diff --git a/PROMS/DotNetBar Source Code/AdvPropertyGrid.ico b/PROMS/DotNetBar Source Code/AdvPropertyGrid.ico
new file mode 100644
index 00000000..3c3bd614
Binary files /dev/null and b/PROMS/DotNetBar Source Code/AdvPropertyGrid.ico differ
diff --git a/PROMS/DotNetBar Source Code/AdvTree.ico b/PROMS/DotNetBar Source Code/AdvTree.ico
new file mode 100644
index 00000000..32a570b6
Binary files /dev/null and b/PROMS/DotNetBar Source Code/AdvTree.ico differ
diff --git a/PROMS/DotNetBar Source Code/AdvTree/AdvTree.cs b/PROMS/DotNetBar Source Code/AdvTree/AdvTree.cs
new file mode 100644
index 00000000..1433f472
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/AdvTree.cs	
@@ -0,0 +1,9872 @@
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.Drawing;
+using System.Data;
+using System.Runtime.InteropServices;
+using System.Windows.Forms;
+using DevComponents.AdvTree.Display;
+using DevComponents.AdvTree.Layout;
+using System.Xml;
+using System.IO;
+using DevComponents.DotNetBar;
+using System.Runtime.Serialization;
+using System.Drawing.Drawing2D;
+using System.Drawing.Text;
+#if FRAMEWORK20
+using System.Collections.Generic;
+using System.Text;
+using System.Globalization;
+using System.Security;
+#endif
+
+namespace DevComponents.AdvTree
+{
+    /// <summary>
+    /// Represents advanced multi-column Tree control.
+    /// </summary>
+    [ToolboxItem(true), DefaultEvent("Click"), System.Runtime.InteropServices.ComVisible(false), Designer("DevComponents.AdvTree.Design.AdvTreeDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf"), ToolboxBitmap(typeof(ToolboxIconResFinder), "AdvTree.ico")]
+    public class AdvTree : System.Windows.Forms.ScrollableControl, INodeNotify, ISupportInitialize
+    {
+        #region Private Variables
+        private bool _DisposeNodes = true;
+        private ElementStyleCollection m_Styles = new ElementStyleCollection();
+        private ColumnHeaderCollection m_Columns = new ColumnHeaderCollection();
+        private NodeCollection m_Nodes = new NodeCollection();
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.Container components = null;
+
+        private ElementStyle m_CellStyleDefault = null;
+        private ElementStyle m_CellStyleMouseDown = null;
+        private ElementStyle m_CellStyleMouseOver = null;
+        private ElementStyle m_CellStyleSelected = null;
+        private ElementStyle m_CellStyleDisabled = null;
+        private ElementStyle m_NodeStyleExpanded = null;
+        private ElementStyle m_NodeStyle = null;
+        private ElementStyle m_NodeStyleSelected = null;
+        private ElementStyle m_NodeStyleMouseOver = null;
+
+        private ElementStyle m_ColumnStyleNormal = null;
+        private ElementStyle m_ColumnStyleMouseOver = null;
+        private ElementStyle m_ColumnStyleMouseDown = null;
+
+        private Layout.NodeLayout m_NodeLayout = null;
+        private NodeDisplay m_NodeDisplay = null;
+
+        private HeadersCollection m_Headers = null;
+
+        private string m_PathSeparator = System.IO.Path.PathSeparator.ToString();
+
+        private int m_UpdateSuspended = 0;
+        private bool m_PendingLayout = false;
+        private bool m_SuspendPaint = false;
+
+        private Node m_SelectedNode = null;
+        private SelectedNodesCollection m_SelectedNodes = new SelectedNodesCollection();
+        //private Cell m_SelectedCell=null;
+        private Node m_MouseOverNode = null;
+        private Cell m_MouseOverCell = null;
+        private int m_CellMouseDownCounter = 0;
+
+        private ImageList m_ImageList = null;
+        private int m_ImageIndex = -1;
+        private bool m_AntiAlias = true;
+
+        //private NodeConnector m_RootConnector=null;
+        private NodeConnector m_NodesConnector = null;
+        private NodeConnector m_LinkConnector = null;
+        private NodeConnector m_SelectedPathConnector = null;
+        private eCellLayout m_CellLayout = eCellLayout.Default;
+        private eCellPartLayout m_CellPartLayout = eCellPartLayout.Default;
+        private Cursor m_OriginalCursor = null;
+        private Cursor m_DefaultCellCursor = null;
+        private ColorScheme m_ColorScheme = null;
+        private bool m_CenterContent = true;
+
+        // Selection box properties
+        private bool m_SelectionBox = true;
+        private int m_SelectionBoxSize = 4;
+        //private Color m_SelectionBoxBorderColor=Color.Empty;
+        //private Color m_SelectionBoxFillColor=Color.Empty;
+
+        // Expand Part Properties
+        private Size m_DefaultExpandPartSize = new Size(8, 8);
+        private Size m_ExpandButtonSize = Size.Empty;
+        private Color m_ExpandBorderColor = Color.Empty;
+        private eColorSchemePart m_ExpandBorderColorSchemePart = eColorSchemePart.None;
+        private Color m_ExpandBackColor = Color.Empty;
+        private eColorSchemePart m_ExpandBackColorSchemePart = eColorSchemePart.None;
+        private Color m_ExpandBackColor2 = Color.Empty;
+        private eColorSchemePart m_ExpandBackColor2SchemePart = eColorSchemePart.None;
+        private int m_ExpandBackColorGradientAngle = 0;
+        private Color m_ExpandLineColor = Color.Empty;
+        private eColorSchemePart m_ExpandLineColorSchemePart = eColorSchemePart.None;
+        private Image m_ExpandImage = null;
+        private Image m_ExpandImageCollapse = null;
+        private eExpandButtonType m_ExpandButtonType = eExpandButtonType.Rectangle;
+
+        private Node m_DisplayRootNode = null;
+
+        // Command button properties
+        private int m_CommandWidth = 10;
+        private Color m_CommandBackColor = Color.Empty;
+        private eColorSchemePart m_CommandBackColorSchemePart = eColorSchemePart.CustomizeBackground;
+        private Color m_CommandBackColor2 = Color.Empty;
+        private eColorSchemePart m_CommandBackColor2SchemePart = eColorSchemePart.CustomizeBackground2;
+        private Color m_CommandForeColor = Color.Empty;
+        private eColorSchemePart m_CommandForeColorSchemePart = eColorSchemePart.CustomizeText;
+        private int m_CommandBackColorGradientAngle = 90;
+        private Color m_CommandMouseOverBackColor = Color.Empty;
+        private eColorSchemePart m_CommandMouseOverBackColorSchemePart = eColorSchemePart.ItemHotBackground;
+        private Color m_CommandMouseOverBackColor2 = Color.Empty;
+        private eColorSchemePart m_CommandMouseOverBackColor2SchemePart = eColorSchemePart.ItemHotBackground2;
+        private Color m_CommandMouseOverForeColor = Color.Empty;
+        private eColorSchemePart m_CommandMouseOverForeColorSchemePart = eColorSchemePart.ItemHotText;
+        private int m_CommandMouseOverBackColorGradientAngle = 90;
+
+        // Cell editing support
+        private bool m_CellEdit = false;
+        private bool m_CellEditing = false;
+        private Cell m_EditedCell = null;
+        private TextBoxEx m_EditTextBox = null;
+
+        // Drag & Drop
+        private bool m_DragDropEnabled = true;
+        private Node m_DragNode = null;
+        private Point m_MouseDownLocation = Point.Empty;
+
+        // Layout
+        private eNodeLayout m_Layout = eNodeLayout.Map;
+        private int m_NodeHorizontalSpacing = 32;
+        private int m_NodeVerticalSpacing = 32;
+        private eDiagramFlow m_DiagramLayoutFlow = eDiagramFlow.LeftToRight;
+        private eMapFlow m_MapLayoutFlow = eMapFlow.Spread;
+
+        private ElementStyle m_BackgroundStyle = new ElementStyle();
+        private eNodeRenderMode m_RenderMode = eNodeRenderMode.Default;
+        private TreeRenderer m_NodeRenderer = null;
+
+        private ArrayList m_HostedControlCells = new ArrayList();
+        private float m_ZoomFactor = 1f;
+        private object m_DotNetBarManager = null;
+
+        private DevComponents.DotNetBar.VScrollBarAdv _VScrollBar = null;
+        private DevComponents.DotNetBar.ScrollBar.HScrollBarAdv _HScrollBar = null;
+        private Control _Thumb = null;
+        private ColumnHeaderControl _ColumnHeader = null;
+        private ArrayList _FullRowBackgroundNodes = null;
+        private DevComponents.AdvTree.Layout.LayoutSettings _LayoutSettings = new DevComponents.AdvTree.Layout.LayoutSettings();
+        #endregion
+
+        #region Events
+        /// <summary>
+        /// Occurs just before cell editor is released for editing. It allows you to customize any properties on edit control.
+        /// </summary>
+        [Description(" Occurs just before cell editor is released for editing. It allows you to customize any properties on edit control.")]
+        public event PrepareCellEditorEventHandler PrepareCellEditorControl;
+        /// <summary>
+        /// Occurs when mouse button is pressed over the column header.
+        /// </summary>
+        public event MouseEventHandler ColumnHeaderMouseDown;
+        /// <summary>
+        /// Occurs when mouse button is released over the column header.
+        /// </summary>
+        public event MouseEventHandler ColumnHeaderMouseUp;
+        /// <summary>
+        /// Occurs after the cell check box is checked.
+        /// </summary>
+        public event AdvTreeCellEventHandler AfterCheck;
+
+        /// <summary>
+        /// Occurs before the cell check box is checked and provides opportunity to cancel the event.
+        /// </summary>
+        public event AdvTreeCellBeforeCheckEventHandler BeforeCheck;
+
+        /// <summary>
+        /// Occurs after the tree node is collapsed.
+        /// </summary>
+        public event AdvTreeNodeEventHandler AfterCollapse;
+
+        /// <summary>
+        /// Occurs before the tree node is collapsed.
+        /// </summary>
+        public event AdvTreeNodeCancelEventHandler BeforeCollapse;
+
+        /// <summary>
+        /// Occurs after the tree node is expanded.
+        /// </summary>
+        public event AdvTreeNodeEventHandler AfterExpand;
+
+        /// <summary>
+        /// Occurs before the tree node is expanded.
+        /// </summary>
+        public event AdvTreeNodeCancelEventHandler BeforeExpand;
+
+        /// <summary>
+        /// Occurs when command button on node is clicked.
+        /// </summary>
+        public event CommandButtonEventHandler CommandButtonClick;
+
+        /// <summary>
+        /// Occurs before cell is edited. The order of the cell editing events is as follows:
+        /// BeforeCellEdit, CellEditEnding, AfterCellEdit, AfterCellEditComplete.
+        /// </summary>
+        public event CellEditEventHandler BeforeCellEdit;
+        /// <summary>
+        /// Occurs just before the cell editing is ended. The text box for editing is still visible and you can cancel
+        /// the exit out of editing mode at this point. The order of the cell editing events is as follows:
+        /// BeforeCellEdit, CellEditEnding, AfterCellEdit, AfterCellEditComplete.
+        /// </summary>
+        public event CellEditEventHandler CellEditEnding;
+        /// <summary>
+        /// Occurs after cell editing has ended and before the new text entered by the user is assigned to the cell. You can abort the edits in this event.
+        /// The order of the cell editing events is as follows:
+        /// BeforeCellEdit, CellEditEnding, AfterCellEdit, AfterCellEditComplete.
+        /// </summary>
+        public event CellEditEventHandler AfterCellEdit;
+
+        /// <summary>
+        /// Occurs after cell editing has been completed. This event cannot be canceled.
+        /// </summary>
+        public event CellEditEventHandler AfterCellEditComplete;
+        /// <summary>
+        /// Occurs after node selection has changed.
+        /// </summary>
+        public event EventHandler SelectionChanged;
+        /// <summary>
+        /// Occurs before Node has been selected by user or through the SelectedNode property. Event can be cancelled.
+        /// </summary>
+        public event AdvTreeNodeCancelEventHandler BeforeNodeSelect;
+
+        /// <summary>
+        /// Occurs after node has been selected by user or through the SelectedNode property.
+        /// </summary>
+        public event AdvTreeNodeEventHandler AfterNodeSelect;
+
+        /// <summary>
+        /// Occurs after node has been deselected by user or through the SelectedNode or SelectedNodes properties.
+        /// </summary>
+        public event AdvTreeNodeEventHandler AfterNodeDeselect;
+
+        /// <summary>
+        /// Occurs before node has been removed from its parent.
+        /// </summary>
+        public event TreeNodeCollectionEventHandler BeforeNodeRemove;
+
+        /// <summary>
+        /// Occurs after node has been removed from its parent.
+        /// </summary>
+        public event TreeNodeCollectionEventHandler AfterNodeRemove;
+
+        /// <summary>
+        /// Occurs before node is inserted or added as child node to parent node.
+        /// </summary>
+        public event TreeNodeCollectionEventHandler BeforeNodeInsert;
+
+        /// <summary>
+        /// Occurs after node is inserted or added as child node.
+        /// </summary>
+        public event TreeNodeCollectionEventHandler AfterNodeInsert;
+
+        /// <summary>
+        /// Occurs when node drag &amp; drop operation is initiated.
+        /// </summary>
+        [Description("Occurs when node drag & drop operation is initiated.")]
+        public event EventHandler NodeDragStart;
+        /// <summary>
+        /// Occurs before internal node drag &amp; drop support is initiated and allows you to cancel the drag &amp; drop.
+        /// </summary>
+        public event AdvTreeNodeCancelEventHandler BeforeNodeDragStart;
+        /// <summary>
+        /// Occurs before Drag-Drop of a node is completed and gives you information about new parent of the node that is being dragged
+        /// as well as opportunity to cancel the operation.
+        /// </summary>
+        public event TreeDragDropEventHandler BeforeNodeDrop;
+
+        /// <summary>
+        /// Occurs while node is being dragged. You can handle this event to disable the drop at specific nodes or to even change the
+        /// drop location for the node by modifying event arguments.
+        /// </summary>
+        public event TreeDragFeedbackEventHander NodeDragFeedback;
+
+        /// <summary>
+        /// Occurs after Drag-Drop of a node is completed. This operation cannot be cancelled.
+        /// </summary>
+        public event TreeDragDropEventHandler AfterNodeDrop;
+
+        /// <summary>
+        /// Occurs when the mouse pointer is over the node and a mouse button is pressed.
+        /// </summary>
+        public event TreeNodeMouseEventHandler NodeMouseDown;
+
+        /// <summary>
+        /// Occurs when the mouse pointer is over the node and a mouse button is released.
+        /// </summary>
+        public event TreeNodeMouseEventHandler NodeMouseUp;
+
+        /// <summary>
+        /// Occurs when the mouse pointer is moved over the node.
+        /// </summary>
+        public event TreeNodeMouseEventHandler NodeMouseMove;
+
+        /// <summary>
+        /// Occurs when the mouse enters the node.
+        /// </summary>
+        public event TreeNodeMouseEventHandler NodeMouseEnter;
+
+        /// <summary>
+        /// Occurs when the mouse leaves the node.
+        /// </summary>
+        public event TreeNodeMouseEventHandler NodeMouseLeave;
+
+        /// <summary>
+        /// Occurs when the mouse hovers over the node.
+        /// </summary>
+        public event TreeNodeMouseEventHandler NodeMouseHover;
+
+        /// <summary>
+        /// Occurs when the node is clicked with left mouse button. If you need to know more information like if another mouse button is clicked etc. use
+        /// NodeMouseDown event.
+        /// </summary>
+        public event TreeNodeMouseEventHandler NodeClick;
+
+        /// <summary>
+        /// Occurs when the node is double-clicked.
+        /// </summary>
+        public event TreeNodeMouseEventHandler NodeDoubleClick;
+
+        /// <summary>
+        /// Occurs after an node has been serialized to XmlElement and provides you with opportunity to add any custom data
+        /// to serialized XML. This allows you to serialize any data associated with the node and load it back up in DeserializeNode event.
+        /// </summary>
+        /// <remarks>
+        /// 	<para>To serialize custom data to XML definition control creates handle this event and use CustomXmlElement
+        /// property on SerializeNodeEventArgs to add new nodes or set attributes with custom data you want saved.</para>
+        /// </remarks>
+        public event SerializeNodeEventHandler SerializeNode;
+
+        /// <summary>
+        /// Occurs after an node has been de-serialized (loaded) from XmlElement and provides you with opportunity to load any custom data
+        /// you have serialized during SerializeItem event.
+        /// </summary>
+        /// <remarks>
+        /// 	<para>To de-serialize custom data from XML definition handle this event and use CustomXmlElement
+        /// property on SerializeItemEventArgs to retrieve any data you saved in SerializeNode event.</para>
+        /// </remarks>
+        public event SerializeNodeEventHandler DeserializeNode;
+
+        /// <summary>
+        /// Occurs when hyperlink in text-markup is clicked.
+        /// </summary>
+        public event MarkupLinkClickEventHandler MarkupLinkClick;
+
+        /// <summary>
+        /// Occurs when cell with custom editor type is about to be edited by user. Handle this event to provide 
+        /// custom editors.
+        /// </summary>
+        public event CustomCellEditorEventHandler ProvideCustomCellEditor;
+
+#if FRAMEWORK20
+        /// <summary>
+        /// Occurs when the DataSource changes.
+        /// </summary>
+        [Description("Occurs when the DataSource changes.")]
+        public event EventHandler DataSourceChanged;
+        /// <summary>
+        /// Occurs when the DisplayMembers property changes.
+        /// </summary>
+        [Description("Occurs when the DisplayMembers property changes")]
+        public event EventHandler DisplayMembersChanged;
+        /// <summary>
+        /// Occurs when the control is bound to a data value that need to be converted.
+        /// </summary>
+        [Description("Occurs when the control is bound to a data value that need to be converted.")]
+        public event DevComponents.DotNetBar.Controls.TreeConvertEventHandler Format;
+        /// <summary>
+        /// Occurs when FormattingEnabled property changes.
+        /// </summary>
+        [Description("Occurs when FormattingEnabled property changes.")]
+        public event EventHandler FormattingEnabledChanged;
+        /// <summary>
+        /// Occurs when FormatString property changes.
+        /// </summary>
+        [Description("Occurs when FormatString property changes.")]
+        public event EventHandler FormatStringChanged;
+        /// <summary>
+        /// Occurs when FormatInfo property has changed.
+        /// </summary>
+        [Description("Occurs when FormatInfo property has changed.")]
+        public event EventHandler FormatInfoChanged;
+        /// <summary>
+        /// Occurs when a Node for an data-bound object item has been created and provides you with opportunity to modify the node.
+        /// </summary>
+        [Description("Occurs when a Node for an data-bound object item has been created and provides you with opportunity to modify the node")]
+        public event DevComponents.DotNetBar.Controls.DataNodeEventHandler DataNodeCreated;
+        /// <summary>
+        /// Occurs when a group Node is created as result of GroupingMembers property setting and provides you with opportunity to modify the node.
+        /// </summary>
+        [Description("Occurs when a group Node is created as result of GroupingMembers property setting and provides you with opportunity to modify the node")]
+        public event DevComponents.DotNetBar.Controls.DataNodeEventHandler GroupNodeCreated;
+        /// <summary>
+        /// Occurs when value of ValueMember property has changed.
+        /// </summary>
+        [Description("Occurs when value of ValueMember property has changed.")]
+        public event EventHandler ValueMemberChanged;
+        /// <summary>
+        /// Occurs when value of SelectedValue property has changed.
+        /// </summary>
+        [Description("Occurs when value of SelectedValue property has changed.")]
+        public event EventHandler SelectedValueChanged;
+        /// <summary>
+        /// Occurs when value of SelectedIndex property has changed.
+        /// </summary>
+        [Description("Occurs when value of SelectedValue property has changed.")]
+        public event EventHandler SelectedIndexChanged;
+        /// <summary>
+        /// Occurs when ColumnHeader is automatically created by control as result of data binding and provides you with opportunity to modify it.
+        /// </summary>
+        [Description("Occurs when ColumnHeader is automatically created by control as result of data binding and provides you with opportunity to modify it.")]
+        public event DevComponents.DotNetBar.Controls.DataColumnEventHandler DataColumnCreated;
+#endif
+        /// <summary>
+        /// Occurs after column has been resized by end-user.
+        /// </summary>
+        [Description("Occurs after column has been resized by end-user")]
+        public event EventHandler ColumnResized;
+        /// <summary>
+        /// Occurs while column is being resized by end-user.
+        /// </summary>
+        [Description("Occurs while column is being resized by end-user.")]
+        public event EventHandler ColumnResizing;
+
+        /// <summary>
+        /// Occurs after cell has been selected.
+        /// </summary>
+        [Description("Occurs after cell has been selected.")]
+        public event AdvTreeCellEventHandler CellSelected;
+        /// <summary>
+        /// Occurs after cell has been unselected.
+        /// </summary>
+        [Description("Occurs after cell has been unselected.")]
+        public event AdvTreeCellEventHandler CellUnselected;
+        /// <summary>
+        /// Occurs after users has moved the column.
+        /// </summary>
+        [Description("Occurs after users has moved the column.")]
+        public event ColumnMovedHandler ColumnMoved;
+        /// <summary>
+        /// Occurs while tree control is being rendered.
+        /// </summary>
+        [Description("Occurs while tree control is being rendered.")]
+        public event AdvTreeRenderEventHandler Render;
+        /// <summary>
+        /// Raises Render event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnRender(AdvTreeRenderEventArgs e)
+        {
+            AdvTreeRenderEventHandler handler = Render;
+            if (handler != null)
+                handler(this, e);
+        }
+        internal void InvokeRenderEvent(AdvTreeRenderEventArgs e)
+        {
+            OnRender(e);
+        }
+        #endregion
+
+        #region Constructor/Dispose
+        /// <summary>Creates new instance of the class.</summary>
+        public AdvTree()
+        {
+            if (!ColorFunctions.ColorsLoaded)
+            {
+                NativeFunctions.RefreshSettings();
+                NativeFunctions.OnDisplayChange();
+                ColorFunctions.LoadColors();
+            }
+            m_SelectedNodes.TreeSelectionControl = this;
+            this.SetStyle(ControlStyles.UserPaint, true);
+            this.SetStyle(ControlStyles.AllPaintingInWmPaint, true);
+            this.SetStyle(ControlStyles.Opaque, true);
+            this.SetStyle(ControlStyles.ResizeRedraw, true);
+            this.SetStyle(ControlStyles.DoubleBuffer, true);
+            this.SetStyle(ControlStyles.Selectable, true);
+
+            // This call is required by the Windows.Forms Form Designer.
+            InitializeComponent();
+
+            m_BackgroundStyle.StyleChanged += new EventHandler(ElementStyleChanged);
+            m_BackgroundStyle.TreeControl = this;
+
+            m_Columns.Parent = this;
+
+            // Setup layout helper
+            m_NodeLayout = new NodeTreeLayout(this, this.ClientRectangle, _LayoutSettings);
+            _LayoutSettings.NodeVerticalSpacing = _NodeSpacing;
+
+            m_NodeLayout.LeftRight = this.RtlTranslateLeftRight(LeftRightAlignment.Left);
+
+#if TRIAL
+			NodeOperations.ColorExpAlt();
+#endif
+            // Setup display helper
+            m_NodeDisplay = new NodeTreeDisplay(this);
+
+            m_Headers = new HeadersCollection();
+
+            m_Nodes.TreeControl = this;
+            m_Styles.TreeControl = this;
+
+            m_ColorScheme = new ColorScheme(eColorSchemeStyle.Office2007);
+
+            //m_SelectionBoxBorderColor=GetDefaultSelectionBoxBorderColor();
+            //m_SelectionBoxFillColor=GetDefaultSelectionBoxFillColor();
+
+            m_ExpandButtonSize = GetDefaultExpandButtonSize();
+
+            this.AllowDrop = true;
+            this.IsAccessible = true;
+
+            if (BarFunctions.IsWindows7 && DevComponents.DotNetBar.Touch.TouchHandler.IsTouchEnabled)
+            {
+                _TouchHandler = new DevComponents.DotNetBar.Touch.TouchHandler(this, DevComponents.DotNetBar.Touch.eTouchHandlerType.Gesture);
+                _TouchHandler.PanBegin += new EventHandler<DevComponents.DotNetBar.Touch.GestureEventArgs>(TouchHandlerPanBegin);
+                _TouchHandler.Pan += new EventHandler<DevComponents.DotNetBar.Touch.GestureEventArgs>(TouchHandlerPan);
+                _TouchHandler.PanEnd += new EventHandler<DevComponents.DotNetBar.Touch.GestureEventArgs>(TouchHandlerPanEnd);
+            }
+        }
+
+        private bool _Disposed = false;
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        protected override void Dispose(bool disposing)
+        {
+            _Disposed = true;
+            if (disposing)
+            {
+                if (components != null)
+                    components.Dispose();
+
+                System.Windows.Forms.Timer timer = _SearchBufferExpireTimer;
+                _SearchBufferExpireTimer = null;
+                if (timer != null)
+                {
+                    timer.Stop();
+                    timer.Dispose();
+                }
+            }
+
+            if (BarUtilities.DisposeItemImages && !this.DesignMode)
+            {
+                BarUtilities.DisposeImage(ref _CheckBoxImageChecked);
+                BarUtilities.DisposeImage(ref _CheckBoxImageIndeterminate);
+                BarUtilities.DisposeImage(ref _CheckBoxImageUnChecked);
+                BarUtilities.DisposeImage(ref m_ExpandImage);
+                BarUtilities.DisposeImage(ref m_ExpandImageCollapse);
+            }
+
+            if (m_Nodes != null && disposing && _DisposeNodes)
+            {
+                Node[] nodes = new Node[m_Nodes.Count];
+                m_Nodes.CopyTo(nodes);
+                foreach (Node node in nodes)
+                    node.Dispose();
+                //m_Nodes.Clear();
+            }
+
+            base.Dispose(disposing);
+        }
+        /// <summary>
+        /// Indicates whether nodes are disposed when control is disposed.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool DisposeNodes
+        {
+            get { return _DisposeNodes; }
+            set
+            {
+                _DisposeNodes = value;
+            }
+        }
+        
+        #endregion
+
+        #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();
+        }
+        #endregion
+
+        #region Properties
+        [DefaultValue(true)]
+        public override bool AllowDrop {
+            get { return base.AllowDrop; }
+            set { base.AllowDrop = value; }
+        }
+
+        private bool _DeepSort = false;
+        /// <summary>
+        /// Indicates whether sorting of node collection sorts child nodes as well. Default value is false.
+        /// </summary>
+        [Browsable(false), DefaultValue(false), Category("Behavior"), Description("Indicates whether sorting of node collection sorts child nodes as well. Default value is false.")]
+        public bool DeepSort
+        {
+            get { return _DeepSort; }
+            set
+            {
+                _DeepSort = value;
+            }
+        }
+        
+        private bool _ShowToolTips = true;
+        /// <summary>
+        /// Gets or sets whether tooltips are shown when mouse is over the cell when Tooltip property is set.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether tooltips are shown when mouse is over the cell when Tooltip property is set.")]
+        public bool ShowToolTips
+        {
+            get { return _ShowToolTips; }
+            set
+            {
+                _ShowToolTips = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the column header control which renderes the columns.
+        /// </summary>
+        internal ColumnHeaderControl ColumnHeaderControl
+        {
+            get { return _ColumnHeader; }
+        }
+        private eScrollBarAppearance _ScrollBarAppearance = eScrollBarAppearance.Default;
+        /// <summary>
+        /// Gets or sets the scroll-bar visual style.
+        /// </summary>
+        [DefaultValue(eScrollBarAppearance.Default), Category("Appearance"), Description("Gets or sets the scroll-bar visual style.")]
+        public eScrollBarAppearance ScrollBarAppearance
+        {
+            get { return _ScrollBarAppearance; }
+            set
+            {
+                _ScrollBarAppearance = value;
+                OnScrollBarAppearanceChanged();
+            }
+        }
+        private void OnScrollBarAppearanceChanged()
+        {
+            if (_VScrollBar != null) _VScrollBar.Appearance = _ScrollBarAppearance;
+            if (_HScrollBar != null) _HScrollBar.Appearance = _ScrollBarAppearance;
+        }
+
+        private Size _TileSize = new Size(184, 30);
+        /// <summary>
+        /// Gets or sets the proposed size of the tile in Tile view. The size of the tile might be larger than specified if Style assigned to node, cells adds padding, margins etc. or if Node.Image or font is greater than width or height specified here.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates size of the tile in Tile view.")]
+        public Size TileSize
+        {
+            get { return _TileSize; }
+            set
+            {
+                if (value != _TileSize)
+                {
+                    Size oldValue = _TileSize;
+                    _TileSize = value;
+                    OnTileSizeChanged(oldValue, value);
+                }
+            }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeTileSize()
+        {
+            return _TileSize.Width != 184 || _TileSize.Height != 30;
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetTileSize()
+        {
+            TileSize = new Size(184, 30);
+        }
+        private void OnTileSizeChanged(Size oldValue, Size newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("TileSize"));
+            if (_View == eView.Tile)
+            {
+                InvalidateNodesSize();
+                this.RecalcLayout();
+            }
+        }
+
+        private bool _HideSelection = false;
+        /// <summary>
+        /// Gets or sets a value indicating whether the selected tree node remains highlighted even when the tree control has lost the focus.
+        /// </summary>
+        [DefaultValue(false), Category("Selection"), Description("Indicates whether the selected tree node remains highlighted even when the tree control has lost the focus.")]
+        public bool HideSelection
+        {
+            get { return _HideSelection; }
+            set
+            {
+                _HideSelection = value;
+                if (this.SelectedNode != null && !this.IsKeyboardFocusWithin)
+                    this.Invalidate();
+            }
+        }
+
+        private bool _IsKeyboardFocusWithin = false;
+        /// <summary>
+        /// Gets whether keyboard focus is within the control.
+        /// </summary>
+        [Browsable(false)]
+        public bool IsKeyboardFocusWithin
+        {
+            get { return _IsKeyboardFocusWithin; }
+#if FRAMEWORK20
+            internal set
+#else
+            set
+#endif
+            {
+                _IsKeyboardFocusWithin = value;
+                OnIsKeyboardFocusWithinChanged();
+            }
+        }
+        protected virtual void OnIsKeyboardFocusWithinChanged()
+        {
+            if (_IsKeyboardFocusWithin)
+            {
+                if (_MultiSelect)
+                {
+                    foreach (Node node in m_SelectedNodes)
+                    {
+                        InvalidateNode(node);
+                    }
+                }
+                else if (this.SelectedNode != null)
+                    InvalidateNode(this.SelectedNode);
+            }
+            else
+            {
+                if (_MultiSelect)
+                {
+                    foreach (Node node in m_SelectedNodes)
+                    {
+                        InvalidateNode(node);
+                    }
+                }
+                else if (this.SelectedNode != null)
+                    InvalidateNode(this.SelectedNode);
+
+                if (m_CellEditing && _EndCellEditingOnLostFocus)
+                    EndCellEditing(eTreeAction.Keyboard);
+            }
+        }
+
+        private bool _EndCellEditingOnLostFocus = true;
+        /// <summary>
+        /// Gets or sets whether cell editing is completed when control loses input focus. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Editing"), Description("Indicates whether cell editing is completed when control loses input focus. Default value is true.")]
+        public bool EndCellEditingOnLostFocus
+        {
+            get { return _EndCellEditingOnLostFocus; }
+            set
+            {
+                _EndCellEditingOnLostFocus = value;
+            }
+        }
+
+        protected override void OnEnter(EventArgs e)
+        {
+            this.IsKeyboardFocusWithin = true;
+            base.OnEnter(e);
+        }
+        protected override void OnLeave(EventArgs e)
+        {
+            this.IsKeyboardFocusWithin = false;
+            base.OnLeave(e);
+        }
+
+        internal ArrayList FullRowBackgroundNodes
+        {
+            get
+            {
+                return _FullRowBackgroundNodes;
+            }
+            set
+            {
+                _FullRowBackgroundNodes = value;
+            }
+        }
+
+        private ContextMenuBar _ContextMenuBar = null;
+        /// <summary>
+        /// Gets or sets the reference to DotNetBar ContextMenuBar component which is used to provide context menu for nodes. This property
+        /// is automatically maintained by AdvTree.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never), DefaultValue(null), Browsable(false)]
+        public ContextMenuBar ContextMenuBar
+        {
+            get { return _ContextMenuBar; }
+            set { _ContextMenuBar = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets zoom factor for the control. Default value is 1. To zoom display of the nodes for 20% set zoom factor to 1.2
+        /// To zoom view 2 times set zoom factor to 2. Value must be greater than 0. Zoom is supported only when non-column tree setup is used.
+        /// Please note that Zoom functionality is designed only for very special use cases and only for
+        /// plain tree control setup which does not use editing, alternating row colors, drag &amp; drop or any other
+        /// advanced functionality.
+        /// </summary>
+        [Browsable(false), DefaultValue(1f), Category("Layout"), Description("Indicates zoom factor for the control.")]
+        public float Zoom
+        {
+            get { return m_ZoomFactor; }
+            set
+            {
+                if (value <= 0.1)
+                    return;
+                m_ZoomFactor = value;
+                this.RecalcLayout();
+            }
+        }
+
+        /// <summary>
+        /// Gets the size of the tree.
+        /// </summary>
+        [Browsable(false)]
+        public Size TreeSize
+        {
+            get
+            {
+                return new Size(m_NodeLayout.Width, m_NodeLayout.Height);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets custom node renderer. You can set this property to your custom renderer. When set the RenderMode should be set to Custom to enable
+        /// your custom renderer. To choose one of the system renderer use RenderMode property. Default value is null.
+        /// </summary>
+        [Browsable(false), Category("Style"), DefaultValue(null), Description("Indicates render mode used to render the node.")]
+        internal TreeRenderer NodeRenderer
+        {
+            get { return m_NodeRenderer; }
+            set
+            {
+                m_NodeRenderer = value;
+                OnDisplayChanged();
+            }
+        }
+        /// <summary>
+        /// Gets or sets the render mode used to render all nodes. Default value is eNodeRenderMode.Default which indicates that system default renderer is used.
+        /// Note that if you specify custom renderer you need to set AdvTree.NodeRenderer property to your custom renderer.
+        /// </summary>
+        [Browsable(true), Category("Style"), DefaultValue(eNodeRenderMode.Default), Description("Indicates render mode used to render the node.")]
+        internal eNodeRenderMode RenderMode
+        {
+            get { return m_RenderMode; }
+            set
+            {
+                m_RenderMode = value;
+                OnDisplayChanged();
+            }
+        }
+
+        /// <summary>
+        /// Gets the style for the background of the control.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), Description("Gets the style for the background of the control."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ElementStyle BackgroundStyle
+        {
+            get { return m_BackgroundStyle; }
+        }
+
+        /// <summary>
+        /// Gets the current renderer used by the control.
+        /// </summary>
+        /// <returns>Reference to the TreeRenderer used by the control.</returns>
+        public TreeRenderer GetRenderer()
+        {
+            if (m_RenderMode == eNodeRenderMode.Default)
+            {
+                if (m_NodeDisplay is NodeTreeDisplay)
+                    return ((NodeTreeDisplay)m_NodeDisplay).SystemRenderer;
+                return null;
+            }
+            else
+                return m_NodeRenderer;
+        }
+
+        /// <summary>
+        /// Gets or sets internal layout cell horizontal spacing. This property is for advanced internal use and you should not set it.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), EditorBrowsable(EditorBrowsableState.Advanced)]
+        public int CellHorizontalSpacing
+        {
+            get
+            {
+                return _LayoutSettings.CellHorizontalSpacing;
+            }
+            set
+            {
+                _LayoutSettings.CellHorizontalSpacing = value;
+            }
+        }
+
+        ///// <summary>
+        ///// Gets or sets the flow of nodes when Diagram layout is used. Note that this setting applies only to Diagram layout type.
+        ///// </summary>
+        //[Browsable(true),Category("Layout"),DefaultValue(eDiagramFlow.LeftToRight),Description("Indicates flow of nodes when Diagram layout is used.")]
+        //public eDiagramFlow DiagramLayoutFlow
+        //{
+        //    get {return m_DiagramLayoutFlow;}
+        //    set
+        //    {
+        //        m_DiagramLayoutFlow=value;
+        //        OnLayoutChanged();
+        //    }
+        //}
+
+        ///// <summary>
+        ///// Gets or sets the flow of nodes when Map layout is used. Note that this setting applies only to Map layout type.
+        ///// </summary>
+        //[Browsable(true),Category("Layout"),DefaultValue(eMapFlow.Spread),Description("Indicates flow of nodes when Map layout is used.")]
+        //public eMapFlow MapLayoutFlow
+        //{
+        //    get {return m_MapLayoutFlow;}
+        //    set
+        //    {
+        //        m_MapLayoutFlow=value;
+        //        OnLayoutChanged();
+        //    }
+        //}
+
+        ///// <summary>
+        ///// Gets or sets the horizontal spacing in pixels between nodes. Default value is 32.
+        ///// </summary>
+        //[Browsable(true),Category("Layout"),DefaultValue(32),Description("Indicates horizontal spacing in pixels between nodes.")]
+        //public int NodeHorizontalSpacing
+        //{
+        //    get {return m_NodeHorizontalSpacing;}
+        //    set
+        //    {
+        //        m_NodeHorizontalSpacing=value;
+        //        OnLayoutChanged();
+        //    }
+        //}
+
+        ///// <summary>
+        ///// Gets or sets the vertical spacing in pixels between nodes. Default value is 16.
+        ///// </summary>
+        //[Browsable(true),Category("Layout"),DefaultValue(32),Description("Indicates vertical spacing in pixels between nodes.")]
+        //public int NodeVerticalSpacing
+        //{
+        //    get {return m_NodeVerticalSpacing;}
+        //    set
+        //    {
+        //        m_NodeVerticalSpacing=value;
+        //        OnLayoutChanged();
+        //    }
+        //}
+
+        ///// <summary>
+        ///// Gets or sets the layout type for the nodes.
+        ///// </summary>
+        //[Browsable(true),Category("Layout"),DefaultValue(eNodeLayout.Map),Description("Indicates layout type for the nodes.")]
+        //public eNodeLayout LayoutType
+        //{
+        //    get {return m_Layout;}
+        //    set
+        //    {
+        //        if(m_Layout!=value)
+        //        {
+        //            SetLayout(value);
+        //        }
+        //    }
+        //}
+
+        /// <summary>
+        /// Gets or sets whether automatic drag and drop is enabled. Default value is true.
+        /// </summary>
+        [Browsable(true), Category("Behavior"), Description("Indicates whether automatic drag and drop is enabled."), DefaultValue(true)]
+        public bool DragDropEnabled
+        {
+            get { return m_DragDropEnabled; }
+            set { m_DragDropEnabled = value; }
+        }
+
+        /// <summary>
+        /// Creates the Graphics object for the control.
+        /// </summary>
+        /// <returns>The Graphics object for the control.</returns>
+        public new Graphics CreateGraphics()
+        {
+            Graphics g = base.CreateGraphics();
+            if (m_AntiAlias)
+            {
+                g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.AntiAlias;
+#if FRAMEWORK20
+                if (!SystemInformation.IsFontSmoothingEnabled)
+#endif
+                    g.TextRenderingHint = DisplayHelp.AntiAliasTextRenderingHint;
+            }
+            return g;
+        }
+
+        /// <summary>
+        /// Gets or sets whether anti-alias smoothing is used while painting the tree.
+        /// </summary>
+        [DefaultValue(true), Browsable(true), Category("Appearance"), Description("Gets or sets whether anti-aliasing is used while painting the tree.")]
+        public bool AntiAlias
+        {
+            get { return m_AntiAlias; }
+            set
+            {
+                if (m_AntiAlias != value)
+                {
+                    m_AntiAlias = value;
+                    this.Refresh();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the delimiter string that the tree node path uses.
+        /// </summary>
+        [DefaultValue("\\"), Browsable(false), Description("Indicates the delimiter string that the tree node path uses.")]
+        public string PathSeparator
+        {
+            get { return m_PathSeparator; }
+            set { m_PathSeparator = value; }
+        }
+
+        private bool _AllowUserToResizeColumns = true;
+        /// <summary>
+        /// Gets or sets whether user can resize the columns. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Columns"), Description("Indicates whether user can resize the columns.")]
+        public bool AllowUserToResizeColumns
+        {
+            get { return _AllowUserToResizeColumns; }
+            set
+            {
+                _AllowUserToResizeColumns = value;
+            }
+        }
+
+        private bool _AllowUserToReorderColumns = false;
+        /// <summary>
+        /// Gets or sets whether user can reorder the columns. Default value is false.
+        /// </summary>
+        [DefaultValue(false), Category("Columns"), Description("Indicates whether user can reorder the columns.")]
+        public bool AllowUserToReorderColumns
+        {
+            get { return _AllowUserToReorderColumns; }
+            set
+            {
+                _AllowUserToReorderColumns = value;
+            }
+        }
+
+
+        /// <summary>
+        /// Gets the collection of column headers that appear in the tree.
+        /// </summary>
+        /// <remarks>
+        /// 	<para>By default there are no column headers defined. In that case tree control
+        ///     functions as regular tree control where text has unrestricted width.</para>
+        /// 	<para>If you want to restrict the horizontal width of the text but not display
+        ///     column header you can create one column and set its width to the width desired and
+        ///     set its Visible property to false.</para>
+        /// </remarks>
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content), Category("Columns"), Description("Gets collection of column headers that appear in the tree.")]
+        public ColumnHeaderCollection Columns
+        {
+            get
+            {
+                return m_Columns;
+            }
+        }
+
+        private bool _ColumnsVisible = true;
+        /// <summary>
+        /// Gets or sets whether column headers are visible if they are defined through Columns collection. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Columns"), Description("Indicates whether column headers are visible if they are defined through Columns collection.")]
+        public bool ColumnsVisible
+        {
+            get { return _ColumnsVisible; }
+            set
+            {
+                if (_ColumnsVisible != value)
+                {
+                    _ColumnsVisible = value;
+                    if (m_Columns.Count > 0) RecalcLayout();
+                }
+            }
+        }
+
+        internal void SetColumnHeaderControlVisibility(bool visible)
+        {
+            if (visible)
+            {
+                if (_ColumnHeader == null)
+                {
+                    _ColumnHeader = new ColumnHeaderControl();
+                    _ColumnHeader.Columns = this.Columns;
+                    this.Controls.Add(_ColumnHeader);
+                }
+            }
+            else if (_ColumnHeader != null)
+            {
+                _ColumnHeader.Columns = null;
+                this.Controls.Remove(_ColumnHeader);
+                _ColumnHeader.Dispose();
+                _ColumnHeader = null;
+            }
+            RepositionColumnHeader();
+        }
+
+        internal bool CanResizeColumnAt(int x, int y)
+        {
+            if (!m_Columns.Bounds.Contains(x, y)) return false;
+
+            ColumnHeader col = GetColumnForResizeAt(x, y, m_Columns, false);
+            return col != null;
+        }
+
+        internal ColumnHeader GetColumnAt(int x, int y, ColumnHeaderCollection columns)
+        {
+            Point p = new Point(x, y);
+            Point offset = Point.Empty;
+            if (AutoScroll)
+            {
+                offset = GetAutoScrollPositionOffset();
+                if (columns.ParentNode == null)
+                    offset.Y = 0;
+            }
+
+            Rectangle columnsBounds = columns.Bounds;
+            columnsBounds.Offset(offset);
+            if (!columnsBounds.Contains(p)) return null;
+
+            foreach (ColumnHeader item in columns)
+            {
+                if (!item.Visible) continue;
+                Rectangle r = item.Bounds;
+                r.Offset(offset);
+                if (r.Contains(p))
+                    return item;
+            }
+            return null;
+        }
+
+        private ColumnHeader GetColumnForResizeAt(int x, int y, ColumnHeaderCollection columns, bool ignoreY)
+        {
+            return GetColumnForResizeAt(x, y, columns, ignoreY, false);
+        }
+        private ColumnHeader GetColumnForResizeAt(int x, int y, ColumnHeaderCollection columns, bool ignoreY, bool ignoreLastColumn)
+        {
+            Point p = new Point(x, y);
+            Point offset = Point.Empty;
+            if (AutoScroll)
+            {
+                offset = GetAutoScrollPositionOffset();
+                if (columns.ParentNode == null)
+                    offset.Y = 0;
+            }
+
+            Rectangle columnsBounds = columns.Bounds;
+            columnsBounds.Offset(offset);
+            if (!columnsBounds.Contains(p) && !ignoreY) return null;
+
+            int count = columns.Count - (ignoreLastColumn ? 1 : 0);
+            for (int i = 0; i < count; i++)
+            {
+                ColumnHeader item = columns[i];
+                Rectangle r = new Rectangle(item.Bounds.Right - 4, item.Bounds.Y, 6, item.Bounds.Height);
+                r.Offset(offset);
+                if (r.Contains(p) || ignoreY && p.X >= r.X && p.X <= r.Right)
+                    return item;
+            }
+            return null;
+        }
+
+        private ColumnHeader _ColumnReorder = null;
+        private Cursor _OldCursor = null;
+        private int _ColumnMoveMarkerIndex = -1;
+        private int ColumnMoveMarkerIndex
+        {
+            get
+            {
+                return _ColumnMoveMarkerIndex;
+            }
+            set
+            {
+                if (_ColumnReorder == null) throw new ArgumentException("Column is not being reordered");
+                _ColumnMoveMarkerIndex = value;
+                if (_ColumnReorder.Parent == m_Columns)
+                    _ColumnHeader.ColumnMoveMarkerIndex = value;
+                else
+                {
+                    this.Invalidate(_ColumnReorder.Parent.Bounds);
+                }
+            }
+        }
+        internal void StartColumnReorder(int x, int y)
+        {
+            StartColumnReorder(x, y, m_Columns);
+        }
+        private void StartColumnReorder(int x, int y, ColumnHeaderCollection columns)
+        {
+            ColumnHeader col = GetColumnAt(x, y, columns);
+            if (col == null) return;
+            EndCellEditing(eTreeAction.Mouse);
+            _OldCursor = this.Cursor;
+            this.Cursor = Cursors.Hand;
+            this.Capture = true;
+            _ColumnReorder = col;
+            this.ColumnMoveMarkerIndex = columns.IndexOf(col);
+            this.Invalidate();
+        }
+
+        private ColumnHeader _ColumnResize = null;
+        internal void StartColumnResize(int x, int y)
+        {
+            StartColumnResize(x, y, m_Columns);
+        }
+
+        private void StartColumnResize(int x, int y, ColumnHeaderCollection columns)
+        {
+            ColumnHeader col = GetColumnForResizeAt(x, y, columns, _GridColumnLineResizeEnabled, false);
+            if (col == null) return;
+
+            this.Capture = true;
+            _ColumnResize = col;
+        }
+
+        /// <summary>
+        /// Gets the collection of all style elements created for the tree.
+        /// </summary>
+        [Browsable(true), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ElementStyleCollection Styles
+        {
+            get { return m_Styles; }
+        }
+
+        /// <summary>
+        /// Gets or sets default style for the node cell.
+        /// </summary>
+        [Browsable(true), Category("Node Style"), DefaultValue(null), Editor("DevComponents.AdvTree.Design.ElementStyleTypeEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), Description("Indicates default style for the node cell.")]
+        public ElementStyle CellStyleDefault
+        {
+            get { return m_CellStyleDefault; }
+            set
+            {
+                if (m_CellStyleDefault != value)
+                {
+                    if (m_CellStyleDefault != null)
+                        m_CellStyleDefault.StyleChanged -= new EventHandler(this.ElementStyleChanged);
+                    if (value != null)
+                        value.StyleChanged += new EventHandler(this.ElementStyleChanged);
+                    m_CellStyleDefault = value;
+                    this.OnCellStyleChanged();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets default style for the node cell when mouse is pressed.
+        /// </summary>
+        [Browsable(true), Category("Node Style"), DefaultValue(null), Editor("DevComponents.AdvTree.Design.ElementStyleTypeEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), Description("Indicates default style for the node cell when mouse is pressed.")]
+        public ElementStyle CellStyleMouseDown
+        {
+            get { return m_CellStyleMouseDown; }
+            set
+            {
+                if (m_CellStyleMouseDown != value)
+                {
+                    if (m_CellStyleMouseDown != null)
+                        m_CellStyleMouseDown.StyleChanged -= new EventHandler(this.ElementStyleChanged);
+                    if (value != null)
+                        value.StyleChanged += new EventHandler(this.ElementStyleChanged);
+                    m_CellStyleMouseDown = value;
+                    this.OnCellStyleChanged();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets default style for the node cell when mouse is over the cell.
+        /// </summary>
+        [Browsable(true), Category("Node Style"), DefaultValue(null), Editor("DevComponents.AdvTree.Design.ElementStyleTypeEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), Description("Indicates default style for the node cell when mouse is over the cell.")]
+        public ElementStyle CellStyleMouseOver
+        {
+            get { return m_CellStyleMouseOver; }
+            set
+            {
+                if (m_CellStyleMouseOver != value)
+                {
+                    if (m_CellStyleMouseOver != null)
+                        m_CellStyleMouseOver.StyleChanged -= new EventHandler(this.ElementStyleChanged);
+                    if (value != null)
+                        value.StyleChanged += new EventHandler(this.ElementStyleChanged);
+                    m_CellStyleMouseOver = value;
+                    this.OnCellStyleChanged();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets default style for the node cell when cell is selected.
+        /// </summary>
+        [Browsable(true), Category("Node Style"), DefaultValue(null), Editor("DevComponents.AdvTree.Design.ElementStyleTypeEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), Description("Indicates default style for the node cell when cell is selected.")]
+        public ElementStyle CellStyleSelected
+        {
+            get { return m_CellStyleSelected; }
+            set
+            {
+                if (m_CellStyleSelected != value)
+                {
+                    if (m_CellStyleSelected != null)
+                        m_CellStyleSelected.StyleChanged -= new EventHandler(this.ElementStyleChanged);
+                    if (value != null)
+                        value.StyleChanged += new EventHandler(this.ElementStyleChanged);
+                    m_CellStyleSelected = value;
+                    this.OnCellStyleChanged();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets default style for the node cell when cell is disabled.
+        /// </summary>
+        [Browsable(true), Category("Node Style"), DefaultValue(null), Editor("DevComponents.AdvTree.Design.ElementStyleTypeEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), Description("Indicates default style for the node cell when cell is disabled.")]
+        public ElementStyle CellStyleDisabled
+        {
+            get { return m_CellStyleDisabled; }
+            set
+            {
+                if (m_CellStyleDisabled != value)
+                {
+                    if (m_CellStyleDisabled != null)
+                        m_CellStyleDisabled.StyleChanged -= new EventHandler(this.ElementStyleChanged);
+                    if (value != null)
+                        value.StyleChanged += new EventHandler(this.ElementStyleChanged);
+                    m_CellStyleDisabled = value;
+                    this.OnCellStyleChanged();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets default style for the node when node is expanded.
+        /// </summary>
+        [Browsable(true), Category("Node Style"), DefaultValue(null), Editor("DevComponents.AdvTree.Design.ElementStyleTypeEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), Description("Gets or sets default style for the node cell when node that cell belongs to is expanded.")]
+        public ElementStyle NodeStyleExpanded
+        {
+            get { return m_NodeStyleExpanded; }
+            set
+            {
+                if (m_NodeStyleExpanded != value)
+                {
+                    if (m_NodeStyleExpanded != null)
+                        m_NodeStyleExpanded.StyleChanged -= new EventHandler(this.ElementStyleChanged);
+                    if (value != null)
+                        value.StyleChanged += new EventHandler(this.ElementStyleChanged);
+                    m_NodeStyleExpanded = value;
+                    this.OnCellStyleChanged();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets default style for all nodes where style is not specified
+        /// explicity.
+        /// </summary>
+        /// <value>
+        /// Name of the style assigned or null value indicating that no style is used.
+        /// Default value is null.
+        /// </value>
+        [Browsable(true), Category("Node Style"), DefaultValue(null), Editor("DevComponents.AdvTree.Design.ElementStyleTypeEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), Description("Gets or sets default style for the node.")]
+        public ElementStyle NodeStyle
+        {
+            get { return m_NodeStyle; }
+            set
+            {
+                if (m_NodeStyle != value)
+                {
+                    if (m_NodeStyle != null)
+                        m_NodeStyle.StyleChanged -= new EventHandler(this.ElementStyleChanged);
+                    if (value != null)
+                        value.StyleChanged += new EventHandler(this.ElementStyleChanged);
+                    m_NodeStyle = value;
+                    this.OnCellStyleChanged();
+                }
+            }
+        }
+        /// <summary>
+        /// Gets or sets style for the node when node is selected. Note that this style is applied to the default node style.
+        /// </summary>
+        /// <value>
+        /// Reference to the style assigned or null value indicating that no style is used.
+        /// Default value is null.
+        /// </value>
+        [Browsable(true), Category("Node Style"), DefaultValue(null), Editor("DevComponents.AdvTree.Design.ElementStyleTypeEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), Description("Gets or sets style of the node when node is selected.")]
+        public ElementStyle NodeStyleSelected
+        {
+            get { return m_NodeStyleSelected; }
+            set
+            {
+                if (m_NodeStyleSelected != value)
+                {
+                    if (m_NodeStyleSelected != null)
+                        m_NodeStyleSelected.StyleChanged -= new EventHandler(this.ElementStyleChanged);
+                    if (value != null)
+                        value.StyleChanged += new EventHandler(this.ElementStyleChanged);
+                    m_NodeStyleSelected = value;
+                    this.OnCellStyleChanged();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets style for the node when mouse is over node. Note that this style is applied to the default node style.
+        /// </summary>
+        /// <value>
+        /// Reference to the style assigned or null value indicating that no style is used.
+        /// Default value is null.
+        /// </value>
+        [Browsable(true), Category("Node Style"), DefaultValue(null), Editor("DevComponents.AdvTree.Design.ElementStyleTypeEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), Description("Gets or sets style of the node when mouse is over node.")]
+        public ElementStyle NodeStyleMouseOver
+        {
+            get { return m_NodeStyleMouseOver; }
+            set
+            {
+                if (m_NodeStyleMouseOver != value)
+                {
+                    if (m_NodeStyleMouseOver != null)
+                        m_NodeStyleMouseOver.StyleChanged -= new EventHandler(this.ElementStyleChanged);
+                    if (value != null)
+                        value.StyleChanged += new EventHandler(this.ElementStyleChanged);
+                    m_NodeStyleMouseOver = value;
+                    this.OnCellStyleChanged();
+                }
+            }
+        }
+
+
+        /// <summary>
+        /// Gets the collection of tree nodes that are assigned to the tree view control.
+        /// </summary>
+        /// <value>
+        /// A <see cref="NodeCollection">NodeCollection</see> that represents the tree nodes
+        /// assigned to the tree control.
+        /// </value>
+        /// <remarks>
+        /// 	<para>The Nodes property holds a collection of Node objects, each of which has a
+        ///     Nodes property that can contain its own NodeCollection.</para>
+        /// </remarks>
+        [Browsable(true), DesignerSerializationVisibility(DesignerSerializationVisibility.Content), Description("Gets the collection of tree nodes that are assigned to the tree control.")]
+        public NodeCollection Nodes
+        {
+            get { return m_Nodes; }
+        }
+
+        private int _NodeSpacing = 3;
+        /// <summary>
+        /// Gets or sets the vertical spacing between nodes in pixels. Default value is 3.
+        /// </summary>
+        [DefaultValue(3), Description("Indicates vertical spacing between nodes in pixels."), Category("Layout")]
+        public int NodeSpacing
+        {
+            get { return _NodeSpacing; }
+            set
+            {
+                _NodeSpacing = value;
+                _LayoutSettings.NodeVerticalSpacing = value;
+                this.InvalidateNodesSize();
+                this.RecalcLayout();
+            }
+        }
+        /// <summary>
+        /// Gets or sets the horizontal spacing between nodes in pixels when control is in Tile layout. Default value is 4.
+        /// </summary>
+        [DefaultValue(4), Description("Indicates horizontal spacing between nodes in pixels when control is in Tile layout."), Category("Layout")]
+        public int NodeHorizontalSpacing
+        {
+            get { return _LayoutSettings.NodeHorizontalSpacing; }
+            set
+            {
+                if (value != _LayoutSettings.NodeHorizontalSpacing)
+                {
+                    _LayoutSettings.NodeHorizontalSpacing = value;
+                    this.InvalidateNodesSize();
+                    this.RecalcLayout();
+                }
+            }
+        }
+
+        private bool _GridRowLines = false;
+        /// <summary>
+        /// Gets or sets whether horizontal grid lines between each row are displayed. Default value is false.
+        /// </summary>
+        [DefaultValue(false), Category("Columns"), Description("")]
+        public bool GridRowLines
+        {
+            get { return _GridRowLines; }
+            set
+            {
+                if (_GridRowLines != value)
+                {
+                    _GridRowLines = value;
+                    this.Invalidate();
+                }
+            }
+        }
+
+        private bool _GridColumnLineResizeEnabled = false;
+        /// <summary>
+        /// Gets or sets whether column can be resized when mouse is over the column grid line and outside of the column header.
+        /// GridColumnLines must be set to true to make column lines visible.
+        /// </summary>
+        [DefaultValue(false), Category("Columns"), Description("Indicates whether column can be resized when mouse is over the column grid line and outside of the column header.")]
+        public bool GridColumnLineResizeEnabled
+        {
+            get { return _GridColumnLineResizeEnabled; }
+            set
+            {
+                _GridColumnLineResizeEnabled = value;
+            }
+        }
+
+        private bool _GridLines = true;
+        /// <summary>
+        /// Gets or sets whether grid lines are displayed when columns are defined. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Columns"), Description("Indicates whether grid lines are displayed when columns are defined.")]
+        public bool GridColumnLines
+        {
+            get { return _GridLines; }
+            set
+            {
+                if (_GridLines != value)
+                {
+                    _GridLines = value;
+                    if (m_Columns.Count > 0 && _ColumnsVisible)
+                        this.Invalidate();
+                }
+            }
+        }
+
+        private Color _GridLinesColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets the grid lines color.
+        /// </summary>
+        [Category("Columns"), Description("Indicates grid lines color.")]
+        public Color GridLinesColor
+        {
+            get { return _GridLinesColor; }
+            set { _GridLinesColor = value; this.Invalidate(); }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeGridLinesColor()
+        {
+            return !_GridLinesColor.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetGridLinesColor()
+        {
+            this.GridLinesColor = Color.Empty;
+        }
+
+        private Color _AlternateRowColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets the alternate row color applied to every other row. Default value is Color.Empty.
+        /// </summary>
+        [Category("Columns"), Description("Indicates alternate row color applied to every other row.")]
+        public Color AlternateRowColor
+        {
+            get { return _AlternateRowColor; }
+            set
+            {
+                _AlternateRowColor = value;
+                this.Invalidate();
+            }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeAlternateRowColor()
+        {
+            return !_AlternateRowColor.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetAlternateRowColor()
+        {
+            this.AlternateRowColor = Color.Empty;
+        }
+
+        private ElementStyle _NodesColumnsBackgroundStyle = null;
+        /// <summary>
+        /// Gets or sets the background style for the child nodes columns. Background style defines the appearance of the column header background.
+        /// </summary>
+        /// <value>
+        /// Reference to the style assigned to the column header.
+        /// </value>
+        [Browsable(true), DefaultValue(null), Category("Column Header Style"), Editor("DevComponents.AdvTree.Design.ElementStyleTypeEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), Description("Indicates the style class assigned to the child nodes columns.")]
+        public ElementStyle NodesColumnsBackgroundStyle
+        {
+            get { return _NodesColumnsBackgroundStyle; }
+            set
+            {
+                if (_NodesColumnsBackgroundStyle != null)
+                    _NodesColumnsBackgroundStyle.StyleChanged -= new EventHandler(this.ElementStyleChanged);
+                if (value != null)
+                    value.StyleChanged += new EventHandler(this.ElementStyleChanged);
+                _NodesColumnsBackgroundStyle = value;
+            }
+        }
+
+        private ElementStyle _ColumnsBackgroundStyle = null;
+        /// <summary>
+        /// Gets or sets the background style for the columns. Background style defines the appearance of the column header background.
+        /// </summary>
+        /// <value>
+        /// Reference to the style assigned to the column header.
+        /// </value>
+        /// <seealso cref="ColumnStyleNormal">ColumnStyleNormal Property</seealso>
+        /// <seealso cref="ColumnStyleMouseDown">ColumnStyleMouseDown Property</seealso>
+        /// <seealso cref="ColumnStyleMouseOver">ColumnStyleMouseOver Property</seealso>
+        [Browsable(true), DefaultValue(null), Category("Column Header Style"), Editor("DevComponents.AdvTree.Design.ElementStyleTypeEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), Description("Indicates the style class assigned to the column.")]
+        public ElementStyle ColumnsBackgroundStyle
+        {
+            get { return _ColumnsBackgroundStyle; }
+            set
+            {
+                if (_ColumnsBackgroundStyle != null)
+                    _ColumnsBackgroundStyle.StyleChanged -= new EventHandler(this.ElementStyleChanged);
+                if (value != null)
+                    value.StyleChanged += new EventHandler(this.ElementStyleChanged);
+                _ColumnsBackgroundStyle = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the default style class assigned to the column headers.
+        /// </summary>
+        /// <value>
+        /// Reference to the style assigned to the column header.
+        /// </value>
+        /// <remarks>
+        /// When style is not set on ColumnHeader objects then style setting from this property is used instead.
+        /// </remarks>
+        /// <seealso cref="ColumnStyleMouseDown">ColumnStyleMouseDown Property</seealso>
+        /// <seealso cref="ColumnStyleMouseOver">ColumnStyleMouseOver Property</seealso>
+        [Browsable(true), DefaultValue(null), Category("Column Header Style"), Editor("DevComponents.AdvTree.Design.ElementStyleTypeEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), Description("Indicates the style class assigned to the column.")]
+        public ElementStyle ColumnStyleNormal
+        {
+            get { return m_ColumnStyleNormal; }
+            set
+            {
+                if (m_ColumnStyleNormal != null)
+                    m_ColumnStyleNormal.StyleChanged -= new EventHandler(this.ElementStyleChanged);
+                if (value != null)
+                    value.StyleChanged += new EventHandler(this.ElementStyleChanged);
+                m_ColumnStyleNormal = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets default style class assigned to the column which is applied when mouse
+        /// button is pressed over the header.
+        /// </summary>
+        /// <value>
+        /// Name of the style assigned to the column.
+        /// </value>
+        /// <remarks>
+        /// When style is not set on ColumnHeader objects then style setting from this property is used instead.
+        /// </remarks>
+        /// <seealso cref="ColumnStyleNormal">ColumnStyleNormal Property</seealso>
+        /// <seealso cref="ColumnStyleMouseOver">ColumnStyleMouseOver Property</seealso>
+        [Browsable(true), DefaultValue(null), Category("Column Header Style"), Editor("DevComponents.AdvTree.Design.ElementStyleTypeEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), Description("Indicates the style class assigned to the column when mouse is down.")]
+        public ElementStyle ColumnStyleMouseDown
+        {
+            get { return m_ColumnStyleMouseDown; }
+            set
+            {
+                if (m_ColumnStyleMouseDown != null)
+                    m_ColumnStyleMouseDown.StyleChanged -= new EventHandler(this.ElementStyleChanged);
+                if (value != null)
+                    value.StyleChanged += new EventHandler(this.ElementStyleChanged);
+                m_ColumnStyleMouseDown = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets default style class assigned to the column which is applied when mouse is
+        /// over the column.
+        /// </summary>
+        /// <value>
+        /// Name of the style assigned to the column.
+        /// </value>
+        /// <remarks>
+        /// When style is not set on ColumnHeader objects then style setting from this property is used instead.
+        /// </remarks>
+        /// <seealso cref="ColumnStyleNormal">ColumnStyleNormal Property</seealso>
+        /// <seealso cref="ColumnStyleMouseDown">ColumnStyleMouseDown Property</seealso>
+        [Browsable(true), DefaultValue(null), Category("Column Header Style"), Editor("DevComponents.AdvTree.Design.ElementStyleTypeEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), Description("Indicates the style class assigned to the cell when mouse is over the column.")]
+        public ElementStyle ColumnStyleMouseOver
+        {
+            get { return m_ColumnStyleMouseOver; }
+            set
+            {
+                if (m_ColumnStyleMouseOver != null)
+                    m_ColumnStyleMouseOver.StyleChanged -= new EventHandler(this.ElementStyleChanged);
+                if (value != null)
+                    value.StyleChanged += new EventHandler(this.ElementStyleChanged);
+                m_ColumnStyleMouseOver = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets collection that holds definition of column headers associated with nodes.
+        /// </summary>
+        [Browsable(true), DesignerSerializationVisibility(DesignerSerializationVisibility.Content), Description("Collection that holds definition of column headers associated with nodes.")]
+        internal HeadersCollection Headers
+        {
+            get { return m_Headers; }
+        }
+
+        /// <summary>
+        /// Gets or sets the tree node that is currently selected in the tree control.
+        /// </summary>
+        /// <remarks>
+        /// 	<para>If no <see cref="Node">Node</see> is currently selected, the
+        ///     <b>SelectedNode</b> property is a null reference (<b>Nothing</b> in Visual
+        ///     Basic).</para>
+        /// </remarks>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public Node SelectedNode
+        {
+            get
+            {
+                if (_MultiSelect && m_SelectedNodes.Count > 0)
+                    return m_SelectedNodes[m_SelectedNodes.Count - 1];
+                return m_SelectedNode;
+            }
+            set
+            {
+                if (m_SelectedNode != value)
+                {
+                    SelectNode(value, eTreeAction.Code);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the collection of currently selected nodes in tree control.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public NodeCollection SelectedNodes
+        {
+            get
+            {
+                return m_SelectedNodes;
+            }
+        }
+
+        private bool _MultiSelect = false;
+        /// <summary>
+        /// Gets or sets whether multi-node selection is enabled. Default value is false. When
+        /// multi-selection is enabled use SelectedNodes property to retrive collection of selected nodes.
+        /// Use MultiSelectRule property to change the multi-node selection rule.
+        /// </summary>
+        [DefaultValue(false), Category("Selection"), Description("Indicates whether multi-node selection is enabled.")]
+        public bool MultiSelect
+        {
+            get { return _MultiSelect; }
+            set
+            {
+                if (_MultiSelect != value)
+                {
+                    if (_MultiSelect)
+                        m_SelectedNodes.Clear();
+                    _MultiSelect = value;
+                }
+            }
+        }
+
+        private eMultiSelectRule _MultiSelectRule = eMultiSelectRule.SameParent;
+        /// <summary>
+        /// Gets or sets the rule that governs the multiple node selection. Default value indicates that only nodes
+        /// belonging to same parent can be multi-selected.
+        /// </summary>
+        [DefaultValue(eMultiSelectRule.SameParent), Category("Selection"), Description("Indicates rule that governs the multiple node selection.")]
+        public eMultiSelectRule MultiSelectRule
+        {
+            get { return _MultiSelectRule; }
+            set { _MultiSelectRule = value; }
+        }
+
+        /// <summary>
+        /// Invalidates node bounds on canvas.
+        /// </summary>
+        /// <param name="node">Reference node.</param>
+        internal void InvalidateNode(Node[] nodes)
+        {
+            foreach (Node node in nodes)
+            {
+                InvalidateNode(node);
+            }
+        }
+
+        /// <summary>
+        /// Invalidates node bounds on canvas.
+        /// </summary>
+        /// <param name="node">Reference node.</param>
+        internal void InvalidateNode(Node node)
+        {
+            if (node == null)
+                return;
+
+            Rectangle r;
+            if (node == m_DragNode && m_DragNode.Parent == null)
+                r = m_DragNode.BoundsRelative;
+            else
+                r = NodeDisplay.GetNodeRectangle(eNodeRectanglePart.NodeBounds, node, m_NodeDisplay.Offset);
+            if (node.FullRowBackground)
+            {
+                r.Width = this.Width;
+                r.X = 0;
+            }
+
+            //if (m_SelectionBox)
+            {
+                r.Inflate(m_SelectionBoxSize, m_SelectionBoxSize);
+                if (_SelectionBoxStyle == eSelectionStyle.FullRowSelect)
+                {
+                    r.X = this.ClientRectangle.X;
+                    r.Width = this.ClientRectangle.Width;
+                }
+            }
+
+            if (this.NodeStyleMouseOver != null || this.CellStyleMouseOver != null || node.StyleMouseOver != null || this.NodeStyleMouseOver != null || _HotTracking)
+                r.Inflate(1, 1);
+
+            r = GetScreenRectangle(r);
+
+            this.Invalidate(r);
+        }
+
+        /// <summary>
+        /// Finds the node based on the Node.Name property.
+        /// </summary>
+        /// <param name="name">Name of the node to find.</param>
+        /// <returns>Reference to a node with given name or null if node cannot be found.</returns>
+        public Node FindNodeByName(string name)
+        {
+            return NodeOperations.FindNodeByName(this, name);
+        }
+
+        /// <summary>
+        /// Finds the node based on the Node.DataKey property.
+        /// </summary>
+        /// <param name="name">Data key to look for.</param>
+        /// <returns>Reference to a node with given key or null if node cannot be found.</returns>
+        public Node FindNodeByDataKey(object key)
+        {
+            return NodeOperations.FindNodeByDataKey(this, key);
+        }
+
+        /// <summary>
+        /// Finds the node based on the Node.BindingIndex property.
+        /// </summary>
+        /// <param name="bindingIndex">Index to look for.</param>
+        /// <returns>Reference to a node with given key or null if node cannot be found.</returns>
+        public Node FindNodeByBindingIndex(int bindingIndex)
+        {
+            return NodeOperations.FindNodeByBindingIndex(this, bindingIndex);
+        }
+
+        /// <summary>
+        /// Finds the first node that starts with the specified text. Node.Text property is searched.
+        /// </summary>
+        /// <param name="text">Partial text to look for</param>
+        /// <returns>Reference to a node or null if no node is found.</returns>
+        public Node FindNodeByText(string text)
+        {
+            return NodeOperations.FindNodeByText(this, text, null, true);
+        }
+
+        /// <summary>
+        /// Finds the first node where each Node.Cell[0:n].Text value starts with the
+        /// respective value found in the comma delimited 'text' string.
+        /// </summary>
+        /// <param name="text">Comma delimited partial text to look for</param>
+        /// <returns>Reference to a node or null if no node is found.</returns>
+        public Node FindNodeByCellText(string text)
+        {
+            return NodeOperations.FindNodeByCellText(this, text, null, true);
+        }
+
+        /// <summary>
+        /// Finds the first node that starts with the specified text. Node.Text property is searched.
+        /// </summary>
+        /// <param name="text">Partial text to look for</param>
+        /// <param name="ignoreCase">Controls whether case insensitive search is performed</param>
+        /// <returns>Reference to a node or null if no node is found.</returns>
+        public Node FindNodeByText(string text, bool ignoreCase)
+        {
+            return NodeOperations.FindNodeByText(this, text, null, ignoreCase);
+        }
+
+        /// <summary>
+        /// Finds the first node where each Node.Cell[0:n].Text value starts with the
+        /// respective value found in the comma delimited 'text' string.
+        /// </summary>
+        /// <param name="text">Comma delimited partial text to look for</param>
+        /// <param name="ignoreCase">Controls whether case insensitive search is performed</param>
+        /// <returns>Reference to a node or null if no node is found.</returns>
+        public Node FindNodeByCellText(string text, bool ignoreCase)
+        {
+            return NodeOperations.FindNodeByCellText(this, text, null, ignoreCase);
+        }
+        
+        /// <summary>
+        /// Finds the first node that starts with the specified text. Node.Text property is searched.
+        /// </summary>
+        /// <param name="text">Partial text to look for</param>
+        /// <param name="startFromNode">Reference node to start searching from</param>
+        /// <param name="ignoreCase">Controls whether case insensitive search is performed</param>
+        /// <returns>Reference to a node or null if no node is found.</returns>
+        public Node FindNodeByText(string text, Node startFromNode, bool ignoreCase)
+        {
+            return NodeOperations.FindNodeByText(this, text, startFromNode, ignoreCase);
+        }
+
+        /// <summary>
+        /// Finds the first node where each Node.Cell[0:n].Text value starts with the
+        /// respective value found in the comma delimited 'text' string.
+        /// </summary>
+        /// <param name="text">Comma delimited partial text to look for</param>
+        /// <param name="startFromNode">Reference node to start searching from</param>
+        /// <param name="ignoreCase">Controls whether case insensitive search is performed</param>
+        /// <returns>Reference to a node or null if no node is found.</returns>
+        public Node FindNodeByCellText(string text, Node startFromNode, bool ignoreCase)
+        {
+            return NodeOperations.FindNodeByCellText(this, text, startFromNode, ignoreCase);
+        }
+        
+        /// <summary>
+        /// Returns reference to node layout object.
+        /// </summary>
+        internal Layout.NodeLayout NodeLayout
+        {
+            get { return m_NodeLayout; }
+        }
+
+        /// <summary>
+        /// Returns reference to node display object.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never), Browsable(false)]
+        public NodeDisplay NodeDisplay
+        {
+            get { return m_NodeDisplay; }
+        }
+
+        /// <summary>
+        /// Gets whether layout is suspended for tree control. Layout is suspended after
+        /// call to <see cref="BeginUpdate">BeginUpdate</see> method and it is resumed after the
+        /// call to <see cref="EndUpdate">EndUpdate</see> method.
+        /// </summary>
+        [Browsable(false)]
+        public bool IsUpdateSuspended
+        {
+            get { return (m_UpdateSuspended > 0); }
+        }
+
+        internal void SetPendingLayout()
+        {
+            m_PendingLayout = true;
+        }
+
+        /// <summary>
+        /// Gets whether control has layout operation pending on next paint or update.
+        /// </summary>
+        [Browsable(false)]
+        public bool IsLayoutPending
+        {
+            get { return m_PendingLayout; }
+        }
+
+
+        /// <summary>
+        /// Gets or sets whether paint operations are suspended for the control. You should use this method
+        /// if you need the RecalcLayout operations to proceed but you want to stop painting of the control.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool SuspendPaint
+        {
+            get { return m_SuspendPaint; }
+            set { m_SuspendPaint = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the ImageList that contains the Image objects used by the tree nodes.
+        /// </summary>
+        [Browsable(true), DefaultValue(null), Category("Images"), Description("Indicates the ImageList that contains the Image objects used by the tree nodes.")]
+        public ImageList ImageList
+        {
+            get
+            {
+                return m_ImageList;
+            }
+            set
+            {
+                if (m_ImageList != null)
+                    m_ImageList.Disposed -= new EventHandler(this.ImageListDisposed);
+                m_ImageList = value;
+                if (m_ImageList != null)
+                    m_ImageList.Disposed += new EventHandler(this.ImageListDisposed);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the image-list index value of the default image that is displayed by the tree nodes.
+        /// </summary>
+        [Browsable(true), Category("Images"), Description("Indicates the image-list index value of the default image that is displayed by the tree nodes."), Editor("DevComponents.DotNetBar.Design.ImageIndexEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), TypeConverter(typeof(ImageIndexConverter)), DefaultValue(-1)]
+        public int ImageIndex
+        {
+            get { return m_ImageIndex; }
+            set
+            {
+                if (m_ImageIndex != value)
+                {
+                    m_ImageIndex = value;
+                }
+            }
+        }
+
+        private Image _CheckBoxImageChecked = null;
+        /// <summary>
+        /// Gets or sets the custom image that is displayed instead default check box representation when check box in cell is checked.
+        /// </summary>
+        [DefaultValue(null), Category("CheckBox Images"), Description("Indicates custom image that is displayed instead default check box representation when check box in cell is checked")]
+        public Image CheckBoxImageChecked
+        {
+            get { return _CheckBoxImageChecked; }
+            set
+            {
+                _CheckBoxImageChecked = value;
+                OnCheckBoxImageChanged();
+            }
+        }
+        private Image _CheckBoxImageUnChecked = null;
+        /// <summary>
+        /// Gets or sets the custom image that is displayed instead default check box representation when check box in cell is unchecked.
+        /// </summary>
+        [DefaultValue(null), Category("CheckBox Images"), Description("Indicates custom image that is displayed instead default check box representation when check box in cell is unchecked")]
+        public Image CheckBoxImageUnChecked
+        {
+            get { return _CheckBoxImageUnChecked; }
+            set
+            {
+                _CheckBoxImageUnChecked = value;
+                OnCheckBoxImageChanged();
+            }
+        }
+        private Image _CheckBoxImageIndeterminate = null;
+        /// <summary>
+        /// Gets or sets the custom image that is displayed instead default check box representation when check box in cell is in indeterminate state.
+        /// </summary>
+        [DefaultValue(null), Category("CheckBox Images"), Description("Indicates custom image that is displayed instead default check box representation when check box in cell is in indeterminate state")]
+        public Image CheckBoxImageIndeterminate
+        {
+            get { return _CheckBoxImageIndeterminate; }
+            set
+            {
+                _CheckBoxImageIndeterminate = value;
+                OnCheckBoxImageChanged();
+            }
+        }
+        private void OnCheckBoxImageChanged()
+        {
+            InvalidateNodesSize();
+            SetPendingLayout();
+            Invalidate();
+        }
+
+        ///// <summary>
+        ///// Gets or sets the NodeConnector object that describes the type of the connector used for
+        ///// displaying connection between root node and it's nested nodes. The root node is defined as
+        ///// the top level node i.e. which belongs directly to AdvTree.Nodes collection. Default value is null.
+        ///// </summary>
+        ///// <remarks>
+        ///// You can use
+        ///// <a href="AdvTree~DevComponents.AdvTree.Node~ParentConnector.html">Node.ParentConnector</a>
+        ///// property to specify per node connectors.
+        ///// </remarks>
+        //[Browsable(true),Category("Connectors"),DefaultValue(null),Editor("DevComponents.AdvTree.Design.NodeConnectorTypeEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf",typeof(System.Drawing.Design.UITypeEditor)),Description("Indicates the root node connector.")]
+        //public NodeConnector RootConnector
+        //{
+        //    get {return m_RootConnector;}
+        //    set
+        //    {
+        //        if(m_RootConnector!=value)
+        //        {
+        //            if(m_RootConnector!=null)
+        //                m_RootConnector.AppearanceChanged-=new EventHandler(this.ConnectorAppearanceChanged);
+        //            if(value!=null)
+        //                value.AppearanceChanged+=new EventHandler(this.ConnectorAppearanceChanged);
+        //            m_RootConnector=value;
+        //            this.OnDisplayChanged();
+        //        }
+        //    }
+        //}
+
+        /// <summary>
+        /// Gets or sets the NodeConnector object that describes the type of the connector used for
+        /// displaying connection between nested nodes. RootConnector property specifies the connector
+        /// between root node and it's imidate nested nodes. This property specifies connector for all other nested levels.
+        /// Default value is null.
+        /// </summary>
+        /// <remarks>
+        /// You can use
+        /// <a href="AdvTree~DevComponents.AdvTree.Node~ParentConnector.html">Node.ParentConnector</a>
+        /// property to specify per node connectors.
+        /// </remarks>
+        [Browsable(true), Category("Connectors"), DefaultValue(null), Editor("DevComponents.AdvTree.Design.NodeConnectorTypeEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), Description("Indicates the nested nodes connector.")]
+        public NodeConnector NodesConnector
+        {
+            get { return m_NodesConnector; }
+            set
+            {
+                if (m_NodesConnector != value)
+                {
+                    if (m_NodesConnector != null)
+                        m_NodesConnector.AppearanceChanged -= new EventHandler(this.ConnectorAppearanceChanged);
+                    if (value != null)
+                        value.AppearanceChanged += new EventHandler(this.ConnectorAppearanceChanged);
+                    m_NodesConnector = value;
+                    this.OnDisplayChanged();
+                }
+            }
+        }
+
+        ///// <summary>
+        ///// Gets or sets the NodeConnector object that describes the type of the connector used for
+        ///// displaying connection between linked nodes. This property specifies connector for all linked nodes.
+        ///// Default value is null.
+        ///// </summary>
+        //[Browsable(true),Category("Connectors"),DefaultValue(null),Editor("DevComponents.AdvTree.Design.NodeConnectorTypeEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf",typeof(System.Drawing.Design.UITypeEditor)),Description("Indicates the linked nodes connector.")]
+        //public NodeConnector LinkConnector
+        //{
+        //    get {return m_LinkConnector;}
+        //    set
+        //    {
+        //        if(m_LinkConnector!=value)
+        //        {
+        //            if(m_LinkConnector!=null)
+        //                m_LinkConnector.AppearanceChanged-=new EventHandler(this.ConnectorAppearanceChanged);
+        //            if(value!=null)
+        //                value.AppearanceChanged+=new EventHandler(this.ConnectorAppearanceChanged);
+        //            m_LinkConnector=value;
+        //            this.OnDisplayChanged();
+        //        }
+        //    }
+        //}
+
+        /// <summary>
+        /// Gets or sets the NodeConnector object that describes the type of the connector used for
+        /// displaying connection between linked nodes. Connector specified here is used to display the connection
+        /// between nodes that are on the path to the selected node. When set you can use it to visually indicate the path to the currently selected node.
+        /// Default value is null.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never), Browsable(false), Category("Connectors"), DefaultValue(null), Editor("DevComponents.AdvTree.Design.NodeConnectorTypeEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), Description("Indicates the linked nodes connector.")]
+        public NodeConnector SelectedPathConnector
+        {
+            get { return m_SelectedPathConnector; }
+            set
+            {
+                if (m_SelectedPathConnector != value)
+                {
+                    if (m_SelectedPathConnector != null)
+                        m_SelectedPathConnector.AppearanceChanged -= new EventHandler(this.ConnectorAppearanceChanged);
+                    if (value != null)
+                        value.AppearanceChanged += new EventHandler(this.ConnectorAppearanceChanged);
+                    m_SelectedPathConnector = value;
+                    this.OnDisplayChanged();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the layout of the cells inside the node. Default value is Horizontal layout which
+        /// means that cell are positioned horizontally next to each other.
+        /// </summary>
+        /// <remarks>
+        /// You can specify cell layout on each node by using
+        /// <a href="AdvTree~DevComponents.AdvTree.Node~CellLayout.html">Node.CellLayout</a>
+        /// property.
+        /// </remarks>
+        [Browsable(true), DefaultValue(eCellLayout.Default), Category("Appearance"), Description("Indicates layout of the cells inside the node.")]
+        public eCellLayout CellLayout
+        {
+            get { return m_CellLayout; }
+            set
+            {
+                m_CellLayout = value;
+                InvalidateNodesSize();
+                this.Invalidate();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the layout of the cells inside the node. Default value is Horizontal layout which
+        /// means that cell are positioned horizontally next to each other.
+        /// </summary>
+        /// <remarks>
+        /// You can specify cell layout on each node by using
+        /// <a href="AdvTree~DevComponents.AdvTree.Node~CellLayout.html">Node.CellLayout</a>
+        /// property.
+        /// </remarks>
+        [Browsable(true), DefaultValue(eCellPartLayout.Default), Category("Appearance"), Description("Indicates layout of the cells inside the node.")]
+        public eCellPartLayout CellPartLayout
+        {
+            get { return m_CellPartLayout; }
+            set
+            {
+                m_CellPartLayout = value;
+                InvalidateNodesSize();
+                this.Invalidate();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the color scheme style. Color scheme provides predefined colors based on popular visual styles.
+        /// We recommend that you use "SchemePart" color settings since they maintain consistant look that is
+        /// based on target system color scheme setting.
+        /// </summary>
+        [Browsable(true), DefaultValue(eColorSchemeStyle.Office2007), Category("Appearance"), Description("Indicates the color scheme style.")]
+        public eColorSchemeStyle ColorSchemeStyle
+        {
+            get { return MapStyle(m_ColorScheme.Style); }
+            set
+            {
+                m_ColorScheme.Style = MapStyle(value);
+                if (this.DesignMode)
+                    this.Refresh();
+            }
+        }
+
+        internal static eDotNetBarStyle MapStyle(eColorSchemeStyle style)
+        {
+            if (style == eColorSchemeStyle.Office2003)
+                return eDotNetBarStyle.Office2003;
+            else if (style == eColorSchemeStyle.VS2005)
+                return eDotNetBarStyle.VS2005;
+            return eDotNetBarStyle.Office2007;
+        }
+        internal static eColorSchemeStyle MapStyle(eDotNetBarStyle style)
+        {
+            if (style == eDotNetBarStyle.Office2003)
+                return eColorSchemeStyle.Office2003;
+            else if (style == eDotNetBarStyle.VS2005)
+                return eColorSchemeStyle.VS2005;
+
+            return eColorSchemeStyle.Office2007;
+        }
+
+        /// <summary>
+        /// Gets the reference to the color scheme object.
+        /// </summary>
+        internal ColorScheme ColorScheme
+        {
+            get
+            {
+                if (ColorSchemeStyle == eColorSchemeStyle.Office2007 && DevComponents.DotNetBar.Rendering.GlobalManager.Renderer is DevComponents.DotNetBar.Rendering.Office2007Renderer)
+                {
+                    return ((DevComponents.DotNetBar.Rendering.Office2007Renderer)DevComponents.DotNetBar.Rendering.GlobalManager.Renderer).ColorTable.LegacyColors;
+                }
+                return m_ColorScheme;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether the content of the control is centered within the bounds of control. Default value is true.
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Description("Indicates whether the content of the control is centered within the bounds of control."), Category("Layout")]
+        internal bool CenterContent
+        {
+            get { return m_CenterContent; }
+            set
+            {
+                m_CenterContent = value;
+                OnLayoutChanged();
+            }
+        }
+
+        private bool _SelectionPerCell = false;
+        /// <summary>
+        /// Gets or sets whether per cell selection mode is enabled. In cell selection mode the selection box is drawn over selected cell only
+        /// instead of all cells in the node.
+        /// Default value is false.
+        /// </summary>
+        [DefaultValue(false), Category("Selection"), Description("Indicates whether selection is drawn for selected cell only instead of all cells inside of node")]
+        public bool SelectionPerCell
+        {
+            get { return _SelectionPerCell; }
+            set
+            {
+                if (_SelectionPerCell != value)
+                {
+                    _SelectionPerCell = value;
+                    if (this.SelectedNode != null)
+                    {
+                        InvalidateNode(this.SelectedNode);
+                    }
+                }
+            }
+        }
+
+        private bool _SelectionFocusAware = true;
+        /// <summary>
+        /// Gets or sets whether selection appearance changes depending on whether control has input focus. Default value is true. Setting this value to false causes selection box to be rendered as if control has focus all the time.
+        /// </summary>
+        [DefaultValue(true), Category("Selection"), Description("Indicates whether selection appearance changes depending on whether control has input focus.")]
+        public bool SelectionFocusAware
+        {
+            get { return _SelectionFocusAware; }
+            set
+            {
+                if (_SelectionFocusAware != value)
+                {
+                    _SelectionFocusAware = value;
+                    this.Invalidate();
+                }
+            }
+        }
+
+
+        private eSelectionStyle _SelectionBoxStyle = eSelectionStyle.HighlightCells;
+        /// <summary>
+        /// Gets or sets the node selection box style.
+        /// </summary>
+        /// <seealso cref="SelectionBox">SelectionBox Property</seealso>
+        /// <seealso cref="SelectionBoxSize">SelectionBoxSize Property</seealso>
+        /// <seealso cref="SelectionBoxFillColor">SelectionBoxFillColor Property</seealso>
+        /// <seealso cref="SelectionBoxBorderColor">SelectionBoxBorderColor Property</seealso>
+        [DefaultValue(eSelectionStyle.HighlightCells), Category("Selection"), Description("Indicates node selection box style.")]
+        public eSelectionStyle SelectionBoxStyle
+        {
+            get { return _SelectionBoxStyle; }
+            set { _SelectionBoxStyle = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the value that indicates whether selection box is drawn around the
+        /// selected node. Default value is true. Another way to provide the visual indication that
+        /// node is selected is by using selected state style properties like
+        /// <a href="AdvTree~DevComponents.AdvTree.AdvTree~NodeStyleSelected.html">NodeStyleSelected</a>
+        /// and
+        /// <a href="AdvTree~DevComponents.AdvTree.AdvTree~CellStyleSelected.html">CellStyleSelected</a>.
+        /// </summary>
+        /// <seealso cref="CellStyleSelected">CellStyleSelected Property</seealso>
+        /// <seealso cref="NodeStyleSelected">NodeStyleSelected Property</seealso>
+        [Browsable(true), DefaultValue(true), Category("Selection"), Description("Indicates whether selection box is drawn around selected node.")]
+        public bool SelectionBox
+        {
+            get { return m_SelectionBox; }
+            set
+            {
+                if (m_SelectionBox != value)
+                {
+                    m_SelectionBox = value;
+                    this.OnSelectionBoxChanged();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the size/thickness in pixel of the selection box drawn around selected
+        /// node.
+        /// </summary>
+        [Browsable(true), DefaultValue(4), Category("Selection"), Description("Indicates the size in pixels of the selection box drawn around selected node.")]
+        internal int SelectionBoxSize
+        {
+            get { return m_SelectionBoxSize; }
+            set
+            {
+                if (m_SelectionBoxSize != value)
+                {
+                    m_SelectionBoxSize = value;
+                    this.OnSelectionBoxChanged();
+                }
+            }
+        }
+
+        private bool _FullRowSelect = true;
+        /// <summary>
+        /// Gets or sets whether node is selected when mouse is pressed anywhere within node vertical bounds. Default value is true.
+        /// </summary>
+        /// <remarks>
+        /// When set to false the node is selected only when mouse is pressed over the node content.
+        /// </remarks>
+        [DefaultValue(true), Description("Indicates whether node is selected when mouse is pressed anywhere within node vertical bounds."), Category("Selection")]
+        public bool FullRowSelect
+        {
+            get { return _FullRowSelect; }
+            set
+            {
+                _FullRowSelect = value;
+            }
+        }
+
+
+        ///// <summary>
+        ///// Gets or sets the selection box border color.
+        ///// </summary>
+        //[Browsable(true),Category("Selection"),Description("Indicates the selection box border color.")]
+        //public Color SelectionBoxBorderColor
+        //{
+        //    get {return m_SelectionBoxBorderColor;}
+        //    set
+        //    {
+        //        if(m_SelectionBoxBorderColor!=value)
+        //        {
+        //            m_SelectionBoxBorderColor=value;
+        //            this.OnSelectionBoxChanged();
+        //        }
+        //    }
+
+        //}
+        ///// <summary>
+        ///// Indicates whether SelectionBoxBorderColor should be serialized. Used by windows forms designer design-time support.
+        ///// </summary>
+        //[EditorBrowsable(EditorBrowsableState.Never)]
+        //public bool ShouldSerializeSelectionBoxBorderColor()
+        //{return (m_SelectionBoxBorderColor!=GetDefaultSelectionBoxBorderColor());}
+        ///// <summary>
+        ///// Resets SelectionBoxBorderColor to it's default value. Used by windows forms designer design-time support.
+        ///// </summary>
+        //[EditorBrowsable(EditorBrowsableState.Never)]
+        //public void ResetSelectionBoxBorderColor()
+        //{
+        //    m_SelectionBoxBorderColor=GetDefaultSelectionBoxBorderColor();
+        //}
+
+        ///// <summary>
+        ///// Gets or sets the selection box fill color.
+        ///// </summary>
+        //[Browsable(true),Category("Selection"),Description("Indicates the selection box fill color.")]
+        //public Color SelectionBoxFillColor
+        //{
+        //    get {return m_SelectionBoxFillColor;}
+        //    set
+        //    {
+        //        if(m_SelectionBoxFillColor!=value)
+        //        {
+        //            m_SelectionBoxFillColor=value;
+        //            this.OnSelectionBoxChanged();
+        //        }
+        //    }
+
+        //}
+        ///// <summary>
+        ///// Indicates whether SelectionBoxFillColor should be serialized. Used by windows forms designer design-time support.
+        ///// </summary>
+        //[EditorBrowsable(EditorBrowsableState.Never)]
+        //public bool ShouldSerializeSelectionBoxFillColor()
+        //{return (m_SelectionBoxFillColor!=GetDefaultSelectionBoxFillColor());}
+        ///// <summary>
+        ///// Resets SelectionBoxFillColor to it's default value. Used by windows forms designer design-time support.
+        ///// </summary>
+        //[EditorBrowsable(EditorBrowsableState.Never)]
+        //public void ResetSelectionBoxFillColor()
+        //{
+        //    m_SelectionBoxFillColor=GetDefaultSelectionBoxFillColor();
+        //}
+
+        private int _ExpandWidth = 24;
+        /// <summary>
+        /// Gets or sets the total node expand area width in pixels. The expand button with ExpandButtonSize is fitted into this area. Default value is 24. 
+        /// </summary>
+        [DefaultValue(24), Category("Expand Button"), Description("Indicates total node expand area width in pixels.")]
+        public int ExpandWidth
+        {
+            get { return _ExpandWidth; }
+            set
+            {
+                if (_ExpandWidth != value)
+                {
+                    _ExpandWidth = value;
+                    _LayoutSettings.ExpandAreaWidth = value;
+                    this.InvalidateNodesSize();
+                    this.Invalidate();
+                }
+            }
+        }
+
+
+        /// <summary>
+        /// Gets or sets the size of the expand button that is used to expand/collapse node. Default value is 8,8.
+        /// </summary>
+        [Browsable(true), Category("Expand Button"), Description("Indicates size of the expand button that is used to expand/collapse node.")]
+        public Size ExpandButtonSize
+        {
+            get { return m_ExpandButtonSize; }
+            set
+            {
+                if (m_ExpandButtonSize != value)
+                {
+                    m_ExpandButtonSize = value;
+                    this.OnExpandButtonChanged();
+                }
+            }
+        }
+        /// <summary>
+        /// Indicates whether SelectionBoxFillColor should be serialized. Used by windows forms designer design-time support.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeExpandButtonSize()
+        { return (m_ExpandButtonSize != GetDefaultExpandButtonSize()); }
+        /// <summary>
+        /// Resets SelectionBoxFillColor to it's default value. Used by windows forms designer design-time support.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetExpandButtonSize()
+        {
+            this.ExpandButtonSize = GetDefaultExpandButtonSize();
+        }
+
+        /// <summary>
+        /// Gets or sets expand button border color. Note that setting ExpandBorderColorSchemePart property will override the value that you set here.
+        /// </summary>
+        [Browsable(true), Category("Expand Button"), Description("Indicates expand button border color.")]
+        public Color ExpandBorderColor
+        {
+            get { return m_ExpandBorderColor; }
+            set
+            {
+                m_ExpandBorderColor = value;
+                this.OnExpandButtonChanged();
+            }
+        }
+        /// <summary>
+        /// Indicates whether ExpandBorderColor should be serialized. Used by windows forms designer design-time support.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeExpandBorderColor()
+        { return (!m_ExpandBorderColor.IsEmpty && m_ExpandBorderColorSchemePart == eColorSchemePart.None); }
+        /// <summary>
+        /// Resets ExpandBorderColor to it's default value. Used by windows forms designer design-time support.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetExpandBorderColor()
+        {
+            this.ExpandBorderColor = Color.Empty;
+        }
+        /// <summary>
+        /// Gets or sets expand button color scheme border color. Setting
+        /// this property overrides the setting of the corresponding ExpandBorderColor property.
+        /// Color scheme colors are automatically managed and are based on current system colors.
+        /// That means if colors on the system change the color scheme will ensure that it's colors
+        /// are changed as well to fit in the color scheme of target system. Set this property to
+        /// <a href="AdvTree~DevComponents.AdvTree.eColorSchemePart.html">eColorSchemePart.None</a> to
+        /// specify explicit color to use through ExpandBorderColor property.
+        /// </summary>
+        [Browsable(true), Category("Expand Button"), DefaultValue(eColorSchemePart.None), Description("Indicates expand button border color.")]
+        public eColorSchemePart ExpandBorderColorSchemePart
+        {
+            get { return m_ExpandBorderColorSchemePart; }
+            set
+            {
+                m_ExpandBorderColorSchemePart = value;
+                this.OnExpandButtonChanged();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets expand button back color. Note that setting ExpandBackColorSchemePart property will override the value that you set here.
+        /// </summary>
+        [Browsable(true), Category("Expand Button"), Description("Indicates expand button back color.")]
+        public Color ExpandBackColor
+        {
+            get { return m_ExpandBackColor; }
+            set
+            {
+                m_ExpandBackColor = value;
+                this.OnExpandButtonChanged();
+            }
+        }
+        /// <summary>
+        /// Indicates whether ExpandBackColor should be serialized. Used by windows forms designer design-time support.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeExpandBackColor()
+        { return (!m_ExpandBackColor.IsEmpty && m_ExpandBackColorSchemePart == eColorSchemePart.None); }
+        /// <summary>
+        /// Resets ExpandBackColor to it's default value. Used by windows forms designer design-time support.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetExpandBackColor()
+        {
+            this.ExpandBackColor = Color.Empty;
+        }
+        /// <summary>
+        /// Gets or sets expand button color scheme back color. Setting
+        /// this property overrides the setting of the corresponding ExpandBackColor property.
+        /// Color scheme colors are automatically managed and are based on current system colors.
+        /// That means if colors on the system change the color scheme will ensure that it's colors
+        /// are changed as well to fit in the color scheme of target system. Set this property to
+        /// <a href="AdvTree~DevComponents.AdvTree.eColorSchemePart.html">eColorSchemePart.None</a> to
+        /// specify explicit color to use through ExpandBackColor property.
+        /// </summary>
+        [Browsable(true), Category("Expand Button"), DefaultValue(eColorSchemePart.None), Description("Indicates expand button back color.")]
+        public eColorSchemePart ExpandBackColorSchemePart
+        {
+            get { return m_ExpandBackColorSchemePart; }
+            set
+            {
+                m_ExpandBackColorSchemePart = value;
+                this.OnExpandButtonChanged();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets expand button target gradientback color. Note that setting ExpandBackColor2SchemePart property will override the value that you set here.
+        /// </summary>
+        [Browsable(true), Category("Expand Button"), Description("Indicates expand button target gradient back color.")]
+        public Color ExpandBackColor2
+        {
+            get { return m_ExpandBackColor2; }
+            set
+            {
+                m_ExpandBackColor2 = value;
+                this.OnExpandButtonChanged();
+            }
+        }
+        /// <summary>
+        /// Indicates whether ExpandBackColor2 should be serialized. Used by windows forms designer design-time support.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeExpandBackColor2()
+        { return (!m_ExpandBackColor2.IsEmpty && m_ExpandBackColor2SchemePart == eColorSchemePart.None); }
+        /// <summary>
+        /// Resets ExpandBackColor2 to it's default value. Used by windows forms designer design-time support.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetExpandBackColor2()
+        {
+            this.ExpandBackColor2 = Color.Empty;
+        }
+        /// <summary>
+        /// Gets or sets expand button color scheme target gradient back color. Setting
+        /// this property overrides the setting of the corresponding ExpandBackColor2 property.
+        /// Color scheme colors are automatically managed and are based on current system colors.
+        /// That means if colors on the system change the color scheme will ensure that it's colors
+        /// are changed as well to fit in the color scheme of target system. Set this property to
+        /// <a href="AdvTree~DevComponents.AdvTree.eColorSchemePart.html">eColorSchemePart.None</a> to
+        /// specify explicit color to use through ExpandBackColor2 property.
+        /// </summary>
+        [Browsable(true), Category("Expand Button"), DefaultValue(eColorSchemePart.None), Description("Indicates expand button target gradient back color.")]
+        public eColorSchemePart ExpandBackColor2SchemePart
+        {
+            get { return m_ExpandBackColor2SchemePart; }
+            set
+            {
+                m_ExpandBackColor2SchemePart = value;
+                this.OnExpandButtonChanged();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets expand button line color. Note that setting ExpandLineColorSchemePart property will override the value that you set here.
+        /// </summary>
+        [Browsable(true), Category("Expand Button"), Description("Indicates expand button line color.")]
+        public Color ExpandLineColor
+        {
+            get { return m_ExpandLineColor; }
+            set
+            {
+                m_ExpandLineColor = value;
+                this.OnExpandButtonChanged();
+            }
+        }
+        /// <summary>
+        /// Indicates whether ExpandLineColor should be serialized. Used by windows forms designer design-time support.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeExpandLineColor()
+        { return (!m_ExpandLineColor.IsEmpty && m_ExpandLineColorSchemePart == eColorSchemePart.None); }
+        /// <summary>
+        /// Resets ExpandLineColor to it's default value. Used by windows forms designer design-time support.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetExpandLineColor()
+        {
+            this.ExpandLineColor = Color.Empty;
+        }
+        /// <summary>
+        /// Gets or sets expand button color scheme line color. Setting
+        /// this property overrides the setting of the corresponding ExpandLineColor property.
+        /// Color scheme colors are automatically managed and are based on current system colors.
+        /// That means if colors on the system change the color scheme will ensure that it's colors
+        /// are changed as well to fit in the color scheme of target system. Set this property to
+        /// <a href="AdvTree~DevComponents.AdvTree.eColorSchemePart.html">eColorSchemePart.None</a> to
+        /// specify explicit color to use through ExpandLineColor property.
+        /// </summary>
+        [Browsable(true), Category("Expand Button"), DefaultValue(eColorSchemePart.None), Description("Indicates expand button line color.")]
+        public eColorSchemePart ExpandLineColorSchemePart
+        {
+            get { return m_ExpandLineColorSchemePart; }
+            set
+            {
+                m_ExpandLineColorSchemePart = value;
+                this.OnExpandButtonChanged();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the expand button background gradient angle.
+        /// </summary>
+        [Browsable(true), Category("Expand Button"), DefaultValue(0), Description("Indicates expand button background gradient angle.")]
+        public int ExpandBackColorGradientAngle
+        {
+            get
+            {
+                return m_ExpandBackColorGradientAngle;
+            }
+            set
+            {
+                if (m_ExpandBackColorGradientAngle != value)
+                {
+                    m_ExpandBackColorGradientAngle = value;
+                    this.OnExpandButtonChanged();
+
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the expand button image which is used to indicate that node will be expanded. To use images as expand buttons you also need to set ExpandButtonType=eExpandButtonType.Image.
+        /// </summary>
+        [Browsable(true), DefaultValue(null), Description("Indicates expand button image which is used to indicate that node will be expanded."), Category("Expand Button")]
+        public Image ExpandImage
+        {
+            get { return m_ExpandImage; }
+            set
+            {
+                if (m_ExpandImage != value)
+                {
+                    m_ExpandImage = value;
+                    if (m_ExpandButtonType == eExpandButtonType.Image)
+                        this.OnExpandButtonChanged();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the expand button image which is used to indicate that node will be collapsed. To use images as expand buttons you also need to set ExpandButtonType=eExpandButtonType.Image.
+        /// </summary>
+        [Browsable(true), DefaultValue(null), Description("Indicates expand button image which is used to indicate that node will be collapsed."), Category("Expand Button")]
+        public Image ExpandImageCollapse
+        {
+            get { return m_ExpandImageCollapse; }
+            set
+            {
+                if (m_ExpandImageCollapse != value)
+                {
+                    m_ExpandImageCollapse = value;
+                    if (m_ExpandButtonType == eExpandButtonType.Image)
+                        this.OnExpandButtonChanged();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the type of the expand button used to expand/collapse nodes.
+        /// </summary>
+        [Browsable(true), DefaultValue(eExpandButtonType.Rectangle), Category("Expand Button"), Description("Indicates type of the expand button used to expand/collapse nodes.")]
+        public eExpandButtonType ExpandButtonType
+        {
+            get { return m_ExpandButtonType; }
+            set
+            {
+                if (m_ExpandButtonType != value)
+                {
+                    m_ExpandButtonType = value;
+                    this.OnExpandButtonChanged();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the display root node. Setting this property allows you to use any
+        /// Node as root display node. Default value is Null which means that first node from
+        /// AdvTree.Nodes collection is used as display root node.
+        /// </summary>
+        [Browsable(true), DefaultValue(null), Category("Appearance"), Description("Indicates display root node.")]
+        public Node DisplayRootNode
+        {
+            get { return m_DisplayRootNode; }
+            set
+            {
+                if (m_DisplayRootNode != value)
+                {
+                    m_DisplayRootNode = value;
+                    if (m_NodeDisplay != null) m_NodeDisplay.PaintedNodes.Clear();
+                    InvalidateNodesSize();
+                    this.RecalcLayout();
+                    this.Refresh();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the width of the command button. Default value is 10 pixels.
+        /// </summary>
+        [Browsable(true), Category("Command Button"), DefaultValue(10), Description("Indicates width of the command button.")]
+        internal int CommandWidth
+        {
+            get { return m_CommandWidth; }
+            set
+            {
+                m_CommandWidth = value;
+                OnCommandButtonChanged();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets command button back color. Note that setting CommandBackColorSchemePart property will override the value that you set here.
+        /// </summary>
+        [Browsable(true), Category("Command Button"), Description("Indicates command button back color.")]
+        internal Color CommandBackColor
+        {
+            get { return m_CommandBackColor; }
+            set
+            {
+                m_CommandBackColor = value;
+                this.OnCommandButtonChanged();
+            }
+        }
+        /// <summary>
+        /// Indicates whether CommandBackColor should be serialized. Used by windows forms designer design-time support.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        internal bool ShouldSerializeCommandBackColor()
+        { return (!m_CommandBackColor.IsEmpty && m_CommandBackColorSchemePart == eColorSchemePart.None); }
+        /// <summary>
+        /// Resets CommandBackColor to it's default value. Used by windows forms designer design-time support.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        internal void ResetCommandBackColor()
+        {
+            this.CommandBackColor = Color.Empty;
+        }
+        /// <summary>
+        /// Gets or sets command button color scheme back color. Setting
+        /// this property overrides the setting of the corresponding CommandBackColor property.
+        /// Color scheme colors are automatically managed and are based on current system colors.
+        /// That means if colors on the system change the color scheme will ensure that it's colors
+        /// are changed as well to fit in the color scheme of target system. Set this property to
+        /// <a href="AdvTree~DevComponents.AdvTree.eColorSchemePart.html">eColorSchemePart.None</a> to
+        /// specify explicit color to use through CommandBackColor property.
+        /// </summary>
+        [Browsable(true), Category("Command Button"), DefaultValue(eColorSchemePart.CustomizeBackground), Description("Indicates command button back color.")]
+        internal eColorSchemePart CommandBackColorSchemePart
+        {
+            get { return m_CommandBackColorSchemePart; }
+            set
+            {
+                m_CommandBackColorSchemePart = value;
+                this.OnCommandButtonChanged();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets command button target gradient back color. Note that setting CommandBackColor2SchemePart property will override the value that you set here.
+        /// </summary>
+        [Browsable(true), Category("Command Button"), Description("Indicates command button target gradient back color.")]
+        internal Color CommandBackColor2
+        {
+            get { return m_CommandBackColor2; }
+            set
+            {
+                m_CommandBackColor2 = value;
+                this.OnCommandButtonChanged();
+            }
+        }
+        /// <summary>
+        /// Indicates whether CommandBackColor2 should be serialized. Used by windows forms designer design-time support.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        internal bool ShouldSerializeCommandBackColor2()
+        { return (!m_CommandBackColor2.IsEmpty && m_CommandBackColor2SchemePart == eColorSchemePart.None); }
+        /// <summary>
+        /// Resets CommandBackColor2 to it's default value. Used by windows forms designer design-time support.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        internal void ResetCommandBackColor2()
+        {
+            this.CommandBackColor2 = Color.Empty;
+        }
+        /// <summary>
+        /// Gets or sets command button color scheme target gradient back color. Setting
+        /// this property overrides the setting of the corresponding CommandBackColor2 property.
+        /// Color scheme colors are automatically managed and are based on current system colors.
+        /// That means if colors on the system change the color scheme will ensure that it's colors
+        /// are changed as well to fit in the color scheme of target system. Set this property to
+        /// <a href="AdvTree~DevComponents.AdvTree.eColorSchemePart.html">eColorSchemePart.None</a> to
+        /// specify explicit color to use through CommandBackColor2 property.
+        /// </summary>
+        [Browsable(true), Category("Command Button"), DefaultValue(eColorSchemePart.CustomizeBackground2), Description("Indicates command button target gradient back color.")]
+        internal eColorSchemePart CommandBackColor2SchemePart
+        {
+            get { return m_CommandBackColor2SchemePart; }
+            set
+            {
+                m_CommandBackColor2SchemePart = value;
+                this.OnCommandButtonChanged();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets command button foreground color. Note that setting CommandForeColorSchemePart property will override the value that you set here.
+        /// </summary>
+        [Browsable(true), Category("Command Button"), Description("Indicates command button fore color.")]
+        internal Color CommandForeColor
+        {
+            get { return m_CommandForeColor; }
+            set
+            {
+                m_CommandForeColor = value;
+                this.OnCommandButtonChanged();
+            }
+        }
+        /// <summary>
+        /// Indicates whether CommandForeColor should be serialized. Used by windows forms designer design-time support.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        internal bool ShouldSerializeCommandForeColor()
+        { return (!m_CommandForeColor.IsEmpty && m_CommandForeColorSchemePart == eColorSchemePart.None); }
+        /// <summary>
+        /// Resets CommandForeColor to it's default value. Used by windows forms designer design-time support.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        internal void ResetCommandForeColor()
+        {
+            this.CommandForeColor = Color.Empty;
+        }
+        /// <summary>
+        /// Gets or sets command button color scheme foreground color. Setting
+        /// this property overrides the setting of the corresponding CommandForeColor property.
+        /// Color scheme colors are automatically managed and are based on current system colors.
+        /// That means if colors on the system change the color scheme will ensure that it's colors
+        /// are changed as well to fit in the color scheme of target system. Set this property to
+        /// <a href="AdvTree~DevComponents.AdvTree.eColorSchemePart.html">eColorSchemePart.None</a> to
+        /// specify explicit color to use through CommandForeColor property.
+        /// </summary>
+        [Browsable(true), Category("Command Button"), DefaultValue(eColorSchemePart.CustomizeText), Description("Indicates command button foreground color.")]
+        internal eColorSchemePart CommandForeColorSchemePart
+        {
+            get { return m_CommandForeColorSchemePart; }
+            set
+            {
+                m_CommandForeColorSchemePart = value;
+                this.OnCommandButtonChanged();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the command button background gradient angle.
+        /// </summary>
+        [Browsable(true), Category("Expand Button"), DefaultValue(0), Description("Indicates command button background gradient angle.")]
+        internal int CommandBackColorGradientAngle
+        {
+            get
+            {
+                return m_CommandBackColorGradientAngle;
+            }
+            set
+            {
+                if (m_CommandBackColorGradientAngle != value)
+                {
+                    m_CommandBackColorGradientAngle = value;
+                    this.OnExpandButtonChanged();
+
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets command button mouse over back color. Note that setting CommandMouseOverBackColorSchemePart property will override the value that you set here.
+        /// </summary>
+        [Browsable(true), Category("Command Button"), Description("Indicates command button mouse over back color.")]
+        internal Color CommandMouseOverBackColor
+        {
+            get { return m_CommandMouseOverBackColor; }
+            set
+            {
+                m_CommandMouseOverBackColor = value;
+                this.OnCommandButtonChanged();
+            }
+        }
+        /// <summary>
+        /// Indicates whether CommandMouseOverBackColor should be serialized. Used by windows forms designer design-time support.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        internal bool ShouldSerializeCommandMouseOverBackColor()
+        { return (!m_CommandMouseOverBackColor.IsEmpty && m_CommandMouseOverBackColorSchemePart == eColorSchemePart.None); }
+        /// <summary>
+        /// Resets CommandMouseOverBackColor to it's default value. Used by windows forms designer design-time support.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        internal void ResetCommandMouseOverBackColor()
+        {
+            this.CommandMouseOverBackColor = Color.Empty;
+        }
+        /// <summary>
+        /// Gets or sets command button color scheme mouse over back color. Setting
+        /// this property overrides the setting of the corresponding CommandMouseOverBackColor property.
+        /// Color scheme colors are automatically managed and are based on current system colors.
+        /// That means if colors on the system change the color scheme will ensure that it's colors
+        /// are changed as well to fit in the color scheme of target system. Set this property to
+        /// <a href="AdvTree~DevComponents.AdvTree.eColorSchemePart.html">eColorSchemePart.None</a> to
+        /// specify explicit color to use through CommandMouseOverBackColor property.
+        /// </summary>
+        [Browsable(true), Category("Command Button"), DefaultValue(eColorSchemePart.ItemHotBackground), Description("Indicates command button mouse over back color.")]
+        internal eColorSchemePart CommandMouseOverBackColorSchemePart
+        {
+            get { return m_CommandMouseOverBackColorSchemePart; }
+            set
+            {
+                m_CommandMouseOverBackColorSchemePart = value;
+                this.OnCommandButtonChanged();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets command button mouse over target gradient back color. Note that setting CommandMouseOverBackColor2SchemePart property will override the value that you set here.
+        /// </summary>
+        [Browsable(true), Category("Command Button"), Description("Indicates command button mouse over target gradient back color.")]
+        internal Color CommandMouseOverBackColor2
+        {
+            get { return m_CommandMouseOverBackColor2; }
+            set
+            {
+                m_CommandMouseOverBackColor2 = value;
+                this.OnCommandButtonChanged();
+            }
+        }
+        /// <summary>
+        /// Indicates whether CommandMouseOverBackColor2 should be serialized. Used by windows forms designer design-time support.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        internal bool ShouldSerializeCommandMouseOverBackColor2()
+        { return (!m_CommandMouseOverBackColor2.IsEmpty && m_CommandMouseOverBackColor2SchemePart == eColorSchemePart.None); }
+        /// <summary>
+        /// Resets CommandMouseOverBackColor2 to it's default value. Used by windows forms designer design-time support.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        internal void ResetCommandMouseOverBackColor2()
+        {
+            this.CommandMouseOverBackColor2 = Color.Empty;
+        }
+        /// <summary>
+        /// Gets or sets command button mouse over color scheme target gradient back color. Setting
+        /// this property overrides the setting of the corresponding CommandMouseOverBackColor2 property.
+        /// Color scheme colors are automatically managed and are based on current system colors.
+        /// That means if colors on the system change the color scheme will ensure that it's colors
+        /// are changed as well to fit in the color scheme of target system. Set this property to
+        /// <a href="AdvTree~DevComponents.AdvTree.eColorSchemePart.html">eColorSchemePart.None</a> to
+        /// specify explicit color to use through CommandMouseOverBackColor2 property.
+        /// </summary>
+        [Browsable(true), Category("Command Button"), DefaultValue(eColorSchemePart.ItemPressedBackground2), Description("Indicates command button mouse over target gradient back color.")]
+        internal eColorSchemePart CommandMouseOverBackColor2SchemePart
+        {
+            get { return m_CommandMouseOverBackColor2SchemePart; }
+            set
+            {
+                m_CommandMouseOverBackColor2SchemePart = value;
+                this.OnCommandButtonChanged();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets command button mouse over foreground color. Note that setting CommandMouseOverForeColorSchemePart property will override the value that you set here.
+        /// </summary>
+        [Browsable(true), Category("Command Button"), Description("Indicates command button mouse over fore color.")]
+        internal Color CommandMouseOverForeColor
+        {
+            get { return m_CommandMouseOverForeColor; }
+            set
+            {
+                m_CommandMouseOverForeColor = value;
+                this.OnCommandButtonChanged();
+            }
+        }
+        /// <summary>
+        /// Indicates whether CommandMouseOverForeColor should be serialized. Used by windows forms designer design-time support.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        internal bool ShouldSerializeCommandMouseOverForeColor()
+        { return (!m_CommandMouseOverForeColor.IsEmpty && m_CommandMouseOverForeColorSchemePart == eColorSchemePart.None); }
+        /// <summary>
+        /// Resets CommandMouseOverForeColor to it's default value. Used by windows forms designer design-time support.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        internal void ResetCommandMouseOverForeColor()
+        {
+            this.CommandMouseOverForeColor = Color.Empty;
+        }
+        /// <summary>
+        /// Gets or sets command button mouse over color scheme foreground color. Setting
+        /// this property overrides the setting of the corresponding CommandMouseOverForeColor property.
+        /// Color scheme colors are automatically managed and are based on current system colors.
+        /// That means if colors on the system change the color scheme will ensure that it's colors
+        /// are changed as well to fit in the color scheme of target system. Set this property to
+        /// <a href="AdvTree~DevComponents.AdvTree.eColorSchemePart.html">eColorSchemePart.None</a> to
+        /// specify explicit color to use through CommandMouseOverForeColor property.
+        /// </summary>
+        [Browsable(true), Category("Command Button"), DefaultValue(eColorSchemePart.ItemHotText), Description("Indicates command button mouse over foreground color.")]
+        internal eColorSchemePart CommandMouseOverForeColorSchemePart
+        {
+            get { return m_CommandMouseOverForeColorSchemePart; }
+            set
+            {
+                m_CommandMouseOverForeColorSchemePart = value;
+                this.OnCommandButtonChanged();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the command button mouse over background gradient angle.
+        /// </summary>
+        [Browsable(true), Category("Expand Button"), DefaultValue(0), Description("Indicates command button mouse over background gradient angle.")]
+        internal int CommandMouseOverBackColorGradientAngle
+        {
+            get
+            {
+                return m_CommandMouseOverBackColorGradientAngle;
+            }
+            set
+            {
+                if (m_CommandMouseOverBackColorGradientAngle != value)
+                {
+                    m_CommandMouseOverBackColorGradientAngle = value;
+                    this.OnExpandButtonChanged();
+
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the label text of the node cells can be edited. Default value is false.
+        /// </summary>
+        [Browsable(true), DefaultValue(false), Description("Indicates whether the label text of the node cells can be edited."), Category("Editing")]
+        public bool CellEdit
+        {
+            get { return m_CellEdit; }
+            set { m_CellEdit = value; }
+        }
+
+        /// <summary>
+        /// Returns whether cell editing is in progress.
+        /// </summary>
+        [Browsable(false)]
+        public bool IsCellEditing
+        {
+            get { return m_CellEditing; }
+        }
+
+        /// <summary>
+        /// Returns the zero based flat index of the node. Flat index is the index of the node as if tree structure
+        /// has been flattened into the list.
+        /// </summary>
+        /// <param name="node">Reference to the node to return index for.</param>
+        /// <returns>Zero based node index or -1 if index cannot be determined.</returns>
+        public int GetNodeFlatIndex(Node node)
+        {
+            return NodeOperations.GetNodeFlatIndex(this, node);
+        }
+
+        /// <summary>
+        /// Returns node based on the flat index. Flat index is the index of the node as if tree structure
+        /// has been flattened into the list.
+        /// </summary>
+        /// <param name="index">Index to return node for.</param>
+        /// <returns>Reference to a node or null if node at specified index cannot be found.</returns>
+        public Node GetNodeByFlatIndex(int index)
+        {
+            return NodeOperations.GetNodeByFlatIndex(this, index);
+        }
+        #endregion
+
+        #region Private implementation
+        private bool _AccessibleObjectCreated = false;
+        protected override AccessibleObject CreateAccessibilityInstance()
+        {
+            _AccessibleObjectCreated = true;
+            return new AdvTreeAccessibleObject(this);
+        }
+
+        protected override void ScaleControl(SizeF factor, BoundsSpecified specified)
+        {
+            if (Dpi.RecordScalePerControl)
+                Dpi.SetScaling(factor);
+            ScaleHostedControls(factor);
+            this.InvalidateNodesSize();
+            if (_VScrollBar != null) _VScrollBar.UpdateScaling(factor);
+            if (_HScrollBar != null) _HScrollBar.UpdateScaling(factor);
+            base.ScaleControl(factor, specified);
+        }
+
+        private void ScaleHostedControls(SizeF factor)
+        {
+            foreach (Cell cell in m_HostedControlCells)
+            {
+                System.Windows.Forms.Control cellHostedControl = cell.HostedControl;
+                if (cellHostedControl == null) continue;
+                cellHostedControl.Scale(factor);
+            }
+        }
+
+        protected override bool ScaleChildren
+        {
+            get { return false; }
+        }
+
+        /// <summary>
+        /// Returns color scheme part color if set otherwise returns color passed in.
+        /// </summary>
+        /// <param name="color">Color.</param>
+        /// <param name="p">Color scheme part.</param>
+        /// <returns>Color.</returns>
+        internal Color GetColor(Color color, eColorSchemePart p)
+        {
+            if (p == eColorSchemePart.None || p == eColorSchemePart.Custom)
+                return color;
+            ColorScheme cs = this.ColorScheme;
+            if (cs == null)
+                return color;
+            return (Color)cs.GetType().GetProperty(p.ToString()).GetValue(cs, null);
+        }
+        private void OnExpandButtonChanged()
+        {
+            _LayoutSettings.ExpandPartSize = m_ExpandButtonSize;
+            this.InvalidateNodesSize();
+            this.RecalcLayout();
+            this.Refresh();
+        }
+        private Size GetDefaultExpandButtonSize()
+        {
+            return m_DefaultExpandPartSize;
+        }
+        private void ElementStyleChanged(object sender, EventArgs e)
+        {
+            this.InvalidateNodesSize();
+            if (this.DesignMode)
+                this.RecalcLayout();
+            this.OnDisplayChanged();
+        }
+        private void OnDisplayChanged()
+        {
+            if (this.DesignMode)
+                this.Refresh();
+        }
+        private void OnLayoutChanged()
+        {
+            _LayoutSettings.NodeHorizontalSpacing = m_NodeHorizontalSpacing;
+            _LayoutSettings.NodeVerticalSpacing = m_NodeVerticalSpacing;
+
+            //// Layout specific properties
+            //if (m_Layout == eNodeLayout.Diagram)
+            //{
+            //    Layout.NodeDiagramLayout nd = m_NodeLayout as Layout.NodeDiagramLayout;
+            //    nd.DiagramFlow = m_DiagramLayoutFlow;
+            //}
+            //else if (m_Layout == eNodeLayout.Map)
+            //{
+            //    NodeMapLayout nd = m_NodeLayout as NodeMapLayout;
+            //    nd.MapFlow = m_MapLayoutFlow;
+            //}
+
+            this.RecalcLayout();
+            OnDisplayChanged();
+        }
+        private void ConnectorAppearanceChanged(object sender, EventArgs e)
+        {
+            OnDisplayChanged();
+        }
+        //private void SetLayout(eNodeLayout layout)
+        //{
+        //    m_Layout=layout;
+        //    if(m_Layout==eNodeLayout.Map)
+        //    {
+        //        m_NodeLayout=new NodeMapLayout(this,this.ClientRectangle);
+        //    }
+        //    else if(m_Layout==eNodeLayout.Diagram)
+        //    {
+        //        m_NodeLayout=new Layout.NodeDiagramLayout(this,this.ClientRectangle);
+        //    }
+        //    InvalidateNodesSize();
+        //    OnLayoutChanged();
+        //}
+
+        /// <summary>
+        /// Collapses all nodes in a tree.
+        /// </summary>
+        public void CollapseAll()
+        {
+            this.BeginUpdate();
+            try
+            {
+                foreach (Node item in this.Nodes)
+                {
+                    item.CollapseAll();
+                }
+            }
+            finally
+            {
+                this.EndUpdate(true);
+            }
+        }
+
+        /// <summary>
+        /// Expands all the tree nodes.
+        /// </summary>
+        public void ExpandAll()
+        {
+            this.BeginUpdate();
+            try
+            {
+                foreach (Node item in this.Nodes)
+                {
+                    item.Expand();
+                    item.ExpandAll();
+                }
+            }
+            finally
+            {
+                this.EndUpdate(true);
+            }
+        }
+
+        private void PaintStyleBackground(Graphics g)
+        {
+            Display.TreeRenderer renderer = this.NodeRenderer;
+            if (renderer != null)
+            {
+                this.NodeRenderer.DrawTreeBackground(new TreeBackgroundRendererEventArgs(g, this));
+                return;
+            }
+
+            if (!this.BackColor.IsEmpty)
+            {
+                using (SolidBrush brush = new SolidBrush(this.BackColor))
+                    g.FillRectangle(brush, this.DisplayRectangle);
+            }
+
+            ElementStyleDisplayInfo info = new ElementStyleDisplayInfo();
+            info.Bounds = this.DisplayRectangle;
+            info.Graphics = g;
+            bool disposeStyle = false;
+            ElementStyle style = ElementStyleDisplay.GetElementStyle(m_BackgroundStyle, out disposeStyle);
+            info.Style = style;
+            ElementStyleDisplay.Paint(info);
+            if (disposeStyle)
+                style.Dispose();
+        }
+
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            if (this.SuspendPaint)
+                return;
+
+            try
+            {
+                if (m_PendingLayout)
+                {
+                    this.RecalcLayout();
+                }
+
+                if (this.BackColor.A < 255)
+                {
+                    base.OnPaintBackground(e);
+                }
+
+                Graphics g = e.Graphics;
+
+                PaintStyleBackground(g);
+                Point offset = Point.Empty;
+                bool setOffset = false;
+                if (this.AutoScroll)
+                {
+                    offset = GetAutoScrollPositionOffset();
+                    setOffset = true;
+                }
+                else if (this.SelectionBoxStyle == eSelectionStyle.NodeMarker)
+                {
+                    offset.X += this.SelectionBoxSize;
+                    offset.Y += this.SelectionBoxSize;
+                    setOffset = true;
+                }
+
+                SmoothingMode sm = g.SmoothingMode;
+                TextRenderingHint th = g.TextRenderingHint;
+                if (m_AntiAlias)
+                {
+                    g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.AntiAlias;
+                    g.TextRenderingHint = DisplayHelp.AntiAliasTextRenderingHint;
+                }
+
+                Rectangle clipRect = GetInnerRectangle();
+                if (_VScrollBar != null) clipRect.Width -= _VScrollBar.Width;
+                if (_HScrollBar != null) clipRect.Height -= _HScrollBar.Height;
+                g.SetClip(clipRect);
+
+                PaintTree(g, e.ClipRectangle, offset, setOffset, m_ZoomFactor);
+
+                if (_ColumnMoveMarkerIndex >= 0 && _ColumnReorder != null && _ColumnReorder.Parent != m_Columns)
+                    DevComponents.AdvTree.Display.ColumnHeaderDisplay.PaintColumnMoveMarker(g, this, _ColumnMoveMarkerIndex, _ColumnReorder.Parent);
+
+                if (m_AntiAlias)
+                {
+                    g.SmoothingMode = sm;
+                    g.TextRenderingHint = th;
+                }
+            }
+            finally
+            {
+                base.OnPaint(e);
+            }
+        }
+
+        internal Rectangle GetInnerRectangle()
+        {
+            Rectangle r = ElementStyleLayout.GetInnerRect(this.BackgroundStyle, this.ClientRectangle);
+            return r;
+        }
+
+        internal Point GetAutoScrollPositionOffset()
+        {
+            Point p = this.AutoScrollPosition;
+            if (this.SelectionBoxStyle == eSelectionStyle.NodeMarker)
+            {
+                p.Y += this.SelectionBoxSize;
+                p.X += this.SelectionBoxSize;
+            }
+            return p;
+        }
+
+        private void PaintTree(Graphics g, Rectangle clipRectangle, Point offset, bool setOffset, float zoomFactor)
+        {
+
+#if TRIAL
+			if(NodeOperations.ColorExpAlt())
+			{
+				StringFormat format=new StringFormat(StringFormat.GenericDefault);
+				format.Alignment=StringAlignment.Center;
+				format.FormatFlags=format.FormatFlags & ~(format.FormatFlags & StringFormatFlags.NoWrap);	
+				g.DrawString("Thank you very much for trying AdvTree. Unfortunately your trial period is over. To continue using AdvTree you should purchase license at http://www.devcomponents.com",new Font(this.Font.FontFamily,12),SystemBrushes.Highlight,this.ClientRectangle,format);
+				format.Dispose();
+				return;
+			}
+#else
+            if (NodeOperations.keyValidated2 != 114)
+            {
+                Font trial = new Font(this.Font.FontFamily, 7);
+                SolidBrush brushTrial = new SolidBrush(Color.FromArgb(200, SystemColors.Highlight));
+                StringFormat format = new StringFormat(StringFormat.GenericDefault);
+                format.Alignment = StringAlignment.Center;
+                g.DrawString("DotNetBar AdvTree license not found. Please purchase license at http://www.devcomponents.com",
+                    trial, brushTrial, this.DisplayRectangle.X + this.DisplayRectangle.Width / 2, this.DisplayRectangle.Bottom - 14, format);
+                brushTrial.Dispose();
+                format.Dispose();
+                trial.Dispose();
+            }
+#endif
+
+            //Creates the drawing matrix with the right zoom;
+            if (zoomFactor != 1)
+            {
+                System.Drawing.Drawing2D.Matrix mx = GetTranslationMatrix(zoomFactor);
+                //use it for drawing
+                g.Transform = mx;
+
+                // Translate ClipRectangle
+                clipRectangle = GetLayoutRectangle(clipRectangle);
+            }
+
+            if (setOffset)
+            {
+                m_NodeDisplay.Offset = offset;
+            }
+            OnRender(new AdvTreeRenderEventArgs(eAdvTreeRenderType.Background, g));
+            m_NodeDisplay.Paint(g, clipRectangle);
+
+#if TRIAL
+			Font trial=new Font(this.Font.FontFamily,7);
+			SolidBrush brushTrial = new SolidBrush(Color.FromArgb(220, SystemColors.Highlight));
+			StringFormat formatTrial=new StringFormat(StringFormat.GenericDefault);
+			formatTrial.Alignment=StringAlignment.Center;
+			g.DrawString("Thank you for trying AdvTree. Please purchase license at http://www.devcomponents.com",
+			                      trial, brushTrial, this.DisplayRectangle.X+this.DisplayRectangle.Width/2, this.DisplayRectangle.Bottom - 14, formatTrial);
+			brushTrial.Dispose();
+			formatTrial.Dispose();
+			trial.Dispose();
+#endif
+        }
+
+        /// <summary>
+        /// Paints control to canvas. This method might be used for print output.
+        /// </summary>
+        /// <param name="g">Graphics object to paint control to.</param>
+        /// <param name="background">Indicates whether to paint control background.</param>
+        public void PaintTo(Graphics g, bool background)
+        {
+            PaintTo(g, background, Rectangle.Empty);
+        }
+
+        /// <summary>
+        /// Paints control to canvas. This method might be used for print output.
+        /// </summary>
+        /// <param name="g">Graphics object to paint control to.</param>
+        /// <param name="background">Indicates whether to paint control background.</param>
+        /// <param name="clipRectangle">Indicates clipping rectangle. Nodes outside of clipping rectangle will not be painted. You can pass Rectangle.Empty and all nodes will be painted.</param>
+        public void PaintTo(Graphics g, bool background, Rectangle clipRectangle)
+        {
+            if (background)
+                PaintStyleBackground(g);
+            Point lockedOffset = m_NodeDisplay.GetLockedOffset();
+            Point offsetDisplay = m_NodeDisplay.Offset;
+            Point offset = Point.Empty;
+
+            m_NodeLayout.Graphics = g;
+            try
+            {
+                m_NodeLayout.PerformLayout();
+            }
+            finally
+            {
+                m_NodeLayout.Graphics = null;
+            }
+
+            Node displayNode = this.GetDisplayRootNode();
+
+            //if(displayNode!=null)
+            //{
+            //    if(this.NodeLayout is NodeMapLayout)
+            //    {
+            //        offset = new Point(Math.Abs(displayNode.ChildNodesBounds.Left),Math.Abs(displayNode.ChildNodesBounds.Top));
+            //    }
+            //}
+
+            m_NodeDisplay.SetLockedOffset(offset);
+
+            try
+            {
+                PaintTree(g, clipRectangle, Point.Empty, true, 1f);
+            }
+            finally
+            {
+                m_NodeLayout.PerformLayout();
+                m_NodeDisplay.SetLockedOffset(lockedOffset);
+                if (lockedOffset.IsEmpty)
+                    m_NodeDisplay.Offset = offsetDisplay;
+            }
+        }
+
+        protected override void OnRightToLeftChanged(EventArgs e)
+        {
+            this.RecalcLayout();
+            base.OnRightToLeftChanged(e);
+        }
+
+        protected override void OnHandleCreated(EventArgs e)
+        {
+            base.OnHandleCreated(e);
+#if TRIAL
+			if(!this.DesignMode)
+			{
+                RemindForm f = new RemindForm();
+				//Design.ComponentNotLicensed f = new Design.ComponentNotLicensed();
+				f.ShowDialog();
+				f.Dispose();
+			}
+#endif
+        }
+
+        protected override void OnHandleDestroyed(EventArgs e)
+        {
+            DestroyDragScrollTimer();
+            base.OnHandleDestroyed(e);
+        }
+
+        private int _IsLayoutOrResize = 0;
+        protected override void OnResize(EventArgs e)
+        {
+            _IsLayoutOrResize++;
+            try
+            {
+                base.OnResize(e);
+                if (this.Size.Width == 0 || this.Size.Height == 0)
+                    return;
+                RepositionScrollBars(); // Reposition scrollbars for appearance reasons so the do not "lag" behind when resizing
+                if ((m_Columns.Count > 0 && m_Columns.UsesRelativeSize || _View == eView.Tile) && !_FirstLayout)
+                {
+                    this.InvalidateNodesSize();
+                    if (this.Nodes.Count == 0 && m_Columns.UsesRelativeSize)
+                        SetPendingLayout();
+                }
+                else
+                    SetPendingLayout();
+
+                //this.RecalcLayout();
+                UpdateControlBorderPanel();
+            }
+            finally
+            {
+                _IsLayoutOrResize--;
+            }
+
+        }
+
+        protected override void OnLayout(LayoutEventArgs levent)
+        {
+            try
+            {
+                _IsLayoutOrResize++;
+                base.OnLayout(levent);
+            }
+            finally
+            {
+                _IsLayoutOrResize--;
+            }
+        }
+
+        protected override void OnKeyPress(KeyPressEventArgs e)
+        {
+            if (_KeyboardSearchEnabled && char.IsLetterOrDigit(e.KeyChar))
+            {
+                Node node = this.SelectedNode;
+                if (!(node != null && node.CheckBoxVisible && node.Enabled && e.KeyChar == ' ') || node == null)
+                    e.Handled = ProcessKeyboardCharacter(e.KeyChar);
+            }
+            base.OnKeyPress(e);
+        }
+
+        private bool _KeyboardSearchEnabled = true;
+        /// <summary>
+        /// Gets or sets whether keyboard incremental search through Node.Text property is enabled. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether keyboard incremental search is enabled.")]
+        public bool KeyboardSearchEnabled
+        {
+            get { return _KeyboardSearchEnabled; }
+            set
+            {
+                _KeyboardSearchEnabled = value;
+            }
+        }
+
+        private System.Windows.Forms.Timer _SearchBufferExpireTimer = null;
+        /// <summary>
+        /// Processes the keyboard character and executes the search through the nodes.
+        /// </summary>
+        /// <param name="p">Character to process.</param>
+        /// <returns></returns>
+        public virtual bool ProcessKeyboardCharacter(char p)
+        {
+            string searchString = UpdateSearchBuffer(p.ToString());
+            Node node = FindNodeByText(searchString, SelectedNode, true);
+            if (node == null && SelectedNode != null)
+            {
+                // Try from top searching
+                node = FindNodeByText(searchString, true);
+            }
+            else
+            {
+                while (node != null && !node.Selectable)
+                {
+                    node = FindNodeByText(searchString, node, true);
+                }
+            }
+            if (node != null)
+                SelectNode(node, eTreeAction.Keyboard);
+            else
+            {
+                if (searchString.Length > 1 && _SearchBufferAutoClearNotFound)
+                {
+                    searchString = p.ToString();
+                    _SearchBuffer = searchString;
+                    node = FindNodeByText(searchString, SelectedNode, true);
+                    if (node == null && SelectedNode != null)
+                        node = FindNodeByText(searchString, true);
+                    if (node != null)
+                        SelectNode(node, eTreeAction.Keyboard);
+                }
+            }
+
+            return false;
+        }
+
+        private int _SearchBufferExpireTimeout = 1000;
+        /// <summary>
+        /// Gets or sets the keyboard search buffer expiration timeout. Default value is 1000 which indicates that
+        /// key pressed within 1 second will add to the search buffer and control will be searched for node text
+        /// that begins with resulting string. Setting this value to 0 will disable the search buffer.
+        /// </summary>
+        [DefaultValue(1000), Category("Behavior"), Description("Indicates keyboard search buffer expiration timeout.")]
+        public int SearchBufferExpireTimeout
+        {
+            get { return _SearchBufferExpireTimeout; }
+            set
+            {
+                if (value < 0) value = 0;
+                _SearchBufferExpireTimeout = value;
+            }
+        }
+        private bool _SearchBufferAutoClearNotFound = true;
+        /// <summary>
+        /// Indicates whether search buffer is auto-cleared regardless of the expiration timeout if node is not found using current buffer content.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether search buffer is auto-cleared regardless of the expiration timeout if node is not found using current buffer content.")]
+        public bool SearchBufferAutoClearNotFound
+        {
+            get { return _SearchBufferAutoClearNotFound; }
+            set
+            {
+                _SearchBufferAutoClearNotFound = value;
+            }
+        }
+        
+
+        private string _SearchBuffer = "";
+        private string UpdateSearchBuffer(string s)
+        {
+            if (_SearchBufferExpireTimeout <= 0)
+                return s;
+
+            if (_SearchBufferExpireTimer == null)
+            {
+                _SearchBufferExpireTimer = new System.Windows.Forms.Timer();
+                _SearchBufferExpireTimer.Interval = _SearchBufferExpireTimeout;
+                _SearchBufferExpireTimer.Tick += new EventHandler(SearchBufferExpireTimerTick);
+                _SearchBufferExpireTimer.Start();
+            }
+            else
+                _SearchBufferExpireTimer.Start();
+            _SearchBuffer += s;
+            return _SearchBuffer;
+        }
+
+        private void SearchBufferExpireTimerTick(object sender, EventArgs e)
+        {
+            _SearchBufferExpireTimer.Stop();
+            _SearchBuffer = "";
+        }
+
+        protected override void OnKeyDown(KeyEventArgs e)
+        {
+            base.OnKeyDown(e);
+            if (!e.Handled)
+                KeyNavigation.KeyDown(this, e);
+        }
+
+        protected override bool IsInputChar(char charCode)
+        {
+            if (char.IsLetterOrDigit(charCode))
+                return true;
+            return base.IsInputChar(charCode);
+        }
+
+
+        protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
+        {
+            if (this.IsKeyboardFocusWithin && !this.Focused)
+            {
+                foreach (Cell item in m_HostedControlCells)
+                {
+                    if (item.HostedControl != null && (item.HostedControl.Focused || item.HostedControl.ContainsFocus))
+                        return base.ProcessCmdKey(ref msg, keyData);
+                }
+            }
+
+            if (!m_CellEditing)
+            {
+                if (this.AutoScroll && this.AutoScrollMinSize.Height > this.ClientRectangle.Height && _VScrollBar != null)
+                {
+                    if (keyData == (Keys.Down | Keys.Control))
+                    {
+                        // Scroll UP
+                        AutoScrollPosition = new Point(AutoScrollPosition.X, Math.Max(AutoScrollPosition.Y - _VScrollBar.SmallChange, -(_VScrollBar.Maximum - _VScrollBar.LargeChange)));
+                        return true;
+                    }
+                    else if (keyData == (Keys.Up | Keys.Control))
+                    {
+                        // Scroll Down
+                        AutoScrollPosition = new Point(AutoScrollPosition.X, Math.Min(0, AutoScrollPosition.Y + _VScrollBar.SmallChange));
+                        return true;
+                    }
+                }
+
+                if (keyData == Keys.Left || keyData == Keys.Right ||
+                    keyData == Keys.Up || keyData == (Keys.Up | Keys.Shift) ||
+                    keyData == Keys.Down || keyData == (Keys.Down | Keys.Shift) || keyData == Keys.End || keyData == Keys.Home ||
+                    keyData == Keys.PageDown || keyData == Keys.PageUp)
+                {
+                    return KeyNavigation.NavigateKeyDown(this, new KeyEventArgs(keyData));
+                }
+            }
+            return base.ProcessCmdKey(ref msg, keyData);
+        }
+
+        private ColumnHeader _MouseDownColumnHeader = null;
+        protected override void OnMouseDown(MouseEventArgs e)
+        {
+            base.OnMouseDown(e);
+
+            if (!this.Focused)
+                this.Focus();
+
+            _AutoScrollPositionChange = Point.Empty; // Reset scroll change tracking see notes elsewhere in code for what this does
+
+            Point mousePos = GetLayoutPosition(e);
+            if (m_CellEditing)
+            {
+                m_CellMouseDownCounter = 0;
+                if (!EndCellEditing(eTreeAction.Mouse))
+                    return;
+            }
+
+            NodeHitTestInfo info = e.Button == MouseButtons.Left && _FullRowSelect && _View != eView.Tile ? NodeOperations.GetNodeAt(this, mousePos.Y, false, true) : NodeOperations.GetNodeAt(this, mousePos.X, mousePos.Y, false, true);
+
+            if (_MouseOverColumnHeader != null && e.Button == MouseButtons.Left && AllowUserToResizeColumns)
+            {
+                if (info.ColumnsAt != null)
+                {
+                    StartColumnResize(mousePos.X, mousePos.Y, info.ColumnsAt);
+                }
+                else if (_GridColumnLineResizeEnabled)
+                {
+                    StartColumnResize(mousePos.X, mousePos.Y, m_Columns);
+                }
+            }
+            else if (info.ColumnsAt != null)
+            {
+                ColumnHeader ch = GetColumnAt(mousePos.X, mousePos.Y, info.ColumnsAt);
+                if (ch != null)
+                {
+                    _MouseDownColumnHeader = ch;
+                    ch.OnMouseDown(e);
+                }
+            }
+
+            Node node = info.NodeAt; // e.Button == MouseButtons.Left && _FullRowSelect ? this.GetNodeAt(mousePos.Y) : this.GetNodeAt(mousePos.X, mousePos.Y);
+            if (node != null)
+                OnNodeMouseDown(node, e, m_NodeDisplay.Offset);
+            else if (_MultiSelect && this.SelectedNodes.Count > 1 && (Control.ModifierKeys & (Keys.Control | Keys.Shift)) == Keys.None)
+                SelectNode(null, eTreeAction.Mouse);
+            m_MouseDownLocation = mousePos;
+
+#if !TRIAL
+            if (NodeOperations.keyValidated2 != 114 && !m_DialogDisplayed)
+            {
+                RemindForm f = new RemindForm();
+                f.ShowDialog();
+                f.Dispose();
+                m_DialogDisplayed = true;
+            }
+#endif
+        }
+
+        private DateTime _LastMouseUpTime = DateTime.MinValue;
+        private DateTime _IgnoreDoubleClickTime = DateTime.MinValue;
+        private bool _MovingColumn = false;
+        protected override void OnMouseUp(MouseEventArgs e)
+        {
+            base.OnMouseUp(e);
+
+            if (_MouseDownColumnHeader != null)
+                _MouseDownColumnHeader.OnMouseUp(e);
+            _MouseDownColumnHeader = null;
+
+            if (_ColumnResize != null)
+            {
+                DateTime now = DateTime.Now;
+                ColumnHeader header = _ColumnResize;
+                _ColumnResize = null;
+                this.Capture = false;
+                if (_LastMouseUpTime == DateTime.MinValue || now.Subtract(_LastMouseUpTime).TotalMilliseconds > SystemInformation.DoubleClickTime)
+                    _LastMouseUpTime = DateTime.Now;
+                else if (now.Subtract(_LastMouseUpTime).TotalMilliseconds <= SystemInformation.DoubleClickTime)
+                {
+                    _LastMouseUpTime = DateTime.MinValue;
+                    header.OnDoubleClick(EventArgs.Empty);
+                    if (header.DoubleClickAutoSize) header.AutoSize();
+                    if (header.Parent != null && header.Parent.ParentNode == null)
+                    {
+                        if (_ColumnHeader != null)
+                            _ColumnHeader.IgnoreDoubleClickTime = now;
+                    }
+                    else if (header.Parent != null && header.Parent.Parent != null)
+                        _IgnoreDoubleClickTime = now;
+                    else
+                        _IgnoreDoubleClickTime = DateTime.MinValue;
+
+                }
+                else
+                    _LastMouseUpTime = DateTime.MinValue;
+                OnColumnResized(header, EventArgs.Empty);
+                InvalidateNodesSize();
+                return;
+            }
+            else
+            {
+                ColumnHeader columnToMove = _ColumnReorder;
+                if (columnToMove != null)
+                {
+                    this.Cursor = _OldCursor;
+                    _OldCursor = null;
+                    ColumnHeaderCollection columnsCollection = columnToMove.Parent;
+                    if (columnToMove.Parent == columnsCollection)
+                    {
+                        int moveToPosition = this.ColumnMoveMarkerIndex;
+                        int newDisplayIndex = -1;
+                        this.ColumnMoveMarkerIndex = -1;
+                        if (moveToPosition >= -1)
+                        {
+                            _MovingColumn = true;
+                            this.EndCellEditing(eTreeAction.Mouse);
+                            if (moveToPosition == columnsCollection.Count)
+                                newDisplayIndex = columnsCollection.GetDisplayIndex(columnsCollection.LastVisibleColumn) + 1;
+                            else if (moveToPosition >= 0)
+                            {
+                                int displayIndex = columnsCollection.GetDisplayIndex(columnsCollection[moveToPosition]);
+                                if (displayIndex >= 0)
+                                    newDisplayIndex = displayIndex;
+                                else
+                                    newDisplayIndex = 0;
+                            }
+                            List<int> displayIndexMap = columnsCollection.DisplayIndexMap;
+                            int oldDisplayIndex = columnsCollection.GetDisplayIndex(columnToMove);
+                            displayIndexMap.RemoveAt(oldDisplayIndex);
+                            if (oldDisplayIndex < newDisplayIndex) newDisplayIndex--;
+                            displayIndexMap.Insert(newDisplayIndex, columnsCollection.IndexOf(columnToMove));
+                            columnsCollection.UpdatingDisplayIndexes = true;
+                            for (int i = 0; i < displayIndexMap.Count; i++)
+                            {
+                                columnsCollection[displayIndexMap[i]].DisplayIndex = i;
+                            }
+                            columnsCollection.UpdatingDisplayIndexes = false;
+                            _MovingColumn = false;
+                            OnColumnMoved(new ColumnMovedEventArgs(columnToMove, oldDisplayIndex, newDisplayIndex));
+                            InvalidateNodesSize();
+                            Invalidate();
+                            this.RecalcLayout();
+                        }
+                    }
+                    _ColumnReorder = null;
+                }
+            }
+
+            _LastMouseUpTime = DateTime.MinValue;
+
+            ReleaseMouseOverColumnHeader();
+
+            OnNodeMouseUp(e);
+        }
+        /// <summary>
+        /// Raises ColumnResized event.
+        /// </summary>
+        /// <param name="header">ColumnHeader that was resized.</param>
+        /// <param name="e">Event arguments</param>
+        protected virtual void OnColumnResized(ColumnHeader header, EventArgs e)
+        {
+            EventHandler handler = ColumnResized;
+            if (handler != null)
+                handler(header, e);
+        }
+
+        /// <summary>
+        /// Raises ColumnMoved event.
+        /// </summary>
+        /// <param name="header">ColumnHeader that was moved.</param>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnColumnMoved(ColumnMovedEventArgs e)
+        {
+            ColumnMovedHandler handler = ColumnMoved;
+            if (handler != null)
+                handler(this, e);
+        }
+        protected override void OnClick(EventArgs e)
+        {
+            base.OnClick(e);
+
+            OnNodeMouseClick(e);
+        }
+
+        protected override void OnDoubleClick(EventArgs e)
+        {
+            base.OnDoubleClick(e);
+            MouseEventArgs sourceArgs = e as MouseEventArgs;
+
+            Node selectedNode = this.SelectedNode;
+            if (selectedNode != null)
+            {
+                Point p = this.PointToClient(Control.MousePosition);
+                p = GetLayoutPosition(p);
+                if (selectedNode.Bounds.Contains(p) || _SelectionBoxStyle == eSelectionStyle.FullRowSelect && p.Y>=selectedNode.Bounds.Y && p.Y<=selectedNode.Bounds.Bottom)
+                {
+                    Cell cell = GetCellAt(p);
+                    bool toggle = true;
+                    if (cell != null)
+                    {
+                        Rectangle r = NodeDisplay.GetCellRectangle(eCellRectanglePart.CheckBoxBounds, cell, m_NodeDisplay.Offset);
+                        if (!r.IsEmpty && r.Contains(p))
+                            toggle = false;
+                    }
+                    Node node = selectedNode;
+                    if (_DoubleClickTogglesNode && toggle && (node.HasChildNodes || node.ExpandVisibility == eNodeExpandVisibility.Visible))
+                        node.Toggle(eTreeAction.Mouse);
+
+                    InvokeNodeDoubleClick(new TreeNodeMouseEventArgs(node,
+                                              (sourceArgs != null ? sourceArgs.Button : MouseButtons.Left),
+                                              2,
+                                              0,
+                                              p.X,
+                                              p.Y));
+                }
+
+                if (selectedNode.HasColumns && selectedNode.NodesColumnsHeaderVisible && selectedNode.CommandBounds.Contains(p))
+                {
+                    ColumnHeader ch = GetColumnAt(p.X, p.Y, selectedNode.NodesColumns);
+                    if (ch != null)
+                    {
+                        DateTime now = DateTime.Now;
+                        if (_IgnoreDoubleClickTime != DateTime.MinValue && now.Subtract(_IgnoreDoubleClickTime).TotalMilliseconds <= SystemInformation.DoubleClickTime)
+                        {
+                            _IgnoreDoubleClickTime = DateTime.MinValue;
+                            return;
+                        }
+                        _IgnoreDoubleClickTime = DateTime.MinValue;
+                        ch.OnDoubleClick(e);
+                    }
+                }
+            }
+        }
+
+        private bool _DoubleClickTogglesNode = true;
+        /// <summary>
+        /// Gets or sets whether double-clicking the node will toggle its expanded state. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether double-clicking the node will toggle its expanded state.")]
+        public bool DoubleClickTogglesNode
+        {
+            get { return _DoubleClickTogglesNode; }
+            set
+            {
+                _DoubleClickTogglesNode = value;
+            }
+        }
+
+
+        protected override void OnMouseLeave(EventArgs e)
+        {
+            base.OnMouseLeave(e);
+
+            if (m_MouseOverNode != null)
+                this.SetMouseOverNode(null);
+        }
+
+        protected override void OnMouseHover(EventArgs e)
+        {
+            base.OnMouseHover(e);
+            if (m_MouseOverNode != null && (FireHoverEvent || m_MouseOverNode.FireHoverEvent))
+            {
+                Point p = this.PointToClient(Control.MousePosition);
+                p = GetLayoutPosition(p);
+                InvokeNodeMouseHover(new TreeNodeMouseEventArgs(m_MouseOverNode, Control.MouseButtons, 0, 0, p.X, p.Y));
+            }
+        }
+
+        private ColumnHeader _MouseOverColumnHeader = null;
+        private ColumnHeaderCollection _MouseOverColumsHeaderCollection = null;
+        protected override void OnMouseMove(MouseEventArgs e)
+        {
+            base.OnMouseMove(e);
+            bool bUpdate = false;
+
+            if (m_MouseOverNode != null && m_MouseOverNode.Parent == null && m_MouseOverNode.TreeControl == null) // Node has been removed
+                SetMouseOverNode(null);
+
+            Point mousePos = GetLayoutPosition(e);
+
+            if (_MouseDownColumnHeader != null && _ColumnReorder == null && Math.Abs(mousePos.X - m_MouseDownLocation.X) >= 2 && _AllowUserToReorderColumns)
+            {
+                StartColumnReorder(e.X, e.Y, _MouseDownColumnHeader.Parent);
+                return;
+            }
+
+            if (_ColumnResize != null)
+            {
+                Point offset = Point.Empty;
+                if (AutoScroll)
+                {
+                    offset = GetAutoScrollPositionOffset();
+                    if (_MouseOverColumsHeaderCollection == null) // Main column header resize
+                        offset.Y = 0;
+                }
+                Rectangle columnBounds = _ColumnResize.Bounds;
+                if (m_BackgroundStyle.PaddingLeft > 0 || m_BackgroundStyle.MarginLeft > 0)
+                    columnBounds.X += m_BackgroundStyle.PaddingLeft + m_BackgroundStyle.MarginLeft;
+                columnBounds.Offset(offset);
+                columnBounds = GetScreenRectangle(columnBounds);
+                int columnWidth = Math.Max(Math.Max(2, _ColumnResize.MinimumWidth), mousePos.X - columnBounds.X);
+
+                if (columnWidth != _ColumnResize.Width.Absolute)
+                {
+                    _ColumnResize.Width.AutoSize = false;
+                    _ColumnResize.Width.Absolute = columnWidth;
+                    OnColumnResizing(_ColumnResize, EventArgs.Empty);
+                    if (_MouseOverColumsHeaderCollection != null) InvalidateNodeSize(_MouseOverColumsHeaderCollection.ParentNode);
+                    this.Update();
+                    if (_ColumnHeader != null) _ColumnHeader.Refresh();
+                    if (m_CellEditing && _CellEditControl is Control)
+                    {
+                        Control editControl = (Control)_CellEditControl;
+                        Rectangle rCell = NodeDisplay.GetCellRectangle(eCellRectanglePart.TextBounds, m_EditedCell, m_NodeDisplay.Offset);
+                        rCell = GetScreenRectangle(rCell);
+                        editControl.Bounds = rCell;
+                    }
+                }
+                return;
+            }
+            else if (_ColumnReorder != null)
+            {
+                ColumnHeader col = GetColumnAt(mousePos.X, mousePos.Y, _ColumnReorder.Parent);
+                int columnIndex = -1;
+                if (col != null)
+                    columnIndex = col.Parent.IndexOf(col);
+                else if (col == null)
+                {
+                    ColumnHeader lastVisible = _ColumnReorder.Parent.LastVisibleColumn;
+                    if (lastVisible != null && mousePos.X >= lastVisible.Bounds.Right)
+                        columnIndex = _ColumnReorder.Parent.Count;
+                }
+                if (columnIndex >= 0)
+                {
+                    this.ColumnMoveMarkerIndex = columnIndex;
+                }
+                return;
+            }
+
+            if (e.Button == MouseButtons.Left && !m_CellEditing && m_DragDropEnabled && m_MouseOverNode != null && m_DragNode == null && m_MouseOverNode.DragDropEnabled && m_MouseOverNode.IsSelected &&
+                (Math.Abs(m_MouseDownLocation.X - mousePos.X) > SystemInformation.DragSize.Width || Math.Abs(m_MouseDownLocation.Y - mousePos.Y) > SystemInformation.DragSize.Height))
+            {
+                StartDragDrop();
+            }
+
+            Rectangle r = Rectangle.Empty;
+            if (m_MouseOverNode != null)
+                r = NodeDisplay.GetNodeRectangle(eNodeRectanglePart.NodeBounds, m_MouseOverNode, m_NodeDisplay.Offset);
+
+            bool checkColumns = true;
+            if (_AllowUserToResizeColumns && _GridLines && _GridColumnLineResizeEnabled && m_Columns.Count > 0)
+            {
+                ColumnHeader mouseOverHeader = GetColumnForResizeAt(mousePos.X, mousePos.Y, m_Columns, true, false);
+                if (mouseOverHeader != null)
+                {
+                    if (_MouseOverColumnHeader == null)
+                    {
+                        m_OriginalCursor = this.Cursor;
+                        this.Cursor = Cursors.VSplit;
+                    }
+                    _MouseOverColumnHeader = mouseOverHeader;
+                    checkColumns = false;
+                }
+                else
+                    ReleaseMouseOverColumnHeader();
+            }
+
+            if (!r.IsEmpty && r.Contains(mousePos))
+                bUpdate = OnNodeMouseMove(m_MouseOverNode, e, m_NodeDisplay.Offset);
+            else
+            {
+                Node node = null;
+                NodeHitTestInfo info = null;
+                if (_FullRowSelect && _View == eView.Tree)
+                    info = NodeOperations.GetNodeAt(this, mousePos.Y, true);
+                else
+                    info = NodeOperations.GetNodeAt(this, mousePos.X, mousePos.Y, true);
+                node = info.NodeAt;
+                if (node != m_MouseOverNode)
+                    bUpdate = SetMouseOverNode(node);
+
+                if (checkColumns)
+                {
+                    // Check for mouse over Columns
+                    if (node == null && info.ColumnsAt != null && _AllowUserToResizeColumns)
+                    {
+                        ColumnHeader mouseOverHeader = GetColumnForResizeAt(mousePos.X, mousePos.Y, info.ColumnsAt, false);
+                        if (mouseOverHeader != null)
+                        {
+                            if (_MouseOverColumnHeader == null)
+                            {
+                                m_OriginalCursor = this.Cursor;
+                                this.Cursor = Cursors.VSplit;
+                            }
+                            _MouseOverColumnHeader = mouseOverHeader;
+                            _MouseOverColumsHeaderCollection = info.ColumnsAt;
+                        }
+                        else
+                            ReleaseMouseOverColumnHeader();
+                    }
+                    else
+                        ReleaseMouseOverColumnHeader();
+                }
+
+                if (m_MouseOverNode != null)
+                    bUpdate = bUpdate | OnNodeMouseMove(m_MouseOverNode, e, m_NodeDisplay.Offset);
+            }
+
+            if (bUpdate)
+                this.Update();
+        }
+        /// <summary>
+        /// Raises ColumnResizing event.
+        /// </summary>
+        /// <param name="column">Column being resized</param>
+        /// <param name="e">Event arguments</param>
+        protected virtual void OnColumnResizing(ColumnHeader column, EventArgs e)
+        {
+            EventHandler handler = ColumnResizing;
+            if (handler != null) handler(column, e);
+        }
+        private void ReleaseMouseOverColumnHeader()
+        {
+            if (_MouseOverColumnHeader != null)
+            {
+                _MouseOverColumnHeader = null;
+                if (m_OriginalCursor != null)
+                    this.Cursor = m_OriginalCursor;
+                else
+                    this.Cursor = null;
+                m_OriginalCursor = null;
+            }
+            _MouseOverColumsHeaderCollection = null;
+        }
+
+        protected override void OnMouseWheel(MouseEventArgs e)
+        {
+            if (this.AutoScroll && _VScrollBar != null && !this.IsCellEditing)
+            {
+                if (e.Delta < 0)
+                {
+                    AutoScrollPosition = new Point(AutoScrollPosition.X, Math.Max(AutoScrollPosition.Y - _VScrollBar.SmallChange * SystemInformation.MouseWheelScrollLines, -(_VScrollBar.Maximum - _VScrollBar.LargeChange)));
+                }
+                else
+                {
+                    AutoScrollPosition = new Point(AutoScrollPosition.X, Math.Min(0, AutoScrollPosition.Y + _VScrollBar.SmallChange * SystemInformation.MouseWheelScrollLines));
+
+                }
+            }
+            base.OnMouseWheel(e);
+        }
+
+        /// <summary>
+        /// Deselect specified node. Use this method when multiple node selection is enabled to deselect single node or all nodes.
+        /// </summary>
+        /// <param name="node">Reference to node to select or null to deselect all selected nodes.</param>
+        /// <param name="action">Action that is selecting the node.</param>
+        public void DeselectNode(Node node, eTreeAction action)
+        {
+            if (!_MultiSelect || node == null)
+            {
+                SelectNode(null, action);
+                return;
+            }
+
+            if (!node.IsSelected) return;
+            m_SelectedNodes.Remove(node, action);
+        }
+
+        internal void InvokeSelectionChanged(EventArgs e)
+        {
+            OnSelectionChanged(e);
+        }
+
+        /// <summary>
+        /// Raises SelectionChanged event.
+        /// </summary>
+        /// <param name="e">Event arguments</param>
+        protected virtual void OnSelectionChanged(EventArgs e)
+        {
+            EventHandler handler = SelectionChanged;
+            if (handler != null) handler(this, e);
+        }
+
+        internal void InvokeCellSelected(AdvTreeCellEventArgs e)
+        {
+            OnCellSelected(e);
+        }
+        /// <summary>
+        /// Raises CellSelected event.
+        /// </summary>
+        /// <param name="e">Event arguments.</param>
+        protected virtual void OnCellSelected(AdvTreeCellEventArgs e)
+        {
+            AdvTreeCellEventHandler handler = CellSelected;
+            if (handler != null) handler(this, e);
+        }
+        internal void InvokeCellUnselected(AdvTreeCellEventArgs e)
+        {
+            OnCellUnselected(e);
+        }
+        /// <summary>
+        /// Raises CellUnselected event.
+        /// </summary>
+        /// <param name="e">Event arguments.</param>
+        protected virtual void OnCellUnselected(AdvTreeCellEventArgs e)
+        {
+            AdvTreeCellEventHandler handler = CellUnselected;
+            if (handler != null) handler(this, e);
+        }
+
+        /// <summary>
+        /// Selected specified node.
+        /// </summary>
+        /// <param name="node">Node to select.</param>
+        /// <param name="action">Action that is selecting the node.</param>
+        public void SelectNode(Node node, eTreeAction action)
+        {
+            if (node != null && !node.Selectable && !this.DesignMode) return;
+            if (!_MultiSelect && node == m_SelectedNode) return;
+
+            AdvTreeNodeCancelEventArgs cancelArgs = new AdvTreeNodeCancelEventArgs(action, node);
+            OnBeforeNodeSelect(cancelArgs);
+            if (cancelArgs.Cancel)
+                return;
+
+            // Reset change tracking since if node is partially covered by scroll-bars and is scrolled into the view
+            // the NodeClick event does not get fired since mouse at that time points to different node due to scrolling.
+            // This offset is used to offset mouse position so correct node is found and NodeClick event is fired.
+            _AutoScrollPositionChange = Point.Empty;
+            if (_MultiSelect && !this.DesignMode)
+            {
+                if (m_SelectedNodes.Count > 0)
+                {
+                    //m_SelectedNodes.SuspendClearEvents = true;
+                    m_SelectedNodes.SourceAction = action;
+                    m_SelectedNodes.Clear();
+                    m_SelectedNodes.SourceAction = eTreeAction.Code;
+                    //m_SelectedNodes.SuspendClearEvents = false;
+                }
+                bool fireSelection = false;
+                if (node != null)
+                {
+                    m_SelectedNodes.SuspendEvents = true;
+                    try
+                    {
+                        if (m_SelectedNodes.Add(node, action) != -1)
+                        {
+                            node.EnsureVisible();
+                            fireSelection = true;
+                        }
+                    }
+                    finally
+                    {
+                        m_SelectedNodes.SuspendEvents = false;
+                    }
+                }
+                else
+                    OnSelectionChanged(EventArgs.Empty);
+                this.Invalidate();
+                //OnSelectionChanged(EventArgs.Empty);  // Fired from SelectedNodes collection
+                return;
+            }
+
+            //bool bUpdate=false;
+
+            if (m_CellEditing)
+            {
+                if (!EndCellEditing(eTreeAction.Code))
+                    return;
+            }
+
+#if !TRIAL
+            if (NodeOperations.keyValidated2 < 114)
+            {
+                NodeDisplay.keyInvalid = true;
+                NodeOperations.keyValidated2 = NodeOperations.keyValidated2 + 124;
+            }
+            else if (NodeOperations.keyValidated2 > 114)
+                return;
+#endif
+            Node oldSelected = m_SelectedNode;
+            m_SelectedNode = node;
+
+            if (oldSelected != null)
+            {
+                oldSelected.IsSelected = false;
+                InvalidateNode(oldSelected);
+                //bUpdate = true;
+                if (oldSelected.GetSelectedCell() != null && oldSelected != node)
+                    oldSelected.SetSelectedCell(null, action); // SelectedCell.SetSelected(false);
+                if (m_SelectedNodes.Contains(oldSelected))
+                    m_SelectedNodes.Remove(oldSelected);
+                OnAfterNodeDeselect(new AdvTreeNodeEventArgs(action, oldSelected));
+                oldSelected.InternalDeselected(action);
+            }
+
+            if (m_SelectedNode != null)
+            {
+                m_SelectedNode.IsSelected = true;
+                m_SelectedNodes.Add(m_SelectedNode);
+                InvalidateNode(m_SelectedNode);
+                //bUpdate = true;
+                if (m_SelectedNode.SelectedCell == null)
+                {
+                    m_SelectedNode.SelectFirstCell(action);
+                }
+                m_SelectedNode.EnsureVisible();
+            }
+
+            if (this.SelectedPathConnector != null)
+                this.Invalidate();
+
+            if (_DataManager != null && _EnableDataPositionChange)
+            {
+                if (node != null && node.BindingIndex > -1 && _DataManager.Position != node.BindingIndex)
+                {
+                    _DataManager.Position = node.BindingIndex;
+                }
+                //else if (node == null && !_LoadingDataSource)
+                //    _DataManager.Position = -1;
+            }
+
+            AdvTreeNodeEventArgs args = new AdvTreeNodeEventArgs(action, node);
+            OnAfterNodeSelect(args);
+
+            if (m_SelectedNode != null)
+            {
+                m_SelectedNode.InternalSelected(action);
+            }
+
+            OnSelectedIndexChanged(EventArgs.Empty);
+            if (!string.IsNullOrEmpty(this.ValueMember))
+                this.OnSelectedValueChanged(EventArgs.Empty);
+            OnSelectionChanged(EventArgs.Empty);
+        }
+
+        private void OnCellStyleChanged()
+        {
+            InvalidateNodesSize();
+            if (this.DesignMode)
+            {
+                this.RecalcLayout();
+                this.Refresh();
+            }
+        }
+
+        private void SetSizeChanged(Node node)
+        {
+            node.SizeChanged = true;
+            foreach (Node c in node.Nodes)
+                SetSizeChanged(c);
+        }
+
+
+        /// <summary>
+        /// Invalidates the size for all top-level nodes and their sub-nodes.
+        /// </summary>
+        public void InvalidateNodesSize()
+        {
+            if (_ColumnResize != null)
+            {
+                // To optimize perormace when resizing columns just invalidate visible columns
+                ArrayList paintedNodes = this.NodeDisplay.PaintedNodes;
+                foreach (Node paintedNode in paintedNodes)
+                {
+                    SetSizeChanged(paintedNode);
+                }
+            }
+            else
+            {
+                foreach (Node node in m_Nodes)
+                    SetSizeChanged(node);
+            }
+        }
+
+        /// <summary>
+        /// Invalidates the size for a node and its sub-nodes.
+        /// </summary>
+        /// <param name="node">Node to invalidate size for.</param>
+        public void InvalidateNodeSize(Node node)
+        {
+            SetSizeChanged(node);
+        }
+
+        private void ImageListDisposed(object sender, EventArgs e)
+        {
+            if (sender == m_ImageList)
+            {
+                this.ImageList = null;
+            }
+        }
+
+        /// <summary>
+        /// Ensures that selected node is visible i.e. that all parents of the selected node are expanded. If not selects the first parent node not expanded.
+        /// </summary>
+        internal void ValidateSelectedNode()
+        {
+            Node node = this.SelectedNode;
+            Node nodeSelected = node;
+            if (node == null)
+                return;
+            if (node.TreeControl != this)
+            {
+                nodeSelected = null;
+            }
+            else
+            {
+                while (node != null)
+                {
+                    node = node.Parent;
+                    if (node != null && !node.Expanded && node.Selectable)
+                        nodeSelected = node;
+                }
+            }
+            if (nodeSelected == null || !nodeSelected.IsVisible)
+            {
+                if (!SelectFirstNode(eTreeAction.Code))
+                    this.SelectedNode = null;
+            }
+            else
+            {
+                if (_MultiSelect)
+                {
+                    if (!this.SelectedNodes.Contains(nodeSelected))
+                        this.SelectedNode = nodeSelected;
+                }
+                else
+                {
+                    if (this.SelectedNode != nodeSelected)
+                        this.SelectedNode = nodeSelected;
+                }
+            }
+        }
+
+        private bool SetMouseOverCell(Cell mouseOverCell)
+        {
+            bool bUpdate = false;
+            if (mouseOverCell == m_MouseOverCell)
+                return bUpdate;
+
+            if (m_MouseOverCell != null && m_MouseOverCell != mouseOverCell)
+            {
+                if (this.CellStyleMouseOver != null || m_MouseOverCell.StyleMouseOver != null || m_RenderMode != eNodeRenderMode.Default || m_MouseOverCell.Parent != null && m_MouseOverCell.Parent.RenderMode != eNodeRenderMode.Default)
+                    bUpdate = true;
+                m_MouseOverCell.SetMouseOver(false);
+                if (m_MouseOverCell.Tooltip != null)
+                    Interop.WinApi.ResetHover(this);
+            }
+
+            m_MouseOverCell = mouseOverCell;
+            if (m_MouseOverCell != null)
+            {
+                m_MouseOverCell.SetMouseOver(true);
+                if (this.CellStyleMouseOver != null || m_MouseOverCell.StyleMouseOver != null || m_RenderMode != eNodeRenderMode.Default || m_MouseOverCell.Parent != null && m_MouseOverCell.Parent.RenderMode != eNodeRenderMode.Default)
+                    bUpdate = true;
+            }
+
+            UpdateTreeCursor();
+
+            return bUpdate;
+        }
+
+        private bool SetMouseOverNode(Node mouseOverNode)
+        {
+            bool bUpdate = false;
+            if (m_MouseOverNode != null)
+            {
+                bUpdate = bUpdate | SetMouseOverCell(null);
+                if (m_MouseOverNode.MouseOverNodePart == eMouseOverNodePart.Expand)
+                    bUpdate = true;
+                m_MouseOverNode.MouseOverNodePart = eMouseOverNodePart.None;
+                if (this.NodeStyleMouseOver != null || this.CellStyleMouseOver != null || m_MouseOverNode.StyleMouseOver != null || this.NodeStyleMouseOver != null ||
+                    m_RenderMode != eNodeRenderMode.Default || m_MouseOverNode.RenderMode != eNodeRenderMode.Default || m_MouseOverNode.CommandButton || bUpdate || _HotTracking)
+                {
+                    InvalidateNode(m_MouseOverNode);
+                    bUpdate = true;
+                }
+
+                if (m_MouseOverNode != mouseOverNode && m_MouseOverNode != null)
+                {
+                    Point p = this.PointToClient(Control.MousePosition);
+                    InvokeNodeMouseLeave(new TreeNodeMouseEventArgs(m_MouseOverNode, Control.MouseButtons, 0, 0, p.X, p.Y));
+                }
+            }
+
+            bool mouseOverNodeChanged = m_MouseOverNode != mouseOverNode;
+            m_MouseOverNode = mouseOverNode;
+
+            if (mouseOverNode != null)
+            {
+                mouseOverNode.MouseOverNodePart = eMouseOverNodePart.Node;
+                if (mouseOverNode.StyleMouseOver != null || this.NodeStyleMouseOver != null ||
+                    m_RenderMode != eNodeRenderMode.Default || mouseOverNode.RenderMode != eNodeRenderMode.Default || mouseOverNode.CommandButton || _HotTracking)
+                {
+                    InvalidateNode(mouseOverNode);
+                    bUpdate = true;
+                }
+
+                Point p = this.PointToClient(Control.MousePosition);
+                InvokeNodeMouseEnter(new TreeNodeMouseEventArgs(mouseOverNode, Control.MouseButtons, 0, 0, p.X, p.Y));
+
+                if (mouseOverNodeChanged && (FireHoverEvent || mouseOverNode.FireHoverEvent))
+                {
+                    Interop.WinApi.ResetHover(this);
+                }
+            }
+
+            return bUpdate;
+        }
+        private static readonly string DotNetBarPrefix = "DotNetBar.";
+        private void OnNodeMouseDown(Node node, MouseEventArgs e, Point offset)
+        {
+            Point mousePos = GetLayoutPosition(e);
+
+            InvokeNodeMouseDown(new TreeNodeMouseEventArgs(node, e.Button, e.Clicks, e.Delta, mousePos.X, mousePos.Y));
+
+            if (e.Button == MouseButtons.Left)
+            {
+                Rectangle r = NodeDisplay.GetNodeRectangle(eNodeRectanglePart.ExpandHitTestBounds, node, offset);
+
+                if (r.Contains(mousePos) && e.Clicks == 1 && node.ExpandVisibility != eNodeExpandVisibility.Hidden)
+                {
+                    m_CellMouseDownCounter = 0;
+                    node.Toggle(eTreeAction.Mouse);
+                    return;
+                }
+
+                if (node.CommandButton)
+                {
+                    m_CellMouseDownCounter = 0;
+                    r = NodeDisplay.GetNodeRectangle(eNodeRectanglePart.CommandBounds, node, offset);
+                    if (r.Contains(mousePos))
+                    {
+                        InvokeCommandButtonClick(node, new CommandButtonEventArgs(eTreeAction.Mouse, node));
+                        return;
+                    }
+                }
+
+                r = NodeDisplay.GetNodeRectangle(eNodeRectanglePart.NodeContentBounds, node, offset);
+                if ((r.Contains(mousePos) || _FullRowSelect && mousePos.Y >= r.Y && mousePos.Y <= r.Bottom) && node.TreeControl != null)
+                {
+                    if (node.TreeControl.SelectedNode != node)
+                        m_CellMouseDownCounter = 0;
+
+                    if (node.Selectable)
+                    {
+                        if (_MultiSelect && m_SelectedNodes.Count > 0 && Control.ModifierKeys == Keys.None && e.Button == MouseButtons.Left) // Deselect all
+                            _SelectOnMouseUp = true;
+                        else
+                            _SelectOnMouseUp = false;
+
+                        if (_MultiSelect && m_SelectedNodes.Count > 0 && (Control.ModifierKeys == Keys.Shift || Control.ModifierKeys == Keys.Control))
+                        {
+                            m_CellMouseDownCounter = 0;
+                            if (_MultiSelectRule == eMultiSelectRule.SameParent && m_SelectedNodes[0].Parent != node.Parent) return;
+                            if (Control.ModifierKeys == Keys.Shift && m_SelectedNodes.Count > 0)
+                            {
+                                // Range selection
+                                Node startNode = m_SelectedNodes[0];
+                                Node currentNode = node;
+                                bool selectionChanged = false;
+                                m_SelectedNodes.MultiNodeOperation = true;
+                                try
+                                {
+                                    while (m_SelectedNodes.Count > 1)
+                                    {
+                                        m_SelectedNodes.Remove(m_SelectedNodes[m_SelectedNodes.Count - 1], eTreeAction.Mouse);
+                                        selectionChanged = true;
+                                    }
+                                }
+                                finally
+                                {
+                                    m_SelectedNodes.MultiNodeOperation = false;
+                                }
+                                if (currentNode != startNode)
+                                {
+                                    if (currentNode.Bounds.Y > startNode.Bounds.Y)
+                                    {
+                                        // Selecting down
+                                        m_SelectedNodes.MultiNodeOperation = true;
+                                        try
+                                        {
+                                            do
+                                            {
+                                                if (!currentNode.IsSelected && currentNode.Selectable)
+                                                {
+                                                    if (_MultiSelectRule == eMultiSelectRule.AnyNode ||
+                                                        _MultiSelectRule == eMultiSelectRule.SameParent && m_SelectedNodes.Count > 0 && m_SelectedNodes[0].Parent == currentNode.Parent)
+                                                        m_SelectedNodes.Add(currentNode, eTreeAction.Mouse);
+                                                }
+                                                currentNode = NodeOperations.GetPreviousVisibleNode(currentNode);
+
+                                            } while (startNode != currentNode && currentNode != null);
+                                        }
+                                        finally
+                                        {
+                                            m_SelectedNodes.MultiNodeOperation = false;
+                                            InvokeSelectionChanged(EventArgs.Empty);
+                                        }
+                                    }
+                                    else
+                                    {
+                                        // Selecting upwards
+                                        m_SelectedNodes.MultiNodeOperation = true;
+                                        try
+                                        {
+                                            do
+                                            {
+                                                if (!currentNode.IsSelected && currentNode.Selectable)
+                                                {
+                                                    if (_MultiSelectRule == eMultiSelectRule.AnyNode ||
+                                                        _MultiSelectRule == eMultiSelectRule.SameParent && m_SelectedNodes.Count > 0 && m_SelectedNodes[0].Parent == currentNode.Parent)
+                                                        m_SelectedNodes.Add(currentNode, eTreeAction.Mouse);
+                                                }
+                                                currentNode = NodeOperations.GetNextVisibleNode(currentNode);
+
+                                            } while (startNode != currentNode && currentNode != null);
+                                        }
+                                        finally
+                                        {
+                                            m_SelectedNodes.MultiNodeOperation = false;
+                                            InvokeSelectionChanged(EventArgs.Empty);
+                                        }
+                                    }
+                                }
+                                else if (selectionChanged)
+                                    InvokeSelectionChanged(EventArgs.Empty);
+                            }
+                            else
+                            {
+                                if (node.IsSelected)
+                                    m_SelectedNodes.Remove(node, eTreeAction.Mouse);
+                                else
+                                    m_SelectedNodes.Add(node, eTreeAction.Mouse);
+                            }
+                            //OnSelectionChanged(EventArgs.Empty);
+                            return;
+                        }
+                        else if (!node.IsSelected)
+                        {
+                            SelectNode(node, eTreeAction.Mouse);
+                            if (node.TreeControl == null || node.TreeControl.SelectedNode != node) // Action cancelled
+                                return;
+                        }
+                    }
+
+                    Cell cell = GetCellAt(node, mousePos.X, mousePos.Y, offset);
+                    if (cell != null)
+                    {
+                        bool checkBoxSelection = false;
+                        if (cell.CheckBoxVisible && cell.GetEnabled())
+                        {
+                            Rectangle rCheckBox = cell.CheckBoxBoundsRelative;
+                            r = NodeDisplay.GetNodeRectangle(eNodeRectanglePart.NodeBounds, node, offset);
+                            rCheckBox.Offset(r.Location);
+                            if (rCheckBox.Contains(mousePos))
+                            {
+
+                                if (cell.CheckBoxThreeState)
+                                {
+                                    if (cell.CheckState == CheckState.Checked)
+                                        cell.SetChecked(CheckState.Indeterminate, eTreeAction.Mouse);
+                                    else if (cell.CheckState == CheckState.Unchecked)
+                                        cell.SetChecked(CheckState.Checked, eTreeAction.Mouse);
+                                    else if (cell.CheckState == CheckState.Indeterminate)
+                                        cell.SetChecked(CheckState.Unchecked, eTreeAction.Mouse);
+                                }
+                                else
+                                    cell.SetChecked(!cell.Checked, eTreeAction.Mouse);
+                                checkBoxSelection = true;
+                                m_CellMouseDownCounter = 0;
+                            }
+                        }
+                        if (node.SelectedCell != cell)
+                        {
+                            m_CellMouseDownCounter = 1;
+                        }
+                        else if (!checkBoxSelection)
+                            m_CellMouseDownCounter++;
+                        node.SetSelectedCell(cell, eTreeAction.Mouse);
+                        cell.SetMouseDown(true);
+                    }
+                }
+                else
+                    m_CellMouseDownCounter = 0;
+            }
+            else if (e.Button == MouseButtons.Right)
+            {
+                if (node.TreeControl == null) return;
+                if (!node.IsSelected)
+                    SelectNode(node, eTreeAction.Mouse);
+                if (!this.MultiSelect && node.TreeControl.SelectedNode != node) // Action cancelled
+                    return;
+                if (node.ContextMenu != null)
+                {
+                    if (node.ContextMenu is ContextMenu)
+                    {
+                        ContextMenu cm = node.ContextMenu as ContextMenu;
+                        cm.Show(this, new Point(e.X, e.Y));
+                    }
+                    else if (node.ContextMenu.GetType().FullName == "System.Windows.Forms.ContextMenuStrip")
+                    {
+                        node.ContextMenu.GetType().InvokeMember("Show", System.Reflection.BindingFlags.InvokeMethod, null,
+                                                                node.ContextMenu, new object[] { this, new Point(e.X, e.Y) });
+                    }
+                    else if (node.ContextMenu.GetType().FullName == "DevComponents.DotNetBar.ButtonItem")
+                    {
+                        Point p = this.PointToScreen(new Point(e.X, e.Y));
+                        ((PopupItem)node.ContextMenu).SetSourceControl(this);
+                        node.ContextMenu.GetType().InvokeMember("Popup", System.Reflection.BindingFlags.InvokeMethod,
+                            null, node.ContextMenu, new object[] { p });
+                    }
+                    else if (node.ContextMenu.ToString().StartsWith(DotNetBarPrefix) && m_DotNetBarManager != null)
+                    {
+                        string menuName = node.ContextMenu.ToString().Substring(DotNetBarPrefix.Length);
+                        object contextMenus = m_DotNetBarManager.GetType().InvokeMember("ContextMenus",
+                            System.Reflection.BindingFlags.GetProperty, null, m_DotNetBarManager, null);
+                        int index = (int)contextMenus.GetType().InvokeMember("IndexOf", System.Reflection.BindingFlags.InvokeMethod,
+                            null, contextMenus, new string[] { menuName });
+                        if (index >= 0)
+                        {
+                            IList list = contextMenus as IList;
+                            object popup = list[index];
+                            // Older version of DotNetBar do not have this method exposed so ignore the error...
+                            try
+                            {
+                                popup.GetType().InvokeMember("SetSourceControl", System.Reflection.BindingFlags.InvokeMethod,
+                                    null, popup, new object[] { this });
+                            }
+                            catch { }
+
+                            Point p = this.PointToScreen(new Point(e.X, e.Y));
+                            popup.GetType().InvokeMember("Popup", System.Reflection.BindingFlags.InvokeMethod,
+                                null, popup, new object[] { p });
+                        }
+                    }
+                }
+            }
+        }
+
+        private bool _SelectOnMouseUp = false;
+        private void OnNodeMouseUp(MouseEventArgs e)
+        {
+            bool bUpdate = false;
+            Point mousePos = GetLayoutPosition(e);
+
+            if (this.SelectedNode != null)
+            {
+                if (this.SelectedNode.SelectedCell != null && this.SelectedNode.SelectedCell.IsMouseDown)
+                {
+                    this.SelectedNode.SelectedCell.SetMouseDown(false);
+                    this.InvalidateNode(this.SelectedNode);
+                    bUpdate = true;
+                }
+            }
+
+            if (bUpdate)
+                this.Update();
+
+            Node node = null;
+            if (this.SelectedNode != null && this.SelectedNode.Bounds.Contains(mousePos))
+                node = this.SelectedNode;
+            else
+                node = NodeOperations.GetNodeAt(this, mousePos.X, mousePos.Y, true).NodeAt; //this.GetNodeAt(mousePos);
+
+            if (_SelectOnMouseUp && node != null && node.IsSelected && _MultiSelect && m_SelectedNodes.Count > 1 && Control.ModifierKeys == Keys.None) // Deselect all
+                SelectNode(node, eTreeAction.Mouse);
+            _SelectOnMouseUp = false;
+            if (node != null)
+            {
+                InvokeNodeMouseUp(new TreeNodeMouseEventArgs(node, e.Button, e.Clicks, e.Delta, mousePos.X, mousePos.Y));
+            }
+        }
+
+        private void OnNodeMouseClick(EventArgs e)
+        {
+            if (this.SelectedNode == null)
+                return;
+            MouseEventArgs me = e as MouseEventArgs;
+            if (me == null)
+            {
+                Point p = this.PointToClient(Control.MousePosition);
+                me = new MouseEventArgs(MouseButtons.Left, 1, p.X, p.Y, 0);
+            }
+
+            Point mousePos = GetLayoutPosition(me);
+            NodeHitTestInfo info = (me.Button == MouseButtons.Left && _FullRowSelect && _View == eView.Tree) ? NodeOperations.GetNodeAt(this, mousePos.Y + _AutoScrollPositionChange.Y, true, true) : NodeOperations.GetNodeAt(this, mousePos.X, mousePos.Y, true, true);
+            _AutoScrollPositionChange = Point.Empty;
+            if (info.NodeAt != null && (info.NodeAt == this.SelectedNode || info.NodeAt.IsSelected && me.Button == System.Windows.Forms.MouseButtons.Right) && !info.NodeAt.ExpandPartRectangle.Contains(mousePos))
+            {
+                InvokeNodeClick(new TreeNodeMouseEventArgs(this.SelectedNode, me.Button, me.Clicks, me.Delta, me.X, me.Y));
+                if (m_CellMouseDownCounter > 1 && me.Button == MouseButtons.Left)
+                    EditSelectedCell(eTreeAction.Mouse);
+            }
+
+            if (info.ColumnsAt != null)
+            {
+                ColumnHeader ch = GetColumnAt(mousePos.X, mousePos.Y, info.ColumnsAt);
+                if (ch != null)
+                {
+                    ch.OnClick(e);
+                }
+            }
+
+        }
+
+        internal bool EditSelectedCell(eTreeAction actionSource)
+        {
+            // Start editing if allowed
+            if (this.CellEdit && this.SelectedNode != null && this.SelectedNode.SelectedCell != null && this.SelectedNode.SelectedCell.IsEditable)
+            {
+                EditCell(this.SelectedNode.SelectedCell, actionSource);
+                return true;
+            }
+            return false;
+        }
+
+        private bool _HotTracking = false;
+        /// <summary>
+        /// Gets or sets whether node is highlighted when mouse enters the node. Default value is false.
+        /// </summary>
+        /// <remarks>
+        /// There are two ways to enable the node hot-tracking. You can set the HotTracking property to true in which case the
+        /// mouse tracking is enabled using system colors specified in TreeColorTable. You can also define the NodeStyleMouseOver 
+        /// style which gets applied to the node when mouse is over the node.
+        /// </remarks>
+        [DefaultValue(false), Category("Appearance"), Description("Indicates whether node is highlighted when mouse enters the node.")]
+        public bool HotTracking
+        {
+            get { return _HotTracking; }
+            set
+            {
+                _HotTracking = value;
+                this.Invalidate();
+            }
+        }
+
+        /// <summary>
+        /// Starts editing specified cell, places the cell into the edit mode.
+        /// </summary>
+        /// <param name="cell">Cell to start editing.</param>
+        /// <param name="action">Action that is a cause for the edit.</param>
+        internal void EditCell(Cell cell, eTreeAction action)
+        {
+            EditCell(cell, action, null);
+        }
+
+        private ICellEditControl _CellEditControl = null;
+        /// <summary>
+        /// Starts editing specified cell, places the cell into the edit mode.
+        /// </summary>
+        /// <param name="cell">Cell to start editing.</param>
+        /// <param name="action">Action that is a cause for the edit.</param>
+        /// <param name="initialText">Specifies the text to be edited instead of the text of the cell. Passing the NULL value will edit the text of the cell.</param>
+        internal void EditCell(Cell cell, eTreeAction action, string initialText)
+        {
+            if (cell == null || !cell.GetEnabled()) return;
+
+            if (m_CellEditing)
+            {
+                if (!EndCellEditing(action))
+                    return;
+            }
+
+            if (_MovingColumn)
+                throw new InvalidOperationException("Cannot initiate cell edit while column is being moved.");
+
+            CellEditEventArgs e = new CellEditEventArgs(cell, action, "");
+            OnBeforeCellEdit(e);
+            if (e.Cancel)
+                return;
+            // No editing on non-data nodes
+            if (_DataManager != null && cell.Parent.DataKey == null) return;
+
+            ICellEditControl editControl = GetCellEditor(cell);
+            if (editControl == null) return;
+
+            NodeOperations.EnsureVisible(cell);
+            this.Update();
+
+            TextBoxEx textBox = editControl as TextBoxEx;
+            Control control = editControl as Control;
+
+            Rectangle rCell = NodeDisplay.GetCellRectangle(eCellRectanglePart.TextBounds, cell, m_NodeDisplay.Offset);
+            if (rCell.IsEmpty)
+            {
+                rCell = NodeDisplay.GetCellRectangle(eCellRectanglePart.CellBounds, cell, m_NodeDisplay.Offset);
+                if (string.IsNullOrEmpty(cell.Text)) // Move edit box so its next to the actual cell
+                    rCell.X += rCell.Width;
+            }
+            rCell = GetScreenRectangle(rCell);
+            // It is important that text is assigned first or textbox will be resized to different size otherwise
+            editControl.CurrentValue = cell.Text;
+            editControl.EditWordWrap = cell.WordWrap;
+
+            Font font = CellDisplay.GetCellFont(this, cell);
+            if (m_ZoomFactor != 1 && font != null)
+            {
+                font = new Font(font.FontFamily, font.SizeInPoints * m_ZoomFactor);
+            }
+
+            control.Font = font;
+            control.Location = rCell.Location;
+            control.Size = rCell.Size;
+            control.Visible = true;
+            control.Focus();
+
+            if (textBox != null)
+            {
+                //if initial text is null then follow default behaviour of selecting all text
+                //if initial text is not null, set that as the default text and set the caret to the end of the text
+                if (initialText == null)
+                {
+                    textBox.SelectAll();
+                }
+                else
+                {
+                    textBox.Text = initialText;
+                    textBox.Select(textBox.Text.Length, 0);
+                }
+            }
+
+            PrepareCellEditor(cell, editControl);
+
+            cell.Parent.SetEditing(true);
+            m_EditedCell = cell;
+            m_CellEditing = true;
+            _CellEditControl = editControl;
+            editControl.BeginEdit();
+        }
+
+        /// <summary>
+        /// Gets whether tree is in process of moving the column in response to user finishing the column move action.
+        /// </summary>
+        [Browsable(false)]
+        public bool IsMovingColumn
+        {
+            get { return _MovingColumn; }
+        }
+
+        /// <summary>
+        /// Called just before cell editor is released for editing.
+        /// </summary>
+        /// <param name="cell">Reference to the cell being edited.</param>
+        /// <param name="editControl">Reference to the editor control.</param>
+        protected virtual void PrepareCellEditor(Cell cell, ICellEditControl editControl)
+        {
+            OnPrepareCellEditorControl(new PrepareCellEditorEventArgs(cell, editControl));
+        }
+
+        protected virtual void OnPrepareCellEditorControl(PrepareCellEditorEventArgs e)
+        {
+            PrepareCellEditorEventHandler h = PrepareCellEditorControl;
+            if (h != null) h(this, e);
+        }
+
+        /// <summary>
+        /// Raises the ProvideCustomCellEditor event.
+        /// </summary>
+        /// <param name="e">Event arguments.</param>
+        protected virtual void OnProvideCustomCellEditor(CustomCellEditorEventArgs e)
+        {
+            CustomCellEditorEventHandler handler = ProvideCustomCellEditor;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        /// <summary>
+        /// Ends cell editing.
+        /// </summary>
+        /// <param name="action">Specifies which action is cause for end of the editing.</param>
+        /// <returns>Returns true if edits were applied to the cell or false otherwise.</returns>
+        internal bool EndCellEditing(eTreeAction action)
+        {
+            return EndCellEditing(action, false);
+        }
+
+        private bool _CellEditEnding = false;
+        /// <summary>
+        /// Ends cell editing.
+        /// </summary>
+        /// <param name="action">Specifies which action is cause for end of the editing.</param>
+        /// <returns>Returns true if edits were applied to the cell or false otherwise.</returns>
+        internal bool EndCellEditing(eTreeAction action, bool cancelEdit)
+        {
+            Cell editedCell = m_EditedCell;
+            if (editedCell == null || _CellEditControl == null)
+            {
+                m_CellEditing = false;
+                return true;
+            }
+            ICellEditControl editControl = _CellEditControl;
+            Control control = editControl as Control;
+
+            string text = editControl.CurrentValue.ToString();
+
+            CellEditEventArgs e = new CellEditEventArgs(editedCell, action, text, cancelEdit, editControl);
+            InvokeCellEditEnding(e);
+            if (e.Cancel)
+                return false;
+            this.Focus();
+            control.Visible = false;
+
+            text = e.NewText;
+            InvokeAfterCellEdit(e);
+            text = e.NewText;
+
+            if (!e.Cancel && editedCell.Text != text && !cancelEdit)
+            {
+                if (this.DesignMode && editedCell.Parent.Cells[0] == editedCell)
+                    TypeDescriptor.GetProperties(editedCell.Parent)["Text"].SetValue(editedCell.Parent, text);
+                else
+                    TypeDescriptor.GetProperties(editedCell)["Text"].SetValue(editedCell, text);
+                this.BeginUpdate();
+                this.RecalcLayout();
+                this.EndUpdate();
+            }
+
+            editedCell.Parent.SetEditing(false);
+
+            // Try to apply to data-binding
+            if (_DataSource != null)
+            {
+                object item = editedCell.Parent.DataKey;
+                string fieldName = this.Columns[editedCell.Parent.Cells.IndexOf(editedCell)].DataFieldName;
+                if (item != null)
+                {
+                    IEditableObject editableObject = item as IEditableObject;
+                    PropertyDescriptor descriptor;
+                    if (_DataManager != null)
+                        descriptor = _DataManager.GetItemProperties().Find(fieldName, true);
+                    else
+                        descriptor = TypeDescriptor.GetProperties(item).Find(fieldName, true);
+
+                    if (descriptor != null)
+                    {
+                        if (_EnableDataPositionChange && _DataManager != null && _DataManager.Position != editedCell.Parent.BindingIndex)
+                            _DataManager.Position = editedCell.Parent.BindingIndex;
+                        if (editableObject != null)
+                            editableObject.BeginEdit();
+
+                        descriptor.SetValue(item, text);
+
+                        if (editableObject != null)
+                            editableObject.EndEdit();
+                    }
+                }
+            }
+
+            m_EditedCell = null;
+            m_CellEditing = false;
+
+            OnAfterCellEditComplete(e);
+
+            if (editControl != m_EditTextBox)
+            {
+                this.Controls.Remove(control);
+                editControl.EditComplete -= new EventHandler(EditControlEndEdit);
+                editControl.CancelEdit -= new EventHandler(EditControlCancelEdit);
+            }
+            editControl.EndEdit();
+
+            return true;
+        }
+
+        /// <summary>
+        /// Raises the AfterCellEditComplete event.
+        /// </summary>
+        /// <param name="e">Provides information about event.</param>
+        protected virtual void OnAfterCellEditComplete(CellEditEventArgs e)
+        {
+            CellEditEventHandler eh = AfterCellEditComplete;
+            if (eh != null) eh(this, e);
+        }
+
+        /// <summary>
+        /// Cancels the cell editing if it is in progress.
+        /// </summary>
+        /// <param name="action">Specifies which action is cause for canceling of editing.</param>
+        internal void CancelCellEdit(eTreeAction action)
+        {
+            if (m_EditedCell == null)
+                return;
+
+            if (m_EditTextBox != null)
+                m_EditTextBox.Text = m_EditedCell.Text;
+            else
+            {
+                ICellEditControl editControl = _CellEditControl;
+                if (editControl != null)
+                    editControl.CurrentValue = m_EditedCell.Text;
+            }
+            this.EndCellEditing(action, true);
+        }
+
+        private ICellEditControl GetCellEditor(Cell cell)
+        {
+            eCellEditorType editorType = cell.GetEffectiveEditorType();
+            ICellEditControl editor = null;
+
+            if (editorType == eCellEditorType.Default)
+            {
+                editor = GetTextBoxEditor();
+                if (editor is TextBox)
+                {
+                    ColumnHeader header = NodeOperations.GetCellColumnHeader(this, cell);
+                    if (header != null)
+                        ((TextBox)editor).MaxLength = header.MaxInputLength;
+                    else
+                        ((TextBox)editor).MaxLength = 0;
+                }
+            }
+#if FRAMEWORK20
+            else if (editorType == eCellEditorType.NumericInteger)
+            {
+                IntegerCellEditor edit = new IntegerCellEditor();
+                edit.ShowUpDown = true;
+                editor = edit;
+            }
+            else if (editorType == eCellEditorType.NumericDouble)
+            {
+                DoubleCellEditor edit = new DoubleCellEditor();
+                edit.ShowUpDown = true;
+                editor = edit;
+            }
+            else if (editorType == eCellEditorType.NumericCurrency)
+            {
+                DoubleCellEditor edit = new DoubleCellEditor();
+                edit.DisplayFormat = "C";
+                edit.ShowUpDown = true;
+                editor = edit;
+            }
+            else if (editorType == eCellEditorType.Date)
+            {
+                DateTimeCellEditor edit = new DateTimeCellEditor();
+                edit.Format = DevComponents.Editors.eDateTimePickerFormat.Short;
+                edit.ButtonDropDown.Visible = true;
+                editor = edit;
+            }
+            else if (editorType == eCellEditorType.Time)
+            {
+                DateTimeCellEditor edit = new DateTimeCellEditor();
+                edit.Format = DevComponents.Editors.eDateTimePickerFormat.ShortTime;
+                edit.ButtonDropDown.Visible = true;
+                editor = edit;
+            }
+            else if (editorType == eCellEditorType.DateTime)
+            {
+                DateTimeCellEditor edit = new DateTimeCellEditor();
+                edit.Format = DevComponents.Editors.eDateTimePickerFormat.Custom;
+                CultureInfo currentCulture = DevComponents.Editors.DateTimeAdv.DateTimeInput.GetActiveCulture();
+                edit.CustomFormat = currentCulture.DateTimeFormat.ShortDatePattern + " " + currentCulture.DateTimeFormat.ShortTimePattern;
+                edit.DateTimeSelectorVisibility = DevComponents.Editors.DateTimeAdv.eDateTimeSelectorVisibility.Both;
+                edit.ButtonDropDown.Visible = true;
+                editor = edit;
+            }
+#endif
+            else if (editorType == eCellEditorType.Custom)
+            {
+                CustomCellEditorEventArgs e = new CustomCellEditorEventArgs(cell);
+                OnProvideCustomCellEditor(e);
+                if (e.EditControl == null)
+                    throw new ArgumentNullException("CustomCellEditorEventArgs.EditControl must be set to the custom cell editor.");
+
+                editor = e.EditControl;
+            }
+
+            if (editor == null)
+                throw new NotImplementedException("Editor type " + editorType.ToString() + " not implemented.");
+
+            if (((Control)editor).Parent != this)
+            {
+                this.Controls.Add((Control)editor);
+                editor.EditComplete += new EventHandler(EditControlEndEdit);
+                editor.CancelEdit += new EventHandler(EditControlCancelEdit);
+            }
+
+            return editor;
+        }
+
+        private TextBoxEx GetTextBoxEditor()
+        {
+            if (m_EditTextBox == null)
+            {
+                m_EditTextBox = new TextBoxEx();
+                m_EditTextBox.Name = "DefaultCellEditor";
+                m_EditTextBox.AutoSize = false;
+                m_EditTextBox.PreventEnterBeep = true;
+                this.Controls.Add(m_EditTextBox);
+                m_EditTextBox.EditComplete += new EventHandler(EditControlEndEdit);
+                m_EditTextBox.CancelEdit += new EventHandler(EditControlCancelEdit);
+            }
+            return m_EditTextBox;
+        }
+
+        private void EditControlEndEdit(object sender, EventArgs e)
+        {
+            if (m_EditedCell == null)
+                return;
+
+            this.EndCellEditing(eTreeAction.Keyboard);
+        }
+
+        private void EditControlCancelEdit(object sender, EventArgs e)
+        {
+            CancelCellEdit(eTreeAction.Keyboard);
+        }
+
+        private void UpdateTreeCursor()
+        {
+            if (m_MouseOverCell != null)
+            {
+                if (m_MouseOverCell.Cursor != null && this.Cursor != m_MouseOverCell.Cursor)
+                {
+                    if (m_OriginalCursor == null)
+                        m_OriginalCursor = this.Cursor;
+                    this.Cursor = m_MouseOverCell.Cursor;
+                }
+                else if (m_DefaultCellCursor != null && this.Cursor != m_DefaultCellCursor)
+                {
+                    if (m_OriginalCursor == null)
+                        m_OriginalCursor = this.Cursor;
+                    this.Cursor = m_DefaultCellCursor;
+                }
+            }
+            else if (m_OriginalCursor != null)
+            {
+                this.Cursor = m_OriginalCursor;
+                m_OriginalCursor = null;
+            }
+        }
+
+        private Cell GetCellAt(Node node, int x, int y, Point offset)
+        {
+            Cell cellAt = null;
+            Rectangle r = NodeDisplay.GetNodeRectangle(eNodeRectanglePart.NodeBounds, node, offset);
+            foreach (Cell cell in node.Cells)
+            {
+                if (!cell.IsVisible) continue;
+                Rectangle rCell = cell.BoundsRelative;
+                //rCell.Offset(offset);
+                rCell.Offset(r.Location);
+                if (rCell.Contains(x, y))
+                {
+                    cellAt = cell;
+                    break;
+                }
+            }
+            return cellAt;
+        }
+
+        private bool OnNodeMouseMove(Node node, MouseEventArgs e, Point offset)
+        {
+            Point mousePos = GetLayoutPosition(e);
+            InvokeNodeMouseMove(new TreeNodeMouseEventArgs(node, e.Button, e.Clicks, e.Delta, mousePos.X, mousePos.Y));
+
+            Rectangle r = NodeDisplay.GetNodeRectangle(eNodeRectanglePart.ExpandHitTestBounds, node, offset);
+            bool bUpdate = false;
+            if (r.Contains(mousePos) && node.ExpandVisibility != eNodeExpandVisibility.Hidden)
+            {
+                node.MouseOverNodePart = eMouseOverNodePart.Expand;
+                if (m_MouseOverCell != null)
+                {
+                    bUpdate |= SetMouseOverCell(null);
+                }
+                bUpdate = true;
+            }
+            else if (node.MouseOverNodePart == eMouseOverNodePart.Expand)
+            {
+                node.MouseOverNodePart = eMouseOverNodePart.Node;
+                bUpdate = true;
+            }
+
+            r = NodeDisplay.GetNodeRectangle(eNodeRectanglePart.CommandBounds, node, offset);
+            if (r.Contains(mousePos))
+            {
+                node.MouseOverNodePart = eMouseOverNodePart.Command;
+                if (m_MouseOverCell != null)
+                {
+                    bUpdate |= SetMouseOverCell(null);
+                }
+                bUpdate = true;
+            }
+            else if (node.MouseOverNodePart != eMouseOverNodePart.Expand)
+            {
+                if (node.MouseOverNodePart != eMouseOverNodePart.Node)
+                {
+                    node.MouseOverNodePart = eMouseOverNodePart.Node;
+                    bUpdate = true;
+                }
+                Cell cell = GetCellAt(node, mousePos.X, mousePos.Y, offset);
+
+                if (cell != null)
+                {
+                    bUpdate |= SetMouseOverCell(cell);
+                }
+            }
+
+            if (bUpdate)
+                InvalidateNode(node);
+            return bUpdate;
+        }
+        //
+        //		private class MouseOverInfo
+        //		{
+        //			public DevComponents.AdvTree.Node Node=null;
+        //			public DevComponents.AdvTree.Cell Cell=null;
+        //			MouseOverInfo()
+        //			{
+        //				this.Node=null;
+        //				this.Cell=null;
+        //			}
+        //		}
+
+        private void OnSelectionBoxChanged()
+        {
+            if (this.SelectedNode != null)
+            {
+                InvalidateNode(this.SelectedNode);
+                this.Update();
+            }
+        }
+
+        //private Color GetDefaultSelectionBoxBorderColor()
+        //{
+        //    return Color.FromArgb(96,SystemColors.Highlight);
+        //}
+
+        //private Color GetDefaultSelectionBoxFillColor()
+        //{
+        //    return Color.FromArgb(64,SystemColors.Highlight);
+        //}
+
+        private void OnCommandButtonChanged()
+        {
+            _LayoutSettings.CommandAreaWidth = m_CommandWidth;
+            this.RecalcLayout();
+        }
+
+        private void InvokeCellEditEnding(CellEditEventArgs e)
+        {
+            if (CellEditEnding != null)
+                CellEditEnding(this, e);
+        }
+
+        private void InvokeAfterCellEdit(CellEditEventArgs e)
+        {
+            if (AfterCellEdit != null)
+                AfterCellEdit(this, e);
+        }
+
+        /// <summary>
+        /// Raises BeforeNodeInsert event
+        /// </summary>
+        /// <param name="node">Node that is about to be inserted</param>
+        /// <param name="action">Source of the event</param>
+        internal protected virtual void InvokeBeforeNodeInsert(eTreeAction action, Node node, Node parentNode)
+        {
+            if (BeforeNodeInsert != null)
+            {
+                TreeNodeCollectionEventArgs e = new TreeNodeCollectionEventArgs(action, node, parentNode);
+                BeforeNodeInsert(this, e);
+            }
+        }
+
+        /// <summary>
+        /// Raises AfterNodeInsert event
+        /// </summary>
+        /// <param name="node">Node that is inserted</param>
+        /// <param name="action">Source of the event</param>
+        internal protected virtual void InvokeAfterNodeInsert(eTreeAction action, Node node, Node parentNode)
+        {
+            if (AfterNodeInsert != null)
+            {
+                TreeNodeCollectionEventArgs e = new TreeNodeCollectionEventArgs(action, node, parentNode);
+                AfterNodeInsert(this, e);
+            }
+        }
+
+        /// <summary>
+        /// Raises BeforeNodeRemove event
+        /// </summary>
+        /// <param name="node">Node that is about to be removed</param>
+        /// <param name="action">Source of the event</param>
+        internal protected virtual void InvokeBeforeNodeRemove(eTreeAction action, Node node, Node parentNode)
+        {
+            if (BeforeNodeRemove != null)
+            {
+                TreeNodeCollectionEventArgs e = new TreeNodeCollectionEventArgs(action, node, parentNode);
+                BeforeNodeRemove(this, e);
+            }
+        }
+
+        /// <summary>
+        /// Raises AfterNodeRemove event
+        /// </summary>
+        /// <param name="node">Node that is removed</param>
+        /// <param name="action">Source of the event</param>
+        internal protected virtual void InvokeAfterNodeRemove(eTreeAction action, Node node, Node parentNode)
+        {
+            if (AfterNodeRemove != null)
+            {
+                TreeNodeCollectionEventArgs e = new TreeNodeCollectionEventArgs(action, node, parentNode);
+                AfterNodeRemove(this, e);
+            }
+        }
+
+        /// <summary>
+        /// Called after node has been removed
+        /// </summary>
+        /// <param name="node">Node that is removed</param>
+        /// <param name="action">Source of the event</param>
+        internal protected virtual void NodeRemoved(eTreeAction action, Node node, Node parentNode, int indexOfRemovedNode)
+        {
+            InvokeAfterNodeRemove(action, node, parentNode);
+
+            if (m_NodeDisplay != null) m_NodeDisplay.PaintedNodes.Clear();
+
+            if (!this.IsDisposed)
+                RecalcLayout();
+
+            if (!this.IsUpdateSuspended)
+            {
+                bool updateSelection = false;
+                if (node.IsSelected)
+                    updateSelection = true;
+                else
+                {
+                    Node n = this.SelectedNode;
+                    while (n != null)
+                    {
+                        if (n != null && n == node)
+                        {
+                            updateSelection = true;
+                            break;
+                        }
+                        n = n.Parent;
+                    }
+                }
+
+                if (updateSelection)
+                {
+                    Node refNode = parentNode;
+                    bool selectFirst = true;
+                    if (parentNode != null)
+                    {
+                        if (parentNode.Nodes.Count > 0)
+                        {
+                            if (indexOfRemovedNode >= parentNode.Nodes.Count)
+                                indexOfRemovedNode = parentNode.Nodes.Count - 1;
+                            refNode = parentNode.Nodes[indexOfRemovedNode];
+                            if (refNode.CanSelect)
+                            {
+                                this.SelectNode(refNode, action);
+                                selectFirst = false;
+                                refNode = null;
+                            }
+                        }
+                        else
+                        {
+                            if (refNode.CanSelect)
+                            {
+                                this.SelectNode(refNode, action);
+                                selectFirst = false;
+                                refNode = null;
+                            }
+                        }
+
+                        if (refNode != null)
+                        {
+                            while (refNode != null)
+                            {
+                                refNode = NodeOperations.GetPreviousVisibleNode(refNode);
+                                if (refNode != null && refNode.CanSelect)
+                                {
+                                    this.SelectNode(refNode, action);
+                                    selectFirst = false;
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                    else
+                    {
+                        int startIndex = indexOfRemovedNode;
+                        if (this.Nodes.Count == indexOfRemovedNode) startIndex--;
+                        if (startIndex > 0 && this.Nodes.Count > startIndex)
+                        {
+                            for (int i = startIndex; i >= 0; i--)
+                            {
+                                refNode = this.Nodes[i];
+                                if (refNode.CanSelect && refNode.Visible && refNode.Enabled)
+                                {
+                                    this.SelectNode(refNode, action);
+                                    selectFirst = false;
+                                    break;
+                                }
+                            }
+                        }
+                    }
+
+                    if (selectFirst && !SelectFirstNode(action))
+                        this.SelectNode(null, action);
+                }
+                this.Invalidate();
+            }
+            else
+            {
+                if (node.IsSelected)
+                {
+                    if (MultiSelect)
+                        this.SelectedNodes.Remove(node, action);
+                    else
+                        this.SelectNode(null, action);
+                }
+            }
+        }
+
+        private bool SelectFirstNode(eTreeAction action)
+        {
+            bool selected = false;
+            foreach (Node node in this.Nodes)
+            {
+                if (node.Selectable && node.Visible && node.Enabled)
+                {
+                    this.SelectNode(node, action);
+                    if (this.SelectedNode == node)
+                    {
+                        return true;
+                    }
+                }
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// Invokes BeforeNodeDrop event. If overriden base implementation must be called in order for event to fire.
+        /// </summary>
+        /// <param name="e">Provides information about event</param>
+        protected virtual void InvokeBeforeNodeDrop(TreeDragDropEventArgs e)
+        {
+            if (BeforeNodeDrop != null)
+                BeforeNodeDrop(this, e);
+        }
+
+        /// <summary>
+        /// Invokes AfterNodeDrop event. If overridden base implementation must be called in order for event to fire.
+        /// </summary>
+        /// <param name="e">Provides information about event</param>
+        protected virtual void InvokeAfterNodeDrop(TreeDragDropEventArgs e)
+        {
+            if (AfterNodeDrop != null)
+                AfterNodeDrop(this, e);
+        }
+
+        /// <summary>
+        /// Invokes NodeMouseDown event. If overridden base implementation must be called in order for event to fire.
+        /// </summary>
+        /// <param name="e">Provides information about event</param>
+        protected virtual void InvokeNodeMouseDown(TreeNodeMouseEventArgs e)
+        {
+            if (e.Node != null)
+                e.Node.InvokeNodeMouseDown(this, new MouseEventArgs(e.Button, e.Clicks, e.X, e.Y, e.Delta));
+
+            if (NodeMouseDown != null)
+                NodeMouseDown(this, e);
+        }
+
+        /// <summary>
+        /// Invokes NodeMouseUp event. If overridden base implementation must be called in order for event to fire.
+        /// </summary>
+        /// <param name="e">Provides information about event</param>
+        protected virtual void InvokeNodeMouseUp(TreeNodeMouseEventArgs e)
+        {
+            if (e.Node != null)
+                e.Node.InvokeNodeMouseUp(this, new MouseEventArgs(e.Button, e.Clicks, e.X, e.Y, e.Delta));
+
+            if (NodeMouseUp != null)
+                NodeMouseUp(this, e);
+        }
+
+        /// <summary>
+        /// Invokes NodeMouseMove event. If overridden base implementation must be called in order for event to fire.
+        /// </summary>
+        /// <param name="e">Provides information about event</param>
+        protected virtual void InvokeNodeMouseMove(TreeNodeMouseEventArgs e)
+        {
+            if (e.Node != null)
+                e.Node.InvokeNodeMouseMove(this, new MouseEventArgs(e.Button, e.Clicks, e.X, e.Y, e.Delta));
+
+            if (NodeMouseMove != null)
+                NodeMouseMove(this, e);
+        }
+
+        internal void InternalInvokeNodeClick(TreeNodeMouseEventArgs e)
+        {
+            InvokeNodeClick(e);
+        }
+        /// <summary>
+        /// Invokes NodeClick event. If overridden base implementation must be called in order for event to fire.
+        /// </summary>
+        /// <param name="e">Provides information about event</param>
+        protected virtual void InvokeNodeClick(TreeNodeMouseEventArgs e)
+        {
+            if (e.Node != null)
+                e.Node.InvokeNodeClick(this, e);
+
+            if (NodeClick != null)
+                NodeClick(this, e);
+        }
+
+        /// <summary>
+        /// Invokes NodeDoubleClick event. If overridden base implementation must be called in order for event to fire.
+        /// </summary>
+        /// <param name="e">Provides information about event</param>
+        protected virtual void InvokeNodeDoubleClick(TreeNodeMouseEventArgs e)
+        {
+            if (e.Node != null)
+                e.Node.InvokeNodeDoubleClick(this, e);
+
+            if (NodeDoubleClick != null)
+                NodeDoubleClick(this, e);
+        }
+
+        /// <summary>
+        /// Invokes NodeMouseEnter event.  If overriden base implementation must be called in order for event to fire.
+        /// </summary>
+        /// <param name="e">Provides information about event</param>
+        protected virtual void InvokeNodeMouseEnter(TreeNodeMouseEventArgs e)
+        {
+            if (e.Node != null)
+                e.Node.InvokeNodeMouseEnter(this, e);
+
+            if (NodeMouseEnter != null)
+                NodeMouseEnter(this, e);
+        }
+
+        /// <summary>
+        /// Invokes NodeMouseLeave event.  If overriden base implementation must be called in order for event to fire.
+        /// </summary>
+        /// <param name="e">Provides information about event</param>
+        protected virtual void InvokeNodeMouseLeave(TreeNodeMouseEventArgs e)
+        {
+            if (e.Node != null)
+                e.Node.InvokeNodeMouseLeave(this, e);
+
+            if (NodeMouseLeave != null)
+                NodeMouseLeave(this, e);
+        }
+
+        /// <summary>
+        /// Invokes NodeMouseHover event.  If overriden base implementation must be called in order for event to fire.
+        /// </summary>
+        /// <param name="e">Provides information about event</param>
+        protected virtual void InvokeNodeMouseHover(TreeNodeMouseEventArgs e)
+        {
+            if (e.Node != null)
+                e.Node.InvokeNodeMouseHover(this, e);
+
+            if (NodeMouseHover != null)
+                NodeMouseHover(this, e);
+        }
+
+        private bool FireHoverEvent
+        {
+            get { return NodeMouseHover != null; }
+        }
+        #endregion
+
+        #region INodeNotify
+        void INodeNotify.ExpandedChanged(Node node)
+        {
+            if (!node.Expanded)
+                ValidateSelectedNode();
+            if (!this.IsUpdateSuspended)
+            {
+                this.RecalcLayout();
+                this.Refresh();
+            }
+        }
+
+        #endregion
+
+        #region Public Interface
+        private eView _View = eView.Tree;
+        /// <summary>
+        /// Gets or sets how control positions the items. Default value is standard TreeView layout.
+        /// </summary>
+        [DefaultValue(eView.Tree), Category("Appearance"), Description("Indicates how control positions the items.")]
+        public eView View
+        {
+            get { return _View; }
+            set
+            {
+                if (value != _View)
+                {
+                    eView oldValue = _View;
+                    _View = value;
+                    OnViewChanged(oldValue, value);
+                }
+            }
+        }
+        private void OnViewChanged(eView oldValue, eView newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("View"));
+            if (newValue == eView.Tree)
+            {
+                m_NodeLayout = new NodeTreeLayout(this, this.ClientRectangle, _LayoutSettings);
+                //m_NodeLayout.NodeVerticalSpacing = _NodeSpacing;
+            }
+            else if (newValue == eView.Tile)
+            {
+                m_NodeLayout = new NodeTileLayout(this, this.ClientRectangle, _LayoutSettings);
+                //m_NodeLayout.NodeHorizontalSpacing = 8;
+                //m_NodeLayout.NodeVerticalSpacing = 8;
+                //m_NodeLayout.NodeVerticalSpacing = _NodeSpacing;
+            }
+            InvalidateNodesSize();
+            RecalcLayout();
+        }
+
+        private static readonly Color DefaultTileGroupLineColor = ColorScheme.GetColor(0xE2E2E2);
+        private Color _TileGroupLineColor = DefaultTileGroupLineColor;
+        /// <summary>
+        /// Gets or sets the color of the group divider line when in tile view.  
+        /// </summary>
+        [Category("Columns"), Description("Indicates color of the group divider line when in tile view.")]
+        public Color TileGroupLineColor
+        {
+            get { return _TileGroupLineColor; }
+            set
+            {
+                _TileGroupLineColor = value;
+                if (_View == eView.Tile)
+                    this.Invalidate();
+            }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeTileGroupLineColor()
+        {
+            return !ColorFunctions.IsEqual(DefaultTileGroupLineColor, _TileGroupLineColor);
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetTileGroupLineColor()
+        {
+            this.TileGroupLineColor = DefaultTileGroupLineColor;
+        }
+
+        /// <summary>
+        /// Save nodes to XmlDocument. New Node AdvTree is created and nodes are serialized into it.
+        /// </summary>
+        /// <param name="document">Reference to an instance of XmlDocument object</param>
+        public void Save(XmlDocument document)
+        {
+            TreeSerializer.Save(this, document);
+        }
+
+        /// <summary>
+        /// Saves nodes to a file.
+        /// </summary>
+        /// <param name="fileName">File name to save nodes to.</param>
+        public void Save(string fileName)
+        {
+            TreeSerializer.Save(this, fileName);
+        }
+
+        /// <summary>
+        /// Saves nodes to specified stream.
+        /// </summary>
+        /// <param name="outStream">Stream to save nodes to.</param>
+        public void Save(Stream outStream)
+        {
+            TreeSerializer.Save(this, outStream);
+        }
+
+        /// <summary>
+        /// Saves nodes to specified writer.
+        /// </summary>
+        /// <param name="writer">Writer to save nodes to.</param>
+        public void Save(TextWriter writer)
+        {
+            TreeSerializer.Save(this, writer);
+        }
+
+        /// <summary>
+        /// Saves nodes to specified writer.
+        /// </summary>
+        /// <param name="writer">Writer to save nodes to.</param>
+        public void Save(XmlWriter writer)
+        {
+            TreeSerializer.Save(this, writer);
+        }
+
+        /// <summary>
+        /// Load nodes from file.
+        /// </summary>
+        /// <param name="fileName">File to load nodes from</param>
+        public void Load(string fileName)
+        {
+            TreeSerializer.Load(this, fileName);
+        }
+
+        /// <summary>
+        /// Load nodes from stream.
+        /// </summary>
+        /// <param name="inStream">Stream to load from</param>
+        public void Load(Stream inStream)
+        {
+            TreeSerializer.Load(this, inStream);
+        }
+
+        /// <summary>
+        /// Load nodes from reader.
+        /// </summary>
+        /// <param name="reader">Reader to load from.</param>
+        public void Load(XmlReader reader)
+        {
+            TreeSerializer.Load(this, reader);
+        }
+
+        /// <summary>
+        /// Load nodes from reader.
+        /// </summary>
+        /// <param name="reader">Reader to load from.</param>
+        public void Load(TextReader reader)
+        {
+            TreeSerializer.Load(this, reader);
+        }
+
+        /// <summary>
+        /// Load nodes from an XmlDocument object.
+        /// </summary>
+        /// <param name="document">Document to load Nodes from.</param>
+        public void Load(XmlDocument document)
+        {
+            TreeSerializer.Load(this, document);
+        }
+
+        /// <summary>
+        /// Forces the control to invalidate its client area and immediately redraw itself
+        /// and any child controls. Note however that this method will node do anything if refresh
+        /// is suspended as result of call to BeginUpdate method without corresponding EndUpdate
+        /// call or if SuspendPaint property is set to true.
+        /// </summary>
+        public override void Refresh()
+        {
+            if (!this.IsUpdateSuspended && !this.SuspendPaint)
+                base.Refresh();
+        }
+
+        ///// <summary>
+        ///// Sets the node map position when tree is in Map layout mode. The node's position
+        ///// can be set only for the sub-root nodes, i.e. nodes that are parented directly to
+        ///// top-level root node. Setting map position for any other node does not have any effect.
+        ///// </summary>
+        ///// <remarks>
+        ///// 	<para>Note that setting map position explicitly can change the position for other
+        /////     nodes that are on the same level as the node that you pass into this method. Since
+        /////     Map mode layouts the nodes clock-wise, setting the node position to Near will cause
+        /////     all nodes that are in collection <strong>after</strong> the reference node to be
+        /////     positioned Near as well.</para>
+        ///// 	<para>Similarly, setting the node position to Far will cause all nodes that are in
+        /////     collection <strong>before</strong> the reference node to be positioned Far as
+        /////     well.</para>
+        ///// </remarks>
+        ///// <param name="node">Sub-root node to set layout position for.</param>
+        ///// <param name="position">The position relative to the root node should take</param>
+        //public void SetNodeMapPosition(Node node, eMapPosition position)
+        //{
+        //    if(node==null || node.Parent==null)
+        //        return;
+
+        //    if(position==eMapPosition.Default)
+        //    {
+        //        node.SetMapSubRootPosition(position);
+        //    }
+        //    else if(position==eMapPosition.Near)
+        //    {
+        //        int start=node.Parent.Nodes.IndexOf(node);
+        //        int end=node.Parent.Nodes.Count;
+        //        for(int i=start;i<end;i++)
+        //            node.Parent.Nodes[i].SetMapSubRootPosition(position);
+        //    }
+        //    else if(position==eMapPosition.Far)
+        //    {
+        //        int start=node.Parent.Nodes.IndexOf(node);
+        //        for(int i=start;i>=0;i--)
+        //            node.Parent.Nodes[i].SetMapSubRootPosition(position);
+        //    }
+        //}
+
+        private bool _ProcessingSortRequests = false;
+        private void ProcessSortRequests()
+        {
+            if (_ProcessingSortRequests) return;
+            _ProcessingSortRequests = true;
+            try
+            {
+                if (_TopLevelSortRequest)
+                {
+                    _TopLevelSortRequest = false;
+                    if (m_Columns.IsSorted)
+                        m_Columns.UpdateSort();
+                }
+                if (_SortRequestNodes.Count > 0)
+                {
+                    foreach (Node sortRequestNode in _SortRequestNodes)
+                    {
+                        if (sortRequestNode.NodesColumns.IsSorted)
+                            sortRequestNode.NodesColumns.UpdateSort();
+                    }
+                    _SortRequestNodes.Clear();
+                }
+            }
+            finally
+            {
+                _ProcessingSortRequests = false;
+            }
+        }
+
+        private List<Node> _SortRequestNodes = new List<Node>();
+        private bool _TopLevelSortRequest = false;
+        internal void PushSortRequest()
+        {
+            PushSortRequest(null);
+        }
+        internal void PushSortRequest(Node parentNode)
+        {
+            if (parentNode == null)
+                _TopLevelSortRequest = true;
+            else if (!_SortRequestNodes.Contains(parentNode))
+                _SortRequestNodes.Add(parentNode);
+        }
+
+        /// <summary>
+        /// Disables any redrawing of the tree control. To maintain performance while items
+        /// are added one at a time to the control, call the BeginUpdate method. The BeginUpdate
+        /// method prevents the control from painting until the
+        /// <see cref="EndUpdate">EndUpdate</see> method is called.
+        /// </summary>
+        public void BeginUpdate()
+        {
+            m_UpdateSuspended++;
+        }
+
+        /// <summary>
+        /// Enables the redrawing of the tree view. To maintain performance while items are
+        /// added one at a time to the control, call the <see cref="BeginUpdate">BeginUpdate</see>
+        /// method. The BeginUpdate method prevents the control from painting until the EndUpdate
+        /// method is called.
+        /// </summary>
+        /// <remarks>
+        /// Call to EndUpdate will enable the layout and painting in tree control. If there
+        /// are any pending layouts the EndUpdate will call
+        /// <see cref="RecalcLayout">RecalcLayout</see> method to perform the layout and it will
+        /// repaint the control.
+        /// </remarks>
+        public void EndUpdate()
+        {
+            EndUpdate(true);
+        }
+
+        /// <summary>
+        /// Enables the redrawing of the tree view. To maintain performance while items are
+        /// added one at a time to the control, call the <see cref="BeginUpdate">BeginUpdate</see>
+        /// method. The BeginUpdate method prevents the control from painting until the EndUpdate
+        /// method is called.
+        /// </summary>
+        /// <param name="performLayoutAndRefresh">Gets or sets whether layout and refresh of control is performed if there are no other update blocks pending.</param>
+        public void EndUpdate(bool performLayoutAndRefresh)
+        {
+            if (m_UpdateSuspended > 0) m_UpdateSuspended--;
+            if (m_UpdateSuspended == 0 && performLayoutAndRefresh)
+            {
+                this.RecalcLayout();
+                this.Invalidate(true);
+            }
+        }
+
+        /// <summary>
+        /// Retrieves the tree node that is at the specified location.
+        /// </summary>
+        /// <returns>The Node at the specified point, in tree view coordinates.</returns>
+        /// <remarks>
+        /// 	<para>You can pass the MouseEventArgs.X and MouseEventArgs.Y coordinates of the
+        ///     MouseDown event as the x and y parameters.</para>
+        /// </remarks>
+        /// <param name="p">The Point to evaluate and retrieve the node from.</param>
+        public Node GetNodeAt(Point p)
+        {
+            return GetNodeAt(p.X, p.Y);
+        }
+
+        /// <summary>
+        /// Retrieves the tree node that is at the specified location.
+        /// </summary>
+        /// <returns>The TreeNode at the specified location, in tree view coordinates.</returns>
+        /// <remarks>
+        /// 	<para>You can pass the MouseEventArgs.X and MouseEventArgs.Y coordinates of the
+        ///     MouseDown event as the x and y parameters.</para>
+        /// </remarks>
+        /// <param name="x">The X position to evaluate and retrieve the node from.</param>
+        /// <param name="y">The Y position to evaluate and retrieve the node from.</param>
+        public Node GetNodeAt(int x, int y)
+        {
+            return NodeOperations.GetNodeAt(this, x, y).NodeAt;
+        }
+
+        /// <summary>
+        /// Retrieves the tree node that is at the specified location.
+        /// </summary>
+        /// <returns>The TreeNode at the specified location, in tree view coordinates.</returns>
+        /// <remarks>
+        /// 	<para>You can pass the MouseEventArgs.X and MouseEventArgs.Y coordinates of the
+        ///     MouseDown event as the x and y parameters.</para>
+        /// </remarks>
+        /// <param name="x">The X position to evaluate and retrieve the node from.</param>
+        /// <param name="y">The Y position to evaluate and retrieve the node from.</param>
+        /// <param name="displayedOnly">Whether to enumerated displayed nodes only.</param>
+        public Node GetNodeAt(int x, int y, bool displayedOnly)
+        {
+            return NodeOperations.GetNodeAt(this, x, y, displayedOnly).NodeAt;
+        }
+
+        /// <summary>
+        /// Retrieves the tree node that is at the specified vertical location.
+        /// </summary>
+        /// <returns>The TreeNode at the specified location, in tree view coordinates.</returns>
+        /// <remarks>
+        /// 	<para>You can pass the MouseEventArgs.Y coordinates of the
+        ///     MouseDown event as the y parameter.</para>
+        /// </remarks>
+        /// <param name="y">The Y position to evaluate and retrieve the node from.</param>
+        public Node GetNodeAt(int y)
+        {
+            return NodeOperations.GetNodeAt(this, y).NodeAt;
+        }
+
+        /// <summary>
+        /// Retrieves the node cell that is at the specified location.
+        /// </summary>
+        /// <param name="p">The Point to evaluate and retrieve the cell from.</param>
+        /// <returns>The Cell at the specified point, in tree view coordinates.</returns>
+        public Cell GetCellAt(Point p)
+        {
+            return GetCellAt(p.X, p.Y);
+        }
+
+        /// <summary>
+        /// Retrieves the node cell that is at the specified location.
+        /// </summary>
+        /// <param name="x">The X position to evaluate and retrieve the cell from.</param>
+        /// <param name="y">The Y position to evaluate and retrieve the cell from.</param>
+        /// <returns>The Cell at the specified point, in tree view coordinates.</returns>
+        public Cell GetCellAt(int x, int y)
+        {
+            return GetCellAt(x, y, false);
+        }
+
+        /// <summary>
+        /// Retrieves the node cell that is at the specified location.
+        /// </summary>
+        /// <param name="x">The X position to evaluate and retrieve the cell from.</param>
+        /// <param name="y">The Y position to evaluate and retrieve the cell from.</param>
+        /// <param name="displayedOnly">Whether to enumerated displayed nodes only.</param>
+        /// <returns>The Cell at the specified point, in tree view coordinates.</returns>
+        public Cell GetCellAt(int x, int y, bool displayedOnly)
+        {
+            Node node = GetNodeAt(x, y, displayedOnly);
+            if (node != null)
+            {
+                return GetCellAt(node, x, y, m_NodeDisplay.Offset);
+            }
+            return null;
+        }
+
+        /// <summary>
+        /// Returns the reference to the node mouse is currently over or null (Nothing) if mouse is not over any node in tree.
+        /// </summary>
+        [Browsable(false)]
+        public Node MouseOverNode
+        {
+            get
+            {
+                return m_MouseOverNode;
+            }
+        }
+
+        /// <summary>
+        /// Specifies the mouse cursor displayed when mouse is over the cell. Default value
+        /// is null which means that default control cursor is used.
+        /// </summary>
+        /// <remarks>
+        /// To specify cursor for each individual cell use
+        /// <a href="AdvTree~DevComponents.AdvTree.Cell~Cursor.html">Cell.Cursor</a> property.
+        /// </remarks>
+        [Browsable(true), DefaultValue(null), Category("Appearance"), Description("Specifies the default mouse cursor displayed when mouse is over the cell.")]
+        public Cursor DefaultCellCursor
+        {
+            get
+            {
+                return m_DefaultCellCursor;
+            }
+            set
+            {
+                if (m_DefaultCellCursor != value)
+                {
+                    m_DefaultCellCursor = value;
+                }
+            }
+        }
+
+        /// <summary>Applies any layout changes to the tree control.</summary>
+        /// <remarks>
+        /// Layout will not be performed if BeginUpdate is called. Any calls to the
+        /// RecalcLayout will return without executing requested layout operation.
+        /// </remarks>
+        public void RecalcLayout()
+        {
+            if (this.IsUpdateSuspended)
+            {
+                m_PendingLayout = true;
+                return;
+            }
+            RecalcLayoutInternal();
+        }
+
+        protected override void OnFontChanged(EventArgs e)
+        {
+            InvalidateNodesSize();
+            RecalcLayout();
+            base.OnFontChanged(e);
+        }
+
+        /// <summary>
+        /// Gets reference to array of Cell objects that have HostedControl property set.
+        /// </summary>
+        internal ArrayList HostedControlCells
+        {
+            get { return m_HostedControlCells; }
+        }
+
+        private bool _FirstLayout = true;
+        private delegate void NoArgumentsDelegate();
+        /// <summary>
+        /// Recalculates layout for the tree control. Not affected by BeginUpdate call.
+        /// </summary>
+        internal void RecalcLayoutInternal()
+        {
+            if (this.Bounds.IsEmpty || this.IsDisposed) return;
+            if (this.InvokeRequired)
+            {
+                this.Invoke(new NoArgumentsDelegate(RecalcLayoutInternal));
+                return;
+            }
+
+            _FirstLayout = false;
+
+            // Process any pending sorting requests first
+            ProcessSortRequests();
+
+            Rectangle clientArea = Rectangle.Empty, controlRect = Rectangle.Empty;
+            GetClientAndControlRectangles(ref clientArea, ref controlRect);
+
+            m_NodeLayout.ClientArea = clientArea;
+            m_NodeLayout.LeftRight = this.RtlTranslateLeftRight(LeftRightAlignment.Left);
+            m_NodeLayout.PerformLayout();
+            m_PendingLayout = false;
+
+            UpdateScrollState(clientArea, controlRect);
+
+            if (_InvalidControlBorder)
+                UpdateControlBorderPanel();
+            RepositionHostedControls(true);
+            RepositionColumnHeader();
+            UpdateScrollBars();
+            this.Invalidate(true);
+        }
+        private void GetClientAndControlRectangles(ref Rectangle clientArea, ref Rectangle controlRect)
+        {
+            clientArea = GetInnerRectangle();
+            if ((m_Columns.Count > 0 && m_Columns.UsesRelativeSize || _View == eView.Tile) && _VScrollBar != null)
+                clientArea.Width -= _VScrollBar.Width;
+            controlRect = clientArea;
+
+            if (this.SelectionBoxStyle == eSelectionStyle.NodeMarker)
+                clientArea.Inflate(-this.SelectionBoxSize, -this.SelectionBoxSize);
+            else
+            {
+                if (this.DisplayRootNode != null && !this.DisplayRootNode.Selectable || this.Nodes.Count > 0 && !this.Nodes[0].Selectable)
+                    clientArea.Height -= 2;
+                else
+                    clientArea.Inflate(-1, -2);
+            }
+        }
+        private void UpdateScrollState()
+        {
+            Rectangle clientArea = Rectangle.Empty, controlRect = Rectangle.Empty;
+            GetClientAndControlRectangles(ref clientArea, ref controlRect);
+            UpdateScrollState(clientArea, controlRect);
+        }
+        private void UpdateScrollState(Rectangle clientArea, Rectangle controlRect)
+        {
+            Rectangle screenRect = GetScreenRectangle(new Rectangle(0, 0, m_NodeLayout.Width, m_NodeLayout.Height));
+            Size nodeLayoutSize = screenRect.Size;
+            if (nodeLayoutSize.Width > controlRect.Width || nodeLayoutSize.Height > controlRect.Height)
+            {
+                Size autoScrollMinSize = nodeLayoutSize;
+                if (this.SelectionBoxStyle == eSelectionStyle.NodeMarker)
+                {
+                    autoScrollMinSize.Width += this.SelectionBoxSize * 2;
+                    autoScrollMinSize.Height += this.SelectionBoxSize * 2;
+                }
+                else
+                {
+                    //autoScrollMinSize.Width += 2;
+                    autoScrollMinSize.Height += 2;
+                }
+                Rectangle inner = clientArea; //GetInnerRectangle();
+
+                if (nodeLayoutSize.Height > inner.Height && _VScrollBarVisible ||
+                    nodeLayoutSize.Width > inner.Width && nodeLayoutSize.Height > inner.Height - SystemInformation.HorizontalScrollBarHeight)
+                    autoScrollMinSize.Width += SystemInformation.VerticalScrollBarWidth;
+
+                if (_HScrollBarVisible)
+                    autoScrollMinSize.Height += SystemInformation.HorizontalScrollBarHeight;
+
+                if (!this.AutoScroll)
+                {
+                    this.BeginUpdate();
+                    this.Invalidate();
+                    this.AutoScroll = true;
+                    this.AutoScrollMinSize = autoScrollMinSize;
+                    this.AutoScrollPosition = m_NodeDisplay.DefaultOffset;
+                    if (m_Columns.Count > 0 && m_Columns.UsesRelativeSize || _View == eView.Tile)
+                    {
+                        InvalidateNodesSize();
+                        SetPendingLayout();
+                    }
+                    this.EndUpdate(false);
+                }
+                else if (this.AutoScrollMinSize != autoScrollMinSize)
+                {
+                    this.BeginUpdate();
+                    this.AutoScrollMinSize = autoScrollMinSize;
+                    if (nodeLayoutSize.Width <= this.Bounds.Width && this.AutoScrollPosition.X != 0)
+                    {
+                        this.AutoScrollPosition = new Point(0, this.AutoScrollPosition.Y);
+                    }
+                    Point asp = this.AutoScrollPosition;
+                    if (Math.Abs(asp.Y) > autoScrollMinSize.Height)
+                    {
+                        if (autoScrollMinSize.Height > inner.Height)
+                            asp.Y = -(autoScrollMinSize.Height - inner.Height);
+                        else
+                            asp.Y = 0;
+                    }
+                    else if (nodeLayoutSize.Height <= this.Bounds.Height)
+                        asp.Y = 0;
+                    else if (asp.Y<0 && autoScrollMinSize.Height - Math.Abs(asp.Y) < clientArea.Height) // Overscroll test
+                    {
+                        asp.Y = -(autoScrollMinSize.Height - inner.Height);
+                    } 
+
+                    if (Math.Abs(asp.X) > autoScrollMinSize.Width)
+                    {
+                        asp.X = -(autoScrollMinSize.Width - inner.Width);
+                    }
+                    else if (nodeLayoutSize.Width <= this.Bounds.Width)
+                        asp.X = 0;
+                    if (this.AutoScrollPosition != asp) this.AutoScrollPosition = asp;
+                    this.EndUpdate(false);
+                }
+                else if(_AutoScrollPosition.X != 0 && nodeLayoutSize.Width <= controlRect.Width)
+                    this.AutoScrollPosition = new Point(0, this.AutoScrollPosition.Y);
+            }
+            else if (this.AutoScroll)
+            {
+                this.BeginUpdate();
+                bool updateColumnsWidth = false;
+                if (m_Columns.Count > 0 && _VScrollBar != null)
+                {
+                    if (m_Columns.UsesRelativeSize)
+                        InvalidateNodesSize();
+                    else
+                        updateColumnsWidth = true;
+                }
+
+                this.AutoScroll = false;
+                m_NodeDisplay.Offset = m_NodeDisplay.DefaultOffset;
+                if (updateColumnsWidth) m_NodeLayout.UpdateTopLevelColumnsWidth();
+                this.EndUpdate(false);
+            }
+            else
+                m_NodeDisplay.Offset = m_NodeDisplay.DefaultOffset;
+        }
+        private bool _ClipHostedControls = true;
+        /// <summary>
+        /// Gets or sets whether hosted controls are clipped so they don't overlap the control borders. Default value is true.
+        /// </summary>
+        [Browsable(false), DefaultValue(true)]
+        public bool ClipHostedControls
+        {
+            get { return _ClipHostedControls; }
+            set
+            {
+                _ClipHostedControls = value;
+                UpdateControlBorderPanel();
+            }
+        }
+
+        internal bool IsRepositioningControls
+        {
+            get
+            {
+                return _IsRepositioningControls;
+            }
+        }
+        private bool _IsRepositioningControls = false;
+        private PanelControl _ControlBorderPanel = null;
+        private void RemoveControlBorderPanel()
+        {
+            if (_ControlBorderPanel == null) return;
+
+            if (_IsLayoutOrResize > 0)
+            {
+                if (_IsUpdateControlBorderPanelPending) return;
+
+                // Delay this due to http://support.microsoft.com/kb/949458 bug in WinForms and MDI-Child Forms
+                _IsUpdateControlBorderPanelPending = true;
+                InvokeDelayed(new MethodInvoker(delegate { this.RemoveControlBorderPanel(); }));
+                return;
+            }
+            _IsUpdateControlBorderPanelPending = false;
+
+            PanelControl control = _ControlBorderPanel;
+            _ControlBorderPanel = null;
+            this.Controls.Remove(control);
+            control.Dispose();
+        }
+
+        private bool _InvalidControlBorder = true;
+        /// <summary>
+        /// Gets or sets whether control border needs to be updated by calling UpdateControlBorderPanel()
+        /// </summary>
+        internal bool InvalidControlBorder
+        {
+            get { return _InvalidControlBorder; }
+            set
+            {
+                _InvalidControlBorder = value;
+            }
+        }
+        private bool _IsUpdateControlBorderPanelPending = false;
+        private void UpdateControlBorderPanel()
+        {
+            if (!_ClipHostedControls)
+            {
+                RemoveControlBorderPanel();
+                return;
+            }
+            if (m_HostedControlCells.Count > 0)
+            {
+                Rectangle innerRect = GetInnerRectangle();
+                Rectangle cr = this.ClientRectangle;
+                if (cr.Contains(innerRect) && innerRect != cr &&
+                    innerRect.X > cr.X && innerRect.Right < cr.Right && innerRect.Y > cr.Y && innerRect.Bottom < cr.Bottom)
+                {
+                    if (_ControlBorderPanel == null)
+                    {
+                        if (_IsLayoutOrResize > 0)
+                        {
+                            if (_IsUpdateControlBorderPanelPending) return;
+
+                            // Delay this due to http://support.microsoft.com/kb/949458 bug in WinForms and MDI-Child Forms
+                            _IsUpdateControlBorderPanelPending = true;
+                            InvokeDelayed(new MethodInvoker(delegate { this.UpdateControlBorderPanel(); }));
+                            return;
+                        }
+                        _IsUpdateControlBorderPanelPending = false;
+                        _ControlBorderPanel = new PanelControl();
+                        _ControlBorderPanel.CanSetRegion = false;
+                        _ControlBorderPanel.Style.ApplyStyle(this.BackgroundStyle);
+                        _ControlBorderPanel.Style.Class = this.BackgroundStyle.Class;
+                        this.Controls.Add(_ControlBorderPanel);
+                    }
+                    _ControlBorderPanel.Bounds = cr;
+                    Region region = new Region(cr);
+                    region.Exclude(innerRect);
+                    _ControlBorderPanel.Region = region;
+                    _ControlBorderPanel.BringToFront();
+                }
+                else
+                {
+                    RemoveControlBorderPanel();
+                }
+            }
+            else
+                RemoveControlBorderPanel();
+            _InvalidControlBorder = false;
+        }
+        private void RepositionHostedControls(bool performLayout)
+        {
+            if (_IsRepositioningControls) return;
+            try
+            {
+                _IsRepositioningControls = true;
+                if (m_HostedControlCells.Count > 0)
+                {
+                    this.SuspendLayout();
+                    if (this.AutoScroll)
+                        m_NodeDisplay.Offset = GetAutoScrollPositionOffset();
+                    m_NodeDisplay.MoveHostedControls();
+
+                    this.ResumeLayout(performLayout);
+                }
+                else if (_ControlBorderPanel != null)
+                {
+                    RemoveControlBorderPanel();
+                }
+
+                if (m_CellEditing && _CellEditControl is Control && m_EditedCell != null)
+                {
+                    Point offset = m_NodeDisplay.Offset;
+                    if (this.AutoScroll)
+                        offset = GetAutoScrollPositionOffset();
+                    Control editControl = (Control)_CellEditControl;
+                    Rectangle rCell = NodeDisplay.GetCellRectangle(eCellRectanglePart.TextBounds, m_EditedCell, offset);
+                    rCell = GetScreenRectangle(rCell);
+                    editControl.Location = rCell.Location;
+                }
+
+
+            }
+            finally
+            {
+                _IsRepositioningControls = false;
+            }
+        }
+
+        /// <summary>
+        /// Gets the reference to internal vertical scroll-bar control if one is created or null if no scrollbar is visible.
+        /// </summary>
+        [Browsable(false)]
+        public DevComponents.DotNetBar.VScrollBarAdv VScrollBar
+        {
+            get
+            {
+                return _VScrollBar;
+            }
+        }
+
+        private bool _VScrollBarVisible = true;
+        /// <summary>
+        /// Gets or sets whether Vertical Scroll-bar is shown if needed because content of the control exceeds available height. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance"), Description("Indicates whether Vertical Scroll-bar is shown if needed because content of the control exceeds available height.")]
+        public bool VScrollBarVisible
+        {
+            get { return _VScrollBarVisible; }
+            set
+            {
+                _VScrollBarVisible = value;
+                if (!_VScrollBarVisible && _VScrollBar != null) _VScrollBar.Visible = false;
+            }
+        }
+
+        private bool _HScrollBarVisible = true;
+        /// <summary>
+        /// Gets or sets whether Horizontal Scroll-bar is shown if needed because content of the control exceeds available width. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance"), Description("Indicates whether Vertical Scroll-bar is shown if needed because content of the control exceeds available height.")]
+        public bool HScrollBarVisible
+        {
+            get { return _HScrollBarVisible; }
+            set
+            {
+                _HScrollBarVisible = value;
+                if (!_HScrollBarVisible && _HScrollBar != null) _HScrollBar.Visible = false;
+            }
+        }
+
+
+        /// <summary>
+        /// Gets the reference to internal horizontal scroll-bar control if one is created or null if no scrollbar is visible.
+        /// </summary>
+        [Browsable(false)]
+        public DevComponents.DotNetBar.ScrollBar.HScrollBarAdv HScrollBar
+        {
+            get
+            {
+                return _HScrollBar;
+            }
+        }
+
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public new Size AutoScrollMargin
+        {
+            get { return base.AutoScrollMargin; }
+            set { base.AutoScrollMargin = value; }
+        }
+
+        private bool _AutoScroll = false;
+        /// <summary>
+        /// Gets or sets a value indicating whether the tree control enables the user to scroll to any nodes placed outside of its visible boundaries.
+        /// This property is managed internally by AdvTree control and should not be modified.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public new bool AutoScroll
+        {
+            get { return _AutoScroll; }
+            set
+            {
+                if (_AutoScroll != value)
+                {
+                    _AutoScroll = value;
+                    UpdateScrollBars();
+                }
+            }
+        }
+
+        private Size _AutoScrollMinSize = Size.Empty;
+        /// <summary>
+        /// Gets or sets the minimum size of the auto-scroll. Returns a Size that represents the minimum height and width of the scrolling area in pixels.
+        /// This property is managed internally by AdvTree control and should not be modified.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public new Size AutoScrollMinSize
+        {
+            get { return _AutoScrollMinSize; }
+            set
+            {
+                _AutoScrollMinSize = value;
+                UpdateScrollBars();
+            }
+        }
+
+        private Point _AutoScrollPositionChange = Point.Empty;
+        private Point _AutoScrollPosition = Point.Empty;
+        /// <summary>
+        /// Gets or sets the location of the auto-scroll position.
+        /// </summary>
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), Browsable(false), Description("Indicates location of the auto-scroll position.")]
+        public new Point AutoScrollPosition
+        {
+            get
+            {
+                return _AutoScrollPosition;
+            }
+            set
+            {
+                //if (value.X > 0) value.X = -value.X;
+                //if (value.Y > 0) value.Y = -value.Y;
+                if (_AutoScrollPosition != value)
+                {
+                    _AutoScrollPositionChange = new Point(value.X - _AutoScrollPosition.X, value.Y - _AutoScrollPosition.Y);
+                    _AutoScrollPosition = value;
+                    if (_AutoScroll)
+                    {
+                        if (_VScrollBar != null && _VScrollBar.Value != -_AutoScrollPosition.Y)
+                            _VScrollBar.Value = Math.Min(_VScrollBar.Maximum, Math.Max(_VScrollBar.Minimum, -_AutoScrollPosition.Y));
+                        if (_HScrollBar != null && _HScrollBar.Value != -_AutoScrollPosition.X)
+                            _HScrollBar.Value = Math.Min(_HScrollBar.Maximum, Math.Max(_HScrollBar.Minimum, -_AutoScrollPosition.X));
+                        RepositionHostedControls(false);
+                        Invalidate();
+                        m_NodeDisplay.Offset = Point.Empty; // Reset render offset
+                        if (_ColumnHeader != null) _ColumnHeader.Invalidate();
+                    }
+                }
+            }
+        }
+
+        private void InvokeDelayed(MethodInvoker method)
+        {
+            Timer delayedInvokeTimer = new Timer();
+            delayedInvokeTimer = new Timer();
+            delayedInvokeTimer.Tag = method;
+            delayedInvokeTimer.Interval = 10;
+            delayedInvokeTimer.Tick += new EventHandler(DelayedInvokeTimerTick);
+            delayedInvokeTimer.Start();
+        }
+        void DelayedInvokeTimerTick(object sender, EventArgs e)
+        {
+            Timer timer = (Timer)sender;
+            MethodInvoker method = (MethodInvoker)timer.Tag;
+            timer.Stop();
+            timer.Dispose();
+            method.Invoke();
+        }
+
+        private bool _IsUpdateScrollBarsPending = false;
+        private void UpdateScrollBars()
+        {
+            if (_IsLayoutOrResize > 0)
+            {
+                //Form form = this.FindForm();
+                //if (form != null && form.IsMdiChild)
+                {
+                    if (_IsUpdateScrollBarsPending) return;
+
+                    // Delay this due to http://support.microsoft.com/kb/949458 bug in WinForms and MDI-Child Forms
+                    _IsUpdateScrollBarsPending = true;
+                    InvokeDelayed(new MethodInvoker(delegate { this.UpdateScrollBars(); }));
+                    return;
+                }
+            }
+
+            _IsUpdateScrollBarsPending = false;
+            if (!_AutoScroll)
+            {
+                bool update = _HScrollBar != null || _VScrollBar != null;
+                RemoveHScrollBar();
+                RemoveVScrollBar();
+                if (_Thumb != null)
+                {
+                    this.Controls.Remove(_Thumb);
+                    _Thumb.Dispose();
+                    _Thumb = null;
+                }
+                if (update)
+                    this.Update();
+                return;
+            }
+
+            //Node root = GetDisplayRootNode();
+            Rectangle innerBounds = ElementStyleLayout.GetInnerRect(this.BackgroundStyle, this.ClientRectangle);
+            // Check do we need vertical scrollbar
+            Size scrollSize = _AutoScrollMinSize;
+            if (_VScrollBarVisible && scrollSize.Height > innerBounds.Height)
+            {
+                if (_VScrollBar == null)
+                {
+                    _VScrollBar = new DevComponents.DotNetBar.VScrollBarAdv();
+                    _VScrollBar.Appearance = _ScrollBarAppearance;
+                    _VScrollBar.Width = GetVerticalScrollBarWidth();
+                    this.Controls.Add(_VScrollBar);
+                    _VScrollBar.BringToFront();
+                    _VScrollBar.Scroll += new ScrollEventHandler(VScrollBarScroll);
+                }
+                if (_VScrollBar.Minimum != 0)
+                    _VScrollBar.Minimum = 0;
+                int innerHeight = innerBounds.Height - 12;
+                if (_ColumnHeader != null && _ColumnHeader.Visible)
+                    innerHeight -= _ColumnHeader.Height + 2;
+                if (_VScrollBar.LargeChange != innerHeight && innerHeight > 0)
+                    _VScrollBar.LargeChange = innerHeight;
+                //if (root != null && root.Bounds.Height > 0)
+                //    _VScrollBar.SmallChange = root.Bounds.Height;
+                //else
+                //    _VScrollBar.SmallChange = 22;
+                _VScrollBar.SmallChange = (int)Math.Ceiling(this.Font.GetHeight());
+                if (_VScrollBar.Maximum != _AutoScrollMinSize.Height)
+                    _VScrollBar.Maximum = _AutoScrollMinSize.Height;
+                if (_VScrollBar.Value != -_AutoScrollPosition.Y)
+                    _VScrollBar.Value = (Math.Min(_VScrollBar.Maximum, Math.Abs(_AutoScrollPosition.Y)));
+            }
+            else
+                RemoveVScrollBar();
+
+            // Check horizontal scrollbar
+            if (_HScrollBarVisible && scrollSize.Width > innerBounds.Width)
+            {
+                if (_HScrollBar == null)
+                {
+                    _HScrollBar = new DevComponents.DotNetBar.ScrollBar.HScrollBarAdv();
+                    _HScrollBar.Appearance = _ScrollBarAppearance;
+                    _HScrollBar.Height = GetHorizontalScrollBarHeight();
+                    this.Controls.Add(_HScrollBar);
+                    _HScrollBar.BringToFront();
+                    _HScrollBar.Scroll += new ScrollEventHandler(HScrollBarScroll);
+                }
+                if (_HScrollBar.Minimum != 0)
+                    _HScrollBar.Minimum = 0;
+                if (_HScrollBar.LargeChange != innerBounds.Width && innerBounds.Width > 0)
+                    _HScrollBar.LargeChange = innerBounds.Width;
+                if (_HScrollBar.Maximum != _AutoScrollMinSize.Width)
+                    _HScrollBar.Maximum = _AutoScrollMinSize.Width;
+                if (_HScrollBar.Value != -_AutoScrollPosition.X)
+                    _HScrollBar.Value = (Math.Min(_HScrollBar.Maximum, Math.Abs(_AutoScrollPosition.X)));
+                //if (root != null && root.Bounds.Height > 0)
+                //    _HScrollBar.SmallChange = root.Bounds.Height;
+                //else
+                //    _HScrollBar.SmallChange = 22;
+                _HScrollBar.SmallChange = (int)Math.Ceiling(this.Font.GetHeight());
+            }
+            else
+                RemoveHScrollBar();
+
+            RepositionScrollBars();
+
+            if (_Thumb != null)
+                _Thumb.BringToFront();
+        }
+
+        private static int GetHorizontalScrollBarHeight()
+        {
+            return SystemInformation.HorizontalScrollBarHeight;
+        }
+
+        private static int GetVerticalScrollBarWidth()
+        {
+            return SystemInformation.VerticalScrollBarWidth;
+        }
+
+        private void VScrollBarScroll(object sender, ScrollEventArgs e)
+        {
+            if (e.NewValue != e.OldValue)
+            {
+                _AutoScrollPosition.Y = -e.NewValue;
+                RepositionHostedControls(false);
+                this.Invalidate();
+                if (_ColumnHeader != null) _ColumnHeader.Invalidate();
+                if (e.Type == ScrollEventType.ThumbTrack && m_HostedControlCells.Count > 0)
+                    this.Update();
+            }
+            OnScroll(new ScrollEventArgs(e.Type, e.OldValue, e.NewValue, ScrollOrientation.VerticalScroll));
+        }
+        private void HScrollBarScroll(object sender, ScrollEventArgs e)
+        {
+            _AutoScrollPosition.X = -e.NewValue;
+            RepositionHostedControls(false);
+            this.Invalidate();
+            if (_ColumnHeader != null) _ColumnHeader.Invalidate();
+            if (e.Type == ScrollEventType.ThumbTrack && m_HostedControlCells.Count > 0)
+                this.Update();
+
+            OnScroll(new ScrollEventArgs(e.Type, e.OldValue, e.NewValue, ScrollOrientation.HorizontalScroll));
+        }
+
+        private void RepositionScrollBars()
+        {
+            Rectangle innerBounds = ElementStyleLayout.GetInnerRect(this.BackgroundStyle, this.ClientRectangle);
+            if (_HScrollBar != null)
+            {
+                int width = innerBounds.Width;
+                if (_VScrollBar != null)
+                    width -= _VScrollBar.Width;
+                _HScrollBar.Bounds = new Rectangle(innerBounds.X, innerBounds.Height - GetHorizontalScrollBarHeight() + 1, width, GetHorizontalScrollBarHeight());
+            }
+
+            if (_VScrollBar != null)
+            {
+                int height = innerBounds.Height;
+                if (_HScrollBar != null)
+                    height -= _HScrollBar.Height;
+                _VScrollBar.Bounds = new Rectangle(innerBounds.Right - GetVerticalScrollBarWidth(), innerBounds.Y, GetVerticalScrollBarWidth(), height);
+            }
+
+            if (_VScrollBar != null && _HScrollBar != null)
+            {
+                if (_Thumb == null)
+                {
+                    _Thumb = new Control();
+                    _Thumb.BackColor = this.BackColor;
+                    this.Controls.Add(_Thumb);
+                }
+                _Thumb.Bounds = new Rectangle(_HScrollBar.Bounds.Right, _VScrollBar.Bounds.Bottom, _VScrollBar.Width, _HScrollBar.Height);
+            }
+            else if (_Thumb != null)
+            {
+                this.Controls.Remove(_Thumb);
+                _Thumb.Dispose();
+                _Thumb = null;
+            }
+            RepositionColumnHeader();
+        }
+
+        internal int ColumnHeaderHeight
+        {
+            get
+            {
+                return _ColumnHeader != null ? _ColumnHeader.Height : 0;
+            }
+        }
+
+        private void RepositionColumnHeader()
+        {
+            Rectangle innerBounds = ElementStyleLayout.GetInnerRect(this.BackgroundStyle, this.ClientRectangle);
+            if (_ColumnHeader != null)
+            {
+                Rectangle r = GetScreenRectangle(new Rectangle(innerBounds.X, innerBounds.Y,
+                    innerBounds.Width - (_VScrollBar != null ? _VScrollBar.Width : 0), _ColumnHeader.Columns.Bounds.Height));
+                r.X = innerBounds.X;
+                r.Y = innerBounds.Y;
+                r.Width = Math.Max(0, innerBounds.Width - (_VScrollBar != null ? _VScrollBar.Width : 0));
+                r.Height = Math.Max(0, r.Height);
+                _ColumnHeader.Bounds = r;
+                _ColumnHeader.BringToFront();
+            }
+        }
+
+        private void RemoveHScrollBar()
+        {
+            if (_HScrollBar != null)
+            {
+                Rectangle r = _HScrollBar.Bounds;
+                this.Controls.Remove(_HScrollBar);
+                _HScrollBar.Dispose();
+                _HScrollBar = null;
+                this.Invalidate(r);
+            }
+        }
+
+        private void RemoveVScrollBar()
+        {
+            if (_VScrollBar != null)
+            {
+                Rectangle r = _VScrollBar.Bounds;
+                this.Controls.Remove(_VScrollBar);
+                _VScrollBar.Dispose();
+                _VScrollBar = null;
+                this.Invalidate(r);
+            }
+        }
+
+        private System.Drawing.Drawing2D.Matrix GetTranslationMatrix(float zoom)
+        {
+            System.Drawing.Drawing2D.Matrix mx = new System.Drawing.Drawing2D.Matrix(zoom, 0, 0, zoom, 0, 0);
+            if (this.CenterContent)
+            {
+                float offsetX = 0, offsetY = 0;
+                if (this.AutoScroll)
+                {
+                    if (this.Width > this.NodeLayout.Width)
+                    {
+                        if (this.Width < this.NodeLayout.Width * zoom)
+                            offsetX = -(this.Width - this.NodeLayout.Width) / 2;
+                        else
+                            offsetX = (this.Width * (1.0f / zoom) - this.Width) / 2;
+                    }
+
+                    if (this.Height > this.NodeLayout.Height)
+                    {
+                        if (this.Height < this.NodeLayout.Height * zoom)
+                            offsetY = -(this.Height - this.NodeLayout.Height) / 2;
+                        else
+                            offsetY = (this.Height * (1.0f / zoom) - this.Height) / 2;
+                    }
+                }
+                else
+                {
+                    offsetX = (this.Width * (1.0f / zoom) - this.Width) / 2;
+                    offsetY = (this.Height * (1.0f / zoom) - this.Height) / 2;
+                }
+
+                mx.Translate(offsetX, offsetY);
+            }
+            return mx;
+        }
+
+        /// <summary>
+        /// Returns translation matrix for current Zoom. Translation matrix is used to translate internal node coordinates to screen
+        /// coordinates when Zoom is not set to 1.
+        /// </summary>
+        /// <returns>Returns new instance of Matrix object.</returns>
+        public System.Drawing.Drawing2D.Matrix GetTranslationMatrix()
+        {
+            return GetTranslationMatrix(m_ZoomFactor);
+        }
+
+        /// <summary>
+        /// Returns layout based rectangle from screen rectangle. Layout based rectangle will be different
+        /// from screen rectangle when Zoom is not set to 1. This method will translate the screen rectangle enlarged by Zoom
+        /// to layout rectangle which does not have Zoom applied.
+        /// </summary>
+        /// <param name="r">Screen rectangle</param>
+        /// <returns>Layout rectangle</returns>
+        public virtual Rectangle GetLayoutRectangle(Rectangle r)
+        {
+            if (m_ZoomFactor == 1)
+                return r;
+
+            Point[] p = new Point[] { new Point(r.X, r.Y), new Point(r.Right, r.Bottom) };
+            using (System.Drawing.Drawing2D.Matrix mx = GetTranslationMatrix())
+            {
+                mx.Invert();
+                mx.TransformPoints(p);
+            }
+            return new Rectangle(p[0].X, p[0].Y, p[1].X - p[0].X, p[1].Y - p[0].Y);
+        }
+
+        /// <summary>
+        /// Returns mouse position which is translated if control Zoom is not equal 1
+        /// </summary>
+        /// <param name="e">Mouse event arguments</param>
+        /// <returns>Returns translated position</returns>
+        protected virtual Point GetLayoutPosition(MouseEventArgs e)
+        {
+            return GetLayoutPosition(e.X, e.Y);
+        }
+
+        /// <summary>
+        /// Returns mouse position which is translated if control Zoom is not equal 1
+        /// </summary>
+        /// <param name="mousePosition">Mouse position</param>
+        /// <returns>Returns translated position</returns>
+        public virtual Point GetLayoutPosition(Point mousePosition)
+        {
+            return GetLayoutPosition(mousePosition.X, mousePosition.Y);
+        }
+
+        /// <summary>
+        /// Returns mouse position which is translated if control Zoom is not equal 1
+        /// </summary>
+        /// <param name="x">X coordinate</param>
+        /// <param name="y">Y coordinate</param>
+        /// <returns></returns>
+        public virtual Point GetLayoutPosition(int x, int y)
+        {
+            if (m_ZoomFactor == 1)
+                return new Point(x, y);
+            Point[] p = new Point[] { new Point(x, y) };
+            using (System.Drawing.Drawing2D.Matrix mx = GetTranslationMatrix())
+            {
+                mx.Invert();
+                mx.TransformPoints(p);
+            }
+            return p[0];
+        }
+
+        /// <summary>
+        /// Returns rectangle translated to screen rectangle if Zoom is not equal 1.
+        /// </summary>
+        /// <param name="r">Rectangle to translate</param>
+        /// <returns>Screen Rectangle</returns>
+        public virtual Rectangle GetScreenRectangle(Rectangle r)
+        {
+            if (m_ZoomFactor == 1)
+                return r;
+            Point[] p = new Point[] { new Point(r.X, r.Y), new Point(r.Right, r.Bottom) };
+            using (System.Drawing.Drawing2D.Matrix mx = GetTranslationMatrix())
+            {
+                mx.TransformPoints(p);
+            }
+            return new Rectangle(p[0].X, p[0].Y, p[1].X - p[0].X, p[1].Y - p[0].Y);
+        }
+
+        /// <summary>
+        /// Returns size translated to screen dimension if Zoom is not equal 1.
+        /// </summary>
+        /// <param name="s">Size to translate</param>
+        /// <returns>Screen Size</returns>
+        public virtual Size GetScreenSize(Size s)
+        {
+            return GetScreenRectangle(new Rectangle(Point.Empty, s)).Size;
+        }
+
+        internal void InvokeColumnHeaderMouseUp(object sender, MouseEventArgs e)
+        {
+            OnColumnHeaderMouseUp(sender, e);
+        }
+        /// <summary>
+        /// Raises ColumnHeaderMouseUp event.
+        /// </summary>
+        /// <param name="sender">Reference to ColumnHeader</param>
+        /// <param name="e">Event arguments</param>
+        protected virtual void OnColumnHeaderMouseUp(object sender, MouseEventArgs e)
+        {
+            if (ColumnHeaderMouseUp != null)
+                ColumnHeaderMouseUp(sender, e);
+        }
+
+        internal void InvokeColumnHeaderMouseDown(object sender, MouseEventArgs e)
+        {
+            OnColumnHeaderMouseDown(sender, e);
+        }
+        /// <summary>
+        /// Raises ColumnHeaderMouseDown event.
+        /// </summary>
+        /// <param name="sender">Reference to ColumnHeader</param>
+        /// <param name="e">Event arguments</param>
+        protected virtual void OnColumnHeaderMouseDown(object sender, MouseEventArgs e)
+        {
+            if (ColumnHeaderMouseDown != null)
+                ColumnHeaderMouseDown(sender, e);
+        }
+
+        /// <summary>
+        /// Gets the list of all checked nodes in tree including child nodes.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public System.Collections.Generic.List<Node> CheckedNodes
+        {
+            get
+            {
+                System.Collections.Generic.List<Node> items = new System.Collections.Generic.List<Node>();
+                NodeCollection itemsCollection = this.Nodes;
+                GetSelectedNodes(items, itemsCollection);
+                return items;
+            }
+        }
+
+        private static void GetSelectedNodes(System.Collections.Generic.List<Node> items, NodeCollection itemsCollection)
+        {
+            foreach (Node item in itemsCollection)
+            {
+				if (item.Checked)
+                    items.Add(item);
+				
+                if (item.HasChildNodes)
+                {
+                    GetSelectedNodes(items, item.Nodes);
+                }
+            }
+        }
+        #endregion
+
+        #region Event Invocation
+        /// <summary>
+        /// Calls <see cref="OnAfterCheck">OnBeforeCheck</see> method which fired
+        /// <see cref="AfterCheck">OnBeforeCheck</see> event.
+        /// </summary>
+        /// <param name="e">Event arguments.</param>
+        internal void InvokeBeforeCheck(AdvTreeCellBeforeCheckEventArgs e)
+        {
+            OnBeforeCheck(e);
+        }
+
+        /// <summary>Raises the <see cref="BeforeCheck">BeforeCheck</see> event.</summary>
+        /// <param name="e">
+        /// A <see cref="AdvTreeCellBeforeCheckEventArgs">AdvTreeCellBeforeCheckEventArgs</see> that contains the event
+        /// data.
+        /// </param>
+        protected virtual void OnBeforeCheck(AdvTreeCellBeforeCheckEventArgs e)
+        {
+            if (BeforeCheck != null)
+                BeforeCheck(this, e);
+        }
+
+        /// <summary>
+        /// Calls <see cref="OnAfterCheck">OnAfterCheck</see> method which fired
+        /// <see cref="AfterCheck">AfterCheck</see> event.
+        /// </summary>
+        /// <param name="e">Event arguments.</param>
+        internal void InvokeAfterCheck(AdvTreeCellEventArgs e)
+        {
+            OnAfterCheck(e);
+        }
+
+        /// <summary>Raises the <see cref="AfterCheck">AfterCheck</see> event.</summary>
+        /// <param name="e">
+        /// A <see cref="AdvTreeCellEventArgs">AdvTreeEventArgs</see> that contains the event
+        /// data.
+        /// </param>
+        protected virtual void OnAfterCheck(AdvTreeCellEventArgs e)
+        {
+            if (AfterCheck != null)
+                AfterCheck(this, e);
+        }
+
+        /// <summary>
+        /// Invokes CommandButtonClick event.
+        /// </summary>
+        /// <param name="node">Context node.</param>
+        /// <param name="e">Event arguments.</param>
+        internal void InvokeCommandButtonClick(Node node, CommandButtonEventArgs e)
+        {
+            if (CommandButtonClick != null)
+                CommandButtonClick(node, e);
+        }
+
+        protected virtual void OnBeforeCellEdit(CellEditEventArgs e)
+        {
+            if (BeforeCellEdit != null)
+                BeforeCellEdit(this, e);
+        }
+
+        void INodeNotify.OnBeforeCollapse(AdvTreeNodeCancelEventArgs e)
+        {
+            if (BeforeCollapse != null)
+                BeforeCollapse(this, e);
+        }
+
+        void INodeNotify.OnAfterCollapse(AdvTreeNodeEventArgs e)
+        {
+            if (AfterCollapse != null)
+                AfterCollapse(this, e);
+        }
+
+        void INodeNotify.OnBeforeExpand(AdvTreeNodeCancelEventArgs e)
+        {
+            if (BeforeExpand != null)
+                BeforeExpand(this, e);
+        }
+
+        void INodeNotify.OnAfterExpand(AdvTreeNodeEventArgs e)
+        {
+            if (AfterExpand != null)
+                AfterExpand(this, e);
+        }
+
+        internal void InvokeOnAfterNodeDeselect(AdvTreeNodeEventArgs args)
+        {
+            OnAfterNodeDeselect(args);
+        }
+        protected virtual void OnAfterNodeDeselect(AdvTreeNodeEventArgs args)
+        {
+            if (AfterNodeDeselect != null)
+                AfterNodeDeselect(this, args);
+        }
+
+        internal void InvokeOnAfterNodeSelect(AdvTreeNodeEventArgs args)
+        {
+            OnAfterNodeSelect(args);
+        }
+        protected virtual void OnAfterNodeSelect(AdvTreeNodeEventArgs args)
+        {
+            if (AfterNodeSelect != null)
+                AfterNodeSelect(this, args);
+        }
+
+        internal void InvokeOnBeforeNodeSelect(AdvTreeNodeCancelEventArgs args)
+        {
+            OnBeforeNodeSelect(args);
+        }
+        protected virtual void OnBeforeNodeSelect(AdvTreeNodeCancelEventArgs args)
+        {
+            if (BeforeNodeSelect != null)
+                BeforeNodeSelect(this, args);
+        }
+
+        /// <summary>
+        /// Invokes DeserializeNode event.
+        /// </summary>
+        /// <param name="e">Provides more information about the event</param>
+        protected virtual void OnDeserializeNode(SerializeNodeEventArgs e)
+        {
+            if (DeserializeNode != null)
+                DeserializeNode(this, e);
+        }
+
+        /// <summary>
+        /// Invokes SerializeNode event.
+        /// </summary>
+        /// <param name="e">Provides more information about the event</param>
+        protected virtual void OnSerializeNode(SerializeNodeEventArgs e)
+        {
+            if (SerializeNode != null)
+                SerializeNode(this, e);
+        }
+
+        internal void InvokeSerializeNode(SerializeNodeEventArgs e)
+        {
+            OnSerializeNode(e);
+        }
+
+        internal void InvokeDeserializeNode(SerializeNodeEventArgs e)
+        {
+            OnDeserializeNode(e);
+        }
+
+        internal bool HasSerializeNodeHandlers
+        {
+            get { return (SerializeNode != null); }
+        }
+
+        internal bool HasDeserializeNodeHandlers
+        {
+            get { return (DeserializeNode != null); }
+        }
+
+        internal void InvokeMarkupLinkClick(object sender, MarkupLinkClickEventArgs e)
+        {
+            OnMarkupLinkClick(sender, e);
+            m_CellMouseDownCounter = 0;
+        }
+
+        /// <summary>
+        /// Invokes the MarkupLinkClick evcent.
+        /// </summary>
+        /// <param name="sender">Sender of the event, usually instance Cell object.</param>
+        /// <param name="e">Event arguments</param>
+        protected virtual void OnMarkupLinkClick(object sender, MarkupLinkClickEventArgs e)
+        {
+            if (MarkupLinkClick != null)
+                MarkupLinkClick(sender, e);
+        }
+        #endregion
+
+        #region Drag & Drop Support
+        [DllImport("user32.dll", SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        private static extern bool SetCursorPos(int X, int Y);
+
+        protected override void OnDragDrop(DragEventArgs drgevent)
+        {
+            base.OnDragDrop(drgevent);
+            InternalDragDrop(drgevent);
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void InternalDragDrop(DragEventArgs drgevent)
+        {
+            ReleaseDragNode(true);
+        }
+
+        protected override void OnDragLeave(EventArgs e)
+        {
+            base.OnDragLeave(e);
+            InternalDragLeave();
+        }
+
+        private Timer _DragScrollTimer = null;
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void InternalDragLeave()
+        {
+            ReleaseDragNode(false);
+            if (AutoScroll && _DragScrollTimer == null)
+            {
+                _DragScrollTimer = new Timer();
+                _DragScrollTimer.Interval = 100;
+                _DragScrollTimer.Tick += new EventHandler(DragScrollTimerTick);
+                _DragScrollTimer.Start();
+            }
+        }
+
+        private void DestroyDragScrollTimer()
+        {
+            Timer t = _DragScrollTimer;
+            if (t == null) return;
+            _DragScrollTimer = null;
+            t.Stop();
+            t.Tick -= new EventHandler(DragScrollTimerTick);
+            t.Dispose();
+        }
+
+        private void DragScrollTimerTick(object sender, EventArgs e)
+        {
+            if (Control.MouseButtons == MouseButtons.Left && this.IsHandleCreated && this.AutoScroll)
+            {
+                Point p = this.PointToClient(Control.MousePosition);
+                Rectangle temp = this.ClientRectangle;
+                temp.Inflate(32, 32);
+                if (!temp.Contains(p)) return;
+
+                if (p.Y < 0 && this.AutoScrollPosition.Y != 0 && _VScrollBar != null)
+                    this.AutoScrollPosition = new Point(this.AutoScrollPosition.X, Math.Min(0, this.AutoScrollPosition.Y + _VScrollBar.SmallChange));
+                else if (_VScrollBar != null && p.Y > this.ClientRectangle.Bottom && -(this.AutoScrollPosition.Y - _VScrollBar.SmallChange) < (_VScrollBar.Maximum - _VScrollBar.LargeChange))
+                {
+                    this.AutoScrollPosition = new Point(this.AutoScrollPosition.X, Math.Min(0, this.AutoScrollPosition.Y - _VScrollBar.SmallChange));
+                }
+            }
+            else
+                DestroyDragScrollTimer();
+        }
+
+        protected override void OnDragEnter(DragEventArgs drgevent)
+        {
+            DestroyDragScrollTimer();
+            base.OnDragEnter(drgevent);
+        }
+
+        protected override void OnDragOver(DragEventArgs drgevent)
+        {
+            base.OnDragOver(drgevent);
+            InternalDragOver(drgevent);
+        }
+
+        /// <summary>
+        /// Raises the NodeDragFeedback event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnNodeDragFeedback(TreeDragFeedbackEventArgs e)
+        {
+            TreeDragFeedbackEventHander h = NodeDragFeedback;
+            if (h != null)
+                h(this, e);
+        }
+
+        private int _DropAsChildOffset = 24;
+        /// <summary>
+        /// Gets or sets the offset in pixels from node's X position that is used during drag &amp; drop operation to indicate that
+        /// dragged node is dropped as child node of the parent's node.
+        /// </summary>
+        [DefaultValue(24), Category("Behavior"), Description("Indicates offset in pixels from node's X position that is used during drag & drop operation to indicate that dragged node is dropped as child node of the parent's node.")]
+        public int DropAsChildOffset
+        {
+            get { return _DropAsChildOffset; }
+            set
+            {
+                _DropAsChildOffset = value;
+            }
+        }
+
+        private bool _DragDropNodeCopyEnabled = true;
+        /// <summary>
+        /// Gets or sets whether drag &amp; drop internal implementation allows the copying of the node being dragged when CTRL key is pressed.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether drag & drop internal implementation allows the copying of the node being dragged when CTRL key is pressed.")]
+        public bool DragDropNodeCopyEnabled
+        {
+            get { return _DragDropNodeCopyEnabled; }
+            set
+            {
+                _DragDropNodeCopyEnabled = value;
+            }
+        }
+
+        private bool GetNodesContain(Node[] nodes, Node nodeToLookFor)
+        {
+            foreach (Node node in nodes)
+            {
+                if (node == nodeToLookFor)
+                    return true;
+            }
+            return false;
+        }
+
+        private bool _AllowExternalDrop = true;
+        /// <summary>
+        /// Gets or sets whether control accepts the dragged nodes from other AdvTree controls. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether control accepts the dragged nodes from other AdvTree controls.")]
+        public bool AllowExternalDrop
+        {
+            get { return _AllowExternalDrop; }
+            set { _AllowExternalDrop = value; }
+        }
+
+        private NodeDragInfo _DragInfo = null;
+        /// <summary>
+        /// Processes drag over event.
+        /// </summary>
+        /// <param name="drgevent">Drag event arguments.</param>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void InternalDragOver(DragEventArgs drgevent)
+        {
+            if (!m_DragDropEnabled)
+                return;
+
+            if (!_AllowExternalDrop && IsExternalTreeDrop(drgevent))
+            {
+                drgevent.Effect = DragDropEffects.None;
+                return;
+            }
+
+            if (m_DragNode == null)
+                CreateDragNode(drgevent);
+
+            if (m_DragNode == null)
+            {
+                drgevent.Effect = DragDropEffects.None;
+                return;
+            }
+
+            drgevent.Effect = (Control.ModifierKeys == Keys.Control && _DragDropNodeCopyEnabled) ? DragDropEffects.Copy : DragDropEffects.Move;
+
+            InvalidateNode(m_DragNode);
+            Point p = this.PointToClient(new Point(drgevent.X, drgevent.Y));
+            p = GetLayoutPosition(p);
+            TreeAreaInfo areaInfo = NodeOperations.GetTreeAreaInfo(this, p.X, p.Y);
+            Point insideNodeOffset = Point.Empty;
+
+            NodeDragInfo newDragInfo = null;
+            Node lastVisibleNode = null;
+            if (areaInfo != null && areaInfo.NodeAt == null && this.ClientRectangle.Contains(p.X, p.Y))
+            {
+                lastVisibleNode = NodeOperations.GetLastVisibleTopLevelNode(this);
+                if (lastVisibleNode != null && p.Y >= lastVisibleNode.Bounds.Y)
+                    areaInfo.NodeAt = lastVisibleNode;
+            }
+
+            if (areaInfo != null && areaInfo.NodeAt != null && !GetNodesContain((Node[])m_DragNode.Tag, areaInfo.NodeAt) && !NodeOperations.IsChildOfAnyParent((Node[])m_DragNode.Tag, areaInfo.NodeAt))
+            {
+                Rectangle r = NodeDisplay.GetNodeRectangle(eNodeRectanglePart.NodeBounds, areaInfo.NodeAt, m_NodeDisplay.Offset);
+                Rectangle rContent = NodeDisplay.GetNodeRectangle(eNodeRectanglePart.NodeContentBounds, areaInfo.NodeAt, m_NodeDisplay.Offset);
+
+                if (_View == eView.Tile)
+                {
+                    if (areaInfo.NodeAt == lastVisibleNode)
+                    {
+                        // Drop at the end of the tree as new parent
+                        MultiNodeTreeDragFeedbackEventArgs feedbackArgs = new MultiNodeTreeDragFeedbackEventArgs(null, this.Nodes.Count, (Node[])m_DragNode.Tag, drgevent.Effect);
+                        OnNodeDragFeedback(feedbackArgs);
+                        if (feedbackArgs.AllowDrop)
+                        {
+                            // Adding the drag node as child node
+                            newDragInfo = new NodeDragInfo(feedbackArgs.ParentNode, feedbackArgs.InsertPosition);
+                            if (feedbackArgs.EffectSet)
+                                drgevent.Effect = feedbackArgs.Effect;
+                        }
+                        else
+                            drgevent.Effect = DragDropEffects.None;
+                    }
+                    else if ((areaInfo.NodeAt.HasChildNodes || areaInfo.NodeAt.Parent == null))
+                    {
+                        // Drop as child
+                        MultiNodeTreeDragFeedbackEventArgs feedbackArgs = new MultiNodeTreeDragFeedbackEventArgs(areaInfo.NodeAt, -1, (Node[])m_DragNode.Tag, drgevent.Effect);
+                        OnNodeDragFeedback(feedbackArgs);
+                        if (feedbackArgs.AllowDrop)
+                        {
+                            // Adding the drag node as child node
+                            newDragInfo = new NodeDragInfo(feedbackArgs.ParentNode, feedbackArgs.InsertPosition);
+                            if (feedbackArgs.EffectSet)
+                                drgevent.Effect = feedbackArgs.Effect;
+                        }
+                        else
+                            drgevent.Effect = DragDropEffects.None;
+                    }
+                    else
+                    {
+                        TreeDragFeedbackEventArgs feedbackArgs = null;
+                        // Pick insert position based on X position within the mouse over node. X<node.Width/2 insert before otherwise insert after
+                        if (p.X < (r.X + r.Width / 3))
+                            feedbackArgs = new MultiNodeTreeDragFeedbackEventArgs(areaInfo.NodeAt.Parent, areaInfo.NodeAt.Index - 1, (Node[])m_DragNode.Tag, drgevent.Effect);
+                        else
+                        {
+                            if (p.Y < rContent.Y)
+                                feedbackArgs = new MultiNodeTreeDragFeedbackEventArgs(areaInfo.NodeAt.Parent, areaInfo.NodeAt.Index + 1, (Node[])m_DragNode.Tag, drgevent.Effect);
+                            else if (areaInfo.NodeAt.Expanded && areaInfo.NodeAt.Nodes.Count > 0)
+                                feedbackArgs = new MultiNodeTreeDragFeedbackEventArgs(areaInfo.NodeAt, -1, (Node[])m_DragNode.Tag);
+                            else
+                                feedbackArgs = new MultiNodeTreeDragFeedbackEventArgs(areaInfo.NodeAt.Parent, areaInfo.NodeAt.Index, (Node[])m_DragNode.Tag, drgevent.Effect);
+                        }
+                        OnNodeDragFeedback(feedbackArgs);
+                        if (feedbackArgs.AllowDrop)
+                        {
+                            // Adding the drag node as child node
+                            newDragInfo = new NodeDragInfo(feedbackArgs.ParentNode, feedbackArgs.InsertPosition);
+                            if (feedbackArgs.EffectSet)
+                                drgevent.Effect = feedbackArgs.Effect;
+                        }
+                        else
+                            drgevent.Effect = DragDropEffects.None;
+                    }
+                }
+                else
+                {
+                    // Determine drag node insert position
+                    if (p.X > rContent.X + _DropAsChildOffset)
+                    {
+                        MultiNodeTreeDragFeedbackEventArgs feedbackArgs = new MultiNodeTreeDragFeedbackEventArgs(areaInfo.NodeAt, -1, (Node[])m_DragNode.Tag, drgevent.Effect);
+                        OnNodeDragFeedback(feedbackArgs);
+                        if (feedbackArgs.AllowDrop)
+                        {
+                            // Adding the drag node as child node
+                            newDragInfo = new NodeDragInfo(feedbackArgs.ParentNode, feedbackArgs.InsertPosition);
+                            if (feedbackArgs.EffectSet)
+                                drgevent.Effect = feedbackArgs.Effect;
+                        }
+                        else
+                            drgevent.Effect = DragDropEffects.None;
+                    }
+                    else
+                    {
+                        TreeDragFeedbackEventArgs feedbackArgs = null;
+                        // Pick insert position based on Y position within the mouse over node. y<node.Height/2 insert before otherwise insert after
+                        if (p.Y < (r.Y + r.Height / 3))
+                            feedbackArgs = new MultiNodeTreeDragFeedbackEventArgs(areaInfo.NodeAt.Parent, areaInfo.NodeAt.Index - 1, (Node[])m_DragNode.Tag, drgevent.Effect);
+                        else
+                        {
+                            if (p.X < rContent.X)
+                                feedbackArgs = new MultiNodeTreeDragFeedbackEventArgs(areaInfo.NodeAt.Parent, areaInfo.NodeAt.Index + 1, (Node[])m_DragNode.Tag, drgevent.Effect);
+                            else if (areaInfo.NodeAt.Expanded && areaInfo.NodeAt.Nodes.Count > 0)
+                                feedbackArgs = new MultiNodeTreeDragFeedbackEventArgs(areaInfo.NodeAt, -1, (Node[])m_DragNode.Tag);
+                            else
+                                feedbackArgs = new MultiNodeTreeDragFeedbackEventArgs(areaInfo.NodeAt.Parent, areaInfo.NodeAt.Index, (Node[])m_DragNode.Tag, drgevent.Effect);
+                        }
+                        OnNodeDragFeedback(feedbackArgs);
+                        if (feedbackArgs.AllowDrop)
+                        {
+                            // Adding the drag node as child node
+                            newDragInfo = new NodeDragInfo(feedbackArgs.ParentNode, feedbackArgs.InsertPosition);
+                            if (feedbackArgs.EffectSet)
+                                drgevent.Effect = feedbackArgs.Effect;
+                        }
+                        else
+                            drgevent.Effect = DragDropEffects.None;
+                    }
+                }
+            }
+            else if (m_Nodes.Count == 0) // Drop into empty tree
+            {
+                MultiNodeTreeDragFeedbackEventArgs feedbackArgs = new MultiNodeTreeDragFeedbackEventArgs(null, 0, (Node[])m_DragNode.Tag, drgevent.Effect);
+                OnNodeDragFeedback(feedbackArgs);
+                if (feedbackArgs.AllowDrop)
+                {
+                    // Adding the drag node as child node
+                    newDragInfo = new NodeDragInfo(null, 0);
+                    if (feedbackArgs.EffectSet)
+                        drgevent.Effect = feedbackArgs.Effect;
+                }
+                else
+                    drgevent.Effect = DragDropEffects.None;
+            }
+            else
+            {
+                Rectangle temp = this.ClientRectangle;
+                temp.Inflate(32, 32);
+                if (AutoScroll && temp.Contains(p))
+                {
+                    if (p.Y < 0)
+                    {
+                        if (_VScrollBar != null && _VScrollBar.Value > 0)
+                            _VScrollBar.Value -= _VScrollBar.SmallChange;
+                    }
+                    else if (p.Y > this.ClientRectangle.Bottom)
+                    {
+                        if (_VScrollBar != null && _VScrollBar.Value + _VScrollBar.SmallChange < _VScrollBar.Maximum)
+                            _VScrollBar.Value += _VScrollBar.SmallChange;
+                    }
+
+                }
+                drgevent.Effect = DragDropEffects.None;
+            }
+
+            bool update = false;
+            if (newDragInfo != null)
+            {
+                if (_DragInfo == null)
+                {
+                    _DragInfo = newDragInfo;
+                    InvalidateDragInfo(_DragInfo);
+                    update = true;
+                }
+                else if (_DragInfo.Parent != newDragInfo.Parent || _DragInfo.InsertIndex != newDragInfo.InsertIndex)
+                {
+                    InvalidateDragInfo(_DragInfo);
+                    InvalidateDragInfo(newDragInfo);
+                    _DragInfo = newDragInfo;
+                    update = true;
+                }
+            }
+            else if (newDragInfo != _DragInfo)
+            {
+                InvalidateDragInfo(_DragInfo);
+                _DragInfo = null;
+                update = true;
+            }
+
+            m_DragNode.SetBounds(new Rectangle(p.X, p.Y, m_DragNode.BoundsRelative.Width, m_DragNode.BoundsRelative.Height));
+            m_DragNode.Visible = true;
+            InvalidateNode(m_DragNode);
+
+            if (update)
+            {
+                if (this.DesignMode)
+                    this.Refresh();
+                else
+                    this.Update();
+            }
+        }
+
+        
+        private void InvalidateDragInfo(NodeDragInfo dragInfo)
+        {
+            if (dragInfo == null) return;
+            Rectangle r = GetDragInsertionBounds(dragInfo);
+            if (!r.IsEmpty)
+            {
+                r.Inflate(1, 1);
+                Invalidate(r);
+            }
+        }
+
+        private Node GetDragInfoReferenceNode(NodeDragInfo dragInfo)
+        {
+            Node referenceNode = null;
+            NodeCollection col = null;
+            if (dragInfo.Parent != null)
+            {
+                col = dragInfo.Parent.Nodes;
+            }
+            else
+            {
+                col = this.Nodes;
+            }
+
+            if (col.Count > 0)
+            {
+                if (dragInfo.InsertIndex <= 0)
+                    referenceNode = col[0];
+                else if (dragInfo.InsertIndex >= col.Count)
+                    referenceNode = col[col.Count - 1];
+                else
+                    referenceNode = col[dragInfo.InsertIndex];
+            }
+
+            return referenceNode;
+        }
+        internal static readonly int DragInsertMarkSize = 9;
+        internal Rectangle GetDragInsertionBounds(NodeDragInfo dragInfo)
+        {
+            if (dragInfo == null) return Rectangle.Empty;
+
+            Rectangle r = Rectangle.Empty;
+
+            Node referenceNode = GetDragInfoReferenceNode(dragInfo);
+
+            Node parentDragNode = dragInfo.Parent;
+            if (_View == eView.Tile)
+            {
+                //Console.WriteLine(dragInfo);
+                if (referenceNode != null)
+                {
+                    r = NodeDisplay.GetNodeRectangle(eNodeRectanglePart.NodeContentBounds, referenceNode, m_NodeDisplay.Offset);
+                    if (dragInfo.InsertIndex == -1)
+                        r.X -= 4;
+                    else
+                        r.X = r.Right - DragInsertMarkSize;
+                    r.Height = referenceNode.Bounds.Height;
+                    r.Width = DragInsertMarkSize;
+                }
+                else if (parentDragNode != null)
+                {
+                    r = NodeDisplay.GetNodeRectangle(eNodeRectanglePart.NodeContentBounds, parentDragNode, m_NodeDisplay.Offset);
+                    r.X += this.Indent;
+                    if (!parentDragNode.HasChildNodes)
+                        r.Y = r.Bottom - DragInsertMarkSize;
+                    r.Width = parentDragNode.Bounds.Width;
+                    r.Height = DragInsertMarkSize;
+                }
+            }
+            else
+            {
+                if (referenceNode != null)
+                {
+                    r = NodeDisplay.GetNodeRectangle(eNodeRectanglePart.NodeContentBounds, referenceNode, m_NodeDisplay.Offset);
+                    r.Width = referenceNode.Bounds.Width;
+                    if (referenceNode.Expanded && dragInfo.InsertIndex >= 0)
+                    {
+                        Rectangle childBounds = NodeDisplay.GetNodeRectangle(eNodeRectanglePart.ChildNodeBounds, referenceNode, m_NodeDisplay.Offset);
+                        r.Y = childBounds.Bottom - r.Height;
+                    }
+                }
+                else if (parentDragNode != null)
+                {
+                    r = NodeDisplay.GetNodeRectangle(eNodeRectanglePart.NodeContentBounds, parentDragNode, m_NodeDisplay.Offset);
+                    r.X += this.Indent;
+                    r.Width = parentDragNode.Bounds.Width;
+                }
+
+                if (dragInfo.InsertIndex < 0 && referenceNode != null)
+                    r.Y -= 4;
+                else
+                    r.Y = r.Bottom - 2;
+                r.Height = DragInsertMarkSize;
+            }
+
+            return r;
+        }
+
+        private int _Indent = 16;
+        /// <summary>
+        /// Gets or sets the distance to indent each of the child tree node levels. Default value is 16.
+        /// </summary>
+        [DefaultValue(16), Description("Indicates distance to indent each of the child tree node levels."), Category("Appearance")]
+        public int Indent
+        {
+            get { return _Indent; }
+            set
+            {
+                if (_Indent != value)
+                {
+                    _Indent = value;
+                    if (m_NodeLayout is NodeTreeLayout)
+                        ((NodeTreeLayout)m_NodeLayout).NodeLevelOffset = value;
+                    InvalidateNodesSize();
+                    RecalcLayout();
+                }
+            }
+        }
+
+        private bool _PaintDragDropInsertMarker = true;
+        /// <summary>
+        /// Indicates whether drop marker is displayed during drag-drop operation.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether drop marker is displayed during drag-drop operation.")]
+        public bool PaintDragDropInsertMarker
+        {
+            get { return _PaintDragDropInsertMarker; }
+            set
+            {
+                _PaintDragDropInsertMarker = value;
+                if (IsDragDropInProgress && _DragInfo != null)
+                    InvalidateDragInfo(_DragInfo);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether drag and drop operation is in progress. This member supports
+        /// the AdvTree infrastructure and is not intended to be used directly from your
+        /// code.
+        /// </summary>
+        [Browsable(false)]
+        public bool IsDragDropInProgress
+        {
+            get { return (m_DragNode != null); }
+        }
+
+        private Node[] SortNodesByFlatIndex(Node[] dragNodes)
+        {
+            ArrayList nodes = new ArrayList(dragNodes);
+            nodes.Sort(new NodeFlatIndexComparer(this));
+            nodes.CopyTo(dragNodes);
+            return dragNodes;
+        }
+        private void ReleaseDragNode(bool drop)
+        {
+            if (m_DragNode == null)
+                return;
+            bool isCopy = (Control.ModifierKeys == Keys.Control && _DragDropNodeCopyEnabled);
+
+            this.BeginUpdate();
+            try
+            {
+                if (m_NodeDisplay.LockOffset)
+                    m_NodeDisplay.LockOffset = false;
+
+                Node[] dragNodes = m_DragNode.Tag as Node[];
+                foreach (Node item in dragNodes)
+                {
+                    if (!item.Visible) item.Visible = true;
+                }
+
+                if (drop && _DragInfo != null)
+                {
+                    Node parent = _DragInfo.Parent;
+                    // Fire off events and cancel processing if needed
+                    TreeDragDropEventArgs e = new TreeDragDropEventArgs(eTreeAction.Mouse, dragNodes, dragNodes[0].Parent, parent, isCopy, _DragInfo.InsertIndex);
+                    InvokeBeforeNodeDrop(e);
+                    if (!e.Cancel && e.Nodes != null && e.Nodes.Length > 0)
+                    {
+                        isCopy = e.IsCopy;
+                        dragNodes = e.Nodes;
+                        int index = e.InsertPosition + 1;
+
+                        if (dragNodes.Length > 1)
+                            dragNodes = SortNodesByFlatIndex(dragNodes);
+                        Node[] afterDragNodes = new Node[dragNodes.Length];
+                        for (int i = 0; i < dragNodes.Length; i++)
+                        {
+                            Node childNode = dragNodes[i];
+                            Node node = childNode;
+                            if (NodeOperations.IsChildOfAnyParent(dragNodes, node)) continue;
+
+                            if (isCopy)
+                            {
+                                node = node.DeepCopy();
+                            }
+                            else
+                            {
+                                if (parent != null)
+                                {
+                                    if (node.Parent == parent && parent.Nodes.IndexOf(node) < index)
+                                        index--;
+                                }
+                                else
+                                {
+                                    if (node.Parent == null && node.TreeControl == this && this.Nodes.IndexOf(node) < index)
+                                        index--;
+                                }
+                                node.Remove(eTreeAction.Mouse);
+                            }
+                            afterDragNodes[i] = node;
+
+                            // Adjust index in case node was removed and flat indexes changed
+                            if (index < 0)
+                                index = 0;
+                            else if (parent != null && index > parent.Nodes.Count)
+                                index = parent.Nodes.Count;
+                            else if (parent == null && index > this.Nodes.Count)
+                                index = this.Nodes.Count;
+
+                            if (parent == null)
+                                this.Nodes.Insert(index, node, eTreeAction.Mouse);
+                            else
+                            {
+                                parent.Nodes.Insert(index, node, eTreeAction.Mouse);
+                                if (!parent.Expanded)
+                                    parent.Expanded = true;
+                            }
+                            index++;
+                        }
+                        e.Nodes = afterDragNodes;
+                        InvokeAfterNodeDrop(e);
+                    }
+                }
+                _DragInfo = null;
+            }
+            finally
+            {
+                m_DragNode = null;
+                if (!m_PendingLayout)
+                {
+                    this.EndUpdate();
+                    this.RecalcLayout();
+                    this.Refresh();
+                }
+                else
+                    this.EndUpdate();
+            }
+        }
+
+        /// <summary>
+        /// Raises the NodeDragStart event.
+        /// </summary>
+        /// <param name="sender">Reference to node being dragged.</param>
+        /// <param name="e">Event parameters</param>
+        protected virtual void OnNodeDragStart(object sender, EventArgs e)
+        {
+            EventHandler eh = NodeDragStart;
+            if (eh != null)
+                eh(sender, e);
+        }
+        
+        private bool IsExternalTreeDrop(DragEventArgs e)
+        {
+            if (e.Data != null)
+            {
+                Node node = null;
+                Node[] nodes = null;
+                if (e.Data.GetDataPresent(typeof(Node)))
+                    node = e.Data.GetData(typeof(Node)) as Node;
+                else if (e.Data.GetDataPresent(typeof(Node[])))
+                    nodes = e.Data.GetData(typeof(Node[])) as Node[];
+                else if (e.Data.GetFormats().Length > 0)
+                {
+                    node = e.Data.GetData(e.Data.GetFormats()[0]) as Node;
+                    nodes = e.Data.GetData(e.Data.GetFormats()[0]) as Node[];
+                }
+
+                if (node != null && node.TreeControl != this)
+                    return true;
+                else if (nodes != null && nodes.Length > 0)
+                {
+                    if (nodes[0].TreeControl != this)
+                        return true;
+                }
+            }
+
+            return false;
+        }
+
+        private void CreateDragNode(DragEventArgs e)
+        {
+            if (e.Data != null)
+            {
+                Node node = null;
+                Node[] nodes = null;
+                if (e.Data.GetDataPresent(typeof(Node)))
+                    node = e.Data.GetData(typeof(Node)) as Node;
+                else if (e.Data.GetDataPresent(typeof(Node[])))
+                    nodes = e.Data.GetData(typeof(Node[])) as Node[];
+                else if (e.Data.GetFormats().Length > 0)
+                {
+                    node = e.Data.GetData(e.Data.GetFormats()[0]) as Node;
+                    nodes = e.Data.GetData(e.Data.GetFormats()[0]) as Node[];
+                }
+
+                if (node != null)
+                    CreateDragNode(new Node[1] { node });
+                else if (nodes != null && nodes.Length > 0)
+                {
+                    CreateDragNode(nodes);
+                }
+            }
+        }
+
+        private bool _MultiNodeDragCountVisible = true;
+        /// <summary>
+        /// Gets or sets whether number of nodes being dragged is displayed on drag node preview. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Selection"), Description("Indicates whether number of nodes being dragged is displayed on drag node preview.")]
+        public bool MultiNodeDragCountVisible
+        {
+            get
+            {
+                return _MultiNodeDragCountVisible;
+            }
+            set
+            {
+                _MultiNodeDragCountVisible = value;
+            }
+        }
+        private void CreateDragNode(Node[] nodes)
+        {
+            AdvTreeMultiNodeCancelEventArgs eventArgs = new AdvTreeMultiNodeCancelEventArgs(eTreeAction.Mouse, nodes);
+            OnBeforeNodeDragStart(eventArgs);
+            if (eventArgs.Cancel) return;
+
+            m_DragNode = nodes[0].Copy();
+            m_DragNode.Tag = nodes;
+            m_DragNode.IsDragNode = true;
+            PrepareDragNodeElementStyle(m_DragNode, nodes[0]);
+
+            if (nodes.Length > 1 && this.MultiNodeDragCountVisible)
+            {
+                Cell cell = new Cell();
+                cell.Text = nodes.Length.ToString();
+                cell.StyleNormal = new ElementStyle();
+                cell.StyleNormal.BackColor = ColorScheme.GetColor(0x40408C);
+                cell.StyleNormal.BackColor2 = ColorScheme.GetColor(0x0093F9);
+                cell.StyleNormal.BackColorGradientAngle = 90;
+                cell.StyleNormal.TextColor = Color.White;
+                cell.StyleNormal.Padding = 3;
+                cell.Name = "sysNodeCount";
+                cell.Tag = m_DragNode.Tag;
+                m_DragNode.Tag = null;
+                m_DragNode.Cells.Insert(0, cell);
+            }
+
+            m_DragNode.Visible = false;
+            m_NodeLayout.PerformSingleNodeLayout(m_DragNode);
+            this.Refresh();
+            OnNodeDragStart(nodes[0], new EventArgs());
+        }
+
+        /// <summary>
+        /// Raises BeforeNodeDragStart event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnBeforeNodeDragStart(AdvTreeNodeCancelEventArgs e)
+        {
+            if (BeforeNodeDragStart != null) BeforeNodeDragStart(this, e);
+        }
+
+        private void PrepareDragNodeElementStyle(Node dragNode, Node originalNode)
+        {
+            // Setup half transparent styles
+            int alpha = 128;
+            ElementStyle style = null;
+            if (originalNode.Style != null)
+                style = originalNode.Style.Copy();
+            else if (this.NodeStyle != null)
+                style = this.NodeStyle.Copy();
+            else
+            {
+                style = new ElementStyle();
+                style.TextColorSchemePart = eColorSchemePart.ItemText;
+            }
+            ElementStyle.SetColorsAlpha(style, alpha);
+            dragNode.Style = style;
+
+            if (this.CellStyleDefault != null)
+                style = this.CellStyleDefault.Copy();
+            else
+                style = ElementStyle.GetDefaultCellStyle(dragNode.Style);
+            ElementStyle.SetColorsAlpha(style, alpha);
+            foreach (Cell cell in dragNode.Cells)
+            {
+                cell.StyleNormal = style;
+            }
+
+            for (int i = 0; i < dragNode.Cells.Count; i++)
+            {
+                if (originalNode.Cells[i].StyleNormal != null)
+                {
+                    ElementStyle cellStyle = originalNode.Cells[i].StyleNormal.Copy();
+                    ElementStyle.SetColorsAlpha(style, alpha);
+                    dragNode.Cells[i].StyleNormal = cellStyle;
+                }
+                else
+                    dragNode.Cells[i].StyleNormal = style;
+            }
+        }
+
+        private bool _MultiNodeDragDropAllowed = true;
+        /// <summary>
+        /// Gets or sets whether multiple nodes drag &amp; drop is enabled. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Selection"), Description("Indicates whether multiple nodes drag & drop is enabled.")]
+        public bool MultiNodeDragDropAllowed
+        {
+            get
+            {
+                return _MultiNodeDragDropAllowed;
+            }
+            set
+            {
+                _MultiNodeDragDropAllowed = value;
+            }
+        }
+        private bool StartDragDrop()
+        {
+            if (m_MouseOverNode == null)
+                return false;
+
+            if (this.MultiSelect && this.SelectedNodes.Count > 1 && this.MultiNodeDragDropAllowed)
+            {
+                Node[] nodes = new Node[this.SelectedNodes.Count];
+                this.SelectedNodes.CopyTo(nodes);
+                return StartDragDrop(nodes);
+            }
+
+            return StartDragDrop(m_MouseOverNode);
+        }
+
+        private bool StartDragDrop(Node[] nodes)
+        {
+            if (IsDragDropInProgress)
+                return false;
+
+            _SelectOnMouseUp = false;
+            foreach (Node node in nodes)
+            {
+                if (!node.DragDropEnabled || node == m_DisplayRootNode)
+                    return false;
+                if (node.IsMouseDown)
+                    OnNodeMouseUp(new MouseEventArgs(Control.MouseButtons, 0, 0, 0, 0));
+            }
+
+            this.EndCellEditing(eTreeAction.Mouse);
+
+            Point m_MouseDownPoint = Control.MousePosition;
+
+            if (this.DesignMode)
+                CreateDragNode(nodes);
+            else
+                this.DoDragDrop(nodes, DragDropEffects.Copy | DragDropEffects.Link | DragDropEffects.Move | DragDropEffects.Scroll);
+
+            return true;
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool StartDragDrop(Node node)
+        {
+            if (IsDragDropInProgress || !node.DragDropEnabled)
+                return false;
+
+            this.EndCellEditing(eTreeAction.Mouse);
+
+            if (node.IsMouseDown)
+                OnNodeMouseUp(new MouseEventArgs(Control.MouseButtons, 0, 0, 0, 0));
+
+            if (node == m_DisplayRootNode /*|| node.Parent==null*/) // Drag & drop in designer means that parent is null
+                return false;
+
+            Point m_MouseDownPoint = Control.MousePosition;
+
+            if (this.DesignMode)
+                CreateDragNode(new Node[1] { node });
+            else
+                this.DoDragDrop(node, DragDropEffects.Copy | DragDropEffects.Link | DragDropEffects.Move | DragDropEffects.Scroll);
+
+            return true;
+        }
+
+        /// <summary>
+        /// Returns the display root node.
+        /// </summary>
+        /// <returns>Instance of node or null if there is no display root node.</returns>
+        internal Node GetDisplayRootNode()
+        {
+            if (m_DisplayRootNode != null)
+                return m_DisplayRootNode;
+            if (this.Nodes.Count > 0)
+                return this.Nodes[0];
+            return null;
+        }
+
+        /// <summary>
+        /// Returns reference to the node involved in drag-drop operation if any.
+        /// </summary>
+        /// <returns>Reference to node object or null if there is no drag node.</returns>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public Node GetDragNode()
+        {
+            return m_DragNode;
+        }
+
+        /// <summary>
+        /// Returns the reference to node drag information class that gives information about node drag & drop.
+        /// </summary>
+        /// <returns>Reference to node drag info object or null if no drag information is available</returns>
+        internal NodeDragInfo GetNodeDragInfo()
+        {
+            return _DragInfo;
+        }
+        #endregion
+
+        #region ISupportInitialize
+        /// <summary>
+        /// This member supports the .NET Framework infrastructure and is not intended to be
+        /// used directly from your code.
+        /// </summary>
+        public void BeginInit()
+        {
+            this.BeginUpdate();
+        }
+
+        /// <summary>
+        /// This member supports the .NET Framework infrastructure and is not intended to be
+        /// used directly from your code.
+        /// </summary>
+        public void EndInit()
+        {
+            this.EndUpdate();
+        }
+        #endregion
+
+        #region Property Hiding
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public new System.Windows.Forms.Padding Padding
+        {
+            get
+            {
+                return base.Padding;
+            }
+            set
+            {
+                //base.Padding = value;
+            }
+        }
+
+        [Browsable(false)]
+        public override Image BackgroundImage
+        {
+            get
+            {
+                return base.BackgroundImage;
+            }
+            set
+            {
+                base.BackgroundImage = value;
+            }
+        }
+#if FRAMEWORK20
+        [Browsable(false)]
+        public override ImageLayout BackgroundImageLayout
+        {
+            get
+            {
+                return base.BackgroundImageLayout;
+            }
+            set
+            {
+                base.BackgroundImageLayout = value;
+            }
+        }
+#endif
+        #endregion
+
+        #region Licensing
+#if !TRIAL
+        private string m_LicenseKey = "";
+        private bool m_DialogDisplayed = false;
+        [Browsable(false), DefaultValue("")]
+        public string LicenseKey
+        {
+            get { return m_LicenseKey; }
+            set
+            {
+                if (NodeOperations.ValidateLicenseKey(value))
+                    return;
+                m_LicenseKey = (!NodeOperations.CheckLicenseKey(value) ? "9dsjkhds7" : value);
+            }
+        }
+#endif
+        #endregion
+
+        #region BarAccessibleObject
+        public class AdvTreeAccessibleObject : System.Windows.Forms.Control.ControlAccessibleObject
+        {
+            AdvTree _Owner = null;
+            public AdvTreeAccessibleObject(AdvTree owner)
+                : base(owner)
+            {
+                _Owner = owner;
+            }
+
+            internal void GenerateEvent(Node sender, System.Windows.Forms.AccessibleEvents e)
+            {
+                int iChild = _Owner.Nodes.IndexOf(sender);
+                if (iChild >= 0)
+                {
+                    if (_Owner != null && !_Owner.IsDisposed)
+                        _Owner.AccessibilityNotifyClients(e, iChild);
+                }
+            }
+
+            public override AccessibleRole Role
+            {
+                get
+                {
+                    if (_Owner != null && !_Owner.IsDisposed)
+                        return _Owner.AccessibleRole;
+                    return System.Windows.Forms.AccessibleRole.None;
+                }
+            }
+
+            public override AccessibleObject Parent
+            {
+                get
+                {
+                    if (_Owner != null && !_Owner.IsDisposed)
+                        return _Owner.Parent.AccessibilityObject;
+                    return null;
+                }
+            }
+
+            public override Rectangle Bounds
+            {
+                get
+                {
+                    if (_Owner != null && !_Owner.IsDisposed && _Owner.Parent != null)
+                        return this._Owner.Parent.RectangleToScreen(_Owner.Bounds);
+                    return Rectangle.Empty;
+                }
+            }
+
+            public override int GetChildCount()
+            {
+                if (_Owner != null && !_Owner.IsDisposed && _Owner.Nodes != null)
+                    return _Owner.Nodes.Count;
+                return 0;
+            }
+
+            public override System.Windows.Forms.AccessibleObject GetChild(int iIndex)
+            {
+                if (_Owner != null && !_Owner.IsDisposed && _Owner.Nodes != null)
+                    return _Owner.Nodes[iIndex].AccessibleObject;
+                return null;
+            }
+
+            public override AccessibleStates State
+            {
+                get
+                {
+                    AccessibleStates state = AccessibleStates.Default;
+                    if (_Owner == null || _Owner.IsDisposed)
+                        return AccessibleStates.None;
+                    if (_Owner.Focused)
+                        state = AccessibleStates.Focused;
+
+                    return state;
+                }
+            }
+        }
+        private bool _ResetAutoScrollPositionOnClearedNodes=true;
+        /// <summary>
+        /// Indicates whether AutoScrollPosition is reset to 0,0 when all nodes are cleared from the tree. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Browsable(false)]
+        public bool ResetAutoScrollPositionOnClearedNodes
+        {
+            get { return _ResetAutoScrollPositionOnClearedNodes; }
+            set
+            {
+                _ResetAutoScrollPositionOnClearedNodes = value;
+            }
+        }
+        
+        internal void OnNodesCleared()
+        {
+            if (m_NodeDisplay != null)
+                m_NodeDisplay.PaintedNodes.Clear();
+            if (_FullRowBackgroundNodes != null)
+                _FullRowBackgroundNodes.Clear();
+            if (this.MultiSelect && this.SelectedNodes.Count > 0) this.SelectedNodes.Clear();
+            if (_ResetAutoScrollPositionOnClearedNodes)
+                this.AutoScrollPosition = Point.Empty;
+            this.SelectedNode = null;
+            if (this.IsHandleCreated)
+                this.RecalcLayout();
+            else
+                SetPendingLayout();
+        }
+
+        internal Rectangle GetPaintRectangle()
+        {
+            Rectangle rect = this.ClientRectangle;
+            if (_ColumnHeader != null && _ColumnHeader.Visible)
+            {
+                rect.Y += _ColumnHeader.Height;
+                rect.Height -= _ColumnHeader.Height;
+            }
+            if (_VScrollBar != null && _VScrollBar.Visible)
+            {
+                rect.Width -= _VScrollBar.Width;
+            }
+            if (_HScrollBar != null && _HScrollBar.Visible)
+            {
+                rect.Height -= _HScrollBar.Height;
+            }
+            return rect;
+        }
+
+        #endregion
+
+        #region Data-binding
+#if FRAMEWORK20
+        private List<BindingMemberInfo> _DisplayMembers = null;
+        /// <summary>
+        /// Gets or sets the comma separated list of property or column names to display on popup tree control.
+        /// </summary>
+        [DefaultValue(""), Category("Data"), Description("Indicates comma separated list of property or column names to display on popup tree control")]
+        [Editor("DevComponents.DotNetBar.Design.DataMembersSelector, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor))]
+        public string DisplayMembers
+        {
+            get
+            {
+                if (_DisplayMembers == null || _DisplayMembers.Count == 0)
+                    return "";
+                StringBuilder members = new StringBuilder();
+                for (int i = 0; i < _DisplayMembers.Count; i++)
+                {
+                    BindingMemberInfo item = _DisplayMembers[i];
+                    members.Append(item.BindingMember);
+                    if (i + 1 < _DisplayMembers.Count)
+                        members.Append(',');
+                }
+                return members.ToString();
+            }
+            set
+            {
+                List<BindingMemberInfo> displayMembers = _DisplayMembers;
+
+                List<BindingMemberInfo> newMembers = null;
+
+                if (!string.IsNullOrEmpty(value))
+                {
+                    newMembers = new List<BindingMemberInfo>();
+                    // Parse the members comma separated list expected...
+                    string[] members = value.Split(',');
+                    for (int i = 0; i < members.Length; i++)
+                    {
+                        newMembers.Add(new BindingMemberInfo(members[i].Trim()));
+                    }
+                }
+
+                try
+                {
+                    this.SetDataConnection(_DataSource, newMembers, false);
+                }
+                catch
+                {
+                    _DisplayMembers = displayMembers;
+                }
+            }
+        }
+
+        private object _DataSource = null;
+        /// <summary>
+        /// Gets or sets the data source for the ComboTree. Expected is an object that implements the IList or IListSource interfaces, 
+        /// such as a DataSet or an Array. The default is null.
+        /// </summary>
+        [AttributeProvider(typeof(IListSource)), Description("Indicates data source for the ComboTree."), Category("Data"), DefaultValue(null), RefreshProperties(RefreshProperties.Repaint)]
+        public object DataSource
+        {
+            get
+            {
+                return _DataSource;
+            }
+            set
+            {
+                if (((value != null) && !(value is IList)) && !(value is IListSource))
+                {
+                    throw new ArgumentException("Data type is not supported for complex data binding");
+                }
+                //if (_DataSource != value)
+                {
+                    ClearDescriptorsCache();
+                    try
+                    {
+                        this.SetDataConnection(value, _DisplayMembers, true);
+                    }
+                    catch
+                    {
+                        this.DisplayMembers = "";
+                    }
+                    if (value == null)
+                    {
+                        this.DisplayMembers = "";
+                    }
+                }
+            }
+        }
+
+        private bool _FormattingEnabled = false;
+        /// <summary>
+        /// Gets or sets a value indicating whether formatting is applied to the DisplayMembers property of the control.
+        /// </summary>
+        [DefaultValue(false), Description("Indicates whether formatting is applied to the DisplayMembers property of the control.")]
+        public bool FormattingEnabled
+        {
+            get
+            {
+                return _FormattingEnabled;
+            }
+            set
+            {
+                if (value != _FormattingEnabled)
+                {
+                    _FormattingEnabled = value;
+                    RefreshItems();
+                    OnFormattingEnabledChanged(EventArgs.Empty);
+                }
+            }
+        }
+        /// <summary>
+        /// Raises FormattingEnabledChanged event.
+        /// </summary>
+        /// <param name="e">Event arguments.</param>
+        protected virtual void OnFormattingEnabledChanged(EventArgs e)
+        {
+            EventHandler handler = FormattingEnabledChanged;
+            if (handler != null)
+            {
+                handler(this, e);
+            }
+        }
+
+        private string _FormatString = "";
+        /// <summary>
+        /// Gets or sets the format-specifier characters that indicate how a value is to be displayed.
+        /// </summary>
+        [MergableProperty(false), Editor("System.Windows.Forms.Design.FormatStringEditor, System.Design, Version= 2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", typeof(System.Drawing.Design.UITypeEditor)), DefaultValue(""), Description("Indicates format-specifier characters that indicate how a value is to be displayed.")]
+        public string FormatString
+        {
+            get
+            {
+                return _FormatString;
+            }
+            set
+            {
+                if (value == null)
+                {
+                    value = string.Empty;
+                }
+                if (!value.Equals(_FormatString))
+                {
+                    _FormatString = value;
+                    RefreshItems();
+                    OnFormatStringChanged(EventArgs.Empty);
+                }
+            }
+        }
+        /// <summary>
+        /// Raises FormatStringChanged event.
+        /// </summary>
+        /// <param name="e">Event arguments.</param>
+        protected virtual void OnFormatStringChanged(EventArgs e)
+        {
+            EventHandler handler = FormatStringChanged;
+            if (handler != null)
+            {
+                handler(this, e);
+            }
+        }
+
+        private IFormatProvider _FormatInfo = null;
+        /// <summary>
+        /// Gets or sets the IFormatProvider that provides custom formatting behavior. 
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Advanced), Browsable(false), DefaultValue((string)null)]
+        public IFormatProvider FormatInfo
+        {
+            get
+            {
+                return _FormatInfo;
+            }
+            set
+            {
+                if (value != _FormatInfo)
+                {
+                    _FormatInfo = value;
+                    RefreshItems();
+                    OnFormatInfoChanged(EventArgs.Empty);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Raises FormatInfoChanged event.
+        /// </summary>
+        /// <param name="e">Event arguments.</param>
+        protected virtual void OnFormatInfoChanged(EventArgs e)
+        {
+            EventHandler handler = FormatInfoChanged;
+            if (handler != null)
+            {
+                handler(this, e);
+            }
+        }
+
+
+        private bool _InSetDataConnection = false;
+        private void SetDataConnection(object newDataSource, List<BindingMemberInfo> newDisplayMembers, bool force)
+        {
+            bool dataSourceChanged = _DataSource != newDataSource;
+            bool displayMemberChanged = _DisplayMembers != newDisplayMembers;
+
+            if (!_InSetDataConnection)
+            {
+                try
+                {
+                    if ((force || dataSourceChanged) || displayMemberChanged)
+                    {
+                        _InSetDataConnection = true;
+                        IList list = (this.DataManager != null) ? this.DataManager.List : null;
+                        bool isDataManagerNull = this.DataManager == null;
+                        this.UnwireDataSource();
+                        _DataSource = newDataSource;
+                        _DisplayMembers = newDisplayMembers;
+                        this.WireDataSource();
+                        if (_IsDataSourceInitialized)
+                        {
+                            CurrencyManager manager = null;
+                            if (((newDataSource != null) && (this.BindingContext != null)) && (newDataSource != Convert.DBNull))
+                            {
+                                string bindingPath = "";
+                                if (_DisplayMembers != null && _DisplayMembers.Count > 0)
+                                    bindingPath = newDisplayMembers[0].BindingPath;
+                                manager = (CurrencyManager)this.BindingContext[newDataSource, bindingPath];
+                            }
+
+                            if (_DataManager != manager)
+                            {
+                                if (_DataManager != null)
+                                {
+                                    _DataManager.ItemChanged -= new ItemChangedEventHandler(this.DataManager_ItemChanged);
+                                    _DataManager.PositionChanged -= new EventHandler(this.DataManager_PositionChanged);
+                                }
+                                _DataManager = manager;
+                                if (_DataManager != null)
+                                {
+                                    _DataManager.ItemChanged += new ItemChangedEventHandler(this.DataManager_ItemChanged);
+                                    _DataManager.PositionChanged += new EventHandler(this.DataManager_PositionChanged);
+                                }
+                                else if (newDataSource == null)
+                                    this.Nodes.Clear();
+                            }
+                            if (((_DataManager != null) && (displayMemberChanged || dataSourceChanged)) && !ValidateDisplayMembers(_DisplayMembers))
+                            {
+                                throw new ArgumentException("Wrong DisplayMembers parameter", "newDisplayMember");
+                            }
+                            if ((_DataManager != null && (dataSourceChanged || displayMemberChanged || force))
+                                && (displayMemberChanged || dataSourceChanged || (force && ((list != _DataManager.List) || isDataManagerNull))))
+                            {
+                                DataManager_ItemChanged(_DataManager, null);
+                            }
+                        }
+                        _Converters.Clear();
+                    }
+                    if (dataSourceChanged)
+                    {
+                        this.OnDataSourceChanged(EventArgs.Empty);
+                    }
+                    if (displayMemberChanged)
+                    {
+                        this.OnDisplayMembersChanged(EventArgs.Empty);
+                    }
+                }
+                finally
+                {
+                    _InSetDataConnection = false;
+                }
+            }
+        }
+
+        private bool ValidateDisplayMembers(List<BindingMemberInfo> members)
+        {
+            if (members == null || members.Count == 0) return true;
+
+            foreach (BindingMemberInfo item in members)
+            {
+                if (item.BindingMember != null && !BindingMemberInfoInDataManager(item))
+                    return false;
+            }
+            return true;
+        }
+        private bool BindingMemberInfoInDataManager(BindingMemberInfo bindingMemberInfo)
+        {
+            if (_DataManager != null)
+            {
+                PropertyDescriptorCollection itemProperties = _DataManager.GetItemProperties();
+                int count = itemProperties.Count;
+                for (int i = 0; i < count; i++)
+                {
+                    if (!typeof(IList).IsAssignableFrom(itemProperties[i].PropertyType) && itemProperties[i].Name.Equals(bindingMemberInfo.BindingField))
+                    {
+                        return true;
+                    }
+                }
+                for (int j = 0; j < count; j++)
+                {
+                    if (!typeof(IList).IsAssignableFrom(itemProperties[j].PropertyType) && (string.Compare(itemProperties[j].Name, bindingMemberInfo.BindingField, true, CultureInfo.CurrentCulture) == 0))
+                    {
+                        return true;
+                    }
+                }
+            }
+            return false;
+        }
+        /// <summary>
+        /// Raises the DataSourceChanged event.
+        /// </summary>
+        /// <param name="e">An EventArgs that contains the event data. </param>
+        protected virtual void OnDataSourceChanged(EventArgs e)
+        {
+            EventHandler handler = DataSourceChanged;
+            if (handler != null)
+            {
+                handler(this, e);
+            }
+        }
+        /// <summary>
+        /// Raises the DisplayMemberChanged event.
+        /// </summary>
+        /// <param name="e">An EventArgs that contains the event data. </param>
+        protected virtual void OnDisplayMembersChanged(EventArgs e)
+        {
+            EventHandler handler = DisplayMembersChanged;
+            if (handler != null)
+            {
+                handler(this, e);
+            }
+        }
+
+        private Hashtable _Converters = new Hashtable();
+        private TypeConverter GetFieldConverter(string fieldName)
+        {
+            if (_Converters.ContainsKey(fieldName))
+                return (TypeConverter)_Converters[fieldName];
+            if (this.DataManager != null)
+            {
+                PropertyDescriptorCollection itemProperties = this.DataManager.GetItemProperties();
+                if (itemProperties != null)
+                {
+                    PropertyDescriptor descriptor = itemProperties.Find(fieldName, true);
+                    if (descriptor != null)
+                    {
+                        _Converters.Add(fieldName, descriptor.Converter);
+                        return descriptor.Converter;
+                    }
+                }
+            }
+
+            return null;
+        }
+
+        private void DataManager_ItemChanged(object sender, ItemChangedEventArgs e)
+        {
+            if (this.InvokeRequired)
+            {
+                this.Invoke(new ItemChangedEventHandler(DataManager_ItemChanged), sender, e);
+                return;
+            }
+            if (_DataManager != null)
+            {
+                if (e == null || e.Index == -1)
+                {
+                    this.SetItemsCore(_DataManager.List);
+                    if (this.AllowSelection)
+                    {
+                        if (_DataManager.Position == -1)
+                            this.SelectedNode = null;
+                        else
+                            this.SelectedNode = this.FindNodeByBindingIndex(_DataManager.Position);
+                    }
+                }
+                else
+                {
+                    this.SetItemCore(e.Index, _DataManager.List[e.Index]);
+                }
+            }
+        }
+        private void DataManager_PositionChanged(object sender, EventArgs e)
+        {
+            if ((_DataManager != null) && this.AllowSelection)
+            {
+                if (_DataManager.Position == -1)
+                    this.SelectedNode = null;
+                else
+                    this.SelectedNode = this.FindNodeByBindingIndex(_DataManager.Position);
+                //this.SelectedIndex = _DataManager.Position;
+            }
+        }
+
+        /// <summary>
+        /// When overridden in a derived class, resynchronizes the item data with the contents of the data source.
+        /// </summary>
+        public virtual void RefreshItems()
+        {
+            if (_DataManager != null)
+            {
+                SetItemsCore(_DataManager.List);
+                if (this.AllowSelection)
+                {
+                    if (_DataManager.Position == -1)
+                        this.SelectedNode = null;
+                    else
+                        this.SelectedNode = this.FindNodeByBindingIndex(_DataManager.Position);
+                }
+            }
+        }
+
+        private bool _LoadingDataSource = false;
+        /// <summary>
+        /// Disposes all nodes in Nodes collection and clears it.
+        /// </summary>
+        public void ClearAndDisposeAllNodes()
+        {
+            List<Control> disposeControls = new List<Control>();
+            if (m_HostedControlCells.Count > 0)
+            {
+                foreach (Cell cell in m_HostedControlCells)
+                {
+                    Control c = cell.HostedControl;
+                    if (c != null)
+                        disposeControls.Add(c);
+                }
+            }
+            foreach (Node node in this.Nodes)
+            {
+                node.Dispose();
+            }
+            foreach (Control c in disposeControls)
+            {
+                this.Controls.Remove(c);
+                c.Dispose();
+            }
+            this.Nodes.Clear();
+        }
+        private bool IsSimpleType(object current)
+        {
+            if (current == null) return false;
+            return current is string || current.GetType().IsPrimitive;
+        }
+        /// <summary>
+        /// When overridden in a derived class, sets the specified array of objects in a collection in the derived class.
+        /// </summary>
+        /// <param name="items">An array of items.</param>
+        protected virtual void SetItemsCore(IList items)
+        {
+            this.BeginUpdate();
+            this.SuspendPaint = true;
+            _LoadingDataSource = true;
+            try
+            {
+                ClearAndDisposeAllNodes();
+
+                //bool isGrouping = !string.IsNullOrEmpty(_GroupingMembers);
+
+                List<string> fieldNames = new List<string>();
+                // Create Columns
+                if (string.IsNullOrEmpty(this.DisplayMembers))
+                {
+                    if (this.Columns.Count > 0)
+                    {
+                        foreach (DevComponents.AdvTree.ColumnHeader columnHeader in this.Columns)
+                        {
+                            if (!string.IsNullOrEmpty(columnHeader.DataFieldName))
+                                fieldNames.Add(columnHeader.DataFieldName);
+                        }
+                    }
+                    if (fieldNames.Count == 0)
+                    {
+                        this.Columns.Clear();
+                        if (_DataManager.List is Array)
+                        {
+                            DevComponents.AdvTree.ColumnHeader ch = new DevComponents.AdvTree.ColumnHeader("Items");
+                            ch.Width.Relative = 100;
+                            this.Columns.Add(ch);
+                            OnDataColumnCreated(new DevComponents.DotNetBar.Controls.DataColumnEventArgs(ch));
+                        }
+                        else if (_DataManager != null)
+                        {
+                            if (_DataManager.Position >= 0 && _DataManager.Current != null && IsSimpleType(_DataManager.Current))
+                            {
+                                DevComponents.AdvTree.ColumnHeader ch = new DevComponents.AdvTree.ColumnHeader();
+                                ch.Width.Relative = 100;
+                                this.Columns.Add(ch);
+                                OnDataColumnCreated(new DevComponents.DotNetBar.Controls.DataColumnEventArgs(ch));
+                            }
+                            else
+                            {
+                                PropertyDescriptorCollection properties = _DataManager.GetItemProperties();
+                                foreach (PropertyDescriptor prop in properties)
+                                {
+                                    fieldNames.Add(prop.Name);
+                                    DevComponents.AdvTree.ColumnHeader ch = new DevComponents.AdvTree.ColumnHeader(StringHelper.GetFriendlyName(prop.Name));
+                                    ch.DataFieldName = prop.Name;
+                                    ch.Width.Relative = Math.Max(15, 100 / properties.Count);
+                                    this.Columns.Add(ch);
+                                    OnDataColumnCreated(new DevComponents.DotNetBar.Controls.DataColumnEventArgs(ch));
+                                }
+                            }
+                        }
+                    }
+                }
+                else
+                {
+                    this.Columns.Clear();
+                    if (_DisplayMembers != null && _DisplayMembers.Count > 0)
+                    {
+                        foreach (BindingMemberInfo item in _DisplayMembers)
+                        {
+                            DevComponents.AdvTree.ColumnHeader ch = new DevComponents.AdvTree.ColumnHeader(StringHelper.GetFriendlyName(item.BindingMember));
+                            ch.DataFieldName = item.BindingMember;
+                            ch.Tag = item;
+                            ch.Width.Relative = Math.Max(15, 100 / _DisplayMembers.Count);
+                            this.Columns.Add(ch);
+                            fieldNames.Add(item.BindingMember);
+                            OnDataColumnCreated(new DevComponents.DotNetBar.Controls.DataColumnEventArgs(ch));
+                        }
+                    }
+                }
+
+                if (string.IsNullOrEmpty(_GroupingMembers) && string.IsNullOrEmpty(_ParentFieldNames))
+                {
+                    for (int i = 0; i < items.Count; i++)
+                    {
+                        object item = items[i];
+                        Node node = CreateNode(this.Nodes, item, i, fieldNames);
+                    }
+                }
+                else if (!string.IsNullOrEmpty(_ParentFieldNames))
+                {
+                    //isGrouping = true;
+
+                    Dictionary<string, Node> nodeParentCollection = new Dictionary<string, Node>();
+                    Dictionary<string, List<Node>> nodeNeedsParentCollection = new Dictionary<string, List<Node>>();
+                    string[] parentFields = _ParentFieldNames.Split(',');
+                    int currentPosition = _DataManager.Position;
+                    for (int i = 0; i < items.Count; i++)
+                    {
+                        object item = items[i];
+                        string nodeKey = GetItemText(item, parentFields[0].Trim());
+                        string parentKey = GetItemText(item, parentFields[1].Trim());
+                        Node parentNode = null;
+                        if (nodeParentCollection.TryGetValue(parentKey, out parentNode))
+                        {
+                            Node node = CreateNode(parentNode.Nodes, item, i, fieldNames);
+                            nodeParentCollection.Add(nodeKey, node);
+                            if (node.BindingIndex == currentPosition) SelectNode(node, eTreeAction.Code);
+                        }
+                        else
+                        {
+                            Node node = CreateNode(this.Nodes, item, i, fieldNames);
+                            List<Node> list = null;
+                            if (!nodeNeedsParentCollection.TryGetValue(parentKey, out list))
+                            {
+                                list = new List<Node>();
+                                nodeNeedsParentCollection.Add(parentKey, list);
+                            }
+                            list.Add(node);
+                            nodeParentCollection.Add(nodeKey, node);
+                        }
+                    }
+                    // If there are nodes that needed a parent process them now
+                    foreach (KeyValuePair<string, List<Node>> keyValue in nodeNeedsParentCollection)
+                    {
+                        Node parentNode = null;
+                        if (nodeParentCollection.TryGetValue(keyValue.Key, out parentNode))
+                        {
+                            foreach (Node node in keyValue.Value)
+                            {
+                                node.Remove();
+                                parentNode.Nodes.Add(node);
+                                if (node.BindingIndex == currentPosition) SelectNode(node, eTreeAction.Code);
+                            }
+                        }
+                    }
+                }
+                else
+                {
+                    string[] groupFields = _GroupingMembers.Split(',');
+                    for (int i = 0; i < groupFields.Length; i++)
+                    {
+                        groupFields[i] = groupFields[i].Trim();
+                    }
+                    Dictionary<string, Node> groupTable = new Dictionary<string, Node>();
+                    for (int i = 0; i < items.Count; i++)
+                    {
+                        object item = items[i];
+                        NodeCollection parentCollection = this.Nodes;
+
+                        // Find the parent collection to add item to
+                        string key = "";
+                        for (int gi = 0; gi < groupFields.Length; gi++)
+                        {
+                            string text = GetItemText(item, groupFields[gi]);
+                            key += text.ToLower() + "/";
+                            Node groupNode = null;
+                            if (!groupTable.TryGetValue(key, out groupNode))
+                            {
+                                groupNode = CreateGroupNode(parentCollection, text);
+                                groupTable.Add(key, groupNode);
+                            }
+                            parentCollection = groupNode.Nodes;
+                        }
+
+                        Node node = CreateNode(parentCollection, item, i, fieldNames);
+                    }
+                }
+
+                //// If not grouping then remove the expand part space on left-hand side
+                //if (isGrouping)
+                //{
+                //    this.ExpandWidth = 24;
+                //}
+                //else
+                //{
+                //    this.ExpandWidth = 0;
+                //}
+            }
+            finally
+            {
+                this.SuspendPaint = false;
+                this.EndUpdate();
+                _LoadingDataSource = false;
+            }
+        }
+
+        /// <summary>
+        /// Raises the DataColumnCreated event.
+        /// </summary>
+        /// <param name="args">Provides event arguments.</param>
+        protected virtual void OnDataColumnCreated(DevComponents.DotNetBar.Controls.DataColumnEventArgs args)
+        {
+            if (DataColumnCreated != null)
+                DataColumnCreated(this, args);
+        }
+
+        private Node CreateGroupNode(NodeCollection parentCollection, string text)
+        {
+            Node node = new Node();
+            node.Text = text;
+            node.Style = _GroupNodeStyle;
+            node.Expanded = true;
+            node.Selectable = false;
+            parentCollection.Add(node);
+            DevComponents.DotNetBar.Controls.DataNodeEventArgs eventArgs = new DevComponents.DotNetBar.Controls.DataNodeEventArgs(node, null);
+            OnGroupNodeCreated(eventArgs);
+            return node;
+        }
+        /// <summary>
+        /// Raises the DataNodeCreated event.
+        /// </summary>
+        /// <param name="dataNodeEventArgs">Provides event arguments.</param>
+        protected virtual void OnGroupNodeCreated(DevComponents.DotNetBar.Controls.DataNodeEventArgs dataNodeEventArgs)
+        {
+            if (GroupNodeCreated != null) GroupNodeCreated(this, dataNodeEventArgs);
+        }
+
+        /// <summary>
+        /// Creates a new node for the data item.
+        /// </summary>
+        /// <param name="item">Item to create node for.</param>
+        /// <returns>New instance of the node.</returns>
+        private Node CreateNode(NodeCollection parentCollection, object item, int itemIndex, List<string> fieldNames)
+        {
+            Node node = new Node();
+            parentCollection.Add(node);
+
+            SetNodeData(node, item, fieldNames, itemIndex);
+
+            DevComponents.DotNetBar.Controls.DataNodeEventArgs eventArgs = new DevComponents.DotNetBar.Controls.DataNodeEventArgs(node, item);
+
+            OnDataNodeCreated(eventArgs);
+
+            return eventArgs.Node;
+        }
+
+        private void SetNodeData(Node node, object item, List<string> fieldNames, int bindingIndex)
+        {
+            node.DataKey = item;
+            node.BindingIndex = bindingIndex;
+
+            node.CreateCells();
+
+            if (fieldNames.Count > 0)
+            {
+                for (int i = 0; i < fieldNames.Count; i++)
+                {
+                    object propertyValue = GetPropertyValue(item, fieldNames[i]);
+                    if (propertyValue is Image)
+                    {
+                        node.Cells[i].Images.Image = (Image)propertyValue;
+                        //node.Cells[i].Images.AutoDispose = true;
+                    }
+                    else
+                        node.Cells[i].Text = GetItemText(item, fieldNames[i]);
+                }
+            }
+            else if (item != null)
+                node.Text = item.ToString();
+        }
+
+
+        /// <summary>
+        /// Raises the DataNodeCreated event.
+        /// </summary>
+        /// <param name="dataNodeEventArgs">Provides event arguments.</param>
+        protected virtual void OnDataNodeCreated(DevComponents.DotNetBar.Controls.DataNodeEventArgs dataNodeEventArgs)
+        {
+            if (DataNodeCreated != null) DataNodeCreated(this, dataNodeEventArgs);
+        }
+
+        /// <summary>
+        /// When overridden in a derived class, sets the object with the specified index in the derived class.
+        /// </summary>
+        /// <param name="index">The array index of the object.</param>
+        /// <param name="value">The object.</param>
+        protected virtual void SetItemCore(int index, object value)
+        {
+            Node node = this.FindNodeByBindingIndex(index);
+            if (node == null) return;
+
+            List<string> fieldNames = new List<string>();
+
+            foreach (DevComponents.AdvTree.ColumnHeader column in this.Columns)
+            {
+                if (!string.IsNullOrEmpty(column.DataFieldName))
+                    fieldNames.Add(column.DataFieldName);
+            }
+
+            SetNodeData(node, value, fieldNames, index);
+        }
+
+        private string _ParentFieldNames = "";
+        /// <summary>
+        /// Gets or sets comma separated field or property names that holds the value that is used to identify node and parent node. Format expected is: FieldNodeId,ParentNodeFieldId. For example if your table represents departments, you have DepartmentId field which uniquely identifies a department and ParentDepartmentId field which identifies parent of the department if any you would set this property to DepartmentId,ParentDepartmentId.
+        /// Note that you can only use ParentFieldNames or GroupingMembers property but not both. If both are set ParentFieldName take precedence.
+        /// </summary>
+        [DefaultValue(""), Category("Data"), Description("Indicates comma separated field or property names that holds the value that is used to identify node and parent node. Format expected is: FieldNodeId,ParentNodeFieldId. For example if your table represents departments, you have DepartmentId field which uniquely identifies a department and ParentDepartmentId field which identifies parent of the department if any you would set this property to DepartmentId,ParentDepartmentId.")]
+        public string ParentFieldNames
+        {
+            get { return _ParentFieldNames; }
+            set
+            {
+                if (value == null) value = "";
+                if (!string.IsNullOrEmpty(value))
+                {
+                    string[] fields = value.Split(',');
+                    if (fields.Length != 2)
+                        throw new ArgumentException("ParentFieldNames excepts two and only two fields/property names separated by comma character.");
+                    if (string.IsNullOrEmpty(fields[0]))
+                        throw new ArgumentException("ParentFieldNames excepts two and only two fields/property names separated by comma character. First field name is empty.");
+                    if (string.IsNullOrEmpty(fields[1]))
+                        throw new ArgumentException("ParentFieldNames excepts two and only two fields/property names separated by comma character. Second field name is empty.");
+                }
+                _ParentFieldNames = value;
+                OnParentFieldNamesChanged();
+            }
+        }
+
+        /// <summary>
+        /// Called when ParentFieldName property has changed.
+        /// </summary>
+        protected virtual void OnParentFieldNamesChanged()
+        {
+            RefreshItems();
+        }
+
+        private string _GroupingMembers = "";
+        /// <summary>
+        /// Gets or sets comma separated list of field or property names that are used for grouping when data-binding is used. Note that you can only use ParentFieldName or GroupingMembers property but not both. If both are set ParentFieldName take precedence.
+        /// </summary>
+        [DefaultValue(""), Category("Data"), Description("Indicates comma separated list of field or property names that are used for grouping when data-binding is used")]
+        public string GroupingMembers
+        {
+            get { return _GroupingMembers; }
+            set
+            {
+                if (value == null) value = "";
+                _GroupingMembers = value;
+                OnGroupingMembersChanged();
+            }
+        }
+
+        /// <summary>
+        /// Called when GroupingMembers property has changed.
+        /// </summary>
+        protected virtual void OnGroupingMembersChanged()
+        {
+            RefreshItems();
+        }
+
+        private ElementStyle _GroupNodeStyle = null;
+        /// <summary>
+        /// Gets or sets style for automatically created group nodes when data-binding is used and GroupingMembers property is set.
+        /// </summary>
+        /// <value>
+        /// Name of the style assigned or null value indicating that no style is used.
+        /// Default value is null.
+        /// </value>
+        [Browsable(true), Category("Node Style"), DefaultValue(null), Editor("DevComponents.AdvTree.Design.ElementStyleTypeEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), Description("Gets or sets default style for the node.")]
+        public ElementStyle GroupNodeStyle
+        {
+            get { return _GroupNodeStyle; }
+            set
+            {
+                if (_GroupNodeStyle != value)
+                {
+                    _GroupNodeStyle = value;
+                    if (_DataManager != null && this.Nodes != null)
+                        RefreshItems();
+                }
+            }
+        }
+
+        private bool AllowSelection
+        {
+            get
+            {
+                return true;
+            }
+        }
+
+
+        private CurrencyManager _DataManager = null;
+        protected CurrencyManager DataManager
+        {
+            get
+            {
+                return _DataManager;
+            }
+        }
+        private bool _IsDataSourceInitEventHooked = false;
+        private void UnwireDataSource()
+        {
+            if (_DataSource is IComponent)
+            {
+                ((IComponent)_DataSource).Disposed -= new EventHandler(DataSourceDisposed);
+            }
+            ISupportInitializeNotification dataSource = _DataSource as ISupportInitializeNotification;
+            if ((dataSource != null) && _IsDataSourceInitEventHooked)
+            {
+                dataSource.Initialized -= new EventHandler(DataSourceInitialized);
+                _IsDataSourceInitEventHooked = false;
+            }
+        }
+        private void DataSourceDisposed(object sender, EventArgs e)
+        {
+            this.SetDataConnection(null, null, true);
+        }
+        private bool _IsDataSourceInitialized = false;
+        private void WireDataSource()
+        {
+            if (_DataSource is IComponent)
+            {
+                ((IComponent)_DataSource).Disposed += new EventHandler(DataSourceDisposed);
+            }
+            ISupportInitializeNotification dataSource = _DataSource as ISupportInitializeNotification;
+            if ((dataSource != null) && !dataSource.IsInitialized)
+            {
+                dataSource.Initialized += new EventHandler(DataSourceInitialized);
+                _IsDataSourceInitEventHooked = true;
+                _IsDataSourceInitialized = false;
+            }
+            else
+            {
+                _IsDataSourceInitialized = true;
+            }
+        }
+        private void DataSourceInitialized(object sender, EventArgs e)
+        {
+            this.SetDataConnection(_DataSource, _DisplayMembers, true);
+        }
+        /// <summary>
+        /// Raises the Format event.
+        /// </summary>
+        /// <param name="e">Event parameters</param>
+        protected virtual void OnFormat(DevComponents.DotNetBar.Controls.TreeConvertEventArgs e)
+        {
+            DevComponents.DotNetBar.Controls.TreeConvertEventHandler handler = Format;
+            if (handler != null)
+            {
+                handler(this, e);
+            }
+        }
+
+        private static TypeConverter stringTypeConverter;
+        public string GetItemText(object item, string fieldName)
+        {
+            object propertyValue = GetPropertyValue(item, fieldName);
+            if (!_FormattingEnabled)
+            {
+                if (item == null)
+                {
+                    return string.Empty;
+                }
+                if (propertyValue == null)
+                {
+                    return "";
+                }
+                return Convert.ToString(propertyValue, CultureInfo.CurrentCulture);
+            }
+
+            DevComponents.DotNetBar.Controls.TreeConvertEventArgs e = new DevComponents.DotNetBar.Controls.TreeConvertEventArgs(propertyValue, typeof(string), item, fieldName);
+            this.OnFormat(e);
+            if ((e.Value != item) && (e.Value is string))
+            {
+                return (string)e.Value;
+            }
+            if (stringTypeConverter == null)
+            {
+                stringTypeConverter = TypeDescriptor.GetConverter(typeof(string));
+            }
+            try
+            {
+                return (string)FormatHelper.FormatObject(propertyValue, typeof(string), GetFieldConverter(fieldName), stringTypeConverter, _FormatString, _FormatInfo, null, DBNull.Value);
+            }
+            catch (Exception ex)
+            {
+                if (ex is SecurityException || IsCriticalException(ex))
+                {
+                    throw;
+                }
+                return ((propertyValue != null) ? Convert.ToString(item, CultureInfo.CurrentCulture) : "");
+            }
+        }
+        private static bool IsCriticalException(Exception ex)
+        {
+            return (((((ex is NullReferenceException) || (ex is StackOverflowException)) || ((ex is OutOfMemoryException) || (ex is System.Threading.ThreadAbortException))) || ((ex is ExecutionEngineException) || (ex is IndexOutOfRangeException))) || (ex is AccessViolationException));
+        }
+        Dictionary<string, PropertyDescriptor> _DescriptorsCache = new Dictionary<string, PropertyDescriptor>();
+        /// <summary>
+        /// Clears internal property descriptors cache when data-binding is used. In most cases it is not needed that you call this method. Do so only if instructed by DevComponents support.
+        /// </summary>
+        public void ClearDescriptorsCache()
+        {
+            _DescriptorsCache.Clear();
+        }
+        protected object GetPropertyValue(object item, string fieldName)
+        {
+            if ((item != null) && (fieldName.Length > 0))
+            {
+                try
+                {
+                    PropertyDescriptor descriptor = null;
+                    string key = item.GetType().ToString() + ":" + fieldName;
+                    if (!_DescriptorsCache.TryGetValue(key, out descriptor))
+                    {
+                        if (_DataManager != null)
+                        {
+                            descriptor = _DataManager.GetItemProperties().Find(fieldName, true);
+                        }
+                        else
+                        {
+                            descriptor = TypeDescriptor.GetProperties(item).Find(fieldName, true);
+                        }
+                        if (descriptor != null)
+                            _DescriptorsCache.Add(key, descriptor);
+                    }
+                    if (descriptor != null)
+                    {
+                        item = descriptor.GetValue(item);
+                    }
+                }
+                catch
+                {
+                }
+            }
+            return item;
+        }
+        /// <summary>
+        /// Gets or sets the index specifying the currently selected item.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), Description("Gets or sets the index specifying the currently selected item.")]
+        public int SelectedIndex
+        {
+            get
+            {
+                if (_DataManager != null)
+                {
+                    if (this.SelectedNode == null || this.SelectedNode.BindingIndex < 0)
+                        return -1;
+                    return this.SelectedNode.BindingIndex;
+                }
+                if (this.SelectedNode == null) return -1;
+                return this.GetNodeFlatIndex(this.SelectedNode);
+            }
+            set
+            {
+                SetSelectedIndex(value);
+            }
+        }
+        private void SetSelectedIndex(int value)
+        {
+            if (value == -1)
+            {
+                this.SelectedNode = null;
+                return;
+            }
+            Node node = null;
+            if (_DataManager != null)
+            {
+                node = this.FindNodeByBindingIndex(value);
+            }
+            else
+            {
+                node = this.GetNodeByFlatIndex(value);
+            }
+            this.SelectedNode = node;
+        }
+        /// <summary>
+        /// Raises the SelectedIndexChanged event.
+        /// </summary>
+        /// <param name="e">Event arguments.</param>
+        protected virtual void OnSelectedIndexChanged(EventArgs e)
+        {
+            EventHandler handler = SelectedIndexChanged;
+            if (handler != null)
+            {
+                handler(this, e);
+            }
+        }
+        private BindingMemberInfo _ValueMember = new BindingMemberInfo();
+        /// <summary>
+        /// Gets or sets the property to use as the actual value for the items in the control. Applies to data-binding scenarios. SelectedValue property will return the value of selected node as indicated by this property.
+        /// </summary>
+        [Category("Data"), DefaultValue(""), Editor("System.Windows.Forms.Design.DataMemberFieldEditor, System.Design, Version= 2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", typeof(System.Drawing.Design.UITypeEditor)), Description("property to use as the actual value for the items in the control. Applies to data-binding scenarios. SelectedValue property will return the value of selected node as indicated by this property.")]
+        public string ValueMember
+        {
+            get
+            {
+                return _ValueMember.BindingMember;
+            }
+            set
+            {
+                if (value == null)
+                {
+                    value = "";
+                }
+                BindingMemberInfo newValueMember = new BindingMemberInfo(value);
+                if (!newValueMember.Equals(_ValueMember))
+                {
+                    if (this.DisplayMembers.Length == 0)
+                    {
+                        List<BindingMemberInfo> list = new List<BindingMemberInfo>();
+                        list.Add(newValueMember);
+                        this.SetDataConnection(this.DataSource, list, false);
+                    }
+                    if (((_DataManager != null) && (value != null)) && ((value.Length != 0) && !this.BindingMemberInfoInDataManager(newValueMember)))
+                    {
+                        throw new ArgumentException("Invalid value for ValueMember", "value");
+                    }
+                    _ValueMember = newValueMember;
+                    this.OnValueMemberChanged(EventArgs.Empty);
+                    this.OnSelectedValueChanged(EventArgs.Empty);
+                }
+            }
+        }
+        /// <summary>
+        /// Raises the ValueMemberChanged event.
+        /// </summary>
+        /// <param name="e">Event arguments.</param>
+        protected virtual void OnValueMemberChanged(EventArgs e)
+        {
+            EventHandler handler = ValueMemberChanged;
+            if (handler != null)
+            {
+                handler(this, e);
+            }
+        }
+        /// <summary>
+        /// Raises the SelectedValueChanged event.
+        /// </summary>
+        /// <param name="e">Event arguments.</param>
+        protected virtual void OnSelectedValueChanged(EventArgs e)
+        {
+            EventHandler handler = SelectedValueChanged;
+            if (handler != null)
+            {
+                handler(this, e);
+            }
+        }
+        /// <summary>
+        /// Gets or sets the value of the member property specified by the ValueMember property.
+        /// </summary>
+        [Browsable(false), DefaultValue(null), Bindable(true), Category("Data"), Description("Indicates value of the member property specified by the ValueMember property."), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public object SelectedValue
+        {
+            get
+            {
+                if (_DataManager != null && this.SelectedIndex != -1)
+                {
+                    object item = _DataManager.List[this.SelectedIndex];
+                    return this.GetPropertyValue(item, _ValueMember.BindingField);
+                }
+                return null;
+            }
+            set
+            {
+                if (_DataManager != null)
+                {
+                    string bindingField = _ValueMember.BindingField;
+                    if (string.IsNullOrEmpty(bindingField))
+                    {
+                        throw new InvalidOperationException("ValueMember property must be set to be able to set SelectedValue");
+                    }
+                    PropertyDescriptor property = _DataManager.GetItemProperties().Find(bindingField, true);
+                    System.Reflection.MethodInfo mi = _DataManager.GetType().GetMethod("Find", System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.NonPublic);
+                    int num = -1;
+                    if (mi != null)
+                    {
+                        num = (int)mi.Invoke(_DataManager, new object[] { property, value, true });
+                    }
+                    else
+                    {
+                        //int num = _DataManager.Find(property, value, true);
+                        // Provide an alternate implementation...
+                    }
+                    this.SelectedIndex = num;
+                }
+            }
+        }
+
+        private bool _EnableDataPositionChange = true;
+        /// <summary>
+        /// Indicates whether control changes the CurrencyManager.DataPosition when selected node is changed during data binding.
+        /// Default value is true.
+        /// </summary>
+        [Browsable(false), DefaultValue(true)]
+        public bool EnableDataPositionChange
+        {
+            get
+            {
+                return _EnableDataPositionChange;
+            }
+            set
+            {
+                _EnableDataPositionChange = value;
+            }
+        }
+#endif
+        #endregion
+
+        #region Touch Handling
+        private DevComponents.DotNetBar.Touch.TouchHandler _TouchHandler = null;
+
+        private bool _TouchEnabled = true;
+        /// <summary>
+        /// Indicates whether touch support for scrolling is enabled.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether touch support for scrolling is enabled.")]
+        public bool TouchEnabled
+        {
+            get { return _TouchEnabled; }
+            set
+            {
+                if (value != _TouchEnabled)
+                {
+                    bool oldValue = _TouchEnabled;
+                    _TouchEnabled = value;
+                    OnTouchEnabledChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when TouchEnabled property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnTouchEnabledChanged(bool oldValue, bool newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("TouchEnabled"));
+        }
+        private int TriggerPageChangeOffset
+        {
+            get
+            {
+                return 32;
+            }
+        }
+        private int MaximumReversePageOffset
+        {
+            get
+            {
+                return 0; //Math.Min(32, this.Width / 6);
+            }
+        }
+        private bool _TouchDrag = false;
+        private Point _TouchStartLocation = Point.Empty;
+        private Point _TouchStartScrollPosition = Point.Empty;
+        private Rectangle _TouchInnerBounds = Rectangle.Empty;
+        private void TouchHandlerPanBegin(object sender, DevComponents.DotNetBar.Touch.GestureEventArgs e)
+        {
+            if (_TouchEnabled)
+            {
+                _TouchInnerBounds = GetInnerRectangle();
+                _TouchStartLocation = e.Location;
+                _TouchStartScrollPosition = _AutoScrollPosition;
+                _TouchDrag = true;
+                e.Handled = true;
+            }
+        }
+
+        private void TouchHandlerPanEnd(object sender, DevComponents.DotNetBar.Touch.GestureEventArgs e)
+        {
+            if (_TouchDrag)
+            {
+                EndTouchPan();
+                e.Handled = true;
+            }
+        }
+
+        private void EndTouchPan()
+        {
+            _TouchDrag = false;
+            Point autoScrollPosition = this.AutoScrollPosition;
+
+            if (_AutoScrollMinSize.Width > _TouchInnerBounds.Width)
+            {
+                if (_AutoScrollMinSize.Width - _TouchInnerBounds.Width < -_AutoScrollPosition.X)
+                    autoScrollPosition = new Point(_AutoScrollMinSize.Width - _TouchInnerBounds.Width, autoScrollPosition.Y);
+                else if (-_AutoScrollPosition.X < 0)
+                    autoScrollPosition = new Point(0, autoScrollPosition.Y);
+            }
+
+            if (_AutoScrollMinSize.Height > _TouchInnerBounds.Height)
+            {
+                if (_AutoScrollMinSize.Height - _TouchInnerBounds.Height < -_AutoScrollPosition.Y)
+                    autoScrollPosition = new Point(autoScrollPosition.X, _AutoScrollMinSize.Height - _TouchInnerBounds.Height);
+                else if (-_AutoScrollPosition.Y < 0)
+                    autoScrollPosition = new Point(autoScrollPosition.X, 0);
+            }
+
+            if (this.AutoScrollPosition != autoScrollPosition)
+            {
+                this.AutoScrollPosition = autoScrollPosition;
+                OnScroll(new ScrollEventArgs(ScrollEventType.EndScroll, autoScrollPosition.Y));
+            }
+            //ApplyScrollChange();
+
+        }
+
+        private void TouchHandlerPan(object sender, DevComponents.DotNetBar.Touch.GestureEventArgs e)
+        {
+            if (_TouchDrag)
+            {
+                Point autoScrollPosition = this.AutoScrollPosition;
+
+                int offset = (e.Location.X - _TouchStartLocation.X);
+                int offsetChange = offset + _TouchStartScrollPosition.X;
+
+                bool overflowH = false;
+
+                if (_AutoScrollMinSize.Width > _TouchInnerBounds.Width)
+                {
+                    if (-offsetChange + MaximumReversePageOffset > _AutoScrollMinSize.Width - _TouchInnerBounds.Width)
+                    {
+                        autoScrollPosition.X = -(_AutoScrollMinSize.Width + MaximumReversePageOffset - _TouchInnerBounds.Width);
+                        overflowH = true;
+                    }
+                    else if (offsetChange > MaximumReversePageOffset)
+                    {
+                        autoScrollPosition.X = MaximumReversePageOffset;
+                        overflowH = true;
+                    }
+                    else
+                        autoScrollPosition.X = offsetChange;
+                }
+
+                // Y Scroll
+                bool overflowV = false;
+                if (_AutoScrollMinSize.Height > _TouchInnerBounds.Height)
+                {
+                    offset = (e.Location.Y - _TouchStartLocation.Y);
+                    offsetChange = offset + _TouchStartScrollPosition.Y;
+
+                    if (-offsetChange + MaximumReversePageOffset > _AutoScrollMinSize.Height - _TouchInnerBounds.Height)
+                    {
+                        autoScrollPosition.Y = -(_AutoScrollMinSize.Height + MaximumReversePageOffset - _TouchInnerBounds.Height);
+                        overflowV = true;
+                    }
+                    else if (offsetChange > MaximumReversePageOffset)
+                    {
+                        autoScrollPosition.Y = MaximumReversePageOffset;
+                        overflowV = true;
+                    }
+                    else
+                        autoScrollPosition.Y = offsetChange;
+                }
+
+                if (this.AutoScrollPosition != autoScrollPosition)
+                {
+                    this.AutoScrollPosition = autoScrollPosition;
+                    Update();
+                    OnScroll(new ScrollEventArgs(ScrollEventType.ThumbTrack, autoScrollPosition.Y));
+                }
+                if (overflowH && overflowV && e.IsInertia) EndTouchPan();
+
+
+                //if (_VScrollBar != null && _VScrollBar.Value != -_AutoScrollPosition.Y)
+                //    _VScrollBar.Value = Math.Min(_VScrollBar.Maximum, Math.Max(0, -_AutoScrollPosition.Y));
+                //if (_HScrollBar != null && _HScrollBar.Value != -_AutoScrollPosition.X)
+                //    _HScrollBar.Value = Math.Min(_HScrollBar.Maximum, Math.Max(0, -_AutoScrollPosition.X));
+                e.Handled = true;
+            }
+        }
+        #endregion
+    }
+
+    #region AdvTreeSettings
+    /// <summary>
+    /// Static class that holds AdvTree settings that are not commonly used.
+    /// </summary>
+    public class AdvTreeSettings
+    {
+        /// <summary>
+        /// Gets or sets whether tree control is scrolled horizontally so selected node is brought into the view. Default value is false.
+        /// You can set this property to false to disable the horizontal scrolling of tree control when selected node has changed.
+        /// </summary>
+        public static bool SelectedScrollIntoViewHorizontal = false;
+        /// <summary>
+        /// Gets or sets whether AdvTree node comparer that provides column sorting uses standard text comparer instead of default
+        /// hybrid alpha-numeric comparer. Default value is false.
+        /// </summary>
+        public static bool UseSortAlphaComparer = false;
+    }
+    #endregion
+
+    #region ICellEditControl
+    /// <summary>
+    /// Defines an interface for cell edit control that allows custom controls to be used as cell editors. AdvTree control
+    /// expects that editing control inherits from System.Windows.Forms.Control.
+    /// </summary>
+    public interface ICellEditControl
+    {
+        /// <summary>
+        /// Called when edit operation is started. The AdvTree control will first set CurrentValue, then call BeginEdit and will call EditComplete once
+        /// editing is completed.
+        /// </summary>
+        void BeginEdit();
+        /// <summary>
+        /// Called when edit operation is completed.
+        /// </summary>
+        void EndEdit();
+        /// <summary>
+        /// Gets or sets current edit value.
+        /// </summary>
+        object CurrentValue { get;set;}
+        /// <summary>
+        /// AdvTree control subscribes to this event to be notified when edit operation is completed. For example when Enter key is
+        /// pressed the edit control might raise this event to indicate the completion of editing operation.
+        /// </summary>
+        event EventHandler EditComplete;
+        /// <summary>
+        /// AdvTree control subscribes to this event to be notified that user has cancelled the editing. For example when Escape key is
+        /// pressed the edit control might raise this event to indicate that editing has been cancelled.
+        /// </summary>
+        event EventHandler CancelEdit;
+        /// <summary>
+        /// Gets or sets whether cell requests the word-wrap based on the current cell style. If your editor does not support
+        /// word-wrap functionality this can be ignored.
+        /// </summary>
+        bool EditWordWrap { get;set;}
+    }
+    #endregion
+
+    #region PrepareCellEditor
+    /// <summary>
+    /// Defines delegate for PrepareCellEditor event.
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="ea"></param>
+    public delegate void PrepareCellEditorEventHandler(object sender, PrepareCellEditorEventArgs e);
+    /// <summary>
+    /// Event arguments for PrepareCellEditor event.
+    /// </summary>
+    public class PrepareCellEditorEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets reference to the cell being edited.
+        /// </summary>
+        public readonly Cell EditedCell;
+        /// <summary>
+        /// Gets reference to the cell editor control.
+        /// </summary>
+        public readonly ICellEditControl Editor;
+        /// <summary>
+        /// Initializes a new instance of the PrepareCellEditorEventArgs class.
+        /// </summary>
+        /// <param name="editedCell"></param>
+        /// <param name="editor"></param>
+        public PrepareCellEditorEventArgs(Cell editedCell, ICellEditControl editor)
+        {
+            EditedCell = editedCell;
+            Editor = editor;
+        }
+    }
+    #endregion
+
+    #region AdvTreeRender
+    /// <summary>
+    /// Defines delegate for PrepareCellEditor event.
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="ea"></param>
+    public delegate void AdvTreeRenderEventHandler(object sender, AdvTreeRenderEventArgs e);
+    /// <summary>
+    /// Event arguments for AdvTree.Render event.
+    /// </summary>
+    public class AdvTreeRenderEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Indicates the rendering operation being performed.
+        /// </summary>
+        public readonly eAdvTreeRenderType RenderType;
+        /// <summary>
+        /// Indicates graphics canvas to render on.
+        /// </summary>
+        public Graphics Graphics;
+        /// <summary>
+        /// Initializes a new instance of the AdvTreeRenderEventArgs class.
+        /// </summary>
+        /// <param name="renderType">Specifies rendering type</param>
+        /// <param name="g">Specifies graphics canvas to render on</param>
+        public AdvTreeRenderEventArgs(eAdvTreeRenderType renderType, Graphics g)
+        {
+            RenderType = renderType;
+            Graphics = g;
+        }
+    }
+    /// <summary>
+    /// Specifies the rendering type being performed on AdvTree control Render event.
+    /// </summary>
+    public enum eAdvTreeRenderType
+    {
+        /// <summary>
+        /// Control background is being painted.
+        /// </summary>
+        Background
+    }
+    #endregion
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/AdvTree/AdvTree.resx b/PROMS/DotNetBar Source Code/AdvTree/AdvTree.resx
new file mode 100644
index 00000000..7e323966
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/AdvTree.resx	
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<root>
+	<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+		<xsd:element name="root" msdata:IsDataSet="true">
+			<xsd:complexType>
+				<xsd:choice maxOccurs="unbounded">
+					<xsd:element name="data">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+								<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" />
+							<xsd:attribute name="type" type="xsd:string" />
+							<xsd:attribute name="mimetype" type="xsd:string" />
+						</xsd:complexType>
+					</xsd:element>
+					<xsd:element name="resheader">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" use="required" />
+						</xsd:complexType>
+					</xsd:element>
+				</xsd:choice>
+			</xsd:complexType>
+		</xsd:element>
+	</xsd:schema>
+	<resheader name="ResMimeType">
+		<value>text/microsoft-resx</value>
+	</resheader>
+	<resheader name="Version">
+		<value>1.0.0.0</value>
+	</resheader>
+	<resheader name="Reader">
+		<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.3102.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+	<resheader name="Writer">
+		<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.3102.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+</root>
diff --git a/PROMS/DotNetBar Source Code/AdvTree/Cell.cs b/PROMS/DotNetBar Source Code/AdvTree/Cell.cs
new file mode 100644
index 00000000..1383dbb0
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/Cell.cs	
@@ -0,0 +1,1836 @@
+using System;
+using System.Drawing;
+using System.ComponentModel;
+using System.Windows.Forms;
+using DevComponents.AdvTree.Display;
+using DevComponents.DotNetBar;
+using System.Collections;
+
+namespace DevComponents.AdvTree
+{
+	/// <summary>Represents a cell assigned to the Node.</summary>
+	/// <remarks>
+	/// 	<para>The Cell with Index 0 (zero) always exists for a Node and it is a cell that
+	///     you can interact with through the properties on a node, which are forwarding to the
+	///     Cell(0), or you can go directly to the Cell(0).</para>
+	/// 	<para>When Node has multiple columns defined each column corresponds to Cell in
+	///     Node's Cells collection. The first Column has Index 0, second Column Index 1 and so
+	///     forth.</para>
+	/// 	<para>Note that there is always at least one Cell in a Node even if multiple
+	///     columns are not used.</para>
+	/// </remarks>
+	[DesignTimeVisible(false),ToolboxItem(false)]
+	public class Cell:Component
+	{
+		#region Private Variables
+		private ElementStyle m_StyleNormal=null;
+		private ElementStyle m_StyleDisabled=null;
+		private ElementStyle m_StyleMouseDown=null;
+		private ElementStyle m_StyleMouseOver=null;
+		private ElementStyle m_StyleSelected=null;
+		private bool m_Enabled=true;
+		private CellImages m_Images=null;
+		private Rectangle m_Bounds=Rectangle.Empty;
+		private Rectangle m_TextBounds=Rectangle.Empty;
+		private Rectangle m_TextContentBounds=Rectangle.Empty;
+		private Rectangle m_ImageBounds=Rectangle.Empty;
+		private Rectangle m_CheckBoxBounds=Rectangle.Empty;
+		private object m_Tag=null;
+		private string m_Text="";
+		private eCellPartAlignment m_ImageAlignment=eCellPartAlignment.Default;
+		private eCellPartAlignment m_CheckBoxAlignment=eCellPartAlignment.Default;
+		private bool m_CheckBoxVisible=false;
+		private bool m_Checked=false;
+		private bool m_MouseDown=false;
+		private bool m_MouseOver=false;
+		private bool m_Selected=false;
+		private Node m_Parent=null;
+		private bool m_Visible=true;
+		private eTreeAction m_ActionSource=eTreeAction.Code;
+		private eCellPartLayout m_Layout=eCellPartLayout.Default;
+		private System.Windows.Forms.Cursor m_Cursor=null;
+		private bool m_WordWrap=false;
+		private string m_Name="";
+		private Control m_HostedControl=null;
+		private Size m_HostedControlSize=Size.Empty;
+		private bool m_IgnoreHostedControlSizeChange=false;
+		#endregion
+
+		#region Constructor/Dispose
+		/// <summary>
+		/// Initializes new instance of Cell class.
+		/// </summary>
+		public Cell():this("")
+		{
+		}
+
+		/// <summary>
+		/// Initializes new instance of Cell class.
+		/// </summary>
+		/// <param name="text">Cell text.</param>
+		public Cell(string text)
+		{
+			Text=text;
+			m_Images=new CellImages(this);
+		}
+
+        /// <summary>
+        /// Initializes new instance of Cell class.
+        /// </summary>
+        /// <param name="text">Cell text.</param>
+        public Cell(string text, ElementStyle styleNormal)
+            : this(text)
+        {
+            this.StyleNormal = styleNormal;
+        }
+
+        /// <summary>
+        /// Initializes new instance of Cell class.
+        /// </summary>
+        /// <param name="text">Cell text.</param>
+        public Cell(string text, string styleNormalName)
+            : this(text)
+        {
+            this.StyleNormalName = styleNormalName;
+        }
+
+		/// <summary>
+		/// Releases the resources used by the Component.
+		/// </summary>
+		/// <param name="disposing">true to release both managed and unmanaged resources; false to release only unmanaged resources.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if(m_HostedControl!=null)
+				m_HostedControl.SizeChanged-=new EventHandler(this.HostedControlSizedChanged);
+			m_HostedControl=null;
+            if (m_Images != null)
+            {
+                m_Images.Dispose();
+            }
+			base.Dispose(disposing);
+		}
+		#endregion
+
+		#region Properties
+        /// <summary>
+        /// Occurs after Tooltip text has changed.
+        /// </summary>
+        protected virtual void OnTooltipChanged() { }
+        private string _Tooltip = "";
+        /// <summary>
+        /// Gets/Sets informational text (tooltip) for the cell.
+        /// </summary>
+        [Browsable(true), DefaultValue(""), Category("Appearance"), Description("Indicates the text that is displayed when mouse hovers over the cell."), Localizable(true)]
+        public string Tooltip
+        {
+            get
+            {
+
+                return _Tooltip;
+            }
+            set
+            {
+                if (_Tooltip == value)
+                    return;
+                if (value == null) value = "";
+                _Tooltip = value;
+
+                if (this.ToolTipVisible)
+                {
+                    if (string.IsNullOrEmpty(_Tooltip))
+                        this.HideToolTip();
+                    else
+                    {
+                        DevComponents.DotNetBar.ToolTip tooltipWindow = _ToolTipWnd;
+                        tooltipWindow.Text = _Tooltip;
+                        tooltipWindow.ShowToolTip();
+                        tooltipWindow.Invalidate();
+                    }
+                }
+                OnTooltipChanged();
+            }
+        }
+        /// <summary>
+        /// Gets whether tooltip is visible or not.
+        /// </summary>
+        internal protected bool ToolTipVisible
+        {
+            get
+            {
+                return (_ToolTipWnd != null);
+            }
+        }
+        /// <summary>
+        /// Called when tooltip is shown and hidden.
+        /// </summary>
+        /// <param name="isShown">true if tooltip is being shown otherwise false.</param>
+        protected virtual void OnTooltip(bool isShown)
+        {
+        }
+        private DevComponents.DotNetBar.ToolTip _ToolTipWnd = null;
+        /// <summary>
+        /// Shows tooltip for this item.
+        /// </summary>
+        public virtual void ShowToolTip()
+        {
+            if (this.DesignMode)
+                return;
+
+            if (IsVisible)
+            {
+                AdvTree tree = TreeControl;
+                if (tree != null && !tree.ShowToolTips || !this.ShowToolTips)
+                    return;
+                OnTooltip(true);
+                if (_Tooltip != "")
+                {
+                    if (_ToolTipWnd == null)
+                        _ToolTipWnd = new DevComponents.DotNetBar.ToolTip();
+                    _ToolTipWnd.Style = StyleManager.GetEffectiveStyle();
+                    _ToolTipWnd.Text = _Tooltip;
+                    _ToolTipWnd.ReferenceRectangle = ScreenRectangle;
+
+                    OnToolTipVisibleChanged(new EventArgs());
+                    _ToolTipWnd.ShowToolTip();
+                }
+            }
+        }
+        /// <summary>
+        /// Destroys tooltip window.
+        /// </summary>
+        internal protected void HideToolTip()
+        {
+            if (_ToolTipWnd != null)
+            {
+                System.Drawing.Rectangle tipRect = _ToolTipWnd.Bounds;
+                tipRect.Width += 5;
+                tipRect.Height += 6;
+
+                OnTooltip(false);
+                OnToolTipVisibleChanged(new EventArgs());
+                try
+                {
+                    if (_ToolTipWnd != null)
+                    {
+                        _ToolTipWnd.Hide();
+                        _ToolTipWnd.Dispose();
+                        _ToolTipWnd = null;
+                    }
+                }
+                catch { }
+                AdvTree tree = this.TreeControl;
+                if (tree != null)
+                {
+                    tree.Invalidate(tree.RectangleToClient(tipRect), false);
+                }
+            }
+        }
+        /// <summary>
+        /// Occurs when item's tooltip visibility has changed.
+        /// </summary>
+        [System.ComponentModel.Description("Occurs when item's tooltip visibility has changed.")]
+        public event EventHandler ToolTipVisibleChanged;
+        private void OnToolTipVisibleChanged(EventArgs eventArgs)
+        {
+            EventHandler h = ToolTipVisibleChanged;
+            if (h != null)
+                ToolTipVisibleChanged(this, eventArgs);
+        }
+        private Rectangle ScreenRectangle
+        {
+            get
+            {
+                AdvTree tree = this.TreeControl;
+                if (tree == null) return Rectangle.Empty;
+                return new Rectangle(tree.PointToScreen(this.Bounds.Location), this.Bounds.Size);
+            }
+        }
+
+        private bool _ShowToolTips = true;
+        /// <summary>
+        /// Gets or sets whether tooltips are shown when mouse is over the cell when Tooltip property is set.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether tooltips are shown when mouse is over the cell when Tooltip property is set.")]
+        public bool ShowToolTips
+        {
+            get { return _ShowToolTips; }
+            set
+            {
+                _ShowToolTips = value;
+            }
+        }
+        
+
+        private bool _Editable = true;
+        /// <summary>
+        /// Gets or sets whether cell content is editable when cell editing is enabled on tree control. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether cell content is editable when cell editing is enabled on tree control.")]
+        public bool Editable
+        {
+            get { return _Editable; }
+            set
+            {
+                _Editable = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets whether cell can be edited. Cell can be edited if both Editable property is set to true and ColumnHeader.Editable property is set to true.
+        /// </summary>
+        [Browsable(false)]
+        public bool IsEditable
+        {
+            get
+            {
+                ColumnHeader header = NodeOperations.GetCellColumnHeader(this.TreeControl, this);
+                if (header == null) return _Editable;
+                return _Editable && header.Editable;
+            }
+        }
+
+        private BaseItem _HostedItem = null;
+        /// <summary>
+        /// Gets or sets the item hosted inside of the cell. Only items that do not generate
+        /// popups are supported. Note that cell can only host either HostedItem or HostedControl but not both.
+        /// </summary>
+        [DefaultValue(null), Category("Appearance"), Editor("DevComponents.AdvTree.Design.HostedItemTypeEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), Description("Indicates item hosted inside of the cell. Only items that do not generate popups are supported. Note that cell can only host either HostedItem or HostedControl but not both.")]
+        public BaseItem HostedItem
+        {
+            get { return _HostedItem; }
+            set { SetHostedItem(value); }
+        }      
+
+		/// <summary>
+		/// Gets or sets the control hosted inside of the cell. Note that cell can only host either HostedItem or HostedControl but not both.
+		/// </summary>
+		/// <remarks>
+		/// 	<para>When control is hosted inside of the cell, cell size is determined by the
+		///     size of the control hosted inside of it. The cell will not display its text but it will display any image assigned
+		///     or check box when control is hosted inside of it. The Style settings like Margin
+		///     and Padding will still apply.</para>
+		/// </remarks>
+		[Browsable(true),Category("Behavior"),Description("Indicates control hosted inside of the cell."),DefaultValue(null)]
+		public Control HostedControl
+		{
+			get {return m_HostedControl;}
+			set
+			{
+				SetHostedControl(value);
+			}
+		}
+		
+		/// <summary>
+		/// Gets or sets whether hosted control size change event is ignored.
+		/// </summary>
+		internal bool IgnoreHostedControlSizeChange
+		{
+			get { return m_IgnoreHostedControlSizeChange;}
+			set { m_IgnoreHostedControlSizeChange=value; }
+		}
+		
+		/// <summary>
+		/// Gets or sets the hosted control size. Property is used to correctly scale control when AdvTree.Zoom is used to zoom view.
+		/// </summary>
+		internal Size HostedControlSize
+		{
+			get { return m_HostedControlSize;}
+			set { m_HostedControlSize = value;}	
+		}
+
+		/// <summary>
+		/// Returns name of the cell that can be used to identify it from the code.
+		/// </summary>
+		[Browsable(false),Category("Design"),Description("Indicates the name used to identify cell.")]
+		public string Name
+		{
+			get
+			{
+				if(this.Site!=null)
+					m_Name=this.Site.Name;
+				return m_Name;
+			}
+			set
+			{
+				if(this.Site!=null)
+					this.Site.Name=value;
+				if(value==null)
+					m_Name="";
+				else
+					m_Name=value;
+			}
+		}
+
+		/// <summary>
+		/// Gets the relative bounds of the cell.
+		/// </summary>
+		[Browsable(false)]
+		internal Rectangle BoundsRelative
+		{
+			get
+			{
+				return m_Bounds;			
+			}
+		}
+		
+		/// <summary>
+		/// Gets the bounds of the cell.
+		/// </summary>
+		[Browsable(false)]
+		public Rectangle Bounds
+		{
+			get
+			{
+				AdvTree tree=this.TreeControl;
+				if(tree!=null)
+				{
+					return NodeDisplay.GetCellRectangle(eCellRectanglePart.CellBounds, this, tree.NodeDisplay.Offset);
+				}
+				return Rectangle.Empty;			
+			}
+		}
+
+		/// <summary>
+		/// Sets the bounds of the cell.
+		/// </summary>
+		/// <param name="bounds">New cell bounds.</param>
+		internal void SetBounds(Rectangle bounds)
+		{
+			m_Bounds=bounds;
+		}
+
+//		/// <summary>
+//		/// Gets the bounds of the text inside of cell.
+//		/// </summary>
+//		[Browsable(false)]
+//		public Rectangle TextBounds
+//		{
+//			get
+//			{
+//				return m_TextBounds;			
+//			}
+//		}
+
+//		/// <summary>
+//		/// Sets the bounds of the text inside of the cell.
+//		/// </summary>
+//		/// <param name="bounds">New cell bounds.</param>
+//		internal void SetTextBounds(Rectangle bounds)
+//		{
+//			m_TextBounds=bounds;
+//		}
+
+		/// <summary>
+		/// Gets or sets the available content bounds for the text. Text will fitted into these bounds
+		/// but it's true location can be obtained only after it is displayed.
+		/// </summary>
+		internal Rectangle TextContentBounds
+		{
+			get {return m_TextContentBounds;}
+			set {m_TextContentBounds=value;}
+		}
+
+        /// <summary>
+        /// Gets the bounds of the text inside of cell.
+        /// </summary>
+        [Browsable(false)]
+        public Rectangle TextBounds
+        {
+            get
+            {
+                AdvTree tree = this.TreeControl;
+                if (tree != null)
+                {
+                    return NodeDisplay.GetCellRectangle(eCellRectanglePart.TextBounds, this, tree.NodeDisplay.Offset);
+                }
+                return Rectangle.Empty;
+            }
+        }
+
+		/// <summary>
+		/// Gets the relative bounds of the image inside of cell.
+		/// </summary>
+		[Browsable(false)]
+		internal Rectangle ImageBoundsRelative
+		{
+			get
+			{
+				return m_ImageBounds;			
+			}
+		}
+		
+		/// <summary>
+		/// Gets the bounds of the image inside of cell.
+		/// </summary>
+		[Browsable(false)]
+		public Rectangle ImageBounds
+		{
+			get
+			{
+				AdvTree tree=this.TreeControl;
+				if(tree!=null)
+				{
+					return NodeDisplay.GetCellRectangle(eCellRectanglePart.ImageBounds, this, tree.NodeDisplay.Offset);
+				}
+				return Rectangle.Empty;			
+			}
+		}
+
+		/// <summary>
+		/// Sets the bounds of the image inside of the cell.
+		/// </summary>
+		/// <param name="bounds">New cell bounds.</param>
+		internal void SetImageBounds(Rectangle bounds)
+		{
+			m_ImageBounds=bounds;
+		}
+
+		/// <summary>
+		/// Gets the bounds of the image inside of cell.
+		/// </summary>
+		[Browsable(false)]
+		internal Rectangle CheckBoxBoundsRelative
+		{
+			get
+			{
+				return m_CheckBoxBounds;			
+			}
+		}
+		
+		/// <summary>
+		/// Gets the bounds of the check box inside of cell.
+		/// </summary>
+		[Browsable(false)]
+		public Rectangle CheckBoxBounds
+		{
+			get
+			{
+				AdvTree tree=this.TreeControl;
+                if (tree != null)
+                {
+                    return NodeDisplay.GetCellRectangle(eCellRectanglePart.CheckBoxBounds, this, tree.NodeDisplay.Offset);
+                }
+				return Rectangle.Empty;			
+			}
+		}
+
+		/// <summary>
+		/// Sets the bounds of the check box inside of the cell.
+		/// </summary>
+		/// <param name="bounds">New cell bounds.</param>
+		internal void SetCheckBoxBounds(Rectangle bounds)
+		{
+			m_CheckBoxBounds=bounds;
+		}
+
+		/// <summary>
+		/// Gets a value indicating whether the cell is in an editable state. true if the cell is in editable state; otherwise, false.
+		/// </summary>
+		[Browsable(false)]
+		public bool IsEditing
+		{
+			get
+			{
+				return false;
+			}
+		}
+
+		/// <summary>
+		/// Gets a value indicating whether the cell is in the selected state. true if the cell is in the selected state; otherwise, false.
+		/// </summary>
+		[Browsable(false)]
+		public bool IsSelected
+		{
+			get
+			{
+				return m_Selected;
+			}
+		}
+
+		internal void SetSelected(bool selected, eTreeAction actionSource)
+		{
+            m_Selected = selected;
+		}
+
+		/// <summary>
+		/// Gets a value indicating whether the cell is visible. Cell is considered to be visible when it's parent column is visible.
+		/// </summary>
+		[Browsable(false)]
+		public bool IsVisible
+		{
+			get
+			{
+				return m_Visible;
+			}
+		}
+
+		/// <summary>
+		/// Sets whether cells is visible or not. This is set by node layout manager and it is based on column visibility.
+		/// </summary>
+		/// <param name="visible">True if visible otherwise false.</param>
+		internal void SetVisible(bool visible)
+		{
+			if(m_Visible!=visible)
+			{
+				m_Visible=visible;
+				OnVisibleChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets the parent node of the current cell.
+		/// </summary>
+		[Browsable(false)]
+		public Node Parent
+		{
+			get
+			{
+				return m_Parent;
+			}
+		}
+
+		/// <summary>
+		/// Sets the parent of the cell.
+		/// </summary>
+		/// <param name="parent">Parent node.</param>
+		internal void SetParent(Node parent)
+		{
+			m_Parent=parent;
+		}
+
+		/// <summary>
+		/// Gets or sets the object that contains data about the cell. Any Object derived type can be assigned to this property. If this property is being set through the Windows Forms designer, only text can be assigned.
+		/// </summary>
+		[Browsable(false),DefaultValue(null),Category("Data"),Description("Indicates text that contains data about the cell.")]
+		public object Tag
+		{
+			get
+			{
+				return m_Tag;
+			}
+			set
+			{
+				m_Tag=value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the object that contains data about the cell. Any Object derived type can be assigned to this property. If this property is being set through the Windows Forms designer, only text can be assigned.
+		/// </summary>
+		[Browsable(true),DefaultValue(""),Category("Data"),Description("Indicates text that contains data about the cell."),DevCoSerialize()]
+		public string TagString
+		{
+			get
+			{
+				if(m_Tag==null)
+					return "";
+				return m_Tag.ToString();
+			}
+			set
+			{
+				m_Tag=value;
+			}
+		}
+
+        private string _TextDisplayFormat = "";
+        /// <summary>
+        /// Gets or sets the format that is applied to the value of Text property for display purposes. See "Formatting Overview" in MSDN
+        /// for description on available format strings. For example you can specify "C" to format text as currency, or "D" to format text as decimal number etc.
+        /// <seealso cref="http://msdn.microsoft.com/en-us/library/26etazsy.aspx"/>
+        /// </summary>
+        [Browsable(true), DefaultValue(""), Category("Appearance"), Description("Indicates format that is applied to the value of Text property for display purposes.")]
+        public string TextDisplayFormat
+        {
+            get { return _TextDisplayFormat; }
+            set
+            {
+                _TextDisplayFormat = value;
+                UpdateDisplayText();
+                this.OnSizeChanged();
+            }
+        }
+
+        private string _DisplayText = string.Empty;
+        /// <summary>
+        /// Gets the formatted display text.
+        /// </summary>
+        internal string DisplayText
+        {
+            get
+            {
+                return _DisplayText;
+            }
+        }
+        private void UpdateDisplayText()
+        {
+            if (string.IsNullOrEmpty(_TextDisplayFormat))
+            {
+                _DisplayText = m_Text;
+                return;
+            }
+
+            long longNumber = 0;
+            double number = 0;
+            DateTime date = DateTime.MinValue;
+            if (long.TryParse(m_Text, out longNumber))
+            {
+                _DisplayText = longNumber.ToString(_TextDisplayFormat);
+            }
+            else if (double.TryParse(m_Text, out number))
+            {
+                _DisplayText = number.ToString(_TextDisplayFormat);
+            }
+            else if (DateTime.TryParse(m_Text, out date))
+            {
+                _DisplayText = date.ToString(_TextDisplayFormat);
+            }
+            else
+                _DisplayText = m_Text;
+        }
+
+        /// <summary>
+		/// Gets or sets the text displayed in the cell.
+		/// </summary>
+        [Browsable(true), DefaultValue(""), Editor("DevComponents.DotNetBar.Design.TextMarkupUIEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), Category("Appearance"), Localizable(true), Description("Indicates text displayed in the cell."), DevCoSerialize()]
+		public string Text
+		{
+			get
+			{
+				return m_Text;
+			}
+			set
+			{
+                if (value == null) value = "";
+                if (m_Text != value)
+                {
+                    m_Text = value;
+                    UpdateDisplayText();
+                    OnTextChanged();
+                    this.OnSizeChanged();
+                }
+			}
+		}
+		
+		/// <summary>
+		/// Occurs after text has changed.
+		/// </summary>
+		protected virtual void OnTextChanged()
+		{
+			MarkupTextChanged();
+		}
+
+		/// <summary>
+		/// Gets the parent tree control that the cell belongs to.
+		/// </summary>
+		[Browsable(false)]
+		public AdvTree TreeControl
+		{
+			get
+			{
+				if(this.Parent!=null)
+					return this.Parent.TreeControl;
+				return null;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the style class assigned to the cell. Null value indicates that
+		/// default style is used as specified on cell's parent.
+		/// </summary>
+		/// <value>
+		/// Reference to the style assigned to the cell or null (VB Nothing) indicating that default
+		/// style setting from tree control is applied. Default value is null.
+		/// </value>
+		/// <remarks>
+		/// When property is set to null (VB Nothing) the style setting from parent tree
+		/// controls is used. CellStyleNormal on AdvTree control is a root style for a cell.
+		/// </remarks>
+		/// <seealso cref="StyleDisabled">StyleDisabled Property</seealso>
+		/// <seealso cref="StyleMouseDown">StyleMouseDown Property</seealso>
+		/// <seealso cref="StyleMouseOver">StyleMouseOver Property</seealso>
+		/// <seealso cref="StyleSelected">StyleSelected Property</seealso>
+		[Browsable(true),DefaultValue(null),Category("Style"),Editor("DevComponents.AdvTree.Design.ElementStyleTypeEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf",typeof(System.Drawing.Design.UITypeEditor)),Description("Indicates the style class assigned to the cell.")]
+		public ElementStyle StyleNormal
+		{
+			get {return m_StyleNormal;}
+			set
+			{
+				m_StyleNormal=value;
+			}
+		}
+		
+		/// <summary>
+		/// Gets or sets the style name used by cell. This member is provided for internal use only. To set or get the style use StyleNormal property instead.
+		/// </summary>
+		[Browsable(false), DefaultValue(""), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), EditorBrowsable(EditorBrowsableState.Never) , DevCoSerialize()]
+		public string StyleNormalName
+		{
+			get
+			{
+				if(m_StyleNormal!=null)
+					return m_StyleNormal.Name;
+				return "";
+			}
+			set
+			{
+				if(value.Length==0)
+				{
+					TypeDescriptor.GetProperties(this)["StyleNormal"].SetValue(this, null);
+					return;
+				}
+				
+				AdvTree tree=this.TreeControl;
+				if(tree!=null)
+				{
+					TypeDescriptor.GetProperties(this)["StyleNormal"].SetValue(this, tree.Styles[value]);
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the style class that is to when cell is selected. Null value indicates that
+		/// default style is used as specified on cell's parent.
+		/// </summary>
+		/// <value>
+		/// Reference to the style assigned to the cell or null value indicating that default
+		/// style setting from tree control is applied. Default is null value.
+		/// </value>
+		/// <remarks>
+		/// When property is set to null value the style setting from parent tree
+		/// controls is used. CellStyleSelected on AdvTree control is a root style for a cell.
+		/// </remarks>
+		/// <seealso cref="StyleNormal">StyleNormal Property</seealso>
+		/// <seealso cref="StyleDisabled">StyleDisabled Property</seealso>
+		/// <seealso cref="StyleMouseDown">StyleMouseDown Property</seealso>
+		/// <seealso cref="StyleMouseOver">StyleMouseOver Property</seealso>
+		[Browsable(true),DefaultValue(null),Category("Style"),Editor("DevComponents.AdvTree.Design.ElementStyleTypeEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf",typeof(System.Drawing.Design.UITypeEditor)),Description("Indicates the style class assigned to the cell.")]
+		public ElementStyle StyleSelected
+		{
+			get {return m_StyleSelected;}
+			set
+			{
+				m_StyleSelected=value;
+			}
+		}
+		
+		/// <summary>
+		/// Gets or sets the selected style name used by cell. This member is provided for internal use only. To set or get the style use StyleSelected property instead.
+		/// </summary>
+		[Browsable(false), DefaultValue(""), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), EditorBrowsable(EditorBrowsableState.Never) , DevCoSerialize()]
+		public string StyleSelectedName
+		{
+			get
+			{
+				if(m_StyleSelected!=null)
+					return m_StyleSelected.Name;
+				return "";
+			}
+			set
+			{
+				if(value.Length==0)
+				{
+					TypeDescriptor.GetProperties(this)["StyleSelected"].SetValue(this, null);
+					return;
+				}
+				
+				AdvTree tree=this.TreeControl;
+				if(tree!=null)
+				{
+					TypeDescriptor.GetProperties(this)["StyleSelected"].SetValue(this, tree.Styles[value]);
+				}
+			}
+		}
+
+
+		/// <summary>
+		/// Gets or sets the disabled style class assigned to the cell. Null value indicates
+		/// that default style is used as specified on cell's parent.
+		/// </summary>
+		/// <value>
+		/// Reference to the style assigned to the cell or null value indicating that default
+		/// style setting from tree control is applied. Default value is null.
+		/// </value>
+		/// <remarks>
+		/// When property is set to null value the style setting from parent tree
+		/// controls is used. CellStyleDisabled on AdvTree control is a root style for a
+		/// cell.
+		/// </remarks>
+		/// <seealso cref="StyleNormal">StyleNormal Property</seealso>
+		/// <seealso cref="StyleMouseDown">StyleMouseDown Property</seealso>
+		/// <seealso cref="StyleMouseOver">StyleMouseOver Property</seealso>
+		/// <seealso cref="StyleSelected">StyleSelected Property</seealso>
+		[Browsable(true),DefaultValue(null),Category("Style"),Editor("DevComponents.AdvTree.Design.ElementStyleTypeEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf",typeof(System.Drawing.Design.UITypeEditor)),Description("Indicates the disabled style class assigned to the cell.")]
+		public ElementStyle StyleDisabled
+		{
+			get {return m_StyleDisabled;}
+			set
+			{
+				m_StyleDisabled=value;
+			}
+		}
+		
+		/// <summary>
+		/// Gets or sets the disabled style name used by cell. This member is provided for internal use only. To set or get the style use StyleDisabled property instead.
+		/// </summary>
+		[Browsable(false), DefaultValue(""), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), EditorBrowsable(EditorBrowsableState.Never) , DevCoSerialize()]
+		public string StyleDisabledName
+		{
+			get
+			{
+				if(m_StyleDisabled!=null)
+					return m_StyleDisabled.Name;
+				return "";
+			}
+			set
+			{
+				if(value.Length==0)
+				{
+					TypeDescriptor.GetProperties(this)["StyleDisabled"].SetValue(this, null);
+					return;
+				}
+				
+				AdvTree tree=this.TreeControl;
+				if(tree!=null)
+				{
+					TypeDescriptor.GetProperties(this)["StyleDisabled"].SetValue(this, tree.Styles[value]);
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the style class assigned to the cell which is applied when mouse
+		/// button is pressed while mouse is over the cell. Null value indicates that default
+		/// style is used as specified on cell's parent.
+		/// </summary>
+		/// <value>
+		/// Reference to the style assigned to the cell or null value indicating that default
+		/// style setting from tree control is applied. Default value is null.
+		/// </value>
+		/// <remarks>
+		/// When property is set to null value style setting from parent tree
+		/// controls is used. CellStyleMouseDown on AdvTree control is a root style for a
+		/// cell.
+		/// </remarks>
+		/// <seealso cref="StyleNormal">StyleNormal Property</seealso>
+		/// <seealso cref="StyleDisabled">StyleDisabled Property</seealso>
+		/// <seealso cref="StyleMouseOver">StyleMouseOver Property</seealso>
+		/// <seealso cref="StyleSelected">StyleSelected Property</seealso>
+		[Browsable(true),DefaultValue(null),Category("Style"),Editor("DevComponents.AdvTree.Design.ElementStyleTypeEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf",typeof(System.Drawing.Design.UITypeEditor)),Description("Indicates the style class assigned to the cell when mouse is down.")]
+		public ElementStyle StyleMouseDown
+		{
+			get {return m_StyleMouseDown;}
+			set
+			{
+				m_StyleMouseDown=value;
+			}
+		}
+		
+		/// <summary>
+		/// Gets or sets the mouse down style name used by cell. This member is provided for internal use only. To set or get the style use StyleMouseDown property instead.
+		/// </summary>
+		[Browsable(false), DefaultValue(""), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), EditorBrowsable(EditorBrowsableState.Never) , DevCoSerialize()]
+		public string StyleMouseDownName
+		{
+			get
+			{
+				if(m_StyleMouseDown!=null)
+					return m_StyleMouseDown.Name;
+				return "";
+			}
+			set
+			{
+				if(value.Length==0)
+				{
+					TypeDescriptor.GetProperties(this)["StyleMouseDown"].SetValue(this, null);
+					return;
+				}
+				
+				AdvTree tree=this.TreeControl;
+				if(tree!=null)
+				{
+					TypeDescriptor.GetProperties(this)["StyleMouseDown"].SetValue(this, tree.Styles[value]);
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the style class assigned to the cell which is applied when mouse is
+		/// over the cell. Null value indicates that default style is used as specified on cell's
+		/// parent.
+		/// </summary>
+		/// <value>
+		/// Reference to the style assigned to the cell or null value indicating that default
+		/// style setting from tree control is applied. Default value is null.
+		/// </value>
+		/// <remarks>
+		/// When property is set to null value the style setting from parent tree
+		/// controls is used. CellStyleMouseOver on AdvTree control is a root style for a
+		/// cell.
+		/// </remarks>
+		/// <seealso cref="StyleNormal">StyleNormal Property</seealso>
+		/// <seealso cref="StyleDisabled">StyleDisabled Property</seealso>
+		/// <seealso cref="StyleMouseDown">StyleMouseDown Property</seealso>
+		/// <seealso cref="StyleSelected">StyleSelected Property</seealso>
+		[Browsable(true),DefaultValue(""),Category("Style"),Editor("DevComponents.AdvTree.Design.ElementStyleTypeEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf",typeof(System.Drawing.Design.UITypeEditor)),Description("Indicates the style class assigned to the cell when mouse is over the cell.")]
+		public ElementStyle StyleMouseOver
+		{
+			get {return m_StyleMouseOver;}
+			set
+			{
+				m_StyleMouseOver=value;
+			}
+		}
+		
+		/// <summary>
+		/// Gets or sets the mouse over style name used by cell. This member is provided for internal use only. To set or get the style use StyleMouseOver property instead.
+		/// </summary>
+		[Browsable(false), DefaultValue(""), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), EditorBrowsable(EditorBrowsableState.Never) , DevCoSerialize()]
+		public string StyleMouseOverName
+		{
+			get
+			{
+				if(m_StyleMouseOver!=null)
+					return m_StyleMouseOver.Name;
+				return "";
+			}
+			set
+			{
+				if(value.Length==0)
+				{
+					TypeDescriptor.GetProperties(this)["StyleMouseOver"].SetValue(this, null);
+					return;
+				}
+				
+				AdvTree tree=this.TreeControl;
+				if(tree!=null)
+				{
+					TypeDescriptor.GetProperties(this)["StyleMouseOver"].SetValue(this, tree.Styles[value]);
+				}
+			}
+		}
+
+
+		/// <summary>
+		/// Gets or sets whether cell is enabled or not.
+		/// </summary>
+		[Browsable(true),DefaultValue(true),Category("Behavior"),Description("Gets or sets whether cell is enabled or not."),DevCoSerialize()]
+		public bool Enabled
+		{
+			get {return m_Enabled;}
+			set
+			{
+				m_Enabled=value;
+                if (this.Parent != null)
+                {
+                    this.Parent.OnDisplayChanged();
+                }
+			}
+		}
+
+		/// <summary>
+		/// Gets the reference to images associated with this cell.
+		/// </summary>
+		[Browsable(true),Category("Images"),Description("Gets the reference to images associated with this cell."),DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+		public CellImages Images
+		{
+			get {return m_Images;}
+		}
+		/// <summary>
+		/// Sets the Images to the new CellImages object.
+		/// </summary>
+		/// <param name="ci">CellImages object.</param>
+		internal void SetCellImages(CellImages ci)
+		{
+			m_Images=ci;
+			m_Images.Parent=this;
+		}
+		/// <summary>
+		/// Returns whether Images property should be serialized. Used internally for windows forms designer support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		internal bool ShouldSerializeImages()
+		{
+			return m_Images.ShouldSerialize;
+		}
+
+		/// <summary>
+		/// Gets or sets the image alignment in relation to the text displayed by cell.
+		/// </summary>
+		[Browsable(true),Category("Image Properties"),DefaultValue(eCellPartAlignment.Default),Description("Gets or sets the image alignment in relation to the text displayed by cell."),DevCoSerialize()]
+		public eCellPartAlignment ImageAlignment
+		{
+			get
+			{
+				return m_ImageAlignment;
+			}
+			set
+			{
+				if(m_ImageAlignment!=value)
+				{
+					m_ImageAlignment=value;
+					this.OnAppearanceChanged();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the checkbox alignment in relation to the text displayed by cell.
+		/// </summary>
+		[Browsable(true),Category("Check-box Properties"),DefaultValue(eCellPartAlignment.Default),Description("Indicates checkbox alignment in relation to the text displayed by cell.")]
+		public eCellPartAlignment CheckBoxAlignment
+		{
+			get
+			{
+				return m_CheckBoxAlignment;
+			}
+			set
+			{
+				if(m_CheckBoxAlignment!=value)
+				{
+					m_CheckBoxAlignment=value;
+					this.OnAppearanceChanged();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets whether check box is visible inside the cell.
+		/// </summary>
+		[Browsable(true),Category("Check-box Properties"),DefaultValue(false),Description("Indicates whether check box is visible inside the cell."),DevCoSerialize()]
+		public bool CheckBoxVisible
+		{
+			get
+			{
+				return m_CheckBoxVisible;
+			}
+			set
+			{
+				if(m_CheckBoxVisible!=value)
+				{
+					m_CheckBoxVisible=value;
+					this.OnAppearanceChanged();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or set a value indicating whether the check box is in the checked state.
+		/// </summary>
+		[Browsable(true),Category("Check-box Properties"),DefaultValue(false),Description("Indicates whether the check box is in the checked state."),DevCoSerialize()]
+		public bool Checked
+		{
+			get {return m_Checked;}
+			set
+			{
+				if(m_Checked!=value)
+				{
+                    if (_ThreeState && value && _CheckState != CheckState.Unchecked) return;
+                    SetChecked(value ? CheckState.Checked : CheckState.Unchecked, eTreeAction.Code);
+				}
+			}
+		}
+
+        private bool _ThreeState = false;
+        /// <summary>
+        /// Gets or sets a value indicating whether the CheckBox will allow three check states rather than two. If the ThreeState property is set to true
+        /// CheckState property should be used instead of Checked property to set the extended state of the control.
+        /// </summary>
+        [Browsable(true), Category("Check-box Properties"), DefaultValue(false), Description("Indicates whether the CheckBox will allow three check states rather than two.")]
+        public bool CheckBoxThreeState
+        {
+            get { return _ThreeState; }
+            set { _ThreeState = value; }
+        }
+
+        private CheckState _CheckState = CheckState.Unchecked;
+        /// <summary>
+        /// Specifies the state of a control, such as a check box, that can be checked, unchecked, or set to an indeterminate state. 
+        /// </summary>
+        [Browsable(true), Category("Check-box Properties"), DefaultValue(CheckState.Unchecked), RefreshProperties(RefreshProperties.All), Description("Specifies the state of a control, such as a check box, that can be checked, unchecked, or set to an indeterminate state")]
+        public CheckState CheckState
+        {
+            get { return _CheckState; }
+            set
+            {
+                if (value != _CheckState)
+                    SetChecked(value, eTreeAction.Code);
+            }
+        }
+
+        /// <summary>
+        /// Sets the Checked or CheckState properties.
+        /// </summary>
+        /// <param name="value">New value for checked state.</param>
+        /// <param name="actionSource">Action source.</param>
+        public void SetChecked(bool value, eTreeAction actionSource)
+        {
+            SetChecked(value ? CheckState.Checked : CheckState.Unchecked, actionSource);
+        }
+
+        /// <summary>
+        /// Sets the Checked or CheckState properties.
+        /// </summary>
+        /// <param name="value">New value for checked state.</param>
+        /// <param name="actionSource">Action source.</param>
+        public void SetChecked(CheckState value, eTreeAction actionSource)
+        {
+            AdvTreeCellBeforeCheckEventArgs beforeCheckArgs = new AdvTreeCellBeforeCheckEventArgs(actionSource, this, value);
+            InvokeBeforeCheck(beforeCheckArgs);
+            if (beforeCheckArgs.Cancel) return;
+
+            _CheckState = value;
+            m_Checked = value == CheckState.Checked;
+            OnAppearanceChanged();
+
+            if (this.CheckBoxStyle == eCheckBoxStyle.RadioButton && value == CheckState.Checked && this.Parent != null)
+            {
+                Node parent = this.Parent;
+                AdvTree tree = parent.TreeControl;
+                if (tree != null) tree.BeginUpdate();
+                bool processNodes = true;
+                foreach (Cell item in parent.Cells)
+                {
+                    if (item == this) continue;
+                    if (item.CheckBoxStyle == eCheckBoxStyle.RadioButton)
+                    {
+                        item.Checked = false;
+                        processNodes = false;
+                    }
+                }
+                if (processNodes)
+                {
+                    if (parent.Parent != null)
+                    {
+                        foreach (Node item in parent.Parent.Nodes)
+                        {
+                            if (item != parent && item.CheckBoxStyle == eCheckBoxStyle.RadioButton)
+                                item.Checked = false;
+                        }
+                    }
+                    else
+                    {
+                        if (tree != null && NodeOperations.IsRootNode(tree, parent))
+                        {
+                            foreach (Node item in tree.Nodes)
+                            {
+                                if (item != parent && item.CheckBoxStyle == eCheckBoxStyle.RadioButton)
+                                    item.Checked = false;
+                            }
+                        }
+                    }
+                }
+                if (tree != null) tree.EndUpdate();
+            }
+
+            InvokeAfterCheck(actionSource);
+        }
+
+        private eCheckBoxStyle _CheckBoxStyle = eCheckBoxStyle.CheckBox;
+        /// <summary>
+        /// Gets or sets the appearance style of the item. Default value is CheckBox. Item can also assume the style of radio-button.
+        /// </summary>
+        [Browsable(true), DefaultValue(eCheckBoxStyle.CheckBox), Category("Check-box Properties"), Description("Indicates appearance style of the item. Default value is CheckBox. Item can also assume the style of radio-button.")]
+        public eCheckBoxStyle CheckBoxStyle
+        {
+            get { return _CheckBoxStyle; }
+            set
+            {
+                _CheckBoxStyle = value;
+                OnAppearanceChanged();
+            }
+        }
+
+		/// <summary>
+		/// Gets whether mouse is over the cell.
+		/// </summary>
+		[Browsable(false)]
+		public bool IsMouseOver
+		{
+			get{return m_MouseOver;}
+		}
+		/// <summary>
+		/// Sets the mouse over flag.
+		/// </summary>
+		/// <param name="over">true if mouse is over the cell otherwise false.</param>
+		internal void SetMouseOver(bool over)
+		{
+			m_MouseOver=over;
+		}
+
+		/// <summary>
+		/// Gets whether left mouse button is pressed while over the cell.
+		/// </summary>
+		[Browsable(false)]
+		public bool IsMouseDown
+		{
+			get{return m_MouseDown;}
+		}
+		/// <summary>
+		/// Sets the mouse down flag.
+		/// </summary>
+		/// <param name="over">true if left mouse button is pressed while over the cell otherwise false.</param>
+		internal void SetMouseDown(bool over)
+		{
+			m_MouseDown=over;
+		}
+
+		/// <summary>
+		/// Gets or sets the layout of the cell parts like check box, image and text. Layout can be horizontal (default)
+		/// where parts of the cell are positioned next to each other horizontally, or vertical where
+		/// parts of the cell are positioned on top of each other vertically.
+		/// Alignment of the each part is controlled by alignment properties.
+		/// </summary>
+		/// <seealso cref="ImageAlignment">ImageAlignment Property</seealso>
+		/// <seealso cref="CheckBoxAlignment">CheckBoxAlignment Property</seealso>
+		[Browsable(true),DefaultValue(eCellPartLayout.Default),Category("Cells"),Description("Indicates the layout of the cell parts like check box, image and text."), DevCoSerialize()]
+		public eCellPartLayout Layout
+		{
+			get {return m_Layout;}
+			set
+			{
+				if(m_Layout!=value)
+				{
+					m_Layout=value;
+					this.OnAppearanceChanged();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Specifies the mouse cursor displayed when mouse is over the cell.
+		/// </summary>
+		[Browsable(true),DefaultValue(null),Category("Appearance"),Description("Specifies the mouse cursor displayed when mouse is over the cell.")]
+		public System.Windows.Forms.Cursor Cursor
+		{
+			get
+			{
+				return m_Cursor;
+			}
+			set
+			{
+				if(m_Cursor!=value)
+				{
+					m_Cursor=value;
+				}
+			}
+		}
+
+        internal bool GetEnabled()
+        {
+            return m_Enabled;
+        }
+
+		/// <summary>
+		/// Gets or sets whether cell wrapped the text during the layout.
+		/// </summary>
+		internal bool WordWrap
+		{
+			get {return m_WordWrap;}
+			set {m_WordWrap=value;}
+		}
+
+        private eCellEditorType _EditorType = eCellEditorType.Default;
+        /// <summary>
+        /// Gets or sets the editor type used to edit the cell. Setting this property to value other than Default
+        /// overrides the cell editor type specified on column cell belongs to.
+        /// </summary>
+        [DefaultValue(eCellEditorType.Default), Category("Behavior"), Description("Indicates editor type used to edit the cell.")]
+        public eCellEditorType EditorType
+        {
+            get { return _EditorType; }
+            set { _EditorType = value; }
+        }
+
+        /// <summary>
+        /// Returns effective editor type used for cell editing.
+        /// </summary>
+        /// <returns>Editor type.</returns>
+        internal eCellEditorType GetEffectiveEditorType()
+        {
+            if (_EditorType != eCellEditorType.Default) return _EditorType;
+            int index = -1;
+            if (this.Parent != null) index = this.Parent.Cells.IndexOf(this);
+            if (index == -1) return _EditorType;
+
+            if (this.Parent != null && this.Parent.Parent != null && this.Parent.Parent.NodesColumns.Count > 0 && index < this.Parent.Parent.NodesColumns.Count)
+            {
+                return this.Parent.Parent.NodesColumns[index].EditorType;
+            }
+
+            AdvTree tree=TreeControl;
+            if (tree != null && tree.Columns.Count > 0 && index < tree.Columns.Count)
+                return tree.Columns[index].EditorType;
+
+            return _EditorType;
+        }
+		#endregion
+
+		#region Methods
+		/// <summary>Makes a copy of a Cell.</summary>
+		public virtual Cell Copy()
+		{
+			// TODO: Make sure that new properties are copied
+			Cell c=new Cell();
+			c.CheckBoxAlignment=this.CheckBoxAlignment;
+			c.CheckBoxVisible=this.CheckBoxVisible;
+            c.CheckBoxStyle = this.CheckBoxStyle;
+            if (this.CheckBoxThreeState)
+                c.CheckState = this.CheckState;
+            else
+			    c.Checked=this.Checked;
+			c.Cursor=this.Cursor;
+			c.Enabled=this.Enabled;
+			c.ImageAlignment=this.ImageAlignment;
+			c.SetCellImages(this.Images.Copy());
+			c.Layout=this.Layout;
+			c.StyleDisabled=this.StyleDisabled;
+			c.StyleMouseDown=this.StyleMouseDown;
+			c.StyleMouseOver=this.StyleMouseOver;
+			c.StyleNormal=this.StyleNormal;
+			c.StyleSelected=this.StyleSelected;
+			c.Tag=this.Tag;
+			c.Text=this.Text;
+            c.Editable = this.Editable;
+            c.EditorType = this.EditorType;
+
+
+			return c;
+		}
+
+        /// <summary>
+        /// Ensures that the cell is visible, expanding nodes and scrolling the control as necessary.
+        /// </summary>
+        public void EnsureVisible()
+        {
+            NodeOperations.EnsureVisible(this);
+        }
+
+		private void OnAppearanceChanged()
+		{
+			if(this.Parent!=null)
+			{
+				this.Parent.SizeChanged=true;
+				this.Parent.OnDisplayChanged();
+			}
+		}
+
+		private void OnSizeChanged()
+		{
+			if(this.Parent!=null)
+			{
+				this.Parent.SizeChanged=true;
+				this.Parent.OnDisplayChanged();
+			}
+		}
+
+		/// <summary>
+		/// Occurs when any image property for the cell has changed.
+		/// </summary>
+		internal void OnImageChanged()
+		{
+			if(m_Parent!=null)
+				m_Parent.OnImageChanged();
+		}
+
+		/// <summary>
+		/// Invokes <see cref="AdvTree.AfterCheck">AfterCheck</see> event on AdvTree
+		/// control.
+		/// </summary>
+		protected virtual void InvokeAfterCheck(eTreeAction actionSource)
+		{
+			AdvTree tree=this.TreeControl;
+			if(tree!=null)
+			{
+                tree.InvokeAfterCheck(new AdvTreeCellEventArgs(actionSource, this));
+			}
+			m_ActionSource=eTreeAction.Code;
+		}
+
+        /// <summary>
+        /// Invokes <see cref="AdvTree.BeforeCheck">BeforeCheck</see> event on AdvTree
+        /// control.
+        /// </summary>
+        protected virtual void InvokeBeforeCheck(AdvTreeCellBeforeCheckEventArgs e)
+        {
+            AdvTree tree = this.TreeControl;
+            if (tree != null)
+            {
+                tree.InvokeBeforeCheck(e);
+            }
+
+            if (this.Parent != null)
+                this.Parent.BeforeCellCheck(this, e);
+        }
+
+		/// <summary>
+		/// Called just before cell layout is to be performed.
+		/// </summary>
+		internal void OnLayoutCell()
+		{
+            if (m_HostedControl != null && !_HostedControlAdded)
+            {
+                AddHostedControlToTree();
+            }
+            else if (_HostedItem != null && !_HostedItemAdded)
+                AddHostedItemToTree();
+		}
+
+        private void SetHostedItem(BaseItem value)
+        {
+            // Note that hosted item when set is guided by the size of the text. So the TextContentBounds are actually bounds of the control.
+            if (m_HostedControl != null)
+                throw new InvalidOperationException("HostedItem cannot be set if HostedControl property is set to non-null value.");
+
+            if (_HostedItem != null)
+            {
+                RemoveHostedItemFromTree();
+            }
+
+            _HostedItem = value;
+            if (_HostedItem != null)
+            {
+                if (_HostedItem.Parent != null)
+                    _HostedItem.Parent.SubItems.Remove(_HostedItem);
+                _HostedItem.Visible = true;
+                _HostedItem.Style = eDotNetBarStyle.StyleManagerControlled;
+                AddHostedItemToTree();
+            }
+
+            OnSizeChanged();
+        }
+
+        private void RemoveHostedItemFromTree()
+        {
+            if (_HostedItem != null)
+                _HostedItem.ContainerControl = null;
+            _HostedItemAdded = false;
+        }
+        private bool _HostedItemAdded = false;
+        private void AddHostedItemToTree()
+        {
+            if (_HostedItemAdded) return;
+            AdvTree tree = this.TreeControl;
+            if (tree != null)
+            {
+                if (_HostedItem.ContainerControl != tree)
+                {
+                    _HostedItem.ContainerControl = tree;
+                }
+                _HostedItemAdded = true;
+            }
+        }
+
+        private bool _HostedControlAdded = false;
+		internal void AddHostedControlToTree()
+		{
+            if (_HostedControlAdded) return;
+			AdvTree tree = this.TreeControl;
+			if(tree!=null)
+			{
+                if (m_HostedControl.Parent != tree)
+                {
+                    if (m_HostedControl.Parent != null)
+                        m_HostedControl.Parent.Controls.Remove(m_HostedControl);
+                    tree.Controls.Add(m_HostedControl);
+                    tree.InvalidControlBorder = true;
+                    m_HostedControl.SendToBack();
+                }
+				tree.HostedControlCells.Add(this);
+                _HostedControlAdded = true;
+			}
+		}
+		
+		internal void RemoveHostedControlFromTree()
+		{
+			AdvTree tree = m_HostedControl.Parent as AdvTree;
+            if (tree == null) tree = this.TreeControl;
+            if (tree != null)
+            {
+                tree.Controls.Remove(m_HostedControl);
+                tree.HostedControlCells.Remove(this);
+                _HostedControlAdded = false;
+            }
+		}
+
+		private void SetHostedControl(Control value)
+		{
+			// Note that hosted control when set is guided by the size of the text. So the TextContentBounds are actually bounds of the control.
+			if(value==this.TreeControl)
+				return;
+
+            if (_HostedItem != null)
+                throw new InvalidOperationException("HostedControl cannot be set when HostedItem is set to non-null value.");
+			
+			if(m_HostedControl!=null)
+			{
+				m_HostedControl.SizeChanged-=new EventHandler(this.HostedControlSizedChanged);
+                m_HostedControl.Enter -= new EventHandler(HostedControlEnter);
+				RemoveHostedControlFromTree();
+			}
+			
+			m_HostedControl=value;
+			if(m_HostedControl!=null)
+			{
+				m_HostedControl.SizeChanged+=new EventHandler(this.HostedControlSizedChanged);
+                m_HostedControl.Enter += new EventHandler(HostedControlEnter);
+				TypeDescriptor.GetProperties(m_HostedControl)["Dock"].SetValue(m_HostedControl,DockStyle.None);
+				if(m_HostedControl.Parent!=null)
+					m_HostedControl.Parent.Controls.Remove(m_HostedControl);
+				
+				if(!this.DesignMode)
+					m_HostedControl.Visible = false;
+				if(this.DesignMode || this.Parent!=null && this.Parent.Site!=null && this.Parent.Site.DesignMode)
+				{
+					bool visible=GetVisible();
+					TypeDescriptor.GetProperties(m_HostedControl)["Visible"].SetValue(m_HostedControl,visible);
+				}
+				
+				AddHostedControlToTree();
+			}
+
+			OnSizeChanged();
+		}
+
+        private void HostedControlEnter(object sender, EventArgs e)
+        {
+            AdvTree tree = this.TreeControl;
+            if (tree != null)
+                tree.SelectedNode = this.Parent;
+        }
+		private void HostedControlSizedChanged(object sender, EventArgs e)
+		{
+			if(!m_HostedControlSize.IsEmpty && m_HostedControl!=null)
+				m_HostedControlSize = m_HostedControl.Size;
+            if (m_IgnoreHostedControlSizeChange)
+                return;
+
+			OnSizeChanged();
+		}
+
+		internal void OnVisibleChanged()
+		{
+			if(m_HostedControl!=null)
+			{
+				TypeDescriptor.GetProperties(m_HostedControl)["Visible"].SetValue(m_HostedControl,GetVisible());
+			}
+		}
+		
+		private bool GetVisible()
+		{
+			if(m_Parent!=null && !NodeOperations.GetIsNodeVisible(m_Parent))
+				return false;
+			return m_Visible;
+		}
+		
+		internal void OnParentExpandedChanged(bool expanded)
+		{
+			if(m_HostedControl!=null && m_HostedControl.Visible != expanded)
+			{
+				bool visible=GetVisible();
+				m_HostedControl.Visible = visible;
+				if(this.DesignMode || this.Parent!=null && this.Parent.Site!=null && this.Parent.Site.DesignMode)
+					TypeDescriptor.GetProperties(m_HostedControl)["Visible"].SetValue(m_HostedControl,visible);
+			}
+		}
+
+        private bool _Selectable = true;
+        /// <summary>
+        /// Gets or sets whether cell can be selected by user by clicking it with the mouse or using keyboard. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether cell can be selected by user by clicking it with the mouse or using keyboard.")]
+        public bool Selectable
+        {
+            get { return _Selectable; }
+            set
+            {
+                _Selectable = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets whether cell can be selected. Cell must be Visible, Enabled and Selectable in order for it to be selected.
+        /// </summary>
+        [Browsable(false)]
+        public bool CanSelect
+        {
+            get
+            {
+                return this.Enabled & this.IsVisible & this.Selectable;
+            }
+        }
+
+        /// <summary>
+        /// Returns ColumnHeader cell is under if one is defined and cell is already parented to the tree. Otherwise it returns null/nothing.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public ColumnHeader ColumnHeader
+        {
+            get
+            {
+                AdvTree tree = this.TreeControl;
+                if (this.Parent == null || tree == null) return null;
+                int index = this.Parent.Cells.IndexOf(this);
+                if (this.Parent.HasColumns && this.Parent.NodesColumns.Count > index)
+                    return this.Parent.NodesColumns[index];
+                if (tree.Columns.Count > index)
+                    return tree.Columns[index];
+                return null;
+            }
+        }
+		#endregion
+		
+		#region Markup Implementation
+        private DevComponents.DotNetBar.TextMarkup.BodyElement m_TextMarkup = null;
+
+		private void MarkupTextChanged()
+		{
+			if (!IsMarkupSupported)
+				return;
+
+			if(m_TextMarkup!=null)
+				m_TextMarkup.HyperLinkClick -= new EventHandler(this.TextMarkupLinkClick);
+			
+			m_TextMarkup = null;
+
+            if (!DevComponents.DotNetBar.TextMarkup.MarkupParser.IsMarkup(ref m_Text))
+				return;
+
+            m_TextMarkup = DevComponents.DotNetBar.TextMarkup.MarkupParser.Parse(m_Text);
+
+            if (m_TextMarkup != null)
+                m_TextMarkup.HyperLinkClick += new EventHandler(TextMarkupLinkClick);
+		}
+
+		/// <summary>
+		/// Occurs when text markup link is clicked.
+		/// </summary>
+		protected virtual void TextMarkupLinkClick(object sender, EventArgs e)
+		{
+            DevComponents.DotNetBar.TextMarkup.HyperLink link = sender as DevComponents.DotNetBar.TextMarkup.HyperLink;
+			
+			if(link!=null && this.Parent!=null)
+				this.Parent.InvokeMarkupLinkClick(this, new MarkupLinkClickEventArgs(link.Name, link.HRef));
+		}
+
+		/// <summary>
+		/// Gets reference to parsed markup body element if text was markup otherwise returns null.
+		/// </summary>
+        internal DevComponents.DotNetBar.TextMarkup.BodyElement TextMarkupBody
+		{
+			get { return m_TextMarkup; }
+		}
+
+        private bool _TextMarkupEnabled = true;
+        /// <summary>
+        /// Gets or sets whether cell supports and renders text markup. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Gets or sets whether cell supports and renders text markup.")]
+        public bool TextMarkupEnabled
+        {
+            get { return _TextMarkupEnabled; }
+            set
+            {
+                _TextMarkupEnabled = value;
+            }
+        }
+
+		/// <summary>
+		/// Gets whether item supports text markup. Default is false.
+		/// </summary>
+		protected virtual bool IsMarkupSupported
+		{
+			get { return _TextMarkupEnabled; }
+		}
+
+        private bool _HostedItemMouseEntered = false;
+		protected internal virtual void InvokeNodeMouseMove(object sender, MouseEventArgs e)
+		{
+			if(m_TextMarkup!=null)
+				m_TextMarkup.MouseMove(sender as Control, e);
+
+            if (_HostedItem != null)
+            {
+                if (_HostedItem.DisplayRectangle.Contains(e.X, e.Y))
+                {
+                    if (!_HostedItemMouseEntered)
+                    {
+                        _HostedItem.InternalMouseEnter();
+                        _HostedItemMouseEntered = true;
+                    }
+                    _HostedItem.InternalMouseMove(e);
+                }
+                else if(_HostedItemMouseEntered)
+                {
+                    _HostedItem.InternalMouseLeave();
+                    _HostedItemMouseEntered = false;
+                }
+            }
+
+            if (!IsMouseOver) HideToolTip();
+		}
+
+        private bool _HostedItemMouseDown = false;
+		protected internal virtual void InvokeNodeMouseDown(object sender, MouseEventArgs e)
+		{
+            HideToolTip();
+
+			if(m_TextMarkup!=null)
+				m_TextMarkup.MouseDown(sender as Control, e);
+
+            if (_HostedItem != null && _HostedItem.DisplayRectangle.Contains(e.X, e.Y))
+            {
+                _HostedItem.InternalMouseDown(e);
+                _HostedItemMouseDown = true;
+            }
+		}
+		
+		protected internal virtual void InvokeNodeMouseUp(object sender, MouseEventArgs e)
+		{
+			if(m_TextMarkup!=null)
+				m_TextMarkup.MouseUp(sender as Control, e);
+
+            if (_HostedItem != null && _HostedItemMouseDown)
+            {
+                _HostedItem.InternalMouseUp(e);
+                _HostedItemMouseDown = false;
+            }
+		}
+		
+		protected internal virtual void InvokeNodeMouseLeave(object sender, EventArgs e)
+		{
+            HideToolTip();
+
+			if(m_TextMarkup!=null)
+				m_TextMarkup.MouseLeave(sender as Control);
+            if (_HostedItem != null)
+            {
+                if (_HostedItemMouseEntered)
+                {
+                    _HostedItem.InternalMouseLeave();
+                    _HostedItemMouseEntered = false;
+                }
+            }
+		}
+		
+		protected internal virtual void InvokeNodeClick(object sender, EventArgs e)
+		{
+			if(m_TextMarkup!=null)
+				m_TextMarkup.Click(sender as Control);
+            if (_HostedItem != null && e is TreeNodeMouseEventArgs)
+            {
+                TreeNodeMouseEventArgs me = (TreeNodeMouseEventArgs)e;
+                if (this.Bounds.Contains(me.X, me.Y))
+                    _HostedItem.InternalClick(me.Button, new Point(me.X, me.Y));
+            }
+		}
+
+        protected internal virtual void InvokeNodeMouseHover(object sender, EventArgs e)
+        {
+            if (_HostedItem != null)
+                _HostedItem.InternalMouseHover();
+            if (System.Windows.Forms.Control.MouseButtons == System.Windows.Forms.MouseButtons.None)
+                this.ShowToolTip();
+        }
+		#endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/Cell.resx b/PROMS/DotNetBar Source Code/AdvTree/Cell.resx
new file mode 100644
index 00000000..3f337e08
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/Cell.resx	
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<root>
+	<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+		<xsd:element name="root" msdata:IsDataSet="true">
+			<xsd:complexType>
+				<xsd:choice maxOccurs="unbounded">
+					<xsd:element name="data">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+								<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" />
+							<xsd:attribute name="type" type="xsd:string" />
+							<xsd:attribute name="mimetype" type="xsd:string" />
+						</xsd:complexType>
+					</xsd:element>
+					<xsd:element name="resheader">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" use="required" />
+						</xsd:complexType>
+					</xsd:element>
+				</xsd:choice>
+			</xsd:complexType>
+		</xsd:element>
+	</xsd:schema>
+	<resheader name="ResMimeType">
+		<value>text/microsoft-resx</value>
+	</resheader>
+	<resheader name="Version">
+		<value>1.0.0.0</value>
+	</resheader>
+	<resheader name="Reader">
+		<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+	<resheader name="Writer">
+		<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+</root>
diff --git a/PROMS/DotNetBar Source Code/AdvTree/CellCollection.cs b/PROMS/DotNetBar Source Code/AdvTree/CellCollection.cs
new file mode 100644
index 00000000..85c4fd56
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/CellCollection.cs	
@@ -0,0 +1,211 @@
+using System;
+using System.Collections;
+using System.ComponentModel;
+
+namespace DevComponents.AdvTree
+{
+	///<summary>
+	/// A strongly-typed collection of <see cref="Cell"/> objects.
+	///</summary>
+	public class CellCollection:CollectionBase 
+	{
+		#region Private Variables
+		private Node m_ParentNode=null;
+		#endregion
+
+		#region Internal Implementation
+		/// <summary>Creates new instance of the class.</summary>
+		public CellCollection()
+		{
+		}
+		/// <summary>
+		/// Adds new object to the collection.
+		/// </summary>
+		/// <param name="cell">Object to add.</param>
+		/// <returns>Index of newly added object.</returns>
+		public int Add(Cell cell)
+		{
+			return List.Add(cell);
+		}
+		/// <summary>
+		/// Returns reference to the object in collection based on it's index.
+		/// </summary>
+		public Cell this[int index]
+		{
+			get {return (Cell)(List[index]);}
+			set {List[index] = value;}
+		}
+        /// <summary>
+        /// Returns reference to the object in collection based on it's name. Returns null/nothing if cell with given name is not found.
+        /// </summary>
+        public Cell this[string name]
+        {
+            get 
+            {
+                foreach (Cell item in List)
+                {
+                    if (item.Name == name) return item;
+                }
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Gets the cell based on the column name. Node must be able to reach AdvTree control for this method to work.
+        /// </summary>
+        /// <param name="columnName">Column name.</param>
+        /// <returns>Cell object or null.</returns>
+        public Cell GetByColumnName(string columnName)
+        {
+            if (string.IsNullOrEmpty(columnName))
+                throw new ArgumentException("columnName argument must be non-empty non-null string with column name");
+            Node parentNode = this.ParentNode;
+            AdvTree tree = parentNode.TreeControl;
+            if (tree == null)
+                throw new NullReferenceException("AdvTree control cannot be reached. Node is not added to a tree.");
+            Cell cell = null;
+            if (parentNode.Parent != null && parentNode.Parent.NodesColumns.Count > 0)
+            {
+                int index= parentNode.Parent.NodesColumns.IndexOf(columnName);
+                if (index >= 0) cell = this[index];
+            }
+            else
+            {
+                int index = tree.Columns.IndexOf(columnName);
+                if (index >= 0) cell = this[index];
+            }
+            return cell;
+        }
+
+		/// <summary>
+		/// Inserts new object into the collection.
+		/// </summary>
+		/// <param name="index">Position of the object.</param>
+		/// <param name="value">Object to insert.</param>
+		public void Insert(int index, Cell value) 
+		{
+			List.Insert(index, value);
+		}
+
+		/// <summary>
+		/// Returns index of the object inside of the collection.
+		/// </summary>
+		/// <param name="value">Reference to the object.</param>
+		/// <returns>Index of the object.</returns>
+		public int IndexOf(Cell value) 
+		{
+			return List.IndexOf(value);
+		}
+
+		/// <summary>
+		/// Returns whether collection contains specified object.
+		/// </summary>
+		/// <param name="value">Object to look for.</param>
+		/// <returns>true if object is part of the collection, otherwise false.</returns>
+		public bool Contains(Cell value) 
+		{
+			return List.Contains(value);
+		}
+
+		/// <summary>
+		/// Removes specified object from the collection.
+		/// </summary>
+		/// <param name="value"></param>
+		public void Remove(Cell value) 
+		{
+			List.Remove(value);
+		}
+
+		protected override void OnRemoveComplete(int index,object value)
+		{
+			base.OnRemoveComplete(index,value);
+			Cell cell=value as Cell;
+			cell.SetParent(null);
+			if(m_ParentNode!=null)
+				m_ParentNode.OnCellRemoved(cell);
+		}
+		protected override void OnInsertComplete(int index,object value)
+		{
+			base.OnInsertComplete(index,value);
+			Cell cell=value as Cell;
+			if(cell.Parent!=null && cell.Parent!=m_ParentNode)
+				cell.Parent.Cells.Remove(cell);
+			cell.SetParent(m_ParentNode);
+			if(m_ParentNode!=null)
+				m_ParentNode.OnCellInserted(cell);
+		}
+        protected override void OnInsert(int index, object value)
+        {
+            if (m_ParentNode != null && m_ParentNode.Site != null && m_ParentNode.Site.DesignMode && this.List.Count > 0)
+            {
+                Cell cell = value as Cell;
+                if (cell.Site == null && this.List.Contains(cell)) this.List.Remove(cell);
+            }
+
+            base.OnInsert(index, value);
+        }
+
+		/// <summary>
+		/// Copies collection into the specified array.
+		/// </summary>
+		/// <param name="array">Array to copy collection to.</param>
+		/// <param name="index">Starting index.</param>
+		public void CopyTo(Cell[] array, int index) 
+		{
+			List.CopyTo(array, index);
+		}
+
+		/// <summary>
+		/// Copies contained items to the Cell array.
+		/// </summary>
+		/// <param name="array">Array to copy to.</param>
+		internal void CopyTo(Cell[] array)
+		{
+			List.CopyTo(array,0);
+		}
+
+        private Cell _RootCell = null;
+		protected override void OnClear()
+		{
+            if (m_ParentNode != null && m_ParentNode.Site != null && m_ParentNode.Site.DesignMode && this.List.Count>0)
+            {
+                if (this[0].Site == null)
+                    _RootCell = this[0];
+            }
+			base.OnClear();
+		}
+
+        protected override void OnClearComplete()
+        {
+            base.OnClearComplete();
+            if (_RootCell != null)
+            {
+                this.Add(_RootCell);
+                _RootCell = null;
+            }
+        }
+
+        protected override void OnSet(int index, object oldValue, object newValue)
+        {
+            base.OnSet(index, oldValue, newValue);
+        }
+
+		/// <summary>
+		/// Gets or sets the node this collection is associated with.
+		/// </summary>
+		[Browsable(false),DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public Node ParentNode
+		{
+			get {return m_ParentNode;}
+		}
+		/// <summary>
+		/// Sets the node collection belongs to.
+		/// </summary>
+		/// <param name="parent">Cell that is parent of this collection.</param>
+		internal void SetParentNode(Node parent)
+		{
+			m_ParentNode=parent;
+		}
+		#endregion
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/CellEditEventArgs.cs b/PROMS/DotNetBar Source Code/AdvTree/CellEditEventArgs.cs
new file mode 100644
index 00000000..891b6bc4
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/CellEditEventArgs.cs	
@@ -0,0 +1,105 @@
+using System;
+
+namespace DevComponents.AdvTree
+{
+	/// <summary>
+	/// Represents event arguments for cell editing events.
+	/// </summary>
+	public class CellEditEventArgs : EventArgs
+	{
+		/// <summary>
+		/// Indicates the action that caused the event.
+		/// </summary>
+		public eTreeAction Action=eTreeAction.Code;
+		/// <summary>
+		/// Indicates the cell that is affected.
+		/// </summary>
+		public DevComponents.AdvTree.Cell Cell=null;
+		/// <summary>
+		/// Indicates new text that will be assigned to the cell if one is appropriate for given event.
+		/// </summary>
+		public string NewText="";
+
+        private ICellEditControl _Editor = null;
+        /// <summary>
+        /// Gets reference to the cell editor control.
+        /// </summary>
+        public ICellEditControl Editor
+        {
+            get
+            {
+                return _Editor;
+            }
+        }
+
+		/// <summary>
+		/// Indicates whether the current action is cancelled. For BeforeCellEdit event setting this
+		/// property to true will cancel the editing. For AfterCellEdit event setting this property to
+		/// true will cancel any changes made to the text and edits will not be accepted. For CellEditEnding
+		/// event setting this property to true will keep the cell in edit mode.
+		/// </summary>
+		public bool Cancel=false;
+
+        /// <summary>
+        /// Indicates whether editing operation was canceled by the end user, usually by pressing ESCAPE key.
+        /// </summary>
+        public readonly bool IsUserCanceled;
+
+		/// <summary>
+		/// Initializes new instance of CellEditEventArgs class.
+		/// </summary>
+		/// <param name="cell">Reference to Cell this event is raised for.</param>
+		/// <param name="action">Indicates the action that caused the event.</param>
+		/// <param name="newText">Indicates new text of the cell if it applies to given event.</param>
+		public CellEditEventArgs(Cell cell, eTreeAction action, string newText)
+		{
+			this.Action=action;
+			this.Cell=cell;
+			this.NewText=newText;
+            this.IsUserCanceled = false;
+		}
+        /// <summary>
+        /// Initializes new instance of CellEditEventArgs class.
+        /// </summary>
+        /// <param name="cell">Reference to Cell this event is raised for.</param>
+        /// <param name="action">Indicates the action that caused the event.</param>
+        /// <param name="newText">Indicates new text of the cell if it applies to given event.</param>
+        public CellEditEventArgs(Cell cell, eTreeAction action, string newText, ICellEditControl editor)
+        {
+            this.Action = action;
+            this.Cell = cell;
+            this.NewText = newText;
+            this.IsUserCanceled = false;
+            _Editor = editor;
+        }
+        /// <summary>
+        /// Initializes new instance of CellEditEventArgs class.
+        /// </summary>
+        /// <param name="cell">Reference to Cell this event is raised for.</param>
+        /// <param name="action">Indicates the action that caused the event.</param>
+        /// <param name="newText">Indicates new text of the cell if it applies to given event.</param>
+        /// <param name="isUserCanceled">Indicates whether action is canceled by the end user.</param>
+        public CellEditEventArgs(Cell cell, eTreeAction action, string newText, bool isUserCanceled)
+        {
+            this.Action = action;
+            this.Cell = cell;
+            this.NewText = newText;
+            this.IsUserCanceled = isUserCanceled;
+        }
+        /// <summary>
+        /// Initializes new instance of CellEditEventArgs class.
+        /// </summary>
+        /// <param name="cell">Reference to Cell this event is raised for.</param>
+        /// <param name="action">Indicates the action that caused the event.</param>
+        /// <param name="newText">Indicates new text of the cell if it applies to given event.</param>
+        /// <param name="isUserCanceled">Indicates whether action is canceled by the end user.</param>
+        public CellEditEventArgs(Cell cell, eTreeAction action, string newText, bool isUserCanceled, ICellEditControl editor)
+        {
+            this.Action = action;
+            this.Cell = cell;
+            this.NewText = newText;
+            this.IsUserCanceled = isUserCanceled;
+            _Editor = editor;
+        }
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/CellImages.cs b/PROMS/DotNetBar Source Code/AdvTree/CellImages.cs
new file mode 100644
index 00000000..ab7910ea
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/CellImages.cs	
@@ -0,0 +1,570 @@
+using System;
+using System.Drawing;
+using System.ComponentModel;
+using DevComponents.DotNetBar;
+
+namespace DevComponents.AdvTree
+{
+	/// <summary>
+	/// Represents class that holds images for a cell.
+	/// </summary>
+	/// <remarks>
+	/// If you plan to use alpha-blended images we recommend using PNG-24 format which
+	/// supports alpha-blending. As of this writing .NET Framework 1.0 and 1.1 do not support
+	/// alpha-blending when used through Image class.
+	/// </remarks>
+	[ToolboxItem(false), TypeConverter(typeof(System.ComponentModel.ExpandableObjectConverter))]
+	public class CellImages
+	{
+		// Image variables
+		private System.Drawing.Image m_Image=null;
+        private System.Drawing.Image m_DisabledImageGenerated = null;
+		private int m_ImageIndex=-1; // Image index if image from ImageList is used
+		private System.Drawing.Image m_ImageMouseOver=null;
+		private int m_ImageMouseOverIndex=-1; // Image index if image from ImageList is used
+		private System.Drawing.Image m_ImageDisabled=null;
+//		private bool m_DisabledImageCustom=false;
+		private int m_ImageDisabledIndex=-1; // Image index if image from ImageList is used
+		private System.Drawing.Image m_ImageExpanded=null;
+		private int m_ImageExpandedIndex=-1;
+		private Cell m_ParentCell=null;
+		private Size m_LargestImageSize=Size.Empty;
+
+		/// <summary>
+		/// Initializes new instance of CellImages class.
+		/// </summary>
+		/// <param name="parentCell">Reference to parent cell.</param>
+		public CellImages(Cell parentCell)
+		{
+			m_ParentCell=parentCell;
+		}
+
+		#region Properties
+
+        internal System.Drawing.Image DisabledImageGenerated
+        {
+            get { return m_DisabledImageGenerated; }
+            set
+            {
+                m_DisabledImageGenerated = value;
+            }
+        }
+
+		/// <summary>
+		/// Gets or sets default cell image. Setting this property to valid image will
+		/// override any setting of ImageIndex property.
+		/// </summary>
+		/// <remarks>
+		/// 	<para>The image set through this property will be serialized with the cell. If you
+		///     plan to use ImageList then use <see cref="ImageIndex">ImageIndex</see>
+		///     property.</para>
+		/// 	<para>
+		/// 		<para>If you plan to use alpha-blended images we recommend using PNG-24 format
+		///         which supports alpha-blending. As of this writing .NET Framework 1.0 and 1.1
+		///         do not support alpha-blending when used through Image class.</para>
+		/// 	</para>
+		/// </remarks>
+		/// <value>Image object or <strong>null (Nothing)</strong> if no image is assigned.</value>
+		[Browsable(true),DefaultValue(null),Category("Images"),Description("Indicates default cell image"), DevCoSerialize()]
+		public System.Drawing.Image Image
+		{
+			get {return m_Image;}
+			set
+			{
+				ChangeImage(ref m_Image, value);
+			}
+		}
+
+		/// <summary>
+		/// Resets Image property to it's default value (null, VB nothing).
+		/// </summary>
+		public void ResetImage()
+		{
+			TypeDescriptor.GetProperties(this)["Image"].SetValue(this, null);
+		}
+
+		/// <summary>
+		/// Gets or sets the image that is displayed when mouse is over the cell. Setting
+		/// this property to valid image will override any setting of ImageMouseOverIndex
+		/// property.
+		/// </summary>
+		/// <remarks>
+		/// If you plan to use alpha-blended images we recommend using PNG-24 format which
+		/// supports alpha-blending. As of this writting .NET Framework 1.0 and 1.1 do not support
+		/// alpha-blending when used through Image class.
+		/// </remarks>
+		[Browsable(true),DefaultValue(null),Category("Images"),Description("Indicates cell image when mouse is over the cell"), DevCoSerialize()]
+		public System.Drawing.Image ImageMouseOver
+		{
+			get {return m_ImageMouseOver;}
+			set
+			{
+                ChangeImage(ref m_ImageMouseOver, value);
+			}
+		}
+
+		/// <summary>
+		/// Resets ImageMouseOver to it's default value (null, VB nothing).
+		/// </summary>
+		public void ResetImageMouseOver()
+		{
+			TypeDescriptor.GetProperties(this)["ImageMouseOver"].SetValue(this, null);
+		}
+
+        /// <summary>
+        /// Gets or sets the image that is displayed when cell is disabled. If not assigned
+        /// disabled image is created from default cell image. Setting this property to valid image
+        /// will override any setting of ImageDisabledIndex property.
+        /// </summary>
+        /// <remarks>
+        /// If you plan to use alpha-blended images we recommend using PNG-24 format which
+        /// supports alpha-blending. As of this writing .NET Framework 1.0 and 1.1 do not support
+        /// alpha-blending when used through Image class.
+        /// </remarks>
+        [Browsable(true), DefaultValue(null), Category("Images"), Description("Indicates disabled cell image")]
+        public System.Drawing.Image ImageDisabled
+        {
+            get { return m_ImageDisabled; }
+            set
+            {
+                ChangeImage(ref m_ImageDisabled, value);
+            }
+        }
+
+        /// <summary>
+        /// Resets ImageDisabled to it's default value (null, VB nothing).
+        /// </summary>
+        public void ResetImageDisabled()
+        {
+            this.ImageDisabled = null;
+        }
+
+		/// <summary>
+		/// Gets or sets image that is displayed when Node that this cell belongs to is
+		/// expanded. Setting this property to valid image will override any setting of
+		/// ImageExpandedIndex property.
+		/// </summary>
+		/// <remarks>
+		/// If you plan to use alpha-blended images we recommend using PNG-24 format which
+		/// supports alpha-blending. As of this writing .NET Framework 1.0 and 1.1 do not support
+		/// alpha-blending when used through Image class.
+		/// </remarks>
+        [Browsable(true),DefaultValue(null),Category("Images"),Description("Indicates cell image when node associtaed with this cell is expanded"), DevCoSerialize()]
+		public System.Drawing.Image ImageExpanded
+		{
+			get {return m_ImageExpanded;}
+			set
+			{
+                ChangeImage(ref m_ImageExpanded, value);
+			}
+		}
+
+		/// <summary>
+		/// Resets ImageExpanded to it's default value (null, VB nothing).
+		/// </summary>
+		public void ResetImageExpanded()
+		{
+			TypeDescriptor.GetProperties(this)["ImageExpanded"].SetValue(this, null);
+		}
+
+		/// <summary>
+		/// Gets or sets the Index of default cell image from ImageList specified on AdvTree
+		/// control.
+		/// </summary>
+		/// <remarks>
+		/// If you plan to use alpha-blended images we recommend using PNG-24 format which
+		/// supports alpha-blending. As of this writing .NET Framework 1.0 and 1.1 do not support
+		/// alpha-blending when used through Image class.
+		/// </remarks>
+		[Browsable(true),DefaultValue(-1),Category("ImageList Images"),Description("Indicates default cell image"), DevCoSerialize()]
+		public int ImageIndex
+		{
+			get {return m_ImageIndex;}
+			set
+			{
+				m_ImageIndex=value;
+				this.OnImageChanged();
+			}
+		}
+
+        private string _ImageKey = "";
+        /// <summary>
+        /// Gets or sets the key of the default cell image from ImageList specified on AdvTree control.
+        /// </summary>
+        [DefaultValue(""), Category("ImageList Images"), Description("Indicates the default cell image key"), DevCoSerialize()]
+        public string ImageKey
+        {
+            get { return _ImageKey; }
+            set
+            {
+                _ImageKey = value;
+                this.OnImageChanged();
+            }
+        }
+        
+
+		/// <summary>
+		/// Property Editor support for ImageIndex selection
+		/// </summary>
+		[System.ComponentModel.Browsable(false),System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+		public System.Windows.Forms.ImageList ImageList
+		{
+			get
+			{
+				if(this.Parent!=null)
+				{
+					AdvTree tree=this.Parent.TreeControl;
+					if(tree!=null)
+					{
+						return tree.ImageList;
+					}
+				}
+
+				return null;
+			}
+		}
+
+		/// <remarks>
+		/// If you plan to use alpha-blended images we recommend using PNG-24 format which
+		/// supports alpha-blending. As of this writing .NET Framework 1.0 and 1.1 do not support
+		/// alpha-blending when used through Image class.
+		/// </remarks>
+		/// <summary>
+		/// Gets or sets the Index of cell image when mouse is over the cell from ImageList
+		/// specified on AdvTree control.
+		/// </summary>
+		[Browsable(true),DefaultValue(-1),Category("ImageList Images"),Description("Indicates cell image when mouse is over the cell"), DevCoSerialize()]
+		public int ImageMouseOverIndex
+		{
+			get {return m_ImageMouseOverIndex;}
+			set
+			{
+				m_ImageMouseOverIndex=value;
+				this.OnImageChanged();
+			}
+		}
+
+        private string _ImageMouseOverKey = "";
+        /// <remarks>
+        /// If you plan to use alpha-blended images we recommend using PNG-24 format which
+        /// supports alpha-blending. As of this writing .NET Framework 1.0 and 1.1 do not support
+        /// alpha-blending when used through Image class.
+        /// </remarks>
+        /// <summary>
+        /// Gets or sets the key of cell image when mouse is over the cell from ImageList
+        /// specified on AdvTree control.
+        /// </summary>
+        [Browsable(true), DefaultValue(""), Category("ImageList Images"), Description("Indicates cell image when mouse is over the cell"), DevCoSerialize()]
+        public string ImageMouseOverKey
+        {
+            get { return _ImageMouseOverKey; }
+            set
+            {
+                _ImageMouseOverKey = value;
+                this.OnImageChanged();
+            }
+        }
+
+        /// <remarks>
+        /// If you plan to use alpha-blended images we recommend using PNG-24 format which
+        /// supports alpha-blending. As of this writing .NET Framework 1.0 and 1.1 do not support
+        /// alpha-blending when used through Image class.
+        /// </remarks>
+        /// <summary>
+        /// Gets or sets the Index of disabled cell image from ImageList specified on AdvTree
+        /// control.
+        /// </summary>
+        [Browsable(true), DefaultValue(-1), Category("ImageList Images"), Description("Indicates disabled cell image")]
+        public int ImageDisabledIndex
+        {
+            get { return m_ImageDisabledIndex; }
+            set
+            {
+                m_ImageDisabledIndex = value;
+                this.OnImageChanged();
+            }
+        }
+
+        private string _ImageDisabledKey = "";
+        /// <remarks>
+        /// If you plan to use alpha-blended images we recommend using PNG-24 format which
+        /// supports alpha-blending. As of this writing .NET Framework 1.0 and 1.1 do not support
+        /// alpha-blending when used through Image class.
+        /// </remarks>
+        /// <summary>
+        /// Gets or sets the key of disabled cell image from ImageList specified on AdvTree
+        /// control.
+        /// </summary>
+        [Browsable(true), DefaultValue(""), Category("ImageList Images"), Description("Indicates disabled cell image")]
+        public string ImageDisabledKey
+        {
+            get { return _ImageDisabledKey; }
+            set
+            {
+                _ImageDisabledKey = value;
+                this.OnImageChanged();
+            }
+        }
+
+		/// <remarks>
+		/// If you plan to use alpha-blended images we recommend using PNG-24 format which
+		/// supports alpha-blending. As of this writing .NET Framework 1.0 and 1.1 do not support
+		/// alpha-blending when used through Image class.
+		/// </remarks>
+		/// <summary>
+		/// Gets or sets the Index of cell image from ImageList specified on AdvTree control
+		/// that is used when Node associated with this cell is expanded
+		/// </summary>
+		[Browsable(true),DefaultValue(-1),Category("ImageList Images"),Description("Indicates expanded cell image"), DevCoSerialize()]
+		public int ImageExpandedIndex
+		{
+			get {return m_ImageExpandedIndex;}
+			set
+			{
+				m_ImageExpandedIndex=value;
+				this.OnImageChanged();
+			}
+		}
+
+        private string _ImageExpandedKey = "";
+        /// <remarks>
+        /// If you plan to use alpha-blended images we recommend using PNG-24 format which
+        /// supports alpha-blending. As of this writing .NET Framework 1.0 and 1.1 do not support
+        /// alpha-blending when used through Image class.
+        /// </remarks>
+        /// <summary>
+        /// Gets or sets the key of cell image from ImageList specified on AdvTree control
+        /// that is used when Node associated with this cell is expanded
+        /// </summary>
+        [Browsable(true), DefaultValue(""), Category("ImageList Images"), Description("Indicates expanded cell image"), DevCoSerialize()]
+        public string ImageExpandedKey
+        {
+            get { return _ImageExpandedKey; }
+            set
+            {
+                _ImageExpandedKey = value;
+                this.OnImageChanged();
+            }
+        }
+
+		/// <summary>
+		/// Gets or sets the parent node of the cell.
+		/// </summary>
+		[Browsable(false),DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public Cell Parent
+		{
+			get {return m_ParentCell;}
+			set {m_ParentCell=value;}
+		}
+
+		/// <summary>
+		/// Gets whether CellImages object should be serialized or not. If object has all
+		/// default values then this property will return <strong>false</strong>.
+		/// </summary>
+		internal bool ShouldSerialize
+		{
+			get
+			{
+				if(m_Image==null && m_ImageDisabled==null && m_ImageDisabledIndex==-1 &&
+					m_ImageExpanded==null && m_ImageExpandedIndex==-1 && m_ImageIndex==-1 &&
+					m_ImageMouseOver==null && m_ImageMouseOverIndex==-1)
+					return false;
+				return true;
+			}
+		}
+
+		/// <summary>
+		/// Returns largest image size in this set of images.
+		/// </summary>
+		internal Size LargestImageSize
+		{
+			get
+			{
+				return m_LargestImageSize;
+			}
+		}
+
+		#endregion
+
+		#region Methods
+
+		/// <summary>Makes a copy of a CellImages object.</summary>
+		public virtual CellImages Copy()
+		{
+			CellImages ci=new CellImages(null);
+			ci.Image=this.Image;
+//			ci.ImageDisabled=this.ImageDisabled;
+//			ci.ImageDisabledIndex=this.ImageDisabledIndex;
+		    ci.ImageExpanded = this.ImageExpanded == null ? null : (Image) this.ImageExpanded.Clone();
+			ci.ImageExpandedIndex=this.ImageExpandedIndex;
+			ci.ImageIndex=this.ImageIndex;
+			ci.ImageMouseOver=this.ImageMouseOver == null? null : (Image)this.ImageMouseOver.Clone();
+			ci.ImageMouseOverIndex=this.ImageMouseOverIndex;
+            ci.ImageDisabledKey = this.ImageDisabledKey;
+            ci.ImageExpandedKey = this.ImageExpandedKey;
+            ci.ImageKey = this.ImageKey;
+            ci.ImageMouseOverKey = this.ImageMouseOverKey;
+			return ci;
+		}
+
+		#endregion
+
+		#region Internals
+        /// <summary>
+        /// Changes the image and invokes largest image size calculation if the
+        /// image size truly changed.
+        /// </summary>
+        /// <param name="currentImage"></param>
+        /// <param name="newImage"></param>
+        private void ChangeImage(ref System.Drawing.Image currentImage, System.Drawing.Image newImage)
+        {
+            // Early out if no real change
+            if (currentImage == newImage)
+                return;
+
+            // Hold onto previous image
+            System.Drawing.Image previousImage = currentImage;
+
+            // Assign new image
+            currentImage = newImage;
+
+            // If either current or previous is null, or the sizes don't match,
+            // we need to resize ourselves and the parent.
+            if (previousImage == null || currentImage == null || GetImageSize(previousImage) != GetImageSize(currentImage))
+            {
+                RefreshLargestImageSize();
+
+                if (this.Parent != null)
+                    this.Parent.OnImageChanged();
+            }
+
+            // Dispose the generated disabled image, if applicable.
+            DisposeGeneratedDisabledImage();
+        }
+        private Size GetImageSize(Image image)
+        {
+            try
+            {
+                return image.Size;
+            }
+            catch
+            {
+                return Size.Empty;
+            }
+        }
+
+        private void OnImageChanged()
+        {
+            RefreshLargestImageSize();
+            if (this.Parent != null)
+                this.Parent.OnImageChanged();
+            DisposeGeneratedDisabledImage();
+        }
+
+        public void Dispose()
+        {
+            DisposeGeneratedDisabledImage();
+            if (BarUtilities.DisposeItemImages || _AutoDispose)
+            {
+                BarUtilities.DisposeImage(ref m_Image);
+                BarUtilities.DisposeImage(ref m_ImageDisabled);
+                BarUtilities.DisposeImage(ref m_ImageExpanded);
+                BarUtilities.DisposeImage(ref m_ImageMouseOver);
+            }
+        }
+
+        internal void DisposeGeneratedDisabledImage()
+        {
+            if (m_DisabledImageGenerated != null)
+            {
+                m_DisabledImageGenerated.Dispose();
+                m_DisabledImageGenerated = null;
+            }
+        }
+
+		internal void RefreshLargestImageSize()
+		{
+			m_LargestImageSize=Size.Empty;
+			AdjustSize(m_Image,ref m_LargestImageSize);
+			AdjustSize(m_ImageDisabled,ref m_LargestImageSize);
+			AdjustSize(m_ImageExpanded,ref m_LargestImageSize);
+			AdjustSize(m_ImageMouseOver,ref m_LargestImageSize);
+            
+			AdjustSize(GetImageByIndex(m_ImageIndex),ref m_LargestImageSize);
+			AdjustSize(GetImageByIndex(m_ImageDisabledIndex),ref m_LargestImageSize);
+			AdjustSize(GetImageByIndex(m_ImageExpandedIndex),ref m_LargestImageSize);
+			AdjustSize(GetImageByIndex(m_ImageMouseOverIndex),ref m_LargestImageSize);
+
+            AdjustSize(GetImageByKey(_ImageKey), ref m_LargestImageSize);
+            AdjustSize(GetImageByKey(_ImageDisabledKey), ref m_LargestImageSize);
+            AdjustSize(GetImageByKey(_ImageExpandedKey), ref m_LargestImageSize);
+            AdjustSize(GetImageByKey(_ImageMouseOverKey), ref m_LargestImageSize);
+		}
+		private void AdjustSize(System.Drawing.Image image, ref Size size)
+		{
+			if(image!=null)
+			{
+				if(image.Width>size.Width)
+					size.Width=image.Width;
+				if(image.Height>size.Height)
+					size.Height=image.Height;
+			}
+		}
+		/// <summary>
+		/// Returns image from image list based on the image index.
+		/// </summary>
+		/// <param name="imageIndex">Index of the image to return.</param>
+		/// <returns>Image object from image list.</returns>
+		internal System.Drawing.Image GetImageByIndex(int imageIndex)
+		{
+            if (imageIndex >= 0 && this.Parent != null && this.Parent.TreeControl != null && this.Parent.TreeControl.ImageList != null && this.Parent.TreeControl.ImageList.Images.Count > 0)
+            {
+                try
+                {
+                    return this.Parent.TreeControl.ImageList.Images[imageIndex];
+                }
+                catch
+                {
+                    return null;
+                }
+                
+            }
+            else
+                return null;
+		}
+
+        /// <summary>
+        /// Returns image from image list based on the image key.
+        /// </summary>
+        /// <param name="key">Key of the image to return.</param>
+        /// <returns>Image object from image list.</returns>
+        internal System.Drawing.Image GetImageByKey(string key)
+        {
+            if (string.IsNullOrEmpty(key)) return null;
+
+            Cell parent = this.Parent;
+            if (parent == null) return null;
+
+            AdvTree tree = parent.TreeControl;
+            if (tree == null || tree.ImageList == null || !tree.ImageList.Images.ContainsKey(key)) return null;
+
+            return tree.ImageList.Images[key];
+        }
+
+        private bool _AutoDispose = false;
+        /// <summary>
+        /// Indicates whether assigned images are automatically disposed when the cell and node are disposed. Default value is false.
+        /// </summary>
+        [Browsable(false), DefaultValue(false)]
+        public bool AutoDispose
+        {
+            get { return _AutoDispose; }
+            set
+            {
+                _AutoDispose = value;
+            }
+        }
+        
+		#endregion
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/ColumnHeader.cs b/PROMS/DotNetBar Source Code/AdvTree/ColumnHeader.cs
new file mode 100644
index 00000000..980bf138
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/ColumnHeader.cs	
@@ -0,0 +1,1183 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Windows.Forms;
+using DevComponents.DotNetBar;
+using System.Collections;
+
+namespace DevComponents.AdvTree
+{
+    /// <summary>Represents the node or tree ColumnHeader.</summary>
+    [ToolboxItem(false), Designer("DevComponents.AdvTree.Design.ColumnHeaderDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+    public class ColumnHeader : Component
+    {
+        #region Private Variables
+        private string m_Text = "";
+        private ColumnWidth m_Width = null;
+        private bool m_Sortable = true;
+        private eStyleTextAlignment m_TextAlign = eStyleTextAlignment.Near;
+        private string m_StyleNormal = "";
+        private string m_StyleMouseDown = "";
+        private string m_StyleMouseOver = "";
+        private string m_ColumnName = "";
+        private bool m_Visible = true;
+        private Rectangle m_Bounds = Rectangle.Empty;
+        private bool m_SizeChanged = true;
+        private string m_Name = "";
+        /// <summary>
+        /// Occurs when header size has changed due to the user resizing the column.
+        /// </summary>
+        public event EventHandler HeaderSizeChanged;
+        internal event SortCellsEventHandler SortCells;
+        #endregion
+
+        #region Events
+        /// <summary>
+        /// Occurs when mouse button is pressed over the column header.
+        /// </summary>
+        public event MouseEventHandler MouseDown;
+        /// <summary>
+        /// Occurs when mouse button is released over the column header.
+        /// </summary>
+        public event MouseEventHandler MouseUp;
+        /// <summary>
+        /// Occurs when header is double clicked.
+        /// </summary>
+        public event EventHandler DoubleClick;
+        /// <summary>
+        /// Occurs when header is clicked.
+        /// </summary>
+        public event EventHandler Click;
+        #endregion
+
+        #region Constructor
+        /// <summary>
+        /// Creates new instance of the object.
+        /// </summary>
+        public ColumnHeader()
+            : this("")
+        {
+
+        }
+
+        /// <summary>
+        /// Creates new instance of the object and initializes it with text.
+        /// </summary>
+        /// <param name="text">Text to initialize object with.</param>
+        public ColumnHeader(string text)
+        {
+            m_Text = text;
+            m_Width = new ColumnWidth();
+            m_Width.WidthChanged += new EventHandler(this.WidthChanged);
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            if (BarUtilities.DisposeItemImages)
+            {
+                BarUtilities.DisposeImage(ref _Image);
+            }
+            base.Dispose(disposing);
+        }
+        #endregion
+
+        #region Methods
+        /// <summary>
+        /// Makes a copy of ColumnHeader object.
+        /// </summary>
+        /// <returns>Returns new instance of column header object.</returns>
+        public virtual ColumnHeader Copy()
+        {
+            ColumnHeader c = new ColumnHeader();
+            c.ColumnName = this.ColumnName;
+            c.StyleMouseDown = this.StyleMouseDown;
+            c.StyleMouseOver = this.StyleMouseOver;
+            c.StyleNormal = this.StyleNormal;
+            c.Text = this.Text;
+            c.Visible = this.Visible;
+            c.Width.Absolute = this.Width.Absolute;
+            c.Width.Relative = this.Width.Relative;
+            c.Width.AutoSize = this.Width.AutoSize;
+            c.Width.AutoSizeMinHeader = this.Width.AutoSizeMinHeader;
+            c.DisplayIndex = this.DisplayIndex;
+            c.SortDirection = this.SortDirection;
+            c.SortingEnabled = this.SortingEnabled;
+            c.StretchToFill = this.StretchToFill;
+            c.Tag = this.Tag;
+            c.DataFieldName = this.DataFieldName;
+            c.DoubleClickAutoSize = this.DoubleClickAutoSize;
+            c.Editable = this.Editable;
+            c.EditorType = this.EditorType;
+            c.Image = this.Image;
+            c.ImageAlignment = this.ImageAlignment;
+            c.MaxInputLength = this.MaxInputLength;
+            c.MinimumWidth = this.MinimumWidth;
+            c.SortComparer = this.SortComparer;
+            c.SortComparerReverse = this.SortComparerReverse;
+
+            return c;
+        }
+        #endregion
+
+        #region Properties
+        private ColumnHeaderCollection _Parent;
+        internal ColumnHeaderCollection Parent
+        {
+            get { return _Parent; }
+            set { _Parent = value; }
+        }
+
+        private bool _Editable = true;
+        /// <summary>
+        /// Gets or sets whether cells content in this column is editable when cell editing is enabled on tree control. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether cells content in this column is editable when cell editing is enabled on tree control.")]
+        public bool Editable
+        {
+            get { return _Editable; }
+            set
+            {
+                _Editable = value;
+            }
+        }
+
+        private int _MaxInputLength = 0;
+        /// <summary>
+        /// Gets or sets the maximum number of characters the user can type or paste when editing cells in this column.
+        /// </summary>
+        [DefaultValue(0), Category("Behavior"), Description("Indicates maximum number of characters the user can type or paste when editing cells in this column.")]
+        public int MaxInputLength
+        {
+            get { return _MaxInputLength; }
+            set
+            {
+                _MaxInputLength = value;
+            }
+        }
+
+        /// <summary>
+        /// Returns name of the column header that can be used to identify it from the code.
+        /// </summary>
+        [Browsable(false), Category("Design"), Description("Indicates the name used to identify column header.")]
+        public string Name
+        {
+            get
+            {
+                if (this.Site != null)
+                    m_Name = this.Site.Name;
+                return m_Name;
+            }
+            set
+            {
+                if (this.Site != null)
+                    this.Site.Name = value;
+                if (value == null)
+                    m_Name = "";
+                else
+                    m_Name = value;
+            }
+        }
+        /// <summary>
+        /// Returns rectangle that this column occupies. If the layout has not been performed on the column the return value will be Rectangle.Empty.
+        /// </summary>
+        [Browsable(false)]
+        public Rectangle Bounds
+        {
+            get { return m_Bounds; }
+        }
+        /// <summary>
+        /// Sets the column bounds.
+        /// </summary>
+        internal void SetBounds(Rectangle bounds)
+        {
+            m_Bounds = bounds;
+        }
+
+        /// <summary>
+        /// Gets the reference to the object that represents width of the column as either
+        /// absolute or relative value.
+        /// </summary>
+        /// <remarks>
+        /// Set Width using Absolute or Relative properties of ColumnWidth object.
+        /// </remarks>
+        /// <seealso cref="ColumnWidth.Absolute">Absolute Property (DevComponents.AdvTree.ColumnWidth)</seealso>
+        /// <seealso cref="ColumnWidth.Relative">Relative Property (DevComponents.AdvTree.ColumnWidth)</seealso>
+        [Browsable(true), Category("Layout"), Description("Gets or sets the width of the column."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ColumnWidth Width
+        {
+            // TODO: Add Proper TypeConverter for ColumnWidth object and test design-time support
+            get { return m_Width; }
+        }
+
+        private int _MinimumWidth = 0;
+        /// <summary>
+        /// Gets or sets the minimum column width in pixels that is enforced when user is resizing the columns using mouse. 
+        /// Default value is 0 which indicates that there is no minimum size constraint.
+        /// </summary>
+        [DefaultValue(0), Category("Layout"), Description("Indicates minimum column width in pixels that is enforced when user is resizing the columns using mouse")]
+        public int MinimumWidth
+        {
+            get { return _MinimumWidth; }
+            set
+            {
+                if (value < 0) value = 0;
+                _MinimumWidth = value;
+            }
+        }
+
+        private bool _StretchToFill = false;
+        /// <summary>
+        /// Gets or sets whether column is stretched to fill any empty space horizontally in tree when all columns consume less width than available.
+        /// Only one column in tree may have this property set to true and only last column with this property set will be stretched.
+        /// You should always set the Width for the column since Width will be used when columns consume more space in tree horizontally than available.
+        /// Applies to top-level columns only.
+        /// </summary>
+        [DefaultValue(false), Category("Layout"), Description("Indicates whether column is stretched to fill any empty space horizontally in tree when all columns consume less width than available. Only one column in tree may have this property set to true and only last column with this property set will be stretched. You should always set the Width for the column since Width will be used when columns consume more space in tree horizontally than available. Applies to top-level columns only.")]
+        public bool StretchToFill
+        {
+            get { return _StretchToFill; }
+            set 
+            {
+                if (_StretchToFill != value)
+                {
+                    _StretchToFill = value;
+                    OnSizeChanged();
+                }
+            }
+        }
+
+
+        /// <summary>
+        /// Gets or sets the style class assigned to the column. Empty value indicates that
+        /// default style is used as specified on cell's parent's control.
+        /// </summary>
+        /// <value>
+        /// Name of the style assigned to the cell or an empty string indicating that default
+        /// style setting from tree control is applied. Default is empty string.
+        /// </value>
+        /// <remarks>
+        /// When property is set to an empty string the style setting from parent tree
+        /// controls is used. ColumnStyleNormal on AdvTree control is a root style for a cell.
+        /// </remarks>
+        /// <seealso cref="StyleMouseDown">StyleMouseDown Property</seealso>
+        /// <seealso cref="StyleMouseOver">StyleMouseOver Property</seealso>
+        [Browsable(true), DefaultValue(""), Category("Style"), Description("Indicates the style class assigned to the column.")]
+        public string StyleNormal
+        {
+            get { return m_StyleNormal; }
+            set
+            {
+                if (value == null) value = "";
+                m_StyleNormal = value;
+                this.OnSizeChanged();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the style class assigned to the column which is applied when mouse
+        /// button is pressed over the header. Empty value indicates that default
+        /// style is used as specified on column's parent.
+        /// </summary>
+        /// <value>
+        /// Name of the style assigned to the column or an empty string indicating that default
+        /// style setting from tree control is applied. Default is empty string.
+        /// </value>
+        /// <remarks>
+        /// When property is set to an empty string the style setting from parent tree
+        /// controls is used. ColumnStyleMouseDown on AdvTree control is a root style for a
+        /// cell.
+        /// </remarks>
+        /// <seealso cref="StyleNormal">StyleNormal Property</seealso>
+        /// <seealso cref="StyleMouseOver">StyleMouseOver Property</seealso>
+        [Browsable(true), DefaultValue(""), Category("Style"), Description("Indicates the style class assigned to the column when mouse is down.")]
+        public string StyleMouseDown
+        {
+            get { return m_StyleMouseDown; }
+            set
+            {
+                if (value == null) value = "";
+                m_StyleMouseDown = value;
+                this.OnSizeChanged();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the style class assigned to the column which is applied when mouse is
+        /// over the column. Empty value indicates that default style is used as specified on column's
+        /// parent control.
+        /// </summary>
+        /// <value>
+        /// Name of the style assigned to the column or an empty string indicating that default
+        /// style setting from tree control is applied. Default is empty string.
+        /// </value>
+        /// <remarks>
+        /// When property is set to an empty string the style setting from parent tree
+        /// controls is used. ColumnStyleMouseOver on AdvTree control is a root style for a
+        /// cell.
+        /// </remarks>
+        /// <seealso cref="StyleNormal">StyleNormal Property</seealso>
+        /// <seealso cref="StyleMouseDown">StyleMouseDown Property</seealso>
+        [Browsable(true), DefaultValue(""), Category("Style"), Description("Indicates the style class assigned to the cell when mouse is over the column.")]
+        public string StyleMouseOver
+        {
+            get { return m_StyleMouseOver; }
+            set
+            {
+                if (value == null) value = "";
+                m_StyleMouseOver = value;
+                this.OnSizeChanged();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the name of the column in the ColumnHeaderCollection.
+        /// </summary>
+        [Browsable(true), DefaultValue(""), Category("Data"), Description("Indicates the name of the column in the ColumnHeaderCollection.")]
+        public string ColumnName
+        {
+            get { return m_ColumnName; }
+            set
+            {
+                m_ColumnName = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the column caption.
+        /// </summary>
+        [Browsable(true), DefaultValue(""), Category("Appearance"), Description("Indicates column caption."), Localizable(true)]
+        public string Text
+        {
+            get { return m_Text; }
+            set
+            {
+                m_Text = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether column is visible. Hiding the header column will also hide corresponding data column.
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Behavior"), Description("Indicates whether column is visible.")]
+        public bool Visible
+        {
+            get { return m_Visible; }
+            set
+            {
+                if (m_Visible != value)
+                {
+                    m_Visible = value;
+                    OnSizeChanged();
+                }
+            }
+        }
+
+        private Image _Image = null;
+        /// <summary>
+        /// Gets or sets column image.
+        /// </summary>
+        /// <remarks>
+        /// 	<para>The image set through this property will be serialized with the column.
+        /// 	<para>
+        /// 		<para>If you plan to use alpha-blended images we recommend using PNG-24 format
+        ///         which supports alpha-blending. As of this writing .NET Framework 1.0 and 1.1
+        ///         do not support alpha-blending when used through Image class.</para>
+        /// 	</para>
+        /// </remarks>
+        /// <value>Image object or <strong>null (Nothing)</strong> if no image is assigned.</value>
+        [Browsable(true), DefaultValue(null), Category("Images"), Description("Indicates column image"), DevCoSerialize()]
+        public System.Drawing.Image Image
+        {
+            get { return _Image; }
+            set
+            {
+                _Image = value;
+                this.OnImageChanged();
+            }
+        }
+
+        private void OnImageChanged()
+        {
+            OnSizeChanged();
+        }
+        /// <summary>
+        /// Resets Image property to it's default value (null, VB nothing).
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetImage()
+        {
+            TypeDescriptor.GetProperties(this)["Image"].SetValue(this, null);
+        }
+
+        private eColumnImageAlignment _ImageAlignment = eColumnImageAlignment.Left;
+        /// <summary>
+        /// Gets or sets Image alignment inside of column. Default value is Left.
+        /// </summary>
+        [DefaultValue(eColumnImageAlignment.Left), Category("Images"), Description("Indicates image alignment."), DevCoSerialize()]
+        public eColumnImageAlignment ImageAlignment
+        {
+            get { return _ImageAlignment; }
+            set { _ImageAlignment = value; OnSizeChanged(); }
+        }
+
+        private string _DataFieldName = "";
+        /// <summary>
+        /// Gets or sets the data-field or property name that is used as source of data for this column when data-binding is used.
+        /// </summary>
+        [DefaultValue(""), Category("Data"), Description("Indicates data-field or property name that is used as source of data for this column when data-binding is used.")]
+        public string DataFieldName
+        {
+            get { return _DataFieldName; }
+            set
+            {
+                if (value == null) value = "";
+                if (_DataFieldName != value)
+                {
+                    _DataFieldName = value;
+                    OnDataFieldNameChanged();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Called when DataFieldName property has changed.
+        /// </summary>
+        protected virtual void OnDataFieldNameChanged()
+        {
+
+        }
+
+        private object _Tag = null;
+        /// <summary>
+        /// Gets or sets additional custom data associated with the column.
+        /// </summary>
+        [Browsable(false), DefaultValue(null)]
+        public object Tag
+        {
+            get { return _Tag; }
+            set { _Tag = value; }
+        }
+
+        private Color _CellsBackColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets the color of the cells background for this column.
+        /// </summary>
+        [Category("Columns"), Description("Indicates color of cells background for this column.")]
+        public Color CellsBackColor
+        {
+            get { return _CellsBackColor; }
+            set
+            {
+                if (_CellsBackColor != value)
+                {
+                    _CellsBackColor = value;
+                    if (_Parent != null && _Parent.Parent != null)
+                        _Parent.Parent.Invalidate();
+                }
+            }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeCellsBackColor()
+        {
+            return !_CellsBackColor.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetCellsBackColor()
+        {
+            this.CellsBackColor = Color.Empty;
+        }
+
+        private int _DisplayIndex = -1;
+        /// <summary>
+        /// Gets or sets display index of the column. -1 indicates default value and is modified to actual display index when the column is added to a ColumnHeaderCollection.
+        /// </summary>
+        /// <remarks>
+        ///     A lower display index means a column will appear first (to the left) of columns with a higher display index. 
+        ///     Allowable values are from 0 to num columns - 1. (-1 is legal only as the default value and is modified to something else
+        ///     when the column is added to a AdvTree's column collection). AdvTree enforces that no two columns have the same display index;
+        ///     changing the display index of a column will cause the index of other columns to adjust as well.
+        /// </remarks>
+        [DefaultValue(-1), Category("Appearance"), Description("Indicates display index of the column. -1 indicates default value and is modified to actual display index when the column is added to a ColumnHeaderCollection.")]
+        public int DisplayIndex
+        {
+            get { return _DisplayIndex; }
+            set
+            {
+                if (value != _DisplayIndex)
+                {
+                    int oldValue = _DisplayIndex;
+                    _DisplayIndex = value;
+                    OnDisplayIndexChanged(oldValue, value);
+                }
+            }
+        }
+
+        private void OnDisplayIndexChanged(int oldValue, int newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("DisplayIndex"));
+            if (_Parent != null) _Parent.DisplayIndexChanged(this, newValue, oldValue);
+        }
+
+        private bool _SortingEnabled = true;
+        /// <summary>
+        /// Gets or sets whether user can sort by this column by clicking it.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether user can sort by this column by clicking it.")]
+        public bool SortingEnabled
+        {
+            get { return _SortingEnabled; }
+            set
+            {
+                if (value != _SortingEnabled)
+                {
+                    bool oldValue = _SortingEnabled;
+                    _SortingEnabled = value;
+                    OnSortingEnabledChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when SortingEnabled property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnSortingEnabledChanged(bool oldValue, bool newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("SortingEnabled"));
+        }
+
+        private eSortDirection _SortDirection = eSortDirection.None;
+        /// <summary>
+        /// Gets or sets the sort direction. Sort direction can be changed by clicking the column header if SortingEnabled=true.
+        /// </summary>
+        [DefaultValue(eSortDirection.None), Category("Behavior"), Description("Indicates sort direction. Sort direction can be changed by clicking the column header if SortingEnabled=true.")]
+        public eSortDirection SortDirection
+        {
+            get { return _SortDirection; }
+            set
+            {
+                if (value != _SortDirection)
+                {
+                    eSortDirection oldValue = _SortDirection;
+                    _SortDirection = value;
+                    OnSortDirectionChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when SortDirection property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnSortDirectionChanged(eSortDirection oldValue, eSortDirection newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("SortDirection"));
+            this.Invalidate();
+            if (_SortingEnabled)
+            {
+                if (_Parent != null) _Parent.SortDirectionUpdated(this);
+                if (newValue == eSortDirection.Ascending)
+                    this.Sort(false);
+                else if (newValue == eSortDirection.Descending)
+                    this.Sort(true);
+            }
+        }
+        /// <summary>
+        /// Invalidates the appearance of column header.
+        /// </summary>
+        private void Invalidate()
+        {
+            if (_Parent == null) return;
+            if (_Parent.Parent != null)
+            {
+                if (_Parent.Parent.ColumnHeaderControl != null)
+                {
+                    Rectangle r = this.Bounds;
+                    if (!this.IsFirstVisible)
+                    {
+                        int spacing = _Parent.Parent.CellHorizontalSpacing;
+                        r.Width += spacing;
+                        r.X -= spacing;
+                    }
+                    _Parent.Parent.ColumnHeaderControl.Invalidate(r);
+                }
+            }
+            else if (_Parent.ParentNode != null)
+                _Parent.ParentNode.Invalidate();
+        }
+        #endregion
+
+        #region Internal Implementation
+        /// <summary>
+        /// Occurs after Tooltip text has changed.
+        /// </summary>
+        protected virtual void OnTooltipChanged() { }
+        private string _Tooltip = "";
+        /// <summary>
+        /// Gets/Sets informational text (tooltip) for the cell.
+        /// </summary>
+        [Browsable(true), DefaultValue(""), Category("Appearance"), Description("Indicates the text that is displayed when mouse hovers over the cell."), Localizable(true)]
+        public string Tooltip
+        {
+            get
+            {
+
+                return _Tooltip;
+            }
+            set
+            {
+                if (_Tooltip == value)
+                    return;
+                if (value == null) value = "";
+                _Tooltip = value;
+
+                if (this.ToolTipVisible)
+                {
+                    if (string.IsNullOrEmpty(_Tooltip))
+                        this.HideToolTip();
+                    else
+                    {
+                        DevComponents.DotNetBar.ToolTip tooltipWindow = _ToolTipWnd;
+                        tooltipWindow.Text = _Tooltip;
+                        tooltipWindow.ShowToolTip();
+                        tooltipWindow.Invalidate();
+                    }
+                }
+                OnTooltipChanged();
+            }
+        }
+        /// <summary>
+        /// Gets whether tooltip is visible or not.
+        /// </summary>
+        internal protected bool ToolTipVisible
+        {
+            get
+            {
+                return (_ToolTipWnd != null);
+            }
+        }
+        /// <summary>
+        /// Called when tooltip is shown and hidden.
+        /// </summary>
+        /// <param name="isShown">true if tooltip is being shown otherwise false.</param>
+        protected virtual void OnTooltip(bool isShown)
+        {
+        }
+        private DevComponents.DotNetBar.ToolTip _ToolTipWnd = null;
+        /// <summary>
+        /// Shows tooltip for this item.
+        /// </summary>
+        public virtual void ShowToolTip()
+        {
+            if (this.DesignMode)
+                return;
+
+            if (Visible)
+            {
+                AdvTree tree = this.AdvTree;
+                if (tree != null && !tree.ShowToolTips || !this.ShowToolTips)
+                    return;
+                OnTooltip(true);
+                if (_Tooltip != "")
+                {
+                    if (_ToolTipWnd == null)
+                        _ToolTipWnd = new DevComponents.DotNetBar.ToolTip();
+                    _ToolTipWnd.Style = StyleManager.GetEffectiveStyle();
+                    _ToolTipWnd.Text = _Tooltip;
+                    _ToolTipWnd.ReferenceRectangle = ScreenRectangle;
+
+                    OnToolTipVisibleChanged(new EventArgs());
+                    _ToolTipWnd.ShowToolTip();
+                }
+            }
+        }
+        /// <summary>
+        /// Destroys tooltip window.
+        /// </summary>
+        internal protected void HideToolTip()
+        {
+            if (_ToolTipWnd != null)
+            {
+                System.Drawing.Rectangle tipRect = _ToolTipWnd.Bounds;
+                tipRect.Width += 5;
+                tipRect.Height += 6;
+
+                OnTooltip(false);
+                OnToolTipVisibleChanged(new EventArgs());
+                try
+                {
+                    if (_ToolTipWnd != null)
+                    {
+                        _ToolTipWnd.Hide();
+                        _ToolTipWnd.Dispose();
+                        _ToolTipWnd = null;
+                    }
+                }
+                catch { }
+                AdvTree tree = this.AdvTree;
+                if (tree != null)
+                {
+                    tree.Invalidate(tree.RectangleToClient(tipRect), false);
+                }
+            }
+        }
+        /// <summary>
+        /// Occurs when item's tooltip visibility has changed.
+        /// </summary>
+        [System.ComponentModel.Description("Occurs when item's tooltip visibility has changed.")]
+        public event EventHandler ToolTipVisibleChanged;
+        private void OnToolTipVisibleChanged(EventArgs eventArgs)
+        {
+            EventHandler h = ToolTipVisibleChanged;
+            if (h != null)
+                ToolTipVisibleChanged(this, eventArgs);
+        }
+        private Rectangle ScreenRectangle
+        {
+            get
+            {
+                AdvTree tree = this.AdvTree;
+                if (tree == null) return Rectangle.Empty;
+                return new Rectangle(tree.PointToScreen(this.Bounds.Location), this.Bounds.Size);
+            }
+        }
+
+        private bool _ShowToolTips = true;
+        /// <summary>
+        /// Gets or sets whether tooltips are shown when mouse is over the cell when Tooltip property is set.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether tooltips are shown when mouse is over the cell when Tooltip property is set.")]
+        public bool ShowToolTips
+        {
+            get { return _ShowToolTips; }
+            set
+            {
+                _ShowToolTips = value;
+            }
+        }
+
+        /// <summary>
+        /// Automatically sets the column width (Width.Absolute) property based on the content of the column.
+        /// This will perform the one-time auto sizing of the column. To make column auto-size all the time
+        /// set Width.AutoSize=true.
+        /// </summary>
+        public void AutoSize()
+        {
+            if (_Parent == null)
+                throw new InvalidOperationException("ColumnHeader is not parented.");
+            AdvTree tree = AdvTree;
+            if (tree == null)
+                throw new InvalidOperationException("Cannot obtain reference to parent tree control, column might not be parented.");
+            this.Width.AutoSize = true;
+            tree.RecalcLayout();
+            tree.Invalidate();
+            this.Width.SetAutoSize(false);
+            this.Width.SetAbsolute(this.Width.AutoSizeWidth);
+            OnHeaderSizeChanged(EventArgs.Empty);
+        }
+        private void OnHeaderSizeChanged(EventArgs e)
+        {
+            EventHandler h = HeaderSizeChanged;
+            if (h != null)
+                h(this, e);
+        }
+        /// <summary>
+        /// Returns reference to AdvTree control this column belongs to.
+        /// </summary>
+        [Browsable(false)]
+        public AdvTree AdvTree
+        {
+            get
+            {
+                if (_Parent == null) return null;
+                return _Parent.ParentNode == null ? _Parent.Parent : _Parent.ParentNode.TreeControl;
+            }
+        }
+
+        private bool _DoubleClickAutoSize = true;
+        /// <summary>
+        /// Gets or sets whether column is automatically sized to the content when user double-clicks the column 
+        /// on the column resize line. Column resizing must be enabled in order for this property to function.
+        /// Default value is true which indicates that column will be auto-sized to content when user double-clicks the
+        /// column resize marker.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether column is automatically sized to content when user double-clicks the column resize marker.")]
+        public bool DoubleClickAutoSize
+        {
+            get { return _DoubleClickAutoSize; }
+            set
+            {
+                _DoubleClickAutoSize = value;
+            }
+        }
+
+
+        /// <summary>
+        /// Gets or sets whether column size has changed and it's layout needs to be recalculated.
+        /// </summary>
+        internal bool SizeChanged
+        {
+            get { return m_SizeChanged; }
+            set { m_SizeChanged = value; }
+        }
+
+        private void OnSizeChanged()
+        {
+            m_SizeChanged = true;
+            OnHeaderSizeChanged(EventArgs.Empty);
+        }
+
+        private void WidthChanged(object sender, EventArgs e)
+        {
+            this.OnSizeChanged();
+        }
+
+        private bool _IsMouseDown = false;
+        /// <summary>
+        /// Gets whether mouse left button is pressed on the column.
+        /// </summary>
+        [Browsable(false)]
+        public bool IsMouseDown
+        {
+            get { return _IsMouseDown; }
+#if FRAMEWORK20
+            internal set
+#else
+			set
+#endif
+
+            {
+                if (_IsMouseDown != value)
+                {
+                    _IsMouseDown = value;
+                    OnIsMouseDownChanged();
+                }
+            }
+        }
+
+        private void OnIsMouseDownChanged()
+        {
+            if (_Parent != null && _Parent.ParentNode != null)
+            {
+                AdvTree tree = _Parent.ParentNode.TreeControl;
+                if (tree != null) tree.Invalidate(this.Bounds);
+            }
+        }
+
+        private bool _IsMouseOver = false;
+        /// <summary>
+        /// Gets whether mouse is over the column.
+        /// </summary>
+        [Browsable(false)]
+        public bool IsMouseOver
+        {
+            get { return _IsMouseOver; }
+#if FRAMEWORK20
+            internal set
+#else
+			set
+#endif
+            {
+                _IsMouseOver = value;
+                this.Invalidate();
+            }
+        }
+
+        internal bool IsLastVisible = false;
+        internal bool IsFirstVisible = false;
+        /// <summary>
+        /// Occurs when mouse is moving over the column header.
+        /// </summary>
+        [Description("Occurs when mouse is moving over the column header")]
+        public event MouseEventHandler MouseMove;
+        /// <summary>
+        /// Raises MouseMove event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnMouseMove(MouseEventArgs e)
+        {
+            MouseEventHandler handler = MouseMove;
+            if (handler != null)
+                handler(this, e);
+        }
+        internal void InternalMouseMove(MouseEventArgs e) 
+        {
+            OnMouseMove(e);
+        }
+        /// <summary>
+        /// Occurs when mouse enters column header.
+        /// </summary>
+        [Description("Occurs when mouse enters column header.")]
+        public event EventHandler MouseEnter;
+        /// <summary>
+        /// Raises MouseEnter event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnMouseEnter(EventArgs e)
+        {
+            EventHandler handler = MouseEnter;
+            if (handler != null)
+                handler(this, e);
+        }
+        internal void InternalMouseEnter(EventArgs e)
+        {
+            this.IsMouseOver = true;
+            OnMouseEnter(e);
+        }
+        /// <summary>
+        /// Occurs when mouse leaves the column header.
+        /// </summary>
+        [Description("Occurs when mouse leaves the column header.")]
+        public event EventHandler MouseLeave;
+        /// <summary>
+        /// Raises MouseLeave event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnMouseLeave(EventArgs e)
+        {
+            EventHandler handler = MouseLeave;
+            if (handler != null)
+                handler(this, e);
+        }
+        internal void InternalMouseLeave(EventArgs e)
+        {
+            HideToolTip();
+            this.IsMouseOver = false;
+            OnMouseLeave(e);
+        }
+        /// <summary>
+        /// Occurs when mouse hovers over the column.
+        /// </summary>
+        [Description("Occurs when mouse hovers over the column.")]
+        public event EventHandler MouseHover;
+        /// <summary>
+        /// Raises MouseHover event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnMouseHover(EventArgs e)
+        {
+            EventHandler handler = MouseHover;
+            if (handler != null)
+                handler(this, e);
+        }
+        internal void InternalMouseHover(EventArgs e)
+        {
+            ShowToolTip();
+            OnMouseHover(e);
+        }
+
+        internal virtual void OnMouseDown(System.Windows.Forms.MouseEventArgs e)
+        {
+            HideToolTip();
+            if (e.Button == MouseButtons.Left) IsMouseDown = true;
+
+            MouseEventHandler eh = this.MouseDown;
+            if (eh != null)
+                eh(this, e);
+        }
+
+        internal virtual void OnMouseUp(System.Windows.Forms.MouseEventArgs e)
+        {
+            bool wasMouseDown = IsMouseDown;
+            if (e.Button == MouseButtons.Left) IsMouseDown = false;
+
+            if (_SortingEnabled && wasMouseDown)
+            {
+                if (e.Button == MouseButtons.Middle && _SortDirection != eSortDirection.None)
+                    SortDirection = eSortDirection.None;
+                else if (e.Button == MouseButtons.Left)
+                {
+                    if (_SortDirection == eSortDirection.None || _SortDirection == eSortDirection.Descending)
+                        SortDirection = eSortDirection.Ascending;
+                    else
+                        SortDirection = eSortDirection.Descending;
+                }
+            }
+
+            MouseEventHandler eh = this.MouseUp;
+            if (eh != null)
+                eh(this, e);
+        }
+
+        internal virtual void OnDoubleClick(EventArgs e)
+        {
+            EventHandler handler = DoubleClick;
+            if (handler != null) handler(this, e);
+        }
+
+        internal virtual void OnClick(EventArgs e)
+        {
+            EventHandler handler = Click;
+            if (handler != null) handler(this, e);
+        }
+
+        private eCellEditorType _EditorType = eCellEditorType.Default;
+        /// <summary>
+        /// Gets or sets the editor type used to edit the cell. Setting this property to value other than Default
+        /// overrides the cell editor type specified on column cell belongs to.
+        /// </summary>
+        [DefaultValue(eCellEditorType.Default), Category("Behavior"), Description("Indicates editor type used to edit the cell.")]
+        public eCellEditorType EditorType
+        {
+            get { return _EditorType; }
+            set { _EditorType = value; }
+        }
+
+        private bool _LastSortReverse = false;
+        /// <summary>
+        /// Sort first level nodes that belong directly to this column. Calling this method repeatedly will
+        /// alternate between A-Z and Z-A sorting.
+        /// </summary>
+        public void Sort()
+        {
+            Sort(_LastSortReverse);
+            _LastSortReverse = !_LastSortReverse;
+        }
+
+        /// <summary>
+        /// Sort first level nodes that belong directly to this column.
+        /// </summary>
+        /// <param name="reverse">true to use reverse Z-A sorting, false to sort from A-Z</param>
+        public void Sort(bool reverse)
+        {
+            if (SortCells != null)
+                SortCells(this, new SortEventArgs(reverse, this));
+        }
+
+        private IComparer _SortComparer = null;
+        /// <summary>
+        /// Gets or sets ascending (A-Z) column comparer used to sort nodes when this column is clicked. Your comparer will be passed to NodeCollection.Sort method and should know how to sort by appropriate column.
+        /// </summary>
+        [Browsable(false), DefaultValue(null), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public IComparer SortComparer
+        {
+            get { return _SortComparer; }
+            set
+            {
+                if (value != _SortComparer)
+                {
+                    IComparer oldValue = _SortComparer;
+                    _SortComparer = value;
+                    OnSortComparerChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when SortComparer property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnSortComparerChanged(IComparer oldValue, IComparer newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("SortComparer"));
+        }
+
+        private IComparer _SortComparerReverse = null;
+        /// <summary>
+        /// Gets or sets descending (Z-A) column comparer used to sort nodes when this column is clicked. Your comparer will be passed to NodeCollection.Sort method and should know how to sort by appropriate column.
+        /// </summary>
+        [Browsable(false), DefaultValue(null), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public IComparer SortComparerReverse
+        {
+            get { return _SortComparerReverse; }
+            set
+            {
+                if (value != _SortComparerReverse)
+                {
+                    IComparer oldValue = _SortComparerReverse;
+                    _SortComparerReverse = value;
+                    OnSortComparerReverseChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when SortComparerReverse property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnSortComparerReverseChanged(IComparer oldValue, IComparer newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("SortComparerReverse"));
+        }
+        #endregion
+
+    }
+
+    public delegate void SortCellsEventHandler(object sender, SortEventArgs e);
+    public class SortEventArgs : EventArgs
+    {
+        public bool ReverseSort = false;
+        /// <summary>
+        /// Gets or sets whether to cancel internal sorting performed by AdvTree.
+        /// </summary>
+        public bool Cancel = false;
+        /// <summary>
+        /// Gets or sets the column header being sorted.
+        /// </summary>
+        public ColumnHeader ColumnHeader = null;
+        /// <summary>
+        /// Gets or sets the IComparer used for sorting.
+        /// </summary>
+        public IComparer Comparer = null;
+        public SortEventArgs(bool reverse, ColumnHeader columnHeader)
+        {
+            ReverseSort = reverse;
+            ColumnHeader = columnHeader;
+        }
+    }
+    /// <summary>
+    /// Defines column related event arguments.
+    /// </summary>
+    public class ColumnEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets reference to the column.
+        /// </summary>
+        public readonly ColumnHeader Column;
+        /// <summary>
+        /// Initializes a new instance of the ColumnEventArgs class.
+        /// </summary>
+        /// <param name="column"></param>
+        public ColumnEventArgs(ColumnHeader column)
+        {
+            Column = column;
+        }
+    }
+
+    /// <summary>
+    /// Defines delegate for ColumnMoved event.
+    /// </summary>
+    public delegate void ColumnMovedHandler(object sender, ColumnMovedEventArgs ea);
+    /// <summary>
+    /// Defines column moved event arguments.
+    /// </summary>
+    public class ColumnMovedEventArgs : ColumnEventArgs
+    {
+        /// <summary>
+        /// Gets the column display index before the column was moved.
+        /// </summary>
+        public readonly int OldColumnDisplayIndex;
+        /// <summary>
+        /// Gets the column display index before the column was moved.
+        /// </summary>
+        public readonly int NewColumnDisplayIndex;
+        /// <summary>
+        /// Initializes a new instance of the ColumnMovedEventArgs class.
+        /// </summary>
+        /// <param name="column">Column affected</param>
+        /// <param name="oldColumnDisplayIndex">Old display index</param>
+        /// <param name="newColumnDisplayIndex">New display index</param>
+        public ColumnMovedEventArgs(ColumnHeader column, int oldColumnDisplayIndex, int newColumnDisplayIndex)
+            : base(column)
+        {
+            OldColumnDisplayIndex = oldColumnDisplayIndex;
+            NewColumnDisplayIndex = newColumnDisplayIndex;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/ColumnHeaderCollection.cs b/PROMS/DotNetBar Source Code/AdvTree/ColumnHeaderCollection.cs
new file mode 100644
index 00000000..7d57b7c2
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/ColumnHeaderCollection.cs	
@@ -0,0 +1,583 @@
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.Drawing;
+using System.Collections.Generic;
+using System.Windows.Forms;
+
+namespace DevComponents.AdvTree
+{
+    /// <summary>
+    /// Represents collection for ColumnHeader objects.
+    /// </summary>
+    public class ColumnHeaderCollection : CollectionBase
+    {
+        #region Private Variables
+        private Node _ParentNode = null;
+        private AdvTree _Parent = null;
+        #endregion
+
+        #region Internal Implementation
+        /// <summary>
+        /// Default constructor.
+        /// </summary>
+        public ColumnHeaderCollection()
+        {
+        }
+        /// <summary>
+        /// Gets or sets the node this collection is associated with.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public Node ParentNode
+        {
+            get { return _ParentNode; }
+        }
+        /// <summary>
+        /// Sets the node collection belongs to.
+        /// </summary>
+        /// <param name="parent">ColumnHeader that is parent of this collection.</param>
+        internal void SetParentNode(Node parent)
+        {
+            _ParentNode = parent;
+        }
+
+        internal AdvTree Parent
+        {
+            get { return _Parent; }
+            set { _Parent = value; }
+        }
+
+        /// <summary>
+        /// Adds new object to the collection.
+        /// </summary>
+        /// <param name="ch">Object to add.</param>
+        /// <returns>Index of newly added object.</returns>
+        public int Add(ColumnHeader ch)
+        {
+            return List.Add(ch);
+        }
+        /// <summary>
+        /// Returns reference to the object in collection based on it's index.
+        /// </summary>
+        public ColumnHeader this[int index]
+        {
+            get { return (ColumnHeader)(List[index]); }
+            set { List[index] = value; }
+        }
+
+        /// <summary>
+        /// Returns reference to the object in collection based on it's name.
+        /// </summary>
+        public ColumnHeader this[string name]
+        {
+            get 
+            {
+                int index = IndexOf(name);
+                if (index == -1) return null;
+                return this[index];
+            }
+            set { this[IndexOf(name)] = value; }
+        }
+
+        /// <summary>
+        /// Inserts new object into the collection.
+        /// </summary>
+        /// <param name="index">Position of the object.</param>
+        /// <param name="value">Object to insert.</param>
+        public void Insert(int index, ColumnHeader value)
+        {
+            List.Insert(index, value);
+        }
+
+        /// <summary>
+        /// Returns index of the object inside of the collection.
+        /// </summary>
+        /// <param name="value">Reference to the object.</param>
+        /// <returns>Index of the object.</returns>
+        public int IndexOf(ColumnHeader value)
+        {
+            return List.IndexOf(value);
+        }
+
+        /// <summary>
+        /// Returns index of the object inside of the collection.
+        /// </summary>
+        /// <param name="name">Name of column to return index for.</param>
+        /// <returns>Index of the column or -1 if column not found.</returns>
+        public int IndexOf(string name)
+        {
+            for (int i = 0; i < this.List.Count; i++)
+            {
+                if (this[i].Name == name) return i;
+            }
+            return -1;
+        }
+
+        /// <summary>
+        /// Returns index of the object inside of the collection based on column DataFieldName.
+        /// </summary>
+        /// <param name="dataFieldName">DataFieldName of column to return index for.</param>
+        /// <returns>Index of the column or -1 if column not found.</returns>
+        public int IndexOfDataField(string dataFieldName)
+        {
+            dataFieldName = dataFieldName.ToLower();
+            for (int i = 0; i < this.List.Count; i++)
+            {
+                if (this[i].DataFieldName.ToLower() == dataFieldName) return i;
+            }
+            return -1;
+        }
+
+        /// <summary>
+        /// Returns index of the object inside of the collection based on column DataFieldName.
+        /// </summary>
+        /// <param name="fieldName">DataFieldName of column to return index for.</param>
+        /// <returns>Index of the column or -1 if column not found.</returns>
+        internal int IndexOfField(string fieldName)
+        {
+            fieldName = fieldName.ToLower();
+            for (int i = 0; i < this.List.Count; i++)
+            {
+                ColumnHeader header = this[i];
+                if (header.Tag is BindingMemberInfo && ((BindingMemberInfo)header.Tag).BindingField.ToLower() == fieldName)
+                    return i;
+                if (header.DataFieldName.ToLower() == fieldName) return i;
+                if (header.Name == fieldName) return i;
+            }
+            return -1;
+        }
+
+        /// <summary>
+        /// Returns whether collection contains specified object.
+        /// </summary>
+        /// <param name="value">Object to look for.</param>
+        /// <returns>true if object is part of the collection, otherwise false.</returns>
+        public bool Contains(ColumnHeader value)
+        {
+            return List.Contains(value);
+        }
+
+        protected override void OnSet(int index, object oldValue, object newValue)
+        {
+            if (oldValue is ColumnHeader)
+            {
+                ColumnHeader header = (ColumnHeader)oldValue;
+                if (header.SortDirection != eSortDirection.None) IsSorted = false;
+            }
+            if (newValue is ColumnHeader)
+            {
+                ColumnHeader header = (ColumnHeader)newValue;
+                if (header.SortDirection != eSortDirection.None) IsSorted = true;
+            }
+            base.OnSet(index, oldValue, newValue);
+        }
+
+        /// <summary>
+        /// Removes specified object from the collection.
+        /// </summary>
+        /// <param name="value"></param>
+        public void Remove(ColumnHeader value)
+        {
+            List.Remove(value);
+        }
+
+        protected override void OnRemoveComplete(int index, object value)
+        {
+            if (value is ColumnHeader)
+            {
+                ColumnHeader header = (ColumnHeader)value;
+                if (header.SortDirection != eSortDirection.None) IsSorted = false;
+                header.HeaderSizeChanged -= new EventHandler(this.HeaderSizeChanged);
+                header.SortCells -= new SortCellsEventHandler(SortCellsHandler);
+                header.MouseDown -= new System.Windows.Forms.MouseEventHandler(ColumnMouseDown);
+                header.MouseUp -= new System.Windows.Forms.MouseEventHandler(ColumnMouseUp);
+                header.Parent = null;
+            }
+            InvalidateDisplayIndexes();
+            UpdateTreeLayout();
+            base.OnRemoveComplete(index, value);
+        }
+        protected override void OnInsertComplete(int index, object value)
+        {
+            if (value is ColumnHeader)
+            {
+                ((ColumnHeader)value).HeaderSizeChanged += new EventHandler(this.HeaderSizeChanged);
+                ((ColumnHeader)value).SortCells += new SortCellsEventHandler(SortCellsHandler);
+                ((ColumnHeader)value).MouseDown += new System.Windows.Forms.MouseEventHandler(ColumnMouseDown);
+                ((ColumnHeader)value).MouseUp += new System.Windows.Forms.MouseEventHandler(ColumnMouseUp);
+                ((ColumnHeader)value).Parent = this;
+            }
+            InvalidateDisplayIndexes();
+            UpdateTreeLayout();
+            base.OnInsertComplete(index, value);
+        }
+
+        [System.Reflection.Obfuscation(Exclude = true)]
+        private void ColumnMouseUp(object sender, System.Windows.Forms.MouseEventArgs e)
+        {
+            AdvTree tree = GetTree();
+            if (tree != null)
+                tree.InvokeColumnHeaderMouseUp(sender, e);
+        }
+        [System.Reflection.Obfuscation(Exclude = true)]
+        private void ColumnMouseDown(object sender, System.Windows.Forms.MouseEventArgs e)
+        {
+            AdvTree tree = GetTree();
+            if (tree != null)
+                tree.InvokeColumnHeaderMouseDown(sender, e);
+        }
+
+        private AdvTree GetTree()
+        {
+            AdvTree tree = _Parent;
+            if (tree == null && _ParentNode != null)
+                tree = _ParentNode.TreeControl;
+            return tree;
+        }
+
+        /// <summary>
+        /// Occurs before the cells are sorted.
+        /// </summary>
+        [Description("Occurs before the cells are sorted.")]
+        public event SortCellsEventHandler SortCells;
+        protected virtual void OnSortCells(SortEventArgs e)
+        {
+            if (SortCells != null)
+                SortCells(this, e);
+        }
+
+        private void SortCellsHandler(object sender, SortEventArgs e)
+        {
+            ColumnHeader ch = (ColumnHeader)sender;
+            int i = this.IndexOf(ch);
+
+            IComparer comparer = null;
+            if (e.ReverseSort)
+            {
+                if (ch.SortComparerReverse != null)
+                    comparer = ch.SortComparerReverse;
+                else
+                    comparer = new NodeComparerReverse(i);
+            }
+            else
+            {
+                if (ch.SortComparer != null)
+                    comparer = ch.SortComparer;
+                else
+                    comparer = new NodeComparer(i);
+            }
+
+            if (e.Comparer == null)
+                e.Comparer = comparer;
+            else
+                comparer = e.Comparer;
+            OnSortCells(e);
+            if (e.Cancel)
+                return;
+
+            if (_Parent != null)
+            {
+                _Parent.Nodes.Sort(comparer);
+            }
+            else if (_ParentNode != null)
+                _ParentNode.Nodes.Sort(comparer);
+        }
+        private bool _UpdatingSortDirection = false;
+        /// <summary>
+        /// Called when SortDirection property on column header is set to value other than None.
+        /// </summary>
+        /// <param name="header">Ref to column header</param>
+        internal void SortDirectionUpdated(ColumnHeader header)
+        {
+            if (_UpdatingSortDirection) return;
+
+            _UpdatingSortDirection = true;
+            try
+            {
+                if (header.SortDirection == eSortDirection.None)
+                {
+                    IsSorted = false;
+                    return;
+                }
+                
+                IsSorted = true;
+
+                foreach (ColumnHeader col in this.List)
+                {
+                    if (col != header && col.SortDirection != eSortDirection.None)
+                        col.SortDirection = eSortDirection.None;
+                }
+            }
+            finally
+            {
+                _UpdatingSortDirection = false;
+            }
+        }
+
+        private bool _IsSorted;
+        /// <summary>
+        /// Gets whether a column that is part of this collection has SortDirection set.
+        /// </summary>
+        public bool IsSorted
+        {
+            get { return _IsSorted; }
+            internal set { _IsSorted = value; }
+        }
+
+        internal void UpdateSort()
+        {
+            if (!_IsSorted) return;
+            foreach (ColumnHeader header in this.List)
+            {
+                if (header.SortDirection != eSortDirection.None)
+                {
+                    header.Sort(header.SortDirection == eSortDirection.Descending);
+                    break;
+                }
+            }
+        }
+
+        private void UpdateTreeLayout()
+        {
+            if (_Parent != null)
+            {
+                _Parent.InvalidateNodesSize();
+                _Parent.Invalidate();
+                if (_Parent.Nodes.Count == 0)
+                    _Parent.RecalcLayout();
+                else
+                    _Parent.SetPendingLayout();
+            }
+            else if (_ParentNode != null)
+            {
+                AdvTree tree = _ParentNode.TreeControl;
+                if (tree != null)
+                {
+                    tree.InvalidateNodeSize(_ParentNode);
+                    tree.Invalidate();
+                }
+            }
+        }
+
+        private void HeaderSizeChanged(object sender, EventArgs e)
+        {
+            UpdateTreeLayout();
+        }
+
+        /// <summary>
+        /// Copies collection into the specified array.
+        /// </summary>
+        /// <param name="array">Array to copy collection to.</param>
+        /// <param name="index">Starting index.</param>
+        public void CopyTo(ColumnHeader[] array, int index)
+        {
+            List.CopyTo(array, index);
+        }
+
+        /// <summary>
+        /// Copies contained items to the ColumnHeader array.
+        /// </summary>
+        /// <param name="array">Array to copy to.</param>
+        internal void CopyTo(ColumnHeader[] array)
+        {
+            List.CopyTo(array, 0);
+        }
+
+        protected override void OnClear()
+        {
+            foreach (ColumnHeader item in this)
+            {
+                item.HeaderSizeChanged -= new EventHandler(this.HeaderSizeChanged);
+                item.SortCells -= new SortCellsEventHandler(SortCellsHandler);
+                item.MouseDown -= new System.Windows.Forms.MouseEventHandler(ColumnMouseDown);
+                item.MouseUp -= new System.Windows.Forms.MouseEventHandler(ColumnMouseUp);
+                item.Parent = null;
+            }
+            IsSorted = false;
+            base.OnClear();
+        }
+
+        /// <summary>
+        ///     A map of display index (key) to index in the column collection (value).  Used to quickly find a column from its display index.
+        /// </summary>
+        internal List<int> DisplayIndexMap
+        {
+            get
+            {
+                if (!_IsDisplayIndexValid)
+                {
+                    UpdateDisplayIndexMap();
+                }
+
+
+                return _DisplayIndexMap;
+            }
+        }
+
+        /// <summary>
+        /// Gets the display index for specified column.
+        /// </summary>
+        /// <param name="column">Column that is part f ColumnHeaderCollection</param>
+        /// <returns>Display index or -1 column is not part of this collection.</returns>
+        public int GetDisplayIndex(ColumnHeader column)
+        {
+            int index = this.IndexOf(column);
+            UpdateDisplayIndexMap();
+            for (int i = 0; i < _DisplayIndexMap.Count; i++)
+            {
+                if (_DisplayIndexMap[i] == index) return i;
+            }
+            return -1;
+        }
+
+        /// <summary>
+        /// Returns the column that is displayed at specified display index..
+        /// </summary>
+        /// <param name="displayIndex">0 based display index.</param>
+        /// <returns>ColumnHeader</returns>
+        public ColumnHeader ColumnAtDisplayIndex(int displayIndex)
+        {
+            UpdateDisplayIndexMap();
+            return this[_DisplayIndexMap[displayIndex]];
+        }
+
+        private List<int> _DisplayIndexMap = new List<int>();
+        private bool _IsDisplayIndexValid = false;
+        private void UpdateDisplayIndexMap()
+        {
+            if (_IsDisplayIndexValid) return;
+
+            _IsDisplayIndexValid = true;
+            _DisplayIndexMap.Clear();
+            List<IndexToDisplayIndex> workingMap = new List<IndexToDisplayIndex>();
+            bool isAllDefault = true;
+            for (int i = 0; i < Count; i++)
+            {
+                int displayIndex = this[i].DisplayIndex;
+                if (displayIndex != -1) isAllDefault = false;
+                workingMap.Add(new IndexToDisplayIndex(i, displayIndex));
+            }
+            if (!isAllDefault)
+                workingMap.Sort(new DisplayIndexComparer());
+            foreach (IndexToDisplayIndex item in workingMap)
+            {
+                _DisplayIndexMap.Add(item.Index);
+            }
+        }
+        /// <summary>
+        /// Gets reference to last visible column or null if there is no last visible column.
+        /// </summary>
+        public DevComponents.AdvTree.ColumnHeader LastVisibleColumn
+        {
+            get
+            {
+                List<int> displayMap = DisplayIndexMap;
+                for (int i = displayMap.Count - 1; i >=0; i--)
+                {
+                    if (this[displayMap[i]].Visible) return this[displayMap[i]];
+                }
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Gets reference to first visible column or null if there is no first visible column.
+        /// </summary>
+        public DevComponents.AdvTree.ColumnHeader FirstVisibleColumn
+        {
+            get
+            {
+                List<int> displayMap = DisplayIndexMap;
+                for (int i = 0; i < displayMap.Count; i++)
+                {
+                    if (this[displayMap[i]].Visible) return this[displayMap[i]];
+                }
+                return null;
+            }
+        }
+
+        #region IndexToDisplayIndex Class
+        private class IndexToDisplayIndex
+        {
+            public int Index = -1;
+            public int DisplayIndex = -1;
+            /// <summary>
+            /// Initializes a new instance of the IndexToDisplayIndex class.
+            /// </summary>
+            /// <param name="index"></param>
+            /// <param name="displayIndex"></param>
+            public IndexToDisplayIndex(int index, int displayIndex)
+            {
+                Index = index;
+                DisplayIndex = displayIndex;
+            }
+        }
+        #endregion
+
+        #region DisplayIndexComparer
+
+        private class DisplayIndexComparer : IComparer<IndexToDisplayIndex>
+        {
+            #region IComparer<IndexToDisplayIndex> Members
+
+            public int Compare(IndexToDisplayIndex x, IndexToDisplayIndex y)
+            {
+                if (x.DisplayIndex == y.DisplayIndex)
+                {
+                    return x.Index - y.Index;
+                }
+                else
+                {
+                    return x.DisplayIndex - y.DisplayIndex;
+                }
+            }
+            #endregion
+        }
+
+        #endregion
+
+        internal void DisplayIndexChanged(ColumnHeader column, int newDisplayIndex, int oldDisplayIndex)
+        {
+            InvalidateDisplayIndexes();
+
+            if (_UpdatingDisplayIndexes) return;
+
+            if (_Parent != null && !_Parent.IsUpdateSuspended)
+                UpdateTreeLayout();
+            else if (_ParentNode != null && _ParentNode.TreeControl != null && !_ParentNode.TreeControl.IsUpdateSuspended)
+                UpdateTreeLayout();
+        }
+        /// <summary>
+        /// Invalidates the display indexes and causes them to be re-evaluated on next layout.
+        /// </summary>
+        public void InvalidateDisplayIndexes()
+        {
+            _IsDisplayIndexValid = false;
+        }
+        #endregion
+
+        private Rectangle _Bounds = Rectangle.Empty;
+        internal void SetBounds(System.Drawing.Rectangle totalBounds)
+        {
+            _Bounds = totalBounds;
+        }
+
+        /// <summary>
+        /// Gets the column header rendering bounds.
+        /// </summary>
+        [Browsable(false)]
+        public Rectangle Bounds
+        {
+            get { return _Bounds; }
+        }
+
+        internal bool UsesRelativeSize = false;
+
+        private bool _UpdatingDisplayIndexes = false;
+        internal bool UpdatingDisplayIndexes
+        {
+            get { return _UpdatingDisplayIndexes; }
+            set { _UpdatingDisplayIndexes = value; }
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/ColumnHeaderControl.cs b/PROMS/DotNetBar Source Code/AdvTree/ColumnHeaderControl.cs
new file mode 100644
index 00000000..179854a9
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/ColumnHeaderControl.cs	
@@ -0,0 +1,324 @@
+using System;
+using System.Text;
+using System.Windows.Forms;
+using System.Drawing;
+using DevComponents.DotNetBar;
+using System.Drawing.Drawing2D;
+using System.Drawing.Text;
+
+namespace DevComponents.AdvTree
+{
+    internal class ColumnHeaderControl : Control
+    {
+        #region Constructor
+        /// <summary>
+        /// Initializes a new instance of the ColumnHeaderControl class.
+        /// </summary>
+        public ColumnHeaderControl()
+        {
+            this.SetStyle(ControlStyles.UserPaint, true);
+            this.SetStyle(ControlStyles.AllPaintingInWmPaint, true);
+            this.SetStyle(ControlStyles.Opaque, true);
+            this.SetStyle(ControlStyles.ResizeRedraw, true);
+            this.SetStyle(ControlStyles.DoubleBuffer, true);
+            this.SetStyle(ControlStyles.Selectable, false);
+            this.SetStyle(ControlStyles.StandardDoubleClick | ControlStyles.StandardClick, true);
+        }
+        #endregion
+
+        #region Internal Implementation
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            Graphics g = e.Graphics;
+
+            DisplayHelp.FillRectangle(g, this.ClientRectangle, this.BackColor);
+
+            if (_Columns == null)
+            {
+                return;
+            }
+
+            AdvTree tree = GetTree();
+            if (tree != null)
+            {
+                SmoothingMode sm = g.SmoothingMode;
+                TextRenderingHint th = g.TextRenderingHint;
+                if (tree.AntiAlias)
+                {
+                    g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.AntiAlias;
+                    g.TextRenderingHint = DisplayHelp.AntiAliasTextRenderingHint;
+                }
+                //Creates the drawing matrix with the right zoom;
+                if (tree.Zoom != 1)
+                {
+                    System.Drawing.Drawing2D.Matrix mx = GetTranslationMatrix(tree.Zoom);
+                    //use it for drawing
+                    g.Transform = mx;
+                }
+
+                tree.NodeDisplay.PaintColumnHeaders(_Columns, g, true);
+
+                int columnMoveMarkerIndex = _ColumnMoveMarkerIndex;
+                if (columnMoveMarkerIndex >= 0)
+                    DevComponents.AdvTree.Display.ColumnHeaderDisplay.PaintColumnMoveMarker(g, tree, columnMoveMarkerIndex, _Columns);
+
+                if (tree.AntiAlias)
+                {
+                    g.SmoothingMode = sm;
+                    g.TextRenderingHint = th;
+                }
+            }
+
+
+            base.OnPaint(e);
+        }
+
+        private int _ColumnMoveMarkerIndex = -1;
+        /// <summary>
+        /// Gets or sets the column move marker that marks insertion point for column that is dragged. Marker is drawn before the column specified by this index.
+        /// </summary>
+        internal int ColumnMoveMarkerIndex
+        {
+            get { return _ColumnMoveMarkerIndex; }
+            set
+            {
+                _ColumnMoveMarkerIndex = value;
+                this.Invalidate();
+            }
+        }
+        
+
+        /// <summary>
+        /// Returns mouse position which is translated if control Zoom is not equal 1
+        /// </summary>
+        /// <param name="x">X coordinate</param>
+        /// <param name="y">Y coordinate</param>
+        /// <returns></returns>
+        private Point GetLayoutPosition(float zoom, int x, int y)
+        {
+            if (zoom == 1)
+                return new Point(x, y);
+            Point[] p = new Point[] { new Point(x, y) };
+            using (System.Drawing.Drawing2D.Matrix mx = GetTranslationMatrix(zoom))
+            {
+                mx.Invert();
+                mx.TransformPoints(p);
+            }
+            return p[0];
+        }
+
+        private System.Drawing.Drawing2D.Matrix GetTranslationMatrix(float zoom)
+        {
+            System.Drawing.Drawing2D.Matrix mx = new System.Drawing.Drawing2D.Matrix(zoom, 0, 0, zoom, 0, 0);
+            return mx;
+        }
+
+        private AdvTree GetTree()
+        {
+            return this.Parent as AdvTree;
+        }
+
+        private ColumnHeaderCollection _Columns = null;
+        /// <summary>
+        /// Gets or sets the column header collection to be rendered.
+        /// </summary>
+        public ColumnHeaderCollection Columns
+        {
+            get { return _Columns; }
+            set { _Columns = value; }
+        }
+
+        private Cursor _OldCursor = null;
+        private ColumnHeader _MouseOverColumnHeader = null;
+        protected override void OnMouseMove(MouseEventArgs e)
+        {
+            AdvTree tree = GetTree();
+
+            Point p = GetLayoutPosition(tree.Zoom, e.X, e.Y);
+            ColumnHeader ch = tree.GetColumnAt(p.X, p.Y, _Columns);
+            if (_MouseOverColumnHeader != ch)
+            {
+                if (_MouseOverColumnHeader != null)
+                    _MouseOverColumnHeader.InternalMouseLeave(e);
+                _MouseOverColumnHeader = ch;
+                if (_MouseOverColumnHeader != null)
+                {
+                    _MouseOverColumnHeader.InternalMouseEnter(e);
+                    Interop.WinApi.ResetHover(this);
+                }
+            }
+
+            if (ch != null)
+            {
+                ch.InternalMouseMove(e);
+            }
+
+            if (e.Button == MouseButtons.Left && _MouseDownHeader != null && tree.AllowUserToReorderColumns && (Math.Abs(_MouseDownPoint.X-e.X)>1))
+            {
+                tree.StartColumnReorder(p.X, p.Y);
+                return;
+            }
+
+            if (tree == null || e.Button != MouseButtons.None || !tree.AllowUserToResizeColumns) return;
+
+            
+            if (tree.CanResizeColumnAt(p.X, p.Y))
+            {
+                if (_OldCursor == null)
+                {
+                    _OldCursor = this.Cursor;
+                    this.Cursor = Cursors.VSplit;
+                }
+            }
+            else 
+            {
+                ReleaseCursor();
+            }
+
+            base.OnMouseMove(e);
+        }
+
+        ColumnHeader _MouseDownHeader = null;
+        private Point _MouseDownPoint = Point.Empty;
+        protected override void OnMouseDown(MouseEventArgs e)
+        {
+            AdvTree tree = GetTree();
+            Point p = Point.Empty;
+            
+            bool canResize = false;
+            _MouseDownPoint = e.Location;
+
+            if (tree != null)
+            {
+                p = GetLayoutPosition(tree.Zoom, e.X, e.Y);
+            }
+
+            if (tree != null && tree.AllowUserToResizeColumns && e.Button == MouseButtons.Left)
+                canResize = tree.CanResizeColumnAt(p.X, p.Y);
+
+            if (tree != null)
+            {
+                p = GetLayoutPosition(tree.Zoom, e.X, e.Y);
+                ColumnHeader ch = tree.GetColumnAt(p.X, p.Y, _Columns);
+                if (ch != null)
+                {
+                    _MouseDownHeader = ch;
+                    if (!canResize)
+                        ch.OnMouseDown(e);
+                }
+            }
+
+            if (tree == null || e.Button != MouseButtons.Left || !tree.AllowUserToResizeColumns) return;
+
+            if (canResize)
+            {
+                tree.StartColumnResize(p.X, p.Y);
+            }
+
+            this.Invalidate();
+            base.OnMouseDown(e);
+        }
+
+        protected override void OnMouseHover(EventArgs e)
+        {
+            if (Control.MouseButtons == MouseButtons.None)
+            {
+                AdvTree tree = GetTree();
+                Point p = this.PointToClient(Control.MousePosition);
+                p = GetLayoutPosition(tree.Zoom, p.X, p.Y);
+                ColumnHeader ch = tree.GetColumnAt(p.X, p.Y, _Columns);
+                if (ch != null)
+                {
+                    ch.InternalMouseHover(e);
+                }
+            }
+            base.OnMouseHover(e);
+        }
+
+        protected override void OnMouseUp(MouseEventArgs e)
+        {
+            ReleaseCursor();
+            _MouseDownPoint = Point.Empty;
+
+            if (_MouseDownHeader!=null)
+            {
+                _MouseDownHeader.OnMouseUp(e);
+                _MouseDownHeader = null;
+            }
+            this.Invalidate();
+
+            base.OnMouseUp(e);
+        }
+
+        protected override void OnClick(EventArgs e)
+        {
+            AdvTree tree = GetTree();
+            Point p = Point.Empty;
+
+            if (tree != null)
+            {
+                Point tp = tree.PointToClient(Control.MousePosition);
+                p = GetLayoutPosition(tree.Zoom, tp.X, tp.Y);
+                ColumnHeader ch = tree.GetColumnAt(p.X, p.Y, _Columns);
+                if (ch != null)
+                {
+                    ch.OnClick(e);
+                }
+            }
+            this.Invalidate();
+            base.OnClick(e);
+        }
+
+        internal DateTime IgnoreDoubleClickTime = DateTime.MinValue;
+        
+        protected override void OnDoubleClick(EventArgs e)
+        {
+            AdvTree tree = GetTree();
+            Point p = Point.Empty;
+
+            if (tree != null)
+            {
+                Point tp = tree.PointToClient(Control.MousePosition);
+                p = GetLayoutPosition(tree.Zoom, tp.X, tp.Y);
+                ColumnHeader ch = tree.GetColumnAt(p.X, p.Y, _Columns);
+                if (ch != null)
+                {
+                    DateTime now = DateTime.Now;
+                    if (IgnoreDoubleClickTime != DateTime.MinValue && now.Subtract(IgnoreDoubleClickTime).TotalMilliseconds <= SystemInformation.DoubleClickTime)
+                    {
+                        IgnoreDoubleClickTime = DateTime.MinValue;
+                        return;
+                    }
+                    IgnoreDoubleClickTime = DateTime.MinValue;
+
+                    ch.OnDoubleClick(e);
+                }
+            }
+            this.Invalidate();
+
+            base.OnDoubleClick(e);
+        }
+
+        private void ReleaseCursor()
+        {
+            if (_OldCursor != null)
+            {
+                this.Cursor = _OldCursor;
+                _OldCursor = null;
+            }
+        }
+
+        protected override void OnMouseLeave(EventArgs e)
+        {
+            if (_MouseOverColumnHeader != null)
+            {
+                _MouseOverColumnHeader.InternalMouseLeave(e);
+                _MouseOverColumnHeader = null;
+            }
+            if (Control.MouseButtons != MouseButtons.Left)
+                ReleaseCursor();
+            base.OnMouseLeave(e);
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/ColumnWidth.cs b/PROMS/DotNetBar Source Code/AdvTree/ColumnWidth.cs
new file mode 100644
index 00000000..21a42f7d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/ColumnWidth.cs	
@@ -0,0 +1,151 @@
+using System;
+using System.ComponentModel;
+
+namespace DevComponents.AdvTree
+{
+	/// <summary>
+	/// Represents the width of the Column. Supports absolute width in Pixels and
+	/// relative width as percentage of the width of parent control.
+	/// </summary>
+	[ToolboxItem(false) ,System.ComponentModel.DesignTimeVisible(false),TypeConverter(typeof(System.ComponentModel.ExpandableObjectConverter))]
+    public class ColumnWidth
+	{
+		private int m_Relative=0;
+		private int m_Absolute=0;
+		internal event EventHandler WidthChanged;
+
+		/// <summary>
+		/// Creates new instance of the object.
+		/// </summary>
+		public ColumnWidth()
+		{
+		}
+
+		/// <summary>
+		/// Gets or sets relative width expressed as percentage between 1-100. 0 indicates that
+		/// absolute width will be used.
+		/// </summary>
+		/// <remarks>
+		/// Relative width is expressed as percentage between 1-100 of the parent controls
+		/// width. 0 indicates that absolute width will be used. Absolute width always takes
+		/// priority over relative width. For example value of 30 assigned to this property
+		/// indicates that width of the column will be 30% of the total client width of the
+		/// control.
+		/// </remarks>
+		[DefaultValue(0),Browsable(true),Description("Gets or sets relative width in percent. Valid values are between 1-100 with 0 indicating that absolute width will be used.")]
+		public int Relative
+		{
+			get {return m_Relative;}
+			set
+			{
+				if(m_Relative!=value)
+				{
+					m_Relative=value;
+					OnSizeChanged();
+				}
+			}
+		}
+
+		/// <summary>Gets or sets the absolute width of the column in pixels.</summary>
+		/// <remarks>
+		/// Absolute width always takes precedence over the relative width of the
+		/// column.
+		/// </remarks>
+		[DefaultValue(0),Browsable(true),Description("Gets or sets the absolute width of the column in pixels.")]
+		public int Absolute
+		{
+			get {return m_Absolute;}
+			set
+			{
+				if(m_Absolute<0)
+					return;
+				if(m_Absolute!=value)
+				{
+					m_Absolute=value;
+					if(m_Absolute!=0)
+						m_Relative=0;
+					OnSizeChanged();
+				}
+			}
+		}
+
+        internal void SetAbsolute(int value)
+        {
+            m_Absolute = value;
+        }
+
+        internal int GetWidth(int containerWidth)
+        {
+            if (m_Absolute > 0)
+                return m_Absolute;
+            if(m_Relative>0)
+                return (100 / m_Relative) * containerWidth;
+            return 0;
+        }
+
+		private void OnSizeChanged()
+		{
+			if(WidthChanged!=null)
+				WidthChanged(this,new EventArgs());
+		}
+
+        private bool _AutoSize = false;
+        /// <summary>
+        /// Gets or sets whether column width is automatically set based on the column's content. Default value is false.
+        /// When set absolute and relative size values are ignored.
+        /// </summary>
+        [DefaultValue(false), Description("Indicates whether column is sized based on the content.")]
+        public bool AutoSize
+        {
+            get { return _AutoSize; }
+            set
+            {
+                if (_AutoSize != value)
+                {
+                    _AutoSize = value;
+                    OnSizeChanged();
+                }
+            }
+        }
+
+        internal void SetAutoSize(bool autoSize)
+        {
+            _AutoSize = autoSize;
+        }
+
+        private bool _AutoSizeMinHeader = false;
+        /// <summary>
+        /// Gets or sets whether column auto-width is set to minimum of the column header text width. Applies to AutoSize=true only.
+        /// </summary>
+        [DefaultValue(false), Description("Indicates whether column auto-width is set to minimum of the column header text width. Applies to AutoSize=true only.")]
+        public bool AutoSizeMinHeader
+        {
+            get { return _AutoSizeMinHeader; }
+            set
+            {
+                _AutoSizeMinHeader = value;
+                OnSizeChanged();
+            }
+        }
+        
+
+        private int _AutoSizeWidth = 0;
+        /// <summary>
+        /// Gets the auto-size calculated width of the column after tree layout is performed and column has AutoSize=true.
+        /// </summary>
+        [Browsable(false)]
+        public int AutoSizeWidth
+        {
+            get { return _AutoSizeWidth; }
+//            internal set
+//            {
+//                _AutoSizeWidth = value;
+//            }
+        }
+		internal void SetAutoSizeWidth(int value)
+		{
+			_AutoSizeWidth = value;
+		}
+        
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/CommandButtonEventArgs.cs b/PROMS/DotNetBar Source Code/AdvTree/CommandButtonEventArgs.cs
new file mode 100644
index 00000000..37324a7c
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/CommandButtonEventArgs.cs	
@@ -0,0 +1,30 @@
+using System;
+
+namespace DevComponents.AdvTree
+{
+	/// <summary>
+	/// Provides event arguments for command button events.
+	/// </summary>
+	public class CommandButtonEventArgs:EventArgs
+	{
+		/// <summary>
+		/// Default constructor.
+		/// </summary>
+		/// <param name="action">Action type.</param>
+		/// <param name="node">Context node.</param>
+		public CommandButtonEventArgs(eTreeAction action, Node node)
+		{
+			this.Action=action;
+			this.Node=node;
+		}
+		
+		/// <summary>
+		/// Indicates the action type that caused the event.
+		/// </summary>
+		public eTreeAction Action=eTreeAction.Code;
+		/// <summary>
+		/// Indicates the node action is peformed on.
+		/// </summary>
+		public DevComponents.AdvTree.Node Node=null;
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/ConnectorPointsCollection.cs b/PROMS/DotNetBar Source Code/AdvTree/ConnectorPointsCollection.cs
new file mode 100644
index 00000000..126f003b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/ConnectorPointsCollection.cs	
@@ -0,0 +1,154 @@
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.Drawing;
+
+namespace DevComponents.AdvTree
+{
+	/// <summary>
+	/// Represents collection of connector points for a node.
+	/// </summary>
+	public class ConnectorPointsCollection:CollectionBase 
+	{
+		#region Private Variables
+		private Node m_ParentNode=null;
+		#endregion
+
+		#region Internal Implementation
+		/// <summary>
+		/// Default constructor.
+		/// </summary>
+		public ConnectorPointsCollection()
+		{
+		}
+		/// <summary>
+		/// Gets or sets the node this collection is associated with.
+		/// </summary>
+		[Browsable(false),DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public Node ParentNode
+		{
+			get {return m_ParentNode;}
+		}
+		/// <summary>
+		/// Sets the node collection belongs to.
+		/// </summary>
+		/// <param name="parent">Node that is parent of this collection.</param>
+		internal void SetParentNode(Node parent)
+		{
+			m_ParentNode=parent;
+		}
+
+		/// <summary>
+		/// Adds new object to the collection.
+		/// </summary>
+		/// <param name="p">Object to add.</param>
+		/// <returns>Index of newly added object.</returns>
+		public int Add(Point p)
+		{
+			return List.Add(p);
+		}
+
+		/// <summary>
+		/// Adds range of objects to the array.
+		/// </summary>
+		/// <param name="ap">Array to add.</param>
+		public void AddRange(Point[] ap)
+		{
+			foreach(Point p in ap)
+				this.Add(p);
+		}
+
+		/// <summary>
+		/// Copies objects of the collection to the array.
+		/// </summary>
+		/// <returns></returns>
+		public Point[] ToArray()
+		{
+			Point[] ap=new Point[this.Count];
+			this.CopyTo(ap);
+			return ap;
+		}
+
+		/// <summary>
+		/// Returns reference to the object in collection based on it's index.
+		/// </summary>
+		public Point this[int index]
+		{
+			get {return (Point)(List[index]);}
+			set {List[index] = value;}
+		}
+
+		/// <summary>
+		/// Inserts new object into the collection.
+		/// </summary>
+		/// <param name="index">Position of the object.</param>
+		/// <param name="value">Object to insert.</param>
+		public void Insert(int index, Point value) 
+		{
+			List.Insert(index, value);
+		}
+
+		/// <summary>
+		/// Returns index of the object inside of the collection.
+		/// </summary>
+		/// <param name="value">Reference to the object.</param>
+		/// <returns>Index of the object.</returns>
+		public int IndexOf(Point value) 
+		{
+			return List.IndexOf(value);
+		}
+
+		/// <summary>
+		/// Returns whether collection contains specified object.
+		/// </summary>
+		/// <param name="value">Object to look for.</param>
+		/// <returns>true if object is part of the collection, otherwise false.</returns>
+		public bool Contains(Point value) 
+		{
+			return List.Contains(value);
+		}
+
+		/// <summary>
+		/// Removes specified object from the collection.
+		/// </summary>
+		/// <param name="value"></param>
+		public void Remove(Point value) 
+		{
+			List.Remove(value);
+		}
+
+		protected override void OnRemoveComplete(int index,object value)
+		{
+			base.OnRemoveComplete(index,value);
+		}
+		protected override void OnInsertComplete(int index,object value)
+		{
+			base.OnInsertComplete(index,value);
+		}
+
+		/// <summary>
+		/// Copies collection into the specified array.
+		/// </summary>
+		/// <param name="array">Array to copy collection to.</param>
+		/// <param name="index">Starting index.</param>
+		public void CopyTo(Point[] array, int index) 
+		{
+			List.CopyTo(array, index);
+		}
+
+		/// <summary>
+		/// Copies contained items to the ColumnHeader array.
+		/// </summary>
+		/// <param name="array">Array to copy to.</param>
+		internal void CopyTo(Point[] array)
+		{
+			List.CopyTo(array,0);
+		}
+
+		protected override void OnClear()
+		{
+			base.OnClear();
+		}
+		#endregion
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/CustomEditors.cs b/PROMS/DotNetBar Source Code/AdvTree/CustomEditors.cs
new file mode 100644
index 00000000..017e914c
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/CustomEditors.cs	
@@ -0,0 +1,243 @@
+using System;
+using System.Text;
+using DevComponents.Editors;
+using System.Windows.Forms;
+using DevComponents.Editors.DateTimeAdv;
+
+namespace DevComponents.AdvTree
+{
+#if FRAMEWORK20
+    #region Integer Custom Editor
+    internal class IntegerCellEditor : IntegerInput, ICellEditControl
+    {
+        #region ICellEditControl Members
+
+        public void BeginEdit()
+        {
+#if (FRAMEWORK20)
+            this.MinimumSize = new System.Drawing.Size(32, 10);
+#endif
+        }
+
+        public void EndEdit()
+        {
+            this.Dispose();
+        }
+
+        public object CurrentValue
+        {
+            get
+            {
+                if (this.FreeTextEntryMode && this.IsKeyboardFocusWithin)
+                    this.ApplyFreeTextValue();
+                return this.Text;
+            }
+            set
+            {
+                if (value is int)
+                    this.Value = (int)value;
+                else if (value == null)
+                    this.ValueObject = null;
+                else
+                {
+                    string s = Utilities.StripNonNumeric(value.ToString());
+                    int i = 0;
+#if FRAMEWORK20
+                    int.TryParse(s, out i);
+#else
+            try
+            {
+                i = int.Parse(s);
+            }
+            catch { }
+#endif
+                    this.Value = i;
+                }
+            }
+        }
+        protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
+        {
+            if (keyData == Keys.Enter || keyData == Keys.Tab)
+            {
+                if (EditComplete != null)
+                    EditComplete(this, new EventArgs());
+                return true;
+            }
+            else if (keyData == Keys.Escape)
+            {
+                if (CancelEdit != null)
+                    CancelEdit(this, new EventArgs());
+                return true;
+            }
+            return base.ProcessCmdKey(ref msg, keyData);
+        }
+
+        public event EventHandler EditComplete;
+
+        public event EventHandler CancelEdit;
+
+        public bool EditWordWrap
+        {
+            get { return false; }
+            set { }
+        }
+
+        #endregion
+    }
+    #endregion
+
+    #region Double Custom Editor
+    internal class DoubleCellEditor : DoubleInput, ICellEditControl
+    {
+        #region ICellEditControl Members
+
+        public void BeginEdit()
+        {
+#if (FRAMEWORK20)
+            this.MinimumSize = new System.Drawing.Size(32, 10);
+#endif
+        }
+
+        public void EndEdit()
+        {
+            this.Dispose();
+        }
+
+        public object CurrentValue
+        {
+            get
+            {
+                if (this.FreeTextEntryMode && this.IsKeyboardFocusWithin)
+                    this.ApplyFreeTextValue();
+                return this.Text;
+            }
+            set
+            {
+                if (value is int)
+                    this.Value = (int)value;
+                else if (value == null)
+                    this.ValueObject = null;
+                else
+                {
+                    string s = Utilities.StripNonNumeric(value.ToString());
+                    double i = 0;
+#if FRAMEWORK20
+                    double.TryParse(s, out i);
+#else
+            try
+            {
+                i = double.Parse(s);
+            }
+            catch { }
+#endif
+                    this.Value = i;
+                }
+            }
+        }
+        protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
+        {
+            if (keyData == Keys.Enter || keyData == Keys.Tab)
+            {
+                if (EditComplete != null)
+                    EditComplete(this, new EventArgs());
+                return true;
+            }
+            else if (keyData == Keys.Escape)
+            {
+                if (CancelEdit != null)
+                    CancelEdit(this, new EventArgs());
+                return true;
+            }
+            return base.ProcessCmdKey(ref msg, keyData);
+        }
+
+        public event EventHandler EditComplete;
+
+        public event EventHandler CancelEdit;
+
+        public bool EditWordWrap
+        {
+            get { return false; }
+            set { }
+        }
+
+        #endregion
+    }
+    #endregion
+
+    #region Date-Time Custom Editor
+    internal class DateTimeCellEditor : DateTimeInput, ICellEditControl
+    {
+        #region Constructor
+        /// <summary>
+        /// Initializes a new instance of the DateTimeCellEditor class.
+        /// </summary>
+        public DateTimeCellEditor()
+        {
+            this.BackgroundStyle.BorderColor = System.Drawing.Color.Transparent;
+        }
+        #endregion
+
+        #region ICellEditControl Members
+        public void BeginEdit()
+        {
+            this.MinimumSize = new System.Drawing.Size(70, 10);
+        }
+
+        public void EndEdit()
+        {
+            this.Dispose();
+        }
+
+        public object CurrentValue
+        {
+            get
+            {
+                return this.Text;
+            }
+            set
+            {
+                if (value is DateTime)
+                    this.Value = (DateTime)value;
+                else if (value == null)
+                    this.ValueObject = null;
+                else if(value is string)
+                {
+                    DateTime date = DateTime.MinValue;
+                    if (DateTime.TryParse((string)value, out date))
+                        this.Value = date;
+                }
+            }
+        }
+        protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
+        {
+            if (keyData == Keys.Enter || keyData == Keys.Tab)
+            {
+                if (EditComplete != null)
+                    EditComplete(this, new EventArgs());
+                return true;
+            }
+            else if (keyData == Keys.Escape)
+            {
+                if (CancelEdit != null)
+                    CancelEdit(this, new EventArgs());
+                return true;
+            }
+            return base.ProcessCmdKey(ref msg, keyData);
+        }
+
+        public event EventHandler EditComplete;
+
+        public event EventHandler CancelEdit;
+
+        public bool EditWordWrap
+        {
+            get { return false; }
+            set { }
+        }
+
+        #endregion
+    }
+    #endregion
+#endif
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/Display/CellDisplay.cs b/PROMS/DotNetBar Source Code/AdvTree/Display/CellDisplay.cs
new file mode 100644
index 00000000..869fbe03
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/Display/CellDisplay.cs	
@@ -0,0 +1,328 @@
+using System;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using DevComponents.DotNetBar;
+using DevComponents.DotNetBar.Rendering;
+
+namespace DevComponents.AdvTree.Display
+{
+	/// <summary>
+	/// Represents cell display class.
+	/// </summary>
+	internal class CellDisplay
+	{
+		public CellDisplay()
+		{
+		}
+
+        private static Office2007CheckBoxItemPainter _CheckBoxPainter;
+        public static Office2007CheckBoxItemPainter CheckBoxPainter
+        {
+            get { return _CheckBoxPainter; }
+            set { _CheckBoxPainter = value; }
+        }
+
+        public static Office2007CheckBoxColorTable ColorTable = null;
+
+		public static void PaintCell(NodeCellRendererEventArgs ci)
+		{
+			if(ci.Cell.CheckBoxVisible)
+				CellDisplay.PaintCellCheckBox(ci);
+			if(!ci.Cell.Images.LargestImageSize.IsEmpty)
+				CellDisplay.PaintCellImage(ci);
+			CellDisplay.PaintText(ci);
+		}
+
+		public static void PaintCellCheckBox(NodeCellRendererEventArgs ci)
+		{
+			if(!ci.Cell.CheckBoxVisible)
+				return;
+            Cell cell = ci.Cell;
+            Rectangle r = cell.CheckBoxBoundsRelative;
+			r.Offset(ci.CellOffset);
+
+            if (ci.CheckBoxImageChecked != null)
+            {
+                Image img = ci.CheckBoxImageChecked;
+                if (cell.CheckState == System.Windows.Forms.CheckState.Unchecked)
+                    img = ci.CheckBoxImageUnChecked;
+                else if (cell.CheckState == System.Windows.Forms.CheckState.Indeterminate)
+                    img = ci.CheckBoxImageIndeterminate;
+                if (img != null)
+                    ci.Graphics.DrawImage(img, r);
+            }
+            else if (_CheckBoxPainter != null)
+            {
+                Office2007CheckBoxStateColorTable ct = GetCheckBoxStateColorTable(ci);
+                if (cell.CheckBoxStyle == eCheckBoxStyle.CheckBox)
+                {
+                    _CheckBoxPainter.PaintCheckBox(ci.Graphics, r, ct, cell.CheckState);
+                }
+                else
+                {
+                    _CheckBoxPainter.PaintRadioButton(ci.Graphics, r, ct, cell.Checked);
+                }
+            }
+            else
+            {
+                System.Windows.Forms.ButtonState state = System.Windows.Forms.ButtonState.Normal;
+                if (ci.Cell.Checked)
+                    state = System.Windows.Forms.ButtonState.Checked;
+                System.Windows.Forms.ControlPaint.DrawCheckBox(ci.Graphics, r, state);
+            }
+		}
+
+        private static Office2007CheckBoxStateColorTable GetCheckBoxStateColorTable(NodeCellRendererEventArgs e)
+        {
+            Cell cell = e.Cell;
+
+            if (ColorTable != null && BarFunctions.IsOffice2007Style(e.ColorScheme.Style))
+            {
+                Office2007CheckBoxColorTable ct = ColorTable;
+                if (!cell.GetEnabled())
+                    return ct.Disabled;
+                //else if (cell.IsMouseDown)
+                //    return ct.Pressed;
+                //else if (cell.IsMouseOver)
+                //    return ct.MouseOver;
+                return ct.Default;
+            }
+            else
+            {
+                ColorScheme cs = e.ColorScheme;
+                // Create color table based on the ColorScheme object...
+                Office2007CheckBoxStateColorTable ct = new Office2007CheckBoxStateColorTable();
+                if (!cell.GetEnabled())
+                {
+                    ct.CheckBackground = new LinearGradientColorTable(cs.MenuBackground, Color.Empty);
+                    ct.CheckBorder = cs.ItemDisabledText;
+                    ct.CheckInnerBorder = cs.ItemDisabledText;
+                    ct.CheckInnerBackground = new LinearGradientColorTable();
+                    ct.CheckSign = new LinearGradientColorTable(cs.ItemDisabledText, Color.Empty);
+                    ct.Text = cs.ItemDisabledText;
+                }
+                //else if (cell.IsMouseDown)
+                //{
+                //    ct.CheckBackground = new LinearGradientColorTable(cs.MenuBackground, Color.Empty);
+                //    ct.CheckBorder = cs.ItemPressedBorder;
+                //    ct.CheckInnerBorder = cs.ItemPressedBorder;
+                //    ct.CheckInnerBackground = new LinearGradientColorTable(cs.ItemPressedBackground, cs.ItemPressedBackground2);
+                //    ct.CheckSign = new LinearGradientColorTable(cs.ItemPressedText, Color.Empty);
+                //    ct.Text = cs.ItemPressedText;
+                //}
+                //else if (cell.IsMouseOver)
+                //{
+                //    ct.CheckBackground = new LinearGradientColorTable(cs.MenuBackground, Color.Empty);
+                //    ct.CheckBorder = cs.ItemHotBorder;
+                //    ct.CheckInnerBorder = cs.ItemHotBorder;
+                //    ct.CheckInnerBackground = new LinearGradientColorTable(cs.ItemHotBackground, cs.ItemHotBackground2);
+                //    ct.CheckSign = new LinearGradientColorTable(cs.ItemHotText, Color.Empty);
+                //    ct.Text = cs.ItemHotText;
+                //}
+                else
+                {
+                    ct.CheckBackground = new LinearGradientColorTable(cs.MenuBackground, Color.Empty);
+                    ct.CheckBorder = cs.PanelBorder;
+                    ct.CheckInnerBorder = ColorBlendFactory.SoftLight(cs.PanelBorder, Color.White);
+                    ct.CheckInnerBackground = new LinearGradientColorTable(cs.MenuBackground, Color.Empty);
+                    ct.CheckSign = new LinearGradientColorTable(cs.ItemText, Color.Empty);
+                    ct.Text = cs.ItemText;
+                }
+                return ct;
+            }
+        }
+
+		public static void PaintCellImage(NodeCellRendererEventArgs ci)
+		{
+			if(ci.Cell.Images.LargestImageSize.IsEmpty)
+				return;
+			Rectangle r=ci.Cell.ImageBoundsRelative;
+			r.Offset(ci.CellOffset);
+			
+			Image image = CellDisplay.GetCellImage(ci.Cell);
+			
+			if(image!=null)
+			{
+			    Size imageSize = Dpi.ImageSize(image.Size);
+                ci.Graphics.DrawImage(image, r.X + (r.Width - imageSize.Width) / 2,
+                                      r.Y + (r.Height - imageSize.Height) / 2, imageSize.Width, imageSize.Height);
+			}
+		}
+
+        public static void PaintText(NodeCellRendererEventArgs ci)
+        {
+            Cell cell = ci.Cell;
+            if (cell.HostedControl == null && cell.HostedItem == null && (cell.DisplayText == "" || ci.Style.TextColor.IsEmpty) || cell.TextContentBounds.IsEmpty)
+                return;
+
+            Rectangle bounds = ci.Cell.TextContentBounds;
+            bounds.Offset(ci.CellOffset);
+
+            Graphics g = ci.Graphics;
+            if (cell.HostedControl != null)
+            {
+                if (!cell.HostedControl.Visible)
+                    cell.HostedControl.Visible = true;
+                return;
+            }
+            else if (cell.HostedItem != null)
+            {
+                BaseItem item = cell.HostedItem;
+                if (item.ItemAlignment == eItemAlignment.Near)
+                    item.LeftInternal = bounds.X;
+                else if (item.ItemAlignment == eItemAlignment.Far)
+                    item.LeftInternal = bounds.X + (bounds.Width - item.WidthInternal);
+                else if (item.ItemAlignment == eItemAlignment.Center)
+                    item.LeftInternal = bounds.X + (bounds.Width - item.WidthInternal) / 2;
+                if (item.DisplayRectangle.Height < bounds.Height)
+                    item.TopInternal = bounds.Y + (bounds.Height - item.DisplayRectangle.Height) / 2;
+                else
+                    item.TopInternal = bounds.Y;
+                item.Displayed = true;
+                Region oldClip = g.Clip;
+                Rectangle cb = bounds;
+                cb.Inflate(2, 1);
+                g.SetClip(cb, CombineMode.Intersect);
+                item.Paint(ci.ItemPaintArgs);
+                if (oldClip != null)
+                {
+                    g.Clip = oldClip;
+                    oldClip.Dispose();
+                }
+                return;
+            }
+
+            Font font = ci.Style.Font;
+            if (bounds.Width > 1 && bounds.Height > 1)
+            {
+                //eTextFormat textFormat = ci.Style.TextFormat;
+                //textFormat = textFormat & ~(textFormat & eTextFormat.HidePrefix);
+                //textFormat |= eTextFormat.NoPrefix;
+                if (cell.TextMarkupBody == null)
+                {
+                    TextDrawing.DrawString(g, cell.DisplayText, font, ci.Style.TextColor, bounds, ci.Style.TextFormat);
+                }
+                else
+                {
+                    DevComponents.DotNetBar.TextMarkup.MarkupDrawContext d = new DevComponents.DotNetBar.TextMarkup.MarkupDrawContext(g, font, ci.Style.TextColor, false);
+                    d.HotKeyPrefixVisible = !((ci.Style.TextFormat & eTextFormat.HidePrefix) == eTextFormat.HidePrefix);
+                    Rectangle mr = Rectangle.Empty;
+                    eStyleTextAlignment lineAlignment = ci.Style.TextLineAlignment;
+                    if (lineAlignment == eStyleTextAlignment.Center)
+                    {
+                        mr = new Rectangle(bounds.X, bounds.Y + (bounds.Height - cell.TextMarkupBody.Bounds.Height) / 2, cell.TextMarkupBody.Bounds.Width, cell.TextMarkupBody.Bounds.Height);
+                    }
+                    else if (lineAlignment == eStyleTextAlignment.Near)
+                    {
+                        mr = new Rectangle(bounds.X, bounds.Y, cell.TextMarkupBody.Bounds.Width, cell.TextMarkupBody.Bounds.Height);
+                    }
+                    else // Far
+                    {
+                        mr = new Rectangle(bounds.X, bounds.Y + (bounds.Height - cell.TextMarkupBody.Bounds.Height), cell.TextMarkupBody.Bounds.Width, cell.TextMarkupBody.Bounds.Height);
+                    }
+
+                    cell.TextMarkupBody.Bounds = mr;
+                    cell.TextMarkupBody.Render(d);
+                }
+            }
+        }
+
+		private static Image GetCellImage(Cell cell)
+		{
+			Image img=cell.Images.Image;
+
+            bool enabled = cell.GetEnabled();
+
+            if (!enabled && (cell.Images.ImageDisabled != null || cell.Images.ImageDisabledIndex >= 0 || cell.Images.DisabledImageGenerated != null))
+            {
+                if (cell.Images.DisabledImageGenerated != null) return cell.Images.DisabledImageGenerated;
+                if (cell.Images.ImageDisabled != null) return cell.Images.ImageDisabled;
+                if (cell.Images.ImageDisabledIndex >= 0) return cell.Images.GetImageByIndex(cell.Images.ImageDisabledIndex);
+            }
+
+            if(img == null && !string.IsNullOrEmpty(cell.Images.ImageKey))
+                img = cell.Images.GetImageByKey(cell.Images.ImageKey);
+            if (img == null && cell.Images.ImageIndex >= 0)
+                img = cell.Images.GetImageByIndex(cell.Images.ImageIndex);
+
+            if (!enabled && img is Bitmap)
+            {
+                cell.Images.DisposeGeneratedDisabledImage();
+                cell.Images.DisabledImageGenerated = ImageHelper.CreateGrayScaleImage(img as Bitmap);
+                if (cell.Images.DisabledImageGenerated != null) return cell.Images.DisabledImageGenerated;
+                return img;
+            }
+			
+			if(cell.IsMouseOver && (cell.Images.ImageMouseOver!=null || cell.Images.ImageMouseOverIndex>= 0 || !string.IsNullOrEmpty(cell.Images.ImageMouseOverKey)))
+			{
+                if (cell.Images.ImageMouseOver != null)
+                    img = cell.Images.ImageMouseOver;
+                else if (cell.Images.ImageMouseOverIndex >= 0)
+                    img = cell.Images.GetImageByIndex(cell.Images.ImageMouseOverIndex);
+                else
+                    img = cell.Images.GetImageByKey(cell.Images.ImageMouseOverKey);
+			}
+			else if(cell.Parent.Expanded && (cell.Images.ImageExpanded!=null || cell.Images.ImageExpandedIndex>= 0 || !string.IsNullOrEmpty(cell.Images.ImageExpandedKey)))
+			{
+                if (cell.Images.ImageExpanded != null)
+                    img = cell.Images.ImageExpanded;
+                else if (cell.Images.ImageExpandedIndex >= 0)
+                    img = cell.Images.GetImageByIndex(cell.Images.ImageExpandedIndex);
+                else
+                    img = cell.Images.GetImageByKey(cell.Images.ImageExpandedKey);
+			}
+			return img;
+		}
+
+		public static Font GetCellFont(AdvTree tree, Cell cell)
+		{
+			Font font=tree.Font;
+			ElementStyle style=null;
+			
+			if(cell.StyleNormal!=null)
+			{
+				style=cell.StyleNormal;
+			}
+			else
+			{
+				if(tree.NodeStyle!=null)
+					style=tree.NodeStyle;
+				else
+					style=new ElementStyle();
+
+				if(tree.CellStyleDefault!=null)
+					style=tree.CellStyleDefault;
+				else
+					style=ElementStyle.GetDefaultCellStyle(style);
+			}
+
+			if(style!=null && style.Font!=null)
+				font=style.Font;
+
+			return font;
+		}
+	}
+
+	/// <summary>
+	/// Represents information necessary to paint the cell on canvas.
+	/// </summary>
+	internal class CellDisplayInfo
+	{
+		public ElementStyle Style=null;
+		public System.Drawing.Graphics Graphics=null;
+		public Cell ContextCell=null;
+		public Point CellOffset=Point.Empty;
+
+		public CellDisplayInfo()
+		{
+		}
+
+		public CellDisplayInfo(ElementStyle style, System.Drawing.Graphics g, Cell cell, Point cellOffset)
+		{
+			this.Style=style;
+			this.Graphics=g;
+			this.ContextCell=cell;
+			this.CellOffset=cellOffset;
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/Display/ColorTableInitializer.cs b/PROMS/DotNetBar Source Code/AdvTree/Display/ColorTableInitializer.cs
new file mode 100644
index 00000000..1dbeda02
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/Display/ColorTableInitializer.cs	
@@ -0,0 +1,384 @@
+using System;
+using System.Text;
+using DevComponents.WinForms.Drawing;
+using System.Drawing;
+using DevComponents.DotNetBar.Rendering;
+
+namespace DevComponents.AdvTree.Display
+{
+    /// <summary>
+    /// Initializes the tree color tables.
+    /// </summary>
+    internal class ColorTableInitializer
+    {
+        #region Office 2007 Blue
+        public static void InitOffice2007Blue(TreeColorTable ct, ColorFactory factory)
+        {
+            #region Tree Selection
+            TreeSelectionColors treeSelection = new TreeSelectionColors();
+            ct.Selection = treeSelection;
+            // Highlight full row
+            SelectionColorTable selColorTable = new SelectionColorTable();
+            selColorTable.Fill = new SolidFill(factory.GetColor(0xA7CDF0));
+            treeSelection.FullRowSelect = selColorTable;
+            //  Highlight full row Inactive
+            selColorTable = new SelectionColorTable();
+            selColorTable.Fill = new SolidFill(factory.GetColor(0xE5E5E5));
+            treeSelection.FullRowSelectInactive = selColorTable;
+
+            // Node Marker
+            selColorTable = new SelectionColorTable();
+            selColorTable.Fill = new SolidFill(factory.GetColor(64, 0x316AC5));
+            selColorTable.Border = new SolidBorder(factory.GetColor(96, 0x316AC5), 1);
+            treeSelection.NodeMarker = selColorTable;
+            // Node marker inactibe
+            selColorTable = new SelectionColorTable();
+            selColorTable.Fill = new SolidFill(factory.GetColor(64, 0xE5E5E5));
+            selColorTable.Border = new SolidBorder(factory.GetColor(96, 0x000000), 1);
+            treeSelection.NodeMarkerInactive = selColorTable;
+
+            // Cell selection
+            selColorTable = new SelectionColorTable();
+            selColorTable.Fill = new GradientFill(new ColorStop[] {
+                    new ColorStop(factory.GetColor(0xFFFCD9), 0f),
+                    new ColorStop(factory.GetColor(0xFFE78D), .4f),
+                    new ColorStop(factory.GetColor(0xFFD748), .4f),
+                    new ColorStop(factory.GetColor(0xFFE793), 1f)
+                });
+            selColorTable.Border = new SolidBorder(factory.GetColor(0xDDCF9B), 1);
+            selColorTable.BorderCornerRadius = 2;
+            selColorTable.InnerBorder = new SolidBorder(factory.GetColor(192, 0xFFF2BE), 1);
+            //selColorTable = new SelectionColorTable();
+            //selColorTable.Fill = new GradientFill(factory.GetColor(0xF6FBFD), factory.GetColor(0xD5EFFC), 90);
+            //selColorTable.Border = new SolidBorder(factory.GetColor(0x99DEFD), 1);
+            //selColorTable.InnerBorder = new SolidBorder(factory.GetColor(192, 0xFFFFFF), 1);
+            treeSelection.HighlightCells = selColorTable;
+            // Cell selection inactive
+            selColorTable = new SelectionColorTable();
+            selColorTable.Fill = new GradientFill(factory.GetColor(0xFAFAFB), factory.GetColor(0xE5E5E5), 90);
+            selColorTable.Border = new SolidBorder(factory.GetColor(0xD9D9D9), 1);
+            selColorTable.BorderCornerRadius = 2;
+            selColorTable.InnerBorder = new SolidBorder(factory.GetColor(228, 0xFFFFFF), 1);
+            treeSelection.HighlightCellsInactive = selColorTable;
+
+            selColorTable = new SelectionColorTable();
+            selColorTable.Fill = new GradientFill(factory.GetColor(0xFAFAFB), factory.GetColor(0xE5E5E5), 90);
+            selColorTable.Border = new SolidBorder(factory.GetColor(0xD9D9D9), 1);
+            selColorTable.InnerBorder = new SolidBorder(factory.GetColor(228, 0xFFFFFF), 1);
+            treeSelection.NodeHotTracking = selColorTable;
+            #endregion
+
+            #region Expand Buttons
+            TreeExpandColorTable expand = new TreeExpandColorTable();
+            expand.CollapseBorder = new SolidBorder(factory.GetColor(0x000000), 1);
+            expand.CollapseFill = new SolidFill(factory.GetColor(0x595959));
+            expand.CollapseMouseOverBorder = new SolidBorder(factory.GetColor(0x1CC4F7), 1);
+            expand.CollapseMouseOverFill = new SolidFill(factory.GetColor(0x82DFFB));
+            expand.ExpandBorder = new SolidBorder(factory.GetColor(0x848484), 1);
+            expand.ExpandFill = new SolidFill(factory.GetColor(0xFFFFFF));
+            expand.ExpandMouseOverBorder = new SolidBorder(factory.GetColor(0x1CC4F7), 1);
+            expand.ExpandMouseOverFill = new SolidFill(factory.GetColor(0xCCEDFA));
+            ct.ExpandTriangle = expand;
+            // Rectangle
+            expand = new TreeExpandColorTable();
+            expand.CollapseForeground = new SolidFill(factory.GetColor(0x000000));
+            expand.CollapseBorder = new SolidBorder(factory.GetColor(0x969696), 1);
+            expand.CollapseFill = new GradientFill(new ColorStop[]{
+                new ColorStop(factory.GetColor(0xFFFFFF), 0f), new ColorStop(factory.GetColor(0xFFFFFF), .40f), new ColorStop(factory.GetColor(0xB6B6B6), 1f)}, 45);
+            expand.CollapseMouseOverForeground = expand.CollapseForeground;
+            expand.CollapseMouseOverBorder = expand.CollapseBorder;
+            expand.CollapseMouseOverFill = expand.CollapseFill;
+            expand.ExpandForeground = expand.CollapseForeground;
+            expand.ExpandBorder = expand.CollapseBorder;
+            expand.ExpandFill = expand.CollapseFill;
+            expand.ExpandMouseOverForeground = expand.CollapseForeground;
+            expand.ExpandMouseOverBorder = expand.CollapseBorder;
+            expand.ExpandMouseOverFill = expand.CollapseFill;
+            ct.ExpandRectangle = expand;
+            ct.ExpandEllipse = expand;
+            #endregion
+
+            #region Misc Tree Color
+            ct.GridLines = factory.GetColor(0xE1E1E1);
+            #endregion
+        }
+        #endregion
+
+        #region Office 2007 Silver
+        public static void InitOffice2007Silver(TreeColorTable ct, ColorFactory factory)
+        {
+            #region Tree Selection
+            TreeSelectionColors treeSelection = new TreeSelectionColors();
+            ct.Selection = treeSelection;
+            // Highlight full row
+            SelectionColorTable selColorTable = new SelectionColorTable();
+            selColorTable.Fill = new SolidFill(factory.GetColor(0xA7CDF0));
+            treeSelection.FullRowSelect = selColorTable;
+            //  Highlight full row Inactive
+            selColorTable = new SelectionColorTable();
+            selColorTable.Fill = new SolidFill(factory.GetColor(0xE5E5E5));
+            treeSelection.FullRowSelectInactive = selColorTable;
+
+            // Node Marker
+            selColorTable = new SelectionColorTable();
+            selColorTable.Fill = new SolidFill(factory.GetColor(64, 0x316AC5));
+            selColorTable.Border = new SolidBorder(factory.GetColor(96, 0x316AC5), 1);
+            treeSelection.NodeMarker = selColorTable;
+            // Node marker inactibe
+            selColorTable = new SelectionColorTable();
+            selColorTable.Fill = new SolidFill(factory.GetColor(64, 0xE5E5E5));
+            selColorTable.Border = new SolidBorder(factory.GetColor(96, 0x000000), 1);
+            treeSelection.NodeMarkerInactive = selColorTable;
+
+            // Cell selection
+            selColorTable = new SelectionColorTable();
+            selColorTable.Fill = new GradientFill(new ColorStop[] {
+                    new ColorStop(factory.GetColor(0xFFFCD9), 0f),
+                    new ColorStop(factory.GetColor(0xFFE78D), .4f),
+                    new ColorStop(factory.GetColor(0xFFD748), .4f),
+                    new ColorStop(factory.GetColor(0xFFE793), 1f)
+                });
+            selColorTable.Border = new SolidBorder(factory.GetColor(0xDDCF9B), 1);
+            selColorTable.BorderCornerRadius = 2;
+            selColorTable.InnerBorder = new SolidBorder(factory.GetColor(192, 0xFFF2BE), 1);
+            //selColorTable = new SelectionColorTable();
+            //selColorTable.Fill = new GradientFill(factory.GetColor(0xF6FBFD), factory.GetColor(0xD5EFFC), 90);
+            //selColorTable.Border = new SolidBorder(factory.GetColor(0x99DEFD), 1);
+            //selColorTable.InnerBorder = new SolidBorder(factory.GetColor(192, 0xFFFFFF), 1);
+            treeSelection.HighlightCells = selColorTable;
+            // Cell selection inactive
+            selColorTable = new SelectionColorTable();
+            selColorTable.Fill = new GradientFill(factory.GetColor(0xFAFAFB), factory.GetColor(0xE5E5E5), 90);
+            selColorTable.Border = new SolidBorder(factory.GetColor(0xD9D9D9), 1);
+            selColorTable.BorderCornerRadius = 2;
+            selColorTable.InnerBorder = new SolidBorder(factory.GetColor(228, 0xFFFFFF), 1);
+            treeSelection.HighlightCellsInactive = selColorTable;
+
+            selColorTable = new SelectionColorTable();
+            selColorTable.Fill = new GradientFill(factory.GetColor(0xFAFAFB), factory.GetColor(0xE5E5E5), 90);
+            selColorTable.Border = new SolidBorder(factory.GetColor(0xD9D9D9), 1);
+            selColorTable.InnerBorder = new SolidBorder(factory.GetColor(228, 0xFFFFFF), 1);
+            treeSelection.NodeHotTracking = selColorTable;
+            #endregion
+
+            #region Expand Buttons
+            TreeExpandColorTable expand = new TreeExpandColorTable();
+            expand.CollapseBorder = new SolidBorder(factory.GetColor(0x000000), 1);
+            expand.CollapseFill = new SolidFill(factory.GetColor(0x595959));
+            expand.CollapseMouseOverBorder = new SolidBorder(factory.GetColor(0x1CC4F7), 1);
+            expand.CollapseMouseOverFill = new SolidFill(factory.GetColor(0x82DFFB));
+            expand.ExpandBorder = new SolidBorder(factory.GetColor(0x848484), 1);
+            expand.ExpandFill = new SolidFill(factory.GetColor(0xFFFFFF));
+            expand.ExpandMouseOverBorder = new SolidBorder(factory.GetColor(0x1CC4F7), 1);
+            expand.ExpandMouseOverFill = new SolidFill(factory.GetColor(0xCCEDFA));
+            ct.ExpandTriangle = expand;
+            // Rectangle
+            expand = new TreeExpandColorTable();
+            expand.CollapseForeground = new SolidFill(factory.GetColor(0x000000));
+            expand.CollapseBorder = new SolidBorder(factory.GetColor(0x969696), 1);
+            expand.CollapseFill = new GradientFill(new ColorStop[]{
+                new ColorStop(factory.GetColor(0xFFFFFF), 0f), new ColorStop(factory.GetColor(0xFFFFFF), .40f), new ColorStop(factory.GetColor(0xB6B6B6), 1f)}, 45);
+            expand.CollapseMouseOverForeground = expand.CollapseForeground;
+            expand.CollapseMouseOverBorder = expand.CollapseBorder;
+            expand.CollapseMouseOverFill = expand.CollapseFill;
+            expand.ExpandForeground = expand.CollapseForeground;
+            expand.ExpandBorder = expand.CollapseBorder;
+            expand.ExpandFill = expand.CollapseFill;
+            expand.ExpandMouseOverForeground = expand.CollapseForeground;
+            expand.ExpandMouseOverBorder = expand.CollapseBorder;
+            expand.ExpandMouseOverFill = expand.CollapseFill;
+            ct.ExpandRectangle = expand;
+            ct.ExpandEllipse = expand;
+            #endregion
+
+            #region Misc Tree Color
+            ct.GridLines = factory.GetColor(0xE1E1E1);
+            #endregion
+        }
+        #endregion
+
+        #region Office 2007 Black
+        public static void InitOffice2007Black(TreeColorTable ct, ColorFactory factory)
+        {
+            #region Tree Selection
+            TreeSelectionColors treeSelection = new TreeSelectionColors();
+            ct.Selection = treeSelection;
+            // Highlight full row
+            SelectionColorTable selColorTable = new SelectionColorTable();
+            selColorTable.Fill = new SolidFill(factory.GetColor(0xA7CDF0));
+            treeSelection.FullRowSelect = selColorTable;
+            //  Highlight full row Inactive
+            selColorTable = new SelectionColorTable();
+            selColorTable.Fill = new SolidFill(factory.GetColor(0xE5E5E5));
+            treeSelection.FullRowSelectInactive = selColorTable;
+
+            // Node Marker
+            selColorTable = new SelectionColorTable();
+            selColorTable.Fill = new SolidFill(factory.GetColor(64, 0x316AC5));
+            selColorTable.Border = new SolidBorder(factory.GetColor(96, 0x316AC5), 1);
+            treeSelection.NodeMarker = selColorTable;
+            // Node marker inactibe
+            selColorTable = new SelectionColorTable();
+            selColorTable.Fill = new SolidFill(factory.GetColor(64, 0xE5E5E5));
+            selColorTable.Border = new SolidBorder(factory.GetColor(96, 0x000000), 1);
+            treeSelection.NodeMarkerInactive = selColorTable;
+
+            // Cell selection
+            selColorTable = new SelectionColorTable();
+            selColorTable.Fill = new GradientFill(new ColorStop[] {
+                    new ColorStop(factory.GetColor(0xFFFCD9), 0f),
+                    new ColorStop(factory.GetColor(0xFFE78D), .4f),
+                    new ColorStop(factory.GetColor(0xFFD748), .4f),
+                    new ColorStop(factory.GetColor(0xFFE793), 1f)
+                });
+            selColorTable.Border = new SolidBorder(factory.GetColor(0xDDCF9B), 1);
+            selColorTable.BorderCornerRadius = 2;
+            selColorTable.InnerBorder = new SolidBorder(factory.GetColor(192, 0xFFF2BE), 1);
+            //selColorTable = new SelectionColorTable();
+            //selColorTable.Fill = new GradientFill(factory.GetColor(0xF6FBFD), factory.GetColor(0xD5EFFC), 90);
+            //selColorTable.Border = new SolidBorder(factory.GetColor(0x99DEFD), 1);
+            //selColorTable.InnerBorder = new SolidBorder(factory.GetColor(192, 0xFFFFFF), 1);
+            treeSelection.HighlightCells = selColorTable;
+            // Cell selection inactive
+            selColorTable = new SelectionColorTable();
+            selColorTable.Fill = new GradientFill(factory.GetColor(0xFAFAFB), factory.GetColor(0xE5E5E5), 90);
+            selColorTable.Border = new SolidBorder(factory.GetColor(0xD9D9D9), 1);
+            selColorTable.BorderCornerRadius = 2;
+            selColorTable.InnerBorder = new SolidBorder(factory.GetColor(228, 0xFFFFFF), 1);
+            treeSelection.HighlightCellsInactive = selColorTable;
+
+            selColorTable = new SelectionColorTable();
+            selColorTable.Fill = new GradientFill(factory.GetColor(0xFAFAFB), factory.GetColor(0xE5E5E5), 90);
+            selColorTable.Border = new SolidBorder(factory.GetColor(0xD9D9D9), 1);
+            selColorTable.InnerBorder = new SolidBorder(factory.GetColor(228, 0xFFFFFF), 1);
+            treeSelection.NodeHotTracking = selColorTable;
+            #endregion
+
+            #region Expand Buttons
+            TreeExpandColorTable expand = new TreeExpandColorTable();
+            expand.CollapseBorder = new SolidBorder(factory.GetColor(0x000000), 1);
+            expand.CollapseFill = new SolidFill(factory.GetColor(0x595959));
+            expand.CollapseMouseOverBorder = new SolidBorder(factory.GetColor(0x1CC4F7), 1);
+            expand.CollapseMouseOverFill = new SolidFill(factory.GetColor(0x82DFFB));
+            expand.ExpandBorder = new SolidBorder(factory.GetColor(0x848484), 1);
+            expand.ExpandFill = new SolidFill(factory.GetColor(0xFFFFFF));
+            expand.ExpandMouseOverBorder = new SolidBorder(factory.GetColor(0x1CC4F7), 1);
+            expand.ExpandMouseOverFill = new SolidFill(factory.GetColor(0xCCEDFA));
+            ct.ExpandTriangle = expand;
+            // Rectangle
+            expand = new TreeExpandColorTable();
+            expand.CollapseForeground = new SolidFill(factory.GetColor(0x000000));
+            expand.CollapseBorder = new SolidBorder(factory.GetColor(0x969696), 1);
+            expand.CollapseFill = new GradientFill(new ColorStop[]{
+                new ColorStop(factory.GetColor(0xFFFFFF), 0f), new ColorStop(factory.GetColor(0xFFFFFF), .40f), new ColorStop(factory.GetColor(0xB6B6B6), 1f)}, 45);
+            expand.CollapseMouseOverForeground = expand.CollapseForeground;
+            expand.CollapseMouseOverBorder = expand.CollapseBorder;
+            expand.CollapseMouseOverFill = expand.CollapseFill;
+            expand.ExpandForeground = expand.CollapseForeground;
+            expand.ExpandBorder = expand.CollapseBorder;
+            expand.ExpandFill = expand.CollapseFill;
+            expand.ExpandMouseOverForeground = expand.CollapseForeground;
+            expand.ExpandMouseOverBorder = expand.CollapseBorder;
+            expand.ExpandMouseOverFill = expand.CollapseFill;
+            ct.ExpandRectangle = expand;
+            ct.ExpandEllipse = expand;
+            #endregion
+
+            #region Misc Tree Color
+            ct.GridLines = factory.GetColor(0xE1E1E1);
+            #endregion
+        }
+        #endregion
+
+        #region Office 2007 Vista Glass
+        public static void InitOffice2007VistaGlass(TreeColorTable ct, ColorFactory factory)
+        {
+            #region Tree Selection
+            TreeSelectionColors treeSelection = new TreeSelectionColors();
+            ct.Selection = treeSelection;
+            // Highlight full row
+            SelectionColorTable selColorTable = new SelectionColorTable();
+            selColorTable.Fill = new SolidFill(factory.GetColor(0xC4E8FA));
+            treeSelection.FullRowSelect = selColorTable;
+            //  Highlight full row Inactive
+            selColorTable = new SelectionColorTable();
+            selColorTable.Fill = new SolidFill(factory.GetColor(0xE5E5E5));
+            treeSelection.FullRowSelectInactive = selColorTable;
+
+            // Node Marker
+            selColorTable = new SelectionColorTable();
+            selColorTable.Fill = new SolidFill(factory.GetColor(64, 0x316AC5));
+            selColorTable.Border = new SolidBorder(factory.GetColor(96, 0x316AC5), 1);
+            treeSelection.NodeMarker = selColorTable;
+            // Node marker inactive
+            selColorTable = new SelectionColorTable();
+            selColorTable.Fill = new SolidFill(factory.GetColor(64, 0xE5E5E5));
+            selColorTable.Border = new SolidBorder(factory.GetColor(96, 0x000000), 1);
+            treeSelection.NodeMarkerInactive = selColorTable;
+
+            // Cell selection
+            selColorTable = new SelectionColorTable();
+            selColorTable.Fill = new GradientFill(new ColorStop[] {
+                    new ColorStop(factory.GetColor(0xF1F8FD), 0f),
+                    new ColorStop(factory.GetColor(0xD5EFFC), 1f)
+                });
+            selColorTable.Border = new SolidBorder(factory.GetColor(0x99DEFD), 1);
+            selColorTable.BorderCornerRadius = 2;
+            selColorTable.InnerBorder = new SolidBorder(factory.GetColor(192, 0xF6FBFD), 1);
+            //selColorTable = new SelectionColorTable();
+            //selColorTable.Fill = new GradientFill(factory.GetColor(0xF6FBFD), factory.GetColor(0xD5EFFC), 90);
+            //selColorTable.Border = new SolidBorder(factory.GetColor(0x99DEFD), 1);
+            //selColorTable.InnerBorder = new SolidBorder(factory.GetColor(192, 0xFFFFFF), 1);
+            treeSelection.HighlightCells = selColorTable;
+            // Cell selection inactive
+            selColorTable = new SelectionColorTable();
+            selColorTable.Fill = new GradientFill(factory.GetColor(0xF8F8F8), factory.GetColor(0xE5E5E5), 90);
+            selColorTable.Border = new SolidBorder(factory.GetColor(0xD9D9D9), 1);
+            selColorTable.BorderCornerRadius = 2;
+            selColorTable.InnerBorder = new SolidBorder(factory.GetColor(228, 0xFAFAFB), 1);
+            treeSelection.HighlightCellsInactive = selColorTable;
+
+            selColorTable = new SelectionColorTable();
+            selColorTable.Fill = new GradientFill(factory.GetColor(0xF5FAFD), factory.GetColor(0xE8F5FD), 90);
+            selColorTable.Border = new SolidBorder(factory.GetColor(0xD8F0FA), 1);
+            selColorTable.InnerBorder = new SolidBorder(factory.GetColor(228, 0xF8FCFE), 1);
+            treeSelection.NodeHotTracking = selColorTable;
+            #endregion
+
+            #region Expand Buttons
+            TreeExpandColorTable expand = new TreeExpandColorTable();
+            expand.CollapseBorder = new SolidBorder(factory.GetColor(0x000000), 1);
+            expand.CollapseFill = new SolidFill(factory.GetColor(0x595959));
+            expand.CollapseMouseOverBorder = new SolidBorder(factory.GetColor(0x1CC4F7), 1);
+            expand.CollapseMouseOverFill = new SolidFill(factory.GetColor(0x82DFFB));
+            expand.ExpandBorder = new SolidBorder(factory.GetColor(0x848484), 1);
+            expand.ExpandFill = new SolidFill(factory.GetColor(0xFFFFFF));
+            expand.ExpandMouseOverBorder = new SolidBorder(factory.GetColor(0x1CC4F7), 1);
+            expand.ExpandMouseOverFill = new SolidFill(factory.GetColor(0xCCEDFA));
+            ct.ExpandTriangle = expand;
+            // Rectangle
+            expand = new TreeExpandColorTable();
+            expand.CollapseForeground = new SolidFill(factory.GetColor(0x000000));
+            expand.CollapseBorder = new SolidBorder(factory.GetColor(0x969696), 1);
+            expand.CollapseFill = new GradientFill(new ColorStop[]{
+                new ColorStop(factory.GetColor(0xFFFFFF), 0f), new ColorStop(factory.GetColor(0xFFFFFF), .40f), new ColorStop(factory.GetColor(0xB6B6B6), 1f)}, 45);
+            expand.CollapseMouseOverForeground = expand.CollapseForeground;
+            expand.CollapseMouseOverBorder = expand.CollapseBorder;
+            expand.CollapseMouseOverFill = expand.CollapseFill;
+            expand.ExpandForeground = expand.CollapseForeground;
+            expand.ExpandBorder = expand.CollapseBorder;
+            expand.ExpandFill = expand.CollapseFill;
+            expand.ExpandMouseOverForeground = expand.CollapseForeground;
+            expand.ExpandMouseOverBorder = expand.CollapseBorder;
+            expand.ExpandMouseOverFill = expand.CollapseFill;
+            ct.ExpandRectangle = expand;
+            ct.ExpandEllipse = expand;
+            #endregion
+
+            #region Misc Tree Color
+            ct.GridLines = factory.GetColor(0xEDEDED);
+            #endregion
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/Display/ColumnHeaderDisplay.cs b/PROMS/DotNetBar Source Code/AdvTree/Display/ColumnHeaderDisplay.cs
new file mode 100644
index 00000000..13dc9d8c
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/Display/ColumnHeaderDisplay.cs	
@@ -0,0 +1,119 @@
+using System;
+using System.Text;
+using DevComponents.DotNetBar;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+
+namespace DevComponents.AdvTree.Display
+{
+    internal class ColumnHeaderDisplay
+    {
+        internal void DrawColumnHeader(ColumnHeaderRendererEventArgs e, ElementStyleDisplayInfo di)
+        {
+            // Adjust the header bounds so the header is filled completely
+            if (e.Tree != null && e.Tree.CellHorizontalSpacing > 0 && !e.ColumnHeader.IsFirstVisible) {
+                Rectangle ob = di.Bounds;
+                di.Bounds = new Rectangle(ob.X - e.Tree.CellHorizontalSpacing, ob.Y, ob.Width + e.Tree.CellHorizontalSpacing, ob.Height);
+                ElementStyleDisplay.Paint(di);
+                di.Bounds = ob;
+            }
+            else
+                ElementStyleDisplay.Paint(di);
+            di.Bounds.Inflate(-1, -1);
+            if (di.Bounds.Width > 1 && di.Bounds.Height > 1)
+            {
+                if (e.ColumnHeader.IsFirstVisible)
+                {
+                    Rectangle r = di.Bounds;
+                    r.Width -= 3;
+                    r.X += 3;
+                    di.Bounds = r;
+                }
+
+                if (e.ColumnHeader.SortDirection != eSortDirection.None && !e.SortIndicatorColor.IsEmpty)
+                {
+                    using (GraphicsPath sortShapePath = UIGraphics.GetTrianglePath(
+                        new Point(di.Bounds.Right - 11, di.Bounds.Y + (di.Bounds.Height - 5) / 2), 9, 
+                        (e.ColumnHeader.SortDirection == eSortDirection.Ascending ? eTriangleDirection.Top : eTriangleDirection.Bottom)))
+                    {
+                        SmoothingMode sm = e.Graphics.SmoothingMode;
+                        e.Graphics.SmoothingMode = SmoothingMode.Default;
+                        using (SolidBrush brush = new SolidBrush(e.SortIndicatorColor))
+                            e.Graphics.FillPath(brush, sortShapePath);
+                        e.Graphics.SmoothingMode = sm;
+                    }
+                    di.Bounds.Width -= 12;
+                }
+
+                if (e.ColumnHeader.Image != null)
+                {
+                    Image image = e.ColumnHeader.Image;
+                    Rectangle r = di.Bounds;
+                    if (e.ColumnHeader.ImageAlignment == eColumnImageAlignment.Left)
+                    {
+                        e.Graphics.DrawImage(image, r.X,
+                                              r.Y + (r.Height - image.Height) / 2, image.Width, image.Height);
+                        r.X += image.Width + 2;
+                        r.Width -= image.Width + 2;
+
+                    }
+                    else if (e.ColumnHeader.ImageAlignment == eColumnImageAlignment.Right)
+                    {
+                        e.Graphics.DrawImage(image, r.Right - image.Width,
+                                              r.Y + (r.Height - image.Height) / 2, image.Width, image.Height);
+                        r.Width -= image.Width + 2;
+                    }
+                    di.Bounds = r;
+                }
+
+                ElementStyleDisplay.PaintText(di, e.ColumnHeader.Text, e.Tree.Font);
+            }
+        }
+
+        internal static void PaintColumnMoveMarker(Graphics g, AdvTree tree, int columnMoveMarkerIndex, ColumnHeaderCollection columns)
+        {
+            if (columnMoveMarkerIndex == -1) throw new ArgumentException("columnMoveMarkerIndex must be grater or equal than 0");
+            if (columns == null) throw new ArgumentNullException("columns");
+
+            Color lineColor = ColorScheme.GetColor("834DD5");
+            Color fillColor = ColorScheme.GetColor("CCCFF8");
+            Size markerSize = new Size(10, 14);
+
+            ColumnHeader header = null;
+
+            if (columnMoveMarkerIndex == columns.Count)
+                header = columns.LastVisibleColumn;
+            else
+                header = columns[columnMoveMarkerIndex];
+            Rectangle markerBounds = Rectangle.Empty;
+            if (columnMoveMarkerIndex == columns.Count)
+                markerBounds = new Rectangle(header.Bounds.Right - markerSize.Width, header.Bounds.Bottom - markerSize.Height, markerSize.Width, markerSize.Height);
+            else if (columns[columnMoveMarkerIndex] == columns.FirstVisibleColumn)
+                markerBounds = new Rectangle(header.Bounds.X, header.Bounds.Bottom - markerSize.Height, markerSize.Width, markerSize.Height);
+            else
+                markerBounds = new Rectangle(header.Bounds.X - markerSize.Width / 2 - tree.NodeLayout.GetCellLayout().LayoutSettings.CellHorizontalSpacing, header.Bounds.Bottom - markerSize.Height, markerSize.Width, markerSize.Height);
+            if (tree.AutoScrollPosition.X != 0)
+                markerBounds.Offset(tree.AutoScrollPosition.X, 0);
+            using (GraphicsPath path = CreateMarker(markerBounds))
+            {
+                using (SolidBrush brush = new SolidBrush(fillColor))
+                    g.FillPath(brush, path);
+                using (Pen pen = new Pen(lineColor, 1))
+                    g.DrawPath(pen, path);
+            }
+        }
+        private static GraphicsPath CreateMarker(Rectangle markerBounds)
+        {
+            markerBounds.Height--;
+            GraphicsPath path = new GraphicsPath();
+            path.AddLine(markerBounds.X + markerBounds.Width / 2, markerBounds.Bottom, markerBounds.X, markerBounds.Bottom - markerBounds.Width / 2);
+            path.AddLine(markerBounds.X, markerBounds.Bottom - markerBounds.Width / 2, markerBounds.X + markerBounds.Width / 3, markerBounds.Bottom - markerBounds.Width / 2);
+            path.AddLine(markerBounds.X + markerBounds.Width / 3, markerBounds.Bottom - markerBounds.Width / 2, markerBounds.X + markerBounds.Width / 3, markerBounds.Y);
+            path.AddLine(markerBounds.X + markerBounds.Width / 3, markerBounds.Y, markerBounds.Right - markerBounds.Width / 3, markerBounds.Y);
+            path.AddLine(markerBounds.Right - markerBounds.Width / 3, markerBounds.Y, markerBounds.Right - markerBounds.Width / 3, markerBounds.Bottom - markerBounds.Width / 2);
+            path.AddLine(markerBounds.Right - markerBounds.Width / 3, markerBounds.Bottom - markerBounds.Width / 2, markerBounds.Right, markerBounds.Bottom - markerBounds.Width / 2);
+            path.CloseAllFigures();
+            return path;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/Display/ColumnHeaderRendererEventArgs.cs b/PROMS/DotNetBar Source Code/AdvTree/Display/ColumnHeaderRendererEventArgs.cs
new file mode 100644
index 00000000..06765d91
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/Display/ColumnHeaderRendererEventArgs.cs	
@@ -0,0 +1,61 @@
+using System;
+using System.Text;
+using System.Drawing;
+using DevComponents.DotNetBar;
+
+namespace DevComponents.AdvTree.Display
+{
+    /// <summary>
+    /// Provides data for RenderColumnHeader event.
+    /// </summary>
+    public class ColumnHeaderRendererEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets the column header that is rendered.
+        /// </summary>
+        public ColumnHeader ColumnHeader = null;
+        /// <summary>
+        /// Target Graphics canvas.
+        /// </summary>
+        public Graphics Graphics;
+        /// <summary>
+        /// Gets the bounds of the column header.
+        /// </summary>
+        public Rectangle Bounds;
+        /// <summary>
+        /// Gets the effective style for the column.
+        /// </summary>
+        public ElementStyle Style = null;
+        /// <summary>
+        /// Gets the AdvTree control header is rendered for.
+        /// </summary>
+        public AdvTree Tree = null;
+        /// <summary>
+        /// Gets or sets the color of the column sort indicator.
+        /// </summary>
+        public Color SortIndicatorColor = Color.Empty;
+
+        /// <summary>
+        /// Initializes a new instance of the ColumnHeaderRendererEventArgs class.
+        /// </summary>
+        public ColumnHeaderRendererEventArgs()
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the ColumnHeaderRendererEventArgs class.
+        /// </summary>
+        /// <param name="columnHeader"></param>
+        /// <param name="graphics"></param>
+        /// <param name="bounds"></param>
+        /// <param name="style"></param>
+        public ColumnHeaderRendererEventArgs(AdvTree tree, ColumnHeader columnHeader, Graphics graphics, Rectangle bounds, ElementStyle style)
+        {
+            Tree = tree;
+            ColumnHeader = columnHeader;
+            Graphics = graphics;
+            Bounds = bounds;
+            Style = style;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/Display/ConnectorRendererEventArgs.cs b/PROMS/DotNetBar Source Code/AdvTree/Display/ConnectorRendererEventArgs.cs
new file mode 100644
index 00000000..599bad6d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/Display/ConnectorRendererEventArgs.cs	
@@ -0,0 +1,53 @@
+using System;
+using System.Drawing;
+using DevComponents.DotNetBar;
+
+namespace DevComponents.AdvTree.Display
+{
+	/// <summary>
+	/// Represents helper class for node connector display.
+	/// </summary>
+	public class ConnectorRendererEventArgs:EventArgs
+	{
+		/// <summary>
+		/// From node reference.
+		/// </summary>
+		public Node FromNode=null;
+		/// <summary>
+		/// From node style reference.
+		/// </summary>
+		public ElementStyle StyleFromNode=null;
+		/// <summary>
+		/// To node reference.
+		/// </summary>
+		public Node ToNode=null;
+		/// <summary>
+		/// To node style reference.
+		/// </summary>
+		public ElementStyle StyleToNode=null;
+		/// <summary>
+		/// Graphics object used for drawing.
+		/// </summary>
+		public System.Drawing.Graphics Graphics=null;
+		/// <summary>
+		/// Node offset since some node coordinates are relative.
+		/// </summary>
+		public Point Offset=Point.Empty;
+		/// <summary>
+		/// Indicates whether from node is a root node.
+		/// </summary>
+		public bool IsRootNode=false;
+		/// <summary>
+		/// Reference to node connector object that describes connector type.
+		/// </summary>
+		public NodeConnector NodeConnector=null;
+		/// <summary>
+		/// Gets or sets whether connector is link connector.
+		/// </summary>
+		public bool LinkConnector=false;
+		/// <summary>
+		/// Reference to the collection of the connector path points. Default value is null indicating there are no path points.
+		/// </summary>
+		public ConnectorPointsCollection ConnectorPoints=null;
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/Display/DragDropMarkerDisplay.cs b/PROMS/DotNetBar Source Code/AdvTree/Display/DragDropMarkerDisplay.cs
new file mode 100644
index 00000000..c4dca5a4
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/Display/DragDropMarkerDisplay.cs	
@@ -0,0 +1,78 @@
+using System;
+using System.Text;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+
+namespace DevComponents.AdvTree.Display
+{
+    internal class DragDropMarkerDisplay
+    {
+        public void DrawMarker(DragDropMarkerRendererEventArgs e)
+        {
+            Graphics g = e.Graphics;
+            Rectangle bounds = e.Bounds;
+            if (bounds.IsEmpty || _MarkerColor.IsEmpty) return;
+
+            if (bounds.Width == AdvTree.DragInsertMarkSize) // Vertical insert mark
+            {
+                using (SolidBrush brush = new SolidBrush(_MarkerColor))
+                {
+                    using (Pen pen = new Pen(brush, 1))
+                    {
+                        Point p = new Point(bounds.X + 4, bounds.Y);
+                        g.DrawLine(pen, p.X, p.Y, p.X, bounds.Bottom - 1);
+                    }
+
+                    using (GraphicsPath path = new GraphicsPath())
+                    {
+                        path.AddLine(bounds.X, bounds.Y, bounds.X + 8, bounds.Y );
+                        path.AddLine(bounds.X + 8, bounds.Y, bounds.X + 4, bounds.Y + 4);
+                        path.CloseAllFigures();
+                        g.FillPath(brush, path);
+                    }
+                    using (GraphicsPath path = new GraphicsPath())
+                    {
+                        path.AddLine(bounds.X, bounds.Bottom, bounds.X + 8, bounds.Bottom);
+                        path.AddLine(bounds.X + 8, bounds.Bottom, bounds.X + 4, bounds.Bottom - 4);
+                        path.CloseAllFigures();
+                        g.FillPath(brush, path);
+                    }
+                }
+            }
+            else
+            {
+                // Horizontal insert mark
+                using (SolidBrush brush = new SolidBrush(_MarkerColor))
+                {
+                    using (Pen pen = new Pen(brush, 1))
+                    {
+                        Point p = new Point(bounds.X, bounds.Y + 4);
+                        g.DrawLine(pen, p.X, p.Y, bounds.Right - 1, p.Y);
+                    }
+
+                    using (GraphicsPath path = new GraphicsPath())
+                    {
+                        path.AddLine(bounds.X, bounds.Y, bounds.X, bounds.Y + 8);
+                        path.AddLine(bounds.X, bounds.Y + 8, bounds.X + 4, bounds.Y + 4);
+                        path.CloseAllFigures();
+                        g.FillPath(brush, path);
+                    }
+                    using (GraphicsPath path = new GraphicsPath())
+                    {
+                        path.AddLine(bounds.Right, bounds.Y, bounds.Right, bounds.Y + 8);
+                        path.AddLine(bounds.Right, bounds.Y + 8, bounds.Right - 4, bounds.Y + 4);
+                        path.CloseAllFigures();
+                        g.FillPath(brush, path);
+                    }
+                }
+            }
+        }
+
+        private Color _MarkerColor;
+        public Color MarkerColor
+        {
+            get { return _MarkerColor; }
+            set { _MarkerColor = value; }
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/Display/DragDropMarkerRendererEventArgs.cs b/PROMS/DotNetBar Source Code/AdvTree/Display/DragDropMarkerRendererEventArgs.cs
new file mode 100644
index 00000000..a2cfecb5
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/Display/DragDropMarkerRendererEventArgs.cs	
@@ -0,0 +1,39 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.AdvTree.Display
+{
+    /// <summary>
+    /// Provides data for the NodeRenderer.RenderDragDropMarker event.
+    /// </summary>
+    public class DragDropMarkerRendererEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets or sets reference to Graphics object, canvas node is rendered on.
+        /// </summary>
+        public System.Drawing.Graphics Graphics = null;
+        /// <summary>
+        /// Gets or sets the selection bounds.
+        /// </summary>
+        public Rectangle Bounds = Rectangle.Empty;
+
+        /// <summary>
+        /// Initializes a new instance of the DragDropMarkerRendererEventArgs class.
+        /// </summary>
+        public DragDropMarkerRendererEventArgs()
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the DragDropMarkerRendererEventArgs class.
+        /// </summary>
+        /// <param name="graphics"></param>
+        /// <param name="bounds"></param>
+        public DragDropMarkerRendererEventArgs(System.Drawing.Graphics graphics, Rectangle bounds)
+        {
+            Graphics = graphics;
+            Bounds = bounds;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/Display/LineConnectorDisplay.cs b/PROMS/DotNetBar Source Code/AdvTree/Display/LineConnectorDisplay.cs
new file mode 100644
index 00000000..45651c23
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/Display/LineConnectorDisplay.cs	
@@ -0,0 +1,52 @@
+using System;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using DevComponents.AdvTree.Display;
+
+namespace DevComponents.AdvTree.Display
+{
+	/// <summary>
+	/// Represents the line connector display class.
+	/// </summary>
+	public class LineConnectorDisplay:NodeConnectorDisplay
+	{
+		/// <summary>
+		/// Draws connector line between two nodes.
+		/// </summary>
+		/// <param name="info">Connector context information.</param>
+		public override void DrawConnector(ConnectorRendererEventArgs info)
+		{
+			if(info.NodeConnector.LineColor.IsEmpty || info.NodeConnector.LineWidth<=0)
+				return;
+
+            Point pStart, pEnd;
+
+            // FromNode is null when connector is rendered for the child node
+            if (info.FromNode == null)
+            {
+                Rectangle cellBounds = NodeDisplay.GetNodeRectangle(eNodeRectanglePart.NodeContentBounds, info.ToNode, info.Offset);
+                Rectangle expandBounds = NodeDisplay.GetNodeRectangle(eNodeRectanglePart.ExpandBounds, info.ToNode, info.Offset);
+                pStart = new Point(cellBounds.X - 4, cellBounds.Y + cellBounds.Height / 2);
+                pEnd = new Point(expandBounds.X + expandBounds.Width / 2, pStart.Y);
+            }
+            else
+            {
+                // FromNode is parent node, ToNode is last visible child node. Connector is vertical line from parent to last visible child
+                Rectangle cellBounds = NodeDisplay.GetNodeRectangle(eNodeRectanglePart.NodeContentBounds, info.FromNode, info.Offset);
+                Rectangle expandBounds = NodeDisplay.GetNodeRectangle(eNodeRectanglePart.ExpandBounds, info.ToNode, info.Offset);
+                pStart = new Point(expandBounds.X + expandBounds.Width / 2, cellBounds.Bottom);
+                pEnd = new Point(pStart.X, expandBounds.Y + expandBounds.Height / 2);
+            }
+
+            Graphics g = info.Graphics;
+            using (Pen pen = GetLinePen(info))
+            {
+                SmoothingMode sm = g.SmoothingMode;
+                if (pen.DashStyle != DashStyle.Solid)
+                    g.SmoothingMode = SmoothingMode.Default;
+                g.DrawLine(pen, pStart, pEnd);
+                g.SmoothingMode = sm;
+            }
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/Display/NodeCellRendererEventArgs.cs b/PROMS/DotNetBar Source Code/AdvTree/Display/NodeCellRendererEventArgs.cs
new file mode 100644
index 00000000..62ca06b0
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/Display/NodeCellRendererEventArgs.cs	
@@ -0,0 +1,59 @@
+using System;
+using System.Drawing;
+using DevComponents.DotNetBar;
+
+namespace DevComponents.AdvTree.Display
+{
+	/// <summary>
+	/// Provides information for cell rendering methods and events.
+	/// </summary>
+	public class NodeCellRendererEventArgs:NodeRendererEventArgs
+	{
+		/// <summary>
+		/// Gets or sets the cell being rendered.
+		/// </summary>
+		public Cell Cell=null;
+		
+		/// <summary>
+		/// Gets or sets absolute cell bounds.
+		/// </summary>
+		public Rectangle CellBounds=Rectangle.Empty;
+		
+		/// <summary>
+		/// Gets or sets the internal cell offset.
+		/// </summary>
+		internal Point CellOffset=Point.Empty;
+
+        /// <summary>
+        /// Gets or sets the color scheme.
+        /// </summary>
+        internal ColorScheme ColorScheme = null;
+
+        internal Image CheckBoxImageChecked = null;
+        internal Image CheckBoxImageUnChecked = null;
+        internal Image CheckBoxImageIndeterminate = null;
+        internal ItemPaintArgs ItemPaintArgs = null;
+
+		/// <summary>
+		/// Creates new instance of the class.
+		/// </summary>
+		public NodeCellRendererEventArgs():base(null,null,Rectangle.Empty,null)
+		{
+		}
+		
+		/// <summary>
+		/// Creates new instance of the class and initializes it with default values.
+		/// </summary>
+		/// <param name="g">Reference to graphics object.</param>
+		/// <param name="node">Reference to context node.</param>
+		/// <param name="bounds">Reference to node bounds</param>
+		/// <param name="style">Reference to cell style</param>
+		/// <param name="cell">Reference to cell</param>
+		/// <param name="cellBounds">Reference to cell bounds</param>
+		public NodeCellRendererEventArgs(Graphics g, Node node, Rectangle bounds, ElementStyle style, Cell cell, Rectangle cellBounds):base(g,node,bounds,style)
+		{
+			this.Cell = cell;
+			this.CellBounds = cellBounds;
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/Display/NodeConnectorDisplay.cs b/PROMS/DotNetBar Source Code/AdvTree/Display/NodeConnectorDisplay.cs
new file mode 100644
index 00000000..63231b26
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/Display/NodeConnectorDisplay.cs	
@@ -0,0 +1,511 @@
+using System;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+
+namespace DevComponents.AdvTree
+{
+	namespace Display
+	{
+		/// <summary>
+		/// Base class for drawing node connectors.
+		/// </summary>
+		public abstract class NodeConnectorDisplay
+		{
+			//private bool m_RootNode=false;
+			//private bool m_DrawRootAllLevels=false;
+			//private bool m_EndCap=true;
+			//private bool m_DrawConnectorUnderNodes=true;
+
+			/// <summary>
+			/// Creates new instance of the object.
+			/// </summary>
+			public NodeConnectorDisplay()
+			{
+			}
+
+			/// <summary>
+			/// Draws connector line between two nodes.
+			/// </summary>
+			/// <param name="info">Connector context information.</param>
+			public virtual void DrawConnector(ConnectorRendererEventArgs info){}
+
+            ///// <summary>
+            ///// Returns the connector starting coordinates.
+            ///// </summary>
+            ///// <param name="info">Connector display information.</param>
+            ///// <returns>Point object.</returns>
+            //protected virtual Point GetStartPoint(ConnectorRendererEventArgs info)
+            //{
+            //    Point p=Point.Empty;
+
+            //    if(info.IsRootNode)
+            //    {
+            //        //int toMidPoint=info.ToNode.Bounds.Top+info.ToNode.Bounds.Height/2;
+            //        //if(info.FromNode.Bounds.Top>toMidPoint)
+            //        if(IsAbove(info.FromNode,info.ToNode))
+            //            p=new Point(info.FromNode.BoundsRelative.Left+info.FromNode.BoundsRelative.Width/2,info.FromNode.BoundsRelative.Top);
+            //            //else if(info.FromNode.Bounds.Bottom<toMidPoint)
+            //        else if(IsBelow(info.FromNode,info.ToNode))
+            //            p=new Point(info.FromNode.BoundsRelative.Left+info.FromNode.BoundsRelative.Width/2,info.FromNode.BoundsRelative.Bottom-1);
+            //    }
+
+            //    if(p.IsEmpty)
+            //    {
+            //        // To element to the Left
+            //        if(this.IsOnLeftSide(info.FromNode,info.ToNode))
+            //            p=new Point(info.FromNode.BoundsRelative.Left,info.FromNode.BoundsRelative.Top+info.FromNode.BoundsRelative.Height/2);
+            //        else
+            //        {
+            //            p=new Point(info.FromNode.BoundsRelative.Right,info.FromNode.BoundsRelative.Top+info.FromNode.BoundsRelative.Height/2);
+            //            if(info.IsRootNode)
+            //                p.X--;
+            //            if(!NodeDisplay.DrawExpandPart(info.FromNode) && info.FromNode.ExpandVisibility==eNodeExpandVisibility.Auto)
+            //                p.X-=(info.FromNode.BoundsRelative.Width-info.FromNode.ContentBounds.Width);
+            //        }
+            //    }
+
+            //    if(!p.IsEmpty)
+            //        p.Offset(info.Offset.X,info.Offset.Y);
+
+            //    return p;
+            //}
+
+            ///// <summary>
+            ///// Returns true if fromNode is above the toNode.
+            ///// </summary>
+            ///// <param name="fromNode">From Node object.</param>
+            ///// <param name="toNode">To Node object</param>
+            ///// <returns>True if fromNode is above toNode.</returns>
+            //protected bool IsAbove(Node fromNode, Node toNode)
+            //{
+            //    //int toMidPoint=toNode.Bounds.Top+toNode.Bounds.Height/2;
+            //    //if(fromNode.Bounds.Top>toMidPoint)
+            //    if(fromNode.BoundsRelative.Top>toNode.BoundsRelative.Bottom)
+            //        return true;
+            //    return false;
+            //}
+
+            ///// <summary>
+            ///// Returns true if fromNode is below toNode.
+            ///// </summary>
+            ///// <param name="fromNode">From Node object.</param>
+            ///// <param name="toNode">To Node object.</param>
+            ///// <returns>True if fromNode is below toNode.</returns>
+            //protected bool IsBelow(Node fromNode, Node toNode)
+            //{
+            //    int toMidPoint=toNode.BoundsRelative.Top+toNode.BoundsRelative.Height/2;
+            //    if(fromNode.BoundsRelative.Bottom<toMidPoint)
+            //        return true;
+            //    return false;
+            //}
+
+            ///// <summary>
+            ///// Returns whether connector is extended to underline the node.
+            ///// </summary>
+            ///// <param name="nodeStyle">Refernce to Node style.</param>
+            ///// <returns>True if node should be underlined by connector.</returns>
+            //protected bool UnderlineNode(ElementStyle nodeStyle)
+            //{
+            //    if(!nodeStyle.PaintBottomBorder && !nodeStyle.PaintTopBorder &&
+            //       !nodeStyle.PaintLeftBorder && !nodeStyle.PaintRightBorder)
+            //        return true;
+            //    return false;
+            //}
+
+            ///// <summary>
+            ///// Returns the connector end point. The array of end points. Two valid points will be returned if node needs to be underlined by connector.
+            ///// </summary>
+            ///// <param name="info">Connector display info.</param>
+            ///// <returns>Array of point objects.</returns>
+            //protected Point[] GetEndPoint(ConnectorRendererEventArgs info)
+            //{
+            //    // If to element is to the right of the from node and has left border end point is the vertical mid-point
+            //    // If to element is to the left of the from node and has right border end point is the vertical mid-point
+            //    // If there is no border end point is text bottom
+            //    // If this is link connector the end point is the middle bottom or top point of the node
+
+            //    Point p=Point.Empty;
+            //    Point pLineEnd=Point.Empty;
+            //    int capWidthOffset = 0; // GetCapWidthOffset(info.NodeConnector.EndCap, info.NodeConnector.EndCapSize);
+            //    bool leftSide=this.IsOnLeftSide(info.FromNode,info.ToNode);
+
+            //    if(info.LinkConnector && info.FromNode.BoundsRelative.Top>info.ToNode.BoundsRelative.Bottom)
+            //        p=new Point(info.ToNode.BoundsRelative.X+info.ToNode.BoundsRelative.Width/2+(leftSide?capWidthOffset:-capWidthOffset),info.ToNode.BoundsRelative.Bottom+1);
+            //    else if(info.LinkConnector && info.FromNode.BoundsRelative.Bottom<info.ToNode.BoundsRelative.Top)
+            //        p=new Point(info.ToNode.BoundsRelative.X+info.ToNode.BoundsRelative.Width/2+(leftSide?capWidthOffset:-capWidthOffset),info.ToNode.BoundsRelative.Top-info.NodeConnector.EndCapSize.Height);
+            //    else
+            //    {
+            //        if(leftSide)
+            //        {
+            //            // To element is to the left of from node
+            //            Rectangle r=info.ToNode.BoundsRelative;
+            //            if(info.StyleToNode==null || UnderlineNode(info.StyleToNode))
+            //            {
+            //                p=new Point(r.Right,r.Bottom);
+            //                if(m_EndCap)
+            //                    p.X+=capWidthOffset;
+
+            //                if(info.NodeConnector.UnderlineNoBorderNode)
+            //                {
+            //                    Rectangle rc=NodeDisplay.GetNodeRectangle(eNodeRectanglePart.NodeContentBounds,info.ToNode,Point.Empty);
+            //                    pLineEnd=new Point(rc.Left+1,r.Bottom);
+            //                }
+            //            }
+            //            else
+            //            {
+            //                p=new Point(r.Right,r.Y+r.Height/2);
+            //                if(m_EndCap)
+            //                    p.X+=capWidthOffset;
+            //            }
+            //        }
+            //        else
+            //        {
+            //            // To element to the right of from node
+            //            Rectangle r=info.ToNode.BoundsRelative;
+            //            if(info.StyleToNode==null || UnderlineNode(info.StyleToNode))
+            //            {
+            //                //r=NodeDisplay.GetCellRectangle(eCellRectanglePart.TextBounds,info.ToNode.Cells[0],Point.Empty);
+            //                //r=info.ToNode.Cells[0].TextContentBounds;
+            //                p=new Point(r.X,r.Bottom);
+            //                if(m_EndCap)
+            //                    p.X-=capWidthOffset;
+            //                if(info.NodeConnector.UnderlineNoBorderNode)
+            //                {
+            //                    Rectangle rc=NodeDisplay.GetNodeRectangle(eNodeRectanglePart.NodeContentBounds,info.ToNode,Point.Empty);
+            //                    pLineEnd=new Point(rc.Right-1,r.Bottom);
+            //                }
+            //            }
+            //            else
+            //            {
+            //                p=new Point(r.X,r.Y+r.Height/2);
+            //                if(m_EndCap)
+            //                    p.X-=capWidthOffset;
+            //            }
+            //        }
+            //    }
+			
+            //    if(!p.IsEmpty)
+            //        p.Offset(info.Offset.X,info.Offset.Y);
+            //    if(!pLineEnd.IsEmpty)
+            //        pLineEnd.Offset(info.Offset.X,info.Offset.Y);
+
+            //    return new Point[] {p,pLineEnd};
+            //}
+
+            ///// <summary>
+            ///// Returns the offest for the node connector cap.
+            ///// </summary>
+            ///// <param name="cap">Cap type.</param>
+            ///// <param name="size">Cap size.</param>
+            ///// <returns></returns>
+            //protected int GetCapWidthOffset(eConnectorCap cap,Size size)
+            //{
+            //    int capWidthOffset=0;
+            //    switch(cap)
+            //    {
+            //        case eConnectorCap.Arrow:
+            //            capWidthOffset=size.Width+1;
+            //            break;
+            //        case eConnectorCap.Ellipse:
+            //            capWidthOffset=size.Width;
+            //            break;
+            //    }
+            //    return capWidthOffset;
+            //}
+
+            ///// <summary>
+            ///// Returns true if source node is on the left side of the target node.
+            ///// </summary>
+            ///// <param name="source">Reference to source node.</param>
+            ///// <param name="target">Reference to target node.</param>
+            ///// <returns>True if source is on the left side of target.</returns>
+            //protected bool IsOnLeftSide(Node source, Node target)
+            //{
+            //    if((source.BoundsRelative.Left+source.BoundsRelative.Width/2)>target.BoundsRelative.Left)
+            //        return true;
+            //    return false;
+            //}
+
+			/// <summary>
+			/// Returns new instance of pen object for node connector line. Caller is responsible for
+			/// disposing of this object.
+			/// </summary>
+			/// <param name="info">Node connector display info.</param>
+			/// <returns>New instance of Pen object.</returns>
+			protected Pen GetLinePen(ConnectorRendererEventArgs info)
+			{
+                Pen pen = new Pen(info.NodeConnector.LineColor, info.NodeConnector.LineWidth);
+                pen.DashStyle = info.NodeConnector.DashStyle;
+                return pen;
+			}
+
+            ///// <summary>
+            ///// Returns new instance of pen object for the end node connector line. Caller is responsible for
+            ///// disposing of this object.
+            ///// </summary>
+            ///// <param name="info">Node connector display info.</param>
+            ///// <returns>New instance of Pen object.</returns>
+            //protected Pen GetEndLinePen(ConnectorRendererEventArgs info)
+            //{
+            //    return new Pen(info.NodeConnector.LineColor,EndLineWidth);
+            //}
+
+            ///// <summary>
+            ///// Returns new instance of pen object for the node underline line. Caller is responsible for
+            ///// disposing of this object.
+            ///// </summary>
+            ///// <param name="info">Node connector display info.</param>
+            ///// <returns>New instance of Pen object.</returns>
+            //protected Pen GetEndUnderlinePen(ConnectorRendererEventArgs info)
+            //{
+            //    return new Pen(info.NodeConnector.LineColor,EndLineWidth);
+            //}
+
+            //private int EndLineWidth
+            //{
+            //    get {return 1;}
+            //}
+
+//            /// <summary>
+//            /// Draws straight line connector between start and end point.
+//            /// </summary>
+//            /// <param name="info">Node connector display info.</param>
+//            /// <param name="pStart">Start point.</param>
+//            /// <param name="pEnd">End point.</param>
+//            /// <param name="pEndUnderLine">Underline end point if any.</param>
+//            protected void DrawStraightLineConnector(ConnectorRendererEventArgs info, Point pStart, Point pEnd)
+//            {
+//                using (Pen pen = this.GetLinePen(info))
+//                {
+//                    if (pen.DashStyle != DashStyle.Solid)
+//                    {
+//                        SmoothingMode sm = info.Graphics.SmoothingMode;
+//                        info.Graphics.SmoothingMode = SmoothingMode.Default;
+//                        info.Graphics.DrawLine(pen, pStart, pEnd);
+//                        info.Graphics.SmoothingMode = sm;
+//                    }
+//                    else
+//                        info.Graphics.DrawLine(pen, pStart, pEnd);
+//                }
+//            }
+
+//            /// <summary>
+//            /// Draws straight line connector between start and end point.
+//            /// </summary>
+//            /// <param name="info">Node connector display info.</param>
+//            /// <param name="pStart">Start point.</param>
+//            /// <param name="pEnd">End point.</param>
+//            /// <param name="pEndUnderLine">Underline end point if any.</param>
+//            protected void DrawLineConnector(ConnectorRendererEventArgs info,Point pStart,Point pEnd, Point pEndUnderLine)
+//            {
+//                if(info.NodeConnector.LineWidth>1)
+//                {
+//                    // Merge lines nicely by filling and creating path...
+//                    int rootLineWidth=this.EndLineWidth;
+//                    int lineWidth=info.NodeConnector.LineWidth;
+				
+//                    using(Brush brush=GetLineBrush(info))
+//                    {
+//                        GraphicsPath path=GetConnectingPath(pStart,pEnd,lineWidth,rootLineWidth,info.IsRootNode,!(IsAbove(info.FromNode,info.ToNode) || IsBelow(info.FromNode,info.ToNode)));
+//                        info.Graphics.FillPath(brush,path);
+//                    }
+//                }
+//                else
+//                {
+//                    using(Pen pen=this.GetLinePen(info))
+//                    {
+//                        info.Graphics.DrawLine(pen,pStart,pEnd);
+//                    }
+//                }
+
+//                if(!pEndUnderLine.IsEmpty)
+//                {
+//                    using(Pen pen=this.GetEndUnderlinePen(info))
+//                    {
+//                        info.Graphics.DrawLine(pen,pEnd,pEndUnderLine);
+//                    }
+//                }
+//            }
+
+//            private GraphicsPath GetConnectingPath(Point pStart, Point pEnd, int lineStartWidth, int lineEndWidth, bool bRoot, bool bRootSide)
+//            {
+//                int direction=1;
+//                if(pStart.X>pEnd.X)
+//                    direction=-1;
+//                lineStartWidth++;
+//                lineEndWidth++;
+//                GraphicsPath path=new GraphicsPath();
+//                if(bRoot && !bRootSide)
+//                {
+//                    path.AddLine(pStart.X,pStart.Y,pStart.X+lineStartWidth*direction,pStart.Y);
+////					if(direction>0)
+////						path.AddLine(pEnd.X+lineEndWidth*direction,pEnd.Y,pEnd.X,pEnd.Y);
+////					else
+////						path.AddLine(pEnd.X,pEnd.Y,pEnd.X+lineEndWidth*direction,pEnd.Y);
+//                    if(direction>0)
+//                    {
+//                        path.AddLine(pStart.X+lineStartWidth*direction,pStart.Y, pEnd.X, pEnd.Y);
+//                        path.AddLine(pEnd.X, pEnd.Y, pEnd.X, pEnd.Y + lineEndWidth*direction);
+//                        path.AddLine(pEnd.X, pEnd.Y + lineEndWidth*direction, pStart.X, pStart.Y);
+//                    }
+//                    else
+//                        path.AddLine(pEnd.X, pEnd.Y, pEnd.X, pEnd.Y + lineEndWidth*direction);
+						
+//                    path.CloseAllFigures();
+////					if(Math.Abs(pEnd.Y-pStart.Y)<=8)
+////						path.Widen(SystemPens.Highlight);
+//                }
+//                else
+//                {
+//                    int offsetStart=lineStartWidth/2;
+//                    int offsetEnd=lineEndWidth/2;
+//                    path.AddLine(pStart.X,pStart.Y-offsetStart,pStart.X,pStart.Y+offsetStart);
+//                    path.AddLine(pEnd.X,pEnd.Y+offsetEnd,pEnd.X,pEnd.Y-offsetEnd);
+//                    path.AddLine(pEnd.X,pEnd.Y-offsetEnd,pStart.X,pStart.Y-offsetStart);
+//                    path.CloseAllFigures();
+//                }
+			
+//                return path;
+//            }
+
+//            protected Brush GetLineBrush(ConnectorRendererEventArgs info)
+//            {
+//                return new SolidBrush(info.NodeConnector.LineColor);
+//            }
+
+//            protected void DrawEndLine(ConnectorRendererEventArgs info,Point pStart,Point pEnd,Point pEndUnderLine)
+//            {
+//                if(pEndUnderLine.IsEmpty)
+//                {
+//                    switch(info.NodeConnector.EndCap)
+//                    {
+//                        case eConnectorCap.Ellipse:
+//                            {
+//                                using(Pen pen=this.GetEndLinePen(info))
+//                                {
+//                                    Size endCapSize=info.NodeConnector.EndCapSize;
+//                                    if(pStart.X<pEnd.X)
+//                                        info.Graphics.DrawEllipse(pen,pEnd.X-1,pEnd.Y-endCapSize.Height/2,endCapSize.Width,endCapSize.Height);
+//                                    else
+//                                        info.Graphics.DrawEllipse(pen,pEnd.X-endCapSize.Width,pEnd.Y-endCapSize.Height/2,endCapSize.Width,endCapSize.Height);
+//                                }
+//                                break;
+//                            }
+//                        case eConnectorCap.Arrow:
+//                            {
+//                                using(Pen pen=this.GetEndLinePen(info))
+//                                {
+//                                    // Connects connector line to arrow
+//                                    int direction=1;
+//                                    if(pStart.X>pEnd.X)
+//                                        direction=-1;
+//                                    info.Graphics.DrawLine(pen,pEnd,new Point(pEnd.X+info.NodeConnector.EndCapSize.Width/3*direction,pEnd.Y));
+
+//                                    Size endCapSize=info.NodeConnector.EndCapSize;
+//                                    GraphicsPath arrow=GetArrowPath(endCapSize,pStart,pEnd);
+//                                    info.Graphics.DrawPath(pen,arrow);
+//                                }
+//                                break;
+//                            }
+//                    }
+//                }
+//                else
+//                {
+//                    using(Pen pen=this.GetEndUnderlinePen(info))
+//                    {
+//                        info.Graphics.DrawLine(pen,pEnd,pEndUnderLine);
+					
+//                        // Connect underline to expand part
+//                        if(NodeDisplay.DrawExpandPart(info.ToNode))
+//                        {
+//                            Rectangle re=NodeDisplay.GetNodeRectangle(eNodeRectanglePart.ExpandBounds,info.ToNode,info.Offset);
+//                            Point p2=new Point((re.X>pEndUnderLine.X?re.X:re.Right)+(re.Width/2*(re.X>pEndUnderLine.X?1:-1)),re.Bottom);
+//                            Point p1=new Point(p2.X,pEndUnderLine.Y+(pEndUnderLine.Y>p2.Y?(p2.Y-pEndUnderLine.Y)/2:-(p2.Y-pEndUnderLine.Y)/2));
+//                            info.Graphics.DrawCurve(pen,new Point[]{pEndUnderLine,p1,p2},.5f);
+//                        }
+//                    }
+//                }
+//            }
+
+//            private GraphicsPath GetArrowPath(Size capSize,Point pStart,Point pEnd)
+//            {
+//                GraphicsPath path=new GraphicsPath();
+//                int direction=1;
+//                if(pStart.X>pEnd.X)
+//                    direction=-1;
+			
+//                pEnd.X+=(GetCapWidthOffset(eConnectorCap.Arrow,capSize)*direction);
+//                path.AddLine(pEnd.X,pEnd.Y,pEnd.X-capSize.Width*direction,pEnd.Y-capSize.Height/2);
+//                path.AddLine(pEnd.X-(2*capSize.Width/3*direction),pEnd.Y,pEnd.X-capSize.Width*direction,pEnd.Y+capSize.Height/2);
+
+//                path.CloseAllFigures();
+//                return path;
+//            }
+
+            //internal virtual ConnectorPointInfo GetConnectorPointInfo(ConnectorRendererEventArgs info, Point pStart, Point pEnd)
+            //{
+            //    ConnectorPointInfo pointInfo=new ConnectorPointInfo();
+
+            //    int xMulti=1/*, yMulti=1*/;
+            //    int lineWidth=info.NodeConnector.LineWidth;
+
+            //    // used for direction control
+            //    if(pStart.X>pEnd.X)
+            //        xMulti=-1;
+            //    //if(pStart.Y>pEnd.Y)
+            //    //	yMulti=-1;
+
+            //    if(info.ConnectorPoints!=null)
+            //    {
+            //        Point connPointsOffset=info.ToNode.BoundsRelative.Location;
+            //        connPointsOffset.Offset(info.Offset.X,info.Offset.Y);
+            //        GraphicsPath path=new GraphicsPath();
+				
+            //        pointInfo.Points1=new Point[info.ConnectorPoints.Count+2];
+            //        pointInfo.Points1[0]=pStart;
+            //        pointInfo.Points1[pointInfo.Points1.Length-1]=pEnd;
+
+            //        if(lineWidth>1)
+            //        {
+            //            pointInfo.Points2=new Point[info.ConnectorPoints.Count+2];
+            //            pointInfo.Points2[pointInfo.Points2.Length-1]=pStart;
+            //            pointInfo.Points2[0]=pEnd;
+
+            //            int i=pointInfo.Points1.Length-2;
+            //            int k=1;
+
+            //            foreach(Point pcp in info.ConnectorPoints)
+            //            {
+            //                pointInfo.Points1[i]=pcp;
+            //                pointInfo.Points1[i].Offset(connPointsOffset.X,connPointsOffset.Y);
+            //                pointInfo.Points2[k]=new Point(pcp.X+lineWidth*xMulti,pcp.Y);
+            //                pointInfo.Points2[k].Offset(connPointsOffset.X,connPointsOffset.Y);
+            //                k++;
+            //                i--;
+            //            }
+            //        }
+            //        else
+            //        {
+            //            int i=pointInfo.Points1.Length-2;
+            //            foreach(Point pcp in info.ConnectorPoints)
+            //            {
+            //                pointInfo.Points1[i]=pcp;
+            //                pointInfo.Points1[i].Offset(connPointsOffset.X,connPointsOffset.Y);
+            //                i--;
+            //            }
+            //        }	
+            //    }
+            //    return pointInfo;
+            //}
+		}
+	}
+
+	/// <summary>
+	/// Represents custom connector path info.
+	/// </summary>
+	internal class ConnectorPointInfo
+	{
+		public Point[] Points1=null;
+		public Point[] Points2=null;
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/Display/NodeDisplay.cs b/PROMS/DotNetBar Source Code/AdvTree/Display/NodeDisplay.cs
new file mode 100644
index 00000000..59e30afb
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/Display/NodeDisplay.cs	
@@ -0,0 +1,351 @@
+using System;
+using System.Drawing;
+using DevComponents.AdvTree.Layout;
+using System.Collections;
+using DevComponents.DotNetBar;
+using System.ComponentModel;
+
+namespace DevComponents.AdvTree.Display
+{
+	/// <summary>
+	/// Summary description for NodeDisplay.
+	/// </summary>
+	public class NodeDisplay
+	{
+		#region Private Variables
+		private Point m_Offset=Point.Empty;
+		private Point m_LockedOffset=Point.Empty;
+		private AdvTree m_Tree=null;
+        internal ArrayList _PaintedNodes = new ArrayList(100);
+#if !TRIAL
+		internal static bool keyInvalid=false;
+#endif
+		#endregion
+		/// <summary>Creates new instance of the class</summary>
+		/// <param name="tree">Object to initialize class with.</param>
+		public NodeDisplay(AdvTree tree)
+		{
+			m_Tree=tree;
+		}
+
+		/// <summary>
+		/// Paints the layout on canvas.
+		/// </summary>
+		public virtual void Paint(Graphics g, Rectangle clipRectangle)
+		{
+		}
+
+		/// <summary>
+		/// Gets or sets the offset of the tree content relative to the size of the container control.
+		/// </summary>
+		public virtual Point Offset
+		{
+			get
+			{
+				if(!m_LockedOffset.IsEmpty)
+					return m_LockedOffset;
+				
+				Node displayNode=m_Tree.GetDisplayRootNode();
+				if(displayNode==null)
+					return Point.Empty;;
+				
+				Size nodesSize = m_Tree.GetScreenSize(new Size(m_Tree.NodeLayout.Width, m_Tree.NodeLayout.Height));
+				return m_Tree.GetLayoutPosition(m_Offset);
+			}
+			set {m_Offset=value;}
+		}
+
+		/// <summary>Gets or sets whether offset is locked, i.e. cannot be changed.</summary>
+		public bool LockOffset
+		{
+			get {return (!m_LockedOffset.IsEmpty);}
+			set
+			{
+				if(value)
+					m_LockedOffset=this.Offset;
+				else
+					m_LockedOffset=Point.Empty;
+			}
+		}
+		
+		/// <summary>
+		/// Sets locked offset to specific value. Point.Empty means there is no locked offset set.
+		/// </summary>
+		/// <param name="p">New locked offset.</param>
+		public void SetLockedOffset(Point p)
+		{
+			m_LockedOffset=p;
+		}
+		
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <returns></returns>
+		public Point GetLockedOffset()
+		{
+			return m_LockedOffset;
+		}
+
+		/// <summary>
+		/// Returns the default offset for the tree content relative to the size of the container.
+		/// </summary>
+		public virtual Point DefaultOffset
+		{
+			get
+			{
+				Node displayNode=m_Tree.GetDisplayRootNode();
+				if(displayNode==null)
+					return Point.Empty;;
+				
+                //if(m_Tree.NodeLayout is NodeMapLayout && m_Tree.Nodes.Count>0)
+                //{
+                //    if(!m_Tree.CenterContent)
+                //        return new Point(Math.Abs(displayNode.ChildNodesBounds.Left),Math.Abs(displayNode.ChildNodesBounds.Top));
+                //    else
+                //        return new Point(m_Tree.SelectionBoxSize+(m_Tree.Width - m_Tree.SelectionBoxSize * 2 - m_Tree.NodeLayout.Width) / 2 + Math.Abs(displayNode.ChildNodesBounds.Left),
+                //            m_Tree.SelectionBoxSize + (m_Tree.Height - m_Tree.SelectionBoxSize * 2 - m_Tree.NodeLayout.Height) / 2 + Math.Abs(displayNode.ChildNodesBounds.Top));
+                //}
+                //if(m_Tree.NodeLayout is Layout.NodeDiagramLayout)
+                //{
+                //    if(!m_Tree.CenterContent)
+                //        return m_Tree.ClientRectangle.Location;
+                //    else
+                //        return new Point((m_Tree.Width-m_Tree.NodeLayout.Width)/2,(m_Tree.Height-m_Tree.NodeLayout.Height)/2);
+                //}
+                //else
+					return m_Tree.ClientRectangle.Location;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the reference to the tree control managed by display class.
+		/// </summary>
+		protected virtual AdvTree Tree
+		{
+			get {return m_Tree;}
+			set {m_Tree=value;}
+		}
+        [EditorBrowsable(EditorBrowsableState.Never)]
+		public static Rectangle GetNodeRectangle(eNodeRectanglePart part, Node node, Point offset)
+		{
+			Rectangle r=Rectangle.Empty;
+			if(part==eNodeRectanglePart.CellsBounds)
+			{
+				r=node.CellsBoundsRelative;
+				if(!r.IsEmpty)
+				{
+					r.Offset(offset);
+					r.Offset(node.BoundsRelative.Location);
+				}
+			}
+            else if (part == eNodeRectanglePart.ExpandHitTestBounds)
+            {
+                Rectangle nodeBounds = GetNodeRectangle(eNodeRectanglePart.NodeBounds, node, offset);
+
+                r = node.ExpandPartRectangleRelative;
+                if (!r.IsEmpty)
+                {
+                    r.Offset(offset);
+                    r.Offset(node.BoundsRelative.Location);
+                }
+                r.Y = nodeBounds.Y;
+                r.Height = nodeBounds.Height;
+                r.Inflate(1, 0);
+            }
+			else if(part==eNodeRectanglePart.ExpandBounds)
+			{
+				r=node.ExpandPartRectangleRelative;
+				if(!r.IsEmpty)
+				{
+					r.Offset(offset);
+					r.Offset(node.BoundsRelative.Location);
+				}
+			}
+			else if(part==eNodeRectanglePart.CommandBounds)
+			{
+				r=node.CommandBoundsRelative;
+				if(!r.IsEmpty)
+				{
+					r.Offset(offset);
+					r.Offset(node.BoundsRelative.Location);
+				}
+			}	
+			else if(part==eNodeRectanglePart.NodeContentBounds)
+			{
+				r=node.ContentBounds;
+				if(!r.IsEmpty)
+				{
+					r.Offset(offset);
+					r.Offset(node.BoundsRelative.Location);
+				}
+			}
+			else if(part==eNodeRectanglePart.NodeBounds)
+			{
+				r=node.BoundsRelative;
+				if(!r.IsEmpty)
+					r.Offset(offset);
+			}
+            else if (part == eNodeRectanglePart.ChildNodeBounds)
+            {
+                r = node.ChildNodesBounds;
+                if (!r.IsEmpty)
+                {
+                    //r.Offset(node.Bounds.Location);
+                    r.Offset(offset);
+                }
+            }
+            else if (part == eNodeRectanglePart.ColumnsBounds && HasColumnsVisible(node))
+            {
+                r = node.NodesColumns.Bounds;
+                if(!r.IsEmpty)
+                    r.Offset(offset);
+            }
+			return r;
+		}
+
+        internal static bool HasColumnsVisible(Node node)
+        {
+            return node.Expanded && node.HasColumns && node.NodesColumnsHeaderVisible;
+        }
+
+		internal static Rectangle GetCellRectangle(eCellRectanglePart part, Cell cell, Point offset)
+		{
+			Rectangle r=Rectangle.Empty;
+			
+			// If cell parent is not assigned rectangle cannot be returned.
+			if(cell.Parent==null)
+				return r;
+
+			if(part==eCellRectanglePart.CheckBoxBounds)
+			{
+				r=cell.CheckBoxBoundsRelative;
+				if(!r.IsEmpty)
+				{
+					r.Offset(offset);
+					r.Offset(cell.Parent.BoundsRelative.Location);
+				}
+			}
+			else if(part==eCellRectanglePart.ImageBounds)
+			{
+				r=cell.ImageBoundsRelative;
+				if(!r.IsEmpty)
+				{
+					r.Offset(offset);
+					r.Offset(cell.Parent.BoundsRelative.Location);
+				}
+			}
+			else if(part==eCellRectanglePart.TextBounds)
+			{
+				r=cell.TextContentBounds;
+				if(!r.IsEmpty)
+				{
+					r.Offset(offset);
+					r.Offset(cell.Parent.BoundsRelative.Location);
+				}
+			}
+			else if(part==eCellRectanglePart.CellBounds)
+			{
+				r=cell.BoundsRelative;
+				if(!r.IsEmpty)
+				{
+					r.Offset(offset);
+                    r.Offset(cell.Parent.BoundsRelative.Location);
+				}
+			}
+			return r;
+		}
+
+		internal static bool DrawExpandPart(Node node)
+		{
+			if(node.Nodes.Count>0 && node.ExpandVisibility!=eNodeExpandVisibility.Hidden || node.ExpandVisibility==eNodeExpandVisibility.Visible)
+				return true;
+			return false;
+		}
+
+		protected NodeExpandDisplay GetExpandDisplay(eExpandButtonType e)
+		{
+			NodeExpandDisplay d=null;
+			switch(e)
+			{
+                case eExpandButtonType.Rectangle:
+                    d = new NodeExpandRectDisplay();
+                    break;
+                case eExpandButtonType.Triangle:
+                    d = new NodeExpandTriangleDisplay();
+                    break;
+				case eExpandButtonType.Ellipse:
+					d=new NodeExpandEllipseDisplay();
+					break;
+				case eExpandButtonType.Image:
+					d=new NodeExpandImageDisplay();
+					break;
+			}
+			return d;
+		}
+
+		protected bool IsRootNode(Node node)
+		{
+			return NodeOperations.IsRootNode(m_Tree,node);
+		}
+
+		protected ElementStyle GetDefaultNodeStyle()
+		{
+			ElementStyle style=new ElementStyle();
+			style.TextColorSchemePart=eColorSchemePart.ItemText;
+
+			return style;
+		}
+
+        public void MoveHostedControls()
+        {
+            Point offset = this.Offset;
+            float zoom = this.Tree.Zoom;
+            foreach (Cell cell in this.Tree.HostedControlCells)
+            {
+                System.Windows.Forms.Control cellHostedControl = cell.HostedControl;
+                if (cellHostedControl == null) continue;
+                Rectangle bounds = NodeDisplay.GetCellRectangle(eCellRectanglePart.TextBounds, cell, offset);
+                Rectangle screenBounds = this.Tree.GetScreenRectangle(bounds);
+                if (!bounds.IsEmpty && cellHostedControl.Bounds != screenBounds)
+                {
+                    if (zoom != 1)
+                    {
+                        cell.HostedControlSize = bounds.Size;
+                        cell.IgnoreHostedControlSizeChange = true;
+                    }
+                    else
+                    {
+                        cell.HostedControlSize = Size.Empty;
+                        if (screenBounds.Height > cellHostedControl.Height && cellHostedControl.Height > 0)
+                        {
+                            screenBounds.Y += (screenBounds.Height - cellHostedControl.Height) / 2;
+                            screenBounds.Height = cellHostedControl.Height;
+                        }
+                    }
+                    cellHostedControl.Bounds = screenBounds;
+                    if (zoom != 1)
+                        cell.IgnoreHostedControlSizeChange = false;
+                    if (cell.Parent != null)
+                    {
+                        bool visible = NodeOperations.GetIsNodeVisible(cell.Parent) && cell.IsVisible;
+                        if (visible != cellHostedControl.Visible)
+                            cellHostedControl.Visible = visible;
+                    }
+                }
+            }
+        }
+
+        public ArrayList PaintedNodes
+        {
+            get
+            {
+                return _PaintedNodes;
+            }
+        }
+
+        internal virtual void PaintColumnHeaders(ColumnHeaderCollection columns, Graphics g, bool treeControlHeader)
+        {
+            
+        }
+	} 
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/Display/NodeExpandDisplay.cs b/PROMS/DotNetBar Source Code/AdvTree/Display/NodeExpandDisplay.cs
new file mode 100644
index 00000000..f340c175
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/Display/NodeExpandDisplay.cs	
@@ -0,0 +1,139 @@
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using DevComponents.DotNetBar;
+
+namespace DevComponents.AdvTree
+{
+	namespace Display
+	{
+		/// <summary>
+		/// Base class for node expand button display.
+		/// </summary>
+		public abstract class NodeExpandDisplay
+		{
+			/// <summary>Creates new instance of the class</summary>
+			public NodeExpandDisplay()
+			{
+			}
+
+			/// <summary>Draws expand button.</summary>
+			/// <param name="e">Context parameters for drawing expand button.</param>
+			public abstract void DrawExpandButton(NodeExpandPartRendererEventArgs e);
+
+			protected Pen GetBorderPen(NodeExpandPartRendererEventArgs e)
+			{
+                if(!e.BorderColor.IsEmpty)
+                    return new Pen(e.BorderColor,1);
+                if (_ColorTable != null)
+                {
+                    bool expanded = e.Node.Expanded;
+                    TreeExpandColorTable ct = GetExpandColorTable(e);
+                    if (ct == null) return null;
+                    if (expanded)
+                    {
+                        // Collapse node colors
+                        if (!e.IsMouseOver && ct.CollapseBorder != null)
+                            return ct.CollapseBorder.CreatePen();
+                        else if (e.IsMouseOver && ct.CollapseMouseOverBorder != null)
+                            return ct.CollapseMouseOverBorder.CreatePen();
+                    }
+                    else
+                    {
+                        // Expand node colors
+                        if (!e.IsMouseOver && ct.ExpandBorder != null)
+                            return ct.ExpandBorder.CreatePen();
+                        else if (e.IsMouseOver && ct.ExpandMouseOverBorder != null)
+                            return ct.ExpandMouseOverBorder.CreatePen();
+                    }
+                }
+                return null;
+			}
+
+            private TreeExpandColorTable GetExpandColorTable(NodeExpandPartRendererEventArgs e)
+            {
+                TreeExpandColorTable ct = null;
+                if (e.ExpandButtonType == eExpandButtonType.Rectangle)
+                    ct = _ColorTable.ExpandRectangle;
+                else if (e.ExpandButtonType == eExpandButtonType.Triangle)
+                    ct = _ColorTable.ExpandTriangle;
+                else if (e.ExpandButtonType == eExpandButtonType.Ellipse)
+                    ct = _ColorTable.ExpandEllipse;
+                return ct;
+            }
+
+			protected Pen GetExpandPen(NodeExpandPartRendererEventArgs e)
+			{
+                if (e.ExpandLineColor.IsEmpty)
+                {
+                    TreeExpandColorTable ct = GetExpandColorTable(e);
+                    if (ct != null)
+                    {
+                        bool expanded = e.Node.Expanded;
+                        if (expanded)
+                        {
+                            // Collapse node colors
+                            if (!e.IsMouseOver && ct.CollapseForeground != null)
+                                return ct.CollapseForeground.CreatePen(Dpi.Width1);
+                            else if (e.IsMouseOver && ct.CollapseMouseOverForeground != null)
+                                return ct.CollapseMouseOverForeground.CreatePen(Dpi.Width1);
+                        }
+                        else
+                        {
+                            // Collapse node colors
+                            if (!e.IsMouseOver && ct.ExpandForeground != null)
+                                return ct.ExpandForeground.CreatePen(Dpi.Width1);
+                            else if (e.IsMouseOver && ct.ExpandMouseOverForeground != null)
+                                return ct.ExpandMouseOverForeground.CreatePen(Dpi.Width1);
+                        }
+                    }
+
+                    return GetBorderPen(e);
+                }
+
+				return new Pen(e.ExpandLineColor,1);
+			}
+
+			protected Brush GetBackgroundBrush(NodeExpandPartRendererEventArgs e)
+			{
+                if (e.BackColor.IsEmpty && e.BackColor2.IsEmpty)
+                {
+                    bool expanded = e.Node.Expanded;
+                    TreeExpandColorTable ct = GetExpandColorTable(e);
+                    if (ct == null) return null;
+                    if (expanded)
+                    {
+                        // Collapse node colors
+                        if (!e.IsMouseOver && ct.CollapseFill != null)
+                            return ct.CollapseFill.CreateBrush(e.ExpandPartBounds);
+                        else if (e.IsMouseOver && ct.CollapseMouseOverFill != null)
+                            return ct.CollapseMouseOverFill.CreateBrush(e.ExpandPartBounds);
+                    }
+                    else
+                    {
+                        // Expand node colors
+                        if (!e.IsMouseOver && ct.ExpandFill != null)
+                            return ct.ExpandFill.CreateBrush(e.ExpandPartBounds);
+                        else if (e.IsMouseOver && ct.ExpandMouseOverFill != null)
+                            return ct.ExpandMouseOverFill.CreateBrush(e.ExpandPartBounds);
+                    }
+
+                    return null;
+                }
+
+				if(e.BackColor2.IsEmpty)
+					return new SolidBrush(e.BackColor);
+			
+				System.Drawing.Drawing2D.LinearGradientBrush brush=DisplayHelp.CreateLinearGradientBrush(e.ExpandPartBounds,e.BackColor,e.BackColor2,e.BackColorGradientAngle);
+				//brush.SetSigmaBellShape(0.8f);
+				return brush;
+			}
+
+            private TreeColorTable _ColorTable;
+            public TreeColorTable ColorTable
+            {
+                get { return _ColorTable; }
+                set { _ColorTable = value; }
+            }
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/Display/NodeExpandEllipseDisplay.cs b/PROMS/DotNetBar Source Code/AdvTree/Display/NodeExpandEllipseDisplay.cs
new file mode 100644
index 00000000..88ec8330
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/Display/NodeExpandEllipseDisplay.cs	
@@ -0,0 +1,57 @@
+using System.Drawing;
+using System.Drawing.Drawing2D;
+
+namespace DevComponents.AdvTree.Display
+{
+	/// <summary>
+	/// Represents class that paints elliptical expand button.
+	/// </summary>
+	public class NodeExpandEllipseDisplay:NodeExpandDisplay
+	{
+		/// <summary>Draws ellipse type expand button.</summary>
+		/// <param name="e">Expand context drawing information.</param>
+		public override void DrawExpandButton(NodeExpandPartRendererEventArgs e)
+		{
+			if(e.ExpandPartBounds.IsEmpty)
+				return;
+			
+			Brush brush=GetBackgroundBrush(e);
+			if(brush!=null)
+			{
+				e.Graphics.FillEllipse(brush,e.ExpandPartBounds);
+				brush.Dispose();
+			}
+
+            Pen pen=GetBorderPen(e);
+            if (pen != null)
+            {
+                SmoothingMode sm = e.Graphics.SmoothingMode;
+                e.Graphics.SmoothingMode = SmoothingMode.AntiAlias;
+                e.Graphics.DrawEllipse(pen, e.ExpandPartBounds);
+                e.Graphics.SmoothingMode = sm;
+                pen.Dispose();
+                pen = null;
+            }
+
+			if(e.Node.Expanded)
+			{
+                pen = GetExpandPen(e);
+                if (pen != null)
+                {
+                    e.Graphics.DrawLine(pen, e.ExpandPartBounds.X + 2, e.ExpandPartBounds.Y + e.ExpandPartBounds.Height / 2, e.ExpandPartBounds.Right - 2, e.ExpandPartBounds.Y + e.ExpandPartBounds.Height / 2);
+                    pen.Dispose();
+                }
+			}
+			else
+			{
+                pen = GetExpandPen(e);
+                if (pen != null)
+				{
+					e.Graphics.DrawLine(pen,e.ExpandPartBounds.X+2,e.ExpandPartBounds.Y+e.ExpandPartBounds.Height/2,e.ExpandPartBounds.Right-2,e.ExpandPartBounds.Y+e.ExpandPartBounds.Height/2);
+					e.Graphics.DrawLine(pen,e.ExpandPartBounds.X+e.ExpandPartBounds.Width/2,e.ExpandPartBounds.Y+2,e.ExpandPartBounds.X+e.ExpandPartBounds.Width/2,e.ExpandPartBounds.Bottom-2);
+                    pen.Dispose();
+				}
+			}
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/Display/NodeExpandImageDisplay.cs b/PROMS/DotNetBar Source Code/AdvTree/Display/NodeExpandImageDisplay.cs
new file mode 100644
index 00000000..f581b073
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/Display/NodeExpandImageDisplay.cs	
@@ -0,0 +1,25 @@
+
+
+namespace DevComponents.AdvTree.Display
+{
+	/// <summary>
+	/// Represents expand button display using predefined images.
+	/// </summary>
+	public class NodeExpandImageDisplay:NodeExpandDisplay
+	{
+		/// <summary>
+		/// Draws image type expand button.
+		/// </summary>
+		/// <param name="e">Expand context information</param>
+		public override void DrawExpandButton(NodeExpandPartRendererEventArgs e)
+		{
+			if(e.Node.Expanded)
+			{
+				if(e.ExpandImageCollapse!=null)
+					e.Graphics.DrawImage(e.ExpandImageCollapse,e.ExpandPartBounds);
+			}
+			else if(e.ExpandImage!=null)
+				e.Graphics.DrawImage(e.ExpandImage,e.ExpandPartBounds);
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/Display/NodeExpandPartRendererEventArgs.cs b/PROMS/DotNetBar Source Code/AdvTree/Display/NodeExpandPartRendererEventArgs.cs
new file mode 100644
index 00000000..c3ef9ec9
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/Display/NodeExpandPartRendererEventArgs.cs	
@@ -0,0 +1,49 @@
+using System;
+using System.Drawing;
+
+namespace DevComponents.AdvTree
+{
+	/// <summary>
+	/// Represents event arguments for RenderExpandPart event.
+	/// </summary>
+	public class NodeExpandPartRendererEventArgs:EventArgs
+	{
+		/// <summary>
+		/// Gets or sets reference to Graphics object, canvas node is rendered on.
+		/// </summary>
+		public System.Drawing.Graphics Graphics=null;
+		/// <summary>
+		/// Gets or sets the reference to Node object being rendered.
+		/// </summary>
+		public DevComponents.AdvTree.Node Node=null;
+		/// <summary>Expand part bounds</summary>
+		public Rectangle ExpandPartBounds=Rectangle.Empty;
+		/// <summary>Expand part border color</summary>
+		public Color BorderColor=Color.Empty;
+		/// <summary>Expand part line color</summary>
+		public Color ExpandLineColor=Color.Empty;
+		/// <summary>Expand part background color</summary>
+		public Color BackColor=Color.Empty;
+		/// <summary>Expand part target gradient background color</summary>
+		public Color BackColor2=Color.Empty;
+		/// <summary>Gradient angle</summary>
+		public int BackColorGradientAngle=90;
+		/// <summary>Expand part image when node is expanded</summary>
+		public Image ExpandImage=null;
+		/// <summary>Expand part image when node is collapsed</summary>
+		public Image ExpandImageCollapse=null;
+		/// <summary>Internal support for expand button types</summary>
+		internal eExpandButtonType ExpandButtonType=eExpandButtonType.Ellipse;
+        /// <summary>Gets whether mouse is over expand part</summary>
+        public bool IsMouseOver = false;
+
+		/// <summary>
+		/// Creates new instance of the class and initializes it with default values.
+		/// </summary>
+		/// <param name="g">Reference to graphics object.</param>
+		public NodeExpandPartRendererEventArgs(Graphics g)
+		{
+			this.Graphics = g;
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/Display/NodeExpandRectDisplay.cs b/PROMS/DotNetBar Source Code/AdvTree/Display/NodeExpandRectDisplay.cs
new file mode 100644
index 00000000..65ba6b8b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/Display/NodeExpandRectDisplay.cs	
@@ -0,0 +1,56 @@
+using System;
+using System.Drawing;
+
+namespace DevComponents.AdvTree.Display
+{
+	/// <summary>
+	/// Represents class that paints rectangular expand button.
+	/// </summary>
+	public class NodeExpandRectDisplay:NodeExpandDisplay
+	{
+		/// <summary>
+		/// Draw rectangular type expand button.
+		/// </summary>
+		/// <param name="e">Expand button context information.</param>
+		public override void DrawExpandButton(NodeExpandPartRendererEventArgs e)
+		{
+			if(e.ExpandPartBounds.IsEmpty)
+				return;
+
+			Brush brush=GetBackgroundBrush(e);
+			if(brush!=null)
+			{
+				e.Graphics.FillRectangle(brush,e.ExpandPartBounds);
+				brush.Dispose();
+			}
+
+            Pen pen = GetBorderPen(e);
+            if (pen != null)
+            {
+                e.Graphics.DrawRectangle(pen, e.ExpandPartBounds);
+                pen.Dispose();
+                pen = null;
+            }
+
+			if(e.Node.Expanded)
+			{
+                pen = GetExpandPen(e);
+                if (pen != null)
+                {
+                    e.Graphics.DrawLine(pen, e.ExpandPartBounds.X + 2, e.ExpandPartBounds.Y + e.ExpandPartBounds.Height / 2, e.ExpandPartBounds.Right - 2, e.ExpandPartBounds.Y + e.ExpandPartBounds.Height / 2);
+                    pen.Dispose();
+                }
+			}
+			else
+			{
+                pen = GetExpandPen(e);
+                if (pen != null)
+				{
+					e.Graphics.DrawLine(pen,e.ExpandPartBounds.X+2,e.ExpandPartBounds.Y+e.ExpandPartBounds.Height/2,e.ExpandPartBounds.Right-2,e.ExpandPartBounds.Y+e.ExpandPartBounds.Height/2);
+					e.Graphics.DrawLine(pen,e.ExpandPartBounds.X+e.ExpandPartBounds.Width/2,e.ExpandPartBounds.Y+2,e.ExpandPartBounds.X+e.ExpandPartBounds.Width/2,e.ExpandPartBounds.Bottom-2);
+                    pen.Dispose();
+				}
+			}
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/Display/NodeExpandTriangleDisplay.cs b/PROMS/DotNetBar Source Code/AdvTree/Display/NodeExpandTriangleDisplay.cs
new file mode 100644
index 00000000..6df26b02
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/Display/NodeExpandTriangleDisplay.cs	
@@ -0,0 +1,58 @@
+using System;
+using System.Text;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using DevComponents.DotNetBar;
+
+namespace DevComponents.AdvTree.Display
+{
+    internal class NodeExpandTriangleDisplay : NodeExpandDisplay
+    {
+        /// <summary>
+        /// Draw triangular type expand button.
+        /// </summary>
+        /// <param name="e">Expand button context information.</param>
+        public override void DrawExpandButton(NodeExpandPartRendererEventArgs e)
+        {
+            if (e.ExpandPartBounds.IsEmpty)
+                return;
+
+            SmoothingMode sm = e.Graphics.SmoothingMode;
+            e.Graphics.SmoothingMode = SmoothingMode.AntiAlias;
+            int pw = Dpi.Width5;
+            Rectangle r = new Rectangle(e.ExpandPartBounds.X , e.ExpandPartBounds.Y + (e.ExpandPartBounds.Height - 8) / 2, pw, Dpi.Height8);
+
+            GraphicsPath path = null;
+            if (e.Node.Expanded)
+            {
+                path = new GraphicsPath();
+                path.AddLine(r.X, r.Y + pw, r.X + pw, r.Y);
+                path.AddLine(r.X + pw, r.Y, r.X + pw, r.Y + pw);
+                path.CloseAllFigures();
+            }
+            else
+            {
+                path = new GraphicsPath();
+                path.AddLine(r.X, r.Y, r.X, r.Bottom);
+                path.AddLine(r.X, r.Bottom, r.X + Dpi.Width4, r.Y + r.Height / 2);
+                path.CloseAllFigures();
+            }
+
+            Brush brush = GetBackgroundBrush(e);
+            if (brush != null)
+            {
+                e.Graphics.FillPath(brush, path);
+                brush.Dispose();
+            }
+
+            Pen pen = GetBorderPen(e);
+            if(pen!=null)
+            {
+                e.Graphics.DrawPath(pen, path);
+                pen.Dispose();
+            }
+            e.Graphics.SmoothingMode = sm;
+            if(path!=null) path.Dispose();
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/Display/NodeGroupLineDisplay.cs b/PROMS/DotNetBar Source Code/AdvTree/Display/NodeGroupLineDisplay.cs
new file mode 100644
index 00000000..58198541
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/Display/NodeGroupLineDisplay.cs	
@@ -0,0 +1,51 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+using DevComponents.AdvTree.Layout;
+using DevComponents.DotNetBar;
+
+namespace DevComponents.AdvTree.Display
+{
+    internal class NodeGroupLineDisplay
+    {
+        private static readonly int LineMargin = 4;
+        public void DrawGroupLine(NodeRendererEventArgs e)
+        {
+            Color lineColor = e.Color;
+            Node node = e.Node;
+
+            if (lineColor.IsEmpty || lineColor.A == 0 || node.Cells.Count == 0) return;
+            Graphics g = e.Graphics;
+
+            Rectangle r = node.Bounds;
+            
+            Cell lastCell = node.Cells[node.Cells.Count - 1];
+            if (lastCell.CheckBoxVisible && CellLayout.GetCheckBoxHorizontalAlign(lastCell.CheckBoxAlignment, true, eView.Tile) == eHorizontalAlign.Right)
+            {
+                r.Width -= (lastCell.CheckBoxBounds.Right - r.X) + LineMargin;
+                r.X = lastCell.CheckBoxBounds.Right + LineMargin;
+            }
+            else if (!lastCell.ImageBoundsRelative.IsEmpty && CellLayout.GetHorizontalAlign(lastCell.ImageAlignment, true, eView.Tile) == eHorizontalAlign.Right)
+            {
+                r.Width -= (lastCell.ImageBounds.Right - r.X) + LineMargin;
+                r.X = lastCell.ImageBounds.Right + LineMargin;
+            }
+            else if (e.Style.TextAlignment == eStyleTextAlignment.Near)
+            {
+                Rectangle textBounds = lastCell.TextBounds;
+                if (lastCell.TextMarkupBody == null)
+                    textBounds.Width = TextDrawing.MeasureString(g, lastCell.Text, e.Style.Font).Width;
+                r.Width -= (textBounds.Right - r.X) + LineMargin;
+                r.X = textBounds.Right + LineMargin;
+            }
+            else 
+                return;
+
+            using (Pen pen = new Pen(lineColor, 1))
+            {
+                g.DrawLine(pen, r.X, r.Y + r.Height / 2, r.Right, r.Y + r.Height / 2);
+            }
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/Display/NodeRendererEventArgs.cs b/PROMS/DotNetBar Source Code/AdvTree/Display/NodeRendererEventArgs.cs
new file mode 100644
index 00000000..1c9ad961
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/Display/NodeRendererEventArgs.cs	
@@ -0,0 +1,55 @@
+using System;
+using System.Drawing;
+using DevComponents.DotNetBar;
+
+namespace DevComponents.AdvTree.Display
+{
+	/// <summary>
+	/// Summary description for NodeRendererEventArgs.
+	/// </summary>
+	public class NodeRendererEventArgs:EventArgs
+	{
+		/// <summary>
+		/// Gets or sets reference to Graphics object, canvas node is rendered on.
+		/// </summary>
+		public System.Drawing.Graphics Graphics=null;
+		/// <summary>
+		/// Gets or sets the reference to Node object being rendered.
+		/// </summary>
+		public DevComponents.AdvTree.Node Node=null;
+		/// <summary>
+		/// Gets or sets the absolute node bounds.
+		/// </summary>
+		public Rectangle NodeBounds=Rectangle.Empty;
+		/// <summary>
+		/// Gets or sets the reference to element style for rendered node or cell. Style provided here is the style
+		/// for current node or cell state.
+		/// </summary>
+		public ElementStyle Style=null;
+        /// <summary>
+        /// Gets or sets color that is passed to renderer. May be Color.Empty.
+        /// </summary>
+        public Color Color = Color.Empty;
+		
+		/// <summary>
+		/// Creates new instance of the class.
+		/// </summary>
+		public NodeRendererEventArgs()
+		{
+		}
+		
+		public NodeRendererEventArgs(Graphics g, Node node, Rectangle bounds, ElementStyle style)
+            : this(g, node, bounds, style, Color.Empty)
+		{
+		}
+
+        public NodeRendererEventArgs(Graphics g, Node node, Rectangle bounds, ElementStyle style, Color color)
+        {
+            this.Graphics = g;
+            this.Node = node;
+            this.NodeBounds = bounds;
+            this.Style = style;
+            this.Color = color;
+        }
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/Display/NodeSelectionDisplay.cs b/PROMS/DotNetBar Source Code/AdvTree/Display/NodeSelectionDisplay.cs
new file mode 100644
index 00000000..5a41d02b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/Display/NodeSelectionDisplay.cs	
@@ -0,0 +1,190 @@
+using System.Drawing;
+using DevComponents.WinForms.Drawing;
+
+namespace DevComponents.AdvTree.Display
+{
+	/// <summary>
+	/// Represent class that paints selection around node.
+	/// </summary>
+	internal class NodeSelectionDisplay
+	{
+		public void PaintSelection(SelectionRendererEventArgs info)
+		{
+            if (info.SelectionBoxStyle == eSelectionStyle.HighlightCells)
+                PaintHighlightCellsSelectionStyle(info);
+            else if (info.SelectionBoxStyle == eSelectionStyle.FullRowSelect)
+                PaintFullRowSelectSelectionStyle(info);
+            else if (info.SelectionBoxStyle == eSelectionStyle.NodeMarker)
+                PaintNodeMarkerSelectionStyle(info);
+			
+		}
+
+        public void PaintHotTracking(SelectionRendererEventArgs info)
+        {
+            // Full row is just a rectangle with the background...
+            Shape[] fullRowShapes = GetHotTrackingShapes();
+            Graphics g = info.Graphics;
+            Rectangle bounds = info.Bounds;
+            bounds.Width--;
+            bounds.Height--;
+            foreach (Shape shape in fullRowShapes)
+            {
+                shape.Paint(g, bounds);
+            }
+        }
+
+        private void PaintFullRowSelectSelectionStyle(SelectionRendererEventArgs info)
+        {
+            // Full row is just a rectangle with the background...
+            Shape[] fullRowShapes = GetFullRowShapes(info.TreeActive);
+            Graphics g = info.Graphics;
+            Rectangle bounds = info.Bounds;
+            //bounds.Width--;
+            //bounds.Height--;
+
+            foreach (Shape shape in fullRowShapes)
+            {
+                shape.Paint(g, bounds);
+            }
+        }
+
+        Shape[] _FullRowShapes = null;
+        private Shape[] GetFullRowShapes(bool treeActive)
+        {
+            if (_FullRowShapes == null)
+            {
+                _FullRowShapes = new Shape[1];
+                _FullRowShapes[0] = new RectangleShape();
+            }
+            RectangleShape shape = (RectangleShape)_FullRowShapes[0];
+            SelectionColorTable colors = treeActive ? _SelectionColors.FullRowSelect : _SelectionColors.FullRowSelectInactive;
+            shape.Fill = colors.Fill;
+            shape.Border = colors.Border;
+
+            return _FullRowShapes;
+        }
+
+        private void PaintHighlightCellsSelectionStyle(SelectionRendererEventArgs info)
+        {
+            // Full row is just a rectangle with the background...
+            Shape[] fullRowShapes = GetHighlightCellsShapes(info.TreeActive);
+            Graphics g = info.Graphics;
+            Rectangle bounds = info.Bounds;
+            bounds.Width--;
+            bounds.Height--;
+            foreach (Shape shape in fullRowShapes)
+            {
+                shape.Paint(g, bounds);
+            }
+        }
+
+        Shape[] _HighlightCellsShapes = null;
+        private Shape[] GetHighlightCellsShapes(bool treeActive)
+        {
+            SelectionColorTable colorTable = treeActive ? _SelectionColors.HighlightCells : _SelectionColors.HighlightCellsInactive;
+
+            if (_HighlightCellsShapes == null || ((RectangleShape)_HighlightCellsShapes[0]).CornerRadius != null && ((RectangleShape)_HighlightCellsShapes[0]).CornerRadius.TopLeft != colorTable.BorderCornerRadius)
+            {
+                _HighlightCellsShapes = new Shape[1];
+                RectangleShape rectShape = new RectangleShape();
+                if (colorTable.BorderCornerRadius > 0)
+                {
+                    rectShape.CornerRadius = new CornerRadius(colorTable.BorderCornerRadius);
+                    RectangleShape inner = new RectangleShape();
+                    rectShape.Content = inner;
+                }
+                _HighlightCellsShapes[0] = rectShape;
+            }
+            
+            RectangleShape shape = (RectangleShape)_HighlightCellsShapes[0];
+            shape.Fill = colorTable.Fill;
+            shape.Border = colorTable.Border;
+            if (shape.Content != null)
+            {
+                shape = (RectangleShape)shape.Content;
+                shape.Border = colorTable.InnerBorder;
+            }
+
+            return _HighlightCellsShapes;
+        }
+
+        Shape[] _HotTrackingShapes = null;
+        private Shape[] GetHotTrackingShapes()
+        {
+            if (_HotTrackingShapes == null)
+            {
+                _HotTrackingShapes = new Shape[1];
+                RectangleShape rectShape = new RectangleShape();
+                rectShape.CornerRadius = new CornerRadius(2);
+                RectangleShape inner = new RectangleShape();
+                //inner.CornerRadius = new CornerRadius(2);
+                rectShape.Content = inner;
+                _HotTrackingShapes[0] = rectShape;
+            }
+
+            SelectionColorTable colorTable = _SelectionColors.NodeHotTracking;
+            RectangleShape shape = (RectangleShape)_HotTrackingShapes[0];
+            shape.Fill = colorTable.Fill;
+            shape.Border = colorTable.Border;
+            shape = (RectangleShape)shape.Content;
+            shape.Border = colorTable.InnerBorder;
+
+            return _HotTrackingShapes;
+        }
+
+        private void PaintNodeMarkerSelectionStyle(SelectionRendererEventArgs info)
+        {
+            Rectangle inside = info.Bounds;
+            int borderWidth = 4;
+            inside.Inflate(1, 1);
+            inside.Width--;
+            inside.Height--;
+            Rectangle outside = info.Bounds;
+            outside.Inflate(borderWidth, borderWidth);
+            outside.Width--;
+            outside.Height--;
+
+            SelectionColorTable colorTable = info.TreeActive ? _SelectionColors.NodeMarker : _SelectionColors.NodeMarkerInactive;
+
+            if (colorTable.Border != null)
+            {
+                Pen pen = colorTable.Border.CreatePen();
+                if (pen != null)
+                {
+                    info.Graphics.DrawRectangle(pen, inside);
+                    info.Graphics.DrawRectangle(pen, outside);
+                    pen.Dispose();
+                }
+            }
+
+            if (colorTable.Fill != null)
+            {
+                Brush brush = colorTable.Fill.CreateBrush(outside);
+                if (brush != null)
+                {
+                    Region region = new Region(outside);
+                    region.Exclude(inside);
+                    info.Graphics.FillRegion(brush, region);
+                    brush.Dispose();
+                }
+            }
+        }
+
+        private TreeSelectionColors _SelectionColors = null;
+        public TreeSelectionColors SelectionColors
+        {
+            get { return _SelectionColors; }
+            set { _SelectionColors = value; }
+        }
+	}
+
+	internal class NodeSelectionDisplayInfo
+	{
+		public Node Node=null;
+		public Graphics Graphics=null;
+		public Rectangle Bounds=Rectangle.Empty;
+		public Color BorderColor=Color.Empty;
+		public Color FillColor=Color.Empty;
+		public int Width=4;
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/Display/NodeSystemRenderer.cs b/PROMS/DotNetBar Source Code/AdvTree/Display/NodeSystemRenderer.cs
new file mode 100644
index 00000000..49f17339
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/Display/NodeSystemRenderer.cs	
@@ -0,0 +1,270 @@
+using System;
+using System.Drawing;
+using DevComponents.DotNetBar;
+using DevComponents.DotNetBar.Rendering;
+
+namespace DevComponents.AdvTree.Display
+{
+	/// <summary>
+	/// Represents default system node and cell renderer.
+	/// </summary>
+	public class NodeSystemRenderer:TreeRenderer
+	{
+		#region Private Variables
+		private NodeExpandEllipseDisplay m_NodeExpandEllipseDisplay=new NodeExpandEllipseDisplay();
+		private NodeExpandRectDisplay m_NodeExpandRectDisplay=new NodeExpandRectDisplay();
+        private NodeExpandTriangleDisplay m_NodeExpandTriangleDisplay = new NodeExpandTriangleDisplay();
+		private NodeExpandImageDisplay m_NodeExpandImageDisplay=new NodeExpandImageDisplay();
+		private ElementStyleDisplayInfo m_ElementStyleDisplayInfo=new ElementStyleDisplayInfo();
+		private NodeSelectionDisplay m_SelectionDisplay=new NodeSelectionDisplay();
+		private LineConnectorDisplay m_LineConnectorDisplay=null;
+        private DragDropMarkerDisplay m_DragDropMarkerDisplay = new DragDropMarkerDisplay();
+        private ColumnHeaderDisplay m_ColumnHeaderDisplay = new ColumnHeaderDisplay();
+        private Office2007CheckBoxItemPainter m_CheckBoxPainter = new Office2007CheckBoxItemPainter();
+        private NodeGroupLineDisplay _GroupLineDisplay = new NodeGroupLineDisplay();
+		#endregion
+		
+		#region Internal Implementation
+		/// <summary>
+		/// Returns ElementStyleDisplayInfo class that provides information for ElementStyle rendering.
+		/// </summary>
+		/// <param name="style">Reference to style.</param>
+		/// <param name="g">Reference to graphics object.</param>
+		/// <param name="bounds">Style bounds</param>
+		/// <returns>New instance of ElementStyleDisplayInfo</returns>
+		protected ElementStyleDisplayInfo GetElementStyleDisplayInfo(ElementStyle style, Graphics g, Rectangle bounds)
+		{
+			m_ElementStyleDisplayInfo.Style=style;
+			m_ElementStyleDisplayInfo.Graphics=g;
+			m_ElementStyleDisplayInfo.Bounds=bounds;
+			return m_ElementStyleDisplayInfo;
+		}
+		
+		private NodeConnectorDisplay GetConnectorDisplay(NodeConnector c)
+		{
+			NodeConnectorDisplay d=null;
+			if(c==null)
+				return null;
+
+			switch(c.ConnectorType)
+			{
+				case eNodeConnectorType.Line:
+				{
+					if(m_LineConnectorDisplay==null)
+						m_LineConnectorDisplay=new LineConnectorDisplay();
+					d=m_LineConnectorDisplay;
+					break;
+				}
+			}
+			return d;
+		}
+		
+		/// <summary>
+		/// Draws node background. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+		/// do not want default rendering to occur do not call the base implementation. You can call OnRenderNodeBackground method so events can occur.
+		/// </summary>
+		/// <param name="e">Information provided for rendering.</param>
+		public override void DrawNodeBackground(NodeRendererEventArgs e)
+		{
+            ElementStyleDisplayInfo di = GetElementStyleDisplayInfo(e.Style, e.Graphics, e.NodeBounds);
+			ElementStyleDisplay.Paint(di);
+			
+			base.DrawNodeBackground(e);
+		}
+		
+		/// <summary>
+		/// Draws node expand part. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+		/// do not want default rendering to occur do not call the base implementation. You can call OnRenderNodeExpandPart method so events can occur.
+		/// </summary>
+		/// <param name="e">Information provided for rendering.</param>
+		public override void DrawNodeExpandPart(NodeExpandPartRendererEventArgs e)
+		{
+            NodeExpandDisplay expandDisplay = GetExpandDisplay(e.ExpandButtonType);
+            expandDisplay.ColorTable = this.ColorTable;
+            expandDisplay.DrawExpandButton(e);
+            expandDisplay.ColorTable = null;
+			base.DrawNodeExpandPart(e);
+		}
+		
+		private NodeExpandDisplay GetExpandDisplay(eExpandButtonType e)
+		{
+			NodeExpandDisplay d=null;
+			switch(e)
+			{
+				case eExpandButtonType.Rectangle:
+					d=m_NodeExpandRectDisplay;
+					break;
+                case eExpandButtonType.Triangle:
+                    d = m_NodeExpandTriangleDisplay;
+                    break;
+                case eExpandButtonType.Ellipse:
+                    d = m_NodeExpandEllipseDisplay;
+                    break;
+				case eExpandButtonType.Image:
+					d= m_NodeExpandImageDisplay;
+					break;
+			}
+			return d;
+		}
+		
+        ///// <summary>
+        ///// Draws node command part. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+        ///// do not want default rendering to occur do not call the base implementation. You can call OnRenderNodeCommandPart method so events can occur.
+        ///// </summary>
+        ///// <param name="e">Information provided for rendering.</param>
+        //public override void DrawNodeCommandPart(NodeCommandPartRendererEventArgs e)
+        //{
+        //    m_NodeCommandDisplay.DrawCommandButton(e);
+        //    base.DrawNodeCommandPart(e);
+        //}
+		
+		/// <summary>
+		/// Draws cell background. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+		/// do not want default rendering to occur do not call the base implementation. You can call OnRenderCellBackground method so events can occur.
+		/// </summary>
+		/// <param name="e">Information provided for rendering.</param>
+		public override void DrawCellBackground(NodeCellRendererEventArgs e)
+		{
+			ElementStyleDisplayInfo di=GetElementStyleDisplayInfo(e.Style,e.Graphics,DisplayHelp.GetDrawRectangle(e.CellBounds));
+			ElementStyleDisplay.Paint(di);
+			
+			base.DrawCellBackground(e);
+		}
+		
+		/// <summary>
+		/// Draws cell check box.  If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+		/// do not want default rendering to occur do not call the base implementation. You can call OnRenderCellCheckBox method so events can occur.
+		/// </summary>
+		/// <param name="e">Information provided for rendering.</param>
+		public override void DrawCellCheckBox(NodeCellRendererEventArgs e)
+		{
+            CellDisplay.CheckBoxPainter = m_CheckBoxPainter;
+            if (Office2007ColorTable != null)
+                CellDisplay.ColorTable = Office2007ColorTable.CheckBoxItem;
+			CellDisplay.PaintCellCheckBox(e);
+			base.DrawCellCheckBox(e);
+            CellDisplay.CheckBoxPainter = null;
+		}
+		
+		/// <summary>
+		/// Draws cell image. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+		/// do not want default rendering to occur do not call the base implementation. You can call OnRenderCellImage method so events can occur.
+		/// </summary>
+		/// <param name="e">Information provided for rendering.</param>
+		public override void DrawCellImage(NodeCellRendererEventArgs e)
+		{
+			CellDisplay.PaintCellImage(e);
+			base.DrawCellImage(e);
+		}
+		
+		/// <summary>
+		/// Draws cell text. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+		/// do not want default rendering to occur do not call the base implementation. You can call OnRenderCellText method so events can occur.
+		/// </summary>
+		/// <param name="e">Information provided for rendering.</param>
+		public override void DrawCellText(NodeCellRendererEventArgs e)
+		{
+			CellDisplay.PaintText(e);
+			base.DrawCellText(e);
+		}
+		
+		/// <summary>
+		/// Draws selection for SelectedNode. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+		/// do not want default rendering to occur do not call the base implementation. You can call OnRenderSelection method so events can occur.
+		/// </summary>
+		/// <param name="e">Information provided for rendering.</param>
+		public override void DrawSelection(SelectionRendererEventArgs e)
+		{
+            m_SelectionDisplay.SelectionColors = ColorTable.Selection;
+			m_SelectionDisplay.PaintSelection(e);
+			base.DrawSelection(e);
+		}
+
+        /// <summary>
+        /// Draws hot-tracking marker for mouse over node. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+        /// do not want default rendering to occur do not call the base implementation. You can call OnRenderHotTracking method so events can occur.
+        /// </summary>
+        /// <param name="e">Information provided for rendering.</param>
+        public override void DrawHotTracking(SelectionRendererEventArgs e)
+        {
+            m_SelectionDisplay.SelectionColors = ColorTable.Selection;
+            m_SelectionDisplay.PaintHotTracking(e);
+            base.DrawHotTracking(e);
+        }
+		
+		/// <summary>
+		/// Draws connector between nodes. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+		/// do not want default rendering to occur do not call the base implementation. You can call OnRenderConnector method so events can occur.
+		/// </summary>
+		/// <param name="e">Information provided for rendering.</param>
+		public override void DrawConnector(ConnectorRendererEventArgs e)
+		{
+			NodeConnectorDisplay display = GetConnectorDisplay(e.NodeConnector);
+			if(display!=null)
+				display.DrawConnector(e);
+
+			base.DrawConnector(e);
+		}
+		
+		/// <summary>
+		/// Draws the tree background. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+		/// do not want default rendering to occur do not call the base implementation. You can call OnRenderTreeBackground method so events can occur.
+		/// </summary>
+		/// <param name="e">Information provided for rendering.</param>
+		public override void DrawTreeBackground(TreeBackgroundRendererEventArgs e)
+		{
+			AdvTree tree = e.AdvTree;
+			Graphics g = e.Graphics;
+			
+			if(!tree.BackColor.IsEmpty)
+			{
+				using(SolidBrush brush=new SolidBrush(tree.BackColor))
+					g.FillRectangle(brush,tree.DisplayRectangle);
+			}
+
+			ElementStyleDisplayInfo info=new ElementStyleDisplayInfo();
+			info.Bounds=tree.DisplayRectangle;
+			info.Graphics=g;
+			info.Style=tree.BackgroundStyle;
+			ElementStyleDisplay.Paint(info);
+			
+			base.DrawTreeBackground (e);
+		}
+
+        /// <summary>
+        /// Draws the drag &amp; drop marker that indicates the insertion point for the node. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+        /// do not want default rendering to occur do not call the base implementation. You can call OnRenderDragDropMarker method so events can occur.
+        /// </summary>
+        /// <param name="e">Information provided for rendering.</param>
+        public override void DrawDragDropMarker(DragDropMarkerRendererEventArgs e)
+        {
+            m_DragDropMarkerDisplay.MarkerColor = this.ColorTable.DragDropMarker;
+            m_DragDropMarkerDisplay.DrawMarker(e);
+            base.DrawDragDropMarker(e);
+        }
+
+        /// <summary>
+        /// Draws the column header. If you need to provide custom rendering this is the method that you should override in your custom renderer. If you
+        /// do not want default rendering to occur do not call the base implementation. You can call OnRenderColumnHeader method so events can occur.
+        /// </summary>
+        /// <param name="e">Information provided for rendering.</param>
+        public override void DrawColumnHeader(ColumnHeaderRendererEventArgs e)
+        {
+            ElementStyleDisplayInfo di = GetElementStyleDisplayInfo(e.Style, e.Graphics, e.Bounds);
+            m_ColumnHeaderDisplay.DrawColumnHeader(e, di);
+            base.DrawColumnHeader(e);
+        }
+
+        /// <summary>
+        /// Draws node group line when in tile view. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+        /// do not want default rendering to occur do not call the base implementation. You can call OnRenderTileGroupLine method so events can occur.
+        /// </summary>
+        /// <param name="e">Information provided for rendering.</param>
+        public override void DrawTileGroupLine(NodeRendererEventArgs e)
+        {
+            _GroupLineDisplay.DrawGroupLine(e);
+            OnRenderTileGroupLine(e);
+        }
+		#endregion
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/Display/NodeTreeDisplay.cs b/PROMS/DotNetBar Source Code/AdvTree/Display/NodeTreeDisplay.cs
new file mode 100644
index 00000000..8653e3a3
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/Display/NodeTreeDisplay.cs	
@@ -0,0 +1,1139 @@
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System;
+using System.Collections;
+using DevComponents.DotNetBar;
+using DevComponents.DotNetBar.Rendering;
+
+namespace DevComponents.AdvTree.Display
+{
+	/// <summary>
+	/// Summary description for NodeTreeDisplay.
+	/// </summary>
+	public class NodeTreeDisplay:NodeDisplay
+	{
+		#region Private Variables
+		// Cashed objects
+		ElementStyleDisplayInfo m_ElementStyleDisplayInfo=new ElementStyleDisplayInfo();
+		NodeCellRendererEventArgs m_CellDisplayInfo=new NodeCellRendererEventArgs();
+//		CurveConnectorDisplay m_CurveConnectorDisplay=null;
+//		LineConnectorDisplay m_LineConnectorDisplay=null;
+		private NodeSystemRenderer m_SystemRenderer=new NodeSystemRenderer();
+		//private NodeProfessionalRenderer m_ProfRenderer=new NodeProfessionalRenderer();
+		#endregion
+		/// <summary>Creates new instance of the class</summary>
+		/// <param name="tree">Object to initialize class with.</param>
+		public NodeTreeDisplay(AdvTree tree):base(tree)
+		{
+            m_SystemRenderer.ColorTable = new TreeColorTable();
+            ColorTableInitializer.InitOffice2007Blue(m_SystemRenderer.ColorTable, new ColorFactory());
+		}
+
+        public NodeSystemRenderer SystemRenderer
+        {
+            get { return m_SystemRenderer; }
+            set { m_SystemRenderer = value; }
+        }
+
+        public TreeRenderer GetTreeRenderer()
+        {
+            TreeRenderer renderer = m_SystemRenderer;
+            if (this.Tree.NodeRenderer != null && this.Tree.RenderMode == eNodeRenderMode.Custom)
+                renderer = this.Tree.NodeRenderer;
+            if (GlobalManager.Renderer is Office2007Renderer)
+            {
+                renderer.Office2007ColorTable = ((Office2007Renderer)GlobalManager.Renderer).ColorTable;
+                renderer.ColorTable = renderer.Office2007ColorTable.AdvTree;
+            }
+
+            return renderer;
+        }
+
+        private NodeDisplayContext CreateDisplayContext(Graphics g, Rectangle clipRectangle)
+        {
+            NodeDisplayContext context = new NodeDisplayContext();
+            context.Graphics = g;
+            context.DefaultFont = this.Tree.Font;
+            context.ClipRectangle = clipRectangle;
+            context.Offset = this.Offset;
+            context.Styles = this.Tree.Styles;
+            context.IsBackgroundSelection = IsBackgroundSelection;
+            context.ClientRectangle = ElementStyleLayout.GetInnerRect(Tree.BackgroundStyle, Tree.ClientRectangle);
+            context.ColorScheme = Tree.ColorScheme;
+            context.GridRowLines = Tree.GridRowLines;
+            context.GridRowLineColor = Tree.GridLinesColor;
+            context.CellSelection = Tree.SelectionPerCell;
+            context.AlternateRowBrush = CreateBrush(Tree.AlternateRowColor);
+            context.DrawAlternateRowBackground = !Tree.AlternateRowColor.IsEmpty;
+            context.View = this.Tree.View;
+            context.TileGroupLineColor = this.Tree.TileGroupLineColor;
+            // Setup rendering
+            context.NodeRenderer = m_SystemRenderer;
+            if (this.Tree.NodeRenderer != null && this.Tree.RenderMode == eNodeRenderMode.Custom)
+                context.NodeRenderer = this.Tree.NodeRenderer;
+            if (GlobalManager.Renderer is Office2007Renderer)
+            {
+                context.NodeRenderer.Office2007ColorTable = ((Office2007Renderer)GlobalManager.Renderer).ColorTable;
+                context.NodeRenderer.ColorTable = context.NodeRenderer.Office2007ColorTable.AdvTree;
+            }
+
+            context.NodeRendererEventArgs = new NodeRendererEventArgs();
+
+            if (this.Tree.NodeStyle != null)
+                context.DefaultNodeStyle = this.Tree.NodeStyle;
+            else
+                context.DefaultNodeStyle = GetDefaultNodeStyle();
+
+            if (this.Tree.NodeStyleExpanded != null)
+                context.ExpandedNodeStyle = this.Tree.NodeStyleExpanded;
+            if (this.Tree.NodeStyleSelected != null)
+                context.SelectedNodeStyle = this.Tree.NodeStyleSelected;
+            if (this.Tree.NodeStyleMouseOver != null)
+                context.MouseOverNodeStyle = this.Tree.NodeStyleMouseOver;
+
+            if (this.Tree.CellStyleDefault != null)
+                context.CellStyleDefault = this.Tree.CellStyleDefault;
+            if (this.Tree.CellStyleDisabled != null)
+                context.CellStyleDisabled = this.Tree.CellStyleDisabled;
+            else
+                context.CellStyleDisabled = ElementStyle.GetDefaultDisabledCellStyle();
+            if (this.Tree.CellStyleMouseDown != null)
+                context.CellStyleMouseDown = this.Tree.CellStyleMouseDown;
+            if (this.Tree.CellStyleMouseOver != null)
+                context.CellStyleMouseOver = this.Tree.CellStyleMouseOver;
+            if (this.Tree.CellStyleSelected != null)
+                context.CellStyleSelected = this.Tree.CellStyleSelected;
+            else
+                context.CellStyleSelected = ElementStyle.GetDefaultSelectedCellStyle();
+
+            // Setup connector
+            context.ConnectorDisplayInfo = new ConnectorRendererEventArgs();
+            context.ConnectorDisplayInfo.Graphics = context.Graphics;
+            
+            // Setup Node Expander Painter
+            context.ExpandDisplayInfo = new NodeExpandPartRendererEventArgs(context.Graphics);
+            context.ExpandDisplayInfo.BackColor = this.Tree.GetColor(this.Tree.ExpandBackColor, this.Tree.ExpandBackColorSchemePart);
+            context.ExpandDisplayInfo.BackColor2 = this.Tree.GetColor(this.Tree.ExpandBackColor2, this.Tree.ExpandBackColor2SchemePart);
+            
+            context.ExpandDisplayInfo.BackColorGradientAngle = this.Tree.ExpandBackColorGradientAngle;
+            context.ExpandDisplayInfo.BorderColor = this.Tree.GetColor(this.Tree.ExpandBorderColor, this.Tree.ExpandBorderColorSchemePart);
+            context.ExpandDisplayInfo.ExpandLineColor = this.Tree.GetColor(this.Tree.ExpandLineColor, this.Tree.ExpandLineColorSchemePart);
+            context.ExpandDisplayInfo.Graphics = context.Graphics;
+            context.ExpandDisplayInfo.ExpandButtonType = this.Tree.ExpandButtonType;
+            context.ExpandDisplayInfo.ExpandImage = this.Tree.ExpandImage;
+            context.ExpandDisplayInfo.ExpandImageCollapse = this.Tree.ExpandImageCollapse;
+            
+            // Setup Selection Display
+            context.SelectionDisplayInfo = new SelectionRendererEventArgs();
+            context.SelectionDisplayInfo.Graphics = context.Graphics;
+            context.SelectionDisplayInfo.SelectionBoxStyle = this.Tree.SelectionBoxStyle;
+            context.SelectionDisplayInfo.TreeActive = this.Tree.IsKeyboardFocusWithin || !this.Tree.SelectionFocusAware;
+
+            return context;
+        }
+
+        private Brush CreateBrush(Color color)
+        {
+            if (color.IsEmpty) return null;
+            return new SolidBrush(color);
+        }
+
+		/// <summary>
+		/// Paints the tree on canvas.
+		/// </summary>
+		public override void Paint(Graphics g, Rectangle clipRectangle)
+		{
+			base.Paint(g,clipRectangle);
+
+            // Setup custom check box images if any
+            m_CellDisplayInfo.CheckBoxImageChecked = this.Tree.CheckBoxImageChecked;
+            m_CellDisplayInfo.CheckBoxImageUnChecked = this.Tree.CheckBoxImageUnChecked;
+            m_CellDisplayInfo.CheckBoxImageIndeterminate = this.Tree.CheckBoxImageIndeterminate;
+            m_CellDisplayInfo.ItemPaintArgs = new ItemPaintArgs(null, Tree, g, new ColorScheme());
+
+			// Paint header
+            if (GlobalManager.Renderer is Office2007Renderer)
+            {
+                m_SystemRenderer.Office2007ColorTable = ((Office2007Renderer)GlobalManager.Renderer).ColorTable;
+                m_CellDisplayInfo.ItemPaintArgs.Colors = m_SystemRenderer.Office2007ColorTable.LegacyColors;
+                m_CellDisplayInfo.ItemPaintArgs.Renderer = GlobalManager.Renderer;
+            }
+			// Paint Nodes...
+            NodeDisplayContext context = CreateDisplayContext(g, clipRectangle);
+            
+			if(this.Tree.SelectedPathConnector!=null)
+			{
+				// Prepare nodes for path display. Downstream nodes are easily recognized when
+				// path upstream nodes need special treatment to improve performance
+				if(this.Tree.SelectedNode!=null)
+				{
+					Node n=this.Tree.SelectedNode;
+					while(n!=null)
+					{
+						// This marker will be reset once node is painted...
+						n.SelectedConnectorMarker = true;
+						n=n.Parent;
+					}
+				}
+				//context.SelectedPathConnectorDisplay=GetConnectorDisplay(this.Tree.SelectedPathConnector);
+			}
+
+            if (context.DrawAlternateRowBackground)
+            {
+                PaintAlternateRowBackground(context);
+            }
+
+            // Paint Grid Lines
+            if (this.Tree.GridColumnLines && this.Tree.Columns.Count > 0)
+            {
+                PaintGridLines(context);
+            }
+
+            // Paint background for nodes with full row background
+            if (this.Tree.FullRowBackgroundNodes != null && this.Tree.FullRowBackgroundNodes.Count > 0)
+                PaintFullRowBackgroundForNodes(context, this.Tree.FullRowBackgroundNodes);
+
+            // Paint selection
+            if (context.IsBackgroundSelection)
+            {
+                PaintSelection(context);
+            }
+            if (Tree.HotTracking)
+                PaintHotTracking(context);
+            Rectangle innerRect = Tree.GetPaintRectangle();
+		    Rectangle clientRect = Tree.ClientRectangle;
+		    
+            if(innerRect == clipRectangle || clientRect == clipRectangle || clipRectangle.IsEmpty)
+                _PaintedNodes.Clear();
+            
+			if(this.Tree.DisplayRootNode!=null)
+				this.PaintNode(this.Tree.DisplayRootNode, context);
+			else
+				this.PaintNodes(this.Tree.Nodes, context);
+
+			Node dragNode=this.Tree.GetDragNode();
+			if(dragNode!=null && dragNode.Parent==null)
+			{
+				Point p=context.Offset;
+				context.Offset=Point.Empty;
+				PaintNode(dragNode,context);
+				context.Offset=p;
+			}
+            if (this.Tree.IsDragDropInProgress && this.Tree.PaintDragDropInsertMarker)
+            {
+                PaintDragInsertMarker(context, this.Tree.GetDragInsertionBounds(this.Tree.GetNodeDragInfo()));
+            }
+
+            if(!context.IsBackgroundSelection)
+			    PaintSelection(context);
+
+            if (context.AlternateRowBrush != null)
+            {
+                context.AlternateRowBrush.Dispose();
+                context.AlternateRowBrush = null;
+            }
+		}
+
+        private void PaintAlternateRowBackground(NodeDisplayContext context)
+        {
+            if (this.Tree.DisplayRootNode != null)
+            {
+                context.AlternateRowFlag = true;
+                PaintAlternateRowBackground(context, this.Tree.DisplayRootNode.Nodes);
+            }
+            else
+            {
+                PaintAlternateRowBackground(context, this.Tree.Nodes);
+            }
+        }
+
+        private void PaintAlternateRowBackground(NodeDisplayContext context, NodeCollection nodeCollection)
+        {
+            foreach (Node node in nodeCollection)
+            {
+                if (!node.Visible) continue;
+                Rectangle r = NodeDisplay.GetNodeRectangle(eNodeRectanglePart.NodeContentBounds, node, context.Offset);
+                if (r.Y > context.ClientRectangle.Bottom) break;
+
+                if (r.Y >= context.ClientRectangle.Y)
+                {
+                    if (context.AlternateRowFlag)
+                    {
+                        Rectangle backRect = new Rectangle(context.ClientRectangle.X, r.Y - 1, context.ClientRectangle.Width, r.Height + 1);
+                        context.Graphics.FillRectangle(context.AlternateRowBrush, backRect);
+                    }
+                }
+                context.AlternateRowFlag = !context.AlternateRowFlag;
+
+                if (node.Expanded && node.HasChildNodes) PaintAlternateRowBackground(context, node.Nodes);
+            }
+        }
+
+        public void ExternalPaintNode(Node node, Graphics g, Rectangle bounds)
+        {
+            // Setup custom check box images if any
+            m_CellDisplayInfo.CheckBoxImageChecked = this.Tree.CheckBoxImageChecked;
+            m_CellDisplayInfo.CheckBoxImageUnChecked = this.Tree.CheckBoxImageUnChecked;
+            m_CellDisplayInfo.CheckBoxImageIndeterminate = this.Tree.CheckBoxImageIndeterminate;
+
+            // Paint header
+            if (GlobalManager.Renderer is Office2007Renderer)
+                m_SystemRenderer.Office2007ColorTable = ((Office2007Renderer)GlobalManager.Renderer).ColorTable;
+            // Paint Nodes...
+            NodeDisplayContext context = CreateDisplayContext(g, bounds);
+            context.ExpandDisplayInfo = null;
+            context.ConnectorDisplayInfo = null;
+
+            // Update offset
+            context.Offset = new Point(bounds.X - node.BoundsRelative.X, bounds.Y - node.BoundsRelative.Y);
+
+            PaintSingleNode(node, context);
+        }
+
+        private void PaintGridLines(NodeDisplayContext context)
+        {
+            PaintGridLines(context, Tree.Columns, context.ClientRectangle);   
+        }
+
+        private void PaintGridLines(NodeDisplayContext context, ColumnHeaderCollection columnHeaderCollection, Rectangle bounds)
+        {
+            Color color = this.Tree.GridLinesColor.IsEmpty ? context.NodeRenderer.ColorTable.GridLines : this.Tree.GridLinesColor;
+            Graphics g = context.Graphics;
+            for (int i = 0; i < columnHeaderCollection.Count; i++)
+            {
+                ColumnHeader columnHeader = columnHeaderCollection.ColumnAtDisplayIndex(i);
+                if (!columnHeader.Visible || columnHeader.Bounds.Width <= 0) continue;
+                Rectangle r = columnHeader.Bounds;
+                r.Offset(context.Offset);
+                if (columnHeaderCollection.ParentNode == null)
+                {
+                    r.Offset(bounds.Location);
+                    if (!columnHeader.CellsBackColor.IsEmpty)
+                    {
+                        SmoothingMode oldSmoothing = g.SmoothingMode;
+                        g.SmoothingMode = SmoothingMode.None;
+                        Rectangle rBack = new Rectangle(r.X - 5, context.ClientRectangle.Y, r.Width + 4, context.ClientRectangle.Height);
+                        using (SolidBrush brush = new SolidBrush(columnHeader.CellsBackColor))
+                            g.FillRectangle(brush, rBack);
+                        g.SmoothingMode = oldSmoothing;
+                    }
+                }
+                DisplayHelp.DrawLine(g, r.Right - (columnHeader.IsLastVisible ? 0 : 1), bounds.Y, r.Right - (columnHeader.IsLastVisible ? 0 : 1), bounds.Bottom, color, 1);
+            }
+        }
+
+        private void PaintFullRowBackgroundForNodes(NodeDisplayContext context, ArrayList nodesCollection)
+        {
+            Rectangle clientRectangle = context.ClientRectangle;
+            if (this.Tree.VScrollBar != null) clientRectangle.Width -= this.Tree.VScrollBar.Width;
+
+            foreach (Node node in nodesCollection)
+            {
+                Rectangle r = NodeDisplay.GetNodeRectangle(eNodeRectanglePart.NodeContentBounds, node, context.Offset);
+
+                if (!r.IsEmpty)
+                {
+                    r.X = clientRectangle.X;
+                    r.Width = clientRectangle.Width;
+                    r.Inflate(0, 1);
+                }
+
+                if (r.IsEmpty || !r.IntersectsWith(context.ClipRectangle) && !context.ClipRectangle.IsEmpty)
+                    continue;
+                ElementStyle style = GetEffectiveNodeBackgroundStyle(node, context);
+                if (style == null)
+                    continue;
+                TreeRenderer renderer = context.NodeRenderer;
+                if (node.NodeRenderer != null && node.RenderMode == eNodeRenderMode.Custom)
+                    renderer = node.NodeRenderer;
+                if (style != null)
+                {
+                    context.NodeRendererEventArgs.Graphics = context.Graphics;
+                    context.NodeRendererEventArgs.Node = node;
+                    context.NodeRendererEventArgs.NodeBounds = r;
+                    context.NodeRendererEventArgs.Style = style;
+                    renderer.DrawNodeBackground(context.NodeRendererEventArgs);
+                }
+            }
+        }
+
+        private void PaintDragInsertMarker(NodeDisplayContext context, Rectangle dragInsertionBounds)
+        {
+            if (dragInsertionBounds.IsEmpty) return;
+            context.NodeRenderer.DrawDragDropMarker(new DragDropMarkerRendererEventArgs(context.Graphics, dragInsertionBounds));
+        }
+        
+        public bool IsBackgroundSelection
+        {
+            get { return this.Tree.SelectionBoxStyle != eSelectionStyle.NodeMarker; }
+        }
+        
+		private void PaintSelection(NodeDisplayContext context)
+		{
+            if (!this.Tree.MultiSelect && this.Tree.SelectedNode != null && this.Tree.SelectedNode.Visible && this.Tree.SelectionBox && !(this.Tree.HideSelection && !this.Tree.Focused))
+			{
+                PaintNodeSelection(this.Tree.SelectedNode, context);
+			}
+            else if (this.Tree.MultiSelect && this.Tree.SelectedNodes.Count>0 && this.Tree.SelectionBox && !(this.Tree.HideSelection && !this.Tree.Focused))
+            {
+                foreach (Node node in Tree.SelectedNodes)
+                {
+                    if(node.IsVisible)
+                        PaintNodeSelection(node, context);    
+                }
+            }
+		}
+
+        private void PaintNodeSelection(Node node, NodeDisplayContext context)
+        {
+            if (!node.IsSelectionVisible) return;
+
+            context.SelectionDisplayInfo.Node = node;
+            Rectangle r;
+            if (this.Tree.SelectionBoxStyle == eSelectionStyle.FullRowSelect)
+            {
+                if (context.CellSelection)
+                {
+                    Cell cell = context.SelectionDisplayInfo.Node.SelectedCell != null ? context.SelectionDisplayInfo.Node.SelectedCell : context.SelectionDisplayInfo.Node.Cells[0];
+                    r = NodeDisplay.GetCellRectangle(eCellRectanglePart.CellBounds, 
+                        cell, context.Offset);
+                }
+                else
+                {
+                    r = NodeDisplay.GetNodeRectangle(eNodeRectanglePart.NodeContentBounds, context.SelectionDisplayInfo.Node, context.Offset);
+                    r.X = context.ClientRectangle.X;
+                    r.Width = context.ClientRectangle.Width;
+                }
+                if(context.GridRowLines)
+                    r.Inflate(0, (int)Math.Floor((float)Tree.NodeSpacing / 2));
+                else
+                    r.Inflate(0, (int)Math.Ceiling((float)Tree.NodeSpacing / 2));
+            }
+            else if (this.Tree.SelectionBoxStyle == eSelectionStyle.HighlightCells)
+            {
+                if (context.CellSelection)
+                {
+                    Cell cell = context.SelectionDisplayInfo.Node.SelectedCell != null ? context.SelectionDisplayInfo.Node.SelectedCell : context.SelectionDisplayInfo.Node.Cells[0];
+                    r = NodeDisplay.GetCellRectangle(eCellRectanglePart.CellBounds,
+                        cell, context.Offset);
+                }
+                else
+                {
+                    r = NodeDisplay.GetNodeRectangle(eNodeRectanglePart.CellsBounds, context.SelectionDisplayInfo.Node, context.Offset);
+                }
+                r.Inflate(2, 2);
+                if (r.Right > context.ClientRectangle.Right)
+                    r.Width -= (r.Right - context.ClientRectangle.Right);
+                    
+            }
+            else
+            {
+                if (context.CellSelection)
+                {
+                    Cell cell = context.SelectionDisplayInfo.Node.SelectedCell != null ? context.SelectionDisplayInfo.Node.SelectedCell : context.SelectionDisplayInfo.Node.Cells[0];
+                    r = NodeDisplay.GetCellRectangle(eCellRectanglePart.CellBounds,
+                        cell, context.Offset);
+                }
+                else
+                {
+                    r = NodeDisplay.GetNodeRectangle(eNodeRectanglePart.NodeContentBounds, context.SelectionDisplayInfo.Node, context.Offset);
+                }
+            }
+
+            context.SelectionDisplayInfo.Bounds = r;
+            context.NodeRenderer.DrawSelection(context.SelectionDisplayInfo);
+        }
+
+        private void PaintHotTracking(NodeDisplayContext context)
+        {
+            Node node = this.Tree.MouseOverNode;
+            if (node != null && !node.IsSelected && node.Selectable)
+            {
+                Rectangle r = NodeDisplay.GetNodeRectangle(eNodeRectanglePart.CellsBounds, node, context.Offset);
+                r.Inflate(2, 2);
+                context.SelectionDisplayInfo.Node = node;
+                context.SelectionDisplayInfo.Bounds = r;
+                context.NodeRenderer.DrawHotTracking(context.SelectionDisplayInfo);
+            }
+        }
+
+        private Node PaintNodes(NodeCollection nodes, NodeDisplayContext context)
+        {
+            Node lastPainted = null;
+            int count = nodes.Count;
+            int start = 0;
+
+            // Find first node to render in case there are lot of them
+            if (context.View == eView.Tree && count > 99 && /*this.Tree.NodesConnector == null &&*/ context.Offset.Y != 0)
+            {
+                int testIndex = count / 2;
+                int chunk = testIndex;
+                while (testIndex > 0 && testIndex < count)
+                {
+                    chunk = chunk / 2;
+                    Node node = nodes[testIndex];
+                    if (!node.Visible)
+                    {
+                        int ti = testIndex + 1;
+                        while (ti < count)
+                        {
+                            node = nodes[ti];
+                            ti++;
+                            if (node.Visible) break;
+                        }
+                        if (!node.Visible)
+                        {
+                            ti = testIndex - 1;
+                            while (ti >= 0)
+                            {
+                                node = nodes[ti];
+                                ti--;
+                                if (node.Visible) break;
+                            }
+                        }
+                    }
+                    if (!node.Visible)
+                    {
+                        start = 0;
+                        break;
+                    }
+                    Rectangle r = NodeDisplay.GetNodeRectangle(eNodeRectanglePart.NodeContentBounds, node, context.Offset);
+                    if (chunk > 0 && r.Y > context.ClipRectangle.Bottom) // go back
+                        testIndex -= chunk;
+                    else if (chunk > 0 && r.Y < context.ClipRectangle.Y) // go forward
+                        testIndex += chunk;
+                    else
+                    {
+                        if (testIndex == 0) break;
+                        testIndex--;
+                        for (int i = testIndex; i >= 0; i--)
+                        {
+                            node = nodes[i];
+                            if (!node.Visible) continue;
+                            r = NodeDisplay.GetNodeRectangle(eNodeRectanglePart.NodeContentBounds, node, context.Offset);
+                            if (r.Y < context.ClipRectangle.Y)
+                            {
+                                start = i;
+                                break;
+                            }
+                        }
+                        break;
+                    }
+                }
+            }
+
+            bool clipEmpty = context.ClipRectangle.IsEmpty;
+            for (int i = start; i < count; i++)
+            {
+                Node node = nodes[i];
+                if (PaintNode(node, context))
+                {
+                    lastPainted = node;
+                    Rectangle r = NodeDisplay.GetNodeRectangle(eNodeRectanglePart.NodeContentBounds, node, context.Offset);
+                    if (!clipEmpty && r.Y > context.ClipRectangle.Bottom && !context.ClientRectangle.IsEmpty)
+                        break;
+                }
+            }
+            return lastPainted;
+        }
+
+		private bool PaintNode(Node node, NodeDisplayContext context)
+		{
+			if(!node.Visible)
+			{
+				node.SelectedConnectorMarker = false;
+				return false;
+			}
+
+			Rectangle r=NodeDisplay.GetNodeRectangle(eNodeRectanglePart.NodeContentBounds,node,context.Offset);
+			if(r.IsEmpty)
+			{
+				node.SelectedConnectorMarker = false;
+                return false;
+			}
+
+            if (context.GridRowLines && !node.IsDragNode)
+            {
+                DisplayHelp.DrawLine(context.Graphics, context.ClientRectangle.X, r.Bottom+1, context.ClientRectangle.Right, r.Bottom+1, context.GridRowLineColor, 1);
+            }
+
+            bool paintChildNodes = (node.Expanded && node.Nodes.Count > 0);
+            
+            if (!node.IsDragNode && (node.Parent != null || node.ExpandVisibility != eNodeExpandVisibility.Hidden))
+                this.PaintConnector(null, node, context, false);
+
+            if (paintChildNodes)
+            {
+                Node lastChildNode = NodeOperations.GetLastVisibleChildNode(node);
+                if (lastChildNode != null)
+                    this.PaintConnector(node, lastChildNode, context, false);
+            }
+
+            node.SelectedConnectorMarker = false;
+
+            if (NodeDisplay.HasColumnsVisible(node))
+            {
+                r.Height += node.ColumnHeaderHeight;
+                r.Width = Math.Max(r.Width, node.NodesColumns.Bounds.Width);
+            }
+            if (r.Y >= context.ClipRectangle.Y && r.Y <= context.ClipRectangle.Bottom ||
+                r.Bottom >= context.ClipRectangle.Y && r.Bottom <= context.ClipRectangle.Bottom ||
+                r.Y <= context.ClipRectangle.Y && r.Bottom > context.ClipRectangle.Y ||
+                context.ClipRectangle.IsEmpty)
+                PaintSingleNode(node, context);
+            
+            if (paintChildNodes)
+            {
+                PaintNodes(node.Nodes, context);
+            }
+
+            return true;
+		}
+
+        private ElementStyle GetEffectiveNodeBackgroundStyle(Node node, NodeDisplayContext context)
+        {
+            ElementStyle style = context.DefaultNodeStyle.Copy();
+
+            bool bApplyStyles = true;
+            bool isSelected = (node.IsSelected && node.IsSelectionVisible);
+
+            if (isSelected && context.SelectedNodeStyle == null && node.StyleSelected == null && !node.FullRowBackground) bApplyStyles = false;
+
+            if (isSelected && (context.SelectedNodeStyle == null || context.SelectedNodeStyle.TextColor.IsEmpty) &&
+                (node.StyleSelected == null || node.StyleSelected.TextColor.IsEmpty))
+            {
+                eSelectionStyle ss = Tree.SelectionBoxStyle;
+                TreeSelectionColors table = context.NodeRenderer.ColorTable.Selection;
+                if (context.SelectionDisplayInfo.TreeActive)
+                {
+                    if (ss == eSelectionStyle.FullRowSelect && !table.FullRowSelect.TextColor.IsEmpty)
+                        style.TextColor = table.FullRowSelect.TextColor;
+                    else if (ss == eSelectionStyle.HighlightCells && !table.HighlightCells.TextColor.IsEmpty)
+                        style.TextColor = table.HighlightCells.TextColor;
+                    else if (ss == eSelectionStyle.NodeMarker && !table.NodeMarker.TextColor.IsEmpty)
+                        style.TextColor = table.NodeMarker.TextColor;
+                }
+                else
+                {
+                    if (ss == eSelectionStyle.FullRowSelect && !table.FullRowSelectInactive.TextColor.IsEmpty)
+                        style.TextColor = table.FullRowSelectInactive.TextColor;
+                    else if (ss == eSelectionStyle.HighlightCells && !table.HighlightCellsInactive.TextColor.IsEmpty)
+                        style.TextColor = table.HighlightCellsInactive.TextColor;
+                    else if (ss == eSelectionStyle.NodeMarker && !table.NodeMarkerInactive.TextColor.IsEmpty)
+                        style.TextColor = table.NodeMarkerInactive.TextColor;
+                }
+
+            }
+            else if (this.Tree.HotTracking && !node.IsSelected && node.Selectable && this.Tree.MouseOverNode == node)
+            {
+                SelectionColorTable table = context.NodeRenderer.ColorTable.Selection.NodeHotTracking;
+                if (!table.TextColor.IsEmpty)
+                    style.TextColor = table.TextColor;
+            }
+
+            if (node.Style != null)
+            {
+                if (bApplyStyles)
+                    style.ApplyStyle(node.Style); //=node.Style.Copy();
+                else
+                    style.ApplyFontStyle(node.Style);
+            }
+
+            if (bApplyStyles && node.MouseOverNodePart == eMouseOverNodePart.Node && style != null)
+            {
+                ElementStyle mouseOverStyle = context.MouseOverNodeStyle;
+                if (node.StyleMouseOver != null)
+                {
+                    mouseOverStyle = node.StyleMouseOver;
+                    bApplyStyles = false;
+                }
+                if (mouseOverStyle != null)
+                {
+                    style.ApplyStyle(mouseOverStyle);
+                    bApplyStyles = false;
+                }
+            }
+
+            // On default style apply expanded style
+            if (bApplyStyles && node.Expanded && style != null)
+            {
+                ElementStyle expandedStyle = context.ExpandedNodeStyle;
+                if (node.StyleExpanded != null)
+                    expandedStyle = node.StyleExpanded;
+                if (expandedStyle != null)
+                    style.ApplyStyle(expandedStyle);
+            }
+
+            // Apply selected style if needed too
+            if (bApplyStyles && node.IsSelected && style != null)
+            {
+                ElementStyle selectedStyle = context.SelectedNodeStyle;
+                if (node.StyleSelected != null)
+                    selectedStyle = node.StyleSelected;
+                if (selectedStyle != null)
+                    style.ApplyStyle(selectedStyle);
+            }
+
+            if (style != null)
+            {
+                if (style.Font == null)
+                    style.Font = context.DefaultFont;
+            }
+
+            return style;
+        }
+
+		private void PaintSingleNode(Node node, NodeDisplayContext context)
+		{
+            _PaintedNodes.Add(node);
+			Rectangle r=NodeDisplay.GetNodeRectangle(eNodeRectanglePart.NodeContentBounds,node,context.Offset);
+			TreeRenderer renderer=context.NodeRenderer;
+			if(node.NodeRenderer!=null && node.RenderMode==eNodeRenderMode.Custom)
+				renderer = node.NodeRenderer;
+            bool isSelected = node.IsSelectionVisible && node.IsSelected;
+
+			// Paint node background
+            ElementStyle style = GetEffectiveNodeBackgroundStyle(node, context);
+
+			Region backRegion=null;
+			if(style!=null)
+			{
+				context.NodeRendererEventArgs.Graphics=context.Graphics;
+				context.NodeRendererEventArgs.Node = node;
+				context.NodeRendererEventArgs.NodeBounds = r;
+				context.NodeRendererEventArgs.Style = style;
+                if (!node.FullRowBackground) // Node full row backgrounds are drawn first...
+                    renderer.DrawNodeBackground(context.NodeRendererEventArgs);
+                ElementStyleDisplayInfo di = new ElementStyleDisplayInfo(style, context.Graphics, context.NodeRendererEventArgs.NodeBounds);
+                di.Bounds.Inflate(1, 1);
+				backRegion=ElementStyleDisplay.GetStyleRegion(di);
+                di.Bounds = r;
+			}
+
+            if (NodeDisplay.DrawExpandPart(node) && context.ExpandDisplayInfo != null)
+            {
+                r = NodeDisplay.GetNodeRectangle(eNodeRectanglePart.ExpandBounds, node, context.Offset);
+                context.ExpandDisplayInfo.Node = node;
+                context.ExpandDisplayInfo.ExpandPartBounds = r;
+                context.ExpandDisplayInfo.IsMouseOver = node.MouseOverNodePart == eMouseOverNodePart.Expand;
+                renderer.DrawNodeExpandPart(context.ExpandDisplayInfo);
+            }
+
+            if (NodeDisplay.HasColumnsVisible(node))
+            {
+                PaintColumnHeaders(node.NodesColumns, context.Graphics, false);
+            }
+
+			Region oldRegion=null;
+			if(backRegion!=null)
+			{
+				oldRegion=context.Graphics.Clip;
+				context.Graphics.SetClip(backRegion,CombineMode.Intersect);
+			}
+			
+			ElementStyle cellStyle = null;
+            if (context.CellStyleDefault == null)
+            {
+                cellStyle = new ElementStyle();
+                cellStyle.TextColor = style.TextColor;
+                cellStyle.TextShadowColor = style.TextShadowColor;
+                cellStyle.TextShadowOffset = style.TextShadowOffset;
+                cellStyle.TextAlignment = style.TextAlignment;
+                cellStyle.TextLineAlignment = style.TextLineAlignment;
+                cellStyle.TextTrimming = style.TextTrimming;
+                cellStyle.WordWrap = style.WordWrap;
+                cellStyle.Font = style.Font;
+                cellStyle.UseMnemonic = style.UseMnemonic;
+            }
+            
+			foreach(Cell cell in node.Cells)
+			{
+                if (!cell.IsVisible) continue;
+                if (cell.StyleNormal != null)
+                {
+                    if (context.CellStyleDefault != null)
+                        style = context.CellStyleDefault.Copy();
+                    else
+                        style = cellStyle.Copy();
+                    style.ApplyStyle(cell.StyleNormal);
+                }
+                else if (context.CellStyleDefault != null)
+                    style = context.CellStyleDefault.Copy();
+                else
+                {
+                    if (!cell.Enabled || cell.IsMouseDown && (cell.StyleMouseDown != null || context.CellStyleMouseDown != null) ||
+                        cell.IsSelected && (cell.StyleSelected != null || context.CellStyleSelected != null) ||
+                        cell.IsMouseOver && (cell.StyleMouseOver != null || context.CellStyleMouseOver != null))
+                        style = cellStyle.Copy();
+                    else
+                        style = cellStyle;
+                }
+
+				if(!cell.Enabled && cell.StyleDisabled!=null)
+					style.ApplyStyle(cell.StyleDisabled);
+				else if(!cell.Enabled && context.CellStyleDisabled!=null)
+					style.ApplyStyle(context.CellStyleDisabled);
+				else if(cell.IsMouseDown && cell.StyleMouseDown!=null)
+					style.ApplyStyle(cell.StyleMouseDown);
+				else if(cell.IsMouseDown && context.CellStyleMouseDown!=null)
+					style.ApplyStyle(context.CellStyleMouseDown);
+				else 
+				{
+                    if (cell.IsSelected && cell.StyleSelected != null)
+                        style.ApplyStyle(cell.StyleSelected);
+                    else if (cell.IsSelected && context.CellStyleSelected != null && context.CellStyleSelected.Custom)
+                        style.ApplyStyle(context.CellStyleSelected);
+                    else if (isSelected && !cell.IsSelected && this.Tree.SelectionPerCell)
+                        style.TextColor = context.DefaultNodeStyle.TextColor;
+
+					if(cell.IsMouseOver && cell.StyleMouseOver!=null)
+						style.ApplyStyle(cell.StyleMouseOver);
+					else if(cell.IsMouseOver && context.CellStyleMouseOver!=null)
+						style.ApplyStyle(context.CellStyleMouseOver);
+				}
+
+				r=NodeDisplay.GetNodeRectangle(eNodeRectanglePart.NodeBounds,node,context.Offset);
+				
+				if(style!=null)
+				{
+					if(style.Font==null)
+						style.Font=context.DefaultFont;
+                    if (isSelected)
+                    {
+                        style.BackColor = Color.Empty;
+                        style.BackColorSchemePart = eColorSchemePart.None;
+                        style.BackColor2 = Color.Empty;
+                        style.BackColor2SchemePart = eColorSchemePart.None;
+                    }
+
+					Rectangle rCell=cell.BoundsRelative;
+					Rectangle rText=cell.TextContentBounds;
+					rCell.Offset(r.Location);
+					rText.Offset(r.Location);
+					ElementStyleDisplayInfo di=GetElementStyleDisplayInfo(style,context.Graphics,rCell);
+					ElementStyleDisplay.Paint(di);
+					NodeCellRendererEventArgs ci=GetCellDisplayInfo(style,context.Graphics,cell,r.Location, context.ColorScheme);
+					
+					if(ci.Cell.CheckBoxVisible)
+						renderer.DrawCellCheckBox(ci);
+					if(!ci.Cell.Images.LargestImageSize.IsEmpty)
+						renderer.DrawCellImage(ci);
+					renderer.DrawCellText(ci);
+                    if (context.View == eView.Tile && node.HasChildNodes && !context.TileGroupLineColor.IsEmpty)
+                        renderer.DrawTileGroupLine(new NodeRendererEventArgs(context.Graphics, node, r, style, context.TileGroupLineColor));                        
+				}
+			}
+
+            if (backRegion != null)
+            {
+                context.Graphics.SetClip(oldRegion, CombineMode.Replace);
+                backRegion.Dispose();
+            }
+            if(oldRegion!=null) oldRegion.Dispose();
+		}
+
+		private void PaintConnector(Node fromNode, Node toNode, NodeDisplayContext context,bool linkConnector)
+		{
+			PaintConnector(fromNode, toNode, context, linkConnector, null);
+		}
+		
+		private void PaintConnector(Node fromNode, Node toNode, NodeDisplayContext context,bool linkConnector, ConnectorPointsCollection connectorPoints)
+		{
+            bool isRootNode = fromNode != null ? IsRootNode(fromNode) : IsRootNode(toNode);
+
+            if (context.View == eView.Tile || isRootNode && fromNode == null && toNode.Nodes.Count == 0 && toNode.ExpandVisibility != eNodeExpandVisibility.Visible || context.ConnectorDisplayInfo == null)
+                return;
+
+			context.ConnectorDisplayInfo.FromNode=fromNode;
+			context.ConnectorDisplayInfo.ToNode=toNode;
+			context.ConnectorDisplayInfo.IsRootNode=isRootNode;
+			context.ConnectorDisplayInfo.LinkConnector=linkConnector;
+            if (fromNode != null && fromNode.Style != null)
+                context.ConnectorDisplayInfo.StyleFromNode = fromNode.Style;
+            else
+                context.ConnectorDisplayInfo.StyleFromNode = context.DefaultNodeStyle;
+			if(toNode.Style!=null)
+				context.ConnectorDisplayInfo.StyleToNode=toNode.Style;
+			else
+				context.ConnectorDisplayInfo.StyleToNode=context.DefaultNodeStyle;
+			context.ConnectorDisplayInfo.Offset=context.Offset;
+			
+			/*if(linkConnector)
+			{
+				context.ConnectorDisplayInfo.NodeConnector=this.Tree.LinkConnector;
+			}
+			else*/ if(toNode.SelectedConnectorMarker)
+			{
+				context.ConnectorDisplayInfo.NodeConnector=this.Tree.SelectedPathConnector;
+			}
+			else if(toNode.ParentConnector!=null)
+			{
+				context.ConnectorDisplayInfo.NodeConnector=toNode.ParentConnector;
+			}
+            //else if(isRootNode)
+            //{
+            //    context.ConnectorDisplayInfo.NodeConnector=this.Tree.RootConnector;
+            //}
+			else
+			{
+				context.ConnectorDisplayInfo.NodeConnector=this.Tree.NodesConnector;
+			}
+
+			if(linkConnector)
+			{
+				context.ConnectorDisplayInfo.ConnectorPoints=connectorPoints;
+			}
+			else
+			{
+				if(connectorPoints!=null)
+					context.ConnectorDisplayInfo.ConnectorPoints=connectorPoints;
+				else
+					context.ConnectorDisplayInfo.ConnectorPoints=null;
+			}
+
+			context.NodeRenderer.DrawConnector(context.ConnectorDisplayInfo);
+		}
+
+		private void PaintConnector(Node toNode, NodeDisplayContext context)
+		{
+			PaintConnector(toNode.Parent, toNode, context,false);
+		}
+		
+//		private void MoveHostedControls(Node node, NodeDisplayContext context)
+//		{
+//			foreach(Cell cell in node.Cells)
+//			{
+//				if(cell.HostedControl!=null && cell.HostedControl.Visible)
+//				{
+//					Rectangle bounds = NodeDisplay.GetCellRectangle(eCellRectanglePart.TextBounds, cell, context.Offset);
+//					if(cell.HostedControl.Bounds!=bounds)
+//						cell.HostedControl.Bounds=bounds;
+//					return;
+//				}
+//			}
+//		}
+
+		private ElementStyleDisplayInfo GetElementStyleDisplayInfo(ElementStyle style, Graphics g, Rectangle bounds)
+		{
+			m_ElementStyleDisplayInfo.Style=style;
+			m_ElementStyleDisplayInfo.Graphics=g;
+			m_ElementStyleDisplayInfo.Bounds=bounds;
+			return m_ElementStyleDisplayInfo;
+		}
+
+		private NodeCellRendererEventArgs GetCellDisplayInfo(ElementStyle style, Graphics g, Cell cell, Point cellOffset, ColorScheme cs)
+		{
+			m_CellDisplayInfo.Cell=cell;
+			m_CellDisplayInfo.Graphics=g;
+			m_CellDisplayInfo.Style=style;
+			m_CellDisplayInfo.CellOffset=cellOffset;
+            m_CellDisplayInfo.ColorScheme = cs;
+			return m_CellDisplayInfo;
+		}
+        internal override void PaintColumnHeaders(ColumnHeaderCollection columns, Graphics g, bool treeControlHeader)
+        {
+             // Setup rendering
+            TreeRenderer renderer = m_SystemRenderer;
+            if (this.Tree.NodeRenderer != null && this.Tree.RenderMode == eNodeRenderMode.Custom)
+                renderer = this.Tree.NodeRenderer;
+            //else if (this.Tree.RenderMode == eNodeRenderMode.Professional)
+            //    renderer = m_ProfRenderer;
+            PaintColumnHeaders(renderer, columns, g, treeControlHeader);
+        }
+
+        internal void PaintColumnHeaders(TreeRenderer renderer, ColumnHeaderCollection columns, Graphics g, bool treeControlHeader)
+        {
+            ColumnHeaderRendererEventArgs ce = new ColumnHeaderRendererEventArgs();
+            ce.Graphics = g;
+            ce.Tree = this.Tree;
+            ce.SortIndicatorColor = renderer.ColorTable.ColumnSortIndicatorColor;
+
+            ElementStyle defaultNormalStyle = GetDefaultColumnStyleNormal(renderer);
+            ElementStyle headerStyle = null;
+            if(treeControlHeader)
+                headerStyle = this.Tree.ColumnsBackgroundStyle == null ? GetDefaultHeaderStyle(renderer) : this.Tree.ColumnsBackgroundStyle;
+            else
+                headerStyle = this.Tree.NodesColumnsBackgroundStyle == null ? GetDefaultNodesHeaderStyle(renderer) : this.Tree.NodesColumnsBackgroundStyle;
+
+            if (Tree.ColumnStyleNormal != null && Tree.ColumnStyleNormal.Custom)
+                defaultNormalStyle = Tree.ColumnStyleNormal;
+
+            Point offset = Point.Empty;
+            if (this.Tree.AutoScroll)
+            {
+                offset = this.Tree.GetAutoScrollPositionOffset();
+                if (treeControlHeader)
+                    offset.Y = 0;
+            }
+
+            Rectangle columnsBounds = columns.Bounds;
+            if (!treeControlHeader) columnsBounds.Offset(offset);
+            ElementStyleDisplayInfo di = new ElementStyleDisplayInfo(headerStyle, g, columnsBounds);
+            ElementStyleDisplay.Paint(di);
+            Color columnSeparator = (headerStyle != null && !headerStyle.BorderColor.IsEmpty) ? headerStyle.BorderColor : Color.Empty;
+            for (int i = 0; i < columns.Count; i++)
+            {
+                ColumnHeader column = columns.ColumnAtDisplayIndex(i);
+                if (!column.Visible) continue;
+                ElementStyle style = null;
+                if (column.StyleNormal != "")
+                    style = Tree.Styles[column.StyleNormal].Copy();
+                else
+                    style = defaultNormalStyle.Copy();
+
+                if (column.IsMouseDown)
+                {
+                    if (column.StyleMouseDown != "")
+                        style.ApplyStyle(Tree.Styles[column.StyleMouseDown]);
+                    else if (Tree.ColumnStyleMouseDown != null)
+                        style.ApplyStyle(Tree.ColumnStyleMouseDown);
+                }
+                else if (column.IsMouseOver)
+                {
+                    if (column.StyleMouseOver != "")
+                        style.ApplyStyle(Tree.Styles[column.StyleMouseOver]);
+                    else if (Tree.ColumnStyleMouseOver != null)
+                        style.ApplyStyle(Tree.ColumnStyleMouseOver);
+                }
+
+                ce.ColumnHeader = column;
+                Rectangle columnBounds = column.Bounds;
+                columnBounds.Offset(offset);
+                ce.Bounds = columnBounds;
+                ce.Style = style;
+                renderer.DrawColumnHeader(ce);
+                if (!columnSeparator.IsEmpty)
+                    DisplayHelp.DrawLine(g, columnBounds.Right - (column.IsLastVisible ? 0 : 1), columnBounds.Y, columnBounds.Right - (column.IsLastVisible ? 0 : 1), columnBounds.Bottom - 1, columnSeparator, 1);
+            }
+        }
+
+        private ElementStyle GetDefaultHeaderStyle(TreeRenderer renderer)
+        {
+            if (renderer != null && renderer.Office2007ColorTable != null)
+            {
+                return renderer.Office2007ColorTable.StyleClasses[ElementStyleClassKeys.TreeColumnsHeaderKey] as ElementStyle;
+            }
+            else
+            {
+                ElementStyle style = new ElementStyle();
+                style.BackColor = ColorScheme.GetColor(0xF9FCFD);
+                style.BackColor2 = ColorScheme.GetColor(0xD3DBE9);
+                style.BackColorGradientAngle = 90;
+                style.TextColor = ColorScheme.GetColor(0x000000);
+                style.BorderColor = ColorScheme.GetColor(0x9EB6CE);
+                style.BorderBottom = eStyleBorderType.Solid;
+                style.BorderBottomWidth = 1;
+                return style;
+            }
+        }
+
+        private ElementStyle GetDefaultNodesHeaderStyle(TreeRenderer renderer)
+        {
+            if (renderer != null && renderer.Office2007ColorTable != null)
+            {
+                return renderer.Office2007ColorTable.StyleClasses[ElementStyleClassKeys.TreeNodesColumnsHeaderKey] as ElementStyle;
+            }
+            else
+            {
+                ElementStyle style = new ElementStyle();
+                style.BackColor = ColorScheme.GetColor(0xF9FCFD);
+                style.BackColor2 = ColorScheme.GetColor(0xD3DBE9);
+                style.BackColorGradientAngle = 90;
+                style.TextColor = ColorScheme.GetColor(0x000000);
+                style.BorderColor = ColorScheme.GetColor(0x9EB6CE);
+                style.BorderBottom = eStyleBorderType.Solid;
+                style.BorderBottomWidth = 1;
+                style.BorderLeft = eStyleBorderType.Solid;
+                style.BorderLeftWidth = 1;
+                style.BorderTop = eStyleBorderType.Solid;
+                style.BorderTopWidth = 1;
+                return style;
+            }
+        }
+
+        private ElementStyle GetDefaultColumnStyleNormal(TreeRenderer renderer)
+        {
+            if (renderer != null && renderer.Office2007ColorTable != null)
+            {
+                return renderer.Office2007ColorTable.StyleClasses[ElementStyleClassKeys.TreeColumnKey] as ElementStyle;
+            }
+            else
+            {
+                ElementStyle style = new ElementStyle();
+                style.TextColor = ColorScheme.GetColor(0x000000);
+                return style;
+            }
+        }
+
+//		private NodeConnectorDisplay GetConnectorDisplay(NodeConnector c)
+//		{
+//			NodeConnectorDisplay d=null;
+//			if(c==null)
+//				return null;
+//
+//			switch(c.ConnectorType)
+//			{
+//				case eNodeConnectorType.Curve:
+//				{
+//					if(m_CurveConnectorDisplay==null)
+//						m_CurveConnectorDisplay=new CurveConnectorDisplay();
+//					d=m_CurveConnectorDisplay;
+//					break;
+//				}
+//				case eNodeConnectorType.Line:
+//				{
+//					if(m_LineConnectorDisplay==null)
+//						m_LineConnectorDisplay=new LineConnectorDisplay();
+//					d=m_LineConnectorDisplay;
+//					break;
+//				}
+//			}
+//			return d;
+//		}
+
+		private class NodeDisplayContext
+		{
+			public Graphics Graphics=null;
+			public Font DefaultFont=null;
+			public Rectangle ClipRectangle=Rectangle.Empty;
+			public Point Offset=Point.Empty;
+			public ElementStyle DefaultNodeStyle=null;
+			public ElementStyle ExpandedNodeStyle=null;
+			public ElementStyle SelectedNodeStyle=null;
+			public ElementStyle MouseOverNodeStyle=null;
+			public ElementStyle CellStyleDefault=null;
+			public ElementStyle CellStyleMouseDown=null;
+			public ElementStyle CellStyleMouseOver=null;
+			public ElementStyle CellStyleSelected=null;
+			public ElementStyle CellStyleDisabled=null;
+			public ElementStyleCollection Styles=null;
+			//public NodeConnectorDisplay RootConnectorDisplay=null;
+			//public NodeConnectorDisplay NodesConnectorDisplay=null;
+			//public NodeConnectorDisplay LinkConnectorDisplay=null;
+			//public NodeConnectorDisplay SelectedPathConnectorDisplay=null;
+			public ConnectorRendererEventArgs ConnectorDisplayInfo=null;
+			public NodeExpandPartRendererEventArgs ExpandDisplayInfo=null;
+			//public NodeExpandDisplay ExpandDisplay=null;
+			//public NodeSelectionDisplay SelectionDisplay=null;
+			public SelectionRendererEventArgs SelectionDisplayInfo=null;
+			//public NodeCommandDisplay CommandDisplay=null;
+			//public NodeCommandPartRendererEventArgs CommandDisplayInfo=null;
+			public bool SelectedNodePath=false;
+			public TreeRenderer NodeRenderer=null;
+			public NodeRendererEventArgs NodeRendererEventArgs=null;
+            public bool IsBackgroundSelection = false;
+            public Rectangle ClientRectangle = Rectangle.Empty;
+            public ColorScheme ColorScheme = null;
+            public bool GridRowLines = false;
+            public Color GridRowLineColor = Color.Empty;
+            public bool CellSelection = false;
+            public Brush AlternateRowBrush = null;
+            public bool DrawAlternateRowBackground = false;
+            public bool AlternateRowFlag = false;
+            public eView View = eView.Tree;
+            public Color TileGroupLineColor = Color.Empty;
+		}
+
+		
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/Display/SelectionColorTable.cs b/PROMS/DotNetBar Source Code/AdvTree/Display/SelectionColorTable.cs
new file mode 100644
index 00000000..411e30aa
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/Display/SelectionColorTable.cs	
@@ -0,0 +1,34 @@
+using System;
+using System.Text;
+using DevComponents.WinForms.Drawing;
+using System.Drawing;
+
+namespace DevComponents.AdvTree.Display
+{
+    /// <summary>
+    /// Defines the color table for tree selection.
+    /// </summary>
+    public class SelectionColorTable
+    {
+        /// <summary>
+        /// Gets or sets the outer border for the selection.
+        /// </summary>
+        public Border Border = null;
+        /// <summary>
+        /// Gets or sets the outer border corner radius.
+        /// </summary>
+        public int BorderCornerRadius = 0;
+        /// <summary>
+        /// Gets or sets the inner border for the selection.
+        /// </summary>
+        public Border InnerBorder = null;
+        /// <summary>
+        /// Gets or sets the selection fill.
+        /// </summary>
+        public Fill Fill = null;
+        /// <summary>
+        /// Gets or sets the selection text color.
+        /// </summary>
+        public Color TextColor = Color.Empty;
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/Display/SelectionRendererEventArgs.cs b/PROMS/DotNetBar Source Code/AdvTree/Display/SelectionRendererEventArgs.cs
new file mode 100644
index 00000000..e0475495
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/Display/SelectionRendererEventArgs.cs	
@@ -0,0 +1,32 @@
+using System;
+using System.Drawing;
+
+namespace DevComponents.AdvTree
+{
+	/// <summary>
+	/// Data form RenderSelection event.
+	/// </summary>
+	public class SelectionRendererEventArgs : EventArgs
+	{
+		/// <summary>
+		/// Gets or sets reference to Graphics object, canvas node is rendered on.
+		/// </summary>
+		public System.Drawing.Graphics Graphics=null;
+		/// <summary>
+		/// Gets or sets the reference to selected Node object.
+		/// </summary>
+		public DevComponents.AdvTree.Node Node=null;
+		/// <summary>
+		/// Gets or sets the selection bounds.
+		/// </summary>
+		public Rectangle Bounds=Rectangle.Empty;
+        /// <summary>
+        /// Gets or sets the node selection box style.
+        /// </summary>
+        public eSelectionStyle SelectionBoxStyle = eSelectionStyle.HighlightCells;
+        /// <summary>
+        /// Gets or sets whether tree control is active, focused.
+        /// </summary>
+        public bool TreeActive = false;
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/Display/TreeBackgroundRendererEventArgs.cs b/PROMS/DotNetBar Source Code/AdvTree/Display/TreeBackgroundRendererEventArgs.cs
new file mode 100644
index 00000000..79f82314
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/Display/TreeBackgroundRendererEventArgs.cs	
@@ -0,0 +1,31 @@
+using System;
+using System.Drawing;
+
+namespace DevComponents.AdvTree.Display
+{
+	/// <summary>
+	/// Provides data for tree background rendering events.
+	/// </summary>
+	public class TreeBackgroundRendererEventArgs
+	{
+		/// <summary>
+		/// Gets or sets reference to Graphics object, canvas tree background is rendered on.
+		/// </summary>
+		public System.Drawing.Graphics Graphics=null;
+		
+		/// <summary>
+		/// Gets or sets the reference to AdvTree control.
+		/// </summary>
+		public AdvTree AdvTree = null;
+		
+		/// <summary>
+		/// Creates new instance of the class and initializes it with default values.
+		/// </summary>
+		/// <param name="g">Reference to graphics object.</param>
+		public TreeBackgroundRendererEventArgs(Graphics g, AdvTree tree)
+		{
+			this.Graphics = g;
+			this.AdvTree = tree;
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/Display/TreeColorTable.cs b/PROMS/DotNetBar Source Code/AdvTree/Display/TreeColorTable.cs
new file mode 100644
index 00000000..fdcd7717
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/Display/TreeColorTable.cs	
@@ -0,0 +1,45 @@
+using System;
+using System.Text;
+using System.ComponentModel;
+using System.Drawing;
+
+namespace DevComponents.AdvTree.Display
+{
+    /// <summary>
+    /// Defines the Tree color table.
+    /// </summary>
+    [ToolboxItem(false)]
+    public class TreeColorTable : Component
+    {
+        #region Internal Implementation
+        /// <summary>
+        /// Gets or sets the color table used for the node selection display.
+        /// </summary>
+        public TreeSelectionColors Selection = new TreeSelectionColors();
+        /// <summary>
+        /// Gets or sets the color for node drag &amp; drop marker.
+        /// </summary>
+        public Color DragDropMarker = Color.Black;
+        /// <summary>
+        /// Gets or sets the color of tree expand button type of rectangle.
+        /// </summary>
+        public TreeExpandColorTable ExpandRectangle = new TreeExpandColorTable();
+        /// <summary>
+        /// Gets or sets the color of tree expand button type of Ellipse.
+        /// </summary>
+        public TreeExpandColorTable ExpandEllipse = new TreeExpandColorTable();
+        /// <summary>
+        /// Gets or sets the color of tree expand button type of Triangle.
+        /// </summary>
+        public TreeExpandColorTable ExpandTriangle = new TreeExpandColorTable();
+        /// <summary>
+        /// Gets or sets the color for tree grid lines.
+        /// </summary>
+        public Color GridLines = Color.Empty;
+        /// <summary>
+        /// Gets or sets the color of the column sort indicator which is rendered on columns when sorted.
+        /// </summary>
+        public Color ColumnSortIndicatorColor = Color.Gray;
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/Display/TreeExpandColorTable.cs b/PROMS/DotNetBar Source Code/AdvTree/Display/TreeExpandColorTable.cs
new file mode 100644
index 00000000..a079d19a
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/Display/TreeExpandColorTable.cs	
@@ -0,0 +1,61 @@
+using System;
+using System.Text;
+using DevComponents.WinForms.Drawing;
+
+namespace DevComponents.AdvTree.Display
+{
+    /// <summary>
+    /// Defines the color table for node expand button.
+    /// </summary>
+    public class TreeExpandColorTable
+    {
+        /// <summary>
+        /// Gets or sets the border for the expand button which expands the node.
+        /// </summary>
+        public Border ExpandBorder = null;
+        /// <summary>
+        /// Gets or sets the expand button fill for button that expands the node.
+        /// </summary>
+        public Fill ExpandFill = null;
+        /// <summary>
+        /// Gets or sets the expand button foreground for button that expands the node.
+        /// </summary>
+        public Fill ExpandForeground = null;
+        /// <summary>
+        /// Gets or sets the border for the expand button which expands the node.
+        /// </summary>
+        public Border ExpandMouseOverBorder = null;
+        /// <summary>
+        /// Gets or sets the expand button fill for button that expands the node.
+        /// </summary>
+        public Fill ExpandMouseOverFill = null;
+        /// <summary>
+        /// Gets or sets the expand button foreground for button that expands the node.
+        /// </summary>
+        public Fill ExpandMouseOverForeground = null;
+        /// <summary>
+        /// Gets or sets the border for the expand button which collapses the node.
+        /// </summary>
+        public Border CollapseBorder = null;
+        /// <summary>
+        /// Gets or sets the expand button fill for button that collapses the node.
+        /// </summary>
+        public Fill CollapseFill = null;
+        /// <summary>
+        /// Gets or sets the expand button foreground for button that expands the node.
+        /// </summary>
+        public Fill CollapseForeground = null;
+        /// <summary>
+        /// Gets or sets the border for the expand button which collapses the node.
+        /// </summary>
+        public Border CollapseMouseOverBorder = null;
+        /// <summary>
+        /// Gets or sets the expand button fill for button that collapses the node.
+        /// </summary>
+        public Fill CollapseMouseOverFill = null;
+        /// <summary>
+        /// Gets or sets the expand button foreground for button that expands the node.
+        /// </summary>
+        public Fill CollapseMouseOverForeground = null;
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/Display/TreeRenderer.cs b/PROMS/DotNetBar Source Code/AdvTree/Display/TreeRenderer.cs
new file mode 100644
index 00000000..62fcbebb
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/Display/TreeRenderer.cs	
@@ -0,0 +1,386 @@
+using System;
+using System.Drawing;
+using DevComponents.DotNetBar.Rendering;
+
+namespace DevComponents.AdvTree.Display
+{
+	/// <summary>
+	/// Represents abstract renderer class for node objects.
+	/// </summary>
+	public abstract class TreeRenderer
+	{
+		#region Events
+		/// <summary>
+		/// Occurs when node background is being drawn.
+		/// </summary>
+		public event NodeRendererEventHandler RenderNodeBackground;
+		/// <summary>
+		/// Occurs when node expand part is being drawn.
+		/// </summary>
+		public event NodeExpandPartRendererEventHandler RenderNodeExpandPart;
+        ///// <summary>
+        ///// Occurs when node command part is being drawn.
+        ///// </summary>
+        //public event NodeCommandPartRendererEventHandler RenderNodeCommandPart;
+		/// <summary>
+		/// Occurs when cell background is being drawn.
+		/// </summary>
+		public event NodeCellRendererEventHandler RenderCellBackground;
+		/// <summary>
+		/// Occurs when cell check-box is being drawn.
+		/// </summary>
+		public event NodeCellRendererEventHandler RenderCellCheckBox;
+		/// <summary>
+		/// Occurs when cell image is being drawn.
+		/// </summary>
+		public event NodeCellRendererEventHandler RenderCellImage;
+		/// <summary>
+		/// Occurs when cell text is being drawn.
+		/// </summary>
+		public event NodeCellRendererEventHandler RenderCellText;
+		/// <summary>
+		/// Occurs when node selection marker is rendered.
+		/// </summary>
+		public event SelectionRendererEventHandler RenderSelection;
+        /// <summary>
+        /// Occurs when node hot-tracking marker is rendered.
+        /// </summary>
+        public event SelectionRendererEventHandler RenderHotTracking;
+		/// <summary>
+		/// Occurs when node connector is being drawn.
+		/// </summary>
+		public event ConnectorRendererEventHandler RenderConnector;
+		
+		/// <summary>
+		/// Occurs when tree background is rendered.
+		/// </summary>
+		public event TreeBackgroundRendererEventHandler RenderTreeBackground;
+
+        /// <summary>
+        /// Occurs when drag & drop marker is rendered.
+        /// </summary>
+        public event DragDropMarkerRendererEventHandler RenderDragDropMarker;
+        /// <summary>
+        /// Renders the Column Header.
+        /// </summary>
+        public event ColumnHeaderRendererEventHandler RenderColumnHeader;
+        /// <summary>
+        /// Occurs when node group line is being rendered while control is in tile view.
+        /// </summary>
+        public event NodeRendererEventHandler RenderTileGroupLine;
+		#endregion
+		
+		#region Private Variables
+		#endregion
+		
+		#region Constructor
+		public TreeRenderer()
+		{
+		}
+		#endregion
+		
+		#region Internal Implementation
+		/// <summary>
+		/// Draws node background. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+		/// do not want default rendering to occur do not call the base implementation. You can call OnRenderNodeBackground method so events can occur.
+		/// </summary>
+		/// <param name="e">Information provided for rendering.</param>
+		public virtual void DrawNodeBackground(NodeRendererEventArgs e)
+		{
+			OnRenderNodeBackground(e);
+		}
+		
+		/// <summary>
+		/// Raises RenderNodeBackground event.
+		/// </summary>
+		/// <param name="e">Event arguments.</param>
+		protected virtual void OnRenderNodeBackground(NodeRendererEventArgs e)
+		{
+			if(RenderNodeBackground!=null)
+				RenderNodeBackground(this,e);
+		}
+		
+		/// <summary>
+		/// Draws node expand part. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+		/// do not want default rendering to occur do not call the base implementation. You can call OnRenderNodeExpandPart method so events can occur.
+		/// </summary>
+		/// <param name="e">Information provided for rendering.</param>
+		public virtual void DrawNodeExpandPart(NodeExpandPartRendererEventArgs e)
+		{
+			OnRenderNodeExpandPart(e);
+		}
+		
+		/// <summary>
+		/// Raises RenderNodeExpandPart event.
+		/// </summary>
+		/// <param name="e"></param>
+		protected virtual void OnRenderNodeExpandPart(NodeExpandPartRendererEventArgs e)
+		{
+			if(RenderNodeExpandPart!=null)
+				RenderNodeExpandPart(this,e);
+		}
+		
+        ///// <summary>
+        ///// Draws node command part. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+        ///// do not want default rendering to occur do not call the base implementation. You can call OnRenderNodeCommandPart method so events can occur.
+        ///// </summary>
+        ///// <param name="e">Information provided for rendering.</param>
+        //public virtual void DrawNodeCommandPart(NodeCommandPartRendererEventArgs e)
+        //{
+        //    OnRenderNodeCommandPart(e);
+        //}
+		
+        ///// <summary>
+        ///// Raises RenderNodeCommandPart event.
+        ///// </summary>
+        ///// <param name="e">Event arguments.</param>
+        //protected virtual void OnRenderNodeCommandPart(NodeCommandPartRendererEventArgs e)
+        //{
+        //    if(RenderNodeCommandPart!=null)
+        //        RenderNodeCommandPart(this,e);
+        //}
+		
+		/// <summary>
+		/// Draws cell background. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+		/// do not want default rendering to occur do not call the base implementation. You can call OnRenderCellBackground method so events can occur.
+		/// </summary>
+		/// <param name="e">Information provided for rendering.</param>
+		public virtual void DrawCellBackground(NodeCellRendererEventArgs e)
+		{
+			OnRenderCellBackground(e);
+		}
+		
+		/// <summary>
+		/// Raises RenderCellBackground event.
+		/// </summary>
+		/// <param name="e">Event arguments</param>
+		protected virtual void OnRenderCellBackground(NodeCellRendererEventArgs e)
+		{
+			if(RenderCellBackground!=null)
+				RenderCellBackground(this, e);
+		}
+		
+		/// <summary>
+		/// Draws cell check box.  If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+		/// do not want default rendering to occur do not call the base implementation. You can call OnRenderCellCheckBox method so events can occur.
+		/// </summary>
+		/// <param name="e">Information provided for rendering.</param>
+		public virtual void DrawCellCheckBox(NodeCellRendererEventArgs e)
+		{
+			OnRenderCellCheckBox(e);
+		}
+		
+		/// <summary>
+		/// Raises RenderCellCheckBox event.
+		/// </summary>
+		/// <param name="e">Event arguments</param>
+		protected virtual void OnRenderCellCheckBox(NodeCellRendererEventArgs e)
+		{
+			if(RenderCellCheckBox!=null)
+				RenderCellCheckBox(this, e);
+		}
+		
+		/// <summary>
+		/// Draws cell image. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+		/// do not want default rendering to occur do not call the base implementation. You can call OnRenderCellImage method so events can occur.
+		/// </summary>
+		/// <param name="e">Information provided for rendering.</param>
+		public virtual void DrawCellImage(NodeCellRendererEventArgs e)
+		{
+			OnRenderCellImage(e);
+		}
+		
+		/// <summary>
+		/// Raises RenderCellImage event.
+		/// </summary>
+		/// <param name="e">Event arguments</param>
+		protected virtual void OnRenderCellImage(NodeCellRendererEventArgs e)
+		{
+			if(RenderCellImage!=null)
+				RenderCellImage(this, e);
+		}
+		
+		/// <summary>
+		/// Draws cell text. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+		/// do not want default rendering to occur do not call the base implementation. You can call OnRenderCellText method so events can occur.
+		/// </summary>
+		/// <param name="e">Information provided for rendering.</param>
+		public virtual void DrawCellText(NodeCellRendererEventArgs e)
+		{
+			OnRenderCellText(e);
+		}
+		
+		/// <summary>
+		/// Raises RenderCellImage event.
+		/// </summary>
+		/// <param name="e">Event arguments</param>
+		protected virtual void OnRenderCellText(NodeCellRendererEventArgs e)
+		{
+			if(RenderCellText!=null)
+				RenderCellText(this, e);
+		}
+		
+		/// <summary>
+		/// Draws selection for SelectedNode. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+		/// do not want default rendering to occur do not call the base implementation. You can call OnRenderSelection method so events can occur.
+		/// </summary>
+		/// <param name="e">Information provided for rendering.</param>
+		public virtual void DrawSelection(SelectionRendererEventArgs e)
+		{
+			OnRenderSelection(e);
+		}
+
+		/// <summary>
+		/// Raises RenderSelection event.
+		/// </summary>
+		/// <param name="e">Event data.</param>
+		protected virtual void OnRenderSelection(SelectionRendererEventArgs e)
+		{
+			if(RenderSelection!=null)
+				RenderSelection(this, e);
+		}
+
+        /// <summary>
+        /// Draws hot-tracking marker for mouse over node. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+        /// do not want default rendering to occur do not call the base implementation. You can call OnRenderHotTracking method so events can occur.
+        /// </summary>
+        /// <param name="e">Information provided for rendering.</param>
+        public virtual void DrawHotTracking(SelectionRendererEventArgs e)
+        {
+            OnRenderHotTracking(e);
+        }
+
+        /// <summary>
+        /// Raises RenderHotTracking event.
+        /// </summary>
+        /// <param name="e">Event data.</param>
+        protected virtual void OnRenderHotTracking(SelectionRendererEventArgs e)
+        {
+            if (RenderHotTracking != null)
+                RenderHotTracking(this, e);
+        }
+		
+		/// <summary>
+		/// Draws connector between nodes. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+		/// do not want default rendering to occur do not call the base implementation. You can call OnRenderConnector method so events can occur.
+		/// </summary>
+		/// <param name="e">Information provided for rendering.</param>
+		public virtual void DrawConnector(ConnectorRendererEventArgs e)
+		{
+			OnRenderConnector(e);
+		}
+
+		/// <summary>
+		/// Raises RenderConnector event.
+		/// </summary>
+		/// <param name="e">Event data.</param>
+		protected virtual void OnRenderConnector(ConnectorRendererEventArgs e)
+		{
+			if(RenderConnector!=null)
+				RenderConnector(this, e);
+		}
+
+		/// <summary>
+		/// Draws the tree background. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+		/// do not want default rendering to occur do not call the base implementation. You can call OnRenderTreeBackground method so events can occur.
+		/// </summary>
+		/// <param name="e">Information provided for rendering.</param>
+		public virtual void DrawTreeBackground(TreeBackgroundRendererEventArgs e)
+		{
+			OnRenderTreeBackground(e);
+		}
+
+		/// <summary>
+		/// Raises RenderTreeBackground event.
+		/// </summary>
+		/// <param name="e">Event data.</param>
+		protected virtual void OnRenderTreeBackground(TreeBackgroundRendererEventArgs e)
+		{
+			if(RenderTreeBackground!=null)
+				RenderTreeBackground(this, e);
+		}
+
+        /// <summary>
+        /// Draws the drag &amp; drop marker that indicates the insertion point for the node. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+        /// do not want default rendering to occur do not call the base implementation. You can call OnRenderDragDropMarker method so events can occur.
+		/// </summary>
+		/// <param name="e">Information provided for rendering.</param>
+        public virtual void DrawDragDropMarker(DragDropMarkerRendererEventArgs e)
+		{
+            OnRenderDragDropMarker(e);
+		}
+
+		/// <summary>
+		/// Raises RenderDragDropMarker event.
+		/// </summary>
+		/// <param name="e">Event data.</param>
+        protected virtual void OnRenderDragDropMarker(DragDropMarkerRendererEventArgs e)
+		{
+            if (RenderDragDropMarker != null)
+                RenderDragDropMarker(this, e);
+		}
+
+        /// <summary>
+        /// Draws the column header. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+        /// do not want default rendering to occur do not call the base implementation. You can call OnRenderColumnHeader method so events can occur.
+        /// </summary>
+        /// <param name="e">Information provided for rendering.</param>
+        public virtual void DrawColumnHeader(ColumnHeaderRendererEventArgs e)
+        {
+            OnRenderColumnHeader(e);
+        }
+
+        /// <summary>
+        /// Raises RenderDragDropMarker event.
+        /// </summary>
+        /// <param name="e">Event data.</param>
+        protected virtual void OnRenderColumnHeader(ColumnHeaderRendererEventArgs e)
+        {
+            if (RenderColumnHeader != null)
+                RenderColumnHeader(this, e);
+        }
+
+        private TreeColorTable _ColorTable = null;
+        /// <summary>
+        /// Gets or sets the color table used by the renderer.
+        /// </summary>
+        public TreeColorTable ColorTable
+        {
+            get { return _ColorTable; }
+            set { _ColorTable = value; }
+        }
+
+        private Office2007ColorTable _Office2007ColorTable = null;
+        /// <summary>
+        /// Gets or sets the color table used by the renderer.
+        /// </summary>
+        internal Office2007ColorTable Office2007ColorTable
+        {
+            get { return _Office2007ColorTable; }
+            set { _Office2007ColorTable = value; }
+        }
+
+        /// <summary>
+        /// Draws node group line when in tile view. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+        /// do not want default rendering to occur do not call the base implementation. You can call OnRenderTileGroupLine method so events can occur.
+        /// </summary>
+        /// <param name="e">Information provided for rendering.</param>
+        public virtual void DrawTileGroupLine(NodeRendererEventArgs e)
+        {
+            OnRenderTileGroupLine(e);
+        }
+
+        /// <summary>
+        /// Raises RenderNodeBackground event.
+        /// </summary>
+        /// <param name="e">Event arguments.</param>
+        protected virtual void OnRenderTileGroupLine(NodeRendererEventArgs e)
+        {
+            if (RenderTileGroupLine != null)
+                RenderTileGroupLine(this, e);
+        }
+		
+		#endregion
+	}
+
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/Display/TreeSelectionColors.cs b/PROMS/DotNetBar Source Code/AdvTree/Display/TreeSelectionColors.cs
new file mode 100644
index 00000000..4909d030
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/Display/TreeSelectionColors.cs	
@@ -0,0 +1,40 @@
+using System;
+using System.Text;
+
+namespace DevComponents.AdvTree.Display
+{
+    /// <summary>
+    /// Defines the color table for tree selection.
+    /// </summary>
+    public class TreeSelectionColors
+    {
+        /// <summary>
+        /// Gets or sets the color table for FullRowSelect selection type.
+        /// </summary>
+        public SelectionColorTable FullRowSelect = null;
+        /// <summary>
+        /// Gets or sets the color table for FullRowSelect selection type when tree control is inactive.
+        /// </summary>
+        public SelectionColorTable FullRowSelectInactive = null;
+        /// <summary>
+        /// Gets or sets the color table for HighlightCells selection type.
+        /// </summary>
+        public SelectionColorTable HighlightCells = null;
+        /// <summary>
+        /// Gets or sets the color table for HighlightCells selection type when tree control is inactive.
+        /// </summary>
+        public SelectionColorTable HighlightCellsInactive = null;
+        /// <summary>
+        /// Gets or sets the color table for NodeMarker selection type.
+        /// </summary>
+        public SelectionColorTable NodeMarker = null;
+        /// <summary>
+        /// Gets or sets the color table for NodeMarker selection type when tree control is inactive.
+        /// </summary>
+        public SelectionColorTable NodeMarkerInactive = null;
+        /// <summary>
+        /// Gets or sets the color table used for node hot-tracking.
+        /// </summary>
+        public SelectionColorTable NodeHotTracking = null;
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/Drawing/Border.cs b/PROMS/DotNetBar Source Code/AdvTree/Drawing/Border.cs
new file mode 100644
index 00000000..250c4817
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/Drawing/Border.cs	
@@ -0,0 +1,40 @@
+using System;
+using System.Text;
+using System.ComponentModel;
+using System.Drawing;
+
+namespace DevComponents.WinForms.Drawing
+{
+    [ToolboxItem(false)]
+    public abstract class Border : Component
+    {
+        #region Internal Implementation
+        /// <summary>
+        /// Creates the pen for the border.
+        /// </summary>
+        /// <returns>Returns pen or null if pen cannot be created.</returns>
+        public abstract Pen CreatePen();
+
+        internal int _Width = 0;
+        /// <summary>
+        /// Gets or sets the border width. Default value is 0.
+        /// </summary>
+        [DefaultValue(0), Description("Indicates border width.")]
+        public int Width
+        {
+            get { return _Width; }
+            set
+            {
+                _Width = value;
+            }
+        }
+
+        internal static Rectangle Deflate(Rectangle bounds, Border border)
+        {
+            if (border == null) return bounds;
+            bounds.Inflate(-border.Width, -border.Width);
+            return bounds;
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/Drawing/ColorBlendCollection.cs b/PROMS/DotNetBar Source Code/AdvTree/Drawing/ColorBlendCollection.cs
new file mode 100644
index 00000000..a0e0de54
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/Drawing/ColorBlendCollection.cs	
@@ -0,0 +1,234 @@
+using System;
+using System.Collections;
+using System.Text;
+using System.Drawing.Drawing2D;
+using System.Drawing;
+
+namespace DevComponents.WinForms.Drawing
+{
+    /// <summary>
+    /// Represents Collection for the ColorStop objects.
+    /// </summary>
+    public class ColorBlendCollection : CollectionBase
+    {
+        #region Private Variables
+        
+        #endregion
+
+        #region Internal Implementation
+        /// <summary>Creates new instance of the class.</summary>
+        public ColorBlendCollection() { }
+
+        /// <summary>
+        /// Adds new object to the collection.
+        /// </summary>
+        /// <param name="item">Object to add.</param>
+        /// <returns>Index of newly added object.</returns>
+        public int Add(ColorStop item)
+        {
+            return List.Add(item);
+        }
+
+        /// <summary>
+        /// Adds array of new objects to the collection.
+        /// </summary>
+        /// <param name="items">Array of object to add.</param>
+        public void AddRange(ColorStop[] items)
+        {
+            foreach (ColorStop item in items)
+                this.Add(item);
+        }
+
+        /// <summary>
+        /// Returns reference to the object in collection based on it's index.
+        /// </summary>
+        public ColorStop this[int index]
+        {
+            get { return (ColorStop)(List[index]); }
+            set { List[index] = value; }
+        }
+
+        /// <summary>
+        /// Inserts new object into the collection.
+        /// </summary>
+        /// <param name="index">Position of the object.</param>
+        /// <param name="value">Object to insert.</param>
+        public void Insert(int index, ColorStop value)
+        {
+            List.Insert(index, value);
+        }
+
+        /// <summary>
+        /// Returns index of the object inside of the collection.
+        /// </summary>
+        /// <param name="value">Reference to the object.</param>
+        /// <returns>Index of the object.</returns>
+        public int IndexOf(ColorStop value)
+        {
+            return List.IndexOf(value);
+        }
+
+        /// <summary>
+        /// Returns whether collection contains specified object.
+        /// </summary>
+        /// <param name="value">Object to look for.</param>
+        /// <returns>true if object is part of the collection, otherwise false.</returns>
+        public bool Contains(ColorStop value)
+        {
+            return List.Contains(value);
+        }
+
+        /// <summary>
+        /// Removes specified object from the collection.
+        /// </summary>
+        /// <param name="value"></param>
+        public void Remove(ColorStop value)
+        {
+            List.Remove(value);
+        }
+
+        //protected override void OnRemoveComplete(int index,object value)
+        //{
+        //    base.OnRemoveComplete(index,value);
+        //    ColorStop me=value as ColorStop;
+        //}
+        //protected override void OnInsertComplete(int index,object value)
+        //{
+        //    base.OnInsertComplete(index,value);
+        //    ColorStop me=value as ColorStop;
+        //}
+
+        /// <summary>
+        /// Copies collection into the specified array.
+        /// </summary>
+        /// <param name="array">Array to copy collection to.</param>
+        /// <param name="index">Starting index.</param>
+        public void CopyTo(ColorStop[] array, int index)
+        {
+            List.CopyTo(array, index);
+        }
+
+        /// <summary>
+        /// Copies contained items to the ColorStop array.
+        /// </summary>
+        /// <param name="array">Array to copy to.</param>
+        internal void CopyTo(ColorStop[] array)
+        {
+            List.CopyTo(array, 0);
+        }
+
+        /// <summary>
+        /// Creates ColorBlend object based on the members of the collection. ColorBlend object will be valid only if all members of the collection
+        /// represents relative/percentage based color blends.
+        /// </summary>
+        /// <returns></returns>
+        public ColorBlend GetColorBlend()
+        {
+            ColorBlend blend = new ColorBlend();
+            Color[] colors = new Color[this.Count];
+            float[] positions = new float[this.Count];
+
+            for (int i = 0; i < this.Count; i++)
+            {
+                ColorStop b = this[i];
+                colors[i] = b.Color;
+                positions[i] = b.Position;
+            }
+
+            blend.Colors = colors;
+            blend.Positions = positions;
+
+            return blend;
+        }
+
+        /// <summary>
+        /// Adds the ColorStop objects from the collection.
+        /// </summary>
+        /// <param name="col">Collection to copy objects from</param>
+        public void CopyFrom(ColorBlendCollection col)
+        {
+            foreach (ColorStop b in col)
+                this.Add(b);
+        }
+
+        internal eColorStopType GetBlendType()
+        {
+            ColorBlendCollection c = this;
+            if (c.Count <= 1)
+                return eColorStopType.Invalid;
+
+            eColorStopType t = eColorStopType.Invalid;
+
+            foreach (ColorStop b in c)
+            {
+                if (b.Position == 0 || b.Position == 1f)
+                    continue;
+                if (b.Position <= 1f)
+                {
+                    if (t == eColorStopType.Invalid)
+                        t = eColorStopType.Relative;
+                    else if (t == eColorStopType.Absolute)
+                    {
+                        t = eColorStopType.Invalid;
+                        break;
+                    }
+                }
+                else
+                {
+                    if (t == eColorStopType.Invalid)
+                        t = eColorStopType.Absolute;
+                    else if (t == eColorStopType.Relative)
+                    {
+                        t = eColorStopType.Invalid;
+                        break;
+                    }
+                }
+            }
+
+            if (c.Count == 2 && c[0].Position == 0f && c[1].Position == 1f)
+                return eColorStopType.Relative;
+
+            if (t == eColorStopType.Invalid)
+                return t;
+
+            if (t == eColorStopType.Relative && c[0].Position != 0f && c[c.Count - 1].Position != 1f)
+                return eColorStopType.Invalid;
+            else if (t == eColorStopType.Absolute && ((c.Count / 2) * 2 != c.Count))
+                return eColorStopType.Invalid;
+
+            return t;
+        }
+
+        ///// <summary>
+        ///// Initializes the collection with the two color blend.
+        ///// </summary>
+        ///// <param name="collection">Collection to initialize.</param>
+        ///// <param name="backColor1">Start color.</param>
+        ///// <param name="backColor2">End color.</param>
+        //public static void InitializeCollection(ColorBlendCollection collection, int backColor1, int backColor2)
+        //{
+        //    InitializeCollection(collection, ColorScheme.GetColor(backColor1), ColorScheme.GetColor(backColor2));
+        //}
+
+        /// <summary>
+        /// Initializes the collection with the two color blend.
+        /// </summary>
+        /// <param name="collection">Collection to initialize.</param>
+        /// <param name="backColor1">Start color.</param>
+        /// <param name="backColor2">End color.</param>
+        public static void InitializeCollection(ColorBlendCollection collection, Color backColor1, Color backColor2)
+        {
+            collection.Clear();
+            collection.Add(new ColorStop(backColor1, 0f));
+            collection.Add(new ColorStop(backColor2, 1f));
+        }
+        #endregion
+    }
+
+    internal enum eColorStopType
+    {
+        Invalid,
+        Relative,
+        Absolute
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/Drawing/ColorStop.cs b/PROMS/DotNetBar Source Code/AdvTree/Drawing/ColorStop.cs
new file mode 100644
index 00000000..b17a4a50
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/Drawing/ColorStop.cs	
@@ -0,0 +1,83 @@
+using System;
+using System.Text;
+using System.Drawing;
+using System.ComponentModel;
+
+namespace DevComponents.WinForms.Drawing
+{
+    /// <summary>
+    /// Defines single color blend point for the multicolor gradient fills.
+    /// </summary>
+    [ToolboxItem(false), DesignTimeVisible(false), TypeConverter(typeof(ColorStopConverter))]
+    public class ColorStop
+    {
+        #region Private Variables
+        private Color _Color = Color.Empty;
+        private float _Position = 0;
+        #endregion
+
+        #region Internal Implementation
+        /// <summary>
+        /// Creates new instance of the class. When defining multicolor gradient blends and using the percentage positions the positions created
+        /// must start with 0f and end with 1f.
+        /// </summary>
+        public ColorStop() { }
+
+        /// <summary>
+        /// Creates new instance of the class and initialize it with default values.
+        /// </summary>
+        public ColorStop(Color color, float position)
+        {
+            _Color = color;
+            _Position = position;
+        }
+
+        ///// <summary>
+        ///// Creates new instance of the class and initialize it with default values.
+        ///// </summary>
+        //public ColorStop(int color, float position)
+        //{
+        //    _Color = ColorScheme.GetColor(color);
+        //    _Position = position;
+        //}
+
+        /// <summary>
+        /// Gets or sets Color to use in multicolor gradient blend at specified position.
+        /// </summary>
+        [Browsable(true), Description("Indicates the Color to use in multicolor gradient blend at specified position.")]
+        public Color Color
+        {
+            get { return _Color; }
+            set
+            {
+                _Color = value;
+                OnColorBlendChanged();
+            }
+        }
+        private bool ShouldSerializeColor()
+        {
+            return !_Color.IsEmpty;
+        }
+
+        /// <summary>
+        /// Gets or sets the color position in multicolor gradient blend. Values less or equal to 1 are used as percentage specifing percentages of distance along the gradient line.
+        /// Values greater than 1 are used as absolute pixel values of distance along the gradient line.
+        /// </summary>
+        [Browsable(true), DefaultValue(0f), Description("")]
+        public float Position
+        {
+            get { return _Position; }
+            set
+            {
+                _Position = value;
+                OnColorBlendChanged();
+            }
+        }
+
+        private void OnColorBlendChanged()
+        {
+        }
+        #endregion
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/Drawing/ColorStopConverter.cs b/PROMS/DotNetBar Source Code/AdvTree/Drawing/ColorStopConverter.cs
new file mode 100644
index 00000000..17656735
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/Drawing/ColorStopConverter.cs	
@@ -0,0 +1,49 @@
+using System;
+using System.ComponentModel;
+using System.ComponentModel.Design.Serialization;
+using System.Globalization;
+using System.Reflection;
+using System.Drawing;
+
+namespace DevComponents.WinForms.Drawing
+{
+    /// <summary>
+    /// Represents BackgroundColorBlend object converter.
+    /// </summary>
+    public class ColorStopConverter : TypeConverter
+    {
+        public ColorStopConverter() { }
+
+        public override bool CanConvertTo(ITypeDescriptorContext context, Type destinationType)
+        {
+            if (destinationType == typeof(InstanceDescriptor))
+                return true;
+            return base.CanConvertTo(context, destinationType);
+        }
+
+        public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+        {
+            if (destinationType == null)
+                throw new ArgumentNullException("destinationType");
+
+            if ((destinationType == typeof(InstanceDescriptor)) && (value is ColorStop))
+            {
+                ColorStop doc = (ColorStop)value;
+                Type[] constructorParams = null;
+                MemberInfo constructorMemberInfo = null;
+                object[] constructorValues = null;
+
+                constructorParams = new Type[2] { typeof(Color), typeof(float) };
+                constructorMemberInfo = typeof(ColorStop).GetConstructor(constructorParams);
+                constructorValues = new object[2] { doc.Color, doc.Position };
+
+                if (constructorMemberInfo != null)
+                {
+                    return new InstanceDescriptor(constructorMemberInfo, constructorValues);
+                }
+            }
+
+            return base.ConvertTo(context, culture, value, destinationType);
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/Drawing/CornerRadius.cs b/PROMS/DotNetBar Source Code/AdvTree/Drawing/CornerRadius.cs
new file mode 100644
index 00000000..85b1b91f
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/Drawing/CornerRadius.cs	
@@ -0,0 +1,258 @@
+using System;
+using System.Text;
+using System.Runtime.InteropServices;
+using System.ComponentModel;
+using System.Globalization;
+using System.ComponentModel.Design.Serialization;
+
+namespace DevComponents.WinForms.Drawing
+{
+    [StructLayout(LayoutKind.Sequential), TypeConverter(typeof(CornerRadiusConverter))]
+    public struct CornerRadius 
+#if FRAMEWORK20
+		: IEquatable<CornerRadius>
+#endif
+    {
+        #region Private Variables
+        private int _TopLeft;
+        private int _topRight;
+        private int _bottomLeft;
+        private int _bottomRight;
+        #endregion
+
+        #region Constructor
+        public CornerRadius(int uniformRadius)
+        {
+            this._TopLeft = this._topRight = this._bottomLeft = this._bottomRight = uniformRadius;
+        }
+
+        public CornerRadius(int topLeft, int topRight, int bottomRight, int bottomLeft)
+        {
+            this._TopLeft = topLeft;
+            this._topRight = topRight;
+            this._bottomRight = bottomRight;
+            this._bottomLeft = bottomLeft;
+        }
+        #endregion
+
+        #region Internal Implementation
+        public override bool Equals(object obj)
+        {
+            if (obj is CornerRadius)
+            {
+                CornerRadius radius = (CornerRadius)obj;
+                return (this == radius);
+            }
+            return false;
+        }
+
+        public bool Equals(CornerRadius cornerRadius)
+        {
+            return (this == cornerRadius);
+        }
+
+        public override int GetHashCode()
+        {
+            return (((this._TopLeft.GetHashCode() ^ this._topRight.GetHashCode()) ^ this._bottomLeft.GetHashCode()) ^ this._bottomRight.GetHashCode());
+        }
+
+        public override string ToString()
+        {
+            return CornerRadiusConverter.ToString(this, CultureInfo.InvariantCulture);
+        }
+
+        public static bool operator ==(CornerRadius cr1, CornerRadius cr2)
+        {
+            return ((cr1._TopLeft == cr2._TopLeft) && (cr1._topRight == cr2._topRight) && (cr1._bottomRight == cr2._bottomRight) && (cr1._bottomLeft == cr2._bottomLeft));
+        }
+
+        public static bool operator !=(CornerRadius cr1, CornerRadius cr2)
+        {
+            return !(cr1 == cr2);
+        }
+
+        public int TopLeft
+        {
+            get
+            {
+                return this._TopLeft;
+            }
+            set
+            {
+                this._TopLeft = value;
+            }
+        }
+        public int TopRight
+        {
+            get
+            {
+                return this._topRight;
+            }
+            set
+            {
+                this._topRight = value;
+            }
+        }
+        public int BottomRight
+        {
+            get
+            {
+                return this._bottomRight;
+            }
+            set
+            {
+                this._bottomRight = value;
+            }
+        }
+        public int BottomLeft
+        {
+            get
+            {
+                return this._bottomLeft;
+            }
+            set
+            {
+                this._bottomLeft = value;
+            }
+        }
+
+        internal bool IsValid(bool allowNegative)
+        {
+            if (!allowNegative && (((this._TopLeft < 0.0) || (this._topRight < 0.0)) || ((this._bottomLeft < 0.0) || (this._bottomRight < 0.0))))
+            {
+                return false;
+            }
+            return true;
+        }
+
+        internal bool IsZero
+        {
+            get
+            {
+                return (_TopLeft == 0 && _topRight == 0 && _bottomRight == 0 && _bottomLeft == 0);
+            }
+        }
+        #endregion
+    }
+
+    #region CornerRadiusConverter
+    public class CornerRadiusConverter : TypeConverter
+    {
+        // Methods
+        public override bool CanConvertFrom(ITypeDescriptorContext typeDescriptorContext, Type sourceType)
+        {
+            switch (Type.GetTypeCode(sourceType))
+            {
+                case TypeCode.Int16:
+                case TypeCode.UInt16:
+                case TypeCode.Int32:
+                case TypeCode.UInt32:
+                case TypeCode.Int64:
+                case TypeCode.UInt64:
+                case TypeCode.Single:
+                case TypeCode.Double:
+                case TypeCode.Decimal:
+                case TypeCode.String:
+                    return true;
+            }
+            return false;
+        }
+
+        public override bool CanConvertTo(ITypeDescriptorContext typeDescriptorContext, Type destinationType)
+        {
+            if ((destinationType != typeof(InstanceDescriptor)) && (destinationType != typeof(string)))
+            {
+                return false;
+            }
+            return true;
+        }
+
+        public override object ConvertFrom(ITypeDescriptorContext typeDescriptorContext, CultureInfo cultureInfo, object source)
+        {
+            if (source == null)
+            {
+                throw base.GetConvertFromException(source);
+            }
+            if (source is string)
+            {
+                return FromString((string)source, cultureInfo);
+            }
+            return new CornerRadius(Convert.ToInt32(source, cultureInfo));
+        }
+
+        public override object ConvertTo(ITypeDescriptorContext typeDescriptorContext, CultureInfo cultureInfo, object value, Type destinationType)
+        {
+            if (value == null)
+            {
+                throw new ArgumentNullException("value");
+            }
+            if (destinationType == null)
+            {
+                throw new ArgumentNullException("destinationType");
+            }
+            if (!(value is CornerRadius))
+            {
+                throw new ArgumentException("Unexpected parameter type", "value");
+            }
+            CornerRadius cr = (CornerRadius)value;
+            if (destinationType == typeof(string))
+            {
+                return ToString(cr, cultureInfo);
+            }
+            if (destinationType != typeof(InstanceDescriptor))
+            {
+                throw new ArgumentException("Cannot convert to type " + destinationType.FullName);
+            }
+            return new InstanceDescriptor(typeof(CornerRadius).GetConstructor(new Type[] { typeof(int), typeof(int), typeof(int), typeof(int) }), new object[] { cr.TopLeft, cr.TopRight, cr.BottomRight, cr.BottomLeft });
+        }
+
+        internal static CornerRadius FromString(string s, CultureInfo cultureInfo)
+        {
+            string[] parsed = s.Split(GetNumericListSeparator(cultureInfo));
+            int[] numArray = new int[4];
+            for (int i = 0; i < parsed.Length; i++)
+            {
+                numArray[i] = int.Parse(parsed[i], cultureInfo);
+            }
+
+            int index = Math.Min(5, parsed.Length);
+            
+            switch (index)
+            {
+                case 1:
+                    return new CornerRadius(numArray[0]);
+
+                case 4:
+                    return new CornerRadius(numArray[0], numArray[1], numArray[2], numArray[3]);
+            }
+            throw new FormatException("Invalid string corner radius");
+        }
+
+        internal static string ToString(CornerRadius cr, CultureInfo cultureInfo)
+        {
+            char numericListSeparator = GetNumericListSeparator(cultureInfo);
+            StringBuilder builder = new StringBuilder(0x40);
+            builder.Append(cr.TopLeft.ToString(cultureInfo));
+            builder.Append(numericListSeparator);
+            builder.Append(cr.TopRight.ToString(cultureInfo));
+            builder.Append(numericListSeparator);
+            builder.Append(cr.BottomRight.ToString(cultureInfo));
+            builder.Append(numericListSeparator);
+            builder.Append(cr.BottomLeft.ToString(cultureInfo));
+            return builder.ToString();
+        }
+
+        internal static char GetNumericListSeparator(IFormatProvider provider)
+        {
+            char ch = ',';
+            NumberFormatInfo instance = NumberFormatInfo.GetInstance(provider);
+            if ((instance.NumberDecimalSeparator.Length > 0) && (ch == instance.NumberDecimalSeparator[0]))
+            {
+                ch = ';';
+            }
+            return ch;
+        }
+    }
+    #endregion
+
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/Drawing/Fill.cs b/PROMS/DotNetBar Source Code/AdvTree/Drawing/Fill.cs
new file mode 100644
index 00000000..9757f71a
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/Drawing/Fill.cs	
@@ -0,0 +1,27 @@
+using System;
+using System.Text;
+using System.ComponentModel;
+using System.Drawing;
+
+namespace DevComponents.WinForms.Drawing
+{
+    [ToolboxItem(false)]
+    public abstract class Fill : Component
+    {
+        #region Internal Implementation
+        /// <summary>
+        /// Creates the brush for fill.
+        /// </summary>
+        /// <param name="bounds">Bounds for the brush</param>
+        /// <returns>Returns brush or null if brush cannot be created for given bounds or colors are not set. It is responsibility of caller to Dispose the brush.</returns>
+        public abstract Brush CreateBrush(Rectangle bounds);
+
+        /// <summary>
+        /// Creates a pen based on fill parameters.
+        /// </summary>
+        /// <param name="width">Width of the pen to create</param>
+        /// <returns>new instance of pen or null if pen cannot be created.</returns>
+        public abstract Pen CreatePen(int width);
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/Drawing/GradientFill.cs b/PROMS/DotNetBar Source Code/AdvTree/Drawing/GradientFill.cs
new file mode 100644
index 00000000..8072a5b3
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/Drawing/GradientFill.cs	
@@ -0,0 +1,179 @@
+using System;
+using System.Text;
+using System.Drawing;
+using System.ComponentModel;
+using System.Drawing.Drawing2D;
+
+namespace DevComponents.WinForms.Drawing
+{
+    public class GradientFill : Fill
+    {
+        #region Constructor
+        /// <summary>
+        /// Initializes a new instance of the GradientFill class.
+        /// </summary>
+        public GradientFill()
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the GradientFill class.
+        /// </summary>
+        /// <param name="color1"></param>
+        /// <param name="color2"></param>
+        public GradientFill(Color color1, Color color2)
+        {
+            _Color1 = color1;
+            _Color2 = color2;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the GradientFill class.
+        /// </summary>
+        /// <param name="color1"></param>
+        /// <param name="color2"></param>
+        /// <param name="angle"></param>
+        public GradientFill(Color color1, Color color2, float angle)
+        {
+            _Color1 = color1;
+            _Color2 = color2;
+            _Angle = angle;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the GradientFill class.
+        /// </summary>
+        /// <param name="interpolationColors"></param>
+        public GradientFill(ColorStop[] interpolationColors)
+        {
+            _InterpolationColors.AddRange(interpolationColors);
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the GradientFill class.
+        /// </summary>
+        /// <param name="interpolationColors"></param>
+        public GradientFill(ColorStop[] interpolationColors, int angle)
+        {
+            _InterpolationColors.AddRange(interpolationColors);
+            _Angle = angle;
+        }
+        #endregion
+
+        #region Internal Implementation
+        /// <summary>
+        /// Creates the brush for fill.
+        /// </summary>
+        /// <param name="bounds">Bounds for the brush</param>
+        /// <returns>Returns brush or null if brush cannot be created for given bounds or colors are not set. It is responsibility of caller to Dispose the brush.</returns>
+        public override Brush CreateBrush(Rectangle bounds)
+        {
+            if (_Color1.IsEmpty && _Color2.IsEmpty && _InterpolationColors.Count == 0 || bounds.Width < 1 || bounds.Height < 1) return null;
+
+            LinearGradientBrush brush=new LinearGradientBrush(bounds, _Color1, _Color2, _Angle);
+            if (_InterpolationColors.Count == 0)
+                return brush;
+            brush.InterpolationColors = _InterpolationColors.GetColorBlend();
+
+            return brush;
+        }
+
+        private Color _Color1 = Color.Empty;
+        /// <summary>
+        /// Gets or sets the starting gradient fill color.
+        /// </summary>
+        [Description("Indicates the fill color.")]
+        public Color Color1
+        {
+            get { return _Color1; }
+            set { _Color1 = value; }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        /// <returns>true if property should be serialized</returns>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeColor1()
+        {
+            return !_Color1.IsEmpty;
+        }
+        /// <summary>
+        /// Sets the property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetColor1()
+        {
+            Color1 = Color.Empty;
+        }
+
+        private Color _Color2 = Color.Empty;
+        /// <summary>
+        /// Gets or sets the end gradient fill color.
+        /// </summary>
+        [Description("Indicates the fill color.")]
+        public Color Color2
+        {
+            get { return _Color2; }
+            set { _Color2 = value; }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        /// <returns>true if property should be serialized</returns>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeColor2()
+        {
+            return !_Color2.IsEmpty;
+        }
+        /// <summary>
+        /// Sets the property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetColor2()
+        {
+            Color2 = Color.Empty;
+        }
+
+        private ColorBlendCollection _InterpolationColors = new ColorBlendCollection();
+        /// <summary>
+        /// Gets the collection that defines the multicolor gradient background.
+        /// </summary>
+        /// <remarks>
+        /// Setting this property creates a multicolor gradient with one color at each position along the gradient line. Setting this property nullifies all previous color, position, and falloff settings for this gradient fill.
+        /// </remarks>
+        [Browsable(true), DesignerSerializationVisibility(DesignerSerializationVisibility.Content), Description("Collection that defines the multicolor gradient background.")]
+        public ColorBlendCollection InterpolationColors
+        {
+            get { return _InterpolationColors; }
+        }
+
+        private float _Angle = 90;
+        /// <summary>
+        /// Gets or sets the gradient fill angle. Default value is 90.
+        /// </summary>
+        [DefaultValue(90), Description("Indicates gradient fill angle.")]
+        public float Angle
+        {
+            get { return _Angle; }
+            set
+            {
+                _Angle = value;
+            }
+        }
+        /// <summary>
+        /// Creates a pen based on fill parameters.
+        /// </summary>
+        /// <param name="width">Width of the pen to create</param>
+        /// <returns>new instance of pen or null if pen cannot be created.</returns>
+        public override Pen CreatePen(int width)
+        {
+            if (!_Color1.IsEmpty)
+                return new Pen(_Color1, width);
+            if (!_Color2.IsEmpty)
+                return new Pen(_Color2, width);
+            return null;
+        }
+        #endregion
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/Drawing/RectangleShape.cs b/PROMS/DotNetBar Source Code/AdvTree/Drawing/RectangleShape.cs
new file mode 100644
index 00000000..5cb76178
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/Drawing/RectangleShape.cs	
@@ -0,0 +1,128 @@
+using System;
+using System.Text;
+using System.Drawing;
+using System.ComponentModel;
+using DevComponents.AdvTree;
+using System.Drawing.Drawing2D;
+using DevComponents.DotNetBar;
+
+namespace DevComponents.WinForms.Drawing
+{
+    internal class RectangleShape : Shape
+    {
+        #region Internal Implementation
+        /// <summary>
+        /// Renders rectangle on canvas.
+        /// </summary>
+        /// <param name="g">Target graphics to render shape on.</param>
+        /// <param name="bounds">Shape bounds.</param>
+        public override void Paint(Graphics g, Rectangle bounds)
+        {
+            if (bounds.Width < 2 || bounds.Height < 2 || g == null || _Fill == null && _Border == null) return;
+
+            GraphicsPath path = null;
+            
+            if (!_CornerRadius.IsZero)
+            {
+                path = DisplayHelp.GetRoundedRectanglePath(bounds, _CornerRadius.TopLeft, _CornerRadius.TopRight, 
+                    _CornerRadius.BottomRight, _CornerRadius.BottomLeft);
+            }
+
+            if (_Fill != null)
+            {
+                Brush brush = _Fill.CreateBrush(bounds);
+                if (brush != null)
+                {
+                    SmoothingMode sm = g.SmoothingMode;
+                    if (brush is SolidBrush && path==null)
+                        g.SmoothingMode = SmoothingMode.None;
+                    if (path == null)
+                        g.FillRectangle(brush, bounds);
+                    else
+                        g.FillPath(brush, path);
+                    g.SmoothingMode = sm;
+                    brush.Dispose();
+                }
+            }
+
+            if (_Border != null)
+            {
+                Pen pen = _Border.CreatePen();
+                if (pen != null)
+                {
+                    if (path == null)
+                        g.DrawRectangle(pen, bounds);
+                    else
+                        g.DrawPath(pen, path);
+
+                    pen.Dispose();
+                }
+            }
+
+            Shape content = this.Content;
+            if (content != null)
+            {
+                Rectangle contentBounds = Border.Deflate(bounds, _Border);
+                Region oldClip = null;
+                if (path != null && ClipToBounds)
+                {
+                    oldClip = g.Clip;
+                    g.SetClip(path, CombineMode.Intersect);
+                }
+                content.Paint(g, contentBounds);
+                if (oldClip != null) g.Clip = oldClip;
+            }
+
+            if (path != null) path.Dispose();
+        }
+
+        private Border _Border;
+        /// <summary>
+        /// Gets or sets shape border.
+        /// </summary>
+        [DefaultValue(null), Description("Indicates shape border.")]
+        public Border Border
+        {
+            get { return _Border; }
+            set { _Border = value; }
+        }
+
+        private Fill _Fill = null;
+        /// <summary>
+        /// Gets or sets the shape fill.
+        /// </summary>
+        [DefaultValue(null), Description("Indicates shape fill")]
+        public Fill Fill
+        {
+            get { return _Fill; }
+            set { _Fill = value; }
+        }
+
+        private CornerRadius _CornerRadius;
+        /// <summary>
+        /// Gets or sets the CornerRadius.
+        /// </summary>
+        public CornerRadius CornerRadius
+        {
+            get { return _CornerRadius; }
+            set { _CornerRadius = value; }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeCornerRadius()
+        {
+            return !_CornerRadius.IsZero;
+        }
+        /// <summary>
+        /// Resets the property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetCornerRadius()
+        {
+            CornerRadius = new CornerRadius();
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/Drawing/Shape.cs b/PROMS/DotNetBar Source Code/AdvTree/Drawing/Shape.cs
new file mode 100644
index 00000000..78600219
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/Drawing/Shape.cs	
@@ -0,0 +1,48 @@
+using System;
+using System.Text;
+using System.Drawing;
+using System.ComponentModel;
+
+namespace DevComponents.WinForms.Drawing
+{
+    /// <summary>
+    /// Defines a visual shape.
+    /// </summary>
+    internal abstract class Shape
+    {
+        #region Internal Implementation
+        /// <summary>
+        /// Renders shape on canvas.
+        /// </summary>
+        /// <param name="g">Target graphics to render shape on.</param>
+        /// <param name="bounds">Shape bounds.</param>
+        public abstract void Paint(Graphics g, Rectangle bounds);
+
+        private Shape _Content = null;
+        /// <summary>
+        /// Gets or sets the single piece of content inside of the shape.
+        /// </summary>
+        [DefaultValue(null)]
+        public Shape Content
+        {
+            get { return _Content; }
+            set { _Content = value; }
+        }
+
+        private bool _ClipToBounds = false;
+        /// <summary>
+        /// Gets or sets whether to clip the Content of this shape. Default value is false.
+        /// </summary>
+        [DefaultValue(false)]
+        public bool ClipToBounds
+        {
+            get { return _ClipToBounds; }
+            set
+            {
+                _ClipToBounds = value;
+            }
+        }
+        
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/Drawing/SolidBorder.cs b/PROMS/DotNetBar Source Code/AdvTree/Drawing/SolidBorder.cs
new file mode 100644
index 00000000..7609a497
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/Drawing/SolidBorder.cs	
@@ -0,0 +1,86 @@
+using System;
+using System.Text;
+using System.Drawing;
+using System.ComponentModel;
+
+namespace DevComponents.WinForms.Drawing
+{
+    public class SolidBorder : Border
+    {
+        #region Constructor
+        /// <summary>
+        /// Initializes a new instance of the SolidBorder class.
+        /// </summary>
+        /// <param name="color"></param>
+        /// <param name="width"></param>
+        public SolidBorder(Color color, int width)
+        {
+            _Color = color;
+            _Width = width;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the SolidBorder class.
+        /// </summary>
+        /// <param name="color"></param>
+        public SolidBorder(Color color)
+        {
+            _Color = color;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the SolidBorder class.
+        /// </summary>
+        public SolidBorder()
+        {
+        }
+        #endregion
+        #region Internal Implementation
+        /// <summary>
+        /// Creates the pen for the border.
+        /// </summary>
+        /// <returns>Returns pen or null if pen cannot be created.</returns>
+        public override Pen CreatePen()
+        {
+            if (!CanCreatePen()) return null;
+
+            return new Pen(_Color, _Width);
+        }
+
+        private bool CanCreatePen()
+        {
+            return !_Color.IsEmpty && _Width > 0;
+        }
+
+        private Color _Color = Color.Empty;
+        /// <summary>
+        /// Gets or sets the fill color.
+        /// </summary>
+        [Description("Indicates the fill color.")]
+        public Color Color
+        {
+            get { return _Color; }
+            set { _Color = value; }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        /// <returns>true if property should be serialized</returns>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeColor()
+        {
+            return !_Color.IsEmpty;
+        }
+        /// <summary>
+        /// Sets the property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetColor()
+        {
+            Color = Color.Empty;
+        }
+
+        
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/Drawing/SolidFill.cs b/PROMS/DotNetBar Source Code/AdvTree/Drawing/SolidFill.cs
new file mode 100644
index 00000000..ae63361b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/Drawing/SolidFill.cs	
@@ -0,0 +1,76 @@
+using System;
+using System.Text;
+using System.Drawing;
+using System.ComponentModel;
+
+namespace DevComponents.WinForms.Drawing
+{
+    public class SolidFill : Fill
+    {
+        #region Constructor
+        /// <summary>
+        /// Initializes a new instance of the SolidFill class.
+        /// </summary>
+        /// <param name="color"></param>
+        public SolidFill(Color color)
+        {
+            _Color = color;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the SolidFill class.
+        /// </summary>
+        public SolidFill()
+        {
+        }
+        #endregion
+
+        #region Internal Implementation
+        /// <summary>
+        /// Creates the brush for fill.
+        /// </summary>
+        /// <param name="bounds">Bounds for the brush</param>
+        /// <returns>Returns brush or null if brush cannot be created for given bounds or colors are not set. It is responsibility of caller to Dispose the brush.</returns>
+        public override Brush CreateBrush(Rectangle bounds)
+        {
+            if (_Color.IsEmpty) return null;
+            return new SolidBrush(_Color);
+        }
+
+        private Color _Color = Color.Empty;
+        /// <summary>
+        /// Gets or sets the fill color.
+        /// </summary>
+        [Description("Indicates the fill color.")]
+        public Color Color
+        {
+            get { return _Color; }
+            set { _Color = value; }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        /// <returns>true if property should be serialized</returns>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeColor()
+        {
+            return !_Color.IsEmpty;
+        }
+        /// <summary>
+        /// Sets the property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetColor()
+        {
+            Color = Color.Empty;
+        }
+
+        public override Pen CreatePen(int width)
+        {
+            if (!_Color.IsEmpty)
+                return new Pen(_Color, width);
+            return null;
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/ElementStyleCollection.cs b/PROMS/DotNetBar Source Code/AdvTree/ElementStyleCollection.cs
new file mode 100644
index 00000000..ff62e6d1
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/ElementStyleCollection.cs	
@@ -0,0 +1,143 @@
+using System;
+using System.Collections;
+using DevComponents.DotNetBar;
+
+namespace DevComponents.AdvTree
+{
+	/// <summary>
+	/// Represents collection for Node objects.
+	/// </summary>
+	public class ElementStyleCollection:CollectionBase 
+	{
+		#region Private Variables
+		private AdvTree m_TreeControl=null;
+		//private Hashtable m_InnerHashtable=new Hashtable();
+		#endregion
+
+		#region Internal Implementation
+		/// <summary>Creates new instance of the object.</summary>
+		public ElementStyleCollection()
+		{
+		}
+		internal AdvTree TreeControl
+		{
+			get {return m_TreeControl;}
+			set {m_TreeControl=value;}
+		}
+
+		/// <summary>
+		/// Adds new object to the collection.
+		/// </summary>
+		/// <param name="tab">Object to add.</param>
+		/// <returns>Index of newly added object.</returns>
+		public int Add(ElementStyle style)
+		{
+			return List.Add(style);
+		}
+		/// <summary>
+		/// Returns reference to the object in collection based on it's index.
+		/// </summary>
+		public ElementStyle this[int index]
+		{
+			get {return (ElementStyle)(List[index]);}
+			set {List[index] = value;}
+		}
+
+		/// <summary>
+		/// Returns reference to the object in collection based on it's name.
+		/// </summary>
+		public ElementStyle this[string name]
+		{
+			get
+			{
+				foreach(ElementStyle style in this.List)
+				{
+					if(style.Name==name)
+						return style;
+				}
+				return null;
+			}
+		}
+
+		/// <summary>
+		/// Inserts new object into the collection.
+		/// </summary>
+		/// <param name="index">Position of the object.</param>
+		/// <param name="value">Object to insert.</param>
+		public void Insert(int index, ElementStyle value) 
+		{
+			List.Insert(index, value);
+		}
+
+		/// <summary>
+		/// Returns index of the object inside of the collection.
+		/// </summary>
+		/// <param name="value">Reference to the object.</param>
+		/// <returns>Index of the object.</returns>
+		public int IndexOf(ElementStyle value) 
+		{
+			return List.IndexOf(value);
+		}
+
+		/// <summary>
+		/// Returns whether collection contains specified object.
+		/// </summary>
+		/// <param name="value">Object to look for.</param>
+		/// <returns>true if object is part of the collection, otherwise false.</returns>
+		public bool Contains(ElementStyle value) 
+		{
+			return List.Contains(value);
+		}
+
+		/// <summary>
+		/// Removes specified object from the collection.
+		/// </summary>
+		/// <param name="value"></param>
+		public void Remove(ElementStyle value) 
+		{
+			List.Remove(value);
+		}
+
+		protected override void OnRemoveComplete(int index,object value)
+		{
+			base.OnRemoveComplete(index,value);
+			ElementStyle style=value as ElementStyle;
+			style.Parent=null;
+			//m_InnerHashtable.Remove(style.Name);
+		}
+		protected override void OnInsertComplete(int index,object value)
+		{
+			base.OnInsertComplete(index,value);
+			ElementStyle style=value as ElementStyle;
+			if(style.Parent!=null && style.Parent!=this)
+				style.Parent.Remove(style);
+			style.Parent=this;
+			//m_InnerHashtable.Add(style.Name,style);
+		}
+
+		/// <summary>
+		/// Copies collection into the specified array.
+		/// </summary>
+		/// <param name="array">Array to copy collection to.</param>
+		/// <param name="index">Starting index.</param>
+		public void CopyTo(ElementStyle[] array, int index) 
+		{
+			List.CopyTo(array, index);
+		}
+
+		/// <summary>
+		/// Copies contained items to the Node array.
+		/// </summary>
+		/// <param name="array">Array to copy to.</param>
+		internal void CopyTo(ElementStyle[] array)
+		{
+			List.CopyTo(array,0);
+		}
+
+		protected override void OnClear()
+		{
+			base.OnClear();
+		}
+		#endregion
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/Enums.cs b/PROMS/DotNetBar Source Code/AdvTree/Enums.cs
new file mode 100644
index 00000000..55fece33
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/Enums.cs	
@@ -0,0 +1,766 @@
+using System;
+
+namespace DevComponents.AdvTree
+{
+    /// <summary>
+    /// Specifies layout of the items in AdvTree control.
+    /// </summary>
+    public enum eView
+    {
+        /// <summary>
+        /// Standard TreeView layout.
+        /// </summary>
+        Tree,
+        /// <summary>
+        /// ListView style tile layout.
+        /// </summary>
+        Tile
+    }
+
+	/// <summary>Specifies the way background image is displayed on background.</summary>
+	public enum eStyleBackgroundImage:int
+	{
+		/// <summary>Image is stretched to fill the background</summary>
+		Stretch=0,
+		/// <summary>Image is centered inside the background</summary>
+		Center=1,
+		/// <summary>Image is tiled inside the background</summary>
+		Tile=2,
+		/// <summary>
+		/// Image is drawn in top left corner of container space.
+		/// </summary>
+		TopLeft=3,
+		/// <summary>
+		/// Image is drawn in top right corner of container space.
+		/// </summary>
+		TopRight=4,
+		/// <summary>
+		/// Image is drawn in bottom left corner of container space.
+		/// </summary>
+		BottomLeft=5,
+		/// <summary>
+		/// Image is drawn in bottom right corner of container space.
+		/// </summary>
+		BottomRight=6
+	}
+
+	/// <summary>Indicates alignment of a part of the cell like image or check box in relation to the text.</summary>
+	public enum eCellPartAlignment:int
+	{
+		/// <summary>
+		/// Part is aligned to the left center of the text assuming left-to-right
+		/// orientation.
+		/// </summary>
+		NearCenter=0,
+		/// <summary>
+		/// Part is aligned to the right center of the text assuming left-to-right
+		/// orientation.
+		/// </summary>
+		FarCenter=1,
+		/// <summary>
+		/// Part is aligned to the top left of the text assuming left-to-right
+		/// orientation.
+		/// </summary>
+		NearTop=2,
+		/// <summary>Part is aligned above the text and centered.</summary>
+		CenterTop=3,
+		/// <summary>
+		/// Part is aligned to the top right of the text assuming left-to-right
+		/// orientation.
+		/// </summary>
+		FarTop=4,
+		/// <summary>
+		/// Part is aligned to the bottom left of the text assuming left-to-right
+		/// orientation.
+		/// </summary>
+		NearBottom=5,
+		/// <summary>Part is aligned below the text and centered.</summary>
+		CenterBottom=6,
+		/// <summary>
+		/// Part is aligned to the bottom right of the text assuming left-to-right
+		/// orientation.
+		/// </summary>
+		FarBottom=7,
+        /// <summary>
+        /// Part has default alignment that depends on the parent control view.
+        /// </summary>
+        Default = 8
+	}
+
+	/// <summary>
+	/// Specifies how to trim characters from a text that does not completely fit into a element's shape.
+	/// </summary>
+	public enum eStyleTextTrimming
+	{
+		/// <summary>
+		/// Specifies that the text is trimmed to the nearest character.
+		/// </summary>
+		Character=System.Drawing.StringTrimming.Character,
+		/// <summary>
+		/// Specifies that the text is trimmed to the nearest character, and an ellipsis is inserted at the end of a trimmed line.
+		/// </summary>
+		EllipsisCharacter=System.Drawing.StringTrimming.EllipsisCharacter,
+		/// <summary>
+		/// The center is removed from trimmed lines and replaced by an ellipsis. The algorithm keeps as much of the last slash-delimited segment of the line as possible.
+		/// </summary>
+		EllipsisPath=System.Drawing.StringTrimming.EllipsisPath,
+		/// <summary>
+		/// Specifies that text is trimmed to the nearest word, and an ellipsis is inserted at the end of a trimmed line.
+		/// </summary>
+		EllipsisWord=System.Drawing.StringTrimming.EllipsisWord,
+		/// <summary>
+		/// Specifies no trimming.
+		/// </summary>
+		None=System.Drawing.StringTrimming.None,
+		/// <summary>
+		/// Specifies that text is trimmed to the nearest word.
+		/// </summary>
+		Word=System.Drawing.StringTrimming.Word
+	}
+
+    ///// <summary>
+    ///// Specifies the border type for style element.
+    ///// </summary>
+    //public enum eStyleBorderType:int
+    //{
+    //    /// <summary>Indicates no border</summary>
+    //    None,
+    //    /// <summary>Border is a solid line</summary>
+    //    Solid,
+    //    /// <summary>Border is a solid dash line</summary>
+    //    Dash,
+    //    /// <summary>Border is solid dash-dot line</summary>
+    //    DashDot,
+    //    /// <summary>Border is solid dash-dot-dot line</summary>
+    //    DashDotDot,
+    //    /// <summary>Border consists of dots</summary>
+    //    Dot,
+    //    /// <summary>Etched Border</summary>
+    //    Etched,
+    //    /// <summary>Double Border</summary>
+    //    Double
+    //}
+
+	/// <summary>
+	/// Indicates absolute vertical alignment of the content.
+	/// </summary>
+	public enum eVerticalAlign
+	{
+		/// <summary>
+		/// Content is aligned to the top
+		/// </summary>
+		Top,
+		/// <summary>
+		/// Content is aligned in the middle
+		/// </summary>
+		Middle,
+		/// <summary>
+		/// Content is aligned at the bottom
+		/// </summary>
+		Bottom
+	}
+
+	/// <summary>
+	/// Indicates absolute horizontal alignment
+	/// </summary>
+	public enum eHorizontalAlign
+	{
+		/// <summary>
+		/// Content is left aligned
+		/// </summary>
+		Left,
+		/// <summary>
+		/// Content is centered
+		/// </summary>
+		Center,
+		/// <summary>
+		/// Content is right aligned
+		/// </summary>
+		Right
+	}
+
+	/// <summary>
+	/// Indicates prefered node layout position on Map tree layout when node is the child node of the top-level root node.
+	/// </summary>
+	public enum eMapPosition
+	{
+		/// <summary>
+		/// Node is positioned based on default algorithm.
+		/// </summary>
+		Default,
+		/// <summary>
+		/// Sub-root node and all nodes after it are positioned to the left of the root.
+		/// </summary>
+		Near,
+		/// <summary>
+		/// Sub-root node and all nodes before it are positioned to the right of the root.
+		/// </summary>
+		Far
+	}
+
+    ///// <summary>
+    ///// Indicates corner type for the border around visual element.
+    ///// </summary>
+    //public enum eCornerType
+    //{
+    //    /// <summary>
+    //    /// Specifies that corner type is inherited from parent setting.
+    //    /// </summary>
+    //    Inherit,
+    //    /// <summary>
+    //    /// Specifies square corner.
+    //    /// </summary>
+    //    Square,
+    //    /// <summary>
+    //    /// Specifies rounded corner.
+    //    /// </summary>
+    //    Rounded,
+    //    /// <summary>
+    //    /// Specifies diagonal corner.
+    //    /// </summary>
+    //    Diagonal
+    //}
+
+	/// <summary>
+	/// Specifies the column header visibility for the node.
+	/// </summary>
+	public enum eNodeHeaderVisibility
+	{
+		/// <summary>
+		/// Column header is automatically shown/hidden based on the node's position in the tree. When
+		/// Node is first child node i.e. with index=0 the header will be shown, otherwise header will
+		/// be hidden.
+		/// </summary>
+		Automatic,
+		/// <summary>
+		/// Column header is always displayed regardless of node's position.
+		/// </summary>
+		AlwaysShow,
+		/// <summary>
+		/// Column header is always hidden regardless of node's position.
+		/// </summary>
+		AlwaysHide
+	}
+
+	/// <summary>
+	/// Indicates the part of the node.
+	/// </summary>
+    public enum eNodeRectanglePart
+	{
+		/// <summary>
+		/// Bounds of complete node content except expand button. This also includes the child node bounds if node is expanded.
+		/// </summary>
+		NodeContentBounds,
+		/// <summary>
+		/// Bounds of the expand button which collapses/expands the node.
+		/// </summary>
+		ExpandBounds,
+        /// <summary>
+        /// Hit test bounds of the expand button which collapses/expands the node used by mouse routines to trigger node expansion/collapse.
+        /// </summary>
+        ExpandHitTestBounds,
+		/// <summary>
+		/// Bounds of all child nodes of give node.
+		/// </summary>
+		ChildNodeBounds,
+		/// <summary>
+		/// Bounds for cells inside a node.
+		/// </summary>
+		CellsBounds,
+		/// <summary>
+		/// Complete node bounds including expand button.
+		/// </summary>
+		NodeBounds,
+		/// <summary>
+		/// Bounds of the command button.
+		/// </summary>
+		CommandBounds,
+        /// <summary>
+        /// Bounds of child node columns if node has columns defined.
+        /// </summary>
+        ColumnsBounds
+	}
+
+	/// <summary>
+	/// Indicates the part of the cell.
+	/// </summary>
+	internal enum eCellRectanglePart
+	{
+		/// <summary>
+		/// Bounds of check box or Rectangle.Empty if there is no check-box.
+		/// </summary>
+		CheckBoxBounds,
+		/// <summary>
+		/// Bounds of image inside the cell or Rectangle.Empty if there is no image.
+		/// </summary>
+		ImageBounds,
+		/// <summary>
+		/// Text bounds inside of cell.
+		/// </summary>
+		TextBounds,
+		/// <summary>
+		/// Cell bounds
+		/// </summary>
+		CellBounds
+	}
+
+	/// <summary>
+	/// Indicates part of the node mouse is placed over.
+	/// </summary>
+	internal enum eMouseOverNodePart
+	{
+		/// <summary>
+		/// Mouse is not over any node part.
+		/// </summary>
+		None,
+		/// <summary>
+		/// Mouse is placed over the node.
+		/// </summary>
+		Node,
+		/// <summary>
+		/// Mouse is placed over node expand button.
+		/// </summary>
+		Expand,
+		/// <summary>
+		/// Mouse is placed over the cell.
+		/// </summary>
+		Cell,
+		/// <summary>
+		/// Mouse is placed over the command button.
+		/// </summary>
+		Command
+	}
+
+    ///// <summary>
+    ///// Indicates white-space part of the style.
+    ///// </summary>
+    //[Flags()]
+    //public enum eSpacePart
+    //{
+    //    /// <summary>
+    //    /// Represents style padding.
+    //    /// </summary>
+    //    Padding=1,
+    //    /// <summary>
+    //    /// Represents style border.
+    //    /// </summary>
+    //    Border=2,
+    //    /// <summary>
+    //    /// Represents style margin.
+    //    /// </summary>
+    //    Margin=4
+    //}
+
+    ///// <summary>
+    ///// Indicates the style side.
+    ///// </summary>
+    //public enum eStyleSide
+    //{
+    //    /// <summary>
+    //    /// Specifies left side of the style.
+    //    /// </summary>
+    //    Left,
+    //    /// <summary>
+    //    /// Specifies right side of the style.
+    //    /// </summary>
+    //    Right,
+    //    /// <summary>
+    //    /// Specifies top side of the style.
+    //    /// </summary>
+    //    Top,
+    //    /// <summary>
+    //    /// Specifies bottom side of the style.
+    //    /// </summary>
+    //    Bottom
+    //}
+
+	/// <summary>
+	/// Indicates the visibility of node expand part which allows user to expand/collaps node.
+	/// </summary>
+	public enum eNodeExpandVisibility
+	{
+		/// <summary>
+		/// Default setting which indicates that when node has child nodes expand part is visible otherwise it is hidden.
+		/// </summary>
+		Auto,
+		/// <summary>
+		/// Expand part is always visible regardless of whether child nodes are present or not.
+		/// </summary>
+		Visible,
+		/// <summary>
+		/// Expand part is always hidden regardless of whether child nodes are present or not.
+		/// </summary>
+		Hidden
+	}
+
+	/// <summary>
+	/// Specifies the action that raised a AdvTreeEventArgs event
+	/// </summary>
+	public enum eTreeAction
+	{
+		/// <summary>
+		/// The event was caused by a keystroke.
+		/// </summary>
+		Keyboard,
+		/// <summary>
+		/// The event was caused by a mouse operation.
+		/// </summary>
+		Mouse,
+		/// <summary>
+		/// The event was caused by the Node collapsing.
+		/// </summary>
+		Collapse,
+		/// <summary>
+		/// The event was caused by the Node expanding.
+		/// </summary>
+		Expand,
+		/// <summary>
+		/// The event is caused programmatically from user code.
+		/// </summary>
+		Code
+	}
+
+	/// <summary>
+	/// Specifies node connector type. Node connector is the type of the line/connection that is drawn to connect child node to it's parent node.
+	/// </summary>
+	public enum eNodeConnectorType
+	{
+        ///// <summary>
+        ///// Curved line connector type.
+        ///// </summary>
+        //Curve,
+		/// <summary>
+		/// Straight line connector type.
+		/// </summary>
+		Line
+	}
+
+    ///// <summary>
+    ///// Specifies the cap style with which the connector line will start or end.
+    ///// </summary>
+    //public enum eConnectorCap
+    //{
+    //    /// <summary>
+    //    /// Specifies no cap.
+    //    /// </summary>
+    //    None,
+    //    /// <summary>
+    //    /// Round cap type.
+    //    /// </summary>
+    //    Ellipse,
+    //    /// <summary>
+    //    /// Arrow cap type.
+    //    /// </summary>
+    //    Arrow
+    //}
+
+	/// <summary>
+	/// Specifies the layout type used to position the cells within the nodes.
+	/// </summary>
+	public enum eCellLayout
+	{
+		/// <summary>
+		/// Specifies that default setting is to be used for cell layout. Default is Horizontal. When set to default on the Node, setting from Tree control is used.
+		/// </summary>
+		Default,
+		/// <summary>Horizontal layout positions the cells horizontally next to each other.</summary>
+		Horizontal,
+		/// <summary>
+		/// Vertical layout positions cell vertically on top of each other.
+		/// </summary>
+		Vertical
+	}
+
+	/// <summary>
+	/// Specifies the layout type used to position the parts of the cell like image, checkbox and text.
+	/// </summary>
+	public enum eCellPartLayout
+	{
+		/// <summary>
+		/// Specifies that default setting is to be used for cell parts layout. Default is Horizontal. When set to default on the Cell, setting from Tree control is used.
+		/// </summary>
+		Default,
+		/// <summary>Horizontal layout positions the parts of the cell horizontally next to each other.</summary>
+		Horizontal,
+		/// <summary>
+		/// Vertical layout positions parts of the cell vertically on top of each other.
+		/// </summary>
+		Vertical
+	}
+
+    /// <summary>
+    /// Specifies the color scheme loaded by ColorScheme object.
+    /// </summary>
+    public enum eColorSchemeStyle
+    {
+        /// <summary>
+        /// Indicates Office 2003 like color scheme.
+        /// </summary>
+        Office2003,
+        /// <summary>
+        /// Indicates VS.NET 2005 like color scheme.
+        /// </summary>
+        VS2005,
+        /// <summary>
+        /// Indicates Office 2007 like color scheme.
+        /// </summary>
+        Office2007
+    }
+
+	/// <summary>
+	/// Specifies the currently selected system color scheme if running on Windows XP.
+	/// </summary>
+	internal enum eWinXPColorScheme
+	{
+		/// <summary>
+		/// Color scheme cannot be determined.
+		/// </summary>
+		Undetermined,
+		/// <summary>
+		/// Blue color scheme.
+		/// </summary>
+		Blue,
+		/// <summary>
+		/// Olive green color scheme.
+		/// </summary>
+		OliveGreen,
+		/// <summary>
+		/// Silver color scheme.
+		/// </summary>
+		Silver
+	}
+
+	/// <summary>
+	/// Specifies the flow of diagram layout related to the root node.
+	/// </summary>
+	public enum eDiagramFlow
+	{
+		/// <summary>
+		/// Nodes are positioned from left to right with root node being the left-most node.
+		/// </summary>
+		LeftToRight,
+		/// <summary>
+		/// Nodes are positioned from right to left with root node being the right-most
+		/// node.
+		/// </summary>
+		RightToLeft,
+		/// <summary>
+		/// Nodes are positioned from top to bottom with root node being the top node.
+		/// </summary>
+		TopToBottom,
+		/// <summary>
+		/// Nodes are positioned from bottom to top with root node being bottom node.
+		/// </summary>
+		BottomToTop
+	}
+	
+	/// <summary>
+	/// Specifies the flow of the map layout.
+	/// </summary>
+	public enum eMapFlow
+	{
+		/// <summary>
+		/// Nodes are arranged around the root node.
+		/// </summary>
+		Spread,
+		/// <summary>
+		/// Nodes are arranged from below the root node.
+		/// </summary>
+		TopToBottom,
+		/// <summary>
+		/// Nodes are arranged above the root node.
+		/// </summary>
+		BottomToTop,
+		/// <summary>
+		/// Nodes are arranged to the right of the root node.
+		/// </summary>
+		LeftToRight,
+		/// <summary>
+		/// Nodes are arranged to the left of the root node.
+		/// </summary>
+		RightToLeft
+	}
+
+	/// <summary>
+	/// Specifies the type of the expand button.
+	/// </summary>
+	public enum eExpandButtonType
+	{
+		/// <summary>
+		/// Indicates elliptical expand button.
+		/// </summary>
+		Ellipse,
+		/// <summary>
+		/// Indicates rectangular expand button.
+		/// </summary>
+		Rectangle,
+		/// <summary>
+		/// Indicates that images are used for expand button. 
+		/// </summary>
+		Image,
+        /// <summary>
+        /// Indicates the Windows Vista style expand button.
+        /// </summary>
+        Triangle
+	}
+	
+	/// <summary>
+	/// Specifies the visual style for the tree control.
+	/// </summary>
+	public enum eVisualStyle
+	{
+		/// <summary>
+		/// Indicates default visual style.
+		/// </summary>
+		Default
+	}
+
+	/// <summary>
+	/// Specifies the layout type for the nodes.
+	/// </summary>
+	public enum eNodeLayout
+	{
+		/// <summary>
+		/// Nodes are arranged around root node in map format.
+		/// </summary>
+		Map,
+		/// <summary>
+		/// Nodes are arranged from left-to-right in diagram format.
+		/// </summary>
+		Diagram
+	}
+	
+	/// <summary>
+	/// Specifies renderer type used to render nodes.
+	/// </summary>
+	public enum eNodeRenderMode
+	{
+		
+		/// <summary>
+		/// Specifies default renderer which allows most customization through AdvTree
+		/// properties. Default renderer integrates with the Style architecture to provide
+		/// customization on renderer behavior.
+		/// </summary>
+		Default,
+        ///// <summary>
+        ///// 	<para>Specifies professional renderer. Professional renderer is custom renderer
+        /////     which does not rely on Style architecture for customization of renderer appearance
+        /////     since it provides much richer appearance than Default renderer.</para>
+        ///// 	<para>Professional renderer colors can be controls through
+        /////     NodeProfessionalColorTable object which is exposed by
+        /////     NodeProfessionalRenderer.ColorTable property.</para>
+        ///// </summary>
+        //Professional,
+		/// <summary>
+		/// Specifies that custom renderer is used. When set you must also set NodeRenderer
+		/// to renderer you want to use.
+		/// </summary>
+		Custom
+	}
+
+    /// <summary>
+    /// Specifies the node selection style.
+    /// </summary>
+    public enum eSelectionStyle
+    {
+        /// <summary>
+        /// Node selector highlights the complete node row when node is selected.
+        /// </summary>
+        FullRowSelect,
+        /// <summary>
+        /// Node selector draws the rectangle that highlights the node content. Appearance similar to system tree view in Windows Vista.
+        /// </summary>
+        HighlightCells,
+        /// <summary>
+        /// Node selector draws hollow selection rectangle around the node.
+        /// </summary>
+        NodeMarker,
+    }
+
+    /// <summary>
+    /// Specifies the rule for multi-node selection.
+    /// </summary>
+    public enum eMultiSelectRule
+    {
+        /// <summary>
+        /// Allows multiple selection of nodes with same parent node only.
+        /// </summary>
+        SameParent,
+        /// <summary>
+        /// Allows multiple selection of any node.
+        /// </summary>
+        AnyNode
+    }
+
+    /// <summary>
+    /// Gets or sets the image alignment inside of column header.
+    /// </summary>
+    public enum eColumnImageAlignment
+    {
+        /// <summary>
+        /// Image is left aligned.
+        /// </summary>
+        Left,
+        /// <summary>
+        /// Image is right aligned.
+        /// </summary>
+        Right
+    }
+
+    /// <summary>
+    /// Specifies the editor type used when cell is edited.
+    /// </summary>
+    public enum eCellEditorType
+    {
+        /// <summary>
+        /// Indicates default, text based editor.
+        /// </summary>
+        Default,
+        /// <summary>
+        /// Indicates that Integer numeric editor will be used for editing the value of the cell or column.
+        /// </summary>
+        NumericInteger,
+        /// <summary>
+        /// Indicates that Double numeric editor will be used for editing the value of the cell or column.
+        /// </summary>
+        NumericDouble,
+        /// <summary>
+        /// Indicates that Currency numeric editor will be used for editing the value of the cell or column.
+        /// </summary>
+        NumericCurrency,
+        /// <summary>
+        /// Indicates that date editor will be used for editing the value of the cell or column.
+        /// </summary>
+        Date,
+        /// <summary>
+        /// Indicates that time editor will be used for editing the value of the cell or column.
+        /// </summary>
+        Time,
+        /// <summary>
+        /// Indicates that date and time editor will be used for editing the value of the cell or column.
+        /// </summary>
+        DateTime,
+        /// <summary>
+        /// Indicates that cell will use custom editor that you provide by handling AdvTree.ProvideCustomCellEditor event.
+        /// </summary>
+        Custom
+    }
+    /// <summary>
+    /// Specifies the sort direction for the column header.
+    /// </summary>
+    public enum eSortDirection
+    {
+        /// <summary>
+        /// No sort is specified.
+        /// </summary>
+        None,
+        /// <summary>
+        /// Ascending sorting is in effect, i.e. A-Z
+        /// </summary>
+        Ascending,
+        /// <summary>
+        /// Descending sorting is in effect, i.e. Z-A
+        /// </summary>
+        Descending
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/EventDelegates.cs b/PROMS/DotNetBar Source Code/AdvTree/EventDelegates.cs
new file mode 100644
index 00000000..6da07b7e
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/EventDelegates.cs	
@@ -0,0 +1,98 @@
+using System;
+using DevComponents.AdvTree.Display;
+
+namespace DevComponents.AdvTree
+{
+	/// <summary>
+	/// Defines the delegate for AdvTree cell based action events.
+	/// </summary>
+	public delegate void AdvTreeCellEventHandler(object sender, AdvTreeCellEventArgs e);
+	
+	/// <summary>
+	/// Defines the delegate for AdvTree cell based action events.
+	/// </summary>
+	public delegate void AdvTreeCellCancelEventHandler(object sender, TreeCellCancelEventArgs e);
+	
+	/// <summary>
+	/// Defines the delegate for AdvTree node based action events that can be cancelled.
+	/// </summary>
+	public delegate void AdvTreeNodeCancelEventHandler(object sender, AdvTreeNodeCancelEventArgs e);
+	
+	/// <summary>
+	/// Defines the delegate for AdvTree node based action events.
+	/// </summary>
+	public delegate void AdvTreeNodeEventHandler(object sender, AdvTreeNodeEventArgs e);
+
+	/// <summary>
+	/// Defines delegate for Command button events.
+	/// </summary>
+	public delegate void CommandButtonEventHandler(object sender, CommandButtonEventArgs e);
+
+	/// <summary>
+	/// Defines delegate for label editing events.
+	/// </summary>
+	public delegate void CellEditEventHandler(object sender, CellEditEventArgs e);
+	
+	/// <summary>
+	/// Defines the delegate for AdvTree node based action events.
+	/// </summary>
+	public delegate void TreeNodeCollectionEventHandler(object sender, TreeNodeCollectionEventArgs e);
+	
+	/// <summary>
+	/// Defines the delegate for BeforeNodeDrop and AfterNodeDrop events
+	/// </summary>
+	public delegate void TreeDragDropEventHandler(object sender, TreeDragDropEventArgs e);
+
+    /// <summary>
+    /// Defines the delegate for NodeDragFeedback event.
+    /// </summary>
+    public delegate void TreeDragFeedbackEventHander(object sender, TreeDragFeedbackEventArgs e);
+	
+	/// <summary>
+	/// Defines the delegate for mouse based node events
+	/// </summary>
+	public delegate void TreeNodeMouseEventHandler(object sender, TreeNodeMouseEventArgs e);
+	
+	/// <summary>
+	/// Defines delegate for node rendering events.
+	/// </summary>
+	public delegate void NodeRendererEventHandler(object sender, NodeRendererEventArgs e);
+	
+	/// <summary>
+	/// Defines delegate for cell rendering events.
+	/// </summary>
+	public delegate void NodeCellRendererEventHandler(object sender, NodeCellRendererEventArgs e);
+	
+	/// <summary>
+	/// Defines delegate for RenderExpandPart event.
+	/// </summary>
+	public delegate void NodeExpandPartRendererEventHandler(object sender, NodeExpandPartRendererEventArgs e);
+	
+    ///// <summary>
+    ///// Defines delegate for RenderExpandPart event.
+    ///// </summary>
+    //public delegate void NodeCommandPartRendererEventHandler(object sender, NodeCommandPartRendererEventArgs e);
+	
+	/// <summary>
+	/// Defines delegate for RenderExpandPart event.
+	/// </summary>
+	public delegate void SelectionRendererEventHandler(object sender, SelectionRendererEventArgs e);
+	/// <summary>
+	/// Defines delegate for RenderConnector event.
+	/// </summary>
+	public delegate void ConnectorRendererEventHandler(object sender, ConnectorRendererEventArgs e);
+	/// <summary>
+	/// Defines delegate for TreeBackgroundRenderer events.
+	/// </summary>
+	public delegate void TreeBackgroundRendererEventHandler(object sender, TreeBackgroundRendererEventArgs e);
+    /// <summary>
+    /// Defines delegate for RenderDragDropMarker event.
+    /// </summary>
+    public delegate void DragDropMarkerRendererEventHandler(object sender, DragDropMarkerRendererEventArgs e);
+    /// <summary>
+    /// Defines delegate for RenderColumnHeader event.
+    /// </summary>
+    public delegate void ColumnHeaderRendererEventHandler(object sender, ColumnHeaderRendererEventArgs e);
+
+    public delegate void AdvTreeCellBeforeCheckEventHandler(object sender, AdvTreeCellBeforeCheckEventArgs e);
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/Events/CustomCellEditorEventArgs.cs b/PROMS/DotNetBar Source Code/AdvTree/Events/CustomCellEditorEventArgs.cs
new file mode 100644
index 00000000..e24d95f6
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/Events/CustomCellEditorEventArgs.cs	
@@ -0,0 +1,34 @@
+using System;
+using System.Text;
+
+namespace DevComponents.AdvTree
+{
+    /// <summary>
+    /// Provides data for the ProvideCustomCellEditor event.
+    /// </summary>
+    public class CustomCellEditorEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets or sets the cell editor. You must set this property in your event handler to the custom
+        /// editor to be used for cell editing.
+        /// </summary>
+        public ICellEditControl EditControl = null;
+        /// <summary>
+        /// Gets the cell editor will be used for.
+        /// </summary>
+        public readonly Cell Cell;
+
+        /// <summary>
+        /// Initializes a new instance of the CustomCellEditorEventArgs class.
+        /// </summary>
+        /// <param name="cell"></param>
+        public CustomCellEditorEventArgs(Cell cell)
+        {
+            Cell = cell;
+        }
+    }
+    /// <summary>
+    /// Defines delegate for ProvideCustomCellEditor event.
+    /// </summary>
+    public delegate void CustomCellEditorEventHandler(object sender, CustomCellEditorEventArgs e);
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/Events/MarkupLinkClickEventArgs.cs b/PROMS/DotNetBar Source Code/AdvTree/Events/MarkupLinkClickEventArgs.cs
new file mode 100644
index 00000000..0cfecee9
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/Events/MarkupLinkClickEventArgs.cs	
@@ -0,0 +1,36 @@
+using System;
+
+namespace DevComponents.AdvTree
+{
+	/// <summary>
+	/// Provides more information about MarkupLinkClick event.
+	/// </summary>
+	public class MarkupLinkClickEventArgs : EventArgs
+	{
+		/// <summary>
+		/// Gets the value of href attribute from the markup link that was clicked.
+		/// </summary>
+		public readonly string HRef = "";
+
+		/// <summary>
+		/// Gets the value of name attribute from the markup link that was clicked.
+		/// </summary>
+		public readonly string Name = "";
+
+		/// <summary>
+		/// Creates new instance of the object.
+		/// </summary>
+		/// <param name="name">Value of name attribute.</param>
+		/// <param name="href">Value of href attribute.</param>
+		public MarkupLinkClickEventArgs(string name, string href)
+		{
+			this.HRef = href;
+			this.Name = name;
+		}
+	}
+
+	/// <summary>
+	/// Defines delegate for MarkupLinkClick event.
+	/// </summary>
+	public delegate void MarkupLinkClickEventHandler(object sender, MarkupLinkClickEventArgs e);
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/Events/SerializeNodeEventArgs.cs b/PROMS/DotNetBar Source Code/AdvTree/Events/SerializeNodeEventArgs.cs
new file mode 100644
index 00000000..6424cf0f
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/Events/SerializeNodeEventArgs.cs	
@@ -0,0 +1,38 @@
+using System;
+
+namespace DevComponents.AdvTree
+{
+	/// <summary>
+	/// Represents arguments for SerializeNode event which allows you to add custom serialization data to definitions saved by control.
+	/// </summary>
+	public class SerializeNodeEventArgs : EventArgs
+	{
+		/// <summary>
+		/// Gets reference to the node being serialized or de-serialized.
+		/// </summary>
+		public Node Node = null;
+
+		/// <summary>
+		/// Gets reference to instance of XmlElement that item is serialized to or is being de-serialized from. You should not change any data directly on this element.
+		/// </summary>
+		public System.Xml.XmlElement ItemXmlElement = null;
+
+		/// <summary>
+		/// Gets the reference to XmlElement that you can serialize to or de-serialize any custom data from. You can add child elements or set the attributes on
+		/// this XmlElement when handling SerializeItem event. When handling DeserializeItem event you can load your data from this element.
+		/// </summary>
+		public System.Xml.XmlElement CustomXmlElement = null;
+
+		public SerializeNodeEventArgs(Node node, System.Xml.XmlElement itemXmlElement, System.Xml.XmlElement customXmlElement)
+		{
+			this.Node = node;
+			this.ItemXmlElement = itemXmlElement;
+			this.CustomXmlElement = customXmlElement;
+		}
+	}
+	
+	/// <summary>
+	/// Defines delegate for SerializeItem event.
+	/// </summary>
+	public delegate void SerializeNodeEventHandler(object sender, SerializeNodeEventArgs e);
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/HeaderDefinition.cs b/PROMS/DotNetBar Source Code/AdvTree/HeaderDefinition.cs
new file mode 100644
index 00000000..35a7a948
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/HeaderDefinition.cs	
@@ -0,0 +1,40 @@
+using System;
+using System.ComponentModel;
+
+namespace DevComponents.AdvTree
+{
+	/// <summary>
+	/// Represents the table header.
+	/// </summary>
+	public class HeaderDefinition
+	{
+		private string m_Name="";
+		private ColumnHeaderCollection m_Columns=new ColumnHeaderCollection();
+
+		/// <summary>
+		/// Default constructor.
+		/// </summary>
+		public HeaderDefinition()
+		{
+		}
+
+		/// <summary>
+		/// Gets the reference to the collection that contains the columns associated with header.
+		/// </summary>
+		[Browsable(true),Category("Columns"),Description("Gets the reference to the collection that contains the columns associated with header."),DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+		public ColumnHeaderCollection Columns
+		{
+			get {return m_Columns;}
+		}
+
+		/// <summary>
+		/// Gets or sets the name associated with this header definition.
+		/// </summary>
+		[Browsable(true),Category("Design"),Description("Indicates name associated with this header definition."),DefaultValue("")]
+		public string Name
+		{
+			get {return m_Name;}
+			set {m_Name=value;}
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/HeadersCollection.cs b/PROMS/DotNetBar Source Code/AdvTree/HeadersCollection.cs
new file mode 100644
index 00000000..1ba13231
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/HeadersCollection.cs	
@@ -0,0 +1,135 @@
+using System;
+using System.Collections;
+using System.ComponentModel;
+
+namespace DevComponents.AdvTree 
+{
+	/// <summary>
+	/// Represents collection for HeaderDefinition objects.
+	/// </summary>
+	public class HeadersCollection:CollectionBase 
+	{
+		#region Private Variables
+		private AdvTree m_Parent=null;
+		#endregion
+
+		#region Internal Implementation
+		/// <summary>
+		/// Gets or sets the node this collection is associated with.
+		/// </summary>
+		[Browsable(false),DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public AdvTree Parent
+		{
+			get {return m_Parent;}
+		}
+		/// <summary>
+		/// Sets the node collection belongs to.
+		/// </summary>
+		/// <param name="parent">HeaderDefinition that is parent of this collection.</param>
+		internal void SetParent(AdvTree parent)
+		{
+			m_Parent=parent;
+		}
+
+		/// <summary>
+		/// Adds new object to the collection.
+		/// </summary>
+		/// <param name="ch">Object to add.</param>
+		/// <returns>Index of newly added object.</returns>
+		public int Add(HeaderDefinition ch)
+		{
+			return List.Add(ch);
+		}
+		/// <summary>
+		/// Returns reference to the object in collection based on it's index.
+		/// </summary>
+		public HeaderDefinition this[int index]
+		{
+			get {return (HeaderDefinition)(List[index]);}
+			set {List[index] = value;}
+		}
+
+		/// <summary>
+		/// Inserts new object into the collection.
+		/// </summary>
+		/// <param name="index">Position of the object.</param>
+		/// <param name="value">Object to insert.</param>
+		public void Insert(int index, HeaderDefinition value) 
+		{
+			List.Insert(index, value);
+		}
+
+		/// <summary>
+		/// Returns index of the object inside of the collection.
+		/// </summary>
+		/// <param name="value">Reference to the object.</param>
+		/// <returns>Index of the object.</returns>
+		public int IndexOf(HeaderDefinition value) 
+		{
+			return List.IndexOf(value);
+		}
+
+		/// <summary>
+		/// Returns whether collection contains specified object.
+		/// </summary>
+		/// <param name="value">Object to look for.</param>
+		/// <returns>true if object is part of the collection, otherwise false.</returns>
+		public bool Contains(HeaderDefinition value) 
+		{
+			return List.Contains(value);
+		}
+
+		/// <summary>
+		/// Removes specified object from the collection.
+		/// </summary>
+		/// <param name="value"></param>
+		public void Remove(HeaderDefinition value) 
+		{
+			List.Remove(value);
+		}
+
+		protected override void OnRemoveComplete(int index,object value)
+		{
+			base.OnRemoveComplete(index,value);
+		}
+		protected override void OnInsertComplete(int index,object value)
+		{
+			base.OnInsertComplete(index,value);
+		}
+
+		/// <summary>
+		/// Copies collection into the specified array.
+		/// </summary>
+		/// <param name="array">Array to copy collection to.</param>
+		/// <param name="index">Starting index.</param>
+		public void CopyTo(HeaderDefinition[] array, int index) 
+		{
+			List.CopyTo(array, index);
+		}
+
+		/// <summary>
+		/// Copies contained items to the HeaderDefinition array.
+		/// </summary>
+		/// <param name="array">Array to copy to.</param>
+		internal void CopyTo(HeaderDefinition[] array)
+		{
+			List.CopyTo(array,0);
+		}
+
+		protected override void OnClear()
+		{
+			base.OnClear();
+		}
+		
+		public HeaderDefinition GetByName(string name)
+		{
+			foreach(HeaderDefinition d in this.List)
+			{
+				if(d.Name==name)
+					return d;
+			}
+			return null;
+		}
+		#endregion
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/INodeNotify.cs b/PROMS/DotNetBar Source Code/AdvTree/INodeNotify.cs
new file mode 100644
index 00000000..040d7ccf
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/INodeNotify.cs	
@@ -0,0 +1,26 @@
+using System;
+
+namespace DevComponents.AdvTree
+{
+	/// <summary>
+	/// Specifies the notification interface that node uses to communicate status changes to it's parent tree.
+	/// </summary>
+	public interface INodeNotify
+	{
+		/// <summary>Called when Node.Expanded property has changed.</summary>
+		/// <param name="node">Node which Expanded property has changed.</param>
+		void ExpandedChanged(Node node);
+		/// <summary>Called before node is collapsed</summary>
+		/// <param name="e">Context information.</param>
+		void OnBeforeCollapse(AdvTreeNodeCancelEventArgs e);
+		/// <summary>Called before node is expanded</summary>
+		/// <param name="e">Context information.</param>
+		void OnBeforeExpand(AdvTreeNodeCancelEventArgs e);
+		/// <summary>Called after node is collapsed.</summary>
+		/// <param name="e">Context information.</param>
+		void OnAfterCollapse(AdvTreeNodeEventArgs e);
+		/// <summary>Called after node is expanded</summary>
+		/// <param name="e">Context information</param>
+		void OnAfterExpand(AdvTreeNodeEventArgs e);
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/Interop/WinApi.cs b/PROMS/DotNetBar Source Code/AdvTree/Interop/WinApi.cs
new file mode 100644
index 00000000..489a6eeb
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/Interop/WinApi.cs	
@@ -0,0 +1,58 @@
+using System.Windows.Forms;
+using System.Runtime.InteropServices;
+using System;
+
+namespace DevComponents.AdvTree.Interop
+{
+	/// <summary>
+	/// Provides WinApi functions to rest of the application.
+	/// </summary>
+	internal class WinApi
+	{
+	
+		#region API Calls Declaration
+		
+		[DllImport("user32")]
+		private static extern bool TrackMouseEvent(ref TRACKMOUSEEVENT tme);
+		
+		[StructLayout(LayoutKind.Sequential)]
+		private struct TRACKMOUSEEVENT 
+		{
+			public int cbSize;
+			public uint dwFlags;
+			public int dwHoverTime;
+			public IntPtr hwndTrack;
+		}
+		
+		// Track Mouse Event Flags
+		private const uint
+			TME_HOVER=0x00000001,
+			TME_LEAVE=0x00000002,
+			TME_NONCLIENT=0x00000010,
+			TME_QUERY=0x40000000,
+			TME_CANCEL=0x80000000,
+			HOVER_DEFAULT=0xFFFFFFFF;
+
+		#endregion
+		
+		#region Functions
+		/// <summary>
+		/// Resets Hoover timer for specified control.
+		/// </summary>
+		public static void ResetHover(System.Windows.Forms.Control c)
+		{
+			if (c==null || !c.IsHandleCreated)
+				return;
+			
+			// We need to reset hover thing since it is fired only first time mouse hovers inside the window and we need it for each of our items
+			TRACKMOUSEEVENT tme = new TRACKMOUSEEVENT();
+			tme.dwFlags = TME_QUERY;
+			tme.hwndTrack = c.Handle;
+			tme.cbSize = System.Runtime.InteropServices.Marshal.SizeOf(tme);
+			TrackMouseEvent(ref tme);
+			tme.dwFlags = tme.dwFlags | TME_HOVER;
+			TrackMouseEvent(ref tme);
+		}
+		#endregion
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/KeyNavigation.cs b/PROMS/DotNetBar Source Code/AdvTree/KeyNavigation.cs
new file mode 100644
index 00000000..853e9fe5
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/KeyNavigation.cs	
@@ -0,0 +1,370 @@
+using System;
+using System.Windows.Forms;
+using System.Drawing;
+
+namespace DevComponents.AdvTree
+{
+	/// <summary>
+	/// Provides AdvTree Keyboard handling.
+	/// </summary>
+	internal class KeyNavigation
+	{
+		public static void KeyDown(AdvTree tree, KeyEventArgs e)
+		{
+            Node node = tree.SelectedNode;
+            if (node != null)
+            {
+                node.InternalKeyDown(e);
+                if (e.Handled) return;
+            }
+            
+			switch(e.KeyCode)
+			{
+				case Keys.Space:
+					{
+						SpaceKeyDown(tree, e);
+						e.Handled = true;
+						break;
+					}
+                case Keys.Add:
+                    {
+                        e.Handled = PlusKeyDown(tree, e);
+                        break;
+                    }
+                case Keys.Subtract:
+                    {
+                        e.Handled = MinusKeyDown(tree, e);
+                        break;
+                    }
+                case Keys.F2:
+                    {
+                        F2KeyDown(tree, e);
+                        break;
+                    }
+                default:
+			        {
+                        if (e.Control && e.KeyCode == Keys.C)
+                            CopyKeyDown(tree, e);
+                        else if (e.Control && e.KeyCode == Keys.V)
+                            PasteKeyDown(tree, e);
+			            break;
+			        }
+			}
+		}
+
+        private static bool MinusKeyDown(AdvTree tree, KeyEventArgs e)
+        {
+            Node node = tree.SelectedNode;
+            if (node != null && tree.SelectedNodes.Count == 1 && node.Expanded)
+            {
+                node.Collapse();
+                return true;
+            }
+            return false;
+        }
+        private static bool PlusKeyDown(AdvTree tree, KeyEventArgs e)
+        {
+            Node node = tree.SelectedNode;
+            if (node != null && tree.SelectedNodes.Count == 1 && !node.Expanded)
+            {
+                node.Expand();
+                return true;
+            }
+            return false;
+        }
+
+        private static void PasteKeyDown(AdvTree tree, KeyEventArgs args)
+	    {
+            if (tree.SelectedNode != null)
+                tree.SelectedNode.InvokeKeyboardPaste(args);
+	    }
+
+	    private static void CopyKeyDown(AdvTree tree, KeyEventArgs args)
+	    {
+            if (tree.SelectedNode != null)
+                tree.SelectedNode.InvokeKeyboardCopy(args);
+	    }
+
+	    private static void F2KeyDown(AdvTree tree, KeyEventArgs e)
+        {
+            if (tree.EditSelectedCell(eTreeAction.Keyboard))
+                e.Handled = true;
+        }
+
+        public static void SpaceKeyDown(AdvTree tree, KeyEventArgs e)
+        {
+            Node node = tree.SelectedNode;
+            if (node != null && node.CheckBoxVisible && node.Enabled)
+            {
+                if (node.CheckBoxThreeState)
+                {
+                    if (node.CheckState == CheckState.Checked)
+                        node.SetChecked(CheckState.Indeterminate, eTreeAction.Keyboard);
+                    else if (node.CheckState == CheckState.Unchecked)
+                        node.SetChecked(CheckState.Checked, eTreeAction.Keyboard);
+                    else if (node.CheckState == CheckState.Indeterminate)
+                        node.SetChecked(CheckState.Unchecked, eTreeAction.Keyboard);
+                }
+                else
+                    node.SetChecked(!node.Checked, eTreeAction.Keyboard);
+                e.Handled = true;
+            }
+        }
+		
+		public static void EnterKeyDown(AdvTree tree, KeyEventArgs e)
+		{
+            if (tree.SelectedNode != null && tree.SelectedNode.Nodes.Count > 0)
+            {
+                tree.SelectedNode.Toggle(eTreeAction.Keyboard);
+            }
+		}
+		
+		public static bool NavigateKeyDown(AdvTree tree, KeyEventArgs e)
+		{
+			if(tree.SelectedNode==null)
+			{
+				if(tree.DisplayRootNode!=null)
+					tree.SelectNode(tree.DisplayRootNode, eTreeAction.Keyboard);
+                else if (tree.Nodes.Count > 0)
+                {
+                    Node firstSelectable = NodeOperations.GetFirstVisibleNode(tree);
+                    if (firstSelectable != null)
+                    {
+                        while (firstSelectable!=null && !firstSelectable.Selectable)
+                            firstSelectable = NodeOperations.GetNextVisibleNode(firstSelectable);
+                        if (firstSelectable != null)
+                            tree.SelectNode(firstSelectable, eTreeAction.Keyboard);
+                    }
+                }
+				return true;
+			}
+
+            Node node = tree.SelectedNode;
+            if (node != null && !node.IsKeyboardNavigationEnabled(e))
+            {
+                return false;
+            }
+
+            if(e.KeyCode == Keys.Right)
+			{
+                if (node != null && node.Cells.Count > 1 && tree.SelectionPerCell && node.CellNavigationEnabled)
+                {
+                    if (node.SelectedCell == null)
+                        node.SetSelectedCell(NodeOperations.GetNextVisibleCell(node, -1), eTreeAction.Keyboard);
+                    else
+                        node.SetSelectedCell(NodeOperations.GetNextVisibleCell(node, node.Cells.IndexOf(node.SelectedCell)), eTreeAction.Keyboard);
+                    return true; 
+                }
+
+                if (tree.View == eView.Tile)
+                {
+                    Node nextNode = NodeOperations.GetNextVisibleNode(node);
+                    if (nextNode != null)
+                    {
+                        if (node.Expanded || !node.HasChildNodes)
+                            tree.SelectNode(nextNode, eTreeAction.Keyboard);
+                        else
+                            node.Expand(eTreeAction.Keyboard);
+                    }
+                    else if (node != null && node.ExpandVisibility == eNodeExpandVisibility.Visible && !node.Expanded)
+                        node.Expand(eTreeAction.Keyboard);
+                }
+                else
+                {
+                    Node childNode = NodeOperations.GetFirstVisibleChildNode(node);
+                    if (childNode != null)
+                    {
+                        if (node.Expanded)
+                            tree.SelectNode(childNode, eTreeAction.Keyboard);
+                        else
+                            node.Expand(eTreeAction.Keyboard);
+                    }
+                    else if (node != null && node.ExpandVisibility == eNodeExpandVisibility.Visible && !node.Expanded)
+                        node.Expand(eTreeAction.Keyboard);
+                }
+			}
+			else if(e.KeyCode == Keys.Left)
+			{
+                if (node != null && node.Cells.Count > 1 && tree.SelectionPerCell && node.CellNavigationEnabled)
+                {
+                    if (node.SelectedCell == null)
+                        node.SetSelectedCell(NodeOperations.GetPreviousVisibleCell(node, node.Cells.Count - 1), eTreeAction.Keyboard);
+                    else 
+                        node.SetSelectedCell(NodeOperations.GetPreviousVisibleCell(node, node.Cells.IndexOf(node.SelectedCell)), eTreeAction.Keyboard);
+                    return true;
+                }
+
+                if (tree.View == eView.Tile)
+                {
+                    Node previousNode = NodeOperations.GetPreviousVisibleNode(node);
+                    if (previousNode != null)
+                        tree.SelectNode(previousNode, eTreeAction.Keyboard);
+                }
+                else
+                {
+                    if (node.Expanded && node.IsSelected && NodeOperations.GetFirstVisibleChildNode(node) != null)
+                        node.Collapse(eTreeAction.Keyboard);
+                    else if (node.Parent != null)
+                        tree.SelectNode(node.Parent, eTreeAction.Keyboard);
+                }
+			}
+            else if (e.KeyCode == Keys.End)
+            {
+                Node last = NodeOperations.GetLastVisibleNode(tree);
+                if (last != null)
+                {
+                    if (!last.Selectable)
+                    {
+                        while (last != null)
+                        {
+                            last = NodeOperations.GetPreviousVisibleNode(last);
+                            if (last!=null && last.Selectable) break;
+                        }
+                    }
+                    if (last != null)
+                        tree.SelectNode(last, eTreeAction.Keyboard);
+                }
+            }
+            else if (e.KeyCode == Keys.Home || e.KeyCode == Keys.PageDown && node == null)
+            {
+                Node first = NodeOperations.GetFirstVisibleNode(tree);
+                if (first != null)
+                {
+                    if (!first.Selectable)
+                    {
+                        while (first != null)
+                        {
+                            first = NodeOperations.GetNextVisibleNode(first);
+                            if (first != null && first.Selectable) break;
+                        }
+                    }
+                    if (first != null)
+                        tree.SelectNode(first, eTreeAction.Keyboard);
+                }
+            }
+            else if (e.KeyCode == Keys.PageDown)
+            {
+                // Find last fully rendered node
+                Node lastNode = NodeOperations.GetLastDisplayedNode(tree);
+                if (lastNode != null)
+                {
+                    if (tree.SelectedNode == lastNode)
+                    {
+                        if (tree.VScrollBar != null && tree.AutoScroll)
+                        {
+                            tree.AutoScrollPosition = new Point(tree.AutoScrollPosition.X, Math.Max(tree.AutoScrollPosition.Y - tree.VScrollBar.LargeChange, -(tree.VScrollBar.Maximum - tree.VScrollBar.LargeChange)));
+                            lastNode = NodeOperations.GetLastDisplayedNode(tree);
+                        }
+                    }
+                }
+                if (lastNode != null)
+                    tree.SelectNode(lastNode, eTreeAction.Keyboard);
+            }
+            else if (e.KeyCode == Keys.PageUp)
+            {
+                // Find last fully rendered node
+                Node firstNode = NodeOperations.GetFirstDisplayedNode(tree);
+                if (firstNode != null)
+                {
+                    if (tree.SelectedNode == firstNode)
+                    {
+                        if (tree.VScrollBar != null && tree.AutoScroll && tree.AutoScrollPosition.Y < 0)
+                        {
+                            tree.AutoScrollPosition = new Point(tree.AutoScrollPosition.X, Math.Min(0, tree.AutoScrollPosition.Y + tree.VScrollBar.LargeChange));
+                            firstNode = NodeOperations.GetFirstDisplayedNode(tree);
+                        }
+                    }
+                }
+                if (firstNode != null)
+                    tree.SelectNode(firstNode, eTreeAction.Keyboard);
+            }
+            else if ((e.KeyCode & Keys.Down) == Keys.Down)
+            {
+                int currentCell = 0;
+
+                if (node != null && node.SelectedCell != null) currentCell = node.Cells.IndexOf(node.SelectedCell);
+
+                Node nextNode = NodeOperations.GetNextVisibleNode(node);
+
+                // Adjust nextNode so the multi-selection is proper
+                if ((e.KeyData & Keys.Shift) == Keys.Shift && tree.MultiSelect && tree.SelectedNodes.Count > 1)
+                {
+                    if (tree.SelectedNodes[0].Bounds.Y > tree.SelectedNodes[tree.SelectedNodes.Count - 1].Bounds.Y)
+                        nextNode = tree.SelectedNodes[tree.SelectedNodes.Count - 1];
+                }
+
+                if (nextNode != null)
+                {
+                    if (!nextNode.CanSelect)
+                    {
+                        int counter = 0;
+                        while (nextNode != null && counter < 100)
+                        {
+                            nextNode = NodeOperations.GetNextVisibleNode(nextNode);
+                            if (nextNode != null && nextNode.CanSelect) break;
+                        }
+                    }
+                    if (nextNode != null)
+                    {
+                        if ((e.KeyData & Keys.Shift) == Keys.Shift && tree.MultiSelect && tree.SelectedNodes.Count > 0)
+                        {
+                            if (tree.MultiSelectRule == eMultiSelectRule.SameParent && tree.SelectedNodes[0].Parent != nextNode.Parent) return true;
+
+                            if (nextNode.IsSelected)
+                                tree.SelectedNodes.Remove(nextNode, eTreeAction.Keyboard);
+                            else
+                                tree.SelectedNodes.Add(nextNode, eTreeAction.Keyboard);
+                            nextNode.EnsureVisible();
+                        }
+                        else
+                        {
+                            tree.SelectNode(nextNode, eTreeAction.Keyboard);
+                            if (tree.SelectionPerCell && currentCell < nextNode.Cells.Count && currentCell > 0)
+                                nextNode.SetSelectedCell(nextNode.Cells[currentCell], eTreeAction.Keyboard);
+                        }
+                    }
+                }
+            }
+            else if ((e.KeyCode & Keys.Up) == Keys.Up)
+            {
+                int currentCell = 0;
+                if (node != null && node.SelectedCell != null) currentCell = node.Cells.IndexOf(node.SelectedCell);
+
+                Node prevNode = NodeOperations.GetPreviousVisibleNode(node);
+                if (prevNode != null)
+                {
+                    if (!prevNode.CanSelect)
+                    {
+                        int counter = 0;
+                        while (prevNode != null && counter < 100)
+                        {
+                            prevNode = NodeOperations.GetPreviousVisibleNode(prevNode);
+                            if (prevNode != null && prevNode.CanSelect) break;
+                        }
+                    }
+                    if (prevNode != null)
+                    {
+                        if ((e.KeyData & Keys.Shift) == Keys.Shift && tree.MultiSelect && tree.SelectedNodes.Count > 0)
+                        {
+                            if (tree.MultiSelectRule == eMultiSelectRule.SameParent && tree.SelectedNodes[0].Parent != prevNode.Parent) return true;
+                            if (prevNode.IsSelected)
+                            {
+                                tree.SelectedNodes.Remove(tree.SelectedNodes[tree.SelectedNodes.Count - 1], eTreeAction.Keyboard);
+                            }
+                            else
+                                tree.SelectedNodes.Add(prevNode, eTreeAction.Keyboard);
+                            prevNode.EnsureVisible();
+                        }
+                        else if (prevNode != null)
+                        {
+                            tree.SelectNode(prevNode, eTreeAction.Keyboard);
+                            if (tree.SelectionPerCell && currentCell < prevNode.Cells.Count && currentCell > 0)
+                                prevNode.SetSelectedCell(prevNode.Cells[currentCell], eTreeAction.Keyboard);
+                        }
+                    }
+                }
+            }
+            return true;
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/Layout/CellTileLayout.cs b/PROMS/DotNetBar Source Code/AdvTree/Layout/CellTileLayout.cs
new file mode 100644
index 00000000..70a01e08
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/Layout/CellTileLayout.cs	
@@ -0,0 +1,393 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+using DevComponents.DotNetBar;
+
+namespace DevComponents.AdvTree.Layout
+{
+    internal class CellTileLayout : CellLayout
+    {
+        /// <summary>
+        /// Initializes a new instance of the CellTileLayout class.
+        /// </summary>
+        public CellTileLayout(LayoutSettings layoutSettings) : base(layoutSettings)
+        {
+            
+        }
+        public override Size LayoutCells(NodeLayoutContextInfo layoutInfo, int x, int y)
+        {
+            eCellLayout layout = layoutInfo.CellLayout;
+            if (layoutInfo.ContextNode.CellLayout != layoutInfo.CellLayout && layoutInfo.ContextNode.CellLayout != eCellLayout.Default)
+                layout = layoutInfo.ContextNode.CellLayout;
+            if (layout == eCellLayout.Default && !(layoutInfo.ContextNode.HasChildNodes && layoutInfo.IsViewGroupping) && layoutInfo.ContextNode.ImageAlignment == eCellPartAlignment.Default)
+            {
+                return TileLayout(layoutInfo, x, y);
+            }
+            else
+                return base.LayoutCells(layoutInfo, x, y);
+            
+        }
+        private Size TileLayout(NodeLayoutContextInfo layoutInfo, int x, int y)
+        {
+            Node node = layoutInfo.ContextNode;
+            int height = 0, width = 0, realHeight = 0;
+            //eHorizontalAlign align = eHorizontalAlign.Left;
+            Size tileSize = layoutInfo.TileSize;
+            int iVisibleCells = 0;
+            int cellCount = node.Cells.Count;
+            bool isVerticalOverflow = false;
+            for (int i = 0; i < cellCount; i++)
+            {
+                Cell cell = node.Cells[i];
+
+                bool bCellVisible = isVerticalOverflow ? false : true;
+
+                // Setup cell layout helper class
+                LayoutCellInfo cellLayout = this.GetLayoutCellInfo();
+                cellLayout.Top = y;
+                cellLayout.Left = x;
+                cellLayout.CellWidth = tileSize.Width;
+                cellLayout.ContextCell = cell;
+                cellLayout.Graphics = layoutInfo.Graphics;
+                cellLayout.LeftToRight = layoutInfo.LeftToRight;
+                cellLayout.Font = layoutInfo.DefaultFont;
+                cellLayout.View = layoutInfo.View;
+                cellLayout.CellIndex = i;
+                if (cell.Layout != eCellPartLayout.Default)
+                    cellLayout.VerticalPartAlignment = (cell.Layout == eCellPartLayout.Vertical);
+                else if (layoutInfo.CellPartLayout != eCellPartLayout.Default)
+                    cellLayout.VerticalPartAlignment = (layoutInfo.CellPartLayout == eCellPartLayout.Vertical);
+
+                // Prepare union style
+                if (cell.StyleNormal != null)
+                    cellLayout.LayoutStyle = cell.StyleNormal;
+                else
+                    cellLayout.LayoutStyle = layoutInfo.DefaultCellStyle;
+
+                this.LayoutSingleTileCell(cellLayout);
+                if (bCellVisible && y + cell.BoundsRelative.Height > tileSize.Height && i > 0)
+                {
+                    isVerticalOverflow = true;
+                    bCellVisible = false;
+                }
+                cell.SetVisible(bCellVisible);
+
+                if (bCellVisible)
+                {
+                    iVisibleCells++;
+                    y += cell.BoundsRelative.Height;
+                    height += cell.BoundsRelative.Height;
+                    if (cell.BoundsRelative.Height > 0)
+                    {
+                        y += this.CellVerticalSpacing;
+                        height += this.CellVerticalSpacing;
+                    }
+                    if (cell.BoundsRelative.Width > width)
+                        width = cell.BoundsRelative.Width;
+                    if (i == 0)
+                    {
+                        realHeight += cell.BoundsRelative.Height;
+                        if (cell.BoundsRelative.Height > 0)
+                            realHeight += this.CellVerticalSpacing;
+                    }
+                    else
+                        realHeight = Math.Max(realHeight, height);
+
+                    // Align other cells under the text of the first cell and to the right of the image, if any
+                    if (i == 0 && !cell.Images.LargestImageSize.IsEmpty && cellCount > 1)
+                    {
+                        Size largestImageSize = Dpi.ImageSize(cell.Images.LargestImageSize);
+                        if (cell.TextContentBounds.IsEmpty)
+                            x += largestImageSize.Width + this.ImageTextSpacing;
+                        else
+                            x += (cell.TextContentBounds.X - x);
+                        tileSize.Width = cell.TextContentBounds.Width;
+                        height -= cell.BoundsRelative.Height;
+                        height += cell.TextContentBounds.Height;
+                        y -= cell.BoundsRelative.Height;
+                        y += cell.TextContentBounds.Height;
+                    }
+                }
+            }
+
+            // Take last added spacing off
+            y -= this.CellVerticalSpacing;
+            height -= this.CellVerticalSpacing;
+            realHeight -= this.CellVerticalSpacing;
+
+            if (node.Cells[0].BoundsRelative.Height > height && !node.Cells[0].Images.LargestImageSize.IsEmpty)
+            {
+                int textOffset = ((realHeight - height) / iVisibleCells) / 2;
+                if (textOffset > 0)
+                {
+                    foreach (Cell cell in node.Cells)
+                    {
+                        if (!cell.IsVisible) continue;
+                        cell.TextContentBounds = new Rectangle(cell.TextContentBounds.X, cell.TextContentBounds.Y + textOffset, cell.TextContentBounds.Width, cell.TextContentBounds.Height);
+                    }
+                }
+            }
+            else if(iVisibleCells == 1)
+            {
+                Rectangle rtc = node.Cells[0].TextContentBounds;
+                node.Cells[0].TextContentBounds = new Rectangle(rtc.X, rtc.Y, rtc.Width, node.Cells[0].BoundsRelative.Height);
+            }
+
+            // Additional pass needed if horizontal alignment is other than left and there is more than one cell visible
+            //if (align != eHorizontalAlign.Left && iVisibleCells > 1)
+            //{
+            //    foreach (Cell cell in node.Cells)
+            //    {
+            //        if (!cell.IsVisible)
+            //            continue;
+            //        if (align == eHorizontalAlign.Center)
+            //            this.Offset(cell, (width - cell.BoundsRelative.Width) / 2, 0);
+            //        else // Right aligned cells
+            //            this.Offset(cell, width - cell.BoundsRelative.Width, 0);
+            //    }
+            //}
+            if (width < layoutInfo.TileSize.Width)
+                width = layoutInfo.TileSize.Width;
+            if (realHeight < layoutInfo.TileSize.Height)
+                realHeight = layoutInfo.TileSize.Height;
+            return new Size(width, realHeight);
+        }
+
+        protected virtual void LayoutSingleTileCell(LayoutCellInfo info)
+        {
+            Size textSize = Size.Empty;
+            Font font = info.Font;
+            int fontHeight = info.FontHeight;
+            int height = 0;
+            if (info.LayoutStyle.Font != null)
+            {
+                font = info.LayoutStyle.Font;
+                fontHeight = font.Height;
+            }
+
+            info.ContextCell.OnLayoutCell();
+
+            Size largestImageSize = info.ContextCell.Images.LargestImageSize;
+            if (largestImageSize.IsEmpty && HasImage(info.ContextCell))
+                info.ContextCell.Images.RefreshLargestImageSize();
+            largestImageSize = Dpi.ImageSize(info.ContextCell.Images.LargestImageSize);
+
+            if (info.ContextCell.HostedControl != null)
+            {
+                Size controlSize = info.ContextCell.HostedControl.Size;
+                if (!info.ContextCell.HostedControlSize.IsEmpty)
+                    controlSize = info.ContextCell.HostedControlSize;
+                if (info.CellWidth == 0)
+                    textSize = new Size(controlSize.Width, controlSize.Height);
+                else
+                {
+                    int availTextWidth = info.CellWidth -
+                                       ElementStyleLayout.HorizontalStyleWhiteSpace(info.LayoutStyle);
+                    textSize = new Size(availTextWidth, controlSize.Height);
+                }
+            }
+            else if (info.ContextCell.HostedItem != null)
+            {
+                if (info.CellWidth != 0) info.ContextCell.HostedItem.WidthInternal = info.CellWidth;
+                info.ContextCell.HostedItem.RecalcSize();
+
+                Size controlSize = info.ContextCell.HostedItem.Size;
+                if (info.CellWidth == 0)
+                    textSize = new Size(controlSize.Width, controlSize.Height);
+                else
+                {
+                    int availTextWidth = info.CellWidth -
+                                       ElementStyleLayout.HorizontalStyleWhiteSpace(info.LayoutStyle);
+                    textSize = new Size(availTextWidth, controlSize.Height);
+                    info.ContextCell.HostedItem.WidthInternal = availTextWidth;
+                }
+            }
+            else
+            {
+                // Calculate Text Width and Height
+                if (info.CellWidth == 0)
+                {
+                    if (info.ContextCell.TextMarkupBody == null)
+                    {
+                        string text = info.ContextCell.DisplayText;
+                        if (text != "")
+                        {
+                            if (info.LayoutStyle.WordWrap && info.LayoutStyle.MaximumWidth > 0)
+                                textSize = TextDrawing.MeasureString(info.Graphics, text, font, info.LayoutStyle.MaximumWidth);
+                            else if (info.ContextCell.Parent != null && info.ContextCell.Parent.Style != null && info.ContextCell.Parent.Style.WordWrap && info.ContextCell.Parent.Style.MaximumWidth > 0)
+                                textSize = TextDrawing.MeasureString(info.Graphics, text, font, info.ContextCell.Parent.Style.MaximumWidth);
+                            else
+                                textSize = TextDrawing.MeasureString(info.Graphics, text, font, 0, eTextFormat.Left | eTextFormat.LeftAndRightPadding | eTextFormat.GlyphOverhangPadding | eTextFormat.NoPrefix);
+#if (FRAMEWORK20)
+                            if (!BarFunctions.IsVista && BarUtilities.UseTextRenderer) textSize.Width += 4;
+#endif
+                        }
+                        else if (largestImageSize.IsEmpty && !info.ContextCell.CheckBoxVisible)
+                        {
+                            textSize = new Size(5, fontHeight);
+                        }
+                    }
+                    else
+                    {
+                        Size availSize = new Size(1600, 1);
+                        if (info.LayoutStyle.WordWrap && info.LayoutStyle.MaximumWidth > 0)
+                            availSize.Width = info.LayoutStyle.MaximumWidth;
+                        else if (info.ContextCell.Parent != null && info.ContextCell.Parent.Style != null && info.ContextCell.Parent.Style.WordWrap && info.ContextCell.Parent.Style.MaximumWidth > 0)
+                            availSize.Width = info.ContextCell.Parent.Style.MaximumWidth;
+
+                        DevComponents.DotNetBar.TextMarkup.MarkupDrawContext d = new DevComponents.DotNetBar.TextMarkup.MarkupDrawContext(info.Graphics, font, Color.Empty, false);
+                        info.ContextCell.TextMarkupBody.Measure(availSize, d);
+                        availSize = info.ContextCell.TextMarkupBody.Bounds.Size;
+                        d.RightToLeft = !info.LeftToRight;
+                        info.ContextCell.TextMarkupBody.Arrange(new Rectangle(0, 0, availSize.Width, availSize.Height), d);
+
+                        textSize = info.ContextCell.TextMarkupBody.Bounds.Size;
+                    }
+                }
+                else
+                {
+                    int availTextWidth = info.CellWidth -
+                                       ElementStyleLayout.HorizontalStyleWhiteSpace(info.LayoutStyle);
+
+                    availTextWidth -= largestImageSize.Width +
+                        (largestImageSize.Width > 0 ? ImageTextSpacing * 2 : 0);
+
+                    if (info.ContextCell.CheckBoxVisible)
+                        availTextWidth -= CheckBoxSize.Width + ImageTextSpacing * 2;
+
+                    int cellHeight = fontHeight;
+
+                    if (info.LayoutStyle.WordWrap || info.ContextCell.TextMarkupBody != null)
+                    {
+                        cellHeight = info.LayoutStyle.MaximumHeight - info.LayoutStyle.MarginTop -
+                                   info.LayoutStyle.MarginBottom - info.LayoutStyle.PaddingTop - info.LayoutStyle.PaddingBottom;
+
+                        if (info.ContextCell.TextMarkupBody == null)
+                        {
+                            if (availTextWidth > 0)
+                            {
+                                if (cellHeight > 0)
+                                    textSize = TextDrawing.MeasureString(info.Graphics, info.ContextCell.DisplayText, font, new Size(availTextWidth, cellHeight), info.LayoutStyle.TextFormat);
+                                else
+                                    textSize = TextDrawing.MeasureString(info.Graphics, info.ContextCell.DisplayText, font, availTextWidth, info.LayoutStyle.TextFormat);
+                            }
+                        }
+                        else
+                        {
+                            Size availSize = new Size(availTextWidth, 1);
+                            DevComponents.DotNetBar.TextMarkup.MarkupDrawContext d = new DevComponents.DotNetBar.TextMarkup.MarkupDrawContext(info.Graphics, font, Color.Empty, false);
+                            info.ContextCell.TextMarkupBody.Measure(availSize, d);
+                            availSize = info.ContextCell.TextMarkupBody.Bounds.Size;
+                            availSize.Width = availTextWidth;
+                            d.RightToLeft = !info.LeftToRight;
+                            info.ContextCell.TextMarkupBody.Arrange(new Rectangle(0, 0, availSize.Width, availSize.Height), d);
+
+                            textSize = info.ContextCell.TextMarkupBody.Bounds.Size;
+                        }
+                    }
+                    else
+                        textSize = new Size(availTextWidth, cellHeight);
+                }
+            }
+
+            if (info.LayoutStyle.WordWrap)
+                info.ContextCell.WordWrap = true;
+            else
+                info.ContextCell.WordWrap = false;
+
+            height = (int)Math.Max(height, Math.Ceiling((double)textSize.Height));
+            if (info.VerticalPartAlignment)
+            {
+                if (largestImageSize.Height > 0)
+                    height += largestImageSize.Height + this.ImageTextSpacing;
+                if (info.ContextCell.CheckBoxVisible)
+                    height += CheckBoxSize.Height + this.ImageCheckBoxSpacing;
+            }
+            else
+            {
+                if (largestImageSize.Height > height)
+                    height = largestImageSize.Height;
+                if (info.ContextCell.CheckBoxVisible && CheckBoxSize.Height > height)
+                    height = CheckBoxSize.Height;
+            }
+
+            Rectangle r = new Rectangle(info.Left + ElementStyleLayout.LeftWhiteSpace(info.LayoutStyle),
+                                      info.Top + ElementStyleLayout.TopWhiteSpace(info.LayoutStyle)
+                                      , info.CellWidth, height);
+
+            if (r.Width == 0)
+            {
+                if (info.VerticalPartAlignment)
+                {
+                    r.Width = (int)Math.Ceiling((double)textSize.Width);
+                    if (largestImageSize.Width > r.Width)
+                        r.Width = (largestImageSize.Width + this.ImageTextSpacing);
+                    if (info.ContextCell.CheckBoxVisible && CheckBoxSize.Width > r.Width)
+                        r.Width += (CheckBoxSize.Width + this.ImageTextSpacing);
+                }
+                else
+                {
+                    r.Width = (int)Math.Ceiling((double)textSize.Width);
+                    if (largestImageSize.Width > 0)
+                        r.Width += (largestImageSize.Width + this.ImageTextSpacing);
+                    if (info.ContextCell.CheckBoxVisible)
+                        r.Width += (CheckBoxSize.Width + this.ImageTextSpacing);
+                }
+            }
+
+            // Now that we have cell bounds store them
+            Rectangle rCellBounds = new Rectangle(info.Left, info.Top, info.CellWidth, r.Height + info.LayoutStyle.MarginTop + info.LayoutStyle.MarginBottom + info.LayoutStyle.PaddingTop + info.LayoutStyle.PaddingBottom);
+            if (rCellBounds.Width == 0)
+                rCellBounds.Width = r.Width + ElementStyleLayout.HorizontalStyleWhiteSpace(info.LayoutStyle);
+            info.ContextCell.SetBounds(rCellBounds);
+
+            // Set position of the check box
+            if (info.ContextCell.CheckBoxVisible && rCellBounds.Width >= this.CheckBoxSize.Width)
+            {
+                eVerticalAlign va = GetCheckBoxVerticalAlign(info.ContextCell.CheckBoxAlignment, info.View);
+                eHorizontalAlign ha = GetCheckBoxHorizontalAlign(info.ContextCell.CheckBoxAlignment, info.LeftToRight, info.View);
+                if (ha == eHorizontalAlign.Center && (!string.IsNullOrEmpty(info.ContextCell.Text) || !largestImageSize.IsEmpty))
+                    ha = eHorizontalAlign.Left;
+
+                if (info.VerticalPartAlignment)
+                    info.ContextCell.SetCheckBoxBounds(AlignContentVertical(this.CheckBoxSize, ref r, ha, va, this.ImageTextSpacing));
+                else
+                    info.ContextCell.SetCheckBoxBounds(AlignContent(this.CheckBoxSize, ref r, ha, va, this.ImageTextSpacing));
+            }
+            else
+                info.ContextCell.SetCheckBoxBounds(Rectangle.Empty);
+
+            // Set Position of the image
+            if (!largestImageSize.IsEmpty && rCellBounds.Width >= largestImageSize.Width)
+            {
+                eVerticalAlign va = GetVerticalAlign(info.ContextCell.ImageAlignment, info.View);
+                eHorizontalAlign ha = GetHorizontalAlign(info.ContextCell.ImageAlignment, info.LeftToRight, info.View);
+                if (ha == eHorizontalAlign.Center && (!string.IsNullOrEmpty(info.ContextCell.Text) || info.ContextCell.CheckBoxVisible))
+                    ha = eHorizontalAlign.Left;
+
+                if (info.VerticalPartAlignment)
+                    info.ContextCell.SetImageBounds(AlignContentVertical(largestImageSize, ref r, ha, va, this.ImageTextSpacing));
+                else
+                    info.ContextCell.SetImageBounds(AlignContent(largestImageSize, ref r, ha, va, this.ImageTextSpacing));
+            }
+            else
+                info.ContextCell.SetImageBounds(Rectangle.Empty);
+
+            // Set position of the text
+            //info.ContextCell.SetTextBounds(Rectangle.Empty);
+            if (!textSize.IsEmpty)
+            {
+                if (info.CellWidth > 0)
+                    r.Width -= 2;
+                if (info.View == eView.Tile && info.CellIndex == 0)
+                    info.ContextCell.TextContentBounds = new Rectangle(r.X, r.Y, textSize.Width, textSize.Height + 1);
+                else
+                    info.ContextCell.TextContentBounds = r;
+            }
+            else
+                info.ContextCell.TextContentBounds = Rectangle.Empty;
+
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/Layout/ColumnHeaderLayout.cs b/PROMS/DotNetBar Source Code/AdvTree/Layout/ColumnHeaderLayout.cs
new file mode 100644
index 00000000..d4052832
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/Layout/ColumnHeaderLayout.cs	
@@ -0,0 +1,193 @@
+using System;
+using System.Drawing;
+using DevComponents.DotNetBar;
+
+namespace DevComponents.AdvTree.Layout
+{
+	/// <summary>
+	/// Class that is used to layout column header.
+	/// </summary>
+	internal class ColumnHeaderLayout
+	{
+		public ColumnHeaderLayout()
+		{
+		}
+
+		// Assumes that layoutInfo is up-to-date and that Node that is connected with
+		// columns is already processed and it's size and location calculated.
+		// layoutInfo.Top member reflects the next position below the node
+		// layoutInfo.LevelOffset should reflect the X offset for the child nodes.
+		public static int LayoutColumnHeader(NodeLayoutContextInfo layoutInfo,int x, int y, int clientWidth, int cellHorizontalSpacing)
+		{
+            ColumnHeaderCollection columns = null;
+			Node node=layoutInfo.ContextNode;
+            if (node == null)
+                columns = layoutInfo.TreeColumns;
+            else
+                columns = node.NodesColumns;
+            columns.UsesRelativeSize = false;
+            int height=0;
+            bool adjustHeight = false;
+            Rectangle totalBounds = Rectangle.Empty;
+            ColumnHeader lastVisibleColumn = null;
+            ColumnHeader stretchToFillColumn = null;
+            bool allRelative = true;
+            bool firstVisible = true;
+            for (int i = 0; i < columns.Count; i++)
+			{
+                ColumnHeader col = columns.ColumnAtDisplayIndex(i);
+                col.IsLastVisible = false;
+				if(!col.Visible)
+					continue;
+                col.IsFirstVisible = firstVisible;
+                firstVisible = false;
+				//if(col.SizeChanged)
+				{
+					// Column for child nodes is always placed below the current node and
+					// is not included in the node's rectangle
+					Rectangle bounds=Rectangle.Empty;
+					bounds.X=x;
+					bounds.Y=y;
+                    if (col.Width.AutoSize)
+                    {
+                        int autoWidth = col.Width.AutoSizeWidth;
+                        if (col.Width.AutoSizeMinHeader)
+                        {
+                            Font headerFont = layoutInfo.DefaultFont;
+                            if (!string.IsNullOrEmpty(col.StyleNormal))
+                            {
+                                ElementStyle style = layoutInfo.Styles[col.StyleNormal];
+                                if (style != null && style.Font != null)
+                                    headerFont = style.Font;
+                            }
+                            else if (layoutInfo.ColumnStyle != null && layoutInfo.ColumnStyle.Font != null)
+                                headerFont = layoutInfo.ColumnStyle.Font;
+                            if (headerFont != null)
+                            {
+                                int columnHeaderTextWidth = (int)Math.Ceiling(layoutInfo.Graphics.MeasureString(col.Text, headerFont).Width) + 2;
+                                autoWidth = Math.Max(autoWidth, columnHeaderTextWidth);
+                                col.Width.SetAutoSizeWidth(autoWidth);
+                            }
+                        }
+                        bounds.Width = autoWidth;
+                        allRelative = false;
+                    }
+                    else if (col.Width.Absolute > 0)
+                    {
+                        bounds.Width = col.Width.Absolute;
+                        allRelative = false;
+                    }
+                    else if (col.Width.Absolute == -1)
+                    {
+                        bounds.Width = 0;
+                        allRelative = false;
+                    }
+                    else if (col.Width.Relative > 0)
+                    {
+                        if (col.IsFirstVisible)
+                        {
+                            clientWidth -= layoutInfo.ExpandPartWidth;
+                            bounds.Width = (clientWidth * col.Width.Relative) / 100 - cellHorizontalSpacing;
+                            bounds.Width += layoutInfo.ExpandPartWidth;
+                        }
+                        else
+                            bounds.Width = (clientWidth * col.Width.Relative) / 100 - cellHorizontalSpacing;
+                        columns.UsesRelativeSize = true;
+                    }
+                    lastVisibleColumn = col;
+
+                    if (col.StretchToFill)
+                    {
+                        stretchToFillColumn = col;
+                        columns.UsesRelativeSize = true;
+                    }
+
+					if(col.StyleNormal=="" && col.StyleMouseDown=="" && col.StyleMouseOver=="")
+					{
+						bounds.Height=layoutInfo.DefaultHeaderSize.Height;
+					}
+					else
+					{
+						Size sz=Size.Empty;
+						if(col.StyleNormal!="")
+						{
+							ElementStyleLayout.CalculateStyleSize(layoutInfo.Styles[col.StyleNormal],layoutInfo.DefaultFont);
+							sz=layoutInfo.Styles[col.StyleNormal].Size;
+						}
+												
+						if(sz.Height==0)
+							bounds.Height=layoutInfo.DefaultHeaderSize.Height;
+						else
+							bounds.Height=sz.Height;
+					}
+
+                    if (col.Image != null && col.Image.Height+4>bounds.Height)
+                    {
+                        bounds.Height = col.Image.Height + 4;
+                    }
+
+					col.SetBounds(bounds);
+					col.SizeChanged=false;
+
+                    x += (bounds.Width + cellHorizontalSpacing);
+
+                    if (bounds.Height > height)
+                    {
+                        if (height > 0)
+                            adjustHeight = true;
+                        height = bounds.Height;
+                    }
+                    else if (bounds.Height < height)
+                        adjustHeight = true;
+				}
+                
+                if (totalBounds.IsEmpty)
+                    totalBounds = col.Bounds;
+                else
+                    totalBounds = Rectangle.Union(totalBounds, col.Bounds);
+			}
+            if (adjustHeight)
+            {
+                foreach (ColumnHeader col in columns)
+                {
+                    col.SetBounds(new Rectangle(col.Bounds.X, col.Bounds.Y, col.Bounds.Width, height));
+                }
+            }
+            if (lastVisibleColumn != null && allRelative)
+            {
+                lastVisibleColumn.SetBounds(new Rectangle(lastVisibleColumn.Bounds.X, lastVisibleColumn.Bounds.Y, lastVisibleColumn.Bounds.Width + cellHorizontalSpacing, lastVisibleColumn.Bounds.Height));
+                totalBounds = Rectangle.Union(totalBounds, lastVisibleColumn.Bounds);
+            }
+
+            if (lastVisibleColumn != null) lastVisibleColumn.IsLastVisible = true;
+
+            if (stretchToFillColumn != null && totalBounds.Width < clientWidth)
+            {
+                int stretch = clientWidth - totalBounds.Width;
+                if (stretchToFillColumn.IsFirstVisible && stretchToFillColumn.IsLastVisible) // Single column visible only case
+                    stretch -= layoutInfo.Indent;
+                else if (stretchToFillColumn.Parent != null && stretchToFillColumn.Parent.ParentNode != null)
+                    stretch -= layoutInfo.Indent;
+                stretchToFillColumn.SetBounds(new Rectangle(stretchToFillColumn.Bounds.X, stretchToFillColumn.Bounds.Y,
+                    stretchToFillColumn.Bounds.Width + stretch, stretchToFillColumn.Bounds.Height));
+                totalBounds = Rectangle.Union(totalBounds, stretchToFillColumn.Bounds);
+                if (!stretchToFillColumn.IsLastVisible) // Offset columns to the right if this was not last visible column
+                {
+                    int startIndex = columns.GetDisplayIndex(stretchToFillColumn) + 1;
+                    for (int i = startIndex; i < columns.Count; i++)
+                    {
+                        ColumnHeader col = columns.ColumnAtDisplayIndex(i);
+                        if (!col.Visible) continue;
+                        col.SetBounds(new Rectangle(col.Bounds.X + stretch, col.Bounds.Y, col.Bounds.Width, col.Bounds.Height));
+                        totalBounds = Rectangle.Union(totalBounds, col.Bounds);
+                    }
+                }
+            }
+
+            
+            columns.SetBounds(totalBounds);
+			return height;
+		}
+
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/Layout/LayoutSettings.cs b/PROMS/DotNetBar Source Code/AdvTree/Layout/LayoutSettings.cs
new file mode 100644
index 00000000..1a99be55
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/Layout/LayoutSettings.cs	
@@ -0,0 +1,78 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.AdvTree.Layout
+{
+    internal class LayoutSettings
+    {
+        #region Internal Implementation
+        private int _NodeVerticalSpacing = 3;
+        /// <summary>
+        /// Gets or sets the vertical spacing between nodes in pixels.
+        /// </summary>
+        public virtual int NodeVerticalSpacing
+        {
+            get { return _NodeVerticalSpacing; }
+            set { _NodeVerticalSpacing = value; }
+        }
+
+        private int _NodeHorizontalSpacing = 4;
+        /// <summary>
+        /// Gets or sets the horizontal spacing between nodes in pixels.
+        /// </summary>
+        public virtual int NodeHorizontalSpacing
+        {
+            get { return _NodeHorizontalSpacing; }
+            set { _NodeHorizontalSpacing = value; }
+        }
+
+        private int _CellHorizontalSpacing = 5;
+        /// <summary>
+        /// Returns horizontal spacing between cells in a node
+        /// </summary>
+        public int CellHorizontalSpacing
+        {
+            get { return _CellHorizontalSpacing; }
+            set
+            {
+                _CellHorizontalSpacing = value;
+            }
+        }
+
+        private int _ExpandAreaWidth = 24;
+        /// <summary>
+        /// Returns width of the expand button area. Default is 24 pixels.
+        /// </summary>
+        public virtual int ExpandAreaWidth
+        {
+            get { return _ExpandAreaWidth; }
+            set
+            {
+                _ExpandAreaWidth = value;
+            }
+        }
+
+        protected Size _ExpandPartSize = new Size(8, 8);
+        /// <summary>
+        /// Gets or sets the size of the expand part that is expanding/collapsing the node. Default value is 8,8.
+        /// </summary>
+        public System.Drawing.Size ExpandPartSize
+        {
+            get { return _ExpandPartSize; }
+            set { _ExpandPartSize = value; }
+        }
+
+        private int _CommandAreaWidth = 10;
+        /// <summary>
+        /// Gets or sets width of command button area. Default is 8 pixels.
+        /// </summary>
+        public virtual int CommandAreaWidth
+        {
+            get { return _CommandAreaWidth; }
+            set { _CommandAreaWidth = value; }
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/Layout/NodeCellLayout.cs b/PROMS/DotNetBar Source Code/AdvTree/Layout/NodeCellLayout.cs
new file mode 100644
index 00000000..69773d21
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/Layout/NodeCellLayout.cs	
@@ -0,0 +1,888 @@
+using System;
+using System.Drawing;
+using DevComponents.DotNetBar;
+using System.Collections;
+
+namespace DevComponents.AdvTree
+{
+	namespace Layout
+	{
+		/// <summary>
+		/// Represents class for Node's cell layout.
+		/// </summary>
+		internal class CellLayout
+		{
+			public CellLayout(LayoutSettings layoutSettings)
+			{
+                _LayoutSettings = layoutSettings;
+			}
+
+            private LayoutSettings _LayoutSettings;
+            public LayoutSettings LayoutSettings
+            {
+                get { return _LayoutSettings; }
+                set { _LayoutSettings = value; }
+            }
+			/// <summary>
+			/// Offset cell bounds, check box bounds, image bounds and text bounds by specified offset.
+			/// </summary>
+			/// <param name="cell">Cell to offset.</param>
+			/// <param name="x">Horizontal offset in pixels.</param>
+			/// <param name="y">Vertical offset in pixels.</param>
+			protected void Offset(Cell cell, int x, int y)
+			{
+                if (x == 0 && y == 0) return;
+				cell.SetBounds(new Rectangle(cell.BoundsRelative.X+x,cell.BoundsRelative.Y+y,cell.BoundsRelative.Width,cell.BoundsRelative.Height));
+				if(!cell.CheckBoxBoundsRelative.IsEmpty)
+					cell.SetCheckBoxBounds(new Rectangle(cell.CheckBoxBoundsRelative.X+x,cell.CheckBoxBoundsRelative.Y+y,cell.CheckBoxBoundsRelative.Width,cell.CheckBoxBoundsRelative.Height));
+				if(!cell.ImageBoundsRelative.IsEmpty)
+					cell.SetImageBounds(new Rectangle(cell.ImageBoundsRelative.X+x,cell.ImageBoundsRelative.Y+y,cell.ImageBoundsRelative.Width,cell.ImageBoundsRelative.Height));
+				if(!cell.TextContentBounds.IsEmpty)
+					cell.TextContentBounds=new Rectangle(cell.TextContentBounds.X+x,cell.TextContentBounds.Y+y,cell.TextContentBounds.Width,cell.TextContentBounds.Height);
+			}
+
+            protected virtual void LayoutSingleCell(LayoutCellInfo info)
+            {
+                Size textSize = Size.Empty;
+                Font font = info.Font;
+                int fontHeight = info.FontHeight; // Uses cached FontHeight reference. Huge performance savings on some fonts!!!
+                int height = 0;
+                if (info.LayoutStyle.Font != null)
+                {
+                    font = info.LayoutStyle.Font;
+                    fontHeight = font.Height;
+                }
+
+                info.ContextCell.OnLayoutCell();
+
+                if (info.ContextCell.Images.LargestImageSize.IsEmpty && HasImage(info.ContextCell))
+                    info.ContextCell.Images.RefreshLargestImageSize();
+                Size largestImageSize = Dpi.ImageSize(info.ContextCell.Images.LargestImageSize);
+                Size checkBoxSize = Dpi.Size(CheckBoxSize);
+                if (info.ContextCell.HostedControl != null)
+                {
+                    Size controlSize = info.ContextCell.HostedControl.Size;
+                    if (!info.ContextCell.HostedControlSize.IsEmpty)
+                        controlSize = info.ContextCell.HostedControlSize;
+                    if (info.CellWidth == 0)
+                        textSize = new Size(controlSize.Width, controlSize.Height);
+                    else
+                    {
+                        int availTextWidth = info.CellWidth -
+                                           ElementStyleLayout.HorizontalStyleWhiteSpace(info.LayoutStyle);
+                        textSize = new Size(availTextWidth, controlSize.Height);
+                    }
+                }
+                else if (info.ContextCell.HostedItem != null)
+                {
+                    if (info.CellWidth != 0) info.ContextCell.HostedItem.WidthInternal = info.CellWidth;
+                    info.ContextCell.HostedItem.RecalcSize();
+
+                    Size controlSize = info.ContextCell.HostedItem.Size;
+                    if (info.CellWidth == 0)
+                        textSize = new Size(controlSize.Width, controlSize.Height);
+                    else
+                    {
+                        int availTextWidth = info.CellWidth -
+                                           ElementStyleLayout.HorizontalStyleWhiteSpace(info.LayoutStyle);
+                        textSize = new Size(availTextWidth, controlSize.Height);
+                        info.ContextCell.HostedItem.WidthInternal = availTextWidth;
+                    }
+                }
+                else
+                {
+                    // Calculate Text Width and Height
+                    string cellDisplayText = info.ContextCell.DisplayText;
+                    if (info.CellWidth == 0)
+                    {
+                        if (info.ContextCell.TextMarkupBody == null)
+                        {
+                            string text = cellDisplayText;
+                            if (text != "")
+                            {
+                                if (info.LayoutStyle.WordWrap && info.LayoutStyle.MaximumWidth > 0)
+                                    textSize = TextDrawing.MeasureString(info.Graphics, text, font, info.LayoutStyle.MaximumWidth);
+                                else if (info.ContextCell.Parent != null && info.ContextCell.Parent.Style != null && info.ContextCell.Parent.Style.WordWrap && info.ContextCell.Parent.Style.MaximumWidth > 0)
+                                    textSize = TextDrawing.MeasureString(info.Graphics, text, font, info.ContextCell.Parent.Style.MaximumWidth);
+                                else
+                                    textSize = TextDrawing.MeasureString(info.Graphics, text, font, 0, eTextFormat.Left | eTextFormat.LeftAndRightPadding | eTextFormat.GlyphOverhangPadding | eTextFormat.NoPrefix);
+#if (FRAMEWORK20)
+                                if (!BarFunctions.IsVista && BarUtilities.UseTextRenderer) textSize.Width += 4;
+#endif
+                            }
+                            else if (largestImageSize.IsEmpty && !info.ContextCell.CheckBoxVisible)
+                            {
+                                textSize = new Size(5, fontHeight);
+                            }
+                        }
+                        else
+                        {
+                            Size availSize = new Size(1600, 1);
+                            if (info.LayoutStyle.WordWrap && info.LayoutStyle.MaximumWidth > 0)
+                                availSize.Width = info.LayoutStyle.MaximumWidth;
+                            else if (info.ContextCell.Parent != null && info.ContextCell.Parent.Style != null && info.ContextCell.Parent.Style.WordWrap && info.ContextCell.Parent.Style.MaximumWidth > 0)
+                                availSize.Width = info.ContextCell.Parent.Style.MaximumWidth;
+
+                            DevComponents.DotNetBar.TextMarkup.MarkupDrawContext d = new DevComponents.DotNetBar.TextMarkup.MarkupDrawContext(info.Graphics, font, Color.Empty, false);
+                            info.ContextCell.TextMarkupBody.Measure(availSize, d);
+                            availSize = info.ContextCell.TextMarkupBody.Bounds.Size;
+                            d.RightToLeft = !info.LeftToRight;
+                            info.ContextCell.TextMarkupBody.Arrange(new Rectangle(0, 0, availSize.Width, availSize.Height), d);
+
+                            textSize = info.ContextCell.TextMarkupBody.Bounds.Size;
+                        }
+                    }
+                    else
+                    {
+                        int availTextWidth = info.CellWidth -
+                                           ElementStyleLayout.HorizontalStyleWhiteSpace(info.LayoutStyle);
+
+                        availTextWidth -= largestImageSize.Width +
+                            (largestImageSize.Width > 0 ? ImageTextSpacing * 2 : 0);
+
+                        if (info.ContextCell.CheckBoxVisible)
+                            availTextWidth -= checkBoxSize.Width + ImageTextSpacing * 2;
+
+                        int cellHeight = fontHeight;
+
+                        if (info.LayoutStyle.WordWrap || info.ContextCell.TextMarkupBody != null)
+                        {
+                            cellHeight = info.LayoutStyle.MaximumHeight - info.LayoutStyle.MarginTop -
+                                       info.LayoutStyle.MarginBottom - info.LayoutStyle.PaddingTop - info.LayoutStyle.PaddingBottom;
+
+                            if (info.ContextCell.TextMarkupBody == null)
+                            {
+                                if (availTextWidth > 0)
+                                {
+                                    if (cellHeight > 0)
+                                    {
+                                        textSize = TextDrawing.MeasureString(info.Graphics, cellDisplayText, font, new Size(availTextWidth, cellHeight), info.LayoutStyle.TextFormat);
+                                        if (textSize.Height == 0) textSize.Height = cellHeight;
+                                    }
+                                    else if (!string.IsNullOrEmpty(cellDisplayText))
+                                        textSize = TextDrawing.MeasureString(info.Graphics, cellDisplayText, font, availTextWidth, info.LayoutStyle.TextFormat);
+                                    else
+                                        textSize = new Size(availTextWidth, fontHeight);
+                                }
+                            }
+                            else
+                            {
+                                Size availSize = new Size(availTextWidth, 1);
+                                DevComponents.DotNetBar.TextMarkup.MarkupDrawContext d = new DevComponents.DotNetBar.TextMarkup.MarkupDrawContext(info.Graphics, font, Color.Empty, false);
+                                info.ContextCell.TextMarkupBody.Measure(availSize, d);
+                                availSize = info.ContextCell.TextMarkupBody.Bounds.Size;
+                                availSize.Width = availTextWidth;
+                                d.RightToLeft = !info.LeftToRight;
+                                info.ContextCell.TextMarkupBody.Arrange(new Rectangle(0, 0, availSize.Width, availSize.Height), d);
+
+                                textSize = info.ContextCell.TextMarkupBody.Bounds.Size;
+                            }
+                        }
+                        else
+                            textSize = new Size(availTextWidth, cellHeight);
+                    }
+                }
+
+                if (info.LayoutStyle.WordWrap)
+                    info.ContextCell.WordWrap = true;
+                else
+                    info.ContextCell.WordWrap = false;
+
+                height = (int)Math.Max(height, Math.Ceiling((double)textSize.Height));
+                if (info.VerticalPartAlignment)
+                {
+                    if (largestImageSize.Height > 0)
+                        height += largestImageSize.Height + this.ImageTextSpacing;
+                    if (info.ContextCell.CheckBoxVisible)
+                        height += checkBoxSize.Height + this.ImageCheckBoxSpacing;
+                }
+                else
+                {
+                    if (largestImageSize.Height > height)
+                        height = largestImageSize.Height;
+                    if (info.ContextCell.CheckBoxVisible && checkBoxSize.Height > height)
+                        height = checkBoxSize.Height;
+                }
+
+                Rectangle r = new Rectangle(info.Left + ElementStyleLayout.LeftWhiteSpace(info.LayoutStyle),
+                                          info.Top + ElementStyleLayout.TopWhiteSpace(info.LayoutStyle)
+                                          , info.CellWidth, height);
+
+                if (r.Width == 0)
+                {
+                    if (info.VerticalPartAlignment)
+                    {
+                        r.Width = (int)Math.Ceiling((double)textSize.Width);
+                        if (largestImageSize.Width > r.Width)
+                            r.Width = (largestImageSize.Width + this.ImageTextSpacing);
+                        if (info.ContextCell.CheckBoxVisible && checkBoxSize.Width > r.Width)
+                            r.Width += (checkBoxSize.Width + this.ImageTextSpacing);
+                    }
+                    else
+                    {
+                        r.Width = (int)Math.Ceiling((double)textSize.Width);
+                        if (largestImageSize.Width > 0)
+                            r.Width += (largestImageSize.Width + this.ImageTextSpacing);
+                        if (info.ContextCell.CheckBoxVisible)
+                            r.Width += (checkBoxSize.Width + this.ImageTextSpacing);
+                    }
+                }
+
+                // Now that we have cell bounds store them
+                Rectangle rCellBounds = new Rectangle(info.Left, info.Top, info.CellWidth, r.Height + info.LayoutStyle.MarginTop + info.LayoutStyle.MarginBottom + info.LayoutStyle.PaddingTop + info.LayoutStyle.PaddingBottom);
+                if (rCellBounds.Width == 0)
+                    rCellBounds.Width = r.Width + ElementStyleLayout.HorizontalStyleWhiteSpace(info.LayoutStyle);
+                info.ContextCell.SetBounds(rCellBounds);
+
+                // Set position of the check box
+                //Size checkBoxSize = this.CheckBoxSize;
+                if (info.ContextCell.CheckBoxVisible && rCellBounds.Width >= checkBoxSize.Width)
+                {
+                    eVerticalAlign va = GetCheckBoxVerticalAlign(info.ContextCell.CheckBoxAlignment, info.View);
+                    eHorizontalAlign ha = GetCheckBoxHorizontalAlign(info.ContextCell.CheckBoxAlignment, info.LeftToRight, info.View);
+                    if (ha == eHorizontalAlign.Center && (!string.IsNullOrEmpty(info.ContextCell.Text) || !largestImageSize.IsEmpty))
+                        ha = eHorizontalAlign.Left;
+                    if (info.VerticalPartAlignment)
+                        info.ContextCell.SetCheckBoxBounds(AlignContentVertical(checkBoxSize, ref r, ha, va, this.ImageTextSpacing));
+                    else
+                        info.ContextCell.SetCheckBoxBounds(AlignContent(checkBoxSize, ref r, ha, va, this.ImageTextSpacing));
+                }
+                else
+                    info.ContextCell.SetCheckBoxBounds(Rectangle.Empty);
+
+                // Set Position of the image
+                if (!largestImageSize.IsEmpty && rCellBounds.Width >= largestImageSize.Width)
+                {
+                    eVerticalAlign va = GetVerticalAlign(info.ContextCell.ImageAlignment, info.View);
+                    eHorizontalAlign ha = GetHorizontalAlign(info.ContextCell.ImageAlignment, info.LeftToRight, info.View);
+                    if (ha == eHorizontalAlign.Center && (!string.IsNullOrEmpty(info.ContextCell.Text) || info.ContextCell.CheckBoxVisible) && !info.VerticalPartAlignment)
+                        ha = eHorizontalAlign.Left;
+                    if (info.VerticalPartAlignment)
+                        info.ContextCell.SetImageBounds(AlignContentVertical(largestImageSize, ref r, ha, va, this.ImageTextSpacing));
+                    else
+                        info.ContextCell.SetImageBounds(AlignContent(largestImageSize, ref r, ha, va, this.ImageTextSpacing));
+                }
+                else
+                    info.ContextCell.SetImageBounds(Rectangle.Empty);
+
+                // Set position of the text
+                //info.ContextCell.SetTextBounds(Rectangle.Empty);
+                if (!textSize.IsEmpty)
+                {
+                    if (info.CellWidth > 0)
+                    {
+                        r.Width -= 2 + ElementStyleLayout.HorizontalStyleWhiteSpace(info.LayoutStyle);
+                    }
+                    info.ContextCell.TextContentBounds = r;
+                }
+                else
+                    info.ContextCell.TextContentBounds = Rectangle.Empty;
+
+            }
+
+			protected Rectangle AlignContent(System.Drawing.Size contentSize, ref Rectangle boundingRectangle, eHorizontalAlign horizAlign, eVerticalAlign vertAlign, int contentSpacing)
+			{
+				Rectangle contentRect=new Rectangle(Point.Empty,contentSize);
+				switch(horizAlign)
+				{
+					case eHorizontalAlign.Right:
+						{
+							contentRect.X=boundingRectangle.Right-contentRect.Width;
+							boundingRectangle.Width-=(contentRect.Width+contentSpacing);
+							break;
+						}
+                    case eHorizontalAlign.Center:
+                        {
+                            contentRect.X = boundingRectangle.X + (boundingRectangle.Width - contentRect.Width) / 2;
+        					break;
+                    	}
+					default:
+						{
+							contentRect.X=boundingRectangle.X;
+							boundingRectangle.X=contentRect.Right+contentSpacing;
+							boundingRectangle.Width-=(contentRect.Width+contentSpacing);
+							break;
+						}
+				}
+
+				switch(vertAlign)
+				{
+					case eVerticalAlign.Top:
+						{
+							contentRect.Y=boundingRectangle.Y;
+							break;
+						}
+					case eVerticalAlign.Middle:
+						{
+							contentRect.Y=boundingRectangle.Y+(boundingRectangle.Height-contentRect.Height)/2;
+							break;
+						}
+					case eVerticalAlign.Bottom:
+						{
+							contentRect.Y=boundingRectangle.Bottom-contentRect.Height;
+							break;
+						}
+				}
+
+				return contentRect;
+			}
+
+			protected Rectangle AlignContentVertical(System.Drawing.Size contentSize, ref Rectangle boundingRectangle, eHorizontalAlign horizAlign, eVerticalAlign vertAlign, int contentSpacing)
+			{
+				Rectangle contentRect=new Rectangle(Point.Empty,contentSize);
+				switch(horizAlign)
+				{
+					case eHorizontalAlign.Left:
+						{
+							contentRect.X=boundingRectangle.X;
+							break;
+						}
+					case eHorizontalAlign.Right:
+						{
+							contentRect.X=boundingRectangle.Right-contentRect.Width;
+							break;
+						}
+					case eHorizontalAlign.Center:
+						{
+							contentRect.X=boundingRectangle.X+(boundingRectangle.Width-contentRect.Width)/2;
+							break;
+						}
+				}
+
+				switch(vertAlign)
+				{
+					case eVerticalAlign.Bottom:
+						{
+							contentRect.Y=boundingRectangle.Bottom-contentRect.Height;
+							boundingRectangle.Height-=(contentRect.Height+contentSpacing);
+							break;
+						}
+						//case eVerticalAlign.Top:
+					default:
+						{
+							contentRect.Y=boundingRectangle.Y;
+							boundingRectangle.Y=contentRect.Bottom+contentSpacing;
+							boundingRectangle.Height-=(contentRect.Height+contentSpacing);
+							break;
+						}
+//				case eVerticalAlign.Middle:
+//				{
+//					contentRect.Y=boundingRectangle.Y+(boundingRectangle.Height-contentRect.Height)/2;
+//					break;
+//				}
+				}
+
+				return contentRect;
+			}
+
+            public static eHorizontalAlign GetHorizontalAlign(eCellPartAlignment align, bool leftToRight, eView view)
+			{
+                if (align == eCellPartAlignment.Default)
+                {
+                    if (view == eView.Tree)
+                        align = eCellPartAlignment.NearCenter;
+                    else if (view == eView.Tile)
+                        align = eCellPartAlignment.NearCenter;
+                }
+
+				if(((align==eCellPartAlignment.NearBottom || align==eCellPartAlignment.NearCenter ||
+				     align==eCellPartAlignment.NearTop) && leftToRight) ||
+				   ((align==eCellPartAlignment.FarBottom || align==eCellPartAlignment.FarCenter ||
+				     align==eCellPartAlignment.FarTop) && !leftToRight))
+					return eHorizontalAlign.Left;
+				else if(align==eCellPartAlignment.CenterBottom || align==eCellPartAlignment.CenterTop)
+					return eHorizontalAlign.Center;
+				return eHorizontalAlign.Right;
+			}
+
+			public static eVerticalAlign GetVerticalAlign(eCellPartAlignment align, eView view)
+			{
+                if (align == eCellPartAlignment.Default)
+                {
+                    if (view == eView.Tree)
+                        align = eCellPartAlignment.NearCenter;
+                    else if (view == eView.Tile)
+                        align = eCellPartAlignment.NearCenter;
+                }
+				eVerticalAlign va=eVerticalAlign.Middle;
+
+				switch(align)
+				{
+					case eCellPartAlignment.FarBottom:
+					case eCellPartAlignment.NearBottom:
+					case eCellPartAlignment.CenterBottom:
+						va=eVerticalAlign.Bottom;
+						break;
+					case eCellPartAlignment.FarTop:
+					case eCellPartAlignment.NearTop:
+					case eCellPartAlignment.CenterTop:
+						va=eVerticalAlign.Top;
+						break;
+				}
+
+				return va;
+			}
+
+            public static eHorizontalAlign GetCheckBoxHorizontalAlign(eCellPartAlignment align, bool leftToRight, eView view)
+            {
+                if (align == eCellPartAlignment.Default)
+                {
+                    if (view == eView.Tree)
+                        align = eCellPartAlignment.NearCenter;
+                    else if (view == eView.Tile)
+                        align = eCellPartAlignment.NearCenter;
+                }
+
+                if (((align == eCellPartAlignment.NearBottom || align == eCellPartAlignment.NearCenter ||
+                     align == eCellPartAlignment.NearTop) && leftToRight) ||
+                   ((align == eCellPartAlignment.FarBottom || align == eCellPartAlignment.FarCenter ||
+                     align == eCellPartAlignment.FarTop) && !leftToRight))
+                    return eHorizontalAlign.Left;
+                else if (align == eCellPartAlignment.CenterBottom || align == eCellPartAlignment.CenterTop)
+                    return eHorizontalAlign.Center;
+                return eHorizontalAlign.Right;
+            }
+            public static eVerticalAlign GetCheckBoxVerticalAlign(eCellPartAlignment align, eView view)
+            {
+                if (align == eCellPartAlignment.Default)
+                {
+                    if (view == eView.Tree)
+                        align = eCellPartAlignment.NearCenter;
+                    else if (view == eView.Tile)
+                        align = eCellPartAlignment.NearCenter;
+                }
+                eVerticalAlign va = eVerticalAlign.Middle;
+
+                switch (align)
+                {
+                    case eCellPartAlignment.FarBottom:
+                    case eCellPartAlignment.NearBottom:
+                    case eCellPartAlignment.CenterBottom:
+                        va = eVerticalAlign.Bottom;
+                        break;
+                    case eCellPartAlignment.FarTop:
+                    case eCellPartAlignment.NearTop:
+                    case eCellPartAlignment.CenterTop:
+                        va = eVerticalAlign.Top;
+                        break;
+                }
+
+                return va;
+            }
+
+            private Size _CheckBoxSize = new Size(12, 12);
+			internal System.Drawing.Size CheckBoxSize
+			{
+				get
+				{
+                    return _CheckBoxSize;
+				}
+                set
+                {
+                    _CheckBoxSize = value;
+                }
+			}
+            internal void ResetCheckBoxSize()
+            {
+                _CheckBoxSize = new Size(12, 12);
+            }
+
+			/// <summary>
+			/// Returns spacing between check box and image if both are displayed
+			/// </summary>
+			protected int ImageCheckBoxSpacing
+			{
+				get {return 4;}
+			}
+
+			/// <summary>
+			/// Returns spacing between image or checkbox and text
+			/// </summary>
+			protected int ImageTextSpacing
+			{
+				get {return 4;}
+			}
+
+            //private int _CellHorizontalSpacing = 5;
+            ///// <summary>
+            ///// Returns horizontal spacing between cells in a node
+            ///// </summary>
+            //public int CellHorizontalSpacing
+            //{
+            //    get {return _CellHorizontalSpacing;}
+            //    set
+            //    {
+            //        _CellHorizontalSpacing = value;
+            //    }
+            //}
+
+			/// <summary>
+			/// Returns vertical spacing between cells in a node
+			/// </summary>
+			public int CellVerticalSpacing
+			{
+				get {return 1;}
+			}
+
+			/// <summary>
+			/// Spacing between different parts of the cell, like image, option button, text and expand button area
+			/// </summary>
+			public int CellPartSpacing
+			{
+				get {return 1;}
+			}
+
+			public virtual Size LayoutCells(NodeLayoutContextInfo layoutInfo, int x, int y)
+			{
+				eCellLayout layout=layoutInfo.CellLayout;
+                if (layoutInfo.ContextNode.CellLayout != layoutInfo.CellLayout && layoutInfo.ContextNode.CellLayout != eCellLayout.Default)
+                    layout = layoutInfo.ContextNode.CellLayout;
+
+                if (layout == eCellLayout.Horizontal || layout == eCellLayout.Default && layoutInfo.View == eView.Tree || layoutInfo.View == eView.Tile && layoutInfo.IsViewGroupping && layoutInfo.ContextNode.HasChildNodes)
+                    return this.LayoutCellsHorizontal(layoutInfo, x, y);
+                else
+                    return this.LayoutCellsVertical(layoutInfo, x, y);
+			}
+
+			protected virtual Size LayoutCellsHorizontal(NodeLayoutContextInfo layoutInfo, int x, int y)
+			{
+				Node node=layoutInfo.ContextNode;
+				int height=0, width=0;
+                bool adjustHeight = false;
+                int cellCount = node.Cells.Count;
+                bool firstVisible = true;
+                int runningColumnWidth = 0;
+
+				for(int i=0;i<cellCount;i++)
+				{
+                    Cell cell = null;
+                    if (layoutInfo.ChildColumns != null && layoutInfo.ChildColumns.ColumnInfo.Count == cellCount)
+                        cell = node.Cells[layoutInfo.ChildColumns.ColumnInfo[i].AbsoluteIndex];
+                    else if (layoutInfo.DefaultColumns.ColumnInfo.Count == cellCount)
+                        cell = node.Cells[layoutInfo.DefaultColumns.ColumnInfo[i].AbsoluteIndex];
+                    else
+                        cell = node.Cells[i];
+
+					bool bCellVisible=true;
+
+					// Setup cell layout helper class
+					LayoutCellInfo cellLayout=this.GetLayoutCellInfo();
+                    cellLayout.View = layoutInfo.View;
+					cellLayout.Top=y;
+					cellLayout.Left=x;
+					cellLayout.CellWidth=0;
+                    cellLayout.CellHeight = 0;
+					cellLayout.ContextCell=cell;
+					cellLayout.Graphics=layoutInfo.Graphics;
+					cellLayout.LeftToRight=layoutInfo.LeftToRight;
+					cellLayout.Font=layoutInfo.DefaultFont;
+					if(cell.Layout!=eCellPartLayout.Default)
+						cellLayout.VerticalPartAlignment=(cell.Layout==eCellPartLayout.Vertical);
+					else if(layoutInfo.CellPartLayout!=eCellPartLayout.Default)
+						cellLayout.VerticalPartAlignment=(layoutInfo.CellPartLayout==eCellPartLayout.Vertical);
+
+
+                    ColumnInfo ci = null;
+                    if ((layoutInfo.DefaultColumns.ColumnInfo.Count > 0 || layoutInfo.ChildColumns != null && layoutInfo.ChildColumns.ColumnInfo.Count > 0) &&
+                        (node.Cells.Count > 1 || node.Cells.Count == layoutInfo.DefaultColumns.ColumnInfo.Count ||
+                        layoutInfo.ChildColumns != null && layoutInfo.ChildColumns.ColumnInfo.Count == node.Cells.Count))
+                    {
+                        bool usingTopLevelColumns = false;
+                        if (layoutInfo.ChildColumns != null && layoutInfo.ChildColumns.ColumnInfo.Count > 0 && i < layoutInfo.ChildColumns.ColumnInfo.Count)
+                            ci = layoutInfo.ChildColumns.ColumnInfo[i] as ColumnInfo;
+                        else if (i < layoutInfo.DefaultColumns.ColumnInfo.Count)
+                        {
+                            ci = layoutInfo.DefaultColumns.ColumnInfo[i] as ColumnInfo;
+                            usingTopLevelColumns = true;
+                        }
+
+                        if (ci != null)
+                        {
+                            bCellVisible = ci.Visible;
+                            if (ci.AutoSize && cell.HostedControl == null)
+                                cellLayout.CellWidth = 0;
+                            else
+                            {
+                                cellLayout.CellWidth = ci.Width;
+                                /*if (firstVisible && usingTopLevelColumns && cellLayout.CellWidth > 0)
+                                {
+                                    cellLayout.CellWidth = Math.Max(-1, cellLayout.CellWidth - (layoutInfo.Left + x + this.LayoutSettings.CellHorizontalSpacing));
+                                    if (cellLayout.CellWidth == 0) cellLayout.CellWidth = -1; // this ensures that cell content is not visible since 0 indicates to take as much space as needed
+                                }
+                                else*/ if(usingTopLevelColumns && cellLayout.CellWidth>0 && runningColumnWidth<layoutInfo.Left+x)
+                                {
+                                    // Removed layoutInfo.Left from calculation in case that PaddingLeft was set to larger value on AdvTree.BackgroundStyle to push content to the right
+                                    cellLayout.CellWidth = Math.Max(-1, cellLayout.CellWidth - ((layoutInfo.Left + x - layoutInfo.LeftMargin) - runningColumnWidth));
+                                    if (cellLayout.CellWidth == 0) cellLayout.CellWidth = -1; // this ensures that cell content is not visible since 0 indicates to take as much space as needed
+                                }
+                                runningColumnWidth += ci.Width + this.LayoutSettings.CellHorizontalSpacing;
+                            }
+                        }
+                    }
+                    else if (layoutInfo.View == eView.Tile)
+                    {
+                        if (layoutInfo.IsViewGroupping && node.HasChildNodes)
+                        {
+                            cellLayout.CellWidth = layoutInfo.ClientRectangle.Width - layoutInfo.Left - layoutInfo.ExpandPartWidth - 1;
+                        }
+                        else
+                        {
+                            cellLayout.CellWidth = layoutInfo.TileSize.Width;
+                            cellLayout.CellHeight = layoutInfo.TileSize.Height;
+                        }
+                    }
+
+					// Prepare union style
+					if(cell.StyleNormal!=null)
+						cellLayout.LayoutStyle=cell.StyleNormal;
+					else
+					{
+						if(layoutInfo.ContextNode.Style!=null)
+						{
+							ElementStyle styleCopy = layoutInfo.DefaultCellStyle.Copy();
+							styleCopy.ApplyStyle(layoutInfo.ContextNode.Style);
+							cellLayout.LayoutStyle = styleCopy;
+						}
+						else
+							cellLayout.LayoutStyle=layoutInfo.DefaultCellStyle;
+					}
+
+					this.LayoutSingleCell(cellLayout);
+                    cell.SetVisible(bCellVisible);
+					if(bCellVisible)
+					{
+                        if (ci != null && ci.AutoSize && cell.HostedControl==null)
+                        {
+                            if (ci.ColumnHeader.Parent.ParentNode == null && firstVisible)
+                                ci.MaxWidth = Math.Max(ci.MaxWidth, cell.BoundsRelative.Width + (layoutInfo.Left + x) + this.LayoutSettings.CellHorizontalSpacing);
+                            else
+                                ci.MaxWidth = Math.Max(ci.MaxWidth, cell.BoundsRelative.Width + this.LayoutSettings.CellHorizontalSpacing);
+                        }
+
+                        x += Math.Max(0, cell.BoundsRelative.Width);
+                        width += Math.Max(0, cell.BoundsRelative.Width);
+						//if(cell.BoundsRelative.Width>0)
+						{
+                            x += this.LayoutSettings.CellHorizontalSpacing;
+                            width += this.LayoutSettings.CellHorizontalSpacing;
+						}
+                        if (cell.BoundsRelative.Height > height)
+                        {
+                            if (height != 0) adjustHeight = true;
+                            height = cell.BoundsRelative.Height;
+                        }
+                        else if (!firstVisible && cell.BoundsRelative.Height < height && !cell.TextContentBounds.IsEmpty)
+                            adjustHeight = true;
+
+                        firstVisible = false;
+					}
+				}
+
+                // Apply the uniform cell text height to all cells
+                if (adjustHeight)
+                {
+                    for (int i = 0; i < node.Cells.Count; i++)
+                    {
+                        Cell cell = node.Cells[i];
+                        if (cell.BoundsRelative.Height != height && !cell.TextContentBounds.IsEmpty)
+                        {
+                            cell.TextContentBounds = new Rectangle(cell.TextContentBounds.X, cell.TextContentBounds.Y, 
+                                cell.TextContentBounds.Width, cell.TextContentBounds.Height + (height - cell.BoundsRelative.Height));
+                            int diff = height - cell.BoundsRelative.Height;
+                            if (!cell.CheckBoxBoundsRelative.IsEmpty)
+                            {
+                                eVerticalAlign va = GetCheckBoxVerticalAlign(cell.CheckBoxAlignment, layoutInfo.View);
+                                if (va == eVerticalAlign.Middle)
+                                    cell.SetCheckBoxBounds(new Rectangle(cell.CheckBoxBoundsRelative.X, cell.CheckBoxBoundsRelative.Y + (int)Math.Ceiling((double)diff / 2), cell.CheckBoxBoundsRelative.Width, cell.CheckBoxBoundsRelative.Height));
+                                if (va == eVerticalAlign.Bottom)
+                                    cell.SetCheckBoxBounds(new Rectangle(cell.CheckBoxBoundsRelative.X, cell.CheckBoxBoundsRelative.Y + diff, cell.CheckBoxBoundsRelative.Width, cell.CheckBoxBoundsRelative.Height));
+                            }
+                            if (!cell.ImageBoundsRelative.IsEmpty)
+                            {
+                                eVerticalAlign va = GetVerticalAlign(cell.ImageAlignment, layoutInfo.View);
+                                if(va== eVerticalAlign.Middle)
+                                    cell.SetImageBounds(new Rectangle(cell.ImageBoundsRelative.X, cell.ImageBoundsRelative.Y + (int)Math.Ceiling((double)diff / 2), cell.ImageBoundsRelative.Width, cell.ImageBoundsRelative.Height));
+                                else if (va == eVerticalAlign.Bottom)
+                                    cell.SetImageBounds(new Rectangle(cell.ImageBoundsRelative.X, cell.ImageBoundsRelative.Y + diff, cell.ImageBoundsRelative.Width, cell.ImageBoundsRelative.Height));
+                            }
+                            cell.SetBounds(new Rectangle(cell.BoundsRelative.X, cell.BoundsRelative.Y, cell.BoundsRelative.Width, height));
+                        }
+                    }
+                }
+
+				// Take last added spacing off
+                x -= this.LayoutSettings.CellHorizontalSpacing;
+                width -= this.LayoutSettings.CellHorizontalSpacing;
+
+				return new Size(width,height);
+			}
+
+			protected virtual Size LayoutCellsVertical(NodeLayoutContextInfo layoutInfo, int x, int y)
+			{
+				Node node=layoutInfo.ContextNode;
+				int height=0, width=0;
+                eHorizontalAlign align = node.VerticalCellLayoutAlignment; // eHorizontalAlign.Center;
+				int iVisibleCells=0;
+                int cellCount = node.Cells.Count;
+				for(int i=0;i<cellCount;i++)
+				{
+                    Cell cell = null;
+                    if (layoutInfo.ChildColumns != null && layoutInfo.ChildColumns.ColumnInfo.Count == cellCount)
+                        cell = node.Cells[layoutInfo.ChildColumns.ColumnInfo[i].AbsoluteIndex];
+                    else if(layoutInfo.DefaultColumns.ColumnInfo.Count == cellCount)
+                        cell = node.Cells[layoutInfo.DefaultColumns.ColumnInfo[i].AbsoluteIndex];
+                    else 
+                        cell = node.Cells[i];
+                        
+
+					bool bCellVisible=true;
+
+					// Setup cell layout helper class
+					LayoutCellInfo cellLayout=this.GetLayoutCellInfo();
+					cellLayout.Top=y;
+					cellLayout.Left=x;
+					cellLayout.CellWidth=0;
+					cellLayout.ContextCell=cell;
+					cellLayout.Graphics=layoutInfo.Graphics;
+					cellLayout.LeftToRight=layoutInfo.LeftToRight;
+					cellLayout.Font=layoutInfo.DefaultFont;
+					if(cell.Layout!=eCellPartLayout.Default)
+						cellLayout.VerticalPartAlignment=(cell.Layout==eCellPartLayout.Vertical);
+					else if(layoutInfo.CellPartLayout!=eCellPartLayout.Default)
+						cellLayout.VerticalPartAlignment=(layoutInfo.CellPartLayout==eCellPartLayout.Vertical);
+
+                    if (layoutInfo.DefaultColumns.ColumnInfo.Count > 0 || layoutInfo.ChildColumns != null && layoutInfo.ChildColumns.ColumnInfo.Count > 0)
+					{
+						ColumnInfo ci=null;
+                        if (layoutInfo.ChildColumns != null && layoutInfo.ChildColumns.ColumnInfo.Count > 0)
+							ci=layoutInfo.ChildColumns.ColumnInfo[i] as ColumnInfo;
+						else
+							ci=layoutInfo.DefaultColumns.ColumnInfo[i] as ColumnInfo;
+					
+						bCellVisible=ci.Visible;
+						cellLayout.CellWidth=ci.Width;
+					}
+                    else if (layoutInfo.View == eView.Tile)
+                    {
+                        cellLayout.CellWidth = layoutInfo.TileSize.Width;
+                        cellLayout.CellHeight = layoutInfo.TileSize.Height;
+                    }
+
+					// Prepare union style
+					if(cell.StyleNormal!=null)
+						cellLayout.LayoutStyle=cell.StyleNormal;
+					else
+						cellLayout.LayoutStyle=layoutInfo.DefaultCellStyle;
+
+					this.LayoutSingleCell(cellLayout);
+
+					cell.SetVisible(bCellVisible);
+					if(bCellVisible)
+					{
+						iVisibleCells++;
+						y+=cell.BoundsRelative.Height;
+						height+=cell.BoundsRelative.Height;
+						if(cell.BoundsRelative.Height>0)
+						{
+							y+=this.CellVerticalSpacing;
+							height+=this.CellVerticalSpacing;
+						}
+						if(cell.BoundsRelative.Width>width)
+							width=cell.BoundsRelative.Width;
+					}
+				}
+
+				// Take last added spacing off
+				y-=this.CellVerticalSpacing;
+				height-=this.CellVerticalSpacing;
+
+				// Additional pass needed if horizontal alignment is other than left and there is more than one cell visible
+				if(align!=eHorizontalAlign.Left && iVisibleCells>1)
+				{
+					foreach(Cell cell in node.Cells)
+					{
+						if(!cell.IsVisible)
+							continue;
+						if(align==eHorizontalAlign.Center)
+							this.Offset(cell,(width-cell.BoundsRelative.Width)/2,0);
+						else // Right aligned cells
+							this.Offset(cell,width-cell.BoundsRelative.Width,0);
+					}
+				}
+
+				return new Size(width,height);
+			}
+
+			private LayoutCellInfo m_LayoutCellInfo=null;
+			protected virtual LayoutCellInfo GetLayoutCellInfo()
+			{
+				if(m_LayoutCellInfo==null)
+					m_LayoutCellInfo=new LayoutCellInfo();
+				return m_LayoutCellInfo;
+			}
+
+            protected virtual bool HasImage(Cell cell)
+            {
+                if (cell.Images.Image != null || cell.Images.ImageIndex >= 0 || !string.IsNullOrEmpty(cell.Images.ImageKey))
+                    return true;
+                return false;
+            }
+		}
+	}
+
+	internal class LayoutCellInfo
+	{
+		public Cell ContextCell=null;
+		public int CellWidth=0;
+        public int CellHeight = 0;
+		public System.Drawing.Graphics Graphics=null;
+		public int Left=0;
+		public int Top=0;
+		public ElementStyle LayoutStyle=null;
+		public bool LeftToRight=true;
+		public bool VerticalPartAlignment=false;
+        public eView View = eView.Tree;
+        public int CellIndex = 0;
+
+        private Font _Font;
+        public Font Font
+        {
+            get { return _Font; }
+            set 
+            {
+                if (_Font != value)
+                {
+                    _Font = value;
+                    if (_Font != null)
+                        FontHeight = _Font.Height;
+                    else
+                        FontHeight = 0;
+                }
+            }
+        }
+        public int FontHeight = 0;
+
+		public LayoutCellInfo()
+		{
+		}
+	}
+
+	internal class ColumnInfo
+	{
+		public bool Visible;
+		public int Width;
+        public int MaxWidth = 0;
+        public ColumnHeader ColumnHeader = null;
+        public bool AutoSize = false;
+        // Specifies the absolute index for column data. AbsoluteIndex may be different from DisplayIndex of columns are re-arranged
+        public int AbsoluteIndex = -1;
+		public ColumnInfo(int width, bool visible, ColumnHeader h, int absoluteIndex)
+		{
+			this.Width=width;
+			this.Visible=visible;
+            this.ColumnHeader = h;
+            this.AutoSize = h.Width.AutoSize;
+            this.AbsoluteIndex = absoluteIndex;
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/Layout/NodeLayout.cs b/PROMS/DotNetBar Source Code/AdvTree/Layout/NodeLayout.cs
new file mode 100644
index 00000000..76425a45
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/Layout/NodeLayout.cs	
@@ -0,0 +1,702 @@
+using System;
+using System.Drawing;
+using System.Collections;
+using DevComponents.DotNetBar;
+using System.Drawing.Drawing2D;
+using System.Drawing.Text;
+using System.Collections.Generic;
+
+namespace DevComponents.AdvTree.Layout
+{
+	/// <summary>
+	/// Summary description for NodeLayout.
+	/// </summary>
+	internal abstract class NodeLayout
+	{
+		#region Private Variables
+		protected int m_Height=0;
+		protected int m_Width=0;
+		protected AdvTree m_Tree=null;
+		protected Rectangle m_ClientArea;
+		//protected int m_ExpandAreaWidth=8;
+		protected Size m_ExpandPartSize=new Size(8,8);
+	    private Size _CachedExpandPartSize = Size.Empty;
+		private int m_CommandAreaWidth=10;
+		private int m_TreeLayoutChildNodeIndent = 16;
+
+		private System.Windows.Forms.LeftRightAlignment m_LeftRight=System.Windows.Forms.LeftRightAlignment.Left;
+		private int m_NodeVerticalSpacing=3;
+		private int m_NodeHorizontalSpacing=0;
+		private CellLayout m_CellLayout=null;
+		private Graphics m_Graphics=null;
+		#endregion
+
+		public NodeLayout(AdvTree treeControl, Rectangle clientArea, LayoutSettings layoutSettings)
+		{
+			m_Tree=treeControl;
+			m_ClientArea=clientArea;
+            _LayoutSettings = layoutSettings;
+		}
+
+		/// <summary>
+		/// Performs layout of the nodes inside of the tree control.
+		/// </summary>
+		public virtual void PerformLayout()
+		{
+		}
+
+        public virtual void UpdateTopLevelColumnsWidth()
+        {
+        }
+
+        private LayoutSettings _LayoutSettings;
+        /// <summary>
+        /// Gets or sets layout settings.
+        /// </summary>
+        public LayoutSettings LayoutSettings
+        {
+            get { return _LayoutSettings; }
+            set { _LayoutSettings = value; }
+        }
+
+		/// <summary>
+		/// Performs layout for single unassigned node. Node does not have to be part of the tree control.
+		/// </summary>
+		/// <param name="node">Node to perform layout on.</param>
+		public virtual void PerformSingleNodeLayout(Node node)
+		{
+			if(node==null)
+				return;
+
+			this.PrepareStyles();
+			// Get default Columns
+
+			System.Drawing.Graphics g=this.GetGraphics();
+
+            SmoothingMode sm = g.SmoothingMode;
+            TextRenderingHint th = g.TextRenderingHint;
+            if (m_Tree.AntiAlias)
+            {
+                g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.AntiAlias;
+                //g.TextRenderingHint = DisplayHelp.AntiAliasTextRenderingHint;
+            }
+
+			try
+			{
+				NodeLayoutContextInfo layoutInfo=this.GetDefaultNodeLayoutContextInfo(g);
+				layoutInfo.ContextNode=node;
+			    if (node.IsDragNode)
+			        layoutInfo.DefaultColumns = new NodeColumnInfo(new List<ColumnInfo>(), false);
+				LayoutNode(layoutInfo);
+			}
+			finally
+			{
+                if (m_Tree.AntiAlias)
+                {
+                    g.SmoothingMode = sm;
+                    //g.TextRenderingHint = th;
+                }
+				g.Dispose();
+			}
+		}
+
+		public int Width
+		{
+			get {return m_Width;}
+		}
+
+		public int Height
+		{
+			get {return m_Height;}
+		}
+
+		public Rectangle ClientArea
+		{
+			get {return m_ClientArea;}
+			set {m_ClientArea=value;}
+		}
+		
+		public Graphics Graphics
+		{
+			get { return m_Graphics;}
+			set { m_Graphics = value;}
+		}
+		
+		internal bool DisposeGraphics
+		{
+			get
+			{
+				return (m_Graphics == null);
+			}
+		}
+
+		protected virtual System.Drawing.Graphics GetGraphics()
+		{
+			if(m_Graphics!=null)
+				return m_Graphics;
+			
+			Graphics g=m_Tree.CreateGraphics();
+
+			
+			return g;
+		}
+
+		/// <summary>
+		/// Resizes all styles and prepares them for layout.
+		/// </summary>
+		protected virtual void PrepareStyles()
+		{
+			// Resize styles if needed
+			foreach(ElementStyle es in m_Tree.Styles)
+			{
+				if(es.SizeChanged)
+					ElementStyleLayout.CalculateStyleSize(es,m_Tree.Font);
+			}
+
+            if (_LayoutSettings != null)
+                _CachedExpandPartSize = Dpi.Size(_LayoutSettings.ExpandPartSize);
+            else
+    			_CachedExpandPartSize = Dpi.Size(m_ExpandPartSize);
+            
+		}
+
+		/// <summary>
+		/// Returns default top-level columns for tree control.
+		/// </summary>
+		/// <returns>Returns array list of ColumnInfo objects.</returns>
+        protected virtual NodeColumnInfo GetDefaultColumnInfo()
+		{
+            List<ColumnInfo> ci = new List<ColumnInfo>();
+            NodeColumnInfo info = new NodeColumnInfo(ci, false);
+			ColumnHeaderCollection columns=m_Tree.Columns;
+            //int treeWidth = m_Tree.ClientRectangle.Width;
+			if(columns!=null)
+			{
+                for (int i = 0; i < columns.Count; i++)
+				{
+                    int columnIndex = columns.DisplayIndexMap[i];
+                    ColumnHeader h = columns[columnIndex];
+                    ColumnInfo columnInfo = new ColumnInfo(h.Bounds.Width, h.Visible, h, columnIndex);
+                    ci.Add(columnInfo);
+                    info.HasAutoSizeColumn |= columnInfo.AutoSize;
+				}
+			}
+
+			return info;
+		}
+
+		/// <summary>
+		/// Returns column information for a given node.
+		/// </summary>
+		/// <param name="node">Node to return column information for</param>
+		/// <returns>Returns array list of ColumnInfo objects or null if there are no columns defined.</returns>
+		protected virtual NodeColumnInfo GetNodeColumnInfo(Node node)
+		{
+            if (!node.HasColumns)
+            {
+                return null;
+            }
+
+            List<ColumnInfo> ci = new List<ColumnInfo>();
+            NodeColumnInfo info = new NodeColumnInfo(ci, false);
+            ColumnHeaderCollection columns = node.NodesColumns;
+            for (int i = 0; i < columns.Count; i++)
+			{
+                int columnIndex = columns.DisplayIndexMap[i];
+                ColumnHeader h = columns[columnIndex];
+                ColumnInfo columnInfo = new ColumnInfo(h.Bounds.Width, h.Visible, h, columnIndex);
+                ci.Add(columnInfo);
+                info.HasAutoSizeColumn |= columnInfo.AutoSize;
+			}
+
+            return info;
+		}
+
+        ///// <summary>
+        ///// Gets or sets the vertical spacing between nodes in pixels.
+        ///// </summary>
+        //public virtual int NodeVerticalSpacing
+        //{
+        //    get {return m_NodeVerticalSpacing;}
+        //    set {m_NodeVerticalSpacing=value;}
+        //}
+
+        ///// <summary>
+        ///// Gets or sets the horizontal spacing between nodes in pixels.
+        ///// </summary>
+        //public virtual int NodeHorizontalSpacing
+        //{
+        //    get {return m_NodeHorizontalSpacing;}
+        //    set {m_NodeHorizontalSpacing=value;}
+        //}
+
+		/// <summary>
+		/// Gets or sets the child node indent in pixels.
+		/// </summary>
+		public virtual int TreeLayoutChildNodeIndent
+		{
+			get {return m_TreeLayoutChildNodeIndent; }
+			set { m_TreeLayoutChildNodeIndent = value; }
+		}
+
+		/// <summary>
+		/// Returns column header collection for the given column template name.
+		/// </summary>
+		/// <param name="name">Name of the column template.</param>
+		/// <returns>Column header collection or null if template name cannot be found.</returns>
+		public virtual ColumnHeaderCollection GetColumnHeader(string name)
+		{
+			if(name=="" || name==null)
+				return null;
+			return m_Tree.Headers.GetByName(name).Columns;
+		}
+
+        //private int _ExpandAreaWidth = 24;
+        ///// <summary>
+        ///// Returns width of the expand button area. Default is 24 pixels.
+        ///// </summary>
+        //public virtual int ExpandAreaWidth
+        //{
+        //    get { return _ExpandAreaWidth; }
+        //    set
+        //    {
+        //        _ExpandAreaWidth = value;
+        //    }
+        //}
+
+        ///// <summary>
+        ///// Gets or sets width of command button area. Default is 8 pixels.
+        ///// </summary>
+        //public virtual int CommandAreaWidth
+        //{
+        //    get {return m_CommandAreaWidth;}
+        //    set {m_CommandAreaWidth=value;}
+        //}
+
+		/// <summary>
+		/// Sets the position and size of the node command button.
+		/// </summary>
+		/// <param name="layoutInfo">Node layout context information</param>
+		protected virtual void LayoutCommandPart(NodeLayoutContextInfo layoutInfo, ElementStyle nodeStyle)
+		{
+			// Command part is right-aligned just before the node border
+            Rectangle bounds = new Rectangle(layoutInfo.ContextNode.ContentBounds.Right - this.LayoutSettings.CommandAreaWidth -
+				ElementStyleLayout.StyleSpacing(nodeStyle,eSpacePart.Border,eStyleSide.Right),layoutInfo.ContextNode.ContentBounds.Y+
+				ElementStyleLayout.StyleSpacing(nodeStyle,eSpacePart.Border,eStyleSide.Top),
+                this.LayoutSettings.CommandAreaWidth, layoutInfo.ContextNode.ContentBounds.Height -
+				ElementStyleLayout.StyleSpacing(nodeStyle,eSpacePart.Border,eStyleSide.Top)-
+				ElementStyleLayout.StyleSpacing(nodeStyle,eSpacePart.Border,eStyleSide.Bottom));
+//			Rectangle bounds=new Rectangle(layoutInfo.ContextNode.ContentBounds.Right-this.CommandAreaWidth-
+//				ElementStyleLayout.StyleSpacing(nodeStyle,eSpacePart.Border,eStyleSide.Right),layoutInfo.ContextNode.ContentBounds.Y, 
+//				this.CommandAreaWidth, layoutInfo.ContextNode.ContentBounds.Height);
+			layoutInfo.ContextNode.CommandBoundsRelative=bounds;
+		}
+
+		/// <summary>
+		/// Determines the rectangle of the +/- part of the tree node that is used to expand node.
+		/// </summary>
+		/// <param name="layoutInfo">Node layout context information</param>
+		protected virtual void LayoutExpandPart(NodeLayoutContextInfo layoutInfo, bool bLeftNode, int x)
+		{
+			Node node=layoutInfo.ContextNode;
+
+			Size partSize=GetExpandPartSize();
+
+			Rectangle bounds=new Rectangle(x,0,partSize.Width,partSize.Height);
+
+            if (node.ExpandPartVerticalAlignment == eVerticalAlign.Middle)
+                bounds.Y = (node.BoundsRelative.Height - bounds.Height) / 2;
+            else if (node.ExpandPartVerticalAlignment == eVerticalAlign.Top)
+                bounds.Y = Dpi.Height3;
+            else
+                bounds.Y = node.BoundsRelative.Height - partSize.Height - Dpi.Height3;
+
+            if (bLeftNode || layoutInfo.ExpandPartAlignedLeft && layoutInfo.LeftToRight)
+                bounds.X += (layoutInfo.ExpandAreaWidth - bounds.Width) / 2;
+            else
+                bounds.X = node.BoundsRelative.Right - layoutInfo.ExpandAreaWidth + (layoutInfo.ExpandAreaWidth - partSize.Width) / 2;
+
+			node.SetExpandPartRectangle(bounds);
+		}
+
+		/// <summary>
+		/// Returns the size of the node expand part.
+		/// </summary>
+		/// <returns>Size of the expand part, default 8,8.</returns>
+		protected virtual Size GetExpandPartSize()
+		{
+            return _CachedExpandPartSize;
+            //if (_LayoutSettings != null)
+            //    return _LayoutSettings.ExpandPartSize;
+            //return m_ExpandPartSize;
+		}
+
+        ///// <summary>
+        ///// Gets or sets the size of the expand part that is expanding/collapsing the node. Default value is 8,8.
+        ///// </summary>
+        //public System.Drawing.Size ExpandPartSize
+        //{
+        //    get {return m_ExpandPartSize;}
+        //    set {m_ExpandPartSize=value;}
+        //}
+
+		/// <summary>
+		/// Provides the layout for single node.
+		/// </summary>
+		/// <param name="layoutInfo">Layout information.</param>
+		protected virtual void LayoutNode(NodeLayoutContextInfo layoutInfo)
+		{
+			bool bHasExpandPart=this.HasExpandPart(layoutInfo);
+			bool bHasCommandPart=this.HasCommandPart(layoutInfo);
+
+			Node node=layoutInfo.ContextNode;
+
+            Rectangle nodeRect = new Rectangle(layoutInfo.Left, layoutInfo.Top, 0, 0);
+			Rectangle nodeContentRect=Rectangle.Empty; // Node content rect excludes expand rect
+
+			int height=0, width=0;
+			
+			// Left node relative to the main root node...
+            bool bLeftNode = layoutInfo.LeftToRight; // (layoutInfo.MapPositionNear && layoutInfo.LeftToRight);
+            layoutInfo.LayoutNodeExpandPartWidth = 0;
+			if(bLeftNode && bHasExpandPart || this.ReserveExpandPartSpace)
+			{
+                layoutInfo.LayoutNodeExpandPartWidth = (layoutInfo.ExpandAreaWidth + this.GetCellLayout().CellPartSpacing);
+                width += (layoutInfo.ExpandAreaWidth + this.GetCellLayout().CellPartSpacing);
+			}
+
+			int x=width;		// relative to 0,0 of the node
+			int y=0;			// Relative to 0,0 of the node
+			
+			// Apply node style
+			ElementStyle nodeStyle=null;
+			if(node.Expanded && node.StyleExpanded!=null)
+				nodeStyle=node.StyleExpanded;
+			else if(node.Style!=null)
+				nodeStyle=node.Style;
+			else
+				nodeStyle=layoutInfo.DefaultNodeStyle;
+
+			nodeContentRect.X=x;
+
+			if(nodeStyle!=null)
+			{
+				x+=ElementStyleLayout.LeftWhiteSpace(nodeStyle);
+				y+=ElementStyleLayout.TopWhiteSpace(nodeStyle);
+				nodeContentRect.X+=nodeStyle.MarginLeft;
+				nodeContentRect.Y+=nodeStyle.MarginTop;
+			}
+
+            Size size = this.GetCellLayout().LayoutCells(layoutInfo, x, y);
+
+            node.SetCellsBounds(new Rectangle(x, y, size.Width, size.Height));
+
+			height=size.Height;
+			width+=size.Width;
+
+			nodeContentRect.Width=size.Width;
+			nodeContentRect.Height=size.Height;
+
+			if(nodeStyle!=null)
+			{
+				nodeContentRect.Width+=(ElementStyleLayout.StyleSpacing(nodeStyle,eSpacePart.Padding | eSpacePart.Border,eStyleSide.Left)+
+					ElementStyleLayout.StyleSpacing(nodeStyle,eSpacePart.Padding | eSpacePart.Border,eStyleSide.Right));
+				nodeContentRect.Height+=(ElementStyleLayout.StyleSpacing(nodeStyle,eSpacePart.Padding | eSpacePart.Border,eStyleSide.Top)+
+					ElementStyleLayout.StyleSpacing(nodeStyle,eSpacePart.Padding | eSpacePart.Border,eStyleSide.Bottom));
+
+				width+=(ElementStyleLayout.HorizontalStyleWhiteSpace(nodeStyle));
+				height+=(ElementStyleLayout.VerticalStyleWhiteSpace(nodeStyle));
+			}
+
+            if (!bLeftNode && bHasExpandPart && !this.ReserveExpandPartSpace)
+                width += layoutInfo.ExpandAreaWidth;
+
+			if(bHasCommandPart)
+			{
+                width += this.LayoutSettings.CommandAreaWidth;
+                nodeContentRect.Width += this.LayoutSettings.CommandAreaWidth;
+			}
+
+			nodeRect.Height=height;
+			nodeRect.Width=width;
+			node.SetBounds(nodeRect);
+			node.SetContentBounds(nodeContentRect);
+
+			if(bHasCommandPart)
+				LayoutCommandPart(layoutInfo, nodeStyle);
+			else
+				node.CommandBoundsRelative=Rectangle.Empty;
+
+            if (bHasExpandPart || this.ReserveExpandPartSpace)
+				LayoutExpandPart(layoutInfo,bLeftNode, 0);
+			else
+				node.SetExpandPartRectangle(Rectangle.Empty);
+
+			node.SizeChanged=false;
+
+			// Calculate size and location of node column header if any
+			//if(node.NodesColumnHeaderVisible)
+			{
+				//layoutInfo.Left+=this.NodeLevelOffset;
+				LayoutColumnHeader(layoutInfo);
+				//layoutInfo.Left-=this.NodeLevelOffset;
+			}
+		}
+
+		/// <summary>
+		/// Returns true if given node has expand part.
+		/// </summary>
+		/// <param name="layoutInfo">Layout context information.</param>
+		/// <returns></returns>
+		protected virtual bool HasExpandPart(NodeLayoutContextInfo layoutInfo)
+		{
+			Node node=layoutInfo.ContextNode;
+			if(node.ExpandVisibility==eNodeExpandVisibility.Auto)
+			{
+				if(IsRootNode(node) && !RootHasExpandedPart || !NodeOperations.GetAnyVisibleNodes(node))
+					return false;
+				return true;
+			}
+			else
+				return (node.ExpandVisibility==eNodeExpandVisibility.Visible);
+		}
+
+		/// <summary>
+		/// Returns whether given node has command part.
+		/// </summary>
+		/// <param name="layoutInfo">Layout context information.</param>
+		/// <returns>True if command part should be drawn otherwise false.</returns>
+		protected virtual bool HasCommandPart(NodeLayoutContextInfo layoutInfo)
+		{
+			return layoutInfo.ContextNode.CommandButton;
+		}
+
+		/// <summary>
+		/// Returns true if root node should have expanded part
+		/// </summary>
+		protected virtual bool RootHasExpandedPart
+		{
+			get {return true;}
+		}
+
+		/// <summary>
+		/// Returns true if expand part space should be accounted for even if they expand part is not visible or need to be displayed. Default value is false.
+		/// </summary>
+		protected virtual bool ReserveExpandPartSpace
+		{
+			get
+			{
+				return false;
+			}
+		}
+
+		/// <summary>
+		/// Returns class responsible for cell layout.
+		/// </summary>
+		/// <returns>Cell layout class.</returns>
+		protected internal virtual CellLayout GetCellLayout()
+		{
+            if (m_CellLayout == null)
+                m_CellLayout = new CellLayout(this.LayoutSettings);
+			return m_CellLayout;
+		}
+
+		/// <summary>
+		/// Offsets node location and location of it's child nodes bounds.
+		/// </summary>
+		/// <param name="node">Node to offset.</param>
+		/// <param name="x">Horizontal offset.</param>
+		/// <param name="y">Vertical offset.</param>
+		protected virtual void OffsetNodeLocation(Node node, int x, int y)
+		{
+			node.SetBounds(new Rectangle(node.BoundsRelative.X+x,node.BoundsRelative.Y+y,node.BoundsRelative.Width,node.BoundsRelative.Height));
+			if(node.Expanded)
+				node.ChildNodesBounds=new Rectangle(node.ChildNodesBounds.X+x,node.ChildNodesBounds.Y+y,node.ChildNodesBounds.Width,node.ChildNodesBounds.Height);
+		}
+
+		protected virtual NodeLayoutContextInfo GetDefaultNodeLayoutContextInfo(System.Drawing.Graphics graphics)
+		{
+			NodeLayoutContextInfo layoutInfo=new NodeLayoutContextInfo();
+			layoutInfo.ClientRectangle=m_ClientArea;
+			layoutInfo.DefaultColumns=this.GetDefaultColumnInfo();
+			layoutInfo.ChildColumns=null;
+            layoutInfo.Indent = m_Tree.Indent;
+			layoutInfo.Left=0;
+			layoutInfo.Top=0;
+		    layoutInfo.LeftMargin = m_Tree.BackgroundStyle.PaddingLeft;
+			layoutInfo.DefaultFont=m_Tree.Font;
+			layoutInfo.LeftToRight=(this.LeftRight==System.Windows.Forms.LeftRightAlignment.Left);
+			layoutInfo.Graphics=graphics;
+			layoutInfo.Styles=m_Tree.Styles;
+            layoutInfo.FullRowBackgroundNodes = new ArrayList();
+			if(m_Tree.CellLayout!=eCellLayout.Default)
+				layoutInfo.CellLayout=m_Tree.CellLayout;
+			if(m_Tree.CellPartLayout!=eCellPartLayout.Default)
+				layoutInfo.CellPartLayout=m_Tree.CellPartLayout;
+				
+			if(m_Tree.NodeStyle!=null)
+				layoutInfo.DefaultNodeStyle=m_Tree.NodeStyle;
+
+			if(m_Tree.CellStyleDefault!=null)
+				layoutInfo.DefaultCellStyle=m_Tree.CellStyleDefault;
+			else
+				layoutInfo.DefaultCellStyle=ElementStyle.GetDefaultCellStyle(layoutInfo.DefaultNodeStyle);
+
+			// Determine size of the default Column Header
+			if(m_Tree.ColumnStyleNormal!=null)
+			{
+				ElementStyleLayout.CalculateStyleSize(m_Tree.ColumnStyleNormal,layoutInfo.DefaultFont);
+				layoutInfo.DefaultHeaderSize=m_Tree.ColumnStyleNormal.Size;
+			}
+
+			if(layoutInfo.DefaultHeaderSize.IsEmpty)
+				layoutInfo.DefaultHeaderSize.Height=layoutInfo.DefaultFont.Height+4;
+
+            layoutInfo.ExpandPartWidth = Dpi.Width(this.Tree.ExpandWidth);
+            layoutInfo.View = this.Tree.View;
+            layoutInfo.TileSize = Dpi.Size(this.Tree.TileSize);
+            layoutInfo.ColumnStyle = this.Tree.ColumnStyleNormal;
+		    layoutInfo.ExpandAreaWidth = Dpi.Width(this.LayoutSettings.ExpandAreaWidth);
+			return layoutInfo;
+		}
+
+		protected Node[] GetTopLevelNodes()
+		{
+			if(m_Tree.DisplayRootNode!=null)
+				return new Node[] {m_Tree.DisplayRootNode};
+			else
+			{
+				Node[] nodes=new Node[m_Tree.Nodes.Count];
+				m_Tree.Nodes.CopyTo(nodes);
+				return nodes;
+			}
+		}
+
+		protected bool IsRootNode(Node node)
+		{
+			return NodeOperations.IsRootNode(m_Tree,node);
+		}
+
+		protected virtual void EmptyBoundsUnusedNodes(Node[] topLevelNodes)
+		{
+			if(m_Tree.DisplayRootNode!=null)
+			{
+				Node node=m_Tree.DisplayRootNode.PrevVisibleNode;
+				while(node!=null)
+				{
+					node.SetBounds(Rectangle.Empty);
+					node=node.PrevVisibleNode;
+				}
+				node=m_Tree.DisplayRootNode.NextNode;
+				if(node==null)
+				{
+					node=m_Tree.DisplayRootNode.Parent;
+					while(node!=null)
+					{
+						if(node.NextNode!=null)
+						{
+							node=node.NextNode;
+							break;
+						}
+						else
+							node=node.Parent;
+					}
+				}
+				while(node!=null)
+				{
+					node.SetBounds(Rectangle.Empty);
+					node=node.NextVisibleNode;
+				}
+			}
+			else
+			{
+				for(int i=1;i<topLevelNodes.Length;i++)
+				{
+					topLevelNodes[i].SetBounds(Rectangle.Empty);
+				}
+			}
+		}
+
+        public AdvTree Tree
+        {
+            get { return m_Tree; }
+        }
+
+        
+
+		#region Column Support
+		// Assumes that layoutInfo is up-to-date and that Node that is connected with
+		// columns is already processed and it's size and location calculated.
+		// layoutInfo.Top member reflects the next position below the node
+		// layoutInfo.LevelOffset should reflect the X offset for the child nodes.
+		public void LayoutColumnHeader(NodeLayoutContextInfo layoutInfo)
+		{
+			Node node=layoutInfo.ContextNode;
+
+            if (!node.HasColumns || !node.Expanded)
+            {
+                node.ColumnHeaderHeight = 0;
+                return;
+            }
+            int spacing = 2;
+            int x = layoutInfo.Left + this.NodeLevelOffset + node.NodesIndent;
+			int y=layoutInfo.ContextNode.BoundsRelative.Bottom + spacing;
+
+			bool bLeftNode=(layoutInfo.MapPositionNear && layoutInfo.LeftToRight);
+            int expandPartWidth = layoutInfo.ExpandAreaWidth;
+			int cellPartSpacing=GetCellLayout().CellPartSpacing;
+
+            if (!bLeftNode)
+                x += (expandPartWidth + cellPartSpacing);
+
+            int clientWidth = layoutInfo.ClientRectangle.Width - (layoutInfo.Left + expandPartWidth);
+            if (clientWidth <= 0)
+                clientWidth = layoutInfo.ClientRectangle.Width;
+
+            node.ColumnHeaderHeight = Layout.ColumnHeaderLayout.LayoutColumnHeader(layoutInfo, x, y, clientWidth, this.GetCellLayout().LayoutSettings.CellHorizontalSpacing) + spacing;
+            if (!node.NodesColumnsHeaderVisible)
+                node.ColumnHeaderHeight = 0;
+		}
+
+        private int _NodeLevelOffset = 16;
+        internal int NodeLevelOffset
+        {
+            get { return _NodeLevelOffset; }
+            set
+            {
+                _NodeLevelOffset = value;
+            }
+        }
+		#endregion
+		
+		#region RTL Support
+		public virtual System.Windows.Forms.LeftRightAlignment LeftRight
+		{
+			get {return m_LeftRight;}
+			set {m_LeftRight=value;}
+		}
+		#endregion
+	}
+
+    internal class NodeColumnInfo
+    {
+        /// <summary>
+        /// Initializes a new instance of the NodeColumnInfo structure.
+        /// </summary>
+        /// <param name="columnInfo"></param>
+        /// <param name="hasAutoSizeColumn"></param>
+        public NodeColumnInfo(List<ColumnInfo> columnInfo, bool hasAutoSizeColumn)
+        {
+            ColumnInfo = columnInfo;
+            HasAutoSizeColumn = hasAutoSizeColumn;
+        }
+        /// <summary>
+        /// Gets or sets the list of column info object for the columns.
+        /// </summary>
+        public List<ColumnInfo> ColumnInfo;
+        /// <summary>
+        /// Gets or sets whether columns have auto-size column.
+        /// </summary>
+        public bool HasAutoSizeColumn;
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/Layout/NodeLayoutContextInfo.cs b/PROMS/DotNetBar Source Code/AdvTree/Layout/NodeLayoutContextInfo.cs
new file mode 100644
index 00000000..3e970e5e
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/Layout/NodeLayoutContextInfo.cs	
@@ -0,0 +1,62 @@
+using System;
+using System.Drawing;
+using System.Collections;
+using DevComponents.DotNetBar;
+
+namespace DevComponents.AdvTree.Layout
+{
+	/// <summary>
+	/// Used to pass node contextual information used for layout of the node.
+	/// </summary>
+	internal class NodeLayoutContextInfo
+	{
+		public Node ContextNode=null;
+		public Rectangle ClientRectangle=Rectangle.Empty;
+		public int Left;
+		public int Top;
+	    public int LeftMargin = 0;
+		public NodeColumnInfo DefaultColumns=null;
+        public NodeColumnInfo ChildColumns = null;
+		public ElementStyle DefaultCellStyle=null;
+		public ElementStyle DefaultNodeStyle=null;
+		public Size DefaultHeaderSize=Size.Empty;
+		public bool LeftToRight=true;
+		public bool HasExpandPart=true;
+		public System.Drawing.Graphics Graphics=null;
+		public ElementStyleCollection Styles=null;
+		public eCellLayout CellLayout=eCellLayout.Default;
+		public eCellPartLayout CellPartLayout=eCellPartLayout.Horizontal;
+		public bool MapPositionNear=false;
+        public bool ExpandPartAlignedLeft = false;
+        public ColumnHeaderCollection TreeColumns = null;
+        public ArrayList FullRowBackgroundNodes = null;
+        public int ExpandPartWidth = 0;
+        public int CurrentLineHeight = 0; // Used by tile layout
+        public int CurrentLevelLeft = 0; // Used by tile layout
+        public eView View = eView.Tree; // Current control view
+        public Size TileSize = Size.Empty; // Tile size
+        public bool IsViewGroupping = false; // Tile view grouping enabled
+        public ElementStyle ColumnStyle = null;
+        public int LayoutNodeExpandPartWidth = 0;
+        public int Indent = 0;
+        public int ExpandAreaWidth = 0; // Cached LayoutSettings.ExpandAreaWidth with DPI multipler applied.
+
+        private Font _DefaultFont = null;
+        public Font DefaultFont
+        {
+            get { return _DefaultFont; }
+            set 
+            {
+                if (_DefaultFont != value)
+                {
+                    _DefaultFont = value;
+                    if (_DefaultFont != null)
+                        DefaultFontHeight = _DefaultFont.Height;
+                    else
+                        DefaultFontHeight = 0;
+                }
+            }
+        }
+        public int DefaultFontHeight = 0;
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/Layout/NodeTileLayout.cs b/PROMS/DotNetBar Source Code/AdvTree/Layout/NodeTileLayout.cs
new file mode 100644
index 00000000..9a02205a
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/Layout/NodeTileLayout.cs	
@@ -0,0 +1,393 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Drawing.Text;
+
+namespace DevComponents.AdvTree.Layout
+{
+    /// <summary>
+    /// Performs ListView Tile style layout.
+    /// </summary>
+    internal class NodeTileLayout : NodeLayout
+    {
+        public NodeTileLayout(AdvTree treeControl, Rectangle clientArea, LayoutSettings layoutSettings)
+            : base(treeControl, clientArea, layoutSettings)
+		{
+		}
+
+        public override void UpdateTopLevelColumnsWidth()
+        {
+            // Columns are not visible in tile layout
+            this.Tree.Columns.SetBounds(Rectangle.Empty);
+        }
+
+        /// <summary>
+        /// Returns default top-level columns for tree control.
+        /// </summary>
+        /// <returns>Returns array list of ColumnInfo objects.</returns>
+        protected override NodeColumnInfo GetDefaultColumnInfo()
+        {
+            // There are no columns in Tile view
+            List<ColumnInfo> ci = new List<ColumnInfo>();
+            NodeColumnInfo info = new NodeColumnInfo(ci, false);
+            return info;
+        }
+
+        protected override NodeLayoutContextInfo GetDefaultNodeLayoutContextInfo(System.Drawing.Graphics graphics)
+        {
+            NodeLayoutContextInfo context = base.GetDefaultNodeLayoutContextInfo(graphics);
+            context.IsViewGroupping = this.Groupping;
+            return context;
+        }
+
+		public override void PerformLayout()
+		{
+			this.PrepareStyles();
+            Rectangle area = Rectangle.Empty;
+			Graphics g=this.GetGraphics();
+            SmoothingMode sm = g.SmoothingMode;
+            TextRenderingHint th = g.TextRenderingHint;
+            if (m_Tree.AntiAlias)
+            {
+                g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.AntiAlias;
+            }
+
+            NodeLayoutContextInfo layoutInfo = GetDefaultNodeLayoutContextInfo(g);
+            layoutInfo.ExpandPartAlignedLeft = true;
+            layoutInfo.Left = ClientArea.X;
+            layoutInfo.Top = ClientArea.Y;
+
+            CellLayout cellLayout = this.GetCellLayout();
+            cellLayout.ResetCheckBoxSize();
+            if (this.Tree.CheckBoxImageChecked != null)
+                cellLayout.CheckBoxSize = this.Tree.CheckBoxImageChecked.Size;
+
+            LayoutTopLevelColumns(layoutInfo);
+
+            // Get default Columns
+            NodeColumnInfo defaultColInfoList = this.GetDefaultColumnInfo();
+            layoutInfo.DefaultColumns = defaultColInfoList;
+			try
+			{
+				// Loop through each top-level node
+				Node[] topLevelNodes=this.GetTopLevelNodes();
+                int defaultTop = layoutInfo.Top;
+                area = ProcessTopLevelNodes(area, layoutInfo, topLevelNodes);
+
+                //if (defaultColInfoList.HasAutoSizeColumn)
+                //{
+                //    foreach (ColumnInfo columnInfo in defaultColInfoList.ColumnInfo)
+                //    {
+                //        if (columnInfo.AutoSize)
+                //        {
+                //            columnInfo.AutoSize = false;
+                //            columnInfo.Width = columnInfo.MaxWidth;
+                //            columnInfo.ColumnHeader.Width.SetAutoSizeWidth(columnInfo.MaxWidth);
+                //            columnInfo.MaxWidth = 0;
+                //        }
+                //    }
+                //    layoutInfo.ContextNode = null;
+                //    LayoutTopLevelColumns(layoutInfo);
+                //    layoutInfo.Top = defaultTop;
+                //    area = ProcessTopLevelNodes(Rectangle.Empty, layoutInfo, topLevelNodes);
+                //}
+			}
+			finally
+			{
+                if (m_Tree.AntiAlias)
+                {
+                    g.SmoothingMode = sm;
+                    //g.TextRenderingHint = th;
+                }
+
+				if(this.DisposeGraphics)
+					g.Dispose();
+			}
+            if (layoutInfo.FullRowBackgroundNodes.Count > 0)
+                Tree.FullRowBackgroundNodes = layoutInfo.FullRowBackgroundNodes;
+            else
+                Tree.FullRowBackgroundNodes = null;
+
+            m_Width = area.Width;
+		    m_Height = area.Height;
+		}
+
+        private void LayoutTopLevelColumns(NodeLayoutContextInfo layoutInfo)
+        {
+            // There are no columns in Tile view
+            this.Tree.SetColumnHeaderControlVisibility(false);
+        }
+
+        private Rectangle ProcessTopLevelNodes(Rectangle area, NodeLayoutContextInfo layoutInfo, Node[] topLevelNodes)
+        {
+            layoutInfo.CurrentLevelLeft = layoutInfo.Left;
+            bool isPreviousGroupNode = false;
+            foreach (Node childNode in topLevelNodes)
+            {
+                layoutInfo.ContextNode = childNode;
+                if (childNode.Visible)
+                {
+                    if (_Groupping && childNode.HasChildNodes)
+                    {
+                        if (layoutInfo.CurrentLineHeight > 0)
+                            layoutInfo.Top += layoutInfo.CurrentLineHeight + this.LayoutSettings.NodeVerticalSpacing;
+                        layoutInfo.CurrentLineHeight = 0;
+                        layoutInfo.Left = layoutInfo.CurrentLevelLeft;
+                        isPreviousGroupNode = true;
+                    }
+                    else
+                    {
+                        if (isPreviousGroupNode)
+                        {
+                            if (layoutInfo.CurrentLineHeight > 0)
+                                layoutInfo.Top += layoutInfo.CurrentLineHeight + this.LayoutSettings.NodeVerticalSpacing;
+                            layoutInfo.CurrentLineHeight = 0;
+                            layoutInfo.Left = layoutInfo.CurrentLevelLeft;
+                        }
+                        isPreviousGroupNode = false;
+                    }
+                }
+
+                ProcessNode(layoutInfo);
+
+                if (childNode.Visible)
+                {
+                    area = Rectangle.Union(area, childNode.BoundsRelative);
+                    if (childNode.Expanded && childNode.HasChildNodes)
+                        area = Rectangle.Union(area, childNode.ChildNodesBounds);
+                    if (!(_Groupping && childNode.HasChildNodes))
+                        layoutInfo.Left += childNode.BoundsRelative.Width + this.LayoutSettings.NodeHorizontalSpacing;
+                }
+            }
+            return area;
+        }
+
+        private Rectangle ProcessChildNodes(NodeLayoutContextInfo layoutInfo, Node node, int nodeVerticalSpacing, NodeColumnInfo childColumns)
+        {
+            Rectangle childNodesBounds = new Rectangle(layoutInfo.Left, layoutInfo.Top, 0, 0);
+            bool isPreviousGroupNode = false;
+
+            foreach (Node childNode in node.Nodes)
+            {
+                if (!childNode.Visible) continue;
+
+                if (_Groupping && childNode.HasChildNodes)
+                {
+                    if (layoutInfo.CurrentLineHeight > 0)
+                        layoutInfo.Top += layoutInfo.CurrentLineHeight + this.LayoutSettings.NodeVerticalSpacing;
+                    layoutInfo.CurrentLineHeight = 0;
+                    layoutInfo.Left = layoutInfo.CurrentLevelLeft;
+                    isPreviousGroupNode = true;
+                }
+                else
+                {
+                    if (isPreviousGroupNode)
+                    {
+                        if (layoutInfo.CurrentLineHeight > 0)
+                            layoutInfo.Top += layoutInfo.CurrentLineHeight + this.LayoutSettings.NodeVerticalSpacing;
+                        layoutInfo.CurrentLineHeight = 0;
+                        layoutInfo.Left = layoutInfo.CurrentLevelLeft;
+                        isPreviousGroupNode = false;
+                    }
+                }
+
+                layoutInfo.ContextNode = childNode;
+                layoutInfo.ChildColumns = childColumns;
+                ProcessNode(layoutInfo);
+
+                if (!(_Groupping && childNode.HasChildNodes))
+                    layoutInfo.Left += childNode.BoundsRelative.Width + this.LayoutSettings.NodeHorizontalSpacing;
+                if (isPreviousGroupNode)
+                {
+                    childNodesBounds.Width = Math.Max(childNodesBounds.Width,
+                        Math.Max(childNode.BoundsRelative.Width, (childNode.Expanded && childNode.ChildNodesBounds.Width > 0 ? childNode.ChildNodesBounds.Right - childNodesBounds.X : 0)));
+                     childNodesBounds.Height += childNode.BoundsRelative.Height + (childNode.Expanded ? childNode.ChildNodesBounds.Height + childNode.ColumnHeaderHeight : 0) + nodeVerticalSpacing;
+                }
+                else
+                {
+                    childNodesBounds = Rectangle.Union(childNodesBounds, childNode.BoundsRelative);
+                    childNodesBounds.Height += nodeVerticalSpacing;
+                }
+            }
+            return childNodesBounds;
+        }
+
+
+		#region Node routines
+		private void ProcessNode(NodeLayoutContextInfo layoutInfo)
+		{
+			Node node=layoutInfo.ContextNode;
+            if (!node.Visible || node.Cells.Count == 0) return;
+
+            if (node.SizeChanged || _Groupping && node.HasChildNodes)
+            {
+                // Calculate size of the node itself...
+                LayoutNode(layoutInfo);
+            }
+            if (node.FullRowBackground)
+                layoutInfo.FullRowBackgroundNodes.Add(node);
+
+            // Position the node
+            if (_Groupping && node.HasChildNodes)
+            {
+                if (layoutInfo.CurrentLineHeight > 0)
+                    layoutInfo.Top += layoutInfo.CurrentLineHeight + this.LayoutSettings.NodeVerticalSpacing;
+                layoutInfo.CurrentLineHeight = 0;
+            }
+            else
+            {
+                if (layoutInfo.Left + node.BoundsRelative.Width > this.ClientArea.Right)
+                {
+                    layoutInfo.Left = layoutInfo.CurrentLevelLeft;
+                    layoutInfo.Top += layoutInfo.CurrentLineHeight + this.LayoutSettings.NodeVerticalSpacing;
+                    layoutInfo.CurrentLineHeight = 0;
+                }
+            }
+            layoutInfo.CurrentLineHeight = Math.Max(layoutInfo.CurrentLineHeight, node.BoundsRelative.Height);
+
+            if (node.BoundsRelative.X != layoutInfo.Left || node.BoundsRelative.Y != layoutInfo.Top)
+            {
+                // Adjust top position
+                node.SetBounds(new Rectangle(layoutInfo.Left,layoutInfo.Top,node.BoundsRelative.Width,node.BoundsRelative.Height));
+            }
+
+            // Position the node
+            if (_Groupping && node.HasChildNodes)
+            {
+                if (layoutInfo.CurrentLineHeight > 0)
+                    layoutInfo.Top += layoutInfo.CurrentLineHeight + this.LayoutSettings.NodeVerticalSpacing;
+                layoutInfo.CurrentLineHeight = 0;
+            }
+
+            int nodeVerticalSpacing = this.LayoutSettings.NodeVerticalSpacing;
+			// Need to set the Top position properly
+            //layoutInfo.Top += (node.BoundsRelative.Height + nodeVerticalSpacing);
+            // No columns in tile view
+            //if (DevComponents.AdvTree.Display.NodeDisplay.HasColumnsVisible(node))
+            //    layoutInfo.Top += node.ColumnHeaderHeight;
+
+			if(_Groupping && node.HasChildNodes && node.Expanded)
+			{
+				int originalLevelOffset=layoutInfo.Left;
+                int originalLevelLeft = layoutInfo.CurrentLevelLeft;
+                int childNodesTop = layoutInfo.Top;
+                layoutInfo.Left += this.NodeLevelOffset + node.NodesIndent;
+                layoutInfo.CurrentLevelLeft = layoutInfo.Left;
+                NodeColumnInfo parentColumns = layoutInfo.ChildColumns;
+                NodeColumnInfo childColumns = GetNodeColumnInfo(node);
+                Rectangle childNodesBounds = ProcessChildNodes(layoutInfo, node, nodeVerticalSpacing, childColumns);
+
+                //if (childColumns != null && childColumns.HasAutoSizeColumn)
+                //{
+                //    foreach (ColumnInfo columnInfo in childColumns.ColumnInfo)
+                //    {
+                //        if (columnInfo.AutoSize)
+                //        {
+                //            columnInfo.Width = columnInfo.MaxWidth;
+                //            columnInfo.ColumnHeader.Width.SetAutoSizeWidth(columnInfo.MaxWidth);
+                //            columnInfo.AutoSize = false;
+                //            columnInfo.MaxWidth = 0;
+                //        }
+                //    }
+                //    layoutInfo.Top = originalTop;
+                //    layoutInfo.Left = originalLevelOffset;
+                //    layoutInfo.ContextNode = node;
+                //    layoutInfo.ChildColumns = null;
+                //    LayoutNode(layoutInfo);
+                //    layoutInfo.Top = childNodesTop;
+                //    layoutInfo.Left += this.NodeLevelOffset + node.NodesIndent;
+                //    childNodesBounds = ProcessChildNodes(layoutInfo, node, nodeVerticalSpacing, childColumns);
+                //}
+
+                node.ChildNodesBounds = childNodesBounds;
+
+				layoutInfo.ChildColumns=parentColumns;
+
+				layoutInfo.ContextNode=node;
+				layoutInfo.Left=originalLevelOffset;
+                layoutInfo.CurrentLevelLeft = originalLevelLeft;
+			}
+            else
+                node.ChildNodesBounds = Rectangle.Empty;
+		}
+
+		/// <summary>
+		/// Gets whether the expand part of the node +/- is aligned to the left of the node in left-to-right layout.
+		/// </summary>
+		/// <param name="node">Node to get expand part alignment for</param>
+		/// <returns>true if node expand part is aligned to the left in left-to-right layout.</returns>
+		private bool ExpandPartAlignedNear(Node node)
+		{
+			return true; // If changed LayoutExpandPart needs to be updated as well
+		}
+
+        /// <summary>
+        /// Returns column information for a given node.
+        /// </summary>
+        /// <param name="node">Node to return column information for</param>
+        /// <returns>Returns array list of ColumnInfo objects or null if there are no columns defined.</returns>
+        protected override NodeColumnInfo GetNodeColumnInfo(Node node)
+        {
+            // No columns in tile-view
+            return null;
+        }
+
+        /// <summary>
+        /// Returns true if expand part space should be accounted for even if they expand part is not visible or need to be displayed. Default value is false.
+        /// </summary>
+        protected override bool ReserveExpandPartSpace
+        {
+            get
+            {
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// Returns true if given node has expand part.
+        /// </summary>
+        /// <param name="layoutInfo">Layout context information.</param>
+        /// <returns></returns>
+        protected override bool HasExpandPart(NodeLayoutContextInfo layoutInfo)
+        {
+            Node node = layoutInfo.ContextNode;
+            if (node.ExpandVisibility == eNodeExpandVisibility.Auto)
+            {
+                if (!_Groupping || !NodeOperations.GetAnyVisibleNodes(node))
+                    return false;
+                return true;
+            }
+            else
+                return (node.ExpandVisibility == eNodeExpandVisibility.Visible);
+        }
+
+
+        private bool _Groupping = true;
+        /// <summary>
+        /// Gets or sets whether parent/child node relationship is displayed as groups.
+        /// </summary>
+        public bool Groupping
+        {
+            get { return _Groupping; }
+            set
+            {
+                _Groupping = value;
+            }
+        }
+
+        private CellTileLayout _CellLayout = null;
+        /// <summary>
+        /// Returns class responsible for cell layout.
+        /// </summary>
+        /// <returns>Cell layout class.</returns>
+        protected internal override CellLayout GetCellLayout()
+        {
+            if (_CellLayout == null)
+                _CellLayout = new CellTileLayout(this.LayoutSettings);
+            return _CellLayout;
+        }
+		#endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/Layout/NodeTreeLayout.cs b/PROMS/DotNetBar Source Code/AdvTree/Layout/NodeTreeLayout.cs
new file mode 100644
index 00000000..e800c105
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/Layout/NodeTreeLayout.cs	
@@ -0,0 +1,328 @@
+using System.Collections;
+using System.Drawing;
+using System.Windows.Forms;
+using System;
+using System.Drawing.Drawing2D;
+using System.Drawing.Text;
+using DevComponents.DotNetBar;
+
+namespace DevComponents.AdvTree.Layout
+{
+	/// <summary>
+	/// Performs classic TreeView layout.
+	/// </summary>
+	internal class NodeTreeLayout:NodeLayout
+	{
+        public NodeTreeLayout(AdvTree treeControl, Rectangle clientArea, LayoutSettings layoutSettings)
+            : base(treeControl, clientArea, layoutSettings)
+		{
+		}
+
+        public override void UpdateTopLevelColumnsWidth()
+        {
+            if (this.Tree.Columns.Count > 0)
+            {
+                Rectangle columnsBounds = DevComponents.DotNetBar.ElementStyleLayout.GetInnerRect(this.Tree.BackgroundStyle, this.Tree.ClientRectangle);
+                if (this.Tree.VScrollBar != null) columnsBounds.Width -= this.Tree.VScrollBar.Width;
+                columnsBounds.Height = this.Tree.Columns.Bounds.Height;
+                if(this.Tree.Columns.Bounds.Width<columnsBounds.Width)
+                    this.Tree.Columns.SetBounds(columnsBounds);
+            }
+        }
+
+		public override void PerformLayout()
+		{
+			this.PrepareStyles();
+            Rectangle area = Rectangle.Empty;
+			Graphics g=this.GetGraphics();
+            SmoothingMode sm = g.SmoothingMode;
+            TextRenderingHint th = g.TextRenderingHint;
+            if (m_Tree.AntiAlias)
+            {
+                g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.AntiAlias;
+                //g.TextRenderingHint = DisplayHelp.AntiAliasTextRenderingHint;
+            }
+
+            NodeLayoutContextInfo layoutInfo = GetDefaultNodeLayoutContextInfo(g);
+            layoutInfo.ExpandPartAlignedLeft = true;
+            layoutInfo.Left = ClientArea.X;
+            layoutInfo.Top = ClientArea.Y;
+
+            CellLayout cellLayout = this.GetCellLayout();
+            cellLayout.ResetCheckBoxSize();
+            if (this.Tree.CheckBoxImageChecked != null)
+                cellLayout.CheckBoxSize = this.Tree.CheckBoxImageChecked.Size;
+
+            LayoutTopLevelColumns(layoutInfo);
+
+            // Get default Columns
+            NodeColumnInfo defaultColInfoList = this.GetDefaultColumnInfo();
+            layoutInfo.DefaultColumns = defaultColInfoList;
+			try
+			{
+				// Loop through each top-level node
+				Node[] topLevelNodes=this.GetTopLevelNodes();
+                int defaultTop = layoutInfo.Top;
+                area = ProcessTopLevelNodes(area, layoutInfo, topLevelNodes);
+                bool hasMinColumnAutoSizeWidth = false;
+                bool hasStretchToFillColumn = false;
+                if (defaultColInfoList.HasAutoSizeColumn)
+                {
+                    foreach (ColumnInfo columnInfo in defaultColInfoList.ColumnInfo)
+                    {
+                        if (columnInfo.AutoSize)
+                        {
+                            columnInfo.AutoSize = false;
+                            //if (columnInfo.ColumnHeader.Width.AutoSizeMinHeader)
+                            //{
+                            //    columnInfo.Width = Math.Max(columnInfo.MaxWidth, columnInfo.Width);
+                            //    columnInfo.MaxWidth = Math.Max(columnInfo.MaxWidth, columnInfo.Width);
+                            //}
+                            //else
+                                columnInfo.Width = columnInfo.MaxWidth;
+                            columnInfo.ColumnHeader.Width.SetAutoSizeWidth(columnInfo.MaxWidth);
+                            columnInfo.MaxWidth = 0;
+                            if (columnInfo.ColumnHeader.Width.AutoSizeMinHeader)
+                                hasMinColumnAutoSizeWidth = true;
+                            if (columnInfo.ColumnHeader.StretchToFill)
+                                hasStretchToFillColumn = true;
+                        }
+                    }
+                    layoutInfo.ContextNode = null;
+                    LayoutTopLevelColumns(layoutInfo);
+                    // Adjust the of auto sized columns in case minimum header width is used
+                    if (hasMinColumnAutoSizeWidth || hasStretchToFillColumn)
+                    {
+                        foreach (ColumnInfo columnInfo in defaultColInfoList.ColumnInfo)
+                        {
+                            if (columnInfo.ColumnHeader.Width.AutoSize && columnInfo.ColumnHeader.Width.AutoSizeMinHeader || columnInfo.ColumnHeader.StretchToFill)
+                            {
+                                columnInfo.Width = columnInfo.ColumnHeader.Bounds.Width;
+                            }
+                        }
+                    }
+
+                    layoutInfo.Top = defaultTop;
+                    area = ProcessTopLevelNodes(Rectangle.Empty, layoutInfo, topLevelNodes);
+                }
+			}
+			finally
+			{
+                if (m_Tree.AntiAlias)
+                {
+                    g.SmoothingMode = sm;
+                    //g.TextRenderingHint = th;
+                }
+
+				if(this.DisposeGraphics)
+					g.Dispose();
+			}
+            if (layoutInfo.FullRowBackgroundNodes.Count > 0)
+                Tree.FullRowBackgroundNodes = layoutInfo.FullRowBackgroundNodes;
+            else
+                Tree.FullRowBackgroundNodes = null;
+            //if (columnsVisible && layoutInfo.DefaultColumns != null && layoutInfo.DefaultColumns.Count > 0)
+            //{
+            //    bool layoutColumns = false;
+            //    for (int i = 0; i < layoutInfo.DefaultColumns.Count; i++)
+            //    {
+            //        ColumnInfo ci = (ColumnInfo)layoutInfo.DefaultColumns[i];
+            //        if (ci.Width == 0 && ci.MaxWidth > 0)
+            //        {
+            //            ci.ColumnHeader.ContentWidth = ci.MaxWidth;
+            //            layoutColumns = true;
+            //        }
+            //    }
+            //    if (layoutColumns)
+            //    {
+            //        layoutInfo.ContextNode = null;
+            //        layoutInfo.TreeColumns = this.Tree.Columns;
+            //        Layout.ColumnHeaderLayout.LayoutColumnHeader(layoutInfo, ClientArea.X,
+            //        ClientArea.Y, ClientArea.Width, this.GetCellLayout().CellHorizontalSpacing);
+            //    }
+            //}
+
+            m_Width = area.Width;
+            m_Height = area.Height;
+		}
+
+        private void LayoutTopLevelColumns(NodeLayoutContextInfo layoutInfo)
+        {
+            // Layout tree columns
+            if (this.Tree.Columns.Count > 0)
+            {
+                Rectangle columnsBounds = m_ClientArea;// DevComponents.DotNetBar.ElementStyleLayout.GetInnerRect(this.Tree.BackgroundStyle, this.Tree.ClientRectangle);
+                //if (this.Tree.VScrollBar != null) columnsBounds.Width -= this.Tree.VScrollBar.Width;
+                layoutInfo.TreeColumns = this.Tree.Columns;
+                int columnHeight = Layout.ColumnHeaderLayout.LayoutColumnHeader(layoutInfo, 0,
+                    0, columnsBounds.Width, this.GetCellLayout().LayoutSettings.CellHorizontalSpacing);
+                columnHeight += this.LayoutSettings.NodeVerticalSpacing;
+                if (this.Tree.ColumnsVisible)
+                {
+                    Rectangle headerBounds = layoutInfo.TreeColumns.Bounds;
+                    if (headerBounds.Width > 0 && headerBounds.Width < columnsBounds.Width)
+                    {
+                        headerBounds.Width = columnsBounds.Width;
+                        layoutInfo.TreeColumns.SetBounds(headerBounds);
+                    }
+                    layoutInfo.Top += columnHeight;
+                    this.Tree.SetColumnHeaderControlVisibility(true);
+                }
+                else
+                    this.Tree.SetColumnHeaderControlVisibility(false);
+                layoutInfo.TreeColumns = null;
+            }
+            else
+                this.Tree.SetColumnHeaderControlVisibility(false);
+        }
+
+        private Rectangle ProcessTopLevelNodes(Rectangle area, NodeLayoutContextInfo layoutInfo, Node[] topLevelNodes)
+        {
+            foreach (Node childNode in topLevelNodes)
+            {
+                layoutInfo.ContextNode = childNode;
+                ProcessNode(layoutInfo);
+                if (childNode.Visible)
+                {
+                    area = Rectangle.Union(area, childNode.BoundsRelative);
+                    if (childNode.Expanded)
+                        area = Rectangle.Union(area, childNode.ChildNodesBounds);
+                }
+            }
+            return area;
+        }
+
+		#region Node routines
+		private void ProcessNode(NodeLayoutContextInfo layoutInfo)
+		{
+			Node node=layoutInfo.ContextNode;
+            if (!node.Visible) return;
+
+            int originalTop = layoutInfo.Top;
+
+            if (node.SizeChanged || node.HasColumns || layoutInfo.DefaultColumns!=null && layoutInfo.DefaultColumns.HasAutoSizeColumn || layoutInfo.ChildColumns!=null && layoutInfo.ChildColumns.HasAutoSizeColumn)
+            {
+                // Calculate size of the node itself...
+                LayoutNode(layoutInfo);
+            }
+            if (node.FullRowBackground)
+                layoutInfo.FullRowBackgroundNodes.Add(node);
+
+            if (node.BoundsRelative.X != layoutInfo.Left || node.BoundsRelative.Y != layoutInfo.Top)
+            {
+                // Adjust top position
+                node.SetBounds(new Rectangle(layoutInfo.Left,layoutInfo.Top,node.BoundsRelative.Width,node.BoundsRelative.Height));
+                //foreach(Cell c in node.Cells)
+                //    c.SetBounds(new Rectangle(c.BoundsRelative.X + layoutInfo.Left, c.BoundsRelative.Y+layoutInfo.Top, c.BoundsRelative.Width, c.BoundsRelative.Height));
+            }
+
+            int nodeVerticalSpacing = this.LayoutSettings.NodeVerticalSpacing;
+			// Need to set the Top position properly
+            layoutInfo.Top += (node.BoundsRelative.Height + nodeVerticalSpacing);
+            if (DevComponents.AdvTree.Display.NodeDisplay.HasColumnsVisible(node))
+                layoutInfo.Top += node.ColumnHeaderHeight;
+			
+			if(node.Expanded)
+			{
+				int originalLevelOffset=layoutInfo.Left;
+                int childNodesTop = layoutInfo.Top;
+                layoutInfo.Left += this.NodeLevelOffset + node.NodesIndent;
+                NodeColumnInfo parentColumns = layoutInfo.ChildColumns;
+                NodeColumnInfo childColumns = GetNodeColumnInfo(node);
+                Rectangle childNodesBounds = ProcessChildNodes(layoutInfo, node, nodeVerticalSpacing, childColumns);
+
+                if (childColumns != null && childColumns.HasAutoSizeColumn)
+                {
+                    bool hasMinColumnAutoSizeWidth = false;
+                    foreach (ColumnInfo columnInfo in childColumns.ColumnInfo)
+                    {
+                        if (columnInfo.AutoSize)
+                        {
+                            columnInfo.Width = columnInfo.MaxWidth;
+                            columnInfo.ColumnHeader.Width.SetAutoSizeWidth(columnInfo.MaxWidth);
+                            columnInfo.AutoSize = false;
+                            columnInfo.MaxWidth = 0;
+                            if (columnInfo.ColumnHeader.Width.AutoSizeMinHeader)
+                                hasMinColumnAutoSizeWidth = true;
+                        }
+                    }
+                    layoutInfo.Top = originalTop;
+                    layoutInfo.Left = originalLevelOffset;
+                    layoutInfo.ContextNode = node;
+                    layoutInfo.ChildColumns = parentColumns;
+                    LayoutNode(layoutInfo);
+                    layoutInfo.Top = childNodesTop;
+                    layoutInfo.Left += this.NodeLevelOffset + node.NodesIndent;
+
+                    // Adjust the of auto sized columns in case minimum header width is used
+                    if (hasMinColumnAutoSizeWidth)
+                    {
+                        foreach (ColumnInfo columnInfo in childColumns.ColumnInfo)
+                        {
+                            if (columnInfo.ColumnHeader.Width.AutoSize && columnInfo.ColumnHeader.Width.AutoSizeMinHeader)
+                            {
+                                columnInfo.Width = columnInfo.ColumnHeader.Bounds.Width;
+                            }
+                        }
+                    }
+
+                    childNodesBounds = ProcessChildNodes(layoutInfo, node, nodeVerticalSpacing, childColumns);
+                }
+
+                node.ChildNodesBounds = childNodesBounds;
+
+				layoutInfo.ChildColumns=parentColumns;
+
+				layoutInfo.ContextNode=node;
+				layoutInfo.Left=originalLevelOffset;
+			}
+		}
+
+        private Rectangle ProcessChildNodes(NodeLayoutContextInfo layoutInfo, Node node, int nodeVerticalSpacing, NodeColumnInfo childColumns)
+        {
+            Rectangle childNodesBounds = new Rectangle(layoutInfo.Left, layoutInfo.Top, 0, 0);
+
+            foreach (Node childNode in node.Nodes)
+            {
+                if (!childNode.Visible) continue;
+                layoutInfo.ContextNode = childNode;
+                layoutInfo.ChildColumns = childColumns;
+                ProcessNode(layoutInfo);
+                childNodesBounds.Width = Math.Max(childNodesBounds.Width,
+                    Math.Max(childNode.BoundsRelative.Width, (childNode.Expanded && childNode.ChildNodesBounds.Width > 0 ? childNode.ChildNodesBounds.Right - childNodesBounds.X : 0)));
+                childNodesBounds.Height += childNode.BoundsRelative.Height + (childNode.Expanded ? childNode.ChildNodesBounds.Height + childNode.ColumnHeaderHeight : 0) + nodeVerticalSpacing;
+            }
+            return childNodesBounds;
+        }
+
+		/// <summary>
+		/// Returns true if expand part space should be accounted for even if they expand part is not visible or need to be displayed. Default value is false.
+		/// </summary>
+		protected override bool ReserveExpandPartSpace
+		{
+			get
+			{
+				return true;
+			}
+		}
+
+		/// <summary>
+		/// Gets whether the expand part of the node +/- is aligned to the left of the node in left-to-right layout.
+		/// </summary>
+		/// <param name="node">Node to get expand part alignment for</param>
+		/// <returns>true if node expand part is aligned to the left in left-to-right layout.</returns>
+		private bool ExpandPartAlignedNear(Node node)
+		{
+			return true; // If changed LayoutExpandPart needs to be updated as well
+		}
+
+//		private NodeCollection GetTopLevelNodes()
+//		{
+//			return m_Tree.Nodes;
+//		}
+
+        
+
+		#endregion
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/Node.cs b/PROMS/DotNetBar Source Code/AdvTree/Node.cs
new file mode 100644
index 00000000..363daf9a
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/Node.cs	
@@ -0,0 +1,3227 @@
+using System;
+using System.Drawing;
+using System.ComponentModel;
+using System.Windows.Forms;
+using DevComponents.AdvTree.Display;
+using DevComponents.DotNetBar;
+
+namespace DevComponents.AdvTree
+{
+    /// <summary>
+    /// Represents the Node in Tree control.
+    /// </summary>
+    [DesignTimeVisible(false), ToolboxItem(false), Designer("DevComponents.AdvTree.Design.NodeDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+    public class Node : Component, IComparable
+    {
+        #region Events
+        /// <summary>
+        /// Occurs when the mouse pointer is over the node and a mouse button is pressed.
+        /// </summary>
+        public event MouseEventHandler NodeMouseDown;
+
+        /// <summary>
+        /// Occurs when the mouse pointer is over the node and a mouse button is released.
+        /// </summary>
+        public event MouseEventHandler NodeMouseUp;
+
+        /// <summary>
+        /// Occurs when the mouse pointer is moved over the node.
+        /// </summary>
+        public event MouseEventHandler NodeMouseMove;
+
+        /// <summary>
+        /// Occurs when the mouse enters the node.
+        /// </summary>
+        public event EventHandler NodeMouseEnter;
+
+        /// <summary>
+        /// Occurs when the mouse leaves the node.
+        /// </summary>
+        public event EventHandler NodeMouseLeave;
+
+        /// <summary>
+        /// Occurs when the mouse hovers over the node.
+        /// </summary>
+        public event EventHandler NodeMouseHover;
+
+        /// <summary>
+        /// Occurs when the node is clicked with left mouse button. If you need to know more information like if another mouse button is clicked etc. use
+        /// NodeMouseDown event.
+        /// </summary>
+        public event EventHandler NodeClick;
+
+        /// <summary>
+        /// Occurs when the node is double-clicked.
+        /// </summary>
+        public event EventHandler NodeDoubleClick;
+
+        /// <summary>
+        /// Occurs when hyperlink in text-markup is clicked.
+        /// </summary>
+        public event MarkupLinkClickEventHandler MarkupLinkClick;
+        #endregion
+
+        #region Private Variables
+        private Rectangle m_BoundsRelative = Rectangle.Empty;
+        private Rectangle m_ChildNodesBounds = Rectangle.Empty;
+        private Rectangle m_CellsBounds = Rectangle.Empty;
+        private Rectangle m_ContentBounds = Rectangle.Empty;
+        private Rectangle m_CommandBoundsRelative = Rectangle.Empty;
+        private NodeCollection m_Nodes = null;
+        //private LinkedNodesCollection m_LinkedNodes=null;
+        private CellCollection m_Cells = new CellCollection();
+        //private string m_Header="";
+        private ColumnHeaderCollection m_NodesColumns;
+        //private bool m_NodesColumnHeaderVisible=true;
+        private object m_Tag = null;
+        private object m_DataKey = null;
+        private string m_Text = "";
+        private bool m_Expanded = false;
+        private eNodeExpandVisibility m_ExpandVisibility = eNodeExpandVisibility.Auto;
+        private Rectangle m_ExpandPartRectangle = Rectangle.Empty;
+        private Node m_Parent = null;
+
+        private ElementStyle m_StyleExpanded = null;
+        private ElementStyle m_StyleSelected = null;
+        private ElementStyle m_StyleMouseOver = null;
+        private bool m_SizeChanged = true;
+        //private eNodeHeaderVisibility m_HeaderVisibility=eNodeHeaderVisibility.Automatic;
+        private int m_ColumnHeaderHeight = 0;
+        private eMapPosition m_MapSubRootPosition = eMapPosition.Default;
+        private int m_Offset = 0;
+        internal AdvTree internalTreeControl = null;
+        private ElementStyle m_Style = null;
+        private eMouseOverNodePart m_MouseOverNodePart = eMouseOverNodePart.None;
+        private NodeConnector m_ParentConnector = null;
+        private eCellLayout m_CellLayout = eCellLayout.Default;
+        private bool m_Visible = true;
+        private bool m_CommandButton = false;
+        private bool m_Editing = false;
+        private bool m_DragDropEnabled = true;
+        private string m_Name = "";
+        private ConnectorPointsCollection m_ParentConnectorPoints = null;
+        private bool m_SelectedConnectorMarker = false;
+        private eNodeRenderMode m_RenderMode = eNodeRenderMode.Default;
+        private TreeRenderer m_NodeRenderer = null;
+        private object m_ContextMenu = null;
+        #endregion
+
+        #region Constructor
+        /// <summary>Default Constructor.</summary>
+        public Node()
+        {
+            m_Cells.SetParentNode(this);
+            m_ParentConnectorPoints = new ConnectorPointsCollection();
+            m_ParentConnectorPoints.SetParentNode(this);
+
+            Cell defaultCell = new Cell();
+            this.Cells.Add(defaultCell);
+        }
+        /// <summary>
+        /// Creates node and initializes its text.
+        /// </summary>
+        public Node(string text)
+            : this()
+        {
+            this.Text = text;
+        }
+
+        /// <summary>
+        /// Creates node and initializes its text and Style property.
+        /// </summary>
+        public Node(string text, ElementStyle nodeStyle)
+            : this()
+        {
+            this.Text = text;
+            this.Style = nodeStyle;
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                if (m_Nodes != null)
+                {
+                    Node[] nodes = new Node[m_Nodes.Count];
+                    m_Nodes.CopyTo(nodes);
+                    foreach (Node node in nodes)
+                        node.Dispose();
+                    //m_Nodes.Clear();
+                }
+                foreach (Cell cell in this.Cells)
+                {
+                    cell.Dispose();
+                }
+                //this.Cells.Clear();
+
+                if (m_Style != null)
+                    m_Style.StyleChanged -= new EventHandler(this.ElementStyleChanged);
+                if (m_StyleSelected != null)
+                    m_StyleSelected.StyleChanged -= new EventHandler(this.ElementStyleChanged);
+                if (m_StyleExpanded != null)
+                    m_StyleExpanded.StyleChanged -= new EventHandler(this.ElementStyleChanged);
+                if (m_StyleMouseOver != null)
+                    m_StyleMouseOver.StyleChanged -= new EventHandler(this.ElementStyleChanged);
+                if (m_ParentConnector != null)
+                    m_ParentConnector.AppearanceChanged -= new EventHandler(this.ConnectorAppearanceChanged);
+
+            }
+            base.Dispose(disposing);
+        }
+        #endregion
+
+        #region Properties
+        /// <summary>
+        /// Gets whether node has child nodes.
+        /// </summary>
+        [Browsable(false)]
+        public bool HasChildNodes
+        {
+            get { return m_Nodes != null && m_Nodes.Count > 0; }
+        }
+
+        /// <summary>
+        /// Gets or sets the context menu assigned to this node. Standard Context Menus, VS.NET 2005 Context Menus and DotNetBar Suite context menus are supported.
+        /// Default value is null (Nothing) which indicates that no context menu is assigned.
+        /// </summary>
+        [Browsable(true), DefaultValue(null), Description("Indicates the context menu assigned to this node."), Editor("DevComponents.AdvTree.Design.NodeContextMenuTypeEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor))]
+        public object ContextMenu
+        {
+            get { return m_ContextMenu; }
+            set { m_ContextMenu = value; }
+        }
+
+        /// <summary>
+        /// Gets whether any of the cells inside the node has HostedControl property set.
+        /// </summary>
+        [Browsable(false)]
+        public bool HasHostedControls
+        {
+            get
+            {
+                foreach (Cell cell in m_Cells)
+                {
+                    if (cell.HostedControl != null)
+                        return true;
+                }
+                return false;
+            }
+        }
+        /// <summary>
+        /// Gets or sets custom node renderer. You can set this property to your custom renderer. When set the RenderMode should be set to custom to enable
+        /// your custom renderer. To choose one of the system renderer use RenderMode property. Default value is null.
+        /// </summary>
+        [Browsable(false), Category("Style"), DefaultValue(null), Description("Indicates render mode used to render the node.")]
+        internal TreeRenderer NodeRenderer
+        {
+            get { return m_NodeRenderer; }
+            set
+            {
+                m_NodeRenderer = value;
+                OnDisplayChanged();
+            }
+        }
+        /// <summary>
+        /// Gets or sets the render mode used to render the node. Default value is eNodeRenderMode.Default which indicates that system default renderer is used.
+        /// Note that if you specify custom renderer you need to set either AdvTree.NodeRenderer or Node.NodeRenderer property.
+        /// </summary>
+        [Browsable(true), Category("Style"), DefaultValue(eNodeRenderMode.Default), Description("Indicates render mode used to render the node.")]
+        internal eNodeRenderMode RenderMode
+        {
+            get { return m_RenderMode; }
+            set
+            {
+                m_RenderMode = value;
+                OnDisplayChanged();
+            }
+        }
+        /// <summary>
+        /// Gets or sets whether node is expanded. Expanded node shows it's child nodes.
+        /// </summary>
+        [Browsable(true), Category("Node State"), DefaultValue(false), Description("Indicates whether node is expanded."), DevCoSerialize()]
+        public bool Expanded
+        {
+            get { return m_Expanded; }
+            set
+            {
+                if (value)
+                    this.Expand();
+                else
+                    this.Collapse();
+            }
+        }
+        /// <summary>
+        /// Returns name of the node that can be used to identify it from the code.
+        /// </summary>
+        [Browsable(false), Category("Design"), Description("Indicates the name used to identify node."), DevCoSerialize()]
+        public string Name
+        {
+            get
+            {
+                if (this.Site != null)
+                    m_Name = this.Site.Name;
+                return m_Name;
+            }
+            set
+            {
+                if (this.Site != null)
+                    this.Site.Name = value;
+                if (value == null)
+                    m_Name = "";
+                else
+                    m_Name = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether node can be dragged and dropped. Default value is true.
+        /// </summary>
+        [Browsable(true), Category("Behavior"), Description("Indicates whether node can be dragged and dropped."), DefaultValue(true), DevCoSerialize()]
+        public bool DragDropEnabled
+        {
+            get { return m_DragDropEnabled; }
+            set { m_DragDropEnabled = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets visibility of the expand button. Default value is <strong>Auto</strong> meaning that
+        /// expand button is displayed only if node has at least one child node.
+        /// </summary>
+        /// <remarks>
+        /// You can use this property for example to dynamically load the child nodes when user
+        /// tries to expand the node. You could for example handle BeforeExpand event to load child
+        /// nodes into the node.
+        /// </remarks>
+        [Category("Appearance"), Browsable(true), DefaultValue(eNodeExpandVisibility.Auto), Description("Indicates whether the expand button is always visible regardless of whether node contains child nodes or not."), DevCoSerialize()]
+        public eNodeExpandVisibility ExpandVisibility
+        {
+            get { return m_ExpandVisibility; }
+            set
+            {
+                m_ExpandVisibility = value;
+                this.SizeChanged = true;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether any operation on the node has been performed that would affect node's size. Size changed flag 
+        /// internally indicates that node's size needs to be recalculated because it has changed
+        /// due to the changes in data.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool SizeChanged
+        {
+            get { return m_SizeChanged; }
+            set
+            {
+                m_SizeChanged = value;
+                OnSizeChanged();
+            }
+        }
+
+        /// <summary>
+        /// Gets the relative bounds of the tree node including the expand part of the node.
+        /// </summary>
+        [Browsable(false)]
+        internal Rectangle BoundsRelative
+        {
+            get
+            {
+                return m_BoundsRelative;
+            }
+        }
+
+        /// <summary>
+        /// Gets the absolute bounds of the tree node including the expand part of the node.
+        /// </summary>
+        [Browsable(false)]
+        public Rectangle Bounds
+        {
+            get
+            {
+                AdvTree tree = this.TreeControl;
+                if (tree != null)
+                {
+                    return NodeDisplay.GetNodeRectangle(eNodeRectanglePart.NodeContentBounds, this, tree.NodeDisplay.Offset);
+                }
+                return Rectangle.Empty;
+            }
+        }
+
+        /// <summary>
+        /// Sets the bounds of the node.
+        /// </summary>
+        /// <param name="r">New location and size of the node.</param>
+        internal void SetBounds(Rectangle r)
+        {
+            m_BoundsRelative = r;
+        }
+
+        /// <summary>
+        /// Sets the content bounds of the node. Content bound is bound for the the cells inside the node
+        /// and it excludes the expand rectangle. Bounds also include the node style padding and
+        /// reflect node margin.
+        /// </summary>
+        /// <param name="r">New location and size of the node.</param>
+        internal void SetContentBounds(Rectangle r)
+        {
+            m_ContentBounds = r;
+        }
+
+        /// <summary>
+        /// Gets the node content bounds.
+        /// </summary>
+        internal Rectangle ContentBounds
+        {
+            get { return m_ContentBounds; }
+        }
+
+        /// <summary>
+        /// Gets the bounds for all the cells inside the node. The bounds do not include the expand part.
+        /// </summary>
+        [Browsable(false)]
+        internal Rectangle CellsBoundsRelative
+        {
+            get { return m_CellsBounds; }
+        }
+
+        /// <summary>
+        /// Gets the bounds for all the cells inside the node. The bounds do not include the expand part.
+        /// </summary>
+        [Browsable(false)]
+        public Rectangle CellsBounds
+        {
+            get
+            {
+                AdvTree tree = this.TreeControl;
+                if (tree != null)
+                {
+                    return NodeDisplay.GetNodeRectangle(eNodeRectanglePart.CellsBounds, this, tree.NodeDisplay.Offset);
+                }
+                return Rectangle.Empty;
+            }
+        }
+
+        /// <summary>
+        /// Sets cell bounds.
+        /// </summary>
+        /// <param name="r">New cells bounds.</param>
+        internal void SetCellsBounds(Rectangle r)
+        {
+            m_CellsBounds = r;
+        }
+
+        /// <summary>
+        /// Sets node parent.
+        /// </summary>
+        /// <param name="parent">Parent node object.</param>
+        internal void SetParent(Node parent)
+        {
+            if (parent == null)
+            {
+                RemoveHostedControls(true);
+            }
+            if (m_Parent != parent)
+            {
+                m_Parent = parent;
+                foreach (Cell cell in m_Cells)
+                {
+                    if (cell.HostedControl != null)
+                        cell.AddHostedControlToTree();
+                }
+                OnParentChanged();
+            }
+        }
+
+        internal void InvokeOnParentChanged()
+        {
+            OnParentChanged();
+        }
+
+        /// <summary>
+        /// Called when Parent of the node has changed.
+        /// </summary>
+        protected virtual void OnParentChanged()
+        {
+        }
+
+        internal void RemoveHostedControls(bool enumChildren)
+        {
+            foreach (Cell cell in m_Cells)
+            {
+                if (cell.HostedControl != null && cell.HostedControl.Parent is AdvTree)
+                    cell.RemoveHostedControlFromTree();
+            }
+            if (!enumChildren || m_Nodes == null) return;
+            foreach (Node item in m_Nodes)
+            {
+                item.RemoveHostedControls(true);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the bounds of child nodes.
+        /// </summary>
+        internal Rectangle ChildNodesBounds
+        {
+            get { return m_ChildNodesBounds; }
+            set { m_ChildNodesBounds = value; }
+        }
+
+        /// <summary>
+        /// Gets the expand part rectangle. Expand part is used to expand/collapse node.
+        /// </summary>
+        [Browsable(false)]
+        internal Rectangle ExpandPartRectangleRelative
+        {
+            get { return m_ExpandPartRectangle; }
+        }
+
+        /// <summary>
+        /// Gets the expand part rectangle. Expand part is used to expand/collapse node.
+        /// </summary>
+        [Browsable(false)]
+        public Rectangle ExpandPartRectangle
+        {
+            get
+            {
+                AdvTree tree = this.TreeControl;
+                if (tree != null)
+                {
+                    return NodeDisplay.GetNodeRectangle(eNodeRectanglePart.ExpandBounds, this, tree.NodeDisplay.Offset);
+                }
+                return Rectangle.Empty;
+            }
+        }
+
+        /// <summary>
+        /// Sets the bounds of the expand part.
+        /// </summary>
+        /// <param name="r">New part bounds.</param>
+        internal void SetExpandPartRectangle(Rectangle r)
+        {
+            m_ExpandPartRectangle = r;
+        }
+
+        private eVerticalAlign _ExpandPartVerticalAlignment = eVerticalAlign.Middle;
+        /// <summary>
+        /// Indicates vertical alignment within the node bounds of expand part of the node, if one is visible.
+        /// </summary>
+        [DefaultValue(eVerticalAlign.Middle), Category("Appearance"), Description("Indicates vertical alignment within the node bounds of expand part of the node, if one is visible.")]
+        public eVerticalAlign ExpandPartVerticalAlignment
+        {
+            get { return _ExpandPartVerticalAlignment; }
+            set 
+            {
+                if (_ExpandPartVerticalAlignment != value)
+                {
+                    _ExpandPartVerticalAlignment = value;
+                    InvalidateLayout();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Command part bounds if command part is visible.
+        /// </summary>
+        [Browsable(false)]
+        internal Rectangle CommandBounds
+        {
+            get
+            {
+                if (!m_CommandBoundsRelative.IsEmpty)
+                {
+                    AdvTree tree = this.TreeControl;
+                    if (tree != null)
+                    {
+                        return NodeDisplay.GetNodeRectangle(eNodeRectanglePart.CommandBounds, this, tree.NodeDisplay.Offset);
+                    }
+                }
+                return Rectangle.Empty;
+            }
+        }
+
+        internal Rectangle CommandBoundsRelative
+        {
+            get { return m_CommandBoundsRelative; }
+            set { m_CommandBoundsRelative = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the tree node is in a checked state.
+        /// </summary>
+        [Browsable(true), DefaultValue(false), Category("Appearance"), Description("Indicates whether the tree node is in a checked state."), DevCoSerialize()]
+        public bool Checked
+        {
+            get
+            {
+                return m_Cells[0].Checked;
+            }
+            set
+            {
+                m_Cells[0].Checked = value;
+            }
+        }
+
+        /// <summary>
+        /// Sets the Checked or CheckState properties.
+        /// </summary>
+        /// <param name="value">New value for checked state.</param>
+        /// <param name="actionSource">Action source.</param>
+        public void SetChecked(bool value, eTreeAction actionSource)
+        {
+            SetChecked(value ? CheckState.Checked : CheckState.Unchecked, actionSource);
+        }
+
+        /// <summary>
+        /// Sets the Checked or CheckState properties.
+        /// </summary>
+        /// <param name="value">New value for checked state.</param>
+        /// <param name="actionSource">Action source.</param>
+        public void SetChecked(CheckState value, eTreeAction actionSource)
+        {
+            m_Cells[0].SetChecked(value, actionSource);
+        }
+
+        /// <summary>
+        /// Gets or sets the checkbox alignment in relation to the text displayed by first default cell.
+        /// </summary>
+        [Browsable(true), Category("Check-box Properties"), DefaultValue(eCellPartAlignment.Default), Description("Indicates checkbox alignment in relation to the text displayed by cell."), DevCoSerialize()]
+        public eCellPartAlignment CheckBoxAlignment
+        {
+            get
+            {
+                return m_Cells[0].CheckBoxAlignment;
+            }
+            set
+            {
+                m_Cells[0].CheckBoxAlignment = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether check box is visible inside the cell.
+        /// </summary>
+        [Browsable(true), Category("Check-box Properties"), DefaultValue(false), Description("Indicates whether check box is visible inside the cell."), DevCoSerialize()]
+        public bool CheckBoxVisible
+        {
+            get
+            {
+                return m_Cells[0].CheckBoxVisible;
+            }
+            set
+            {
+                m_Cells[0].CheckBoxVisible = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the appearance style of the item. Default value is CheckBox. Item can also assume the style of radio-button.
+        /// </summary>
+        [Browsable(true), DefaultValue(eCheckBoxStyle.CheckBox), Category("Check-box Properties"), Description("Indicates appearance style of the item. Default value is CheckBox. Item can also assume the style of radio-button.")]
+        public eCheckBoxStyle CheckBoxStyle
+        {
+            get { return m_Cells[0].CheckBoxStyle; }
+            set
+            {
+                m_Cells[0].CheckBoxStyle = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the CheckBox will allow three check states rather than two. If the ThreeState property is set to true
+        /// CheckState property should be used instead of Checked property to set the extended state of the control.
+        /// </summary>
+        [Browsable(true), Category("Check-box Properties"), DefaultValue(false), Description("Indicates whether the CheckBox will allow three check states rather than two.")]
+        public bool CheckBoxThreeState
+        {
+            get { return m_Cells[0].CheckBoxThreeState; }
+            set { m_Cells[0].CheckBoxThreeState = value; }
+        }
+
+        /// <summary>
+        /// Specifies the state of a control, such as a check box, that can be checked, unchecked, or set to an indeterminate state. 
+        /// </summary>
+        [Browsable(true), Category("Check-box Properties"), DefaultValue(CheckState.Unchecked), RefreshProperties(RefreshProperties.All), Description("Specifies the state of a control, such as a check box, that can be checked, unchecked, or set to an indeterminate state")]
+        public CheckState CheckState
+        {
+            get { return m_Cells[0].CheckState; }
+            set
+            {
+                m_Cells[0].CheckState = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether first cell content is editable when cell editing is enabled on tree control. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether first cell content is editable when cell editing is enabled on tree control.")]
+        public bool Editable
+        {
+            get { return m_Cells[0].Editable; }
+            set
+            {
+                m_Cells[0].Editable = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the path from the root tree node to the current tree node. The path consists of the labels of all the tree nodes that must be navigated to get to this tree node, starting at the root tree node. The node labels are separated by the delimiter character specified in the PathSeparator property of the Tree control that contains this node.
+        /// </summary>
+        [Browsable(false)]
+        public string FullPath
+        {
+            get
+            {
+                if (this.TreeControl == null)
+                    return "";
+                return NodeOperations.GetFullPath(this, this.TreeControl.PathSeparator);
+            }
+        }
+
+        /// <summary>
+        /// Gets the zero based index of position of the tree node in the tree node collection. -1 is returned if node is not parented. If node is root node
+        /// the index of node in AdvTree.Nodes collection is returned.
+        /// </summary>
+        [Browsable(false)]
+        public int Index
+        {
+            get
+            {
+                return NodeOperations.GetNodeIndex(this);
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether the tree node is in an editable state. true if the tree node is in editable state; otherwise, false.
+        /// </summary>
+        [Browsable(false)]
+        public bool IsEditing
+        {
+            get { return m_Editing; }
+        }
+        /// <summary>
+        /// Sets whether node is in edit mode or not.
+        /// </summary>
+        /// <param name="b">True indicating that node is in edit mode false otherwise.</param>
+        internal void SetEditing(bool b)
+        {
+            m_Editing = b;
+        }
+
+        /// <summary>
+        /// Gets whether left mouse button is pressed on any cell contained by this node.
+        /// </summary>
+        [Browsable(false)]
+        public bool IsMouseDown
+        {
+            get
+            {
+                foreach (Cell cell in this.Cells)
+                {
+                    if (cell.IsMouseDown)
+                        return true;
+                }
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// Gets whether mouse cursor is over on any cell contained by this node.
+        /// </summary>
+        [Browsable(false)]
+        public bool IsMouseOver
+        {
+            get
+            {
+                foreach (Cell cell in this.Cells)
+                {
+                    if (cell.IsMouseOver)
+                        return true;
+                }
+                return false;
+            }
+        }
+
+        private bool _IsSelected = false;
+        /// <summary>
+        /// Gets a value indicating whether the tree node is in the selected state. true if the tree node is in the selected state; otherwise, false.
+        /// </summary>
+        [Browsable(false)]
+        public bool IsSelected
+        {
+            get
+            {
+                return _IsSelected;
+                //AdvTree tree=this.TreeControl;
+                //if(tree!=null)
+                //{
+                //    if (tree.MultiSelect)
+                //    {
+                //        return tree.SelectedNodes.Contains(this);
+                //    }
+                //    else if(tree.SelectedNode==this)
+                //        return true;
+                //}
+                //return false;
+            }
+            internal set
+            {
+                _IsSelected = value;
+            }
+        }
+
+        private bool _Selectable = true;
+        /// <summary>
+        /// Gets or sets whether node can be selected by user by clicking it with the mouse or using keyboard. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether node can be selected by user by clicking it with the mouse or using keyboard.")]
+        public bool Selectable
+        {
+            get { return _Selectable; }
+            set
+            {
+                _Selectable = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets whether node can be selected. Node must be Visible, Enabled and Selectable in order for it to be selected.
+        /// </summary>
+        [Browsable(false)]
+        public bool CanSelect
+        {
+            get
+            {
+                return this.Enabled & this.Visible & this.Selectable;
+            }
+        }
+
+        /// <summary>
+        /// Sets selected cell and provides information on the action that caused the selection change.
+        /// </summary>
+        /// <param name="value">New selected cell.</param>
+        /// <param name="actionSource">Action source.</param>
+        public void SetSelectedCell(Cell value, eTreeAction actionSource)
+        {
+            AdvTree tree = this.TreeControl;
+
+            if (!this.IsSelected && value != null)
+            {
+                if (tree != null)
+                    tree.SelectedNode = this;
+            }
+
+            Cell previousSelectedCell = null;
+            Cell selectedCell = null;
+
+            foreach (Cell cell in m_Cells)
+            {
+                if (cell.IsSelected) previousSelectedCell = cell;
+                if (cell == value && cell.CanSelect)
+                {
+                    selectedCell = cell;
+                    cell.SetSelected(true, actionSource);
+                }
+                else
+                    cell.SetSelected(false, actionSource);
+            }
+
+            if (tree != null)
+            {
+                tree.InvalidateNode(this);
+                if (value == null || previousSelectedCell != null && value != previousSelectedCell)
+                {
+                    tree.InvokeCellUnselected(new AdvTreeCellEventArgs(actionSource, previousSelectedCell));
+                }
+
+                if (selectedCell != null && previousSelectedCell != selectedCell)
+                {
+                    tree.InvokeCellSelected(new AdvTreeCellEventArgs(actionSource, selectedCell));
+                }
+            }
+        }
+        /// <summary>
+        /// Gets or sets a cell that is in selected state otherwise it returns null.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public Cell SelectedCell
+        {
+            get
+            {
+                if (this.IsSelected)
+                {
+                    return GetSelectedCell();
+                }
+                return null;
+            }
+            set
+            {
+                SetSelectedCell(value, eTreeAction.Code);
+            }
+        }
+
+        internal Cell GetSelectedCell()
+        {
+            foreach (Cell cell in m_Cells)
+                if (cell.IsSelected)
+                    return cell;
+            return null;
+        }
+        internal void SelectFirstCell(eTreeAction actionSource)
+        {
+            foreach (Cell cell in m_Cells)
+            {
+                if (cell.CanSelect)
+                {
+                    this.SetSelectedCell(cell, actionSource);
+                    //cell.SetSelected(true);
+                    break;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether the tree node is visible. Node is considered to be visible when it's Visible property is set to true and path to the node is available i.e. all parent nodes are expanded.
+        /// </summary>
+        [Browsable(false)]
+        public bool IsVisible
+        {
+            get
+            {
+                return NodeOperations.GetIsNodeVisible(this);
+            }
+        }
+
+        /// <summary>
+        /// Returns whether node is displayed on the screen and visible to the user. When node is outside of the viewable area this property will return false. It will also return false if node is not visible.
+        /// </summary>
+        [Browsable(false)]
+        public bool IsDisplayed
+        {
+            get { return NodeOperations.GetIsNodeDisplayed(this); }
+        }
+
+        /// <summary>
+        /// Gets the last child tree node. The LastNode is the last child Node in the NodeCollection stored in the Nodes property of the current tree node. If the Node has no child tree node, the LastNode property returns a null reference (Nothing in Visual Basic).
+        /// </summary>
+        [Browsable(false)]
+        public Node LastNode
+        {
+            get
+            {
+                return NodeOperations.GetLastNode(this);
+            }
+        }
+
+        /// <summary>
+        /// Gets the next sibling tree node. The NextNode is the next sibling Node in the NodeCollection stored in the Nodes property of the tree node's parent Node. If there is no next tree node, the NextNode property returns a null reference (Nothing in Visual Basic).
+        /// </summary>
+        [Browsable(false)]
+        public Node NextNode
+        {
+            get
+            {
+                return NodeOperations.GetNextNode(this);
+            }
+        }
+
+        /// <summary>
+        /// Gets the next visible tree node. The NextVisibleNode can be a child, sibling, or a tree node from another branch. If there is no next tree node, the NextVisibleNode property returns a null reference (Nothing in Visual Basic).
+        /// </summary>
+        [Browsable(false)]
+        public Node NextVisibleNode
+        {
+            get
+            {
+                return NodeOperations.GetNextVisibleNode(this);
+            }
+        }
+
+        /// <summary>
+        /// Gets the zero-based depth of the tree node in the tree control. The root node is considered the first level of nesting and returns 0.
+        /// </summary>
+        [Browsable(false)]
+        public int Level
+        {
+            get
+            {
+                int i = 0;
+                Node parent = this.Parent;
+                while (parent != null)
+                {
+                    i++;
+                    parent = parent.Parent;
+                }
+                return i;
+            }
+        }
+
+
+        /// <summary>
+        /// Gets the collection of Node objects assigned to the current tree node. The Nodes property can hold a collection of other Node objects. Each of the tree node in the collection has a Nodes property that can contain its own NodeCollection. Nesting of tree nodes can make it difficult to navigate a tree structure. The FullPath property makes it easier to determine your location in a tree.
+        /// </summary>
+        [Browsable(true), Category("Nodes"), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public NodeCollection Nodes
+        {
+            get
+            {
+                if (m_Nodes == null)
+                {
+                    m_Nodes = new NodeCollection();
+                    m_Nodes.SetParentNode(this);
+                }
+                return m_Nodes;
+            }
+        }
+
+        ///// <summary>
+        ///// Gets the collection of LinkedNode objects that describe nodes linked to this node.
+        ///// </summary>
+        ///// <remarks>
+        ///// Linked nodes are nodes that are related to given node but do not have strict
+        ///// parent child relationship with the node. Each linked node must be already added as
+        ///// child node to some other node or it will not be displayed. Linked nodes are used in Map
+        ///// and Diagram layout styles to display relationships between nodes.
+        ///// </remarks>
+        //[Browsable(true),Category("Nodes"), Description("Collection of LinkedNode objects that describe nodes linked to this node")]
+        //public LinkedNodesCollection LinkedNodes
+        //{
+        //    get
+        //    {
+        //        if(m_LinkedNodes==null)
+        //        {
+        //            m_LinkedNodes=new LinkedNodesCollection();	
+        //        }
+        //        return m_LinkedNodes;
+        //    }
+        //}
+
+        ///// <summary>
+        ///// Gets whether Node has any linked nodes.
+        ///// </summary>
+        //[Browsable(false)]
+        //public bool HasLinkedNodes
+        //{
+        //    get {return (m_LinkedNodes!=null && m_LinkedNodes.Count>0);}
+        //}
+
+        /// <summary>
+        /// Gets whether there is at least one child node that has its Visible property set to true.
+        /// </summary>
+        [Browsable(false)]
+        public bool AnyVisibleNodes
+        {
+            get
+            {
+                return NodeOperations.GetAnyVisibleNodes(this);
+            }
+        }
+
+        /// <summary>
+        /// Gets the parent tree node of the current tree node. If the tree node is at the root level, the Parent property returns a null reference (Nothing in Visual Basic).
+        /// </summary>
+        [Browsable(false)]
+        public Node Parent
+        {
+            get
+            {
+                return m_Parent;
+            }
+        }
+
+        /// <summary>
+        /// Gets the previous sibling tree node. The PrevNode is the previous sibling Node in the NodeCollection stored in the Nodes property of the tree node's parent Node. If there is no previous tree node, the PrevNode property returns a null reference (Nothing in Visual Basic).
+        /// </summary>
+        [Browsable(false)]
+        public Node PrevNode
+        {
+            get
+            {
+                return NodeOperations.GetPreviousNode(this);
+            }
+        }
+
+        /// <summary>
+        /// Gets the previous visible tree node. The PrevVisibleNode can be a child, sibling, or a tree node from another branch. If there is no previous tree node, the PrevVisibleNode property returns a null reference (Nothing in Visual Basic).
+        /// </summary>
+        [Browsable(false)]
+        public Node PrevVisibleNode
+        {
+            get
+            {
+                return NodeOperations.GetPreviousVisibleNode(this);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the object that contains data about the tree node. Any Object derived type can be assigned to this property. If this property is being set through the Windows Forms designer, only text can be assigned.
+        /// </summary>
+        [Browsable(false), DefaultValue(null), Category("Data"), Description("Indicates text that contains data about the tree node."), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public object Tag
+        {
+            get
+            {
+                return m_Cells[0].Tag;
+            }
+            set
+            {
+                m_Cells[0].Tag = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the object that contains data about the tree node. Any Object derived type can be assigned to this property. If this property is being set through the Windows Forms designer, only text can be assigned.
+        /// </summary>
+        [Browsable(true), DefaultValue(""), Category("Data"), Description("Indicates text that contains data about the tree node."), DevCoSerialize()]
+        public string TagString
+        {
+            get
+            {
+                return m_Cells[0].TagString;
+            }
+            set
+            {
+                m_Cells[0].TagString = value;
+            }
+        }
+
+        private int _BindingIndex = -1;
+        /// <summary>
+        /// Gets or sets the Binding index in CurrencyManager list if node is bound. You should not change this value directly since
+        /// it is used internally by the control for data binding scenarios.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public int BindingIndex
+        {
+            get { return _BindingIndex; }
+            set
+            {
+                _BindingIndex = value;
+            }
+        }
+
+
+        /// <summary>
+        /// Gets or sets the object that contains additional data about the tree node. Any Object derived type can be assigned to this property. If this property is being set through the Windows Forms designer, only text can be assigned.
+        /// This property has same function as Tag property and provides you with additional separate storage of data.
+        /// </summary>
+        [Browsable(false), DefaultValue(null), Category("Data"), Description("Indicates text that contains data about the tree node."), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public object DataKey
+        {
+            get
+            {
+                return m_DataKey;
+            }
+            set
+            {
+                m_DataKey = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the object that contains additional data about the tree node. Any Object derived type can be assigned to this property. If this property is being set through the Windows Forms designer, only text can be assigned.
+        /// This property has same function as Tag property and provides you with additional separate storage of data.
+        /// </summary>
+        [Browsable(true), DefaultValue(""), Category("Data"), Description("Indicates text that contains data about the tree node."), DevCoSerialize()]
+        public string DataKeyString
+        {
+            get
+            {
+                if (m_DataKey == null)
+                    return "";
+                return m_DataKey.ToString();
+            }
+            set
+            {
+                m_DataKey = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the format that is applied to the value of Text property for display purposes (applies to first cell in a node, i.e. Cells[0]). See "Formatting Overview" in MSDN
+        /// for description on available format strings. For example you can specify "C" to format text as currency, or "D" to format text as decimal number etc.
+        /// <seealso cref="http://msdn.microsoft.com/en-us/library/26etazsy.aspx"/>
+        /// </summary>
+        [Browsable(true), DefaultValue(""), Category("Appearance"), Description("Indicates format that is applied to the value of Text property for display purposes.")]
+        public string TextDisplayFormat
+        {
+            get { return this.Cells[0].TextDisplayFormat; }
+            set
+            {
+                this.Cells[0].TextDisplayFormat = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the text displayed in the tree node.
+        /// </summary>
+        [Browsable(true), DefaultValue(""), Editor("DevComponents.DotNetBar.Design.TextMarkupUIEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), Category("Appearance"), Localizable(true), Description("Indicates text displayed in the tree node."), DevCoSerialize()]
+        public string Text
+        {
+            get
+            {
+                return this.Cells[0].Text;
+            }
+            set
+            {
+                this.Cells[0].Text = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the control hosted inside of the first node cell.
+        /// </summary>
+        /// <remarks>
+        /// 	<para>When control is hosted inside of the cell, cell size is determined by the
+        ///     size of the control hosted inside of it. The cell will not display its text but it will display any image assigned
+        ///     or check box when control is hosted inside of it. The Style settings like Margin
+        ///     and Padding will still apply.</para>
+        /// </remarks>
+        [Browsable(true), Category("Appearance"), Description("Indicates control hosted inside of the cell."), DefaultValue(null)]
+        public Control HostedControl
+        {
+            get { return this.Cells[0].HostedControl; }
+            set
+            {
+                this.Cells[0].HostedControl = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the item hosted inside of the first cell. Only items that do not generate
+        /// popups are supported. Note that cell can only host either HostedItem or HostedControl but not both.
+        /// </summary>
+        [DefaultValue(null), Category("Appearance"), Editor("DevComponents.AdvTree.Design.HostedItemTypeEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), Description("Indicates item hosted inside of the cell. Only items that do not generate popups are supported. Note that cell can only host either HostedItem or HostedControl but not both.")]
+        public BaseItem HostedItem
+        {
+            get { return this.Cells[0].HostedItem; }
+            set { this.Cells[0].HostedItem = value; }
+        }
+
+        /// <summary>
+        /// Gets the parent tree control that the tree node is assigned to.
+        /// </summary>
+        [Browsable(false)]
+        public AdvTree TreeControl
+        {
+            get
+            {
+                return this.GetTreeControl();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the layout of the cells inside the node. Default value is Horizontal layout which
+        /// means that cell are positioned horizontally next to each other.
+        /// </summary>
+        [Browsable(true), DefaultValue(eCellLayout.Default), Category("Cells"), Description("Indicates layout of the cells inside the node."), DevCoSerialize()]
+        public eCellLayout CellLayout
+        {
+            get { return m_CellLayout; }
+            set
+            {
+                m_CellLayout = value;
+                this.SizeChanged = true;
+            }
+        }
+
+        private eHorizontalAlign _VerticalCellLayoutAlignment = eHorizontalAlign.Center;
+        /// <summary>
+        /// Gets or sets the cell alignment when CellLayout=Vertical. Default value is center which means that cells are center aligned.
+        /// </summary>
+        [DefaultValue(eHorizontalAlign.Center), Category("Cells"), Description("Indicates cell alignment when CellLayout=Vertical. Default value is center which means that cells are center aligned.")]
+        public eHorizontalAlign VerticalCellLayoutAlignment
+        {
+            get { return _VerticalCellLayoutAlignment; }
+            set { _VerticalCellLayoutAlignment = value; this.SizeChanged = true; }
+        }
+
+        /// <summary>
+        /// Gets or sets the layout of the cell parts like check box, image and text. Layout can be horizontal (default)
+        /// where parts of the cell are positioned next to each other horizontally, or vertical where
+        /// parts of the cell are positioned on top of each other vertically.
+        /// Alignment of the each part is controlled by alignment properties. This property affects only the first cell inside of the node.
+        /// Use Cell.Layout property to change the part layout on each cell contained by node.
+        /// </summary>
+        [Browsable(true), DefaultValue(eCellPartLayout.Default), Category("Cells"), Description("Indicates the layout of the cell parts like check box, image and text."), DevCoSerialize()]
+        public eCellPartLayout CellPartLayout
+        {
+            get { return m_Cells[0].Layout; }
+            set
+            {
+                if (m_Cells[0].Layout != value)
+                {
+                    m_Cells[0].Layout = value;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets/Sets informational text (tooltip) for the cell.
+        /// </summary>
+        [Browsable(true), DefaultValue(""), Category("Appearance"), Description("Indicates the text that is displayed when mouse hovers over the cell."), Localizable(true)]
+        public string Tooltip
+        {
+            get
+            {
+
+                return m_Cells[0].Tooltip;
+            }
+            set
+            {
+                m_Cells[0].Tooltip = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the collection of all Cells assigned to this node. There should be always at least one cell in a node which is default cell. Default
+        /// collection contains a single cell.
+        /// </summary>
+        [Browsable(true), DesignerSerializationVisibility(DesignerSerializationVisibility.Content), Category("Cells"), Description("Collection of Cells assigned to this node.")]
+        public CellCollection Cells
+        {
+            get { return m_Cells; }
+        }
+
+        private bool _NodesColumnsHeaderVisible = true;
+        /// <summary>
+        /// Gets or sets whether column header for child nodes if defined is visible. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Columns"), Description("Indicates whether column header for child nodes if defined is visible.")]
+        public bool NodesColumnsHeaderVisible
+        {
+            get { return _NodesColumnsHeaderVisible; }
+            set
+            {
+                _NodesColumnsHeaderVisible = value;
+                SizeChanged = true;
+                OnDisplayChanged();
+            }
+        }
+
+        /// <summary>
+        /// Gets whether node has child nodes columns defined.
+        /// </summary>
+        [Browsable(false)]
+        public bool HasColumns
+        {
+            get
+            {
+                if (m_NodesColumns != null && m_NodesColumns.Count > 0) return true;
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// Get collection of child node columns.
+        /// </summary>
+        [Browsable(true), DesignerSerializationVisibility(DesignerSerializationVisibility.Content), Category("Columns"), Description("Defines the columns for the child nodes.")]
+        public ColumnHeaderCollection NodesColumns
+        {
+            get
+            {
+                if (m_NodesColumns == null)
+                {
+                    m_NodesColumns = new ColumnHeaderCollection();
+                    m_NodesColumns.SetParentNode(this);
+                }
+                return m_NodesColumns;
+            }
+        }
+
+        //		/// <summary>
+        //		/// Gets or sets whether child node column header is visible or not.
+        //		/// </summary>
+        //		[Browsable(true),DefaultValue(true),Category("Columns"),Description("Indicates whether child node column header is visible or not.")]
+        //		public bool NodesColumnHeaderVisible
+        //		{
+        //			get {return m_NodesColumnHeaderVisible;}
+        //			set
+        //			{
+        //				if(m_NodesColumnHeaderVisible!=value)
+        //				{
+        //					m_NodesColumnHeaderVisible=value;
+        //					if(this.Expanded)
+        //						this.OnChildNodesSizeChanged();
+        //				}
+        //			}
+        //		}
+
+        /// <summary>Gets or sets the style of the cells when node is expanded.</summary>
+        /// <value>
+        /// Reference to the style assigned to the node/cell or null value indicating that
+        /// default style setting from tree control is applied. Default value is null.
+        /// </value>
+        /// <remarks>
+        /// 	<para>When node is expanded the style specified here will be used on all cells
+        ///     associated with this node instead of the
+        ///     <see cref="Cell.StyleNormal">Cell.StyleNormal</see>. That way you can give
+        ///     different appearance to your node's cells when node is expanded.</para>
+        /// 	<para>When property is set to null value the style setting from parent tree
+        ///     controls is used. <see cref="AdvTree.NodeStyleExpanded">NodeStyleExpanded</see> on
+        ///     AdvTree control is a root style for a cell.</para>
+        /// </remarks>
+        [Browsable(true), DefaultValue(null), Category("Style"), Editor("DevComponents.AdvTree.Design.ElementStyleTypeEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), Description("Indicates the style for the child nodes when node is expanded.")]
+        public ElementStyle StyleExpanded
+        {
+            get { return m_StyleExpanded; }
+            set
+            {
+                if (m_StyleExpanded != value)
+                {
+                    if (m_StyleExpanded != null)
+                        m_StyleExpanded.StyleChanged -= new EventHandler(this.ElementStyleChanged);
+                    if (value != null)
+                        value.StyleChanged += new EventHandler(this.ElementStyleChanged);
+                    m_StyleExpanded = value;
+                    if (this.Expanded)
+                        this.SizeChanged = true;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the expanded style name used by node. This member is provided for internal use only. To set or get the style use StyleExpanded property instead.
+        /// </summary>
+        [Browsable(false), DefaultValue(""), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), EditorBrowsable(EditorBrowsableState.Never), DevCoSerialize()]
+        public string StyleExpandedName
+        {
+            get
+            {
+                if (m_StyleExpanded != null)
+                    return m_StyleExpanded.Name;
+                return "";
+            }
+            set
+            {
+                if (value.Length == 0)
+                {
+                    TypeDescriptor.GetProperties(this)["StyleExpanded"].SetValue(this, null);
+                    return;
+                }
+
+                AdvTree tree = this.TreeControl;
+                if (tree != null)
+                {
+                    TypeDescriptor.GetProperties(this)["StyleExpanded"].SetValue(this, tree.Styles[value]);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the style used when Node is selected. Default value is NULL (VB
+        /// Nothing)
+        /// </summary>
+        [Browsable(true), DefaultValue(null), Category("Style"), Editor("DevComponents.AdvTree.Design.ElementStyleTypeEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), Description("Indicates the style for the nodes when node is selected.")]
+        public ElementStyle StyleSelected
+        {
+            get { return m_StyleSelected; }
+            set
+            {
+                if (m_StyleSelected != value)
+                {
+                    if (m_StyleSelected != null)
+                        m_StyleSelected.StyleChanged -= new EventHandler(this.ElementStyleChanged);
+                    if (value != null)
+                        value.StyleChanged += new EventHandler(this.ElementStyleChanged);
+                    m_StyleSelected = value;
+                    if (this.IsSelected)
+                        this.SizeChanged = true;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the selected style name used by node. This member is provided for internal use only. To set or get the style use StyleSelected property instead.
+        /// </summary>
+        [Browsable(false), DefaultValue(""), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), EditorBrowsable(EditorBrowsableState.Never), DevCoSerialize()]
+        public string StyleSelectedName
+        {
+            get
+            {
+                if (m_StyleSelected != null)
+                    return m_StyleSelected.Name;
+                return "";
+            }
+            set
+            {
+                if (value.Length == 0)
+                {
+                    TypeDescriptor.GetProperties(this)["StyleSelected"].SetValue(this, null);
+                    return;
+                }
+
+                AdvTree tree = this.TreeControl;
+                if (tree != null)
+                {
+                    TypeDescriptor.GetProperties(this)["StyleSelected"].SetValue(this, tree.Styles[value]);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the style used when mouse is over the Node. Default value is NULL
+        /// (VB Nothing)
+        /// </summary>
+        [Browsable(true), DefaultValue(null), Category("Style"), Editor("DevComponents.AdvTree.Design.ElementStyleTypeEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), Description("Indicates the style for the nodes when node is selected.")]
+        public ElementStyle StyleMouseOver
+        {
+            get { return m_StyleMouseOver; }
+            set
+            {
+                if (m_StyleMouseOver != value)
+                {
+                    if (m_StyleMouseOver != null)
+                        m_StyleMouseOver.StyleChanged -= new EventHandler(this.ElementStyleChanged);
+                    if (value != null)
+                        value.StyleChanged += new EventHandler(this.ElementStyleChanged);
+                    m_StyleMouseOver = value;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the mouse over style name used by node. This member is provided for internal use only. To set or get the style use StyleMouseOver property instead.
+        /// </summary>
+        [Browsable(false), DefaultValue(""), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), EditorBrowsable(EditorBrowsableState.Never), DevCoSerialize()]
+        public string StyleMouseOverName
+        {
+            get
+            {
+                if (m_StyleMouseOver != null)
+                    return m_StyleMouseOver.Name;
+                return "";
+            }
+            set
+            {
+                if (value.Length == 0)
+                {
+                    TypeDescriptor.GetProperties(this)["StyleMouseOver"].SetValue(this, null);
+                    return;
+                }
+
+                AdvTree tree = this.TreeControl;
+                if (tree != null)
+                {
+                    TypeDescriptor.GetProperties(this)["StyleMouseOver"].SetValue(this, tree.Styles[value]);
+                }
+            }
+        }
+
+        /// <summary>
+        ///     Gets or sets the node style.
+        /// </summary>
+        /// <value>
+        /// Reference to the style assigned to the node or null value indicating that default
+        /// style setting from tree control is applied. Default value is null.
+        /// </value>
+        /// <remarks>
+        /// 	<para>Style specified by this property will be used as default style for the node.
+        ///     Each cell within the node can also specify it's own style. Since node contains the
+        ///     cells using this style property can you for example create a border around all cell
+        ///     contained by the node.</para>
+        /// 	<para>When this property is set to null value (default value) NodeStyle
+        ///     property on AdvTree control is used.</para>
+        /// </remarks>
+        [Browsable(true), DefaultValue(null), Category("Style"), Editor("DevComponents.AdvTree.Design.ElementStyleTypeEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), Description("Indicates the node style.")]
+        public ElementStyle Style
+        {
+            get { return m_Style; }
+            set
+            {
+                if (m_Style != value)
+                {
+                    if (m_Style != null)
+                        m_Style.StyleChanged -= new EventHandler(this.ElementStyleChanged);
+                    if (value != null)
+                        value.StyleChanged += new EventHandler(this.ElementStyleChanged);
+                    m_Style = value;
+                    this.SizeChanged = true;
+                    this.Invalidate();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the style name used by node. This member is provided for internal use only. To set or get the style use Style property instead.
+        /// </summary>
+        [Browsable(false), DefaultValue(""), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), EditorBrowsable(EditorBrowsableState.Never), DevCoSerialize()]
+        public string StyleName
+        {
+            get
+            {
+                if (m_Style != null)
+                    return m_Style.Name;
+                return "";
+            }
+            set
+            {
+                if (value.Length == 0)
+                {
+                    TypeDescriptor.GetProperties(this)["Style"].SetValue(this, null);
+                    return;
+                }
+
+                AdvTree tree = this.TreeControl;
+                if (tree != null)
+                {
+                    TypeDescriptor.GetProperties(this)["Style"].SetValue(this, tree.Styles[value]);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the part of the node mouse is over.
+        /// </summary>
+        internal eMouseOverNodePart MouseOverNodePart
+        {
+            get { return m_MouseOverNodePart; }
+            set { m_MouseOverNodePart = value; }
+        }
+
+
+        /// <summary>
+        /// Gets or sets the node horizontal offset from the position determined by the layout manager.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), DefaultValue(0)]
+        internal int Offset
+        {
+            get { return m_Offset; }
+            set
+            {
+                m_Offset = value;
+                this.SizeChanged = true;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the image alignment in relation to the text displayed by cell. This property affects only first default cell inside the node.
+        /// Property with same name is available on each cell and you can use it to affect each cell individually.
+        /// </summary>
+        [Browsable(true), Category("Image Properties"), DefaultValue(eCellPartAlignment.Default), Description("Gets or sets the image alignment in relation to the text displayed by cell."), DevCoSerialize()]
+        public eCellPartAlignment ImageAlignment
+        {
+            get
+            {
+                return m_Cells[0].ImageAlignment;
+            }
+            set
+            {
+                if (m_Cells[0].ImageAlignment != value)
+                {
+                    m_Cells[0].ImageAlignment = value;
+                }
+            }
+        }
+
+        private bool _Enabled = true;
+        /// <summary>
+        /// Gets or sets whether node is enabled. Default value is true. Setting this value to false will set Enabled=false on all child cells.
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Behavior"), Description("Gets or sets whether node is enabled."), DevCoSerialize()]
+        public bool Enabled
+        {
+            get { return _Enabled; }
+            set
+            {
+                _Enabled = value;
+                foreach (Cell c in m_Cells)
+                {
+                    c.Enabled = _Enabled;
+                }
+            }
+        }
+
+
+        /// <summary>
+        /// Gets or sets the image displayed when the tree node is disabled. If image is not specified control will create
+        /// gray-scale disabled image automatically.
+        /// </summary>
+        /// <remarks>
+        /// Image specified will be used as image when node is disabled.
+        /// </remarks>
+        [Browsable(true), Category("Images"), Description("Indicates image displayed when the tree node is disabled."), DefaultValue(null), DevCoSerialize()]
+        public System.Drawing.Image ImageDisabled
+        {
+            get { return m_Cells[0].Images.ImageDisabled; }
+            set
+            {
+                this.SizeChanged = true;
+                m_Cells[0].Images.ImageDisabled = value;
+            }
+        }
+        /// <summary>
+        /// Resets image to its default value. Windows Forms designer support.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetImageDisabled()
+        {
+            TypeDescriptor.GetProperties(this)["ImageDisabled"].SetValue(this, null);
+        }
+        /// <summary>
+        /// Gets or sets the image-list index value of the disabled image.
+        /// </summary>
+        [Browsable(true), Category("Images"), Description("Indicates the image-list index value of the disabled image"), System.ComponentModel.Editor("DevComponents.DotNetBar.Design.ImageIndexEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), System.ComponentModel.TypeConverter(typeof(System.Windows.Forms.ImageIndexConverter)), DefaultValue(-1), DevCoSerialize()]
+        public int ImageDisabledIndex
+        {
+            get { return this.Cells[0].Images.ImageDisabledIndex; }
+            set
+            {
+                this.SizeChanged = true;
+                this.Cells[0].Images.ImageDisabledIndex = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the image displayed when the tree node is in the unselected state.
+        /// </summary>
+        /// <remarks>
+        /// Image specified will be used as a default image for any other node state where
+        /// different image is not specified.
+        /// </remarks>
+        [Browsable(true), Category("Images"), Description("Indicates image displayed when the tree node is in the unselected state."), DefaultValue(null), DevCoSerialize()]
+        public System.Drawing.Image Image
+        {
+            get { return m_Cells[0].Images.Image; }
+            set
+            {
+                this.SizeChanged = true;
+                m_Cells[0].Images.Image = value;
+            }
+        }
+
+        /// <summary>
+        /// Resets image to its default value. Windows Forms designer support.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetImage()
+        {
+            TypeDescriptor.GetProperties(this)["Image"].SetValue(this, null);
+        }
+
+        /// <summary>
+        /// Gets or sets the image-list key value of the default image that is displayed by the tree nodes.
+        /// </summary>
+        [Browsable(true), Category("Images"), Description("Indicates the image-list key value of the default image that is displayed by the tree nodes."), System.ComponentModel.Editor("DevComponents.DotNetBar.Design.ImageIndexEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), System.ComponentModel.TypeConverter(typeof(System.Windows.Forms.ImageIndexConverter)), DefaultValue(""), DevCoSerialize()]
+        public string ImageKey
+        {
+            get { return this.Cells[0].Images.ImageKey; }
+            set
+            {
+                this.SizeChanged = true;
+                this.Cells[0].Images.ImageKey = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the image-list index value of the default image that is displayed by the tree nodes.
+        /// </summary>
+        [Browsable(true), Category("Images"), Description("Indicates the image-list index value of the default image that is displayed by the tree nodes."), System.ComponentModel.Editor("DevComponents.DotNetBar.Design.ImageIndexEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), System.ComponentModel.TypeConverter(typeof(System.Windows.Forms.ImageIndexConverter)), DefaultValue(-1), DevCoSerialize()]
+        public int ImageIndex
+        {
+            get { return this.Cells[0].Images.ImageIndex; }
+            set
+            {
+                this.SizeChanged = true;
+                this.Cells[0].Images.ImageIndex = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the image displayed when mouse is over the tree node.
+        /// </summary>
+        [Browsable(true), Category("Images"), Description("Indicates the image displayed when mouse is over the tree node."), DefaultValue(null), DevCoSerialize()]
+        public System.Drawing.Image ImageMouseOver
+        {
+            get { return this.Cells[0].Images.ImageMouseOver; }
+            set
+            {
+                this.Cells[0].Images.ImageMouseOver = value;
+                this.SizeChanged = true;
+            }
+        }
+
+        /// <summary>
+        /// Resets ImageMouseOver to its default value. Windows Forms designer support.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetImageMouseOver()
+        {
+            TypeDescriptor.GetProperties(this)["ImageMouseOver"].SetValue(this, null);
+        }
+
+        /// <summary>
+        /// Gets or sets the image-list index value of the image that is displayed by the tree nodes when mouse is over the node.
+        /// </summary>
+        [Browsable(true), Category("Images"), Description("Indicates the image-list index value of the image that is displayed by the tree nodes when mouse is over the node."), System.ComponentModel.Editor("DevComponents.DotNetBar.Design.ImageIndexEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), System.ComponentModel.TypeConverter(typeof(System.Windows.Forms.ImageIndexConverter)), DefaultValue(-1), DevCoSerialize()]
+        public int ImageMouseOverIndex
+        {
+            get { return this.Cells[0].Images.ImageMouseOverIndex; }
+            set
+            {
+                this.SizeChanged = true;
+                this.Cells[0].Images.ImageMouseOverIndex = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the image-list key value of the image that is displayed by the tree nodes when mouse is over the node.
+        /// </summary>
+        [Browsable(true), Category("Images"), Description("Indicates the image-list key value of the image that is displayed by the tree nodes when mouse is over the node."), System.ComponentModel.Editor("DevComponents.DotNetBar.Design.ImageIndexEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), System.ComponentModel.TypeConverter(typeof(System.Windows.Forms.ImageIndexConverter)), DefaultValue(""), DevCoSerialize()]
+        public string ImageMouseOverKey
+        {
+            get { return this.Cells[0].Images.ImageMouseOverKey; }
+            set
+            {
+                this.SizeChanged = true;
+                this.Cells[0].Images.ImageMouseOverKey = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the image displayed when node is expanded.
+        /// </summary>
+        [Browsable(true), Category("Images"), Description("Indicates the image displayed when node is expanded."), DefaultValue(null), DevCoSerialize()]
+        public System.Drawing.Image ImageExpanded
+        {
+            get { return this.Cells[0].Images.ImageExpanded; }
+            set
+            {
+                this.Cells[0].Images.ImageExpanded = value;
+                this.SizeChanged = true;
+            }
+        }
+
+        /// <summary>
+        /// Resets ImageExpanded to its default value. Windows Forms designer support.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetImageExpanded()
+        {
+            TypeDescriptor.GetProperties(this)["ImageExpanded"].SetValue(this, null);
+        }
+
+        /// <summary>
+        /// Gets or sets the image-list index value of the image that is displayed by the tree nodes when node is expanded.
+        /// </summary>
+        [Browsable(true), Category("Images"), Description("Indicates the image-list index value of the image that is displayed by the tree nodes when node is expanded."), System.ComponentModel.Editor("DevComponents.DotNetBar.Design.ImageIndexEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), System.ComponentModel.TypeConverter(typeof(System.Windows.Forms.ImageIndexConverter)), DefaultValue(-1), DevCoSerialize()]
+        public int ImageExpandedIndex
+        {
+            get { return this.Cells[0].Images.ImageExpandedIndex; }
+            set
+            {
+                this.SizeChanged = true;
+                this.Cells[0].Images.ImageExpandedIndex = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the image-list key value of the image that is displayed by the tree nodes when node is expanded.
+        /// </summary>
+        [Browsable(true), Category("Images"), Description("Indicates the image-list key value of the image that is displayed by the tree nodes when node is expanded."), System.ComponentModel.Editor("DevComponents.DotNetBar.Design.ImageIndexEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), System.ComponentModel.TypeConverter(typeof(System.Windows.Forms.ImageIndexConverter)), DefaultValue(""), DevCoSerialize()]
+        public string ImageExpandedKey
+        {
+            get { return this.Cells[0].Images.ImageExpandedKey; }
+            set
+            {
+                this.SizeChanged = true;
+                this.Cells[0].Images.ImageExpandedKey = value;
+            }
+        }
+
+        /// <summary>
+        /// Property Editor support for ImageIndex selection
+        /// </summary>
+        [System.ComponentModel.Browsable(false), System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+        public System.Windows.Forms.ImageList ImageList
+        {
+            get
+            {
+                AdvTree tree = this.TreeControl;
+                if (tree != null)
+                {
+                    return tree.ImageList;
+                }
+                return null;
+            }
+        }
+
+        ///// <summary>
+        ///// Sets the node relative position form the root when map layout is used.
+        ///// </summary>
+        ///// <param name="pos">Relative node position.</param>
+        //internal void SetMapSubRootPosition(eMapPosition pos)
+        //{
+        //    m_MapSubRootPosition=pos;
+        //}
+
+        /// <summary>
+        /// Gets or sets the NodeConnector object that describes the type of the connector used for
+        /// displaying connection between current node and its parent node. 
+        /// Default value is null which means that settings from AdvTree control are used.
+        /// </summary>
+        /// <seealso cref="AdvTree.RootConnector">RootConnector Property (DevComponents.AdvTree.AdvTree)</seealso>
+        /// <seealso cref="AdvTree.NodesConnector">NodesConnector Property (DevComponents.AdvTree.AdvTree)</seealso>
+        [EditorBrowsable(EditorBrowsableState.Never), Browsable(false), Category("Connectors"), DefaultValue(null), Editor("DevComponents.AdvTree.Design.NodeConnectorTypeEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), Description("Indicates the nested nodes connector.")]
+        public NodeConnector ParentConnector
+        {
+            get { return m_ParentConnector; }
+            set
+            {
+                if (m_ParentConnector != value)
+                {
+                    if (m_ParentConnector != null)
+                        m_ParentConnector.AppearanceChanged -= new EventHandler(this.ConnectorAppearanceChanged);
+                    if (value != null)
+                        value.AppearanceChanged += new EventHandler(this.ConnectorAppearanceChanged);
+                    m_ParentConnector = value;
+                    this.OnDisplayChanged();
+                }
+            }
+        }
+
+        ///// <summary>
+        ///// Gets the collection of the parent connector line relative points. By default this collection is empty which indicates that
+        ///// connector line is drawn using predefined path. Points added here are the points through which the connector line will travel to the
+        ///// parent node. The point coordinates added to this collection are relative from the top-left corner of this node.
+        ///// </summary>
+        //[Browsable(true),Category("Connectors"),DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        //internal ConnectorPointsCollection ParentConnectorPoints
+        //{
+        //    get {return m_ParentConnectorPoints;}
+        //}
+
+        /// <summary>
+        /// Gets or sets whether node is visible.
+        /// </summary>
+        [Browsable(true), Category("Behavior"), DefaultValue(true), Description("Indicated whether node is visible"), DevCoSerialize()]
+        public bool Visible
+        {
+            get { return m_Visible; }
+            set
+            {
+                m_Visible = value;
+                this.OnVisibleChanged();
+                this.SizeChanged = true;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether command button is visible. Default value is false.
+        /// Command button can be used to display for example popup menu with commands for node,
+        /// or to display the list of linked nodes.
+        /// </summary>
+        [Browsable(true), DefaultValue(false), Category("Command Button"), Description("Indicates visibility of command button."), DevCoSerialize()]
+        internal bool CommandButton
+        {
+            get { return m_CommandButton; }
+            set
+            {
+                m_CommandButton = value;
+                this.OnDisplayChanged();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets internal value that indicates that node is on "path" of the selected node.
+        /// </summary>
+        internal bool SelectedConnectorMarker
+        {
+            get { return m_SelectedConnectorMarker; }
+            set { m_SelectedConnectorMarker = value; }
+        }
+
+        public void InternalDeselected(eTreeAction action)
+        {
+            OnDeselected(action);
+        }
+
+        /// <summary>
+        /// Called after node has been deselected.
+        /// </summary>
+        /// <param name="action">Provides information on how selection was performed</param>
+        protected virtual void OnDeselected(eTreeAction action)
+        {
+
+        }
+        /// <summary>
+        /// Called after node has been selected.
+        /// </summary>
+        /// <param name="action">Provides information on how selection was performed</param>
+        protected virtual void OnSelected(eTreeAction action)
+        {
+
+        }
+        public void InternalSelected(eTreeAction action)
+        {
+            OnSelected(action);
+        }
+
+        private bool _IsDragNode = false;
+        /// <summary>
+        /// Gets whether node is a drag node being used for drag & drop preview.
+        /// </summary>
+        [Browsable(false)]
+        public bool IsDragNode
+        {
+            get { return _IsDragNode; }
+#if FRAMEWORK20
+            internal set
+#else
+			set
+#endif
+            {
+                if (_IsDragNode != value)
+                {
+                    _IsDragNode = value;
+                    if (m_Nodes != null)
+                    {
+                        foreach (Node n in this.Nodes)
+                        {
+                            n.IsDragNode = value;
+                        }
+                    }
+                }
+            }
+        }
+
+        private bool _IsSelectionVisible = true;
+        /// <summary>
+        /// Gets or sets whether node selection is visible in UI when node is selected. Default value is true. You can
+        /// set this value to false to temporary disable the display of selection for a node.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsSelectionVisible
+        {
+            get { return _IsSelectionVisible; }
+            set
+            {
+                if (_IsSelectionVisible != value)
+                {
+                    _IsSelectionVisible = value;
+                    this.Invalidate();
+                }
+            }
+        }
+
+        private int _NodesIndent = 0;
+        /// <summary>
+        /// Gets or sets the additional indent for the child nodes that is added to the AdvTree.Indent value when performing child node layout. Default value i 0.
+        /// </summary>
+        [DefaultValue(0), Category("Appearance"), Description("additional indent for the child nodes that is added to the AdvTree.Indent value when performing child node layout")]
+        public int NodesIndent
+        {
+            get { return _NodesIndent; }
+            set
+            {
+                _NodesIndent = value;
+                this.InvalidateLayout(true);
+            }
+        }
+
+        #endregion
+
+        #region Methods
+        /// <summary>
+        /// Returns cell within a node which contains specified coordinates.
+        /// </summary>
+        /// <param name="x"></param>
+        /// <param name="y"></param>
+        /// <returns>Cell which contains specified coordinates or null/nothing if no cell contains coordinates.</returns>
+        public Cell GetCellAt(int x, int y)
+        {
+            Cell cellAt = null;
+            foreach (Cell cell in m_Cells)
+            {
+                if (!cell.IsVisible) continue;
+                Rectangle rCell = cell.Bounds;
+                if (rCell.Contains(x, y))
+                {
+                    cellAt = cell;
+                    break;
+                }
+            }
+            return cellAt;
+        }
+
+        private bool _CellNavigationEnabled = true;
+        /// <summary>
+        /// Gets or sets whether Left/Right navigation through the cells when SingleCellSelection on tree is set is enabled. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Browsable(false)]
+        public virtual bool CellNavigationEnabled
+        {
+            get
+            {
+                return _CellNavigationEnabled;
+            }
+            set
+            {
+                _CellNavigationEnabled = value;
+            }
+        }
+        internal void InternalKeyDown(KeyEventArgs e)
+        {
+            OnKeyDown(e);
+        }
+
+        protected virtual void OnKeyDown(KeyEventArgs e)
+        {
+
+        }
+
+        /// <summary>
+        /// Invalidates the layout for this node and causes the layout to be performed on next layout request.
+        /// </summary>
+        public void InvalidateLayout()
+        {
+            NodeOperations.InvalidateNodeLayout(this, false);
+        }
+        /// <summary>
+        /// Invalidates the layout for this node and causes the layout to be performed on next layout request.
+        /// </summary>
+        /// <param name="invalidateChildNodes">Indicates whether to invalidate layout for all child nodes as well.</param>
+        public void InvalidateLayout(bool invalidateChildNodes)
+        {
+            NodeOperations.InvalidateNodeLayout(this, invalidateChildNodes);
+        }
+
+        /// <summary>
+        /// Invalidates node and causes a paint message to be sent to the tree.
+        /// </summary>
+        public void Invalidate()
+        {
+            AdvTree tree = this.TreeControl;
+            if (tree != null)
+                tree.InvalidateNode(this);
+        }
+
+        /// <summary>Initiates the editing of node text.</summary>
+        /// <remarks>
+        /// This method by default edits text stored in Node.Text. Call to this method is
+        /// same as calling the overload method BeginData(0) with zero as parameter. Use BeginData
+        /// overload method to begin editing the specific column for multi-column nodes.
+        /// </remarks>
+        public void BeginEdit()
+        {
+            BeginEdit(0);
+        }
+
+        /// <summary>Initiates the editing of node text.</summary>
+        /// <param name="initialText">
+        /// The initial text to be entered into the edit TextBox. Specify null to use existing text.
+        /// </param>
+        public void BeginEdit(string initialText)
+        {
+            BeginEdit(0, initialText);
+        }
+
+        /// <summary>Initiates text editing of certain Node column.</summary>
+        /// <param name="iColumnIndex">
+        /// Zero based index of a column to begin editing for. Column 0 always corresponds to
+        /// Node.Text property.
+        /// </param>
+        public void BeginEdit(int iColumnIndex)
+        {
+            BeginEdit(iColumnIndex, null);
+        }
+
+        /// <summary>Initiates text editing of certain Node column.</summary>
+        /// <param name="iColumnIndex">
+        /// Zero based index of a column to begin editing for. Column 0 always corresponds to
+        /// Node.Text property.
+        /// </param>
+        /// <param name="initialText">
+        /// The initial text to be entered into the edit TextBox. Specify null to edit existing text.
+        /// </param>
+        public void BeginEdit(int iColumnIndex, string initialText)
+        {
+            AdvTree tree = this.TreeControl;
+            if (tree == null)
+                return;
+            Cell cell = this.Cells[iColumnIndex];
+            if (!cell.IsEditable)
+                throw new InvalidOperationException("Cell is not editable, either Cell.Editable=false or ColumnHeader.Editable=false.");
+            tree.EditCell(this.Cells[iColumnIndex], eTreeAction.Code, initialText);
+        }
+        /// <summary>
+        /// Creates new instance of the node for the Copy() and DeepCopy() methods. Allows you to returns your own node type copy if you inherit from node to add custom properties.
+        /// </summary>
+        /// <returns>New instance of a node.</returns>
+        protected virtual Node CreateCopyInstance()
+        {
+            return new Node();
+        }
+        /// <summary>Makes a "shallow" copy of a Node.</summary>
+        /// <remarks>
+        /// Shallow copy of a Node is a exact copy of Node but <strong>without</strong> copy
+        /// of all child nodes in Nodes collection.
+        /// </remarks>
+        public virtual Node Copy()
+        {
+            Node n = CreateCopyInstance();
+            CopyTo(n);
+            return n;
+        }
+        /// <summary>
+        /// Copies this node properties to a node.
+        /// </summary>
+        /// <param name="n">Node top copy properties to.</param>
+        protected virtual void CopyTo(Node n)
+        {
+            // TODO: Verify that all properties are copied
+            n.CellLayout = this.CellLayout;
+            n.Cells.Clear();
+            foreach (Cell c in this.Cells)
+                n.Cells.Add(c.Copy());
+            n.Checked = this.Checked;
+            n.CommandButton = this.CommandButton;
+            n.ExpandVisibility = this.ExpandVisibility;
+            n.Image = this.Image;
+            n.ImageDisabled = this.ImageDisabled;
+            n.ImageDisabledIndex = this.ImageDisabledIndex;
+            n.ImageExpanded = this.ImageExpanded;
+            n.ImageExpandedIndex = this.ImageExpandedIndex;
+            n.ImageIndex = this.ImageIndex;
+            n.ImageMouseOver = this.ImageMouseOver;
+            n.ImageMouseOverIndex = this.ImageMouseOverIndex;
+            n.Expanded = this.Expanded;
+            n.DragDropEnabled = this.DragDropEnabled;
+            n.CellLayout = this.CellLayout;
+            n.CellPartLayout = this.CellPartLayout;
+            n.CheckBoxAlignment = this.CheckBoxAlignment;
+            n.CheckBoxStyle = this.CheckBoxStyle;
+            n.CheckBoxThreeState = this.CheckBoxThreeState;
+            n.CheckBoxVisible = this.CheckBoxVisible;
+            n.CheckState = this.CheckState;
+            n.ContextMenu = this.ContextMenu;
+            n.DataKey = this.DataKey;
+            n.DragDropEnabled = this.DragDropEnabled;
+            n.Enabled = this.Enabled;
+            n.FullRowBackground = this.FullRowBackground;
+            n.ImageAlignment = this.ImageAlignment;
+            n.Selectable = this.Selectable;
+            //n.NodesColumnHeaderVisible=this.NodesColumnHeaderVisible;
+            foreach (ColumnHeader c in this.NodesColumns)
+                n.NodesColumns.Add(c.Copy());
+            n.ParentConnector = this.ParentConnector;
+            n.Style = this.Style;
+            n.StyleExpanded = this.StyleExpanded;
+            n.StyleMouseOver = this.StyleMouseOver;
+            n.StyleSelected = this.StyleSelected;
+            n.Tag = this.Tag;
+            n.DataKey = this.DataKey;
+            n.Text = this.Text;
+            n.Visible = this.Visible;
+            n.Name = this.Name;
+            //n.ParentConnectorPoints.AddRange(this.ParentConnectorPoints.ToArray());
+        }
+        /// <summary>Makes a "deep" copy of a node.</summary>
+        /// <remarks>
+        /// Deep copy of Node is a exact copy of Node including exact copies of all child nodes
+        /// in this node's Nodes collection.
+        /// </remarks>
+        public virtual Node DeepCopy()
+        {
+            Node n = this.Copy();
+            foreach (Node c in this.Nodes)
+                n.Nodes.Add(c.DeepCopy());
+            return n;
+        }
+
+        /// <summary>
+        /// Collapses the tree node.
+        /// </summary>
+        public void Collapse()
+        {
+            this.SetExpanded(false, eTreeAction.Code);
+        }
+
+        /// <summary>
+        /// Collapses the tree node.
+        /// </summary>
+        /// <param name="action">Action that caused the event</param>
+        public void Collapse(eTreeAction action)
+        {
+            this.SetExpanded(false, action);
+        }
+
+        /// <summary>
+        /// Collapses all the child tree nodes.
+        /// </summary>
+        public void CollapseAll()
+        {
+            AdvTree tree = this.TreeControl;
+            if (tree != null)
+                tree.BeginUpdate();
+            this.Collapse();
+            foreach (Node node in this.Nodes)
+                node.CollapseAll();
+            if (tree != null)
+                tree.EndUpdate();
+        }
+
+        /// <summary>
+        /// Ends the editing of the node text or column.
+        /// </summary>
+        /// <param name="cancelChanges"><strong>true</strong> if the editing of the tree node label text was canceled without being saved; otherwise, <strong>false</strong>. </param>
+        public void EndEdit(bool cancelChanges)
+        {
+            if (!this.IsEditing)
+                return;
+            AdvTree tree = this.TreeControl;
+            if (tree == null)
+                return;
+            if (cancelChanges)
+                tree.CancelCellEdit(eTreeAction.Code);
+            else
+                tree.EndCellEditing(eTreeAction.Code);
+        }
+
+        /// <summary>
+        /// Ensures that the node is visible, expanding nodes and scrolling the control as necessary.
+        /// </summary>
+        public void EnsureVisible()
+        {
+            NodeOperations.EnsureVisible(this, AdvTreeSettings.SelectedScrollIntoViewHorizontal);
+        }
+        /// <summary>
+        /// Ensures that the node is visible, expanding nodes and scrolling the control as necessary.
+        /// </summary>
+        /// <param name="ensureVisibleOption">Indicates the position within a tree visible area node is scrolled to</param>
+        public void EnsureVisible(eEnsureVisibleOption ensureVisibleOption)
+        {
+            NodeOperations.EnsureVisible(this, AdvTreeSettings.SelectedScrollIntoViewHorizontal, ensureVisibleOption);
+        }
+
+        /// <summary>
+        /// Expands the node.
+        /// </summary>
+        /// <remarks>
+        /// The Expand method expands the current Node down to the next level of nodes.
+        /// The state of a Node is persisted. For example, if the next level of child nodes was not collapsed previously, when the Expand method is called, the child nodes appear in their previously expanded state.
+        /// </remarks>
+        public void Expand()
+        {
+            SetExpanded(true, eTreeAction.Code);
+        }
+
+        /// <summary>
+        /// Expands the node.
+        /// </summary>
+        /// <remarks>
+        /// The Expand method expands the current Node down to the next level of nodes.
+        /// The state of a Node is persisted. For example, if the next level of child nodes was not collapsed previously, when the Expand method is called, the child nodes appear in their previously expanded state.
+        /// </remarks>
+        /// <param name="action">Action that caused the event.</param>
+        public void Expand(eTreeAction action)
+        {
+            SetExpanded(true, action);
+        }
+
+        /// <summary>
+        /// Expands all the child tree nodes.
+        /// </summary>
+        public void ExpandAll()
+        {
+            ExpandAll(eTreeAction.Code);
+        }
+        /// <summary>
+        /// Expands all the child tree nodes.
+        /// </summary>
+        public void ExpandAll(eTreeAction action)
+        {
+            AdvTree tree = this.TreeControl;
+            if (tree != null)
+                tree.BeginUpdate();
+            try
+            {
+                if (!this.Expanded) this.Expand(action);
+                foreach (Node node in this.Nodes)
+                {
+                    node.Expand(action);
+                    node.ExpandAll(action);
+                }
+            }
+            finally
+            {
+                if (tree != null)
+                    tree.EndUpdate();
+            }
+        }
+
+        /// <summary>
+        /// Removes the current node from the control.
+        /// </summary>
+        /// <remarks>
+        /// When the Remove method is called, the node and any child nodes assigned to the Node are removed from the Tree. The removed child nodes are removed from the Tree, but are still attached to this node.
+        /// </remarks>
+        public void Remove()
+        {
+            if (this.Parent != null)
+                this.Parent.Nodes.Remove(this);
+            else if (this.TreeControl != null && this.TreeControl.Nodes.Contains(this))
+                this.TreeControl.Nodes.Remove(this);
+        }
+
+        /// <summary>
+        /// Removes the current node from the control and provides information about source of action
+        /// </summary>
+        /// <remarks>
+        /// When the Remove method is called, the node and any child nodes assigned to the Node are removed from the Tree. The removed child nodes are removed from the Tree, but are still attached to this node.
+        /// </remarks>
+        public void Remove(eTreeAction source)
+        {
+            if (this.Parent != null)
+            {
+                this.Parent.Nodes.Remove(this, source);
+            }
+            else if (this.TreeControl != null && this.TreeControl.Nodes.Contains(this))
+            {
+                this.TreeControl.Nodes.Remove(this, source);
+            }
+        }
+
+        /// <summary>
+        /// Toggles the node to either the expanded or collapsed state.
+        /// </summary>
+        public void Toggle()
+        {
+            if (this.Expanded)
+                this.Collapse();
+            else
+                this.Expand();
+        }
+
+        /// <summary>
+        /// Toggles the node to either the expanded or collapsed state.
+        /// </summary>
+        /// <param name="action">Action that caused the event.</param>
+        public void Toggle(eTreeAction action)
+        {
+            if (this.Expanded)
+                this.Collapse(action);
+            else
+                this.Expand(action);
+        }
+
+        /// <summary>Returns string representation of the Node.</summary>
+        public override string ToString()
+        {
+            System.Text.StringBuilder build = new System.Text.StringBuilder();
+            int c = this.Cells.Count;
+            for (int i = 0; i < c; i++)
+            {
+                build.Append(this.Cells[i].Text);
+                if (i + 1 < c) build.Append(", ");
+            }
+            return build.ToString();
+        }
+
+        private bool _FullRowBackground = false;
+        /// <summary>
+        /// Gets or sets whether style background that is applied to the node is drawn across the width of the tree control instead of only
+        /// behind the node content. Default value is false.
+        /// </summary>
+        [DefaultValue(false), Category("Appearance"), Description("Indicates whether style background that is applied to the node is drawn across the width of the tree control instead of only behind the node content.")]
+        public bool FullRowBackground
+        {
+            get { return _FullRowBackground; }
+            set
+            {
+                if (_FullRowBackground != value)
+                {
+                    _FullRowBackground = value;
+                    this.SizeChanged = true;
+                    this.Invalidate();
+                }
+            }
+        }
+
+        internal void BeforeCellCheck(Cell cell, AdvTreeCellBeforeCheckEventArgs e)
+        {
+            OnBeforeCellCheck(cell, e);
+        }
+
+        protected virtual void OnBeforeCellCheck(Cell cell, AdvTreeCellBeforeCheckEventArgs e)
+        {
+        }
+        #endregion
+
+        #region Private Implementation
+        /// <summary>
+        /// Called after new cell has been added to Cells collection.
+        /// </summary>
+        /// <param name="cell">Reference to the new cell added.</param>
+        internal void OnCellInserted(Cell cell)
+        {
+            this.SizeChanged = true;
+            OnDisplayChanged();
+        }
+
+        /// <summary>
+        /// Called after cell has  been removed from Cells collection.
+        /// </summary>
+        /// <param name="cell">Reference to the removed cell.</param>
+        internal void OnCellRemoved(Cell cell)
+        {
+            this.SizeChanged = true;
+            OnDisplayChanged();
+        }
+
+        /// <summary>
+        /// Gets or sets the child column header height.
+        /// </summary>
+        internal int ColumnHeaderHeight
+        {
+            get { return m_ColumnHeaderHeight; }
+            set { m_ColumnHeaderHeight = value; }
+        }
+
+        /// <summary>
+        /// Occurs when property on the node has changed that influences the size of the node.
+        /// </summary>
+        private void OnSizeChanged()
+        {
+            if (m_SizeChanged)
+            {
+                AdvTree tree = this.TreeControl;
+                if (tree != null && !tree.IsUpdateSuspended)
+                {
+                    tree.SetPendingLayout();
+                    tree.Invalidate();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Occurs when any image property for the cell has changed.
+        /// </summary>
+        internal void OnImageChanged()
+        {
+            if (m_SizeChanged) return;
+
+            if (this.Parent != null)
+                this.Parent.OnChildNodesSizeChanged();
+            else
+                this.SizeChanged = true;
+            OnDisplayChanged();
+        }
+
+        /// <summary>
+        /// Occurs when size of the child nodes has changed.
+        /// </summary>
+        internal void OnChildNodesSizeChanged()
+        {
+            foreach (Node node in this.Nodes)
+            {
+                node.SizeChanged = true;
+                node.OnChildNodesSizeChanged();
+            }
+        }
+        private void OnColumnHeaderSizeChanged(object sender, EventArgs e)
+        {
+            if (this.Expanded)
+                this.SizeChanged = true;
+        }
+        private void SetExpanded(bool e, eTreeAction action)
+        {
+            if (e == m_Expanded)
+                return;
+
+            INodeNotify notification = GetINodeNotify();
+            if (notification != null)
+            {
+                AdvTreeNodeCancelEventArgs cancelArgs = new AdvTreeNodeCancelEventArgs(action, this);
+                if (e)
+                    notification.OnBeforeExpand(cancelArgs);
+                else
+                    notification.OnBeforeCollapse(cancelArgs);
+                if (cancelArgs.Cancel)
+                    return;
+            }
+#if TRIAL
+			if(NodeOperations.ColorCountExp==0)
+				return;
+#endif
+            OnExpandChanging(e, action);
+            m_Expanded = e;
+
+            if (notification != null)
+                notification.ExpandedChanged(this);
+
+            if (notification != null)
+            {
+                AdvTreeNodeEventArgs args = new AdvTreeNodeEventArgs(action, this);
+                if (e)
+                    notification.OnAfterExpand(args);
+                else
+                    notification.OnAfterCollapse(args);
+            }
+
+            foreach (Node node in this.Nodes)
+            {
+                node.OnParentExpandedChanged(m_Expanded);
+            }
+
+            this.SizeChanged = true;
+            this.OnDisplayChanged();
+        }
+        /// <summary>
+        /// Called before Expanded state of the node has changed.
+        /// </summary>
+        /// <param name="expanded">New Expand State</param>
+        /// <param name="action">Action Source</param>
+        protected virtual void OnExpandChanging(bool expanded, eTreeAction action)
+        {
+
+        }
+
+        internal void OnParentExpandedChanged(bool expanded)
+        {
+            foreach (Cell cell in this.Cells)
+                cell.OnParentExpandedChanged(expanded);
+            foreach (Node node in this.Nodes)
+            {
+                node.OnParentExpandedChanged(expanded);
+            }
+        }
+
+        private AdvTree GetTreeControl()
+        {
+            Node node = this;
+            while (node.Parent != null)
+                node = node.Parent;
+            return node.internalTreeControl;
+        }
+        private INodeNotify GetINodeNotify()
+        {
+            AdvTree tree = this.TreeControl;
+            if (tree != null) return tree as INodeNotify;
+            return null;
+        }
+        private void ElementStyleChanged(object sender, EventArgs e)
+        {
+            this.SizeChanged = true;
+            this.OnDisplayChanged();
+        }
+        /// <summary>
+        /// Called when visual part of the node has changed due to the changes of its properties or properties of the cells contained by node.
+        /// </summary>
+        internal virtual void OnDisplayChanged()
+        {
+            AdvTree tree = this.TreeControl;
+            if (tree != null && !tree.SuspendPaint)
+            {
+                if (this.SizeChanged)
+                {
+                    if (!tree.IsRepositioningControls)
+                        tree.RecalcLayout();
+                    else
+                        tree.SetPendingLayout();
+                }
+                tree.Invalidate(true);
+            }
+        }
+
+        private void ConnectorAppearanceChanged(object sender, EventArgs e)
+        {
+            this.OnDisplayChanged();
+        }
+
+        /// <summary>
+        /// Called after new node has been added to Nodes collection.
+        /// </summary>
+        /// <param name="node">Reference to the new node.</param>
+        internal void OnChildNodeInserted(Node node)
+        {
+            SizeChanged = true;
+            if (node.Cells.Count > 1)
+                node.SizeChanged = true;
+        }
+
+        /// <summary>
+        /// Called after node has been removed from Nodes collection.
+        /// </summary>
+        /// <param name="node">Reference to the node that is removed.</param>
+        internal void OnChildNodeRemoved(Node node)
+        {
+            SizeChanged = true;
+            if (node.IsSelected)
+            {
+                if (this.TreeControl != null)
+                    this.TreeControl.SelectedNode = null;
+            }
+        }
+
+        internal void OnVisibleChanged()
+        {
+            foreach (Cell cell in this.Cells)
+            {
+                cell.OnVisibleChanged();
+            }
+
+            foreach (Node node in this.Nodes)
+            {
+                node.OnVisibleChanged();
+            }
+        }
+
+        /// <summary>
+        /// Creates new cells based on the columns defined on either parent node or the columns in tree control. Node
+        /// must be parented so it can get reference to a parent tree control.
+        /// </summary>
+        public void CreateCells()
+        {
+            AdvTree tree = this.TreeControl;
+            if (this.Parent == null && tree == null)
+                throw new NullReferenceException("Node must have a parent or be added to AdvTree.Nodes collection to use this method.");
+            Node parent = this.Parent;
+
+            int columnsCount = 0;
+            if (parent != null && parent.NodesColumns.Count > 0)
+            {
+                columnsCount = parent.NodesColumns.Count;
+            }
+            else if (tree != null && tree.Columns.Count > 0)
+            {
+                columnsCount = tree.Columns.Count;
+            }
+
+            if (columnsCount == 0) return;
+
+            for (int i = this.Cells.Count; i < columnsCount; i++)
+            {
+                this.Cells.Add(new Cell());
+            }
+        }
+
+        internal void OnNodesCleared()
+        {
+            this.SizeChanged = true;
+        }
+
+        internal bool IsKeyboardNavigationEnabled(KeyEventArgs e)
+        {
+            return CanKeyboardNavigate(e);
+        }
+
+        protected virtual bool CanKeyboardNavigate(KeyEventArgs e)
+        {
+            return true;
+        }
+
+        internal void InvokeKeyboardPaste(KeyEventArgs args)
+        {
+            OnKeyboardPaste(args);
+        }
+
+        protected virtual void OnKeyboardPaste(KeyEventArgs args)
+        {
+
+        }
+
+        internal void InvokeKeyboardCopy(KeyEventArgs args)
+        {
+            OnKeyboardCopy(args);
+        }
+
+        protected virtual void OnKeyboardCopy(KeyEventArgs args)
+        {
+
+        }
+
+        #endregion
+
+        #region Event Invocation
+        protected internal virtual void InvokeNodeMouseDown(object sender, MouseEventArgs e)
+        {
+            if (NodeMouseDown != null)
+                NodeMouseDown(this, e);
+
+            foreach (Cell cell in m_Cells)
+            {
+                cell.InvokeNodeMouseDown(sender, e);
+            }
+        }
+
+        protected internal virtual void InvokeNodeMouseUp(object sender, MouseEventArgs e)
+        {
+            if (NodeMouseUp != null)
+                NodeMouseUp(this, e);
+
+            foreach (Cell cell in m_Cells)
+            {
+                cell.InvokeNodeMouseUp(sender, e);
+            }
+        }
+
+        protected internal virtual void InvokeNodeMouseMove(object sender, MouseEventArgs e)
+        {
+            if (NodeMouseMove != null)
+                NodeMouseMove(this, e);
+
+            foreach (Cell cell in m_Cells)
+            {
+                cell.InvokeNodeMouseMove(sender, e);
+            }
+        }
+
+        /// <summary>
+        /// Raises the Click event on node and parent tree if available.
+        /// </summary>
+        public void RaiseClick()
+        {
+            AdvTree tree = this.TreeControl;
+            TreeNodeMouseEventArgs e = new TreeNodeMouseEventArgs(this, MouseButtons.None, 0, 0, 0, 0);
+            if (tree == null)
+            {
+                InvokeNodeClick(this, e);
+            }
+            else
+            {
+                tree.InternalInvokeNodeClick(e);
+            }
+        }
+
+        protected internal virtual void InvokeNodeClick(object sender, EventArgs e)
+        {
+            if (NodeClick != null)
+                NodeClick(this, e);
+
+            foreach (Cell cell in m_Cells)
+            {
+                cell.InvokeNodeClick(sender, e);
+            }
+        }
+
+        protected internal virtual void InvokeNodeDoubleClick(object sender, EventArgs e)
+        {
+            OnNodeDoubleClick(e);
+        }
+
+        protected virtual void OnNodeDoubleClick(EventArgs e)
+        {
+            if (NodeDoubleClick != null)
+                NodeDoubleClick(this, e);
+        }
+        protected internal virtual void InvokeNodeMouseEnter(object sender, EventArgs e)
+        {
+            if (NodeMouseEnter != null)
+                NodeMouseEnter(this, e);
+        }
+
+        protected internal virtual void InvokeNodeMouseLeave(object sender, EventArgs e)
+        {
+            if (NodeMouseLeave != null)
+                NodeMouseLeave(this, e);
+
+            foreach (Cell cell in m_Cells)
+            {
+                cell.InvokeNodeMouseLeave(sender, e);
+            }
+        }
+
+        protected internal virtual void InvokeNodeMouseHover(object sender, EventArgs e)
+        {
+            if (NodeMouseHover != null)
+                NodeMouseHover(this, e);
+
+            foreach (Cell cell in m_Cells)
+            {
+                if (cell.IsMouseOver)
+                {
+                    cell.InvokeNodeMouseHover(sender, e);
+                }
+            }
+        }
+
+        internal bool FireHoverEvent
+        {
+            get { return NodeMouseHover != null || CellsHaveHostedItemOrTooltip; }
+        }
+
+        private bool CellsHaveHostedItemOrTooltip
+        {
+            get
+            {
+                foreach (Cell cell in m_Cells)
+                {
+                    if (cell.HostedItem != null || !string.IsNullOrEmpty(cell.Tooltip)) return true;
+                }
+                return false;
+            }
+        }
+        protected internal virtual void InvokeMarkupLinkClick(Cell cell, MarkupLinkClickEventArgs args)
+        {
+            if (MarkupLinkClick != null)
+                MarkupLinkClick(cell, args);
+            AdvTree tree = this.TreeControl;
+            if (tree != null)
+                tree.InvokeMarkupLinkClick(cell, args);
+        }
+        #endregion
+
+        #region Accessibility
+        /// <summary>
+        /// Gets the AccessibleObject assigned to the item.
+        /// </summary>
+        [System.ComponentModel.Browsable(false)]
+        public virtual System.Windows.Forms.AccessibleObject AccessibleObject
+        {
+            get
+            {
+                return CreateAccessibilityInstance();
+            }
+        }
+        private NodeAccessibleObject _NodeAccessibleObject = null;
+        protected virtual System.Windows.Forms.AccessibleObject CreateAccessibilityInstance()
+        {
+            if (_NodeAccessibleObject == null)
+                _NodeAccessibleObject = new NodeAccessibleObject(this);
+            return _NodeAccessibleObject;
+        }
+
+        private string _AccessibleDefaultActionDescription = "";
+        /// <summary>
+        /// Gets or sets the default action description of the control for use by accessibility client applications.
+        /// </summary>
+        [Browsable(true), Category("Accessibility"),DefaultValue(""),Description("Gets or sets the default action description of the control for use by accessibility client applications.")]
+        public virtual string AccessibleDefaultActionDescription
+        {
+            get { return _AccessibleDefaultActionDescription; }
+            set { _AccessibleDefaultActionDescription = value; }
+        }
+
+        private string _AccessibleDescription = "";
+        /// <summary>
+        /// Gets or sets the description of the control used by accessibility client applications.
+        /// </summary>
+        [Browsable(true), Category("Accessibility"),DefaultValue(""),Description("Gets or sets the description of the control used by accessibility client applications.")]
+        public virtual string AccessibleDescription
+        {
+            get { return _AccessibleDescription; }
+            set
+            {
+                if (_AccessibleDescription != value)
+                {
+                    _AccessibleDescription = value;
+                    GenerateAccessibilityEvent(System.Windows.Forms.AccessibleEvents.DescriptionChange);
+                }
+            }
+        }
+
+        private string _AccessibleName = "";
+        /// <summary>
+        /// Gets or sets the name of the control used by accessibility client applications.
+        /// </summary>
+        [Browsable(true), Category("Accessibility"),Description("Gets or sets the name of the control used by accessibility client applications."),DefaultValue("")]
+        public virtual string AccessibleName
+        {
+            get { return _AccessibleName; }
+            set
+            {
+                if (_AccessibleName != value)
+                {
+                    _AccessibleName = value;
+                    GenerateAccessibilityEvent(System.Windows.Forms.AccessibleEvents.NameChange);
+                }
+            }
+        }
+
+        private System.Windows.Forms.AccessibleRole _AccessibleRole = System.Windows.Forms.AccessibleRole.OutlineItem;
+        /// <summary>
+        /// Gets or sets the accessible role of the item.
+        /// </summary>
+        [Browsable(true), Category("Accessibility"),Description("Gets or sets the accessible role of the item."),DefaultValue(System.Windows.Forms.AccessibleRole.OutlineItem)]
+        public virtual System.Windows.Forms.AccessibleRole AccessibleRole
+        {
+            get { return _AccessibleRole; }
+            set { _AccessibleRole = value; }
+        }
+
+        private bool _IsAccessible = true;
+        /// <summary>
+        /// Gets or sets a value indicating whether the node is visible to accessibility applications.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
+        public virtual bool IsAccessible
+        {
+            get { return _IsAccessible; }
+            set { _IsAccessible = value; }
+        }
+
+        internal void GenerateAccessibilityEvent(System.Windows.Forms.AccessibleEvents e)
+        {
+            AdvTree tree = this.TreeControl;
+            if (tree == null) return;
+
+            AdvTree.AdvTreeAccessibleObject a = tree.AccessibilityObject as AdvTree.AdvTreeAccessibleObject;
+            if (a != null)
+                a.GenerateEvent(this, e);
+        }
+        #endregion
+
+        #region IComparable Members
+        /// <summary>
+        /// Provides implementation for IComparable interface. This is used for sorting and it compares the Text property on nodes.
+        /// </summary>
+        /// <param name="obj"></param>
+        /// <returns></returns>
+        public int CompareTo(object obj)
+        {
+            if (obj is Node)
+            {
+                Node node = obj as Node;
+                return Utilities.CompareAlphaNumeric(this.Text, node.Text);
+            }
+            return -1;
+        }
+
+        #endregion
+    }
+
+    #region ItemAccessibleObject
+    public class NodeAccessibleObject : System.Windows.Forms.AccessibleObject
+    {
+        private Node _Owner = null;
+        public NodeAccessibleObject(Node owner)
+        {
+            _Owner = owner;
+        }
+
+        internal Node Owner
+        {
+            get { return _Owner; }
+        }
+
+        public override string Name
+        {
+            get
+            {
+                if (_Owner == null)
+                    return "";
+
+                if (_Owner.AccessibleName != "")
+                    return _Owner.AccessibleName;
+
+                return _Owner.Text.Replace("&", "");
+            }
+            set
+            {
+                _Owner.AccessibleName = value;
+            }
+        }
+
+        public override string Description
+        {
+            get
+            {
+                if (_Owner == null)
+                    return "";
+                if (_Owner.AccessibleDescription != "")
+                    return _Owner.AccessibleDescription;
+                return Name + " Tree Node";
+            }
+        }
+
+        public override System.Windows.Forms.AccessibleRole Role
+        {
+            get
+            {
+                if (_Owner == null || !_Owner.IsAccessible)
+                    return System.Windows.Forms.AccessibleRole.None;
+
+                if (_Owner.AccessibleRole != System.Windows.Forms.AccessibleRole.Default)
+                    return _Owner.AccessibleRole;
+                return AccessibleRole.OutlineItem;
+            }
+        }
+
+        public override System.Windows.Forms.AccessibleStates State
+        {
+            get
+            {
+                if (_Owner == null)
+                    return System.Windows.Forms.AccessibleStates.Unavailable;
+                System.Windows.Forms.AccessibleStates state = 0;
+
+                if (!_Owner.IsAccessible)
+                    return System.Windows.Forms.AccessibleStates.Unavailable;
+
+                if (!_Owner.Visible)
+                    state |= System.Windows.Forms.AccessibleStates.Invisible;
+                else
+                {
+                    if (_Owner.IsSelected)
+                        state = AccessibleStates.Selected;
+                    if (_Owner.Expanded)
+                        state |= System.Windows.Forms.AccessibleStates.Expanded;
+                    else
+                        state |= System.Windows.Forms.AccessibleStates.Collapsed;
+                }
+                return state;
+            }
+        }
+
+        public override System.Windows.Forms.AccessibleObject Parent
+        {
+            get
+            {
+                if (_Owner == null)
+                    return null;
+                if (_Owner.Parent != null)
+                {
+                    return _Owner.Parent.AccessibleObject;
+                }
+
+                System.Windows.Forms.Control control = _Owner.TreeControl as System.Windows.Forms.Control;
+                if (control != null)
+                    return control.AccessibilityObject;
+                return null;
+            }
+        }
+
+        public override System.Drawing.Rectangle Bounds
+        {
+            get
+            {
+                if (_Owner == null)
+                    return System.Drawing.Rectangle.Empty;
+                System.Windows.Forms.Control objCtrl = _Owner.TreeControl as System.Windows.Forms.Control;
+                if (objCtrl != null)
+                    return objCtrl.RectangleToScreen(_Owner.Bounds);
+                else
+                    return _Owner.Bounds;
+            }
+        }
+
+        public override int GetChildCount()
+        {
+            if (_Owner == null || !_Owner.HasChildNodes)
+                return 0;
+            return _Owner.Nodes.Count;
+        }
+
+        public override System.Windows.Forms.AccessibleObject GetChild(int iIndex)
+        {
+            if (_Owner == null)
+                return null;
+            return _Owner.Nodes[iIndex].AccessibleObject;
+        }
+
+        public override string DefaultAction
+        {
+            get
+            {
+                if (_Owner.AccessibleDefaultActionDescription != "")
+                    return _Owner.AccessibleDefaultActionDescription;
+                if (_Owner.Expanded)
+                    return "Collapse";
+                else if (_Owner.Nodes.Count > 0 || _Owner.ExpandVisibility == eNodeExpandVisibility.Visible)
+                    return "Expand";
+                return "Press";
+            }
+        }
+
+        public override void DoDefaultAction()
+        {
+            if (_Owner == null)
+                return;
+            _Owner.Toggle();
+
+            base.DoDefaultAction();
+        }
+
+        public override string KeyboardShortcut
+        {
+            get
+            {
+                return ""; // _Owner.ShortcutString;
+            }
+        }
+
+        public override System.Windows.Forms.AccessibleObject GetSelected()
+        {
+            if (_Owner == null)
+                return base.GetSelected();
+            if (_Owner.IsSelected)
+                return _Owner.AccessibleObject;
+
+            return base.GetSelected();
+        }
+
+        public override System.Windows.Forms.AccessibleObject HitTest(int x, int y)
+        {
+            if (_Owner == null)
+                return base.HitTest(x, y);
+
+            Point screen = new Point(x, y);
+            AdvTree tree = _Owner.TreeControl;
+            if (tree == null) return base.HitTest(x, y);
+
+            Point p = tree.PointToClient(screen);
+            Node node = tree.GetNodeAt(p);
+            if (node != null) return node.AccessibleObject;
+
+            return base.HitTest(x, y);
+        }
+
+        public override System.Windows.Forms.AccessibleObject Navigate(System.Windows.Forms.AccessibleNavigation navDir)
+        {
+            if (_Owner == null)
+                return base.Navigate(navDir);
+
+            Node item = null;
+
+            if (navDir == System.Windows.Forms.AccessibleNavigation.Down || navDir == System.Windows.Forms.AccessibleNavigation.Right
+            || navDir == System.Windows.Forms.AccessibleNavigation.Next)
+            {
+                item = NodeOperations.GetNextVisibleNode(_Owner);
+            }
+            else if (navDir == System.Windows.Forms.AccessibleNavigation.FirstChild)
+            {
+                item = GetFirstVisible(_Owner.Nodes, 0);
+            }
+            else if (navDir == System.Windows.Forms.AccessibleNavigation.LastChild)
+            {
+                item = GetFirstVisibleReverse(_Owner.Nodes, _Owner.Nodes.Count - 1);
+            }
+            else if (navDir == System.Windows.Forms.AccessibleNavigation.Up || navDir == System.Windows.Forms.AccessibleNavigation.Left
+                || navDir == System.Windows.Forms.AccessibleNavigation.Previous)
+            {
+                item = NodeOperations.GetPreviousVisibleNode(_Owner);
+            }
+
+            if (item != null)
+                return item.AccessibleObject;
+
+            return base.Navigate(navDir);
+        }
+
+        private Node GetFirstVisible(NodeCollection col, int startIndex)
+        {
+            int count = col.Count;
+
+            for (int i = startIndex; i < count; i++)
+            {
+                if (col[i].Visible)
+                    return col[i];
+            }
+            return null;
+        }
+
+        private Node GetFirstVisibleReverse(NodeCollection col, int startIndex)
+        {
+            for (int i = startIndex; i >= 0; i--)
+            {
+                if (col[i].Visible)
+                    return col[i];
+            }
+            return null;
+        }
+
+    }
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/NodeCollection.cs b/PROMS/DotNetBar Source Code/AdvTree/NodeCollection.cs
new file mode 100644
index 00000000..05a8957d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/NodeCollection.cs	
@@ -0,0 +1,502 @@
+using System;
+using System.Collections;
+using System.ComponentModel;
+
+namespace DevComponents.AdvTree
+{
+	/// <summary>
+	/// Represents collection for Node objects.
+	/// </summary>
+	public class NodeCollection:CollectionBase 
+	{
+		#region Private Variables
+		private Node m_ParentNode=null;
+		private AdvTree m_TreeControl=null;
+		private eTreeAction m_SourceAction=eTreeAction.Code;
+        private bool _PassiveCollection = false;
+		#endregion
+
+		#region Internal Implementation
+		public NodeCollection()
+		{
+		}
+        internal eTreeAction SourceAction
+        {
+            get
+            {
+                return m_SourceAction;
+            }
+            set
+            {
+                m_SourceAction = value;
+            }
+        }
+        internal bool PassiveCollection
+        {
+            get { return _PassiveCollection; }
+            set
+            {
+                _PassiveCollection = value;
+            }
+        }
+		/// <summary>
+		/// Gets or sets the node this collection is associated with.
+		/// </summary>
+		[Browsable(false),DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public Node ParentNode
+		{
+			get {return m_ParentNode;}
+		}
+		/// <summary>
+		/// Sets the node collection belongs to.
+		/// </summary>
+		/// <param name="parent">Node that is parent of this collection.</param>
+		internal void SetParentNode(Node parent)
+		{
+			m_ParentNode=parent;
+		}
+
+		internal AdvTree TreeControl
+		{
+			get {return m_TreeControl;}
+			set {m_TreeControl=value;}
+		}
+
+		/// <summary>
+		/// Adds new object to the collection.
+		/// </summary>
+		/// <param name="node">Object to add.</param>
+		/// <returns>Index of newly added object.</returns>
+		public virtual int Add(Node node)
+		{
+			return Add(node, eTreeAction.Code);
+		}
+		
+		/// <summary>
+		/// Adds new object to the collection and provides information about the source of the command
+		/// </summary>
+		/// <param name="node">Node to add</param>
+		/// <param name="action">Source action</param>
+		/// <returns></returns>
+		public virtual int Add(Node node, eTreeAction action)
+		{
+			m_SourceAction = action;
+			return List.Add(node);
+		}
+		
+		/// <summary>
+		/// Adds an array of objects to the collection. 
+		/// </summary>
+		/// <param name="nodes">Array of Node objects.</param>
+		public virtual void AddRange(Node[] nodes)
+		{
+			foreach(Node node in nodes)
+				this.Add(node);
+		}
+		
+		/// <summary>
+		/// Returns reference to the object in collection based on it's index.
+		/// </summary>
+		public Node this[int index]
+		{
+			get {return (Node)(List[index]);}
+			set {List[index] = value;}
+		}
+
+		/// <summary>
+		/// Inserts new object into the collection.
+		/// </summary>
+		/// <param name="index">Position of the object.</param>
+		/// <param name="value">Object to insert.</param>
+		public virtual void Insert(int index, Node value) 
+		{
+			List.Insert(index, value);
+		}
+		
+		/// <summary>
+		/// Inserts new object into the collection.
+		/// </summary>
+		/// <param name="index">Position of the object.</param>
+		/// <param name="value">Object to insert.</param>
+		/// <param name="action">Action that is causing the event</param>
+        public virtual void Insert(int index, Node value, eTreeAction action) 
+		{
+			m_SourceAction = action;
+			List.Insert(index, value);
+		}
+
+		/// <summary>
+		/// Returns index of the object inside of the collection.
+		/// </summary>
+		/// <param name="value">Reference to the object.</param>
+		/// <returns>Index of the object.</returns>
+		public int IndexOf(Node value) 
+		{
+			return List.IndexOf(value);
+		}
+
+		/// <summary>
+		/// Returns whether collection contains specified object.
+		/// </summary>
+		/// <param name="value">Object to look for.</param>
+		/// <returns>true if object is part of the collection, otherwise false.</returns>
+		public bool Contains(Node value) 
+		{
+			return List.Contains(value);
+		}
+
+		/// <summary>
+		/// Removes specified object from the collection.
+		/// </summary>
+		/// <param name="value"></param>
+		public virtual void Remove(Node value) 
+		{
+			List.Remove(value);
+		}
+		
+		/// <summary>
+		/// Removes specified object from the collection and provides information about source of the command
+		/// </summary>
+		/// <param name="node">Node to remove</param>
+		/// <param name="action">Source action</param>
+		public virtual void Remove(Node node, eTreeAction action)
+		{
+			m_SourceAction = action;
+			List.Remove(node);
+		}
+		
+		protected override void OnRemove(int index, object value)
+		{
+            if (!_PassiveCollection)
+            {
+                AdvTree tree = GetTreeControl();
+                if (tree != null)
+                    tree.InvokeBeforeNodeRemove(m_SourceAction, value as Node, m_ParentNode);
+            }
+			base.OnRemove (index, value);
+		}
+
+
+		protected override void OnRemoveComplete(int index,object value)
+		{
+			base.OnRemoveComplete(index,value);
+            NodeRemoveComplete(index, value);
+		}
+
+        private void NodeRemoveComplete(int index, object value)
+        {
+            if (!_PassiveCollection)
+            {
+                Node node = value as Node;
+                node.SetParent(null);
+                node.internalTreeControl = null;
+                if (m_ParentNode != null) m_ParentNode.OnChildNodeRemoved(node);
+
+                AdvTree tree = GetTreeControl();
+                if (tree != null)
+                {
+                    //tree.InvokeAfterNodeRemove(m_SourceAction, value as Node, m_ParentNode);
+                    tree.NodeRemoved(m_SourceAction, value as Node, m_ParentNode, index);
+                }
+            }
+        }
+
+        protected override void OnSetComplete(int index, object oldValue, object newValue)
+        {
+            base.OnSetComplete(index, oldValue, newValue);
+
+            NodeRemoveComplete(index, oldValue);
+            NodeInsertComplete(newValue);
+        }
+
+        protected override void OnSet(int index, object oldValue, object newValue)
+        {
+            if (!_PassiveCollection)
+            {
+                AdvTree tree = GetTreeControl();
+
+                if (tree != null)
+                    tree.InvokeBeforeNodeRemove(m_SourceAction, oldValue as Node, m_ParentNode);
+
+                if (tree != null)
+                    tree.InvokeBeforeNodeInsert(m_SourceAction, newValue as Node, m_ParentNode);
+            }
+            base.OnSet(index, oldValue, newValue);
+        }
+		
+		protected override void OnInsert(int index, object value)
+		{
+            if (!_PassiveCollection)
+            {
+                AdvTree tree = GetTreeControl();
+                if (tree != null)
+                    tree.InvokeBeforeNodeInsert(m_SourceAction, value as Node, m_ParentNode);
+            }
+			base.OnInsert (index, value);
+		}
+
+		protected override void OnInsertComplete(int index,object value)
+		{
+			base.OnInsertComplete(index,value);
+            NodeInsertComplete(value);
+		}
+
+        private void NodeInsertComplete(object value)
+        {
+            if (!_PassiveCollection)
+            {
+                Node node = value as Node;
+                if (m_ParentNode != null)
+                {
+                    if (node.Parent != null && node.Parent != m_ParentNode)
+                        node.Remove();
+                    node.SetParent(m_ParentNode);
+                    if (m_ParentNode.NodesColumns.IsSorted)
+                    {
+                        AdvTree parentTree = m_TreeControl;
+                        if (parentTree == null) parentTree = m_ParentNode.TreeControl;
+                        if (parentTree != null)
+                            parentTree.PushSortRequest(m_ParentNode);
+                    }
+                }
+                else
+                {
+                    if (node.Parent != null)
+                        node.Remove();
+                    else
+                        node.InvokeOnParentChanged();
+                    if (m_TreeControl != null && m_TreeControl.Columns.IsSorted)
+                    {
+                        m_TreeControl.PushSortRequest();
+                    }
+                }
+                node.internalTreeControl = m_TreeControl;
+
+                if (m_ParentNode != null)
+                    m_ParentNode.OnChildNodeInserted(node);
+                else
+                    node.SizeChanged = true;
+
+                AdvTree tree = GetTreeControl();
+                if (tree != null)
+                    tree.InvokeAfterNodeInsert(m_SourceAction, value as Node, m_ParentNode);
+            }
+            m_SourceAction = eTreeAction.Code;
+        }
+        /// <summary>
+		/// Copies collection into the specified array.
+		/// </summary>
+		/// <param name="array">Array to copy collection to.</param>
+		/// <param name="index">Starting index.</param>
+		public void CopyTo(Node[] array, int index) 
+		{
+			List.CopyTo(array, index);
+		}
+
+		/// <summary>
+		/// Copies contained items to the Node array.
+		/// </summary>
+		/// <param name="array">Array to copy to.</param>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+        public void CopyTo(Node[] array)
+		{
+			List.CopyTo(array,0);
+		}
+
+		protected override void OnClear()
+		{
+            if (!_PassiveCollection)
+            {
+                foreach (Node node in this.List)
+                {
+                    node.SetParent(null);
+                    node.internalTreeControl = null;
+                }
+            }
+           
+			base.OnClear();
+		}
+
+        protected override void OnClearComplete()
+        {
+            if (m_TreeControl != null && !PassiveCollection)
+            {
+                m_TreeControl.OnNodesCleared();
+            }
+            else if (m_ParentNode != null && !PassiveCollection)
+                m_ParentNode.OnNodesCleared();
+
+            AdvTree tree = GetTreeControl();
+            if (tree != null)
+            {
+                tree.ValidateSelectedNode();
+            }
+
+            base.OnClearComplete();
+        }
+		
+		private AdvTree GetTreeControl()
+		{
+			if(m_TreeControl!=null)
+				return m_TreeControl;
+			if(m_ParentNode!=null)
+				return m_ParentNode.TreeControl;
+			return null;
+		}
+
+        /// <summary>
+        /// Sorts the elements in the entire collection using the IComparable implementation of each element.
+        /// </summary>
+        public virtual void Sort()
+        {
+            this.Sort(0, this.Count, Comparer.Default);
+        }
+        /// <summary>
+        /// Sorts the elements in the entire collection using the specified comparer.
+        /// </summary>
+        /// <param name="comparer">The IComparer implementation to use when comparing elements.-or- null to use the IComparable implementation of each element.</param>
+        public virtual void Sort(IComparer comparer)
+        {
+            this.Sort(0, this.Count, comparer);
+        }
+        /// <summary>
+        /// Sorts the elements in a range of elements in collection using the specified comparer.
+        /// </summary>
+        /// <param name="index"></param>
+        /// <param name="count"></param>
+        /// <param name="comparer"></param>
+        public virtual void Sort(int index, int count, IComparer comparer)
+        {
+            AdvTree tree = GetTreeControl();
+            if (!_PassiveCollection && tree != null)
+                tree.BeginUpdate();
+
+            this.InnerList.Sort(index, count, comparer);
+
+            if (tree != null && tree.DeepSort)
+            {
+                foreach (Node node in this.InnerList)
+                {
+                    node.Nodes.Sort(0, node.Nodes.Count, comparer);
+                }
+            }
+
+            if (!_PassiveCollection && tree != null)
+                tree.EndUpdate(); 
+        }
+        
+        /// <summary>
+        /// Finds the tree nodes with specified key, optionally searching sub-nodes.
+        /// </summary>
+        /// <param name="name">The name of the tree node to search for.</param>
+        /// <param name="searchAllChildren">true to search child nodes of tree nodes; otherwise, false. </param>
+        /// <returns>An array of Node objects whose Name property matches the specified key.</returns>
+        public Node[] Find(string name,	bool searchAllChildren)
+        {
+            ArrayList list = new ArrayList();
+            NodeOperations.FindNodesByName(this, name, searchAllChildren, list);
+            Node[] nodes = new Node[list.Count];
+            if (list.Count > 0) list.CopyTo(nodes);
+            return nodes;
+        }
+
+		#endregion
+	}
+
+    #region Node Comparer
+    public class NodeComparer : IComparer
+    {
+        private int _ColumnIndex = 0;
+        /// <summary>
+        /// Creates new instance of NodeComparer class. You can use NodeComparer to sort the nodes by specific column/cell by calling
+        /// NodeCollection.Sort method and pass new instance of NodeComparer class. 
+        /// </summary>
+        public NodeComparer()
+        {
+        }
+        /// <summary>
+        /// Creates new instance of NodeComparer class. You can use NodeComparer to sort the nodes by specific column/cell by calling
+        /// NodeCollection.Sort method and pass new instance of NodeComparer class. 
+        /// </summary>
+        /// <param name="columnIndex">Column/Cell index to use for sorting.</param>
+        public NodeComparer(int columnIndex)
+        {
+            _ColumnIndex = columnIndex;
+        }
+
+        /// <summary>
+        /// Gets or sets the Column/Cell index that is used for sorting.
+        /// </summary>
+        public int ColumnIndex
+        {
+            get { return _ColumnIndex; }
+            set { _ColumnIndex = value; }
+        }
+        #region IComparer Members
+
+        public virtual int Compare(object x, object y)
+        {
+            Node nx = (Node)x;
+            Node ny = (Node)y;
+            if (_ColumnIndex < nx.Cells.Count && _ColumnIndex < ny.Cells.Count)
+            {
+                if(AdvTreeSettings.UseSortAlphaComparer)
+                    return Utilities.CompareAlpha(nx.Cells[_ColumnIndex].Text, ny.Cells[_ColumnIndex].Text);
+                else
+                    return Utilities.CompareAlphaNumeric(nx.Cells[_ColumnIndex].Text, ny.Cells[_ColumnIndex].Text);
+            }
+            return 0;
+        }
+
+        #endregion
+    }
+    /// <summary>
+    /// Reverse sort nodes.
+    /// </summary>
+    public class NodeComparerReverse : NodeComparer
+    {
+        /// <summary>
+        /// Creates new instance of NodeComparer class. You can use NodeComparer to sort the nodes by specific column/cell by calling
+        /// NodeCollection.Sort method and pass new instance of NodeComparer class. 
+        /// </summary>
+        /// <param name="columnIndex">Column/Cell index to use for sorting.</param>
+        public NodeComparerReverse(int columnIndex) : base(columnIndex)
+        {
+        }
+
+        public override int Compare(object x, object y)
+        {
+            return base.Compare(y, x);
+        }
+    }
+    /// <summary>
+    /// Sort by flat node index.
+    /// </summary>
+    public class NodeFlatIndexComparer : IComparer
+    {
+        private AdvTree _TreeControl = null;
+        /// <summary>
+        /// Creates new instance of NodeComparer class. You can use NodeComparer to sort the nodes by specific column/cell by calling
+        /// NodeCollection.Sort method and pass new instance of NodeComparer class. 
+        /// </summary>
+        public NodeFlatIndexComparer(AdvTree treeControl)
+        {
+            _TreeControl = treeControl;
+        }
+        #region IComparer Members
+
+        public virtual int Compare(object x, object y)
+        {
+            Node nx = (Node)x;
+            Node ny = (Node)y;
+
+            if (_TreeControl.GetNodeFlatIndex(nx) < _TreeControl.GetNodeFlatIndex(ny))
+                return -1;
+            else
+                return 1;
+        }
+
+        #endregion
+    }
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/NodeConnector.cs b/PROMS/DotNetBar Source Code/AdvTree/NodeConnector.cs
new file mode 100644
index 00000000..2ae2268e
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/NodeConnector.cs	
@@ -0,0 +1,215 @@
+using System;
+using System.Drawing;
+using System.ComponentModel;
+using System.Drawing.Drawing2D;
+
+namespace DevComponents.AdvTree
+{
+	/// <summary>
+	/// Represents node connector. Node connector is the line that is drawn to indicate connection between child and parent node.
+	/// </summary>
+	[ToolboxItem(false),System.ComponentModel.DesignTimeVisible(false),TypeConverter(typeof(System.ComponentModel.ExpandableObjectConverter))]
+	public class NodeConnector:Component
+	{
+		#region Private Variables
+		private int m_LineWidth=1;
+		private Color m_LineColor=SystemColors.Highlight;
+		private eNodeConnectorType m_ConnectorType=eNodeConnectorType.Line;
+		//private bool m_UnderlineNoBorderNode=true;
+		//private eConnectorCap m_EndCap=eConnectorCap.Ellipse;
+		//private eConnectorCap m_StartCap=eConnectorCap.None;
+		//private Size m_EndCapSize=new Size(5,5);
+		//private Size m_StartCapSize=new Size(5,5);
+		#endregion
+
+		#region Events
+		/// <summary>
+		/// Occurs when appearance of the connector has changed as result of changed settings on the connector.
+		/// </summary>
+		public event EventHandler AppearanceChanged;
+		#endregion
+
+		#region Public Interface
+		/// <summary>
+		/// Default Constructor.
+		/// </summary>
+		public NodeConnector()
+		{
+		}
+
+		/// <summary>
+		/// Creates new instance of the object with specified parameters.
+		/// </summary>
+		/// <param name="lineWidth">Connector line width.</param>
+		/// <param name="type">Connector type.</param>
+		public NodeConnector(int lineWidth, eNodeConnectorType type)
+		{
+			this.LineWidth=lineWidth;
+			this.ConnectorType=type;
+		}
+
+		/// <summary>
+		/// Gets or sets the connector line width.
+		/// </summary>
+		[Browsable(true),DefaultValue(1),Category("Appearance"),Description("Indicates connector line width.")]
+		public int LineWidth
+		{
+			get {return m_LineWidth;}
+			set 
+			{
+				m_LineWidth=value;
+				OnAppearanceChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the color of the connector line.
+		/// </summary>
+		[Browsable(true),Category("Appearance"),Description("Indicates color of the connector line.")]
+		public Color LineColor
+		{
+			get {return m_LineColor;}
+			set
+			{
+				m_LineColor=value;
+				OnAppearanceChanged();
+			}
+		}
+
+		/// <summary>
+		/// Returns true if editor should serialize LineColor property.
+		/// </summary>
+		[Browsable(false),EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeLineColor()
+		{
+			return m_LineColor!=SystemColors.Highlight;
+		}
+
+		/// <summary>
+		/// Gets or sets the type of the connector.
+		/// </summary>
+		/// <remarks>
+		/// See <see cref="eNodeConnectorType">eNodeConnectorType</see> enum for list of
+		/// available connectors.
+		/// </remarks>
+		/// <seealso cref="eNodeConnectorType">eNodeConnectorType Enumeration</seealso>
+		[Browsable(false),DefaultValue(eNodeConnectorType.Line),Category("Appearance"),Description("Indicates visual type of the connector.")]
+		public eNodeConnectorType ConnectorType
+		{
+			get {return m_ConnectorType;}
+			set 
+			{
+				m_ConnectorType=value;
+				OnAppearanceChanged();
+			}
+		}
+
+        private DashStyle _DashStyle = DashStyle.Dot;
+        /// <summary>
+        /// Gets or sets the DashStyle for the connector line. Default value is DashStyle.Dot.
+        /// </summary>
+        [DefaultValue(DashStyle.Dot), Category("Appearance"), Description("Indicates DashStyle for the connector line")]
+        public DashStyle DashStyle
+        {
+            get { return _DashStyle; }
+            set { _DashStyle = value; }
+        }
+
+        ///// <summary>
+        ///// Gets or sets whether the child node without borders is underlined as a
+        ///// continuation of the connector from node's parent. Default value is true.
+        ///// </summary>
+        ///// <remarks>
+        ///// To enhance visual appearance of the connectors that are connecting to the node
+        ///// with no borders assigned the connector is continued as a single line under the node
+        ///// when this property is set to true (default) value.
+        ///// </remarks>
+        //[Browsable(true), DefaultValue(true), Category("Behavior"), Description("Indicates whether connector is drawn under the nodes with no borders assigned.")]
+        //public bool UnderlineNoBorderNode
+        //{
+        //    get { return m_UnderlineNoBorderNode; }
+        //    set
+        //    {
+        //        m_UnderlineNoBorderNode = value;
+        //        OnAppearanceChanged();
+        //    }
+        //}
+
+        ///// <summary>
+        ///// Gets or sets the type of the cap that connector is ended with. Note that connector starts with parent node and ends with the child node. Default value is Ellipse.
+        ///// </summary>
+        //[Browsable(true),DefaultValue(eConnectorCap.Ellipse),Category("Appearance"),Description("Indicates type of the cap that connector is ended with.")]
+        //public eConnectorCap EndCap
+        //{
+        //    get {return m_EndCap;}
+        //    set
+        //    {
+        //        m_EndCap=value;
+        //        OnAppearanceChanged();
+        //    }
+        //}
+
+        ///// <summary>
+        ///// Gets or sets the size of the end cap.
+        ///// </summary>
+        //[Browsable(true),Category("Appearance"),Description("Indicates the size of the end cap.")]
+        //public System.Drawing.Size EndCapSize
+        //{
+        //    get {return m_EndCapSize;}
+        //    set
+        //    {
+        //        m_EndCapSize=value;
+        //        OnAppearanceChanged();
+        //    }
+        //}
+
+        ///// <summary>
+        ///// Returns true if EndCapSize property should be serialized by editor.
+        ///// </summary>
+        ///// <returns></returns>
+        //[Browsable(false),EditorBrowsable(EditorBrowsableState.Never)]
+        //public bool ShouldSerializeEndCapSize()
+        //{
+        //    return (m_EndCapSize.Width!=5 || m_EndCapSize.Height!=5);
+        //}
+		#endregion
+
+		#region Private Implementation
+		private void OnAppearanceChanged()
+		{
+			if(AppearanceChanged!=null)
+				AppearanceChanged(this,new EventArgs());
+		}
+		#endregion
+
+//		/// <summary>
+//		/// Gets or sets the type of the cap that connector is started with. Note that connector starts with parent node and ends with the child node.  Default value is None.
+//		/// </summary>
+//		[Browsable(true),DefaultValue(eConnectorCap.None),Category("Appearance"),Description("Indicates type of the cap that connector is starts with.")]
+//		public eConnectorCap StartCap
+//		{
+//			get {return m_StartCap;}
+//			set {m_StartCap=value;}
+//		}
+//
+//		/// <summary>
+//		/// Gets or sets the size of the start cap.
+//		/// </summary>
+//		[Browsable(true),Category("Appearance"),Description("Indicates the size of the start cap.")]
+//		public System.Drawing.Size StartCapSize
+//		{
+//			get {return m_StartCapSize;}
+//			set {m_StartCapSize=value;}
+//		}
+//
+//		/// <summary>
+//		/// Returns true if StartCapSize property should be serialized by editor.
+//		/// </summary>
+//		/// <returns></returns>
+//		[Browsable(false),EditorBrowsable(EditorBrowsableState.Never)]
+//		public bool ShouldSerializeStartCapSize()
+//		{
+//			return (m_StartCapSize.Width!=5 || m_StartCapSize.Height!=5);
+//		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/NodeOperations.cs b/PROMS/DotNetBar Source Code/AdvTree/NodeOperations.cs
new file mode 100644
index 00000000..13e6cf47
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/NodeOperations.cs	
@@ -0,0 +1,1700 @@
+using System;
+using System.Drawing;
+using System.Text;
+using DevComponents.AdvTree.Display;
+using System.Collections;
+
+namespace DevComponents.AdvTree
+{
+	/// <summary>
+	/// Represents node operations.
+	/// </summary>
+	internal class NodeOperations
+	{
+		/// <summary>
+		/// Returns full path to the given node.
+		/// </summary>
+		/// <param name="node">Node to return path to.</param>
+		/// <returns>Full path to the node.</returns>
+		public static string GetFullPath(Node node,string pathSeparator)
+		{
+			if(node==null)
+				throw new ArgumentNullException("node");
+			
+			StringBuilder sb=new StringBuilder(node.Text);
+			node=node.Parent;
+			while(node!=null)
+			{
+                sb.Insert(0, node.Text + pathSeparator);
+				node=node.Parent;
+			}
+
+			return sb.ToString();
+		}
+
+		/// <summary>
+		/// Gets the last child tree node. The LastNode is the last child Node in the NodeCollection stored in the Nodes property of the current tree node. If the Node has no child tree node, the LastNode property returns a null reference (Nothing in Visual Basic).
+		/// </summary>
+		/// <param name="node">Reference node.</param>
+		/// <returns>Last node if found or null if there is no last node.</returns>
+		public static Node GetLastNode(Node node)
+		{
+			if(node.Nodes.Count>0)
+			{
+				return node.Nodes[node.Nodes.Count-1];
+			}
+			return null;
+		}
+
+        /// <summary>
+        /// Returns last rendered node on screen.
+        /// </summary>
+        /// <param name="tree">Tree control.</param>
+        /// <returns>Last rendered node or null</returns>
+        public static Node GetLastDisplayedNode(AdvTree tree)
+        {
+            Rectangle r = tree.NodeLayout.ClientArea;
+            Node node = tree.SelectedNode;
+            if (node == null) node = GetFirstVisibleNode(tree);
+            Point scrollPos = Point.Empty;
+            if (tree.AutoScroll)
+                scrollPos = tree.GetAutoScrollPositionOffset();
+
+            // Find last fully rendered node
+            Node lastNode = null;
+            if (r.IntersectsWith(node.Bounds))
+                lastNode = node;
+            while (node != null)
+            {
+                node = NodeOperations.GetNextVisibleNode(node);
+                if (node != null && node.Selectable)
+                {
+                    Rectangle nodeRect = NodeDisplay.GetNodeRectangle(eNodeRectanglePart.NodeContentBounds, node, scrollPos);
+                    if (nodeRect.Bottom > r.Bottom)
+                        break;
+                    else if (r.IntersectsWith(nodeRect))
+                        lastNode = node;
+                }
+            }
+
+            return lastNode;
+        }
+
+        /// <summary>
+        /// Returns first rendered node on screen.
+        /// </summary>
+        /// <param name="tree">Tree control.</param>
+        /// <returns>Last rendered node or null</returns>
+        public static Node GetFirstDisplayedNode(AdvTree tree)
+        {
+            Rectangle r = tree.GetInnerRectangle();
+            r.Y += tree.ColumnHeaderHeight;
+            r.Height -= tree.ColumnHeaderHeight;
+
+            Node node = tree.SelectedNode;
+            if (node == null) node = GetFirstVisibleNode(tree);
+            Point scrollPos = Point.Empty;
+            if (tree.AutoScroll)
+                scrollPos = tree.GetAutoScrollPositionOffset();
+            // Find last fully rendered node
+            Node lastNode = null;
+            if (r.IntersectsWith(node.Bounds))
+                lastNode = node;
+            while (node != null)
+            {
+                node = NodeOperations.GetPreviousVisibleNode(node);
+                if (node != null && node.Selectable)
+                {
+                    Rectangle nodeRect = NodeDisplay.GetNodeRectangle(eNodeRectanglePart.NodeContentBounds, node, scrollPos);
+                    if (r.IntersectsWith(nodeRect))
+                        lastNode = node;
+                    else if (nodeRect.Y < r.Y)
+                        break;
+                }
+            }
+
+            return lastNode;
+        }
+
+        /// <summary>
+        /// Gets first visible node.
+        /// </summary>
+        /// <param name="tree">Reference to tree.</param>
+        /// <returns>Last visible node found or null</returns>
+        public static Node GetFirstVisibleNode(AdvTree tree)
+        {
+            if (tree.Nodes.Count == 0) return null;
+
+            Node node = tree.DisplayRootNode == null ? tree.Nodes[0] : tree.DisplayRootNode;
+            if (node.Visible)
+                return node;
+            return GetNextVisibleNode(node);
+        }
+
+        /// <summary>
+        /// Gets last visible node in tree control.
+        /// </summary>
+        /// <param name="tree">Reference to tree.</param>
+        /// <returns>Last visible node found or null</returns>
+        public static Node GetLastVisibleNode(AdvTree tree)
+        {
+            if (tree.Nodes.Count == 0) return null;
+
+            Node node = tree.DisplayRootNode == null ? tree.Nodes[tree.Nodes.Count - 1] : tree.DisplayRootNode;
+            if (node.Visible)
+            {
+                if (node.Nodes.Count > 0 && node.Expanded)
+                {
+                    Node child = GetLastVisibleChildNode(node);
+                    if (child != null)
+                    {
+                        while (child.Nodes.Count > 0 && child.Expanded)
+                        {
+                            Node child1 = GetLastVisibleChildNode(child);
+                            if (child1 == null) return child;
+                            child = child1;
+                        }
+                        return child;
+                    }
+                }
+                return node;
+            }
+            return GetPreviousVisibleNode(node);
+        }
+
+        /// <summary>
+        /// Gets last visible top-level node in tree control.
+        /// </summary>
+        /// <param name="tree">Reference to tree.</param>
+        /// <returns>Last visible node found or null</returns>
+        public static Node GetLastVisibleTopLevelNode(AdvTree tree)
+        {
+            if (tree.Nodes.Count == 0) return null;
+
+            NodeCollection col = tree.Nodes;
+            if (tree.DisplayRootNode != null) col = tree.DisplayRootNode.Nodes;
+
+            for (int i = col.Count - 1; i >= 0; i--)
+            {
+                if (col[i].Visible)
+                    return col[i];
+            }
+
+            return null;
+        }
+
+		/// <summary>
+		/// Gets the next sibling tree node. The NextNode is the next sibling Node in the NodeCollection stored in the Nodes property of the tree node's parent Node. If there is no next tree node, the NextNode property returns a null reference (Nothing in Visual Basic).
+		/// </summary>
+		/// <param name="node">Reference node.</param>
+		/// <returns>Node object or null if node cannot be found.</returns>
+		public static Node GetNextNode(Node node)
+		{
+			if(node==null)
+				return null;
+			NodeCollection parentNodes=null;
+			if(node.Parent!=null)
+				parentNodes=node.Parent.Nodes;
+			else if(node.internalTreeControl!=null)
+				parentNodes=node.internalTreeControl.Nodes;
+			
+			if(parentNodes!=null)
+			{
+				int index=parentNodes.IndexOf(node);
+				if(index<parentNodes.Count-1)
+					return parentNodes[index+1];
+			}
+
+			return null;
+		}
+		
+		/// <summary>
+		/// Returns next visible sibling tree node.
+		/// </summary>
+		/// <param name="node">Reference node</param>
+		/// <returns>Node object or null if next visible node cannot be found</returns>
+		public static Node GetNextVisibleSibling(Node node)
+		{
+			if(node==null)
+				return null;
+			Node ret = GetNextNode(node);
+			while(ret!=null && !ret.Visible)
+				ret = GetNextNode(ret);
+			return ret;
+		}
+
+		/// <summary>
+		/// Gets the next visible tree node. The NextVisibleNode can be a child, sibling, or a tree node from another branch. If there is no next tree node, the NextVisibleNode property returns a null reference (Nothing in Visual Basic).
+		/// </summary>
+		/// <param name="node">Reference node.</param>
+		/// <returns>Node object or null if node cannot be found.</returns>
+		public static Node GetNextVisibleNode(Node node)
+		{
+			Node nextVisibleNode=null;
+			
+			// First see whether all parent nodes are expanded and if not find the first one that is
+			Node parent=node.Parent;
+			Node lastNotExpanded=null;
+			while(parent!=null)
+			{
+				if(!parent.Expanded)
+					lastNotExpanded=parent;
+				parent=parent.Parent;
+			}
+			if(lastNotExpanded!=null)
+			{
+				// Last parent node expanded
+				if(lastNotExpanded.Parent!=null)
+					lastNotExpanded=lastNotExpanded.Parent;
+                while (lastNotExpanded != null)
+                {
+                    lastNotExpanded = GetNextNode(lastNotExpanded);
+                    if (lastNotExpanded != null && lastNotExpanded.Visible) return lastNotExpanded;
+                }
+			}
+
+			// Walk into the child nodes
+            if (node.Expanded && node.Nodes.Count > 0)
+            {
+                foreach (Node n in node.Nodes)
+                {
+                    if (n.Visible) return n;
+                }
+                //return null;
+            }
+
+			// Get next sibling
+            nextVisibleNode = GetAnyNextNode(node);
+            while (nextVisibleNode != null)
+            {
+                if (nextVisibleNode.Visible && nextVisibleNode.IsVisible)
+                    return nextVisibleNode;
+                nextVisibleNode = GetAnyNextNode(nextVisibleNode);
+            }
+
+			// Walk-up...
+            //while (nextVisibleNode == null && node != null)
+            //{
+            //    node = node.Parent;
+            //    nextVisibleNode = GetAnyNextNode(node);
+            //    if (nextVisibleNode != null && !nextVisibleNode.Visible)
+            //        nextVisibleNode = null;
+            //}
+			return nextVisibleNode;
+		}
+
+        /// <summary>
+        /// Gets the next visible tree node. The NextVisibleNode can be a child, sibling, or a tree node from another branch. If there is no next tree node, the NextVisibleNode property returns a null reference (Nothing in Visual Basic).
+        /// </summary>
+        /// <param name="node">Reference node.</param>
+        /// <returns>Node object or null if node cannot be found.</returns>
+        public static Node GetAnyNextNode(Node node)
+        {
+            Node nextNode = null;
+
+            // Walk into the child nodes
+            if (node.Nodes.Count > 0)
+            {
+                return node.Nodes[0];
+            }
+
+            // Get next sibling
+            nextNode = GetNextNode(node);
+
+            // Walk-up...
+            if (nextNode == null)
+            {
+                while (nextNode == null && node != null)
+                {
+                    node = node.Parent;
+                    nextNode = GetNextNode(node);
+                }
+            }
+
+            return nextNode;
+        }
+
+		/// <summary>
+		/// Gets a value indicating whether the tree node is visible. Node is considered to be visible when it's Visible property is set to true and path to the node is available i.e. all parent nodes are expanded.
+		/// </summary>
+		/// <param name="node"></param>
+		/// <returns></returns>
+		public static bool GetIsNodeVisible(Node node)
+		{
+			if(!node.Visible)
+				return false;
+
+			Node n=node;
+			while(n.Parent!=null)
+			{
+				n=n.Parent;
+				if(!n.Expanded || !n.Visible)
+					return false;
+			}
+			return true;
+		}
+
+		/// <summary>
+		/// Returns whether node is displayed on the screen and visible to the user. When node is outside of the viewable area this property will return false. It will also return false if node is not visible.
+		/// </summary>
+		/// <param name="node"></param>
+		/// <returns></returns>
+		public static bool GetIsNodeDisplayed(Node node)
+		{
+			if(!node.Visible || !GetIsNodeVisible(node))
+				return false;
+			AdvTree tree=node.TreeControl;
+			if(tree!=null)
+			{
+				Rectangle r=NodeDisplay.GetNodeRectangle(eNodeRectanglePart.NodeBounds,node,tree.NodeDisplay.Offset);
+				return tree.ClientRectangle.IntersectsWith(r);
+			}
+			return false;
+		}
+
+		/// <summary>
+		/// Gets the zero based index of position of the tree node in the tree node collection. -1 is returned if node is not added to the nodes collection.
+		/// </summary>
+		/// <param name="node">Reference node.</param>
+		/// <returns>Zero based index or -1 if node is not in collection.</returns>
+		public static int GetNodeIndex(Node node)
+		{
+            if (node.Parent == null)
+            {
+                AdvTree tree = node.TreeControl;
+                if (tree != null)
+                    return tree.Nodes.IndexOf(node);
+                return -1;
+            }
+			return node.Parent.Nodes.IndexOf(node);
+		}
+
+		/// <summary>
+		/// Gets the previous sibling tree node. The PrevNode is the previous sibling Node in the NodeCollection stored in the Nodes property of the tree node's parent Node. If there is no previous tree node, the PrevNode property returns a null reference (Nothing in Visual Basic).
+		/// </summary>
+		/// <param name="node">Reference node.</param>
+		/// <returns>Node object or null if node cannot be found.</returns>
+		public static Node GetPreviousNode(Node node)
+		{
+			if(node==null)
+				return null;
+			NodeCollection parentNodes=null;
+			if(node.Parent!=null)
+				parentNodes=node.Parent.Nodes;
+			else if(node.internalTreeControl!=null)
+				parentNodes=node.internalTreeControl.Nodes;
+			
+			if(parentNodes!=null)
+			{
+				int index=parentNodes.IndexOf(node);
+				if(index>0)
+					return parentNodes[index-1];
+			}
+
+			return null;
+		}
+
+        ///// <summary>
+        ///// Gets the previous visible tree node. The PrevVisibleNode can be a child, sibling, or a tree node from another branch. If there is no previous tree node, the PrevVisibleNode property returns a null reference (Nothing in Visual Basic).
+        ///// </summary>
+        ///// <param name="node">Reference node.</param>
+        ///// <returns>Node object or null if node cannot be found.</returns>
+        //public static Node GetPreviousDisplayedNode(Node node)
+        //{
+        //    Node referenceNode = node;
+        //    do
+        //    {
+        //        referenceNode = GetPreviousVisibleNode(referenceNode);
+        //        if (referenceNode != null && referenceNode.IsVisible) break;
+        //    } while (referenceNode != null);
+        //    return referenceNode;
+        //}
+
+		/// <summary>
+		/// Gets the previous visible tree node. The PrevVisibleNode can be a child, sibling, or a tree node from another branch. If there is no previous tree node, the PrevVisibleNode property returns a null reference (Nothing in Visual Basic).
+		/// </summary>
+		/// <param name="node">Reference node.</param>
+		/// <returns>Node object or null if node cannot be found.</returns>
+		public static Node GetPreviousVisibleNode(Node node)
+		{
+			Node prevVisibleNode=null;
+			
+			// First see whether all parent nodes are expanded and if not find the first one that is
+			Node referenceNode=node.Parent;
+			Node lastNotExpanded=null;
+			while(referenceNode!=null)
+			{
+				if(!referenceNode.Expanded)
+					lastNotExpanded=referenceNode;
+				referenceNode=referenceNode.Parent;
+			}
+            if (lastNotExpanded != null)
+            {
+                if (lastNotExpanded.IsVisible) return lastNotExpanded;
+                referenceNode = lastNotExpanded;
+            }
+            else
+                referenceNode = node;
+
+			// Walk into the previous node parent
+			if(referenceNode.Parent!=null)
+			{
+                if (referenceNode.Parent.Nodes.IndexOf(referenceNode) > 0)
+                {
+                    prevVisibleNode = GetAnyPreviousNode(referenceNode);
+                    while (prevVisibleNode != null)
+                    {
+                        if (prevVisibleNode.IsVisible) break;
+                        prevVisibleNode = GetAnyPreviousNode(prevVisibleNode);
+                    }
+                    if (prevVisibleNode != null) return prevVisibleNode;
+                }
+                else
+                {
+                    while (referenceNode.Parent != null)
+                    {
+                        if (referenceNode.Parent.IsVisible)
+                            return referenceNode.Parent;
+                        referenceNode = referenceNode.Parent;
+                    }
+                    if (referenceNode.TreeControl != null)
+                        prevVisibleNode = GetAnyPreviousNode(referenceNode);
+                }
+			}
+            else if (referenceNode.TreeControl != null)
+            {
+                prevVisibleNode = GetPreviousNode(referenceNode);
+                if (prevVisibleNode != null && (!prevVisibleNode.Visible || !prevVisibleNode.Selectable))
+                {
+                    while (prevVisibleNode != null && (!prevVisibleNode.Visible || !prevVisibleNode.Selectable))
+                        prevVisibleNode = GetPreviousNode(prevVisibleNode);
+                }
+            }
+            else
+                return null;
+
+			if(prevVisibleNode==null)
+				return null;
+			
+			// Walk into the node
+			while(prevVisibleNode.Expanded && prevVisibleNode.Nodes.Count>0)
+			{
+                prevVisibleNode = prevVisibleNode.Nodes[prevVisibleNode.Nodes.Count - 1];
+			}
+
+			return prevVisibleNode;
+		}
+
+        /// <summary>
+        /// Gets the previous tree node. The Previous Node can be a child, sibling, or a tree node from another branch. If there is no previous tree node, the PrevNode property returns a null reference (Nothing in Visual Basic).
+        /// </summary>
+        /// <param name="node">Reference node.</param>
+        /// <returns>Node object or null if node cannot be found.</returns>
+        public static Node GetAnyPreviousNode(Node node)
+        {
+            Node prevNode = null;
+
+            Node referenceNode = node;
+
+            // Walk into the previous node parent
+            if (referenceNode.Parent != null)
+            {
+                if (referenceNode.Parent.Nodes.IndexOf(referenceNode) > 0)
+                {
+                    prevNode = GetPreviousNode(referenceNode);
+                }
+                else
+                {
+                    return referenceNode.Parent;
+                }
+            }
+            else if (referenceNode.TreeControl != null)
+                prevNode = GetPreviousNode(referenceNode);
+            else
+                return null;
+
+            if (prevNode == null)
+                return null;
+
+            // Walk into the node
+            while (prevNode.Nodes.Count > 0)
+            {
+                prevNode = prevNode.Nodes[prevNode.Nodes.Count - 1];
+            }
+
+            return prevNode;
+        }
+
+		/// <summary>
+		/// Returns true if node passed is considered root node for display purposes.
+		/// </summary>
+		/// <param name="tree">Reference to the tree control.</param>
+		/// <param name="node">Node to test.</param>
+		/// <returns>true if node is root node for display purposes otherwise false.</returns>
+		public static bool IsRootNode(AdvTree tree, Node node)
+		{
+			if(node.Parent==null || node==tree.DisplayRootNode)
+				return true;
+			return false;
+		}
+
+        /// <summary>
+        /// Ensures that the cell is visible, expanding nodes and scrolling the control as necessary.
+        /// </summary>
+        /// <param name="reference">Cell to be made visible.</param>
+        public static void EnsureVisible(Cell cell)
+        {
+            Node parentNode = cell.Parent;
+            if (parentNode == null) return;
+            AdvTree tree = parentNode.TreeControl;
+            if (tree == null) return;
+
+            EnsureVisible(parentNode, false);
+
+            Rectangle r = NodeDisplay.GetCellRectangle(eCellRectanglePart.CellBounds, cell, tree.NodeDisplay.Offset);
+
+            if (tree != null && tree.AutoScroll)
+            {
+                if (tree.Zoom != 1)
+                {
+                    r = tree.GetScreenRectangle(r);
+                }
+                Rectangle treeClientRectangle = tree.GetInnerRectangle();
+                if (tree.VScrollBar != null) treeClientRectangle.Width -= tree.VScrollBar.Width;
+                if (tree.HScrollBar != null) treeClientRectangle.Height -= tree.HScrollBar.Height;
+
+                if (!treeClientRectangle.Contains(r))
+                {
+                    Point p = tree.NodeDisplay.Offset;
+                    p.Y = tree.AutoScrollPosition.Y;
+                    if (r.X < treeClientRectangle.X)
+                        p.X -= r.X;
+                    else if (r.X > treeClientRectangle.Right)
+                        p.X += (r.Right - treeClientRectangle.Right);
+                    // Scroll it to show the cell
+                    if (!tree.IsLayoutPending)
+                        tree.AutoScrollPosition = p;
+                }
+            }
+        }
+
+        /// <summary>
+		/// Ensures that the node is visible, expanding nodes and scrolling the control as necessary.
+		/// </summary>
+		/// <param name="reference">Node to be made visible.</param>
+        public static void EnsureVisible(Node reference, bool scrollHorizontally)
+        {
+            EnsureVisible(reference, scrollHorizontally, eEnsureVisibleOption.Middle);
+        }
+
+		/// <summary>
+		/// Ensures that the node is visible, expanding nodes and scrolling the control as necessary.
+		/// </summary>
+		/// <param name="reference">Node to be made visible.</param>
+        public static void EnsureVisible(Node reference, bool scrollHorizontally, eEnsureVisibleOption scrollPositionOption)
+        {
+            // First expand all parents
+            AdvTree tree = reference.TreeControl;
+            if (tree == null || tree.IsUpdateSuspended) return;
+
+            tree.SuspendPaint = true;
+            try
+            {
+                Node node = reference;
+                bool layout = false;
+                while (node.Parent != null)
+                {
+                    if (!node.Parent.Expanded)
+                    {
+                        node.Parent.Expand();
+                        layout = true;
+                    }
+                    node = node.Parent;
+                }
+
+                if (layout || tree.IsLayoutPending)
+                    tree.RecalcLayoutInternal();
+
+                // Adjust for tree never being displayed but it has been scrolled
+                Point offset = tree.NodeDisplay.Offset;
+                if (offset.IsEmpty && tree.AutoScroll && !tree.AutoScrollPosition.IsEmpty)
+                    offset = tree.GetAutoScrollPositionOffset();
+
+                Rectangle r = NodeDisplay.GetNodeRectangle(eNodeRectanglePart.NodeBounds, reference, offset);
+                if (tree != null && tree.AutoScroll)
+                {
+                    if (tree.Zoom != 1)
+                    {
+                        r = tree.GetScreenRectangle(r);
+                    }
+                    Rectangle treeClientRectangle = tree.GetInnerRectangle();
+                    if (tree.VScrollBar != null) treeClientRectangle.Width -= tree.VScrollBar.Width;
+                    if (tree.HScrollBar != null) treeClientRectangle.Height -= tree.HScrollBar.Height;
+                    int treeColumnHeaderHeight = tree.ColumnHeaderHeight;
+                    treeClientRectangle.Y += treeColumnHeaderHeight;
+                    treeClientRectangle.Height -= treeColumnHeaderHeight;
+
+                    if (!treeClientRectangle.Contains(r))
+                    {
+                        Point p = tree.AutoScrollPosition; // tree.NodeDisplay.Offset;
+                        if (scrollHorizontally)
+                        {
+                            /*if (r.Right > treeClientRectangle.Right)
+                                p.X -= r.Right - treeClientRectangle.Right;
+                            else*/
+                            if (r.X < treeClientRectangle.X)
+                                p.X -= r.X;
+                            if (p.X > 0) p.X = -p.X;
+                            if (p.X > -10 && p.X < 0 || p.X < 11 && p.X > 0) p.X = 0; // Snap to left
+                        }
+                        if (r.Height > treeClientRectangle.Height * .8)
+                        {
+                            p.Y = -Math.Max(0, (r.Y - 4));
+                        }
+                        else if (r.Bottom > treeClientRectangle.Bottom)
+                        {
+                            if (scrollPositionOption == eEnsureVisibleOption.Bottom)
+                            {
+                                p.Y -= r.Bottom - treeClientRectangle.Bottom + r.Height;
+                            }
+                            else if (scrollPositionOption == eEnsureVisibleOption.Middle)
+                            {
+                                p.Y -= r.Bottom - (treeClientRectangle.Bottom - treeClientRectangle.Height / 2) + r.Height / 2;
+                            }
+                            else if (scrollPositionOption == eEnsureVisibleOption.Top)
+                            {
+                                p.Y -= r.Top - (treeClientRectangle.Bottom - treeClientRectangle.Height);
+                            }
+                        }
+                        else if (r.Y < treeClientRectangle.Y)
+                        {
+                            if (scrollPositionOption == eEnsureVisibleOption.Top)
+                            {
+                                p.Y -= (r.Y - treeColumnHeaderHeight);
+                            }
+                            else if (scrollPositionOption == eEnsureVisibleOption.Middle)
+                            {
+                                p.Y -= r.Y - (treeColumnHeaderHeight + treeClientRectangle.Height/2 + r.Height/2);
+                            }
+                            else if (scrollPositionOption == eEnsureVisibleOption.Bottom)
+                            {
+                                p.Y -= (r.Y - (treeColumnHeaderHeight - treeClientRectangle.Height + r.Height));
+                            }
+                        }
+                        if (p.Y > -10 && p.Y < 0 || /*p.Y < 11 &&*/ p.Y > 0) p.Y = 0; // Snap to top
+                        // Scroll it to show the node
+                        if (!tree.IsLayoutPending)
+                            tree.AutoScrollPosition = p;
+                    }
+                }
+            }
+            finally
+            {
+                if (tree != null)
+                    tree.SuspendPaint = false;
+            }
+        }
+
+		/// <summary>
+		/// Returns number of visible child nodes for given node.
+		/// </summary>
+		/// <param name="node">Reference node.</param>
+		/// <returns>Number of visible child nodes.</returns>
+		public static int GetVisibleNodesCount(Node node)
+		{
+			if(node.Nodes.Count==0)
+				return 0;
+			int count=0;
+			foreach(Node n in node.Nodes)
+			{
+				if(n.Visible)
+					count++;
+			}
+			return count;
+		}
+
+		/// <summary>
+		/// Returns true if node has at least single visible child node.
+		/// </summary>
+		/// <param name="node">Reference node.</param>
+		/// <returns>True if at least single child node is visible otherwise false.</returns>
+		public static bool GetAnyVisibleNodes(Node node)
+		{
+            if (!node.HasChildNodes)
+                return false;
+			foreach(Node n in node.Nodes)
+			{
+				if(n.Visible)
+					return true;
+			}
+			return false;
+		}
+		
+		/// <summary>
+		/// Retrieves the tree node that is at the specified location.
+		/// </summary>
+		/// <returns>The Node at the specified point, in tree view coordinates.</returns>
+		/// <remarks>
+		/// 	<para>You can pass the MouseEventArgs.X and MouseEventArgs.Y coordinates of the
+		///     MouseDown event as the x and y parameters.</para>
+		/// </remarks>
+		/// <param name="p">The Point to evaluate and retrieve the node from.</param>
+		/// <param name="tree">Tree control to find node at.</param>
+        public static NodeHitTestInfo GetNodeAt(AdvTree tree, Point p)
+		{
+			return GetNodeAt(tree,p.X,p.Y);
+		}
+
+        /// <summary>
+		/// Retrieves the tree node that is at the specified location.
+		/// </summary>
+		/// <returns>The TreeNode at the specified location, in tree view coordinates.</returns>
+		/// <remarks>
+		/// 	<para>You can pass the MouseEventArgs.X and MouseEventArgs.Y coordinates of the
+		///     MouseDown event as the x and y parameters.</para>
+		/// </remarks>
+		/// <param name="x">The X position to evaluate and retrieve the node from.</param>
+		/// <param name="y">The Y position to evaluate and retrieve the node from.</param>
+		/// <param name="tree">Tree control to find node at.</param>
+        public static NodeHitTestInfo GetNodeAt(AdvTree tree, int x, int y)
+        {
+            return GetNodeAt(tree, x, y, false);
+        }
+
+        /// <summary>
+		/// Retrieves the tree node that is at the specified location.
+		/// </summary>
+		/// <returns>The TreeNode at the specified location, in tree view coordinates.</returns>
+		/// <remarks>
+		/// 	<para>You can pass the MouseEventArgs.X and MouseEventArgs.Y coordinates of the
+		///     MouseDown event as the x and y parameters.</para>
+		/// </remarks>
+        /// <param name="tree">Tree control to find node at.</param>
+		/// <param name="x">The X position to evaluate and retrieve the node from.</param>
+		/// <param name="y">The Y position to evaluate and retrieve the node from.</param>
+        /// <param name="paintedOnly">Enumerates rendered nodes only.</param>
+        public static NodeHitTestInfo GetNodeAt(AdvTree tree, int x, int y, bool paintedOnly)
+        {
+            return GetNodeAt(tree, x, y, paintedOnly, false);
+        }
+
+		/// <summary>
+		/// Retrieves the tree node that is at the specified location.
+		/// </summary>
+		/// <returns>The TreeNode at the specified location, in tree view coordinates.</returns>
+		/// <remarks>
+		/// 	<para>You can pass the MouseEventArgs.X and MouseEventArgs.Y coordinates of the
+		///     MouseDown event as the x and y parameters.</para>
+		/// </remarks>
+        /// <param name="tree">Tree control to find node at.</param>
+		/// <param name="x">The X position to evaluate and retrieve the node from.</param>
+		/// <param name="y">The Y position to evaluate and retrieve the node from.</param>
+        /// <param name="paintedOnly">Enumerates rendered nodes only.</param>
+        public static NodeHitTestInfo GetNodeAt(AdvTree tree, int x, int y, bool paintedOnly, bool isUserInterfaceHitTest)
+		{
+            NodeHitTestInfo info = new NodeHitTestInfo();
+            if (tree.Nodes.Count == 0 || !tree.DisplayRectangle.Contains(x, y) && tree.Zoom == 1)
+                return info;
+
+			Node node=tree.Nodes[0];
+			Node retNode=null;
+
+            bool displayRootSet = false;
+            if (tree.DisplayRootNode != null)
+            {
+                node = tree.DisplayRootNode;
+                displayRootSet = true;
+            }
+
+            Point displayOffset = tree.NodeDisplay.Offset;
+
+            // Enumerate painted nodes first
+            if(tree.DisplayRectangle.Contains(x, y))
+            {
+                ArrayList paintedNodes = tree.NodeDisplay.PaintedNodes;
+                foreach (Node paintedNode in paintedNodes)
+                {
+                    if (!paintedNode.IsDisplayed) continue;
+                    Rectangle r = NodeDisplay.GetNodeRectangle(eNodeRectanglePart.NodeBounds, paintedNode, displayOffset);
+                    if (r.Contains(x, y))
+                    {
+                        info.NodeAt = paintedNode;
+                        return info;
+                    }
+                    else if (NodeDisplay.HasColumnsVisible(paintedNode))
+                    {
+                        Rectangle headerBounds = NodeDisplay.GetNodeRectangle(eNodeRectanglePart.ColumnsBounds, paintedNode, displayOffset);
+                        if (headerBounds.Contains(x, y))
+                        {
+                            info.ColumnsAt = paintedNode.NodesColumns;
+                            return info;
+                        }
+                    }
+                }
+            }
+            if (paintedOnly) return info;
+
+            while (node != null)
+            {
+                Rectangle r = NodeDisplay.GetNodeRectangle(eNodeRectanglePart.NodeBounds, node, displayOffset);
+                if (r.Contains(x, y))
+                {
+                    retNode = node;
+                    break;
+                }
+                else if (NodeDisplay.HasColumnsVisible(node))
+                {
+                    Rectangle headerBounds = NodeDisplay.GetNodeRectangle(eNodeRectanglePart.ColumnsBounds, node, displayOffset);
+                    if (headerBounds.Contains(x, y))
+                    {
+                        info.ColumnsAt = node.NodesColumns;
+                        return info;
+                    }
+                }
+                if (r.Y > y) break;
+
+                r = NodeDisplay.GetNodeRectangle(eNodeRectanglePart.ChildNodeBounds, node, displayOffset);
+                if (!r.Contains(x, y))
+                    node = GetNextVisibleSibling(node);
+                else
+                    node = node.NextVisibleNode;
+
+                if (displayRootSet && !IsChildNode(tree.DisplayRootNode, node)) break;
+            }
+
+            info.NodeAt = retNode;
+			return info;
+		}
+
+        /// <summary>
+        /// Retrieves the tree node that is at the specified vertical location.
+        /// </summary>
+        /// <returns>The TreeNode at the specified location, in tree view coordinates.</returns>
+        /// <remarks>
+        /// 	<para>You can pass the MouseEventArgs.X and MouseEventArgs.Y coordinates of the
+        ///     MouseDown event as the x and y parameters.</para>
+        /// </remarks>
+        /// <param name="y">The Y position to evaluate and retrieve the node from.</param>
+        /// <param name="tree">Tree control to find node at.</param>
+        public static NodeHitTestInfo GetNodeAt(AdvTree tree, int y)
+        {
+            return GetNodeAt(tree, y, false);
+        }
+
+        /// <summary>
+        /// Retrieves the tree node that is at the specified vertical location.
+        /// </summary>
+        /// <returns>The TreeNode at the specified location, in tree view coordinates.</returns>
+        /// <remarks>
+        /// 	<para>You can pass the MouseEventArgs.X and MouseEventArgs.Y coordinates of the
+        ///     MouseDown event as the x and y parameters.</para>
+        /// </remarks>
+        /// <param name="y">The Y position to evaluate and retrieve the node from.</param>
+        /// <param name="tree">Tree control to find node at.</param>
+        /// <param name="paintedOnly">Enumerates rendered nodes only.</param>
+        public static NodeHitTestInfo GetNodeAt(AdvTree tree, int y, bool paintedOnly)
+        {
+            return GetNodeAt(tree, y, paintedOnly, false);
+        }
+
+        /// <summary>
+        /// Retrieves the tree node that is at the specified vertical location.
+        /// </summary>
+        /// <returns>The TreeNode at the specified location, in tree view coordinates.</returns>
+        /// <remarks>
+        /// 	<para>You can pass the MouseEventArgs.X and MouseEventArgs.Y coordinates of the
+        ///     MouseDown event as the x and y parameters.</para>
+        /// </remarks>
+        /// <param name="y">The Y position to evaluate and retrieve the node from.</param>
+        /// <param name="tree">Tree control to find node at.</param>
+        /// <param name="paintedOnly">Enumerates rendered nodes only.</param>
+        public static NodeHitTestInfo GetNodeAt(AdvTree tree, int y, bool paintedOnly, bool isUserInterfaceHitTest)
+        {
+            NodeHitTestInfo info = new NodeHitTestInfo();
+            if (tree.Nodes.Count == 0 || !tree.DisplayRectangle.Contains(1, y) && tree.Zoom == 1)
+                return info;
+            Point displayOffset = tree.NodeDisplay.Offset;
+
+            // Enumerate painted node first
+            if (tree.DisplayRectangle.Contains(1, y))
+            {
+                ArrayList paintedNodes = tree.NodeDisplay.PaintedNodes;
+                foreach (Node paintedNode in paintedNodes)
+                {
+                    if (!paintedNode.IsDisplayed && !(paintedNode.Expanded && paintedNode.HasColumns)) continue;
+                    Rectangle r = NodeDisplay.GetNodeRectangle(eNodeRectanglePart.NodeBounds, paintedNode, displayOffset);
+                    if (y >= r.Y && y <= r.Bottom)
+                    {
+                        info.NodeAt = paintedNode;
+                        return info;
+                    }
+                    else if(NodeDisplay.HasColumnsVisible(paintedNode))
+                    {
+                        Rectangle headerBounds = NodeDisplay.GetNodeRectangle(eNodeRectanglePart.ColumnsBounds, paintedNode, displayOffset);
+                        if (y >= headerBounds.Y && y <= headerBounds.Bottom)
+                        {
+                            info.ColumnsAt = paintedNode.NodesColumns;
+                            return info;
+                        }
+                    }
+                }
+            }
+            if (paintedOnly) return info;
+
+            Node node = tree.Nodes[0];
+            Node retNode = null;
+            if (tree.DisplayRootNode != null)
+                node = tree.DisplayRootNode;
+            while (node != null)
+            {
+                Rectangle r = NodeDisplay.GetNodeRectangle(eNodeRectanglePart.NodeBounds, node, displayOffset);
+                if (node.Visible && y >= r.Y && y <= r.Bottom)
+                {
+                    retNode = node;
+                    break;
+                }
+                else if (NodeDisplay.HasColumnsVisible(node))
+                {
+                    Rectangle headerBounds = NodeDisplay.GetNodeRectangle(eNodeRectanglePart.ColumnsBounds, node, displayOffset);
+                    if (y >= headerBounds.Y && y <= headerBounds.Bottom)
+                    {
+                        info.ColumnsAt = node.NodesColumns;
+                        return info;
+                    }
+                }
+                if (isUserInterfaceHitTest && (r.Bottom + 16 < y || r.Y + 16 > y))
+                    break;
+                r = NodeDisplay.GetNodeRectangle(eNodeRectanglePart.ChildNodeBounds, node, displayOffset);
+                if (!(y >= r.Y && y <= r.Bottom))
+                    node = GetNextVisibleSibling(node);
+                else
+                    node = node.NextVisibleNode;
+            }
+
+            info.NodeAt = retNode;
+            return info;
+        }
+		
+		public static TreeAreaInfo GetTreeAreaInfo(AdvTree tree, int x, int y)
+		{
+			TreeAreaInfo areaInfo=new TreeAreaInfo();
+
+            if (tree.Nodes.Count == 0 || !tree.DisplayRectangle.Contains(x, y) && tree.Zoom == 1)
+				return null;
+
+			Node node=tree.Nodes[0];
+			if(tree.DisplayRootNode!=null)
+				node = tree.DisplayRootNode;
+			
+            if (tree.DisplayRootNode != null)
+                node = tree.DisplayRootNode;
+
+            Node previousNode = null;
+            Rectangle previousRectangle = Rectangle.Empty;
+
+            if (tree.View == eView.Tile)
+            {
+                while (node != null)
+                {
+                    if (!node.IsDisplayed)
+                    {
+                        node = node.NextVisibleNode;
+                        continue;
+                    }
+                    Rectangle r = NodeDisplay.GetNodeRectangle(eNodeRectanglePart.NodeBounds, node, tree.NodeDisplay.Offset);
+                    if (r.Contains(x, y))
+                    {
+                        areaInfo.NodeAt = node;
+                        break;
+                    }
+                    if (y >= r.Y && y <= r.Bottom && node.HasChildNodes)
+                    {
+                        areaInfo.NodeAt = node;
+                        break;
+                    }
+                    else if (previousNode != null && y > previousRectangle.Bottom && y < r.Y)
+                    {
+                        // Covers the case if point is between two nodes in the vertical space between nodes due to node vertical spacing
+                        areaInfo.NodeAt = previousNode;
+                        break;
+                    }
+
+                    previousNode = node;
+                    previousRectangle = r;
+
+                    node = node.NextVisibleNode;
+                }
+
+            }
+            else
+            {
+                while (node != null)
+                {
+                    if (!node.IsDisplayed)
+                    {
+                        node = node.NextVisibleNode;
+                        continue;
+                    }
+                    Rectangle r = NodeDisplay.GetNodeRectangle(eNodeRectanglePart.NodeBounds, node, tree.NodeDisplay.Offset);
+                    if (y >= r.Y && y <= r.Bottom)
+                    {
+                        areaInfo.NodeAt = node;
+                        break;
+                    }
+                    else if (previousNode != null && y > previousRectangle.Bottom && y < r.Y)
+                    {
+                        // Covers the case if point is between two nodes in the vertical space between nodes due to node vertical spacing
+                        areaInfo.NodeAt = previousNode;
+                        break;
+                    }
+
+                    previousNode = node;
+                    previousRectangle = r;
+
+                    node = node.NextVisibleNode;
+                }
+            }
+			return areaInfo;
+		}
+		
+		/// <summary>
+		/// Gets the count of visible child nodes (Visible=true) for given node.
+		/// </summary>
+		/// <param name="parent">Reference to Node object.</param>
+		/// <returns>Number of visible nodes.</returns>
+		public static int GetVisibleChildNodesCount(Node parent)
+		{
+			int count = 0;
+			foreach(Node node in parent.Nodes)
+			{
+				if(node.Visible)
+					count++;
+			}
+			return count;
+		}
+		
+		/// <summary>
+		/// Gets the first visible child node or returns null if node cannot be found.
+		/// </summary>
+		/// <param name="parent">Reference to Node object.</param>
+		/// <returns>First visible node or null if node cannot be found.</returns>
+		public static Node GetFirstVisibleChildNode(Node parent)
+		{
+			foreach(Node node in parent.Nodes)
+			{
+				if(node.Visible)
+					return node;
+			}
+			return null;
+		}
+
+        /// <summary>
+        /// Gets the last visible child node or returns null if node cannot be found.
+        /// </summary>
+        /// <param name="parent">Reference to Node object.</param>
+        /// <returns>Last visible node or null if node cannot be found.</returns>
+        public static Node GetLastVisibleChildNode(Node parent)
+        {
+            NodeCollection col = parent.Nodes;
+            int c = col.Count - 1;
+            for (int i = c; i >=0; i--)
+            {
+                Node node = col[i];
+                if (node.Visible)
+                    return node;
+            }
+            
+            return null;
+        }
+
+        /// <summary>
+        /// Gets whether any node from array is child node of parent on any level.
+        /// </summary>
+        /// <param name="parent">Reference to parent node.</param>
+        /// <param name="child">Reference to child nodes.</param>
+        /// <returns></returns>
+        public static bool IsChildNode(Node parent, Node[] childNodes)
+        {
+            foreach (Node childNode in childNodes)
+            {
+                if (IsChildNode(parent, childNode))
+                    return true;
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// Gets whether node is child node of parent on any level.
+        /// </summary>
+        /// <param name="parent">Reference to parent node.</param>
+        /// <param name="child">Reference to child node.</param>
+        /// <returns></returns>
+        public static bool IsChildNode(Node parent, Node child)
+        {
+            if (parent == child || child == null || parent == null) return false;
+            while (child.Parent != null)
+            {
+                if (child.Parent == parent) return true;
+                child = child.Parent;
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// Returns true if child node is child of any parent node at any level.
+        /// </summary>
+        /// <param name="parents">Parent nodes array</param>
+        /// <param name="child">Child node</param>
+        /// <returns>true if child otherwise false</returns>
+        public static bool IsChildOfAnyParent(Node[] parents, Node child)
+        {
+            foreach (Node parent in parents)
+            {
+                if (IsChildNode(parent, child)) return true;
+            }
+            return false;
+        }
+		
+		#region Licensing
+#if !TRIAL
+		internal static bool keyValidated=false;
+		internal static int keyValidated2=0;
+		internal static bool ValidateLicenseKey(string key)
+		{
+			bool ret = false;
+			string[] parts = key.Split('-');
+			int i = 10;
+			foreach(string s in parts)
+			{
+				if(s=="88405280")
+					i++;
+				else if(s=="D06E")
+					i += 10;
+				else if(s=="4617")
+					i += 8;
+				else if(s=="8810")
+					i += 12;
+				else if(s=="64462F60FA93")
+					i += 3;
+			}
+			if(i==29)
+				return true;
+			keyValidated = true;
+			return ret;
+		}
+		
+		internal static bool CheckLicenseKey(string key)
+		{
+			// {F962CEC7-CD8F-4911-A9E9-CAB39962FC1F}, 114
+			string[] parts = key.Split('-');
+			int test = 0;
+			for(int i=parts.Length-1;i>=0;i--)
+			{
+				if(parts[i]=="CD8F")
+					test += 12;
+				else if(parts[i]=="CAB39962FC1F")
+					test += 2;
+				else if(parts[i]=="A9E9")
+					test += 3;
+				else if(parts[i]=="4911")
+					test += 7;
+				else if(parts[i]=="F962CEC7")
+					test += 13;
+			}
+
+			keyValidated2 = test + 77;
+
+			if(test==23)
+				return false;
+			
+			return true;
+		}
+#endif
+		
+#if TRIAL
+		private static Color m_ColorExpFlag=Color.Empty;
+		internal static int ColorCountExp=0;
+		internal static bool ColorExpAlt()
+		{
+			Color clr=SystemColors.Control;
+			Color clr2;
+			Color clr3;
+			clr2=clr;
+			if(clr2.ToArgb()==clr.ToArgb())
+			{
+				clr3=clr2;
+			}
+			else
+			{
+				clr3=clr;
+			}
+
+			ColorCountExp=clr.A;
+
+			if(!m_ColorExpFlag.IsEmpty)
+			{
+				return (m_ColorExpFlag==Color.Black?false:true);
+			}
+			try
+			{
+				Microsoft.Win32.RegistryKey key=Microsoft.Win32.Registry.ClassesRoot;
+				key=key.CreateSubKey("CLSID\\{C0093B14-207D-4406-826D-7186EF33C7E5}\\InprocServer32");
+			
+				try
+				{
+					if(key.GetValue("")==null || key.GetValue("").ToString()=="")
+					{
+						key.SetValue("",DateTime.Today.ToOADate().ToString());
+					}
+					else
+					{
+						if(key.GetValue("").ToString()=="windows3.dll")
+						{
+							m_ColorExpFlag=Color.White;
+							key.Close();
+							key=null;
+							return true;
+						}
+						DateTime date=DateTime.FromOADate(double.Parse(key.GetValue("").ToString()));
+						if(((TimeSpan)DateTime.Today.Subtract(date)).TotalDays>30)
+						{
+							m_ColorExpFlag=Color.White;
+							key.SetValue("","windows3.dll");
+							key.Close();
+							key=null;
+							return true;
+						}
+						if(((TimeSpan)DateTime.Today.Subtract(date)).TotalDays<0)
+						{
+							m_ColorExpFlag=Color.White;
+							key.SetValue("","windows2.dll");
+							key.Close();
+							key=null;
+							return true;
+						}
+					}
+				}
+				finally
+				{
+					if(key!=null)
+						key.Close();
+				}
+			}
+			catch{}
+			m_ColorExpFlag=Color.Black;
+			return false;
+		}
+#endif
+        #endregion
+
+        /// <summary>
+        /// Finds the node based on the Node.Name property.
+        /// </summary>
+        /// <param name="advTree">Reference to a tree control.</param>
+        /// <param name="name">Reference to a node with given name or null if node cannot be found.</param>
+        public static Node FindNodeByName(AdvTree advTree, string name)
+        {
+            return FindNodeByName(advTree.Nodes, name);
+        }
+
+        public static Node FindNodeByName(NodeCollection col, string name)
+        {
+            foreach (Node node in col)
+            {
+                if (node.Name == name)
+                    return node;
+                if (node.HasChildNodes)
+                {
+                    Node n2 = FindNodeByName(node.Nodes, name);
+                    if (n2 != null) return n2;
+                }
+            }
+            return null;
+        }
+
+        public static void FindNodesByName(NodeCollection col, string name, bool searchAllChildren, ArrayList listToPopulate)
+        {
+            foreach (Node node in col)
+            {
+                if (node.Name == name)
+                    listToPopulate.Add(node);
+                if (searchAllChildren && node.HasChildNodes)
+                {
+                    FindNodesByName(node.Nodes, name, true, listToPopulate);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Finds the node based on the Node.DataKey property.
+        /// </summary>
+        /// <param name="advTree">Reference to a tree control.</param>
+        /// <param name="name">Reference to a node with given key or null if node cannot be found.</param>
+        public static Node FindNodeByDataKey(AdvTree advTree, object key)
+        {
+            return FindNodeByDataKey(advTree.Nodes, key);
+        }
+        public static Node FindNodeByDataKey(NodeCollection col, object key)
+        {
+            foreach (Node node in col)
+            {
+                if (object.Equals(node.DataKey, key))
+                    return node;
+                if (node.HasChildNodes)
+                {
+                    Node n2 = FindNodeByDataKey(node.Nodes, key);
+                    if (n2 != null) return n2;
+                }
+            }
+            return null;
+        }
+
+        /// <summary>
+        /// Finds the node based on the Node.BindingIndex property.
+        /// </summary>
+        /// <param name="advTree">Reference to a tree control.</param>
+        /// <param name="bindingIndex">Index to look for</param>
+        public static Node FindNodeByBindingIndex(AdvTree advTree, int bindingIndex)
+        {
+            return FindNodeByBindingIndex(advTree.Nodes, bindingIndex);
+        }
+        public static Node FindNodeByBindingIndex(NodeCollection col, int bindingIndex)
+        {
+            foreach (Node node in col)
+            {
+                if (node.BindingIndex == bindingIndex)
+                    return node;
+                if (node.HasChildNodes)
+                {
+                    Node n2 = FindNodeByBindingIndex(node.Nodes, bindingIndex);
+                    if (n2 != null) return n2;
+                }
+            }
+            return null;
+        }
+
+        /// <summary>
+        /// Returns next visible cell in node.
+        /// </summary>
+        /// <param name="node">Reference to a node</param>
+        /// <param name="startIndex">The index at which to start search.</param>
+        /// <returns>Reference to cell or null if there are no visible cells</returns>
+        public static Cell GetNextVisibleCell(Node node, int startIndex)
+        {
+            return GetVisibleCell(node, startIndex, 1);
+        }
+        /// <summary>
+        /// Returns previous visible cell in node.
+        /// </summary>
+        /// <param name="node">Reference to a node</param>
+        /// <param name="startIndex">The index at which to start search.</param>
+        /// <returns>Reference to cell or null if there are no visible cells</returns>
+        public static Cell GetPreviousVisibleCell(Node node, int startIndex)
+        {
+            return GetVisibleCell(node, startIndex, -1);
+        }
+
+        public static Cell GetVisibleCell(Node node, int startIndex, int direction)
+        {
+            AdvTree tree = node.TreeControl;
+            if (tree != null && tree.AllowUserToReorderColumns && tree.Columns.Count > 0)
+            {
+                // Convert the startIndex to display index
+                startIndex = tree.Columns.GetDisplayIndex(tree.Columns[startIndex]);
+                startIndex += direction;
+
+                int c = direction > 0 ? tree.Columns.Count - 1 : 0;
+                int i = startIndex;
+                int loopCount = 0;
+                while (loopCount < 2)
+                {
+                    if (i < 0)
+                    {
+                        i = tree.Columns.Count - 1;
+                        loopCount++;
+                    }
+                    else if (i >= tree.Columns.Count)
+                    {
+                        i = 0;
+                        loopCount++;
+                    }
+                    int cellIndex = tree.Columns.DisplayIndexMap[i];
+                    if (node.Cells.Count>cellIndex && node.Cells[cellIndex].IsVisible) return node.Cells[cellIndex];
+                    i += direction;
+                }
+            }
+            else
+            {
+                startIndex += direction;
+                int c = direction > 0 ? node.Cells.Count - 1 : 0;
+                int i = startIndex;
+                int loopCount = 0;
+                while (loopCount < 2)
+                {
+                    if (i < 0)
+                    {
+                        i = node.Cells.Count - 1;
+                        loopCount++;
+                    }
+                    else if (i >= node.Cells.Count)
+                    {
+                        i = 0;
+                        loopCount++;
+                    }
+
+                    if (node.Cells[i].IsVisible) return node.Cells[i];
+                    i += direction;
+                }
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Returns the zero based flat index of the node. Flat index is the index of the node as if tree structure
+        /// has been flattened into the list.
+        /// </summary>
+        /// <param name="tree">Reference to parent tree control.</param>
+        /// <param name="node">Reference to the node to return index for.</param>
+        /// <returns>Zero based node index or -1 if index cannot be determined.</returns>
+        internal static int GetNodeFlatIndex(AdvTree tree, Node node)
+        {
+            if (node == null) throw new NullReferenceException("Parameter node cannot be null");
+            int count = 0;
+            Node currentNode = GetAnyPreviousNode(node);
+            while (currentNode != null)
+            {
+                count++;
+                currentNode = GetAnyPreviousNode(currentNode);
+                //if (currentNode != null && currentNode.Parent == null)
+                //{
+                //    count += tree.Nodes.IndexOf(currentNode) + 1;
+                //    break;
+                //}
+            }
+            
+            return count;
+        }
+
+        /// <summary>
+        /// Returns node based on the flat index. Flat index is the index of the node as if tree structure
+        /// has been flattened into the list.
+        /// </summary>
+        /// <param name="advTree">Parent tree control.</param>
+        /// <param name="index">Index to return node for.</param>
+        /// <returns>Reference to a node or null if node at specified index cannot be found.</returns>
+        internal static Node GetNodeByFlatIndex(AdvTree advTree, int index)
+        {
+            if (index == -1 || advTree.Nodes.Count == 0) return null;
+
+            Node node = advTree.Nodes[0];
+            int count = 0;
+            while (node != null)
+            {
+                if (index == count)
+                    return node;
+                node = GetAnyNextNode(node);
+                count++;
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Finds the first node that starts with the specified text. Node.Text property is searched.
+        /// </summary>
+        /// <param name="advTree">Parent tree control.</param>
+        /// <param name="text">Partial text to look for</param>
+        /// <param name="startFromNode">Reference node to start searching from</param>
+        /// <param name="ignoreCase">Gets or sets whether search ignores the letter case</param>
+        /// <returns>Reference to a node or null if no node is found.</returns>
+        internal static Node FindNodeByText(AdvTree advTree, string text, Node startFromNode, bool ignoreCase)
+        {
+            if (startFromNode == null)
+                startFromNode = GetFirstVisibleNode(advTree);
+            else
+                startFromNode = GetAnyNextNode(startFromNode);
+            if (startFromNode == null) return null;
+
+            Node node = startFromNode;
+#if FRAMEWORK20
+            StringComparison comparison = ignoreCase ? StringComparison.CurrentCultureIgnoreCase : StringComparison.CurrentCulture;
+            while (node != null)
+            {
+                if (node.Text.StartsWith(text, comparison))
+                    return node;
+                node = GetAnyNextNode(node);
+            }
+#else
+			if(ignoreCase)
+			{
+				text = text.ToLower();
+				while (node != null)
+				{
+					if (node.Text.ToLower().StartsWith(text))
+						return node;
+					node = GetAnyNextNode(node);
+				}
+			}
+			else
+			{
+				while (node != null)
+				{
+					if (node.Text.StartsWith(text))
+						return node;
+					node = GetAnyNextNode(node);
+				}
+			}
+#endif
+            return null;
+        }
+
+        internal static Node FindNodeByCellText(
+            AdvTree advTree, string text, Node startFromNode, bool ignoreCase)
+        {
+            if (string.IsNullOrEmpty(text) == true)
+                return (null);
+
+            startFromNode = (startFromNode == null)
+                ? GetFirstVisibleNode(advTree) : GetAnyNextNode(startFromNode);
+
+            if (startFromNode == null) 
+                return (null);
+
+            string[] s = text.Split(',');
+
+            for (int i = 0; i < s.Length; i++)
+                s[i] = s[i].Trim();
+
+            Node node = startFromNode;
+
+#if FRAMEWORK20
+            StringComparison comparison = (ignoreCase == true)
+                ? StringComparison.CurrentCultureIgnoreCase : StringComparison.CurrentCulture;
+
+            while (node != null)
+            {
+                if (MatchedCell(node, s, comparison) == true)
+                    return (node);
+
+                node = GetAnyNextNode(node);
+            }
+#else
+			if (ignoreCase == true)
+			{
+                for (int i = 0; i < s.Length; i++)
+                    s[i] = s[i].ToLower();
+            }
+
+			while (node != null)
+			{
+                if (MatchedCell(node, s, ignoreCase) == true)
+                    return (node);
+
+				node = GetAnyNextNode(node);
+			}
+#endif
+            return (null);
+        }
+
+#if FRAMEWORK20
+	    private static bool MatchedCell(
+            Node node, string[] s, StringComparison comp)
+	    {
+            for (int i = 0; i < s.Length; i++)
+            {
+                if (i >= node.Cells.Count)
+                    break;
+
+                Cell cell = node.Cells[i];
+
+                if (cell.Text.StartsWith(s[i], comp) == false)
+                    return (false);
+            }
+
+	        return (true);
+	    }
+#else
+        private static bool MatchedCell(Node node, string[] s, bool ignoreCase)
+	    {
+            for (int i = 0; i < s.Length; i++)
+            {
+                if (i >= node.Cells.Count)
+                    break;
+
+                Cell cell = node.Cells[i];
+
+                if (ignoreCase == true)
+                {
+                    if (cell.Text.ToLower().StartsWith(s[i]) == false)
+                        return (false);
+                }
+                else
+                {
+                    if (cell.Text.StartsWith(s[i]) == false)
+                        return (false);
+                }
+            }
+
+	        return (true);
+	    }
+#endif
+
+        internal static ColumnHeader GetCellColumnHeader(AdvTree tree, Cell cell)
+        {
+            int index = -1;
+            if (cell.Parent != null) index = cell.Parent.Cells.IndexOf(cell);
+
+            if (cell.Parent != null && cell.Parent.Parent != null && cell.Parent.Parent.NodesColumns.Count > 0 && index < cell.Parent.Parent.NodesColumns.Count)
+            {
+                return cell.Parent.Parent.NodesColumns[index];
+            }
+
+            if (tree != null && tree.Columns.Count > 0 && index < tree.Columns.Count)
+                return tree.Columns[index];
+
+            return null;
+        }
+
+        public static void InvalidateNodeLayout(Node node, bool invalidateChildNodes)
+        {
+            node.SizeChanged = true;
+            if (invalidateChildNodes && node.HasChildNodes)
+            {
+                foreach (Node item in node.Nodes)
+                {
+                    InvalidateNodeLayout(item, true);
+                }
+            }
+        }
+    }
+
+    /// <summary>
+    /// Returned as information about the node or its column header at given coordinates.
+    /// </summary>
+    internal class NodeHitTestInfo
+    {
+        public Node NodeAt = null;
+        public ColumnHeaderCollection ColumnsAt = null;
+    }
+
+    /// <summary>
+    /// Defines options for EnsureVisible method which brings node into the view.
+    /// </summary>
+    public enum eEnsureVisibleOption
+    {
+        /// <summary>
+        /// Scrolls the tree so node is displayed at the bottom of the tree, if possible.
+        /// </summary>
+        Bottom,
+        /// <summary>
+        /// Scrolls the tree so node is displayed in the middle of the tree, if possible.
+        /// </summary>
+        Middle,
+        /// <summary>
+        /// Scrolls the tree so node is displayed at the top of the tree, if possible.
+        /// </summary>
+        Top
+    }
+}
+
diff --git a/PROMS/DotNetBar Source Code/AdvTree/NodeStyles.cs b/PROMS/DotNetBar Source Code/AdvTree/NodeStyles.cs
new file mode 100644
index 00000000..1219088b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/NodeStyles.cs	
@@ -0,0 +1,463 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using DevComponents.DotNetBar;
+
+namespace DevComponents.AdvTree
+{
+	/// <summary>
+	/// Class that provides predefined styles for the nodes. Styles are defined as static memeber of the class
+	/// </summary>
+	public class NodeStyles
+	{
+		private static ElementStyle s_AppleStyle=null;
+		private static ElementStyle s_BlueStyle=null;
+		private static ElementStyle s_BlueLightStyle=null;
+		private static ElementStyle s_BlueNightStyle=null;
+		private static ElementStyle s_BlueMistStyle=null;
+		private static ElementStyle s_CyanStyle=null;
+		private static ElementStyle s_GreenStyle=null;
+		private static ElementStyle s_LemonStyle=null;
+		private static ElementStyle s_MagentaStyle=null;
+		private static ElementStyle s_OrangeStyle=null;
+		private static ElementStyle s_OrangeLightStyle=null;
+		private static ElementStyle s_PurpleStyle=null;
+		private static ElementStyle s_PurpleMistStyle=null;
+		private static ElementStyle s_RedStyle=null;
+		private static ElementStyle s_SilverStyle=null;
+		private static ElementStyle s_SilverMistStyle=null;
+		private static ElementStyle s_TanStyle=null;
+		private static ElementStyle s_TealStyle=null;
+		private static ElementStyle s_YellowStyle=null;
+		private static ElementStyle s_GrayStyle=null;
+		
+		/// <summary>
+		/// Returns Apple element style
+		/// </summary>
+		public static ElementStyle Apple
+		{
+			get
+			{
+				if(s_AppleStyle==null)
+					s_AppleStyle = GetStyle(ePredefinedElementStyle.Apple);
+				return s_AppleStyle;
+			}	
+		}
+		
+		/// <summary>
+		/// Returns Blue element style
+		/// </summary>
+		public static ElementStyle Blue
+		{
+			get
+			{
+				if(s_BlueStyle==null)
+					s_BlueStyle= GetStyle(ePredefinedElementStyle.Blue);
+				return s_BlueStyle;
+			}	
+		}
+		
+		/// <summary>
+		/// Returns BlueLight element style
+		/// </summary>
+		public static ElementStyle BlueLight
+		{
+			get
+			{
+				if(s_BlueLightStyle==null)
+					s_BlueLightStyle= GetStyle(ePredefinedElementStyle.BlueLight);
+				return s_BlueLightStyle;
+			}	
+		}
+		
+		/// <summary>
+		/// Returns BlueNight element style
+		/// </summary>
+		public static ElementStyle BlueNight
+		{
+			get
+			{
+				if(s_BlueNightStyle==null)
+					s_BlueNightStyle= GetStyle(ePredefinedElementStyle.BlueNight);
+				return s_BlueNightStyle;
+			}	
+		}
+		
+		/// <summary>
+		/// Returns BlueMist element style
+		/// </summary>
+		public static ElementStyle BlueMist
+		{
+			get
+			{
+				if(s_BlueMistStyle==null)
+					s_BlueMistStyle= GetStyle(ePredefinedElementStyle.BlueMist);
+				return s_BlueMistStyle;
+			}	
+		}
+		
+		/// <summary>
+		/// Returns Cyan element style
+		/// </summary>
+		public static ElementStyle Cyan
+		{
+			get
+			{
+				if(s_CyanStyle==null)
+					s_CyanStyle= GetStyle(ePredefinedElementStyle.Cyan);
+				return s_CyanStyle;
+			}	
+		}
+		
+		/// <summary>
+		/// Returns Green element style
+		/// </summary>
+		public static ElementStyle Green
+		{
+			get
+			{
+				if(s_GreenStyle==null)
+					s_GreenStyle= GetStyle(ePredefinedElementStyle.Green);
+				return s_GreenStyle;
+			}	
+		}
+		
+		/// <summary>
+		/// Returns Lemon element style
+		/// </summary>
+		public static ElementStyle Lemon
+		{
+			get
+			{
+				if(s_LemonStyle==null)
+					s_LemonStyle= GetStyle(ePredefinedElementStyle.Lemon);
+				return s_LemonStyle;
+			}	
+		}
+		
+		/// <summary>
+		/// Returns Magenta element style
+		/// </summary>
+		public static ElementStyle Magenta
+		{
+			get
+			{
+				if(s_MagentaStyle==null)
+					s_MagentaStyle= GetStyle(ePredefinedElementStyle.Magenta);
+				return s_MagentaStyle;
+			}	
+		}
+		
+		/// <summary>
+		/// Returns Orange element style
+		/// </summary>
+		public static ElementStyle Orange
+		{
+			get
+			{
+				if(s_OrangeStyle==null)
+					s_OrangeStyle= GetStyle(ePredefinedElementStyle.Orange);
+				return s_OrangeStyle;
+			}	
+		}
+		
+		/// <summary>
+		/// Returns OrangeLight element style
+		/// </summary>
+		public static ElementStyle OrangeLight
+		{
+			get
+			{
+				if(s_OrangeLightStyle==null)
+					s_OrangeLightStyle= GetStyle(ePredefinedElementStyle.OrangeLight);
+				return s_OrangeLightStyle;
+			}	
+		}
+		
+		/// <summary>
+		/// Returns Purple element style
+		/// </summary>
+		public static ElementStyle Purple
+		{
+			get
+			{
+				if(s_PurpleStyle==null)
+					s_PurpleStyle= GetStyle(ePredefinedElementStyle.Purple);
+				return s_PurpleStyle;
+			}	
+		}
+		
+		/// <summary>
+		/// Returns PurpleMist element style
+		/// </summary>
+		public static ElementStyle PurpleMist
+		{
+			get
+			{
+				if(s_PurpleMistStyle==null)
+					s_PurpleMistStyle= GetStyle(ePredefinedElementStyle.PurpleMist);
+				return s_PurpleMistStyle;
+			}	
+		}
+		
+		/// <summary>
+		/// Returns Red element style
+		/// </summary>
+		public static ElementStyle Red
+		{
+			get
+			{
+				if(s_RedStyle==null)
+					s_RedStyle= GetStyle(ePredefinedElementStyle.Red);
+				return s_RedStyle;
+			}	
+		}
+		
+		/// <summary>
+		/// Returns Silver element style
+		/// </summary>
+		public static ElementStyle Silver
+		{
+			get
+			{
+				if(s_SilverStyle==null)
+					s_SilverStyle= GetStyle(ePredefinedElementStyle.Silver);
+				return s_SilverStyle;
+			}	
+		}
+		
+		/// <summary>
+		/// Returns SilverMist element style
+		/// </summary>
+		public static ElementStyle SilverMist
+		{
+			get
+			{
+				if(s_SilverMistStyle==null)
+					s_SilverMistStyle= GetStyle(ePredefinedElementStyle.SilverMist);
+				return s_SilverMistStyle;
+			}	
+		}
+		
+		/// <summary>
+		/// Returns Tan element style
+		/// </summary>
+		public static ElementStyle Tan
+		{
+			get
+			{
+				if(s_TanStyle==null)
+					s_TanStyle= GetStyle(ePredefinedElementStyle.Tan);
+				return s_TanStyle;
+			}	
+		}
+		
+		/// <summary>
+		/// Returns Teal element style
+		/// </summary>
+		public static ElementStyle Teal
+		{
+			get
+			{
+				if(s_TealStyle==null)
+					s_TealStyle= GetStyle(ePredefinedElementStyle.Teal);
+				return s_TealStyle;
+			}	
+		}
+		
+		/// <summary>
+		/// Returns Yellow element style
+		/// </summary>
+		public static ElementStyle Yellow
+		{
+			get
+			{
+				if(s_YellowStyle==null)
+					s_YellowStyle= GetStyle(ePredefinedElementStyle.Yellow);
+				return s_YellowStyle;
+			}	
+		}
+		
+		/// <summary>
+		/// Returns Gray element style
+		/// </summary>
+		public static ElementStyle Gray
+		{
+			get
+			{
+				if(s_GrayStyle==null)
+					s_GrayStyle= GetStyle(ePredefinedElementStyle.Gray);
+				return s_GrayStyle;
+			}	
+		}
+		
+		private static ElementStyle GetStyle(ePredefinedElementStyle c)
+		{
+			Color color1=Color.Empty;
+			Color color2=Color.Empty;
+			int gradientAngle = 90;
+			Color textColor=Color.Black;
+			Color borderColor = Color.DarkGray;
+			
+			switch (c)
+			
+			{
+				case ePredefinedElementStyle.Apple:
+				{
+					color1 = Color.FromArgb(232, 248, 224);
+					color2 = Color.FromArgb(173, 231, 146);
+					break;
+				}
+				case ePredefinedElementStyle.Blue:
+				{
+					color1 = Color.FromArgb(221, 230, 247);
+					color2 = Color.FromArgb(138, 168, 228);
+					break;
+				}
+				case ePredefinedElementStyle.BlueLight:
+				{
+					color1=Color.FromArgb(255,255,255);
+					color2=Color.FromArgb(210,224,252);
+					textColor=Color.FromArgb(69,84,115);
+					break;
+				}
+				case ePredefinedElementStyle.BlueMist:
+				{
+					color1 = Color.FromArgb(227, 236, 243);
+					color2 = Color.FromArgb(155, 187, 210);
+					break;
+				}
+				case ePredefinedElementStyle.BlueNight:
+				{
+					color1=Color.FromArgb(77,108,152);
+					color2=Color.Navy;
+					textColor=Color.White;
+					borderColor=Color.Navy;
+					break;
+				}
+				case ePredefinedElementStyle.Cyan:
+				{
+					color1 = Color.FromArgb(227, 236, 243);
+					color2 = Color.FromArgb(155, 187, 210);
+					break;
+				}
+				case ePredefinedElementStyle.Green:
+				{
+					color1 = Color.FromArgb(234, 240, 226);
+					color2 = Color.FromArgb(183, 201, 151);
+					break;
+				}
+				case ePredefinedElementStyle.Lemon:
+				{
+					color1 = Color.FromArgb(252, 253, 215);
+					color2 = Color.FromArgb(245, 249, 111);
+					break;
+				}
+				case ePredefinedElementStyle.Magenta:
+				{
+					color1 = Color.FromArgb(243, 229, 236);
+					color2 = Color.FromArgb(213, 164, 187);
+					break;
+				}
+				case ePredefinedElementStyle.Orange:
+				{
+					color1 = Color.FromArgb(252, 233, 217);
+					color2 = Color.FromArgb(246, 176, 120);
+					break;
+				}
+				case ePredefinedElementStyle.OrangeLight:
+				{
+					color1=Color.FromArgb(255,239,201);
+					color2=Color.FromArgb(242,210,132);
+					textColor=Color.FromArgb(117,83,2);
+					break;
+				}
+				case ePredefinedElementStyle.Purple:
+				{
+					color1 = Color.FromArgb(234, 227, 245);
+					color2 = Color.FromArgb(180, 158, 222);
+					break;
+				}
+				case ePredefinedElementStyle.PurpleMist:
+				{
+					color1 = Color.FromArgb(232, 227, 234);
+					color2 = Color.FromArgb(171, 156, 183);
+					break;
+				}
+				case ePredefinedElementStyle.Red:
+				{
+					color1 = Color.FromArgb(249, 225, 226);
+					color2 = Color.FromArgb(238, 149, 151);
+					break;
+				}
+				case ePredefinedElementStyle.Silver:
+				{
+					color1 = Color.FromArgb(225, 225, 232);
+					color2 = Color.FromArgb(149, 149, 170);
+					break;
+				}
+				case ePredefinedElementStyle.SilverMist:
+				{
+					color1 = Color.FromArgb(243,244,250);
+					color2=Color.FromArgb(155,153,183);
+					textColor=Color.FromArgb(87,86,113);
+					break;
+				}
+				case ePredefinedElementStyle.Tan:
+				{
+					color1 = Color.FromArgb(248, 242, 226);
+					color2 = Color.FromArgb(232, 209, 153);
+					break;
+				}
+				case ePredefinedElementStyle.Teal:
+				{
+					color1 = Color.FromArgb(205, 236, 240);
+					color2 = Color.FromArgb(78, 188, 202);
+					break;
+				}
+				case ePredefinedElementStyle.Yellow:
+				{
+					color1 = Color.FromArgb(255, 244, 213);
+					color2 = Color.FromArgb(255, 216, 105);
+					break;
+				}
+				case ePredefinedElementStyle.Gray:
+				{
+					color1 = Color.White;
+					color2 = ColorScheme.GetColor("E4E4F0");
+					break;
+				}
+			}
+			
+			ElementStyle style=Utilities.CreateStyle(new ComponentFactory(),Enum.GetName(typeof(ePredefinedElementStyle),c),borderColor,color1, color2, gradientAngle,textColor);
+			return style;
+		}
+	}
+	
+	/// <summary>
+	/// Indicates predefined element style.
+	/// </summary>
+	public enum ePredefinedElementStyle
+	{
+		Blue,
+		BlueLight,
+		BlueNight,
+		Yellow,
+		Green,
+		Red,
+		Purple,
+		Cyan,
+		Orange,
+		OrangeLight,
+		Magenta,
+		BlueMist,
+		PurpleMist,
+		Tan,
+		Lemon,
+		Apple,
+		Teal,
+		Silver,
+		SilverMist,
+		Gray
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/SelectedNodesCollection.cs b/PROMS/DotNetBar Source Code/AdvTree/SelectedNodesCollection.cs
new file mode 100644
index 00000000..94007432
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/SelectedNodesCollection.cs	
@@ -0,0 +1,160 @@
+using System;
+using System.Text;
+using System.Collections.Generic;
+
+namespace DevComponents.AdvTree
+{
+    /// <summary>
+    /// Represents the selected nodes collection.
+    /// </summary>
+    public class SelectedNodesCollection : NodeCollection
+    {
+        #region Internal Implementation
+        internal AdvTree TreeSelectionControl = null;
+        internal bool SuspendEvents = false;
+        internal bool SuspendClearEvents = false;
+        /// <summary>
+        /// Initializes a new instance of the SelectedNodesCollection class.
+        /// </summary>
+        public SelectedNodesCollection()
+        {
+            PassiveCollection = true;
+        }
+        
+        /// <summary>
+        /// Adds new object to the collection and provides information about the source of the command
+        /// </summary>
+        /// <param name="node">Node to add</param>
+        /// <param name="action">Source action</param>
+        /// <returns></returns>
+        public override int Add(Node node, eTreeAction action)
+        {
+            if (this.List.Contains(node)) return -1;
+
+            if (TreeSelectionControl.MultiSelect)
+            {
+                if (TreeSelectionControl.MultiSelectRule == eMultiSelectRule.SameParent && this.Count>0)
+                {
+                    if (this[0].Parent != node.Parent)
+                        throw new InvalidOperationException("Node being added does not belong to the same parent as currently selected nodes. See AdvTree.MultiSelectRule property");
+                }
+                if (!SuspendEvents)
+                {
+                    AdvTreeNodeCancelEventArgs cancelArgs = new AdvTreeNodeCancelEventArgs(action, node);
+                    TreeSelectionControl.InvokeOnBeforeNodeSelect(cancelArgs);
+                    if (cancelArgs.Cancel)
+                        return -1;
+                }
+            }
+            return base.Add(node, action);
+        }
+
+        /// <summary>
+        /// Adds an array of objects to the collection. 
+        /// </summary>
+        /// <param name="nodes">Array of Node objects.</param>
+        public override void AddRange(Node[] nodes)
+        {
+            this.MultiNodeOperation = true;
+            base.AddRange(nodes);
+            this.MultiNodeOperation = false;
+            if (!SuspendEvents)
+                TreeSelectionControl.InvokeSelectionChanged(EventArgs.Empty);
+        }
+
+        protected override void OnInsertComplete(int index, object value)
+        {
+            if (TreeSelectionControl.MultiSelect)
+            {
+                Node node = value as Node;
+                node.IsSelected = true;
+                TreeSelectionControl.InvalidateNode(node);
+                if (node.SelectedCell == null)
+                {
+                    node.SelectFirstCell(SourceAction);
+                }
+                AdvTreeNodeEventArgs args = new AdvTreeNodeEventArgs(SourceAction, node);
+                TreeSelectionControl.InvokeOnAfterNodeSelect(args);
+                node.InternalSelected(this.SourceAction);
+                if(!_MultiNodeOperation)
+                    TreeSelectionControl.InvokeSelectionChanged(EventArgs.Empty);
+            }
+            base.OnInsertComplete(index, value);
+
+        }
+
+        protected override void OnRemoveComplete(int index, object value)
+        {
+            if (TreeSelectionControl.MultiSelect)
+            {
+                Node node = value as Node;
+                node.IsSelected = false;
+                TreeSelectionControl.InvalidateNode(node);
+                if (node.SelectedCell != null)
+                    node.SelectedCell.SetSelected(false, SourceAction);
+
+                TreeSelectionControl.InvokeOnAfterNodeDeselect(new AdvTreeNodeEventArgs(this.SourceAction, node));
+                node.InternalDeselected(this.SourceAction);
+                if (!_MultiNodeOperation)
+                    TreeSelectionControl.InvokeSelectionChanged(EventArgs.Empty);
+            }
+            base.OnRemoveComplete(index, value);
+        }
+
+        private int _NumberOfClearedNodes = 0;
+        protected override void OnClear()
+        {
+            if (TreeSelectionControl.MultiSelect)
+            {
+                _NumberOfClearedNodes = this.List.Count;
+                Node[] list = new Node[_NumberOfClearedNodes];
+                this.List.CopyTo(list, 0);
+                foreach (Node node in list)
+                {
+                    node.IsSelected = false;
+                    TreeSelectionControl.InvalidateNode(node);
+                    if (node.SelectedCell == null)
+                        node.Cells[0].SetSelected(false, SourceAction);
+                    _ClearedEventArgsList.Add(new AdvTreeNodeEventArgs(this.SourceAction, node)); // Delay event notification to OnClearComplete so node is not in collection if collection is being tested
+                    //TreeSelectionControl.InvokeOnAfterNodeDeselect(new AdvTreeNodeEventArgs(this.SourceAction, node));
+                    node.InternalDeselected(this.SourceAction);
+                }
+            }
+            base.OnClear();
+        }
+        private List<AdvTreeNodeEventArgs> _ClearedEventArgsList = new List<AdvTreeNodeEventArgs>();
+        protected override void OnClearComplete()
+        {
+            if (TreeSelectionControl.MultiSelect)
+            {
+                if (TreeSelectionControl != null && !SuspendClearEvents)
+                {
+                    // Invoke nodes deselected
+                    foreach (AdvTreeNodeEventArgs advTreeNodeEventArgs in _ClearedEventArgsList)
+                    {
+                        TreeSelectionControl.InvokeOnAfterNodeDeselect(advTreeNodeEventArgs);
+                    }
+                }
+                _ClearedEventArgsList.Clear();
+                if (!SuspendClearEvents && _NumberOfClearedNodes > 0)
+                    TreeSelectionControl.InvokeSelectionChanged(EventArgs.Empty);
+            }
+            base.OnClearComplete();
+        }
+
+        private bool _MultiNodeOperation;
+        internal bool MultiNodeOperation
+        {
+            get
+            {
+                return _MultiNodeOperation;
+            }
+            set
+            {
+                _MultiNodeOperation = value;
+            }
+        }
+        #endregion
+        
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/TextBoxEx.cs b/PROMS/DotNetBar Source Code/AdvTree/TextBoxEx.cs
new file mode 100644
index 00000000..8e03e717
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/TextBoxEx.cs	
@@ -0,0 +1,159 @@
+using System;
+using System.Drawing;
+using System.Windows.Forms;
+using System.ComponentModel;
+
+namespace DevComponents.AdvTree
+{
+	/// <summary>
+	/// Represents the text box for editing cell's text.
+	/// </summary>
+	[Designer("System.Windows.Forms.Design.ControlDesigner, System.Design, Version= 2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"),ToolboxItem(false)]
+	internal class TextBoxEx:TextBox, ICellEditControl
+	{
+		#region Private variables
+		private bool m_WordWrap=false;
+		#endregion
+
+		#region Events
+		public event EventHandler EditComplete;
+		public event EventHandler CancelEdit;
+		#endregion
+
+		#region Constructor
+		public TextBoxEx():base()
+		{
+			this.AutoSize=false;
+			this.BorderStyle=System.Windows.Forms.BorderStyle.None;
+		}
+		#endregion
+
+		#region Internal Implementation
+		protected override void OnKeyDown(KeyEventArgs e)
+	{	
+			base.OnKeyDown(e);
+
+			if(e.KeyCode==Keys.Enter && !m_WordWrap || e.KeyCode==Keys.Enter && e.Modifiers==Keys.Control)
+			{
+				if(EditComplete!=null)
+					EditComplete(this, new EventArgs());
+			}
+			else if(e.KeyCode==Keys.Escape)
+			{
+				if(CancelEdit!=null)
+					CancelEdit(this,new EventArgs());
+			}
+		}
+#if FRAMEWORK20
+        protected override void OnKeyPress(KeyPressEventArgs e)
+        {
+            if (!m_WordWrap && _PreventEnterBeep && e.KeyChar == (char)Keys.Enter)
+            {
+                e.Handled = true;
+            }
+            base.OnKeyPress(e);
+        }
+#endif
+
+        protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
+        {
+            if (keyData == Keys.Tab)
+            {
+                if (EditComplete != null)
+                    EditComplete(this, new EventArgs());
+            }
+            return base.ProcessCmdKey(ref msg, keyData);
+        }
+
+		protected override void OnTextChanged(EventArgs e)
+		{
+			base.OnTextChanged (e);
+			ResizeControl();
+		}
+
+		private void ResizeControl()
+		{
+			Graphics g=this.CreateGraphics();
+			SizeF size=g.MeasureString(this.Text,this.Font);
+			int width=(int)Math.Ceiling(size.Width);
+			int height=(int)Math.Ceiling(size.Height);
+            if (this.Parent != null && this.Right + (width - this.Width) > (this.Parent.ClientRectangle.Right - SystemInformation.VerticalScrollBarWidth - 2))
+                return;
+            if (width > this.Width)
+                this.Width = width;
+
+			if(m_WordWrap)
+			{
+				if(this.Parent!=null && this.Bottom+(height-this.Height)>this.Parent.Bottom)
+					return;
+				if(height>this.Height)
+					this.Height=height;
+			}
+		}
+		#endregion
+
+		#region Public Properties
+
+		/// <summary>
+		/// Gets or sets whether the editing is in word-wrap mode.
+		/// </summary>
+		public bool EditWordWrap
+		{
+			get {return m_WordWrap;}
+			set
+			{
+				m_WordWrap=value;
+				if(m_WordWrap)
+				{
+					this.Multiline=true;
+					this.ScrollBars=ScrollBars.None;
+				}
+				else
+				{
+					this.Multiline=false;
+				}
+			}
+		}
+
+        private bool _PreventEnterBeep = false;
+        /// <summary>
+        /// Gets or sets whether control prevents Beep sound when Enter key is pressed.
+        /// </summary>
+        [DefaultValue(false), Category("Behavior"), Description("Gets or sets whether control prevents Beep sound when Enter key is pressed.")]
+        public bool PreventEnterBeep
+        {
+            get { return _PreventEnterBeep; }
+            set
+            {
+                _PreventEnterBeep = value;
+            }
+        }
+        
+		#endregion
+
+        #region ICellEditControl Members
+
+        public void BeginEdit()
+        {
+            
+        }
+
+        public void EndEdit()
+        {
+            
+        }
+
+        public object CurrentValue
+        {
+            get
+            {
+                return this.Text;
+            }
+            set
+            {
+                this.Text = value.ToString();
+            }
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/TreeAreaInfo.cs b/PROMS/DotNetBar Source Code/AdvTree/TreeAreaInfo.cs
new file mode 100644
index 00000000..1920c540
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/TreeAreaInfo.cs	
@@ -0,0 +1,60 @@
+namespace DevComponents.AdvTree
+{
+	/// <summary>
+	/// Summary description for TreeAreaInfo.
+	/// </summary>
+	internal class TreeAreaInfo
+	{
+		/// <summary>
+		/// Reference to parent node in which child bounds the coordinates are. Can be null if no parent node contains given coordinates.
+		/// </summary>
+		public Node ParentAreaNode=null;
+		/// <summary>
+		/// Node which contains specified coordinates. Can be null if no node contains coordinates.
+		/// </summary>
+		public Node NodeAt=null;
+		/// <summary>
+		/// Previous reference node for given coordinates. If coordinates fall between two nodes this will indicate previous node or null.
+		/// </summary>
+		public Node PreviousNode=null;
+		/// <summary>
+		/// Next reference node for given coordinates. If coordinates fall between two nodes this will indicate next node or null.
+		/// </summary>
+		public Node NextNode=null;
+	}
+
+    internal class NodeDragInfo
+    {
+        /// <summary>
+        /// Gets or sets the parent node drag node will be added to. When null the drag node is being added as top-level node.
+        /// </summary>
+        public Node Parent = null;
+        /// <summary>
+        /// Gets or sets the insert index of drag node into the parent's node Nodes collection.
+        /// </summary>
+        public int InsertIndex = -1;
+
+        /// <summary>
+        /// Initializes a new instance of the NodeDragInfo class.
+        /// </summary>
+        public NodeDragInfo()
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the NodeDragInfo class.
+        /// </summary>
+        /// <param name="parent"></param>
+        /// <param name="insertIndex"></param>
+        public NodeDragInfo(Node parent, int insertIndex)
+        {
+            Parent = parent;
+            InsertIndex = insertIndex;
+        }
+
+        public override string ToString()
+        {
+            return string.Format("NodeDragInfo-> Parent={0}, InsertIndex={1}", Parent, InsertIndex);
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/TreeCellCancelEventArgs.cs b/PROMS/DotNetBar Source Code/AdvTree/TreeCellCancelEventArgs.cs
new file mode 100644
index 00000000..9949412d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/TreeCellCancelEventArgs.cs	
@@ -0,0 +1,43 @@
+using System;
+using System.Windows.Forms;
+
+namespace DevComponents.AdvTree
+{
+	/// <summary>
+	/// Provides data for AdvTree Cell events that can be canceled.
+	/// </summary>
+	public class TreeCellCancelEventArgs:AdvTreeCellEventArgs
+	{
+		/// <summary>
+		/// Default constructor for event data.
+		/// </summary>
+		/// <param name="action">Type of the action event is raised for.</param>
+		/// <param name="cell">Cell that event is raised for.</param>
+		public TreeCellCancelEventArgs(eTreeAction action, Cell cell):base(action,cell)
+		{
+		}
+		
+		/// <summary>
+		/// Indicates that event action should be canceled.
+		/// </summary>
+		public bool Cancel=false;
+	}
+
+    /// <summary>
+    /// Provides data for AdvTree.BeforeCheck event.
+    /// </summary>
+    public class AdvTreeCellBeforeCheckEventArgs : TreeCellCancelEventArgs
+    {
+        public CheckState NewCheckState = CheckState.Indeterminate;
+
+        /// <summary>
+        /// Initializes a new instance of the AdvTreeCellBeforeCheckEventArgs class.
+        /// </summary>
+        /// <param name="newCheckState"></param>
+        public AdvTreeCellBeforeCheckEventArgs(eTreeAction action, Cell cell, CheckState newCheckState)
+            : base(action, cell)
+        {
+            NewCheckState = newCheckState;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/TreeCellEventArgs.cs b/PROMS/DotNetBar Source Code/AdvTree/TreeCellEventArgs.cs
new file mode 100644
index 00000000..b5b25976
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/TreeCellEventArgs.cs	
@@ -0,0 +1,30 @@
+using System;
+
+namespace DevComponents.AdvTree
+{
+	/// <summary>
+	/// Provides data for AdvTree Cell events.
+	/// </summary>
+	public class AdvTreeCellEventArgs:EventArgs
+	{
+		/// <summary>
+		/// Default constructor for event data.
+		/// </summary>
+		/// <param name="action">Type of the action event is raised for.</param>
+		/// <param name="cell">Cell that event is raised for.</param>
+		public AdvTreeCellEventArgs(eTreeAction action, Cell cell)
+		{
+			this.Action=action;
+			this.Cell=cell;
+		}
+
+		/// <summary>
+		/// Indicates the type of the action performed on a cell.
+		/// </summary>
+		public eTreeAction Action=eTreeAction.Code;
+		/// <summary>
+		/// Indicates the cell that action is performed on.
+		/// </summary>
+		public DevComponents.AdvTree.Cell Cell=null;
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/TreeDragDropEventArgs.cs b/PROMS/DotNetBar Source Code/AdvTree/TreeDragDropEventArgs.cs
new file mode 100644
index 00000000..88705986
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/TreeDragDropEventArgs.cs	
@@ -0,0 +1,48 @@
+using System;
+
+namespace DevComponents.AdvTree
+{
+	/// <summary>
+	/// Represents event arguments for BeforeNodeDrop and AfterNodeDrop events
+	/// </summary>
+    public class TreeDragDropEventArgs : AdvTreeMultiNodeCancelEventArgs
+	{
+        public TreeDragDropEventArgs(eTreeAction action, Node[] nodes, Node oldParentNode, Node newParentNode, int insertPosition)
+            : base(action, nodes)
+		{
+			this.NewParentNode = newParentNode;
+			this.OldParentNode = oldParentNode;
+            this.InsertPosition = insertPosition;
+		}
+
+        public TreeDragDropEventArgs(eTreeAction action, Node[] nodes, Node oldParentNode, Node newParentNode, bool isCopy, int insertPosition)
+            : base(action, nodes)
+        {
+            this.NewParentNode = newParentNode;
+            this.OldParentNode = oldParentNode;
+            this.IsCopy = isCopy;
+            this.InsertPosition = insertPosition;
+        }
+		
+		/// <summary>
+		/// Returns reference to the old parent node.
+		/// </summary>
+		public readonly Node OldParentNode=null;
+		
+		/// <summary>
+		/// Reference to the new parent node if event is not cancelled.
+		/// </summary>
+		public readonly Node NewParentNode=null;
+
+        /// <summary>
+        /// Gets or sets whether drag node is being copied instead of moved.
+        /// </summary>
+        public bool IsCopy = false;
+
+        /// <summary>
+        /// Gets or sets the new insert position inside of NewParentNode.Nodes collection for the node being dragged. If InsertPosition is -1 
+        /// the ParentNode refers to the current mouse over node and drag &amp; drop node will be added as child node to it.
+        /// </summary>
+        public int InsertPosition = 0;
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/TreeDragFeedbackEventArgs.cs b/PROMS/DotNetBar Source Code/AdvTree/TreeDragFeedbackEventArgs.cs
new file mode 100644
index 00000000..5611b904
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/TreeDragFeedbackEventArgs.cs	
@@ -0,0 +1,129 @@
+using System;
+using System.Text;
+using System.Windows.Forms;
+
+namespace DevComponents.AdvTree
+{
+    /// <summary>
+    /// Defines the data for NodeDragFeedback event.
+    /// </summary>
+    public class TreeDragFeedbackEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets or sets whether this drop location is accepted. Default value is true. You can set this to false to disable drop at this location.
+        /// </summary>
+        public bool AllowDrop = true;
+        /// <summary>
+        /// Gets or sets the parent node for the node that is being dragged. This can be null/nothing value to indicate a root top-level node that
+        /// is in AdvTree.Nodes collection.
+        /// </summary>
+        public Node ParentNode = null;
+        /// <summary>
+        /// Gets or sets the new insert position inside of ParentNode.Nodes collection for the node being dragged. If InsertPosition is -1 
+        /// the ParentNode refers to the current mouse over node and drag &amp; drop node will be added as child node to it.
+        /// </summary>
+        public int InsertPosition = 0;
+
+        private Node _DragNode;
+        /// <summary>
+        /// Gets reference to the node being dragged.
+        /// </summary>
+        public Node DragNode
+        {
+            get { return _DragNode; }
+#if FRAMEWORK20
+            set
+            {
+            	_DragNode = value;
+            }
+#endif
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the TreeDragFeedbackEventArgs class.
+        /// </summary>
+        /// <param name="parentNode"></param>
+        /// <param name="insertPosition"></param>
+        public TreeDragFeedbackEventArgs(Node parentNode, int insertPosition, Node dragNode)
+        {
+            ParentNode = parentNode;
+            InsertPosition = insertPosition;
+            _DragNode = dragNode;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the TreeDragFeedbackEventArgs class.
+        /// </summary>
+        /// <param name="parentNode"></param>
+        /// <param name="insertPosition"></param>
+        public TreeDragFeedbackEventArgs(Node parentNode, int insertPosition, Node dragNode, DragDropEffects effect)
+        {
+            ParentNode = parentNode;
+            InsertPosition = insertPosition;
+            _DragNode = dragNode;
+            _Effect = effect;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the TreeDragFeedbackEventArgs class.
+        /// </summary>
+        public TreeDragFeedbackEventArgs()
+        {
+        }
+
+        internal bool EffectSet = false;
+        private DragDropEffects _Effect = DragDropEffects.None;
+        /// <summary>
+        /// Gets or sets the drop effect for the drag-drop operation.
+        /// </summary>
+        public DragDropEffects Effect
+        {
+            get { return _Effect; }
+            set 
+            { 
+                _Effect = value;
+                EffectSet = true;
+            }
+        }
+    }
+
+    public class MultiNodeTreeDragFeedbackEventArgs : TreeDragFeedbackEventArgs
+    {
+        /// <summary>
+        /// Initializes a new instance of the TreeDragFeedbackEventArgs class.
+        /// </summary>
+        /// <param name="parentNode"></param>
+        /// <param name="insertPosition"></param>
+        public MultiNodeTreeDragFeedbackEventArgs(Node parentNode, int insertPosition, Node[] dragNodes) : 
+            base(parentNode, insertPosition, dragNodes[0])
+        {
+            _DragNodes = dragNodes;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the TreeDragFeedbackEventArgs class.
+        /// </summary>
+        /// <param name="parentNode"></param>
+        /// <param name="insertPosition"></param>
+        public MultiNodeTreeDragFeedbackEventArgs(Node parentNode, int insertPosition, Node[] dragNodes, DragDropEffects effect) : 
+            base(parentNode, insertPosition, dragNodes[0], effect)
+        {
+            _DragNodes = dragNodes;
+        }
+
+        private Node[] _DragNodes;
+        /// <summary>
+        /// Gets reference to the node being dragged.
+        /// </summary>
+        public Node[] DragNodes
+        {
+            get { return _DragNodes; }
+#if FRAMEWORK20
+            set
+            {
+                _DragNodes = value;
+            }
+#endif
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/TreeNodeCancelEventArgs.cs b/PROMS/DotNetBar Source Code/AdvTree/TreeNodeCancelEventArgs.cs
new file mode 100644
index 00000000..6f98877f
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/TreeNodeCancelEventArgs.cs	
@@ -0,0 +1,46 @@
+using System;
+
+namespace DevComponents.AdvTree
+{
+	/// <summary>
+	/// Provides data for AdvTree Node events that can be cancelled.
+	/// </summary>
+	public class AdvTreeNodeCancelEventArgs:AdvTreeNodeEventArgs
+	{
+		/// <summary>
+		/// Default constructor.
+		/// </summary>
+		/// <param name="action">Default action</param>
+		/// <param name="node">Default node.</param>
+		public AdvTreeNodeCancelEventArgs(eTreeAction action, Node node):base(action,node)
+		{
+		}
+		
+		/// <summary>
+		/// Indicates that event action should be canceled.
+		/// </summary>
+		public bool Cancel=false;
+	}
+
+    /// <summary>
+    /// Provides data for AdvTree Node events that can be cancelled.
+    /// </summary>
+    public class AdvTreeMultiNodeCancelEventArgs : AdvTreeNodeCancelEventArgs
+    {
+        /// <summary>
+        /// Default constructor.
+        /// </summary>
+        /// <param name="action">Default action</param>
+        /// <param name="node">Default node.</param>
+        public AdvTreeMultiNodeCancelEventArgs(eTreeAction action, Node[] nodes)
+            : base(action, nodes[0])
+        {
+            Nodes = nodes;
+        }
+
+        /// <summary>
+        /// Indicates the array of nodes that action is performed on.
+        /// </summary>
+        public DevComponents.AdvTree.Node[] Nodes = null;
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/TreeNodeCollectionEventArgs.cs b/PROMS/DotNetBar Source Code/AdvTree/TreeNodeCollectionEventArgs.cs
new file mode 100644
index 00000000..e1bf3a2a
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/TreeNodeCollectionEventArgs.cs	
@@ -0,0 +1,28 @@
+using System;
+
+namespace DevComponents.AdvTree
+{
+	/// <summary>
+	/// Represents event arguments for NodeCollection based events, like BeforeNodeInsert, AfterNodeInsert etc.
+	/// </summary>
+	public class TreeNodeCollectionEventArgs : AdvTreeNodeEventArgs
+	{
+		/// <summary>
+		/// Creates new instance of the class.
+		/// </summary>
+		/// <param name="action">Source action</param>
+		/// <param name="node">Affected node</param>
+		/// <param name="parentNode">Parent of the node if any</param>
+		public TreeNodeCollectionEventArgs(eTreeAction action, Node node, Node parentNode):base(action, node)
+		{
+			this.ParentNode = parentNode;
+		}
+		
+		/// <summary>
+		/// Indicates parent node of the affected node. For example if event handled is BeforeNodeInsert parent of the Node is has
+		/// not been set yet so this property provides information on the node that will become parent. If this property returns null
+		/// then node is being added or removed from the main AdvTree.Nodes collection.
+		/// </summary>
+		public DevComponents.AdvTree.Node ParentNode=null;
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/TreeNodeEventArgs.cs b/PROMS/DotNetBar Source Code/AdvTree/TreeNodeEventArgs.cs
new file mode 100644
index 00000000..48d94091
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/TreeNodeEventArgs.cs	
@@ -0,0 +1,31 @@
+using System;
+
+namespace DevComponents.AdvTree
+{
+	/// <summary>
+	/// Provides data for AdvTree Node events.
+	/// </summary>
+	public class AdvTreeNodeEventArgs:EventArgs
+	{
+		/// <summary>
+		/// Default constructor.
+		/// </summary>
+		/// <param name="action">Default action</param>
+		/// <param name="node">Default node.</param>
+		public AdvTreeNodeEventArgs(eTreeAction action, Node node)
+		{
+			this.Action = action;
+			this.Node = node;
+		}
+		
+		/// <summary>
+		/// Indicates the type of the action performed on a node.
+		/// </summary>
+		public eTreeAction Action=eTreeAction.Code;
+		
+		/// <summary>
+		/// Indicates the node that action is performed on.
+		/// </summary>
+		public DevComponents.AdvTree.Node Node=null;
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/TreeNodeMouseEventArgs.cs b/PROMS/DotNetBar Source Code/AdvTree/TreeNodeMouseEventArgs.cs
new file mode 100644
index 00000000..a4c994c4
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/TreeNodeMouseEventArgs.cs	
@@ -0,0 +1,51 @@
+using System;
+using System.Windows.Forms;
+
+namespace DevComponents.AdvTree
+{
+	/// <summary>
+	/// Represents event arguments for node mouse based events.
+	/// </summary>
+	public class TreeNodeMouseEventArgs:EventArgs
+	{
+		public TreeNodeMouseEventArgs(Node node, MouseButtons button, int clicks, int delta, int x, int y)
+		{
+			this.Node = node;
+			this.Button = button;
+			this.Clicks = clicks;
+			this.Delta = delta;
+			this.X = x;
+			this.Y = y;
+		}
+		
+		/// <summary>
+		/// Gets node affected by mouse action.
+		/// </summary>
+		public readonly Node Node;
+		
+		/// <summary>
+		/// Gets which mouse button was pressed.
+		/// </summary>
+		public readonly MouseButtons Button;
+		
+		/// <summary>
+		/// Gets the number of times the mouse button was pressed and released.
+		/// </summary>
+		public readonly int Clicks;
+		
+		/// <summary>
+		/// Gets a signed count of the number of detents the mouse wheel has rotated. A detent is one notch of the mouse wheel.
+		/// </summary>
+		public readonly int Delta;
+		
+		/// <summary>
+		/// Gets the x-coordinate of the mouse.
+		/// </summary>
+		public readonly int X;
+		
+		/// <summary>
+		/// Gets the y-coordinate of the mouse.
+		/// </summary>
+		public readonly int Y;
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/TreeSerializer.cs b/PROMS/DotNetBar Source Code/AdvTree/TreeSerializer.cs
new file mode 100644
index 00000000..c8917786
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/TreeSerializer.cs	
@@ -0,0 +1,351 @@
+using System;
+using System.Xml;
+using System.IO;
+using DevComponents.DotNetBar;
+
+namespace DevComponents.AdvTree
+{
+	/// <summary>
+	/// Provides means for AdvTree serialization.
+	/// </summary>
+	public class TreeSerializer
+	{
+		#region Private Variables
+		private static string XmlNodeName="Node";
+		private static string XmlCellsName="Cells";
+		private static string XmlCellName="Cell";
+		private static string XmlCellImagesName="Images";
+		private static string XmlAdvTreeName="AdvTree";
+		private static string XmlCustomName = "Custom";
+		#endregion
+		
+		#region Saving
+		/// <summary>
+		/// Saves Nodes to specified file.
+		/// </summary>
+		/// <param name="tree">AdvTree to save</param>
+		/// <param name="fileName">Target file name</param>
+		public static void Save(AdvTree tree, string fileName)
+		{
+			XmlDocument document=Save(tree);
+			document.Save(fileName);
+		}
+		
+		/// <summary>
+		/// Saves Nodes to stream.
+		/// </summary>
+		/// <param name="tree">AdvTree to save</param>
+		/// <param name="outStream">Stream to save nodes to.</param>
+		public static void Save(AdvTree tree, Stream outStream)
+		{
+			XmlDocument document=Save(tree);
+			document.Save(outStream);
+		}
+		
+		/// <summary>
+		/// Saves Nodes to TextWriter
+		/// </summary>
+		/// <param name="tree">AdvTree to save</param>
+		/// <param name="writer">TextWriter to write nodes to.</param>
+		public static void Save(AdvTree tree, TextWriter writer)
+		{
+			XmlDocument document=Save(tree);
+			document.Save(writer);
+		}
+		
+		/// <summary>
+		/// Saves nodes to XmlWriter.
+		/// </summary>
+		/// <param name="tree">AdvTree to save</param>
+		/// <param name="writer">XmlWriter to write nodes to</param>
+		public static void Save(AdvTree tree, XmlWriter writer)
+		{
+			XmlDocument document=Save(tree);
+			document.Save(writer);
+		}
+		
+		/// <summary>
+		/// Creates new XmlDocument and serializes AdvTree into it.
+		/// </summary>
+		/// <param name="tree">AdvTree to serialize</param>
+		/// <returns>New instance of XmlDocument/returns>
+		public static XmlDocument Save(AdvTree tree)
+		{
+			XmlDocument document=new XmlDocument();
+			Save(tree, document);
+			return document;
+		}
+		
+		/// <summary>
+		/// Saves AdvTree to an existing XmlDocument. New node AdvTree is created in document and Nodes are serialized into it.
+		/// </summary>
+		/// <param name="tree">AdvTree to serialize</param>
+		/// <param name="document">XmlDocument instance.</param>
+		public static void Save(AdvTree tree, XmlDocument document)
+		{
+			XmlElement parent = document.CreateElement(XmlAdvTreeName);
+			document.AppendChild(parent);
+			TreeSerializer.Save(tree, parent);
+		}
+		
+		/// <summary>
+		/// Serializes AdvTree object to XmlElement object.
+		/// </summary>
+		/// <param name="tree">Instance of AdvTree to serialize.</param>
+		/// <param name="parent">XmlElement to serialize to.</param>
+		public static void Save(AdvTree tree, XmlElement parent)
+		{
+			NodeSerializationContext context = new NodeSerializationContext();
+			context.RefXmlElement = parent;
+			context.AdvTree = tree;
+			context.HasSerializeNodeHandlers = tree.HasSerializeNodeHandlers;
+			context.HasDeserializeNodeHandlers = tree.HasDeserializeNodeHandlers;
+			
+			foreach(Node node in tree.Nodes)
+			{
+				Save(node, context);
+			}
+		}
+		
+		/// <summary>
+		/// Serializes Node and all child nodes to XmlElement object.
+		/// </summary>
+		/// <param name="node">Node to serialize.</param>
+		/// <param name="context">Provides serialization context.</param>
+		public static void Save(Node node, NodeSerializationContext context)
+		{
+			XmlElement parent = context.RefXmlElement;
+			
+			XmlElement xmlNode=parent.OwnerDocument.CreateElement(XmlNodeName);
+			parent.AppendChild(xmlNode);
+			
+			ElementSerializer.Serialize(node, xmlNode);
+			
+			if(context.HasSerializeNodeHandlers)
+			{
+				XmlElement customXml = parent.OwnerDocument.CreateElement(XmlCustomName);
+				SerializeNodeEventArgs e = new SerializeNodeEventArgs(node, xmlNode, customXml);
+				context.AdvTree.InvokeSerializeNode(e);
+				if (customXml.Attributes.Count > 0 || customXml.ChildNodes.Count > 0)
+					xmlNode.AppendChild(customXml);
+			}
+			
+			if(node.Cells.Count>1)
+			{
+				XmlElement xmlCells = parent.OwnerDocument.CreateElement(XmlCellsName);
+				xmlNode.AppendChild(xmlCells);
+				
+				for(int i=1; i<node.Cells.Count;i++)
+				{
+					Cell cell=node.Cells[i];
+					XmlElement xmlCell= parent.OwnerDocument.CreateElement(XmlCellName);
+					xmlCells.AppendChild(xmlCell);
+					ElementSerializer.Serialize(cell, xmlCell);
+					if(cell.ShouldSerializeImages())
+					{
+						XmlElement xmlCellImages = parent.OwnerDocument.CreateElement(XmlCellImagesName);
+						xmlCell.AppendChild(xmlCellImages);
+						ElementSerializer.Serialize(cell.Images, xmlCellImages);
+					}
+				}
+			}
+			
+			context.RefXmlElement = xmlNode;
+			foreach(Node childNode in node.Nodes)
+			{
+				Save(childNode, context);
+			}
+			context.RefXmlElement = parent;
+		}
+		#endregion
+		
+		#region Loading
+		/// <summary>
+		/// Load AdvTree Nodes from file.
+		/// </summary>
+		/// <param name="tree">Reference to AdvTree to populate</param>
+		/// <param name="fileName">File name.</param>
+		public static void Load(AdvTree tree, string fileName)
+		{
+			XmlDocument document=new XmlDocument();
+			document.Load(fileName);
+			Load(tree, document);
+		}
+		
+		/// <summary>
+		/// Load AdvTree Nodes from stream.
+		/// </summary>
+		/// <param name="tree">Reference to AdvTree to populate</param>
+		/// <param name="inStream">Reference to stream</param>
+		public static void Load(AdvTree tree, Stream inStream)
+		{
+			XmlDocument document=new XmlDocument();
+			document.Load(inStream);
+			Load(tree, document);
+		}
+		
+		/// <summary>
+		/// Load AdvTree Nodes from reader.
+		/// </summary>
+		/// <param name="tree">Reference to AdvTree to populate</param>
+		/// <param name="reader">Reference to reader.</param>
+		public static void Load(AdvTree tree, TextReader reader)
+		{
+			XmlDocument document=new XmlDocument();
+			document.Load(reader);
+			Load(tree, document);
+		}
+		
+		/// <summary>
+		/// Load AdvTree Nodes from reader.
+		/// </summary>
+		/// <param name="tree">Reference to AdvTree to populate</param>
+		/// <param name="reader">Reference to reader.</param>
+		public static void Load(AdvTree tree, XmlReader reader)
+		{
+			XmlDocument document=new XmlDocument();
+			document.Load(reader);
+			Load(tree, document);
+		}
+		
+		/// <summary>
+		/// Load AdvTree from XmlDocument that was created by Save method.
+		/// </summary>
+		/// <param name="tree">Tree Control to load</param>
+		/// <param name="document">XmlDocument to load control from</param>
+		public static void Load(AdvTree tree, XmlDocument document)
+		{
+			foreach(XmlNode xmlNode in document.ChildNodes)
+			{
+				if(xmlNode.Name==XmlAdvTreeName && xmlNode is XmlElement)
+				{
+					Load(tree, xmlNode as XmlElement);
+					break;
+				}
+			}
+		}
+		
+		/// <summary>
+		/// Load nodes from XmlElement.
+		/// </summary>
+		/// <param name="tree">Reference to AdvTree to be populated.</param>
+		/// <param name="parent">XmlElement that tree was serialized to.</param>
+		public static void Load(AdvTree tree, XmlElement parent)
+		{
+			tree.BeginUpdate();
+			tree.DisplayRootNode = null;
+			tree.Nodes.Clear();
+			
+			NodeSerializationContext context = new NodeSerializationContext();
+			context.AdvTree = tree;
+			context.HasDeserializeNodeHandlers  = tree.HasDeserializeNodeHandlers;
+			context.HasSerializeNodeHandlers = tree.HasSerializeNodeHandlers;
+			
+			try
+			{
+				foreach(XmlNode xmlNode in parent.ChildNodes)
+				{
+					if(xmlNode.Name==XmlNodeName && xmlNode is XmlElement)
+					{
+						Node node=new Node();
+						tree.Nodes.Add(node);
+						context.RefXmlElement = xmlNode as XmlElement;
+						LoadNode(node, context);
+					}
+				}
+			}
+			finally
+			{
+				tree.EndUpdate();
+			}
+		}
+		
+		/// <summary>
+		/// Load single node and it's child nodes if any.
+		/// </summary>
+		/// <param name="nodeToLoad">New instance of node that is populated with loaded data.</param>
+		/// <param name="context">Provides deserialization context.</param>
+		public static void LoadNode(Node nodeToLoad, NodeSerializationContext context)
+		{
+			XmlElement xmlNode = context.RefXmlElement;
+			
+			ElementSerializer.Deserialize(nodeToLoad, xmlNode);
+
+			foreach(XmlNode xmlChild in xmlNode.ChildNodes)
+			{
+				XmlElement xmlElem = xmlChild as XmlElement;
+				if(xmlElem == null)
+					continue;
+				if(xmlElem.Name==XmlNodeName)
+				{
+					Node node=new Node();
+					nodeToLoad.Nodes.Add(node);
+					context.RefXmlElement = xmlElem;
+					LoadNode(node, context);
+				}
+				else if(xmlElem.Name == XmlCellsName)
+				{
+					LoadCells(nodeToLoad, xmlElem);
+				}
+				else if(xmlElem.Name == XmlCustomName)
+				{
+					if(context.HasDeserializeNodeHandlers)
+					{
+						SerializeNodeEventArgs e = new SerializeNodeEventArgs(nodeToLoad, xmlNode, xmlElem);
+						context.AdvTree.InvokeDeserializeNode(e);
+					}
+				}
+			}
+			context.RefXmlElement = xmlNode;
+		}
+		
+		private static void LoadCells(Node parentNode, XmlElement xmlCells)
+		{
+			foreach(XmlNode xmlChild in xmlCells.ChildNodes)
+			{
+				if(xmlChild.Name==XmlCellName && xmlChild is XmlElement)
+				{
+					Cell cell=new Cell();
+					parentNode.Cells.Add(cell);
+					ElementSerializer.Deserialize(cell, xmlChild as XmlElement);
+					// Load images if any
+					foreach(XmlElement xmlImage in xmlChild.ChildNodes)
+					{
+						if(xmlImage.Name==XmlCellImagesName)
+						{
+							ElementSerializer.Deserialize(cell.Images, xmlImage);
+							break;
+						}
+					}
+				}
+			}
+		}
+		#endregion
+	}
+	
+	/// <summary>
+	/// Provides context information for serialization.
+	/// </summary>
+	public class NodeSerializationContext
+	{
+		/// <summary>
+		/// Gets or sets reference to context parent XmlElement when serializing or actual Node element when deserializing.
+		/// </summary>
+		public System.Xml.XmlElement RefXmlElement = null;
+
+		/// <summary>
+		/// Gets or sets whether SerializeNode event handler has been defined and whether event should be fired.
+		/// </summary>
+		public bool HasSerializeNodeHandlers = false;
+
+		/// <summary>
+		/// Gets or sets whether DeserializeNode event handler has been defined and whether event should be fired.
+		/// </summary>
+		public bool HasDeserializeNodeHandlers = false;
+
+		/// <summary>
+		/// Provides access to serializer.
+		/// </summary>
+		public AdvTree AdvTree = null;
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/AdvTree/Utilites.cs b/PROMS/DotNetBar Source Code/AdvTree/Utilites.cs
new file mode 100644
index 00000000..0d015014
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AdvTree/Utilites.cs	
@@ -0,0 +1,329 @@
+using System;
+using System.ComponentModel.Design;
+using System.Drawing;
+using System.ComponentModel;
+using DevComponents.DotNetBar;
+using DevComponents.DotNetBar.Rendering;
+using System.Windows.Forms;
+
+namespace DevComponents.AdvTree
+{
+	/// <summary>
+	/// Represents class for static tree utilities.
+	/// </summary>
+	public class Utilities
+	{
+		/// <summary>
+		/// Initializes control with default settings for connectors and nodes.
+		/// </summary>
+		/// <param name="tree">Control to initialize.</param>
+		public static void InitializeTree(AdvTree tree)
+		{
+			InitializeTree(tree,new ComponentFactory());
+		}
+		
+		/// <summary>
+		/// Initializes control with default settings for connectors and nodes.
+		/// </summary>
+		/// <param name="tree">Control to initialize.</param>
+		/// <param name="factory">Factory to use to create new instances of objects.</param>
+		public static void InitializeTree(AdvTree tree, ComponentFactory factory)
+		{
+            //tree.RootConnector=factory.CreateComponent(typeof(NodeConnector)) as NodeConnector;
+            //tree.RootConnector.LineWidth=1;
+            //tree.RootConnector.LineColor = SystemColors.ControlText;
+			tree.NodesConnector=factory.CreateComponent(typeof(NodeConnector)) as NodeConnector;
+			tree.NodesConnector.LineWidth=1;
+			tree.NodesConnector.LineColor=SystemColors.ControlText;
+            tree.BackColor = SystemColors.Window;
+			//eStyleBorderType border=eStyleBorderType.Solid;
+			ElementStyle style=factory.CreateComponent(typeof(ElementStyle)) as ElementStyle;
+			
+			//style.BackColorSchemePart=eColorSchemePart.BarBackground;
+			//style.BackColor2SchemePart=eColorSchemePart.BarBackground2;
+			//style.BackColorGradientAngle=90;
+			//style.CornerDiameter=4;
+			//style.CornerType=eCornerType.Rounded;
+			//style.BorderLeft=border;
+			//style.BorderLeftWidth=1;
+			//style.BorderTop=border;
+			//style.BorderTopWidth=1;
+			//style.BorderBottom=border;
+			//style.BorderBottomWidth=1;
+			//style.BorderRight=border;
+			//style.BorderRightWidth=1;
+			//style.BorderColorSchemePart=eColorSchemePart.BarDockedBorder;
+			//style.PaddingBottom=3;
+			//style.PaddingLeft=3;
+			//style.PaddingRight=3;
+			//style.PaddingTop=3;
+            style.TextColor = SystemColors.ControlText;
+			tree.Styles.Add(style);
+
+			tree.NodeStyle=style;
+
+            tree.BackgroundStyle.Class = ElementStyleClassKeys.TreeBorderKey;
+            tree.AccessibleRole = AccessibleRole.Outline;
+		}
+		
+		/// <summary>
+		/// Creates new style and adds it to styles collection
+		/// </summary>
+		/// <param name="tree">Tree to assign style to</param>
+		/// <param name="factory">Style factory</param>
+		/// <param name="backColor"></param>
+		/// <param name="backColor2"></param>
+		/// <param name="gradientAngle"></param>
+		/// <param name="textColor"></param>
+		internal static ElementStyle CreateStyle(ComponentFactory factory, string description, Color borderColor, Color backColor, Color backColor2, int gradientAngle, Color textColor)
+		{
+			eStyleBorderType border=eStyleBorderType.Solid;
+			ElementStyle style=factory.CreateComponent(typeof(ElementStyle)) as ElementStyle;
+			
+			style.Description = description;
+			style.BackColor = backColor;
+			style.BackColor2=backColor2;
+			style.BackColorGradientAngle=gradientAngle;
+			style.CornerDiameter=4;
+			style.CornerType=eCornerType.Square;
+			style.BorderLeft=border;
+			style.BorderLeftWidth=1;
+			style.BorderTop=border;
+			style.BorderTopWidth=1;
+			style.BorderBottom=border;
+			style.BorderBottomWidth=1;
+			style.BorderRight=border;
+			style.BorderRightWidth=1;
+			style.BorderColor=borderColor;
+			style.PaddingBottom=1;
+			style.PaddingLeft=1;
+			style.PaddingRight=1;
+			style.PaddingTop=1;
+			style.TextColor=textColor;
+			
+			return style;
+		}
+
+		/// <summary>
+		/// Returns reference to a node that is hosting given control.
+		/// </summary>
+		/// <param name="tree">Reference to the AdvTree control instance</param>
+		/// <param name="c">Control instance to look for</param>
+		/// <returns>Reference to a node hosting control or null if node could not be found</returns>
+		public static Node FindNodeForControl(AdvTree tree, System.Windows.Forms.Control c)
+		{
+			if(tree==null || c==null || tree.Nodes.Count==0)
+				return null;
+			
+			Node node = tree.Nodes[0];
+			while(node!=null)
+			{
+				foreach(Cell cell in node.Cells)
+				{
+					if(cell.HostedControl==c)
+						return node;
+				}
+				node = node.NextVisibleNode;
+			}
+			
+			return null;
+		}
+
+        internal static int CompareAlpha(string t, string t2)
+        {
+            return string.Compare(t, t2, StringComparison.CurrentCulture);
+        }
+
+        internal static bool StartsWithNumber(string s)
+        {
+            if (s.Length > 0 && char.IsDigit(s[0]))
+                return true;
+            return false;
+        }
+
+        internal static int CompareAlphaNumeric(string t, string t2)
+        {
+            if (Utilities.StartsWithNumber(t) && Utilities.StartsWithNumber(t2))
+            {
+                long l = GetNumber(t), l2 = GetNumber(t2);
+                int i = l.CompareTo(l2);
+                if (i != 0)
+                    return i;
+            }
+#if FRAMEWORK20
+            return string.Compare(t, t2, StringComparison.CurrentCulture);
+#else
+            return string.Compare(t, t2);
+#endif
+        }
+
+        internal static long GetNumber(string s)
+        {
+            long l = 0;
+            int start = 0, end = 0;
+            for (int i = 0; i < s.Length; i++)
+            {
+                if (char.IsDigit(s[i]))
+                {
+                    end = i;
+                }
+                else
+                    break;
+            }
+#if FRAMEWORK20
+            long.TryParse(s.Substring(start, end - start + 1), out l);
+#else
+            try
+            {
+                l = long.Parse(s.Substring(start, end - start + 1));
+            }
+            catch { }
+#endif
+            return l;
+        }
+
+        internal static string StripNonNumeric(string p)
+        {
+            string s = "";
+            string decimalSeparator = NumberDecimalSeparator;
+            string groupSeparator = NumberGroupSeparator;
+            for (int i = 0; i < p.Length; i++)
+            {
+                if (p[i].ToString() == decimalSeparator || p[i].ToString() == groupSeparator || p[i] >= '0' && p[i] <= '9' || i == 0 && p[i] == '-')
+                    s += p[i];
+                else if (s.Length > 0) break;
+            }
+            return s;
+        }
+
+        private static string NumberDecimalSeparator
+        {
+            get 
+			{
+#if FRAMEWORK20
+				return DevComponents.Editors.DateTimeAdv.DateTimeInput.GetActiveCulture().NumberFormat.NumberDecimalSeparator; 
+#else
+				return System.Globalization.CultureInfo.CurrentCulture.NumberFormat.NumberDecimalSeparator;
+#endif
+			}
+        }
+        private static string NumberGroupSeparator
+        {
+            get
+            {
+#if FRAMEWORK20
+                return DevComponents.Editors.DateTimeAdv.DateTimeInput.GetActiveCulture().NumberFormat.NumberGroupSeparator;
+#else
+				return System.Globalization.CultureInfo.CurrentCulture.NumberFormat.NumberGroupSeparator;
+#endif
+            }
+        }
+	}
+	
+	#region ComponentFactory
+	/// <summary>
+	/// Represents internal component factory with design-time support.
+	/// </summary>
+	public class ComponentFactory
+	{
+		private IDesignerHost m_Designer=null; 
+		/// <summary>
+		/// Creates new instance of the class.
+		/// </summary>
+		/// <param name="designer">Reference to DesignerHost to use for creation of new components.</param>
+		public ComponentFactory(IDesignerHost designer)
+		{
+			m_Designer=designer;
+		}
+
+		/// <summary>
+		/// Creates new instance of the class.
+		/// </summary>
+		public ComponentFactory() {}
+
+		/// <summary>
+		/// Creates component and returns reference to the new instance.
+		/// </summary>
+		/// <param name="type">Type that identifies component to create.</param>
+		/// <returns>New instance of the component.</returns>
+		public object CreateComponent(Type type)
+		{
+			object o=null;
+			if(m_Designer!=null)
+				o=m_Designer.CreateComponent(type);
+			else
+				o=type.Assembly.CreateInstance(type.FullName);
+			return o;
+		}
+	}
+	#endregion
+
+    #region Padding Class
+    /// <summary>
+    /// Represents class that holds padding information for user interface elements.
+    /// </summary>
+    public class Padding
+    {
+        /// <summary>
+        /// Gets or sets padding on left side. Default value is 0
+        /// </summary>
+        public int Left = 0;
+        /// <summary>
+        /// Gets or sets padding on right side. Default value is 0
+        /// </summary>
+        public int Right = 0;
+        /// <summary>
+        /// Gets or sets padding on top side. Default value is 0
+        /// </summary>
+        public int Top = 0;
+        /// <summary>
+        /// Gets or sets padding on bottom side. Default value is 0
+        /// </summary>
+        public int Bottom = 0;
+
+        /// <summary>
+        /// Creates new instance of the class and initializes it.
+        /// </summary>
+        /// <param name="left">Left padding</param>
+        /// <param name="right">Right padding</param>
+        /// <param name="top">Top padding</param>
+        /// <param name="bottom">Bottom padding</param>
+        public Padding(int left, int right, int top, int bottom)
+        {
+            this.Left = left;
+            this.Right = right;
+            this.Top = top;
+            this.Bottom = bottom;
+        }
+
+        /// <summary>
+        /// Gets amount of horizontal padding (Left+Right)
+        /// </summary>
+        [Browsable(false)]
+        public int Horizontal
+        {
+            get { return this.Left + this.Right; }
+        }
+
+        /// <summary>
+        /// Gets amount of vertical padding (Top+Bottom)
+        /// </summary>
+        [Browsable(false)]
+        public int Vertical
+        {
+            get { return this.Top + this.Bottom; }
+        }
+
+        /// <summary>
+        /// Gets whether Padding is empty.
+        /// </summary>
+        public bool IsEmpty
+        {
+            get
+            {
+                return this.Left == 0 && this.Right == 0 && this.Top == 0 && this.Bottom == 0;
+            }
+        }
+    }
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/AnalogClock/AnalogClockControl.cs b/PROMS/DotNetBar Source Code/AnalogClock/AnalogClockControl.cs
new file mode 100644
index 00000000..cd633acd
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AnalogClock/AnalogClockControl.cs	
@@ -0,0 +1,1101 @@
+using System;
+using System.ComponentModel;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Text;
+using System.Windows.Forms;
+using System.Drawing.Text;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    /// <summary>
+    /// Analog clock control.
+    /// </summary>
+    [Description("Analog Clock Control"), ToolboxBitmap(typeof(AnalogClockControl), "AnalogClock.AnalogClockControl.bmp"), DefaultEvent("ValueChanged"), DefaultProperty("Value")]
+    public class AnalogClockControl : Control
+    {
+        #region Private Vars
+
+        private const float _BaseSize = 100.0f;
+
+        private Point _EditLoc;
+        private eClockEditStates _EditState;
+        private Size _LastSize;
+        private Timer _Timer;
+        #endregion
+
+        #region Implementation
+        /// <summary>
+        /// Default minimum size. Defaults to 100, 100.
+        /// </summary>
+        protected override Size DefaultMinimumSize
+        {
+            get { return new Size(100, 100); }
+        }
+
+        private bool _AntiAlias;
+        /// <summary>
+        /// Gets or sets whether anti-aliasing is used when rendering the control.  Default value is true.
+        /// </summary>
+        [DefaultValue(true),
+        Category("Appearance"),
+        Description("Indicates whether Anti-aliasing is used when rendering the control.")]
+        public bool AntiAlias
+        {
+            get { return _AntiAlias; }
+            set
+            {
+                _AntiAlias = value;
+                Invalidate();
+            }
+        }
+
+        private bool _AutomaticMode;
+        /// <summary>
+        /// Gets or sets the state for automatic mode.  When true the clock will auto redraw once a second and display the current date/time.  Default value is false.
+        /// </summary>
+        [DefaultValue(false),
+        Category("Behavior"),
+        Description("Toggles the state for automatic mode.  When true the clock will auto redraw once a second and display the current date/time.")]
+        public bool AutomaticMode
+        {
+            get { return _AutomaticMode; }
+            set
+            {
+                _AutomaticMode = value;
+                if (_AutomaticMode)
+                {
+                    _Value = DateTime.Now;
+                    _IsEditable = false;
+                    if (!DesignMode)
+                    {
+                        if (_Timer != null)
+                            _Timer.Dispose();
+                        _Timer = new Timer();
+                        _Timer.Interval = 1000;
+                        _Timer.Tick += Timer_Tick;
+                        _Timer.Enabled = true;
+                    }
+                }
+                else
+                {
+                    if (_Timer != null)
+                    {
+                        _Timer.Enabled = false;
+                        _Timer.Dispose();
+                        _Timer = null;
+                    }
+                }
+                Invalidate();
+            }
+        }
+
+        private eClockStyles _ClockStyle;
+        /// <summary>
+        /// Gets or sets clock style for this control.
+        /// </summary>
+        [DefaultValue(eClockStyles.Style1),
+        Category("Appearance"),
+        Description("The clock style for the control."),
+        RefreshProperties(RefreshProperties.All)]
+        public eClockStyles ClockStyle
+        {
+            get { return _ClockStyle; }
+            set
+            {
+                _ClockStyle = value;
+                if (_ClockStyle != eClockStyles.Custom)
+                {
+                    if (_ClockStyleData != null)
+                    {
+                        _ClockStyleData.Parent = null;
+                        _ClockStyleData.Dispose();
+                    }
+                    _ClockStyleData = new ClockStyleData(_ClockStyle, this);
+                }
+                Invalidate();
+            }
+        }
+
+        private ClockStyleData _ClockStyleData;
+        /// <summary>
+        /// Gets or sets the clock style data elements for this control.
+        /// </summary>
+        [Category("Appearance"),
+        Description("The clock style data for the control."),
+        RefreshProperties(RefreshProperties.All)]
+        public ClockStyleData ClockStyleData
+        {
+            get { return _ClockStyleData; }
+            set
+            {
+                if (_ClockStyleData != null) _ClockStyleData.Parent = null;
+                _ClockStyleData = value;
+                _ClockStyleData.Parent = this;
+                _ClockStyleData.Style = eClockStyles.Custom;
+                ClockStyle = eClockStyles.Custom;
+                Invalidate();
+            }
+        }
+        /// <summary>
+        /// Resets the property to default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetClockStyleData()
+        {
+            ClockStyle = eClockStyles.Style1;
+        }
+
+        private eClockIndicatorStyles _IndicatorStyle;
+        /// <summary>
+        /// Gets or sets a the indicator style the clock control.  Default value is Ticks.
+        /// </summary>
+        [DefaultValue(eClockIndicatorStyles.Ticks),
+        Category("Appearance"),
+        Description("Indicates which indicator style the clock will use.")]
+        public eClockIndicatorStyles IndicatorStyle
+        {
+            get { return _IndicatorStyle; }
+            set
+            {
+                _IndicatorStyle = value;
+                Invalidate();
+            }
+        }
+
+        private bool _IsEditable;
+        /// <summary>
+        /// Gets or sets whether the time can be changed by moving the clock hands. Default value is false. 
+        /// </summary>
+        [DefaultValue(false),
+        Category("Behavior"),
+        Description("Indicates whether the time can be changed by moving the clock hands. If AutomaticMode is enabled, this setting is ignored.")]
+        public bool IsEditable
+        {
+            get { return _IsEditable; }
+            set
+            {
+                if (!AutomaticMode)
+                    _IsEditable = value;
+                Invalidate();
+            }
+        }
+
+        private bool _ShowGlassOverlay;
+        /// <summary>
+        /// Gets or sets a value indicating whether to display the glass overlay on the clock control.  Default value is true.
+        /// </summary>
+        [DefaultValue(true),
+        Category("Appearance"),
+        Description("Indicates whether the glass overlay on the clock control will be displayed or not.")]
+        public bool ShowGlassOverlay
+        {
+            get { return _ShowGlassOverlay; }
+            set
+            {
+                _ShowGlassOverlay = value;
+                Invalidate();
+            }
+        }
+
+        private bool _ShowSecondHand;
+        /// <summary>
+        /// Gets or sets a value indicating whether to display the second hand on the clock control.  Default value is true.
+        /// </summary>
+        [DefaultValue(true),
+        Category("Appearance"),
+        Description("Indicates whether the second hand on the clock control will be displayed or not.")]
+        public bool ShowSecondHand
+        {
+            get { return _ShowSecondHand; }
+            set
+            {
+                _ShowSecondHand = value;
+                Invalidate();
+            }
+        }
+
+        /// <summary>
+        /// Occurs while user is dragging the mouse in order to change time.
+        /// </summary>
+        [Description("Occurs while user is dragging the mouse in order to change time.")]
+        public event TimeValueChangingEventHandler ValueChanging;
+        /// <summary>
+        /// Raises ValueChanging event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnValueChanging(TimeValueChangingEventArgs e)
+        {
+            TimeValueChangingEventHandler handler = ValueChanging;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        /// <summary>
+        /// Occurs when Value i.e. time clock is displaying has changed.
+        /// </summary>
+        [Description("Occurs when Value i.e. time clock is displaying has changed.")]
+        public event EventHandler ValueChanged;
+        /// <summary>
+        /// Raises ValueChanged event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnValueChanged(EventArgs e)
+        {
+            EventHandler handler = ValueChanged;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        private DateTime _Value;
+        /// <summary>
+        /// Gets or sets the current date/time value for this control.
+        /// </summary>
+        [Category("Behavior"),
+        Description("The current date/time value for this control. If AutomaticMode is enabled, assigned values are ignored.")]
+        public DateTime Value
+        {
+            get { return _Value; }
+            set
+            {
+                _Value = value;
+                OnValueChanged(EventArgs.Empty);
+                Invalidate();
+            }
+        }
+        /// <summary>
+        /// Resets the property to default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetValue()
+        {
+            Value = DateTime.Now;
+        }
+
+        ///// <summary>
+        ///// Occurs when subproperty value has changed.
+        ///// </summary>
+        //public event DevComponents.Schedule.Model.SubPropertyChangedEventHandler SubPropertyChanged;
+
+        /// <summary>
+        /// Initializes a new instance of the ClockControl class 
+        /// </summary>
+        public AnalogClockControl()
+        {
+            SetStyle(ControlStyles.AllPaintingInWmPaint | ControlStyles.UserPaint |
+                    ControlStyles.OptimizedDoubleBuffer | ControlStyles.ResizeRedraw |
+                    ControlStyles.SupportsTransparentBackColor, true);
+
+            _AntiAlias = true;
+            _AutomaticMode = false;
+            _ClockStyle = eClockStyles.Style1;
+            _ClockStyleData = new ClockStyleData();
+            _ClockStyleData.Parent = this;
+            _EditState = eClockEditStates.None;
+            _IndicatorStyle = eClockIndicatorStyles.Ticks;
+            _IsEditable = false;
+            _ShowGlassOverlay = true;
+            _ShowSecondHand = true;
+            _Value = DateTime.Now;
+
+            MinimumSize = new Size((int)_BaseSize, (int)_BaseSize); ;
+            Size = MinimumSize;
+        }
+
+        /// <summary>
+        /// Releases all resources used by the class. 
+        /// </summary>
+        protected override void Dispose(bool disposing)
+        {
+            base.Dispose(disposing);
+            if (disposing)
+            {
+                if (_ClockStyleData != null)
+                {
+                    _ClockStyleData.Parent = null;
+                    _ClockStyleData.Dispose();
+                }
+
+                if (_Timer != null)
+                {
+                    _Timer.Dispose();
+                    _Timer = null;
+                }
+            }
+        }
+
+        protected override void OnMouseDown(MouseEventArgs e)
+        {
+            base.OnMouseDown(e);
+
+            RectangleF rect;
+            float bezelWidth, angle;
+
+            if (e.Button != MouseButtons.Left || !_IsEditable)
+                return;
+
+            bezelWidth = _ClockStyleData.BezelWidth * (ClientRectangle.Width - 1);
+            rect = new RectangleF(ClientRectangle.X + bezelWidth,
+                                  ClientRectangle.Y + bezelWidth,
+                                  (ClientRectangle.Width - 1) - bezelWidth * 2.0f,
+                                  (ClientRectangle.Height - 1) - bezelWidth * 2.0f);
+
+            angle = RoundToExactHour((float)_Value.TimeOfDay.TotalHours * 30.0f);
+            if (_ClockStyleData.HourHandStyle.ContainsPoint(rect, angle, e.Location))
+            {
+                _LastMouseMoveHour = _Value.Hour;
+                _NewMouseMoveHour = _Value.Hour;
+                if (_Value.Hour > 12) _LastMouseMoveHour -= 12;
+                _EditState = eClockEditStates.Hour;
+            }
+            else
+            {
+                angle = (float)_Value.TimeOfDay.TotalMinutes * 6.0f;
+                if (_ClockStyleData.MinuteHandStyle.ContainsPoint(rect, angle, e.Location))
+                    _EditState = eClockEditStates.Minute;
+                else
+                {
+                    angle = (float)_Value.TimeOfDay.Seconds * 6.0f;
+                    if (_ShowSecondHand && _ClockStyleData.SecondHandStyle.ContainsPoint(rect, angle, e.Location))
+                        _EditState = eClockEditStates.Second;
+                }
+            }
+            if (_EditState != eClockEditStates.None)
+                _EditLoc = e.Location;
+        }
+
+        private int _LastMouseMoveHour = -1;
+        private int _NewMouseMoveHour = -1;
+        protected override void OnMouseMove(MouseEventArgs e)
+        {
+            base.OnMouseMove(e);
+
+            RectangleF rect;
+            float bezelWidth, angle;
+
+            if (!_IsEditable)
+                return;
+
+            if (_EditState != eClockEditStates.None)
+            {
+                _EditLoc = e.Location;
+
+                // We need to record the direction of hour hand movement so AM/PM can be switched
+                if (_EditState == eClockEditStates.Hour)
+                {
+                    int hour = GetHourFromPoint(_EditLoc);
+                    if (hour == 1 && _LastMouseMoveHour == 12)
+                        _LastMouseMoveHour = 0;
+                    else if (hour == 12 && _LastMouseMoveHour == 1)
+                        _LastMouseMoveHour = 13;
+                    _NewMouseMoveHour += (hour - _LastMouseMoveHour);
+                    if (_NewMouseMoveHour < 0)
+                        _NewMouseMoveHour = 23;
+                    else if (_NewMouseMoveHour > 23)
+                        _NewMouseMoveHour = 0;
+                    _LastMouseMoveHour = hour;
+                    
+                }
+
+                OnValueChanging(new TimeValueChangingEventArgs(GetCurrentMouseTime()));
+
+                Invalidate();
+            }
+            else
+            {
+                bezelWidth = _ClockStyleData.BezelWidth * (ClientRectangle.Width - 1);
+                rect = new RectangleF(ClientRectangle.X + bezelWidth,
+                                      ClientRectangle.Y + bezelWidth,
+                                      (ClientRectangle.Width - 1) - bezelWidth * 2.0f,
+                                      (ClientRectangle.Height - 1) - bezelWidth * 2.0f);
+
+                angle = RoundToExactHour((float)_Value.TimeOfDay.TotalHours * 30.0f);
+                if (_ClockStyleData.HourHandStyle.ContainsPoint(rect, angle, e.Location))
+                    Cursor = Cursors.Hand;
+                else
+                {
+                    angle = (float)_Value.TimeOfDay.TotalMinutes * 6.0f;
+                    if (_ClockStyleData.MinuteHandStyle.ContainsPoint(rect, angle, e.Location))
+                        Cursor = Cursors.Hand;
+                    else
+                    {
+                        angle = (float)_Value.TimeOfDay.Seconds * 6.0f;
+                        if (_ShowSecondHand && _ClockStyleData.SecondHandStyle.ContainsPoint(rect, angle, e.Location))
+                            Cursor = Cursors.Hand;
+                        else if (Cursor != Cursors.Default)
+                            Cursor = Cursors.Default;
+                    }
+                }
+            }
+        }
+
+        private float GetClockAngleFromPoint(Point p)
+        {
+            float angle = (float)MathHelper.GetDegrees(GetAngleFromPoint(p));
+            angle += 90.0f;
+            while (angle < 0)
+                angle += 360;
+            while (angle >= 360)
+                angle -= 360;
+            return angle;
+        }
+        private int GetHourFromPoint(Point p)
+        {
+            float angle = RoundToExactHour(GetClockAngleFromPoint(p));
+            int hour = (int)Math.Round(angle / 30.0, 0);
+            if (hour == 0) hour = 12;
+            return hour;
+        }
+        private int GetMinuteFromPoint(Point p)
+        {
+            float angle = GetClockAngleFromPoint(p);
+            int minute = (int)Math.Round(angle / 6.0, 0);
+            if (minute == 60)
+                minute = 0;
+            return minute;
+        }
+        private int GetSecondFromPoint(Point p)
+        {
+            float angle = GetClockAngleFromPoint(p);
+            int minute = (int)Math.Round(angle / 6.0, 0);
+            if (minute == 60)
+                minute = 0;
+            return minute;
+        }
+
+        private DateTime GetCurrentMouseTime()
+        {
+            DateTime time = _Value;
+            switch (_EditState)
+            {
+                case eClockEditStates.Hour:
+                    time = new DateTime(_Value.Year, _Value.Month, _Value.Day, _NewMouseMoveHour, _Value.Minute, _Value.Second);
+                    break;
+                case eClockEditStates.Minute:
+                    time = new DateTime(_Value.Year, _Value.Month, _Value.Day, _Value.Hour, GetMinuteFromPoint(_EditLoc), _Value.Second);
+                    break;
+                case eClockEditStates.Second:
+                    time = new DateTime(_Value.Year, _Value.Month, _Value.Day, _Value.Hour, _Value.Minute, GetSecondFromPoint(_EditLoc));
+                    break;
+            }
+
+            return time;
+        }
+
+        protected override void OnMouseUp(MouseEventArgs e)
+        {
+            if (_EditState != eClockEditStates.None)
+            {
+                _EditLoc = e.Location;
+                Value = GetCurrentMouseTime();
+                _EditLoc = Point.Empty;
+                _EditState = eClockEditStates.None;
+                Cursor = Cursors.Default;
+            }
+            base.OnMouseUp(e);
+        }
+
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            base.OnPaint(e);
+            Graphics g;
+            RectangleF rect;
+            float bezelWidth;
+
+            g = e.Graphics;
+
+            TextRenderingHint textHint = g.TextRenderingHint;
+            SmoothingMode sm = g.SmoothingMode;
+            if (_AntiAlias)
+            {
+                g.TextRenderingHint = BarUtilities.AntiAliasTextRenderingHint;
+                g.SmoothingMode = SmoothingMode.AntiAlias;
+            }
+
+            bezelWidth = _ClockStyleData.BezelWidth * (ClientRectangle.Width - 1);
+            rect = new RectangleF(ClientRectangle.X + bezelWidth,
+                                  ClientRectangle.Y + bezelWidth,
+                                  (ClientRectangle.Width - 1) - bezelWidth * 2.0f,
+                                  (ClientRectangle.Height - 1) - bezelWidth * 2.0f);
+
+
+            e.Graphics.TranslateTransform(rect.X + rect.Width * 0.5f, rect.Y + rect.Height * 0.5f);
+            switch (_IndicatorStyle)
+            {
+                case eClockIndicatorStyles.Ticks:
+                    DrawTicks(g, rect);
+                    break;
+                case eClockIndicatorStyles.Numbers:
+                    DrawNumbers(g, rect);
+                    break;
+            }
+
+            DrawHands(g, rect, false);
+            DrawCap(g, rect);
+            DrawHands(g, rect, true);
+
+            if (_ShowGlassOverlay)
+                DrawGlassOverlay(g, rect);
+
+            g.TextRenderingHint = textHint;
+            g.SmoothingMode = sm;
+        }
+
+        protected override void OnPaintBackground(PaintEventArgs pevent)
+        {
+            base.OnPaintBackground(pevent);
+            Graphics gfx;
+            RectangleF innerRect, outerRect;
+            GraphicsPath outerPath, innerPath;
+            Brush brush;
+            Pen pen;
+            RectangleF imageRect = new RectangleF();
+            float aspect, bezelWidth;
+            float scaleFactor;
+
+            gfx = pevent.Graphics;
+            gfx.SmoothingMode = _AntiAlias ? SmoothingMode.AntiAlias : SmoothingMode.Default;
+
+            Rectangle clientRectangle = ClientRectangle;
+            if (_ClockStyleData.BezelColor.BorderWidth > 0)
+            {
+                int borderInflateSize = (int)((_ClockStyleData.BezelColor.BorderWidth * Math.Min(clientRectangle.Width, clientRectangle.Height)) / 2);
+                clientRectangle.Inflate(-borderInflateSize, -borderInflateSize);
+            }
+
+            scaleFactor = Math.Min(clientRectangle.Width, clientRectangle.Height);
+            bezelWidth = _ClockStyleData.BezelWidth * (scaleFactor - 1);
+
+            innerRect = new RectangleF(clientRectangle.X + bezelWidth,
+                                       clientRectangle.Y + bezelWidth,
+                                       (clientRectangle.Width - 1) - bezelWidth * 2.0f,
+                                       (clientRectangle.Height - 1) - bezelWidth * 2.0f);
+            outerRect = new RectangleF(clientRectangle.X,
+                                       clientRectangle.Y,
+                                       clientRectangle.Width - 1,
+                                       clientRectangle.Height - 1);
+
+            outerPath = new GraphicsPath();
+            innerPath = new GraphicsPath();
+
+            switch (_ClockStyleData.ClockShape)
+            {
+                case eClockShapes.Round:
+                    outerPath.AddEllipse(outerRect);
+                    outerPath.CloseAllFigures();
+                    innerPath.AddEllipse(innerRect);
+                    innerPath.CloseAllFigures();
+                    break;
+                default:
+                    outerPath.AddRectangle(outerRect);
+                    innerPath.AddRectangle(innerRect);
+                    break;
+            }
+
+
+            if (_ClockStyleData.FaceBackgroundImage != null)
+            {
+                gfx.SetClip(outerPath);
+                if (_ClockStyleData.FaceBackgroundImage.Width < _ClockStyleData.FaceBackgroundImage.Height)
+                    aspect = (float)innerRect.Width / (float)_ClockStyleData.FaceBackgroundImage.Width;
+                else
+                    aspect = (float)innerRect.Height / (float)_ClockStyleData.FaceBackgroundImage.Height;
+                imageRect.X = innerRect.X + ((innerRect.Width / 2.0f) - (aspect * _ClockStyleData.FaceBackgroundImage.Width) / 2.0f);
+                imageRect.Y = innerRect.Y + ((innerRect.Height / 2.0f) - (aspect * _ClockStyleData.FaceBackgroundImage.Height) / 2.0f);
+                imageRect.Width = aspect * _ClockStyleData.FaceBackgroundImage.Width;
+                imageRect.Height = aspect * _ClockStyleData.FaceBackgroundImage.Height;
+                gfx.DrawImage(_ClockStyleData.FaceBackgroundImage, imageRect);
+
+            }
+
+            gfx.ResetClip();
+            gfx.SetClip(innerPath, CombineMode.Exclude);
+            brush = _ClockStyleData.BezelColor.GetBrush(outerPath);
+            gfx.FillPath(brush, outerPath);
+            brush.Dispose();
+            if (_ClockStyleData.BezelColor.BorderWidth > 0)
+            {
+                pen = _ClockStyleData.BezelColor.GetBorderPen(scaleFactor, PenAlignment.Center);
+                gfx.DrawPath(pen, outerPath);
+                pen.Dispose();
+            }
+
+            gfx.ResetClip();
+            if (_ClockStyleData.FaceBackgroundImage == null)
+            {
+                brush = _ClockStyleData.FaceColor.GetBrush(innerPath, new PointF(0.50f, 0.50f));
+                gfx.FillPath(brush, innerPath);
+                brush.Dispose();
+            }
+            if (_ClockStyleData.FaceColor.BorderWidth > 0)
+            {
+                pen = _ClockStyleData.FaceColor.GetBorderPen(scaleFactor, PenAlignment.Center);
+                gfx.DrawPath(pen, innerPath);
+                pen.Dispose();
+            }
+            innerPath.Dispose();
+            outerPath.Dispose();
+        }
+
+        protected override void OnResize(EventArgs e)
+        {
+            base.OnResize(e);
+            //if (Width < 100)
+            //{
+            //    Width = 100;
+            //    Height = 100;
+            //}
+            //else 
+            if (_LastSize.Width != Width)
+                Height = Width;
+            else
+                Width = Height;
+
+            _LastSize = Size;
+        }
+
+        /// <summary>
+        /// Renders the clock's center cap.
+        /// </summary>
+        /// <param name="gfx">Graphics object used for rendering.</param>
+        /// <param name="rect">Bounding rectangle.</param>
+        protected virtual void DrawCap(Graphics gfx, RectangleF rect)
+        {
+            float scaleFactor;
+            GraphicsPath path;
+            RectangleF capRect;
+            Pen pen;
+            Brush brush;
+            float capSize;
+            scaleFactor = Math.Min(rect.Width, rect.Height);
+
+            capSize = _ClockStyleData.CapSize * scaleFactor;
+            capRect = new RectangleF(-capSize / 2.0f, -capSize / 2.0f, capSize, capSize);
+            path = new GraphicsPath();
+            path.AddEllipse(capRect);
+
+            brush = _ClockStyleData.CapColor.GetBrush(path);
+            gfx.FillPath(brush, path);
+            if (_ClockStyleData.CapColor.BorderWidth > 0)
+            {
+                pen = _ClockStyleData.CapColor.GetBorderPen(scaleFactor, PenAlignment.Outset);
+                gfx.DrawPath(pen, path);
+                pen.Dispose();
+            }
+            brush.Dispose();
+            path.Dispose();
+        }
+
+        /// <summary>
+        /// Renders the clock's glass overlay.
+        /// </summary>
+        /// <param name="gfx">Graphics object used for rendering.</param>
+        /// <param name="rect">Bounding rectangle.</param>
+        protected virtual void DrawGlassOverlay(Graphics gfx, RectangleF rect)
+        {
+            GraphicsState gState;
+            PathGradientBrush brush;
+            GraphicsPath path, brushPath;
+            PointF[] curvePoints;
+            float radius;
+
+            gState = gfx.Save();
+            rect.Width *= 0.95f;
+            rect.Height *= 0.95f;
+            rect.X = -rect.Width / 2.0f;
+            rect.Y = -rect.Height / 2.0f;
+            radius = Math.Min(rect.Width, rect.Height) / 2.0f;
+
+            brushPath = new GraphicsPath();
+            brushPath.AddEllipse(rect);
+            brush = new PathGradientBrush(brushPath);
+            brush.CenterPoint = new PointF(0.0f, 0.0f);
+            brush.CenterColor = Color.FromArgb(192, Color.White);
+            brush.SurroundColors = new Color[] { Color.FromArgb(64, Color.White) };
+
+            path = new GraphicsPath();
+            path.AddArc(rect, 180, 180);
+            curvePoints = new PointF[5];
+            curvePoints[0].X = -radius;
+            curvePoints[0].Y = 0.0f;
+
+            curvePoints[1].X = -radius * 0.5f;
+            curvePoints[1].Y = -radius * 0.175f;
+
+            curvePoints[2].X = 0.0f;
+            curvePoints[2].Y = -radius * 0.25f;
+
+            curvePoints[3].X = radius * 0.5f;
+            curvePoints[3].Y = -radius * 0.175f;
+
+            curvePoints[4].X = radius;
+            curvePoints[4].Y = 0.0f;
+
+            path.AddCurve(curvePoints);
+            path.CloseAllFigures();
+
+            gfx.RotateTransform(_ClockStyleData.GlassAngle);
+            gfx.FillPath(brush, path);
+
+            gfx.Restore(gState);
+            brush.Dispose();
+            brushPath.Dispose();
+            path.Dispose();
+
+        }
+
+        private static float RoundToExactHour(float angle)
+        {
+            return (float)Math.Floor((angle / 30f)) * 30f;
+        }
+        /// <summary>
+        /// Renders the clock's hands.
+        /// </summary>
+        /// <param name="gfx">Graphics object used for rendering.</param>
+        /// <param name="rect">Bounding rectangle.</param>
+        /// <param name="overCap">True if this is the rending pass after the cap has been rendered.</param>
+        protected virtual void DrawHands(Graphics gfx, RectangleF rect, bool overCap)
+        {
+            GraphicsState gState;
+            GraphicsPath path;
+            Pen pen;
+            Brush brush;
+            float scaleFactor, angle;
+
+            scaleFactor = Math.Min(rect.Width, rect.Height);
+            gState = gfx.Save();
+            gfx.ResetTransform();
+
+            //Hour Hand
+            if (_ClockStyleData.HourHandStyle.DrawOverCap == overCap)
+            {
+                if (_EditState == eClockEditStates.Hour)
+                    angle = (float)MathHelper.GetDegrees(GetAngleFromPoint(_EditLoc)) + 90.0f;
+                else
+                    angle = (float)(_Value.TimeOfDay.TotalHours > 12 ? _Value.TimeOfDay.TotalHours - 12 : _Value.TimeOfDay.TotalHours) * 30.0f;
+
+                // When clock is editable round up the angle to point at the hour exactly
+                if (_IsEditable && !_AutomaticMode)
+                {
+                    angle = RoundToExactHour(angle);
+                }
+                path = _ClockStyleData.HourHandStyle.GenerateHandPath(rect, angle);
+                brush = _ClockStyleData.HourHandStyle.HandColor.GetBrush(path, _ClockStyleData.HourHandStyle.HandColor.BrushAngle + angle);
+                gfx.FillPath(brush, path);
+                if (_ClockStyleData.HourHandStyle.HandColor.BorderWidth > 0)
+                {
+                    pen = _ClockStyleData.HourHandStyle.HandColor.GetBorderPen(scaleFactor, PenAlignment.Outset);
+                    gfx.DrawPath(pen, path);
+                    pen.Dispose();
+                }
+                brush.Dispose();
+                path.Dispose();
+            }
+
+            //Minute Hand
+            if (_ClockStyleData.MinuteHandStyle.DrawOverCap == overCap)
+            {
+                if (_EditState == eClockEditStates.Minute)
+                    angle = (float)MathHelper.GetDegrees(GetAngleFromPoint(_EditLoc)) + 90.0f;
+                else
+                    angle = (float)_Value.TimeOfDay.TotalMinutes * 6.0f;
+                path = _ClockStyleData.MinuteHandStyle.GenerateHandPath(rect, angle);
+                brush = _ClockStyleData.MinuteHandStyle.HandColor.GetBrush(path, _ClockStyleData.MinuteHandStyle.HandColor.BrushAngle + angle);
+                gfx.FillPath(brush, path);
+                if (_ClockStyleData.MinuteHandStyle.HandColor.BorderWidth > 0)
+                {
+                    pen = _ClockStyleData.MinuteHandStyle.HandColor.GetBorderPen(scaleFactor, PenAlignment.Outset);
+                    gfx.DrawPath(pen, path);
+                    pen.Dispose();
+                }
+                brush.Dispose();
+                path.Dispose();
+            }
+
+            //Second Hand
+            if (_ShowSecondHand && _ClockStyleData.SecondHandStyle.DrawOverCap == overCap)
+            {
+                if (_EditState == eClockEditStates.Second)
+                    angle = (float)MathHelper.GetDegrees(GetAngleFromPoint(_EditLoc)) + 90.0f;
+                else
+                    angle = (float)_Value.TimeOfDay.Seconds * 6.0f;
+                path = _ClockStyleData.SecondHandStyle.GenerateHandPath(rect, angle);
+                brush = _ClockStyleData.SecondHandStyle.HandColor.GetBrush(path, _ClockStyleData.SecondHandStyle.HandColor.BrushAngle + angle);
+                gfx.FillPath(brush, path);
+                if (_ClockStyleData.SecondHandStyle.HandColor.BorderWidth > 0)
+                {
+                    pen = _ClockStyleData.SecondHandStyle.HandColor.GetBorderPen(scaleFactor, PenAlignment.Outset);
+                    gfx.DrawPath(pen, path);
+                    pen.Dispose();
+                }
+                brush.Dispose();
+                path.Dispose();
+            }
+            gfx.Restore(gState);
+        }
+
+        /// <summary>
+        /// Renders the clock's numeric hour indicators.
+        /// </summary>
+        /// <param name="gfx">Graphics object used for rendering.</param>
+        /// <param name="rect">Bounding rectangle.</param>
+        protected virtual void DrawNumbers(Graphics gfx, RectangleF rect)
+        {
+            PointF center, txtCenter;
+            float scaleFactor, radius, tickIncrement, angle;
+            Brush brush;
+            StringFormat strFormat;
+            Font fnt;
+
+            strFormat = new StringFormat();
+            strFormat.Alignment = StringAlignment.Center;
+            strFormat.LineAlignment = StringAlignment.Center;
+
+            scaleFactor = Math.Min(rect.Width, rect.Height) / _BaseSize;
+            fnt = new Font(_ClockStyleData.NumberFont.FontFamily, _ClockStyleData.NumberFont.Size * scaleFactor, _ClockStyleData.NumberFont.Style, GraphicsUnit.Pixel);
+            center = new PointF(rect.X + rect.Width / 2.0f, rect.Y + rect.Height / 2.0f);
+            radius = (rect.Width / 2.0f) - (gfx.MeasureString("12", fnt).Height) / 1.25f;
+            tickIncrement = (float)MathHelper.GetRadians(30.0f);
+            angle = (float)MathHelper.GetRadians(-60.0f);
+            brush = new SolidBrush(_ClockStyleData.NumberColor);
+
+            txtCenter = new PointF();
+            for (int i = 1; i <= 12; i++)
+            {
+                txtCenter.X = (float)(radius * Math.Cos(angle));
+                txtCenter.Y = (float)(radius * Math.Sin(angle));
+                gfx.DrawString(i.ToString(), fnt, brush, txtCenter, strFormat);
+                angle += tickIncrement;
+            }
+
+            brush.Dispose();
+            fnt.Dispose();
+        }
+
+        /// <summary>
+        /// Renders the clock's tick hour/minute indicators.
+        /// </summary>
+        /// <param name="gfx">Graphics object used for rendering.</param>
+        /// <param name="rect">Bounding rectangle.</param>
+        protected virtual void DrawTicks(Graphics gfx, RectangleF rect)
+        {
+            float scaleFactor;
+            PointF[] largePts, smallPts;
+            GraphicsState gState;
+            Brush largeBrush, smallBrush;
+            Pen largePen = null, smallPen = null;
+            GraphicsPath largePath, smallPath;
+
+            scaleFactor = Math.Min(rect.Width, rect.Height);
+
+            largePts = new PointF[4];
+            largePts[0].X = (-_ClockStyleData.LargeTickWidth * 0.5f) * scaleFactor;
+            largePts[0].Y = -0.45f * scaleFactor;
+
+            largePts[1].X = (-_ClockStyleData.LargeTickWidth * 0.5f) * scaleFactor;
+            largePts[1].Y = (-0.45f + _ClockStyleData.LargeTickLength) * scaleFactor;
+
+            largePts[2].X = (_ClockStyleData.LargeTickWidth * 0.5f) * scaleFactor;
+            largePts[2].Y = (-0.45f + _ClockStyleData.LargeTickLength) * scaleFactor;
+
+            largePts[3].X = (_ClockStyleData.LargeTickWidth * 0.5f) * scaleFactor;
+            largePts[3].Y = -0.45f * scaleFactor;
+
+            smallPts = new PointF[4];
+            smallPts[0].X = (-_ClockStyleData.SmallTickWidth * -0.5f) * scaleFactor;
+            smallPts[0].Y = -0.45f * scaleFactor;
+
+            smallPts[1].X = (-_ClockStyleData.SmallTickWidth * -0.5f) * scaleFactor;
+            smallPts[1].Y = (-0.45f + _ClockStyleData.SmallTickLength) * scaleFactor;
+
+            smallPts[2].X = (_ClockStyleData.SmallTickWidth * -0.5f) * scaleFactor;
+            smallPts[2].Y = (-0.45f + _ClockStyleData.SmallTickLength) * scaleFactor;
+
+            smallPts[3].X = (_ClockStyleData.SmallTickWidth * -0.5f) * scaleFactor;
+            smallPts[3].Y = -0.45f * scaleFactor;
+
+            largePath = new GraphicsPath();
+            largePath.AddPolygon(largePts);
+
+            smallPath = new GraphicsPath();
+            smallPath.AddPolygon(smallPts);
+
+            largeBrush = _ClockStyleData.LargeTickColor.GetBrush(largePath);
+            if (_ClockStyleData.LargeTickColor.BorderWidth > 0)
+                largePen = _ClockStyleData.LargeTickColor.GetBorderPen(scaleFactor, PenAlignment.Center);
+
+            smallBrush = _ClockStyleData.LargeTickColor.GetBrush(largePath);
+            if (_ClockStyleData.SmallTickColor.BorderWidth > 0)
+                smallPen = _ClockStyleData.SmallTickColor.GetBorderPen(scaleFactor, PenAlignment.Center);
+
+            gState = gfx.Save();
+            for (int i = 0; i < 12; i++)
+            {
+                gfx.FillPolygon(largeBrush, largePts);
+                if (largePen != null)
+                    gfx.DrawPolygon(largePen, largePts);
+                for (int j = 0; j < 4; j++)
+                {
+                    gfx.RotateTransform(6);
+                    gfx.FillPolygon(smallBrush, smallPts);
+                    if (smallPen != null)
+                        gfx.DrawPolygon(smallPen, smallPts);
+                }
+                gfx.RotateTransform(6);
+            }
+            gfx.Restore(gState);
+
+            largePath.Dispose();
+            smallPath.Dispose();
+            largeBrush.Dispose();
+            smallBrush.Dispose();
+            if (largePen != null)
+                largePen.Dispose();
+            if (smallPen != null)
+                smallPen.Dispose();
+        }
+
+        private float GetAngleFromPoint(PointF pt)
+        {
+            float angle;
+            PointF center = new PointF(ClientRectangle.X + ClientRectangle.Width / 2.0f, ClientRectangle.Y + ClientRectangle.Height / 2.0f);
+            pt.X -= center.X;
+            pt.Y -= center.Y;
+            angle = (float)Math.Atan2((double)(pt.Y), (double)(pt.X));
+            return angle;
+        }
+
+        private void UpdateAutomaticTime()
+        {
+            if (_TimeZoneInfo != null)
+                Value = DevComponents.Schedule.TimeZoneInfo.ConvertTime(DateTime.Now, _TimeZoneInfo);
+            else
+                Value = DateTime.Now;
+        }
+
+        private void Timer_Tick(object sender, EventArgs e)
+        {
+            UpdateAutomaticTime();
+        }
+
+        private DevComponents.Schedule.TimeZoneInfo _TimeZoneInfo = null;
+        private string _TimeZone = string.Empty;
+        /// <summary>
+        /// Gets or sets the time-zone string identifier that is used to display the time when AutomaticMode=true and clock is displaying current time.
+        /// </summary>
+        [DefaultValue(""), Editor("DevComponents.DotNetBar.Design.TimeZoneSelectionEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), Category("Behavior"), Description("Indicates time-zone string identifier that is used to display the time when AutomaticMode=true and clock is displaying current time.")]
+        public string TimeZone
+        {
+            get { return _TimeZone; }
+            set
+            {
+                if (value != _TimeZone)
+                {
+                    DevComponents.Schedule.TimeZoneInfo timeZoneInfo = null;
+                    if (!string.IsNullOrEmpty(value))
+                        timeZoneInfo = DevComponents.Schedule.TimeZoneInfo.FindSystemTimeZoneById(value);
+                    if (timeZoneInfo != null || string.IsNullOrEmpty(value))
+                    {
+                        string oldValue = _TimeZone;
+                        _TimeZone = value;
+                        _TimeZoneInfo = timeZoneInfo;
+                        OnTimeZoneChanged(oldValue, value);
+                    }
+                }
+            }
+        }
+        /// <summary>
+        /// Called when TimeZone property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnTimeZoneChanged(string oldValue, string newValue)
+        {
+            if (_AutomaticMode)
+                UpdateAutomaticTime();
+            //OnPropertyChanged(new PropertyChangedEventArgs("TimeZone"));
+        }
+
+        ///// <summary>
+        ///// Raises the SubPropertyChanged event.
+        ///// </summary>
+        ///// <param name="e">Event arguments</param>
+        //public void OnSubPropertyChanged(DevComponents.Schedule.Model.SubPropertyChangedEventArgs e)
+        //{
+        //    if (SubPropertyChanged != null)
+        //        SubPropertyChanged(this, e);
+        //    Invalidate();
+        //}
+
+        #endregion
+    }
+
+    /// <summary>
+    /// Enumeration containing the available hour/minute indicators.
+    /// </summary>
+    public enum eClockIndicatorStyles
+    {
+        /// <summary>
+        /// Control will use ticks for hour/minute indicators.
+        /// </summary>
+        Ticks,
+
+        /// <summary>
+        /// Control will use numbers for hour indicators.
+        /// </summary>
+        Numbers
+    }
+
+    /// <summary>
+    /// Enumeration containing the available mouse edit states.
+    /// </summary>
+    public enum eClockEditStates
+    {
+        /// <summary>
+        /// Control is not currently in an edit state.
+        /// </summary>
+        None,
+
+        /// <summary>
+        /// Control is currently in an hour edit state.
+        /// </summary>
+        Hour,
+
+        /// <summary>
+        /// Control is currently in an minute edit state.
+        /// </summary>
+        Minute,
+
+        /// <summary>
+        /// Control is currently in an second edit state.
+        /// </summary>
+        Second
+    }
+
+    /// <summary>
+    /// Provides event arguments for TimeValueChanging event.
+    /// </summary>
+    public class TimeValueChangingEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets the current time represented by the control.
+        /// </summary>
+        public readonly DateTime Time;
+        /// <summary>
+        /// Initializes a new instance of the TimeValueChangingEventArgs class.
+        /// </summary>
+        /// <param name="time"></param>
+        public TimeValueChangingEventArgs(DateTime time)
+        {
+            Time = time;
+        }
+
+    }
+    /// <summary>
+    /// Defines delegate for TimeValueChanging event.
+    /// </summary>
+    /// <param name="sender">Source of event.</param>
+    /// <param name="e">Event arguments</param>
+    public delegate void TimeValueChangingEventHandler(object sender, TimeValueChangingEventArgs e);
+}
diff --git a/PROMS/DotNetBar Source Code/AnalogClock/ClockHandStyleData.cs b/PROMS/DotNetBar Source Code/AnalogClock/ClockHandStyleData.cs
new file mode 100644
index 00000000..5cb6fa93
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AnalogClock/ClockHandStyleData.cs	
@@ -0,0 +1,305 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Text;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    /// <summary>
+    /// Data storage class for clock hand visual style.
+    /// </summary>
+    [Description("Clock Hand Style"),
+    TypeConverterAttribute(typeof(ExpandableObjectConverter))]
+    public class ClockHandStyleData : INotifyPropertyChanged
+    {
+        private bool _DrawOverCap;
+        /// <summary>
+        /// Gets or sets a value indicating whether the hand is drawn over the cap.
+        /// </summary>
+        [DefaultValue(false),
+        Category("Appearance"),
+        Description("Indicates whether the hand is drawn over the cap.")]
+        public bool DrawOverCap
+        {
+            get { return _DrawOverCap; }
+            set { _DrawOverCap = value; }
+        }
+
+        private void ColorPropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            OnPropertyChanged(e);
+        }
+
+        private ColorData _HandColor;
+        /// <summary>
+        /// Gets or sets the hand color data for this hand.
+        /// </summary>
+        [Category("Appearance"),
+        Description("The hand color data for this hand.")]
+        public ColorData HandColor
+        {
+            get { return _HandColor; }
+            set
+            {
+                if (value != _HandColor)
+                {
+                    if (_HandColor != null) _HandColor.PropertyChanged -= ColorPropertyChanged;
+                    _HandColor = value;
+                    if (_HandColor != null) _HandColor.PropertyChanged += ColorPropertyChanged;
+                    OnPropertyChanged(new PropertyChangedEventArgs("HandColor"));
+                }
+            }
+        }
+        /// <summary>
+        /// Resets the property to default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetHandColor()
+        {
+            HandColor = new ColorData(eBrushTypes.Solid, Color.FromArgb(109, 127, 138), Color.FromArgb(109, 127, 138), Color.FromArgb(128, 109, 127, 138), 0.01f);
+        }
+
+        private eHandStyles _HandStyle;
+        /// <summary>
+        /// Gets or sets the hand style for this clock hand. Default value is Style1.
+        /// </summary>
+        [DefaultValue(eHandStyles.Style1),
+        Category("Appearance"),
+        Description("The hand style for this clock hand.")]
+        public eHandStyles HandStyle
+        {
+            get { return _HandStyle; }
+            set
+            {
+                if (value != _HandStyle)
+                {
+                    _HandStyle = value;
+                    OnPropertyChanged(new PropertyChangedEventArgs("HandStyle"));
+                }
+            }
+        }
+
+        private float _Length;
+        /// <summary>
+        /// Gets or sets the length of this clock hand as a percentage value ranging from 0.0 to 1.0, with 1.0 being half the width/height of the bounding rectangle. Default value is 1.0.
+        /// </summary>
+        [DefaultValue(1.0f),
+        Category("Appearance"),
+        Description("The length of this clock hand as a percentage value ranging from 0.0 to 1.0, with 1.0 being half the width/height of the bounding rectangle.")]
+        public float Length
+        {
+            get { return _Length; }
+            set
+            {
+                if (value != _Length)
+                {
+                    _Length = value;
+                    OnPropertyChanged(new PropertyChangedEventArgs("Length"));
+                }
+            }
+        }
+
+        private float _Width;
+        /// <summary>
+        /// Gets or sets the width of this clock hand as a percentage value ranging from 0.0 to 1.0, with 1.0 being half the width/height of the bounding rectangle. Default value is 0.1.
+        /// </summary>
+        [DefaultValue(0.1f),
+        Category("Appearance"),
+        Description("The width of this clock hand as a percentage value ranging from 0.0 to 1.0, with 1.0 being half the width/height of the bounding rectangle.")]
+        public float Width
+        {
+            get { return _Width; }
+            set
+            {
+                if (value != _Width)
+                {
+                    _Width = value;
+                    OnPropertyChanged(new PropertyChangedEventArgs("Width"));
+                }
+            }
+        }
+
+        /// <summary>
+        /// Occurs when property value has changed.
+        /// </summary>
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        /// <summary>
+        /// Initializes a new instance of the ClockHand class.
+        /// </summary>
+        public ClockHandStyleData()
+        {
+            _DrawOverCap = false;
+            _HandColor = new ColorData(eBrushTypes.Solid, Color.FromArgb(109, 127, 138), Color.FromArgb(109, 127, 138), Color.FromArgb(128, 109, 127, 138), 0.01f);
+            _HandStyle = eHandStyles.Style1;
+            _Length = 1.0f;
+            _Width = 0.1f;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the ClockHand class.
+        /// </summary>
+        /// <param name="handStyle">The hand style for this item.</param>
+        /// <param name="length">The length of this clock hand as a percentage value ranging from 0.0 to 1.0, with 1.0 being half the width/height of the bounding rectangle</param>
+        /// <param name="width">The width of this clock hand as a percentage value ranging from 0.0 to 1.0, with 1.0 being half the width/height of the bounding rectangle.</param>
+        public ClockHandStyleData(eHandStyles handStyle, float length, float width)
+        {
+            _DrawOverCap = false;
+            _HandColor = new ColorData(eBrushTypes.Solid, Color.FromArgb(109, 127, 138), Color.FromArgb(109, 127, 138), Color.FromArgb(128, 109, 127, 138), 0.01f);
+            _HandStyle = handStyle;
+            _Length = length;
+            _Width = width;
+        }
+
+        /// <summary>
+        /// Indicates whether the specified point is contained within the bounds of this hand.
+        /// </summary>
+        /// <param name="boundingRect">The bounding rectangle of the parent clock control.</param>
+        /// <param name="angle">The clockwise angle for this clock hand in degrees from the 12 o'clock position.</param>
+        /// <param name="pt">A Point that represents the point to test.</param>
+        /// <returns></returns>
+        public virtual bool ContainsPoint(RectangleF boundingRect, float angle, Point pt)
+        {
+            GraphicsPath path;
+            bool ret;
+
+            path = GenerateHandPath(boundingRect, angle);
+            
+            ret = path.IsVisible(pt);
+            path.Dispose();
+            return ret;
+        }
+
+        /// <summary>
+        /// Generates a scaled and rotated graphics path based on the given style, rectangle and angle.
+        /// </summary>
+        /// <param name="boundingRect">The bounding rectangle of the parent clock control.</param>
+        /// <param name="angle">The clockwise angle for this clock hand in degrees from the 12 o'clock position.</param>
+        /// <returns></returns>
+        public GraphicsPath GenerateHandPath(RectangleF boundingRect, float angle)
+        {
+            GraphicsPath path = new GraphicsPath();
+            RectangleF rect;
+            Matrix matrix;
+            float scaleFactor;
+            PointF[] pts;
+
+            switch (_HandStyle)
+            {
+                case eHandStyles.Style1:
+                    pts = new PointF[4];
+                    pts[0].X = -0.5f;
+                    pts[0].Y = 0.0f;
+
+                    pts[1].X = -0.5f;
+                    pts[1].Y = -1.0f;
+
+                    pts[2].X = 0.5f;
+                    pts[2].Y = -1.0f;
+
+                    pts[3].X = 0.5f;
+                    pts[3].Y = 0.0f;
+                    path.AddPolygon(pts);
+                    break;
+                case eHandStyles.Style2:
+                    pts = new PointF[4];
+                    pts[0].X = -0.4f;
+                    pts[0].Y = 0.25f;
+
+                    pts[1].X = -0.4f;
+                    pts[1].Y = -1.0f;
+
+                    pts[2].X = 0.4f;
+                    pts[2].Y = -1.0f;
+
+                    pts[3].X = 0.4f;
+                    pts[3].Y = 0.25f;
+                    path.AddPolygon(pts);
+                    break;
+                case eHandStyles.Style3:
+                    pts = new PointF[4];
+                    pts[0].X = -0.5f;
+                    pts[0].Y = 0.0f;
+
+                    pts[1].X = -0.0125f;
+                    pts[1].Y = -1.0f;
+                    
+                    pts[2].X = 0.0125f;
+                    pts[2].Y = -1.0f;
+
+                    pts[3].X = 0.5f;
+                    pts[3].Y = 0.0f;
+
+                    path.AddPolygon(pts);
+                    break;
+                case eHandStyles.Style4:
+                    path.FillMode = FillMode.Winding;
+                    pts = new PointF[4];
+                    pts[0].X = -0.5f;
+                    pts[0].Y = -0.05f;
+
+                    pts[1].X = -0.5f;
+                    pts[1].Y = -1.0f;
+
+                    pts[2].X = 0.5f;
+                    pts[2].Y = -1.0f;
+
+                    pts[3].X = 0.5f;
+                    pts[3].Y = -0.05f;
+                    path.AddPolygon(pts);
+
+                    rect = new RectangleF(-5.0f, -0.06f, 10.0f, 0.12f);
+                    path.AddEllipse(rect);
+                    break;
+            }
+            scaleFactor = Math.Min(boundingRect.Width, boundingRect.Height) / 2.0f;
+            matrix = new Matrix();
+            matrix.Translate(boundingRect.X + boundingRect.Width * 0.5f, boundingRect.Y + boundingRect.Width * 0.5f);
+            matrix.Rotate(angle);
+            matrix.Scale(scaleFactor * Width, scaleFactor * Length);
+            path.Transform(matrix);
+            matrix.Dispose();
+            return path;
+        }
+
+        /// <summary>
+        /// Raises the PropertyChanged event.
+        /// </summary>
+        /// <param name="e">Event arguments</param>
+        protected virtual void OnPropertyChanged(PropertyChangedEventArgs e)
+        {
+            if (PropertyChanged != null)
+                PropertyChanged(this, e);
+        }
+    }
+
+    /// <summary>
+    /// Enumeration containing the available hand styles.
+    /// </summary>
+    public enum eHandStyles
+    {
+        /// <summary>
+        /// Style 1.
+        /// </summary>
+        Style1,
+
+        /// <summary>
+        /// Style 2.
+        /// </summary>
+        Style2,
+
+        /// <summary>
+        /// Style 3.
+        /// </summary>
+        Style3,
+
+        /// <summary>
+        /// Style 4.
+        /// </summary>
+        Style4,
+    }
+
+}
diff --git a/PROMS/DotNetBar Source Code/AnalogClock/ClockStyleData.cs b/PROMS/DotNetBar Source Code/AnalogClock/ClockStyleData.cs
new file mode 100644
index 00000000..b15808eb
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AnalogClock/ClockStyleData.cs	
@@ -0,0 +1,659 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Text;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    /// <summary>
+    /// Data storage class for clock visual styles.
+    /// </summary>
+    [Description("Clock Style"),
+    TypeConverterAttribute(typeof(ExpandableObjectConverter))]
+    public class ClockStyleData : IDisposable, INotifyPropertyChanged
+    {
+
+        private eClockStyles _Style;
+        /// <summary>
+        /// Gets or sets the PredefinedStyles value for this style.
+        /// </summary>
+        [Browsable(false)]
+        public eClockStyles Style
+        {
+            get { return _Style; }
+            set
+            {
+                if (value != _Style)
+                {
+                    _Style = value;
+                    OnPropertyChanged(new PropertyChangedEventArgs("Style"));
+                }
+            }
+        }
+
+
+        private eClockShapes _ClockShape;
+        /// <summary>
+        /// Gets or sets the clock shape value for this style.
+        /// </summary>
+        [DefaultValue(eClockShapes.Round),
+        Category("Appearance"),
+        Description("The clock shape for this style.")]
+        public eClockShapes ClockShape
+        {
+            get { return _ClockShape; }
+            set
+            {
+                if (value != _ClockShape)
+                {
+                    _ClockShape = value;
+                    OnPropertyChanged(new PropertyChangedEventArgs("ClockShape"));
+                }
+            }
+        }
+
+        private void ColorPropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            if (_Parent != null) _Parent.Invalidate();
+        }
+
+        private ColorData _BezelColor;
+        /// <summary>
+        /// Gets or sets the bezel color data for this style.
+        /// </summary>
+        [Category("Appearance"),
+        Description("The bezel color data for this style.")]
+        public ColorData BezelColor
+        {
+            get { return _BezelColor; }
+            set
+            {
+                if (value != _BezelColor)
+                {
+                    if (_BezelColor != null) _BezelColor.PropertyChanged -= ColorPropertyChanged;
+                    _BezelColor = value;
+                    if (_BezelColor != null) _BezelColor.PropertyChanged += ColorPropertyChanged;
+                    OnPropertyChanged(new PropertyChangedEventArgs("BezelColor"));
+                }
+            }
+        }
+        /// <summary>
+        /// Resets the property to default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetBezelColor()
+        {
+            BezelColor = new ColorData(eBrushTypes.Linear, Color.FromArgb(255, 255, 255), Color.FromArgb(152, 152, 152), Color.FromArgb(120, 120, 120), 1.0f, 45.0f);
+        }
+        
+
+        private float _BezelWidth;
+        /// <summary>
+        /// Gets or sets the width of clock bezel as a percentage value ranging from 0.0 to 1.0.
+        /// </summary>
+        [DefaultValue(0.03f),
+        Category("Appearance"),
+        Description("The width of clock bezel as a percentage value ranging from 0.0 to 1.0.")]
+        public float BezelWidth
+        {
+            get { return _BezelWidth; }
+            set
+            {
+                if (value != _BezelWidth)
+                {
+                    _BezelWidth = value;
+                    OnPropertyChanged(new PropertyChangedEventArgs("BezelWidth"));
+                }
+            }
+        }
+
+        private ColorData _FaceColor;
+        /// <summary>
+        /// Gets or sets the face color data for this style.
+        /// </summary>
+        [Category("Appearance"),
+        Description("The face color data for this style.")]
+        public ColorData FaceColor
+        {
+            get { return _FaceColor; }
+            set
+            {
+                if (value != _FaceColor)
+                {
+                    if (_FaceColor != null) _FaceColor.PropertyChanged -= ColorPropertyChanged;
+                    _FaceColor = value;
+                    if (_FaceColor != null) _FaceColor.PropertyChanged += ColorPropertyChanged;
+                    OnPropertyChanged(new PropertyChangedEventArgs("FaceColor"));
+                }
+            }
+        }
+        /// <summary>
+        /// Resets the property to default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetFaceColor()
+        {
+            FaceColor = new ColorData(eBrushTypes.Linear, Color.FromArgb(191, 204, 213), Color.FromArgb(255, 255, 255), Color.FromArgb(135, 145, 161), 1.0f, 45.0f);
+        }
+
+        private Image _FaceBackgroundImage;
+        /// <summary>
+        /// Gets or sets the face background image for this style.
+        /// </summary>
+        [DefaultValue(null),
+        Category("Appearance"),
+        Description("The face background image for this style.")]
+        public Image FaceBackgroundImage
+        {
+            get { return _FaceBackgroundImage; }
+            set
+            {
+                if (value != _FaceBackgroundImage)
+                {
+                    _FaceBackgroundImage = value;
+                    OnPropertyChanged(new PropertyChangedEventArgs("FaceBackgroundImage"));
+                }
+            }
+        }
+
+        private ClockHandStyleData _HourHandStyle;
+        /// <summary>
+        /// Gets or sets the hour hand style for this style.
+        /// </summary>
+        [Category("Appearance"),
+        Description("The hour hand style for this style.")]
+        public ClockHandStyleData HourHandStyle
+        {
+            get { return _HourHandStyle; }
+            set
+            {
+                if (value != _HourHandStyle)
+                {
+                    if (_HourHandStyle != null) _HourHandStyle.PropertyChanged -= ColorPropertyChanged;
+                    _HourHandStyle = value;
+                    if (_HourHandStyle != null) _HourHandStyle.PropertyChanged += ColorPropertyChanged;
+                    OnPropertyChanged(new PropertyChangedEventArgs("HourHandStyle"));
+                }
+            }
+        }
+        /// <summary>
+        /// Resets the property to default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetHourHandStyle()
+        {
+            HourHandStyle = new ClockHandStyleData(eHandStyles.Style1, 0.55f, 0.01f);
+        }
+
+        private ClockHandStyleData _MinuteHandStyle;
+        /// <summary>
+        /// Gets or sets the minute hand style for this style.
+        /// </summary>
+        [Category("Appearance"),
+        Description("The minute hand style for this style.")]
+        public ClockHandStyleData MinuteHandStyle
+        {
+            get { return _MinuteHandStyle; }
+            set
+            {
+                if (value != _MinuteHandStyle)
+                {
+                    if (_MinuteHandStyle != null) _MinuteHandStyle.PropertyChanged -= ColorPropertyChanged;
+                    _MinuteHandStyle = value;
+                    if (_MinuteHandStyle != null) _MinuteHandStyle.PropertyChanged += ColorPropertyChanged;
+                    OnPropertyChanged(new PropertyChangedEventArgs("MinuteHandStyle"));
+                }
+            }
+        }
+        /// <summary>
+        /// Resets the property to default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetMinuteHandStyle()
+        {
+            MinuteHandStyle = new ClockHandStyleData(eHandStyles.Style1, 0.8f, 0.01f);
+        }
+
+
+        private ClockHandStyleData _SecondHandStyle;
+        /// <summary>
+        /// Gets or sets the second hand style for this style.
+        /// </summary>
+        [Category("Appearance"),
+        Description("The second hand style for this style.")]
+        public ClockHandStyleData SecondHandStyle
+        {
+            get { return _SecondHandStyle; }
+            set
+            {
+                if (value != _SecondHandStyle)
+                {
+                    if (_SecondHandStyle != null) _SecondHandStyle.PropertyChanged -= ColorPropertyChanged;
+                    _SecondHandStyle = value;
+                    if (_SecondHandStyle != null) _SecondHandStyle.PropertyChanged += ColorPropertyChanged;
+                    OnPropertyChanged(new PropertyChangedEventArgs("SecondHandStyle"));
+                }
+            }
+        }
+        /// <summary>
+        /// Resets the property to default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetSecondHandStyle()
+        {
+            SecondHandStyle = new ClockHandStyleData(eHandStyles.Style2, 0.8f, 0.005f);
+        }
+
+
+        private ColorData _CapColor;
+        /// <summary>
+        /// Gets or sets the center cap color data for this style.
+        /// </summary>
+        [Category("Appearance"),
+        Description("The center cap color data for this style.")]
+        public ColorData CapColor
+        {
+            get { return _CapColor; }
+            set
+            {
+                if (value != _CapColor)
+                {
+                    if (_CapColor != null) _CapColor.PropertyChanged -= ColorPropertyChanged;
+                    _CapColor = value;
+                    if (_CapColor != null) _CapColor.PropertyChanged += ColorPropertyChanged;
+                    OnPropertyChanged(new PropertyChangedEventArgs("CapColor"));
+                }
+            }
+        }
+        /// <summary>
+        /// Resets the property to default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetCapColor()
+        {
+            CapColor = new ColorData(eBrushTypes.Solid, Color.FromArgb(109, 127, 138), Color.FromArgb(109, 127, 138), Color.FromArgb(128, 109, 127, 138), 0.01f);
+        }
+
+        private float _CapSize;
+        /// <summary>
+        /// Gets or sets the center cap diameter as a percentage value ranging from 0.0 to 1.0.
+        /// </summary>
+        [DefaultValue(0.03f),
+        Category("Appearance"),
+        Description("The center cap diameter as a percentage value ranging from 0.0 to 1.0.")]
+        public float CapSize
+        {
+            get { return _CapSize; }
+            set
+            {
+                if (value != _CapSize)
+                {
+                    _CapSize = value;
+                    OnPropertyChanged(new PropertyChangedEventArgs("CapSize"));
+                }
+            }
+        }
+
+        private Color _NumberColor;
+        /// <summary>
+        /// Gets or sets the face number color for this style.
+        /// </summary>
+        [DefaultValue(typeof(Color), "139, 158, 168"), 
+        Category("Appearance"),
+        Description("The face number color for this style.")]
+        public Color NumberColor
+        {
+            get { return _NumberColor; }
+            set
+            {
+                if (value != _NumberColor)
+                {
+                    _NumberColor = value;
+                    OnPropertyChanged(new PropertyChangedEventArgs("NumberColor"));
+                }
+            }
+        }
+        
+        private Font _NumberFont;
+        /// <summary>
+        /// Gets or sets the center cap color data for this style.
+        /// </summary>
+        [Category("Appearance"),
+        Description("The face number font for this style.")]
+        public Font NumberFont
+        {
+            get { return _NumberFont; }
+            set
+            {
+                if (value != _NumberFont)
+                {
+                    _NumberFont = value;
+                    OnPropertyChanged(new PropertyChangedEventArgs("NumberFont"));
+                }
+            }
+        }
+        /// <summary>
+        /// Resets the property to default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetNumberFont()
+        {
+            _NumberFont = new Font("Microsoft Sans Serif", 8, FontStyle.Regular, GraphicsUnit.Pixel);
+        }
+
+        private ColorData _LargeTickColor;
+        /// <summary>
+        /// Gets or sets the large tick color data for this style.
+        /// </summary>
+        [Category("Appearance"),
+        Description("The large tick color data for this style.")]
+        public ColorData LargeTickColor
+        {
+            get { return _LargeTickColor; }
+            set
+            {
+                if (value != _LargeTickColor)
+                {
+                    if (_LargeTickColor != null) _LargeTickColor.PropertyChanged -= ColorPropertyChanged;
+                    _LargeTickColor = value;
+                    if (_LargeTickColor != null) _LargeTickColor.PropertyChanged += ColorPropertyChanged;
+                    OnPropertyChanged(new PropertyChangedEventArgs("LargeTickColor"));
+                }
+            }
+        }
+        /// <summary>
+        /// Resets the property to default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetLargeTickColor()
+        {
+            LargeTickColor = new ColorData(eBrushTypes.Centered, Color.FromArgb(122, 142, 154), Color.FromArgb(122, 142, 154), Color.FromArgb(255, 255, 255), 1.0f);
+        }
+
+        private float _LargeTickLength;
+        /// <summary>
+        /// Gets or sets the large tick length as a percentage value ranging from 0.0 to 1.0.
+        /// </summary>
+        [DefaultValue(0.06f),
+        Category("Appearance"),
+        Description("The large tick length as a percentage value ranging from 0.0 to 1.0.")]
+        public float LargeTickLength
+        {
+            get { return _LargeTickLength; }
+            set
+            {
+                if (value != _LargeTickLength)
+                {
+                    _LargeTickLength = value;
+                    OnPropertyChanged(new PropertyChangedEventArgs("LargeTickLength"));
+                }
+            }
+        }
+
+        private float _LargeTickWidth;
+        /// <summary>
+        /// Gets or sets the large tick width as a percentage value ranging from 0.0 to 1.0.
+        /// </summary>
+        [DefaultValue(0.02f),
+        Category("Appearance"),
+        Description("The large tick width as a percentage value ranging from 0.0 to 1.0.")]
+        public float LargeTickWidth
+        {
+            get { return _LargeTickWidth; }
+            set
+            {
+                if (value != _LargeTickWidth)
+                {
+                    _LargeTickWidth = value;
+                    OnPropertyChanged(new PropertyChangedEventArgs("LargeTickWidth"));
+                }
+            }
+        }
+
+        private ColorData _SmallTickColor;
+        /// <summary>
+        /// Gets or sets the small tick color data for this style.
+        /// </summary>
+        [Category("Appearance"),
+        Description("The small tick color data for this style.")]
+        public ColorData SmallTickColor
+        {
+            get { return _SmallTickColor; }
+            set
+            {
+                if (value != _SmallTickColor)
+                {
+                    if (_SmallTickColor != null) _SmallTickColor.PropertyChanged -= ColorPropertyChanged;
+                    _SmallTickColor = value;
+                    if (_SmallTickColor != null) _SmallTickColor.PropertyChanged += ColorPropertyChanged;
+                    OnPropertyChanged(new PropertyChangedEventArgs("SmallTickColor"));
+                }
+            }
+        }
+        /// <summary>
+        /// Resets the property to default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetSmallTickColor()
+        {
+            SmallTickColor = new ColorData(eBrushTypes.Centered, Color.FromArgb(122, 142, 154), Color.FromArgb(122, 142, 154), Color.FromArgb(255, 255, 255), 1.0f);
+        }
+
+        private float _SmallTickLength;
+        /// <summary>
+        /// Gets or sets the small tick length as a percentage value ranging from 0.0 to 1.0.
+        /// </summary>
+        [DefaultValue(0.02f),
+        Category("Appearance"),
+        Description("The small tick length as a percentage value ranging from 0.0 to 1.0.")]
+        public float SmallTickLength
+        {
+            get { return _SmallTickLength; }
+            set
+            {
+                if (value != _SmallTickLength)
+                {
+                    _SmallTickLength = value;
+                    OnPropertyChanged(new PropertyChangedEventArgs("SmallTickLength"));
+                }
+            }
+        }
+
+        private float _SmallTickWidth;
+        /// <summary>
+        /// Gets or sets the small tick width as a percentage value ranging from 0.0 to 1.0.
+        /// </summary>
+        [DefaultValue(0.02f),
+        Category("Appearance"),
+        Description("The small tick width as a percentage value ranging from 0.0 to 1.0.")]
+        public float SmallTickWidth
+        {
+            get { return _SmallTickWidth; }
+            set
+            {
+                if (value != _SmallTickWidth)
+                {
+                    _SmallTickWidth = value;
+                    OnPropertyChanged(new PropertyChangedEventArgs("SmallTickWidth"));
+                }
+            }
+        }
+
+        private int _GlassAngle;
+        /// <summary>
+        /// Gets or sets the overlay glass angle, in degrees for this style.
+        /// </summary>
+        [DefaultValue(20),
+        Category("Appearance"),
+        Description("The overlay angle, in degrees for this style.")]
+        public int GlassAngle
+        {
+            get { return _GlassAngle; }
+            set
+            {
+                if (value != _GlassAngle)
+                {
+                    _GlassAngle = value;
+                    OnPropertyChanged(new PropertyChangedEventArgs("_GlassAngle"));
+                }
+            }
+        }
+
+        /// <summary>
+        /// Occurs when property value has changed.
+        /// </summary>
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        /// <summary>
+        /// Initializes a new instance of the ClockStyle class.
+        /// </summary>
+        public ClockStyleData()
+        {
+            LoadStyle(eClockStyles.Style1);
+        }
+
+        private AnalogClockControl _Parent = null;
+        /// <summary>
+        /// Gets the parent of the style.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public AnalogClockControl Parent
+        {
+            get { return _Parent; }
+            internal set { _Parent = value; }
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the ClockStyle class.
+        /// </summary>
+        /// <param name="style">Predefined style from the PredefinedStyles enum.</param>
+        public ClockStyleData(eClockStyles style)
+        {
+            LoadStyle(style);
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the ClockStyle class.
+        /// </summary>
+        /// <param name="style">Predefined style from the PredefinedStyles enum.</param>
+        public ClockStyleData(eClockStyles style, AnalogClockControl parent)
+        {
+            LoadStyle(style);
+            _Parent = parent;
+        }
+
+        /// <summary>
+        /// Releases all resources used by the class. 
+        /// </summary>
+        public void Dispose()
+        {
+            if (_FaceBackgroundImage != null)
+                _FaceBackgroundImage.Dispose();
+            if (_NumberFont != null)
+                _NumberFont.Dispose();
+        }
+
+        /// <summary>
+        /// Loads a predefined style
+        /// </summary>
+        /// <param name="style">The predefined style to load.</param>
+        private void LoadStyle(eClockStyles style)
+        {
+            _Style = style;
+            switch (style)
+            {
+                case eClockStyles.Style1:
+                case eClockStyles.Custom:
+                    _ClockShape = eClockShapes.Round;
+                    BezelColor = new ColorData(eBrushTypes.Linear, Color.FromArgb(255, 255, 255), Color.FromArgb(152, 152, 152), Color.FromArgb(120, 120, 120), 0.01f);
+                    _BezelWidth = 0.03f;
+                    FaceColor = new ColorData(eBrushTypes.Linear, Color.FromArgb(191, 204, 213), Color.FromArgb(255, 255, 255), Color.FromArgb(135, 145, 161), 0.01f, 45.0f);
+                    _FaceBackgroundImage = null;
+                    HourHandStyle = new ClockHandStyleData(eHandStyles.Style1, 0.55f, 0.015f);
+                    MinuteHandStyle = new ClockHandStyleData(eHandStyles.Style1, 0.8f, 0.01f);
+                    SecondHandStyle = new ClockHandStyleData(eHandStyles.Style2, 0.8f, 0.005f);
+                    CapColor = new ColorData(eBrushTypes.Solid, Color.FromArgb(109, 127, 138), Color.FromArgb(109, 127, 138), Color.FromArgb(128, 109, 127, 138), 0.01f);
+                    _CapSize = 0.03f;
+                    _NumberColor = Color.FromArgb(139, 158, 168);
+                    _NumberFont = new Font("Microsoft Sans Serif", 12, FontStyle.Regular, GraphicsUnit.Pixel);
+                    LargeTickColor = new ColorData(eBrushTypes.Linear, Color.FromArgb(122, 142, 154), Color.FromArgb(122, 142, 154), Color.FromArgb(128, 255, 255, 255), 0.01f);
+                    _LargeTickLength = 0.06f;
+                    _LargeTickWidth = 0.02f;
+                    SmallTickColor = new ColorData(eBrushTypes.Linear, Color.FromArgb(122, 142, 154), Color.FromArgb(122, 142, 154), Color.FromArgb(128, 255, 255, 255), 0.01f);
+                    _SmallTickLength = 0.02f;
+                    _SmallTickWidth = 0.02f;
+                    _GlassAngle = -20;
+                    break;
+                case eClockStyles.Style2:
+                    _ClockShape = eClockShapes.Round;
+                    BezelColor = new ColorData(eBrushTypes.Linear, Color.FromArgb(80, 80, 80), Color.FromArgb(0, 0, 0), Color.FromArgb(0, 0, 0), 0.0f, 90.0f);
+                    _BezelWidth = 0.03f;
+                    FaceColor = new ColorData(eBrushTypes.Linear, Color.FromArgb(225, 225, 225), Color.FromArgb(240, 240, 240), Color.FromArgb(0, 0, 0), 0.0f, 90.0f);
+                    _FaceBackgroundImage = null;
+                    HourHandStyle = new ClockHandStyleData(eHandStyles.Style3, 0.45f, 0.175f);
+                    HourHandStyle.HandColor = new ColorData(eBrushTypes.Linear, Color.FromArgb(0, 0, 0), Color.FromArgb(80, 80, 80), Color.FromArgb(64, 0, 0, 0), 0.01f, 90.0f);
+                    MinuteHandStyle = new ClockHandStyleData(eHandStyles.Style3, 0.75f, 0.175f);
+                    MinuteHandStyle.HandColor = new ColorData(eBrushTypes.Linear, Color.FromArgb(0, 0, 0), Color.FromArgb(80, 80, 80), Color.FromArgb(64, 0, 0, 0), 0.01f, 90.0f);
+                    SecondHandStyle = new ClockHandStyleData(eHandStyles.Style4, 0.9f, 0.01f);
+                    SecondHandStyle.HandColor = new ColorData(eBrushTypes.Solid, Color.FromArgb(255, 0, 0), Color.FromArgb(255, 0, 0), Color.FromArgb(128, 192, 0, 0), 0.01f);
+                    _SecondHandStyle.DrawOverCap = true;
+                    CapColor = new ColorData(eBrushTypes.Solid, Color.FromArgb(255, 255, 255), Color.FromArgb(255, 255, 255), Color.FromArgb(223, 0, 0, 0), 0.01f);
+                    _CapSize = 0.1f;
+                    _NumberColor = Color.FromArgb(0, 0, 0);
+                    _NumberFont = new Font("Trebuchet MS", 12, FontStyle.Regular, GraphicsUnit.Pixel);
+                    LargeTickColor = new ColorData(eBrushTypes.Solid, Color.FromArgb(0, 0, 0), Color.FromArgb(0, 0, 0), Color.FromArgb(64, 0, 0, 0), 0.01f);
+                    _LargeTickLength = 0.06f;
+                    _LargeTickWidth = 0.01f;
+                    SmallTickColor = new ColorData(eBrushTypes.Solid, Color.FromArgb(0, 0, 0), Color.FromArgb(0, 0, 0), Color.FromArgb(64, 0, 0, 0), 0.01f);
+                    _SmallTickLength = 0.01f;
+                    _SmallTickWidth = 0.01f;
+                    _GlassAngle = 0;
+                    break;
+            }
+        }
+
+        /// <summary>
+        /// Raises the PropertyChanged event.
+        /// </summary>
+        /// <param name="e">Event arguments</param>
+        protected virtual void OnPropertyChanged(PropertyChangedEventArgs e)
+        {
+            if (PropertyChanged != null)
+                PropertyChanged(this, e);
+            if (_Parent != null) _Parent.Invalidate();
+        }
+    }
+
+    /// <summary>
+    /// Enumeration containing the predefined clock styles.
+    /// </summary>
+    public enum eClockStyles
+    {
+        /// <summary>
+        /// Style 1. Default style,
+        /// </summary>
+        Style1,
+
+        /// <summary>
+        /// Style 2.
+        /// </summary>
+        Style2,
+
+        /// <summary>
+        /// No predefined style.
+        /// </summary>
+        Custom
+    }
+
+    /// <summary>
+    /// Enumeration containing the predefined clock shapes.
+    /// </summary>
+    public enum eClockShapes
+    {
+        /// <summary>
+        /// Round clock shape.
+        /// </summary>
+        Round
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/AnalogClock/ColorData.cs b/PROMS/DotNetBar Source Code/AnalogClock/ColorData.cs
new file mode 100644
index 00000000..b7031d9e
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AnalogClock/ColorData.cs	
@@ -0,0 +1,442 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    /// <summary>
+    /// Data storage and utility class for defining gradient colors.
+    /// </summary>
+    [Description("Color Data Class"),
+    TypeConverterAttribute(typeof(ExpandableObjectConverter))]
+    public class ColorData : INotifyPropertyChanged
+    {
+        private Color _BorderColor;
+        /// <summary>
+        /// Gets or sets the border color for this item. Default value is white.
+        /// </summary>
+        [DefaultValue(typeof(Color), "255, 255, 255"),
+        Category("Appearance"),
+        Description("The border color for this item.")]
+        public Color BorderColor
+        {
+            get { return _BorderColor; }
+            set
+            {
+                if (value != _BorderColor)
+                {
+                    _BorderColor = value;
+                    OnPropertyChanged(new PropertyChangedEventArgs("BorderColor"));
+                }
+            }        
+        }
+
+        private float _BorderWidth;
+        /// <summary>
+        /// Gets or sets the border width for this item. Default value is 0.
+        /// </summary>
+        [DefaultValue(0.0f),
+        Category("Appearance"),
+        Description("The border width for this item.")]
+        public float BorderWidth
+        {
+            get { return _BorderWidth; }
+            set
+            {
+                if (value != _BorderWidth)
+                {
+                    _BorderWidth = value;
+                    OnPropertyChanged(new PropertyChangedEventArgs("BorderWidth"));
+                }
+            }        
+        }
+
+        private float _BrushAngle;
+        /// <summary>
+        /// Gets or sets the brush angle for this item. Only applies to Linear and Reflected brush types. Default value is 0.
+        /// </summary>
+        [DefaultValue(0.0f),
+        Category("Appearance"),
+        Description("The brush angle for this item. Only applies to Linear and Reflected brush types.")]
+        public float BrushAngle
+        {
+            get { return _BrushAngle; }
+            set
+            {
+                if (value != _BrushAngle)
+                {
+                    _BrushAngle = value;
+                    OnPropertyChanged(new PropertyChangedEventArgs("BrushAngle"));
+                }
+            }        
+        }
+
+        private float _BrushSBSFocus;
+        /// <summary>
+        /// Gets or sets the brush SigmaBellShape focus for this item. Only applies to Reflected brush types. Default value is 0.5.
+        /// </summary>
+        [DefaultValue(0.5f),
+        Category("Appearance"),
+        Description("The brush SigmaBellShape focus for this item. Only applies to Linear and Reflected brush types.")]
+        public float BrushSBSFocus
+        {
+            get { return _BrushSBSFocus; }
+            set
+            {
+                if (value != _BrushSBSFocus)
+                {
+                    _BrushSBSFocus = value;
+                    OnPropertyChanged(new PropertyChangedEventArgs("BrushSBSFocus"));
+                }
+            }        
+        }
+
+        private float _BrushSBSScale;
+        /// <summary>
+        /// Gets or sets the brush SigmaBellShape scale for this item. Only applies to Reflected brush types. Default value is 0.5.
+        /// </summary>
+        [DefaultValue(0.5f),
+        Category("Appearance"),
+        Description("The brush SigmaBellShape scale for this item. Only applies to Linear and Reflected brush types.")]
+        public float BrushSBSScale
+        {
+            get { return _BrushSBSScale; }
+            set
+            {
+                if (value != _BrushSBSScale)
+                {
+                    _BrushSBSScale = value;
+                    OnPropertyChanged(new PropertyChangedEventArgs("BrushSBSScale"));
+                }
+            }        
+        }
+
+        private eBrushTypes _BrushType;
+        /// <summary>
+        /// Gets or sets the brush type for this item. Default value is Solid.
+        /// </summary>
+        [DefaultValue(eBrushTypes.Solid),
+        Category("Appearance"),
+        Description("The brush type for this item.")]
+        public eBrushTypes BrushType
+        {
+            get { return _BrushType; }
+            set
+            {
+                if (value != _BrushType)
+                {
+                    _BrushType = value;
+                    OnPropertyChanged(new PropertyChangedEventArgs("BrushType"));
+                }
+            }
+        }
+
+        private Color _Color1;
+        /// <summary>
+        /// Gets or sets the first color for this item. Default value is white.
+        /// </summary>
+        [DefaultValue(typeof(Color), "255, 255, 255"),
+        Category("Appearance"),
+        Description("The first color for this item.")]
+        public Color Color1
+        {
+            get { return _Color1; }
+            set
+            {
+                if (value != _Color1)
+                {
+                    _Color1 = value;
+                    OnPropertyChanged(new PropertyChangedEventArgs("Color1"));
+                }
+            }
+        }
+
+        private Color _Color2;
+        /// <summary>
+        /// Gets or sets the second color for this item. Default value is white.
+        /// </summary>
+        [DefaultValue(typeof(Color), "255, 255, 255"),
+        Category("Appearance"),
+        Description("The second color for this item.")]
+        public Color Color2
+        {
+            get { return _Color2; }
+            set 
+            {
+                if (value != _Color2)
+                {
+                    _Color2 = value;
+                    OnPropertyChanged(new PropertyChangedEventArgs("Color2"));
+                }
+            }
+        }
+
+        /// <summary>
+        /// Occurs when property value has changed.
+        /// </summary>
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        /// <summary>
+        /// Creates new instance of the object. 
+        /// </summary>
+        public ColorData()
+        {
+            LoadData(eBrushTypes.Solid, Color.White, Color.White, Color.White, 0.0f, 0.0f, 0.5f, 1.0f);
+        }
+
+        /// <summary>
+        /// Creates new instance of the object. 
+        /// </summary>
+        /// <param name="color1">The first color for this entry.</param>
+        /// <param name="color2">The second color for this entry.</param>
+        public ColorData(eBrushTypes brushType, Color color1, Color color2) 
+        {
+            LoadData(brushType, color1, color2, Color.White, 0.0f, 0.0f, 0.5f, 1.0f);
+        }
+
+        /// <summary>
+        /// Creates new instance of the object. 
+        /// </summary>
+        /// <param name="color1">The first color for this entry.</param>
+        /// <param name="color2">The second color for this entry.</param>
+        /// <param name="borderColor">The border color for this entry.</param>
+        /// <param name="borderWidth">The border width for this entry.</param>
+        public ColorData(eBrushTypes brushType, Color color1, Color color2, Color borderColor, float borderWidth)
+        {
+            LoadData(brushType, color1, color2, borderColor, borderWidth, 0.0f, 0.5f, 1.0f);
+        }
+
+        /// <summary>
+        /// Creates new instance of the object. 
+        /// </summary>
+        /// <param name="color1">The first color for this entry.</param>
+        /// <param name="color2">The second color for this entry.</param>
+        /// <param name="borderColor">The border color for this entry.</param>
+        /// <param name="borderWidth">The border width for this entry.</param>
+        /// <param name="brushAngle">The gradient angle.</param>
+        public ColorData(eBrushTypes brushType, Color color1, Color color2, Color borderColor, float borderWidth, float brushAngle)
+        {
+            LoadData(brushType, color1, color2, borderColor, borderWidth, brushAngle, 0.5f, 1.0f);
+        }
+
+        /// <summary>
+        /// Creates new instance of the object. 
+        /// </summary>
+        /// <param name="color1">The first color for this entry.</param>
+        /// <param name="color2">The second color for this entry.</param>
+        /// <param name="borderColor">The border color for this entry.</param>
+        /// <param name="borderWidth">The border width for this entry.</param>
+        /// <param name="brushSBSFocus">The focus for the SigmaBellShape.</param>
+        /// <param name="brushSBSScale">The scale for the SigmaBellShape.</param>
+        public ColorData(eBrushTypes brushType, Color color1, Color color2, Color borderColor, float borderWidth, float brushSBSFocus, float brushSBSScale)
+        {
+            LoadData(brushType, color1, color2, borderColor, borderWidth, 0.0f, brushSBSFocus, brushSBSScale);
+        }
+
+        /// <summary>
+        /// Loads data into the class, called by constructors. 
+        /// </summary>
+        /// <param name="color1">The first color for this entry.</param>
+        /// <param name="color2">The second color for this entry.</param>
+        /// <param name="borderColor">The border color for this entry.</param>
+        /// <param name="borderWidth">The border width for this entry.</param>
+        /// <param name="brushSBSFocus">The focus for the SigmaBellShape.</param>
+        /// <param name="brushSBSScale">The scale for the SigmaBellShape.</param>
+        protected void LoadData(eBrushTypes brushType, Color color1, Color color2, Color borderColor, float borderWidth, float brushAngle, float brushSBSFocus, float brushSBSScale)
+        {
+            _BorderColor = borderColor;
+            _BorderWidth = borderWidth;
+            _Color1 = color1;
+            _Color2 = color2;
+            _BrushType = brushType;
+            _BrushAngle = brushAngle;
+            _BrushSBSFocus = brushSBSFocus;
+            _BrushSBSScale = brushSBSScale;
+        }
+
+        /// <summary>
+        /// Creates Pen object using the BorderColor and BorderWidth properties.
+        /// </summary>
+        public Pen GetBorderPen(float scaleFactor, PenAlignment penAlignment)
+        {
+            Pen pen = new Pen(_BorderColor, (float)Math.Round(_BorderWidth * scaleFactor, 0));
+            pen.Alignment = penAlignment;
+            return pen;
+        }
+
+        /// <summary>
+        /// Creates a brush of the type specified by BrushType.
+        /// </summary>
+        /// <param name="path">The graphics path used to construct the brush.</param>
+        public Brush GetBrush(GraphicsPath path)
+        {
+            return GetBrush(path, new PointF(0.5f, 0.5f), _BrushAngle);
+        }
+
+        /// <summary>
+        /// Creates a brush of the type specified by BrushType.
+        /// </summary>
+        /// <param name="path">The graphics path used to construct the brush.</param>
+        /// <param name="angle">The angle used for the gradients, allowing an override of BrushAngle</param>
+        public Brush GetBrush(GraphicsPath path, float angle)
+        {
+            return GetBrush(path, new PointF(0.5f, 0.5f), angle);
+        }
+
+        /// <summary>
+        /// Creates a brush of the type specified by BrushType.
+        /// </summary>
+        /// <param name="path">The graphics path used to construct the brush.</param>
+        /// <param name="center">The center point of the gradient as a percentage value typically ranging from 0.0 to 1.0.</param>
+        public Brush GetBrush(GraphicsPath path, PointF center)
+        {
+            return GetBrush(path, center, _BrushAngle);
+        }
+
+        /// <summary>
+        /// Creates a brush of the type specified by BrushType.
+        /// </summary>
+        /// <param name="path">The graphics path used to construct the brush.</param>
+        /// <param name="center">The center point of the gradient as a percentage value typically ranging from 0.0 to 1.0.</param>
+        /// <param name="angle">The angle used for the gradients, allowing an override of BrushAngle</param>
+        public Brush GetBrush(GraphicsPath path, PointF center, float angle)
+        {
+            RectangleF rect;
+            switch (_BrushType)
+            {
+                case eBrushTypes.Solid:
+                    return new SolidBrush(_Color1);
+                case eBrushTypes.Linear:
+                    path.Flatten();
+                    rect = path.GetBounds();
+                    if (rect.Width > 0.0f && rect.Height > 0.0f)
+                        return new LinearGradientBrush(path.GetBounds(), _Color1, _Color2, angle, false);
+                    else
+                        return null;
+                case eBrushTypes.Reflected:
+                    LinearGradientBrush lBrush = new LinearGradientBrush(path.GetBounds(), _Color1, _Color2, angle, false);
+                    lBrush.SetSigmaBellShape(_BrushSBSFocus, _BrushSBSScale);
+                    return lBrush;
+                case eBrushTypes.Centered:
+                    PointF pt = new PointF();
+                    rect = path.GetBounds();
+                    PathGradientBrush pBrush = new PathGradientBrush(path);
+                    pt.X = rect.X + rect.Width * center.X;
+                    pt.Y = rect.Y + rect.Height * center.Y;
+                    pBrush.CenterPoint = pt;
+                    pBrush.CenterColor = _Color1;
+                    pBrush.SurroundColors = new Color[] { _Color2 };
+                    return pBrush;
+                default:
+                    return new SolidBrush(_Color1);
+            }
+        }
+
+        /// <summary>
+        /// Creates SolidBrushObject using Color1.
+        /// </summary>
+        public Brush GetSolidBrush()
+        {
+            return new SolidBrush(_Color1);
+        }
+
+        /// <summary>
+        /// Creates a LinearGradientBrush object.
+        /// </summary>
+        /// <param name="path">The graphics path used to construct the brush.</param>
+        /// <param name="angle">The gradient angle.</param>
+        public LinearGradientBrush GetLinearBrush(GraphicsPath path, int angle)
+        {
+            return new LinearGradientBrush(path.GetBounds(), _Color1, _Color2, angle, false);
+        }
+
+        /// <summary>
+        /// Creates a PathGradientBrush object.
+        /// </summary>
+        /// <param name="path">The graphics path used to construct the brush.</param>
+        /// <param name="center">The center point of the gradient.</param>
+        public PathGradientBrush GetCenteredBrush(GraphicsPath path, PointF center)
+        {
+            PathGradientBrush brush;
+
+            brush = new PathGradientBrush(path);
+            brush.CenterPoint = center;
+            brush.CenterColor = _Color1;
+            brush.SurroundColors = new Color[] { _Color2 };
+
+            return brush;
+        }
+
+        /// <summary>
+        /// Creates a LinearGradientBrush object.
+        /// </summary>
+        /// <param name="path">The graphics path used to construct the brush.</param>
+        /// <param name="angle">The gradient angle.</param>
+        public LinearGradientBrush GetReflectedBrush(GraphicsPath path, int angle)
+        {
+            return GetReflectedBrush(path, angle, 0.5f, 1.0f);
+        }
+
+        /// <summary>
+        /// Creates a LinearGradientBrush object.
+        /// </summary>
+        /// <param name="path">The graphics path used to construct the brush.</param>
+        /// <param name="angle">The gradient angle.</param>
+        /// <param name="focus">The focus for the SigmaBellShape.</param>
+        public LinearGradientBrush GetReflectedBrush(GraphicsPath path, int angle, float focus)
+        {
+            return GetReflectedBrush(path, angle, focus, 1.0f);
+        }
+
+        /// <summary>
+        /// Creates a LinearGradientBrush object.
+        /// </summary>
+        /// <param name="path">The graphics path used to construct the brush.</param>
+        /// <param name="angle">The gradient angle.</param>
+        /// <param name="focus">The focus for the SigmaBellShape.</param>
+        /// <param name="scale">The scale for the SigmaBellShape.</param>
+        public LinearGradientBrush GetReflectedBrush(GraphicsPath path, int angle, float focus, float scale)
+        {
+            LinearGradientBrush brush = new LinearGradientBrush(path.GetBounds(), _Color1, _Color2, angle, false);
+            brush.SetSigmaBellShape(focus, scale);
+            return brush;
+        }
+
+        /// <summary>
+        /// Raises the PropertyChanged event.
+        /// </summary>
+        /// <param name="e">Event arguments</param>
+        protected virtual void OnPropertyChanged(PropertyChangedEventArgs e)
+        {
+            if (PropertyChanged != null)
+                PropertyChanged(this, e);
+        }
+    }
+
+    /// <summary>
+    /// Enumeration containing predefined brush types for the ColorData class.
+    /// </summary>
+    public enum eBrushTypes
+    {
+        /// <summary>
+        /// Solid brush.
+        /// </summary>
+        Solid,
+        /// <summary>
+        /// Linear gradient brush.
+        /// </summary>
+        Linear,
+
+        /// <summary>
+        /// Centered path gradient brush.
+        /// </summary>
+        Centered,
+
+        /// <summary>
+        /// Reflected linear gradient brush.
+        /// </summary>
+        Reflected
+    }
+
+}
diff --git a/PROMS/DotNetBar Source Code/AnalogClock/MathHelper.cs b/PROMS/DotNetBar Source Code/AnalogClock/MathHelper.cs
new file mode 100644
index 00000000..cf4d9307
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AnalogClock/MathHelper.cs	
@@ -0,0 +1,30 @@
+using System;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Math helper class
+    /// </summary>
+    internal static class MathHelper
+    {
+        /// <summary>
+        /// Converts radians to degrees.
+        /// </summary>
+        /// <param name="radians">Value to be converted in radians.</param>
+        /// <returns>Converted value in degrees.</returns>
+        public static double GetDegrees(double radians)
+        {
+            return radians * (180.0 / Math.PI);
+        }
+
+        /// <summary>
+        /// Converts degrees to radians.
+        /// </summary>
+        /// <param name="degrees">Value to be converted in degrees.</param>
+        /// <returns>Converted value in radians.</returns>
+        public static double GetRadians(double degrees)
+        {
+            return degrees * (Math.PI / 180.0);
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Animation/Animation.cs b/PROMS/DotNetBar Source Code/Animation/Animation.cs
new file mode 100644
index 00000000..f3776b70
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Animation/Animation.cs	
@@ -0,0 +1,772 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Reflection;
+using System.ComponentModel;
+using System.Windows.Forms;
+using DevComponents.DotNetBar;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Animation
+{
+    internal abstract class Animation : Component
+    {
+        #region Events
+        /// <summary>
+        /// Occurs after animation has completed.
+        /// </summary>
+        public event EventHandler AnimationCompleted;
+        /// <summary>
+        /// Raises AnimationCompleted event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnAnimationCompleted(EventArgs e)
+        {
+            EventHandler handler = AnimationCompleted;
+            if (handler != null)
+                handler(this, e);
+        }
+        #endregion
+
+        #region Constructor
+        private BackgroundWorker _Worker = null;
+        private AnimationEasing _EasingFunction = AnimationEasing.EaseOutQuad;
+        private double _Duration = 300;
+        private EasingFunctionDelegate[] _AnimationFunctions;
+        private List<AnimationRequest> _AnimationList = new List<AnimationRequest>();
+
+        /// <summary>
+        /// Initializes a new instance of the Animation class.
+        /// </summary>
+        /// <param name="target">Target object for animation</param>
+        /// <param name="targetPropertyName">Target property name for animation</param>
+        public Animation(AnimationEasing animationEasing, int animationDuration)
+            :
+            this(new AnimationRequest[0], animationEasing, animationDuration)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the Animation class.
+        /// </summary>
+        /// <param name="target">Target object for animation</param>
+        /// <param name="targetPropertyName">Target property name for animation</param>
+        public Animation(AnimationRequest animationRequest, AnimationEasing animationEasing, int animationDuration)
+            :
+            this(new AnimationRequest[] { animationRequest }, animationEasing, animationDuration)
+        {
+        }
+        /// <summary>
+        /// Initializes a new instance of the Animation class.
+        /// </summary>
+        /// <param name="target">Target object for animation</param>
+        /// <param name="targetPropertyName">Target property name for animation</param>
+        public Animation(AnimationRequest[] animationRequests, AnimationEasing animationEasing, int animationDuration)
+        {
+            if (animationRequests != null && animationRequests.Length > 0)
+                _AnimationList.AddRange(animationRequests);
+            _EasingFunction = animationEasing;
+            _Duration = (int)animationDuration;
+            InitializeAnimationFunctions();
+        }
+
+        private void InitializeAnimationFunctions()
+        {
+            _AnimationFunctions = new EasingFunctionDelegate[28];
+            _AnimationFunctions[(int)AnimationEasing.EaseInBounce] = new EasingFunctionDelegate(EaseInBounce);
+            _AnimationFunctions[(int)AnimationEasing.EaseInCirc] = new EasingFunctionDelegate(EaseInCirc);
+            _AnimationFunctions[(int)AnimationEasing.EaseInCubic] = new EasingFunctionDelegate(EaseInCubic);
+            _AnimationFunctions[(int)AnimationEasing.EaseInElastic] = new EasingFunctionDelegate(EaseInElastic);
+            _AnimationFunctions[(int)AnimationEasing.EaseInExpo] = new EasingFunctionDelegate(EaseInExpo);
+            _AnimationFunctions[(int)AnimationEasing.EaseInOutBounce] = new EasingFunctionDelegate(EaseInOutBounce);
+            _AnimationFunctions[(int)AnimationEasing.EaseInOutCirc] = new EasingFunctionDelegate(EaseInOutCirc);
+            _AnimationFunctions[(int)AnimationEasing.EaseInOutCubic] = new EasingFunctionDelegate(EaseInOutCubic);
+            _AnimationFunctions[(int)AnimationEasing.EaseInOutElastic] = new EasingFunctionDelegate(EaseInOutElastic);
+            _AnimationFunctions[(int)AnimationEasing.EaseInOutExpo] = new EasingFunctionDelegate(EaseInOutExpo);
+            _AnimationFunctions[(int)AnimationEasing.EaseInOutQuad] = new EasingFunctionDelegate(EaseInOutQuad);
+            _AnimationFunctions[(int)AnimationEasing.EaseInOutQuart] = new EasingFunctionDelegate(EaseInOutQuart);
+            _AnimationFunctions[(int)AnimationEasing.EaseInOutQuint] = new EasingFunctionDelegate(EaseInOutQuint);
+            _AnimationFunctions[(int)AnimationEasing.EaseInOutSine] = new EasingFunctionDelegate(EaseInOutSine);
+            _AnimationFunctions[(int)AnimationEasing.EaseInQuad] = new EasingFunctionDelegate(EaseInQuad);
+            _AnimationFunctions[(int)AnimationEasing.EaseInQuart] = new EasingFunctionDelegate(EaseInQuart);
+            _AnimationFunctions[(int)AnimationEasing.EaseInQuint] = new EasingFunctionDelegate(EaseInQuint);
+            _AnimationFunctions[(int)AnimationEasing.EaseInSine] = new EasingFunctionDelegate(EaseInSine);
+            _AnimationFunctions[(int)AnimationEasing.EaseOutBounce] = new EasingFunctionDelegate(EaseOutBounce);
+            _AnimationFunctions[(int)AnimationEasing.EaseOutCirc] = new EasingFunctionDelegate(EaseOutCirc);
+            _AnimationFunctions[(int)AnimationEasing.EaseOutCubic] = new EasingFunctionDelegate(EaseOutCubic);
+            _AnimationFunctions[(int)AnimationEasing.EaseOutElastic] = new EasingFunctionDelegate(EaseOutElastic);
+            _AnimationFunctions[(int)AnimationEasing.EaseOutExpo] = new EasingFunctionDelegate(EaseOutExpo);
+            _AnimationFunctions[(int)AnimationEasing.EaseOutQuad] = new EasingFunctionDelegate(EaseOutQuad);
+            _AnimationFunctions[(int)AnimationEasing.EaseOutQuart] = new EasingFunctionDelegate(EaseOutQuart);
+            _AnimationFunctions[(int)AnimationEasing.EaseOutQuint] = new EasingFunctionDelegate(EaseOutQuint);
+            _AnimationFunctions[(int)AnimationEasing.EaseOutSine] = new EasingFunctionDelegate(EaseOutSine);
+            _AnimationFunctions[(int)AnimationEasing.Linear] = new EasingFunctionDelegate(Linear);
+
+        }
+        #endregion
+
+        #region Implementation
+        private bool _AutoDispose = false;
+        /// <summary>
+        /// Gets or sets whether animation is auto-disposed once its completed. Default value is false.
+        /// </summary>
+        public bool AutoDispose
+        {
+            get { return _AutoDispose; }
+            set
+            {
+                _AutoDispose = value;
+            }
+        }
+
+        public List<AnimationRequest> Animations
+        {
+            get
+            {
+                return _AnimationList;
+            }
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            //Console.WriteLine("{0} Animation DISPOSED", DateTime.Now);
+            Stop();
+            _IsDisposed = true;
+            base.Dispose(disposing);
+        }
+
+        private bool _IsDisposed = false;
+        public bool IsDisposed
+        {
+            get { return _IsDisposed; }
+            internal set
+            {
+                _IsDisposed = value;
+            }
+        }
+
+        /// <summary>
+        /// Stops animation if one is currently running.
+        /// </summary>
+        public void Stop()
+        {
+            BackgroundWorker worker = _Worker;
+            if (worker != null)
+            {
+                worker.DoWork -= new DoWorkEventHandler(WorkerDoWork);
+                worker.RunWorkerCompleted -= new RunWorkerCompletedEventHandler(RunWorkerCompleted);
+                worker.CancelAsync();
+                worker.Dispose();
+                _Worker = null;
+            }
+        }
+
+        public void Start()
+        {
+            Start(_AnimationList.ToArray());
+        }
+
+        protected void Start(AnimationRequest[] requests)
+        {
+            if (_Worker != null)
+                throw new InvalidOperationException("Animation is already running animations");
+            //Console.WriteLine("{0} Animation Started", DateTime.Now);
+            _IsCompleted = false;
+            _Worker = new BackgroundWorker();
+            _Worker.WorkerSupportsCancellation = true;
+            _Worker.DoWork += new DoWorkEventHandler(WorkerDoWork);
+            _Worker.RunWorkerCompleted += new RunWorkerCompletedEventHandler(RunWorkerCompleted);
+            _Worker.RunWorkerAsync(requests);
+        }
+
+        private void RunWorkerCompleted(object sender, RunWorkerCompletedEventArgs e)
+        {
+            //Console.WriteLine(string.Format("{0}  RunWorkerCompleted", DateTime.Now));
+            BackgroundWorker worker = _Worker;
+            _Worker = null;
+            if (worker != null)
+            {
+                worker.DoWork -= new DoWorkEventHandler(WorkerDoWork);
+                worker.RunWorkerCompleted -= new RunWorkerCompletedEventHandler(RunWorkerCompleted);
+                worker.Dispose();
+            }
+
+            _IsCompleted = true;
+            OnAnimationCompleted(EventArgs.Empty);
+
+            if (_AutoDispose)
+                this.Dispose();
+        }
+
+        protected virtual void SetTargetPropertyValue(object target, PropertyInfo property, object value)
+        {
+            Control c = target as Control;
+            if (c != null)
+            {
+                c.Invoke(new MethodInvoker(delegate
+                {
+                    property.SetValue(target, value, null);
+                    if (c.Parent != null)
+                        c.Parent.Update();
+                    else
+                        c.Update();
+                }));
+            }
+            else if (target is BaseItem)
+            {
+                if (_AnimationUpdateControl != null)
+                    _AnimationUpdateControl.Invoke(new MethodInvoker(delegate { property.SetValue(target, value, null); if (value is Rectangle) _AnimationUpdateControl.Invalidate(); }));
+                else
+                {
+                    if (target is DevComponents.DotNetBar.Metro.MetroTileItem && property.Name == "CurrentFrameOffset")
+                        ((DevComponents.DotNetBar.Metro.MetroTileItem)target).CurrentFrameOffset = (int)value;
+                    else
+                        property.SetValue(target, value, null);
+                }
+            }
+            else
+            {
+                property.SetValue(target, value, null);
+            }
+        }
+        protected abstract object GetPropertyValueCorrectType(double value);
+
+        protected virtual void WorkerDoWork(object sender, DoWorkEventArgs e)
+        {
+            AnimationRequest[] requests = (AnimationRequest[])e.Argument;
+            double elapsedTime = 0;
+            DateTime startTime = DateTime.UtcNow;
+            double duration = _Duration;
+
+            bool firstPass = true;
+
+            if (_FixedStepCount <= 0)
+            {
+                while (elapsedTime <= duration)
+                {
+                    try
+                    {
+                        foreach (AnimationRequest request in requests)
+                        {
+                            double toValue = request.GetToValue();
+                            double fromValue = request.GetFromValue();
+                            double change = toValue - fromValue;
+
+                            if (firstPass)
+                                SetTargetPropertyValue(request.Target, request.Property, request.From);
+
+                            double r = _AnimationFunctions[(int)_EasingFunction](elapsedTime, fromValue, change, duration);
+                            if (change < 0 && r < toValue || change > 0 && r > toValue) { r = toValue; e.Cancel = true; break; }
+                            if (change < 0 && r > fromValue || change > 0 && r < fromValue) r = fromValue;
+
+                            SetTargetPropertyValue(request.Target, request.Property, GetPropertyValueCorrectType(r));
+                            elapsedTime = DateTime.UtcNow.Subtract(startTime).TotalMilliseconds;
+                            if (e.Cancel) break;
+                        }
+
+                        if (e.Cancel) break;
+
+                        ExecuteStepUpdateMethod();
+
+                        if (_AnimationUpdateControl != null)
+                        {
+                            if (_AnimationUpdateControl.InvokeRequired)
+                                _AnimationUpdateControl.BeginInvoke(new MethodInvoker(delegate { _AnimationUpdateControl.Update(); }));
+                            else
+                                _AnimationUpdateControl.Update();
+                        }
+                        if (e.Cancel) break;
+                        firstPass = false;
+                    }
+                    catch (TargetInvocationException exc)
+                    {
+                        if (exc.InnerException is ObjectDisposedException) // Stop work if target has been disposed
+                            return;
+                        throw;
+                    }
+                }
+            }
+            else
+            {
+                try
+                {
+                    for (int i = 0; i < _FixedStepCount; i++)
+                    {
+                        foreach (AnimationRequest request in requests)
+                        {
+                            double toValue = request.GetToValue();
+                            double fromValue = request.GetFromValue();
+                            double change = toValue - fromValue;
+                            double step = change / _FixedStepCount;
+
+                            if (firstPass)
+                                SetTargetPropertyValue(request.Target, request.Property, request.From);
+
+                            double r = fromValue + step * (i + 1);
+                            if (change < 0 && r < toValue || change > 0 && r > toValue) { r = toValue; e.Cancel = true; break; }
+                            if (change < 0 && r > fromValue || change > 0 && r < fromValue) r = fromValue;
+
+                            SetTargetPropertyValue(request.Target, request.Property, GetPropertyValueCorrectType(r));
+                            if (e.Cancel) break;
+                            if (_Duration > 0)
+                            {
+                                try
+                                {
+                                    using (
+                                        System.Threading.ManualResetEvent wait =
+                                            new System.Threading.ManualResetEvent(false))
+                                        wait.WaitOne((int) _Duration);
+
+                                    //System.Threading.Thread.Sleep((int)_Duration);
+                                }
+                                catch
+                                {
+                                    break;
+                                }
+
+                            }
+                        }
+
+                        if (e.Cancel) break;
+
+                        ExecuteStepUpdateMethod();
+
+                        if (_AnimationUpdateControl != null)
+                            _AnimationUpdateControl.Update();
+                        if (e.Cancel) break;
+                        firstPass = false;
+                    }
+                }
+                catch (TargetInvocationException exc)
+                {
+                    if (exc.InnerException is ObjectDisposedException) // Stop work if target has been disposed
+                        return;
+                    throw;
+                }
+            }
+            // Make sure final to value is assigned
+            foreach (AnimationRequest request in requests)
+            {
+                try
+                {
+                    SetTargetPropertyValue(request.Target, request.Property, request.To);
+                }
+                catch (TargetInvocationException exc)
+                {
+                    if (exc.InnerException is ObjectDisposedException) // Stop work if target has been disposed
+                        continue;
+                    throw;
+                }
+            }
+            //System.Diagnostics.Debug.WriteLine(string.Format("{0}  WorkerDoWork DONE", DateTime.Now));
+        }
+        private bool _IsCompleted;
+        /// <summary>
+        /// Gets whether animation run is complete.
+        /// </summary>
+        public bool IsCompleted
+        {
+            get { return _IsCompleted; }
+        }
+        /// <summary>
+        /// Gets the animation duration in milliseconds.
+        /// </summary>
+        public double Duration
+        {
+            get { return _Duration; }
+            internal set
+            {
+                _Duration = value;
+            }
+        }
+        /// <summary>
+        /// Gets the animation easing function.
+        /// </summary>
+        public AnimationEasing EasingFunction
+        {
+            get
+            {
+                return _EasingFunction;
+            }
+        }
+
+        protected EasingFunctionDelegate[] AnimationFunctions
+        {
+            get
+            {
+                return _AnimationFunctions;
+            }
+        }
+
+        protected virtual void ExecuteStepUpdateMethod()
+        {
+            if (_StepUpdateMethod != null)
+                _StepUpdateMethod.DynamicInvoke(null);
+        }
+
+        private Delegate _StepUpdateMethod = null;
+        /// <summary>
+        /// Sets the method which is called each time value on target object property is set. This method may execute the visual updates on animation client.
+        /// </summary>
+        /// <param name="method">Method to call</param>
+        public void SetStepUpdateMethod(Delegate method)
+        {
+            _StepUpdateMethod = method;
+        }
+
+        protected delegate double EasingFunctionDelegate(double t, double b, double c, double d);
+
+        private Control _AnimationUpdateControl;
+        public Control AnimationUpdateControl
+        {
+            get { return _AnimationUpdateControl; }
+            set { _AnimationUpdateControl = value; }
+        }
+
+        private int _FixedStepCount = 0;
+        /// <summary>
+        /// Gets or sets the number of fixed steps animation will perform from star to finish instead of using the easing function in time.
+        /// Stepped animation executes specified number of steps always with Duration specifying delays between each step.
+        /// </summary>
+        public int FixedStepCount
+        {
+            get { return _FixedStepCount; }
+            set
+            {
+                _FixedStepCount = value;
+            }
+        }
+        #endregion
+
+        #region Easing Functions
+        private double EaseInOutQuad(double t, double b, double c, double d)
+        {
+            if ((t /= d / 2) < 1) return c / 2 * t * t + b;
+            return -c / 2 * ((--t) * (t - 2) - 1) + b;
+        }
+        private double EaseInQuad(double t, double b, double c, double d)
+        {
+            return c * (t /= d) * t + b;
+        }
+        private double EaseOutQuad(double t, double b, double c, double d)
+        {
+            return -c * (t /= d) * (t - 2) + b;
+        }
+        private double EaseInCubic(double t, double b, double c, double d)
+        {
+            return c * (t /= d) * t * t + b;
+        }
+        private double EaseOutCubic(double t, double b, double c, double d)
+        {
+            return c * ((t = t / d - 1) * t * t + 1) + b;
+        }
+        private double EaseInOutCubic(double t, double b, double c, double d)
+        {
+            if ((t /= d / 2) < 1) return c / 2 * t * t * t + b;
+            return c / 2 * ((t -= 2) * t * t + 2) + b;
+        }
+        private double EaseInQuart(double t, double b, double c, double d)
+        {
+            return c * (t /= d) * t * t * t + b;
+        }
+        private double EaseOutQuart(double t, double b, double c, double d)
+        {
+            return -c * ((t = t / d - 1) * t * t * t - 1) + b;
+        }
+        private double EaseInOutQuart(double t, double b, double c, double d)
+        {
+            if ((t /= d / 2) < 1) return c / 2 * t * t * t * t + b;
+            return -c / 2 * ((t -= 2) * t * t * t - 2) + b;
+        }
+        private double EaseInQuint(double t, double b, double c, double d)
+        {
+            return c * (t /= d) * t * t * t * t + b;
+        }
+        private double EaseOutQuint(double t, double b, double c, double d)
+        {
+            return c * ((t = t / d - 1) * t * t * t * t + 1) + b;
+        }
+        private double EaseInOutQuint(double t, double b, double c, double d)
+        {
+            if ((t /= d / 2) < 1) return c / 2 * t * t * t * t * t + b;
+            return c / 2 * ((t -= 2) * t * t * t * t + 2) + b;
+        }
+        private double EaseInSine(double t, double b, double c, double d)
+        {
+            return -c * Math.Cos(t / d * (Math.PI / 2)) + c + b;
+        }
+        private double EaseOutSine(double t, double b, double c, double d)
+        {
+            return c * Math.Sin(t / d * (Math.PI / 2)) + b;
+        }
+        private double EaseInOutSine(double t, double b, double c, double d)
+        {
+            return -c / 2 * (Math.Cos(Math.PI * t / d) - 1) + b;
+        }
+        private double EaseInExpo(double t, double b, double c, double d)
+        {
+            return (t == 0) ? b : c * Math.Pow(2, 10 * (t / d - 1)) + b;
+        }
+        private double EaseOutExpo(double t, double b, double c, double d)
+        {
+            return (t == d) ? b + c : c * (-Math.Pow(2, -10 * t / d) + 1) + b;
+        }
+        private double EaseInOutExpo(double t, double b, double c, double d)
+        {
+            if (t == 0) return b;
+            if (t == d) return b + c;
+            if ((t /= d / 2) < 1) return c / 2 * Math.Pow(2, 10 * (t - 1)) + b;
+            return c / 2 * (-Math.Pow(2, -10 * --t) + 2) + b;
+        }
+        private double EaseInCirc(double t, double b, double c, double d)
+        {
+            return -c * (Math.Sqrt(1 - (t /= d) * t) - 1) + b;
+        }
+        private double EaseOutCirc(double t, double b, double c, double d)
+        {
+            return c * Math.Sqrt(1 - (t = t / d - 1) * t) + b;
+        }
+        private double EaseInOutCirc(double t, double b, double c, double d)
+        {
+            if ((t /= d / 2) < 1) return -c / 2 * (Math.Sqrt(1 - t * t) - 1) + b;
+            return c / 2 * (Math.Sqrt(1 - (t -= 2) * t) + 1) + b;
+        }
+        private double EaseInElastic(double t, double b, double c, double d)
+        {
+            double s = 1.70158;
+            double p = 0;
+            double a = c;
+            if (t == 0)
+                return b;
+            if ((t /= d) == 1)
+                return b + c;
+            if (p == 0)
+                p = d * .3;
+            if (a < Math.Abs(c))
+            {
+                a = c;
+                s = p / 4;
+            }
+            else
+                s = p / (2 * Math.PI) * Math.Asin(c / a);
+            return -(a * Math.Pow(2, 10 * (t -= 1)) * Math.Sin((t * d - s) * (2 * Math.PI) / p)) + b;
+        }
+        private double EaseOutElastic(double t, double b, double c, double d)
+        {
+            double s = 1.70158;
+            double p = 0;
+            double a = c;
+            if (t == 0)
+                return b;
+            if ((t /= d) == 1)
+                return b + c;
+            if (p == 0) p = d * .3;
+            if (a < Math.Abs(c))
+            {
+                a = c;
+                s = p / 4;
+            }
+            else
+                s = p / (2 * Math.PI) * Math.Asin(c / a);
+            return a * Math.Pow(2, -10 * t) * Math.Sin((t * d - s) * (2 * Math.PI) / p) + c + b;
+        }
+        private double EaseInOutElastic(double t, double b, double c, double d)
+        {
+            double s = 1.70158;
+            double p = 0;
+            double a = c;
+            if (t == 0)
+                return b;
+            if ((t /= d / 2) == 2)
+                return b + c;
+            if (p == 0)
+                p = d * (.3 * 1.5);
+            if (a < Math.Abs(c))
+            {
+                a = c;
+                s = p / 4;
+            }
+            else
+                s = p / (2 * Math.PI) * Math.Asin(c / a);
+            if (t < 1)
+                return -.5 * (a * Math.Pow(2, 10 * (t -= 1)) * Math.Sin((t * d - s) * (2 * Math.PI) / p)) + b;
+            return a * Math.Pow(2, -10 * (t -= 1)) * Math.Sin((t * d - s) * (2 * Math.PI) / p) * .5 + c + b;
+        }
+
+        private double EaseInBounce(double t, double b, double c, double d)
+        {
+            return c - EaseOutBounce(d - t, 0, c, d) + b;
+        }
+        private double EaseOutBounce(double t, double b, double c, double d)
+        {
+            if ((t /= d) < (1 / 2.75))
+            {
+                return c * (7.5625 * t * t) + b;
+            }
+            else if (t < (2 / 2.75))
+            {
+                return c * (7.5625 * (t -= (1.5 / 2.75)) * t + .75) + b;
+            }
+            else if (t < (2.5 / 2.75))
+            {
+                return c * (7.5625 * (t -= (2.25 / 2.75)) * t + .9375) + b;
+            }
+            else
+            {
+                return c * (7.5625 * (t -= (2.625 / 2.75)) * t + .984375) + b;
+            }
+        }
+        private double EaseInOutBounce(double t, double b, double c, double d)
+        {
+            if (t < d / 2) return EaseInBounce(t * 2, 0, c, d) * .5 + b;
+            return EaseOutBounce(t * 2 - d, 0, c, d) * .5 + c * .5 + b;
+        }
+
+        private double Linear(double t, double b, double c, double d)
+        {
+            return (t / d) * c + b;
+        }
+        #endregion
+    }
+
+    internal class AnimationRequest
+    {
+        private PropertyInfo _TargetProperty = null;
+
+        /// <summary>
+        /// Initializes a new instance of the AnimationRequest class.
+        /// </summary>
+        /// <param name="target">Target object for animation.</param>
+        /// <param name="targetPropertyName">Target property name for animation.</param>
+        /// <param name="from">From value.</param>
+        /// <param name="to">To value.</param>
+        public AnimationRequest(object target, string targetPropertyName, object to)
+        {
+            _TargetProperty = target.GetType().GetProperty(targetPropertyName);
+            _Target = target;
+            From = _TargetProperty.GetValue(target, null);
+            To = to;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the AnimationRequest class.
+        /// </summary>
+        /// <param name="target">Target object for animation.</param>
+        /// <param name="targetPropertyName">Target property name for animation.</param>
+        /// <param name="from">From value.</param>
+        /// <param name="to">To value.</param>
+        public AnimationRequest(object target, string targetPropertyName, object from, object to)
+        {
+            _TargetProperty = target.GetType().GetProperty(targetPropertyName);
+            _Target = target;
+            From = from;
+            To = to;
+        }
+
+        private object _Target;
+        /// <summary>
+        /// Target object for animation.
+        /// </summary>
+        public object Target
+        {
+            get { return _Target; }
+            set { _Target = value; }
+        }
+
+        private object _From;
+        /// <summary>
+        /// Animation from value.
+        /// </summary>
+        public object From
+        {
+            get { return _From; }
+            set
+            {
+                _From = value;
+                _FromValue = GetDoubleValue(value);
+            }
+        }
+
+        private object _To;
+        /// <summary>
+        /// Animation to value.
+        /// </summary>
+        public object To
+        {
+            get { return _To; }
+            set
+            {
+                _To = value;
+                _ToValue = GetDoubleValue(value);
+            }
+        }
+
+        private static double GetDoubleValue(object value)
+        {
+            if (value is int)
+                return (double)(int)value;
+            else if (value is double)
+                return (double)value;
+            else if (value is long)
+                return (double)(long)value;
+            else if (value is float)
+                return (double)(float)value;
+
+            return double.NaN;
+        }
+
+        internal PropertyInfo Property
+        {
+            get
+            {
+                return _TargetProperty;
+            }
+        }
+
+        private double _ToValue = double.NaN;
+        internal double GetToValue()
+        {
+            return _ToValue;
+        }
+        private double _FromValue = double.NaN;
+        internal double GetFromValue()
+        {
+            return _FromValue;
+        }
+
+    }
+    /// <summary>
+    /// Specifies the animation easing function
+    /// </summary>
+    public enum AnimationEasing : int
+    {
+        EaseInOutQuad = 0,
+        EaseInQuad = 1,
+        EaseOutQuad = 2,
+        EaseInCubic = 3,
+        EaseOutCubic = 4,
+        EaseInOutCubic = 5,
+        EaseInQuart = 6,
+        EaseOutQuart = 7,
+        EaseInOutQuart = 8,
+        EaseInQuint = 9,
+        EaseOutQuint = 10,
+        EaseInOutQuint = 11,
+        EaseInSine = 12,
+        EaseOutSine = 13,
+        EaseInOutSine = 14,
+        EaseInExpo = 15,
+        EaseOutExpo = 16,
+        EaseInOutExpo = 17,
+        EaseInCirc = 18,
+        EaseOutCirc = 19,
+        EaseInOutCirc = 20,
+        EaseInElastic = 21,
+        EaseOutElastic = 22,
+        EaseInOutElastic = 23,
+        EaseInBounce = 24,
+        EaseOutBounce = 25,
+        EaseInOutBounce = 26,
+        Linear = 27
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Animation/AnimationDouble.cs b/PROMS/DotNetBar Source Code/Animation/AnimationDouble.cs
new file mode 100644
index 00000000..14dc9453
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Animation/AnimationDouble.cs	
@@ -0,0 +1,46 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace DevComponents.DotNetBar.Animation
+{
+    internal class AnimationDouble : Animation
+    {
+        #region Constructor
+        /// <summary>
+        /// Initializes a new instance of the Animation class.
+        /// </summary>
+        /// <param name="target">Target object for animation</param>
+        /// <param name="targetPropertyName">Target property name for animation</param>
+        public AnimationDouble(AnimationEasing animationEasing, int animationDuration)
+            :
+            base(new AnimationRequest[0], animationEasing, animationDuration)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the Animation class.
+        /// </summary>
+        /// <param name="target">Target object for animation</param>
+        /// <param name="targetPropertyName">Target property name for animation</param>
+        public AnimationDouble(AnimationRequest animationRequest, AnimationEasing animationEasing, int animationDuration)
+            :
+            base(new AnimationRequest[] { animationRequest }, animationEasing, animationDuration)
+        {
+        }
+        /// <summary>
+        /// Initializes a new instance of the Animation class.
+        /// </summary>
+        /// <param name="target">Target object for animation</param>
+        /// <param name="targetPropertyName">Target property name for animation</param>
+        public AnimationDouble(AnimationRequest[] animationRequests, AnimationEasing animationEasing, int animationDuration)
+            :
+            base(animationRequests, animationEasing, animationDuration) { }
+        #endregion
+
+        protected override object GetPropertyValueCorrectType(double value)
+        {
+            return value;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Animation/AnimationInt.cs b/PROMS/DotNetBar Source Code/Animation/AnimationInt.cs
new file mode 100644
index 00000000..d9445eea
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Animation/AnimationInt.cs	
@@ -0,0 +1,49 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace DevComponents.DotNetBar.Animation
+{
+    internal class AnimationInt : Animation
+    {
+        
+        #region Constructor
+        /// <summary>
+        /// Initializes a new instance of the Animation class.
+        /// </summary>
+        /// <param name="target">Target object for animation</param>
+        /// <param name="targetPropertyName">Target property name for animation</param>
+        public AnimationInt(AnimationEasing animationEasing, int animationDuration)
+            :
+            base(new AnimationRequest[0], animationEasing, animationDuration)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the Animation class.
+        /// </summary>
+        /// <param name="target">Target object for animation</param>
+        /// <param name="targetPropertyName">Target property name for animation</param>
+        public AnimationInt(AnimationRequest animationRequest, AnimationEasing animationEasing, int animationDuration)
+            :
+            base(new AnimationRequest[] { animationRequest }, animationEasing, animationDuration)
+        {
+        }
+        /// <summary>
+        /// Initializes a new instance of the Animation class.
+        /// </summary>
+        /// <param name="target">Target object for animation</param>
+        /// <param name="targetPropertyName">Target property name for animation</param>
+        public AnimationInt(AnimationRequest[] animationRequests, AnimationEasing animationEasing, int animationDuration)
+            :
+            base(animationRequests, animationEasing, animationDuration) { }
+        #endregion
+
+        protected override object GetPropertyValueCorrectType(double value)
+        {
+            return (int)value;
+        }
+
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Animation/AnimationPoint.cs b/PROMS/DotNetBar Source Code/Animation/AnimationPoint.cs
new file mode 100644
index 00000000..39b0fd1a
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Animation/AnimationPoint.cs	
@@ -0,0 +1,98 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar.Animation
+{
+    internal class AnimationPoint : Animation
+    {
+        #region Constructor
+        /// <summary>
+        /// Initializes a new instance of the Animation class.
+        /// </summary>
+        /// <param name="target">Target object for animation</param>
+        /// <param name="targetPropertyName">Target property name for animation</param>
+        public AnimationPoint(AnimationEasing animationEasing, int animationDuration)
+            :
+            base(new AnimationRequest[0], animationEasing, animationDuration)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the Animation class.
+        /// </summary>
+        /// <param name="target">Target object for animation</param>
+        /// <param name="targetPropertyName">Target property name for animation</param>
+        public AnimationPoint(AnimationRequest animationRequest, AnimationEasing animationEasing, int animationDuration)
+            :
+            base(new AnimationRequest[] { animationRequest }, animationEasing, animationDuration)
+        {
+        }
+        /// <summary>
+        /// Initializes a new instance of the Animation class.
+        /// </summary>
+        /// <param name="target">Target object for animation</param>
+        /// <param name="targetPropertyName">Target property name for animation</param>
+        public AnimationPoint(AnimationRequest[] animationRequests, AnimationEasing animationEasing, int animationDuration)
+            :
+            base(animationRequests, animationEasing, animationDuration) { }
+        #endregion
+
+        #region Implementation
+        protected override void WorkerDoWork(object sender, DoWorkEventArgs e)
+        {
+            AnimationRequest[] requests = (AnimationRequest[])e.Argument;
+            double elapsedTime = 0;
+            DateTime startTime = DateTime.Now;
+            double duration = Duration;
+
+            bool firstPass = true;
+            while (elapsedTime <= duration)
+            {
+                foreach (AnimationRequest request in requests)
+                {
+                    Point toValue = (Point)request.To;
+                    Point fromValue = (Point)request.From;
+                    Point change = new Point(toValue.X - fromValue.X, toValue.Y - fromValue.Y);
+                    Point newValue = toValue;
+
+                    if (firstPass)
+                        SetTargetPropertyValue(request.Target, request.Property, request.From);
+
+                    if (change.X != 0)
+                        newValue.X = (int)AnimationFunctions[(int)EasingFunction](elapsedTime, fromValue.X, change.X, duration);
+                    if (change.Y != 0)
+                        newValue.Y = (int)AnimationFunctions[(int)EasingFunction](elapsedTime, fromValue.Y, change.Y, duration);
+
+                    SetTargetPropertyValue(request.Target, request.Property, newValue);
+
+                    elapsedTime = DateTime.Now.Subtract(startTime).TotalMilliseconds;
+
+                    if (e.Cancel) return;
+                }
+
+                ExecuteStepUpdateMethod();
+
+                if (AnimationUpdateControl != null)
+                    AnimationUpdateControl.Update();
+
+                firstPass = false;
+            }
+
+            // Make sure final to value is assigned
+            foreach (AnimationRequest request in requests)
+            {
+                SetTargetPropertyValue(request.Target, request.Property, request.To);
+            }
+        }
+
+        protected override object GetPropertyValueCorrectType(double value)
+        {
+            return (int)value;
+        }
+        #endregion
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Animation/AnimationRectangle.cs b/PROMS/DotNetBar Source Code/Animation/AnimationRectangle.cs
new file mode 100644
index 00000000..5f5edc21
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Animation/AnimationRectangle.cs	
@@ -0,0 +1,114 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+using System.ComponentModel;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Animation
+{
+    internal class AnimationRectangle : Animation
+    {
+        #region Constructor
+        /// <summary>
+        /// Initializes a new instance of the Animation class.
+        /// </summary>
+        /// <param name="target">Target object for animation</param>
+        /// <param name="targetPropertyName">Target property name for animation</param>
+        public AnimationRectangle(AnimationEasing animationEasing, int animationDuration)
+            :
+            base(new AnimationRequest[0], animationEasing, animationDuration)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the Animation class.
+        /// </summary>
+        /// <param name="target">Target object for animation</param>
+        /// <param name="targetPropertyName">Target property name for animation</param>
+        public AnimationRectangle(AnimationRequest animationRequest, AnimationEasing animationEasing, int animationDuration)
+            :
+            base(new AnimationRequest[] { animationRequest }, animationEasing, animationDuration)
+        {
+        }
+        /// <summary>
+        /// Initializes a new instance of the Animation class.
+        /// </summary>
+        /// <param name="target">Target object for animation</param>
+        /// <param name="targetPropertyName">Target property name for animation</param>
+        public AnimationRectangle(AnimationRequest[] animationRequests, AnimationEasing animationEasing, int animationDuration)
+            :
+            base(animationRequests, animationEasing, animationDuration) { }
+        #endregion
+
+        #region Implementation
+        protected override void WorkerDoWork(object sender, DoWorkEventArgs e)
+        {
+            AnimationRequest[] requests = (AnimationRequest[])e.Argument;
+            double elapsedTime = 0;
+            DateTime startTime = DateTime.Now;
+            double duration = Duration;
+
+            bool firstPass = true;
+            while (elapsedTime <= duration)
+            {
+                foreach (AnimationRequest request in requests)
+                {
+                    Rectangle toValue = (Rectangle)request.To;
+                    Rectangle fromValue = (Rectangle)request.From;
+                    Rectangle change = new Rectangle(toValue.X - fromValue.X, toValue.Y - fromValue.Y, 
+                        toValue.Width - fromValue.Width, toValue.Height - fromValue.Height);
+                    Rectangle newValue = toValue;
+                    if (IsDisposed(request.Target)) return;
+                    if (firstPass)
+                        SetTargetPropertyValue(request.Target, request.Property, request.From);
+                    
+                    if (change.X != 0)
+                        newValue.X = (int)AnimationFunctions[(int)EasingFunction](elapsedTime, fromValue.X, change.X, duration);
+                    if (change.Y != 0)
+                        newValue.Y = (int)AnimationFunctions[(int)EasingFunction](elapsedTime, fromValue.Y, change.Y, duration);
+                    if (change.Width != 0)
+                        newValue.Width = (int)AnimationFunctions[(int)EasingFunction](elapsedTime, fromValue.Width, change.Width, duration);
+                    if (change.Height != 0)
+                        newValue.Height = (int)AnimationFunctions[(int)EasingFunction](elapsedTime, fromValue.Height, change.Height, duration);
+
+                    SetTargetPropertyValue(request.Target, request.Property, newValue);
+
+                    elapsedTime = DateTime.Now.Subtract(startTime).TotalMilliseconds;
+
+                    if (e.Cancel) return;
+                }
+                
+                ExecuteStepUpdateMethod();
+
+                //if (AnimationUpdateControl != null)
+                //    AnimationUpdateControl.Invoke(new MethodInvoker(delegate { AnimationUpdateControl.Update(); }));
+
+                firstPass = false;
+            }
+
+            // Make sure final to value is assigned
+            foreach (AnimationRequest request in requests)
+            {
+                SetTargetPropertyValue(request.Target, request.Property, request.To);
+            }
+
+            //Console.WriteLine("{0}  WorkerDoWork Complete", DateTime.Now);
+        }
+
+        private bool IsDisposed(object p)
+        {
+            if (p == null) return true;
+            if (p is Control && ((Control)p).IsDisposed) return true;
+            if (p is BaseItem && ((BaseItem)p).IsDisposed) return true;
+            return false;
+        }
+
+        protected override object GetPropertyValueCorrectType(double value)
+        {
+            return (int)value;
+        }
+        #endregion
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Animation/Storyline.cs b/PROMS/DotNetBar Source Code/Animation/Storyline.cs
new file mode 100644
index 00000000..df0d65b2
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Animation/Storyline.cs	
@@ -0,0 +1,155 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel;
+using System.Threading;
+
+namespace DevComponents.DotNetBar.Animation
+{
+    internal class Storyline : Component
+    {
+        #region Events
+
+        #endregion
+
+        #region Constructor
+
+        #endregion
+
+        #region Implementation
+        private bool _IsDisposed = false;
+        /// <summary>
+        /// Returns whether Storyline is disposed.
+        /// </summary>
+        public bool IsDisposed
+        {
+            get
+            {
+                return _IsDisposed;
+            }
+        }
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                BackgroundWorker worker = _Worker;
+                if (worker != null)
+                {
+                    worker.CancelAsync();
+                    worker.Dispose();
+                    _Worker = null;
+                }
+            }
+            _IsDisposed = true;
+            base.Dispose(disposing);
+        }
+
+        private List<Animation> _Animations = new List<Animation>();
+        /// <summary>
+        /// Gets the list of animations to run using this storyline.
+        /// </summary>
+        public List<Animation> Animations
+        {
+            get
+            {
+                return _Animations;
+            }
+        }
+
+        private BackgroundWorker _Worker = null;
+        /// <summary>
+        /// Runs all animations from Animations list.
+        /// </summary>
+        public void Run()
+        {
+            if (_Worker != null)
+                throw new InvalidOperationException("Storyline is already running animations");
+
+            _Worker = new BackgroundWorker();
+            _Worker.WorkerReportsProgress = true;
+            _Worker.WorkerSupportsCancellation = true;
+            _Worker.DoWork += new DoWorkEventHandler(WorkerDoWork);
+            _Worker.RunWorkerCompleted += new RunWorkerCompletedEventHandler(RunWorkerCompleted);
+            _Worker.RunWorkerAsync();
+        }
+
+        void RunWorkerCompleted(object sender, RunWorkerCompletedEventArgs e)
+        {
+            if (_RepeatStoryTimes > 0)
+            {
+                if (_Worker == null)
+                {
+                    _RepeatStoryTimes = 0;
+                    return;
+                }
+
+                _RepeatStoryTimes--;
+                _Worker.RunWorkerAsync();
+            }
+            else
+            {
+                if (_Worker != null)
+                    _Worker.Dispose();
+                _Worker = null;
+                if (_AutoDispose && !_IsDisposed)
+                    this.Dispose();
+            }
+        }
+
+        void WorkerDoWork(object sender, DoWorkEventArgs e)
+        {
+            int count = _Animations.Count;
+            for (int i = 0; i < count; i++)
+            {
+                if (e.Cancel) return;
+                _Animations[i].Start();
+                while (!_Animations[i].IsCompleted)
+                {
+                    try
+                    {
+                        using (
+                                        System.Threading.ManualResetEvent wait =
+                                            new System.Threading.ManualResetEvent(false))
+                            wait.WaitOne(50);
+                        //Thread.Sleep(50);
+                    }
+                    catch 
+                    {
+                        _Animations[i].Stop();
+                        return;
+                    }
+                    if (e.Cancel)
+                    {
+                        _Animations[i].Stop();
+                        return;
+                    }
+                }
+            }
+        }
+
+        private int _RepeatStoryTimes = 0;
+        /// <summary>
+        /// Gets or sets number of times storyline is repeated. Default value is 0 which indicates that storyline is run only once meaning not repeated.
+        /// </summary>
+        public int RepeatStoryTimes
+        {
+            get { return _RepeatStoryTimes; }
+            set { _RepeatStoryTimes = value; }
+        }
+
+        private bool _AutoDispose = false;
+        /// <summary>
+        /// Gets or sets whether storyline is auto-disposed when finished.
+        /// </summary>
+        public bool AutoDispose
+        {
+            get { return _AutoDispose; }
+            set
+            {
+                _AutoDispose = value;
+            }
+        }
+        #endregion
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/AssemblyInfo_ORG.cs.sav b/PROMS/DotNetBar Source Code/AssemblyInfo_ORG.cs.sav
new file mode 100644
index 00000000..afe3e53d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AssemblyInfo_ORG.cs.sav	
@@ -0,0 +1,58 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+//
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+//
+[assembly: AssemblyTitle("DevComponents.DotNetBar")]
+[assembly: AssemblyDescription("DotNetBar is Toolbar, Menubar, Docking Component.")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("DevComponents.com")]
+[assembly: AssemblyProduct("DevComponents.DotNetBar")]
+[assembly: AssemblyCopyright("(c) 2002 by DevComponents.com, All Rights Reserved.")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]		
+
+//
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Revision
+//      Build Number
+//
+// You can specify all the value or you can default the Revision and Build Numbers 
+// by using the '*' as shown below:
+
+[assembly: AssemblyFileVersion("14.1.0.37")]
+[assembly: AssemblyVersion("14.1.0.37")]
+
+//[assembly: AssemblyVersion("1.0.0.*")]
+
+//
+// In order to sign your assembly you must specify a key to use. Refer to the 
+// Microsoft .NET Framework documentation for more information on assembly signing.
+//
+// Use the attributes below to control which key is used for signing. 
+//
+// Notes: 
+//   (*) If no key is specified - the assembly cannot be signed.
+//   (*) KeyName refers to a key that has been installed in the Crypto Service
+//       Provider (CSP) on your machine. 
+//   (*) If the key file and a key name attributes are both specified, the 
+//       following processing occurs:
+//       (1) If the KeyName can be found in the CSP - that key is used.
+//       (2) If the KeyName does not exist and the KeyFile does exist, the key 
+//           in the file is installed into the CSP and used.
+//   (*) Delay Signing is an advanced option - see the Microsoft .NET Framework
+//       documentation for more information on this.
+//
+//[assembly: AssemblyDelaySign(false)]
+[assembly: AssemblyDelaySign(true)]
+[assembly: AssemblyKeyFile("dotnetbar.snk")]
+[assembly: AssemblyKeyName("")]
+[assembly: System.Security.AllowPartiallyTrustedCallers]
+// Uncomment for .NET Framework 4.0 compilation
+//[assembly: System.Security.SecurityRules(System.Security.SecurityRuleSet.Level1)]
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/Attributes.cs b/PROMS/DotNetBar Source Code/Attributes.cs
new file mode 100644
index 00000000..bee1310d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Attributes.cs	
@@ -0,0 +1,16 @@
+using System;
+
+namespace DevComponents.DotNetBar
+{
+	[AttributeUsage(AttributeTargets.Property|AttributeTargets.Method|AttributeTargets.Field)]
+	public class DevCoBrowsable : Attribute
+	{
+		public static readonly DevCoBrowsable Yes=new DevCoBrowsable(true);
+		public static readonly DevCoBrowsable No=new DevCoBrowsable(false);
+		public bool Browsable;
+		public DevCoBrowsable(bool browsable)
+		{
+			this.Browsable = browsable;
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/AutoHidePanel.cs b/PROMS/DotNetBar Source Code/AutoHidePanel.cs
new file mode 100644
index 00000000..f3d3b7be
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/AutoHidePanel.cs	
@@ -0,0 +1,1628 @@
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Windows.Forms;
+using System.Drawing.Text;
+
+namespace DevComponents.DotNetBar
+{
+    [System.ComponentModel.ToolboxItem(false), System.ComponentModel.DesignTimeVisible(false), System.Runtime.InteropServices.ComVisible(false)]
+    public class AutoHidePanel : System.Windows.Forms.Control
+    {
+        private ArrayList m_Panels = new ArrayList(10);
+        private System.Windows.Forms.Timer m_Timer = null;
+
+        private eDotNetBarStyle m_Style = eDotNetBarStyle.OfficeXP;
+
+        private bool m_EnableHoverExpand = true;
+        private bool m_EnableFocusCollapse = true;
+
+        private int m_AutoHideShowTimeout = 800;
+        private ColorScheme m_ColorScheme = null;
+        private DotNetBarManager m_Owner = null;
+
+        public AutoHidePanel()
+        {
+            this.SetStyle(ControlStyles.Selectable, false);
+            this.SetStyle(ControlStyles.UserPaint, true);
+            this.SetStyle(ControlStyles.Opaque, true);
+            this.SetStyle(DisplayHelp.DoubleBufferFlag, true);
+            this.SetStyle(ControlStyles.AllPaintingInWmPaint, true);
+            this.SetStyle(ControlStyles.ResizeRedraw, true);
+            //this.Font = SystemFonts.DefaultFont; // SystemInformation.MenuFont.Clone() as Font;
+        }
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                DestroyTimer();
+                foreach (PanelBar panel in m_Panels)
+                {
+                    panel.Dispose();
+                }
+                m_Panels.Clear();
+            }
+            base.Dispose(disposing);
+        }
+
+        internal void SetOwner(DotNetBarManager owner)
+        {
+            m_Owner = owner;
+        }
+
+        private Size _FixedSize = Size.Empty;
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public Size FixedSize
+        {
+            get { return _FixedSize; }
+            set { _FixedSize = value; }
+        }
+
+        private bool m_AntiAlias = false;
+        /// <summary>
+        /// Gets or sets whether anti-alias smoothing is used while painting. Default value is false.
+        /// </summary>
+        [DefaultValue(false), Browsable(true), Category("Appearance"), Description("Gets or sets whether anti-aliasing is used while painting.")]
+        public bool AntiAlias
+        {
+            get { return m_AntiAlias; }
+            set
+            {
+                if (m_AntiAlias != value)
+                {
+                    m_AntiAlias = value;
+                    this.Invalidate();
+                }
+            }
+        }
+
+        protected override void OnPaint(PaintEventArgs p)
+        {
+            eTextFormat format = eTextFormat.Default | eTextFormat.VerticalCenter | eTextFormat.SingleLine;
+            Graphics g = p.Graphics;
+            ColorScheme scheme = null;
+
+            if (this.BackColor == Color.Transparent || this.BackgroundImage != null)
+            {
+                base.OnPaintBackground(p);
+            }
+
+            TextRenderingHint textHint = g.TextRenderingHint;
+            SmoothingMode sm = g.SmoothingMode;
+            if (m_AntiAlias)
+            {
+                g.TextRenderingHint = BarUtilities.AntiAliasTextRenderingHint;
+                g.SmoothingMode = SmoothingMode.AntiAlias;
+            }
+            bool office2007Style = BarFunctions.IsOffice2007Style(m_Style);
+
+            if (office2007Style && m_ColorScheme == null && Rendering.GlobalManager.Renderer is Rendering.Office2007Renderer)
+                scheme = ((Rendering.Office2007Renderer)Rendering.GlobalManager.Renderer).ColorTable.LegacyColors;
+            else if (m_Owner != null && m_Owner.UseGlobalColorScheme)
+                scheme = m_Owner.ColorScheme;
+            else if (m_ColorScheme != null)
+                scheme = m_ColorScheme;
+            else
+                scheme = new ColorScheme(m_Style);
+
+            Rectangle clientRect = this.ClientRectangle;
+            clientRect.Inflate(1, 1);
+            if (scheme.AutoHidePanelBackgroundImage != null)
+                BarFunctions.PaintBackgroundImage(g, clientRect, scheme.AutoHidePanelBackgroundImage, eBackgroundImagePosition.Tile, 255);
+
+            if (!scheme.AutoHidePanelBackground.IsEmpty)
+            {
+                DisplayHelp.FillRectangle(g, clientRect, scheme.AutoHidePanelBackground, scheme.AutoHidePanelBackground2, 90);
+            }
+            else if (IsGradientStyle)
+            {
+                DisplayHelp.FillRectangle(g, clientRect, scheme.BarBackground, scheme.BarBackground2, scheme.BarBackgroundGradientAngle);
+            }
+            else
+            {
+                using (SolidBrush brush = new SolidBrush(ControlPaint.Light(this.BackColor)))
+                    g.FillRectangle(brush, this.DisplayRectangle);
+            }
+
+            if (m_Style == eDotNetBarStyle.VS2005 || office2007Style)
+            {
+                VS2005TabDisplay td = StyleManager.IsMetro(m_Style) ? new VS2012TabDisplay(this, scheme) : new VS2005TabDisplay(this, scheme);
+                td.DisplayTextForActiveTabOnly = office2007Style;
+                td.Paint(g, m_Panels);
+
+
+                if (m_AntiAlias)
+                {
+                    g.TextRenderingHint = textHint;
+                    g.SmoothingMode = sm;
+                }
+
+                return;
+            }
+
+            const int margin = 2;
+            int width = this.Width - 2;
+            int height = this.Height - 2;
+
+            Color textColor = Color.Empty;
+            SolidBrush backBrush = null;
+            Pen linePen = null;
+            if (m_Style == eDotNetBarStyle.Office2003)
+            {
+                textColor = scheme.ItemText;
+                linePen = new Pen(scheme.ItemHotBorder, 1);
+            }
+            else if (m_Style == eDotNetBarStyle.VS2005 || BarFunctions.IsOffice2007Style(m_Style))
+            {
+                textColor = scheme.ItemText;
+                linePen = new Pen(scheme.MenuBorder, 1);
+            }
+            else
+            {
+                textColor = g.GetNearestColor(ControlPaint.DarkDark(this.BackColor));
+                backBrush = new SolidBrush(this.BackColor);
+                linePen = new Pen(g.GetNearestColor(ControlPaint.Dark(this.BackColor)), 1);
+            }
+
+            if (this.Dock == DockStyle.Top || this.Dock == DockStyle.Bottom || this.Dock == DockStyle.None)
+            {
+                int x = 2;
+                foreach (PanelBar panel in m_Panels)
+                {
+                    for (int i = 0; i < panel.Tabs.Count; i++)
+                    {
+                        DockItemTab tab = panel.Tabs[i] as DockItemTab;
+                        CompositeImage icon = tab.Icon;
+                        tab.DisplayRectangle.X = x;
+                        tab.DisplayRectangle.Y = 0;
+                        tab.DisplayRectangle.Height = height;
+                        x += PanelBar.TabPadding;
+                        if (panel.ActiveTab == i || panel.BoundBar.AutoHideTabTextAlwaysVisible)
+                        {
+                            if (icon != null)
+                            {
+
+                                if (this.Dock == DockStyle.Top)
+                                {
+                                    if ((m_Style == eDotNetBarStyle.Office2003 || m_Style == eDotNetBarStyle.VS2005) && !scheme.ItemPressedBackground2.IsEmpty)
+                                    {
+                                        using (LinearGradientBrush gradient = BarFunctions.CreateLinearGradientBrush(new Rectangle(tab.DisplayRectangle.X, 0, icon.Width + panel.MaxTextWidth + PanelBar.TabPadding * 3, height), scheme.ItemPressedBackground, scheme.ItemPressedBackground2, scheme.ItemPressedBackgroundGradientAngle))
+                                            g.FillRectangle(gradient, tab.DisplayRectangle.X, 0, icon.Width + panel.MaxTextWidth + PanelBar.TabPadding * 3, height);
+
+                                    }
+                                    else if (backBrush != null)
+                                        g.FillRectangle(backBrush, tab.DisplayRectangle.X, 0, icon.Width + panel.MaxTextWidth + PanelBar.TabPadding * 3, height);
+                                    icon.DrawImage(g, new Rectangle(x, (height - icon.Height) / 2, icon.Width, icon.Height));
+                                    //g.DrawImage(icon,x,(height-icon.Height)/2,icon.Width,icon.Height);
+                                }
+                                else
+                                {
+                                    if ((m_Style == eDotNetBarStyle.Office2003 || m_Style == eDotNetBarStyle.VS2005) && !scheme.ItemPressedBackground2.IsEmpty)
+                                    {
+                                        using (LinearGradientBrush gradient = BarFunctions.CreateLinearGradientBrush(new Rectangle(tab.DisplayRectangle.X, margin, icon.Width + panel.MaxTextWidth + PanelBar.TabPadding * 3, height), scheme.ItemPressedBackground, scheme.ItemPressedBackground2, scheme.ItemPressedBackgroundGradientAngle))
+                                            g.FillRectangle(gradient, tab.DisplayRectangle.X, margin, icon.Width + panel.MaxTextWidth + PanelBar.TabPadding * 3, height);
+
+                                    }
+                                    else if (backBrush != null)
+                                        g.FillRectangle(backBrush, tab.DisplayRectangle.X, margin, icon.Width + panel.MaxTextWidth + PanelBar.TabPadding * 3, height);
+                                    icon.DrawImage(g, new Rectangle(x, (height - icon.Height) / 2 + margin, icon.Width, icon.Height));
+                                    //g.DrawImage(icon,x,(height-icon.Height)/2+margin,icon.Width,icon.Height);
+                                }
+                                x += (icon.Width + PanelBar.TabPadding);
+                            }
+                            else
+                            {
+                                if (this.Dock == DockStyle.Top)
+                                {
+                                    if ((m_Style == eDotNetBarStyle.Office2003 || m_Style == eDotNetBarStyle.VS2005) && !scheme.ItemPressedBackground2.IsEmpty)
+                                    {
+                                        using (LinearGradientBrush gradient = BarFunctions.CreateLinearGradientBrush(new Rectangle(tab.DisplayRectangle.X, 0, tab.TextSize.Width + PanelBar.TabPadding * 2, height), scheme.ItemPressedBackground, scheme.ItemPressedBackground2, scheme.ItemPressedBackgroundGradientAngle))
+                                            g.FillRectangle(gradient, tab.DisplayRectangle.X, 0, tab.TextSize.Width + PanelBar.TabPadding * 2, height);
+
+                                    }
+                                    else if (backBrush != null)
+                                        g.FillRectangle(backBrush, tab.DisplayRectangle.X, 0, tab.TextSize.Width + PanelBar.TabPadding * 2, height);
+                                }
+                                else
+                                {
+                                    if ((m_Style == eDotNetBarStyle.Office2003 || m_Style == eDotNetBarStyle.VS2005) && !scheme.ItemPressedBackground2.IsEmpty)
+                                    {
+                                        using (LinearGradientBrush gradient = BarFunctions.CreateLinearGradientBrush(new Rectangle(tab.DisplayRectangle.X, margin, tab.TextSize.Width + PanelBar.TabPadding * 2, height), scheme.ItemPressedBackground, scheme.ItemPressedBackground2, scheme.ItemPressedBackgroundGradientAngle))
+                                            g.FillRectangle(gradient, tab.DisplayRectangle.X, margin, tab.TextSize.Width + PanelBar.TabPadding * 2, height);
+
+                                    }
+                                    else if (backBrush != null)
+                                        g.FillRectangle(backBrush, tab.DisplayRectangle.X, margin, tab.TextSize.Width + PanelBar.TabPadding * 2, height);
+                                }
+                            }
+
+                            TextDrawing.DrawStringLegacy(g, tab.Text, this.Font, textColor, new Rectangle(x, this.Dock == DockStyle.Top ? 0 : margin, (icon == null ? tab.TextSize.Width : panel.MaxTextWidth), height), format);
+                            x += ((icon == null ? tab.TextSize.Width : panel.MaxTextWidth) + PanelBar.TabPadding);
+                            tab.DisplayRectangle.Width = x - tab.DisplayRectangle.X;
+                            if (this.Dock == DockStyle.Top)
+                                tab.DisplayRectangle.Offset(0, -1);
+                            else
+                            {
+                                tab.DisplayRectangle.Offset(0, 1);
+                                tab.DisplayRectangle.Height += 2;
+                            }
+                            g.DrawRectangle(linePen, tab.DisplayRectangle);
+                        }
+                        else
+                        {
+                            if (icon != null)
+                            {
+                                if (this.Dock == DockStyle.Top)
+                                {
+                                    if (backBrush != null)
+                                        g.FillRectangle(backBrush, tab.DisplayRectangle.X, 0, icon.Width + PanelBar.TabPadding * 2, height);
+                                    icon.DrawImage(g, new Rectangle(x, (height - icon.Height) / 2, icon.Width, icon.Height));
+                                    //g.DrawImage(icon,x,(height-icon.Height)/2,icon.Width,icon.Height);
+                                }
+                                else
+                                {
+                                    if (backBrush != null)
+                                        g.FillRectangle(backBrush, tab.DisplayRectangle.X, margin, icon.Width + PanelBar.TabPadding * 2, height);
+                                    icon.DrawImage(g, new Rectangle(x, (height - icon.Height) / 2 + margin, icon.Width, icon.Height));
+                                    //g.DrawImage(icon,x,(height-icon.Height)/2+margin,icon.Width,icon.Height);
+                                }
+                                x += (icon.Width + PanelBar.TabPadding);
+                            }
+                            else
+                            {
+                                TextDrawing.DrawStringLegacy(g, tab.Text, this.Font, textColor, new Rectangle(x, this.Dock == DockStyle.Top ? 0 : margin, tab.TextSize.Width, height), format);
+                                x += (tab.TextSize.Width + PanelBar.TabPadding);
+                            }
+                            tab.DisplayRectangle.Width = x - tab.DisplayRectangle.X;
+                            if (this.Dock == DockStyle.Top)
+                                tab.DisplayRectangle.Y--;
+                            else
+                            {
+                                tab.DisplayRectangle.Y++;
+                                tab.DisplayRectangle.Height += 2;
+                            }
+                            g.DrawRectangle(linePen, tab.DisplayRectangle);
+                        }
+                        if (x > this.Width)
+                            break;
+                    }
+                    x += 4;
+                    if (x > this.Width)
+                        break;
+                }
+            }
+            else if (this.Dock == DockStyle.Left || this.Dock == DockStyle.Right)
+            {
+                int y = 2;
+                foreach (PanelBar panel in m_Panels)
+                {
+                    for (int i = 0; i < panel.Tabs.Count; i++)
+                    {
+                        DockItemTab tab = panel.Tabs[i] as DockItemTab;
+                        CompositeImage icon = tab.Icon;
+                        tab.DisplayRectangle.X = 0;
+                        tab.DisplayRectangle.Y = y;
+                        tab.DisplayRectangle.Width = width;
+                        y += PanelBar.TabPadding;
+                        if (panel.ActiveTab == i || panel.BoundBar.AutoHideTabTextAlwaysVisible)
+                        {
+                            if (icon != null)
+                            {
+                                if (this.Dock == DockStyle.Left)
+                                {
+                                    if ((m_Style == eDotNetBarStyle.Office2003 || m_Style == eDotNetBarStyle.VS2005) && !scheme.ItemPressedBackground2.IsEmpty)
+                                    {
+                                        using (LinearGradientBrush gradient = BarFunctions.CreateLinearGradientBrush(new Rectangle(tab.DisplayRectangle.X, tab.DisplayRectangle.Y, width, icon.Height + panel.MaxTextWidth + PanelBar.TabPadding * 3), scheme.ItemPressedBackground, scheme.ItemPressedBackground2, scheme.ItemPressedBackgroundGradientAngle))
+                                            g.FillRectangle(gradient, tab.DisplayRectangle.X, tab.DisplayRectangle.Y, width, icon.Height + panel.MaxTextWidth + PanelBar.TabPadding * 3);
+
+                                    }
+                                    else if (backBrush != null)
+                                        g.FillRectangle(backBrush, tab.DisplayRectangle.X, tab.DisplayRectangle.Y, width, icon.Height + panel.MaxTextWidth + PanelBar.TabPadding * 3);
+                                    icon.DrawImage(g, new Rectangle((width - icon.Width - margin) / 2, y, icon.Width, icon.Height));
+                                    //g.DrawImage(icon,(width-icon.Width-margin)/2,y,icon.Width,icon.Height);
+                                }
+                                else
+                                {
+                                    if ((m_Style == eDotNetBarStyle.Office2003 || m_Style == eDotNetBarStyle.VS2005) && !scheme.ItemPressedBackground2.IsEmpty)
+                                    {
+                                        using (LinearGradientBrush gradient = BarFunctions.CreateLinearGradientBrush(new Rectangle(margin, tab.DisplayRectangle.Y, width, icon.Height + panel.MaxTextWidth + PanelBar.TabPadding * 3), scheme.ItemPressedBackground, scheme.ItemPressedBackground2, scheme.ItemPressedBackgroundGradientAngle))
+                                            g.FillRectangle(gradient, margin, tab.DisplayRectangle.Y, width, icon.Height + panel.MaxTextWidth + PanelBar.TabPadding * 3);
+
+                                    }
+                                    else if (backBrush != null)
+                                        g.FillRectangle(backBrush, margin, tab.DisplayRectangle.Y, width, icon.Height + panel.MaxTextWidth + PanelBar.TabPadding * 3);
+                                    icon.DrawImage(g, new Rectangle((width - icon.Width + margin) / 2, y, icon.Width, icon.Height));
+                                    //g.DrawImage(icon,(width-icon.Width+margin)/2,y,icon.Width,icon.Height);
+                                }
+                                y += (icon.Height + PanelBar.TabPadding);
+                            }
+                            else
+                            {
+                                if (this.Dock == DockStyle.Left)
+                                {
+                                    if ((m_Style == eDotNetBarStyle.Office2003 || m_Style == eDotNetBarStyle.VS2005) && !scheme.ItemPressedBackground2.IsEmpty)
+                                    {
+                                        using (LinearGradientBrush gradient = BarFunctions.CreateLinearGradientBrush(new Rectangle(tab.DisplayRectangle.X, tab.DisplayRectangle.Y, width, tab.TextSize.Width + PanelBar.TabPadding * 2), scheme.ItemPressedBackground, scheme.ItemPressedBackground2, scheme.ItemPressedBackgroundGradientAngle))
+                                            g.FillRectangle(gradient, tab.DisplayRectangle.X, tab.DisplayRectangle.Y, width, tab.TextSize.Width + PanelBar.TabPadding * 2);
+
+                                    }
+                                    else if (backBrush != null)
+                                        g.FillRectangle(backBrush, tab.DisplayRectangle.X, tab.DisplayRectangle.Y, width, tab.TextSize.Width + PanelBar.TabPadding * 2);
+                                }
+                                else
+                                {
+                                    if ((m_Style == eDotNetBarStyle.Office2003 || m_Style == eDotNetBarStyle.VS2005) && !scheme.ItemPressedBackground2.IsEmpty)
+                                    {
+                                        using (LinearGradientBrush gradient = BarFunctions.CreateLinearGradientBrush(new Rectangle(margin, tab.DisplayRectangle.Y, width, tab.TextSize.Width + PanelBar.TabPadding * 2), scheme.ItemPressedBackground, scheme.ItemPressedBackground2, scheme.ItemPressedBackgroundGradientAngle))
+                                            g.FillRectangle(gradient, margin, tab.DisplayRectangle.Y, width, tab.TextSize.Width + PanelBar.TabPadding * 2);
+
+                                    }
+                                    else if (backBrush != null)
+                                        g.FillRectangle(backBrush, margin, tab.DisplayRectangle.Y, width, tab.TextSize.Width + PanelBar.TabPadding * 2);
+                                }
+                            }
+                            g.RotateTransform(90);
+                            TextDrawing.DrawStringLegacy(g, tab.Text, this.Font, textColor, new Rectangle(y, -width, (icon == null ? tab.TextSize.Width : panel.MaxTextWidth), width), format);
+                            g.ResetTransform();
+                            y += ((icon == null ? tab.TextSize.Width : panel.MaxTextWidth) + PanelBar.TabPadding);
+                            if (this.Dock == DockStyle.Left)
+                                tab.DisplayRectangle.Offset(-1, 0);
+                            else
+                                tab.DisplayRectangle.Offset(1, 0);
+                            tab.DisplayRectangle.Height = y - tab.DisplayRectangle.Y;
+                            g.DrawRectangle(linePen, tab.DisplayRectangle);
+                        }
+                        else
+                        {
+                            if (icon != null)
+                            {
+                                if (this.Dock == DockStyle.Left)
+                                {
+                                    if (backBrush != null)
+                                        g.FillRectangle(backBrush, tab.DisplayRectangle.X, tab.DisplayRectangle.Y, width, icon.Height + PanelBar.TabPadding * 2);
+                                    icon.DrawImage(g, new Rectangle((width - icon.Width - margin) / 2, y, icon.Width, icon.Height));
+                                    //g.DrawImage(icon,(width-icon.Width-margin)/2,y,icon.Width,icon.Height);
+                                }
+                                else
+                                {
+                                    if (backBrush != null)
+                                        g.FillRectangle(backBrush, margin, tab.DisplayRectangle.Y, width, icon.Height + PanelBar.TabPadding * 2);
+                                    icon.DrawImage(g, new Rectangle((width - icon.Width + margin) / 2, y, icon.Width, icon.Height));
+                                    //g.DrawImage(icon,(width-icon.Width+margin)/2,y,icon.Width,icon.Height);
+                                }
+                                y += (icon.Height + PanelBar.TabPadding);
+                            }
+                            else
+                            {
+                                g.RotateTransform(90);
+                                TextDrawing.DrawStringLegacy(g, tab.Text, this.Font, textColor, new Rectangle(y, -width, tab.TextSize.Width, width), format);
+                                g.ResetTransform();
+                                y += (tab.TextSize.Width + PanelBar.TabPadding);
+                            }
+                            tab.DisplayRectangle.Height = y - tab.DisplayRectangle.Y;
+                            if (this.Dock == DockStyle.Left)
+                                tab.DisplayRectangle.X--;
+                            else
+                                tab.DisplayRectangle.X++;
+                            g.DrawRectangle(linePen, tab.DisplayRectangle);
+                        }
+                        if (y > this.Height)
+                            break;
+                    }
+                    y += 4;
+                    if (y > this.Height)
+                        break;
+                }
+            }
+
+            linePen.Dispose();
+
+
+            if (m_AntiAlias)
+            {
+                g.TextRenderingHint = textHint;
+                g.SmoothingMode = sm;
+            }
+        }
+
+        private bool IsGradientStyle
+        {
+            get
+            {
+                if (m_Style == eDotNetBarStyle.Office2003 || m_Style == eDotNetBarStyle.VS2005 || BarFunctions.IsOffice2007Style(m_Style))
+                    return true;
+                return false;
+            }
+        }
+        private DockItemTab _MouseOverTab = null;
+        private void SetMouseOverTab(AutoHidePanel.DockItemTab tab)
+        {
+            if (tab == _MouseOverTab) return;
+
+            if (_MouseOverTab != null)
+            {
+                _MouseOverTab.IsMouseOver = false;
+                this.Invalidate(_MouseOverTab.DisplayRectangle);
+            }
+
+            _MouseOverTab = tab;
+
+            if (_MouseOverTab != null)
+            {
+                _MouseOverTab.IsMouseOver = true;
+                this.Invalidate(_MouseOverTab.DisplayRectangle);
+            }
+        }
+        protected override void OnMouseMove(MouseEventArgs e)
+        {
+            DockItemTab tab = HitTestTab(e.X, e.Y);
+            SetMouseOverTab(tab);
+
+            base.OnMouseMove(e);
+        }
+        protected override void OnMouseEnter(EventArgs e)
+        {
+            base.OnMouseEnter(e);
+            CreateTimer();
+        }
+        protected override void OnMouseLeave(EventArgs e)
+        {
+            base.OnMouseLeave(e);
+            SetMouseOverTab(null);
+            if (m_Timer != null)
+                m_Timer.Interval = m_AutoHideShowTimeout;
+        }
+        private void CreateTimer()
+        {
+            if (m_Timer != null)
+            {
+                m_Timer.Start();
+                return;
+            }
+            m_Timer = new Timer();
+            m_Timer.Interval = m_AutoHideShowTimeout;
+            m_Timer.Tick += new EventHandler(this.TimerTick);
+            m_Timer.Start();
+        }
+        internal void StopTimer()
+        {
+            if (m_Timer != null)
+                m_Timer.Stop();
+        }
+        internal void StartTimer()
+        {
+            if (m_Timer != null)
+                m_Timer.Start();
+        }
+
+        private void TimerTick(object sender, EventArgs e)
+        {
+            Point p = this.PointToClient(Control.MousePosition);
+
+            if (this.ClientRectangle.Contains(p))
+            {
+                IntPtr activeWnd = NativeFunctions.GetActiveWindow();
+                Form parentForm = this.FindForm();
+                if (parentForm != null && parentForm.Handle != activeWnd)
+                {
+                    Control c = parentForm;
+                    bool bExit = true;
+                    while (c.Parent != null)
+                    {
+                        c = c.Parent;
+                        if (c.Handle == activeWnd)
+                        {
+                            bExit = false;
+                            break;
+                        }
+                    }
+                    if (bExit)
+                        return;
+                }
+                if (!m_EnableHoverExpand)
+                    return;
+                if (parentForm != null)
+                {
+                    Point mousePosition = Control.MousePosition;
+                    Point parentPoint = parentForm.PointToClient(mousePosition);
+                    Control childAtPoint = parentForm.GetChildAtPoint(parentPoint, GetChildAtPointSkip.Invisible | GetChildAtPointSkip.Transparent);
+                    while (childAtPoint != null && !(childAtPoint is AutoHidePanel))
+                    {
+                        parentPoint = childAtPoint.PointToClient(mousePosition);
+                        childAtPoint = childAtPoint.GetChildAtPoint(parentPoint, GetChildAtPointSkip.Invisible | GetChildAtPointSkip.Transparent);
+                    }
+                    if (!(childAtPoint is AutoHidePanel))
+                    {
+                        StopTimer();
+                        return;
+                    }
+                }
+                SelectPanel(p.X, p.Y);
+            }
+            else
+            {
+                PanelBar activePanel = ActivePanelBar;
+                if (activePanel != null && !activePanel.BoundBar.IsSizingWindow)
+                {
+                    if (activePanel.BoundBar.Visible && !(!m_EnableFocusCollapse && IsBarActive(activePanel.BoundBar)))
+                    {
+                        p = activePanel.BoundBar.PointToClient(Control.MousePosition);
+                        if (!activePanel.BoundBar.ClientRectangle.Contains(p))
+                        {
+                            if (AnimateHide(activePanel.BoundBar))
+                                DestroyTimer();
+                        }
+                    }
+                }
+            }
+
+        }
+        private void DestroyTimer()
+        {
+            if (m_Timer == null)
+                return;
+            m_Timer.Stop();
+            m_Timer.Dispose();
+            m_Timer = null;
+        }
+        private bool IsBarActive(Bar bar)
+        {
+            if (bar == null)
+                return false;
+            Form form = this.FindForm();
+            if (form == null)
+                return false;
+            Control activeControl = form.ActiveControl;
+            if (activeControl == null)
+                return false;
+            while (activeControl != null)
+            {
+                if (bar == activeControl)
+                    return true;
+                activeControl = activeControl.Parent;
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// Gets or sets the timeout in milliseconds for auto hide/show action.
+        /// When timeout has elapsed and mouse has left the bar the bar will be automatically hidden.
+        /// If mouse is hovering over the collapsed bar and timeout has elapsed the bar will be displayed.
+        /// </summary>
+        [DefaultValue(800), Category("Behavior"), Description("Indicates timeout in milliseconds for auto hide/show action.")]
+        public int AutoHideShowTimeout
+        {
+            get { return m_AutoHideShowTimeout; }
+            set { m_AutoHideShowTimeout = value; }
+        }
+
+        protected override void OnMouseDown(MouseEventArgs e)
+        {
+            base.OnMouseDown(e);
+            if (e.Button == MouseButtons.Left)
+            {
+                SelectPanel(e.X, e.Y);
+            }
+        }
+
+        public void SelectPanel(int x, int y)
+        {
+            foreach (PanelBar panel in m_Panels)
+            {
+                foreach (DockItemTab tab in panel.Tabs)
+                {
+                    if (tab.DisplayRectangle.Contains(x, y))
+                    {
+                        PanelBar activePanel = ActivePanelBar;
+                        if (activePanel != null)
+                        {
+                            if (activePanel != panel)
+                            {
+                                if (activePanel.BoundBar.IsSizingWindow)
+                                    return;
+                                if (!AnimateHide(activePanel.BoundBar))
+                                    return;
+                            }
+                            else
+                            {
+                                if (panel.ActiveTab < panel.Tabs.Count)
+                                {
+                                    if (panel.Tabs[panel.ActiveTab] == tab && panel.BoundBar.Visible)
+                                        return;
+                                    ((DockItemTab)activePanel.Tabs[activePanel.ActiveTab]).Item.Displayed = false;
+                                }
+                            }
+                        }
+                        if (panel.BoundBar.VisibleItemCount == 0)
+                            throw new InvalidOperationException("Bar.Items collection must contain at least one visible DockContainerItem object so auto-hide functionality can function properly.");
+                        panel.ActiveTab = panel.Tabs.IndexOf(tab);
+                        if (panel.BoundBar.IsDisposed) return;
+                        panel.BoundBar.SelectedDockTab = panel.BoundBar.Items.IndexOf(tab.Item);
+                        PopupManager.CloseAllPopups();
+                        AnimateShow(panel.BoundBar);
+                        this.Refresh();
+                        return;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Returns the reference to DockContainerItem tab if any under specified coordinates.
+        /// </summary>
+        /// <param name="x">X - client mouse coordinate</param>
+        /// <param name="y">Y - client mouse coordinate</param>
+        /// <returns>Reference to DockContainerItem whose tab is at specified coordinates or null if there is no tab at given coordinates</returns>
+        public DockContainerItem HitTest(int x, int y)
+        {
+            DockItemTab tab = HitTestTab(x, y);
+            if (tab != null)
+                return tab.Item;
+            return null;
+        }
+
+        private DockItemTab HitTestTab(int x, int y)
+        {
+            foreach (PanelBar panel in m_Panels)
+            {
+                foreach (DockItemTab tab in panel.Tabs)
+                {
+                    if (tab.DisplayRectangle.Contains(x, y))
+                    {
+                        return tab;
+                    }
+                }
+            }
+            return null;
+        }
+
+
+        internal DockContainerItem SelectedDockContainerItem
+        {
+            get
+            {
+                PanelBar panel = this.ActivePanelBar;
+                if (panel == null)
+                {
+                    foreach (PanelBar p in m_Panels)
+                    {
+                        for (int i = 0; i < p.Tabs.Count; i++)
+                        {
+                            DockItemTab tab = p.Tabs[i] as DockItemTab;
+                            if (p.ActiveTab == i)
+                                return tab.Item;
+                        }
+                    }
+                    return null;
+                }
+                try
+                {
+                    DockItemTab tab = panel.Tabs[panel.ActiveTab] as DockItemTab;
+                    return tab.Item;
+                }
+                catch
+                {
+                    return null;
+                }
+            }
+            set
+            {
+                foreach (PanelBar panel in m_Panels)
+                {
+                    foreach (DockItemTab tab in panel.Tabs)
+                    {
+                        if (tab.Item == value)
+                        {
+                            PanelBar activePanel = ActivePanelBar;
+                            if (activePanel != null)
+                            {
+                                if (activePanel != panel)
+                                {
+                                    if (activePanel.BoundBar.IsSizingWindow)
+                                        return;
+                                    if (!AnimateHide(activePanel.BoundBar))
+                                        return;
+                                }
+                                else
+                                {
+                                    if (panel.Tabs[panel.ActiveTab] == tab && panel.BoundBar.Visible)
+                                        return;
+                                    ((DockItemTab)activePanel.Tabs[activePanel.ActiveTab]).Item.Displayed = false;
+                                }
+                            }
+                            panel.ActiveTab = panel.Tabs.IndexOf(tab);
+                            this.Refresh();
+                            return;
+                        }
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether bars on auto-hide panel are displayed when mouse hovers over the tab.
+        /// </summary>
+        [DefaultValue(true), Browsable(true), Description("Indicates whether bars on auto-hide panel are displayed when mouse hovers over the tab.")]
+        public bool EnableHoverExpand
+        {
+            get { return m_EnableHoverExpand; }
+            set { m_EnableHoverExpand = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether bars that have focus are collapsed automatically or not.
+        /// </summary>
+        [DefaultValue(true), Browsable(true), Description("Indicates whether bars that have focus are collapsed automatically or not.")]
+        public bool EnableFocusCollapse
+        {
+            get { return m_EnableFocusCollapse; }
+            set { m_EnableFocusCollapse = value; }
+        }
+
+        protected override void OnFontChanged(EventArgs e)
+        {
+            base.OnFontChanged(e);
+            RefreshPanels();
+        }
+
+        protected override void OnSystemColorsChanged(EventArgs e)
+        {
+            base.OnSystemColorsChanged(e);
+            Application.DoEvents();
+            this.Font = SystemFonts.DefaultFont; // SystemInformation.MenuFont.Clone() as Font;
+        }
+
+        private void RefreshPanels()
+        {
+            foreach (PanelBar panelbar in m_Panels)
+                panelbar.ReloadDockItems();
+            this.Invalidate();
+        }
+
+        internal void ShowBar(Bar bar)
+        {
+            PanelBar panel = null;
+            foreach (PanelBar panelbar in m_Panels)
+            {
+                if (panelbar.BoundBar == bar)
+                {
+                    panel = panelbar;
+                    break;
+                }
+            }
+            PanelBar activePanel = ActivePanelBar;
+            if (activePanel == panel)
+                return;
+
+            if (activePanel != null)
+            {
+                if (activePanel.BoundBar.IsSizingWindow)
+                    return;
+                if (!AnimateHide(activePanel.BoundBar))
+                {
+                    CreateTimer();
+                    return;
+                }
+            }
+            panel.BoundBar.SelectedDockTab = panel.ActiveTab;
+            AnimateShow(panel.BoundBar);
+            this.Refresh();
+            CreateTimer();
+        }
+        internal void HideBar(Bar bar)
+        {
+            PanelBar activePanel = ActivePanelBar;
+            if (activePanel.BoundBar != bar)
+                return;
+            if (activePanel.BoundBar.Visible)
+            {
+                if (AnimateHide(activePanel.BoundBar))
+                    DestroyTimer();
+            }
+        }
+
+        private bool AnimateHide(Bar bar)
+        {
+            return bar.AnimateHide();
+        }
+
+        private bool AnimateShow(Bar bar)
+        {
+            if (bar.Enabled)
+                return bar.AnimateShow();
+            return false;
+        }
+
+        private PanelBar ActivePanelBar
+        {
+            get
+            {
+                foreach (PanelBar panel in m_Panels)
+                {
+                    if (panel.ActiveTab >= 0 && panel.BoundBar.Visible)
+                        return panel;
+                }
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Sets bars position on the auto-hide panel.
+        /// </summary>
+        /// <param name="bar">Bar for which position should be changed.</param>
+        /// <param name="iIndex">New indexed position of the bar.</param>
+        public void SetBarPosition(Bar bar, int iIndex)
+        {
+            if (iIndex < m_Panels.Count)
+            {
+                for (int i = 0; i < m_Panels.Count; i++)
+                {
+                    if (((PanelBar)m_Panels[i]).BoundBar == bar)
+                    {
+                        if (i != iIndex)
+                        {
+                            PanelBar panel = (PanelBar)m_Panels[i];
+                            m_Panels.RemoveAt(i);
+                            m_Panels.Insert(iIndex, panel);
+                            this.Refresh();
+                        }
+                        break;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the style of auto-hide panel.
+        /// </summary>
+        public eDotNetBarStyle Style
+        {
+            get { return m_Style; }
+            set
+            {
+                m_Style = value;
+                this.Invalidate();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the ColorScheme object used by this panel. Default value is null which means that ColorScheme is
+        /// automatically created as specified by Style property. Note that if your DotNetBarManager has UseGlobalColorScheme set to true
+        /// ColorScheme from DotNetBarManager will be used.
+        /// </summary>
+        [Browsable(false), DefaultValue(null)]
+        public ColorScheme ColorScheme
+        {
+            get { return m_ColorScheme; }
+            set { m_ColorScheme = value; }
+        }
+
+        public void AddBar(Bar bar)
+        {
+            if (bar.Style == eDotNetBarStyle.Office2003)
+                m_Style = eDotNetBarStyle.Office2003;
+            else if (bar.Style == eDotNetBarStyle.VS2005)
+                m_Style = eDotNetBarStyle.VS2005;
+            else if (bar.Style == eDotNetBarStyle.Office2007)
+                m_Style = eDotNetBarStyle.Office2007;
+            else if (bar.Style == eDotNetBarStyle.Office2010)
+                m_Style = eDotNetBarStyle.Office2010;
+            else if (bar.Style == eDotNetBarStyle.Windows7)
+                m_Style = eDotNetBarStyle.Windows7;
+            else if (bar.Style == eDotNetBarStyle.StyleManagerControlled)
+                m_Style = bar.ItemsContainer.EffectiveStyle;
+            else
+                m_Style = eDotNetBarStyle.OfficeXP;
+
+            PanelBar panel = new PanelBar(this, bar);
+            m_Panels.Add(panel);
+            if (this.Dock == DockStyle.Right || this.Dock == DockStyle.Left)
+            {
+                if (panel.PanelSize.Height > this.Width)
+                    this.Width = panel.PanelSize.Height;
+            }
+            else
+            {
+                if (panel.PanelSize.Height > this.Height)
+                    this.Height = panel.PanelSize.Height;
+            }
+
+            if (!this.Visible)
+            {
+                BarFunctions.SetControlVisible(this, true);
+            }
+            else
+                this.Refresh();
+            this.Parent.PerformLayout();
+            this.Parent.Update();
+        }
+
+        public void RemoveBar(Bar bar)
+        {
+            foreach (PanelBar panel in m_Panels)
+            {
+                if (panel.BoundBar == bar)
+                {
+                    m_Panels.Remove(panel);
+                    panel.Dispose();
+                    if (m_Panels.Count == 0)
+                    {
+                        this.Visible = false;
+                        if (this.Dock == DockStyle.Right || this.Dock == DockStyle.Left)
+                        {
+                            this.Width = 0;
+                        }
+                        else
+                        {
+                            this.Height = 0;
+                        }
+                    }
+                    else
+                        this.Refresh();
+                    break;
+                }
+            }
+            if (m_Panels.Count == 0)
+                DestroyTimer();
+        }
+
+        public void RefreshBar(Bar bar)
+        {
+            foreach (PanelBar panel in m_Panels)
+            {
+                if (panel.BoundBar == bar)
+                {
+                    panel.ReloadDockItems();
+                    break;
+                }
+            }
+            this.Refresh();
+        }
+
+        protected override void OnHandleDestroyed(EventArgs e)
+        {
+            base.OnHandleDestroyed(e);
+            DestroyTimer();
+        }
+
+        protected override void OnResize(EventArgs e)
+        {
+            base.OnResize(e);
+            PanelBar panel = this.ActivePanelBar;
+            if (panel != null)
+            {
+                if (panel.BoundBar.Visible)
+                    panel.BoundBar.SetAutoHideSize();
+            }
+        }
+
+        #region DockItemTab
+        private class DockItemTab : IDisposable
+        {
+            public Rectangle DisplayRectangle = new Rectangle(0, 0, 0, 0);
+            public DockContainerItem Item = null;
+            public Size TextSize = Size.Empty;
+            public Size IconSize = Size.Empty;
+            private string m_Text = "";
+            private PanelBar m_Parent = null;
+            public DockItemTab(PanelBar parent, DockContainerItem item)
+            {
+                this.Item = item;
+                m_Parent = parent;
+                item.TextChanged += new EventHandler(this.ItemTextChanged);
+                CompositeImage image = this.Icon;
+                if (image != null)
+                    IconSize = image.Size;
+            }
+            public DockItemTab(PanelBar parent, string text)
+            {
+                m_Text = text;
+                m_Parent = parent;
+            }
+            public string Text
+            {
+                get
+                {
+                    if (this.Item == null)
+                        return m_Text;
+                    else
+                        return this.Item.Text;
+                }
+            }
+            public CompositeImage Icon
+            {
+                get
+                {
+                    if (Item == null)
+                        return null;
+                    if (Item.Image != null)
+                    {
+                        return new CompositeImage(Item.Image, false);
+                    }
+                    if (Item.ImageIndex >= 0 && Item.ImageList != null)
+                        return new CompositeImage(Item.ImageList.Images[Item.ImageIndex], false);
+                    if (Item.Icon != null)
+                        return new CompositeImage(Item.Icon, false);
+                    return null;
+                }
+            }
+            private bool _IsMouseOver = false;
+            public bool IsMouseOver
+            {
+                get
+                {
+                    return _IsMouseOver;
+                }
+                set
+                {
+                    _IsMouseOver = value;
+                }
+            }
+            private void ItemTextChanged(object sender, EventArgs e)
+            {
+                Control container = ((BaseItem)sender).ContainerControl as Control;
+                if (container != null)
+                {
+                    Graphics g = BarFunctions.CreateGraphics(container);
+                    try
+                    {
+                        TextSize = TextDrawing.MeasureStringLegacy(g, ((BaseItem)sender).Text, m_Parent.Parent.Font, Size.Empty, eTextFormat.Default);
+                        TextSize.Width += 4;
+                    }
+                    finally
+                    {
+                        g.Dispose();
+                    }
+                    CompositeImage image = this.Icon;
+                    if (image != null)
+                        IconSize = image.Size;
+                    else
+                        IconSize = Size.Empty;
+                }
+                m_Parent.Refresh();
+            }
+            public void Dispose()
+            {
+                if (this.Item != null)
+                    this.Item.TextChanged -= new EventHandler(this.ItemTextChanged);
+            }
+        }
+        #endregion
+
+        #region PanelBar
+        private class PanelBar : IDisposable
+        {
+            public ArrayList Tabs = new ArrayList(10);
+            public int ActiveTab = -1;
+            public Bar BoundBar = null;
+            private AutoHidePanel m_Parent = null;
+            public static int TabPadding = 4;
+            public static int TabTextVPadding = 4;
+            public static int TabIconVPadding = 3;
+            private Size m_PanelSize = Size.Empty;
+            private int m_MaxTextWidth = 0;
+
+            public PanelBar(AutoHidePanel parent, Bar bar)
+            {
+                m_Parent = parent;
+                BoundBar = bar;
+                ReloadDockItems();
+            }
+            public void ReloadDockItems()
+            {
+                foreach (DockItemTab tab in Tabs)
+                    tab.Dispose();
+                Tabs.Clear();
+
+                Graphics g = BarFunctions.CreateGraphics(BoundBar);
+                try
+                {
+                    if (BoundBar.LayoutType == eLayoutType.DockContainer)
+                    {
+                        foreach (BaseItem item in BoundBar.Items)
+                        {
+                            DockContainerItem dockItem = item as DockContainerItem;
+                            if (dockItem != null && dockItem.Visible)
+                            {
+                                DockItemTab tab = new DockItemTab(this, dockItem);
+                                this.Tabs.Add(tab);
+                                tab.TextSize = TextDrawing.MeasureStringLegacy(g, dockItem.Text, m_Parent.Font, Size.Empty, eTextFormat.Default);
+                                tab.TextSize.Width += 4;
+                            }
+                        }
+                    }
+                    if (this.Tabs.Count == 0)
+                    {
+                        DockItemTab tab = new DockItemTab(this, BoundBar.Text);
+                        this.Tabs.Add(tab);
+                        tab.TextSize = TextDrawing.MeasureStringLegacy(g, BoundBar.Text, m_Parent.Font, Size.Empty, eTextFormat.Default);
+                        tab.TextSize.Width += 4;
+                    }
+                }
+                finally
+                {
+                    g.Dispose();
+                }
+                m_PanelSize = CalcPanelSize();
+                if (BoundBar.SelectedDockTab >= 0)
+                    this.ActiveTab = BoundBar.SelectedDockTab;
+                else
+                    this.ActiveTab = 0;
+            }
+            public void Refresh()
+            {
+                m_PanelSize = CalcPanelSize();
+                m_Parent.Refresh();
+            }
+            public void Dispose()
+            {
+                foreach (DockItemTab tab in Tabs)
+                    tab.Dispose();
+                Tabs.Clear();
+                BoundBar = null;
+                m_Parent = null;
+            }
+
+            public AutoHidePanel Parent
+            {
+                get { return m_Parent; }
+            }
+
+            public Size PanelSize
+            {
+                get
+                {
+                    return m_PanelSize;
+                }
+            }
+
+            public int MaxTextWidth
+            {
+                get { return m_MaxTextWidth; }
+            }
+
+            private Size CalcPanelSize()
+            {
+                Size size = Size.Empty;
+                Size textSize = Size.Empty;
+
+                bool bHorizontal = true;
+
+                foreach (DockItemTab tab in Tabs)
+                {
+                    if (!tab.IconSize.IsEmpty)
+                    {
+                        if (bHorizontal)
+                        {
+                            size.Width += (tab.IconSize.Width + PanelBar.TabPadding * 2);
+                            size.Height = tab.IconSize.Height + TabIconVPadding * 2;
+                        }
+                        else
+                        {
+                            size.Height += (tab.IconSize.Height + PanelBar.TabPadding * 2);
+                            size.Width = tab.IconSize.Width + TabIconVPadding * 2;
+                        }
+                    }
+                    if (bHorizontal)
+                    {
+                        if (tab.TextSize.Width > textSize.Width)
+                            textSize.Width = tab.TextSize.Width;
+                        if (tab.TextSize.Height > textSize.Height)
+                            textSize.Height = tab.TextSize.Height;
+                    }
+                    else
+                    {
+                        if (tab.TextSize.Width > textSize.Height)
+                            textSize.Height = tab.TextSize.Width;
+                        if (tab.TextSize.Height > textSize.Width)
+                            textSize.Width = tab.TextSize.Height;
+                    }
+                }
+                if (bHorizontal)
+                {
+                    m_MaxTextWidth = textSize.Width;
+                    textSize.Width += PanelBar.TabPadding;
+                    textSize.Height += (PanelBar.TabTextVPadding * 2);
+                    size = new Size(size.Width + textSize.Width, (size.Height > textSize.Height ? size.Height : textSize.Height));
+                    if (StyleManager.IsMetro(StyleManager.Style))
+                        size.Height += 6;
+                }
+                else
+                {
+                    m_MaxTextWidth = textSize.Height;
+                    textSize.Height += PanelBar.TabPadding;
+                    textSize.Width += (PanelBar.TabTextVPadding * 2);
+                    size = new Size((size.Width > textSize.Height ? size.Width : textSize.Height), size.Height + textSize.Width);
+                    if (StyleManager.IsMetro(StyleManager.Style))
+                        size.Width += 6;
+                }
+
+                if (m_Parent != null && !m_Parent.FixedSize.IsEmpty)
+                    return m_Parent.FixedSize;
+                return size;
+            }
+        }
+        #endregion
+
+        #region VS2005TabDisplay
+        private class VS2005TabDisplay
+        {
+            protected AutoHidePanel m_AutoHidePanel = null;
+            private ColorScheme m_ColorScheme = null;
+            private int m_xTabOffset = 1;
+            private bool m_DisplayTextForActiveTabOnly = false;
+            /// <summary>
+            /// Creates new instance of the class.
+            /// </summary>
+            public VS2005TabDisplay(AutoHidePanel autoHidePanel, ColorScheme colorScheme)
+            {
+                m_AutoHidePanel = autoHidePanel;
+                m_ColorScheme = colorScheme;
+            }
+
+            public bool DisplayTextForActiveTabOnly
+            {
+                get { return m_DisplayTextForActiveTabOnly; }
+                set { m_DisplayTextForActiveTabOnly = value; }
+            }
+
+            public void Paint(Graphics g, ArrayList m_Panels)
+            {
+                ArrayList activeTabs = new ArrayList();
+                Point p = new Point(0, 0);
+
+                if (m_AutoHidePanel.Dock == DockStyle.Left || m_AutoHidePanel.Dock == DockStyle.Right)
+                {
+                    p.Y = 2;
+                    p.X = 1;
+                }
+                else
+                    p.X = 2;
+
+                foreach (PanelBar panel in m_Panels)
+                {
+                    for (int i = 0; i < panel.Tabs.Count; i++)
+                    {
+                        bool displayText = true;
+                        if (m_DisplayTextForActiveTabOnly && panel.ActiveTab != i && !panel.BoundBar.AutoHideTabTextAlwaysVisible)
+                            displayText = false;
+                        DockItemTab tab = panel.Tabs[i] as DockItemTab;
+                        if (m_AutoHidePanel.Dock == DockStyle.Left || m_AutoHidePanel.Dock == DockStyle.Right)
+                        {
+                            tab.DisplayRectangle = new Rectangle(p.X, p.Y, m_AutoHidePanel.Width - 2, tab.IconSize.Width + 2 +
+                                (displayText || tab.IconSize.Width == 0 ? tab.TextSize.Width : 4));
+                            p.Y += (tab.DisplayRectangle.Height + m_xTabOffset);
+                        }
+                        else
+                        {
+                            tab.DisplayRectangle = new Rectangle(p.X, p.Y, tab.IconSize.Width + 2 +
+                                (displayText || tab.IconSize.Width == 0 ? tab.TextSize.Width : 4), m_AutoHidePanel.Height);
+                            p.X += (tab.DisplayRectangle.Width + m_xTabOffset);
+                        }
+
+                        if (panel.ActiveTab == i)
+                            activeTabs.Add(tab);
+                        else
+                            PaintTab(g, tab, false);
+                    }
+                    if (m_AutoHidePanel.Dock == DockStyle.Left || m_AutoHidePanel.Dock == DockStyle.Right)
+                        p.Y += 2;
+                    else
+                        p.X += 2;
+                }
+
+                foreach (DockItemTab tab in activeTabs)
+                    PaintTab(g, tab, true);
+            }
+
+            protected virtual void PaintTab(Graphics g, DockItemTab tab, bool selected)
+            {
+                GraphicsPath path = GetTabItemPath(tab);
+                TabColors colors = GetTabColors(tab, selected);
+
+                DrawTabItemBackground(tab, path, colors, g);
+
+                DrawTabText(tab, colors, g, selected);
+            }
+
+            protected virtual TabColors GetTabColors(DockItemTab tab, bool selected)
+            {
+                TabColors c = new TabColors();
+                if (tab.Item != null && BarFunctions.IsOffice2007Style(tab.Item.EffectiveStyle))
+                {
+                    if (tab.Item.PredefinedTabColor == eTabItemColor.Default)
+                    {
+                        if (selected && !m_ColorScheme.AutoHideSelectedTabBackground.IsEmpty)
+                        {
+                            c.BackColor = m_ColorScheme.AutoHideSelectedTabBackground;
+                            c.BackColor2 = m_ColorScheme.AutoHideSelectedTabBackground2;
+                            c.BackColorGradientAngle = m_ColorScheme.AutoHideTabBackgroundGradientAngle;
+                            c.TextColor = m_ColorScheme.AutoHideSelectedTabText;
+                            c.BorderColor = m_ColorScheme.AutoHideSelectedTabBorder;
+                        }
+                        else if (!m_ColorScheme.AutoHideTabBackground.IsEmpty)
+                        {
+                            c.BackColor = m_ColorScheme.AutoHideTabBackground;
+                            c.BackColor2 = m_ColorScheme.AutoHideTabBackground2;
+                            c.BackColorGradientAngle = m_ColorScheme.AutoHideTabBackgroundGradientAngle;
+                            c.TextColor = m_ColorScheme.AutoHideTabText;
+                            c.BorderColor = m_ColorScheme.AutoHideTabBorder;
+                        }
+                        else
+                        {
+                            c.BackColor = m_ColorScheme.BarBackground;
+                            c.BackColor2 = m_ColorScheme.BarBackground2;
+                            c.BackColorGradientAngle = m_ColorScheme.BarBackgroundGradientAngle;
+                            c.TextColor = m_ColorScheme.ItemText;
+                            c.BorderColor = m_ColorScheme.BarDockedBorder;
+                        }
+                    }
+                    else
+                    {
+                        Color c1, c2;
+                        TabColorScheme.GetPredefinedColors(tab.Item.PredefinedTabColor, out c1, out c2);
+                        c.BackColor = c1;
+                        c.BackColor2 = c2;
+                        c.BackColorGradientAngle = 90;
+                        c.TextColor = m_ColorScheme.ItemText;
+                    }
+
+                    if (m_AutoHidePanel != null && (m_AutoHidePanel.Dock == DockStyle.Left || m_AutoHidePanel.Dock == DockStyle.Right))
+                    {
+                        c.BackColorGradientAngle -= 90;
+                    }
+                }
+                else
+                {
+                    c.BackColor = m_ColorScheme.DockSiteBackColor;
+                    c.BackColor2 = m_ColorScheme.DockSiteBackColor;
+                    c.TextColor = SystemColors.ControlText;
+                    c.BorderColor = SystemColors.ControlDarkDark;
+                }
+
+                return c;
+            }
+
+            protected virtual void DrawTabItemBackground(DockItemTab tab, GraphicsPath path, TabColors colors, Graphics g)
+            {
+                RectangleF rf = path.GetBounds();
+                Rectangle tabRect = new Rectangle((int)rf.X, (int)rf.Y, (int)rf.Width, (int)rf.Height);
+
+                if (colors.BackColor2.IsEmpty)
+                {
+                    if (!colors.BackColor.IsEmpty)
+                    {
+                        using (SolidBrush brush = new SolidBrush(colors.BackColor))
+                            g.FillPath(brush, path);
+                    }
+                }
+                else
+                {
+                    using (SolidBrush brush = new SolidBrush(Color.White))
+                        g.FillPath(brush, path);
+                    using (LinearGradientBrush brush = CreateTabGradientBrush(tabRect, colors.BackColor, colors.BackColor2, colors.BackColorGradientAngle))
+                        g.FillPath(brush, path);
+                }
+
+                if (!colors.BorderColor.IsEmpty)
+                {
+                    using (Pen pen = new Pen(colors.BorderColor, 1))
+                        g.DrawPath(pen, path);
+                }
+            }
+
+            protected virtual void DrawTabText(DockItemTab tab, TabColors colors, Graphics g, bool selected)
+            {
+                int MIN_TEXT_WIDTH = 12;
+                eTextFormat strFormat = eTextFormat.Default | eTextFormat.HorizontalCenter | eTextFormat.VerticalCenter
+                | eTextFormat.EndEllipsis | eTextFormat.SingleLine;
+
+                Rectangle rText = tab.DisplayRectangle;
+                // Draw image
+                CompositeImage image = tab.Icon;
+                if (image != null && image.Width + 4 <= rText.Width)
+                {
+                    if (m_AutoHidePanel.Dock == DockStyle.Top || m_AutoHidePanel.Dock == DockStyle.Bottom)
+                    {
+                        image.DrawImage(g, new Rectangle(rText.X + 3, rText.Y + (rText.Height - image.Height) / 2, image.Width, image.Height));
+                        int offset = image.Width + 2;
+                        rText.X += offset;
+                        rText.Width -= offset;
+                    }
+                    else
+                    {
+                        image.DrawImage(g, new Rectangle(rText.X + (rText.Width - image.Width) / 2, rText.Y + 3, image.Width, image.Height));
+                        int offset = image.Height + 2;
+                        rText.Y += offset;
+                        rText.Height -= offset;
+                    }
+                }
+
+                bool drawTextAlways = false;
+                if (tab.Item != null && tab.Item.ContainerControl is Bar)
+                    drawTextAlways = ((Bar)tab.Item.ContainerControl).AutoHideTabTextAlwaysVisible;
+                if (m_DisplayTextForActiveTabOnly && !drawTextAlways && !selected && image != null)
+                    return;
+
+                // Draw text
+                //if(selected)
+                {
+                    Font font = m_AutoHidePanel.Font;
+                    rText.Inflate(-1, -1);
+
+                    if ((m_AutoHidePanel.Dock == DockStyle.Left || m_AutoHidePanel.Dock == DockStyle.Right))
+                    {
+                        rText.Y += 2;
+                        g.RotateTransform(90);
+                        rText = new Rectangle(rText.Top, -rText.Right, rText.Height, rText.Width);
+                    }
+
+                    if (rText.Width > MIN_TEXT_WIDTH)
+                    {
+                        TextDrawing.DrawStringLegacy(g, tab.Text, font, colors.TextColor, rText, strFormat);
+                    }
+
+                    if ((m_AutoHidePanel.Dock == DockStyle.Left || m_AutoHidePanel.Dock == DockStyle.Right))
+                        g.ResetTransform();
+                }
+            }
+
+            protected virtual LinearGradientBrush CreateTabGradientBrush(Rectangle r, Color color1, Color color2, int gradientAngle)
+            {
+                if (r.Width <= 0)
+                    r.Width = 1;
+                if (r.Height <= 0)
+                    r.Height = 1;
+                LinearGradientBrush brush = new System.Drawing.Drawing2D.LinearGradientBrush(new Rectangle(r.X, r.Y - 1, r.Width, r.Height + 1), color1, color2, gradientAngle);
+                return brush;
+            }
+
+            protected virtual GraphicsPath GetTabItemPath(DockItemTab tab)
+            {
+                Rectangle r = tab.DisplayRectangle;
+                if (m_AutoHidePanel.Dock == DockStyle.Left)
+                    r = new Rectangle(r.X - (r.Height - r.Width), r.Y, r.Height, r.Width);
+                else if (m_AutoHidePanel.Dock == DockStyle.Right)
+                    r = new Rectangle(r.X, r.Y, r.Height, r.Width);
+
+                r.Offset(0, 1);
+
+                GraphicsPath path = new GraphicsPath();
+                int cornerSize = 2;
+                // Left line
+                //path.AddPath(GetLeftLine(r),true);
+                path.AddLine(r.X, r.Bottom, r.X, r.Y + cornerSize);
+
+                // Top line
+                path.AddLine(r.X + cornerSize, r.Y, r.Right - cornerSize, r.Y);
+
+                // Right line
+                //path.AddPath(GetRightLine(r),true);
+                path.AddLine(r.Right, r.Y + cornerSize, r.Right, r.Bottom);
+
+                // Bottom line
+                //path.AddLine(r.Right+m_xTabOffset,r.Bottom,r.X-m_xTabOffset,r.Bottom);
+                path.AddLine(r.Right, r.Bottom, r.X, r.Bottom);
+
+                path.CloseAllFigures();
+
+                if (m_AutoHidePanel.Dock == DockStyle.Top)
+                {
+                    // Bottom
+                    Matrix m = new Matrix();
+                    m.RotateAt(180, new PointF(r.X + r.Width / 2, r.Y + r.Height / 2));
+                    path.Transform(m);
+                }
+                else if (m_AutoHidePanel.Dock == DockStyle.Right)
+                {
+                    // Left
+                    Matrix m = new Matrix();
+                    m.RotateAt(-90, new PointF(r.X, r.Bottom));
+                    m.Translate(r.Height, r.Width - r.Height, MatrixOrder.Append);
+                    path.Transform(m);
+                }
+                else if (m_AutoHidePanel.Dock == DockStyle.Left)
+                {
+                    // Right
+                    Matrix m = new Matrix();
+                    m.RotateAt(90, new PointF(r.Right, r.Bottom));
+                    m.Translate(-r.Height, r.Width - (r.Height - 1), MatrixOrder.Append);
+                    path.Transform(m);
+                }
+
+                return path;
+            }
+
+            private GraphicsPath GetLeftLine(Rectangle r)
+            {
+                GraphicsPath path = new GraphicsPath();
+                // Left line
+                path.AddLine(r.X - m_xTabOffset, r.Bottom, r.X, r.Y + 5);
+                Point[] pc = new Point[3];
+                pc[0] = new Point(r.X, r.Y + 5);
+                pc[1] = new Point(r.X + 2, r.Y + 2);
+                pc[2] = new Point(r.X + 5, r.Y);
+                path.AddCurve(pc, .9f);
+                return path;
+            }
+
+            private GraphicsPath GetRightLine(Rectangle r)
+            {
+                GraphicsPath path = new GraphicsPath();
+                // Right line
+                Point[] pc = new Point[3];
+                pc[0] = new Point(r.Right - 5, r.Y);
+                pc[1] = new Point(r.Right - 2, r.Y + 2);
+                pc[2] = new Point(r.Right, r.Y + 5);
+                path.AddCurve(pc, .9f);
+                path.AddLine(r.Right, r.Y + 5, r.Right + m_xTabOffset, r.Bottom);
+                return path;
+            }
+        }
+        #endregion
+
+        #region VS2012 Tab Display
+        private class VS2012TabDisplay : VS2005TabDisplay
+        {
+            private const int BorderSize = 6;
+            /// <summary>
+            /// Creates new instance of the class.
+            /// </summary>
+            public VS2012TabDisplay(AutoHidePanel autoHidePanel, ColorScheme colorScheme)
+                : base(autoHidePanel, colorScheme)
+            {
+            }
+
+            protected override GraphicsPath GetTabItemPath(DockItemTab tab)
+            {
+                Rectangle r = tab.DisplayRectangle;
+                if (m_AutoHidePanel.Dock == DockStyle.Left)
+                    r = new Rectangle(r.X - (r.Height - r.Width), r.Y, r.Height, r.Width);
+                else if (m_AutoHidePanel.Dock == DockStyle.Right)
+                    r = new Rectangle(r.X, r.Y, r.Height, r.Width);
+
+                r.Offset(0, 1);
+
+                GraphicsPath path = new GraphicsPath();
+                path.AddRectangle(r);
+
+                return path;
+            }
+            protected override void DrawTabItemBackground(DockItemTab tab, GraphicsPath path, TabColors colors, Graphics g)
+            {
+                Rectangle tabRect = tab.DisplayRectangle;
+
+                if (!colors.BackColor.IsEmpty)
+                {
+                    using (SolidBrush brush = new SolidBrush(colors.BackColor))
+                        g.FillPath(brush, path);
+                }
+                if (!colors.BorderColor.IsEmpty)
+                {
+                    Rectangle br = new Rectangle(tabRect.X, tabRect.Y, BorderSize, tabRect.Height);
+                    if (m_AutoHidePanel.Dock == DockStyle.Right)
+                        br = new Rectangle(tabRect.Right - BorderSize, tabRect.Y, BorderSize, tabRect.Height);
+                    else if (m_AutoHidePanel.Dock == DockStyle.Top)
+                        br = new Rectangle(tabRect.X, tabRect.Y, tabRect.Width, BorderSize);
+                    else if (m_AutoHidePanel.Dock == DockStyle.Bottom)
+                        br = new Rectangle(tabRect.X, tabRect.Bottom - BorderSize, tabRect.Width, BorderSize);
+                    using (SolidBrush brush = new SolidBrush(colors.BorderColor))
+                        g.FillRectangle(brush, br);
+                }
+            }
+            protected override TabColors GetTabColors(DockItemTab tab, bool selected)
+            {
+                selected = tab.IsMouseOver;
+                return base.GetTabColors(tab, selected);
+            }
+        }
+        #endregion
+    }
+}
+
diff --git a/PROMS/DotNetBar Source Code/Balloon.cs b/PROMS/DotNetBar Source Code/Balloon.cs
new file mode 100644
index 00000000..11c8adda
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Balloon.cs	
@@ -0,0 +1,2060 @@
+using System;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Collections;
+using System.ComponentModel;
+using System.Windows.Forms;
+using System.Drawing.Text;
+using DevComponents.DotNetBar.Rendering;
+using DevComponents.DotNetBar.Rendering;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Indicates the Balloon tip position.
+	/// </summary>
+	public enum eTipPosition
+	{
+		/// <summary>
+		/// Tip is on the top.
+		/// </summary>
+		Top=0,
+		/// <summary>
+		/// Tip is on the left side.
+		/// </summary>
+		Left=1,
+		/// <summary>
+		/// Tip is on the right side.
+		/// </summary>
+		Right=2,
+		/// <summary>
+		/// Tip is on the bottom.
+		/// </summary>
+		Bottom=3
+	}
+
+	/// <summary>
+	/// Indicates the style of the balloon.
+	/// </summary>
+	public enum eBallonStyle
+	{
+		Balloon=0,
+		Alert=1,
+        Office2007Alert
+	}
+
+	/// <summary>
+	/// Indicates type of Alert animation performed when alert is displayed.
+	/// </summary>
+	public enum eAlertAnimation
+	{
+		/// <summary>
+		/// No animation take place when alert is displayed.
+		/// </summary>
+		None=0,
+		/// <summary>
+		/// Alert is animated from bottom to top. (Default)
+		/// </summary>
+		BottomToTop=1,
+		/// <summary>
+		/// Alert is animated from top to bottom.
+		/// </summary>
+		TopToBottom=2,
+		/// <summary>
+		/// Alert is animated from left to right.
+		/// </summary>
+		LeftToRight=3,
+		/// <summary>
+		/// Alert is animated from right to left.
+		/// </summary>
+		RightToLeft=4
+	}
+
+	/// <summary>
+	/// Delegate for custom paint event handler.
+	/// </summary>
+	public delegate void CustomPaintEventHandler(object sender, CustomPaintEventArgs e);
+
+	/// <summary>
+	/// Summary description for Balloon.
+	/// </summary>
+    [ToolboxItem(false), System.Runtime.InteropServices.ComVisible(false), Designer("System.Windows.Forms.Design.ParentControlDesigner, System.Design, Version= 2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
+	public class Balloon : System.Windows.Forms.Form
+	{
+		private System.ComponentModel.IContainer components;
+		#region Event Definition
+		/// <summary>
+		/// Occurs when background is redrawn.
+		/// </summary>
+		public event CustomPaintEventHandler PaintBackground;
+		/// <summary>
+		/// Occurs when caption image is redrawn.
+		/// </summary>
+		public event CustomPaintEventHandler PaintCaptionImage;
+		/// <summary>
+		/// Occurs when caption text is redrawn.
+		/// </summary>
+		public event CustomPaintEventHandler PaintCaptionText;
+		/// <summary>
+		/// Occurs when text is redrawn.
+		/// </summary>
+		public event CustomPaintEventHandler PaintText;
+		/// <summary>
+		/// Occurs when close button is clicked.
+		/// </summary>
+		public event EventHandler CloseButtonClick;
+		/// <summary>
+		/// Occurs when TipPosition property has changed.
+		/// </summary>
+		public event EventHandler TipPositionChanged;
+		#endregion
+
+
+		private int m_TipLength=16;
+		private int m_CornerSize=8;
+		private int m_TipOffset=32;
+		private eTipPosition m_TipPosition=eTipPosition.Top;
+
+		private Color m_BackColor2=Color.Empty;
+		private int m_BackColorGradientAngle=90;
+
+		private eBackgroundImagePosition m_BackgroundImagePosition=eBackgroundImagePosition.Stretch;
+		private int m_BackgroundImageAlpha=255;
+
+		private Color m_BorderColor=SystemColors.InfoText;
+
+		private bool m_ShowCloseButton=true;
+		private ImageButton m_CloseButton=null;
+
+		private eBallonStyle m_Style=eBallonStyle.Balloon;
+
+		private Image m_CloseButtonNormal=null, m_CloseButtonHot=null, m_CloseButtonPressed=null;
+		private Image m_CaptionImage=null;
+		private Icon m_CaptionIcon=null;
+		private Font m_CaptionFont=null;
+		private string m_CaptionText="";
+		private StringAlignment m_CaptionAlignment=StringAlignment.Near;
+		private Color m_CaptionColor=SystemColors.InfoText;
+
+		private StringAlignment m_TextAlignment=StringAlignment.Near;
+		private StringAlignment m_TextLineAlignment=StringAlignment.Center;
+
+		// Layout rectangles
+		private Rectangle m_CaptionImageRectangle=Rectangle.Empty;
+		private Rectangle m_CaptionRectangle=Rectangle.Empty;
+		private Rectangle m_TextRectangle=Rectangle.Empty;
+
+		private bool m_AutoClose=true;
+		private int m_AutoCloseTimeOut=0;
+		private System.Windows.Forms.Timer m_Timer=null;
+
+		const int IMAGETEXT_SPACING=4;
+		const int TEXTCLOSE_SPACING=4;
+		const int CAPTIONTEXT_VSPACING=1;
+		const int CAPTIONALERT_VSPACING=1;
+
+		private Color m_BorderColor1=Color.FromArgb(241,239,226);
+		private Color m_BorderColor2=Color.White;
+		private Color m_BorderColor3=Color.FromArgb(236,233,216);
+		private Color m_BorderColor4=Color.FromArgb(172,168,153);
+		private Color m_BorderColor5=Color.FromArgb(113,111,100);
+
+		private eAlertAnimation m_AlertAnimation=eAlertAnimation.BottomToTop;
+		private int m_AlertAnimationDuration=200;
+		private bool m_AnimationInProgress=false;
+        private bool m_AntiAlias = true;
+
+		public Balloon()
+		{
+			CreateCloseButton();
+			//
+			// Required for Windows Form Designer support
+			//
+			InitializeComponent();
+			if(components==null)
+				this.components = new System.ComponentModel.Container();
+			m_CaptionFont=new Font(this.Font,FontStyle.Bold);
+
+			this.SetStyle(ControlStyles.UserPaint,true);
+			this.SetStyle(ControlStyles.AllPaintingInWmPaint,true);
+			//this.SetStyle(ControlStyles.Opaque,true);
+			this.SetStyle(ControlStyles.ResizeRedraw,true);
+			this.SetStyle(DisplayHelp.DoubleBufferFlag,true);
+			this.SetStyle(ControlStyles.ContainerControl,true);
+		}
+
+	    /// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		protected override void Dispose( bool disposing )
+		{
+			DestroyAutoCloseTimer();
+			if( disposing )
+			{
+				if(components != null)
+				{
+					components.Dispose();
+				}
+			}
+
+            if (BarUtilities.DisposeItemImages && !this.DesignMode)
+            {
+                BarUtilities.DisposeImage(ref m_CaptionIcon);
+                BarUtilities.DisposeImage(ref m_CaptionImage);
+                BarUtilities.DisposeImage(ref m_CloseButtonHot);
+                BarUtilities.DisposeImage(ref m_CloseButtonNormal);
+                BarUtilities.DisposeImage(ref m_CloseButtonPressed);
+            }
+			base.Dispose( disposing );
+		}
+
+        /// <summary>
+        /// Gets or sets whether anti-alias smoothing is used while painting. Default value is false.
+        /// </summary>
+        [DefaultValue(true), Browsable(true), Category("Appearance"), Description("Gets or sets whether anti-aliasing is used while painting.")]
+        public bool AntiAlias
+        {
+            get { return m_AntiAlias; }
+            set
+            {
+                m_AntiAlias = value;
+                this.Invalidate();
+            }
+        }
+
+		#region Windows Form 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()
+		{
+			// 
+			// Balloon
+			// 
+			this.AccessibleRole = System.Windows.Forms.AccessibleRole.HelpBalloon;
+			this.AutoScaleBaseSize = new System.Drawing.Size(5, 13);
+            this.AutoScaleMode = AutoScaleMode.None;
+            this.BackColor = System.Drawing.SystemColors.Info; // ColorScheme.GetColor(0xFFFFBD);//
+			this.ClientSize = new System.Drawing.Size(192, 80);
+			this.ControlBox = false;
+			this.ForeColor = System.Drawing.SystemColors.InfoText;
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.Name = "Balloon";
+			this.ShowInTaskbar = false;
+			this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
+
+		}
+		#endregion
+
+		protected override void OnClick(EventArgs e)
+		{
+			if(m_ShowCloseButton && m_CloseButton.Bounds.Contains(this.PointToClient(Control.MousePosition)))
+				return;
+			base.OnClick(e);
+		}
+
+		protected override void OnPaint(PaintEventArgs e)
+		{
+            SmoothingMode sm = e.Graphics.SmoothingMode;
+            TextRenderingHint th = e.Graphics.TextRenderingHint;
+
+            if (m_AntiAlias)
+            {
+                e.Graphics.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.HighQuality;
+                e.Graphics.TextRenderingHint = DisplayHelp.AntiAliasTextRenderingHint;
+            }
+
+			if(m_Style==eBallonStyle.Balloon)
+				PaintBalloon(e.Graphics);
+			else
+				PaintAlert(e.Graphics);
+
+            e.Graphics.SmoothingMode = sm;
+            e.Graphics.TextRenderingHint = th;
+		}
+
+		private void PaintAlert(Graphics g)
+		{
+			Rectangle client=this.GetAlertClientRect();
+			if(PaintBackground!=null)
+				PaintBackground(this,new CustomPaintEventArgs(g,client));
+			else
+			{
+				PaintBackgroundInternal(g);
+                if (m_Style == eBallonStyle.Alert)
+                {
+                    // Paint Caption Background
+                    Rectangle rCap = client;
+                    rCap.Height = Math.Max(m_CaptionImageRectangle.Bottom, m_CaptionRectangle.Bottom) - rCap.Top;
+                    rCap.Height += CAPTIONALERT_VSPACING;
+                    if (rCap.Width > 0 && rCap.Height > 0)
+                    {
+                        using (LinearGradientBrush gradient = BarFunctions.CreateLinearGradientBrush(rCap, this.BackColor, m_BackColor2, m_BackColorGradientAngle))
+                        {
+                            Blend b = new Blend(4);
+                            b.Positions = new float[] { 0f, .5f, .5f, 1f };
+                            b.Factors = new float[] { 0f, 1f, 1f, 0f };
+                            gradient.Blend = b;
+                            g.FillRectangle(gradient, rCap);
+                        }
+                    }
+                }
+			}
+
+			// Draw Border
+			Rectangle r=this.DisplayRectangle;
+            if (m_Style == eBallonStyle.Office2007Alert)
+            {
+                DisplayHelp.DrawRectangle(g, m_BorderColor, r);
+            }
+            else
+            {
+                r.Width--;
+                r.Height--;
+                using (Pen pen = new Pen(m_BorderColor1, 1))
+                {
+                    g.DrawLine(pen, r.X, r.Y, r.Right, r.Y);
+                    g.DrawLine(pen, r.X, r.Y, r.X, r.Bottom);
+                    g.DrawLine(pen, r.X + 4, r.Bottom - 4, r.Right - 4, r.Bottom - 4);
+                    g.DrawLine(pen, r.Right - 4, r.Y + 4, r.Right - 4, r.Bottom - 4);
+                }
+                using (Pen pen = new Pen(m_BorderColor2, 1))
+                {
+                    g.DrawLine(pen, r.X + 1, r.Y + 1, r.Right - 1, r.Y + 1);
+                    g.DrawLine(pen, r.X + 1, r.Y + 1, r.X + 1, r.Bottom - 1);
+                    g.DrawLine(pen, r.X + 3, r.Bottom - 3, r.Right - 3, r.Bottom - 3);
+                    g.DrawLine(pen, r.Right - 3, r.Y + 3, r.Right - 3, r.Bottom - 3);
+                }
+                using (Pen pen = new Pen(m_BorderColor3, 1))
+                {
+                    g.DrawLine(pen, r.X + 2, r.Y + 2, r.Right - 2, r.Y + 2);
+                    g.DrawLine(pen, r.X + 2, r.Y + 2, r.X + 2, r.Bottom - 2);
+                    g.DrawLine(pen, r.X + 2, r.Bottom - 2, r.Right - 2, r.Bottom - 2);
+                    g.DrawLine(pen, r.Right - 2, r.Y + 2, r.Right - 2, r.Bottom - 2);
+                }
+                using (Pen pen = new Pen(m_BorderColor4, 1))
+                {
+                    g.DrawLine(pen, r.X + 3, r.Y + 3, r.Right - 3, r.Y + 3);
+                    g.DrawLine(pen, r.X + 3, r.Y + 3, r.X + 3, r.Bottom - 3);
+                    g.DrawLine(pen, r.X + 1, r.Bottom - 1, r.Right - 1, r.Bottom - 1);
+                    g.DrawLine(pen, r.Right - 1, r.Y + 1, r.Right - 1, r.Bottom - 1);
+                }
+                using (Pen pen = new Pen(m_BorderColor5, 1))
+                {
+                    g.DrawLine(pen, r.X + 4, r.Y + 4, r.Right - 4, r.Y + 4);
+                    g.DrawLine(pen, r.X + 4, r.Y + 4, r.X + 4, r.Bottom - 4);
+                    g.DrawLine(pen, r.X, r.Bottom, r.Right, r.Bottom);
+                    g.DrawLine(pen, r.Right, r.Y, r.Right, r.Bottom);
+                }
+            }
+
+	
+			if(m_CloseButton!=null)
+				m_CloseButton.Paint(g);
+
+			if(PaintCaptionImage!=null)
+				PaintCaptionImage(this,new CustomPaintEventArgs(g,m_CaptionImageRectangle));
+			else
+			{
+				CompositeImage image=this.ImageInternal;
+				if(image!=null && !m_CaptionImageRectangle.IsEmpty)
+					image.DrawImage(g,m_CaptionImageRectangle);
+			}
+
+			if(PaintCaptionText!=null)
+				PaintCaptionText(this,new CustomPaintEventArgs(g,m_CaptionRectangle));
+			else
+			{
+				if(m_CaptionText!="" && !m_CaptionRectangle.IsEmpty)
+				{
+                    eTextFormat format = eTextFormat.Default | eTextFormat.WordBreak;
+                    if (m_CaptionAlignment == StringAlignment.Center)
+                        format |= eTextFormat.HorizontalCenter;
+                    else if (m_CaptionAlignment == StringAlignment.Far)
+                        format |= eTextFormat.Right;
+					Font font=m_CaptionFont;
+					if(font==null)
+						font=this.Font;
+                    if (_CaptionTextMarkup != null)
+                    {
+                        TextMarkup.MarkupDrawContext d = new TextMarkup.MarkupDrawContext(g, font, m_CaptionColor, (this.RightToLeft == RightToLeft.Yes), r, true);
+                        _CaptionTextMarkup.Arrange(m_CaptionRectangle, d);
+                        _CaptionTextMarkup.Render(d);
+                    }
+                    else
+    					TextDrawing.DrawString(g, m_CaptionText, font, m_CaptionColor, m_CaptionRectangle, format);
+				}
+			}
+
+			if(PaintText!=null)
+				PaintText(this,new CustomPaintEventArgs(g,m_TextRectangle));
+			else
+			{
+				if(this.Text!="")
+				{
+                    eTextFormat format = eTextFormat.Default | eTextFormat.WordBreak;
+                    if (m_TextAlignment == StringAlignment.Center)
+                        format |= eTextFormat.HorizontalCenter;
+                    else if (m_TextAlignment == StringAlignment.Far)
+                        format |= eTextFormat.Right;
+                    if (m_TextLineAlignment == StringAlignment.Center)
+                        format |= eTextFormat.VerticalCenter;
+                    else if (m_TextLineAlignment == StringAlignment.Far)
+                        format |= eTextFormat.Bottom;
+                    if (_TextMarkup != null)
+                    {
+                        TextMarkup.MarkupDrawContext d = new TextMarkup.MarkupDrawContext(g, this.Font, this.ForeColor,
+                            (this.RightToLeft == RightToLeft.Yes), r, true);
+                        _TextMarkup.Arrange(m_TextRectangle, d);
+                        _TextMarkup.Render(d);
+                    }
+                    else
+                        TextDrawing.DrawString(g, this.Text, this.Font, this.ForeColor, m_TextRectangle, format);
+				}
+			}
+		}
+
+		private void PaintBalloon(Graphics g)
+		{
+            Rectangle r = new Rectangle(0, 0, this.Width, this.Height); //this.DisplayRectangle;
+			GraphicsPath path=this.GetBalloonPath(r);
+			if(PaintBackground!=null)
+				PaintBackground(this,new CustomPaintEventArgs(g,r));
+			else
+				PaintBackgroundInternal(g);
+
+			using(Pen pen=new Pen(m_BorderColor,1))
+			{
+				pen.Alignment=PenAlignment.Inset;
+				g.DrawPath(pen,path);
+			}
+
+			if(m_CloseButton!=null)
+				m_CloseButton.Paint(g);
+
+			if(PaintCaptionImage!=null)
+				PaintCaptionImage(this,new CustomPaintEventArgs(g,m_CaptionImageRectangle));
+			else
+			{
+				CompositeImage image=this.ImageInternal;
+				if(image!=null && !m_CaptionImageRectangle.IsEmpty)
+					image.DrawImage(g,m_CaptionImageRectangle);
+			}
+
+			if(PaintCaptionText!=null)
+				PaintCaptionText(this,new CustomPaintEventArgs(g,m_CaptionRectangle));
+			else
+			{
+				if(m_CaptionText!="" && !m_CaptionRectangle.IsEmpty)
+				{
+                    eTextFormat format = eTextFormat.Default | TextDrawing.TranslateHorizontal(m_CaptionAlignment) | eTextFormat.WordBreak;
+                    Font font = m_CaptionFont;
+                    if (font == null)
+                        font = this.Font;
+
+
+				    if (_CaptionTextMarkup != null)
+				    {
+                        TextMarkup.MarkupDrawContext d = new TextMarkup.MarkupDrawContext(g, font, m_CaptionColor, (this.RightToLeft == RightToLeft.Yes), r, true);
+                        _CaptionTextMarkup.Arrange(m_CaptionRectangle, d);
+                        _CaptionTextMarkup.Render(d);
+				    }
+                    else
+                        TextDrawing.DrawString(g, m_CaptionText, font, m_CaptionColor, m_CaptionRectangle, format);
+				}
+			}
+
+			if(PaintText!=null)
+				PaintText(this,new CustomPaintEventArgs(g,m_TextRectangle));
+			else
+			{
+				if(this.Text!="")
+				{
+                    eTextFormat format = eTextFormat.Default | TextDrawing.TranslateHorizontal(m_TextAlignment) |
+                        TextDrawing.TranslateVertical(m_TextLineAlignment) | eTextFormat.WordBreak;
+				    if (_TextMarkup != null)
+				    {
+                        TextMarkup.MarkupDrawContext d = new TextMarkup.MarkupDrawContext(g, this.Font, this.ForeColor,
+                            (this.RightToLeft == RightToLeft.Yes), r, true);
+                        _TextMarkup.Arrange(m_TextRectangle, d);
+                        _TextMarkup.Render(d);
+				    }
+                    else
+    					TextDrawing.DrawString(g, this.Text, this.Font, this.ForeColor, m_TextRectangle, format);
+				}
+			}
+		}
+
+		protected override void OnResize(EventArgs e)
+		{
+			base.OnResize(e);
+			if(!m_AnimationInProgress)
+				this.RecalcLayout();
+		}
+        private int _MinimumBalloonWidth = 180;
+        /// <summary>
+        /// Gets or sets the minimum balloon width when auto sizing balloon. Default value is 180.
+        /// </summary>
+        [DefaultValue(180), Category("Appearance"), Description("Indicates minimum balloon width when auto sizing balloon.")]
+        public int MinimumBalloonWidth
+        {
+            get { return _MinimumBalloonWidth; }
+            set { _MinimumBalloonWidth = value; }
+        }
+
+        private TextMarkup.BodyElement _TextMarkup = null;
+        protected override void OnTextChanged(EventArgs e)
+        {
+            string text = this.Text;
+
+            if (_TextMarkup != null)
+            {
+                _TextMarkup.MouseLeave(this);
+                _TextMarkup.HyperLinkClick -= new EventHandler(TextMarkupLinkClicked);
+                _TextMarkup = null;
+            }
+
+            if (TextMarkup.MarkupParser.IsMarkup(ref text))
+                _TextMarkup = TextMarkup.MarkupParser.Parse(text);
+
+            if (_TextMarkup != null)
+            {
+                _TextMarkup.HyperLinkClick += new EventHandler(TextMarkupLinkClicked);
+            }
+            this.Invalidate();
+            base.OnTextChanged(e);
+        }
+
+        private void TextMarkupLinkClicked(object sender, EventArgs e)
+        {
+            TextMarkup.HyperLink link = sender as TextMarkup.HyperLink;
+            if (link != null)
+            {
+                OnMarkupLinkClick(new MarkupLinkClickEventArgs(link.Name, link.HRef));
+            }
+        }
+
+        /// <summary>
+        /// Occurs when text markup link is clicked. Markup links can be created using "a" tag, for example:
+        /// <a name="MyLink">Markup link</a>
+        /// </summary>
+        [Description("Occurs when text markup link is clicked. Markup links can be created using <a> tag.")]
+        public event MarkupLinkClickEventHandler MarkupLinkClick;
+
+        protected virtual void OnMarkupLinkClick(MarkupLinkClickEventArgs e)
+        {
+            if (this.MarkupLinkClick != null)
+                MarkupLinkClick(this, e);
+        }
+
+        protected virtual Size ResizeMarkup(Graphics g, int containerWidth)
+        {
+            if (_TextMarkup != null)
+            {
+                Rectangle r= new Rectangle(0,0,containerWidth, 1);
+                TextMarkup.MarkupDrawContext d = new TextMarkup.MarkupDrawContext(g, this.Font, SystemColors.Control, (this.RightToLeft == RightToLeft.Yes));
+                _TextMarkup.Measure(r.Size, d);
+                //_TextMarkup.Arrange(r, d);
+                return _TextMarkup.Bounds.Size;
+            }
+            return Size.Empty;
+        }
+
+        protected virtual Size ResizeCaptionMarkup(Graphics g, int containerWidth)
+        {
+            if (_CaptionTextMarkup != null)
+            {
+                Rectangle r = new Rectangle(0, 0, containerWidth, 1);
+                TextMarkup.MarkupDrawContext d = new TextMarkup.MarkupDrawContext(g, this.Font, SystemColors.Control, (this.RightToLeft == RightToLeft.Yes));
+                _CaptionTextMarkup.Measure(r.Size, d);
+                //_TextMarkup.Arrange(r, d);
+                return _CaptionTextMarkup.Bounds.Size;
+            }
+            return Size.Empty;
+        }
+
+		/// <summary>
+		/// Auto resize balloon to the content. Balloon width is calculated so image and caption text can fit in single line.
+		/// </summary>
+		public void AutoResize()
+		{
+            System.Drawing.Size newSize = new Size(Dpi.Width(_MinimumBalloonWidth), 0);
+			
+			Size strSize=Size.Empty;
+
+			// Calculates caption text rectangle height
+			Font font=m_CaptionFont;
+			if(font==null)
+				font=this.Font;
+			Graphics g=this.CreateGraphics();
+			try
+			{
+			    if (_CaptionTextMarkup != null)
+			        strSize = ResizeCaptionMarkup(g, 800);
+                else
+                    strSize = TextDrawing.MeasureString(g,(m_CaptionText != "" ? m_CaptionText : " "), font);
+
+                newSize.Width = Math.Max(newSize.Width, strSize.Width);
+				if(m_CloseButton!=null)
+					newSize.Width+=Dpi.Width(m_CloseButton.Size.Width);
+				else
+					newSize.Width+=Dpi.Width18;
+				newSize.Width+=TEXTCLOSE_SPACING;
+				
+				int imageHeight=0;
+				if(m_CaptionIcon!=null)
+				{
+					newSize.Width+=Dpi.Width(m_CaptionIcon.Width+IMAGETEXT_SPACING);
+                    imageHeight = Dpi.Height(m_CaptionIcon.Height);
+				}
+				else if(m_CaptionImage!=null)
+				{
+					newSize.Width+=Dpi.Width(m_CaptionImage.Width+IMAGETEXT_SPACING);
+                    imageHeight = Dpi.Height(m_CaptionImage.Height);
+				}
+
+				newSize.Height+=Math.Max(imageHeight,strSize.Height);
+				newSize.Height+=IMAGETEXT_SPACING*2;
+
+			    if (_TextMarkup == null)
+			        strSize = TextDrawing.MeasureString(g, (this.Text != "" ? this.Text : " "), this.Font, newSize.Width,
+			            eTextFormat.Default | eTextFormat.WordBreak);
+			    else
+			        strSize = ResizeMarkup(g, newSize.Width);
+
+				newSize.Height+=strSize.Height;
+
+				newSize.Width+=m_CornerSize*2;
+				newSize.Height+=m_CornerSize*2;
+				
+				if(m_Style==eBallonStyle.Balloon)
+				{
+					if(m_TipPosition==eTipPosition.Left || m_TipPosition==eTipPosition.Right)
+						newSize.Width+=Dpi.Width(m_TipLength);
+					else
+						newSize.Height+=Dpi.Height(m_TipLength);
+				}
+				else
+					newSize.Height+=(int)((float)newSize.Height*.3);
+			}
+			finally
+			{
+				g.Dispose();
+			}
+
+			this.Size=newSize;
+		}
+
+		/// <summary>
+		/// Recalculates layout of the balloon.
+		/// </summary>
+		public void RecalcLayout()
+		{
+			if(this.DisplayRectangle.Width==0 || this.DisplayRectangle.Height==0)
+				return;
+
+		    Size closeButtonSize = Size.Empty;
+		    if (m_CloseButton != null)
+		        closeButtonSize = m_CloseButton.Size;
+		    if(m_Style==eBallonStyle.Balloon)
+			{
+				Rectangle client=new Rectangle(m_CornerSize/2,m_CornerSize/2,this.Width-m_CornerSize,this.Height-m_CornerSize);
+				if(m_TipPosition==eTipPosition.Bottom)
+					client.Height-=m_TipLength;
+				else if(m_TipPosition==eTipPosition.Left)
+				{
+					client.X+=m_TipLength;
+					client.Width-=m_TipLength;
+				}
+				else if(m_TipPosition==eTipPosition.Right)
+					client.Width-=m_TipLength;
+				else
+				{
+					// TOP
+					client.Y+=m_TipLength;
+					client.Height-=m_TipLength;
+				}
+
+				System.Drawing.Size imageSize=System.Drawing.Size.Empty;
+				if(m_CaptionIcon!=null)
+					imageSize=Dpi.ImageSize(m_CaptionIcon.Size);
+				else if(m_CaptionImage!=null)
+					imageSize=Dpi.ImageSize(m_CaptionImage.Size);
+
+				m_CaptionRectangle=client;
+				if(!imageSize.IsEmpty)
+				{
+					m_CaptionRectangle.X+=(imageSize.Width+IMAGETEXT_SPACING);
+					m_CaptionRectangle.Width-=(imageSize.Width+IMAGETEXT_SPACING);
+				}
+				
+				// Calculates position of the close button if visible
+				if(m_CloseButton!=null)
+				{
+                    m_CloseButton.Location = new Point(client.Right - closeButtonSize.Width, client.Top);
+					m_CaptionRectangle.Width-=(closeButtonSize.Width+TEXTCLOSE_SPACING);
+				}
+
+				// Calculates caption text rectangle height
+				Font font=m_CaptionFont;
+				if(font==null)
+					font=this.Font;
+				Graphics g=this.CreateGraphics();
+				try
+				{
+                    eTextFormat format = eTextFormat.Default | eTextFormat.WordBreak;
+                    if (m_CaptionAlignment == StringAlignment.Center)
+                        format = eTextFormat.HorizontalCenter;
+                    else if (m_CaptionAlignment == StringAlignment.Far)
+                        format = eTextFormat.Right;
+				    Size strSize = Size.Empty;
+				    if (_CaptionTextMarkup != null)
+				        strSize = ResizeCaptionMarkup(g, m_CaptionRectangle.Width);
+                    else
+                    strSize = TextDrawing.MeasureString(g,(m_CaptionText!=""?m_CaptionText:" "),font,m_CaptionRectangle.Width,format);
+					m_CaptionRectangle.Height=strSize.Height;
+				}
+				finally
+				{
+					g.Dispose();
+				}
+
+				// Calculates position of the image rectangle
+				if(!imageSize.IsEmpty)
+				{
+					m_CaptionImageRectangle=new Rectangle(client.X,client.Y,imageSize.Width,imageSize.Height);
+					if(m_CaptionRectangle.Height>imageSize.Height)
+						m_CaptionImageRectangle.Y+=(int)(m_CaptionRectangle.Height-imageSize.Height)/2;
+					else if(imageSize.Height>m_CaptionRectangle.Height)
+						m_CaptionRectangle.Y+=(int)(imageSize.Height-m_CaptionRectangle.Height)/2;
+
+				}
+				else if(m_CloseButton!=null && closeButtonSize.Height>m_CaptionRectangle.Height)
+					m_CaptionRectangle.Y+=(int)(closeButtonSize.Height-m_CaptionRectangle.Height)/2;
+				
+				// Calculates the rectangle for balloon text
+				if(m_CaptionRectangle.Bottom>m_CaptionImageRectangle.Bottom)
+					m_TextRectangle=new Rectangle(client.X,m_CaptionRectangle.Bottom+CAPTIONTEXT_VSPACING,client.Width,client.Bottom-(m_CaptionRectangle.Bottom+CAPTIONTEXT_VSPACING));
+				else
+					m_TextRectangle=new Rectangle(client.X,m_CaptionImageRectangle.Bottom+CAPTIONTEXT_VSPACING,client.Width,client.Bottom-(m_CaptionImageRectangle.Bottom+CAPTIONTEXT_VSPACING));
+
+				// Calculates and sets the balloon window region
+				GraphicsPath path=this.GetBalloonPath(this.DisplayRectangle);
+				GraphicsPath tmpPath = (GraphicsPath)path.Clone();
+				tmpPath.Widen(Pens.Black);
+				Region region = new Region(tmpPath);
+				region.Union(path);
+				this.Region=region;
+                path.Dispose();
+                tmpPath.Dispose();
+			}
+			else
+			{
+				Rectangle client=this.GetAlertClientRect();
+				System.Drawing.Size imageSize=System.Drawing.Size.Empty;
+
+				if(m_CaptionIcon!=null)
+					imageSize=Dpi.ImageSize(m_CaptionIcon.Size);
+				else if(m_CaptionImage!=null)
+					imageSize=Dpi.ImageSize(m_CaptionImage.Size);
+
+				m_CaptionRectangle=client;
+				if(!imageSize.IsEmpty)
+				{
+					m_CaptionRectangle.X+=(imageSize.Width+IMAGETEXT_SPACING*2);
+					m_CaptionRectangle.Width-=(imageSize.Width+IMAGETEXT_SPACING*2);
+				}
+				
+				// Calculates position of the close button if visible
+				if(m_CloseButton!=null)
+				{
+					m_CloseButton.Location=new Point(client.Right-m_CloseButton.Bounds.Width-CAPTIONALERT_VSPACING,client.Top);
+					m_CaptionRectangle.Width-=(closeButtonSize.Width+TEXTCLOSE_SPACING+CAPTIONALERT_VSPACING);
+				}
+
+				// Calculates caption text rectangle height
+				Font font=m_CaptionFont;
+				if(font==null)
+					font=this.Font;
+				Graphics g=this.CreateGraphics();
+				try
+				{
+                    eTextFormat format = eTextFormat.Default | eTextFormat.WordBreak;
+                    if (m_CaptionAlignment == StringAlignment.Center)
+                        format = eTextFormat.HorizontalCenter;
+                    else if (m_CaptionAlignment == StringAlignment.Far)
+                        format = eTextFormat.Right;
+                    Size strSize = TextDrawing.MeasureString(g, (m_CaptionText != "" ? m_CaptionText : " "), font, m_CaptionRectangle.Width, format);
+					m_CaptionRectangle.Height=strSize.Height;
+				}
+				finally
+				{
+					g.Dispose();
+				}
+
+				// Calculates position of the image rectangle
+				if(!imageSize.IsEmpty)
+				{
+					m_CaptionImageRectangle=new Rectangle(client.X+IMAGETEXT_SPACING,client.Y,imageSize.Width,imageSize.Height);
+					if(m_CaptionRectangle.Height>imageSize.Height)
+						m_CaptionImageRectangle.Y+=(int)(m_CaptionRectangle.Height-imageSize.Height)/2;
+					else if(imageSize.Height>m_CaptionRectangle.Height)
+					{
+						m_CaptionRectangle.Y+=(int)(imageSize.Height+-m_CaptionRectangle.Height)/2;
+					}
+
+				}
+				else if(m_CloseButton!=null && closeButtonSize.Height>m_CaptionRectangle.Height)
+					m_CaptionRectangle.Y+=(int)(closeButtonSize.Height-m_CaptionRectangle.Height)/2;
+
+				m_CaptionRectangle.Offset(0,CAPTIONALERT_VSPACING);
+				m_CaptionImageRectangle.Offset(0,CAPTIONALERT_VSPACING);
+
+				if(m_CloseButton!=null)
+				{
+					m_CloseButton.Location=new Point(m_CloseButton.Location.X,m_CaptionRectangle.Y+(m_CaptionRectangle.Height-closeButtonSize.Height)/2);
+				}
+
+				
+				// Calculates the rectangle for balloon text
+				if(m_CaptionRectangle.Bottom>m_CaptionImageRectangle.Bottom)
+					m_TextRectangle=new Rectangle(client.X,m_CaptionRectangle.Bottom+CAPTIONTEXT_VSPACING*4,client.Width,client.Bottom-(m_CaptionRectangle.Bottom+CAPTIONTEXT_VSPACING*4));
+				else
+					m_TextRectangle=new Rectangle(client.X,m_CaptionImageRectangle.Bottom+CAPTIONTEXT_VSPACING*4,client.Width,client.Bottom-(m_CaptionImageRectangle.Bottom+CAPTIONTEXT_VSPACING*4));
+
+				this.Region=new Region(this.DisplayRectangle);
+			}
+		}
+
+		private Rectangle GetAlertClientRect()
+		{
+            Rectangle r = new Rectangle(0, 0, this.Width, this.Height); // this.DisplayRectangle;
+			r.Inflate(-4,-4);
+			return r;
+		}
+
+		private GraphicsPath GetBalloonPath(Rectangle rect)
+		{
+			GraphicsPath path = new GraphicsPath();
+
+			Rectangle clipBounds=rect;
+			Rectangle balloonBounds=clipBounds;
+			int cornerDiameter=m_CornerSize*2;
+			Matrix matrix=new Matrix();
+			Point[] anchorPoints=new Point[3];
+			int tipOffset=m_TipOffset;
+
+			balloonBounds.Size=new Size(balloonBounds.Width-1,balloonBounds.Height-1);
+
+			bool adjustOffset = false;
+			if(m_TipPosition==eTipPosition.Bottom)
+			{
+				adjustOffset=true;
+				matrix.Translate(balloonBounds.Width, balloonBounds.Height);
+				matrix.Rotate(180);
+			}
+            else if (m_TipPosition == eTipPosition.Left && this.RightToLeft == RightToLeft.No || 
+                m_TipPosition == eTipPosition.Right && this.RightToLeft == RightToLeft.Yes)
+			{
+				adjustOffset = true;
+				balloonBounds.Size=new Size(balloonBounds.Height, balloonBounds.Width);
+				matrix.Translate(0, balloonBounds.Width);
+				matrix.Rotate(-90);
+			}
+			else if(m_TipPosition==eTipPosition.Right && this.RightToLeft == RightToLeft.No ||
+                m_TipPosition == eTipPosition.Left && this.RightToLeft == RightToLeft.Yes)
+			{
+				balloonBounds.Size=new Size(balloonBounds.Height, balloonBounds.Width);
+				matrix.Translate(balloonBounds.Height, 0);
+				matrix.Rotate(90);
+			}
+
+			int balloonEdgeCenter =((int)(balloonBounds.Width-(m_CornerSize*2))/2)+1;
+			int offsetFromEdge = m_CornerSize;
+			if(adjustOffset)
+			{
+				tipOffset=(balloonBounds.Width-(offsetFromEdge*2)-m_TipOffset)+1;
+			}
+			if(tipOffset<balloonEdgeCenter)
+			{
+				anchorPoints[0]=new Point(tipOffset+offsetFromEdge,balloonBounds.Y+m_TipLength);
+				anchorPoints[1]=new Point(tipOffset+offsetFromEdge,balloonBounds.Y);
+				anchorPoints[2]=new Point(tipOffset+m_TipLength+offsetFromEdge,balloonBounds.Y+m_TipLength);
+			} 
+			else if(tipOffset>balloonEdgeCenter)
+			{
+				anchorPoints[0]=new Point(tipOffset-m_TipLength+offsetFromEdge,balloonBounds.Y+m_TipLength);
+				anchorPoints[1]=new Point(tipOffset+offsetFromEdge,balloonBounds.Y);
+				anchorPoints[2]=new Point(tipOffset+offsetFromEdge,balloonBounds.Y+m_TipLength);
+			} 
+			else 
+			{
+				anchorPoints[0]=new Point(tipOffset-m_TipLength+offsetFromEdge,balloonBounds.Y+m_TipLength);
+				anchorPoints[1]=new Point(tipOffset+offsetFromEdge,balloonBounds.Y);
+				anchorPoints[2]=new Point(tipOffset+m_TipLength+offsetFromEdge,balloonBounds.Y+m_TipLength);
+			}
+
+			path.AddArc(balloonBounds.Left,balloonBounds.Top+m_TipLength,cornerDiameter, cornerDiameter,180, 90);
+
+			path.AddLine(anchorPoints[0],anchorPoints[1]);
+			path.AddLine(anchorPoints[1],anchorPoints[2]);
+
+			path.AddArc(balloonBounds.Width-cornerDiameter,balloonBounds.Top+m_TipLength,cornerDiameter, cornerDiameter, -90, 90);
+			path.AddArc(balloonBounds.Width-cornerDiameter,balloonBounds.Bottom-cornerDiameter,cornerDiameter, cornerDiameter, 0, 90);
+			path.AddArc(balloonBounds.Left, balloonBounds.Bottom-cornerDiameter,cornerDiameter, cornerDiameter, 90, 90);
+
+			path.CloseFigure();
+				
+			path.Transform(matrix);
+			
+			return path;
+		}
+
+		private void PaintBackgroundInternal(Graphics g)
+		{
+			Rectangle r=this.ClientRectangle;
+			if(r.Width==0 || r.Height==0)
+				return;
+
+			if(m_BackColor2.IsEmpty)
+			{
+				using(SolidBrush brush=new SolidBrush(this.BackColor))
+					g.FillRectangle(brush,r);
+			}
+			else
+			{
+				using(LinearGradientBrush gradient=BarFunctions.CreateLinearGradientBrush(r,this.BackColor,m_BackColor2,m_BackColorGradientAngle))
+				{
+					if(m_Style==eBallonStyle.Alert)
+					{
+						Blend b=new Blend(4);
+						b.Positions=new float[]{0f,.25f,.4f,.5f,.5f,.85f,.85f,1f};
+						b.Factors=new float[] {0f,1f,1f,0f,0f,0f,0f,1f};
+						gradient.Blend=b;
+					}
+					g.FillRectangle(gradient,r);
+				}
+			}
+
+			if(this.BackgroundImage==null)
+				return;
+
+//			System.Drawing.Imaging.ImageAttributes imageAtt=null;
+//			
+//			if(m_BackgroundImageAlpha!=255)
+//			{
+//				System.Drawing.Imaging.ColorMatrix colorMatrix=new System.Drawing.Imaging.ColorMatrix();
+//				colorMatrix.Matrix33=255-m_BackgroundImageAlpha;
+//				imageAtt=new System.Drawing.Imaging.ImageAttributes();
+//				imageAtt.SetColorMatrix(colorMatrix,System.Drawing.Imaging.ColorMatrixFlag.Default,System.Drawing.Imaging.ColorAdjustType.Bitmap);
+//			}
+
+			BarFunctions.PaintBackgroundImage(g,r,this.BackgroundImage,m_BackgroundImagePosition,m_BackgroundImageAlpha);
+
+//			switch(m_BackgroundImagePosition)
+//			{
+//				case eBackgroundImagePosition.Stretch:
+//				{
+//					if(imageAtt!=null)
+//						g.DrawImage(this.BackgroundImage,r,0,0,this.BackgroundImage.Width,this.BackgroundImage.Height,GraphicsUnit.Pixel,imageAtt);
+//					else
+//						g.DrawImage(this.BackgroundImage,r,0,0,this.BackgroundImage.Width,this.BackgroundImage.Height,GraphicsUnit.Pixel);
+//					break;
+//				}
+//				case eBackgroundImagePosition.Center:
+//				{
+//					Rectangle destRect=new Rectangle(r.X,r.Y,this.BackgroundImage.Width,this.BackgroundImage.Height);
+//					if(r.Width>this.BackgroundImage.Width)
+//						destRect.X+=(r.Width-this.BackgroundImage.Width)/2;
+//					if(r.Height>this.BackgroundImage.Height)
+//						destRect.Y+=(r.Height-this.BackgroundImage.Height)/2;
+//					if(imageAtt!=null)
+//						g.DrawImage(this.BackgroundImage,destRect,0,0,this.BackgroundImage.Width,this.BackgroundImage.Height,GraphicsUnit.Pixel,imageAtt);
+//					else
+//						g.DrawImage(this.BackgroundImage,destRect,0,0,this.BackgroundImage.Width,this.BackgroundImage.Height,GraphicsUnit.Pixel);
+//					break;
+//				}
+//				case eBackgroundImagePosition.TopLeft:
+//				case eBackgroundImagePosition.TopRight:
+//				case eBackgroundImagePosition.BottomLeft:
+//				case eBackgroundImagePosition.BottomRight:
+//				{
+//					Rectangle destRect=new Rectangle(r.X,r.Y,this.BackgroundImage.Width,this.BackgroundImage.Height);
+//					if(m_BackgroundImagePosition==eBackgroundImagePosition.TopRight)
+//						destRect.X=r.Right-this.BackgroundImage.Width;
+//					else if(m_BackgroundImagePosition==eBackgroundImagePosition.BottomLeft)
+//						destRect.Y=r.Bottom-this.BackgroundImage.Height;
+//					else if(m_BackgroundImagePosition==eBackgroundImagePosition.BottomRight)
+//					{
+//						destRect.Y=r.Bottom-this.BackgroundImage.Height;
+//						destRect.X=r.Right-this.BackgroundImage.Width;
+//					}
+//
+//					if(imageAtt!=null)
+//						g.DrawImage(this.BackgroundImage,destRect,0,0,this.BackgroundImage.Width,this.BackgroundImage.Height,GraphicsUnit.Pixel,imageAtt);
+//					else
+//						g.DrawImage(this.BackgroundImage,destRect,0,0,this.BackgroundImage.Width,this.BackgroundImage.Height,GraphicsUnit.Pixel);
+//					break;
+//				}
+//				case eBackgroundImagePosition.Tile:
+//				{
+//					if(imageAtt!=null)
+//					{
+//						if(r.Width>this.BackgroundImage.Width || r.Height>this.BackgroundImage.Height)
+//						{
+//							int x=r.X,y=r.Y;
+//							while(y<r.Bottom)
+//							{
+//								while(x<r.Right)
+//								{
+//									Rectangle destRect=new Rectangle(x,y,this.BackgroundImage.Width,this.BackgroundImage.Height);
+//									if(destRect.Right>r.Right)
+//										destRect.Width=destRect.Width-(destRect.Right-r.Right);
+//									if(destRect.Bottom>r.Bottom)
+//										destRect.Height=destRect.Height-(destRect.Bottom-r.Bottom);
+//									g.DrawImage(this.BackgroundImage,destRect,0,0,destRect.Width,destRect.Height,GraphicsUnit.Pixel,imageAtt);
+//									x+=this.BackgroundImage.Width;
+//								}
+//								x=r.X;
+//								y+=this.BackgroundImage.Height;
+//							}
+//						}
+//						else
+//						{
+//							g.DrawImage(this.BackgroundImage,new Rectangle(0,0,this.BackgroundImage.Width,this.BackgroundImage.Height),0,0,this.BackgroundImage.Width,this.BackgroundImage.Height,GraphicsUnit.Pixel,imageAtt);
+//						}
+//					}
+//					else
+//					{
+//						TextureBrush brush=new TextureBrush(this.BackgroundImage); //,r);
+//						brush.WrapMode=System.Drawing.Drawing2D.WrapMode.Tile;
+//						g.FillRectangle(brush,r);
+//						brush.Dispose();
+//					}
+//					break;
+//				}
+//			}
+		}
+
+		/// <summary>
+		/// Gets or sets the target gradient background color.
+		/// </summary>
+		[Browsable(true),Description("Indicates the target gradient background color."),Category("Style")]
+		public Color BackColor2
+		{
+			get {return m_BackColor2;}
+			set
+			{
+				m_BackColor2=value;
+				if(this.DesignMode)
+					this.Refresh();
+			}
+		}
+		[Browsable(false),EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeBackColor2()
+		{
+			return !m_BackColor2.IsEmpty;
+		}
+		[Browsable(false),EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetBackColor2()
+		{
+			m_BackColor2=Color.Empty;
+		}
+
+		/// <summary>
+		/// Gets or sets gradient fill angle.
+		/// </summary>
+		[Browsable(true),Description("Indicates gradient fill angle."),Category("Style"),DefaultValue(90)]
+		public int BackColorGradientAngle
+		{
+			get {return m_BackColorGradientAngle;}
+			set
+			{
+				if(value!=m_BackColorGradientAngle)
+				{
+					m_BackColorGradientAngle=value;
+					if(this.DesignMode)
+						this.Refresh();
+				}
+			}
+		}
+		/// <summary>
+		/// Specifies the transparency of background image.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),Category("Appearance"),DefaultValue(255),Description("Specifies the transparency of background image.")]
+		public int BackgroundImageAlpha
+		{
+			get {return m_BackgroundImageAlpha;}
+			set
+			{
+				if(value<0)
+					value=0;
+				else if(value>255)
+					value=255;
+				if(m_BackgroundImageAlpha!=value)
+				{
+					m_BackgroundImageAlpha=value;
+					if(this.DesignMode)
+						this.Refresh();
+				}
+			}
+		}
+		/// <summary>
+		/// Specifies background image position when container is larger than image.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),Category("Appearance"),DefaultValue(eBackgroundImagePosition.Stretch),Description("Specifies background image position when container is larger than image.")]
+		public eBackgroundImagePosition BackgroundImagePosition
+		{
+			get {return m_BackgroundImagePosition;}
+			set
+			{
+				if(m_BackgroundImagePosition!=value)
+				{
+					m_BackgroundImagePosition=value;
+					if(this.DesignMode)
+						this.Refresh();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the border color..
+		/// </summary>
+		[Browsable(true),Description("Indicates border color."),Category("Style")]
+		public Color BorderColor
+		{
+			get {return m_BorderColor;}
+			set
+			{
+				m_BorderColor=value;
+				if(this.DesignMode)
+					this.Refresh();
+			}
+		}
+		[Browsable(false),EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeBorderColor()
+		{
+			return m_BorderColor!=SystemColors.InfoText;
+		}
+		[Browsable(false),EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetBorderColor()
+		{
+			m_BorderColor=SystemColors.InfoText;
+		}
+
+		/// <summary>
+		/// Specifies balloon style.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),Category("Style"),DefaultValue(eBallonStyle.Balloon),Description("Specifies balloon style.")]
+		public eBallonStyle Style
+		{
+			get {return m_Style;}
+			set
+			{
+				m_Style=value;
+				if(m_Style==eBallonStyle.Alert)
+				{
+					this.BackColor=Color.FromArgb(207,221,244);
+					this.BackColor2=Color.White;
+					this.ForeColor=Color.FromArgb(102,114,196);
+					m_TextAlignment=StringAlignment.Center;
+				}
+                else if (m_Style == eBallonStyle.Office2007Alert)
+                {
+                    Office2007ColorTable ct = GetOffice2007ColorTable();
+                    ColorScheme cs = ct.LegacyColors;
+                    if (ct.SuperTooltip.BackgroundColors.IsEmpty)
+                    {
+                        this.BackColor = cs.PanelBackground;
+                        this.BackColor2 = cs.PanelBackground2;
+                        this.ForeColor = cs.PanelText;
+                    }
+                    else
+                    {
+                        this.BackColor = ct.SuperTooltip.BackgroundColors.Start;
+                        this.BackColor2 = ct.SuperTooltip.BackgroundColors.End;
+                        this.ForeColor = ct.SuperTooltip.TextColor;
+                    }
+                    m_BorderColor = cs.PanelBorder;
+                    m_TextAlignment = StringAlignment.Near;
+                }
+                else
+                {
+                    m_TextAlignment = StringAlignment.Near;
+                    m_BorderColor = SystemColors.InfoText;
+                }
+                if(m_ShowCloseButton)
+				    this.CreateCloseButton();
+				this.RecalcLayout();
+				if(this.DesignMode)
+					this.Refresh();
+			}
+		}
+
+        private Office2007ColorTable GetOffice2007ColorTable()
+        {
+            Office2007Renderer r = GlobalManager.Renderer as Office2007Renderer;
+            if (r != null)
+                return r.ColorTable;
+            return new Office2007ColorTable();
+        }
+
+		protected override void OnMouseDown(MouseEventArgs e)
+		{
+			base.OnMouseDown(e);
+			if(m_CloseButton!=null)
+				m_CloseButton.OnMouseDown(e);
+			if(this.Focused)
+				this.Focus();
+		}
+
+		protected override void OnMouseMove(MouseEventArgs e)
+		{
+			base.OnMouseMove(e);
+			if(m_CloseButton!=null)
+				m_CloseButton.OnMouseMove(e);
+		}
+
+		protected override void OnMouseUp(MouseEventArgs e)
+		{
+			base.OnMouseUp(e);
+			if(m_CloseButton!=null)
+				m_CloseButton.OnMouseUp(e);
+		}
+
+		protected override void OnMouseLeave(EventArgs e)
+		{
+			base.OnMouseLeave(e);
+			if(m_CloseButton!=null)
+				m_CloseButton.OnMouseLeave(e);
+		}
+
+		/// <summary>
+		/// Gets or sets whether the Close button is displayed.
+		/// </summary>
+		[Browsable(true),Description("Indicates whether the Close button is displayed."),Category("Behavior"),DefaultValue(true)]
+		public bool ShowCloseButton
+		{
+			get {return m_ShowCloseButton;}
+			set
+			{
+				if(value!=m_ShowCloseButton)
+				{
+					m_ShowCloseButton=value;
+					OnShowCloseButtonChanged();
+					if(this.DesignMode)
+						this.Refresh();
+				}
+			}
+		}
+
+		private void OnShowCloseButtonChanged()
+		{
+			if(m_ShowCloseButton)
+			{
+				CreateCloseButton();
+				RecalcLayout();
+			}
+			else
+			{
+				m_CloseButton=null;
+			}
+		}
+
+		private void CreateCloseButton()
+		{
+            if (m_CloseButtonNormal != null)
+            {
+                m_CloseButton = new ImageButton(this, new Rectangle(0, 0, Dpi.Width(m_CloseButtonNormal.Width), Dpi.Height(m_CloseButtonNormal.Height)));
+                if (m_CloseButton.Normal != null)
+                {
+                    m_CloseButton.Normal.Dispose();
+                    m_CloseButton.Normal = null;
+                }
+                m_CloseButton.Normal = m_CloseButtonNormal;
+                if (m_CloseButton.Hover != null)
+                {
+                    m_CloseButton.Hover.Dispose();
+                    m_CloseButton.Hover = null;
+                }
+                m_CloseButton.Hover = m_CloseButtonHot;
+                if (m_CloseButton.Pressed != null)
+                {
+                    m_CloseButton.Pressed.Dispose();
+                    m_CloseButton.Pressed = null;
+                }
+                m_CloseButton.Pressed = m_CloseButtonPressed;
+            }
+            else // Default Image Size is 18x18
+            {
+                if (m_Style == eBallonStyle.Balloon)
+                {
+                    m_CloseButton = new ImageButton(this, new Rectangle(0, 0, Dpi.Width18, Dpi.Height18));
+                    m_CloseButton.Normal = BarFunctions.LoadBitmap("BalloonImages.BalloonNormal.png");
+                    m_CloseButton.Hover = BarFunctions.LoadBitmap("BalloonImages.BalloonHot.png");
+                    m_CloseButton.Pressed = BarFunctions.LoadBitmap("BalloonImages.BalloonPress.png");
+                }
+                else
+                {
+                    m_CloseButton = new ImageButton(this, new Rectangle(0, 0, Dpi.Width13, Dpi.Height13));
+                    m_CloseButton.Normal = BarFunctions.LoadBitmap("BalloonImages.AlertNormal.png");
+                    m_CloseButton.Hover = BarFunctions.LoadBitmap("BalloonImages.AlertHot.png");
+                    m_CloseButton.Pressed = BarFunctions.LoadBitmap("BalloonImages.AlertPress.png");
+                }
+            }
+			m_CloseButton.Click+=new EventHandler(this.CloseButtonClickInternal);
+		}
+
+		private void CloseButtonClickInternal(object sender, EventArgs e)
+		{
+			if(CloseButtonClick!=null)
+				CloseButtonClick(this,new EventArgs());
+			if(m_AutoClose)
+			{
+				this.Hide();
+				this.Close();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the animation type used to display Alert type balloon.
+		/// </summary>
+		[Browsable(true),Description("Gets or sets the animation type used to display Alert type balloon."),Category("Behavior"),DefaultValue(eAlertAnimation.BottomToTop)]
+		public eAlertAnimation AlertAnimation
+		{
+			get {return m_AlertAnimation;}
+			set {m_AlertAnimation=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets the total time in milliseconds alert animation takes.
+		/// Default value is 200.
+		/// </summary>
+		[Browsable(true),Description("Gets or sets the total time in milliseconds alert animation takes."),Category("Behavior"),DefaultValue(200)]
+		public int AlertAnimationDuration
+		{
+			get {return m_AlertAnimationDuration;}
+			set {m_AlertAnimationDuration=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets whether balloon will close automatically when user click the close button.
+		/// </summary>
+		[Browsable(true),Description("Indicates whether balloon will close automatically when user click the close button."),Category("Behavior"),DefaultValue(true)]
+		public bool AutoClose
+		{
+			get {return m_AutoClose;}
+			set {m_AutoClose=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets time period in seconds after balloon closes automatically.
+		/// </summary>
+		[Browsable(true),Description("Indicates time period in seconds after balloon closes automatically."),Category("Behavior"),DefaultValue(0)]
+		public int AutoCloseTimeOut
+		{
+			get {return m_AutoCloseTimeOut;}
+			set
+			{
+				m_AutoCloseTimeOut=value;
+				OnAutoCloseTimeOutChanged();
+			}
+		}
+
+		protected void OnAutoCloseTimeOutChanged()
+		{
+			if(m_AutoCloseTimeOut>0 && !this.DesignMode)
+			{
+				if(m_Timer==null)
+					m_Timer=new System.Windows.Forms.Timer(components);
+				m_Timer.Enabled=false;
+				m_Timer.Interval=m_AutoCloseTimeOut*1000;
+				m_Timer.Tick+=new EventHandler(this.AutoCloseTimeOutEllapsed);
+				if(this.Visible)
+				{
+					m_Timer.Enabled=true;
+					m_Timer.Start();
+				}
+			}
+			else
+			{
+				DestroyAutoCloseTimer();
+			}
+		}
+
+		protected virtual void AutoCloseTimeOutEllapsed(object sender, EventArgs e)
+		{
+			if(this.IsDisposed)
+				return;
+			DestroyAutoCloseTimer();
+			this.Hide();
+			this.Close();
+		}
+
+		private void DestroyAutoCloseTimer()
+		{
+			if(m_Timer!=null)
+			{
+				m_Timer.Enabled=false;
+				m_Timer.Tick-=new EventHandler(this.AutoCloseTimeOutEllapsed);
+				components.Remove(m_Timer);
+				m_Timer.Dispose();
+				m_Timer=null;
+			}
+		}
+
+		protected override void OnVisibleChanged(EventArgs e)
+		{
+			base.OnVisibleChanged(e);
+			if(this.Visible)
+			{
+				if(m_Timer!=null && !m_Timer.Enabled)
+				{
+					m_Timer.Enabled=true;
+					m_Timer.Start();
+				}
+			}
+			else
+			{
+				if(m_Timer!=null && m_Timer.Enabled)
+				{
+					m_Timer.Stop();
+					m_Timer.Enabled=false;
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the custom image for Close Button.
+        /// </summary>
+        [Browsable(true),Description("Indicates custom image for Close Button."),Category("Appearance")]
+		public Image CloseButtonNormal
+		{
+			get {return m_CloseButtonNormal;}
+			set 
+			{
+				if(m_CloseButtonNormal!=value)
+				{
+					m_CloseButtonNormal=value;
+					OnShowCloseButtonChanged();
+					if(this.DesignMode)
+						this.Refresh();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the custom image for Close Button when mouse is over the button.
+        /// </summary>
+        [Browsable(true),Description("Indicates custom image for Close Button when mouse is over the button."),Category("Appearance"),DefaultValue(null)]
+		public Image CloseButtonHot
+		{
+			get {return m_CloseButtonHot;}
+			set 
+			{
+				if(m_CloseButtonHot!=value)
+				{
+					m_CloseButtonHot=value;
+					OnShowCloseButtonChanged();
+					if(this.DesignMode)
+						this.Refresh();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the custom image for Close Button when button is pressed.
+        /// </summary>
+        [Browsable(true),Description("Indicates custom image for Close Button when button is pressed."),Category("Appearance"),DefaultValue(null)]
+		public Image CloseButtonPressed
+		{
+			get {return m_CloseButtonPressed;}
+			set 
+			{
+				if(m_CloseButtonPressed!=value)
+				{
+					m_CloseButtonPressed=value;
+					OnShowCloseButtonChanged();
+					if(this.DesignMode)
+						this.Refresh();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the Caption image.
+        /// </summary>
+        [Browsable(true),Description("Indicates Caption image."),Category("Appearance"),DefaultValue(null)]
+		public Image CaptionImage
+		{
+			get {return m_CaptionImage;}
+			set 
+			{
+				if(m_CaptionImage!=value)
+				{
+					m_CaptionImage=value;
+					this.RecalcLayout();
+					if(this.DesignMode)
+						this.Refresh();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the Caption icon. Icon is used to provide support for alpha-blended images in caption.
+		/// </summary>
+		[Browsable(true),Description("Indicates Caption icon. Icon is used to provide support for alpha-blended images in caption."),Category("Appearance"),DefaultValue(null)]
+		public Icon CaptionIcon
+		{
+			get {return m_CaptionIcon;}
+			set 
+			{
+				if(m_CaptionIcon!=value)
+				{
+					m_CaptionIcon=value;
+					this.RecalcLayout();
+					if(this.DesignMode)
+						this.Refresh();
+				}
+			}
+		}
+
+		private CompositeImage ImageInternal
+		{
+			get
+			{
+				if(m_CaptionIcon!=null)
+					return new CompositeImage(m_CaptionIcon,false);
+				else if(m_CaptionImage!=null)
+					return new CompositeImage(m_CaptionImage,false);
+				return null;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the Caption font.
+		/// </summary>
+		[Browsable(true),Description("Indicates Caption font."),Category("Appearance")]
+		public Font CaptionFont
+		{
+			get {return m_CaptionFont;}
+			set 
+			{
+				if(m_CaptionFont!=value)
+				{
+					m_CaptionFont=value;
+					this.RecalcLayout();
+					if(this.DesignMode)
+						this.Refresh();
+				}
+			}
+		}
+
+        private TextMarkup.BodyElement _CaptionTextMarkup = null;
+		/// <summary>
+		/// Gets or sets text displayed in caption.
+		/// </summary>
+		[Browsable(true),Description("Indicates text displayed in caption."),Category("Appearance"),DefaultValue(""), Localizable(true)]
+		public string CaptionText
+		{
+			get {return m_CaptionText;}
+			set 
+			{
+				if(m_CaptionText!=value)
+				{
+					m_CaptionText=value;
+
+                    if (_CaptionTextMarkup != null)
+                    {
+                        _CaptionTextMarkup.MouseLeave(this);
+                        _CaptionTextMarkup.HyperLinkClick -= TextMarkupLinkClicked;
+                        _CaptionTextMarkup = null;
+                    }
+
+                    if (TextMarkup.MarkupParser.IsMarkup(ref m_CaptionText))
+                        _CaptionTextMarkup = TextMarkup.MarkupParser.Parse(m_CaptionText);
+
+                    if (_CaptionTextMarkup != null)
+                    {
+                        _CaptionTextMarkup.HyperLinkClick += TextMarkupLinkClicked;
+                    }
+
+					this.RecalcLayout();
+					if(this.DesignMode)
+						this.Refresh();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets color of caption text.
+		/// </summary>
+		[Browsable(true),Description("Indicates color of caption text"),Category("Appearance")]
+		public Color CaptionColor
+		{
+			get {return m_CaptionColor;}
+			set 
+			{
+				if(m_CaptionColor!=value)
+				{
+					m_CaptionColor=value;
+					if(this.DesignMode)
+						this.Refresh();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or set position of the balloon tip.
+		/// </summary>
+		[Browsable(true),Description("Indicates position of the balloon tip."),Category("Appearance"),DefaultValue(eTipPosition.Top)]
+		public eTipPosition TipPosition
+		{
+			get {return m_TipPosition;}
+			set
+			{
+				if(m_TipPosition!=value)
+				{
+					m_TipPosition=value;
+					this.RecalcLayout();
+					if(TipPositionChanged!=null)
+						TipPositionChanged(this,new EventArgs());
+					if(this.DesignMode)
+						this.Refresh();
+				}
+			}
+		}
+
+		private void InternalTipPositionChanged(eTipPosition newValue)
+		{
+			if(this.Controls.Count==0 || this.Style!=eBallonStyle.Balloon)
+				return;
+			if(newValue==eTipPosition.Top && m_TipPosition==eTipPosition.Bottom)
+			{
+				foreach(Control control in this.Controls)
+				{
+					control.Top+=m_TipLength;
+				}
+			}
+			else if(newValue==eTipPosition.Bottom && m_TipPosition==eTipPosition.Top)
+			{
+				foreach(Control control in this.Controls)
+				{
+					control.Top-=m_TipLength;
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets tip distance from the edge of the balloon.
+		/// </summary>
+		[Browsable(true),Description("Indicates tip distance from the edge of the balloon."),Category("Appearance"),DefaultValue(32)]
+		public int TipOffset
+		{
+			get {return m_TipOffset;}
+			set
+			{
+				if(m_TipOffset!=value)
+				{
+					if(value<m_CornerSize)
+						value=m_CornerSize+1;
+					else if((m_TipPosition==eTipPosition.Top || m_TipPosition==eTipPosition.Bottom) && value>this.Width-m_CornerSize-m_TipLength)
+						value=this.Width-m_CornerSize-m_TipLength;
+					else if((m_TipPosition==eTipPosition.Left || m_TipPosition==eTipPosition.Right) && value>this.Height-m_CornerSize-m_TipLength)
+						value=this.Height-m_CornerSize-m_TipLength;
+
+					m_TipOffset=value;
+					this.RecalcLayout();
+					if(this.DesignMode)
+						this.Refresh();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Returns length of the tip.
+		/// </summary>
+		[Browsable(false),Description("Returns tip length"),Category("Appearance")]
+		public int TipLength
+		{
+			get {return m_TipLength;}
+		}
+
+		/// <summary>
+		/// Displays balloon using control to automatically calculate balloon location. Method is usually used display balloon that is showing information for the certain control.
+		/// </summary>
+		/// <param name="referenceControl">Control used for balloon positioning.</param>
+		public void Show(Control referenceControl)
+		{
+			this.Show(referenceControl,true);
+		}
+
+		/// <summary>
+		/// Displays balloon using control to automatically calculate balloon location. Method is usually used display balloon that is showing information for the certain control.
+		/// </summary>
+		/// <param name="referenceControl">Control used for balloon positioning.</param>
+		/// <param name="balloonFocus">Indicates whether balloon receives input focus.</param>
+		public void Show(Control referenceControl, bool balloonFocus)
+		{
+			if(referenceControl==null)
+			{
+				this.Show();
+				return;
+			}
+			Point scrLocCtrl=Point.Empty;
+			
+			if(referenceControl.Parent!=null)
+				scrLocCtrl=referenceControl.Parent.PointToScreen(referenceControl.Location);
+			else
+				scrLocCtrl=referenceControl.Location;
+			
+			this.Show(new Rectangle(scrLocCtrl,referenceControl.Size),balloonFocus);
+		}
+
+		/// <summary>
+		/// Displays balloon using rectangle to automatically calculate balloon location. Method is usually used display balloon that is showing information for the certain screen region.
+		/// </summary>
+		/// <param name="referenceScreenRect">Rectangle in screen coordinates used for balloon positioning.</param>
+		/// <param name="balloonFocus">Indicates whether balloon receives input focus.</param>
+		public void Show(Rectangle referenceScreenRect, bool balloonFocus)
+		{
+			if(referenceScreenRect.IsEmpty)
+			{
+				this.Show();
+				return;
+			}
+
+			int tipPositionOffset=m_TipLength+m_CornerSize*3;
+			int tipOffset=m_TipLength/2+m_CornerSize*3;
+			Point balloonLocation=Point.Empty;
+			ScreenInformation screen=BarFunctions.ScreenFromPoint(referenceScreenRect.Location);
+			
+			if(referenceScreenRect.X+referenceScreenRect.Width/2+this.Width>screen.WorkingArea.Right)
+			{
+				balloonLocation.X=referenceScreenRect.X+referenceScreenRect.Width/2-this.Width+tipPositionOffset;
+				tipOffset=this.Width-tipPositionOffset;
+			}
+			else
+				balloonLocation.X=referenceScreenRect.X+referenceScreenRect.Width/2-tipPositionOffset;
+			
+			if(referenceScreenRect.Y+referenceScreenRect.Height+this.Height>screen.WorkingArea.Bottom)
+			{
+				balloonLocation.Y=referenceScreenRect.Y-this.Height;
+				InternalTipPositionChanged(eTipPosition.Bottom);
+				this.TipPosition=eTipPosition.Bottom;
+			}
+			else
+			{
+				balloonLocation.Y=referenceScreenRect.Y+referenceScreenRect.Height;
+				InternalTipPositionChanged(eTipPosition.Top);
+				this.TipPosition=eTipPosition.Top;
+			}
+
+			this.TipOffset=tipOffset;
+			this.Location=balloonLocation;
+			this.Show(balloonFocus);
+		}
+
+		/// <summary>
+		/// Displays balloon using item to automatically calculate balloon location. Method is usually used display balloon that is showing information for the certain item.
+		/// </summary>
+		/// <param name="item">Item used for balloon positioning.</param>
+		/// <param name="balloonFocus">Indicates whether balloon receives input focus.</param>
+		public void Show(BaseItem item, bool balloonFocus)
+		{
+			if(item==null || item.ContainerControl==null)
+			{
+				this.Show();
+				return;
+			}
+			Point loc=((Control)item.ContainerControl).PointToScreen(item.DisplayRectangle.Location);
+			this.Show(new Rectangle(loc,item.DisplayRectangle.Size),balloonFocus);
+		}
+
+		/// <summary>
+		/// Display balloon.
+		/// </summary>
+		/// <param name="balloonFocus">Indicates whether balloon receives input focus.</param>
+		public void Show(bool balloonFocus)
+		{
+			Rectangle rEnd=new Rectangle(this.Location,this.Size);
+			Rectangle rStart=GetAnimationRectangle();
+
+			if(!balloonFocus)
+			{
+				if(this.TopMost)
+				{
+					this.TopMost=false;
+					NativeFunctions.SetWindowPos(this.Handle,new IntPtr(NativeFunctions.HWND_TOP),0,0,0,0,NativeFunctions.SWP_SHOWWINDOW | NativeFunctions.SWP_NOACTIVATE | NativeFunctions.SWP_NOMOVE | NativeFunctions.SWP_NOSIZE);
+					this.TopMost=true;
+				}
+				else
+					NativeFunctions.SetWindowPos(this.Handle,new IntPtr(NativeFunctions.HWND_TOP),0,0,0,0,NativeFunctions.SWP_SHOWWINDOW | NativeFunctions.SWP_NOACTIVATE | NativeFunctions.SWP_NOMOVE | NativeFunctions.SWP_NOSIZE);
+			}
+
+			if(ShouldAnimate())
+			{
+				try
+				{
+					m_AnimationInProgress=true;
+					BarFunctions.AnimateControl(this,true,m_AlertAnimationDuration,rStart,rEnd);
+				}
+				finally
+				{
+					m_AnimationInProgress=false;
+				}
+			}
+			else
+				base.Show();
+		}
+
+		/// <summary>
+		/// Displays balloon.
+		/// </summary>
+		public new void Show()
+		{
+			this.Show(true);
+		}
+        /// <summary>
+        /// Called when balloon is hidden.
+        /// </summary>
+        protected virtual void HideBalloon()
+        {
+            DestroyAutoCloseTimer();
+            if (ShouldAnimate())
+            {
+                Rectangle rStart = new Rectangle(this.Location, this.Size);
+                Rectangle rEnd = GetAnimationRectangle();
+                try
+                {
+                    m_AnimationInProgress = true;
+                    BarFunctions.AnimateControl(this, false, m_AlertAnimationDuration, rStart, rEnd);
+                }
+                finally
+                {
+                    m_AnimationInProgress = false;
+                }
+            }
+            else
+                base.Hide();
+        }
+
+        /// <summary>
+		/// Hides balloon.
+		/// </summary>
+		public new void Hide()
+		{
+            HideBalloon();
+		}
+
+		private bool ShouldAnimate()
+		{
+            if (m_Style != eBallonStyle.Balloon && m_AlertAnimation != eAlertAnimation.None && !this.DesignMode)
+                return true;
+			return false;
+		}
+
+		private Rectangle GetAnimationRectangle()
+		{
+			Rectangle r=new Rectangle(this.Location,this.Size);
+			if(m_AlertAnimation==eAlertAnimation.BottomToTop)// && bShowing || m_AlertAnimation==eAlertAnimation.TopToBottom && !bShowing)
+			{
+				r.Y=r.Bottom-1;
+				r.Height=1;
+			}
+			else if(m_AlertAnimation==eAlertAnimation.TopToBottom)
+			{
+				r.Height=1;
+			}
+			else if(m_AlertAnimation==eAlertAnimation.LeftToRight)
+			{
+				r.Width=2;
+			}
+			else if(m_AlertAnimation==eAlertAnimation.RightToLeft)
+			{
+				r.X=r.Right-1;
+				r.Width=1;
+			}
+			return r;
+		}
+
+		/// <summary>
+		/// Gets/Sets whether Balloon is visible.
+		/// </summary>
+		[DevCoBrowsable(true)]
+		public new bool Visible
+		{
+			get { return base.Visible;}
+			set
+			{
+				if(value)
+					this.Show();
+				else
+					this.Hide();
+			}
+		}
+
+		const int WM_MOUSEACTIVATE = 0x21;
+		const int MA_NOACTIVATE = 3;
+		protected override void WndProc(ref Message m)
+		{
+			if(m.Msg==WM_MOUSEACTIVATE)
+			{
+				m.Result=new System.IntPtr(MA_NOACTIVATE);
+				return;
+			}
+			base.WndProc(ref m);
+		}
+
+		private class ImageButton
+		{
+			private Rectangle m_Bounds=Rectangle.Empty;
+			private Control m_Parent=null;
+			private bool m_MouseOver=false;
+			private bool m_MouseDown=false;
+			public Image Normal=null;
+			public Image Hover=null;
+			public Image Pressed=null;
+
+			public event EventHandler Click;
+
+			public ImageButton(Control parent, Rectangle bounds)
+			{
+				m_Parent=parent;
+				m_Bounds=bounds;
+			}
+
+			public virtual void Paint(Graphics g)
+			{
+			    Rectangle bounds = m_Bounds;
+			    if(m_MouseDown)
+				{
+					if(Pressed!=null)
+						g.DrawImage(Pressed,bounds);
+				}
+				else if(m_MouseOver)
+				{
+					if(Hover!=null)
+						g.DrawImage(Hover,bounds);
+				}
+				else
+				{
+					if(Normal!=null)
+						g.DrawImage(Normal,bounds);
+				}
+			}
+
+		    public virtual void OnMouseMove(MouseEventArgs e)
+			{
+				if(m_MouseDown)
+					return;
+
+				if(m_Bounds.Contains(e.X,e.Y))
+				{
+					if(!m_MouseOver)
+					{
+						m_MouseOver=true;
+						if(m_Parent!=null)
+							m_Parent.Invalidate(m_Bounds);
+					}
+				}
+				else if(m_MouseOver)
+				{
+					m_MouseOver=false;
+					if(m_Parent!=null)
+						m_Parent.Invalidate(m_Bounds);
+				}
+			}
+			public virtual void OnMouseDown(MouseEventArgs e)
+			{
+				if(m_Bounds.Contains(e.X,e.Y) && !m_MouseDown)
+				{
+					m_MouseDown=true;
+					if(m_Parent!=null)
+						m_Parent.Invalidate(m_Bounds);
+				}
+			}
+
+			public virtual void OnMouseUp(MouseEventArgs e)
+			{
+				if(m_Bounds.Contains(e.X,e.Y) && m_MouseDown)
+				{
+					m_MouseDown=false;
+					if(m_Parent!=null)
+						m_Parent.Invalidate(m_Bounds);
+					if(Click!=null)
+						Click(this,new EventArgs());
+				}
+				else if(m_MouseOver || m_MouseDown)
+				{
+					m_MouseDown=false;
+					m_MouseOver=false;
+					if(m_Parent!=null)
+						m_Parent.Invalidate(m_Bounds);
+				}
+			}
+
+			public virtual void OnMouseLeave(EventArgs e)
+			{
+				if(m_MouseOver && !m_MouseDown)
+				{
+					m_MouseOver=false;
+					if(m_Parent!=null)
+						m_Parent.Invalidate(m_Bounds);
+				}
+			}
+
+			public bool MouseDown
+			{
+				get {return m_MouseDown;}
+			}
+
+			public bool MouseOver
+			{
+				get {return m_MouseOver;}
+			}
+
+			public Rectangle Bounds
+			{
+				get {return m_Bounds;}
+				set {m_Bounds=value;}
+			}
+
+			public Point Location
+			{
+				get {return m_Bounds.Location;}
+				set {m_Bounds.Location=value;}
+			}
+
+			public System.Drawing.Size Size
+			{
+				get {return m_Bounds.Size;}
+				set {m_Bounds.Size=value;}
+			}
+		}
+	}
+
+	public class CustomPaintEventArgs:EventArgs
+	{
+		private System.Drawing.Graphics m_Graphics=null;
+		private Rectangle m_PaintRectangle=Rectangle.Empty;
+		public CustomPaintEventArgs(Graphics g, Rectangle r)
+		{
+			m_Graphics=g;
+			m_PaintRectangle=r;
+		}
+
+		public System.Drawing.Graphics Graphics
+		{
+			get {return m_Graphics;}
+		}
+
+		public Rectangle PaintRectangle
+		{
+			get {return m_PaintRectangle;}
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/Balloon.resx b/PROMS/DotNetBar Source Code/Balloon.resx
new file mode 100644
index 00000000..ae7000b3
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Balloon.resx	
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+            Microsoft ResX Schema 
+        
+            Version 1.3
+                
+            The primary goals of this format is to allow a simple XML format 
+            that is mostly human readable. The generation and parsing of the 
+            various data types are done through the TypeConverter classes 
+            associated with the data types.
+        
+            Example:
+        
+                ... ado.net/XML headers & schema ...
+                <resheader name="resmimetype">text/microsoft-resx</resheader>
+                <resheader name="version">1.3</resheader>
+                <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+                <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+                <data name="Name1">this is my long string</data>
+                <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+                <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+                    [base64 mime encoded serialized .NET Framework object]
+                </data>
+                <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+                    [base64 mime encoded string representing a byte array form of the .NET Framework object]
+                </data>
+        
+            There are any number of "resheader" rows that contain simple 
+            name/value pairs.
+            
+            Each data row contains a name, and value. The row also contains a 
+            type or mimetype. Type corresponds to a .NET class that support 
+            text/value conversion through the TypeConverter architecture. 
+            Classes that don't support this are serialized and stored with the 
+            mimetype set.
+                     
+            The mimetype is used for serialized objects, and tells the 
+            ResXResourceReader how to depersist the object. This is currently not 
+            extensible. For a given mimetype the value must be set accordingly:
+        
+            Note - application/x-microsoft.net.object.binary.base64 is the format 
+                   that the ResXResourceWriter will generate, however the reader can 
+                   read any of the formats listed below.
+        
+            mimetype: application/x-microsoft.net.object.binary.base64
+            value   : The object must be serialized with 
+                    : System.Serialization.Formatters.Binary.BinaryFormatter
+                    : and then encoded with base64 encoding.
+        
+            mimetype: application/x-microsoft.net.object.soap.base64
+            value   : The object must be serialized with 
+                    : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+                    : and then encoded with base64 encoding.
+            mimetype: application/x-microsoft.net.object.bytearray.base64
+            value   : The object must be serialized into a byte array 
+                    : using a System.ComponentModel.TypeConverter
+                    : and then encoded with base64 encoding.
+        -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>1.3</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="$this.Name">
+    <value>Balloon</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/BalloonImages/AlertHot.png b/PROMS/DotNetBar Source Code/BalloonImages/AlertHot.png
new file mode 100644
index 00000000..47868a00
Binary files /dev/null and b/PROMS/DotNetBar Source Code/BalloonImages/AlertHot.png differ
diff --git a/PROMS/DotNetBar Source Code/BalloonImages/AlertNormal.png b/PROMS/DotNetBar Source Code/BalloonImages/AlertNormal.png
new file mode 100644
index 00000000..07f19054
Binary files /dev/null and b/PROMS/DotNetBar Source Code/BalloonImages/AlertNormal.png differ
diff --git a/PROMS/DotNetBar Source Code/BalloonImages/AlertPress.png b/PROMS/DotNetBar Source Code/BalloonImages/AlertPress.png
new file mode 100644
index 00000000..50984e27
Binary files /dev/null and b/PROMS/DotNetBar Source Code/BalloonImages/AlertPress.png differ
diff --git a/PROMS/DotNetBar Source Code/BalloonImages/BalloonHot.png b/PROMS/DotNetBar Source Code/BalloonImages/BalloonHot.png
new file mode 100644
index 00000000..f7f7ef6e
Binary files /dev/null and b/PROMS/DotNetBar Source Code/BalloonImages/BalloonHot.png differ
diff --git a/PROMS/DotNetBar Source Code/BalloonImages/BalloonNormal.png b/PROMS/DotNetBar Source Code/BalloonImages/BalloonNormal.png
new file mode 100644
index 00000000..ef7ff150
Binary files /dev/null and b/PROMS/DotNetBar Source Code/BalloonImages/BalloonNormal.png differ
diff --git a/PROMS/DotNetBar Source Code/BalloonImages/BalloonPress.png b/PROMS/DotNetBar Source Code/BalloonImages/BalloonPress.png
new file mode 100644
index 00000000..298a5c23
Binary files /dev/null and b/PROMS/DotNetBar Source Code/BalloonImages/BalloonPress.png differ
diff --git a/PROMS/DotNetBar Source Code/BalloonTip.bmp b/PROMS/DotNetBar Source Code/BalloonTip.bmp
new file mode 100644
index 00000000..b7fd34ba
Binary files /dev/null and b/PROMS/DotNetBar Source Code/BalloonTip.bmp differ
diff --git a/PROMS/DotNetBar Source Code/BalloonTip.cs b/PROMS/DotNetBar Source Code/BalloonTip.cs
new file mode 100644
index 00000000..8d810096
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/BalloonTip.cs	
@@ -0,0 +1,670 @@
+using System;
+using System.ComponentModel;
+using System.Windows.Forms;
+using System.Collections;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Represents a balloon style pop-up window that displays a brief description of a control's purpose when the mouse hovers over the control or when controls receives input focus.
+	/// </summary>
+	[ToolboxItem(true),ProvideProperty("BalloonCaption",typeof(Control)),
+	ProvideProperty("BalloonText",typeof(Control)),
+	System.Runtime.InteropServices.ComVisible(false)]
+	public class BalloonTip:Component, IExtenderProvider
+	{
+        /// <summary>
+        /// Occurs before balloon is displayed.
+        /// </summary>
+        [Description("Occurs before balloon is displayed.")]
+        public event EventHandler BalloonDisplaying;
+        /// <summary>
+        /// Occurs before balloon is closed and allows to cancel the action.
+        /// </summary>
+        [Description("Occurs before balloon is closed and allows to cancel the action.")]
+        public event CancelEventHandler BalloonClosing;
+
+		private bool m_BalloonFocus=false;
+		private bool m_Enabled=true;
+		private bool m_ShowAlways=false;
+		private eBallonStyle m_Style=eBallonStyle.Balloon;
+		private int m_InitialDelay=500;
+		private bool m_AutoClose=true;
+		private int m_AutoCloseTimeOut=5;
+		private eAlertAnimation m_AlertAnimation=eAlertAnimation.BottomToTop;
+		private int m_AlertAnimationDuration=200;
+		private bool m_ShowBalloonOnFocus=false;
+		private bool m_ShowCloseButton=true;
+
+		private Balloon m_BalloonControl=null;
+
+		private System.Drawing.Image m_CaptionImage=null;
+		private System.Drawing.Icon m_CaptionIcon=null;
+
+		private Hashtable m_BalloonsInfo=new Hashtable();
+
+		private Control m_MouseOverControl=null;
+		private Control m_FocusedControl=null;
+
+		private Timer m_DelayTimer=null;
+
+		private Control m_BalloonTriggerControl=null;
+		private int m_DefaultBalloonWidth=256;
+        private bool m_AntiAlias = true;
+		/// <summary>
+		/// Initializes a new instance of the BalloonTip class.
+		/// </summary>
+		public BalloonTip()
+		{
+		}
+
+		/// <summary>
+		///    Clean up any resources being used.
+		/// </summary>
+		protected override void Dispose(bool disposing)
+		{
+			RemoveAll();
+			m_MouseOverControl=null;
+			m_FocusedControl=null;
+			m_BalloonTriggerControl=null;
+            if (BarUtilities.DisposeItemImages &&  !this.DesignMode)
+            {
+                BarUtilities.DisposeImage(ref m_CaptionImage);
+                BarUtilities.DisposeImage(ref m_CaptionIcon);
+            }
+			DestroyDelayTimer();
+			base.Dispose(disposing);
+		}
+
+		bool IExtenderProvider.CanExtend(object target) 
+		{
+			if (target is Control)
+				return true;
+			return false;
+		}
+
+        /// <summary>
+        /// Gets or sets whether anti-alias smoothing is used while painting. Default value is false.
+        /// </summary>
+        [DefaultValue(true), Browsable(true), Category("Appearance"), Description("Gets or sets whether anti-aliasing is used while painting.")]
+        public bool AntiAlias
+        {
+            get { return m_AntiAlias; }
+            set
+            {
+                m_AntiAlias = value;
+            }
+        }
+
+		/// <summary>
+		/// Retrieves the Balloon Caption text associated with the specified control.
+		/// </summary>
+        [DefaultValue(""), Localizable(true)]
+		public string GetBalloonCaption(Control control)
+		{
+			if(m_BalloonsInfo.Contains(control))
+			{
+				BalloonTipInfo info=m_BalloonsInfo[control] as BalloonTipInfo;
+				if(info!=null)
+					return info.Caption;
+			}
+			return "";
+		}
+
+		/// <summary>
+		/// Associates Balloon Caption text with the specified control.
+		/// </summary>
+		/// <param name="control">The Control to associate the Balloon Caption text with.</param>
+		/// <param name="value">The Balloon Caption text to display on the Balloon.</param>
+		[Localizable(true)]
+        public void SetBalloonCaption(Control control, string caption)
+		{
+			if(caption==null)
+				caption="";
+			if(m_BalloonsInfo.Contains(control))
+			{
+				BalloonTipInfo info=m_BalloonsInfo[control] as BalloonTipInfo;
+				if(info!=null)
+				{
+					info.Caption=caption;
+					if(info.Caption=="" && info.Text=="")
+					{
+						this.Remove(control);
+					}
+				}
+			}
+			else if(caption!="")
+			{
+				BalloonTipInfo info=new BalloonTipInfo();
+				info.Caption=caption;
+				this.AddControl(control,info);
+			}
+		}
+
+		/// <summary>
+		/// Retrieves the Balloon text associated with the specified control.
+		/// </summary>
+		[DefaultValue(""), Localizable(true)]
+		public string GetBalloonText(Control control)
+		{
+			if(m_BalloonsInfo.Contains(control))
+			{
+				BalloonTipInfo info=m_BalloonsInfo[control] as BalloonTipInfo;
+				if(info!=null)
+					return info.Text;
+			}
+			return "";
+		}
+
+		/// <summary>
+		/// Associates Balloon text with the specified control.
+		/// </summary>
+		/// <param name="control">The Control to associate the Balloon text with.</param>
+		/// <param name="value">The Balloon text to display on the Balloon.</param>
+		[Localizable(true)]
+        public void SetBalloonText(Control control, string text)
+		{
+			if(text==null)
+				text="";
+			if(m_BalloonsInfo.Contains(control))
+			{
+				BalloonTipInfo info=m_BalloonsInfo[control] as BalloonTipInfo;
+				if(info!=null)
+				{
+					info.Text=text;
+					if(info.Caption=="" && info.Text=="")
+					{
+						this.Remove(control);
+					}
+				}
+			}
+			else if(text!="")
+			{
+				BalloonTipInfo info=new BalloonTipInfo();
+				info.Text=text;
+				this.AddControl(control,info);
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets a value indicating whether the BalloonTip is currently active.
+		/// true if the BalloonTip is currently active; otherwise, false. The default is true.
+		/// </summary>
+		[DefaultValue(true),Category("Misc"),Description("Gets or sets a value indicating whether the BalloonTip is currently active.")]
+		public bool Enabled
+		{
+			get{return m_Enabled;}
+			set
+			{
+				m_Enabled=value;
+			}
+		}
+
+		/// <summary>
+		/// Removes all Balloon texts currently associated with the BalloonTip control.
+		/// </summary>
+		public void RemoveAll()
+		{
+			Control[] ctrls=new Control[m_BalloonsInfo.Keys.Count];
+
+			m_BalloonsInfo.Keys.CopyTo(ctrls,0);
+			foreach(Control c in ctrls)
+			{
+				this.Remove(c);
+			}
+			m_BalloonsInfo.Clear();
+		}
+
+		/// <summary>
+		/// Removes specific Balloon texts currently associated with the BalloonTip control.
+		/// </summary>
+		/// <param name="control">Control that has Balloon texts associated.</param>
+		public void Remove(Control control)
+		{
+			if(m_BalloonsInfo.Contains(control))
+			{
+				// Remove event handlers
+				try
+				{
+					control.MouseEnter-=new EventHandler(this.ControlMouseEnter);
+					control.MouseLeave-=new EventHandler(this.ControlMouseLeave);
+					control.Enter-=new EventHandler(this.ControlGotFocus);
+					control.Leave-=new EventHandler(this.ControlLeave);
+				}
+				catch{}
+				m_BalloonsInfo.Remove(control);
+			}
+		}
+
+		private void AddControl(Control control, BalloonTipInfo info)
+		{
+			if(m_BalloonsInfo.Contains(control))
+				return;
+			m_BalloonsInfo.Add(control,info);
+			// Hook-up events
+			control.MouseEnter+=new EventHandler(this.ControlMouseEnter);
+			control.MouseLeave+=new EventHandler(this.ControlMouseLeave);
+			control.Enter+=new EventHandler(this.ControlGotFocus);
+			control.Leave+=new EventHandler(this.ControlLeave);
+		}
+
+		/// <summary>
+		/// Shows Balloon for specific control. Control must have Balloon already assigned to it.
+		/// </summary>
+		/// <param name="control">Control that has Balloon already assigned.</param>
+		public virtual void ShowBalloon(Control control)
+		{
+			if(m_BalloonsInfo.Contains(control))
+			{
+				BalloonTipInfo info=m_BalloonsInfo[control] as BalloonTipInfo;
+				if(info!=null)
+				{
+					CloseBalloon();
+
+					// Closing of balloon was denied exit.
+					if(m_BalloonControl!=null)
+					{
+						return;
+					}
+
+					m_BalloonControl=CreateBalloonControl(info);
+					m_BalloonControl.Location=new System.Drawing.Point(0,0);
+					m_BalloonTriggerControl=control;
+					
+					if(BalloonDisplaying!=null)
+						BalloonDisplaying(this,new EventArgs());
+
+					// If Balloon Control is still around
+					if(m_BalloonControl!=null)
+					{
+						Form parentForm=control.FindForm();
+						if(parentForm!=null)
+							m_BalloonControl.Owner=parentForm;
+						if(!m_BalloonControl.Location.IsEmpty)
+							m_BalloonControl.Show(m_BalloonFocus);
+						else
+							m_BalloonControl.Show(control,m_BalloonFocus);
+					}
+				}
+			}
+		}
+
+		/// <summary>
+		/// Returns reference to the control that triggered balloon.
+		/// </summary>
+		public Control BalloonTriggerControl
+		{
+			get
+			{
+				return m_BalloonTriggerControl;
+			}
+		}
+
+        private int _MinimumBalloonWidth = 180;
+        /// <summary>
+        /// Gets or sets the minimum balloon width when auto sizing balloon. Default value is 180.
+        /// </summary>
+        [DefaultValue(180), Category("Appearance"), Description("Indicates minimum balloon width when auto sizing balloon.")]
+        public int MinimumBalloonWidth
+        {
+            get { return _MinimumBalloonWidth; }
+            set { _MinimumBalloonWidth = value; }
+        }
+
+		private Balloon CreateBalloonControl(BalloonTipInfo info)
+		{
+			Balloon b=new Balloon();
+			b.CaptionText=info.Caption;
+			b.Text=info.Text;
+			b.AutoClose=m_AutoClose;
+			b.AutoCloseTimeOut=m_AutoCloseTimeOut;
+			b.CaptionImage=this.CaptionImage;
+			b.CaptionIcon=this.CaptionIcon;
+			b.AlertAnimation=m_AlertAnimation;
+			b.AlertAnimationDuration=m_AlertAnimationDuration;
+			b.ShowCloseButton=m_ShowCloseButton;
+			b.Style=m_Style;
+            b.MinimumBalloonWidth = _MinimumBalloonWidth;
+			if(info.Caption=="" || info.Caption==null)
+			{
+				b.Width=this.DefaultBalloonWidth;
+			}
+			else
+				b.AutoResize();
+
+			return b;
+		}
+
+		/// <summary>
+		/// Closes Balloon control if visible.
+		/// </summary>
+		public virtual void CloseBalloon()
+		{
+			m_BalloonTriggerControl=null;
+
+			if(m_BalloonControl==null)
+				return;
+
+			CancelEventArgs e=new CancelEventArgs(false);
+			if(BalloonClosing!=null)
+				BalloonClosing(this,e);
+			if(e.Cancel)
+				return;
+
+			if(m_BalloonControl.Visible)
+			{
+				m_BalloonControl.Hide();
+			}
+            
+			m_BalloonControl.Close();
+            m_BalloonControl.Dispose();
+            m_BalloonControl=null;
+		}
+
+		/// <summary>
+		/// Gets or sets a value indicating whether Balloon receives input focus when displayed.
+		/// Default value is false.
+		/// </summary>
+		[DefaultValue(false),Category("Misc"),Description("Gets or sets a value indicating whether Balloon receives input focus when displayed.")]
+		public bool BalloonFocus
+		{
+			get {return m_BalloonFocus;}
+			set {m_BalloonFocus=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets the time (in milliseconds) that passes before the BalloonTip appears.
+		/// </summary>
+		[DefaultValue(500),Category("Misc"),Description("Indicates the time (in milliseconds) that passes before the BalloonTip appears.")]
+		public int InitialDelay
+		{
+			get{return m_InitialDelay;}
+			set{m_InitialDelay=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets a value indicating whether a Balloon window is displayed even when its parent form is not active. Default value is false.
+		/// </summary>
+		[DefaultValue(false),Category("Misc"),Description("Indicates whether a Balloon window is displayed even when its parent form is not active.")]
+		public bool ShowAlways
+		{
+			get{return m_ShowAlways;}
+			set{m_ShowAlways=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets the internal Balloon control that is used to display Balloon.
+		/// This property will have valid value only during time Balloon is actually
+		/// displayed on the screen. Value will also be valid during BalloonDisplaying event.
+		/// You can use this property to further customize Balloon control before it is
+		/// displayed to the user. You can also set it to your own instance of the Balloon
+		/// control (or the control that is inheriting it) for ultimate customization options.
+		/// Note that new instance of Balloon control is created each time Balloon needs to be displayed.
+		/// Once Balloon is closed control is disposed.
+		/// </summary>
+		[Browsable(false),DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public Balloon BalloonControl
+		{
+			get {return m_BalloonControl;}
+			set {m_BalloonControl=value;}
+		}
+
+		/// <summary>
+		/// Specifies balloon style.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),Category("Style"),DefaultValue(eBallonStyle.Balloon),Description("Specifies balloon style.")]
+		public eBallonStyle Style
+		{
+			get {return m_Style;}
+			set
+			{
+				if(m_Style!=value)
+				{
+					m_Style=value;
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the animation type used to display Alert type balloon.
+		/// </summary>
+		[Browsable(true),Description("Gets or sets the animation type used to display Alert type balloon."),Category("Behavior"),DefaultValue(eAlertAnimation.BottomToTop)]
+		public eAlertAnimation AlertAnimation
+		{
+			get {return m_AlertAnimation;}
+			set {m_AlertAnimation=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets the total time in milliseconds alert animation takes.
+		/// Default value is 200.
+		/// </summary>
+		[Browsable(true),Description("Gets or sets the total time in milliseconds alert animation takes."),Category("Behavior"),DefaultValue(200)]
+		public int AlertAnimationDuration
+		{
+			get {return m_AlertAnimationDuration;}
+			set {m_AlertAnimationDuration=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets whether balloon will close automatically when user click the close button.
+		/// </summary>
+		[Browsable(true),Description("Indicates whether balloon will close automatically when user click the close button."),Category("Behavior"),DefaultValue(true)]
+		public bool AutoClose
+		{
+			get {return m_AutoClose;}
+			set {m_AutoClose=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets time period in seconds after balloon closes automatically.
+		/// </summary>
+		[Browsable(true),Description("Indicates time period in seconds after balloon closes automatically."),Category("Behavior"),DefaultValue(5)]
+		public int AutoCloseTimeOut
+		{
+			get {return m_AutoCloseTimeOut;}
+			set
+			{
+				m_AutoCloseTimeOut=value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets whether Balloon is shown after control receives input focus. Default value is false. When set to true Balloon will not be displayed on mouse hover.
+		/// </summary>
+		[Browsable(true),Description("Indicates whether Balloon is shown after control receives input focus."),Category("Behavior"),DefaultValue(false)]
+		public bool ShowBalloonOnFocus
+		{
+			get {return m_ShowBalloonOnFocus;}
+			set
+			{
+				if(m_ShowBalloonOnFocus!=value)
+				{
+					m_ShowBalloonOnFocus=value;
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets whether the Balloon Close button is displayed.
+		/// </summary>
+		[Browsable(true),Description("Indicates whether the Balloon Close button is displayed."),Category("Behavior"),DefaultValue(true)]
+		public bool ShowCloseButton
+		{
+			get {return m_ShowCloseButton;}
+			set
+			{
+				if(value!=m_ShowCloseButton)
+				{
+					m_ShowCloseButton=value;
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets default balloon width. Usually the width of the balloon is calculated based on the width of the caption text. If caption text is not set then this value will be used as default width of the balloon.
+		/// </summary>
+		[Browsable(true),Description("Indicates default balloon width. Usually the width of the balloon is calculated based on the width of the caption text. If caption text is not set then this value will be used as default width of the balloon."),Category("Appearance"),DefaultValue(256)]
+		public int DefaultBalloonWidth
+		{
+			get {return m_DefaultBalloonWidth;}
+			set {m_DefaultBalloonWidth=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets the Balloon Caption image.
+        /// </summary>
+        [Browsable(true),Description("Indicates Balloon Caption image."),Category("Appearance"),DefaultValue(null)]
+		public System.Drawing.Image CaptionImage
+		{
+			get {return m_CaptionImage;}
+			set 
+			{
+				if(m_CaptionImage!=value)
+				{
+					m_CaptionImage=value;
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the Balloon Caption icon. Icon is used to provide support for alpha-blended images in caption.
+		/// </summary>
+		[Browsable(true),Description("Indicates Balloon Caption icon. Icon is used to provide support for alpha-blended images in caption."),Category("Appearance"),DefaultValue(null)]
+		public System.Drawing.Icon CaptionIcon
+		{
+			get {return m_CaptionIcon;}
+			set 
+			{
+				if(m_CaptionIcon!=value)
+				{
+					m_CaptionIcon=value;
+				}
+			}
+		}
+
+		private void DestroyDelayTimer()
+		{
+			if(m_DelayTimer!=null)
+			{
+				m_DelayTimer.Stop();
+				m_DelayTimer.Tick-=new EventHandler(this.DelayTimerTick);
+				m_DelayTimer.Dispose();
+				m_DelayTimer=null;
+			}
+		}
+
+		private void DelayTimerTick(object sender, EventArgs e)
+		{
+			m_DelayTimer.Enabled=false;
+			DestroyDelayTimer();
+
+            if (m_Enabled)
+            {
+                if (m_ShowBalloonOnFocus && m_FocusedControl != null)
+                    ShowBalloon(m_FocusedControl);
+                else if (!m_ShowBalloonOnFocus && m_MouseOverControl != null)
+                    ShowBalloon(m_MouseOverControl);
+            }
+		}
+
+		private void ShowBalloonDelayed(Control control)
+		{
+			if(control==null || !m_Enabled)
+				return;
+
+			if(!m_ShowAlways)
+			{
+				Form parentForm=control.FindForm();
+				if(parentForm.IsMdiChild)
+				{
+					if(parentForm.MdiParent!=null && parentForm.MdiParent.ActiveMdiChild!=parentForm)
+						return;
+				}
+				else
+				{
+					if(Form.ActiveForm!=parentForm)
+						return;
+				}
+			}
+
+			if(m_InitialDelay==0)
+			{
+				ShowBalloon(control);
+				return;
+			}
+			
+			if(m_DelayTimer==null)
+			{
+				m_DelayTimer=new Timer();
+				m_DelayTimer.Tick+=new EventHandler(this.DelayTimerTick);
+				m_DelayTimer.Interval=m_InitialDelay;
+				m_DelayTimer.Start();
+			}
+		}
+
+		private void OnMouseEnter()
+		{
+			if(!m_Enabled || m_MouseOverControl==null || m_ShowBalloonOnFocus || !m_BalloonsInfo.Contains(m_MouseOverControl))
+				return;
+
+			ShowBalloonDelayed(m_MouseOverControl);
+		}
+
+		private void OnMouseLeave()
+		{
+			if(!m_ShowBalloonOnFocus)
+			{
+				DestroyDelayTimer();
+				CloseBalloon();
+			}
+		}
+
+		private void OnControlGotFocus()
+		{
+			if(!m_Enabled || m_FocusedControl==null || !m_ShowBalloonOnFocus || !m_BalloonsInfo.Contains(m_FocusedControl))
+				return;
+
+			ShowBalloonDelayed(m_FocusedControl);
+		}
+
+		private void OnControlLeave()
+		{
+			if(m_ShowBalloonOnFocus)
+			{
+				DestroyDelayTimer();
+				CloseBalloon();
+			}
+		}
+
+		private void ControlMouseEnter(object sender, EventArgs e)
+		{
+			m_MouseOverControl=sender as Control;
+			OnMouseEnter();
+		}
+
+		private void ControlMouseLeave(object sender, EventArgs e)
+		{
+			m_MouseOverControl=null;
+			OnMouseLeave();
+		}
+
+		private void ControlGotFocus(object sender, EventArgs e)
+		{
+			m_FocusedControl=sender as Control;
+			OnControlGotFocus();
+		}
+
+		private void ControlLeave(object sender, EventArgs e)
+		{
+			m_FocusedControl=null;
+			OnControlLeave();
+		}
+
+		private class BalloonTipInfo
+		{
+			public string Caption;
+			public string Text;
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/Bar.bmp b/PROMS/DotNetBar Source Code/Bar.bmp
new file mode 100644
index 00000000..1bfca562
Binary files /dev/null and b/PROMS/DotNetBar Source Code/Bar.bmp differ
diff --git a/PROMS/DotNetBar Source Code/Bar.cs b/PROMS/DotNetBar Source Code/Bar.cs
new file mode 100644
index 00000000..c064f59c
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Bar.cs	
@@ -0,0 +1,14246 @@
+namespace DevComponents.DotNetBar
+{
+    using System;
+    using System.Windows.Forms;
+    using System.Drawing;
+    using System.ComponentModel;
+    using System.Collections;
+    using System.Resources;
+    using System.Drawing.Drawing2D;
+    using System.ComponentModel.Design;
+    using DevComponents.DotNetBar.Rendering;
+    using System.Runtime.InteropServices;
+    using System.Drawing.Text;
+    using System.Collections.Generic;
+
+    /// <summary>
+    ///  Represents bar control.
+    /// </summary>
+    [ToolboxBitmap(typeof(Bar), "Bar.ico"), ToolboxItem(true), Designer("DevComponents.DotNetBar.Design.BarDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf"), System.Runtime.InteropServices.ComVisible(false), DefaultEvent("ItemClick")]
+    public class Bar : Control, IDockInfo, IBarImageSize, IOwner, IOwnerMenuSupport,
+        IMessageHandlerClient, ISupportInitialize, IBarDesignerServices,
+        ICustomSerialization, IRenderingSupport, IAccessibilitySupport, IOwnerLocalize
+    {
+        #region Events Definitions
+        /// <summary>
+        /// Occurs after bar state has changed, like selected dock tab has changed, bar has closed, bar has been docked or undocked etc.
+        /// </summary>
+        [Description("Occurs after bar state has changed, like selected dock tab has changed, bar has closed, bar has been docked or undocked etc.")]
+        public event BarStateChangedEventHandler BarStateChanged;
+        /// <summary>
+        /// Raises BarStateChanged event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnBarStateChanged(BarStateChangedEventArgs e)
+        {
+            BarStateChangedEventHandler handler = BarStateChanged;
+            if (handler != null)
+                handler(this, e);
+
+            DotNetBarManager manager = this.Owner as DotNetBarManager;
+            if (manager != null)
+                manager.InvokeOnBarStateChanged(e);
+        }
+        /// <summary>
+        /// Occurs when Item is clicked.
+        /// </summary>
+        [System.ComponentModel.Description("Occurs when Item is clicked."), Category("Item")]
+        public event EventHandler ItemClick;
+        /// <summary>
+        /// Occurs after Bar is docked.
+        /// </summary>
+        [System.ComponentModel.Description("Occurs after Bar is docked.")]
+        public event EventHandler BarDock;
+
+        /// <summary>
+        /// Occurs after Bar is undocked.
+        /// </summary>
+        [System.ComponentModel.Description("Occurs after Bar is undocked.")]
+        public event EventHandler BarUndock;
+
+        /// <summary>
+        /// Occurs after Bar definition is loaded.
+        /// </summary>
+        [System.ComponentModel.Description("Occurs after Bar definition is loaded.")]
+        public event EventHandler DefinitionLoaded;
+
+        /// <summary>
+        /// Occurs when current Dock tab has changed.
+        /// </summary>
+        [System.ComponentModel.Description("Occurs when current Dock tab has changed.")]
+        public event DotNetBarManager.DockTabChangeEventHandler DockTabChange;
+
+        /// <summary>
+        /// Occurs when bar visibility has changed as a result of user action.
+        /// </summary>
+        [System.ComponentModel.Description("Occurs when bar visibility has changed as a result of user action.")]
+        public event EventHandler UserVisibleChanged;
+
+        /// <summary>
+        /// Occurs when bar auto hide state has changed.
+        /// </summary>
+        [System.ComponentModel.Description("Occurs when bar auto hide state has changed.")]
+        public event EventHandler AutoHideChanged;
+
+        /// <summary>
+        /// Occurs when Bar is about to be closed as a result of user clicking the Close button on the bar.
+        /// </summary>
+        [System.ComponentModel.Description("Occurs when Bar is about to be closed as a result of user clicking the Close button on the bar.")]
+        public event DotNetBarManager.BarClosingEventHandler Closing;
+
+        /// <summary>
+        /// Occurs when Bar in auto-hide state is about to be displayed.
+        /// </summary>
+        [System.ComponentModel.Description("Occurs when Bar in auto-hide state is about to be displayed.")]
+        public event DotNetBarManager.AutoHideDisplayEventHandler AutoHideDisplay;
+
+        /// <summary>
+        /// Occurs when popup item is closing. Event is fired only when Bar is used independently of DotNetBarManager.
+        /// </summary>
+        [System.ComponentModel.Description("Occurs when popup item is closing."), Category("Item")]
+        public event EventHandler PopupClose;
+
+        /// <summary>
+        /// Occurs when popup of type container is loading. Event is fired only when Bar is used independently of DotNetBarManager.
+        /// </summary>
+        [System.ComponentModel.Description("Occurs when popup of type container is loading."), Category("Item")]
+        public event EventHandler PopupContainerLoad;
+
+        /// <summary>
+        /// Occurs when popup of type container is unloading. Event is fired only when Bar is used independently of DotNetBarManager.
+        /// </summary>
+        [System.ComponentModel.Description("Occurs when popup of type container is unloading."), Category("Item")]
+        public event EventHandler PopupContainerUnload;
+
+        /// <summary>
+        /// Occurs when popup item is about to open.  Event is fired only when Bar is used independently of DotNetBarManager.
+        /// </summary>
+        [System.ComponentModel.Description("Occurs when popup item is about to open."), Category("Item")]
+        public event DotNetBarManager.PopupOpenEventHandler PopupOpen;
+
+        /// <summary>
+        /// Occurs just before popup window is shown. Event is fired only when Bar is used independently of DotNetBarManager.
+        /// </summary>
+        [System.ComponentModel.Description("Occurs just before popup window is shown."), Category("Item")]
+        public event EventHandler PopupShowing;
+
+        /// <summary>
+        /// Occurs before dock tab is displayed.
+        /// </summary>
+        [System.ComponentModel.Description("Occurs before dock tab is displayed.")]
+        public event EventHandler BeforeDockTabDisplayed;
+
+        /// <summary>
+        /// Occurs when caption button is clicked. Caption button is button displayed on bars with grab handle style task pane.
+        /// </summary>
+        [System.ComponentModel.Description("Occurs when caption button is clicked on bars with grab handle style task pane.")]
+        public event EventHandler CaptionButtonClick;
+
+        /// <summary>
+        /// Occurs on dockable bars when end-user attempts to close the individual DockContainerItem objects using system buttons on dock tab.
+        /// Event can be canceled by setting the Cancel property of event arguments to true. This even will occur only after user presses the
+        /// X button on tab that is displaying the dockable windows/documents.
+        /// </summary>
+        [System.ComponentModel.Description("Occurs on dockable bars when end-user attempts to close the individual DockContainerItem objects using system buttons on dock tab.")]
+        public event DockTabClosingEventHandler DockTabClosing;
+
+        /// <summary>
+        /// Occurs on dockable bars after DockContainerItem is closed by end-user. This action cannot be cancelled.
+        /// </summary>
+        [System.ComponentModel.Description("Occurs on dockable bars after DockContainerItem is closed by end-user. This action cannot be cancelled.")]
+        public event DockTabClosingEventHandler DockTabClosed;
+
+        /// <summary>
+        /// Occurs after an item has been serialized to XmlElement and provides you with opportunity to add any custom data
+        /// to serialized XML. This allows you to serialize any data with the item and load it back up in DeserializeItem event.
+        /// </summary>
+        /// <remarks>
+        /// 	<para>To serialize custom data to XML definition control creates handle this event and use CustomXmlElement
+        /// property on SerializeItemEventArgs to add new nodes or set attributes with custom data you want saved.</para>
+        /// </remarks>
+        public event SerializeItemEventHandler SerializeItem;
+
+        /// <summary>
+        /// Occurs after an item has been de-serialized (load) from XmlElement and provides you with opportunity to load any custom data
+        /// you have serialized during SerializeItem event.
+        /// </summary>
+        /// <remarks>
+        /// 	<para>To de-serialize custom data from XML definition handle this event and use CustomXmlElement
+        /// property on SerializeItemEventArgs to retrive any data you saved in SerializeItem event.</para>
+        /// </remarks>
+        public event SerializeItemEventHandler DeserializeItem;
+
+        /// <summary>
+        /// Occurs after the TabStrip style which used on dockable windows has changed. This event gives you opportunity to
+        /// change the style of the tab strip by accessing Bar.DockTabControl.Style property.
+        /// </summary>
+        public event EventHandler TabStripStyleChanged;
+
+        /// <summary>
+        /// Occurs before the bar control is rendered. This event is fired once for each part of the bar control being rendered. Check the Part property of the event arguments to identify the part being rendered.
+        /// You can cancel internal rendering by setting Cancel property.
+        /// </summary>
+        public event RenderBarEventHandler PreRender;
+
+        /// <summary>
+        /// Occurs after the bar control is rendered and allows you to render on top of the default rendering provided by the control.
+        /// </summary>
+        public event RenderBarEventHandler PostRender;
+
+        /// <summary>
+        /// Occurs when DotNetBar is looking for translated text for one of the internal text that are
+        /// displayed on menus, toolbars and customize forms. You need to set Handled=true if you want
+        /// your custom text to be used instead of the built-in system value.
+        /// </summary>
+        public event DotNetBarManager.LocalizeStringEventHandler LocalizeString;
+        #endregion
+
+        #region System Buttons class
+        private class System_Buttons
+        {
+            public System_Buttons(Rectangle closerect, Rectangle custrect, bool mouseoverclose, bool mouseovercustomize, bool mousednclose, bool mousedncust)
+            {
+                this.CloseButtonRect = closerect;
+                this.CustomizeButtonRect = custrect;
+                this.MouseOverClose = mouseoverclose;
+                this.MouseOverCustomize = mouseovercustomize;
+                this.MouseDownClose = mousednclose;
+                this.MouseDownCustomize = mousedncust;
+                this.MouseOverAutoHide = false;
+                this.MouseDownAutoHide = false;
+                this.AutoHideButtonRect = Rectangle.Empty;
+                this.ButtonSize = new Size(Dpi.Width14, Dpi.Height14);
+            }
+            public event EventHandler MouseOverCloseChanged;
+            public event EventHandler MouseOverMaximizeChanged;
+            public event EventHandler MouseOverCustomizeChanged;
+            public event EventHandler MouseOverAutoHideChanged;
+            public event EventHandler MouseDownCloseChanged;
+            public event EventHandler MouseDownMaximizeChanged;
+            public event EventHandler MouseDownCustomizeChanged;
+            public event EventHandler MouseDownAutoHideChanged;
+            public event EventHandler MouseOverCaptionChanged;
+            public event EventHandler MouseDownCaptionChanged;
+            public Rectangle CloseButtonRect;
+            public Rectangle CustomizeButtonRect;
+            public Rectangle AutoHideButtonRect;
+            public Rectangle CaptionButtonRect;
+            public Rectangle MaximizeButtonRect;
+            public System.Drawing.Size ButtonSize = new Size(14, 14);
+            private bool m_MouseOverClose = false;
+            private bool m_MouseOverMaximize = false;
+            private bool m_MouseOverCustomize = false;
+            private bool m_MouseDownClose = false;
+            private bool m_MouseDownMaximize = false;
+            private bool m_MouseDownCustomize = false;
+            private bool m_MouseOverAutoHide = false;
+            private bool m_MouseDownAutoHide = false;
+            private bool m_MouseOverCaption = false;
+            private bool m_MouseDownCaption = false;
+
+            public bool MouseOverClose
+            {
+                get { return m_MouseOverClose; }
+                set
+                {
+                    if (m_MouseOverClose != value)
+                    {
+                        m_MouseOverClose = value;
+                        if (MouseOverCloseChanged != null)
+                            MouseOverCloseChanged(this, new EventArgs());
+                    }
+                }
+            }
+            public bool MouseOverMaximize
+            {
+                get { return m_MouseOverMaximize; }
+                set
+                {
+                    if (m_MouseOverMaximize != value)
+                    {
+                        m_MouseOverMaximize = value;
+                        if (MouseOverMaximizeChanged != null)
+                            MouseOverMaximizeChanged(this, new EventArgs());
+                    }
+                }
+            }
+            public bool MouseOverCaption
+            {
+                get { return m_MouseOverCaption; }
+                set
+                {
+                    if (m_MouseOverCaption != value)
+                    {
+                        m_MouseOverCaption = value;
+                        if (MouseOverCaptionChanged != null)
+                            MouseOverCaptionChanged(this, new EventArgs());
+                    }
+                }
+            }
+            public bool MouseOverCustomize
+            {
+                get { return m_MouseOverCustomize; }
+                set
+                {
+                    if (m_MouseOverCustomize != value)
+                    {
+                        m_MouseOverCustomize = value;
+                        if (MouseOverCustomizeChanged != null)
+                            MouseOverCustomizeChanged(this, new EventArgs());
+                    }
+                }
+            }
+            public bool MouseDownClose
+            {
+                get { return m_MouseDownClose; }
+                set
+                {
+                    if (m_MouseDownClose != value)
+                    {
+                        m_MouseDownClose = value;
+                        if (MouseDownCloseChanged != null)
+                            MouseDownCloseChanged(this, new EventArgs());
+                    }
+                }
+            }
+            public bool MouseDownMaximize
+            {
+                get { return m_MouseDownMaximize; }
+                set
+                {
+                    if (m_MouseDownMaximize != value)
+                    {
+                        m_MouseDownMaximize = value;
+                        if (MouseDownMaximizeChanged != null)
+                            MouseDownMaximizeChanged(this, new EventArgs());
+                    }
+                }
+            }
+            public bool MouseDownCaption
+            {
+                get { return m_MouseDownCaption; }
+                set
+                {
+                    if (m_MouseDownCaption != value)
+                    {
+                        m_MouseDownCaption = value;
+                        if (MouseDownCaptionChanged != null)
+                            MouseDownCaptionChanged(this, new EventArgs());
+                    }
+                }
+            }
+            public bool MouseDownCustomize
+            {
+                get { return m_MouseDownCustomize; }
+                set
+                {
+                    if (m_MouseDownCustomize != value)
+                    {
+                        m_MouseDownCustomize = value;
+                        if (MouseDownCustomizeChanged != null)
+                            MouseDownCustomizeChanged(this, new EventArgs());
+                    }
+                }
+            }
+            public bool MouseOverAutoHide
+            {
+                get { return m_MouseOverAutoHide; }
+                set
+                {
+                    if (m_MouseOverAutoHide != value)
+                    {
+                        m_MouseOverAutoHide = value;
+                        if (MouseOverAutoHideChanged != null)
+                            MouseOverAutoHideChanged(this, new EventArgs());
+                    }
+                }
+            }
+            public bool MouseDownAutoHide
+            {
+                get { return m_MouseDownAutoHide; }
+                set
+                {
+                    if (m_MouseDownAutoHide != value)
+                    {
+                        m_MouseDownAutoHide = value;
+                        if (MouseDownAutoHideChanged != null)
+                            MouseDownAutoHideChanged(this, new EventArgs());
+                    }
+                }
+            }
+        }
+        #endregion
+
+        #region Constants
+        private struct ThemeMargin
+        {
+            public int Left;
+            public int Top;
+            public int Right;
+            public int Bottom;
+            public bool IsEmpty
+            {
+                get
+                { return (Left == 0 && Top == 0 && Right == 0 && Bottom == 0); }
+            }
+        }
+
+        const int WM_MOUSEACTIVATE = 0x21;
+        const int MA_NOACTIVATE = 3;
+        const int MA_NOACTIVATEANDEAT = 4;
+        const long WS_POPUP = 0x80000000L;
+        const long WS_CLIPSIBLINGS = 0x04000000L;
+        const long WS_CLIPCHILDREN = 0x02000000L;
+        const long WS_EX_TOPMOST = 0x00000008L;
+        const long WS_EX_TOOLWINDOW = 0x00000080L;
+        const long WS_VISIBLE = 0x10000000L;
+        const int WM_WINDOWPOSCHANGING = 0x0046;
+        const int WM_WINDOWPOSCHANGED = 0x0047;
+
+        const int SIZE_W = 1;
+        const int SIZE_E = 2;
+        const int SIZE_N = 3;
+        const int SIZE_S = 4;
+        const int SIZE_NWN = 5;
+        const int SIZE_NWS = 6;
+        const int SIZE_NEN = 7;
+        const int SIZE_NES = 8;
+        const int SIZE_HSPLITRIGHT = 9;
+        const int SIZE_HSPLITLEFT = 10;
+        const int SIZE_VSPLITTOP = 11;
+        const int SIZE_VSPLITBOTTOM = 12;
+        const int SIZE_HSPLIT = 13;
+        const int SIZE_VSPLIT = 14;
+        const int SIZE_PARENTRESIZE = 15;
+
+        const int DRAGRECTANGLE_WIDTH = 3;
+
+        const int GrabHandleDotNetWidth = 7;
+        const int GrabHandleOfficeWidth = 7;
+        const int GrabHandleResizeWidth = 17;
+        const int GrabHandleTaskPaneHeight = 23;
+        const int GrabHandleCaptionHeight = 20;
+
+        const int DOCKTABSTRIP_HEIGHT = 25;
+        #endregion
+
+        #region Private Variables
+        private BaseItem m_ParentItem;
+        private Point m_ParentItemScreenPos;
+        private object m_OldContainer;
+        private Rectangle m_ClientRect;
+        private SideBarImage m_SideBarImage;
+        private Rectangle m_SideBarRect;
+        private GenericItemContainer m_ItemContainer;
+        //private BaseItem m_OldParent;
+        private int m_InitialContainerWidth;
+        private eBarState m_BarState;
+        private eGrabHandleStyle m_GrabHandleStyle;
+        private Rectangle m_GrabHandleRect;
+
+        // IDockInfo members
+        private int m_DockOffset;
+        private int m_DockLine;
+
+        private object m_Owner;
+        private Point m_MouseDownPt;
+        private Size m_MouseDownSize;
+        private bool m_MoveWindow;
+        private int m_DockTabTearOffIndex = -1; // Used if dock tab is being torn-off but bar cannot float so processing needs to be done after the drop is complete
+
+        private Rectangle m_FloatingRect;
+        private Size m_DockedSizeH = Size.Empty, m_DockedSizeV = Size.Empty;
+        private int m_SizeWindow;
+        // Used when show window content when dragging is not set
+        private DockSiteInfo m_DragDockInfo = new DockSiteInfo();
+        private Rectangle m_LastDragRect;
+        internal DockSiteInfo m_LastDockSiteInfo = new DockSiteInfo();
+        private bool m_WrapItemsDock;
+        private bool m_WrapItemsFloat;
+        private bool m_MenuBar;
+        private bool m_DockStretch;
+        private FloatingContainer m_Float;
+        private bool m_DockingInProgress;
+        private IntPtr m_LastFocusWindow;
+        private bool m_CanDockLeft = true, m_CanDockRight = true, m_CanDockTop = true, m_CanDockBottom = true, m_CanUndock, m_CanTearOffTabs = true, m_CanReorderTabs = true;
+        private bool m_CanDockTab = true;
+        private bool m_CanDockDocument = false;
+        private bool m_CanHide = false;
+        private bool m_CloseSingleTab = false;
+        private bool m_AcceptDropItems = true;
+        private eBorderType m_DockedBorder = eBorderType.None;
+        private Color m_SingleLineColor = SystemColors.ControlDark;
+        private bool m_CustomBar = false;
+        private System_Buttons m_SystemButtons = new System_Buttons(Rectangle.Empty, Rectangle.Empty, false, false, false, false);
+        private ePopupAnimation m_PopupAnimation = ePopupAnimation.ManagerControlled;
+        private PopupShadow m_DropShadow = null;
+        private eBarImageSize m_ImageSize = eBarImageSize.Default;
+        private Color m_CaptionBackColor = Color.Empty;
+        private Color m_CaptionForeColor = Color.Empty;
+        private PopupItem m_CustomizeMenu = null;
+        private TabStrip m_TabDockItems = null;
+        private bool m_AutoHideState = false, m_CanAutoHide = true;
+        private bool m_HasFocus = false;
+        private bool m_SystemPrefChanged = false, m_CustomFont = false;
+        private bool m_LockDockPosition = false;
+        private ColorScheme m_ColorScheme = null;
+        internal bool PassiveBar = false;
+        private bool m_ThemeAware = false;
+        private ThemeMargin m_ThemeWindowMargins = new ThemeMargin();
+        //private int m_MinClientSize=64;  // Minimum Parent Dockable size
+
+        // Theme Caching Support
+        private ThemeWindow m_ThemeWindow = null;
+        private ThemeRebar m_ThemeRebar = null;
+        private ThemeToolbar m_ThemeToolbar = null;
+        private ThemeHeader m_ThemeHeader = null;
+        private ThemeScrollBar m_ThemeScrollBar = null;
+        private ThemeProgress m_ThemeProgress = null;
+
+        // Support for same line docked windows
+        //		internal int _SplitDockWidth=0;
+        //		internal int _SplitDockHeight=0;
+        private int m_SplitDockWidthPercent = 0;
+        private int m_SplitDockHeightPercent = 0;
+
+        // While docking is in progress this will hold the tabbed bar that this bar was added to if any
+        private Bar m_TempTabBar = null;
+
+        // Tabbed Dockable Windows Tab Control position
+        private eTabStripAlignment m_DockTabAlignment = eTabStripAlignment.Bottom;
+
+        // TODO: Menu Merge Implementation  - Item Merge Support
+        //private bool m_MergeEnabled=false;
+        private bool m_HideFloatingInactive = true;
+
+        private Point m_ResizeOffset = Point.Empty;
+        private bool m_TabNavigation = false;
+
+        internal bool m_AccessibleObjectCreated = false;
+
+        private bool m_BarDefinitionLoading = false;
+        private bool m_ParentMsgHandlerRegistered = false;
+
+        private BaseItem m_DoDefaultActionItem = null;
+
+        private int m_AutoHideAnimationTime = 100;
+
+        private eBackgroundImagePosition m_BackgroundImagePosition = eBackgroundImagePosition.Stretch;
+        private byte m_BackgroundImageAlpha = 255;
+
+        private bool m_ShowToolTips = true;
+        private bool m_IgnoreAnimation = true;
+
+        protected ToolTip m_ToolTipWnd = null;
+
+        private int m_DockSideDelayed = -1;
+
+        private bool m_AnimationInProgress = false;
+
+        private bool m_EnableRedraw = true;
+
+        private bool m_AlwaysDisplayDockTab = false;
+        private bool m_MenuEventSupport = false;
+        private bool m_MenuFocus = false;
+
+        private int m_BarShowIndex = -1; // Used to control bar Z-Order if WinForms change it...
+        private bool m_AlwaysDisplayKeyAccelerators = false;
+
+        private bool m_AutoCreateCaptionMenu = true;
+        private PopupItem m_CaptionMenu = null;
+        private bool m_AutoSyncBarCaption = false;
+
+        private bool m_SaveLayoutChanges = true;
+        private bool m_TabsRearranged = false;
+
+        private IBarItemDesigner m_BarDesigner = null;
+        private bool m_LoadingHideFloating = false;
+        private bool m_DesignerSelection = false;
+        internal Hashtable PropertyBag = new Hashtable();
+
+        private int m_CornerSize = 3;
+        private bool m_FadeEffect = false;
+        private bool m_AntiAlias = false;
+        private eBarType m_BarType = eBarType.Toolbar;
+        private bool m_RoundCorners = true;
+        private bool m_AutoHideTextAlwaysVisible = false;
+        private bool m_DockTabCloseButtonVisible = false;
+        #endregion
+
+        /// <summary>
+        /// Initializes a new instance of the Bar class.
+        /// </summary>
+        public Bar()
+        {
+            if (!ColorFunctions.ColorsLoaded)
+            {
+                NativeFunctions.RefreshSettings();
+                NativeFunctions.OnDisplayChange();
+                ColorFunctions.LoadColors();
+            }
+
+            m_ColorScheme = new ColorScheme();
+            m_ParentItem = null;
+            m_OldContainer = null;
+            m_ClientRect = Rectangle.Empty;
+            m_SideBarRect = Rectangle.Empty;
+            m_SideBarImage = new SideBarImage();
+            m_ItemContainer = new GenericItemContainer();
+            m_ItemContainer.GlobalItem = false;
+            m_ItemContainer.ContainerControl = this;
+            m_ItemContainer.WrapItems = true;
+            m_ItemContainer.Stretch = false;
+            m_ItemContainer.Displayed = true;
+            m_ItemContainer.SystemContainer = true;
+            //m_ItemContainer.SetSystemItem(true);
+            //m_OldParent=null;
+            m_InitialContainerWidth = 164;
+            //m_BarState=eBarState.Popup;
+            m_BarState = eBarState.Docked;
+
+            m_DockOffset = 0;
+            m_DockLine = 0;
+            m_GrabHandleStyle = eGrabHandleStyle.None;
+            m_GrabHandleRect = Rectangle.Empty;
+            m_Owner = null;
+            m_MouseDownPt = Point.Empty;
+            m_MouseDownSize = new Size(0, 0);
+            m_MoveWindow = false;
+            m_FloatingRect = Rectangle.Empty;
+            m_SizeWindow = 0;
+
+            m_LastDragRect = Rectangle.Empty;
+
+            m_WrapItemsDock = false;
+            m_WrapItemsFloat = true;
+            m_DockStretch = false;
+            m_MenuBar = false;
+            this.Text = "";
+
+            m_Float = null;
+            m_DockingInProgress = false;
+
+            this.SetStyle(ControlStyles.Selectable, false);
+            this.SetStyle(ControlStyles.UserPaint, true);
+            this.SetStyle(ControlStyles.AllPaintingInWmPaint, true);
+            this.SetStyle(ControlStyles.Opaque, true);
+            this.SetStyle(ControlStyles.ResizeRedraw, true);
+            this.SetStyle(DisplayHelp.DoubleBufferFlag, true);
+            this.SetStyle(ControlStyles.SupportsTransparentBackColor, true);
+
+            this.TabStop = false;
+            base.Font = SystemFonts.MenuFont; // System.Windows.Forms.SystemInformation.MenuFont.Clone() as Font;
+
+            m_CanDockLeft = true;
+            m_CanDockRight = true;
+            m_CanDockTop = true;
+            m_CanDockBottom = true;
+            m_CanUndock = true;
+
+            Microsoft.Win32.SystemEvents.UserPreferenceChanged += new Microsoft.Win32.UserPreferenceChangedEventHandler(PreferenceChanged);
+
+            this.IsAccessible = true;
+
+            m_SystemButtons.MouseDownAutoHideChanged += new EventHandler(this.SysButtonHideTooltip);
+            m_SystemButtons.MouseDownCloseChanged += new EventHandler(this.SysButtonHideTooltip);
+            m_SystemButtons.MouseDownCustomizeChanged += new EventHandler(this.SysButtonHideTooltip);
+            m_SystemButtons.MouseOverAutoHideChanged += new EventHandler(this.SysButtonMouseOverAutoHide);
+            m_SystemButtons.MouseOverCustomizeChanged += new EventHandler(this.SysButtonMouseOverCustomize);
+            m_SystemButtons.MouseOverCloseChanged += new EventHandler(this.SysButtonMouseOverClose);
+
+            StyleManager.Register(this);
+        }
+
+        /// <summary>
+        /// Called by StyleManager to notify control that style on manager has changed and that control should refresh its appearance if
+        /// its style is controlled by StyleManager.
+        /// </summary>
+        /// <param name="newStyle">New active style.</param>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void StyleManagerStyleChanged(eDotNetBarStyle newStyle)
+        {
+            if (m_ItemContainer == null || this.IsDisposed) return;
+            if(this.Style == eDotNetBarStyle.StyleManagerControlled)
+                this.Style = eDotNetBarStyle.StyleManagerControlled;
+            this.Invalidate();
+        }
+        private void PreferenceChanged(object sender, Microsoft.Win32.UserPreferenceChangedEventArgs e)
+        {
+            if (!m_SystemPrefChanged && !m_CustomFont)
+            {
+                m_SystemPrefChanged = true;
+                NativeFunctions.PostMessage(this.Handle, NativeFunctions.WM_USER + 102, IntPtr.Zero, IntPtr.Zero);
+            }
+        }
+
+        protected override void ScaleControl(SizeF factor, BoundsSpecified specified)
+        {
+            if(Dpi.RecordScalePerControl)
+                Dpi.SetScaling(factor);
+            if (m_ItemContainer != null)
+                m_ItemContainer.NotifyScaleItem(factor);
+            m_SystemButtons.ButtonSize = Dpi.Size(m_SystemButtons.ButtonSize, factor);
+            base.ScaleControl(factor, specified);
+        }
+
+        protected override AccessibleObject CreateAccessibilityInstance()
+        {
+            return new BarAccessibleObject(this);
+        }
+
+        private void SetupAccessibility()
+        {
+            if (this.Text != "")
+                this.AccessibleName = this.Text;
+            else
+                this.AccessibleName = "DotNetBar Bar";
+            this.AccessibleDescription = this.AccessibleName + " (" + this.Name + ")";
+            if (this.MenuBar)
+                this.AccessibleRole = AccessibleRole.MenuBar;
+            else
+            {
+                if (this.LayoutType == eLayoutType.DockContainer)
+                    this.AccessibleRole = AccessibleRole.Grouping;
+                else if (this.GrabHandleStyle == eGrabHandleStyle.ResizeHandle)
+                    this.AccessibleRole = AccessibleRole.StatusBar;
+                else
+                    this.AccessibleRole = AccessibleRole.ToolBar;
+            }
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the Control class.
+        /// </summary>
+        /// <param name="BarCaption">Bar Caption</param>
+        public Bar(string BarCaption)
+            : this()
+        {
+            this.Text = BarCaption;
+        }
+
+        /// <summary>
+        /// Gets/Sets the owner of the Bar object.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), DefaultValue(null), DevCoBrowsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public object Owner
+        {
+            get
+            {
+                if (m_ParentItem is CustomizeItem)
+                    return m_ParentItem.GetOwner();
+                if (this.Parent != null && !(this.Parent is FloatingContainer) && !(this.Parent is DockSite) && !this.AutoHide && !m_DesignerParent || this.Parent == null && m_Owner == null)
+                    return this;
+                return m_Owner;
+            }
+            set
+            {
+                m_Owner = value;
+                if (this.DesignMode && this.Site != null && m_TabDockItems != null)
+                    this.RefreshDockTab(false);
+            }
+        }
+        internal bool IsDisposing = false;
+        protected override void Dispose(bool disposing)
+        {
+            StyleManager.Unregister(this);
+            IsDisposing = true;
+            if (m_ParentMsgHandlerRegistered)
+            {
+                DotNetBarManager.UnRegisterOwnerParentMsgHandler(this, null);
+                m_ParentMsgHandlerRegistered = false;
+            }
+            if (m_Float != null && disposing)
+            {
+                try
+                {
+                    if (m_Float.Controls.Contains(this))
+                        m_Float.Controls.Remove(this);
+                    m_Float.Close();
+                    m_Float.Dispose();
+                    m_Float = null;
+                }
+                catch (Exception)
+                { }
+            }
+
+            if (m_Owner is DotNetBarManager && ((DotNetBarManager)m_Owner).IgnoreLoadedControlDispose)
+                this.Controls.Clear();
+
+            if (this.Parent != null)
+            {
+                try
+                {
+                    this.Parent.Controls.Remove(this);
+                }
+                catch (Exception)
+                { }
+            }
+            Microsoft.Win32.SystemEvents.UserPreferenceChanged -= new Microsoft.Win32.UserPreferenceChangedEventHandler(PreferenceChanged);
+            if (m_TabDockItems != null)
+            {
+                m_TabDockItems.Dispose();
+                m_TabDockItems = null;
+            }
+            if (m_DropShadow != null)
+            {
+                m_DropShadow.Hide();
+                m_DropShadow.Dispose();
+                m_DropShadow = null;
+            }
+            if (m_FilterInstalled)
+            {
+                MessageHandler.UnregisterMessageClient(this);
+                m_FilterInstalled = false;
+            }
+
+            RestoreContainer();
+            m_Owner = null;
+            m_ParentItem = null;
+            m_OldContainer = null;
+            //m_OldParent=null;
+            if (m_ItemContainer != null)
+                m_ItemContainer.Dispose();
+            m_ItemContainer = null;
+
+            base.Dispose(disposing);
+            IsDisposing = false;
+        }
+
+        protected override CreateParams CreateParams
+        {
+            get
+            {
+                CreateParams p = base.CreateParams;
+                if (PassiveBar)
+                    return p;
+                if (m_BarState == eBarState.Popup && (m_ParentItem == null || (m_ParentItem.Site == null || !m_ParentItem.Site.DesignMode)))
+                {
+                    p.Style = unchecked((int)(WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN));
+                    p.ExStyle = (int)(WS_EX_TOPMOST | WS_EX_TOOLWINDOW);
+                }
+                //else if(m_BarState==eBarState.Floating)
+                //{
+                //	p.style=(int)(WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN);
+                //	p.exStyle=(int)(WS_EX_TOOLWINDOW);
+                //}
+                p.Caption = "";
+                return p;
+            }
+        }
+
+        internal bool HasFocus
+        {
+            get { return m_HasFocus; }
+        }
+
+        internal void SetHasFocus(bool b)
+        {
+            m_HasFocus = b;
+            if (this.DockSide == eDockSide.None && this.LayoutType == eLayoutType.DockContainer && this.Owner is DotNetBarManager)
+            {
+                DotNetBarManager manager = this.Owner as DotNetBarManager;
+                if (b)
+                    manager.InternalDockContainerActivated(this.SelectedDockContainerItem);
+                else
+                    manager.InternalDockContainerDeactivated(this.SelectedDockContainerItem);
+            }
+            this.Refresh();
+        }
+
+        protected override void OnLeave(EventArgs e)
+        {
+            base.OnLeave(e);
+            if (m_HasFocus)
+            {
+                m_HasFocus = false;
+                if (m_GrabHandleStyle == eGrabHandleStyle.Caption && (m_BarState == eBarState.Docked || m_BarState == eBarState.AutoHide))
+                    this.Invalidate();
+
+                if (m_BarState == eBarState.AutoHide)
+                {
+                    GetAutoHidePanel(m_LastDockSiteInfo.DockSide).StartTimer();
+                }
+            }
+        }
+
+        protected override void OnEnter(EventArgs e)
+        {
+            base.OnEnter(e);
+            if (!m_HasFocus)
+            {
+                m_HasFocus = true;
+                if (m_GrabHandleStyle == eGrabHandleStyle.Caption && (m_BarState == eBarState.Docked || m_BarState == eBarState.AutoHide))
+                    this.Invalidate();
+                if (m_BarState == eBarState.AutoHide)
+                {
+                    Point p = this.PointToClient(Control.MousePosition);
+                    if (this.ClientRectangle.Contains(p))
+                        GetAutoHidePanel(m_LastDockSiteInfo.DockSide).StopTimer();
+                }
+            }
+        }
+
+        protected override bool IsInputKey(Keys keyData)
+        {
+            if (keyData == System.Windows.Forms.Keys.Left || keyData == System.Windows.Forms.Keys.Right || keyData == System.Windows.Forms.Keys.Up || keyData == System.Windows.Forms.Keys.Down || keyData == System.Windows.Forms.Keys.Enter || keyData == System.Windows.Forms.Keys.Return || keyData == System.Windows.Forms.Keys.Tab || keyData == System.Windows.Forms.Keys.Escape)
+                return true;
+            return base.IsInputKey(keyData);
+        }
+
+        internal bool EnableRedraw
+        {
+            get
+            {
+                return m_EnableRedraw;
+            }
+            set
+            {
+                if (m_EnableRedraw != value && this.Visible)
+                {
+                    m_EnableRedraw = value;
+                    if (m_EnableRedraw)
+                        NativeFunctions.SendMessage(this.Handle, NativeFunctions.WM_SETREDRAW, 1, 0);
+                    else
+                        NativeFunctions.SendMessage(this.Handle, NativeFunctions.WM_SETREDRAW, 0, 0);
+                }
+            }
+        }
+
+#if FRAMEWORK20
+        protected override void OnBindingContextChanged(EventArgs e)
+        {
+            base.OnBindingContextChanged(e);
+            if (m_ItemContainer != null)
+                m_ItemContainer.UpdateBindings();
+        }
+#endif
+
+        protected override void WndProc(ref Message m)
+        {
+            if (m.Msg == WM_MOUSEACTIVATE && (m_BarState == eBarState.Popup || m_BarState == eBarState.Floating && m_ItemContainer.LayoutType == eLayoutType.TaskList))// && m_BarState!=eBarState.Docked)
+            {
+                m.Result = new System.IntPtr(MA_NOACTIVATE);
+                return;
+            }
+            else if (m.Msg == NativeFunctions.WM_USER + 101)
+            {
+                if (!m_DockingInProgress && m_BarState == eBarState.Floating)
+                    NativeFunctions.SetWindowPos(this.Handle, new IntPtr(NativeFunctions.HWND_TOP), 0, 0, 0, 0, NativeFunctions.SWP_NOMOVE | NativeFunctions.SWP_NOSIZE | NativeFunctions.SWP_NOACTIVATE);
+            }
+            else if (m.Msg == NativeFunctions.WM_USER + 102)
+            {
+                if (this.Name == "StatusBar")
+                    this.Name = this.Name;
+                if (this.LayoutType != eLayoutType.DockContainer)
+                    this.Font = SystemFonts.MenuFont; // System.Windows.Forms.SystemInformation.MenuFont.Clone() as Font;
+                this.RecalcLayout();
+                m_SystemPrefChanged = false;
+            }
+            else if (m.Msg == NativeFunctions.WM_USER + 107)
+            {
+                if (m_DoDefaultActionItem != null)
+                {
+                    m_DoDefaultActionItem.DoAccesibleDefaultAction();
+                    m_DoDefaultActionItem = null;
+                }
+
+            }
+            else if (m.Msg == NativeFunctions.WM_SETFOCUS)
+            {
+                IntPtr wnd = m.WParam;
+                Control objCtrl = Control.FromChildHandle(wnd);
+                if (objCtrl != null && !(objCtrl is DevComponents.DotNetBar.Bar) && !(objCtrl is MenuPanel) && !(objCtrl is Controls.TextBoxX))
+                {
+                    Form form = objCtrl.FindForm();
+                    if (form == this.FindForm())
+                        m_LastFocusWindow = m.WParam;
+                    else if (form != null)
+                        m_LastFocusWindow = m.WParam;
+                }
+            }
+            else if (m.Msg == NativeFunctions.WM_KILLFOCUS)
+            {
+                bool bLostFocus = false;
+                Control objCtrl = Control.FromChildHandle(m.WParam);
+                if (objCtrl != null)
+                {
+                    while (objCtrl.Parent != null)
+                        objCtrl = objCtrl.Parent;
+                    if (objCtrl != this && (m_ItemContainer != null && !m_ItemContainer.IsAnyOnHandle(objCtrl.Handle)))
+                        bLostFocus = true;
+                }
+                else
+                    bLostFocus = true;
+
+                if (bLostFocus && m_ItemContainer != null)
+                    m_ItemContainer.ContainerLostFocus(false);
+            }
+            else if (m.Msg == NativeFunctions.WM_THEMECHANGED)
+            {
+                this.RefreshThemes();
+                this.RefreshThemeMargins();
+                Themes.RefreshIsThemeActive();
+            }
+            //else if (m.Msg == (int)WinApi.WindowsMessages.WM_NCHITTEST)
+            //{
+            //    Form form = this.FindForm();
+            //    Rectangle resizeRect = GetResizeHandleRectangle();
+            //    if (form != null && form.WindowState == FormWindowState.Normal && !resizeRect.IsEmpty)
+            //    {
+            //        int mouseX = WinApi.LOWORD(m.LParam);
+            //        int mouseY = WinApi.HIWORD(m.LParam);
+            //        if (resizeRect.Contains(this.PointToClient(new Point(mouseX, mouseY))))
+            //        {
+            //            IntPtr formHandle = form.Handle;
+            //            if (formHandle != IntPtr.Zero)
+            //            {
+            //                WinApi.POINT point1;
+            //                WinApi.RECT rect1 = new WinApi.RECT(0, 0, form.ClientRectangle.Right, form.ClientRectangle.Bottom);
+            //                if (this.RightToLeft == RightToLeft.Yes)
+            //                {
+            //                    point1 = new WinApi.POINT(resizeRect.Left, resizeRect.Bottom);
+            //                }
+            //                else
+            //                {
+            //                    point1 = new WinApi.POINT(resizeRect.Right, resizeRect.Bottom);
+            //                }
+            //                WinApi.MapWindowPoints(this.Handle, formHandle, ref point1, 1);
+            //                int num3 = Math.Abs((int)(rect1.Bottom - point1.y));
+            //                int num4 = Math.Abs((int)(rect1.Right - point1.x));
+            //                if (this.RightToLeft != RightToLeft.Yes)
+            //                {
+            //                    m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.BottomRightSizeableCorner);
+            //                    return;
+            //                }
+            //            }
+            //        }
+
+            //    }   
+            //}
+            base.WndProc(ref m);
+        }
+
+        protected override void OnSystemColorsChanged(EventArgs e)
+        {
+            base.OnSystemColorsChanged(e);
+            Application.DoEvents();
+            //m_ColorScheme.Refresh(null,true);
+            this.GetColorScheme().Refresh(null, true);
+            this.Refresh();
+        }
+
+        /// <summary>
+        /// Gets or sets the item default accessibility action will be performed on.
+        /// </summary>
+        BaseItem IAccessibilitySupport.DoDefaultActionItem
+        {
+            get { return m_DoDefaultActionItem; }
+            set { m_DoDefaultActionItem = value; }
+        }
+
+        /// <summary>
+        /// Releases the focus from the bar and selects the control that had focus before bar was selected. If control that had focus could not be determined focus will stay on the bar.
+        /// This method is used by internal DotNetBar implementation and you should not use it.
+        /// </summary>
+        public void ReleaseFocus()
+        {
+            if (this.Focused && m_LastFocusWindow != IntPtr.Zero)
+            {
+                Control ctrl = Control.FromChildHandle(m_LastFocusWindow);
+                if (ctrl != null)
+                {
+                    ctrl.Select();
+                    if (!ctrl.Focused)
+                        NativeFunctions.SetFocus(m_LastFocusWindow);
+                }
+                else
+                {
+                    NativeFunctions.SetFocus(m_LastFocusWindow);
+                }
+                m_LastFocusWindow = IntPtr.Zero;
+                m_ItemContainer.AutoExpand = false;
+            }
+        }
+
+        /// <summary>
+        /// Returns the reference to the control that last had input focus. This property should be used to
+        /// determine which control had input focus before bar gained the focus. Use it to apply
+        /// the menu command to active control.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public Control LastFocusControl
+        {
+            get
+            {
+                if (this.Focused && m_LastFocusWindow != IntPtr.Zero)
+                {
+                    Control ctrl = Control.FromChildHandle(m_LastFocusWindow);
+                    return ctrl;
+                }
+                return null;
+            }
+        }
+
+        internal void SetSystemFocus()
+        {
+            if (!this.Focused)
+            {
+                m_ItemContainer.SetSystemFocus();
+                this.Focus();
+            }
+        }
+
+        private Color[] _BorderColors = null;
+        /// <summary>
+        /// Indicates the array of colors that when set are used to draw the border of the item.
+        /// </summary>
+        [DefaultValue(null), Category("Appearance"), Description("Indicates the array of colors that when set are used to draw the border of the item."), TypeConverter(typeof(ArrayConverter))]
+        internal Color[] BorderColors
+        {
+            get
+            {
+                return _BorderColors;
+            }
+            set
+            {
+                if (_BorderColors != value)
+                {
+                    _BorderColors = value;
+                    //OnPropertyChanged(new PropertyChangedEventArgs("Colors"));
+                    this.Invalidate();
+                }
+            }
+        }
+
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            if (m_ItemContainer == null || this.IsDisposed)
+                return;
+
+            if (this.BackColor == Color.Transparent)
+            {
+                base.OnPaintBackground(e);
+            }
+
+            Graphics g = e.Graphics;
+            g.PageUnit = GraphicsUnit.Pixel;
+            // Support for the design-time when insert position is drawn
+#if TRIAL
+				if(NativeFunctions.ColorExpAlt())
+				{
+					g.Clear(Color.White);
+					g.DrawString("Your DotNetBar Trial has expired :-(",this.Font,SystemBrushes.ControlText,0,0);
+				}
+				else
+				{
+					if(m_ItemContainer.EffectiveStyle==eDotNetBarStyle.Office2000)
+						PaintOffice(g);
+					else
+						PaintDotNet(e);
+				}
+#else
+            if (m_ItemContainer.EffectiveStyle == eDotNetBarStyle.Office2000)
+                PaintOffice(g);
+            else
+                PaintDotNet(e);
+#endif
+
+            if (_BorderColors != null && _BorderColors.Length > 0)
+            {
+                g.ResetClip();
+                DisplayHelp.DrawRoundedRectangle(g, this.ClientRectangle, _BorderColors, 0);
+            }
+        }
+
+        protected override void OnResize(EventArgs e)
+        {
+            base.OnResize(e);
+            if (m_AnimationInProgress || this.Width == 0 || this.Height == 0)
+                return;
+
+            if (!(this.Parent is DockSite || this.Parent is FloatingContainer) && m_BarState == eBarState.Docked && !m_LayoutSuspended)
+                this.RecalcLayout();
+            ResizeDockTab();
+        }
+
+        private void PaintBackgroundImage(Graphics g)
+        {
+            if (this.BackgroundImage == null)
+                return;
+            Rectangle r = this.ClientRectangle;
+            BarFunctions.PaintBackgroundImage(g, r, this.BackgroundImage, m_BackgroundImagePosition, m_BackgroundImageAlpha);
+        }
+
+        private bool IsGradientStyle
+        {
+            get
+            {
+                return (this.Style == eDotNetBarStyle.Office2003 || this.Style == eDotNetBarStyle.VS2005 || BarFunctions.IsOffice2007Style(this.Style));
+            }
+        }
+
+        /// <summary>
+        /// Creates the Graphics object for the control.
+        /// </summary>
+        /// <returns>The Graphics object for the control.</returns>
+        public new Graphics CreateGraphics()
+        {
+            Graphics g = base.CreateGraphics();
+            if (m_AntiAlias)
+            {
+                g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.AntiAlias;
+#if FRAMEWORK20
+                if (!SystemInformation.IsFontSmoothingEnabled)
+#endif
+                    g.TextRenderingHint = DisplayHelp.AntiAliasTextRenderingHint;
+            }
+            return g;
+        }
+
+        #region Rendering Support
+        private Rendering.BaseRenderer m_DefaultRenderer = null;
+        private Rendering.BaseRenderer m_Renderer = null;
+        private eRenderMode m_RenderMode = eRenderMode.Global;
+        /// <summary>
+        /// Returns the renderer control will be rendered with.
+        /// </summary>
+        /// <returns>The current renderer.</returns>
+        public virtual Rendering.BaseRenderer GetRenderer()
+        {
+            if (m_RenderMode == eRenderMode.Global && Rendering.GlobalManager.Renderer != null)
+                return Rendering.GlobalManager.Renderer;
+            else if (m_RenderMode == eRenderMode.Custom && m_Renderer != null)
+                return m_Renderer;
+
+            if (m_DefaultRenderer == null)
+            {
+                if (BarFunctions.IsOffice2007Style(this.Style))
+                    m_DefaultRenderer = new Rendering.Office2007Renderer();
+            }
+
+            return m_Renderer;
+        }
+
+        /// <summary>
+        /// Gets or sets the redering mode used by control. Default value is eRenderMode.Global which means that static GlobalManager.Renderer is used. If set to Custom then Renderer property must
+        /// also be set to the custom renderer that will be used.
+        /// </summary>
+        [Browsable(false), DefaultValue(eRenderMode.Global)]
+        public eRenderMode RenderMode
+        {
+            get { return m_RenderMode; }
+            set
+            {
+                if (m_RenderMode != value)
+                {
+                    m_RenderMode = value;
+                    this.Invalidate(true);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the custom renderer used by the items on this control. RenderMode property must also be set to eRenderMode.Custom in order renderer
+        /// specified here to be used.
+        /// </summary>
+        [Browsable(false), DefaultValue(null)]
+        public DevComponents.DotNetBar.Rendering.BaseRenderer Renderer
+        {
+            get
+            {
+                return m_Renderer;
+            }
+            set { m_Renderer = value; }
+        }
+        #endregion
+
+        internal ItemPaintArgs GetItemPaintArgs(Graphics g)
+        {
+            ItemPaintArgs pa = new ItemPaintArgs(m_Owner as IOwner, this, g, this.GetColorScheme());
+            pa.DesignerSelection = m_DesignerSelection;
+            pa.Renderer = GetRenderer();
+
+            if (m_BarState == eBarState.Popup && m_ParentItem != null && m_ParentItem.DesignMode)
+            {
+                ISite site = this.GetSite();
+                if (site != null && site.DesignMode)
+                    pa.DesignerSelection = true;
+            }
+
+            return pa;
+        }
+
+        protected void PaintDotNet(PaintEventArgs e)
+        {
+            Graphics g = e.Graphics;
+            SmoothingMode sm = g.SmoothingMode;
+            TextRenderingHint th = g.TextRenderingHint;
+            RenderBarEventArgs re = null;
+
+            if (m_AntiAlias)
+            {
+                g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.AntiAlias;
+                g.TextRenderingHint = DisplayHelp.AntiAliasTextRenderingHint;
+            }
+
+            m_SystemButtons.CustomizeButtonRect = Rectangle.Empty;
+            m_SystemButtons.CloseButtonRect = Rectangle.Empty;
+            m_SystemButtons.AutoHideButtonRect = Rectangle.Empty;
+            m_SystemButtons.CaptionButtonRect = Rectangle.Empty;
+            m_SystemButtons.MaximizeButtonRect = Rectangle.Empty;
+            ColorScheme cs = this.GetColorScheme();
+
+            ItemPaintArgs pa = GetItemPaintArgs(g);
+            pa.ClipRectangle = e.ClipRectangle;
+            Pen p;
+            if (m_BarState == eBarState.Popup)
+                p = new Pen(pa.Colors.BarPopupBorder, 1);
+            else
+                p = new Pen(pa.Colors.BarFloatingBorder);
+
+            if (this.DisplayShadow && !this.AlphaShadow && m_ParentItem != null && !BarFunctions.IsOffice2007Style(m_ParentItem.EffectiveStyle))
+                SetupRegion();
+
+            if (m_BarState == eBarState.Popup)
+            {
+                re = new RenderBarEventArgs(this, g, eBarRenderPart.Background, this.ClientRectangle);
+                OnPreRender(re);
+                if (!re.Cancel)
+                {
+                    if (m_ParentItem != null && BarFunctions.IsOffice2007Style(m_ParentItem.EffectiveStyle) && GetRenderer() != null)
+                    {
+                        ToolbarRendererEventArgs tre = new ToolbarRendererEventArgs(this, g, this.DisplayRectangle);
+                        tre.ItemPaintArgs = pa;
+                        GetRenderer().DrawPopupToolbarBackground(tre);
+                    }
+                    else
+                    {
+                        using (SolidBrush brush = new SolidBrush(pa.Colors.BarPopupBackground))
+                            g.FillRectangle(brush, this.DisplayRectangle);
+                        PaintBackgroundImage(pa.Graphics);
+
+                        PaintSideBar(g);
+
+                        Rectangle borderRectangle = this.ClientRectangle;
+                        if (this.DisplayShadow && !this.AlphaShadow)
+                            borderRectangle = new Rectangle(0, 0, this.ClientSize.Width - 2, this.ClientSize.Height - 2);
+
+                        if (m_ParentItem != null && BarFunctions.IsOffice2007Style(m_ParentItem.EffectiveStyle))
+                            DisplayHelp.DrawRoundedRectangle(g, p, borderRectangle, m_CornerSize);
+                        else
+                            NativeFunctions.DrawRectangle(g, p, borderRectangle);
+
+                        if (this.DisplayShadow && !this.AlphaShadow)
+                        {
+                            // Shadow
+                            p.Dispose();
+                            p = new Pen(SystemColors.ControlDark, 2);
+                            Point[] pt = new Point[3];
+                            pt[0].X = 2;
+                            pt[0].Y = this.ClientSize.Height - 1;
+                            pt[1].X = this.ClientSize.Width - 1;
+                            pt[1].Y = this.ClientSize.Height - 1;
+                            pt[2].X = this.ClientSize.Width - 1;
+                            pt[2].Y = 2;
+                            g.DrawLines(p, pt);
+                        }
+                        if (m_ParentItem != null && !BarFunctions.IsOffice2007Style(m_ParentItem.EffectiveStyle) && m_ParentItem is ButtonItem && m_ParentItem.Displayed)
+                        {
+                            // Determine where to draw the line based on parent position
+                            if (m_ParentItemScreenPos.Y < this.Location.Y)
+                            {
+                                Point p1 = new Point((m_ParentItemScreenPos.X - this.Location.X) + 1, 0);
+                                Point p2 = new Point(p1.X + m_ParentItem.WidthInternal - 5, 0);
+                                DisplayHelp.DrawLine(g, p1, p2, pa.Colors.ItemExpandedBackground, 1);
+                                //g.DrawLine(new Pen(pa.Colors.ItemExpandedBackground, 1), p1, p2);
+                            }
+                        }
+                    }
+                }
+            }
+            else if (m_BarState == eBarState.Floating)
+            {
+                bool drawCaptionText = true;
+
+                re = new RenderBarEventArgs(this, g, eBarRenderPart.Background, this.ClientRectangle);
+                OnPreRender(re);
+                if (!re.Cancel)
+                {
+                    if (BarFunctions.IsOffice2007Style(this.Style) && this.GetRenderer() != null)
+                    {
+                        ToolbarRendererEventArgs tre = new ToolbarRendererEventArgs(this, g, this.DisplayRectangle);
+                        tre.ItemPaintArgs = pa;
+                        this.GetRenderer().DrawToolbarBackground(tre);
+                    }
+                    else
+                    {
+                        sm = g.SmoothingMode;
+                        g.SmoothingMode = SmoothingMode.Default;
+                        if (this.MenuBar)
+                            DisplayHelp.FillRectangle(g, this.ClientRectangle, pa.Colors.MenuBarBackground, pa.Colors.MenuBarBackground2, pa.Colors.MenuBarBackgroundGradientAngle);
+                        else
+                            DisplayHelp.FillRectangle(g, this.ClientRectangle, pa.Colors.BarBackground, pa.Colors.BarBackground2, pa.Colors.BarBackgroundGradientAngle);
+
+                        PaintBackgroundImage(pa.Graphics);
+                        g.SmoothingMode = sm;
+                    }
+                }
+
+                Rectangle r = new Rectangle(0, 0, this.Width, this.Height);
+
+                ThemeWindow theme = null;
+                ThemeWindowParts part = ThemeWindowParts.SmallFrameLeft;
+                ThemeWindowStates state = ThemeWindowStates.FrameActive;
+
+                re = new RenderBarEventArgs(this, g, eBarRenderPart.Caption, Rectangle.Empty);
+
+                if (this.DrawThemedCaption)
+                {
+                    re.Bounds = new Rectangle(0, 0, this.Width, m_ThemeWindowMargins.Top + 1);
+                    OnPreRender(re);
+                    if (!re.Cancel)
+                    {
+                        theme = this.ThemeWindow;
+                        if (this.LayoutType == eLayoutType.DockContainer && !m_HasFocus)
+                            state = ThemeWindowStates.FrameInactive;
+
+                        theme.DrawBackground(g, part, state, new Rectangle(0, 0, m_ThemeWindowMargins.Left, this.Height));
+                        part = ThemeWindowParts.SmallFrameRight;
+                        theme.DrawBackground(g, part, state, new Rectangle(this.Width - m_ThemeWindowMargins.Right, 0, m_ThemeWindowMargins.Left, this.Height));
+                        part = ThemeWindowParts.SmallFrameBottom;
+                        theme.DrawBackground(g, part, state, new Rectangle(0, this.Height - m_ThemeWindowMargins.Bottom, this.Width, m_ThemeWindowMargins.Bottom));
+
+                        if (this.LayoutType == eLayoutType.DockContainer && !m_HasFocus)
+                            state = ThemeWindowStates.CaptionInactive;
+                        part = ThemeWindowParts.SmallCaption;
+                    }
+                    r = new Rectangle(0, 0, this.Width, m_ThemeWindowMargins.Top + 1);
+                    theme.DrawBackground(g, part, state, r);
+                    r.Offset(0, 1);
+                }
+                else if (m_GrabHandleStyle == eGrabHandleStyle.Caption && this.LayoutType == eLayoutType.DockContainer && this.Style == eDotNetBarStyle.Office2000)
+                {
+                    Rectangle rback = new Rectangle(3, 3, this.Width - 6, GetGrabHandleCaptionHeight());
+                    re.Bounds = rback;
+                    OnPreRender(re);
+                    if (!re.Cancel)
+                    {
+                        ControlPaint.DrawBorder3D(g, r, Border3DStyle.Raised, Border3DSide.All);
+                        eDrawCaption flags = eDrawCaption.DC_SMALLCAP | eDrawCaption.DC_GRADIENT | eDrawCaption.DC_TEXT;
+                        if (m_HasFocus) flags |= eDrawCaption.DC_ACTIVE;
+                        IntPtr hdc = g.GetHdc();
+                        NativeFunctions.RECT rect = new NativeFunctions.RECT(rback.X, rback.Y, rback.Right, rback.Bottom);
+                        try
+                        {
+                            NativeFunctions.DrawCaption(this.Handle, hdc, ref rect, flags);
+                        }
+                        finally
+                        {
+                            g.ReleaseHdc(hdc);
+                        }
+                    }
+                    drawCaptionText = false;
+                    r = rback;
+                }
+                else
+                {
+                    Rectangle rback = new Rectangle(3, 3, this.Width - 6, GetGrabHandleCaptionHeight());
+                    re.Bounds = rback;
+                    OnPreRender(re);
+
+                    if (!re.Cancel)
+                    {
+                        Pen p1 = new Pen(pa.Colors.BarFloatingBorder, 1);
+                        NativeFunctions.DrawRectangle(g, p, r);
+                        r.Inflate(-1, -1);
+                        NativeFunctions.DrawRectangle(g, p, r);
+
+                        p1.Dispose();
+                        p1 = new Pen(pa.Colors.BarFloatingBorder, 1);
+                        g.DrawLine(p1, 1, 2, 2, 2);
+                        g.DrawLine(p1, this.Width - 3, 2, this.Width - 2, 2);
+                        g.DrawLine(p1, 1, this.Height - 3, 2, this.Height - 3);
+                        g.DrawLine(p1, this.Width - 3, this.Height - 3, this.Width - 2, this.Height - 3);
+                        p1.Dispose();
+                        p1 = null;
+
+                        if (this.GrabHandleStyle != eGrabHandleStyle.CaptionTaskPane)
+                        {
+                            sm = g.SmoothingMode;
+                            g.SmoothingMode = SmoothingMode.Default;
+
+                            if (m_CaptionBackColor.IsEmpty)
+                            {
+                                if (this.LayoutType == eLayoutType.Toolbar || m_HasFocus)
+                                    DisplayHelp.FillRectangle(g, rback, pa.Colors.BarCaptionBackground, pa.Colors.BarCaptionBackground2, pa.Colors.BarCaptionBackgroundGradientAngle);
+                                else
+                                    DisplayHelp.FillRectangle(g, rback, pa.Colors.BarCaptionInactiveBackground, pa.Colors.BarCaptionInactiveBackground2, pa.Colors.BarCaptionInactiveBackgroundGAngle);
+                            }
+                            else
+                                DisplayHelp.FillRectangle(g, new Rectangle(3, 3, this.Width - 6, GetGrabHandleCaptionHeight()), m_CaptionBackColor, Color.Empty);
+
+                            g.SmoothingMode = sm;
+                        }
+                    }
+                    r = rback;
+                }
+
+                r.Inflate(-1, -1);
+
+                if (this.GrabHandleStyle != eGrabHandleStyle.CaptionTaskPane)
+                {
+                    if (this.CanHideResolved)
+                    {
+                        m_SystemButtons.CloseButtonRect = new Rectangle(r.Right - (m_SystemButtons.ButtonSize.Width + 3), r.Y + (r.Height - m_SystemButtons.ButtonSize.Height) / 2, m_SystemButtons.ButtonSize.Width, m_SystemButtons.ButtonSize.Height);
+                        re = new RenderBarEventArgs(this, g, eBarRenderPart.CloseButton, m_SystemButtons.CloseButtonRect);
+                        OnPreRender(re);
+                        m_SystemButtons.CloseButtonRect = re.Bounds;
+                        r.Width -= (m_SystemButtons.CloseButtonRect.Width + 3);
+                        if (!re.Cancel)
+                            PaintCloseButton(pa);
+                    }
+                    if (this.EffectiveCanMaximizeFloating)
+                    {
+                        m_SystemButtons.MaximizeButtonRect =
+                            new Rectangle(r.Right - (m_SystemButtons.ButtonSize.Width + 3),
+                                r.Y + (r.Height - m_SystemButtons.ButtonSize.Height)/2, m_SystemButtons.ButtonSize.Width,
+                                m_SystemButtons.ButtonSize.Height);
+                        re = new RenderBarEventArgs(this, g, eBarRenderPart.MaximizeButton,
+                            m_SystemButtons.MaximizeButtonRect);
+                        OnPreRender(re);
+                        m_SystemButtons.MaximizeButtonRect = re.Bounds;
+                        r.Width -= (m_SystemButtons.MaximizeButtonRect.Width + 3);
+                        if (!re.Cancel)
+                            PaintMaximizeButton(pa);
+                    }
+                    if (this.ShowCustomizeMenuButton)
+                    {
+                        m_SystemButtons.CustomizeButtonRect = new Rectangle(r.Right - (m_SystemButtons.ButtonSize.Width + 1), r.Y + (r.Height - m_SystemButtons.ButtonSize.Height) / 2, m_SystemButtons.ButtonSize.Width, m_SystemButtons.ButtonSize.Height);
+                        re = new RenderBarEventArgs(this, g, eBarRenderPart.CustomizeButton, m_SystemButtons.CustomizeButtonRect);
+                        OnPreRender(re);
+                        m_SystemButtons.CustomizeButtonRect = re.Bounds;
+                        r.Width -= (m_SystemButtons.CustomizeButtonRect.Width + 2);
+                        if (!re.Cancel)
+                            PaintCustomizeButton(pa);
+                    }
+                    r.X += 2;
+                    r.Width -= 2;
+                    if (r.Width > 0 && drawCaptionText)
+                    {
+                        re = new RenderBarEventArgs(this, g, eBarRenderPart.CaptionText, r);
+                        OnPreRender(re);
+                        if (!re.Cancel)
+                        {
+                            System.Drawing.Font objFont = null;
+                            try
+                            {
+                                objFont = new Font(this.Font, FontStyle.Bold);
+                            }
+                            catch
+                            {
+                                objFont = SystemFonts.MenuFont; // (Font)System.Windows.Forms.SystemInformation.MenuFont.Clone();
+                            }
+                            eTextFormat sf = eTextFormat.Default | eTextFormat.EndEllipsis | eTextFormat.SingleLine | eTextFormat.VerticalCenter;
+                            if (m_CaptionForeColor.IsEmpty)
+                            {
+                                if (this.DrawThemedCaption)
+                                {
+                                    if (m_HasFocus)
+                                        state = ThemeWindowStates.CaptionActive;
+                                    else
+                                        state = ThemeWindowStates.CaptionInactive;
+                                    r.Y += 1;
+                                    //theme.DrawText(g, this.Text, objFont, r, part, state, ThemeTextFormat.Left | ThemeTextFormat.VCenter);
+                                }
+                                //else
+                                TextDrawing.DrawString(g, this.Text, objFont, ((m_HasFocus || this.LayoutType == eLayoutType.Toolbar) ? pa.Colors.BarCaptionText : pa.Colors.BarCaptionInactiveText), r, sf);
+                            }
+                            else
+                                TextDrawing.DrawString(g, this.Text, objFont, m_CaptionForeColor, r, sf);
+                            objFont.Dispose();
+                            objFont = null;
+                        }
+                    }
+                }
+                else
+                {
+                    this.PaintGrabHandle(pa);
+                }
+            }
+            else if (m_BarState == eBarState.Docked && BarFunctions.IsOffice2007Style(this.Style) && this.GetRenderer() != null && (!this.IsThemed || this.MenuBar))
+            {
+                re = new RenderBarEventArgs(this, g, eBarRenderPart.Background, this.DisplayRectangle);
+                OnPreRender(re);
+                if (!re.Cancel && this.BackColor != Color.Transparent)
+                {
+                    ToolbarRendererEventArgs tre = new ToolbarRendererEventArgs(this, g, this.DisplayRectangle);
+                    tre.ItemPaintArgs = pa;
+                    this.GetRenderer().DrawToolbarBackground(tre);
+                }
+                else
+                    PaintGrabHandle(pa);
+            }
+            else
+            {
+                p.Dispose();
+                p = null;
+                bool drawBorder = true;
+                // Docked state
+                if (m_ItemContainer.m_BackgroundColor.IsEmpty && this.BackColor != Color.Transparent)
+                {
+                    if (this.IsThemed)
+                    {
+                        Rectangle r = new Rectangle(-this.Location.X, -this.Location.Y, this.Parent.Width, this.Parent.Height);
+                        ThemeRebar theme = this.ThemeRebar;
+                        theme.DrawBackground(g, ThemeRebarParts.Background, ThemeRebarStates.Normal, r);
+                    }
+                    else
+                    {
+                        sm = g.SmoothingMode;
+                        g.SmoothingMode = SmoothingMode.Default;
+                        re = new RenderBarEventArgs(this, g, eBarRenderPart.Background, this.ClientRectangle);
+                        OnPreRender(re);
+                        if (!re.Cancel)
+                        {
+                            if (this.MenuBar)
+                            {
+                                if (!pa.Colors.MenuBarBackground2.IsEmpty && pa.Colors.MenuBarBackground2.A > 0)
+                                {
+                                    System.Drawing.Drawing2D.LinearGradientBrush gradient = BarFunctions.CreateLinearGradientBrush(this.ClientRectangle, pa.Colors.MenuBarBackground, pa.Colors.MenuBarBackground2, pa.Colors.MenuBarBackgroundGradientAngle);
+                                    g.FillRectangle(gradient, this.ClientRectangle);
+                                    gradient.Dispose();
+                                }
+                                else if (IsGradientStyle && this.Parent != null && !pa.Colors.DockSiteBackColor2.IsEmpty && !pa.Colors.DockSiteBackColor.IsEmpty)
+                                {
+                                    System.Drawing.Drawing2D.LinearGradientBrush gradient = BarFunctions.CreateLinearGradientBrush(new Rectangle(-this.Left, -this.Top, this.Parent.Width, this.Parent.Height), pa.Colors.DockSiteBackColor, pa.Colors.DockSiteBackColor2, 0f);
+                                    g.FillRectangle(gradient, -this.Left, -this.Top, this.Parent.Width, this.Parent.Height);
+                                    gradient.Dispose();
+                                }
+                                else
+                                {
+                                    using (SolidBrush brush = new SolidBrush(pa.Colors.MenuBarBackground))
+                                        g.FillRectangle(brush, this.DisplayRectangle);
+                                }
+                            }
+                            else
+                            {
+                                if (this.Style == eDotNetBarStyle.VS2005 && this.LayoutType == eLayoutType.DockContainer && !this.BackColor.IsEmpty)
+                                {
+                                    DisplayHelp.FillRectangle(g, this.ClientRectangle, this.BackColor, Color.Empty);
+                                }
+                                else if (this.GradientBackground)
+                                    DisplayHelp.FillRectangle(g, this.ClientRectangle, pa.Colors.BarBackground, pa.Colors.BarBackground2, pa.Colors.BarBackgroundGradientAngle);
+                                else
+                                {
+                                    using (SolidBrush brush = new SolidBrush(pa.Colors.BarBackground))
+                                        g.FillRectangle(brush, this.ClientRectangle);
+                                }
+                            }
+                        }
+                        else
+                            drawBorder = false;
+                        g.SmoothingMode = sm;
+                    }
+                }
+                else if (!m_ItemContainer.BackColor.IsEmpty)
+                {
+                    sm = g.SmoothingMode;
+                    g.SmoothingMode = SmoothingMode.Default;
+                    re = new RenderBarEventArgs(this, g, eBarRenderPart.Background, this.DisplayRectangle);
+                    OnPreRender(re);
+                    if (!re.Cancel)
+                    {
+                        using (SolidBrush brush = new SolidBrush(m_ItemContainer.BackColor))
+                            g.FillRectangle(brush, this.DisplayRectangle);
+                    }
+                    else
+                        drawBorder = false;
+                    g.SmoothingMode = sm;
+                }
+
+                if (this.Parent != null && this.Parent.BackgroundImage != null && this.Parent is DockSite)
+                {
+                    Rectangle r = new Rectangle(-this.Location.X, -this.Location.Y, this.Parent.Width, this.Parent.Height);
+                    DockSite site = this.Parent as DockSite;
+                    BarFunctions.PaintBackgroundImage(g, r, site.BackgroundImage, site.BackgroundImagePosition, site.BackgroundImageAlpha);
+                }
+                else
+                    PaintBackgroundImage(pa.Graphics);
+
+                if (drawBorder)
+                {
+                    if (IsGradientStyle && !this.IsThemed && this.LayoutType == eLayoutType.Toolbar && !this.MenuBar && this.BarType == eBarType.Toolbar && this.BackColor != Color.Transparent)
+                    {
+                        if (p != null) p.Dispose();
+                        p = new Pen(pa.Colors.BarDockedBorder, 1);
+                        g.DrawLine(p, 0, this.Height - 1, this.Width, this.Height - 1);
+                        p.Dispose();
+                        p = null;
+                    }
+                    else
+                    {
+                        Rectangle border = this.ClientRectangle;
+                        border.Inflate(-2, -2);
+                        BarFunctions.DrawBorder(g, m_DockedBorder, border, m_SingleLineColor);
+                    }
+                }
+                PaintGrabHandle(pa);
+            }
+            m_ItemContainer.Paint(pa);
+            if (m_BarType == eBarType.StatusBar && this.GrabHandleStyle == eGrabHandleStyle.ResizeHandle)
+            {
+                PaintGrabHandle(pa);
+            }
+            if (p != null) p.Dispose();
+            g.SmoothingMode = sm;
+            g.TextRenderingHint = th;
+
+            if (HasPostRender)
+            {
+                re = new RenderBarEventArgs(this, g, eBarRenderPart.All, this.ClientRectangle);
+                OnPostRender(re);
+            }
+        }
+
+        /// <summary>
+        /// Raises the PreRender event.
+        /// </summary>
+        /// <param name="e">Provides the event arguments</param>
+        protected virtual void OnPreRender(RenderBarEventArgs e)
+        {
+            if (PreRender != null)
+                PreRender(this, e);
+        }
+
+        /// <summary>
+        /// Raises the PostRender event.
+        /// </summary>
+        /// <param name="e">Provides the event arguments</param>
+        protected virtual void OnPostRender(RenderBarEventArgs e)
+        {
+            if (PostRender != null)
+                PostRender(this, e);
+        }
+
+        private bool HasPostRender
+        {
+            get
+            {
+                return PostRender != null;
+            }
+        }
+
+        private bool GradientBackground
+        {
+            get
+            {
+                if (this.Style == eDotNetBarStyle.VS2005 && this.LayoutType == eLayoutType.DockContainer)
+                    return false;
+                return true;
+            }
+        }
+
+        internal bool ThemedBackground
+        {
+            get
+            {
+                if (this.IsThemed && m_ItemContainer.m_BackgroundColor.IsEmpty)
+                    return true;
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// Drawns bar grab handle if one specified.
+        /// </summary>
+        /// <param name="pa">Context information.</param>
+        internal void PaintGrabHandle(ItemPaintArgs pa)
+        {
+            RenderBarEventArgs re = null;
+            Graphics g = pa.Graphics;
+            // Draw grab handles
+            if (m_GrabHandleStyle != eGrabHandleStyle.None)
+            {
+                Rectangle r = Rectangle.Empty;
+
+                if (m_GrabHandleStyle != eGrabHandleStyle.Caption && m_GrabHandleStyle != eGrabHandleStyle.CaptionTaskPane && m_GrabHandleStyle != eGrabHandleStyle.CaptionDotted && this.IsThemed && m_GrabHandleStyle != eGrabHandleStyle.ResizeHandle)
+                {
+                    ThemeRebar theme = this.ThemeRebar;
+                    ThemeRebarParts part = ThemeRebarParts.Gripper;
+
+                    if (m_ItemContainer.Orientation == eOrientation.Vertical)
+                    {
+                        part = ThemeRebarParts.GripperVert;
+                        r = new Rectangle(m_GrabHandleRect.X + 2, m_GrabHandleRect.Top + 2, m_GrabHandleRect.Width - 4, 5);
+                    }
+                    else
+                        r = new Rectangle(m_GrabHandleRect.X + 2, m_GrabHandleRect.Top + 2, 5, m_GrabHandleRect.Height - 4);
+                    re = new RenderBarEventArgs(this, g, eBarRenderPart.GrabHandle, r);
+                    OnPreRender(re);
+                    r = re.Bounds;
+                    if (!re.Cancel)
+                        theme.DrawBackground(g, part, ThemeRebarStates.Normal, r);
+                    return;
+                }
+
+                Color clr = pa.Colors.BarBackground;
+                if (!m_ItemContainer.m_BackgroundColor.IsEmpty)
+                    clr = m_ItemContainer.m_BackgroundColor;
+
+                switch (m_GrabHandleStyle)
+                {
+                    case eGrabHandleStyle.Single:
+                        {
+                            if (m_ItemContainer.Orientation == eOrientation.Horizontal && m_ItemContainer.LayoutType != eLayoutType.DockContainer)
+                            {
+                                r = new Rectangle(m_GrabHandleRect.X + 2, m_GrabHandleRect.Top + 2, 3, m_GrabHandleRect.Height - 4);
+                                re = new RenderBarEventArgs(this, g, eBarRenderPart.GrabHandle, r);
+                                OnPreRender(re);
+                                if (!re.Cancel)
+                                    BarFunctions.DrawBorder3D(g, r, System.Windows.Forms.Border3DStyle.RaisedInner, System.Windows.Forms.Border3DSide.All, clr);
+                            }
+                            else
+                            {
+                                r = new Rectangle(m_GrabHandleRect.X + 2, m_GrabHandleRect.Top + 2, m_GrabHandleRect.Width - 4, 3);
+                                re = new RenderBarEventArgs(this, g, eBarRenderPart.GrabHandle, r);
+                                OnPreRender(re);
+                                if (!re.Cancel)
+                                    BarFunctions.DrawBorder3D(g, r, System.Windows.Forms.Border3DStyle.RaisedInner, System.Windows.Forms.Border3DSide.All, clr);
+                            }
+                            break;
+                        }
+                    case eGrabHandleStyle.Double:
+                        {
+                            if (m_ItemContainer.Orientation == eOrientation.Horizontal && m_ItemContainer.LayoutType != eLayoutType.DockContainer)
+                            {
+                                r = new Rectangle(m_GrabHandleRect.X + 1, m_GrabHandleRect.Top + 1, 3, m_GrabHandleRect.Height - 2);
+                                BarFunctions.DrawBorder3D(g, r, System.Windows.Forms.Border3DStyle.RaisedInner, System.Windows.Forms.Border3DSide.All, clr);
+                                r.Offset(3, 0);
+                                re = new RenderBarEventArgs(this, g, eBarRenderPart.GrabHandle, r);
+                                OnPreRender(re);
+                                if (!re.Cancel)
+                                    BarFunctions.DrawBorder3D(g, r, System.Windows.Forms.Border3DStyle.RaisedInner, System.Windows.Forms.Border3DSide.All, clr);
+                            }
+                            else
+                            {
+                                r = new Rectangle(m_GrabHandleRect.X + 1, m_GrabHandleRect.Top + 1, m_GrabHandleRect.Width - 2, 3);
+                                BarFunctions.DrawBorder3D(g, r, System.Windows.Forms.Border3DStyle.RaisedInner, System.Windows.Forms.Border3DSide.All, clr);
+                                r.Offset(0, 3);
+                                re = new RenderBarEventArgs(this, g, eBarRenderPart.GrabHandle, r);
+                                OnPreRender(re);
+                                if (!re.Cancel)
+                                    BarFunctions.DrawBorder3D(g, r, System.Windows.Forms.Border3DStyle.RaisedInner, System.Windows.Forms.Border3DSide.All, clr);
+                            }
+                            break;
+                        }
+                    case eGrabHandleStyle.DoubleThin:
+                        {
+                            if (m_ItemContainer.Orientation == eOrientation.Horizontal && m_ItemContainer.LayoutType != eLayoutType.DockContainer)
+                            {
+                                r = new Rectangle(m_GrabHandleRect.X + 1, m_GrabHandleRect.Top + 2, 3, m_GrabHandleRect.Height - 4);
+                                BarFunctions.DrawBorder3D(g, r, System.Windows.Forms.Border3DStyle.RaisedInner, System.Windows.Forms.Border3DSide.Left | System.Windows.Forms.Border3DSide.Right, clr);
+                                r.Offset(3, 0);
+                                re = new RenderBarEventArgs(this, g, eBarRenderPart.GrabHandle, r);
+                                OnPreRender(re);
+                                if (!re.Cancel)
+                                    BarFunctions.DrawBorder3D(g, r, System.Windows.Forms.Border3DStyle.RaisedInner, System.Windows.Forms.Border3DSide.Left | System.Windows.Forms.Border3DSide.Right, clr);
+                            }
+                            else
+                            {
+                                r = new Rectangle(m_GrabHandleRect.X + 2, m_GrabHandleRect.Top + 1, m_GrabHandleRect.Width - 4, 2);
+                                BarFunctions.DrawBorder3D(g, r, System.Windows.Forms.Border3DStyle.RaisedInner, System.Windows.Forms.Border3DSide.Top | System.Windows.Forms.Border3DSide.Bottom, clr);
+                                r.Offset(0, 3);
+                                re = new RenderBarEventArgs(this, g, eBarRenderPart.GrabHandle, r);
+                                OnPreRender(re);
+                                if (!re.Cancel)
+                                    BarFunctions.DrawBorder3D(g, r, System.Windows.Forms.Border3DStyle.RaisedInner, System.Windows.Forms.Border3DSide.Top | System.Windows.Forms.Border3DSide.Bottom, clr);
+                            }
+                            break;
+                        }
+                    case eGrabHandleStyle.DoubleFlat:
+                        {
+                            re = new RenderBarEventArgs(this, g, eBarRenderPart.GrabHandle, m_GrabHandleRect);
+                            OnPreRender(re);
+                            if (!re.Cancel)
+                            {
+                                Pen pen = new Pen(ControlPaint.Dark(clr), 1);
+                                if (m_ItemContainer.Orientation == eOrientation.Horizontal && m_ItemContainer.LayoutType != eLayoutType.DockContainer)
+                                {
+                                    g.DrawLine(/*SystemPens.ControlDark*/pen, m_GrabHandleRect.X + 2, m_GrabHandleRect.Top + 2, m_GrabHandleRect.X + 2, m_GrabHandleRect.Height - 4);
+                                    g.DrawLine(/*SystemPens.ControlDark*/pen, m_GrabHandleRect.X + 5, m_GrabHandleRect.Top + 2, m_GrabHandleRect.X + 5, m_GrabHandleRect.Height - 4);
+                                }
+                                else
+                                {
+                                    g.DrawLine(pen, m_GrabHandleRect.X + 2, m_GrabHandleRect.Top + 2, m_GrabHandleRect.Width - 4, m_GrabHandleRect.Y + 2);
+                                    g.DrawLine(pen, m_GrabHandleRect.X + 2, m_GrabHandleRect.Top + 5, m_GrabHandleRect.Width - 4, m_GrabHandleRect.Y + 5);
+                                }
+                                pen.Dispose();
+                                pen = null;
+                            }
+                            break;
+                        }
+                    case eGrabHandleStyle.Dotted:
+                        {
+                            re = new RenderBarEventArgs(this, g, eBarRenderPart.GrabHandle, m_GrabHandleRect);
+                            OnPreRender(re);
+                            if (!re.Cancel)
+                            {
+                                Brush brushDark = new SolidBrush(ControlPaint.Dark(clr));
+                                Brush brushLight = new SolidBrush(ControlPaint.Light(clr));
+                                if (m_ItemContainer.Orientation == eOrientation.Horizontal && m_ItemContainer.LayoutType != eLayoutType.DockContainer)
+                                {
+                                    for (int i = 0; i < (m_GrabHandleRect.Height - 4); i += 4)
+                                    {
+                                        g.FillRectangle(/*SystemBrushes.ControlDark*/brushDark, m_GrabHandleRect.X + 1, m_GrabHandleRect.Top + 2 + i, 2, 2);
+                                        g.FillRectangle(/*SystemBrushes.ControlLight*/brushLight, m_GrabHandleRect.X + 1, m_GrabHandleRect.Top + 2 + i, 1, 1);
+
+                                        g.FillRectangle(brushDark, m_GrabHandleRect.X + 5, m_GrabHandleRect.Top + 2 + i, 2, 2);
+                                        g.FillRectangle(brushLight, m_GrabHandleRect.X + 5, m_GrabHandleRect.Top + 2 + i, 1, 1);
+                                    }
+                                }
+                                else
+                                {
+                                    for (int i = 0; i < (m_GrabHandleRect.Width - 4); i += 4)
+                                    {
+                                        g.FillRectangle(SystemBrushes.ControlDark, m_GrabHandleRect.Left + 2 + i, m_GrabHandleRect.Y + 1, 2, 2);
+                                        g.FillRectangle(SystemBrushes.ControlLight, m_GrabHandleRect.Left + 2 + i, m_GrabHandleRect.Y + 1, 1, 1);
+
+                                        g.FillRectangle(SystemBrushes.ControlDark, m_GrabHandleRect.Left + 2 + i, m_GrabHandleRect.Y + 5, 2, 2);
+                                        g.FillRectangle(SystemBrushes.ControlLight, m_GrabHandleRect.Left + 2 + i, m_GrabHandleRect.Y + 5, 1, 1);
+                                    }
+                                }
+                                brushDark.Dispose();
+                                brushLight.Dispose();
+                            }
+                            break;
+                        }
+                    case eGrabHandleStyle.Stripe:
+                        {
+                            re = new RenderBarEventArgs(this, g, eBarRenderPart.GrabHandle, m_GrabHandleRect);
+                            OnPreRender(re);
+                            if (!re.Cancel)
+                            {
+                                if (m_ItemContainer.Orientation == eOrientation.Horizontal && m_ItemContainer.LayoutType != eLayoutType.DockContainer)
+                                {
+                                    for (int i = 0; i < (m_GrabHandleRect.Height - 4); i += 3)
+                                        BarFunctions.DrawBorder3D(g, m_GrabHandleRect.X + 2, m_GrabHandleRect.Top + i + 2, 5, 2, System.Windows.Forms.Border3DStyle.RaisedInner, System.Windows.Forms.Border3DSide.Top | System.Windows.Forms.Border3DSide.Bottom, clr);
+                                    //System.Windows.Forms.ControlPaint.DrawBorder3D(g,m_GrabHandleRect.X+2,m_GrabHandleRect.Top+i+2,5,2,System.Windows.Forms.Border3DStyle.RaisedInner,System.Windows.Forms.Border3DSide.Top | System.Windows.Forms.Border3DSide.Bottom);
+                                }
+                                else
+                                {
+                                    for (int i = 0; i < (m_GrabHandleRect.Width - 4); i += 3)
+                                        BarFunctions.DrawBorder3D(g, m_GrabHandleRect.Left + i + 2, m_GrabHandleRect.Y + 2, 2, 5, System.Windows.Forms.Border3DStyle.RaisedInner, System.Windows.Forms.Border3DSide.Right | System.Windows.Forms.Border3DSide.Left, clr);
+                                    //System.Windows.Forms.ControlPaint.DrawBorder3D(g,m_GrabHandleRect.Left+i+2,m_GrabHandleRect.Y+2,2,5,System.Windows.Forms.Border3DStyle.RaisedInner,System.Windows.Forms.Border3DSide.Right | System.Windows.Forms.Border3DSide.Left);
+                                }
+                            }
+                            break;
+                        }
+                    case eGrabHandleStyle.StripeFlat:
+                        {
+                            re = new RenderBarEventArgs(this, g, eBarRenderPart.GrabHandle, m_GrabHandleRect);
+                            OnPreRender(re);
+                            if (!re.Cancel)
+                            {
+                                Pen pen = new Pen(pa.Colors.BarStripeColor/*ControlPaint.Dark(clr)*/, 1);
+                                if (m_ItemContainer.Orientation == eOrientation.Horizontal && m_ItemContainer.LayoutType != eLayoutType.DockContainer)
+                                {
+                                    for (int i = 2; i < (m_GrabHandleRect.Height - 6); i += 2)
+                                        g.DrawLine(/*SystemPens.ControlDark*/pen, m_GrabHandleRect.X + 3, m_GrabHandleRect.Top + i + 3, m_GrabHandleRect.X + 5, m_GrabHandleRect.Top + i + 3);
+                                }
+                                else
+                                {
+                                    for (int i = 1; i < (m_GrabHandleRect.Width - 6); i += 2)
+                                        g.DrawLine(/*SystemPens.ControlDark*/pen, m_GrabHandleRect.Left + i + 3, m_GrabHandleRect.Y + 2, m_GrabHandleRect.Left + i + 3, m_GrabHandleRect.Y + 5);
+                                }
+                                pen.Dispose();
+                            }
+                            break;
+                        }
+                    case eGrabHandleStyle.CaptionTaskPane:
+                    case eGrabHandleStyle.CaptionDotted:
+                        {
+                            Rectangle targetRect = m_GrabHandleRect;
+                            Brush brush = null;
+                            re = new RenderBarEventArgs(this, g, eBarRenderPart.Caption, m_GrabHandleRect);
+                            OnPreRender(re);
+                            if (!re.Cancel)
+                            {
+                                if (m_BarState == eBarState.Floating)
+                                {
+                                    DisplayHelp.FillRectangle(g, targetRect, pa.Colors.BarCaptionBackground, pa.Colors.BarCaptionBackground2, pa.Colors.BarCaptionBackgroundGradientAngle);
+                                }
+                                else
+                                {
+                                    if (!this.CaptionBackColor.IsEmpty)
+                                        brush = new SolidBrush(this.CaptionBackColor);
+                                    if (pa.Colors.BarBackground2.IsEmpty)
+                                    {
+                                        if (m_HasFocus && m_GrabHandleStyle == eGrabHandleStyle.CaptionDotted)
+                                            brush = new SolidBrush(pa.Colors.BarCaptionBackground);
+                                        else
+                                            brush = new SolidBrush(pa.Colors.BarBackground);
+                                    }
+                                    else
+                                    {
+                                        brush = BarFunctions.CreateLinearGradientBrush(targetRect, pa.Colors.BarBackground, pa.Colors.BarBackground2, pa.Colors.BarBackgroundGradientAngle);
+                                    }
+
+                                    g.FillRectangle(brush, targetRect);
+
+                                    brush.Dispose();
+                                    brush = null;
+                                }
+
+                                Brush brushDark = null;
+                                Brush brushLight = new SolidBrush(ControlPaint.Light(clr));
+
+                                if (!pa.Colors.BarStripeColor.IsEmpty)
+                                {
+                                    clr = pa.Colors.BarStripeColor;
+                                    brushDark = new SolidBrush(clr);
+                                }
+                                else
+                                    brushDark = new SolidBrush(ControlPaint.Dark(clr));
+                                int y = m_GrabHandleRect.Top + 4;
+                                int x = m_GrabHandleRect.Left + 4;
+                                for (int i = y; i <= m_GrabHandleRect.Bottom - 4; i += 5)
+                                {
+                                    g.FillRectangle(brushLight, x + 1, i + 1, 2, 2);
+                                    g.FillRectangle(brushDark, x, i, 2, 2);
+                                }
+                                if (brushLight != null) brushLight.Dispose();
+                                if (brushDark != null) brushDark.Dispose();
+                            }
+
+                            targetRect.X += 8;
+                            targetRect.Width -= 8;
+
+                            targetRect.Inflate(-1, -1);
+                            PaintGrabHandleButtons(pa, ref targetRect);
+                            if (m_GrabHandleStyle == eGrabHandleStyle.CaptionDotted)
+                                PaintCaptionText(pa, targetRect);
+                            break;
+                        }
+                    case eGrabHandleStyle.Caption:
+                        {
+                            Rectangle targetRect = m_GrabHandleRect;
+                            re = new RenderBarEventArgs(this, g, eBarRenderPart.Caption, m_GrabHandleRect);
+                            OnPreRender(re);
+                            if (!re.Cancel)
+                            {
+                                ThemeWindow theme = null;
+                                ThemeWindowParts part = ThemeWindowParts.SmallCaption;
+                                ThemeWindowStates state = ThemeWindowStates.CaptionInactive;
+                                if (this.DrawThemedCaption)
+                                    theme = this.ThemeWindow;
+
+                                if (m_DockedBorder == eBorderType.None)
+                                    targetRect.Inflate(-1, 0);
+                                if (m_CaptionBackColor.IsEmpty)
+                                {
+                                    if (this.Style == eDotNetBarStyle.Office2000)
+                                    {
+                                        if (m_HasFocus)
+                                            g.FillRectangle(SystemBrushes.ActiveCaption, targetRect);
+                                        else
+                                            g.FillRectangle(SystemBrushes.InactiveCaption, targetRect);
+                                    }
+                                    else
+                                    {
+                                        if (this.DrawThemedCaption)
+                                        {
+                                            if (m_HasFocus)
+                                                state = ThemeWindowStates.CaptionActive;
+                                            theme.DrawBackground(g, part, state, targetRect);
+                                        }
+                                        else
+                                        {
+                                            Color hatchForeColor, hatchBackColor;
+                                            if (m_HasFocus)
+                                            {
+                                                hatchForeColor = Color.FromArgb(128, pa.Colors.BarCaptionText);
+                                                hatchBackColor = pa.Colors.BarCaptionBackground;
+                                                if (pa.Colors.BarCaptionBackground2.IsEmpty)
+                                                    DisplayHelp.FillRectangle(g, targetRect, pa.Colors.BarCaptionBackground);
+                                                else
+                                                {
+                                                    using (System.Drawing.Drawing2D.LinearGradientBrush gradient = BarFunctions.CreateLinearGradientBrush(targetRect, pa.Colors.BarCaptionBackground, pa.Colors.BarCaptionBackground2, pa.Colors.BarCaptionBackgroundGradientAngle))
+                                                        g.FillRectangle(gradient, targetRect);
+                                                }
+                                            }
+                                            else
+                                            {
+                                                hatchForeColor = Color.FromArgb(192, pa.Colors.BarCaptionInactiveText);
+                                                hatchBackColor = pa.Colors.BarCaptionInactiveBackground;
+                                                if (pa.Colors.BarCaptionInactiveBackground2.IsEmpty)
+                                                    DisplayHelp.FillRectangle(g, targetRect, pa.Colors.BarCaptionInactiveBackground);
+                                                else
+                                                {
+                                                    using (System.Drawing.Drawing2D.LinearGradientBrush brush = BarFunctions.CreateLinearGradientBrush(targetRect, pa.Colors.BarCaptionInactiveBackground, pa.Colors.BarCaptionInactiveBackground2, pa.Colors.BarCaptionInactiveBackgroundGAngle))
+                                                    {
+                                                        g.FillRectangle(brush, targetRect);
+                                                    }
+                                                }
+
+                                                eDotNetBarStyle effectiveStyle = m_ItemContainer.EffectiveStyle;
+                                                if (effectiveStyle != eDotNetBarStyle.VS2005 && effectiveStyle != eDotNetBarStyle.Office2010 && !StyleManager.IsMetro(effectiveStyle))
+                                                {
+                                                    Pen penCap = new Pen(pa.Colors.BarCaptionBackground, 1);
+                                                    g.DrawLine(penCap, targetRect.X + 1, targetRect.Y, targetRect.Right - 2, targetRect.Y);
+                                                    g.DrawLine(penCap, targetRect.X + 1, targetRect.Bottom - 1, targetRect.Right - 2, targetRect.Bottom - 1);
+                                                    g.DrawLine(penCap, targetRect.X, targetRect.Y + 1, targetRect.X, targetRect.Bottom - 2);
+                                                    g.DrawLine(penCap, targetRect.Right - 1, targetRect.Y + 1, targetRect.Right - 1, targetRect.Bottom - 2);
+                                                    penCap.Dispose();
+                                                }
+                                            }
+                                            if (StyleManager.IsVisualStudio2012(StyleManager.Style))
+                                            {
+                                                Rectangle hatchRect = new Rectangle(targetRect.X, targetRect.Y + (targetRect.Height - 6) / 2, targetRect.Width, 6);
+                                                if (!string.IsNullOrEmpty(this.Text))
+                                                {
+                                                    Size textSize = TextDrawing.MeasureString(g, this.Text, this.Font);
+                                                    textSize.Width += 8;
+                                                    if (textSize.Width < hatchRect.Width)
+                                                    {
+                                                        hatchRect.Width -= textSize.Width;
+                                                        hatchRect.X += textSize.Width;
+                                                        if (CanHideResolved)
+                                                            hatchRect.Width -= 16;
+                                                        if (GetPaintAutoHidePin())
+                                                            hatchRect.Width -= 16;
+                                                        if (ShowCustomizeMenuButton)
+                                                            hatchRect.Width -= 16;
+                                                        if (hatchRect.Width <= 0)
+                                                            hatchRect = Rectangle.Empty;
+                                                    }
+                                                    else
+                                                        hatchRect = Rectangle.Empty;
+                                                }
+                                                if (!hatchRect.IsEmpty)
+                                                {
+                                                    Region oldClip = g.Clip;
+                                                    g.SetClip(new Rectangle(hatchRect.X + 2, hatchRect.Y, hatchRect.Width - 2, hatchRect.Height), CombineMode.Intersect);
+                                                    using (HatchBrush hatch = new HatchBrush(HatchStyle.Percent20, hatchForeColor, hatchBackColor))
+                                                        g.FillRectangle(hatch, hatchRect);
+                                                    g.Clip = oldClip;
+                                                    if (oldClip != null) oldClip.Dispose();
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                                else
+                                {
+                                    DisplayHelp.FillRectangle(g, targetRect, m_CaptionBackColor);
+                                }
+                            }
+
+                            targetRect.Inflate(-1, -1);
+
+                            PaintGrabHandleButtons(pa, ref targetRect);
+
+                            PaintCaptionText(pa, targetRect);
+                            break;
+                        }
+                    case eGrabHandleStyle.ResizeHandle:
+                        {
+                            re = new RenderBarEventArgs(this, g, eBarRenderPart.ResizeHandle, m_GrabHandleRect);
+                            OnPreRender(re);
+                            if (!re.Cancel && !StyleManager.IsMetro(m_ItemContainer.EffectiveStyle))
+                            {
+                                // Paint Internet Explorer-style dotted sizer in lower right
+                                // draw light 'shadows'
+                                Form form = this.FindForm();
+                                if (form != null && form.WindowState == FormWindowState.Maximized)
+                                    break;
+                                int direction = 1;
+                                Point startLoc = new Point(this.ClientRectangle.Right, this.ClientRectangle.Bottom);
+                                if (this.RightToLeft == RightToLeft.Yes)
+                                {
+                                    direction = -1;
+                                    startLoc = new Point(0, this.ClientRectangle.Bottom - 2);
+                                }
+                                ColorFunctions.HLSColor hls = ColorFunctions.RGBToHSL(clr);
+                                Color lightColor = ColorFunctions.HLSToRGB(hls.Hue, hls.Lightness + .3d, hls.Saturation);
+                                Pen pen = new Pen(lightColor, 1);
+                                g.DrawLine(pen, startLoc.X - 2 * direction, startLoc.Y - 2,
+                                    startLoc.X - 3 * direction, startLoc.Y - 2);
+                                g.DrawLine(pen, startLoc.X - 6 * direction, startLoc.Y - 2,
+                                    startLoc.X - 7 * direction, startLoc.Y - 2);
+                                g.DrawLine(pen, startLoc.X - 10 * direction, startLoc.Y - 2,
+                                    startLoc.X - 11 * direction, startLoc.Y - 2);
+                                g.DrawLine(pen, startLoc.X - 2 * direction, startLoc.Y - 2,
+                                    startLoc.X - 2 * direction, startLoc.Y - 3);
+                                g.DrawLine(pen, startLoc.X - 6 * direction, startLoc.Y - 2,
+                                    startLoc.X - 6 * direction, startLoc.Y - 3);
+                                g.DrawLine(pen, startLoc.X - 10 * direction, startLoc.Y - 2,
+                                    startLoc.X - 10 * direction, startLoc.Y - 3);
+                                g.DrawLine(pen, startLoc.X - 2 * direction, startLoc.Y - 6,
+                                    startLoc.X - 3 * direction, startLoc.Y - 6);
+                                g.DrawLine(pen, startLoc.X - 6 * direction, startLoc.Y - 6,
+                                    startLoc.X - 7 * direction, startLoc.Y - 6);
+                                g.DrawLine(pen, startLoc.X - 2 * direction, startLoc.Y - 6,
+                                    startLoc.X - 2 * direction, startLoc.Y - 7);
+                                g.DrawLine(pen, startLoc.X - 6 * direction, startLoc.Y - 6,
+                                    startLoc.X - 6 * direction, startLoc.Y - 7);
+                                g.DrawLine(pen, startLoc.X - 2 * direction, startLoc.Y - 10,
+                                    startLoc.X - 3 * direction, startLoc.Y - 10);
+                                g.DrawLine(pen, startLoc.X - 2 * direction, startLoc.Y - 10,
+                                    startLoc.X - 2 * direction, startLoc.Y - 11);
+                                pen.Dispose();
+
+                                // draw dark squares
+                                if (!StyleManager.IsMetro(m_ItemContainer.EffectiveStyle))
+                                {
+                                    pen = new Pen(pa.Colors.BarStripeColor/*ControlPaint.Dark(clr)*/, 1);
+                                    g.DrawRectangle(pen, startLoc.X - 4 * direction, startLoc.Y - 4, 1, 1);
+                                    g.DrawRectangle(pen, startLoc.X - 8 * direction, startLoc.Y - 4, 1, 1);
+                                    g.DrawRectangle(pen, startLoc.X - 12 * direction, startLoc.Y - 4, 1, 1);
+                                    g.DrawRectangle(pen, startLoc.X - 4 * direction, startLoc.Y - 8, 1, 1);
+                                    g.DrawRectangle(pen, startLoc.X - 8 * direction, startLoc.Y - 8, 1, 1);
+                                    g.DrawRectangle(pen, startLoc.X - 4 * direction, startLoc.Y - 12, 1, 1);
+                                    pen.Dispose();
+                                    pen = null;
+                                }
+                            }
+                            break;
+                        }
+                    case eGrabHandleStyle.Office2003:
+                    case eGrabHandleStyle.Office2003SingleDot:
+                        {
+                            re = new RenderBarEventArgs(this, g, eBarRenderPart.GrabHandle, m_GrabHandleRect);
+                            OnPreRender(re);
+                            if (!re.Cancel)
+                            {
+                                int x = m_GrabHandleRect.Left + (m_GrabHandleRect.Width - 3) / 2;
+                                int y = m_GrabHandleRect.Top + 4;
+
+                                if (m_GrabHandleStyle == eGrabHandleStyle.Office2003SingleDot)
+                                {
+                                    x = m_GrabHandleRect.Left + (m_GrabHandleRect.Width - 3) / 2;
+                                    y = m_GrabHandleRect.Top + (m_GrabHandleRect.Height - 3) / 2;
+                                }
+                                else
+                                {
+                                    if (m_ItemContainer.Orientation == eOrientation.Vertical)
+                                    {
+                                        x = m_GrabHandleRect.Left + 4;
+                                        y = m_GrabHandleRect.Top + (m_GrabHandleRect.Height - 3) / 2;
+                                    }
+                                }
+
+                                Brush brushDark = null;
+                                Brush brushLight = new SolidBrush(ControlPaint.Light(clr));
+
+                                if (!pa.Colors.BarStripeColor.IsEmpty)
+                                {
+                                    clr = pa.Colors.BarStripeColor;
+                                    brushDark = new SolidBrush(clr);
+                                }
+                                else
+                                    brushDark = new SolidBrush(ControlPaint.Dark(clr));
+
+                                if (m_GrabHandleStyle == eGrabHandleStyle.Office2003SingleDot)
+                                {
+                                    g.FillRectangle(brushLight, x + 1, y + 1, 2, 2);
+                                    g.FillRectangle(brushDark, x, y, 2, 2);
+                                }
+                                else
+                                {
+                                    if (StyleManager.IsVisualStudio2012(StyleManager.Style))
+                                    {
+                                        Rectangle tr = new Rectangle(m_GrabHandleRect.X, m_GrabHandleRect.Y+2, 6, m_GrabHandleRect.Height-4);
+                                        Region oldClip = g.Clip;
+                                        g.SetClip(new Rectangle(tr.X, tr.Y + 1, tr.Width, tr.Height - 2), CombineMode.Intersect);
+                                        using (HatchBrush hatch = new HatchBrush(HatchStyle.Percent20, clr, pa.Colors.BarBackground))
+                                            g.FillRectangle(hatch, tr);
+                                        g.Clip = oldClip;
+                                        if (oldClip != null) oldClip.Dispose();
+                                    }
+                                    else
+                                    {
+                                        if (m_ItemContainer.Orientation == eOrientation.Vertical)
+                                        {
+                                            for (int i = x; i <= m_GrabHandleRect.Right - 4; i += 5)
+                                            {
+                                                g.FillRectangle(brushLight, i + 1, y + 1, 2, 2);
+                                                g.FillRectangle(brushDark, i, y, 2, 2);
+                                            }
+                                        }
+                                        else
+                                        {
+                                            for (int i = y; i <= m_GrabHandleRect.Bottom - 4; i += 5)
+                                            {
+                                                g.FillRectangle(brushLight, x + 1, i + 1, 2, 2);
+                                                g.FillRectangle(brushDark, x, i, 2, 2);
+                                            }
+                                        }
+                                    }
+                                }
+                                brushDark.Dispose();
+                                brushLight.Dispose();
+                            }
+                            break;
+                        }
+                }
+            }
+        }
+
+        private void PaintCaptionText(ItemPaintArgs pa, Rectangle targetRect)
+        {
+            Graphics g = pa.Graphics;
+            RenderBarEventArgs re = new RenderBarEventArgs(this, g, eBarRenderPart.CaptionText, targetRect);
+            OnPreRender(re);
+            if (re.Cancel) return;
+            System.Drawing.Font objFont = null;
+            bool bDisposeFont = false;
+            try
+            {
+                objFont = this.Font.Clone() as Font; //new Font(this.Font.Name, 8);
+                bDisposeFont = true;
+            }
+            catch
+            {
+                objFont = SystemFonts.MenuFont; // System.Windows.Forms.SystemInformation.MenuFont;
+                bDisposeFont = true;
+            }
+            eTextFormat sf = eTextFormat.Default | eTextFormat.SingleLine | eTextFormat.EndEllipsis | eTextFormat.VerticalCenter;
+            if (m_CaptionForeColor.IsEmpty)
+            {
+                if (this.IsThemed)
+                {
+                    if (targetRect.Height < objFont.Height)
+                        targetRect.Height = objFont.Height;
+                    if (targetRect.Width > 0)
+                    {
+                        if (!m_HasFocus)
+                            TextDrawing.DrawString(g, this.Text, objFont, SystemColors.WindowText, targetRect, sf);
+                        else
+                            TextDrawing.DrawString(g, this.Text, objFont, SystemColors.ActiveCaptionText, targetRect, sf);
+                    }
+                }
+                else
+                {
+                    if (targetRect.Height < objFont.Height)
+                        targetRect.Height = objFont.Height;
+                    if (targetRect.Width > 0)
+                    {
+                        Color textColor = pa.Colors.BarCaptionText;
+                        if (m_GrabHandleStyle == eGrabHandleStyle.CaptionDotted)
+                            textColor = pa.Colors.ItemText;
+                        else if ((this.Style == eDotNetBarStyle.OfficeXP || this.Style == eDotNetBarStyle.Office2003 || this.Style == eDotNetBarStyle.VS2005 || BarFunctions.IsOffice2007Style(this.Style)) && !m_HasFocus)
+                            textColor = pa.Colors.BarCaptionInactiveText;
+                        TextDrawing.DrawString(g, this.Text, objFont, textColor, targetRect, sf);
+                    }
+                }
+            }
+            else if (targetRect.Width > 0)
+                TextDrawing.DrawString(g, this.Text, objFont, m_CaptionForeColor, targetRect, sf);
+            if (bDisposeFont)
+                objFont.Dispose();
+        }
+
+        /// <summary>
+        /// Gets whether caption of floating bar will be drawn using themes.
+        /// </summary>
+        internal bool DrawThemedCaption
+        {
+            get
+            {
+                if (BarFunctions.IsOffice2007Style(this.Style) || !this.ThemeAware)
+                    return false;
+                if (this.IsThemed || m_BarState == eBarState.Floating && BarFunctions.ThemedOS && Themes.ThemesActive && this.LayoutType == eLayoutType.DockContainer)
+                    return true;
+                return false;
+            }
+        }
+
+        private bool GetPaintAutoHidePin()
+        {
+            bool ret = false;
+            if (m_CanAutoHide && m_ItemContainer.LayoutType == eLayoutType.DockContainer && m_BarState != eBarState.Floating)
+            {
+                if (this.Parent is DockSite && this.Parent.Dock == DockStyle.Fill)
+                    ret = false;
+                else
+                    ret = true;
+            }
+            return ret;
+        }
+
+        private void PaintGrabHandleButtons(ItemPaintArgs pa, ref Rectangle targetRect)
+        {
+            RenderBarEventArgs re = null;
+            if (this.CanHideResolved)
+            {
+                if (this.Style == eDotNetBarStyle.Office2000)
+                    m_SystemButtons.CloseButtonRect = new Rectangle(targetRect.Right - 11, targetRect.Y + (targetRect.Height - m_SystemButtons.ButtonSize.Width) / 2, m_SystemButtons.ButtonSize.Width, m_SystemButtons.ButtonSize.Height);
+                else
+                    m_SystemButtons.CloseButtonRect = new Rectangle(targetRect.Right - (m_SystemButtons.ButtonSize.Width + 1), targetRect.Y + (targetRect.Height - m_SystemButtons.ButtonSize.Height) / 2, m_SystemButtons.ButtonSize.Width, m_SystemButtons.ButtonSize.Height);
+                re = new RenderBarEventArgs(this, pa.Graphics, eBarRenderPart.CloseButton, m_SystemButtons.CloseButtonRect);
+                OnPreRender(re);
+                m_SystemButtons.CloseButtonRect = re.Bounds;
+                targetRect.Width -= (m_SystemButtons.CloseButtonRect.Width + 3);
+                if (!re.Cancel)
+                    PaintCloseButton(pa);
+            }
+            if (GetPaintAutoHidePin())
+            {
+                if (this.Style == eDotNetBarStyle.Office2000)
+                    m_SystemButtons.AutoHideButtonRect = new Rectangle(targetRect.Right - (m_SystemButtons.ButtonSize.Width - 1), targetRect.Y + (targetRect.Height - m_SystemButtons.ButtonSize.Height) / 2, m_SystemButtons.ButtonSize.Width, m_SystemButtons.ButtonSize.Height);
+                else
+                    m_SystemButtons.AutoHideButtonRect = new Rectangle(targetRect.Right - (m_SystemButtons.ButtonSize.Width + 1), targetRect.Y + (targetRect.Height - m_SystemButtons.ButtonSize.Height) / 2, m_SystemButtons.ButtonSize.Width, m_SystemButtons.ButtonSize.Height);
+                re = new RenderBarEventArgs(this, pa.Graphics, eBarRenderPart.AutoHideButton, m_SystemButtons.AutoHideButtonRect);
+                OnPreRender(re);
+                m_SystemButtons.AutoHideButtonRect = re.Bounds;
+                targetRect.Width -= (m_SystemButtons.AutoHideButtonRect.Width + 3);
+                if (!re.Cancel)
+                    PaintAutoHideButton(pa);
+            }
+            if (this.ShowCustomizeMenuButton)
+            {
+                re = new RenderBarEventArgs(this, pa.Graphics, eBarRenderPart.CustomizeButton, Rectangle.Empty);
+
+                if (this.Style == eDotNetBarStyle.Office2000)
+                {
+                    m_SystemButtons.CustomizeButtonRect = new Rectangle(targetRect.X, targetRect.Y + (targetRect.Height - m_SystemButtons.ButtonSize.Height) / 2, m_SystemButtons.ButtonSize.Width, m_SystemButtons.ButtonSize.Height);
+                    re.Bounds = m_SystemButtons.CustomizeButtonRect;
+                    OnPreRender(re);
+                    m_SystemButtons.CustomizeButtonRect = re.Bounds;
+                    targetRect.Width -= (m_SystemButtons.CustomizeButtonRect.Width + 2);
+                    targetRect.X += (m_SystemButtons.CustomizeButtonRect.Width + 2);
+                }
+                else
+                {
+                    m_SystemButtons.CustomizeButtonRect = new Rectangle(targetRect.Right - (m_SystemButtons.ButtonSize.Width + 1), targetRect.Y + (targetRect.Height - m_SystemButtons.ButtonSize.Height) / 2, m_SystemButtons.ButtonSize.Width, m_SystemButtons.ButtonSize.Height);
+                    re.Bounds = m_SystemButtons.CustomizeButtonRect;
+                    OnPreRender(re);
+                    m_SystemButtons.CustomizeButtonRect = re.Bounds;
+                    targetRect.Width -= (m_SystemButtons.CustomizeButtonRect.Width + 2);
+                }
+
+                if (!re.Cancel)
+                    PaintCustomizeButton(pa);
+            }
+
+            if (this.GrabHandleStyle == eGrabHandleStyle.CaptionTaskPane)
+            {
+                targetRect.X += 2;
+                targetRect.Width -= 2;
+                targetRect.Inflate(0, -2);
+                m_SystemButtons.CaptionButtonRect = targetRect;
+                re = new RenderBarEventArgs(this, pa.Graphics, eBarRenderPart.CaptionTaskPane, m_SystemButtons.CaptionButtonRect);
+                OnPreRender(re);
+                m_SystemButtons.CaptionButtonRect = re.Bounds;
+                if (!re.Cancel)
+                    PaintCaptionButton(pa);
+            }
+
+            targetRect.X += 2;
+            targetRect.Width -= 2;
+        }
+
+        protected void PaintOffice(Graphics g)
+        {
+            m_SystemButtons.CustomizeButtonRect = Rectangle.Empty;
+            m_SystemButtons.CloseButtonRect = Rectangle.Empty;
+
+            if (m_ItemContainer.BackColor.IsEmpty)
+            {
+                using (SolidBrush brush = new SolidBrush(SystemColors.Control))
+                    g.FillRectangle(brush, this.DisplayRectangle);
+            }
+            else
+            {
+                using (SolidBrush brush = new SolidBrush(m_ItemContainer.BackColor))
+                    g.FillRectangle(brush, this.DisplayRectangle);
+            }
+            ColorScheme cs = this.GetColorScheme();
+            PaintSideBar(g);
+            ItemPaintArgs pa = GetItemPaintArgs(g); // new ItemPaintArgs(m_Owner as IOwner, this, g, cs); // TODO: ADD SUPPORT FOR SCHEMES
+            //pa.DesignerSelection = m_DesignerSelection;
+            if (m_ItemContainer.SubItems.Count > 0)
+            {
+                if (m_BarState == eBarState.Popup)
+                {
+                    System.Windows.Forms.ControlPaint.DrawBorder3D(g, 0, 0, this.ClientSize.Width, this.ClientSize.Height, System.Windows.Forms.Border3DStyle.Raised);
+                    PaintSideBar(g);
+                }
+                else if (m_BarState == eBarState.Floating)
+                {
+                    System.Windows.Forms.ControlPaint.DrawBorder3D(g, 0, 0, this.ClientSize.Width, this.ClientSize.Height, System.Windows.Forms.Border3DStyle.Raised | System.Windows.Forms.Border3DStyle.RaisedOuter);
+                    if (m_CaptionBackColor.IsEmpty)
+                        g.FillRectangle(SystemBrushes.ActiveCaption, 4, 4, this.ClientSize.Width - 8, 15);
+                    else
+                    {
+                        using (SolidBrush b1 = new SolidBrush(m_CaptionBackColor))
+                            g.FillRectangle(b1, 4, 4, this.ClientSize.Width - 8, 15);
+                    }
+
+                    System.Drawing.Font objFont = null;
+                    bool bDisposeFont = false;
+                    try
+                    {
+                        objFont = new Font(this.Font, FontStyle.Bold);
+                        bDisposeFont = true;
+                    }
+                    catch
+                    {
+                        objFont = SystemFonts.MenuFont; // System.Windows.Forms.SystemInformation.MenuFont;
+                        bDisposeFont = true;
+                    }
+
+                    Rectangle r = Rectangle.Empty;
+                    if (this.ShowCustomizeMenuButton)
+                    {
+                        r = new Rectangle(18, 4, this.ClientSize.Width - 22, 15);
+                        m_SystemButtons.CustomizeButtonRect = new Rectangle(5, 6, 15, 14);
+                        PaintCustomizeButton(pa);
+                    }
+                    else
+                    {
+                        r = new Rectangle(4, 4, this.ClientSize.Width - 8, 15);
+                    }
+                    if (this.CanHideResolved)
+                    {
+                        m_SystemButtons.CloseButtonRect = new Rectangle(r.Right - m_SystemButtons.ButtonSize.Width, 6, m_SystemButtons.ButtonSize.Width, m_SystemButtons.ButtonSize.Height);
+                        PaintCloseButton(pa);
+                        r.Width -= (m_SystemButtons.ButtonSize.Width + 1);
+                    }
+
+                    if (m_CaptionForeColor.IsEmpty)
+                        TextDrawing.DrawString(g, this.Text, objFont, SystemColors.ActiveCaptionText, r, eTextFormat.Default);
+                    else
+                        TextDrawing.DrawString(g, this.Text, objFont, m_CaptionForeColor, r, eTextFormat.Default);
+
+                    if (bDisposeFont)
+                        objFont.Dispose();
+                }
+                else
+                {
+                    // Docked state
+                    BarFunctions.DrawBorder(g, m_DockedBorder, this.ClientRectangle, m_SingleLineColor);
+                    PaintGrabHandle(pa);
+                }
+
+                m_ItemContainer.Paint(pa);
+            }
+        }
+        private void PaintMaximizeButton()
+        {
+            this.Invalidate(m_SystemButtons.MaximizeButtonRect);
+            this.Update();
+        }
+        private void PaintCloseButton()
+        {
+            this.Invalidate(m_SystemButtons.CloseButtonRect);
+            this.Update();
+        }
+        private void PaintCloseButton(ItemPaintArgs pa)
+        {
+            if (m_SystemButtons.CloseButtonRect.IsEmpty)
+                return;
+
+            Graphics g = pa.Graphics;
+
+            if (this.DrawThemedCaption)
+            {
+                ThemeWindow theme = this.ThemeWindow;
+                ThemeWindowParts part = ThemeWindowParts.SmallCloseButton;
+                ThemeWindowStates state = ThemeWindowStates.ButtonNormal;
+                if (m_SystemButtons.MouseDownClose)
+                    state = ThemeWindowStates.ButtonPushed;
+                else if (m_SystemButtons.MouseOverClose)
+                    state = ThemeWindowStates.ButtonHot;
+                theme.DrawBackground(g, part, state, m_SystemButtons.CloseButtonRect);
+                return;
+            }
+
+            if (m_ItemContainer.EffectiveStyle == eDotNetBarStyle.Office2000)
+            {
+                ButtonState state = ButtonState.Normal;
+                if (m_SystemButtons.MouseDownClose)
+                    state = ButtonState.Pushed;
+                ControlPaint.DrawCaptionButton(g, m_SystemButtons.CloseButtonRect, CaptionButton.Close, state);
+            }
+            else
+            {
+                Pen pen = null;
+
+                if (m_SystemButtons.MouseDownClose)
+                {
+                    if (pa.Colors.ItemPressedBackground2.IsEmpty)
+                        DisplayHelp.FillRectangle(g, m_SystemButtons.CloseButtonRect, pa.Colors.ItemPressedBackground);
+                    else
+                    {
+                        System.Drawing.Drawing2D.LinearGradientBrush gradient = BarFunctions.CreateLinearGradientBrush(m_SystemButtons.CloseButtonRect, pa.Colors.ItemPressedBackground, pa.Colors.ItemPressedBackground2, pa.Colors.ItemPressedBackgroundGradientAngle);
+                        g.FillRectangle(gradient, m_SystemButtons.CloseButtonRect);
+                        gradient.Dispose();
+                    }
+                    using (Pen p1 = new Pen(pa.Colors.ItemPressedBorder))
+                        NativeFunctions.DrawRectangle(g, p1, m_SystemButtons.CloseButtonRect);
+                }
+                else if (m_SystemButtons.MouseOverClose)
+                {
+                    pen = new Pen(pa.Colors.ItemHotText); //SystemPens.ControlText;
+                    if (!pa.Colors.ItemHotBackground2.IsEmpty)
+                    {
+                        System.Drawing.Drawing2D.LinearGradientBrush gradient = BarFunctions.CreateLinearGradientBrush(m_SystemButtons.CloseButtonRect, pa.Colors.ItemHotBackground, pa.Colors.ItemHotBackground2, pa.Colors.ItemHotBackgroundGradientAngle);
+                        g.FillRectangle(gradient, m_SystemButtons.CloseButtonRect);
+                        gradient.Dispose();
+                    }
+                    else
+                        DisplayHelp.FillRectangle(g, m_SystemButtons.CloseButtonRect, pa.Colors.ItemHotBackground);
+                    pen.Dispose();
+                    pen = null;
+                    using (Pen p1 = new Pen(pa.Colors.ItemHotBorder))
+                        NativeFunctions.DrawRectangle(g, p1, m_SystemButtons.CloseButtonRect);
+                }
+
+                if (m_GrabHandleStyle == eGrabHandleStyle.CaptionTaskPane || m_GrabHandleStyle == eGrabHandleStyle.CaptionDotted)
+                    pen = new Pen(pa.Colors.ItemText, Dpi.Width1);
+                else
+                    pen = new Pen(((m_HasFocus || this.LayoutType == eLayoutType.Toolbar) ? pa.Colors.BarCaptionText : pa.Colors.BarCaptionInactiveText));
+                if (m_SystemButtons.MouseOverClose)
+                    pen = new Pen(pa.Colors.ItemHotText, Dpi.Width1);
+                else if (m_SystemButtons.MouseDownClose)
+                    pen = new Pen(pa.Colors.ItemPressedText, Dpi.Width1);
+                else if (!m_CaptionForeColor.IsEmpty)
+                    pen = new Pen(m_CaptionForeColor, Dpi.Width1);
+                else if (!m_HasFocus && m_BarState != eBarState.Floating && m_GrabHandleStyle != eGrabHandleStyle.CaptionTaskPane && m_GrabHandleStyle != eGrabHandleStyle.CaptionDotted)
+                    pen = new Pen(pa.Colors.BarCaptionInactiveText, Dpi.Width1);
+
+                Point[] p = new Point[2];
+                Rectangle rect = m_SystemButtons.CloseButtonRect;
+                rect.Inflate(-1, -1);
+                p[0].X = rect.Left + Dpi.Width2;
+                p[0].Y = rect.Top + Dpi.Height3;
+                p[1].X = rect.Right - Dpi.Width4;
+                p[1].Y = rect.Bottom - Dpi.Height4;
+                g.DrawLine(pen, p[0], p[1]);
+                p[0].X++;
+                p[1].X++;
+                g.DrawLine(pen, p[0], p[1]);
+
+                p[0].X = rect.Right - Dpi.Width3;
+                p[0].Y = rect.Top + Dpi.Height3;
+                p[1].X = rect.Left + Dpi.Width3;
+                p[1].Y = rect.Bottom - Dpi.Height4;
+                g.DrawLine(pen, p[0], p[1]);
+                p[0].X--;
+                p[1].X--;
+                g.DrawLine(pen, p[0], p[1]);
+                pen.Dispose();
+            }
+        }
+        private void PaintMaximizeButton(ItemPaintArgs pa)
+        {
+            if (m_SystemButtons.MaximizeButtonRect.IsEmpty)
+                return;
+
+            Graphics g = pa.Graphics;
+
+            if (this.DrawThemedCaption)
+            {
+                ThemeWindow theme = this.ThemeWindow;
+                ThemeWindowParts part = ThemeWindowParts.SmallMaxCaption;
+                ThemeWindowStates state = ThemeWindowStates.ButtonNormal;
+                if (m_SystemButtons.MouseDownMaximize)
+                    state = ThemeWindowStates.ButtonPushed;
+                else if (m_SystemButtons.MouseOverMaximize)
+                    state = ThemeWindowStates.ButtonHot;
+                theme.DrawBackground(g, part, state, m_SystemButtons.MaximizeButtonRect);
+                return;
+            }
+
+            if (m_ItemContainer.EffectiveStyle == eDotNetBarStyle.Office2000)
+            {
+                ButtonState state = ButtonState.Normal;
+                if (m_SystemButtons.MouseDownMaximize)
+                    state = ButtonState.Pushed;
+                ControlPaint.DrawCaptionButton(g, m_SystemButtons.MaximizeButtonRect, CaptionButton.Maximize, state);
+            }
+            else
+            {
+                Pen pen = null;
+
+                if (m_SystemButtons.MouseDownMaximize)
+                {
+                    if (pa.Colors.ItemPressedBackground2.IsEmpty)
+                        DisplayHelp.FillRectangle(g, m_SystemButtons.MaximizeButtonRect, pa.Colors.ItemPressedBackground);
+                    else
+                    {
+                        System.Drawing.Drawing2D.LinearGradientBrush gradient = BarFunctions.CreateLinearGradientBrush(m_SystemButtons.MaximizeButtonRect, pa.Colors.ItemPressedBackground, pa.Colors.ItemPressedBackground2, pa.Colors.ItemPressedBackgroundGradientAngle);
+                        g.FillRectangle(gradient, m_SystemButtons.CloseButtonRect);
+                        gradient.Dispose();
+                    }
+                    using (Pen p1 = new Pen(pa.Colors.ItemPressedBorder))
+                        NativeFunctions.DrawRectangle(g, p1, m_SystemButtons.MaximizeButtonRect);
+                }
+                else if (m_SystemButtons.MouseOverMaximize)
+                {
+                    pen = new Pen(pa.Colors.ItemHotText); //SystemPens.ControlText;
+                    if (!pa.Colors.ItemHotBackground2.IsEmpty)
+                    {
+                        System.Drawing.Drawing2D.LinearGradientBrush gradient = BarFunctions.CreateLinearGradientBrush(m_SystemButtons.MaximizeButtonRect, pa.Colors.ItemHotBackground, pa.Colors.ItemHotBackground2, pa.Colors.ItemHotBackgroundGradientAngle);
+                        g.FillRectangle(gradient, m_SystemButtons.MaximizeButtonRect);
+                        gradient.Dispose();
+                    }
+                    else
+                        DisplayHelp.FillRectangle(g, m_SystemButtons.MaximizeButtonRect, pa.Colors.ItemHotBackground);
+                    pen.Dispose();
+                    pen = null;
+                    using (Pen p1 = new Pen(pa.Colors.ItemHotBorder))
+                        NativeFunctions.DrawRectangle(g, p1, m_SystemButtons.MaximizeButtonRect);
+                }
+
+                SolidBrush brush=null;
+                if (m_GrabHandleStyle == eGrabHandleStyle.CaptionTaskPane || m_GrabHandleStyle == eGrabHandleStyle.CaptionDotted)
+                    brush = new SolidBrush(pa.Colors.ItemText);
+                else
+                    brush = new SolidBrush(((m_HasFocus || this.LayoutType == eLayoutType.Toolbar) ? pa.Colors.BarCaptionText : pa.Colors.BarCaptionInactiveText));
+                if (m_SystemButtons.MouseOverMaximize)
+                    brush = new SolidBrush(pa.Colors.ItemHotText);
+                else if (m_SystemButtons.MouseDownMaximize)
+                    brush = new SolidBrush(pa.Colors.ItemPressedText);
+                else if (!m_CaptionForeColor.IsEmpty)
+                    brush = new SolidBrush(m_CaptionForeColor);
+                else if (!m_HasFocus && m_BarState != eBarState.Floating && m_GrabHandleStyle != eGrabHandleStyle.CaptionTaskPane && m_GrabHandleStyle != eGrabHandleStyle.CaptionDotted)
+                    brush = new SolidBrush(pa.Colors.BarCaptionInactiveText);
+
+                
+                Rectangle rect = m_SystemButtons.MaximizeButtonRect;
+                rect.Inflate(-1, -1);
+                Region oldClip = g.Clip;
+                if (_IsMaximized)
+                {
+                    Rectangle rMax = new Rectangle(rect.X + (rect.Width - Dpi.Width10) / 2 + Dpi.Width3, rect.Y + (rect.Height - Dpi.Height10) / 2, Dpi.Width7, Dpi.Height7);
+                    g.SetClip(new Rectangle(rMax.X + Dpi.Width1, rMax.Y + Dpi.Height2, rMax.Width - Dpi.Width2, rMax.Height - Dpi.Height3), CombineMode.Exclude);
+                    rMax.Offset(-Dpi.Width3, Dpi.Height3);
+                    g.SetClip(new Rectangle(rMax.X + Dpi.Width1, rMax.Y + Dpi.Height2, rMax.Width - Dpi.Width2, rMax.Height - Dpi.Height3), CombineMode.Exclude);
+                    rMax.Offset(Dpi.Width3, -Dpi.Height3);
+                    g.FillRectangle(brush, rMax);
+                    g.Clip = oldClip;
+                    rMax.Offset(-Dpi.Width3, Dpi.Height3);
+                    g.SetClip(new Rectangle(rMax.X + Dpi.Width1, rMax.Y + Dpi.Height2, rMax.Width - Dpi.Width2, rMax.Height - Dpi.Height3), CombineMode.Exclude);
+                    g.FillRectangle(brush, rMax);
+                }
+                else
+                {
+                    Rectangle rMax = new Rectangle(rect.X + (rect.Width - Dpi.Width9) / 2, rect.Y + (rect.Height - Dpi.Height9) / 2, Dpi.Width9, Dpi.Height9);
+                    g.SetClip(new Rectangle(rMax.X + Dpi.Width1, rMax.Y + Dpi.Height3, rMax.Width - Dpi.Width2, rMax.Height - Dpi.Height4), CombineMode.Exclude);
+                    g.FillRectangle(brush, rMax);
+                }
+                g.Clip = oldClip;
+                if (oldClip != null) oldClip.Dispose();
+                brush.Dispose();
+            }
+        }
+        private void PaintCaptionButton()
+        {
+            this.Invalidate(m_SystemButtons.CaptionButtonRect);
+            this.Update();
+        }
+        private void PaintCaptionButton(ItemPaintArgs pa)
+        {
+            if (m_SystemButtons.CaptionButtonRect.IsEmpty)
+                return;
+
+            Rectangle rect = m_SystemButtons.CaptionButtonRect;
+            Graphics g = pa.Graphics;
+
+            if (m_ItemContainer.EffectiveStyle == eDotNetBarStyle.Office2000)
+            {
+                ButtonState state = ButtonState.Normal;
+                if (m_SystemButtons.MouseDownCaption)
+                    state = ButtonState.Pushed;
+                ControlPaint.DrawButton(g, rect, state);
+            }
+            else
+            {
+                if (m_CaptionMenu != null && m_CaptionMenu.Expanded)
+                {
+                    if (pa.Colors.ItemExpandedBackground2.IsEmpty)
+                        DisplayHelp.FillRectangle(g, rect, pa.Colors.ItemExpandedBackground);
+                    else
+                    {
+                        System.Drawing.Drawing2D.LinearGradientBrush gradient = BarFunctions.CreateLinearGradientBrush(rect, pa.Colors.ItemExpandedBackground, pa.Colors.ItemExpandedBackground2, pa.Colors.ItemExpandedBackgroundGradientAngle);
+                        g.FillRectangle(gradient, rect);
+                        gradient.Dispose();
+                    }
+                    using (Pen p1 = new Pen(pa.Colors.ItemExpandedBorder))
+                        NativeFunctions.DrawRectangle(g, p1, rect);
+                }
+                else if (m_SystemButtons.MouseDownCaption)
+                {
+                    if (pa.Colors.ItemPressedBackground2.IsEmpty)
+                        DisplayHelp.FillRectangle(g, rect, pa.Colors.ItemPressedBackground);
+                    else
+                    {
+                        System.Drawing.Drawing2D.LinearGradientBrush gradient = BarFunctions.CreateLinearGradientBrush(rect, pa.Colors.ItemPressedBackground, pa.Colors.ItemPressedBackground2, pa.Colors.ItemPressedBackgroundGradientAngle);
+                        g.FillRectangle(gradient, rect);
+                        gradient.Dispose();
+                    }
+                    using (Pen p1 = new Pen(pa.Colors.ItemPressedBorder))
+                        NativeFunctions.DrawRectangle(g, p1, rect);
+                }
+                else if (m_SystemButtons.MouseOverCaption)
+                {
+                    Pen pen = new Pen(pa.Colors.ItemHotText);
+                    if (!pa.Colors.ItemHotBackground2.IsEmpty)
+                    {
+                        System.Drawing.Drawing2D.LinearGradientBrush gradient = BarFunctions.CreateLinearGradientBrush(rect, pa.Colors.ItemHotBackground, pa.Colors.ItemHotBackground2, pa.Colors.ItemHotBackgroundGradientAngle);
+                        g.FillRectangle(gradient, rect);
+                        gradient.Dispose();
+                    }
+                    else
+                        DisplayHelp.FillRectangle(g, rect, pa.Colors.ItemHotBackground);
+                    using (Pen p1 = new Pen(pa.Colors.ItemHotBorder))
+                        NativeFunctions.DrawRectangle(g, p1, rect);
+                }
+            }
+            SolidBrush brush = null;
+            Color textColor = pa.Colors.ItemText;
+
+            if (m_SystemButtons.MouseOverCaption)
+                textColor = pa.Colors.ItemHotText;
+            else if (m_SystemButtons.MouseDownCaption)
+                textColor = pa.Colors.ItemPressedText;
+            else if (!m_CaptionForeColor.IsEmpty)
+                textColor = m_CaptionForeColor;
+            else
+                textColor = pa.Colors.ItemText;
+            brush = new SolidBrush(textColor);
+            eTextFormat format = eTextFormat.Default | eTextFormat.VerticalCenter | eTextFormat.EndEllipsis | eTextFormat.SingleLine;
+            Rectangle rText = rect;
+            rText.Width -= Dpi.Width12;
+            rText.X += Dpi.Width3;
+            if (rText.Width > Dpi.Width8)
+                TextDrawing.DrawString(g, this.Text, this.Font, textColor, rText, format);
+
+            Point[] p = new Point[3];
+            p[0].X = rect.Right - Dpi.Width9;
+            p[0].Y = rect.Top + (rect.Height + Dpi.Height6) / 2;
+            p[1].X = p[0].X - Dpi.Width4;
+            p[1].Y = p[0].Y - Dpi.Height5;
+            p[2].X = p[1].X + Dpi.Width9;
+            p[2].Y = p[1].Y;
+            g.FillPolygon(brush, p);
+
+            brush.Dispose();
+        }
+        private void PaintCustomizeButton()
+        {
+            this.Invalidate(m_SystemButtons.CustomizeButtonRect);
+            this.Update();
+        }
+        private void PaintCustomizeButton(ItemPaintArgs pa)
+        {
+            if (m_SystemButtons.CustomizeButtonRect.IsEmpty)
+                return;
+            Graphics g = pa.Graphics;
+            Brush brush = new SolidBrush(((m_HasFocus || this.LayoutType == eLayoutType.Toolbar) ? pa.Colors.BarCaptionText : pa.Colors.BarCaptionInactiveText));
+
+            if (!this.DrawThemedCaption)
+            {
+                if (m_ItemContainer.EffectiveStyle == eDotNetBarStyle.Office2000)
+                {
+                    Point[] p1 = new Point[3];
+                    p1[0].X = m_SystemButtons.CustomizeButtonRect.X + Dpi.Width4;
+                    p1[0].Y = m_SystemButtons.CustomizeButtonRect.Y + Dpi.Height8;
+                    p1[1].X = p1[0].X - Dpi.Width3;
+                    p1[1].Y = p1[0].Y - Dpi.Height4;
+                    p1[2].X = p1[1].X + Dpi.Width7;
+                    p1[2].Y = p1[1].Y;
+                    g.FillPolygon(SystemBrushes.ActiveCaptionText, p1);
+                    brush.Dispose();
+                    return;
+                }
+                else
+                {
+                    if (!m_CaptionForeColor.IsEmpty)
+                    {
+                        brush.Dispose();
+                        brush = new SolidBrush(m_CaptionForeColor);
+                    }
+                    if (!m_HasFocus && m_BarState != eBarState.Floating)
+                    {
+                        brush.Dispose();
+                        brush = new SolidBrush(pa.Colors.BarCaptionInactiveText);
+                    }
+
+                    if (m_SystemButtons.MouseDownCustomize)
+                    {
+                        if (pa.Colors.ItemPressedBackground2.IsEmpty)
+                        {
+                            using (SolidBrush b = new SolidBrush(pa.Colors.ItemPressedBackground))
+                                g.FillRectangle(b, m_SystemButtons.CustomizeButtonRect);
+                        }
+                        else
+                        {
+                            System.Drawing.Drawing2D.LinearGradientBrush gradient = BarFunctions.CreateLinearGradientBrush(m_SystemButtons.CustomizeButtonRect, pa.Colors.ItemPressedBackground, pa.Colors.ItemPressedBackground2, pa.Colors.ItemPressedBackgroundGradientAngle);
+                            g.FillRectangle(gradient, m_SystemButtons.CustomizeButtonRect);
+                            gradient.Dispose();
+                        }
+                        using (Pen p1 = new Pen(pa.Colors.ItemPressedBorder))
+                            NativeFunctions.DrawRectangle(g, p1, m_SystemButtons.CustomizeButtonRect);
+                    }
+                    else if (m_SystemButtons.MouseOverCustomize)
+                    {
+                        brush.Dispose();
+                        brush = new SolidBrush(pa.Colors.BarCaptionText); // SystemBrushes.ControlText;
+                        if (!pa.Colors.ItemHotBackground2.IsEmpty)
+                        {
+                            System.Drawing.Drawing2D.LinearGradientBrush gradient = BarFunctions.CreateLinearGradientBrush(m_SystemButtons.CustomizeButtonRect, pa.Colors.ItemHotBackground, pa.Colors.ItemHotBackground2, pa.Colors.ItemHotBackgroundGradientAngle);
+                            g.FillRectangle(gradient, m_SystemButtons.CustomizeButtonRect);
+                            gradient.Dispose();
+                        }
+                        else
+                        {
+                            using (SolidBrush b = new SolidBrush(pa.Colors.ItemHotBackground))
+                                g.FillRectangle(b, m_SystemButtons.CustomizeButtonRect);
+                        }
+                        using (Pen p1 = new Pen(pa.Colors.ItemHotBorder, Dpi.Width1))
+                            NativeFunctions.DrawRectangle(g, p1, m_SystemButtons.CustomizeButtonRect);
+                    }
+                }
+            }
+
+            if (m_GrabHandleStyle == eGrabHandleStyle.CaptionTaskPane || m_GrabHandleStyle == eGrabHandleStyle.CaptionDotted)
+            {
+                brush.Dispose();
+                brush = new SolidBrush(pa.Colors.ItemText);
+            }
+            else
+            {
+                brush.Dispose();
+                brush = new SolidBrush(((m_HasFocus || this.LayoutType == eLayoutType.Toolbar) ? pa.Colors.BarCaptionText : pa.Colors.BarCaptionInactiveText));
+            }
+            if (m_SystemButtons.MouseOverCustomize)
+            {
+                brush.Dispose();
+                brush = new SolidBrush(pa.Colors.ItemHotText);
+            }
+            else if (m_SystemButtons.MouseDownCustomize)
+            {
+                brush.Dispose();
+                brush = new SolidBrush(pa.Colors.ItemPressedText);
+            }
+            else if (!m_CaptionForeColor.IsEmpty)
+            {
+                brush.Dispose();
+                brush = new SolidBrush(m_CaptionForeColor);
+            }
+            else if (!m_HasFocus && m_BarState != eBarState.Floating && m_GrabHandleStyle != eGrabHandleStyle.CaptionTaskPane && m_GrabHandleStyle != eGrabHandleStyle.CaptionDotted)
+            {
+                brush.Dispose();
+                brush = new SolidBrush(pa.Colors.BarCaptionInactiveText);
+            }
+
+            Point[] p = new Point[3];
+            p[0].X = m_SystemButtons.CustomizeButtonRect.Right - Dpi.Width7;
+            p[0].Y = m_SystemButtons.CustomizeButtonRect.Top + Dpi.Height8;
+            p[1].X = p[0].X - Dpi.Width3;
+            p[1].Y = p[0].Y - Dpi.Height4;
+            p[2].X = p[1].X + Dpi.Width7;
+            p[2].Y = p[1].Y;
+            g.FillPolygon(brush, p);
+            brush.Dispose();
+        }
+        private void PaintAutoHideButton()
+        {
+            if (!m_SystemButtons.AutoHideButtonRect.IsEmpty)
+            {
+                Rectangle r = m_SystemButtons.AutoHideButtonRect;
+                r.Inflate(1, 1);
+                this.Invalidate(r);
+                this.Update();
+            }
+        }
+        private void PaintAutoHideButton(ItemPaintArgs pa)
+        {
+            if (m_SystemButtons.AutoHideButtonRect.IsEmpty)
+                return;
+
+            Graphics g = pa.Graphics;
+
+            if (this.DrawThemedCaption)
+            {
+                Image img = null;
+                if (m_SystemButtons.MouseDownAutoHide && !this.AutoHide || this.AutoHide && !m_SystemButtons.MouseDownAutoHide)
+                {
+                    if (m_SystemButtons.MouseOverAutoHide)
+                        img = BarFunctions.LoadBitmap("SystemImages.Pin.png");
+                    else
+                        img = BarFunctions.LoadBitmap("SystemImages.PinInactive.png");
+                    g.DrawImage(img, m_SystemButtons.AutoHideButtonRect.X + (m_SystemButtons.AutoHideButtonRect.Width - img.Width) / 2, m_SystemButtons.AutoHideButtonRect.Y + (m_SystemButtons.AutoHideButtonRect.Height - img.Height) / 2, img.Width, img.Height);
+                }
+                else
+                {
+                    if (m_SystemButtons.MouseOverAutoHide)
+                        img = BarFunctions.LoadBitmap("SystemImages.PinPushed.png");
+                    else
+                        img = BarFunctions.LoadBitmap("SystemImages.PinPushedInactive.png");
+                    g.DrawImage(img, m_SystemButtons.AutoHideButtonRect.X + (m_SystemButtons.AutoHideButtonRect.Width - img.Width) / 2, m_SystemButtons.AutoHideButtonRect.Y + (m_SystemButtons.AutoHideButtonRect.Height - img.Height) / 2, img.Width, img.Height);
+                }
+                return;
+            }
+
+
+            if (m_ItemContainer.EffectiveStyle == eDotNetBarStyle.Office2000)
+            {
+                Rectangle r = m_SystemButtons.AutoHideButtonRect;
+                r.Inflate(1, 0);
+                if (m_SystemButtons.MouseDownAutoHide)
+                {
+                    ControlPaint.DrawBorder3D(g, r, Border3DStyle.SunkenInner, Border3DSide.All);
+                }
+                else
+                {
+                    ControlPaint.DrawBorder3D(g, r, Border3DStyle.Raised, Border3DSide.All);
+                }
+            }
+            else
+            {
+                if (m_SystemButtons.MouseDownAutoHide)
+                {
+                    if (pa.Colors.ItemPressedBackground2.IsEmpty)
+                        DisplayHelp.FillRectangle(g, m_SystemButtons.AutoHideButtonRect, pa.Colors.ItemPressedBackground);
+                    else
+                    {
+                        System.Drawing.Drawing2D.LinearGradientBrush gradient = BarFunctions.CreateLinearGradientBrush(m_SystemButtons.AutoHideButtonRect, pa.Colors.ItemPressedBackground, pa.Colors.ItemPressedBackground2, pa.Colors.ItemPressedBackgroundGradientAngle);
+                        g.FillRectangle(gradient, m_SystemButtons.AutoHideButtonRect);
+                        gradient.Dispose();
+                    }
+                    using (Pen p1 = new Pen(pa.Colors.ItemPressedBorder))
+                        NativeFunctions.DrawRectangle(g, p1, m_SystemButtons.AutoHideButtonRect);
+                }
+                else if (m_SystemButtons.MouseOverAutoHide)
+                {
+                    if (!pa.Colors.ItemHotBackground2.IsEmpty)
+                    {
+                        System.Drawing.Drawing2D.LinearGradientBrush gradient = BarFunctions.CreateLinearGradientBrush(m_SystemButtons.AutoHideButtonRect, pa.Colors.ItemHotBackground, pa.Colors.ItemHotBackground2, pa.Colors.ItemHotBackgroundGradientAngle);
+                        g.FillRectangle(gradient, m_SystemButtons.AutoHideButtonRect);
+                        gradient.Dispose();
+                    }
+                    else
+                        DisplayHelp.FillRectangle(g, m_SystemButtons.AutoHideButtonRect, pa.Colors.ItemHotBackground);
+                    using (Pen p1 = new Pen(pa.Colors.ItemHotBorder))
+                        NativeFunctions.DrawRectangle(g, p1, m_SystemButtons.AutoHideButtonRect);
+                }
+            }
+            if (m_SystemButtons.MouseDownAutoHide && !this.AutoHide || this.AutoHide && !m_SystemButtons.MouseDownAutoHide)
+            {
+                Rectangle r = new Rectangle(m_SystemButtons.AutoHideButtonRect.X + (m_SystemButtons.AutoHideButtonRect.Width - Dpi.Width10) / 2, m_SystemButtons.AutoHideButtonRect.Y + (m_SystemButtons.AutoHideButtonRect.Height - Dpi.Height7) / 2, Dpi.Width10, Dpi.Height7);
+
+                Pen pen = null;
+                if (m_GrabHandleStyle == eGrabHandleStyle.CaptionTaskPane || m_GrabHandleStyle == eGrabHandleStyle.CaptionDotted)
+                    pen = new Pen(pa.Colors.ItemText, Dpi.Width1);
+                else
+                    pen = new Pen(((m_HasFocus || this.LayoutType == eLayoutType.Toolbar) ? pa.Colors.BarCaptionText : pa.Colors.BarCaptionInactiveText));
+                if (m_SystemButtons.MouseOverAutoHide)
+                    pen = new Pen(pa.Colors.ItemHotText, Dpi.Width1);
+                else if (m_SystemButtons.MouseDownAutoHide)
+                    pen = new Pen(pa.Colors.ItemPressedText, Dpi.Width1);
+                else if (!m_CaptionForeColor.IsEmpty)
+                    pen = new Pen(m_CaptionForeColor, Dpi.Width1);
+                else if (!m_HasFocus && m_BarState != eBarState.Floating && m_GrabHandleStyle != eGrabHandleStyle.CaptionTaskPane && m_GrabHandleStyle != eGrabHandleStyle.CaptionDotted)
+                    pen = new Pen(pa.Colors.BarCaptionInactiveText, Dpi.Width1);
+
+                g.DrawRectangle(pen, r.X + Dpi.Width4, r.Y + Dpi.Height1, Dpi.Width5, Dpi.Height4);
+                g.DrawLine(pen, r.X + Dpi.Width4, r.Y + Dpi.Height4, r.X + Dpi.Width9, r.Y + Dpi.Height4);
+                g.DrawLine(pen, r.X + Dpi.Width4, r.Y, r.X + Dpi.Width4, r.Y + Dpi.Height6);
+                g.DrawLine(pen, r.X, r.Y + Dpi.Height3, r.X + Dpi.Width3, r.Y + Dpi.Height3);
+            }
+            else
+            {
+                Rectangle r = new Rectangle(m_SystemButtons.AutoHideButtonRect.X + (m_SystemButtons.AutoHideButtonRect.Width - Dpi.Width7) / 2, m_SystemButtons.AutoHideButtonRect.Y + (m_SystemButtons.AutoHideButtonRect.Height - Dpi.Height9) / 2, Dpi.Width7, Dpi.Height9);
+
+                Pen pen = null;
+                if (m_GrabHandleStyle == eGrabHandleStyle.CaptionTaskPane || m_GrabHandleStyle == eGrabHandleStyle.CaptionDotted)
+                    pen = new Pen(pa.Colors.ItemText, Dpi.Width1);
+                else
+                    pen = new Pen(((m_HasFocus || this.LayoutType == eLayoutType.Toolbar) ? pa.Colors.BarCaptionText : pa.Colors.BarCaptionInactiveText), Dpi.Width1);
+                if (m_SystemButtons.MouseOverAutoHide)
+                    pen = new Pen(pa.Colors.ItemHotText, Dpi.Width1);
+                else if (m_SystemButtons.MouseDownAutoHide)
+                    pen = new Pen(pa.Colors.ItemPressedText, Dpi.Width1);
+                else if (!m_CaptionForeColor.IsEmpty)
+                    pen = new Pen(m_CaptionForeColor, Dpi.Width1);
+                else if (!m_HasFocus && m_BarState != eBarState.Floating && m_GrabHandleStyle != eGrabHandleStyle.CaptionTaskPane && m_GrabHandleStyle != eGrabHandleStyle.CaptionDotted)
+                    pen = new Pen(pa.Colors.BarCaptionInactiveText, Dpi.Width1);
+
+                g.DrawRectangle(pen, r.X + Dpi.Width1, r.Y, Dpi.Width4, Dpi.Height5);
+                g.DrawLine(pen, r.X + Dpi.Width4, r.Y, r.X + Dpi.Width4, r.Y + Dpi.Height5);
+                g.DrawLine(pen, r.X, r.Y + Dpi.Height5, r.X + Dpi.Width6, r.Y + Dpi.Height5);
+                g.DrawLine(pen, r.X + Dpi.Width3, r.Y + Dpi.Height5, r.X + Dpi.Width3, r.Y + Dpi.Height8);
+            }
+        }
+
+        /// <summary>
+        /// Paints bar side bar.
+        /// </summary>
+        /// <param name="g">Reference to graphics object.</param>
+        internal void PaintSideBar(Graphics g)
+        {
+            if (m_SideBarImage.Picture == null || m_BarState != eBarState.Popup)
+                return;
+
+            if (!m_SideBarImage.GradientColor1.IsEmpty && !m_SideBarImage.GradientColor2.IsEmpty)
+            {
+                System.Drawing.Drawing2D.LinearGradientBrush lgb = BarFunctions.CreateLinearGradientBrush(m_SideBarRect, m_SideBarImage.GradientColor1, m_SideBarImage.GradientColor2, m_SideBarImage.GradientAngle);
+                g.FillRectangle(lgb, m_SideBarRect);
+            }
+            else if (!m_SideBarImage.BackColor.Equals(Color.Empty))
+                DisplayHelp.FillRectangle(g, m_SideBarRect, m_SideBarImage.BackColor);
+
+            if (m_SideBarImage.StretchPicture)
+            {
+                g.DrawImage(m_SideBarImage.Picture, m_SideBarRect);
+            }
+            else
+            {
+                if (m_SideBarImage.Alignment == eAlignment.Top)
+                    g.DrawImage(m_SideBarImage.Picture, m_SideBarRect.X, m_SideBarRect.Top, m_SideBarRect.Width, m_SideBarImage.Picture.Height);
+                else if (m_SideBarImage.Alignment == eAlignment.Bottom)
+                    g.DrawImage(m_SideBarImage.Picture, m_SideBarRect.Left, m_SideBarRect.Bottom - m_SideBarImage.Picture.Height, m_SideBarImage.Picture.Width, m_SideBarImage.Picture.Height);
+                else
+                    g.DrawImage(m_SideBarImage.Picture, m_SideBarRect.Left, m_SideBarRect.Top + (m_SideBarRect.Height - m_SideBarImage.Picture.Height) / 2, m_SideBarImage.Picture.Width, m_SideBarImage.Picture.Height);
+            }
+        }
+
+        internal BaseItem ParentInternal
+        {
+            get
+            {
+                return m_ParentItem;
+            }
+        }
+
+        /// <summary>
+        /// Gets/Sets the parent item of the Bar. The parents item sub-items are displayed on the bar.
+        /// </summary>
+        [System.ComponentModel.Browsable(false)]
+        public BaseItem ParentItem
+        {
+            get
+            {
+                if (m_ParentItem != null)
+                    return m_ParentItem;
+                return m_ItemContainer;
+            }
+            set
+            {
+                RestoreContainer();
+
+                if (m_ItemContainer.SubItems.Count > 0)
+                    m_ItemContainer.SubItems.Clear();
+
+                m_ParentItem = value;
+
+                if (m_ParentItem == null || m_ParentItem.SubItems.Count == 0)
+                    return;
+
+                m_ItemContainer.Style = m_ParentItem.Style;
+
+                BaseItem objTmp = m_ParentItem.SubItems[0];
+                if (objTmp != null)
+                    m_OldContainer = objTmp.ContainerControl;
+                else
+                    m_OldContainer = null;
+
+                m_ItemContainer.SubItems.AllowParentRemove = false;
+                foreach (BaseItem objItem in m_ParentItem.SubItems)
+                {
+                    objItem.ContainerControl = this;
+                    m_ItemContainer.SubItems.Add(objItem);
+                }
+                m_ItemContainer.SubItems.AllowParentRemove = true;
+
+                // Get the parent's screen position
+                if (m_ParentItem.Displayed)
+                {
+                    System.Windows.Forms.Control objCtrl = m_ParentItem.ContainerControl as System.Windows.Forms.Control;
+                    if (BaseItem.IsHandleValid(objCtrl))
+                    {
+                        m_ParentItemScreenPos = objCtrl.PointToScreen(new Point(m_ParentItem.LeftInternal, m_ParentItem.TopInternal));
+                        objCtrl = null;
+                    }
+                }
+            }
+        }
+
+        private void SetupRegion()
+        {
+            if (m_BarState != eBarState.Popup)
+                return;
+
+            Rectangle r = new Rectangle(0, 0, this.Width, this.Height);
+            System.Drawing.Region rgn = new System.Drawing.Region(r);
+            r.X = this.Width - 2;
+            r.Y = 0;
+            r.Width = 2;
+            r.Height = 2;
+            rgn.Xor(r);
+            r.X = 0;
+            r.Y = this.Height - 2;
+            r.Width = 2;
+            r.Height = 2;
+            rgn.Xor(r);
+            this.Region = rgn;
+        }
+
+        private void SetRoundRegion(Control c)
+        {
+            Rectangle rectPath = c.ClientRectangle;
+            rectPath.Width--;
+            rectPath.Height--;
+            GraphicsPath path = DisplayHelp.GetRoundedRectanglePath(rectPath, m_CornerSize);
+            Region r = new Region();
+            r.MakeEmpty();
+            r.Union(path);
+            // Widen path for the border...
+            path.Widen(SystemPens.ControlText);
+            r.Union(path);
+            c.Region = r;
+        }
+
+        /// <summary>
+        /// Recalculates the layout of the Bar, resizes the Bar if necessary and repaints it.
+        /// </summary>
+        public void RecalcLayout()
+        {
+            if (m_LayoutSuspended || IsDisposing) return;
+
+            if (m_BarState == eBarState.Docked)
+            {
+                if (this.Parent != null && !PassiveBar)
+                {
+                    if (m_ItemContainer.LayoutType != eLayoutType.DockContainer)
+                        this.Invalidate(this.Region, true);
+
+                    if (this.Parent is DockSite)
+                        ((DockSite)this.Parent).RecalcLayout();
+                    else
+                    {
+                        RecalcSize();
+                        this.Refresh();
+                    }
+                    ResizeDockTab();
+                }
+            }
+            else
+            {
+                RecalcSize();
+                ResizeDockTab();
+                this.Refresh();
+            }
+        }
+
+        internal void OnDockContainerWidthChanged(DockContainerItem item, int width)
+        {
+            if (m_LayoutSuspended)
+                return;
+
+            if (this.DockSide == eDockSide.Document || this.Parent is DockSite && ((DockSite)this.Parent).DocumentDockContainer != null)
+            {
+                ((DockSite)this.DockedSite).GetDocumentUIManager().SetBarWidth(this, width + 2);
+            }
+            else if (m_BarState == eBarState.AutoHide)
+            {
+                m_ItemContainer.MinWidth = width;
+                m_LastDockSiteInfo.DockedWidth = width + 2;
+            }
+            //else
+            //{
+            //    m_ItemContainer.MinWidth=width+2;
+            //    if(this.AutoHide)
+            //        m_LastDockSiteInfo.DockedWidth=width+2;
+
+            //    ChangeSplitSize(new Size(width+2,0));
+
+            //    this.RecalcLayout();
+            //}
+        }
+
+        internal void OnDockContainerHeightChanged(DockContainerItem item, int height)
+        {
+            if (m_LayoutSuspended)
+                return;
+
+            if (this.DockSide == eDockSide.Document || this.Parent is DockSite && ((DockSite)this.Parent).DocumentDockContainer != null)
+            {
+                ((DockSite)this.DockedSite).GetDocumentUIManager().SetBarHeight(this, height + this.GetNonClientHeight());
+            }
+            else if (m_BarState == eBarState.AutoHide)
+            {
+                m_ItemContainer.MinHeight = height;
+                m_LastDockSiteInfo.DockedHeight = height + 2;
+            }
+            //else
+            //{
+            //    m_ItemContainer.MinHeight=height+2;
+            //    if(this.AutoHide)
+            //        m_LastDockSiteInfo.DockedHeight=height+2;
+
+            //    ChangeSplitSize(new Size(0,height+this.GetNonClientHeight())); // Accounts for caption size and border
+
+            //    this.RecalcLayout();
+            //}
+        }
+
+        internal void OnDockContainerMinimumSizeChanged(DockContainerItem item)
+        {
+            if (this.AutoHide)
+            {
+                m_LastDockSiteInfo.DockedHeight = 0;
+                m_LastDockSiteInfo.DockedWidth = 0;
+            }
+        }
+
+        private void ChangeSplitSize(System.Drawing.Size size)
+        {
+            // Support for resizing of the side-by-side docked bars i.e. on the same line
+            if (this.Parent != null && this.Parent.Controls.Count > 1)
+            {
+                Bar barLeft = null, barRight = null;
+
+                Bar previous = this.GetPreviousVisibleBar(this);
+                Bar next = this.GetNextVisibleBar(this);
+                if (next != null && next.LayoutType == eLayoutType.DockContainer && next.DockLine == this.DockLine)
+                {
+                    barLeft = this;
+                    barRight = next;
+                }
+                else if (previous != null && previous.LayoutType == eLayoutType.DockContainer && previous.DockLine == this.DockLine)
+                {
+                    barLeft = previous;
+                    barRight = this;
+                    if (size.Width > 0)
+                        size.Width = barLeft.Width + (barRight.Width - size.Width);
+                    if (size.Height > 0)
+                        size.Height = barLeft.Height + (barRight.Height - size.Height);
+                }
+
+                if (this.DockSide == eDockSide.Left || this.DockSide == eDockSide.Right)
+                {
+                    if (barLeft != null && barRight != null && barLeft.DockLine == barRight.DockLine)
+                    {
+                        System.Drawing.Size minLeftSize = barLeft.MinimumDockSize(eOrientation.Horizontal);
+                        System.Drawing.Size minThisSize = barRight.MinimumDockSize(eOrientation.Horizontal);
+                        int heightOffset = size.Height - barLeft.Height;
+                        if (size.Height >= minLeftSize.Height && barRight.Height - heightOffset >= minThisSize.Height)
+                        {
+                            Size oldLeftBarSize = barLeft.Size;
+                            Size oldSize = barRight.Size;
+                            Size newBarLeftSize = barLeft.RecalcSizeOnly(new Size(barLeft.Width, size.Height));
+                            Size newSize = barRight.RecalcSizeOnly(new Size(barRight.Width, barRight.Height - heightOffset));
+                            if (!oldLeftBarSize.Equals(newBarLeftSize) && !oldSize.Equals(newSize))
+                            {
+                                barRight.SplitDockHeight = 0;
+                                barLeft.SplitDockHeight = size.Height;
+                            }
+                        }
+                    }
+                    else
+                    {
+                        this.SplitDockHeight = 0;
+                        this.SplitDockWidth = 0;
+                    }
+                }
+                else if (this.DockSide == eDockSide.Top || this.DockSide == eDockSide.Bottom)
+                {
+                    if (barLeft != null && barRight != null && barLeft.DockLine == barRight.DockLine)
+                    {
+                        System.Drawing.Size minLeftSize = barLeft.MinimumDockSize(eOrientation.Horizontal);
+                        System.Drawing.Size minThisSize = barRight.MinimumDockSize(eOrientation.Horizontal);
+                        int widthOffset = size.Width - barLeft.Width;
+                        if (size.Width >= minLeftSize.Width && barRight.Width - widthOffset >= minThisSize.Width)
+                        {
+                            Size oldLeftBarSize = barLeft.Size;
+                            Size oldSize = barRight.Size;
+                            Size newBarLeftSize = barLeft.RecalcSizeOnly(new Size(size.Width, barLeft.Height));
+                            Size newSize = barRight.RecalcSizeOnly(new Size(barRight.Width - widthOffset, barRight.Height));
+                            if (!oldLeftBarSize.Equals(newBarLeftSize) && !oldSize.Equals(newSize))
+                            {
+                                barRight.SplitDockWidth = 0;
+                                barLeft.SplitDockWidth = size.Width;
+                            }
+                        }
+                    }
+                    else
+                    {
+                        this.SplitDockHeight = 0;
+                        this.SplitDockWidth = 0;
+                    }
+                }
+            }
+        }
+
+        internal int SplitDockHeight
+        {
+            get
+            {
+                if (this.Parent != null && m_SplitDockHeightPercent > 0)
+                {
+                    int height = ((this.Parent.Height * m_SplitDockHeightPercent) / 1000);
+                    Size sz = GetAdjustedFullSize(this.MinimumDockSize(eOrientation.Horizontal));
+                    if (height < sz.Height)
+                        height = sz.Height;
+                    return height;
+                }
+                return 0;
+            }
+            set
+            {
+                if (this.Parent != null && value > 0)
+                {
+                    if (value > this.Parent.Height)
+                        value = this.Parent.Height;
+                    m_SplitDockHeightPercent = (int)(((float)value / (float)this.Parent.Height) * 1000);
+                }
+                else
+                    m_SplitDockHeightPercent = 0;
+            }
+        }
+        internal int SplitDockWidth
+        {
+            get
+            {
+                if (this.Parent != null && m_SplitDockWidthPercent > 0)
+                {
+                    return ((this.Parent.Width * m_SplitDockWidthPercent) / 1000);
+                }
+                return 0;
+            }
+            set
+            {
+                if (this.Parent != null && value > 0)
+                {
+                    if (value > this.Parent.Width)
+                        value = this.Parent.Width;
+                    m_SplitDockWidthPercent = (int)(((float)value / (float)this.Parent.Width) * 1000);
+                }
+                else
+                    m_SplitDockWidthPercent = 0;
+            }
+        }
+
+        internal int MinHeight
+        {
+            get
+            {
+                if (m_ItemContainer.MinHeight > 0)
+                    return m_ItemContainer.MinHeight + GetNonClientHeight();
+                return 0;
+            }
+            set
+            {
+                if (m_ItemContainer == null) return;
+                if (value > 0)
+                    m_ItemContainer.MinHeight = value - GetNonClientHeight();
+                else
+                    m_ItemContainer.MinHeight = 0;
+            }
+        }
+        internal int GetNonClientHeight()
+        {
+            return GetGrabHandleCaptionHeight() + 2; // Caption + border
+        }
+
+        private bool m_RecalculatingSize = false; // Used to preven re-entrancy
+        /// <summary>
+        /// Recalculates the layout of the Bar and repaints it. This will not change the size of the Bar it will only force the recalculation of the size for each contained item and it will repaint the bar. To ensure that Bar is resized if necessary as well call RecalcLayout method.
+        /// </summary>
+        public void RecalcSize()
+        {
+            if (!BarFunctions.IsHandleValid(this))
+                return;
+
+            m_GrabHandleRect = Rectangle.Empty;
+            if (m_RecalculatingSize || m_ItemContainer == null)
+                return;
+            Form form = this.FindForm();
+            if (form != null && form.WindowState == FormWindowState.Minimized)
+                return;
+
+            m_RecalculatingSize = true;
+
+            if (this.LayoutType == eLayoutType.DockContainer && m_TabDockItems == null)
+                RefreshDockTab(false);
+
+            try
+            {
+                //m_ItemContainer.IsRightToLeft = (this.RightToLeft == RightToLeft.Yes);
+                if (m_BarState == eBarState.Docked)
+                {
+                    m_ItemContainer.WrapItems = m_WrapItemsDock;
+                    m_ItemContainer.Stretch = m_DockStretch;
+                }
+                else if (m_BarState == eBarState.Floating || m_BarState == eBarState.AutoHide)
+                {
+                    m_ItemContainer.WrapItems = m_WrapItemsFloat;
+                    if (m_ItemContainer.LayoutType == eLayoutType.DockContainer)
+                        m_ItemContainer.Stretch = m_DockStretch;
+                    else
+                        m_ItemContainer.Stretch = false;
+                }
+                else
+                {
+                    m_ItemContainer.WrapItems = true;
+                    m_ItemContainer.Stretch = false;
+                }
+
+                if (m_ItemContainer.EffectiveStyle == eDotNetBarStyle.Office2000)
+                {
+                    if (m_BarState == eBarState.Docked && !(this.Parent is DockSite))
+                    {
+                        System.Drawing.Size size = RecalcSizeOffice();
+                        if (m_ItemContainer.Orientation == eOrientation.Horizontal)
+                            this.Height = size.Height;
+                        else
+                            this.Width = size.Width;
+                    }
+                    else
+                        this.ClientSize = RecalcSizeOffice();
+                }
+                else
+                {
+                    if (m_BarState == eBarState.Docked && !(this.Parent is DockSite))
+                    {
+                        System.Drawing.Size size = RecalcSizeDotNet();
+                        if (m_ItemContainer.Orientation == eOrientation.Horizontal)
+                            this.Height = size.Height;
+                        else
+                            this.Width = size.Width;
+                    }
+                    else
+                        this.ClientSize = RecalcSizeDotNet();
+                }
+
+                if (m_DropShadow != null)
+                    NativeFunctions.SetWindowPos(m_DropShadow.Handle, new IntPtr(NativeFunctions.HWND_NOTOPMOST), this.Left + 5, this.Top + 5, this.Width - 2, this.Height - 2, NativeFunctions.SWP_SHOWWINDOW | NativeFunctions.SWP_NOACTIVATE);
+
+                if (m_BarState == eBarState.Docked)
+                {
+                    if (m_ItemContainer.Orientation == eOrientation.Horizontal)
+                        m_DockedSizeH = this.Size;
+                    else
+                        m_DockedSizeV = this.Size;
+                    RefreshOffice2003Region();
+                }
+                else if (this.Region != null)
+                    this.Region = null;
+                if (m_BarState == eBarState.Floating && !PassiveBar)
+                {
+                    m_Float.RefreshRegion(this.ClientSize);
+                    m_Float.ClientSize = this.ClientSize;
+                }
+            }
+            finally
+            {
+                m_RecalculatingSize = false;
+            }
+
+            if (this.LayoutType == eLayoutType.DockContainer && m_TabDockItems != null && this.DesignMode && this.Site != null)
+                RefreshDockTab(false);
+
+            OnItemLayoutUpdated(EventArgs.Empty);
+        }
+
+        /// <summary>
+        /// Occurs after internal item layout has been updated and items have valid bounds assigned.
+        /// </summary>
+        public event EventHandler ItemLayoutUpdated;
+        /// <summary>
+        /// Raises ItemLayoutUpdated event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnItemLayoutUpdated(EventArgs e)
+        {
+            EventHandler handler = ItemLayoutUpdated;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        private void RefreshOffice2003Region()
+        {
+            if (m_RoundCorners && IsGradientStyle && !this.MenuBar && this.LayoutType == eLayoutType.Toolbar && this.BarType == eBarType.Toolbar && !this.IsThemed && this.GrabHandleStyle != eGrabHandleStyle.ResizeHandle && this.BackColor != Color.Transparent)
+            {
+                System.Drawing.Drawing2D.GraphicsPath path = new System.Drawing.Drawing2D.GraphicsPath();
+                path.AddLine(0, 2, 2, 0);
+                path.AddLine(2, 0, this.Width - 2, 0);
+                path.AddLine(this.Width, 2, this.Width, this.Height - 3);
+                path.AddLine(this.Width - 3, this.Height, 3, this.Height);
+                path.AddLine(2, this.Height, 0, this.Height - 3);
+                this.Region = new Region(path);
+            }
+            else if (this.Region != null)
+                this.Region = null;
+        }
+
+        internal void RecalcSize(System.Drawing.Size frameSize)
+        {
+            m_GrabHandleRect = Rectangle.Empty;
+            if (m_RecalculatingSize || m_ItemContainer == null)
+                return;
+            m_RecalculatingSize = true;
+
+            try
+            //if(m_ItemContainer.SubItemsCount>0)
+            {
+                if (m_BarState == eBarState.Docked)
+                {
+                    m_ItemContainer.WrapItems = m_WrapItemsDock;
+                    m_ItemContainer.Stretch = m_DockStretch;
+                }
+                else if (m_BarState == eBarState.Floating || m_BarState == eBarState.AutoHide)
+                {
+                    m_ItemContainer.WrapItems = m_WrapItemsFloat;
+                    if (m_ItemContainer.LayoutType == eLayoutType.DockContainer)
+                        m_ItemContainer.Stretch = m_DockStretch;
+                    else
+                        m_ItemContainer.Stretch = false;
+                }
+                else
+                {
+                    m_ItemContainer.WrapItems = true;
+                    m_ItemContainer.Stretch = false;
+                }
+
+                if (m_ItemContainer.EffectiveStyle == eDotNetBarStyle.Office2000)
+                    this.ClientSize = RecalcSizeOffice(false, frameSize, m_ItemContainer.Orientation, m_BarState, m_ItemContainer.WrapItems);
+                else
+                {
+                    this.ClientSize = RecalcSizeDotNet(false, frameSize, m_ItemContainer.Orientation, m_BarState, m_ItemContainer.WrapItems);
+                }
+
+                if (m_DropShadow != null)
+                    NativeFunctions.SetWindowPos(m_DropShadow.Handle, new IntPtr(NativeFunctions.HWND_NOTOPMOST), this.Left + 5, this.Top + 5, this.Width - 2, this.Height - 2, NativeFunctions.SWP_SHOWWINDOW | NativeFunctions.SWP_NOACTIVATE);
+
+                if (m_BarState == eBarState.Docked)
+                {
+                    if (m_ItemContainer.Orientation == eOrientation.Horizontal)
+                        m_DockedSizeH = this.Size;
+                    else
+                        m_DockedSizeV = this.Size;
+                    RefreshOffice2003Region();
+                }
+                if (m_BarState == eBarState.Floating && !PassiveBar)
+                {
+                    m_Float.RefreshRegion(this.ClientSize);
+                    m_Float.ClientSize = this.ClientSize;
+                }
+            }
+            finally
+            {
+                m_RecalculatingSize = false;
+            }
+        }
+
+        private System.Drawing.Size RecalcSizeOnly(System.Drawing.Size objFrameSize)
+        {
+            return RecalcSizeOnly(objFrameSize, m_ItemContainer.Orientation, m_BarState, m_ItemContainer.WrapItems);
+        }
+        private System.Drawing.Size RecalcSizeOnly(System.Drawing.Size objFrameSize, eOrientation barOrientation, eBarState barState, bool bWrapItems)
+        {
+            if (m_ItemContainer.SubItems.Count > 0)
+            {
+                if (m_ItemContainer.EffectiveStyle == eDotNetBarStyle.Office2000)
+                    return RecalcSizeOffice(true, objFrameSize, barOrientation, barState, bWrapItems);
+                else
+                    return RecalcSizeDotNet(true, objFrameSize, barOrientation, barState, bWrapItems);
+            }
+            return System.Drawing.Size.Empty;
+        }
+
+        private System.Drawing.Size RecalcSizeDotNet()
+        {
+            return RecalcSizeDotNet(false, this.Size, m_ItemContainer.Orientation, this.m_BarState, m_ItemContainer.WrapItems);
+        }
+        private System.Drawing.Size RecalcSizeDotNet(bool bCalculateOnly, System.Drawing.Size objFrameSize, eOrientation barOrientation, eBarState barState, bool bWrapItems)
+        {
+            System.Drawing.Size thisSize = System.Drawing.Size.Empty;
+            int iTopMargin = 0, iBottomMargin = 0, iLeftMargin = 0, iRightMargin = 0, iRightTabMargin = 0;
+            int iOrgWidth = 0, iOrgHeight = 0;
+            eOrientation oldOrientation = m_ItemContainer.Orientation;
+            eBarState thisBarState = m_BarState;
+            bool bOldStretch = m_ItemContainer.Stretch;
+            bool bOldWrapItems = m_ItemContainer.WrapItems;
+            m_ItemContainer.IsRightToLeft = (this.RightToLeft == RightToLeft.Yes);
+            if (bCalculateOnly)
+            {
+                m_ItemContainer.Orientation = barOrientation;
+                thisBarState = barState;
+                m_ItemContainer.WrapItems = bWrapItems;
+                if (barState == eBarState.Docked)
+                    m_ItemContainer.Stretch = m_DockStretch;
+                else
+                {
+                    if (m_ItemContainer.LayoutType == eLayoutType.DockContainer)
+                        m_ItemContainer.Stretch = m_DockStretch;
+                    else
+                        m_ItemContainer.Stretch = false;
+                }
+            }
+
+            if (thisBarState == eBarState.Docked)
+            {
+                if (m_DockedBorder != eBorderType.None)
+                {
+                    iTopMargin = Dpi.Height3;
+                    iBottomMargin = Dpi.Height3;
+                    iLeftMargin = Dpi.Width3;
+                    iRightMargin = Dpi.Width3;
+                }
+            }
+            else if (thisBarState == eBarState.Floating)
+            {
+                if (this.IsThemed || this.DrawThemedCaption)
+                {
+                    if (m_ThemeWindowMargins.IsEmpty)
+                        this.RefreshThemeMargins();
+                    iTopMargin = m_ThemeWindowMargins.Top;
+                    iLeftMargin = m_ThemeWindowMargins.Left;
+                    iRightMargin = m_ThemeWindowMargins.Right;
+                    iBottomMargin = m_ThemeWindowMargins.Bottom;
+                    if (this.GrabHandleStyle == eGrabHandleStyle.CaptionTaskPane)
+                        iTopMargin = GetGrabHandleTaskPaneHeight() + m_ThemeWindowMargins.Bottom;
+                }
+                else
+                {
+                    if (this.GrabHandleStyle == eGrabHandleStyle.CaptionTaskPane)
+                        iTopMargin = GetGrabHandleTaskPaneHeight() + Dpi.Height4;
+                    else
+                        iTopMargin = GetNonClientHeight();
+                    iLeftMargin = Dpi.Width2;
+                    iRightMargin = Dpi.Width2;
+                    iBottomMargin = Dpi.Height3;
+                }
+            }
+            else
+            {
+                iTopMargin = this.ClientMarginTop;
+                iLeftMargin = this.ClientMarginLeft;
+                iRightMargin = this.ClientMarginRight;
+                iBottomMargin = this.ClientMarginBottom;
+            }
+
+            int iTop = iTopMargin, iLeft = iLeftMargin;
+
+            if (BarType == eBarType.StatusBar && BarFunctions.IsOffice2007Style(m_ItemContainer.EffectiveStyle))
+                iTop += Dpi.Height2;
+
+            if (m_ItemContainer.LayoutType == eLayoutType.DockContainer && !m_AutoHideState && GetDockTabVisible())
+            {
+                if (m_ItemContainer.VisibleSubItems > 1 || m_AlwaysDisplayDockTab && m_ItemContainer.VisibleSubItems == 1 && m_BarState != eBarState.Floating)
+                {
+                    int dockTabStripHeight = Dpi.Height(DockTabStripHeight);
+                    switch (m_DockTabAlignment)
+                    {
+                        case eTabStripAlignment.Top:
+                            {
+                                iTop += dockTabStripHeight;
+                                break;
+                            }
+                        case eTabStripAlignment.Left:
+                            {
+                                iLeft += dockTabStripHeight;
+                                break;
+                            }
+                        case eTabStripAlignment.Right:
+                            {
+                                iRightTabMargin = dockTabStripHeight;
+                                break;
+                            }
+                        default:
+                            {
+                                iBottomMargin += dockTabStripHeight;
+                                break;
+                            }
+                    }
+                }
+            }
+
+            // Take in account the side bar picture
+            if (thisBarState == eBarState.Popup && m_SideBarImage.Picture != null)
+                iLeft += m_SideBarImage.Picture.Width;
+            else if (thisBarState == eBarState.Docked || this.BarState == eBarState.AutoHide)
+            {
+                // Show grab handles if any selected
+                if (m_GrabHandleStyle != eGrabHandleStyle.None)
+                {
+                    if (m_GrabHandleStyle == eGrabHandleStyle.ResizeHandle)
+                    {
+                        // Leave space for the window sizer at the right
+                        if (this.RightToLeft == RightToLeft.Yes)
+                            iLeft += GrabHandleResizeWidth;
+                        else
+                            iRightMargin += GrabHandleResizeWidth;
+                    }
+                    else
+                    {
+                        if (m_ItemContainer.Orientation == eOrientation.Horizontal && m_ItemContainer.LayoutType == eLayoutType.Toolbar)
+                        {
+
+                            if (m_GrabHandleStyle == eGrabHandleStyle.Caption)
+                                iLeft += GetGrabHandleCaptionHeight();
+                            else
+                            {
+                                if (this.RightToLeft == RightToLeft.Yes)
+                                    iRightMargin += GrabHandleDotNetWidth;
+                                else
+                                    iLeft += GrabHandleDotNetWidth;
+                            }
+                        }
+                        else
+                        {
+                            if (m_GrabHandleStyle == eGrabHandleStyle.Caption)
+                                iTop += GetGrabHandleCaptionHeight();
+                            else if (m_GrabHandleStyle == eGrabHandleStyle.CaptionTaskPane || m_GrabHandleStyle == eGrabHandleStyle.CaptionDotted)
+                                iTop += GetGrabHandleTaskPaneHeight();
+                            else
+                                iTop += GrabHandleDotNetWidth;
+                        }
+                    }
+                }
+            }
+
+            if (!bCalculateOnly)
+            {
+                m_ItemContainer.TopInternal = iTop;
+                m_ItemContainer.LeftInternal = iLeft;
+            }
+            else
+            {
+                iOrgHeight = m_ItemContainer.HeightInternal;
+                iOrgWidth = m_ItemContainer.WidthInternal;
+            }
+
+            // Suspend Layout while setting suggested size
+            m_ItemContainer.SuspendLayout = true;
+            if (!bCalculateOnly)
+            {
+                if (thisBarState == eBarState.Popup)
+                    m_ItemContainer.WidthInternal = m_InitialContainerWidth;
+                else
+                {
+                    m_ItemContainer.WidthInternal = objFrameSize.Width - iLeft - iRightMargin - iRightTabMargin; //m_ItemContainer.WidthInternal=this.Width-iLeft-iRightMargin;
+                    m_ItemContainer.HeightInternal = objFrameSize.Height - iTop - iBottomMargin; //m_ItemContainer.HeightInternal=this.Height-iTop-iBottomMargin;
+                }
+            }
+            else
+            {
+                m_ItemContainer.WidthInternal = objFrameSize.Width - iLeft - iRightMargin - iRightTabMargin;
+                m_ItemContainer.HeightInternal = objFrameSize.Height - iTop - iBottomMargin;
+            }
+            m_ItemContainer.SuspendLayout = false;
+
+            if (m_ItemContainer.VisibleSubItems == 0 || (m_ItemContainer.SubItems.Count == 1 && m_ItemContainer.SubItems[0] is CustomizeItem && !m_ItemContainer.SubItems[0].Visible))
+            {
+                m_ItemContainer.RecalcSize();
+                if (this.LayoutType != eLayoutType.DockContainer && this.DockSide != eDockSide.Document)
+                {
+                    m_ItemContainer.WidthInternal = 36;
+                    m_ItemContainer.HeightInternal = 24;
+                }
+            }
+            else
+                m_ItemContainer.RecalcSize();
+
+            iTop += m_ItemContainer.HeightInternal;
+            if (IsGradientStyle && this.LayoutType == eLayoutType.Toolbar && !this.MenuBar && !this.IsThemed && BarType != eBarType.StatusBar)
+                iTop++;
+
+            if (!bCalculateOnly)
+            {
+                if (this.RightToLeft == RightToLeft.Yes)
+                {
+                    if (this.LayoutType == eLayoutType.Toolbar && m_ItemContainer.WidthInternal < objFrameSize.Width - iLeft - iRightMargin - iRightTabMargin && this.Stretch)
+                    {
+                        m_ItemContainer.LeftInternal = objFrameSize.Width - iRightMargin - m_ItemContainer.WidthInternal;
+                        m_ItemContainer.RecalcSize();
+                    }
+                    m_ClientRect = new Rectangle(m_ItemContainer.LeftInternal, iTopMargin, m_ItemContainer.WidthInternal, iTop);
+                }
+                else
+                    m_ClientRect = new Rectangle(iLeft, iTopMargin, m_ItemContainer.WidthInternal, iTop);
+            }
+
+            if (!bCalculateOnly)
+            {
+                if ((thisBarState == eBarState.Docked || thisBarState == eBarState.AutoHide) && m_GrabHandleStyle != eGrabHandleStyle.None && m_GrabHandleStyle != eGrabHandleStyle.ResizeHandle)
+                {
+                    if (m_ItemContainer.Orientation == eOrientation.Horizontal && m_ItemContainer.LayoutType == eLayoutType.Toolbar)
+                    {
+                        if (m_GrabHandleStyle == eGrabHandleStyle.Caption)
+                            m_GrabHandleRect = new Rectangle(iLeftMargin, iTopMargin, GetGrabHandleCaptionHeight(), iTop);
+                        else
+                        {
+                            if (this.RightToLeft == RightToLeft.Yes)
+                                m_GrabHandleRect = new Rectangle(m_ItemContainer.WidthInternal + iLeft + iLeftMargin, iTopMargin, 10, iTop);
+                            else
+                                m_GrabHandleRect = new Rectangle(iLeftMargin, iTopMargin, 10, iTop);
+                        }
+                    }
+                    else
+                    {
+                        if (m_GrabHandleStyle == eGrabHandleStyle.Caption)
+                            m_GrabHandleRect = new Rectangle(iLeftMargin, iTopMargin, m_ItemContainer.WidthInternal + iLeft - iLeftMargin + iRightTabMargin, GetGrabHandleCaptionHeight());
+                        else if (m_GrabHandleStyle == eGrabHandleStyle.CaptionTaskPane || m_GrabHandleStyle == eGrabHandleStyle.CaptionDotted)
+                            m_GrabHandleRect = new Rectangle(iLeftMargin, iTopMargin, m_ItemContainer.WidthInternal + iLeft - iLeftMargin + iRightTabMargin, GetGrabHandleTaskPaneHeight());
+                        else
+                        {
+                            //if (this.RightToLeft == RightToLeft.Yes)
+                            //    m_GrabHandleRect = new Rectangle(objFrameSize.Width - iLeft - iRightMargin - iRightTabMargin, iTopMargin, m_ItemContainer.WidthInternal + iLeft - iLeftMargin + iRightTabMargin, 10);
+                            //else
+                            m_GrabHandleRect = new Rectangle(iLeftMargin, iTopMargin, m_ItemContainer.WidthInternal + iLeft - iLeftMargin + iRightTabMargin, 10);
+                        }
+                    }
+                }
+                else if (thisBarState == eBarState.Floating)
+                {
+                    if (m_GrabHandleStyle == eGrabHandleStyle.CaptionTaskPane)
+                    {
+                        m_GrabHandleRect = new Rectangle(iLeftMargin, ((this.IsThemed || this.DrawThemedCaption) ? m_ThemeWindowMargins.Bottom : 2), m_ItemContainer.WidthInternal + iLeft - iLeftMargin + iRightTabMargin, GetGrabHandleTaskPaneHeight());
+                    }
+                    else
+                    {
+                        m_GrabHandleRect = new Rectangle(2, 2, m_ItemContainer.WidthInternal + iRightTabMargin, GetGrabHandleCaptionHeight());
+                        if (this.CanHideResolved)
+                            m_GrabHandleRect.Width -= 14;
+                    }
+                }
+
+                if (thisBarState == eBarState.Popup && m_SideBarImage.Picture != null)
+                    m_SideBarRect = new Rectangle(iLeft - m_SideBarImage.Picture.Width, iTopMargin, m_SideBarImage.Picture.Width, iTop - iTopMargin);
+
+                //if(iLeft+m_ItemContainer.Width+iRightMargin!=this.ClientSize.Width || this.ClientSize.Height!=iTop+iBottomMargin)
+                //	this.ClientSize=new Size(iLeft+m_ItemContainer.Width+iRightMargin,iTop+iBottomMargin);
+                thisSize = new Size(iLeft + m_ItemContainer.WidthInternal + iRightMargin + iRightTabMargin, iTop + iBottomMargin);
+            }
+            else
+            {
+                //if(m_BarState==eBarState.Floating)
+                thisSize = new Size(iLeft + m_ItemContainer.WidthInternal + iRightMargin + iRightTabMargin, iTop + iBottomMargin);
+                //else
+                //	thisSize=new Size(iLeft+m_ItemContainer.WidthInternal+iRightMargin+iRightTabMargin+14,iTop+iBottomMargin);
+                m_ItemContainer.WidthInternal = iOrgWidth;
+                m_ItemContainer.HeightInternal = iOrgHeight;
+                m_ItemContainer.Orientation = oldOrientation;
+                m_ItemContainer.WrapItems = bOldWrapItems;
+                m_ItemContainer.Stretch = bOldStretch;
+                m_ItemContainer.RecalcSize();
+            }
+            return thisSize;
+        }
+
+        private System.Drawing.Size RecalcSizeOffice()
+        {
+            return RecalcSizeOffice(false, this.Size, m_ItemContainer.Orientation, this.m_BarState, m_ItemContainer.WrapItems);
+        }
+        private System.Drawing.Size RecalcSizeOffice(bool bCalculateOnly, System.Drawing.Size objFrameSize, eOrientation barOrientation, eBarState barState, bool bWrapItems)
+        {
+            System.Drawing.Size thisSize = System.Drawing.Size.Empty;
+
+            int iTopMargin = 0, iBottomMargin = 0, iLeftMargin = 0, iRightMargin = 0, iRightTabMargin = 0;
+            int iOrgWidth = 0, iOrgHeight = 0;
+            eOrientation oldOrientation = m_ItemContainer.Orientation;
+            eBarState thisBarState = m_BarState;
+            bool bOldStretch = m_ItemContainer.Stretch;
+            bool bOldWrapItems = m_ItemContainer.WrapItems;
+            m_ItemContainer.IsRightToLeft = (this.RightToLeft == RightToLeft.Yes);
+            if (bCalculateOnly)
+            {
+                m_ItemContainer.Orientation = barOrientation;
+                thisBarState = barState;
+                m_ItemContainer.WrapItems = bWrapItems;
+                if (barState == eBarState.Docked)
+                    m_ItemContainer.Stretch = m_DockStretch;
+                else
+                {
+                    if (m_ItemContainer.LayoutType == eLayoutType.DockContainer)
+                        m_ItemContainer.Stretch = m_DockStretch;
+                    else
+                        m_ItemContainer.Stretch = false;
+                }
+            }
+
+            if (thisBarState == eBarState.Docked)
+            {
+                if (m_DockedBorder != eBorderType.None)
+                {
+                    iTopMargin = 2;
+                    iBottomMargin = 2;
+                    iLeftMargin = 2;
+                    iRightMargin = 2;
+                }
+            }
+            else if (thisBarState == eBarState.Floating)
+            {
+                iTopMargin = 22;
+                iLeftMargin = 4;
+                iRightMargin = 4;
+                iBottomMargin = 4;
+            }
+            else
+            {
+                iTopMargin = this.ClientMarginTop;
+                iLeftMargin = this.ClientMarginLeft;
+                iRightMargin = this.ClientMarginRight;
+                iBottomMargin = this.ClientMarginBottom;
+            }
+
+            int iTop = iTopMargin, iLeft = iLeftMargin;
+
+            if (m_ItemContainer.LayoutType == eLayoutType.DockContainer && !m_AutoHideState && GetDockTabVisible())
+            {
+                if (m_ItemContainer.VisibleSubItems > 1 || m_AlwaysDisplayDockTab && m_ItemContainer.VisibleSubItems == 1 && m_BarState != eBarState.Floating)
+                {
+                    int dockTabStripHeight = Dpi.Height(DockTabStripHeight);
+                    switch (m_DockTabAlignment)
+                    {
+                        case eTabStripAlignment.Top:
+                            {
+                                iTop += dockTabStripHeight;
+                                break;
+                            }
+                        case eTabStripAlignment.Left:
+                            {
+                                iLeft += dockTabStripHeight;
+                                break;
+                            }
+                        case eTabStripAlignment.Right:
+                            {
+                                iRightTabMargin = dockTabStripHeight;
+                                break;
+                            }
+                        default:
+                            {
+                                iBottomMargin += dockTabStripHeight;
+                                break;
+                            }
+                    }
+                }
+            }
+
+            // Take in account the side bar picture
+            if (thisBarState == eBarState.Popup && m_SideBarImage.Picture != null)
+                iLeft += m_SideBarImage.Picture.Width;
+            else if (thisBarState == eBarState.Docked || this.BarState == eBarState.AutoHide)
+            {
+                // Show grab handles if any selected
+                if (m_GrabHandleStyle != eGrabHandleStyle.None)
+                {
+                    if (m_ItemContainer.Orientation == eOrientation.Horizontal && m_ItemContainer.LayoutType != eLayoutType.DockContainer)
+                        iLeft += GrabHandleOfficeWidth;
+                    else
+                    {
+                        if (m_GrabHandleStyle == eGrabHandleStyle.Caption)
+                            iTop += GetGrabHandleCaptionHeight();
+                        else if (m_GrabHandleStyle == eGrabHandleStyle.CaptionTaskPane || m_GrabHandleStyle == eGrabHandleStyle.CaptionDotted)
+                            iTop += GetGrabHandleTaskPaneHeight();
+                        else
+                            iTop += GrabHandleOfficeWidth;
+                    }
+                }
+            }
+
+            if (!bCalculateOnly)
+            {
+                m_ItemContainer.TopInternal = iTop;
+                m_ItemContainer.LeftInternal = iLeft;
+            }
+            else
+            {
+                iOrgHeight = m_ItemContainer.HeightInternal;
+                iOrgWidth = m_ItemContainer.WidthInternal;
+            }
+
+            if (!bCalculateOnly)
+            {
+                if (thisBarState == eBarState.Popup)
+                    m_ItemContainer.WidthInternal = m_InitialContainerWidth;
+                else
+                {
+                    m_ItemContainer.WidthInternal = objFrameSize.Width - iLeft - iRightMargin - iRightTabMargin; //m_ItemContainer.WidthInternal=this.Width-iLeft-iRightMargin;
+                    m_ItemContainer.HeightInternal = objFrameSize.Height - iTop - iBottomMargin; //m_ItemContainer.HeightInternal=this.Height-iTop-iBottomMargin;
+                }
+            }
+            else
+            {
+                m_ItemContainer.WidthInternal = objFrameSize.Width - iLeft - iRightMargin - iRightTabMargin;
+                m_ItemContainer.HeightInternal = objFrameSize.Height - iTop - iBottomMargin;
+            }
+
+            if (m_ItemContainer.VisibleSubItems == 0)
+            {
+                m_ItemContainer.WidthInternal = 36;
+                m_ItemContainer.HeightInternal = 24;
+            }
+            else
+                m_ItemContainer.RecalcSize();
+
+            iTop += m_ItemContainer.HeightInternal;
+
+            if (!bCalculateOnly)
+                m_ClientRect = new Rectangle(iLeft, iTopMargin, m_ItemContainer.WidthInternal, iTop);
+
+            if (!bCalculateOnly)
+            {
+                if ((thisBarState == eBarState.Docked || this.BarState == eBarState.AutoHide) && m_GrabHandleStyle != eGrabHandleStyle.None)
+                {
+                    if (m_ItemContainer.Orientation == eOrientation.Horizontal && m_ItemContainer.LayoutType != eLayoutType.DockContainer)
+                    {
+                        m_GrabHandleRect = new Rectangle(iLeftMargin, iTopMargin, 12, iTop);
+                    }
+                    else
+                    {
+                        if (m_GrabHandleStyle == eGrabHandleStyle.Caption)
+                            m_GrabHandleRect = new Rectangle(iLeftMargin, iTopMargin, m_ItemContainer.WidthInternal + iLeft - iLeftMargin + iRightTabMargin, GetGrabHandleCaptionHeight());
+                        else if (m_GrabHandleStyle == eGrabHandleStyle.CaptionTaskPane || m_GrabHandleStyle == eGrabHandleStyle.CaptionDotted)
+                            m_GrabHandleRect = new Rectangle(iLeftMargin, iTopMargin, m_ItemContainer.WidthInternal + iLeft - iLeftMargin + iRightTabMargin, GetGrabHandleTaskPaneHeight());
+                        else
+                            m_GrabHandleRect = new Rectangle(iLeftMargin, iTopMargin, m_ItemContainer.WidthInternal + iLeft - iLeftMargin + iRightTabMargin, 12);
+                    }
+                }
+                else if (thisBarState == eBarState.Floating)
+                {
+                    if (m_GrabHandleStyle == eGrabHandleStyle.CaptionTaskPane)
+                        m_GrabHandleRect = new Rectangle(4, 4, m_ItemContainer.WidthInternal + iRightTabMargin, GetGrabHandleTaskPaneHeight());
+                    else
+                        m_GrabHandleRect = new Rectangle(4, 4, m_ItemContainer.WidthInternal + iRightTabMargin, 15);
+                    if (this.CanHideResolved)
+                        m_GrabHandleRect.Width -= 14;
+                }
+
+                if (thisBarState == eBarState.Popup && m_SideBarImage.Picture != null)
+                    m_SideBarRect = new Rectangle(iLeft - m_SideBarImage.Picture.Width, iTopMargin, m_SideBarImage.Picture.Width, iTop - iTopMargin);
+                //this.ClientSize=new Size(iLeft+m_ItemContainer.Width+iRightMargin,iTop+iBottomMargin);
+                thisSize = new Size(iLeft + m_ItemContainer.WidthInternal + iRightMargin + iRightTabMargin, iTop + iBottomMargin);
+            }
+            else
+            {
+                thisSize = new Size(iLeft + m_ItemContainer.WidthInternal + iRightMargin + iRightTabMargin, iTop + iBottomMargin);
+                m_ItemContainer.WidthInternal = iOrgWidth;
+                m_ItemContainer.HeightInternal = iOrgHeight;
+                m_ItemContainer.Orientation = oldOrientation;
+                m_ItemContainer.WrapItems = bOldWrapItems;
+                m_ItemContainer.Stretch = bOldStretch;
+                m_ItemContainer.RecalcSize();
+            }
+            return thisSize;
+        }
+
+        private void RestoreContainer()
+        {
+            if (m_ParentItem != null)// && m_ParentItem.SubItems.Count!=0)
+            {
+                foreach (BaseItem objItem in m_ParentItem.SubItems)
+                {
+                    objItem.Expanded = false;
+                    objItem.SetParent(m_ParentItem);
+                    objItem.ContainerControl = m_OldContainer;
+                    objItem.Displayed = false;
+                    objItem.Orientation = m_ParentItem.Orientation;
+                }
+                m_ItemContainer.SubItems._Clear();
+            }
+        }
+
+        internal void OnAddedToBars()
+        {
+            if (m_Owner != null && m_Owner is IOwner)
+            {
+                if (((IOwner)m_Owner).Images != null)
+                    m_ItemContainer.RefreshImageSize();
+            }
+        }
+
+        internal void ProcessDelayedCommands()
+        {
+            if (m_DockSideDelayed >= 0)
+            {
+                if (!((eDockSide)m_DockSideDelayed == eDockSide.Document && this.DockSide == eDockSide.Document))
+                    this.DockSide = (eDockSide)m_DockSideDelayed;
+                m_DockSideDelayed = -1;
+                foreach (BaseItem item in m_ItemContainer.SubItems)
+                    item.OnProcessDelayedCommands();
+            }
+        }
+
+        private bool IsAnyControl(Control ctrlParent, Control ctrlReference)
+        {
+            if (ctrlParent == ctrlReference)
+                return true;
+            foreach (Control ctrl in ctrlParent.Controls)
+            {
+                if (ctrl == ctrlReference)
+                    return true;
+                bool bRet = IsAnyControl(ctrl, ctrlReference);
+                if (bRet)
+                    return true;
+            }
+            return false;
+        }
+
+        private int GetGrabHandleTaskPaneHeight()
+        {
+            if (this.Font != null)
+                return Math.Max(Dpi.Height(GrabHandleTaskPaneHeight), this.Font.Height + Dpi.Height2);
+            return Dpi.Height(GrabHandleTaskPaneHeight);
+        }
+
+        private int _CaptionHeight = 0;
+        /// <summary>
+        /// Gets or sets docked bar caption height. Default value is 0 which means system predefined height is used.
+        /// </summary>
+        [DefaultValue(0), Category("Appearance"), Description("Indicates docked bar caption height. Default value is 0 which means system predefined height is used.")]
+        public int CaptionHeight
+        {
+            get { return _CaptionHeight; }
+            set { _CaptionHeight = value; this.RecalcLayout(); }
+        }
+
+        private int GetGrabHandleCaptionHeight()
+        {
+            if (_CaptionHeight > 0) return Dpi.Height(_CaptionHeight);
+            if (this.Font != null)
+                return Math.Max(Dpi.Height(GrabHandleCaptionHeight), this.Font.Height + 2);
+            return Dpi.Height(GrabHandleCaptionHeight);
+        }
+
+        /// <summary>
+        /// Gets or sets whether bar when changed over to floating state is hidden instead of shown. This property is used
+        /// internally to optimize loading of hidden floating bars. You should not use this property in your code. It is for internal DotNetBar
+        /// infrastructure use only.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool LoadingHideFloating
+        {
+            get { return m_LoadingHideFloating; }
+            set { m_LoadingHideFloating = value; }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void DockDocumentManager(DockSiteInfo pDockInfo)
+        {
+            DocumentDockUIManager dm = pDockInfo.objDockSite.GetDocumentUIManager();
+            if (pDockInfo.objDockSite.Dock == DockStyle.Fill)
+                dm.Dock(pDockInfo.MouseOverBar, this, pDockInfo.MouseOverDockSide);
+            else if ((pDockInfo.DockLine == -1 || pDockInfo.DockLine == 999) && (pDockInfo.objDockSite.Dock == DockStyle.Left || pDockInfo.objDockSite.Dock == DockStyle.Right)) // Ajdust for edge case docking
+            {
+                dm.Dock(null, this, pDockInfo.DockLine == -1 ? eDockSide.Left : eDockSide.None);
+            }
+            else if ((pDockInfo.DockLine == -1 || pDockInfo.DockLine == 999) && (pDockInfo.objDockSite.Dock == DockStyle.Top || pDockInfo.objDockSite.Dock == DockStyle.Bottom)) // Ajdust for edge case docking
+            {
+                dm.Dock(null, this, pDockInfo.DockLine == -1 ? eDockSide.Top : eDockSide.None);
+            }
+            else
+                dm.Dock(pDockInfo.MouseOverBar, this, pDockInfo.MouseOverDockSide);
+        }
+
+        internal void RemoveFromFloatingContainer()
+        {
+            if (m_Float == null) return;
+            // Remember undocked size
+            m_FloatingRect = new Rectangle(m_Float.Location, this.Size);
+            m_Float.Controls.Remove(this);
+            m_Float.Hide();
+            m_Float.Dispose();
+            m_Float = null;
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void DockingHandler(DockSiteInfo pDockInfo, Point p)
+        {
+            IOwner owner = m_Owner as IOwner;
+
+            if (m_TempTabBar != null && pDockInfo.TabDockContainer == m_TempTabBar)
+                return;
+
+            if (pDockInfo.objDockSite == null && (m_BarState != eBarState.Floating || m_Float == null))
+            {
+                m_DockingInProgress = true;
+
+                if (m_TempTabBar != null)
+                {
+                    RemoveTempTabBarItems();
+                    m_TempTabBar.RecalcLayout();
+                    m_TempTabBar = null;
+                }
+
+                // Remember last docking info
+                DockSiteInfo tempInfo = m_LastDockSiteInfo;
+                m_LastDockSiteInfo = new DockSiteInfo();
+                // Preserve the relative last docked to bar in case the return to same docking position is needed
+                m_LastDockSiteInfo.LastRelativeDocumentId = tempInfo.LastRelativeDocumentId;
+                m_LastDockSiteInfo.LastRelativeDockToBar = tempInfo.LastRelativeDockToBar;
+
+                m_LastDockSiteInfo.DockedHeight = this.Height;
+                m_LastDockSiteInfo.DockedWidth = this.Width;
+                m_LastDockSiteInfo.DockLine = this.DockLine;
+                m_LastDockSiteInfo.DockOffset = this.DockOffset;
+                if (this.Parent != null)
+                    m_LastDockSiteInfo.DockSide = this.Parent.Dock;
+                else
+                    m_LastDockSiteInfo.DockSide = DockStyle.Left;
+
+                if (this.Parent != null && this.Parent is DockSite)
+                {
+                    m_LastDockSiteInfo.InsertPosition = ((DockSite)this.Parent).Controls.GetChildIndex(this);
+                    m_LastDockSiteInfo.objDockSite = (DockSite)this.DockedSite;
+                }
+                if (m_LastDockSiteInfo.objDockSite == null)
+                {
+                    IOwnerBarSupport barSupp = m_Owner as IOwnerBarSupport;
+                    if (barSupp != null)
+                    {
+                        switch (m_LastDockSiteInfo.DockSide)
+                        {
+                            case DockStyle.Left:
+                                m_LastDockSiteInfo.objDockSite = barSupp.LeftDockSite;
+                                break;
+                            case DockStyle.Right:
+                                m_LastDockSiteInfo.objDockSite = barSupp.RightDockSite;
+                                break;
+                            case DockStyle.Top:
+                                m_LastDockSiteInfo.objDockSite = barSupp.TopDockSite;
+                                break;
+                            case DockStyle.Bottom:
+                                m_LastDockSiteInfo.objDockSite = barSupp.BottomDockSite;
+                                break;
+                            case DockStyle.Fill:
+                                m_LastDockSiteInfo.objDockSite = barSupp.FillDockSite;
+                                break;
+                        }
+                    }
+                }
+
+                // Undock the window
+                m_BarState = eBarState.Floating;
+                if (m_Float == null)
+                {
+                    m_Float = new FloatingContainer(this);
+                    m_Float.CreateControl();
+                }
+
+                // Must reset the ActiveControl to null because on MDI Forms if this was not done
+                // MDI form could not be closed if bar that had ActiveControl is floating.
+                if (owner.ParentForm != null && owner.ParentForm.ActiveControl == this)
+                {
+                    owner.ParentForm.ActiveControl = null;
+                    this.Focus(); // Fixes the problem on SDI forms
+                }
+                else if (owner.ParentForm != null && IsAnyControl(this, owner.ParentForm.ActiveControl))
+                {
+                    owner.ParentForm.ActiveControl = null;
+                    this.Focus();
+                }
+
+                // Check for parent since if bar is deserialized there is no parent and state is Docked by default
+
+                if (this.Parent != null && this.Parent is DockSite)
+                {
+                    if (((DockSite)this.Parent).IsDocumentDock || ((DockSite)this.Parent).DocumentDockContainer != null)
+                    {
+                        ((DockSite)this.Parent).GetDocumentUIManager().UnDock(this);
+                    }
+                    else
+                        ((DockSite)this.Parent).RemoveBar(this);
+                }
+
+                this.Parent = null;
+                m_Float.Controls.Add(this);
+                if (!this.Visible/* && !m_BarDefinitionLoading*/)
+                    base.Visible = true;
+                // IMPORTANT SINCE WE OVERRIDE BASE LOCATION WE HAVE TO USE BASE HERE TO ACTUALLY MOVE IT
+                base.Location = new Point(0, 0);
+
+                m_FloatingRect = new Rectangle(m_FloatingRect.Location, GetFloatingSize());
+                this.Size = m_FloatingRect.Size;
+
+                this.DockOrientation = eOrientation.Horizontal;
+                if (m_ItemContainer.LayoutType == eLayoutType.DockContainer && m_AlwaysDisplayDockTab)
+                    RefreshDockTab(true);
+                this.RecalcSize();
+                m_FloatingRect.Size = this.Size;
+
+                m_Float.Location = p;
+                if (m_ItemContainer.LayoutType != eLayoutType.Toolbar)
+                    m_MouseDownPt = new Point(this.Width / 2, 8);
+                else
+                    m_MouseDownPt = new Point(8, 8);
+
+                if (m_LoadingHideFloating)
+                    m_Float.Visible = false;
+                else
+                    m_Float.Show();
+
+                m_FloatingRect.Location = m_Float.Location;
+
+                // TODO: Bug Width was sometimes not reflected properly
+                if (m_Float.Width != m_FloatingRect.Width)
+                    m_Float.Width = m_FloatingRect.Width;
+
+                if (owner.ParentForm != null)
+                {
+                    bool activate = true;
+                    if (m_BarDefinitionLoading && owner is DotNetBarManager && !((DotNetBarManager)owner).ActivateOnLayoutLoad)
+                        activate = false;
+                    if (activate)
+                        owner.ParentForm.Activate();
+                }
+                m_DockingInProgress = false;
+
+                // Raise events
+                if (BarUndock != null)
+                    BarUndock(this, new EventArgs());
+                IOwnerBarSupport ownerDockEvents = m_Owner as IOwnerBarSupport;
+                if (ownerDockEvents != null)
+                    ownerDockEvents.InvokeBarUndock(this, new EventArgs());
+                OnBarStateChanged(new BarStateChangedEventArgs(this, eBarStateChange.BarUndocked));
+
+                // Resize Docking Tab if it exists
+                ResizeDockTab();
+            }
+            else
+            {
+                // Change the Z-Order of the dock-site if needed
+                if ((pDockInfo.FullSizeDock || pDockInfo.PartialSizeDock) && pDockInfo.DockSiteZOrderIndex >= 0 && pDockInfo.objDockSite != null && pDockInfo.objDockSite.Parent != null)
+                    pDockInfo.objDockSite.Parent.Controls.SetChildIndex(pDockInfo.objDockSite, pDockInfo.DockSiteZOrderIndex);
+
+                if (m_Owner != null)
+                {
+                    if (pDockInfo.TabDockContainer != null)
+                    {
+                        if (m_TempTabBar != null && pDockInfo.TabDockContainer != m_TempTabBar)
+                        {
+                            RemoveTempTabBarItems();
+                            m_TempTabBar.RecalcLayout();
+                            m_TempTabBar = null;
+                        }
+                        if (m_TempTabBar != pDockInfo.TabDockContainer)
+                        {
+                            m_DockingInProgress = true;
+
+                            if (m_DockTabTearOffIndex == -1)
+                            {
+                                if (m_Float != null && m_Float.Visible)
+                                {
+                                    if (owner.ParentForm != null)
+                                        owner.ParentForm.Activate();
+                                    // Remember undocked size
+                                    m_FloatingRect = new Rectangle(m_Float.Location, this.Size);
+                                    m_DockOffset = pDockInfo.DockOffset;
+                                    m_DockLine = pDockInfo.DockLine;
+                                    m_Float.Controls.Remove(this);
+                                    m_Float.Hide();
+                                    m_Float.Dispose();
+                                    m_Float = null;
+                                }
+                                else if (this.Parent != null && this.Parent is DockSite)
+                                    ((DockSite)this.Parent).RemoveBar(this);
+                                m_BarState = eBarState.Docked;
+                                if (!m_BarDefinitionLoading)
+                                    base.Visible = false;
+
+                                foreach (BaseItem item in m_ItemContainer.SubItems)
+                                {
+                                    DockContainerItem dockitem = item as DockContainerItem;
+                                    if (dockitem != null)
+                                    {
+                                        DockContainerItem temp = new DockContainerItem();
+                                        temp.Displayed = false;
+                                        temp.Text = item.Text;
+                                        temp.Image = dockitem.Image;
+                                        temp.ImageIndex = dockitem.ImageIndex;
+                                        temp.Icon = dockitem.Icon;
+                                        temp.Tag = "systempdockitem";
+                                        pDockInfo.TabDockContainer.Items.Add(temp);
+                                    }
+                                    m_TempTabBar = pDockInfo.TabDockContainer;
+                                    m_TempTabBar.RecalcLayout();
+                                    m_TempTabBar.Refresh();
+                                }
+                            }
+                            else
+                            {
+                                DockContainerItem dockitem = m_ItemContainer.SubItems[m_DockTabTearOffIndex] as DockContainerItem;
+                                if (dockitem != null)
+                                {
+                                    DockContainerItem temp = new DockContainerItem();
+                                    temp.Displayed = false;
+                                    temp.Text = dockitem.Text;
+                                    temp.Image = dockitem.Image;
+                                    temp.ImageIndex = dockitem.ImageIndex;
+                                    temp.Icon = dockitem.Icon;
+                                    temp.Tag = "systempdockitem";
+                                    pDockInfo.TabDockContainer.Items.Add(temp);
+                                }
+                                m_TempTabBar = pDockInfo.TabDockContainer;
+                                m_TempTabBar.RecalcLayout();
+                                m_TempTabBar.Refresh();
+                            }
+                            m_DockingInProgress = false;
+                        }
+
+                    }
+                    else
+                    {
+                        if (m_TempTabBar != null)
+                        {
+                            // Allow tabbed bar to change position only if it is going to different bar
+                            if (pDockInfo.objDockSite == m_TempTabBar.Parent)
+                                return;
+                            RemoveTempTabBarItems();
+                            m_TempTabBar.RecalcLayout();
+                            m_TempTabBar = null;
+                        }
+                        // If coming from the tabs
+                        if (!this.Visible && !m_BarDefinitionLoading)
+                            this.Visible = true;
+                        if (pDockInfo.LastRelativeDockToBar != null && pDockInfo.LastRelativeDockToBar.DockedSite != null && owner is DotNetBarManager)
+                        {
+                            DotNetBarManager manager = (DotNetBarManager)owner;
+                            if (pDockInfo.LastRelativeDockToBar.AutoHide)
+                            {
+                                if (pDockInfo.objDockSite != null)
+                                    pDockInfo.objDockSite.GetDocumentUIManager().Dock(this);
+                                else
+                                    manager.Dock(this, eDockSide.Right);
+                            }
+                            else if (!pDockInfo.LastRelativeDockToBar.Visible ||
+                                pDockInfo.LastRelativeDockToBar.DockSide == eDockSide.None) // Closed or floating
+                            {
+                                manager.Dock(this, m_LastDockSiteInfo.LastDockSiteSide);
+                            }
+                            else if (pDockInfo.LastRelativeDockToBar.DockSide != eDockSide.None &&
+                           m_LastDockSiteInfo.LastDockSiteSide != pDockInfo.LastRelativeDockToBar.DockSide) // Reference bar docked somewhere else
+                            {
+                                manager.Dock(this, m_LastDockSiteInfo.LastDockSiteSide);
+                            }
+                            else
+                                manager.Dock(this, pDockInfo.LastRelativeDockToBar, LastDockSide);
+                            if (this.IsDisposed) return;
+                            m_BarState = eBarState.Docked;
+                            pDockInfo.LastRelativeDockToBar = null;
+                        }
+                        else if (pDockInfo.objDockSite != null && m_BarState != eBarState.Docked)
+                        {
+                            m_DockingInProgress = true;
+                            if (m_Float != null && m_BarState == eBarState.Floating)
+                            {
+                                if (owner.ParentForm != null)
+                                    owner.ParentForm.Activate();
+                                // Remember undocked size
+                                m_FloatingRect = new Rectangle(m_Float.Location, this.Size);
+                                m_DockOffset = pDockInfo.DockOffset;
+                                m_DockLine = pDockInfo.DockLine;
+                                m_Float.Controls.Remove(this);
+                                m_Float.Hide();
+                                m_Float.Dispose();
+                                m_Float = null;
+                            }
+                            m_BarState = eBarState.Docked;
+
+                            if (pDockInfo.objDockSite.IsDocumentDock || pDockInfo.objDockSite.DocumentDockContainer != null)
+                            {
+                                DockDocumentManager(pDockInfo);
+                            }
+                            else
+                            {
+                                if (pDockInfo.InsertPosition == -10)
+                                    pDockInfo.objDockSite.AddBar(this);
+                                else
+                                    pDockInfo.objDockSite.AddBar(this, pDockInfo.InsertPosition);
+                            }
+                            m_DockingInProgress = false;
+
+                            //							// Raise events
+                            //							if(BarDock!=null)
+                            //								BarDock(this,new EventArgs());
+                            //							IOwnerBarSupport ownerDockEvents=m_Owner as IOwnerBarSupport;
+                            //							if(ownerDockEvents!=null)
+                            //								ownerDockEvents.InvokeBarDock(this,new EventArgs());
+                        }
+                        else if (pDockInfo.objDockSite != null && pDockInfo.objDockSite != this.Parent)
+                        {
+                            m_DockingInProgress = true;
+                            // Must reset the ActiveControl to null becouse on MDI Forms if this was not done
+                            // MDI form could not be closed if bar that had ActiveControl is floating.
+                            if (owner.ParentForm != null && owner.ParentForm.ActiveControl == this)
+                            {
+                                owner.ParentForm.ActiveControl = null;
+                                this.Focus(); // Fixes the problem on SDI forms
+                            }
+                            else if (owner.ParentForm != null && IsAnyControl(this, owner.ParentForm.ActiveControl))
+                            {
+                                owner.ParentForm.ActiveControl = null;
+                                this.Focus();
+                            }
+
+                            // It is docked somewhere else, we need to undockit and dockit on another site
+                            // If Bar is deserialized there is no parent
+                            if (this.Parent != null && this.Parent is DockSite)
+                            {
+                                if (((DockSite)this.Parent).IsDocumentDock || ((DockSite)this.Parent).DocumentDockContainer != null)
+                                    ((DockSite)this.Parent).GetDocumentUIManager().UnDock(this);
+                                else
+                                    ((DockSite)this.Parent).RemoveBar(this);
+                            }
+
+                            // If coming from the tabs
+                            if (!this.Visible && !m_BarDefinitionLoading)
+                                this.Visible = true;
+
+                            m_DockOffset = pDockInfo.DockOffset;
+                            m_DockLine = pDockInfo.DockLine;
+
+                            if (pDockInfo.objDockSite.IsDocumentDock || pDockInfo.objDockSite.DocumentDockContainer != null)
+                            {
+                                pDockInfo.objDockSite.GetDocumentUIManager().Dock(pDockInfo.MouseOverBar, this, pDockInfo.MouseOverDockSide);
+                            }
+                            else
+                            {
+                                if (pDockInfo.InsertPosition == -10)
+                                    pDockInfo.objDockSite.AddBar(this);
+                                else
+                                    pDockInfo.objDockSite.AddBar(this, pDockInfo.InsertPosition);
+                            }
+                            // Raise events
+                            //							if(BarDock!=null)
+                            //								BarDock(this,new EventArgs());
+                            //							IOwnerBarSupport ownerDockEvents=m_Owner as IOwnerBarSupport;
+                            //							if(ownerDockEvents!=null)
+                            //								ownerDockEvents.InvokeBarDock(this,new EventArgs());
+                            m_DockingInProgress = false;
+                        }
+                        else if (this.Parent != null && pDockInfo.objDockSite == this.Parent)
+                        {
+                            if (pDockInfo.objDockSite.IsDocumentDock || pDockInfo.objDockSite.DocumentDockContainer != null)
+                            {
+                                pDockInfo.objDockSite.GetDocumentUIManager().Dock(pDockInfo.MouseOverBar, this, pDockInfo.MouseOverDockSide);
+                            }
+                            else
+                            {
+                                if (m_DockLine != pDockInfo.DockLine || m_DockOffset != pDockInfo.DockOffset && !this.Stretch || pDockInfo.objDockSite.Controls.GetChildIndex(this) != pDockInfo.InsertPosition || pDockInfo.NewLine)
+                                {
+                                    m_DockLine = pDockInfo.DockLine;
+                                    m_DockOffset = pDockInfo.DockOffset;
+                                    // If coming from the tabs
+                                    if (!this.Visible && !m_BarDefinitionLoading)
+                                        this.Visible = true;
+                                    if (pDockInfo.NewLine)
+                                        pDockInfo.objDockSite.SetBarPosition(this, pDockInfo.InsertPosition, true);
+                                    else if (pDockInfo.InsertPosition == -10)
+                                    {
+                                        pDockInfo.objDockSite.AdjustBarPosition(this);
+                                        pDockInfo.objDockSite.RecalcLayout();
+                                    }
+                                    else
+                                        pDockInfo.objDockSite.SetBarPosition(this, pDockInfo.InsertPosition);
+                                }
+                            }
+                        }
+                        else
+                        {
+                            Point newLocation = new Point(p.X - m_MouseDownPt.X, p.Y - m_MouseDownPt.Y);
+                            ScreenInformation screen = BarFunctions.ScreenFromControl(m_Float);
+                            if (screen != null)
+                            {
+                                if (newLocation.Y + 8 >= screen.WorkingArea.Bottom)
+                                    newLocation.Y = screen.WorkingArea.Bottom - 8;
+                                else if (newLocation.Y <= screen.WorkingArea.Y - 1 && this.EffectiveCanMaximizeFloating && !this.IsMaximized &&
+                                    BarFunctions.ScreenFromPoint(new Point(newLocation.X, screen.Bounds.Y - 32)) == null) // Make sure there is no screen above
+                                {
+                                    this.IsMaximized = true;
+                                }
+                                else if (this.IsMaximized && (Math.Abs(p.X - m_MouseDownPt.X) > 0 || Math.Abs(p.Y - m_MouseDownPt.Y) > 0) && newLocation.Y > screen.WorkingArea.Y + 8)
+                                {
+                                    this.IsMaximized = false;
+                                    m_MouseDownPt.X = this.ClientSize.Width / 2;
+                                    newLocation = new Point(p.X - m_MouseDownPt.X, p.Y - m_MouseDownPt.Y);
+                                }
+                            }
+                            if (!this.IsMaximized)
+                                m_Float.Location = newLocation;
+                            if (((IOwner)m_Owner).ParentForm != null)
+                                ((IOwner)m_Owner).ParentForm.Update();
+                        }
+                    }
+                }
+                if (m_ItemContainer.LayoutType == eLayoutType.DockContainer && (m_TabDockItems == null || !m_TabDockItems.Visible))
+                {
+                    int iVisible = m_ItemContainer.VisibleSubItems;
+                    if (!(m_BarState == eBarState.Floating && iVisible <= 1) && (m_AlwaysDisplayDockTab || iVisible > 0))
+                    {
+                        eBarState oldBarState = m_BarState;
+                        m_BarState = eBarState.Docked;
+                        RefreshDockTab(false);
+                        m_BarState = oldBarState;
+                    }
+                }
+                if (m_BarState != eBarState.Floating)
+                    InvokeBarDockEvents();
+            }
+        }
+
+        internal void InvokeBarDockEvents()
+        {
+            // Raise events
+            if (BarDock != null)
+                BarDock(this, new EventArgs());
+            IOwnerBarSupport ownerDockEvents = m_Owner as IOwnerBarSupport;
+            if (ownerDockEvents != null)
+                ownerDockEvents.InvokeBarDock(this, new EventArgs());
+            OnBarStateChanged(new BarStateChangedEventArgs(this, eBarStateChange.BarDocked));
+        }
+
+        private Size GetFloatingSize()
+        {
+            Size size = m_FloatingRect.Size;
+            if (size.IsEmpty)
+            {
+                if (m_ItemContainer.LayoutType == eLayoutType.DockContainer)
+                {
+                    int tab = this.SelectedDockTab;
+                    if (tab >= 0 && m_ItemContainer.SubItems[tab] is DockContainerItem)
+                    {
+                        DockContainerItem item = m_ItemContainer.SubItems[tab] as DockContainerItem;
+                        size = Dpi.Size(item.DefaultFloatingSize);
+                    }
+                    else if (m_ItemContainer.SubItems.Count > 0 && m_ItemContainer.SubItems[0] is DockContainerItem)
+                    {
+                        DockContainerItem item = m_ItemContainer.SubItems[0] as DockContainerItem;
+                        size = Dpi.Size(item.DefaultFloatingSize);
+                    }
+                    else
+                    {
+                        if (m_ItemContainer.Orientation == eOrientation.Vertical)
+                            size = new Size(m_ItemContainer.WidthInternal + 16, m_ItemContainer.WidthInternal + 16);
+                        else
+                            size = new Size(m_ItemContainer.HeightInternal + 24, m_ItemContainer.HeightInternal + 24);
+                    }
+                }
+                else
+                    size = System.Windows.Forms.Screen.FromControl(this).WorkingArea.Size;
+            }
+
+            return size;
+        }
+
+        private void RemoveTempTabBarItems()
+        {
+            if (m_TempTabBar != null)
+            {
+                System.Collections.ArrayList list = new System.Collections.ArrayList(m_TempTabBar.Items.Count);
+                m_TempTabBar.Items.CopyTo(list);
+                foreach (BaseItem item in list)
+                {
+                    if (item.Tag != null && item.Tag.ToString() == "systempdockitem")
+                        m_TempTabBar.Items.Remove(item);
+                }
+            }
+        }
+
+        internal Bar TempTabBar
+        {
+            get { return m_TempTabBar; }
+        }
+
+        internal void DragMouseMove()
+        {
+            Point p = this.PointToClient(Control.MousePosition);
+            this.OnMouseMove(new MouseEventArgs(MouseButtons.Left, 0, p.X, p.Y, 0));
+        }
+        internal void DragMouseUp()
+        {
+            Point p = this.PointToClient(Control.MousePosition);
+            this.OnMouseUp(new MouseEventArgs(MouseButtons.Left, 0, p.X, p.Y, 0));
+        }
+
+        internal void InternalMouseMove(MouseEventArgs e)
+        {
+            this.OnMouseMove(e);
+        }
+
+        /// <summary>
+        /// Returns true if bar is being moved/dragged by user.
+        /// </summary>
+        internal bool IsBarMoving
+        {
+            get { return m_MoveWindow; }
+        }
+
+        /// <summary>
+        /// Method is called by DotNetBarManager when bar is being moved and Escape key is pressed.
+        /// </summary>
+        internal void OnEscapeKey()
+        {
+            EndDocking(true, Point.Empty);
+        }
+
+        protected override void OnFontChanged(EventArgs e)
+        {
+            this.InvalidateFontChange();
+            base.OnFontChanged(e);
+        }
+
+        private void InvalidateFontChange()
+        {
+            if (m_ItemContainer != null)
+                BarUtilities.InvalidateFontChange(m_ItemContainer.SubItems);
+        }
+
+        private bool m_InMouseMove = false;
+        private Rectangle m_OldOutlineRectangle = Rectangle.Empty;
+        private Form m_OutlineForm = null;
+        //private bool m_OutlineDrag=true;
+        protected override void OnMouseMove(MouseEventArgs e)
+        {
+            if (m_InMouseMove)
+                return;
+            m_InMouseMove = true;
+            // Start window dragging
+            if (m_MoveWindow && m_BarState != eBarState.Popup && e.Button == System.Windows.Forms.MouseButtons.Left && DotNetBarManager.MouseDockingEnabled) 
+            {
+                if (this.Cursor != System.Windows.Forms.Cursors.SizeAll)
+                    this.Cursor = System.Windows.Forms.Cursors.SizeAll;
+
+                Point p = Control.MousePosition;
+                Point p2 = this.PointToClient(p);
+                IOwnerBarSupport ownerDock = m_Owner as IOwnerBarSupport;
+
+                // Graceful exit
+                if (ownerDock == null || Math.Abs(p2.X - m_MouseDownPt.X) <= 4 && Math.Abs(p2.Y - m_MouseDownPt.Y) <= 4)
+                {
+                    base.OnMouseMove(e);
+                    m_InMouseMove = false;
+                    return;
+                }
+                DockSiteInfo pDockInfo = ownerDock.GetDockInfo(this, p.X, p.Y);
+                if (pDockInfo.objDockSite == null && !m_CanUndock)
+                {
+                    base.OnMouseMove(e);
+                    m_InMouseMove = false;
+                    return;
+                }
+                bool bPreview = true;
+
+                if (!m_OldOutlineRectangle.IsEmpty)
+                {
+                    NativeFunctions.DrawReversibleDesktopRect(m_OldOutlineRectangle, 3);
+                    m_OldOutlineRectangle = Rectangle.Empty;
+                }
+
+                if (pDockInfo.UseOutline && pDockInfo.objDockSite != null)
+                {
+                    Rectangle r = pDockInfo.objDockSite.GetBarDockRectangle(this, ref pDockInfo);
+                    if (!r.IsEmpty)
+                    {
+                        bPreview = false;
+                        if (m_OutlineForm == null)
+                            m_OutlineForm = CreateOutlineForm();
+                        NativeFunctions.SetWindowPos(m_OutlineForm.Handle, new IntPtr(NativeFunctions.HWND_TOP), r.X, r.Y, r.Width, r.Height, NativeFunctions.SWP_SHOWWINDOW | NativeFunctions.SWP_NOACTIVATE);
+                    }
+                }
+                if (bPreview && m_OutlineForm != null)
+                {
+                    m_OutlineForm.Visible = false;
+                }
+
+                m_DragDockInfo = pDockInfo;
+
+                if (bPreview)
+                {
+                    //if(m_BarState==eBarState.Floating || this.LayoutType!=eLayoutType.DockContainer || pDockInfo.TabDockContainer!=null)
+                    DockingHandler(pDockInfo, p);
+                }
+            }
+            else if (e.Button == System.Windows.Forms.MouseButtons.None)
+            {
+                if (m_BarState == eBarState.Floating)
+                {
+                    if (m_ItemContainer.LayoutType == eLayoutType.DockContainer && ((e.X <= 2 && e.Y <= 2) || (e.X >= this.Width - 4 && e.Y >= this.Height - 4)))
+                        this.Cursor = System.Windows.Forms.Cursors.SizeNWSE;
+                    else if (m_ItemContainer.LayoutType == eLayoutType.DockContainer && ((e.X >= this.Width - 2 && e.Y <= 2) || (e.X <= 4 && e.Y >= this.Height - 4)))
+                        this.Cursor = System.Windows.Forms.Cursors.SizeNESW;
+                    else if (e.X >= 0 && e.X <= 2 || e.X >= this.Width - 3 && e.X <= this.Width)
+                        this.Cursor = System.Windows.Forms.Cursors.SizeWE;
+                    else if (e.Y >= 0 && e.Y <= 2 || e.Y >= this.Height - 3 && e.Y <= this.Height)
+                        this.Cursor = System.Windows.Forms.Cursors.SizeNS;
+                    else if (this.Cursor == System.Windows.Forms.Cursors.SizeWE || this.Cursor == System.Windows.Forms.Cursors.SizeNS || this.Cursor == System.Windows.Forms.Cursors.SizeNWSE || this.Cursor == System.Windows.Forms.Cursors.SizeNESW)
+                        this.Cursor = System.Windows.Forms.Cursors.Default;
+                }
+                //else if(m_BarState==eBarState.Docked && m_ItemContainer.LayoutType==eLayoutType.DockContainer && m_ItemContainer.Stretch)
+                //{
+                //    if((e.X<=2 && this.DockedSite.Dock==DockStyle.Right) || (e.X>=this.Width-2 && this.DockedSite.Dock==DockStyle.Left))
+                //        this.Cursor=Cursors.VSplit;	
+                //    else if((e.Y<=2 && this.DockedSite.Dock==DockStyle.Bottom) || (e.Y>=this.Height-2 && this.DockedSite.Dock==DockStyle.Top))
+                //        this.Cursor=Cursors.HSplit;
+                //    else if(e.X<=2 && (this.DockedSite.Dock==DockStyle.Bottom || this.DockedSite.Dock==DockStyle.Top) && this.Left>0)
+                //        this.Cursor=Cursors.VSplit;
+                //    else if(e.Y<=2 && (this.DockedSite.Dock==DockStyle.Left || this.DockedSite.Dock==DockStyle.Right) && this.Top>0)
+                //        this.Cursor=Cursors.HSplit;
+                //    else if(this.Cursor==Cursors.HSplit || this.Cursor==Cursors.VSplit)
+                //        this.Cursor=Cursors.Default;
+                //}
+                else if (m_BarState == eBarState.AutoHide && m_ItemContainer.LayoutType == eLayoutType.DockContainer && m_ItemContainer.Stretch)
+                {
+                    if ((e.X <= 2 && m_LastDockSiteInfo.DockSide == DockStyle.Right) || (e.X >= this.Width - 2 && m_LastDockSiteInfo.DockSide == DockStyle.Left))
+                        this.Cursor = Cursors.VSplit;
+                    else if ((e.Y <= 2 && m_LastDockSiteInfo.DockSide == DockStyle.Bottom) || (e.Y >= this.Height - 2 && m_LastDockSiteInfo.DockSide == DockStyle.Top))
+                        this.Cursor = Cursors.HSplit;
+                    else if (e.X <= 2 && (m_LastDockSiteInfo.DockSide == DockStyle.Bottom || m_LastDockSiteInfo.DockSide == DockStyle.Top) && this.Left > 0)
+                        this.Cursor = Cursors.VSplit;
+                    else if (e.Y <= 2 && (m_LastDockSiteInfo.DockSide == DockStyle.Left || m_LastDockSiteInfo.DockSide == DockStyle.Right) && this.Top > 0)
+                        this.Cursor = Cursors.HSplit;
+                    else if (this.Cursor == Cursors.HSplit || this.Cursor == Cursors.VSplit)
+                        this.Cursor = Cursors.Default;
+                }
+                else if (m_BarState == eBarState.Docked && m_GrabHandleStyle == eGrabHandleStyle.ResizeHandle)
+                {
+                    if ((e.X > this.Location.X + this.Width - GrabHandleResizeWidth && this.RightToLeft == RightToLeft.No) ||
+                        (e.X < this.Location.X + +GrabHandleResizeWidth && this.RightToLeft == RightToLeft.Yes))
+                    {
+                        Form form = this.FindForm();
+                        if (form != null && form.WindowState == FormWindowState.Maximized)
+                        {
+                            if (this.Cursor == Cursors.SizeNESW || this.Cursor == Cursors.SizeNWSE)
+                                this.Cursor = Cursors.Default;
+                        }
+                        else
+                        {
+                            if (this.RightToLeft == RightToLeft.Yes)
+                                this.Cursor = Cursors.SizeNESW;
+                            else
+                                this.Cursor = Cursors.SizeNWSE;
+                        }
+                    }
+                    else if (this.Cursor == Cursors.SizeNESW || this.Cursor == Cursors.SizeNWSE)
+                        this.Cursor = Cursors.Default;
+                }
+
+                if (m_ItemContainer.EffectiveStyle == eDotNetBarStyle.OfficeXP || m_ItemContainer.EffectiveStyle == eDotNetBarStyle.Office2003 || m_ItemContainer.EffectiveStyle == eDotNetBarStyle.VS2005 || BarFunctions.IsOffice2007Style(m_ItemContainer.EffectiveStyle))
+                {
+                    if (!m_SystemButtons.CloseButtonRect.IsEmpty && m_SystemButtons.CloseButtonRect.Contains(e.X, e.Y))
+                    {
+                        if (!m_SystemButtons.MouseOverClose)
+                        {
+                            m_SystemButtons.MouseOverClose = true;
+                            PaintCloseButton();
+                        }
+                    }
+                    else if (m_SystemButtons.MouseOverClose)
+                    {
+                        m_SystemButtons.MouseOverClose = false;
+                        PaintCloseButton();
+                    }
+                    if (!m_SystemButtons.MaximizeButtonRect.IsEmpty && m_SystemButtons.MaximizeButtonRect.Contains(e.X, e.Y))
+                    {
+                        if (!m_SystemButtons.MouseOverMaximize)
+                        {
+                            m_SystemButtons.MouseOverMaximize = true;
+                            PaintMaximizeButton();
+                        }
+                    }
+                    else if (m_SystemButtons.MouseOverMaximize)
+                    {
+                        m_SystemButtons.MouseOverMaximize = false;
+                        PaintMaximizeButton();
+                    }
+                    if (!m_SystemButtons.CaptionButtonRect.IsEmpty && m_SystemButtons.CaptionButtonRect.Contains(e.X, e.Y))
+                    {
+                        if (!m_SystemButtons.MouseOverCaption)
+                        {
+                            m_SystemButtons.MouseOverCaption = true;
+                            PaintCaptionButton();
+                        }
+                    }
+                    else if (m_SystemButtons.MouseOverCaption)
+                    {
+                        m_SystemButtons.MouseOverCaption = false;
+                        PaintCaptionButton();
+                    }
+                    if (!m_SystemButtons.CustomizeButtonRect.IsEmpty && m_SystemButtons.CustomizeButtonRect.Contains(e.X, e.Y))
+                    {
+                        if (!m_SystemButtons.MouseOverCustomize)
+                        {
+                            m_SystemButtons.MouseOverCustomize = true;
+                            PaintCustomizeButton();
+                        }
+                    }
+                    else if (m_SystemButtons.MouseOverCustomize)
+                    {
+                        m_SystemButtons.MouseOverCustomize = false;
+                        PaintCustomizeButton();
+                    }
+                    if (!m_SystemButtons.AutoHideButtonRect.IsEmpty && m_SystemButtons.AutoHideButtonRect.Contains(e.X, e.Y))
+                    {
+                        if (!m_SystemButtons.MouseOverAutoHide)
+                        {
+                            m_SystemButtons.MouseOverAutoHide = true;
+                            PaintAutoHideButton();
+                        }
+                    }
+                    else if (m_SystemButtons.MouseOverAutoHide)
+                    {
+                        m_SystemButtons.MouseOverAutoHide = false;
+                        PaintAutoHideButton();
+                    }
+                }
+            }
+            else if (e.Button == System.Windows.Forms.MouseButtons.Left && m_SizeWindow != 0 && m_BarState == eBarState.Floating)
+            {
+                System.Drawing.Size oldSize = this.ClientSize;
+                System.Drawing.Size newSize = System.Drawing.Size.Empty;
+                System.Drawing.Size minSize = MinimumDockSize(m_ItemContainer.Orientation);
+                if (m_SizeWindow == SIZE_NWN || m_SizeWindow == SIZE_NWS)
+                {
+                    if (m_SizeWindow == SIZE_NWS)
+                        newSize = RecalcSizeOnly(new System.Drawing.Size(e.X, e.Y));
+                    else
+                        newSize = RecalcSizeOnly(new System.Drawing.Size(this.Width - e.X, this.Height - e.Y));
+                    if (!oldSize.Equals(newSize) && newSize.Width >= minSize.Width && newSize.Height >= minSize.Height)
+                    {
+                        if (m_SizeWindow == SIZE_NWS)
+                            this.ClientSize = newSize;
+                        else
+                        {
+                            m_Float.Location = new Point(m_Float.Left + (this.Width - newSize.Width), m_Float.Top + (this.Height - newSize.Height));
+                            this.ClientSize = newSize;
+                        }
+                        RecalcSize();
+                        this.Update();
+                        // Updates the parent form, there was a very bad lagging painting effect when dockable window is resized and the DotNetBar controls where behind it.
+                        IOwner owner = m_Owner as IOwner;
+                        if (owner != null && owner.ParentForm != null)
+                            owner.ParentForm.Update();
+                    }
+                }
+                else if (m_SizeWindow == SIZE_NEN || m_SizeWindow == SIZE_NES)
+                {
+                    if (m_SizeWindow == SIZE_NES)
+                        newSize = RecalcSizeOnly(new System.Drawing.Size(this.Width - e.X, e.Y));
+                    else
+                        newSize = RecalcSizeOnly(new System.Drawing.Size(e.X, this.Height - e.Y));
+                    if (!oldSize.Equals(newSize) && newSize.Width >= minSize.Width && newSize.Height >= minSize.Height)
+                    {
+                        if (m_SizeWindow == SIZE_NES)
+                        {
+                            m_Float.Location = new Point(m_Float.Left + (this.Width - newSize.Width), m_Float.Top);
+                            this.ClientSize = newSize;
+                        }
+                        else
+                        {
+                            m_Float.Location = new Point(m_Float.Left, m_Float.Top + (this.Height - newSize.Height));
+                            this.ClientSize = newSize;
+                        }
+                        RecalcSize();
+                        this.Update();
+                        // Updates the parent form, there was a very bad lagging painting effect when dockable window is resized and the DotNetBar controls where behind it.
+                        IOwner owner = m_Owner as IOwner;
+                        if (owner != null && owner.ParentForm != null)
+                            owner.ParentForm.Update();
+                    }
+                }
+                else if (m_SizeWindow == SIZE_E)
+                {
+                    newSize = RecalcSizeOnly(new System.Drawing.Size(e.X, this.Height));
+                    if (!oldSize.Equals(newSize) && newSize.Width >= minSize.Width && newSize.Height >= minSize.Height)
+                    {
+                        this.ClientSize = newSize;
+                        RecalcSize();
+                        this.Update();
+                        // Updates the parent form, there was a very bad lagging painting effect when dockable window is resized and the DotNetBar controls where behind it.
+                        IOwner owner = m_Owner as IOwner;
+                        if (owner != null && owner.ParentForm != null)
+                            owner.ParentForm.Update();
+                    }
+                }
+                else if (m_SizeWindow == SIZE_W)
+                {
+                    newSize = RecalcSizeOnly(new System.Drawing.Size(this.Width - e.X, this.Height));
+                    if (!oldSize.Equals(newSize) && newSize.Width >= minSize.Width && newSize.Height >= minSize.Height)
+                    {
+                        int iRight = m_Float.Right;
+                        this.ClientSize = newSize;
+                        RecalcSize();
+                        m_Float.Left = m_Float.Left + iRight - m_Float.Right;
+                        this.Update();
+                        // Updates the parent form, there was a very bad lagging painting effect when dockable window is resized and the DotNetBar controls where behind it.
+                        IOwner owner = m_Owner as IOwner;
+                        if (owner != null && owner.ParentForm != null)
+                            owner.ParentForm.Update();
+                    }
+                }
+                else if (m_SizeWindow == SIZE_S)
+                {
+                    if (e.Y > 0)
+                    {
+                        if (m_ItemContainer.LayoutType == eLayoutType.TaskList || m_ItemContainer.LayoutType == eLayoutType.DockContainer)
+                            newSize = RecalcSizeOnly(new System.Drawing.Size(this.Width, e.Y));
+                        else
+                            newSize = RecalcSizeOnly(new System.Drawing.Size((int)(m_MouseDownSize.Width * ((float)m_MouseDownSize.Height / (float)e.Y)), this.Height));
+                        if (!oldSize.Equals(newSize) && newSize.Width >= minSize.Width && newSize.Height >= minSize.Height)
+                        {
+                            this.ClientSize = newSize;
+                            RecalcSize();
+                            this.Update();
+                            // Updates the parent form, there was a very bad lagging painting effect when dockable window is resized and the DotNetBar controls where behind it.
+                            IOwner owner = m_Owner as IOwner;
+                            if (owner != null && owner.ParentForm != null)
+                                owner.ParentForm.Update();
+                        }
+                    }
+                }
+                else if (m_SizeWindow == SIZE_N)
+                {
+                    if (e.Y != 0)
+                    {
+                        if (m_ItemContainer.LayoutType == eLayoutType.TaskList || m_ItemContainer.LayoutType == eLayoutType.DockContainer)
+                            newSize = RecalcSizeOnly(new Size(this.Width, this.Height - e.Y));
+                        else
+                            newSize = RecalcSizeOnly(new System.Drawing.Size((int)(m_MouseDownSize.Width * ((float)m_MouseDownSize.Height / (float)(this.Height - e.Y))), this.Height));
+                        if (!oldSize.Equals(newSize) && newSize.Width >= minSize.Width && newSize.Height >= minSize.Height)
+                        {
+                            int iBottom = m_Float.Bottom;
+                            this.ClientSize = newSize;
+                            RecalcSize();
+                            m_Float.Top = m_Float.Top + iBottom - m_Float.Bottom;
+                            this.Update();
+                            // Updates the parent form, there was a very bad lagging painting effect when dockable window is resized and the DotNetBar controls where behind it.
+                            IOwner owner = m_Owner as IOwner;
+                            if (owner != null && owner.ParentForm != null)
+                                owner.ParentForm.Update();
+                        }
+                    }
+                }
+                m_FloatingRect = new Rectangle(this.Location, this.Size);
+            }
+            else if (e.Button == System.Windows.Forms.MouseButtons.Left && m_SizeWindow != 0 && m_BarState == eBarState.AutoHide || m_SizeWindow == SIZE_PARENTRESIZE && m_BarState == eBarState.Docked) //(m_BarState == eBarState.Docked || m_BarState == eBarState.AutoHide))
+            {
+                System.Drawing.Size oldSize = this.ClientSize;
+                System.Drawing.Size newSize = System.Drawing.Size.Empty;
+                if (m_SizeWindow == SIZE_PARENTRESIZE)
+                {
+                    if (this.RightToLeft == RightToLeft.No)
+                    {
+                        if (this.Parent != null && this.Parent.Parent != null)
+                        {
+                            Point pScreen = this.PointToScreen(new Point(e.X, e.Y));
+                            if (this.Parent.Parent.Parent != null)
+                            {
+                                Point pl = this.Parent.Parent.Parent.PointToScreen(this.Parent.Parent.Location);
+                                this.Parent.Parent.Size = new Size(pScreen.X - pl.X + m_ResizeOffset.X, pScreen.Y - pl.Y + m_ResizeOffset.Y);
+                            }
+                            else
+                                this.Parent.Parent.Size = new Size(pScreen.X - this.Parent.Parent.Location.X + m_ResizeOffset.X, pScreen.Y - this.Parent.Parent.Location.Y + m_ResizeOffset.Y);
+                            IOwner owner = m_Owner as IOwner;
+                            if (owner != null && owner.ParentForm != null)
+                                owner.ParentForm.Update();
+                        }
+                        else if (m_Owner == null && !(this.Parent is DockSite) && !(this.Parent is FloatingContainer))
+                        {
+                            Form form = this.FindForm();
+                            if (form != null)
+                            {
+                                Point pScreen = this.PointToScreen(new Point(e.X, e.Y));
+                                form.Size = new Size(pScreen.X - form.Location.X + m_ResizeOffset.X, pScreen.Y - form.Location.Y + m_ResizeOffset.Y);
+                                form.Update();
+                            }
+                        }
+                    }
+                    else
+                    {
+                        if (this.Parent != null && this.Parent.Parent != null)
+                        {
+                            Point pScreen = this.PointToScreen(new Point(e.X, e.Y));
+                            if (this.Parent.Parent.Parent != null)
+                            {
+                                Point pl = this.Parent.Parent.Parent.PointToScreen(this.Parent.Parent.Location);
+                                Rectangle b = this.Parent.Parent.Bounds;
+                                b.X = pScreen.X - m_ResizeOffset.X;
+                                b.Width += this.Parent.Parent.Left - b.X;
+                                b.Height = pScreen.Y - pl.Y + m_ResizeOffset.Y;
+                                this.Parent.Parent.Bounds = b;
+                            }
+                            else
+                            {
+                                Rectangle b = this.Parent.Parent.Bounds;
+                                b.X = pScreen.X - m_ResizeOffset.X;
+                                b.Width += this.Parent.Parent.Left - b.X;
+                                b.Height = pScreen.Y - this.Parent.Parent.Location.Y + m_ResizeOffset.Y;
+                                this.Parent.Parent.Bounds = b;
+                            }
+                            IOwner owner = m_Owner as IOwner;
+                            if (owner != null && owner.ParentForm != null)
+                                owner.ParentForm.Update();
+                        }
+                        else if (m_Owner == null && !(this.Parent is DockSite) && !(this.Parent is FloatingContainer))
+                        {
+                            Form form = this.FindForm();
+                            if (form != null)
+                            {
+                                Point pScreen = this.PointToScreen(new Point(e.X, e.Y));
+                                Rectangle b = form.Bounds;
+
+                                b.X = pScreen.X - m_ResizeOffset.X;
+                                b.Width += form.Left - b.X;
+                                b.Height = pScreen.Y - form.Location.Y + m_ResizeOffset.Y;
+                                form.Bounds = b;
+                                //Size = new Size(pScreen.X - form.Location.X + m_ResizeOffset.X, pScreen.Y - form.Location.Y + m_ResizeOffset.Y);
+                                form.Update();
+                            }
+                        }
+                    }
+                }
+                else if (m_SizeWindow == SIZE_HSPLITRIGHT)
+                {
+                    int formClientWidth = GetFormClientWidth();
+                    int mouseX = e.X;
+                    int minClientSize = 32;
+                    if (m_Owner is DotNetBarManager) minClientSize = ((DotNetBarManager)m_Owner).MinimumClientSize.Width;
+
+                    if (minClientSize > 0 && formClientWidth + mouseX < minClientSize)
+                        mouseX = minClientSize - formClientWidth;
+
+                    if (formClientWidth + mouseX >= minClientSize || minClientSize == 0)
+                    {
+                        int oldMinWidth = m_ItemContainer.MinWidth;
+                        m_ItemContainer.MinWidth = 0;
+                        newSize = RecalcSizeOnly(new Size(this.Width - mouseX, this.Height));
+                        m_ItemContainer.MinWidth = oldMinWidth;
+                        if (!oldSize.Equals(newSize))
+                        {
+                            if (m_BarState == eBarState.AutoHide)
+                            {
+                                Rectangle oldRect = this.Bounds;
+                                this.EnableRedraw = false;
+                                try
+                                {
+                                    m_ItemContainer.MinWidth = m_ItemContainer.WidthInternal - mouseX;
+                                    this.Width = this.Width - mouseX;
+                                    RecalcSize();
+                                    this.Left = this.Left + (oldSize.Width - this.Size.Width);
+                                }
+                                finally
+                                {
+                                    this.EnableRedraw = true;
+                                }
+                                if (this.Parent != null)
+                                {
+                                    this.Parent.Invalidate(oldRect, true);
+                                    this.Parent.Invalidate(this.Bounds, true);
+                                    this.Parent.Update();
+                                }
+                                else
+                                    this.Refresh();
+                            }
+                            else
+                            {
+                                int iOldMinWidth = m_ItemContainer.MinWidth;
+                                m_ItemContainer.MinWidth = m_ItemContainer.WidthInternal - mouseX;
+
+                                if (m_ItemContainer.MinWidth < iOldMinWidth)
+                                    SyncLineMinWidth();
+                                RecalcLayout();
+                            }
+                            if (m_BarState == eBarState.AutoHide)
+                                m_LastDockSiteInfo.DockedWidth = this.Width;
+                        }
+                    }
+                }
+                else if (m_SizeWindow == SIZE_HSPLITLEFT)
+                {
+                    int formClientWidth = GetFormClientWidth();
+                    int mouseX = e.X;
+                    int minClientSize = 32;
+                    if (m_Owner is DotNetBarManager) minClientSize = ((DotNetBarManager)m_Owner).MinimumClientSize.Width;
+
+                    if (minClientSize > 0 && formClientWidth - (mouseX - this.Width) < minClientSize)
+                    {
+                        mouseX = formClientWidth + this.Width - minClientSize;
+                    }
+
+                    if (formClientWidth - (mouseX - this.Width) >= minClientSize || minClientSize == 0)
+                    {
+                        int oldMinWidth = m_ItemContainer.MinWidth;
+                        m_ItemContainer.MinWidth = 0;
+                        newSize = RecalcSizeOnly(new Size(mouseX, this.Height));
+                        m_ItemContainer.MinWidth = oldMinWidth;
+                        if (!oldSize.Equals(newSize))
+                        {
+                            if (m_BarState == eBarState.AutoHide)
+                            {
+                                Rectangle oldRect = this.Bounds;
+                                this.EnableRedraw = false;
+                                try
+                                {
+                                    m_ItemContainer.MinWidth = m_ItemContainer.WidthInternal + (mouseX - this.Width);
+                                    this.Width = this.Width + (mouseX - this.Width);
+                                    RecalcSize();
+                                }
+                                finally
+                                {
+                                    this.EnableRedraw = true;
+                                }
+                                if (this.Parent != null)
+                                {
+                                    this.Parent.Invalidate(oldRect, true);
+                                    this.Parent.Invalidate(this.Bounds, true);
+                                    this.Parent.Update();
+                                }
+                                else
+                                    this.Refresh();
+                            }
+                            else
+                            {
+                                int iOldMinWidth = m_ItemContainer.MinWidth;
+                                m_ItemContainer.MinWidth = m_ItemContainer.WidthInternal + (mouseX - this.Width);
+                                if (m_ItemContainer.MinWidth < iOldMinWidth)
+                                    SyncLineMinWidth();
+                                RecalcLayout();
+                            }
+                            if (m_BarState == eBarState.AutoHide)
+                                m_LastDockSiteInfo.DockedWidth = this.Width;
+                        }
+                    }
+                }
+                else if (m_SizeWindow == SIZE_VSPLITBOTTOM)
+                {
+                    int formClientHeight = GetFormClientHeight();
+                    int mouseY = e.Y;
+                    int minClientSize = 32;
+                    if (m_Owner is DotNetBarManager) minClientSize = ((DotNetBarManager)m_Owner).MinimumClientSize.Height;
+
+                    if (minClientSize > 0 && formClientHeight + mouseY < minClientSize)
+                        mouseY = minClientSize - formClientHeight;
+
+                    if (formClientHeight + mouseY >= minClientSize || minClientSize == 0)
+                    {
+                        int oldMinHeight = m_ItemContainer.MinHeight;
+                        m_ItemContainer.MinHeight = 0;
+                        newSize = RecalcSizeOnly(new Size(this.Width, this.Height - mouseY));
+                        m_ItemContainer.MinHeight = oldMinHeight;
+                        if (!oldSize.Equals(newSize))
+                        {
+                            if (m_BarState == eBarState.AutoHide)
+                            {
+                                Rectangle oldRect = this.Bounds;
+                                this.EnableRedraw = false;
+                                try
+                                {
+                                    m_ItemContainer.MinHeight = m_ItemContainer.HeightInternal - mouseY;
+                                    this.Height = this.Height - mouseY;
+                                    RecalcSize();
+                                    this.Top = this.Top + (oldSize.Height - this.Height);
+                                }
+                                finally
+                                {
+                                    this.EnableRedraw = true;
+                                }
+                                if (this.Parent != null)
+                                {
+                                    this.Parent.Invalidate(oldRect, true);
+                                    this.Parent.Invalidate(this.Bounds, true);
+                                    this.Parent.Update();
+                                }
+                                else
+                                    this.Refresh();
+                            }
+                            else
+                            {
+                                int iOldMinHeight = m_ItemContainer.MinHeight;
+                                Size minSize = this.MinimumDockSize(m_ItemContainer.Orientation);
+                                if (m_ItemContainer.HeightInternal - mouseY >= minSize.Height)
+                                    m_ItemContainer.MinHeight = m_ItemContainer.HeightInternal - mouseY;
+                                if (m_ItemContainer.MinHeight < iOldMinHeight)
+                                    SyncLineMinHeight();
+                                RecalcLayout();
+                            }
+
+                            if (m_BarState == eBarState.AutoHide)
+                                m_LastDockSiteInfo.DockedHeight = this.Height;
+                        }
+                    }
+                }
+                else if (m_SizeWindow == SIZE_VSPLITTOP)
+                {
+                    int formClientHeight = GetFormClientHeight();
+                    int mouseY = e.Y;
+                    int minClientSize = 32;
+                    if (m_Owner is DotNetBarManager) minClientSize = ((DotNetBarManager)m_Owner).MinimumClientSize.Height;
+
+                    if (minClientSize > 0 && formClientHeight - (mouseY - this.Height) < minClientSize)
+                        mouseY = formClientHeight + this.Height - minClientSize;
+
+                    if (formClientHeight - (mouseY - this.Height) >= minClientSize || minClientSize == 0)
+                    {
+                        int oldMinHeight = m_ItemContainer.MinHeight;
+                        m_ItemContainer.MinHeight = 0;
+                        newSize = RecalcSizeOnly(new Size(this.Width, mouseY));
+                        m_ItemContainer.MinHeight = oldMinHeight;
+                        if (!oldSize.Equals(newSize))
+                        {
+                            if (m_BarState == eBarState.AutoHide)
+                            {
+                                Rectangle oldRect = this.Bounds;
+                                this.EnableRedraw = false;
+                                try
+                                {
+                                    m_ItemContainer.MinHeight = m_ItemContainer.HeightInternal + (mouseY - this.Height);
+                                    this.Height = mouseY;
+                                    this.RecalcSize();
+                                }
+                                finally
+                                {
+                                    this.EnableRedraw = true;
+                                }
+                                if (this.Parent != null)
+                                {
+                                    this.Parent.Invalidate(oldRect, true);
+                                    this.Parent.Invalidate(this.Bounds, true);
+                                    this.Parent.Update();
+                                }
+                                else
+                                    this.Refresh();
+                            }
+                            else
+                            {
+                                int iOldMinHeight = m_ItemContainer.MinHeight;
+                                m_ItemContainer.MinHeight = m_ItemContainer.HeightInternal + (mouseY - this.Height);
+                                if (m_ItemContainer.MinHeight < iOldMinHeight)
+                                    SyncLineMinHeight();
+                                RecalcLayout();
+                            }
+
+                            if (m_BarState == eBarState.AutoHide)
+                                m_LastDockSiteInfo.DockedHeight = this.Height;
+                        }
+                    }
+                }
+                else if (m_SizeWindow == SIZE_HSPLIT && this.Parent.Controls.IndexOf(this) > 0)
+                {
+                    Bar barLeft = GetPreviousVisibleBar(this); //this.Parent.Controls[iIndex] as Bar;
+                    if (barLeft != null && barLeft.DockLine == this.DockLine)
+                    {
+                        System.Drawing.Size minLeftSize = GetAdjustedFullSize(barLeft.MinimumDockSize(eOrientation.Horizontal));
+                        System.Drawing.Size minThisSize = GetAdjustedFullSize(this.MinimumDockSize(eOrientation.Horizontal));
+                        int x = e.X;
+                        if (barLeft.Width + x < minLeftSize.Width)
+                            x += (minLeftSize.Width - (barLeft.Width + x)) - 1;
+                        if (this.Width - x < minThisSize.Width)
+                            x -= (minThisSize.Width - (this.Width - x)) + 1;
+
+                        if (barLeft.Width + x >= minLeftSize.Width && this.Width - x >= minThisSize.Width)
+                        {
+                            Size oldLeftBarSize = barLeft.Size;
+                            Size newBarLeftSize = barLeft.RecalcSizeOnly(new Size(barLeft.Width + x, this.Height));
+                            newSize = this.RecalcSizeOnly(new Size(this.Width - x, this.Height));
+                            if (!oldLeftBarSize.Equals(newBarLeftSize) && !oldSize.Equals(newSize))
+                            {
+                                this.SplitDockWidth = 0;
+                                barLeft.SplitDockWidth = barLeft.Width + x;
+                                foreach (Control c in this.Parent.Controls)
+                                {
+                                    if (c != this && c != barLeft && c.Visible && c is Bar)
+                                    {
+                                        Bar b = c as Bar;
+                                        if (b.DockLine == this.DockLine && b.SplitDockHeight == 0)
+                                            b.SplitDockWidth = b.Width;
+                                    }
+                                }
+                                RecalcLayout();
+                            }
+                        }
+                    }
+                }
+                else if (m_SizeWindow == SIZE_VSPLIT && this.Parent.Controls.IndexOf(this) > 0)
+                {
+                    // Resize two bars that are docked on the same line, this bar is always on the right side
+                    //int iIndex=this.Parent.Controls.IndexOf(this)-1;  // Index of the control to the left
+                    Bar barLeft = GetPreviousVisibleBar(this); //this.Parent.Controls[iIndex] as Bar;
+                    if (barLeft != null && barLeft.DockLine == this.DockLine)
+                    {
+                        System.Drawing.Size minLeftSize = GetAdjustedFullSize(barLeft.MinimumDockSize(eOrientation.Horizontal));
+                        System.Drawing.Size minThisSize = GetAdjustedFullSize(this.MinimumDockSize(eOrientation.Horizontal));
+                        int y = e.Y;
+                        if (barLeft.Height + y < minLeftSize.Height)
+                            y += (minLeftSize.Height - (barLeft.Height + y)) - 1;
+                        if (this.Height - y < minThisSize.Height)
+                            y -= minThisSize.Height - (this.Height - y) + 1;
+                        if (barLeft.Height + y >= minLeftSize.Height && this.Height - y >= minThisSize.Height)
+                        {
+                            Size oldLeftBarSize = barLeft.Size;
+                            Size newBarLeftSize = barLeft.RecalcSizeOnly(new Size(barLeft.Width, this.Height + y));
+                            newSize = this.RecalcSizeOnly(new Size(this.Width, this.Height - y));
+                            if (!oldLeftBarSize.Equals(newBarLeftSize) && !oldSize.Equals(newSize))
+                            {
+                                this.SplitDockHeight = 0;
+                                barLeft.SplitDockHeight = barLeft.Height + y;
+                                foreach (Control c in this.Parent.Controls)
+                                {
+                                    if (c != this && c != barLeft && c.Visible && c is Bar)
+                                    {
+                                        Bar b = c as Bar;
+                                        if (b.DockLine == this.DockLine && b.SplitDockHeight == 0)
+                                            b.SplitDockHeight = b.Height;
+                                    }
+                                }
+                                RecalcLayout();
+                            }
+                        }
+                    }
+                }
+            }
+
+            if (m_BarState == eBarState.Popup && m_ParentItem != null && m_ParentItem.DesignMode && e.Button == System.Windows.Forms.MouseButtons.Left && (Math.Abs(e.X - m_MouseDownPt.X) >= 2 || Math.Abs(e.Y - m_MouseDownPt.Y) >= 2 || m_DragDropInProgress))
+            {
+                BaseItem focus = m_FocusItem;
+                if (m_Owner is IOwner)
+                    focus = ((IOwner)m_Owner).GetFocusItem();
+                ISite site = this.GetSite();
+                if (site != null && focus != null)
+                {
+                    DesignTimeMouseMove(e);
+                }
+            }
+
+            base.OnMouseMove(e);
+            if (m_ItemContainer.SubItems.Count == 0)
+            {
+                m_InMouseMove = false;
+                return;
+            }
+            if (!m_MoveWindow && m_SizeWindow == 0)
+                m_ItemContainer.InternalMouseMove(e);
+            m_InMouseMove = false;
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public Form CreateOutlineForm()
+        {
+            return BarFunctions.CreateOutlineForm();
+        }
+        private Bar GetPreviousVisibleBar(Bar startBar)
+        {
+            if (this.Parent == null)
+                return null;
+            int iIndex = this.Parent.Controls.IndexOf(this) - 1;
+            if (iIndex >= 0)
+            {
+                for (int i = iIndex; i >= 0; i--)
+                {
+                    if (this.Parent.Controls[i].Visible)
+                        return this.Parent.Controls[i] as Bar;
+                }
+            }
+            return null;
+        }
+
+        private Bar GetNextVisibleBar(Bar startBar)
+        {
+            if (this.Parent == null)
+                return null;
+            int iIndex = this.Parent.Controls.IndexOf(this) + 1;
+            if (iIndex >= 0)
+            {
+                for (int i = iIndex; i < this.Parent.Controls.Count; i++)
+                {
+                    if (this.Parent.Controls[i].Visible)
+                        return this.Parent.Controls[i] as Bar;
+                }
+            }
+            return null;
+        }
+
+        private int GetFormClientWidth()
+        {
+            IOwner owner = m_Owner as IOwner;
+            if (owner == null || this.Parent == null || (this.Parent.Parent == null && m_BarState != eBarState.AutoHide))
+                return 0;
+
+            Control parentControl = this.Parent.Parent;
+            if (m_BarState == eBarState.AutoHide)
+                parentControl = owner.ParentForm;
+            if (parentControl == null && owner.ParentForm == null && m_Owner is DotNetBarManager)
+                parentControl = ((DotNetBarManager)m_Owner).ParentUserControl;
+
+            if (parentControl == null)
+                return 0;
+            int width = parentControl.ClientSize.Width;
+
+            foreach (Control ctrl in parentControl.Controls)
+            {
+                if (ctrl.Visible && (ctrl.Dock == DockStyle.Left || ctrl.Dock == DockStyle.Right))
+                    width -= ctrl.Width;
+            }
+            if (m_BarState == eBarState.AutoHide && this.Visible)
+                width -= this.Width;
+            return width;
+        }
+
+        private int GetFormClientHeight()
+        {
+            IOwner owner = m_Owner as IOwner;
+            if (owner == null || this.Parent == null || (this.Parent.Parent == null && m_BarState != eBarState.AutoHide))
+                return 0;
+            Control parentControl = null;
+            if (m_BarState == eBarState.AutoHide)
+                parentControl = owner.ParentForm;
+            else
+                parentControl = this.Parent.Parent;
+
+            if (parentControl == null && owner.ParentForm == null && m_Owner is DotNetBarManager)
+                parentControl = ((DotNetBarManager)m_Owner).ParentUserControl;
+
+            if (parentControl == null)
+                return 0;
+            int height = parentControl.ClientSize.Height;
+
+            foreach (Control ctrl in parentControl.Controls)
+            {
+                if (ctrl.Visible && (ctrl.Dock == DockStyle.Top || ctrl.Dock == DockStyle.Bottom))
+                    height -= ctrl.Height;
+            }
+            if (m_BarState == eBarState.AutoHide && this.Visible)
+                height -= this.Height;
+            return height;
+        }
+
+        internal void SyncLineMinWidth()
+        {
+            if (this.Parent == null)
+                return;
+            foreach (Control ctrl in this.Parent.Controls)
+            {
+                Bar bar = ctrl as Bar;
+                if (bar == null || bar == this || bar.DockLine != m_DockLine)
+                    continue;
+                bar.ItemsContainer.MinWidth = m_ItemContainer.MinWidth;
+            }
+        }
+        internal void SyncLineMinHeight()
+        {
+            if (this.Parent == null)
+                return;
+            foreach (Control ctrl in this.Parent.Controls)
+            {
+                Bar bar = ctrl as Bar;
+                if (bar == null || bar == this || bar.DockLine != m_DockLine)
+                    continue;
+                bar.ItemsContainer.MinHeight = m_ItemContainer.MinHeight;
+            }
+        }
+
+        protected override void OnMouseHover(EventArgs e)
+        {
+            base.OnMouseHover(e);
+            InternalMouseHover();
+        }
+
+        internal void InternalMouseHover()
+        {
+            if (!m_MoveWindow)
+            {
+                if (Control.MouseButtons == MouseButtons.Left)
+                {
+                    Point pClient = this.PointToClient(Control.MousePosition);
+                    if (!this.ClientRectangle.Contains(pClient))
+                    {
+                        IOwnerMenuSupport menu = this.Owner as IOwnerMenuSupport;
+                        if (menu != null)
+                        {
+                            if (menu.RelayMouseHover())
+                                return;
+                        }
+                    }
+                }
+                m_ItemContainer.InternalMouseHover();
+
+                if (m_SystemButtons.MouseOverAutoHide)
+                {
+                    using (LocalizationManager lm = new LocalizationManager(m_Owner as IOwnerLocalize))
+                    {
+                        string tip = lm.GetLocalizedString(LocalizationKeys.BarAutoHideButtonTooltip);
+                        if (tip != "")
+                            ShowToolTip(tip);
+                    }
+                }
+                else if (m_SystemButtons.MouseOverCustomize)
+                {
+                    using (LocalizationManager lm = new LocalizationManager(m_Owner as IOwnerLocalize))
+                    {
+                        string tip = lm.GetLocalizedString(LocalizationKeys.BarCustomizeButtonTooltip);
+                        if (tip != "")
+                            ShowToolTip(tip);
+                    }
+                }
+                else if (m_SystemButtons.MouseOverClose)
+                {
+                    using (LocalizationManager lm = new LocalizationManager(m_Owner as IOwnerLocalize))
+                    {
+                        string tip = lm.GetLocalizedString(LocalizationKeys.BarCloseButtonTooltip);
+                        if (tip != "")
+                            ShowToolTip(tip);
+                    }
+                }
+                else if (m_SystemButtons.MouseOverMaximize)
+                {
+                    using (LocalizationManager lm = new LocalizationManager(m_Owner as IOwnerLocalize))
+                    {
+                        string tip = lm.GetLocalizedString(LocalizationKeys.BarMaximizeButtonTooltip);
+                        if (!string.IsNullOrEmpty(tip))
+                            ShowToolTip(tip);
+                    }
+                }
+            }
+        }
+
+        protected override void OnMouseLeave(EventArgs e)
+        {
+            // If we had hot sub item pass the mouse leave message to it...
+            if (this.Cursor != System.Windows.Forms.Cursors.Arrow)
+                this.Cursor = System.Windows.Forms.Cursors.Arrow;
+
+            if (m_SystemButtons.MouseOverClose)
+            {
+                m_SystemButtons.MouseOverClose = false;
+                PaintCloseButton();
+            }
+            if (m_SystemButtons.MouseOverMaximize)
+            {
+                m_SystemButtons.MouseOverMaximize = false;
+                PaintMaximizeButton();
+            }
+            if (m_SystemButtons.MouseOverCaption)
+            {
+                m_SystemButtons.MouseOverCaption = false;
+                PaintCaptionButton();
+            }
+            if (m_SystemButtons.MouseOverCustomize)
+            {
+                m_SystemButtons.MouseOverCustomize = false;
+                PaintCustomizeButton();
+            }
+            if (m_SystemButtons.MouseOverAutoHide)
+            {
+                m_SystemButtons.MouseOverAutoHide = false;
+                PaintAutoHideButton();
+            }
+
+            if (!m_MoveWindow)
+                m_ItemContainer.InternalMouseLeave();
+
+            base.OnMouseLeave(e);
+        }
+
+        protected override void OnMouseDown(MouseEventArgs e)
+        {
+            m_MouseDownPt = new Point(e.X, e.Y);
+            m_MouseDownSize = this.Size;
+            HideToolTip();
+            if (e.Button == MouseButtons.Left && !m_SystemButtons.CustomizeButtonRect.IsEmpty && m_SystemButtons.CustomizeButtonRect.Contains(m_MouseDownPt) && !this.DesignMode && !m_ItemContainer.DesignMode)
+            {
+                if (m_CustomizeMenu != null)
+                {
+                    if (m_CustomizeMenu.GetOwner() == null)
+                        m_CustomizeMenu.SetOwner(m_Owner);
+                    Point popupLocation;
+                    if (m_ItemContainer.EffectiveStyle == eDotNetBarStyle.Office2000)
+                        popupLocation = new Point(0, 16);
+                    else
+                        popupLocation = new Point(m_SystemButtons.CustomizeButtonRect.Left, m_SystemButtons.CustomizeButtonRect.Bottom);
+                    if (popupLocation.X < 0)
+                        popupLocation.X = 0;
+                    popupLocation = this.PointToScreen(popupLocation);
+                    m_CustomizeMenu.SetSourceControl(this);
+                    m_CustomizeMenu.Popup(popupLocation);
+                    base.OnMouseDown(e);
+                    return;
+                }
+                else
+                {
+                    foreach (BaseItem objItem in m_ItemContainer.SubItems)
+                    {
+                        if (objItem is CustomizeItem && !objItem.Expanded)
+                        {
+                            if (m_ItemContainer.EffectiveStyle == eDotNetBarStyle.Office2000)
+                                ((CustomizeItem)objItem).PopupLocation = new Point(this.Left - 128, this.Top + 16);
+                            else
+                                ((CustomizeItem)objItem).PopupLocation = new Point(m_SystemButtons.CustomizeButtonRect.Left, m_SystemButtons.CustomizeButtonRect.Bottom);
+
+                            objItem.Expanded = true;
+                            base.OnMouseDown(e);
+                            return;
+                        }
+                    }
+                }
+            }
+            else if (e.Button == MouseButtons.Left && !m_SystemButtons.CloseButtonRect.IsEmpty && m_SystemButtons.CloseButtonRect.Contains(e.X, e.Y))
+            {
+                m_SystemButtons.MouseDownClose = true;
+                PaintCloseButton();
+                base.OnMouseDown(e);
+                return;
+            }
+            else if (e.Button == MouseButtons.Left && !m_SystemButtons.MaximizeButtonRect.IsEmpty && m_SystemButtons.MaximizeButtonRect.Contains(e.X, e.Y))
+            {
+                m_SystemButtons.MouseDownMaximize = true;
+                PaintMaximizeButton();
+                base.OnMouseDown(e);
+                return;
+            }
+            else if (e.Button == MouseButtons.Left && !m_SystemButtons.CaptionButtonRect.IsEmpty && m_SystemButtons.CaptionButtonRect.Contains(e.X, e.Y))
+            {
+                m_SystemButtons.MouseDownCaption = true;
+                PaintCaptionButton();
+                base.OnMouseDown(e);
+                return;
+            }
+            else if (e.Button == MouseButtons.Left && !m_SystemButtons.AutoHideButtonRect.IsEmpty && m_SystemButtons.AutoHideButtonRect.Contains(e.X, e.Y))
+            {
+                m_SystemButtons.MouseDownAutoHide = true;
+                PaintAutoHideButton();
+                base.OnMouseDown(e);
+                return;
+            }
+            else if (e.Button == System.Windows.Forms.MouseButtons.Left && m_BarState == eBarState.Floating)
+            {
+                if (m_ItemContainer.LayoutType == eLayoutType.DockContainer && e.X <= 4 && e.Y <= 4)
+                    m_SizeWindow = SIZE_NWN;
+                else if (m_ItemContainer.LayoutType == eLayoutType.DockContainer && e.X >= this.Width - 4 && e.Y >= this.Height - 4)
+                    m_SizeWindow = SIZE_NWS;
+                else if (m_ItemContainer.LayoutType == eLayoutType.DockContainer && e.X >= this.Width - 4 && e.Y <= 4)
+                    m_SizeWindow = SIZE_NEN;
+                else if (m_ItemContainer.LayoutType == eLayoutType.DockContainer && e.X <= 4 && e.Y >= this.Height - 4)
+                    m_SizeWindow = SIZE_NES;
+                else if (e.X >= 0 && e.X <= 2)
+                    m_SizeWindow = SIZE_W;
+                else if (e.X >= this.Width - 3 && e.X <= this.Width)
+                    m_SizeWindow = SIZE_E;
+                else if (e.Y >= 0 && e.Y <= 2)
+                    m_SizeWindow = SIZE_N;
+                else if (e.Y >= this.Height - 3 && e.Y <= this.Height)
+                    m_SizeWindow = SIZE_S;
+            }
+            //else if(e.Button==System.Windows.Forms.MouseButtons.Left && m_BarState==eBarState.Docked && m_ItemContainer.LayoutType==eLayoutType.DockContainer && m_ItemContainer.Stretch)
+            //{
+            //    if(this.DockedSite.Dock==DockStyle.Right && e.X<=2)
+            //        m_SizeWindow=SIZE_HSPLITRIGHT;
+            //    else if(this.DockedSite.Dock==DockStyle.Left && e.X>=this.Width-2)
+            //        m_SizeWindow=SIZE_HSPLITLEFT;
+            //    else if(this.DockedSite.Dock==DockStyle.Bottom && e.Y<=2)
+            //        m_SizeWindow=SIZE_VSPLITBOTTOM;
+            //    else if(this.DockedSite.Dock==DockStyle.Top && e.Y>=this.Height-2)
+            //        m_SizeWindow=SIZE_VSPLITTOP;
+            //    else if((this.DockedSite.Dock==DockStyle.Bottom || this.DockedSite.Dock==DockStyle.Top) && e.X<=2 && this.Left>0)
+            //        m_SizeWindow=SIZE_HSPLIT;
+            //    else if((this.DockedSite.Dock==DockStyle.Left || this.DockedSite.Dock==DockStyle.Right) && e.Y<=2 && this.Top>0)
+            //        m_SizeWindow=SIZE_VSPLIT;
+            //}
+            else if (e.Button == System.Windows.Forms.MouseButtons.Left && m_BarState == eBarState.AutoHide && m_ItemContainer.LayoutType == eLayoutType.DockContainer && m_ItemContainer.Stretch)
+            {
+                if (m_LastDockSiteInfo.DockSide == DockStyle.Right && e.X <= 2)
+                    m_SizeWindow = SIZE_HSPLITRIGHT;
+                else if (m_LastDockSiteInfo.DockSide == DockStyle.Left && e.X >= this.Width - 2)
+                    m_SizeWindow = SIZE_HSPLITLEFT;
+                else if (m_LastDockSiteInfo.DockSide == DockStyle.Bottom && e.Y <= 2)
+                    m_SizeWindow = SIZE_VSPLITBOTTOM;
+                else if (m_LastDockSiteInfo.DockSide == DockStyle.Top && e.Y >= this.Height - 2)
+                    m_SizeWindow = SIZE_VSPLITTOP;
+                else if ((m_LastDockSiteInfo.DockSide == DockStyle.Bottom || m_LastDockSiteInfo.DockSide == DockStyle.Top) && e.X <= 2 && this.Left > 0)
+                    m_SizeWindow = SIZE_HSPLIT;
+                else if ((m_LastDockSiteInfo.DockSide == DockStyle.Left || m_LastDockSiteInfo.DockSide == DockStyle.Right) && e.Y <= 2 && this.Top > 0)
+                    m_SizeWindow = SIZE_VSPLIT;
+            }
+            else if (e.Button == MouseButtons.Right && this.CanCustomize && !m_ItemContainer.DesignMode && m_BarState != eBarState.Popup && !m_MoveWindow)
+            {
+                DotNetBarManager owner = m_Owner as DotNetBarManager;
+                if (owner != null)
+                {
+                    IOwnerBarSupport ownersupport = m_Owner as IOwnerBarSupport;
+                    if (ownersupport != null)
+                        ownersupport.BarContextMenu(this, e);
+                }
+            }
+
+            if (e.Button == MouseButtons.Left && m_BarState == eBarState.Docked && this.m_GrabHandleStyle == eGrabHandleStyle.ResizeHandle
+                && (m_MouseDownPt.X > this.Location.X + this.Width - GrabHandleResizeWidth) && this.RightToLeft == RightToLeft.No)
+            {
+                Form formParent = this.FindForm();
+                if (formParent != null && formParent.WindowState != FormWindowState.Maximized || formParent == null)
+                {
+                    // Start resizing parent window...
+                    this.Capture = true;
+                    this.Cursor = System.Windows.Forms.Cursors.SizeNWSE;
+                    m_SizeWindow = SIZE_PARENTRESIZE;
+                    Point p = this.PointToScreen(m_MouseDownPt);
+                    if (this.Parent != null && this.Parent.Parent != null)
+                    {
+                        p = this.Parent.Parent.PointToClient(p);
+                        m_ResizeOffset = new Point(this.Parent.Parent.Width - p.X, this.Parent.Parent.ClientRectangle.Height - p.Y);
+                    }
+                    else if (m_Owner == null && !(this.Parent is DockSite) && !(this.Parent is FloatingContainer))
+                    {
+                        if (formParent != null)
+                        {
+                            p = formParent.PointToClient(p);
+                            m_ResizeOffset = new Point(formParent.Width - p.X, formParent.ClientRectangle.Height - p.Y);
+                        }
+                    }
+                }
+            }
+            else if (e.Button == MouseButtons.Left && m_BarState == eBarState.Docked && this.m_GrabHandleStyle == eGrabHandleStyle.ResizeHandle
+           && (m_MouseDownPt.X < this.Location.X + GrabHandleResizeWidth) && this.RightToLeft == RightToLeft.Yes)
+            {
+                Form formParent = this.FindForm();
+                if (formParent != null && formParent.WindowState != FormWindowState.Maximized || formParent == null)
+                {
+                    // Start resizing parent window...
+                    this.Capture = true;
+                    this.Cursor = System.Windows.Forms.Cursors.SizeNESW;
+                    m_SizeWindow = SIZE_PARENTRESIZE;
+                    Point pointMouseDown = m_MouseDownPt;
+                    if (formParent.GetType().GetProperty("RightToLeftLayout") != null)
+                    {
+                        if ((bool)TypeDescriptor.GetProperties(formParent)["RightToLeftLayout"].GetValue(formParent))
+                        {
+                            // Reverse it
+                            pointMouseDown.X = this.Width - pointMouseDown.X;
+                        }
+                    }
+
+                    Point p = this.PointToScreen(pointMouseDown);
+                    if (this.Parent != null && this.Parent.Parent != null)
+                    {
+                        p = this.Parent.Parent.PointToClient(p);
+                        m_ResizeOffset = new Point(p.X, this.Parent.Parent.ClientRectangle.Height - p.Y);
+                    }
+                    else if (m_Owner == null && !(this.Parent is DockSite) && !(this.Parent is FloatingContainer))
+                    {
+                        if (formParent != null)
+                        {
+                            p = formParent.PointToClient(p);
+                            m_ResizeOffset = new Point(p.X, formParent.ClientRectangle.Height - p.Y);
+                        }
+                    }
+                }
+            }
+
+            if (e.Button == MouseButtons.Left && _CanMove && !m_GrabHandleRect.IsEmpty && m_GrabHandleRect.Contains(m_MouseDownPt) && m_SizeWindow == 0 && !m_AutoHideState && !(m_CustomizeMenu != null && m_CustomizeMenu.Expanded))
+            {
+                this.Cursor = System.Windows.Forms.Cursors.SizeAll;
+                this.Capture = true;
+                m_MoveWindow = true;
+            }
+
+            if (m_BarState == eBarState.Popup && m_ParentItem != null && m_ParentItem.DesignMode)
+            {
+                DesignTimeMouseDown(e);
+            }
+            else
+                m_ItemContainer.InternalMouseDown(e);
+
+            base.OnMouseDown(e);
+        }
+
+        internal bool IsSizingWindow
+        {
+            get { return m_SizeWindow != 0; }
+        }
+        internal void InternalMouseUp(MouseEventArgs e)
+        {
+            this.OnMouseUp(e);
+        }
+
+        internal void CloseBar()
+        {
+            BarClosingEventArgs closingArgs = new BarClosingEventArgs();
+            InvokeBarClosing(closingArgs);
+            if (!closingArgs.Cancel)
+            {
+                if (this.AutoHide)
+                    this.AutoHide = false;
+                this.HideBar();
+                IOwner owner = this.Owner as IOwner;
+                if (owner.ParentForm != null && !owner.ParentForm.ContainsFocus)
+                    owner.ParentForm.Focus();
+                InvokeUserVisibleChanged();
+            }
+        }
+
+        protected override void OnMouseUp(MouseEventArgs e)
+        {
+            if (m_MoveWindow || m_SizeWindow != 0)
+                this.Cursor = System.Windows.Forms.Cursors.Default;
+
+            if (m_DragDropInProgress)
+            {
+                DesignTimeMouseUp(e);
+            }
+
+            if (m_MoveWindow)
+            {
+                EndDocking(false, new Point(e.X, e.Y));
+            }
+            else if (e.Button == MouseButtons.Left && !m_SystemButtons.CloseButtonRect.IsEmpty && m_SystemButtons.CloseButtonRect.Contains(m_MouseDownPt))
+            {
+                m_SystemButtons.MouseDownClose = false;
+                PaintCloseButton();
+                if (m_SystemButtons.CloseButtonRect.Contains(e.X, e.Y))
+                {
+                    if (m_CloseSingleTab && this.SelectedDockContainerItem != null)
+                        CloseDockTab(this.SelectedDockContainerItem);
+                    else
+                        CloseBar();
+                }
+            }
+            else if (e.Button == MouseButtons.Left && !m_SystemButtons.MaximizeButtonRect.IsEmpty && m_SystemButtons.MaximizeButtonRect.Contains(m_MouseDownPt))
+            {
+                m_SystemButtons.MouseDownMaximize = false;
+                if (m_SystemButtons.MaximizeButtonRect.Contains(e.X, e.Y))
+                {
+                    if (this.Parent is FloatingContainer)
+                    {
+                        this.IsMaximized = !this.IsMaximized;
+                    }
+                }
+                PaintMaximizeButton();
+            }
+            else if (e.Button == MouseButtons.Left && !m_SystemButtons.CaptionButtonRect.IsEmpty && m_SystemButtons.CaptionButtonRect.Contains(m_MouseDownPt))
+            {
+                m_SystemButtons.MouseDownCaption = false;
+                PaintCaptionButton();
+                if (m_SystemButtons.CaptionButtonRect.Contains(e.X, e.Y))
+                {
+                    InvokeCaptionButtonClick();
+                    if (m_AutoCreateCaptionMenu)
+                    {
+                        ToggleCaptionMenu();
+                        PaintCaptionButton();
+                    }
+                }
+            }
+            else if (e.Button == MouseButtons.Left && !m_SystemButtons.AutoHideButtonRect.IsEmpty && m_SystemButtons.AutoHideButtonRect.Contains(m_MouseDownPt))
+            {
+                m_SystemButtons.MouseDownAutoHide = false;
+                PaintAutoHideButton();
+                if (m_SystemButtons.AutoHideButtonRect.Contains(e.X, e.Y))
+                {
+                    m_IgnoreAnimation = false;
+                    this.AutoHide = !this.AutoHide;
+                }
+            }
+            m_MoveWindow = false;
+            m_SizeWindow = 0;
+
+            if (m_ItemContainer != null)
+                m_ItemContainer.InternalMouseUp(e);
+
+            base.OnMouseUp(e);
+        }
+
+        private bool _IsMaximized = false;
+        /// <summary>
+        /// Gets or sets whether floating dockable window is maximized.
+        /// </summary>
+        [Browsable(false)]
+        public bool IsMaximized
+        {
+            get { return _IsMaximized; }
+            set
+            {
+                if (value != _IsMaximized)
+                {
+                    if (!(this.Parent is FloatingContainer) || this.LayoutType != eLayoutType.DockContainer)
+                        throw new InvalidOperationException("Bar is not dockable window or its not floating"); 
+                    bool oldValue = _IsMaximized;
+                    _IsMaximized = value;
+                    OnIsMaximizedChanged(oldValue, value);
+                }
+            }
+        }
+
+        private Rectangle _RestoredBounds = Rectangle.Empty;
+        /// <summary>
+        /// Called when IsMaximized property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnIsMaximizedChanged(bool oldValue, bool newValue)
+        {
+            FloatingContainer form = (FloatingContainer)this.Parent;
+            if (!newValue)
+            {
+                this.ClientSize = _RestoredBounds.Size;
+                this.Location = _RestoredBounds.Location;
+                //form.WindowState = FormWindowState.Normal;
+            }
+            else
+            {
+                _RestoredBounds = new Rectangle(m_Float.Location, this.ClientSize);
+                ScreenInformation screen = BarFunctions.ScreenFromControl(m_Float);
+                if (screen != null)
+                {
+                    this.ClientSize = screen.WorkingArea.Size;
+                    this.Location = screen.WorkingArea.Location;
+                }
+                //form.WindowState = FormWindowState.Maximized;
+            }
+            //this.ClientSize = form.ClientSize;
+            this.RecalcSize();
+            this.Update();
+            //OnPropertyChanged(new PropertyChangedEventArgs("IsMaximized"));
+            
+        }
+
+        private void EndDocking(bool revertLast, Point mousePos)
+        {
+            if (this.Capture)
+                this.Capture = false;
+
+            this.Cursor = System.Windows.Forms.Cursors.Default;
+
+            IOwnerBarSupport barsupport = this.Owner as IOwnerBarSupport;
+            if (barsupport != null)
+                barsupport.DockComplete();
+
+            if (m_DragDockInfo.IsEmpty())
+            {
+                m_MoveWindow = false;
+                return;
+            }
+
+            if (m_TempTabBar != null || m_DragDockInfo.TabDockContainer != null)
+            {
+                DisposeDockingPreview();
+
+                Bar targetBar = m_TempTabBar;
+                if (targetBar == null)
+                    targetBar = m_DragDockInfo.TabDockContainer;
+
+                RemoveTempTabBarItems();
+                if (m_DragDockInfo.TabDockContainer != this)
+                {
+                    if (m_DockTabTearOffIndex == -1)
+                    {
+                        System.Collections.ArrayList list = new System.Collections.ArrayList(m_ItemContainer.SubItems.Count);
+                        m_ItemContainer.SubItems.CopyTo(list);
+                        DockContainerItem firstItem = null;
+                        Form f = targetBar.FindForm();
+                        if (f != null) f.ActiveControl = targetBar;
+                        foreach (BaseItem item in list)
+                        {
+                            DockContainerItem dockitem = item as DockContainerItem;
+                            if (dockitem != null)
+                            {
+                                if (firstItem == null) firstItem = dockitem;
+                                dockitem.Displayed = false;
+                                if (dockitem.OriginalBarName == "")
+                                {
+                                    dockitem.OriginalBarName = this.Name;
+                                    dockitem.OriginalPosition = m_ItemContainer.SubItems.IndexOf(dockitem);
+                                }
+                                m_ItemContainer.SubItems.Remove(dockitem);
+                                targetBar.Items.Add(dockitem);
+                            }
+                        }
+                        targetBar.RecalcLayout();
+
+                        if (firstItem != null)
+                        {
+                            targetBar.SelectedDockContainerItem = firstItem;
+                            //if (f != null && firstItem.Control!=null) f.ActiveControl = firstItem.Control;
+                        }
+                        targetBar.InvokeBarDockEvents();
+
+                        DotNetBarManager manager = m_Owner as DotNetBarManager;
+                        if (manager != null)
+                        {
+                            m_MoveWindow = false;
+                            targetBar = null;
+
+                            if (this.CustomBar)
+                            {
+                                manager.Bars.Remove(this);
+                                this.Dispose();
+                            }
+                            else
+                            {
+                                this.Visible = false;
+                            }
+
+                            if (manager.ParentForm != null)
+                                manager.ParentForm.Activate();
+                            return;
+                        }
+                    }
+                    else
+                    {
+                        Form f = targetBar.FindForm();
+                        if (f != null) f.ActiveControl = targetBar;
+                        DockContainerItem dockitem = m_ItemContainer.SubItems[m_DockTabTearOffIndex] as DockContainerItem;
+                        dockitem.Displayed = false;
+                        m_ItemContainer.SubItems.Remove(dockitem);
+                        targetBar.Items.Add(dockitem);
+
+                        targetBar.SelectedDockContainerItem = dockitem;
+                        targetBar.RecalcLayout();
+                        //if (f != null && dockitem.Control != null) f.ActiveControl = dockitem.Control;
+                        targetBar.InvokeBarDockEvents();
+                    }
+                }
+                m_TempTabBar = null;
+                m_DockTabTearOffIndex = -1;
+                m_MoveWindow = false;
+                m_DragDockInfo = new DockSiteInfo();
+                return;
+            }
+
+            if (m_DockTabTearOffIndex != -1)
+            {
+                DisposeDockingPreview();
+                if (revertLast)
+                    DockingHandler(m_LastDockSiteInfo, this.PointToScreen(new Point(mousePos.X, mousePos.Y)));
+                else
+                {
+                    DockContainerItem dc = (DockContainerItem)this.Items[m_DockTabTearOffIndex];
+                    Bar bar = TearOffDockContainerItem(dc, false);
+                    bar.DockingHandler(m_DragDockInfo, this.PointToScreen(new Point(mousePos.X, mousePos.Y)));
+                    Form f = this.FindForm();
+                    if (f != null && dc != null && dc.Control != null)
+                    {
+                        f.ActiveControl = dc.Control;
+                    }
+                }
+                m_DragDockInfo = new DockSiteInfo();
+                m_DockTabTearOffIndex = -1;
+            }
+            else
+            {
+                if (!m_OldOutlineRectangle.IsEmpty || m_OutlineForm != null)
+                {
+                    DisposeDockingPreview();
+                    if (revertLast)
+                    {
+                        if (this.LayoutType == eLayoutType.Toolbar)
+                            DockingHandler(m_LastDockSiteInfo, this.PointToScreen(new Point(mousePos.X, mousePos.Y)));
+                    }
+                    else
+                        DockingHandler(m_DragDockInfo, this.PointToScreen(new Point(mousePos.X, mousePos.Y)));
+                    m_DragDockInfo = new DockSiteInfo();
+                }
+                else if (revertLast)
+                {
+                    DockingHandler(m_LastDockSiteInfo, this.PointToScreen(new Point(mousePos.X, mousePos.Y)));
+                    m_DragDockInfo = new DockSiteInfo();
+                }
+            }
+
+            m_MoveWindow = false;
+        }
+
+        private void DisposeDockingPreview()
+        {
+            if (!m_OldOutlineRectangle.IsEmpty || m_OutlineForm != null)
+            {
+                if (!m_OldOutlineRectangle.IsEmpty)
+                {
+                    NativeFunctions.DrawReversibleDesktopRect(m_OldOutlineRectangle, DRAGRECTANGLE_WIDTH);
+                    m_OldOutlineRectangle = Rectangle.Empty;
+                }
+                if (m_OutlineForm != null)
+                {
+                    m_OutlineForm.Visible = false;
+                    m_OutlineForm.Dispose();
+                    m_OutlineForm = null;
+                }
+            }
+        }
+
+        internal Bar StartTabDrag()
+        {
+            if (m_TabDockItems.SelectedTab == null)
+                return null;
+            DockContainerItem item = m_TabDockItems.SelectedTab.AttachedItem as DockContainerItem;
+            if (item == null)
+                return null;
+            DotNetBarManager manager = m_Owner as DotNetBarManager;
+            if (manager == null)
+                return null;
+
+            if (this.VisibleItemCount == 1 && this.GrabHandleStyle == eGrabHandleStyle.None)
+            {
+                this.StartBarMove();
+                return this;
+            }
+            else if (!this.CanUndock)
+            {
+                m_DockTabTearOffIndex = this.Items.IndexOf(item);
+                this.StartBarMove();
+                return this;
+            }
+
+            Bar bar = TearOffDockContainerItem(item, true);
+            bar.InitalFloatLocation = Point.Empty;
+            bar.StartBarMove();
+            return bar;
+        }
+
+        internal Bar TearOffDockContainerItem(DockContainerItem item, bool floatBar)
+        {
+            return TearOffDockContainerItem(item, floatBar, new Point(Control.MousePosition.X - 32, Control.MousePosition.Y - 8));
+        }
+        internal Bar TearOffDockContainerItem(DockContainerItem item, bool floatBar, Point initialFloatLocation)
+        {
+            Form f = this.FindForm();
+            if (f != null)
+            {
+                f.ActiveControl = this;
+            }
+            DotNetBarManager manager = m_Owner as DotNetBarManager;
+            m_ItemContainer.SubItems.Remove(item);
+            this.RecalcLayout();
+            Bar bar = BarFunctions.CreateDuplicateDockBar(this);
+            bar.Text = item.Text;
+
+            bar.InitalFloatLocation = initialFloatLocation;
+
+            if (manager.Bars.Contains(item.Name))
+            {
+                string name = item.Name;
+                int i = 0;
+                while (manager.Bars.Contains(name + i.ToString()))
+                    i++;
+                bar.Name = name + i.ToString();
+            }
+            else
+                bar.Name = item.Name;
+
+            bar.Items.Add(item);
+            manager.Bars.Add(bar);
+
+            if (floatBar)
+            {
+                bar.DockSide = eDockSide.None;
+                bar.Location = initialFloatLocation;
+            }
+
+            bar.LastDockSide = this.DockSide;
+            bar.m_LastDockSiteInfo.objDockSite = this.Parent as DockSite;
+            bar.m_LastDockSiteInfo.LastRelativeDockToBar = this;
+            bar.m_LastDockSiteInfo.LastDockSiteSide = this.DockSide;
+
+            bar.CustomBar = true;
+
+            IOwnerBarSupport ownerBar = m_Owner as IOwnerBarSupport;
+            if (ownerBar != null)
+            {
+                if (ownerBar.ApplyDocumentBarStyle && this.DockSide == eDockSide.Document)
+                    BarFunctions.RestoreAutoDocumentBarStyle(bar); //BarFunctions.ApplyAutoDocumentBarStyle(bar);
+                ownerBar.InvokeBarTearOff(bar, new EventArgs());
+            }
+
+            return bar;
+        }
+
+        internal void StartBarMove()
+        {
+            m_MouseDownPt = this.PointToClient(Control.MousePosition);
+            m_MouseDownSize = this.Size;
+            this.Cursor = System.Windows.Forms.Cursors.SizeAll;
+            m_MoveWindow = true;
+        }
+
+        internal void InvokeUserVisibleChanged()
+        {
+            if (UserVisibleChanged != null)
+                UserVisibleChanged(this, new EventArgs());
+        }
+
+        private void InvokeAutoHideChanged()
+        {
+            EventArgs e = new EventArgs();
+            if (AutoHideChanged != null)
+                AutoHideChanged(this, e);
+            IOwnerBarSupport barSupp = m_Owner as IOwnerBarSupport;
+            if (barSupp != null)
+                barSupp.InvokeAutoHideChanged(this, e);
+            OnBarStateChanged(new BarStateChangedEventArgs(this, eBarStateChange.AutoHideChanged));
+        }
+
+        /// <summary>
+        /// Closes the DockContainerItem with event source set to Code.
+        /// </summary>
+        /// <param name="dockTab">DockContainerItem to close.</param>
+        public void CloseDockTab(DockContainerItem dockTab)
+        {
+            CloseDockTab(dockTab, eEventSource.Code);
+        }
+
+        /// <summary>
+        /// Closes the DockContainerItem.
+        /// </summary>
+        /// <param name="dockTab">DockContainerItem to close.</param>
+        /// <param name="source">Source of the event.</param>
+        public void CloseDockTab(DockContainerItem dockTab, eEventSource source)
+        {
+            DockTabClosingEventArgs e = new DockTabClosingEventArgs(dockTab, source);
+            InvokeDockTabClosing(e);
+            if (e.Cancel)
+                return;
+
+            if (this.VisibleItemCount > 1)
+            {
+                if (e.RemoveDockTab)
+                    this.Items.Remove(dockTab);
+                else
+                    BarUtilities.SetDockContainerVisible(dockTab, false);
+            }
+            else
+            {
+                if (e.RemoveDockTab)
+                    this.Items.Remove(dockTab);
+                CloseBar();
+                if (!this.Visible)
+                    dockTab.Visible = false;
+            }
+
+            InvokeDockTabClosed(e);
+        }
+
+        private void InvokeDockTabClosed(DockTabClosingEventArgs e)
+        {
+            if (DockTabClosed != null)
+                DockTabClosed(this, e);
+            if (this.Owner is DotNetBarManager)
+            {
+                ((DotNetBarManager)this.Owner).InvokeDockTabClosed(this, e);
+            }
+            OnBarStateChanged(new BarStateChangedEventArgs(this, eBarStateChange.DockTabClosed, e.DockContainerItem));
+        }
+
+        internal void InvokeDockTabClosing(DockTabClosingEventArgs e)
+        {
+            if (DockTabClosing != null)
+                DockTabClosing(this, e);
+            if (this.Owner is DotNetBarManager)
+            {
+                ((DotNetBarManager)this.Owner).InvokeDockTabClosing(this, e);
+            }
+        }
+
+        private void InvokeBarClosing(BarClosingEventArgs e)
+        {
+            if (Closing != null)
+                Closing(this, e);
+            IOwnerBarSupport barSupp = m_Owner as IOwnerBarSupport;
+            if (barSupp != null)
+                barSupp.InvokeBarClosing(this, e);
+        }
+
+        /// <summary>
+        /// Raises the ItemClick event.
+        /// </summary>
+        /// <param name="item">Item that was clicked.</param>
+        /// <param name="e">Event arguments.</param>
+        protected virtual void OnItemClick(BaseItem item, EventArgs e)
+        {
+            if (ItemClick != null)
+                ItemClick(item, e);
+        }
+
+        internal void InvokeItemClick(BaseItem item, EventArgs e)
+        {
+            OnItemClick(item, e);
+        }
+
+        protected override void OnClick(EventArgs e)
+        {
+            m_ItemContainer.InternalClick(Control.MouseButtons, this.PointToClient(Control.MousePosition));
+            base.OnClick(e);
+        }
+
+        private eDoubleClickBarBehavior _DoubleClickBehavior = eDoubleClickBarBehavior.FloatAndReDock;
+        /// <summary>
+        /// Specifies the bar behavior when its title is double-clicked
+        /// </summary>
+        [DefaultValue(eDoubleClickBarBehavior.FloatAndReDock), Category("Behavior"), Description("Specifies the bar behavior when its title is double-clicked")]
+        public eDoubleClickBarBehavior DoubleClickBehavior
+        {
+            get { return _DoubleClickBehavior; }
+            set { _DoubleClickBehavior = value; }
+        }
+
+        protected override void OnDoubleClick(EventArgs e)
+        {
+            if (m_BarState == eBarState.Popup)
+            {
+                ISite site = this.GetSite();
+                if (site != null && site.DesignMode)
+                {
+                    ISelectionService selection = (ISelectionService)site.GetService(typeof(ISelectionService));
+                    if (selection != null)
+                    {
+                        IDesignerHost host = (IDesignerHost)site.GetService(typeof(IDesignerHost));
+                        if (host != null)
+                        {
+                            IDesigner designer = host.GetDesigner(selection.PrimarySelection as IComponent);
+                            if (designer != null)
+                            {
+                                designer.DoDefaultAction();
+                            }
+                        }
+                    }
+                }
+            }
+
+
+            Point mouseDownPoint = this.PointToClient(Control.MousePosition);
+            if (m_GrabHandleRect.Contains(mouseDownPoint) && 
+                !m_SystemButtons.CloseButtonRect.Contains(mouseDownPoint) && 
+                !m_SystemButtons.AutoHideButtonRect.Contains(mouseDownPoint))
+            {
+                if (m_BarState == eBarState.Floating)
+                {
+                    if (_DoubleClickBehavior == eDoubleClickBarBehavior.ReDock || _DoubleClickBehavior == eDoubleClickBarBehavior.FloatAndReDock)
+                        ReDock();
+                }
+                else if (m_BarState == eBarState.Docked && this.CanUndock && this.Parent is DockSite)
+                {
+                    Point p = Point.Empty;
+                    if (m_FloatingRect.IsEmpty)
+                        p = Control.MousePosition;
+                    else
+                        p = m_FloatingRect.Location;
+                    if (_DoubleClickBehavior == eDoubleClickBarBehavior.Float || _DoubleClickBehavior == eDoubleClickBarBehavior.FloatAndReDock)
+                        DockingHandler(new DockSiteInfo(), p);
+                }
+            }
+            if (!this.IsDisposed)
+                m_ItemContainer.InternalDoubleClick(Control.MouseButtons, Control.MousePosition);
+            base.OnDoubleClick(e);
+        }
+
+        protected override void OnKeyDown(KeyEventArgs e)
+        {
+            ExKeyDown(e);
+            base.OnKeyDown(e);
+        }
+
+        internal void ExKeyDown(KeyEventArgs e)
+        {
+            m_ItemContainer.InternalKeyDown(e);
+        }
+
+        private void ResetHover()
+        {
+            // We need to reset hover thing since it is fired only first time mouse hovers inside the window and we need it for each of our items
+            NativeFunctions.TRACKMOUSEEVENT tme = new NativeFunctions.TRACKMOUSEEVENT();
+            tme.dwFlags = NativeFunctions.TME_QUERY;
+            tme.hwndTrack = this.Handle;
+            tme.cbSize = System.Runtime.InteropServices.Marshal.SizeOf(tme);
+            NativeFunctions.TrackMouseEvent(ref tme);
+            tme.dwFlags = tme.dwFlags | NativeFunctions.TME_HOVER;
+            NativeFunctions.TrackMouseEvent(ref tme);
+        }
+
+        public override string ToString()
+        {
+            return this.Text;
+        }
+
+        private bool m_IsVisible = true;
+        internal bool IsVisible
+        {
+            get
+            {
+                return m_IsVisible;
+            }
+        }
+
+        protected override void OnVisibleChanged(EventArgs e)
+        {
+            if (this.IsHandleCreated)
+                m_IsVisible = base.Visible;
+            // Restore bar order when docked to the side. WinForms can change it's order which
+            // creates problem for docking...
+            if (m_BarShowIndex >= 0)
+            {
+                if (this.Parent is DockSite && this.Parent.Controls.IndexOf(this) != m_BarShowIndex)
+                {
+                    this.Parent.Controls.SetChildIndex(this, m_BarShowIndex);
+                }
+                m_BarShowIndex = -1;
+            }
+
+            // Must reset the ActiveControl to null becouse on MDI Forms if this was not done
+            // MDI form could not be closed if bar that had ActiveControl is floating.
+            IOwner owner = m_Owner as IOwner;
+            if (owner != null)
+            {
+                if (owner.ParentForm != null && owner.ParentForm.ActiveControl == this)
+                {
+                    owner.ParentForm.ActiveControl = null;
+                    this.Focus(); // Fixes the problem on SDI forms
+                }
+                else if (owner.ParentForm != null && IsAnyControl(this, owner.ParentForm.ActiveControl))
+                {
+                    owner.ParentForm.ActiveControl = null;
+                    this.Focus();
+                }
+            }
+
+            base.OnVisibleChanged(e);
+
+            // m_DockingInProgress check is needed becouse we don't want RecalcLayout to be called from
+            // DockSite.AddBar. The visible change event will fire when from that procedure Bar is added
+            // to the Dock Site.
+            if (m_BarState == eBarState.Docked && !m_DockingInProgress && this.Visible)
+            {
+                if (this.LayoutType == eLayoutType.DockContainer && m_AlwaysDisplayDockTab) RefreshDockTab(false);
+                this.RecalcLayout();
+            }
+
+            if (!this.Visible && m_DropShadow != null)
+            {
+                m_DropShadow.Hide();
+                m_DropShadow.Dispose();
+                m_DropShadow = null;
+            }
+            if (!this.Visible && m_CustomizeMenu != null && m_CustomizeMenu.Expanded)
+                m_CustomizeMenu.Expanded = false;
+
+        }
+
+        private bool m_LayoutSuspended = false;
+        /// <summary>
+        /// Suspends normal layout logic.
+        /// </summary>
+        public new void SuspendLayout()
+        {
+            m_LayoutSuspended = true;
+            base.SuspendLayout();
+        }
+
+        /// <summary>
+        /// Resumes normal layout logic.
+        /// </summary>
+        public new void ResumeLayout()
+        {
+            this.ResumeLayout(true);
+        }
+
+        /// <summary>
+        /// Resumes normal layout logic. Optionally forces an immediate layout of pending layout requests.
+        /// </summary>
+        public new void ResumeLayout(bool performLayout)
+        {
+            m_LayoutSuspended = false;
+            base.ResumeLayout(true);
+        }
+
+        protected override void OnParentChanged(EventArgs e)
+        {
+            base.OnParentChanged(e);
+            if (this.Parent != null && !(this.Parent is FloatingContainer) && !(this.Parent is DockSite))
+            {
+                m_ItemContainer.SetOwner(this);
+                if (!m_ParentMsgHandlerRegistered && this.DesignMode && this.FindForm() != null)
+                {
+                    DotNetBarManager.RegisterOwnerParentMsgHandler(this, this.FindForm());
+                    m_ParentMsgHandlerRegistered = true;
+                }
+
+                // Cycle shortcuts
+                if (m_ShortcutTable.Count == 0)
+                {
+                    foreach (BaseItem item in m_ItemContainer.SubItems)
+                        ((IOwner)this).AddShortcutsFromItem(item);
+                }
+
+                if (this.Parent != null && !(this.Parent is FloatingContainer) && !(this.Parent is DockSite) && !this.AutoHide)
+                {
+                    if (!m_FilterInstalled)
+                    {
+                        MessageHandler.RegisterMessageClient(this);
+                        m_FilterInstalled = true;
+                    }
+                }
+
+                if (!m_DockStretch) Stretch = true;
+            }
+            else if (m_FilterInstalled)
+            {
+                MessageHandler.UnregisterMessageClient(this);
+                m_FilterInstalled = false;
+            }
+
+            if (this.DesignMode)
+                m_ItemContainer.SetDesignMode(this.DesignMode);
+        }
+
+        protected override void OnHandleCreated(EventArgs e)
+        {
+            base.OnHandleCreated(e);
+            if (m_ThemeWindowMargins.IsEmpty)
+            {
+                RefreshThemeMargins();
+            }
+
+            if (this.Parent != null && !(this.Parent is FloatingContainer) && !(this.Parent is DockSite) && !this.AutoHide)
+            {
+                if (!m_FilterInstalled)
+                {
+                    MessageHandler.RegisterMessageClient(this);
+                    m_FilterInstalled = true;
+                }
+            }
+
+            this.RecalcSize();
+        }
+
+        protected override void OnHandleDestroyed(EventArgs e)
+        {
+            DisposeThemes();
+            MenuEventSupportUnhook();
+            if (m_FilterInstalled)
+            {
+                MessageHandler.UnregisterMessageClient(this);
+                m_FilterInstalled = false;
+            }
+            base.OnHandleDestroyed(e);
+        }
+
+        private void RefreshThemeMargins()
+        {
+            if (!BarFunctions.ThemedOS)
+                return;
+
+            ThemeWindow theme = this.ThemeWindow;
+            Graphics g = this.CreateGraphics();
+            try
+            {
+                System.Drawing.Size sz = theme.ThemeMinSize(g, ThemeWindowParts.SmallFrameLeft, ThemeWindowStates.FrameActive);
+                m_ThemeWindowMargins.Left = sz.Width;
+                sz = theme.ThemeMinSize(g, ThemeWindowParts.SmallFrameRight, ThemeWindowStates.FrameActive);
+                m_ThemeWindowMargins.Right = sz.Width;
+                sz = theme.ThemeMinSize(g, ThemeWindowParts.SmallFrameBottom, ThemeWindowStates.FrameActive);
+                m_ThemeWindowMargins.Bottom = sz.Height;
+                sz = theme.ThemeTrueSize(g, ThemeWindowParts.SmallCaption, ThemeWindowStates.FrameActive);
+                m_ThemeWindowMargins.Top = sz.Height;
+            }
+            finally
+            {
+                g.Dispose();
+            }
+        }
+
+        private void DisposeThemes()
+        {
+            if (m_ThemeWindow != null)
+            {
+                m_ThemeWindow.Dispose();
+                m_ThemeWindow = null;
+            }
+            if (m_ThemeRebar != null)
+            {
+                m_ThemeRebar.Dispose();
+                m_ThemeRebar = null;
+            }
+            if (m_ThemeToolbar != null)
+            {
+                m_ThemeToolbar.Dispose();
+                m_ThemeToolbar = null;
+            }
+            if (m_ThemeHeader != null)
+            {
+                m_ThemeHeader.Dispose();
+                m_ThemeHeader = null;
+            }
+            if (m_ThemeScrollBar != null)
+            {
+                m_ThemeScrollBar.Dispose();
+                m_ThemeScrollBar = null;
+            }
+            if (m_ThemeProgress != null)
+            {
+                m_ThemeProgress.Dispose();
+                m_ThemeProgress = null;
+            }
+        }
+        private void RefreshThemes()
+        {
+            if (m_ThemeWindow != null)
+            {
+                m_ThemeWindow.Dispose();
+                m_ThemeWindow = new ThemeWindow(this);
+            }
+            if (m_ThemeRebar != null)
+            {
+                m_ThemeRebar.Dispose();
+                m_ThemeRebar = new ThemeRebar(this);
+            }
+            if (m_ThemeToolbar != null)
+            {
+                m_ThemeToolbar.Dispose();
+                m_ThemeToolbar = new ThemeToolbar(this);
+            }
+            if (m_ThemeHeader != null)
+            {
+                m_ThemeHeader.Dispose();
+                m_ThemeHeader = new ThemeHeader(this);
+            }
+            if (m_ThemeScrollBar != null)
+            {
+                m_ThemeScrollBar.Dispose();
+                m_ThemeScrollBar = new ThemeScrollBar(this);
+            }
+            if (m_ThemeProgress != null)
+            {
+                m_ThemeProgress.Dispose();
+                m_ThemeProgress = new ThemeProgress(this);
+            }
+        }
+        internal DevComponents.DotNetBar.ThemeWindow ThemeWindow
+        {
+            get
+            {
+                if (m_ThemeWindow == null)
+                    m_ThemeWindow = new ThemeWindow(this);
+                return m_ThemeWindow;
+            }
+        }
+        internal DevComponents.DotNetBar.ThemeRebar ThemeRebar
+        {
+            get
+            {
+                if (m_ThemeRebar == null)
+                    m_ThemeRebar = new ThemeRebar(this);
+                return m_ThemeRebar;
+            }
+        }
+        internal DevComponents.DotNetBar.ThemeToolbar ThemeToolbar
+        {
+            get
+            {
+                if (m_ThemeToolbar == null)
+                    m_ThemeToolbar = new ThemeToolbar(this);
+                return m_ThemeToolbar;
+            }
+        }
+        internal DevComponents.DotNetBar.ThemeHeader ThemeHeader
+        {
+            get
+            {
+                if (m_ThemeHeader == null)
+                    m_ThemeHeader = new ThemeHeader(this);
+                return m_ThemeHeader;
+            }
+        }
+        internal DevComponents.DotNetBar.ThemeScrollBar ThemeScrollBar
+        {
+            get
+            {
+                if (m_ThemeScrollBar == null)
+                    m_ThemeScrollBar = new ThemeScrollBar(this);
+                return m_ThemeScrollBar;
+            }
+        }
+        internal DevComponents.DotNetBar.ThemeProgress ThemeProgress
+        {
+            get
+            {
+                if (m_ThemeProgress == null)
+                    m_ThemeProgress = new ThemeProgress(this);
+                return m_ThemeProgress;
+            }
+        }
+
+        private int ClientMarginLeft
+        {
+            get
+            {
+                int iMargin = 0;
+
+                if (m_ParentItem != null && m_ParentItem.EffectiveStyle != eDotNetBarStyle.Office2000)
+                    iMargin = 1;
+                else
+                    iMargin = 3;
+
+                return iMargin;
+            }
+        }
+
+        private int ClientMarginTop
+        {
+            get
+            {
+                int iMargin = 0;
+                if (m_ParentItem != null && m_ParentItem.EffectiveStyle != eDotNetBarStyle.Office2000)
+                    iMargin = 2;
+                else
+                    iMargin = 3;
+
+                return iMargin;
+            }
+        }
+
+        private int ClientMarginRight
+        {
+            get
+            {
+                bool bShowShadow = true;
+                int iMargin = 0;
+                IOwnerMenuSupport ownersupport = m_Owner as IOwnerMenuSupport;
+                if (ownersupport != null && !ownersupport.ShowPopupShadow)
+                    bShowShadow = false;
+                if (m_ParentItem != null && m_ParentItem.EffectiveStyle != eDotNetBarStyle.Office2000)
+                {
+                    if (this.AlphaShadow || !bShowShadow)
+                        iMargin = 1;
+                    else
+                        iMargin = 3;
+                }
+                else
+                    iMargin = 3;
+
+                return iMargin;
+            }
+        }
+
+        private int ClientMarginBottom
+        {
+            get
+            {
+                bool bShowShadow = true;
+                int iMargin = 0;
+                IOwnerMenuSupport ownersupport = m_Owner as IOwnerMenuSupport;
+                if (ownersupport != null && !ownersupport.ShowPopupShadow)
+                    bShowShadow = false;
+                if (m_ParentItem != null && m_ParentItem.EffectiveStyle != eDotNetBarStyle.Office2000)
+                {
+                    if (this.AlphaShadow || !bShowShadow)
+                        iMargin = 2;
+                    else
+                        iMargin = 4;
+                }
+                else
+                    iMargin = 3;
+
+                return iMargin;
+            }
+        }
+
+        /// <summary>
+        /// Returns whether popup bar should display shadow.
+        /// </summary>
+        internal bool DisplayShadow
+        {
+            get
+            {
+                if (PassiveBar)
+                    return false;
+                IOwnerMenuSupport ownersupport = m_Owner as IOwnerMenuSupport;
+                if (ownersupport != null)
+                {
+                    if (m_ParentItem != null && m_ParentItem.EffectiveStyle == eDotNetBarStyle.Office2000)
+                    {
+                        if (ownersupport.MenuDropShadow == eMenuDropShadow.Show)
+                            return true;
+                        else
+                            return false;
+                    }
+                    return ownersupport.ShowPopupShadow;
+                }
+                else
+                {
+                    if (m_ParentItem != null && m_ParentItem.EffectiveStyle == eDotNetBarStyle.Office2000)
+                        return false;
+                }
+
+                return true;
+            }
+        }
+
+        /// <summary>
+        /// Returns whether popup bar shadow should be alpha-blended.
+        /// </summary>
+        internal bool AlphaShadow
+        {
+            get
+            {
+                if (Environment.OSVersion.Version.Major < 5)
+                    return false;
+                IOwnerMenuSupport ownersupport = m_Owner as IOwnerMenuSupport;
+                if (ownersupport != null && !ownersupport.AlphaBlendShadow)
+                    return false;
+                return NativeFunctions.CursorShadow;
+            }
+        }
+
+        protected override void OnGotFocus(EventArgs e)
+        {
+            base.OnGotFocus(e);
+            if (this.MenuBar)
+                this.Refresh();
+        }
+
+        protected override void OnLostFocus(EventArgs e)
+        {
+            base.OnLostFocus(e);
+            if (this.MenuBar)
+                this.Refresh();
+        }
+
+        internal bool MenuFocus
+        {
+            get
+            {
+                return m_MenuFocus;
+            }
+            set
+            {
+                if (m_MenuFocus != value)
+                {
+                    m_MenuFocus = value;
+                    if (m_MenuFocus)
+                    {
+                        m_ItemContainer.SetSystemFocus();
+                        DotNetBarManager manager = m_Owner as DotNetBarManager;
+                        if (manager != null)
+                            manager.FocusedBar = this;
+                    }
+                    else
+                    {
+                        if (m_ItemContainer != null)
+                        {
+                            m_ItemContainer.AutoExpand = false;
+                            m_ItemContainer.ReleaseSystemFocus();
+                            m_ItemContainer.ContainerLostFocus(false);
+                        }
+
+                        DotNetBarManager manager = m_Owner as DotNetBarManager;
+                        if (manager != null)
+                            manager.FocusedBar = null;
+                    }
+                    if (this.MenuBar)
+                    {
+                        this.Refresh();
+                    }
+                }
+            }
+        }
+
+        [System.ComponentModel.Browsable(false), System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+        public void SetDesignMode(bool b)
+        {
+            m_ItemContainer.SetDesignMode(b);
+        }
+
+        internal bool GetDesignMode()
+        {
+            return this.DesignMode;
+        }
+
+        internal int PopupWidth
+        {
+            get
+            {
+                return m_InitialContainerWidth;
+            }
+            set
+            {
+                m_InitialContainerWidth = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets/Sets the popup animation that will be applied when popup is shown.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), DefaultValue(ePopupAnimation.ManagerControlled)]
+        public ePopupAnimation PopupAnimation
+        {
+            get
+            {
+                return m_PopupAnimation;
+            }
+            set
+            {
+                m_PopupAnimation = value;
+            }
+        }
+
+        #region ICustomSerialization Implementation
+        /// <summary>
+        /// Invokes SerializeItem event.
+        /// </summary>
+        /// <param name="e">Provides data for the event.</param>
+        void ICustomSerialization.InvokeSerializeItem(SerializeItemEventArgs e)
+        {
+            if (SerializeItem != null)
+                SerializeItem(this, e);
+            if (this.Owner != this && this.Owner is ICustomSerialization)
+                ((ICustomSerialization)this.Owner).InvokeSerializeItem(e);
+        }
+
+        /// <summary>
+        /// Invokes DeserializeItem event.
+        /// </summary>
+        /// <param name="e">Provides data for the event.</param>
+        void ICustomSerialization.InvokeDeserializeItem(SerializeItemEventArgs e)
+        {
+            if (DeserializeItem != null)
+                DeserializeItem(this, e);
+            if (this.Owner != this && this.Owner is ICustomSerialization)
+                ((ICustomSerialization)this.Owner).InvokeDeserializeItem(e);
+        }
+
+        /// <summary>
+        /// Gets whether any handlers have been defined for SerializeItem event. If no handles have been defined to optimize performance SerializeItem event will not be attempted to fire.
+        /// </summary>
+        bool ICustomSerialization.HasSerializeItemHandlers
+        {
+            get
+            {
+                bool b = SerializeItem != null;
+                if (this.Owner != this && this.Owner is ICustomSerialization)
+                    b |= ((ICustomSerialization)this.Owner).HasSerializeItemHandlers;
+                return b;
+            }
+        }
+
+        /// <summary>
+        /// Gets whether any handlers have been defined for DeserializeItem event. If no handles have been defined to optimize performance DeserializeItem event will not be attempted to fire.
+        /// </summary>
+        bool ICustomSerialization.HasDeserializeItemHandlers
+        {
+            get
+            {
+                bool b = DeserializeItem != null;
+                if (this.Owner != this && this.Owner is ICustomSerialization)
+                    b |= ((ICustomSerialization)this.Owner).HasDeserializeItemHandlers;
+                return b;
+            }
+        }
+        #endregion
+
+        /// <summary>
+        /// Saves the Bar definition to file.
+        /// </summary>
+        /// <param name="FileName">Definition file name.</param>
+        public void SaveDefinition(string FileName)
+        {
+            System.Xml.XmlDocument xmlDoc = new System.Xml.XmlDocument();
+
+            this.SaveDefinition(xmlDoc);
+
+            xmlDoc.Save(FileName);
+        }
+
+        internal void SaveDefinition(System.Xml.XmlDocument xmlDoc)
+        {
+            System.Xml.XmlElement xmlBar = xmlDoc.CreateElement("bar");
+            xmlDoc.AppendChild(xmlBar);
+            this.Serialize(xmlBar);
+        }
+
+        /// <summary>
+        /// Loads the Bar definition from file.
+        /// </summary>
+        /// <param name="FileName">Definition file name.</param>
+        public void LoadDefinition(string FileName)
+        {
+            System.Xml.XmlDocument xmlDoc = new System.Xml.XmlDocument();
+            xmlDoc.Load(FileName);
+            this.LoadDefinition(xmlDoc);
+        }
+
+        internal void LoadDefinition(System.Xml.XmlDocument xmlDoc)
+        {
+            if (xmlDoc.FirstChild.Name != "bar")
+                throw (new System.InvalidOperationException("XML Format not recognized"));
+
+            m_ItemContainer.SubItems.Clear();
+            this.Deserialize(xmlDoc.FirstChild as System.Xml.XmlElement);
+
+            IOwnerBarSupport ownersupport = m_Owner as IOwnerBarSupport;
+            if (ownersupport != null)
+                ownersupport.AddShortcutsFromBar(this);
+
+            ((IOwner)this).InvokeDefinitionLoaded(this, new EventArgs());
+        }
+
+        /// <summary>
+        /// Gets/Sets Bar definition as XML string.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
+        public string Definition
+        {
+            get
+            {
+                System.Xml.XmlDocument xmlDoc = new System.Xml.XmlDocument();
+                SaveDefinition(xmlDoc);
+                return xmlDoc.OuterXml;
+            }
+            set
+            {
+                System.Xml.XmlDocument xmlDoc = new System.Xml.XmlDocument();
+                xmlDoc.LoadXml(value);
+                LoadDefinition(xmlDoc);
+            }
+        }
+
+        void IOwner.InvokeDefinitionLoaded(object sender, EventArgs e)
+        {
+            if (DefinitionLoaded != null)
+                DefinitionLoaded(sender, e);
+        }
+
+        internal void Serialize(System.Xml.XmlElement xmlThisBar)
+        {
+            Serialize(xmlThisBar, false);
+        }
+
+        internal void Serialize(System.Xml.XmlElement xmlThisBar, bool bPropertiesOnly)
+        {
+            // Creates serialization context
+            ItemSerializationContext context = new ItemSerializationContext();
+            context.Serializer = this;
+            context.HasDeserializeItemHandlers = ((ICustomSerialization)this).HasDeserializeItemHandlers;
+            context.HasSerializeItemHandlers = ((ICustomSerialization)this).HasSerializeItemHandlers;
+
+            xmlThisBar.SetAttribute("name", this.Name);
+            xmlThisBar.SetAttribute("candockleft", System.Xml.XmlConvert.ToString(m_CanDockLeft));
+            xmlThisBar.SetAttribute("candockright", System.Xml.XmlConvert.ToString(m_CanDockRight));
+            xmlThisBar.SetAttribute("candocktop", System.Xml.XmlConvert.ToString(m_CanDockTop));
+            xmlThisBar.SetAttribute("candockbottom", System.Xml.XmlConvert.ToString(m_CanDockBottom));
+            xmlThisBar.SetAttribute("candockdoc", System.Xml.XmlConvert.ToString(m_CanDockDocument));
+            xmlThisBar.SetAttribute("candocktab", System.Xml.XmlConvert.ToString(m_CanDockTab));
+            xmlThisBar.SetAttribute("canmaximizefloating", System.Xml.XmlConvert.ToString(_CanMaximizeFloating));
+            xmlThisBar.SetAttribute("text", this.Text);
+            xmlThisBar.SetAttribute("dockline", System.Xml.XmlConvert.ToString(m_DockLine));
+            if (/*m_DockOffset==0 && this.Left>0 && */ (this.DockSide == eDockSide.Top || this.DockSide == eDockSide.Bottom))
+                xmlThisBar.SetAttribute("dockoffset", System.Xml.XmlConvert.ToString(this.Left));
+            else if (/*m_DockOffset==0 && this.Top>0 &&*/ (this.DockSide == eDockSide.Left || this.DockSide == eDockSide.Right))
+                xmlThisBar.SetAttribute("dockoffset", System.Xml.XmlConvert.ToString(this.Top));
+            //else
+            //    xmlThisBar.SetAttribute("dockoffset",System.Xml.XmlConvert.ToString(m_DockOffset));
+            xmlThisBar.SetAttribute("grabhandle", System.Xml.XmlConvert.ToString((int)m_GrabHandleStyle));
+            xmlThisBar.SetAttribute("menubar", System.Xml.XmlConvert.ToString(m_MenuBar));
+            xmlThisBar.SetAttribute("stretch", System.Xml.XmlConvert.ToString(m_DockStretch));
+            xmlThisBar.SetAttribute("style", System.Xml.XmlConvert.ToString((int)m_ItemContainer.Style));
+            xmlThisBar.SetAttribute("wrapdock", System.Xml.XmlConvert.ToString(m_WrapItemsDock));
+            xmlThisBar.SetAttribute("wrapfloat", System.Xml.XmlConvert.ToString(m_WrapItemsFloat));
+            if (m_LockDockPosition)
+                xmlThisBar.SetAttribute("lockdockpos", System.Xml.XmlConvert.ToString(m_LockDockPosition));
+            if (!m_CanUndock)
+                xmlThisBar.SetAttribute("canundock", System.Xml.XmlConvert.ToString(m_CanUndock));
+            if (m_TabNavigation)
+                xmlThisBar.SetAttribute("tabnav", System.Xml.XmlConvert.ToString(m_TabNavigation));
+
+            if (!m_ShowToolTips)
+                xmlThisBar.SetAttribute("tooltips", System.Xml.XmlConvert.ToString(m_ShowToolTips));
+
+            if (m_ItemContainer.MoreItemsOnMenu)
+                xmlThisBar.SetAttribute("overflowmenu", System.Xml.XmlConvert.ToString(m_ItemContainer.MoreItemsOnMenu));
+
+            if (m_AutoHideState)
+            {
+                xmlThisBar.SetAttribute("state", System.Xml.XmlConvert.ToString((int)eBarState.Docked));
+                eDockSide dockside = eDockSide.None;
+                switch (m_LastDockSiteInfo.DockSide)
+                {
+                    case DockStyle.Left:
+                        dockside = eDockSide.Left;
+                        break;
+                    case DockStyle.Right:
+                        dockside = eDockSide.Right;
+                        break;
+                    case DockStyle.Top:
+                        dockside = eDockSide.Top;
+                        break;
+                    case DockStyle.Bottom:
+                        dockside = eDockSide.Bottom;
+                        break;
+                }
+                xmlThisBar.SetAttribute("dockside", System.Xml.XmlConvert.ToString((int)dockside));
+            }
+            else
+            {
+                xmlThisBar.SetAttribute("state", System.Xml.XmlConvert.ToString((int)m_BarState));
+                xmlThisBar.SetAttribute("dockside", System.Xml.XmlConvert.ToString((int)this.DockSide));
+                if (this.DockSide == eDockSide.None && m_Float != null)
+                    xmlThisBar.SetAttribute("fpos", m_Float.Location.X + "," + m_Float.Location.Y + "," + this.DisplayRectangle.Width + "," + this.DisplayRectangle.Height);
+            }
+
+            IOwnerBarSupport ownersupport = m_Owner as IOwnerBarSupport;
+            if (m_BarState == eBarState.Floating && !this.Visible && ownersupport != null && ownersupport.WereVisible.Count > 0 && ownersupport.WereVisible.Contains(this))
+                xmlThisBar.SetAttribute("visible", System.Xml.XmlConvert.ToString(true));
+            else
+            {
+                if (m_AutoHideState)
+                {
+                    xmlThisBar.SetAttribute("visible", System.Xml.XmlConvert.ToString(true));
+                    xmlThisBar.SetAttribute("autohide", System.Xml.XmlConvert.ToString(true));
+                }
+                else
+                    xmlThisBar.SetAttribute("visible", System.Xml.XmlConvert.ToString(this.Visible));
+            }
+            xmlThisBar.SetAttribute("custom", System.Xml.XmlConvert.ToString(m_CustomBar));
+            xmlThisBar.SetAttribute("canhide", System.Xml.XmlConvert.ToString(m_CanHide));
+            xmlThisBar.SetAttribute("imagesize", System.Xml.XmlConvert.ToString((int)m_ImageSize));
+            xmlThisBar.SetAttribute("itemsp", System.Xml.XmlConvert.ToString(m_ItemContainer.ItemSpacing));
+
+            xmlThisBar.SetAttribute("themes", System.Xml.XmlConvert.ToString(m_ThemeAware));
+
+            if (!m_ItemContainer.CanCustomize)
+                xmlThisBar.SetAttribute("cancust", System.Xml.XmlConvert.ToString(m_ItemContainer.CanCustomize));
+
+            // Save Font information if needed
+            if (this.Font != null)
+            {
+                if (m_CustomFont)
+                {
+                    xmlThisBar.SetAttribute("fontname", this.Font.Name);
+                    xmlThisBar.SetAttribute("fontemsize", System.Xml.XmlConvert.ToString(this.Font.Size));
+                    xmlThisBar.SetAttribute("fontstyle", System.Xml.XmlConvert.ToString((int)this.Font.Style));
+                }
+            }
+
+            if (!m_ItemContainer.m_BackgroundColor.IsEmpty)
+                xmlThisBar.SetAttribute("backcolor", BarFunctions.ColorToString(m_ItemContainer.BackColor));
+            xmlThisBar.SetAttribute("layout", System.Xml.XmlConvert.ToString((int)m_ItemContainer.LayoutType));
+            xmlThisBar.SetAttribute("eqbutton", System.Xml.XmlConvert.ToString(m_ItemContainer.EqualButtonSize));
+            if (m_DockedBorder != eBorderType.None)
+                xmlThisBar.SetAttribute("dborder", System.Xml.XmlConvert.ToString((int)m_DockedBorder));
+
+            if (!m_AcceptDropItems)
+                xmlThisBar.SetAttribute("acceptdrop", System.Xml.XmlConvert.ToString(m_AcceptDropItems));
+
+            if (m_SingleLineColor != SystemColors.ControlDark)
+                xmlThisBar.SetAttribute("slcolor", BarFunctions.ColorToString(m_SingleLineColor));
+
+            if (!m_CaptionBackColor.IsEmpty)
+                xmlThisBar.SetAttribute("captionbc", BarFunctions.ColorToString(m_CaptionBackColor));
+            if (!m_CaptionForeColor.IsEmpty)
+                xmlThisBar.SetAttribute("captionfc", BarFunctions.ColorToString(m_CaptionForeColor));
+
+            if (m_AlwaysDisplayDockTab)
+                xmlThisBar.SetAttribute("showtab", System.Xml.XmlConvert.ToString(m_AlwaysDisplayDockTab));
+
+            if (this.AutoHide)
+            {
+                if (m_ItemContainer.MinWidth != 0)
+                    xmlThisBar.SetAttribute("dockwidth", System.Xml.XmlConvert.ToString(m_ItemContainer.MinWidth));
+                else if (m_LastDockSiteInfo.DockedWidth != 0)
+                    xmlThisBar.SetAttribute("dockwidth", System.Xml.XmlConvert.ToString(m_LastDockSiteInfo.DockedWidth));
+                if (m_ItemContainer.MinHeight != 0)
+                    xmlThisBar.SetAttribute("dockheight", System.Xml.XmlConvert.ToString(m_ItemContainer.MinHeight));
+                else if (m_LastDockSiteInfo.DockedHeight != 0)
+                    xmlThisBar.SetAttribute("dockheight", System.Xml.XmlConvert.ToString(m_LastDockSiteInfo.DockedHeight));
+            }
+            else
+            {
+                if (m_ItemContainer.MinWidth != 0 && this.CanSaveMinWidth)
+                    xmlThisBar.SetAttribute("dockwidth", System.Xml.XmlConvert.ToString(m_ItemContainer.MinWidth));
+                if (m_ItemContainer.MinHeight != 0 && this.CanSaveMinHeight)
+                    xmlThisBar.SetAttribute("dockheight", System.Xml.XmlConvert.ToString(m_ItemContainer.MinHeight));
+            }
+
+            if (m_SplitDockWidthPercent > 0)
+                xmlThisBar.SetAttribute("splitwidthpercent", System.Xml.XmlConvert.ToString(m_SplitDockWidthPercent));
+            if (m_SplitDockHeightPercent > 0)
+                xmlThisBar.SetAttribute("splitheightpercent", System.Xml.XmlConvert.ToString(m_SplitDockHeightPercent));
+
+
+            if (m_ItemContainer.PaddingBottom != 1)
+                xmlThisBar.SetAttribute("padbottom", System.Xml.XmlConvert.ToString(m_ItemContainer.PaddingBottom));
+            if (m_ItemContainer.PaddingLeft != 1)
+                xmlThisBar.SetAttribute("padleft", System.Xml.XmlConvert.ToString(m_ItemContainer.PaddingLeft));
+            if (m_ItemContainer.PaddingRight != 1)
+                xmlThisBar.SetAttribute("padright", System.Xml.XmlConvert.ToString(m_ItemContainer.PaddingRight));
+            if (m_ItemContainer.PaddingTop != 1)
+                xmlThisBar.SetAttribute("padtop", System.Xml.XmlConvert.ToString(m_ItemContainer.PaddingTop));
+
+            if (m_ItemContainer.LayoutType == eLayoutType.DockContainer && this.SelectedDockTab >= 0)
+                xmlThisBar.SetAttribute("seldocktab", System.Xml.XmlConvert.ToString(this.SelectedDockTab));
+
+            if (!m_CanAutoHide)
+                xmlThisBar.SetAttribute("canautohide", System.Xml.XmlConvert.ToString(m_CanAutoHide));
+            if (!m_CanReorderTabs)
+                xmlThisBar.SetAttribute("canreordertabs", System.Xml.XmlConvert.ToString(m_CanReorderTabs));
+            if (!m_CanTearOffTabs)
+                xmlThisBar.SetAttribute("cantearoff", System.Xml.XmlConvert.ToString(m_CanTearOffTabs));
+
+            // TODO: Menu Merge Implementation
+            //if(m_MergeEnabled)
+            //	xmlThisBar.SetAttribute("merge",System.Xml.XmlConvert.ToString(m_MergeEnabled));
+
+            if (!m_HideFloatingInactive)
+                xmlThisBar.SetAttribute("hidein", System.Xml.XmlConvert.ToString(m_HideFloatingInactive));
+
+            if (m_DockTabAlignment != eTabStripAlignment.Bottom)
+                xmlThisBar.SetAttribute("tabalign", System.Xml.XmlConvert.ToString((int)m_DockTabAlignment));
+
+            if (m_AutoHideAnimationTime != 100)
+                xmlThisBar.SetAttribute("ahanim", System.Xml.XmlConvert.ToString(m_AutoHideAnimationTime));
+
+            if (!m_AutoCreateCaptionMenu)
+                xmlThisBar.SetAttribute("autocaptionmenu", System.Xml.XmlConvert.ToString(m_AutoCreateCaptionMenu));
+
+            if (m_AutoSyncBarCaption)
+                xmlThisBar.SetAttribute("autocaptionsync", System.Xml.XmlConvert.ToString(m_AutoSyncBarCaption));
+
+            if (!m_SaveLayoutChanges)
+                xmlThisBar.SetAttribute("savelayout", System.Xml.XmlConvert.ToString(m_SaveLayoutChanges));
+
+            if (m_ColorScheme.SchemeChanged)
+            {
+                System.Xml.XmlElement xmlScheme = xmlThisBar.OwnerDocument.CreateElement("colorscheme");
+                m_ColorScheme.Serialize(xmlScheme);
+                xmlThisBar.AppendChild(xmlScheme);
+            }
+
+            if (this.BackgroundImage != null)
+            {
+                System.Xml.XmlElement elementImage = xmlThisBar.OwnerDocument.CreateElement("backimage");
+                xmlThisBar.AppendChild(elementImage);
+                BarFunctions.SerializeImage(this.BackgroundImage, elementImage);
+                elementImage.SetAttribute("pos", ((int)m_BackgroundImagePosition).ToString());
+                elementImage.SetAttribute("alpha", m_BackgroundImageAlpha.ToString());
+            }
+
+            if (!bPropertiesOnly)
+            {
+                System.Xml.XmlElement xmlItems = xmlThisBar.OwnerDocument.CreateElement("items");
+                xmlThisBar.AppendChild(xmlItems);
+                foreach (BaseItem objItem in m_ItemContainer.SubItems)
+                {
+                    if (objItem.ShouldSerialize)
+                    {
+                        System.Xml.XmlElement xmlItem = xmlThisBar.OwnerDocument.CreateElement("item");
+                        xmlItems.AppendChild(xmlItem);
+                        context.ItemXmlElement = xmlItem;
+                        objItem.Serialize(context);
+                    }
+                }
+            }
+        }
+
+        private bool CanSaveMinWidth
+        {
+            get
+            {
+                eDockSide dockSide = this.DockSide;
+                if (dockSide == eDockSide.None || dockSide == eDockSide.Left || dockSide == eDockSide.Right)
+                    return true;
+                return false;
+            }
+        }
+
+        private bool CanSaveMinHeight
+        {
+            get
+            {
+                eDockSide dockSide = this.DockSide;
+                if (dockSide == eDockSide.None || dockSide == eDockSide.Top || dockSide == eDockSide.Bottom)
+                    return true;
+                return false;
+            }
+        }
+
+        internal void Deserialize(System.Xml.XmlElement xmlThisBar)
+        {
+            // Creates serialization context
+            ItemSerializationContext context = new ItemSerializationContext();
+            context.Serializer = this;
+            context.HasDeserializeItemHandlers = ((ICustomSerialization)this).HasDeserializeItemHandlers;
+            context.HasSerializeItemHandlers = ((ICustomSerialization)this).HasSerializeItemHandlers;
+
+            Deserialize(xmlThisBar, context);
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void Deserialize(System.Xml.XmlElement xmlThisBar, ItemSerializationContext context)
+        {
+            m_BarDefinitionLoading = true;
+            m_IgnoreAnimation = true;
+            try
+            {
+                LoadCommonProperties(xmlThisBar);
+
+                this.BackgroundImage = null;
+
+                foreach (System.Xml.XmlElement xmlElem in xmlThisBar.ChildNodes)
+                {
+                    switch (xmlElem.Name)
+                    {
+                        case "items":
+                            {
+                                foreach (System.Xml.XmlElement xmlItem in xmlElem.ChildNodes)
+                                {
+                                    BaseItem objItem = context.CreateItemFromXml(xmlItem);
+                                    m_ItemContainer.SubItems.Add(objItem);
+                                    context.ItemXmlElement = xmlItem;
+                                    objItem.Deserialize(context);
+                                }
+                                break;
+                            }
+                        case "colorscheme":
+                            {
+                                m_ColorScheme.Deserialize(xmlElem);
+                                break;
+                            }
+                        case "backimage":
+                            {
+                                this.BackgroundImage = BarFunctions.DeserializeImage(xmlElem);
+                                m_BackgroundImagePosition = (eBackgroundImagePosition)System.Xml.XmlConvert.ToInt32(xmlElem.GetAttribute("pos"));
+                                m_BackgroundImageAlpha = System.Xml.XmlConvert.ToByte(xmlElem.GetAttribute("alpha"));
+                                break;
+                            }
+                    }
+                }
+
+                if ((eDockSide)System.Xml.XmlConvert.ToInt32(xmlThisBar.GetAttribute("dockside")) == eDockSide.None)
+                {
+                    // Try to load position
+                    if (xmlThisBar.HasAttribute("fpos"))
+                    {
+                        string s = xmlThisBar.GetAttribute("fpos");
+                        string[] arr = s.Split(',');
+                        if (arr.Length == 4)
+                        {
+                            Rectangle r = new Rectangle(System.Xml.XmlConvert.ToInt32(arr[0]), System.Xml.XmlConvert.ToInt32(arr[1]), System.Xml.XmlConvert.ToInt32(arr[2]), System.Xml.XmlConvert.ToInt32(arr[3]));
+                            m_FloatingRect = r;
+                        }
+                    }
+                    if (!System.Xml.XmlConvert.ToBoolean(xmlThisBar.GetAttribute("visible")) || xmlThisBar.HasAttribute("autohide") && System.Xml.XmlConvert.ToBoolean(xmlThisBar.GetAttribute("autohide")))
+                        m_LoadingHideFloating = true;
+                }
+
+                if (xmlThisBar.HasAttribute("seldocktab"))
+                {
+                    int iTab = System.Xml.XmlConvert.ToInt32(xmlThisBar.GetAttribute("seldocktab"));
+                    if (iTab >= 0 && iTab < m_ItemContainer.SubItems.Count)
+                    {
+                        foreach (BaseItem dockItem in m_ItemContainer.SubItems)
+                            dockItem.Displayed = false;
+                        m_ItemContainer.SubItems[iTab].Displayed = true;
+                    }
+                }
+
+                // Last Thing to do so it is docked properly
+                m_DockLine = System.Xml.XmlConvert.ToInt32(xmlThisBar.GetAttribute("dockline"));
+                if (m_ItemContainer.LayoutType == eLayoutType.DockContainer)
+                    RefreshDockTab(true);
+                this.DockSide = (eDockSide)System.Xml.XmlConvert.ToInt32(xmlThisBar.GetAttribute("dockside"));
+                if (m_LoadingHideFloating) m_LoadingHideFloating = false;
+                if (xmlThisBar.HasAttribute("autohide") && context._DesignerHost == null)
+                {
+                    base.Visible = false;
+                    if (m_ItemContainer.MinWidth > 0)
+                        this.Width = m_ItemContainer.MinWidth;
+                    if (m_ItemContainer.MinHeight > 0)
+                        this.Height = m_ItemContainer.MinHeight;
+                    this.AutoHide = true;
+                    m_LastDockSiteInfo.DockedWidth = m_ItemContainer.MinWidth;
+                    m_LastDockSiteInfo.DockedHeight = m_ItemContainer.MinHeight;
+                }
+                else
+                {
+                    if (context._DesignerHost == null)
+                        this.Visible = System.Xml.XmlConvert.ToBoolean(xmlThisBar.GetAttribute("visible"));
+                    else
+                        this.Visible = true;
+                }
+            }
+            finally
+            {
+                m_BarDefinitionLoading = false;
+            }
+            m_TabsRearranged = false;
+            SetupAccessibility();
+        }
+
+        private void LoadCommonProperties(System.Xml.XmlElement xmlBar)
+        {
+            m_BarState = eBarState.Docked;
+            this.Name = xmlBar.GetAttribute("name");
+            if (xmlBar.HasAttribute("candockleft"))
+                m_CanDockLeft = System.Xml.XmlConvert.ToBoolean(xmlBar.GetAttribute("candockleft"));
+            if (xmlBar.HasAttribute("candockright"))
+                m_CanDockRight = System.Xml.XmlConvert.ToBoolean(xmlBar.GetAttribute("candockright"));
+            if (xmlBar.HasAttribute("candocktop"))
+                m_CanDockTop = System.Xml.XmlConvert.ToBoolean(xmlBar.GetAttribute("candocktop"));
+            if (xmlBar.HasAttribute("candockbottom"))
+                m_CanDockBottom = System.Xml.XmlConvert.ToBoolean(xmlBar.GetAttribute("candockbottom"));
+            if (xmlBar.HasAttribute("candockdoc"))
+                m_CanDockDocument = System.Xml.XmlConvert.ToBoolean(xmlBar.GetAttribute("candockdoc"));
+            if (xmlBar.HasAttribute("candocktab"))
+                m_CanDockTab = System.Xml.XmlConvert.ToBoolean(xmlBar.GetAttribute("candocktab"));
+            if (xmlBar.HasAttribute("canmaximizefloating"))
+                _CanMaximizeFloating = System.Xml.XmlConvert.ToBoolean(xmlBar.GetAttribute("canmaximizefloating"));
+            if (xmlBar.HasAttribute("text"))
+                this.Text = xmlBar.GetAttribute("text");
+            if (xmlBar.HasAttribute("dockline"))
+                m_DockLine = System.Xml.XmlConvert.ToInt32(xmlBar.GetAttribute("dockline"));
+            if (xmlBar.HasAttribute("dockoffset"))
+                m_DockOffset = System.Xml.XmlConvert.ToInt32(xmlBar.GetAttribute("dockoffset"));
+            if (xmlBar.HasAttribute("grabhandle"))
+                m_GrabHandleStyle = (eGrabHandleStyle)System.Xml.XmlConvert.ToInt32(xmlBar.GetAttribute("grabhandle"));
+            if (xmlBar.HasAttribute("menubar"))
+                m_MenuBar = System.Xml.XmlConvert.ToBoolean(xmlBar.GetAttribute("menubar"));
+            if (xmlBar.HasAttribute("stretch"))
+                m_DockStretch = System.Xml.XmlConvert.ToBoolean(xmlBar.GetAttribute("stretch"));
+            if (xmlBar.HasAttribute("wrapdock"))
+                m_WrapItemsDock = System.Xml.XmlConvert.ToBoolean(xmlBar.GetAttribute("wrapdock"));
+            if (xmlBar.HasAttribute("wrapfloat"))
+                m_WrapItemsFloat = System.Xml.XmlConvert.ToBoolean(xmlBar.GetAttribute("wrapfloat"));
+            if (xmlBar.HasAttribute("custom"))
+                m_CustomBar = System.Xml.XmlConvert.ToBoolean(xmlBar.GetAttribute("custom"));
+            if (xmlBar.HasAttribute("canhide"))
+                m_CanHide = System.Xml.XmlConvert.ToBoolean(xmlBar.GetAttribute("canhide"));
+            if (xmlBar.HasAttribute("imagesize"))
+                m_ImageSize = (eBarImageSize)System.Xml.XmlConvert.ToInt32(xmlBar.GetAttribute("imagesize"));
+
+            if (xmlBar.HasAttribute("itemsp"))
+                m_ItemContainer.ItemSpacing = System.Xml.XmlConvert.ToInt32(xmlBar.GetAttribute("itemsp"));
+            //			else
+            //				m_ItemContainer.ItemSpacing=0;
+
+            if (xmlBar.HasAttribute("backcolor"))
+                m_ItemContainer.BackColor = BarFunctions.ColorFromString(xmlBar.GetAttribute("backcolor"));
+
+            if (xmlBar.HasAttribute("layout"))
+                m_ItemContainer.LayoutType = (eLayoutType)System.Xml.XmlConvert.ToInt32(xmlBar.GetAttribute("layout"));
+
+            if (xmlBar.HasAttribute("eqbutton"))
+                m_ItemContainer.EqualButtonSize = System.Xml.XmlConvert.ToBoolean(xmlBar.GetAttribute("eqbutton"));
+
+            if (xmlBar.HasAttribute("dborder"))
+                m_DockedBorder = (eBorderType)System.Xml.XmlConvert.ToInt32(xmlBar.GetAttribute("dborder"));
+            //else
+            //    m_DockedBorder=eBorderType.None;
+
+            if (xmlBar.HasAttribute("acceptdrop"))
+                m_AcceptDropItems = System.Xml.XmlConvert.ToBoolean(xmlBar.GetAttribute("acceptdrop"));
+
+            if (xmlBar.HasAttribute("slcolor"))
+                m_SingleLineColor = BarFunctions.ColorFromString(xmlBar.GetAttribute("slcolor"));
+
+            if (xmlBar.HasAttribute("captionbc"))
+                m_CaptionBackColor = BarFunctions.ColorFromString(xmlBar.GetAttribute("captionbc"));
+            if (xmlBar.HasAttribute("captionfc"))
+                m_CaptionForeColor = BarFunctions.ColorFromString(xmlBar.GetAttribute("captionfc"));
+
+            if (xmlBar.HasAttribute("dockwidth"))
+                m_ItemContainer.MinWidth = System.Xml.XmlConvert.ToInt32(xmlBar.GetAttribute("dockwidth"));
+            if (xmlBar.HasAttribute("dockheight"))
+                m_ItemContainer.MinHeight = System.Xml.XmlConvert.ToInt32(xmlBar.GetAttribute("dockheight"));
+
+            if (xmlBar.HasAttribute("splitwidthpercent"))
+                m_SplitDockWidthPercent = System.Xml.XmlConvert.ToInt32(xmlBar.GetAttribute("splitwidthpercent"));
+            else
+                m_SplitDockWidthPercent = 0;
+            if (xmlBar.HasAttribute("splitheightpercent"))
+                m_SplitDockHeightPercent = System.Xml.XmlConvert.ToInt32(xmlBar.GetAttribute("splitheightpercent"));
+            //			else
+            //				m_SplitDockHeightPercent=0;
+
+            if (xmlBar.HasAttribute("padbottom"))
+                m_ItemContainer.PaddingBottom = System.Xml.XmlConvert.ToInt32(xmlBar.GetAttribute("padbottom"));
+            if (xmlBar.HasAttribute("padleft"))
+                m_ItemContainer.PaddingLeft = System.Xml.XmlConvert.ToInt32(xmlBar.GetAttribute("padleft"));
+            if (xmlBar.HasAttribute("padright"))
+                m_ItemContainer.PaddingRight = System.Xml.XmlConvert.ToInt32(xmlBar.GetAttribute("padright"));
+            if (xmlBar.HasAttribute("padtop"))
+                m_ItemContainer.PaddingTop = System.Xml.XmlConvert.ToInt32(xmlBar.GetAttribute("padtop"));
+
+            if (xmlBar.HasAttribute("lockdockpos"))
+                m_LockDockPosition = System.Xml.XmlConvert.ToBoolean(xmlBar.GetAttribute("lockdockpos"));
+            if (xmlBar.HasAttribute("canundock"))
+                m_CanUndock = System.Xml.XmlConvert.ToBoolean(xmlBar.GetAttribute("canundock"));
+            if (xmlBar.HasAttribute("canreordertabs"))
+                m_CanReorderTabs = System.Xml.XmlConvert.ToBoolean(xmlBar.GetAttribute("canreordertabs"));
+            if (xmlBar.HasAttribute("cantearoff"))
+                m_CanTearOffTabs = System.Xml.XmlConvert.ToBoolean(xmlBar.GetAttribute("cantearoff"));
+
+            if (xmlBar.HasAttribute("canautohide"))
+                m_CanAutoHide = System.Xml.XmlConvert.ToBoolean(xmlBar.GetAttribute("canautohide"));
+
+            if (xmlBar.HasAttribute("cancust"))
+                m_ItemContainer.CanCustomize = System.Xml.XmlConvert.ToBoolean(xmlBar.GetAttribute("cancust"));
+
+            if (xmlBar.HasAttribute("tabalign"))
+                m_DockTabAlignment = (eTabStripAlignment)System.Xml.XmlConvert.ToInt32(xmlBar.GetAttribute("tabalign"));
+
+            if (xmlBar.HasAttribute("showtab"))
+                m_AlwaysDisplayDockTab = System.Xml.XmlConvert.ToBoolean(xmlBar.GetAttribute("showtab"));
+
+            // TODO: Menu Merge Implementation
+            //if(xmlBar.HasAttribute("merge"))
+            //	m_MergeEnabled=System.Xml.XmlConvert.ToBoolean(xmlBar.GetAttribute("merge"));
+
+            if (xmlBar.HasAttribute("hidein"))
+                m_HideFloatingInactive = System.Xml.XmlConvert.ToBoolean(xmlBar.GetAttribute("hidein"));
+
+            if (xmlBar.HasAttribute("themes"))
+            {
+                m_ThemeAware = System.Xml.XmlConvert.ToBoolean(xmlBar.GetAttribute("themes"));
+                m_ItemContainer.ThemeAware = m_ThemeAware;
+            }
+
+            if (xmlBar.HasAttribute("tabnav"))
+                m_TabNavigation = System.Xml.XmlConvert.ToBoolean(xmlBar.GetAttribute("tabnav"));
+
+            if (xmlBar.HasAttribute("tooltips"))
+                m_ShowToolTips = System.Xml.XmlConvert.ToBoolean(xmlBar.GetAttribute("tooltips"));
+            //			else
+            //				m_ShowToolTips=true;
+
+            if (xmlBar.HasAttribute("overflowmenu"))
+                m_ItemContainer.MoreItemsOnMenu = System.Xml.XmlConvert.ToBoolean(xmlBar.GetAttribute("overflowmenu"));
+            //			else
+            //				m_ItemContainer.MoreItemsOnMenu=false;
+
+            if (xmlBar.HasAttribute("autocaptionmenu"))
+                m_AutoCreateCaptionMenu = System.Xml.XmlConvert.ToBoolean(xmlBar.GetAttribute("autocaptionmenu"));
+            //			else
+            //				m_AutoCreateCaptionMenu=true;
+
+            if (xmlBar.HasAttribute("autocaptionsync"))
+                this.AutoSyncBarCaption = System.Xml.XmlConvert.ToBoolean(xmlBar.GetAttribute("autocaptionsync"));
+            //			else
+            //				this.AutoSyncBarCaption=false;
+
+            if (xmlBar.HasAttribute("style"))
+            {
+                string sty = xmlBar.GetAttribute("style");
+                //if (sty == "5")
+                //    this.Style = eDotNetBarStyle.Office2007;
+                //else
+                this.Style = (eDotNetBarStyle)System.Xml.XmlConvert.ToInt32(sty);
+            }
+
+            // Load font information if it exists
+            if (xmlBar.HasAttribute("fontname"))
+            {
+                string FontName = xmlBar.GetAttribute("fontname");
+                float FontSize = System.Xml.XmlConvert.ToSingle(xmlBar.GetAttribute("fontemsize"));
+                System.Drawing.FontStyle FontStyle = (System.Drawing.FontStyle)System.Xml.XmlConvert.ToInt32(xmlBar.GetAttribute("fontstyle"));
+                try
+                {
+                    this.Font = new Font(FontName, FontSize, FontStyle);
+                }
+                catch (Exception)
+                {
+                    this.Font = SystemFonts.MenuFont; // System.Windows.Forms.SystemInformation.MenuFont.Clone() as Font;
+                }
+                m_CustomFont = true;
+            }
+
+            if (xmlBar.HasAttribute("ahanim"))
+                m_AutoHideAnimationTime = System.Xml.XmlConvert.ToInt32(xmlBar.GetAttribute("ahanim"));
+            //			else
+            //				m_AutoHideAnimationTime=100;
+
+            if (xmlBar.HasAttribute("savelayout"))
+                m_SaveLayoutChanges = System.Xml.XmlConvert.ToBoolean(xmlBar.GetAttribute("savelayout"));
+            //			else
+            //				m_SaveLayoutChanges=true;
+        }
+
+        /// <summary>
+        /// Gets or sets whether layout changes are saved for this bar when DotNetBarManager.SaveLayout method is used to save layout for all bars. Default value is true which means that layout changes are saved.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true),DefaultValue(true),Category("Behavior"),Description("Indicates whether layout changes are saved for this bar")]
+        public bool SaveLayoutChanges
+        {
+            get { return m_SaveLayoutChanges; }
+            set { m_SaveLayoutChanges = value; }
+        }
+
+        /// <summary>
+        /// Saves the Bar layout to file.
+        /// </summary>
+        /// <param name="FileName">Definition file name.</param>
+        public void SaveLayout(string FileName)
+        {
+            System.Xml.XmlDocument xmlDoc = new System.Xml.XmlDocument();
+
+            this.SaveLayout(xmlDoc);
+
+            xmlDoc.Save(FileName);
+        }
+
+        internal void SaveLayout(System.Xml.XmlDocument xmlDoc)
+        {
+            System.Xml.XmlElement xmlBar = xmlDoc.CreateElement("bar");
+            xmlDoc.AppendChild(xmlBar);
+            this.SerializeLayout(xmlBar);
+        }
+
+        /// <summary>
+        /// Loads the Bar definition from file.
+        /// </summary>
+        /// <param name="FileName">Definition file name.</param>
+        public void LoadLayout(string FileName)
+        {
+            System.Xml.XmlDocument xmlDoc = new System.Xml.XmlDocument();
+            xmlDoc.Load(FileName);
+            this.LoadLayout(xmlDoc);
+        }
+
+        internal void LoadLayout(System.Xml.XmlDocument xmlDoc)
+        {
+            if (xmlDoc.FirstChild.Name != "bar")
+                throw (new System.InvalidOperationException("XML Format not recognized"));
+
+            this.DeserializeLayout(xmlDoc.FirstChild as System.Xml.XmlElement);
+        }
+
+        /// <summary>
+        /// Gets/Sets Bar layout as XML string.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
+        public string LayoutDefinition
+        {
+            get
+            {
+                System.Xml.XmlDocument xmlDoc = new System.Xml.XmlDocument();
+                SaveLayout(xmlDoc);
+                return xmlDoc.OuterXml;
+            }
+            set
+            {
+                System.Xml.XmlDocument xmlDoc = new System.Xml.XmlDocument();
+                xmlDoc.LoadXml(value);
+                LoadLayout(xmlDoc);
+            }
+        }
+
+        internal void SerializeLayout(System.Xml.XmlElement xmlThisBar)
+        {
+            if (this.CustomBar)
+            {
+                this.Serialize(xmlThisBar, true);
+            }
+            else
+            {
+                xmlThisBar.SetAttribute("name", this.Name);
+                xmlThisBar.SetAttribute("dockline", System.Xml.XmlConvert.ToString(m_DockLine));
+                xmlThisBar.SetAttribute("layout", System.Xml.XmlConvert.ToString((int)this.LayoutType));
+
+                if (m_DockOffset == 0 && this.Left > 0 && (this.DockSide == eDockSide.Top || this.DockSide == eDockSide.Bottom))
+                    xmlThisBar.SetAttribute("dockoffset", System.Xml.XmlConvert.ToString(this.Left));
+                else if (m_DockOffset == 0 && this.Top > 0 && (this.DockSide == eDockSide.Left || this.DockSide == eDockSide.Right))
+                    xmlThisBar.SetAttribute("dockoffset", System.Xml.XmlConvert.ToString(this.Top));
+                else
+                    xmlThisBar.SetAttribute("dockoffset", System.Xml.XmlConvert.ToString(m_DockOffset));
+
+                if (m_AutoHideState)
+                {
+                    xmlThisBar.SetAttribute("state", System.Xml.XmlConvert.ToString((int)eBarState.Docked));
+                    eDockSide dockside = eDockSide.None;
+                    switch (m_LastDockSiteInfo.DockSide)
+                    {
+                        case DockStyle.Left:
+                            dockside = eDockSide.Left;
+                            break;
+                        case DockStyle.Right:
+                            dockside = eDockSide.Right;
+                            break;
+                        case DockStyle.Top:
+                            dockside = eDockSide.Top;
+                            break;
+                        case DockStyle.Bottom:
+                            dockside = eDockSide.Bottom;
+                            break;
+                    }
+                    xmlThisBar.SetAttribute("dockside", System.Xml.XmlConvert.ToString((int)dockside));
+                }
+                else
+                {
+                    xmlThisBar.SetAttribute("state", System.Xml.XmlConvert.ToString((int)m_BarState));
+                    xmlThisBar.SetAttribute("dockside", System.Xml.XmlConvert.ToString((int)this.DockSide));
+                    if (this.DockSide == eDockSide.None && m_Float != null)
+                        xmlThisBar.SetAttribute("fpos", m_Float.Location.X + "," + m_Float.Location.Y + "," + this.DisplayRectangle.Width + "," + this.DisplayRectangle.Height);
+                    else if (!m_FloatingRect.IsEmpty)
+                        xmlThisBar.SetAttribute("fpos", m_FloatingRect.X + "," + m_FloatingRect.Y + "," + m_FloatingRect.Width + "," + m_FloatingRect.Height);
+                }
+
+                IOwnerBarSupport ownersupport = m_Owner as IOwnerBarSupport;
+                if (m_BarState == eBarState.Floating && !this.Visible && ownersupport != null && ownersupport.WereVisible.Count > 0 && ownersupport.WereVisible.Contains(this))
+                    xmlThisBar.SetAttribute("visible", System.Xml.XmlConvert.ToString(true));
+                else
+                {
+                    if (m_AutoHideState)
+                    {
+                        xmlThisBar.SetAttribute("visible", System.Xml.XmlConvert.ToString(true));
+                        xmlThisBar.SetAttribute("autohide", System.Xml.XmlConvert.ToString(true));
+                    }
+                    else
+                        xmlThisBar.SetAttribute("visible", System.Xml.XmlConvert.ToString(this.Visible));
+                }
+
+                if (m_ItemContainer.MinWidth != 0)
+                    xmlThisBar.SetAttribute("dockwidth", System.Xml.XmlConvert.ToString(m_ItemContainer.MinWidth));
+                if (m_ItemContainer.MinHeight != 0)
+                    xmlThisBar.SetAttribute("dockheight", System.Xml.XmlConvert.ToString(m_ItemContainer.MinHeight));
+                if (m_SplitDockWidthPercent > 0)
+                    xmlThisBar.SetAttribute("splitwidthpercent", System.Xml.XmlConvert.ToString(m_SplitDockWidthPercent));
+                if (m_SplitDockHeightPercent > 0)
+                    xmlThisBar.SetAttribute("splitheightpercent", System.Xml.XmlConvert.ToString(m_SplitDockHeightPercent));
+
+                if (m_ItemContainer.LayoutType == eLayoutType.DockContainer && this.SelectedDockTab >= 0)
+                    xmlThisBar.SetAttribute("seldocktab", System.Xml.XmlConvert.ToString(this.SelectedDockTab));
+            }
+
+            System.Xml.XmlElement xmlItems = xmlThisBar.OwnerDocument.CreateElement("items");
+
+            foreach (BaseItem item in m_ItemContainer.SubItems)
+            {
+                if (item.OriginalBarName != "" || item.OriginalPosition >= 0 || item.UserCustomized || this.CustomBar || m_TabsRearranged || this.LayoutType == eLayoutType.DockContainer)
+                {
+                    System.Xml.XmlElement xmlItem = xmlThisBar.OwnerDocument.CreateElement("item");
+                    xmlItem.SetAttribute("name", item.Name);
+                    xmlItem.SetAttribute("origBar", item.OriginalBarName);
+                    xmlItem.SetAttribute("origPos", System.Xml.XmlConvert.ToString(item.OriginalPosition));
+                    xmlItem.SetAttribute("pos", System.Xml.XmlConvert.ToString(m_ItemContainer.SubItems.IndexOf(item)));
+                    if (!item.Visible)
+                        xmlItem.SetAttribute("visible", System.Xml.XmlConvert.ToString(item.Visible));
+                    xmlItems.AppendChild(xmlItem);
+                }
+            }
+
+            if (xmlItems.ChildNodes.Count > 0)
+                xmlThisBar.AppendChild(xmlItems);
+        }
+
+        internal void DeserializeLayout(System.Xml.XmlElement xmlBar)
+        {
+            m_BarDefinitionLoading = true;
+            try
+            {
+                m_IgnoreAnimation = true;
+
+                LoadCommonProperties(xmlBar);
+
+                if (xmlBar.ChildNodes.Count > 0)
+                {
+                    foreach (System.Xml.XmlElement xmlChild in xmlBar.ChildNodes)
+                    {
+                        if (xmlChild.Name == "items")
+                        {
+                            // Load items stored on bar first...
+                            LoadLayoutItems(xmlBar);
+                            break;
+                        }
+                    }
+                }
+
+                // Try to load floating position
+                if (xmlBar.HasAttribute("fpos"))
+                {
+                    string s = xmlBar.GetAttribute("fpos");
+                    string[] arr = s.Split(',');
+                    if (arr.Length == 4)
+                    {
+                        Rectangle r = new Rectangle(System.Xml.XmlConvert.ToInt32(arr[0]), System.Xml.XmlConvert.ToInt32(arr[1]), System.Xml.XmlConvert.ToInt32(arr[2]), System.Xml.XmlConvert.ToInt32(arr[3]));
+                        m_FloatingRect = r;
+                    }
+                }
+
+                if ((eDockSide)System.Xml.XmlConvert.ToInt32(xmlBar.GetAttribute("dockside")) == eDockSide.None)
+                {
+                    if (!System.Xml.XmlConvert.ToBoolean(xmlBar.GetAttribute("visible")))
+                        m_LoadingHideFloating = true;
+                }
+
+                if (xmlBar.HasAttribute("seldocktab"))
+                {
+                    int iTab = System.Xml.XmlConvert.ToInt32(xmlBar.GetAttribute("seldocktab"));
+                    if (iTab >= 0 && iTab < m_ItemContainer.SubItems.Count)
+                    {
+                        foreach (BaseItem dockItem in m_ItemContainer.SubItems)
+                            dockItem.Displayed = false;
+                        m_ItemContainer.SubItems[iTab].Displayed = true;
+                        if (m_AutoSyncBarCaption)
+                            this.Text = m_ItemContainer.SubItems[iTab].Text;
+                    }
+                }
+
+                // Last Thing to do so it is docked properly
+                //m_DockLine=System.Xml.XmlConvert.ToInt32(xmlBar.GetAttribute("dockline"));
+                if (m_ItemContainer.LayoutType == eLayoutType.DockContainer)
+                    RefreshDockTab(true);
+                if (this.AutoHide)
+                {
+                    if (xmlBar.HasAttribute("autohide"))
+                    {
+                        // If it is going back to auto-hide mode make sure it does not affect any bars on same line when we
+                        // bring it out of auto-hide state
+                        int minWidth = m_ItemContainer.MinWidth;
+                        int minHeight = m_ItemContainer.MinHeight;
+                        m_ItemContainer.MinWidth = 0;
+                        m_ItemContainer.MinHeight = 0;
+                        this.AutoHide = false;
+                        m_ItemContainer.MinWidth = minWidth;
+                        m_ItemContainer.MinHeight = minHeight;
+                    }
+                    else
+                        this.AutoHide = false;
+                }
+
+                this.DockSide = (eDockSide)System.Xml.XmlConvert.ToInt32(xmlBar.GetAttribute("dockside"));
+                if (m_LoadingHideFloating) m_LoadingHideFloating = false;
+                if (xmlBar.HasAttribute("autohide"))
+                {
+                    if (!this.AutoHide)
+                    {
+                        base.Visible = false;
+                        if (m_ItemContainer.MinWidth > 0)
+                            this.Width = m_ItemContainer.MinWidth;
+                        if (m_ItemContainer.MinHeight > 0)
+                            this.Height = m_ItemContainer.MinHeight;
+                        this.AutoHide = true;
+                        m_LastDockSiteInfo.DockedWidth = m_ItemContainer.MinWidth;
+                        m_LastDockSiteInfo.DockedHeight = m_ItemContainer.MinHeight;
+                    }
+                }
+                else
+                    this.Visible = System.Xml.XmlConvert.ToBoolean(xmlBar.GetAttribute("visible"));
+            }
+            finally
+            {
+                m_BarDefinitionLoading = false;
+            }
+        }
+
+        private void LoadLayoutItems(System.Xml.XmlElement xmlBar)
+        {
+            bool customBar = false;
+            eLayoutType layoutType = eLayoutType.Toolbar;
+            DotNetBarManager manager = null;
+            if (m_Owner != null && m_Owner is DotNetBarManager)
+                manager = m_Owner as DotNetBarManager;
+
+            if (xmlBar.HasAttribute("layout"))
+                layoutType = (eLayoutType)System.Xml.XmlConvert.ToInt32(xmlBar.GetAttribute("layout"));
+
+            if (layoutType == eLayoutType.DockContainer)
+                m_TabsRearranged = true;
+
+            if (xmlBar.HasAttribute("custom"))
+                customBar = System.Xml.XmlConvert.ToBoolean(xmlBar.GetAttribute("custom"));
+
+            foreach (System.Xml.XmlElement xmlElem in xmlBar.ChildNodes)
+            {
+                switch (xmlElem.Name)
+                {
+                    case "items":
+                        {
+                            for (int i = 0; i < xmlElem.ChildNodes.Count; i++)
+                            {
+                                System.Xml.XmlElement xmlItem = xmlElem.ChildNodes[i] as System.Xml.XmlElement;
+                                string itemName = xmlItem.GetAttribute("name");
+                                string originalBar = xmlItem.GetAttribute("origBar");
+                                int originalPos = System.Xml.XmlConvert.ToInt32(xmlItem.GetAttribute("origPos"));
+                                int actualPos = System.Xml.XmlConvert.ToInt32(xmlItem.GetAttribute("pos"));
+                                bool visible = true;
+                                if (xmlItem.HasAttribute("visible"))
+                                    visible = System.Xml.XmlConvert.ToBoolean(xmlItem.GetAttribute("visible"));
+
+                                if (layoutType == eLayoutType.DockContainer)
+                                {
+                                    // Just adjust item position
+                                    if (this.Items.Contains(itemName))
+                                    {
+                                        BaseItem item = this.Items[itemName];
+
+                                        if (item.Visible != visible)
+                                            item.Visible = visible;
+
+                                        if (this.Items.IndexOf(this.Items[itemName]) != actualPos)
+                                        {
+                                            this.Items.Remove(item);
+                                            if (this.Items.Count > actualPos)
+                                                this.Items.Insert(actualPos, item);
+                                            else
+                                                this.Items.Add(item);
+                                        }
+                                    }
+                                    else if (manager != null)
+                                    {
+                                        // Move item from other bar onto this bar...
+                                        BaseItem item = manager.GetItem(itemName);
+                                        if (item != null && item is DockContainerItem)
+                                        {
+                                            Bar parentBar = item.ContainerControl as Bar;
+                                            item.Parent.SubItems.Remove(item);
+                                            if (item.Visible != visible)
+                                                item.Visible = visible;
+                                            if (this.Items.Count > actualPos)
+                                                this.Items.Insert(actualPos, item);
+                                            else
+                                                this.Items.Add(item);
+                                            if (parentBar != null && parentBar.Items.Count == 0)
+                                            {
+                                                if (parentBar.AutoHide) parentBar.AutoHide = false;
+                                                parentBar.Visible = false;
+                                                //manager.Bars.Remove(parentBar);
+                                            }
+                                            else if (parentBar != null && parentBar.VisibleItemCount == 0)
+                                            {
+                                                parentBar.Visible = false;
+                                            }
+                                        }
+                                    }
+                                }
+                                else
+                                {
+                                    BaseItem item = null;
+                                    if (this.Items.Contains(itemName))
+                                    {
+                                        item = this.Items[itemName];
+                                        if (this.Items.IndexOf(itemName) != actualPos)
+                                        {
+                                            this.Items.Remove(item);
+                                            if (this.Items.Count > actualPos)
+                                                this.Items.Insert(actualPos, item);
+                                            else
+                                                this.Items.Add(item);
+                                        }
+                                    }
+                                    else
+                                    {
+                                        if (originalBar != "" && manager != null && manager.Bars.Contains(originalBar))
+                                        {
+                                            if (manager.Bars[originalBar].Items.Contains(itemName))
+                                                item = manager.Bars[originalBar].Items[itemName];
+                                        }
+                                        if (item == null)
+                                            item = manager.GetItem(itemName, true);
+                                        if (item != null)
+                                        {
+                                            if (item.ContainerControl == null || originalBar == "" && !(item.ContainerControl is Bar))
+                                                item = item.Copy();
+                                            else
+                                                item.Parent.SubItems.Remove(item);
+                                            if (this.Items.Count > actualPos)
+                                                this.Items.Insert(actualPos, item);
+                                            else
+                                                this.Items.Add(item);
+                                        }
+                                    }
+                                    if (item != null)
+                                    {
+                                        if (item.Visible != visible)
+                                            item.Visible = visible;
+                                        item.OriginalBarName = originalBar;
+                                        item.OriginalPosition = originalPos;
+                                        item.UserCustomized = true;
+                                    }
+                                }
+                            }
+                            break;
+                        }
+                }
+            }
+        }
+
+        // TODO: Menu Merge Implementation
+        //		private bool IsParentMdiChild
+        //		{
+        //			get
+        //			{
+        //				IOwner owner=m_Owner as IOwner;
+        //				if(owner!=null && owner.ParentForm!=null)
+        //				{
+        //					return ((IOwner)m_Owner).ParentForm.IsMdiChild;
+        //				}
+        //				return false;
+        //			}
+        //		}
+
+        /// <summary>
+        /// Sets the client size of the bar excluding caption. This method is useful when setting the size of the bars with layout type DockContainer.
+        /// </summary>
+        /// <param name="width">Width of bar in pixels.</param>
+        /// <param name="height">Height of bar in pixels.</param>
+        [Obsolete("Method is obsolete. Use DocumentDockUIManager.SetBarWidth or DocumentDockUIManager.SetBarHeight instead. You can obtain DocumentDockUIManager using DockSite.GetDocumentUIManager method.")]
+        public void SetSize(int width, int height)
+        {
+            if (m_BarState == eBarState.Docked)
+            {
+                m_ItemContainer.MinHeight = height;
+                m_ItemContainer.MinWidth = width;
+                SyncLineMinWidth();
+                SyncLineMinHeight();
+            }
+            else
+            {
+                this.Size = new Size(width, height);
+            }
+            if (this.IsHandleCreated)
+                this.RecalcLayout();
+        }
+
+        /// <summary>
+        /// Sets the client size of the bar excluding caption. This method is useful when setting the size of the bars with layout type DockContainer.
+        /// </summary>
+        /// <param name="size">New bar size</param>
+        [Obsolete("Method is obsolete. Use DocumentDockUIManager.SetBarWidth or DocumentDockUIManager.SetBarHeight instead. You can obtain DocumentDockUIManager using DockSite.GetDocumentUIManager method.")]
+        public void SetSize(System.Drawing.Size size)
+        {
+            SetSize(size.Width, size.Height);
+        }
+
+        /// <summary>
+        /// Specifies background image position when container is larger than image.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true),Category("Appearance"),DefaultValue(eBackgroundImagePosition.Stretch),Description("Specifies background image position when container is larger than image.")]
+        public eBackgroundImagePosition BackgroundImagePosition
+        {
+            get { return m_BackgroundImagePosition; }
+            set
+            {
+                if (m_BackgroundImagePosition != value)
+                {
+                    m_BackgroundImagePosition = value;
+                    this.Refresh();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Specifies the transparency of background image.
+        /// </summary>
+        [Browsable(true), DefaultValue((byte)255),DevCoBrowsable(true),Category("Appearance"),Description("Specifies the transparency of background image.")]
+        public byte BackgroundImageAlpha
+        {
+            get { return m_BackgroundImageAlpha; }
+            set
+            {
+                if (m_BackgroundImageAlpha != value)
+                {
+                    m_BackgroundImageAlpha = value;
+                    this.Refresh();
+                }
+            }
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeBackgroundImageAlpha()
+        {
+            return m_BackgroundImageAlpha != 255;
+        }
+
+        /// <summary>
+        /// Sets/Gets the side bar image structure.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public SideBarImage SideBar
+        {
+            get
+            {
+                return m_SideBarImage;
+            }
+            set
+            {
+                m_SideBarImage = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets/Sets the caption of the Bar. This text is displayed in title of the Bar when Bar is floating.
+        /// </summary>
+        [DevCoBrowsable(true)]
+        public override string Text
+        {
+            get
+            {
+                return base.Text;
+            }
+            set
+            {
+                if (base.Text != value)
+                {
+                    base.Text = value;
+                    if (this.Visible && (m_BarState == eBarState.Floating ||
+                        (m_BarState == eBarState.Docked || m_BarState == eBarState.AutoHide) &&
+                        (m_GrabHandleStyle == eGrabHandleStyle.Caption || m_GrabHandleStyle == eGrabHandleStyle.CaptionTaskPane ||
+                        m_GrabHandleStyle == eGrabHandleStyle.CaptionDotted)))
+                    {
+                        this.Refresh();
+                    }
+                }
+            }
+        }
+
+        [DevCoBrowsable(true)]
+        public override System.Drawing.Font Font
+        {
+            get
+            {
+                return base.Font;
+            }
+            set
+            {
+                base.Font = value;
+                if (this.Font != null)
+                    m_CustomFont = ShouldSerializeFont();
+            }
+        }
+
+        /// <summary>
+        /// Returns true if Font property should be serialized by Windows Forms designer.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeFont()
+        {
+            if (this.Font != null)
+            {
+                if (this.Font.Name != System.Windows.Forms.SystemInformation.MenuFont.Name || this.Font.Size != System.Windows.Forms.SystemInformation.MenuFont.Size || this.Font.Style != System.Windows.Forms.SystemInformation.MenuFont.Style)
+                    return true;
+                else
+                    return false;
+            }
+            return false;
+        }
+        /// <summary>
+        /// Designer method to reset the property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public new void ResetFont()
+        {
+            if (this.LayoutType == eLayoutType.DockContainer)
+                base.ResetFont();
+            else
+                this.Font = System.Windows.Forms.SystemInformation.MenuFont.Clone() as Font;
+        }
+
+        protected internal bool IsThemed
+        {
+            get
+            {
+                if (m_ThemeAware && this.Style != eDotNetBarStyle.Office2000 && BarFunctions.ThemedOS && Themes.ThemesActive)
+                    return true;
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// Specifies whether Bar is drawn using Themes when running on OS that supports themes like Windows XP.
+        /// </summary>
+        [System.ComponentModel.Browsable(true), DevCoBrowsable(true),System.ComponentModel.DefaultValue(false),System.ComponentModel.Category("Appearance"),System.ComponentModel.Description("Specifies whether SideBar is drawn using Themes when running on OS that supports themes like Windows XP.")]
+        public virtual bool ThemeAware
+        {
+            get
+            {
+                return m_ThemeAware;
+            }
+            set
+            {
+                m_ThemeAware = value;
+                m_ItemContainer.ThemeAware = value;
+            }
+        }
+
+        /// <summary>
+        /// Returns current Bar state.
+        /// </summary>
+        [System.ComponentModel.Browsable(false)]
+        public eBarState BarState
+        {
+            get
+            {
+                return m_BarState;
+            }
+        }
+
+        internal void SetBarState(eBarState state)
+        {
+            m_BarState = state;
+            if (m_BarState != eBarState.Popup && m_DropShadow != null)
+            {
+                m_DropShadow.Hide();
+                m_DropShadow.Dispose();
+                m_DropShadow = null;
+            }
+        }
+
+        /// <summary>
+        /// Returns the collection of sub-items hosted on the Bar.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), DevCoBrowsable(false),DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public SubItemsCollection Items
+        {
+            get
+            {
+                if (m_ItemContainer == null)
+                    return null;
+                return m_ItemContainer.SubItems;
+            }
+        }
+
+        /// <summary>
+        /// Returns the reference to the container that containing the sub-items.
+        /// </summary>
+        [System.ComponentModel.Browsable(false)]
+        public GenericItemContainer ItemsContainer
+        {
+            get
+            {
+                return m_ItemContainer;
+            }
+        }
+
+        /// <summary>
+        /// Gets/Sets whether the items that could not be displayed on the non-wrap Bar are displayed on popup menu or popup Bar.
+        /// </summary>
+        [System.ComponentModel.Browsable(true), DevCoBrowsable(true),System.ComponentModel.Category("Behavior"),System.ComponentModel.Description("Indicates whether the items that could not be displayed on the non-wrap Bar are displayed on popup menu or popup Bar."),DefaultValue(false)]
+        public bool DisplayMoreItemsOnMenu
+        {
+            get
+            {
+                return m_ItemContainer.MoreItemsOnMenu;
+            }
+            set
+            {
+                m_ItemContainer.MoreItemsOnMenu = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets/Sets the spacing in pixels between the sub-items.
+        /// </summary>
+        [System.ComponentModel.Browsable(true), DevCoBrowsable(true),System.ComponentModel.Category("Layout"),System.ComponentModel.Description("Indicates the spacing in pixels between the sub-items."),DefaultValue(0)]
+        public int ItemSpacing
+        {
+            get
+            {
+                return m_ItemContainer.ItemSpacing;
+            }
+            set
+            {
+                if (m_ItemContainer.ItemSpacing == value)
+                    return;
+                m_ItemContainer.ItemSpacing = value;
+                this.RecalcLayout();
+            }
+        }
+
+        /// <summary>
+        /// Gets/Sets the padding in pixels. This represents the spacing between the top edge of the bar and the top of the item.
+        /// </summary>
+        [System.ComponentModel.Browsable(true), DevCoBrowsable(true),System.ComponentModel.Category("Layout"),System.ComponentModel.Description("Gets/Sets the padding in pixels. This represents the spacing between the top of the bar and the top of the item."),DefaultValue(1)]
+        public int PaddingTop
+        {
+            get
+            {
+                return m_ItemContainer.PaddingTop;
+            }
+            set
+            {
+                if (m_ItemContainer.PaddingTop == value)
+                    return;
+                m_ItemContainer.PaddingTop = value;
+                if (this.DesignMode)
+                    this.RecalcLayout();
+            }
+        }
+
+        /// <summary>
+        /// Gets/Sets the padding in pixels. This represents the spacing between the bottom edge of the bar and the bottom of the item.
+        /// </summary>
+        [System.ComponentModel.Browsable(true), DevCoBrowsable(true),System.ComponentModel.Category("Layout"),System.ComponentModel.Description("Gets/Sets the padding in pixels. This represents the spacing between the bottom edge of the bar and the bottom of the item."),DefaultValue(1)]
+        public int PaddingBottom
+        {
+            get
+            {
+                return m_ItemContainer.PaddingBottom;
+            }
+            set
+            {
+                if (m_ItemContainer.PaddingBottom == value)
+                    return;
+                m_ItemContainer.PaddingBottom = value;
+                if (this.DesignMode)
+                    this.RecalcLayout();
+            }
+        }
+
+        /// <summary>
+        /// Gets/Sets the padding in pixels. This represents the spacing between the left edge of the bar and the left side of the first item.
+        /// </summary>
+        [System.ComponentModel.Browsable(true), DevCoBrowsable(true),System.ComponentModel.Category("Layout"),System.ComponentModel.Description("Gets/Sets the padding in pixels. This represents the spacing between the left edge of the bar and the left position of the first item."),DefaultValue(1)]
+        public int PaddingLeft
+        {
+            get
+            {
+                return m_ItemContainer.PaddingLeft;
+            }
+            set
+            {
+                if (m_ItemContainer.PaddingLeft == value)
+                    return;
+                m_ItemContainer.PaddingLeft = value;
+                if (this.DesignMode)
+                    this.RecalcLayout();
+            }
+        }
+
+        /// <summary>
+        /// Gets/Sets the padding in pixels. This represents the spacing between the right edge of the bar and the right side of the last item.
+        /// </summary>
+        [System.ComponentModel.Browsable(true), DevCoBrowsable(true),System.ComponentModel.Category("Layout"),System.ComponentModel.Description("Gets/Sets the padding in pixels. This represents the spacing between the right edge of the bar and the right side of the last item."),DefaultValue(1)]
+        public int PaddingRight
+        {
+            get
+            {
+                return m_ItemContainer.PaddingRight;
+            }
+            set
+            {
+                if (m_ItemContainer.PaddingRight == value)
+                    return;
+                m_ItemContainer.PaddingRight = value;
+                if (this.DesignMode)
+                    this.RecalcLayout();
+            }
+        }
+
+        /// <summary>
+        /// Sets/Gets whether bar is menu bar. Menu bar will show system icons
+        /// for Maximized forms in MDI Applications. Only one bar can be a Menu bar in an application.
+        /// </summary>
+        [System.ComponentModel.Browsable(true), DevCoBrowsable(true),System.ComponentModel.Category("Behavior"),System.ComponentModel.Description("Indicates Bar layout type."),DefaultValue(false)]
+        public bool MenuBar
+        {
+            get
+            {
+                return m_MenuBar;
+            }
+            set
+            {
+                m_MenuBar = value;
+                SetupAccessibility();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the visual type of the bar. The type specified here is used to determine the appearance of the bar.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), DefaultValue(eBarType.Toolbar), Category("Appearance"), Description("Indicates visual type of the bar. The type specified here is used to determine the appearance of the bar.")]
+        public eBarType BarType
+        {
+            get { return m_BarType; }
+            set
+            {
+                m_BarType = value;
+                if (m_BarType == eBarType.StatusBar)
+                    m_ItemContainer.ToolbarItemsAlign = eContainerVerticalAlignment.Middle;
+                else
+                    m_ItemContainer.ToolbarItemsAlign = eContainerVerticalAlignment.Top;
+                if (BarType == eBarType.DockWindow)
+                    this.ResetFont();
+                this.Invalidate();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets Bar Color Scheme.
+        /// </summary>
+        [System.ComponentModel.Editor(typeof(ColorSchemeVSEditor), typeof(System.Drawing.Design.UITypeEditor)), System.ComponentModel.Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Appearance"),System.ComponentModel.Description("Gets or sets Bar Color Scheme."),DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public DevComponents.DotNetBar.ColorScheme ColorScheme
+        {
+            get { return m_ColorScheme; }
+            set
+            {
+                if (value == null)
+                    throw new ArgumentException("NULL is not a valid value for this property.");
+                m_ColorScheme = value;
+                if (this.Visible)
+                    this.Refresh();
+            }
+        }
+
+        internal ColorScheme GetColorScheme()
+        {
+            if (BarFunctions.IsOffice2007Style(this.Style))
+            {
+                Office2007Renderer r = this.GetRenderer() as Office2007Renderer;
+                if (r != null && r.ColorTable.LegacyColors != null)
+                    return r.ColorTable.LegacyColors;
+            }
+
+            if (m_Owner is DotNetBarManager && ((DotNetBarManager)m_Owner).UseGlobalColorScheme)
+                return ((DotNetBarManager)m_Owner).ColorScheme;
+            return m_ColorScheme;
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeColorScheme()
+        {
+            return m_ColorScheme.SchemeChanged;
+        }
+
+        /// <summary>
+        /// Resets the ColorScheme property to its default value.
+        /// </summary>
+        public void ResetColorScheme()
+        {
+            m_ColorScheme.Refresh();
+            this.Invalidate();
+        }
+
+        /// <summary>
+        /// Gets or sets Caption (Title bar) background color.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), DevCoBrowsable(true),System.ComponentModel.Category("Appearance"),System.ComponentModel.Description("Indicates the background color of the caption (Title bar)."),DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public Color CaptionBackColor
+        {
+            get
+            {
+                return m_CaptionBackColor;
+            }
+            set
+            {
+                if (m_CaptionBackColor != value)
+                {
+                    m_CaptionBackColor = value;
+                    this.Refresh();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets Caption (Title bar) text color.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), DevCoBrowsable(true),System.ComponentModel.Category("Appearance"),System.ComponentModel.Description("Indicates the caption (Title bar) text color."),DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public Color CaptionForeColor
+        {
+            get
+            {
+                return m_CaptionForeColor;
+            }
+            set
+            {
+                if (m_CaptionForeColor != value)
+                {
+                    m_CaptionForeColor = value;
+                    this.Refresh();
+                }
+            }
+        }
+
+        internal void ClearMDIChildSystemItems(bool bRecalcLayout)
+        {
+            if (m_ItemContainer == null)
+                return;
+            try
+            {
+                if (m_ItemContainer.SubItems.Contains("dotnetbarsysiconitem"))
+                    m_ItemContainer.SubItems.Remove("dotnetbarsysiconitem");
+                if (m_ItemContainer.SubItems.Contains("dotnetbarsysmenuitem"))
+                    m_ItemContainer.SubItems.Remove("dotnetbarsysmenuitem");
+                if (bRecalcLayout)
+                    this.RecalcLayout();
+            }
+            catch (Exception)
+            {
+            }
+        }
+
+        internal void ShowMDIChildSystemItems(System.Windows.Forms.Form objMdiChild, bool bRecalcLayout)
+        {
+            ClearMDIChildSystemItems(bRecalcLayout);
+
+            if (objMdiChild == null)
+                return;
+
+            MDISystemItem mdi = new MDISystemItem("dotnetbarsysiconitem");
+            mdi.Icon = objMdiChild.Icon;
+            if (!objMdiChild.ControlBox)
+                mdi.CloseEnabled = false;
+            if (!objMdiChild.MinimizeBox)
+                mdi.MinimizeEnabled = false;
+            mdi.Click += new System.EventHandler(this.MDISysItemClick);
+            mdi.IsSystemIcon = true;
+            m_ItemContainer.SubItems.Add(mdi, 0);
+
+            mdi = new MDISystemItem("dotnetbarsysmenuitem");
+            if (!objMdiChild.ControlBox)
+                mdi.CloseEnabled = false;
+            if (!objMdiChild.MinimizeBox)
+                mdi.MinimizeEnabled = false;
+            mdi.ItemAlignment = eItemAlignment.Far;
+            mdi.Click += new System.EventHandler(this.MDISysItemClick);
+
+            m_ItemContainer.SubItems.Add(mdi);
+
+            if (bRecalcLayout)
+                this.RecalcLayout();
+        }
+
+        private void MDISysItemClick(object sender, System.EventArgs e)
+        {
+            MDISystemItem mdi = sender as MDISystemItem;
+            IOwner owner = m_Owner as IOwner;
+            Form frm = null;
+            if (owner != null)
+                frm = owner.ActiveMdiChild;
+            if (frm == null)
+            {
+                ClearMDIChildSystemItems(true);
+                return;
+            }
+            if (mdi.LastButtonClick == SystemButton.Minimize)
+            {
+                NativeFunctions.PostMessage(frm.Handle, NativeFunctions.WM_SYSCOMMAND, new IntPtr(NativeFunctions.SC_MINIMIZE), IntPtr.Zero);
+                //frm.WindowState=FormWindowState.Minimized;
+            }
+            else if (mdi.LastButtonClick == SystemButton.Restore)
+            {
+                NativeFunctions.PostMessage(frm.Handle, NativeFunctions.WM_SYSCOMMAND, new IntPtr(NativeFunctions.SC_RESTORE), IntPtr.Zero);
+                //frm.WindowState=FormWindowState.Normal;
+            }
+            else if (mdi.LastButtonClick == SystemButton.Close)
+            {
+                NativeFunctions.PostMessage(frm.Handle, NativeFunctions.WM_SYSCOMMAND, new IntPtr(NativeFunctions.SC_CLOSE), IntPtr.Zero);
+            }
+            else if (mdi.LastButtonClick == SystemButton.NextWindow)
+            {
+                NativeFunctions.PostMessage(frm.Handle, NativeFunctions.WM_SYSCOMMAND, new IntPtr(NativeFunctions.SC_NEXTWINDOW), IntPtr.Zero);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether toolbars with appropriate style appear with rounded corners. Default value is true.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(false), Category("Appearance"), Description("Indicates whether toolbars with appropriate style appear with rounded corners."), DefaultValue(true)]
+        public bool RoundCorners
+        {
+            get { return m_RoundCorners; }
+            set
+            {
+                m_RoundCorners = value;
+                this.RecalcLayout();
+            }
+        }
+
+        /// <summary>
+        /// Gets/Sets the visual style of the Bar.
+        /// </summary>
+        [System.ComponentModel.Browsable(true), DevCoBrowsable(true),System.ComponentModel.Category("Appearance"),System.ComponentModel.Description("Specifies the visual style of the Bar."),DefaultValue(eDotNetBarStyle.OfficeXP)]
+        public eDotNetBarStyle Style
+        {
+            get
+            {
+                return m_ItemContainer.Style;
+            }
+            set
+            {
+                //if(m_ItemContainer.Style==value)
+                //	return;
+                m_ColorScheme.SwitchStyle(value);
+                m_ItemContainer.Style = value;
+                if ((m_ItemContainer.EffectiveStyle == eDotNetBarStyle.Office2003 || m_ItemContainer.EffectiveStyle == eDotNetBarStyle.VS2005 || BarFunctions.IsOffice2007Style(m_ItemContainer.EffectiveStyle)) && this.LayoutType == eLayoutType.Toolbar && this.GrabHandleStyle != eGrabHandleStyle.None && this.GrabHandleStyle != eGrabHandleStyle.ResizeHandle)
+                    m_GrabHandleStyle = eGrabHandleStyle.Office2003;
+                SetDockTabStyle(m_ItemContainer.EffectiveStyle);
+                if (this.AutoHide)
+                {
+                    AutoHidePanel panel = this.GetAutoHidePanel();
+                    if (panel != null)
+                        panel.Style = value;
+                }
+                else
+                {
+                    this.Invalidate();
+                    this.RecalcLayout();
+                }
+            }
+        }
+
+        //internal int MinClientSize
+        //{
+        //    get
+        //    {
+        //        if(this.SelectedDockTab>=0)
+        //        {
+        //            return ((DockContainerItem)m_TabDockItems.SelectedTab.AttachedItem).MinFormClientSize;
+        //        }
+        //        else if(m_ItemContainer.LayoutType==eLayoutType.DockContainer && m_ItemContainer.SubItems.Count==1 && m_ItemContainer.SubItems[0] is DockContainerItem)
+        //            return ((DockContainerItem)m_ItemContainer.SubItems[0]).MinFormClientSize;
+
+        //        return m_MinClientSize;
+        //    }
+        //    set {m_MinClientSize=value;}
+        //}
+
+        internal bool IsPositionOnDockTab(int x, int y)
+        {
+            // Receives the screen coordinates
+            Point p = this.PointToClient(new Point(x, y));
+            if (m_GrabHandleRect.Contains(p) || m_TabDockItems != null && m_TabDockItems.Bounds.Contains(p))
+                return true;
+            return false;
+        }
+
+        internal void AppLostFocus()
+        {
+            if (m_ItemContainer != null)
+                m_ItemContainer.ContainerLostFocus(true);
+            if (!this.IsDisposed)
+                AccessibilityNotifyClients(AccessibleEvents.StateChange, 0);
+        }
+        internal void AppActivate()
+        {
+            if (!this.IsDisposed)
+                AccessibilityNotifyClients(AccessibleEvents.StateChange, 0);
+        }
+
+        internal void HideBar()
+        {
+            if (m_DesignerParent && this.Parent != null)
+            {
+                this.Parent.Controls.Remove(this);
+                m_DesignerParent = false;
+            }
+
+            if (m_BarState == eBarState.Floating)
+            {
+                if (m_Float != null)
+                {
+                    m_Float.Hide();
+                    base.OnVisibleChanged(new EventArgs());
+                }
+            }
+            else
+            {
+                base.Hide();
+
+                if (!m_DockingInProgress && !m_LayoutSuspended && this.Parent is DockSite && ((DockSite)this.Parent).DocumentDockContainer != null)
+                    ((DockSite)this.Parent).GetDocumentUIManager().AdjustContainerSize(this, true);
+
+                if (m_Owner != null && m_Owner is DotNetBarManager && ((DotNetBarManager)m_Owner).IsDisposed)
+                    return;
+                this.RecalcLayout();
+            }
+        }
+
+        private bool m_DesignerParent = false;
+        private bool AddtoDesignTimeContainer()
+        {
+            ISite site = GetSite();
+            if (site == null)
+                return false;
+
+            IDesignerHost dh = site.GetService(typeof(IDesignerHost)) as IDesignerHost;
+            if (dh == null) return false;
+
+            Control parent = dh.RootComponent as Control;
+            while (parent != null)
+            {
+                parent = parent.Parent;
+                if (parent != null && parent.GetType().Name.IndexOf("DesignerFrame") >= 0)
+                    break;
+            }
+            if (parent == null || parent.Parent == null) return false;
+            //parent = parent.Parent;
+            Point p = parent.PointToClient(this.Location);
+            parent.Controls.Add(this);
+            this.Location = p;
+            base.Show();
+            this.Update();
+            this.BringToFront();
+            m_DesignerParent = true;
+            return true;
+        }
+
+        internal void ShowBar()
+        {
+            if (PassiveBar)
+            {
+                base.Show();
+                this.Update();
+                return;
+            }
+
+            if (m_BarState == eBarState.Floating)
+            {
+                if (m_Float == null)
+                {
+                    m_Float = new FloatingContainer(this);
+                    m_Float.CreateControl();
+                    if (this.Parent != null)
+                    {
+                        if (this.Parent is DockSite)
+                            ((DockSite)this.Parent).RemoveBar(this);
+                        else
+                            this.Parent.Controls.Remove(this);
+                    }
+                    this.Parent = null;
+                    m_Float.Controls.Add(this);
+                    // WE OVERRIDE BASE LOCATION WE MUST USE BASE.
+                    base.Location = new Point(0, 0);
+                }
+                if (m_Float != null)
+                {
+                    // TODO: Show method did not want to show the form, check has it been fixed in newer versions
+                    //m_Float.Show();
+                    //NativeFunctions.SetWindowPos(m_Float.Handle.ToInt32(),NativeFunctions.HWND_TOP,0,0,0,0,NativeFunctions.SWP_SHOWWINDOW | NativeFunctions.SWP_NOSIZE | NativeFunctions.SWP_NOACTIVATE | NativeFunctions.SWP_NOMOVE);
+                    //m_Float.TopMost=true;
+                    m_Float.TopLevel = true;
+                    m_Float.Visible = true;
+                    if (!base.Visible)
+                        base.Visible = true;
+                    m_Float.Refresh();
+                }
+            }
+            else if (m_BarState == eBarState.Popup)
+            {
+                // Design mode add
+                if (m_ParentItem != null && (m_ParentItem.Site != null && m_ParentItem.Site.DesignMode ||
+                    m_ParentItem.Parent != null && m_ParentItem.Parent.Site != null && m_ParentItem.Parent.Site.DesignMode))
+                {
+                    if (AddtoDesignTimeContainer())
+                        return;
+                }
+
+                //NativeFunctions.sndPlaySound("MenuPopup",NativeFunctions.SND_ASYNC | NativeFunctions.SND_NODEFAULT);
+                ePopupAnimation animation = m_PopupAnimation;
+                if (!BarFunctions.SupportsAnimation)
+                    animation = ePopupAnimation.None;
+                else
+                {
+                    IOwnerMenuSupport ownersupport = m_Owner as IOwnerMenuSupport;
+                    if (animation == ePopupAnimation.ManagerControlled)
+                    {
+                        if (ownersupport != null)
+                            animation = ownersupport.PopupAnimation;
+                        if (animation == ePopupAnimation.ManagerControlled)
+                            animation = ePopupAnimation.SystemDefault;
+                    }
+
+                    if (animation == ePopupAnimation.SystemDefault)
+                        animation = NativeFunctions.SystemMenuAnimation;
+                    else if (animation == ePopupAnimation.Random)
+                    {
+                        Random r = new System.Random();
+                        int i = r.Next(2);
+                        animation = ePopupAnimation.Fade;
+                        if (i == 1)
+                            animation = ePopupAnimation.Slide;
+                        else if (i == 2)
+                            animation = ePopupAnimation.Unfold;
+                    }
+                }
+
+                if (BarFunctions.IsOffice2007Style(this.Style) && this.BarType == eBarType.Toolbar)
+                    SetRoundRegion(this);
+
+                if (animation == ePopupAnimation.Fade && Environment.OSVersion.Version.Major >= 5)
+                {
+                    // TODO: Blending was leaving the white dots in the region that was excluded, make sure that it is not happening for final release, test other AnimateWindows
+                    NativeFunctions.AnimateWindow(this.Handle, BarFunctions.ANIMATION_INTERVAL, NativeFunctions.AW_BLEND);
+                }
+                else if (animation == ePopupAnimation.Slide)
+                    NativeFunctions.AnimateWindow(this.Handle, BarFunctions.ANIMATION_INTERVAL, (NativeFunctions.AW_SLIDE | NativeFunctions.AW_HOR_POSITIVE | NativeFunctions.AW_VER_POSITIVE));
+                else if (animation == ePopupAnimation.Unfold)
+                    NativeFunctions.AnimateWindow(this.Handle, BarFunctions.ANIMATION_INTERVAL, (NativeFunctions.AW_HOR_POSITIVE | NativeFunctions.AW_VER_POSITIVE));
+                else
+                    base.Show();
+
+                if (animation != ePopupAnimation.None && this.Controls.Count > 0)
+                    this.Refresh();
+
+                if (this.DisplayShadow && this.AlphaShadow)
+                {
+                    if (m_DropShadow != null)
+                    {
+                        m_DropShadow.Hide();
+                        m_DropShadow.Dispose();
+                    }
+                    m_DropShadow = new PopupShadow(true);
+                    m_DropShadow.CreateControl();
+                    NativeFunctions.SetWindowPos(m_DropShadow.Handle, new IntPtr(NativeFunctions.HWND_NOTOPMOST), this.Left + 5, this.Top + 5, this.Width - 2, this.Height - 2, NativeFunctions.SWP_SHOWWINDOW | NativeFunctions.SWP_NOACTIVATE);
+                    m_DropShadow.UpdateShadow();
+                }
+            }
+            else
+            {
+                // Retain bar's position in controls collection it can change when bar is shown
+                // OnVisibleChanged will be triggered and index of the bar will be checked against
+                // this value. If it has changed it will be restored.
+                if (this.Parent is DockSite)
+                    m_BarShowIndex = this.Parent.Controls.IndexOf(this);
+                else
+                    m_BarShowIndex = -1;
+
+                if (!m_DockingInProgress && !m_LayoutSuspended && this.Parent is DockSite && this.Parent.Dock != DockStyle.Fill && ((DockSite)this.Parent).DocumentDockContainer != null)
+                {
+                    DockSite ds = this.Parent as DockSite;
+                    m_LayoutSuspended = true;
+                    base.Show();
+                    m_LayoutSuspended = false;
+                    ds.GetDocumentUIManager().AdjustContainerSize(this, true);
+                    // Reset the side by side docking for the bars so they are uniform
+                    if (!m_BarDefinitionLoading)
+                    {
+                        DocumentBaseContainer dc = ds.GetDocumentUIManager().GetDocumentFromBar(this);
+                        if (dc != null && dc.Parent is DocumentDockContainer)
+                        {
+                            DocumentDockContainer p = dc.Parent as DocumentDockContainer;
+                            int visibleCount = p.Documents.VisibleCount;
+                            if (visibleCount > 1)
+                            {
+                                if (p.Orientation == eOrientation.Horizontal && (ds.Dock == DockStyle.Top || ds.Dock == DockStyle.Bottom))
+                                {
+                                    //float f = 1 + dc.LayoutBounds.Width / (float)(p.DisplayBounds.Width - dc.LayoutBounds.Width);
+                                    //dc.SetLayoutBounds(new Rectangle(dc.LayoutBounds.X, dc.LayoutBounds.Y, (int)(dc.LayoutBounds.Width * f), dc.LayoutBounds.Height));
+                                    dc.SetLayoutBounds(new Rectangle(dc.LayoutBounds.X, dc.LayoutBounds.Y, (int)(p.LayoutBounds.Width / visibleCount), dc.LayoutBounds.Height));
+                                }
+                                else if (p.Orientation == eOrientation.Vertical && (ds.Dock == DockStyle.Left || ds.Dock == DockStyle.Right))
+                                {
+                                    //float f = 1 + dc.LayoutBounds.Height / (float)(p.DisplayBounds.Height - dc.LayoutBounds.Height);
+                                    //dc.SetLayoutBounds(new Rectangle(dc.LayoutBounds.X, dc.LayoutBounds.Y, dc.LayoutBounds.Width, (int)(dc.LayoutBounds.Height * f)));
+                                    dc.SetLayoutBounds(new Rectangle(dc.LayoutBounds.X, dc.LayoutBounds.Y, dc.LayoutBounds.Width, (int)(p.LayoutBounds.Height / visibleCount)));
+                                }
+                            }
+                        }
+                    }
+                    DotNetBarManager man = this.Owner as DotNetBarManager;
+                    if (man != null && man.SuspendLayout)
+                        ds.NeedsLayout = true;
+                }
+                else
+                    base.Show();
+
+                m_BarShowIndex = -1;
+            }
+            // This makes the bar paint BEFORE it returns out of this function
+            this.Update();
+        }
+
+        internal bool DockingInProgress
+        {
+            get
+            {
+                return m_DockingInProgress;
+            }
+        }
+
+        /// <summary>
+        /// Gets/Sets whether the items will be wrapped into next line when Bar is full. Applies to both docked and floating Bar states.
+        /// </summary>
+        [System.ComponentModel.Browsable(false)]
+        public bool WrapItems
+        {
+            get
+            {
+                return m_ItemContainer.WrapItems;
+            }
+        }
+
+        /// <summary>
+        /// Gets/Sets whether the items will be wrapped into next line when Bar is full. Applies only to Bars that are docked.
+        /// </summary>
+        [System.ComponentModel.Browsable(true), DevCoBrowsable(true),System.ComponentModel.Category("Layout"),System.ComponentModel.Description("Indicates whether the items will be wrapped into next line when Bar is full. Applies only to Bars that are docked."),DefaultValue(false)]
+        public bool WrapItemsDock
+        {
+            get
+            {
+                return m_WrapItemsDock;
+            }
+            set
+            {
+                m_WrapItemsDock = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets/Sets whether the items will be wrapped into next line when Bar is full. Applies only to Bars that are floating.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), DevCoBrowsable(true),System.ComponentModel.Category("Layout"),System.ComponentModel.Description("Indicates whether the items will be wrapped into next line when Bar is full. Applies only to Bars that are floating."),DefaultValue(true)]
+        public bool WrapItemsFloat
+        {
+            get
+            {
+                return m_WrapItemsFloat;
+            }
+            set
+            {
+                m_WrapItemsFloat = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets/Sets the grab handle style of the docked Bars.
+        /// </summary>
+        [System.ComponentModel.Browsable(true), DevCoBrowsable(true),System.ComponentModel.Category("Appearance"),System.ComponentModel.Description("Indicates the grab handle style of the docked Bars."),DefaultValue(eGrabHandleStyle.None)]
+        public eGrabHandleStyle GrabHandleStyle
+        {
+            get
+            {
+                return m_GrabHandleStyle;
+            }
+            set
+            {
+                if (m_GrabHandleStyle == value)
+                    return;
+                m_GrabHandleStyle = value;
+                SetupAccessibility();
+                if (this.Visible && !m_LayoutSuspended)
+                    this.RecalcLayout();
+            }
+        }
+
+        /// <summary>
+        /// Gets the grab handle client rectangle.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false)]
+        public Rectangle GrabHandleRect
+        {
+            get
+            {
+                return m_GrabHandleRect;
+            }
+        }
+
+        internal void DockContainerItemCanCloseChanged(DockContainerItem item, eDockContainerClose oldValue, eDockContainerClose newValue)
+        {
+            if (SelectedDockContainerItem != item) return;
+            UpdateCloseButtonVisibility();
+        }
+
+        private void UpdateCloseButtonVisibility()
+        {
+            bool canHideResolved = this.CanHideResolved;
+
+            if (m_BarState == eBarState.Floating || m_BarState == eBarState.Docked && (m_GrabHandleStyle == eGrabHandleStyle.Caption || m_GrabHandleStyle == eGrabHandleStyle.CaptionTaskPane || m_GrabHandleStyle == eGrabHandleStyle.CaptionDotted))
+                this.Invalidate(m_GrabHandleRect);
+
+            if (m_TabDockItems != null && m_TabDockItems._TabSystemBox != null)
+            {
+                m_TabDockItems._TabSystemBox.CloseVisible = canHideResolved;
+            }
+        }
+
+        /// <summary>
+        /// Returns CanClose based on the selected dock-container item.
+        /// </summary>
+        private bool CanHideResolved
+        {
+            get
+            {
+                DockContainerItem item = this.SelectedDockContainerItem;
+                if (item == null || item.CanClose == eDockContainerClose.Inherit)
+                    return CanHide;
+                return item.CanClose == eDockContainerClose.Yes;
+            }
+        }
+
+        /// <summary>
+        /// Gets/Sets whether the Bar can be hidden by end-user. Applies to Document docked bars only.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true),System.ComponentModel.Category("Behavior"),System.ComponentModel.Description("Determines whether bar can be hidden."),DefaultValue(false)]
+        public bool CanHide
+        {
+            get
+            {
+                return m_CanHide;
+            }
+            set
+            {
+                if (m_CanHide == value)
+                    return;
+                m_CanHide = value;
+                if (m_BarState == eBarState.Floating || m_BarState == eBarState.Docked && (m_GrabHandleStyle == eGrabHandleStyle.Caption || m_GrabHandleStyle == eGrabHandleStyle.CaptionTaskPane || m_GrabHandleStyle == eGrabHandleStyle.CaptionDotted))
+                    this.Invalidate(m_GrabHandleRect);
+                UpdateDockTabSettings();
+                if (m_TabDockItems != null && BarFunctions.IsHandleValid(this))
+                {
+                    m_TabDockItems.RecalcSize();
+                    if (this.DesignMode)
+                        m_TabDockItems.Invalidate();
+                }
+            }
+        }
+
+        private bool EffectiveCanMaximizeFloating
+        {
+            get
+            {
+                return _CanMaximizeFloating && this.LayoutType == eLayoutType.DockContainer &&
+                       this.Parent is FloatingContainer;
+            }
+        }
+
+        private bool _CanMaximizeFloating = true;
+        /// <summary>
+        /// Indicates whether Maximize button is visible on floating dock windows.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether Maximize button is visible on floating dock windows.")]
+        public bool CanMaximizeFloating
+        {
+            get { return _CanMaximizeFloating; }
+            set
+            {
+                if (value != _CanMaximizeFloating)
+                {
+                    bool oldValue = _CanMaximizeFloating;
+                    _CanMaximizeFloating = value;
+                    OnCanMaximizeFloatingChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when CanMaximizeFloating property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnCanMaximizeFloatingChanged(bool oldValue, bool newValue)
+        {
+            if (m_BarState == eBarState.Floating && (m_GrabHandleStyle == eGrabHandleStyle.Caption || m_GrabHandleStyle == eGrabHandleStyle.CaptionTaskPane || m_GrabHandleStyle == eGrabHandleStyle.CaptionDotted))
+                this.Invalidate(m_GrabHandleRect);
+            //OnPropertyChanged(new PropertyChangedEventArgs("CanMaximizeFloating"));
+        }
+
+        /// <summary>
+        /// Gets/Sets border style when Bar is docked.
+        /// </summary>
+        [System.ComponentModel.Browsable(true), DevCoBrowsable(true),System.ComponentModel.Category("Appearance"),System.ComponentModel.Description("Indicates border style when Bar is docked."),DefaultValue(eBorderType.None)]
+        public eBorderType DockedBorderStyle
+        {
+            get
+            {
+                return m_DockedBorder;
+            }
+            set
+            {
+                if (m_DockedBorder == value)
+                    return;
+                m_DockedBorder = value;
+                if (m_BarState == eBarState.Docked && this.Visible)
+                    this.RecalcLayout();
+            }
+        }
+
+        /// <summary>
+        /// Gets/Sets whether floating bar is hidden when application loses focus.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true),DefaultValue(true),Category("Docking"),Description("Indicates whether floating bar is hidden when application loses focus.")]
+        public bool HideFloatingInactive
+        {
+            get
+            {
+                return m_HideFloatingInactive;
+            }
+            set
+            {
+                m_HideFloatingInactive = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets/Sets whether tab navigation buttons are shown for tabbed dockable bars.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true),DefaultValue(false),Category("Docking"),Description("Indicates whether tab navigation buttons are shown for tabbed dockable bars.")]
+        public bool TabNavigation
+        {
+            get
+            {
+                return m_TabNavigation;
+            }
+            set
+            {
+                if (m_TabNavigation != value)
+                {
+                    m_TabNavigation = value;
+                    UpdateDockTabSettings();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the border line color when docked border is a single line.
+        /// </summary>
+        [System.ComponentModel.Browsable(true), DevCoBrowsable(true),System.ComponentModel.Category("Appearance"),System.ComponentModel.Description("Indicates the border line color when docked border is a single line.")]
+        public Color SingleLineColor
+        {
+            get
+            {
+                return m_SingleLineColor;
+            }
+            set
+            {
+                if (m_SingleLineColor != value)
+                {
+                    m_SingleLineColor = value;
+                    if (m_BarState == eBarState.Docked && this.Visible && m_DockedBorder == eBorderType.SingleLine)
+                        this.Refresh();
+                }
+            }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeSingleLineColor()
+        {
+            return (m_SingleLineColor != SystemColors.ControlDark);
+        }
+
+        /// <summary>
+        /// Gets/Sets whether Bar is visible or not.
+        /// </summary>
+        [DevCoBrowsable(true), DefaultValue(true)]
+        public new bool Visible
+        {
+            get
+            {
+                if (m_BarState == eBarState.Floating && m_Float != null)
+                    return m_Float.Visible;
+                return base.Visible;
+            }
+            set
+            {
+                m_IsVisible = value;
+                if (base.Visible == value)
+                {
+                    // This allows the Bar to be hidden when Visible property is set from forms constructor...
+                    if (/*!this.IsHandleCreated &&*/ value == false)
+                        base.Visible = false;
+                    return;
+                }
+                if (value)
+                    this.ShowBar();
+                else
+                    this.HideBar();
+            }
+        }
+
+        /// <summary>
+        /// Returns number of items that have Visible property set to true.
+        /// </summary>
+        [Browsable(false)]
+        public int VisibleItemCount
+        {
+            get
+            {
+                return m_ItemContainer.VisibleSubItems;
+            }
+        }
+
+        private BaseItem GetFirstVisibleItem()
+        {
+            foreach (BaseItem item in this.Items)
+            {
+                if (item.Visible)
+                    return item;
+            }
+            return null;
+        }
+
+        /// <summary>
+        /// Gets or sets whether bar is valid drop target for end-user bar customization. Default value is true.
+        /// When bar is used as dock container then you can use this property to prevent docking of other bars as dock tabs.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), DevCoBrowsable(true),System.ComponentModel.Category("Behavior"),System.ComponentModel.Description("Determines whether end-user can drag and drop items on the Bar."),DefaultValue(true)]
+        public bool AcceptDropItems
+        {
+            get
+            {
+                return m_AcceptDropItems;
+            }
+            set
+            {
+                m_AcceptDropItems = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether items on the Bar can be customized.
+        /// </summary>
+        [Browsable(true), Category("Behavior"),Description("Gets or sets whether items on the Bar can be customized."),DefaultValue(true)]
+        public bool CanCustomize
+        {
+            get
+            {
+                if (m_ItemContainer != null)
+                    return m_ItemContainer.CanCustomize;
+                return false;
+            }
+            set
+            {
+                if (this.DesignMode) return;
+                if (m_ItemContainer != null)
+                    m_ItemContainer.CanCustomize = value;
+            }
+        }
+
+
+        /// <summary>
+        /// Makes the Bar display by setting the visible property to true.
+        /// </summary>
+        public new void Show()
+        {
+            this.Visible = true;
+        }
+
+        /// <summary>
+        /// Hides the Bar.
+        /// </summary>
+        public new void Hide()
+        {
+            if (this.AutoHide)
+                this.AutoHide = false;
+            this.Visible = false;
+            this.RecalcLayout();
+        }
+
+        /// <summary>
+        /// Specifies whether Bar was created by user using Customize dialog.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool CustomBar
+        {
+            get
+            {
+                return m_CustomBar;
+            }
+            set
+            {
+                m_CustomBar = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets/Sets the Bar name used to identify Bar from code.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), DevCoBrowsable(true),System.ComponentModel.Category("Design"),System.ComponentModel.Description("Bar name that can be used to identify Bar from code.")]
+        public new string Name
+        {
+            get
+            {
+                return base.Name;
+            }
+            set
+            {
+                base.Name = value;
+                if (this.Site != null)
+                    this.Site.Name = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets/Sets the Image size for all sub-items on the Bar.
+        /// </summary>
+        [System.ComponentModel.Browsable(true), DevCoBrowsable(true),System.ComponentModel.Category("Behavior"),System.ComponentModel.Description("Specifies the Image size that will be used by items on this bar."),DefaultValue(eBarImageSize.Default)]
+        public eBarImageSize ImageSize
+        {
+            get
+            {
+                return m_ImageSize;
+            }
+            set
+            {
+                if (m_ImageSize == value)
+                    return;
+                m_ImageSize = value;
+                m_ItemContainer.RefreshImageSize();
+                this.RecalcLayout();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the layout type.
+        /// </summary>
+        [System.ComponentModel.Browsable(true), DevCoBrowsable(true),System.ComponentModel.Category("Layout"),System.ComponentModel.Description("Indicates Bar layout type."),DefaultValue(eLayoutType.Toolbar)]
+        public eLayoutType LayoutType
+        {
+            get
+            {
+                if (m_ItemContainer == null)
+                    return eLayoutType.Toolbar;
+                return m_ItemContainer.LayoutType;
+            }
+            set
+            {
+                if (m_ItemContainer.LayoutType == value)
+                    return;
+                m_ItemContainer.LayoutType = value;
+                if (value == eLayoutType.DockContainer)
+                    this.ResetFont();
+                SetupAccessibility();
+                this.RecalcLayout();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether all buttons are automatically resized to the largest button in collection.
+        /// </summary>
+        [System.ComponentModel.Browsable(true), DevCoBrowsable(true),System.ComponentModel.Category("Behavior"),System.ComponentModel.Description("Indicates that buttons will be automatically resized to match the size of the largest button on the bar."),DefaultValue(false)]
+        public bool EqualButtonSize
+        {
+            get
+            {
+                return m_ItemContainer.EqualButtonSize;
+            }
+            set
+            {
+                if (m_ItemContainer.EqualButtonSize == value)
+                    return;
+                m_ItemContainer.EqualButtonSize = value;
+                this.RecalcLayout();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets rounded corner size for styles that use rounded corners.
+        /// </summary>
+        internal int CornerSize
+        {
+            get { return m_CornerSize; }
+            set { m_CornerSize = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether anti-alias smoothing is used while painting. Default value is false.
+        /// </summary>
+        [DefaultValue(false), Browsable(true), Category("Appearance"), Description("Gets or sets whether anti-aliasing is used while painting.")]
+        public bool AntiAlias
+        {
+            get { return m_AntiAlias; }
+            set
+            {
+                if (m_AntiAlias != value)
+                {
+                    m_AntiAlias = value;
+                    this.Invalidate();
+                }
+            }
+        }
+
+
+        /// <summary>
+        /// Gets or sets whether mouse over fade effect is enabled for buttons. Default value is false. Note that Fade effect
+        /// will work only when Office2007 style is used. For other styles this property has no effect and fade animation is not used regardless
+        /// this property setting.
+        /// </summary>
+        [Browsable(true), DefaultValue(false), Category("Appearance"), Description("Indicates whether mouse over fade effect for buttons is enabled.")]
+        public bool FadeEffect
+        {
+            get { return m_FadeEffect; }
+            set
+            {
+                m_FadeEffect = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets whether fade effect should be in use.
+        /// </summary>
+        internal bool IsFadeEnabled
+        {
+            get
+            {
+                if (this.DesignMode || (!BarFunctions.IsOffice2007Style(m_ItemContainer.EffectiveStyle)) || m_FadeEffect && NativeFunctions.IsTerminalSession() || this.IsThemed || TextDrawing.UseTextRenderer)
+                    return false;
+                return m_FadeEffect;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Bar back color.
+        /// </summary>
+        [System.ComponentModel.Browsable(true), DevCoBrowsable(true),System.ComponentModel.Category("Appearance"),System.ComponentModel.Description("Specifies background color of the Bar."),DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
+        public override Color BackColor
+        {
+            get
+            {
+                if (m_ItemContainer != null)
+                    return m_ItemContainer.BackColor;
+                else
+                {
+                    return base.BackColor;
+                }
+            }
+            set
+            {
+                if (m_ItemContainer != null)
+                    m_ItemContainer.BackColor = value;
+                else
+                    base.BackColor = value;
+                this.Invalidate();
+            }
+        }
+        [System.ComponentModel.Browsable(false), System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+        public override void ResetBackColor()
+        {
+            if (m_ItemContainer != null)
+                m_ItemContainer.BackColor = Color.Empty;
+            else
+                base.BackColor = SystemColors.Control;
+        }
+        public bool ShouldSerializeBackColor()
+        {
+            if (m_ItemContainer != null)
+            {
+                if (!m_ItemContainer.m_BackgroundColor.IsEmpty)
+                    return true;
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// Returns whether Size property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeSize()
+        {
+            if (this.LayoutType == eLayoutType.DockContainer && this.Parent is DockSite && this.Parent.Dock == DockStyle.Fill)
+                return false;
+            return true;
+        }
+
+        /// <summary>
+        /// Gets or sets the Bar customize menu (Applies to the bars with LayoutType set to DockWindow only).
+        /// </summary>
+        [System.ComponentModel.Browsable(false), System.ComponentModel.Category("Behavior"),System.ComponentModel.Description("Indicates the Customize popup menu."),DefaultValue(null)]
+        public PopupItem CustomizeMenu
+        {
+            get
+            {
+                return m_CustomizeMenu;
+            }
+            set
+            {
+                m_CustomizeMenu = value;
+            }
+        }
+
+        /// <summary>
+        /// Indicates the auto-hide side of the parent form where bar is positioned.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), DevCoBrowsable(false),System.ComponentModel.Category("Behavior"),System.ComponentModel.Description("Indicates the auto-hide side of the parent form where bar is positioned.")]
+        public eDockSide AutoHideSide
+        {
+            get
+            {
+                eDockSide side = eDockSide.None;
+                if (m_AutoHideState)
+                {
+                    switch (m_LastDockSiteInfo.DockSide)
+                    {
+                        case DockStyle.Left:
+                            {
+                                side = eDockSide.Left;
+                                break;
+                            }
+                        case DockStyle.Right:
+                            {
+                                side = eDockSide.Right;
+                                break;
+                            }
+                        case DockStyle.Top:
+                            {
+                                side = eDockSide.Top;
+                                break;
+                            }
+                        default:
+                            {
+                                side = eDockSide.Bottom;
+                                break;
+                            }
+                    }
+                }
+                return side;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether tab text is always visible while bar is in auto-hide state. Default value is false which indicates that only text for the active dock tab is visible.
+        /// </summary>
+        [Browsable(true), DefaultValue(false), Category("Auto-Hide"), Description("")]
+        public bool AutoHideTabTextAlwaysVisible
+        {
+            get { return m_AutoHideTextAlwaysVisible; }
+            set
+            {
+                m_AutoHideTextAlwaysVisible = value;
+                if (this.AutoHide && this.GetAutoHidePanel() != null)
+                    this.GetAutoHidePanel().Invalidate();
+            }
+        }
+
+        private bool m_AutoHideStateDelayed = false;
+        /// <summary>
+        /// Indicates whether Bar is in auto-hide state. Applies to non-document dockable bars only.
+        /// </summary>
+        [Browsable(true), DefaultValue(false), DevCoBrowsable(true), System.ComponentModel.Category("Auto-Hide"), System.ComponentModel.Description("Indicates whether Bar is in auto-hide state. Applies to non-document dockable bars only."), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public virtual bool AutoHide
+        {
+            get
+            {
+                return m_AutoHideState;
+            }
+            set
+            {
+                if (this.DesignMode)
+                    return;
+                if (m_LayoutSuspended)
+                {
+                    m_AutoHideStateDelayed = value;
+                    return;
+                }
+                if (!m_CanAutoHide || this.LayoutType != eLayoutType.DockContainer || this.Parent != null && this.Parent.Dock == DockStyle.Fill && value)
+                    return;
+                if (m_AutoHideState == value)
+                    return;
+
+                m_AutoHideState = value;
+                AutoHideStateChanged();
+                InvokeAutoHideChanged();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the visibility of the bar when bar is in auto-hide state.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), DevCoBrowsable(false),System.ComponentModel.Category("Auto-Hide"),System.ComponentModel.Description("Gets or sets the visibility of the bar when bar is in auto-hide state."), System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
+        public bool AutoHideVisible
+        {
+            get
+            {
+                return this.Visible;
+            }
+            set
+            {
+                if (!this.AutoHide || this.Visible == value)
+                    return;
+
+                AutoHidePanel panel = GetAutoHidePanel(m_LastDockSiteInfo.DockSide);
+                if (value && panel != null && m_AutoHideState)
+                    panel.ShowBar(this);
+                else if (!value && panel != null && m_AutoHideState)
+                    panel.HideBar(this);
+            }
+        }
+
+        /// <summary>
+        /// Indicates whether Bar can be auto hidden.
+        /// </summary>
+        [Browsable(true), DefaultValue(true),Category("Auto-Hide"),Description("Indicates whether Bar can be auto hidden.")]
+        public bool CanAutoHide
+        {
+            get
+            {
+                return m_CanAutoHide;
+            }
+            set
+            {
+                m_CanAutoHide = value;
+                if (!m_CanAutoHide)
+                {
+                    m_SystemButtons.AutoHideButtonRect = Rectangle.Empty;
+                    m_SystemButtons.MouseOverAutoHide = false;
+                    m_SystemButtons.MouseDownAutoHide = false;
+                }
+                if (this.IsHandleCreated)
+                    this.Invalidate();
+            }
+        }
+
+        private Component m_GlobalParentComponent = null;
+        /// <summary>
+        /// Gets or sets the global parent control used as part of Global Items feature when bar is used as context menu bar. This property is used internally by
+        /// DotNetBar and should not be set directly.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never), Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public Component GlobalParentComponent
+        {
+            get { return m_GlobalParentComponent; }
+            set { m_GlobalParentComponent = value; }
+        }
+
+        /// <summary>
+        /// Returns the first child item with specified name regardless of it's hierarchy.
+        /// </summary>
+        /// <param name="name">Item name.</param>
+        /// <returns></returns>
+        public BaseItem GetItem(string name)
+        {
+            BaseItem item = BarFunctions.GetSubItemByName(m_ItemContainer, name);
+            if (item != null)
+                return item;
+
+            if (m_GlobalParentComponent != null)
+            {
+                if (m_GlobalParentComponent is RibbonControl)
+                    return ((RibbonControl)m_GlobalParentComponent).RibbonStrip.GetItem(name);
+                else if (m_GlobalParentComponent is DotNetBarManager)
+                    return ((DotNetBarManager)m_GlobalParentComponent).GetItem(name);
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Returns the collection of items with the specified name.
+        /// </summary>
+        /// <param name="ItemName">Item name to look for.</param>
+        /// <returns></returns>
+        public ArrayList GetItems(string ItemName)
+        {
+            ArrayList list = new ArrayList(15);
+            if (m_GlobalParentComponent != null)
+            {
+                if (m_GlobalParentComponent is RibbonControl)
+                    list.AddRange(((RibbonControl)m_GlobalParentComponent).RibbonStrip.GetItems(ItemName));
+                else if (m_GlobalParentComponent is DotNetBarManager)
+                    list.AddRange(((DotNetBarManager)m_GlobalParentComponent).GetItems(ItemName));
+            }
+            else
+            {
+                BarFunctions.GetSubItemsByName(m_ItemContainer, ItemName, list);
+            }
+
+            return list;
+        }
+
+        /// <summary>
+        /// Returns the collection of items with the specified name and type.
+        /// </summary>
+        /// <param name="ItemName">Item name to look for.</param>
+        /// <param name="itemType">Item type to look for.</param>
+        /// <returns></returns>
+        public ArrayList GetItems(string ItemName, Type itemType)
+        {
+            ArrayList list = new ArrayList(15);
+
+            if (m_GlobalParentComponent != null)
+            {
+                if (m_GlobalParentComponent is RibbonControl)
+                    list.AddRange(((RibbonControl)m_GlobalParentComponent).RibbonStrip.GetItems(ItemName, itemType));
+                else if (m_GlobalParentComponent is DotNetBarManager)
+                    list.AddRange(((DotNetBarManager)m_GlobalParentComponent).GetItems(ItemName, itemType));
+            }
+            else
+            {
+                BarFunctions.GetSubItemsByNameAndType(m_ItemContainer, ItemName, list, itemType);
+            }
+
+            return list;
+        }
+
+        /// <summary>
+        /// Returns the collection of items with the specified name and type. This member is not implemented and should not be used.
+        /// </summary>
+        /// <param name="ItemName">Item name to look for.</param>
+        /// <param name="itemType">Item type to look for.</param>
+        /// <param name="useGlobalName">Indicates whether GlobalName property is used for searching.</param>
+        /// <returns></returns>
+        public ArrayList GetItems(string ItemName, Type itemType, bool useGlobalName)
+        {
+            ArrayList list = new ArrayList(15);
+
+            if (m_GlobalParentComponent != null)
+            {
+                if (m_GlobalParentComponent is RibbonControl)
+                    list.AddRange(((RibbonControl)m_GlobalParentComponent).RibbonStrip.GetItems(ItemName, itemType, useGlobalName));
+                else if (m_GlobalParentComponent is DotNetBarManager)
+                    list.AddRange(((DotNetBarManager)m_GlobalParentComponent).GetItems(ItemName, itemType, false, useGlobalName));
+            }
+            else
+            {
+                BarFunctions.GetSubItemsByNameAndType(m_ItemContainer, ItemName, list, itemType, useGlobalName);
+            }
+
+            return list;
+        }
+
+        /// <summary>
+        /// Returns AutoHidePanel that bar is on if in auto-hide state otherwise returns null.
+        /// </summary>
+        /// <returns>AutoHidePanel object or null if bar is not in auto-hide state.</returns>
+        public AutoHidePanel GetAutoHidePanel()
+        {
+            if (!this.AutoHide)
+                return null;
+
+            return GetAutoHidePanel(m_LastDockSiteInfo.DockSide);
+        }
+
+        private AutoHidePanel GetAutoHidePanel(DockStyle dock)
+        {
+            IOwnerAutoHideSupport ownerAutoHide = m_Owner as IOwnerAutoHideSupport;
+            if (ownerAutoHide == null)
+                return null;
+
+            AutoHidePanel panel = null;
+            switch (m_LastDockSiteInfo.DockSide)
+            {
+                case DockStyle.Left:
+                    {
+                        panel = ownerAutoHide.LeftAutoHidePanel;
+                        break;
+                    }
+                case DockStyle.Right:
+                    {
+                        panel = ownerAutoHide.RightAutoHidePanel;
+                        break;
+                    }
+                case DockStyle.Top:
+                    {
+                        panel = ownerAutoHide.TopAutoHidePanel;
+                        break;
+                    }
+                default:
+                    {
+                        panel = ownerAutoHide.BottomAutoHidePanel;
+                        break;
+                    }
+            }
+
+            if (this.AntiAlias) panel.AntiAlias = true;
+            panel.Style = this.Style;
+
+            return panel;
+        }
+        private Size GetLargestMinSize()
+        {
+            Size ret = Size.Empty;
+            foreach (BaseItem item in m_ItemContainer.SubItems)
+            {
+                if (item is DockContainerItem)
+                {
+                    DockContainerItem dock = item as DockContainerItem;
+                    if (dock.MinimumSize.Width > ret.Width)
+                        ret.Width = dock.MinimumSize.Width;
+                    if (dock.MinimumSize.Height > ret.Height)
+                        ret.Height = dock.MinimumSize.Height;
+                }
+            }
+            return ret;
+        }
+        private Control GetOwnerControl()
+        {
+            Control parentControl = null;
+            IOwner owner = m_Owner as IOwner;
+            if (owner is DotNetBarManager && ((DotNetBarManager)owner).TopDockSite != null)
+                parentControl = ((DotNetBarManager)owner).TopDockSite.Parent;
+            else if (owner != null)
+                parentControl = owner.ParentForm;
+            return parentControl;
+        }
+
+        private void AutoHideStateChanged()
+        {
+            IOwner owner = m_Owner as IOwner;
+            IOwnerAutoHideSupport ownerAutoHide = m_Owner as IOwnerAutoHideSupport;
+            if (owner == null)
+                return;
+
+            Control parentControl = GetOwnerControl();
+
+            if (parentControl == null)
+                return;
+
+            if (m_AutoHideState)
+            {
+                if (m_BarState == eBarState.AutoHide)
+                    return;
+                if (m_TabDockItems != null)
+                    m_TabDockItems.Visible = false;
+                // Remember last docking info
+                DockSiteInfo tempInfo = m_LastDockSiteInfo;
+                m_LastDockSiteInfo = new DockSiteInfo();
+                // Preserve the relative last docked to bar in case the return to same docking position is needed
+                m_LastDockSiteInfo.LastRelativeDocumentId = tempInfo.LastRelativeDocumentId;
+                m_LastDockSiteInfo.LastRelativeDockToBar = tempInfo.LastRelativeDockToBar;
+
+                if (!m_BarDefinitionLoading)
+                {
+                    if (this.Height > 0)
+                        m_LastDockSiteInfo.DockedHeight = this.Height;
+                    else if (m_ItemContainer != null && m_ItemContainer.MinHeight > 0)
+                        m_LastDockSiteInfo.DockedHeight = m_ItemContainer.MinHeight + 22;
+                    if (this.Width > 0)
+                        m_LastDockSiteInfo.DockedWidth = this.Width;
+                    else if (m_ItemContainer != null && m_ItemContainer.MinWidth > 0)
+                        m_LastDockSiteInfo.DockedWidth = m_ItemContainer.MinWidth + 22;
+
+                    // This will force proper recalculation in SetAutoHideSize procedure
+                    System.Drawing.Size minSize = GetLargestMinSize();
+                    if (minSize.Width > m_LastDockSiteInfo.DockedWidth)
+                        m_LastDockSiteInfo.DockedWidth = 0;
+                    if (minSize.Height > m_LastDockSiteInfo.DockedHeight)
+                        m_LastDockSiteInfo.DockedHeight = 0;
+                }
+
+                m_LastDockSiteInfo.DockLine = this.DockLine;
+                m_LastDockSiteInfo.DockOffset = this.DockOffset;
+                if (this.Parent != null && m_BarState == eBarState.Docked)
+                    m_LastDockSiteInfo.DockSide = this.Parent.Dock;
+                else
+                    m_LastDockSiteInfo.DockSide = DockStyle.Left;
+                if (this.Parent != null && this.Parent is DockSite)
+                {
+                    m_LastDockSiteInfo.InsertPosition = ((DockSite)this.Parent).Controls.GetChildIndex(this);
+                    m_LastDockSiteInfo.objDockSite = (DockSite)this.DockedSite;
+                }
+
+                // Undock the window
+                m_BarState = eBarState.AutoHide;
+                ResetActiveControl();
+                parentControl.SuspendLayout();
+                try
+                {
+                    // Check for parent since if bar is deserialized there is no parent and state is Docked by default
+                    base.Visible = false;
+                    if (this.Parent != null && this.Parent is DockSite)
+                    {
+                        DockSite ds = this.Parent as DockSite;
+                        if (ds.DocumentDockContainer != null)
+                        {
+                            // Remember the split view docking if it was in effect
+                            if (ds.Dock != DockStyle.Fill)
+                            {
+                                DocumentBarContainer dbr = ds.GetDocumentUIManager().GetDocumentFromBar(this) as DocumentBarContainer;
+                                if (dbr != null && dbr.Parent is DocumentDockContainer)
+                                {
+                                    DocumentDockContainer ddc = dbr.Parent as DocumentDockContainer;
+                                    if (ddc.Orientation == eOrientation.Horizontal && (ds.Dock == DockStyle.Top || ds.Dock == DockStyle.Bottom) ||
+                                        ddc.Orientation == eOrientation.Vertical && (ds.Dock == DockStyle.Left || ds.Dock == DockStyle.Right) && ddc.Documents.Count > 1)
+                                    {
+                                        for (int i = 0; i < ddc.Documents.Count; i++)
+                                        {
+                                            if (ddc.Documents[i] is DocumentBarContainer && ddc.Documents[i].Visible && ddc.Documents[i] != dbr)
+                                            {
+                                                m_LastDockSiteInfo.MouseOverBar = ((DocumentBarContainer)ddc.Documents[i]).Bar;
+                                                if (i < ddc.Documents.IndexOf(dbr))
+                                                    m_LastDockSiteInfo.MouseOverDockSide = (ddc.Orientation == eOrientation.Horizontal ? eDockSide.Left : eDockSide.Bottom);
+                                                else
+                                                    m_LastDockSiteInfo.MouseOverDockSide = (ddc.Orientation == eOrientation.Horizontal ? eDockSide.Right : eDockSide.Top);
+                                                break;
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                            ds.GetDocumentUIManager().UnDock(this);
+                        }
+                        else
+                            ((DockSite)this.Parent).RemoveBar(this);
+                    }
+                    this.Parent = null;
+
+                    parentControl.Controls.Add(this);
+                    parentControl.Controls.SetChildIndex(this, 0);
+                    AutoHidePanel panel = GetAutoHidePanel(m_LastDockSiteInfo.DockSide);
+                    panel.AddBar(this);
+
+                    if (!m_BarDefinitionLoading)
+                        SetAutoHideSize();
+                    if (!m_IgnoreAnimation && m_AutoHideAnimationTime != 0)
+                        this.Visible = true;
+                }
+                finally
+                {
+                    parentControl.ResumeLayout();
+                }
+                //this.RecalcSize();
+                if (!m_BarDefinitionLoading)
+                {
+                    this.Update();
+                    AnimateHide();
+                }
+            }
+            else
+            {
+                AutoHidePanel panel = GetAutoHidePanel(m_LastDockSiteInfo.DockSide);
+                panel.RemoveBar(this);
+                if (m_LastDockSiteInfo.objDockSite != null)
+                {
+                    if (m_LastDockSiteInfo.MouseOverBar != null)
+                    {
+                        if (m_LastDockSiteInfo.objDockSite.GetDocumentUIManager() == null ||
+                            m_LastDockSiteInfo.objDockSite.GetDocumentUIManager().GetDocumentFromBar(m_LastDockSiteInfo.MouseOverBar) == null)
+                        {
+                            m_LastDockSiteInfo.MouseOverBar = null;
+                            m_LastDockSiteInfo.MouseOverDockSide = eDockSide.None;
+                            m_LastDockSiteInfo.NewLine = true;
+                        }
+                    }
+                }
+                else
+                {
+                    m_LastDockSiteInfo.MouseOverBar = null;
+                    m_LastDockSiteInfo.MouseOverDockSide = eDockSide.None;
+                    m_LastDockSiteInfo.NewLine = true;
+                }
+
+                //m_LastDockSiteInfo.NewLine = true;
+                DockingHandler(m_LastDockSiteInfo, Point.Empty);
+                if (!this.IsVisible)
+                    this.Visible = true;
+                this.RefreshDockTab(true);
+                this.ResizeDockTab();
+                m_ItemContainer.MinHeight = 0;
+                m_ItemContainer.MinWidth = 0;
+            }
+        }
+
+        internal void SetAutoHideSize()
+        {
+            IOwner owner = m_Owner as IOwner;
+            IOwnerBarSupport ownerBar = m_Owner as IOwnerBarSupport;
+            IOwnerAutoHideSupport ownerAutoHide = m_Owner as IOwnerAutoHideSupport;
+            Control parentControl = this.GetOwnerControl();
+
+            if (owner == null || parentControl == null || ownerBar == null || ownerAutoHide == null)
+                return;
+
+            int width = parentControl.ClientSize.Width;
+            int height = parentControl.ClientSize.Height;
+            int x = 0, y = 0;
+
+            //if(ownerBar.TopDockSite.Parent is UserControl)
+            {
+                switch (m_LastDockSiteInfo.DockSide)
+                {
+                    case DockStyle.Left:
+                        {
+                            width = ownerBar.LeftDockSite.Parent.Width;
+                            height = ownerBar.LeftDockSite.Parent.Height;
+                            Point pLoc = ownerAutoHide.LeftAutoHidePanel.Location;
+                            x = pLoc.X + ownerAutoHide.LeftAutoHidePanel.Width;
+                            y = pLoc.Y;
+                            break;
+                        }
+                    case DockStyle.Right:
+                        {
+                            width = ownerBar.RightDockSite.Parent.Width;
+                            height = ownerBar.RightDockSite.Parent.Height;
+                            Point pLoc = ownerAutoHide.RightAutoHidePanel.Location;
+                            x = pLoc.X;
+                            y = pLoc.Y;
+                            break;
+                        }
+                    case DockStyle.Top:
+                        {
+                            width = ownerBar.TopDockSite.Parent.Width;
+                            height = ownerBar.TopDockSite.Parent.Height;
+                            Point pLoc = ownerAutoHide.TopAutoHidePanel.Location;
+                            x = pLoc.X;
+                            y = pLoc.Y + ownerAutoHide.TopAutoHidePanel.Height;
+                            break;
+                        }
+                    default:
+                        {
+                            width = ownerBar.BottomDockSite.Parent.Width;
+                            height = ownerBar.BottomDockSite.Parent.Height;
+                            Point pLoc = ownerAutoHide.BottomAutoHidePanel.Location;
+                            x = pLoc.X;
+                            y = pLoc.Y;
+                            break;
+                        }
+                }
+            }
+
+            switch (m_LastDockSiteInfo.DockSide)
+            {
+                case DockStyle.Left:
+                    {
+                        //					if(ownerBar.TopDockSite.Parent.Controls.IndexOf(ownerBar.TopDockSite)>ownerBar.TopDockSite.Parent.Controls.IndexOf(ownerBar.LeftDockSite))
+                        //					{
+                        //						height-=ownerBar.TopDockSite.Height;
+                        //						y=ownerBar.TopDockSite.Bottom;
+                        //					}
+                        //					if(ownerAutoHide.HasBottomAutoHidePanel)
+                        //						height-=ownerAutoHide.BottomAutoHidePanel.Height;
+                        //					if(ownerBar.BottomDockSite.Parent.Controls.IndexOf(ownerBar.BottomDockSite)>ownerBar.BottomDockSite.Parent.Controls.IndexOf(ownerBar.LeftDockSite))
+                        //						height-=ownerBar.BottomDockSite.Height;
+                        height = ownerAutoHide.LeftAutoHidePanel.Height;
+                        width = m_LastDockSiteInfo.DockedWidth;
+                        if (width == 0)
+                        {
+                            int index = -1;
+                            if (this.SelectedDockTab >= 0 && this.Items[this.SelectedDockTab] is DockContainerItem)
+                                index = this.SelectedDockTab;
+                            else if (this.Items.Count > 0 && this.Items[0] is DockContainerItem)
+                                index = 0;
+                            if (index >= 0)
+                                width = Math.Max(((DockContainerItem)this.Items[index]).MinimumSize.Width, ((DockContainerItem)this.Items[index]).Width);
+                            this.EnableRedraw = false;
+                            try
+                            {
+                                this.Size = new Size(width, height);
+                                this.RecalcSize();
+                            }
+                            finally
+                            {
+                                this.EnableRedraw = true;
+                            }
+                            width = this.Width;
+                            m_LastDockSiteInfo.DockedWidth = width;
+                        }
+                        //					if(!(ownerBar.TopDockSite.Parent is UserControl))
+                        //					{
+                        //						x=ownerAutoHide.LeftAutoHidePanel.Right;
+                        //					}
+                        //					else
+                        //						y+=ownerBar.TopDockSite.Top;
+                        break;
+                    }
+                case DockStyle.Right:
+                    {
+                        //					if(ownerBar.TopDockSite.Parent.Controls.IndexOf(ownerBar.TopDockSite)>ownerBar.TopDockSite.Parent.Controls.IndexOf(ownerBar.RightDockSite))
+                        //					{
+                        //						height-=ownerBar.TopDockSite.Height;
+                        //						y=ownerBar.TopDockSite.Bottom;
+                        //					}
+                        //					if(ownerAutoHide.HasBottomAutoHidePanel)
+                        //						height-=ownerAutoHide.BottomAutoHidePanel.Height;
+                        //					if(ownerBar.BottomDockSite.Parent.Controls.IndexOf(ownerBar.BottomDockSite)>ownerBar.BottomDockSite.Parent.Controls.IndexOf(ownerBar.RightDockSite))
+                        //						height-=ownerBar.BottomDockSite.Height;
+                        height = ownerAutoHide.RightAutoHidePanel.Height;
+                        width = m_LastDockSiteInfo.DockedWidth;
+                        if (width == 0)
+                        {
+                            int index = -1;
+                            if (this.SelectedDockTab >= 0 && this.Items[this.SelectedDockTab] is DockContainerItem)
+                                index = this.SelectedDockTab;
+                            else if (this.Items.Count > 0 && this.Items[0] is DockContainerItem)
+                                index = 0;
+                            if (index >= 0)
+                                width = Math.Max(((DockContainerItem)this.Items[index]).MinimumSize.Width, ((DockContainerItem)this.Items[index]).Width);
+                            this.EnableRedraw = false;
+                            try
+                            {
+                                this.Size = new Size(width, height);
+                                this.RecalcSize();
+                            }
+                            finally
+                            {
+                                this.EnableRedraw = true;
+                            }
+                            width = this.Width;
+                            m_LastDockSiteInfo.DockedWidth = width;
+                        }
+                        //					if(!(ownerBar.TopDockSite.Parent is UserControl))
+                        //						x=ownerAutoHide.RightAutoHidePanel.Left-width;
+                        //					else
+                        //					{
+                        x -= width;
+                        //y+=ownerBar.TopDockSite.Top;
+                        //}
+                        break;
+                    }
+                case DockStyle.Top:
+                    {
+                        //					if(ownerAutoHide.HasLeftAutoHidePanel)
+                        //					{
+                        //						width-=ownerAutoHide.LeftAutoHidePanel.Width;
+                        //						x+=ownerAutoHide.LeftAutoHidePanel.Width;
+                        //					}
+                        //					if(ownerAutoHide.HasRightAutoHidePanel)
+                        //					{
+                        //						width-=ownerAutoHide.RightAutoHidePanel.Width;
+                        //					}
+                        //					if(ownerBar.TopDockSite.Parent.Controls.IndexOf(ownerBar.TopDockSite)<ownerBar.TopDockSite.Parent.Controls.IndexOf(ownerBar.RightDockSite))
+                        //					{
+                        //						width-=ownerBar.RightDockSite.Width;
+                        //					}
+                        //					if(ownerBar.TopDockSite.Parent.Controls.IndexOf(ownerBar.TopDockSite)<ownerBar.TopDockSite.Parent.Controls.IndexOf(ownerBar.LeftDockSite))
+                        //					{
+                        //						width-=ownerBar.LeftDockSite.Width;
+                        //						x+=ownerBar.LeftDockSite.Width;
+                        //					}
+                        width = ownerAutoHide.TopAutoHidePanel.Width;
+                        height = m_LastDockSiteInfo.DockedHeight;
+                        if (height == 0)
+                        {
+                            int index = -1;
+                            if (this.SelectedDockTab >= 0 && this.Items[this.SelectedDockTab] is DockContainerItem)
+                                index = this.SelectedDockTab;
+                            else if (this.Items.Count > 0 && this.Items[0] is DockContainerItem)
+                                index = 0;
+                            if (index >= 0)
+                                height = Math.Max(((DockContainerItem)this.Items[index]).MinimumSize.Height, ((DockContainerItem)this.Items[index]).Height);
+
+                            this.EnableRedraw = false;
+                            try
+                            {
+                                this.Size = new Size(width, height);
+                                this.RecalcSize();
+                            }
+                            finally
+                            {
+                                this.EnableRedraw = true;
+                            }
+                            height = this.Height;
+                            m_LastDockSiteInfo.DockedHeight = height;
+                        }
+
+                        //					if(!(ownerBar.TopDockSite.Parent is UserControl))
+                        //						y=ownerAutoHide.TopAutoHidePanel.Bottom;
+
+                        break;
+                    }
+                default:
+                    {
+                        //					if(ownerAutoHide.HasLeftAutoHidePanel)
+                        //					{
+                        //						width-=ownerAutoHide.LeftAutoHidePanel.Width;
+                        //						x+=ownerAutoHide.LeftAutoHidePanel.Width;
+                        //					}
+                        //					if(ownerAutoHide.HasRightAutoHidePanel)
+                        //						width-=ownerAutoHide.RightAutoHidePanel.Width;
+                        //					if(ownerBar.BottomDockSite.Parent.Controls.IndexOf(ownerBar.BottomDockSite)<ownerBar.BottomDockSite.Parent.Controls.IndexOf(ownerBar.RightDockSite))
+                        //					{
+                        //						width-=ownerBar.RightDockSite.Width;
+                        //					}
+                        //					if(ownerBar.BottomDockSite.Parent.Controls.IndexOf(ownerBar.BottomDockSite)<ownerBar.BottomDockSite.Parent.Controls.IndexOf(ownerBar.LeftDockSite))
+                        //					{
+                        //						width-=ownerBar.LeftDockSite.Width;
+                        //						x+=ownerBar.LeftDockSite.Width;
+                        //					}
+                        width = ownerAutoHide.BottomAutoHidePanel.Width;
+                        height = m_LastDockSiteInfo.DockedHeight;
+                        if (height == 0)
+                        {
+                            int index = -1;
+                            if (this.SelectedDockTab >= 0 && this.Items[this.SelectedDockTab] is DockContainerItem)
+                                index = this.SelectedDockTab;
+                            else if (this.Items.Count > 0 && this.Items[0] is DockContainerItem)
+                                index = 0;
+                            if (index >= 0)
+                                height = Math.Max(((DockContainerItem)this.Items[index]).MinimumSize.Height, ((DockContainerItem)this.Items[index]).Height);
+
+                            this.EnableRedraw = false;
+                            try
+                            {
+                                this.Size = new Size(width, height);
+                                this.RecalcSize();
+                            }
+                            finally
+                            {
+                                this.EnableRedraw = true;
+                            }
+                            height = this.Height;
+
+                            m_LastDockSiteInfo.DockedHeight = height;
+                            if (m_TabDockItems != null) m_LastDockSiteInfo.DockedHeight += m_TabDockItems.Height;
+                        }
+                        y -= height;
+                        //					if(!(ownerBar.TopDockSite.Parent is UserControl))
+                        //						y=ownerAutoHide.BottomAutoHidePanel.Top-height;
+                        //					else if(this.Parent!=null)
+                        //					{
+                        //						Point p=ownerAutoHide.BottomAutoHidePanel.PointToScreen(Point.Empty);
+                        //						p=this.Parent.PointToClient(p);
+                        //						y=p.Y-height;
+                        //					}
+                        break;
+                    }
+            }
+
+            Rectangle r = new Rectangle(x, y, width, height);
+            AutoHideDisplayEventArgs eventArgs = new AutoHideDisplayEventArgs(r);
+            if (AutoHideDisplay != null)
+            {
+                AutoHideDisplay(this, eventArgs);
+                r = eventArgs.DisplayRectangle;
+            }
+            if (ownerBar != null)
+            {
+                ownerBar.InvokeAutoHideDisplay(this, eventArgs);
+                r = eventArgs.DisplayRectangle;
+            }
+            this.Bounds = r;
+            //this.Size=r.Size; //new Size(width,height);
+            //this.Location=r.Location; //new Point(x,y);
+            this.RecalcSize();
+
+            if (m_LastDockSiteInfo.DockSide == DockStyle.Bottom)
+            {
+                if (this.Height != height)
+                    this.Top += (height - this.Height);
+            }
+            else if (m_LastDockSiteInfo.DockSide == DockStyle.Right)
+            {
+                if (this.Width != width)
+                    this.Left += (width - this.Width);
+            }
+
+        }
+
+        /// <summary>
+        /// Gets or sets how long it takes to play the auto-hide animation, in milliseconds. Maximum value is 2000, 0 disables animation.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true),DefaultValue(100),Category("Auto-Hide"),Description("Specifies how long it takes to play the auto-hide animation, in milliseconds. Maximum value is 2000, 0 disables animation.")]
+        public virtual int AutoHideAnimationTime
+        {
+            get { return m_AutoHideAnimationTime; }
+            set
+            {
+                if (value < 0)
+                    value = 0;
+                if (value > 2000)
+                    value = 2000;
+                m_AutoHideAnimationTime = value;
+            }
+        }
+
+        internal bool AnimateShow()
+        {
+            if (this.Visible)
+                return false;
+
+            CancelEventArgs e = new CancelEventArgs();
+            OnBeforeAutoHideDisplayed(e);
+            if (e.Cancel) return false;
+
+            SetAutoHideSize();
+            Rectangle rectEnd = new Rectangle(this.Location, this.Size);
+            Rectangle rectStart = rectEnd;
+            this.Parent.Controls.SetChildIndex(this, 0);
+            if (!m_IgnoreAnimation && m_AutoHideAnimationTime > 0  /*&& BarFunctions.SupportsAnimation*/)
+            {
+                switch (m_LastDockSiteInfo.DockSide)
+                {
+                    case DockStyle.Left:
+                        rectStart.Width = 1;
+                        break;
+                    case DockStyle.Right:
+                        rectStart.X = rectStart.Right - 1;
+                        rectStart.Width = 1;
+                        break;
+                    case DockStyle.Top:
+                        rectStart.Height = 1;
+                        break;
+                    default:
+                        rectStart.Y = rectStart.Bottom - 1;
+                        rectStart.Height = 1;
+                        break;
+                }
+            }
+            try
+            {
+                m_AnimationInProgress = true;
+                BarFunctions.AnimateControl(this, true, m_AutoHideAnimationTime, rectStart, rectEnd);
+            }
+            finally
+            {
+                m_AnimationInProgress = false;
+            }
+
+            m_IgnoreAnimation = false;
+
+            OnBarStateChanged(new BarStateChangedEventArgs(this, eBarStateChange.AutoHideOpen));
+
+            return true;
+        }
+        internal bool AnimateHide()
+        {
+            if (!this.Visible)
+                return true;
+
+            CancelEventArgs e = new CancelEventArgs();
+            OnBeforeAutoHideHidden(e);
+            if (e.Cancel) return false;
+
+            this.Parent.Controls.SetChildIndex(this, 0);
+            Rectangle rectStart = new Rectangle(this.Location, this.Size);
+            Rectangle rectEnd = rectStart;
+
+            if (!m_IgnoreAnimation && m_AutoHideAnimationTime > 0 /*&& BarFunctions.SupportsAnimation*/)
+            {
+                switch (m_LastDockSiteInfo.DockSide)
+                {
+                    case DockStyle.Left:
+                        rectEnd.Width = 1;
+                        break;
+                    case DockStyle.Right:
+                        rectEnd.X = rectEnd.Right - 1;
+                        rectEnd.Width = 1;
+                        break;
+                    case DockStyle.Top:
+                        rectEnd.Height = 1;
+                        break;
+                    default:
+                        rectEnd.Y = rectEnd.Bottom - 1;
+                        rectEnd.Height = 1;
+                        break;
+                }
+
+                try
+                {
+                    m_AnimationInProgress = true;
+                    BarFunctions.AnimateControl(this, false, m_AutoHideAnimationTime, rectStart, rectEnd);
+                }
+                finally
+                {
+                    m_AnimationInProgress = false;
+                }
+            }
+            else
+                this.Visible = false;
+
+            OnBarStateChanged(new BarStateChangedEventArgs(this, eBarStateChange.AutoHideFolded));
+            return true;
+        }
+        /// <summary>
+        /// Occurs before the bar in auto-hide state is displayed on popup and allows you to cancel display by setting Cancel=true on event arguments.
+        /// </summary>
+        public event CancelEventHandler BeforeAutoHideDisplayed;
+        /// <summary>
+        /// Raises BeforeAutoHideDisplayed event.
+        /// </summary>
+        /// <param name="e"></param>
+        protected virtual void OnBeforeAutoHideDisplayed(CancelEventArgs e)
+        {
+            CancelEventHandler eh = BeforeAutoHideDisplayed;
+            if (eh != null)
+                eh(this, e);
+        }
+
+        /// <summary>
+        /// Occurs before the bar in auto-hide state is hidden and allows you to cancel display by setting Cancel=true on event arguments.
+        /// </summary>
+        public event CancelEventHandler BeforeAutoHideHidden;
+        /// <summary>
+        /// Raises BeforeAutoHideHidden event.
+        /// </summary>
+        /// <param name="e"></param>
+        protected virtual void OnBeforeAutoHideHidden(CancelEventArgs e)
+        {
+            CancelEventHandler eh = BeforeAutoHideHidden;
+            if (eh != null)
+                eh(this, e);
+        }
+
+        private void ResetActiveControl()
+        {
+            IOwner owner = m_Owner as IOwner;
+            // Must reset the ActiveControl to null becouse on MDI Forms if this was not done
+            // MDI form could not be closed if bar that had ActiveControl is floating.
+            if (owner.ParentForm != null && owner.ParentForm.ActiveControl == this)
+            {
+                owner.ParentForm.ActiveControl = null;
+                this.Focus(); // Fixes the problem on SDI forms
+            }
+            else if (owner.ParentForm != null && IsAnyControl(this, owner.ParentForm.ActiveControl))
+            {
+                owner.ParentForm.ActiveControl = null;
+                this.Focus();
+            }
+        }
+
+        private bool ShowCustomizeMenuButton
+        {
+            get
+            {
+                // We Show customize menu button if there is CustomizeItem in container or when
+                // LayoutType is DockingContainer and grab handle style is caption users have the docking container menu
+                if (m_ItemContainer.LayoutType == eLayoutType.DockContainer && (m_GrabHandleStyle == eGrabHandleStyle.Caption || m_GrabHandleStyle == eGrabHandleStyle.CaptionTaskPane || m_GrabHandleStyle == eGrabHandleStyle.CaptionDotted) && m_CustomizeMenu != null)
+                    return true;
+                if (m_ItemContainer.LayoutType != eLayoutType.DockContainer)
+                {
+                    if (m_ItemContainer.HaveCustomizeItem)
+                        return true;
+                    return (m_CustomizeMenu != null);
+                }
+                return false;
+            }
+        }
+
+        private void SysButtonMouseOverAutoHide(object sender, EventArgs e)
+        {
+            if (!m_SystemButtons.MouseOverAutoHide)
+                this.HideToolTip();
+            else
+                ResetHover();
+        }
+        private void SysButtonMouseOverCustomize(object sender, EventArgs e)
+        {
+            if (!m_SystemButtons.MouseOverCustomize)
+                this.HideToolTip();
+            else
+                ResetHover();
+        }
+        private void SysButtonMouseOverClose(object sender, EventArgs e)
+        {
+            if (!m_SystemButtons.MouseOverClose)
+                this.HideToolTip();
+            else
+                ResetHover();
+        }
+        private void SysButtonHideTooltip(object sender, EventArgs e)
+        {
+            HideToolTip();
+        }
+
+        /// <summary>
+        /// Destroys tooltip window.
+        /// </summary>
+        private void HideToolTip()
+        {
+            if (m_ToolTipWnd != null)
+            {
+                m_ToolTipWnd.Hide();
+                m_ToolTipWnd.Dispose();
+                m_ToolTipWnd = null;
+                ResetHover();
+            }
+        }
+
+        internal void HideAllToolTips()
+        {
+            HideToolTip();
+            if (m_ItemContainer != null)
+            {
+                foreach (BaseItem item in m_ItemContainer.SubItems)
+                    this.HideItemToolTips(item);
+            }
+        }
+        private void HideItemToolTips(BaseItem item)
+        {
+            item.HideToolTip();
+            foreach (BaseItem i in item.SubItems)
+                this.HideItemToolTips(i);
+        }
+
+
+
+        /// <summary>
+        /// Shows tooltip for this item.
+        /// </summary>
+        private void ShowToolTip(string tipText)
+        {
+            if (this.DesignMode || !m_ShowToolTips || tipText == null || tipText == "")
+                return;
+
+            if (this.Visible)
+            {
+                if (m_ToolTipWnd == null)
+                    m_ToolTipWnd = new ToolTip();
+                m_ToolTipWnd.Text = tipText;
+                IOwnerItemEvents ownerEvents = this.Owner as IOwnerItemEvents;
+                if (ownerEvents != null)
+                    ownerEvents.InvokeToolTipShowing(m_ToolTipWnd, new EventArgs());
+                m_ToolTipWnd.ShowToolTip();
+            }
+        }
+
+        /// <summary>
+        /// Gets whether tooltip is visible or not.
+        /// </summary>
+        private bool ToolTipVisible
+        {
+            get
+            {
+                return (m_ToolTipWnd != null);
+            }
+        }
+
+        private void UpdateDockTabSettings()
+        {
+            if (m_TabDockItems == null || !BarFunctions.IsHandleValid(this))
+                return;
+
+            if (m_TabDockItems.CanReorderTabs != m_CanReorderTabs)
+                m_TabDockItems.CanReorderTabs = m_CanReorderTabs;
+            if (m_TabDockItems.TabAlignment != m_DockTabAlignment)
+                m_TabDockItems.TabAlignment = m_DockTabAlignment;
+
+            if (m_TabNavigation)
+                m_TabDockItems.TabLayoutType = eTabLayoutType.FixedWithNavigationBox;
+            else
+                m_TabDockItems.TabLayoutType = eTabLayoutType.FitContainer;
+
+            m_TabDockItems.ShowFocusRectangle = false;
+
+            if (m_TabDockItems._TabSystemBox != null)
+                m_TabDockItems._TabSystemBox.CloseVisible = this.CanHideResolved;
+
+            if (m_AutoHideState)
+                m_TabDockItems.Visible = false;
+        }
+
+        internal void CreateDockTab()
+        {
+            if (m_TabDockItems != null || !BarFunctions.IsHandleValid(this))
+                return;
+            m_TabDockItems = new TabStrip();
+            UpdateDockTabSettings();
+
+            this.SuspendLayout();
+            this.ResizeDockTab();
+            m_TabDockItems.SelectedTabChanging += new TabStrip.SelectedTabChangingEventHandler(this.TabStripTabChanging);
+            m_TabDockItems.SelectedTabChanged += new TabStrip.SelectedTabChangedEventHandler(TabDockItemsSelectedTabChanged);
+            m_TabDockItems.BeforeTabDisplay += new EventHandler(this.BeforeTabDisplay);
+            m_TabDockItems.TabMoved += new TabStrip.TabMovedEventHandler(this.TabStripTabMoved);
+            m_TabDockItems.TabItemClose += new TabStrip.UserActionEventHandler(TabStripTabItemClose);
+            m_TabDockItems.CloseButtonOnTabsVisible = m_DockTabCloseButtonVisible;
+            this.Controls.Add(m_TabDockItems);
+
+            SetDockTabStyle(m_ItemContainer.EffectiveStyle);
+
+            m_TabDockItems.Visible = GetDockTabVisible();
+            RefreshDockTabItems();
+            this.Invalidate();
+            this.ResumeLayout();
+        }
+
+        private void TabDockItemsSelectedTabChanged(object sender, TabStripTabChangedEventArgs e)
+        {
+            UpdateCloseButtonVisibility();
+            OnBarStateChanged(new BarStateChangedEventArgs(this, eBarStateChange.SelectedDockTabChanged, this.SelectedDockContainerItem));
+        }
+
+        private void TabStripTabItemClose(object sender, TabStripActionEventArgs e)
+        {
+            TabItem ti = sender as TabItem;
+            if (ti != null)
+            {
+                DockContainerItem di = ti.AttachedItem as DockContainerItem;
+                if (di != null)
+                    CloseDockTab(di, eEventSource.Mouse);
+            }
+        }
+
+        internal void SetDockTabStyle(eDotNetBarStyle style)
+        {
+            if (m_TabDockItems == null)
+                return;
+            if (style == eDotNetBarStyle.StyleManagerControlled)
+                style = StyleManager.GetEffectiveStyle();
+            if(StyleManager.IsMetro(style))
+                m_TabDockItems.Style = eTabStripStyle.Metro;
+            else if (style == eDotNetBarStyle.Office2003)
+            {
+                IOwnerBarSupport ob = m_Owner as IOwnerBarSupport;
+                if (this.DockSide == eDockSide.Document && ob != null && ob.ApplyDocumentBarStyle)
+                    m_TabDockItems.Style = eTabStripStyle.OneNote;
+                else
+                    m_TabDockItems.Style = eTabStripStyle.Office2003;
+            }
+            else if (style == eDotNetBarStyle.VS2005)
+            {
+                IOwnerBarSupport ob = m_Owner as IOwnerBarSupport;
+                if (this.DockSide == eDockSide.Document && ob != null && ob.ApplyDocumentBarStyle)
+                    m_TabDockItems.Style = eTabStripStyle.VS2005Document;
+                else
+                    m_TabDockItems.Style = eTabStripStyle.VS2005;
+            }
+            else if (BarFunctions.IsOffice2007Style(style))
+            {
+                IOwnerBarSupport ob = m_Owner as IOwnerBarSupport;
+                if (this.DockSide == eDockSide.Document && ob != null && ob.ApplyDocumentBarStyle)
+                    m_TabDockItems.Style = eTabStripStyle.Office2007Document;
+                else
+                    m_TabDockItems.Style = eTabStripStyle.Office2007Dock;
+            }
+            else
+                m_TabDockItems.Style = eTabStripStyle.Flat;
+            m_TabDockItems.ColorScheme.TabBorder = Color.Empty; // No border
+
+            if (TabStripStyleChanged != null)
+                TabStripStyleChanged(this, new EventArgs());
+        }
+
+        private void BeforeTabDisplay(object sender, EventArgs e)
+        {
+            if (sender is TabItem)
+            {
+                InvokeBeforeDockTabDisplayed(((TabItem)sender).AttachedItem);
+            }
+        }
+
+        private void DestroyDockTab()
+        {
+            if (m_TabDockItems == null)
+                return;
+            if (m_TabDockItems.IsDraggingBar)
+            {
+                //if(m_TabDockItems.Visible)
+                m_TabDockItems.Visible = false;
+                m_TabDockItems.Tabs.Clear();
+                return;
+            }
+            this.Controls.Remove(m_TabDockItems);
+            m_TabDockItems.Dispose();
+            m_TabDockItems = null;
+        }
+
+        internal void RefreshTabStrip()
+        {
+            if (m_TabDockItems != null)
+                m_TabDockItems.Refresh();
+        }
+
+        internal void RefreshDockTab(bool bFireEvents)
+        {
+            if (m_ItemContainer == null || !BarFunctions.IsHandleValid(this))
+                return;
+
+            SyncBarCaption();
+
+            int iVisibleItems = m_ItemContainer.VisibleSubItems;
+
+            if (iVisibleItems > 1 || m_AlwaysDisplayDockTab && m_BarState != eBarState.Floating)
+            {
+                if (m_TabDockItems == null)
+                {
+                    CreateDockTab();
+                    return;
+                }
+                else if (!m_TabDockItems.Visible && m_BarState != eBarState.AutoHide)
+                    m_TabDockItems.Visible = GetDockTabVisible();
+            }
+            else
+            {
+                if (iVisibleItems == 1 && m_TabDockItems != null)
+                {
+                    // Fire last DockTabChange Event
+                    DockContainerItem item = null;
+                    foreach (BaseItem baseItem in m_ItemContainer.SubItems)
+                    {
+                        if (baseItem.Visible && baseItem is DockContainerItem)
+                        {
+                            item = baseItem as DockContainerItem;
+                            break;
+                        }
+                    }
+                    if (item != null)
+                    {
+                        if (bFireEvents)
+                            InvokeDockTabChange(null, item);
+                    }
+                }
+                if (this.DesignMode)
+                {
+                    if (m_TabDockItems != null)
+                        m_TabDockItems.Visible = false;
+                }
+                else
+                    DestroyDockTab();
+                return;
+            }
+
+            BaseItem oldItem = null;
+            if (bFireEvents && m_TabDockItems != null && m_TabDockItems.SelectedTab != null)
+                oldItem = m_TabDockItems.SelectedTab.AttachedItem;
+
+            RefreshDockTabItems();
+
+            if (bFireEvents && m_TabDockItems != null && m_TabDockItems.SelectedTab != null && oldItem != m_TabDockItems.SelectedTab.AttachedItem)
+                InvokeDockTabChange(oldItem, m_TabDockItems.SelectedTab.AttachedItem);
+        }
+
+        internal void RefreshAutoHidePanel()
+        {
+            if (this.AutoHide)
+            {
+                AutoHidePanel panel = GetAutoHidePanel(m_LastDockSiteInfo.DockSide);
+                if (panel != null)
+                {
+                    panel.RefreshBar(this);
+                    if (panel.SelectedDockContainerItem != null)
+                    {
+                        InvokeDockTabChange(null, panel.SelectedDockContainerItem);
+                    }
+                }
+            }
+        }
+
+        internal void OnDockContainerVisibleChanged(DockContainerItem dockItem)
+        {
+            if (!this.AutoHide || dockItem.Visible)
+                return;
+            bool bDisplayed = true;
+            foreach (BaseItem item in this.Items)
+            {
+                if (item.Visible && bDisplayed)
+                {
+                    item.Displayed = true;
+                    bDisplayed = false;
+                }
+                else
+                    item.Displayed = false;
+            }
+        }
+
+        /// <summary>
+        /// Re-docks the floating bar to its previous docking position.
+        /// </summary>
+        public void ReDock()
+        {
+
+            if (m_BarState == eBarState.Floating && (this.CanDockBottom || this.CanDockTop || this.CanDockLeft || this.CanDockRight || this.CanDockDocument))
+            {
+                DockingHandler(m_LastDockSiteInfo, Point.Empty);
+            }
+        }
+
+        internal void OnSubItemRemoved(BaseItem objItem)
+        {
+            if (objItem is DockContainerItem)
+            {
+                if (this.LayoutType == eLayoutType.DockContainer)
+                {
+                    if (objItem.Displayed)
+                    {
+                        bool bOneDisp = false;
+                        foreach (BaseItem item in this.Items)
+                        {
+                            if (item.Displayed)
+                                bOneDisp = true;
+                        }
+                        if (!bOneDisp && this.Items.Count > 0)
+                            this.Items[0].Displayed = true;
+                    }
+                    this.RefreshDockTab(true);
+                    if (this.AutoHide)
+                    {
+                        AutoHidePanel panel = this.GetAutoHidePanel();
+                        if (panel != null)
+                            panel.RefreshBar(this);
+                    }
+                }
+            }
+            SyncBarCaption();
+        }
+
+        /// <summary>
+        /// Invokes CaptionButtonClick event.
+        /// </summary>
+        protected void InvokeCaptionButtonClick()
+        {
+            if (CaptionButtonClick != null)
+                CaptionButtonClick(this, new EventArgs());
+        }
+
+        /// <summary>
+        /// Displays or hides the automatic caption button popup menu.
+        /// </summary>
+        private void ToggleCaptionMenu()
+        {
+            if (m_CaptionMenu != null)
+            {
+                bool bClose = m_CaptionMenu.Expanded;
+                if (bClose)
+                    m_CaptionMenu.ClosePopup();
+                m_CaptionMenu.Dispose();
+                m_CaptionMenu = null;
+                if (bClose)
+                    return;
+            }
+
+            if (this.Items.Count <= 0)
+                return;
+
+            m_CaptionMenu = new ButtonItem("sysCaptionButtonMenuParent");
+            m_CaptionMenu.Style = this.Style;
+            m_CaptionMenu.PopupShowing += new EventHandler(this.CaptionMenuShowing);
+            m_CaptionMenu.PopupFinalized += new EventHandler(this.CaptionMenuClose);
+            foreach (BaseItem item in this.Items)
+            {
+                ButtonItem menuItem = new ButtonItem("sysCaption_" + item.Name);
+                menuItem.Tag = item;
+                menuItem.OptionGroup = "sysCaptionMenu";
+                menuItem.Text = item.Text;
+                menuItem.BeginGroup = item.BeginGroup;
+                if (item is DockContainerItem)
+                {
+                    DockContainerItem dock = item as DockContainerItem;
+                    menuItem.Checked = item.Displayed;
+                    if (dock.Image != null)
+                        menuItem.Image = dock.Image.Clone() as System.Drawing.Image;
+                    else if (dock.Icon != null)
+                        menuItem.Icon = dock.Icon.Clone() as System.Drawing.Icon;
+                    else if (dock.ImageIndex >= 0 && dock.ImageList != null)
+                        menuItem.Image = dock.ImageList.Images[dock.ImageIndex].Clone() as System.Drawing.Image;
+                }
+                else
+                    menuItem.Checked = item.Visible;
+                menuItem.Click += new EventHandler(this.CaptionMenuItemClick);
+                m_CaptionMenu.SubItems.Add(menuItem);
+            }
+
+            if (m_CaptionMenu.GetOwner() == null)
+                m_CaptionMenu.SetOwner(m_Owner);
+            System.Drawing.Size size = m_CaptionMenu.PopupSize;
+            Point popupLocation = new Point(m_SystemButtons.CaptionButtonRect.Right - size.Width, m_SystemButtons.CaptionButtonRect.Bottom);
+            if (popupLocation.X < 0)
+                popupLocation.X = 0;
+            popupLocation = this.PointToScreen(popupLocation);
+            m_CaptionMenu.Popup(popupLocation);
+        }
+        private void CaptionMenuItemClick(object sender, EventArgs e)
+        {
+            ButtonItem menuItem = sender as ButtonItem;
+            if (menuItem == null)
+                return;
+            if (this.LayoutType == eLayoutType.DockContainer)
+                this.SelectedDockTab = this.Items.IndexOf(menuItem.Tag as BaseItem);
+            else
+            {
+                foreach (BaseItem item in this.Items)
+                {
+                    if (item == menuItem.Tag)
+                        item.Visible = true;
+                    else
+                        item.Visible = false;
+                }
+                this.RecalcLayout();
+                m_CaptionMenu.Dispose();
+                m_CaptionMenu = null;
+            }
+        }
+        private void CaptionMenuShowing(object sender, EventArgs e)
+        {
+            if (m_CaptionMenu != null)
+                ((MenuPanel)m_CaptionMenu.PopupControl).ColorScheme = this.GetColorScheme();
+        }
+        private void CaptionMenuClose(object sender, EventArgs e)
+        {
+            PaintCaptionButton();
+        }
+
+        internal void RefreshDockContainerItem(DockContainerItem item)
+        {
+            if (m_ItemContainer == null || m_TabDockItems == null)
+            {
+                SyncBarCaption();
+                return;
+            }
+
+            foreach (TabItem tab in m_TabDockItems.Tabs)
+            {
+                if (tab.AttachedItem == item)
+                {
+                    tab.Text = item.Text;
+                    tab.AttachedItem = item;
+                    tab.Tooltip = item.Tooltip;
+                    tab.Name = item.Name;
+                    if (item.Icon != null)
+                        tab.Icon = item.Icon.Clone() as Icon;
+                    else
+                    {
+                        tab.Image = item.TabImage;
+                        tab.Icon = null;
+                    }
+                    break;
+                }
+            }
+            m_TabDockItems.Refresh();
+            if (this.AutoHide)
+            {
+                AutoHidePanel panel = GetAutoHidePanel(m_LastDockSiteInfo.DockSide);
+                if (panel != null)
+                    panel.Refresh();
+            }
+            SyncBarCaption();
+        }
+
+        private bool GetDockTabVisible()
+        {
+            if (m_GrabHandleStyle == eGrabHandleStyle.CaptionTaskPane && m_AutoCreateCaptionMenu || !_DockTabVisible)
+                return false;
+            return true;
+        }
+
+        private bool _DockTabVisible = true;
+        /// <summary>
+        /// Indicates whether dock tabs are visible when bar is acting as dock-container and it needs to display tabs to represents multiple DockContainerItem objects hosted by the bar. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Browsable(false)]
+        public bool DockTabVisible
+        {
+            get { return _DockTabVisible; }
+            set 
+            {
+                _DockTabVisible = value;
+                if (m_TabDockItems != null && !value)
+                    m_TabDockItems.Visible = false;
+            }
+        }
+
+        private int _DockTabStripHeight = DOCKTABSTRIP_HEIGHT;
+        /// <summary>
+        /// Gets or sets height of the docked bar tab strip which displays docked tabs.
+        /// </summary>
+        [DefaultValue(DOCKTABSTRIP_HEIGHT), Category("Appearance"), Description("Indicates height of the docked bar tab strip which displays docked tabs.")]
+        public int DockTabStripHeight
+        {
+            get { return _DockTabStripHeight; }
+            set
+            {
+                if (value != _DockTabStripHeight)
+                {
+                    int oldValue = _DockTabStripHeight;
+                    _DockTabStripHeight = value;
+                    OnDockTabStripHeightChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when DockTabStripHeight property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnDockTabStripHeightChanged(int oldValue, int newValue)
+        {
+            if (this.IsHandleCreated)
+                RecalcLayout();
+            //OnPropertyChanged(new PropertyChangedEventArgs("DockTabStripHeight"));
+        }
+
+        private bool m_RefreshingDockTab = false; // Used to preven re-entrancy
+        private void RefreshDockTabItems()
+        {
+            if (m_RefreshingDockTab)
+                return;
+            if (!m_TabDockItems.Visible && m_BarState != eBarState.AutoHide)
+            {
+                m_TabDockItems.Visible = GetDockTabVisible();
+                int dockTabStripHeight = Dpi.Height(DockTabStripHeight);
+                if (this.IsThemed && m_BarState == eBarState.Floating)
+                {
+                    m_TabDockItems.Size = new Size(this.Width - (m_ThemeWindowMargins.Left + m_ThemeWindowMargins.Right), dockTabStripHeight);
+                    m_TabDockItems.Location = new Point(m_ThemeWindowMargins.Left, this.Height - dockTabStripHeight - m_ThemeWindowMargins.Bottom);
+                }
+                else
+                {
+                    m_TabDockItems.Size = new Size(this.Width - Dpi.Width4, dockTabStripHeight);
+                    m_TabDockItems.Location = new Point(Dpi.Width2, this.Height - dockTabStripHeight - Dpi.Height2);
+                }
+            }
+            m_RefreshingDockTab = true;
+            try
+            {
+                m_TabDockItems.Tabs.Clear();
+                int iCount = 0;
+                foreach (BaseItem item in m_ItemContainer.SubItems)
+                {
+                    if (item.Visible)
+                    {
+                        iCount++;
+                        TabItem tab = new TabItem();
+                        tab.Text = item.Text;
+                        tab.Tooltip = item.Tooltip;
+                        tab.Name = item.Name;
+                        if (item is DockContainerItem)
+                        {
+                            DockContainerItem di = item as DockContainerItem;
+                            if (di.Icon != null)
+                                tab.Icon = di.Icon.Clone() as Icon;
+                            else
+                                tab.Image = di.TabImage;
+                            tab.PredefinedColor = di.PredefinedTabColor;
+                        }
+                        m_TabDockItems.Tabs.Add(tab);
+                        tab.AttachedItem = item;
+                        if (item.Displayed)
+                        {
+                            m_TabDockItems._IgnoreBeforeTabDisplayEvent = true;
+                            m_TabDockItems.SelectedTab = tab;
+                            m_TabDockItems._IgnoreBeforeTabDisplayEvent = false;
+                        }
+                    }
+                }
+                if (iCount > 1 || iCount == 1 && m_AlwaysDisplayDockTab && m_BarState != eBarState.Floating)
+                {
+                    if (!m_TabDockItems.Visible && m_BarState != eBarState.AutoHide)
+                        m_TabDockItems.Visible = GetDockTabVisible();
+                    if (m_TabDockItems.SelectedTab == null)
+                        m_TabDockItems.SelectedTab = m_TabDockItems.Tabs[0];
+                    else if (m_TabDockItems.SelectedTab.AttachedItem != null && !m_TabDockItems.SelectedTab.AttachedItem.Displayed)
+                        m_TabDockItems.SelectedTab.AttachedItem.Displayed = true;
+                    m_TabDockItems.Refresh();
+                }
+                else if (m_TabDockItems.Visible)
+                    m_TabDockItems.Visible = false;
+            }
+            finally
+            {
+                m_RefreshingDockTab = false;
+            }
+
+            if (m_BarState == eBarState.AutoHide)
+            {
+                AutoHidePanel panel = GetAutoHidePanel(m_LastDockSiteInfo.DockSide);
+                if (panel != null)
+                    panel.RefreshBar(this);
+            }
+        }
+
+        private void ResizeDockTab()
+        {
+            if (m_TabDockItems != null && m_TabDockItems.Visible)
+            {
+                Point p = Point.Empty;
+                Size sz = Size.Empty;
+
+                int dockTabStripHeight = Dpi.Height(DockTabStripHeight);
+                switch (m_DockTabAlignment)
+                {
+                    case eTabStripAlignment.Top:
+                        {
+                            if (m_GrabHandleStyle != eGrabHandleStyle.None && !m_GrabHandleRect.IsEmpty)
+                            {
+                                p = new Point(m_GrabHandleRect.X, m_GrabHandleRect.Bottom);
+                                sz = new Size(this.Width - m_GrabHandleRect.Left * 2, dockTabStripHeight);
+                            }
+                            else
+                            {
+                                if (m_BarState == eBarState.Docked)
+                                {
+                                    p = new Point(Dpi.Width1, Dpi.Width1);
+                                    sz = new Size(this.Width - Dpi.Width2, dockTabStripHeight);
+                                }
+                                else if (m_BarState == eBarState.Floating)
+                                {
+                                    if (this.IsThemed)
+                                    {
+                                        p = new Point(m_ThemeWindowMargins.Left, m_ThemeWindowMargins.Top);
+                                        sz = new Size(this.Width - (m_ThemeWindowMargins.Left + m_ThemeWindowMargins.Right), dockTabStripHeight);
+                                    }
+                                    else
+                                    {
+                                        p = new Point(Dpi.Width3, Dpi.Height3);
+                                        sz = new Size(this.Width - Dpi.Width6, dockTabStripHeight);
+                                    }
+                                }
+                                else
+                                    m_TabDockItems.Visible = false;
+                            }
+                            break;
+                        }
+                    case eTabStripAlignment.Left:
+                        {
+                            if (m_GrabHandleStyle != eGrabHandleStyle.None && !m_GrabHandleRect.IsEmpty)
+                            {
+                                p = new Point(m_GrabHandleRect.X + 1, m_GrabHandleRect.Bottom + Dpi.Height1);
+                                sz = new Size(dockTabStripHeight, m_ItemContainer.HeightInternal - Dpi.Height1);
+                            }
+                            else
+                            {
+                                if (m_BarState == eBarState.Docked)
+                                {
+                                    p = new Point(Dpi.Width2, Dpi.Height1);
+                                    sz = new Size(dockTabStripHeight, this.Height - Dpi.Height3);
+                                }
+                                else if (m_BarState == eBarState.Floating)
+                                {
+                                    if (this.IsThemed)
+                                    {
+                                        p = new Point(m_ThemeWindowMargins.Left, m_ThemeWindowMargins.Top);
+                                        sz = new Size(this.Width - (m_ThemeWindowMargins.Left + m_ThemeWindowMargins.Right), dockTabStripHeight);
+                                    }
+                                    else
+                                    {
+                                        p = new Point(Dpi.Width3, Dpi.Height3);
+                                        sz = new Size(this.Width - Dpi.Width6, dockTabStripHeight);
+                                    }
+                                }
+                                else
+                                    m_TabDockItems.Visible = false;
+                            }
+                            break;
+                        }
+                    case eTabStripAlignment.Right:
+                        {
+                            if (m_GrabHandleStyle != eGrabHandleStyle.None && !m_GrabHandleRect.IsEmpty && m_BarState == eBarState.Docked)
+                            {
+                                p = new Point(this.ClientRectangle.Right - dockTabStripHeight, m_GrabHandleRect.Bottom + Dpi.Height1);
+                                sz = new Size(dockTabStripHeight - Dpi.Width2, m_ItemContainer.HeightInternal);
+                            }
+                            else
+                            {
+                                if (m_BarState == eBarState.Docked)
+                                {
+                                    p = new Point(this.Width - dockTabStripHeight, Dpi.Height1);
+                                    sz = new Size(dockTabStripHeight, this.Height - Dpi.Height2);
+                                }
+                                else if (m_BarState == eBarState.Floating)
+                                {
+                                    if (this.IsThemed)
+                                    {
+                                        p = new Point(this.Width - m_ThemeWindowMargins.Right - dockTabStripHeight, m_ThemeWindowMargins.Top);
+                                        sz = new Size(dockTabStripHeight, this.Height - (m_ThemeWindowMargins.Top + m_ThemeWindowMargins.Bottom));
+                                    }
+                                    else
+                                    {
+                                        p = new Point(this.Width - Dpi.Width3 - dockTabStripHeight, m_ItemContainer.TopInternal);
+                                        sz = new Size(dockTabStripHeight, m_ItemContainer.HeightInternal);
+                                    }
+                                }
+                                else
+                                    m_TabDockItems.Visible = false;
+                            }
+                            break;
+                        }
+                    default:
+                        {
+                            p = new Point(0, this.Height - dockTabStripHeight);
+                            sz = new Size(this.Width, dockTabStripHeight);
+                            if (this.DockSide == eDockSide.Top && m_BarState == eBarState.Docked)
+                            {
+                                p = new Point(0, this.Height - dockTabStripHeight - Dpi.Height1);
+                                sz = new Size(this.Width, dockTabStripHeight);
+                            }
+                            if (m_BarState == eBarState.Docked)
+                            {
+                                if (m_DockedBorder != eBorderType.None)
+                                {
+                                    p = new Point(Dpi.Width2, this.Height - dockTabStripHeight - Dpi.Height3);
+                                    sz = new Size(this.Width - Dpi.Width4, dockTabStripHeight);
+                                }
+                            }
+                            else if (m_BarState == eBarState.Floating)
+                            {
+                                if (this.IsThemed)
+                                {
+                                    p = new Point(m_ThemeWindowMargins.Left, this.Height - dockTabStripHeight - m_ThemeWindowMargins.Right);
+                                    sz = new Size(this.Width - (m_ThemeWindowMargins.Left + m_ThemeWindowMargins.Right), dockTabStripHeight);
+                                }
+                                else
+                                {
+                                    p = new Point(3, this.Height - dockTabStripHeight - Dpi.Height3);
+                                    sz = new Size(this.Width - Dpi.Width6, dockTabStripHeight);
+                                }
+                            }
+                            else
+                                m_TabDockItems.Visible = false;
+                            break;
+                        }
+                }
+                m_TabDockItems.SetBounds(p.X, p.Y, sz.Width, sz.Height);
+            }
+        }
+
+        /// <summary>
+        /// Returns the reference to internal TabStrip control used to display contained DockContainerItems.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), DevCoBrowsable(false)]
+        public TabStrip DockTabControl
+        {
+            get
+            {
+                return m_TabDockItems;
+            }
+        }
+
+        private void TabStripTabChanging(object sender, TabStripTabChangingEventArgs e)
+        {
+            if (m_RefreshingDockTab)
+                return;
+            e.Cancel = InvokeDockTabChange((e.OldTab == null ? null : e.OldTab.AttachedItem), (e.NewTab == null ? null : e.NewTab.AttachedItem));
+        }
+
+        private void SyncBarCaption(BaseItem selected)
+        {
+            if (m_AutoSyncBarCaption && this.LayoutType == eLayoutType.DockContainer)
+            {
+                DockContainerItem sel = this.SelectedDockContainerItem;
+                if (sel != null && sel.Visible || selected != null)
+                {
+                    if (selected == null)
+                        selected = sel; // this.Items[this.SelectedDockTab];
+
+                    this.Text = selected.Text;
+                }
+                else
+                {
+                    foreach (BaseItem item in this.Items)
+                    {
+                        if (item.Visible && item.Displayed)
+                        {
+                            this.Text = item.Text;
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+        internal void SyncBarCaption()
+        {
+            SyncBarCaption(null);
+        }
+
+        private bool InvokeDockTabChange(BaseItem oldItem, BaseItem newItem)
+        {
+            DockTabChangeEventArgs dockarg = null;
+            IOwnerBarSupport ownersupport = m_Owner as IOwnerBarSupport;
+            bool bCancel = false;
+            if (DockTabChange != null)
+            {
+                dockarg = new DockTabChangeEventArgs(oldItem, newItem);
+                DockTabChange(this, dockarg);
+                bCancel = dockarg.Cancel;
+                if (bCancel)
+                    return bCancel;
+            }
+            if (m_Owner != null)
+            {
+                if (dockarg == null)
+                    dockarg = new DockTabChangeEventArgs(oldItem, newItem);
+                if (ownersupport != null)
+                    ownersupport.InvokeDockTabChange(this, dockarg);
+                bCancel = dockarg.Cancel;
+            }
+            if (!bCancel)
+            {
+                SyncBarCaption(newItem);
+                UpdateCloseButtonVisibility();
+            }
+
+            if (!bCancel)
+                OnBarStateChanged(new BarStateChangedEventArgs(this, eBarStateChange.SelectedDockTabChanging, newItem));
+
+            return bCancel;
+        }
+
+        internal void InvokeBeforeDockTabDisplayed(BaseItem item)
+        {
+            if (BeforeDockTabDisplayed != null)
+                BeforeDockTabDisplayed(item, new EventArgs());
+
+            IOwnerBarSupport ownersupport = m_Owner as IOwnerBarSupport;
+            if (ownersupport != null)
+                ownersupport.InvokeBeforeDockTabDisplay(item, new EventArgs());
+        }
+
+        private void TabStripTabMoved(object sender, TabStripTabMovedEventArgs e)
+        {
+            List<BaseItem> hiddenList = new List<BaseItem>();
+            foreach (BaseItem item in m_ItemContainer.SubItems)
+            {
+                if (!item.Visible)
+                    hiddenList.Add(item);
+            }
+            foreach (BaseItem item in hiddenList)
+            {
+                m_ItemContainer.SubItems._Remove(item);
+            }
+            m_ItemContainer.SubItems._Remove((DockContainerItem)e.Tab.AttachedItem);
+            m_ItemContainer.SubItems._Add((DockContainerItem)e.Tab.AttachedItem, e.NewIndex);
+            foreach (BaseItem item in hiddenList)
+            {
+                m_ItemContainer.SubItems._Add(item);
+            }
+            m_TabsRearranged = true;
+            OnBarStateChanged(new BarStateChangedEventArgs(this, eBarStateChange.DockTabMoved, e.Tab.AttachedItem));
+        }
+
+        /// <summary>
+        /// Gets or sets the selected DockContainerItem if bar represents dockable window.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public DockContainerItem SelectedDockContainerItem
+        {
+            get
+            {
+                if (m_ItemContainer.LayoutType != eLayoutType.DockContainer) return null;
+                int si = this.SelectedDockTab;
+                if (si >= 0)
+                    return this.Items[si] as DockContainerItem;
+                if (this.VisibleItemCount > 0)
+                {
+                    foreach (BaseItem item in this.Items)
+                    {
+                        if (item.Visible && item.Displayed) return item as DockContainerItem;
+                    }
+                }
+                return null;
+            }
+            set
+            {
+                if (m_ItemContainer.LayoutType != eLayoutType.DockContainer)
+                    throw new InvalidOperationException("Bar type is not dockable window. LayoutType must be set to eLayoutType.DockContainer");
+                if (!this.Items.Contains(value))
+                    throw new InvalidOperationException("Bar.Items collection does not contain the item");
+                this.SelectedDockTab = this.Items.IndexOf(value);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the tab (DockContainerItem) index for Bars with LayoutType set to eLayoutType.DockContainer. Index corresponds to the index of the DockContainerItem in Bar.Items collection.
+        /// </summary>
+        [System.ComponentModel.Browsable(true), DevCoBrowsable(true),System.ComponentModel.Category("Docking"),System.ComponentModel.Description("Gets or sets the tab (DockContainerItem) index for Bars with LayoutType set to eLayoutType.DockContainer."),DefaultValue(-1)]
+        public int SelectedDockTab
+        {
+            get
+            {
+                if (m_ItemContainer.LayoutType != eLayoutType.DockContainer || m_TabDockItems == null)
+                    return -1;
+                if (m_TabDockItems.SelectedTab != null)
+                    return m_ItemContainer.SubItems.IndexOf(m_TabDockItems.SelectedTab.AttachedItem);
+
+                return -1;
+            }
+            set
+            {
+                if (m_TabDockItems == null || m_TabDockItems != null && this.AutoHide)
+                {
+                    if (value < this.Items.Count)
+                    {
+                        for (int i = 0; i < this.Items.Count; i++)
+                        {
+                            if (i == value && this.Items[i].Visible)
+                                this.Items[i].Displayed = true;
+                            else
+                                this.Items[i].Displayed = false;
+                        }
+                        if (m_TabDockItems == null)
+                        {
+                            if (this.Items[value].Displayed)
+                                InvokeDockTabChange(null, this.Items[value]);
+                            RefreshAutoHidePanel();
+                        }
+                    }
+                    if (m_TabDockItems == null) return;
+                }
+                if (m_ItemContainer.LayoutType != eLayoutType.DockContainer)
+                    throw new InvalidOperationException("SelectedDockTab property can be set only for LayoutType=eLayoutType.DockContainer.");
+                if (value < 0) value = 0;
+                if (value >= m_ItemContainer.SubItems.Count)
+                    throw new InvalidOperationException("Invalid tab index.");
+                //if(this.AutoHide)
+                //{
+                //    m_LastDockSiteInfo.DockedHeight=0;
+                //    m_LastDockSiteInfo.DockedWidth=0;
+                //}
+                BaseItem item = m_ItemContainer.SubItems[value];
+                foreach (TabItem tab in m_TabDockItems.Tabs)
+                {
+                    if (tab.AttachedItem == item)
+                    {
+                        if (m_TabDockItems.SelectedTab == tab && this.AutoHide)
+                            InvokeBeforeDockTabDisplayed(item);
+                        m_TabDockItems.SelectedTab = tab;
+                        if (this.AutoHide)
+                        {
+                            AutoHidePanel panel = GetAutoHidePanel(m_LastDockSiteInfo.DockSide);
+                            panel.SelectedDockContainerItem = item as DockContainerItem;
+                        }
+                        break;
+                    }
+                }
+            }
+        }
+
+        #region Inherited properties hiding
+        [System.ComponentModel.Browsable(false), System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+        public override Cursor Cursor
+        {
+            get
+            { return base.Cursor; }
+            set
+            { base.Cursor = value; }
+        }
+        /// <summary>
+        /// Indicates Bar background image.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true),Category("Appearance"),Description("Indicates Bar background image.")]
+        public override Image BackgroundImage
+        {
+            get { return base.BackgroundImage; }
+            set { base.BackgroundImage = value; }
+        }
+        [System.ComponentModel.Browsable(false), System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+        public override Color ForeColor
+        {
+            get { return base.ForeColor; }
+            set { base.ForeColor = value; }
+        }
+        [System.ComponentModel.Browsable(false), System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+        public override RightToLeft RightToLeft
+        {
+            get { return base.RightToLeft; }
+            set { base.RightToLeft = value; }
+        }
+        [System.ComponentModel.Browsable(false), System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+        public override ContextMenu ContextMenu
+        {
+            get { return base.ContextMenu; }
+            set { base.ContextMenu = value; }
+        }
+        [System.ComponentModel.Browsable(false), System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+        public new ImeMode ImeMode
+        {
+            get { return base.ImeMode; }
+            set { base.ImeMode = value; }
+        }
+        [System.ComponentModel.Browsable(false), System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+        public new int TabIndex
+        {
+            get { return base.TabIndex; }
+            set { base.TabIndex = value; }
+        }
+        [System.ComponentModel.Browsable(false), System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+        public new bool TabStop
+        {
+            get { return base.TabStop; }
+            set { base.TabStop = value; }
+        }
+        [System.ComponentModel.Browsable(false), System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+        public new bool CausesValidation
+        {
+            get { return base.CausesValidation; }
+            set { base.CausesValidation = value; }
+        }
+        [System.ComponentModel.Browsable(false), System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+        public override AnchorStyles Anchor
+        {
+            get { return base.Anchor; }
+            set { base.Anchor = value; }
+        }
+        [Browsable(true), DevCoBrowsable(false),System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+        public override DockStyle Dock
+        {
+            get { return base.Dock; }
+            set
+            {
+                if (this.DockSide == eDockSide.Document && value != DockStyle.None && this.Parent is DockSite)
+                    return;
+                base.Dock = value;
+            }
+        }
+
+        [Browsable(false)]
+        public new Point Location
+        {
+            get { return base.Location; }
+            set
+            {
+                if (m_BarState == eBarState.Floating)
+                {
+                    if (m_Float != null)
+                        m_Float.Location = value;
+                }
+                else
+                    base.Location = value;
+            }
+        }
+        [Browsable(false)]
+        public new Size Size
+        {
+            get { return base.Size; }
+            set { base.Size = value; }
+        }
+        [System.ComponentModel.Browsable(false), System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+        public override bool AllowDrop
+        {
+            get { return base.AllowDrop; }
+            set { base.AllowDrop = value; }
+        }
+#if FRAMEWORK20
+        [System.ComponentModel.Browsable(false), System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+        public new System.Windows.Forms.Padding Padding
+        {
+            get { return base.Padding; }
+            set { base.Padding = value; }
+        }
+#endif
+        #endregion
+
+        /// <summary>
+        /// Gets or sets whether caption button menu for bars with grab handle task pane is automatically created.
+        /// Caption menu when automatically created will display the list of all items from Items collection
+        /// and it will maintain only one item from the list as visible item.
+        /// To create custom caption menu that is displayed when user clicks the caption button handle CaptionButtonClick event.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true),DefaultValue(true),Category("Behavior"),Description("Indicates whether caption button drop-down menu is automatically created")]
+        public virtual bool AutoCreateCaptionMenu
+        {
+            get
+            {
+                return m_AutoCreateCaptionMenu;
+            }
+            set
+            {
+                m_AutoCreateCaptionMenu = value;
+                if (this.Visible)
+                    this.RecalcLayout();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether caption (text) of the bars with dock container layout is automatically set to the
+        /// selected dock container item text.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true),DefaultValue(false),Category("Behavior"),Description("Indicates whether caption is automatically set to the active dock container item text.")]
+        public virtual bool AutoSyncBarCaption
+        {
+            get { return m_AutoSyncBarCaption; }
+            set
+            {
+                m_AutoSyncBarCaption = value;
+                SyncBarCaption();
+            }
+        }
+
+        // IDockInfo Interface implementation
+        /// <summary>
+        /// Returns the Minimum Size for specified orientation.
+        /// </summary>
+        /// <param name="dockOrientation">Orientation to return minimum size for.</param>
+        /// <returns></returns>
+        public System.Drawing.Size MinimumDockSize(eOrientation dockOrientation)
+        {
+            if (m_ItemContainer == null) return new Size(32, 32);
+            if (m_ItemContainer.LayoutType == eLayoutType.DockContainer && (m_ItemContainer.Stretch || m_DockStretch))
+            {
+                if (m_ItemContainer.SubItems.Count > 0 && m_ItemContainer.SubItems[0] is DockContainerItem)
+                    return ((DockContainerItem)m_ItemContainer.SubItems[0]).MinimumSize;
+                return new Size(32, 32);
+            }
+
+            if (m_ItemContainer.Stretch || m_DockStretch)
+                return PreferredDockSize(dockOrientation);
+
+            if (m_ItemContainer.SubItems.Count > 0)
+            {
+                BaseItem objItem = m_ItemContainer.SubItems[0];
+                if (objItem != null)
+                {
+                    return new Size(objItem.WidthInternal + m_ClientRect.Left * 2, objItem.HeightInternal);
+                }
+            }
+
+            return new Size(0, 0);
+        }
+        internal Size GetAdjustedFullSize(Size size)
+        {
+            const int TOTAL_BORDER_SIZE = 6;
+            Size newSize = size;
+            if (m_TabDockItems != null && m_TabDockItems.Visible && (this.DockTabAlignment == eTabStripAlignment.Top || this.DockTabAlignment == eTabStripAlignment.Bottom))
+                newSize.Height += (m_TabDockItems.Height);
+            newSize.Height += (TOTAL_BORDER_SIZE + SystemInformation.ToolWindowCaptionHeight);
+            newSize.Width += TOTAL_BORDER_SIZE;
+            return newSize;
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public int GetBarDockedSize(eOrientation o)
+        {
+            int TOTAL_BORDER_SIZE = Dpi.Width6;
+            if (m_ItemContainer == null)
+                return 0;
+            if (o == eOrientation.Horizontal && m_LastDockSiteInfo.DockedHeight > 0 && (m_LastDockSiteInfo.DockSide == DockStyle.Top || m_LastDockSiteInfo.DockSide == DockStyle.Bottom))
+                return m_LastDockSiteInfo.DockedHeight;
+            else if (o == eOrientation.Vertical && m_LastDockSiteInfo.DockedWidth > 0 && (m_LastDockSiteInfo.DockSide == DockStyle.Left || m_LastDockSiteInfo.DockSide == DockStyle.Right))
+                return m_LastDockSiteInfo.DockedWidth;
+
+            if (o == eOrientation.Horizontal && m_ItemContainer.MinHeight > 0 && m_ItemContainer.MinHeight + SystemInformation.ToolWindowCaptionHeight < this.GetFormClientHeight())
+                return m_ItemContainer.MinHeight + SystemInformation.ToolWindowCaptionHeight;
+            else if (o == eOrientation.Vertical && m_ItemContainer.MinWidth > 0 && m_ItemContainer.MinWidth + SystemInformation.ToolWindowCaptionHeight < this.GetFormClientWidth())
+                return m_ItemContainer.MinWidth + SystemInformation.ToolWindowCaptionHeight;
+
+            if (this.SelectedDockTab >= 0 || this.VisibleItemCount > 0 && this.LayoutType == eLayoutType.DockContainer)
+            {
+                DockContainerItem item = null;
+                if (this.SelectedDockTab >= 0)
+                    item = this.Items[this.SelectedDockTab] as DockContainerItem;
+                else
+                    item = GetFirstVisibleItem() as DockContainerItem;
+                if (item != null)
+                {
+                    if (o == eOrientation.Horizontal)
+                    {
+                        if (item.MinimumSize.Height > 0)
+                        {
+                            int height = this.Height;
+                            if (this.Parent != null && (this.DockSide == eDockSide.Left || this.DockSide == eDockSide.Right) ||
+                                this.Parent == null && (LastDockSide == eDockSide.Left || LastDockSide == eDockSide.Right))
+                                height = this.Width;
+
+                            if (height > item.MinimumSize.Height)
+                                return height;
+                            return item.MinimumSize.Height * 2 + Dpi.Height(DockTabStripHeight) + TOTAL_BORDER_SIZE;
+                        }
+                    }
+                    else
+                    {
+                        if (item.MinimumSize.Width > 0)
+                        {
+                            int width = this.Width;
+                            if (this.Parent != null && (this.DockSide == eDockSide.Top || this.DockSide == eDockSide.Bottom) ||
+                                this.Parent == null && (LastDockSide == eDockSide.Top || LastDockSide == eDockSide.Bottom))
+                                width = this.Height;
+                            if (width > item.MinimumSize.Width)
+                                return width;
+                            return item.MinimumSize.Width * 2 + TOTAL_BORDER_SIZE;
+                        }
+                    }
+                }
+            }
+
+            if (o == eOrientation.Horizontal)
+                return this.Height;
+            else
+                return this.Width;
+        }
+
+        /// <summary>
+        /// Returns the preferred size of the Bar when docked.
+        /// </summary>
+        /// <param name="dockOrientation">Orientation to return preferred size for.</param>
+        /// <returns></returns>
+        public System.Drawing.Size PreferredDockSize(eOrientation dockOrientation)
+        {
+            // Return preffered size for this container
+            IOwner owner = m_Owner as IOwner;
+            if (dockOrientation == eOrientation.Horizontal)
+            {
+                if (m_DockedSizeH.IsEmpty)
+                {
+                    if (owner != null && owner.ParentForm != null)
+                        m_DockedSizeH = RecalcSizeOnly(owner.ParentForm.Size, eOrientation.Horizontal, eBarState.Docked, m_WrapItemsDock);
+                    else
+                        m_DockedSizeH = RecalcSizeOnly(System.Windows.Forms.Screen.FromControl(this).WorkingArea.Size, eOrientation.Horizontal, eBarState.Docked, m_WrapItemsDock);
+                }
+
+                return m_DockedSizeH;
+            }
+            else
+            {
+                // We will need to calculate that size
+                if (m_DockedSizeV.IsEmpty)
+                {
+                    Size size = Size.Empty;
+                    if (owner != null && owner.ParentForm != null)
+                        size = RecalcSizeOnly(owner.ParentForm.Size, eOrientation.Horizontal, eBarState.Docked, m_WrapItemsDock);
+                    else
+                        size = RecalcSizeOnly(System.Windows.Forms.Screen.FromControl(this).WorkingArea.Size, eOrientation.Horizontal, eBarState.Docked, m_WrapItemsDock);
+                    m_DockedSizeV = new Size(size.Height, size.Width);
+                }
+
+                return m_DockedSizeV;
+            }
+        }
+
+        /// <summary>
+        /// Specifies whether Bar can be undocked. Does not apply to stand alone bars.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true),System.ComponentModel.Category("Docking"),System.ComponentModel.Description("Specifies whether Bar can be undocked."),DefaultValue(true)]
+        public bool CanUndock
+        {
+            get
+            {
+                return m_CanUndock;
+            }
+            set
+            {
+                if (m_CanUndock != value)
+                    m_CanUndock = value;
+            }
+        }
+
+        /// <summary>
+        /// Specifes whether end-user can tear-off (deattach) the tabs on dockable window.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), DevCoBrowsable(true),System.ComponentModel.Category("Docking"),System.ComponentModel.Description("Specifes whether end-user can tear-off (deattach) the tabs on dockable window."),DefaultValue(true)]
+        public bool CanTearOffTabs
+        {
+            get
+            {
+                return m_CanTearOffTabs;
+            }
+            set
+            {
+                if (m_CanTearOffTabs != value)
+                    m_CanTearOffTabs = value;
+            }
+        }
+
+        /// <summary>
+        /// Specifes whether end-user can reorder the tabs on dockable window.
+        /// </summary>
+        [System.ComponentModel.Browsable(true), DevCoBrowsable(true),System.ComponentModel.Category("Docking"),System.ComponentModel.Description("Specifes whether end-user can reorder the tabs on dockable window."),DefaultValue(true)]
+        public bool CanReorderTabs
+        {
+            get
+            {
+                return m_CanReorderTabs;
+            }
+            set
+            {
+                if (m_CanReorderTabs != value)
+                {
+                    m_CanReorderTabs = value;
+                    if (m_TabDockItems != null)
+                        m_TabDockItems.CanReorderTabs = value;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether bar or DockContainerItem that is torn-off this bar can be docked
+        /// as tab to another bar. Default value is true which indicates that bar can be docked as tab to another bar.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true),DefaultValue(true),Category("Docking"),Description("Indicates whether bar or DockContainerItem that is torn-off this bar can be docked as tab to another bar.")]
+        public bool CanDockTab
+        {
+            get { return m_CanDockTab; }
+            set { m_CanDockTab = value; }
+        }
+
+        private bool _CanMove = true;
+        /// <summary>
+        /// Gets or sets whether dock bar can be moved by dragging its caption using the mouse.
+        /// </summary>
+        [DefaultValue(true), Category("Docking"), Description("Indicates whether dock bar can be moved by dragging its caption using the mouse.")]
+        public bool CanMove
+        {
+            get { return _CanMove; }
+            set
+            {
+                _CanMove = value;
+            }
+        }
+
+        /// <summary>
+        /// Specifies whether Bar can be docked on Top dock site or not. Does not apply to stand alone bars.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true),DefaultValue(true),System.ComponentModel.Category("Docking"),System.ComponentModel.Description("Determines whether bar can be docked to the top edge of container.")]
+        public bool CanDockTop
+        {
+            get
+            {
+                return m_CanDockTop;
+            }
+            set
+            {
+                if (m_CanDockTop != value)
+                    m_CanDockTop = value;
+            }
+        }
+
+        /// <summary>
+        /// Specifies whether Bar can be docked on Bottom dock site or not. Does not apply to stand alone bars.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true),DefaultValue(true),Category("Docking"),Description("Determines whether bar can be docked to the bottom edge of container.")]
+        public bool CanDockBottom
+        {
+            get
+            {
+                return m_CanDockBottom;
+            }
+            set
+            {
+                if (m_CanDockBottom != value)
+                    m_CanDockBottom = value;
+            }
+        }
+
+        /// <summary>
+        /// Specifes whether Bar can be docked on Left dock site or not. Does not apply to stand alone bars.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true),DefaultValue(true),System.ComponentModel.Category("Docking"),System.ComponentModel.Description("Determines whether bar can be docked to the left edge of container.")]
+        public bool CanDockLeft
+        {
+            get
+            {
+                return m_CanDockLeft;
+            }
+            set
+            {
+                if (m_CanDockLeft != value)
+                    m_CanDockLeft = value;
+            }
+        }
+
+        /// <summary>
+        /// Specifes whether Bar can be docked on Right dock site or not. Does not apply to stand alone bars.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true),DefaultValue(true),System.ComponentModel.Category("Docking"),System.ComponentModel.Description("Determines whether bar can be docked to the right edge of container.")]
+        public bool CanDockRight
+        {
+            get
+            {
+                return m_CanDockRight;
+            }
+            set
+            {
+                if (m_CanDockRight != value)
+                    m_CanDockRight = value;
+            }
+        }
+
+        /// <summary>
+        /// Specifies whether Bar can be docked as document. Default value is false. See DotNetBarManager.EnableDocumentDocking for more details.
+        /// </summary>
+        [Browsable(true), DefaultValue(false) , Category("Docking"), Description("Specifies whether Bar can be docked as document.")]
+        public bool CanDockDocument
+        {
+            get { return m_CanDockDocument; }
+            set { m_CanDockDocument = value; }
+        }
+
+        /// <summary>
+        /// Specifies whether Bar will stretch to always fill the space in dock site. Applies to the dockable bars only.
+        /// </summary>
+        [Browsable(false), DefaultValue(false),System.ComponentModel.Category("Layout"),System.ComponentModel.Description("Specifies whether Bar will stretch to always fill the space in dock site.")/*,DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)*/]
+        public bool Stretch
+        {
+            get
+            {
+                return m_DockStretch;
+            }
+            set
+            {
+                if (m_DockStretch != value)
+                {
+                    m_DockStretch = value;
+                    this.RecalcLayout();
+                }
+            }
+        }
+
+        protected override void OnDockChanged(EventArgs e)
+        {
+            base.OnDockChanged(e);
+            if (this.Dock != DockStyle.None)
+                m_DockStretch = true;
+            else
+                m_DockStretch = false;
+            this.RecalcLayout();
+        }
+
+        private bool m_DisabledImagesGrayScale = true;
+        /// <summary>
+        /// Gets or sets whether gray-scale algorithm is used to create automatic gray-scale images. Default is true.
+        /// </summary>
+        [System.ComponentModel.Browsable(true), DefaultValue(true),System.ComponentModel.Category("Appearance"),Description("Gets or sets whether gray-scale algorithm is used to create automatic gray-scale images.")]
+        public bool DisabledImagesGrayScale
+        {
+            get
+            {
+                return m_DisabledImagesGrayScale;
+            }
+            set
+            {
+                m_DisabledImagesGrayScale = value;
+            }
+        }
+
+        // TODO: Merge Implementation
+        //		/// <summary>
+        //		/// Specifies whether Bar is merged with MDI Parent Bars when on MDI Child form.
+        //		/// </summary>
+        //		[System.ComponentModel.Browsable(true),DevCoBrowsable(true),System.ComponentModel.DefaultValue(false),System.ComponentModel.Category("Layout"),System.ComponentModel.Description("Specifies whether Bar is merged with MDI Parent Bars when on MDI Child form.")]
+        //		public bool MergeEnabled
+        //		{
+        //			get
+        //			{
+        //				return m_MergeEnabled;
+        //			}
+        //			set
+        //			{
+        //				m_MergeEnabled=value;
+        //				if(!this.DesignMode && this.Visible && IsParentMdiChild)
+        //				{
+        //					this.Visible=false;
+        //				}
+        //			}
+        //		}
+
+        /// <summary>
+        /// Gets/Sets the distance from the far left/top side of the docking site or suggests the order of the docked bar. Upon serialization this property
+        /// will contain actual left/top position of the bar. You can use it to re-order the bars docked on the same line. Property value is relative to the other
+        /// bars docked on the same line when it is used to change the order. For example setting DockOffset value to 10 will place the bar just after the last bar on the
+        /// same line that has DockOffset value less than 10. If there is no bar with DockOffset value less than 10 the bar will be placed in first position.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), DevCoBrowsable(true),System.ComponentModel.Category("Docking"),System.ComponentModel.Description("Indicates the distance from the far left/top side of the docking site.."),DefaultValue(0)]
+        public int DockOffset
+        {
+            get
+            {
+                return m_DockOffset;
+            }
+            set
+            {
+                m_DockOffset = value;
+            }
+        }
+        /// <summary>
+        /// Gets/Sets the dock line.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), DevCoBrowsable(true),System.ComponentModel.Category("Docking"),System.ComponentModel.Description("Indicates the docking line."),DefaultValue(0)]
+        public int DockLine
+        {
+            get
+            {
+                return m_DockLine;
+            }
+            set
+            {
+                m_DockLine = value;
+                if (m_BarState == eBarState.Docked)
+                {
+                    if (this.Parent is DockSite && !m_LayoutSuspended)
+                    {
+                        ((DockSite)this.Parent).AdjustBarPosition(this);
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Sets the dock line but it does not forces the Bar to change position. The position will be changed on next layout request or when dock site needs to recalculate the layout of the bat. Used internally only.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+        public void SetDockLine(int iLine)
+        {
+            m_DockLine = iLine;
+        }
+
+        /// <summary>
+        /// Gets or sets the dock tab alignment.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true),System.ComponentModel.Category("Docking"),System.ComponentModel.Description("Gets or sets the dock tab alignment."),System.ComponentModel.DefaultValue(eTabStripAlignment.Bottom)]
+        public eTabStripAlignment DockTabAlignment
+        {
+            get { return m_DockTabAlignment; }
+            set
+            {
+                m_DockTabAlignment = value;
+                if (m_TabDockItems != null)
+                {
+                    m_TabDockItems.TabAlignment = m_DockTabAlignment;
+                    RecalcLayout();
+                    ResizeDockTab();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether selected dock tab is closed when Bar caption close button is pressed. Default value is false which indicates that whole bar will be hidden when bars close button is pressed.
+        /// </summary>
+        [Browsable(true), DefaultValue(false), Category("Docking"), Description("Indicates whether selected dock tab is closed when Bar caption close button is pressed. Default value is false which indicates that whole bar will be hidden when bars close button is pressed.")]
+        public bool CloseSingleTab
+        {
+            get { return m_CloseSingleTab; }
+            set { m_CloseSingleTab = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether close button is displayed on each dock tab that allows closing of the tab. Default value is false.
+        /// </summary>
+        [Browsable(true), DefaultValue(false), Description("Indicates whether close button is displayed on each dock tab that allows closing of the tab."), Category("Docking")]
+        public bool DockTabCloseButtonVisible
+        {
+            get { return m_DockTabCloseButtonVisible; }
+            set
+            {
+                if (m_DockTabCloseButtonVisible != value)
+                {
+                    m_DockTabCloseButtonVisible = value;
+                    if (m_TabDockItems != null)
+                    {
+                        m_TabDockItems.CloseButtonOnTabsVisible = m_DockTabCloseButtonVisible;
+                    }
+                }
+            }
+        }
+
+        protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
+        {
+            DotNetBarManager manager = this.Owner as DotNetBarManager;
+            bool ctrlTabEnabled = false;
+            if (manager != null)
+                ctrlTabEnabled = manager.EnableDockCtrlTabKey;
+            if (ctrlTabEnabled && this.LayoutType == eLayoutType.DockContainer && this.VisibleItemCount > 1)
+            {
+                if ((keyData & Keys.Control) == Keys.Control && (keyData & Keys.Tab) == Keys.Tab && WinApi.HIWORD(WinApi.GetKeyState(9)) != 0)
+                {
+
+                    if ((keyData & Keys.Shift) == Keys.Shift)
+                    {
+                        SelectPreviousTab(true);
+                    }
+                    else
+                    {
+                        SelectNextTab(true);
+                    }
+                    return true;
+                }
+            }
+            return base.ProcessCmdKey(ref msg, keyData);
+        }
+
+        internal bool SelectPreviousTab(bool cycle)
+        {
+            int newIndex = -1;
+            if (this.SelectedDockTab <= 0)
+            {
+                if (cycle)
+                {
+                    newIndex = GetTabIndex(this.Items.Count, -1);
+                }
+                else
+                    return false;
+            }
+            else
+            {
+                newIndex = GetTabIndex(this.SelectedDockTab, -1);
+                if (newIndex < 0 && cycle)
+                {
+                    newIndex = GetTabIndex(this.Items.Count, -1);
+                }
+            }
+            if (newIndex < 0) return false;
+            this.SelectedDockTab = newIndex;
+            return true;
+        }
+
+        internal bool SelectNextTab(bool cycle)
+        {
+            int newIndex = -1;
+            if (this.SelectedDockTab >= this.Items.Count - 1)
+            {
+                if (cycle)
+                {
+                    newIndex = GetTabIndex(-1, 1);
+                }
+                else
+                    return false;
+            }
+            else
+            {
+                newIndex = GetTabIndex(this.SelectedDockTab, 1);
+                if (newIndex < 0 && cycle)
+                {
+                    newIndex = GetTabIndex(-1, 1);
+                }
+            }
+            if (newIndex < 0) return false;
+            this.SelectedDockTab = newIndex;
+            return true;
+        }
+
+        private int GetTabIndex(int start, int direction)
+        {
+            int i = start;
+            int end = this.Items.Count - 1;
+            int increment = 1;
+
+            if (direction < 0)
+            {
+                end = 0;
+                increment = -1;
+                if (start <= 0) return -1;
+            }
+            else if (start >= end) return -1;
+
+            while (end != i)
+            {
+                i += increment;
+                DockContainerItem tab = this.Items[i] as DockContainerItem;
+                if (tab != null && tab.Visible)
+                    return i;
+            }
+
+            return -1;
+        }
+
+        /// <summary>
+        /// Gets or sets whether tab that shows all dock containers on the bar is visible all the time. By default
+        /// tab is hidden when there is only one item displayed.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true),System.ComponentModel.Category("Docking"),System.ComponentModel.Description("Indicates whether tab that shows all dock containers on the bar is visible all the time."),System.ComponentModel.DefaultValue(false)]
+        public virtual bool AlwaysDisplayDockTab
+        {
+            get { return m_AlwaysDisplayDockTab; }
+            set
+            {
+                if (m_AlwaysDisplayDockTab != value)
+                {
+                    m_AlwaysDisplayDockTab = value;
+                    RefreshDockTab(false);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether bar is locked to prevent docking below it. Applies to undockable bars only.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), DevCoBrowsable(true),System.ComponentModel.Category("Docking"),System.ComponentModel.Description("Indicates whether bar is locked to prevent docking below it. Applies to undockable bars only."),DefaultValue(false)]
+        public bool LockDockPosition
+        {
+            get { return m_LockDockPosition; }
+            set
+            {
+                if (m_LockDockPosition == value)
+                    return;
+                m_LockDockPosition = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets/Sets the orientation of the Bar.
+        /// </summary>
+        [System.ComponentModel.Browsable(true), DefaultValue(eOrientation.Horizontal),DevCoBrowsable(false)]
+        public eOrientation DockOrientation
+        {
+            get
+            {
+                return m_ItemContainer.Orientation;
+            }
+            set
+            {
+                if (m_ItemContainer.Orientation != value)
+                {
+                    m_ItemContainer.Orientation = value;
+                }
+                if (this.DesignMode && !(this.Parent is DockSite))
+                    this.RecalcLayout();
+            }
+        }
+
+        /// <summary>
+        /// Returns whether Bar is docked or not.
+        /// </summary>
+        [System.ComponentModel.Browsable(false)]
+        public bool Docked
+        {
+            get
+            {
+                return (m_BarState == eBarState.Docked);
+            }
+        }
+
+        /// <summary>
+        /// Returns the Bars dock site.
+        /// </summary>
+        [System.ComponentModel.Browsable(false)]
+        public System.Windows.Forms.Control DockedSite
+        {
+            get
+            {
+                return this.Parent;
+            }
+        }
+
+        public bool ShouldSerializeDockSide()
+        {
+            if (this.Parent is DockSite && ((DockSite)this.Parent).DocumentDockContainer != null)
+                return false;
+            return DockSide != eDockSide.None;
+        }
+
+        private eDockSide _LastDockSidePrivate = eDockSide.None;
+        internal eDockSide LastDockSide
+        {
+            get
+            {
+                return _LastDockSidePrivate;
+            }
+            set
+            {
+                _LastDockSidePrivate = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets/Sets the dock side for the Bar.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), DevCoBrowsable(true),System.ComponentModel.Category("Docking"),System.ComponentModel.Description("Indicates the dock side for the Bar.")]
+        public eDockSide DockSide
+        {
+            get
+            {
+                if (m_BarState != eBarState.Docked)
+                    return eDockSide.None;
+                if (this.Parent == null)
+                    return eDockSide.Top;
+                else if (this.Parent.Dock == DockStyle.Left)
+                    return eDockSide.Left;
+                else if (this.Parent.Dock == DockStyle.Right)
+                    return eDockSide.Right;
+                else if (this.Parent.Dock == DockStyle.Top)
+                    return eDockSide.Top;
+                else if (this.Parent.Dock == DockStyle.Bottom)
+                    return eDockSide.Bottom;
+                else if (this.Parent.Dock == DockStyle.Fill)
+                    return eDockSide.Document;
+                return eDockSide.None;
+            }
+            set
+            {
+                if (this.Owner == null || m_LayoutSuspended)
+                {
+                    m_DockSideDelayed = (int)value;
+                    return;
+                }
+
+                if (this.AutoHide)
+                {
+                    ChangeAutoHidePanel(value);
+                    return;
+                }
+
+                DockSiteInfo pDockInfo = new DockSiteInfo();
+                IOwnerBarSupport ownersupport = m_Owner as IOwnerBarSupport;
+                if (ownersupport == null)
+                {
+                    m_DockSideDelayed = (int)value;
+                    return;
+                    //throw(new System.InvalidOperationException("Could not find owner of the Bar or owner does not implement IOwnerBarSupport."));
+                }
+
+                // Use Dock Line and Dock Offset to determine bar insert position
+                pDockInfo.InsertPosition = -10;
+                pDockInfo.DockLine = m_DockLine;
+                pDockInfo.DockOffset = m_DockOffset;
+
+                // Reset the split width and height
+                if (!m_BarDefinitionLoading)
+                {
+                    this.SplitDockHeight = 0;
+                    this.SplitDockWidth = 0;
+                }
+
+                if (value == eDockSide.Left)
+                {
+                    DockSite ds = null;
+                    if (this.LayoutType == eLayoutType.Toolbar)
+                    {
+                        ds = ownersupport.ToolbarLeftDockSite;
+                        if (ds == null)
+                            throw (new System.InvalidOperationException("DotNetBarManager.ToolbarLeftDockSite dock-site is not set."));
+                    }
+                    else
+                    {
+                        ds = ownersupport.LeftDockSite;
+                        if (ds == null)
+                            throw (new System.InvalidOperationException("DotNetBarManager.LeftDockSite dock-site is not set."));
+                    }
+
+                    pDockInfo.objDockSite = ds;
+                }
+                else if (value == eDockSide.Right)
+                {
+                    DockSite ds = null;
+                    if (this.LayoutType == eLayoutType.Toolbar)
+                    {
+                        ds = ownersupport.ToolbarRightDockSite;
+                        if (ds == null)
+                            throw (new System.InvalidOperationException("DotNetBarManager.ToolbarRightDockSite dock-site is not set."));
+                    }
+                    else
+                    {
+                        ds = ownersupport.RightDockSite;
+                        if (ds == null)
+                            throw (new System.InvalidOperationException("DotNetBarManager.RightDockSite dock-site is not set."));
+                    }
+
+                    pDockInfo.objDockSite = ds;
+                }
+                else if (value == eDockSide.Top)
+                {
+                    DockSite ds = null;
+                    if (this.LayoutType == eLayoutType.Toolbar)
+                    {
+                        ds = ownersupport.ToolbarTopDockSite;
+                        if (ds == null)
+                            throw (new System.InvalidOperationException("DotNetBarManager.ToolbarTopDockSite dock-site is not set."));
+                    }
+                    else
+                    {
+                        ds = ownersupport.TopDockSite;
+                        if (ds == null)
+                            throw (new System.InvalidOperationException("DotNetBarManager.TopDockSite dock-site is not set."));
+                    }
+
+                    pDockInfo.objDockSite = ds;
+                }
+                else if (value == eDockSide.Bottom)
+                {
+                    DockSite ds = null;
+                    if (this.LayoutType == eLayoutType.Toolbar)
+                    {
+                        ds = ownersupport.ToolbarBottomDockSite;
+                        if (ds == null)
+                            throw (new System.InvalidOperationException("DotNetBarManager.ToolbarBottomDockSite dock-site is not set."));
+                    }
+                    else
+                    {
+                        ds = ownersupport.BottomDockSite;
+                        if (ds == null)
+                            throw (new System.InvalidOperationException("DotNetBarManager.BottomDockSite dock-site is not set."));
+                    }
+
+                    if (ds == null)
+                        throw (new System.InvalidOperationException("Bottom dock-site is not set."));
+                    pDockInfo.objDockSite = ds;
+                }
+                else if (value == eDockSide.Document)
+                {
+                    pDockInfo.objDockSite = ownersupport.FillDockSite;
+                }
+                else
+                    pDockInfo.objDockSite = null;
+
+                this.DockingHandler(pDockInfo, m_FloatingRect.Location);
+            }
+        }
+
+        private void ChangeAutoHidePanel(eDockSide side)
+        {
+            if (!this.AutoHide)
+                return;
+            DockStyle dockStyle = DockStyle.Left;
+            if (side == eDockSide.Bottom)
+                dockStyle = DockStyle.Bottom;
+            else if (side == eDockSide.Right)
+                dockStyle = DockStyle.Right;
+            else if (side == eDockSide.Top)
+                dockStyle = DockStyle.Top;
+
+            if (m_LastDockSiteInfo.DockSide == dockStyle || side == eDockSide.None)
+                return;
+
+            AutoHidePanel panel = GetAutoHidePanel(m_LastDockSiteInfo.DockSide);
+            if (panel == null)
+                return;
+
+            IOwnerBarSupport barSupp = m_Owner as IOwnerBarSupport;
+            if (barSupp == null)
+                return;
+
+            AnimateHide();
+
+            panel.RemoveBar(this);
+            m_LastDockSiteInfo.DockSide = dockStyle;
+            switch (dockStyle)
+            {
+                case DockStyle.Left:
+                    m_LastDockSiteInfo.objDockSite = barSupp.LeftDockSite;
+                    break;
+                case DockStyle.Right:
+                    m_LastDockSiteInfo.objDockSite = barSupp.RightDockSite;
+                    break;
+                case DockStyle.Top:
+                    m_LastDockSiteInfo.objDockSite = barSupp.TopDockSite;
+                    break;
+                case DockStyle.Bottom:
+                    m_LastDockSiteInfo.objDockSite = barSupp.BottomDockSite;
+                    break;
+            }
+
+            panel = GetAutoHidePanel(dockStyle);
+            panel.AddBar(this);
+        }
+
+        /// <summary>
+        /// Gets or sets the inital floating location. This location will be used when DockSide is set to None.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false),Description("Indicates the inital floating location."),DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public Point InitalFloatLocation
+        {
+            get { return m_FloatingRect.Location; }
+            set { m_FloatingRect.Location = value; }
+        }
+
+        /// <summary>
+        /// Indicates whether Tooltips are shown on Bars and menus.
+        /// </summary>
+        [System.ComponentModel.Browsable(true), DevCoBrowsable(true),DefaultValue(true),System.ComponentModel.Category("Run-time Behavior"),System.ComponentModel.Description("Indicates whether Tooltips are shown on Bar and it's sub-items.")]
+        public bool ShowToolTips
+        {
+            get
+            {
+                return m_ShowToolTips;
+            }
+            set
+            {
+                m_ShowToolTips = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether control is selected in designer.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never), Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool DesignerSelection
+        {
+            get { return m_DesignerSelection; }
+            set
+            {
+                if (m_DesignerSelection != value)
+                {
+                    m_DesignerSelection = value;
+                    this.Refresh();
+                }
+            }
+        }
+
+        #region IOwner
+        // IOwner Implementation
+        BaseItem m_ExpandedItem = null;
+        BaseItem m_FocusItem = null;
+        private Hashtable m_ShortcutTable = new Hashtable();
+        // Only one Popup Item can be expanded at a time. This is used
+        // to track the currently expanded popup item and to close the popup item
+        // if another item is expanding.
+        void IOwner.SetExpandedItem(BaseItem objItem)
+        {
+            if (objItem != null && objItem.Parent is PopupItem)
+                return;
+            if (m_ExpandedItem != null)
+            {
+                if (m_ExpandedItem.Expanded)
+                    m_ExpandedItem.Expanded = false;
+                m_ExpandedItem = null;
+            }
+            m_ExpandedItem = objItem;
+        }
+
+        BaseItem IOwner.GetExpandedItem()
+        {
+            return m_ExpandedItem;
+        }
+
+        // Currently we are using this to communicate "focus" when control is in
+        // design mode. This can be used later if we decide to add focus
+        // handling to our BaseItem class.
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public event EventHandler FocusItemChange;
+        void IOwner.SetFocusItem(BaseItem objFocusItem)
+        {
+            if (DockSide == eDockSide.Document && m_Owner != null)
+            {
+                ((IOwner)m_Owner).SetFocusItem(objFocusItem);
+                return;
+            }
+
+            if (m_FocusItem != null && m_FocusItem != objFocusItem)
+            {
+                m_FocusItem.OnLostFocus();
+            }
+            m_FocusItem = objFocusItem;
+            if (m_FocusItem != null)
+                m_FocusItem.OnGotFocus();
+
+            if (FocusItemChange != null)
+                FocusItemChange(this, new EventArgs());
+        }
+
+        BaseItem IOwner.GetFocusItem()
+        {
+            if (DockSide == eDockSide.Document && m_Owner != null && m_Owner is IOwner)
+            {
+                return ((IOwner)m_Owner).GetFocusItem();
+            }
+            return m_FocusItem;
+        }
+        bool IOwner.DesignMode
+        {
+            get { return this.DesignMode; }
+        }
+        void IOwner.DesignTimeContextMenu(BaseItem objItem)
+        {
+        }
+
+        void IOwner.RemoveShortcutsFromItem(BaseItem objItem)
+        {
+            ShortcutTableEntry objEntry = null;
+            if (objItem.ShortcutString != "")
+            {
+                foreach (eShortcut key in objItem.Shortcuts)
+                {
+                    if (m_ShortcutTable.ContainsKey(key))
+                    {
+                        objEntry = (ShortcutTableEntry)m_ShortcutTable[key];
+                        try
+                        {
+                            objEntry.Items.Remove(objItem.Id);
+                            if (objEntry.Items.Count == 0)
+                                m_ShortcutTable.Remove(objEntry.Shortcut);
+                        }
+                        catch (System.ArgumentException) { }
+                    }
+                }
+            }
+            IOwner owner = this as IOwner;
+            foreach (BaseItem objTmp in objItem.SubItems)
+                owner.RemoveShortcutsFromItem(objTmp);
+        }
+
+        void IOwner.AddShortcutsFromItem(BaseItem objItem)
+        {
+            ShortcutTableEntry objEntry = null;
+            if (objItem.ShortcutString != "")
+            {
+                foreach (eShortcut key in objItem.Shortcuts)
+                {
+                    if (m_ShortcutTable.ContainsKey(key))
+                        objEntry = (ShortcutTableEntry)m_ShortcutTable[objItem.Shortcuts[0]];
+                    else
+                    {
+                        objEntry = new ShortcutTableEntry(key);
+                        m_ShortcutTable.Add(objEntry.Shortcut, objEntry);
+                    }
+                    try
+                    {
+                        objEntry.Items.Add(objItem.Id, objItem);
+                    }
+                    catch (System.ArgumentException) { }
+                }
+            }
+            IOwner owner = this as IOwner;
+            foreach (BaseItem objTmp in objItem.SubItems)
+                owner.AddShortcutsFromItem(objTmp);
+        }
+
+        /// <summary>
+        /// Gets or sets whether accelerator letters for menu or toolbar commands are underlined regardless of
+        /// current Windows settings. Accelerator keys allow easy access to menu commands by using
+        /// Alt + choosen key (letter). Default value is false which indicates that system setting is used
+        /// to determine whether accelerator letters are underlined. Setting this property to true
+        /// will always display accelerator letter underlined.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(false),DefaultValue(false),Category("Run-time Behavior"),Description("Indicates whether accelerator letters for menu or toolbar commands are underlined regardless of current Windows settings.")]
+        public bool AlwaysDisplayKeyAccelerators
+        {
+            get { return m_AlwaysDisplayKeyAccelerators; }
+            set
+            {
+                if (m_AlwaysDisplayKeyAccelerators != value)
+                {
+                    m_AlwaysDisplayKeyAccelerators = value;
+                    this.Refresh();
+                }
+            }
+        }
+
+        Form IOwner.ParentForm
+        {
+            get { return this.FindForm(); }
+            set { }
+        }
+
+        Form IOwner.ActiveMdiChild
+        {
+            get
+            {
+                Form form = this.FindForm();
+                if (form == null)
+                    return null;
+                if (form.IsMdiContainer)
+                    return form.ActiveMdiChild;
+                return null;
+            }
+        }
+        System.Windows.Forms.MdiClient IOwner.GetMdiClient(System.Windows.Forms.Form MdiForm)
+        {
+            return BarFunctions.GetMdiClient(MdiForm);
+        }
+
+        void IOwner.Customize() { }
+
+        private System.Windows.Forms.ImageList m_ImageList;
+        private System.Windows.Forms.ImageList m_ImageListMedium = null;
+        private System.Windows.Forms.ImageList m_ImageListLarge = null;
+        /// <summary>
+        /// ImageList for images used on Items. Images specified here will always be used on menu-items and are by default used on all Bars.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(false),DefaultValue(null),Category("Data"),Description("ImageList for images used on Items. Images specified here will always be used on menu-items and are by default used on all Bars.")]
+        public System.Windows.Forms.ImageList Images
+        {
+            get
+            {
+                return m_ImageList;
+            }
+            set
+            {
+                if (m_ImageList != null)
+                    m_ImageList.Disposed -= new EventHandler(this.ImageListDisposed);
+                m_ImageList = value;
+                if (m_ImageList != null)
+                    m_ImageList.Disposed += new EventHandler(this.ImageListDisposed);
+            }
+        }
+        /// <summary>
+        /// ImageList for medium-sized images used on Items.
+        /// </summary>
+        [Browsable(true), DefaultValue(null),Category("Data"),Description("ImageList for medium-sized images used on Items.")]
+        public System.Windows.Forms.ImageList ImagesMedium
+        {
+            get
+            {
+                return m_ImageListMedium;
+            }
+            set
+            {
+                if (m_ImageListMedium != null)
+                    m_ImageListMedium.Disposed -= new EventHandler(this.ImageListDisposed);
+                m_ImageListMedium = value;
+                if (m_ImageListMedium != null)
+                    m_ImageListMedium.Disposed += new EventHandler(this.ImageListDisposed);
+            }
+        }
+
+        /// <summary>
+        /// ImageList for large-sized images used on Items.
+        /// </summary>
+        [Browsable(true), DefaultValue(null),Category("Data"),Description("ImageList for large-sized images used on Items.")]
+        public System.Windows.Forms.ImageList ImagesLarge
+        {
+            get
+            {
+                return m_ImageListLarge;
+            }
+            set
+            {
+                if (m_ImageListLarge != null)
+                    m_ImageListLarge.Disposed -= new EventHandler(this.ImageListDisposed);
+                m_ImageListLarge = value;
+                if (m_ImageListLarge != null)
+                    m_ImageListLarge.Disposed += new EventHandler(this.ImageListDisposed);
+            }
+        }
+        private void ImageListDisposed(object sender, EventArgs e)
+        {
+            if (sender == m_ImageList)
+            {
+                this.Images = null;
+            }
+            else if (sender == m_ImageListLarge)
+            {
+                this.ImagesLarge = null;
+            }
+            else if (sender == m_ImageListMedium)
+            {
+                this.ImagesMedium = null;
+            }
+        }
+        #endregion
+
+        #region ISupportInitialize
+        /// <summary>
+        /// ISupportInitialize.BeginInit implementation.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Advanced)]
+        public void BeginInit()
+        {
+            m_LayoutSuspended = true;
+        }
+
+        /// <summary>
+        /// ISupportInitialize.EndInit implementation.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Advanced)]
+        public void EndInit()
+        {
+            m_LayoutSuspended = false;
+            if (this.DockSide == eDockSide.Document && this.Parent is DockSite)
+            {
+                ((DockSite)this.Parent).RecalcLayout();
+            }
+            else
+                this.RecalcSize();
+            if (this.AutoHide != m_AutoHideStateDelayed)
+                this.AutoHide = m_AutoHideStateDelayed;
+        }
+        #endregion
+
+        #region IBarDesignerServices
+        IBarItemDesigner IBarDesignerServices.Designer
+        {
+            get { return m_BarDesigner; }
+            set { m_BarDesigner = value; }
+        }
+        #endregion
+
+        #region IOwner
+        void IOwner.InvokeResetDefinition(BaseItem item, EventArgs e) { }
+        bool IOwner.ShowResetButton { get { return false; } set { } }
+        void IOwner.InvokeUserCustomize(object sender, EventArgs e) { }
+        void IOwner.InvokeEndUserCustomize(object sender, EndUserCustomizeEventArgs e) { }
+        bool IOwner.ShowShortcutKeysInToolTips { get { return true; } set { } }
+        void IOwner.StartItemDrag(BaseItem item)
+        {
+            if (this.DesignMode && m_BarDesigner != null)
+                m_BarDesigner.StartExternalDrag(item);
+        }
+        BaseItem IOwner.DragItem { get { return null; } }
+        bool IOwner.DragInProgress { get { return false; } }
+        void IOwner.OnApplicationActivate() { }
+        void IOwner.OnApplicationDeactivate()
+        {
+            ClosePopups();
+        }
+        void IOwner.OnParentPositionChanging() { }
+
+
+        private void MenuEventSupportHook()
+        {
+            if (m_MenuEventSupport)
+                return;
+            m_MenuEventSupport = true;
+
+            Form parentForm = this.FindForm();
+            if (parentForm == null)
+            {
+                m_MenuEventSupport = false;
+                return;
+            }
+            if (parentForm.IsMdiChild && parentForm.MdiParent != null)
+                parentForm = parentForm.MdiParent;
+
+            parentForm.Resize += new System.EventHandler(this.ParentResize);
+            parentForm.Deactivate += new System.EventHandler(this.ParentDeactivate);
+
+            DotNetBarManager.RegisterParentMsgHandler(this, parentForm);
+        }
+        private void MenuEventSupportUnhook()
+        {
+            if (!m_MenuEventSupport)
+                return;
+            m_MenuEventSupport = false;
+
+            Form parentForm = this.FindForm();
+            if (parentForm == null)
+                return;
+            if (parentForm.IsMdiChild && parentForm.MdiParent != null)
+                parentForm = parentForm.MdiParent;
+            DotNetBarManager.UnRegisterParentMsgHandler(this, parentForm);
+            parentForm.Resize -= new System.EventHandler(this.ParentResize);
+            parentForm.Deactivate -= new System.EventHandler(this.ParentDeactivate);
+        }
+        private void ParentResize(object sender, System.EventArgs e)
+        {
+            Form parentForm = this.FindForm();
+            if (parentForm.IsMdiChild && parentForm.MdiParent != null)
+                parentForm = parentForm.MdiParent;
+
+            if (parentForm != null && parentForm.WindowState == FormWindowState.Minimized)
+                ((IOwner)this).OnApplicationDeactivate();
+        }
+        private void ParentDeactivate(object sender, System.EventArgs e)
+        {
+            Form parentForm = this.FindForm();
+            if (parentForm != null && parentForm.IsMdiChild && parentForm.MdiParent != null)
+                parentForm = parentForm.MdiParent;
+
+            if (parentForm != null && parentForm.WindowState == FormWindowState.Minimized)
+                ((IOwner)this).OnApplicationDeactivate();
+        }
+        #endregion
+
+        #region IOwnerMenuSupport
+        private bool _UseHook = false;
+        /// <summary>
+        /// Gets or sets whether hooks are used for internal DotNetBar system functionality. Using hooks is recommended only if DotNetBar is used in hybrid environments like Visual Studio designers or IE.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), DefaultValue(false), System.ComponentModel.Category("Behavior"), System.ComponentModel.Description("Gets or sets whether hooks are used for internal DotNetBar system functionality. Using hooks is recommended only if DotNetBar is used in hybrid environments like Visual Studio designers or IE.")]
+        public bool UseHook
+        {
+            get
+            {
+                return _UseHook;
+            }
+            set
+            {
+                if (_UseHook == value)
+                    return;
+                _UseHook = value;
+            }
+        }
+
+        // IOwnerMenuSupport
+        private ArrayList m_RegisteredPopups = new ArrayList();
+        private bool m_FilterInstalled = false;
+        private Hook m_Hook = null;
+        bool IOwnerMenuSupport.PersonalizedAllVisible { get { return false; } set { } }
+        bool IOwnerMenuSupport.ShowFullMenusOnHover { get { return true; } set { } }
+        bool IOwnerMenuSupport.AlwaysShowFullMenus { get { return false; } set { } }
+
+        void IOwnerMenuSupport.RegisterPopup(PopupItem objPopup)
+        {
+            if (m_RegisteredPopups.Contains(objPopup))
+                return;
+
+            if (!this.DesignMode && !_UseHook)
+            {
+                if (!m_FilterInstalled)
+                {
+                    //System.Windows.Forms.Application.AddMessageFilter(this);
+                    MessageHandler.RegisterMessageClient(this);
+                    m_FilterInstalled = true;
+                }
+                if (!m_MenuEventSupport)
+                    MenuEventSupportHook();
+            }
+            else
+            {
+                if (m_Hook == null)
+                {
+                    m_Hook = new Hook(this);
+                }
+            }
+            if (m_RegisteredPopups.Count == 0)
+                PopupManager.RegisterPopup((IOwnerMenuSupport)this);
+            m_RegisteredPopups.Add(objPopup);
+            if (objPopup.GetOwner() != this)
+                objPopup.SetOwner(this);
+        }
+        void IOwnerMenuSupport.UnregisterPopup(PopupItem objPopup)
+        {
+            if (m_RegisteredPopups.Contains(objPopup))
+                m_RegisteredPopups.Remove(objPopup);
+            if (m_RegisteredPopups.Count == 0)
+            {
+                MenuEventSupportUnhook();
+                if (m_Hook != null)
+                {
+                    m_Hook.Dispose();
+                    m_Hook = null;
+                }
+                PopupManager.UnregisterPopup((IOwnerMenuSupport)this);
+            }
+        }
+        bool IOwnerMenuSupport.RelayMouseHover()
+        {
+            foreach (PopupItem popup in m_RegisteredPopups)
+            {
+                Control ctrl = popup.PopupControl;
+                if (ctrl != null && ctrl.DisplayRectangle.Contains(Control.MousePosition))
+                {
+                    if (ctrl is MenuPanel)
+                        ((MenuPanel)ctrl).InternalMouseHover();
+                    else if (ctrl is Bar)
+                        ((Bar)ctrl).InternalMouseHover();
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        void IOwnerMenuSupport.ClosePopups()
+        {
+            ClosePopups();
+        }
+
+        internal void ClosePopups()
+        {
+            ArrayList popupList = new ArrayList(m_RegisteredPopups);
+            foreach (PopupItem objPopup in popupList)
+            {
+                if (objPopup.QueryPopupClosing(eEventSource.Mouse))
+                    objPopup.ClosePopup();
+            }
+        }
+
+        // Events
+        void IOwnerMenuSupport.InvokePopupClose(PopupItem item, EventArgs e)
+        {
+            if (PopupClose != null)
+                PopupClose(item, e);
+        }
+        void IOwnerMenuSupport.InvokePopupContainerLoad(PopupItem item, EventArgs e)
+        {
+            if (PopupContainerLoad != null)
+                PopupContainerLoad(item, e);
+        }
+        void IOwnerMenuSupport.InvokePopupContainerUnload(PopupItem item, EventArgs e)
+        {
+            if (PopupContainerUnload != null)
+                PopupContainerUnload(item, e);
+        }
+        void IOwnerMenuSupport.InvokePopupOpen(PopupItem item, PopupOpenEventArgs e)
+        {
+            if (PopupOpen != null)
+                PopupOpen(item, e);
+        }
+        void IOwnerMenuSupport.InvokePopupShowing(PopupItem item, EventArgs e)
+        {
+            if (PopupShowing != null)
+                PopupShowing(item, e);
+        }
+        bool IOwnerMenuSupport.ShowPopupShadow { get { return true; } }
+        eMenuDropShadow IOwnerMenuSupport.MenuDropShadow { get { return eMenuDropShadow.SystemDefault; } set { } }
+        ePopupAnimation IOwnerMenuSupport.PopupAnimation { get { return ePopupAnimation.SystemDefault; } set { } }
+        bool IOwnerMenuSupport.AlphaBlendShadow { get { return true; } set { } }
+        #endregion
+
+        #region IMessageHandlerClient
+        internal bool IgnoreSysKeyUp
+        {
+            get { return m_IgnoreSysKeyUp; }
+            set { m_IgnoreSysKeyUp = value; }
+        }
+        internal bool EatSysKeyUp
+        {
+            get { return m_EatSysKeyUp; }
+            set { m_EatSysKeyUp = value; }
+        }
+        // IMessageHandlerClient Implementation
+        private bool m_DispatchShortcuts = false;
+        private bool m_IgnoreSysKeyUp = false, m_EatSysKeyUp = false, m_IgnoreF10Key = false;
+        bool IMessageHandlerClient.IsModal
+        {
+            get
+            {
+                Form form = this.FindForm();
+                if (form != null)
+                    return form.Modal;
+                return false;
+            }
+        }
+
+        bool IMessageHandlerClient.OnMouseWheel(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+            return false;
+        }
+
+        bool IMessageHandlerClient.OnKeyDown(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+            bool designMode = this.DesignMode;
+
+            int wParamInt = WinApi.ToInt(wParam);
+
+            if (m_RegisteredPopups.Count > 0)
+            {
+                BaseItem popup = ((BaseItem)m_RegisteredPopups[m_RegisteredPopups.Count - 1]);
+                Keys key = (Keys)NativeFunctions.MapVirtualKey((uint)wParam, 2);
+                if (key == Keys.None)
+                    key = (Keys)wParamInt;
+                if (popup.Parent == null || IsContextPopup(popup) || (key == Keys.Escape || key == Keys.Enter || key == Keys.Left || key == Keys.Right || key == Keys.Down || key == Keys.Up))
+                {
+                    PopupItem objItem = (PopupItem)m_RegisteredPopups[m_RegisteredPopups.Count - 1];
+
+                    Control ctrl = objItem.PopupControl as Control;
+                    Control ctrl2 = Control.FromChildHandle(hWnd);
+
+                    if (ctrl2 != null)
+                    {
+                        while (ctrl2.Parent != null)
+                            ctrl2 = ctrl2.Parent;
+                    }
+
+                    bool bIsOnHandle = false;
+                    if (ctrl2 != null && objItem != null)
+                        bIsOnHandle = objItem.IsAnyOnHandle(ctrl2.Handle);
+
+                    bool bNoEat = ctrl != null && ctrl2 != null && ctrl.Handle == ctrl2.Handle || bIsOnHandle;
+
+                    if (!bIsOnHandle)
+                    {
+                        objItem.InternalKeyDown(new KeyEventArgsEx(key, WinApi.ToAscii((uint)wParam)));
+                    }
+
+                    // Don't eat the message if the pop-up window has focus
+                    if (bNoEat)
+                        return false;
+                    return true && !designMode;
+                }
+            }
+
+            Form form = this.FindForm();
+            if (form == null || form != Form.ActiveForm && form.MdiParent == null ||
+                form.MdiParent != null && form.MdiParent.ActiveMdiChild != form)
+                return false;
+
+            if (wParamInt >= 0x70 || System.Windows.Forms.Control.ModifierKeys != Keys.None || (WinApi.ToInt(lParam) & 0x1000000000) != 0 || wParamInt == 0x2E || wParamInt == 0x2D) // 2E=VK_DELETE, 2D=VK_INSERT
+            {
+                int i = (int)System.Windows.Forms.Control.ModifierKeys | wParamInt;
+                return ProcessShortcut((eShortcut)i) && !designMode;
+            }
+            return false;
+        }
+
+        protected virtual bool IsContextPopup(BaseItem popup)
+        {
+            return false;
+        }
+        private bool ProcessShortcut(eShortcut key)
+        {
+            if (!IsHandlingShortcuts)
+                return false;
+            bool eat = BarFunctions.ProcessItemsShortcuts(key, m_ShortcutTable);
+            return !m_DispatchShortcuts && eat;
+            //			if(m_ShortcutTable.Contains(key))
+            //			{
+            //				ShortcutTableEntry objEntry=(ShortcutTableEntry)m_ShortcutTable[key];
+            //				// Must convert to independable array, since if this is for example
+            //				// close command first Click will destroy the collection we are
+            //				// iterating through and exception will be raised.
+            //				BaseItem[] arr=new BaseItem[objEntry.Items.Values.Count];
+            //				objEntry.Items.Values.CopyTo(arr,0);
+            //				Hashtable hnames=new Hashtable(arr.Length);
+            //
+            //				bool eat=false;
+            //
+            //				foreach(BaseItem objItem in arr)
+            //				{
+            //					if(objItem.CanRaiseClick && (objItem.Name=="" || !hnames.Contains(objItem.Name)))
+            //					{
+            //						eat=true;
+            //						objItem.RaiseClick();
+            //						if(objItem.Name!="")
+            //							hnames.Add(objItem.Name,"");
+            //					}
+            //				}
+            //				return !m_DispatchShortcuts && eat; // True will eat the key, false will pass it through
+            //			}
+            //			return false;
+        }
+        private bool IsHandlingShortcuts
+        {
+            get
+            {
+                Form form = this.FindForm();
+                Form activeForm = Form.ActiveForm;
+                if (form == null)
+                    return false;
+
+                if (form.IsMdiChild)
+                {
+                    if (form.MdiParent != null)
+                    {
+                        if (form.MdiParent.ActiveMdiChild == form && (form == activeForm || form.MdiParent == activeForm))
+                            return true;
+                        return false;
+                    }
+                }
+
+                return (form == Form.ActiveForm);
+            }
+        }
+        bool IMessageHandlerClient.OnMouseDown(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+            if (m_RegisteredPopups.Count == 0 || this.DesignMode)
+                return false;
+
+            //foreach(PopupItem objPopup in m_RegisteredPopups)
+            for (int i = m_RegisteredPopups.Count - 1; i >= 0; i--)
+            {
+                PopupItem objPopup = m_RegisteredPopups[i] as PopupItem;
+                System.Windows.Forms.Control objCtrl = objPopup.ContainerControl as System.Windows.Forms.Control;
+                bool bChildHandle = objPopup.IsAnyOnHandle(hWnd);
+
+                if (!bChildHandle)
+                {
+                    System.Windows.Forms.Control cTmp = System.Windows.Forms.Control.FromChildHandle(hWnd);
+                    if (cTmp != null)
+                    {
+                        if (cTmp is MenuPanel)
+                        {
+                            bChildHandle = true;
+                        }
+                        else
+                        {
+                            while (cTmp.Parent != null)
+                            {
+                                cTmp = cTmp.Parent;
+                                if (cTmp.GetType().FullName.IndexOf("DropDownHolder") >= 0 || cTmp is MenuPanel || cTmp is PopupContainerControl)
+                                {
+                                    bChildHandle = true;
+                                    break;
+                                }
+                            }
+                        }
+                        if (!bChildHandle)
+                            bChildHandle = objPopup.IsAnyOnHandle(cTmp.Handle);
+                    }
+                    else
+                    {
+                        string s = NativeFunctions.GetClassName(hWnd);
+                        s = s.ToLower();
+                        if (s.IndexOf("combolbox") >= 0)
+                            bChildHandle = true;
+                    }
+                }
+
+                if (!bChildHandle)
+                {
+                    Control popupContainer = objPopup.PopupControl;
+                    if (popupContainer != null)
+                        while (popupContainer.Parent != null) popupContainer = popupContainer.Parent;
+                    if (popupContainer != null && popupContainer.Bounds.Contains(Control.MousePosition))
+                        bChildHandle = true;
+                }
+
+                if (bChildHandle)
+                    break;
+
+                if (objCtrl != null && hWnd != objCtrl.Handle && !bChildHandle)
+                {
+                    if (objPopup.Expanded && objPopup.QueryPopupClosing(eEventSource.Mouse))
+                    {
+                        objPopup.Expanded = !objPopup.Expanded;
+                        if (!objPopup.Expanded && objPopup.Parent != null)
+                        {
+                            objPopup.Parent.AutoExpand = false;
+                        }
+                    }
+                }
+                else if (objCtrl == null && !bChildHandle)
+                {
+                    if (objPopup.QueryPopupClosing(eEventSource.Mouse))
+                        objPopup.ClosePopup();
+                }
+
+                if (m_RegisteredPopups.Count == 0)
+                    break;
+            }
+            return false;
+        }
+
+        bool IMessageHandlerClient.OnMouseMove(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+            if (m_RegisteredPopups.Count > 0)
+            {
+                foreach (BaseItem item in m_RegisteredPopups)
+                {
+                    if (item.Parent == null)
+                    {
+                        Control ctrl = ((PopupItem)item).PopupControl;
+                        if (ctrl != null && ctrl.Handle != hWnd && !item.IsAnyOnHandle(hWnd) && !(ctrl.Parent != null && ctrl.Parent.Handle != hWnd))
+                            return true;
+                    }
+                }
+            }
+            return false;
+        }
+
+        private bool _ProcessMnemonics = true;
+        /// <summary>
+        /// Indicates whether mnemonic keys, accelerator keys, which are set through item Text property used ampersand character are processed by control.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether mnemonic keys, accelerator keys, which are set through item Text property used ampersand character are processed by control.")]
+        public bool ProcessMnemonics
+        {
+            get { return _ProcessMnemonics; }
+            set
+            {
+                _ProcessMnemonics = value;
+            }
+        }
+        
+
+        protected override bool ProcessMnemonic(char charCode)
+        {
+            if (!this.MenuBar && _ProcessMnemonics)
+            {
+                foreach(BaseItem objItem in this.Items)
+			    {
+                    if (objItem.Visible && objItem.GetEnabled() && objItem.Displayed && objItem.AccessKeyEnabled && objItem.AccessKey == charCode)
+                    {
+                        objItem.RaiseClick(eEventSource.Keyboard);
+                        return true;
+                    }
+                }
+            }
+
+            return base.ProcessMnemonic(charCode);
+        }
+
+        protected virtual bool InternalSysKeyDown(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+            int wParamInt = WinApi.ToInt(wParam);
+            if (wParamInt == 18 && System.Windows.Forms.Control.ModifierKeys == System.Windows.Forms.Keys.Alt)
+                this.ClosePopups();
+
+            Form form = this.FindForm();
+            if (form == null || !BarFunctions.IsFormActive(form))
+                return false;
+
+            Bar bar = null;
+            if (this.MenuBar)
+                bar = this;
+            if (bar != null && bar.ItemsContainer != null && !bar.ItemsContainer.DesignMode)
+            {
+                GenericItemContainer cont = bar.ItemsContainer;
+                if (cont == null)
+                    return false;
+                if (wParamInt == 18 || (wParamInt == 121 && !m_IgnoreF10Key && (System.Windows.Forms.Control.ModifierKeys == System.Windows.Forms.Keys.None || System.Windows.Forms.Control.ModifierKeys == System.Windows.Forms.Keys.Alt)))
+                {
+                    if (cont.ExpandedItem() != null && bar.Focused)
+                    {
+                        bar.ReleaseFocus();
+                        m_IgnoreSysKeyUp = true;
+                        return true;
+                    }
+                }
+                else
+                {
+                    // Check Shortcuts
+                    if (System.Windows.Forms.Control.ModifierKeys != Keys.None || wParamInt >= (int)eShortcut.F1 && wParamInt <= (int)eShortcut.F12)
+                    {
+                        int i = (int)System.Windows.Forms.Control.ModifierKeys | wParamInt;
+                        if (ProcessShortcut((eShortcut)i))
+                            return true;
+                    }
+                    m_IgnoreSysKeyUp = true;
+                    if (wParamInt >= 27 && wParamInt <= 111) // VK_ESC - VK_DIVIDE range
+                    {
+                        int key = (int)NativeFunctions.MapVirtualKey((uint)wParam, 2);
+                        if (key == 0)
+                            key = wParamInt;
+                        if (key > 0 && cont.SysKeyDown(key))
+                            return true;
+                    }
+                }
+            }
+            else if (bar == null && !this.DesignMode)
+            {
+                // Check Shortcuts
+                if (System.Windows.Forms.Control.ModifierKeys != Keys.None || wParamInt >= (int)eShortcut.F1 && wParamInt <= (int)eShortcut.F12)
+                {
+                    int i = (int)System.Windows.Forms.Control.ModifierKeys | wParamInt;
+                    if (ProcessShortcut((eShortcut)i))
+                        return true;
+                }
+            }
+
+            if (System.Windows.Forms.Control.ModifierKeys == System.Windows.Forms.Keys.Alt && wParamInt > 0x1B)
+            {
+                m_IgnoreSysKeyUp = true;
+                int key = (int)NativeFunctions.MapVirtualKey((uint)wParam, 2);
+                if (key != 0)
+                {
+                    if (!this.DesignMode)
+                    {
+                        if (m_ItemContainer.SysKeyDown(key))
+                            return true;
+                    }
+                }
+            }
+            return false;
+        }
+
+        bool IMessageHandlerClient.OnSysKeyDown(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+            return InternalSysKeyDown(hWnd, wParam, lParam);
+        }
+        bool IMessageHandlerClient.OnSysKeyUp(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+            Form form = this.FindForm();
+            if (form == null || this.DesignMode || !BarFunctions.IsFormActive(form))
+                return false;
+
+            int wParamInt = WinApi.ToInt(wParam);
+            if (wParamInt == 18 || wParamInt == 121)
+            {
+                if (m_IgnoreSysKeyUp)
+                {
+                    m_IgnoreSysKeyUp = false;
+                    return false;
+                }
+                if (m_EatSysKeyUp)
+                {
+                    m_EatSysKeyUp = false;
+                    return true;
+                }
+                if (wParamInt == 18 || wParamInt == 121 && !m_IgnoreF10Key)
+                {
+                    DevComponents.DotNetBar.Bar bar = null;
+                    if (this.MenuBar)
+                        bar = this;
+                    if (bar != null && !bar.ItemsContainer.DesignMode)
+                    {
+                        if (bar.Focused)
+                            bar.ReleaseFocus();
+                        else
+                            bar.SetSystemFocus();
+                        return true;
+                    }
+                }
+            }
+            return false;
+        }
+        #endregion
+
+        #region BarAccessibleObject
+        public class BarAccessibleObject : System.Windows.Forms.Control.ControlAccessibleObject
+        {
+            Bar m_Owner = null;
+            public BarAccessibleObject(Bar owner)
+                : base(owner)
+            {
+                m_Owner = owner;
+            }
+
+            internal void GenerateEvent(BaseItem sender, System.Windows.Forms.AccessibleEvents e)
+            {
+                int iChild = m_Owner.Items.IndexOf(sender);
+                if (iChild >= 0)
+                {
+                    if (m_Owner != null && !m_Owner.IsDisposed)
+                        m_Owner.AccessibilityNotifyClients(e, iChild);
+                }
+            }
+
+            public override AccessibleRole Role
+            {
+                get
+                {
+                    if (m_Owner != null && !m_Owner.IsDisposed)
+                        return m_Owner.AccessibleRole;
+                    return System.Windows.Forms.AccessibleRole.None;
+                }
+            }
+
+            public override AccessibleObject Parent
+            {
+                get
+                {
+                    if (m_Owner != null && m_Owner.Parent is DockSite)
+                        return m_Owner.Parent.AccessibilityObject;
+                    return base.Parent;
+                }
+            }
+
+            public override Rectangle Bounds
+            {
+                get
+                {
+                    if (m_Owner != null && !m_Owner.IsDisposed && m_Owner.Parent != null)
+                        return this.m_Owner.Parent.RectangleToScreen(m_Owner.Bounds);
+                    return Rectangle.Empty;
+                }
+            }
+
+            public override int GetChildCount()
+            {
+                if (m_Owner != null && !m_Owner.IsDisposed && m_Owner.Items != null)
+                    return m_Owner.Items.Count;
+                return 0;
+            }
+
+            public override System.Windows.Forms.AccessibleObject GetChild(int iIndex)
+            {
+                if (m_Owner != null && !m_Owner.IsDisposed && m_Owner.Items != null)
+                    return m_Owner.Items[iIndex].AccessibleObject;
+                return null;
+            }
+
+            public override AccessibleStates State
+            {
+                get
+                {
+                    AccessibleStates state;
+                    if (m_Owner == null || m_Owner.IsDisposed)
+                        return AccessibleStates.None;
+
+                    if (m_Owner.GrabHandleStyle != eGrabHandleStyle.None && m_Owner.GrabHandleStyle != eGrabHandleStyle.ResizeHandle)
+                    {
+                        state = AccessibleStates.Moveable;
+                        if (m_Owner.DockSide == eDockSide.None)
+                            state = state | AccessibleStates.Floating;
+                    }
+                    else
+                        state = AccessibleStates.None;
+                    return state;
+                }
+            }
+
+            public override AccessibleObject Navigate(AccessibleNavigation navdir)
+            {
+                if (navdir == AccessibleNavigation.FirstChild)
+                {
+                    if (m_Owner.Items.Count > 0) return m_Owner.Items[0].AccessibleObject;
+                }
+                else if (navdir == AccessibleNavigation.LastChild)
+                {
+                    if (m_Owner.Items.Count > 0) return m_Owner.Items[m_Owner.Items.Count - 1].AccessibleObject;
+                }
+                else if (navdir == AccessibleNavigation.Next)
+                {
+                    return null;
+                    Control parent = m_Owner.Parent;
+                    if (parent != null && parent.Controls.IndexOf(m_Owner) < parent.Controls.Count - 1)
+                    {
+                        return parent.Controls[parent.Controls.IndexOf(m_Owner) + 1].AccessibilityObject;
+                    }
+                }
+                else if (navdir == AccessibleNavigation.Previous)
+                {
+                    return null;
+                    Control parent = m_Owner.Parent;
+                    if (parent != null && parent.Controls.IndexOf(m_Owner) > 0)
+                    {
+                        return parent.Controls[parent.Controls.IndexOf(m_Owner) - 1].AccessibilityObject;
+                    }
+                }
+                else if (navdir == AccessibleNavigation.Down)
+                {
+                    return null;
+                    if (m_Owner.Items.Count > 0) return m_Owner.Items[0].AccessibleObject;
+                }
+                else if (navdir == AccessibleNavigation.Up)
+                {
+                    return null;
+                    if (m_Owner.Parent != null) return m_Owner.Parent.AccessibilityObject;
+                }
+                return base.Navigate(navdir);
+            }
+        }
+        #endregion
+
+        #region IDockInfo
+        /// <summary>
+        /// Specifes whether Bar can be docked on Top dock site or not. Does not apply to stand alone bars.
+        /// </summary>
+        bool IDockInfo.CanDockTop
+        {
+            get { return this.CanDockTop; }
+        }
+
+        /// <summary>
+        /// Specifes whether Bar can be docked on Bottom dock site or not. Does not apply to stand alone bars.
+        /// </summary>
+        bool IDockInfo.CanDockBottom
+        {
+            get { return this.CanDockBottom; }
+        }
+
+        /// <summary>
+        /// Specifes whether Bar can be docked on Left dock site or not. Does not apply to stand alone bars.
+        /// </summary>
+        bool IDockInfo.CanDockLeft
+        {
+            get { return this.CanDockLeft; }
+        }
+
+        /// <summary>
+        /// Specifes whether Bar can be docked on Right dock site or not. Does not apply to stand alone bars.
+        /// </summary>
+        bool IDockInfo.CanDockRight
+        {
+            get { return this.CanDockRight; }
+        }
+
+        /// <summary>
+        /// Specifes whether Bar can be docked as document. Default value is false. See DotNetBarManager.EnableDocumentDocking for more details.
+        /// </summary>
+        bool IDockInfo.CanDockDocument
+        {
+            get { return this.CanDockDocument; }
+        }
+
+        /// <summary>
+        /// Returns Minimum docked size of the control.
+        /// </summary>
+        System.Drawing.Size IDockInfo.MinimumDockSize(eOrientation dockOrientation)
+        {
+            return this.MinimumDockSize(dockOrientation);
+        }
+        /// <summary>
+        /// Returns Preferrred size of the docked control.
+        /// </summary>
+        System.Drawing.Size IDockInfo.PreferredDockSize(eOrientation dockOrientation)
+        {
+            return this.PreferredDockSize(dockOrientation);
+        }
+
+        /// <summary>
+        ///  Indicated whether control can be stretched to fill dock site.
+        /// </summary>
+        bool IDockInfo.Stretch
+        {
+            get { return this.Stretch; }
+            set { this.Stretch = value; }
+        }
+        /// <summary>
+        /// Holds the left position (dock offset) of the control.
+        /// </summary>
+        int IDockInfo.DockOffset
+        {
+            get { return this.DockOffset; }
+            set { this.DockOffset = value; }
+        }
+        /// <summary>
+        /// Specifies the dock line for the control.
+        /// </summary>
+        int IDockInfo.DockLine
+        {
+            get { return this.DockLine; }
+            set { this.DockLine = value; }
+        }
+        /// <summary>
+        /// Specifies current dock orientation.
+        /// </summary>
+        eOrientation IDockInfo.DockOrientation
+        {
+            get { return this.DockOrientation; }
+            set { this.DockOrientation = value; }
+        }
+        /// <summary>
+        /// Gets whether control is docked.
+        /// </summary>
+        bool IDockInfo.Docked
+        {
+            get { return this.Docked; }
+        }
+        /// <summary>
+        /// Returns the dock site of the control.
+        /// </summary>
+        System.Windows.Forms.Control IDockInfo.DockedSite
+        {
+            get { return this.DockedSite; }
+        }
+        /// <summary>
+        /// Gets or sets the control dock side.
+        /// </summary>
+        eDockSide IDockInfo.DockSide
+        {
+            get { return this.DockSide; }
+            set { this.DockSide = value; }
+        }
+        /// <summary>
+        /// Sets the dock line for the control. Used internaly by dock manager.
+        /// </summary>
+        /// <param name="iLine">New Dock line.</param>
+        void IDockInfo.SetDockLine(int iLine)
+        {
+            this.SetDockLine(iLine);
+        }
+        /// <summary>
+        /// Gets or sets whether bar is locked to prevent docking below it.
+        /// </summary>
+        bool IDockInfo.LockDockPosition
+        {
+            get { return this.LockDockPosition; }
+            set { this.LockDockPosition = value; }
+        }
+        #endregion
+
+        #region Design Time Drag & Drop
+        private bool m_DragDropInProgress = false;
+        private int m_InsertPosition = -1;
+        private bool m_InsertBefore = false;
+        private IDesignTimeProvider m_DesignTimeProvider = null;
+        private BaseItem m_DragItem = null;
+        private IDesignTimeProvider m_DragDropDesignTimeProvider = null;
+
+        private ISite GetSite()
+        {
+            ISite site = null;
+            IOwner owner = this.Owner as IOwner;
+            Control c = null;
+            if (owner is Control)
+            {
+                c = owner as Control;
+            }
+
+            if (m_ParentItem != null && m_ParentItem.ContainerControl is Control && (c == null || c != null && c.Site == null))
+            {
+                c = m_ParentItem.ContainerControl as Control;
+            }
+
+            if (c != null)
+            {
+                while (site == null && c != null)
+                {
+                    if (c.Site != null && c.Site.DesignMode)
+                        site = c.Site;
+                    else
+                        c = c.Parent;
+                }
+            }
+
+            if (site == null && m_ParentItem != null)
+            {
+                BaseItem item = m_ParentItem;
+                while (site == null && item != null)
+                {
+                    if (item.Site != null && item.Site.DesignMode)
+                        site = item.Site;
+                    else
+                        item = item.Parent;
+                }
+            }
+
+            return site;
+        }
+
+        private void DesignTimeMouseMove(MouseEventArgs e)
+        {
+            if (m_DragDropInProgress)
+            {
+                try
+                {
+                    if (m_DesignTimeProvider != null)
+                    {
+                        m_DesignTimeProvider.DrawReversibleMarker(m_InsertPosition, m_InsertBefore);
+                        m_DesignTimeProvider = null;
+                    }
+
+                    InsertPosition pos = m_DragDropDesignTimeProvider.GetInsertPosition(Control.MousePosition, m_DragItem);
+                    if (pos != null)
+                    {
+                        if (pos.TargetProvider == null)
+                        {
+                            // Cursor is over drag item
+                            System.Windows.Forms.Cursor.Current = System.Windows.Forms.Cursors.No;
+                        }
+                        else
+                        {
+                            pos.TargetProvider.DrawReversibleMarker(pos.Position, pos.Before);
+                            m_InsertPosition = pos.Position;
+                            m_InsertBefore = pos.Before;
+                            m_DesignTimeProvider = pos.TargetProvider;
+                            System.Windows.Forms.Cursor.Current = System.Windows.Forms.Cursors.Hand;
+                        }
+                    }
+                    else
+                    {
+                        System.Windows.Forms.Cursor.Current = System.Windows.Forms.Cursors.No;
+                    }
+                }
+                catch
+                {
+                    m_DesignTimeProvider = null;
+                }
+            }
+            else
+            {
+                if (m_Owner is IOwner)
+                    m_DragItem = ((IOwner)m_Owner).GetFocusItem();
+                if (m_DragItem != null)
+                {
+                    // Get top level design-time provider
+                    BaseItem item = m_ParentItem;
+                    while (item.Parent is IDesignTimeProvider)
+                        item = item.Parent;
+                    m_DragDropDesignTimeProvider = (IDesignTimeProvider)item;
+
+                    m_DragDropInProgress = true;
+                    this.Capture = true;
+                }
+            }
+        }
+
+        private void DesignTimeMouseUp(MouseEventArgs e)
+        {
+            ISite site = GetSite();
+            if (site == null)
+                return;
+            IComponentChangeService cc = site.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+
+            if (m_DesignTimeProvider != null)
+            {
+                m_DesignTimeProvider.DrawReversibleMarker(m_InsertPosition, m_InsertBefore);
+                BaseItem objParent = m_DragItem.Parent;
+                if (objParent != null)
+                {
+                    if (objParent == (BaseItem)m_DesignTimeProvider && m_InsertPosition > 0)
+                    {
+                        if (objParent.SubItems.IndexOf(m_DragItem) < m_InsertPosition)
+                            m_InsertPosition--;
+                    }
+                    if (cc != null)
+                        cc.OnComponentChanging(objParent, TypeDescriptor.GetProperties(objParent)["SubItems"]);
+
+                    objParent.SubItems.Remove(m_DragItem);
+
+                    if (cc != null)
+                        cc.OnComponentChanged(objParent, TypeDescriptor.GetProperties(objParent)["SubItems"], null, null);
+
+                    Control ctrl = objParent.ContainerControl as Control;
+                    if (ctrl is Bar)
+                        ((Bar)ctrl).RecalcLayout();
+                    else if (ctrl is MenuPanel)
+                        ((MenuPanel)ctrl).RecalcSize();
+                }
+
+                m_DesignTimeProvider.InsertItemAt(m_DragItem, m_InsertPosition, m_InsertBefore);
+
+                m_DesignTimeProvider = null;
+
+            }
+            m_DragDropDesignTimeProvider = null;
+            m_DragItem = null;
+            m_DragDropInProgress = false;
+            this.Capture = false;
+        }
+
+        private void DesignTimeMouseDown(MouseEventArgs e)
+        {
+            IOwner owner = this.Owner as IOwner;
+            BaseItem objNew = m_ItemContainer.ItemAtLocation(e.X, e.Y);
+            // Ignore system items
+            if (objNew != null && objNew.SystemItem)
+                objNew = null;
+
+            if (objNew == null)
+                return;
+
+            if (owner != null)
+            {
+                owner.SetFocusItem(objNew);
+                ISite site = GetSite();
+                if (site != null)
+                {
+                    ISelectionService selection = (ISelectionService)site.GetService(typeof(ISelectionService));
+                    if (selection != null)
+                    {
+                        ArrayList arr = new ArrayList(1);
+                        arr.Add(objNew);
+#if FRAMEWORK20
+                        selection.SetSelectedComponents(arr, SelectionTypes.Primary);
+#else
+                            selection.SetSelectedComponents(arr,SelectionTypes.MouseDown);
+#endif
+                    }
+                    if (e.Button == MouseButtons.Right)
+                    {
+                        IMenuCommandService service1 = (IMenuCommandService)site.GetService(typeof(IMenuCommandService));
+                        if (service1 != null)
+                        {
+                            service1.ShowContextMenu(new CommandID(new Guid("{74D21312-2AEE-11d1-8BFB-00A0C90F26F7}"), 0x500)/*System.Windows.Forms.Design.MenuCommands.SelectionMenu*/, Control.MousePosition.X, Control.MousePosition.Y);
+                        }
+                    }
+                }
+            }
+            owner = null;
+            if (objNew != null)
+                objNew.InternalMouseDown(e);
+        }
+        #endregion
+
+        #region IOwnerLocalize Implementation
+        void IOwnerLocalize.InvokeLocalizeString(LocalizeEventArgs e)
+        {
+            if (LocalizeString != null)
+                LocalizeString(this, e);
+        }
+        #endregion
+    }
+
+    #region FloatingContainer
+    [ToolboxItem(false)]
+    internal class FloatingContainer : Form
+    {
+        const int WM_MOUSEACTIVATE = 0x21;
+        const int MA_NOACTIVATE = 3;
+        //const int MA_NOACTIVATEANDEAT = 4;
+        Bar m_Bar;
+        private Size m_OldSize = Size.Empty;
+        public FloatingContainer(Bar objBar)
+        {
+            m_Bar = objBar;
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.ControlBox = false;
+            this.ShowInTaskbar = false;
+            IOwner owner = objBar.Owner as IOwner;
+            if (owner != null)
+                this.Owner = owner.ParentForm;
+            this.StartPosition = FormStartPosition.Manual;
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.SetStyle(ControlStyles.Selectable, false);
+            this.SetStyle(ControlStyles.Opaque, true);
+            this.SetStyle(ControlStyles.ResizeRedraw, true);
+            this.Font = objBar.Font;
+        }
+        private bool m_CodeClose = false;
+        public new void Close()
+        {
+            m_CodeClose = true;
+            base.Close();
+        }
+        protected override void OnClosing(CancelEventArgs e)
+        {
+            if (this.Visible)
+            {
+                if (!m_CodeClose)
+                {
+                    e.Cancel = true;
+                    if (m_Bar != null)
+                        m_Bar.CloseBar();
+                }
+            }
+            base.OnClosing(e);
+        }
+        
+        public void RefreshRegion(System.Drawing.Size sz)
+        {
+            if (m_Bar == null || m_OldSize == sz)
+                return;
+
+            if (!m_Bar.IsThemed)
+                return;
+
+            m_OldSize = sz;
+
+            ThemeWindow theme = m_Bar.ThemeWindow;
+            Graphics g = this.CreateGraphics();
+            try
+            {
+                IntPtr r = theme.GetThemeBackgroundRegion(g, ThemeWindowParts.SmallCaption, ThemeWindowStates.CaptionActive, new Rectangle(0, 0, sz.Width, sz.Height));
+                if (r != IntPtr.Zero)
+                {
+                    NativeFunctions.SetWindowRgn(this.Handle, r, true);
+                }
+            }
+            finally
+            {
+                g.Dispose();
+            }
+        }
+        protected override void WndProc(ref Message m)
+        {
+            if (m.Msg == WM_MOUSEACTIVATE && m_Bar.LayoutType != eLayoutType.DockContainer)
+            {
+                m.Result = new System.IntPtr(MA_NOACTIVATE);
+                return;
+            }
+            base.WndProc(ref m);
+        }
+        protected override void OnActivated(EventArgs e)
+        {
+            base.OnActivated(e);
+            if (m_Bar != null && m_Bar.LayoutType == eLayoutType.DockContainer)
+            {
+                m_Bar.SetHasFocus(true);
+            }
+        }
+
+        protected override void OnDeactivate(EventArgs e)
+        {
+            base.OnDeactivate(e);
+            if (m_Bar != null && m_Bar.LayoutType == eLayoutType.DockContainer)
+            {
+                m_Bar.SetHasFocus(false);
+            }
+        }
+    }
+    #endregion
+
+    #region Custom Rendering Support
+    /// <summary>
+    /// Defines delegate for the PreRender and PostRender Bar control events.
+    /// </summary>
+    public delegate void RenderBarEventHandler(object sender, RenderBarEventArgs e);
+
+    /// <summary>
+    /// Represents event arguments for PreRender and PostRender Bar control event.
+    /// </summary>
+    public class RenderBarEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets the reference to the Bar being rendered.
+        /// </summary>
+        public readonly Bar Bar;
+
+        /// <summary>
+        /// Gets or sets the rectangle of the part being rendered. Certain parts of bar like the title buttons allow you to set this property to the custom size of your button.
+        /// Default value is the system size of the part being rendered.
+        /// </summary>
+        public Rectangle Bounds = Rectangle.Empty;
+
+        /// <summary>
+        /// Gets the Bar part being rendered.
+        /// </summary>
+        public readonly eBarRenderPart Part = eBarRenderPart.Background;
+
+        /// <summary>
+        /// When used in PreRender event allows you to cancel the default rendering by setting this property to true.
+        /// </summary>
+        public bool Cancel = false;
+
+        /// <summary>
+        /// Gets the reference to the Graphics object to render the tab on.
+        /// </summary>
+        public readonly Graphics Graphics;
+
+        /// <summary>
+        /// Creates new instance of the class and initializes it with default values.
+        /// </summary>
+        public RenderBarEventArgs(Bar bar, Graphics g, eBarRenderPart part, Rectangle bounds)
+        {
+            this.Bar = bar;
+            this.Part = part;
+            this.Bounds = bounds;
+            this.Graphics = g;
+        }
+    }
+
+    /// <summary>
+    /// Defines the part of the Bar control for custom rendering.
+    /// </summary>
+    public enum eBarRenderPart
+    {
+        /// <summary>
+        /// Indicates the Bar background and border.
+        /// </summary>
+        Background,
+        /// <summary>
+        /// Indicates the Bar caption.
+        /// </summary>
+        Caption,
+        /// <summary>
+        /// Indicates the Bar close button displayed inside of caption.
+        /// </summary>
+        CloseButton,
+        /// <summary>
+        /// Indicates the Bar customize button displayed inside of caption.
+        /// </summary>
+        CustomizeButton,
+        /// <summary>
+        /// Indicates the Bar caption text.
+        /// </summary>
+        CaptionText,
+        /// <summary>
+        /// Indicates the Bar grab handle.
+        /// </summary>
+        GrabHandle,
+        /// <summary>
+        /// Indicates the Bar resize handle.
+        /// </summary>
+        ResizeHandle,
+        /// <summary>
+        /// Indicates the Bar auto-hide button displayed inside of caption.
+        /// </summary>
+        AutoHideButton,
+        /// <summary>
+        /// Indicates the Bar caption task pane.
+        /// </summary>
+        CaptionTaskPane,
+        /// <summary>
+        /// Indicates the Bar maximize button displayed inside of caption.
+        /// </summary>
+        MaximizeButton,
+        /// <summary>
+        /// Indicates the complete bar area. This part is used for the PostRender event.
+        /// </summary>
+        All
+
+    }
+    #endregion
+
+    #region BarStateChanged Event Support
+    /// <summary>
+    /// Defines delegate for BarStateChanged event.
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    public delegate void BarStateChangedEventHandler(object sender, BarStateChangedEventArgs e);
+    /// <summary>
+    /// Provides event arguments for ActiveDockContainerChanged event.
+    /// </summary>
+    public class BarStateChangedEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets the Bar that is changed.
+        /// </summary>
+        public readonly Bar Bar;
+        /// <summary>
+        /// Gets the type of the change that affected the bar.
+        /// </summary>
+        public readonly eBarStateChange AffectedState;
+        /// <summary>
+        /// Provides any optional context information about the state change.
+        /// </summary>
+        public object ContextInformation;
+        /// <summary>
+        /// Initializes a new instance of the BarStateChangedEventArgs class.
+        /// </summary>
+        /// <param name="bar"></param>
+        /// <param name="affectedState"></param>
+        public BarStateChangedEventArgs(Bar bar, eBarStateChange affectedState)
+        {
+            Bar = bar;
+            AffectedState = affectedState;
+        }
+        /// <summary>
+        /// Initializes a new instance of the BarStateChangedEventArgs class.
+        /// </summary>
+        /// <param name="bar"></param>
+        /// <param name="affectedState"></param>
+        /// <param name="contextInformation"></param>
+        public BarStateChangedEventArgs(Bar bar, eBarStateChange affectedState, object contextInformation)
+        {
+            Bar = bar;
+            AffectedState = affectedState;
+            ContextInformation = contextInformation;
+        }
+    }
+    /// <summary>
+    /// Defines bar state changes for BarStateChanged event.
+    /// </summary>
+    public enum eBarStateChange
+    {
+        /// <summary>
+        /// Indicates that Bar selected dock tab is about to change.
+        /// </summary>
+        SelectedDockTabChanging,
+        /// <summary>
+        /// Indicates that Bar selected dock tab has changed.
+        /// </summary>
+        SelectedDockTabChanged,
+        /// <summary>
+        /// Indicates that bar docking has changed and bar was docked.
+        /// </summary>
+        BarDocked,
+        /// <summary>
+        /// Indicates that bar has been undocked from dock site.
+        /// </summary>
+        BarUndocked,
+        /// <summary>
+        /// Indicates that bar dock tab has closed.
+        /// </summary>
+        DockTabClosed,
+        /// <summary>
+        /// Indicates that bar in auto-hide state has been folded, i.e. returned to collapsed state.
+        /// </summary>
+        AutoHideFolded,
+        /// <summary>
+        /// Indicates that bar in auto-hide state has been open, shown.
+        /// </summary>
+        AutoHideOpen,
+        /// <summary>
+        /// Indicates that bar AutoHide property has changed meaning that bar has been either placed in auto-hide mode or taken out of auto-hide mode.
+        /// </summary>
+        AutoHideChanged,
+        /// <summary>
+        /// Indicates that tab has been moved within a bar tab-strip by end user.
+        /// </summary>
+        DockTabMoved
+    }
+    #endregion
+
+    public class KeyEventArgsEx:KeyEventArgs
+    {
+        public char KeyChar = '\0';
+        public KeyEventArgsEx(Keys keyData, char keyChar):base(keyData)
+        {
+            this.KeyChar = keyChar;
+        }
+    }
+
+    /// <summary>
+    /// Specifies the behavior of bar when its title is double clicked.
+    /// </summary>
+    public enum eDoubleClickBarBehavior
+    {
+        /// <summary>
+        /// Double clicking bar title does not do anything.
+        /// </summary>
+        None,
+        /// <summary>
+        /// Double clicking bar title when bar is docked will float the bar if CanUndock=true
+        /// </summary>
+        Float,
+        /// <summary>
+        /// Double clicking floating bar title will re-dock it if any of CanDock*** properties is true.
+        /// </summary>
+        ReDock,
+        /// <summary>
+        /// Double clicking will toggle bar state between float and dock state if all CanDock*** and CanUndock properties allow it.
+        /// </summary>
+        FloatAndReDock
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Bar.ico b/PROMS/DotNetBar Source Code/Bar.ico
new file mode 100644
index 00000000..494cb4e6
Binary files /dev/null and b/PROMS/DotNetBar Source Code/Bar.ico differ
diff --git a/PROMS/DotNetBar Source Code/BarBaseControl.cs b/PROMS/DotNetBar Source Code/BarBaseControl.cs
new file mode 100644
index 00000000..e69faed3
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/BarBaseControl.cs	
@@ -0,0 +1,2337 @@
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.Drawing;
+using System.Data;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.Rendering;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Represents base control for bars.
+	/// </summary>
+	[ToolboxItem(false),System.Runtime.InteropServices.ComVisible(false)]
+	public abstract class BarBaseControl: System.Windows.Forms.Control,
+        IOwner, IOwnerMenuSupport, IMessageHandlerClient, IOwnerItemEvents, IThemeCache, IOwnerLocalize, IBarDesignerServices, IRenderingSupport,
+        IAccessibilitySupport
+	{
+		// Events
+		#region Event Definition
+        /// <summary>
+        /// Occurs when Checked property of an button has changed.
+        /// </summary>
+        public event EventHandler ButtonCheckedChanged;
+		/// <summary>
+		/// Represents the method that will handle the ItemRemoved event.
+		/// </summary>
+		public delegate void ItemRemovedEventHandler(object sender, ItemRemovedEventArgs e);
+
+		/// <summary>
+		/// Occurs when Item is clicked.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when Item is clicked.")]
+		public event EventHandler ItemClick;
+
+        /// <summary>
+        /// Occurs when Item is clicked.
+        /// </summary>
+        [Description("Occurs when Item is double-clicked.")]
+        public event MouseEventHandler ItemDoubleClick;
+
+		/// <summary>
+		/// Occurs when popup of type container is loading.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when popup of type container is loading.")]
+		public event EventHandler PopupContainerLoad;
+
+		/// <summary>
+		/// Occurs when popup of type container is unloading.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when popup of type container is unloading.")]
+		public event EventHandler PopupContainerUnload;
+
+		/// <summary>
+		/// Occurs when popup item is about to open.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when popup item is about to open.")]
+		public event EventHandler PopupOpen;
+
+		/// <summary>
+		/// Occurs when popup item is closing.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when popup item is closing.")]
+		public event EventHandler PopupClose;
+
+		/// <summary>
+		/// Occurs just before popup window is shown.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs just before popup window is shown.")]
+		public event EventHandler PopupShowing;
+
+		/// <summary>
+		/// Occurs when Item Expanded property has changed.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when Item Expanded property has changed.")]
+		public event EventHandler ExpandedChange;
+
+		private MouseEventHandler EventMouseDown;
+		/// <summary>
+		/// Occurs when mouse button is pressed.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when mouse button is pressed.")]
+		new public event MouseEventHandler MouseDown 
+		{
+			add { EventMouseDown += value; }
+			remove { EventMouseDown -= value; }
+		}
+
+		private MouseEventHandler EventMouseUp;
+		/// <summary>
+		/// Occurs when mouse button is released.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when mouse button is released.")]
+		new public event MouseEventHandler MouseUp
+		{
+			add { EventMouseUp += value; }
+			remove { EventMouseUp -= value; }
+		}
+
+		private EventHandler EventMouseEnter;
+		/// <summary>
+		/// Occurs when mouse enters the item.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when mouse enters the item.")]
+		new public event EventHandler MouseEnter
+		{
+			add { EventMouseEnter += value; }
+			remove { EventMouseEnter -= value; }
+		}
+		
+		private EventHandler EventMouseLeave;
+		/// <summary>
+		/// Occurs when mouse leaves the item.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when mouse leaves the item.")]
+		new public event EventHandler MouseLeave
+		{
+			add { EventMouseLeave += value; }
+			remove { EventMouseLeave -= value; }
+		}
+
+		private MouseEventHandler EventMouseMove;
+		/// <summary>
+		/// Occurs when mouse moves over the item.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when mouse moves over the item.")]
+		new public event MouseEventHandler MouseMove
+		{
+			add { EventMouseMove += value; }
+			remove { EventMouseMove -= value; }
+		}
+		
+		private EventHandler EventMouseHover;
+		/// <summary>
+		/// Occurs when mouse remains still inside an item for an amount of time.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when mouse remains still inside an item for an amount of time.")]
+		new public event EventHandler MouseHover
+		{
+			add { EventMouseHover += value; }
+			remove { EventMouseHover -= value; }
+		}
+		
+		private EventHandler EventLostFocus;
+		/// <summary>
+		/// Occurs when item loses input focus.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when item loses input focus.")]
+		new public event EventHandler LostFocus
+		{
+			add { EventLostFocus += value; }
+			remove { EventLostFocus -= value; }
+		}
+		
+		private EventHandler EventGotFocus;
+		/// <summary>
+		/// Occurs when item receives input focus.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when item receives input focus.")]
+		new public event EventHandler GotFocus
+		{
+			add { EventGotFocus += value; }
+			remove { EventGotFocus -= value; }
+		}
+		
+		/// <summary>
+		/// Occurs when user changes the item position, removes the item, adds new item or creates new bar.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when user changes the item position.")]
+		public event EventHandler UserCustomize;
+
+		/// <summary>
+		/// Occurs after an Item is removed from SubItemsCollection.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs after an Item is removed from SubItemsCollection.")]
+		public event ItemRemovedEventHandler ItemRemoved;
+
+		/// <summary>
+		/// Occurs after an Item has been added to the SubItemsCollection.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs after an Item has been added to the SubItemsCollection.")]
+		public event EventHandler ItemAdded;
+
+		/// <summary>
+		/// Occurs when ControlContainerControl is created and contained control is needed.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when ControlContainerControl is created and contained control is needed.")]
+		public event EventHandler ContainerLoadControl;
+
+		/// <summary>
+		/// Occurs when Text property of an Item has changed.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when Text property of an Item has changed.")]
+		public event EventHandler ItemTextChanged;
+
+		/// <summary>
+		/// Use this event if you want to serialize the hosted control state directly into the DotNetBar definition file.
+		/// </summary>
+		public event ControlContainerItem.ControlContainerSerializationEventHandler ContainerControlSerialize;
+		/// <summary>
+		/// Use this event if you want to deserialize the hosted control state directly from the DotNetBar definition file.
+		/// </summary>
+		public event ControlContainerItem.ControlContainerSerializationEventHandler ContainerControlDeserialize;
+
+		/// <summary>
+		/// Occurs after DotNetBar definition is loaded.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs after DotNetBar definition is loaded.")]
+		public event EventHandler DefinitionLoaded;
+
+		/// <summary>
+		/// Occurs when DotNetBar is looking for translated text for one of the internal text that are
+		/// displayed on menus, toolbars and customize forms. You need to set Handled=true if you want
+		/// your custom text to be used instead of the built-in system value.
+		/// </summary>
+		public event DotNetBarManager.LocalizeStringEventHandler LocalizeString;
+
+		/// <summary>
+		/// Occurs before an item in option group is checked and provides opportunity to cancel that.
+		/// </summary>
+		public event OptionGroupChangingEventHandler OptionGroupChanging;
+
+		/// <summary>
+		/// Occurs before tooltip for an item is shown. Sender could be the BaseItem or derived class for which tooltip is being displayed or it could be a ToolTip object itself it tooltip is not displayed for any item in particular.
+		/// </summary>
+		public event EventHandler ToolTipShowing;
+
+        /// <summary>
+        /// Occurs after main application form is activated.
+        /// </summary>
+        internal event EventHandler ApplicationActivate;
+        /// <summary>
+        /// Occurs after main application form is deacticated.
+        /// </summary>
+        internal event EventHandler ApplicationDeactivate;
+        /// <summary>
+        /// Occurs on application wide mouse down event.
+        /// </summary>
+        internal event HandlerMessageEventHandler ApplicationMouseDown;
+		#endregion
+
+		#region Private Variables
+		private BaseItem m_BaseItemContainer=null;
+		private BaseItem m_ExpandedItem=null;
+		private BaseItem m_FocusItem=null;
+		private Hashtable m_ShortcutTable=new Hashtable();
+		private System.Windows.Forms.ImageList m_ImageList;
+		private System.Windows.Forms.ImageList m_ImageListMedium=null;
+		private System.Windows.Forms.ImageList m_ImageListLarge=null;
+		private BaseItem m_DragItem=null;
+		private bool m_DragDropSupport=false;
+		private bool m_DragLeft=false;
+		private bool m_AllowExternalDrop=false;
+		private bool m_UseNativeDragDrop=false;
+		private bool m_DragInProgress=false;
+		private bool m_ExternalDragInProgress=false;
+		private Cursor m_MoveCursor, m_CopyCursor, m_NACursor;
+		private bool m_ShowToolTips=true;
+		private bool m_ShowShortcutKeysInToolTips=false;
+		private bool m_FilterInstalled=false;
+		private bool m_DispatchShortcuts=false;
+		private bool m_MenuEventSupport=false;
+		private IDesignTimeProvider m_DesignTimeProvider=null;
+		private int m_InsertPosition;
+		private bool m_InsertBefore=false;
+		private System.Windows.Forms.Timer m_ClickTimer=null;
+		private BaseItem m_ClickRepeatItem=null;
+		// Theme Caching Support
+		private ThemeWindow m_ThemeWindow=null;
+		private ThemeRebar m_ThemeRebar=null;
+		private ThemeToolbar m_ThemeToolbar=null;
+		private ThemeHeader m_ThemeHeader=null;
+		private ThemeScrollBar m_ThemeScrollBar=null;
+		private ThemeExplorerBar m_ThemeExplorerBar=null;
+		private ThemeProgress m_ThemeProgress=null;
+        private ThemeButton m_ThemeButton = null;
+
+		private ColorScheme m_ColorScheme=null;
+		private bool m_ThemeAware=false;
+		private string m_EmptyContainerDesignTimeHint="Right-click to add more items...";
+		private ItemStyle m_BackgroundStyle=new ItemStyle();
+		private bool m_DesignModeInternal=false;
+		private IBarItemDesigner m_BarDesigner=null;
+        private BaseItem m_DoDefaultActionItem = null;
+        private bool m_AntiAlias = false;
+		#endregion
+
+		#region Constructor
+		public BarBaseControl()
+		{
+			if(!ColorFunctions.ColorsLoaded)
+			{
+				NativeFunctions.RefreshSettings();
+				NativeFunctions.OnDisplayChange();
+				ColorFunctions.LoadColors();
+			}
+
+			this.SetStyle(ControlStyles.UserPaint,true);
+			this.SetStyle(ControlStyles.AllPaintingInWmPaint,true);
+			this.SetStyle(ControlStyles.Opaque,true);
+			this.SetStyle(ControlStyles.ResizeRedraw,true);
+			this.SetStyle(DisplayHelp.DoubleBufferFlag,true);
+
+			try
+			{
+				m_MoveCursor=new Cursor(typeof(DevComponents.DotNetBar.DotNetBarManager),"DRAGMOVE.CUR");
+				m_CopyCursor=new Cursor(typeof(DevComponents.DotNetBar.DotNetBarManager),"DRAGCOPY.CUR");
+				m_NACursor=new Cursor(typeof(DevComponents.DotNetBar.DotNetBarManager),"DRAGNONE.CUR");
+			}
+			catch(Exception)
+			{
+				m_MoveCursor=null;
+				m_CopyCursor=null;
+				m_NACursor=null;
+			}
+
+			m_ColorScheme=new ColorScheme(eDotNetBarStyle.Office2003);
+
+			m_BackgroundStyle.BackColor1.Color=SystemColors.Control;
+			m_BackgroundStyle.VisualPropertyChanged+=new EventHandler(this.VisualPropertyChanged);
+
+			this.IsAccessible=true;
+		}
+
+		protected bool GetDesignMode()
+		{
+			if(!m_DesignModeInternal)
+				return this.DesignMode;
+			return m_DesignModeInternal;
+		}
+
+		internal void SetDesignMode(bool mode)
+		{
+			m_DesignModeInternal=mode;
+			m_BaseItemContainer.SetDesignMode(mode);
+		}
+
+		protected override AccessibleObject CreateAccessibilityInstance()
+		{
+			return new BarBaseControlAccessibleObject(this);
+		}
+
+		/// <summary>
+		/// Notifies the accessibility client applications of the specified AccessibleEvents for the specified child control.
+		/// </summary>
+		/// <param name="accEvent">The AccessibleEvents object to notify the accessibility client applications of. </param>
+		/// <param name="childID">The child Control to notify of the accessible event.</param>
+		internal void InternalAccessibilityNotifyClients(AccessibleEvents accEvent,int childID)
+		{
+			this.AccessibilityNotifyClients(accEvent,childID);
+		}
+		#endregion
+
+		#region IOwner Implementation
+		/// <summary>
+		/// Gets or sets the form SideBar is attached to.
+		/// </summary>
+		Form IOwner.ParentForm
+		{
+			get
+			{
+				return base.FindForm();
+			}
+			set {}
+		}
+
+		/// <summary>
+		/// Returns the collection of items with the specified name.
+		/// </summary>
+		/// <param name="ItemName">Item name to look for.</param>
+		/// <returns></returns>
+		public virtual ArrayList GetItems(string ItemName)
+		{
+			ArrayList list=new ArrayList(15);
+			BarFunctions.GetSubItemsByName(m_BaseItemContainer,ItemName,list);
+			return list;
+		}
+
+		/// <summary>
+		/// Returns the collection of items with the specified name and type.
+		/// </summary>
+		/// <param name="ItemName">Item name to look for.</param>
+		/// <param name="itemType">Item type to look for.</param>
+		/// <returns></returns>
+		public virtual ArrayList GetItems(string ItemName, Type itemType)
+		{
+			ArrayList list=new ArrayList(15);
+			BarFunctions.GetSubItemsByNameAndType(m_BaseItemContainer,ItemName,list,itemType);
+			return list;
+		}
+
+        /// <summary>
+        /// Returns the collection of items with the specified name and type.
+        /// </summary>
+        /// <param name="ItemName">Item name to look for.</param>
+        /// <param name="itemType">Item type to look for.</param>
+        /// <returns></returns>
+        public virtual ArrayList GetItems(string ItemName, Type itemType, bool useGlobalName)
+        {
+            ArrayList list = new ArrayList(15);
+            BarFunctions.GetSubItemsByNameAndType(m_BaseItemContainer, ItemName, list, itemType, useGlobalName);
+            return list;
+        }
+
+		/// <summary>
+		/// Returns the first item that matches specified name.
+		/// </summary>
+		/// <param name="ItemName">Item name to look for.</param>
+		/// <returns></returns>
+		public virtual BaseItem GetItem(string ItemName)
+		{
+			BaseItem item=BarFunctions.GetSubItemByName(m_BaseItemContainer,ItemName);
+			if(item!=null)
+				return item;
+			return null;
+		}
+
+		// Only one Popup Item can be expanded at a time. This is used
+		// to track the currently expanded popup item and to close the popup item
+		// if another item is expanding.
+		void IOwner.SetExpandedItem(BaseItem objItem)
+		{
+			if(objItem!=null && objItem.Parent is PopupItem)
+				return;
+			if(m_ExpandedItem!=null)
+			{
+				if(m_ExpandedItem.Expanded)
+					m_ExpandedItem.Expanded=false;
+				m_ExpandedItem=null;
+			}
+			m_ExpandedItem=objItem;
+		}
+
+		BaseItem IOwner.GetExpandedItem()
+		{
+			return m_ExpandedItem;
+		}
+
+		// Currently we are using this to communicate "focus" when control is in
+		// design mode. This can be used later if we decide to add focus
+		// handling to our BaseItem class.
+		void IOwner.SetFocusItem(BaseItem objFocusItem)
+		{
+			if(m_FocusItem!=null && m_FocusItem!=objFocusItem)
+			{
+				m_FocusItem.OnLostFocus();
+			}
+			OnSetFocusItem(objFocusItem);
+			m_FocusItem=objFocusItem;
+			if(m_FocusItem!=null)
+				m_FocusItem.OnGotFocus();
+		}
+
+		protected virtual void OnSetFocusItem(BaseItem objFocusItem)
+		{
+		}
+
+		BaseItem IOwner.GetFocusItem()
+		{
+			return m_FocusItem;
+		}
+
+		void IOwner.DesignTimeContextMenu(BaseItem objItem)
+		{
+		}
+
+		bool IOwner.DesignMode
+		{
+			get {return this.GetDesignMode();}
+		}
+
+		void IOwner.RemoveShortcutsFromItem(BaseItem objItem)
+		{
+			ShortcutTableEntry objEntry=null;
+			if(objItem.ShortcutString!="")
+			{
+				foreach(eShortcut key in objItem.Shortcuts)
+				{
+					if(m_ShortcutTable.ContainsKey(key))
+					{
+						objEntry=(ShortcutTableEntry)m_ShortcutTable[key];
+						try
+						{
+							objEntry.Items.Remove(objItem.Id);
+							if(objEntry.Items.Count==0)
+								m_ShortcutTable.Remove(objEntry.Shortcut);
+						}
+						catch(System.ArgumentException)	{}
+					}
+				}
+			}
+			IOwner owner=this as IOwner;
+			foreach(BaseItem objTmp in objItem.SubItems)
+				owner.RemoveShortcutsFromItem(objTmp);
+		}
+
+		void IOwner.AddShortcutsFromItem(BaseItem objItem)
+		{
+			ShortcutTableEntry objEntry=null;
+			if(objItem.ShortcutString!="")
+			{
+				foreach(eShortcut key in objItem.Shortcuts)
+				{
+					if(m_ShortcutTable.ContainsKey(key))
+						objEntry=(ShortcutTableEntry)m_ShortcutTable[objItem.Shortcuts[0]];
+					else
+					{
+						objEntry=new ShortcutTableEntry(key);
+						m_ShortcutTable.Add(objEntry.Shortcut,objEntry);
+					}
+					try
+					{
+						objEntry.Items.Add(objItem.Id,objItem);
+					}
+					catch(System.ArgumentException)	{}
+				}
+			}
+			IOwner owner=this as IOwner;
+			foreach(BaseItem objTmp in objItem.SubItems)
+				owner.AddShortcutsFromItem(objTmp);
+		}
+
+		Form IOwner.ActiveMdiChild
+		{
+			get
+			{
+				Form form=base.FindForm();
+				if(form==null)
+					return null;
+				if(form.IsMdiContainer)
+				{
+					return form.ActiveMdiChild;
+				}
+				return null;
+			}
+		}
+
+		bool IOwner.AlwaysDisplayKeyAccelerators
+		{
+			get {return false;}
+			set {}
+		}
+
+		/// <summary>
+		/// Invokes the DotNetBar Customize dialog.
+		/// </summary>
+		void IOwner.Customize()
+		{
+		}
+
+		void IOwner.InvokeResetDefinition(BaseItem item,EventArgs e)
+		{
+		}
+
+		/// <summary>
+		/// Indicates whether Reset buttons is shown that allows end-user to reset the toolbar state.
+		/// </summary>
+		bool IOwner.ShowResetButton
+		{
+			get{return false;}
+			set {}
+		}
+
+		void IOwner.OnApplicationActivate()
+        {
+            if (ApplicationActivate != null)
+                ApplicationActivate(this, new EventArgs());
+        }
+		void IOwner.OnApplicationDeactivate()
+		{
+            ClosePopups();
+            if (ApplicationDeactivate != null)
+                ApplicationDeactivate(this, new EventArgs());
+		}
+		void IOwner.OnParentPositionChanging(){}
+
+		void IOwner.StartItemDrag(BaseItem item)
+		{
+			if(!m_DragDropSupport)
+				return;
+
+			if(m_DragItem==null)
+			{
+				m_DragItem=item;
+				if(!m_UseNativeDragDrop)
+				{
+					this.Capture=true;
+					if(m_MoveCursor!=null)
+						System.Windows.Forms.Cursor.Current=m_MoveCursor;
+					else
+						System.Windows.Forms.Cursor.Current=System.Windows.Forms.Cursors.Hand;
+					m_DragInProgress=true;
+				}
+				else
+				{
+					m_DragInProgress=true;
+					this.DoDragDrop(item,DragDropEffects.All);
+					if(m_DragInProgress)
+						MouseDragDrop(-1,-1,null);
+				}
+					
+			}
+		}
+
+		bool IOwner.DragInProgress
+		{
+			get{ return m_DragInProgress;}
+		}
+
+		BaseItem IOwner.DragItem
+		{
+			get {return m_DragItem;}
+		}
+
+		void IOwner.InvokeUserCustomize(object sender,EventArgs e)
+		{
+			if(UserCustomize!=null)
+				UserCustomize(sender,e);
+		}
+
+		void IOwner.InvokeEndUserCustomize(object sender,EndUserCustomizeEventArgs e){}
+
+		System.Windows.Forms.MdiClient IOwner.GetMdiClient(System.Windows.Forms.Form MdiForm)
+		{
+			return BarFunctions.GetMdiClient(MdiForm);
+		}
+
+		/// <summary>
+		/// ImageList for images used on Items. Images specified here will always be used on menu-items and are by default used on all Bars.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),System.ComponentModel.Category("Data"),DefaultValue(null),System.ComponentModel.Description("ImageList for images used on Items. Images specified here will always be used on menu-items and are by default used on all Bars.")]
+		public System.Windows.Forms.ImageList Images
+		{
+			get
+			{
+				return m_ImageList;
+			}
+			set
+			{
+				if(m_ImageList!=null)
+					m_ImageList.Disposed-=new EventHandler(this.ImageListDisposed);
+				m_ImageList=value;
+				if(m_ImageList!=null)
+					m_ImageList.Disposed+=new EventHandler(this.ImageListDisposed);
+			}
+		}
+
+		/// <summary>
+		/// ImageList for medium-sized images used on Items.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),System.ComponentModel.Category("Data"),DefaultValue(null),System.ComponentModel.Description("ImageList for medium-sized images used on Items.")]
+		public System.Windows.Forms.ImageList ImagesMedium
+		{
+			get
+			{
+				return m_ImageListMedium;
+			}
+			set
+			{
+				if(m_ImageListMedium!=null)
+					m_ImageListMedium.Disposed-=new EventHandler(this.ImageListDisposed);
+				m_ImageListMedium=value;
+				if(m_ImageListMedium!=null)
+					m_ImageListMedium.Disposed+=new EventHandler(this.ImageListDisposed);
+			}
+		}
+
+		/// <summary>
+		/// ImageList for large-sized images used on Items.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),System.ComponentModel.Category("Data"),DefaultValue(null),System.ComponentModel.Description("ImageList for large-sized images used on Items.")]
+		public System.Windows.Forms.ImageList ImagesLarge
+		{
+			get
+			{
+				return m_ImageListLarge;
+			}
+			set
+			{
+				if(m_ImageListLarge!=null)
+					m_ImageListLarge.Disposed-=new EventHandler(this.ImageListDisposed);
+				m_ImageListLarge=value;
+				if(m_ImageListLarge!=null)
+					m_ImageListLarge.Disposed+=new EventHandler(this.ImageListDisposed);
+			}
+		}
+
+		private void ImageListDisposed(object sender, EventArgs e)
+		{
+			if(sender==m_ImageList)
+			{
+				m_ImageList=null;
+			}
+			else if(sender==m_ImageListLarge)
+			{
+				m_ImageListLarge=null;
+			}
+			else if(sender==m_ImageListMedium)
+			{
+				m_ImageListMedium=null;
+			}
+		}
+
+		protected override void OnParentChanged(EventArgs e)
+		{
+			base.OnParentChanged(e);
+			if(this.Parent!=null && (this.Images!=null || this.ImagesLarge!=null || this.ImagesMedium!=null))
+			{
+				foreach(BaseItem panel in m_BaseItemContainer.SubItems)
+				{
+					foreach(BaseItem item in panel.SubItems)
+					{
+						if(item is ImageItem)
+							((ImageItem)item).OnImageChanged();
+					}
+				}
+			}
+
+			if(this.DesignMode)
+				m_BaseItemContainer.SetDesignMode(this.DesignMode);
+		}
+
+		void IOwner.InvokeDefinitionLoaded(object sender,EventArgs e)
+		{
+			if(DefinitionLoaded!=null)
+				DefinitionLoaded(sender,e);
+		}
+
+		/// <summary>
+		/// Indicates whether Tooltips are shown on Bars and menus.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DefaultValue(true),System.ComponentModel.Category("Run-time Behavior"),System.ComponentModel.Description("Indicates whether Tooltips are shown on Bars and menus.")]
+		public bool ShowToolTips
+		{
+			get
+			{
+				return m_ShowToolTips;
+			}
+			set
+			{
+				m_ShowToolTips=value;
+			}
+		}
+
+		/// <summary>
+		/// Indicates whether item shortcut is displayed in Tooltips.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DefaultValue(false),System.ComponentModel.Category("Run-time Behavior"),System.ComponentModel.Description("Indicates whether item shortcut is displayed in Tooltips.")]
+		public bool ShowShortcutKeysInToolTips
+		{
+			get
+			{
+				return m_ShowShortcutKeysInToolTips;
+			}
+			set
+			{
+				m_ShowShortcutKeysInToolTips=value;
+			}
+		}
+
+
+		#endregion
+
+		#region IOwnerMenuSupport Implementation
+		// IOwnerMenuSupport
+        private Hook m_Hook = null;
+		private ArrayList m_RegisteredPopups=new ArrayList();
+		bool IOwnerMenuSupport.PersonalizedAllVisible {get{return false;}set{}}
+		bool IOwnerMenuSupport.ShowFullMenusOnHover {get{return true;}set{}}
+		bool IOwnerMenuSupport.AlwaysShowFullMenus {get{return false;}set{}}
+
+		void IOwnerMenuSupport.RegisterPopup(PopupItem objPopup)
+		{
+			if(m_RegisteredPopups.Contains(objPopup))
+				return;
+			
+			if(!this.GetDesignMode())
+			{
+				if(!m_FilterInstalled)
+				{
+					//System.Windows.Forms.Application.AddMessageFilter(this);
+					MessageHandler.RegisterMessageClient(this);
+					m_FilterInstalled=true;
+				}	
+			}
+            else
+            {
+                if (m_Hook == null)
+                {
+                    m_Hook = new Hook(this);
+                }
+            }
+
+			if(!m_MenuEventSupport)
+				MenuEventSupportHook();
+            
+            if (m_RegisteredPopups.Count == 0)
+                PopupManager.RegisterPopup((IOwnerMenuSupport)this);
+
+			m_RegisteredPopups.Add(objPopup);
+			if(objPopup.GetOwner()!=this)
+				objPopup.SetOwner(this);
+		}
+		void IOwnerMenuSupport.UnregisterPopup(PopupItem objPopup)
+		{
+			if(m_RegisteredPopups.Contains(objPopup))
+				m_RegisteredPopups.Remove(objPopup);
+            if (m_RegisteredPopups.Count == 0)
+            {
+                MenuEventSupportUnhook();
+                if (m_Hook != null)
+                {
+                    m_Hook.Dispose();
+                    m_Hook = null;
+                }
+                PopupManager.UnregisterPopup((IOwnerMenuSupport)this);
+            }
+		}
+		bool IOwnerMenuSupport.RelayMouseHover()
+		{
+			foreach(PopupItem popup in m_RegisteredPopups)
+			{
+				Control ctrl=popup.PopupControl;
+				if(ctrl!=null && ctrl.DisplayRectangle.Contains(Control.MousePosition))
+				{
+					if(ctrl is MenuPanel)
+						((MenuPanel)ctrl).InternalMouseHover();
+					else if(ctrl is Bar)
+						((Bar)ctrl).InternalMouseHover();
+					return true;
+				}
+			}
+			return false;
+		}
+
+        void IOwnerMenuSupport.ClosePopups()
+        {
+            ClosePopups();
+        }
+
+        private void ClosePopups()
+        {
+            ArrayList popupList = new ArrayList(m_RegisteredPopups);
+            foreach (PopupItem objPopup in popupList)
+                objPopup.ClosePopup();
+        }
+
+		// Events
+		void IOwnerMenuSupport.InvokePopupClose(PopupItem item,EventArgs e)
+		{
+			if(PopupClose!=null)
+				PopupClose(item,e);
+		}
+		void IOwnerMenuSupport.InvokePopupContainerLoad(PopupItem item,EventArgs e)
+		{
+			if(PopupContainerLoad!=null)
+				PopupContainerLoad(item,e);
+		}
+		void IOwnerMenuSupport.InvokePopupContainerUnload(PopupItem item,EventArgs e)
+		{
+			if(PopupContainerUnload!=null)
+				PopupContainerUnload(item,e);
+		}
+		void IOwnerMenuSupport.InvokePopupOpen(PopupItem item,PopupOpenEventArgs e)
+		{
+			if(PopupOpen!=null)
+				PopupOpen(item,e);
+		}
+		void IOwnerMenuSupport.InvokePopupShowing(PopupItem item,EventArgs e)
+		{
+			if(PopupShowing!=null)
+				PopupShowing(item,e);
+		}
+		bool IOwnerMenuSupport.ShowPopupShadow {get{return false;}}
+		eMenuDropShadow IOwnerMenuSupport.MenuDropShadow{get{return eMenuDropShadow.Hide;}set{}}
+		ePopupAnimation IOwnerMenuSupport.PopupAnimation{get {return ePopupAnimation.SystemDefault;}set{}}
+		bool IOwnerMenuSupport.AlphaBlendShadow{get {return true;}set{}}
+		#endregion
+
+		#region IOwnerItemEvents Implementation
+        void IOwnerItemEvents.InvokeCheckedChanged(ButtonItem item, EventArgs e)
+        {
+            if (ButtonCheckedChanged != null)
+                ButtonCheckedChanged(item, e);
+        }
+		void IOwnerItemEvents.InvokeItemAdded(BaseItem item,EventArgs e)
+		{
+			if(ItemAdded!=null)
+				ItemAdded(item,e);
+		}
+		void IOwnerItemEvents.InvokeItemRemoved(BaseItem item, BaseItem parent, int itemIndex)
+		{
+			if(ItemRemoved!=null)
+			{
+				ItemRemoved(item,new ItemRemovedEventArgs(parent, itemIndex));
+			}
+		}
+		void IOwnerItemEvents.InvokeMouseEnter(BaseItem item,EventArgs e)
+		{
+			if(EventMouseEnter!=null)
+				EventMouseEnter(item,e);
+		}
+		void IOwnerItemEvents.InvokeMouseHover(BaseItem item,EventArgs e)
+		{
+			if(EventMouseHover!=null)
+				EventMouseHover(item,e);
+		}
+		void IOwnerItemEvents.InvokeMouseLeave(BaseItem item,EventArgs e)
+		{
+			if(EventMouseLeave!=null)
+				EventMouseLeave(item,e);
+		}
+		void IOwnerItemEvents.InvokeMouseDown(BaseItem item, System.Windows.Forms.MouseEventArgs e)
+		{
+			if (EventMouseDown!= null)
+				EventMouseDown(item, e);
+			//if(this.MouseDown!=null)
+			//	this.MouseDown(item,e);
+			if(item.ClickAutoRepeat && e.Button==MouseButtons.Left)
+			{
+				m_ClickRepeatItem=item;
+				if(m_ClickTimer==null)
+					m_ClickTimer=new Timer();
+				m_ClickTimer.Interval=item.ClickRepeatInterval;
+				m_ClickTimer.Tick+=new EventHandler(this.ClickTimerTick);
+				m_ClickTimer.Start();
+			}
+		}
+		void IOwnerItemEvents.InvokeMouseUp(BaseItem item, System.Windows.Forms.MouseEventArgs e)
+		{
+			if(EventMouseUp!=null)
+				EventMouseUp(item, e);
+
+			if(m_ClickTimer!=null && m_ClickTimer.Enabled)
+			{
+				m_ClickTimer.Stop();
+				m_ClickTimer.Enabled=false;
+			}
+		}
+		private void ClickTimerTick(object sender, EventArgs e)
+		{
+			if(m_ClickRepeatItem!=null)
+				m_ClickRepeatItem.RaiseClick();
+			else
+				m_ClickTimer.Stop();
+		}
+		void IOwnerItemEvents.InvokeMouseMove(BaseItem item, System.Windows.Forms.MouseEventArgs e)
+		{
+			if(EventMouseMove!=null)
+				EventMouseMove(item,e);
+		}
+        void IOwnerItemEvents.InvokeItemDoubleClick(BaseItem objItem, MouseEventArgs e)
+        {
+            OnItemDoubleClick(objItem, e);
+        }
+        /// <summary>
+        /// Invokes ItemDoubleClick event.
+        /// </summary>
+        /// <param name="objItem">Reference to item double-clicked</param>
+        /// <param name="e">Event arguments</param>
+        protected virtual void OnItemDoubleClick(BaseItem objItem, MouseEventArgs e)
+        {
+            MouseEventHandler handler = ItemDoubleClick;
+            if (handler != null)
+                handler(objItem, e);
+        }
+		void IOwnerItemEvents.InvokeItemClick(BaseItem objItem)
+		{
+			if(ItemClick!=null)
+				ItemClick(objItem,new EventArgs());
+		}
+		void IOwnerItemEvents.InvokeGotFocus(BaseItem item,EventArgs e)
+		{
+			if(EventGotFocus!=null)
+				EventGotFocus(item,e);
+		}
+		void IOwnerItemEvents.InvokeLostFocus(BaseItem item,EventArgs e)
+		{
+			if(EventLostFocus!=null)
+				EventLostFocus(item,e);
+		}
+		void IOwnerItemEvents.InvokeExpandedChange(BaseItem item,EventArgs e)
+		{
+			if(ExpandedChange!=null)
+				ExpandedChange(item,e);
+		}
+		void IOwnerItemEvents.InvokeItemTextChanged(BaseItem item, EventArgs e)
+		{
+			if(ItemTextChanged!=null)
+				ItemTextChanged(item,e);
+		}
+
+		void IOwnerItemEvents.InvokeContainerControlDeserialize(BaseItem item,ControlContainerSerializationEventArgs e)
+		{
+			if(ContainerControlDeserialize!=null)
+				ContainerControlDeserialize(item,e);
+		}
+		void IOwnerItemEvents.InvokeContainerControlSerialize(BaseItem item,ControlContainerSerializationEventArgs e)
+		{
+			if(ContainerControlSerialize!=null)
+				ContainerControlSerialize(item,e);
+		}
+		void IOwnerItemEvents.InvokeContainerLoadControl(BaseItem item,EventArgs e)
+		{
+			if(ContainerLoadControl!=null)
+				ContainerLoadControl(item,e);
+		}
+
+		void IOwnerItemEvents.InvokeOptionGroupChanging(BaseItem item, OptionGroupChangingEventArgs e)
+		{
+			if(OptionGroupChanging!=null)
+				OptionGroupChanging(item,e);
+		}
+
+		void IOwnerItemEvents.InvokeToolTipShowing(object item, EventArgs e)
+		{
+			if(ToolTipShowing!=null)
+				ToolTipShowing(item,e);
+		}
+		#endregion
+
+		#region IMessageHandlerClient Implementation
+        
+		bool IMessageHandlerClient.IsModal
+		{
+			get
+			{
+				Form form=this.FindForm();
+				if(form!=null)
+					return form.Modal;
+				return false;
+			}
+		}
+        bool IMessageHandlerClient.OnMouseWheel(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+            return false;
+        }
+        bool IMessageHandlerClient.OnKeyDown(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+            int wParamInt = WinApi.ToInt(wParam);
+            if (m_RegisteredPopups.Count > 0)
+            {
+                if (((BaseItem)m_RegisteredPopups[m_RegisteredPopups.Count - 1]).Parent == null)
+                {
+                    PopupItem objItem = (PopupItem)m_RegisteredPopups[m_RegisteredPopups.Count - 1];
+
+                    Control ctrl = objItem.PopupControl as Control;
+                    Control ctrl2 = Control.FromChildHandle(hWnd);
+
+                    if (ctrl2 != null)
+                    {
+                        while (ctrl2.Parent != null)
+                            ctrl2 = ctrl2.Parent;
+                    }
+
+                    bool bIsOnHandle = false;
+                    if (ctrl2 != null && objItem != null)
+                        bIsOnHandle = objItem.IsAnyOnHandle(ctrl2.Handle);
+
+                    bool bNoEat = ctrl != null && ctrl2 != null && ctrl.Handle == ctrl2.Handle || bIsOnHandle;
+
+                    if (!bIsOnHandle)
+                    {
+                        Keys key = (Keys)NativeFunctions.MapVirtualKey((uint)wParam, 2);
+                        if (key == Keys.None)
+                            key = (Keys)wParamInt;
+                        objItem.InternalKeyDown(new KeyEventArgs(key));
+                    }
+
+                    // Don't eat the message if the pop-up window has focus
+                    if (bNoEat)
+                        return false;
+                    return true;
+                }
+            }
+
+            if (!this.IsParentFormActive)
+                return false;
+
+            if (wParamInt>= 0x70 || System.Windows.Forms.Control.ModifierKeys != Keys.None || (WinApi.ToInt(lParam) & 0x1000000000) != 0 || wParamInt== 0x2E || wParamInt== 0x2D) // 2E=VK_DELETE, 2D=VK_INSERT
+            {
+                int i = (int)System.Windows.Forms.Control.ModifierKeys | wParamInt;
+                return ProcessShortcut((eShortcut)i);
+            }
+            return false;
+        }
+		private bool ProcessShortcut(eShortcut key)
+		{
+			bool eat=BarFunctions.ProcessItemsShortcuts(key,m_ShortcutTable);
+			return !m_DispatchShortcuts && eat;
+
+//			if(m_ShortcutTable.Contains(key))
+//			{
+//				ShortcutTableEntry objEntry=(ShortcutTableEntry)m_ShortcutTable[key];
+//				// Must convert to independable array, since if this is for example
+//				// close command first Click will destroy the collection we are
+//				// iterating through and exception will be raised.
+//				BaseItem[] arr=new BaseItem[objEntry.Items.Values.Count];
+//				objEntry.Items.Values.CopyTo(arr,0);
+//				Hashtable hnames=new Hashtable(arr.Length);
+//
+//				bool eat=false;
+//
+//				foreach(BaseItem objItem in arr)
+//				{
+//					if(objItem.CanRaiseClick && (objItem.Name=="" || !hnames.Contains(objItem.Name)))
+//					{
+//						eat=true;
+//						objItem.RaiseClick();
+//						if(objItem.Name!="")
+//							hnames.Add(objItem.Name,"");
+//					}
+//				}
+//				return !m_DispatchShortcuts && eat; // True will eat the key, false will pass it through
+//			}
+//			return false;
+		}
+		protected bool IsParentFormActive
+		{
+			get
+			{
+				// Process only if parent form is active
+				Form form=this.FindForm();
+				if(form==null)
+					return false;
+				if(form.IsMdiChild)
+				{
+					if(form.MdiParent==null)
+						return false;
+					if(form.MdiParent.ActiveMdiChild!=form)
+						return false;
+				}
+				else if(form!=Form.ActiveForm)
+					return false;
+				return true;
+			}
+		}
+		bool IMessageHandlerClient.OnMouseDown(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+		{
+            if(ApplicationMouseDown!=null)
+                ApplicationMouseDown(this,new HandlerMessageEventArgs(hWnd,wParam,lParam));
+
+			if(m_RegisteredPopups.Count==0)
+				return false;
+
+			for(int i=m_RegisteredPopups.Count-1;i>=0;i--)
+			{
+				PopupItem objPopup=m_RegisteredPopups[i] as PopupItem;
+				bool bChildHandle=objPopup.IsAnyOnHandle(hWnd);
+
+				if(!bChildHandle)
+				{
+                    System.Windows.Forms.Control cTmp = System.Windows.Forms.Control.FromChildHandle(hWnd);
+                    if (cTmp != null)
+                    {
+                        if (cTmp is MenuPanel)
+                        {
+                            bChildHandle = true;
+                        }
+                        else
+                        {
+                            while (cTmp.Parent != null)
+                            {
+                                cTmp = cTmp.Parent;
+                                if (cTmp.GetType().FullName.IndexOf("DropDownHolder") >= 0 || cTmp is MenuPanel || cTmp is PopupContainerControl)
+                                {
+                                    bChildHandle = true;
+                                    break;
+                                }
+                            }
+                        }
+                        if (!bChildHandle)
+                            bChildHandle = objPopup.IsAnyOnHandle(cTmp.Handle);
+                    }
+                    else
+                    {
+                        string s = NativeFunctions.GetClassName(hWnd);
+                        s = s.ToLower();
+                        if (s.IndexOf("combolbox") >= 0)
+                            bChildHandle = true;
+                    }
+				}
+
+                if (!bChildHandle)
+                {
+                    Control popupContainer = objPopup.PopupControl;
+                    if (popupContainer != null)
+                        while (popupContainer.Parent != null) popupContainer = popupContainer.Parent;
+                    if (popupContainer != null && popupContainer.Bounds.Contains(Control.MousePosition))
+                        bChildHandle = true;
+                }
+
+				if(bChildHandle)
+					break;
+
+				if(objPopup.Displayed)
+				{
+					// Do not close if mouse is inside the popup parent button
+					Point p=this.PointToClient(Control.MousePosition);
+					if(objPopup.DisplayRectangle.Contains(p))
+						break;
+				}
+				
+				objPopup.ClosePopup();
+
+				if(m_RegisteredPopups.Count==0)
+					break;
+			}
+			return false;
+		}
+		bool IMessageHandlerClient.OnMouseMove(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+		{
+			if(m_RegisteredPopups.Count>0)
+			{
+				foreach(BaseItem item in m_RegisteredPopups)
+				{
+					if(item.Parent==null)
+					{
+						Control ctrl=((PopupItem)item).PopupControl;
+						if(ctrl!=null && ctrl.Handle!=hWnd && !item.IsAnyOnHandle(hWnd) && !(ctrl.Parent!=null && ctrl.Parent.Handle!=hWnd))
+							return true;
+					}
+				}
+			}
+			return false;
+		}
+        bool IMessageHandlerClient.OnSysKeyDown(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+            if (!this.GetDesignMode())
+            {
+                // Check Shortcuts
+                int wParamInt = WinApi.ToInt(wParam);
+                if (System.Windows.Forms.Control.ModifierKeys != Keys.None || wParamInt>= (int)eShortcut.F1 && wParamInt<= (int)eShortcut.F12)
+                {
+                    int i = (int)System.Windows.Forms.Control.ModifierKeys | wParamInt;
+                    if (ProcessShortcut((eShortcut)i))
+                        return true;
+                }
+            }
+            return false;
+        }
+		bool IMessageHandlerClient.OnSysKeyUp(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+		{
+			return false;
+		}
+
+		private void MenuEventSupportHook()
+		{
+			if(m_MenuEventSupport)
+				return;
+			m_MenuEventSupport=true;
+			
+			Form parentForm=this.FindForm();
+			if(parentForm==null)
+			{
+				m_MenuEventSupport=false;
+				return;
+			}
+
+			parentForm.Resize+=new System.EventHandler(this.ParentResize);
+			parentForm.Deactivate+=new System.EventHandler(this.ParentDeactivate);
+
+			DotNetBarManager.RegisterParentMsgHandler(this,parentForm);
+		}
+
+		private void MenuEventSupportUnhook()
+		{
+			if(!m_MenuEventSupport)
+				return;
+			m_MenuEventSupport=false;
+
+			Form parentForm=this.FindForm();
+			if(parentForm==null)
+				return;
+            DotNetBarManager.UnRegisterParentMsgHandler(this, parentForm);
+			parentForm.Resize-=new System.EventHandler(this.ParentResize);
+			parentForm.Deactivate-=new System.EventHandler(this.ParentDeactivate);
+		}
+		private void ParentResize(object sender, System.EventArgs e)
+		{
+			Form parentForm=this.FindForm();
+			if(parentForm!=null && parentForm.WindowState==FormWindowState.Minimized)
+				((IOwner)this).OnApplicationDeactivate();
+		}
+		private void ParentDeactivate(object sender, System.EventArgs e)
+		{
+			Form parentForm=this.FindForm();
+			if(parentForm!=null && parentForm.WindowState==FormWindowState.Minimized)
+				((IOwner)this).OnApplicationDeactivate();
+		}
+		#endregion
+
+		#region IThemeCache Implementation
+		protected override void WndProc(ref Message m)
+		{
+			if(m.Msg==NativeFunctions.WM_THEMECHANGED)
+			{
+				this.RefreshThemes();
+			}
+            else if (m.Msg == NativeFunctions.WM_USER + 107)
+            {
+                if (m_DoDefaultActionItem != null)
+                {
+                    m_DoDefaultActionItem.DoAccesibleDefaultAction();
+                    m_DoDefaultActionItem = null;
+                }
+
+            }
+			base.WndProc(ref m);
+		}
+		protected void RefreshThemes()
+		{
+			if(m_ThemeWindow!=null)
+			{
+				m_ThemeWindow.Dispose();
+				m_ThemeWindow=new ThemeWindow(this);
+			}
+			if(m_ThemeRebar!=null)
+			{
+				m_ThemeRebar.Dispose();
+				m_ThemeRebar=new ThemeRebar(this);
+			}
+			if(m_ThemeToolbar!=null)
+			{
+				m_ThemeToolbar.Dispose();
+				m_ThemeToolbar=new ThemeToolbar(this);
+			}
+			if(m_ThemeHeader!=null)
+			{
+				m_ThemeHeader.Dispose();
+				m_ThemeHeader=new ThemeHeader(this);
+			}
+			if(m_ThemeScrollBar!=null)
+			{
+				m_ThemeScrollBar.Dispose();
+				m_ThemeScrollBar=new ThemeScrollBar(this);
+			}
+			if(m_ThemeProgress!=null)
+			{
+				m_ThemeProgress.Dispose();
+				m_ThemeProgress=new ThemeProgress(this);
+			}
+			if(m_ThemeExplorerBar!=null)
+			{
+				m_ThemeExplorerBar.Dispose();
+				m_ThemeExplorerBar=new ThemeExplorerBar(this);
+			}
+            if (m_ThemeButton != null)
+            {
+                m_ThemeButton.Dispose();
+                m_ThemeButton = new ThemeButton(this);
+            }
+		}
+		private void DisposeThemes()
+		{
+			if(m_ThemeWindow!=null)
+			{
+				m_ThemeWindow.Dispose();
+				m_ThemeWindow=null;
+			}
+			if(m_ThemeRebar!=null)
+			{
+				m_ThemeRebar.Dispose();
+				m_ThemeRebar=null;
+			}
+			if(m_ThemeToolbar!=null)
+			{
+				m_ThemeToolbar.Dispose();
+				m_ThemeToolbar=null;
+			}
+			if(m_ThemeHeader!=null)
+			{
+				m_ThemeHeader.Dispose();
+				m_ThemeHeader=null;
+			}
+			if(m_ThemeScrollBar!=null)
+			{
+				m_ThemeScrollBar.Dispose();
+				m_ThemeScrollBar=null;
+			}
+            if (m_ThemeProgress != null)
+            {
+                m_ThemeProgress.Dispose();
+                m_ThemeProgress = null;
+            }
+            if (m_ThemeExplorerBar != null)
+            {
+                m_ThemeExplorerBar.Dispose();
+                m_ThemeExplorerBar = null;
+            }
+            if (m_ThemeButton != null)
+            {
+                m_ThemeButton.Dispose();
+                m_ThemeButton = null;
+            }
+		}
+		protected override void OnHandleCreated(EventArgs e)
+		{
+			base.OnHandleCreated(e);
+
+			if(!m_FilterInstalled && !this.DesignMode)
+			{
+				MessageHandler.RegisterMessageClient(this);
+				m_FilterInstalled=true;
+			}
+		}
+		protected override void OnHandleDestroyed(EventArgs e)
+		{
+			DisposeThemes();
+			MenuEventSupportUnhook();
+			base.OnHandleDestroyed(e);
+
+			if(m_FilterInstalled)
+			{
+				MessageHandler.UnregisterMessageClient(this);
+				m_FilterInstalled=false;
+			}
+		}
+		DevComponents.DotNetBar.ThemeWindow IThemeCache.ThemeWindow
+		{
+			get
+			{
+				if(m_ThemeWindow==null)
+					m_ThemeWindow=new ThemeWindow(this);
+				return m_ThemeWindow;
+			}
+		}
+		DevComponents.DotNetBar.ThemeRebar IThemeCache.ThemeRebar
+		{
+			get
+			{
+				if(m_ThemeRebar==null)
+					m_ThemeRebar=new ThemeRebar(this);
+				return m_ThemeRebar;
+			}
+		}
+		DevComponents.DotNetBar.ThemeToolbar IThemeCache.ThemeToolbar
+		{
+			get
+			{
+				if(m_ThemeToolbar==null)
+					m_ThemeToolbar=new ThemeToolbar(this);
+				return m_ThemeToolbar;
+			}
+		}
+		DevComponents.DotNetBar.ThemeHeader IThemeCache.ThemeHeader
+		{
+			get
+			{
+				if(m_ThemeHeader==null)
+					m_ThemeHeader=new ThemeHeader(this);
+				return m_ThemeHeader;
+			}
+		}
+		DevComponents.DotNetBar.ThemeScrollBar IThemeCache.ThemeScrollBar
+		{
+			get
+			{
+				if(m_ThemeScrollBar==null)
+					m_ThemeScrollBar=new ThemeScrollBar(this);
+				return m_ThemeScrollBar;
+			}
+		}
+		DevComponents.DotNetBar.ThemeExplorerBar IThemeCache.ThemeExplorerBar
+		{
+			get
+			{
+				if(m_ThemeExplorerBar==null)
+					m_ThemeExplorerBar=new ThemeExplorerBar(this);
+				return m_ThemeExplorerBar;
+			}
+		}
+		DevComponents.DotNetBar.ThemeProgress IThemeCache.ThemeProgress
+		{
+			get
+			{
+				if(m_ThemeProgress==null)
+					m_ThemeProgress=new ThemeProgress(this);
+				return m_ThemeProgress;
+			}
+		}
+        DevComponents.DotNetBar.ThemeButton IThemeCache.ThemeButton
+        {
+            get
+            {
+                if (m_ThemeButton == null)
+                    m_ThemeButton = new ThemeButton(this);
+                return m_ThemeButton;
+            }
+        }
+		#endregion
+
+		#region Mouse & Keyboard Support
+		protected override void OnClick(EventArgs e)
+		{
+			m_BaseItemContainer.InternalClick(Control.MouseButtons,Control.MousePosition);
+			base.OnClick(e);
+		}
+
+		protected override void OnDoubleClick(EventArgs e)
+		{
+			m_BaseItemContainer.InternalDoubleClick(Control.MouseButtons,Control.MousePosition);
+			base.OnDoubleClick(e);
+		}
+
+		protected override void OnKeyDown(KeyEventArgs e)
+		{
+			ExKeyDown(e);
+			base.OnKeyDown(e);
+		}
+
+		internal void ExKeyDown(KeyEventArgs e)
+		{
+			m_BaseItemContainer.InternalKeyDown(e);
+		}
+
+		protected override void OnMouseDown(MouseEventArgs e)
+		{
+			m_BaseItemContainer.InternalMouseDown(e);
+			base.OnMouseDown(e);
+		}
+
+		protected override void OnMouseHover(EventArgs e)
+		{
+			base.OnMouseHover(e);
+			m_BaseItemContainer.InternalMouseHover();
+		}
+
+		protected override void OnMouseLeave(EventArgs e)
+		{
+			// If we had hot sub item pass the mouse leave message to it...
+			if(this.Cursor!=System.Windows.Forms.Cursors.Arrow)
+				this.Cursor=System.Windows.Forms.Cursors.Arrow;
+			m_BaseItemContainer.InternalMouseLeave();
+			base.OnMouseLeave(e);
+		}
+
+		protected override void OnMouseUp(MouseEventArgs e)
+		{
+			base.OnMouseUp(e);
+			if(m_DragDropSupport && !m_UseNativeDragDrop)
+				MouseDragDrop(e.X,e.Y,null);
+
+			m_BaseItemContainer.InternalMouseUp(e);
+		}
+
+		protected override void OnMouseMove(MouseEventArgs e)
+		{
+			base.OnMouseMove(e);
+			if(m_DragDropSupport && m_DragInProgress)
+			{
+				if(!m_UseNativeDragDrop)
+					MouseDragOver(e.X,e.Y,null);
+			}
+			else
+				m_BaseItemContainer.InternalMouseMove(e);
+		}
+
+		protected override void OnDragOver(DragEventArgs e)
+		{
+			if(m_DragDropSupport && (m_DragInProgress || m_ExternalDragInProgress))
+			{
+				Point p=this.PointToClient(new Point(e.X,e.Y));
+				MouseDragOver(p.X,p.Y,e);
+				m_DragLeft=false;
+			}
+			base.OnDragOver(e);
+		}
+
+		protected override void OnDragLeave(EventArgs e)
+		{
+			if(m_DragDropSupport)
+			{
+				if(m_DragInProgress || m_ExternalDragInProgress)
+					MouseDragOver(-1,-1,null);
+				m_DragLeft=true;
+				m_ExternalDragInProgress=false;
+			}
+			base.OnDragLeave(e);
+		}
+
+		protected override void OnDragEnter(DragEventArgs e)
+		{
+			base.OnDragEnter(e);
+			if(m_DragDropSupport)
+			{
+				if(m_DragInProgress || !m_AllowExternalDrop)
+					return;
+				if(e.Data.GetData(typeof(ButtonItem))==null)
+				{
+					if(e.Effect!=DragDropEffects.None)
+						m_ExternalDragInProgress=true;
+					return;
+				}
+				if((e.AllowedEffect & DragDropEffects.Move)==DragDropEffects.Move)
+					e.Effect=DragDropEffects.Move;
+				else if((e.AllowedEffect & DragDropEffects.Copy)==DragDropEffects.Copy)
+					e.Effect=DragDropEffects.Move;
+				else if((e.AllowedEffect & DragDropEffects.Link)==DragDropEffects.Link)
+					e.Effect=DragDropEffects.Move;
+				else
+					return;
+				m_ExternalDragInProgress=true;
+			}
+		}
+
+		protected override void OnDragDrop(DragEventArgs e)
+		{
+			if(m_DragDropSupport)
+			{
+				if(m_DragInProgress)
+				{
+					Point p=this.PointToClient(new Point(e.X,e.Y));
+					MouseDragDrop(p.X,p.Y,null);
+				}
+				else if(m_ExternalDragInProgress)
+				{
+					Point p=this.PointToClient(new Point(e.X,e.Y));
+					MouseDragDrop(p.X,p.Y,e);
+				}
+			}
+			base.OnDragDrop(e);
+		}
+
+		protected override void OnQueryContinueDrag(QueryContinueDragEventArgs e)
+		{
+			if(m_DragDropSupport)
+			{
+				if(m_DragInProgress)
+				{
+					if(m_DragLeft && e.Action==DragAction.Drop || e.Action==DragAction.Cancel)
+						MouseDragDrop(-1,-1,null);
+				}
+			}
+			base.OnQueryContinueDrag(e);
+		}
+
+		private void MouseDragOver(int x, int y, DragEventArgs dragArgs)
+		{
+			if(!m_DragInProgress && !m_ExternalDragInProgress)
+				return;
+			BaseItem dragItem=m_DragItem;
+			
+			if(m_ExternalDragInProgress && dragArgs!=null)
+				dragItem=dragArgs.Data.GetData(typeof(ButtonItem)) as BaseItem;
+
+			if(m_DesignTimeProvider!=null)
+			{
+				m_DesignTimeProvider.DrawReversibleMarker(m_InsertPosition,m_InsertBefore);
+				m_DesignTimeProvider=null;
+			}
+
+			if(m_ExternalDragInProgress && dragItem==null)
+				return;
+
+			Point pScreen=this.PointToScreen(new Point(x,y));
+			foreach(SideBarPanelItem panel in m_BaseItemContainer.SubItems)
+			{
+				if(!panel.Visible)
+					continue;
+				InsertPosition pos=((IDesignTimeProvider)panel).GetInsertPosition(pScreen, dragItem);
+				
+				if(pos!=null)
+				{
+					if(pos.TargetProvider==null)
+					{
+						// Cursor is over drag item
+						if(!m_UseNativeDragDrop)
+						{
+							if(m_NACursor!=null)
+								System.Windows.Forms.Cursor.Current=m_NACursor;
+							else
+								System.Windows.Forms.Cursor.Current=System.Windows.Forms.Cursors.No;
+						}
+						break;
+					}
+					pos.TargetProvider.DrawReversibleMarker(pos.Position,pos.Before);
+					m_InsertPosition=pos.Position;
+					m_InsertBefore=pos.Before;
+					m_DesignTimeProvider=pos.TargetProvider;
+					if(!m_UseNativeDragDrop)
+					{
+						if(m_MoveCursor!=null)
+							System.Windows.Forms.Cursor.Current=m_MoveCursor;
+						else
+							System.Windows.Forms.Cursor.Current=System.Windows.Forms.Cursors.Hand;
+					}
+					else if(dragArgs!=null)
+						dragArgs.Effect=DragDropEffects.Move;
+					break;
+				}
+				else
+				{
+					if(!m_UseNativeDragDrop)
+					{
+						if(m_NACursor!=null)
+							System.Windows.Forms.Cursor.Current=m_NACursor;
+						else
+							System.Windows.Forms.Cursor.Current=System.Windows.Forms.Cursors.No;
+					}
+					else if(dragArgs!=null)
+						dragArgs.Effect=DragDropEffects.None;
+				}
+			}
+		}
+		#endregion
+
+		#region IOwnerLocalize Implementation
+		void IOwnerLocalize.InvokeLocalizeString(LocalizeEventArgs e)
+		{
+			if(LocalizeString!=null)
+				LocalizeString(this,e);
+		}
+		#endregion
+
+        /// <summary>
+        /// Gets or sets the item default accessibility action will be performed on.
+        /// </summary>
+        BaseItem IAccessibilitySupport.DoDefaultActionItem
+        {
+            get { return m_DoDefaultActionItem; }
+            set { m_DoDefaultActionItem = value; }
+        }
+
+		protected void SetBaseItemContainer(BaseItem item)
+		{
+			m_BaseItemContainer=item;
+		}
+        [EditorBrowsable(EditorBrowsableState.Never)]
+		public BaseItem GetBaseItemContainer()
+		{
+			return m_BaseItemContainer;
+		}
+
+#if FRAMEWORK20
+        protected override void OnBindingContextChanged(EventArgs e)
+        {
+            base.OnBindingContextChanged(e);
+            if (m_BaseItemContainer != null)
+                m_BaseItemContainer.UpdateBindings();
+        }
+#endif
+
+		protected virtual string EmptyContainerDesignTimeHint
+		{
+			get {return m_EmptyContainerDesignTimeHint;}
+			set {m_EmptyContainerDesignTimeHint=value;}
+		}
+
+		/// <summary> 
+		/// Clean up any resources being used.
+		/// </summary>
+		protected override void Dispose( bool disposing )
+		{
+			if( disposing )
+			{
+				if(m_ClickTimer!=null)
+				{
+					m_ClickTimer.Stop();
+					m_ClickTimer.Dispose();
+					m_ClickTimer=null;
+				}
+			}
+			base.Dispose( disposing );
+		}
+
+		/// <summary>
+		/// Specifies the background style of the Explorer Bar.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),Category("Style"),Description("Gets or sets bar background style."),DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+		public ItemStyle BackgroundStyle
+		{
+			get {return m_BackgroundStyle;}
+		}
+
+		public void ResetBackgroundStyle()
+		{
+			m_BackgroundStyle.VisualPropertyChanged-=new EventHandler(this.VisualPropertyChanged);
+			m_BackgroundStyle=new ItemStyle();
+			m_BackgroundStyle.VisualPropertyChanged+=new EventHandler(this.VisualPropertyChanged);
+		}
+
+		private void VisualPropertyChanged(object sender, EventArgs e)
+		{
+			if(m_BackgroundStyle!=null)
+				m_BackgroundStyle.ApplyColorScheme(this.ColorScheme);
+			if(this.GetDesignMode())
+				this.Refresh();
+		}
+
+		protected virtual void MouseDragDrop(int x, int y, DragEventArgs dragArgs)
+		{
+			if(!m_DragInProgress && !m_ExternalDragInProgress)
+				return;
+			BaseItem dragItem=m_DragItem;
+			if(m_ExternalDragInProgress)
+				dragItem=dragArgs.Data.GetData(typeof(ButtonItem)) as BaseItem;
+
+			if(dragItem!=null)
+				dragItem.InternalMouseLeave();
+
+			if(m_DesignTimeProvider!=null)
+			{
+				if(x==-1 && y==-1)
+				{
+					// Cancel state
+					m_DesignTimeProvider.DrawReversibleMarker(m_InsertPosition, m_InsertBefore);
+				}
+				else
+				{
+					m_DesignTimeProvider.DrawReversibleMarker(m_InsertPosition, m_InsertBefore);
+					if(dragItem!=null)
+					{
+						BaseItem objParent=dragItem.Parent;
+						if(objParent!=null)
+						{
+							if(objParent==(BaseItem)m_DesignTimeProvider && m_InsertPosition>0)
+							{
+								if(objParent.SubItems.IndexOf(dragItem)<m_InsertPosition)
+									m_InsertPosition--;
+							}
+							objParent.SubItems.Remove(dragItem);
+							Control ctrl=objParent.ContainerControl as Control;
+							objParent.Refresh();
+						}
+						m_DesignTimeProvider.InsertItemAt(dragItem,m_InsertPosition,m_InsertBefore);
+						m_DesignTimeProvider=null;
+						((IOwner)this).InvokeUserCustomize(dragItem,new EventArgs());
+					}
+				}
+			}
+			m_DesignTimeProvider=null;
+			m_DragInProgress=false;
+			m_ExternalDragInProgress=false;
+			if(!m_UseNativeDragDrop)
+				System.Windows.Forms.Cursor.Current=System.Windows.Forms.Cursors.Default;
+			this.Capture=false;
+			if(dragItem!=null)
+				dragItem._IgnoreClick=true;
+			m_BaseItemContainer.InternalMouseUp(new MouseEventArgs(MouseButtons.Left,0,x,y,0));
+			if(dragItem!=null)
+				dragItem._IgnoreClick=false;
+
+			m_DragItem=null;
+		}
+
+		/// <summary>
+		/// Indicates whether shortucts handled by items are dispatched to the next handler or control.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DefaultValue(false),System.ComponentModel.Category("Behavior"),System.ComponentModel.Description("Indicates whether shortucts handled by items are dispatched to the next handler or control.")]
+		public bool DispatchShortcuts
+		{
+			get {return m_DispatchShortcuts;}
+			set {m_DispatchShortcuts=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets Bar Color Scheme.
+		/// </summary>
+		[Browsable(false),DevCoBrowsable(false),Category("Appearance"),Description("Gets or sets Bar Color Scheme."),DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+		public DevComponents.DotNetBar.ColorScheme ColorScheme
+		{
+			get {return m_ColorScheme;}
+			set
+			{
+				if(value==null)
+					throw new ArgumentException("NULL is not a valid value for this property.");
+				m_ColorScheme=value;
+				if(this.Visible)
+					this.Refresh();
+			}
+		}
+		[Browsable(false),EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeColorScheme()
+		{
+			return m_ColorScheme.SchemeChanged;
+		}
+
+		protected bool IsThemed
+		{
+			get
+			{
+                if (m_ThemeAware && m_BaseItemContainer.EffectiveStyle != eDotNetBarStyle.Office2000 && BarFunctions.ThemedOS && Themes.ThemesActive)
+					return true;
+				return false;
+			}
+		}
+
+		private bool m_DisabledImagesGrayScale=true;
+		/// <summary>
+		/// Gets or sets whether gray-scale algorithm is used to create automatic gray-scale images. Default is true.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DefaultValue(true),System.ComponentModel.Category("Appearance"),Description("Gets or sets whether gray-scale algorithm is used to create automatic gray-scale images.")]
+		public bool DisabledImagesGrayScale
+		{
+			get
+			{
+				return m_DisabledImagesGrayScale;
+			}
+			set
+			{
+				m_DisabledImagesGrayScale=value;
+			}
+		}
+
+		/// <summary>
+		/// Specifies whether SideBar is drawn using Themes when running on OS that supports themes like Windows XP.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DevCoBrowsable(true),System.ComponentModel.DefaultValue(false),System.ComponentModel.Category("Appearance"),System.ComponentModel.Description("Specifies whether SideBar is drawn using Themes when running on OS that supports themes like Windows XP.")]
+		public virtual bool ThemeAware
+		{
+			get
+			{
+				return m_ThemeAware;
+			}
+			set
+			{
+				m_ThemeAware=value;
+				m_BaseItemContainer.ThemeAware=value;
+				if(this.GetDesignMode())
+					this.Refresh();
+			}
+		}
+
+		/// <summary>
+		/// Applies design-time defaults to control.
+		/// </summary>
+		public virtual void SetDesignTimeDefaults()
+		{
+		}
+
+        /// <summary>
+        /// Gets or sets whether anti-alias smoothing is used while painting. Default value is false.
+        /// </summary>
+        [DefaultValue(false), Browsable(true), Category("Appearance"), Description("Gets or sets whether anti-aliasing is used while painting.")]
+        public bool AntiAlias
+        {
+            get { return m_AntiAlias; }
+            set
+            {
+                if (m_AntiAlias != value)
+                {
+                    m_AntiAlias = value;
+                    this.Invalidate();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Creates the Graphics object for the control.
+        /// </summary>
+        /// <returns>The Graphics object for the control.</returns>
+        public new Graphics CreateGraphics()
+        {
+            Graphics g = base.CreateGraphics();
+            if (m_AntiAlias)
+            {
+                g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.AntiAlias;
+#if FRAMEWORK20
+                if (!SystemInformation.IsFontSmoothingEnabled)
+#endif
+                    g.TextRenderingHint = DisplayHelp.AntiAliasTextRenderingHint;
+            }
+            return g;
+        }
+
+		#region Painting Support
+        private Rendering.BaseRenderer m_DefaultRenderer = null;
+        private Rendering.BaseRenderer m_Renderer = null;
+        private eRenderMode m_RenderMode = eRenderMode.Global;
+        /// <summary>
+        /// Returns the renderer control will be rendered with.
+        /// </summary>
+        /// <returns>The current renderer.</returns>
+        public virtual Rendering.BaseRenderer GetRenderer()
+        {
+            if (m_RenderMode == eRenderMode.Global && Rendering.GlobalManager.Renderer != null)
+                return Rendering.GlobalManager.Renderer;
+            else if (m_RenderMode == eRenderMode.Custom && m_Renderer != null)
+                return m_Renderer;
+
+            if (m_DefaultRenderer == null)
+                m_DefaultRenderer = new Rendering.Office2007Renderer();
+
+            return m_Renderer;
+        }
+
+        /// <summary>
+        /// Gets or sets the redering mode used by control. Default value is eRenderMode.Global which means that static GlobalManager.Renderer is used. If set to Custom then Renderer property must
+        /// also be set to the custom renderer that will be used.
+        /// </summary>
+        [Browsable(false), DefaultValue(eRenderMode.Global)]
+        public eRenderMode RenderMode
+        {
+            get { return m_RenderMode; }
+            set
+            {
+                if (m_RenderMode != value)
+                {
+                    m_RenderMode = value;
+                    this.Invalidate(true);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the custom renderer used by the items on this control. RenderMode property must also be set to eRenderMode.Custom in order renderer
+        /// specified here to be used.
+        /// </summary>
+        [Browsable(false), DefaultValue(null)]
+        public DevComponents.DotNetBar.Rendering.BaseRenderer Renderer
+        {
+            get
+            {
+                return m_Renderer;
+            }
+            set { m_Renderer = value; }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public ColorScheme GetColorScheme()
+        {
+            if (BarFunctions.IsOffice2007Style(m_BaseItemContainer.EffectiveStyle))
+            {
+                Office2007Renderer r = this.GetRenderer() as Office2007Renderer;
+                if (r != null && r.ColorTable.LegacyColors != null)
+                    return r.ColorTable.LegacyColors;
+            }
+            return m_ColorScheme;
+        }
+
+		protected override void OnPaint(PaintEventArgs e)
+		{
+			if(m_BaseItemContainer==null || this.IsDisposed)
+				return;
+
+			ItemPaintArgs pa=new ItemPaintArgs(this as IOwner,this,e.Graphics,GetColorScheme());
+            pa.Renderer = this.GetRenderer();
+            if (m_AntiAlias)
+            {
+                pa.Graphics.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.AntiAlias;
+                pa.Graphics.TextRenderingHint = DisplayHelp.AntiAliasTextRenderingHint;
+            }
+
+			PaintControlBackground(pa);
+
+			pa.Graphics.SetClip(this.GetItemContainerRectangle());
+			PaintItemContainer(pa);
+			pa.Graphics.ResetClip();
+
+			if(m_BaseItemContainer.SubItems.Count==0 && this.GetDesignMode())
+				PaintDesignTimeEmptyHint(pa);
+
+            PaintContentOnTop(pa);
+		}
+        /// <summary>
+        /// Called after control has painted its content and allows painting on top of the controls content.
+        /// </summary>
+        /// <param name="pa">Paint arguments.</param>
+        protected virtual void PaintContentOnTop(ItemPaintArgs pa) { }
+        protected virtual void PaintControlBackground(ItemPaintArgs pa)
+		{
+            if (m_BackgroundStyle != null)
+            {
+                m_BackgroundStyle.ApplyColorScheme(pa.Colors);
+                m_BackgroundStyle.Paint(pa.Graphics, this.ClientRectangle);
+            }
+		}
+
+		protected virtual void PaintItemContainer(ItemPaintArgs pa)
+		{
+			m_BaseItemContainer.Paint(pa);
+		}
+
+		protected virtual void PaintDesignTimeEmptyHint(ItemPaintArgs pa)
+		{
+			string info=m_EmptyContainerDesignTimeHint;
+			Rectangle rText=this.GetItemContainerRectangle();
+			rText.Inflate(-2,-2);
+			if(rText.Width<0 || rText.Height<0)
+				return;
+            eTextFormat format = eTextFormat.Default | eTextFormat.HorizontalCenter | eTextFormat.VerticalCenter | eTextFormat.WordBreak;
+			TextDrawing.DrawString(pa.Graphics,info,this.Font,SystemColors.ControlDark,rText,format);
+		}
+		#endregion
+
+		#region Layout Support
+		protected virtual Rectangle GetItemContainerRectangle()
+		{
+			if(m_BackgroundStyle==null)
+				return this.ClientRectangle;
+
+			Rectangle r=this.ClientRectangle;
+			
+			if(m_BackgroundStyle.Border==eBorderType.SingleLine)
+			{
+				if(m_BackgroundStyle.BorderSide==eBorderSide.All)
+					r.Inflate(-1,-1);
+				else
+				{
+					if((m_BackgroundStyle.BorderSide & eBorderSide.Left)!=0)
+						r.X++;
+					if((m_BackgroundStyle.BorderSide & eBorderSide.Right)!=0)
+						r.Width--;
+					if((m_BackgroundStyle.BorderSide & eBorderSide.Top)!=0)
+						r.Y++;
+					if((m_BackgroundStyle.BorderSide & eBorderSide.Bottom)!=0)
+						r.Height--;
+				}
+			}
+			else if(m_BackgroundStyle.Border!=eBorderType.None)
+			{
+				if(m_BackgroundStyle.BorderSide==eBorderSide.All)
+					r.Inflate(-2,-2);
+				else
+				{
+					if((m_BackgroundStyle.BorderSide & eBorderSide.Left)!=0)
+						r.X+=2;
+					if((m_BackgroundStyle.BorderSide & eBorderSide.Right)!=0)
+						r.Width-=2;
+					if((m_BackgroundStyle.BorderSide & eBorderSide.Top)!=0)
+						r.Y+=2;
+					if((m_BackgroundStyle.BorderSide & eBorderSide.Bottom)!=0)
+						r.Height-=2;
+				}
+			}
+
+			return r;
+		}
+
+		protected virtual void RecalcSize()
+		{
+			if(m_BaseItemContainer.IsRecalculatingSize)
+				return;
+			Rectangle r=this.GetItemContainerRectangle();
+            m_BaseItemContainer.IsRightToLeft = (this.RightToLeft == RightToLeft.Yes);
+			m_BaseItemContainer.LeftInternal=r.X;
+			m_BaseItemContainer.TopInternal=r.Y;
+			m_BaseItemContainer.WidthInternal =r.Width;
+			m_BaseItemContainer.HeightInternal=r.Height;
+
+			m_BaseItemContainer.RecalcSize();
+
+            OnItemLayoutUpdated(EventArgs.Empty);
+		}
+
+        /// <summary>
+        /// Occurs after internal item layout has been updated and items have valid bounds assigned.
+        /// </summary>
+        public event EventHandler ItemLayoutUpdated;
+        /// <summary>
+        /// Raises ItemLayoutUpdated event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnItemLayoutUpdated(EventArgs e)
+        {
+            EventHandler handler = ItemLayoutUpdated;
+            if (handler != null)
+                handler(this, e);
+        }
+
+		/// <summary>
+		/// Applies any layout changes and repaint the control.
+		/// </summary>
+		public virtual void RecalcLayout()
+		{
+			if(m_BaseItemContainer.IsRecalculatingSize)
+				return;
+			this.RecalcSize();
+			this.Invalidate();
+		}
+		#endregion
+
+		#region IBarDesignerServices
+		IBarItemDesigner IBarDesignerServices.Designer
+		{
+			get {return m_BarDesigner;}
+			set {m_BarDesigner=value;}
+		}
+		#endregion
+	}
+
+	#region HandlerMessageEventArgs
+    internal class HandlerMessageEventArgs : EventArgs
+    {
+        public IntPtr hWnd = IntPtr.Zero;
+        public IntPtr wParam = IntPtr.Zero;
+        public IntPtr lParam = IntPtr.Zero;
+
+        public HandlerMessageEventArgs(IntPtr hwnd, IntPtr wparam, IntPtr lparam)
+        {
+            this.hWnd = hwnd;
+            this.wParam = wparam;
+            this.lParam = lparam;
+        }
+    }
+
+    internal delegate void HandlerMessageEventHandler(object sender, HandlerMessageEventArgs e);
+	#endregion
+
+
+	#region BarAccessibleObject
+	/// <summary>
+	/// Represents class for Accessibility support.
+	/// </summary>
+	public class BarBaseControlAccessibleObject : System.Windows.Forms.Control.ControlAccessibleObject
+	{
+		BarBaseControl m_Owner = null;
+		/// <summary>
+		/// Creates new instance of the object and initializes it with owner control.
+		/// </summary>
+		/// <param name="owner">Reference to owner control.</param>
+		public BarBaseControlAccessibleObject(BarBaseControl owner):base(owner)
+		{
+			m_Owner = owner;
+		}
+
+		internal void GenerateEvent(BaseItem sender, System.Windows.Forms.AccessibleEvents e)
+		{
+			int	iChild = m_Owner.GetBaseItemContainer().SubItems.IndexOf(sender);
+			if(iChild>=0)
+			{
+				if(m_Owner!=null && !m_Owner.IsDisposed)
+					m_Owner.InternalAccessibilityNotifyClients(e,iChild);
+			}
+		}
+
+        ///// <summary>
+        ///// Gets or sets accessible name.
+        ///// </summary>
+        //public override string Name 
+        //{
+        //    get
+        //    {
+        //        if(m_Owner!=null && !m_Owner.IsDisposed)
+        //            return m_Owner.AccessibleName;
+        //        return "";
+        //    }
+        //    set
+        //    {
+        //        if(m_Owner!=null && !m_Owner.IsDisposed)
+        //            m_Owner.AccessibleName = value;
+        //    }
+        //}
+
+        ///// <summary>
+        ///// Gets accessible description.
+        ///// </summary>
+        //public override string Description
+        //{
+        //    get
+        //    {
+        //        if(m_Owner!=null && !m_Owner.IsDisposed)
+        //            return m_Owner.AccessibleDescription;
+        //        return "";
+        //    }
+        //}
+
+		/// <summary>
+		/// Gets accessible role.
+		/// </summary>
+		public override AccessibleRole Role
+		{
+			get
+			{
+				if(m_Owner!=null && !m_Owner.IsDisposed)
+					return m_Owner.AccessibleRole;
+				return System.Windows.Forms.AccessibleRole.None;
+			}
+		}
+
+		/// <summary>
+		/// Gets parent accessibility object.
+		/// </summary>
+		public override AccessibleObject Parent 
+		{
+			get
+			{
+				if(m_Owner!=null && !m_Owner.IsDisposed)
+					return m_Owner.Parent.AccessibilityObject;
+				return null;
+			}
+		}
+
+		/// <summary>
+		/// Returns bounds of the control.
+		/// </summary>
+		public override Rectangle Bounds 
+		{
+			get
+			{
+				if(m_Owner!=null && !m_Owner.IsDisposed && m_Owner.Parent!=null)
+					return this.m_Owner.Parent.RectangleToScreen(m_Owner.Bounds);
+				return Rectangle.Empty;
+			}
+		}
+
+		/// <summary>
+		/// Returns number of child objects.
+		/// </summary>
+		/// <returns>Total number of child objects.</returns>
+		public override int GetChildCount()
+		{
+			if(m_Owner!=null && !m_Owner.IsDisposed && m_Owner.GetBaseItemContainer()!=null)
+				return m_Owner.GetBaseItemContainer().SubItems.Count;
+			return 0;
+		}
+
+		/// <summary>
+		/// Returns reference to child object given the index.
+		/// </summary>
+		/// <param name="iIndex">0 based index of child object.</param>
+		/// <returns>Reference to child object.</returns>
+		public override System.Windows.Forms.AccessibleObject GetChild(int iIndex)
+		{
+			if(m_Owner!=null && !m_Owner.IsDisposed && m_Owner.GetBaseItemContainer()!=null)
+				return m_Owner.GetBaseItemContainer().SubItems[iIndex].AccessibleObject;
+			return null;
+		}
+
+		/// <summary>
+		/// Returns current accessible state.
+		/// </summary>
+		public override AccessibleStates State
+		{
+			get
+			{
+				AccessibleStates state;
+				if(m_Owner==null || m_Owner.IsDisposed)
+					return AccessibleStates.None;
+
+				state=AccessibleStates.None;
+				return state;
+			}
+		}
+	}
+		#endregion
+}
diff --git a/PROMS/DotNetBar Source Code/BarBaseControlDesigner.cs b/PROMS/DotNetBar Source Code/BarBaseControlDesigner.cs
new file mode 100644
index 00000000..6165cda1
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/BarBaseControlDesigner.cs	
@@ -0,0 +1,1317 @@
+using System;
+using System.Windows.Forms;
+using System.Windows.Forms.Design;
+using System.Collections;
+using System.Drawing;
+using System.ComponentModel.Design;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Summary description for BarBaseControlDesigner.
+	/// </summary>
+	public class BarBaseControlDesigner:System.Windows.Forms.Design.ParentControlDesigner,IDesignerServices
+	{
+		#region Private Variables
+		const string TEMP_NAME="tempDragDropItem";
+		private bool m_EnableItemDragDrop=false;
+		private bool m_AcceptExternalControls=true;
+		private Point m_MouseDownPoint=Point.Empty;
+		private BaseItem m_DragItem=null;
+		private bool m_DragInProgress=false;
+		private IDesignTimeProvider m_DesignTimeProvider=null;
+		private int m_InsertPosition;
+		private bool m_InsertBefore;
+		private bool m_Capture=false;
+		private System.Windows.Forms.Control m_DesignerHost=null;
+		private Timer m_TimerAdded=null;
+		private Timer m_TimerDragDrop=null;
+		private bool m_NewControlAdded=false;
+		private bool m_SuspendInternalCursor=false;
+		private bool m_DragLeave=false;
+		private bool m_ControlRemoved=false;
+		private DateTime m_JustAdded=DateTime.MinValue;
+		private bool m_MouseDownSelectionPerformed=false;
+		#endregion
+
+		#region Designer Implementation
+		public BarBaseControlDesigner()
+		{
+			
+		}
+
+		public override void Initialize(IComponent component) 
+		{
+			base.Initialize(component);
+			if(!component.Site.DesignMode)
+				return;
+
+			ISelectionService ss =(ISelectionService)GetService(typeof(ISelectionService));
+			if(ss!=null)
+				ss.SelectionChanged+=new EventHandler(OnSelectionChanged);
+
+			// If our component is removed we need to clean-up
+			IComponentChangeService cc=(IComponentChangeService)GetService(typeof(IComponentChangeService));
+			if(cc!=null)
+			{
+				cc.ComponentRemoving+=new ComponentEventHandler(this.OnComponentRemoving);
+				cc.ComponentRemoved+=new ComponentEventHandler(this.OnComponentRemoved);
+			}
+
+			IDesignerEventService ds=GetService(typeof(IDesignerEventService)) as IDesignerEventService;
+			if(ds!=null)
+			{
+				ds.ActiveDesignerChanged+=new ActiveDesignerEventHandler(this.OnActiveDesignerChanged);
+				ds.SelectionChanged+=new EventHandler(DesignerSelectionChanged);
+			}
+
+			if(this.Control is IBarDesignerServices)
+				((IBarDesignerServices)this.Control).Designer=this;
+
+			if(component is System.Windows.Forms.Control)
+			{
+				((Control)component).ControlAdded+=new ControlEventHandler(this.ComponentAdded);
+				((Control)component).ControlRemoved+=new ControlEventHandler(this.ComponentRemoved);
+			}
+			//this.EnableDragDrop(false);
+		}
+
+		protected override void Dispose(bool disposing)
+		{
+			// Unhook events
+			IComponentChangeService cc=(IComponentChangeService)GetService(typeof(IComponentChangeService));
+			if(cc!=null)
+			{
+				cc.ComponentRemoving-=new ComponentEventHandler(this.OnComponentRemoving);
+				cc.ComponentRemoved-=new ComponentEventHandler(this.OnComponentRemoved);
+			}
+
+			ISelectionService ss =(ISelectionService)GetService(typeof(ISelectionService));
+			if(ss!=null)
+				ss.SelectionChanged-=new EventHandler(OnSelectionChanged);
+			
+			IDesignerEventService ds=GetService(typeof(IDesignerEventService)) as IDesignerEventService;
+			if(ds!=null)
+			{
+				ds.ActiveDesignerChanged-=new ActiveDesignerEventHandler(this.OnActiveDesignerChanged);
+				ds.SelectionChanged-=new EventHandler(DesignerSelectionChanged);
+			}
+
+			if(this.Component is System.Windows.Forms.Control)
+			{
+				((Control)this.Component).ControlAdded-=new ControlEventHandler(this.ComponentAdded);
+				((Control)this.Component).ControlRemoved-=new ControlEventHandler(this.ComponentRemoved);
+			}
+
+			base.Dispose(disposing);
+		}
+
+		public override bool CanParent(Control control)
+		{
+			BaseItem item = GetControlItem(control);
+			if (item != null && item != m_DragItem && !m_NewControlAdded)
+				return false;
+			return base.CanParent(control);
+		}
+
+		private void ComponentAdded(object sender, ControlEventArgs e)
+		{
+			if(!m_NewControlAdded || !m_EnableItemDragDrop || !m_AcceptExternalControls || this.IsDockableWindow)
+			{
+				if(!m_NewControlAdded)
+				{
+					if(!OnControlAdded(e))
+						return;
+				}
+				else
+					return;
+			}
+
+			m_TimerAdded=new Timer();
+			m_TimerAdded.Tick+=new EventHandler(this.TimerTick);
+			m_TimerAdded.Interval=50;
+			m_TimerAdded.Enabled=true;
+			m_TimerAdded.Start();
+			m_NewControlAdded=false;
+		}
+
+		/// <summary>
+		/// Called after control has been added to container but not through drag & drop. Control added could also be
+		/// internal control by the bar container.
+		/// </summary>
+		/// <param name="e">Event arguments</param>
+		/// <returns>true if acted upon this new control otherwise false.</returns>
+		protected virtual bool OnControlAdded(ControlEventArgs e)
+		{
+			return false;
+		}
+
+		private void ComponentRemoved(object sender, ControlEventArgs e)
+		{
+			IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+			if(dh==null || dh.Loading)
+				return;
+
+			if(m_JustAdded!=DateTime.MinValue && DateTime.Now.Subtract(m_JustAdded).Seconds<2)
+			{
+				m_JustAdded=DateTime.MinValue;
+				return;
+			}
+			m_JustAdded=DateTime.MinValue;
+			if(m_DragLeave)
+				ControlRemoved(e.Control);
+			else if(m_TimerDragDrop!=null)
+				m_ControlRemoved=true;
+			else
+			{
+				ISelectionService ss =(ISelectionService)GetService(typeof(ISelectionService));
+				if(ss!=null && ss.PrimarySelection==e.Control && this.GetControlItem(e.Control)!=null)
+				{
+					ControlRemoved(e.Control);
+				}
+			}
+		}
+
+		private void ControlRemoved(Control control)
+		{
+			if(control!=null)
+			{
+				BaseItem item=this.GetControlItem(control);
+				if(item!=null)
+				{
+					MouseDragDrop(-1,-1);
+					if(item.Parent!=null)
+						item.Parent.SubItems.Remove(item);
+					this.DestroyComponent(item);
+					this.RecalcLayout();
+				}
+			}
+		}
+
+		private void TimerTick(object sender, EventArgs e)
+		{
+			m_TimerAdded.Stop();
+			m_TimerAdded.Enabled=false;
+			m_TimerAdded=null;
+			this.RecalcLayout();
+			ISelectionService sel=(ISelectionService)this.GetService(typeof(ISelectionService));
+			if(sel!=null && sel.PrimarySelection is Control && this.Control.Controls.Contains((Control)sel.PrimarySelection))
+			{
+				IComponentChangeService cc=this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+				cc.OnComponentChanged(sel.PrimarySelection,null,null,null);
+			}
+		}
+
+		private void OnSelectionChanged(object sender, EventArgs e) 
+		{
+			DesignTimeSelectionChanged(sender as ISelectionService);
+		}
+
+		private void OnActiveDesignerChanged(object sender, ActiveDesignerEventArgs e)
+		{
+			this.ActiveDesignerChanged(e);
+		}
+
+		/// <summary>
+		/// Support for popup menu closing.
+		/// </summary>
+		/// <param name="e"></param>
+		protected virtual void ActiveDesignerChanged(ActiveDesignerEventArgs e)
+		{
+			if((this.GetItemContainerControl() as IOwner)!=null)
+			{
+				((IOwner)this.GetItemContainerControl()).OnApplicationDeactivate(); // Closes all popups
+			}
+		}
+
+		/// <summary>
+		/// Support for popup menu closing.
+		/// </summary>
+		protected virtual void DesignTimeSelectionChanged(ISelectionService ss)
+		{
+			if(ss==null)
+				return;
+			if(this.Control==null || this.Control.IsDisposed)
+				return;
+
+			if(ss.PrimarySelection!=this.Control)
+			{
+				BaseItem container=this.GetItemContainer();
+				if(container==null)
+					return;
+				if(ss.PrimarySelection is BaseItem)
+				{
+					BaseItem item=ss.PrimarySelection as BaseItem;
+					if(item.ContainerControl==this.GetItemContainerControl())
+						return;
+					
+					if(this.GetAllAssociatedComponents().Contains(item))
+						return;
+					
+					if((this.GetItemContainerControl() as IOwner)!=null)
+						((IOwner)this.GetItemContainerControl()).SetFocusItem(null);
+				}
+				else
+				{
+					if((this.GetItemContainerControl() as IOwner)!=null)
+					{
+						((IOwner)this.GetItemContainerControl()).SetFocusItem(null);
+						((IOwner)this.GetItemContainerControl()).OnApplicationDeactivate(); // Closes all popups
+					}
+				}
+			}
+			else
+			{
+				if((this.GetItemContainerControl() as IOwner)!=null)
+					((IOwner)this.GetItemContainerControl()).OnApplicationDeactivate(); // Closes all popups
+			}
+		}
+
+		protected virtual BaseItem GetItemContainer()
+		{
+			BarBaseControl bar=this.Control as BarBaseControl;
+			if(bar!=null)
+				return bar.GetBaseItemContainer();
+			return null;
+		}
+
+		protected virtual System.Windows.Forms.Control GetItemContainerControl()
+		{
+			return this.Control;
+		}
+
+		protected bool m_InternalRemoving=false;
+		private void OnComponentRemoving(object sender,ComponentEventArgs e)
+		{
+			if(e.Component==this.Component)
+				ThisComponentRemoving(sender,e);
+			else
+				OtherComponentRemoving(sender,e);
+		}
+
+		private void OnComponentRemoved(object sender,ComponentEventArgs e)
+		{
+			ComponentRemoved(sender,e);
+		}
+
+		protected virtual void ComponentRemoved(object sender, ComponentEventArgs e){}
+
+		/// <summary>
+		/// Removes all subitems from container.
+		/// </summary>
+		protected virtual void ThisComponentRemoving(object sender, ComponentEventArgs e)
+		{
+			if(!m_InternalRemoving)
+			{
+				m_InternalRemoving=true;
+				try
+				{
+					// Unhook events
+					IComponentChangeService cc=(IComponentChangeService)GetService(typeof(IComponentChangeService));
+					if(cc!=null)
+						cc.ComponentRemoving-=new ComponentEventHandler(this.OnComponentRemoving);
+
+					BaseItem container=this.GetItemContainer();
+					IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+
+					if(dh==null || container==null)
+						return;
+
+					foreach(BaseItem item in container.SubItems)
+					{
+						// Covers the undo case in designer
+						if(item.Parent==container)
+						{
+							DestroySubItems(item,dh);
+							dh.DestroyComponent(item);
+						}
+					}
+				}
+				finally
+				{
+					m_InternalRemoving=false;
+				}
+			}
+		}
+
+		/// <summary>
+		/// Triggered when some other component on the form is removed.
+		/// </summary>
+		protected virtual void OtherComponentRemoving(object sender, ComponentEventArgs e)
+		{
+			if(e.Component is BaseItem)
+			{
+				BaseItem item=e.Component as BaseItem;
+				if(item.ContainerControl==GetItemContainerControl())
+				{
+					if(item.Parent!=null && item.Parent.SubItems.Contains(item))
+						item.Parent.SubItems.Remove(item);
+					if(item!=null)
+						DestroySubItems(item);
+					this.RecalcLayout();
+				}
+			}
+		}
+
+		protected virtual void DestroySubItems(BaseItem parent, IDesignerHost dh)
+		{
+			if(parent is ControlContainerItem)
+			{
+				if(((ControlContainerItem)parent).Control!=null)
+				{
+					Control c=((ControlContainerItem)parent).Control;
+					((ControlContainerItem)parent).Control=null;
+					dh.DestroyComponent(c);
+				}
+			}
+			else if(parent is DockContainerItem)
+			{
+				if(((DockContainerItem)parent).Control!=null)
+				{
+					Control c=((DockContainerItem)parent).Control;
+					((DockContainerItem)parent).Control=null;
+					dh.DestroyComponent(c);
+				}
+			}
+
+			BaseItem[] subitems=new BaseItem[parent.SubItems.Count];
+			parent.SubItems.CopyTo(subitems,0);
+			foreach(BaseItem item in subitems)
+			{
+				DestroySubItems(item,dh);
+				dh.DestroyComponent(item);
+			}
+		}
+
+		protected virtual void DestroySubItems(BaseItem parent)
+		{
+			IDesignerHost dh=GetService(typeof(IDesignerHost)) as IDesignerHost;
+			if(dh!=null)
+				DestroySubItems(parent,dh);
+		}
+
+		/// <summary>
+		/// Selection support for items on container.
+		/// </summary>
+		protected override void WndProc(ref Message m)
+		{
+			if(m_DesignerHost==null)
+				m_DesignerHost=System.Windows.Forms.Control.FromHandle(m.HWnd);
+			BaseItem container=this.GetItemContainer();
+			System.Windows.Forms.Control ctrl=this.GetItemContainerControl();
+			if(container==null || ctrl==null || ctrl.IsDisposed)
+			{
+				base.WndProc(ref m);
+				return;
+			}
+
+			switch(m.Msg)
+			{
+				case NativeFunctions.WM_LBUTTONDOWN:
+				case NativeFunctions.WM_RBUTTONDOWN:
+				{
+					if(OnMouseDown(ref m))
+						return;
+					break;
+				}
+				case NativeFunctions.WM_RBUTTONUP:
+				case NativeFunctions.WM_LBUTTONUP:
+				{
+					if(OnMouseUp(ref m))
+						return;
+
+					break;
+				}
+				case NativeFunctions.WM_MOUSEMOVE:
+				{
+					if(OnMouseMove(ref m))
+					{
+						m.Result=IntPtr.Zero;
+						return;
+					}
+					break;
+				}
+				case NativeFunctions.WM_MOUSELEAVE:
+				{
+					if(OnMouseLeave(ref m))
+						return;
+					break;
+				}
+				case NativeFunctions.WM_LBUTTONDBLCLK:
+				{
+					if(OnMouseDoubleClick(m))
+						return;
+					break;
+				}
+			}
+
+			base.WndProc(ref m);
+		}
+
+		protected virtual bool OnMouseDown(ref Message m)
+		{
+			if(this.IsDockableWindow)
+				return false;
+
+			System.Windows.Forms.Control ctrl=this.GetItemContainerControl();
+			BaseItem container=this.GetItemContainer();
+
+			if(ctrl==null || (ctrl as IOwner)==null || container==null)
+				return false;
+
+			if(m.Msg==NativeFunctions.WM_RBUTTONDOWN)
+			{
+				Point pos=ctrl.PointToClient(System.Windows.Forms.Control.MousePosition);
+				MouseEventArgs e=new MouseEventArgs(MouseButtons.Left,0,pos.X,pos.Y,0);
+				container.InternalMouseDown(e);
+				if(((IOwner)ctrl).GetFocusItem()!=null)
+				{
+					ISelectionService selection = (ISelectionService) this.GetService(typeof(ISelectionService));
+					if(selection!=null)
+					{
+						ArrayList arr=new ArrayList(1);
+						arr.Add(((IOwner)ctrl).GetFocusItem());
+#if FRAMEWORK20
+						selection.SetSelectedComponents(arr,SelectionTypes.Primary);
+#else
+                        selection.SetSelectedComponents(arr,SelectionTypes.MouseDown);
+#endif
+                        OnItemSelected(((IOwner)ctrl).GetFocusItem());
+						this.OnContextMenu(System.Windows.Forms.Control.MousePosition.X, System.Windows.Forms.Control.MousePosition.Y);
+						return true;
+					}
+				}
+			}
+			return false;
+		}
+
+		protected virtual bool OnMouseUp(ref Message m)
+		{
+			bool bProcessed=false;
+
+			if(m_Capture)
+			{
+				m_Capture=false;
+				System.Windows.Forms.Control c=System.Windows.Forms.Control.FromHandle(m.HWnd);
+				if(c!=null)
+					c.Capture=false;
+			}
+
+			System.Windows.Forms.Control ctrl=this.GetItemContainerControl();
+			BaseItem container=this.GetItemContainer();
+
+			if(ctrl==null || (ctrl as IOwner)==null || container==null)
+				return false;
+
+			Point pos=ctrl.PointToClient(System.Windows.Forms.Control.MousePosition);
+			MouseEventArgs e=new MouseEventArgs(MouseButtons.Left,0,pos.X,pos.Y,0);
+			container.InternalMouseUp(e);
+					
+//			if(((IOwner)ctrl).GetFocusItem()==null && !m_MouseDownSelectionPerformed)
+//			{
+//				ISelectionService selection = (ISelectionService) this.GetService(typeof(ISelectionService));
+//				if(selection!=null && selection.PrimarySelection!=this.Control && !(selection.PrimarySelection.GetType() == this.Control.GetType()))
+//				{
+//					ArrayList arr=new ArrayList(1);
+//					arr.Add(this.Control);
+//					selection.SetSelectedComponents(arr,SelectionTypes.Click);
+//				}
+//			}
+            if (m_MouseDownSelectionPerformed)
+                bProcessed = true;
+			m_MouseDownSelectionPerformed=false;
+
+			if(m_DragItem!=null && m_DragItem is ControlContainerItem)
+				MouseDragDrop(pos.X,pos.Y);
+
+			return bProcessed;
+		}
+
+		protected virtual bool OnMouseMove(ref Message m)
+		{
+			return false;
+		}
+
+		protected override void OnMouseDragBegin(int x, int y)
+		{
+			Control bar=this.GetItemContainerControl();
+			System.Windows.Forms.Control ctrl=this.GetItemContainerControl();
+			
+			BaseItem container=this.GetItemContainer();
+			Point pos=ctrl.PointToClient(new Point(x,y));
+			MouseEventArgs e=new MouseEventArgs(MouseButtons.Left,0,pos.X,pos.Y,0);
+			
+			BaseItem dragItem=null;
+			container.InternalMouseDown(e);
+			dragItem=((IOwner)ctrl).GetFocusItem();
+			
+			if(dragItem!=null)
+			{
+				ISelectionService selection = (ISelectionService) this.GetService(typeof(ISelectionService));
+				if(selection!=null)
+				{
+					ArrayList arr=new ArrayList(1);
+					arr.Add(dragItem);
+#if FRAMEWORK20
+                    selection.SetSelectedComponents(arr, SelectionTypes.Primary);
+#else
+                    selection.SetSelectedComponents(arr,SelectionTypes.MouseDown);
+#endif
+                    OnItemSelected(((IOwner)ctrl).GetFocusItem());
+				}
+			}
+
+			if(bar==null || dragItem==null || this.IsDockableWindow || !m_EnableItemDragDrop || !CanDragItem(dragItem))
+			{
+				if(dragItem==null)
+					base.OnMouseDragBegin(x,y);
+				else
+					this.Control.Capture = true; // Does same as base implementation
+				return;
+			}
+
+			bar.Capture = true;
+			NativeFunctions.RECT rect = new NativeFunctions.RECT(0,0,0,0);
+			NativeFunctions.GetWindowRect(bar.Handle, ref rect);
+			Rectangle r=Rectangle.FromLTRB(rect.Left, rect.Top, rect.Right, rect.Bottom);
+			Cursor.Clip=r;
+			StartItemDrag(dragItem);
+
+			// Does same as base implementation
+			this.Control.Capture = true;
+		}
+		protected virtual bool CanDragItem(BaseItem item)
+		{
+			return true;
+		}
+		protected override void OnMouseDragMove(int x, int y)
+		{
+			if(m_DragInProgress)
+			{
+				Point p=this.Control.PointToClient(new Point(x,y));
+				MouseDragOver(p.X,p.Y);
+			}
+		}
+		protected override void OnMouseDragEnd(bool cancel)
+		{
+			if(!this.IsDockableWindow)
+			{
+				this.Control.Capture = false;
+				Cursor.Clip = Rectangle.Empty;
+
+				if(m_DragInProgress)
+				{
+					if(cancel)
+						MouseDragDrop(-1,-1);
+					else
+					{
+						Point p=this.Control.PointToClient(Control.MousePosition);
+						MouseDragDrop(p.X,p.Y);
+					}
+					cancel=true;
+				}
+				else
+				{
+					System.Windows.Forms.Control ctrl=this.GetItemContainerControl();
+					if(ctrl is IOwner && ((IOwner)ctrl).GetFocusItem()!=null)
+						cancel=true;
+				}
+			}
+
+			base.OnMouseDragEnd(cancel);
+		}
+
+		protected virtual bool OnMouseLeave(ref Message m)
+		{
+			return false;
+		}
+
+		protected virtual bool OnMouseDoubleClick(Message m)
+		{
+			bool processed=false;
+
+			ISelectionService selection = (ISelectionService) this.GetService(typeof(ISelectionService));
+			if(selection!=null && selection.PrimarySelection is ButtonItem && ((ButtonItem)selection.PrimarySelection).ContainerControl==this.GetItemContainerControl())
+			{
+				IDesignerHost host=(IDesignerHost) this.GetService(typeof(IDesignerHost));
+				if(host!=null)
+				{
+					IDesigner designer=host.GetDesigner(selection.PrimarySelection as IComponent);
+					if(designer!=null)
+					{
+						designer.DoDefaultAction();
+						processed=true;
+					}
+				}
+			}
+
+			return processed;
+		}
+
+		protected virtual void OnItemSelected(BaseItem item)
+		{
+
+		}
+
+		protected virtual void RecalcLayout()
+		{
+			BarBaseControl bar=this.GetItemContainerControl() as BarBaseControl;
+			if(bar!=null)
+				bar.RecalcLayout();
+		}
+
+		/// <summary>
+		/// Indicates to the designed control that it has been selected or one of the elements managed by the control is selected in designer.
+		/// </summary>
+		/// <param name="selected">true if selected otherwise false</param>
+		protected virtual void SetComponentSelected(bool selected)
+		{
+			
+		}
+
+		public override System.Collections.ICollection AssociatedComponents
+		{
+			get
+			{
+				ArrayList c=new ArrayList(base.AssociatedComponents);
+				BaseItem container=this.GetItemContainer();
+				if(container!=null)
+				{
+					foreach(BaseItem item in container.SubItems)
+					{
+						if(item.DesignMode)
+							c.Add(item);
+					}
+				}
+				return c;
+			}
+		}
+
+		private ArrayList GetAllAssociatedComponents()
+		{
+			ArrayList c=new ArrayList(base.AssociatedComponents);
+			BaseItem container=this.GetItemContainer();
+			if(container!=null)
+			{
+				AddSubItems(container,c);
+			}
+			return c;
+		}
+
+		private void AddSubItems(BaseItem parent, ArrayList list)
+		{
+			foreach(BaseItem item in parent.SubItems)
+			{
+				if(item.DesignMode)
+					list.Add(item);
+				AddSubItems(item,list);
+			}
+		}
+		#endregion
+
+		#region Design-Time Item Creation
+		protected virtual void CreateButton(object sender, EventArgs e)
+		{
+			OnSubItemsChanging();
+			CreateButton(this.GetItemContainer());
+			OnSubItemsChanged();
+		}
+
+		protected virtual void CreateButton(BaseItem parent)
+		{
+			if(parent==null)
+				return;
+
+			IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+			if(dh!=null)
+			{
+				ButtonItem item=dh.CreateComponent(typeof(ButtonItem)) as ButtonItem;
+				if(item==null)
+					return;
+				
+				TypeDescriptor.GetProperties(item)["Text"].SetValue(item,item.Name);
+
+				IComponentChangeService cc=this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+				if(parent!=this.GetItemContainer() && cc!=null)
+					cc.OnComponentChanging(parent,TypeDescriptor.GetProperties(typeof(BaseItem))["SubItems"]);
+
+				parent.SubItems.Add(item);
+				this.RecalcLayout();
+
+				if(parent!=this.GetItemContainer() && cc!=null)
+					cc.OnComponentChanged(parent,TypeDescriptor.GetProperties(typeof(BaseItem))["SubItems"],null,null);
+			}
+		}
+
+		protected virtual void CreateTextBox(object sender, EventArgs e)
+		{
+			OnSubItemsChanging();
+			CreateTextBox(this.GetItemContainer());
+			OnSubItemsChanged();
+		}
+
+		protected virtual void CreateTextBox(BaseItem parent)
+		{
+			if(parent==null)
+				return;
+
+			IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+			if(dh!=null)
+			{
+				TextBoxItem item=dh.CreateComponent(typeof(TextBoxItem)) as TextBoxItem;
+				if(item==null)
+					return;
+
+				IComponentChangeService cc=this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+				if(parent!=this.GetItemContainer() && cc!=null)
+					cc.OnComponentChanging(parent,TypeDescriptor.GetProperties(typeof(BaseItem))["SubItems"]);
+
+				parent.SubItems.Add(item);
+				this.RecalcLayout();
+
+				if(parent!=this.GetItemContainer() && cc!=null)
+					cc.OnComponentChanged(parent,TypeDescriptor.GetProperties(typeof(BaseItem))["SubItems"],null,null);
+			}
+		}
+
+
+		protected virtual void CreateComboBox(object sender, EventArgs e)
+		{
+			OnSubItemsChanging();
+			CreateComboBox(this.GetItemContainer());
+			OnSubItemsChanged();
+		}
+
+		protected virtual void CreateComboBox(BaseItem parent)
+		{
+			if(parent==null)
+				return;
+
+			IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+			if(dh!=null)
+			{
+				ComboBoxItem item=dh.CreateComponent(typeof(ComboBoxItem)) as ComboBoxItem;
+				if(item==null)
+					return;
+
+				IComponentChangeService cc=this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+				if(parent!=this.GetItemContainer() && cc!=null)
+					cc.OnComponentChanging(parent,TypeDescriptor.GetProperties(typeof(BaseItem))["SubItems"]);
+
+				parent.SubItems.Add(item);
+				this.RecalcLayout();
+
+				if(parent!=this.GetItemContainer() && cc!=null)
+					cc.OnComponentChanged(parent,TypeDescriptor.GetProperties(typeof(BaseItem))["SubItems"],null,null);
+			}
+		}
+
+		protected virtual void CreateLabel(object sender, EventArgs e)
+		{
+			OnSubItemsChanging();
+			CreateLabel(this.GetItemContainer());
+			OnSubItemsChanged();
+		}
+
+		protected virtual void CreateLabel(BaseItem parent)
+		{
+			if(parent==null)
+				return;
+
+			IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+			if(dh!=null)
+			{
+				LabelItem item=dh.CreateComponent(typeof(LabelItem)) as LabelItem;
+				if(item==null)
+					return;
+
+				TypeDescriptor.GetProperties(item)["Text"].SetValue(item,item.Name);
+
+				IComponentChangeService cc=this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+				if(parent!=this.GetItemContainer() && cc!=null)
+					cc.OnComponentChanging(parent,TypeDescriptor.GetProperties(typeof(BaseItem))["SubItems"]);
+
+				parent.SubItems.Add(item);
+				this.RecalcLayout();
+
+				if(parent!=this.GetItemContainer() && cc!=null)
+					cc.OnComponentChanged(parent,TypeDescriptor.GetProperties(typeof(BaseItem))["SubItems"],null,null);
+			}
+		}
+
+		protected virtual void CreateDocument(object sender, EventArgs e)
+		{
+			IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+			if(dh==null)
+				return;
+			DockContainerItem item=dh.CreateComponent(typeof(DockContainerItem)) as DockContainerItem;
+			item.Text=item.Name;
+			OnSubItemsChanging();
+			this.GetItemContainer().SubItems.Add(item);
+			PanelDockContainer panel=dh.CreateComponent(typeof(PanelDockContainer)) as PanelDockContainer;
+			this.Control.Controls.Add(panel);
+			panel.ColorSchemeStyle=this.Style;
+			panel.ApplyLabelStyle();
+			item.Control=panel;
+			OnSubItemsChanged();
+
+
+			this.RecalcLayout();
+		}
+
+		protected virtual void OnSubItemsChanging() {}
+		protected virtual void OnSubItemsChanged() {}
+
+		protected virtual eDotNetBarStyle Style
+		{
+			get {return eDotNetBarStyle.Office2003;}
+		}
+		#endregion
+
+		#region Drag & Drop support
+		private void TimerTickDragDrop(object sender, EventArgs e)
+		{
+			Point p=this.Control.PointToClient(System.Windows.Forms.Control.MousePosition);
+			if(this.Control.Bounds.Contains(p))
+				m_DragLeave=false;
+			else
+				m_DragLeave=true;
+
+			if(System.Windows.Forms.Control.MouseButtons!=MouseButtons.Left)
+			{
+				m_TimerDragDrop.Enabled=false;
+				m_TimerDragDrop.Stop();
+				m_TimerDragDrop.Tick-=new EventHandler(TimerTickDragDrop);
+				m_TimerDragDrop.Dispose();
+				m_TimerDragDrop=null;
+				if(m_ControlRemoved)
+				{
+					m_ControlRemoved=false;
+					ISelectionService sel=this.GetService(typeof(ISelectionService)) as ISelectionService;
+					if(sel!=null && sel.PrimarySelection is System.Windows.Forms.Control)
+						ControlRemoved((System.Windows.Forms.Control)sel.PrimarySelection);
+				}
+			}
+		}
+
+		protected override void OnDragLeave(EventArgs e)
+		{
+			if(m_DragInProgress)
+			{
+				MouseDragDrop(-1,-1);
+			}
+			base.OnDragLeave (e);
+		}
+
+		protected override void OnDragOver(DragEventArgs de)
+		{
+			if(m_DragInProgress)
+			{
+				Point p=this.Control.PointToClient(new Point(de.X,de.Y));
+				MouseDragOver(p.X,p.Y);
+				de.Effect=DragDropEffects.Move;
+				return;
+			}
+
+			if(m_EnableItemDragDrop && m_AcceptExternalControls && !this.IsDockableWindow)
+			{
+				ISelectionService sel=(ISelectionService)this.GetService(typeof(ISelectionService));
+				if(sel!=null && sel.PrimarySelection!=this.Component)
+				{
+					if(sel.PrimarySelection is Control && this.Control.Controls.Contains((Control)sel.PrimarySelection))
+					{			
+						BaseItem item=GetControlItem(sel.PrimarySelection as Control);
+						if(item!=null)
+						{
+							m_MouseDownPoint=this.Control.PointToClient(new Point(de.X,de.Y));
+							m_SuspendInternalCursor=true;
+							StartItemDrag(item);
+							if(m_TimerDragDrop==null)
+							{
+								m_TimerDragDrop=new Timer();
+								m_TimerDragDrop.Tick+=new EventHandler(this.TimerTickDragDrop);
+								m_TimerDragDrop.Interval=100;
+								m_TimerDragDrop.Enabled=true;
+								m_TimerDragDrop.Start();
+							}
+						}
+						return;
+					}
+					else if(sel.SelectionCount>1)
+					{
+						de.Effect=DragDropEffects.None;
+						return;
+					}
+					else if(sel.PrimarySelection is Control && ((Control)sel.PrimarySelection).Parent!=null)
+					{
+						// New control being added to the container
+						BaseItem dragItem=null;
+						if(this.IsDockableWindow)
+						{
+							DockContainerItem dc=new DockContainerItem();
+							dc.Name=TEMP_NAME;
+							//dc.Control=sel.PrimarySelection as System.Windows.Forms.Control;
+							dragItem=dc;
+						}
+						else
+						{
+							ControlContainerItem cc=new ControlContainerItem();
+							cc.Name=TEMP_NAME;
+							//cc.Control=sel.PrimarySelection as System.Windows.Forms.Control;
+							dragItem=cc;
+						}
+						m_MouseDownPoint=this.Control.PointToClient(new Point(de.X,de.Y));
+						m_SuspendInternalCursor=true;
+						StartItemDrag(dragItem);
+					}
+				}
+			}
+			base.OnDragOver (de);
+		}
+
+		protected override void OnDragDrop(DragEventArgs de)
+		{
+			if(m_EnableItemDragDrop && m_AcceptExternalControls && !this.IsDockableWindow)
+			{
+				ISelectionService sel=(ISelectionService)this.GetService(typeof(ISelectionService));
+				if(sel!=null && sel.PrimarySelection is Control && this.Control.Controls.Contains((Control)sel.PrimarySelection))
+				{
+					de.Effect=DragDropEffects.Move;
+					Point p=this.Control.PointToClient(new Point(de.X,de.Y));
+					MouseDragDrop(p.X,p.Y);
+				}
+				else
+				{
+					if(sel.SelectionCount>1)
+					{
+						de.Effect=DragDropEffects.None;
+						return;
+					}
+					else
+					{
+						if(m_DragItem!=null && m_DragItem.Name==TEMP_NAME && (m_DragItem is ControlContainerItem || m_DragItem is DockContainerItem))
+						{
+							m_JustAdded=DateTime.Now;
+							BaseItem dragItem=null;
+							if(m_DragItem is ControlContainerItem)
+							{
+								ControlContainerItem cc=m_DragItem as ControlContainerItem;
+								cc.Control=null;
+								cc=this.CreateComponent(typeof(ControlContainerItem)) as ControlContainerItem;
+								TypeDescriptor.GetProperties(cc)["Control"].SetValue(cc,sel.PrimarySelection as System.Windows.Forms.Control);
+								dragItem=cc;
+							}
+							else if(m_DragItem is DockContainerItem)
+							{
+								DockContainerItem dc=m_DragItem as DockContainerItem;
+								dc.Control=null;
+								dc=this.CreateComponent(typeof(DockContainerItem)) as DockContainerItem;
+								TypeDescriptor.GetProperties(dc)["Control"].SetValue(dc,sel.PrimarySelection as System.Windows.Forms.Control);
+								dragItem=dc;
+							}
+							m_DragItem=dragItem;
+							Point p=this.Control.PointToClient(new Point(de.X,de.Y));
+							MouseDragDrop(p.X,p.Y);
+						}
+						m_NewControlAdded=true;
+					}
+				}
+			}
+		
+			base.OnDragDrop(de);
+		}
+
+		protected virtual BaseItem GetControlItem(System.Windows.Forms.Control control)
+		{
+			BaseItem parent=this.GetItemContainer();
+			if(parent==null)
+				return null;
+			return GetControlItem(control,parent);
+		}
+
+		private BaseItem GetControlItem(System.Windows.Forms.Control control, BaseItem parent)
+		{
+			if(parent is ControlContainerItem && ((ControlContainerItem)parent).Control==control)
+				return parent;
+			else if(parent is DockContainerItem && ((DockContainerItem)parent).Control==control)
+				return parent;
+
+			foreach(BaseItem item in parent.SubItems)
+			{
+				BaseItem i2=GetControlItem(control,item);
+				if(i2!=null)
+					return i2;
+			}
+			return null;
+		}
+
+		protected virtual bool DragInProgress
+		{
+			get {return m_DragInProgress;}
+			set {m_DragInProgress=value;}
+		}
+
+		protected void StartItemDrag(BaseItem item)
+		{
+			if(item==null)
+				return;
+
+			if(m_DragItem==null)
+			{
+				m_DragItem=item;
+				if(!m_SuspendInternalCursor)
+					System.Windows.Forms.Cursor.Current=System.Windows.Forms.Cursors.Hand;
+				m_DragInProgress=true;
+			}
+		}
+
+		private void MouseDragOver(int x, int y)
+		{
+			if(!m_DragInProgress)
+				return;
+			BaseItem dragItem=m_DragItem;
+			BaseItem container=this.GetItemContainer();
+			
+			if(m_DesignTimeProvider!=null)
+			{
+				m_DesignTimeProvider.DrawReversibleMarker(m_InsertPosition,m_InsertBefore);
+				m_DesignTimeProvider=null;
+			}
+
+			Control control=this.GetItemContainerControl();
+			Point pScreen=control.PointToScreen(new Point(x,y));
+
+			InsertPosition pos=((IDesignTimeProvider)container).GetInsertPosition(pScreen, dragItem);
+				
+			if(pos!=null)
+			{
+				if(pos.TargetProvider==null)
+				{
+					// Cursor is over drag item
+					if(!m_SuspendInternalCursor)
+						System.Windows.Forms.Cursor.Current=System.Windows.Forms.Cursors.No;
+				}
+				else
+				{
+					pos.TargetProvider.DrawReversibleMarker(pos.Position,pos.Before);
+					m_InsertPosition=pos.Position;
+					m_InsertBefore=pos.Before;
+					m_DesignTimeProvider=pos.TargetProvider;
+					if(!m_SuspendInternalCursor)
+						System.Windows.Forms.Cursor.Current=System.Windows.Forms.Cursors.Hand;
+				}
+			}
+			else
+			{
+				if(!m_SuspendInternalCursor)
+					System.Windows.Forms.Cursor.Current=System.Windows.Forms.Cursors.No;
+			}
+		}
+
+		private void MouseDragDrop(int x, int y)
+		{
+			if(!m_DragInProgress)
+				return;
+			BaseItem dragItem=m_DragItem;
+			BaseItem container=this.GetItemContainer();
+			bool changed=false;
+
+			if(m_DesignTimeProvider!=null)
+			{
+				if(x==-1 && y==-1)
+				{
+					// Cancel state
+					m_DesignTimeProvider.DrawReversibleMarker(m_InsertPosition, m_InsertBefore);
+				}
+				else
+				{
+					m_DesignTimeProvider.DrawReversibleMarker(m_InsertPosition, m_InsertBefore);
+					if(dragItem!=null)
+					{
+						BaseItem objParent=dragItem.Parent;
+						if(objParent!=null)
+						{
+							if(objParent==(BaseItem)m_DesignTimeProvider && m_InsertPosition>0)
+							{
+								if(objParent.SubItems.IndexOf(dragItem)<m_InsertPosition)
+									m_InsertPosition--;
+							}
+							objParent.SubItems.Remove(dragItem);
+						}
+						m_DesignTimeProvider.InsertItemAt(dragItem,m_InsertPosition,m_InsertBefore);
+						m_DesignTimeProvider=null;
+						changed=true;
+						if(dragItem.Parent!=null && dragItem.Parent!=this.GetItemContainer())
+						{
+							IComponentChangeService cc=(IComponentChangeService)GetService(typeof(IComponentChangeService));
+							if(cc!=null)
+								cc.OnComponentChanged(dragItem.Parent,TypeDescriptor.GetProperties(typeof(BaseItem))["SubItems"],null,null);
+						}
+					}
+				}
+			}
+			else if(x!=-1 && y!=-1 && dragItem is ControlContainerItem)
+			{
+				BaseItem parent=container;
+                parent.SubItems.Add(dragItem);
+				IComponentChangeService cc=(IComponentChangeService)GetService(typeof(IComponentChangeService));
+				if(cc!=null)
+					cc.OnComponentChanged(dragItem.Parent,TypeDescriptor.GetProperties(typeof(BaseItem))["SubItems"],null,null);
+				changed=true;
+			}
+
+			m_DesignTimeProvider=null;
+			m_DragInProgress=false;
+			if(!m_SuspendInternalCursor)
+				System.Windows.Forms.Cursor.Current=System.Windows.Forms.Cursors.Default;
+			if(dragItem!=null)
+				dragItem._IgnoreClick=true;
+			container.InternalMouseUp(new MouseEventArgs(MouseButtons.Left,0,x,y,0));
+			if(dragItem!=null)
+				dragItem._IgnoreClick=false;
+
+			m_DragItem=null;
+			this.RecalcLayout();
+
+			if(changed)
+			{
+				IComponentChangeService cc=(IComponentChangeService)GetService(typeof(IComponentChangeService));
+				if(cc!=null)
+				{
+					cc.OnComponentChanged(this.Control,null,null,null);
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets whether drag and drop of BaseItems is enabled. Default is false.
+		/// </summary>
+		protected virtual bool EnableItemDragDrop
+		{
+			get {return m_EnableItemDragDrop;}
+			set {m_EnableItemDragDrop=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets whether dropping of external control into Bar is enabled. Default is false. 
+		/// </summary>
+		protected virtual bool AcceptExternalControls
+		{
+			get {return m_AcceptExternalControls;}
+			set {m_AcceptExternalControls=value;}
+		}
+
+		public void StartExternalDrag(BaseItem item)
+		{
+			if(!m_DragInProgress && m_DesignerHost!=null)
+			{
+				m_SuspendInternalCursor=false;
+				m_MouseDownPoint=this.Control.PointToClient(System.Windows.Forms.Control.MousePosition);
+				this.StartItemDrag(item);
+				m_DesignerHost.Capture=true;
+			}
+		}
+
+		protected virtual bool IsDockableWindow
+		{
+			get {return false;}
+		}
+
+		protected virtual void SelectComponent(IComponent comp, SelectionTypes selectionType)
+		{
+			ISelectionService selection = (ISelectionService) this.GetService(typeof(ISelectionService));
+			if(selection!=null)
+			{
+				ArrayList arr=new ArrayList(1);
+				arr.Add(comp);
+				selection.SetSelectedComponents(arr,selectionType);
+			}
+		}
+
+		protected virtual bool MouseDownSelectionPerformed
+		{
+			get {return m_MouseDownSelectionPerformed;}
+			set {m_MouseDownSelectionPerformed=value;}
+		}
+		#endregion
+
+		#region IDesignerServices Implementation
+		public object CreateComponent(System.Type componentClass)
+		{
+			IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+			if(dh==null)
+				return null;
+			return dh.CreateComponent(componentClass);
+		}
+
+		public void DestroyComponent(IComponent c)
+		{
+			IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+			if(dh==null)
+				return;
+			dh.DestroyComponent(c);
+		}
+
+		object IDesignerServices.GetService(Type serviceType)
+		{
+			return this.GetService(serviceType);
+		}
+		#endregion
+
+		private void DesignerSelectionChanged(object sender, EventArgs e)
+		{
+			ISelectionService sel=this.GetService(typeof(ISelectionService)) as ISelectionService;
+			if(sel==null)
+			{
+				SetComponentSelected(false);
+				return;
+			}
+			bool selected=false;
+			if(sel.PrimarySelection==this.Control || sel.PrimarySelection==this.GetItemContainerControl())
+				selected=true;
+			else if(sel.PrimarySelection is BaseItem && ((BaseItem)sel.PrimarySelection).ContainerControl==this.GetItemContainerControl())
+				selected=true;
+
+			SetComponentSelected(selected);
+		}
+	}
+
+	#region IDesignerServices
+	/// <summary>
+	/// Classes used for internal support of design-time features.
+	/// </summary>
+	public interface IDesignerServices
+	{
+		/// <summary>
+		/// Creates new component.
+		/// </summary>
+		/// <param name="componentClass">Component type to create</param>
+		/// <returns>New instance of component</returns>
+		object CreateComponent(System.Type componentClass);
+		/// <summary>
+		/// Destroys component
+		/// </summary>
+		/// <param name="c">Component to destroy</param>
+		void DestroyComponent(IComponent c);
+
+		/// <summary>
+		/// Gets specified designer service.
+		/// </summary>
+		/// <param name="serviceType">Type of the service to get</param>
+		/// <returns>Returns reference to the service.</returns>
+		object GetService(Type serviceType);
+	}
+
+	/// <summary>
+	/// Interface implemented by target Bar interested in access to designer.
+	/// </summary>
+	public interface IBarDesignerServices
+	{
+		/// <summary>
+		/// Gets or sets the BarBaseControlDesigner instance.
+		/// </summary>
+		BarBaseControlDesigner Designer {get;set;}
+	}
+	#endregion
+}
diff --git a/PROMS/DotNetBar Source Code/BarDesigner.cs b/PROMS/DotNetBar Source Code/BarDesigner.cs
new file mode 100644
index 00000000..b1cd258c
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/BarDesigner.cs	
@@ -0,0 +1,701 @@
+using System;
+using System.ComponentModel;
+using System.ComponentModel.Design;
+using System.Windows.Forms;
+using System.ComponentModel.Design.Serialization;
+using System.CodeDom;
+using System.Drawing;
+using System.Collections;
+using System.Windows.Forms.Design;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Represents Windows Forms designer for Bar control.
+	/// </summary>
+	public class BarDesigner:BarBaseControlDesigner
+	{
+		#region Internal Implementation
+		private int m_MouseDownSelectedTabIndex=-1;
+		private bool m_IsDocking=false;
+		private Form m_OutlineForm=null;
+		private DockSiteInfo m_DockInfo;
+		private bool m_DragDrop=false;
+
+		public BarDesigner():base()
+		{
+			m_DockInfo=new DockSiteInfo();
+			this.EnableItemDragDrop=true;
+		}
+
+		public override DesignerVerbCollection Verbs 
+		{
+			get 
+			{
+				Bar bar=this.Control as Bar;
+				DesignerVerb[] verbs=null;
+				if(this.IsDockableWindow)
+				{
+					verbs = new DesignerVerb[]
+						{
+							new DesignerVerb("Create Document", new EventHandler(CreateDocument))};
+				}
+				else
+				{
+					verbs = new DesignerVerb[]
+						{
+							new DesignerVerb("Create Button", new EventHandler(CreateButton)),
+							new DesignerVerb("Create Text Box", new EventHandler(CreateTextBox)),
+							new DesignerVerb("Create Combo Box", new EventHandler(CreateComboBox)),
+							new DesignerVerb("Create Label", new EventHandler(CreateLabel)),
+							new DesignerVerb("Open Bar Designer", new EventHandler(EditBar))};
+				}
+				
+				return new DesignerVerbCollection(verbs);
+			}
+		}
+
+		private void EditBar(object sender, EventArgs e) 
+		{
+			OpenDesigner();
+		}
+
+		public override void DoDefaultAction()
+		{
+			ISelectionService selection = (ISelectionService) this.GetService(typeof(ISelectionService));
+			if(!this.IsDockableWindow && selection!=null && selection.PrimarySelection==this.Control)
+				OpenDesigner();
+			else
+				base.DoDefaultAction();
+		}
+
+		private void OpenDesigner()
+		{
+			Bar bar=this.Control as Bar;
+			if(bar!=null)	
+			{
+				DotNetBarManagerDesigner.OpenDesignerEditor(null,bar,this);
+			}
+		}
+
+#if FRAMEWORK20
+        public override void InitializeNewComponent(IDictionary defaultValues)
+        {
+            base.InitializeNewComponent(defaultValues);
+            SetDesignTimeDefaults();
+        }
+#else
+		public override void OnSetComponentDefaults()
+		{
+			base.OnSetComponentDefaults();
+			SetDesignTimeDefaults();
+		}
+#endif
+
+        private void SetDesignTimeDefaults()
+        {
+            Bar bar = this.Component as Bar;
+            if (bar == null)
+                return;
+            bar.Style = eDotNetBarStyle.Office2003;
+        }
+
+		protected override BaseItem GetItemContainer()
+		{
+			Bar bar=this.Control as Bar;
+			if(bar!=null)
+				return bar.ItemsContainer;
+			return null;
+		}
+
+		protected override void RecalcLayout()
+		{
+			Bar bar=this.GetItemContainerControl() as Bar;
+			if(bar!=null)
+				bar.RecalcLayout();
+		}
+
+		protected override void OnSubItemsChanging()
+		{
+			base.OnSubItemsChanging();
+			IComponentChangeService change=this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+			if(change!=null)
+			{
+				Bar bar=this.GetItemContainerControl() as Bar;
+				change.OnComponentChanging(this.Component,TypeDescriptor.GetProperties(bar).Find("Items",true));
+			}
+		}
+
+		protected override void OnSubItemsChanged()
+		{
+			base.OnSubItemsChanged();
+			IComponentChangeService change=this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+			if(change!=null)
+			{
+				Bar bar=this.GetItemContainerControl() as Bar;
+				change.OnComponentChanged(this.Component,TypeDescriptor.GetProperties(bar).Find("Items",true),null,null);
+			}
+		}
+
+		
+		#endregion
+
+		#region Support For Dockable Windows
+
+		public override SelectionRules SelectionRules
+		{
+			get
+			{
+				if(this.IsDockableWindow)
+					return (SelectionRules.Locked);
+				return base.SelectionRules;
+			}
+		}
+
+		public override bool CanParent(Control control)
+		{
+			if(control.Contains(this.Control))
+				return false;
+			if(this.IsDockableWindow && !(control is PanelDockContainer))
+				return false;
+			return base.CanParent(control);
+		}
+
+		protected override bool IsDockableWindow
+		{
+			get
+			{
+				Bar bar=this.Control as Bar;
+				if(bar!=null && bar.LayoutType==eLayoutType.DockContainer)
+					return true;
+				return false;
+			}
+		}
+
+		private void SelectDockTab(int index)
+		{
+			Bar bar=this.Control as Bar;
+			if(bar==null) return;
+
+			IComponentChangeService cc=(IComponentChangeService)GetService(typeof(IComponentChangeService));
+			if(cc!=null)
+				cc.OnComponentChanging(bar,TypeDescriptor.GetProperties(typeof(Bar))["SelectedDockTab"]);
+			bar.SelectedDockTab=index;
+			if(cc!=null)
+				cc.OnComponentChanged(bar,TypeDescriptor.GetProperties(typeof(Bar))["SelectedDockTab"],null,null);
+			if(bar.SelectedDockTab>=0)
+			{
+#if FRAMEWORK20
+                SelectComponent(bar.Items[bar.SelectedDockTab], SelectionTypes.Primary);
+#else
+                SelectComponent(bar.Items[bar.SelectedDockTab],SelectionTypes.MouseDown);
+#endif
+                DockContainerItem dock=bar.Items[bar.SelectedDockTab] as DockContainerItem;
+				if(dock!=null && dock.Control!=null)
+				{
+					dock.Control.BringToFront();
+					if(cc!=null)
+						cc.OnComponentChanged(bar,TypeDescriptor.GetProperties(typeof(Bar))["Controls"],null,null);
+				}
+			}
+		}
+
+		protected override eDotNetBarStyle Style
+		{
+			get
+			{
+				Bar bar=this.Control as Bar;
+				if(bar!=null)
+					return bar.Style;
+				return base.Style;;
+			}
+		}
+
+		protected override void OtherComponentRemoving(object sender, ComponentEventArgs e)
+		{
+			Bar bar=this.Control as Bar;
+			if(e.Component is Control)
+			{
+				BaseItem item=GetControlItem(e.Component as Control);
+				if(item!=null && item.Parent!=null && item.Parent.SubItems.Contains(item))
+				{
+					if(item is DockContainerItem)
+						((DockContainerItem)item).Control=null;
+                    else if(item is ControlContainerItem)
+                        ((ControlContainerItem)item).Control = null;
+					item.Parent.SubItems.Remove(item);
+					DestroySubItems(item);
+					this.RecalcLayout();
+					if(bar!=null && bar.Items.Count>0)
+						SelectDockTab(0);
+				}
+			}
+			else if(!m_InternalRemoving && bar!=null && e.Component is DockContainerItem && bar.Items.Contains((BaseItem)e.Component))
+			{
+				// Throw exception to stop removing the last dock container item.
+				if(bar.VisibleItemCount==1)
+					throw new InvalidOperationException("Cannot delete last DockContainerItem object. Select and Delete Bar object instead");
+			}
+			base.OtherComponentRemoving(sender,e);
+		}
+
+		protected override bool OnMouseDown(ref Message m)
+		{
+			Bar bar=this.Control as Bar;
+			if(!this.IsDockableWindow || bar==null)
+				return base.OnMouseDown(ref m);
+			Point p=Control.MousePosition;
+			int i=GetTabAt(p.X,p.Y);
+			if(i>=0 && m.Msg==NativeFunctions.WM_RBUTTONDOWN)
+			{
+				ISelectionService selection = (ISelectionService) this.GetService(typeof(ISelectionService));
+				if(selection!=null && selection.PrimarySelection!=bar.Items[i])
+				{
+					ArrayList arr=new ArrayList(1);
+					arr.Add(bar.Items[i]);
+#if FRAMEWORK20
+                    selection.SetSelectedComponents(arr, SelectionTypes.Primary);
+#else
+                    selection.SetSelectedComponents(arr,SelectionTypes.MouseDown);
+#endif
+
+                    SelectDockTab(i);
+					this.OnContextMenu(System.Windows.Forms.Control.MousePosition.X,System.Windows.Forms.Control.MousePosition.Y);
+					return true;
+				}
+			}
+
+
+			return base.OnMouseDown(ref m);
+		}
+
+		protected override void OnMouseDragBegin(int x, int y)
+		{
+			Bar bar=this.Control as Bar;
+			m_DragDrop=false;
+
+			if(bar!=null && this.IsDockableWindow)
+			{
+				m_MouseDownSelectedTabIndex=GetTabAt(x,y);
+				if(m_MouseDownSelectedTabIndex!=-1)
+				{
+					if(bar.SelectedDockTab!=m_MouseDownSelectedTabIndex)
+						SelectDockTab(m_MouseDownSelectedTabIndex);
+					m_DragDrop=true;
+				}
+				else if(IsInTabSystemBox(x,y))
+				{
+					MouseDownTabSystemBox(x,y);
+				}
+				else if(IsCaptionGrabHandle(bar))
+				{
+					Point clientPos=bar.PointToClient(new Point(x,y));
+					if(bar.GrabHandleRect.Contains(clientPos))
+						m_DragDrop=true;
+				}
+			}
+			base.OnMouseDragBegin(x,y);
+			
+			if(m_MouseDownSelectedTabIndex!=-1)
+			{
+				ISelectionService selection = (ISelectionService) this.GetService(typeof(ISelectionService));
+				if(selection!=null && selection.PrimarySelection!=bar.Items[m_MouseDownSelectedTabIndex])
+				{
+					ArrayList arr=new ArrayList(1);
+					arr.Add(bar.Items[m_MouseDownSelectedTabIndex]);
+#if FRAMEWORK20
+                    selection.SetSelectedComponents(arr, SelectionTypes.Primary);
+#else
+                    selection.SetSelectedComponents(arr,SelectionTypes.Click);
+#endif
+                }
+			}
+
+			if(m_DragDrop)
+			{
+				bar.Capture = true;
+				NativeFunctions.RECT rect = new NativeFunctions.RECT(0,0,0,0);
+				NativeFunctions.GetWindowRect(bar.Parent.Handle, ref rect);
+				Rectangle r=Rectangle.FromLTRB(rect.Left, rect.Top, rect.Right, rect.Bottom);
+				Cursor.Clip=r;
+			}
+		}
+
+		private bool IsCaptionGrabHandle(Bar bar)
+		{
+			return (bar.GrabHandleStyle==eGrabHandleStyle.Caption || bar.GrabHandleStyle==eGrabHandleStyle.CaptionTaskPane);
+		}
+
+		protected override void OnMouseDragMove(int x, int y)
+		{
+			if(!this.IsDockableWindow || !m_DragDrop)
+			{
+				base.OnMouseDragMove(x,y);
+				return;
+			}
+
+			Point screenPos=new Point(x,y);
+			
+			Bar bar=this.Control as Bar;
+			if(bar==null) return;
+
+			Point tabPos=bar.DockTabControl.PointToClient(screenPos);
+			if(bar.DockTabControl!=null && bar.DockTabControl.ClientRectangle.Contains(tabPos))
+			{
+				if(m_IsDocking)
+				{
+					EndBarOwnerDocking(bar);
+					m_IsDocking=false;
+					m_DockInfo=new DockSiteInfo();
+				}
+				MouseEventArgs e=new MouseEventArgs(MouseButtons.Left,0,tabPos.X,tabPos.Y,0);
+				bar.DockTabControl.InternalOnMouseMove(e);
+			}
+			else
+			{
+				m_IsDocking=true;
+				IOwnerBarSupport ownerDock=bar.Owner as IOwnerBarSupport;
+				m_DockInfo=ownerDock.GetDockInfo(bar,screenPos.X,screenPos.Y);
+				if(m_DockInfo.objDockSite==null)
+				{
+					if(m_OutlineForm!=null)
+						m_OutlineForm.Hide();
+				}
+				else
+				{
+					Rectangle r=m_DockInfo.objDockSite.GetBarDockRectangle(bar,ref m_DockInfo);
+					if(!r.IsEmpty)
+					{
+						if(m_OutlineForm==null)
+							m_OutlineForm=BarFunctions.CreateOutlineForm();
+						NativeFunctions.SetWindowPos(m_OutlineForm.Handle.ToInt32(),NativeFunctions.HWND_TOP,r.X,r.Y,r.Width,r.Height,NativeFunctions.SWP_SHOWWINDOW | NativeFunctions.SWP_NOACTIVATE);
+					}
+					else if(m_OutlineForm!=null)
+						m_OutlineForm.Hide();
+				}
+			}
+		}
+
+		protected override void OnMouseDragEnd(bool cancel)
+		{
+			if(!this.IsDockableWindow)
+			{
+				base.OnMouseDragEnd(cancel);
+				return;
+			}
+
+			this.Control.Capture = false;
+			Cursor.Clip = Rectangle.Empty;
+			
+			Bar bar=this.Control as Bar;
+
+			if(cancel || bar==null || !m_DragDrop)
+			{
+				base.OnMouseDragEnd(cancel);
+				return;
+			}
+
+			m_DragDrop=false;
+
+			IDesignerHost designerHost=this.GetService(typeof(IDesignerHost)) as IDesignerHost;
+			if(designerHost==null)
+			{
+				EndBarOwnerDocking(bar);
+				m_IsDocking=false;
+				m_MouseDownSelectedTabIndex=-1;
+				base.OnMouseDragEnd(cancel);
+				return;
+			}
+
+			if(m_IsDocking)
+			{
+				EndBarOwnerDocking(bar);
+				// Moves and docks the selected DockContainerItem or bar
+				Bar referenceBar=m_DockInfo.MouseOverBar;
+				if(m_DockInfo.MouseOverDockSide!=eDockSide.None && m_DockInfo.MouseOverDockSide!=eDockSide.Document && (referenceBar!=bar || m_MouseDownSelectedTabIndex!=-1 && bar.VisibleItemCount>1))
+				{
+					DesignerTransaction trans=designerHost.CreateTransaction("DotNetBar Docking");
+					IComponentChangeService cc=(IComponentChangeService)GetService(typeof(IComponentChangeService));
+					try
+					{
+						Bar newBar=null;
+						if(m_MouseDownSelectedTabIndex!=-1 && bar.VisibleItemCount>1)
+							newBar=BarFunctions.CreateDuplicateDockBar(bar,this);
+						else
+							newBar=bar;
+
+						cc.OnComponentChanging(bar,TypeDescriptor.GetProperties(typeof(Bar))["SelectedDockTab"]);
+						
+						if(m_MouseDownSelectedTabIndex!=-1 && bar.VisibleItemCount>1)
+						{
+							DockContainerItem item=bar.Items[bar.SelectedDockTab] as DockContainerItem;
+							cc.OnComponentChanging(bar,TypeDescriptor.GetProperties(typeof(Bar))["Controls"]);
+							cc.OnComponentChanging(bar,TypeDescriptor.GetProperties(typeof(Bar))["Items"]);
+							bar.Items.Remove(item);
+							cc.OnComponentChanged(bar,TypeDescriptor.GetProperties(typeof(Bar))["Items"],null,null);
+							cc.OnComponentChanged(bar,TypeDescriptor.GetProperties(typeof(Bar))["Controls"],null,null);
+
+							cc.OnComponentChanging(newBar,TypeDescriptor.GetProperties(typeof(Bar))["Controls"]);
+							cc.OnComponentChanging(newBar,TypeDescriptor.GetProperties(typeof(Bar))["Items"]);
+							newBar.Items.Add(item);
+							cc.OnComponentChanged(newBar,TypeDescriptor.GetProperties(typeof(Bar))["Items"],null,null);
+							cc.OnComponentChanged(newBar,TypeDescriptor.GetProperties(typeof(Bar))["Controls"],null,null);							
+						}
+						
+						cc.OnComponentChanging(m_DockInfo.objDockSite,TypeDescriptor.GetProperties(typeof(DockSite))["Controls"]);
+						cc.OnComponentChanging(newBar,null);
+						cc.OnComponentChanging(referenceBar,null);
+						cc.OnComponentChanging(m_DockInfo.objDockSite,TypeDescriptor.GetProperties(typeof(DockSite))["DocumentDockContainer"]);
+						m_DockInfo.objDockSite.GetDocumentUIManager().Dock(referenceBar,newBar,m_DockInfo.MouseOverDockSide);
+						cc.OnComponentChanged(m_DockInfo.objDockSite,TypeDescriptor.GetProperties(typeof(DockSite))["DocumentDockContainer"],null,null);
+						cc.OnComponentChanged(referenceBar,null,null,null);
+						cc.OnComponentChanged(newBar,null,null,null);
+						cc.OnComponentChanged(m_DockInfo.objDockSite,TypeDescriptor.GetProperties(typeof(DockSite))["Controls"],null,null);
+
+					}
+					catch
+					{
+						trans.Cancel();
+						throw;
+					}
+					finally
+					{
+						if(!trans.Canceled)
+							trans.Commit();
+					}
+				}
+				else if(m_DockInfo.MouseOverDockSide==eDockSide.Document && bar!=referenceBar)
+				{
+					BarDesigner referenceDesigner=designerHost.GetDesigner(referenceBar) as BarDesigner;
+					if(referenceDesigner!=null)
+						referenceDesigner.DelayedDockTabs(bar,m_MouseDownSelectedTabIndex);
+				}
+
+				m_DockInfo=new DockSiteInfo();
+			}
+			else if(m_MouseDownSelectedTabIndex!=-1)
+			{
+				if(m_MouseDownSelectedTabIndex!=bar.SelectedDockTab)
+				{
+					IComponentChangeService cc=(IComponentChangeService)GetService(typeof(IComponentChangeService));
+					if(cc!=null)
+					{
+						cc.OnComponentChanged(bar,TypeDescriptor.GetProperties(typeof(Bar))["Items"],null,null);
+						cc.OnComponentChanged(bar,TypeDescriptor.GetProperties(typeof(Bar))["SelectedDockTab"],null,null);
+						cc.OnComponentChanged(bar,TypeDescriptor.GetProperties(typeof(Bar))["Controls"],null,null);
+					}
+				}
+			}
+			m_IsDocking=false;
+			m_MouseDownSelectedTabIndex=-1;
+			base.OnMouseDragEnd(cancel);
+		}
+
+		private Timer m_TimerDelayRemove=null;
+		private Bar m_DelayDockBar=null;
+		private int m_DelayDockTabIndex=-1;
+		internal void DelayedDockTabs(Bar bar, int tabIndex)
+		{
+			if(m_TimerDelayRemove==null)
+			{
+				m_DelayDockBar=bar;
+				m_DelayDockTabIndex=tabIndex;
+				m_TimerDelayRemove=new Timer();
+				m_TimerDelayRemove.Tick+=new EventHandler(this.TimerTickDelayRemove);
+				m_TimerDelayRemove.Interval=200;
+				m_TimerDelayRemove.Enabled=true;
+				m_TimerDelayRemove.Start();
+			}
+		}
+		private void TimerTickDelayRemove(object sender, EventArgs e)
+		{
+			m_TimerDelayRemove.Stop();
+			m_TimerDelayRemove.Enabled=false;
+			m_TimerDelayRemove.Dispose();
+			m_TimerDelayRemove=null;
+
+			DockTabs(m_DelayDockBar,m_DelayDockTabIndex,this.Control as Bar);
+
+			m_DelayDockBar=null;
+			m_DelayDockTabIndex=-1;
+		}
+
+		private void DockTabs(Bar sourceBar, int selectedTabIndex, Bar targetBar)
+		{
+			// Move Dock-container item to different bar
+			IDesignerHost designerHost=this.GetService(typeof(IDesignerHost)) as IDesignerHost;
+			DesignerTransaction trans=designerHost.CreateTransaction("DotNetBar Docking");
+			IComponentChangeService cc=(IComponentChangeService)GetService(typeof(IComponentChangeService));
+			try
+			{
+				DockContainerItem[] items=null;
+				if(selectedTabIndex!=-1)
+					items=new DockContainerItem[] {sourceBar.Items[sourceBar.SelectedDockTab] as DockContainerItem};
+				else
+				{
+					items=new DockContainerItem[sourceBar.Items.Count];
+					sourceBar.Items.CopyTo(items,0);
+				}
+
+				cc.OnComponentChanging(sourceBar,TypeDescriptor.GetProperties(typeof(Bar))["Controls"]);
+				cc.OnComponentChanging(sourceBar,TypeDescriptor.GetProperties(typeof(Bar))["Items"]);
+				sourceBar.Items.RemoveRange(items);
+				cc.OnComponentChanged(sourceBar,TypeDescriptor.GetProperties(typeof(Bar))["Items"],null,null);
+				cc.OnComponentChanged(sourceBar,TypeDescriptor.GetProperties(typeof(Bar))["Controls"],null,null);
+
+				cc.OnComponentChanging(targetBar,TypeDescriptor.GetProperties(typeof(Bar))["Controls"]);
+				cc.OnComponentChanging(targetBar,TypeDescriptor.GetProperties(typeof(Bar))["Items"]);
+				targetBar.Items.AddRange(items);
+				cc.OnComponentChanged(targetBar,TypeDescriptor.GetProperties(typeof(Bar))["Items"],null,null);
+				cc.OnComponentChanged(targetBar,TypeDescriptor.GetProperties(typeof(Bar))["Controls"],null,null);
+
+				if(sourceBar.Items.Count==0)
+				{
+					DockSite sourceDockSite=sourceBar.Parent as DockSite;
+					cc.OnComponentChanging(sourceDockSite,TypeDescriptor.GetProperties(typeof(DockSite))["DocumentDockContainer"]);
+					cc.OnComponentChanging(sourceBar,null);
+					sourceDockSite.GetDocumentUIManager().UnDock(sourceBar,false);
+					cc.OnComponentChanged(sourceBar,null,null,null);
+					cc.OnComponentChanged(sourceDockSite,TypeDescriptor.GetProperties(typeof(DockSite))["DocumentDockContainer"],null,null);
+
+					designerHost.DestroyComponent(sourceBar);
+				}
+
+				if(targetBar!=null && targetBar.SelectedDockTab>=0)
+				{
+					DockContainerItem dock=targetBar.Items[targetBar.SelectedDockTab] as DockContainerItem;
+					if(dock!=null && dock.Control!=null)
+					{
+						cc.OnComponentChanged(targetBar,TypeDescriptor.GetProperties(typeof(Bar))["Controls"],null,null);
+						dock.Control.BringToFront();
+						cc.OnComponentChanged(targetBar,TypeDescriptor.GetProperties(typeof(Bar))["Controls"],null,null);
+					}
+				}
+			}
+			catch
+			{
+				trans.Cancel();
+				throw;
+			}
+			finally
+			{
+				if(!trans.Canceled)
+					trans.Commit();
+			}
+		}
+
+		private void EndBarOwnerDocking(Bar bar)
+		{
+			IOwnerBarSupport barSupport=bar.Owner as IOwnerBarSupport;
+			if(barSupport!=null)
+				barSupport.DockComplete();
+			if(m_OutlineForm!=null)
+			{
+				m_OutlineForm.Hide();
+				m_OutlineForm.Dispose();
+				m_OutlineForm=null;
+			}
+		}
+
+		/// <summary>
+		/// Returns tab index under specified coordinates.
+		/// </summary>
+		/// <param name="x">Screen X coordinate</param>
+		/// <param name="y">Screen Y coordinate</param>
+		/// <returns>Tab index or -1 if tab was not found</returns>
+		private int GetTabAt(int x, int y)
+		{
+			Bar bar=this.Control as Bar;
+			if(bar==null) return -1;
+			
+			// Select dockable tab if mouse is clicked over the tab
+			if(this.IsDockableWindow && bar.DockTabControl!=null)
+			{
+				Point posTab=bar.DockTabControl.PointToClient(new Point(x,y));
+				if(bar.DockTabControl._TabSystemBox.Visible && bar.DockTabControl._TabSystemBox.DisplayRectangle.Contains(posTab))
+				{
+					return -1;
+				}
+				TabItem tab=bar.DockTabControl.HitTest(posTab.X,posTab.Y);
+				if(tab!=null)
+					return bar.Items.IndexOf(tab.AttachedItem);
+			}
+
+			return -1;
+		}
+
+		private bool IsInTabSystemBox(int x, int y)
+		{
+			Bar bar=this.Control as Bar;
+			if(bar==null) return false;
+
+			// Select dockable tab if mouse is clicked over the tab
+			if(this.IsDockableWindow && bar.DockTabControl!=null)
+			{
+				Point posTab=bar.DockTabControl.PointToClient(new Point(x,y));
+				if(bar.DockTabControl._TabSystemBox.Visible && bar.DockTabControl._TabSystemBox.DisplayRectangle.Contains(posTab))
+					return true;
+			}
+
+			return false;
+		}
+
+		private void MouseDownTabSystemBox(int x, int y)
+		{
+			Bar bar=this.Control as Bar;
+			if(bar==null) return;
+
+			// Select dockable tab if mouse is clicked over the tab
+			if(this.IsDockableWindow && bar.DockTabControl!=null)
+			{
+				Point posTab=bar.DockTabControl.PointToClient(new Point(x,y));
+				if(bar.DockTabControl._TabSystemBox.Visible && bar.DockTabControl._TabSystemBox.DisplayRectangle.Contains(posTab))
+				{
+					if(bar.DockTabControl._TabSystemBox.ForwardEnabled && bar.DockTabControl._TabSystemBox.ForwardRect.Contains(posTab))
+					{
+						bar.DockTabControl.ScrollForward();
+					}
+					else if(bar.DockTabControl._TabSystemBox.BackEnabled && bar.DockTabControl._TabSystemBox.BackRect.Contains(posTab))
+					{
+						bar.DockTabControl.ScrollBackwards();
+					}
+				}
+			}
+
+		}
+
+		/// <summary>
+		/// Removes all subitems from container.
+		/// </summary>
+		protected override void ThisComponentRemoving(object sender, ComponentEventArgs e)
+		{
+			if(!m_InternalRemoving)
+			{
+				m_InternalRemoving=true;
+				try
+				{
+					if(this.IsDockableWindow)
+					{
+						Bar bar=this.Control as Bar;
+						if(bar!=null && bar.DockSide==eDockSide.Document && bar.Parent is DockSite)
+						{
+							IComponentChangeService cc=this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+							if(cc!=null)
+								cc.OnComponentChanging(((DockSite)bar.Parent),TypeDescriptor.GetProperties(typeof(DockSite)).Find("DocumentDockContainer",true));
+							((DockSite)bar.Parent).GetDocumentUIManager().UnDock(bar,false);
+							if(cc!=null)
+								cc.OnComponentChanged(((DockSite)bar.Parent),TypeDescriptor.GetProperties(typeof(DockSite)).Find("DocumentDockContainer",true),null,null);
+						}
+					}
+				}
+				finally
+				{
+					m_InternalRemoving=false;
+				}
+			}
+
+			base.ThisComponentRemoving(sender,e);
+		}
+		#endregion
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/BarEditor.cs b/PROMS/DotNetBar Source Code/BarEditor.cs
new file mode 100644
index 00000000..e0acfce6
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/BarEditor.cs	
@@ -0,0 +1,2106 @@
+using System;
+using System.Drawing;
+using System.Collections;
+using System.ComponentModel;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Summary description for BarEditor.
+	/// </summary>
+	public class BarEditor : System.Windows.Forms.Form
+	{
+		private System.Windows.Forms.Panel panel1;
+		private System.Windows.Forms.TreeView barTree;
+		private System.Windows.Forms.PropertyGrid propertyGrid1;
+		private System.Windows.Forms.Splitter splitter1;
+		private System.ComponentModel.IContainer components;
+		private DevComponents.DotNetBar.DockSite barTopDockSite;
+		private DevComponents.DotNetBar.DockSite barBottomDockSite;
+		private DevComponents.DotNetBar.DockSite barLeftDockSite;
+		private DevComponents.DotNetBar.DockSite barRightDockSite;
+		private DevComponents.DotNetBar.DotNetBarManager barManager;
+		private System.Windows.Forms.ImageList imageList;
+
+		private DotNetBarManager m_DotNetBar;
+		private Bar m_Bar=null;
+		private TreeNode m_BarsNode=null,m_CategoriesNode=null,m_PopupsNode=null;
+
+		private System.Windows.Forms.Button btnClose;
+		private System.Windows.Forms.Button btnCancel;
+		private System.Windows.Forms.OpenFileDialog m_OpenFileDialog;
+		private Hashtable m_catTable;
+		private System.Windows.Forms.SaveFileDialog m_SaveFileDialog;
+		private System.Windows.Forms.ImageList m_BarImages;
+		private string m_DefinitionFileName="";
+		private bool m_ShowItemText=true;
+		private GridViewSubclass m_GridViewSubclass=null;
+		private bool m_DataChanged=false;
+		private HTMLHelp m_HtmlHelp=null;
+
+		internal IDesignerServices _barDesigner=null;
+
+		public BarEditor(DotNetBarManager dotnetbar)
+		{
+			m_DotNetBar=dotnetbar;
+			Initialize();
+		}
+
+		public BarEditor(Bar bar)
+		{
+            m_Bar=bar;
+			Initialize();
+		}
+
+		private void Initialize()
+		{
+			InitializeComponent();
+			if(m_Bar!=null)
+				propertyGrid1.BrowsableAttributes=new AttributeCollection(new Attribute[] {BrowsableAttribute.Yes});
+			else
+				propertyGrid1.BrowsableAttributes=new AttributeCollection(new Attribute[] {DevCoBrowsable.Yes});
+			propertyGrid1.CommandsVisibleIfAvailable=false;
+			LoadResourceImages();
+			m_catTable=new Hashtable(20);
+			
+			m_GridViewSubclass=new GridViewSubclass();
+			m_GridViewSubclass.OnRightMouseDown+=new EventHandler(this.GridViewMouseDown);
+
+			foreach(Control ctrl in propertyGrid1.Controls)
+			{
+				if(ctrl.GetType().ToString().IndexOf("PropertyGridView")>=0)
+				{
+					m_GridViewSubclass.AssignHandle(ctrl.Handle);
+					break;
+				}
+			}
+
+			if(m_DotNetBar!=null && !m_DotNetBar.IsDesignTime() || m_Bar!=null)
+			{
+				btnCancel.Visible=false;
+				btnClose.Location=btnCancel.Location;
+			}
+
+			CreateToolbar();
+			RefreshView();
+		}
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		protected override void Dispose( bool disposing )
+		{
+			if( disposing )
+			{
+				if(components != null)
+				{
+					components.Dispose();
+				}
+			}
+			base.Dispose( disposing );
+		}
+
+		#region Windows Form 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();
+			System.Resources.ResourceManager resources = new System.Resources.ResourceManager(typeof(BarEditor));
+			this.panel1 = new System.Windows.Forms.Panel();
+			this.propertyGrid1 = new System.Windows.Forms.PropertyGrid();
+			this.splitter1 = new System.Windows.Forms.Splitter();
+			this.barTree = new System.Windows.Forms.TreeView();
+			this.imageList = new System.Windows.Forms.ImageList(this.components);
+		#if TRIAL
+			this.barManager = new DevComponents.DotNetBar.DotNetBarManager(this.components);
+		#else
+			this.barManager = new DevComponents.DotNetBar.DotNetBarManager(this.components,false);
+		#endif
+			this.barBottomDockSite = new DevComponents.DotNetBar.DockSite();
+			this.m_BarImages = new System.Windows.Forms.ImageList(this.components);
+			this.barLeftDockSite = new DevComponents.DotNetBar.DockSite();
+			this.barRightDockSite = new DevComponents.DotNetBar.DockSite();
+			this.barTopDockSite = new DevComponents.DotNetBar.DockSite();
+			this.m_OpenFileDialog = new System.Windows.Forms.OpenFileDialog();
+			this.m_SaveFileDialog = new System.Windows.Forms.SaveFileDialog();
+			this.btnClose = new System.Windows.Forms.Button();
+			this.btnCancel = new System.Windows.Forms.Button();
+			this.panel1.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// panel1
+			// 
+			this.panel1.Anchor = (((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+				| System.Windows.Forms.AnchorStyles.Left) 
+				| System.Windows.Forms.AnchorStyles.Right);
+			this.panel1.Controls.AddRange(new System.Windows.Forms.Control[] {
+																				 this.propertyGrid1,
+																				 this.splitter1,
+																				 this.barTree});
+			this.panel1.Location = new System.Drawing.Point(8, 48);
+			this.panel1.Name = "panel1";
+			this.panel1.Size = new System.Drawing.Size(520, 232);
+			this.panel1.TabIndex = 5;
+			// 
+			// propertyGrid1
+			// 
+			this.propertyGrid1.CommandsVisibleIfAvailable = true;
+			this.propertyGrid1.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.propertyGrid1.LargeButtons = false;
+			this.propertyGrid1.LineColor = System.Drawing.SystemColors.ScrollBar;
+			this.propertyGrid1.Location = new System.Drawing.Point(182, 0);
+			this.propertyGrid1.Name = "propertyGrid1";
+			this.propertyGrid1.Size = new System.Drawing.Size(338, 232);
+			this.propertyGrid1.TabIndex = 1;
+			this.propertyGrid1.Text = "propertyGrid1";
+			this.propertyGrid1.ViewBackColor = System.Drawing.SystemColors.Window;
+			this.propertyGrid1.ViewForeColor = System.Drawing.SystemColors.WindowText;
+			this.propertyGrid1.PropertyValueChanged += new System.Windows.Forms.PropertyValueChangedEventHandler(this.OnPropertyValueChanged);
+			// 
+			// splitter1
+			// 
+			this.splitter1.Location = new System.Drawing.Point(176, 0);
+			this.splitter1.Name = "splitter1";
+			this.splitter1.Size = new System.Drawing.Size(6, 232);
+			this.splitter1.TabIndex = 2;
+			this.splitter1.TabStop = false;
+			// 
+			// barTree
+			// 
+			this.barTree.Dock = System.Windows.Forms.DockStyle.Left;
+			this.barTree.HideSelection = false;
+			this.barTree.ImageList = this.imageList;
+			this.barTree.Name = "barTree";
+			this.barTree.Size = new System.Drawing.Size(176, 232);
+			this.barTree.TabIndex = 0;
+			this.barTree.KeyDown += new System.Windows.Forms.KeyEventHandler(this.TreeKeyDown);
+			this.barTree.MouseDown += new System.Windows.Forms.MouseEventHandler(this.TreeMouseDown);
+			this.barTree.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.ItemSelected);
+			this.barTree.BeforeSelect += new System.Windows.Forms.TreeViewCancelEventHandler(this.BeforeItemSelect);
+			this.barTree.AfterLabelEdit += new System.Windows.Forms.NodeLabelEditEventHandler(this.ItemEdited);
+			this.barTree.BeforeCollapse += new System.Windows.Forms.TreeViewCancelEventHandler(this.NodeCollapsing);
+			this.barTree.BeforeExpand += new System.Windows.Forms.TreeViewCancelEventHandler(this.NodeExpanding);
+			// 
+			// imageList
+			// 
+			this.imageList.ColorDepth = System.Windows.Forms.ColorDepth.Depth8Bit;
+			this.imageList.ImageSize = new System.Drawing.Size(16, 16);
+			this.imageList.TransparentColor = System.Drawing.Color.Magenta;
+			// 
+			// barManager
+			// 
+			this.barManager.BottomDockSite = this.barBottomDockSite;
+			this.barManager.Images = this.m_BarImages;
+			this.barManager.ImagesLarge = null;
+			this.barManager.ImagesMedium = null;
+			this.barManager.LeftDockSite = this.barLeftDockSite;
+			this.barManager.ParentForm = this;
+			this.barManager.RightDockSite = this.barRightDockSite;
+			this.barManager.TopDockSite = this.barTopDockSite;
+			this.barManager.UseHook = true;
+			this.barManager.ItemClick += new System.EventHandler(this.BarItemClick);
+			// 
+			// barBottomDockSite
+			// 
+			this.barBottomDockSite.Dock = System.Windows.Forms.DockStyle.Bottom;
+			this.barBottomDockSite.Location = new System.Drawing.Point(0, 325);
+			this.barBottomDockSite.Name = "barBottomDockSite";
+			this.barBottomDockSite.Size = new System.Drawing.Size(536, 0);
+			this.barBottomDockSite.TabIndex = 8;
+			this.barBottomDockSite.TabStop = false;
+			// 
+			// m_BarImages
+			// 
+			this.m_BarImages.ColorDepth = System.Windows.Forms.ColorDepth.Depth8Bit;
+			this.m_BarImages.ImageSize = new System.Drawing.Size(16, 16);
+			this.m_BarImages.TransparentColor = System.Drawing.Color.Magenta;
+			// 
+			// barLeftDockSite
+			// 
+			this.barLeftDockSite.Dock = System.Windows.Forms.DockStyle.Left;
+			this.barLeftDockSite.Name = "barLeftDockSite";
+			this.barLeftDockSite.Size = new System.Drawing.Size(0, 325);
+			this.barLeftDockSite.TabIndex = 9;
+			this.barLeftDockSite.TabStop = false;
+			// 
+			// barRightDockSite
+			// 
+			this.barRightDockSite.Dock = System.Windows.Forms.DockStyle.Right;
+			this.barRightDockSite.Location = new System.Drawing.Point(536, 0);
+			this.barRightDockSite.Name = "barRightDockSite";
+			this.barRightDockSite.Size = new System.Drawing.Size(0, 325);
+			this.barRightDockSite.TabIndex = 10;
+			this.barRightDockSite.TabStop = false;
+			// 
+			// barTopDockSite
+			// 
+			this.barTopDockSite.Dock = System.Windows.Forms.DockStyle.Top;
+			this.barTopDockSite.Name = "barTopDockSite";
+			this.barTopDockSite.Size = new System.Drawing.Size(536, 0);
+			this.barTopDockSite.TabIndex = 7;
+			this.barTopDockSite.TabStop = false;
+			// 
+			// m_OpenFileDialog
+			// 
+			this.m_OpenFileDialog.Filter = "DotNetBar Files (*.dnb)|*.dnb|All Files (*.*)|*.*";
+			this.m_OpenFileDialog.ShowReadOnly = true;
+			this.m_OpenFileDialog.Title = "Open DotNetBar Definition File";
+			// 
+			// m_SaveFileDialog
+			// 
+			this.m_SaveFileDialog.CreatePrompt = false;
+			this.m_SaveFileDialog.DefaultExt = "dnb";
+			this.m_SaveFileDialog.FileName = "dotnetbardefinition";
+			this.m_SaveFileDialog.Filter = "DotNetBar Files (*.dnb)|*.dnb|XML Files (*.xml)|*.xml|All Files (*.*)|*.*";
+			this.m_SaveFileDialog.Title = "Save DotNetBar Definition";
+			// 
+			// btnClose
+			// 
+			this.btnClose.Anchor = (System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right);
+			this.btnClose.DialogResult = System.Windows.Forms.DialogResult.OK;
+			this.btnClose.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+			this.btnClose.Location = new System.Drawing.Point(376, 291);
+			this.btnClose.Name = "btnClose";
+			this.btnClose.Size = new System.Drawing.Size(73, 24);
+			this.btnClose.TabIndex = 6;
+			this.btnClose.Text = "OK";
+			this.btnClose.Click += new System.EventHandler(this.CloseClick);
+			// 
+			// btnCancel
+			// 
+			this.btnCancel.Anchor = (System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right);
+			this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.btnCancel.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+			this.btnCancel.Location = new System.Drawing.Point(455, 291);
+			this.btnCancel.Name = "btnCancel";
+			this.btnCancel.Size = new System.Drawing.Size(73, 24);
+			this.btnCancel.TabIndex = 7;
+			this.btnCancel.Text = "Cancel";
+			this.btnCancel.Click += new System.EventHandler(this.CloseClick);
+			// 
+			// BarEditor
+			// 
+			//this.AutoScaleBaseSize = new System.Drawing.Size(5, 13);
+			this.ClientSize = new System.Drawing.Size(536, 325);
+			this.Controls.AddRange(new System.Windows.Forms.Control[] {
+																		  this.panel1,
+																		  this.btnClose,
+																		  this.btnCancel,
+																		  this.barTopDockSite,
+																		  this.barBottomDockSite,
+																		  this.barLeftDockSite,
+																		  this.barRightDockSite});
+			this.MinimizeBox = false;
+			this.Name = "BarEditor";
+			this.Text = "DotNetBar Editor";
+			this.Closing += new System.ComponentModel.CancelEventHandler(this.FormClosing);
+			this.Load += new EventHandler(this.FormLoad);
+			this.panel1.ResumeLayout(false);
+			this.ResumeLayout(false);
+
+		}
+		#endregion
+
+		private void FormLoad(object sender, EventArgs e)
+		{
+			try
+			{
+				Microsoft.Win32.RegistryKey key=Microsoft.Win32.Registry.LocalMachine;
+				string helpfile="";
+				try
+				{
+					key=key.OpenSubKey("Software\\DevComponents\\DotNetBar");
+					helpfile=key.GetValue("InstallationFolder","").ToString();
+				}
+				finally{key.Close();}
+
+				if(helpfile.Substring(helpfile.Length-1,1)!="\\")
+					helpfile+="\\";
+
+				if(System.IO.File.Exists(helpfile+"dotnetbar.chm"))
+					helpfile+="dotnetbar.chm";
+				else
+					helpfile="";
+
+				if(helpfile!="")
+					m_HtmlHelp=new HTMLHelp(this,helpfile);
+			}
+			catch(Exception)
+			{
+			}
+
+			// Load position if any
+			try
+			{
+				Microsoft.Win32.RegistryKey key=Microsoft.Win32.Registry.CurrentUser;
+				key=key.OpenSubKey("Software\\DevComponents\\DotNetBar");
+				if(key!=null)
+				{
+					try
+					{
+						string s=key.GetValue("DesignerPosition","").ToString();
+						if(s!="")
+						{
+							if(s=="1")
+							{
+								this.WindowState=FormWindowState.Maximized;
+							}
+							else
+							{
+								string[] arr=s.Split(',');
+								if(arr.Length==4)
+								{
+									Rectangle r=new Rectangle(int.Parse(arr[0]),int.Parse(arr[1]),int.Parse(arr[2]),int.Parse(arr[3]));
+									foreach(Screen screen in Screen.AllScreens)
+									{
+										if(screen.Bounds.IntersectsWith(r))
+										{
+											this.StartPosition=FormStartPosition.Manual;
+											this.DesktopLocation=r.Location;
+											this.Size=r.Size;
+											break;
+										}
+									}
+								}
+							}
+						}
+						s=key.GetValue("DesignerPanelSize","").ToString();
+						barTree.Width=int.Parse(s);
+					}
+					finally
+					{
+						key.Close();
+					}
+				}
+			}
+			catch(Exception)
+			{
+			}
+		}
+		
+		#region Toolbar Definition Code
+		private void CreateToolbar()
+		{
+			Bar bar, barToolbar;
+			ButtonItem item, item2, item3, popupmain;
+			ButtonItem popup=new ButtonItem("popup");
+			barManager.Items.Add(popup);
+			bar=new Bar("Main Menu");
+			barManager.Bars.Add(bar);
+			bar.MenuBar=true;
+			bar.Stretch=true;
+
+			barToolbar=new Bar("Item Navigation");
+			barManager.Bars.Add(barToolbar);
+
+			// File Menu
+            item=new ButtonItem("file");
+			item.Text="&File";
+			item.PopupType=ePopupType.Menu;
+			bar.Items.Add(item);
+			item2=new ButtonItem("open");
+			item2.Shortcuts.Add(eShortcut.CtrlO);
+			item.SubItems.Add(item2);
+			item2.Text="&Open definition...";
+			item2.ImageIndex=4;
+			barToolbar.Items.Add(item2.Copy());
+			
+			item2=new ButtonItem("save");
+			item2.Shortcuts.Add(eShortcut.CtrlS);
+			item.SubItems.Add(item2);
+			item2.Text="&Save definition...";
+			item2.ImageIndex=5;
+			barToolbar.Items.Add(item2.Copy());
+			item2.BeginGroup=true;
+
+			item2=new ButtonItem("saveas");
+			item2.Text="&Save definition as...";
+			item.SubItems.Add(item2);
+			
+			item2=new ButtonItem("loadbar");
+			item2.Shortcuts.Add(eShortcut.CtrlL);
+			item.SubItems.Add(item2);
+			item2.Text="Load Bar...";
+			barManager.Items.Add(item2.Copy());
+			item2.BeginGroup=true;
+			item2.Enabled=true;
+
+			item2=new ButtonItem("savebaras");
+			item2.Shortcuts.Add(eShortcut.CtrlD);
+			item.SubItems.Add(item2);
+			item2.Text="Save Bar as...";
+			barManager.Items.Add(item2.Copy());
+			item2.Enabled=false;
+
+			item2=new ButtonItem("close");
+			item2.Text="&Close Designer";
+			item2.BeginGroup=true;
+			item.SubItems.Add(item2);
+
+			// Tools
+			item=new ButtonItem("tools");
+			item.Text="&Tools";
+			item.PopupType=ePopupType.Menu;
+			bar.Items.Add(item);
+			item2=new ButtonItem("barscreation","Create Bar");
+			item.SubItems.Add(item2);
+			popupmain=item2.Copy() as ButtonItem;
+			popup.SubItems.Add(popupmain);
+			if(m_Bar!=null)
+				item2.Visible=false;
+			else if(m_DotNetBar.LeftDockSite==null && m_DotNetBar.RightDockSite==null && m_DotNetBar.TopDockSite==null && m_DotNetBar.BottomDockSite==null)
+				item2.Enabled=false;
+			item3=new ButtonItem("createbar");
+			item3.Text="&Toolbar";
+			item2.SubItems.Add(item3);
+			popupmain.SubItems.Add(item3.Copy());
+			item3=new ButtonItem("createmenubar");
+			item3.Text="&Menu Bar";
+			item2.SubItems.Add(item3);
+			popupmain.SubItems.Add(item3.Copy());
+			item3=new ButtonItem("createstatusbar","&Status Bar");
+			item2.SubItems.Add(item3);
+			popupmain.SubItems.Add(item3.Copy());
+			item3=new ButtonItem("createdockwindow","&Dockable Window");
+			item2.SubItems.Add(item3);
+			popupmain.SubItems.Add(item3.Copy());
+			item3=new ButtonItem("createtaskpane","&Task Pane");
+			item2.SubItems.Add(item3);
+			popupmain.SubItems.Add(item3.Copy());
+
+			item2=new ButtonItem("buttonitem");
+			item2.Text="Add &ButtonItem";
+			item2.BeginGroup=true;
+			item.SubItems.Add(item2);
+			popup.SubItems.Add(item2.Copy());
+			item2=new ButtonItem("textboxitem");
+			item2.Text="Add &TextBoxItem";
+			item.SubItems.Add(item2);
+			popup.SubItems.Add(item2.Copy());
+			item2=new ButtonItem("comboboxitem");
+			item2.Text="Add &ComboBoxItem";
+			item.SubItems.Add(item2);
+			popup.SubItems.Add(item2.Copy());
+			item2=new ButtonItem("labelitem");
+			item2.Text="Add &LabelItem";
+			item.SubItems.Add(item2);
+			popup.SubItems.Add(item2.Copy());
+			// Progress Bar Item
+			item2=new ButtonItem("progressbaritem");
+			item2.Tooltip="Displays a progress bar.";
+			item2.Text="Add &ProgressBarItem";
+			item.SubItems.Add(item2);
+			popup.SubItems.Add(item2.Copy());
+
+			item2=new ButtonItem("customizeitem");
+			item2.BeginGroup=true;
+			item2.Tooltip="Lets end users hide/show Bar items as well as open the Customize dialog.";
+			item2.Text="Add Custo&mizeItem";
+			item.SubItems.Add(item2);
+			popup.SubItems.Add(item2.Copy());
+			item2=new ButtonItem("mdiwindowlistitem");
+			item2.Tooltip="Displays list of MDI Child forms.";
+			item2.Text="Add &MdiWindowListItem";
+			item.SubItems.Add(item2);
+			popup.SubItems.Add(item2.Copy());
+			item2=new ButtonItem("controlcontaineritem");
+			item2.Tooltip="Allows you to host any Control on Bar or Menu-bar.";
+			item2.Text="Add &ControlContainerItem";
+			item.SubItems.Add(item2);
+			popup.SubItems.Add(item2.Copy());
+			item2=new ButtonItem("dockcontaineritem");
+			item2.Tooltip="Helps you create dockable windows.";
+			item2.Text="Add &DockContainerItem";
+			item.SubItems.Add(item2);
+			popup.SubItems.Add(item2.Copy());
+
+			// Pop-up specific items
+			item2=new ButtonItem("copyto");
+            item2.Text="Copy To";
+            item2.BeginGroup=true;
+			item2.PopupType=ePopupType.Menu;
+			popup.SubItems.Add(item2);
+			item2=new ButtonItem("moveto");
+			item2.Text="Move To";
+			item2.PopupType=ePopupType.Menu;
+			popup.SubItems.Add(item2);
+
+			item2=new ButtonItem("delselected");
+			item.SubItems.Add(item2);
+			item2.Text="&Delete Selected Item";
+			item2.BeginGroup=true;
+			item2.ImageIndex=7;
+			popup.SubItems.Add(item2.Copy());
+
+			// Help
+			item=new ButtonItem("help");
+			item.Text="&Help";
+			item.PopupType=ePopupType.Menu;
+			bar.Items.Add(item);
+			item2=new ButtonItem("contents");
+			item2.Text="&Contents...";
+			item.SubItems.Add(item2);
+//			item2=new ButtonItem("index");
+//			item2.Text="&Index...";
+//			item.SubItems.Add(item2);
+//			item2=new ButtonItem("search");
+//			item2.Text="&Search...";
+//			item.SubItems.Add(item2);
+			item2=new ButtonItem("about");
+			item2.Text="&About";
+			item2.BeginGroup=true;
+			item.SubItems.Add(item2);
+
+			bar.DockSide=eDockSide.Top;
+
+			// Create left bar with the item navigation buttons
+			item=new ButtonItem("addnewitems");
+			barToolbar.Items.Add(item);
+			item.PopupType=ePopupType.Menu;
+			item.ImageIndex=6;
+			item.Text="Create new item";
+			item.Tooltip="Press to see available items that can be created";
+			item.BeginGroup=true;
+			item.Enabled=true;
+			item.SubItems.Add(barManager.Items["buttonitem"].Copy());
+			item.SubItems.Add(barManager.Items["textboxitem"].Copy());
+			item.SubItems.Add(barManager.Items["comboboxitem"].Copy());
+			item.SubItems.Add(barManager.Items["customizeitem"].Copy());
+			item.SubItems.Add(barManager.Items["mdiwindowlistitem"].Copy());
+            item.SubItems.Add(barManager.Items["controlcontaineritem"].Copy());
+			item.SubItems.Add(barManager.Items["dockcontaineritem"].Copy());
+			item.SubItems.Add(barManager.Items["progressbaritem"].Copy());
+			barToolbar.Items.Add(barManager.Items["delselected"].Copy());
+
+
+			item=new ButtonItem("moveleft");
+			barToolbar.Items.Add(item);
+			item.ImageIndex=0;
+			item.Text="Move Left";
+			item.Tooltip="Move selected item left";
+			item.BeginGroup=true;
+			item.Enabled=false;
+			item.ClickAutoRepeat=true;
+			barManager.Items.Add(item.Copy());
+			
+			item=new ButtonItem("moveright");
+			barToolbar.Items.Add(item);
+			item.ImageIndex=1;
+			item.Text="Move Right";
+			item.Tooltip="Move selected item right";
+			item.Enabled=false;
+			item.ClickAutoRepeat=true;
+			barManager.Items.Add(item.Copy());
+			
+			item=new ButtonItem("moveup");
+			barToolbar.Items.Add(item);
+			item.ImageIndex=2;
+			item.Text="Move Up";
+			item.Tooltip="Move selected item up";
+			item.Enabled=false;
+			item.ClickAutoRepeat=true;
+			barManager.Items.Add(item.Copy());
+			
+			item=new ButtonItem("movedown");
+			barToolbar.Items.Add(item);
+			item.ImageIndex=3;
+			item.Text="Move Down";
+			item.Tooltip="Move selected item down";
+			item.Enabled=false;
+			item.ClickAutoRepeat=true;
+			barManager.Items.Add(item.Copy());
+
+			item=new ButtonItem("synccat");
+			barToolbar.Items.Add(item);
+			item.ImageIndex=8;
+			item.Text="Sync Categories";
+			item.Tooltip="Recreates Categories from your current definition.";
+			item.Enabled=true;
+			item.ButtonStyle=eButtonStyle.ImageAndText;
+			item.ClickAutoRepeat=false;
+			
+			barToolbar.DockLine=1;
+			barToolbar.DockSide=eDockSide.Top;
+
+			popup=new ButtonItem("resetimagepopup");
+			item=new ButtonItem("resetimage","Reset");
+			popup.SubItems.Add(item);
+			barManager.ContextMenus.Add(popup);
+
+			barManager.Style=eDotNetBarStyle.Office2003;
+
+		}
+		#endregion
+
+		protected void CloseClick (object sender, System.EventArgs e)
+		{
+			this.Close();
+		}
+
+		private void RefreshView()
+		{
+			barTree.Nodes.Clear();
+
+			if(m_Bar!=null)
+			{
+				try
+				{
+					this.Cursor=Cursors.WaitCursor;
+					m_BarsNode=barTree.Nodes.Add("Bar");
+					m_BarsNode.ImageIndex=2;
+					m_BarsNode.SelectedImageIndex=2;
+
+					TreeNode barNode=m_BarsNode.Nodes.Add(m_Bar.Text);
+					barNode.Tag=m_Bar;
+					barNode.ImageIndex=1;
+					barNode.SelectedImageIndex=1;
+					foreach(BaseItem objItem in m_Bar.Items)
+					{
+						TreeNode itemNode=barNode.Nodes.Add(GetTreeItemText(objItem));
+						itemNode.Tag=objItem;
+
+						itemNode.ImageIndex=GetItemImageIndex(objItem);
+						itemNode.SelectedImageIndex=itemNode.ImageIndex;
+
+						AddSubItems(objItem,itemNode);
+					}
+					m_BarsNode.Expand();
+					barNode.Expand();
+				}
+				finally
+				{
+					this.Cursor=Cursors.Arrow;
+				}
+				return;
+			}
+
+			if(m_DotNetBar==null)
+				return;
+
+			this.Cursor=Cursors.WaitCursor;
+
+			if(m_DotNetBar.TopDockSite==null && m_DotNetBar.BottomDockSite==null && m_DotNetBar.LeftDockSite==null && m_DotNetBar.RightDockSite==null)
+			{
+				m_CategoriesNode=null;
+				m_BarsNode=null;
+			}
+			else
+			{
+				m_CategoriesNode=barTree.Nodes.Add("Categories");
+				m_CategoriesNode.ImageIndex=5;
+				m_CategoriesNode.SelectedImageIndex=5;
+
+				m_BarsNode=barTree.Nodes.Add("Bars");
+				m_BarsNode.ImageIndex=2;
+				m_BarsNode.SelectedImageIndex=2;
+			}
+
+			m_PopupsNode=barTree.Nodes.Add("Context Menus");
+			m_PopupsNode.ImageIndex=12;
+			m_PopupsNode.SelectedImageIndex=12;
+
+			if(m_BarsNode!=null)
+			{
+				foreach(Bar bar in m_DotNetBar.Bars)
+				{
+					TreeNode barNode=m_BarsNode.Nodes.Add(bar.Text);
+					barNode.Tag=bar;
+					barNode.ImageIndex=1;
+					barNode.SelectedImageIndex=1;
+					foreach(BaseItem objItem in bar.Items)
+					{
+						TreeNode itemNode=barNode.Nodes.Add(GetTreeItemText(objItem));
+						itemNode.Tag=objItem;
+
+						itemNode.ImageIndex=GetItemImageIndex(objItem);
+						itemNode.SelectedImageIndex=itemNode.ImageIndex;
+
+						AddSubItems(objItem,itemNode);
+					}
+				}
+			}
+
+			// Load nodes from items
+			m_catTable.Clear();
+			if(m_CategoriesNode!=null)
+			{
+				foreach(DictionaryEntry o in m_DotNetBar.Items)
+				{
+					BaseItem objItem=o.Value as BaseItem;
+					TreeNode itemNode=CategorizeItem(objItem);
+					itemNode.Tag=objItem;
+
+					itemNode.ImageIndex=GetItemImageIndex(objItem);
+					itemNode.SelectedImageIndex=itemNode.ImageIndex;
+
+					AddSubItems(objItem,itemNode);
+				}
+			}
+
+			// Load all popups
+			foreach(BaseItem objItem in m_DotNetBar.ContextMenus)
+			{
+				TreeNode itemNode=m_PopupsNode.Nodes.Add(GetTreeItemText(objItem));
+				itemNode.Tag=objItem;
+
+				itemNode.ImageIndex=GetItemImageIndex(objItem);
+				itemNode.SelectedImageIndex=itemNode.ImageIndex;
+
+				AddSubItems(objItem,itemNode);
+			}
+
+			if(m_BarsNode!=null)
+				m_BarsNode.Expand();
+			if(m_CategoriesNode!=null)
+				m_CategoriesNode.Expand();
+			m_PopupsNode.Expand();
+
+			this.Cursor=Cursors.Arrow;
+		}
+		private void AddSubItems(BaseItem objItem, TreeNode parentNode)
+		{
+			if(objItem.SubItems.Count==0)
+				return;
+			foreach(BaseItem objChild in objItem.SubItems)
+			{
+				TreeNode itemNode=parentNode.Nodes.Add(GetTreeItemText(objChild));
+				itemNode.Tag=objChild;
+
+				itemNode.ImageIndex=GetItemImageIndex(objChild);
+				itemNode.SelectedImageIndex=itemNode.ImageIndex;
+
+				AddSubItems(objChild,itemNode);
+			}
+		}
+		// TODO: Make sure that when designing the Menu Bar when new item is added default
+		// PopupType is MENU not TOOLBAR
+		private void ItemSelected(object sender,TreeViewEventArgs e)
+		{
+			barTree.LabelEdit=false;
+			if(e.Node.Tag==null)
+			{
+				propertyGrid1.SelectedObject=null;
+				return;
+			}
+
+			if(e.Node.Tag is BaseItem)
+			{
+				propertyGrid1.SelectedObject=e.Node.Tag;
+				barTree.LabelEdit=true;
+
+				// Now way to detect when Items collection has changed, reset changed flag if combo box is selected...
+				if(e.Node.Tag is ComboBoxItem)
+					m_DataChanged=true;
+			}
+			else if(e.Node.Tag is Bar)
+			{
+				propertyGrid1.SelectedObject=(Bar)e.Node.Tag;
+
+			}
+			else
+			{
+				propertyGrid1.SelectedObject=null;
+			}
+
+		}
+
+		private void BeforeItemSelect(object sender, System.Windows.Forms.TreeViewCancelEventArgs e)
+		{
+			// Disable/Enable toolbar items...
+			bool bLeftEnabled=false, bRightEnabled=false, bUpEnabled=false, bDownEnabled=false;
+
+			BaseItem popupItem=barManager.Items["popup"];
+
+			if(e.Node!=null && e.Node.Tag is BaseItem)
+			{
+				if(e.Node.Parent==m_PopupsNode)
+				{
+					bRightEnabled=true;
+				}
+				else
+				{
+					BaseItem objItem=e.Node.Tag as BaseItem;
+					int i=0;
+					if(objItem.Parent!=null)
+						i=objItem.Parent.SubItems.IndexOf(objItem);
+					else
+						i=e.Node.Index;
+					if(i>0)
+					{
+						bUpEnabled=true;
+						bRightEnabled=true;
+					}
+					int iCount=0;
+					if(objItem.Parent!=null)
+						iCount=objItem.Parent.SubItems.Count-1;
+					else
+						iCount=e.Node.Parent.Nodes.Count-1;
+
+					if(i<iCount)
+						bDownEnabled=true;
+
+					if((objItem.Parent!=null && !objItem.Parent.SystemItem && (!(objItem.Parent is GenericItemContainer) || !((GenericItemContainer)objItem.Parent).SystemContainer)) || (e.Node.Parent!=null && e.Node.Parent.Tag is BaseItem))
+						bLeftEnabled=true;
+				}
+			}
+
+			barManager.Items["moveleft"].Enabled=bLeftEnabled;
+			barManager.Items["moveright"].Enabled=bRightEnabled;
+			barManager.Items["moveup"].Enabled=bUpEnabled;
+			barManager.Items["movedown"].Enabled=bDownEnabled;
+
+			if(e.Node!=null && e.Node.Tag is BaseItem)
+			{
+				popupItem.SubItems["copyto"].Visible=true;
+				popupItem.SubItems["moveto"].Visible=true;
+			}
+			else
+			{
+				popupItem.SubItems["copyto"].Visible=false;
+				popupItem.SubItems["moveto"].Visible=false;
+			}
+
+			if(e.Node==null || m_BarsNode!=null && e.Node==m_BarsNode)
+			{
+				barManager.Items["buttonitem"].Enabled=false;
+				barManager.Items["textboxitem"].Enabled=false;
+				barManager.Items["comboboxitem"].Enabled=false;
+				barManager.Items["customizeitem"].Enabled=false;
+				barManager.Items["labelitem"].Enabled=false;
+				barManager.Items["mdiwindowlistitem"].Enabled=false;
+				barManager.Items["controlcontaineritem"].Enabled=false;
+				barManager.Items["dockcontaineritem"].Enabled=false;
+				barManager.Items["progressbaritem"].Enabled=false;
+				barManager.Items["delselected"].Enabled=false;
+				return;
+			}
+			else if(m_CategoriesNode!=null && e.Node==m_CategoriesNode)
+			{
+				barManager.Items["buttonitem"].Enabled=true;
+				barManager.Items["textboxitem"].Enabled=true;
+				barManager.Items["comboboxitem"].Enabled=true;
+				barManager.Items["customizeitem"].Enabled=true;
+				barManager.Items["labelitem"].Enabled=true;
+				barManager.Items["mdiwindowlistitem"].Enabled=true;
+				barManager.Items["controlcontaineritem"].Enabled=true;
+				barManager.Items["dockcontaineritem"].Enabled=true;
+				barManager.Items["progressbaritem"].Enabled=true;
+				barManager.Items["delselected"].Enabled=false;
+				return;
+			}
+
+			if(e.Node!=null && e.Node.Tag is Bar)
+				barManager.Items["savebaras"].Enabled=true;
+			else
+                barManager.Items["savebaras"].Enabled=false;
+
+			barManager.Items["buttonitem"].Enabled=true;
+			barManager.Items["textboxitem"].Enabled=true;
+			barManager.Items["comboboxitem"].Enabled=true;
+			barManager.Items["customizeitem"].Enabled=true;
+			barManager.Items["labelitem"].Enabled=true;
+			barManager.Items["mdiwindowlistitem"].Enabled=true;
+			barManager.Items["controlcontaineritem"].Enabled=true;
+			barManager.Items["dockcontaineritem"].Enabled=true;
+			barManager.Items["progressbaritem"].Enabled=true;
+
+			if(m_CategoriesNode!=null && e.Node.Parent==m_CategoriesNode || e.Node.Tag is BaseItem || e.Node.Tag is Bar)
+				barManager.Items["delselected"].Enabled=true;
+			else
+				barManager.Items["delselected"].Enabled=false;
+		}
+
+		private void TreeMouseDown(object sender, System.Windows.Forms.MouseEventArgs e)
+		{
+			if(e.Button!=MouseButtons.Right)
+				return;
+            
+			TreeNode node=barTree.GetNodeAt(e.X,e.Y);
+			if(node!=null)
+                barTree.SelectedNode=node;
+
+			// Popup menu
+			ButtonItem popup=barManager.Items["popup"] as ButtonItem;
+			
+			// If MoveTo and CopyTo are visible add items to them
+			if(popup.SubItems["copyto"].Visible)
+			{
+				BaseItem itemCopyTo=popup.SubItems["copyto"];
+				BaseItem itemMoveTo=popup.SubItems["moveto"];
+				BaseItem itemSel=barTree.SelectedNode.Tag as BaseItem;
+				itemCopyTo.SubItems.Clear();
+				itemMoveTo.SubItems.Clear();
+				bool bBars=true,bCategories=false, bPopups=false;
+				// Don't show categories for category items...
+				node=barTree.SelectedNode;
+				while(node.Parent!=null)
+					node=node.Parent;
+				if(m_PopupsNode!=null && node!=m_PopupsNode)
+					bPopups=true;
+				if(m_CategoriesNode!=null && node!=m_CategoriesNode)
+					bCategories=true;
+
+				if(bBars && m_BarsNode!=null)
+				{
+					foreach(TreeNode barNode in m_BarsNode.Nodes)
+					{
+						BaseItem newItem=new ButtonItem();
+						newItem.Text=barNode.Text;
+						newItem.Tag=barNode;
+						newItem.Click+=new System.EventHandler(this.CopyMoveToClick);
+						itemCopyTo.SubItems.Add(newItem);
+						itemMoveTo.SubItems.Add(newItem.Copy());
+					}
+				}
+				if(bCategories && m_CategoriesNode!=null)
+				{
+					ButtonItem cat=new ButtonItem("tocategories");
+					cat.Text="Categories";
+					cat.BeginGroup=true;
+					cat.Click+=new System.EventHandler(this.CopyMoveToClick);
+					itemCopyTo.SubItems.Add(cat);
+					itemMoveTo.SubItems.Add(cat.Copy());
+
+					foreach(TreeNode catNode in m_CategoriesNode.Nodes)
+					{
+						BaseItem newItem=new ButtonItem();
+						newItem.Text=catNode.Text;
+						newItem.Click+=new System.EventHandler(this.CopyMoveToClick);
+						newItem.Tag="cat";
+						itemCopyTo.SubItems.Add(newItem);
+						itemMoveTo.SubItems.Add(newItem.Copy());
+					}
+				}
+				if(bPopups)
+				{
+					BaseItem pi=new ButtonItem("topopups");
+					pi.BeginGroup=true;
+					pi.Text="Popups";
+					pi.Click+=new System.EventHandler(this.CopyMoveToClick);
+					itemCopyTo.SubItems.Add(pi);
+					itemMoveTo.SubItems.Add(pi.Copy());
+
+					foreach(BaseItem objItem in m_DotNetBar.ContextMenus)
+					{
+						BaseItem newItem=new ButtonItem();
+                        newItem.Text=(objItem.Text=="")?objItem.Name:objItem.Text;
+                        newItem.Tag=objItem;
+						newItem.Click+=new System.EventHandler(this.CopyMoveToClick);
+						itemCopyTo.SubItems.Add(newItem);
+						itemMoveTo.SubItems.Add(newItem.Copy());						
+					}
+				}
+			}
+
+			Point pt=new Point(e.X,e.Y);
+			pt=barTree.PointToScreen(pt);
+            popup.PopupMenu(pt);
+		}
+
+		private void NodeExpanding(object sender, System.Windows.Forms.TreeViewCancelEventArgs e)
+		{
+			if(e.Node.ImageIndex==5)
+			{
+				e.Node.ImageIndex=6;
+				e.Node.SelectedImageIndex=6;
+			}
+		}
+
+		private void NodeCollapsing(object sender, System.Windows.Forms.TreeViewCancelEventArgs e)
+		{
+			if(e.Node.ImageIndex==6)
+			{
+				e.Node.ImageIndex=5;
+				e.Node.SelectedImageIndex=5;
+			}
+		}
+
+		private void BarItemClick(object sender, EventArgs e)
+		{
+			BaseItem objItem=sender as BaseItem;
+			BaseItem newItem=null;
+			if(objItem.Name=="file" || objItem.Name=="tools" || objItem.Name=="help" || objItem.Name=="")
+				return;
+
+			if(objItem.Name=="about")
+			{
+				MessageBox.Show("DotNetBar by DevComponents.com (c) 2001-2003 by DevComponents.com All Rights Reserved.");
+				return;
+			}
+			else if(objItem.Name=="close")
+			{
+				this.DialogResult=DialogResult.OK;
+				this.Close();
+				return;
+			}
+			else if(objItem.Name=="contents")
+			{
+				if(m_HtmlHelp!=null)
+					m_HtmlHelp.ShowContents();
+			}
+			else if(objItem.Name=="index")
+			{
+				if(m_HtmlHelp!=null)
+					m_HtmlHelp.ShowContents();
+			}
+			else if(objItem.Name=="search")
+			{
+				if(m_HtmlHelp!=null)
+					m_HtmlHelp.ShowSearch();
+			}
+			else if(objItem.Name=="resetimage")
+			{
+				m_DataChanged=true;
+				if(propertyGrid1.SelectedGridItem!=null && propertyGrid1.SelectedGridItem.PropertyDescriptor.PropertyType==typeof(System.Drawing.Image))
+				{
+					propertyGrid1.SelectedGridItem.PropertyDescriptor.SetValue(propertyGrid1.SelectedObject,null);
+					propertyGrid1.Refresh();
+				}
+				return;
+			}
+			else if(objItem.Name=="createbar" || objItem.Name=="createmenubar" || objItem.Name=="createstatusbar" || objItem.Name=="createtaskpane")
+			{
+				m_DataChanged=true;
+				Bar bar;
+
+				if(objItem.Name=="createmenubar")
+				{
+					bar=CreateObject(typeof(Bar)) as Bar;
+					bar.Text="Main Menu";
+					bar.MenuBar=true;
+					bar.Stretch=true;
+					bar.Name="mainmenu";
+				}
+				else if(objItem.Name=="createstatusbar")
+				{
+					bar=CreateObject(typeof(Bar)) as Bar;
+					bar.Text="Status";
+					bar.Stretch=true;
+					bar.Name="statusBar"+((int)m_DotNetBar.Bars.Count+1).ToString();
+					bar.LayoutType=eLayoutType.Toolbar;
+					bar.GrabHandleStyle=eGrabHandleStyle.ResizeHandle;
+					bar.ItemSpacing=2;
+				}
+				else if(objItem.Name=="createtaskpane")
+				{
+					bar=CreateObject(typeof(Bar)) as Bar;
+					bar.Text="Task Pane";
+					bar.Stretch=true;
+					bar.Name="taskbar"+((int)m_DotNetBar.Bars.Count+1).ToString();
+					bar.LayoutType=eLayoutType.TaskList;
+					bar.GrabHandleStyle=eGrabHandleStyle.Caption;
+				}
+				else
+				{
+					bar=CreateObject(typeof(Bar)) as Bar;
+					bar.Text="My Bar";
+					bar.Name="bar"+((int)m_DotNetBar.Bars.Count+1).ToString();
+				}
+                
+				bar.SetDesignMode(true);
+
+				TreeNode barNode=m_BarsNode.Nodes.Add(bar.Text);
+				barNode.Tag=bar;
+				barNode.ImageIndex=3;
+				barNode.SelectedImageIndex=3;
+				bar.DockLine=m_DotNetBar.Bars.Count;
+				m_DotNetBar.Bars.Add(bar);
+				if(objItem.Name=="createtaskpane")
+					bar.DockSide=eDockSide.Right;
+				else if(objItem.Name=="createstatusbar")
+					bar.DockSide=eDockSide.Bottom;
+				else
+					bar.DockSide=eDockSide.Top;
+				
+				if(objItem.Name=="createstatusbar")
+				{
+					LabelItem status=CreateObject(typeof(LabelItem)) as LabelItem;
+					status.Name="label"+status.Id.ToString();
+					status.Text="Status Ready...";
+					status.BorderType=eBorderType.SingleLine;
+					status.Width=136;
+					bar.Items.Add(status);
+					bar.RecalcLayout();
+					TreeNode itemTreeNode=barNode.Nodes.Add(GetTreeItemText(status));
+					itemTreeNode.Tag=status;
+					itemTreeNode.ImageIndex=GetItemImageIndex(status);
+					itemTreeNode.SelectedImageIndex=itemTreeNode.ImageIndex;
+					itemTreeNode.EnsureVisible();
+
+					barTree.SelectedNode=barNode;
+					barNode.EnsureVisible();
+				}
+				else
+				{
+					barTree.SelectedNode=barNode;
+					barNode.EnsureVisible();
+				}
+				return;
+			}
+			else if(objItem.Name=="createdockwindow")
+			{
+				m_DataChanged=true;
+				Bar bar=CreateObject(typeof(Bar)) as Bar;;
+				bar.Text="Dockable Window";
+				bar.Stretch=true;
+				bar.LayoutType=eLayoutType.DockContainer;
+				bar.GrabHandleStyle=eGrabHandleStyle.Caption;
+				bar.Name="dockwindow"+m_DotNetBar.Bars.Count.ToString();
+				bar.SetDesignMode(true);
+
+				DockContainerItem dockItem=CreateObject(typeof(DockContainerItem)) as DockContainerItem;
+				dockItem.Name="item_"+dockItem.Id.ToString();
+				dockItem.Text="Dock Container";
+				bar.Items.Add(dockItem);
+
+				TreeNode barNode=m_BarsNode.Nodes.Add(bar.Text);
+				barNode.Tag=bar;
+				barNode.ImageIndex=3;
+				barNode.SelectedImageIndex=3;
+				bar.DockLine=m_DotNetBar.Bars.Count;
+				m_DotNetBar.Bars.Add(bar);
+				bar.DockSide=eDockSide.Left;
+
+				TreeNode itemTreeNode=barNode.Nodes.Add(GetTreeItemText(dockItem));
+				itemTreeNode.Tag=dockItem;
+				itemTreeNode.ImageIndex=GetItemImageIndex(dockItem);
+				itemTreeNode.SelectedImageIndex=itemTreeNode.ImageIndex;
+				itemTreeNode.EnsureVisible();
+
+				barTree.SelectedNode=barNode;
+				barNode.EnsureVisible();
+				return;
+			}
+			else if(objItem.Name=="delselected")
+			{
+				if(barTree.SelectedNode==null)
+					return;
+
+				m_DataChanged=true;
+
+				if(barTree.SelectedNode.Nodes.Count>0)
+					if(MessageBox.Show(this,"Are you sure you want to delete selected item?","DotNetBar Editor",MessageBoxButtons.YesNo,MessageBoxIcon.Question)==DialogResult.No)
+						return;
+
+				if(barTree.SelectedNode.Tag is BaseItem)
+				{
+					BaseItem item=barTree.SelectedNode.Tag as BaseItem;
+					Bar cont=item.ContainerControl as Bar;
+
+					TreeNode topParentNode=barTree.SelectedNode;
+					while(topParentNode.Parent!=null)
+						topParentNode=topParentNode.Parent;
+					
+					if(item.Parent!=null)
+						item.Parent.SubItems.Remove(item);
+					else if(topParentNode==m_CategoriesNode)
+						m_DotNetBar.Items.Remove(item);
+					else if(barTree.SelectedNode.Parent==m_PopupsNode)
+						m_DotNetBar.ContextMenus.Remove(item);
+					
+					if(_barDesigner!=null)
+						_barDesigner.DestroyComponent(item);
+					else
+						item.Dispose();
+
+					barTree.SelectedNode.Tag=null;
+					TreeNode parentNode=barTree.SelectedNode.Parent;
+					barTree.Nodes.Remove(barTree.SelectedNode);
+					// If it is last node under one of the categories remove parent too
+					if(parentNode!=null && parentNode.Parent==m_CategoriesNode && parentNode.Nodes.Count==0)
+						barTree.Nodes.Remove(parentNode);
+					if(cont!=null)
+						cont.RecalcLayout();
+					
+				}
+				else if(barTree.SelectedNode.Tag is Bar)
+				{
+					Bar bar=barTree.SelectedNode.Tag as Bar;
+
+					m_DotNetBar.Bars.Remove(bar);
+
+					barTree.SelectedNode.Tag=null;
+					barTree.Nodes.Remove(barTree.SelectedNode);
+				}
+				else if(m_CategoriesNode!=null && barTree.SelectedNode.Parent==m_CategoriesNode)
+				{
+					// Delete all items within this category
+					foreach(TreeNode node in barTree.SelectedNode.Nodes)
+					{
+						objItem=node.Tag as BaseItem;
+						if(objItem!=null)
+						{
+							m_DotNetBar.Items.Remove(objItem);
+							objItem.Dispose();
+						}
+						node.Tag=null;
+					}
+					barTree.SelectedNode.Remove();					
+				}
+
+				return;
+			}
+			else if(objItem.Name=="open")
+			{
+				if(m_OpenFileDialog.ShowDialog()==DialogResult.OK && System.IO.File.Exists(m_OpenFileDialog.FileName))
+				{
+					m_DotNetBar.Bars.Owner.LoadDefinition(m_OpenFileDialog.FileName);
+					m_DefinitionFileName=m_OpenFileDialog.FileName;
+					RefreshView();
+					m_DataChanged=true;
+				}
+				return;
+			}
+			else if(objItem.Name=="save" && m_DefinitionFileName!="")
+			{
+				m_DotNetBar.Bars.Owner.SaveDefinition(m_DefinitionFileName);
+				return;
+			}
+			else if(objItem.Name=="saveas" || objItem.Name=="save" && m_DefinitionFileName=="")
+			{
+				if(m_SaveFileDialog.ShowDialog()==DialogResult.OK)
+				{
+					m_DotNetBar.Bars.Owner.SaveDefinition(m_SaveFileDialog.FileName);
+					m_DefinitionFileName=m_SaveFileDialog.FileName;
+				}
+				return;
+			}
+			else if(objItem.Name=="savebaras")
+			{
+				// Save currently selected bar
+				if(barTree.SelectedNode==null || !(barTree.SelectedNode.Tag is Bar))
+					return;
+				
+				Bar bar=barTree.SelectedNode.Tag as Bar;
+				string stitle=m_SaveFileDialog.Title;
+				string defaultExt=m_SaveFileDialog.DefaultExt;
+				string fileName=m_SaveFileDialog.FileName;
+				string filter=m_SaveFileDialog.Filter;
+
+				m_SaveFileDialog.Title="Save Bar Definition";
+				m_SaveFileDialog.DefaultExt = "xml";
+				m_SaveFileDialog.FileName = (bar.Name!=""?bar.Name:"MyBar");
+				m_SaveFileDialog.Filter = "DotNetBar Bar Files (*.xml)|*.xml|All Files (*.*)|*.*";
+				
+				if(m_SaveFileDialog.ShowDialog()==DialogResult.OK)
+				{
+					bar.SaveDefinition(m_SaveFileDialog.FileName);
+				}
+
+				m_SaveFileDialog.Title=stitle;
+				m_SaveFileDialog.DefaultExt=defaultExt;
+				m_SaveFileDialog.FileName=fileName;
+				m_SaveFileDialog.Filter=filter;
+
+				return;
+			}
+			else if(objItem.Name=="loadbar")
+			{
+				string defaultExt=m_OpenFileDialog.DefaultExt;
+				string filter=m_OpenFileDialog.Filter;
+				m_OpenFileDialog.DefaultExt="xml";
+				m_OpenFileDialog.Filter = "DotNetBar Bar Files (*.xml)|*.xml|All Files (*.*)|*.*";
+				if(m_OpenFileDialog.ShowDialog()==DialogResult.OK && System.IO.File.Exists(m_OpenFileDialog.FileName))
+				{
+					Bar bar=new Bar();
+					try
+					{
+						bar.LoadDefinition(m_OpenFileDialog.FileName);
+					}
+					catch(Exception ex)
+					{
+						MessageBox.Show("File '"+m_OpenFileDialog.FileName+"' does not appear to be valid Bar file.\n\rException has been generated while loading: "+ex.Source+": "+ex.Message+"\n\r"+ex.StackTrace);
+						return;
+					}
+					bar.Dispose();
+					bar=new Bar();
+					m_DotNetBar.SuspendLayout=true;
+					m_DotNetBar.Bars.Add(bar);
+					bar.LoadDefinition(m_OpenFileDialog.FileName);
+					m_DotNetBar.SuspendLayout=false;
+				}
+				m_OpenFileDialog.DefaultExt=defaultExt;
+				m_OpenFileDialog.Filter=filter;
+			}
+			else if(objItem.Name=="moveleft" || objItem.Name=="moveright" || objItem.Name=="moveup" || objItem.Name=="movedown")
+				MoveSelectedItem(objItem.Name);
+			else if(objItem.Name=="addnewitems")
+				objItem.Expanded=true;
+			else if(objItem.Name=="synccat")
+			{
+				RescanCategories();
+				return;
+			}
+
+			m_DataChanged=true;
+
+			// Creation of new items only below this point
+			if(objItem.Name!="buttonitem" && objItem.Name!="textboxitem" && objItem.Name!="comboboxitem" && objItem.Name!="customizeitem" && objItem.Name!="labelitem" && objItem.Name!="mdiwindowlistitem" && objItem.Name!="controlcontaineritem" && objItem.Name!="dockcontaineritem" && objItem.Name!="progressbaritem")
+				return;
+			
+			// Item creation buttons only below!!!
+			if(objItem.Name=="buttonitem")
+			{
+				ButtonItem btn=CreateObject(typeof(ButtonItem)) as ButtonItem;
+				btn.Text="New Button";
+				newItem=btn;
+			}
+			else if(objItem.Name=="textboxitem")
+			{
+				TextBoxItem tb=CreateObject(typeof(TextBoxItem)) as TextBoxItem;
+				tb.Text="Text Box";
+				newItem=tb;
+			}
+			else if(objItem.Name=="comboboxitem")
+			{
+				ComboBoxItem cb=CreateObject(typeof(ComboBoxItem)) as ComboBoxItem;
+				cb.Text="Combo Box";
+				newItem=cb;
+			}
+			else if(objItem.Name=="customizeitem")
+			{
+				CustomizeItem cust=CreateObject(typeof(CustomizeItem)) as CustomizeItem;
+				newItem=cust;
+			}
+			else if(objItem.Name=="labelitem")
+			{
+				LabelItem li=CreateObject(typeof(LabelItem)) as LabelItem;
+				li.Text="Label";
+				li.BorderType=eBorderType.SingleLine;
+				newItem=li;
+			}
+			else if(objItem.Name=="mdiwindowlistitem")
+			{
+				MdiWindowListItem mdi=CreateObject(typeof(MdiWindowListItem)) as MdiWindowListItem;
+				mdi.Text="MDI Window List";
+				newItem=mdi;
+			}
+			else if(objItem.Name=="controlcontaineritem")
+			{
+				ControlContainerItem cci=CreateObject(typeof(ControlContainerItem)) as ControlContainerItem;
+				newItem=cci;
+			}
+			else if(objItem.Name=="dockcontaineritem")
+			{
+				DockContainerItem dci=CreateObject(typeof(DockContainerItem)) as DockContainerItem;
+				dci.Text="Dockable Window";
+				newItem=dci;
+			}
+			else if(objItem.Name=="progressbaritem")
+			{
+				ProgressBarItem pb=CreateObject(typeof(ProgressBarItem)) as ProgressBarItem;
+				pb.Text="Progress Bar";
+				pb.SetDesignMode(true);
+				pb.Style=m_DotNetBar.Style;
+				pb.ResetBackgroundStyle();
+				newItem=pb;
+			}
+
+			if(_barDesigner==null)
+			{
+				string name="item_";
+				long id=newItem.Id;
+				if(m_DotNetBar!=null)
+				{
+					while(m_DotNetBar.GetItem(name+id,true)!=null)
+						id++;
+				}
+				else if(m_Bar!=null)
+				{
+					while(m_Bar.GetItem(name+id)!=null)
+						id++;
+				}
+				newItem.Name=name+id;
+			}
+
+			if(barTree.SelectedNode.Tag is BaseItem)
+			{
+				newItem.Style=((BaseItem)barTree.SelectedNode.Tag).Style;
+				if(barTree.SelectedNode.Tag is PopupItem && newItem is PopupItem)
+					((PopupItem)newItem).PopupType=((PopupItem)barTree.SelectedNode.Tag).PopupType;
+			}
+			else if(barTree.SelectedNode.Tag is Bar)
+			{
+				newItem.Style=((Bar)barTree.SelectedNode.Tag).Style;
+				if(newItem is PopupItem && ((Bar)barTree.SelectedNode.Tag).MenuBar)
+					((PopupItem)newItem).PopupType=ePopupType.Menu;
+			}
+
+			// We need to determine is new item being added to the Categories
+			TreeNode itemNode=barTree.SelectedNode;
+			while(itemNode.Parent!=null)
+				itemNode=itemNode.Parent;
+
+			if(itemNode==m_CategoriesNode)
+			{
+				// Assign category to new item
+				if(barTree.SelectedNode==m_CategoriesNode)
+					newItem.Category="(Untitled)";
+				else if(barTree.SelectedNode.Parent==m_CategoriesNode)
+					newItem.Category=barTree.SelectedNode.Text;
+				else
+					newItem.Category=((BaseItem)barTree.SelectedNode.Tag).Category;
+
+				m_DotNetBar.Items.Add(newItem);                
+				itemNode=CategorizeItem(newItem);
+			}
+			else if(itemNode==m_PopupsNode)
+			{
+				//if(barTree.SelectedNode.Tag is BaseItem && barTree.SelectedNode.Parent.Tag is BaseItem)
+				if(barTree.SelectedNode.Tag is BaseItem)
+				{
+					//itemNode=barTree.SelectedNode.Parent.Nodes.Add(GetTreeItemText(newItem));
+					itemNode=barTree.SelectedNode.Nodes.Add(GetTreeItemText(newItem));
+
+					//BaseItem objParent=((BaseItem)barTree.SelectedNode.Tag).Parent;
+					BaseItem objParent=(BaseItem)barTree.SelectedNode.Tag;
+					int iPos=-1;
+					// New Items are always added before any system items which are by default kept at the end
+					if(objParent.SubItems.Count>0 && !newItem.SystemItem)
+					{
+						iPos=GetAppendPosition(objParent);
+					}
+					objParent.SubItems.Add(newItem,iPos);
+				}
+				else
+				{
+					itemNode=m_PopupsNode.Nodes.Add(GetTreeItemText(newItem));
+					m_DotNetBar.ContextMenus.Add(newItem);
+				}
+			}
+			else
+			{
+				Control cont=null;
+				if(barTree.SelectedNode.Tag is BaseItem)
+				{
+					//itemNode=barTree.SelectedNode.Parent.Nodes.Add(GetTreeItemText(newItem));
+					itemNode=barTree.SelectedNode.Nodes.Add(GetTreeItemText(newItem));
+					//BaseItem objParent=((BaseItem)barTree.SelectedNode.Tag).Parent;
+					BaseItem objParent=(BaseItem)barTree.SelectedNode.Tag;
+					int iPos=-1;
+					// New Items are always added before any system items which are by default kept at the end
+					if(objParent.SubItems.Count>0 && !newItem.SystemItem)
+					{
+						iPos=GetAppendPosition(objParent);
+					}
+					objParent.SubItems.Add(newItem,iPos);
+					cont=newItem.ContainerControl as Control;
+					if(cont==null)
+						((BaseItem)barTree.SelectedNode.Tag).Refresh();
+
+				}
+				else if(barTree.SelectedNode.Tag is Bar)
+				{
+					itemNode=barTree.SelectedNode.Nodes.Add(GetTreeItemText(newItem));
+					Bar bar=(Bar)barTree.SelectedNode.Tag;
+					int iPos=-1;
+					// New Items are always added before any system items which are by default kept at the end
+					if(bar.Items.Count>0 && !newItem.SystemItem)
+					{
+						iPos=GetAppendPosition(bar.ItemsContainer);
+					}
+					bar.Items.Add(newItem,iPos);
+					cont=bar;
+				}
+				if(cont!=null && cont is Bar)
+					((Bar)cont).RecalcLayout();
+			}
+
+			itemNode.Tag=newItem;
+			itemNode.ImageIndex=GetItemImageIndex(newItem);
+			itemNode.SelectedImageIndex=itemNode.ImageIndex;
+
+			itemNode.EnsureVisible();
+			barTree.SelectedNode=itemNode;
+			//itemNode.BeginEdit();
+		}
+
+		public void RescanCategories()
+		{
+			if(m_DotNetBar==null)
+				return;
+			if(m_DotNetBar.Bars.Count==0)
+				return;
+			m_DotNetBar.Items.Clear();
+			foreach(Bar bar in m_DotNetBar.Bars)
+			{
+				foreach(BaseItem item in bar.Items)
+					AutoCategorizeItem(item);
+			}
+			m_DataChanged=true;
+			RefreshView();
+		}
+
+		private void AutoCategorizeItem(BaseItem item)
+		{
+			if(item.Category!="" && item.Name!="" && !m_DotNetBar.Items.Contains(item.Name))
+				m_DotNetBar.Items.Add(item.Copy());
+			foreach(BaseItem i in item.SubItems)
+				AutoCategorizeItem(i);
+		}
+
+		private void MoveSelectedItem(string Direction)
+		{
+			if(barTree.SelectedNode==null)
+				return;
+			m_DataChanged=true;
+			BaseItem objItem=barTree.SelectedNode.Tag as BaseItem;
+			if(objItem==null)
+				return;
+
+			bool bCategoryItem=false;
+			if(barTree.SelectedNode.Parent==m_CategoriesNode)
+				bCategoryItem=true;
+			
+			bool bPopupsItem=false;
+			if(barTree.SelectedNode.Parent==m_PopupsNode)
+				bPopupsItem=true;
+
+
+			TreeNode selNode=barTree.SelectedNode;
+			TreeNode parentNode=selNode.Parent;
+
+			BaseItem objParent=objItem.Parent;
+
+			int i=0;
+			if(objParent!=null)
+				i=objParent.SubItems.IndexOf(objItem);
+			else
+				i=selNode.Index;
+
+			if(Direction=="moveup" && i>0)
+			{
+				if(objParent!=null)
+				{
+					objParent.SubItems.Remove(objItem);
+					objParent.SubItems.Add(objItem,i-1);
+					if(objParent.ContainerControl is Bar)
+						((Bar)objParent.ContainerControl).RecalcLayout();
+				}
+				
+				i=selNode.Index;
+				selNode.Remove();
+                parentNode.Nodes.Insert(i-1,selNode);
+				barTree.SelectedNode=selNode;
+				selNode.EnsureVisible();
+			}
+			else if(Direction=="moveright" && i>0)
+			{
+				BaseItem objNewParent=null;
+				
+				if(bCategoryItem)
+					m_DotNetBar.Items.Remove(objItem);
+				else if(bPopupsItem)
+					m_DotNetBar.ContextMenus.Remove(objItem);
+
+				if(objParent!=null)
+				{
+					objNewParent=objParent.SubItems[i-1];
+					objParent.SubItems.Remove(objItem);
+					if(objParent.ContainerControl is Bar)
+						((Bar)objParent.ContainerControl).RecalcLayout();
+				}
+				else
+				{
+					objNewParent=selNode.PrevNode.Tag as BaseItem;
+				}
+				objNewParent.SubItems.Add(objItem,GetAppendPosition(objNewParent));
+				objNewParent.Refresh();
+				if(objNewParent.ContainerControl is Bar)
+					((Bar)objNewParent.ContainerControl).RecalcLayout();
+
+				i=selNode.Index;
+				TreeNode newParent=selNode.PrevNode;
+				selNode.Remove();
+				newParent.Nodes.Add(selNode);
+				barTree.SelectedNode=selNode;
+				selNode.EnsureVisible();
+			}
+			else if(Direction=="movedown" && ((objParent!=null && i<objParent.SubItems.Count-1) || (objParent==null && selNode.Index<selNode.Parent.Nodes.Count-1)))
+			{
+				if(objParent!=null)
+				{
+					objParent.SubItems.Remove(objItem);
+					objParent.SubItems.Add(objItem,i+1);
+					if(objParent.ContainerControl is Bar)
+						((Bar)objParent.ContainerControl).RecalcLayout();
+				}
+
+				i=selNode.Index;
+				selNode.Remove();
+				parentNode.Nodes.Insert(i+1,selNode);
+				barTree.SelectedNode=selNode;
+				selNode.EnsureVisible();
+			}
+			if(Direction=="moveleft" && objParent!=null && (!(objParent is GenericItemContainer) || !((GenericItemContainer)objParent).SystemItem))
+			{
+				BaseItem objNewParent=null;
+				objNewParent=objParent.Parent;
+				if(objNewParent!=null)
+				{
+					i=objNewParent.SubItems.IndexOf(objParent)+1;
+					objParent.SubItems.Remove(objItem);
+					if(objParent.ContainerControl is Bar)
+						((Bar)objParent.ContainerControl).RecalcLayout();
+					objNewParent.SubItems.Add(objItem,i);
+					if(objNewParent.ContainerControl is Bar)
+						((Bar)objNewParent.ContainerControl).RecalcLayout();
+				}
+				else
+				{
+					objParent.SubItems.Remove(objItem);
+					if(objParent.ContainerControl is Bar)
+						((Bar)objParent.ContainerControl).RecalcLayout();
+				}
+				
+				if(parentNode.Parent==m_CategoriesNode)
+					m_DotNetBar.Items.Add(objItem);
+				else if(parentNode.Parent==m_PopupsNode)
+					m_DotNetBar.ContextMenus.Add(objItem);
+
+				selNode.Remove();
+				parentNode.Parent.Nodes.Insert(parentNode.Index+1,selNode);
+				barTree.SelectedNode=selNode;
+				selNode.EnsureVisible();
+			}
+		}
+
+		private int GetAppendPosition(BaseItem objParent)
+		{
+			int iPos=-1;
+			for(int i=objParent.SubItems.Count-1;i>=0;i--)
+			{
+				if(objParent.SubItems[i].SystemItem)
+					iPos=i;
+				else
+					break;
+			}
+			return iPos;
+		}
+
+		private void OnPropertyValueChanged(object s, System.Windows.Forms.PropertyValueChangedEventArgs e)
+		{
+			m_DataChanged=true;
+			// If user changes the category of the item that is in categories we need to
+			// reflect that change and move item to the right category
+			TreeNode node=barTree.SelectedNode;
+			BaseItem item=node.Tag as BaseItem;
+
+			if(e.ChangedItem.PropertyDescriptor.Name=="Category" && e.ChangedItem.Value!=e.OldValue)
+			{
+				if(node.Tag==null || !(node.Tag is BaseItem))
+					return;
+				while(node.Parent!=null)
+					node=node.Parent;
+				if(node!=m_CategoriesNode)
+					return;
+	            
+				node=barTree.SelectedNode;
+				BaseItem objItem=node.Tag as BaseItem;
+				node.Remove();
+				node=CategorizeItem(objItem);
+				node.ImageIndex=GetItemImageIndex(objItem);
+				node.SelectedImageIndex=node.ImageIndex;
+				AddSubItems(objItem,node);
+				node.EnsureVisible();
+				barTree.SelectedNode=node;
+			}
+			else if(e.ChangedItem.PropertyDescriptor.Name=="Name" && e.ChangedItem.Value!=e.OldValue && !m_ShowItemText)
+			{
+				node.Text=(string)e.ChangedItem.Value;
+			}
+			else if(e.ChangedItem.PropertyDescriptor.Name=="Text" && e.ChangedItem.Value!=e.OldValue && m_ShowItemText)
+			{
+				node.Text=(string)e.ChangedItem.Value;
+			}
+			else if(e.ChangedItem.PropertyDescriptor.Name=="DockLine" || e.ChangedItem.PropertyDescriptor.Name=="DockOffset")
+			{
+				Bar bar=node.Tag as Bar;
+				if(bar!=null)
+					bar.RecalcLayout();
+			}
+
+			if(e.ChangedItem.PropertyDescriptor.Name=="Name" && m_DotNetBar!=null)
+			{
+				TreeNode parent=node;
+				while(parent.Parent!=null)
+					parent=parent.Parent;
+				if(parent==m_CategoriesNode)
+				{
+					if(m_DotNetBar.Items.Contains(e.ChangedItem.Value.ToString()))
+					{
+						item.Name=e.OldValue.ToString();
+						propertyGrid1.Refresh();
+						MessageBox.Show("Item with that name already exists.");
+					}
+					else
+					{
+						m_DotNetBar.Items.Remove(e.OldValue.ToString());
+						m_DotNetBar.Items.Add(item);						
+					}
+				}
+			}
+
+			if(item!=null)
+			{
+				Bar barContainer=item.ContainerControl as Bar;
+				if(barContainer!=null)
+					barContainer.RecalcLayout();
+			}
+		}
+
+		private TreeNode CategorizeItem(BaseItem newItem)
+		{
+			// Assign item to category
+			if(newItem.Category=="")
+				newItem.Category="(Untitled)";
+
+			TreeNode parentNode=null;
+			if(m_catTable.ContainsKey(newItem.Category))
+				parentNode=m_catTable[newItem.Category] as TreeNode;
+			else
+			{
+				parentNode=m_CategoriesNode.Nodes.Add(newItem.Category);
+				parentNode.ImageIndex=5;
+				parentNode.SelectedImageIndex=5;
+				m_catTable.Add(newItem.Category,parentNode);
+			}
+			
+			TreeNode newNode=parentNode.Nodes.Add(GetTreeItemText(newItem));
+			newNode.ImageIndex=GetItemImageIndex(newItem);
+			newNode.SelectedImageIndex=newNode.ImageIndex;
+			newNode.Tag=newItem;
+			return newNode;
+		}
+
+		private void CopyMoveToClick(object sender, System.EventArgs e)
+		{
+			BaseItem item=sender as BaseItem;
+			BaseItem itemSel=barTree.SelectedNode.Tag as BaseItem;
+			BaseItem itemOriginal=barTree.SelectedNode.Tag as BaseItem;
+
+			bool bMove=(item.Parent.Name=="moveto");
+			if(!bMove)
+			{
+				itemSel=itemSel.Copy();
+				if((Control.ModifierKeys & Keys.Control)==Keys.Control)
+					itemSel.Name=itemOriginal.Name;
+				else
+					itemSel.Name="item_"+itemSel.Id;
+			}
+
+			if((item.Tag is string && (string)item.Tag=="cat") || item.Name=="tocategories")
+			{
+				// To Categories
+				if(item.Name!="tocategories")
+					itemSel.Category=item.Text;
+				if(bMove)
+				{
+					if(itemSel.Parent!=null)
+						itemSel.Parent.SubItems.Remove(itemSel);
+					barTree.SelectedNode.Remove();
+				}
+				if(m_DotNetBar.Items.Contains(itemSel.Name))
+				{
+					string sDupName=itemSel.Name;
+					itemSel.Name="item_"+itemSel.Id;
+					MessageBox.Show("Item with name: '"+sDupName+"' already exists. Item that you are trying to move will be renamed.");
+				}
+				m_DotNetBar.Items.Add(itemSel);
+				barTree.SelectedNode=CategorizeItem(itemSel);
+				barTree.SelectedNode.EnsureVisible();
+			}
+			else if(item.Name=="topopups" || item.Tag is BaseItem)
+			{
+				if(bMove)
+				{
+					if(itemSel.Parent!=null)
+						itemSel.Parent.SubItems.Remove(itemSel);
+					barTree.SelectedNode.Remove();
+				}
+
+				if(item.Name=="topopups")
+				{
+					TreeNode itemNode=m_PopupsNode.Nodes.Add(GetTreeItemText(itemSel));
+					itemNode.Tag=itemSel;
+					itemNode.ImageIndex=GetItemImageIndex(itemSel);
+					itemNode.SelectedImageIndex=itemNode.ImageIndex;
+					AddSubItems(itemSel,itemNode);
+					m_DotNetBar.ContextMenus.Add(itemSel);
+					itemNode.EnsureVisible();
+				}
+				else
+				{
+                    BaseItem objParent=item.Tag as BaseItem;
+					objParent.SubItems.Add(itemSel);
+					foreach(TreeNode node in m_PopupsNode.Nodes)
+					{
+						if(node.Tag==objParent)
+						{
+							TreeNode itemNode=node.Nodes.Add(GetTreeItemText(itemSel));
+							itemNode.Tag=itemSel;
+							itemNode.ImageIndex=GetItemImageIndex(itemSel);
+							itemNode.SelectedImageIndex=itemNode.ImageIndex;
+							AddSubItems(itemSel,itemNode);
+							itemNode.EnsureVisible();
+							break;
+						}
+					}
+				}
+			}
+			else if(item.Tag is TreeNode)
+			{
+				// To Bar
+				TreeNode barNode=item.Tag as TreeNode;
+				Bar bar=barNode.Tag as Bar;
+				if(bMove)
+				{
+					if(itemSel.Parent!=null)
+						itemSel.Parent.SubItems.Remove(itemSel);
+					barTree.SelectedNode.Remove();
+				}
+
+				bar.Items.Add(itemSel,GetAppendPosition(bar.ItemsContainer));
+				TreeNode itemNode=barNode.Nodes.Add(GetTreeItemText(itemSel));
+				itemNode.Tag=itemSel;
+				itemNode.ImageIndex=GetItemImageIndex(itemSel);
+				itemNode.SelectedImageIndex=itemNode.ImageIndex;
+				AddSubItems(itemSel,itemNode);
+				barTree.SelectedNode=itemNode;
+				barTree.SelectedNode.EnsureVisible();
+				bar.RecalcLayout();
+			}
+            
+			// Clear Copy To and Move To
+			item=barManager.Items["popup"];
+			item.SubItems["copyto"].SubItems.Clear();
+			item.SubItems["moveto"].SubItems.Clear();
+		}
+
+		private void ItemEdited(object sender, System.Windows.Forms.NodeLabelEditEventArgs e)
+		{
+			if(e.CancelEdit)
+				return;
+
+			BaseItem objItem=e.Node.Tag as BaseItem;
+			if(m_ShowItemText)
+				objItem.Text=e.Label;
+			else
+				objItem.Name=e.Label;
+			
+			propertyGrid1.Refresh();
+			m_DataChanged=true;
+		}
+
+		private string GetTreeItemText(BaseItem objItem)
+		{
+			if(objItem==null)
+				return "";
+
+			if(m_ShowItemText)
+				return objItem.Text;
+			else
+				return objItem.Name;
+		}
+
+		private int GetItemImageIndex(BaseItem objItem)
+		{
+			int index=0;
+			if(objItem is ButtonItem)
+			{
+				index=7;
+			}
+			else if(objItem is ComboBoxItem)
+			{
+				index=8;
+			}
+			else if(objItem is TextBoxItem)
+			{
+				index=9;
+			}
+			else if(objItem is CustomizeItem)
+			{
+				index=10;
+			}
+			else if(objItem is LabelItem)
+			{
+				index=11;
+			}
+			return index;
+		}
+
+		private void TreeKeyDown(object sender, System.Windows.Forms.KeyEventArgs e)
+		{
+			if(e.KeyCode==Keys.F2 && barTree.SelectedNode!=null && barTree.LabelEdit)
+				barTree.SelectedNode.BeginEdit();
+		}
+
+		private void GridViewMouseDown(object sender, EventArgs e)
+		{
+			if(propertyGrid1.SelectedGridItem==null)
+				return;
+			if(!(propertyGrid1.SelectedGridItem.PropertyDescriptor.PropertyType==typeof(System.Drawing.Image)))
+				return;
+            PopupItem popup=barManager.ContextMenus["resetimagepopup"] as PopupItem;
+            popup.PopupMenu(Control.MousePosition);		
+		}
+
+		private void FormClosing(object sender, System.ComponentModel.CancelEventArgs e)
+		{
+			m_GridViewSubclass.ReleaseHandle();
+			m_GridViewSubclass=null;
+
+			if(m_HtmlHelp!=null)
+				m_HtmlHelp.CloseHelpWindow();
+
+			// ColorScheme property when changed is not detected, so try to fix it here...
+			if(m_DotNetBar!=null)
+			{
+				foreach(Bar bar in m_DotNetBar.Bars)
+				{
+					if(bar.ColorScheme._DesignTimeSchemeChanged)
+					{
+						m_DataChanged=true;
+						bar.ColorScheme._DesignTimeSchemeChanged=false;
+					}
+				}
+			}
+			else if(m_Bar!=null)
+			{
+				if(m_Bar.ColorScheme._DesignTimeSchemeChanged)
+				{
+					m_DataChanged=true;
+					m_Bar.ColorScheme._DesignTimeSchemeChanged=false;
+				}
+			}
+
+
+			// Save form position
+			if(this.WindowState!=FormWindowState.Minimized)
+			{
+				string s="";
+				if(this.WindowState==FormWindowState.Maximized)
+				{
+					s="1";
+				}
+				else
+				{
+					s=this.DesktopLocation.X+","+this.DesktopLocation.Y+","+this.Width+","+this.Height;
+				}
+				try
+				{
+					Microsoft.Win32.RegistryKey key=Microsoft.Win32.Registry.CurrentUser;
+					key=key.CreateSubKey("Software\\DevComponents\\DotNetBar");
+					key.SetValue("DesignerPosition",s);
+					// Save Panel size
+					key.SetValue("DesignerPanelSize",barTree.Width);
+					key.Close();
+				}
+				catch(Exception)
+				{
+				}
+			}
+		}
+
+		private class GridViewSubclass:NativeWindow
+		{
+			public event EventHandler OnRightMouseDown;
+			protected override void WndProc(ref Message m)
+			{
+				if(m.Msg==NativeFunctions.WM_CONTEXTMENU)
+				{
+					if(OnRightMouseDown!=null)
+						OnRightMouseDown(this,new EventArgs());
+					return;
+				}
+				base.WndProc(ref m);
+			}
+		}
+
+		public bool DataChanged
+		{
+			get { return m_DataChanged;}
+			set { m_DataChanged=value;}
+		}
+
+		public DotNetBarManager FormBarManager
+		{
+			get
+			{
+				return barManager;
+			}
+		}
+
+		private void LoadResourceImages()
+		{
+			Image img=null;
+			try
+			{
+				m_BarImages.Images.Clear();
+				img=new Bitmap(typeof(DevComponents.DotNetBar.DotNetBarManager),"BarEditorImages.MoveItemLeft.bmp");
+				m_BarImages.Images.Add(img,Color.Magenta);
+				img=new Bitmap(typeof(DevComponents.DotNetBar.DotNetBarManager),"BarEditorImages.MoveItemRight.bmp");
+				m_BarImages.Images.Add(img,Color.Magenta);
+				img=new Bitmap(typeof(DevComponents.DotNetBar.DotNetBarManager),"BarEditorImages.MoveItemUp.bmp");
+				m_BarImages.Images.Add(img,Color.Magenta);
+				img=new Bitmap(typeof(DevComponents.DotNetBar.DotNetBarManager),"BarEditorImages.MoveItemDown.bmp");
+				m_BarImages.Images.Add(img,Color.Magenta);
+				img=new Bitmap(typeof(DevComponents.DotNetBar.DotNetBarManager),"BarEditorImages.FileOpen.bmp");
+				m_BarImages.Images.Add(img,Color.Magenta);
+				img=new Bitmap(typeof(DevComponents.DotNetBar.DotNetBarManager),"BarEditorImages.FileSave.bmp");
+				m_BarImages.Images.Add(img,Color.Magenta);
+				img=new Bitmap(typeof(DevComponents.DotNetBar.DotNetBarManager),"BarEditorImages.CreateItem.bmp");
+				m_BarImages.Images.Add(img,Color.Magenta);
+				img=new Bitmap(typeof(DevComponents.DotNetBar.DotNetBarManager),"BarEditorImages.DeleteItem.bmp");
+				m_BarImages.Images.Add(img,Color.Magenta);
+				img=new Bitmap(typeof(DevComponents.DotNetBar.DotNetBarManager),"BarEditorImages.RescanCategories.bmp");
+				m_BarImages.Images.Add(img,Color.Magenta);
+
+				imageList.Images.Clear();
+				img=new Bitmap(typeof(DevComponents.DotNetBar.DotNetBarManager),"BarEditorImages.Item.bmp");
+				imageList.Images.Add(img,Color.Magenta);
+				img=new Bitmap(typeof(DevComponents.DotNetBar.DotNetBarManager),"BarEditorImages.Toolbar.bmp");
+				imageList.Images.Add(img,Color.Magenta);
+				img=new Bitmap(typeof(DevComponents.DotNetBar.DotNetBarManager),"BarEditorImages.Toolbars.bmp");
+				imageList.Images.Add(img,Color.Magenta);
+				img=new Bitmap(typeof(DevComponents.DotNetBar.DotNetBarManager),"BarEditorImages.Toolbar.bmp");
+				imageList.Images.Add(img,Color.Magenta);
+				img=new Bitmap(typeof(DevComponents.DotNetBar.DotNetBarManager),"BarEditorImages.Item.bmp");
+				imageList.Images.Add(img,Color.Magenta);
+				img=new Bitmap(typeof(DevComponents.DotNetBar.DotNetBarManager),"BarEditorImages.Folder.bmp");
+				imageList.Images.Add(img,Color.Magenta);
+				img=new Bitmap(typeof(DevComponents.DotNetBar.DotNetBarManager),"BarEditorImages.FolderOpen.bmp");
+				imageList.Images.Add(img,Color.Magenta);
+				img=new Bitmap(typeof(DevComponents.DotNetBar.DotNetBarManager),"BarEditorImages.ButtonItem.bmp");
+				imageList.Images.Add(img,Color.Magenta);
+				img=new Bitmap(typeof(DevComponents.DotNetBar.DotNetBarManager),"BarEditorImages.ComboItem.bmp");
+				imageList.Images.Add(img,Color.Magenta);
+				img=new Bitmap(typeof(DevComponents.DotNetBar.DotNetBarManager),"BarEditorImages.TextBoxItem.bmp");
+				imageList.Images.Add(img,Color.Magenta);
+				img=new Bitmap(typeof(DevComponents.DotNetBar.DotNetBarManager),"BarEditorImages.CustomizeItem.bmp");
+				imageList.Images.Add(img,Color.Magenta);
+				img=new Bitmap(typeof(DevComponents.DotNetBar.DotNetBarManager),"BarEditorImages.LableItem.bmp");
+				imageList.Images.Add(img,Color.Magenta);
+				img=new Bitmap(typeof(DevComponents.DotNetBar.DotNetBarManager),"BarEditorImages.PopupMenu.bmp");
+				imageList.Images.Add(img,Color.Magenta);
+                				
+			}
+			catch(Exception e)
+			{
+				MessageBox.Show("Could not load resource images. Exception was thrown: "+e.ToString());
+			}
+		}
+
+		private object CreateObject(Type type)
+		{
+			if(_barDesigner!=null)
+				return _barDesigner.CreateComponent(type);
+			else
+				return type.Assembly.CreateInstance(type.FullName);
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/BarEditor.resx b/PROMS/DotNetBar Source Code/BarEditor.resx
new file mode 100644
index 00000000..af96e84f
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/BarEditor.resx	
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<root>
+	<!-- 
+            Microsoft ResX Schema 
+        
+            Version 1.3
+                
+            The primary goals of this format is to allow a simple XML format 
+            that is mostly human readable. The generation and parsing of the 
+            various data types are done through the TypeConverter classes 
+            associated with the data types.
+        
+            Example:
+        
+                ... ado.net/XML headers & schema ...
+                <resheader name="resmimetype">text/microsoft-resx</resheader>
+                <resheader name="version">1.3</resheader>
+                <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+                <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+                <data name="Name1">this is my long string</data>
+                <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+                <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+                    [base64 mime encoded serialized .NET Framework object]
+                </data>
+                <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+                    [base64 mime encoded string representing a byte array form of the .NET Framework object]
+                </data>
+        
+            There are any number of "resheader" rows that contain simple 
+            name/value pairs.
+            
+            Each data row contains a name, and value. The row also contains a 
+            type or mimetype. Type corresponds to a .NET class that support 
+            text/value conversion through the TypeConverter architecture. 
+            Classes that don't support this are serialized and stored with the 
+            mimetype set.
+                     
+            The mimetype is used for serialized objects, and tells the 
+            ResXResourceReader how to depersist the object. This is currently not 
+            extensible. For a given mimetype the value must be set accordingly:
+        
+            Note - application/x-microsoft.net.object.binary.base64 is the format 
+                   that the ResXResourceWriter will generate, however the reader can 
+                   read any of the formats listed below.
+        
+            mimetype: application/x-microsoft.net.object.binary.base64
+            value   : The object must be serialized with 
+                    : System.Serialization.Formatters.Binary.BinaryFormatter
+                    : and then encoded with base64 encoding.
+        
+            mimetype: application/x-microsoft.net.object.soap.base64
+            value   : The object must be serialized with 
+                    : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+                    : and then encoded with base64 encoding.
+            mimetype: application/x-microsoft.net.object.bytearray.base64
+            value   : The object must be serialized into a byte array 
+                    : using a System.ComponentModel.TypeConverter
+                    : and then encoded with base64 encoding.
+        -->
+	<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+		<xsd:element name="root" msdata:IsDataSet="true">
+			<xsd:complexType>
+				<xsd:choice maxOccurs="unbounded">
+					<xsd:element name="data">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+								<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+							<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+							<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+						</xsd:complexType>
+					</xsd:element>
+					<xsd:element name="resheader">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" use="required" />
+						</xsd:complexType>
+					</xsd:element>
+				</xsd:choice>
+			</xsd:complexType>
+		</xsd:element>
+	</xsd:schema>
+	<resheader name="resmimetype">
+		<value>text/microsoft-resx</value>
+	</resheader>
+	<resheader name="version">
+		<value>1.3</value>
+	</resheader>
+	<resheader name="reader">
+		<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+	<resheader name="writer">
+		<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+	<data name="imageList.Location" type="System.Drawing.Point, System.Drawing, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+		<value>419, 17</value>
+	</data>
+	<data name="barManager.Location" type="System.Drawing.Point, System.Drawing, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+		<value>518, 17</value>
+	</data>
+	<data name="m_BarImages.Location" type="System.Drawing.Point, System.Drawing, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+		<value>298, 17</value>
+	</data>
+	<data name="m_OpenFileDialog.Location" type="System.Drawing.Point, System.Drawing, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+		<value>17, 17</value>
+	</data>
+	<data name="m_SaveFileDialog.Location" type="System.Drawing.Point, System.Drawing, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+		<value>159, 17</value>
+	</data>
+	<data name="$this.Name">
+		<value>BarEditor</value>
+	</data>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/BarEditorImages/ButtonItem.bmp b/PROMS/DotNetBar Source Code/BarEditorImages/ButtonItem.bmp
new file mode 100644
index 00000000..eff482aa
Binary files /dev/null and b/PROMS/DotNetBar Source Code/BarEditorImages/ButtonItem.bmp differ
diff --git a/PROMS/DotNetBar Source Code/BarEditorImages/ComboItem.bmp b/PROMS/DotNetBar Source Code/BarEditorImages/ComboItem.bmp
new file mode 100644
index 00000000..4b9f807a
Binary files /dev/null and b/PROMS/DotNetBar Source Code/BarEditorImages/ComboItem.bmp differ
diff --git a/PROMS/DotNetBar Source Code/BarEditorImages/CreateItem.bmp b/PROMS/DotNetBar Source Code/BarEditorImages/CreateItem.bmp
new file mode 100644
index 00000000..6eb00f55
Binary files /dev/null and b/PROMS/DotNetBar Source Code/BarEditorImages/CreateItem.bmp differ
diff --git a/PROMS/DotNetBar Source Code/BarEditorImages/CustomizeItem.bmp b/PROMS/DotNetBar Source Code/BarEditorImages/CustomizeItem.bmp
new file mode 100644
index 00000000..c5b6aa58
Binary files /dev/null and b/PROMS/DotNetBar Source Code/BarEditorImages/CustomizeItem.bmp differ
diff --git a/PROMS/DotNetBar Source Code/BarEditorImages/DeleteItem.bmp b/PROMS/DotNetBar Source Code/BarEditorImages/DeleteItem.bmp
new file mode 100644
index 00000000..96d9e054
Binary files /dev/null and b/PROMS/DotNetBar Source Code/BarEditorImages/DeleteItem.bmp differ
diff --git a/PROMS/DotNetBar Source Code/BarEditorImages/FileClose.bmp b/PROMS/DotNetBar Source Code/BarEditorImages/FileClose.bmp
new file mode 100644
index 00000000..d51e2df4
Binary files /dev/null and b/PROMS/DotNetBar Source Code/BarEditorImages/FileClose.bmp differ
diff --git a/PROMS/DotNetBar Source Code/BarEditorImages/FileCloseSol.bmp b/PROMS/DotNetBar Source Code/BarEditorImages/FileCloseSol.bmp
new file mode 100644
index 00000000..0d540644
Binary files /dev/null and b/PROMS/DotNetBar Source Code/BarEditorImages/FileCloseSol.bmp differ
diff --git a/PROMS/DotNetBar Source Code/BarEditorImages/FileNew.bmp b/PROMS/DotNetBar Source Code/BarEditorImages/FileNew.bmp
new file mode 100644
index 00000000..318ff541
Binary files /dev/null and b/PROMS/DotNetBar Source Code/BarEditorImages/FileNew.bmp differ
diff --git a/PROMS/DotNetBar Source Code/BarEditorImages/FileOpen.bmp b/PROMS/DotNetBar Source Code/BarEditorImages/FileOpen.bmp
new file mode 100644
index 00000000..520b24c4
Binary files /dev/null and b/PROMS/DotNetBar Source Code/BarEditorImages/FileOpen.bmp differ
diff --git a/PROMS/DotNetBar Source Code/BarEditorImages/FileOpenSol.bmp b/PROMS/DotNetBar Source Code/BarEditorImages/FileOpenSol.bmp
new file mode 100644
index 00000000..47d0de66
Binary files /dev/null and b/PROMS/DotNetBar Source Code/BarEditorImages/FileOpenSol.bmp differ
diff --git a/PROMS/DotNetBar Source Code/BarEditorImages/FileSave.bmp b/PROMS/DotNetBar Source Code/BarEditorImages/FileSave.bmp
new file mode 100644
index 00000000..9a43d0e2
Binary files /dev/null and b/PROMS/DotNetBar Source Code/BarEditorImages/FileSave.bmp differ
diff --git a/PROMS/DotNetBar Source Code/BarEditorImages/Folder.bmp b/PROMS/DotNetBar Source Code/BarEditorImages/Folder.bmp
new file mode 100644
index 00000000..e469bcc4
Binary files /dev/null and b/PROMS/DotNetBar Source Code/BarEditorImages/Folder.bmp differ
diff --git a/PROMS/DotNetBar Source Code/BarEditorImages/FolderOpen.bmp b/PROMS/DotNetBar Source Code/BarEditorImages/FolderOpen.bmp
new file mode 100644
index 00000000..6a24e1fb
Binary files /dev/null and b/PROMS/DotNetBar Source Code/BarEditorImages/FolderOpen.bmp differ
diff --git a/PROMS/DotNetBar Source Code/BarEditorImages/Item.bmp b/PROMS/DotNetBar Source Code/BarEditorImages/Item.bmp
new file mode 100644
index 00000000..e0c64c5f
Binary files /dev/null and b/PROMS/DotNetBar Source Code/BarEditorImages/Item.bmp differ
diff --git a/PROMS/DotNetBar Source Code/BarEditorImages/LableItem.bmp b/PROMS/DotNetBar Source Code/BarEditorImages/LableItem.bmp
new file mode 100644
index 00000000..4d5ca551
Binary files /dev/null and b/PROMS/DotNetBar Source Code/BarEditorImages/LableItem.bmp differ
diff --git a/PROMS/DotNetBar Source Code/BarEditorImages/MoveItemDown.bmp b/PROMS/DotNetBar Source Code/BarEditorImages/MoveItemDown.bmp
new file mode 100644
index 00000000..15adffd9
Binary files /dev/null and b/PROMS/DotNetBar Source Code/BarEditorImages/MoveItemDown.bmp differ
diff --git a/PROMS/DotNetBar Source Code/BarEditorImages/MoveItemLeft.bmp b/PROMS/DotNetBar Source Code/BarEditorImages/MoveItemLeft.bmp
new file mode 100644
index 00000000..20c9c53e
Binary files /dev/null and b/PROMS/DotNetBar Source Code/BarEditorImages/MoveItemLeft.bmp differ
diff --git a/PROMS/DotNetBar Source Code/BarEditorImages/MoveItemRight.bmp b/PROMS/DotNetBar Source Code/BarEditorImages/MoveItemRight.bmp
new file mode 100644
index 00000000..74574131
Binary files /dev/null and b/PROMS/DotNetBar Source Code/BarEditorImages/MoveItemRight.bmp differ
diff --git a/PROMS/DotNetBar Source Code/BarEditorImages/MoveItemUp.bmp b/PROMS/DotNetBar Source Code/BarEditorImages/MoveItemUp.bmp
new file mode 100644
index 00000000..fbf0c715
Binary files /dev/null and b/PROMS/DotNetBar Source Code/BarEditorImages/MoveItemUp.bmp differ
diff --git a/PROMS/DotNetBar Source Code/BarEditorImages/PopupMenu.bmp b/PROMS/DotNetBar Source Code/BarEditorImages/PopupMenu.bmp
new file mode 100644
index 00000000..c3ebaf4d
Binary files /dev/null and b/PROMS/DotNetBar Source Code/BarEditorImages/PopupMenu.bmp differ
diff --git a/PROMS/DotNetBar Source Code/BarEditorImages/RescanCategories.bmp b/PROMS/DotNetBar Source Code/BarEditorImages/RescanCategories.bmp
new file mode 100644
index 00000000..75412cdf
Binary files /dev/null and b/PROMS/DotNetBar Source Code/BarEditorImages/RescanCategories.bmp differ
diff --git a/PROMS/DotNetBar Source Code/BarEditorImages/TextBoxItem.bmp b/PROMS/DotNetBar Source Code/BarEditorImages/TextBoxItem.bmp
new file mode 100644
index 00000000..b5896f4f
Binary files /dev/null and b/PROMS/DotNetBar Source Code/BarEditorImages/TextBoxItem.bmp differ
diff --git a/PROMS/DotNetBar Source Code/BarEditorImages/Toolbar.bmp b/PROMS/DotNetBar Source Code/BarEditorImages/Toolbar.bmp
new file mode 100644
index 00000000..4d56068c
Binary files /dev/null and b/PROMS/DotNetBar Source Code/BarEditorImages/Toolbar.bmp differ
diff --git a/PROMS/DotNetBar Source Code/BarEditorImages/Toolbars.bmp b/PROMS/DotNetBar Source Code/BarEditorImages/Toolbars.bmp
new file mode 100644
index 00000000..4630ed96
Binary files /dev/null and b/PROMS/DotNetBar Source Code/BarEditorImages/Toolbars.bmp differ
diff --git a/PROMS/DotNetBar Source Code/BarFunctions.cs b/PROMS/DotNetBar Source Code/BarFunctions.cs
new file mode 100644
index 00000000..081a4c02
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/BarFunctions.cs	
@@ -0,0 +1,2363 @@
+using System;
+using System.Drawing;
+using System.Reflection;
+using System.Xml;
+using System.Resources;
+using System.Collections;
+using System.Windows.Forms;
+using System.ComponentModel;
+using System.Drawing.Drawing2D;
+using System.IO;
+using System.Collections.Generic;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Summary description for BarFunctions.
+    /// </summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class BarFunctions
+    {
+        public const int ANIMATION_INTERVAL = 100;
+
+        private static string ms_ResourceName = "";
+        const string DEFAULT_RESOURCE = ".Strings";
+        private static bool m_ThemedOS = false;
+        private static bool m_IsVista = false;
+        private static bool _IsWindows7 = false;
+        private static bool _IsWindows8 = false;
+        private static bool _IsWindows10 = false;
+        private static bool m_SupportsAnimation = true;
+        private static bool _IsWindowsXP = false;
+
+        static BarFunctions()
+        {
+
+            m_ThemedOS = false;
+
+            NativeFunctions.OSVERSIONINFO os = new NativeFunctions.OSVERSIONINFO();
+            os.dwOSVersionInfoSize = System.Runtime.InteropServices.Marshal.SizeOf(typeof(NativeFunctions.OSVERSIONINFO));
+            NativeFunctions.GetVersionEx(ref os);
+            if (os.dwPlatformId == 2 && os.dwMajorVersion == 4)
+                m_SupportsAnimation = false;
+            if (os.dwMajorVersion == 5 && os.dwMinorVersion >= 1 && os.dwPlatformId == 2 ||
+                os.dwMajorVersion > 5 && os.dwPlatformId == 2)
+                m_ThemedOS = System.Windows.Forms.OSFeature.Feature.IsPresent(System.Windows.Forms.OSFeature.Themes);
+            Version osVersion = System.Environment.OSVersion.Version;
+            _IsWindowsXP = osVersion.Major <= 5;
+            m_IsVista = osVersion.Major >= 6;
+            _IsWindows7 = (osVersion.Major == 6 && osVersion.Minor >= 1 || osVersion.Major>6) && osVersion.Build >= 7000;
+            _IsWindows8 = (osVersion.Major == 6 && osVersion.Minor >= 2 || osVersion.Major > 6) && osVersion.Build >= 9200;
+            _IsWindows10 = (osVersion.Major == 6 && osVersion.Minor >= 3 || osVersion.Major > 6) && osVersion.Build >= 9600;
+            RefreshScreens();
+        }
+
+        private static Size _Windows10CaptionButtonSize = new Size(46, 28);
+        public static Size CaptionButtonSize
+        {
+            get
+            {
+                if (_IsWindows10)
+                    return Dpi.Size(_Windows10CaptionButtonSize);
+                else
+                    return SystemInformation.CaptionButtonSize;
+            }
+        }
+
+        public static Size Windows10CaptionButtonSize
+        {
+            get { return _Windows10CaptionButtonSize; }
+            set { _Windows10CaptionButtonSize = value; }
+        }
+
+        public static bool IsWindowsXP
+        {
+            get
+            {
+                return _IsWindowsXP;
+            }
+        }
+
+        public static bool IsVista
+        {
+            get { return m_IsVista; }
+        }
+        public static bool IsWindows7
+        {
+            get
+            {
+                return _IsWindows7;
+            }
+        }
+
+        public static bool IsWindows8
+        {
+            get
+            {
+                return _IsWindows8;
+            }
+        }
+
+        public static bool IsWindows10
+        {
+            get
+            {
+                return _IsWindows10;
+            }
+        }
+
+        internal static char GetCharForKeyValue(int keyValue)
+        {
+            byte[] chars = new byte[2];
+            try
+            {
+                byte[] keyState = new byte[256];
+                if (NativeFunctions.GetKeyboardState(keyState))
+                {
+                    if (NativeFunctions.ToAscii((uint)keyValue, 0, keyState, chars, 0) != 0)
+                    {
+                        return (char)chars[0];
+                    }
+                }
+            }
+            catch (Exception)
+            {
+                return char.MinValue;
+            }
+
+            return char.MinValue;
+        }
+
+        public static Color Darken(Color color, int percent)
+        {
+            ColorFunctions.HLSColor h = ColorFunctions.RGBToHSL(color.R, color.G, color.B);
+            h.Lightness *= (double)(100 - percent) / 100;
+            return ColorFunctions.HLSToRGB(h);
+        }
+
+        public static Color Ligten(Color color, int percent)
+        {
+            ColorFunctions.HLSColor h = ColorFunctions.RGBToHSL(color.R, color.G, color.B);
+            h.Lightness *= (1 + (double)percent / 100);
+            return ColorFunctions.HLSToRGB(h);
+        }
+
+        /// <summary>
+        /// Tries to invoke the RecalcLayout method on the control and return true if such method was invoked.
+        /// </summary>
+        /// <param name="c">Reference to the control</param>
+        /// <param name="invalidate">Indicates whether to invalidate control if no recalc layout method is found</param>
+        /// <returns>return true if method is invoked.</returns>
+        public static bool InvokeRecalcLayout(Control c, bool invalidate)
+        {
+            if (c is ItemControl)
+            {
+                ((ItemControl)c).RecalcLayout();
+                return true;
+            }
+            else if (c is Bar)
+            {
+                ((Bar)c).RecalcLayout();
+                return true;
+            }
+            else if (c is ExplorerBar)
+            {
+                ((ExplorerBar)c).RecalcLayout();
+                return true;
+            }
+            else if (c is BaseItemControl)
+            {
+                ((BaseItemControl)c).RecalcLayout();
+                return true;
+            }
+            else if (c is BarBaseControl)
+            {
+                ((BarBaseControl)c).RecalcLayout();
+                return true;
+            }
+            else if (c is PopupItemControl)
+            {
+                ((PopupItemControl)c).RecalcLayout();
+                return true;
+            }
+
+
+
+            MethodInfo m = c.GetType().GetMethod("RecalcLayout");
+
+            if (m != null)
+            {
+                m.Invoke(c, null);
+                return true;
+            }
+            else if (invalidate)
+            {
+                c.Invalidate(true);
+                c.Update();
+            }
+            return false;
+        }
+
+        public static bool ThemedOS
+        {
+            get { return m_ThemedOS; }
+            set { m_ThemedOS = value; }
+        }
+
+        public static StringFormat CreateStringFormat()
+        {
+            StringFormat sf = new StringFormat();
+            sf.Alignment = StringAlignment.Near;
+            sf.LineAlignment = StringAlignment.Near;
+            sf.HotkeyPrefix = System.Drawing.Text.HotkeyPrefix.None;
+            sf.Trimming = StringTrimming.Character;
+            return sf;
+            //return new StringFormat(StringFormat.GenericDefault);
+        }
+
+        public static void SetControlVisible(Control c, bool visible)
+        {
+            if (visible)
+            {
+                int indexZOrder = -1;
+                if (c.Parent != null && c.Dock != DockStyle.None) indexZOrder = c.Parent.Controls.IndexOf(c);
+                c.Visible = true;
+                if (indexZOrder != -1) c.Parent.Controls.SetChildIndex(c, indexZOrder);
+            }
+            else
+                c.Visible = false;
+        }
+
+        public static bool ProcessItemsShortcuts(eShortcut key, Hashtable itemsShortcuts)
+        {
+            bool eat = false;
+            if (itemsShortcuts.Contains(key))
+            {
+                ShortcutTableEntry objEntry = (ShortcutTableEntry)itemsShortcuts[key];
+                // Must convert to new array, since if this is for example
+                // close command first Click will destroy the collection we are
+                // iterating through and exception will be raised.
+                BaseItem[] arr = new BaseItem[objEntry.Items.Values.Count];
+                objEntry.Items.Values.CopyTo(arr, 0);
+                Hashtable hnames = new Hashtable(arr.Length);
+                foreach (BaseItem objItem in arr)
+                {
+                    if (objItem.CanRaiseClick && (objItem.Name == "" || !hnames.Contains(objItem.Name)))
+                    {
+                        if (!objItem.GlobalItem || objItem.GlobalName == "" || !hnames.Contains(objItem.GlobalName))
+                        {
+                            eat = true;
+                            objItem.RaiseClick(eEventSource.Keyboard);
+                            if (objItem.Name != "")
+                            {
+                                hnames.Add(objItem.Name, "");
+                            }
+                            if (objItem.GlobalItem && objItem.GlobalName != "" && objItem.GlobalName != objItem.Name && !hnames.Contains(objItem.GlobalName))
+                                hnames.Add(objItem.GlobalName, "");
+                        }
+                    }
+                }
+            }
+            return eat;
+        }
+
+        /// <summary>
+        /// Creates copy of a bar to be used as new dock bar. This function is used to create new bar for tabs that are torn off the existing dock bars.
+        /// </summary>
+        /// <param name="instance">Original base bar to base the new bar on.</param>
+        /// <returns>New instance of a bar. Note that bar is not added to the DotNetBarManager.Bars collection and DockSide is not set.</returns>
+        public static Bar CreateDuplicateDockBar(Bar instance)
+        {
+            // Create new Bar and invoke the drag there
+            Bar bar = new Bar(instance.Text);
+            return CreateDuplicateDockBar(instance, bar);
+        }
+
+        ///// <summary>
+        ///// Creates copy of a bar to be used as new dock bar. This function is used to create new bar for tabs that are torn off the existing dock bars.
+        ///// </summary>
+        ///// <param name="instance">Original base bar to base the new bar on.</param>
+        ///// <param name="services">IDesignerServices to use for creation of the new instance of the object.</param>
+        ///// <returns>New instance of a bar. Note that bar is not added to the DotNetBarManager.Bars collection and DockSide is not set.</returns>
+        //public static Bar CreateDuplicateDockBar(Bar instance, IDesignerServices services)
+        //{
+        //    Bar bar = services.CreateComponent(typeof(Bar)) as Bar;
+        //    return CreateDuplicateDockBar(instance, bar);
+        //}
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public static Bar CreateDuplicateDockBar(Bar instance, Bar bar)
+        {
+            bar.Text = instance.Text;
+            bar.ItemsContainer.MinHeight = instance.MinHeight;
+            bar.ItemsContainer.MinWidth = instance.ItemsContainer.MinWidth;
+            bar.CanDockBottom = instance.CanDockBottom;
+            bar.CanDockLeft = instance.CanDockLeft;
+            bar.CanDockRight = instance.CanDockRight;
+            bar.CanDockTop = instance.CanDockTop;
+            bar.CanDockDocument = instance.CanDockDocument;
+            bar.CanDockTab = instance.CanDockTab;
+            bar.CanUndock = instance.CanUndock;
+            bar.CanMaximizeFloating = instance.CanMaximizeFloating;
+            bar.CanAutoHide = instance.CanAutoHide;
+            bar.DockTabAlignment = instance.DockTabAlignment;
+            bar.CanCustomize = instance.CanCustomize;
+            bar.AutoHideAnimationTime = instance.AutoHideAnimationTime;
+            bar.AlwaysDisplayDockTab = instance.AlwaysDisplayDockTab;
+            bar.AutoCreateCaptionMenu = instance.AutoCreateCaptionMenu;
+            bar.AutoSyncBarCaption = instance.AutoSyncBarCaption;
+            bar.HideFloatingInactive = instance.HideFloatingInactive;
+            bar.CloseSingleTab = instance.CloseSingleTab;
+            bar.DockTabCloseButtonVisible = instance.DockTabCloseButtonVisible;
+            bar.CaptionHeight = instance.CaptionHeight;
+            bar.TabNavigation = instance.TabNavigation;
+
+            if (!instance.CaptionBackColor.IsEmpty)
+                bar.CaptionBackColor = instance.CaptionBackColor;
+            if (!instance.CaptionForeColor.IsEmpty)
+                bar.CaptionForeColor = instance.CaptionForeColor;
+            if (!instance.ItemsContainer.m_BackgroundColor.IsEmpty)
+                bar.ItemsContainer.BackColor = instance.ItemsContainer.m_BackgroundColor;
+            if (instance.DockedBorderStyle != eBorderType.None)
+                bar.DockedBorderStyle = instance.DockedBorderStyle;
+
+            bar.Style = instance.Style;
+
+            if (instance.ColorScheme.SchemeChanged)
+                bar.ColorScheme = instance.ColorScheme;
+
+            bar.LayoutType = instance.LayoutType;
+            bar.GrabHandleStyle = instance.GrabHandleStyle;
+            bar.Stretch = instance.Stretch;
+            bar.CanHide = instance.CanHide;
+            bar.ThemeAware = instance.ThemeAware;
+            bar.DockedBorderStyle = instance.DockedBorderStyle;
+
+            return bar;
+        }
+
+        public static void ApplyAutoDocumentBarStyle(Bar bar)
+        {
+            bar.SetDockTabStyle(bar.Style);
+            bar.TabNavigation = true;
+            if (!bar.AlwaysDisplayDockTab)
+                bar.AlwaysDisplayDockTab = true;
+            if (bar.DockTabAlignment != eTabStripAlignment.Top)
+                bar.DockTabAlignment = eTabStripAlignment.Top;
+            if (bar.GrabHandleStyle != eGrabHandleStyle.None)
+                bar.GrabHandleStyle = eGrabHandleStyle.None;
+        }
+
+        public static void RestoreAutoDocumentBarStyle(Bar bar)
+        {
+            bar.SetDockTabStyle(bar.Style);
+            if (bar.AlwaysDisplayDockTab)
+                bar.AlwaysDisplayDockTab = false;
+            if (bar.DockTabAlignment != eTabStripAlignment.Bottom)
+                bar.DockTabAlignment = eTabStripAlignment.Bottom;
+            if (bar.GrabHandleStyle != eGrabHandleStyle.Caption)
+                bar.GrabHandleStyle = eGrabHandleStyle.Caption;
+        }
+
+        /// <summary>
+        /// Returns if passed control is ready for painting.
+        /// </summary>
+        /// <param name="objCtrl">Control to test.</param>
+        /// <returns>true if handle is valid otherwise false</returns>
+        public static bool IsHandleValid(System.Windows.Forms.Control objCtrl)
+        {
+            return (objCtrl != null && !objCtrl.Disposing && !objCtrl.IsDisposed && objCtrl.IsHandleCreated);
+        }
+
+        public static void DrawMenuCheckBox(ItemPaintArgs pa, System.Drawing.Rectangle r, eDotNetBarStyle style, bool MouseOver)
+        {
+            System.Drawing.Graphics g = pa.Graphics;
+            Color clr;
+            if (style != eDotNetBarStyle.Office2000)
+            {
+                if (MouseOver)
+                {
+                    //clr=g.GetNearestColor(Color.FromArgb(45,SystemColors.Highlight));
+                    //SolidBrush objBrush=new SolidBrush(clr);
+                    //g.FillRectangle(objBrush,r);
+                    //objBrush.Dispose();
+                }
+                else
+                {
+                    //clr=g.GetNearestColor(Color.FromArgb(96,ColorFunctions.HoverBackColor()));
+                    clr = pa.Colors.ItemCheckedBackground; //ColorFunctions.CheckBoxBackColor(g);
+                    SolidBrush objBrush = new SolidBrush(clr);
+                    g.FillRectangle(objBrush, r);
+                    objBrush.Dispose();
+                }
+                //clr=g.GetNearestColor(Color.FromArgb(200,SystemColors.Highlight));
+                clr = pa.Colors.ItemCheckedBorder; // SystemColors.Highlight;
+                Pen objPen = new Pen(clr, 1);
+                // TODO: Beta 2 fix --> g.DrawRectangle(objPen,r);
+                NativeFunctions.DrawRectangle(g, objPen, r);
+                objPen.Dispose();
+                // Draw checker...
+                Point[] pt = new Point[3];
+                pt[0].X = r.Left + (r.Width - 5) / 2 - 1;
+                pt[0].Y = r.Top + (r.Height - 6) / 2 + 3;
+                pt[1].X = pt[0].X + 2;
+                pt[1].Y = pt[0].Y + 2;
+                pt[2].X = pt[1].X + 4;
+                pt[2].Y = pt[1].Y - 4;
+                objPen = new Pen(pa.Colors.ItemCheckedText);
+                g.DrawLines(objPen, pt);
+                pt[0].X++;
+                pt[1].X++;
+                pt[2].X++;
+                g.DrawLines(objPen, pt);
+                objPen.Dispose();
+            }
+            else if (style == eDotNetBarStyle.Office2000)
+            {
+                // Draw checked box
+                System.Windows.Forms.ControlPaint.DrawBorder3D(g, r, System.Windows.Forms.Border3DStyle.SunkenOuter, System.Windows.Forms.Border3DSide.All);
+                if (!MouseOver)
+                {
+                    r.Inflate(-1, -1);
+                    g.FillRectangle(ColorFunctions.GetPushedBrush(), r);
+                }
+                // Draw checker...
+                Point[] pt = new Point[3];
+                pt[0].X = r.Left + (r.Width - 6) / 2;
+                pt[0].Y = r.Top + (r.Height - 6) / 2 + 3;
+                pt[1].X = pt[0].X + 2;
+                pt[1].Y = pt[0].Y + 2;
+                pt[2].X = pt[1].X + 4;
+                pt[2].Y = pt[1].Y - 4;
+                g.DrawLines(SystemPens.ControlText, pt);
+                pt[0].X++;
+                pt[1].X++;
+                pt[2].X++;
+                g.DrawLines(SystemPens.ControlText, pt);
+            }
+        }
+
+        public static void SerializeImage(System.Drawing.Image image, XmlElement xml)
+        {
+            if (image == null)
+                return;
+
+            System.IO.MemoryStream mem = new System.IO.MemoryStream(1024);
+            // TODO: Beta 2 issue with the ImageFormat. RawFormat on image object does not return the actual image format
+            // Right now it is hard coded to PNG but in final version we should get the original image format
+            image.Save(mem, System.Drawing.Imaging.ImageFormat.Png);
+
+            System.Text.StringBuilder sb = new System.Text.StringBuilder();
+            System.IO.StringWriter sw = new System.IO.StringWriter(sb);
+
+            System.Xml.XmlTextWriter xt = new System.Xml.XmlTextWriter(sw);
+            xt.WriteBase64(mem.GetBuffer(), 0, (int)mem.Length);
+
+            xml.InnerText = sb.ToString();
+        }
+
+        public static void SerializeIcon(System.Drawing.Icon icon, XmlElement xml)
+        {
+            if (icon == null)
+                return;
+
+            System.IO.MemoryStream mem = new System.IO.MemoryStream(1024);
+            // TODO: Beta 2 issue with the ImageFormat. RawFormat on image object does not return the actual image format
+            // Right now it is hard coded to PNG but in final version we should get the original image format
+            icon.Save(mem);
+
+            System.Text.StringBuilder sb = new System.Text.StringBuilder();
+            System.IO.StringWriter sw = new System.IO.StringWriter(sb);
+
+            System.Xml.XmlTextWriter xt = new System.Xml.XmlTextWriter(sw);
+
+            xml.SetAttribute("encoding", "binhex");
+            //xt.WriteBase64(mem.GetBuffer(),0,(int)mem.Length);
+            xt.WriteBinHex(mem.GetBuffer(), 0, (int)mem.Length);
+
+            xml.InnerText = sb.ToString();
+        }
+
+        public static System.Windows.Forms.Form CreateOutlineForm()
+        {
+            System.Windows.Forms.Form form = new System.Windows.Forms.Form();
+            try
+            {
+                form.Size = new Size(0, 0);
+            }
+            catch
+            {
+                form = new System.Windows.Forms.Form();
+            }
+            form.BackColor = SystemColors.Highlight;
+            form.MinimizeBox = false;
+            form.MaximizeBox = false;
+            form.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            if (NativeFunctions.AlphaBlendingSupported)
+                form.Opacity = .5;
+            else
+                form.BackColor = System.Windows.Forms.ControlPaint.LightLight(SystemColors.Highlight);
+            form.ShowInTaskbar = false;
+            form.Text = "";
+            form.CreateControl();
+            return form;
+        }
+
+        public static System.Windows.Forms.Form CreateTransparentOutlineForm()
+        {
+            System.Windows.Forms.Form form = new TransparentForm();
+            try
+            {
+                form.Size = new Size(0, 0);
+            }
+            catch
+            {
+                form = new TransparentForm();
+            }
+            form.BackColor = SystemColors.Highlight;
+            form.MinimizeBox = false;
+            form.MaximizeBox = false;
+            form.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            if (NativeFunctions.AlphaBlendingSupported)
+                form.Opacity = .5;
+            else
+                form.BackColor = System.Windows.Forms.ControlPaint.LightLight(SystemColors.Highlight);
+            form.ShowInTaskbar = false;
+            form.Text = "";
+            form.CreateControl();
+            return form;
+        }
+
+        private class TransparentForm : Form
+        {
+            protected override void WndProc(ref Message m)
+            {
+                if (m.Msg == (int)WinApi.WindowsMessages.WM_NCHITTEST)
+                {
+                    m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.TransparentOrCovered);
+                    return;
+                }
+                base.WndProc(ref m);
+            }
+        }
+
+        /// <summary>
+        /// XML element is expected to be something like <image>Image data Base64 encoded</image>
+        /// </summary>
+        /// <param name="xml">Image data</param>
+        /// <returns></returns>
+        public static System.Drawing.Image DeserializeImage(XmlElement xml)
+        {
+            System.Drawing.Image img = null;
+            if (xml == null || xml.InnerText == "")
+                return null;
+
+            System.IO.StringReader sr = new System.IO.StringReader(xml.OuterXml);
+            System.Xml.XmlTextReader xr = new System.Xml.XmlTextReader(sr);
+            System.IO.MemoryStream mem = new System.IO.MemoryStream(1024);
+            // Skip <image> to data
+            xr.Read();
+
+            byte[] base64 = new byte[1024];
+            int base64len = 0;
+            do
+            {
+                base64len = xr.ReadBase64(base64, 0, 1024);
+                if (base64len > 0)
+                    mem.Write(base64, 0, base64len);
+
+            } while (base64len != 0);
+
+            img = System.Drawing.Image.FromStream(mem);
+
+            return img;
+        }
+
+        public static System.Drawing.Icon DeserializeIcon(XmlElement xml)
+        {
+            System.Drawing.Icon img = null;
+            if (xml == null || xml.InnerText == "")
+                return null;
+            bool bDecodeBinHex = false;
+            if (xml.HasAttribute("encoding") && xml.GetAttribute("encoding") == "binhex")
+                bDecodeBinHex = true;
+            System.IO.StringReader sr = new System.IO.StringReader(xml.OuterXml);
+            System.Xml.XmlTextReader xr = new System.Xml.XmlTextReader(sr);
+            System.IO.MemoryStream mem = new System.IO.MemoryStream(1024);
+            // Skip <image> to data
+            xr.Read();
+
+            byte[] base64 = new byte[1024];
+            int base64len = 0;
+            if (bDecodeBinHex)
+            {
+                do
+                {
+                    base64len = xr.ReadBinHex(base64, 0, 1024);
+                    if (base64len > 0)
+                        mem.Write(base64, 0, base64len);
+
+                } while (base64len != 0);
+            }
+            else
+            {
+                do
+                {
+                    base64len = xr.ReadBase64(base64, 0, 1024);
+                    if (base64len > 0)
+                        mem.Write(base64, 0, base64len);
+
+                } while (base64len != 0);
+            }
+            mem.Position = 0;
+            img = new System.Drawing.Icon(mem);
+
+            return img;
+        }
+
+        internal static BaseItem CreateItemFromXml(System.Xml.XmlElement xmlItem)
+        {
+            string cl = xmlItem.GetAttribute("class");
+            BaseItem returnItem = null;
+            switch (cl)
+            {
+                case "DevComponents.DotNetBar.ButtonItem":
+                    returnItem = new ButtonItem();
+                    break;
+                case "DevComponents.DotNetBar.TextBoxItem":
+                    returnItem = new TextBoxItem();
+                    break;
+                case "DevComponents.DotNetBar.ComboBoxItem":
+                    returnItem = new ComboBoxItem();
+                    break;
+                case "DevComponents.DotNetBar.LabelItem":
+                    returnItem = new LabelItem();
+                    break;
+                case "DevComponents.DotNetBar.CustomizeItem":
+                    returnItem = new CustomizeItem();
+                    break;
+                case "DevComponents.DotNetBar.ControlContainerItem":
+                    returnItem = new ControlContainerItem();
+                    break;
+                case "DevComponents.DotNetBar.DockContainerItem":
+                    returnItem = new DockContainerItem();
+                    break;
+                case "DevComponents.DotNetBar.MdiWindowListItem":
+                    returnItem = new MdiWindowListItem();
+                    break;
+                case "DevComponents.DotNetBar.SideBarContainerItem":
+                    returnItem = new SideBarContainerItem();
+                    break;
+                case "DevComponents.DotNetBar.SideBarPanelItem":
+                    returnItem = new SideBarPanelItem();
+                    break;
+                case "DevComponents.DotNetBar.ExplorerBarGroupItem":
+                    returnItem = new ExplorerBarGroupItem();
+                    break;
+                case "DevComponents.DotNetBar.ExplorerBarContainerItem":
+                    returnItem = new ExplorerBarContainerItem();
+                    break;
+                case "DevComponents.DotNetBar.ProgressBarItem":
+                    returnItem = new ProgressBarItem();
+                    break;
+                case "DevComponents.DotNetBar.ColorPickerDropDown":
+                    returnItem = new ColorPickerDropDown();
+                    break;
+                default:
+                    {
+                        try
+                        {
+                            //System.Windows.Forms.MessageBox.Show("Loading custom: "+xmlItem.GetAttribute("assembly")+"   "+xmlItem.GetAttribute("class"));
+                            System.Reflection.Assembly a = System.Reflection.Assembly.Load(xmlItem.GetAttribute("assembly"));
+                            if (a == null)
+                                return null;
+                            BaseItem item = a.CreateInstance(xmlItem.GetAttribute("class")) as BaseItem;
+                            returnItem = item;
+                        }
+                        catch (Exception e)
+                        {
+                            throw new ArgumentException("Could not create item from XML. Assembly=" + xmlItem.GetAttribute("assembly") + ", Class=" + xmlItem.GetAttribute("class") + ", Inner Exception: " + e.Message + ", Source=" + e.Source);
+                        }
+                        break;
+                    }
+            }
+            return returnItem;
+        }
+
+        internal static BaseItem CreateItemFromXml(System.Xml.XmlElement xmlItem, System.ComponentModel.Design.IDesignerHost dh, string name)
+        {
+            string cl = xmlItem.GetAttribute("class");
+            BaseItem returnItem = null;
+            switch (cl)
+            {
+                case "DevComponents.DotNetBar.ButtonItem":
+                    if (name != "")
+                        returnItem = dh.CreateComponent(typeof(ButtonItem), name) as ButtonItem;
+                    else
+                        returnItem = dh.CreateComponent(typeof(ButtonItem)) as ButtonItem;
+                    break;
+                case "DevComponents.DotNetBar.TextBoxItem":
+                    if (name != "")
+                        returnItem = dh.CreateComponent(typeof(TextBoxItem), name) as TextBoxItem;
+                    else
+                        returnItem = dh.CreateComponent(typeof(TextBoxItem)) as TextBoxItem;
+                    break;
+                case "DevComponents.DotNetBar.ComboBoxItem":
+                    if (name != "")
+                        returnItem = dh.CreateComponent(typeof(ComboBoxItem), name) as ComboBoxItem;
+                    else
+                        returnItem = dh.CreateComponent(typeof(ComboBoxItem)) as ComboBoxItem;
+                    break;
+                case "DevComponents.DotNetBar.LabelItem":
+                    if (name != "")
+                        returnItem = dh.CreateComponent(typeof(LabelItem), name) as LabelItem;
+                    else
+                        returnItem = dh.CreateComponent(typeof(LabelItem)) as LabelItem;
+                    break;
+                case "DevComponents.DotNetBar.CustomizeItem":
+                    if (name != "")
+                        returnItem = dh.CreateComponent(typeof(CustomizeItem), name) as CustomizeItem;
+                    else
+                        returnItem = dh.CreateComponent(typeof(CustomizeItem)) as CustomizeItem;
+                    break;
+                case "DevComponents.DotNetBar.ControlContainerItem":
+                    if (name != "")
+                        returnItem = dh.CreateComponent(typeof(ControlContainerItem), name) as ControlContainerItem;
+                    else
+                        returnItem = dh.CreateComponent(typeof(ControlContainerItem)) as ControlContainerItem;
+                    break;
+                case "DevComponents.DotNetBar.DockContainerItem":
+                    if (name != "")
+                        returnItem = dh.CreateComponent(typeof(DockContainerItem), name) as DockContainerItem;
+                    else
+                        returnItem = dh.CreateComponent(typeof(DockContainerItem)) as DockContainerItem;
+                    break;
+                case "DevComponents.DotNetBar.MdiWindowListItem":
+                    if (name != "")
+                        returnItem = dh.CreateComponent(typeof(MdiWindowListItem), name) as MdiWindowListItem;
+                    else
+                        returnItem = dh.CreateComponent(typeof(MdiWindowListItem)) as MdiWindowListItem;
+                    break;
+                case "DevComponents.DotNetBar.SideBarContainerItem":
+                    if (name != "")
+                        returnItem = dh.CreateComponent(typeof(SideBarContainerItem), name) as SideBarContainerItem;
+                    else
+                        returnItem = dh.CreateComponent(typeof(SideBarContainerItem)) as SideBarContainerItem;
+                    break;
+                case "DevComponents.DotNetBar.SideBarPanelItem":
+                    if (name != "")
+                        returnItem = dh.CreateComponent(typeof(SideBarPanelItem), name) as SideBarPanelItem;
+                    else
+                        returnItem = dh.CreateComponent(typeof(SideBarPanelItem)) as SideBarPanelItem;
+                    break;
+                case "DevComponents.DotNetBar.ExplorerBarGroupItem":
+                    if (name != "")
+                        returnItem = dh.CreateComponent(typeof(ExplorerBarGroupItem), name) as ExplorerBarGroupItem;
+                    else
+                        returnItem = dh.CreateComponent(typeof(ExplorerBarGroupItem)) as ExplorerBarGroupItem;
+                    break;
+                case "DevComponents.DotNetBar.ExplorerBarContainerItem":
+                    if (name != "")
+                        returnItem = dh.CreateComponent(typeof(ExplorerBarContainerItem), name) as ExplorerBarContainerItem;
+                    else
+                        returnItem = dh.CreateComponent(typeof(ExplorerBarContainerItem)) as ExplorerBarContainerItem;
+                    break;
+                case "DevComponents.DotNetBar.ProgressBarItem":
+                    if (name != "")
+                        returnItem = dh.CreateComponent(typeof(ProgressBarItem), name) as ProgressBarItem;
+                    else
+                        returnItem = dh.CreateComponent(typeof(ProgressBarItem)) as ProgressBarItem;
+                    break;
+                case "DevComponents.DotNetBar.ColorPickerDropDown":
+                    if (name != "")
+                        returnItem = dh.CreateComponent(typeof(ColorPickerDropDown), name) as ColorPickerDropDown;
+                    else
+                        returnItem = dh.CreateComponent(typeof(ColorPickerDropDown)) as ColorPickerDropDown;
+                    break;
+                default:
+                    {
+                        try
+                        {
+                            //System.Windows.Forms.MessageBox.Show("Loading custom: "+xmlItem.GetAttribute("assembly")+"   "+xmlItem.GetAttribute("class"));
+                            System.Reflection.Assembly a = System.Reflection.Assembly.Load(xmlItem.GetAttribute("assembly"));
+                            if (a == null)
+                                return null;
+                            BaseItem item = a.CreateInstance(xmlItem.GetAttribute("class")) as BaseItem;
+                            returnItem = dh.CreateComponent(item.GetType()) as BaseItem;
+                        }
+                        catch (Exception e)
+                        {
+                            throw new ArgumentException("Could not create item from XML. Assembly=" + xmlItem.GetAttribute("assembly") + ", Class=" + xmlItem.GetAttribute("class") + ", Inner Exception: " + e.Message + ", Source=" + e.Source);
+                        }
+                        break;
+                    }
+            }
+            return returnItem;
+        }
+
+        internal static string GetItemErrorInfo(System.Xml.XmlElement xmlItem)
+        {
+            string s = "";
+            if (xmlItem.HasAttribute("assembly"))
+                s = s + xmlItem.GetAttribute("assembly");
+            if (xmlItem.HasAttribute("class"))
+                s = s + xmlItem.GetAttribute("class");
+            return s;
+        }
+
+        internal static void PaintSystemButton(System.Drawing.Graphics g, SystemButton btn, Rectangle r, bool MouseDown, bool MouseOver, bool Disabled)
+        {
+            // Draw state if any
+            if (MouseDown)
+            {
+                g.FillRectangle(new SolidBrush(ColorFunctions.PressedBackColor(g)), r);
+                NativeFunctions.DrawRectangle(g, SystemPens.Highlight, r);
+            }
+            else if (MouseOver)
+            {
+                g.FillRectangle(new SolidBrush(ColorFunctions.HoverBackColor(g)), r);
+                NativeFunctions.DrawRectangle(g, SystemPens.Highlight, r);
+            }
+
+            Bitmap bmp = new Bitmap(r.Width, r.Height, g);
+            Graphics gBmp = Graphics.FromImage(bmp);
+            Rectangle rBtn = new Rectangle(0, 0, r.Width, r.Height);
+            rBtn.Inflate(0, -1);
+            Rectangle rClip = rBtn;
+            rClip.Inflate(-1, -1);
+            using (SolidBrush brush = new SolidBrush(SystemColors.Control))
+                gBmp.FillRectangle(brush, 0, 0, r.Width, r.Height);
+            gBmp.SetClip(rClip);
+            System.Windows.Forms.ControlPaint.DrawCaptionButton(gBmp, rBtn, (System.Windows.Forms.CaptionButton)btn, System.Windows.Forms.ButtonState.Flat);
+            gBmp.ResetClip();
+            gBmp.Dispose();
+
+            bmp.MakeTransparent(SystemColors.Control);
+            if (Disabled)
+            {
+                float[][] array = new float[5][];
+                array[0] = new float[5] { 0, 0, 0, 0, 0 };
+                array[1] = new float[5] { 0, 0, 0, 0, 0 };
+                array[2] = new float[5] { 0, 0, 0, 0, 0 };
+                array[3] = new float[5] { .5f, .5f, .5f, .5f, 0 };
+                array[4] = new float[5] { 0, 0, 0, 0, 0 };
+                System.Drawing.Imaging.ColorMatrix grayMatrix = new System.Drawing.Imaging.ColorMatrix(array);
+                System.Drawing.Imaging.ImageAttributes disabledImageAttr = new System.Drawing.Imaging.ImageAttributes();
+                disabledImageAttr.ClearColorKey();
+                disabledImageAttr.SetColorMatrix(grayMatrix);
+                g.DrawImage(bmp, r, 0, 0, bmp.Width, bmp.Height, GraphicsUnit.Pixel, disabledImageAttr);
+            }
+            else
+            {
+                if (MouseDown)
+                    r.Offset(1, 1);
+                g.DrawImageUnscaled(bmp, r);
+            }
+
+        }
+
+        internal static void SyncProperty(BaseItem item, string propertyName)
+        {
+            if (item.GlobalName.Length > 0)
+            {
+                PropertyDescriptor propDesc = TypeDescriptor.GetProperties(item)[propertyName];
+                SetPropertyByGlobalName(GetOwner(item), item.GetType(), item.GlobalName, propDesc, propDesc.GetValue(item));
+            }
+            else if (item.Name.Length > 0)
+            {
+                PropertyDescriptor propDesc = TypeDescriptor.GetProperties(item)[propertyName];
+                SetProperty(GetOwner(item), item.GetType(), item.Name, propDesc, propDesc.GetValue(item));
+            }
+        }
+
+        private static object GetOwner(BaseItem item)
+        {
+            object owner = item.GetOwner();
+            if (owner is RibbonBar && ((RibbonBar)owner).IsOverflowRibbon)
+            {
+                if (((RibbonBar)owner).IsOnQat)
+                    owner = ((RibbonBar)owner).QatButtonParent.GetOwner();
+                else
+                    owner = ((RibbonBar)owner).OverflowParent;
+            }
+            return owner;
+        }
+
+        internal static void SetProperty(object owner, System.Type itemType, string itemName, System.ComponentModel.PropertyDescriptor prop, object value)
+        {
+            IOwner manager = owner as IOwner;
+            DotNetBarManager dnbmanager = owner as DotNetBarManager;
+
+            if (manager == null || itemName == "" || prop == null)
+                return;
+
+            System.Collections.ArrayList list = null;
+            if (dnbmanager != null)
+            {
+                if (!dnbmanager.IsDisposed)
+                    list = dnbmanager.GetItems(itemName, itemType, true);
+            }
+            else
+                list = manager.GetItems(itemName, itemType);
+            if (list == null)
+                return;
+            foreach (BaseItem objItem in list)
+            {
+                object propertyValue = prop.GetValue(objItem);
+                if (!(propertyValue == value || propertyValue != null && propertyValue.Equals(value)))
+                    prop.SetValue(objItem, value);
+            }
+        }
+
+        internal static void SetPropertyByGlobalName(object owner, System.Type itemType, string itemName, System.ComponentModel.PropertyDescriptor prop, object value)
+        {
+            IOwner manager = owner as IOwner;
+            DotNetBarManager dnbmanager = owner as DotNetBarManager;
+
+            if (manager == null || itemName == "" || prop == null)
+                return;
+
+            System.Collections.ArrayList list = null;
+            if (dnbmanager != null)
+            {
+                if (!dnbmanager.IsDisposed)
+                    list = dnbmanager.GetItems(itemName, itemType, true, true);
+            }
+            else
+                list = manager.GetItems(itemName, itemType, true);
+            if (list == null)
+                return;
+            foreach (BaseItem objItem in list)
+            {
+                if (prop.GetValue(objItem) != value)
+                    prop.SetValue(objItem, value);
+            }
+        }
+
+        internal static ResourceManager GetResourceManager(bool bDefault)
+        {
+            string defaultResource = DEFAULT_RESOURCE;
+            DotNetBarResourcesAttribute att = Attribute.GetCustomAttribute(System.Reflection.Assembly.GetExecutingAssembly(), typeof(DotNetBarResourcesAttribute)) as DotNetBarResourcesAttribute;
+            if (att != null && att.NamespacePrefix != "")
+                defaultResource = att.NamespacePrefix + defaultResource;
+            else
+                defaultResource = "DevComponents.DotNetBar" + defaultResource;
+
+            ResourceManager rm = new ResourceManager(defaultResource, System.Reflection.Assembly.GetExecutingAssembly());
+            return rm;
+        }
+        internal static ResourceManager GetResourceManager()
+        {
+            string defaultResource = DEFAULT_RESOURCE;
+            DotNetBarResourcesAttribute att = Attribute.GetCustomAttribute(System.Reflection.Assembly.GetExecutingAssembly(), typeof(DotNetBarResourcesAttribute)) as DotNetBarResourcesAttribute;
+            if (att != null && att.NamespacePrefix != "")
+                defaultResource = att.NamespacePrefix + defaultResource;
+            else
+                defaultResource = "DevComponents.DotNetBar" + defaultResource;
+
+            if (ms_ResourceName == "")
+            {
+                System.Globalization.CultureInfo cu = System.Threading.Thread.CurrentThread.CurrentUICulture;
+                System.Reflection.Assembly assembly = System.Reflection.Assembly.GetExecutingAssembly();
+                string[] arr = assembly.GetManifestResourceNames();
+                int count = 0; // Make sure this exits
+                while (cu.LCID != 127 && count < 16)
+                {
+                    if (assembly.GetManifestResourceInfo(defaultResource + "_" + cu.Name.ToLower() + ".resources") != null)
+                    {
+                        ms_ResourceName = defaultResource + "_" + cu.Name.ToLower();
+                        break;
+                    }
+                    else if (assembly.GetManifestResourceInfo(defaultResource + "_" + cu.TwoLetterISOLanguageName.ToLower() + ".resources") != null)
+                    {
+                        ms_ResourceName = defaultResource + "_" + cu.TwoLetterISOLanguageName.ToLower();
+                        break;
+                    }
+                    cu = cu.Parent;
+                    count++;
+                }
+                if (ms_ResourceName == "")
+                    ms_ResourceName = defaultResource;
+            }
+
+            ResourceManager rm = new ResourceManager(ms_ResourceName, System.Reflection.Assembly.GetExecutingAssembly());
+            return rm;
+        }
+
+        internal static void DrawBorder(Graphics g, eBorderType bordertype, Rectangle r, Color singleLineColor)
+        {
+            DrawBorder(g, bordertype, r, singleLineColor, eBorderSide.Left | eBorderSide.Right | eBorderSide.Top | eBorderSide.Bottom);
+        }
+        internal static void DrawBorder(Graphics g, eBorderType bordertype, Rectangle r, Color singleLineColor, eBorderSide side)
+        {
+            DrawBorder(g, bordertype, r, singleLineColor, side, System.Drawing.Drawing2D.DashStyle.Solid);
+        }
+        internal static void DrawBorder(Graphics g, eBorderType bordertype, Rectangle r, Color singleLineColor, eBorderSide side, System.Drawing.Drawing2D.DashStyle borderDashStyle)
+        {
+            DrawBorder(g, bordertype, r, singleLineColor, side, borderDashStyle, 1);
+        }
+        internal static void DrawBorder(Graphics g, eBorderType bordertype, Rectangle r, Color singleLineColor, eBorderSide side, System.Drawing.Drawing2D.DashStyle borderDashStyle, int lineWidth)
+        {
+            if (lineWidth <= 0) return;
+            System.Windows.Forms.Border3DSide border3dside;
+            if (side == eBorderSide.All)
+                border3dside = System.Windows.Forms.Border3DSide.All;
+            else
+                border3dside = (((side | eBorderSide.Left) != 0) ? System.Windows.Forms.Border3DSide.Left : 0) |
+                (((side | eBorderSide.Right) != 0) ? System.Windows.Forms.Border3DSide.Right : 0) |
+                (((side | eBorderSide.Top) != 0) ? System.Windows.Forms.Border3DSide.Top : 0) |
+                (((side | eBorderSide.Bottom) != 0) ? System.Windows.Forms.Border3DSide.Bottom : 0);
+
+            switch (bordertype)
+            {
+                case eBorderType.Bump:
+                    {
+                        System.Windows.Forms.ControlPaint.DrawBorder3D(g, r, System.Windows.Forms.Border3DStyle.Bump, border3dside);
+                        break;
+                    }
+                case eBorderType.Etched:
+                    System.Windows.Forms.ControlPaint.DrawBorder3D(g, r, System.Windows.Forms.Border3DStyle.Etched, border3dside);
+                    break;
+                case eBorderType.Raised:
+                    System.Windows.Forms.ControlPaint.DrawBorder3D(g, r, System.Windows.Forms.Border3DStyle.RaisedInner, border3dside);
+                    break;
+                case eBorderType.Sunken:
+                    System.Windows.Forms.ControlPaint.DrawBorder3D(g, r, System.Windows.Forms.Border3DStyle.SunkenOuter, border3dside);
+                    break;
+                case eBorderType.SingleLine:
+                    {
+                        SmoothingMode sm = g.SmoothingMode;
+                        g.SmoothingMode = SmoothingMode.None;
+                        using (Pen pen = new Pen(singleLineColor, lineWidth))
+                        {
+                            pen.DashStyle = borderDashStyle;
+                            int offset = lineWidth / 2;
+                            if ((side & eBorderSide.Left) != 0)
+                                g.DrawLine(pen, r.X + offset, r.Y, r.X + offset, r.Bottom - (lineWidth > 1 ? 0 : 1));
+                            if ((side & eBorderSide.Top) != 0)
+                                g.DrawLine(pen, r.X, r.Y + offset, r.Right - 1, r.Y + offset);
+                            if (offset == 0) offset = 1;
+                            if ((side & eBorderSide.Right) != 0)
+                                g.DrawLine(pen, r.Right - offset, r.Y, r.Right - offset, r.Bottom - (lineWidth>1?0:1));
+                            if ((side & eBorderSide.Bottom) != 0)
+                                g.DrawLine(pen, r.X, r.Bottom - offset, r.Right - 1, r.Bottom - offset);
+                        }
+                        g.SmoothingMode = sm;
+                        break;
+                    }
+                case eBorderType.DoubleLine:
+                    {
+                        using (Pen pen = new Pen(singleLineColor, lineWidth))
+                        {
+                            pen.DashStyle = borderDashStyle;
+                            for (int i = 0; i < lineWidth + 1; i += lineWidth)
+                            {
+                                if ((side & eBorderSide.Left) != 0)
+                                    g.DrawLine(pen, r.X, r.Y, r.X, r.Bottom - 1);
+                                if ((side & eBorderSide.Top) != 0)
+                                    g.DrawLine(pen, r.X, r.Y, r.Right - 1, r.Y);
+                                if ((side & eBorderSide.Right) != 0)
+                                    g.DrawLine(pen, r.Right - 1, r.Y, r.Right - 1, r.Bottom - 1);
+                                if ((side & eBorderSide.Bottom) != 0)
+                                    g.DrawLine(pen, r.X, r.Bottom - 1, r.Right - 1, r.Bottom - 1);
+                                r.Inflate(-1, -1);
+                            }
+
+                        }
+                        break;
+                    }
+                default:
+                    break;
+            }
+        }
+
+        internal static void DrawBorder3D(Graphics g, int x, int y, int width, int height, System.Windows.Forms.Border3DStyle style, System.Windows.Forms.Border3DSide side)
+        {
+            DrawBorder3D(g, x, y, width, height, style, side, SystemColors.Control, true);
+        }
+        internal static void DrawBorder3D(Graphics g, int x, int y, int width, int height, System.Windows.Forms.Border3DStyle style, Color clr)
+        {
+            DrawBorder3D(g, x, y, width, height, style, System.Windows.Forms.Border3DSide.All, clr, true);
+        }
+        internal static void DrawBorder3D(Graphics g, int x, int y, int width, int height, System.Windows.Forms.Border3DStyle style)
+        {
+            DrawBorder3D(g, x, y, width, height, style, System.Windows.Forms.Border3DSide.All, SystemColors.Control, true);
+        }
+        internal static void DrawBorder3D(Graphics g, Rectangle r, System.Windows.Forms.Border3DStyle style, System.Windows.Forms.Border3DSide side, Color baseColor)
+        {
+            DrawBorder3D(g, r.X, r.Y, r.Width, r.Height, style, side, baseColor, true);
+        }
+        internal static void DrawBorder3D(Graphics g, Rectangle r, System.Windows.Forms.Border3DStyle style, System.Windows.Forms.Border3DSide side, Color baseColor, bool bFillInner)
+        {
+            DrawBorder3D(g, r.X, r.Y, r.Width, r.Height, style, side, baseColor, bFillInner);
+        }
+        internal static void DrawBorder3D(Graphics g, Rectangle r, System.Windows.Forms.Border3DStyle style)
+        {
+            DrawBorder3D(g, r.X, r.Y, r.Width, r.Height, style, System.Windows.Forms.Border3DSide.All, SystemColors.Control, true);
+        }
+        internal static void DrawBorder3D(Graphics g, int x, int y, int width, int height, System.Windows.Forms.Border3DStyle style, System.Windows.Forms.Border3DSide side, Color baseColor)
+        {
+            DrawBorder3D(g, x, y, width, height, style, side, baseColor, true);
+        }
+        internal static void DrawBorder3D(Graphics g, int x, int y, int width, int height, System.Windows.Forms.Border3DStyle style, System.Windows.Forms.Border3DSide side, Color baseColor, bool bFillInner)
+        {
+            if (bFillInner)
+                g.FillRectangle(new SolidBrush(baseColor), x, y, width, height);
+
+            Color colorLight = System.Windows.Forms.ControlPaint.Light(baseColor);
+            Color colorDark = System.Windows.Forms.ControlPaint.Dark(baseColor);
+            Pen penLight = null;
+            Pen penDark = null;
+            Pen penBase = new Pen(baseColor);
+            height--;
+            width--;
+            switch (style)
+            {
+                case System.Windows.Forms.Border3DStyle.RaisedInner:
+                    {
+                        penLight = new Pen(colorLight, 1);
+                        penDark = new Pen(colorDark, 1);
+                        if ((side & System.Windows.Forms.Border3DSide.Top) != 0)
+                            g.DrawLine(penLight, x, y, x + width, y);
+                        if ((side & System.Windows.Forms.Border3DSide.Left) != 0)
+                            g.DrawLine(penLight, x, y, x, y + height);
+                        if ((side & System.Windows.Forms.Border3DSide.Right) != 0)
+                            g.DrawLine(penDark, x + width, y, x + width, y + height);
+                        if ((side & System.Windows.Forms.Border3DSide.Bottom) != 0)
+                            g.DrawLine(penDark, x, y + height, x + width, y + height);
+                        break;
+                    }
+                case System.Windows.Forms.Border3DStyle.SunkenOuter:
+                    {
+                        penLight = new Pen(colorLight, 1);
+                        penDark = new Pen(colorDark, 1);
+                        if ((side & System.Windows.Forms.Border3DSide.Top) != 0)
+                            g.DrawLine(penDark, x, y, x + width, y);
+                        if ((side & System.Windows.Forms.Border3DSide.Left) != 0)
+                            g.DrawLine(penDark, x, y, x, y + height);
+                        if ((side & System.Windows.Forms.Border3DSide.Right) != 0)
+                            g.DrawLine(penLight, x + width, y, x + width, y + height);
+                        if ((side & System.Windows.Forms.Border3DSide.Bottom) != 0)
+                            g.DrawLine(penLight, x, y + height, x + width, y + height);
+                        break;
+                    }
+                case System.Windows.Forms.Border3DStyle.Raised:
+                    {
+                        if ((side & System.Windows.Forms.Border3DSide.Top) != 0 &&
+                            (side & System.Windows.Forms.Border3DSide.Left) != 0 &&
+                            (side & System.Windows.Forms.Border3DSide.Right) != 0 &&
+                            (side & System.Windows.Forms.Border3DSide.Bottom) != 0)
+                        {
+
+                            penLight = new Pen(Color.White, 1);
+                            g.DrawRectangle(penBase, x, y, width, height);
+                            g.DrawLine(penLight, x + 1, y + 1, x + width - 1, y + 1);
+                            g.DrawLine(penLight, x + 1, y + 1, x + 1, y + height - 1);
+                        }
+                        else
+                        {
+                            penDark = new Pen(colorLight, 1);
+                            penLight = new Pen(System.Windows.Forms.ControlPaint.LightLight(baseColor), 1);
+                            if ((side & System.Windows.Forms.Border3DSide.Top) != 0)
+                            {
+                                g.DrawLine(penDark, x, y, x + width, y);
+                                g.DrawLine(penLight, x + 1, y + 1, x + width - 2, y + 1);
+                            }
+                            if ((side & System.Windows.Forms.Border3DSide.Left) != 0)
+                            {
+                                g.DrawLine(penDark, x, y, x, y + height);
+                                g.DrawLine(penLight, x + 1, y + 1, x + 1, y + height - 2);
+                            }
+
+                            penDark.Dispose();
+                            penLight.Dispose();
+
+                            penDark = new Pen(System.Windows.Forms.ControlPaint.DarkDark(baseColor), 1);
+                            penLight = new Pen(colorDark, 1);
+
+                            if ((side & System.Windows.Forms.Border3DSide.Right) != 0)
+                            {
+                                g.DrawLine(penDark, x + width, y, x + width, y + height);
+                                g.DrawLine(penLight, x + width - 1, y + 1, x + width - 1, y + height - 1);
+                            }
+                            if ((side & System.Windows.Forms.Border3DSide.Bottom) != 0)
+                            {
+                                g.DrawLine(penDark, x, y + height, x + width, y + height);
+                                g.DrawLine(penLight, x + 1, y + height - 1, x + width - 1, y + height - 1);
+                            }
+                        }
+                        break;
+                    }
+                case System.Windows.Forms.Border3DStyle.Sunken:
+                    {
+                        penDark = new Pen(System.Windows.Forms.ControlPaint.DarkDark(baseColor), 1);
+                        penLight = new Pen(colorDark, 1);
+
+                        if ((side & System.Windows.Forms.Border3DSide.Top) != 0)
+                        {
+                            g.DrawLine(penDark, x, y, x + width, y);
+                            g.DrawLine(penLight, x + 1, y + 1, x + width - 2, y + 1);
+                        }
+                        if ((side & System.Windows.Forms.Border3DSide.Left) != 0)
+                        {
+                            g.DrawLine(penDark, x, y, x, y + height);
+                            g.DrawLine(penLight, x + 1, y + 1, x + 1, y + height - 2);
+                        }
+
+                        penDark.Dispose();
+                        penLight.Dispose();
+
+                        penDark = new Pen(colorLight, 1);
+                        penLight = new Pen(System.Windows.Forms.ControlPaint.LightLight(baseColor), 1);
+
+                        if ((side & System.Windows.Forms.Border3DSide.Right) != 0)
+                        {
+                            g.DrawLine(penDark, x + width, y, x + width, y + height);
+                            g.DrawLine(penLight, x + width - 1, y + 1, x + width - 1, y + height - 1);
+                        }
+                        if ((side & System.Windows.Forms.Border3DSide.Bottom) != 0)
+                        {
+                            g.DrawLine(penDark, x, y + height, x + width, y + height);
+                            g.DrawLine(penLight, x + 1, y + height - 1, x + width - 1, y + height - 1);
+                        }
+                        break;
+                    }
+            }
+            if (penLight != null)
+                penLight.Dispose();
+            if (penDark != null)
+                penDark.Dispose();
+            penBase.Dispose();
+        }
+
+        internal static System.Drawing.Drawing2D.LinearGradientBrush CreateLinearGradientBrush(Rectangle r, Color color1, Color color2, float gradientAngle)
+        {
+            if (r.Width <= 0)
+                r.Width = 1;
+            if (r.Height <= 0)
+                r.Height = 1;
+            return new System.Drawing.Drawing2D.LinearGradientBrush(new Rectangle(r.X, r.Y - 1, r.Width, r.Height + 1), color1, color2, gradientAngle);
+        }
+
+        internal static System.Drawing.Drawing2D.LinearGradientBrush CreateLinearGradientBrush(RectangleF r, Color color1, Color color2, float gradientAngle)
+        {
+            if (r.Width <= 0)
+                r.Width = 1;
+            if (r.Height <= 0)
+                r.Height = 1;
+            return new System.Drawing.Drawing2D.LinearGradientBrush(new RectangleF(r.X, r.Y - 1, r.Width, r.Height + 1), color1, color2, gradientAngle);
+        }
+
+        internal static System.Drawing.Drawing2D.LinearGradientBrush CreateLinearGradientBrush(Rectangle r, Color color1, Color color2, float gradientAngle, bool isAngleScalable)
+        {
+            if (r.Width <= 0)
+                r.Width = 1;
+            if (r.Height <= 0)
+                r.Height = 1;
+            return new System.Drawing.Drawing2D.LinearGradientBrush(new Rectangle(r.X, r.Y - 1, r.Width, r.Height + 1), color1, color2, gradientAngle, isAngleScalable);
+        }
+
+        public static void DrawDesignTimeSelection(Graphics g, Rectangle r, Color backColor, Color border, int penWidth)
+        {
+            if (r.Width <= 0 || r.Height <= 0)
+                return;
+            if (!backColor.IsEmpty && backColor != Color.Transparent)
+            {
+                if ((double)backColor.GetBrightness() < 0.5)
+                    border = System.Windows.Forms.ControlPaint.Light(backColor);
+                else
+                    border = System.Windows.Forms.ControlPaint.Dark(backColor);
+            }
+            using (Pen pen = new Pen(border, penWidth))
+            {
+                pen.DashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
+                r.Width--;
+                r.Height--;
+                g.DrawRectangle(pen, r);
+            }
+        }
+
+        public static BaseItem GetSubItemByName(BaseItem objParent, string ItemName)
+        {
+            return GetSubItemByName(objParent, ItemName, false);
+        }
+
+        public static BaseItem GetSubItemByName(BaseItem objParent, string ItemName, bool useGlobalName)
+        {
+            if (objParent == null)
+                return null;
+            foreach (BaseItem objItem in objParent.SubItems)
+            {
+                if (useGlobalName && objItem.GlobalName == ItemName || !useGlobalName && objItem.Name == ItemName)
+                    return objItem;
+                if (objItem.SubItems.Count > 0)
+                {
+                    BaseItem item = GetSubItemByName(objItem, ItemName, useGlobalName);
+                    if (item != null)
+                        return item;
+                }
+            }
+
+            if (objParent is GalleryContainer)
+            {
+                return GetSubItemByName(((GalleryContainer)objParent).PopupGalleryItem, ItemName, useGlobalName);
+            }
+
+            return null;
+        }
+
+        public static void GetSubItemsByName(BaseItem objParent, string ItemName, ArrayList list)
+        {
+            GetSubItemsByName(objParent, ItemName, list, false);
+        }
+
+        public static void GetSubItemsByName(BaseItem objParent, string ItemName, ArrayList list, bool useGlobalName)
+        {
+            if (objParent == null) return;
+            foreach (BaseItem objItem in objParent.SubItems)
+            {
+                if (useGlobalName && objItem.GlobalName == ItemName || !useGlobalName && objItem.Name == ItemName)
+                    list.Add(objItem);
+                else if (objItem is ControlContainerItem)
+                {
+                    ControlContainerItem cc = objItem as ControlContainerItem;
+                    if (cc.Control is RibbonBar)
+                    {
+                        RibbonBar rb = cc.Control as RibbonBar;
+                        ArrayList rbList = rb.GetItems(ItemName);
+                        list.AddRange(rbList);
+                    }
+                }
+
+                if (objItem.SubItems.Count > 0)
+                    GetSubItemsByName(objItem, ItemName, list, useGlobalName);
+            }
+
+            if (objParent is GalleryContainer)
+            {
+                GetSubItemsByName(((GalleryContainer)objParent).PopupGalleryItem, ItemName, list, useGlobalName);
+            }
+        }
+
+        public static void GetSubItemsByNameAndType(BaseItem objParent, string ItemName, ArrayList list, Type itemType)
+        {
+            GetSubItemsByNameAndType(objParent, ItemName, list, itemType, false);
+        }
+
+        public static void GetSubItemsByNameAndType(BaseItem objParent, string ItemName, ArrayList list, Type itemType, bool useGlobalName)
+        {
+            if (objParent == null) return;
+            foreach (BaseItem objItem in objParent.SubItems)
+            {
+                if (objItem.GetType() == itemType && (useGlobalName && objItem.GlobalName == ItemName || !useGlobalName && objItem.Name == ItemName))
+                    list.Add(objItem);
+                else if (objItem is ControlContainerItem)
+                {
+                    ControlContainerItem cc = objItem as ControlContainerItem;
+                    if (cc.Control is RibbonBar)
+                    {
+                        RibbonBar rb = cc.Control as RibbonBar;
+                        ArrayList rbList = rb.GetItems(ItemName, itemType, useGlobalName);
+                        list.AddRange(rbList);
+                    }
+                }
+
+                if (objItem.SubItems.Count > 0)
+                    GetSubItemsByNameAndType(objItem, ItemName, list, itemType, useGlobalName);
+            }
+        }
+
+        public static string ColorToString(Color clr)
+        {
+            if (clr.IsSystemColor)
+                return ("." + clr.Name);
+            else
+                return clr.ToArgb().ToString();
+        }
+
+        public static Color ColorFromString(string sclr)
+        {
+            if (sclr == "")
+                return Color.Empty;
+            if (sclr[0] == '.')
+                return Color.FromName(sclr.Substring(1));
+            else
+                return Color.FromArgb(System.Xml.XmlConvert.ToInt32(sclr));
+        }
+
+        public static bool SupportsAnimation
+        {
+            get { return m_SupportsAnimation; }
+        }
+
+        internal static ScreenInformation PrimaryScreen
+        {
+            get
+            {
+                if (m_Screens.Count == 0)
+                    RefreshScreens();
+                foreach (ScreenInformation s in m_Screens)
+                {
+                    if (s.Primary)
+                        return s;
+                }
+                if (m_Screens.Count > 0)
+                    return m_Screens[0];
+                return new ScreenInformation(new Rectangle(0, 0, 1024, 768), new Rectangle(0, 0, 1024, 768), true);
+            }
+        }
+
+        internal static ScreenInformation ScreenFromPoint(Point pScreen)
+        {
+            if (m_Screens.Count == 0)
+                RefreshScreens();
+            //foreach (System.Windows.Forms.Screen s in System.Windows.Forms.Screen.AllScreens) 
+            foreach (ScreenInformation s in m_Screens)
+            {
+                if (s.Bounds.Contains(pScreen))
+                {
+                    return s;
+                }
+            }
+
+            System.Windows.Forms.Screen scr = System.Windows.Forms.Screen.FromPoint(pScreen);
+            if (scr != null && scr.Bounds.Contains(pScreen))
+                return new ScreenInformation(scr.Bounds, scr.WorkingArea);
+
+            return null;
+        }
+        internal static ScreenInformation ScreenFromControl(System.Windows.Forms.Control control)
+        {
+            Rectangle r;
+            if (control.Parent != null)
+            {
+                Point screenLocation = control.PointToScreen(Point.Empty);
+                r = new Rectangle(screenLocation, control.Size);
+            }
+            else
+                r = new Rectangle(control.Location, control.Size);
+            if (m_Screens.Count == 0)
+                RefreshScreens();
+            //foreach (System.Windows.Forms.Screen s in System.Windows.Forms.Screen.AllScreens)
+            foreach (ScreenInformation s in m_Screens)
+            {
+                //if(s.Bounds.Contains(r)) 
+                if (s.Bounds.Contains(r))
+                {
+                    return s;
+                }
+            }
+            System.Windows.Forms.Screen scr = System.Windows.Forms.Screen.FromControl(control);
+            if (scr != null)
+                return new ScreenInformation(scr.Bounds, scr.WorkingArea);
+            return null;
+        }
+
+        private static List<ScreenInformation> m_Screens = new List<ScreenInformation>(2);
+        public static void RefreshScreens()
+        {
+            m_Screens.Clear();
+            foreach (System.Windows.Forms.Screen s in System.Windows.Forms.Screen.AllScreens)
+                m_Screens.Add(new ScreenInformation(s.Bounds, s.WorkingArea, s.Primary));
+        }
+
+        public static void SetExplorerBarStyle(ExplorerBar bar, eExplorerBarStockStyle stockStyle)
+        {
+            if (stockStyle == eExplorerBarStockStyle.SystemColors)
+            {
+                bar.BackStyle.Reset();
+                bar.BackStyle.BackColorSchemePart = eColorSchemePart.ExplorerBarBackground;
+                bar.BackStyle.BackColor2SchemePart = eColorSchemePart.ExplorerBarBackground2;
+                bar.BackStyle.BackColorGradientAngle = bar.ColorScheme.ExplorerBarBackgroundGradientAngle;
+            }
+            else if (stockStyle != eExplorerBarStockStyle.Custom)
+            {
+                ePredefinedColorScheme scheme = ePredefinedColorScheme.Blue2003;
+                if (stockStyle == eExplorerBarStockStyle.Silver || stockStyle == eExplorerBarStockStyle.SilverSpecial)
+                    scheme = ePredefinedColorScheme.Silver2003;
+                else if (stockStyle == eExplorerBarStockStyle.OliveGreen || stockStyle == eExplorerBarStockStyle.OliveGreenSpecial)
+                    scheme = ePredefinedColorScheme.OliveGreen2003;
+                ColorScheme cs = new ColorScheme(eDotNetBarStyle.Office2003);
+                cs.PredefinedColorScheme = scheme;
+
+                bar.BackStyle.Reset();
+                bar.BackStyle.BackColor = cs.ExplorerBarBackground;
+                bar.BackStyle.BackColor2 = cs.ExplorerBarBackground2;
+                bar.BackStyle.BackColorGradientAngle = cs.ExplorerBarBackgroundGradientAngle;
+            }
+        }
+        public static void SetExplorerBarStyle(ExplorerBarGroupItem group, eExplorerBarStockStyle stockStyle)
+        {
+            if (stockStyle == eExplorerBarStockStyle.SystemColors)
+            {
+                eExplorerBarStockStyle stock = eExplorerBarStockStyle.Blue;
+                eExplorerBarStockStyle special = eExplorerBarStockStyle.BlueSpecial;
+
+                if (SystemColors.Control.ToArgb() == Color.FromArgb(224, 223, 227).ToArgb() && SystemColors.Highlight.ToArgb() == Color.FromArgb(178, 180, 191).ToArgb())
+                {
+                    stock = eExplorerBarStockStyle.Silver;
+                    special = eExplorerBarStockStyle.SilverSpecial;
+                }
+                else if (SystemColors.Control.ToArgb() == Color.FromArgb(236, 233, 216).ToArgb() && SystemColors.Highlight.ToArgb() == Color.FromArgb(147, 160, 112).ToArgb())
+                {
+                    stock = eExplorerBarStockStyle.OliveGreen;
+                    special = eExplorerBarStockStyle.OliveGreenSpecial;
+                }
+
+                if (group.XPSpecialGroup)
+                    stockStyle = special;
+                else
+                    stockStyle = stock;
+            }
+
+            if (stockStyle != eExplorerBarStockStyle.Custom)
+            {
+                group.TitleStyle.Reset();
+                group.TitleHotStyle.Reset();
+                group.BackStyle.Reset();
+
+                group.TitleStyle.CornerTypeTopLeft = eCornerType.Rounded;
+                group.TitleStyle.CornerTypeTopRight = eCornerType.Rounded;
+                group.TitleStyle.CornerDiameter = 3;
+                group.TitleHotStyle.CornerTypeTopLeft = eCornerType.Rounded;
+                group.TitleHotStyle.CornerTypeTopRight = eCornerType.Rounded;
+                group.TitleHotStyle.CornerDiameter = 3;
+            }
+
+            switch (stockStyle)
+            {
+                case eExplorerBarStockStyle.Blue:
+                    {
+                        group.TitleStyle.BackColor = Color.White;
+                        group.TitleStyle.BackColor2 = Color.FromArgb(199, 211, 247);
+                        group.TitleStyle.TextColor = Color.FromArgb(33, 93, 198);
+                        group.TitleHotStyle.TextColor = Color.FromArgb(66, 142, 255);
+                        group.TitleHotStyle.BackColor = Color.White;
+                        group.TitleHotStyle.BackColor2 = Color.FromArgb(199, 211, 247); ;
+                        group.BackStyle.BackColor = Color.FromArgb(214, 223, 247);
+                        group.BackStyle.BorderBottom = eStyleBorderType.Solid;
+                        group.BackStyle.BorderTop = eStyleBorderType.None;
+                        group.BackStyle.BorderLeft = eStyleBorderType.Solid;
+                        group.BackStyle.BorderRight = eStyleBorderType.Solid;
+                        group.BackStyle.BorderBottomWidth = 1;
+                        group.BackStyle.BorderTopWidth = 0;
+                        group.BackStyle.BorderLeftWidth = 1;
+                        group.BackStyle.BorderRightWidth = 1;
+                        group.BackStyle.BorderColor = Color.White;
+                        group.ExpandBackColor = Color.White;
+                        group.ExpandBorderColor = Color.FromArgb(174, 182, 216);
+                        group.ExpandForeColor = Color.FromArgb(0, 60, 165);
+                        group.ExpandHotBackColor = Color.White;
+                        group.ExpandHotBorderColor = Color.FromArgb(174, 182, 216);
+                        group.ExpandHotForeColor = Color.FromArgb(66, 142, 255);
+
+                        break;
+                    }
+                case eExplorerBarStockStyle.BlueSpecial:
+                    {
+                        group.TitleStyle.BackColor = Color.FromArgb(0, 73, 181);
+                        group.TitleStyle.BackColor2 = Color.FromArgb(41, 93, 206);
+                        group.TitleStyle.TextColor = Color.White;
+                        group.TitleHotStyle.TextColor = Color.FromArgb(66, 142, 255);
+                        group.TitleHotStyle.BackColor = Color.FromArgb(0, 73, 181);
+                        group.TitleHotStyle.BackColor2 = Color.FromArgb(41, 93, 206);
+                        group.BackStyle.Reset();
+                        group.BackStyle.BackColor = Color.FromArgb(239, 243, 255);
+                        group.BackStyle.BorderBottom = eStyleBorderType.Solid;
+                        group.BackStyle.BorderTop = eStyleBorderType.None;
+                        group.BackStyle.BorderLeft = eStyleBorderType.Solid;
+                        group.BackStyle.BorderRight = eStyleBorderType.Solid;
+                        group.BackStyle.BorderBottomWidth = 1;
+                        group.BackStyle.BorderTopWidth = 0;
+                        group.BackStyle.BorderLeftWidth = 1;
+                        group.BackStyle.BorderRightWidth = 1;
+                        group.BackStyle.BorderColor = Color.White;
+
+                        group.ExpandBackColor = Color.FromArgb(48, 97, 196);
+                        group.ExpandBorderColor = Color.FromArgb(123, 168, 229);
+                        group.ExpandForeColor = Color.White;
+                        group.ExpandHotBackColor = Color.FromArgb(48, 97, 196);
+                        group.ExpandHotBorderColor = Color.FromArgb(123, 168, 229);
+                        group.ExpandHotForeColor = Color.FromArgb(172, 205, 255);
+
+                        break;
+                    }
+                case eExplorerBarStockStyle.OliveGreen:
+                    {
+                        group.TitleStyle.BackColor = Color.FromArgb(255, 252, 236);
+                        group.TitleStyle.BackColor2 = Color.FromArgb(224, 231, 184);
+                        group.TitleStyle.TextColor = Color.FromArgb(86, 102, 45);
+                        group.TitleHotStyle.TextColor = Color.FromArgb(114, 146, 29);
+                        group.TitleHotStyle.BackColor = Color.FromArgb(255, 252, 236);
+                        group.TitleHotStyle.BackColor2 = Color.FromArgb(224, 231, 184);
+                        group.BackStyle.Reset();
+                        group.BackStyle.BackColor = Color.FromArgb(246, 246, 236);
+                        group.BackStyle.BorderBottom = eStyleBorderType.Solid;
+                        group.BackStyle.BorderTop = eStyleBorderType.None;
+                        group.BackStyle.BorderLeft = eStyleBorderType.Solid;
+                        group.BackStyle.BorderRight = eStyleBorderType.Solid;
+                        group.BackStyle.BorderBottomWidth = 1;
+                        group.BackStyle.BorderTopWidth = 0;
+                        group.BackStyle.BorderLeftWidth = 1;
+                        group.BackStyle.BorderRightWidth = 1;
+                        group.BackStyle.BorderColor = Color.White;
+                        group.ExpandBackColor = Color.FromArgb(254, 254, 253);
+                        group.ExpandBorderColor = Color.FromArgb(194, 206, 185);
+                        group.ExpandForeColor = Color.FromArgb(75, 103, 28);
+                        group.ExpandHotBackColor = Color.FromArgb(254, 254, 253);
+                        group.ExpandHotBorderColor = Color.FromArgb(194, 206, 185);
+                        group.ExpandHotForeColor = Color.FromArgb(114, 146, 29);
+
+                        break;
+                    }
+                case eExplorerBarStockStyle.OliveGreenSpecial:
+                    {
+                        group.TitleStyle.BackColor = Color.FromArgb(119, 140, 64);
+                        group.TitleStyle.BackColor2 = Color.FromArgb(150, 168, 103);
+                        group.TitleStyle.TextColor = Color.White;
+                        group.TitleHotStyle.TextColor = Color.FromArgb(224, 231, 184);
+                        group.TitleHotStyle.BackColor = Color.FromArgb(119, 140, 64);
+                        group.TitleHotStyle.BackColor2 = Color.FromArgb(150, 168, 103);
+                        group.BackStyle.Reset();
+                        group.BackStyle.BackColor = Color.FromArgb(246, 246, 236);
+                        group.BackStyle.BorderBottom = eStyleBorderType.Solid;
+                        group.BackStyle.BorderTop = eStyleBorderType.None;
+                        group.BackStyle.BorderLeft = eStyleBorderType.Solid;
+                        group.BackStyle.BorderRight = eStyleBorderType.Solid;
+                        group.BackStyle.BorderBottomWidth = 1;
+                        group.BackStyle.BorderTopWidth = 0;
+                        group.BackStyle.BorderLeftWidth = 1;
+                        group.BackStyle.BorderRightWidth = 1;
+                        group.BackStyle.BorderColor = Color.White;
+
+                        group.ExpandBackColor = Color.FromArgb(129, 163, 79);
+                        group.ExpandBorderColor = Color.FromArgb(191, 205, 156);
+                        group.ExpandForeColor = Color.White;
+                        group.ExpandHotBackColor = Color.FromArgb(130, 164, 80);
+                        group.ExpandHotBorderColor = Color.FromArgb(182, 202, 139);
+                        group.ExpandHotForeColor = Color.FromArgb(221, 237, 190);
+
+                        break;
+                    }
+                case eExplorerBarStockStyle.Silver:
+                    {
+                        group.TitleStyle.BackColor = Color.White;
+                        group.TitleStyle.BackColor2 = Color.FromArgb(214, 215, 224);
+                        group.TitleStyle.TextColor = Color.FromArgb(63, 61, 61);
+                        group.TitleHotStyle.TextColor = Color.FromArgb(126, 124, 124);
+                        group.TitleHotStyle.BackColor = Color.White;
+                        group.TitleHotStyle.BackColor2 = Color.FromArgb(214, 215, 224);
+                        group.BackStyle.Reset();
+                        group.BackStyle.BackColor = Color.FromArgb(240, 241, 245);
+                        group.BackStyle.BorderBottom = eStyleBorderType.Solid;
+                        group.BackStyle.BorderTop = eStyleBorderType.None;
+                        group.BackStyle.BorderLeft = eStyleBorderType.Solid;
+                        group.BackStyle.BorderRight = eStyleBorderType.Solid;
+                        group.BackStyle.BorderBottomWidth = 1;
+                        group.BackStyle.BorderTopWidth = 0;
+                        group.BackStyle.BorderLeftWidth = 1;
+                        group.BackStyle.BorderRightWidth = 1;
+                        group.BackStyle.BorderColor = Color.White;
+
+                        group.ExpandBackColor = Color.White;
+                        group.ExpandBorderColor = Color.FromArgb(188, 189, 203);
+                        group.ExpandForeColor = Color.FromArgb(49, 68, 115);
+                        group.ExpandHotBackColor = Color.White;
+                        group.ExpandHotBorderColor = Color.FromArgb(194, 195, 208);
+                        group.ExpandHotForeColor = Color.FromArgb(126, 124, 124);
+
+                        break;
+                    }
+                case eExplorerBarStockStyle.SilverSpecial:
+                    {
+                        group.TitleStyle.BackColor = Color.FromArgb(119, 119, 146);
+                        group.TitleStyle.BackColor2 = Color.FromArgb(180, 182, 199);
+                        group.TitleStyle.TextColor = Color.White;
+                        group.TitleHotStyle.BackColor = Color.FromArgb(119, 119, 146);
+                        group.TitleHotStyle.BackColor2 = Color.FromArgb(180, 182, 199);
+                        group.TitleHotStyle.TextColor = Color.FromArgb(230, 230, 230);
+                        group.BackStyle.Reset();
+                        group.BackStyle.BackColor = Color.FromArgb(240, 241, 245);
+                        group.BackStyle.BorderBottom = eStyleBorderType.Solid;
+                        group.BackStyle.BorderTop = eStyleBorderType.None;
+                        group.BackStyle.BorderLeft = eStyleBorderType.Solid;
+                        group.BackStyle.BorderRight = eStyleBorderType.Solid;
+                        group.BackStyle.BorderBottomWidth = 1;
+                        group.BackStyle.BorderTopWidth = 0;
+                        group.BackStyle.BorderLeftWidth = 1;
+                        group.BackStyle.BorderRightWidth = 1;
+                        group.BackStyle.BorderColor = Color.White;
+
+                        group.ExpandBackColor = Color.FromArgb(111, 117, 151);
+                        group.ExpandBorderColor = Color.FromArgb(196, 203, 224);
+                        group.ExpandForeColor = Color.White;
+                        group.ExpandHotBackColor = Color.FromArgb(111, 117, 151);
+                        group.ExpandHotBorderColor = Color.FromArgb(196, 203, 224);
+                        group.ExpandHotForeColor = Color.White;
+
+                        break;
+                    }
+            }
+        }
+        public static void SetExplorerBarStyle(ButtonItem item, eExplorerBarStockStyle stockStyle)
+        {
+            if (stockStyle == eExplorerBarStockStyle.SystemColors)
+            {
+                eExplorerBarStockStyle stock = eExplorerBarStockStyle.Blue;
+
+                if (SystemColors.Control.ToArgb() == Color.FromArgb(224, 223, 227).ToArgb() && SystemColors.Highlight.ToArgb() == Color.FromArgb(178, 180, 191).ToArgb())
+                {
+                    stock = eExplorerBarStockStyle.Silver;
+                }
+                else if (SystemColors.Control.ToArgb() == Color.FromArgb(236, 233, 216).ToArgb() && SystemColors.Highlight.ToArgb() == Color.FromArgb(147, 160, 112).ToArgb())
+                {
+                    stock = eExplorerBarStockStyle.OliveGreen;
+                }
+
+                stockStyle = stock;
+            }
+
+            switch (stockStyle)
+            {
+                case eExplorerBarStockStyle.Blue:
+                case eExplorerBarStockStyle.BlueSpecial:
+                    {
+                        item.ForeColor = Color.FromArgb(33, 93, 198);
+                        item.HotForeColor = Color.FromArgb(66, 142, 255);
+                        break;
+                    }
+                case eExplorerBarStockStyle.OliveGreen:
+                case eExplorerBarStockStyle.OliveGreenSpecial:
+                    {
+                        item.ForeColor = Color.FromArgb(86, 102, 45);
+                        item.HotForeColor = Color.FromArgb(114, 146, 29);
+                        break;
+                    }
+                case eExplorerBarStockStyle.Silver:
+                case eExplorerBarStockStyle.SilverSpecial:
+                    {
+                        item.ForeColor = Color.FromArgb(63, 61, 61);
+                        item.HotForeColor = Color.FromArgb(126, 124, 124);
+                        break;
+                    }
+                default:
+                    {
+                        item.ForeColor = SystemColors.ControlText;
+                        item.HotForeColor = SystemColors.ControlDark;
+                        break;
+                    }
+            }
+        }
+
+        public static System.Windows.Forms.MdiClient GetMdiClient(System.Windows.Forms.Form MdiForm)
+        {
+            if (!MdiForm.IsMdiContainer)
+                return null;
+            foreach (System.Windows.Forms.Control ctrl in MdiForm.Controls)
+            {
+                if (ctrl is System.Windows.Forms.MdiClient)
+                    return (ctrl as System.Windows.Forms.MdiClient);
+            }
+            return null;
+        }
+
+        //internal static Bitmap CreateDisabledBitmap(Bitmap bmp)
+        //{
+        //    if(bmp==null)
+        //        return null;
+
+        //    Bitmap bmpTarget=null;
+        //    try
+        //    {
+        //        int nWidth = bmp.Width;
+        //        int nHeight = bmp.Height;
+        //        bmpTarget = new Bitmap(bmp);
+        //        for (int iX = 0; iX < nWidth; iX++)
+        //        {
+        //            for (int iY = 0; iY < nHeight; iY++)
+        //            {
+        //                Color cr = bmp.GetPixel(iX, iY);
+        //                if(cr.IsEmpty || cr==Color.Transparent)
+        //                {
+        //                    bmpTarget.SetPixel(iX, iY, Color.Transparent);
+        //                }
+        //                else
+        //                {
+        //                    byte nA = cr.A;
+        //                    byte nB = (byte) ((cr.B + 255) / 2);
+        //                    byte nG = (byte) ((cr.G + 255) / 2);
+        //                    byte nR = (byte) ((cr.R + 255) / 2);
+        //                    nR = nG = nB = (byte) (nR * 0.299 + nG * 0.587 + nB * 0.114);
+        //                    bmpTarget.SetPixel(iX, iY, Color.FromArgb(nA, nR, nG, nB));
+        //                }
+        //            }
+        //        }
+        //    }
+        //    catch
+        //    {
+        //        return null;
+        //    }
+
+        //    return bmpTarget;
+        //}
+        internal static Icon CreateDisabledIcon(Icon ico)
+        {
+            try
+            {
+                System.IO.MemoryStream memStream = new System.IO.MemoryStream();
+                ico.Save(memStream);
+                byte[] array = memStream.ToArray();
+                int nIconCount = array[4];
+                for (int iIcon = 0; iIcon < nIconCount; iIcon++)
+                {
+                    int nBaseOffset = 6 + iIcon * 16;
+                    int nWidth = array[nBaseOffset + 0];
+                    int nHeight = array[nBaseOffset + 1];
+                    int nOffset = GetDWORD(ref array, nBaseOffset + 12);
+                    //data at position
+                    int nStructSize = GetDWORD(ref array, nOffset);
+                    int nPlanes = GetWORD(ref array, nOffset + 12);
+                    int nBitCount = GetWORD(ref array, nOffset + 14);
+                    //process 32-bit Icons (bitcount=32)
+
+                    //process 24-bit icons (bitcount=24)
+
+                    //process 8-bit (256 color) icons (bitcount=8)
+                    if (nPlanes != 1) continue;
+
+                    int nSize = GetDWORD(ref array, nOffset + 20);
+                    int nStep = 0;
+
+                    switch (nBitCount)
+                    {
+                        case 32: nStep = 4; nSize = nWidth * nHeight * 4; break;
+                        case 24: nStep = 3; nSize = nWidth * nHeight * 3; break;
+                        case 8: nStep = 4; nSize = 1024; break;           //256 colors x 4 bytes
+                        default: continue;
+                    }
+
+                    int iDataStart = nOffset + nStructSize;
+                    for (int iPtr = iDataStart; iPtr < iDataStart + nSize; iPtr += nStep)
+                    {
+                        byte nB = (byte)((array[iPtr] + 255) / 2);
+                        byte nG = (byte)((array[iPtr + 1] + 255) / 2);
+                        byte nR = (byte)((array[iPtr + 2] + 255) / 2);
+                        if (!(nB == 127 && nG == 127 && nR == 127))
+                        {
+                            byte nNewRGB = (byte)(nR * 0.299 + nG * 0.587 + nB * 0.114);
+                            array[iPtr] = nNewRGB;
+                            array[iPtr + 1] = nNewRGB;
+                            array[iPtr + 2] = nNewRGB;
+                        }
+                    }
+                }
+                return new Icon(new System.IO.MemoryStream(array));
+            }
+            catch (Exception)
+            {
+                return null;
+            }
+        }
+        private static int GetDWORD(ref byte[] array, int offset)
+        {
+            return array[offset] + (array[offset + 1] << 8) + (array[offset + 2] << 16) + (array[offset + 3] << 24);
+        }
+        private static int GetWORD(ref byte[] array, int offset)
+        {
+            return array[offset] + (array[offset + 1] << 8);
+        }
+
+        internal static void PaintBackgroundImage(Graphics g, Rectangle targetRect, Image backgroundImage, eStyleBackgroundImage backgroundImagePosition, int backgroundImageAlpha)
+        {
+            PaintBackgroundImage(g, targetRect, backgroundImage, (eBackgroundImagePosition)backgroundImagePosition, backgroundImageAlpha);
+        }
+
+        internal static void PaintBackgroundImage(Graphics g, Rectangle targetRect, Image backgroundImage, eBackgroundImagePosition backgroundImagePosition, int backgroundImageAlpha)
+        {
+            if (backgroundImage == null)
+                return;
+
+            Rectangle r = targetRect;
+            System.Drawing.Imaging.ImageAttributes imageAtt = null;
+
+            if (backgroundImageAlpha != 255)
+            {
+                float[][] matrixItems ={ 
+                   new float[] {1, 0, 0, 0, 0},
+                   new float[] {0, 1, 0, 0, 0},
+                   new float[] {0, 0, 1, 0, 0},
+                   new float[] {0, 0, 0, (float)backgroundImageAlpha/255, 0}, 
+                   new float[] {0, 0, 0, 0, 1}};
+                System.Drawing.Imaging.ColorMatrix colorMatrix = new System.Drawing.Imaging.ColorMatrix(matrixItems);
+
+                //System.Drawing.Imaging.ColorMatrix colorMatrix = new System.Drawing.Imaging.ColorMatrix();
+                //colorMatrix.Matrix33 = 255 - backgroundImageAlpha;
+                imageAtt = new System.Drawing.Imaging.ImageAttributes();
+                imageAtt.SetColorMatrix(colorMatrix, System.Drawing.Imaging.ColorMatrixFlag.Default, System.Drawing.Imaging.ColorAdjustType.Bitmap);
+            }
+
+            switch (backgroundImagePosition)
+            {
+                case eBackgroundImagePosition.Stretch:
+                    {
+                        if (imageAtt != null)
+                            g.DrawImage(backgroundImage, r, 0, 0, backgroundImage.Width, backgroundImage.Height, GraphicsUnit.Pixel, imageAtt);
+                        else
+                            g.DrawImage(backgroundImage, r, 0, 0, backgroundImage.Width, backgroundImage.Height, GraphicsUnit.Pixel);
+                        break;
+                    }
+                case eBackgroundImagePosition.CenterLeft:
+                case eBackgroundImagePosition.CenterRight:
+                    {
+                        Rectangle destRect = new Rectangle(r.X, r.Y, Dpi.Width(backgroundImage.Width), Dpi.Height(backgroundImage.Height));
+                        if (r.Width > destRect.Width && backgroundImagePosition == eBackgroundImagePosition.CenterRight)
+                            destRect.X += (r.Width - destRect.Width);
+                        destRect.Y += (r.Height - destRect.Height) / 2;
+                        if (imageAtt != null)
+                            g.DrawImage(backgroundImage, destRect, 0, 0, backgroundImage.Width, backgroundImage.Height, GraphicsUnit.Pixel, imageAtt);
+                        else
+                            g.DrawImage(backgroundImage, destRect, 0, 0, backgroundImage.Width, backgroundImage.Height, GraphicsUnit.Pixel);
+
+                        break;
+                    }
+                case eBackgroundImagePosition.Center:
+                    {
+                        Rectangle destRect = new Rectangle(r.X, r.Y, Dpi.Width(backgroundImage.Width), Dpi.Height(backgroundImage.Height));
+                        if (r.Width > destRect.Width)
+                            destRect.X += (r.Width - destRect.Width) / 2;
+                        if (r.Height > destRect.Height)
+                            destRect.Y += (r.Height - destRect.Height) / 2;
+                        if (imageAtt != null)
+                            g.DrawImage(backgroundImage, destRect, 0, 0, backgroundImage.Width, backgroundImage.Height, GraphicsUnit.Pixel, imageAtt);
+                        else
+                            g.DrawImage(backgroundImage, destRect, 0, 0, backgroundImage.Width, backgroundImage.Height, GraphicsUnit.Pixel);
+                        break;
+                    }
+                case eBackgroundImagePosition.TopLeft:
+                case eBackgroundImagePosition.TopRight:
+                case eBackgroundImagePosition.BottomLeft:
+                case eBackgroundImagePosition.BottomRight:
+                    {
+                        Rectangle destRect = new Rectangle(r.X, r.Y, Dpi.Width(backgroundImage.Width), Dpi.Height(backgroundImage.Height));
+                        if (backgroundImagePosition == eBackgroundImagePosition.TopRight)
+                            destRect.X = r.Right - destRect.Width;
+                        else if (backgroundImagePosition == eBackgroundImagePosition.BottomLeft)
+                            destRect.Y = r.Bottom - destRect.Height;
+                        else if (backgroundImagePosition == eBackgroundImagePosition.BottomRight)
+                        {
+                            destRect.Y = r.Bottom - destRect.Height;
+                            destRect.X = r.Right - destRect.Width;
+                        }
+
+                        if (imageAtt != null)
+                            g.DrawImage(backgroundImage, destRect, 0, 0, backgroundImage.Width, backgroundImage.Height, GraphicsUnit.Pixel, imageAtt);
+                        else
+                            g.DrawImage(backgroundImage, destRect, 0, 0, backgroundImage.Width, backgroundImage.Height, GraphicsUnit.Pixel);
+                        break;
+                    }
+                case eBackgroundImagePosition.Tile:
+                    {
+                        if (imageAtt != null)
+                        {
+                            int imageWidth = Dpi.Width(backgroundImage.Width);
+                            int imageHeight = Dpi.Height(backgroundImage.Height);
+                            if (r.Width > imageWidth || r.Height > imageHeight)
+                            {
+                                int x = r.X, y = r.Y;
+                                while (y < r.Bottom)
+                                {
+                                    while (x < r.Right)
+                                    {
+                                        Rectangle destRect = new Rectangle(x, y, imageWidth, imageHeight);
+                                        if (destRect.Right > r.Right)
+                                            destRect.Width = destRect.Width - (destRect.Right - r.Right);
+                                        if (destRect.Bottom > r.Bottom)
+                                            destRect.Height = destRect.Height - (destRect.Bottom - r.Bottom);
+                                        g.DrawImage(backgroundImage, destRect, 0, 0, imageWidth, imageHeight, GraphicsUnit.Pixel, imageAtt);
+                                        x += imageWidth;
+                                    }
+                                    x = r.X;
+                                    y += imageHeight;
+                                }
+                            }
+                            else
+                            {
+                                g.DrawImage(backgroundImage, new Rectangle(0, 0, imageWidth, imageHeight), 0, 0, backgroundImage.Width, backgroundImage.Height, GraphicsUnit.Pixel, imageAtt);
+                            }
+                        }
+                        else
+                        {
+                            SmoothingMode sm = g.SmoothingMode;
+                            g.SmoothingMode = SmoothingMode.None;
+                            using (TextureBrush brush = new TextureBrush(backgroundImage))
+                            {
+                                brush.WrapMode = System.Drawing.Drawing2D.WrapMode.Tile;
+                                g.FillRectangle(brush, r);
+                            }
+                            g.SmoothingMode = sm;
+                        }
+                        break;
+                    }
+            }
+        }
+
+        public static bool IsSystemKey(System.Windows.Forms.Keys key)
+        {
+            if (key == Keys.Add || key == Keys.Alt || key == Keys.Apps || key == Keys.Attn ||
+                key == Keys.Back || key == Keys.Escape || key == Keys.Enter ||
+                (key >= Keys.F1 && key <= Keys.F19) || key == Keys.Tab)
+                return true;
+            return false;
+        }
+
+        public static bool IsFormActive(Form f)
+        {
+            if (f == null) return false;
+
+            if (Form.ActiveForm == f)
+            {
+                if (f.IsMdiChild)
+                {
+                    if (f.MdiParent != null)
+                    {
+                        if (f.MdiParent.ActiveMdiChild == f)
+                            return true;
+                        else
+                            return false;
+                    }
+                }
+                return true;
+            }
+
+            return false;
+        }
+
+        public static void AnimateControl(System.Windows.Forms.Control control, bool show, int animationTime, Rectangle rectStart, Rectangle rectEnd)
+        {
+            control.Bounds = rectStart;
+            if (!control.Visible)
+                control.Visible = true;
+
+            bool directSet = false;
+            if (animationTime <= 0)
+                directSet = true;
+
+            TimeSpan time = new TimeSpan(0, 0, 0, 0, animationTime);
+            int dxLoc, dyLoc;
+            int dWidth, dHeight;
+            dxLoc = dyLoc = dWidth = dHeight = 0;
+            if (rectStart.Left == rectEnd.Left &&
+                rectStart.Top == rectEnd.Top &&
+                rectStart.Right == rectEnd.Right && rectStart.Height != rectEnd.Height)
+            {
+                dHeight = (rectEnd.Height > rectStart.Height ? 1 : -1);
+            }
+            else if (rectStart.Left == rectEnd.Left &&
+                rectStart.Top == rectEnd.Top &&
+                rectStart.Bottom == rectEnd.Bottom && rectStart.Width != rectEnd.Width)
+            {
+                dWidth = (rectEnd.Width > rectStart.Width ? 1 : -1);
+            }
+            else if (rectStart.Right == rectEnd.Right &&
+                rectStart.Top == rectEnd.Top &&
+                rectStart.Bottom == rectEnd.Bottom && rectStart.Width != rectEnd.Width)
+            {
+                dxLoc = (rectEnd.Width > rectStart.Width ? -1 : 1);
+                dWidth = (rectEnd.Width > rectStart.Width ? 1 : -1);
+            }
+            else if (rectStart.Right == rectEnd.Right &&
+                rectStart.Left == rectEnd.Left &&
+                rectStart.Bottom == rectEnd.Bottom && rectStart.Height != rectEnd.Height)
+            {
+                dyLoc = (rectEnd.Height > rectStart.Height ? -1 : 1);
+                dHeight = (rectEnd.Height > rectStart.Height ? 1 : -1);
+            }
+            else if (rectEnd.X != rectStart.X && rectEnd.Y == rectStart.Y && rectStart.Height == rectEnd.Height && rectEnd.Width == rectStart.Width)
+            {
+                // Simple to left move of the control
+                dxLoc = (rectEnd.X > rectStart.X ? 1 : -1);
+            }
+            else if (rectEnd.Y != rectStart.Y && rectEnd.X == rectStart.X && rectStart.Height == rectEnd.Height && rectEnd.Width == rectStart.Width)
+            {
+                // Simple to left move of the control
+                dxLoc = (rectEnd.Y > rectStart.Y ? 1 : -1);
+            }
+            else
+                directSet = true;
+
+            if (directSet)
+            {
+                control.Bounds = rectEnd;
+            }
+            else
+            {
+                int speedFactor = 1;
+                int totalPixels = (rectStart.Width != rectEnd.Width) ?
+                    Math.Abs(rectStart.Width - rectEnd.Width) :
+                    Math.Abs(rectStart.Height - rectEnd.Height);
+                if (totalPixels == 0 && rectStart.Width == rectEnd.Width && rectStart.Height == rectEnd.Height)
+                {
+                    if (rectEnd.X - rectStart.X != 0)
+                        totalPixels = Math.Abs(rectStart.X - rectEnd.X);
+                    else if (rectEnd.Y - rectStart.Y != 0)
+                        totalPixels = Math.Abs(rectStart.Y - rectEnd.Y);
+                }
+                int remainPixels = totalPixels;
+                DateTime startingTime = DateTime.Now;
+                Rectangle rectAnimation = rectStart;
+                while (rectAnimation != rectEnd)
+                {
+                    DateTime startPerMove = DateTime.Now;
+
+                    rectAnimation.X += dxLoc * speedFactor;
+                    rectAnimation.Y += dyLoc * speedFactor;
+                    rectAnimation.Width += dWidth * speedFactor;
+                    rectAnimation.Height += dHeight * speedFactor;
+                    if (Math.Sign(rectEnd.X - rectAnimation.X) != Math.Sign(dxLoc))
+                        rectAnimation.X = rectEnd.X;
+                    if (Math.Sign(rectEnd.Y - rectAnimation.Y) != Math.Sign(dyLoc))
+                        rectAnimation.Y = rectEnd.Y;
+                    if (Math.Sign(rectEnd.Width - rectAnimation.Width) != Math.Sign(dWidth))
+                        rectAnimation.Width = rectEnd.Width;
+                    if (Math.Sign(rectEnd.Height - rectAnimation.Height) != Math.Sign(dHeight))
+                        rectAnimation.Height = rectEnd.Height;
+                    control.Bounds = rectAnimation;
+                    
+                    if (control.Parent != null)
+                        control.Parent.Update();
+                    else
+                        control.Update();
+
+                    remainPixels -= speedFactor;
+
+                    while (true)
+                    {
+                        DateTime now = DateTime.Now;
+                        TimeSpan elapsedPerMove = now - startPerMove;
+                        TimeSpan elapsedTime = now - startingTime;
+                        if ((time - elapsedTime).TotalMilliseconds <= 0)
+                        {
+                            speedFactor = remainPixels;
+                            break;
+                        }
+                        else
+                        {
+                            if ((int)(time - elapsedTime).TotalMilliseconds == 0)
+                                speedFactor = 1;
+                            else
+                            {
+                                try
+                                {
+
+                                    speedFactor = remainPixels * (int)elapsedPerMove.TotalMilliseconds / (int)((time - elapsedTime).TotalMilliseconds);
+                                }
+                                catch { }
+                            }
+                        }
+                        if (speedFactor >= 1)
+                            break;
+                    }
+                }
+            }
+
+            if (!show)
+            {
+                control.Visible = false;
+                control.Bounds = rectStart;
+            }
+        }
+
+        //		internal static Keys GetPressedKey()
+        //		{
+        //			NativeFunctions.GetKeyboardState 
+        //
+        //			return Keys.None;
+        //		}
+
+        internal static eWinXPColorScheme WinXPColorScheme
+        {
+            get
+            {
+                eWinXPColorScheme c = eWinXPColorScheme.Undetermined;
+                if (BarFunctions.ThemedOS && NativeFunctions.ColorDepth >= 16)
+                {
+                    if (m_IsVista)
+                        c = eWinXPColorScheme.Blue;
+                    else if (SystemColors.Control.ToArgb() == Color.FromArgb(236, 233, 216).ToArgb() && SystemColors.Highlight.ToArgb() == Color.FromArgb(49, 106, 197).ToArgb())
+                        c = eWinXPColorScheme.Blue;
+                    else if (SystemColors.Control.ToArgb() == Color.FromArgb(224, 223, 227).ToArgb() && SystemColors.Highlight.ToArgb() == Color.FromArgb(178, 180, 191).ToArgb())
+                        c = eWinXPColorScheme.Silver;
+                    else if (SystemColors.Control.ToArgb() == Color.FromArgb(236, 233, 216).ToArgb() && SystemColors.Highlight.ToArgb() == Color.FromArgb(147, 160, 112).ToArgb())
+                        c = eWinXPColorScheme.OliveGreen;
+                }
+
+                return c;
+            }
+        }
+
+        internal static Bitmap LoadBitmap(string imageName)
+        {
+            DotNetBarResourcesAttribute att = Attribute.GetCustomAttribute(System.Reflection.Assembly.GetExecutingAssembly(), typeof(DotNetBarResourcesAttribute)) as DotNetBarResourcesAttribute;
+            if (att != null && att.NamespacePrefix != "")
+            {
+                return new Bitmap(Assembly.GetExecutingAssembly().GetManifestResourceStream(att.NamespacePrefix + "." + imageName));
+            }
+            else
+                return new Bitmap(typeof(DevComponents.DotNetBar.DotNetBarManager), imageName);
+        }
+
+        internal static Icon LoadIcon(string imageName)
+        {
+            DotNetBarResourcesAttribute att = Attribute.GetCustomAttribute(System.Reflection.Assembly.GetExecutingAssembly(), typeof(DotNetBarResourcesAttribute)) as DotNetBarResourcesAttribute;
+            if (att != null && att.NamespacePrefix != "")
+            {
+                return new Icon(Assembly.GetExecutingAssembly().GetManifestResourceStream(att.NamespacePrefix + "." + imageName));
+            }
+            else
+                return new Icon(typeof(DevComponents.DotNetBar.DotNetBarManager), imageName);
+        }
+
+        public static Graphics CreateGraphics(Control objCtrl)
+        {
+            if (objCtrl is ItemControl)
+                return ((ItemControl)objCtrl).CreateGraphics();
+            else if (objCtrl is Bar)
+                return ((Bar)objCtrl).CreateGraphics();
+            else if (objCtrl is ExplorerBar)
+                return ((ExplorerBar)objCtrl).CreateGraphics();
+            else if (objCtrl is BaseItemControl)
+                return ((BaseItemControl)objCtrl).CreateGraphics();
+            else if (objCtrl is BarBaseControl)
+                return ((BarBaseControl)objCtrl).CreateGraphics();
+            else if (objCtrl is PanelControl)
+                return ((PanelControl)objCtrl).CreateGraphics();
+            else if (objCtrl is PopupItemControl)
+                return ((PopupItemControl)objCtrl).CreateGraphics();
+
+            return objCtrl.CreateGraphics();
+        }
+
+        public static bool IsOffice2007Style(eDotNetBarStyle style)
+        {
+            if (style == eDotNetBarStyle.StyleManagerControlled)
+                style = StyleManager.GetEffectiveStyle();
+            return (style == eDotNetBarStyle.Office2007 || style == eDotNetBarStyle.Office2010 || style == eDotNetBarStyle.Windows7 || StyleManager.IsMetro(style));
+        }
+
+        public static bool IsOffice2010Style(eDotNetBarStyle style)
+        {
+            if (style == eDotNetBarStyle.StyleManagerControlled)
+                style = StyleManager.GetEffectiveStyle();
+            return (style == eDotNetBarStyle.Office2010 || style == eDotNetBarStyle.Windows7 || StyleManager.IsMetro(style));
+        }
+
+        public static bool IsOffice2007StyleOnly(eDotNetBarStyle style)
+        {
+            if (style == eDotNetBarStyle.StyleManagerControlled)
+                style = StyleManager.GetEffectiveStyle();
+            return (style == eDotNetBarStyle.Office2007);
+        }
+    }
+
+    internal class ScreenInformation
+    {
+        public Rectangle Bounds = Rectangle.Empty;
+        public Rectangle WorkingArea = Rectangle.Empty;
+        public bool Primary = false;
+        public ScreenInformation(Rectangle bounds, Rectangle workingarea)
+        {
+            this.Bounds = bounds;
+            this.WorkingArea = workingarea;
+        }
+        public ScreenInformation(Rectangle bounds, Rectangle workingarea, bool primary)
+        {
+            this.Bounds = bounds;
+            this.WorkingArea = workingarea;
+            this.Primary = primary;
+        }
+    }
+
+    internal enum eWinXPColorScheme
+    {
+        Undetermined,
+        Blue,
+        OliveGreen,
+        Silver
+    }
+
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public class LocalizationManager : IDisposable
+    {
+        private ResourceManager m_ResourceManager = null;
+        private IOwnerLocalize m_Manager = null;
+
+        public LocalizationManager()
+            : this(null)
+        {
+        }
+        public LocalizationManager(IOwnerLocalize manager)
+        {
+            m_Manager = manager;
+        }
+        public void Dispose()
+        {
+            m_ResourceManager = null;
+            m_Manager = null;
+        }
+
+        public string GetDefaultLocalizedString(string key)
+        {
+            string s = GetLocalizedString(key);
+            if (s == "" || s == null)
+            {
+                ResourceManager res = BarFunctions.GetResourceManager(true);
+                s = res.GetString(key);
+            }
+            if (s == null)
+                s = "";
+            return s;
+        }
+
+        public static string GetLocalizedString(string key, string defaultValue)
+        {
+            LocalizeEventArgs e = new LocalizeEventArgs();
+            e.Key = key;
+            e.LocalizedValue = defaultValue;
+            LocalizationKeys.InvokeLocalizeString(e);
+            if (e.Handled)
+                return e.LocalizedValue;
+
+            return defaultValue;
+        }
+
+        public string GetLocalizedString(string key)
+        {
+            string s = "";
+            if (m_ResourceManager == null)
+                m_ResourceManager = BarFunctions.GetResourceManager();
+            if (m_ResourceManager != null)
+            {
+                s = m_ResourceManager.GetString(key);
+                if (s == null)
+                    s = "";
+            }
+
+            // Fire static event first
+            LocalizeEventArgs e = new LocalizeEventArgs();
+            e.Key = key;
+            e.LocalizedValue = s;
+            LocalizationKeys.InvokeLocalizeString(e);
+            if (e.Handled)
+                return e.LocalizedValue;
+
+
+            if (m_Manager != null)
+            {
+                m_Manager.InvokeLocalizeString(e);
+                if (e.Handled)
+                    return e.LocalizedValue;
+            }
+
+            return s;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/BarSerialization/BarSerializationXml.cs b/PROMS/DotNetBar Source Code/BarSerialization/BarSerializationXml.cs
new file mode 100644
index 00000000..b69a675d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/BarSerialization/BarSerializationXml.cs	
@@ -0,0 +1,14 @@
+using System;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Holds the XML element and attribute names for bar serialization.
+	/// </summary>
+	internal class BarSerializationXml
+	{
+		public static string Bar="bar";
+		public static string Name="name";
+		public static string Custom="custom";
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/BarTextBox.cs b/PROMS/DotNetBar Source Code/BarTextBox.cs
new file mode 100644
index 00000000..edf0c230
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/BarTextBox.cs	
@@ -0,0 +1,80 @@
+using System;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Summary description for BarTextBox.
+	/// </summary>
+	internal class BarTextBox:TextBox
+	{
+		private int m_LastFocusWindow;
+		private string m_OriginalText;
+		public BarTextBox()
+		{
+			this.BorderStyle=System.Windows.Forms.BorderStyle.None;
+			this.AutoSize=false;
+			this.TabStop=false;
+			m_LastFocusWindow=0;
+		}
+
+		protected override void WndProc(ref Message m)
+		{
+			if(m.Msg==NativeFunctions.WM_SETFOCUS)
+			{
+				m_LastFocusWindow=m.WParam.ToInt32();
+				m_OriginalText=this.Text;
+			}
+			base.WndProc(ref m);
+		}
+
+		public void ReleaseFocus()
+		{
+			if(this.Focused && m_LastFocusWindow!=0)
+			{
+				int focus=m_LastFocusWindow;
+				m_LastFocusWindow=0;
+				Control ctrl=Control.FromChildHandle(new System.IntPtr(focus));
+				if(ctrl!=this)
+				{
+					Control p=this.Parent;
+					while(p!=null)
+					{
+						if(p==ctrl)
+							return;
+						p=p.Parent;
+					}
+
+					if(ctrl!=null)
+						ctrl.Focus();
+					else
+					{
+						NativeFunctions.SetFocus(focus);
+					}
+				}
+                
+				//this.OnLostFocus(new System.EventArgs());
+				//this.InvokeLostFocus(this,new System.EventArgs());
+			}
+		}
+
+		protected override void OnKeyDown(KeyEventArgs e)
+		{
+			if(e.KeyCode==Keys.Enter)
+				ReleaseFocus();
+			else if(e.KeyCode==Keys.Escape)
+			{
+				this.Text=m_OriginalText;
+				ReleaseFocus();
+			}
+
+			base.OnKeyDown(e);
+		}
+
+		protected override void OnLostFocus(EventArgs e)
+		{
+			m_LastFocusWindow=0;
+			base.OnLostFocus(e);
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/BarUtilities.cs b/PROMS/DotNetBar Source Code/BarUtilities.cs
new file mode 100644
index 00000000..9e46f569
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/BarUtilities.cs	
@@ -0,0 +1,422 @@
+using System;
+using System.ComponentModel;
+using System.Runtime.InteropServices;
+using System.Drawing.Text;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Represents class with static functions that provide commonly used utility functions when working with
+	/// Bar objects and items hosted by Bar object.
+	/// </summary>
+	public class BarUtilities
+    {
+        #region Docking
+        /// <summary>
+        /// Sets Bar visible property and remembers the auto-hide state.
+        /// </summary>
+        /// <param name="bar">Bar to set visibility for.</param>
+        /// <param name="visible">true if visible otherwise false</param>
+        public static void SetBarVisible(Bar bar, bool visible)
+        {
+            if (bar == null || bar.Visible == visible)
+                return;
+
+            DotNetBarManager manager = bar.Owner as DotNetBarManager;
+            if (manager != null)
+                manager.SuspendLayout = true;
+
+            try
+            {
+                if (visible)
+                {
+                    bar.Visible = true;
+                    if (bar.PropertyBag.ContainsKey(BarPropertyBagKeys.AutoHideSetting))
+                    {
+                        bar.PropertyBag.Remove(BarPropertyBagKeys.AutoHideSetting);
+                        bar.AutoHide = true;
+                    }
+                }
+                else
+                {
+                    if (bar.PropertyBag.ContainsKey(BarPropertyBagKeys.AutoHideSetting))
+                        bar.PropertyBag.Remove(BarPropertyBagKeys.AutoHideSetting);
+                    // Remember auto-hide setting
+                    if (bar.AutoHide)
+                        bar.PropertyBag.Add(BarPropertyBagKeys.AutoHideSetting, true);
+                    bar.CloseBar();
+                }
+            }
+            finally
+            {
+                if (manager != null)
+                    manager.SuspendLayout = false;
+                bar.RecalcLayout();
+            }
+        }
+
+        /// <summary>
+		/// Sets the visible property of DockContainerItem and hides the bar if the given item is the last visible item on the bar.
+		/// It will also automatically display the bar if bar is not visible.
+		/// </summary>
+		/// <param name="item">DockContainerItem to set visibility for.</param>
+		/// <param name="visible">Indicates the visibility of the item</param>
+		public static void SetDockContainerVisible(DevComponents.DotNetBar.DockContainerItem item, bool visible)
+		{
+			if(item==null || item.Visible==visible)
+				return;
+
+			DevComponents.DotNetBar.Bar containerBar=item.ContainerControl as DevComponents.DotNetBar.Bar;
+
+			if(containerBar==null)
+			{
+				// If bar has not been assigned yet just set the visible property and exit
+				item.Visible=visible;
+				return;
+			}
+
+			DotNetBarManager manager=containerBar.Owner as DotNetBarManager;
+			if(manager!=null)
+				manager.SuspendLayout=true;
+
+			try
+			{
+				int visibleCount=containerBar.VisibleItemCount;
+
+				if(visible)
+				{
+					item.Visible=true;
+					if(!containerBar.AutoHide && !containerBar.Visible && visibleCount<=1)
+					{
+						containerBar.Visible=true;
+						if(containerBar.PropertyBag.ContainsKey(BarPropertyBagKeys.AutoHideSetting))
+						{
+							containerBar.PropertyBag.Remove(BarPropertyBagKeys.AutoHideSetting);
+							containerBar.AutoHide=true;
+						}
+					}
+				}
+				else
+				{
+                    if (visibleCount <= 1)
+                    {
+                        if (containerBar.PropertyBag.ContainsKey(BarPropertyBagKeys.AutoHideSetting))
+                            containerBar.PropertyBag.Remove(BarPropertyBagKeys.AutoHideSetting);
+                        // Remember auto-hide setting
+                        if (containerBar.AutoHide)
+                            containerBar.PropertyBag.Add(BarPropertyBagKeys.AutoHideSetting, true);
+                        containerBar.CloseBar();
+                    }
+					item.Visible=false;
+				}
+			}
+			finally
+			{
+				if(manager!=null)
+					manager.SuspendLayout=false;
+				containerBar.RecalcLayout();
+			}
+		}
+
+		/// <summary>
+		/// Creates new instance of the bar and sets its properties so bar can be used as Document bar.
+		/// </summary>
+		/// <returns>Returns new instance of the bar.</returns>
+		public static Bar CreateDocumentBar()
+		{
+			Bar bar=new Bar();
+			BarUtilities.InitializeDocumentBar(bar);
+			return bar;
+		}
+
+		/// <summary>
+		/// Sets the properties on a bar so it can be used as Document bar.
+		/// </summary>
+		/// <param name="bar">Bar to set properties of.</param>
+		public static void InitializeDocumentBar(Bar bar)
+		{
+			TypeDescriptor.GetProperties(bar)["LayoutType"].SetValue(bar,eLayoutType.DockContainer);
+			TypeDescriptor.GetProperties(bar)["DockTabAlignment"].SetValue(bar,eTabStripAlignment.Top);
+			TypeDescriptor.GetProperties(bar)["AlwaysDisplayDockTab"].SetValue(bar,true);
+			TypeDescriptor.GetProperties(bar)["Stretch"].SetValue(bar,true);
+			TypeDescriptor.GetProperties(bar)["GrabHandleStyle"].SetValue(bar,eGrabHandleStyle.None);
+			TypeDescriptor.GetProperties(bar)["CanDockBottom"].SetValue(bar,false);
+			TypeDescriptor.GetProperties(bar)["CanDockTop"].SetValue(bar,false);
+			TypeDescriptor.GetProperties(bar)["CanDockLeft"].SetValue(bar,false);
+			TypeDescriptor.GetProperties(bar)["CanDockRight"].SetValue(bar,false);
+			TypeDescriptor.GetProperties(bar)["CanDockDocument"].SetValue(bar,true);
+			TypeDescriptor.GetProperties(bar)["CanUndock"].SetValue(bar,false);
+			TypeDescriptor.GetProperties(bar)["CanHide"].SetValue(bar,true);
+			TypeDescriptor.GetProperties(bar)["CanCustomize"].SetValue(bar,false);
+			TypeDescriptor.GetProperties(bar)["TabNavigation"].SetValue(bar,true);
+        }
+
+        #region Win API
+        [DllImport("user32")]
+        private static extern int SetWindowLong(IntPtr hWnd, int nIndex, int dwNewLong);
+        [DllImport("user32")]
+        private static extern int GetWindowLong(IntPtr hWnd, int nIndex);
+        private const int GWL_EXSTYLE = (-20);
+        private const int WS_EX_CLIENTEDGE = 0x00000200;
+        [DllImport("user32")]
+        private static extern bool SetWindowPos(IntPtr hWnd, IntPtr hWndInsertAfter, int X, int Y, int cx, int cy, int uFlags);
+        const int SWP_FRAMECHANGED = 0x0020;
+        const int SWP_NOSIZE = 0x0001;
+        const int SWP_NOMOVE = 0x0002;
+        const int SWP_NOZORDER = 0x0004;
+        #endregion
+
+        /// <summary>
+        /// Changes the MDI Client border edge to remove 3D border or to add it.
+        /// </summary>
+        /// <param name="c">Reference to MDI Client object.</param>
+        /// <param name="removeBorder">Indicates whether to remove border.</param>
+        public static void ChangeMDIClientBorder(System.Windows.Forms.MdiClient c, bool removeBorder)
+        {
+            if (c != null)
+            {
+                int exStyle = GetWindowLong(c.Handle, GWL_EXSTYLE);
+                
+                if(removeBorder)
+                    exStyle ^= WS_EX_CLIENTEDGE;
+                else
+                    exStyle |= WS_EX_CLIENTEDGE;
+
+                SetWindowLong(c.Handle, GWL_EXSTYLE, exStyle);
+                SetWindowPos(c.Handle, IntPtr.Zero, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_FRAMECHANGED);
+            }
+        }
+
+        /// <summary>
+        /// Changes the MDI Client border edge to remove 3D border or to add it.
+        /// </summary>
+        /// <param name="c">Reference to MDI parent form.</param>
+        /// <param name="removeBorder">Indicates whether to remove border.</param>
+        public static void ChangeMDIClientBorder(System.Windows.Forms.Form c, bool removeBorder)
+        {
+            if (c.IsMdiContainer && c.IsHandleCreated)
+            {
+                foreach (System.Windows.Forms.Control control in c.Controls)
+                {
+                    if (control is System.Windows.Forms.MdiClient)
+                    {
+                        ChangeMDIClientBorder(control as System.Windows.Forms.MdiClient, removeBorder);
+                        break;
+                    }
+                }
+            }
+        }
+        #endregion
+
+        #region Item Invalidate
+        internal static void InvalidateFontChange(SubItemsCollection col)
+        {
+            foreach (BaseItem item in col)
+            {
+                InvalidateFontChange(item);
+            }
+        }
+
+        internal static void InvalidateFontChange(BaseItem item)
+        {
+            if (item.TextMarkupBody != null) item.TextMarkupBody.InvalidateElementsSize();
+            if (item.SubItems.Count > 0) InvalidateFontChange(item.SubItems);
+        }
+        #endregion
+
+        internal static void InvokeRecalcLayout(System.Windows.Forms.Control control)
+        {
+            if (control is Bar)
+                ((Bar)control).RecalcLayout();
+            else if (control is ItemControl)
+                ((ItemControl)control).RecalcLayout();
+            else if (control is BaseItemControl)
+                ((BaseItemControl)control).RecalcLayout();
+            else if (control is ExplorerBar)
+                ((ExplorerBar)control).RecalcLayout();
+            else if (control is SideBar)
+                ((SideBar)control).RecalcLayout();
+        }
+
+        private static volatile bool _FadeAnimatorEnabled = true;
+        /// <summary>
+        /// Gets or sets whether Fade Animation is enabled on system level for DotNetBar items which use this. Default value is true.
+        /// </summary>
+        public static bool FadeAnimatorEnabled
+        {
+            get { return _FadeAnimatorEnabled; }
+            set { _FadeAnimatorEnabled = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether StringFormat internally used by all DotNetBar controls to render text is GenericDefault. Default value is false
+        /// which indicates that GenericTypographic is used.
+        /// </summary>
+        public static bool UseGenericDefaultStringFormat
+        {
+            get { return TextDrawing.UseGenericDefault; }
+            set { TextDrawing.UseGenericDefault = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the anti-alias text rendering hint that will be used to render text on controls that have AntiAlias property set to true.
+        /// </summary>
+        public static TextRenderingHint AntiAliasTextRenderingHint
+        {
+            get
+            {
+                return DisplayHelp.AntiAliasTextRenderingHint;
+            }
+            set
+            {
+            	DisplayHelp.AntiAliasTextRenderingHint = value;
+            }
+        }
+
+#if FRAMEWORK20
+        /// <summary>
+        /// Gets or sets whether .NET Framework TextRenderer class is used for text rendering instead of Graphics.DrawString. 
+        /// Default value is false. 
+        /// Using TextRenderer will disable the Fade and Animation effects on controls because of issues in TextRenderer when drawing text on transparent
+        /// surfaces.
+        /// </summary>
+        public static bool UseTextRenderer
+        {
+            get { return TextDrawing.UseTextRenderer; }
+            set { TextDrawing.UseTextRenderer = value; }
+        }
+#endif
+
+
+        private static bool _AlwaysGenerateAccessibilityFocusEvent = false;
+        /// <summary>
+        /// Gets or sets whether items always generate the Focus accessibility event when mouse enters the item. Default value is false which indicates
+        /// that focus event will be raised only when item is on menu bar.
+        /// </summary>
+        public static bool AlwaysGenerateAccessibilityFocusEvent
+        {
+            get { return _AlwaysGenerateAccessibilityFocusEvent; }
+            set
+            {
+                _AlwaysGenerateAccessibilityFocusEvent = value;
+            }
+        }
+
+        internal static bool IsModalFormOpen
+        {
+            get
+            {
+#if (FRAMEWORK20)
+                for (int i = 0; i < System.Windows.Forms.Application.OpenForms.Count; i++)
+                {
+                    System.Windows.Forms.Form form = System.Windows.Forms.Application.OpenForms[i];
+                    if (form.Modal) return true;
+                }
+#endif
+                return false;
+            }
+        }
+
+        private static bool _AutoRemoveMessageFilter = false;
+        /// <summary>
+        /// Gets or sets whether Application Message Filter that is registered by popup controls
+        /// is automatically unregistered when last control is disposed. Default value is false and
+        /// in most cases should not be changed.
+        /// </summary>
+        public static bool AutoRemoveMessageFilter
+        {
+            get { return _AutoRemoveMessageFilter; }
+            set { _AutoRemoveMessageFilter = value; }
+        }
+
+        private static int _TextMarkupCultureSpecific = 3;
+        /// <summary>
+        /// Get or sets the text-markup padding for text measurement when running on Japanese version of Windows.
+        /// </summary>
+        public static int TextMarkupCultureSpecificPadding
+        {
+            get { return _TextMarkupCultureSpecific; }
+            set
+            {
+                _TextMarkupCultureSpecific = value;
+            }
+        }
+
+        private static bool _DisposeItemImages = false;
+        /// <summary>
+        /// Gets or sets whether Image and Icon resources assigned to items and controls are automatically disposed when
+        /// control or item is disposed. Default value is false.
+        /// </summary>
+        public static bool DisposeItemImages
+        {
+            get
+            {
+                return _DisposeItemImages;
+            }
+            set
+            {
+                _DisposeItemImages = value;
+            }
+        }
+
+        /// <summary>
+        /// Disposes image reference and sets it to null.
+        /// </summary>
+        /// <param name="image">Reference to image to dispose.</param>
+        internal static void DisposeImage(ref System.Drawing.Image image)
+        {
+            if (image == null) return;
+            image.Dispose();
+            image = null;
+        }
+        /// <summary>
+        /// Disposes image reference and sets it to null.
+        /// </summary>
+        /// <param name="image">Reference to image to dispose.</param>
+        internal static void DisposeImage(ref System.Drawing.Icon icon)
+        {
+            if (icon == null) return;
+            icon.Dispose();
+            icon = null;
+        }
+
+        #region Delayed Invoke
+        /// <summary>
+        /// Invokes the method asynchronously using the WinForms Timer.
+        /// </summary>
+        /// <param name="method">Method to invoke.</param>
+        public static void InvokeDelayed(MethodInvoker method)
+        {
+            InvokeDelayed(method, 10);
+        }
+        /// <summary>
+        /// Invokes the method asynchronously using the WinForms Timer.
+        /// </summary>
+        /// <param name="method">Method to invoke.</param>
+        /// <param name="delayInterval">Time in milliseconds after which method is invoked.</param>
+        public static void InvokeDelayed(MethodInvoker method, int delayInterval)
+        {
+            Timer delayedInvokeTimer = new Timer();
+            delayedInvokeTimer = new Timer();
+            delayedInvokeTimer.Tag = method;
+            delayedInvokeTimer.Interval = delayInterval;
+            delayedInvokeTimer.Tick += new EventHandler(DelayedInvokeTimerTick);
+            delayedInvokeTimer.Start();
+        }
+        private static void DelayedInvokeTimerTick(object sender, EventArgs e)
+        {
+            Timer timer = (Timer)sender;
+            MethodInvoker method = (MethodInvoker)timer.Tag;
+            timer.Stop();
+            timer.Dispose();
+            method.Invoke();
+        }
+        #endregion
+    }
+
+	internal class BarPropertyBagKeys
+	{
+		public static string AutoHideSetting="autohide";
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/Bars.cs b/PROMS/DotNetBar Source Code/Bars.cs
new file mode 100644
index 00000000..42530b22
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Bars.cs	
@@ -0,0 +1,192 @@
+using System;
+using System.Collections;
+using System.Runtime.Serialization;
+using System.Xml;
+
+namespace DevComponents.DotNetBar
+{
+
+	/// <summary>
+	/// Collection of Bar objects.
+	/// </summary>
+	public class Bars:System.Collections.CollectionBase,IDisposable
+	{
+		private DotNetBarManager m_Owner;
+		internal Bars(DotNetBarManager Owner)
+		{
+			m_Owner=Owner;
+		}
+
+		internal DotNetBarManager Owner
+		{
+			get
+			{
+				return m_Owner;
+			}
+		}
+
+		/// <summary>
+		/// Releases the resources used by the Component.
+		/// </summary>
+		public void Dispose()
+		{
+			m_Owner=null;
+			List.Clear();
+		}
+
+		/// <summary>
+		/// Adds an Bar to the end of Bars collection.
+		/// </summary>
+		/// <param name="bar">The Bar to be added to the end of the Bars collection.</param>
+		public void Add(Bar bar)
+		{
+			if(List.IndexOf(bar)<0)
+				List.Add(bar);
+			else
+				throw new InvalidOperationException("Bar is already in collection.");
+		}
+
+		protected override void OnInsertComplete(int index,object value)
+		{
+			base.OnInsertComplete(index,value);
+			Bar bar=(Bar)value;
+			bar.Owner=m_Owner;
+			bar.ThemeAware=m_Owner.ThemeAware;
+			bar.Style=m_Owner.Style;
+			IOwnerBarSupport ownersupport=m_Owner as IOwnerBarSupport;
+			if(ownersupport!=null)
+				ownersupport.AddShortcutsFromBar(bar);
+			bar.OnAddedToBars();
+		}
+
+		/// <summary>
+		/// Gets the Bar at the specified index.
+		/// </summary>
+		public Bar this[int Index]
+		{
+			get
+			{
+				return List[Index] as Bar;
+			}
+		}
+
+		/// <summary>
+		/// Gets the Bar with the specified name.
+		/// </summary>
+		public Bar this[string Name]
+		{
+			get
+			{
+				foreach(Bar bar in List)
+					if(bar.Name==Name)
+						return bar;
+				return null;
+			}
+		}
+
+		/// <summary>
+		/// Removes specified bar from collection.
+		/// </summary>
+		/// <param name="bar">Bar to remove</param>
+		public virtual void Remove(Bar bar) 
+		{
+			List.Remove(bar);
+		}
+
+		protected override void OnRemoveComplete(int index,object value)
+		{
+			Bar bar=(Bar)value;
+			IOwnerBarSupport ownersupport=m_Owner as IOwnerBarSupport;
+			if(ownersupport!=null)
+				ownersupport.RemoveShortcutsFromBar(bar);
+
+			if(bar.Visible)
+				bar.HideBar();
+
+			if(bar.Parent!=null)
+			{
+				if(bar.Parent is DockSite && ((DockSite)bar.Parent).IsDocumentDock)
+					((DockSite)bar.Parent).GetDocumentUIManager().UnDock(bar);
+				if(bar.Parent!=null)
+					bar.Parent.Controls.Remove(bar);
+			}
+
+			base.OnRemoveComplete(index,value);
+		}
+
+		protected override void OnClear()
+		{
+            if (m_Owner != null && m_Owner.GetDesignMode())
+                return;
+
+			foreach(Bar bar in List)
+			{
+                if (bar.GetDesignMode())
+                    continue;
+				if(bar.AutoHide)
+					bar.AutoHide=false;
+				if(bar.Visible)
+					bar.HideBar();
+                if (bar.DockSide == eDockSide.Document && bar.Parent is DockSite && ((DockSite)bar.Parent).GetDocumentUIManager()!=null)
+                    ((DockSite)bar.Parent).GetDocumentUIManager().UnDock(bar);
+				if(bar!=null && !bar.IsDisposed)
+					((IOwnerBarSupport)m_Owner).RemoveShortcutsFromBar(bar);
+				if(bar.Parent!=null)
+					bar.Parent.Controls.Remove(bar);
+                if (!bar.GetDesignMode())
+				    bar.Dispose();
+			}
+		}
+
+		/// <summary>
+		/// Determines whether an Bar is in the collection.
+		/// </summary>
+		/// <param name="bar">The Bar to locate in the collection.</param>
+		/// <returns><b>true</b> if item is found in the collection; otherwise, <b>false</b>.</returns>
+		public bool Contains(Bar bar)
+		{
+			return List.Contains(bar);
+		}
+
+		/// <summary>
+		/// Determines whether bar with given name is in collection.
+		/// </summary>
+		/// <param name="name">Name of the bar</param>
+		/// <returns>True if bar is part of this collection, otherwise false.</returns>
+		public bool Contains(string name)
+		{
+			foreach(Bar bar in this.List)
+				if(bar.Name==name)
+					return true;
+			return false;
+		}
+
+		/// <summary>
+		/// Returns the zero-based index of the Bar in the collection.
+		/// </summary>
+		/// <param name="bar">Bar to locate.</param>
+		/// <returns></returns>
+		public int IndexOf(Bar bar)
+		{
+			return List.IndexOf(bar);
+		}
+
+		public void CopyTo(System.Array array)
+		{
+			List.CopyTo(array,0);
+		}
+
+		internal void ClearNonDocumentBars()
+		{
+			ArrayList removeList=new ArrayList(this.Count);
+			foreach(Bar bar in this.List)
+			{
+				if(bar.DockSide!=eDockSide.Document)
+                    removeList.Add(bar);
+			}
+
+			foreach(Bar bar in removeList)
+				this.Remove(bar);
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/BaseItem.cs b/PROMS/DotNetBar Source Code/BaseItem.cs
new file mode 100644
index 00000000..ee0af3b7
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/BaseItem.cs	
@@ -0,0 +1,4880 @@
+using System;
+using System.Collections;
+using DevComponents.UI.ContentManager;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Defines the base class for items that are used by DotNetBar.
+    /// </summary>
+    [System.ComponentModel.ToolboxItem(false),System.ComponentModel.DesignTimeVisible(false)]
+    public abstract class BaseItem : Component, ICloneable, IBlock, ICommandSource, IComparable
+#if FRAMEWORK20
+        , IBindableComponent
+#endif
+	{
+		#region Event Definition
+		// Events
+		/// <summary>
+		/// Occurs when Item is clicked.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when Item is clicked.")]
+		public event EventHandler Click;
+
+        /// <summary>
+        /// Occurs when Item is double-clicked.
+        /// </summary>
+        [System.ComponentModel.Description("Occurs when Item is double-clicked.")]
+        public event EventHandler DoubleClick;
+
+		/// <summary>
+		/// Occurs when Item Expanded property has changed.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when Item Expanded property has changed.")]
+		public event EventHandler ExpandChange;
+
+		/// <summary>
+		/// Occurs when item loses input focus.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when item loses input focus.")]
+		public event EventHandler LostFocus;
+
+		/// <summary>
+		/// Occurs when item receives input focus.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when item receives input focus.")]
+		public event EventHandler GotFocus;
+
+		/// <summary>
+		/// Occurs when mouse button is pressed.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when mouse button is pressed.")]
+		public event System.Windows.Forms.MouseEventHandler MouseDown;
+
+		/// <summary>
+		/// Occurs when mouse button is released.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when mouse button is released.")]
+		public event System.Windows.Forms.MouseEventHandler MouseUp;
+
+		/// <summary>
+		/// Occurs when mouse enters the item.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when mouse enters the item.")]
+		public event EventHandler MouseEnter;
+
+		/// <summary>
+		/// Occurs when mouse leaves the item.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when mouse leaves the item.")]
+		public event EventHandler MouseLeave;
+
+		/// <summary>
+		/// Occurs when mouse moves over the item.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when mouse moves over the item.")]
+		public event System.Windows.Forms.MouseEventHandler MouseMove;
+
+		/// <summary>
+		/// Occurs when mouse remains still inside an item for an amount of time.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when mouse remains still inside an item for an amount of time.")]
+		public event EventHandler MouseHover;
+
+		/// <summary>
+		/// Occurs when copy of the item is made.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when copy of the item is made.")]
+		public event EventHandler ItemCopied;
+
+		/// <summary>
+		/// Occurs when Text property of an Item has changed.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when Text property of an Item has changed.")]
+		public event EventHandler TextChanged;
+
+		/// <summary>
+		/// Occurs when Visible property of an Item has changed.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when Visible property of an Item has changed.")]
+		public event EventHandler VisibleChanged;
+
+		/// <summary>
+		/// Occurs when Enabled property of an Item has changed.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when Enabled property of an Item has changed.")]
+		public event EventHandler EnabledChanged;
+
+        ///// <summary>
+        ///// Occurs when component is Disposed.
+        ///// </summary>
+        //[System.ComponentModel.Description("Occurs when component is Disposed.")]
+        //public event EventHandler Disposed;
+
+        /// <summary>
+        /// Occurs when item's tooltip visibility has changed.
+        /// </summary>
+        [System.ComponentModel.Description("Occurs when item's tooltip visibility has changed.")]
+        public event EventHandler ToolTipVisibleChanged;
+//		/// <summary>
+//		/// Occurs when actual visiblity on screen of an item has changed i.e. Displayed property change.
+//		/// </summary>
+//		[System.ComponentModel.Description("Occurs when actual visiblity on screen of an item has changed.")]
+//		public event EventHandler DisplayedChanged;
+        /// <summary>
+        /// Occurs when content of SubItems collection has changed. 
+        /// </summary>
+        [Description("Occurs when content of SubItems collection has changed")]
+        public event CollectionChangeEventHandler SubItemsChanged;
+		#endregion
+
+		#region Private variables
+		protected string m_Text;
+		protected System.Drawing.Rectangle m_Rect;
+		protected SubItemsCollection m_SubItems;
+		protected bool m_Visible;
+		protected BaseItem m_HotSubItem;  // Sub Item with Mouse over it
+		protected bool m_IsContainer;
+		protected BaseItem m_Parent;
+		protected bool m_NeedRecalcSize;
+		protected bool m_Expanded;
+		protected bool m_AutoExpand;  // If this is a container should it expand automaticly its child items
+		protected object m_ContainerControl;
+		protected bool m_Displayed; // Set to true when item is shown on screen
+		protected object m_ItemData;
+		protected bool m_Enabled;
+		protected bool m_BeginGroup;
+		protected eDotNetBarStyle m_Style;
+		protected string m_Description;				// Item description
+		protected string m_Tooltip;					// Tooltip
+		protected string m_Name="";	// Unique Item name that can be used to access item
+        private string m_GlobalName = "";
+		protected string m_Category;
+		protected eOrientation m_Orientation;
+		protected bool m_SystemItem;
+		protected eSupportedOrientation m_SupportedOrientation=eSupportedOrientation.Both;
+		protected bool m_RecalculatingSize=false;
+        protected bool m_CheckMouseMovePressed = false;
+		private bool m_CanCustomize;
+		private int m_Id;
+		private bool m_ShowSubItems;
+		private bool m_Focused;
+		private bool m_Stretch=false;
+        internal Rectangle m_ViewRectangle;
+
+		protected ToolTip m_ToolTipWnd;
+		private static int s_IdCounter;
+		private bool m_IsOnCustomizeMenu;
+		private bool m_IsOnCustomizeDialog;
+		protected char m_AccessKey;
+		private bool m_DesignMode;
+		private eItemAlignment m_ItemAlignment; // Item alignment in containers that support alignment
+
+		private ShortcutsCollection m_Shortcuts;
+        private string m_ShortcutString = "";
+
+		private System.Drawing.Point m_MouseDownPt;
+
+		private object m_Owner;
+
+		private bool m_ClickAutoRepeat=false;
+		private int m_ClickRepeatInterval=600;
+		private bool m_AutoCollapseOnClick=true;
+		private bool m_SuspendLayout=false;
+        private bool m_IsRightToLeft = false;
+		//private System.ComponentModel.ISite m_ComponentSite=null;
+		protected bool m_ThemeAware=false;
+
+		// When item is parented to the Items collection GlobalItem is set to true.
+		// This flag is used to propagate property changes to all items with the same name.
+		// Setting for example Visible property on the item that has GlobalItem true will
+		// set visible property to the same value on all items with the same name.
+		private bool m_GlobalItem=true;
+
+		private eDesignInsertPosition m_DesignInsertMarker=eDesignInsertPosition.None;
+
+		private System.Windows.Forms.Cursor m_Cursor=null;
+		private System.Windows.Forms.Cursor m_ContainerCursor=null;
+		protected bool m_ShouldSerialize=true;
+        [EditorBrowsable(EditorBrowsableState.Never), Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public bool _IgnoreClick=false; 
+		protected bool m_AllowOnlyOneSubItemExpanded=true;  // Controls whether only ONE sub item can be expanded at a time, see InternalMouseDown
+
+		//private System.Windows.Forms.AccessibleObject m_Accessible=null;
+		private string m_AccessibleDefaultActionDescription="";
+		private System.Windows.Forms.AccessibleRole m_AccessibleRole=System.Windows.Forms.AccessibleRole.Default;
+		private string m_AccessibleName="";
+		private string m_AccessibleDescription="";
+		private bool m_IsAccessible=true;
+
+		// Used to save extended information about item customization...
+		private string m_OriginalBarName="";
+		private int m_OriginalPosition=-1;
+        private string m_KeyTips = "";
+        [EditorBrowsable(EditorBrowsableState.Never), Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public Point DesignTimeMouseDownPoint = Point.Empty;
+        internal bool RenderText = true;
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool MouseUpNotification = false;
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool MouseDownCapture = false; // Indicates whether item will receive mouse messages if it is pressed and mouse leaves the item
+        private bool m_UserCustomized = false;
+        private bool m_IsDisposed = false;
+		#endregion
+
+        #region Constructor
+        /// <summary>
+		/// Creates new instance of BaseItem.
+		/// </summary>
+		public BaseItem():this("","") {}
+		/// <summary>
+		/// Creates new instance of BaseItem and assigns item name.
+		/// </summary>
+		/// <param name="sItemName">Item name.</param>
+		public BaseItem(string sItemName):this(sItemName,""){}
+		/// <summary>
+		/// Creates new instance of BaseItem and assigns item name and item text.
+		/// </summary>
+		/// <param name="sItemName">Item Name</param>
+		/// <param name="ItemText">Item Text</param>
+		public BaseItem(string sItemName, string ItemText)
+		{
+            if (ItemText == null)
+                ItemText = "";
+			m_Text=ItemText;
+			if(m_Text!="")
+				m_AccessKey=NativeFunctions.GetAccessKey(m_Text);
+			m_Rect=System.Drawing.Rectangle.Empty;
+			m_ContainerControl=null;
+			m_HotSubItem=null;
+			m_IsContainer=false;
+			m_SubItems=null;
+			m_Parent=null;
+			m_NeedRecalcSize=true;
+			m_Visible=true;
+			m_Expanded=false;
+			m_AutoExpand=false;
+			m_ItemData=null;
+			m_Enabled=true;
+			m_BeginGroup=false;
+			m_Style=eDotNetBarStyle.OfficeXP;
+			m_Description="";
+			m_Tooltip="";
+			m_Name=sItemName;
+			m_Category="";
+			m_Orientation=eOrientation.Horizontal;
+			m_ToolTipWnd=null;
+			m_Id=++s_IdCounter;
+			m_IsOnCustomizeMenu=false;
+			m_IsOnCustomizeDialog=false;
+			m_SystemItem=false;
+			//m_AccessKey=;
+			m_Shortcuts=null;
+			m_DesignMode=false;
+			m_CanCustomize=true;
+			m_ShowSubItems=true;
+			m_ItemAlignment=eItemAlignment.Near;
+			m_Focused=false;
+			m_Owner=null;
+            MarkupTextChanged();
+        }
+        #endregion
+
+        #region Serialization
+        /// <summary>
+		/// Serializes the item and all sub-items into the XmlElement.
+		/// </summary>
+		/// <param name="ThisItem">XmlElement to serialize the item to.</param>
+		protected internal virtual void Serialize(ItemSerializationContext context)
+		{
+            System.Xml.XmlElement ThisItem = context.ItemXmlElement;
+			Type t=this.GetType();
+			System.Reflection.AssemblyName aname=t.Assembly.GetName();
+			if(aname.Name!="DevComponents.DotNetBar")
+				ThisItem.SetAttribute("assembly",aname.Name+", PublicKeyToken="+System.Text.Encoding.ASCII.GetString(aname.GetPublicKey()));
+			else
+				ThisItem.SetAttribute("assembly",aname.Name);
+
+			ThisItem.SetAttribute("class",t.FullName);
+
+			ThisItem.SetAttribute("name",m_Name);
+            ThisItem.SetAttribute("globalname", m_GlobalName);
+			ThisItem.SetAttribute("text",m_Text);
+			ThisItem.SetAttribute("iscontainer",System.Xml.XmlConvert.ToString(m_IsContainer));
+			ThisItem.SetAttribute("visible",System.Xml.XmlConvert.ToString(m_Visible));
+			if(m_ItemData!=null && m_ItemData.ToString()!="")
+				ThisItem.SetAttribute("itemdata",m_ItemData.ToString());
+			else
+				ThisItem.SetAttribute("itemdata","");
+			ThisItem.SetAttribute("enabled",System.Xml.XmlConvert.ToString(m_Enabled));
+			ThisItem.SetAttribute("begingroup",System.Xml.XmlConvert.ToString(m_BeginGroup));
+			ThisItem.SetAttribute("style",System.Xml.XmlConvert.ToString((int)m_Style));
+			ThisItem.SetAttribute("desc",m_Description);
+			ThisItem.SetAttribute("tooltip",m_Tooltip);
+			ThisItem.SetAttribute("category",m_Category);
+			ThisItem.SetAttribute("cancustomize",System.Xml.XmlConvert.ToString(m_CanCustomize));
+			ThisItem.SetAttribute("showsubitems",System.Xml.XmlConvert.ToString(m_ShowSubItems));
+			ThisItem.SetAttribute("itemalignment",System.Xml.XmlConvert.ToString((int)m_ItemAlignment));
+			ThisItem.SetAttribute("stretch",System.Xml.XmlConvert.ToString(m_Stretch));
+			ThisItem.SetAttribute("global",System.Xml.XmlConvert.ToString(m_GlobalItem));
+			ThisItem.SetAttribute("themes",System.Xml.XmlConvert.ToString(m_ThemeAware));
+			if(m_AccessibleDefaultActionDescription!="")
+                ThisItem.SetAttribute("adefdesc",m_AccessibleDefaultActionDescription);
+			if(m_AccessibleDescription!="")
+				ThisItem.SetAttribute("adesc",m_AccessibleDescription);
+			if(m_AccessibleName!="")
+				ThisItem.SetAttribute("aname",m_AccessibleName);
+			if(m_AccessibleRole!=System.Windows.Forms.AccessibleRole.Default)
+				ThisItem.SetAttribute("arole",System.Xml.XmlConvert.ToString((int)m_AccessibleRole));
+			if(!m_AutoCollapseOnClick)
+				ThisItem.SetAttribute("autocollapse",System.Xml.XmlConvert.ToString(m_AutoCollapseOnClick));
+			if(m_ClickAutoRepeat)
+				ThisItem.SetAttribute("autorepeat",System.Xml.XmlConvert.ToString(m_ClickAutoRepeat));
+			if(m_ClickRepeatInterval!=600)
+				ThisItem.SetAttribute("clickrepinterv",System.Xml.XmlConvert.ToString(m_ClickRepeatInterval));
+            //if(m_GenerateCommandLink)
+            //    ThisItem.SetAttribute("GenerateCommandLink", System.Xml.XmlConvert.ToString(m_GenerateCommandLink));
+                
+
+			if(m_Cursor!=null)
+			{
+				if(m_Cursor==System.Windows.Forms.Cursors.Hand)
+					ThisItem.SetAttribute("cur","4");
+				else if(m_Cursor==System.Windows.Forms.Cursors.AppStarting)
+					ThisItem.SetAttribute("cur","1");
+				else if(m_Cursor==System.Windows.Forms.Cursors.Arrow)
+					ThisItem.SetAttribute("cur","2");
+				else if(m_Cursor==System.Windows.Forms.Cursors.Cross)
+					ThisItem.SetAttribute("cur","3");
+				else if(m_Cursor==System.Windows.Forms.Cursors.Help)
+					ThisItem.SetAttribute("cur","5");
+				else if(m_Cursor==System.Windows.Forms.Cursors.HSplit)
+					ThisItem.SetAttribute("cur","6");
+				else if(m_Cursor==System.Windows.Forms.Cursors.IBeam)
+					ThisItem.SetAttribute("cur","7");
+				else if(m_Cursor==System.Windows.Forms.Cursors.No)
+					ThisItem.SetAttribute("cur","8");
+				else if(m_Cursor==System.Windows.Forms.Cursors.NoMove2D)
+					ThisItem.SetAttribute("cur","9");
+				else if(m_Cursor==System.Windows.Forms.Cursors.NoMoveHoriz)
+					ThisItem.SetAttribute("cur","10");
+				else if(m_Cursor==System.Windows.Forms.Cursors.NoMoveVert)
+					ThisItem.SetAttribute("cur","11");
+				else if(m_Cursor==System.Windows.Forms.Cursors.PanEast)
+					ThisItem.SetAttribute("cur","12");
+				else if(m_Cursor==System.Windows.Forms.Cursors.PanNE)
+					ThisItem.SetAttribute("cur","13");
+				else if(m_Cursor==System.Windows.Forms.Cursors.PanNorth)
+					ThisItem.SetAttribute("cur","14");
+				else if(m_Cursor==System.Windows.Forms.Cursors.PanNW)
+					ThisItem.SetAttribute("cur","15");
+				else if(m_Cursor==System.Windows.Forms.Cursors.PanSE)
+					ThisItem.SetAttribute("cur","16");
+				else if(m_Cursor==System.Windows.Forms.Cursors.PanSouth)
+					ThisItem.SetAttribute("cur","17");
+				else if(m_Cursor==System.Windows.Forms.Cursors.PanSW)
+					ThisItem.SetAttribute("cur","18");
+				else if(m_Cursor==System.Windows.Forms.Cursors.PanWest)
+					ThisItem.SetAttribute("cur","19");
+				else if(m_Cursor==System.Windows.Forms.Cursors.SizeAll)
+					ThisItem.SetAttribute("cur","20");
+				else if(m_Cursor==System.Windows.Forms.Cursors.SizeNESW)
+					ThisItem.SetAttribute("cur","21");
+				else if(m_Cursor==System.Windows.Forms.Cursors.SizeNS)
+					ThisItem.SetAttribute("cur","22");
+				else if(m_Cursor==System.Windows.Forms.Cursors.SizeNWSE)
+					ThisItem.SetAttribute("cur","23");
+				else if(m_Cursor==System.Windows.Forms.Cursors.SizeWE)
+					ThisItem.SetAttribute("cur","24");
+				else if(m_Cursor==System.Windows.Forms.Cursors.UpArrow)
+					ThisItem.SetAttribute("cur","25");
+				else if(m_Cursor==System.Windows.Forms.Cursors.VSplit)
+					ThisItem.SetAttribute("cur","26");
+				else if(m_Cursor==System.Windows.Forms.Cursors.WaitCursor)
+					ThisItem.SetAttribute("cur","27");
+			}
+
+			if(SubItems.Count>0 && this.ShouldSerializeSubItems())
+			{
+				System.Xml.XmlElement subitems=ThisItem.OwnerDocument.CreateElement("subitems");
+				ThisItem.AppendChild(subitems);
+				foreach(BaseItem objItem in this.SubItems)
+				{
+					if(objItem.ShouldSerialize)
+					{
+						System.Xml.XmlElement ChildItem=ThisItem.OwnerDocument.CreateElement("item");
+						t=objItem.GetType();
+						subitems.AppendChild(ChildItem);
+                        context.ItemXmlElement = ChildItem;
+						objItem.Serialize(context);
+                        context.ItemXmlElement = ThisItem;
+					}
+				}
+			}
+
+			// Serialize Shortcuts
+			if(m_Shortcuts!=null && m_Shortcuts.Count>0)
+				ThisItem.SetAttribute("shortcuts",m_Shortcuts.ToString(","));
+
+            if (context.HasSerializeItemHandlers)
+            {
+                System.Xml.XmlElement customData = ThisItem.OwnerDocument.CreateElement("customData");
+                SerializeItemEventArgs e = new SerializeItemEventArgs(this, ThisItem, customData);
+                context.Serializer.InvokeSerializeItem(e);
+                if (customData.Attributes.Count > 0 || customData.ChildNodes.Count > 0)
+                    ThisItem.AppendChild(customData);
+            }
+		}
+
+		/// <summary>
+		/// Deserialize the Item from the XmlElement.
+		/// </summary>
+		/// <param name="ItemXmlSource">Source XmlElement.</param>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+		public virtual void Deserialize(ItemSerializationContext context)
+		{
+            System.Xml.XmlElement ItemXmlSource = context.ItemXmlElement;
+
+			m_Name=ItemXmlSource.GetAttribute("name");
+            if (ItemXmlSource.HasAttribute("globalname"))
+                m_GlobalName = ItemXmlSource.GetAttribute("globalname");
+			m_Text=ItemXmlSource.GetAttribute("text");
+			m_AccessKey=NativeFunctions.GetAccessKey(m_Text);
+			m_IsContainer=System.Xml.XmlConvert.ToBoolean(ItemXmlSource.GetAttribute("iscontainer"));
+            if (context._DesignerHost == null)
+                m_Visible = System.Xml.XmlConvert.ToBoolean(ItemXmlSource.GetAttribute("visible"));
+            else
+                TypeDescriptor.GetProperties(this)["Visible"].SetValue(this, System.Xml.XmlConvert.ToBoolean(ItemXmlSource.GetAttribute("visible")));
+			if(ItemXmlSource.GetAttribute("itemdata")!="")
+				m_ItemData=ItemXmlSource.GetAttribute("itemdata");
+			else
+				m_ItemData=null;
+			m_Enabled=System.Xml.XmlConvert.ToBoolean(ItemXmlSource.GetAttribute("enabled"));
+			m_BeginGroup=System.Xml.XmlConvert.ToBoolean(ItemXmlSource.GetAttribute("begingroup"));
+			m_Style=(eDotNetBarStyle)System.Xml.XmlConvert.ToInt32(ItemXmlSource.GetAttribute("style"));
+			m_Description=ItemXmlSource.GetAttribute("desc");
+			m_Tooltip=ItemXmlSource.GetAttribute("tooltip");
+			m_Category=ItemXmlSource.GetAttribute("category");
+			m_CanCustomize=System.Xml.XmlConvert.ToBoolean(ItemXmlSource.GetAttribute("cancustomize"));
+			m_ShowSubItems=System.Xml.XmlConvert.ToBoolean(ItemXmlSource.GetAttribute("showsubitems"));
+			m_ItemAlignment=(eItemAlignment)System.Xml.XmlConvert.ToInt32(ItemXmlSource.GetAttribute("itemalignment"));
+			if(ItemXmlSource.HasAttribute("stretch"))
+				m_Stretch=System.Xml.XmlConvert.ToBoolean(ItemXmlSource.GetAttribute("stretch"));
+			else
+				m_Stretch=false;
+			if(ItemXmlSource.HasAttribute("global"))
+				m_GlobalItem=System.Xml.XmlConvert.ToBoolean(ItemXmlSource.GetAttribute("global"));
+
+			if(ItemXmlSource.HasAttribute("themes"))
+				m_ThemeAware=System.Xml.XmlConvert.ToBoolean(ItemXmlSource.GetAttribute("themes"));
+
+			if(ItemXmlSource.HasAttribute("adefdesc"))
+				m_AccessibleDefaultActionDescription=ItemXmlSource.GetAttribute("adefdesc");
+			if(ItemXmlSource.HasAttribute("adesc"))
+				m_AccessibleDescription=ItemXmlSource.GetAttribute("adesc");
+			if(ItemXmlSource.HasAttribute("aname"))
+				m_AccessibleName=ItemXmlSource.GetAttribute("aname");
+			if(ItemXmlSource.HasAttribute("arole"))
+				m_AccessibleRole=(System.Windows.Forms.AccessibleRole)System.Xml.XmlConvert.ToInt32(ItemXmlSource.GetAttribute("arole"));
+			if(ItemXmlSource.HasAttribute("autocollapse"))
+				m_AutoCollapseOnClick=System.Xml.XmlConvert.ToBoolean(ItemXmlSource.GetAttribute("autocollapse"));
+			else
+                m_AutoCollapseOnClick=true;
+			
+			if(ItemXmlSource.HasAttribute("autorepeat"))
+				m_ClickAutoRepeat=System.Xml.XmlConvert.ToBoolean(ItemXmlSource.GetAttribute("autorepeat"));
+			else
+				m_ClickAutoRepeat=false;
+			if(ItemXmlSource.HasAttribute("clickrepinterv"))
+				m_ClickRepeatInterval=System.Xml.XmlConvert.ToInt32(ItemXmlSource.GetAttribute("clickrepinterv"));
+			else
+				m_ClickRepeatInterval=600;
+
+            //if (ItemXmlSource.HasAttribute("GenerateCommandLink"))
+            //    m_GenerateCommandLink = System.Xml.XmlConvert.ToBoolean(ItemXmlSource.GetAttribute("GenerateCommandLink"));
+            //else
+            //    m_GenerateCommandLink = false;
+			
+			// Load Cursor
+			if(ItemXmlSource.HasAttribute("cur"))
+			{
+				switch(ItemXmlSource.GetAttribute("cur"))
+				{
+					case "4":
+						m_Cursor=System.Windows.Forms.Cursors.Hand;
+						break;
+					case "1":
+						m_Cursor=System.Windows.Forms.Cursors.AppStarting;
+						break;
+					case "2":
+						m_Cursor=System.Windows.Forms.Cursors.Arrow;
+						break;
+					case "3":
+						m_Cursor=System.Windows.Forms.Cursors.Cross;
+						break;
+					case "5":
+						m_Cursor=System.Windows.Forms.Cursors.Help;
+						break;
+					case "6":
+						m_Cursor=System.Windows.Forms.Cursors.HSplit;
+						break;
+					case "7":
+						m_Cursor=System.Windows.Forms.Cursors.IBeam;
+						break;
+					case "8":
+						m_Cursor=System.Windows.Forms.Cursors.No;
+						break;
+					case "9":
+						m_Cursor=System.Windows.Forms.Cursors.NoMove2D;
+						break;
+					case "10":
+						m_Cursor=System.Windows.Forms.Cursors.NoMoveHoriz;
+						break;
+					case "11":
+						m_Cursor=System.Windows.Forms.Cursors.NoMoveVert;
+						break;
+					case "12":
+						m_Cursor=System.Windows.Forms.Cursors.PanEast;
+						break;
+					case "13":
+						m_Cursor=System.Windows.Forms.Cursors.PanNE;
+						break;
+					case "14":
+						m_Cursor=System.Windows.Forms.Cursors.PanNorth;
+						break;
+					case "15":
+						m_Cursor=System.Windows.Forms.Cursors.PanNW;
+						break;
+					case "16":
+						m_Cursor=System.Windows.Forms.Cursors.PanSE;
+						break;
+					case "17":
+						m_Cursor=System.Windows.Forms.Cursors.PanSouth;
+						break;
+					case "18":
+						m_Cursor=System.Windows.Forms.Cursors.PanSW;
+						break;
+					case "19":
+						m_Cursor=System.Windows.Forms.Cursors.PanWest;
+						break;
+					case "20":
+						m_Cursor=System.Windows.Forms.Cursors.SizeAll;
+						break;
+					case "21":
+						m_Cursor=System.Windows.Forms.Cursors.SizeNESW;
+						break;
+					case "22":
+						m_Cursor=System.Windows.Forms.Cursors.SizeNS;
+						break;
+					case "23":
+						m_Cursor=System.Windows.Forms.Cursors.SizeNWSE;
+						break;
+					case "24":
+						m_Cursor=System.Windows.Forms.Cursors.SizeWE;
+						break;
+					case "25":
+						m_Cursor=System.Windows.Forms.Cursors.UpArrow;
+						break;
+					case "26":
+						m_Cursor=System.Windows.Forms.Cursors.VSplit;
+						break;
+					case "27":
+						m_Cursor=System.Windows.Forms.Cursors.WaitCursor;
+						break;
+				}
+			}
+
+			System.Xml.XmlNodeList list=ItemXmlSource.GetElementsByTagName("subitems");
+			if(list.Count>0)
+			{
+				foreach(System.Xml.XmlElement xmlChild in list[0].ChildNodes)
+				{
+//					BaseItem oi=null;
+//					System.Reflection.Assembly a=System.Reflection.Assembly.Load(xmlChild.GetAttribute("assembly"));
+//					if(a==null) continue;
+//					oi=a.CreateInstance(xmlChild.GetAttribute("class")) as BaseItem;
+					BaseItem oi=context.CreateItemFromXml(xmlChild);
+					if(oi!=null)
+					{
+						this.SubItems.Add(oi);
+                        context.ItemXmlElement = xmlChild;
+						oi.Deserialize(context);
+                        context.ItemXmlElement = ItemXmlSource;
+					}
+				}
+			}
+			if(ItemXmlSource.HasAttribute("shortcuts"))
+			{
+				if(m_Shortcuts==null)
+					m_Shortcuts=new ShortcutsCollection(this);
+				m_Shortcuts.FromString(ItemXmlSource.GetAttribute("shortcuts"),",");
+			}
+
+            if (context.HasDeserializeItemHandlers)
+            {
+                System.Xml.XmlNodeList customDataList=ItemXmlSource.GetElementsByTagName("customData");
+                if (customDataList.Count > 0)
+                {
+                    System.Xml.XmlElement customData = customDataList[0] as System.Xml.XmlElement;
+                    SerializeItemEventArgs e = new SerializeItemEventArgs(this, ItemXmlSource, customData);
+                    context.Serializer.InvokeDeserializeItem(e);
+                }
+            }
+
+            MarkupTextChanged();
+        }
+
+        /// <summary>
+        /// Indicates whether SubItems collection is serialized. Default value is true.
+        /// </summary>
+        protected virtual bool ShouldSerializeSubItems()
+        {
+            return true;
+        }
+        #endregion
+
+        #region Internal Implementation
+
+        internal void NotifyScaleItem(SizeF factor)
+        {
+            ScaleItem(factor);
+        }
+
+        /// <summary>
+        /// Called on each item when ScaleControl method of parent control is called and gives opportunity to item to adjust its displayed based on current scaling.
+        /// </summary>
+        /// <param name="factor">Scale factor.</param>
+        protected virtual void ScaleItem(SizeF factor)
+        {
+            if (m_SubItems == null) return;
+            foreach (BaseItem item in m_SubItems)
+            {
+                item.NotifyScaleItem(factor);
+            }
+        }
+
+        private bool _IsRendered = true;
+        /// <summary>
+        /// Gets or sets whether item is rendered.
+        /// </summary>
+        internal bool IsRendered
+        {
+            get { return _IsRendered; }
+            set
+            {
+                _IsRendered = value;
+            }
+        }
+        
+        private bool _DesignTimeVisible = true;
+        /// <summary>
+        /// Gets or sets whether item is selectable at design-time. Default value is true.
+        /// </summary>
+        internal bool DesignTimeVisible
+        {
+            get { return _DesignTimeVisible; }
+            set
+            {
+                _DesignTimeVisible = value;
+            }
+        }
+
+        /// <summary>
+		/// Called when item container has changed. If you override this method you must call the base implementation to allow default processing to occur.
+		/// </summary>
+		/// <param name="objOldContainer">Previous container of the item.</param>
+		protected internal virtual void OnContainerChanged(object objOldContainer)
+		{
+			if(m_SubItems==null || !this.IsContainer)
+				return;
+			foreach(BaseItem objItem in m_SubItems)
+				objItem.OnContainerChanged(objOldContainer);
+		}
+
+		/// <summary>
+		/// Control Container (System.Windows.Forms.Control or its descendant)
+		/// </summary>
+		[System.ComponentModel.Browsable(false),System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
+		public virtual object ContainerControl
+		{
+			get
+			{
+                return GetContainerControl(true);
+                //if(m_Parent==null)
+                //    return m_ContainerControl;
+
+                //if(m_ContainerControl==null && m_Parent.IsContainer)
+                //    return m_Parent.ContainerControl;
+
+                //return m_ContainerControl;
+			}
+			set
+			{
+				object oldContainer=this.ContainerControl;
+				m_ContainerControl=value;
+				//if(oldContainer!=this.ContainerControl)
+				OnContainerChanged(oldContainer);
+			}
+		}
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public object GetContainerControl(bool checkIsContainer)
+        {
+            if (m_Parent == null)
+                return m_ContainerControl;
+
+            if (m_ContainerControl == null && (m_Parent.IsContainer || !checkIsContainer))
+                return m_Parent.GetContainerControl(checkIsContainer);
+
+            return m_ContainerControl;
+        }
+
+		/// <summary>
+		/// Returns the Parent of the item.
+		/// </summary>
+		[System.ComponentModel.Browsable(false)]
+		public virtual BaseItem Parent
+		{
+			get
+			{
+				if(this.ContainerControl is Bar)
+				{
+					Bar bar=this.ContainerControl as Bar;
+					if(bar.ParentItem==this)
+						return null;
+					if(m_Parent==bar.ItemsContainer)
+						return bar.ParentItem;
+				}
+				return m_Parent;
+			}
+		}
+
+		[System.ComponentModel.Browsable(false),System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+		public virtual void SetParent(BaseItem o)
+		{
+			m_Parent=o;
+            // Do not set recalc size flag on parent...
+			m_NeedRecalcSize=true;
+            OnParentChanged();
+		}
+        /// <summary>
+        /// Called when item parent has changed.
+        /// </summary>
+        protected virtual void OnParentChanged()
+        {
+            
+        }
+
+        /// <summary>
+        /// Returns whether item is enabled including the parent control item is on.
+        /// </summary>
+        /// <returns></returns>
+        internal bool GetEnabled(System.Windows.Forms.Control container)
+        {
+            if (!m_Enabled || container == null) return m_Enabled;
+            if (!container.Enabled) return false;
+            if (m_Parent != null)
+            {
+                BaseItem parent = m_Parent;
+                while (parent != null)
+                {
+                    if(!parent.Enabled)
+                        return false;
+                    parent = parent.Parent;
+                }
+            }
+            return container.Enabled && m_Enabled;
+        }
+
+        /// <summary>
+        /// Returns whether item is enabled including the parent control item is on.
+        /// </summary>
+        /// <returns></returns>
+        internal bool GetEnabled()
+        {
+            return GetEnabled(GetContainerControl(false) as Control);
+        }
+
+		/// <summary>
+		/// Gets or sets a value indicating whether the item is enabled.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DevCoBrowsable(true),System.ComponentModel.DefaultValue(true),System.ComponentModel.Category("Behavior"),System.ComponentModel.Description("Indicates whether is item enabled.")]
+		public virtual bool Enabled
+		{
+			get
+			{
+				return m_Enabled;
+			}
+			set
+			{
+				if(m_Enabled!=value)
+				{
+					m_Enabled=value;
+                    if(ShouldSyncProperties)
+                        BarFunctions.SyncProperty(this, "Enabled");
+
+					if(!m_Enabled && m_Expanded)
+					{
+						this.Expanded=false;
+						//CollapseAll(this);
+					}
+					this.Refresh();
+					this.OnEnabledChanged();
+					OnAppearanceChanged();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets whether item separator is shown before this item.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DevCoBrowsable(true),System.ComponentModel.DefaultValue(false),System.ComponentModel.Category("Appearance"),System.ComponentModel.Description("Indicates whether this item is beginning of the group.")]
+		public virtual bool BeginGroup
+		{
+			get
+			{
+				return m_BeginGroup;
+			}
+			set
+			{
+				if(m_BeginGroup!=value)
+				{
+					NeedRecalcSize=true;
+					m_BeginGroup=value;
+
+                    if(ShouldSyncProperties)
+                        BarFunctions.SyncProperty(this, "BeginGroup");
+
+					this.Refresh();
+					OnAppearanceChanged();
+				}
+			}
+		}
+
+
+		/// <summary>
+		/// Gets or sets Left position of this item
+		/// </summary>
+		[System.ComponentModel.Browsable(false),System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden),System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+		public virtual int LeftInternal
+		{
+			get
+			{
+				return m_Rect.Left;
+			}
+			set
+			{
+				if(m_Rect.X!=value)
+				{
+					int old=m_Rect.X;
+					m_Rect.X=value;
+					this.OnLeftLocationChanged(old);
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets Top position of this item
+		/// </summary>
+		[System.ComponentModel.Browsable(false),System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden),System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+		public virtual int TopInternal
+		{
+			get
+			{
+				return m_Rect.Top;
+			}
+			set
+			{
+				if(m_Rect.Y!=value)
+				{
+					int oldValue=m_Rect.Y;
+					m_Rect.Y=value;
+					this.OnTopLocationChanged(oldValue);
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets Width of this item
+		/// </summary>
+		[System.ComponentModel.Browsable(false),System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden),System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+		public virtual int WidthInternal
+		{
+			get
+			{
+				return m_Rect.Width;
+			}
+			set
+			{
+				if(m_Rect.Width!=value)
+				{
+					m_Rect.Width=value;
+					OnExternalSizeChange();
+				}
+			}
+		}
+
+        /// <summary>
+        /// Gets whether item is in right-to-left layout mode.
+        /// </summary>
+        protected virtual internal bool IsRightToLeft
+        {
+            get { return m_IsRightToLeft; }
+            set
+            {
+                if (m_IsRightToLeft == value)
+                    return;
+                m_IsRightToLeft = value;
+                foreach (BaseItem item in this.SubItems)
+                {
+                    item.IsRightToLeft = value;
+                }
+            }
+        }
+
+		/// <summary>
+		/// Called when size of the item is changed externally.
+		/// </summary>
+		protected virtual void OnExternalSizeChange(){}
+
+		/// <summary>
+		/// Gets or sets Height of this item
+		/// </summary>
+		[System.ComponentModel.Browsable(false),System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden),System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+		public virtual int HeightInternal
+		{
+			get
+			{
+				return m_Rect.Height;
+			}
+			set
+			{
+				if(m_Rect.Height!=value)
+				{
+					m_Rect.Height=value;
+					OnExternalSizeChange();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Called when Visibility of the items has changed.
+		/// </summary>
+		/// <param name="newValue">New Visible state.</param>
+		protected internal virtual void OnVisibleChanged(bool newValue)
+		{
+			if(this.VisibleChanged!=null)
+				this.VisibleChanged(this,new EventArgs());
+            if (this.DesignMode)
+            {
+                if (this.Parent != null)
+                {
+                    this.Parent.NeedRecalcSize = true;
+                    this.Parent.Refresh();
+                }
+            }
+            else if (this.Parent != null && this.Parent is ItemContainer)
+                this.Parent.NeedRecalcSize = true;
+		}
+
+		/// <summary>
+		/// Gets or sets a value indicating whether the item is visible.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DevCoBrowsable(true),System.ComponentModel.DefaultValue(true),System.ComponentModel.Category("Behavior"),System.ComponentModel.Description("Determines whether the item is visible or hidden.")]
+		public virtual bool Visible
+		{
+			get
+			{
+				return m_Visible;
+			}
+			set
+			{
+				if(m_Visible==value)
+					return;
+
+				m_Visible=value;
+                this.NeedRecalcSize = true;
+                if(ShouldSyncProperties)
+                    BarFunctions.SyncProperty(this, "Visible");
+
+				if(!m_Visible && m_Displayed && m_Parent!=null)
+				{
+					m_Parent.SubItemSizeChanged(this);
+				}
+				if(!m_IsOnCustomizeMenu)
+					this.Displayed=false;
+
+				OnVisibleChanged(value);
+			}
+		}
+
+        internal void SetVisibleDirect(bool b)
+        {
+            m_Visible = b;
+            if (!m_Visible && !m_IsOnCustomizeMenu)
+                m_Displayed = false;
+        }
+
+		/// <summary>
+		/// Gets or sets a value indicating whether the item is expanded or not. For Popup items this would indicate whether the item is popped up or not.
+		/// </summary>
+		[System.ComponentModel.Browsable(false),System.ComponentModel.DefaultValue(false),System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
+		public virtual bool Expanded
+		{
+            get { return m_Expanded; }
+
+		    set
+			{
+				if(m_Expanded!=value)
+				{
+					m_Expanded = value;
+
+					OnExpandChange();
+
+					if(m_Parent!=null)
+						m_Parent.OnSubItemExpandChange(this);
+				}
+			}
+		}
+
+		/// <summary>
+		/// Indicates whether the item will auto-collapse (fold) when clicked. 
+		/// When item is on popup menu and this property is set to false, menu will not
+		/// close when item is clicked.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Behavior"),System.ComponentModel.DefaultValue(true),System.ComponentModel.Description("Indicates whether the item will auto-collapse (fold) when clicked.")]
+		public virtual bool AutoCollapseOnClick
+		{
+			get
+			{
+				return m_AutoCollapseOnClick;
+			}
+			set
+			{
+				m_AutoCollapseOnClick=value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets whether item will auto expand when mouse is over the item or not.
+		/// </summary>
+		[System.ComponentModel.Browsable(false),System.ComponentModel.DefaultValue(false),System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
+		public virtual bool AutoExpand
+		{
+			get
+			{
+				return m_AutoExpand;
+			}
+			set
+			{
+				if(m_AutoExpand==value)
+					return;
+				m_AutoExpand=value;
+                if(ShouldSyncProperties)
+                    BarFunctions.SyncProperty(this, "AutoExpand");
+			}
+		}
+
+		/// <summary>
+		/// Gets the rectangle that represents the display area of the item.
+		/// </summary>
+		[System.ComponentModel.Browsable(false),System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
+		public virtual System.Drawing.Rectangle DisplayRectangle
+		{
+			get
+			{
+				return m_Rect;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the size of the item.
+		/// </summary>
+		[System.ComponentModel.Browsable(false),System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
+		public virtual System.Drawing.Size Size
+		{
+			get {return m_Rect.Size;}
+			set
+			{
+				if(m_Rect.Size!=value)
+				{
+					m_Rect.Size=value;
+					OnExternalSizeChange();
+				}
+			}
+		}
+
+        /// <summary>
+        /// IBlock member implementation
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), EditorBrowsable(EditorBrowsableState.Never)]
+        public virtual System.Drawing.Rectangle Bounds
+        {
+            get { return m_Rect; }
+            set
+            {
+                if (m_Rect != value)
+                {
+                    bool sizeChanged = m_Rect.Size != value.Size;
+                    //bool topLocationChanged = m_Rect.Top != value.Top;
+                    //bool leftLocationChanged = m_Rect.Left != value.Left;
+                    //int oldLeft = m_Rect.Left;
+                    m_Rect = value;
+                    if(sizeChanged)
+                        OnExternalSizeChange();
+                    //if (leftLocationChanged)
+                    //    OnLeftLocationChanged(oldLeft);
+                }
+            }
+        }
+
+        internal void SetDisplayRectangle(Rectangle r)
+        {
+            m_Rect = r;
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void SetViewRectangle(Rectangle r)
+        {
+            m_ViewRectangle = r;
+        }
+
+		/// <summary>
+		/// Specifies whether this item is visual container or not. For example
+		/// Tool Menu is not container since it drops-down its items and they are
+		/// not "visualy" contained. Also, the pop-up menus, drop-down Bars etc. are not containers.
+		/// </summary>
+		[System.ComponentModel.Browsable(false)]
+		public virtual bool IsContainer
+		{
+			get
+			{
+				return m_IsContainer;
+			}
+		}
+
+		protected internal void SetIsContainer(bool b)
+		{
+			m_IsContainer=b;
+		}
+
+		/// <summary>
+		/// Returns true if this item is currently displayed. This property should not be set directly since it is managed by system and container of the item.
+		/// </summary>
+		[System.ComponentModel.Browsable(false),System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
+		public virtual bool Displayed
+		{
+			get
+			{
+				return m_Displayed;
+			}
+			set
+			{
+                if (m_Displayed != value && !LockDisplayedChange)
+				{
+					m_Displayed=value;
+					OnDisplayedChanged();
+				}
+			}
+		}
+        internal bool LockDisplayedChange = false;
+
+		/// <summary>
+		/// Called when item Display state has changed.
+		/// </summary>
+		protected virtual void OnDisplayedChanged()
+		{
+//			if(DisplayedChanged!=null)
+//				DisplayedChanged(this,new EventArgs());
+			if(this.Displayed && this.Visible)
+				this.GenerateAccessibilityEvent(System.Windows.Forms.AccessibleEvents.Show);
+			else
+				this.GenerateAccessibilityEvent(System.Windows.Forms.AccessibleEvents.Hide);
+//			IOwnerItemEvents owner=this.GetIOwnerItemEvents();
+//			if(owner!=null)
+//				owner.InvokeItemDisplayedChanged(this,new EventArgs());
+		}
+
+		protected internal virtual void OnProcessDelayedCommands(){}
+
+		/// <summary>
+		/// Called when item owner has changed.
+		/// </summary>
+		protected virtual void OnOwnerChanged() {}
+
+        /// <summary>
+        /// Raises SubItemsChanged event.
+        /// </summary>
+        /// <param name="e"></param>
+        protected virtual void OnSubItemsChanged(CollectionChangeEventArgs e)
+        {
+            CollectionChangeEventHandler eh = SubItemsChanged;
+            if (eh != null) eh(this, e);
+        }
+
+	    protected virtual void OnSubItemsChanged(CollectionChangeAction action, BaseItem item)
+	    {
+            if (SubItemsChanged != null) OnSubItemsChanged(new CollectionChangeEventArgs(action, item));
+	    }
+
+		/// <summary>
+		/// Occurs after an item has been added to the container. This procedure is called on both item being added and the parent of the item. To distinguish between those two states check the item parameter.
+		/// </summary>
+		/// <param name="item">When occurring on the parent this will hold the reference to the item that has been added. When occurring on the item being added this will be null (Nothing).</param>
+		protected internal virtual void OnItemAdded(BaseItem item)
+		{
+            OnSubItemsChanged(CollectionChangeAction.Add, item);
+			IOwnerItemEvents owner=this.GetIOwnerItemEvents();
+			if(owner!=null)
+				owner.InvokeItemAdded(item,new EventArgs());
+		}
+		/// <summary>
+		/// Occurs after an item has been removed.
+		/// </summary>
+		/// <param name="item">Item being removed.</param>
+		protected internal virtual void OnAfterItemRemoved(BaseItem item, int itemIndex)
+		{
+			if(item==null)
+				return;
+            OnSubItemsChanged(CollectionChangeAction.Remove, item);
+
+			IOwnerItemEvents owner=this.GetIOwnerItemEvents();
+			if(owner!=null)
+				owner.InvokeItemRemoved(item,this,itemIndex);
+		}
+
+		/// <summary>
+		/// Occurs just before Click event is fired.
+		/// </summary>
+		protected virtual void OnClick(){}
+
+		/// <summary>
+		/// Occurs after SubItems Collection has been cleared.
+		/// </summary>
+		protected internal virtual void OnSubItemsClear() {}
+		/// <summary>
+		/// Occurs before an item is removed.
+		/// </summary>
+		/// <param name="item">Item being removed.</param>
+		protected internal virtual void OnBeforeItemRemoved(BaseItem item) {}
+		/// <summary>
+		/// Occurs when IsOnCustomizeMenu property has changed.
+		/// </summary>
+		protected virtual void OnIsOnCustomizeMenuChanged(){}
+		/// <summary>
+		/// Occurs when IsOnCustomizeDialogChanged property has changed.
+		/// </summary>
+		protected virtual void OnIsOnCustomizeDialogChanged(){}
+		/// <summary>
+		/// Occurs when item enter or exists the design mode.
+		/// </summary>
+		protected virtual void OnDesignModeChanged(){}
+		/// <summary>
+		/// Occurs when tooltip is about to be shown or hidden.
+		/// </summary>
+		/// <param name="bShow">Specifies whether tooltip is shown or hidden.</param>
+		protected virtual void OnTooltip(bool bShow){}
+		/// <summary>
+		/// Occurs after item has received the input focus.
+		/// </summary>
+		/// <param name="item">Item that received the focus.</param>
+		protected virtual void OnSubItemGotFocus(BaseItem item){}
+		/// <summary>
+		/// Occurs after item has lost the input focus.
+		/// </summary>
+		/// <param name="item">Item that lost the input focus.</param>
+		protected virtual void OnSubItemLostFocus(BaseItem item){}
+		/// <summary>
+		/// Indicates whether the item enabled property has changed.
+		/// </summary>
+		protected virtual void OnEnabledChanged()
+		{
+			if(this.EnabledChanged!=null)
+				this.EnabledChanged(this,new EventArgs());
+		}
+		/// <summary>
+		/// Called after TopInternal property has changed
+		/// </summary>
+		protected virtual void OnTopLocationChanged(int oldValue){}
+
+		/// <summary>
+		/// Called after LeftInternal property has changed
+		/// </summary>
+		protected virtual void OnLeftLocationChanged(int oldValue){}
+
+		/// <summary>
+		/// Occurs when the mouse pointer enters the item. This is used by internal implementation only.
+		/// </summary>
+		[System.ComponentModel.Browsable(false),System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+		public virtual void InternalMouseEnter()
+		{
+			if(!m_DesignMode)
+			{
+				if(MouseEnter!=null)
+					MouseEnter(this,new EventArgs());
+				IOwnerItemEvents owner=this.GetIOwnerItemEvents();
+				if(owner!=null && !this.SystemItem && !this.IsOnCustomizeMenu && !this.IsOnCustomizeDialog)
+					owner.InvokeMouseEnter(this,new EventArgs());
+			}
+			if(!this.DesignMode)
+			{
+				ResetHover();
+
+				System.Windows.Forms.Control objContainer=this.ContainerControl as System.Windows.Forms.Control;
+
+				if(m_Cursor!=null && objContainer!=null)
+				{
+					m_ContainerCursor=objContainer.Cursor;
+					objContainer.Cursor=m_Cursor;
+				}
+
+				// Accessibility Narrator support for menu items ONLY
+                if (BarUtilities.AlwaysGenerateAccessibilityFocusEvent && !(objContainer is MenuPanel) || objContainer is Bar && this.IsOnMenuBar)
+				{
+					Bar.BarAccessibleObject acc=objContainer.AccessibilityObject as Bar.BarAccessibleObject;
+                    if (acc != null)
+                    {
+                        //acc.GenerateEvent(this,System.Windows.Forms.AccessibleEvents.SystemMenuStart);
+                        acc.GenerateEvent(this, System.Windows.Forms.AccessibleEvents.Focus);
+                    }
+                    else
+                    {
+                        ItemControlAccessibleObject ic = objContainer.AccessibilityObject as ItemControlAccessibleObject;
+                        if (ic != null)
+                            ic.GenerateEvent(this, System.Windows.Forms.AccessibleEvents.Focus);
+                    }
+				}
+				else if(objContainer is MenuPanel && !((MenuPanel)objContainer).IsDisposed)
+				{
+					MenuPanel.PopupMenuAccessibleObject a=objContainer.AccessibilityObject as MenuPanel.PopupMenuAccessibleObject;
+					if(a!=null)
+					{
+						a.GenerateEvent(this,System.Windows.Forms.AccessibleEvents.Focus);
+					}
+				}
+			}			
+		}
+
+		/// <summary>
+		/// Occurs when the mouse pointer hovers the item. This is used by internal implementation only.
+		/// </summary>
+		[System.ComponentModel.Browsable(false),System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+		public virtual void InternalMouseHover()
+		{
+			if(m_DesignMode)
+				return;
+
+			if(m_HotSubItem!=null)
+			{
+				if(!m_AutoExpand)
+				{
+					BaseItem objItem=ExpandedItem();
+					if(objItem!=null && m_HotSubItem!=objItem && objItem.Visible && (this.IsOnMenu || this.ContainerControl is Bar || this.ContainerControl is RibbonBar))
+						objItem.Expanded=false;
+				}
+				// Changing the Expanded of the item can cause hot sub item to be set to null
+				if(m_HotSubItem!=null)
+					m_HotSubItem.InternalMouseHover();
+			}
+			else
+			{
+				if(System.Windows.Forms.Control.MouseButtons==System.Windows.Forms.MouseButtons.None)
+					ShowToolTip();
+				if(!m_DesignMode)
+				{
+					if(MouseHover!=null)
+						MouseHover(this,new EventArgs());
+					IOwnerItemEvents owner=this.GetIOwnerItemEvents();
+					if(owner!=null && !this.SystemItem && !this.IsOnCustomizeMenu && !this.IsOnCustomizeDialog)
+						owner.InvokeMouseHover(this,new EventArgs());
+				}
+			}
+		}
+
+		/// <summary>
+		/// Occurs when the mouse pointer leaves the item. This is used by internal implementation only.
+		/// </summary>
+		[System.ComponentModel.Browsable(false),System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+		public virtual void InternalMouseLeave()
+		{
+			if(m_ContainerCursor!=null)
+			{
+				System.Windows.Forms.Control objContainer=this.ContainerControl as System.Windows.Forms.Control;
+				if(objContainer!=null)
+				{
+					objContainer.Cursor=m_ContainerCursor;
+				}
+				m_ContainerCursor=null;
+			}
+
+			if(m_DesignMode)
+				return;
+
+			// If we had hot sub item pass the mouse leave message to it...
+			if(m_HotSubItem!=null)
+			{
+				m_HotSubItem.InternalMouseLeave();
+                HotSubItem = null;
+			}
+			else
+			{
+                if (m_TextMarkup != null)
+                    m_TextMarkup.MouseLeave(this.ContainerControl as System.Windows.Forms.Control);
+
+				if(MouseLeave!=null)
+					MouseLeave(this,new EventArgs());
+				IOwnerItemEvents owner=this.GetIOwnerItemEvents();
+				if(owner!=null && !this.SystemItem && !this.IsOnCustomizeMenu && !this.IsOnCustomizeDialog)
+					owner.InvokeMouseLeave(this,new EventArgs());
+			}
+			HideToolTip();
+		}
+        /// <summary>
+        /// Gets the mouse down coordinates.
+        /// </summary>
+        internal Point MouseDownPt
+        {
+            get
+            {
+                return m_MouseDownPt;
+            }
+        }
+
+        protected virtual bool ShouldCollapseParentItem()
+        {
+            return true;
+        }
+        protected void RaiseMouseDown(System.Windows.Forms.MouseEventArgs objArg)
+        {
+            if (MouseDown != null)
+                MouseDown(this, objArg);
+        }
+        /// <summary>
+		/// Occurs when the mouse pointer is over the item and a mouse button is pressed. This is used by internal implementation only.
+		/// </summary>
+		[System.ComponentModel.Browsable(false),System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+		public virtual void InternalMouseDown(System.Windows.Forms.MouseEventArgs objArg)
+		{
+			IOwner owner=null;
+
+			// Colapse any item if expanded
+			m_MouseDownPt=new System.Drawing.Point(objArg.X,objArg.Y);
+			BaseItem objItem=ExpandedItem();
+			if(objItem!=null && objItem!=m_HotSubItem && !this.DesignMode && m_AllowOnlyOneSubItemExpanded && ShouldCollapseParentItem())
+			{
+				objItem.Expanded=false;
+				m_AutoExpand=false;
+			}
+
+			if(m_DesignMode && (m_CanCustomize || this.Site!=null && this.Site.DesignMode))// && !this.SystemItem)
+			{
+                if(this.IsContainer && this.SubItems.Count>0)
+				{
+					BaseItem objNew=ItemAtLocation(objArg.X,objArg.Y);
+
+                    if (objNew != null && (objNew.CanCustomize || this.Site != null && this.Site.DesignMode || objNew.Site != null && objNew.Site.DesignMode) && !(objNew.DesignMode && !objNew.DesignTimeVisible))
+					{
+						owner=this.GetOwner() as IOwner;
+						if(owner!=null)
+							owner.SetFocusItem(objNew);
+					}
+					else if(objNew==null)
+					{
+						owner=this.GetOwner() as IOwner;
+						if(owner!=null)
+							owner.SetFocusItem(null);
+					}
+
+					if(objNew!=null && objNew!=this)
+						objNew.InternalMouseDown(objArg);
+				}
+				
+				if(objArg.Button==System.Windows.Forms.MouseButtons.Right && !m_IsContainer)
+				{
+					owner=this.GetOwner() as IOwner;
+					if(owner!=null)
+						owner.DesignTimeContextMenu(this);
+				}
+			}
+
+			if(!this.DesignMode)
+			{
+				owner=this.GetOwner() as IOwner;
+				if(owner!=null && owner.GetFocusItem()!=null)
+				{
+					BaseItem objNew=ItemAtLocation(objArg.X,objArg.Y);
+					if(objNew!=owner.GetFocusItem())
+						owner.GetFocusItem().ReleaseFocus();
+				}
+			}
+
+			if(m_HotSubItem!=null)
+			{
+				m_HotSubItem.InternalMouseDown(objArg);
+			}
+			else if(!m_DesignMode)
+			{
+                if (m_TextMarkup != null)
+                    m_TextMarkup.MouseDown(this.ContainerControl as System.Windows.Forms.Control, objArg);
+
+                RaiseMouseDown(objArg);
+				//if(owner==null)
+				//	owner=this.GetOwner() as IOwner;
+				IOwnerItemEvents ownerEvents=this.GetIOwnerItemEvents();
+				if(ownerEvents!=null && !this.SystemItem && !this.IsOnCustomizeMenu && !this.IsOnCustomizeDialog)
+					ownerEvents.InvokeMouseDown(this,objArg);
+			}
+
+			HideToolTip();
+		}
+
+        protected void RaiseMouseUp(System.Windows.Forms.MouseEventArgs objArg)
+        {
+            if (MouseUp != null)
+                MouseUp(this, objArg);
+        }
+        /// <summary>
+		/// Occurs when the mouse pointer is over the item and a mouse button is released. This is used by internal implementation only.
+		/// </summary>
+		[System.ComponentModel.Browsable(false),System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+		public virtual void InternalMouseUp(System.Windows.Forms.MouseEventArgs objArg)
+		{
+			if(m_HotSubItem!=null)
+			{
+				if(m_HotSubItem.DisplayRectangle.Contains(objArg.X,objArg.Y) || m_HotSubItem.MouseUpNotification)
+					m_HotSubItem.InternalMouseUp(objArg);
+			}
+			else if(!m_DesignMode)
+			{
+                if (m_TextMarkup != null)
+                    m_TextMarkup.MouseUp(this.ContainerControl as System.Windows.Forms.Control, objArg);
+                RaiseMouseUp(objArg);
+				IOwnerItemEvents owner=this.GetIOwnerItemEvents();
+				if(owner!=null && !this.SystemItem && !this.IsOnCustomizeMenu && !this.IsOnCustomizeDialog)
+					owner.InvokeMouseUp(this,objArg);
+                if ((objArg.Button == System.Windows.Forms.MouseButtons.Left || objArg.Button == System.Windows.Forms.MouseButtons.Right && this.IsOnContextMenu) && this.DisplayRectangle.Contains(objArg.X, objArg.Y) && (this.DisplayRectangle.Contains(m_MouseDownPt) && this.GetEnabled() || this.IsOnMenu))
+					RaiseClick(eEventSource.Mouse);
+			}
+			else
+			{
+				BaseItem objNew=ItemAtLocation(objArg.X,objArg.Y);
+				if(objNew!=null && objNew!=this)
+					objNew.InternalMouseUp(objArg);
+			}
+
+			m_MouseDownPt=System.Drawing.Point.Empty;
+		}
+
+        /// <summary>
+        /// Gets whether item is on context menu created using ContextMenuBar
+        /// </summary>
+        [Browsable(false)]
+        public bool IsOnContextMenu
+        {
+            get { return this.GetOwner() is ContextMenuBar; }
+        }
+
+		/// <summary>
+		/// Occurs when a key is pressed down while the item has focus. This is used by internal implementation only.
+		/// </summary>
+		[System.ComponentModel.Browsable(false),System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+		public virtual void InternalKeyDown(System.Windows.Forms.KeyEventArgs objArg)
+		{
+			if(m_DesignMode)
+			{
+				objArg.Handled=true;
+				return;
+			}
+
+			if(m_HotSubItem!=null)
+			{
+				m_HotSubItem.InternalKeyDown(objArg);
+			}
+
+			if(objArg.KeyCode==System.Windows.Forms.Keys.Enter  || objArg.KeyCode==System.Windows.Forms.Keys.Return)
+			{
+                if (!(this.IsOnMenuBar || (this.IsOnMenu || this.ShowSubItems) && this.SubItems.Count > 0) && this.GetEnabled())
+				{
+					RaiseClick(eEventSource.Keyboard);
+					objArg.Handled=true;
+
+                    if (this.GetOwner() is RibbonStrip || this.GetOwner() is RibbonBar)
+                    {
+                        ((ItemControl)this.GetOwner()).ReleaseFocus();
+                        ((ItemControl)this.GetOwner()).MenuFocus = false;
+                    }
+				}
+			}
+		}
+
+        /// <summary>
+        /// Processes the MouseLeave for the current mouse over item.
+        /// </summary>
+        protected virtual void LeaveHotSubItem(BaseItem newMouseOverItem)
+        {
+            BaseItem hotSubItem = m_HotSubItem;
+            if (hotSubItem != null)
+            {
+                hotSubItem.InternalMouseLeave();
+                //if(objNew!=null && m_AutoExpand && m_HotSubItem.Expanded)
+                if (newMouseOverItem != null && hotSubItem.Expanded && (this.IsOnMenu || this.ContainerControl is Bar && ((Bar)this.ContainerControl).BarType == eBarType.MenuBar))
+                    hotSubItem.Expanded = false;
+                HotSubItem = null;
+            }
+        }
+
+		/// <summary>
+		/// Occurs when the mouse pointer is moved over the item. This is used by internal implementation only.
+		/// </summary>
+		[System.ComponentModel.Browsable(false),System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+		public virtual void InternalMouseMove(System.Windows.Forms.MouseEventArgs objArg)
+		{
+			if(m_DesignMode && objArg.Button==System.Windows.Forms.MouseButtons.Left && (Math.Abs(objArg.X-m_MouseDownPt.X)>=2 || Math.Abs(objArg.Y-m_MouseDownPt.Y)>=2))
+			{
+				BaseItem objFocus=this.FocusedItem();
+				if(objFocus!=null && objFocus.CanCustomize)
+				{
+					if(!objFocus.SystemItem)
+					{
+						IOwner owner=this.GetOwner() as IOwner;
+						if(owner!=null)
+							owner.StartItemDrag(objFocus);
+					}
+				}
+				else if(!m_IsContainer)
+				{
+					if(!this.SystemItem && m_CanCustomize)
+					{
+						IOwner owner=this.GetOwner() as IOwner;
+						if(owner!=null)
+							owner.StartItemDrag(this);
+					}
+				}
+				return;
+			}
+
+			// If item is container and not in design time...
+			if(m_IsContainer && !m_DesignMode)
+			{
+				BaseItem objNew=ItemAtLocation(objArg.X,objArg.Y);
+				if(objNew!=m_HotSubItem && (!(objArg.Button != MouseButtons.None && m_HotSubItem!=null) || m_CheckMouseMovePressed) && 
+                    !(m_HotSubItem!=null && m_HotSubItem.MouseDownCapture && objArg.Button == MouseButtons.Left))
+				{
+					LeaveHotSubItem(objNew);
+					
+					if(objNew!=null)
+					{
+						if(m_AutoExpand)
+						{
+							BaseItem objItem=ExpandedItem();
+							if(objItem!=null && objItem!=objNew)
+								objItem.Expanded=false;
+						}
+                        if (objNew != this)
+                        {
+                            objNew.InternalMouseEnter();
+                            objNew.InternalMouseMove(objArg);
+                            if (objNew.GetEnabled())
+                            {
+                                if (m_AutoExpand && objNew.ShowSubItems)
+                                {
+                                    if (objNew is PopupItem)
+                                    {
+                                        PopupItem pi = objNew as PopupItem;
+                                        ePopupAnimation oldAnim = pi.PopupAnimation;
+                                        pi.PopupAnimation = ePopupAnimation.None;
+                                        if (objNew.SubItems.Count > 0)
+                                            objNew.Expanded = true;
+                                        pi.PopupAnimation = oldAnim;
+                                    }
+                                    else
+                                        objNew.Expanded = true;
+                                }
+                            }
+                            HotSubItem = objNew;
+                        }
+					}
+					else
+						HotSubItem=null;
+                    if(MouseMove!=null)
+                        MouseMove(this, objArg);
+				}
+				else if(m_HotSubItem!=null)
+				{
+					m_HotSubItem.InternalMouseMove(objArg);
+				}
+				else
+				{
+					if(MouseMove!=null)
+						MouseMove(this,objArg);
+					IOwnerItemEvents owner=this.GetIOwnerItemEvents();
+					if(owner!=null && !this.SystemItem && !this.IsOnCustomizeMenu && !this.IsOnCustomizeDialog)
+						owner.InvokeMouseMove(this,objArg);
+				}
+
+                if (m_TextMarkup != null)
+                {
+                    //m_TextMarkup.MouseMove(this.ContainerControl as Control, objArg);
+
+                    Control control = GetParentControl();
+
+                    if (control != null)
+                        m_TextMarkup.MouseMove(control, objArg);
+                }
+			}
+			else
+			{
+				if (!m_DesignMode)
+				{
+                    if (m_TextMarkup != null)
+                    {
+                        //m_TextMarkup.MouseMove(this.ContainerControl as Control, objArg);
+
+                        Control control = GetParentControl();
+
+                        if (control != null)
+                            m_TextMarkup.MouseMove(control, objArg);
+                    }
+
+				    if (MouseMove!=null)
+						MouseMove(this,objArg);
+
+					IOwnerItemEvents owner=this.GetIOwnerItemEvents();
+
+					if (owner!=null && !this.SystemItem && !this.IsOnCustomizeMenu && !this.IsOnCustomizeDialog)
+						owner.InvokeMouseMove(this,objArg);
+				}
+			}
+        }
+
+        internal Control GetParentControl()
+        {
+            Control control = ContainerControl as Control;
+
+            if (control == null)
+            {
+                BaseItem item = ContainerControl as BaseItem;
+
+                while (item != null)
+                {
+                    control = item.ContainerControl as Control;
+
+                    if (control != null)
+                        break;
+
+                    item = item.Parent;
+                }
+            }
+
+            return (control);
+        }
+
+		/// <summary>
+		/// Occurs when the item is clicked. This is used by internal implementation only.
+		/// </summary>
+		[System.ComponentModel.Browsable(false),System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+		public virtual void InternalClick(System.Windows.Forms.MouseButtons mb, System.Drawing.Point mpos)
+		{
+			if(m_HotSubItem!=null)
+			{
+				m_HotSubItem.InternalClick(mb,mpos);
+				return;
+			}
+
+            if (m_TextMarkup != null)
+                m_TextMarkup.Click(this.ContainerControl as System.Windows.Forms.Control);
+
+			//RaiseClick();
+		}
+
+		/// <summary>
+		/// Gets whether RaiseClick method will generate a click event give current item state.
+		/// </summary>
+		internal bool CanRaiseClick
+		{
+			get
+			{
+                if (this.DesignMode || !m_Visible && !this.SystemItem && !this.IsOnCustomizeMenu || _IgnoreClick || !GetEnabled())
+					return false;
+                if(this.ContainerControl is BaseItemControl && ((BaseItemControl)this.ContainerControl).IsValidationCancelled)
+                    return false;
+#if TRIAL
+				if(NativeFunctions.ColorExpAlt())
+					return false;
+#endif
+
+				return true;
+			}
+		}
+
+        private bool _CollapseAllBeforeRaisingClick = true;
+        /// <summary>
+        /// Indicates whether RaiseClick method collapses parent popups before raising click event. Default value is true.
+        /// </summary>
+        internal bool CollapseAllBeforeRaisingClick
+        {
+            get { return _CollapseAllBeforeRaisingClick; }
+            set
+            {
+                _CollapseAllBeforeRaisingClick = value;
+            }
+        }
+
+        private void ClickCollapseAll()
+        {
+            if (m_AutoCollapseOnClick)
+            {
+                if ((!this.SystemItem || this.SystemItem && this.Name.StartsWith("mdi-")) && (IsOnPopup(this)) && !(m_Parent != null && m_Parent.SystemItem && !(m_Parent is DisplayMoreItem)))
+                {
+                    if (!(this is PopupItem && ((PopupItem)this).ShowSubItems && (SubItems.Count > 0 || ((PopupItem)this).PopupType == ePopupType.Container)))
+                        CollapseAll(this);
+                }
+
+                if (m_Parent != null && m_Parent.AutoExpand && this.SubItems.Count == 0)
+                    m_Parent.AutoExpand = false;
+            }
+        }
+        /// <summary>
+        /// Raises the click event and provide the information about the source of the event.
+        /// </summary>
+        /// <param name="source"></param>
+        public virtual void RaiseClick(eEventSource source)
+        {
+            //if (BaseItem.IsOnPopup(this))
+            //    NativeFunctions.sndPlaySound("MenuCommand", NativeFunctions.SND_ASYNC | NativeFunctions.SND_NODEFAULT);
+            if (!CanRaiseClick)
+                return;
+
+            IOwnerItemEvents owner = this.GetIOwnerItemEvents();
+            BaseItem rootParent = this.RootParentItem;
+
+            if(_CollapseAllBeforeRaisingClick)
+                ClickCollapseAll();
+
+            if (m_InClickEvent) return;
+            m_InClickEvent = true;
+            try
+            {
+                this.OnClick();
+
+                if (Click != null)
+                    Click(this, new DevComponents.DotNetBar.Events.EventSourceArgs(source));
+
+                if (rootParent != null && rootParent.ContainerControl is Bar)
+                {
+                    Bar bar = rootParent.ContainerControl as Bar;
+                    if (bar != null)
+                        bar.InvokeItemClick(this, new DevComponents.DotNetBar.Events.EventSourceArgs(source));
+                }
+                else if (this.GetOwner() is Bar && owner == null)
+                    ((Bar)this.GetOwner()).InvokeItemClick(this, new DevComponents.DotNetBar.Events.EventSourceArgs(source));
+
+                if (owner != null && !this.SystemItem && !this.IsOnCustomizeMenu && !this.IsOnCustomizeDialog)
+                    owner.InvokeItemClick(this);
+            }
+            finally
+            {
+                m_InClickEvent = false;
+            }
+
+            if (!_CollapseAllBeforeRaisingClick)
+                ClickCollapseAll();
+        }
+
+		/// <summary>
+		/// Raises the Click event with default source as Code.
+		/// </summary>
+		private bool m_InClickEvent=false;
+		public virtual void RaiseClick()
+		{
+            RaiseClick(eEventSource.Code);
+		}
+
+        private BaseItem RootParentItem
+        {
+            get
+            {
+                BaseItem parent = Parent;
+                while (parent != null && parent.Parent != null)
+                    parent = parent.Parent;
+                return parent;
+            }
+        }
+
+		internal void ClearClick()
+		{
+			Click=null;
+		}
+
+		/// <summary>
+		/// Occurs when the item is double clicked. This is used by internal implementation only.
+		/// </summary>
+		[System.ComponentModel.Browsable(false),System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+		public virtual void InternalDoubleClick(System.Windows.Forms.MouseButtons mb, System.Drawing.Point mpos)
+		{
+            if (m_HotSubItem != null)
+            {
+                m_HotSubItem.InternalDoubleClick(mb, mpos);
+            }
+            else
+            {
+                InvokeDoubleClick();
+
+                IOwnerItemEvents owner = this.GetIOwnerItemEvents();
+                if (owner != null && !this.SystemItem && !this.IsOnCustomizeMenu && !this.IsOnCustomizeDialog)
+                    owner.InvokeItemDoubleClick(this, new MouseEventArgs(mb, 2, mpos.X, mpos.Y, 0));
+            }
+		}
+
+        /// <summary>
+        /// Invokes DoubleClick event.
+        /// </summary>
+        protected virtual void InvokeDoubleClick()
+        {
+            if (DoubleClick != null)
+                DoubleClick(this, new EventArgs());
+        }
+
+		/// <summary>
+		/// Occurs when the item receives focus. If overridden base implementation must be called so default processing can occur.
+		/// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+		public virtual void OnGotFocus()
+		{
+			m_Focused=true;
+
+			if(!m_DesignMode)
+			{
+				IOwnerItemEvents owner=this.GetIOwnerItemEvents();
+				if(owner!=null && !this.SystemItem && !this.IsOnCustomizeMenu && !this.IsOnCustomizeDialog)
+					owner.InvokeGotFocus(this,new EventArgs());
+			}
+
+			this.Refresh();
+
+            OnGotFocus(EventArgs.Empty);
+		}
+
+        protected virtual void OnGotFocus(EventArgs e)
+        {
+            if (GotFocus != null)
+                GotFocus(this, e);
+        }
+        /// <summary>
+		/// Occurs when the item has lost the focus. If overridden base implementation must be called so default processing can occur.
+		/// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+		public virtual void OnLostFocus()
+		{
+            if (this.IsDisposed) return;
+
+            if (!m_DesignMode)
+            {
+                IOwnerItemEvents owner = this.GetIOwnerItemEvents();
+                if (owner != null && !this.SystemItem && !this.IsOnCustomizeMenu && !this.IsOnCustomizeDialog)
+                    owner.InvokeLostFocus(this, new EventArgs());
+            }
+            else
+                InternalMouseLeave();
+			m_Focused=false;
+			this.Refresh();
+
+            OnLostFocus(EventArgs.Empty);
+		}
+
+        protected virtual void OnLostFocus(EventArgs e)
+        {
+            if (LostFocus != null)
+                LostFocus(this, e);
+        }
+        /// <summary>
+		/// Sets the input focus to the item. If overridden base implementation must be called so default processing can occur.
+		/// </summary>
+		public virtual void Focus()
+		{
+			if(BaseItem.IsOnPopup(this))
+			{
+				MenuPanel menu=this.ContainerControl as MenuPanel;
+				if(menu!=null && menu.ParentItem.Parent==null)
+				{
+					menu.SetFocusItem(this);
+					return;
+				}
+			}
+
+			IOwner owner=this.GetOwner() as IOwner;
+			if(owner!=null)
+				owner.SetFocusItem(this);
+			else
+				this.OnGotFocus();
+
+			if(this.Parent!=null)
+				this.Parent.OnSubItemGotFocus(this);
+		}
+
+		/// <summary>
+		/// Releases the input focus. If overridden base implementation must be called so default processing can occur.
+		/// </summary>
+		public virtual void ReleaseFocus()
+		{
+			if(m_Focused)
+			{
+				if(BaseItem.IsOnPopup(this))
+				{
+					MenuPanel menu=this.ContainerControl as MenuPanel;
+					if(menu!=null && menu.ParentItem.Parent==null)
+					{
+						menu.SetFocusItem(null);
+						return;
+					}
+				}
+
+				IOwner owner=this.GetOwner() as IOwner;
+				if(owner!=null)
+					owner.SetFocusItem(null);
+				else
+					this.OnLostFocus();
+
+				if(this.Parent!=null)
+					this.Parent.OnSubItemLostFocus(this);
+			}
+		}
+
+		/// <summary>
+		/// Gets whether item has input focus.
+		/// </summary>
+		[System.ComponentModel.Browsable(false),System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
+		public virtual bool Focused
+		{
+			get
+			{
+				return m_Focused;
+			}
+		}
+
+		/// <summary>
+		/// Occurs when item container has lost the input focus. If overridden base implementation must be called so default processing can occur.
+		/// </summary>
+		[System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+		public virtual void ContainerLostFocus(bool appLostFocus)
+		{
+			if(m_SubItems!=null)
+			{
+				foreach(BaseItem objSub in m_SubItems)
+				{
+					objSub.ContainerLostFocus(appLostFocus);
+				}
+			}
+			if(m_HotSubItem!=null)
+			{
+                bool leave = true;
+                if (!appLostFocus)
+                {
+                    System.Windows.Forms.Control c = this.ContainerControl as System.Windows.Forms.Control;
+                    if (c != null)
+                    {
+                        Point p = c.PointToClient(System.Windows.Forms.Control.MousePosition);
+                        if (m_HotSubItem.DisplayRectangle.Contains(p))
+                            leave = false;
+                    }
+                }
+                if (leave)
+                {
+                    m_HotSubItem.InternalMouseLeave();
+                    HotSubItem = null;
+                }
+			}
+			if(this.Focused)
+			{
+				IOwner owner=this.GetOwner() as IOwner;
+				if(owner!=null)
+					owner.SetFocusItem(null);
+			}
+		}
+
+		/// <summary>
+		/// Occurs when item container receives the input focus. If overridden base implementation must be called so default processing can occur.
+		/// </summary>
+		[System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+		public virtual void ContainerGotFocus()
+		{
+			if(m_SubItems!=null)
+			{
+				foreach(BaseItem objSub in m_SubItems)
+				{
+					objSub.ContainerGotFocus();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Indicates that item size has changed. It must be called by child item to let the parent know that its size
+		/// has been changed.
+		/// </summary>
+		[System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+		public virtual void SubItemSizeChanged(BaseItem objChildItem) {}
+		
+		/// <summary>
+		/// Return Sub Item at specified location
+		/// </summary>
+		public virtual BaseItem ItemAtLocation(int x, int y)
+		{
+			if(!m_IsContainer)
+			{
+				return null;
+			}
+			if(m_SubItems!=null)
+			{
+                foreach (BaseItem objSub in m_SubItems)
+                {
+                    //if(objSub.Visible && objSub.Displayed && x>=objSub.Left && x<=(objSub.Left+objSub.Width) && y>=objSub.Top && y<=(objSub.Top+objSub.Height))
+                    if ((objSub.Visible || m_IsOnCustomizeMenu) && objSub.Displayed && objSub.DisplayRectangle.Contains(x, y))
+                    {
+                        if (m_ViewRectangle.IsEmpty || m_ViewRectangle.Contains(x, y))
+                            return objSub;
+                    }
+                }
+			}
+			return null;
+		}
+
+		/// <summary>
+		/// Gets the current expanded subitem.
+		/// </summary>
+		/// <returns></returns>
+		protected internal virtual BaseItem ExpandedItem()
+		{
+			if(!m_IsContainer)
+			{
+				return null;
+			}
+			if(m_SubItems!=null)
+			{
+				foreach(BaseItem objSub in m_SubItems)
+				{
+                    if (objSub is GalleryContainer && ((GalleryContainer)objSub).IsGalleryPopupOpen)
+                        return objSub;
+                    if (objSub is ItemContainer)
+                    {
+                        BaseItem exp = objSub.ExpandedItem();
+                        if (exp != null)
+                            return exp;
+                    }
+					else if(objSub.Expanded)
+					{
+						return objSub;
+					}
+				}
+			}
+			return null;
+		}
+
+		/// <summary>
+		/// Gets the item that has input focus.
+		/// </summary>
+		/// <returns>Item that has focus or Null (Nothing) if none of the subitems have focus.</returns>
+		protected internal BaseItem FocusedItem()
+		{
+			if(!m_IsContainer)
+				return null;
+			if(m_SubItems!=null)
+			{
+				foreach(BaseItem objSub in m_SubItems)
+				{
+					if(objSub.Focused)
+					{
+						return objSub;
+					}
+                    else if (objSub.IsContainer)
+                    {
+                        BaseItem focused = objSub.FocusedItem();
+                        if (focused != null)
+                            return focused;
+                    }
+				}
+			}
+			return null;
+		}
+		
+		/// <summary>
+		/// Gets the owner of the item.
+		/// </summary>
+		/// <returns>DotNetBarManager that owns the item.</returns>
+		public object GetOwner()
+		{
+			if(m_Owner!=null)
+				return m_Owner;
+
+			System.Windows.Forms.Control objCtrl=this.ContainerControl as System.Windows.Forms.Control;
+
+			if (objCtrl is Bar)
+                return ((Bar)objCtrl).Owner;
+			else if(objCtrl is MenuPanel)
+				return ((MenuPanel)objCtrl).Owner;
+			else if(m_Parent!=null)
+				return m_Parent.GetOwner();
+			
+			return null;
+		}
+
+	    protected object OwnerDirect
+	    {
+	        get { return m_Owner; }
+	    }
+
+		internal protected IOwnerItemEvents GetIOwnerItemEvents()
+		{
+			return this.GetOwner() as IOwnerItemEvents;
+		}
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+		public void SetOwner(object owner)
+		{
+			if(m_Owner!=owner)
+			{
+				m_Owner=owner;
+				this.OnOwnerChanged();
+			}
+		}
+
+		/// <summary>
+		/// Recalculate the size of the item. If overridden base implementation must be called so default processing can occur.
+		/// </summary>
+		public virtual void RecalcSize()
+		{
+			m_NeedRecalcSize=false;
+		}
+
+		/// <summary>
+		/// Indicates that item is recalculating its size.
+		/// </summary>
+		[System.ComponentModel.Browsable(false),DevCoBrowsable(false)]
+		public bool IsRecalculatingSize
+		{
+			get {return m_RecalculatingSize;}
+		}
+		
+		/// <summary>
+		/// Must be overridden by class that is inheriting to provide the painting for the item.
+		/// </summary>
+		public abstract void Paint(ItemPaintArgs p);
+
+		/// <summary>
+		/// Must be overridden by class that is inheriting to provide the method to
+		/// return copy of an item. 
+		/// </summary>
+		public abstract BaseItem Copy();
+
+		/// <summary>
+		/// Internal Copy implementation.
+		/// </summary>
+		/// <param name="objCopy">Item to copy to.</param>
+		protected virtual void CopyToItem(BaseItem objCopy)
+		{
+			objCopy.Visible=m_Visible;
+			objCopy.SetIsContainer(m_IsContainer);
+			objCopy.AutoExpand=m_AutoExpand;
+			objCopy.BeginGroup=m_BeginGroup;
+			objCopy.Enabled=m_Enabled;
+			objCopy.Description=m_Description;
+			objCopy.Tooltip=m_Tooltip;
+			objCopy.Category=m_Category;
+			objCopy.Orientation=m_Orientation;
+			objCopy.Text=m_Text;
+			objCopy.Name=m_Name;
+			objCopy.GlobalName = m_GlobalName;
+            objCopy.GlobalItem = m_GlobalItem;
+			objCopy.Style=m_Style;
+			objCopy.SetDesignMode(m_DesignMode);
+			objCopy.ShowSubItems=m_ShowSubItems;
+			objCopy.Stretch=m_Stretch;
+			if(m_Shortcuts!=null && m_Shortcuts.Count>0)
+				objCopy.Shortcuts.FromString(m_Shortcuts.ToString(","),",");
+			
+			// Copy Events
+			objCopy.Click=this.Click;
+			objCopy.ExpandChange=this.ExpandChange;
+			objCopy.LostFocus=this.LostFocus;
+			objCopy.GotFocus=this.GotFocus;
+			objCopy.MouseDown=this.MouseDown;
+			objCopy.MouseEnter=this.MouseEnter;
+			objCopy.MouseHover=this.MouseHover;
+			objCopy.MouseLeave=this.MouseLeave;
+			objCopy.MouseMove=this.MouseMove;
+			objCopy.MouseUp=this.MouseUp;
+			objCopy.VisibleChanged=this.VisibleChanged;
+			objCopy.EnabledChanged=this.EnabledChanged;
+			objCopy.TextChanged=this.TextChanged;
+            objCopy.IsRightToLeft = this.IsRightToLeft;
+			objCopy.Cursor=m_Cursor;
+			objCopy.ThemeAware=m_ThemeAware;
+            objCopy.AutoCollapseOnClick = this.AutoCollapseOnClick;
+			objCopy.Tag=m_ItemData;
+            objCopy.CanCustomize = m_CanCustomize;
+            objCopy.Command = this.Command;
+            objCopy.CommandParameter = this.CommandParameter;
+            objCopy.KeyTips = this.KeyTips;
+			if(m_SubItems!=null)
+			{
+				foreach(BaseItem objItem in m_SubItems)
+					objCopy.SubItems.Add(objItem.Copy());
+			}
+
+			if(ItemCopied!=null)
+				ItemCopied(objCopy,new EventArgs());
+		}
+
+		/// <summary>
+		/// Returns copy of the item.
+		/// </summary>
+		/// <returns>Copy of the item.</returns>
+		public object Clone()
+		{
+			return this.Copy();
+		}
+
+		/// <summary>
+		/// Forces the repaint the item.
+		/// </summary>
+		public virtual void Refresh()
+		{
+			if(m_SuspendLayout)
+				return;
+
+			if((m_Visible || m_IsOnCustomizeMenu) && m_Displayed)
+			{
+				System.Windows.Forms.Control objCtrl=this.ContainerControl as System.Windows.Forms.Control;
+                if (objCtrl != null && IsHandleValid(objCtrl) && !(objCtrl is ItemsListBox))
+                {
+                    if (objCtrl.InvokeRequired)
+                    {
+                        objCtrl.BeginInvoke(new MethodInvoker(delegate { this.Refresh(); }));
+                        return;
+                    }
+
+                    if (m_NeedRecalcSize)
+                    {
+                        if (m_Parent is ItemContainer)
+                        {
+                            m_Parent.RecalcSize();
+                        }
+                        else
+                        {
+                            RecalcSize();
+                            if (m_Parent != null)
+                                m_Parent.SubItemSizeChanged(this);
+                        }
+                    }
+                    Invalidate(objCtrl);
+                }
+			}
+		}
+
+        protected virtual void Update()
+        {
+            Control cont = this.ContainerControl as Control;
+            if (cont != null)
+                Update(cont);
+        }
+        protected virtual void Update(Control containerControl)
+        {
+            if (containerControl.InvokeRequired)
+                containerControl.BeginInvoke(new MethodInvoker(delegate { containerControl.Update(); }));
+            else
+                containerControl.Update();
+        }
+        protected virtual void Invalidate()
+        {
+            Control cont = this.ContainerControl as Control;
+            if (cont != null)
+                Invalidate(cont);
+        }
+        private static void InvalidateFormCaption(Control containerControl)
+        {
+            int height = SystemInformation.Border3DSize.Height + SystemInformation.CaptionHeight;
+            WinApi.RECT r = new WinApi.RECT(0, -height, containerControl.Width, height);
+            WinApi.RedrawWindow(containerControl.Handle, ref r, IntPtr.Zero, WinApi.RedrawWindowFlags.RDW_INVALIDATE | WinApi.RedrawWindowFlags.RDW_FRAME | WinApi.RedrawWindowFlags.RDW_UPDATENOW);
+        }
+        protected virtual void Invalidate(Control containerControl)
+        {
+            if (this.DesignMode)
+            {
+                if (containerControl is Form && !(containerControl is RadialMenuPopup))
+                {
+                    if (IsHandleValid(containerControl))
+                        InvalidateFormCaption(containerControl);
+                    containerControl.Refresh();
+                }
+                else
+                {
+                    if (containerControl.InvokeRequired)
+                        containerControl.BeginInvoke(new MethodInvoker(delegate { containerControl.Invalidate(); }));
+                    else
+                        containerControl.Invalidate();
+                }
+            }
+            else
+            {
+                if (containerControl is Form && !(containerControl is RadialMenuPopup))
+                {
+                    if (IsHandleValid(containerControl))
+                        InvalidateFormCaption(containerControl);
+                }
+                else
+                {
+                    if (containerControl.InvokeRequired)
+                        containerControl.BeginInvoke(new MethodInvoker(delegate { containerControl.Invalidate(GetInvalidateBounds(), true); }));
+                    else
+                        containerControl.Invalidate(GetInvalidateBounds(), true);
+                }
+            }
+        }
+        protected virtual Rectangle GetInvalidateBounds()
+        {
+            return m_Rect;
+        }
+
+		private bool m_Refreshing=false;
+		protected internal void OnAppearanceChanged()
+		{
+			if(m_Refreshing || !this.DesignMode)
+				return;
+
+			m_Refreshing=true;
+			try
+			{
+				System.Windows.Forms.Control c=this.ContainerControl as System.Windows.Forms.Control;
+				if(c!=null)
+				{
+                    BarFunctions.InvokeRecalcLayout(c, true);
+				}
+			}
+			finally
+			{
+				m_Refreshing=false;
+			}
+		}
+
+		/// <summary>
+		/// Occurs when Expanded state changes. If overridden base implementation must be called so default processing can occur.
+		/// </summary>
+		protected internal virtual void OnExpandChange()
+		{
+			HideToolTip();
+            RaiseExpandChange(EventArgs.Empty);
+		}
+
+        /// <summary>
+        /// Raises ExpandChange event.
+        /// </summary>
+        /// <param name="e">Event arguments</param>
+        protected virtual void RaiseExpandChange(EventArgs e) 
+        {
+            if (ExpandChange != null)
+                ExpandChange(this, e);
+
+            IOwnerItemEvents owner = this.GetIOwnerItemEvents();
+            if (owner != null && !this.SystemItem && !this.IsOnCustomizeMenu && !this.IsOnCustomizeDialog)
+                owner.InvokeExpandedChange(this, e);
+        }
+
+		/// <summary>
+		/// Occurs when sub item expanded state has changed.
+		/// </summary>
+		/// <param name="item">Sub item affected.</param>
+		protected internal virtual void OnSubItemExpandChange(BaseItem item){}
+
+		/// <summary>
+		/// Suspends all layout for the item including painting. Use this property carefully and only to improve performace.
+		/// </summary>
+		[System.ComponentModel.Browsable(false),System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
+		public virtual bool SuspendLayout
+		{
+			get
+			{
+				return m_SuspendLayout;
+			}
+			set
+			{
+				m_SuspendLayout=value;
+			}
+		}
+
+	    private bool _IsLayoutPass = false;
+
+        /// <summary>
+        /// Indicates whether item is performing layout pass.
+        /// </summary>
+        [Browsable(false), System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
+        public bool IsLayoutPass
+	    {
+	        get { return _IsLayoutPass; }
+	        set { _IsLayoutPass = value; }
+	    }
+
+        /// <summary>
+        /// Gets whether layout pass is in progress in the parent chain.
+        /// </summary>
+        [Browsable(false), System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
+        public bool IsLayoutPassInProgress
+	    {
+            get
+            {
+                BaseItem parent = this.Parent;
+                while (parent != null)
+                {
+                    if (parent.IsLayoutPass) return true;
+                    parent = parent.Parent;
+                }
+                return false;
+            }
+	    }
+
+        /// <summary>
+        /// Releases all resurces used in this control. After calling Dispose()
+        /// object is not in valid state and cannot be recovered to the valid state.
+        /// Recreation of the object is required.
+        /// </summary>
+        protected override void Dispose(bool disposing)
+		{
+			if(m_Expanded && (this.Site!=null && !this.Site.DesignMode || this.Site==null))
+				this.Expanded=false;
+			
+			HideToolTip();
+
+			if(m_Parent!=null)
+			{
+				m_Parent=null;
+			}
+			IOwner owner=this.GetOwner() as IOwner;
+			if(owner!=null)
+				owner.RemoveShortcutsFromItem(this);
+
+			if(this.Site==null || this.Site!=null && !this.Site.DesignMode)
+			{
+				if(m_SubItems!=null && m_SubItems.Count>0)
+				{
+					ArrayList subitems=new ArrayList(m_SubItems.Count);
+					m_SubItems.CopyTo(subitems);
+					foreach(BaseItem objSub in subitems)
+					{
+						if(objSub.Parent==this)
+							objSub.Dispose();
+					}
+					m_SubItems._Clear();
+				}
+				m_SubItems=null;
+			}
+
+            //if(Disposed != null)
+            //    Disposed(this,EventArgs.Empty);
+
+			if(this.Site==null || this.Site!=null && !this.Site.DesignMode)
+			{
+				if(m_Shortcuts!=null)
+					m_Shortcuts=null;
+				//m_ItemData=null;
+				m_ContainerControl=null;
+			}
+
+            if (_Command != null)
+                this.Command = null;
+
+            if (m_TextMarkup != null)
+            {
+                m_TextMarkup.HyperLinkClick -= TextMarkupLinkClick;
+                m_TextMarkup = null;
+            }
+
+            m_IsDisposed = true;
+
+            base.Dispose(disposing);
+		}
+
+        /// <summary>
+        /// Gets whether item has been disposed through Dispose method call.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsDisposed
+        {
+            get
+            {
+                return m_IsDisposed;
+            }
+        }
+
+		/// <summary>
+		/// Returns the collection of sub items.
+		/// </summary>
+		[System.ComponentModel.Browsable(false),DevCoBrowsable(false),System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Content)]
+		public virtual SubItemsCollection SubItems
+		{
+			get
+			{
+				if(m_SubItems==null)
+					m_SubItems=new SubItemsCollection(this);
+				return m_SubItems;
+			}
+		}
+
+        /// <summary>
+        /// Returns count of sub items in SubItems collection that have Visible property set to true.
+        /// </summary>
+        [Browsable(false)]
+        public int VisibleSubItems
+        {
+            get
+            {
+                int iCount = 0;
+                foreach (BaseItem item in this.SubItems)
+                    if (item.Visible)
+                        iCount++;
+                return iCount;
+            }
+        }
+
+
+		/// <summary>
+		/// Unique ID that indentifies the item.
+		/// </summary>
+		[System.ComponentModel.Browsable(false),System.ComponentModel.Category("Design"),System.ComponentModel.Description("Specifies unique ID of the item.")]
+		public long Id
+		{
+			get
+			{
+				return m_Id;
+			}
+		}
+
+//		/// <summary>
+//		/// Allows the user to associate custom user data with the item.
+//		/// </summary>
+//		[System.ComponentModel.Browsable(false), DevCoBrowsable(false),System.ComponentModel.Category("Data"),System.ComponentModel.DefaultValue(""),System.ComponentModel.TypeConverter(typeof(System.ComponentModel.StringConverter)),Obsolete("ItemData is being replaced by Tag property.")]
+//		public virtual object ItemData
+//		{
+//			get
+//			{
+//				return m_ItemData;
+//			}
+//			set
+//			{
+//				m_ItemData=value;
+//			}
+//		}
+
+		/// <summary>
+		/// Allows the user to associate custom user data with the item.
+		/// </summary>
+		[System.ComponentModel.Browsable(true), DevCoBrowsable(true),System.ComponentModel.Category("Data"),System.ComponentModel.DefaultValue(null),System.ComponentModel.TypeConverter(typeof(System.ComponentModel.StringConverter)),System.ComponentModel.Localizable(true)]
+		public virtual object Tag
+		{
+			get
+			{
+				return m_ItemData;
+			}
+			set
+			{
+				m_ItemData=value;
+			}
+		}
+		
+		/// <summary>
+		/// Applies new visual style to this the item and all of its sub-items.
+		/// </summary>
+		[System.ComponentModel.Browsable(false),DevCoBrowsable(false),System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden),System.ComponentModel.DefaultValue(eDotNetBarStyle.OfficeXP),System.ComponentModel.Category("Appearance"),System.ComponentModel.Description("Determines the display of the item when shown.")]
+		public virtual eDotNetBarStyle Style
+		{
+			get
+			{
+				return m_Style;
+			}
+			set
+			{
+				m_Style=value;
+				if(m_SubItems!=null)
+				{
+					foreach(BaseItem objSub in m_SubItems)
+					{
+						objSub.Style=m_Style;
+					}
+				}
+				OnStyleChanged();
+			}
+		}
+        /// <summary>
+        /// Gets the effective item style.
+        /// </summary>
+        [Browsable(false)]
+        public virtual eDotNetBarStyle EffectiveStyle
+        {
+            get
+            {
+                if (Style == eDotNetBarStyle.StyleManagerControlled)
+                    return StyleManager.GetEffectiveStyle();
+                return Style;
+            }
+        }
+
+		/// <summary>
+		/// Occurs after item visual style has changed.
+		/// </summary>
+		protected virtual void OnStyleChanged(){}
+
+		/// <summary>
+		/// Occurs after text has changed.
+		/// </summary>
+		protected virtual void OnTextChanged()
+		{
+            MarkupTextChanged();
+			if(TextChanged!=null)
+				TextChanged(this,new EventArgs());
+			IOwnerItemEvents owner=this.GetIOwnerItemEvents();
+			if(owner!=null)
+				owner.InvokeItemTextChanged(this,new EventArgs());
+			this.GenerateAccessibilityEvent(System.Windows.Forms.AccessibleEvents.NameChange);
+
+			this.OnAppearanceChanged();
+		}
+
+		/// <summary>
+		/// Gets or sets whether item will display sub items.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DevCoBrowsable(true),System.ComponentModel.DefaultValue(true),System.ComponentModel.Category("Behavior"),System.ComponentModel.Description("Determines whether sub-items are displayed.")]
+		public virtual bool ShowSubItems
+		{
+			get
+			{
+				return m_ShowSubItems;
+			}
+			set
+			{
+				if(m_ShowSubItems!=value)
+				{
+					NeedRecalcSize=true;
+					m_ShowSubItems=value;
+					if(this.Displayed)
+						this.Refresh();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets item alignment inside the container.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DevCoBrowsable(true),System.ComponentModel.DefaultValue(eItemAlignment.Near),System.ComponentModel.Category("Appearance"),System.ComponentModel.Description("Determines alignment of the item inside the container.")]
+		public virtual eItemAlignment ItemAlignment
+		{
+			get
+			{
+				return m_ItemAlignment;
+			}
+			set
+			{
+				if(m_ItemAlignment!=value)
+				{
+					m_ItemAlignment=value;
+					NeedRecalcSize=true;
+					if(this.Displayed && this.Parent!=null)
+						this.Parent.SubItemSizeChanged(this);
+                    if (this.DesignMode)
+                    {
+                        OnAppearanceChanged();
+                        Refresh();
+                    }
+				}
+			}
+		}
+
+		/// <summary>
+		/// Returns if passed control is valid.
+		/// </summary>
+		/// <param name="objCtrl">Control to test.</param>
+		/// <returns></returns>
+		protected internal static bool IsHandleValid(System.Windows.Forms.Control objCtrl)
+		{
+			return (objCtrl!=null && !objCtrl.Disposing && !objCtrl.IsDisposed && objCtrl.IsHandleCreated);
+		}
+
+		/// <summary>
+		/// Resets Hoover timer.
+		/// </summary>
+		protected virtual void ResetHover()
+		{
+			System.Windows.Forms.Control objCtrl=this.ContainerControl as System.Windows.Forms.Control;
+			if(!IsHandleValid(objCtrl))
+				return;
+			// We need to reset hover thing since it is fired only first time mouse hovers inside the window and we need it for each of our items
+			NativeFunctions.TRACKMOUSEEVENT tme=new NativeFunctions.TRACKMOUSEEVENT();
+			tme.dwFlags=NativeFunctions.TME_QUERY;
+			tme.hwndTrack=objCtrl.Handle;
+			tme.cbSize=System.Runtime.InteropServices.Marshal.SizeOf(tme);
+			NativeFunctions.TrackMouseEvent(ref tme);
+			tme.dwFlags=tme.dwFlags | NativeFunctions.TME_HOVER;
+			NativeFunctions.TrackMouseEvent(ref tme);
+			objCtrl=null;
+		}
+
+		/// <summary>
+		/// Returns true if any subitem is contained on the control with a given handle.
+		/// </summary>
+		/// <param name="iHandle">Container handle to test.</param>
+		/// <returns></returns>
+		protected internal virtual bool IsAnyOnHandle(IntPtr iHandle)
+		{
+			bool bRet=false;
+			if(m_SubItems==null || m_SubItems.Count==0)
+				return bRet;
+			BaseItem objTmp=m_SubItems[0] as BaseItem;
+			System.Windows.Forms.Control objCtrl=null;
+			// Since all items are always contained on same control check the first child only
+			if(objTmp!=null)
+			{
+				objCtrl=objTmp.ContainerControl as System.Windows.Forms.Control;
+				if(objCtrl is MenuPanel && ((MenuPanel)objCtrl).PopupMenu)
+					objCtrl=objCtrl.Parent;
+                if (objCtrl != null && objCtrl.Handle == iHandle)
+                    return true;
+				objTmp=null;
+			}
+
+			foreach(BaseItem objItem in m_SubItems)
+			{
+				// Now go through each child and if it is expanded call this function to verify the handle
+				if(objItem.Expanded)
+				{
+					if(objItem.IsAnyOnHandle(iHandle))
+					{
+						bRet=true;
+						break;
+					}
+				}
+			}
+
+			return bRet;
+		}
+
+		/// <summary>
+		/// Gets or sets item description. This description is displayed in
+		/// Customize dialog to describe the item function in an application.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),DefaultValue(""),Category("Design"),Description("Indicates description of the item that is displayed during design."), Localizable(true)]
+		public virtual string Description
+		{
+			get
+			{
+			
+				return m_Description;
+			}
+			set
+			{
+				if(m_Description==value)
+					return;
+				m_Description=value;
+
+                if(ShouldSyncProperties)
+                    BarFunctions.SyncProperty(this, "Description");
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets whether the item expands automatically to fill out the remaining space inside the container. Applies to Items on stretchable, no-wrap Bars only.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DevCoBrowsable(true),System.ComponentModel.DefaultValue(false),System.ComponentModel.Category("Appearance"),System.ComponentModel.Description("Indicates whether item will stretch to consume empty space. Items on stretchable, no-wrap Bars only.")]
+		public virtual bool Stretch
+		{
+			get
+			{
+				return m_Stretch;
+			}
+			set
+			{
+				if(m_Stretch==value)
+					return;
+				m_Stretch=value;
+                if(ShouldSyncProperties)
+                    BarFunctions.SyncProperty(this, "Stretch");
+				NeedRecalcSize=true;
+				if(this.Displayed && m_Parent!=null && !m_SuspendLayout)
+				{
+					m_Parent.SubItemSizeChanged(this);
+				}
+				OnAppearanceChanged();
+			}
+		}
+
+		/// <summary>
+		/// Occurs after Tooltip text has changed.
+		/// </summary>
+		protected virtual void OnTooltipChanged(){}
+		/// <summary>
+		/// Gets/Sets informational text (tooltip) for the item.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DevCoBrowsable(true),System.ComponentModel.DefaultValue(""),System.ComponentModel.Category("Appearance"),System.ComponentModel.Description("Indicates the text that is displayed when mouse hovers over the item."),System.ComponentModel.Localizable(true)]
+		public virtual string Tooltip
+		{
+			get
+			{
+			
+				return m_Tooltip;
+			}
+            set
+            {
+                if (m_Tooltip == value)
+                    return;
+                if (value == null) value = "";
+                m_Tooltip = value;
+
+                if (this.ToolTipVisible)
+                {
+                    if (string.IsNullOrEmpty(m_Tooltip))
+                        this.HideToolTip();
+                    else
+                    {
+                        ToolTip tooltipWindow = m_ToolTipWnd;
+                        tooltipWindow.Text = m_Tooltip;
+                        tooltipWindow.ShowToolTip();
+                        tooltipWindow.Invalidate();
+                    }
+                }
+
+                if (ShouldSyncProperties)
+                    BarFunctions.SyncProperty(this, "Tooltip");
+                OnTooltipChanged();
+            }
+		}
+
+		/// <summary>
+		/// Returns category for this item. If item cannot be customzied using the
+		/// customize dialog category is empty string.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),DefaultValue(""),Category("Design"),Description("Indicates item category used to group similar items at design-time."), Localizable(true)]
+		public virtual string Category
+		{
+			get
+			{
+			
+				return m_Category;
+			}
+			set
+			{
+				m_Category=value;
+			}
+		}
+
+		/// <summary>
+		/// Returns name of the item that can be used to identify item from the code.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Design"),System.ComponentModel.Description("Indicates the name used to identify item.")]
+		public virtual string Name
+		{
+			get
+			{
+				if(this.Site!=null)
+					m_Name=this.Site.Name;
+				return m_Name;
+			}
+			set
+			{
+				if(this.Site!=null)
+					this.Site.Name=value;
+				if(value==null)
+					m_Name="";
+				else
+					m_Name=value;
+			}
+		}
+
+        /// <summary>
+        /// Gets or sets the global name of the item that is used to synchronize the Global properties for the item across all instances with same
+        /// global name. Note that only instances that belong to the same control are synchronized. GlobalItem must be set to true to perform the synchronization.
+        /// You can find more information and list of
+        /// properties that are synchronized in help file.
+        /// </summary>
+        [Browsable(true), Category("Design"), Description("Indicates global name of the item that is used to synchronize the Global properties for the item across all instances with same global name."), DefaultValue("")]
+        public virtual string GlobalName
+        {
+            get { return m_GlobalName; }
+            set { m_GlobalName = value;  }
+        }
+
+        /// <summary>
+        /// Gets whether global properties should synchronized.
+        /// </summary>
+        protected virtual bool ShouldSyncProperties
+        {
+            get { return this.GlobalItem && (this.GlobalName.Length > 0 || this.Name.Length > 0) && !m_IsOnCustomizeDialog; }
+        }
+
+		/// <summary>
+		/// Gets orientation within container that is supported by this item. If item does not support certain orientation the container automatically hides it when container switches into that orientation.
+		/// </summary>
+		[System.ComponentModel.Browsable(false)]
+		public eSupportedOrientation SupportedOrientation
+		{
+			get
+			{
+				return m_SupportedOrientation;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets whether item is global or not.
+		/// This flag is used to propagate property changes to all items with the same name.
+		/// Setting for example Visible property on the item that has GlobalItem set to true will
+		/// set visible property to the same value on all items with the same name.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DevCoBrowsable(true),System.ComponentModel.DefaultValue(true),System.ComponentModel.Category("Behavior"),System.ComponentModel.Description("Indicates whether certain global properties are propagated to all items with the same name when changed.")]
+		public virtual bool GlobalItem
+		{
+			get
+			{
+				return m_GlobalItem;
+			}
+			set
+			{
+				m_GlobalItem=value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets orientation inside the container. Do not change the value of this property. It is managed by system only.
+		/// </summary>
+		[System.ComponentModel.Browsable(false),System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
+		public virtual eOrientation Orientation
+		{
+			get
+			{
+				return m_Orientation;
+			}
+			set
+			{
+				if(m_Orientation!=value)
+				{
+                    SetOrientation(value);
+					NeedRecalcSize=true;
+				}
+			}
+		}
+
+        /// <summary>
+        /// Sets orientation of the item but it does not cause the recalculate layout flag setting on the parent item.
+        /// </summary>
+        /// <param name="o">New orientation value.</param>
+        internal void SetOrientation(eOrientation o)
+        {
+            if (m_Orientation != o)
+            {
+                m_Orientation = o;
+                if (m_SubItems != null)
+                {
+                    foreach (BaseItem objItem in m_SubItems)
+                    {
+                        objItem.Orientation = m_Orientation;
+                    }
+                }
+                m_NeedRecalcSize = true;
+            }
+        }
+
+		/// <summary>
+		/// Destroys tooltip window.
+		/// </summary>
+		internal protected void HideToolTip()
+		{
+			if(m_ToolTipWnd!=null)
+			{
+				System.Drawing.Rectangle tipRect=m_ToolTipWnd.Bounds;
+				tipRect.Width+=5;
+				tipRect.Height+=6;
+				
+				OnTooltip(false);
+                OnToolTipVisibleChanged(new EventArgs());
+				try
+				{
+					if(m_ToolTipWnd!=null)
+					{
+						m_ToolTipWnd.Hide();
+						m_ToolTipWnd.Dispose();
+						m_ToolTipWnd=null;
+					}
+				}
+				catch{}
+
+				if(this.ContainerControl!=null)
+				{
+					System.Windows.Forms.Control ctrl=this.ContainerControl as System.Windows.Forms.Control;
+					if(ctrl!=null)
+						ctrl.Invalidate(ctrl.RectangleToClient(tipRect),false);
+				}
+			}
+		}
+
+        private void OnToolTipVisibleChanged(EventArgs eventArgs)
+        {
+            EventHandler h = ToolTipVisibleChanged;
+            if (h != null)
+                ToolTipVisibleChanged(this, eventArgs);
+        }
+
+        internal BaseItem HotSubItem
+        {
+            get
+            {
+                return m_HotSubItem;
+            }
+            set
+            {
+                BaseItem oldValue = m_HotSubItem;
+                m_HotSubItem = value;
+                if (oldValue != value)
+                    OnHotSubItemChanged(value, oldValue);
+            }
+        }
+        /// <summary>
+        /// Called when HotSubItem has changed.
+        /// </summary>
+        /// <param name="newValue">New value.</param>
+        /// <param name="oldValue">Old value.</param>
+        protected virtual void OnHotSubItemChanged(BaseItem newValue, BaseItem oldValue)
+        {
+        }
+
+        /// <summary>
+		/// Shows tooltip for this item.
+		/// </summary>
+		public virtual void ShowToolTip()
+		{
+			if(m_DesignMode)
+				return;
+
+			if(m_Visible && m_Displayed && !m_Expanded)
+			{
+				IOwner owner=this.GetOwner() as IOwner;
+				if(owner!=null && !owner.ShowToolTips || !this.ShowToolTips)
+					return;
+                Control container = this.ContainerControl as Control;
+                if (container is Bar && !((Bar)container).ShowToolTips)
+					return;
+
+                if (container is MenuPanel && !((MenuPanel)container).ShowToolTips)
+					return;
+
+				OnTooltip(true);
+				if(m_Tooltip!="")
+				{
+					if(m_ToolTipWnd==null)
+						m_ToolTipWnd=new ToolTip();
+                    m_ToolTipWnd.Style = EffectiveStyle;
+					m_ToolTipWnd.Text=m_Tooltip;
+					if(owner!=null && owner.ShowShortcutKeysInToolTips && m_Shortcuts!=null && m_Shortcuts.Count>0)
+                        m_ToolTipWnd.Text+=(" ("+GetTooltipShortcutString()+")");
+					IOwnerItemEvents ownerEvents=this.GetIOwnerItemEvents();
+					if(ownerEvents!=null)
+						ownerEvents.InvokeToolTipShowing(this,new EventArgs());
+
+                    m_ToolTipWnd.ReferenceRectangle = ScreenRectangle;
+
+                    OnToolTipVisibleChanged(new EventArgs());
+					m_ToolTipWnd.ShowToolTip();
+				}
+			}
+		}
+        /// <summary>
+        /// Returns the shortcut string that is displayed on tooltip.
+        /// </summary>
+        /// <returns></returns>
+        protected virtual string GetTooltipShortcutString()
+        {
+            return this.ShortcutString;
+        }
+
+        /// <summary>
+        /// Gets whether tooltip for the item is displayed.
+        /// </summary>
+        protected virtual bool ShowToolTips
+        {
+            get { return true; }
+        }
+
+        internal virtual Rectangle ScreenRectangle
+        {
+            get
+            {
+                System.Windows.Forms.Control c = this.ContainerControl as System.Windows.Forms.Control;
+                if (c == null) return Rectangle.Empty;
+                return new Rectangle(c.PointToScreen(this.DisplayRectangle.Location), this.DisplayRectangle.Size);
+            }
+        }
+
+        /// <summary>
+        /// Returns the point in screen coordinates.
+        /// </summary>
+        /// <param name="clientPoint">Client point</param>
+        /// <returns>Point in screen coordinates if there is a parent Control otherwise clientPoint</returns>
+        public virtual Point PointToScreen(Point clientPoint)
+        {
+            Control c = this.ContainerControl as Control;
+            if (c == null) return clientPoint;
+            return c.PointToScreen(clientPoint);
+        }
+
+		/// <summary>
+		/// Gets whether tooltip is visible or not.
+		/// </summary>
+		internal protected bool ToolTipVisible
+		{
+			get
+			{
+				return (m_ToolTipWnd!=null);
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the name of the bar this item originated on. This is used to remember the
+		/// originating bar when user is moving the items from bar to bar.
+		/// </summary>
+		internal string OriginalBarName
+		{
+			get {return m_OriginalBarName;}
+			set {m_OriginalBarName=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets item's original position (index) if item position has changed due to the user customization.
+		/// </summary>
+		internal int OriginalPosition
+		{
+			get {return m_OriginalPosition;}
+			set {m_OriginalPosition=value;}
+		}
+
+        /// <summary>
+        /// Gets or sets flag that indicates whether item was customize by the end-user.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool UserCustomized
+        {
+            get { return m_UserCustomized; }
+            set { m_UserCustomized = value; }
+        }
+
+		/// <summary>
+		/// Gets reference to the tooltip control if tooltip is displayed for this item.
+		/// </summary>
+		[System.ComponentModel.Browsable(false)]
+		public ToolTip ToolTipControl
+		{
+			get {return m_ToolTipWnd;}
+		}
+
+        /// <summary>
+        /// Gets or sets the Key Tips access key or keys for the item when on Ribbon Control or Ribbon Bar. Use KeyTips property
+        /// when you want to assign the one or more letters to be used to access an item. For example assigning the FN to KeyTips property
+        /// will require the user to press F then N keys to select an item. Pressing the F letter will show only keytips for the items that start with letter F.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), DefaultValue(""), Description("Indicates the Key Tips access key or keys for the item when on Ribbon Control or Ribbon Bar.")]
+        public virtual string KeyTips
+        {
+            get { return m_KeyTips; }
+            set
+            {
+                if (value == null) value = "";
+                m_KeyTips = value.ToUpper();
+            }
+        }
+
+		/// <summary>
+		/// Gets or sets the text associated with this item.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),Category("Appearance"),Description("The text contained in the item."),Localizable(true),DefaultValue(""), Bindable(true)]
+		public virtual string Text
+		{
+			get
+			{
+				return m_Text;
+			}
+			set
+			{
+				if(m_Text==value)
+					return;
+				if(value==null)
+					m_Text="";
+				else
+					m_Text=value;
+				m_AccessKey=NativeFunctions.GetAccessKey(m_Text);
+
+                if(ShouldSyncProperties)
+                    BarFunctions.SyncProperty(this, "Text");
+
+				NeedRecalcSize=true;
+				if(this.Displayed && m_Parent!=null && !m_SuspendLayout)
+				{
+					RecalcSize();
+					m_Parent.SubItemSizeChanged(this);
+				}
+
+				this.OnTextChanged();
+				OnAppearanceChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets whether item can be customized by end user.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DevCoBrowsable(true),System.ComponentModel.DefaultValue(true),System.ComponentModel.Category("Behavior"),System.ComponentModel.Description("Indicates whether item can be customized by user.")]
+		public virtual bool CanCustomize
+		{
+			get
+			{
+				return m_CanCustomize;
+			}
+			set
+			{
+				m_CanCustomize=value;
+			}
+		}
+
+		/// <summary>
+		/// Returns whether item is hosted on Customize menu.
+		/// </summary>
+		protected internal bool IsOnCustomizeMenu
+		{
+			get
+			{
+				return m_IsOnCustomizeMenu;
+			}
+		}
+
+		internal void SetIsOnCustomizeMenu(bool b)
+		{
+			if(m_IsOnCustomizeMenu!=b)
+			{
+				m_IsOnCustomizeMenu=b;
+				OnIsOnCustomizeMenuChanged();
+			}
+		}
+
+		public override string ToString()
+		{
+			return m_Text;
+		}
+
+		/// <summary>
+		/// Returns whether item is hosted on Customize Dialog.
+		/// </summary>
+		protected internal bool IsOnCustomizeDialog
+		{
+			get
+			{
+				return m_IsOnCustomizeDialog;
+			}
+		}
+
+		internal void SetIsOnCustomizeDialog(bool b)
+		{
+			if(m_IsOnCustomizeDialog!=b)
+			{
+				m_IsOnCustomizeDialog=b;
+				OnIsOnCustomizeDialogChanged();
+			}
+		}
+
+		/// <summary>
+		/// Returns whether item is hosted on menu or not.
+		/// </summary>
+		[System.ComponentModel.Browsable(false)]
+		public bool IsOnMenu
+		{
+			get
+			{
+				if(this.ContainerControl is MenuPanel || this.ContainerControl is ItemsListBox)
+					return true;
+				else
+					return false;
+			}
+		}
+
+		/// <summary>
+		/// Returns whether item is hosted on menu bar or not.
+		/// </summary>
+		[System.ComponentModel.Browsable(false)]
+		public virtual bool IsOnMenuBar
+		{
+			get
+			{
+				System.Windows.Forms.Control ctrl=this.ContainerControl as System.Windows.Forms.Control;
+				if(ctrl!=null && ctrl is Bar)
+					return ((Bar)ctrl).MenuBar;
+				return false;
+			}
+		}
+
+		/// <summary>
+		/// Returns whether item is hosted on bar or not.
+		/// </summary>
+		[System.ComponentModel.Browsable(false)]
+		public bool IsOnBar
+		{
+			get
+			{
+				System.Windows.Forms.Control ctrl=this.ContainerControl as System.Windows.Forms.Control;
+				if(ctrl!=null && ctrl is Bar)
+					return true;
+				return false;
+			}
+		}
+
+		/// <summary>
+		/// Returns whether item is in design mode or not.
+		/// </summary>
+		[System.ComponentModel.Browsable(false),DevCoBrowsable(false)]
+		public virtual bool DesignMode
+		{
+			get
+			{
+				return m_DesignMode;
+			}
+		}
+
+		[System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+		public void SetDesignMode(bool b)
+		{
+			if(m_DesignMode!=b)
+			{
+				m_DesignMode=b;
+				if(m_SubItems!=null)
+				{
+					foreach(BaseItem objItem in m_SubItems)
+						objItem.SetDesignMode(m_DesignMode);
+				}
+				if(m_HotSubItem!=null)
+				{
+					m_HotSubItem.InternalMouseLeave();
+                    HotSubItem = null;
+				}
+				OnDesignModeChanged();
+			}
+		}
+
+		/// <summary>
+		/// Get or sets whether item has been changed in a way that it needs its size recalculated. This is internal
+		/// property and it should not be used by your code.
+		/// </summary>
+		[Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public virtual bool NeedRecalcSize
+		{
+			get
+			{
+				return m_NeedRecalcSize;
+			}
+			set
+			{
+				m_NeedRecalcSize=value;
+				if(value && this.Parent!=null && this.ContainerControl == this.Parent.ContainerControl)
+				{
+					this.Parent.NeedRecalcSize=true;
+				}
+			}
+		}
+		
+
+		/// <summary>
+		/// Returns whether item is System item.
+		/// </summary>
+		[System.ComponentModel.Browsable(false)]
+		public bool SystemItem
+		{
+			get
+			{
+				return m_SystemItem;
+			}
+		}
+
+		internal void SetSystemItem(bool b)
+		{
+			m_SystemItem=b;
+		}
+
+        private bool _AccessKeyEnabled = true;
+        /// <summary>
+        /// Indicates whether access key processing set using ampersand key in Text is enabled. When enabled, and access key is pressed, item will raise Click event.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether access key processing set using ampersand key in Text is enabled. When enabled, and access key is pressed, item will raise Click event.")]
+        public bool AccessKeyEnabled
+        {
+            get { return _AccessKeyEnabled; }
+            set
+            {
+                _AccessKeyEnabled = value;
+            }
+        }
+        
+
+		/// <summary>
+		/// Return Access key for the item.
+		/// </summary>
+		protected internal char AccessKey
+		{
+			get
+			{
+				return m_AccessKey;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the collection of shortcut keys associated with the item.
+		/// </summary>
+        [System.ComponentModel.Browsable(true), DevCoBrowsable(true), System.ComponentModel.Category("Design"), System.ComponentModel.Description("Indicates list of shortcut keys for this item."), System.ComponentModel.Editor("DevComponents.DotNetBar.Design.ShortcutsDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), System.ComponentModel.TypeConverter("DevComponents.DotNetBar.Design.ShortcutsConverter, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf"), System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Content)]
+		public virtual ShortcutsCollection Shortcuts
+		{
+			get
+			{
+				if(m_Shortcuts==null)
+					m_Shortcuts=new ShortcutsCollection(this);
+				return m_Shortcuts;
+			}
+			set
+			{
+				IOwner owner=this.GetOwner() as IOwner;
+				if(m_Shortcuts!=null && owner!=null)
+                    owner.RemoveShortcutsFromItem(this);
+                m_Shortcuts=value;
+				m_Shortcuts.Parent=this;
+				if(m_Shortcuts!=null && owner!=null)
+					owner.AddShortcutsFromItem(this);
+			}
+		}
+
+		/// <summary>
+		/// Returns text representation of shortcut for this item.
+		/// </summary>
+		protected internal string ShortcutString
+		{
+			get 
+			{
+                return m_ShortcutString;
+			}
+		}
+
+        internal void RefreshShortcutString()
+        {
+            m_ShortcutString = "";
+            if (m_Shortcuts == null || m_Shortcuts.Count == 0)
+                return;
+            System.Windows.Forms.KeysConverter objConv = new System.Windows.Forms.KeysConverter();
+            m_ShortcutString = objConv.ConvertToString((System.Windows.Forms.Keys)m_Shortcuts[0]);
+        }
+
+		/// <summary>
+		/// Collapses all sub items by setting their Expanded property to false.
+		/// </summary>
+		/// <param name="item">Item to collapse.</param>
+		public static void CollapseSubItems(BaseItem item)
+		{
+			if(item==null && item.SubItems.Count==0)
+				return;
+            BaseItem[] subItems = new BaseItem[item.SubItems.Count];
+            item.SubItems.CopyTo(subItems, 0);
+            foreach (BaseItem o in subItems)
+                if (o.Expanded)
+                    o.Expanded = false;
+		}
+
+        /// <summary>
+        /// Collapses all sub items by setting their Expanded property to false. Enumerates all child items as well.
+        /// </summary>
+        /// <param name="item">Item to collapse.</param>
+        public static void CollapseSubItemsTree(BaseItem item)
+        {
+            if (item == null && item.SubItems.Count == 0)
+                return;
+            BaseItem[] subItems = new BaseItem[item.SubItems.Count];
+            item.SubItems.CopyTo(subItems, 0);
+            foreach (BaseItem o in subItems)
+            {
+                CollapseSubItemsTree(o);
+                if (o.Expanded)
+                    o.Expanded = false;
+            }
+        }
+
+		/// <summary>
+		/// Collapses whole tree for the item starting with its parent.
+		/// </summary>
+		/// <param name="objItem">Item to collapse.</param>
+		public static void CollapseAll(BaseItem objItem)
+		{
+			if(objItem==null)
+				return;
+
+			do
+			{
+				System.Windows.Forms.Control objCtrl=objItem.ContainerControl as System.Windows.Forms.Control;
+                if (objCtrl is MenuPanel)
+                {
+                    if (objItem.Parent != null)
+                        objItem = objItem.Parent;
+                }
+                else if (objCtrl is Bar)
+                {
+                    if (((Bar)objCtrl).ParentInternal == null)
+                        break;
+                    objItem = ((Bar)objCtrl).ParentItem;
+                }
+                else if (objItem is RadialMenuContainer && objItem.Parent != null)
+                {
+                    break;
+                }
+                else if (objItem.Parent != null)
+                    objItem = objItem.Parent;
+			} while (objItem!=null && objItem.Parent!=null);
+
+			if(objItem!=null)
+			{
+				objItem.Expanded=false;
+				objItem.AutoExpand=false;
+				if(objItem.Parent!=null)
+					objItem.Parent.AutoExpand=false;
+			}
+		}
+
+		/// <summary>
+		/// Returns whether item is hosted on popup menu or bar.
+		/// </summary>
+		/// <param name="item">Item to get information for.</param>
+		/// <returns></returns>
+		public static bool IsOnPopup(BaseItem item)
+		{
+			if(item==null)
+				return false;
+			object objCont=item.ContainerControl;
+			if(objCont==null)
+				return false;
+			if(objCont is MenuPanel)
+				return true;
+            if(objCont is Bar)
+			{
+				if(((Bar)objCont).BarState==eBarState.Popup)
+					return true;
+			}
+            if (objCont is RadialMenuPopup) return true;
+
+			return false;
+		}
+
+		/// <summary>
+		/// Gets or sets whether Click event will be auto repeated when mouse button is kept pressed over the item.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DevCoBrowsable(true),System.ComponentModel.DefaultValue(false),System.ComponentModel.Category("Behavior"),System.ComponentModel.Description("Gets or sets whether Click event will be auto repeated when mouse button is kept pressed over the item.")]
+		public virtual bool ClickAutoRepeat
+		{
+			get
+			{
+				return m_ClickAutoRepeat;
+			}
+			set
+			{
+                m_ClickAutoRepeat=value;                
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the auto-repeat interval for the click event when mouse button is kept pressed over the item.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DevCoBrowsable(true),System.ComponentModel.DefaultValue(600),System.ComponentModel.Category("Behavior"),System.ComponentModel.Description("Gets or sets the auto-repeat interval for the click event when mouse button is kept pressed over the item.")]
+		public virtual int ClickRepeatInterval
+		{
+			get
+			{
+				return m_ClickRepeatInterval;
+			}
+			set
+			{
+				m_ClickRepeatInterval=value;                
+			}
+		}
+
+		/// <summary>
+		/// Serves as a hash function for a particular type, suitable for use in hashing algorithms and data structures like a hash table.
+		/// </summary>
+		/// <returns>Hash code.</returns>
+		public override int GetHashCode()
+		{
+			return m_Id;
+		}
+
+		internal eDesignInsertPosition DesignInsertMarker
+		{
+			get {return m_DesignInsertMarker;}
+			set
+			{
+				if(m_DesignInsertMarker==value)
+					return;
+				m_DesignInsertMarker=value;
+				//if(this.DesignMode)
+				this.Refresh();
+			}
+		}
+
+        private eDesignMarkerOrientation _DesignMarkerOrientation = eDesignMarkerOrientation.NotSet;
+        /// <summary>
+        /// Gets or sets the design-marker orientation for the item.
+        /// </summary>
+        protected internal virtual eDesignMarkerOrientation DesignMarkerOrientation
+        {
+            get
+            {
+                return _DesignMarkerOrientation;
+            }
+            set
+            {
+                _DesignMarkerOrientation = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets whether design-time item drag & drop marker is horizontal.
+        /// </summary>
+		internal bool IsDesignMarkHorizontal
+		{
+			get
+			{
+                if (_DesignMarkerOrientation != eDesignMarkerOrientation.NotSet)
+                    return _DesignMarkerOrientation == eDesignMarkerOrientation.Horizontal;
+
+                if (this.Parent is ItemContainer)
+                {
+                    if (((ItemContainer)this.Parent).LayoutOrientation == eOrientation.Horizontal)
+                        return true;
+                    else
+                        return false;
+                }
+                else if (this.Parent is SimpleItemContainer)
+                {
+                    if (((SimpleItemContainer)this.Parent).LayoutOrientation == eOrientation.Horizontal)
+                        return true;
+                    else
+                        return false;
+                }
+
+				if(m_Orientation==eOrientation.Horizontal && !this.IsOnMenu && !(this.Parent is SideBarPanelItem) && !(this.Parent is ExplorerBarGroupItem))
+					return true;
+                
+				return false;
+			}
+		}
+
+        protected virtual bool ShouldDrawInsertMarker()
+        {
+            IOwner owner = GetOwner() as IOwner;
+            
+            return m_DesignInsertMarker != eDesignInsertPosition.None && this.Visible && this.Displayed &&
+                   (owner != null && !owner.DragInProgress && !this.DesignMode);
+        }
+
+		protected internal void DrawInsertMarker(System.Drawing.Graphics g)
+		{
+            if (!ShouldDrawInsertMarker())
+                return;
+
+            Color lineColor = ColorScheme.GetColor("834DD5");
+            Color fillColor = ColorScheme.GetColor("CCCFF8");
+
+            int size = 4;
+            int lineThickness = 1;
+            int padding = 2;
+
+			if(IsDesignMarkHorizontal)
+			{
+                Point start = new Point(m_Rect.X, m_Rect.Y + padding), end = new Point(m_Rect.X, m_Rect.Bottom - (padding + 1));
+                if (m_DesignInsertMarker == eDesignInsertPosition.After)
+                {
+                    start = new Point(m_Rect.Right - size * 2, m_Rect.Y + padding);
+                    end = new Point(m_Rect.Right - size * 2, m_Rect.Bottom - (padding+1));
+                }
+
+                using (SolidBrush fillBrush = new SolidBrush(fillColor))
+                {
+                    using (Pen pen = new Pen(lineColor, 1))
+                    {
+                        using (GraphicsPath path = new GraphicsPath())
+                        {
+                            path.AddLine(start.X, start.Y + size, start.X + size, start.Y);
+                            path.AddLine(start.X + size * 2, start.Y + size, start.X + (size * 2 - (size - lineThickness)), start.Y + size);
+                            path.AddLine(end.X + (size * 2 - (size - lineThickness)), end.Y - size, end.X + size * 2, end.Y - size);
+                            path.AddLine(end.X + size, end.Y, end.X, end.Y - size);
+                            path.AddLine(end.X + (size - lineThickness), end.Y - size, start.X + (size - lineThickness), start.Y + size);
+                            path.CloseAllFigures();
+
+                            g.FillPath(fillBrush, path);
+                            g.DrawPath(pen, path);
+                        }
+                    }
+                }
+			}
+			else
+			{
+                Point start = new Point(m_Rect.X + padding, m_Rect.Y), end = new Point(m_Rect.Right - (padding+1), m_Rect.Y);
+                if (m_DesignInsertMarker == eDesignInsertPosition.After)
+                {
+                    start = new Point(m_Rect.X + padding, m_Rect.Bottom - (size * 2 + 1));
+                    end = new Point(m_Rect.Right - (padding + 1), m_Rect.Bottom - (size * 2 + 1));
+                }
+
+                using (SolidBrush fillBrush = new SolidBrush(fillColor))
+                {
+                    using (Pen pen = new Pen(lineColor, 1))
+                    {
+                        using (GraphicsPath path = new GraphicsPath())
+                        {
+                            path.AddLine(start.X, start.Y + size, start.X + size, start.Y);
+                            path.AddLine(start.X + size, start.Y + (size - lineThickness), end.X - size, end.Y + (size - lineThickness));
+                            path.AddLine(end.X - size, end.Y, end.X, end.Y + size);
+                            path.AddLine(end.X - size, end.Y + size * 2, end.X - size, end.Y + (size*2 - (size-padding)));
+                            path.AddLine(start.X + size, start.Y + (size * 2 - (size - padding)), start.X + size, start.Y + size * 2);
+
+                            path.CloseAllFigures();
+
+                            g.FillPath(fillBrush, path);
+                            g.DrawPath(pen, path);
+                        }
+                    }
+                }
+                //if(m_DesignInsertMarker==eDesignInsertPosition.Before)
+                //{
+                //    p[0].X=m_Rect.Left+1;
+                //    p[0].Y=m_Rect.Top;
+                //    p[1].X=m_Rect.Left+1;
+                //    p[1].Y=m_Rect.Top+4;
+                //    g.DrawLines(pen,p);
+
+                //    p[0].X=m_Rect.Left+1;
+                //    p[0].Y=m_Rect.Top+2;
+                //    p[1].X=m_Rect.Right-1;
+                //    p[1].Y=m_Rect.Top+2;
+                //    g.DrawLines(pen,p);
+
+                //    p[0].X=m_Rect.Right-1;
+                //    p[0].Y=m_Rect.Top;
+                //    p[1].X=m_Rect.Right-1;
+                //    p[1].Y=m_Rect.Top+4;
+                //    g.DrawLines(pen,p);
+                //}
+                //else
+                //{
+                //    p[0].X=m_Rect.Left+1;
+                //    p[0].Y=m_Rect.Bottom-4;
+                //    p[1].X=m_Rect.Left+1;
+                //    p[1].Y=m_Rect.Bottom;
+                //    g.DrawLines(pen,p);
+
+                //    p[0].X=m_Rect.Left+1;
+                //    p[0].Y=m_Rect.Bottom-2;
+                //    p[1].X=m_Rect.Right-1;
+                //    p[1].Y=m_Rect.Bottom-2;
+                //    g.DrawLines(pen,p);
+
+                //    p[0].X=m_Rect.Right-1;
+                //    p[0].Y=m_Rect.Bottom-4;
+                //    p[1].X=m_Rect.Right-1;
+                //    p[1].Y=m_Rect.Bottom;
+                //    g.DrawLines(pen,p);
+                //}
+			}
+            //g.SmoothingMode = sm;
+		}
+
+		/// <summary>
+		/// Specifes the mouse cursor displayed when mouse is over the item.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DevCoBrowsable(true),System.ComponentModel.DefaultValue(null),System.ComponentModel.Category("Appearance"),System.ComponentModel.Description("Specifies the mouse cursor displayed when mouse is over the item.")]
+		public virtual System.Windows.Forms.Cursor Cursor
+		{
+			get
+			{
+				return m_Cursor;
+			}
+			set
+			{
+				if(m_Cursor!=value)
+				{
+					m_Cursor=value;
+					if(m_Cursor!=null && m_Visible && m_Displayed)
+					{
+                        System.Windows.Forms.Control cont=this.ContainerControl as System.Windows.Forms.Control;
+						if(cont!=null)
+						{
+							System.Drawing.Point p=cont.PointToClient(System.Windows.Forms.Control.MousePosition);
+							if(m_Rect.Contains(p))
+								cont.Cursor=m_Cursor;
+						}
+					}
+				}
+			}
+		}
+
+		[System.ComponentModel.Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public override System.ComponentModel.ISite Site
+		{
+			get
+			{
+                return base.Site;
+			}
+			set
+			{
+				base.Site = value;
+                OnSiteChanged();
+			}
+		}
+
+        protected virtual void OnSiteChanged()
+        {
+            
+        }
+
+		/// <summary>
+		/// Indicates whether item will be Serialized.
+		/// </summary>
+		[System.ComponentModel.Browsable(false),DevCoBrowsable(false),System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never),System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
+		public bool ShouldSerialize
+		{
+			get
+			{
+				return m_ShouldSerialize;
+			}
+			set
+			{
+				m_ShouldSerialize=value;
+			}
+		}
+
+		internal bool IsThemed
+		{
+			get
+			{
+				if(m_ThemeAware && BarFunctions.ThemedOS && Themes.ThemesActive && !BarFunctions.IsWindows8)
+					return true;
+				return false;
+			}
+		}
+
+		[System.ComponentModel.Browsable(false),System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+		public virtual bool IsWindowed
+		{
+			get {return false;}
+		}
+
+		/// <summary>
+		/// Specifies whether item is drawn using Themes when running on OS that supports themes like Windows XP.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),DefaultValue(false),Category("Appearance"),Description("Specifies whether item is drawn using Themes when running on OS that supports themes like Windows XP.")]
+		public virtual bool ThemeAware
+		{
+			get
+			{
+				return m_ThemeAware;
+			}
+			set
+			{
+				m_ThemeAware=value;
+				if(m_SubItems!=null)
+				{
+					foreach(BaseItem item in m_SubItems)
+						item.ThemeAware=value;
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets the AccessibleObject assigned to the item.
+		/// </summary>
+		[System.ComponentModel.Browsable(false),DevCoBrowsable(false)]
+		public virtual System.Windows.Forms.AccessibleObject AccessibleObject
+		{
+			get 
+			{
+				return CreateAccessibilityInstance(); //m_Accessible;
+			}
+		}
+
+        private ItemAccessibleObject _ItemAccessibleObject = null;
+		protected virtual System.Windows.Forms.AccessibleObject CreateAccessibilityInstance()
+		{
+            if (_ItemAccessibleObject == null)
+                _ItemAccessibleObject = new ItemAccessibleObject(this);
+            return _ItemAccessibleObject;
+		}
+
+		/// <summary>
+		/// Gets or sets the default action description of the control for use by accessibility client applications.
+		/// </summary>
+		[DevCoBrowsable(true),System.ComponentModel.Browsable(true),System.ComponentModel.Category("Accessibility"),System.ComponentModel.DefaultValue(""),System.ComponentModel.Description("Gets or sets the default action description of the control for use by accessibility client applications.")]
+		public virtual string AccessibleDefaultActionDescription
+		{
+			get {return m_AccessibleDefaultActionDescription;}
+			set {m_AccessibleDefaultActionDescription=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets the description of the control used by accessibility client applications.
+		/// </summary>
+		[DevCoBrowsable(true),System.ComponentModel.Browsable(true),System.ComponentModel.Category("Accessibility"),System.ComponentModel.DefaultValue(""),System.ComponentModel.Description("Gets or sets the description of the control used by accessibility client applications.")]
+		public virtual string AccessibleDescription
+		{
+			get {return m_AccessibleDescription;}
+			set
+			{
+				if(m_AccessibleDescription!=value)
+				{
+					m_AccessibleDescription=value;
+					GenerateAccessibilityEvent(System.Windows.Forms.AccessibleEvents.DescriptionChange);
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the name of the control used by accessibility client applications.
+		/// </summary>
+		[DevCoBrowsable(true),System.ComponentModel.Browsable(true),System.ComponentModel.Category("Accessibility"),System.ComponentModel.Description("Gets or sets the name of the control used by accessibility client applications."),System.ComponentModel.DefaultValue("")]
+		public virtual string AccessibleName
+		{
+			get {return m_AccessibleName;}
+			set
+			{
+				if(m_AccessibleName!=value)
+				{
+					m_AccessibleName=value;
+					GenerateAccessibilityEvent(System.Windows.Forms.AccessibleEvents.NameChange);
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the accessible role of the item.
+		/// </summary>
+		[DevCoBrowsable(true),System.ComponentModel.Browsable(true),System.ComponentModel.Category("Accessibility"),System.ComponentModel.Description("Gets or sets the accessible role of the item."),System.ComponentModel.DefaultValue(System.Windows.Forms.AccessibleRole.Default)]
+		public virtual System.Windows.Forms.AccessibleRole AccessibleRole
+		{
+			get {return m_AccessibleRole;}
+			set {m_AccessibleRole=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets a value indicating whether the item is visible to accessibility applications.
+		/// </summary>
+		[DevCoBrowsable(false),System.ComponentModel.Browsable(false),System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
+		public virtual bool IsAccessible
+		{
+			get {return m_IsAccessible;}
+			set {m_IsAccessible=value;}
+		}
+
+		internal void GenerateAccessibilityEvent(System.Windows.Forms.AccessibleEvents e)
+		{
+			if(this.ContainerControl is Bar && ((Bar)this.ContainerControl).m_AccessibleObjectCreated)
+			{
+				Bar.BarAccessibleObject a=((Bar)this.ContainerControl).AccessibilityObject as Bar.BarAccessibleObject;
+				if(a!=null)
+					a.GenerateEvent(this,e);
+			}
+//			else if(this.ContainerControl is PopupMenu && ((PopupMenu)this.ContainerControl).m_AccessibleObjectCreated)
+//			{
+//				PopupMenu.PopupMenuAccessibleObject a=((PopupMenu)this.ContainerControl).AccessibilityObject as PopupMenu.PopupMenuAccessibleObject;
+//				if(a!=null)
+//					a.GenerateEvent(this,e);
+//			}
+		}
+        internal bool _AccessibleExpandAction = false;
+		internal virtual void DoAccesibleDefaultAction()
+		{
+			if(this.VisibleSubItems>0 && (this.IsOnMenu || this.IsOnMenuBar || _AccessibleExpandAction))
+			{
+				if(this.Expanded)
+				{
+					this.Expanded=false;
+					if(this.Parent!=null && this.IsOnMenuBar)
+						this.Parent.AutoExpand=false;
+				}
+				else
+				{
+					if(this.IsOnMenuBar && this.Parent!=null)
+						this.Parent.AutoExpand=true;
+					this.Expanded=true;
+				}
+				this.Refresh();
+                _AccessibleExpandAction = false;
+			}
+			else
+				this.RaiseClick(eEventSource.Keyboard);
+        }
+
+        private eContainerState _ContainerState = eContainerState.NotSet;
+        /// <summary>
+        /// Gets the item state inside of the parent container.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public eContainerState ContainerState
+        {
+            get { return _ContainerState; }
+            internal set { _ContainerState = value; }
+        }
+
+        private Point _DragStartPoint;
+        internal Point DragStartPoint
+        {
+            get { return _DragStartPoint; }
+            set
+            {
+                if (value != _DragStartPoint)
+                {
+                    Point oldValue = _DragStartPoint;
+                    _DragStartPoint = value;
+                    OnDragStartPointChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when DragStartPoint property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnDragStartPointChanged(Point oldValue, Point newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("DragStartPoint"));
+        }
+        private bool _AllowDrop = true;
+        internal bool AllowDrop
+        {
+            get { return _AllowDrop; }
+            set
+            {
+                _AllowDrop = value;
+            }
+        }
+
+        protected void InvokeDelayed(MethodInvoker method)
+        {
+            InvokeDelayed(method, 10);
+        }
+        protected void InvokeDelayed(MethodInvoker method, int delayInterval)
+        {
+            Timer delayedInvokeTimer = new Timer();
+            delayedInvokeTimer = new Timer();
+            delayedInvokeTimer.Tag = method;
+            delayedInvokeTimer.Interval = delayInterval;
+            delayedInvokeTimer.Tick += new EventHandler(DelayedInvokeTimerTick);
+            delayedInvokeTimer.Start();
+        }
+        void DelayedInvokeTimerTick(object sender, EventArgs e)
+        {
+            Timer timer = (Timer)sender;
+            MethodInvoker method = (MethodInvoker)timer.Tag;
+            timer.Stop();
+            timer.Dispose();
+            if (!this.IsDisposed)
+                method.Invoke();
+        }
+
+        private DevComponents.DotNetBar.Padding _Margin = new DevComponents.DotNetBar.Padding(0);
+        /// <summary>
+        /// Gets or sets item margin only used by certain items in certain containers. Provided only for internal DotNetBar use.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never), Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public DevComponents.DotNetBar.Padding Margin
+        {
+            get { return _Margin; }
+            set { _Margin = value; }
+        }
+        #endregion
+
+        #region ICommandSource Members
+        protected virtual void ExecuteCommand()
+        {
+            if (_Command == null) return;
+            if (_Command is Command && ((Command)_Command).IsSyncingCommand) return;
+
+            CommandManager.ExecuteCommand(this);
+        }
+
+        internal void ExecuteCommandInternal()
+        {
+            ExecuteCommand();
+        }
+
+        /// <summary>
+        /// Gets or sets the command assigned to the item. Default value is null.
+        /// <remarks>Note that for ButtonItem instances if this property is set to null and command was assigned previously, Enabled property will be set to false automatically to disable the item.</remarks>
+        /// </summary>
+        [DefaultValue(null), Category("Commands"), Description("Indicates the command assigned to the item.")]
+        public virtual Command Command
+        {
+            get { return (Command)((ICommandSource)this).Command; }
+            set
+            {
+                ((ICommandSource)this).Command = value;
+                if (ShouldSyncProperties)
+                    BarFunctions.SyncProperty(this, "Command");
+            }
+        }
+
+        private ICommand _Command = null;
+        //[System.ComponentModel.Browsable(false), System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
+        ICommand ICommandSource.Command
+        {
+            get
+            {
+                return _Command;
+            }
+            set
+            {
+                bool changed = false;
+                if (_Command != value)
+                    changed = true;
+
+                if (_Command != null)
+                    CommandManager.UnRegisterCommandSource(this, _Command);
+                _Command = value;
+                if (value != null)
+                    CommandManager.RegisterCommand(this, value);
+                if (changed)
+                    OnCommandChanged();
+            }
+        }
+        /// <summary>
+        /// Called when Command property value changes.
+        /// </summary>
+        protected virtual void OnCommandChanged()
+        {
+        }
+
+        private object _CommandParameter = null;
+        /// <summary>
+        /// Gets or sets user defined data value that can be passed to the command when it is executed.
+        /// </summary>
+        [Browsable(true), DefaultValue(null), Category("Commands"), Description("Indicates user defined data value that can be passed to the command when it is executed."), System.ComponentModel.TypeConverter(typeof(System.ComponentModel.StringConverter)), System.ComponentModel.Localizable(true)]
+        public virtual object CommandParameter
+        {
+            get
+            {
+                return _CommandParameter;
+            }
+            set
+            {
+                _CommandParameter = value;
+                if (ShouldSyncProperties)
+                    BarFunctions.SyncProperty(this, "CommandParameter");
+            }
+        }
+
+        #endregion
+
+        #region ItemAccessibleObject
+        public class ItemAccessibleObject: System.Windows.Forms.AccessibleObject
+		{
+			private BaseItem m_Owner=null;
+			private bool m_Hot=false;
+			public ItemAccessibleObject(BaseItem owner)
+			{
+				m_Owner = owner;
+				m_Owner.MouseEnter+=new EventHandler(OnMouseEnter);
+                m_Owner.MouseLeave+=new EventHandler(OnMouseLeave);
+			}
+
+			protected virtual void OnMouseEnter(object sender, System.EventArgs e)
+			{
+				m_Hot=true;
+			}
+
+            protected virtual void OnMouseLeave(object sender, System.EventArgs e)
+			{
+				m_Hot=false;
+			}
+
+            internal BaseItem Owner
+            {
+                get { return m_Owner; }
+            }
+
+			public override string Name 
+			{
+				get 
+				{
+					if(m_Owner==null)
+						return"";
+
+					if(m_Owner.AccessibleName!="")
+						return m_Owner.AccessibleName;
+
+					if(m_Owner.Text!=null)
+						return m_Owner.Text.Replace("&", "");
+					
+					return m_Owner.Tooltip;
+				}
+				set
+				{
+					m_Owner.AccessibleName=value;
+				}
+			}
+
+			public override string Description
+			{
+				get 
+				{ 
+					if(m_Owner==null)
+						return "";
+					if(m_Owner.AccessibleDescription!="")
+						return m_Owner.AccessibleDescription;
+					if (m_Owner.IsOnMenu)
+						return Name + " menu item"; 
+					else if(m_Owner.IsOnMenuBar)
+						return Name + " menu"; 
+					else
+						return Name + " button"; 
+				}
+			}
+
+			public override System.Windows.Forms.AccessibleRole Role
+			{
+				get 
+				{
+					if(m_Owner==null || !m_Owner.IsAccessible)
+						return System.Windows.Forms.AccessibleRole.None;
+
+					if(m_Owner.AccessibleRole!=System.Windows.Forms.AccessibleRole.Default)
+						return m_Owner.AccessibleRole;
+					BaseItem topParent=m_Owner;
+					while(topParent.Parent!=null)
+						topParent=topParent.Parent;
+					return (m_Owner.IsOnMenu || m_Owner.IsOnMenuBar || topParent.IsOnMenuBar ? 
+						System.Windows.Forms.AccessibleRole.MenuItem : 
+						System.Windows.Forms.AccessibleRole.PushButton); 
+				}
+			}
+
+			public override System.Windows.Forms.AccessibleStates State
+			{
+				get 
+				{ 
+					if(m_Owner==null)
+						return System.Windows.Forms.AccessibleStates.Unavailable;
+					//System.Diagnostics.Trace.WriteLine("Getting state for "+m_Owner.Text);
+					System.Windows.Forms.AccessibleStates state=0;
+
+					if(!m_Owner.IsAccessible)
+						return System.Windows.Forms.AccessibleStates.Unavailable;
+
+					if(!m_Owner.Displayed || !m_Owner.Visible)
+						state |= System.Windows.Forms.AccessibleStates.Invisible;
+                    else if (!m_Owner.GetEnabled())
+					{
+						state=System.Windows.Forms.AccessibleStates.Unavailable;
+						if(m_Owner.Expanded || m_Hot || m_Owner is ButtonItem && ((ButtonItem)m_Owner).IsMouseOver)
+							state|=(System.Windows.Forms.AccessibleStates.HotTracked | System.Windows.Forms.AccessibleStates.Focused);
+						return state;
+					}
+					else
+					{
+						if(m_Owner.Expanded || m_Hot || m_Owner is ButtonItem && ((ButtonItem)m_Owner).IsMouseOver)
+							state |= (System.Windows.Forms.AccessibleStates.Focused | System.Windows.Forms.AccessibleStates.HotTracked);
+						else
+							state |= System.Windows.Forms.AccessibleStates.Focusable;
+						if(m_Owner.ShowSubItems && m_Owner.SubItems.Count>0)
+						{
+							if(m_Owner.Expanded)
+								state|=System.Windows.Forms.AccessibleStates.Expanded;
+							else
+								state|=System.Windows.Forms.AccessibleStates.Collapsed;
+						}
+					}
+					
+
+//					if(m_Owner.SubItems.Count>0 && m_Owner.ShowSubItems)
+//						state|=(System.Windows.Forms.AccessibleStates)0x40000000;
+
+					return state;
+				}
+			}
+
+			/*public override string Value
+			{
+				get { return m_owner.AccessibleRole; }
+				set { m_owner.AccessibleRole = value; }
+			}*/
+
+			public override System.Windows.Forms.AccessibleObject Parent 
+			{
+				get	
+				{
+					if(m_Owner==null)
+						return null;
+					if(m_Owner.Parent!=null)
+					{
+						if(!(m_Owner.Parent is GenericItemContainer && ((GenericItemContainer)m_Owner.Parent).SystemContainer))
+							return m_Owner.Parent.AccessibleObject;
+					}
+
+					System.Windows.Forms.Control control=m_Owner.ContainerControl as System.Windows.Forms.Control;
+					if(control!=null)
+						return control.AccessibilityObject;
+					return null;
+				}
+			}
+
+			public override System.Drawing.Rectangle Bounds 
+			{
+				get 
+				{ 
+					if(m_Owner==null)
+						return System.Drawing.Rectangle.Empty;
+
+					System.Windows.Forms.Control objCtrl=m_Owner.ContainerControl as System.Windows.Forms.Control;
+					if (objCtrl != null)
+						return objCtrl.RectangleToScreen(m_Owner.DisplayRectangle);
+					else
+						return m_Owner.m_Rect; 
+				}
+			}
+
+			public override int GetChildCount()
+			{
+				if(m_Owner==null)
+					return 0;
+				return m_Owner.SubItems.Count;
+			}
+
+			public override System.Windows.Forms.AccessibleObject GetChild(int iIndex)
+			{
+                if (m_Owner == null || iIndex < 0 || iIndex >= m_Owner.SubItems.Count)
+                    return null;
+				return m_Owner.SubItems[iIndex].AccessibleObject;
+			}
+
+			public override string DefaultAction 
+			{
+				get
+				{
+					if(m_Owner.AccessibleDefaultActionDescription!="")
+						return m_Owner.AccessibleDefaultActionDescription;
+					return "Press";
+				}
+			}
+
+			public override void DoDefaultAction()
+			{
+				if(m_Owner==null)
+					return;
+
+				System.Windows.Forms.Control cont=m_Owner.ContainerControl as System.Windows.Forms.Control;
+				if(cont is MenuPanel && !(cont is IAccessibilitySupport))
+				{
+					cont=((MenuPanel)cont).ParentItem.ContainerControl as System.Windows.Forms.Control;
+				}
+
+                IAccessibilitySupport ias = cont as IAccessibilitySupport;
+				if(ias!=null)
+				{
+					ias.DoDefaultActionItem=m_Owner;
+					NativeFunctions.PostMessage(cont.Handle,NativeFunctions.WM_USER+107,IntPtr.Zero,IntPtr.Zero);
+				}
+				
+				base.DoDefaultAction();
+			}
+
+			public override string KeyboardShortcut
+			{
+				get
+				{
+					return m_Owner.ShortcutString;
+				}
+			}
+
+            public override System.Windows.Forms.AccessibleObject GetSelected()
+            {
+                if (m_Owner == null)
+                    return base.GetSelected();
+                foreach (BaseItem item in m_Owner.SubItems)
+                {
+                    if ((item.AccessibleObject.State & System.Windows.Forms.AccessibleStates.HotTracked) == System.Windows.Forms.AccessibleStates.HotTracked)
+                        return item.AccessibleObject;
+                }
+
+                return base.GetSelected();
+            }
+
+            public override System.Windows.Forms.AccessibleObject HitTest(int x, int y)
+            {
+                if (m_Owner == null)
+                    return base.HitTest(x, y);
+
+                Point screen=new Point(x,y);
+                foreach (BaseItem item in m_Owner.SubItems)
+                {
+                    System.Windows.Forms.Control cont = item.ContainerControl as System.Windows.Forms.Control;
+                    if (cont != null)
+                    {
+                        Point p = cont.PointToClient(screen);
+                        if (item.DisplayRectangle.Contains(p))
+                            return item.AccessibleObject;
+                    }
+                }
+
+                return base.HitTest(x, y);
+            }
+
+            public override System.Windows.Forms.AccessibleObject Navigate(System.Windows.Forms.AccessibleNavigation navdir)
+            {
+                if (m_Owner == null)
+                    return base.Navigate(navdir);
+                
+                BaseItem item = null;
+
+                if (navdir == System.Windows.Forms.AccessibleNavigation.Down || navdir == System.Windows.Forms.AccessibleNavigation.Right)
+                {
+                    if (m_Owner.Parent != null)
+                    {
+                        BaseItem parent = m_Owner.Parent;
+                        item = GetFirstVisible(parent.SubItems, parent.SubItems.IndexOf(m_Owner) + 1);
+                    }
+                }
+                else if (navdir == System.Windows.Forms.AccessibleNavigation.Next)
+                {
+                    if (m_Owner != null && m_Owner.Parent != null)
+                    {
+                        int index = m_Owner.Parent.SubItems.IndexOf(m_Owner);
+                        if (index < m_Owner.Parent.SubItems.Count - 1)
+                            item = m_Owner.Parent.SubItems[index + 1];
+                    }
+                }
+                else if (navdir == System.Windows.Forms.AccessibleNavigation.Previous)
+                {
+                    if (m_Owner != null && m_Owner.Parent != null)
+                    {
+                        int index = m_Owner.Parent.SubItems.IndexOf(m_Owner);
+                        if (index > 0)
+                            item = m_Owner.Parent.SubItems[index - 1];
+                    }
+                }
+                else if (navdir == System.Windows.Forms.AccessibleNavigation.FirstChild)
+                {
+                    item = GetFirstVisible(m_Owner.SubItems, 0);
+                }
+                else if (navdir == System.Windows.Forms.AccessibleNavigation.LastChild)
+                {
+                    item = GetFirstVisibleReverse(m_Owner.SubItems, m_Owner.SubItems.Count - 1);
+                }
+                else if (navdir == System.Windows.Forms.AccessibleNavigation.Up)
+                {
+                    if (m_Owner != null && m_Owner.Parent.IsContainer && m_Owner.Parent.SystemItem)
+                    {
+                        Control container = m_Owner.Parent.ContainerControl as Control;
+                        if (container != null) return container.AccessibilityObject;
+                    }
+                    if (m_Owner.Parent != null) return m_Owner.Parent.AccessibleObject;
+                }
+                else if (navdir == System.Windows.Forms.AccessibleNavigation.Left)
+                {
+                    BaseItem parent = m_Owner.Parent;
+                    item = GetFirstVisibleReverse(m_Owner.SubItems, parent.SubItems.IndexOf(m_Owner) - 1);
+                }
+
+                if (item != null)
+                    return item.AccessibleObject;
+
+                return base.Navigate(navdir);
+            }
+
+            private BaseItem GetFirstVisible(SubItemsCollection col, int startIndex)
+            {
+                int count = col.Count;
+                if (count == 0) return null;
+                if (startIndex >= col.Count) startIndex = col.Count - 1;
+                for (int i = startIndex; i < count; i++)
+                {
+                    if (col[i].Visible)
+                        return col[i];
+                }
+                return null;
+            }
+
+            private BaseItem GetFirstVisibleReverse(SubItemsCollection col, int startIndex)
+            {
+                if (col.Count == 0) return null;
+                if (startIndex >= col.Count) startIndex = col.Count - 1;
+                for (int i = startIndex; i >= 0; i--)
+                {
+                    if (col[i].Visible)
+                        return col[i];
+                }
+                return null;
+            }
+            
+        }
+        #endregion
+
+        #region Markup Implementation
+        private TextMarkup.BodyElement m_TextMarkup = null;
+
+        private void MarkupTextChanged()
+        {
+            if (m_TextMarkup != null)
+                m_TextMarkup.HyperLinkClick -= TextMarkupLinkClick;
+
+            m_TextMarkup = null;
+
+            if (!IsMarkupSupported)
+                return;
+
+            if (!TextMarkup.MarkupParser.IsMarkup(ref m_Text))
+                return;
+
+            m_TextMarkup = TextMarkup.MarkupParser.Parse(m_Text);
+
+            if(m_TextMarkup!=null)
+                m_TextMarkup.HyperLinkClick += TextMarkupLinkClick;
+        }
+
+        /// <summary>
+        /// Occurs when text markup link is clicked.
+        /// </summary>
+        protected virtual void TextMarkupLinkClick(object sender, EventArgs e) {}
+
+        /// <summary>
+        /// Gets reference to parsed markup body element if text was markup otherwise returns null.
+        /// </summary>
+        internal TextMarkup.BodyElement TextMarkupBody
+        {
+            get { return m_TextMarkup; }
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void TextMarkupBodyMeasure(Size size, DevComponents.DotNetBar.TextMarkup.MarkupDrawContext d)
+        {
+            TextMarkupBody.InvalidateElementsSize();
+            TextMarkupBody.Measure(size, d);
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void TextMarkupBodyArrange(Rectangle r, DevComponents.DotNetBar.TextMarkup.MarkupDrawContext d)
+        {
+            TextMarkupBody.Arrange(r, d);
+        }
+        [EditorBrowsable(EditorBrowsableState.Never), Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public Rectangle TextMarkupBodyBounds
+        {
+            get
+            {
+                if (TextMarkupBody == null) return Rectangle.Empty;
+                return TextMarkupBody.Bounds;
+            }
+            set
+            {
+                TextMarkupBody.Bounds = value;
+            }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void TextMarkupBodyRender(DevComponents.DotNetBar.TextMarkup.MarkupDrawContext d)
+        {
+            TextMarkupBody.Render(d);
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never), Browsable(false)]
+        public bool IsUsingTextMarkup
+        {
+            get
+            {
+                return m_TextMarkup != null;
+            }
+        }
+
+        /// <summary>
+        /// Gets plain text without text-markup if text-markup is used in Text.
+        /// </summary>
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public string PlainText
+        {
+            get
+            {
+                return m_TextMarkup != null ? m_TextMarkup.PlainText : Text;
+            }
+        }
+
+        /// <summary>
+        /// Gets whether item supports text markup. Default is false.
+        /// </summary>
+        protected virtual bool IsMarkupSupported
+        {
+            get { return false; }
+        }
+        #endregion
+
+        #region IBindableComponent Members
+#if FRAMEWORK20
+        private BindingContext _BindingContext = null;
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Advanced), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public BindingContext BindingContext
+        {
+            get
+            {
+                if (_BindingContext != null) return _BindingContext;
+                Control container = this.ContainerControl as Control;
+                if (container != null)
+                {
+                    if (container is MenuPanel)
+                    {
+                        object owner = this.GetOwner();
+                        if (owner is DotNetBarManager && ((DotNetBarManager)owner).ParentForm != null)
+                            return ((DotNetBarManager)owner).ParentForm.BindingContext;
+                        else if (owner is Control)
+                            return ((Control)owner).BindingContext;
+                    }
+                    else
+                        return container.BindingContext;
+                }
+                else
+                {
+                    object owner = this.GetOwner();
+                    if (owner is DotNetBarManager && ((DotNetBarManager)owner).ParentForm != null)
+                        return ((DotNetBarManager)owner).ParentForm.BindingContext;
+                    else if (owner is Control)
+                    {
+                        return ((Control)owner).BindingContext;
+                    }
+                }
+
+                return null;
+            }
+            set
+            {
+                _BindingContext = value;
+                UpdateBindings();
+            }
+        }
+
+        /// <summary>
+        /// Updates data bindings for item and its sub-items in response to binding context change on parent control.
+        /// </summary>
+        public void UpdateBindings()
+        {
+            if(_DataBindings!=null)
+            {
+                BindingContext context = this.BindingContext;
+                for (int i = 0; i < _DataBindings.Count; i++)
+                {
+                    BindingContext.UpdateBinding(context, _DataBindings[i]);
+                }
+            }
+            if (m_SubItems != null)
+            {
+                foreach (BaseItem item in m_SubItems)
+                {
+                    item.UpdateBindings();
+                }
+            }
+        }
+
+        private ControlBindingsCollection _DataBindings = null;
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content), Category("Data"), ParenthesizePropertyName(true), RefreshProperties(RefreshProperties.All)]
+        public ControlBindingsCollection DataBindings
+        {
+            get 
+            {
+                if (_DataBindings == null)
+                {
+                    _DataBindings = new ControlBindingsCollection(this);
+                }
+                return _DataBindings;
+            }
+        }
+#endif
+        #endregion
+
+        #region Invoke Support
+        /// <summary>
+        /// Gets a value indicating whether the caller must call an invoke method when making method calls to the item because the caller is on a different thread than the one the item was created on.
+        /// This property calls directly the ContainerControl.InvokeRequired and is provided as shortcut convinience property only.
+        /// </summary>
+        [Browsable(false)]
+        public bool InvokeRequired 
+        {
+            get
+            {
+                Control parent = this.ContainerControl as Control;
+                if (parent != null) return parent.InvokeRequired;
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// Executes the specified delegate, on the thread that owns the control's underlying window handle, with the specified list of arguments.
+        /// This property calls directly the ContainerControl.Invoke and is provided as shortcut convenience property only.
+        /// </summary>
+        /// <param name="method">A delegate to a method that takes parameters of the same number and type that are contained in the args parameter.</param>
+        /// <param name="args">An array of objects to pass as arguments to the specified method. This parameter can be null reference (Nothing in Visual Basic) if the method takes no arguments.</param>
+        /// <returns>An Object that contains the return value from the delegate being invoked, or nullNothingnullptra null reference (Nothing in Visual Basic) if the delegate has no return value.</returns>
+        public Object Invoke(Delegate method,Object[] args)
+        {
+            Control parent = this.ContainerControl as Control;
+            if (parent == null || parent.IsDisposed) return null;
+            return parent.Invoke(method, args);
+        }
+
+        /// <summary>
+        /// Executes the specified delegate, on the thread that owns the control's underlying window handle, with the specified list of arguments.
+        /// This property calls directly the ContainerControl.Invoke and is provided as shortcut convenience property only.
+        /// </summary>
+        /// <param name="method">A delegate to a method that takes parameters of the same number and type that are contained in the args parameter.</param>
+        /// <returns>An Object that contains the return value from the delegate being invoked, or nullNothingnullptra null reference (Nothing in Visual Basic) if the delegate has no return value.</returns>
+        public Object Invoke(Delegate method)
+        {
+            Control parent = this.ContainerControl as Control;
+            if (parent == null || parent.IsDisposed) return null;
+            return parent.Invoke(method);
+        }
+        /// <summary>
+        /// Executes the specified delegate, on the thread that owns the control's underlying window handle, with the specified list of arguments.
+        /// This property calls directly the ContainerControl.BeginInvoke and is provided as shortcut convenience property only.
+        /// </summary>
+        /// <param name="method">A delegate to a method that takes parameters of the same number and type that are contained in the args parameter.</param>
+        /// <returns>An Object that contains the return value from the delegate being invoked, or nullNothingnullptra null reference (Nothing in Visual Basic) if the delegate has no return value.</returns>
+        public Object BeginInvoke(Delegate method)
+        {
+            Control parent = this.ContainerControl as Control;
+            if (parent == null || parent.IsDisposed) return null;
+            return parent.BeginInvoke(method);
+        }
+        #endregion
+
+        #region IComparable Members
+
+        int IComparable.CompareTo(object obj)
+        {
+            if (obj == null) return 1;
+
+            BaseItem targetItem = obj as BaseItem;
+            if (targetItem != null)
+                return string.Compare(this.Text, targetItem.Text);
+            else
+                throw new ArgumentException("Object is not a BaseItem");
+        }
+
+        #endregion
+    }
+
+    /// <summary>
+    /// Defines item parent container states.
+    /// </summary>
+    public enum eContainerState
+    {
+        /// <summary>
+        /// State is not set.
+        /// </summary>
+        NotSet,
+        /// <summary>
+        /// Item in on the NavigationPane in normal size.
+        /// </summary>
+        NavigationPane,
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/BaseItemController.cs b/PROMS/DotNetBar Source Code/BaseItemController.cs
new file mode 100644
index 00000000..66b346b5
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/BaseItemController.cs	
@@ -0,0 +1,161 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.Rendering;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Drawing.Text;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represents the controller which allows single BaseItem to be hosted on the control.
+    /// </summary>
+    internal class BaseItemController : IDisposable
+    {
+        #region Constructor
+        private BaseItem _Item = null;
+        private Control _ParentControl = null;
+
+        /// <summary>
+        /// Initializes a new instance of the BaseItemController class.
+        /// </summary>
+        /// <param name="item"></param>
+        /// <param name="parentControl"></param>
+        public BaseItemController(BaseItem item, Control parentControl)
+        {
+            _Item = item;
+            _ParentControl = parentControl;
+            _ParentControl.MouseDown += new MouseEventHandler(ParentControlMouseDown);
+            _ParentControl.MouseEnter += new EventHandler(ParentControlMouseEnter);
+            _ParentControl.MouseMove += new MouseEventHandler(ParentControlMouseMove);
+            _ParentControl.MouseUp += new MouseEventHandler(ParentControlMouseUp);
+            _ParentControl.MouseLeave += new EventHandler(ParentControlMouseLeave);
+            _ParentControl.Paint += new PaintEventHandler(ParentControlPaint);
+            _Item.ContainerControl = _ParentControl;
+        }
+
+        #endregion
+
+        #region Implementation
+        public BaseItem Item
+        {
+            get
+            {
+                return _Item;
+            }
+        }
+        void ParentControlPaint(object sender, PaintEventArgs e)
+        {
+            if (_Item.NeedRecalcSize)
+            {
+                _Item.RecalcSize();
+            }
+            _Item.Displayed = true;
+            Graphics g = e.Graphics;
+            SmoothingMode sm = g.SmoothingMode;
+            TextRenderingHint th = g.TextRenderingHint;
+            g.SmoothingMode = SmoothingMode.AntiAlias;
+            g.TextRenderingHint = DisplayHelp.AntiAliasTextRenderingHint; 
+            _Item.Paint(GetItemPaintArgs(g));
+            g.SmoothingMode = sm;
+            g.TextRenderingHint = th;
+        }
+
+        void ParentControlMouseLeave(object sender, EventArgs e)
+        {
+            if (_MouseOver)
+            {
+                _Item.InternalMouseLeave();
+                _MouseOver = false;
+            }
+        }
+
+        void ParentControlMouseUp(object sender, MouseEventArgs e)
+        {
+            _Item.InternalMouseUp(e);
+        }
+
+        void ParentControlMouseMove(object sender, MouseEventArgs e)
+        {
+            if (_Item.Bounds.Contains(e.Location))
+            {
+                if (!_MouseOver)
+                {
+                    _Item.InternalMouseEnter();
+                    _MouseOver = true;
+                }
+                _Item.InternalMouseMove(e);
+            }
+            else if (_MouseOver)
+            {
+                _Item.InternalMouseLeave();
+                _MouseOver = false;
+            }
+        }
+        private bool _MouseOver = false;
+        void ParentControlMouseEnter(object sender, EventArgs e)
+        {
+            Point p = _ParentControl.PointToClient(Control.MousePosition);
+
+            if (_Item.Bounds.Contains(p))
+                _Item.InternalMouseEnter();
+        }
+
+        void ParentControlMouseDown(object sender, MouseEventArgs e)
+        {
+            if (_Item.Bounds.Contains(e.Location))
+                _Item.InternalMouseDown(e);
+        }
+
+        private ItemPaintArgs GetItemPaintArgs(Graphics g)
+        {
+            ItemPaintArgs pa = new ItemPaintArgs(null, _ParentControl, g, GetColorScheme());
+            pa.Renderer = this.GetRenderer();
+            pa.ButtonStringFormat = pa.ButtonStringFormat & ~(pa.ButtonStringFormat & eTextFormat.SingleLine);
+            pa.ButtonStringFormat |= (eTextFormat.WordBreak | eTextFormat.EndEllipsis);
+            return pa;
+        }
+
+        private ColorScheme GetColorScheme()
+        {
+            BaseRenderer r = GetRenderer();
+            if (r is Office2007Renderer)
+                return ((Office2007Renderer)r).ColorTable.LegacyColors;
+            return new ColorScheme(eDotNetBarStyle.StyleManagerControlled);
+        }
+        private Rendering.BaseRenderer m_DefaultRenderer = null;
+        private Rendering.BaseRenderer m_Renderer = null;
+        private eRenderMode m_RenderMode = eRenderMode.Global;
+        /// <summary>
+        /// Returns the renderer control will be rendered with.
+        /// </summary>
+        /// <returns>The current renderer.</returns>
+        public virtual Rendering.BaseRenderer GetRenderer()
+        {
+            return Rendering.GlobalManager.Renderer;
+        }
+        #endregion
+
+        #region IDisposable Members
+
+        public void Dispose()
+        {
+            if (_ParentControl != null)
+            {
+                _ParentControl.MouseDown -= new MouseEventHandler(ParentControlMouseDown);
+                _ParentControl.MouseEnter -= new EventHandler(ParentControlMouseEnter);
+                _ParentControl.MouseMove -= new MouseEventHandler(ParentControlMouseMove);
+                _ParentControl.MouseUp -= new MouseEventHandler(ParentControlMouseUp);
+                _ParentControl.MouseLeave -= new EventHandler(ParentControlMouseLeave);
+                _ParentControl.Paint -= new PaintEventHandler(ParentControlPaint);
+                _Item.ContainerControl = null;
+                _Item = null;
+                _ParentControl = null;
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/BaseItemDesigner.cs b/PROMS/DotNetBar Source Code/BaseItemDesigner.cs
new file mode 100644
index 00000000..3a2cac92
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/BaseItemDesigner.cs	
@@ -0,0 +1,258 @@
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.ComponentModel.Design;
+using System.Drawing;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Represents designer for BaseItem objects and derived classes.
+	/// </summary>
+	public class BaseItemDesigner:System.ComponentModel.Design.ComponentDesigner,IDesignerServices
+	{
+		#region Internal Implementation
+		/// <summary>
+		/// Creates new instance of the class.
+		/// </summary>
+		public BaseItemDesigner()
+		{
+		}
+
+		public override void Initialize(IComponent component) 
+		{
+			base.Initialize(component);
+			if(!component.Site.DesignMode)
+				return;
+
+			ISelectionService ss =(ISelectionService)GetService(typeof(ISelectionService));
+			if(ss!=null)
+				ss.SelectionChanged+=new EventHandler(OnSelectionChanged);
+
+			BaseItem c=component as BaseItem;
+			if(c!=null)
+				this.Visible=c.Visible;
+
+			// If our component is removed we need to clean-up
+			IComponentChangeService cc=(IComponentChangeService)GetService(typeof(IComponentChangeService));
+			if(cc!=null)
+			{
+				cc.ComponentRemoved+=new ComponentEventHandler(this.OnComponentRemoved);
+			}
+		}
+		protected override void Dispose(bool disposing)
+		{
+			ISelectionService ss =(ISelectionService)GetService(typeof(ISelectionService));
+			if(ss!=null)
+				ss.SelectionChanged-=new EventHandler(OnSelectionChanged);
+
+			IComponentChangeService cc=(IComponentChangeService)GetService(typeof(IComponentChangeService));
+			if(cc!=null)
+			{
+				cc.ComponentRemoved-=new ComponentEventHandler(this.OnComponentRemoved);
+			}
+
+			base.Dispose(disposing);
+		}
+
+		private void OnComponentRemoved(object sender,ComponentEventArgs e)
+		{
+			if(e.Component is BaseItem)
+			{
+				BaseItem parent=this.Component as BaseItem;
+				BaseItem item=e.Component as BaseItem;
+				if(item!=null && parent!=null && parent.SubItems.Contains(item))
+				{
+					IComponentChangeService cc=(IComponentChangeService)GetService(typeof(IComponentChangeService));
+					if(cc!=null)
+						cc.OnComponentChanging(parent,TypeDescriptor.GetProperties(parent)["SubItems"]);
+					parent.SubItems.Remove(item);
+					if(cc!=null)
+						cc.OnComponentChanged(parent,TypeDescriptor.GetProperties(parent)["SubItems"],null,null);
+					this.RecalcLayout();
+				}
+			}
+		}
+
+		private void OnSelectionChanged(object sender, EventArgs e) 
+		{
+			ISelectionService ss = (ISelectionService)sender;
+			if(ss!=null && ss.PrimarySelection!=this.Component && ss.PrimarySelection is BaseItem)
+			{
+				BaseItem item=this.Component as BaseItem;
+				if(item!=null)
+				{
+					BaseItem selected=ss.PrimarySelection as BaseItem;
+					IOwner owner=item.GetOwner() as IOwner;
+					if(owner!=null)
+					{
+						if(owner.GetItem(selected.Name)!=selected)
+							owner.SetFocusItem(null);
+					}
+				}
+			}
+		}
+
+		public override DesignerVerbCollection Verbs 
+		{
+			get 
+			{
+				DesignerVerb[] verbs = new DesignerVerb[]
+					{
+						new DesignerVerb("Create Button", new EventHandler(CreateButton)),
+						new DesignerVerb("Create Text Box", new EventHandler(CreateTextBox)),
+						new DesignerVerb("Create Combo Box", new EventHandler(CreateComboBox)),
+						new DesignerVerb("Create Label", new EventHandler(CreateLabel)),
+				};
+				return new DesignerVerbCollection(verbs);
+			}
+		}
+
+		protected virtual void CreateButton(object sender, EventArgs e)
+		{
+			CreateNewItem(typeof(ButtonItem));
+		}
+
+		protected virtual void CreateComboBox(object sender, EventArgs e)
+		{
+			CreateNewItem(typeof(ComboBoxItem));
+		}
+
+		protected virtual void CreateLabel(object sender, EventArgs e)
+		{
+			CreateNewItem(typeof(LabelItem));
+		}
+
+		protected virtual void CreateTextBox(object sender, EventArgs e)
+		{
+			CreateNewItem(typeof(TextBoxItem));
+		}
+
+		protected virtual void CreateNewItem(Type itemType)
+		{
+			BaseItem parent=this.Component as BaseItem;
+			System.ComponentModel.Design.IDesignerHost dh=(System.ComponentModel.Design.IDesignerHost)GetService(typeof(System.ComponentModel.Design.IDesignerHost));
+			System.ComponentModel.Design.IComponentChangeService change=this.GetService(typeof(System.ComponentModel.Design.IComponentChangeService)) as IComponentChangeService;
+			if(change!=null)
+				change.OnComponentChanging(this.Component,TypeDescriptor.GetProperties(parent).Find("SubItems",true));
+			BaseItem item=dh.CreateComponent(itemType) as BaseItem;
+			if(item==null)
+				return;
+			item.Text=item.Name;
+			BeforeNewItemAdded(item);
+			parent.SubItems.Add(item);
+			AfterNewItemAdded(item);
+			if(change!=null)
+				change.OnComponentChanged(this.Component,TypeDescriptor.GetProperties(parent).Find("SubItems",true),null,null);
+			
+			this.RecalcLayout();
+		}
+
+		protected virtual void BeforeNewItemAdded(BaseItem item) {}
+
+		protected virtual void AfterNewItemAdded(BaseItem item) {}
+
+		protected virtual void RecalcLayout()
+		{
+			BaseItem item=this.Component as BaseItem;
+			System.Windows.Forms.Control control=item.ContainerControl as System.Windows.Forms.Control;
+			
+			if(control is Bar)
+				((Bar)control).RecalcLayout();
+			else if(control is ExplorerBar)
+				((ExplorerBar)control).RecalcLayout();
+			else if(control is BarBaseControl)
+				((BarBaseControl)control).RecalcLayout();
+			else if(control is SideBar)
+				((SideBar)control).RecalcLayout();
+		}
+
+		public override System.Collections.ICollection AssociatedComponents
+		{
+			get
+			{
+				System.Collections.ArrayList components=new System.Collections.ArrayList();
+				BaseItem parent=this.Component as BaseItem;
+				if(parent==null)
+					return base.AssociatedComponents;
+				parent.SubItems.CopyTo(components);
+				return components;
+			}
+		}
+
+		protected override void PreFilterProperties(IDictionary properties)
+		{
+			base.PreFilterProperties(properties);
+			properties["Visible"] = TypeDescriptor.CreateProperty(typeof(BaseItemDesigner),(PropertyDescriptor)properties["Visible"], new Attribute[]
+				{
+					new DefaultValueAttribute(true),
+					new BrowsableAttribute(true),
+					new CategoryAttribute("Layout")});
+			properties["CanCustomize"] = TypeDescriptor.CreateProperty(typeof(BaseItemDesigner),(PropertyDescriptor)properties["CanCustomize"], new Attribute[]
+				{
+					new DefaultValueAttribute(true),
+					new BrowsableAttribute(true),
+					new CategoryAttribute("Behavior"),
+					new DescriptionAttribute("Indicates whether item can be customized by user.")});
+		}
+
+		/// <summary>
+		/// Gets or sets whether item can be customized by end user.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DevCoBrowsable(true),System.ComponentModel.DefaultValue(true),System.ComponentModel.Category("Behavior"),System.ComponentModel.Description("Indicates whether item can be customized by user.")]
+		public virtual bool CanCustomize
+		{
+			get
+			{
+				return (bool)ShadowProperties["CanCustomize"];
+			}
+			set
+			{
+				// this value is not passed to the actual control
+				this.ShadowProperties["CanCustomize"] = value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets whether item is visible.
+		/// </summary>
+		[DefaultValue(true),Browsable(true),DevCoBrowsable(true),Category("Layout"),Description("Gets or sets whether item is visible.")]
+		public bool Visible 
+		{
+			get 
+			{
+				return (bool)ShadowProperties["Visible"];
+			}
+			set 
+			{
+				// this value is not passed to the actual control
+				this.ShadowProperties["Visible"] = value;
+			}
+		}
+		#endregion
+
+		#region IDesignerServices Implementation
+		object IDesignerServices.CreateComponent(System.Type componentClass)
+		{
+			IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+			if(dh==null)
+				return null;
+			return dh.CreateComponent(componentClass);
+		}
+
+		void IDesignerServices.DestroyComponent(IComponent c)
+		{
+			IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+			if(dh==null)
+				return;
+			dh.DestroyComponent(c);
+		}
+
+		object IDesignerServices.GetService(Type serviceType)
+		{
+			return this.GetService(serviceType);
+		}
+		#endregion
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/BindingDef.cs b/PROMS/DotNetBar Source Code/BindingDef.cs
new file mode 100644
index 00000000..6ef3f779
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/BindingDef.cs	
@@ -0,0 +1,504 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel;
+using System.Windows.Forms;
+using System.Globalization;
+using System.Drawing;
+using System.Security;
+using System.Reflection;
+using System.Collections;
+using System.ComponentModel.Design.Serialization;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Defines class which described single binding.
+    /// </summary>
+    [TypeConverter(typeof(BindingDefConverer)), DesignTimeVisible(false), ToolboxItem(false)]
+    public class BindingDef : INotifyPropertyChanged
+    {
+        #region Dependency Properties & Events
+        public event DataConvertEventHandler Format;
+        /// <summary>
+        /// Raises Format event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnFormat(DataConvertEventArgs e)
+        {
+            DataConvertEventHandler handler = Format;
+            if (handler != null)
+                handler(this, e);
+        }
+        #endregion
+
+        #region Constructor
+        /// <summary>
+        /// Initializes a new instance of the BindingDef class.
+        /// </summary>
+        public BindingDef()
+        {
+
+        }
+        /// <summary>
+        /// Initializes a new instance of the BindingDef class.
+        /// </summary>
+        /// <param name="propertyName"></param>
+        /// <param name="dataMember"></param>
+        public BindingDef(string propertyName, string dataMember)
+        {
+            _PropertyName = propertyName;
+            _PropertyPath = propertyName.Split('.');
+            _DataMember = dataMember;
+            _BindingMemberInfo = new BindingMemberInfo(dataMember);
+        }
+        #endregion
+
+        #region Implementation
+        /// <summary>
+        /// Updates specified item PropertyName with the data from data object property specified by DataMember. 
+        /// </summary>
+        /// <param name="item">Item to set PropertyName on.</param>
+        /// <param name="data">Data to retrieve DataMember value from.</param>
+        public void Update(object item, object data)
+        {
+            Update(null, item, data);
+        }
+
+        /// <summary>
+        /// Updates specified item PropertyName with the data from data object property specified by DataMember. 
+        /// </summary>
+        /// <param name="dataManager">CurrencyManager to use</param>
+        /// <param name="item">Item to set PropertyName on.</param>
+        /// <param name="data">Data to retrieve DataMember value from.</param>
+        public void Update(ItemVisualGenerator generator, object item, object data)
+        {
+            string propertyName = _PropertyName;
+
+            if (item is BaseItem && _PropertyPath.Length > 1)
+            {
+                // Dig into child items
+                BaseItem parent = (BaseItem)item;
+                for (int i = 0; i < _PropertyPath.Length - 1; i++)
+                {
+                    parent = parent.SubItems[_PropertyPath[i]];
+                }
+                item = parent;
+                propertyName = _PropertyPath[_PropertyPath.Length - 1];
+            }
+            
+            PropertyInfo targetProp = item.GetType().GetProperty(propertyName);
+            if (targetProp.PropertyType == typeof(string))
+                targetProp.SetValue(item, GetDataText(generator, data, _DataMember), null);
+            else
+                targetProp.SetValue(item, GetDataValue(generator, data, _DataMember, GetPropertyValue(generator, data, _DataMember)), null);
+        }
+
+        private static TypeConverter stringTypeConverter;
+        private string GetDataText(ItemVisualGenerator generator, object data, string fieldName)
+        {
+            object propertyValue = GetPropertyValue(generator, data, fieldName);
+            return GetDataText(generator, data, fieldName, propertyValue);
+        }
+        private string GetDataText(ItemVisualGenerator generator, object data, string fieldName, object propertyValue)
+        {
+            if (!_FormattingEnabled)
+            {
+                if (data == null)
+                {
+                    return string.Empty;
+                }
+                if (propertyValue == null)
+                {
+                    return "";
+                }
+                return Convert.ToString(propertyValue, CultureInfo.CurrentCulture);
+            }
+
+            DataConvertEventArgs e = new DataConvertEventArgs(propertyValue, typeof(string), data, fieldName);
+            this.OnFormat(e);
+            if ((e.Value != data) && (e.Value is string))
+            {
+                return (string)e.Value;
+            }
+            if (stringTypeConverter == null)
+            {
+                stringTypeConverter = TypeDescriptor.GetConverter(typeof(string));
+            }
+            try
+            {
+                return (string)FormatHelper.FormatObject(propertyValue, typeof(string), generator.GetFieldConverter(fieldName), stringTypeConverter, _FormatString, _FormatInfo, null, DBNull.Value);
+            }
+            catch (Exception ex)
+            {
+                if (ex is SecurityException || IsCriticalException(ex))
+                {
+                    throw;
+                }
+                return ((propertyValue != null) ? Convert.ToString(data, CultureInfo.CurrentCulture) : "");
+            }
+        }
+
+        private object GetDataValue(ItemVisualGenerator generator, object data, string fieldName, object propertyValue)
+        {
+            if (!_FormattingEnabled)
+            {
+                return propertyValue;
+            }
+
+            DataConvertEventArgs e = new DataConvertEventArgs(propertyValue, typeof(object), data, fieldName);
+            this.OnFormat(e);
+            return e.Value;
+        }
+
+        private static bool IsCriticalException(Exception ex)
+        {
+            return (((((ex is NullReferenceException) || (ex is StackOverflowException)) || ((ex is OutOfMemoryException) || (ex is System.Threading.ThreadAbortException))) || ((ex is ExecutionEngineException) || (ex is IndexOutOfRangeException))) || (ex is AccessViolationException));
+        }
+
+        private object GetPropertyValue(ItemVisualGenerator generator, object data, string fieldName)
+        {
+            if ((data != null) && (fieldName.Length > 0))
+            {
+                try
+                {
+                    PropertyDescriptor descriptor = null;
+                    if (generator.DataManager != null)
+                    {
+                        descriptor = generator.DataManager.GetItemProperties().Find(fieldName, true);
+                    }
+                    if(descriptor == null)
+                    {
+                        descriptor = TypeDescriptor.GetProperties(data).Find(fieldName, true);
+                    }
+                    if (descriptor != null)
+                    {
+                        data = descriptor.GetValue(data);
+                    }
+                }
+                catch
+                {
+                }
+            }
+
+            if (data == DBNull.Value && _NullValue != null)
+                return _NullValue;
+
+            return data;
+        }
+        #endregion
+
+        #region Properties
+        private string[] _PropertyPath = new string[0];
+        private string _PropertyName = "";
+        /// <summary>
+        /// Gets or sets the property name binding is attached to.
+        /// </summary>
+        [DefaultValue(""), Category("Data"), Description("Indicates property name binding is attached to.")]
+        public string PropertyName
+        {
+            get { return _PropertyName; }
+            set
+            {
+                if (value != _PropertyName)
+                {
+                    string oldValue = _PropertyName;
+                    _PropertyName = value;
+                    OnPropertyNameChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when PropertyName property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnPropertyNameChanged(string oldValue, string newValue)
+        {
+            _PropertyPath = newValue.Split('.');
+            OnPropertyChanged(new PropertyChangedEventArgs("PropertyName"));
+        }
+
+        /// <summary>
+        /// Gets the reference to BindingMemberInfo created based on DataMember.
+        /// </summary>
+        [Browsable(false)]
+        public BindingMemberInfo BindingMemberInfo
+        {
+            get
+            {
+                return _BindingMemberInfo;
+            }
+        }
+
+        private BindingMemberInfo _BindingMemberInfo;
+        private string _DataMember = "";
+        /// <summary>
+        /// Gets or sets the data member name which holds data that PropertyName is populated with.
+        /// </summary>
+        [DefaultValue(""), Category("Data"), Description("Indicates data member name which holds data that PropertyName is populated with.")]
+        public string DataMember
+        {
+            get { return _DataMember; }
+            set
+            {
+                if (value == null) value = "";
+                if (value != _DataMember)
+                {
+                    string oldValue = _DataMember;
+                    _DataMember = value;
+                    OnDataMemberChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when DataMember property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnDataMemberChanged(string oldValue, string newValue)
+        {
+            if (!string.IsNullOrEmpty(newValue))
+                _BindingMemberInfo = new BindingMemberInfo(newValue);
+            else
+                _BindingMemberInfo = new BindingMemberInfo();
+            OnPropertyChanged(new PropertyChangedEventArgs("DataMember"));
+        }
+
+        private bool _FormattingEnabled = false;
+        /// <summary>
+        /// Gets or sets whether type conversion and formatting is applied to the property data.
+        /// </summary>
+        [DefaultValue(false), Category("Data"), Description("Indicates whether type conversion and formatting is applied to the property data.")]
+        public bool FormattingEnabled
+        {
+            get { return _FormattingEnabled; }
+            set
+            {
+                if (value != _FormattingEnabled)
+                {
+                    bool oldValue = _FormattingEnabled;
+                    _FormattingEnabled = value;
+                    OnFormattingEnabledChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when FormattingEnabled property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnFormattingEnabledChanged(bool oldValue, bool newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("FormattingEnabled"));
+
+        }
+
+        private string _FormatString = "";
+        /// <summary>
+        /// Gets or sets format specifier characters that indicate how a value is to be displayed.
+        /// For more information, see Formatting Overview: http://msdn.microsoft.com/en-us/library/26etazsy%28v=vs.71%29.aspx 
+        /// </summary>
+        [DefaultValue(""), Category("Data"), Description("Indicates format specifier characters that indicate how a value is to be displayed.")]
+        public string FormatString
+        {
+            get { return _FormatString; }
+            set
+            {
+                if (value != _FormatString)
+                {
+                    string oldValue = _FormatString;
+                    _FormatString = value;
+                    OnFormatStringChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when FormatString property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnFormatStringChanged(string oldValue, string newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("FormatString"));
+
+        }
+
+        private IFormatProvider _FormatInfo = null;
+        /// <summary>
+        /// Gets or sets the IFormatProvider that provides custom formatting behavior. 
+        /// </summary>
+        [DefaultValue(null), Category("Data"), Description("Indicates IFormatProvider that provides custom formatting behavior.")]
+        public IFormatProvider FormatInfo
+        {
+            get { return _FormatInfo; }
+            set
+            {
+                if (value != _FormatInfo)
+                {
+                    IFormatProvider oldValue = _FormatInfo;
+                    _FormatInfo = value;
+                    OnFormatInfoChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when FormatInfo property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnFormatInfoChanged(IFormatProvider oldValue, IFormatProvider newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("FormatInfo"));
+
+        }
+
+        private object _NullValue = null;
+        /// <summary>
+        /// Gets or sets the Object to be set as the target property when the data source contains a DBNull value. 
+        /// The data source must contain DBNull for the NullValue property to be correctly applied. 
+        /// If the data source type is a type such as a string or integer the value of the NullValue property will be ignored. 
+        /// Also, the NullValue property is ignored if it is set to null. 
+        /// </summary>
+        [DefaultValue(null), Category("Data"), Description("Indicates Object to be set as the control property when the data source contains a DBNull value. ")]
+        [System.ComponentModel.TypeConverter(typeof(System.ComponentModel.StringConverter))]
+        public object NullValue
+        {
+            get { return _NullValue; }
+            set
+            {
+                if (value != _NullValue)
+                {
+                    object oldValue = _NullValue;
+                    _NullValue = value;
+                    OnNullValueChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when NullValue property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnNullValueChanged(object oldValue, object newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("NullValue"));
+        }
+        #endregion
+
+        #region INotifyPropertyChanged Members
+        /// <summary>
+        /// Raises the PropertyChanged event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnPropertyChanged(PropertyChangedEventArgs e)
+        {
+            PropertyChangedEventHandler handler = PropertyChanged;
+            if (handler != null) handler(this, e);
+        }
+        /// <summary>
+        /// Occurs when property on BindingDef object has changed.
+        /// </summary>
+        [Description("Occurs when property on BindingDef object has changed.Occurs when property on BindingDef object has changed.")]
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        #endregion
+    }
+
+    /// <summary>
+    /// Represents the method that will handle converting for bindings.
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    public delegate void DataConvertEventHandler(object sender, DataConvertEventArgs e);
+    public class DataConvertEventArgs : ConvertEventArgs
+    {
+        // Fields
+        private object _DataItem;
+
+        // Methods
+        public DataConvertEventArgs(object value, Type desiredType, object dataItem, string fieldName)
+            : base(value, desiredType)
+        {
+            _DataItem = dataItem;
+            _FieldName = fieldName;
+        }
+
+        /// <summary>
+        /// Gets the reference to the item being converted.
+        /// </summary>
+        public object DataItem
+        {
+            get
+            {
+                return _DataItem;
+            }
+        }
+
+        private string _FieldName = "";
+        /// <summary>
+        /// Get the reference to the name of the field or property on the item that needs conversion.
+        /// </summary>
+        public string FieldName
+        {
+            get { return _FieldName; }
+        }
+    }
+
+    /// <summary>
+    /// Represents BindingDefConverer converter.
+    /// </summary>
+    public class BindingDefConverer : TypeConverter
+    {
+        /// <summary>
+        /// Creates new instance of the class.
+        /// </summary>
+        public BindingDefConverer() { }
+
+        /// <summary>
+        /// Checks whether conversion can be made to specified type.
+        /// </summary>
+        /// <param name="context">Context Information.</param>
+        /// <param name="destinationType">Destination type.</param>
+        /// <returns></returns>
+        public override bool CanConvertTo(ITypeDescriptorContext context, Type destinationType)
+        {
+            if (destinationType == typeof(InstanceDescriptor))
+                return true;
+            return base.CanConvertTo(context, destinationType);
+        }
+
+        /// <summary>
+        /// Converts object to specified type.
+        /// </summary>
+        /// <param name="context">Context information.</param>
+        /// <param name="culture">Culture information.</param>
+        /// <param name="value">Object to convert.</param>
+        /// <param name="destinationType">Destination type.</param>
+        /// <returns>Object converted to destination type.</returns>
+        public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+        {
+            if (destinationType == null)
+                throw new ArgumentNullException("destinationType");
+
+            if ((destinationType == typeof(InstanceDescriptor)) && (value is BindingDef))
+            {
+                BindingDef info = (BindingDef)value;
+                Type[] constructorParams = null;
+                MemberInfo constructorMemberInfo = null;
+                object[] constructorValues = null;
+
+                constructorParams = new Type[] { typeof(string), typeof(string) };
+                constructorMemberInfo = typeof(BindingDef).GetConstructor(constructorParams);
+                constructorValues = new object[] { info.PropertyName, info.DataMember };
+
+                if (constructorMemberInfo != null)
+                {
+                    return new InstanceDescriptor(constructorMemberInfo, constructorValues);
+                }
+            }
+
+            return base.ConvertTo(context, culture, value, destinationType);
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/BubbleBar.bmp b/PROMS/DotNetBar Source Code/BubbleBar.bmp
new file mode 100644
index 00000000..e19d0ac5
Binary files /dev/null and b/PROMS/DotNetBar Source Code/BubbleBar.bmp differ
diff --git a/PROMS/DotNetBar Source Code/BubbleBar.cs b/PROMS/DotNetBar Source Code/BubbleBar.cs
new file mode 100644
index 00000000..8e9376af
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/BubbleBar.cs	
@@ -0,0 +1,2088 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Windows.Forms;
+using DevComponents.UI.ContentManager;
+using System.Drawing.Drawing2D;
+using System.Drawing.Text;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represents the toolbar control with the magnifying (bubbling) buttons.
+    /// </summary>
+    [ToolboxItem(true), DefaultEvent("ButtonClick"), System.Runtime.InteropServices.ComVisible(false), Designer("DevComponents.DotNetBar.Design.BubbleBarDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+    public class BubbleBar : Control, ISupportInitialize, IMessageHandlerClient
+    {
+        #region Private Variables
+        const float _falloffFactor = .3f;
+
+        private System.Windows.Forms.ImageList m_Images;
+        private System.Windows.Forms.ImageList m_ImagesLarge = null;
+        private bool m_ShowTooltips = true;
+        private eOrientation m_Orientation = eOrientation.Horizontal;
+        private System.Drawing.Size m_ImageSizeLarge = new System.Drawing.Size(48, 48);
+        private System.Drawing.Size m_ImageSizeNormal = new System.Drawing.Size(24, 24);
+        private BubbleContentManager m_ContentManager = new BubbleContentManager();
+        private BubbleButtonLayoutManager m_ButtonLayoutManager = new BubbleButtonLayoutManager();
+        private BubbleButton m_MouseOverButton = null;
+        private BubbleButton m_MouseDownButton = null;
+        private int m_AnimationTime = 100;
+        private BubbleButtonDisplayInfo m_BubbleButtonDisplayInfo = new BubbleButtonDisplayInfo();
+        private bool m_AntiAlias = true;
+        private BubbleBarOverlay m_Overlay = null;
+        private bool m_Animation = false;
+        private bool m_AnimationEnabled = true;
+        private bool m_IgnoreMouseMove = false;
+        private bool m_EnableOverlay = true;
+        private eBubbleButtonAlignment m_ButtonAlignment = eBubbleButtonAlignment.Bottom;
+        private int m_ButtonMargin = 6;
+        private Font m_TooltipFont = null;
+        private int m_MagTooltipIncrease = 0;
+        private Rectangle m_ButtonBounds = Rectangle.Empty;
+        private BubbleBarTab m_SelectedTab = null;
+        private BubbleBarTab m_MouseOverTab = null;
+        private TabColors m_SelectedTabColors = new TabColors();
+        private TabColors m_MouseOverTabColors = new TabColors();
+        private BubbleBarTabCollection m_Tabs = null;
+        private bool m_TabsVisible = true;
+        private Rectangle m_TabsBounds = Rectangle.Empty;
+        private SimpleTabLayoutManager m_TabLayoutManager = null;
+        private SimpleTabDisplay m_TabDisplay = null;
+        private SerialContentLayoutManager m_TabContentManager = null;
+        private Point m_LastMouseOverPosition = Point.Empty;
+        private BubbleButton m_IgnoreButtonMouseMove = null;
+        private ElementStyle m_ButtonBackAreaStyle = new ElementStyle();
+        private ElementStyle m_BackgroundStyle = new ElementStyle();
+        private bool m_ButtonBackgroundStretch = true;
+        private bool m_FilterInstalled = false;
+        private bool m_HasShortcuts = false;
+        private Color m_TooltipTextColor = Color.White;
+        private Color m_TooltipOutlineColor = Color.Black;
+        #endregion
+
+        #region Events
+        /// <summary>
+        /// Occurs when active tab is about to change.
+        /// </summary>
+        public event BubbleBarTabChangingEventHadler TabChanging;
+        /// <summary>
+        /// Occurs when any of the buttons is clicked. Sender object should be casted to BubbleButton to get the button that was actually clicked.
+        /// </summary>
+        public event ClickEventHandler ButtonClick;
+        /// <summary>
+        /// Occurs when mouse first enters the control and bubble effect is employed to provide feedback.
+        /// </summary>
+        public event EventHandler BubbleStart;
+        /// <summary>
+        /// Occurs when mouse leaves the control and bubble effect is ended.
+        /// </summary>
+        public event EventHandler BubbleEnd;
+        #endregion
+
+        #region Constructor
+        /// <summary>
+        /// Creates new instance of the control.
+        /// </summary>
+        public BubbleBar()
+        {
+            if (!ColorFunctions.ColorsLoaded)
+            {
+                NativeFunctions.RefreshSettings();
+                NativeFunctions.OnDisplayChange();
+                ColorFunctions.LoadColors();
+            }
+
+            this.SetStyle(ControlStyles.UserPaint, true);
+            this.SetStyle(ControlStyles.AllPaintingInWmPaint, true);
+            this.SetStyle(ControlStyles.Opaque, true);
+            this.SetStyle(ControlStyles.ResizeRedraw, true);
+            this.SetStyle(DisplayHelp.DoubleBufferFlag, true);
+            this.SetStyle(ControlStyles.SupportsTransparentBackColor, true);
+            this.SetStyle(ControlStyles.ContainerControl, false);
+            this.SetStyle(ControlStyles.Selectable, false);
+
+            m_Tabs = new BubbleBarTabCollection(this);
+
+            m_ButtonBackAreaStyle.StyleChanged += new EventHandler(ElementStyleChanged);
+            m_BackgroundStyle.StyleChanged += new EventHandler(ElementStyleChanged);
+
+            m_ContentManager.BlockSpacing = 0;
+            m_ContentManager.ContentVerticalAlignment = eContentVerticalAlignment.Bottom;
+            m_ContentManager.BlockLineAlignment = eContentVerticalAlignment.Bottom;
+            m_ContentManager.ContentOrientation = eContentOrientation.Horizontal;
+
+            m_TabLayoutManager = new SimpleTabLayoutManager();
+            m_TabDisplay = new SimpleTabDisplay();
+            m_TabContentManager = new SerialContentLayoutManager();
+
+            //m_Buttons=new BubbleButtonCollection(this);
+            m_BubbleButtonDisplayInfo.BubbleBar = this;
+            // Make sure this is JIT-ed
+            m_Overlay = new BubbleBarOverlay(this);
+            m_Overlay = null;
+
+            if (!OSFeature.Feature.IsPresent(OSFeature.LayeredWindows))
+                m_EnableOverlay = false;
+
+            ApplyButtonAlignment();
+
+            //			m_SelectedTabColors.BorderColor=Color.Black;
+            //			m_MouseOverTabColors.BorderColor=SystemColors.Highlight;
+        }
+        #endregion
+
+        #region Public Properties
+        /// <summary>
+        /// Gets or sets the bubble button tooltip text color. Default value is White color.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), Description("Indicates bubble button tooltip text color.")]
+        public Color TooltipTextColor
+        {
+            get { return m_TooltipTextColor; }
+            set { m_TooltipTextColor = value; }
+        }
+        /// <summary>
+        /// Indicates whether property should be serialized. Used by the Windows Forms design-time support.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeTooltipTextColor()
+        {
+            return m_TooltipTextColor != Color.White;
+        }
+        /// <summary>
+        /// Resets the property to default value. Used by the Windows Forms design-time support.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetTooltipTextColor()
+        {
+            TypeDescriptor.GetProperties(this)["TooltipTextColor"].SetValue(this, Color.White);
+        }
+
+        /// <summary>
+        /// Gets or sets the bubble button tooltip text outline color. Default value is Black color.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), Description("Indicates bubble button tooltip text outline color.")]
+        public Color TooltipOutlineColor
+        {
+            get { return m_TooltipOutlineColor; }
+            set { m_TooltipOutlineColor = value; }
+        }
+        /// <summary>
+        /// Indicates whether property should be serialized. Used by the Windows Forms design-time support.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeTooltipOutlineColor()
+        {
+            return m_TooltipOutlineColor != Color.Black;
+        }
+        /// <summary>
+        /// Resets the property to default value. Used by the Windows Forms design-time support.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetTooltipOutlineColor()
+        {
+            TypeDescriptor.GetProperties(this)["TooltipOutlineColor"].SetValue(this, Color.Black);
+        }
+
+        /// <summary>
+        /// Gets or sets the spacing in pixels between buttons. Default value is 0.
+        /// </summary>
+        [Browsable(true), DefaultValue(0), Description("Indicates spacing in pixels between buttons."), Category("Appearance")]
+        public int ButtonSpacing
+        {
+            get { return m_ContentManager.BlockSpacing; }
+            set
+            {
+                m_ContentManager.BlockSpacing = value;
+                this.RecalcLayout();
+                this.Refresh();
+            }
+        }
+        /// <summary>
+        /// Gets or sets whether background for the buttons is stretched to consume complete width of the control. Default value is true.
+        /// </summary>
+        [Browsable(true), Category("Button Background"), Description("Indicates whether background for the buttons is stretched to consume complete width of the control."), DefaultValue(true)]
+        public bool ButtonBackgroundStretch
+        {
+            get { return m_ButtonBackgroundStretch; }
+            set
+            {
+                if (m_ButtonBackgroundStretch != value)
+                {
+                    m_ButtonBackgroundStretch = value;
+                    if (this.DesignMode)
+                        this.Refresh();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets the style for the background of the control.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), Description("Gets the style for the background of the control."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ElementStyle BackgroundStyle
+        {
+            get { return m_BackgroundStyle; }
+        }
+
+        /// <summary>
+        /// Gets the style for the background of the buttons.
+        /// </summary>
+        [Browsable(true), Category("Button Background"), Description("Gets the style for the background of the buttons."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ElementStyle ButtonBackAreaStyle
+        {
+            get { return m_ButtonBackAreaStyle; }
+        }
+
+        /// <summary>
+        /// Gets the bounds of the buttons back area.
+        /// </summary>
+        [Browsable(false)]
+        public Rectangle ButtonBackAreaBounds
+        {
+            get { return m_ButtonBounds; }
+        }
+
+        /// <summary>
+        /// Gets the bounds of the tabs area.
+        /// </summary>
+        [Browsable(false)]
+        public Rectangle TabAreaBounds
+        {
+            get { return m_TabsBounds; }
+        }
+
+        /// <summary>
+        /// Gets or sets the duration of animation that is performed when mouse enters a button for the first time or when mouse has left the control.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), Description("Indicates duration of animatio."), DefaultValue(100)]
+        public int AnimationTime
+        {
+            get { return m_AnimationTime; }
+            set { m_AnimationTime = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether bubble animation is enabled. Default value is true.
+        /// </summary>
+        [Browsable(false), Description("Indicates whether animation is enabled."), DefaultValue(true), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool AnimationEnabled
+        {
+            get { return m_AnimationEnabled; }
+            set
+            {
+                m_AnimationEnabled = value;
+                if (!m_AnimationEnabled)
+                    OverlayInactive();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether anti-alias smoothing is used while painting.
+        /// </summary>
+        [DefaultValue(false), Browsable(true), Category("Appearance"), Description("Gets or sets whether anti-aliasing is used while painting.")]
+        public bool AntiAlias
+        {
+            get { return m_AntiAlias; }
+            set
+            {
+                if (m_AntiAlias != value)
+                {
+                    m_AntiAlias = value;
+                    this.Refresh();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets ImageList for images used on buttons. These images will be used as images for the buttons that are not magnified.
+        /// Use ImagesLarge to specify the magnified images for the coresponding images based on the index in this list.
+        /// </summary>
+        [Browsable(true), DefaultValue(null), Category("Button Images"), Description("ImageList for images used on buttons.")]
+        public System.Windows.Forms.ImageList Images
+        {
+            get
+            {
+                return m_Images;
+            }
+            set
+            {
+                if (m_Images != null)
+                    m_Images.Disposed -= new EventHandler(this.ImageListDisposed);
+                m_Images = value;
+                if (m_Images != null)
+                    m_Images.Disposed += new EventHandler(this.ImageListDisposed);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets ImageList for large-sized images used on buttons when button is magnified.
+        /// </summary>
+        [Browsable(true), DefaultValue(null), Category("Button Images"), Description("ImageList for large-sized images used on buttons when button is magnified.")]
+        public System.Windows.Forms.ImageList ImagesLarge
+        {
+            get
+            {
+                return m_ImagesLarge;
+            }
+            set
+            {
+                if (m_ImagesLarge != null)
+                    m_ImagesLarge.Disposed -= new EventHandler(this.ImageListDisposed);
+                m_ImagesLarge = value;
+                if (m_ImagesLarge != null)
+                    m_ImagesLarge.Disposed += new EventHandler(this.ImageListDisposed);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether tooltips are displayed for the buttons.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), DefaultValue(true), Description("Indicates whether tooltips are displayed for the buttons.")]
+        public bool ShowTooltips
+        {
+            get { return m_ShowTooltips; }
+            set { m_ShowTooltips = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets size of the images when button is enlarged, default value is 48 by 48 pixels. Note that you should provide the
+        /// images in the same size for the buttons through the image properties on the buttons or through ImagesLarge property.
+        /// If the large images are not provided the regular button image will be automatically enlarged.
+        /// </summary>
+        [Browsable(true), Category("Button Images"), Description("Indicates size of the images when button is enlarged.")]
+        public System.Drawing.Size ImageSizeLarge
+        {
+            get { return m_ImageSizeLarge; }
+            set
+            {
+                if (m_ImageSizeLarge != value)
+                {
+                    m_ImageSizeLarge = value;
+                    this.RecalcLayout();
+                    this.Refresh();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Returns whether property should be serialized by Windows Forms designer.
+        /// </summary>
+        /// <returns>True if property is different than default value otherwise false.</returns>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeImageSizeLarge()
+        {
+            if (m_ImageSizeLarge.Width != 48 || m_ImageSizeLarge.Height != 48)
+                return true;
+            return false;
+        }
+
+        /// <summary>
+        /// Gets or sets the normal image size for the buttons, default value is 24 by 24 pixels. This should be set to the default image size that you will use on the
+        /// buttons. If the images specified for the buttons are not of the same size as the size specified here then they will
+        /// be automatically resized. Normal size must always be smaller than the size specified by ImageSizeLarge property.
+        /// </summary>
+        [Browsable(true), Category("Button Images"), Description("Indicates size of the images when button is enlarged.")]
+        public System.Drawing.Size ImageSizeNormal
+        {
+            get { return m_ImageSizeNormal; }
+            set
+            {
+                if (m_ImageSizeNormal != value)
+                {
+                    m_ImageSizeNormal = value;
+                    this.RecalcLayout();
+                    this.Refresh();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Returns whether property should be serialized by Windows Forms designer.
+        /// </summary>
+        /// <returns>True if property is different than default value otherwise false.</returns>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeImageSizeNormal()
+        {
+            if (m_ImageSizeLarge.Width != 24 || m_ImageSizeLarge.Height != 24)
+                return true;
+            return false;
+        }
+
+        /// <summary>
+        /// Gets or sets the font that is used to display tooltips.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), DefaultValue(null)]
+        public Font TooltipFont
+        {
+            get { return m_TooltipFont; }
+            set { m_TooltipFont = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the selected tab.
+        /// </summary>
+        [Browsable(false), DefaultValue(null)]
+        public BubbleBarTab SelectedTab
+        {
+            get { return m_SelectedTab; }
+            set
+            {
+                if (m_SelectedTab != value)
+                {
+                    m_SelectedTab = value;
+                    OnSelectedTabChanged();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets the reference to the colors that are used when tab is selected.
+        /// </summary>
+        [Browsable(true), Category("Tabs"), Description("Gets the reference to the colors that are used when tab is selected."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public TabColors SelectedTabColors
+        {
+            get { return m_SelectedTabColors; }
+        }
+
+        /// <summary>
+        /// Gets the reference to the colors that are used when mouse is over the tab.
+        /// </summary>
+        [Browsable(true), Category("Tabs"), Description("Gets the reference to the colors that are used when mouse is over the tab."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public TabColors MouseOverTabColors
+        {
+            get { return m_MouseOverTabColors; }
+        }
+
+        /// <summary>
+        /// Gets the collection of all tabs.
+        /// </summary>
+        [Editor("DevComponents.DotNetBar.Design.BubbleBarTabCollectionEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), DesignerSerializationVisibility(DesignerSerializationVisibility.Content), System.ComponentModel.Category("Tabs"), Description("Returns the collection of Tabs.")]
+        public BubbleBarTabCollection Tabs
+        {
+            get { return m_Tabs; }
+        }
+
+        /// <summary>
+        /// Gets or sets the button alignment.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), Description("Indicates button alignment.")]
+        public eBubbleButtonAlignment Alignment
+        {
+            get
+            {
+                return m_ButtonAlignment;
+            }
+            set
+            {
+                if (m_ButtonAlignment != value)
+                {
+                    m_ButtonAlignment = value;
+                    ApplyButtonAlignment();
+                    this.RecalcLayout();
+                    this.Refresh();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether tabs are visible. Default value is true.
+        /// </summary>
+        [Browsable(true), Category("Tabs"), Description("Indicates whether tabs are visible."), DefaultValue(true)]
+        public bool TabsVisible
+        {
+            get { return m_TabsVisible; }
+            set
+            {
+                if (m_TabsVisible != value)
+                {
+                    m_TabsVisible = value;
+                    this.LayoutButtons();
+                    this.RepaintAll();
+                }
+            }
+        }
+
+        #endregion
+
+        #region Public Methods
+
+        /// <summary>
+        /// Recalculates the layout of the control. This method should be called after all changes to the tabs, buttons are completed so
+        /// layout of the control recalculated.
+        /// </summary>
+        public void RecalcLayout()
+        {
+            this.StopBubbleEffect();
+            this.LayoutButtons();
+            this.Invalidate();
+            OnItemLayoutUpdated(EventArgs.Empty);
+        }
+
+        /// <summary>
+        /// Occurs after internal item layout has been updated and items have valid bounds assigned.
+        /// </summary>
+        public event EventHandler ItemLayoutUpdated;
+        /// <summary>
+        /// Raises ItemLayoutUpdated event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnItemLayoutUpdated(EventArgs e)
+        {
+            EventHandler handler = ItemLayoutUpdated;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        /// <summary>
+        /// Returns reference to the button at specified location
+        /// </summary>
+        /// <param name="x">x - coordinate</param>
+        /// <param name="y">y - coordinate</param>
+        /// <returns>Reference to the button or null if no button could be found at given coordinates.</returns>
+        public BubbleButton GetButtonAt(int x, int y)
+        {
+            if (m_SelectedTab == null)
+                return null;
+            BubbleButton ret = null;
+            foreach (BubbleButton button in m_SelectedTab.Buttons)
+            {
+                if (!button.Visible) continue;
+                if (m_MouseOverButton != null)
+                {
+                    Rectangle r = button.MagnifiedDisplayRectangle;
+                    if (r.Contains(x, y))
+                    {
+                        ret = button;
+                        break;
+                    }
+                }
+                else
+                {
+                    Rectangle r = button.DisplayRectangle;
+                    if (r.Contains(x, y))
+                    {
+                        ret = button;
+                        break;
+                    }
+                }
+            }
+            return ret;
+        }
+
+        /// <summary>
+        /// Returns reference to the button at specified location
+        /// </summary>
+        /// <param name="p">Location coordinates</param>
+        /// <returns>Reference to the button or null if no button could be found at given coordinates.</returns>
+        public BubbleButton GetButtonAt(Point p)
+        {
+            return GetButtonAt(p.X, p.Y);
+        }
+
+        /// <summary>
+        /// Returns tab at specific location.
+        /// </summary>
+        /// <param name="p">Coordinates to get the tab from.</param>
+        /// <returns>Reference to the tab object or null if tab cannot be found at specified location</returns>
+        public BubbleBarTab GetTabAt(Point p)
+        {
+            return GetTabAt(p.X, p.Y);
+        }
+
+        /// <summary>
+        /// Returns tab at specific location.
+        /// </summary>
+        /// <param name="x">x - coordinate </param>
+        /// <param name="y">y - coordinate</param>
+        /// <returns>Reference to the tab object or null if tab cannot be found at specified location</returns>
+        public BubbleBarTab GetTabAt(int x, int y)
+        {
+            foreach (BubbleBarTab tab in m_Tabs)
+            {
+                if (tab.DisplayRectangle.Contains(x, y))
+                    return tab;
+            }
+            return null;
+        }
+
+        #endregion
+
+        #region Internal Implementation
+
+        protected override void ScaleControl(SizeF factor, BoundsSpecified specified)
+        {
+            if (Dpi.RecordScalePerControl)
+                Dpi.SetScaling(factor);
+            base.ScaleControl(factor, specified);
+        }
+
+        protected override void OnCursorChanged(EventArgs e)
+        {
+            if (m_Overlay != null)
+                m_Overlay.Cursor = this.Cursor;
+            base.OnCursorChanged(e);
+        }
+        /// <summary>
+        /// Invokes BubbleStart event.
+        /// </summary>
+        protected virtual void OnBubbleStart(EventArgs e)
+        {
+            if (BubbleStart != null)
+                BubbleStart(this, e);
+        }
+
+        /// <summary>
+        /// Invokes BubbleEnd event.
+        /// </summary>
+        protected virtual void OnBubbleEnd(EventArgs e)
+        {
+            if (BubbleEnd != null)
+                BubbleEnd(this, e);
+        }
+        /// <summary>
+        /// Invokes ButtonClick event on the control.
+        /// </summary>
+        /// <param name="button">Reference to the button that was clicked.</param>
+        internal void InvokeButtonClick(BubbleButton button, ClickEventArgs e)
+        {
+            if (ButtonClick != null)
+                ButtonClick(button, e);
+        }
+        protected override bool ProcessMnemonic(char charCode)
+        {
+            string s = "&" + charCode.ToString();
+            s = s.ToLower();
+            foreach (BubbleBarTab tab in this.Tabs)
+            {
+                string text = tab.Text.ToLower();
+                if (text.IndexOf(s) >= 0)
+                {
+                    this.SelectedTab = tab;
+                    return true;
+                }
+            }
+            return base.ProcessMnemonic(charCode);
+        }
+
+        protected override void OnSystemColorsChanged(EventArgs e)
+        {
+            base.OnSystemColorsChanged(e);
+            Application.DoEvents();
+            if (m_ButtonBackAreaStyle.GetColorScheme() != null)
+                m_ButtonBackAreaStyle.GetColorScheme().Refresh();
+        }
+
+        protected override void OnResize(EventArgs e)
+        {
+            base.OnResize(e);
+
+            if (this.Width == 0 || this.Height == 0)
+                return;
+
+            this.RecalcLayout();
+            this.Refresh();
+        }
+
+        private void RepaintAll()
+        {
+            if (m_Overlay != null)
+            {
+                m_Overlay.UpdateWindow();
+                //				m_Overlay.Parent.Invalidate(m_Overlay.Bounds,true);
+                //				m_Overlay.Parent.Update();
+                //				m_Overlay.Update();
+                //m_Overlay.Refresh();
+                this.Refresh();
+            }
+            else
+                this.Refresh();
+        }
+
+        private void ElementStyleChanged(object sender, EventArgs e)
+        {
+            if (this.DesignMode)
+            {
+                this.LayoutButtons();
+                this.Refresh();
+            }
+        }
+
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            PaintBackground(e);
+            PaintControl(e);
+        }
+
+        protected virtual void PaintControl(PaintEventArgs e)
+        {
+            ElementStyleDisplayInfo info = new ElementStyleDisplayInfo();
+            info.Bounds = this.DisplayRectangle;
+            info.Graphics = e.Graphics;
+            info.Style = m_BackgroundStyle;
+            ElementStyleDisplay.Paint(info);
+
+            if (!m_ButtonBounds.IsEmpty && this.Tabs.Count > 0)
+            {
+                Rectangle r = GetButtonsBackground();
+                info.Bounds = r;
+                info.Graphics = e.Graphics;
+                info.Style = m_ButtonBackAreaStyle;
+                ElementStyleDisplay.Paint(info);
+            }
+
+            SmoothingMode sm = e.Graphics.SmoothingMode;
+            TextRenderingHint th = e.Graphics.TextRenderingHint;
+
+            if (m_AntiAlias)
+            {
+                e.Graphics.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.AntiAlias;
+                e.Graphics.TextRenderingHint = DisplayHelp.AntiAliasTextRenderingHint;
+            }
+
+            if (!m_TabsBounds.IsEmpty)
+            {
+                Rectangle r = GetTabBounds();
+                e.Graphics.SetClip(r);
+                ISimpleTab[] tabs = new ISimpleTab[m_Tabs.Count];
+                m_Tabs.CopyTo(tabs);
+                m_TabDisplay.Paint(e.Graphics, tabs);
+                e.Graphics.ResetClip();
+            }
+
+            if (m_Overlay == null)
+            {
+                BubbleButtonDisplayInfo displayInfo = GetBubbleButtonDisplayInfo();
+                displayInfo.Graphics = e.Graphics;
+
+                if (m_SelectedTab != null)
+                {
+                    foreach (BubbleButton button in m_SelectedTab.Buttons)
+                    {
+                        displayInfo.Button = button;
+                        BubbleButtonDisplay.Paint(displayInfo);
+                    }
+                }
+            }
+
+            if (this.DesignMode && this.Tabs.Count == 0)
+            {
+                Rectangle r = this.DisplayRectangle;
+                eTextFormat format = eTextFormat.Default | eTextFormat.HorizontalCenter | eTextFormat.VerticalCenter |
+                    eTextFormat.EndEllipsis | eTextFormat.WordBreak;
+                string INFO_TEXT = "Right-click and choose Create Tab or Button to add new items.";
+                TextDrawing.DrawString(e.Graphics, INFO_TEXT, this.Font, SystemColors.ControlDarkDark, r, format);
+            }
+
+#if !TRIAL
+            if (NativeFunctions.keyValidated2 != 266)
+                TextDrawing.DrawString(e.Graphics, "Invalid License", this.Font, Color.FromArgb(128, Color.Red), this.ClientRectangle, eTextFormat.Bottom | eTextFormat.HorizontalCenter);
+#endif
+            e.Graphics.TextRenderingHint = th;
+            e.Graphics.SmoothingMode = sm;
+        }
+
+        protected virtual void PaintBackground(PaintEventArgs e)
+        {
+            if (this.BackColor.A < 255)
+            {
+                base.OnPaintBackground(e);
+            }
+
+            if (!this.BackColor.IsEmpty)
+            {
+                using (SolidBrush brush = new SolidBrush(this.BackColor))
+                    e.Graphics.FillRectangle(brush, this.DisplayRectangle);
+            }
+        }
+
+        internal void OnPaintOverlay(PaintEventArgs e)
+        {
+            BubbleButtonDisplayInfo displayInfo = GetBubbleButtonDisplayInfo();
+            displayInfo.Graphics = e.Graphics;
+
+            if (m_SelectedTab != null)
+            {
+                foreach (BubbleButton button in m_SelectedTab.Buttons)
+                {
+                    displayInfo.Button = button;
+                    BubbleButtonDisplay.Paint(displayInfo);
+                }
+            }
+        }
+
+        private bool IsParentFormActive()
+        {
+            Form form = this.FindForm();
+            if (form != null && form.MdiParent == null && form.Parent is Control)
+            {
+                form = form.Parent.FindForm();
+            }
+
+            if (form != null)
+            {
+                return (Form.ActiveForm == form && form.MdiParent == null ||
+                form.MdiParent != null && form.MdiParent.ActiveMdiChild == form);
+            }
+
+            bool ret = false;
+            IntPtr foregroundWindow = NativeFunctions.GetForegroundWindow();
+            try
+            {
+                Control c = Control.FromHandle(foregroundWindow);
+                if (c != null)
+                    ret = true;
+            }
+            catch
+            {
+                ret = false;
+            }
+            return ret;
+        }
+
+        private void CreateOverlay()
+        {
+            if (m_Overlay == null)
+            {
+                OnBubbleStart(new EventArgs());
+            }
+
+            if (m_Overlay != null || this.Parent == null || !m_EnableOverlay || this.DesignMode || !m_AnimationEnabled)
+                return;
+
+            Rectangle overlayBounds = this.GetOverlayBounds();
+            m_Overlay = new BubbleBarOverlay(this);
+            m_Overlay.Bounds = overlayBounds;
+            m_Overlay.Visible = false;
+
+            // Layout buttons for overlay
+            m_ContentManager.MouseOverIndex = -1;
+            this.LayoutButtons();
+            if (m_MouseOverButton != null)
+                m_ContentManager.MouseOverIndex = m_MouseOverButton.Parent.Buttons.IndexOf(m_MouseOverButton);
+
+            m_Overlay.CreateControl();
+            Point p = this.Parent.PointToScreen(m_Overlay.Location);
+            m_Overlay.BeforeShow();
+            int hwndInsertAfter = NativeFunctions.HWND_NOTOPMOST;
+            if (this.FindForm() != null && this.FindForm().TopMost)
+                hwndInsertAfter = NativeFunctions.HWND_TOPMOST;
+            NativeFunctions.SetWindowPos(m_Overlay.Handle, new IntPtr(hwndInsertAfter), p.X, p.Y, m_Overlay.Width, m_Overlay.Height, NativeFunctions.SWP_SHOWWINDOW | NativeFunctions.SWP_NOACTIVATE);
+            m_Overlay.Visible = true;
+            m_Overlay.UpdateWindow();
+            this.Refresh();
+        }
+
+        private Rectangle GetOverlayBounds()
+        {
+            Rectangle r = new Rectangle(this.Location, this.Size);
+            if (m_ButtonAlignment == eBubbleButtonAlignment.Top || m_ButtonAlignment == eBubbleButtonAlignment.Bottom)
+            {
+                Size imageSizeLarge = Dpi.ImageSize(m_ImageSizeLarge);
+                Size imageSizeNormal = Dpi.ImageSize(m_ImageSizeNormal);
+                int increase = (imageSizeLarge.Height - imageSizeNormal.Height);
+                if (this.ShowTooltips)
+                {
+                    if (this.TooltipFont != null)
+                        m_MagTooltipIncrease = this.TooltipFont.Height + 6;
+                    else
+                        m_MagTooltipIncrease = this.Font.Height + 6;
+
+                    increase += m_MagTooltipIncrease;
+                }
+                r.Height += increase;
+                if (m_ButtonAlignment == eBubbleButtonAlignment.Bottom)
+                    r.Y -= increase;
+            }
+            else
+            {
+
+            }
+            return r;
+        }
+
+        /// <summary>
+        /// Called after overlay window became inactive.
+        /// </summary>
+        internal void OverlayInactive()
+        {
+            SetMouseDown(null);
+            // Mouse Over destroys overlay window as well
+            SetMouseOver(null);
+            this.RepaintAll();
+        }
+
+        /// <summary>
+        /// Stops the bubble animation effect is one is applied currently.
+        /// </summary>
+        public void StopBubbleEffect()
+        {
+            SetMouseDown(null);
+            SetMouseOver(null);
+        }
+
+        private void DestroyOverlay()
+        {
+            if (m_Overlay == null)
+                return;
+
+            OnBubbleEnd(new EventArgs());
+
+            m_Overlay.Hide();
+            m_Overlay.AfterClose();
+            m_Overlay.Dispose();
+            m_Overlay = null;
+
+            // Layout buttons without overlay
+            m_ContentManager.MouseOverIndex = -1;
+            this.LayoutButtons();
+            if (m_MouseOverButton != null)
+                m_ContentManager.MouseOverIndex = m_MouseOverButton.Parent.Buttons.IndexOf(m_MouseOverButton);
+            this.Invalidate();
+        }
+
+        private BubbleButtonDisplayInfo GetBubbleButtonDisplayInfo()
+        {
+            m_BubbleButtonDisplayInfo.Magnified = (m_MouseOverButton != null) && m_AnimationEnabled;
+            m_BubbleButtonDisplayInfo.Alignment = m_ButtonAlignment;
+            return m_BubbleButtonDisplayInfo;
+        }
+
+
+        protected override void OnMouseMove(MouseEventArgs e)
+        {
+            if (!IsParentFormActive())
+                return;
+            if (m_Overlay != null && m_MagTooltipIncrease > 0)
+            {
+                Point p = this.PointToScreen(new Point(e.X, e.Y));
+                p = m_Overlay.PointToClient(p);
+                MouseEventArgs em = new MouseEventArgs(e.Button, e.Clicks, p.X, p.Y, e.Delta);
+                MouseMoveMessage(em);
+            }
+            else
+                MouseMoveMessage(e);
+        }
+
+        /// <summary>
+        /// Internal processing of MouseMove event.
+        /// </summary>
+        /// <param name="e">Move move event arguments.</param>
+        internal void MouseMoveMessage(MouseEventArgs e)
+        {
+            base.OnMouseMove(e);
+            if (m_IgnoreMouseMove)
+            {
+                m_IgnoreMouseMove = false;
+                return;
+            }
+
+            bool bRefresh = false;
+
+            Point mousePosition = new Point(e.X, e.Y);
+            BubbleButton mouseOver = GetButtonAt(mousePosition.X, mousePosition.Y);
+            if (mouseOver != null && mouseOver == m_IgnoreButtonMouseMove)
+                return;
+            else if (mouseOver == null)
+                m_IgnoreButtonMouseMove = null;
+
+            if (mouseOver != null)
+            {
+                if (m_MouseOverButton == null)
+                {
+                    CreateOverlay();
+                    // Set to enable painting of magnified buttons...
+                    m_MouseOverButton = mouseOver;
+                    AnimateButton(mouseOver, mousePosition, true);
+                    m_MouseOverButton = null;
+                }
+
+                if (m_AnimationEnabled)
+                {
+                    BubbleFactors factors = this.GetBubbleFactors(mouseOver.DisplayRectangle, mousePosition);
+                    m_ContentManager.Factor1 = factors.Factor1;
+                    m_ContentManager.Factor2 = factors.Factor2;
+                    m_ContentManager.Factor3 = factors.Factor3;
+                    m_ContentManager.Factor4 = factors.Factor4;
+                    Size imageSizeLarge = Dpi.ImageSize(m_ImageSizeLarge);
+                    m_ContentManager.BubbleSize = imageSizeLarge;
+                    m_ContentManager.MouseOverPosition = factors.x;
+                    m_ContentManager.MouseOverIndex = mouseOver.Parent.Buttons.IndexOf(mouseOver);
+                    this.LayoutButtons();
+                    bRefresh = true;
+                    m_LastMouseOverPosition = mousePosition;
+                }
+            }
+
+            if (m_MouseOverTab != null || m_TabsBounds.Contains(mousePosition))
+            {
+                BubbleBarTab tab = GetTabAt(mousePosition);
+                SetMouseOverTab(tab);
+            }
+
+            if (m_MouseOverButton != mouseOver)
+            {
+                SetMouseOver(mouseOver);
+                bRefresh |= true;
+            }
+
+            if (m_MouseOverButton != mouseOver && e.Button == MouseButtons.Left)
+            {
+                SetMouseDown(mouseOver);
+                bRefresh |= true;
+            }
+
+            // Make sure that cursor did not escape while animation was going on...
+            if (m_MouseOverButton != null)
+            {
+                Point p = Control.MousePosition;
+                if (m_Overlay != null)
+                    p = m_Overlay.PointToClient(p);
+                else
+                    p = this.PointToClient(p);
+                mouseOver = GetButtonAt(p.X, p.Y);
+                if (mouseOver != m_MouseOverButton)
+                {
+                    SetMouseOver(mouseOver);
+                    bRefresh |= true;
+                }
+            }
+
+            if (bRefresh)
+                this.RepaintAll();
+        }
+
+        private void SetMouseOver(BubbleButton mouseOver)
+        {
+            if (m_MouseOverButton != null)
+            {
+                m_MouseOverButton.SetMouseOver(false);
+                if (mouseOver == null && !m_LastMouseOverPosition.IsEmpty)
+                {
+                    AnimateButton(m_MouseOverButton, m_LastMouseOverPosition, false);
+                    m_LastMouseOverPosition = Point.Empty;
+                }
+            }
+
+            m_MouseOverButton = mouseOver;
+            if (m_MouseOverButton != null)
+            {
+                m_MouseOverButton.SetMouseOver(true);
+                CreateOverlay();
+            }
+            else
+            {
+                SetMouseDown(null);
+                DestroyOverlay();
+            }
+            if (m_MouseOverButton != null)
+                m_ContentManager.MouseOverIndex = m_MouseOverButton.Parent.Buttons.IndexOf(m_MouseOverButton);
+            else
+                m_ContentManager.MouseOverIndex = -1;
+        }
+
+        private void SetMouseDown(BubbleButton mouseDown)
+        {
+            if (m_MouseDownButton != null)
+                m_MouseDownButton.SetMouseDown(false);
+
+            if (mouseDown != null && !mouseDown.Enabled)
+            {
+                m_MouseDownButton = null;
+                return;
+            }
+
+            m_MouseDownButton = mouseDown;
+            if (m_MouseDownButton != null)
+                m_MouseDownButton.SetMouseDown(true);
+        }
+
+        protected override void OnMouseEnter(EventArgs e)
+        {
+            StopMouseLeaveTimer();
+            base.OnMouseEnter(e);
+        }
+
+        protected override void OnMouseLeave(EventArgs e)
+        {
+            MouseLeaveMessage(e);
+            base.OnMouseLeave(e);
+        }
+
+        /// <summary>
+        /// Internal processing for MouseLeave event.
+        /// </summary>
+        /// <param name="e">Event arguments</param>
+        internal void MouseLeaveMessage(EventArgs e)
+        {
+            Point p = Point.Empty;
+            if (m_MouseOverButton != null && m_Overlay != null)
+                p = m_Overlay.PointToClient(Control.MousePosition);
+            else
+                p = this.PointToClient(Control.MousePosition);
+
+            bool bRepaint = false;
+            BubbleButton buttonAt = GetButtonAt(p.X, p.Y);
+
+            if (m_MouseDownButton != null && buttonAt == null)
+            {
+                SetMouseDown(null);
+                bRepaint = true;
+            }
+
+            SetMouseOverTab(null);
+
+            if (bRepaint)
+                this.RepaintAll();
+            StartMouseLeaveTimer();
+            m_IgnoreButtonMouseMove = null;
+        }
+
+        private Timer m_MouseLeaveTimer = null;
+        private void StartMouseLeaveTimer()
+        {
+            if (m_Overlay == null || m_MouseOverButton == null || m_MouseLeaveTimer != null) return;
+
+            m_MouseLeaveTimer = new Timer();
+            m_MouseLeaveTimer.Interval = 500;
+            m_MouseLeaveTimer.Tick += new EventHandler(MouseLeaveTimerTick);
+            m_MouseLeaveTimer.Start();
+        }
+
+        private void MouseLeaveTimerTick(object sender, EventArgs e)
+        {
+            Point p = Point.Empty;
+            if (m_MouseOverButton != null && m_Overlay != null)
+                p = m_Overlay.PointToClient(Control.MousePosition);
+            else
+                p = this.PointToClient(Control.MousePosition);
+
+            bool bRepaint = false;
+            BubbleButton buttonAt = GetButtonAt(p.X, p.Y);
+
+            if (buttonAt == null)
+            {
+                StopBubbleEffect();
+                StopMouseLeaveTimer();
+            }
+        }
+
+        private void StopMouseLeaveTimer()
+        {
+            Timer t = m_MouseLeaveTimer;
+            m_MouseLeaveTimer = null;
+            if (t == null) return;
+            t.Stop();
+            t.Dispose();
+        }
+
+        protected override void OnMouseDown(MouseEventArgs e)
+        {
+            MouseDownMessage(e);
+            base.OnMouseDown(e);
+        }
+
+        internal void OverlayMouseDownMessage(MouseEventArgs e)
+        {
+            OnMouseDown(e);
+        }
+
+        private void MouseDownMessage(MouseEventArgs e)
+        {
+            BubbleButton mouseOver = GetButtonAt(e.X, e.Y);
+            if (mouseOver != null)
+            {
+                SetMouseDown(mouseOver);
+                this.RepaintAll();
+            }
+            else if (m_TabsBounds.Contains(e.X, e.Y))
+            {
+                BubbleBarTab tab = GetTabAt(new Point(e.X, e.Y));
+                if (tab != null && tab != m_SelectedTab)
+                    SetSelectedTab(tab, eEventSource.Mouse, true);
+            }
+        }
+
+        protected override void OnMouseUp(MouseEventArgs e)
+        {
+            MouseUpMessage(e);
+            base.OnMouseUp(e);
+        }
+
+        internal void OverlayMouseUpMessage(MouseEventArgs e)
+        {
+            OnMouseUp(e);
+        }
+
+        private void MouseUpMessage(MouseEventArgs e)
+        {
+            if (m_MouseDownButton != null)
+            {
+                BubbleButton button = m_MouseDownButton;
+                Rectangle dispRect = button.DisplayRectangle;
+                Rectangle magRect = button.MagnifiedDisplayRectangle;
+                SetMouseDown(null);
+                SetMouseOver(null);
+                m_IgnoreMouseMove = true;
+                this.RepaintAll();
+                if (dispRect.Contains(e.X, e.Y) || magRect.Contains(e.X, e.Y))
+                    button.InvokeClick(eEventSource.Mouse, e.Button);
+                m_IgnoreButtonMouseMove = button;
+            }
+        }
+
+        private void ImageListDisposed(object sender, EventArgs e)
+        {
+            if (sender == m_Images)
+            {
+                this.Images = null;
+            }
+            else if (sender == m_ImagesLarge)
+            {
+                this.ImagesLarge = null;
+            }
+        }
+
+        /// <summary>
+        /// Called after all buttons have been removed.
+        /// </summary>
+        /// <param name="tab">Tab from which all buttons were removed.</param>
+        internal void OnButtonsCollectionClear(BubbleBarTab tab)
+        {
+            StopBubbleEffect();
+            if (this.DesignMode)
+            {
+                this.RecalcLayout();
+                this.Refresh();
+            }
+        }
+
+        /// <summary>
+        /// Called after specified button has been removed.
+        /// </summary>
+        /// <param name="tab">Tab from which button was removed.</param>
+        /// <param name="button">Button that was removed.</param>
+        internal void OnButtonRemoved(BubbleBarTab tab, BubbleButton button)
+        {
+            StopBubbleEffect();
+            if (m_HasShortcuts && !this.IsDisposed)
+                RefreshHasShortcut();
+            if (this.DesignMode)
+            {
+                this.RecalcLayout();
+                this.Refresh();
+            }
+        }
+
+        internal void RefreshHasShortcut()
+        {
+            m_HasShortcuts = false;
+            foreach (BubbleBarTab t in this.Tabs)
+            {
+                foreach (BubbleButton b in t.Buttons)
+                {
+                    if (b.Shortcut != eShortcut.None)
+                    {
+                        m_HasShortcuts = true;
+                        break;
+                    }
+                }
+                if (m_HasShortcuts)
+                    break;
+            }
+        }
+
+        /// <summary>
+        /// Called after new button is added to the Buttons collection.
+        /// </summary>
+        /// <param name="tab">Tab to which button was added.</param>
+        /// <param name="button">Reference to the button added.</param>
+        internal void OnButtonInserted(BubbleBarTab tab, BubbleButton button)
+        {
+            StopBubbleEffect();
+            LayoutButtons();
+            if (button.Shortcut != eShortcut.None)
+            {
+                m_HasShortcuts = true;
+            }
+            if (this.DesignMode)
+            {
+                this.RecalcLayout();
+                this.Refresh();
+            }
+        }
+
+        protected override void OnHandleCreated(EventArgs e)
+        {
+            base.OnHandleCreated(e);
+            this.RecalcLayout();
+            InstallIMessageHandlerClient();
+        }
+
+        protected override void OnHandleDestroyed(EventArgs e)
+        {
+            base.OnHandleDestroyed(e);
+            UninstallIMessageHandlerClient();
+            StopMouseLeaveTimer();
+        }
+
+        /// <summary>
+        /// Called when Visible property of Button has changed.
+        /// </summary>
+        /// <param name="button">Button affected.</param>
+        internal void OnButtonVisibleChanged(BubbleButton button)
+        {
+            LayoutButtons();
+        }
+
+        private void LayoutButtons()
+        {
+            if (m_SelectedTab != null)
+            {
+                if (m_SelectedTab.Buttons.Count > 0)
+                {
+                    IBlock[] buttons = new IBlock[m_SelectedTab.Buttons.Count];
+                    m_SelectedTab.Buttons.CopyTo(buttons);
+                    Rectangle r = m_ContentManager.Layout(GetButtonDisplayArea(), buttons, m_ButtonLayoutManager);
+                    if (m_Overlay != null)
+                    {
+                        m_ButtonBounds.X = r.X;
+                        m_ButtonBounds.Width = r.Width;
+                    }
+                    else
+                        m_ButtonBounds = r;
+                }
+                else
+                {
+                    m_ButtonBounds = GetButtonDisplayArea();
+                    m_ButtonBounds.Inflate(-m_ButtonBounds.Width / 2, 0);
+                    int b = m_ButtonBounds.Bottom;
+                    Size imageSizeNormal = Dpi.ImageSize(m_ImageSizeNormal);
+                    m_ButtonBounds.Height = imageSizeNormal.Height;
+                    if (m_ButtonAlignment == eBubbleButtonAlignment.Bottom)
+                        m_ButtonBounds.Y = b - m_ButtonBounds.Height;
+                }
+            }
+
+            LayoutTabs();
+        }
+
+        private void LayoutTabs()
+        {
+            if (!BarFunctions.IsHandleValid(this))
+                return;
+            // Layout tabs
+            if (m_TabsVisible && m_Tabs.Count > 0)
+            {
+                IBlock[] tabs = new IBlock[m_Tabs.Count];
+                m_Tabs.CopyTo(tabs);
+                Graphics g = null;
+                try
+                {
+                    g = this.CreateGraphics();
+                    m_TabLayoutManager.Graphics = g;
+                    m_TabsBounds = m_TabContentManager.Layout(GetTabDisplayArea(), tabs, m_TabLayoutManager);
+                }
+                finally
+                {
+                    m_TabLayoutManager.Graphics = null;
+                    if (g != null)
+                        g.Dispose();
+                }
+            }
+            else
+                m_TabsBounds = Rectangle.Empty;
+        }
+
+        private Rectangle GetButtonDisplayArea()
+        {
+            Rectangle r = this.DisplayRectangle;
+            if (m_Overlay != null)
+                r = m_Overlay.DisplayRectangle;
+            if (m_ButtonAlignment == eBubbleButtonAlignment.Bottom)
+                r.Height -= m_ButtonMargin;
+            else if (m_ButtonAlignment == eBubbleButtonAlignment.Top)
+            {
+                r.Height -= m_ButtonMargin;
+                r.Y += m_ButtonMargin;
+            }
+
+            return r;
+        }
+
+        /// <summary>
+        /// Returns the button background rectangle for display purposes. Applies setting for the ButtonBackgroundStretch property.
+        /// </summary>
+        /// <returns>Background rectangle.</returns>
+        private Rectangle GetButtonsBackground()
+        {
+            Rectangle r = m_ButtonBounds;
+            if (m_ButtonBackgroundStretch)
+            {
+                r.Width = this.Width;
+                r.X = 0;
+            }
+            else if (m_TabsBounds.Width + 16 > r.Width)
+            {
+                int diff = (m_TabsBounds.Width + 16) - r.Width;
+                r.Width += diff;
+                r.X -= diff / 2;
+            }
+
+            r.Height += (m_ButtonBackAreaStyle.PaddingTop + m_ButtonBackAreaStyle.PaddingBottom);
+            r.Y -= m_ButtonBackAreaStyle.PaddingTop;
+
+            if (!m_ButtonBackgroundStretch)
+            {
+                r.Width += (m_ButtonBackAreaStyle.PaddingLeft + m_ButtonBackAreaStyle.PaddingRight);
+                r.X -= m_ButtonBackAreaStyle.PaddingLeft;
+            }
+
+            return r;
+        }
+
+        private Rectangle GetTabDisplayArea()
+        {
+            Rectangle r;
+            Rectangle rButtonsBack = GetButtonsBackground();
+
+            if (m_ButtonAlignment == eBubbleButtonAlignment.Bottom)
+            {
+                r = new Rectangle(rButtonsBack.X, 0, rButtonsBack.Width, rButtonsBack.Y);
+            }
+            else
+            {
+                r = new Rectangle(rButtonsBack.X, rButtonsBack.Bottom, rButtonsBack.Width, this.Height - rButtonsBack.Bottom);
+            }
+            if (r.Height < 0)
+                r.Height = 0;
+
+            r.Width -= 16;
+            r.X += 8;
+            return r;
+        }
+
+        private Rectangle GetTabBounds()
+        {
+            Rectangle r = m_TabsBounds;
+            if (!r.IsEmpty)
+            {
+                r.Width += 16;
+                r.X -= 8;
+            }
+            return r;
+        }
+
+        private void AnimateButton(BubbleButton button, Point mousePosition, bool animateGrow)
+        {
+            if (m_AnimationTime <= 0 || m_Animation || m_SelectedTab == null || !m_AnimationEnabled)
+                return;
+
+            m_Animation = true;
+            try
+            {
+                m_ContentManager.MouseOverIndex = m_SelectedTab.Buttons.IndexOf(button);
+                bool animate = true;
+                Size imageSizeLarge = Dpi.ImageSize(m_ImageSizeLarge);
+                Size imageSizeNormal = Dpi.ImageSize(m_ImageSizeNormal);
+                int totalSteps = imageSizeLarge.Width - imageSizeNormal.Width;
+                int step = 1;
+                int current = imageSizeNormal.Width + step;
+                if (!animateGrow)
+                    current = imageSizeLarge.Width - step;
+
+                Rectangle displayRectangle = GetButtonDisplayArea();
+
+                IBlock[] blocks = new IBlock[m_SelectedTab.Buttons.Count];
+                m_SelectedTab.Buttons.CopyTo(blocks);
+
+                DateTime start = DateTime.Now;
+                TimeSpan stepDuration = TimeSpan.MinValue;
+
+                while (animate)
+                {
+                    DateTime stepStart = DateTime.Now;
+
+                    float multi = (float)current / (float)imageSizeNormal.Width;
+                    Size bubbleSize = new Size((int)((float)imageSizeNormal.Width * multi), (int)((float)imageSizeNormal.Height * multi));
+                    BubbleFactors factors = this.GetBubbleFactors(button.DisplayRectangle, mousePosition, bubbleSize);
+                    m_ContentManager.Factor1 = factors.Factor1;
+                    m_ContentManager.Factor2 = factors.Factor2;
+                    m_ContentManager.Factor3 = factors.Factor3;
+                    m_ContentManager.Factor4 = factors.Factor4;
+                    m_ContentManager.BubbleSize = bubbleSize;
+                    m_ContentManager.MouseOverPosition = factors.x;
+                    m_ContentManager.Layout(displayRectangle, blocks, m_ButtonLayoutManager);
+                    this.RepaintAll();
+
+                    stepDuration = DateTime.Now.Subtract(stepStart);
+                    step = (int)((float)totalSteps * ((float)stepDuration.TotalMilliseconds / (float)m_AnimationTime));
+                    if (step <= 0)
+                    {
+                        int diff = (int)(m_AnimationTime / Math.Max((float)stepDuration.TotalMilliseconds, (float)1) / totalSteps);
+                        if (diff <= 0)
+                            diff = (int)stepDuration.TotalMilliseconds;
+                        try
+                        {
+                            using (
+                                        System.Threading.ManualResetEvent wait =
+                                            new System.Threading.ManualResetEvent(false))
+                                wait.WaitOne(diff);
+                            //System.Threading.Thread.Sleep(diff);
+                        }
+                        catch 
+                        {
+                            break;
+                        }
+                        step = 1;
+                    }
+                    if (animateGrow)
+                        current += step;
+                    else
+                        current -= step;
+                    totalSteps -= step;
+                    if (totalSteps <= 0 || DateTime.Now.Subtract(start).TotalMilliseconds >= m_AnimationTime)
+                        break;
+                }
+            }
+            finally
+            {
+                m_Animation = false;
+            }
+        }
+
+        private BubbleFactors GetBubbleFactors(Rectangle buttonMouseOver, Point mousePosition)
+        {
+            return GetBubbleFactors(buttonMouseOver, mousePosition, Dpi.ImageSize(m_ImageSizeLarge));
+        }
+
+        private BubbleFactors GetBubbleFactors(Rectangle buttonMouseOver, Point mousePosition, Size finalSize)
+        {
+            BubbleFactors factors = new BubbleFactors();
+
+            float pp = 0;
+            int xa = 0, ya = 0;
+            int xDiff = Math.Max(mousePosition.X - buttonMouseOver.X, 0);
+            xDiff = Math.Min(xDiff, buttonMouseOver.Width);
+            int yDiff = Math.Max(mousePosition.Y - buttonMouseOver.Y, 0);
+            yDiff = Math.Min(yDiff, buttonMouseOver.Height);
+
+            if (m_Orientation == eOrientation.Horizontal)
+            {
+                pp = (float)(xDiff) / (float)buttonMouseOver.Width;
+                xa = mousePosition.X - (int)(pp * (float)finalSize.Width);
+            }
+            else
+            {
+                pp = (float)(yDiff) / (float)buttonMouseOver.Height;
+                ya = mousePosition.Y - (int)(pp * (float)finalSize.Height);
+            }
+
+            factors.x = xa;
+            factors.y = ya;
+
+            factors.Factor1 = (1 - pp) * _falloffFactor;
+            factors.Factor2 = Math.Max(1 - pp, _falloffFactor);
+            factors.Factor3 = Math.Max(pp, _falloffFactor);
+            factors.Factor4 = pp * _falloffFactor;
+
+            return factors;
+        }
+
+        private class BubbleFactors
+        {
+            public int x = 0;
+            public int y = 0;
+            public float Factor1 = 0;
+            public float Factor2 = 0;
+            public float Factor3 = 0;
+            public float Factor4 = 0;
+        }
+
+        private void ApplyButtonAlignment()
+        {
+            m_TabContentManager.BlockSpacing = 8;
+
+            if (m_ButtonAlignment == eBubbleButtonAlignment.Bottom)
+            {
+                m_ContentManager.ContentAlignment = eContentAlignment.Center;
+                m_ContentManager.ContentVerticalAlignment = eContentVerticalAlignment.Bottom;
+                m_ContentManager.BlockLineAlignment = eContentVerticalAlignment.Bottom;
+                m_ContentManager.ContentOrientation = eContentOrientation.Horizontal;
+
+                m_TabContentManager.ContentAlignment = eContentAlignment.Center;
+                m_TabContentManager.ContentVerticalAlignment = eContentVerticalAlignment.Bottom;
+                m_TabContentManager.BlockLineAlignment = eContentVerticalAlignment.Bottom;
+                m_TabContentManager.ContentOrientation = eContentOrientation.Horizontal;
+            }
+            else if (m_ButtonAlignment == eBubbleButtonAlignment.Top)
+            {
+                m_ContentManager.ContentAlignment = eContentAlignment.Center;
+                m_ContentManager.ContentVerticalAlignment = eContentVerticalAlignment.Top;
+                m_ContentManager.BlockLineAlignment = eContentVerticalAlignment.Top;
+                m_ContentManager.ContentOrientation = eContentOrientation.Horizontal;
+
+                m_TabContentManager.ContentAlignment = eContentAlignment.Center;
+                m_TabContentManager.ContentVerticalAlignment = eContentVerticalAlignment.Top;
+                m_TabContentManager.BlockLineAlignment = eContentVerticalAlignment.Top;
+                m_TabContentManager.ContentOrientation = eContentOrientation.Horizontal;
+            }
+            //			else if(m_ButtonAlignment==eBubbleButtonAlignment.Left)
+            //			{
+            //				m_ContentManager.ContentAlignment=eContentAlignment.Center;
+            //				m_ContentManager.ContentVerticalAlignment=eContentVerticalAlignment.Bottom;
+            //				m_ContentManager.ContentOrientation=eContentOrientation.Horizontal;
+            //			}
+        }
+        #endregion
+
+        #region Tabs Support
+        /// <summary>
+        /// Called after tab has been removed from the collection.
+        /// </summary>
+        /// <param name="tab">Tab that was removed.</param>
+        internal void OnTabRemoved(BubbleBarTab tab)
+        {
+            if (m_SelectedTab == tab)
+            {
+                SelectNextVisible(tab, eEventSource.Code, false);
+            }
+            if (this.DesignMode)
+            {
+                this.RecalcLayout();
+                this.Refresh();
+            }
+        }
+
+        /// <summary>
+        /// Called after tab has been added to the collection.
+        /// </summary>
+        /// <param name="tab">Newly added tab.</param>
+        internal void OnTabAdded(BubbleBarTab tab)
+        {
+            if (m_SelectedTab == null)
+                m_SelectedTab = tab;
+            this.LayoutButtons();
+            if (this.DesignMode)
+            {
+                this.RecalcLayout();
+                this.Refresh();
+            }
+        }
+
+        /// <summary>
+        /// Called after all tabs are removed from the collection.
+        /// </summary>
+        internal void OnTabsCleared()
+        {
+            m_SelectedTab = null;
+            this.LayoutButtons();
+            if (this.DesignMode)
+            {
+                this.RecalcLayout();
+                this.Refresh();
+            }
+        }
+
+        /// <summary>
+        /// Called after text of a tab has changed.
+        /// </summary>
+        /// <param name="tab">Tab which text has changed.</param>
+        internal void OnTabTextChanged(BubbleBarTab tab)
+        {
+            this.RecalcLayout();
+            this.Refresh();
+        }
+
+        /// <summary>
+        /// Called after Visible property of the tab has changed.
+        /// </summary>
+        /// <param name="tab">Tab affected.</param>
+        internal void OnTabVisibleChanged(BubbleBarTab tab)
+        {
+            if (m_SelectedTab == tab)
+            {
+                SelectNextVisible(tab, eEventSource.Code, false);
+            }
+            this.LayoutButtons();
+            this.Refresh();
+        }
+
+        private void OnSelectedTabChanged()
+        {
+            StopBubbleEffect();
+            m_IgnoreButtonMouseMove = null;
+            LayoutButtons();
+            this.Refresh();
+        }
+
+        internal BubbleBarTab GetMouseOverTab()
+        {
+            return m_MouseOverTab;
+        }
+
+        private void SelectNextVisible(BubbleBarTab reference, eEventSource source, bool bCanCancel)
+        {
+            BubbleBarTab sel = m_Tabs.GetNextVisibleTab(reference);
+            if (sel == null)
+                sel = m_Tabs.GetPreviousVisibleTab(reference);
+            SetSelectedTab(sel, source, bCanCancel);
+        }
+
+        private void SetSelectedTab(BubbleBarTab tab, eEventSource source, bool bCanCancel)
+        {
+            if (TabChanging != null)
+            {
+                BubbleBarTabChangingEventArgs e = new BubbleBarTabChangingEventArgs();
+                e.CurrentTab = m_SelectedTab;
+                e.NewTab = tab;
+                e.Source = source;
+                TabChanging(this, e);
+                if (e.Cancel && bCanCancel) return;
+            }
+            m_SelectedTab = tab;
+            m_IgnoreButtonMouseMove = null;
+            this.LayoutButtons();
+            this.RepaintAll();
+        }
+
+        /// <summary>
+        /// Sets the tab mouse is placed over.
+        /// </summary>
+        /// <param name="tab">Tab that mouse is currently over or null if mouse is not over any tab.</param>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void SetMouseOverTab(BubbleBarTab tab)
+        {
+            if (m_MouseOverTab == tab)
+                return;
+
+            m_MouseOverTab = tab;
+
+            this.Invalidate(GetTabBounds());
+            this.Update();
+        }
+        #endregion
+
+        #region Drag & Drop support
+        private BubbleBarTab m_DragTab = null;
+        private int m_DragTabOriginalIndex = -1;
+        private int m_DragButtonOriginalIndex = -1;
+        private BubbleButton m_DragButton = null;
+        private bool m_DragInProgress = false;
+        [EditorBrowsable(EditorBrowsableState.Never), Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool DragInProgress
+        {
+            get { return m_DragInProgress; }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void StartDrag(BubbleBarTab tab)
+        {
+            if (m_DragInProgress)
+                return;
+
+            m_DragInProgress = true;
+            m_DragTab = tab;
+            Cursor.Current = Cursors.Hand;
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void StartDrag(BubbleButton button)
+        {
+            if (m_DragInProgress)
+                return;
+
+            m_DragInProgress = true;
+            m_DragButton = button;
+            Cursor.Current = Cursors.Hand;
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void DragMouseMove(Point mousePosition)
+        {
+            if (m_DragTab != null)
+            {
+                BubbleBarTab tab = GetTabAt(mousePosition);
+                if (tab != null && tab != m_DragTab)
+                {
+                    if (m_DragTabOriginalIndex == -1)
+                        m_DragTabOriginalIndex = this.Tabs.IndexOf(m_DragTab);
+                    int insertPos = this.Tabs.IndexOf(tab);
+                    this.Tabs.Remove(m_DragTab);
+                    this.Tabs.Insert(insertPos, m_DragTab);
+                    this.SelectedTab = m_DragTab;
+                }
+            }
+            else if (m_DragButton != null)
+            {
+                BubbleBarTab tab = GetTabAt(mousePosition);
+                if (tab != null && tab != m_DragButton.Parent)
+                {
+                    // Move button to the tab and select that tab
+                    if (m_DragTabOriginalIndex == -1)
+                        m_DragTabOriginalIndex = this.Tabs.IndexOf(m_DragButton.Parent);
+                    if (m_DragButtonOriginalIndex == -1)
+                        m_DragButtonOriginalIndex = m_DragButton.Parent.Buttons.IndexOf(m_DragButton);
+                    this.SelectedTab = tab;
+                    BubbleButton b = GetButtonAt(mousePosition);
+                    if (m_DragButton.Parent != null)
+                        m_DragButton.Parent.Buttons.Remove(m_DragButton);
+                    if (b != null)
+                        tab.Buttons.Insert(tab.Buttons.IndexOf(b), m_DragButton);
+                    else
+                        tab.Buttons.Add(m_DragButton);
+                    this.RecalcLayout();
+                    this.Refresh();
+                }
+                else
+                {
+                    BubbleButton button = GetButtonAt(mousePosition);
+                    if (button != null && button != m_DragButton)
+                    {
+                        if (m_DragTabOriginalIndex == -1)
+                            m_DragTabOriginalIndex = this.Tabs.IndexOf(m_DragButton.Parent);
+                        if (m_DragButtonOriginalIndex == -1)
+                            m_DragButtonOriginalIndex = m_DragButton.Parent.Buttons.IndexOf(m_DragButton);
+                        BubbleBarTab parent = m_DragButton.Parent;
+                        int insertIndex = parent.Buttons.IndexOf(button);
+                        parent.Buttons.Remove(m_DragButton);
+                        parent.Buttons.Insert(insertIndex, m_DragButton);
+                        this.RecalcLayout();
+                        this.Refresh();
+                    }
+                }
+            }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void DragMouseUp(Point mousePosition)
+        {
+            if (m_DragTab != null)
+            {
+                BubbleBarTab tab = GetTabAt(mousePosition);
+                if (tab != m_DragTab)
+                {
+                    DragCancel();
+                }
+                else
+                {
+                    m_DragTab = null;
+                    m_DragTabOriginalIndex = -1;
+                }
+            }
+            else if (m_DragButton != null)
+            {
+                BubbleButton button = GetButtonAt(mousePosition);
+                if (button != m_DragButton)
+                    DragCancel();
+                else
+                {
+                    m_DragButton = null;
+                    m_DragTabOriginalIndex = -1;
+                    m_DragButtonOriginalIndex = -1;
+                }
+            }
+
+            m_DragInProgress = false;
+        }
+
+        internal void DragCancel()
+        {
+            if (!m_DragInProgress)
+                return;
+
+            if (m_DragTab != null)
+            {
+                if (m_DragTabOriginalIndex >= 0)
+                {
+                    this.Tabs.Remove(m_DragTab);
+                    this.Tabs.Insert(m_DragTabOriginalIndex, m_DragTab);
+                    this.RecalcLayout();
+                    this.Refresh();
+                }
+                m_DragTab = null;
+                m_DragTabOriginalIndex = -1;
+            }
+            else if (m_DragButton != null)
+            {
+                if (m_DragButtonOriginalIndex >= 0)
+                {
+                    if (m_DragButton.Parent != null)
+                        m_DragButton.Parent.Buttons.Remove(m_DragButton);
+                    if (m_DragTabOriginalIndex >= 0 && m_DragTabOriginalIndex != this.Tabs.IndexOf(m_DragButton.Parent))
+                    {
+                        this.Tabs[m_DragTabOriginalIndex].Buttons.Insert(m_DragButtonOriginalIndex, m_DragButton);
+                    }
+                    else
+                        this.Tabs[m_DragTabOriginalIndex].Buttons.Insert(m_DragButtonOriginalIndex, m_DragButton);
+                    m_DragButtonOriginalIndex = -1;
+                    m_DragTabOriginalIndex = -1;
+                    m_DragButton = null;
+                    this.RecalcLayout();
+                    this.Refresh();
+                }
+            }
+
+            m_DragInProgress = false;
+        }
+        #endregion
+
+        #region ISupportInitialize
+        void ISupportInitialize.BeginInit()
+        {
+        }
+        void ISupportInitialize.EndInit()
+        {
+            //this.RecalcLayout();
+        }
+        #endregion
+
+        #region IMessageHandlerClient Implementation
+
+        bool IMessageHandlerClient.IsModal
+        {
+            get
+            {
+                Form form = this.FindForm();
+                if (form != null)
+                    return form.Modal;
+                return false;
+            }
+        }
+        bool IMessageHandlerClient.OnMouseWheel(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+            return false;
+        }
+        bool IMessageHandlerClient.OnKeyDown(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+            // Check Shortcuts
+            int wParamInt = WinApi.ToInt(wParam);
+            if (System.Windows.Forms.Control.ModifierKeys != Keys.None || wParamInt >= (int)eShortcut.F1 && wParamInt <= (int)eShortcut.F12)
+            {
+                int i = (int)System.Windows.Forms.Control.ModifierKeys | wParamInt;
+                if (ProcessShortcut((eShortcut)i))
+                    return true;
+            }
+            return false;
+        }
+        private bool ProcessShortcut(eShortcut key)
+        {
+            Form form = this.FindForm();
+            if (form == null || (form != Form.ActiveForm && form.MdiParent == null ||
+                form.MdiParent != null && form.MdiParent.ActiveMdiChild != form) && !form.IsMdiContainer || Form.ActiveForm != null && Form.ActiveForm.Modal && Form.ActiveForm != form)
+                return false;
+
+            if (m_HasShortcuts)
+            {
+                foreach (BubbleBarTab t in this.Tabs)
+                {
+                    foreach (BubbleButton b in t.Buttons)
+                    {
+                        if (b.Shortcut == key && b.Enabled)
+                        {
+                            b.InvokeClick(eEventSource.Keyboard, MouseButtons.None);
+                            return true;
+                        }
+                    }
+                }
+            }
+            return false;
+        }
+        bool IMessageHandlerClient.OnMouseDown(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+            return false;
+        }
+        bool IMessageHandlerClient.OnMouseMove(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+            return false;
+        }
+        bool IMessageHandlerClient.OnSysKeyDown(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+            if (!this.DesignMode)
+            {
+                // Check Shortcuts
+                int wParamInt = WinApi.ToInt(wParam);
+                if (System.Windows.Forms.Control.ModifierKeys != Keys.None || wParamInt >= (int)eShortcut.F1 && wParamInt <= (int)eShortcut.F12)
+                {
+                    int i = (int)System.Windows.Forms.Control.ModifierKeys | wParamInt;
+                    if (ProcessShortcut((eShortcut)i))
+                        return true;
+                }
+            }
+            return false;
+        }
+        bool IMessageHandlerClient.OnSysKeyUp(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+            return false;
+        }
+        private void InstallIMessageHandlerClient()
+        {
+            if (!m_FilterInstalled && !this.DesignMode)
+            {
+                MessageHandler.RegisterMessageClient(this);
+                m_FilterInstalled = true;
+            }
+        }
+        private void UninstallIMessageHandlerClient()
+        {
+            if (m_FilterInstalled)
+            {
+                MessageHandler.UnregisterMessageClient(this);
+                m_FilterInstalled = false;
+            }
+        }
+        #endregion
+
+        #region Licensing
+#if !TRIAL
+        private string m_LicenseKey = "";
+        [Browsable(false), DefaultValue("")]
+        public string LicenseKey
+        {
+            get { return m_LicenseKey; }
+            set
+            {
+                if (NativeFunctions.ValidateLicenseKey(value))
+                    return;
+                m_LicenseKey = (!NativeFunctions.CheckLicenseKey(value) ? "9dsjkhds7" : value);
+            }
+        }
+#endif
+        #endregion
+
+    }
+
+    #region Event handlers declaration
+    /// <summary>
+    /// Delegate for tab change events.
+    /// </summary>
+    public delegate void BubbleBarTabChangingEventHadler(object sender, BubbleBarTabChangingEventArgs e);
+    #endregion
+
+    #region Event Arguments
+    /// <summary>
+    /// Represents the event arguments tab changing events.
+    /// </summary>
+    public class BubbleBarTabChangingEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Cancels the operation.
+        /// </summary>
+        public bool Cancel = false;
+        /// <summary>
+        /// Specifies the event source.
+        /// </summary>
+        public eEventSource Source = eEventSource.Code;
+        /// <summary>
+        /// Specifies newly selected tab.
+        /// </summary>
+        public BubbleBarTab NewTab = null;
+        /// <summary>
+        /// Specifies currently selected tab.
+        /// </summary>
+        public BubbleBarTab CurrentTab = null;
+        /// <summary>
+        /// Default Constructor.
+        /// </summary>
+        public BubbleBarTabChangingEventArgs() { }
+    }
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/BubbleBarDesigner.cs b/PROMS/DotNetBar Source Code/BubbleBarDesigner.cs
new file mode 100644
index 00000000..e2d750b9
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/BubbleBarDesigner.cs	
@@ -0,0 +1,625 @@
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.ComponentModel.Design;
+using System.Drawing;
+using System.Reflection;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Represents Windows Forms designer for BubbleBar control.
+	/// </summary>
+	public class BubbleBarDesigner:System.Windows.Forms.Design.ControlDesigner
+	{
+		#region Private Variables
+		private bool m_IgnoreMouseUp=false;
+		private Point m_MouseDownPosition=Point.Empty;
+		private bool m_Capture=false;
+
+		#endregion
+
+
+		public BubbleBarDesigner()
+		{
+		}
+
+		public override void Initialize(IComponent component) 
+		{
+			base.Initialize(component);
+			if(!component.Site.DesignMode)
+				return;
+
+			ISelectionService ss =(ISelectionService)GetService(typeof(ISelectionService));
+			if(ss!=null)
+				ss.SelectionChanged+=new EventHandler(OnSelectionChanged);
+
+			// If our component is removed we need to clean-up
+			IComponentChangeService cc=(IComponentChangeService)GetService(typeof(IComponentChangeService));
+			if(cc!=null)
+				cc.ComponentRemoving+=new ComponentEventHandler(this.OnComponentRemoving);
+		}
+
+		protected override void Dispose(bool disposing)
+		{
+			ISelectionService ss =(ISelectionService)GetService(typeof(ISelectionService));
+			if(ss!=null)
+				ss.SelectionChanged-=new EventHandler(OnSelectionChanged);
+
+			// If our component is removed we need to clean-up
+			IComponentChangeService cc=(IComponentChangeService)GetService(typeof(IComponentChangeService));
+			if(cc!=null)
+				cc.ComponentRemoving-=new ComponentEventHandler(this.OnComponentRemoving);
+
+			base.Dispose(disposing);
+		}
+
+		public override DesignerVerbCollection Verbs 
+		{
+			get 
+			{
+				DesignerVerb[] verbs = new DesignerVerb[]
+					{
+						new DesignerVerb("Create Tab", new EventHandler(CreateTab)),
+						new DesignerVerb("Create Button", new EventHandler(CreateButton))};
+				return new DesignerVerbCollection(verbs);
+			}
+		}
+
+#if FRAMEWORK20
+        public override void InitializeNewComponent(IDictionary defaultValues)
+        {
+            base.InitializeNewComponent(defaultValues);
+            SetDesignTimeDefaults();
+        }
+#else
+		public override void OnSetComponentDefaults()
+		{
+			base.OnSetComponentDefaults();
+			SetDesignTimeDefaults();
+		}
+#endif
+
+        private void SetDesignTimeDefaults()
+        {
+            BubbleBar bar = this.Component as BubbleBar;
+            if (bar == null)
+                return;
+            // Setup default back style
+            bar.ButtonBackAreaStyle.SetColorScheme(new ColorScheme(eDotNetBarStyle.Office2003));
+            bar.ButtonBackAreaStyle.BackColor = Color.FromArgb(66, Color.DimGray);
+            bar.ButtonBackAreaStyle.BorderColor = Color.FromArgb(180, Color.WhiteSmoke);
+            bar.ButtonBackAreaStyle.BorderTop = eStyleBorderType.Solid;
+            bar.ButtonBackAreaStyle.BorderTopWidth = 1;
+            bar.ButtonBackAreaStyle.BorderBottom = eStyleBorderType.Solid;
+            bar.ButtonBackAreaStyle.BorderBottomWidth = 1;
+            bar.ButtonBackAreaStyle.BorderLeft = eStyleBorderType.Solid;
+            bar.ButtonBackAreaStyle.BorderLeftWidth = 1;
+            bar.ButtonBackAreaStyle.BorderRight = eStyleBorderType.Solid;
+            bar.ButtonBackAreaStyle.BorderRightWidth = 1;
+            bar.ButtonBackAreaStyle.PaddingBottom = 3;
+            bar.ButtonBackAreaStyle.PaddingTop = 3;
+            bar.ButtonBackAreaStyle.PaddingLeft = 3;
+            bar.ButtonBackAreaStyle.PaddingRight = 3;
+            bar.SelectedTabColors.BorderColor = Color.Black;
+            bar.MouseOverTabColors.BorderColor = SystemColors.Highlight;
+        }
+
+		private void OnSelectionChanged(object sender, EventArgs e) 
+		{
+			ISelectionService ss =(ISelectionService)GetService(typeof(ISelectionService));
+			if(ss==null)
+				return;
+
+			bool refresh=ResetFocus();
+			if(ss.PrimarySelection is BubbleBarTab)
+			{
+				if(((BubbleBarTab)ss.PrimarySelection).Parent==this.Control)
+				{
+					((BubbleBarTab)ss.PrimarySelection).Focus=true;
+					refresh=true;
+				}
+			}
+			else if(ss.PrimarySelection is BubbleButton)
+			{
+				if(((BubbleButton)ss.PrimarySelection).Parent.Parent==this.Control)
+				{
+					((BubbleButton)ss.PrimarySelection).Focus=true;
+					refresh=true;
+				}
+			}
+
+			if(refresh)
+				this.Control.Refresh();
+		}
+
+		private bool ResetFocus()
+		{
+			bool refresh=false;
+			BubbleBar bar=this.Control as BubbleBar;
+			foreach(BubbleBarTab tab in bar.Tabs)
+			{
+				if(tab.Focus)
+				{
+					tab.Focus=false;
+					refresh=true;
+				}
+				foreach(BubbleButton button in tab.Buttons)
+				{
+					if(button.Focus)
+					{
+						button.Focus=false;
+						refresh=true;
+					}
+				}
+			}
+			return refresh;
+		}
+
+		private void OnComponentRemoving(object sender,ComponentEventArgs e)
+		{
+			if(e.Component==this.Component)
+				ThisComponentRemoving(sender,e);
+			else if(e.Component is BubbleBarTab)
+			{
+				BubbleBarTab tab=e.Component as BubbleBarTab;
+				if(tab.Parent==this.Control)
+				{
+					IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+					foreach(BubbleButton button in tab.Buttons)
+						dh.DestroyComponent(button);
+					BubbleBar bar=this.Component as BubbleBar;
+					bar.Tabs.Remove(tab);
+					bar.RecalcLayout();
+					bar.Refresh();
+				}
+			}
+			else if(e.Component is BubbleButton)
+			{
+				BubbleButton button=e.Component as BubbleButton;
+				if(button.GetBubbleBar()==this.Control)
+				{
+					button.Parent.Buttons.Remove(button);
+					BubbleBar bar=this.Component as BubbleBar;
+					bar.RecalcLayout();
+					bar.Refresh();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Removes all tabs and buttons.
+		/// </summary>
+		protected virtual void ThisComponentRemoving(object sender, ComponentEventArgs e)
+		{
+			//m_InternalRemoving=true;
+//			try
+//			{
+				// Unhook events
+				IComponentChangeService cc=(IComponentChangeService)GetService(typeof(IComponentChangeService));
+				if(cc!=null)
+					cc.ComponentRemoving-=new ComponentEventHandler(this.OnComponentRemoving);
+
+				ISelectionService ss =(ISelectionService)GetService(typeof(ISelectionService));
+				if(ss!=null)
+					ss.SelectionChanged-=new EventHandler(OnSelectionChanged);
+
+				IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+				BubbleBar bar=this.Component as BubbleBar;
+				if(dh==null)
+					return;
+
+				foreach(BubbleBarTab tab in bar.Tabs)
+				{
+					foreach(BubbleButton button in tab.Buttons)
+						dh.DestroyComponent(button);
+					dh.DestroyComponent(tab);
+				}
+			//}
+//			finally
+//			{
+//				m_InternalRemoving=false;
+//			}
+		}
+
+		private void CreateButton(object sender,EventArgs e)
+		{
+			BubbleBar bar=this.Control as BubbleBar;
+			if(bar==null)
+				return;
+
+			if(bar.SelectedTab==null)
+			{
+				BubbleBarTab tab=CreateTab();
+				IComponentChangeService change=this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+				if(change!=null)
+					change.OnComponentChanging(this.Component,TypeDescriptor.GetProperties(bar).Find("SelectedTab",true));
+				bar.SelectedTab=tab;
+				if(change!=null)
+					change.OnComponentChanged(this.Component,TypeDescriptor.GetProperties(bar).Find("SelectedTab",true),null,null);
+			}
+
+			if(bar.SelectedTab==null)
+				return;
+
+			BubbleButton button=CreateButton(bar.SelectedTab);
+
+			if(button==null)
+				return;
+
+			ISelectionService ss=(ISelectionService)GetService(typeof(ISelectionService));
+			if(ss!=null)
+			{
+				ArrayList list=new ArrayList();
+				list.Add(button);
+				ss.SetSelectedComponents(list);
+			}
+		}
+
+		private void CreateTab(object sender,EventArgs e)
+		{
+			BubbleBar bar=this.Control as BubbleBar;
+			if(bar==null)
+				return;
+
+			BubbleBarTab tab=CreateTab();
+			if(tab!=null)
+			{
+				if(bar.SelectedTab!=tab)
+				{
+					IComponentChangeService change=this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+					if(change!=null)
+						change.OnComponentChanging(this.Component,TypeDescriptor.GetProperties(bar).Find("SelectedTab",true));
+					bar.SelectedTab=tab;
+					if(change!=null)
+						change.OnComponentChanged(this.Component,TypeDescriptor.GetProperties(bar).Find("SelectedTab",true),null,null);
+				}
+
+				ISelectionService ss=(ISelectionService)GetService(typeof(ISelectionService));
+				if(ss!=null)
+				{
+					ArrayList list=new ArrayList();
+					list.Add(tab);
+					ss.SetSelectedComponents(list);
+				}
+			}
+		}
+
+		private BubbleBarTab CreateTab()
+		{
+			BubbleBar bar=this.Control as BubbleBar;
+			if(bar==null)
+				return null;
+			
+			IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+			if(dh==null)
+				return null;
+
+			IComponentChangeService change=this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+			if(change!=null)
+				change.OnComponentChanging(this.Component,TypeDescriptor.GetProperties(bar).Find("Tabs",true));
+
+			BubbleBarTab tab=dh.CreateComponent(typeof(BubbleBarTab)) as BubbleBarTab;
+			if(tab==null)
+				return null;
+            
+			tab.Text=tab.Name;
+			eTabItemColor color=eTabItemColor.Blue;
+			if(bar.Tabs.Count>0)
+			{
+				int tt=bar.Tabs.Count+1;
+				Type t=typeof(eTabItemColor);
+				FieldInfo[] fi=t.GetFields(BindingFlags.Public | BindingFlags.Static);
+				int count=fi.Length;
+                while(tt>count)
+					tt-=count;
+				if(tt==0) tt++;
+				color=(eTabItemColor)Enum.Parse(typeof(eTabItemColor),fi[tt].Name);
+			}
+			tab.PredefinedColor=color;
+
+			bar.Tabs.Add(tab);
+
+			if(change!=null)
+				change.OnComponentChanged(this.Component,TypeDescriptor.GetProperties(bar).Find("Tabs",true),null,null);
+
+			return tab;
+		}
+
+		private BubbleButton CreateButton(BubbleBarTab tab)
+		{
+			BubbleBar bar=this.Control as BubbleBar;
+			if(bar==null)
+				return null;
+			
+			IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+			if(dh==null)
+				return null;
+
+			IComponentChangeService change=this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+			if(change!=null)
+				change.OnComponentChanging(this.Component,TypeDescriptor.GetProperties(tab).Find("Buttons",true));
+
+			BubbleButton button=dh.CreateComponent(typeof(BubbleButton)) as BubbleButton;
+			if(button==null)
+				return null;
+            button.Image=BarFunctions.LoadBitmap("SystemImages.Note24.png");
+			button.ImageLarge=BarFunctions.LoadBitmap("SystemImages.Note64.png");
+			tab.Buttons.Add(button);
+
+			if(change!=null)
+				change.OnComponentChanged(this.Component,TypeDescriptor.GetProperties(tab).Find("Buttons",true),null,null);
+
+			return button;
+		}
+
+		/// <summary>
+		/// Returns all components associated with this control
+		/// </summary>
+		public override System.Collections.ICollection AssociatedComponents
+		{
+			get
+			{
+				ArrayList c=new ArrayList(base.AssociatedComponents);
+				BubbleBar bar=this.Control as BubbleBar;
+				if(bar!=null)
+				{
+					foreach(BubbleBarTab tab in bar.Tabs)
+					{
+						c.Add(tab);
+						GetTabComponents(tab,c);
+					}
+				}
+				return c;
+			}
+		}
+
+		private void GetTabComponents(BubbleBarTab tab, ArrayList c)
+		{
+			foreach(BubbleButton b in tab.Buttons)
+				c.Add(b);
+		}
+
+		protected override void OnSetCursor()
+		{
+			BubbleBar bar=this.Control as BubbleBar;
+			Point pos=bar.PointToClient(System.Windows.Forms.Control.MousePosition);
+			BubbleButton button=bar.GetButtonAt(pos);
+			if(button!=null)
+			{
+				Cursor.Current=Cursors.Default;
+				return;
+			}
+			BubbleBarTab tab=bar.GetTabAt(pos);
+			if(tab!=null)
+			{
+				Cursor.Current=Cursors.Default;
+				return;
+			}
+			base.OnSetCursor();
+		}
+
+		/// <summary>
+		/// Selection support for items on container.
+		/// </summary>
+		protected override void WndProc(ref Message m)
+		{
+			switch(m.Msg)
+			{
+				case NativeFunctions.WM_LBUTTONDOWN:
+				case NativeFunctions.WM_RBUTTONDOWN:
+				{
+					if(OnMouseDown(ref m))
+						return;
+					break;
+				}
+				case NativeFunctions.WM_RBUTTONUP:
+				case NativeFunctions.WM_LBUTTONUP:
+				{
+					if(OnMouseUp(ref m))
+						return;
+					break;
+				}
+				case NativeFunctions.WM_MOUSEMOVE:
+				{
+					if(OnMouseMove(ref m))
+						return;
+					break;
+				}
+				case NativeFunctions.WM_LBUTTONDBLCLK:
+				{
+					if(OnMouseDoubleClick(m))
+						return;
+					break;
+				}
+			}
+
+			base.WndProc(ref m);
+		}
+
+		private bool OnMouseDoubleClick(Message m)
+		{
+			bool processed=false;
+
+			ISelectionService selection = (ISelectionService) this.GetService(typeof(ISelectionService));
+			if(selection!=null && selection.PrimarySelection is BubbleButton && ((BubbleButton)selection.PrimarySelection).GetBubbleBar()==this.Control)
+			{
+				IDesignerHost host=(IDesignerHost) this.GetService(typeof(IDesignerHost));
+				if(host!=null)
+				{
+					IDesigner designer=host.GetDesigner(selection.PrimarySelection as IComponent);
+					if(designer!=null)
+					{
+						designer.DoDefaultAction();
+						processed=true;
+					}
+				}
+			}
+
+			return processed;
+		}
+
+		protected virtual bool OnMouseDown(ref Message m)
+		{
+			BubbleBar bar=this.Control as BubbleBar;
+
+			if(bar==null)
+				return false;
+
+			Point pos=bar.PointToClient(System.Windows.Forms.Control.MousePosition);
+			m_MouseDownPosition=pos;
+
+			BubbleButton button=bar.GetButtonAt(pos);
+			if(button!=null)
+			{
+				ISelectionService selection = (ISelectionService) this.GetService(typeof(ISelectionService));
+				if(selection!=null)
+				{
+					ArrayList arr=new ArrayList(1);
+					arr.Add(button);
+#if FRAMEWORK20
+                    selection.SetSelectedComponents(arr, SelectionTypes.Primary);
+#else
+                    selection.SetSelectedComponents(arr,SelectionTypes.MouseDown);
+#endif
+                    m_IgnoreMouseUp =true;
+
+					if(m.Msg==NativeFunctions.WM_RBUTTONDOWN)
+					{
+						this.OnContextMenu(System.Windows.Forms.Control.MousePosition.X,System.Windows.Forms.Control.MousePosition.Y);
+					}
+
+					return true;
+				}
+			}
+
+			BubbleBarTab tab=bar.GetTabAt(pos);
+			if(tab!=null)
+			{
+				ISelectionService selection = (ISelectionService) this.GetService(typeof(ISelectionService));
+				if(selection!=null && selection.PrimarySelection!=tab)
+				{
+					ArrayList arr=new ArrayList(1);
+					arr.Add(tab);
+#if FRAMEWORK20
+                    selection.SetSelectedComponents(arr, SelectionTypes.Primary);
+#else
+                    selection.SetSelectedComponents(arr,SelectionTypes.MouseDown);
+#endif
+
+                    if (bar.SelectedTab!=tab)
+					{
+						IComponentChangeService change=this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+						if(change!=null)
+							change.OnComponentChanging(this.Component,TypeDescriptor.GetProperties(bar).Find("SelectedTab",true));
+
+						bar.SelectedTab=tab;
+
+						if(change!=null)
+							change.OnComponentChanged(this.Component,TypeDescriptor.GetProperties(bar).Find("SelectedTab",true),null,null);
+					}
+					m_IgnoreMouseUp=true;
+					if(m.Msg!=NativeFunctions.WM_RBUTTONDOWN)
+						return true;
+				}
+
+				if(m.Msg==NativeFunctions.WM_RBUTTONDOWN)
+				{
+					this.OnContextMenu(System.Windows.Forms.Control.MousePosition.X,System.Windows.Forms.Control.MousePosition.Y);
+					return true;
+				}
+			}
+					
+			return false;
+		}
+
+		protected virtual bool OnMouseMove(ref Message m)
+		{
+			BubbleBar bar=this.Control as BubbleBar;
+			Point pos=bar.PointToClient(System.Windows.Forms.Control.MousePosition);
+
+			if(Control.MouseButtons==MouseButtons.Left)
+			{
+				if(bar.DragInProgress)
+				{
+					bar.DragMouseMove(pos);
+					return true;
+				}
+				else if(!m_MouseDownPosition.IsEmpty && Math.Abs(m_MouseDownPosition.X-pos.X)>=2 || Math.Abs(m_MouseDownPosition.Y-pos.Y)>=2)
+				{
+					BubbleBarTab tabDrag=bar.GetTabAt(pos);
+					if(tabDrag!=null)
+					{
+						bar.StartDrag(tabDrag);
+						System.Windows.Forms.Control c=System.Windows.Forms.Control.FromHandle(m.HWnd);
+						if(c!=null)
+						{
+							m_Capture=true;
+							c.Capture=true;
+						}
+						return true;
+					}
+					BubbleButton buttonDrag=bar.GetButtonAt(pos);
+					if(buttonDrag!=null)
+					{
+						bar.StartDrag(buttonDrag);
+						System.Windows.Forms.Control c=System.Windows.Forms.Control.FromHandle(m.HWnd);
+						if(c!=null)
+						{
+							m_Capture=true;
+							c.Capture=true;
+						}
+						return true;
+					}
+					m_MouseDownPosition=Point.Empty;
+				}
+			}
+
+			//BubbleButton button=bar.GetButtonAt(pos);
+			BubbleBarTab tab=bar.GetTabAt(pos);
+			if(tab!=null)
+				bar.SetMouseOverTab(tab);
+			else
+				bar.SetMouseOverTab(null);
+
+			return false;
+		}
+
+		private bool OnMouseUp(ref Message m)
+		{
+			if(m_Capture)
+			{
+				System.Windows.Forms.Control c=System.Windows.Forms.Control.FromHandle(m.HWnd);
+				if(c!=null)
+					c.Capture=false;
+				m_Capture=false;
+			}
+
+            BubbleBar bar=this.Control as BubbleBar;
+			if(bar!=null && bar.DragInProgress)
+			{
+				Point pos=bar.PointToClient(System.Windows.Forms.Control.MousePosition);
+				bar.DragMouseUp(pos);
+				
+				BubbleBarTab tab=bar.SelectedTab;
+				if(tab!=null)
+				{
+					IComponentChangeService change=this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+					if(change!=null)
+						change.OnComponentChanging(this.Component,TypeDescriptor.GetProperties(tab).Find("Buttons",true));
+					if(change!=null)
+						change.OnComponentChanged(this.Component,TypeDescriptor.GetProperties(tab).Find("Buttons",true),null,null);
+				}
+			}
+
+			if(m_IgnoreMouseUp)
+			{
+				m_IgnoreMouseUp=false;
+				return true;
+			}
+
+			return false;
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/BubbleBarOverlay.cs b/PROMS/DotNetBar Source Code/BubbleBarOverlay.cs
new file mode 100644
index 00000000..da016f52
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/BubbleBarOverlay.cs	
@@ -0,0 +1,282 @@
+using System;
+using System.Drawing;
+using System.Drawing.Imaging;
+using System.Drawing.Text;
+using System.Windows.Forms;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Represents overlay class to support bubble effects on BubbleBar control.
+	/// </summary>
+	[ToolboxItem(false)]
+	internal class BubbleBarOverlay:Control
+	{
+		#region Private Variables
+		private BubbleBar m_BubbleBar=null;
+		private Timer m_VisibilityTimer=null;
+		#endregion
+
+		#region Internal Implementation
+		public BubbleBarOverlay(BubbleBar parent)
+		{
+			if(parent==null)
+				throw new InvalidOperationException("Parent BubbleBar object for BubbleBarOverlay cannot be null.");
+
+			m_BubbleBar=parent;
+			this.SetStyle(ControlStyles.UserPaint,true);
+			this.SetStyle(ControlStyles.AllPaintingInWmPaint,true);
+			this.SetStyle(ControlStyles.Opaque,true);
+			this.SetStyle(ControlStyles.ResizeRedraw,true);
+			//this.SetStyle(DisplayHelp.DoubleBufferFlag,true);
+			this.SetStyle(ControlStyles.SupportsTransparentBackColor,true);
+			this.SetStyle(ControlStyles.ContainerControl,false);
+			this.SetStyle(ControlStyles.Selectable,false);
+			this.BackColor=Color.Transparent;
+		}
+
+		protected override void OnPaint(PaintEventArgs e){}
+
+		internal void UpdateWindow()
+		{
+			// Create bitmap for drawing onto
+			Bitmap memoryBitmap = new Bitmap(this.Width, this.Height, PixelFormat.Format32bppArgb);
+
+			using(Graphics g = Graphics.FromImage(memoryBitmap))
+			{
+				// Draw the background area
+				g.Clear(Color.Transparent);
+				g.CompositingMode=System.Drawing.Drawing2D.CompositingMode.SourceCopy;
+
+                g.TextRenderingHint = DisplayHelp.AntiAliasTextRenderingHint;
+				g.SmoothingMode=System.Drawing.Drawing2D.SmoothingMode.AntiAlias;
+
+				PaintEventArgs p=new PaintEventArgs(g,this.DisplayRectangle);
+				m_BubbleBar.OnPaintOverlay(p);
+				
+				// Get hold of the screen DC
+				IntPtr hDC = NativeFunctions.GetDC(IntPtr.Zero);
+				
+				// Create a memory based DC compatible with the screen DC
+				IntPtr memoryDC = WinApi.CreateCompatibleDC(hDC);
+				
+				// Get access to the bitmap handle contained in the Bitmap object
+				IntPtr hBitmap = memoryBitmap.GetHbitmap(Color.FromArgb(0));
+
+				// Select this bitmap for updating the window presentation
+				IntPtr oldBitmap = WinApi.SelectObject(memoryDC, hBitmap);
+
+				// New window size
+				NativeFunctions.SIZE ulwsize;
+				ulwsize.cx = this.Width;
+				ulwsize.cy = this.Height;
+
+				// New window position
+				NativeFunctions.POINT topPos;
+				topPos.x = this.Left;
+				topPos.y = this.Top;
+
+				// Offset into memory bitmap is always zero
+				NativeFunctions.POINT pointSource;
+				pointSource.x = 0;
+				pointSource.y = 0;
+
+				// We want to make the entire bitmap opaque 
+				NativeFunctions.BLENDFUNCTION blend = new NativeFunctions.BLENDFUNCTION();
+				blend.BlendOp             = (byte)NativeFunctions.Win23AlphaFlags.AC_SRC_OVER;
+				blend.BlendFlags          = 0;
+				blend.SourceConstantAlpha = 255;
+				blend.AlphaFormat         = (byte)NativeFunctions.Win23AlphaFlags.AC_SRC_ALPHA;
+
+				// Tell operating system to use our bitmap for painting
+				NativeFunctions.UpdateLayeredWindow(this.Handle, hDC, ref topPos, ref ulwsize, 
+					memoryDC, ref pointSource, 0, ref blend, 
+					(int)NativeFunctions.Win32UpdateLayeredWindowsFlags.ULW_ALPHA);
+				// Put back the old bitmap handle
+				WinApi.SelectObject(memoryDC, oldBitmap);
+
+				// Cleanup resources
+                WinApi.ReleaseDC(IntPtr.Zero, hDC);
+                WinApi.DeleteObject(hBitmap);
+                WinApi.DeleteDC(memoryDC);
+			}
+		}
+
+		protected override void OnMouseEnter(EventArgs e)
+		{
+			this.Capture=true;
+			base.OnMouseEnter (e);
+		}
+
+		protected override void OnMouseMove(MouseEventArgs e)
+		{
+			if(!this.DisplayRectangle.Contains(e.X,e.Y))
+				this.Capture=false;
+			m_BubbleBar.MouseMoveMessage(e);
+			base.OnMouseMove (e);	
+		}
+
+		protected override void OnMouseLeave(EventArgs e)
+		{
+			m_BubbleBar.MouseLeaveMessage(e);
+			base.OnMouseLeave(e);	
+		}
+
+		protected override void OnMouseDown(MouseEventArgs e)
+		{
+			m_BubbleBar.OverlayMouseDownMessage(e);
+			base.OnMouseDown (e);
+		}
+
+		protected override void OnMouseUp(MouseEventArgs e)
+		{
+			m_BubbleBar.OverlayMouseUpMessage(e);
+			base.OnMouseUp(e);
+		}
+
+		protected override void WndProc(ref Message m)
+		{
+			const int WM_MOUSEACTIVATE = 0x21;
+			const int MA_NOACTIVATE = 3;
+			if(m.Msg==WM_MOUSEACTIVATE)
+			{
+				m.Result=new System.IntPtr(MA_NOACTIVATE);
+				return;
+			}
+			base.WndProc(ref m);
+		}
+
+		protected override CreateParams CreateParams
+		{
+			get
+			{
+				const uint WS_POPUP=0x80000000;
+				const uint WS_CLIPSIBLINGS=0x04000000;
+				const uint WS_CLIPCHILDREN=0x02000000;
+				const int WS_EX_LAYERED=0x00080000;
+				const int WS_EX_TOOLWINDOW=0x00000080;
+				CreateParams p=base.CreateParams;
+				p.ExStyle=(p.ExStyle | WS_EX_LAYERED | WS_EX_TOOLWINDOW);
+				p.Style=unchecked((int)(WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN));
+				p.Caption="";
+				return p;
+			}
+		}
+
+		private void CreateTimer()
+		{
+			if(m_VisibilityTimer!=null)
+				return;
+			m_VisibilityTimer=new Timer();
+			m_VisibilityTimer.Tick+=new EventHandler(this.CheckVisibility);
+            m_VisibilityTimer.Interval=500;
+			m_VisibilityTimer.Enabled=true;
+			m_VisibilityTimer.Start();
+		}
+
+		private void DestroyTimer()
+		{
+			if(m_VisibilityTimer==null)
+				return;
+			m_VisibilityTimer.Stop();
+			m_VisibilityTimer.Enabled=false;
+			m_VisibilityTimer.Dispose();
+			m_VisibilityTimer=null;
+		}
+
+		private void CheckVisibility(object sender,EventArgs e)
+		{
+            try
+            {
+                BubbleBar bar = m_BubbleBar;
+                if (bar == null || bar.IsDisposed)
+                {
+                    DestroyTimer();
+                    return;
+                }
+
+                Form form = bar.FindForm();
+                IntPtr foregroundWindow = NativeFunctions.GetForegroundWindow();
+                Control c = null;
+                if (foregroundWindow != IntPtr.Zero)
+                    c = Control.FromHandle(foregroundWindow);
+                if (c == null)
+                {
+                    OnOverlayInactive();
+                    return;
+                }
+                if (form != null)
+                {
+                    if (Form.ActiveForm == form)
+                        return;
+                    Form parentForm = form;
+                    while (parentForm.ParentForm != null)
+                    {
+                        if (parentForm.ParentForm == Form.ActiveForm)
+                            return;
+                        parentForm = parentForm.ParentForm;
+                    }
+
+                    if (form.IsMdiChild && form.MdiParent != null)
+                    {
+                        if (form.MdiParent.ActiveMdiChild == form)
+                            return;
+                    }
+                }
+
+                NativeFunctions.POINT p = new NativeFunctions.POINT();
+                Point pm = Control.MousePosition;
+                p.x = pm.X;
+                p.x = pm.Y;
+                IntPtr window = IntPtr.Zero;
+                if (bar.Parent != null)
+                    NativeFunctions.ChildWindowFromPoint(bar.Parent.Handle, p);
+                if (window == IntPtr.Zero)
+                {
+                    window = NativeFunctions.WindowFromPoint(p);
+                }
+                if (window != IntPtr.Zero && window != this.Handle && window != bar.Handle && bar.Parent != null && bar.Parent.Handle != window)
+                {
+                    OnOverlayInactive();
+                }
+                else
+                {
+                    Point pc = this.PointToClient(pm);
+                    if (!this.DisplayRectangle.Contains(pc))
+                    {
+                        bar.MouseLeaveMessage(e);
+                    }
+                }
+            }
+            catch (NullReferenceException)
+            {
+                DestroyTimer();
+            }
+		}
+
+		private void OnOverlayInactive()
+		{
+			this.Capture=false;
+			DestroyTimer();
+			m_BubbleBar.OverlayInactive();
+		}
+
+		/// <summary>
+		/// Called just before window is shown.
+		/// </summary>
+		internal void BeforeShow()
+		{
+			CreateTimer();
+		}
+
+		/// <summary>
+		/// Called after window is closed.
+		/// </summary>
+		internal void AfterClose()
+		{
+			DestroyTimer();
+		}
+		#endregion
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/BubbleBarTab.cs b/PROMS/DotNetBar Source Code/BubbleBarTab.cs
new file mode 100644
index 00000000..364e4c5b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/BubbleBarTab.cs	
@@ -0,0 +1,495 @@
+using System.Collections;
+using System.ComponentModel;
+using System.ComponentModel.Design;
+using System.Drawing;
+using System.Windows.Forms;
+using DevComponents.UI.ContentManager;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Summary description for BubbleBarGroup.
+	/// </summary>
+    [ToolboxItem(false), DesignTimeVisible(false), Designer("DevComponents.DotNetBar.Design.BubbleBarTabDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+	public class BubbleBarTab:Component,ISimpleTab,IBlock
+	{
+		#region Private Properties
+		private string m_Text="";
+		private BubbleBar m_Parent=null;
+		private bool m_Visible=true;
+		private Rectangle m_DisplayRectangle=Rectangle.Empty;
+		private Color m_BackColor=Color.Empty;
+		private Color m_BackColor2=Color.Empty;
+		private int m_BackColorGradientAngle=90;
+		private Color m_LightBorderColor=Color.Empty;
+		private Color m_DarkBorderColor=Color.Empty;
+		private Color m_BorderColor=Color.Empty;
+		private Color m_TextColor=Color.Empty;
+		private string m_Name="";
+		private eTabItemColor m_PredefinedColor=eTabItemColor.Default;
+		private object m_Tag=null;
+		private BubbleButtonCollection m_Buttons=null;
+		private bool m_Focus=false;
+		#endregion
+
+		#region Internal Implementation
+		/// <summary>
+		/// Default constructor.
+		/// </summary>
+		public BubbleBarTab():this(null){}
+
+		/// <summary>
+		/// Default constructor.
+		/// </summary>
+		/// <param name="container">Container object.</param>
+		public BubbleBarTab(IContainer container)
+		{
+			if(container!=null)
+				container.Add(this);
+			m_Buttons=new BubbleButtonCollection(this);
+		}
+
+
+		/// <summary>
+		/// Gets the collection of the buttons associated with the tab.
+		/// </summary>
+        [Browsable(true), DesignerSerializationVisibility(DesignerSerializationVisibility.Content), Category("Buttons"), Description("Returns collection of buttons on the tab."), Editor("DevComponents.DotNetBar.Design.BubbleButtonCollectionEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor))]
+		public BubbleButtonCollection Buttons
+		{
+			get {return m_Buttons;}
+		}
+
+		/// <summary>
+		/// Gets or sets the text displayed on the tab.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),Category("Appearance"),Description("Indicates the text displayed on the tab."),Localizable(true)]
+		public string Text
+		{
+			get {return m_Text;}
+			set
+			{
+				if(m_Text==value)
+					return;
+				m_Text=value;
+				if(m_Parent!=null)
+					m_Parent.OnTabTextChanged(this);
+				Refresh();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets whether tab is visible.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),DefaultValue(true),Category("Behavior"),Description("Indicates whether the tab is visible.")]
+		public bool Visible
+		{
+			get{return m_Visible;}
+			set
+			{
+				if(m_Visible==value)
+					return;
+				m_Visible=value;
+				if(m_Parent!=null)
+					m_Parent.OnTabVisibleChanged(this);
+				Refresh();
+			}
+		}
+
+		/// <summary>
+		/// Gets the display bounds of the tab.
+		/// </summary>
+		[Browsable(false)]
+		public Rectangle DisplayRectangle
+		{
+			get {return m_DisplayRectangle;}
+		}
+
+		/// <summary>
+		/// Gets or sets the object that contains data about the tab. Any Object derived type can be assigned to this property. If this property is being set through the Windows Forms designer, only text can be assigned.
+		/// </summary>
+		[Browsable(false),DefaultValue(null),Category("Data"),Description("Indicates text that contains data about the cell.")]
+		public object Tag
+		{
+			get
+			{
+				return m_Tag;
+			}
+			set
+			{
+				m_Tag=value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the object that contains data about the tab. Any Object derived type can be assigned to this property. If this property is being set through the Windows Forms designer, only text can be assigned.
+		/// </summary>
+		[Browsable(true),DefaultValue(""),Category("Data"),Description("Indicates text that contains data about the cell.")]
+		public string TagString
+		{
+			get
+			{
+				if(m_Tag==null)
+					return "";
+				return m_Tag.ToString();
+			}
+			set
+			{
+				m_Tag=value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the background color of the tab when inactive.
+		/// </summary>
+		[Browsable(true),Description("Indicates the inactive tab background color."),Category("Style")]
+		public Color BackColor
+		{
+			get {return m_BackColor;}
+			set
+			{
+				m_BackColor=value;
+				this.Refresh();
+			}
+		}
+		[Browsable(false),EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeBackColor()
+		{
+			return !m_BackColor.IsEmpty;
+		}
+		[Browsable(false),EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetBackColor()
+		{
+			BackColor=Color.Empty;
+		}
+
+		/// <summary>
+		/// Gets or sets the target gradient background color of the tab when inactive.
+		/// </summary>
+		[Browsable(true),Description("Indicates the inactive tab target gradient background color."),Category("Style")]
+		public Color BackColor2
+		{
+			get {return m_BackColor2;}
+			set
+			{
+				m_BackColor2=value;
+				this.Refresh();
+			}
+		}
+		[Browsable(false),EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeBackColor2()
+		{
+			return !m_BackColor2.IsEmpty;
+		}
+		[Browsable(false),EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetBackColor2()
+		{
+			BackColor2=Color.Empty;
+		}
+
+		/// <summary>
+		/// Gets or sets the gradient angle.
+		/// </summary>
+		[Browsable(true),Description("Indicates the gradient angle."),Category("Style"),DefaultValue(90)]
+		public int BackColorGradientAngle
+		{
+			get {return m_BackColorGradientAngle;}
+			set {m_BackColorGradientAngle=value;this.Refresh();}
+		}
+
+		/// <summary>
+		/// Gets or sets the light border color when tab is inactive.
+		/// </summary>
+		[Browsable(true),Description("Indicates the inactive tab light border color."),Category("Style")]
+		public Color LightBorderColor
+		{
+			get {return m_LightBorderColor;}
+			set
+			{
+				m_LightBorderColor=value;
+				this.Refresh();
+			}
+		}
+		[Browsable(false),EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeLightBorderColor()
+		{
+			return !m_LightBorderColor.IsEmpty;
+		}
+		[Browsable(false),EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetLightBorderColor()
+		{
+			LightBorderColor=Color.Empty;
+		}
+
+		/// <summary>
+		/// Gets or sets the dark border color when tab is inactive.
+		/// </summary>
+		[Browsable(true),Description("Indicates the inactive tab dark border color."),Category("Style")]
+		public Color DarkBorderColor
+		{
+			get {return m_DarkBorderColor;}
+			set
+			{
+				m_DarkBorderColor=value;
+				this.Refresh();
+			}
+		}
+		[Browsable(false),EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeDarkBorderColor()
+		{
+			return !m_DarkBorderColor.IsEmpty;
+		}
+		[Browsable(false),EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetDarkBorderColor()
+		{
+			DarkBorderColor=Color.Empty;
+		}
+
+		/// <summary>
+		/// Gets or sets the border color when tab is inactive.
+		/// </summary>
+		[Browsable(true),Description("Indicates the inactive tab border color."),Category("Style")]
+		public Color BorderColor
+		{
+			get {return m_BorderColor;}
+			set
+			{
+				m_BorderColor=value;
+				this.Refresh();
+			}
+		}
+		[Browsable(false),EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeBorderColor()
+		{
+			return !m_BorderColor.IsEmpty;
+		}
+		[Browsable(false),EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetBorderColor()
+		{
+			BorderColor=Color.Empty;
+		}
+
+		/// <summary>
+		/// Gets or sets the text color when tab is inactive.
+		/// </summary>
+		[Browsable(true),Description("Indicates the inactive tab text color."),Category("Style")]
+		public Color TextColor
+		{
+			get {return m_TextColor;}
+			set
+			{
+				m_TextColor=value;
+				this.Refresh();
+			}
+		}
+		[Browsable(false),EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeTextColor()
+		{
+			return !m_TextColor.IsEmpty;
+		}
+		[Browsable(false),EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetTextColor()
+		{
+			TextColor=Color.Empty;
+		}
+
+		public override string ToString()
+		{
+			return m_Text;
+		}
+
+		/// <summary>
+		/// Gets or sets name of the tab item that can be used to identify item from the code.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),Category("Design"),Description("Indicates the name used to identify item.")]
+		public string Name
+		{
+			get
+			{
+				if(this.Site!=null)
+					m_Name=this.Site.Name;
+				return m_Name;
+			}
+			set
+			{
+				if(this.Site!=null)
+					this.Site.Name=value;
+				if(value==null)
+					m_Name="";
+				else
+					m_Name=value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the predefined tab color.
+		/// </summary>
+		[Browsable(true), DefaultValue(eTabItemColor.Default),Category("Style"),Description("Applies predefined color to tab.")]
+		public eTabItemColor PredefinedColor
+		{
+			get {return m_PredefinedColor;}
+			set
+			{
+				m_PredefinedColor=value;
+				TabColorScheme.ApplyPredefinedColor(this,m_PredefinedColor);
+				this.Refresh();
+			}
+		}
+
+		/// <summary>
+		/// Returns the font for the tab text.
+		/// </summary>
+		/// <returns>Reference to the font object.</returns>
+		public Font GetTabFont()
+		{
+            if (m_Parent != null)
+                return m_Parent.Font;
+            else
+                return SystemFonts.DefaultFont;
+		}
+
+		/// <summary>
+		/// Returns true if tab is selected tab.
+		/// </summary>
+		[Browsable(false)]
+		public bool IsSelected
+		{
+			get
+			{
+				if(m_Parent!=null)
+				{
+					return (m_Parent.SelectedTab==this);
+				}
+					return false;
+			}
+		}
+
+		/// <summary>
+		/// Returns true if mouse is over the tab.
+		/// </summary>
+		[Browsable(false)]
+		public bool IsMouseOver
+		{
+			get
+			{
+				if(m_Parent!=null)
+					return (m_Parent.GetMouseOverTab()==this);
+				return false;
+			}
+		}
+
+		/// <summary>
+		/// Gets the tab alignment.
+		/// </summary>
+		eTabStripAlignment ISimpleTab.TabAlignment
+		{
+			get
+			{
+				if(m_Parent!=null)
+				{
+					if(m_Parent.Alignment==eBubbleButtonAlignment.Top)
+						return eTabStripAlignment.Bottom;
+				}
+				return eTabStripAlignment.Top;
+			}
+		}
+
+		/// <summary>
+		/// Returns reference to parent object or null if tab does not have parent.
+		/// </summary>
+		[Browsable(false)]
+		public BubbleBar Parent
+		{
+			get {return m_Parent;}
+		}
+
+		/// <summary>
+		/// Sets the parent of the tab.
+		/// </summary>
+		/// <param name="parent">Reference to the tab parent object or null.</param>
+		internal void SetParent(BubbleBar parent)
+		{
+			m_Parent=parent;
+		}
+
+		private void Refresh()
+		{
+			if(m_Parent!=null)
+			{
+				Rectangle r=this.DisplayRectangle;
+				r.Width+=16;
+				r.X-=8;
+				m_Parent.Invalidate(r);
+				m_Parent.Update();
+			}
+		}
+
+		/// <summary>
+		/// Called after new button is added to the Buttons collection.
+		/// </summary>
+		/// <param name="button">Reference to the added button.</param>
+		internal void OnButtonInserted(BubbleButton button)
+		{
+			if(m_Parent!=null)
+				m_Parent.OnButtonInserted(this, button);
+		}
+
+		/// <summary>
+		/// Called after specified button has been removed.
+		/// </summary>
+		/// <param name="button">Button that was removed.</param>
+		internal void OnButtonRemoved(BubbleButton button)
+		{
+			if(m_Parent!=null)
+				m_Parent.OnButtonRemoved(this,button);
+		}
+
+		/// <summary>
+		/// Called after all buttons have been removed.
+		/// </summary>
+		internal void OnButtonsCollectionClear()
+		{
+			if(m_Parent!=null)
+				m_Parent.OnButtonsCollectionClear(this);	
+		}
+
+		/// <summary>
+		/// Gets or sets whether tab has design-time focus.
+		/// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never), Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool Focus
+		{
+			get {return m_Focus;}
+			set {m_Focus=value;}
+		}
+		#endregion
+
+		#region IBlock
+		/// <summary>
+		/// Gets or sets the bounds of the content block.
+		/// </summary>
+		Rectangle IBlock.Bounds
+		{
+			get
+			{
+				return m_DisplayRectangle;
+			}
+			set
+			{
+				m_DisplayRectangle=value;
+			}
+		}
+        private DevComponents.DotNetBar.Padding _Margin = new DevComponents.DotNetBar.Padding(0);
+        /// <summary>
+        /// Gets or sets item margin only used by certain items in certain containers. Provided only for internal DotNetBar use.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never), Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        DevComponents.DotNetBar.Padding DevComponents.UI.ContentManager.IBlock.Margin
+        {
+            get { return _Margin; }
+            set { _Margin = value; }
+        }
+		#endregion
+	}
+
+	
+}
diff --git a/PROMS/DotNetBar Source Code/BubbleBarTabCollection.cs b/PROMS/DotNetBar Source Code/BubbleBarTabCollection.cs
new file mode 100644
index 00000000..5b09af93
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/BubbleBarTabCollection.cs	
@@ -0,0 +1,163 @@
+using System;
+using System.Collections;
+using DevComponents.UI.ContentManager;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Represents collection for BubbleBarTab objects.
+	/// </summary>
+	public class BubbleBarTabCollection:CollectionBase 
+	{
+		#region Private Variables
+		private BubbleBar m_Owner=null;
+		#endregion
+
+		#region Internal Implementation
+		public BubbleBarTabCollection(BubbleBar owner)
+		{
+			m_Owner=owner;
+		}
+		/// <summary>
+		/// Adds new object to the collection.
+		/// </summary>
+		/// <param name="tab">Object to add.</param>
+		/// <returns>Index of newly added object.</returns>
+		public int Add(BubbleBarTab tab)
+		{
+			return List.Add(tab);
+		}
+		/// <summary>
+		/// Returns reference to the object in collection based on it's index.
+		/// </summary>
+		public BubbleBarTab this[int index]
+		{
+			get {return (BubbleBarTab)(List[index]);}
+			set {List[index] = value;}
+		}
+
+		/// <summary>
+		/// Inserts new object into the collection.
+		/// </summary>
+		/// <param name="index">Position of the object.</param>
+		/// <param name="value">Object to insert.</param>
+		public void Insert(int index, BubbleBarTab value) 
+		{
+			List.Insert(index, value);
+		}
+
+		/// <summary>
+		/// Returns index of the object inside of the collection.
+		/// </summary>
+		/// <param name="value">Reference to the object.</param>
+		/// <returns>Index of the object.</returns>
+		public int IndexOf(BubbleBarTab value) 
+		{
+			return List.IndexOf(value);
+		}
+
+		/// <summary>
+		/// Returns whether collection contains specified object.
+		/// </summary>
+		/// <param name="value">Object to look for.</param>
+		/// <returns>true if object is part of the collection, otherwise false.</returns>
+		public bool Contains(BubbleBarTab value) 
+		{
+			return List.Contains(value);
+		}
+
+		/// <summary>
+		/// Removes specified object from the collection.
+		/// </summary>
+		/// <param name="value"></param>
+		public void Remove(BubbleBarTab value) 
+		{
+			List.Remove(value);
+		}
+
+		protected override void OnRemoveComplete(int index,object value)
+		{
+			base.OnRemoveComplete(index,value);
+			BubbleBarTab item=value as BubbleBarTab;
+			m_Owner.OnTabRemoved(item);
+			item.SetParent(null);
+		}
+		protected override void OnInsertComplete(int index,object value)
+		{
+			base.OnInsertComplete(index,value);
+			BubbleBarTab item=value as BubbleBarTab;
+			item.SetParent(m_Owner);
+			m_Owner.OnTabAdded(item);
+		}
+
+		/// <summary>
+		/// Copies collection into the specified array.
+		/// </summary>
+		/// <param name="array">Array to copy collection to.</param>
+		/// <param name="index">Starting index.</param>
+		public void CopyTo(BubbleBarTab[] array, int index) 
+		{
+			List.CopyTo(array, index);
+		}
+
+		/// <summary>
+		/// Copies contained items to the IBlock array.
+		/// </summary>
+		/// <param name="array">Array to copy to.</param>
+		internal void CopyTo(IBlock[] array)
+		{
+			List.CopyTo(array,0);
+		}
+
+		/// <summary>
+		/// Copies contained items to the ISimpleTab array.
+		/// </summary>
+		/// <param name="array">Array to copy to.</param>
+		internal void CopyTo(ISimpleTab[] array)
+		{
+			List.CopyTo(array,0);
+		}
+
+		protected override void OnClear()
+		{
+			m_Owner.OnTabsCleared();
+			base.OnClear();
+		}
+
+		/// <summary>
+		/// Returns next visible tab from the reference tab.
+		/// </summary>
+		/// <param name="tabFrom">Reference tab.</param>
+		/// <returns>Next visible tab or null if next visible tab cannot be determined.</returns>
+		internal BubbleBarTab GetNextVisibleTab(BubbleBarTab tabFrom)
+		{
+			int from=0;
+			if(tabFrom!=null)from=this.IndexOf(tabFrom)+1;
+			for(int i=from;i<this.Count;i++)
+			{
+				if(this[i].Visible)
+					return this[i];
+			}
+			return null;
+		}
+
+		/// <summary>
+		/// Returns previous visible tab from the reference tab.
+		/// </summary>
+		/// <param name="tabFrom">Reference tab.</param>
+		/// <returns>Previous visible tab or null if Previous visible tab cannot be determined.</returns>
+		internal BubbleBarTab GetPreviousVisibleTab(BubbleBarTab tabFrom)
+		{
+			int from=0;
+			if(tabFrom!=null) from=this.IndexOf(tabFrom)-1;
+
+			for(int i=from;i>=0;i--)
+			{
+				if(this[i].Visible)
+					return this[i];
+			}
+			return null;
+		}
+		#endregion
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/BubbleButton.cs b/PROMS/DotNetBar Source Code/BubbleButton.cs
new file mode 100644
index 00000000..442e193d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/BubbleButton.cs	
@@ -0,0 +1,594 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Windows.Forms;
+using System.Diagnostics;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Represents a button used on BubbleBar control.
+	/// </summary>
+	[ToolboxItem(false),DesignTimeVisible(false),DefaultEvent("Click")]
+	public class BubbleButton:Component,DevComponents.UI.ContentManager.IBlock
+	{
+		#region Private Variables
+		private string m_TooltipText="";
+//		private System.Drawing.Icon m_Icon=null;
+		private int m_ImageIndex=-1;
+		private int m_ImageIndexLarge=-1;
+		private bool m_Enabled=true;
+		private Image m_ImageCached=null;
+		private Image m_ImageLargeCached=null;
+		private Image m_Image=null;
+		private Image m_ImageLarge=null;
+		private Rectangle m_DisplayRectangle=Rectangle.Empty;
+		private Rectangle m_MagnifiedDisplayRectangle=Rectangle.Empty;
+		private bool m_MouseOver=false;
+		private bool m_MouseDown=false;
+		//private SubItemsCollection m_MenuItems;
+		private BubbleButtonCollection m_ParentCollection=null;
+		private string m_Name="";
+		private bool m_Visible=true;
+		private object m_Tag=null;
+		private bool m_Focus=false;
+		private eShortcut m_Shortcut=eShortcut.None;
+		#endregion
+
+		#region Events
+		/// <summary>
+		/// Occurs when user clicks the button.
+		/// </summary>
+		public event ClickEventHandler Click;
+        /// <summary>
+        /// Occurs when mouse enters the button.
+        /// </summary>
+        public event EventHandler MouseEnter;
+        /// <summary>
+        /// Occurs when mouse leaves the button.
+        /// </summary>
+        public event EventHandler MouseLeave;
+		#endregion
+
+		/// <summary>
+		/// Creates new instance of button object.
+		/// </summary>
+		public BubbleButton()
+		{
+		}
+
+        protected override void Dispose(bool disposing)
+        {
+            if (BarUtilities.DisposeItemImages && !this.DesignMode)
+            {
+                BarUtilities.DisposeImage(ref m_Image);
+                BarUtilities.DisposeImage(ref m_ImageLarge);
+                BarUtilities.DisposeImage(ref m_ImageCached);
+                BarUtilities.DisposeImage(ref m_ImageLargeCached);
+            }
+            base.Dispose(disposing);
+        }
+		#region Public Properties
+		/// <summary>
+		/// Gets or sets the shortcut key to expand/collapse splitter.
+		/// </summary>
+		[Browsable(true),Category("Expand"),DefaultValue(eShortcut.None),Description("Indicates shortcut key to expand/collapse splitter."),]
+		public eShortcut Shortcut
+		{
+			get {return m_Shortcut;}
+			set
+            {
+                m_Shortcut=value;
+                if (m_Shortcut != eShortcut.None && this.GetBubbleBar()!=null)
+                {
+                    this.GetBubbleBar().RefreshHasShortcut();
+                }
+            }
+		}
+
+		/// <summary>
+		/// Gets or sets the tooltip for the button.
+		/// </summary>
+		[Category("Appearance"),DefaultValue(""),Description("Indicates tooltip for the button."), Localizable(true)]
+		public string TooltipText
+		{
+			get {return m_TooltipText;}
+			set {m_TooltipText=value;}
+		}
+
+//		/// <summary>
+//		/// Gets or sets the icon used on the button. The icon should at least have two sizes. Normal and enlarged size.
+//		/// Proper size will be determined based on the settings for image size on BubbleBar object.
+//		/// </summary>
+//		[Browsable(true),Category("Images"),Description("Indicates icons used on the button."),DefaultValue(null)]
+//		public Icon Icon
+//		{
+//			get {return m_Icon;}
+//			set
+//			{
+//				m_Icon=value;
+//				OnAppearanceChanged();
+//			}
+//		}
+
+		/// <summary>
+		/// Gets or sets the default image used on the button. Note that for improved appearance of the buttons when enlarged
+		/// you should set the ImageIndexLarge to the large version of the image specified here. The image size should be the same size
+		/// that is specified by the image size properties on BubbleBar object.
+		/// </summary>
+		[Browsable(true),Category("Images"),Description("Indicates default image used on the button."),Editor("DevComponents.DotNetBar.Design.ImageIndexEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)),System.ComponentModel.TypeConverter(typeof(ImageIndexConverter)),DefaultValue(-1)]
+		public int ImageIndex
+		{
+			get {return m_ImageIndex;}
+			set
+			{
+				m_ImageIndex=value;
+				m_ImageCached=null;
+				OnImageIndexChanged();
+				OnAppearanceChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets reference to the internal cached image loaded from the ImageIndex.
+		/// </summary>
+		internal Image ImageCached
+		{
+			get {return m_ImageCached;}
+		}
+
+		/// <summary>
+		/// Gets reference to the internal cached image loaded from the ImageIndex.
+		/// </summary>
+		internal Image ImageLargeCached
+		{
+			get {return m_ImageLargeCached;}
+		}
+
+		/// <summary>
+		/// Specifies the Button image.
+        /// </summary>
+        [Browsable(true),Category("Images"),Description("The image that will be displayed on the face of the button."),DefaultValue(null)]
+		public System.Drawing.Image Image
+		{
+			get {return m_Image;}
+			set
+			{
+				m_Image=value;
+				this.OnImageChanged();
+			}
+		}
+
+		/// <summary>
+		/// Specifies enlarged the Button image.
+        /// </summary>
+        [Browsable(true),Category("Images"),Description("Indicates enlarged image that will be displayed on the face of the button."),DefaultValue(null)]
+		public System.Drawing.Image ImageLarge
+		{
+			get {return m_ImageLarge;}
+			set
+			{
+				m_ImageLarge=value;
+				this.OnImageChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the image index of the enlarged image for the button. Note that if large image is not specified the
+		/// default image will be enlarged which might not result in perfect image appearance.
+		/// </summary>
+		[Browsable(true),Category("Images"),Description("Indicates image index of the enlarged image for the button."),Editor("DevComponents.DotNetBar.Design.ImageIndexEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)),TypeConverter(typeof(ImageIndexConverter)),DefaultValue(-1)]
+		public int ImageIndexLarge
+		{
+			get {return m_ImageIndexLarge;}
+			set
+			{
+				m_ImageIndexLarge=value;
+				m_ImageLargeCached=null;
+				OnImageIndexChanged();
+				OnAppearanceChanged();
+			}
+		}
+
+		/// <summary>
+		/// Property for Property Editor support for ImageIndex selection.
+		/// </summary>
+		[Browsable(false),EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+		public System.Windows.Forms.ImageList ImageList
+		{
+			get
+			{
+				BubbleBar bar=this.GetBubbleBar();
+				if(bar!=null)
+					return bar.Images;
+				return null;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets a value indicating whether button is enabled.
+		/// </summary>
+		[Browsable(true),DefaultValue(true),Category("Behavior"),Description("Indicates whether button is enabled.")]
+		public bool Enabled
+		{
+			get {return m_Enabled;}
+			set
+			{
+				if(m_Enabled!=value)
+				{
+					m_Enabled=value;
+					this.OnAppearanceChanged();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets the display rectangle occupied by the button.
+		/// </summary>
+		[Browsable(false)]
+		public Rectangle DisplayRectangle
+		{
+			get {return m_DisplayRectangle;}
+		}
+
+		/// <summary>
+		/// Sets the display rectangle of the button.
+		/// </summary>
+		/// <param name="r">New display rectangle of the button.</param>
+		internal void SetDisplayRectangle(Rectangle r)
+		{
+			m_DisplayRectangle=r;
+		}
+
+		/// <summary>
+		/// Gets or sets the magnified display rectangle of the button.
+		/// </summary>
+		[Browsable(false)]
+		public Rectangle MagnifiedDisplayRectangle
+		{
+			get {return m_MagnifiedDisplayRectangle;}
+		}
+
+		/// <summary>
+		/// Sets the magnified display rectangle of the button.
+		/// </summary>
+		/// <param name="r">New magnified display rectangle.</param>
+		internal void SetMagnifiedDisplayRectangle(Rectangle r)
+		{
+			m_MagnifiedDisplayRectangle=r;
+		}
+
+		/// <summary>
+		/// Gets whether mouse is over the button.
+		/// </summary>
+		[Browsable(false)]
+		public bool MouseOver
+		{
+			get {return m_MouseOver;}
+		}
+
+		/// <summary>
+		/// Sets whether mouse is over the button.
+		/// </summary>
+		/// <param name="value">True if mouse is over the button otherwise false.</param>
+		internal void SetMouseOver(bool value)
+		{
+            bool changed=m_MouseOver!=value;
+			m_MouseOver=value;
+            UpdateCursor();
+            if (changed)
+            {
+                if (value)
+                    OnMouseEnter();
+                else
+                    OnMouseLeave();
+            }
+		}
+
+        /// <summary>
+        /// Raises the MouseEnter event.
+        /// </summary>
+        protected virtual void OnMouseEnter()
+        {
+            EventHandler eh = MouseEnter;
+            if (eh != null)
+                eh(this, new EventArgs());
+        }
+        /// <summary>
+        /// Raises the MouseLeave event.
+        /// </summary>
+        protected virtual void OnMouseLeave()
+        {
+            EventHandler eh = MouseLeave;
+            if (eh != null)
+                eh(this, new EventArgs());
+        }
+
+        private void UpdateCursor()
+        {
+            BubbleBar parent = GetBubbleBar();
+            if (parent == null || _Cursor == null) return;
+
+            if (m_MouseOver)
+            {
+                if (_OldCursor == null)
+                {
+                    _OldCursor = Cursor.Current;
+                }
+                parent.Cursor = _Cursor;
+            }
+            else
+            {
+                if (_OldCursor != null)
+                {
+                    parent.Cursor = _OldCursor;
+                    _OldCursor = null;
+                }
+            }
+        }
+
+		/// <summary>
+		/// Gets whether left mouse button is pressed on the button.
+		/// </summary>
+		[Browsable(false)]
+		public bool MouseDown
+		{
+			get {return m_MouseDown;}
+		}
+
+		/// <summary>
+		/// Sets whether left mouse button is pressed over this button.
+		/// </summary>
+		/// <param name="value">True if left mouse button is pressed otherwise false.</param>
+		internal void SetMouseDown(bool value)
+		{
+			m_MouseDown=value;
+		}
+
+		/// <summary>
+		/// Returns name of the button that can be used to identify it from the code.
+		/// </summary>
+		[Browsable(false),Category("Design"),Description("Indicates the name used to identify button.")]
+		public string Name
+		{
+			get
+			{
+				if(this.Site!=null)
+					m_Name=this.Site.Name;
+				return m_Name;
+			}
+			set
+			{
+				if(this.Site!=null)
+					this.Site.Name=value;
+				if(value==null)
+					m_Name="";
+				else
+					m_Name=value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets a value indicating whether button is visible.
+		/// </summary>
+		[Browsable(true),DefaultValue(true),Category("Behavior"),Description("Determines whether the button is visible or hidden.")]
+		public virtual bool Visible
+		{
+			get
+			{
+				return m_Visible;
+			}
+			set
+			{
+				if(m_Visible==value)
+					return;
+
+				m_Visible=value;
+
+				OnVisibleChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the object that contains data about the tab. Any Object derived type can be assigned to this property. If this property is being set through the Windows Forms designer, only text can be assigned.
+		/// </summary>
+		[Browsable(false),DefaultValue(null),Category("Data"),Description("Indicates text that contains data about the cell.")]
+		public object Tag
+		{
+			get
+			{
+				return m_Tag;
+			}
+			set
+			{
+				m_Tag=value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the object that contains data about the tab. Any Object derived type can be assigned to this property. If this property is being set through the Windows Forms designer, only text can be assigned.
+		/// </summary>
+		[Browsable(true),DefaultValue(""),Category("Data"),Description("Indicates text that contains data about the cell.")]
+		public string TagString
+		{
+			get
+			{
+				if(m_Tag==null)
+					return "";
+				return m_Tag.ToString();
+			}
+			set
+			{
+				m_Tag=value;
+			}
+		}
+
+		/// <summary>
+		/// Returns the reference to parent tab.
+		/// </summary>
+		[Browsable(false)]
+		public BubbleBarTab Parent
+		{
+			get
+			{
+				if(m_ParentCollection!=null)
+					return m_ParentCollection.Parent;
+				return null;
+			}
+		}
+		#endregion
+
+		#region Public Methods
+		#endregion
+
+		#region Internal Implementation
+		/// <summary>
+		/// Gets or sets whether button has design-time focus.
+		/// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never), Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool Focus
+		{
+			get {return m_Focus;}
+			set {m_Focus=value;}
+		}
+
+		/// <summary>
+		/// Sets the parent collection button belongs to.
+		/// </summary>
+		/// <param name="value">Parent collection of the item.</param>
+		internal void SetParentCollection(BubbleButtonCollection value)
+		{
+			m_ParentCollection=value;
+		}
+
+		private void OnAppearanceChanged()
+		{
+			BubbleBar bar=this.GetBubbleBar();
+			if(bar==null)
+				return;
+			bar.Refresh();
+		}
+
+		private void OnImageIndexChanged()
+		{
+			BubbleBar bar=this.GetBubbleBar();
+			if(bar==null)
+				return;
+			if(m_ImageIndex>=0 && m_ImageCached==null)
+			{
+				if(bar.Images!=null && m_ImageIndex<bar.Images.Images.Count)
+					m_ImageCached=bar.Images.Images[m_ImageIndex];
+			}
+
+			if(m_ImageIndexLarge>=0 && m_ImageLargeCached==null)
+			{
+				if(bar.ImagesLarge!=null && m_ImageIndexLarge<bar.ImagesLarge.Images.Count)
+					m_ImageLargeCached=bar.ImagesLarge.Images[m_ImageIndex];
+			}
+		}
+
+		private void OnImageChanged()
+		{
+			BubbleBar bar=this.GetBubbleBar();
+			if(bar!=null && this.Site!=null && this.Site.DesignMode)
+				bar.Refresh();
+		}
+
+		/// <summary>
+		/// Returns the reference to the BubbleBar that contains this button.
+		/// </summary>
+		/// <returns></returns>
+		public BubbleBar GetBubbleBar()
+		{
+			if(m_ParentCollection!=null && m_ParentCollection.Parent!=null && m_ParentCollection.Parent.Parent!=null)
+				return m_ParentCollection.Parent.Parent;
+			return null;
+		}
+
+		private void OnVisibleChanged()
+		{
+			BubbleBar bar=this.GetBubbleBar();
+			if(bar!=null)
+				bar.OnButtonVisibleChanged(this);
+		}
+
+		/// <summary>
+		/// Invokes button's Click event.
+		/// </summary>
+		/// <param name="source">Indicates source of the event.</param>
+		public void InvokeClick(eEventSource source, MouseButtons mouseButton)
+		{
+			OnClick(new ClickEventArgs(source, mouseButton));
+		}
+
+		/// <summary>
+		/// Raises click event.
+		/// </summary>
+		/// <param name="e">Default event arguments.</param>
+		protected virtual void OnClick(ClickEventArgs e)
+		{
+			if(Click!=null)
+				Click(this,e);
+
+			BubbleBar bar=this.GetBubbleBar();
+			if(bar!=null)
+				bar.InvokeButtonClick(this,e);
+		}
+
+        private Cursor _OldCursor = null;
+        private Cursor _Cursor = null;
+        /// <summary>
+        /// Gets or sets the mouse cursor that is displayed when mouse is over the button.
+        /// </summary>
+        [DefaultValue(null), Category("Appearance"), Description("Indciates mouse cursor that is displayed when mouse is over the button.")]
+        public Cursor Cursor
+        {
+            get { return _Cursor; }
+            set { _Cursor = value; }
+        }
+		#endregion
+
+		#region IBlock Interface
+		/// <summary>
+		/// Gets or sets the bounds of the content block.
+		/// </summary>
+		Rectangle DevComponents.UI.ContentManager.IBlock.Bounds
+		{
+			get {return m_DisplayRectangle;}
+			set {m_DisplayRectangle=value;}
+		}
+        private DevComponents.DotNetBar.Padding _Margin = new DevComponents.DotNetBar.Padding(0);
+        /// <summary>
+        /// Gets or sets item margin only used by certain items in certain containers. Provided only for internal DotNetBar use.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never), Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        DevComponents.DotNetBar.Padding DevComponents.UI.ContentManager.IBlock.Margin
+        {
+            get { return _Margin; }
+            set { _Margin = value; }
+        }
+		#endregion
+	}
+
+	#region Event Arguments and delegates
+	public delegate void ClickEventHandler(object sender, ClickEventArgs e);
+
+	/// <summary>
+	/// Represents event arguments for Click event.
+	/// </summary>
+	public class ClickEventArgs:EventArgs
+	{
+		/// <summary>
+		/// Gets the action that caused the event, event source.
+		/// </summary>
+		public readonly eEventSource EventSource=eEventSource.Code;
+		public readonly MouseButtons Button=MouseButtons.None;
+
+		public ClickEventArgs(eEventSource action, MouseButtons button)
+		{
+			this.EventSource=action;
+			this.Button=button;
+		}
+	}
+	#endregion
+}
diff --git a/PROMS/DotNetBar Source Code/BubbleButtonCollection.cs b/PROMS/DotNetBar Source Code/BubbleButtonCollection.cs
new file mode 100644
index 00000000..77841c0f
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/BubbleButtonCollection.cs	
@@ -0,0 +1,405 @@
+using System;
+using System.Collections;
+using System.Windows.Forms;
+using DevComponents.UI.ContentManager;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Represents typed collection of BubbleButton objects.
+	/// </summary>
+	public class BubbleButtonCollection:CollectionBase
+	{
+		#region Private Variables
+		private BubbleBarTab m_Parent=null;
+		private bool m_IgnoreEvents=false;
+		#endregion
+
+		#region Internal Implementation
+		/// <summary>
+		/// Copies contained items to the IBlock array.
+		/// </summary>
+		/// <param name="array">Array to copy to.</param>
+		internal void CopyTo(IBlock[] array)
+		{
+			List.CopyTo(array,0);
+		}
+
+		/// <summary>
+		/// Creates new instance of the collection.
+		/// </summary>
+		/// <param name="parent">Parent of the collection.</param>
+		internal BubbleButtonCollection(BubbleBarTab parent)
+		{
+			m_Parent=parent;
+		}
+
+		/// <summary>
+		/// Gets the parent of the collection.
+		/// </summary>
+		internal BubbleBarTab Parent
+		{
+			get {return m_Parent;}
+		}
+
+		/// <summary>
+		/// Adds new item to the collection but it does not raise internal events.
+		/// </summary>
+		/// <param name="item">New item to add.</param>
+		/// <returns>Index of newly added item.</returns>
+		internal int _Add(BubbleButton item)
+		{
+			m_IgnoreEvents=true;
+			int i=0;
+			try
+			{
+				i=List.Add(item);
+			}
+			finally
+			{
+				m_IgnoreEvents=false;
+			}
+			return i;
+		}
+
+		/// <summary>
+		/// Adds new item to the collection at specified location but it does not raise internal events.
+		/// </summary>
+		/// <param name="item">New item to add.</param>
+		/// <param name="Position">Position to add item to.</param>
+		internal void _Add(BubbleButton item, int Position)
+		{
+			m_IgnoreEvents=true;
+			try
+			{
+				List.Insert(Position,item);
+			}
+			finally
+			{
+				m_IgnoreEvents=false;
+			}
+		}
+
+		/// <summary>
+		/// Clears the collection but it does not raise internal events.
+		/// </summary>
+		internal void _Clear()
+		{
+			m_IgnoreEvents=true;
+			try
+			{
+				List.Clear();
+			}
+			finally
+			{
+				m_IgnoreEvents=false;
+			}
+		}
+
+		/// <summary>
+		/// Performs additional custom processes before setting a value in the CollectionBase instance.
+		/// </summary>
+		/// <param name="index">The zero-based index at which oldValue can be found.</param>
+		/// <param name="oldValue">The value to replace with newValue.</param>
+		/// <param name="newValue">The new value of the element at index.</param>
+		protected override void OnSet(int index,object oldValue,object newValue)
+		{
+			if(newValue==null)
+				throw new InvalidOperationException("Setting of null values to BubbleButtonCollection is not allowed.");
+
+			BubbleButton item=newValue as BubbleButton;
+			if(item.Parent!=null)
+			{
+				item.Parent.Buttons.Remove(item);
+			}
+
+			base.OnSet(index,oldValue,newValue);
+		}
+
+		/// <summary>
+		/// Performs additional custom processes after setting a value in the CollectionBase instance.
+		/// </summary>
+		/// <param name="index">The zero-based index at which oldValue can be found.</param>
+		/// <param name="oldValue">The value to replace with newValue.</param>
+		/// <param name="newValue">The new value of the element at index. </param>
+		protected override void OnSetComplete(int index,object oldValue,object newValue)
+		{
+			if(!m_IgnoreEvents)
+			{
+				BubbleButton item=newValue as BubbleButton;
+				item.SetParentCollection(this);
+				m_Parent.OnButtonInserted(item);
+			}
+			base.OnSetComplete(index,oldValue,newValue);
+		}
+
+		/// <summary>
+		/// Performs additional custom processes before inserting a new element into the CollectionBase instance.
+		/// </summary>
+		/// <param name="index">The zero-based index at which to insert value. </param>
+		/// <param name="value">The new value of the element at index.</param>
+		protected override void OnInsert(int index,object value)
+		{
+			BubbleButton item=value as BubbleButton;
+			if(item.Parent!=null && item.Parent!=this.Parent)
+			{
+				item.Parent.Buttons.Remove(item);
+			}
+			base.OnInsert(index,value);
+		}
+
+		/// <summary>
+		/// Performs additional custom processes after inserting a new element into the CollectionBase instance.
+		/// </summary>
+		/// <param name="index">The zero-based index at which to insert value.</param>
+		/// <param name="value">The new value of the element at index.</param>
+		protected override void OnInsertComplete(int index,object value)
+		{
+			if(!m_IgnoreEvents)
+			{
+				BubbleButton item=value as BubbleButton;
+				item.SetParentCollection(this);
+				m_Parent.OnButtonInserted(item);
+			}
+
+			base.OnInsertComplete(index,value);
+		}
+
+		/// <summary>
+		/// Performs additional custom processes when removing an element from the CollectionBase instance.
+		/// </summary>
+		/// <param name="index">The zero-based index at which value can be found.</param>
+		/// <param name="value">The value of the element to remove from index.</param>
+		protected override void OnRemove(int index,object value)
+		{
+//			if(!m_IgnoreEvents)
+//			{
+//				BubbleButton item=value as BubbleButton;				
+//			}
+			base.OnRemove(index,value);
+		}
+
+		/// <summary>
+		/// Performs additional custom processes after removing an element from the CollectionBase instance.
+		/// </summary>
+		/// <param name="index">The zero-based index at which value can be found. </param>
+		/// <param name="value">The value of the element to remove from index.</param>
+		protected override void OnRemoveComplete(int index,object value)
+		{
+			if(!m_IgnoreEvents)
+			{
+				BubbleButton item=value as BubbleButton;
+				item.SetParentCollection(null);
+				m_Parent.OnButtonRemoved(item);
+			}
+
+			base.OnRemoveComplete(index,value);
+		}
+
+		/// <summary>
+		/// Removes an item without raising internal events.
+		/// </summary>
+		/// <param name="item">Item to remove.</param>
+		internal void _Remove(BubbleButton item)
+		{
+			m_IgnoreEvents=true;
+			try{List.Remove(item);}
+			finally{m_IgnoreEvents=false;}
+		}
+
+		/// <summary>
+		/// Performs additional custom processes when clearing the contents of the CollectionBase instance.
+		/// </summary>
+		protected override void OnClear()
+		{
+			if(!m_IgnoreEvents)
+			{
+//				if(List.Count>0)
+//				{
+//					foreach(BubbleButton objSub in this)
+//					{
+//						if(owner!=null)
+//							owner.RemoveShortcutsFromItem(objSub);
+//					}
+//				}
+				if(m_Parent!=null)
+				{
+					m_Parent.OnButtonsCollectionClear();
+				}
+			}
+			base.OnClear();
+		}
+
+		/// <summary>
+		/// Copies the collection to the ArrayList object.
+		/// </summary>
+		/// <param name="list">Target ArrayList.</param>
+		public void CopyTo(ArrayList list)
+		{
+			if(list==null)
+				return;
+			foreach(BubbleButton item in this)
+				list.Add(item);
+		}
+		#endregion
+
+		#region Public Interface
+		/// <summary>
+		/// Adds new item to the collection.
+		/// </summary>
+		/// <param name="item">New item to add.</param>
+		/// <returns>Index of newly added item.</returns>
+		public virtual int Add(BubbleButton item)
+		{
+			return Add(item,-1);
+		}
+
+		/// <summary>
+		/// Adds new item to the collection at specified location.
+		/// </summary>
+		/// <param name="item">New item to add.</param>
+		/// <param name="Position">Position to insert item at. Position of -1 will append the item to the end of the collection.</param>
+		/// <returns>Index of the newly added item.</returns>
+		public virtual int Add(BubbleButton item, int Position)
+		{
+			int iRet=Position;
+			
+			if(Position>=0)
+				List.Insert(Position,item);
+			else
+				iRet=List.Add(item);
+
+			return iRet;
+		}
+
+		/// <summary>
+		/// Accesses items inside of the collection based on the index.
+		/// </summary>
+		public virtual BubbleButton this[int index]
+		{
+			get {return (BubbleButton)(List[index]);}
+			set {List[index] = value;}
+		}
+
+		/// <summary>
+		/// Accesses items inside of the collection based on the name.
+		/// </summary>
+		public  virtual BubbleButton this[string name]
+		{
+			get {return (BubbleButton)(List[this.IndexOf(name)]);}
+			set {List[this.IndexOf(name)] = value;}
+		}
+
+		/// <summary>
+		/// Inserts new item at the specified position.
+		/// </summary>
+		/// <param name="index">Position to insert item at.</param>
+		/// <param name="item">Item to insert.</param>
+		public virtual void Insert(int index, BubbleButton item) 
+		{
+			this.Add(item,index);
+		}
+
+		/// <summary>
+		/// Returns index of an item.
+		/// </summary>
+		/// <param name="value">Item to return index for.</param>
+		/// <returns>Item at the specified position.</returns>
+		public virtual int IndexOf(BubbleButton value) 
+		{
+			return List.IndexOf(value);
+		}
+
+		/// <summary>
+		/// Returns index of an item with given the item's name.
+		/// </summary>
+		/// <param name="name">Name of the item.</param>
+		/// <returns>Index of the Item with the specified name or -1 if item is not found.</returns>
+		public virtual int IndexOf(string name)
+		{
+			int i=-1;
+			foreach(BubbleButton item in List)
+			{
+				i++;
+				if(item.Name==name)
+					return i;
+			}
+			return -1;
+		}
+
+		/// <summary>
+		/// Returns true if given item is contained by this collection.
+		/// </summary>
+		/// <param name="value">Item to test.</param>
+		/// <returns>True if item is part of this collection otherwise false.</returns>
+		public virtual bool Contains(BubbleButton value) 
+		{
+			return List.Contains(value);
+		}
+
+		/// <summary>
+		/// Returns true if item with given name is part of this collection.
+		/// </summary>
+		/// <param name="name">Item name.</param>
+		/// <returns>True if item is part of this collection otherwise false.</returns>
+		public virtual bool Contains(string name)
+		{
+			foreach(BubbleButton item in List)
+			{
+				if(item.Name==name)
+					return true;
+			}
+			return false;
+		}
+
+		/// <summary>
+		/// Removes an item from the collection.
+		/// </summary>
+		/// <param name="item">Item to remove.</param>
+		public virtual void Remove(BubbleButton item) 
+		{
+			List.Remove(item);
+		}
+
+		/// <summary>
+		/// Removes an item from collection at specified index.
+		/// </summary>
+		/// <param name="index">Index of the item to remove.</param>
+		public void Remove(int index)
+		{
+			this.Remove((BubbleButton)List[index]);
+		}
+
+		/// <summary>
+		/// Removes item from the collection with specified name.
+		/// </summary>
+		/// <param name="name">Name of the item to remove.</param>
+		public virtual void Remove(string name)
+		{
+			this.Remove(this[name]);
+		}
+
+		/// <summary>
+		/// Adds array of the items to the collection.
+		/// </summary>
+		/// <param name="items">Array of items to add.</param>
+		public virtual void AddRange(BubbleButton[] items)
+		{
+			foreach(BubbleButton item in items)
+			{
+				this.Add(item);
+			}
+		}
+
+		/// <summary>
+		/// Copy the collection to the array.
+		/// </summary>
+		/// <param name="array">Array to copy collection to.</param>
+		/// <param name="index">The zero-based relative index in array at which copying begins.</param>
+		public virtual void CopyTo(BubbleButton[] array, int index) 
+		{
+			List.CopyTo(array, index);
+		}
+		#endregion
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/BubbleButtonDisplay.cs b/PROMS/DotNetBar Source Code/BubbleButtonDisplay.cs
new file mode 100644
index 00000000..96ba9c39
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/BubbleButtonDisplay.cs	
@@ -0,0 +1,231 @@
+using System;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Drawing.Imaging;
+using System.Drawing.Text;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Represents class for displaying BubbleButton objects on canvas.
+	/// </summary>
+	internal class BubbleButtonDisplay
+	{
+		static int BUTTON_TOOLTIP_SPACING=3;
+		/// <summary>
+		/// Paints button on given canvas.
+		/// </summary>
+		/// <param name="info">Painting information.</param>
+		public static void Paint(BubbleButtonDisplayInfo info)
+		{
+			if(!info.Button.Visible)
+				return;
+
+			CompositeImage image=null;
+			Rectangle buttonRectangle=Rectangle.Empty;
+			if(info.Magnified)
+			{
+				buttonRectangle=info.Button.MagnifiedDisplayRectangle;
+				image=GetButtonImage(info.Button,buttonRectangle.Size);
+			}
+			else
+			{
+				buttonRectangle=info.Button.DisplayRectangle;
+				image=GetButtonImage(info.Button,buttonRectangle.Size);
+			}
+
+            if (buttonRectangle.Width < 2 || buttonRectangle.Height < 2) return;
+
+			if(image!=null)
+			{
+				if(!info.Button.Enabled)
+					image.DrawImage(info.Graphics,buttonRectangle,0,0,image.ActualWidth,image.ActualHeight,GraphicsUnit.Pixel,GetDisabledAttributes());
+				else if(info.Button.MouseDown)
+					image.DrawImage(info.Graphics,buttonRectangle,0,0,image.ActualWidth,image.ActualHeight,GraphicsUnit.Pixel,GetDarkAttributes());
+				else
+					image.DrawImage(info.Graphics,buttonRectangle);
+			}
+			else
+				info.Graphics.DrawRectangle(SystemPens.Highlight,buttonRectangle);
+            
+			if(info.Button.Focus)
+			{
+				buttonRectangle.Inflate(1,1);
+				DesignTime.DrawDesignTimeSelection(info.Graphics,buttonRectangle,Color.Navy);
+			}
+
+			DrawTooltip(info);
+		}
+
+		public static CompositeImage GetButtonImage(BubbleButton button, Size size)
+		{
+			CompositeImage image=null;
+			if(button.Image!=null)
+			{
+				if(button.Image.Size==size || button.ImageLarge==null)
+					image=new CompositeImage(button.Image,false,size);
+				else if(button.ImageLarge!=null && (button.ImageLarge.Size==size || button.ImageLarge.Size.Height/size.Height<2))
+					image=new CompositeImage(button.ImageLarge,false,size);
+				else
+					image=new CompositeImage(button.Image,false,size);
+			}
+			else if(button.ImageCached!=null)
+			{
+				if(button.ImageCached.Size==size || button.ImageLargeCached==null)
+					image=new CompositeImage(button.ImageCached,false,size);
+				else if(button.ImageLargeCached!=null && button.ImageLargeCached.Size.Height/size.Height<=2)
+					image=new CompositeImage(button.ImageLargeCached,false,size);
+				else
+					image=new CompositeImage(button.ImageCached,false,size);
+			}
+//			else if(button.Icon!=null)
+//			{
+//				
+//			}
+			return image;
+		}
+
+		private static void DrawTooltip(BubbleButtonDisplayInfo info)
+		{
+			//float emMulti=1.3285f;
+
+			if(info.Button.MouseOver && info.BubbleBar.ShowTooltips && info.Button.TooltipText!="")
+			{
+                Color textColor = info.BubbleBar.TooltipTextColor;
+                Color outlineColor = info.BubbleBar.TooltipOutlineColor;
+
+                StringFormat format = TextDrawing.GetStringFormat(eTextFormat.Default); // BarFunctions.CreateStringFormat();
+				System.Drawing.Drawing2D.CompositingMode cs=info.Graphics.CompositingMode=System.Drawing.Drawing2D.CompositingMode.SourceOver;
+				Font font=info.BubbleBar.TooltipFont;
+				if(font==null)
+					font=info.BubbleBar.Font;
+				Rectangle rText=info.Button.DisplayRectangle;
+                
+                Size size = TextDrawing.MeasureString(info.Graphics, info.Button.TooltipText, font);
+
+                if(info.Magnified)
+					rText=info.Button.MagnifiedDisplayRectangle;
+				if(info.Alignment==eBubbleButtonAlignment.Bottom)
+					rText.Y-=(Math.Max(font.Height, size.Height)+BUTTON_TOOLTIP_SPACING);
+				else
+					rText.Y=rText.Bottom+BUTTON_TOOLTIP_SPACING;
+				
+				rText.Offset(-(size.Width-rText.Width)/2,0);
+
+                Size tooltipSize = TextDrawing.MeasureString(info.Graphics, info.Button.TooltipText, font);
+                Rectangle outline = rText;
+                outline.Size = tooltipSize;
+                outline.Inflate(2, 2);
+                using (SolidBrush brush = new SolidBrush(Color.FromArgb(200, outlineColor)))
+                    DisplayHelp.FillRoundedRectangle(info.Graphics, brush, outline, 3);
+                //Point pOutline=rText.Location;
+                //pOutline.Offset(-1,0);
+                //GraphicsPath path=new GraphicsPath();
+                //path.AddString(info.Button.TooltipText,font.FontFamily,(int)font.Style,font.SizeInPoints/*font.SizeInPoints*emMulti*/,new PointF((pOutline.X+1)*72/info.Graphics.DpiX,(pOutline.Y-1)*72/info.Graphics.DpiY),format);
+                //using(Pen pen=new Pen(outlineColor,(font.SizeInPoints>=10?1:1)))
+                //    path.Widen(pen);
+                //using(SolidBrush brush=new SolidBrush(Color.FromArgb(200,outlineColor)))
+                //{
+                //    GraphicsUnit pageUnit=info.Graphics.PageUnit;
+                //    info.Graphics.PageUnit=GraphicsUnit.Point;
+                //    info.Graphics.FillPath(brush,path);
+                //    info.Graphics.PageUnit=pageUnit;
+                //}
+				
+                //path.Dispose();
+                //path=new GraphicsPath();
+                //path.AddString(info.Button.TooltipText,font.FontFamily,(int)font.Style,font.SizeInPoints/*font.SizeInPoints*emMulti*/,new PointF(pOutline.X*72/info.Graphics.DpiX,pOutline.Y*72/info.Graphics.DpiY),format);
+                //path.Widen(SystemPens.ControlText);
+                //using(SolidBrush brush=new SolidBrush(Color.FromArgb(200,outlineColor)))
+                //{
+                //    GraphicsUnit pageUnit=info.Graphics.PageUnit;
+                //    info.Graphics.PageUnit=GraphicsUnit.Point;
+                //    info.Graphics.FillPath(brush,path);
+                //    info.Graphics.PageUnit=pageUnit;
+                //}
+                //path.Dispose();
+
+				TextDrawing.DrawString(info.Graphics,info.Button.TooltipText,font,textColor,rText.X,rText.Y,eTextFormat.Default);
+
+				info.Graphics.CompositingMode=cs;
+				format.Dispose();
+			}
+		}
+
+		private static ImageAttributes GetDarkAttributes()
+		{
+			float[][] array = new float[5][];
+//			array[0] = new float[5] {1, 0, 0, 0, 0};
+//			array[1] = new float[5] {0, 1, 0, 0, 0};
+//			array[2] = new float[5] {0, 0, 1, 0, 0};
+//			array[3] = new float[5] {0, 0, 1, 0, 0};
+//			array[4] = new float[5] {.5f, .5f, .5f, 0, 1};
+			array[0] = new float[5] {.65f, 0, 0, 0, 0};
+			array[1] = new float[5] {0, .65f, 0, 0, 0};
+			array[2] = new float[5] {0, 0, .65f, 0, 0};
+			array[3] = new float[5] {0, 0, 0, 1, 0};
+			array[4] = new float[5] {0, 0, 0, 0, .65f};
+			ColorMatrix grayMatrix = new ColorMatrix(array);
+			ImageAttributes darkImageAttr = new ImageAttributes();
+			darkImageAttr.ClearColorKey();
+			darkImageAttr.SetColorMatrix(grayMatrix);
+			return darkImageAttr;
+		}
+
+		private static ImageAttributes GetDisabledAttributes()
+		{
+			float[][] array = new float[5][];
+			array[0] = new float[5] {0.5f,  0.5f,  0.5f,  0.0f,  0.0f};
+			array[1] = new float[5] {0.5f,  0.5f,  0.5f,  0.0f,  0.0f};
+			array[2] = new float[5] {0.5f,  0.5f,  0.5f,  0.0f,  0.0f};
+			array[3] = new float[5] {0.0f,  0.0f,  0.0f,  1.0f,  0.0f};
+			array[4] = new float[5] {0.0f,  0.0f,  0.0f,  0.0f,  1.0f};
+			//ColorMatrix grayMatrix = new ColorMatrix(array);
+			ColorMatrix grayMatrix = new ColorMatrix();
+			grayMatrix.Matrix00 = 1/3f; 
+			grayMatrix.Matrix01 = 1/3f; 
+			grayMatrix.Matrix02 = 1/3f; 
+			grayMatrix.Matrix10 = 1/3f; 
+			grayMatrix.Matrix11 = 1/3f; 
+			grayMatrix.Matrix12 = 1/3f; 
+			grayMatrix.Matrix20 = 1/3f; 
+			grayMatrix.Matrix21 = 1/3f; 
+			grayMatrix.Matrix22 = 1/3f;
+			grayMatrix.Matrix33 = .5f; // Alpha-channel
+
+			ImageAttributes darkImageAttr = new ImageAttributes();
+			darkImageAttr.ClearColorKey();
+			darkImageAttr.SetColorMatrix(grayMatrix);
+			return darkImageAttr;
+		}
+	}
+
+	#region BubbleButtonDisplayInfo
+	/// <summary>
+	/// Represents class that holds information for BubbleButton painting.
+	/// </summary>
+	public class BubbleButtonDisplayInfo
+	{
+		/// <summary>
+		/// Graphics object.
+		/// </summary>
+		public Graphics Graphics=null;
+		/// <summary>
+		/// Button to paint.
+		/// </summary>
+		public BubbleButton Button=null;
+		/// <summary>
+		/// Reference to BubbleBar control.
+		/// </summary>
+		public BubbleBar BubbleBar=null;
+		/// <summary>
+		/// Gets or sets whether magnified version of the button is painted.
+		/// </summary>
+		public bool Magnified=false;
+		/// <summary>
+		/// Gets or sets the button alignment inside of the bar.
+		/// </summary>
+		public eBubbleButtonAlignment Alignment=eBubbleButtonAlignment.Bottom;
+	}
+	#endregion
+}
diff --git a/PROMS/DotNetBar Source Code/BubbleButtonLayoutManager.cs b/PROMS/DotNetBar Source Code/BubbleButtonLayoutManager.cs
new file mode 100644
index 00000000..d10041c0
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/BubbleButtonLayoutManager.cs	
@@ -0,0 +1,43 @@
+using System;
+using System.Collections;
+using System.Drawing;
+using DevComponents.UI.ContentManager;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Represents class for default layout of the BubbleButton objects.
+	/// </summary>
+	public class BubbleButtonLayoutManager:BlockLayoutManager
+	{
+		/// <summary>
+		/// Creates new instance of the class.
+		/// </summary>
+		public BubbleButtonLayoutManager()
+		{
+		}
+
+		/// <summary>
+		/// Resizes the content block and sets it's Bounds property to reflect new size.
+		/// </summary>
+		/// <param name="block">Content block to resize.</param>
+        public override void Layout(IBlock block, Size availableSize)
+		{
+			BubbleButton button=block as BubbleButton;
+			BubbleBar bar=button.GetBubbleBar();
+			if(bar==null)
+			{
+				if(button.Site!=null && button.Site.DesignMode)
+					return;
+				throw new InvalidOperationException("BubbleBar object could not be found for button named: '"+button.Name+"' in BubbleButtonLayoutManager.Layout");
+			}
+			Size defaultSize=Dpi.ImageSize(bar.ImageSizeNormal);
+			button.SetDisplayRectangle(new Rectangle(button.DisplayRectangle.Location,defaultSize));
+		}
+
+        public override Rectangle FinalizeLayout(Rectangle containerBounds, Rectangle blocksBounds, ArrayList lines)
+        {
+            return (blocksBounds);
+        }
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/BubbleContentManager.cs b/PROMS/DotNetBar Source Code/BubbleContentManager.cs
new file mode 100644
index 00000000..e83edfee
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/BubbleContentManager.cs	
@@ -0,0 +1,302 @@
+using System;
+using System.Drawing;
+using DevComponents.UI.ContentManager;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Represents class that provides mangification for the BubbleMar control
+	/// </summary>
+	public class BubbleContentManager:SerialContentLayoutManager
+	{
+		#region Private Variables
+		private Size m_BubbleSize=Size.Empty;
+		private float m_Factor1=0,m_Factor2=0,m_Factor3=0,m_Factor4=0;
+		private int m_MouseOverIndex=-1;
+		private int m_MouseOverPosition=-1;
+		#endregion
+
+		public BubbleContentManager()
+		{
+			this.ContentAlignment=eContentAlignment.Center;
+		}
+
+		#region IContentLayout
+
+		/// <summary>
+		/// Performs layout of the content block.
+		/// </summary>
+		/// <param name="containerBounds">Container bounds to layout content blocks in.</param>
+		/// <param name="contentBlocks">Content blocks to layout.</param>
+		/// <param name="blockLayout">Block layout manager that resizes the content blocks.</param>
+		/// <returns>The bounds of the content blocks within the container bounds.</returns>
+		public override Rectangle Layout(Rectangle containerBounds,IBlock[] contentBlocks,BlockLayoutManager blockLayout)
+		{
+			if(contentBlocks.Length==0)
+				return Rectangle.Empty;
+
+			if(m_MouseOverIndex==-1)
+			{
+				return base.Layout(containerBounds,contentBlocks,blockLayout);
+			}
+
+			BubbleButton[] buttons=new BubbleButton[contentBlocks.Length];
+			contentBlocks.CopyTo(buttons,0);
+
+			int x=0,y=0;
+			if(this.ContentOrientation==eContentOrientation.Horizontal)
+			{
+				buttons[m_MouseOverIndex].SetMagnifiedDisplayRectangle(new Rectangle(m_MouseOverPosition,GetY(containerBounds,m_BubbleSize.Height),m_BubbleSize.Width,m_BubbleSize.Height));
+				x=m_MouseOverPosition;
+			}
+			else
+			{
+				buttons[m_MouseOverIndex].SetMagnifiedDisplayRectangle(new Rectangle(GetX(containerBounds,m_BubbleSize.Width),m_MouseOverPosition,m_BubbleSize.Width,m_BubbleSize.Height));
+				y=m_MouseOverPosition;
+			}
+
+			int growthWidth=m_BubbleSize.Width-contentBlocks[0].Bounds.Width;
+			int growthHeight=m_BubbleSize.Height-contentBlocks[0].Bounds.Height;
+
+			// Apply factor 2
+			int index=GetPreviousButtonIndex(buttons,m_MouseOverIndex);
+			if(index>=0)
+				SetFactorPrevious(containerBounds,buttons[index],growthWidth,growthHeight,m_Factor2,ref x, ref y);
+			
+			// Apply factor 1
+			index=GetPreviousButtonIndex(buttons,index);
+			if(index>=0)
+				SetFactorPrevious(containerBounds,buttons[index],growthWidth,growthHeight,m_Factor1,ref x, ref y);
+
+			if(this.ContentOrientation==eContentOrientation.Horizontal)
+			{
+				while(index>=0)
+				{
+					index=GetPreviousButtonIndex(buttons,index);
+					if(index>=0)
+					{
+						x-=(buttons[index].DisplayRectangle.Width+this.BlockSpacing);
+						buttons[index].SetMagnifiedDisplayRectangle(new Rectangle(x,buttons[index].DisplayRectangle.Y,buttons[index].DisplayRectangle.Width,buttons[index].DisplayRectangle.Height));	
+					}
+				}
+				x=m_MouseOverPosition+m_BubbleSize.Width+this.BlockSpacing;
+			}
+			else
+			{
+				while(index>=0)
+				{
+					index=GetPreviousButtonIndex(buttons,index);
+					if(index>=0)
+					{
+						y-=(buttons[index].DisplayRectangle.Height+this.BlockSpacing);
+						buttons[index].SetMagnifiedDisplayRectangle(new Rectangle(buttons[index].DisplayRectangle.X,y,buttons[index].DisplayRectangle.Width,buttons[index].DisplayRectangle.Height));
+					}
+				}
+
+				y=m_MouseOverPosition+m_BubbleSize.Height+this.BlockSpacing;
+			}
+			
+			// Apply factor 3
+			index=GetNextButtonIndex(buttons,m_MouseOverIndex);
+			if(index>=0)
+				SetFactorNext(containerBounds,buttons[index],growthWidth,growthHeight,m_Factor3,ref x, ref y);
+
+			// Apply factor 4
+			if(index==-1) index=m_MouseOverIndex;
+			index=GetNextButtonIndex(buttons,index);
+			if(index>=0)
+				SetFactorNext(containerBounds,buttons[index],growthWidth,growthHeight,m_Factor4,ref x, ref y);
+			
+			if(this.ContentOrientation==eContentOrientation.Horizontal)
+			{
+				while(index>=0)
+				{
+					index=GetNextButtonIndex(buttons,index);
+					if(index>=0)
+					{
+						buttons[index].SetMagnifiedDisplayRectangle(new Rectangle(x,buttons[index].DisplayRectangle.Y,buttons[index].DisplayRectangle.Width,buttons[index].DisplayRectangle.Height));
+						x+=(buttons[index].DisplayRectangle.Width+this.BlockSpacing);
+					}
+				}
+			}
+			else
+			{
+				while(index>=0)
+				{
+					index=GetNextButtonIndex(buttons,index);
+					if(index>=0)
+					{
+						buttons[index].SetMagnifiedDisplayRectangle(new Rectangle(buttons[index].DisplayRectangle.X,y,buttons[index].DisplayRectangle.Width,buttons[index].DisplayRectangle.Height));
+						y+=(buttons[index].DisplayRectangle.Height+this.BlockSpacing);
+					}
+				}
+			}
+
+			if(buttons.Length==1)
+				return buttons[0].MagnifiedDisplayRectangle;
+			
+			return Rectangle.Union(buttons[0].MagnifiedDisplayRectangle,buttons[buttons.Length-1].MagnifiedDisplayRectangle);
+		}
+
+		private void SetFactorPrevious(Rectangle containerBounds, BubbleButton button, int growthWidth, int growthHeight, float factor, ref int x, ref int y)
+		{
+			int w=(int)(button.DisplayRectangle.Width+growthWidth*factor);
+			int h=(int)(button.DisplayRectangle.Height+growthHeight*factor);
+			if(this.ContentOrientation==eContentOrientation.Horizontal)
+			{
+				x-=(w+this.BlockSpacing);
+				button.SetMagnifiedDisplayRectangle(new Rectangle(x,GetY(containerBounds,h),w,h));
+			}
+			else
+			{
+				y-=(h+this.BlockSpacing);
+				button.SetMagnifiedDisplayRectangle(new Rectangle(GetX(containerBounds,w),y,w,h));
+			}
+		}
+
+		private void SetFactorNext(Rectangle containerBounds, BubbleButton button, int growthWidth, int growthHeight, float factor, ref int x, ref int y)
+		{
+			int w=(int)(button.DisplayRectangle.Width+growthWidth*factor);
+			int h=(int)(button.DisplayRectangle.Height+growthHeight*factor);
+			if(this.ContentOrientation==eContentOrientation.Horizontal)
+			{
+				button.SetMagnifiedDisplayRectangle(new Rectangle(x,GetY(containerBounds,h),w,h));
+				x+=(w+this.BlockSpacing);
+			}
+			else
+			{
+				button.SetMagnifiedDisplayRectangle(new Rectangle(GetX(containerBounds,w),y,w,h));
+				y+=(h+this.BlockSpacing);
+			}
+		}
+
+		private int GetNextButtonIndex(BubbleButton[] buttons, int index)
+		{
+			int next=-1;
+			for(int i=index+1;i<buttons.Length;i++)
+			{
+				if(buttons[i].Visible)
+				{
+					next=i;
+					break;
+				}
+			}
+			return next;
+		}
+
+		private int GetPreviousButtonIndex(BubbleButton[] buttons, int index)
+		{
+			int next=-1;
+			for(int i=index-1;i>=0;i--)
+			{
+				if(buttons[i].Visible)
+				{
+					next=i;
+					break;
+				}
+			}
+			return next;
+		}
+
+		private int GetX(Rectangle containerBounds, int width)
+		{
+			if(this.ContentOrientation==eContentOrientation.Vertical)
+			{
+				if(this.ContentVerticalAlignment==eContentVerticalAlignment.Top)
+					return containerBounds.Left;
+				else if(this.ContentVerticalAlignment==eContentVerticalAlignment.Middle)
+					return containerBounds.Left+(containerBounds.Width-width)/2;
+				else if(this.ContentVerticalAlignment==eContentVerticalAlignment.Bottom)
+					return containerBounds.Right-width;
+			}
+			else
+				throw new InvalidOperationException("Cannot use GetX method on eContentOrientation.Horizontal");
+			return -1;
+		}
+
+		private int GetY(Rectangle containerBounds, int height)
+		{
+			if(this.ContentOrientation==eContentOrientation.Horizontal)
+			{
+				if(this.ContentVerticalAlignment==eContentVerticalAlignment.Top)
+					return containerBounds.Top;
+				else if(this.ContentVerticalAlignment==eContentVerticalAlignment.Middle)
+					return containerBounds.Top+(containerBounds.Height-height)/2;
+				else if(this.ContentVerticalAlignment==eContentVerticalAlignment.Bottom)
+					return containerBounds.Bottom-height;
+			}
+			else
+				throw new InvalidOperationException("Cannot use GetX method on eContentOrientation.Vertical");
+			return -1;
+		}
+		#endregion
+
+		#region Public Properties
+
+		/// <summary>
+		/// Gets or sets the bubble size for the mouse over item.
+		/// </summary>
+		public Size BubbleSize
+		{
+			get {return m_BubbleSize;}
+			set {m_BubbleSize=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets magnification factor for the item that is at the position MouseOverIndex-1
+		/// </summary>
+		public float Factor1
+		{
+			get {return m_Factor1;}
+			set {m_Factor1=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets magnification factor for the item that is at the position MouseOverIndex-2
+		/// </summary>
+		public float Factor2
+		{
+			get {return m_Factor2;}
+			set {m_Factor2=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets magnification factor for the item that is at the position MouseOverIndex+1
+		/// </summary>
+		public float Factor3
+		{
+			get {return m_Factor3;}
+			set {m_Factor3=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets magnification factor for the item that is at the position MouseOverIndex+2
+		/// </summary>
+		public float Factor4
+		{
+			get {return m_Factor4;}
+			set {m_Factor4=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets the index of the item mouse is over.
+		/// </summary>
+		public int MouseOverIndex
+		{
+			get {return m_MouseOverIndex;}
+			set {m_MouseOverIndex=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets new X coordinate of the mouse over item when in horizontal layout or Y
+		/// coordinate when in vertical layout.
+		/// </summary>
+		public int MouseOverPosition
+		{
+			get {return m_MouseOverPosition;}
+			set {m_MouseOverPosition=value;}
+		}
+
+		#endregion
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/BufferedBitmap.cs b/PROMS/DotNetBar Source Code/BufferedBitmap.cs
new file mode 100644
index 00000000..15c049a9
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/BufferedBitmap.cs	
@@ -0,0 +1,123 @@
+using System;
+using System.Text;
+using System.Drawing;
+using System.Runtime.InteropServices;
+
+namespace DevComponents.DotNetBar
+{
+    public class BufferedBitmap : IDisposable
+    {
+        #region Private Variables
+        private Rectangle m_TargetRect = Rectangle.Empty;
+        private IntPtr m_MemDC = IntPtr.Zero;
+        private Graphics m_BitmapGraphics = null;
+        private IntPtr m_MemDib = IntPtr.Zero;
+        #endregion
+
+        #region Internal Implementation
+        public BufferedBitmap(Graphics source, Rectangle rect)
+        {
+            IntPtr hdc = source.GetHdc();
+            try
+            {
+                Initialize(hdc, rect);
+            }
+            finally
+            {
+                source.ReleaseHdc(hdc);
+            }
+        }
+
+        public Graphics Graphics
+        {
+            get
+            {
+                return m_BitmapGraphics;
+            }
+        }
+
+        public BufferedBitmap(IntPtr hdcSource, Rectangle rect)
+        {
+            Initialize(hdcSource, rect);
+        }
+        private void Initialize(IntPtr hdcSource, Rectangle r)
+        {
+            m_TargetRect = r;
+
+            m_MemDC = WinApi.CreateCompatibleDC(hdcSource);
+            WinApi.BITMAPINFO info = new WinApi.BITMAPINFO();
+            info.biWidth = r.Width;
+            info.biHeight = r.Height;
+            info.biPlanes = 1;
+            info.biBitCount = 32;
+            info.biSize = Marshal.SizeOf(info);
+            m_MemDib = WinApi.CreateDIBSection(hdcSource, info, 0, 0, IntPtr.Zero, 0);
+            WinApi.SelectObject(m_MemDC, m_MemDib);
+            m_BitmapGraphics = Graphics.FromHdc(m_MemDC);
+        }
+
+        public void Render(Graphics targetGraphics)
+        {
+            Render(targetGraphics, new Rectangle[] { });
+        }
+
+        public void Render(Graphics targetGraphics, Rectangle exclude)
+        {
+            Render(targetGraphics, new Rectangle[] { exclude });
+        }
+
+        public void Render(Graphics targetGraphics, Rectangle[] excludeArr)
+        {
+            const int SRCCOPY = 0x00CC0020;
+            IntPtr hdc = targetGraphics.GetHdc();
+            try
+            {
+                if (excludeArr!=null && excludeArr.Length > 0)
+                {
+                    foreach (Rectangle r in excludeArr)
+                    {
+                        if (!r.IsEmpty)
+                            WinApi.ExcludeClipRect(hdc, r.X, r.Y, r.Right, r.Bottom);
+                    }
+                }
+                WinApi.BitBlt(hdc, m_TargetRect.Left, m_TargetRect.Top, m_TargetRect.Width, m_TargetRect.Height, m_MemDC, 0, 0, SRCCOPY);
+            }
+            finally
+            {
+                targetGraphics.ReleaseHdc(hdc);
+            }
+        }
+
+        public Rectangle TargetRect
+        {
+            get { return m_TargetRect; }
+            set { m_TargetRect = value; }
+        }
+        #endregion
+
+        #region IDisposable Members
+
+        public void Dispose()
+        {
+            if (m_BitmapGraphics != null)
+            {
+                m_BitmapGraphics.Dispose();
+                m_BitmapGraphics = null;
+            }
+
+            if (m_MemDib != IntPtr.Zero)
+            {
+                WinApi.DeleteObject(m_MemDib);
+                m_MemDib = IntPtr.Zero;
+            }
+
+            if (m_MemDC != IntPtr.Zero)
+            {
+                WinApi.DeleteDC(m_MemDC);
+                m_MemDC = IntPtr.Zero;
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/ButtonItem.cs b/PROMS/DotNetBar Source Code/ButtonItem.cs
new file mode 100644
index 00000000..85ac7eef
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/ButtonItem.cs	
@@ -0,0 +1,6512 @@
+using System.ComponentModel;
+using System;
+using System.Drawing;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.Controls;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    ///    Summary description for ButtonItem.
+    /// </summary>
+    [System.ComponentModel.ToolboxItem(false), System.ComponentModel.DesignTimeVisible(false), DefaultEvent("Click"), Designer("DevComponents.DotNetBar.Design.BaseItemDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+    public class ButtonItem : PopupItem, IPersonalizedMenuItem
+    {
+        #region Events
+        /// <summary>
+        /// Occurs when Checked property has changed.
+        /// </summary>
+        public event EventHandler CheckedChanged;
+        /// <summary>
+        /// Occurs before an item in option group is checked and provides opportunity to cancel that.
+        /// </summary>
+        [Description("Occurs before an item in option group is checked and provides opportunity to cancel that.")]
+        public event OptionGroupChangingEventHandler OptionGroupChanging;
+        #endregion
+
+        #region Private Variables
+        private const int STATEBUTTON_SPACING = 3;
+        private System.Drawing.Image m_Image;
+        private System.Drawing.Image m_ImageSmall;
+        private int m_ImageIndex; // Image index if image from ImageList is used
+        private System.Drawing.Image m_HoverImage;
+        private int m_HoverImageIndex; // Image index if image from ImageList is used
+        private System.Drawing.Image m_DisabledImage;
+        private bool m_DisabledImageCustom = false;
+        private int m_DisabledImageIndex; // Image index if image from ImageList is used
+        private System.Drawing.Icon m_DisabledIcon = null;
+        private System.Drawing.Image m_PressedImage;
+        private int m_PressedImageIndex;  // Image index if image from ImageList is used
+        private eButtonStyle m_ButtonStyle;
+        private eImagePosition m_ImagePosition;
+        private Font m_Font;
+
+        private string m_AlternateShortcutText;
+
+        private bool m_MouseOver = false;
+        private bool m_MouseOverExpand = false;
+        private bool m_MouseDown;
+
+        private bool m_Checked;
+
+        private Rectangle m_ImageDrawRect;
+        private Rectangle m_TextDrawRect;
+        private Rectangle m_SubItemsRect;
+        private int m_VerticalPadding;
+        private int m_HorizontalPadding;
+
+        private Color m_ForeColor = System.Drawing.Color.Empty;
+        private Color m_HotForeColor = System.Drawing.Color.Empty;
+        private bool m_HotFontUnderline = false;
+        private bool m_HotFontBold = false;
+        private bool m_FontBold = false;
+        private bool m_FontItalic = false;
+        private bool m_FontUnderline = false;
+
+        // IPersonalizedMenuItem Implementation
+        private eMenuVisibility m_MenuVisibility = eMenuVisibility.VisibleAlways;
+        private bool m_RecentlyUsed = false;
+        private eHotTrackingStyle m_HotTrackingStyle = eHotTrackingStyle.Default;
+        private System.Drawing.Image m_ImageCachedIdx = null;
+        private ItemPaintArgs _ItemPaintArgs = null;
+        private int m_SubItemsExpandWidth = 12;
+        private string m_OptionGroup = "";
+        private Size m_ImageSizeOverride = Size.Empty;
+
+        internal bool _FitContainer = false;
+
+        System.Drawing.Icon m_Icon = null;
+        private bool m_AutoExpandOnClick = false;
+
+        private eButtonColor m_ColorTable = eButtonColor.Orange; private string m_CashedColorName = "Orange";
+
+        private int m_ImagePaddingHorizontal = 8;
+        private int m_ImagePaddingVertical = 6;
+        private string m_CustomColorName = "";
+        private Size m_FixedSize = Size.Empty;
+        private bool m_SplitButton = false;
+        private bool m_IgnoreAlpha = false;
+        private int m_MouseOverFadeAlphaIncrement = 65;
+        private int m_PulseFadeAlphaIncrement = 12;
+        private bool m_Pulse = false;
+        private int m_PulseBeats = 0, m_PulseCount = 0;
+        private bool m_StopPulseOnMouseOver = true;
+        private bool m_RibbonWordWrap = true;
+        private bool m_AutoCheckOnClick = false;
+        private bool m_UseSmallImage = false;
+        internal bool _FixedSizeCenterText = false;
+        #endregion
+
+        #region Constructor, Copy
+        /// <summary>
+        /// Creates new instance of ButtonItem.
+        /// </summary>
+        public ButtonItem() : this("", "") { }
+        /// <summary>
+        /// Creates new instance of ButtonItem and assigns the name to it.
+        /// </summary>
+        /// <param name="sItemName">Item name.</param>
+        public ButtonItem(string sItemName) : this(sItemName, "") { }
+        /// <summary>
+        /// Creates new instance of ButtonItem and assigns the name and text to it.
+        /// </summary>
+        /// <param name="sItemName">Item name.</param>
+        /// <param name="ItemText">item text.</param>
+        public ButtonItem(string sItemName, string ItemText)
+            : base(sItemName, ItemText)
+        {
+            m_IsContainer = false;
+            m_Image = null;
+            m_ImageIndex = -1;
+            m_HoverImage = null;
+            m_HoverImageIndex = -1;
+            m_DisabledImage = null;
+            m_DisabledImageIndex = -1;
+            m_PressedImage = null;
+            m_PressedImageIndex = -1;
+            m_MouseOver = false;
+            m_MouseDown = false;
+            m_ButtonStyle = eButtonStyle.Default;
+            m_ImagePosition = eImagePosition.Left;
+            m_Font = null;
+            m_ImageDrawRect = Rectangle.Empty;
+            m_TextDrawRect = Rectangle.Empty;
+            m_SubItemsRect = Rectangle.Empty;
+            m_VerticalPadding = 0;
+            m_HorizontalPadding = 0;
+            m_AlternateShortcutText = "";
+        }
+
+        /// <summary>
+        /// Returns copy of the item.
+        /// </summary>
+        public override BaseItem Copy()
+        {
+            ButtonItem objCopy = new ButtonItem(m_Name);
+            this.CopyToItem(objCopy);
+            return objCopy;
+        }
+
+        /// <summary>
+        /// Copies the ButtonItem specific properties to new instance of the item.
+        /// </summary>
+        /// <param name="copy">New ButtonItem instance.</param>
+        internal void InternalCopyToItem(ButtonItem copy)
+        {
+            CopyToItem((BaseItem)copy);
+        }
+
+        /// <summary>
+        /// Copies the ButtonItem specific properties to new instance of the item.
+        /// </summary>
+        /// <param name="copy">New ButtonItem instance.</param>
+        protected override void CopyToItem(BaseItem copy)
+        {
+            ButtonItem objCopy = copy as ButtonItem;
+            base.CopyToItem(objCopy);
+
+            if (m_Image != null)
+                objCopy.Image = (Image)m_Image.Clone();
+            if (m_ImageSmall != null)
+                objCopy.ImageSmall = (Image)m_ImageSmall.Clone();
+            if (m_HoverImage != null)
+                objCopy.HoverImage = (Image)m_HoverImage.Clone();
+            if (m_PressedImage != null)
+                objCopy.PressedImage = (Image)m_PressedImage.Clone();
+            if (m_DisabledImage != null && m_DisabledImageCustom)
+                objCopy.DisabledImage = (Image)m_DisabledImage.Clone();
+            if (m_Icon != null)
+                objCopy.Icon = m_Icon.Clone() as Icon;
+
+            objCopy.ButtonStyle = m_ButtonStyle;
+            //objCopy.ButtonType=m_ButtonType;
+            objCopy.ImagePosition = m_ImagePosition;
+            objCopy.OptionGroup = m_OptionGroup;
+            objCopy.Checked = m_Checked;
+            objCopy.PopupType = this.PopupType;
+            objCopy.AlternateShortCutText = this.AlternateShortCutText;
+
+            if (m_ImageIndex >= 0)
+                objCopy.SetImageIndex(m_ImageIndex);
+            if (m_PressedImageIndex >= 0)
+                objCopy.PressedImageIndex = m_PressedImageIndex;
+            if (m_HoverImageIndex >= 0)
+                objCopy.HoverImageIndex = m_HoverImageIndex;
+            if (m_DisabledImageIndex >= 0)
+                objCopy.DisabledImageIndex = m_DisabledImageIndex;
+
+            if (!m_ForeColor.IsEmpty)
+                objCopy.ForeColor = m_ForeColor;
+
+            objCopy.HotFontBold = m_HotFontBold;
+            objCopy.HotFontUnderline = m_HotFontUnderline;
+
+            if (!m_HotForeColor.IsEmpty)
+                objCopy.HotForeColor = m_HotForeColor;
+
+            objCopy.HotTrackingStyle = m_HotTrackingStyle;
+            objCopy.MenuVisibility = m_MenuVisibility;
+            objCopy.AutoExpandOnClick = this.AutoExpandOnClick;
+            objCopy.AlternateShortCutText = this.AlternateShortCutText;
+            objCopy.SubItemsExpandWidth = this.SubItemsExpandWidth;
+            objCopy.CheckedChanged = this.CheckedChanged;
+            objCopy.OptionGroupChanging = this.OptionGroupChanging;
+
+            if (!this.ImageFixedSize.IsEmpty)
+                objCopy.ImageFixedSize = this.ImageFixedSize;
+
+            objCopy.ImagePaddingHorizontal = m_ImagePaddingHorizontal;
+            objCopy.ImagePaddingVertical = m_ImagePaddingVertical;
+            objCopy.FixedSize = this.FixedSize;
+            objCopy.RibbonWordWrap = this.RibbonWordWrap;
+            objCopy.AutoCheckOnClick = this.AutoCheckOnClick;
+
+            if (this.Shape != null)
+                objCopy.Shape = this.Shape;
+
+            objCopy.ColorTable = this.ColorTable;
+            objCopy.CustomColorName = this.CustomColorName;
+            objCopy.AutoExpandMenuItem = this.AutoExpandMenuItem;
+
+            objCopy.EnableMarkup = this.EnableMarkup;
+            objCopy.SplitButton = this.SplitButton;
+
+            objCopy.NotificationMarkColor = this.NotificationMarkColor;
+            objCopy.NotificationMarkPosition = this.NotificationMarkPosition;
+            objCopy.NotificationMarkSize = this.NotificationMarkSize;
+            objCopy.NotificationMarkText = this.NotificationMarkText;
+
+            objCopy.Symbol = this.Symbol;
+            objCopy.SymbolSet = this.SymbolSet;
+            objCopy.SymbolColor = this.SymbolColor;
+            objCopy.SymbolSize = this.SymbolSize;
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            StopFade();
+            StopPulse();
+            StopImageAnimation();
+            DisposeMouseOverFont();
+            DisposedCachedImageListImage();
+            if (BarUtilities.DisposeItemImages && !this.DesignMode || _AutoDisposeImages)
+            {
+                BarUtilities.DisposeImage(ref m_Image);
+                BarUtilities.DisposeImage(ref m_Icon);
+                BarUtilities.DisposeImage(ref m_ImageSmall);
+                BarUtilities.DisposeImage(ref m_HoverImage);
+                BarUtilities.DisposeImage(ref m_DisabledImage);
+                BarUtilities.DisposeImage(ref m_PressedImage);
+                BarUtilities.DisposeImage(ref m_DisabledIcon);
+            }
+            base.Dispose(disposing);
+        }
+
+        private void DisposedCachedImageListImage()
+        {
+            if (m_ImageCachedIdx != null) m_ImageCachedIdx.Dispose();
+            m_ImageCachedIdx = null;
+        }
+        private ButtonItemAccessibleObject _ButtonItemAccessibleObject = null;
+        protected override System.Windows.Forms.AccessibleObject CreateAccessibilityInstance()
+        {
+            if (_ButtonItemAccessibleObject == null)
+                _ButtonItemAccessibleObject = new ButtonItemAccessibleObject(this);
+            return _ButtonItemAccessibleObject;
+        }
+
+        private bool _AutoDisposeImages = false;
+        /// <summary>
+        /// Indicates whether images assigned to the button are disposed when button is disposed. Default value is false.
+        /// </summary>
+        [DefaultValue(false), Category("Behavior"), Description("Indicates whether images assigned to the button are disposed when button is disposed. Default value is false.")]
+        public bool AutoDisposeImages
+        {
+            get
+            {
+                return _AutoDisposeImages;
+            }
+            set
+            {
+                _AutoDisposeImages = value;
+            }
+        }
+
+        #endregion
+
+        #region Serialization
+        /// <summary>
+        /// Overloaded. Serializes the item and all sub-items into the XmlElement.
+        /// </summary>
+        /// <param name="ThisItem">XmlElement to serialize the item to.</param>
+        protected internal override void Serialize(ItemSerializationContext context)
+        {
+            base.Serialize(context);
+            System.Xml.XmlElement ThisItem = context.ItemXmlElement;
+            ThisItem.SetAttribute("ImagePosition", System.Xml.XmlConvert.ToString(((int)m_ImagePosition)));
+            ThisItem.SetAttribute("ButtonStyle", System.Xml.XmlConvert.ToString(((int)m_ButtonStyle)));
+            ThisItem.SetAttribute("Checked", System.Xml.XmlConvert.ToString(m_Checked));
+            ThisItem.SetAttribute("VerticalPadding", System.Xml.XmlConvert.ToString(m_VerticalPadding));
+            ThisItem.SetAttribute("HorizontalPadding", System.Xml.XmlConvert.ToString(m_HorizontalPadding));
+
+            ThisItem.SetAttribute("MenuVisibility", System.Xml.XmlConvert.ToString((int)m_MenuVisibility));
+            ThisItem.SetAttribute("RecentlyUsed", System.Xml.XmlConvert.ToString(m_RecentlyUsed));
+
+            if (m_AlternateShortcutText != "")
+                ThisItem.SetAttribute("AlternateShortcutText", m_AlternateShortcutText);
+
+            if (!m_ForeColor.IsEmpty)
+                ThisItem.SetAttribute("forecolor", BarFunctions.ColorToString(m_ForeColor));
+
+            if (m_HotTrackingStyle != eHotTrackingStyle.Default)
+                ThisItem.SetAttribute("hottrack", System.Xml.XmlConvert.ToString((int)m_HotTrackingStyle));
+
+            if (m_HotFontBold)
+                ThisItem.SetAttribute("hotfb", System.Xml.XmlConvert.ToString(m_HotFontBold));
+            if (m_HotFontUnderline)
+                ThisItem.SetAttribute("hotfu", System.Xml.XmlConvert.ToString(m_HotFontUnderline));
+
+            if (!m_HotForeColor.IsEmpty)
+                ThisItem.SetAttribute("hotclr", BarFunctions.ColorToString(m_HotForeColor));
+
+            if (m_OptionGroup != "")
+                ThisItem.SetAttribute("optiongroup", m_OptionGroup);
+
+            if (m_FontBold)
+                ThisItem.SetAttribute("fontbold", System.Xml.XmlConvert.ToString(m_FontBold));
+            if (m_FontItalic)
+                ThisItem.SetAttribute("fontitalic", System.Xml.XmlConvert.ToString(m_FontItalic));
+            if (m_FontUnderline)
+                ThisItem.SetAttribute("fontunderline", System.Xml.XmlConvert.ToString(m_FontUnderline));
+
+            if (m_AutoExpandOnClick)
+                ThisItem.SetAttribute("autoexpandclick", System.Xml.XmlConvert.ToString(m_AutoExpandOnClick));
+
+            if (m_CustomColorName != "")
+                ThisItem.SetAttribute("CustomColorName", m_CustomColorName);
+            if (m_ColorTable != eButtonColor.Orange)
+                ThisItem.SetAttribute("ColorTable", Enum.GetName(m_ColorTable.GetType(), m_ColorTable));
+
+            System.Xml.XmlElement xmlElem = null, xmlElem2 = null;
+
+            // Serialize Images
+            if (m_Image != null || m_ImageIndex >= 0 || m_HoverImage != null || m_HoverImageIndex >= 0 || m_DisabledImage != null || m_DisabledImageIndex >= 0 || m_PressedImage != null || m_PressedImageIndex >= 0 || m_Icon != null || m_ImageSmall != null)
+            {
+                xmlElem = ThisItem.OwnerDocument.CreateElement("images");
+                ThisItem.AppendChild(xmlElem);
+
+                if (m_ImageIndex >= 0)
+                    xmlElem.SetAttribute("imageindex", System.Xml.XmlConvert.ToString(m_ImageIndex));
+                if (m_HoverImageIndex >= 0)
+                    xmlElem.SetAttribute("hoverimageindex", System.Xml.XmlConvert.ToString(m_HoverImageIndex));
+                if (m_DisabledImageIndex >= 0)
+                    xmlElem.SetAttribute("disabledimageindex", System.Xml.XmlConvert.ToString(m_DisabledImageIndex));
+                if (m_PressedImageIndex >= 0)
+                    xmlElem.SetAttribute("pressedimageindex", System.Xml.XmlConvert.ToString(m_PressedImageIndex));
+
+                if (m_Image != null)
+                {
+                    xmlElem2 = ThisItem.OwnerDocument.CreateElement("image");
+                    xmlElem2.SetAttribute("type", "default");
+                    xmlElem.AppendChild(xmlElem2);
+                    BarFunctions.SerializeImage(m_Image, xmlElem2);
+                }
+                if (m_ImageSmall != null)
+                {
+                    xmlElem2 = ThisItem.OwnerDocument.CreateElement("imagesmall");
+                    xmlElem2.SetAttribute("type", "small");
+                    xmlElem.AppendChild(xmlElem2);
+                    BarFunctions.SerializeImage(m_ImageSmall, xmlElem2);
+                }
+                if (m_HoverImage != null)
+                {
+                    xmlElem2 = ThisItem.OwnerDocument.CreateElement("image");
+                    xmlElem2.SetAttribute("type", "hover");
+                    xmlElem.AppendChild(xmlElem2);
+                    BarFunctions.SerializeImage(m_HoverImage, xmlElem2);
+                }
+                if (m_DisabledImage != null && m_DisabledImageCustom)
+                {
+                    xmlElem2 = ThisItem.OwnerDocument.CreateElement("image");
+                    xmlElem2.SetAttribute("type", "disabled");
+                    xmlElem.AppendChild(xmlElem2);
+                    BarFunctions.SerializeImage(m_DisabledImage, xmlElem2);
+                }
+                if (m_PressedImage != null)
+                {
+                    xmlElem2 = ThisItem.OwnerDocument.CreateElement("image");
+                    xmlElem2.SetAttribute("type", "pressed");
+                    xmlElem.AppendChild(xmlElem2);
+                    BarFunctions.SerializeImage(m_PressedImage, xmlElem2);
+                }
+                if (m_Icon != null)
+                {
+                    xmlElem2 = ThisItem.OwnerDocument.CreateElement("image");
+                    xmlElem2.SetAttribute("type", "icon");
+                    xmlElem.AppendChild(xmlElem2);
+                    BarFunctions.SerializeIcon(m_Icon, xmlElem2);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Overloaded. Deserializes the Item from the XmlElement.
+        /// </summary>
+        /// <param name="ItemXmlSource">Source XmlElement.</param>
+        public override void Deserialize(ItemSerializationContext context)
+        {
+            base.Deserialize(context);
+
+            System.Xml.XmlElement ItemXmlSource = context.ItemXmlElement;
+            m_ImagePosition = (eImagePosition)System.Xml.XmlConvert.ToInt32(ItemXmlSource.GetAttribute("ImagePosition"));
+            m_ButtonStyle = (eButtonStyle)System.Xml.XmlConvert.ToInt32(ItemXmlSource.GetAttribute("ButtonStyle"));
+            m_Checked = System.Xml.XmlConvert.ToBoolean(ItemXmlSource.GetAttribute("Checked"));
+            m_VerticalPadding = System.Xml.XmlConvert.ToInt32(ItemXmlSource.GetAttribute("VerticalPadding"));
+            m_HorizontalPadding = System.Xml.XmlConvert.ToInt32(ItemXmlSource.GetAttribute("HorizontalPadding"));
+
+            m_MenuVisibility = (eMenuVisibility)System.Xml.XmlConvert.ToInt32(ItemXmlSource.GetAttribute("MenuVisibility"));
+            m_RecentlyUsed = System.Xml.XmlConvert.ToBoolean(ItemXmlSource.GetAttribute("RecentlyUsed"));
+
+            if (ItemXmlSource.HasAttribute("forecolor"))
+                m_ForeColor = BarFunctions.ColorFromString(ItemXmlSource.GetAttribute("forecolor"));
+            else
+                m_ForeColor = System.Drawing.Color.Empty;
+
+            if (ItemXmlSource.HasAttribute("hottrack"))
+                m_HotTrackingStyle = (eHotTrackingStyle)System.Xml.XmlConvert.ToInt32(ItemXmlSource.GetAttribute("hottrack"));
+            else
+                m_HotTrackingStyle = eHotTrackingStyle.Default;
+
+            if (ItemXmlSource.HasAttribute("hotclr"))
+                m_HotForeColor = BarFunctions.ColorFromString(ItemXmlSource.GetAttribute("hotclr"));
+            else
+                m_HotForeColor = System.Drawing.Color.Empty;
+
+            if (ItemXmlSource.HasAttribute("hotfb"))
+                m_HotFontBold = System.Xml.XmlConvert.ToBoolean(ItemXmlSource.GetAttribute("hotfb"));
+            else
+                m_HotFontBold = false;
+            if (ItemXmlSource.HasAttribute("hotfu"))
+                m_HotFontUnderline = System.Xml.XmlConvert.ToBoolean(ItemXmlSource.GetAttribute("hotfu"));
+            else
+                m_HotFontUnderline = false;
+
+            if (ItemXmlSource.HasAttribute("optiongroup"))
+                m_OptionGroup = ItemXmlSource.GetAttribute("optiongroup");
+            else
+                m_OptionGroup = "";
+
+            if (ItemXmlSource.HasAttribute("fontbold"))
+                m_FontBold = System.Xml.XmlConvert.ToBoolean(ItemXmlSource.GetAttribute("fontbold"));
+            else
+                m_FontBold = false;
+            if (ItemXmlSource.HasAttribute("fontitalic"))
+                m_FontItalic = System.Xml.XmlConvert.ToBoolean(ItemXmlSource.GetAttribute("fontitalic"));
+            else
+                m_FontItalic = false;
+            if (ItemXmlSource.HasAttribute("fontunderline"))
+                m_FontUnderline = System.Xml.XmlConvert.ToBoolean(ItemXmlSource.GetAttribute("fontunderline"));
+            else
+                m_FontUnderline = false;
+
+            if (ItemXmlSource.HasAttribute("AlternateShortcutText"))
+                m_AlternateShortcutText = ItemXmlSource.GetAttribute("AlternateShortcutText");
+            else
+                m_AlternateShortcutText = "";
+
+            if (ItemXmlSource.HasAttribute("autoexpandclick"))
+                m_AutoExpandOnClick = System.Xml.XmlConvert.ToBoolean(ItemXmlSource.GetAttribute("autoexpandclick"));
+            else
+                m_AutoExpandOnClick = false;
+
+            if (ItemXmlSource.HasAttribute("CustomColorName"))
+                m_CustomColorName = ItemXmlSource.GetAttribute("CustomColorName");
+            else
+                m_CustomColorName = "";
+
+            if (ItemXmlSource.HasAttribute("ColorTable"))
+                m_ColorTable = (eButtonColor)Enum.Parse(m_ColorTable.GetType(), ItemXmlSource.GetAttribute("ColorTable"));
+            else
+                m_ColorTable = eButtonColor.Orange;
+
+            m_ImageIndex = -1;
+            m_HoverImageIndex = -1;
+            m_DisabledImageIndex = -1;
+            m_PressedImageIndex = -1;
+            m_Icon = null;
+            m_Image = null;
+            m_ImageSmall = null;
+            m_HoverImage = null;
+            m_DisabledImage = null;
+            m_DisabledImageCustom = false;
+            m_PressedImage = null;
+
+            // Load Images
+            foreach (System.Xml.XmlElement xmlElem in ItemXmlSource.ChildNodes)
+            {
+                if (xmlElem.Name == "images")
+                {
+                    if (xmlElem.HasAttribute("imageindex"))
+                        m_ImageIndex = System.Xml.XmlConvert.ToInt32(xmlElem.GetAttribute("imageindex"));
+                    if (xmlElem.HasAttribute("hoverimageindex"))
+                        m_HoverImageIndex = System.Xml.XmlConvert.ToInt32(xmlElem.GetAttribute("hoverimageindex"));
+                    if (xmlElem.HasAttribute("disabledimageindex"))
+                        m_DisabledImageIndex = System.Xml.XmlConvert.ToInt32(xmlElem.GetAttribute("disabledimageindex"));
+                    if (xmlElem.HasAttribute("pressedimageindex"))
+                        m_PressedImageIndex = System.Xml.XmlConvert.ToInt32(xmlElem.GetAttribute("pressedimageindex"));
+
+                    foreach (System.Xml.XmlElement xmlElem2 in xmlElem.ChildNodes)
+                    {
+                        switch (xmlElem2.GetAttribute("type"))
+                        {
+                            case "default":
+                                {
+                                    m_Image = BarFunctions.DeserializeImage(xmlElem2);
+                                    m_ImageIndex = -1;
+                                    break;
+                                }
+                            case "icon":
+                                {
+                                    m_Icon = BarFunctions.DeserializeIcon(xmlElem2);
+                                    m_ImageIndex = -1;
+                                    break;
+                                }
+                            case "hover":
+                                {
+                                    m_HoverImage = BarFunctions.DeserializeImage(xmlElem2);
+                                    m_HoverImageIndex = -1;
+                                    break;
+                                }
+                            case "disabled":
+                                {
+                                    m_DisabledImage = BarFunctions.DeserializeImage(xmlElem2);
+                                    m_DisabledImageIndex = -1;
+                                    m_DisabledImageCustom = true;
+                                    break;
+                                }
+                            case "pressed":
+                                {
+                                    m_PressedImage = BarFunctions.DeserializeImage(xmlElem2);
+                                    m_PressedImageIndex = -1;
+                                    break;
+                                }
+                            case "small":
+                                {
+                                    m_ImageSmall = BarFunctions.DeserializeImage(xmlElem2);
+                                    break;
+                                }
+                        }
+                    }
+                    break;
+                }
+            }
+            this.OnImageChanged();
+        }
+        #endregion
+
+        #region Internal Implementation
+        private string _NotificationMarkText = "";
+        /// <summary>
+        /// Specifies maximum of 2 character text displayed inside of the notification mark on top of the button.
+        /// </summary>
+        [DefaultValue(""), Category("Appearance"), Description("Specifies maximum of 2 character text displayed inside of the notification mark on top of the button.")]
+        public string NotificationMarkText
+        {
+            get { return _NotificationMarkText; }
+            set
+            {
+                if (value != _NotificationMarkText)
+                {
+                    string oldValue = _NotificationMarkText;
+                    _NotificationMarkText = value;
+                    OnNotificationMarkTextChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when NotificationMarkText property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnNotificationMarkTextChanged(string oldValue, string newValue)
+        {
+            if (string.IsNullOrEmpty(newValue)) _NotificationMarkWasDisplayed = true; // Make sure button gets invalidated properly
+            this.Refresh();
+        }
+
+        private eNotificationMarkPosition _NotificationMarkPosition = eNotificationMarkPosition.TopRight;
+        /// <summary>
+        /// Indicates the position of the notification marker within the bounds of the button.
+        /// </summary>
+        [DefaultValue(eNotificationMarkPosition.TopRight), Category("Appearance"), Description("Indicates the position of the notification marker within the bounds of the button.")]
+        public eNotificationMarkPosition NotificationMarkPosition
+        {
+            get { return _NotificationMarkPosition; }
+            set
+            {
+                if (value != _NotificationMarkPosition)
+                {
+                    eNotificationMarkPosition oldValue = _NotificationMarkPosition;
+                    _NotificationMarkPosition = value;
+                    OnNotificationMarkPositionChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when NotificationMarkPosition property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnNotificationMarkPositionChanged(eNotificationMarkPosition oldValue, eNotificationMarkPosition newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("NotificationMarkPosition"));
+            if(!string.IsNullOrEmpty(_NotificationMarkText))
+                this.Refresh();
+        }
+        private int _NotificationMarkSize = 0;
+        /// <summary>
+        /// Specifies diameter of notification mark. When set to 0 system default value is used.
+        /// </summary>
+        [DefaultValue(0), Category("Appearance"), Description("Specifies diameter of notification mark. When set to 0 system default value is used.")]
+        public int NotificationMarkSize
+        {
+            get { return _NotificationMarkSize; }
+            set
+            {
+                if (value != _NotificationMarkSize)
+                {
+                    int oldValue = _NotificationMarkSize;
+                    _NotificationMarkSize = value;
+                    OnNotificationMarkSizeChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when NotificationMarkSize property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnNotificationMarkSizeChanged(int oldValue, int newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("NotificationMarkSize"));
+            this.Refresh();
+        }
+        private Color _NotificationMarkColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets background color of the notification mark.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates background color of the notification mark.")]
+        public Color NotificationMarkColor
+        {
+            get { return _NotificationMarkColor; }
+            set { _NotificationMarkColor = value; this.Refresh(); }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeNotificationMarkColor()
+        {
+            return !_NotificationMarkColor.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetNotificationMarkColor()
+        {
+            this.NotificationMarkColor = Color.Empty;
+        }
+        private bool _NotificationMarkWasDisplayed = false;
+        protected override Rectangle GetInvalidateBounds()
+        {
+            if (_NotificationMarkWasDisplayed || !string.IsNullOrEmpty(_NotificationMarkText))
+            {
+                _NotificationMarkWasDisplayed = false;
+                Rectangle r = base.GetInvalidateBounds();
+                r.Inflate(6, 6);
+                return r;
+            }
+            return base.GetInvalidateBounds();
+        }
+
+        private static readonly Point DefaultNotificationMarkOffset = new Point(3, 3);
+        private Point _NotificationMarkOffset = DefaultNotificationMarkOffset;
+        /// <summary>
+        /// Specifies the offset for the notification mark relative to its position.
+        /// </summary>
+        [Category("Appearance"), Description("Specifies the offset for the notification mark relative to its position.")]
+        public Point NotificationMarkOffset
+        {
+            get { return _NotificationMarkOffset; }
+            set
+            {
+                if (value != _NotificationMarkOffset)
+                {
+                    Point oldValue = _NotificationMarkOffset;
+                    _NotificationMarkOffset = value;
+                    OnNotificationMarkOffsetChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when NotificationMarkOffset property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnNotificationMarkOffsetChanged(Point oldValue, Point newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("NotificationMarkOffset"));
+            this.Invalidate();
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeNotificationMarkOffset()
+        {
+            return _NotificationMarkOffset != DefaultNotificationMarkOffset;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetNotificationMarkOffset()
+        {
+            this.NotificationMarkOffset = DefaultNotificationMarkOffset;
+        }
+
+        /// <summary>
+        /// Gets/Sets the image position inside the button.
+        /// </summary>
+        [System.ComponentModel.Browsable(true), DevCoBrowsable(true), System.ComponentModel.Category("Appearance"), System.ComponentModel.Description("The alignment of the image in relation to text displayed by this item."), System.ComponentModel.DefaultValue(eImagePosition.Left)]
+        public virtual eImagePosition ImagePosition
+        {
+            get
+            {
+                return m_ImagePosition;
+            }
+            set
+            {
+                if (m_ImagePosition != value)
+                {
+                    m_ImagePosition = value;
+                    if (ShouldSyncProperties)
+                        BarFunctions.SyncProperty(this, "ImagePosition");
+
+                    NeedRecalcSize = true;
+                    if (this.Parent != null)
+                        this.Parent.NeedRecalcSize = true;
+                    OnAppearanceChanged();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the custom color name. Name specified here must be represented by the corresponding object with the same name that is part
+        /// of the Office2007ColorTable.RibbonTabItemColors collection. See documentation for Office2007ColorTable.RibbonTabItemColors for more information.
+        /// If color table with specified name cannot be found default color will be used. Valid settings for this property override any
+        /// setting to the Color property.
+        /// Applies to items with Office 2007 style only.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(false), DefaultValue(""), Category("Appearance"), Description("Indicates custom color table name for the button when Office 2007 style is used.")]
+        public virtual string CustomColorName
+        {
+            get { return m_CustomColorName; }
+            set
+            {
+                m_CustomColorName = value;
+                this.Refresh();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the predefined color of the button. Color specified applies to buttons with Office 2007 style only. It does not have
+        /// any effect on other styles. Default value is eButtonColor.Default
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(false), DefaultValue(eButtonColor.Orange), Category("Appearance"), Description("Indicates predefined color of button when Office 2007 style is used.")]
+        public virtual eButtonColor ColorTable
+        {
+            get { return m_ColorTable; }
+            set
+            {
+                if (m_ColorTable != value)
+                {
+                    m_ColorTable = value;
+                    m_CashedColorName = Enum.GetName(typeof(eButtonColor), m_ColorTable);
+                    this.Refresh();
+                }
+            }
+        }
+
+        internal virtual string GetColorTableName()
+        {
+            return m_CashedColorName;
+        }
+
+        /// <summary>
+        /// Gets/Sets the button style which controls the appearance of the button elements. Changing the property can display image only, text only or image and text on the button at all times.
+        /// </summary>
+        [System.ComponentModel.Browsable(true), DevCoBrowsable(true), System.ComponentModel.Category("Appearance"), System.ComponentModel.Description("Determines the style of the button."), System.ComponentModel.DefaultValue(eButtonStyle.Default)]
+        public virtual eButtonStyle ButtonStyle
+        {
+            get
+            {
+                return m_ButtonStyle;
+            }
+            set
+            {
+                if (m_ButtonStyle != value)
+                {
+                    m_ButtonStyle = value;
+                    if (ShouldSyncProperties)
+                        BarFunctions.SyncProperty(this, "ButtonStyle");
+                    NeedRecalcSize = true;
+                    if (this.Displayed && m_Parent != null)
+                    {
+                        RecalcSize();
+                        m_Parent.SubItemSizeChanged(this);
+                    }
+                    OnAppearanceChanged();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Indicates whether the item will auto-expand when clicked. 
+        /// When item is on top level bar and not on menu and contains sub-items, sub-items will be shown only if user
+        /// click the expand part of the button. Setting this property to true will expand the button and show sub-items when user
+        /// clicks anywhere inside of the button. Default value is false which indicates that button is expanded only
+        /// if its expand part is clicked.
+        /// </summary>
+        [DefaultValue(false), Browsable(true), DevCoBrowsable(true), Category("Behavior"), Description("Indicates whether the item will auto-expand (display pop-up menu or toolbar) when clicked.")]
+        public virtual bool AutoExpandOnClick
+        {
+            get
+            {
+                return m_AutoExpandOnClick;
+            }
+            set
+            {
+                m_AutoExpandOnClick = value;
+            }
+        }
+
+        private Color _SymbolColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets the color of the Symbol.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates color of the Symbol.")]
+        public Color SymbolColor
+        {
+            get { return _SymbolColor; }
+            set { _SymbolColor = value; this.Refresh(); }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeSymbolColor()
+        {
+            return !_SymbolColor.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetSymbolColor()
+        {
+            this.SymbolColor = Color.Empty;
+        }
+
+        /// <summary>
+        /// Gets the realized symbol string.
+        /// </summary>
+        [Browsable(false)]
+        public string SymbolRealized
+        {
+            get { return _SymbolRealized; }
+        }
+        private string _Symbol = "", _SymbolRealized ="";
+        /// <summary>
+        /// Indicates the symbol displayed on face of the button instead of the image. Setting the symbol overrides the image setting.
+        /// </summary>
+        [DefaultValue(""), Category("Appearance"), Description("Indicates the symbol displayed on face of the button instead of the image. Setting the symbol overrides the image setting.")]
+        [Editor("DevComponents.DotNetBar.Design.SymbolTypeEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor))]
+        public string Symbol
+        {
+            get { return _Symbol; }
+            set
+            {
+                if (value != _Symbol)
+                {
+                    string oldValue = _Symbol;
+                    _Symbol = value;
+                    OnSymbolChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when Symbol property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnSymbolChanged(string oldValue, string newValue)
+        {
+            if (string.IsNullOrEmpty(newValue))
+                _SymbolRealized = "";
+            else
+                _SymbolRealized = Symbols.GetSymbol(newValue);
+            //OnPropertyChanged(new PropertyChangedEventArgs("Symbol"));
+            NeedRecalcSize = true;
+            OnAppearanceChanged();
+            this.Refresh();
+        }
+
+        private eSymbolSet _SymbolSet = eSymbolSet.Awesome;
+        /// <summary>
+        /// Gets or sets the symbol set used to represent the Symbol.
+        /// </summary>
+        [Browsable(false), DefaultValue(eSymbolSet.Awesome)]
+        public eSymbolSet SymbolSet
+        {
+            get { return _SymbolSet; }
+            set
+            {
+                if(_SymbolSet!=value)
+                {
+                    eSymbolSet oldValue = _SymbolSet;
+                    _SymbolSet = value;
+                    OnSymbolSetChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when SymbolSet property value changes.
+        /// </summary>
+        /// <param name="oldValue">Indciates old value</param>
+        /// <param name="newValue">Indicates new value</param>
+        protected virtual void OnSymbolSetChanged(eSymbolSet oldValue, eSymbolSet newValue)
+        {
+            NeedRecalcSize = true;
+            OnAppearanceChanged();
+            this.Refresh();
+        }
+        
+
+        private float _SymbolSize = 0f;
+        /// <summary>
+        /// Indicates the size of the symbol in points.
+        /// </summary>
+        [DefaultValue(0f), Category("Appearance"), Description("Indicates the size of the symbol in points.")]
+        public float SymbolSize
+        {
+            get { return _SymbolSize; }
+            set
+            {
+                if (value != _SymbolSize)
+                {
+                    float oldValue = _SymbolSize;
+                    _SymbolSize = value;
+                    OnSymbolSizeChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when SymbolSize property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnSymbolSizeChanged(float oldValue, float newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("SymbolSize"));
+            NeedRecalcSize = true;
+            OnAppearanceChanged();
+            this.Refresh();
+        }
+
+        /// <summary>
+        /// Specifies the Button icon. Icons support multiple image sizes and alpha blending.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Category("Appearance"), Description("Specifies the Button icon. Icons support multiple image sizes and alpha blending."), DefaultValue(null)]
+        public virtual System.Drawing.Icon Icon
+        {
+            get
+            {
+                return m_Icon;
+            }
+            set
+            {
+                NeedRecalcSize = true;
+                m_Icon = value;
+                this.OnImageChanged();
+                OnAppearanceChanged();
+                this.Refresh();
+            }
+        }
+
+        private Image _ImageAlt = null;
+        /// <summary>
+        /// Specifies the Button image which is used when button background is black or very dark. Image is used when button text is white. This is provided for Metro style applications.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Category("Appearance"), Description("Specifies the Button image which is used when button background is black or very dark. Image is used when button text is white. This is provided for Metro style applications."), DefaultValue(null)]
+        public System.Drawing.Image ImageAlt
+        {
+            get
+            {
+                return _ImageAlt;
+            }
+            set
+            {
+                _ImageAlt = value;
+                OnAppearanceChanged();
+                this.Refresh();
+            }
+        }
+
+        /// <summary>
+        /// Specifies the Button image.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Category("Appearance"), Description("The image that will be displayed on the face of the item."), DefaultValue(null)]
+        public System.Drawing.Image Image
+        {
+            get
+            {
+                return m_Image;
+            }
+            set
+            {
+                NeedRecalcSize = true;
+                m_Image = value;
+                this.OnImageChanged();
+                OnAppearanceChanged();
+                this.Refresh();
+            }
+        }
+
+        /// <summary>
+        /// Specifies the small Button image used by Ribbon control when small image variant is needed because of the automatic button resizing or
+        /// because the button is on the Quick Access Toolbar.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Category("Appearance"), Description("Specifies the small Button image used by Ribbon control when small image variant is needed"), DefaultValue(null)]
+        public virtual System.Drawing.Image ImageSmall
+        {
+            get
+            {
+                return m_ImageSmall;
+            }
+            set
+            {
+                m_ImageSmall = value;
+                if (!m_ImageSizeOverride.IsEmpty || UseSmallImageResolved)
+                {
+                    NeedRecalcSize = true;
+                    OnAppearanceChanged();
+                    OnImageChanged();
+                    this.Refresh();
+                }
+            }
+        }
+
+        private bool UseSmallImageResolved
+        {
+            get
+            {
+                return m_UseSmallImage;
+            }
+        }
+
+        private eButtonImageListSelection _ImageListSizeSelection = eButtonImageListSelection.NotSet;
+        /// <summary>
+        /// Gets or sets the image size that is used by the button when multiple ImageList controls are used as source for button image.
+        /// By default ImageList assigned to Images property of parent control is used. Using this property you can selection ImagesMedium or
+        /// ImagesLarge ImageList to be used as source for image for this button.
+        /// </summary>
+        [DefaultValue(eButtonImageListSelection.NotSet), Category("Image"), Description("Indicates image size that is used by the button when multiple ImageList controls are used as source for button image.")]
+        public virtual eButtonImageListSelection ImageListSizeSelection
+        {
+            get { return _ImageListSizeSelection; }
+            set
+            {
+                _ImageListSizeSelection = value;
+                NeedRecalcSize = true;
+                OnImageChanged();
+                this.OnAppearanceChanged();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether button uses the ImageSmall as source of the image displayed on the button if ImageSmall is set to valid image. Default value is false.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool UseSmallImage
+        {
+            get { return m_UseSmallImage; }
+            set
+            {
+                if (m_UseSmallImage != value)
+                {
+                    m_UseSmallImage = value;
+                    if (m_ImageSmall != null)
+                    {
+                        NeedRecalcSize = true;
+                        OnImageChanged();
+                        this.OnAppearanceChanged();
+                    }
+                }
+            }
+        }
+
+
+        /// <summary>
+        /// Specifies the index of the image for the button if ImageList is used.
+        /// </summary>
+        [System.ComponentModel.Browsable(true), DevCoBrowsable(true), System.ComponentModel.Category("Appearance"), System.ComponentModel.Description("The image list image index of the image that will be displayed on the face of the item."), System.ComponentModel.Editor("DevComponents.DotNetBar.Design.ImageIndexEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), System.ComponentModel.TypeConverter(typeof(System.Windows.Forms.ImageIndexConverter)), System.ComponentModel.DefaultValue(-1)]
+        public int ImageIndex
+        {
+            get
+            {
+                return m_ImageIndex;
+            }
+            set
+            {
+                if (m_ImageCachedIdx != null) m_ImageCachedIdx.Dispose();
+                m_ImageCachedIdx = null;
+                if (m_ImageIndex != value)
+                {
+                    //if(this.GetOwner()==null)
+                    //	throw(new System.InvalidOperationException("Owner DotNetBarManager is not set. Add containing bar do the bars collection first."));
+                    m_ImageIndex = value;
+                    if (ShouldSyncProperties)
+                        BarFunctions.SyncProperty(this, "ImageIndex");
+                    if (m_Parent != null)
+                    {
+                        OnImageChanged();
+                        NeedRecalcSize = true;
+                        this.Refresh();
+                    }
+                    OnAppearanceChanged();
+                }
+            }
+        }
+
+        internal void SetImageIndex(int iImageIndex)
+        {
+            m_ImageIndex = iImageIndex;
+        }
+
+        protected override void ScaleItem(SizeF factor)
+        {
+            OnImageChanged(); // Force image size re-evaluation
+            base.ScaleItem(factor);
+        }
+
+        /// <summary>
+        /// Called when button image has changed.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+        public override void OnImageChanged()
+        {
+            base.OnImageChanged();
+            
+            StopPulse();
+            StopImageAnimation();
+
+            if (m_DisabledImage != null && !m_DisabledImageCustom)
+            {
+                m_DisabledImage.Dispose();
+                m_DisabledImage = null;
+            }
+            if (m_DisabledIcon != null)
+            {
+                m_DisabledIcon.Dispose();
+                m_DisabledIcon = null;
+            }
+
+            CompositeImage img = this.GetImage(ImageState.Default, Color.Black);
+            if (img != null)
+            {
+                if (m_Image != null)
+                {
+                    IBarImageSize iImageSize = null;
+                    if (_ItemPaintArgs != null)
+                        iImageSize = _ItemPaintArgs.ContainerControl as IBarImageSize;
+                    if (iImageSize == null) iImageSize = this.ContainerControl as IBarImageSize;
+                    eBarImageSize imageListSize = GetImageListSize(iImageSize);
+
+                    if (iImageSize != null && imageListSize != eBarImageSize.Default)
+                    {
+                        if (imageListSize == eBarImageSize.Medium)
+                        {
+                            this.ImageSize = new Size(32, 32);
+                        }
+                        else
+                        {
+                            this.ImageSize = new Size(48, 48);
+                        }
+                    }
+                    else
+                        this.ImageSize = new Size(img.Width, img.Height);
+                }
+                else
+                    this.ImageSize = new Size(img.Width, img.Height);
+
+                if (img.Image == m_Image)
+                    _CanAnimateImage = ImageAnimator.CanAnimate(m_Image);
+                else
+                    _CanAnimateImage = false;
+
+                img.Dispose();
+            }
+            else
+                this.ImageSize = Dpi.Size(ImageItem._InitalImageSize); // This is ImageItem default size
+
+            if (m_Parent != null)
+            {
+                ImageItem objParentImageItem = m_Parent as ImageItem;
+                if (objParentImageItem != null)
+                {
+                    //if(this.DesignMode)
+                    objParentImageItem.RefreshSubItemImageSize();
+                    //else
+                    //	objParentImageItem.OnSubItemImageSizeChanged(this);
+                }
+            }
+        }
+        private bool _CanAnimateImage = false;
+        internal bool CanAnimateImage
+        {
+            get
+            {
+                return _CanAnimateImage;
+            }
+        }
+        internal bool CurrentlyAnimatingImage
+        {
+            get
+            {
+                return _CurrentlyAnimatingImage;
+            }
+        }
+        private bool _CurrentlyAnimatingImage = false;
+        private Image _AnimateImage = null;
+        internal void StartImageAnimation(Image image)
+        {
+            if (!ImageAnimator.CanAnimate(image)) return;
+
+            _CurrentlyAnimatingImage = true;
+            _AnimateImage = image;
+
+            ImageAnimator.Animate(image, OnFrameChanged);
+        }
+        internal void StopImageAnimation()
+        {
+            if (_CurrentlyAnimatingImage == true)
+            {
+                _CurrentlyAnimatingImage = false;
+
+                Image animateImage = _AnimateImage;
+                _AnimateImage = null;
+
+                if (animateImage != null)
+                {
+                    ImageAnimator.StopAnimate(animateImage, OnFrameChanged);
+
+                    System.Drawing.Imaging.FrameDimension frameDimensions =
+                        new System.Drawing.Imaging.FrameDimension(animateImage.FrameDimensionsList[0]);
+
+                    animateImage.SelectActiveFrame(frameDimensions, 0);
+                }
+            }
+        }
+        private void OnFrameChanged(object o, EventArgs e)
+        {
+            if (_CurrentlyAnimatingImage && this.Visible)
+            {
+                this.Refresh();
+                this.Update();
+            }
+            else
+            {
+                StopImageAnimation();
+            }
+        }
+
+        /// <summary>
+        /// Called when container of the item has changed.
+        /// </summary>
+        /// <param name="objOldContainer">Previous item container.</param>
+        protected internal override void OnContainerChanged(object objOldContainer)
+        {
+            if (this.DesignMode || (m_ImageIndex >= 0 || m_Icon != null) && this.ImageSize.Width == ImageItem._InitalImageSize.Width && this.ImageSize.Height == ImageItem._InitalImageSize.Height)
+                OnImageChanged();
+            base.OnContainerChanged(objOldContainer);
+        }
+
+        /// <summary>
+        /// Specifies the image for the button when mouse is over the item.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Category("Appearance"), Description("The image that will be displayed when mouse hovers over the item."), DefaultValue(null)]
+        public virtual System.Drawing.Image HoverImage
+        {
+            get
+            {
+                return m_HoverImage;
+            }
+            set
+            {
+                m_HoverImage = value;
+                OnAppearanceChanged();
+            }
+        }
+
+        /// <summary>
+        /// Specifies the index of the image for the button when mouse is over the item when ImageList is used.
+        /// </summary>
+        [System.ComponentModel.Browsable(true), DevCoBrowsable(true), System.ComponentModel.Category("Appearance"), System.ComponentModel.Description("The image list image index of the image that will be displayed when mouse hovers over the item."), System.ComponentModel.Editor("DevComponents.DotNetBar.Design.ImageIndexEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), System.ComponentModel.TypeConverter(typeof(System.Windows.Forms.ImageIndexConverter)), System.ComponentModel.DefaultValue(-1)]
+        public virtual int HoverImageIndex
+        {
+            get
+            {
+                return m_HoverImageIndex;
+            }
+            set
+            {
+                if (m_HoverImageIndex != value)
+                {
+                    //if(this.GetOwner()==null)
+                    //	throw(new System.InvalidOperationException("Owner DotNetBarManager is not set. Add containing bar do the bars collection first."));
+                    m_HoverImageIndex = value;
+
+                    if (ShouldSyncProperties)
+                        BarFunctions.SyncProperty(this, "HoverImageIndex");
+
+                    this.Refresh();
+                    OnAppearanceChanged();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Specifies the image for the button when mouse left button is pressed.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Category("Appearance"), Description("The image that will be displayed when item is pressed."), DefaultValue(null)]
+        public virtual System.Drawing.Image PressedImage
+        {
+            get
+            {
+                return m_PressedImage;
+            }
+            set
+            {
+                m_PressedImage = value;
+                OnAppearanceChanged();
+            }
+        }
+
+        /// <summary>
+        /// Specifies the index of the image for the button when mouse left button is pressed and ImageList is used.
+        /// </summary>
+        [System.ComponentModel.Browsable(true), DevCoBrowsable(true), System.ComponentModel.Category("Appearance"), System.ComponentModel.Description("The image list image index of the image that will be displayed when item is pressed."), System.ComponentModel.Editor("DevComponents.DotNetBar.Design.ImageIndexEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), System.ComponentModel.TypeConverter(typeof(System.Windows.Forms.ImageIndexConverter)), System.ComponentModel.DefaultValue(-1)]
+        public virtual int PressedImageIndex
+        {
+            get
+            {
+                return m_PressedImageIndex;
+            }
+            set
+            {
+                if (m_PressedImageIndex != value)
+                {
+                    //if(this.GetOwner()==null)
+                    //	throw(new System.InvalidOperationException("Owner DotNetBarManager is not set. Add containing bar do the bars collection first."));
+                    m_PressedImageIndex = value;
+
+                    if (ShouldSyncProperties)
+                        BarFunctions.SyncProperty(this, "PressedImageIndex");
+
+                    OnAppearanceChanged();
+                    this.Refresh();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Specifies the image for the button when items Enabled property is set to false.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Category("Appearance"), Description("The image that will be displayed when item is disabled."), DefaultValue(null)]
+        public System.Drawing.Image DisabledImage
+        {
+            get
+            {
+                if (!m_DisabledImageCustom)
+                    return null;
+                return m_DisabledImage;
+            }
+            set
+            {
+                m_DisabledImage = value;
+                if (value == null)
+                    m_DisabledImageCustom = false;
+                else
+                    m_DisabledImageCustom = true;
+                OnAppearanceChanged();
+            }
+        }
+
+        /// <summary>
+        /// Specifies the index of the image for the button when items Enabled property is set to false and ImageList is used.
+        /// </summary>
+        [System.ComponentModel.Browsable(true), DevCoBrowsable(true), System.ComponentModel.Category("Appearance"), System.ComponentModel.Description("The image list image index of the image that will be displayed when item is disabled."), System.ComponentModel.Editor("DevComponents.DotNetBar.Design.ImageIndexEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), System.ComponentModel.TypeConverter(typeof(System.Windows.Forms.ImageIndexConverter)), System.ComponentModel.DefaultValue(-1)]
+        public int DisabledImageIndex
+        {
+            get
+            {
+                return m_DisabledImageIndex;
+            }
+            set
+            {
+                if (m_DisabledImageIndex != value)
+                {
+                    if (m_DisabledImage != null)
+                        m_DisabledImage.Dispose();
+                    m_DisabledImage = null;
+                    //if(this.GetOwner()==null)
+                    //	throw(new System.InvalidOperationException("Owner DotNetBarManager is not set. Add containing bar do the bars collection first."));
+                    m_DisabledImageIndex = value;
+
+                    if (ShouldSyncProperties)
+                        BarFunctions.SyncProperty(this, "DisabledImageIndex");
+
+                    this.Refresh();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Overriden. Draws the item.
+        /// </summary>
+        /// <param name="g">Item paint arguments.</param>
+        public override void Paint(ItemPaintArgs p)
+        {
+            if (this.SuspendLayout)
+                return;
+
+            bool oldMouseOver = m_MouseOver;
+
+            m_FadeImageLock.AcquireReaderLock(-1);
+            try
+            {
+                if (m_ImageState2 != null)
+                    m_MouseOver = false;
+                try
+                {
+                    _ItemPaintArgs = p;
+
+                    if (EffectiveStyle == eDotNetBarStyle.Office2000 && !this.IsThemed)
+                        PaintOffice(p);
+                    else
+                    {
+                        RenderButton(p);
+
+                        if (m_ImageState2 != null && !m_IgnoreAlpha)
+                        {
+                            Graphics g = p.Graphics;
+                            Rectangle r = this.DisplayRectangle;
+                            System.Drawing.Imaging.ColorMatrix matrix1 = new System.Drawing.Imaging.ColorMatrix();
+                            matrix1[3, 3] = (float)((float)m_Alpha / 255);
+                            using (System.Drawing.Imaging.ImageAttributes imageAtt = new System.Drawing.Imaging.ImageAttributes())
+                            {
+                                imageAtt.SetColorMatrix(matrix1);
+                                g.DrawImage(m_ImageState2, r, 0, 0, r.Width, r.Height, GraphicsUnit.Pixel, imageAtt);
+                            }
+                            return;
+                        }
+                    }
+                }
+                finally
+                {
+                    _ItemPaintArgs = null;
+                    m_MouseOver = oldMouseOver;
+                }
+            }
+            finally
+            {
+                m_FadeImageLock.ReleaseReaderLock();
+            }
+
+            this.DrawInsertMarker(p.Graphics);
+        }
+        
+        protected virtual void RenderButton(ItemPaintArgs p)
+        {
+            Rendering.BaseRenderer renderer = p.Renderer;
+            if (renderer != null)
+            {
+                p.ButtonItemRendererEventArgs.Graphics = p.Graphics;
+                p.ButtonItemRendererEventArgs.ButtonItem = this;
+                p.ButtonItemRendererEventArgs.ItemPaintArgs = p;
+                renderer.DrawButtonItem(p.ButtonItemRendererEventArgs);
+            }
+            else
+            {
+                ButtonItemPainter painter = PainterFactory.CreateButtonPainter(this);
+                if (painter != null)
+                {
+                    painter.PaintButton(this, p);
+                }
+                else
+                {
+                    if (EffectiveStyle == eDotNetBarStyle.Office2000)
+                        PaintOffice(p);
+                    else
+                        PaintDotNet(p);
+                }
+            }
+            if (!string.IsNullOrEmpty(_NotificationMarkText))
+                DevComponents.DotNetBar.Rendering.NotificationMarkPainter.Paint(p.Graphics, this.Bounds, _NotificationMarkPosition,
+                    _NotificationMarkText, new Size(_NotificationMarkSize, _NotificationMarkSize), _NotificationMarkOffset, _NotificationMarkColor);
+        }
+
+        private void PaintDotNet(ItemPaintArgs pa)
+        {
+            bool bIsOnMenu = pa.IsOnMenu;
+            bool bIsOnMenuBar = pa.IsOnMenuBar;
+            bool bThemed = this.IsThemed;
+
+            if (!bIsOnMenu && !bIsOnMenuBar && bThemed)
+            {
+                ThemedButtonItemPainter.PaintButton(this, pa);
+                return;
+            }
+
+            bool mouseOver = m_MouseOver;
+            if (bIsOnMenu && this.Expanded && pa.ContainerControl != null && pa.ContainerControl.Parent != null)
+            {
+                if (!pa.ContainerControl.Parent.Bounds.Contains(System.Windows.Forms.Control.MousePosition))
+                    mouseOver = true;
+            }
+
+            System.Drawing.Graphics g = pa.Graphics;
+
+            Rectangle rect = Rectangle.Empty;
+            Rectangle itemRect = new Rectangle(m_Rect.X, m_Rect.Y, m_Rect.Width, m_Rect.Height);
+            Color textColor = System.Drawing.Color.Empty;
+
+            if (mouseOver && !m_HotForeColor.IsEmpty)
+                textColor = m_HotForeColor;
+            else if (!m_ForeColor.IsEmpty)
+                textColor = m_ForeColor;
+            else if (mouseOver /*&& m_Checked*/ && !m_Expanded && /*!bIsOnMenu &&*/ m_HotTrackingStyle != eHotTrackingStyle.Image)
+                textColor = pa.Colors.ItemHotText;
+            else if (m_Expanded)
+                textColor = pa.Colors.ItemExpandedText;
+            else
+            {
+                if (bThemed && bIsOnMenuBar && pa.Colors.ItemText == SystemColors.ControlText)
+                    textColor = SystemColors.MenuText;
+                else
+                    textColor = pa.Colors.ItemText;
+            }
+
+            Font objFont = null;
+
+            eTextFormat objStringFormat = pa.ButtonStringFormat;
+            CompositeImage objImage = GetImage();
+            System.Drawing.Size imageSize = System.Drawing.Size.Empty;
+
+            if (m_Font != null)
+                objFont = m_Font;
+            else
+                objFont = GetFont(pa, false);
+
+            // Calculate image position
+            if (objImage != null)
+            {
+                imageSize = this.ImageSize;// objImage.Size;
+                if (!bIsOnMenu && (m_ImagePosition == eImagePosition.Top || m_ImagePosition == eImagePosition.Bottom))
+                    rect = new Rectangle(m_ImageDrawRect.X, m_ImageDrawRect.Y, itemRect.Width, m_ImageDrawRect.Height);
+                else
+                    rect = new Rectangle(m_ImageDrawRect.X, m_ImageDrawRect.Y, m_ImageDrawRect.Width, m_ImageDrawRect.Height);
+
+                rect.Offset(itemRect.Left, itemRect.Top);
+                //if(m_ButtonType==eButtonType.StateButton)
+                //	rect.Offset(STATEBUTTON_SPACING+(m_ImageSize.Width-STATEBUTTON_SPACING)/2+(rect.Width-m_Image.Width*2)/2,(rect.Height-m_Image.Height)/2);
+                //else
+                rect.Offset((rect.Width - imageSize.Width) / 2, (rect.Height - imageSize.Height) / 2);
+
+                rect.Width = imageSize.Width;
+                rect.Height = imageSize.Height;
+            }
+
+            if (bIsOnMenu)
+            {
+                // Draw side bar
+                if (this.MenuVisibility == eMenuVisibility.VisibleIfRecentlyUsed && !this.RecentlyUsed)
+                {
+                    if (!pa.Colors.MenuUnusedSide2.IsEmpty)
+                    {
+                        System.Drawing.Drawing2D.LinearGradientBrush gradient = BarFunctions.CreateLinearGradientBrush(new Rectangle(m_Rect.Left, m_Rect.Top, m_ImageDrawRect.Right, m_Rect.Height), pa.Colors.MenuUnusedSide, pa.Colors.MenuUnusedSide2, pa.Colors.MenuUnusedSideGradientAngle);
+                        g.FillRectangle(gradient, m_Rect.Left, m_Rect.Top, m_ImageDrawRect.Right, m_Rect.Height);
+                        gradient.Dispose();
+                    }
+                    else
+                    {
+                        using (SolidBrush mybrush = new SolidBrush(pa.Colors.MenuUnusedSide/*ColorFunctions.SideRecentlyBackColor(g)*/))
+                            g.FillRectangle(mybrush, m_Rect.Left, m_Rect.Top, m_ImageDrawRect.Right, m_Rect.Height);
+                    }
+                }
+                else
+                {
+                    if (!pa.Colors.MenuSide2.IsEmpty)
+                    {
+                        System.Drawing.Drawing2D.LinearGradientBrush gradient = BarFunctions.CreateLinearGradientBrush(new Rectangle(m_Rect.Left, m_Rect.Top, m_ImageDrawRect.Right, m_Rect.Height), pa.Colors.MenuSide, pa.Colors.MenuSide2, pa.Colors.MenuSideGradientAngle);
+                        g.FillRectangle(gradient, m_Rect.Left, m_Rect.Top, m_ImageDrawRect.Right, m_Rect.Height);
+                        gradient.Dispose();
+                    }
+                    else
+                    {
+                        using (SolidBrush mybrush = new SolidBrush(pa.Colors.MenuSide))
+                            g.FillRectangle(mybrush, m_Rect.Left, m_Rect.Top, m_ImageDrawRect.Right, m_Rect.Height);
+                    }
+                }
+                // Draw Background of the item
+                //using(SolidBrush mybrush=new SolidBrush(pa.Colors.MenuBackground))
+                //	g.FillRectangle(mybrush,m_Rect.Left+m_ImageDrawRect.Right,m_Rect.Top,m_Rect.Width-m_ImageDrawRect.Right,m_Rect.Height);
+            }
+            else
+            {
+                // Draw button background
+                //if(bIsOnMenuBar)
+                //	g.FillRectangle(SystemBrushes.Control,m_Rect);
+                //else
+                //	g.FillRectangle(new SolidBrush(ColorFunctions.ToolMenuFocusBackColor(g)),m_Rect);
+                if (!pa.Colors.ItemBackground.IsEmpty)
+                {
+                    if (pa.Colors.ItemBackground2.IsEmpty)
+                    {
+                        using (SolidBrush mybrush = new SolidBrush(pa.Colors.ItemBackground))
+                            g.FillRectangle(mybrush, m_Rect);
+                    }
+                    else
+                    {
+                        using (System.Drawing.Drawing2D.LinearGradientBrush gradient = BarFunctions.CreateLinearGradientBrush(this.DisplayRectangle, pa.Colors.ItemBackground, pa.Colors.ItemBackground2, pa.Colors.ItemBackgroundGradientAngle))
+                            g.FillRectangle(gradient, this.DisplayRectangle);
+                    }
+                }
+                else if (!GetEnabled(pa.ContainerControl) && !pa.Colors.ItemDisabledBackground.IsEmpty)
+                {
+                    using (SolidBrush mybrush = new SolidBrush(pa.Colors.ItemDisabledBackground))
+                        g.FillRectangle(mybrush, m_Rect);
+                }
+            }
+
+            if (GetEnabled(pa.ContainerControl) || this.DesignMode)
+            {
+                if (m_Expanded && !bIsOnMenu)
+                {
+                    // DotNet Style
+                    if (pa.Colors.ItemExpandedBackground2.IsEmpty)
+                    {
+                        Rectangle rBack = new Rectangle(itemRect.Left, itemRect.Top, itemRect.Width, itemRect.Height);
+                        if (pa.Colors.ItemExpandedShadow.IsEmpty)
+                            rBack.Width -= 2;
+                        using (SolidBrush mybrush = new SolidBrush(pa.Colors.ItemExpandedBackground))
+                            g.FillRectangle(mybrush, rBack);
+                    }
+                    else
+                    {
+                        System.Drawing.Drawing2D.LinearGradientBrush gradient = BarFunctions.CreateLinearGradientBrush(new Rectangle(itemRect.Left, itemRect.Top, itemRect.Width - 2, itemRect.Height), pa.Colors.ItemExpandedBackground, pa.Colors.ItemExpandedBackground2, pa.Colors.ItemExpandedBackgroundGradientAngle);
+                        Rectangle rBack = new Rectangle(itemRect.Left, itemRect.Top, itemRect.Width, itemRect.Height);
+                        if (pa.Colors.ItemExpandedShadow.IsEmpty)
+                            rBack.Width -= 2;
+                        g.FillRectangle(gradient, rBack);
+                        gradient.Dispose();
+                    }
+                    Point[] p;
+                    if (m_Orientation == eOrientation.Horizontal && this.PopupSide == ePopupSide.Default)
+                        p = new Point[4];
+                    else
+                        p = new Point[5];
+                    p[0].X = itemRect.Left;
+                    p[0].Y = itemRect.Top + itemRect.Height - 1;
+                    p[1].X = itemRect.Left;
+                    p[1].Y = itemRect.Top;
+                    if (m_Orientation == eOrientation.Horizontal /*&& !pa.Colors.ItemExpandedShadow.IsEmpty*/)
+                        p[2].X = itemRect.Left + itemRect.Width - 3;
+                    else
+                        p[2].X = itemRect.Left + itemRect.Width - 1;
+                    p[2].Y = itemRect.Top;
+                    if (m_Orientation == eOrientation.Horizontal /*&& !pa.Colors.ItemExpandedShadow.IsEmpty*/)
+                        p[3].X = itemRect.Left + itemRect.Width - 3;
+                    else
+                        p[3].X = itemRect.Left + itemRect.Width - 1;
+
+                    p[3].Y = itemRect.Top + itemRect.Height - 1;
+                    if (m_Orientation == eOrientation.Vertical || this.PopupSide != ePopupSide.Default)
+                    {
+                        p[4].X = itemRect.Left;
+                        p[4].Y = itemRect.Top + itemRect.Height - 1;
+                    }
+
+                    if (!pa.Colors.ItemExpandedBorder.IsEmpty)
+                    {
+                        using (Pen mypen = new Pen(pa.Colors.ItemExpandedBorder, 1))
+                            g.DrawLines(mypen, p);
+                    }
+                    // Draw the shadow
+                    if (!pa.Colors.ItemExpandedShadow.IsEmpty && m_Orientation == eOrientation.Horizontal)
+                    {
+                        using (SolidBrush shadow = new SolidBrush(pa.Colors.ItemExpandedShadow))
+                            g.FillRectangle(shadow, itemRect.Left + itemRect.Width - 2, itemRect.Top + 2, 2, itemRect.Height - 2); // TODO: ADD GRADIENT SHADOW					
+                    }
+                }
+
+                if ((mouseOver && m_HotTrackingStyle != eHotTrackingStyle.None) || m_Expanded && !bIsOnMenu)
+                {
+                    // Draw Mouse over marker
+                    if (!m_Expanded || bIsOnMenu)
+                    {
+                        Rectangle r = itemRect;
+                        if (bIsOnMenu)
+                            r = new Rectangle(itemRect.Left + 1, itemRect.Top, itemRect.Width - 2, itemRect.Height);
+                        if (this.DesignMode && this.Focused)
+                        {
+                            //g.FillRectangle(new SolidBrush(ColorFunctions.MenuBackColor(g)),r);
+                            r = m_Rect;
+                            r.Inflate(-1, -1);
+                            DesignTime.DrawDesignTimeSelection(g, r, pa.Colors.ItemDesignTimeBorder);
+                        }
+                        else
+                        {
+                            if (m_MouseDown)
+                            {
+                                if (m_HotTrackingStyle == eHotTrackingStyle.Image)
+                                {
+                                    r = rect;
+                                    r.Inflate(2, 2);
+                                }
+                                if (pa.Colors.ItemPressedBackground2.IsEmpty)
+                                {
+                                    using (SolidBrush mybrush = new SolidBrush(pa.Colors.ItemPressedBackground/*ColorFunctions.PressedBackColor(g)*/))
+                                        g.FillRectangle(mybrush, r);
+                                }
+                                else
+                                {
+                                    System.Drawing.Drawing2D.LinearGradientBrush gradient = BarFunctions.CreateLinearGradientBrush(r, pa.Colors.ItemPressedBackground, pa.Colors.ItemPressedBackground2, pa.Colors.ItemPressedBackgroundGradientAngle);
+                                    g.FillRectangle(gradient, r);
+                                    gradient.Dispose();
+                                }
+                                using (Pen mypen = new Pen(pa.Colors.ItemPressedBorder, 1))
+                                    NativeFunctions.DrawRectangle(g, mypen, r);
+                            }
+                            else if (m_HotTrackingStyle == eHotTrackingStyle.Image && !rect.IsEmpty)
+                            {
+                                Rectangle rImage = rect;
+                                rImage.Inflate(2, 2);
+                                if (!pa.Colors.ItemHotBackground2.IsEmpty)
+                                {
+                                    System.Drawing.Drawing2D.LinearGradientBrush gradient = BarFunctions.CreateLinearGradientBrush(rImage, pa.Colors.ItemHotBackground, pa.Colors.ItemHotBackground2, pa.Colors.ItemHotBackgroundGradientAngle);
+                                    g.FillRectangle(gradient, rImage);
+                                    gradient.Dispose();
+                                }
+                                else
+                                {
+                                    using (SolidBrush mybrush = new SolidBrush(pa.Colors.ItemHotBackground/*ColorFunctions.HoverBackColor(g)*/))
+                                        g.FillRectangle(mybrush, rImage);
+                                }
+                                using (Pen mypen = new Pen(pa.Colors.ItemHotBorder, 1))
+                                    NativeFunctions.DrawRectangle(g, mypen, rImage);
+                            }
+                            else
+                            {
+                                if (!pa.Colors.ItemCheckedBackground2.IsEmpty && m_Checked)
+                                {
+                                    System.Drawing.Drawing2D.LinearGradientBrush gradient = BarFunctions.CreateLinearGradientBrush(r, pa.Colors.ItemCheckedBackground2, pa.Colors.ItemCheckedBackground, pa.Colors.ItemCheckedBackgroundGradientAngle);
+                                    g.FillRectangle(gradient, r);
+                                    gradient.Dispose();
+                                }
+                                else
+                                {
+                                    if (!pa.Colors.ItemHotBackground2.IsEmpty)
+                                    {
+                                        System.Drawing.Drawing2D.LinearGradientBrush gradient = BarFunctions.CreateLinearGradientBrush(r, pa.Colors.ItemHotBackground, pa.Colors.ItemHotBackground2, pa.Colors.ItemHotBackgroundGradientAngle);
+                                        g.FillRectangle(gradient, r);
+                                        gradient.Dispose();
+                                    }
+                                    else
+                                    {
+                                        using (SolidBrush mybrush = new SolidBrush(pa.Colors.ItemHotBackground))
+                                            g.FillRectangle(mybrush, r);
+                                    }
+                                }
+                                using (Pen mypen = new Pen(pa.Colors.ItemHotBorder, 1))
+                                    NativeFunctions.DrawRectangle(g, mypen, r);
+                            }
+                        }
+                        // TODO: Beta 2 Hack for DrawRectangle Possible bug, need to verify
+                        //r.Width-=1;
+                        //r.Height-=1;
+                        //g.DrawRectangle(SystemPens.Highlight,r);
+                    }
+
+                    // Image needs shadow when it has focus
+                    if (objImage != null && m_ButtonStyle != eButtonStyle.TextOnlyAlways)
+                    {
+                        // We needed the image to stay "up" when button is expanded too so we removed the checking here
+                        //if(m_MouseDown || (m_Expanded && !bIsOnMenu) || m_Checked && !this.IsOnCustomizeMenu && !this.IsOnCustomizeDialog)
+                        if (m_MouseDown || m_Checked && !this.IsOnCustomizeMenu && !this.IsOnCustomizeDialog)
+                        {
+                            objImage.DrawImage(g, rect);// g.DrawImage(objImage,rect);//,0,0,imageSize.Width,imageSize.Height,System.Drawing.GraphicsUnit.Pixel);
+                        }
+                        else
+                        {
+                            if (NativeFunctions.ColorDepth >= 16 && EffectiveStyle != eDotNetBarStyle.Office2003)
+                            {
+                                float[][] array = new float[5][];
+                                array[0] = new float[5] { 0, 0, 0, 0, 0 };
+                                array[1] = new float[5] { 0, 0, 0, 0, 0 };
+                                array[2] = new float[5] { 0, 0, 0, 0, 0 };
+                                array[3] = new float[5] { .5f, .5f, .5f, .5f, 0 };
+                                array[4] = new float[5] { 0, 0, 0, 0, 0 };
+                                System.Drawing.Imaging.ColorMatrix grayMatrix = new System.Drawing.Imaging.ColorMatrix(array);
+                                System.Drawing.Imaging.ImageAttributes disabledImageAttr = new System.Drawing.Imaging.ImageAttributes();
+                                disabledImageAttr.ClearColorKey();
+                                disabledImageAttr.SetColorMatrix(grayMatrix);
+
+                                rect.Offset(1, 1);
+                                //g.DrawImage(objImage,rect,0,0,objImage.Width,objImage.Height,GraphicsUnit.Pixel,disabledImageAttr);
+                                objImage.DrawImage(g, rect, 0, 0, objImage.Width, objImage.Height, GraphicsUnit.Pixel, disabledImageAttr);
+                                rect.Offset(-2, -2);
+                                //g.DrawImage(objImage,rect);
+                                objImage.DrawImage(g, rect);
+                            }
+                            else
+                            {
+                                if (EffectiveStyle == eDotNetBarStyle.OfficeXP)
+                                    rect.Offset(-1, -1);
+                                //g.DrawImage(objImage,rect);
+                                objImage.DrawImage(g, rect);
+                            }
+                        }
+                    }
+
+                    if (bIsOnMenu && this.IsOnCustomizeMenu && m_Visible && !this.SystemItem)
+                    {
+                        // Draw check box if this item is visible
+                        Rectangle r = new Rectangle(m_Rect.Left, m_Rect.Top, m_Rect.Height, m_Rect.Height);
+                        r.Inflate(-1, -1);
+                        //Color clr=g.GetNearestColor(Color.FromArgb(45,SystemColors.Highlight));
+                        Color clr = pa.Colors.ItemCheckedBackground/*ColorFunctions.CheckBoxBackColor(g)*/;
+                        if (mouseOver && !pa.Colors.ItemHotBackground2.IsEmpty)
+                        {
+                            System.Drawing.Drawing2D.LinearGradientBrush gradient = BarFunctions.CreateLinearGradientBrush(r, pa.Colors.ItemHotBackground, pa.Colors.ItemHotBackground2, pa.Colors.ItemHotBackgroundGradientAngle);
+                            g.FillRectangle(gradient, r);
+                            gradient.Dispose();
+                        }
+                        else
+                        {
+                            if (mouseOver)
+                                clr = pa.Colors.ItemHotBackground;
+
+                            if (!pa.Colors.ItemCheckedBackground2.IsEmpty && !mouseOver)
+                            {
+                                System.Drawing.Drawing2D.LinearGradientBrush gradient = BarFunctions.CreateLinearGradientBrush(r, pa.Colors.ItemCheckedBackground, pa.Colors.ItemCheckedBackground2, pa.Colors.ItemCheckedBackgroundGradientAngle);
+                                g.FillRectangle(gradient, r);
+                                gradient.Dispose();
+                            }
+                            else
+                            {
+                                SolidBrush objBrush = new SolidBrush(clr);
+                                g.FillRectangle(objBrush, r);
+                                objBrush.Dispose();
+                            }
+                        }
+                    }
+                }
+                else
+                {
+                    if (objImage != null && m_ButtonStyle != eButtonStyle.TextOnlyAlways)
+                    {
+                        if (!m_Checked || this.IsOnCustomizeMenu)
+                        {
+                            if (m_HotTrackingStyle != eHotTrackingStyle.Color)
+                            {
+                                objImage.DrawImage(g, rect);
+                            }
+                            else
+                            {
+                                // Draw gray-scale image for this hover style...
+                                float[][] array = new float[5][];
+                                array[0] = new float[5] { 0.2125f, 0.2125f, 0.2125f, 0, 0 };
+                                array[1] = new float[5] { 0.5f, 0.5f, 0.5f, 0, 0 };
+                                array[2] = new float[5] { 0.0361f, 0.0361f, 0.0361f, 0, 0 };
+                                array[3] = new float[5] { 0, 0, 0, 1, 0 };
+                                array[4] = new float[5] { 0.2f, 0.2f, 0.2f, 0, 1 };
+                                System.Drawing.Imaging.ColorMatrix grayMatrix = new System.Drawing.Imaging.ColorMatrix(array);
+                                System.Drawing.Imaging.ImageAttributes att = new System.Drawing.Imaging.ImageAttributes();
+                                att.SetColorMatrix(grayMatrix);
+                                //g.DrawImage(objImage,rect,0,0,objImage.Width,objImage.Height,GraphicsUnit.Pixel,att);
+                                objImage.DrawImage(g, rect, 0, 0, objImage.Width, objImage.Height, GraphicsUnit.Pixel, att);
+                            }
+                        }
+                        else
+                        {
+                            if ((m_Checked && bIsOnMenu || !this.Expanded) && !this.IsOnCustomizeDialog)
+                            {
+                                Rectangle r;
+                                if (bIsOnMenu)
+                                    r = new Rectangle(m_Rect.X + 1, m_Rect.Y, m_ImageDrawRect.Width - 2, m_Rect.Height);
+                                else if (m_HotTrackingStyle == eHotTrackingStyle.Image)
+                                {
+                                    r = rect;
+                                    r.Inflate(2, 2);
+                                }
+                                else
+                                    r = m_Rect;
+                                if (bIsOnMenu)
+                                    r.Inflate(-1, -1);
+                                Color clr;
+                                if (mouseOver && m_HotTrackingStyle != eHotTrackingStyle.None)
+                                {
+                                    if (m_Checked && !pa.Colors.ItemCheckedBackground2.IsEmpty)
+                                    {
+                                        System.Drawing.Drawing2D.LinearGradientBrush gradient = BarFunctions.CreateLinearGradientBrush(r, pa.Colors.ItemCheckedBackground2, pa.Colors.ItemCheckedBackground, pa.Colors.ItemCheckedBackgroundGradientAngle);
+                                        g.FillRectangle(gradient, r);
+                                        gradient.Dispose();
+                                        clr = System.Drawing.Color.Empty;
+                                    }
+                                    else
+                                    {
+                                        if (!pa.Colors.ItemHotBackground2.IsEmpty)
+                                        {
+                                            System.Drawing.Drawing2D.LinearGradientBrush gradient = BarFunctions.CreateLinearGradientBrush(r, pa.Colors.ItemHotBackground, pa.Colors.ItemHotBackground2, pa.Colors.ItemHotBackgroundGradientAngle);
+                                            g.FillRectangle(gradient, r);
+                                            gradient.Dispose();
+                                            clr = System.Drawing.Color.Empty;
+                                        }
+                                        else
+                                            clr = System.Windows.Forms.ControlPaint.Dark(pa.Colors.ItemHotBackground);
+                                    }
+                                }
+                                else
+                                {
+                                    if (!pa.Colors.ItemCheckedBackground2.IsEmpty)
+                                    {
+                                        System.Drawing.Drawing2D.LinearGradientBrush gradient = BarFunctions.CreateLinearGradientBrush(r, pa.Colors.ItemCheckedBackground, pa.Colors.ItemCheckedBackground2, pa.Colors.ItemCheckedBackgroundGradientAngle);
+                                        g.FillRectangle(gradient, r);
+                                        gradient.Dispose();
+                                        clr = System.Drawing.Color.Empty;
+                                    }
+                                    else
+                                        clr = pa.Colors.ItemCheckedBackground/*ColorFunctions.CheckBoxBackColor(g)*/;
+                                }
+                                if (!clr.IsEmpty)
+                                {
+                                    SolidBrush objBrush = new SolidBrush(clr);
+                                    g.FillRectangle(objBrush, r);
+                                    objBrush.Dispose();
+                                }
+                            }
+                            objImage.DrawImage(g, rect);
+                        }
+                    }
+                    if (bIsOnMenu && this.IsOnCustomizeMenu && m_Visible && !this.SystemItem)
+                    {
+                        // Draw check box if this item is visible
+                        Rectangle r = new Rectangle(m_Rect.Left, m_Rect.Top, m_Rect.Height, m_Rect.Height);
+                        r.Inflate(-1, -1);
+                        //Color clr=g.GetNearestColor(Color.FromArgb(96,ColorFunctions.HoverBackColor()));
+                        if (pa.Colors.ItemCheckedBackground2.IsEmpty)
+                        {
+                            Color clr = pa.Colors.ItemCheckedBackground/*ColorFunctions.CheckBoxBackColor(g)*/;
+                            SolidBrush objBrush = new SolidBrush(clr);
+                            g.FillRectangle(objBrush, r);
+                            objBrush.Dispose();
+                        }
+                        else
+                        {
+                            System.Drawing.Drawing2D.LinearGradientBrush gradient = BarFunctions.CreateLinearGradientBrush(r, pa.Colors.ItemCheckedBackground, pa.Colors.ItemCheckedBackground2, pa.Colors.ItemCheckedBackgroundGradientAngle);
+                            g.FillRectangle(gradient, r);
+                            gradient.Dispose();
+                        }
+                    }
+                    else if (m_Checked && !bIsOnMenu && objImage == null)
+                    {
+                        Rectangle r = m_Rect;
+                        // TODO: In 9188 GetNearestColor on the Graphics that were taken directly from Paint event did not work correctly. Check in future versions...
+                        // Draw background
+                        //Color clr=g.GetNearestColor(Color.FromArgb(96,ColorFunctions.HoverBackColor(g)));
+                        Color clr;
+                        if (mouseOver && m_HotTrackingStyle != eHotTrackingStyle.None)
+                        {
+                            if (!pa.Colors.ItemCheckedBackground2.IsEmpty)
+                            {
+                                System.Drawing.Drawing2D.LinearGradientBrush gradient = BarFunctions.CreateLinearGradientBrush(r, pa.Colors.ItemCheckedBackground2, pa.Colors.ItemCheckedBackground, pa.Colors.ItemCheckedBackgroundGradientAngle);
+                                g.FillRectangle(gradient, r);
+                                gradient.Dispose();
+                                clr = System.Drawing.Color.Empty;
+                            }
+                            else
+                            {
+                                if (!pa.Colors.ItemHotBackground2.IsEmpty)
+                                {
+                                    System.Drawing.Drawing2D.LinearGradientBrush gradient = BarFunctions.CreateLinearGradientBrush(r, pa.Colors.ItemHotBackground, pa.Colors.ItemHotBackground2, pa.Colors.ItemHotBackgroundGradientAngle);
+                                    g.FillRectangle(gradient, r);
+                                    gradient.Dispose();
+                                    clr = System.Drawing.Color.Empty;
+                                }
+                                else
+                                    clr = pa.Colors.ItemHotBackground;
+                            }
+                        }
+                        else
+                        {
+                            if (!pa.Colors.ItemCheckedBackground2.IsEmpty)
+                            {
+                                System.Drawing.Drawing2D.LinearGradientBrush gradient = BarFunctions.CreateLinearGradientBrush(r, pa.Colors.ItemCheckedBackground, pa.Colors.ItemCheckedBackground2, pa.Colors.ItemCheckedBackgroundGradientAngle);
+                                g.FillRectangle(gradient, r);
+                                gradient.Dispose();
+                                clr = System.Drawing.Color.Empty;
+                            }
+                            else
+                                clr = pa.Colors.ItemCheckedBackground;
+                        }
+                        if (!clr.IsEmpty)
+                        {
+                            SolidBrush objBrush = new SolidBrush(clr);
+                            g.FillRectangle(objBrush, r);
+                            objBrush.Dispose();
+                        }
+                    }
+                }
+
+                if (bIsOnMenu && this.IsOnCustomizeMenu && m_Visible && !this.SystemItem)
+                {
+                    Rectangle r = new Rectangle(m_Rect.Left, m_Rect.Top, m_Rect.Height, m_Rect.Height);
+                    r.Inflate(-1, -1);
+                    //Color clr=g.GetNearestColor(Color.FromArgb(200,SystemColors.Highlight));
+                    Color clr = pa.Colors.ItemCheckedBorder/*SystemColors.Highlight*/;
+                    Pen objPen = new Pen(clr, 1);
+                    // TODO: Beta 2 fix --> g.DrawRectangle(objPen,r);
+                    NativeFunctions.DrawRectangle(g, objPen, r);
+
+                    objPen.Dispose();
+                    objPen = new Pen(pa.Colors.ItemCheckedText);
+                    // Draw checker...
+                    Point[] pt = new Point[3];
+                    pt[0].X = r.Left + (r.Width - 5) / 2 - 1;
+                    pt[0].Y = r.Top + (r.Height - 6) / 2 + 3;
+                    pt[1].X = pt[0].X + 2;
+                    pt[1].Y = pt[0].Y + 2;
+                    pt[2].X = pt[1].X + 4;
+                    pt[2].Y = pt[1].Y - 4;
+                    g.DrawLines(objPen/*SystemPens.ControlText*/, pt);
+                    pt[0].X++;
+                    pt[1].X++;
+                    pt[2].X++;
+                    g.DrawLines(objPen/*SystemPens.ControlText*/, pt);
+                    objPen.Dispose();
+                }
+
+                if (m_Checked && !this.IsOnCustomizeMenu && !this.IsOnCustomizeDialog)
+                {
+                    Rectangle r;
+
+                    if (bIsOnMenu)
+                        r = new Rectangle(m_Rect.X + 1, m_Rect.Y, m_ImageDrawRect.Width - 2, m_Rect.Height);
+                    else if (m_HotTrackingStyle == eHotTrackingStyle.Image)
+                    {
+                        r = rect;
+                        r.Inflate(2, 2);
+                    }
+                    else
+                        r = new Rectangle(m_Rect.X, m_Rect.Y, m_Rect.Width, m_Rect.Height);
+                    if (bIsOnMenu)
+                        r.Inflate(-1, -1);
+
+                    // Draw line around...
+                    if (bIsOnMenu || !this.Expanded)
+                    {
+                        if (objImage == null || m_ButtonStyle == eButtonStyle.TextOnlyAlways)
+                        {
+                            if (mouseOver)
+                            {
+                                if (m_Checked && !pa.Colors.ItemCheckedBackground2.IsEmpty)
+                                {
+                                    System.Drawing.Drawing2D.LinearGradientBrush gradient = BarFunctions.CreateLinearGradientBrush(r, pa.Colors.ItemCheckedBackground2, pa.Colors.ItemCheckedBackground, pa.Colors.ItemCheckedBackgroundGradientAngle);
+                                    g.FillRectangle(gradient, r);
+                                    gradient.Dispose();
+                                }
+                                else
+                                {
+                                    if (!pa.Colors.ItemHotBackground2.IsEmpty)
+                                    {
+                                        System.Drawing.Drawing2D.LinearGradientBrush gradient = BarFunctions.CreateLinearGradientBrush(r, pa.Colors.ItemHotBackground, pa.Colors.ItemHotBackground2, pa.Colors.ItemHotBackgroundGradientAngle);
+                                        g.FillRectangle(gradient, r);
+                                        gradient.Dispose();
+                                    }
+                                    else
+                                    {
+                                        using (SolidBrush mybrush = new SolidBrush(pa.Colors.ItemHotBackground))
+                                            g.FillRectangle(mybrush, r);
+                                    }
+                                }
+                            }
+                            else
+                            {
+                                if (pa.Colors.ItemCheckedBackground2.IsEmpty)
+                                {
+                                    using (SolidBrush mybrush = new SolidBrush(pa.Colors.ItemCheckedBackground))
+                                        g.FillRectangle(mybrush, r);
+                                }
+                                else
+                                {
+                                    System.Drawing.Drawing2D.LinearGradientBrush gradient = BarFunctions.CreateLinearGradientBrush(r, pa.Colors.ItemCheckedBackground, pa.Colors.ItemCheckedBackground2, pa.Colors.ItemCheckedBackgroundGradientAngle);
+                                    g.FillRectangle(gradient, r);
+                                    gradient.Dispose();
+                                }
+                            }
+                        }
+
+                        //Color clr=g.GetNearestColor(Color.FromArgb(200,SystemColors.Highlight));
+                        Color clr = pa.Colors.ItemCheckedBorder/*SystemColors.Highlight*/;
+                        Pen objPen = new Pen(clr, 1);
+                        // TODO: Beta 2 fix  ---> g.DrawRectangle(objPen,r);
+                        NativeFunctions.DrawRectangle(g, objPen, r);
+
+                        objPen.Dispose();
+                    }
+
+                    if ((objImage == null || m_ButtonStyle == eButtonStyle.TextOnlyAlways) && bIsOnMenu)
+                    {
+                        // Draw checker...
+                        Pen pen = new Pen(pa.Colors.ItemCheckedText);
+                        Point[] pt = new Point[3];
+                        pt[0].X = r.Left + (r.Width - 5) / 2 - 1;
+                        pt[0].Y = r.Top + (r.Height - 6) / 2 + 3;
+                        pt[1].X = pt[0].X + 2;
+                        pt[1].Y = pt[0].Y + 2;
+                        pt[2].X = pt[1].X + 4;
+                        pt[2].Y = pt[1].Y - 4;
+                        g.DrawLines(pen/*SystemPens.ControlText*/, pt);
+                        pt[0].X++;
+                        //pt[0].Y
+                        pt[1].X++;
+                        //pt[1].Y;
+                        pt[2].X++;
+                        //pt[2].Y;
+                        g.DrawLines(pen/*SystemPens.ControlText*/, pt);
+                        pen.Dispose();
+                    }
+                }
+            }
+            else
+            {
+                if (bIsOnMenu && mouseOver && m_HotTrackingStyle == eHotTrackingStyle.Default)
+                {
+                    Rectangle r = new Rectangle(itemRect.Left + 1, itemRect.Top, itemRect.Width - 2, itemRect.Height);
+                    using (Pen mypen = new Pen(pa.Colors.ItemHotBorder, 1))
+                        NativeFunctions.DrawRectangle(g, mypen, r);
+                }
+
+                // Replicated code from above to draw the item checked box
+                if (m_Checked && !this.IsOnCustomizeMenu && !this.IsOnCustomizeDialog)
+                {
+                    Rectangle r;
+
+                    if (bIsOnMenu)
+                        r = new Rectangle(m_Rect.X + 1, m_Rect.Y, m_ImageDrawRect.Width - 2, m_Rect.Height);
+                    else if (m_HotTrackingStyle == eHotTrackingStyle.Image)
+                    {
+                        r = rect;
+                        r.Inflate(2, 2);
+                    }
+                    else
+                        r = new Rectangle(m_Rect.X, m_Rect.Y, m_Rect.Width, m_Rect.Height);
+                    if (bIsOnMenu)
+                        r.Inflate(-1, -1);
+
+                    // Draw line around...
+                    if (bIsOnMenu || !this.Expanded)
+                    {
+                        Color clr = pa.Colors.ItemDisabledText;
+                        Pen objPen = new Pen(clr, 1);
+                        NativeFunctions.DrawRectangle(g, objPen, r);
+                        objPen.Dispose();
+                    }
+
+                    if ((objImage == null || m_ButtonStyle == eButtonStyle.TextOnlyAlways) && bIsOnMenu)
+                    {
+                        // Draw checker...
+                        Pen pen = new Pen(pa.Colors.ItemDisabledText);
+                        Point[] pt = new Point[3];
+                        pt[0].X = r.Left + (r.Width - 5) / 2 - 1;
+                        pt[0].Y = r.Top + (r.Height - 6) / 2 + 3;
+                        pt[1].X = pt[0].X + 2;
+                        pt[1].Y = pt[0].Y + 2;
+                        pt[2].X = pt[1].X + 4;
+                        pt[2].Y = pt[1].Y - 4;
+                        g.DrawLines(pen, pt);
+                        pt[0].X++;
+                        //pt[0].Y
+                        pt[1].X++;
+                        //pt[1].Y;
+                        pt[2].X++;
+                        //pt[2].Y;
+                        g.DrawLines(pen, pt);
+                        pen.Dispose();
+                    }
+                }
+                textColor = pa.Colors.ItemDisabledText;
+                if (objImage != null && m_ButtonStyle != eButtonStyle.TextOnlyAlways)
+                {
+                    // Draw disabled image
+                    objImage.DrawImage(g, rect);
+                }
+            }
+
+            // Draw menu item text
+            if (bIsOnMenu || m_ButtonStyle != eButtonStyle.Default || objImage == null || (!bIsOnMenu && (m_ImagePosition == eImagePosition.Top || m_ImagePosition == eImagePosition.Bottom)) /*|| !this.IsOnBar*/) // Commented out becouse it caused text to be drawn if item is not on bar no matter what
+            {
+                if (bIsOnMenu)
+                    rect = new Rectangle(m_TextDrawRect.X, m_TextDrawRect.Y, itemRect.Width - m_ImageDrawRect.Right - 26, m_TextDrawRect.Height);
+                else
+                {
+                    rect = m_TextDrawRect;
+                    if (m_ImagePosition == eImagePosition.Top || m_ImagePosition == eImagePosition.Bottom)
+                    {
+                        if (m_Orientation == eOrientation.Vertical)
+                        {
+                            rect = new Rectangle(m_TextDrawRect.X, m_TextDrawRect.Y, m_TextDrawRect.Width, m_TextDrawRect.Height);
+                        }
+                        else
+                        {
+                            rect = new Rectangle(m_TextDrawRect.X, m_TextDrawRect.Y, itemRect.Width, m_TextDrawRect.Height);
+                            if ((this.SubItems.Count > 0 || this.PopupType == ePopupType.Container) && this.ShowSubItems)
+                                rect.Width -= 10;
+                        }
+
+                        objStringFormat |= eTextFormat.HorizontalCenter;
+                    }
+                    else if (bIsOnMenuBar && objImage == null)
+                        objStringFormat |= eTextFormat.HorizontalCenter;
+
+                    if (m_MouseDown && m_HotTrackingStyle != eHotTrackingStyle.Image)
+                    {
+                        if (m_ForeColor.IsEmpty)
+                        {
+                            textColor = pa.Colors.ItemPressedText;
+                        }
+                        else
+                        {
+                            textColor = System.Windows.Forms.ControlPaint.Light(m_ForeColor);
+                        }
+                    }
+                }
+
+                rect.Offset(itemRect.Left, itemRect.Top);
+
+                if (m_Orientation == eOrientation.Vertical && !bIsOnMenu)
+                {
+                    g.RotateTransform(90);
+                    TextDrawing.DrawStringLegacy(g, m_Text, objFont, textColor, new Rectangle(rect.Top, -rect.Right, rect.Height, rect.Width), objStringFormat);
+                    g.ResetTransform();
+                }
+                else
+                {
+                    if (rect.Right > m_Rect.Right)
+                        rect.Width = m_Rect.Right - rect.Left;
+                    TextDrawing.DrawString(g, m_Text, objFont, textColor, rect, objStringFormat);
+                    if (!this.DesignMode && this.Focused && !bIsOnMenu && !bIsOnMenuBar)
+                    {
+                        //SizeF szf=g.MeasureString(m_Text,objFont,rect.Width,objStringFormat);
+                        Rectangle r = rect;
+                        //r.Width=(int)Math.Ceiling(szf.Width);
+                        //r.Height=(int)Math.Ceiling(szf.Height);
+                        //r.Inflate(1,1);
+                        System.Windows.Forms.ControlPaint.DrawFocusRectangle(g, r);
+                    }
+                }
+
+            }
+
+            // Draw Shortcut text if needed
+            if (this.DrawShortcutText != "" && bIsOnMenu && !this.IsOnCustomizeDialog)
+            {
+                objStringFormat |= eTextFormat.HidePrefix | eTextFormat.Right;
+                TextDrawing.DrawString(g, this.DrawShortcutText, objFont, textColor, rect, objStringFormat);
+            }
+
+            // If it has subitems draw the triangle to indicate that
+            if ((this.SubItems.Count > 0 || this.PopupType == ePopupType.Container) && this.ShowSubItems)
+            {
+                if (bIsOnMenu)
+                {
+                    Point[] p = new Point[3];
+                    p[0].X = itemRect.Left + itemRect.Width - 12;
+                    p[0].Y = itemRect.Top + (itemRect.Height - 8) / 2;
+                    p[1].X = p[0].X;
+                    p[1].Y = p[0].Y + 8;
+                    p[2].X = p[0].X + 4;
+                    p[2].Y = p[0].Y + 4;
+                    using (SolidBrush brush = new SolidBrush(textColor))
+                        g.FillPolygon(brush, p);
+                }
+                else if (!m_SubItemsRect.IsEmpty)
+                {
+                    if (GetEnabled(pa.ContainerControl) && ((mouseOver || m_Checked) && !m_Expanded && m_HotTrackingStyle != eHotTrackingStyle.None && m_HotTrackingStyle != eHotTrackingStyle.Image))
+                    {
+                        if (m_Orientation == eOrientation.Horizontal)
+                        {
+                            using (Pen mypen = new Pen(pa.Colors.ItemHotBorder))
+                                g.DrawLine(mypen/*SystemPens.Highlight*/, itemRect.Left + m_SubItemsRect.Left, itemRect.Top, itemRect.Left + m_SubItemsRect.Left, itemRect.Bottom - 1);
+                        }
+                        else
+                        {
+                            using (Pen mypen = new Pen(pa.Colors.ItemHotBorder))
+                                g.DrawLine(mypen/*SystemPens.Highlight*/, itemRect.Left, itemRect.Top + m_SubItemsRect.Top, itemRect.Right - 2, itemRect.Top + m_SubItemsRect.Top);
+                        }
+                    }
+                    Point[] p = new Point[3];
+                    if (this.PopupSide == ePopupSide.Default)
+                    {
+                        if (m_Orientation == eOrientation.Horizontal)
+                        {
+                            p[0].X = itemRect.Left + m_SubItemsRect.Left + (m_SubItemsRect.Width - 5) / 2;
+                            p[0].Y = itemRect.Top + (m_SubItemsRect.Height - 3) / 2 + 1;
+                            p[1].X = p[0].X + 5;
+                            p[1].Y = p[0].Y;
+                            p[2].X = p[0].X + 2;
+                            p[2].Y = p[0].Y + 3;
+                        }
+                        else
+                        {
+                            p[0].X = itemRect.Left + (m_SubItemsRect.Width - 3) / 2 + 1;
+                            p[0].Y = itemRect.Top + m_SubItemsRect.Top + (m_SubItemsRect.Height - 5) / 2;
+                            p[1].X = p[0].X;
+                            p[1].Y = p[0].Y + 6;
+                            p[2].X = p[0].X - 3;
+                            p[2].Y = p[0].Y + 3;
+                        }
+                    }
+                    else
+                    {
+                        switch (this.PopupSide)
+                        {
+                            case ePopupSide.Left:
+                                {
+                                    p[0].X = itemRect.Left + m_SubItemsRect.Left + m_SubItemsRect.Width / 2;
+                                    p[0].Y = itemRect.Top + m_SubItemsRect.Height / 2 - 3;
+                                    p[1].X = p[0].X;
+                                    p[1].Y = p[0].Y + 6;
+                                    p[2].X = p[0].X + 3;
+                                    p[2].Y = p[0].Y + 3;
+                                    break;
+                                }
+                            case ePopupSide.Right:
+                                {
+                                    p[0].X = itemRect.Left + m_SubItemsRect.Left + m_SubItemsRect.Width / 2 + 3;
+                                    p[0].Y = itemRect.Top + m_SubItemsRect.Height / 2 - 3;
+                                    p[1].X = p[0].X;
+                                    p[1].Y = p[0].Y + 6;
+                                    p[2].X = p[0].X - 3;
+                                    p[2].Y = p[0].Y + 3;
+                                    break;
+                                }
+                            case ePopupSide.Top:
+                                {
+                                    p[0].X = itemRect.Left + m_SubItemsRect.Left + (m_SubItemsRect.Width - 5) / 2;
+                                    p[0].Y = itemRect.Top + (m_SubItemsRect.Height - 3) / 2 + 4;
+                                    p[1].X = p[0].X + 6;
+                                    p[1].Y = p[0].Y;
+                                    p[2].X = p[0].X + 3;
+                                    p[2].Y = p[0].Y - 4;
+                                    break;
+                                }
+                            case ePopupSide.Bottom:
+                                {
+                                    p[0].X = itemRect.Left + m_SubItemsRect.Left + (m_SubItemsRect.Width - 5) / 2 + 1;
+                                    p[0].Y = itemRect.Top + (m_SubItemsRect.Height - 3) / 2 + 1;
+                                    p[1].X = p[0].X + 5;
+                                    p[1].Y = p[0].Y;
+                                    p[2].X = p[0].X + 2;
+                                    p[2].Y = p[0].Y + 3;
+                                    break;
+                                }
+                        }
+                    }
+                    if (GetEnabled(pa.ContainerControl))
+                    {
+                        using (SolidBrush mybrush = new SolidBrush(pa.Colors.ItemText))
+                            g.FillPolygon(mybrush/*SystemBrushes.ControlText*/, p);
+                    }
+                    else
+                    {
+                        using (SolidBrush mybrush = new SolidBrush(pa.Colors.ItemDisabledText))
+                            g.FillPolygon(mybrush/*SystemBrushes.ControlDark*/, p);
+                    }
+                }
+            }
+
+            if (this.Focused && this.DesignMode)
+            {
+                Rectangle r = itemRect;
+                r.Inflate(-1, -1);
+                DesignTime.DrawDesignTimeSelection(g, r, pa.Colors.ItemDesignTimeBorder);
+            }
+
+            if (objImage != null)
+                objImage.Dispose();
+        }
+
+        internal bool IgnoreAlpha
+        {
+            get { return m_IgnoreAlpha; }
+            set { m_IgnoreAlpha = value; }
+        }
+
+        private void PaintThemed(ItemPaintArgs pa)
+        {
+            System.Drawing.Graphics g = pa.Graphics;
+            ThemeToolbar theme = pa.ThemeToolbar;
+            ThemeToolbarParts part = ThemeToolbarParts.Button;
+            ThemeToolbarStates state = ThemeToolbarStates.Normal;
+            eTextFormat format = pa.ButtonStringFormat; //GetStringFormat();
+            Color textColor = SystemColors.ControlText;
+
+            Rectangle rectImage = Rectangle.Empty;
+            Rectangle itemRect = m_Rect;
+
+            Font font = null;
+            CompositeImage image = GetImage();
+
+            if (m_Font != null)
+                font = m_Font;
+            else
+                font = GetFont(pa, false);
+
+            bool bSplitButton = (this.SubItems.Count > 0 || this.PopupType == ePopupType.Container) && this.ShowSubItems && !m_SubItemsRect.IsEmpty;
+
+            if (bSplitButton)
+                part = ThemeToolbarParts.SplitButton;
+
+            // Calculate image position
+            if (image != null)
+            {
+                if (m_ImagePosition == eImagePosition.Top || m_ImagePosition == eImagePosition.Bottom)
+                    rectImage = new Rectangle(m_ImageDrawRect.X, m_ImageDrawRect.Y, itemRect.Width, m_ImageDrawRect.Height);
+                else
+                    rectImage = new Rectangle(m_ImageDrawRect.X, m_ImageDrawRect.Y, m_ImageDrawRect.Width, m_ImageDrawRect.Height);
+
+                rectImage.Offset(itemRect.Left, itemRect.Top);
+                rectImage.Offset((rectImage.Width - this.ImageSize.Width) / 2, (rectImage.Height - this.ImageSize.Height) / 2);
+                rectImage.Width = this.ImageSize.Width;
+                rectImage.Height = this.ImageSize.Height;
+            }
+
+            // Set the state and text brush
+            if (!GetEnabled(pa.ContainerControl))
+            {
+                state = ThemeToolbarStates.Disabled;
+                textColor = pa.Colors.ItemDisabledText;
+            }
+            else if (m_MouseDown)
+            {
+                state = ThemeToolbarStates.Pressed;
+                textColor = pa.Colors.ItemPressedText;
+            }
+            else if (m_MouseOver && m_Checked)
+            {
+                state = ThemeToolbarStates.HotChecked;
+                textColor = pa.Colors.ItemHotText;
+            }
+            else if (m_MouseOver || m_Expanded)
+            {
+                state = ThemeToolbarStates.Hot;
+                textColor = pa.Colors.ItemHotText;
+            }
+            else if (m_Checked)
+            {
+                state = ThemeToolbarStates.Checked;
+                textColor = pa.Colors.ItemCheckedText;
+            }
+            else
+                textColor = pa.Colors.ItemText;
+
+            Rectangle backRect = m_Rect;
+            if (m_HotTrackingStyle == eHotTrackingStyle.Image && image != null)
+            {
+                backRect = rectImage;
+                backRect.Inflate(3, 3);
+            }
+            else if (bSplitButton)
+            {
+                backRect.Width = backRect.Width - m_SubItemsRect.Width;
+            }
+
+            // Draw Button Background
+            if (m_HotTrackingStyle != eHotTrackingStyle.None)
+            {
+                theme.DrawBackground(g, part, state, backRect);
+            }
+
+            // Draw Image
+            if (image != null && m_ButtonStyle != eButtonStyle.TextOnlyAlways)
+            {
+                if (state == ThemeToolbarStates.Normal && m_HotTrackingStyle == eHotTrackingStyle.Color)
+                {
+                    // Draw gray-scale image for this hover style...
+                    float[][] array = new float[5][];
+                    array[0] = new float[5] { 0.2125f, 0.2125f, 0.2125f, 0, 0 };
+                    array[1] = new float[5] { 0.5f, 0.5f, 0.5f, 0, 0 };
+                    array[2] = new float[5] { 0.0361f, 0.0361f, 0.0361f, 0, 0 };
+                    array[3] = new float[5] { 0, 0, 0, 1, 0 };
+                    array[4] = new float[5] { 0.2f, 0.2f, 0.2f, 0, 1 };
+                    System.Drawing.Imaging.ColorMatrix grayMatrix = new System.Drawing.Imaging.ColorMatrix(array);
+                    System.Drawing.Imaging.ImageAttributes att = new System.Drawing.Imaging.ImageAttributes();
+                    att.SetColorMatrix(grayMatrix);
+                    //g.DrawImage(image,rectImage,0,0,image.Width,image.Height,GraphicsUnit.Pixel,att);
+                    image.DrawImage(g, rectImage, 0, 0, image.Width, image.Height, GraphicsUnit.Pixel, att);
+                }
+                else if (state == ThemeToolbarStates.Normal && !image.IsIcon)
+                {
+                    // Draw image little bit lighter, I decied to use gamma it is easy
+                    System.Drawing.Imaging.ImageAttributes lightImageAttr = new System.Drawing.Imaging.ImageAttributes();
+                    lightImageAttr.SetGamma(.7f, System.Drawing.Imaging.ColorAdjustType.Bitmap);
+                    //g.DrawImage(image,rectImage,0,0,image.Width,image.Height,GraphicsUnit.Pixel,lightImageAttr);
+                    image.DrawImage(g, rectImage, 0, 0, image.Width, image.Height, GraphicsUnit.Pixel, lightImageAttr);
+                }
+                else
+                {
+                    image.DrawImage(g, rectImage);
+                }
+            }
+
+            // Draw Text
+            if (m_ButtonStyle == eButtonStyle.ImageAndText || m_ButtonStyle == eButtonStyle.TextOnlyAlways || image == null /*|| !this.IsOnBar*/) // Commented out becouse it caused text to be drawn if item is not on bar no matter what
+            {
+                Rectangle rectText = m_TextDrawRect;
+                if (m_ImagePosition == eImagePosition.Top || m_ImagePosition == eImagePosition.Bottom)
+                {
+                    if (m_Orientation == eOrientation.Vertical)
+                    {
+                        rectText = new Rectangle(m_TextDrawRect.X, m_TextDrawRect.Y, m_TextDrawRect.Width, m_TextDrawRect.Height);
+                    }
+                    else
+                    {
+                        rectText = new Rectangle(m_TextDrawRect.X, m_TextDrawRect.Y, itemRect.Width, m_TextDrawRect.Height);
+                        if ((this.SubItems.Count > 0 || this.PopupType == ePopupType.Container) && this.ShowSubItems)
+                            rectText.Width -= 10;
+                    }
+                    format |= eTextFormat.HorizontalCenter;
+                }
+
+                rectText.Offset(itemRect.Left, itemRect.Top);
+
+                if (m_Orientation == eOrientation.Vertical)
+                {
+                    g.RotateTransform(90);
+                    TextDrawing.DrawStringLegacy(g, m_Text, font, textColor, new Rectangle(rectText.Top, -rectText.Right, rectText.Height, rectText.Width), format);
+                    g.ResetTransform();
+                }
+                else
+                {
+                    if (rectText.Right > m_Rect.Right)
+                        rectText.Width = m_Rect.Right - rectText.Left;
+                    TextDrawing.DrawString(g, m_Text, font, textColor, rectText, format);
+                    if (!this.DesignMode && this.Focused && !pa.IsOnMenu && !pa.IsOnMenuBar)
+                    {
+                        //SizeF szf=g.MeasureString(m_Text,font,rectText.Width,format);
+                        Rectangle r = rectText;
+                        //r.Width=(int)Math.Ceiling(szf.Width);
+                        //r.Height=(int)Math.Ceiling(szf.Height);
+                        //r.Inflate(1,1);
+                        System.Windows.Forms.ControlPaint.DrawFocusRectangle(g, r);
+                    }
+                }
+            }
+
+            // If it has subitems draw the triangle to indicate that
+            if (bSplitButton)
+            {
+                part = ThemeToolbarParts.SplitButtonDropDown;
+
+                if (!GetEnabled(pa.ContainerControl))
+                    state = ThemeToolbarStates.Disabled;
+                else
+                    state = ThemeToolbarStates.Normal;
+
+                if (m_HotTrackingStyle != eHotTrackingStyle.None && m_HotTrackingStyle != eHotTrackingStyle.Image && GetEnabled(pa.ContainerControl))
+                {
+                    if (m_Expanded || m_MouseDown)
+                        state = ThemeToolbarStates.Pressed;
+                    else if (m_MouseOver && m_Checked)
+                        state = ThemeToolbarStates.HotChecked;
+                    else if (m_Checked)
+                        state = ThemeToolbarStates.Checked;
+                    else if (m_MouseOver)
+                        state = ThemeToolbarStates.Hot;
+                }
+
+                if (m_Orientation == eOrientation.Horizontal)
+                {
+                    Rectangle r = m_SubItemsRect;
+                    r.Offset(itemRect.X, itemRect.Y);
+                    theme.DrawBackground(g, part, state, r);
+                }
+                else
+                {
+                    Rectangle r = m_SubItemsRect;
+                    r.Offset(itemRect.X, itemRect.Y);
+                    theme.DrawBackground(g, part, state, r);
+                }
+                //g.DrawLine(new Pen(pa.Colors.ItemHotBorder)/*SystemPens.Highlight*/,itemRect.Left,itemRect.Top+m_SubItemsRect.Top,itemRect.Right-2,itemRect.Top+m_SubItemsRect.Top);
+            }
+
+            if (this.Focused && this.DesignMode)
+            {
+                Rectangle r = itemRect;
+                r.Inflate(-1, -1);
+                DesignTime.DrawDesignTimeSelection(g, r, pa.Colors.ItemDesignTimeBorder);
+            }
+
+            if (image != null)
+                image.Dispose();
+        }
+
+        private void PaintOffice(ItemPaintArgs pa)
+        {
+            System.Drawing.Graphics g = pa.Graphics;
+            Rectangle rect = Rectangle.Empty;
+            Rectangle itemRect = m_Rect;
+            Rectangle rTmp = Rectangle.Empty;
+            Color textColor = SystemColors.ControlText;
+            Color color3d = SystemColors.Control;
+
+            if (m_Parent is GenericItemContainer && !((GenericItemContainer)m_Parent).BackColor.IsEmpty)
+                color3d = ((GenericItemContainer)m_Parent).BackColor;
+            else if (m_Parent is SideBarPanelItem && !((SideBarPanelItem)m_Parent).BackgroundStyle.BackColor1.IsEmpty)
+                color3d = ((SideBarPanelItem)m_Parent).BackgroundStyle.BackColor1.GetCompositeColor();
+
+            if (m_MouseOver && !m_HotForeColor.IsEmpty)
+                textColor = m_HotForeColor;
+            else if (!m_ForeColor.IsEmpty)
+                textColor = m_ForeColor;
+
+            Font objFont = null;
+            bool bIsOnMenu = pa.IsOnMenu;
+            bool buttonX = pa.ContainerControl is ButtonX;
+            //g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.Default;
+            //g.TextRenderingHint=System.Drawing.Text.TextRenderingHint.ClearTypeGridFit;
+            eTextFormat objStringFormat = pa.ButtonStringFormat;
+            CompositeImage objImage = GetImage();
+
+            if (m_Font != null)
+                objFont = m_Font;
+            else
+                objFont = GetFont(pa, false);
+
+            // Calculate image position
+            if (objImage != null)
+            {
+
+                if (!bIsOnMenu && (m_ImagePosition == eImagePosition.Top || m_ImagePosition == eImagePosition.Bottom))
+                    rect = new Rectangle(m_ImageDrawRect.X, m_ImageDrawRect.Y + 1, itemRect.Width, m_ImageDrawRect.Height);
+                else
+                    rect = m_ImageDrawRect; //new Rectangle(m_ImageDrawRect.X,m_ImageDrawRect.Y,m_ImageDrawRect.Width,m_ImageDrawRect.Height);
+
+                rect.Offset(itemRect.Left, itemRect.Top);
+                //if(m_ButtonType==eButtonType.StateButton)
+                //	rect.Offset(STATEBUTTON_SPACING+(m_ImageSize.Width-STATEBUTTON_SPACING)/2+(rect.Width-m_Image.Width*2)/2,(rect.Height-m_Image.Height)/2);
+                //else
+                rect.Offset((rect.Width - this.ImageSize.Width) / 2, (rect.Height - this.ImageSize.Height) / 2);
+
+                rect.Width = this.ImageSize.Width;
+                rect.Height = this.ImageSize.Height;
+            }
+
+            // Draw background
+            if (bIsOnMenu && !this.DesignMode && this.MenuVisibility == eMenuVisibility.VisibleIfRecentlyUsed && !this.RecentlyUsed)
+                g.FillRectangle(new SolidBrush(ColorFunctions.RecentlyUsedOfficeBackColor()), m_Rect);
+            else if (buttonX)
+            {
+                ButtonState state = ButtonState.Normal;
+                if (m_MouseDown)
+                    state = ButtonState.Pushed;
+                else if (m_Checked || m_Expanded)
+                    state = ButtonState.Checked;
+                ControlPaint.DrawButton(g, itemRect, state);
+            }
+            //else
+            //	g.FillRectangle(SystemBrushes.Control,m_Rect);
+
+            if (GetEnabled(pa.ContainerControl) || this.DesignMode)
+            {
+                if (m_Expanded && !bIsOnMenu)
+                {
+                    // Office 2000 Style
+                    g.FillRectangle(SystemBrushes.Control, itemRect);
+                    //System.Windows.Forms.ControlPaint.DrawBorder3D(g,itemRect,System.Windows.Forms.Border3DStyle.SunkenOuter,System.Windows.Forms.Border3DSide.All);
+                    BarFunctions.DrawBorder3D(g, itemRect, System.Windows.Forms.Border3DStyle.SunkenOuter, System.Windows.Forms.Border3DSide.All, color3d);
+                }
+
+                if ((m_MouseOver && m_HotTrackingStyle != eHotTrackingStyle.None) || m_Expanded || m_Checked && !this.IsOnCustomizeMenu && !this.IsOnCustomizeDialog)
+                {
+                    //if(m_ButtonType!=eButtonType.Label)
+                    {
+                        // Draw Mouse over marker
+                        if (bIsOnMenu || this.IsOnCustomizeDialog)
+                        {
+                            if ((m_MouseOver && m_HotTrackingStyle != eHotTrackingStyle.None) || m_Expanded)
+                            {
+                                if (!(m_MouseOver && this.DesignMode) || this.IsOnCustomizeDialog)
+                                    g.FillRectangle(SystemBrushes.Highlight, itemRect);
+                            }
+                        }
+                        else
+                        {
+                            if (m_MouseDown || (m_Checked && !this.IsOnCustomizeMenu && !this.IsOnCustomizeDialog) || this.Expanded && (!this.ShowSubItems || this.IsOnMenuBar))
+                            {
+                                if (m_SubItemsRect.IsEmpty)
+                                {
+                                    if (!buttonX)
+                                    {
+                                        BarFunctions.DrawBorder3D(g, itemRect, System.Windows.Forms.Border3DStyle.SunkenOuter, System.Windows.Forms.Border3DSide.All, color3d);
+                                        if (m_Checked && !m_MouseOver && !this.IsOnCustomizeMenu && !this.IsOnCustomizeDialog)
+                                        {
+                                            Rectangle r = itemRect; // Rectangle(itemRect.X,itemRect.Y,itemRect.Width,itemRect.Height);
+                                            r.Inflate(-1, -1);
+                                            g.FillRectangle(ColorFunctions.GetPushedBrush(this), r);
+                                        }
+                                    }
+                                }
+                                else
+                                {
+                                    if (!buttonX)
+                                    {
+                                        Rectangle r;
+                                        if (m_Orientation == eOrientation.Horizontal)
+                                            r = new Rectangle(itemRect.X, itemRect.Y, itemRect.Width - m_SubItemsRect.Width, itemRect.Height);
+                                        else
+                                            r = new Rectangle(itemRect.X, itemRect.Y, itemRect.Width, itemRect.Height - m_SubItemsRect.Height);
+                                        //System.Windows.Forms.ControlPaint.DrawBorder3D(g,r,System.Windows.Forms.Border3DStyle.SunkenOuter,System.Windows.Forms.Border3DSide.All);
+                                        BarFunctions.DrawBorder3D(g, r, System.Windows.Forms.Border3DStyle.SunkenOuter, System.Windows.Forms.Border3DSide.All, color3d);
+                                        if (!m_MouseOver)
+                                        {
+                                            r.Inflate(-1, -1);
+                                            g.FillRectangle(ColorFunctions.GetPushedBrush(this), r);
+                                        }
+                                    }
+                                }
+                            }
+                            else if (!this.DesignMode)
+                            {
+                                if (m_SubItemsRect.IsEmpty)
+                                {
+                                    if (!buttonX)
+                                        BarFunctions.DrawBorder3D(g, itemRect, System.Windows.Forms.Border3DStyle.RaisedInner, System.Windows.Forms.Border3DSide.All, color3d);
+                                }
+                                else
+                                {
+                                    Rectangle r;
+                                    if (m_Orientation == eOrientation.Horizontal)
+                                        r = new Rectangle(itemRect.X, itemRect.Y, itemRect.Width - m_SubItemsRect.Width, itemRect.Height);
+                                    else
+                                        r = new Rectangle(itemRect.X, itemRect.Y, itemRect.Width, itemRect.Height - m_SubItemsRect.Height);
+                                    //System.Windows.Forms.ControlPaint.DrawBorder3D(g,r,System.Windows.Forms.Border3DStyle.RaisedInner,System.Windows.Forms.Border3DSide.All);
+                                    BarFunctions.DrawBorder3D(g, r, System.Windows.Forms.Border3DStyle.RaisedInner, System.Windows.Forms.Border3DSide.All, color3d);
+                                }
+                            }
+
+                        }
+
+                        // TODO: Add support for Checked buttons etc...
+                        if (objImage != null && m_ButtonStyle != eButtonStyle.TextOnlyAlways)
+                        {
+                            //if(m_ButtonType==eButtonType.StateButton)
+                            //	rTmp=new Rectangle(m_ImageDrawRect.X,m_ImageDrawRect.Y,itemRect.Height,itemRect.Height);
+                            //else
+                            rTmp = new Rectangle(m_ImageDrawRect.X, m_ImageDrawRect.Y, m_ImageDrawRect.Width, itemRect.Height);
+                            //if(m_ImagePosition==eImagePosition.Right)
+                            //	rTmp.X=itemRect.Width-21-m_ImageDrawRect.Width;
+
+                            rTmp.Offset(itemRect.Left, itemRect.Top);
+                            if (bIsOnMenu)
+                            {
+                                if (m_Checked && !this.IsOnCustomizeMenu && !this.IsOnCustomizeDialog)
+                                {
+                                    //System.Windows.Forms.ControlPaint.DrawBorder3D(g,rTmp,System.Windows.Forms.Border3DStyle.SunkenOuter,System.Windows.Forms.Border3DSide.All);
+                                    BarFunctions.DrawBorder3D(g, rTmp, System.Windows.Forms.Border3DStyle.SunkenOuter, System.Windows.Forms.Border3DSide.All, color3d);
+                                    if (!m_MouseOver)
+                                    {
+                                        rTmp.Inflate(-1, -1);
+                                        g.FillRectangle(ColorFunctions.GetPushedBrush(this), rTmp);
+                                    }
+                                    /*if(m_ButtonType==eButtonType.StateButton)
+                                    {
+                                        // Draw checker...
+                                        Point[] pt=new Point[3];
+                                        pt[0].X=rTmp.Left+(rTmp.Width-5)/2;
+                                        pt[0].Y=rTmp.Top+(rTmp.Height-6)/2+3;
+                                        pt[1].X=pt[0].X+2;
+                                        pt[1].Y=pt[0].Y+2;
+                                        pt[2].X=pt[1].X+4;
+                                        pt[2].Y=pt[1].Y-4;
+                                        g.DrawLines(SystemPens.ControlText,pt);
+                                        pt[0].X++;
+                                        //pt[0].Y
+                                        pt[1].X++;
+                                        //pt[1].Y;
+                                        pt[2].X++;
+                                        //pt[2].Y;
+                                        g.DrawLines(SystemPens.ControlText,pt);
+                                    }*/
+                                }
+                                else
+                                {
+                                    //System.Windows.Forms.ControlPaint.DrawBorder3D(g,rTmp,System.Windows.Forms.Border3DStyle.RaisedInner,System.Windows.Forms.Border3DSide.All);
+                                    BarFunctions.DrawBorder3D(g, rTmp, System.Windows.Forms.Border3DStyle.RaisedInner, System.Windows.Forms.Border3DSide.All, color3d);
+                                }
+                                /*if(m_ButtonType==eButtonType.StateButton && m_MouseOver)
+                                {
+                                    rTmp=new Rectangle(rTmp.Right+STATEBUTTON_SPACING,rTmp.Top,m_ImageDrawRect.Width-rTmp.Width-STATEBUTTON_SPACING,itemRect.Height);
+                                    System.Windows.Forms.ControlPaint.DrawBorder3D(g,rTmp,System.Windows.Forms.Border3DStyle.RaisedInner,System.Windows.Forms.Border3DSide.All);
+                                }*/
+                            }
+                            else
+                            {
+                                if (m_MouseDown)
+                                    rect.Offset(1, 1);
+                            }
+                            //g.DrawImage(objImage,rect,0,0,objImage.Width,objImage.Height,System.Drawing.GraphicsUnit.Pixel);
+                            objImage.DrawImage(g, rect);
+                        }
+                        else if ((objImage == null || m_ButtonStyle == eButtonStyle.TextOnlyAlways) && m_Checked && !this.IsOnCustomizeMenu && !this.IsOnCustomizeDialog && bIsOnMenu)
+                        {
+                            // Draw checked box
+                            rTmp = new Rectangle(m_ImageDrawRect.X, m_ImageDrawRect.Y, m_ImageDrawRect.Width, itemRect.Height);
+                            rTmp.Offset(itemRect.Left, itemRect.Top);
+                            DrawOfficeCheckBox(g, rTmp);
+                        }
+                    }
+                    //else
+                    //	g.FillRectangle(SystemBrushes.Highlight,itemRect);
+                }
+                else
+                {
+                    if (objImage != null && m_ButtonStyle != eButtonStyle.TextOnlyAlways)
+                    {
+                        if (m_HotTrackingStyle != eHotTrackingStyle.Color)
+                        {
+                            //g.DrawImage(objImage,rect,0,0,objImage.Width,objImage.Height,System.Drawing.GraphicsUnit.Pixel);
+                            objImage.DrawImage(g, rect);
+                        }
+                        else if (m_HotTrackingStyle == eHotTrackingStyle.Color)
+                        {
+                            // Draw gray-scale image for this hover style...
+                            float[][] array = new float[5][];
+                            array[0] = new float[5] { 0.2125f, 0.2125f, 0.2125f, 0, 0 };
+                            array[1] = new float[5] { 0.5f, 0.5f, 0.5f, 0, 0 };
+                            array[2] = new float[5] { 0.0361f, 0.0361f, 0.0361f, 0, 0 };
+                            array[3] = new float[5] { 0, 0, 0, 1, 0 };
+                            array[4] = new float[5] { 0.2f, 0.2f, 0.2f, 0, 1 };
+                            System.Drawing.Imaging.ColorMatrix grayMatrix = new System.Drawing.Imaging.ColorMatrix(array);
+                            System.Drawing.Imaging.ImageAttributes att = new System.Drawing.Imaging.ImageAttributes();
+                            att.SetColorMatrix(grayMatrix);
+                            //g.DrawImage(objImage,rect,0,0,objImage.Width,objImage.Height,GraphicsUnit.Pixel,att);
+                            objImage.DrawImage(g, rect, 0, 0, objImage.Width, objImage.Height, GraphicsUnit.Pixel, att);
+                        }
+                        //g.CompositingMode=System.Drawing.Drawing2D.CompositingMode.SourceCopy;
+                    }
+                }
+
+                if (bIsOnMenu && this.IsOnCustomizeMenu && m_Visible && !this.SystemItem)
+                {
+                    Rectangle r = new Rectangle(m_Rect.Left, m_Rect.Top, m_Rect.Height, m_Rect.Height);
+                    //r.Inflate(-1,-1);
+                    DrawOfficeCheckBox(g, r);
+                }
+            }
+            else
+            {
+                textColor = SystemColors.ControlDark;
+                if (objImage != null && m_ButtonStyle != eButtonStyle.TextOnlyAlways)
+                {
+                    // Draw disabled image
+                    //g.DrawImage(objImage,rect);
+                    objImage.DrawImage(g, rect);
+                }
+            }
+
+            // Draw menu item text
+            if (bIsOnMenu || m_ButtonStyle != eButtonStyle.Default || objImage == null || (!bIsOnMenu && (m_ImagePosition == eImagePosition.Top || m_ImagePosition == eImagePosition.Bottom)))
+            {
+                if (bIsOnMenu)
+                    rect = new Rectangle(m_TextDrawRect.X, m_TextDrawRect.Y, itemRect.Width - m_ImageDrawRect.Right - 24, m_TextDrawRect.Height);
+                else
+                {
+                    rect = m_TextDrawRect;
+                    if (m_ImagePosition == eImagePosition.Top || m_ImagePosition == eImagePosition.Bottom)
+                    {
+                        if (m_Orientation == eOrientation.Horizontal)
+                            rect = new Rectangle(m_TextDrawRect.X, m_TextDrawRect.Y, itemRect.Width, m_TextDrawRect.Height);
+                        if ((this.SubItems.Count > 0 || this.PopupType == ePopupType.Container) && m_Orientation == eOrientation.Horizontal && this.ShowSubItems)
+                            rect.Width -= 12;
+
+                        objStringFormat |= eTextFormat.HorizontalCenter;
+                    }
+                    //else
+                    //rect=new Rectangle(m_TextDrawRect.X,m_TextDrawRect.Y,itemRect.Width-m_ImageDrawRect.Width,m_TextDrawRect.Height);
+                }
+
+                if (((m_MouseOver && m_HotTrackingStyle != eHotTrackingStyle.None) || m_Expanded) && bIsOnMenu && !this.DesignMode)
+                    textColor = SystemColors.HighlightText;
+
+                rect.Offset(itemRect.Left, itemRect.Top);
+
+                if (!bIsOnMenu && (m_MouseDown || (this.Expanded && this.IsOnMenuBar)))
+                    rect.Offset(1, 1);
+
+                if (buttonX)
+                {
+                    objStringFormat |= eTextFormat.HorizontalCenter;
+                    rect.Height--;
+                }
+                if (GetEnabled(pa.ContainerControl) || this.DesignMode)
+                {
+                    if (m_Orientation == eOrientation.Vertical && !bIsOnMenu)
+                    {
+                        g.RotateTransform(90);
+                        TextDrawing.DrawStringLegacy(g, m_Text, objFont, textColor, new Rectangle(rect.Top, -rect.Right, rect.Height, rect.Width), objStringFormat);
+                        g.ResetTransform();
+                    }
+                    else
+                    {
+                        TextDrawing.DrawString(g, m_Text, objFont, textColor, rect, objStringFormat);
+                        if (!this.DesignMode && this.Focused && !bIsOnMenu && !pa.IsOnMenuBar)
+                        {
+                            //SizeF szf=g.MeasureString(m_Text,objFont,rect.Width,objStringFormat);
+                            Rectangle r = rect;
+                            //r.Width=(int)Math.Ceiling(szf.Width);
+                            //r.Height=(int)Math.Ceiling(szf.Height);
+                            //r.Inflate(1,1);
+                            System.Windows.Forms.ControlPaint.DrawFocusRectangle(g, r);
+                        }
+                    }
+                }
+                else
+                {
+                    if (m_Orientation == eOrientation.Vertical && !bIsOnMenu)
+                    {
+                        g.RotateTransform(90);
+                        System.Windows.Forms.ControlPaint.DrawStringDisabled(g, m_Text, objFont, SystemColors.Control, new Rectangle(rect.Top, -rect.Right, rect.Height, rect.Width), TextDrawing.GetStringFormat(objStringFormat));
+                        g.ResetTransform();
+                    }
+                    else
+                        System.Windows.Forms.ControlPaint.DrawStringDisabled(g, m_Text, objFont, SystemColors.Control, rect, TextDrawing.GetStringFormat(objStringFormat));
+                }
+            }
+
+            // Draw Shortcut text if needed
+            if (this.DrawShortcutText != "" && bIsOnMenu)
+            {
+                objStringFormat |= eTextFormat.HidePrefix | eTextFormat.Right;
+                if (GetEnabled(pa.ContainerControl) || this.DesignMode)
+                    TextDrawing.DrawString(g, this.DrawShortcutText, objFont, textColor, rect, objStringFormat);
+                else
+                    System.Windows.Forms.ControlPaint.DrawStringDisabled(g, this.DrawShortcutText, objFont, SystemColors.Control, rect, TextDrawing.GetStringFormat(objStringFormat));
+            }
+
+            // If it has subitems draw the triangle to indicate that
+            if ((this.SubItems.Count > 0 || this.PopupType == ePopupType.Container) && this.ShowSubItems)
+            {
+                if (bIsOnMenu)
+                {
+                    Point[] p = new Point[3];
+                    p[0].X = itemRect.Left + itemRect.Width - 12;
+                    p[0].Y = itemRect.Top + (itemRect.Height - 8) / 2;
+                    p[1].X = p[0].X;
+                    p[1].Y = p[0].Y + 8;
+                    p[2].X = p[0].X + 4;
+                    p[2].Y = p[0].Y + 4;
+                    using (SolidBrush brush = new SolidBrush(textColor))
+                        g.FillPolygon(brush, p);
+                }
+                else if (!m_SubItemsRect.IsEmpty)
+                {
+                    if (m_MouseOver && !m_Expanded && m_HotTrackingStyle != eHotTrackingStyle.None)
+                    {
+                        Rectangle r = new Rectangle(m_SubItemsRect.X, m_SubItemsRect.Y, m_SubItemsRect.Width, m_SubItemsRect.Height);
+                        r.Offset(itemRect.X, itemRect.Y);
+                        //System.Windows.Forms.ControlPaint.DrawBorder3D(g,r,System.Windows.Forms.Border3DStyle.RaisedInner,System.Windows.Forms.Border3DSide.All);
+                        BarFunctions.DrawBorder3D(g, r, System.Windows.Forms.Border3DStyle.RaisedInner, System.Windows.Forms.Border3DSide.All, color3d);
+                    }
+                    else if (m_Expanded)
+                    {
+                        Rectangle r = new Rectangle(m_SubItemsRect.X, m_SubItemsRect.Y, m_SubItemsRect.Width, m_SubItemsRect.Height);
+                        r.Offset(itemRect.X, itemRect.Y);
+                        //System.Windows.Forms.ControlPaint.DrawBorder3D(g,r,System.Windows.Forms.Border3DStyle.SunkenOuter,System.Windows.Forms.Border3DSide.All);
+                        BarFunctions.DrawBorder3D(g, r, System.Windows.Forms.Border3DStyle.SunkenOuter, System.Windows.Forms.Border3DSide.All, color3d);
+                    }
+                    Point[] p = new Point[3];
+                    if (m_Orientation == eOrientation.Horizontal)
+                    {
+                        p[0].X = itemRect.Left + m_SubItemsRect.Left + (m_SubItemsRect.Width - 5) / 2;
+                        p[0].Y = itemRect.Top + (m_SubItemsRect.Height - 3) / 2 + 1;
+                        p[1].X = p[0].X + 5;
+                        p[1].Y = p[0].Y;
+                        p[2].X = p[0].X + 2;
+                        p[2].Y = p[0].Y + 3;
+                    }
+                    else
+                    {
+                        p[0].X = itemRect.Left + (m_SubItemsRect.Width - 3) / 2 + 1;
+                        p[0].Y = itemRect.Top + m_SubItemsRect.Top + (m_SubItemsRect.Height - 5) / 2;
+                        p[1].X = p[0].X;
+                        p[1].Y = p[0].Y + 6;
+                        p[2].X = p[0].X - 3;
+                        p[2].Y = p[0].Y + 3;
+                    }
+                    g.FillPolygon(SystemBrushes.ControlText, p);
+                }
+            }
+
+            if (this.Focused && this.DesignMode)
+            {
+                Rectangle r = itemRect;
+                r.Inflate(-1, -1);
+                g.DrawRectangle(new Pen(SystemColors.ControlText, 2), r);
+            }
+
+            if (objImage != null)
+                objImage.Dispose();
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public Image GetItemImage()
+        {
+            CompositeImage image = GetImage();
+            if (image != null)
+                return image.Image;
+            return null;
+        }
+
+        internal CompositeImage GetImage(Color textColor)
+        {
+            if (!GetEnabled() && !this.IsOnCustomizeDialog) // Issue: B1002
+                return GetImage(ImageState.Disabled, textColor);
+            else if (m_MouseDown || this.Checked || this.Expanded && m_HotTrackingStyle == eHotTrackingStyle.Image)
+                return GetImage(ImageState.Pressed, textColor);
+            else if (m_MouseOver && !m_MouseOverExpand && !(StyleManager.IsMetro(this.EffectiveStyle) && this.Expanded))
+                return GetImage(ImageState.Hover, textColor);
+            return GetImage(ImageState.Default, textColor);
+        }
+        internal CompositeImage GetImage()
+        {
+            return GetImage(Color.Black);
+        }
+        internal CompositeImage GetImage(ImageState state, Color textColor)
+        {
+            Image image = null;
+            if (state == ImageState.Disabled && (m_DisabledImage != null || m_DisabledImageIndex >= 0 || m_DisabledIcon != null || m_Image != null || m_ImageIndex >= 0 || m_Icon != null))
+            {
+                if (m_DisabledImage != null)
+                    return new CompositeImage(m_DisabledImage, false, m_ImageSizeOverride);
+                else if (m_DisabledIcon != null)
+                    return new CompositeImage(m_DisabledIcon, false, m_ImageSizeOverride);
+                if (m_DisabledImageIndex >= 0)
+                {
+                    DisposedCachedImageListImage();
+                    image = GetImageFromImageList(m_DisabledImageIndex);
+                    if (image != null)
+                        return new CompositeImage(image, (image != m_ImageCachedIdx), m_ImageSizeOverride);
+                    return null;
+                }
+
+                CreateDisabledImage();
+
+                if (m_DisabledImage != null)
+                    return new CompositeImage(m_DisabledImage, false, m_ImageSizeOverride);
+                else if (m_DisabledIcon != null)
+                    return new CompositeImage(m_DisabledIcon, false, m_ImageSizeOverride);
+                else
+                    return null;
+            }
+
+            if (m_Icon != null)
+            {
+                System.Drawing.Size iconSize = this.IconSize;
+                System.Drawing.Icon icon = null;
+                try
+                {
+                    icon = new System.Drawing.Icon(m_Icon, iconSize);
+                }
+                catch { icon = null; }
+                if (icon == null)
+                    return new CompositeImage(m_Icon, false, m_ImageSizeOverride);
+                else
+                    return new CompositeImage(icon, true, m_ImageSizeOverride);
+            }
+
+            if (state == ImageState.Hover && (m_HoverImage != null || m_HoverImageIndex >= 0))
+            {
+                if (m_HoverImage != null)
+                    return new CompositeImage(m_HoverImage, false, m_ImageSizeOverride);
+                if (m_HoverImageIndex >= 0)
+                {
+                    DisposedCachedImageListImage();
+                    image = GetImageFromImageList(m_HoverImageIndex);
+                    if (image != null)
+                        return new CompositeImage(image, (image != m_ImageCachedIdx), m_ImageSizeOverride);
+                    return null;
+                }
+            }
+
+            if (state == ImageState.Pressed && (m_PressedImage != null || m_PressedImageIndex >= 0))
+            {
+                if (m_PressedImage != null)
+                    return new CompositeImage(m_PressedImage, false, m_ImageSizeOverride);
+                if (m_PressedImageIndex >= 0)
+                {
+                    DisposedCachedImageListImage();
+                    image = GetImageFromImageList(m_PressedImageIndex);
+                    if (image != null)
+                        return new CompositeImage(image, (image != m_ImageCachedIdx), m_ImageSizeOverride);
+                    return null;
+                }
+            }
+
+            if (m_ImageSmall != null && (UseSmallImageResolved || m_ImageSizeOverride.Width == m_ImageSmall.Width && m_ImageSizeOverride.Height == m_ImageSmall.Height))
+                return new CompositeImage(m_ImageSmall, false);
+            if (m_Image != null)
+            {
+                if (_ImageAlt != null && textColor == Color.White)
+                    return new CompositeImage(_ImageAlt, false, m_ImageSizeOverride);
+                return new CompositeImage(m_Image, false, m_ImageSizeOverride);
+            }
+            if (m_ImageIndex >= 0)
+            {
+                if (m_DisabledImageIndex >= 0 || m_HoverImageIndex >= 0 || m_PressedImageIndex >= 0)
+                    DisposedCachedImageListImage();
+                image = GetImageFromImageList(m_ImageIndex);
+                if (image != null)
+                    return new CompositeImage(image, (image != m_ImageCachedIdx), m_ImageSizeOverride);
+            }
+
+            return null;
+        }
+
+        //private ImageList GetImageList()
+        //{
+        //    IOwner owner = null;
+        //    IBarImageSize iImageSize = null;
+        //    if (_ItemPaintArgs != null)
+        //    {
+        //        owner = _ItemPaintArgs.Owner;
+        //        iImageSize = _ItemPaintArgs.ContainerControl as IBarImageSize;
+        //    }
+        //    if (owner == null) owner = this.GetOwner() as IOwner;
+        //    if (iImageSize == null) iImageSize = this.ContainerControl as IBarImageSize;
+
+        //    if (owner != null)
+        //    {
+        //        try
+        //        {
+        //            if (iImageSize != null && iImageSize.ImageSize != eBarImageSize.Default)
+        //            {
+        //                if (iImageSize.ImageSize == eBarImageSize.Medium && owner.ImagesMedium != null)
+        //                    return owner.ImagesMedium;
+        //                else if (iImageSize.ImageSize == eBarImageSize.Large && owner.ImagesLarge != null)
+        //                    return owner.ImagesLarge;
+        //                else if (owner.Images != null)
+        //                    return owner.Images;
+        //            }
+        //            else if (m_Parent is SideBarPanelItem && ((SideBarPanelItem)m_Parent).ItemImageSize != eBarImageSize.Default)
+        //            {
+        //                eBarImageSize imgSize = ((SideBarPanelItem)m_Parent).ItemImageSize;
+        //                if (imgSize == eBarImageSize.Medium && owner.ImagesMedium != null)
+        //                    return owner.ImagesMedium;
+        //                else if (imgSize == eBarImageSize.Large && owner.ImagesLarge != null)
+        //                    return owner.ImagesLarge;
+        //                else if (owner.Images != null)
+        //                    return owner.Images;
+        //            }
+        //            else if (owner.Images != null)
+        //                 return owner.Images;
+        //        }
+        //        catch (Exception)
+        //        {
+        //            return null;
+        //        }
+        //    }
+
+        //    return null;
+        //}
+
+        private eBarImageSize GetImageListSize(IBarImageSize barImageSize)
+        {
+            eBarImageSize imageListSize = eBarImageSize.Default;
+            if (barImageSize != null) imageListSize = barImageSize.ImageSize;
+            if (_ImageListSizeSelection != eButtonImageListSelection.NotSet)
+                imageListSize = (eBarImageSize)_ImageListSizeSelection;
+            return imageListSize;
+        }
+
+        private Image GetImageFromImageList(int ImageIndex)
+        {
+            if (ImageIndex >= 0)
+            {
+                IOwner owner = null;
+                IBarImageSize iImageSize = null;
+                if (_ItemPaintArgs != null)
+                {
+                    owner = _ItemPaintArgs.Owner;
+                    iImageSize = _ItemPaintArgs.ContainerControl as IBarImageSize;
+                }
+                if (owner == null) owner = this.GetOwner() as IOwner;
+                if (iImageSize == null)
+                {
+                    iImageSize = this.ContainerControl as IBarImageSize;
+                }
+
+                if (owner != null)
+                {
+                    try
+                    {
+                        eBarImageSize imageListSize = GetImageListSize(iImageSize);
+
+                        if (imageListSize != eBarImageSize.Default)
+                        {
+                            if (imageListSize == eBarImageSize.Medium && owner.ImagesMedium != null && !UseSmallImageResolved) // && owner.ImagesMedium.Images.Count>0 && ImageIndex<owner.ImagesMedium.Images.Count)
+                                return owner.ImagesMedium.Images[ImageIndex];
+                            else if (imageListSize == eBarImageSize.Large && owner.ImagesLarge != null && !UseSmallImageResolved) // && owner.ImagesLarge.Images.Count>0  && ImageIndex<owner.ImagesLarge.Images.Count)
+                                return owner.ImagesLarge.Images[ImageIndex];
+                            else if (owner.Images != null)// && owner.Images.Images.Count>0 && ImageIndex<owner.Images.Images.Count)
+                            {
+                                if (ImageIndex == m_ImageIndex)
+                                {
+                                    if (m_ImageCachedIdx == null)
+                                        m_ImageCachedIdx = owner.Images.Images[ImageIndex];
+                                    return m_ImageCachedIdx; //owner.Images.Images[ImageIndex];
+                                }
+                                else
+                                    return owner.Images.Images[ImageIndex];
+                            }
+                        }
+                        else if (m_Parent is SideBarPanelItem && ((SideBarPanelItem)m_Parent).ItemImageSize != eBarImageSize.Default)
+                        {
+                            eBarImageSize imgSize = ((SideBarPanelItem)m_Parent).ItemImageSize;
+                            if (imgSize == eBarImageSize.Medium && owner.ImagesMedium != null) // && owner.ImagesMedium.Images.Count>0 && ImageIndex<owner.ImagesMedium.Images.Count)
+                                return owner.ImagesMedium.Images[ImageIndex];
+                            else if (imgSize == eBarImageSize.Large && owner.ImagesLarge != null) // && owner.ImagesLarge.Images.Count>0  && ImageIndex<owner.ImagesLarge.Images.Count)
+                                return owner.ImagesLarge.Images[ImageIndex];
+                            else if (owner.Images != null)// && owner.Images.Images.Count>0 && ImageIndex<owner.Images.Images.Count)
+                                return owner.Images.Images[ImageIndex];
+                        }
+                        else if (owner.Images != null)// && owner.Images.Images.Count>0 && ImageIndex<owner.Images.Images.Count)
+                        {
+                            if (ImageIndex == m_ImageIndex)
+                            {
+                                if (m_ImageCachedIdx == null)
+                                    m_ImageCachedIdx = owner.Images.Images[ImageIndex];
+
+                                return m_ImageCachedIdx; //owner.Images.Images[ImageIndex];
+                            }
+                            else
+                                return owner.Images.Images[ImageIndex];
+                        }
+                    }
+                    catch (Exception)
+                    {
+                        return null;
+                    }
+                }
+            }
+            return null;
+        }
+
+        /// <summary>
+        /// Sets fixed size of the image. Image will be scaled and painted it size specified.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(false)]
+        public System.Drawing.Size ImageFixedSize
+        {
+            get { return m_ImageSizeOverride; }
+            set
+            {
+                m_ImageSizeOverride = value;
+                this.OnImageChanged();
+                if (m_Parent != null && m_Parent is ImageItem)
+                {
+                    ((ImageItem)m_Parent).RefreshImageSize();
+                }
+            }
+        }
+        /// <summary>
+        /// Resets ImageFixedSize property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetImageFixedSize()
+        {
+            this.ImageFixedSize = new Size();
+        }
+        /// <summary>
+        /// Gets whether ImageFixedSize property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeImageFixedSize()
+        {
+            return !m_ImageSizeOverride.IsEmpty;
+        }
+
+        /// <summary>
+        /// Gets or sets the fixed size of the button. Both width and height must be set to value greater than 0 in order for button to use fixed size.
+        /// Setting both width and height to 0 (default value) indicates that button will be sized based on content.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(false), Description("Indicates fixed size of the button."), Category("Layout")]
+        public virtual System.Drawing.Size FixedSize
+        {
+            get { return m_FixedSize; }
+            set
+            {
+                if (value.Width < 0) value.Width = 0;
+                if (value.Height < 0) value.Height = 0;
+                m_FixedSize = value;
+                this.NeedRecalcSize = true;
+                this.OnAppearanceChanged();
+            }
+        }
+        /// <summary>
+        /// Gets whether FixedSize property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeFixedSize()
+        {
+            return !m_FixedSize.IsEmpty;
+        }
+        /// <summary>
+        /// Resets the property to default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetFixedSize()
+        {
+            TypeDescriptor.GetProperties(this)["FixedSize"].SetValue(this, Size.Empty);
+        }
+
+        private System.Drawing.Size IconSize
+        {
+            get
+            {
+                // Default Icon Size
+                System.Drawing.Size size = new Size(16, 16);
+                IBarImageSize iImageSize = null;
+                if (_ItemPaintArgs != null)
+                {
+                    iImageSize = _ItemPaintArgs.ContainerControl as IBarImageSize;
+                }
+                if (iImageSize == null) iImageSize = this.ContainerControl as IBarImageSize;
+
+                try
+                {
+                    eBarImageSize imageListSize = GetImageListSize(iImageSize);
+                    if (iImageSize != null && imageListSize != eBarImageSize.Default)
+                    {
+                        if (imageListSize == eBarImageSize.Medium)
+                            size = new Size(24, 24);
+                        else if (imageListSize == eBarImageSize.Large)
+                            size = new Size(32, 32);
+                    }
+                    else if (m_Parent is SideBarPanelItem && ((SideBarPanelItem)m_Parent).ItemImageSize != eBarImageSize.Default)
+                    {
+                        eBarImageSize imgSize = ((SideBarPanelItem)m_Parent).ItemImageSize;
+                        if (imgSize == eBarImageSize.Medium)
+                            size = new Size(24, 24);
+                        else if (imgSize == eBarImageSize.Large)
+                            size = new Size(32, 32);
+                    }
+                }
+                catch (Exception)
+                {
+                }
+
+                return size;
+            }
+        }
+
+        /// <summary>
+        /// Overridden. Recalculates the size of the item.
+        /// </summary>
+        public override void RecalcSize()
+        {
+            if (this.SuspendLayout)
+                return;
+            bool pulse = false;
+            int pulseBeats = m_PulseBeats;
+            if (m_FadeAnimation)
+            {
+                StopFade();
+                pulse = m_Pulse;
+                m_Pulse = false;
+            }
+
+            if (Dpi.Factor.Width > 1)
+            {
+                CompositeImage img = GetImage();
+                if (img != null && this.ImageSize.Width != img.Width)
+                    this.OnImageChanged();
+            }
+
+            if (EffectiveStyle == eDotNetBarStyle.Office2000 && !this.IsThemed)
+                RecalcSizeOffice();
+            else
+                RecalcSizeDotNet();
+            base.RecalcSize();
+
+            if (pulse)
+                InvokeDelayed(new MethodInvoker(delegate { Pulse(pulseBeats); }), 500); 
+        }
+
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public virtual bool UseParentSubItemsImageSize
+        {
+            get
+            {
+                return true;
+            }
+        }
+
+        private void RecalcSizeDotNet()
+        {
+            ButtonItemLayout.LayoutButton(this);
+
+            //			System.Windows.Forms.Control objCtrl=this.ContainerControl as System.Windows.Forms.Control;
+            //			if(!IsHandleValid(objCtrl))
+            //				return;
+            //			//Graphics g=Graphics.FromHwnd(objCtrl.Handle);
+            //            Graphics g = BarFunctions.CreateGraphics(objCtrl);
+            //			bool bHasImage=false;
+            //			if(GetImage(ImageState.Default)!=null)
+            //				bHasImage=true;
+            //
+            //			m_TextDrawRect=Rectangle.Empty;
+            //			m_ImageDrawRect=Rectangle.Empty;
+            //			m_SubItemsRect=Rectangle.Empty;
+            //			int measureStringWidth=0;
+            //			if(_FitContainer)
+            //				measureStringWidth=m_Rect.Width-4;
+            //			m_Rect.Width=0;
+            //			m_Rect.Height=0;
+            //
+            //			// Get the right image size that we will use for calculation
+            //			Size objImageSize=Size.Empty;
+            //			if(m_Parent!=null && m_ImageSizeOverride.IsEmpty)
+            //			{
+            //				ImageItem objParentImageItem=m_Parent as ImageItem;
+            //				if(objParentImageItem!=null && !objParentImageItem.SubItemsImageSize.IsEmpty)
+            //				{
+            //					if(!bHasImage || this.IsOnMenu)
+            //						objImageSize=new Size(objParentImageItem.SubItemsImageSize.Width,objParentImageItem.SubItemsImageSize.Height);
+            //					else
+            //					{
+            //						if(this.Orientation==eOrientation.Horizontal)
+            //							objImageSize=new Size(this.ImageSize.Width,objParentImageItem.SubItemsImageSize.Height);
+            //						else
+            //                            objImageSize=new Size(objParentImageItem.SubItemsImageSize.Width,this.ImageSize.Height);							
+            //					}
+            //				}
+            //				else
+            //					objImageSize=this.ImageSize;
+            //			}
+            //			else if(!m_ImageSizeOverride.IsEmpty)
+            //				objImageSize=m_ImageSizeOverride;
+            //			else
+            //				objImageSize=this.ImageSize;
+            //			if(_FitContainer && bHasImage && (m_ImagePosition==eImagePosition.Left || m_ImagePosition==eImagePosition.Right))
+            //			{
+            //				measureStringWidth-=(objImageSize.Width+10);
+            //			}
+            //
+            //			// Measure string
+            //			Font objCurrentFont=null;
+            //			if(m_Font!=null)
+            //				objCurrentFont=m_Font;
+            //			else
+            //			{
+            //				objCurrentFont=GetFont(null);
+            //				if(m_HotFontBold)
+            //					objCurrentFont=new Font(objCurrentFont,FontStyle.Bold);
+            //			}
+            //
+            //			Size objStringSize=Size.Empty;
+            //			eTextFormat objStringFormat=GetStringFormat();
+            //			
+            //			if(m_Text!="")
+            //			{
+            //                if (m_Orientation == eOrientation.Vertical && !this.IsOnMenu)
+            //                    objStringSize = TextDrawing.MeasureStringLegacy(g, m_Text, objCurrentFont, new Size(measureStringWidth,0), objStringFormat);
+            //                else
+            //				    objStringSize=TextDrawing.MeasureString(g,m_Text,objCurrentFont,measureStringWidth,objStringFormat);
+            //			}
+            //
+            //            // See if this button is on menu, and do appropriate calculations
+            //			if(this.IsOnMenu)
+            //			{
+            //				if(objImageSize.IsEmpty)
+            //					objImageSize=new Size(16,16);
+            //				// Add 4 pixel padding to the image size, 2 pixels on each side
+            //				objImageSize.Height+=2;
+            //				objImageSize.Width+=7;
+            //
+            //				// Calculate item height
+            //				if(objStringSize.Height>objImageSize.Height)
+            //					m_Rect.Height=(int)objStringSize.Height+4;
+            //				else
+            //					m_Rect.Height=objImageSize.Height+4;
+            //				
+            //				// Add Vertical Padding to it
+            //				m_Rect.Height+=m_VerticalPadding;
+            //
+            //				// We know the image position now, we will center it into this area
+            //				if(this.IsOnCustomizeMenu)
+            //					m_ImageDrawRect=new Rectangle(m_Rect.Height+2,(m_Rect.Height-objImageSize.Height)/2,objImageSize.Width,objImageSize.Height);
+            //				else
+            //					m_ImageDrawRect=new Rectangle(0,(m_Rect.Height-objImageSize.Height)/2,objImageSize.Width,objImageSize.Height);
+            //				
+            //				m_Rect.Width=(int)objStringSize.Width;
+            //                // Add short-cut size if we have short-cut
+            //				if( this.DrawShortcutText != "" )
+            //				{
+            //					Size objSizeShortcut=TextDrawing.MeasureString(g,this.DrawShortcutText,objCurrentFont,0,objStringFormat);
+            //					m_Rect.Width+=(objSizeShortcut.Width+14); // 14 distance between text and shortcut
+            //				}
+            //
+            //				m_TextDrawRect=new Rectangle(m_ImageDrawRect.Right+8,3,m_Rect.Width,m_Rect.Height-6);
+            //
+            //				// 8 pixels distance between image and text, 22 pixels if this item has sub items
+            //				m_Rect.Width+=(m_ImageDrawRect.Right+8+26);
+            //				m_Rect.Width+=m_HorizontalPadding;
+            //			}
+            //			else
+            //			{
+            //				bool bThemed=this.IsThemed;
+            //				if(m_Orientation==eOrientation.Horizontal && (m_ImagePosition==eImagePosition.Left || m_ImagePosition==eImagePosition.Right))
+            //				{
+            //					// Recalc size for the Bar button
+            //					// Add 8 pixel padding to the image size, 4 pixels on each side
+            //					//objImageSize.Height+=4;
+            //					objImageSize.Width+=10;
+            //
+            //					// Calculate item height
+            //					if(objStringSize.Height>objImageSize.Height)
+            //						m_Rect.Height=(int)objStringSize.Height+6;
+            //					else
+            //						m_Rect.Height=objImageSize.Height+6;
+            //					
+            //					// Add Vertical Padding
+            //					m_Rect.Height+=m_VerticalPadding;
+            //
+            //					if(bThemed && !this.IsOnMenuBar)
+            //						m_Rect.Height+=4;
+            //
+            //					m_ImageDrawRect=Rectangle.Empty;
+            //					if(m_ButtonStyle!=eButtonStyle.TextOnlyAlways && bHasImage)
+            //					{
+            //						// We know the image position now, we will center it into this area
+            //						m_ImageDrawRect=new Rectangle(0,(m_Rect.Height-objImageSize.Height)/2,objImageSize.Width,objImageSize.Height);
+            //					}
+            //					
+            //					// Draw Text only if needed
+            //					m_TextDrawRect=Rectangle.Empty;
+            //					if(m_ButtonStyle!=eButtonStyle.Default || !bHasImage)
+            //					{
+            //						if(m_ImageDrawRect.Right>0)
+            //						{
+            //							m_Rect.Width=(int)objStringSize.Width+1;
+            //							m_TextDrawRect=new Rectangle(m_ImageDrawRect.Right-2,2,m_Rect.Width,m_Rect.Height-4);
+            //						}
+            //						else
+            //						{
+            //							m_Rect.Width=(int)objStringSize.Width+6;
+            //							if(!bHasImage && this.IsOnMenuBar)
+            //							{
+            //								m_Rect.Width+=6;
+            //								m_TextDrawRect=new Rectangle(0,2,m_Rect.Width,m_Rect.Height-4);
+            //							}
+            //							else
+            //								m_TextDrawRect=new Rectangle(3,2,m_Rect.Width,m_Rect.Height-4);
+            //						}
+            //					}
+            //					// No need for the code below since it causes text to be drawn if item is not on Bar no matter what
+            ////					else if(!this.IsOnBar)
+            ////					{
+            ////						if(m_ImageDrawRect.Right>0)
+            ////						{
+            ////							m_Rect.Width=(int)objStringSize.Width+4;
+            ////							m_TextDrawRect=new Rectangle(m_ImageDrawRect.Right-2,2,m_Rect.Width,m_Rect.Height-4);
+            ////						}
+            ////						else
+            ////						{
+            ////							m_Rect.Width=(int)objStringSize.Width+6;
+            ////							m_TextDrawRect=new Rectangle(3,2,m_Rect.Width,m_Rect.Height-4);
+            ////						}                        						
+            ////					}
+            //					m_Rect.Width+=m_ImageDrawRect.Right;
+            //
+            //					if(m_ImagePosition==eImagePosition.Right && m_ImageDrawRect.Right>0)
+            //					{
+            //						m_TextDrawRect.X=3;
+            //						m_ImageDrawRect.X=m_Rect.Width-m_ImageDrawRect.Width;
+            //					}
+            //
+            //					// Add Horizontal padding
+            //					m_Rect.Width+=m_HorizontalPadding;
+            //				}
+            //				else
+            //				{
+            //					// Image is on top or bottom
+            //					// Calculate width, that is easy
+            //					if(m_Orientation==eOrientation.Horizontal)
+            //					{
+            //						if(objStringSize.Width>objImageSize.Width)
+            //							m_Rect.Width=(int)objStringSize.Width+6;
+            //						else
+            //							m_Rect.Width=objImageSize.Width+6;
+            //						
+            //						// Calculate item height 3 padding on top and bottom and 2 pixels distance between the image and text
+            //						m_Rect.Height=(int)(objImageSize.Height+objStringSize.Height+10);
+            //
+            //						// Add Horizontal/Vertical padding
+            //						m_Rect.Width+=m_HorizontalPadding;
+            //						m_Rect.Height+=m_VerticalPadding;
+            //
+            //						if(m_ImagePosition==eImagePosition.Top)
+            //						{
+            //							m_ImageDrawRect=new Rectangle(0,m_VerticalPadding/2+2,m_Rect.Width,objImageSize.Height+2);
+            //							m_TextDrawRect=new Rectangle((int)(m_Rect.Width-objStringSize.Width)/2,m_ImageDrawRect.Bottom,(int)objStringSize.Width,(int)objStringSize.Height+5);
+            //						}
+            //						else
+            //						{
+            //							m_TextDrawRect=new Rectangle((int)(m_Rect.Width-objStringSize.Width)/2,m_VerticalPadding/2,(int)objStringSize.Width,(int)objStringSize.Height+2);
+            //							m_ImageDrawRect=new Rectangle(0,m_TextDrawRect.Bottom,m_Rect.Width,objImageSize.Height+5);
+            //						}
+            //					}
+            //					else
+            //					{
+            //						if(objStringSize.Height>objImageSize.Width && m_ButtonStyle!=eButtonStyle.Default)
+            //							m_Rect.Width=(int)objStringSize.Height+6;
+            //						else
+            //							m_Rect.Width=objImageSize.Width+10;
+            //
+            //						// Add Horizontal Padding
+            //						m_Rect.Width+=m_HorizontalPadding;
+            //						
+            //						// Calculate item height 3 padding on top and bottom and 2 pixels distance between the image and text
+            //						if(m_ButtonStyle!=eButtonStyle.Default || !bHasImage)
+            //						{
+            //							if(bHasImage)
+            //								m_Rect.Height=(int)(objImageSize.Height+objStringSize.Width+12);
+            //							else
+            //								m_Rect.Height=(int)(objStringSize.Width+6);
+            //						}
+            //						else
+            //							m_Rect.Height=objImageSize.Height+6;
+            //
+            //						if(m_ImagePosition==eImagePosition.Top || m_ImagePosition==eImagePosition.Left)
+            //						{
+            //							if(bHasImage)
+            //								m_ImageDrawRect=new Rectangle(0,0,m_Rect.Width,objImageSize.Height+6);
+            //							m_TextDrawRect=new Rectangle((int)(m_Rect.Width-objStringSize.Height)/2,m_ImageDrawRect.Bottom+2,(int)objStringSize.Height,(int)objStringSize.Width+5);
+            //						}
+            //						else
+            //						{
+            //							m_TextDrawRect=new Rectangle((int)(m_Rect.Width-objStringSize.Width)/2,0,(int)objStringSize.Height,(int)objStringSize.Width+5);
+            //							if(bHasImage)
+            //								m_ImageDrawRect=new Rectangle(0,m_TextDrawRect.Bottom+2,m_Rect.Width,objImageSize.Height+5);
+            //						}
+            //
+            //						// Add Vertical Padding
+            //						m_Rect.Height+=m_VerticalPadding;
+            //					}
+            //				}
+            //
+            //				//if(SubItemsCount>0 && this.ShowSubItems && (!this.IsOnMenuBar || this.GetImage()!=null))
+            //				if((SubItems.Count>0 || this.PopupType==ePopupType.Container) && this.ShowSubItems && !this.IsOnMenuBar)
+            //				{
+            //					// Add small button to expand the item
+            //					if(m_Orientation==eOrientation.Horizontal)
+            //					{
+            //						if(bThemed)
+            //							m_SubItemsRect=new Rectangle(m_Rect.Width,0,m_SubItemsExpandWidth,m_Rect.Height);
+            //						else
+            //							m_SubItemsRect=new Rectangle(m_Rect.Width-2,0/*m_Rect.Top*/,m_SubItemsExpandWidth,m_Rect.Height);
+            //						m_Rect.Width+=m_SubItemsExpandWidth;
+            //					}
+            //					else
+            //					{
+            //						m_SubItemsRect=new Rectangle(/*m_Rect.Left+2*/2,m_Rect.Height-2,m_Rect.Width,m_SubItemsExpandWidth);
+            //						m_Rect.Height+=m_SubItemsExpandWidth;
+            //					}
+            //				}
+            //			}
+            //			// This button is on Bar
+            //			//objCurrentFont.Dispose();
+            //			g.Dispose();
+            //			objCtrl=null;
+        }
+
+        private void RecalcSizeOffice()
+        {
+            System.Windows.Forms.Control objCtrl = this.ContainerControl as System.Windows.Forms.Control;
+            if (!IsHandleValid(objCtrl))
+                return;
+            Graphics g = Graphics.FromHwnd(objCtrl.Handle);
+            g.PageUnit = System.Drawing.GraphicsUnit.Pixel;
+
+            m_TextDrawRect = Rectangle.Empty;
+            m_ImageDrawRect = Rectangle.Empty;
+            m_Rect = Rectangle.Empty;
+            m_SubItemsRect = Rectangle.Empty;
+
+            bool bHasImage = false;
+            if (GetImage(ImageState.Default, Color.Black) != null)
+                bHasImage = true;
+
+            // Get the right image size that we will use for calculation
+            Size objImageSize;
+            if (m_Parent != null)
+            {
+                ImageItem objImageItem = m_Parent as ImageItem;
+                if (objImageItem != null)
+                {
+                    if (!bHasImage || this.IsOnMenu)
+                        objImageSize = new Size(objImageItem.SubItemsImageSize.Width, objImageItem.SubItemsImageSize.Height);
+                    else
+                    {
+                        if (this.Orientation == eOrientation.Horizontal)
+                            objImageSize = new Size(this.ImageSize.Width, objImageItem.SubItemsImageSize.Height);
+                        else
+                            objImageSize = new Size(objImageItem.SubItemsImageSize.Width, this.ImageSize.Height);
+                    }
+                }
+                else
+                    objImageSize = this.ImageSize;
+            }
+            else
+                objImageSize = this.ImageSize;
+
+            // Measure string
+            Font objCurrentFont = null;
+            if (m_Font != null)
+                objCurrentFont = m_Font;
+            else
+                objCurrentFont = GetFont(null, true);
+
+            Size objStringSize;
+            eTextFormat objStringFormat = GetStringFormat();
+
+            if (m_Orientation == eOrientation.Vertical && !this.IsOnMenu)
+                objStringSize = TextDrawing.MeasureStringLegacy(g, m_Text, objCurrentFont, Size.Empty, objStringFormat);
+            else
+                objStringSize = TextDrawing.MeasureString(g, m_Text, objCurrentFont, 0, objStringFormat);
+
+            // See if this button is on menu, and do appropriate calculations
+            if (this.IsOnMenu)
+            {
+                // Add 4 pixel padding to the image size, 2 pixels on each side
+                //objImageSize.Height+=1;
+                objImageSize.Width += 4;
+
+                // Calculate item height
+                if (objStringSize.Height > objImageSize.Height)
+                    m_Rect.Height = (int)objStringSize.Height + 4;
+                else
+                    m_Rect.Height = objImageSize.Height + 4;
+
+                // Add Padding
+                m_Rect.Height += m_VerticalPadding;
+
+                // We know the image position now, we will center it into this area
+                if (this.IsOnCustomizeMenu)
+                    m_ImageDrawRect = new Rectangle(m_Rect.Height, 0, m_Rect.Height, m_Rect.Height);
+                else
+                    m_ImageDrawRect = new Rectangle(0, 0, objImageSize.Width, m_Rect.Height);
+
+                m_Rect.Width = (int)objStringSize.Width;
+                // Add short-cut size if we have short-cut
+                if (this.DrawShortcutText != "")
+                {
+                    Size objSizeShortcut = TextDrawing.MeasureString(g, this.DrawShortcutText, objCurrentFont, 0, objStringFormat);
+                    m_Rect.Width += (objSizeShortcut.Width + 14); // 14 distance between text and shortcut
+                }
+
+                //m_TextDrawRect=new Rectangle(m_ImageDrawRect.Right+2,3,m_Rect.Width,m_Rect.Height-6);
+                m_TextDrawRect = new Rectangle(m_ImageDrawRect.Right + 2, (int)(m_Rect.Height - objStringSize.Height) / 2, m_Rect.Width, (int)objStringSize.Height);
+
+                // 8 pixels distance between image and text, 22 pixels if this item has sub items
+                m_Rect.Width += (m_ImageDrawRect.Right + 2 + 24);
+
+                // Add Horizontal Padding
+                m_Rect.Width += m_HorizontalPadding;
+
+                // Don't support the image alignment in menus yet
+                /*if(m_ImagePosition==eImagePosition.Right)
+                {
+                    int i=m_TextDrawRect.Right-m_ImageDrawRect.Right;
+                    m_TextDrawRect.X=m_ImageDrawRect.X;
+                    m_ImageDrawRect.X=i;
+                }*/
+
+                //if(m_BeginGroup)
+                //	m_Rect.Height+=9;
+            }
+            else
+            {
+                // Recalc size for the Bar button
+                if (m_Orientation == eOrientation.Horizontal && (m_ImagePosition == eImagePosition.Left || m_ImagePosition == eImagePosition.Right))
+                {
+                    // Add 8 pixel padding to the image size, 4 pixels on each side
+                    //objImageSize.Height+=4;
+                    objImageSize.Width += 10;
+
+                    // Calculate item height
+                    if (objStringSize.Height > objImageSize.Height)
+                        m_Rect.Height = (int)objStringSize.Height + 6;
+                    else
+                        m_Rect.Height = objImageSize.Height + 6;
+
+                    // Add Vertical Padding
+                    m_Rect.Height += m_VerticalPadding;
+
+                    m_ImageDrawRect = Rectangle.Empty;
+                    if (m_ButtonStyle != eButtonStyle.TextOnlyAlways && bHasImage)
+                    {
+                        // We know the image position now, we will center it into this area
+                        m_ImageDrawRect = new Rectangle(0, (m_Rect.Height - objImageSize.Height) / 2, objImageSize.Width, objImageSize.Height);
+                    }
+
+                    // Draw Text only if needed
+                    m_TextDrawRect = Rectangle.Empty;
+                    if (m_ButtonStyle != eButtonStyle.Default || !bHasImage)
+                    {
+                        if (m_ImageDrawRect.Right > 0)
+                        {
+                            m_Rect.Width = (int)objStringSize.Width + 1;
+                            m_TextDrawRect = new Rectangle(m_ImageDrawRect.Right - 2, 2, m_Rect.Width, m_Rect.Height - 4);
+                        }
+                        else
+                        {
+                            m_Rect.Width = (int)objStringSize.Width + 6;
+                            m_TextDrawRect = new Rectangle(3, 2, m_Rect.Width, m_Rect.Height - 4);
+                        }
+                    }
+                    m_Rect.Width += m_ImageDrawRect.Right;
+
+                    // Add Horizontal Padding
+                    m_Rect.Width += m_HorizontalPadding;
+                }
+                else
+                {
+                    // Image is on top or bottom
+                    if (m_Orientation == eOrientation.Horizontal)
+                    {
+                        // Calculate width, that is easy
+                        if (objStringSize.Width > objImageSize.Width)
+                            m_Rect.Width = (int)objStringSize.Width + 6;
+                        else
+                            m_Rect.Width = objImageSize.Width + 6;
+
+                        // Calculate item height 3 padding on top and bottom and 2 pixels distance between the image and text
+                        m_Rect.Height = (int)(objImageSize.Height + objStringSize.Height + 10);
+
+                        // Add Padding
+                        m_Rect.Width += m_HorizontalPadding;
+                        m_Rect.Height += m_VerticalPadding;
+
+                        if (m_ImagePosition == eImagePosition.Top)
+                        {
+                            m_ImageDrawRect = new Rectangle(0, m_VerticalPadding / 2, m_Rect.Width, objImageSize.Height + 2);
+                            m_TextDrawRect = new Rectangle((int)(m_Rect.Width - objStringSize.Width) / 2, m_ImageDrawRect.Bottom + 2, (int)objStringSize.Width, (int)objStringSize.Height + 5);
+                        }
+                        else
+                        {
+                            m_TextDrawRect = new Rectangle((int)(m_Rect.Width - objStringSize.Width) / 2, m_VerticalPadding / 2, (int)objStringSize.Width, (int)objStringSize.Height + 2);
+                            m_ImageDrawRect = new Rectangle(0, m_TextDrawRect.Bottom + 2, m_Rect.Width, objImageSize.Height + 5);
+                        }
+                    }
+                    else
+                    {
+                        // Calculate width, that is easy
+                        if (objStringSize.Height > objImageSize.Height && m_ButtonStyle != eButtonStyle.Default)
+                            m_Rect.Width = (int)objStringSize.Height + 6;
+                        else
+                            m_Rect.Width = objImageSize.Width + 6;
+
+                        m_Rect.Width += m_HorizontalPadding;
+
+                        // Calculate item height 3 padding on top and bottom and 2 pixels distance between the image and text
+                        if (m_ButtonStyle != eButtonStyle.Default || !bHasImage)
+                        {
+                            if (bHasImage)
+                                m_Rect.Height = (int)(objImageSize.Height + objStringSize.Width + 12);
+                            else
+                                m_Rect.Height = (int)(objStringSize.Width + 6);
+                        }
+                        else
+                            m_Rect.Height = objImageSize.Height + 6;
+
+                        if (m_ImagePosition == eImagePosition.Top || m_ImagePosition == eImagePosition.Left)
+                        {
+                            if (bHasImage)
+                                m_ImageDrawRect = new Rectangle(0, 0, m_Rect.Width, objImageSize.Height + 5);
+                            m_TextDrawRect = new Rectangle((int)(m_Rect.Width - objStringSize.Height) / 2, m_ImageDrawRect.Bottom + 2, (int)objStringSize.Height, (int)objStringSize.Width + 5);
+                        }
+                        else
+                        {
+                            m_TextDrawRect = new Rectangle((int)(m_Rect.Width - objStringSize.Height) / 2, 0, (int)objStringSize.Height, (int)objStringSize.Width + 5);
+                            if (bHasImage)
+                                m_ImageDrawRect = new Rectangle(0, m_TextDrawRect.Bottom + 2, m_Rect.Width, objImageSize.Height + 5);
+                        }
+                        m_Rect.Height += m_VerticalPadding;
+                    }
+                }
+
+                if ((this.SubItems.Count > 0 || this.PopupType == ePopupType.Container) && this.ShowSubItems && (!this.IsOnMenuBar || this.GetImage() != null))
+                {
+                    // Add small button to expand the item
+                    if (m_Orientation == eOrientation.Horizontal)
+                    {
+                        m_SubItemsRect = new Rectangle(m_Rect.Right, 0/*m_Rect.Top*/, 12, m_Rect.Height);
+                        m_Rect.Width += m_SubItemsRect.Width;
+                    }
+                    else
+                    {
+                        m_SubItemsRect = new Rectangle(0/*m_Rect.Left*/, m_Rect.Bottom, m_Rect.Width, 12);
+                        m_Rect.Height += m_SubItemsRect.Height;
+                    }
+                }
+            }
+
+            // This button is on Bar
+            //objCurrentFont.Dispose();
+            g.Dispose();
+            objCtrl = null;
+        }
+
+        private void DrawOfficeCheckBox(Graphics g, Rectangle r)
+        {
+            // Draw checked box
+            System.Windows.Forms.ControlPaint.DrawBorder3D(g, r, System.Windows.Forms.Border3DStyle.SunkenOuter, System.Windows.Forms.Border3DSide.All);
+            if (!m_MouseOver)
+            {
+                r.Inflate(-1, -1);
+                g.FillRectangle(ColorFunctions.GetPushedBrush(), r);
+            }
+            // Draw checker...
+            Point[] pt = new Point[3];
+            pt[0].X = r.Left + (r.Width - 6) / 2;
+            pt[0].Y = r.Top + (r.Height - 6) / 2 + 3;
+            pt[1].X = pt[0].X + 2;
+            pt[1].Y = pt[0].Y + 2;
+            pt[2].X = pt[1].X + 4;
+            pt[2].Y = pt[1].Y - 4;
+            g.DrawLines(SystemPens.ControlText, pt);
+            pt[0].X++;
+            pt[1].X++;
+            pt[2].X++;
+            g.DrawLines(SystemPens.ControlText, pt);
+        }
+
+        protected internal override void OnItemAdded(BaseItem item)
+        {
+            base.OnItemAdded(item);
+            OnAppearanceChanged();
+        }
+
+        /// <summary>
+        /// Overloaded. Called when size of the item is changed externally.
+        /// </summary>
+        protected override void OnExternalSizeChange()
+        {
+            base.OnExternalSizeChange();
+            if (!m_FixedSize.IsEmpty)
+            {
+                if (m_FixedSize.Width > 0) m_Rect.Width = Dpi.Width(m_FixedSize.Width);
+                if (m_FixedSize.Height > 0) m_Rect.Height = Dpi.Height(m_FixedSize.Height);
+            }
+            ButtonItemLayout.Arrange(this);
+            return;
+        }
+
+        [System.ComponentModel.Browsable(false), System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+        public override void ContainerLostFocus(bool appLostFocus)
+        {
+            base.ContainerLostFocus(appLostFocus);
+            if (m_Expanded)
+            {
+                this.Expanded = false;
+                if (m_Parent != null)
+                    m_Parent.AutoExpand = false;
+            }
+        }
+
+        [System.ComponentModel.Browsable(false), System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+        public override void InternalKeyDown(System.Windows.Forms.KeyEventArgs objArg)
+        {
+            base.InternalKeyDown(objArg);
+            if (this.Expanded || objArg.Handled)
+                return;
+
+            if (objArg.KeyCode == System.Windows.Forms.Keys.Enter || objArg.KeyCode == System.Windows.Forms.Keys.Return || objArg.KeyCode == System.Windows.Forms.Keys.Right && this.IsOnMenu)
+            {
+                if (SubItems.Count > 0 && this.GetEnabled())
+                {
+                    if (this.Expanded)
+                    {
+                        if (m_Parent != null)
+                            m_Parent.AutoExpand = false;
+                        this.Expanded = false;
+                    }
+                    else
+                    {
+                        if (m_Parent != null)
+                            m_Parent.AutoExpand = true;
+                        this.Expanded = true;
+                        // Select first item on that popup
+                        if (this.PopupType == ePopupType.Menu && this.PopupControl is MenuPanel)
+                        {
+                            ((MenuPanel)this.PopupControl).SelectFirstItem();
+                        }
+                    }
+                    objArg.Handled = true;
+                    return;
+                }
+            }
+            else if (objArg.KeyCode == System.Windows.Forms.Keys.Escape)
+            {
+                if (SubItems.Count > 0 && this.Expanded)
+                {
+                    this.Expanded = false;
+                    if (m_Parent != null)
+                        m_Parent.AutoExpand = false;
+                    objArg.Handled = true;
+                    return;
+                }
+            }
+
+            base.InternalKeyDown(objArg);
+        }
+
+        #region Fade Effect Support
+        private Bitmap m_ImageState2 = null;
+        private int m_Direction = 1;
+        private int m_Alpha = 0;
+        private bool m_FadeAnimation = false;
+        private System.Threading.ReaderWriterLock m_FadeImageLock = new System.Threading.ReaderWriterLock();
+        private void SetMouseOver(bool value)
+        {
+            if (value != m_MouseOver)
+            {
+                if (m_Pulse)
+                {
+                    if (m_StopPulseOnMouseOver)
+                        m_Pulse = false;
+                    StopFade();
+                }
+
+                bool fadeEnabled = (IsFadeEnabled || m_Pulse) && this.GetEnabled() && this.Displayed && this.Visible && this.WidthInternal > 0 && this.HeightInternal > 0;
+                if (fadeEnabled)
+                {
+                    int direction = value ? 1 : -1;
+                    int initialAlpha = value ? 10 : 255;
+
+                    m_MouseOver = value;
+                    StartFade(direction, initialAlpha);
+                }
+                else
+                    m_MouseOver = value;
+            }
+        }
+
+        private void StartFade(int direction, int initialAlpha)
+        {
+            bool createImage = false;
+            m_FadeImageLock.AcquireReaderLock(-1);
+            try
+            {
+                createImage = (m_ImageState2 == null);
+            }
+            finally
+            {
+                m_FadeImageLock.ReleaseReaderLock();
+            }
+
+            if (createImage)
+            {
+                bool oldMouseOver = m_MouseOver;
+                m_MouseOver = true;
+                try
+                {
+                    bool readerLockHeld = m_FadeImageLock.IsReaderLockHeld;
+                    System.Threading.LockCookie cookie1 = new System.Threading.LockCookie();
+                    if (readerLockHeld)
+                    {
+                        cookie1 = m_FadeImageLock.UpgradeToWriterLock(-1);
+                    }
+                    else
+                    {
+                        m_FadeImageLock.AcquireWriterLock(-1);
+                    }
+
+                    try
+                    {
+                        m_ImageState2 = GetCurrentStateImage();
+                    }
+                    finally
+                    {
+                        if (readerLockHeld)
+                        {
+                            m_FadeImageLock.DowngradeFromWriterLock(ref cookie1);
+                        }
+                        else
+                        {
+                            m_FadeImageLock.ReleaseWriterLock();
+                        }
+                    }
+                }
+                finally
+                {
+                    m_MouseOver = oldMouseOver;
+                }
+            }
+
+            m_Direction = direction;
+            m_Alpha = initialAlpha;
+
+            FadeAnimator.Fade(this, new EventHandler(this.OnFadeChanged));
+            m_FadeAnimation = true;
+        }
+
+        internal void StopFade()
+        {
+            if (!m_FadeAnimation)
+                return;
+
+            m_FadeAnimation = false;
+            FadeAnimator.StopFade(this, new EventHandler(OnFadeChanged));
+
+            bool disposeImage = false;
+            m_FadeImageLock.AcquireReaderLock(-1);
+            try
+            {
+                disposeImage = (m_ImageState2 != null);
+            }
+            finally
+            {
+                m_FadeImageLock.ReleaseReaderLock();
+            }
+            if (disposeImage)
+                DisposeFadeImage();
+
+            if (m_Alpha > 230)
+                m_Alpha = 255;
+            else if (m_Alpha < 0)
+                m_Alpha = 0;
+            this.Invalidate();
+        }
+
+        private void DisposeFadeImage()
+        {
+            bool readerLockHeld = m_FadeImageLock.IsReaderLockHeld;
+            System.Threading.LockCookie cookie1 = new System.Threading.LockCookie();
+
+            if (readerLockHeld)
+            {
+                cookie1 = m_FadeImageLock.UpgradeToWriterLock(-1);
+            }
+            else
+            {
+                m_FadeImageLock.AcquireWriterLock(-1);
+            }
+
+            try
+            {
+                m_ImageState2.Dispose();
+                m_ImageState2 = null;
+            }
+            finally
+            {
+                if (readerLockHeld)
+                {
+                    m_FadeImageLock.DowngradeFromWriterLock(ref cookie1);
+                }
+                else
+                {
+                    m_FadeImageLock.ReleaseWriterLock();
+                }
+            }
+        }
+
+        private void OnFadeChanged(object sender, EventArgs e)
+        {
+            m_Alpha += (m_Direction * (m_Pulse ? m_PulseFadeAlphaIncrement : m_MouseOverFadeAlphaIncrement));
+
+            if (m_Direction < 0 && m_Alpha <= 0 || m_Direction > 0 && m_Alpha >= 255)
+            {
+                if (m_Pulse)
+                {
+                    m_Direction *= -1;
+                    if (m_Alpha >= 255) m_Alpha = 255; else m_Alpha = 0;
+                    m_PulseCount++;
+                    if (m_PulseBeats > 0 && m_PulseCount > m_PulseBeats)
+                    {
+                        StopFade();
+                        StopPulse();
+                    }
+                }
+                else
+                    StopFade();
+            }
+
+            System.Windows.Forms.Control cc = this.ContainerControl as System.Windows.Forms.Control;
+            if (cc != null && BarFunctions.IsHandleValid(cc))
+            {
+                try
+                {
+                    cc.Invalidate(this.DisplayRectangle);
+                }
+                catch (ObjectDisposedException) { }
+                catch (System.ComponentModel.Win32Exception) { }
+            }
+        }
+
+        private Bitmap GetCurrentStateImage()
+        {
+            Bitmap bitmap = new Bitmap(this.WidthInternal, this.HeightInternal, System.Drawing.Imaging.PixelFormat.Format32bppPArgb); // Format32bppArgb);
+            bitmap.MakeTransparent();
+            Graphics g = Graphics.FromImage(bitmap);
+
+            try
+            {
+                System.Windows.Forms.Control cc = this.ContainerControl as System.Windows.Forms.Control;
+                bool antiAlias = false;
+                ItemPaintArgs pa = null;
+                if (cc is ItemControl)
+                {
+                    antiAlias = ((ItemControl)cc).AntiAlias;
+                    pa = ((ItemControl)cc).GetItemPaintArgs(g);
+                }
+                else if (cc is Bar)
+                {
+                    antiAlias = ((Bar)cc).AntiAlias;
+                    pa = ((Bar)cc).GetItemPaintArgs(g);
+                }
+                else if (cc is ButtonX)
+                {
+                    antiAlias = ((ButtonX)cc).AntiAlias;
+                    pa = ((ButtonX)cc).GetItemPaintArgs(g);
+                }
+
+                System.Drawing.Drawing2D.Matrix myMatrix = new System.Drawing.Drawing2D.Matrix();
+                myMatrix.Translate(-this.DisplayRectangle.X, -this.DisplayRectangle.Y, System.Drawing.Drawing2D.MatrixOrder.Append);
+                g.Transform = myMatrix;
+                myMatrix.Dispose();
+                myMatrix = null;
+                if (antiAlias)
+                {
+                    g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.AntiAlias;
+                    g.TextRenderingHint = DisplayHelp.AntiAliasTextRenderingHint;
+                }
+
+                if (pa == null)
+                {
+                    bitmap.Dispose();
+                    return null;
+                }
+
+                this.Paint(pa);
+            }
+            finally
+            {
+                g.Dispose();
+            }
+            return bitmap;
+        }
+
+        internal bool _FadeEnabled = true;
+        /// <summary>
+        /// Gets whether fade effect is enabled.
+        /// </summary>
+        protected virtual bool IsFadeEnabled
+        {
+            get
+            {
+                eDotNetBarStyle effectiveStyle = EffectiveStyle;
+
+                if (this.DesignMode || m_HotTrackingStyle == eHotTrackingStyle.None || !_FadeEnabled || TextDrawing.UseTextRenderer
+                    || effectiveStyle == eDotNetBarStyle.Office2010 || effectiveStyle == eDotNetBarStyle.Windows7 || StyleManager.IsMetro(effectiveStyle) || !BarUtilities.FadeAnimatorEnabled)
+                    return false;
+                if (WinApi.IsGlassEnabled && (this.Parent is CaptionItemContainer || this.Parent is RibbonTabItemContainer && effectiveStyle == eDotNetBarStyle.Office2010))
+                    return false;
+
+                System.Windows.Forms.Control cc = this.ContainerControl as System.Windows.Forms.Control;
+                if (cc != null)
+                {
+                    if (cc is ItemControl)
+                        return ((ItemControl)cc).IsFadeEnabled;
+                    else if (cc is Bar)
+                        return ((Bar)cc).IsFadeEnabled;
+                    else if (cc is ButtonX)
+                        return ((ButtonX)cc).IsFadeEnabled;
+                }
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// Starts the button pulse effect which alternates slowly between the mouse over and the default state. The pulse effect
+        /// continues indefinitely until it is stopped by call to StopPulse method.
+        /// </summary>
+        public void Pulse()
+        {
+            Pulse(0);
+        }
+        /// <summary>
+        /// Gets whether Pulse function is enabled.
+        /// </summary>
+        protected virtual bool IsPulseEnabed
+        {
+            get
+            {
+                return true;
+            }
+        }
+        /// <summary>
+        /// Starts the button pulse effect which alternates slowly between the mouse over and the default state. Pulse effect
+        /// will alternate between the pulse state for the number of times specified by the pulseBeatCount parameter.
+        /// </summary>
+        /// <param name="pulseBeatCount">Specifies the number of times button alternates between pulse states. 0 indicates indefinite pulse</param>
+        public void Pulse(int pulseBeatCount)
+        {
+            if (this.DesignMode || m_HotTrackingStyle == eHotTrackingStyle.None || !IsPulseEnabed)
+                return;
+
+            m_PulseBeats = pulseBeatCount;
+            m_PulseCount = 0;
+            if (m_Pulse) return;
+
+            m_Pulse = true;
+            if (m_MouseOver) return;
+
+            StartFade(1, 0);
+        }
+
+        /// <summary>
+        /// Stops the button Pulse effect.
+        /// </summary>
+        public void StopPulse()
+        {
+            if (m_Pulse)
+            {
+                m_Pulse = false;
+                if (m_MouseOver) SetMouseOver(false);
+                StopFade();
+            }
+        }
+
+        /// <summary>
+        /// Gets whether the button is currently pulsing, alternating slowly between the mouse over and default state.
+        /// </summary>
+        [Browsable(false)]
+        public bool IsPulsing
+        {
+            get { return m_Pulse; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether pulse effect started with StartPulse method stops automatically when mouse moves over the button. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Browsable(true), Category("Behavior"), Description("Indicates whether pulse effect started with Pulse method stops automatically when mouse moves over the button.")]
+        public virtual bool StopPulseOnMouseOver
+        {
+            get { return m_StopPulseOnMouseOver; }
+            set { m_StopPulseOnMouseOver = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the pulse speed. The value must be greater than 0 and less than 128. Higher values indicate faster pulse. Default value is 12.
+        /// </summary>
+        [Browsable(true), DefaultValue(12), Category("Behavior"), Description("Indicates pulse speed. The value must be greater than 0 and less than 128.")]
+        public virtual int PulseSpeed
+        {
+            get { return m_PulseFadeAlphaIncrement; }
+            set
+            {
+                if (value <= 0 || value >= 128)
+                    throw new ArgumentOutOfRangeException("PulseSpeed value must be greater than 0 and less than 128");
+                m_PulseFadeAlphaIncrement = value;
+            }
+        }
+        #endregion
+
+        /// <summary>
+        /// Indicates whether the item enabled property has changed.
+        /// </summary>
+        protected override void OnEnabledChanged()
+        {
+            if (!this.GetEnabled())
+            {
+                SetMouseOver(false);
+                SetMouseDown(false);
+            }
+            base.OnEnabledChanged();
+        }
+
+        //[System.ComponentModel.Browsable(false), System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+        //public override void InternalMouseEnter()
+        //{
+        //    base.InternalMouseEnter();
+
+        //}
+
+        public override void InternalMouseMove(System.Windows.Forms.MouseEventArgs objArg)
+        {
+            base.InternalMouseMove(objArg);
+
+            if (!this.DisplayRectangle.Contains(objArg.X, objArg.Y))
+                return;
+
+            bool refresh = false;
+
+            Rectangle r = GetTotalSubItemsRect(); // m_SubItemsRect;
+            if (!r.IsEmpty && this.GetEnabled())
+            {
+                r.Offset(this.DisplayRectangle.Location);
+                if (r.Contains(objArg.X, objArg.Y))
+                {
+                    if (!m_MouseOverExpand)
+                    {
+                        m_MouseOverExpand = true;
+                        refresh = true;
+                    }
+                }
+                else if (m_MouseOverExpand)
+                {
+                    m_MouseOverExpand = false;
+                    refresh = true;
+                }
+            }
+
+            if (!m_MouseOver)
+            {
+                SetMouseOver(true);
+                if (this.GetEnabled() || this.IsOnMenu)
+                    refresh = true;
+            }
+
+            if (refresh)
+                this.Refresh();
+        }
+
+        [System.ComponentModel.Browsable(false), System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+        public override void InternalMouseLeave()
+        {
+            base.InternalMouseLeave();
+
+            m_MouseOverExpand = false;
+            SetMouseOver(false);
+            m_MouseDown = false;
+
+            if (this.GetEnabled() || this.IsOnMenu)
+                this.Refresh();
+        }
+
+        internal bool MouseIsOver
+        {
+            get { return (m_MouseOver); }
+            set { m_MouseOver = value; }
+        }
+
+        internal bool MouseIsOverExpand
+        {
+            get { return (m_MouseOverExpand); }
+            set { m_MouseOverExpand = value; }
+        }
+
+        internal bool MouseIsDown
+        {
+            get { return (m_MouseDown); }
+            set { m_MouseDown = value; }
+        }
+
+        internal bool ButtonIsExpanded
+        {
+            get { return (m_Expanded); }
+            set { m_Expanded = value; }
+        }
+
+        [System.ComponentModel.Browsable(false), System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+        public override void InternalMouseHover()
+        {
+            base.InternalMouseHover();
+
+            if ((this.SubItems.Count > 0 || (this.PopupType == ePopupType.Container && !this.IsOnCustomizeMenu)) && this.IsOnMenu && this.ShowSubItems && this.AutoExpandMenuItem)
+            {
+                if (!this.Expanded && GetEnabled())
+                    this.Expanded = true;
+            }
+        }
+
+        private bool _AutoExpandMenuItem = true;
+        /// <summary>
+        /// Gets or sets whether button auto-expands on mouse hover when button is used as menu-item and displayed on menu. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Browsable(false), Description("Indicates whether button auto-expands on mouse hover when button is used as menu-item and displayed on menu."), Category("Behavior")]
+        public bool AutoExpandMenuItem
+        {
+            get { return _AutoExpandMenuItem; }
+            set
+            {
+                _AutoExpandMenuItem = value;
+            }
+        }
+
+
+        [System.ComponentModel.Browsable(false), System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+        public override void InternalMouseDown(System.Windows.Forms.MouseEventArgs objArg)
+        {
+            base.InternalMouseDown(objArg);
+            ButtonMouseDown(objArg);
+        }
+
+        protected virtual bool CanShowPopup
+        {
+            get
+            {
+                return (this.ShowSubItems || ShouldAutoExpandOnClick) && (this.SubItems.Count > 0 || this.PopupType == ePopupType.Container);
+            }
+        }
+        /// <summary>
+        /// Provides internal implementation for ButtonItem mouse down events.
+        /// </summary>
+        /// <param name="objArg">Mouse event arguments.</param>
+        protected virtual void ButtonMouseDown(System.Windows.Forms.MouseEventArgs objArg)
+        {
+            // If this is a label don't do anything
+            //if(m_ButtonType==eButtonType.Label)
+            //	return;
+
+            if (objArg.Button != System.Windows.Forms.MouseButtons.Left || !GetEnabled())
+                return;
+
+            m_MouseDown = true;
+
+            if ((this.IsOnMenuBar || ShouldAutoExpandOnClick) && !this.DesignMode)
+            {
+                if (objArg.Clicks != 2) // Ignore Double Click
+                {
+                    if (CanShowPopup)
+                    {
+                        if (this.Expanded)
+                        {
+                            // Order of those two commands is very important since setting autoexpand to false will collapse all other items
+                            this.Expanded = false;
+                            if (m_Parent != null)
+                                m_Parent.AutoExpand = false;
+                        }
+                        else
+                        {
+                            if (this.IsOnMenuBar && m_Parent != null)
+                                m_Parent.AutoExpand = true;
+                            this.Expanded = true;
+                        }
+                    }
+                    else
+                        this.Refresh();
+                }
+            }
+            else if ((this.IsOnMenuBar || ShouldAutoExpandOnClick) && this.DesignMode)
+                this.Expanded = !this.Expanded;
+            else if (!this.IsOnMenu)
+            {
+                // If user clicks on expand sub items part of this button expand the item
+                if ((this.SubItems.Count > 0 || (this.PopupType == ePopupType.Container && !this.IsOnCustomizeMenu)) && this.ShowSubItems)
+                {
+                    if (!m_Expanded)
+                    {
+                        Rectangle r = GetTotalSubItemsRect();
+                        r.Width += 2;
+                        r.Height += 2;
+                        //Rectangle r = new Rectangle(m_SubItemsRect.X, m_SubItemsRect.Y, m_SubItemsRect.Width + 2, m_SubItemsRect.Height + 2);
+                        r.Offset(m_Rect.X, m_Rect.Y);  // This was a bug since m_SubItemsRect already has the right position see RecalcSize...
+                        if (r.Contains(objArg.X, objArg.Y))
+                        {
+                            if (EffectiveStyle == eDotNetBarStyle.Office2000)
+                                m_MouseDown = false;
+                            this.Expanded = true;
+                        }
+
+                    }
+                    else
+                        this.Expanded = false;
+                }
+
+                this.Refresh();
+            }
+            else
+            {
+                if ((this.SubItems.Count > 0 || this.PopupType == ePopupType.Container && !this.IsOnCustomizeMenu) && this.ShowSubItems)
+                {
+                    if (!(this.IsOnMenu && this.Expanded))
+                        this.Expanded = !m_Expanded;
+                }
+                else
+                    this.Refresh();
+            }
+        }
+
+        internal override void DoAccesibleDefaultAction()
+        {
+            if (this.VisibleSubItems > 0 && (this.IsOnMenu || this.IsOnMenuBar || _AccessibleExpandAction || ShouldAutoExpandOnClick))
+            {
+                if (this.Expanded)
+                {
+                    this.Expanded = false;
+                    if (this.Parent != null && this.IsOnMenuBar)
+                        this.Parent.AutoExpand = false;
+                }
+                else
+                {
+                    if (this.IsOnMenuBar && this.Parent != null)
+                        this.Parent.AutoExpand = true;
+                    this.Expanded = true;
+                }
+                this.Refresh();
+                _AccessibleExpandAction = false;
+            }
+            else
+                this.RaiseClick(eEventSource.Keyboard);
+        }
+
+        /// <summary>
+        /// Indicates whether button should popup when clicked automatically.
+        /// </summary>
+        protected virtual bool ShouldAutoExpandOnClick
+        {
+            get { return m_AutoExpandOnClick; }
+        }
+
+        internal bool GetShouldAutoExpandOnClick()
+        {
+            return this.ShouldAutoExpandOnClick;
+        }
+
+        [System.ComponentModel.Browsable(false), System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+        public override void InternalMouseUp(System.Windows.Forms.MouseEventArgs objArg)
+        {
+            bool bCallBase = true;
+
+            Rectangle rsub = GetTotalSubItemsRect();
+            rsub.Width += 2;
+            rsub.Height += 2;
+            rsub.Offset(m_Rect.X, m_Rect.Y);
+
+            if (objArg.Button == System.Windows.Forms.MouseButtons.Left)
+            {
+                if (GetEnabled() && !this.DesignMode)
+                {
+                    if (m_MenuVisibility == eMenuVisibility.VisibleIfRecentlyUsed && !m_RecentlyUsed && this.IsOnMenu)
+                    {
+                        // Propagate to the top
+                        m_RecentlyUsed = true;
+                        BaseItem objItem = this.Parent;
+                        while (objItem != null)
+                        {
+                            IPersonalizedMenuItem ipm = objItem as IPersonalizedMenuItem;
+                            if (ipm != null)
+                                ipm.RecentlyUsed = true;
+                            objItem = objItem.Parent;
+                        }
+                    }
+                }
+
+                // Since base item does not auto-collapse when clicked if it has subitems and it is on
+                // pop-up we need to handle that here and check did user click on expand part of this button
+                // and if they did not we need to raise click event and collapse the item.
+                if (!this.IsOnMenu && (this.SubItems.Count > 0 || this.PopupType == ePopupType.Container) && this.ShowSubItems && m_HotSubItem == null && !this.DesignMode && !this.IsOnMenuBar && !ShouldAutoExpandOnClick)
+                {
+                    System.Windows.Forms.Control objCtrl = this.ContainerControl as System.Windows.Forms.Control;
+                    if (objCtrl == null)
+                        return;
+
+                    //Point p=objCtrl.PointToClient(new Point(objArg.X,objArg.Y));
+                    objCtrl = null;
+                    if (!rsub.Contains(objArg.X, objArg.Y))
+                    {
+                        bool bCollapse = true;
+                        if (this.PopupType == ePopupType.ToolBar || this.PopupType == ePopupType.Menu)
+                        {
+                            bool bExpanded = this.Expanded;
+                            base.InternalMouseUp(objArg);
+                            // Do not collapse if user has expanded it in Click event
+                            if (!bExpanded && this.Expanded)
+                                bCollapse = false;
+                            bCallBase = false;
+                        }
+                        if (bCollapse)
+                            CollapseAll(this);
+                    }
+                }
+            }
+
+            if (!this.IsOnMenu || this.Parent is ItemContainer)
+            {
+                // If user clicks on expand sub items part of this button do not raise the click event, do not call base MouseUp
+                if ((this.SubItems.Count > 0 || (this.PopupType == ePopupType.Container && !this.IsOnCustomizeMenu)) && this.ShowSubItems)
+                {
+                    if (rsub.Contains(objArg.X, objArg.Y))
+                        bCallBase = false;
+                }
+            }
+
+            if (bCallBase)
+                base.InternalMouseUp(objArg);
+
+            if (!m_MouseDown)
+                return;
+
+            m_MouseDown = false;
+
+            if (!this.IsOnMenu || !(this.Parent is ButtonItem))
+            {
+                this.Refresh();
+            }
+        }
+
+        internal void SetMouseDown(bool mouseDown)
+        {
+            m_MouseDown = mouseDown;
+        }
+
+        /// <summary>
+        /// Occurs when the item is double clicked. This is used by internal implementation only.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+        public override void InternalDoubleClick(System.Windows.Forms.MouseButtons mb, System.Drawing.Point mpos)
+        {
+            base.InternalDoubleClick(mb, mpos);
+
+            if (this.Expanded && this.IsOnMenuBar
+                && m_Parent != null && !this.DesignMode && this.PopupType == ePopupType.Menu &&
+                (this.PersonalizedMenus == ePersonalizedMenus.Both || this.PersonalizedMenus == ePersonalizedMenus.DisplayOnClick))
+            {
+                if (this.PopupControl is MenuPanel)
+                    ((MenuPanel)this.PopupControl).ExpandRecentlyUsed();
+            }
+        }
+
+        /*public override void InternalClick(System.Windows.Forms.MouseButtons mb, System.Drawing.Point mpos)
+        {
+            if(m_Enabled && !this.DesignMode)
+            {
+                if(m_MenuVisibility==eMenuVisibility.VisibleIfRecentlyUsed && !m_RecentlyUsed && this.IsOnMenu)
+                {
+                    // Propagate to the top
+                    m_RecentlyUsed=true;
+                    BaseItem objItem=this.Parent;
+                    while(objItem!=null)
+                    {
+                        IPersonalizedMenuItem ipm=objItem as IPersonalizedMenuItem;
+                        if(ipm!=null)
+                            ipm.RecentlyUsed=true;
+                        objItem=objItem.Parent;
+                    }
+                }
+            }
+
+            // Since base item does not auto-collapse when clicked if it has subitems and it is on
+            // pop-up we need to handle that here and check did user click on expand part of this button
+            // and if they did not we need to raise click event and collapse the item.
+            if(!this.IsOnMenu && (this.SubItemsCount>0 || this.PopupType==ePopupType.Container) && this.ShowSubItems && m_HotSubItem==null && !this.DesignMode && !this.IsOnMenuBar)
+            {
+                Rectangle r=new Rectangle(m_SubItemsRect.X,m_SubItemsRect.Y,m_SubItemsRect.Width,m_SubItemsRect.Height);
+                r.Offset(m_Rect.X,m_Rect.Y);
+                System.Windows.Forms.Control objCtrl=this.ContainerControl as System.Windows.Forms.Control;
+                if(objCtrl==null)
+                {
+                    base.InternalClick(mb,mpos);
+                    return;
+                }
+                Point p=objCtrl.PointToClient(mpos);
+                objCtrl=null;
+                if(!r.Contains(p))
+                {
+                    CollapseAll(this);
+                    RaiseClick();
+                }
+            }
+            else
+                base.InternalClick(mb,mpos);
+        }*/
+
+        //		private void CreateDisabledImage()
+        //		{
+        //			if(m_Image==null && m_ImageIndex<0 && m_Icon==null)
+        //				return;
+        //			if(m_DisabledImage!=null)
+        //				m_DisabledImage.Dispose();
+        //			m_DisabledImage=null;
+        //
+        //			CompositeImage defaultImage=GetImage(ImageState.Default);
+        //
+        //			if(defaultImage==null)
+        //				return;
+        //			if(!defaultImage.IsIcon && defaultImage.Image!=null && defaultImage.Image is Bitmap)
+        //			{
+        //				m_DisabledImage=BarFunctions.CreateDisabledBitmap((Bitmap)defaultImage.Image);
+        //			}
+        //		}
+        private void CreateDisabledImage()
+        {
+            if (m_Image == null && m_ImageIndex < 0 && m_Icon == null)
+                return;
+            if (m_DisabledImage != null)
+                m_DisabledImage.Dispose();
+            m_DisabledImage = null;
+            if (m_DisabledIcon != null)
+                m_DisabledIcon.Dispose();
+            m_DisabledIcon = null;
+
+            CompositeImage defaultImage = GetImage(ImageState.Default, Color.Black);
+
+            if (defaultImage == null)
+                return;
+
+            if (this.GetOwner() is IOwner && ((IOwner)this.GetOwner()).DisabledImagesGrayScale)
+            {
+                if (defaultImage.IsIcon)
+                {
+                    m_DisabledIcon = BarFunctions.CreateDisabledIcon(defaultImage.Icon);
+                }
+                else
+                {
+                    m_DisabledImage = ImageHelper.CreateGrayScaleImage(defaultImage.Image as Bitmap);
+                }
+            }
+            if (m_DisabledIcon != null || m_DisabledImage != null)
+                return;
+
+            // Use old algorithm if first one failed...
+            System.Drawing.Imaging.PixelFormat pixelFormat = System.Drawing.Imaging.PixelFormat.Format32bppArgb;
+            if (!defaultImage.IsIcon && defaultImage.Image != null)
+                pixelFormat = defaultImage.Image.PixelFormat;
+
+            if (pixelFormat == System.Drawing.Imaging.PixelFormat.Format1bppIndexed || pixelFormat == System.Drawing.Imaging.PixelFormat.Format4bppIndexed || pixelFormat == System.Drawing.Imaging.PixelFormat.Format8bppIndexed)
+                pixelFormat = System.Drawing.Imaging.PixelFormat.Format32bppArgb;
+
+            Bitmap bmp = new Bitmap(defaultImage.Width, defaultImage.Height, pixelFormat);
+            m_DisabledImage = new Bitmap(defaultImage.Width, defaultImage.Height, pixelFormat);
+
+            Graphics g2 = Graphics.FromImage(bmp);
+            using (SolidBrush brush = new SolidBrush(System.Drawing.Color.White))
+                g2.FillRectangle(brush, 0, 0, defaultImage.Width, defaultImage.Height);
+            //g2.DrawImage(defaultImage,0,0,defaultImage.Width,defaultImage.Height);
+            defaultImage.DrawImage(g2, new Rectangle(0, 0, defaultImage.Width, defaultImage.Height));
+            g2.Dispose();
+            g2 = Graphics.FromImage(m_DisabledImage);
+
+            bmp.MakeTransparent(System.Drawing.Color.White);
+            eDotNetBarStyle effectiveStyle = EffectiveStyle;
+            if ((effectiveStyle == eDotNetBarStyle.OfficeXP || effectiveStyle == eDotNetBarStyle.Office2003 || effectiveStyle == eDotNetBarStyle.VS2005 || BarFunctions.IsOffice2007Style(effectiveStyle)) && NativeFunctions.ColorDepth >= 8)
+            {
+                float[][] array = new float[5][];
+                array[0] = new float[5] { 0, 0, 0, 0, 0 };
+                array[1] = new float[5] { 0, 0, 0, 0, 0 };
+                array[2] = new float[5] { 0, 0, 0, 0, 0 };
+                array[3] = new float[5] { .5f, .5f, .5f, .5f, 0 };
+                array[4] = new float[5] { 0, 0, 0, 0, 0 };
+                System.Drawing.Imaging.ColorMatrix grayMatrix = new System.Drawing.Imaging.ColorMatrix(array);
+                System.Drawing.Imaging.ImageAttributes disabledImageAttr = new System.Drawing.Imaging.ImageAttributes();
+                disabledImageAttr.ClearColorKey();
+                disabledImageAttr.SetColorMatrix(grayMatrix);
+                g2.DrawImage(bmp, new Rectangle(0, 0, bmp.Width, bmp.Height), 0, 0, bmp.Width, bmp.Height, GraphicsUnit.Pixel, disabledImageAttr);
+            }
+            else
+                System.Windows.Forms.ControlPaint.DrawImageDisabled(g2, bmp, 0, 0, ColorFunctions.MenuBackColor(g2));
+
+            // Clean up
+            g2.Dispose();
+            g2 = null;
+            bmp.Dispose();
+            bmp = null;
+
+            defaultImage.Dispose();
+        }
+
+        private eTextFormat GetStringFormat()
+        {
+            eTextFormat format = eTextFormat.Default;
+            if (!_FitContainer)
+            {
+                format |= eTextFormat.SingleLine;
+            }
+            else
+                format |= eTextFormat.WordBreak;
+
+            format |= eTextFormat.VerticalCenter;
+            return format;
+
+            //            //bool bMenuBar=this.IsOnMenuBar;
+            //            StringFormat sfmt=BarFunctions.CreateStringFormat(); //new StringFormat(StringFormat.GenericDefault);	
+            //            if(NativeFunctions.ShowKeyboardCues /*&& bMenuBar*/ || this.IsOnMenu) 
+            //                sfmt.HotkeyPrefix=System.Drawing.Text.HotkeyPrefix.Show;
+            //            else/* if(bMenuBar)*/
+            //            {
+            //                System.Windows.Forms.Control ctrl=this.ContainerControl as System.Windows.Forms.Control;
+            //                if(ctrl!=null && (ctrl.Focused || ctrl is Bar && ((Bar)ctrl).MenuFocus) || ctrl is NavigationBar)
+            //                    sfmt.HotkeyPrefix=System.Drawing.Text.HotkeyPrefix.Show;
+            //                else
+            //                    sfmt.HotkeyPrefix=System.Drawing.Text.HotkeyPrefix.Hide;
+            //            }
+            ////			else
+            ////				sfmt.HotkeyPrefix=System.Drawing.Text.HotkeyPrefix.Hide;
+
+            //            //sfmt.FormatFlags=sfmt.FormatFlags & ~(sfmt.FormatFlags & StringFormatFlags.DisableKerning);
+            //            if(_FitContainer)
+            //            {
+            //                sfmt.FormatFlags=sfmt.FormatFlags & ~(sfmt.FormatFlags & StringFormatFlags.NoWrap);
+            //            }
+            //            else
+            //            {
+            //                sfmt.FormatFlags=sfmt.FormatFlags | StringFormatFlags.NoWrap;
+            //            }
+            //            sfmt.Trimming=StringTrimming.EllipsisCharacter;
+            //            sfmt.Alignment=System.Drawing.StringAlignment.Near;
+            //            sfmt.LineAlignment=System.Drawing.StringAlignment.Center;
+
+            //            return sfmt;
+        }
+
+        private ThemeTextFormat GetThemeTextFormat()
+        {
+            ThemeTextFormat format = ThemeTextFormat.Left | ThemeTextFormat.HidePrefix |
+                ThemeTextFormat.WordEllipsis |
+                ThemeTextFormat.VCenter;
+            return format;
+        }
+
+        private Font _MouseOverFont = null;
+        /// <summary>
+        /// Returns the Font object to be used for drawing the item text.
+        /// </summary>
+        /// <returns>Font object.</returns>
+        internal virtual Font GetFont(ItemPaintArgs pa, bool isLayout)
+        {
+            System.Drawing.Font objFont = null;
+
+            if (pa != null)
+                objFont = pa.Font;
+
+            if (objFont == null)
+            {
+                System.Windows.Forms.Control objCtrl = null;
+                if (pa != null)
+                    objCtrl = pa.ContainerControl;
+                if (objCtrl == null)
+                    objCtrl = this.ContainerControl as System.Windows.Forms.Control;
+                if (objCtrl != null)
+                {
+                    if (objCtrl.Font != null)
+                        objFont = (Font)objCtrl.Font;
+                }
+                else
+                    objFont = (Font)SystemFonts.DefaultFont;
+            }
+
+            if (m_MouseOver || isLayout && (m_HotFontBold || m_HotFontUnderline))
+            {
+                if (_MouseOverFont != null && objFont != null && objFont.FontFamily.Name == _MouseOverFont.FontFamily.Name && objFont.SizeInPoints == _MouseOverFont.SizeInPoints)
+                    return _MouseOverFont;
+                try
+                {
+                    Font mouseOverFont = null;
+                    FontStyle fontStyle = objFont.Style;
+                    if (m_HotFontBold) fontStyle |= FontStyle.Bold;
+                    if (m_HotFontUnderline) fontStyle |= FontStyle.Underline;
+                    mouseOverFont = new Font(objFont, fontStyle);
+                    DisposeMouseOverFont();
+                    _MouseOverFont = mouseOverFont;
+                    return _MouseOverFont;
+                }
+                catch
+                {
+
+                }
+            }
+
+            if (m_FontBold || m_FontItalic || m_FontUnderline)
+            {
+                FontStyle style = objFont.Style;
+                if (m_FontBold)
+                    style = style | System.Drawing.FontStyle.Bold;
+                if (m_FontItalic)
+                    style = style | System.Drawing.FontStyle.Italic;
+                if (m_FontUnderline)
+                    style = style | System.Drawing.FontStyle.Underline;
+                Font font = null;
+                try
+                {
+                    font = new Font(objFont, style);
+                }
+                catch { }
+                if (font != null)
+                    objFont = font;
+            }
+
+            return objFont;
+        }
+
+        private void DisposeMouseOverFont()
+        {
+            if (_MouseOverFont != null)
+            {
+                _MouseOverFont.Dispose();
+                _MouseOverFont = null;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether Checked property is automatically inverted, button checked/unchecked, when button is clicked. Default value is false.
+        /// </summary>
+        [Browsable(true), DefaultValue(false), Category("Behavior"), Description("Indicates whether Checked property is automatically inverted when button is clicked.")]
+        public virtual bool AutoCheckOnClick
+        {
+            get { return m_AutoCheckOnClick; }
+            set { m_AutoCheckOnClick = value; }
+        }
+
+        /// <summary>
+        /// Gets or set a value indicating whether the button is in the checked state.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Category("Appearance"), Description("Indicates whether item is checked or not."), DefaultValue(false), Bindable(true)]
+        public virtual bool Checked
+        {
+            get
+            {
+                return m_Checked;
+            }
+            set
+            {
+                if (m_Checked != value)
+                {
+                    // Allow user to cancel the checking
+                    if (value && m_OptionGroup.Length > 0 && this.Parent != null)
+                    {
+                        ButtonItem b = null;
+                        foreach (BaseItem item in this.Parent.SubItems)
+                        {
+                            if (item == this)
+                                continue;
+                            b = item as ButtonItem;
+                            if (b != null && b.OptionGroup == m_OptionGroup && b.Checked)
+                            {
+                                break;
+                            }
+                        }
+                        OptionGroupChangingEventArgs e = new OptionGroupChangingEventArgs(b, this);
+                        InvokeOptionGroupChanging(e);
+                        if (e.Cancel)
+                            return;
+                    }
+
+                    m_Checked = value;
+                    if (ShouldSyncProperties)
+                        BarFunctions.SyncProperty(this, "Checked");
+                    this.OnCheckedChanged();
+                    if (this.Displayed)
+                        this.Refresh();
+                    OnAppearanceChanged();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Called after Checked property has changed.
+        /// </summary>
+        protected virtual void OnCheckedChanged()
+        {
+            if (m_OptionGroup != "" && m_Checked && this.Parent != null)
+            {
+                foreach (BaseItem item in this.Parent.SubItems)
+                {
+                    if (item == this)
+                        continue;
+                    ButtonItem b = item as ButtonItem;
+                    if (b != null && b.OptionGroup == m_OptionGroup && b.Checked)
+                        b.Checked = false;
+                }
+            }
+            InvokeCheckedChanged();
+        }
+
+        /// <summary>
+        /// Called when Visibility of the items has changed.
+        /// </summary>
+        /// <param name="bVisible">New Visible state.</param>
+        protected internal override void OnVisibleChanged(bool bVisible)
+        {
+            base.OnVisibleChanged(bVisible);
+
+            if (!bVisible)
+            {
+                StopFade();
+                StopImageAnimation();
+            }
+
+            if (!bVisible && this.Checked && m_OptionGroup != "")
+            {
+                this.Checked = false;
+                // Try to check first item in the group
+                if (this.Parent != null)
+                {
+                    foreach (BaseItem item in this.Parent.SubItems)
+                    {
+                        if (item == this || !item.GetEnabled() || !item.Visible)
+                            continue;
+                        ButtonItem b = item as ButtonItem;
+                        if (b != null && b.OptionGroup == m_OptionGroup)
+                        {
+                            b.Checked = true;
+                            break;
+                        }
+                    }
+                }
+            }
+            else if (bVisible && m_OptionGroup != "" && this.VisibleSubItems <= 1)
+            {
+                bool checkIt = true;
+                // Try to check first item in the group
+                if (this.Parent != null)
+                {
+                    foreach (BaseItem item in this.Parent.SubItems)
+                    {
+                        if (item == this || !item.GetEnabled() || !item.Visible)
+                            continue;
+                        ButtonItem b = item as ButtonItem;
+                        if (b != null && b.OptionGroup == m_OptionGroup && b.Checked)
+                        {
+                            checkIt = false;
+                            break;
+                        }
+                    }
+                }
+                if (checkIt)
+                    this.Checked = true;
+            }
+        }
+
+        /// <summary>
+        /// Sets Checked property without firing any events or performing any built-in logic.
+        /// </summary>
+        internal void SetChecked(bool b)
+        {
+            m_Checked = b;
+        }
+
+        /// <summary>
+        /// Fires CheckedChanged event.
+        /// </summary>
+        protected virtual void InvokeCheckedChanged()
+        {
+            if (CheckedChanged != null)
+                CheckedChanged(this, new EventArgs());
+            IOwnerItemEvents owner = this.GetIOwnerItemEvents();
+            if (owner != null)
+                owner.InvokeCheckedChanged(this, new EventArgs());
+        }
+
+        /// <summary>
+        /// Fires OptionGroupChanging event.
+        /// </summary>
+        protected virtual void InvokeOptionGroupChanging(OptionGroupChangingEventArgs e)
+        {
+            if (OptionGroupChanging != null)
+                OptionGroupChanging(this, e);
+            if (!e.Cancel)
+            {
+                IOwnerItemEvents owner = this.GetIOwnerItemEvents();
+                if (owner != null)
+                    owner.InvokeOptionGroupChanging(this, e);
+            }
+        }
+
+        /// <summary>
+        /// Occurs just before Click event is fired.
+        /// </summary>
+        protected override void OnClick()
+        {
+            if (m_AutoCheckOnClick && m_OptionGroup == "")
+                this.Checked = !this.Checked;
+            base.OnClick();
+            if (m_OptionGroup != "" && !m_Checked)
+                this.Checked = true;
+            ExecuteCommand();
+        }
+
+        protected override void OnCommandChanged()
+        {
+            if (!this.DesignMode && this.Command == null)
+                this.Enabled = false;
+            base.OnCommandChanged();
+        }
+
+        /// <summary>
+        /// Gets or set the alternative shortcut text.
+        /// </summary>
+        [System.ComponentModel.Browsable(true), DevCoBrowsable(true), System.ComponentModel.Category("Design"), System.ComponentModel.Description("Gets or set the alternative Shortcut Text.  This text appears next to the Text instead of any shortcuts"), System.ComponentModel.DefaultValue(""), Localizable(true)]
+        public virtual string AlternateShortCutText
+        {
+            get
+            {
+                return m_AlternateShortcutText;
+            }
+            set
+            {
+                m_AlternateShortcutText = value;
+                OnAppearanceChanged();
+            }
+        }
+
+        /// <summary>
+        /// Returns shortcut text if any that needs to be displayed.
+        /// </summary>
+        internal string DrawShortcutText
+        {
+            get
+            {
+                if (this.AlternateShortCutText != "")
+                    return this.AlternateShortCutText;
+                else
+                    return this.ShortcutString;
+            }
+        }
+
+        /// <summary>
+        /// Returns the shortcut string that is displayed on tooltip.
+        /// </summary>
+        /// <returns></returns>
+        protected override string GetTooltipShortcutString()
+        {
+            return this.DrawShortcutText;
+        }
+
+        /// <summary>
+        /// Gets or sets the image bounds.
+        /// </summary>
+        internal Rectangle ImageDrawRect
+        {
+            get { return m_ImageDrawRect; }
+            set { m_ImageDrawRect = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets sub items bounds.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never), Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public Rectangle SubItemsRect
+        {
+            get { return m_SubItemsRect; }
+            set { m_SubItemsRect = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets text bounds.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never), Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public Rectangle TextDrawRect
+        {
+            get { return m_TextDrawRect; }
+            set { m_TextDrawRect = value; }
+        }
+
+
+        /// <summary>
+        /// Gets or set the Group item belongs to. The groups allows a user to choose from mutually exclusive options within the group. The choice is reflected by Checked property.
+        /// </summary>
+        [System.ComponentModel.Browsable(true), DevCoBrowsable(true), System.ComponentModel.Category("Behavior"), System.ComponentModel.Description("Gets or set the Group item belongs to. The groups allows a user to choose from mutually exclusive options within the group."), System.ComponentModel.DefaultValue("")]
+        public virtual string OptionGroup
+        {
+            get
+            {
+                return m_OptionGroup;
+            }
+            set
+            {
+                if (m_OptionGroup != value)
+                {
+                    m_OptionGroup = value;
+                    if (m_OptionGroup != "" && m_Checked && this.Parent != null)
+                    {
+                        foreach (BaseItem item in this.Parent.SubItems)
+                        {
+                            if (item == this)
+                                continue;
+                            ButtonItem b = item as ButtonItem;
+                            if (b != null && b.OptionGroup == m_OptionGroup && b.Checked)
+                                this.Checked = false;
+                        }
+                    }
+                    OnAppearanceChanged();
+                }
+            }
+        }
+
+        private eColorSchemePart _ForeColorColorSchemePart = eColorSchemePart.None;
+        internal eColorSchemePart ForeColorColorSchemePart
+        {
+            get
+            {
+                return _ForeColorColorSchemePart;
+            }
+            set
+            {
+                _ForeColorColorSchemePart = value;
+            }
+        }
+        /// <summary>
+        /// Gets or sets the text color of the button.
+        /// </summary>
+        [System.ComponentModel.Browsable(true), DevCoBrowsable(true), System.ComponentModel.Category("Appearance"), System.ComponentModel.Description("The foreground color used to display text.")]
+        public virtual Color ForeColor
+        {
+            get
+            {
+                return m_ForeColor;
+            }
+            set
+            {
+                if (m_ForeColor != value)
+                {
+                    m_ForeColor = value;
+
+                    if (ShouldSyncProperties)
+                        BarFunctions.SyncProperty(this, "ForeColor");
+
+                    if (this.Displayed)
+                        this.Refresh();
+                    OnAppearanceChanged();
+                }
+            }
+        }
+        [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+        public bool ShouldSerializeForeColor()
+        {
+            if (m_ForeColor.IsEmpty)
+                return false;
+            return true;
+        }
+
+        /// <summary>
+        /// Gets or sets the text color of the button when mouse is over the item.
+        /// </summary>
+        [System.ComponentModel.Browsable(true), DevCoBrowsable(true), System.ComponentModel.Category("Appearance"), System.ComponentModel.Description("The foreground color used to display text when mouse is over the item.")]
+        public virtual Color HotForeColor
+        {
+            get
+            {
+                return m_HotForeColor;
+            }
+            set
+            {
+                if (m_HotForeColor != value)
+                {
+                    m_HotForeColor = value;
+
+                    if (ShouldSyncProperties)
+                        BarFunctions.SyncProperty(this, "HotForeColor");
+
+                    if (this.Displayed && m_MouseOver)
+                        this.Refresh();
+                    OnAppearanceChanged();
+                }
+            }
+        }
+        [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+        public bool ShouldSerializeHotForeColor()
+        {
+            if (m_HotForeColor.IsEmpty)
+                return false;
+            return true;
+        }
+
+        /// <summary>
+        /// Gets or sets whether the font used to draw the item text is underlined when mouse is over the item.
+        /// </summary>
+        [System.ComponentModel.Browsable(true), DevCoBrowsable(true), System.ComponentModel.Category("Appearance"), System.ComponentModel.Description("Specifies that text font is underlined when mouse is over the item."), System.ComponentModel.DefaultValue(false)]
+        public virtual bool HotFontUnderline
+        {
+            get
+            {
+                return m_HotFontUnderline;
+            }
+            set
+            {
+                if (m_HotFontUnderline != value)
+                {
+                    DisposeMouseOverFont();
+                    m_HotFontUnderline = value;
+
+                    if (ShouldSyncProperties)
+                        BarFunctions.SyncProperty(this, "HotFontUnderline");
+
+                    if (this.Displayed && m_MouseOver)
+                        this.Refresh();
+                    OnAppearanceChanged();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether the font used to draw the item text is bold when mouse is over the item.
+        /// </summary>
+        [System.ComponentModel.Browsable(true), DevCoBrowsable(true), System.ComponentModel.Category("Appearance"), System.ComponentModel.Description("Specifies that text font is bold when mouse is over the item."), System.ComponentModel.DefaultValue(false)]
+        public virtual bool HotFontBold
+        {
+            get
+            {
+                return m_HotFontBold;
+            }
+            set
+            {
+                if (m_HotFontBold != value)
+                {
+                    DisposeMouseOverFont();
+                    m_HotFontBold = value;
+
+                    if (ShouldSyncProperties)
+                        BarFunctions.SyncProperty(this, "HotFontBold");
+
+                    if (this.Displayed && m_MouseOver)
+                        this.Refresh();
+                    OnAppearanceChanged();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether the font used to draw the item text is bold.
+        /// </summary>
+        [System.ComponentModel.Browsable(true), DevCoBrowsable(true), System.ComponentModel.Category("Appearance"), System.ComponentModel.Description("Specifies whether the font used to draw the item text is bold."), System.ComponentModel.DefaultValue(false)]
+        public virtual bool FontBold
+        {
+            get
+            {
+                return m_FontBold;
+            }
+            set
+            {
+                if (m_FontBold != value)
+                {
+                    m_FontBold = value;
+
+                    if (ShouldSyncProperties)
+                        BarFunctions.SyncProperty(this, "FontBold");
+
+                    if (this.Displayed)
+                        this.Refresh();
+                    OnAppearanceChanged();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether the font used to draw the item text is italic.
+        /// </summary>
+        [System.ComponentModel.Browsable(true), DevCoBrowsable(true), System.ComponentModel.Category("Appearance"), System.ComponentModel.Description("Specifies whether the font used to draw the item text is italic."), System.ComponentModel.DefaultValue(false)]
+        public virtual bool FontItalic
+        {
+            get
+            {
+                return m_FontItalic;
+            }
+            set
+            {
+                if (m_FontItalic != value)
+                {
+                    m_FontItalic = value;
+
+                    if (ShouldSyncProperties)
+                        BarFunctions.SyncProperty(this, "FontItalic");
+
+                    if (this.Displayed)
+                        this.Refresh();
+                    OnAppearanceChanged();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether the font used to draw the item text is underlined.
+        /// </summary>
+        [System.ComponentModel.Browsable(true), DevCoBrowsable(true), System.ComponentModel.Category("Appearance"), System.ComponentModel.Description("Specifies whether the font used to draw the item text is underlined."), System.ComponentModel.DefaultValue(false)]
+        public virtual bool FontUnderline
+        {
+            get
+            {
+                return m_FontUnderline;
+            }
+            set
+            {
+                if (m_FontUnderline != value)
+                {
+                    m_FontUnderline = value;
+
+                    if (ShouldSyncProperties)
+                        BarFunctions.SyncProperty(this, "FontUnderline");
+
+                    if (this.Displayed)
+                        this.Refresh();
+                    OnAppearanceChanged();
+                }
+            }
+        }
+
+
+        /// <summary>
+        /// Gets or sets the width of the expand part of the button item.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Category("Behavior"), Description("Indicates the width of the expand part of the button item."), DefaultValue(12)]
+        public virtual int SubItemsExpandWidth
+        {
+            get { return m_SubItemsExpandWidth; }
+            set
+            {
+                m_SubItemsExpandWidth = value;
+                NeedRecalcSize = true;
+                if (this.DesignMode)
+                    this.Refresh();
+                OnAppearanceChanged();
+            }
+        }
+
+        /// <summary>
+        /// Returns the collection of sub items.
+        /// </summary>
+        [System.ComponentModel.Browsable(true), DevCoBrowsable(false), System.ComponentModel.Editor("DevComponents.DotNetBar.Design.ButtonItemEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), System.ComponentModel.Category("Data"), System.ComponentModel.Description("Collection of sub items."), System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Content)]
+        public override SubItemsCollection SubItems
+        {
+            get
+            {
+                return base.SubItems;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether button appears as split button. Split button appearance divides button into two parts. Image which raises the click event
+        /// when clicked and text and expand sign which shows button sub items on popup menu when clicked. Button must have both text and image visible (ButtonStyle property) in order to appear as a full split button.
+        /// Use AutoExpandOnClick=true if you want to make complete surface of the button display popup when clicked.
+        /// </summary>
+        [Browsable(true), DefaultValue(false), Category("Appearance"), Description("Indicates whether button appears as split button. Use AutoExpandOnClick=true if you want to make complete surface of the button display popup when clicked.")]
+        public virtual bool SplitButton
+        {
+            get { return m_SplitButton; }
+            set
+            {
+                m_SplitButton = value;
+                OnAppearanceChanged();
+            }
+        }
+
+        internal Rectangle GetTotalSubItemsRect()
+        {
+            Rectangle r = this.SubItemsRect;
+            if (this.SplitButton && (this.ButtonStyle == eButtonStyle.ImageAndText || this.ImagePosition == eImagePosition.Top || this.ImagePosition == eImagePosition.Bottom)
+                && (this.Image != null || this.ImageIndex >= 0 || !string.IsNullOrEmpty(this.SymbolRealized)) && this.Text.Length > 0)
+            {
+                Rectangle rText = this.TextDrawRect;
+                rText.Inflate(0, -2);
+                if (this.ImagePosition == eImagePosition.Left)
+                {
+                    if (this.Orientation == eOrientation.Horizontal)
+                        rText.X -= 3;
+                    else
+                        rText.Y -= 6;
+                }
+                if (r.IsEmpty)
+                {
+                    r = rText;
+                    if (m_ImagePosition == eImagePosition.Top)
+                    {
+                        r.X = 0;// m_Rect.X - 1;
+                        r.Width = m_Rect.Width;
+                        r.Height = this.DisplayRectangle.Bottom - r.Y;
+                    }
+                    else if (m_ImagePosition == eImagePosition.Bottom)
+                    {
+                        r.X = 0;// m_Rect.X - 1;
+                        r.Width = m_Rect.Width;
+                    }
+                }
+                else
+                    r = Rectangle.Union(r, rText);
+                return r;
+            }
+            return r;
+        }
+
+        /// <summary>
+        /// Gets or sets the text associated with this item.
+        /// </summary>
+        [System.ComponentModel.Browsable(true), DevCoBrowsable(true), Editor("DevComponents.DotNetBar.Design.TextMarkupUIEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), System.ComponentModel.Category("Appearance"), System.ComponentModel.Description("The text contained in the item."), System.ComponentModel.Localizable(true), System.ComponentModel.DefaultValue("")]
+        public override string Text
+        {
+            get
+            {
+                return base.Text;
+            }
+            set
+            {
+                base.Text = value;
+            }
+        }
+
+        internal int VerticalPadding
+        {
+            get { return m_VerticalPadding; }
+            set { m_VerticalPadding = value; }
+        }
+
+        internal int HorizontalPadding
+        {
+            get { return m_HorizontalPadding; }
+            set { m_HorizontalPadding = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the amount of padding added horizontally to the button images when not on menus. Default value is 10 pixels.
+        /// </summary>
+        [Browsable(true), DefaultValue(8), Category("Layout"), Description("Indicates amount of padding added horizontally to the button images when not on menus")]
+        public virtual int ImagePaddingHorizontal
+        {
+            get { return m_ImagePaddingHorizontal; }
+            set
+            {
+                m_ImagePaddingHorizontal = value;
+                this.OnAppearanceChanged();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the amount of padding added vertically to the button images when not on menus. Default value is 6 pixels.
+        /// </summary>
+        [Browsable(true), DefaultValue(6), Category("Layout"), Description("Indicates amount of padding added vertically to the button images when not on menus")]
+        public virtual int ImagePaddingVertical
+        {
+            get { return m_ImagePaddingVertical; }
+            set
+            {
+                m_ImagePaddingVertical = value;
+                this.OnAppearanceChanged();
+            }
+        }
+        /// <summary>
+        /// Gets or sets the current font for the button.
+        /// </summary>
+        //		public System.Drawing.Font Font
+        //		{
+        //			get
+        //			{
+        //				return m_Font;
+        //			}
+        //			set
+        //			{
+        //				if(m_Font!=value)
+        //				{
+        //					m_Font=value;
+        //					if(this.Displayed)
+        //						this.Refresh();
+        //				}
+        //			}
+        //		}
+
+        private ShapeDescriptor _Shape = null;
+        /// <summary>
+        /// Gets or sets an shape descriptor for the button which describes the shape of the button. Default value is null
+        /// which indicates that system default shape is used.
+        /// </summary>
+        [DefaultValue(null), Editor("DevComponents.DotNetBar.Design.ShapeTypeEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), TypeConverter("DevComponents.DotNetBar.Design.ShapeStringConverter, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf"), MergableProperty(false)]
+        public virtual ShapeDescriptor Shape
+        {
+            get { return _Shape; }
+            set
+            {
+                if (_Shape != value)
+                {
+                    _Shape = value;
+                    this.OnAppearanceChanged();
+                }
+            }
+        }
+
+        protected override void OnDisplayedChanged()
+        {
+            // Reset all internal states upon display changed
+            m_MouseDown = false;
+            m_MouseOver = false;
+            if (!this.Displayed && _CurrentlyAnimatingImage)
+                StopImageAnimation();
+        }
+
+        // IPersonalizedMenuItem Impementation
+        /// <summary>
+        /// Indicates item's visibility when on pop-up menu.
+        /// </summary>
+        [System.ComponentModel.Browsable(true), DevCoBrowsable(true), System.ComponentModel.Category("Appearance"), System.ComponentModel.Description("Indicates item's visiblity when on pop-up menu."), System.ComponentModel.DefaultValue(eMenuVisibility.VisibleAlways)]
+        public virtual eMenuVisibility MenuVisibility
+        {
+            get
+            {
+                return m_MenuVisibility;
+            }
+            set
+            {
+                if (m_MenuVisibility != value)
+                {
+                    m_MenuVisibility = value;
+
+                    if (ShouldSyncProperties)
+                        BarFunctions.SyncProperty(this, "MenuVisibility");
+                }
+            }
+        }
+
+        /// <summary>
+        /// Indicates whether item was recently used.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
+        public bool RecentlyUsed
+        {
+            get
+            {
+                return m_RecentlyUsed;
+            }
+            set
+            {
+                if (m_RecentlyUsed != value)
+                {
+                    m_RecentlyUsed = value;
+
+                    if (ShouldSyncProperties)
+                        BarFunctions.SyncProperty(this, "RecentlyUsed");
+
+                    OnAppearanceChanged();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Indicates whether mouse is over the item.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
+        public bool IsMouseOver
+        {
+            get { return m_MouseOver; }
+        }
+
+        /// <summary>
+        /// Indicates whether mouse is over the expand part of the button.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
+        public bool IsMouseOverExpand
+        {
+            get { return m_MouseOverExpand; }
+        }
+
+        /// <summary>
+        /// Indicates whether mouse is pressed.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
+        public bool IsMouseDown
+        {
+            get { return m_MouseDown; }
+        }
+
+        /// <summary>
+        /// Indicates the way item is painting the picture when mouse is over it. Setting the value to Color will render the image in gray-scale when mouse is not over the item.
+        /// </summary>
+        [System.ComponentModel.Browsable(true), DevCoBrowsable(true), System.ComponentModel.Category("Appearance"), System.ComponentModel.Description("Indicates the way item is painting the picture when mouse is over it. Setting the value to Color will render the image in gray-scale when mouse is not over the item."), System.ComponentModel.DefaultValue(eHotTrackingStyle.Default)]
+        public virtual eHotTrackingStyle HotTrackingStyle
+        {
+            get { return m_HotTrackingStyle; }
+            set
+            {
+                if (m_HotTrackingStyle == value)
+                    return;
+                m_HotTrackingStyle = value;
+                if (ShouldSyncProperties)
+                    BarFunctions.SyncProperty(this, "HotTrackingStyle");
+                this.Refresh();
+                OnAppearanceChanged();
+            }
+        }
+
+        // Property Editor support for ImageIndex selection
+        [System.ComponentModel.Browsable(false), System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+        public System.Windows.Forms.ImageList ImageList
+        {
+            get
+            {
+                IOwner owner = this.GetOwner() as IOwner;
+                if (owner != null)
+                    return owner.Images;
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether the button text is automatically wrapped over multiple lines when button is used on RibbonBar control. Default value is true.
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Localizable(true), Category("Ribbon"), Description("Indicates whether the button text is automatically wrapped over multiple lines when button is used on RibbonBar control.")]
+        public virtual bool RibbonWordWrap
+        {
+            get { return m_RibbonWordWrap; }
+            set
+            {
+                if (m_RibbonWordWrap != value)
+                {
+                    m_RibbonWordWrap = value;
+                    this.OnAppearanceChanged();
+                }
+            }
+        }
+
+        private bool _EnableImageAnimation = false;
+        /// <summary>
+        /// Gets or sets whether image animation is enabled
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true)]
+        [DefaultValue(false), Category("Appearance")]
+        [Description("Indicates whether image animation is enabled.")]
+        public bool EnableImageAnimation
+        {
+            get { return (_EnableImageAnimation); }
+
+            set
+            {
+                if (_EnableImageAnimation != value)
+                {
+                    _EnableImageAnimation = value;
+                    this.Refresh();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Creates new ButtonItem with text set to corresponding item from string array and adds it to SubItems collection.
+        /// </summary>
+        /// <param name="p"></param>
+        public void AddSubItems(string[] itemTexts)
+        {
+            AddSubItems(itemTexts, null);
+        }
+
+        /// <summary>
+        /// Creates new ButtonItem with text set to corresponding item from string array and adds it to SubItems collection.
+        /// </summary>
+        /// <param name="clickHandler">Click event handler assigned to each item</param>
+        public void AddSubItems(string[] itemTexts, EventHandler clickHandler)
+        {
+            if (itemTexts == null || itemTexts.Length == 0) return;
+            for (int i = 0; i < itemTexts.Length; i++)
+            {
+                ButtonItem item = new ButtonItem();
+                item.Text = itemTexts[i];
+                if (clickHandler != null)
+                    item.Click += clickHandler;
+                this.SubItems.Add(item);
+            }
+        }
+
+        #endregion
+
+        #region Markup Implementation
+        /// <summary>
+        /// Gets whether item supports text markup. Default is false.
+        /// </summary>
+        protected override bool IsMarkupSupported
+        {
+            get { return _EnableMarkup; }
+        }
+
+        private bool _EnableMarkup = true;
+        /// <summary>
+        /// Gets or sets whether text-markup support is enabled for items Text property. Default value is true.
+        /// Set this property to false to display HTML or other markup in the item instead of it being parsed as text-markup.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance"), Description("Indicates whether text-markup support is enabled for items Text property.")]
+        public bool EnableMarkup
+        {
+            get { return _EnableMarkup; }
+            set
+            {
+                if (_EnableMarkup != value)
+                {
+                    _EnableMarkup = value;
+                    NeedRecalcSize = true;
+                    OnTextChanged();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Occurs when text markup link is clicked. Markup links can be created using "a" tag, for example:
+        /// <a name="MyLink">Markup link</a>
+        /// </summary>
+        [Description("Occurs when text markup link is clicked. Markup links can be created using a tag.")]
+        public event MarkupLinkClickEventHandler MarkupLinkClick;
+        protected override void TextMarkupLinkClick(object sender, EventArgs e)
+        {
+            TextMarkup.HyperLink link = sender as TextMarkup.HyperLink;
+            if (link != null)
+                OnMarkupLinkClick(new MarkupLinkClickEventArgs(link.Name, link.HRef));
+            base.TextMarkupLinkClick(sender, e);
+        }
+        protected virtual void OnMarkupLinkClick(MarkupLinkClickEventArgs e)
+        {
+            if (this.MarkupLinkClick != null)
+                MarkupLinkClick(this, e);
+        }
+        #endregion
+
+        #region ButtonItemAccessibleObject
+        /// <summary>
+        /// Represents accessible interface for ButtonItem object.
+        /// </summary>
+        public class ButtonItemAccessibleObject : BaseItem.ItemAccessibleObject
+        {
+            private ButtonItemPartAccessibleObject m_PushButtonPart = null;
+            private ButtonItemPartAccessibleObject m_ExpandPart = null;
+
+            public ButtonItemAccessibleObject(BaseItem owner) : base(owner) { }
+
+            internal ButtonItem ButtonItem
+            {
+                get { return this.Owner as ButtonItem; }
+            }
+
+            private ButtonItemPartAccessibleObject AccessiblePushButtonPart
+            {
+                get
+                {
+                    if (m_PushButtonPart == null)
+                    {
+                        m_PushButtonPart = new ButtonItemPartAccessibleObject(this.ButtonItem, true);
+                    }
+                    return m_PushButtonPart;
+                }
+            }
+
+            private ButtonItemPartAccessibleObject AccessibleExpandPart
+            {
+                get
+                {
+                    if (m_ExpandPart == null)
+                    {
+                        m_ExpandPart = new ButtonItemPartAccessibleObject(this.ButtonItem, false);
+                    }
+                    return m_ExpandPart;
+                }
+            }
+
+            public override System.Windows.Forms.AccessibleRole Role
+            {
+                get
+                {
+                    if (IsSplitButton)
+                        return System.Windows.Forms.AccessibleRole.Grouping;
+                    return base.Role;
+                }
+            }
+
+            private bool IsSplitButton
+            {
+                get
+                {
+                    ButtonItem b = this.ButtonItem;
+                    if (b.VisibleSubItems > 0 && !b.AutoExpandOnClick && !b.IsOnMenu && !b.IsOnMenuBar)
+                        return true;
+                    return false;
+                }
+            }
+
+            public override System.Windows.Forms.AccessibleStates State
+            {
+                get
+                {
+                    if (this.IsSplitButton)
+                    {
+                        if (this.Owner == null || !this.Owner.IsAccessible)
+                            return System.Windows.Forms.AccessibleStates.Unavailable;
+
+                        System.Windows.Forms.AccessibleStates state = 0;
+
+                        if (!this.Owner.Displayed || !this.Owner.Visible)
+                            state |= System.Windows.Forms.AccessibleStates.Invisible;
+                        else if (!this.Owner.GetEnabled())
+                        {
+                            return System.Windows.Forms.AccessibleStates.Unavailable;
+                        }
+
+                        return System.Windows.Forms.AccessibleStates.Default;
+                    }
+
+                    System.Windows.Forms.AccessibleStates st = base.State;
+
+                    if (this.ButtonItem.GetEnabled())
+                    {
+                        if (this.ButtonItem.Checked || this.ButtonItem.IsMouseDown)
+                            st |= System.Windows.Forms.AccessibleStates.Pressed;
+                    }
+                    return st;
+                }
+            }
+
+            public override int GetChildCount()
+            {
+                if (IsSplitButton)
+                    return 2;
+                return base.GetChildCount();
+            }
+
+            public override System.Windows.Forms.AccessibleObject GetChild(int iIndex)
+            {
+                if (IsSplitButton)
+                {
+                    if (iIndex == 0)
+                        return this.AccessiblePushButtonPart;
+                    else if (iIndex == 1)
+                        return this.AccessibleExpandPart;
+                }
+
+                return base.GetChild(iIndex);
+            }
+
+            public override AccessibleObject Navigate(AccessibleNavigation navdir)
+            {
+                if (IsSplitButton)
+                {
+                    //if (navdir == AccessibleNavigation.FirstChild)
+                    //    return this.AccessiblePushButtonPart;
+                    //else if (navdir == AccessibleNavigation.LastChild)
+                    //    return this.AccessibleExpandPart;
+                    return null;
+                }
+                return base.Navigate(navdir);
+            }
+
+            public override string DefaultAction
+            {
+                get
+                {
+                    if (this.IsSplitButton)
+                        return "";
+                    else
+                        return base.DefaultAction;
+                }
+            }
+
+            public override void DoDefaultAction()
+            {
+                if (!this.IsSplitButton)
+                    base.DoDefaultAction();
+            }
+
+            public override string KeyboardShortcut
+            {
+                get
+                {
+                    return "";
+                }
+            }
+
+            public override System.Windows.Forms.AccessibleObject GetSelected()
+            {
+                if (this.IsSplitButton)
+                {
+                    if (this.ButtonItem.IsMouseOverExpand)
+                        return this.AccessibleExpandPart;
+                    else if (this.ButtonItem.IsMouseOver)
+                        return this.AccessiblePushButtonPart;
+                    return null;
+                }
+                else
+                    return base.GetSelected();
+            }
+
+            public override System.Windows.Forms.AccessibleObject HitTest(int x, int y)
+            {
+                if (this.IsSplitButton)
+                {
+                    Rectangle r = this.AccessiblePushButtonPart.Bounds;
+                    if (r.Contains(x, y))
+                        return this.AccessiblePushButtonPart;
+                    r = this.AccessibleExpandPart.Bounds;
+                    if (r.Contains(x, y))
+                        return this.AccessibleExpandPart;
+
+                    return null;
+                }
+                return base.HitTest(x, y);
+            }
+        }
+
+        /// <summary>
+        /// Represents accessible interface for ButtonItem object.
+        /// </summary>
+        public class ButtonItemPartAccessibleObject : System.Windows.Forms.AccessibleObject
+        {
+            private ButtonItem m_Button = null;
+            //private bool m_Hot = false;
+            private bool m_PushButtonPart = true;
+
+            public ButtonItemPartAccessibleObject(ButtonItem owner, bool pushButtonPart)
+            {
+                m_Button = owner;
+                m_PushButtonPart = pushButtonPart;
+            }
+
+            public override string Name
+            {
+                get
+                {
+                    if (!m_PushButtonPart) return "Open";
+
+                    if (m_Button == null)
+                        return "";
+
+                    if (m_Button.AccessibleName != "")
+                        return m_Button.AccessibleName;
+
+                    if (m_Button.Text != null)
+                        return m_Button.Text.Replace("&", "");
+
+                    return m_Button.Tooltip;
+                }
+                set
+                {
+                    m_Button.AccessibleName = value;
+                }
+            }
+
+            public override string Description
+            {
+                get
+                {
+                    if (m_Button == null)
+                        return "";
+                    if (m_Button.AccessibleDescription != "")
+                        return m_Button.AccessibleDescription;
+                    return Name + " button";
+                }
+            }
+
+            public override System.Windows.Forms.AccessibleRole Role
+            {
+                get
+                {
+                    if (m_PushButtonPart)
+                    {
+#if FRAMEWORK20
+                        return System.Windows.Forms.AccessibleRole.SplitButton;
+#else
+						return System.Windows.Forms.AccessibleRole.PushButton;
+#endif
+                    }
+
+                    return System.Windows.Forms.AccessibleRole.ButtonDropDown;
+                }
+            }
+
+            public override System.Windows.Forms.AccessibleStates State
+            {
+                get
+                {
+                    if (m_Button == null)
+                        return System.Windows.Forms.AccessibleStates.Unavailable;
+
+                    System.Windows.Forms.AccessibleStates state = 0;
+
+                    if (!m_Button.IsAccessible)
+                        return System.Windows.Forms.AccessibleStates.Unavailable;
+
+                    if (!m_Button.Displayed || !m_Button.Visible)
+                        state |= System.Windows.Forms.AccessibleStates.Invisible;
+                    else if (!m_Button.GetEnabled())
+                    {
+                        state = System.Windows.Forms.AccessibleStates.Unavailable;
+                    }
+                    else
+                    {
+                        if (m_PushButtonPart)
+                        {
+                            if (m_Button.IsMouseOver && !m_Button.IsMouseOverExpand)
+                                state |= System.Windows.Forms.AccessibleStates.HotTracked | System.Windows.Forms.AccessibleStates.Focused;
+                            else
+                                state |= System.Windows.Forms.AccessibleStates.Focusable;
+                        }
+                        else
+                        {
+                            if (m_Button.Expanded || m_Button.IsMouseOverExpand)
+                                state |= (System.Windows.Forms.AccessibleStates.Focused | System.Windows.Forms.AccessibleStates.HotTracked);
+                            if (m_Button.Expanded)
+                                state |= System.Windows.Forms.AccessibleStates.Expanded;
+                            else
+                                state |= System.Windows.Forms.AccessibleStates.Collapsed;
+                        }
+                    }
+                    return state;
+                }
+            }
+
+            public override System.Windows.Forms.AccessibleObject Parent
+            {
+                get
+                {
+                    return m_Button.AccessibleObject;
+                }
+            }
+
+            public override System.Drawing.Rectangle Bounds
+            {
+                get
+                {
+                    System.Windows.Forms.Control parent = m_Button.ContainerControl as System.Windows.Forms.Control;
+                    Rectangle r = Rectangle.Empty;
+
+                    if (m_PushButtonPart)
+                    {
+                        Rectangle rs = m_Button.SubItemsRect;
+                        rs.Offset(m_Button.Bounds.Location);
+                        r = m_Button.Bounds;
+                        if (rs.X == r.X && rs.Y == r.Y)
+                        {
+                            r.X += rs.Width;
+                            r.Width -= rs.Width;
+                        }
+                        else if (rs.X == r.X && rs.Bottom == r.Bottom && rs.Y > r.Y)
+                        {
+                            r.Y += rs.Height;
+                            r.Height -= rs.Height;
+                        }
+                        else
+                        {
+                            r.Width -= rs.Width;
+                        }
+                    }
+                    else
+                    {
+                        r = m_Button.SubItemsRect;
+                        r.Offset(m_Button.Bounds.Location);
+                    }
+                    if (parent != null)
+                        r.Location = parent.PointToScreen(r.Location);
+                    return r;
+                }
+            }
+
+            public override int GetChildCount()
+            {
+                if (m_PushButtonPart)
+                    return 0;
+                return m_Button.SubItems.Count;
+            }
+
+            public override System.Windows.Forms.AccessibleObject GetChild(int iIndex)
+            {
+                if (m_Button == null || m_PushButtonPart)
+                    return null;
+
+                return m_Button.SubItems[iIndex].AccessibleObject;
+            }
+
+            public override string DefaultAction
+            {
+                get
+                {
+                    if (m_Button.AccessibleDefaultActionDescription != "")
+                        return m_Button.AccessibleDefaultActionDescription;
+                    if (m_PushButtonPart)
+                        return "Press";
+                    else
+                        return "Open";
+                }
+            }
+
+            public override void DoDefaultAction()
+            {
+                if (m_Button == null)
+                    return;
+
+                if (m_PushButtonPart)
+                    m_Button._AccessibleExpandAction = false;
+                else
+                    m_Button._AccessibleExpandAction = true;
+
+                System.Windows.Forms.Control cont = m_Button.ContainerControl as System.Windows.Forms.Control;
+                if (cont is MenuPanel && !(cont is IAccessibilitySupport))
+                {
+                    cont = ((MenuPanel)cont).ParentItem.ContainerControl as System.Windows.Forms.Control;
+                }
+
+                IAccessibilitySupport ias = cont as IAccessibilitySupport;
+                if (ias != null)
+                {
+                    ias.DoDefaultActionItem = m_Button;
+                    NativeFunctions.PostMessage(cont.Handle, NativeFunctions.WM_USER + 107, IntPtr.Zero, IntPtr.Zero);
+                }
+
+                base.DoDefaultAction();
+            }
+
+            public override string KeyboardShortcut
+            {
+                get
+                {
+                    return m_Button.ShortcutString;
+                }
+            }
+
+            public override System.Windows.Forms.AccessibleObject GetSelected()
+            {
+                if (m_Button == null || m_PushButtonPart)
+                    return base.GetSelected();
+
+                foreach (BaseItem item in m_Button.SubItems)
+                {
+                    if ((item.AccessibleObject.State & System.Windows.Forms.AccessibleStates.HotTracked) == System.Windows.Forms.AccessibleStates.HotTracked)
+                        return item.AccessibleObject;
+                }
+
+                return base.GetSelected();
+            }
+
+            public override System.Windows.Forms.AccessibleObject HitTest(int x, int y)
+            {
+                if (m_Button == null)
+                    return base.HitTest(x, y);
+
+                Point screen = new Point(x, y);
+                foreach (BaseItem item in m_Button.SubItems)
+                {
+                    System.Windows.Forms.Control cont = item.ContainerControl as System.Windows.Forms.Control;
+                    if (cont != null)
+                    {
+                        Point p = cont.PointToClient(screen);
+                        if (item.DisplayRectangle.Contains(p))
+                            return item.AccessibleObject;
+                    }
+                }
+
+                return base.HitTest(x, y);
+            }
+
+            public override System.Windows.Forms.AccessibleObject Navigate(System.Windows.Forms.AccessibleNavigation navdir)
+            {
+                if (m_Button == null || m_PushButtonPart)
+                    return base.Navigate(navdir);
+
+                BaseItem item = null;
+
+                if (navdir == System.Windows.Forms.AccessibleNavigation.Down || navdir == System.Windows.Forms.AccessibleNavigation.Right
+                || navdir == System.Windows.Forms.AccessibleNavigation.Next)
+                {
+                    if (m_Button.Parent != null)
+                    {
+                        BaseItem parent = m_Button.Parent;
+                        item = GetFirstVisible(parent.SubItems, parent.SubItems.IndexOf(m_Button) + 1);
+                    }
+                }
+                else if (navdir == System.Windows.Forms.AccessibleNavigation.FirstChild)
+                {
+                    item = GetFirstVisible(m_Button.SubItems, 0);
+                }
+                else if (navdir == System.Windows.Forms.AccessibleNavigation.LastChild)
+                {
+                    item = GetFirstVisibleReverse(m_Button.SubItems, m_Button.SubItems.Count - 1);
+                }
+                else if (navdir == System.Windows.Forms.AccessibleNavigation.Up || navdir == System.Windows.Forms.AccessibleNavigation.Left
+                    || navdir == System.Windows.Forms.AccessibleNavigation.Previous)
+                {
+                    BaseItem parent = m_Button.Parent;
+                    item = GetFirstVisibleReverse(m_Button.SubItems, parent.SubItems.IndexOf(m_Button) - 1);
+                }
+
+                if (item != null)
+                    return item.AccessibleObject;
+
+                return base.Navigate(navdir);
+            }
+
+            private BaseItem GetFirstVisible(SubItemsCollection col, int startIndex)
+            {
+                int count = col.Count;
+                if (count == 0) return null;
+                if (startIndex >= col.Count) startIndex = col.Count - 1;
+
+                for (int i = startIndex; i < count; i++)
+                {
+                    if (col[i].Visible)
+                        return col[i];
+                }
+                return null;
+            }
+
+            private BaseItem GetFirstVisibleReverse(SubItemsCollection col, int startIndex)
+            {
+                if (col.Count == 0) return null;
+                if (startIndex >= col.Count) startIndex = col.Count - 1;
+                for (int i = startIndex; i >= 0; i--)
+                {
+                    if (col[i].Visible)
+                        return col[i];
+                }
+                return null;
+            }
+        }
+        #endregion
+    }
+
+    #region OptionGroupChangingEventHandler
+    /// <summary>
+    /// Delegate for OptionGroupChanging event.
+    /// </summary>
+    public delegate void OptionGroupChangingEventHandler(object sender, OptionGroupChangingEventArgs e);
+    #endregion
+
+    #region OptionGroupChangingEventArgs
+    /// <summary>
+    /// Represents event arguments for OptionGroupChanging event.
+    /// </summary>
+    public class OptionGroupChangingEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Set to true to cancel the checking on NewChecked button.
+        /// </summary>
+        public bool Cancel = false;
+        /// <summary>
+        /// Button that will become checked if operation is not canceled.
+        /// </summary>
+        public readonly BaseItem NewChecked;
+        /// <summary>
+        /// Button that is currently checked and which will be unchecked if operation is not canceled.
+        /// </summary>
+        public readonly BaseItem OldChecked;
+        /// <summary>
+        /// Default constructor.
+        /// </summary>
+        public OptionGroupChangingEventArgs(BaseItem oldchecked, BaseItem newchecked)
+        {
+            NewChecked = newchecked;
+            OldChecked = oldchecked;
+        }
+    }
+    #endregion
+
+    #region SideBarImage
+    /// <summary>
+    /// Stores all information for side bar images that are used by Bar or Popup menu.
+    /// </summary>
+    public struct SideBarImage
+    {
+        /// <summary>
+        /// Gets or sets the side bar image.
+        /// </summary>
+        public Image Picture;
+        /// <summary>
+        /// Gets or sets the side bar back color.
+        /// </summary>
+        public Color BackColor;
+        /// <summary>
+        /// Gets or sets the gradient staring color.
+        /// </summary>
+        public Color GradientColor1;
+        /// <summary>
+        /// Gets or sets the gradient ending color.
+        /// </summary>
+        public Color GradientColor2;
+        /// <summary>
+        /// Gets or sets the gradient angle.
+        /// </summary>
+        public float GradientAngle;
+        /// <summary>
+        /// Gets or sets the gradient staring color.
+        /// </summary>
+        public eAlignment Alignment;
+
+        /// <summary>
+        /// Gets or sets whether image is stretched so it fills the side bar or not if image is smaller than current side bar size.
+        /// </summary>
+        public bool StretchPicture;
+    }
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/ButtonItemLayout.cs b/PROMS/DotNetBar Source Code/ButtonItemLayout.cs
new file mode 100644
index 00000000..17cc306a
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/ButtonItemLayout.cs	
@@ -0,0 +1,985 @@
+using System.Drawing;
+using System.Drawing.Text;
+using System.Windows.Forms;
+using System;
+using DevComponents.DotNetBar.Controls;
+using DevComponents.DotNetBar.Rendering;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Summary description for ButtonItemLayout.
+    /// </summary>
+    internal class ButtonItemLayout
+    {
+        /// <summary>
+        /// Arranges the button inner parts when button size has changed externally.
+        /// </summary>
+        /// <param name="button">Button to arrange inner parts for.</param>
+        public static void Arrange(ButtonItem button)
+        {
+            int minTextSize = Dpi.Width8;
+            bool isOnMenu = button.IsOnMenu;
+            if (isOnMenu && button.Parent is ItemContainer)
+                isOnMenu = false;
+            bool hasImage = false;
+
+            Size imageSize = Size.Empty;
+            if (!string.IsNullOrEmpty(button.SymbolRealized))
+            {
+                hasImage = true;
+                imageSize = button.ImageSize;
+            }
+            else
+            {
+                using (CompositeImage buttonImage = button.GetImage())
+                {
+                    if (buttonImage != null)
+                        hasImage = true;
+                }
+                imageSize = GetLayoutImageSize(button, hasImage, isOnMenu, false);
+            }
+
+            bool rightToLeft = button.IsRightToLeft;
+            Rectangle bounds = button.DisplayRectangle;
+
+            if (isOnMenu)
+            {
+                // Add 4 pixel padding to the image size, 2 pixels on each side
+                imageSize.Height += Dpi.Width2;
+                imageSize.Width += Dpi.Width7;
+                // Center image if any...
+                //if (rightToLeft)
+                //{
+                //    if (button.IsOnCustomizeMenu)
+                //        button.ImageDrawRect = new Rectangle(bounds.Width - (imageSize.Width + bounds.Height + 2), Math.Max(0, (bounds.Height - imageSize.Height) / 2), imageSize.Width, imageSize.Height);
+                //    else
+                //        button.ImageDrawRect = new Rectangle(bounds.Width - imageSize.Width - 1, Math.Max(0, (bounds.Height - imageSize.Height) / 2), imageSize.Width, imageSize.Height);
+                //}
+                //else
+                {
+                    if (button.IsOnCustomizeMenu && !rightToLeft)
+                        button.ImageDrawRect = new Rectangle(bounds.Height + 2, Math.Max(0, (bounds.Height - imageSize.Height) / 2), imageSize.Width, imageSize.Height);
+                    else
+                        button.ImageDrawRect = new Rectangle(0, Math.Max(0, (bounds.Height - imageSize.Height) / 2), imageSize.Width, imageSize.Height);
+                }
+
+                //if (rightToLeft)
+                //    button.TextDrawRect = new Rectangle(Math.Max(0, button.ImageDrawRect.X - button.TextDrawRect.Width - 2), Math.Max(0, (bounds.Height - button.TextDrawRect.Height) / 2), button.TextDrawRect.Width, button.TextDrawRect.Height);
+                //else
+                button.TextDrawRect = new Rectangle(button.ImageDrawRect.Right + 8, Math.Max(0, (bounds.Height - button.TextDrawRect.Height) / 2), button.TextDrawRect.Width, button.TextDrawRect.Height);
+
+                return;
+            }
+            int x = 0;
+            if (!button.SubItemsRect.IsEmpty)
+            {
+                Rectangle subItemsRect = button.SubItemsRect;
+                if (button.ContainerControl is RibbonBar && (button.ImagePosition == eImagePosition.Top || button.ImagePosition == eImagePosition.Bottom))
+                {
+                    subItemsRect = new Rectangle(0, bounds.Height - subItemsRect.Height, bounds.Width, subItemsRect.Height);
+                    bounds.Height -= subItemsRect.Height;
+                }
+                else
+                {
+                    if (button.Orientation == eOrientation.Horizontal)
+                    {
+                        if (rightToLeft)
+                        {
+                            subItemsRect = new Rectangle(0, 0, subItemsRect.Width, bounds.Height);
+                            //bounds.Width -= subItemsRect.Width;
+                            //bounds.X += subItemsRect.Width;
+                            x = subItemsRect.Width;
+                        }
+                        else
+                        {
+                            subItemsRect = new Rectangle(bounds.Width - subItemsRect.Width, 0, subItemsRect.Width, bounds.Height);
+                            bounds.Width -= subItemsRect.Width;
+                        }
+                    }
+                    else
+                    {
+                        subItemsRect = new Rectangle(0, 0, bounds.Width, subItemsRect.Height);
+                        bounds.Height -= subItemsRect.Height;
+                    }
+                }
+                button.SubItemsRect = subItemsRect;
+            }
+
+            if (!hasImage || button.ButtonStyle == eButtonStyle.TextOnlyAlways)
+            {
+                int newHeight = bounds.Height - 2;
+                button.TextDrawRect = new Rectangle(2,
+                    Math.Max(0, (bounds.Height - newHeight) / 2), bounds.Width - 4, newHeight);
+                return;
+            }
+            else if (button.ButtonStyle == eButtonStyle.Default && !(button.ImagePosition == eImagePosition.Top || button.ImagePosition == eImagePosition.Bottom) || bounds.Width < imageSize.Width + minTextSize)
+            {
+                // Display image only in center of the button
+                button.ImageDrawRect = new Rectangle(Math.Max(0, (bounds.Width - button.ImageDrawRect.Width) / 2),
+                    Math.Max(0, (bounds.Height - button.ImageDrawRect.Height) / 2), button.ImageDrawRect.Width, button.ImageDrawRect.Height);
+                if (bounds.Width < imageSize.Width + minTextSize)
+                    button.TextDrawRect = Rectangle.Empty;
+                return;
+            }
+
+            // Displays both image and text
+            if (button.ImagePosition == eImagePosition.Left && !rightToLeft || button.ImagePosition == eImagePosition.Right && rightToLeft)
+            {
+                button.ImageDrawRect = new Rectangle(0, Math.Max(0, (bounds.Height - button.ImageDrawRect.Height) / 2),
+                    button.ImageDrawRect.Width, button.ImageDrawRect.Height);
+                button.TextDrawRect = new Rectangle(button.ImageDrawRect.Right - 2, Math.Max(0, (bounds.Height - button.TextDrawRect.Height) / 2),
+                    Math.Min(button.TextDrawRect.Width, bounds.Width - (button.ImageDrawRect.Right - 2)), button.TextDrawRect.Height);
+            }
+            else if (button.ImagePosition == eImagePosition.Right && !rightToLeft || button.ImagePosition == eImagePosition.Left && rightToLeft)
+            {
+                button.ImageDrawRect = new Rectangle(bounds.Width - button.ImageDrawRect.Width, Math.Max(0, (bounds.Height - button.TextDrawRect.Height) / 2),
+                    button.ImageDrawRect.Width, button.ImageDrawRect.Height);
+                button.TextDrawRect = new Rectangle(Math.Max(x, button.ImageDrawRect.X - button.TextDrawRect.Width + 2), Math.Max(0, (bounds.Height - button.TextDrawRect.Height) / 2),
+                    Math.Min(button.TextDrawRect.Width, button.ImageDrawRect.X), button.TextDrawRect.Height);
+            }
+            else if (button.ImagePosition == eImagePosition.Top)
+            {
+                int y = Math.Max(2, (bounds.Height - (button.TextDrawRect.Height + button.ImageDrawRect.Height - 2)) / 2);
+                if (button.Name != "sysOverflowButton" && button.Parent is ItemContainer && ((ItemContainer)button.Parent).LayoutOrientation == eOrientation.Horizontal && ((ItemContainer)button.Parent).VerticalItemAlignment == eVerticalItemsAlignment.Top)
+                    y = 2;
+
+                button.ImageDrawRect = new Rectangle(0, y,
+                    bounds.Width, button.ImageDrawRect.Height);
+
+                button.TextDrawRect = new Rectangle(Math.Max(0, (bounds.Width - button.TextDrawRect.Width) / 2), button.ImageDrawRect.Bottom,
+                    button.TextDrawRect.Width, button.TextDrawRect.Height);
+            }
+            else if (button.ImagePosition == eImagePosition.Bottom)
+            {
+                int y = Math.Max(0, (bounds.Height - (button.TextDrawRect.Height + button.ImageDrawRect.Height - 2)) / 2);
+                //button.ImageDrawRect = new Rectangle(Math.Max(0, (bounds.Width - button.ImageDrawRect.Width) / 2), bounds.Height - y - button.ImageDrawRect.Height,
+                //    button.ImageDrawRect.Width, button.ImageDrawRect.Height);
+                button.ImageDrawRect = new Rectangle(0, bounds.Height - y - button.ImageDrawRect.Height,
+                    bounds.Width, button.ImageDrawRect.Height);
+                button.TextDrawRect = new Rectangle(Math.Max(0, (bounds.Width - button.ImageDrawRect.Width) / 2), Math.Max(0, button.ImageDrawRect.Y + 2 - button.TextDrawRect.Height),
+                    button.TextDrawRect.Width, Math.Min(button.TextDrawRect.Height, button.ImageDrawRect.Y));
+            }
+        }
+
+        public static Size MeasureItemText(BaseItem item, Graphics g, int containerWidth, Font font, eTextFormat stringFormat, bool rightToLeft)
+        {
+            return MeasureItemText(item, g, containerWidth, font, stringFormat, rightToLeft, false, eImagePosition.Left);
+        }
+
+        public static Size MeasureItemText(BaseItem item, Graphics g, int containerWidth, Font font, eTextFormat stringFormat, bool rightToLeft, bool ribbonBarButton, eImagePosition imagePosition)
+        {
+            if (item.Text == "" && item.TextMarkupBody == null) return Size.Empty;
+
+            Size textSize = Size.Empty;
+
+            if (item.TextMarkupBody == null)
+            {
+                textSize = TextDrawing.MeasureString(g, ButtonItemPainter.GetDrawText(item.Text), font, containerWidth, stringFormat);
+            }
+            else
+            {
+                Size availSize = new Size(containerWidth, 1);
+                if (containerWidth == 0)
+                    availSize.Width = 1600;
+                TextMarkup.MarkupDrawContext d = new TextMarkup.MarkupDrawContext(g, font, Color.Empty, false);
+                item.TextMarkupBody.Measure(availSize, d);
+                availSize = item.TextMarkupBody.Bounds.Size;
+                if (containerWidth != 0 && !(ribbonBarButton && imagePosition == eImagePosition.Top))
+                    availSize.Width = containerWidth;
+                d.RightToLeft = rightToLeft;
+                item.TextMarkupBody.Arrange(new Rectangle(0, 0, availSize.Width, availSize.Height), d);
+
+                textSize = item.TextMarkupBody.Bounds.Size;
+            }
+
+            return textSize;
+        }
+
+        public static void LayoutButton(ButtonItem button)
+        {
+            LayoutButton(button, false);
+        }
+
+        private static bool UseRibbonWordBreak(ButtonItem button)
+        {
+            if (button.TextMarkupBody == null)
+                return button.Text.IndexOf(' ') > 0 || button.Text.IndexOf(Environment.NewLine)> 0;
+
+            return (button.Text.IndexOf(' ') > 0 && !button.TextMarkupBody.HasExpandElement || button.Text.Split(' ').Length > 2 && button.TextMarkupBody.HasExpandElement && button.ButtonStyle != eButtonStyle.Default);
+        }
+
+        public static void LayoutButton(ButtonItem button, bool startButtonType)
+        {
+            Control objCtrl = button.ContainerControl as Control;
+            if (objCtrl == null || objCtrl.Disposing || objCtrl.IsDisposed) //if(!BarFunctions.IsHandleValid(objCtrl))
+                return;
+            if (objCtrl is ButtonX && button._FitContainer)
+            {
+                LayoutButtonX(button);
+                return;
+            }
+            else if (button.FixedSize.Width > 0 && button.FixedSize.Height > 0)
+            {
+                Size fixedSize=Dpi.Size(button.FixedSize);
+                button.SetDisplayRectangle(new Rectangle(button.DisplayRectangle.Location, fixedSize));
+                LayoutButtonX(button);
+                return;
+            }
+
+            bool isOnMenu = button.IsOnMenu;
+            if (isOnMenu && button.Parent is ItemContainer)
+                isOnMenu = false;
+            bool bHasImage = false;
+            bool isSymbolImage = false;
+            eDotNetBarStyle effectiveStyle = button.EffectiveStyle;
+            bool ignoreImage = false;
+            if (startButtonType && (effectiveStyle == eDotNetBarStyle.Office2010 || effectiveStyle == eDotNetBarStyle.Office2013 || effectiveStyle == eDotNetBarStyle.Metro))
+                ignoreImage = true;
+            if (!ignoreImage)
+            {
+                if (!string.IsNullOrEmpty(button.SymbolRealized))
+                {
+                    bHasImage = true;
+                    isSymbolImage = true;
+                }
+                else
+                {
+                    using (CompositeImage buttonImage = button.GetImage())
+                    {
+                        if (buttonImage != null || startButtonType)
+                            bHasImage = true;
+                    }
+                }
+            }
+
+            eImagePosition imagePosition = button.ImagePosition;
+            bool rightToLeft = (objCtrl.RightToLeft == RightToLeft.Yes);
+
+            Rectangle textDrawRect = Rectangle.Empty;
+            Rectangle imageDrawRect = Rectangle.Empty;
+            Rectangle subItemsRect = Rectangle.Empty;
+            Rectangle bounds = new Rectangle(button.DisplayRectangle.Location, Size.Empty); // Critical to preserve the location for compatibility reasons
+
+            if (rightToLeft && button.Orientation == eOrientation.Horizontal)
+            {
+                if (imagePosition == eImagePosition.Left)
+                    imagePosition = eImagePosition.Right;
+                else if (imagePosition == eImagePosition.Right)
+                    imagePosition = eImagePosition.Left;
+            }
+
+            int measureStringWidth = 0;
+
+            if (button._FitContainer)
+                measureStringWidth = button.DisplayRectangle.Width - 4;
+
+            bounds.Width = 0;
+            bounds.Height = 0;
+
+            Graphics g = BarFunctions.CreateGraphics(objCtrl);
+            try
+            {
+                eTextFormat stringFormat = GetTextFormat(button);
+
+                // Get the right image size that we will use for calculation
+                Size imageSize = Size.Empty;
+                if (isSymbolImage)
+                {
+                    Font symFont = Symbols.GetFont(button.SymbolSize, button.SymbolSet);
+                    
+                    if(button.IsOnMenu || objCtrl is SideNavStrip) // Need to do this to get consistent size for the symbol since they are not all the same width we pick widest
+                        imageSize = TextDrawing.MeasureStringLegacy(g, "\uF00A", symFont, Size.Empty, eTextFormat.Default);
+                    else
+                        imageSize = TextDrawing.MeasureStringLegacy(g, button.SymbolRealized, symFont, Size.Empty, eTextFormat.Default);
+
+                    //int descent = (int)Math.Ceiling((symFont.FontFamily.GetCellDescent(symFont.Style) *
+                    //symFont.Size / symFont.FontFamily.GetEmHeight(symFont.Style)));
+                    //imageSize.Height -= descent;
+                    button.ImageSize = imageSize;
+                }
+                else
+                {
+                    imageSize = GetLayoutImageSize(button, bHasImage, isOnMenu, startButtonType);
+                }
+                bool ribbonBarButton = false;
+                if (button._FitContainer && bHasImage && (imagePosition == eImagePosition.Left || imagePosition == eImagePosition.Right))
+                {
+                    measureStringWidth -= (imageSize.Width + Dpi.Width10);
+                }
+                else if (button.RibbonWordWrap && bHasImage && imagePosition == eImagePosition.Top && objCtrl is RibbonBar && UseRibbonWordBreak(button))
+                {
+                    measureStringWidth = imageSize.Width + Dpi.Width4;
+                    stringFormat |= eTextFormat.WordBreak;
+                    ribbonBarButton = true;
+                }
+
+                // Measure string
+                Font font = button.GetFont(null, true);
+
+                SizeF textSize = SizeF.Empty;
+
+                if ((button.Text != "" || button.TextMarkupBody != null) && (!bHasImage || isOnMenu || button.ButtonStyle != eButtonStyle.Default || button.ImagePosition != eImagePosition.Left && bHasImage))
+                {
+                    textSize = ButtonItemLayout.MeasureItemText(button, g, measureStringWidth, font, stringFormat, rightToLeft, ribbonBarButton, imagePosition);
+                    //if (button.HotFontBold) textSize.Width += textSize.Width * .15f;
+                    int maxItt = 0;
+                    int increase = Math.Max(14, imageSize.Width / 2);
+                    while (ribbonBarButton && textSize.Height > font.Height * 2.2 && maxItt < 4)
+                    {
+                        measureStringWidth += increase;
+                        textSize = ButtonItemLayout.MeasureItemText(button, g, measureStringWidth, font, stringFormat, rightToLeft, ribbonBarButton, imagePosition);
+                        maxItt++;
+                    }
+                    if (maxItt > 0)
+                    {
+                        measureStringWidth += increase;
+                        textSize = ButtonItemLayout.MeasureItemText(button, g, measureStringWidth, font, stringFormat, rightToLeft, ribbonBarButton, imagePosition);
+                    }
+                    if (/*!ribbonBarButton &&*/ objCtrl is RibbonBar && bHasImage && imagePosition == eImagePosition.Top)
+                        textSize.Height += Dpi.Width2;
+                    if (startButtonType && ignoreImage)
+                        textSize.Width = Dpi.Width((int)Math.Max(51, textSize.Width+6));
+                }
+
+                // See if this button is on menu, and do appropriate calculations
+                if (isOnMenu)
+                {
+                    if (imageSize.IsEmpty)
+                        imageSize = new Size(Dpi.Width16, Dpi.Height16);
+
+                    // Add 4 pixel padding to the image size, 2 pixels on each side
+                    imageSize.Height += Dpi.Width2;
+                    imageSize.Width += Dpi.Width7;
+
+                    // Calculate item height
+                    if (textSize.Height > imageSize.Height)
+                        bounds.Height = (int)textSize.Height + Dpi.Height4;
+                    else
+                        bounds.Height = imageSize.Height + Dpi.Height4;
+
+                    // Add Vertical Padding to it
+                    bounds.Height += Dpi.Height(button.VerticalPadding);
+
+                    // We know the image position now, we will center it into this area
+                    if (button.IsOnCustomizeMenu && !rightToLeft)
+                        imageDrawRect = new Rectangle(bounds.Height + Dpi.Width2, (bounds.Height - imageSize.Height) / 2, imageSize.Width, imageSize.Height);
+                    else
+                        imageDrawRect = new Rectangle(0, (bounds.Height - imageSize.Height) / 2, imageSize.Width, imageSize.Height);
+
+                    bounds.Width = (int)textSize.Width;
+                    // Add short-cut size if we have short-cut
+                    if (button.DrawShortcutText != "")
+                    {
+                        Size objSizeShortcut = TextDrawing.MeasureString(g, button.DrawShortcutText, font, 0, stringFormat);
+                        bounds.Width += (objSizeShortcut.Width + 14); // 14 distance between text and shortcut
+                    }
+
+                    textDrawRect = new Rectangle(imageDrawRect.Right + 8, 2, bounds.Width, bounds.Height - 4);
+
+                    // 8 pixels distance between image and text, 22 pixels if this item has sub items
+                    bounds.Width += (imageDrawRect.Right + Dpi.Width34);
+                    bounds.Width += Dpi.Width(button.HorizontalPadding);
+                }
+                else
+                {
+                    bool bThemed = button.IsThemed;
+                    if (StyleManager.Style == eStyle.OfficeMobile2014)
+                    {
+                        imageSize.Width += Dpi.Width6; imageSize.Height += Dpi.Height4;
+                    }
+                    else if (StyleManager.Style == eStyle.Office2016)
+                    {
+                        imageSize.Width += Dpi.Width4; imageSize.Height += Dpi.Width2;
+                    }
+                    if (button.Orientation == eOrientation.Horizontal && (imagePosition == eImagePosition.Left || imagePosition == eImagePosition.Right))
+                    {
+                        // Recalc size for the Bar button
+                        // Add 8 pixel padding to the image size, 4 pixels on each side
+                        //objImageSize.Height+=4;
+                        imageSize.Width += Dpi.Width(button.ImagePaddingHorizontal);
+
+                        // Calculate item height
+                        if (textSize.Height > imageSize.Height)
+                            bounds.Height = (int)textSize.Height + Dpi.Height(button.ImagePaddingVertical);
+                        else
+                            bounds.Height = imageSize.Height + Dpi.Height(button.ImagePaddingVertical);
+
+                        // Add Vertical Padding
+                        bounds.Height += Dpi.Height(button.VerticalPadding);
+
+                        if (bThemed && !button.IsOnMenuBar)
+                            bounds.Height += Dpi.Height4;
+
+                        imageDrawRect = Rectangle.Empty;
+                        if (button.ButtonStyle != eButtonStyle.TextOnlyAlways && bHasImage)
+                        {
+                            // We know the image position now, we will center it into this area
+                            imageDrawRect = new Rectangle(0, (bounds.Height - imageSize.Height) / 2, imageSize.Width, imageSize.Height);
+                        }
+
+                        // Draw Text only if needed
+                        textDrawRect = Rectangle.Empty;
+                        if (button.ButtonStyle != eButtonStyle.Default || !bHasImage)
+                        {
+                            if (imageDrawRect.Right > 0)
+                            {
+                                bounds.Width = (int)textSize.Width + 1;
+                                textDrawRect = new Rectangle(imageDrawRect.Right - 2, 2, bounds.Width, bounds.Height - 4);
+                            }
+                            else
+                            {
+                                bounds.Width = (int)textSize.Width + Dpi.Width6;
+                                if (!bHasImage && button.IsOnMenuBar)
+                                {
+                                    bounds.Width += Dpi.Width6;
+                                    textDrawRect = new Rectangle(2, 2, bounds.Width, bounds.Height - 4);
+                                }
+                                else
+                                    textDrawRect = new Rectangle(2, 2, bounds.Width + Dpi.Width(button.HorizontalPadding - 4), bounds.Height - 4);
+                            }
+                        }
+                        bounds.Width += imageDrawRect.Right;
+
+                        if (imagePosition == eImagePosition.Right && imageDrawRect.Right > 0 && bHasImage)
+                        {
+                            textDrawRect.X = 3;
+                            imageDrawRect.X = bounds.Width - imageDrawRect.Width;
+                        }
+
+                        // Add Horizontal padding
+                        bounds.Width += Dpi.Width(button.HorizontalPadding);
+                    }
+                    else
+                    {
+                        // Image is on top or bottom
+                        // Calculate width, that is easy
+                        if (button.Orientation == eOrientation.Horizontal)
+                        {
+
+                            if (textSize.Width > imageSize.Width)
+                                bounds.Width = (int)textSize.Width + Dpi.Width(button.ImagePaddingHorizontal);
+                            else
+                                bounds.Width = imageSize.Width + Dpi.Width(button.ImagePaddingHorizontal);
+
+                            // Calculate item height 3 padding on top and bottom and 2 pixels distance between the image and text
+                            bounds.Height = (int)(imageSize.Height + textSize.Height + Dpi.Height(button.ImagePaddingVertical) /*10*/);
+
+                            // Add Horizontal/Vertical padding
+                            bounds.Width += Dpi.Width(button.HorizontalPadding);
+                            bounds.Height += Dpi.Height(button.VerticalPadding);
+
+                            if (imagePosition == eImagePosition.Top)
+                            {
+                                imageDrawRect = new Rectangle(0, Dpi.Height(button.VerticalPadding) / 2 + 2, bounds.Width, imageSize.Height/*+2*/);
+                                textDrawRect = new Rectangle((int)(bounds.Width - textSize.Width) / 2, imageDrawRect.Bottom, (int)textSize.Width, (int)textSize.Height + 5);
+                            }
+                            else
+                            {
+                                textDrawRect = new Rectangle((int)(bounds.Width - textSize.Width) / 2, Dpi.Height(button.VerticalPadding) / 2, (int)textSize.Width, (int)textSize.Height + 2);
+                                imageDrawRect = new Rectangle(0, textDrawRect.Bottom, bounds.Width, imageSize.Height + 5);
+                            }
+                        }
+                        else
+                        {
+                            if (textSize.Height > imageSize.Width && button.ButtonStyle != eButtonStyle.Default)
+                                bounds.Width = (int)textSize.Height + 6;
+                            else
+                                bounds.Width = imageSize.Width + 10;
+
+                            // Add Horizontal Padding
+                            bounds.Width += Dpi.Width(button.HorizontalPadding);
+
+                            // Calculate item height 3 padding on top and bottom and 2 pixels distance between the image and text
+                            if (button.ButtonStyle != eButtonStyle.Default || !bHasImage)
+                            {
+                                if (bHasImage)
+                                    bounds.Height = (int)(imageSize.Height + textSize.Width + Dpi.Width12);
+                                else
+                                    bounds.Height = (int)(textSize.Width + Dpi.Width6);
+                            }
+                            else
+                                bounds.Height = imageSize.Height + Dpi.Height6;
+
+                            if (imagePosition == eImagePosition.Top || imagePosition == eImagePosition.Left)
+                            {
+                                if (bHasImage)
+                                    imageDrawRect = new Rectangle(0, 0, bounds.Width, imageSize.Height + Dpi.Height6);
+                                textDrawRect = new Rectangle((int)(bounds.Width - textSize.Height) / 2, imageDrawRect.Bottom + Dpi.Width2, (int)textSize.Height, (int)textSize.Width + Dpi.Width5);
+                            }
+                            else
+                            {
+                                textDrawRect = new Rectangle((int)(bounds.Width - textSize.Height) / 2, Dpi.Height5, (int)textSize.Height, (int)textSize.Width + Dpi.Width5);
+                                if (bHasImage)
+                                    imageDrawRect = new Rectangle(0, textDrawRect.Bottom - Dpi.Height3, bounds.Width, imageSize.Height + Dpi.Height5);
+                            }
+
+                            // Add Vertical Padding
+                            bounds.Height += Dpi.Height(button.VerticalPadding);
+                        }
+                    }
+
+                    if (HasExpandPart(button))
+                    {
+                        subItemsRect = GetSubItemsButtonBounds(button, bounds, rightToLeft);
+                        // Add small button to expand the item
+                        Rectangle rTemp = subItemsRect;
+                        rTemp.Offset(bounds.Location);
+
+                        if (rightToLeft && !(objCtrl is RibbonBar &&
+                            (button.ImagePosition == eImagePosition.Top || button.ImagePosition == eImagePosition.Bottom)))
+                        {
+                            if (!textDrawRect.IsEmpty)
+                                textDrawRect.Offset(subItemsRect.Width + 1, 0);
+                            if (!imageDrawRect.IsEmpty && (button.Orientation == eOrientation.Horizontal && (imagePosition == eImagePosition.Left || imagePosition == eImagePosition.Right)))
+                                imageDrawRect.Offset(subItemsRect.Width, 0);
+                            bounds.X += subItemsRect.Width;
+                        }
+
+                        bounds = Rectangle.Union(bounds, rTemp);
+                    }
+                }
+            }
+            finally
+            {
+                g.TextRenderingHint = TextRenderingHint.SystemDefault;
+                g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.Default;
+                g.Dispose();
+            }
+            objCtrl = null;
+
+            button.SetDisplayRectangle(bounds);
+            button.ImageDrawRect = imageDrawRect;
+            button.TextDrawRect = textDrawRect;
+            button.SubItemsRect = subItemsRect;
+        }
+
+        private static bool HasExpandPart(ButtonItem button)
+        {
+            return (button.SubItems.Count > 0 || button.PopupType == ePopupType.Container) && button.ShowSubItems && !button.IsOnMenuBar &&
+                        !(button.TextMarkupBody != null && button.TextMarkupBody.HasExpandElement && button.ButtonStyle != eButtonStyle.Default);
+        }
+
+        //private static ButtonTextSize GetTextSize(ButtonItem button, int containerWidth, bool measureShortcut)
+        //{
+        //    ButtonTextSize textSize = new ButtonTextSize();
+        //    Control ctrl = button.ContainerControl as Control;
+        //    Graphics g = BarFunctions.CreateGraphics(ctrl);
+        //    try
+        //    {
+        //        eTextFormat stringFormat = GetTextFormat(button);
+        //        Font font = button.GetFont(null);
+
+        //        if (button.TextMarkupBody == null)
+        //        {
+        //            textSize.TextSize = TextDrawing.MeasureString(g, ButtonItemPainter.GetDrawText(button.Text), font, containerWidth, stringFormat);
+        //        }
+        //        else
+        //        {
+        //            Size availSize = new Size(containerWidth, 1);
+        //            if (containerWidth == 0)
+        //                availSize.Width = 1600;
+        //            TextMarkup.MarkupDrawContext d = new TextMarkup.MarkupDrawContext(g, font, Color.Empty, false);
+        //            button.TextMarkupBody.Measure(availSize, d);
+        //            availSize = button.TextMarkupBody.Bounds.Size;
+        //            if (containerWidth != 0)
+        //                availSize.Width = containerWidth;
+        //            d.RightToLeft = button.IsRightToLeft;
+        //            button.TextMarkupBody.Arrange(new Rectangle(0, 0, availSize.Width, availSize.Height), d);
+
+        //            textSize.TextSize = button.TextMarkupBody.Bounds.Size;
+        //        }
+
+        //        if (measureShortcut && button.DrawShortcutText != "")
+        //            textSize.ShortcutTextSize = TextDrawing.MeasureString(g, button.DrawShortcutText, font, 0, stringFormat);
+        //    }
+        //    finally
+        //    {
+        //        g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.Default;
+        //        g.TextRenderingHint = TextRenderingHint.SystemDefault;
+        //        g.Dispose();
+        //    }
+        //    return textSize;
+        //}
+
+        private static Size GetLayoutImageSize(ButtonItem button, bool hasImage, bool isOnMenu, bool startButtonType)
+        {
+            // Get the right image size that we will use for calculation
+            Size imageSize = Size.Empty;
+            if (button.Parent != null && button.ImageFixedSize.IsEmpty && button.UseParentSubItemsImageSize)
+            {
+                ImageItem parentImageItem = button.Parent as ImageItem;
+                if (parentImageItem != null && !parentImageItem.SubItemsImageSize.IsEmpty)
+                {
+                    if (!hasImage || isOnMenu)
+                        imageSize = new Size(parentImageItem.SubItemsImageSize.Width, parentImageItem.SubItemsImageSize.Height);
+                    else
+                    {
+                        if (button.Orientation == eOrientation.Horizontal)
+                            imageSize = new Size(button.ImageSize.Width, Math.Max(parentImageItem.SubItemsImageSize.Height, button.ImageSize.Height));
+                        else
+                            imageSize = new Size(Math.Max(parentImageItem.SubItemsImageSize.Width, button.ImageSize.Width), button.ImageSize.Height);
+                    }
+                }
+                else
+                    imageSize = button.ImageSize;
+            }
+            else if(startButtonType && !button.ImageFixedSize.IsEmpty)
+                imageSize = button.ImageFixedSize;
+            else if (!button.ImageFixedSize.IsEmpty)
+                imageSize = Dpi.Size(button.ImageFixedSize);
+            else
+                imageSize = button.ImageSize;
+
+            if (startButtonType)
+            {
+                Office2007Renderer renderer = GlobalManager.Renderer as Office2007Renderer;
+                if (renderer != null && renderer.ColorTable is Office2007ColorTable)
+                {
+                    Office2007ColorTable table = renderer.ColorTable as Office2007ColorTable;
+                    if (table.RibbonControl.StartButtonDefault != null)
+                    {
+                        if (imageSize.Width < table.RibbonControl.StartButtonDefault.Width)
+                            imageSize.Width = table.RibbonControl.StartButtonDefault.Width;
+                        if (imageSize.Height < table.RibbonControl.StartButtonDefault.Height)
+                            imageSize.Height = table.RibbonControl.StartButtonDefault.Height;
+                    }
+                }
+                imageSize = Dpi.ImageSize(imageSize);
+            }
+
+            return imageSize;
+        }
+
+        public static Rectangle GetSubItemsButtonBounds(ButtonItem button, Rectangle buttonBounds, bool rightToLeft)
+        {
+            Rectangle subItemsRect = Rectangle.Empty;
+
+            int subItemsExpandWidth = Dpi.Width(button.SubItemsExpandWidth);
+            if (button.ContainerControl is RibbonBar && (button.ImagePosition == eImagePosition.Top || button.ImagePosition == eImagePosition.Bottom))
+            {
+                subItemsRect = new Rectangle(0, buttonBounds.Height, buttonBounds.Width, subItemsExpandWidth);
+            }
+            else
+            {
+                // Add small button to expand the item
+                if (button.Orientation == eOrientation.Horizontal)
+                {
+                    if (button.IsThemed)
+                    {
+                        if (rightToLeft)
+                            subItemsRect = new Rectangle(0, 0, subItemsExpandWidth, buttonBounds.Height);
+                        else
+                            subItemsRect = new Rectangle(buttonBounds.Width, 0, subItemsExpandWidth, buttonBounds.Height);
+                    }
+                    else
+                    {
+                        if (rightToLeft)
+                            subItemsRect = new Rectangle(0, 0, subItemsExpandWidth, buttonBounds.Height);
+                        else
+                            subItemsRect = new Rectangle(buttonBounds.Width + 1, 0, subItemsExpandWidth, buttonBounds.Height);
+                    }
+                }
+                else
+                {
+                    subItemsRect = new Rectangle(0, buttonBounds.Height - 2, buttonBounds.Width, subItemsExpandWidth);
+                }
+            }
+
+            return subItemsRect;
+        }
+
+        public static eTextFormat GetTextFormat(ButtonItem button)
+        {
+            eTextFormat format = eTextFormat.Default;
+            if (!button._FitContainer)
+            {
+                format |= eTextFormat.SingleLine;
+            }
+            else
+                format |= eTextFormat.WordBreak;
+
+            format |= eTextFormat.VerticalCenter;
+            return format;
+        }
+
+        public static void LayoutButtonX(ButtonItem button)
+        {
+            Control objCtrl = button.ContainerControl as Control;
+            ButtonX btnX = button.ContainerControl as ButtonX;
+            if (!BarFunctions.IsHandleValid(objCtrl))
+                return;
+            bool isOnMenu = button.IsOnMenu;
+            if (isOnMenu && button.Parent is ItemContainer)
+                isOnMenu = false;
+            bool bHasImage = false;
+
+            if (!string.IsNullOrEmpty(button.SymbolRealized))
+            {
+                bHasImage = true;
+            }
+            else
+            {
+                using (CompositeImage buttonImage = button.GetImage())
+                {
+                    if (buttonImage != null)
+                        bHasImage = true;
+                }
+            }
+
+            eImagePosition imagePosition = button.ImagePosition;
+            bool rightToLeft = (objCtrl.RightToLeft == RightToLeft.Yes);
+
+            Rectangle textDrawRect = Rectangle.Empty;
+            Rectangle imageDrawRect = Rectangle.Empty;
+            Rectangle subItemsRect = Rectangle.Empty;
+            Rectangle bounds = button.Bounds;
+
+            // Calculate sub-items rectangle
+            if (button.SubItems.Count > 0 && button.ShowSubItems &&
+                        !(button.TextMarkupBody != null && button.TextMarkupBody.HasExpandElement && button.ButtonStyle != eButtonStyle.Default))
+            {
+                // Add small button to expand the item
+                int subItemsExpandWidth = Dpi.Width(button.SubItemsExpandWidth);
+                if (button.Orientation == eOrientation.Horizontal)
+                {
+                    if (rightToLeft)
+                        subItemsRect = new Rectangle(0, 0, subItemsExpandWidth, bounds.Height);
+                    else
+                        subItemsRect = new Rectangle(bounds.Width - subItemsExpandWidth, 0, subItemsExpandWidth, bounds.Height);
+                    if (rightToLeft)
+                        bounds.X += subItemsExpandWidth + 1;
+                    bounds.Width -= subItemsExpandWidth + 1;
+                }
+                else
+                {
+                    subItemsRect = new Rectangle(0, bounds.Height - subItemsExpandWidth, bounds.Width, subItemsExpandWidth);
+                    bounds.Height -= subItemsExpandWidth + 1;
+                }
+            }
+
+            // Adjust image position
+            if (rightToLeft && button.Orientation == eOrientation.Horizontal)
+            {
+                if (imagePosition == eImagePosition.Left)
+                    imagePosition = eImagePosition.Right;
+                else if (imagePosition == eImagePosition.Right)
+                    imagePosition = eImagePosition.Left;
+            }
+
+            int measureStringWidth = 0;
+
+            measureStringWidth = bounds.Width;
+
+            Graphics g = BarFunctions.CreateGraphics(objCtrl);
+            try
+            {
+
+                // Get the right image size that we will use for calculation
+                Size imageSize = Size.Empty;
+                if (!string.IsNullOrEmpty(button.SymbolRealized))
+                {
+                    Font symFont = Symbols.GetFont(button.SymbolSize, button.SymbolSet);
+                    imageSize = TextDrawing.MeasureStringLegacy(g, button.SymbolRealized, symFont, Size.Empty, eTextFormat.Default);
+                    int descent = (int)Math.Ceiling((symFont.FontFamily.GetCellDescent(symFont.Style) *
+                    symFont.Size / symFont.FontFamily.GetEmHeight(symFont.Style)));
+                    imageSize.Height -= descent;
+                    button.ImageSize = imageSize;
+                }
+                else
+                {
+                    if (!button.ImageFixedSize.IsEmpty)
+                        imageSize = button.ImageFixedSize;
+                    else
+                        imageSize = button.ImageSize;
+                }
+
+                if (bHasImage && (imagePosition == eImagePosition.Left || imagePosition == eImagePosition.Right))
+                {
+                    if (btnX != null)
+                        measureStringWidth -= imageSize.Width + btnX.ImageTextSpacing * 2 + 3;
+                    else
+                        measureStringWidth -= (imageSize.Width + 8);
+                }
+
+                if (bHasImage && !imageSize.IsEmpty && btnX != null && btnX.ImageTextSpacing != 0)
+                {
+                    if (imagePosition == eImagePosition.Left || imagePosition == eImagePosition.Right)
+                        imageSize.Width += btnX.ImageTextSpacing * 2;
+                    else
+                        imageSize.Height += btnX.ImageTextSpacing * 2;
+                }
+
+                // Measure string
+                Font font = button.GetFont(null, true);
+
+                SizeF textSize = SizeF.Empty;
+                eTextFormat stringFormat = eTextFormat.Default | eTextFormat.VerticalCenter;
+#if FRAMEWORK20
+                if (BarFunctions.IsWindowsXP && BarUtilities.UseTextRenderer) stringFormat |= eTextFormat.LeftAndRightPadding;
+#endif
+                if (btnX != null || objCtrl is RibbonBar && button.RibbonWordWrap) stringFormat |= eTextFormat.WordBreak;
+                if (btnX != null && !btnX.UseMnemonic) stringFormat |= eTextFormat.NoPrefix;
+
+                if (button.Text != "")
+                {
+                    if (button.TextMarkupBody == null)
+                    {
+                        if (button.Orientation == eOrientation.Vertical && !isOnMenu)
+                            textSize = TextDrawing.MeasureStringLegacy(g, ButtonItemPainter.GetDrawText(button.Text), font, new Size(measureStringWidth, 0), stringFormat);
+                        else
+                        {
+                            textSize = TextDrawing.MeasureString(g, ButtonItemPainter.GetDrawText(button.Text), font, measureStringWidth, stringFormat);
+#if FRAMEWORK20
+                            if (BarFunctions.IsWindowsXP && BarUtilities.UseTextRenderer) textSize.Width += 2;
+#endif
+                        }
+                    }
+                    else
+                    {
+                        Size availSize = new Size(measureStringWidth, 1);
+                        if (measureStringWidth == 0)
+                            availSize.Width = 1600;
+                        TextMarkup.MarkupDrawContext d = new TextMarkup.MarkupDrawContext(g, font, Color.Empty, false);
+                        d.RightToLeft = rightToLeft;
+                        button.TextMarkupBody.Measure(availSize, d);
+                        availSize = button.TextMarkupBody.Bounds.Size;
+                        button.TextMarkupBody.Arrange(new Rectangle(0, 0, availSize.Width, availSize.Height), d);
+
+                        textSize = button.TextMarkupBody.Bounds.Size;
+                    }
+                }
+
+                if (button.Orientation == eOrientation.Horizontal && (imagePosition == eImagePosition.Left || imagePosition == eImagePosition.Right))
+                {
+                    // Recalc size for the Bar button
+                    // Add 8 pixel padding to the image size, 4 pixels on each side
+                    if (button.ButtonStyle != eButtonStyle.Default || !bHasImage)
+                        imageSize.Width += 4;
+
+                    imageDrawRect = Rectangle.Empty;
+                    if (button.ButtonStyle != eButtonStyle.TextOnlyAlways && bHasImage)
+                    {
+                        // We know the image position now, we will center it into this area
+                        if (imagePosition == eImagePosition.Left)
+                        {
+                            if (btnX != null && btnX.TextAlignment == eButtonTextAlignment.Left)
+                                imageDrawRect = new Rectangle(2, (bounds.Height - imageSize.Height) / 2, imageSize.Width, imageSize.Height);
+                            else if (btnX != null && btnX.TextAlignment == eButtonTextAlignment.Right)
+                                imageDrawRect = new Rectangle(bounds.Width - (imageSize.Width + (int)Math.Ceiling(textSize.Width) + 4), (bounds.Height - imageSize.Height) / 2, imageSize.Width, imageSize.Height);
+                            else if (btnX != null)
+                                imageDrawRect = new Rectangle(/*bounds.X+*/(int)(bounds.Width - (textSize.Width + imageSize.Width)) / 2, (bounds.Height - imageSize.Height) / 2, imageSize.Width, imageSize.Height);
+                            else
+                            {
+                                if (subItemsRect.IsEmpty && button.ButtonStyle == eButtonStyle.Default)
+                                    imageDrawRect = new Rectangle((bounds.Width - imageSize.Width) / 2, (bounds.Height - imageSize.Height) / 2, imageSize.Width, imageSize.Height);
+                                else
+                                    imageDrawRect = new Rectangle(0, (bounds.Height - imageSize.Height) / 2, imageSize.Width, imageSize.Height);
+                            }
+                        }
+                        else
+                        {
+                            if (btnX != null && btnX.TextAlignment == eButtonTextAlignment.Left)
+                                imageDrawRect = new Rectangle((int)textSize.Width + 4, (bounds.Height - imageSize.Height) / 2, imageSize.Width, imageSize.Height);
+                            else if (btnX != null && btnX.TextAlignment == eButtonTextAlignment.Right)
+                                imageDrawRect = new Rectangle(bounds.Width - imageSize.Width, (bounds.Height - imageSize.Height) / 2, imageSize.Width, imageSize.Height);
+                            else if (btnX != null)
+                                imageDrawRect = new Rectangle(bounds.Width - (int)(bounds.Width - (textSize.Width + imageSize.Width)) / 2 - (imageSize.Width), (bounds.Height - imageSize.Height) / 2, imageSize.Width, imageSize.Height);
+                            else
+                                imageDrawRect = new Rectangle(bounds.Width - imageSize.Width, (bounds.Height - imageSize.Height) / 2, imageSize.Width, imageSize.Height);
+                        }
+                    }
+
+                    // Draw Text only if needed
+                    textDrawRect = Rectangle.Empty;
+                    if (button.ButtonStyle != eButtonStyle.Default || !bHasImage)
+                    {
+                        if (bHasImage)
+                        {
+                            if (imagePosition == eImagePosition.Left)
+                            {
+                                if (btnX != null && btnX.TextAlignment == eButtonTextAlignment.Center)
+                                    textDrawRect = new Rectangle(imageDrawRect.Right + 1, (int)((bounds.Height - textSize.Height) / 2), (int)textSize.Width, (int)textSize.Height);
+                                else if (btnX != null && (btnX.TextAlignment == eButtonTextAlignment.Right || btnX.TextAlignment == eButtonTextAlignment.Left))
+                                    textDrawRect = new Rectangle(imageDrawRect.Right + 1, (int)((bounds.Height - textSize.Height) / 2), bounds.Width - 3 - imageDrawRect.Width, (int)textSize.Height);
+                                else
+                                    textDrawRect = new Rectangle(imageDrawRect.Right + 1, (int)((bounds.Height - textSize.Height) / 2), bounds.Width - 3 - imageDrawRect.Width, (int)textSize.Height);
+                            }
+                            else
+                            {
+                                if (btnX != null && btnX.TextAlignment == eButtonTextAlignment.Center)
+                                    textDrawRect = new Rectangle((int)(imageDrawRect.X - textSize.Width) - 1, (int)((bounds.Height - textSize.Height) / 2), (int)textSize.Width, (int)textSize.Height);
+                                else if (btnX != null && btnX.TextAlignment == eButtonTextAlignment.Right)
+                                    textDrawRect = new Rectangle(imageDrawRect.X - ((int)textSize.Width + 4), (int)((bounds.Height - textSize.Height) / 2), (int)textSize.Width + 2, (int)textSize.Height);
+                                else
+                                    textDrawRect = new Rectangle(3, (int)((bounds.Height - textSize.Height) / 2), imageDrawRect.X - 2, (int)textSize.Height);
+                            }
+                        }
+                        else
+                        {
+                            if (btnX != null && btnX.TextAlignment == eButtonTextAlignment.Center || button._FixedSizeCenterText)
+                                textDrawRect = new Rectangle(/*bounds.X+*/(int)((bounds.Width - textSize.Width) / 2), (int)((bounds.Height - textSize.Height) / 2), (int)textSize.Width, (int)textSize.Height);
+                            else
+                                textDrawRect = new Rectangle(/*bounds.X +*/ 3, (int)((bounds.Height - textSize.Height) / 2), bounds.Width - 6, (int)textSize.Height);
+                        }
+                    }
+                }
+                else
+                {
+                    // Image is on top or bottom
+                    // Calculate width, that is easy
+                    if (button.Orientation == eOrientation.Horizontal)
+                    {
+
+                        if (imagePosition == eImagePosition.Top)
+                        {
+                            imageDrawRect = new Rectangle(0, (int)(bounds.Height - (imageSize.Height + textSize.Height)) / 2, bounds.Width, imageSize.Height/*+2*/);
+                            textDrawRect = new Rectangle(0, imageDrawRect.Bottom, (int)textSize.Width, (int)textSize.Height + 5);
+                        }
+                        else
+                        {
+                            textDrawRect = new Rectangle((int)(bounds.Width - textSize.Width) / 2, (int)(bounds.Height - (imageSize.Height + textSize.Height)) / 2, (int)textSize.Width, (int)textSize.Height);
+                            imageDrawRect = new Rectangle(0, textDrawRect.Bottom, bounds.Width, imageSize.Height + 5);
+                        }
+                    }
+                    else
+                    {
+                        if (imagePosition == eImagePosition.Top || imagePosition == eImagePosition.Left)
+                        {
+                            if (bHasImage)
+                            {
+                                if (subItemsRect.IsEmpty && button.ButtonStyle == eButtonStyle.Default)
+                                    imageDrawRect = new Rectangle((bounds.Width - imageSize.Width) / 2, (bounds.Height - imageSize.Height) / 2, imageSize.Width, imageSize.Height);
+                                else
+                                    imageDrawRect = new Rectangle(0, 0, bounds.Width, imageSize.Height + 6);
+                            }
+                            textDrawRect = new Rectangle((int)(bounds.Width - textSize.Height) / 2, imageDrawRect.Bottom + 2, (int)textSize.Height, (int)textSize.Width + 5);
+                        }
+                        else
+                        {
+                            textDrawRect = new Rectangle((int)(bounds.Width - textSize.Width) / 2, 0, (int)textSize.Height, (int)textSize.Width + 5);
+                            if (bHasImage)
+                                imageDrawRect = new Rectangle(0, textDrawRect.Bottom + 2, bounds.Width, imageSize.Height + 5);
+                        }
+                    }
+                }
+            }
+            finally
+            {
+                g.TextRenderingHint = TextRenderingHint.SystemDefault;
+                g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.Default;
+                g.Dispose();
+            }
+
+            button.ImageDrawRect = imageDrawRect;
+            button.TextDrawRect = textDrawRect;
+            button.SubItemsRect = subItemsRect;
+        }
+
+        private struct ButtonTextSize
+        {
+            public Size TextSize;
+            public Size ShortcutTextSize;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/ButtonX/ButtonX.cs b/PROMS/DotNetBar Source Code/ButtonX/ButtonX.cs
new file mode 100644
index 00000000..211bd86c
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/ButtonX/ButtonX.cs	
@@ -0,0 +1,1542 @@
+using System;
+using System.Text;
+using System.Windows.Forms;
+using System.ComponentModel;
+using System.Drawing;
+using System.Collections;
+using System.Drawing.Drawing2D;
+using System.Drawing.Text;
+using System.Drawing.Design;
+
+namespace DevComponents.DotNetBar
+{
+    [ToolboxBitmap(typeof(ButtonX),"ButtonX.ButtonX.ico"),ToolboxItem(true), DefaultEvent("Click"), Designer("DevComponents.DotNetBar.Design.ButtonXDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf"), System.Runtime.InteropServices.ComVisible(false)]
+    public class ButtonX : PopupItemControl, IButtonControl, ICommandSource
+    {
+        #region Events
+        /// <summary>
+        /// Occurs when Checked property has changed.
+        /// </summary>
+        [Description("Occurs when Checked property has changed.")]
+        public event EventHandler CheckedChanged;
+        #endregion
+
+        #region Private Variables
+        private ButtonItem m_Button = null;
+        private ColorScheme m_ColorScheme = null;
+        private DialogResult m_DialogResult = DialogResult.None;
+        private bool m_IsDefault = false;
+        private bool m_FadeEffect = true;
+        private eButtonTextAlignment m_TextAlignment = eButtonTextAlignment.Center;
+        private Size m_PreferredSize = Size.Empty;
+        #endregion
+
+        #region Constructor
+        public ButtonX()
+        {
+            this.IsAccessible = true;
+            this.AccessibleRole = AccessibleRole.PushButton;
+            base.SetStyle(ControlStyles.StandardDoubleClick | ControlStyles.StandardClick, false);
+            StyleManager.Register(this);
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                StyleManager.Unregister(this);
+                //m_Button.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        /// <summary>
+        /// Called by StyleManager to notify control that style on manager has changed and that control should refresh its appearance if
+        /// its style is controlled by StyleManager.
+        /// </summary>
+        /// <param name="newStyle">New active style.</param>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void StyleManagerStyleChanged(eDotNetBarStyle newStyle)
+        {
+            this.Style = this.Style;
+        }
+
+        protected virtual ButtonItem CreateButtonItem()
+        {
+            return new ButtonItem();
+        }
+
+        protected override PopupItem CreatePopupItem()
+        {
+            m_Button = CreateButtonItem();
+            m_Button.GlobalItem = false;
+            m_Button.Displayed = true;
+            m_Button.ContainerControl = this;
+            m_Button.ColorTable = eButtonColor.BlueWithBackground;
+            m_Button.ButtonStyle = eButtonStyle.ImageAndText;
+            m_Button._FitContainer = true;
+            m_Button.Style = eDotNetBarStyle.Office2007;
+            m_Button.SetOwner(this);
+            m_Button.CheckedChanged += new EventHandler(OnCheckedChanged);
+            return m_Button;
+        }
+
+        private void OnCheckedChanged(object sender, EventArgs e)
+        {
+            if (CheckedChanged != null)
+                CheckedChanged(this, e);
+        }
+
+        /// <summary>
+        /// Creates new accessibility instance.
+        /// </summary>
+        /// <returns>Reference to AccessibleObject.</returns>
+        protected override AccessibleObject CreateAccessibilityInstance()
+        {
+            return new ButtonXAccessibleObject(this);
+        }
+        #endregion
+
+        #region Internal Implementation
+        [EditorBrowsable(EditorBrowsableState.Never), Browsable(false)]
+        protected internal ButtonItem ButtonItem
+        {
+            get { return (m_Button); }
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never), Browsable(false)]
+        protected bool IsMouseDown
+        {
+            get
+            {
+                return m_Button.IsMouseDown;
+            }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        protected void StopFade()
+        {
+            m_Button.StopFade();
+        }
+        protected override void ScaleControl(SizeF factor, BoundsSpecified specified)
+        {
+            base.ScaleControl(factor, specified);
+            m_Button.NotifyScaleItem(factor);
+        }
+        /// <summary>
+        /// Gets or sets whether text-markup support is enabled for controls Text property. Default value is true.
+        /// Set this property to false to display HTML or other markup in the control instead of it being parsed as text-markup.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance"), Description("Indicates whether text-markup support is enabled for controls Text property.")]
+        public bool EnableMarkup
+        {
+            get { return m_Button.EnableMarkup; }
+            set
+            {
+                m_Button.EnableMarkup = value;
+            }
+        }
+
+        /// <summary>
+        /// Starts the button pulse effect which alternates slowly between the mouse over and the default state. The pulse effect
+        /// continues indefinitely until it is stopped by call to StopPulse method.
+        /// </summary>
+        public void Pulse()
+        {
+            m_Button.Pulse();
+        }
+
+        /// <summary>
+        /// Starts the button pulse effect which alternates slowly between the mouse over and the default state. Pulse effect
+        /// will alternate between the pulse state for the number of times specified by the pulseBeatCount parameter.
+        /// </summary>
+        /// <param name="pulseBeatCount">Specifies the number of times button alternates between pulse states. 0 indicates indefinite pulse</param>
+        public void Pulse(int pulseBeatCount)
+        {
+            m_Button.Pulse(pulseBeatCount);
+        }
+
+        /// <summary>
+        /// Stops the button Pulse effect.
+        /// </summary>
+        public void StopPulse()
+        {
+            m_Button.StopPulse();
+        }
+
+        /// <summary>
+        /// Gets whether the button is currently pulsing, alternating slowly between the mouse over and default state.
+        /// </summary>
+        [Browsable(false)]
+        public bool IsPulsing
+        {
+            get { return m_Button.IsPulsing; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether pulse effect started with StartPulse method stops automatically when mouse moves over the button. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Browsable(true), Category("Behavior"), Description("Indicates whether pulse effect started with Pulse method stops automatically when mouse moves over the button.")]
+        public bool StopPulseOnMouseOver
+        {
+            get { return m_Button.StopPulseOnMouseOver; }
+            set { m_Button.StopPulseOnMouseOver = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the pulse speed. The value must be greater than 0 and less than 128. Higher values indicate faster pulse. Default value is 12.
+        /// </summary>
+        [Browsable(true), DefaultValue(12), Category("Behavior"), Description("Indicates pulse speed. The value must be greater than 0 and less than 128.")]
+        public int PulseSpeed
+        {
+            get { return m_Button.PulseSpeed; }
+            set
+            {
+                m_Button.PulseSpeed = value;
+            }
+        }
+
+        protected override void OnEnabledChanged(EventArgs e)
+        {
+            if (!this.Enabled && this.IsPulsing) this.StopPulse(); 
+            base.OnEnabledChanged(e);
+        }
+
+        /// <summary>
+        /// Sets fixed size of the image. Image will be scaled and painted it size specified.
+        /// </summary>
+        [Browsable(true)]
+        public System.Drawing.Size ImageFixedSize
+        {
+            get { return m_Button.ImageFixedSize; }
+            set
+            {
+                m_Button.ImageFixedSize = value;
+                this.RecalcLayout();
+            }
+        }
+        /// <summary>
+        /// Gets whether ImageFixedSize property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeImageFixedSize()
+        {
+            return m_Button.ShouldSerializeImageFixedSize();
+        }
+        
+        /// <summary>
+        /// Gets or sets the text alignment. Applies only when button text is not composed using text markup. Default value is center.
+        /// </summary>
+        [Browsable(true), DefaultValue(eButtonTextAlignment.Center), Category("Appearance"), Description("Indicates text alignment. Applies only when button text is not composed using text markup. Default value is center.")]
+        public eButtonTextAlignment TextAlignment
+        {
+            get { return m_TextAlignment; }
+            set
+            {
+                m_TextAlignment = value;
+                this.RecalcLayout();
+            }
+        }
+
+        private bool _CallBasePaintBackground = true;
+        /// <summary>
+        /// Gets or sets whether during painting OnPaintBackground on base control is called when BackColor=Transparent.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool CallBasePaintBackground
+        {
+            get { return _CallBasePaintBackground; }
+            set
+            {
+                _CallBasePaintBackground = value;
+            }
+        }
+
+        internal void InternalPaint(PaintEventArgs e)
+        {
+            OnPaint(e);
+        }
+
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            if ((this.BackColor.IsEmpty || this.BackColor == Color.Transparent || this.BackgroundImage != null) && _CallBasePaintBackground)
+            {
+                base.OnPaintBackground(e);
+            }
+            else
+            {
+                DisplayHelp.FillRectangle(e.Graphics, this.ClientRectangle, this.BackColor, System.Drawing.Color.Empty);
+            }
+
+            Rectangle r = this.ClientRectangle;
+            Graphics g=e.Graphics;
+
+            ColorScheme cs = this.GetColorScheme();
+
+            if (!IsThemed)
+            {
+                if (BarFunctions.IsOffice2007Style(m_Button.EffectiveStyle))
+                {
+                    //int cornerSize = this.CornerSize;
+                    //SmoothingMode sm = g.SmoothingMode;
+                    //g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.HighQuality;
+                    //DisplayHelp.FillRoundedRectangle(g, r, cornerSize, cs.BarBackground, cs.BarBackground2, cs.BarBackgroundGradientAngle);
+                    //DisplayHelp.DrawRoundedRectangle(g, cs.BarDockedBorder, r, cornerSize);
+                    //g.SmoothingMode = sm;
+                }
+                else
+                {
+                    DisplayHelp.FillRectangle(g, r, cs.BarBackground, cs.BarBackground2, cs.BarBackgroundGradientAngle);
+                    DisplayHelp.DrawRectangle(g, cs.BarDockedBorder, r);
+                }
+            }
+
+            SmoothingMode sm = g.SmoothingMode;
+            TextRenderingHint th = g.TextRenderingHint;
+
+            ItemPaintArgs pa = GetItemPaintArgs(g);
+            
+            if (this.AntiAlias)
+            {
+                pa.Graphics.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.AntiAlias;
+                pa.Graphics.TextRenderingHint = DisplayHelp.AntiAliasTextRenderingHint;
+            }
+
+            IShapeDescriptor shape = GetButtonShape();
+            if (!(shape is RoundRectangleShapeDescriptor))
+            {
+                Rectangle rs = this.ClientRectangle;
+                rs.Y--;
+                rs.X--;
+                rs.Width++;
+                rs.Height++;
+                if (shape.CanDrawShape(rs))
+                {
+                    using (GraphicsPath path = shape.GetShape(rs))
+                        g.SetClip(path);
+                }
+            }
+
+            m_Button.Paint(pa);
+
+            g.SmoothingMode = sm;
+            g.TextRenderingHint = th;
+
+            base.OnPaint(e);
+        }
+
+        protected override void OnResize(EventArgs e)
+        {
+            RecalcLayout();
+            base.OnResize(e);
+        }
+
+        protected override void OnTextChanged(EventArgs e)
+        {
+            m_Button.Text = this.Text;
+            UpdateButtonAutoSize();
+            base.OnTextChanged(e);
+        }
+
+        private void UpdateButtonAutoSize()
+        {
+            InvalidateAutoSize();
+#if FRAMEWORK20
+            this.AdjustSize();
+#endif
+            this.RecalcLayout();
+        }
+
+        protected override void OnFontChanged(EventArgs e)
+        {
+            base.OnFontChanged(e);
+            InvalidateAutoSize();
+        }
+
+        //protected override void OnForeColorChanged(EventArgs e)
+        //{
+        //    if (this.ForeColor != SystemColors.ControlText)
+        //        m_Button.ForeColor = this.ForeColor;
+        //    else
+        //        m_Button.ForeColor = Color.Empty;
+
+        //    base.OnForeColorChanged(e);
+        //}
+
+        protected override void RecalcSize()
+        {
+            m_Button.Bounds = this.ClientRectangle;
+            m_Button.RecalcSize();
+            m_Button.Bounds = this.ClientRectangle;
+        }
+
+        private bool _IsSpaceKeyDown = false;
+        protected override void OnKeyDown(KeyEventArgs e)
+        {
+            if(e.KeyCode == Keys.Space && !m_Button.Expanded)
+            {
+                if (m_Button.GetShouldAutoExpandOnClick())
+                    m_Button.Expanded = true;
+                else
+                    m_Button.SetMouseDown(true);
+                this.Invalidate();
+            }
+            _IsSpaceKeyDown = (e.KeyCode == Keys.Space);
+            base.OnKeyDown(e);
+        }
+
+        protected override void OnKeyUp(KeyEventArgs e)
+        {
+            if (e.KeyCode == Keys.Space && _IsSpaceKeyDown && !m_Button.Expanded)
+            {
+                m_Button.SetMouseDown(false);
+                this.Invalidate();
+                PerformClick();
+            }
+            _IsSpaceKeyDown = false;
+            base.OnKeyUp(e);
+        }
+
+        protected override void OnMouseEnter(EventArgs e)
+        {
+            m_Button.InternalMouseEnter();
+            base.OnMouseEnter(e);
+        }
+
+        protected override void OnMouseMove(MouseEventArgs e)
+        {
+            m_Button.InternalMouseMove(e);
+            base.OnMouseMove(e);
+        }
+
+        protected override void OnMouseLeave(EventArgs e)
+        {
+            m_Button.InternalMouseLeave();
+            base.OnMouseLeave(e);
+        }
+
+        protected override void OnMouseHover(EventArgs e)
+        {
+            m_Button.InternalMouseHover();
+            base.OnMouseHover(e);
+        }
+
+        private Point _MouseDownPoint = Point.Empty;
+        protected override void OnMouseDown(MouseEventArgs e)
+        {
+            if (e.Button == MouseButtons.Left)
+            {
+                if (!this.Focused && this.CanSelect && _FocusOnLeftMouseButtonDown)
+                {
+                    if (!this.Focus())
+                        return;
+                }
+                _MouseDownPoint = new Point(e.X, e.Y);
+            }
+
+            m_Button.InternalMouseDown(e);
+            base.OnMouseDown(e);
+        }
+
+        private bool _FocusOnLeftMouseButtonDown = true;
+        /// <summary>
+        /// Gets or sets whether button is focused when pressed using left mouse button. Default value is true.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool FocusOnLeftMouseButtonDown
+        {
+            get { return _FocusOnLeftMouseButtonDown; }
+            set
+            {
+                _FocusOnLeftMouseButtonDown = value;
+            }
+        }
+
+        protected override void OnMouseUp(MouseEventArgs e)
+        {
+            m_Button.InternalMouseUp(e);
+            if (e.Button == MouseButtons.Left && this.ClientRectangle.Contains(e.X, e.Y) && !_MouseDownPoint.IsEmpty)
+            {
+#if FRAMEWORK20
+                this.OnMouseClick(e);
+#endif
+                this.OnClick(e);
+            }
+            _MouseDownPoint = Point.Empty;
+            base.OnMouseUp(e);
+        }
+
+        protected override void OnVisibleChanged(EventArgs e)
+        {
+            if(m_Button.IsMouseOver)
+                m_Button.InternalMouseLeave();
+
+            base.OnVisibleChanged(e);
+        }
+
+        private bool IsImageSet
+        {
+            get
+            {
+                if (!string.IsNullOrEmpty(this.Symbol))
+                    return true;
+                CompositeImage image = m_Button.GetImage();
+                bool imageSet = image != null;
+                if (image != null)
+                    image.Dispose();
+                return imageSet;
+            }
+        }
+        protected override void OnClick(EventArgs e)
+        {
+            // Ignore Click event if it is fired when click occurred on sub items rectangle...
+            if (!m_Button.SubItemsRect.IsEmpty)
+            {
+                Point p = this.PointToClient(Control.MousePosition);
+                if (m_Button.SubItemsRect.Contains(p))
+                    return;
+            }
+            
+            if (this.SplitButton && !m_Button.TextDrawRect.IsEmpty && IsImageSet)
+            {
+                Point p = this.PointToClient(Control.MousePosition);
+                if (m_Button.TextDrawRect.Contains(p))
+                    return;
+            }
+
+            Form form1 = this.FindForm();
+            if (form1 != null)
+            {
+                form1.DialogResult = this.DialogResult;
+            }
+
+            base.OnClick(e);
+
+            if(ExecuteCommandOnClick)
+                ExecuteCommand();
+        }
+
+        /// <summary>
+        /// Gets whether command is executed when button is clicked.
+        /// </summary>
+        protected virtual bool ExecuteCommandOnClick
+        {
+            get { return true; }
+        }
+
+        protected override void OnGotFocus(EventArgs e)
+        {
+            m_Button.OnGotFocus();
+            base.OnGotFocus(e);
+        }
+
+        protected override void OnLostFocus(EventArgs e)
+        {
+            m_Button.OnLostFocus();
+            base.OnLostFocus(e);
+        }
+
+        /// <summary>
+        /// Gets or sets the color of the Symbol.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates color of the Symbol.")]
+        public Color SymbolColor
+        {
+            get { return m_Button.SymbolColor; }
+            set { m_Button.SymbolColor = value; }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeSymbolColor()
+        {
+            return m_Button.ShouldSerializeSymbolColor();
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetSymbolColor()
+        {
+            m_Button.ResetSymbolColor();
+        }
+
+        /// <summary>
+        /// Indicates the symbol displayed on face of the button instead of the image. Setting the symbol overrides the image setting.
+        /// </summary>
+        [DefaultValue(""), Category("Appearance"), Description("Indicates the symbol displayed on face of the button instead of the image. Setting the symbol overrides the image setting.")]
+        [Editor("DevComponents.DotNetBar.Design.SymbolTypeEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor))]
+        public string Symbol
+        {
+            get { return m_Button.Symbol; }
+            set
+            {
+                m_Button.Symbol = value;
+            }
+        }
+        /// <summary>
+        /// Gets or sets the symbol set used to represent the Symbol.
+        /// </summary>
+        [Browsable(false), DefaultValue(eSymbolSet.Awesome)]
+        public eSymbolSet SymbolSet
+        {
+            get { return m_Button.SymbolSet; }
+            set { m_Button.SymbolSet = value; }
+        }
+        /// <summary>
+        /// Indicates the size of the symbol in points.
+        /// </summary>
+        [DefaultValue(0f), Category("Appearance"), Description("Indicates the size of the symbol in points.")]
+        public float SymbolSize
+        {
+            get { return m_Button.SymbolSize; }
+            set
+            {
+                m_Button.SymbolSize = value;
+            }
+        }
+
+        /// <summary>
+        /// Specifies the Button image which is used when button background is black or very dark. Image is used when button text is white. This is provided for Metro style applications.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Category("Appearance"), Description("Specifies the Button image which is used when button background is black or very dark. Image is used when button text is white. This is provided for Metro style applications."), DefaultValue(null)]
+        public System.Drawing.Image ImageAlt
+        {
+            get { return m_Button.ImageAlt; }
+            set
+            {
+                m_Button.ImageAlt = value;
+            }
+        }
+        /// <summary>
+        /// Specifies the Button image.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Category("Appearance"), Description("The image that will be displayed on the face of the button."), DefaultValue(null)]
+        public System.Drawing.Image Image
+        {
+            get { return m_Button.Image; }
+            set
+            {
+                m_Button.Image = value;
+                InvalidateAutoSize();
+#if FRAMEWORK20
+                this.AdjustSize();
+#endif
+            }
+        }
+
+        /// <summary>
+        /// Specifies the image for the button when mouse is over the item.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Category("Appearance"), Description("The image that will be displayed when mouse hovers over the item."), DefaultValue(null)]
+        public System.Drawing.Image HoverImage
+        {
+            get { return m_Button.HoverImage; }
+            set { m_Button.HoverImage = value; }
+        }
+
+        /// <summary>
+        /// Specifies the image for the button when items Enabled property is set to false.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Category("Appearance"), Description("The image that will be displayed when item is disabled."),DefaultValue(null)]
+        public System.Drawing.Image DisabledImage
+        {
+            get { return m_Button.DisabledImage; }
+            set { m_Button.DisabledImage = value; }
+        }
+
+        /// <summary>
+        /// Specifies the image for the button when mouse left button is pressed.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Category("Appearance"), Description("The image that will be displayed when item is pressed."), DefaultValue(null)]
+        public System.Drawing.Image PressedImage
+        {
+            get { return m_Button.PressedImage; }
+            set { m_Button.PressedImage = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the location of popup in relation to it's parent.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(false), DefaultValue(ePopupSide.Default), Description("Indicates location of popup in relation to it's parent.")]
+        public ePopupSide PopupSide
+        {
+            get { return m_Button.PopupSide; }
+            set { m_Button.PopupSide = value; InvalidateAutoSize(); }
+        }
+
+        /// <summary>
+        /// Returns the collection of sub items.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(false), Editor("DevComponents.DotNetBar.Design.ButtonItemEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), Category("Data"), Description("Collection of sub items."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public virtual SubItemsCollection SubItems
+        {
+            get
+            {
+                return m_Button.SubItems;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether button appears as split button. Split button appearance divides button into two parts. Image which raises the click event
+        /// when clicked and text and expand sign which shows button sub items on popup menu when clicked. Button must have both text and image visible (ButtonStyle property) in order to appear as a full split button.
+        /// </summary>
+        [Browsable(true), DefaultValue(false), Category("Appearance"), Description("Indicates whether button appears as split button.")]
+        public bool SplitButton
+        {
+            get { return m_Button.SplitButton; }
+            set { m_Button.SplitButton = value; InvalidateAutoSize(); }
+        }
+
+        /// <summary>
+        /// Gets or sets whether button displays the expand part that indicates that button has popup.
+        /// </summary>
+        [System.ComponentModel.Browsable(true), DevCoBrowsable(true), System.ComponentModel.DefaultValue(true), System.ComponentModel.Category("Behavior"), System.ComponentModel.Description("Determines whether sub-items are displayed.")]
+        public bool ShowSubItems
+        {
+            get
+            {
+                return m_Button.ShowSubItems;
+            }
+            set
+            {
+                m_Button.ShowSubItems = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets/Sets the image position inside the button.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Category("Appearance"), Description("The alignment of the image in relation to text displayed by this item."), DefaultValue(eImagePosition.Left)]
+        public eImagePosition ImagePosition
+        {
+            get { return m_Button.ImagePosition; }
+            set
+            {
+                m_Button.ImagePosition = value;
+                InvalidateAutoSize();
+                this.RecalcLayout();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether mouse over fade effect is enabled. Default value is true.
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Appearance"), Description("Indicates whether mouse over fade effect is enabled")]
+        public bool FadeEffect
+        {
+            get { return m_FadeEffect; }
+            set
+            {
+                m_FadeEffect = value;
+            }
+        }
+
+        internal bool IsFadeEnabled
+        {
+            get
+            {
+                if (this.DesignMode || (!BarFunctions.IsOffice2007Style(m_Button.EffectiveStyle)) ||
+                    m_FadeEffect && NativeFunctions.IsTerminalSession() || IsThemed || TextDrawing.UseTextRenderer)
+                    return false;
+                return m_FadeEffect;
+            }
+        }
+
+        /// <summary>
+        /// Indicates the way button is rendering the mouse over state. Setting the value to Color will render the image in gray-scale when mouse is not over the item.
+        /// </summary>
+        [System.ComponentModel.Browsable(true), DevCoBrowsable(true), System.ComponentModel.Category("Appearance"), System.ComponentModel.Description("Indicates the button mouse over tracking style. Setting the value to Color will render the image in gray-scale when mouse is not over the item."), System.ComponentModel.DefaultValue(eHotTrackingStyle.Default)]
+        public virtual eHotTrackingStyle HotTrackingStyle
+        {
+            get { return m_Button.HotTrackingStyle; }
+            set
+            {
+                m_Button.HotTrackingStyle = value;
+            }
+        }
+
+        internal override ItemPaintArgs GetItemPaintArgs(Graphics g)
+        {
+            ItemPaintArgs pa = base.GetItemPaintArgs(g);
+            pa.IsDefaultButton = m_IsDefault && _FocusCuesEnabled;
+            
+            return pa;
+        }
+
+        /// <summary>
+        /// Gets or sets the width of the expand part of the button item.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Category("Behavior"), Description("Indicates the width of the expand part of the button item."), DefaultValue(12)]
+        public virtual int SubItemsExpandWidth
+        {
+            get { return m_Button.SubItemsExpandWidth; }
+            set
+            {
+                m_Button.SubItemsExpandWidth = value;
+                this.RecalcLayout();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the text associated with this button.
+        /// </summary>
+        [Browsable(true), Editor("DevComponents.DotNetBar.Design.TextMarkupUIEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), Category("Appearance"), Description("Indicates text associated with this button.."), Localizable(true), DefaultValue("")]
+        public override string Text
+        {
+            get { return base.Text; }
+            set { base.Text = value; }
+        }
+
+        /// <summary>
+        /// Gets/Sets informational text (tooltip) for the button.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), DefaultValue(""), Editor("DevComponents.DotNetBar.Design.TextMarkupUIEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), Category("Appearance"), Description("Indicates informational text (tooltip) for the button."), Localizable(true)]
+        public virtual string Tooltip
+        {
+            get { return m_Button.Tooltip; }
+            set { m_Button.Tooltip = value; }
+        }
+
+        private bool _EnableMnemonicWithAltKeyOnly = false;
+        /// <summary>
+        /// Gets or sets whether mnemonic character assigned to button is processed only if Alt key is pressed. Default value is false which indicate that Alt key is not required.
+        /// </summary>
+        [DefaultValue(false), Category("Behavior"), Description("Indicates whether mnemonic character assigned to button is processed only if Alt key is pressed")]
+        public bool EnableMnemonicWithAltKeyOnly
+        {
+            get { return _EnableMnemonicWithAltKeyOnly; }
+            set
+            {
+                _EnableMnemonicWithAltKeyOnly = value;
+            }
+        }
+
+        private bool _UseMnemonic = true;
+        /// <summary>
+        /// Gets or sets a value indicating whether the control interprets an ampersand character (&) in the control's Text property to be an access key prefix character.
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Appearance"), Description("Indicates whether the control interprets an ampersand character (&) in the control's Text property to be an access key prefix character.")]
+        public bool UseMnemonic
+        {
+            get { return _UseMnemonic; }
+            set
+            {
+                _UseMnemonic = value;
+                if (this.IsHandleCreated)
+                    UpdateButtonAutoSize();
+            }
+        }
+
+        protected override bool ProcessMnemonic(char charCode)
+        {
+            if (CanSelect && IsMnemonic(charCode, this.Text) && this.Enabled && _UseMnemonic && 
+                (!_EnableMnemonicWithAltKeyOnly || Control.ModifierKeys == Keys.Alt || this.Focused) && !m_Button.IsUsingTextMarkup)
+            {
+                if (Focus())
+                {
+                    PerformClick();
+                    return true;
+                }
+            }
+            return base.ProcessMnemonic(charCode);
+        }
+
+        /// <summary>
+        /// Indicates whether the button will auto-expand when clicked. 
+        /// When button contains sub-items, sub-items will be shown only if user
+        /// click the expand part of the button. Setting this property to true will expand the button and show sub-items when user
+        /// clicks anywhere inside of the button. Default value is false which indicates that button is expanded only
+        /// if its expand part is clicked.
+        /// </summary>
+        [DefaultValue(false), Browsable(true), DevCoBrowsable(true), Category("Behavior"), Description("Indicates whether the button will auto-expand (display pop-up menu or toolbar) when clicked.")]
+        public virtual bool AutoExpandOnClick
+        {
+            get { return (InternalAutoExpandOnClick); }
+            set { InternalAutoExpandOnClick = value; }
+        }
+
+        protected bool InternalAutoExpandOnClick
+        {
+            get { return m_Button.AutoExpandOnClick; }
+            set
+            {
+                m_Button.AutoExpandOnClick = value;
+                this.RecalcLayout();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether Checked property is automatically inverted, button checked/unchecked, when button is clicked. Default value is false.
+        /// </summary>
+        [Browsable(true), DefaultValue(false), Category("Behavior"), Description("Indicates whether Checked property is automatically inverted when button is clicked.")]
+        public bool AutoCheckOnClick
+        {
+            get { return m_Button.AutoCheckOnClick; }
+            set { m_Button.AutoCheckOnClick = value; }
+        }
+
+        /// <summary>
+        /// Gets or set a value indicating whether the button is in the checked state.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Category("Appearance"), Description("Indicates whether item is checked or not."), DefaultValue(false)]
+        public virtual bool Checked
+        {
+            get
+            {
+                return m_Button.Checked;
+            }
+            set
+            {
+                m_Button.Checked = value;
+                this.Invalidate();
+            }
+        }
+
+        private static RoundRectangleShapeDescriptor _DefaultButtonShape = new RoundRectangleShapeDescriptor(2);
+        private static RoundRectangleShapeDescriptor _DefaultMetroButtonShape = new RoundRectangleShapeDescriptor(0);
+        internal IShapeDescriptor GetButtonShape()
+        {
+            if (this.Shape != null)
+                return this.Shape;
+            if (StyleManager.IsMetro(m_Button.EffectiveStyle))
+                return _DefaultMetroButtonShape;
+            return _DefaultButtonShape;
+        }
+
+        private ShapeDescriptor _Shape = null;
+        /// <summary>
+        /// Gets or sets an shape descriptor for the button which describes the shape of the button. Default value is null
+        /// which indicates that system default shape is used.
+        /// </summary>
+        [DefaultValue(null), Editor("DevComponents.DotNetBar.Design.ShapeTypeEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(UITypeEditor)), TypeConverter("DevComponents.DotNetBar.Design.ShapeStringConverter, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf"), MergableProperty(false)]
+        public ShapeDescriptor Shape
+        {
+            get { return _Shape; }
+            set
+            {
+                if (_Shape != value)
+                {
+                    _Shape = value;
+                    this.Invalidate();
+                }
+            }
+        }
+
+        private bool _FocusCuesEnabled = true;
+        /// <summary>
+        /// Gets or sets whether control displays focus cues when focused.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether control displays focus cues when focused.")]
+        public virtual bool FocusCuesEnabled
+        {
+            get { return (InternalFocusCuesEnabled); }
+            set { InternalFocusCuesEnabled = value; }
+        }
+
+        protected bool InternalFocusCuesEnabled
+        {
+            get { return _FocusCuesEnabled; }
+            set
+            {
+                _FocusCuesEnabled = value;
+                if (this.Focused) this.Invalidate();
+            }
+        }
+
+        internal int CornerSize
+        {
+            get { return 2; }
+        }
+
+        /// <summary>
+        /// Gets or sets the custom color name. Name specified here must be represented by the corresponding object with the same name that is part
+        /// of the Office2007ColorTable.ButtonItemColors collection. See documentation for Office2007ColorTable.ButtonItemColors for more information.
+        /// If color table with specified name cannot be found default color will be used. Valid settings for this property override any
+        /// setting to the Color property.
+        /// Applies to items with Office 2007 style only.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(false), DefaultValue(""), Category("Appearance"), Description("Indicates custom color table name for the button when Office 2007 style is used.")]
+        public string CustomColorName
+        {
+            get { return m_Button.CustomColorName; }
+            set
+            {
+                m_Button.CustomColorName = value;
+                this.Invalidate();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the predefined color of the button. Color specified applies to buttons with Office 2007 style only. It does not have
+        /// any effect on other styles. Default value is eButtonColor.Default
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(false), DefaultValue(eButtonColor.BlueWithBackground), Category("Appearance"), Description("Indicates predefined color of button when Office 2007 style is used.")]
+        public eButtonColor ColorTable
+        {
+            get { return m_Button.ColorTable; }
+            set
+            {
+                if (m_Button.ColorTable != value)
+                {
+                    m_Button.ColorTable = value;
+                    this.Invalidate();
+                }
+            }
+        }
+        protected override void InvalidateAutoSize()
+        {
+            m_PreferredSize = Size.Empty;
+        }
+
+#if FRAMEWORK20
+        //[Localizable(true), Browsable(false)]
+        //public new System.Windows.Forms.Padding Padding
+        //{
+        //    get { return base.Padding; }
+        //    set { base.Padding = value; }
+        //}
+
+        public override Size GetPreferredSize(Size proposedSize)
+        {
+            if (!m_PreferredSize.IsEmpty) return m_PreferredSize;
+
+            if (!BarFunctions.IsHandleValid(this))
+                return base.GetPreferredSize(proposedSize);
+            if (this.Text.Length == 0 && this.Image == null)
+                return base.GetPreferredSize(proposedSize);
+
+            int oldWidth = m_Button.WidthInternal, oldHeight = m_Button.HeightInternal;
+
+            m_Button._FitContainer = false;
+            m_Button.RecalcSize();
+
+            Size s = m_Button.Size;
+            if (s.Width < this.MinimumSize.Width)
+                s.Width = this.MinimumSize.Width;
+            if (s.Height < this.MinimumSize.Height)
+                s.Height = this.MinimumSize.Height;
+
+            if (m_AutoSizeMode == AutoSizeMode.GrowOnly)
+            {
+                if (s.Width < this.Size.Width)
+                    s.Width = this.Size.Width;
+                if (s.Height < this.Size.Height)
+                    s.Height = this.Size.Height;
+
+                if (proposedSize.Width > 0 && proposedSize.Width < 50000 && s.Width < proposedSize.Width)
+                    s.Width = proposedSize.Width;
+                if (proposedSize.Height > 0 && proposedSize.Height < 50000 && s.Height < proposedSize.Height)
+                    s.Height = proposedSize.Height;
+                    
+            }
+            m_Button._FitContainer = true;
+            RecalcSize();
+            m_PreferredSize = s;
+            return m_PreferredSize;
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the control is automatically resized to display its entire contents. You can set MaximumSize.Width property to set the maximum width used by the control.
+        /// </summary>
+        [Browsable(true), DefaultValue(false), EditorBrowsable(EditorBrowsableState.Always), DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
+        public override bool AutoSize
+        {
+            get
+            {
+                return base.AutoSize;
+            }
+            set
+            {
+                if (this.AutoSize != value)
+                {
+                    base.AutoSize = value;
+                    InvalidateAutoSize();
+                    AdjustSize();
+                }
+            }
+        }
+
+        protected override void SetBoundsCore(int x, int y, int width, int height, BoundsSpecified specified)
+        {
+            if (this.AutoSize)
+            {
+                Size preferredSize = base.PreferredSize;
+                if(preferredSize.Width>0)
+                    width = preferredSize.Width;
+                if (preferredSize.Height > 0)
+                    height = preferredSize.Height;
+            }
+            base.SetBoundsCore(x, y, width, height, specified);
+        }
+
+        protected override void AdjustSize()
+        {
+            if (this.AutoSize)
+            {
+                System.Drawing.Size prefSize = base.PreferredSize;
+                if(prefSize.Width>0 && prefSize.Height>0)
+                    this.Size = base.PreferredSize;
+            }
+        }
+
+        private AutoSizeMode m_AutoSizeMode = AutoSizeMode.GrowOnly;
+        /// <summary>
+        /// Gets or sets the mode by which the Button automatically resizes itself. 
+        /// </summary>
+        [LocalizableAttribute(true), Browsable(true), DefaultValue(AutoSizeMode.GrowOnly), Category("Layout"), Description("Indicates the mode by which the Button automatically resizes itself. ")]
+        public AutoSizeMode AutoSizeMode
+        {
+            get { return m_AutoSizeMode; }
+            set
+            {
+                if (m_AutoSizeMode != value)
+                {
+                    m_AutoSizeMode = value;
+                    InvalidateAutoSize();
+                    AdjustSize();
+                }
+            }
+        }
+
+        //[Browsable(false), EditorBrowsable(EditorBrowsableState.Never), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        //public override Image BackgroundImage
+        //{
+        //    get { return base.BackgroundImage; }
+        //    set { base.BackgroundImage = value; }
+        //}
+        //[Browsable(false), EditorBrowsable(EditorBrowsableState.Never), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        //public override ImageLayout BackgroundImageLayout
+        //{
+        //    get
+        //    {
+        //        return base.BackgroundImageLayout;
+        //    }
+        //    set
+        //    {
+        //        base.BackgroundImageLayout = value;
+        //    }
+        //}
+#endif
+        private int _ImageTextSpacing = 0;
+        /// <summary>
+        /// Gets or sets the amount of spacing between button image if specified and text.
+        /// </summary>
+        [Browsable(true), DefaultValue(0), Category("Layout"), Description("Indicates amount of spacing between button image if specified and text.")]
+        public virtual int ImageTextSpacing
+        {
+            get { return _ImageTextSpacing; }
+            set
+            {
+                _ImageTextSpacing = value;
+                RecalcLayout();
+            }
+        }
+
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override Color ForeColor
+        {
+            get
+            {
+                return base.ForeColor;
+            }
+            set
+            {
+                base.ForeColor = value;
+            }
+        }
+
+        private static readonly Color DefaultTextColor = Color.Empty;
+        private Color _TextColor = DefaultTextColor;
+        /// <summary>
+        /// Gets or sets the text color.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates text color.")]
+        public  Color TextColor
+        {
+        	get {	return _TextColor; }
+        	set 
+            {
+                _TextColor = value;
+                m_Button.ForeColor = value;
+            }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeTextColor()
+        {
+            return _TextColor != DefaultTextColor;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetTextColor()
+        {
+            this.TextColor =  DefaultTextColor;
+        }
+        #endregion
+
+        #region IButtonControl Members
+        /// <summary>
+        /// Gets or sets the value returned to the parent form when the button is clicked.
+        /// </summary>
+        [Browsable(true), Category("Behavior"), DefaultValue(DialogResult.None), Description("Gets or sets the value returned to the parent form when the button is clicked.")]
+        public DialogResult DialogResult
+        {
+            get
+            {
+                return m_DialogResult;
+            }
+
+            set
+            {
+                if (Enum.IsDefined(typeof(DialogResult), value))
+                {
+                    m_DialogResult = value;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Notifies a control that it is the default button so that its appearance and behavior is adjusted accordingly.
+        /// </summary>
+        /// <param name="value">true if the control should behave as a default button; otherwise false.</param>
+        public void NotifyDefault(bool value)
+        {
+            if (m_IsDefault != value)
+            {
+                m_IsDefault = value;
+                this.Invalidate();
+            }
+        }
+
+        /// <summary>
+        /// Generates a Click event for the control.
+        /// </summary>
+        public override void PerformClick()
+        {
+            if (!this.Enabled) return;
+
+            Form form1 = this.FindForm();
+            if (form1 != null)
+            {
+                form1.DialogResult = this.DialogResult;
+            }
+            if (this.AutoCheckOnClick) this.Checked = !this.Checked;
+
+            if (ExecuteCommandOnClick)
+                ExecuteCommand();
+
+            // Must call base since this class overrides OnClick to prevent it from firing when sub-items rect is clicked
+            base.OnClick(EventArgs.Empty);
+        }
+        #endregion
+
+        #region IOwner 
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the button is expanded (displays drop-down) or not.
+        /// </summary>
+        [Browsable(false), DefaultValue(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public virtual bool Expanded
+        {
+            get { return m_Button.Expanded; }
+            set { m_Button.Expanded = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the collection of shortcut keys associated with the button. When shortcut key is pressed button Click event is raised.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Category("Design"), Description("Indicates list of shortcut keys for this button."), Editor("DevComponents.DotNetBar.Design.ShortcutsDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), System.ComponentModel.TypeConverter("DevComponents.DotNetBar.Design.ShortcutsConverter, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf"), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public virtual ShortcutsCollection Shortcuts
+        {
+            get { return m_Button.Shortcuts; }
+            set { m_Button.Shortcuts = value; }
+        }
+
+        /// <summary>
+		/// Displays the sub-items on popup specified by PopupType.
+		/// </summary>
+		/// <param name="p">Popup location.</param>
+		public virtual void Popup(Point p)
+		{
+            m_Button.Popup(p);
+		}
+
+		/// <summary>
+		/// Displays the sub-items on popup specified by PopupType.
+		/// </summary>
+		/// <param name="x">Horizontal coordinate in pixels of the upper left corner of a popup.</param>
+		/// <param name="y">Vertical coordinate in pixels of the upper left corner of a popup.</param>
+		public virtual void Popup(int x, int y)
+		{
+            m_Button.Popup(x, y);
+		}
+        #endregion
+
+        #region ICommandSource Members
+        protected virtual void ExecuteCommand()
+        {
+            if (_Command == null) return;
+            CommandManager.ExecuteCommand(this);
+        }
+
+        /// <summary>
+        /// Gets or sets the command assigned to the item. Default value is null.
+        /// <remarks>Note that if this property is set to null Enabled property will be set to false automatically to disable the item.</remarks>
+        /// </summary>
+        [DefaultValue(null), Category("Commands"), Description("Indicates the command assigned to the item.")]
+        public Command Command
+        {
+            get { return (Command)((ICommandSource)this).Command; }
+            set
+            {
+                ((ICommandSource)this).Command = value;
+            }
+        }
+
+        private ICommand _Command = null;
+        //[Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        ICommand ICommandSource.Command
+        {
+            get
+            {
+                return _Command;
+            }
+            set
+            {
+                bool changed = false;
+                if (_Command != value)
+                    changed = true;
+
+                if (_Command != null)
+                    CommandManager.UnRegisterCommandSource(this, _Command);
+                _Command = value;
+                if (value != null)
+                    CommandManager.RegisterCommand(this, value);
+                if(changed)
+                    OnCommandChanged();
+            }
+        }
+
+        /// <summary>
+        /// Called when Command property value changes.
+        /// </summary>
+        protected virtual void OnCommandChanged()
+        {
+        }
+
+        private object _CommandParameter = null;
+        /// <summary>
+        /// Gets or sets user defined data value that can be passed to the command when it is executed.
+        /// </summary>
+        [Browsable(true), DefaultValue(null), Category("Commands"), Description("Indicates user defined data value that can be passed to the command when it is executed."), System.ComponentModel.TypeConverter(typeof(System.ComponentModel.StringConverter)), System.ComponentModel.Localizable(true)]
+        public object CommandParameter
+        {
+            get
+            {
+                return _CommandParameter;
+            }
+            set
+            {
+                _CommandParameter = value;
+            }
+        }
+
+        #endregion
+    }
+
+    #region ButtonXAccessibleObject
+    /// <summary>
+    /// Represents class for Accessibility support.
+    /// </summary>
+    public class ButtonXAccessibleObject : Control.ControlAccessibleObject
+    {
+        private ButtonX m_Owner = null;
+        /// <summary>
+        /// Creates new instance of the object and initializes it with owner control.
+        /// </summary>
+        /// <param name="owner">Reference to owner control.</param>
+        public ButtonXAccessibleObject(ButtonX owner)
+            : base(owner)
+        {
+            m_Owner = owner;
+        }
+
+        protected ButtonX Owner
+        {
+            get { return m_Owner; }
+        }
+
+        ///// <summary>
+        ///// Gets or sets accessible name.
+        ///// </summary>
+        //public override string Name
+        //{
+        //    get
+        //    {
+        //        if (m_Owner != null && !m_Owner.IsDisposed && !string.IsNullOrEmpty(m_Owner.AccessibleName))
+        //            return m_Owner.AccessibleName;
+        //        if (m_Owner != null) return TextWithoutMnemonics(m_Owner.Text);
+        //        return "";
+        //    }
+        //    set
+        //    {
+        //        if (m_Owner != null && !m_Owner.IsDisposed)
+        //            m_Owner.AccessibleName = value;
+        //    }
+        //}
+
+        //internal static string TextWithoutMnemonics(string text)
+        //{
+        //    if (text == null)
+        //    {
+        //        return null;
+        //    }
+        //    int index = text.IndexOf('&');
+        //    if (index == -1)
+        //    {
+        //        return text;
+        //    }
+        //    StringBuilder builder = new StringBuilder(text.Substring(0, index));
+        //    while (index < text.Length)
+        //    {
+        //        if (text[index] == '&')
+        //        {
+        //            index++;
+        //        }
+        //        if (index < text.Length)
+        //        {
+        //            builder.Append(text[index]);
+        //        }
+        //        index++;
+        //    }
+        //    return builder.ToString();
+        //}
+
+        ///// <summary>
+        ///// Gets accessible description.
+        ///// </summary>
+        //public override string Description
+        //{
+        //    get
+        //    {
+        //        if (m_Owner != null && !m_Owner.IsDisposed)
+        //            return m_Owner.AccessibleDescription;
+        //        return "";
+        //    }
+        //}
+
+        ///// <summary>
+        ///// Gets accessible role.
+        ///// </summary>
+        //public override AccessibleRole Role
+        //{
+        //    get
+        //    {
+        //        if (m_Owner != null && !m_Owner.IsDisposed)
+        //            return m_Owner.AccessibleRole;
+        //        return System.Windows.Forms.AccessibleRole.None;
+        //    }
+        //}
+
+        ///// <summary>
+        ///// Gets parent accessibility object.
+        ///// </summary>
+        //public override AccessibleObject Parent
+        //{
+        //    get
+        //    {
+        //        if (m_Owner != null && !m_Owner.IsDisposed)
+        //            return m_Owner.Parent.AccessibilityObject;
+        //        return null;
+        //    }
+        //}
+
+        ///// <summary>
+        ///// Returns bounds of the control.
+        ///// </summary>
+        //public override Rectangle Bounds
+        //{
+        //    get
+        //    {
+        //        if (m_Owner != null && !m_Owner.IsDisposed && m_Owner.Parent != null)
+        //            return this.m_Owner.Parent.RectangleToScreen(m_Owner.Bounds);
+        //        return Rectangle.Empty;
+        //    }
+        //}
+
+        /// <summary>
+        /// Returns number of child objects.
+        /// </summary>
+        /// <returns>Total number of child objects.</returns>
+        public override int GetChildCount()
+        {
+            if (m_Owner != null && !m_Owner.IsDisposed)
+                return m_Owner.InternalItem.AccessibleObject.GetChildCount();
+            return 0;
+        }
+
+        /// <summary>
+        /// Returns reference to child object given the index.
+        /// </summary>
+        /// <param name="iIndex">0 based index of child object.</param>
+        /// <returns>Reference to child object.</returns>
+        public override System.Windows.Forms.AccessibleObject GetChild(int iIndex)
+        {
+            if (m_Owner != null && !m_Owner.IsDisposed)
+                return m_Owner.InternalItem.AccessibleObject.GetChild(iIndex);  //return m_Owner.SubItems[iIndex].AccessibleObject;
+            return null;
+        }
+
+        /// <summary>
+        /// Returns current accessible state.
+        /// </summary>
+        public override AccessibleStates State
+        {
+            get
+            {
+                AccessibleStates state=m_Owner.InternalItem.AccessibleObject.State;
+                if(m_Owner.Focused)
+                    state|= AccessibleStates.Focused;
+                return state;
+            }
+        }
+
+        ///// <summary>
+        ///// Gets or sets the value of an accessible object.
+        ///// </summary>
+        //public override string Value
+        //{
+        //    get
+        //    {
+        //        return m_Owner.Text;
+        //    }
+        //    set
+        //    {
+        //        m_Owner.Text = value;
+        //    }
+        //}
+
+        public override void DoDefaultAction()
+        {
+            if (m_Owner != null)
+                m_Owner.PerformClick();
+        }
+
+        public override string DefaultAction
+        {
+            get
+            {
+                if (m_Owner != null && m_Owner.AccessibleDefaultActionDescription != "")
+                    return m_Owner.AccessibleDefaultActionDescription;
+
+                return "Click";
+            }
+        }
+    }
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/ButtonX/ButtonX.ico b/PROMS/DotNetBar Source Code/ButtonX/ButtonX.ico
new file mode 100644
index 00000000..66d1a417
Binary files /dev/null and b/PROMS/DotNetBar Source Code/ButtonX/ButtonX.ico differ
diff --git a/PROMS/DotNetBar Source Code/ButtonX/ThemedButtonXPainter.cs b/PROMS/DotNetBar Source Code/ButtonX/ThemedButtonXPainter.cs
new file mode 100644
index 00000000..93c76cd2
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/ButtonX/ThemedButtonXPainter.cs	
@@ -0,0 +1,191 @@
+using System;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Summary description for ThemedButtonItemPainter.
+    /// </summary>
+    internal class ThemedButtonXPainter
+    {
+        public static void PaintButton(ButtonItem button, ItemPaintArgs pa)
+        {
+            System.Drawing.Graphics g = pa.Graphics;
+            ThemeButton theme = pa.ThemeButton;
+            ThemeButtonParts part = ThemeButtonParts.PushButton;
+            ThemeButtonStates state = ThemeButtonStates.PushButtonNormal;
+            Color textColor = ButtonItemPainterHelper.GetTextColor(button, pa);
+            ButtonX buttonX = pa.ContainerControl as ButtonX;
+            bool paintFocusCues = true;
+            if (buttonX != null) paintFocusCues = buttonX.FocusCuesEnabled;
+            Rectangle rectImage = Rectangle.Empty;
+            Rectangle itemRect = button.DisplayRectangle;
+
+            Font font = null;
+            CompositeImage image = button.GetImage();
+            
+            eTextFormat format = GetStringFormat(button, pa, image);
+
+            font = button.GetFont(pa, false);
+
+            bool bSplitButton = (button.SubItems.Count > 0 || button.PopupType == ePopupType.Container) && button.ShowSubItems && !button.SubItemsRect.IsEmpty;
+
+            // Calculate image position
+            if (image != null)
+            {
+                if (button.ImagePosition == eImagePosition.Top || button.ImagePosition == eImagePosition.Bottom)
+                    rectImage = new Rectangle(button.ImageDrawRect.X, button.ImageDrawRect.Y, itemRect.Width, button.ImageDrawRect.Height);
+                else
+                    rectImage = new Rectangle(button.ImageDrawRect.X, button.ImageDrawRect.Y, button.ImageDrawRect.Width, button.ImageDrawRect.Height);
+
+                rectImage.Offset(itemRect.Left, itemRect.Top);
+                rectImage.Offset((rectImage.Width - button.ImageSize.Width) / 2, (rectImage.Height - button.ImageSize.Height) / 2);
+                rectImage.Width = button.ImageSize.Width;
+                rectImage.Height = button.ImageSize.Height;
+            }
+
+            // Set the state and text brush
+            if (!ButtonItemPainter.IsItemEnabled(button, pa))
+            {
+                state = ThemeButtonStates.PushButtonDisabled;
+            }
+            else if (button.IsMouseDown || button.Expanded)
+            {
+                state = ThemeButtonStates.PushButtonPressed;
+            }
+            else if (button.IsMouseOver && button.Checked)
+            {
+                state = ThemeButtonStates.PushButtonPressed;
+            }
+            else if (button.IsMouseOver)
+            {
+                state = ThemeButtonStates.PushButtonHot;
+            }
+            else if (button.Checked || button.Expanded)
+            {
+                state = ThemeButtonStates.PushButtonPressed;
+            }
+            else if (button.Focused || pa.ContainerControl.Focused)
+                state = ThemeButtonStates.PushButtonDefaulted;
+
+            Rectangle backRect = button.DisplayRectangle;
+            if (button.HotTrackingStyle == eHotTrackingStyle.Image && image != null)
+            {
+                backRect = rectImage;
+                backRect.Inflate(3, 3);
+            }
+            //else if (bSplitButton)
+            //{
+            //    backRect.Width = backRect.Width - button.SubItemsRect.Width;
+            //}
+
+            // Draw Button Background
+            if (button.HotTrackingStyle != eHotTrackingStyle.None)
+            {
+                theme.DrawBackground(g, part, state, backRect);
+            }
+
+            // Draw Image
+            if (image != null && button.ButtonStyle != eButtonStyle.TextOnlyAlways)
+            {
+                if (state == ThemeButtonStates.PushButtonNormal && button.HotTrackingStyle == eHotTrackingStyle.Color)
+                {
+                    // Draw gray-scale image for this hover style...
+                    float[][] array = new float[5][];
+                    array[0] = new float[5] { 0.2125f, 0.2125f, 0.2125f, 0, 0 };
+                    array[1] = new float[5] { 0.5f, 0.5f, 0.5f, 0, 0 };
+                    array[2] = new float[5] { 0.0361f, 0.0361f, 0.0361f, 0, 0 };
+                    array[3] = new float[5] { 0, 0, 0, 1, 0 };
+                    array[4] = new float[5] { 0.2f, 0.2f, 0.2f, 0, 1 };
+                    System.Drawing.Imaging.ColorMatrix grayMatrix = new System.Drawing.Imaging.ColorMatrix(array);
+                    System.Drawing.Imaging.ImageAttributes att = new System.Drawing.Imaging.ImageAttributes();
+                    att.SetColorMatrix(grayMatrix);
+                    //g.DrawImage(image,rectImage,0,0,image.Width,image.Height,GraphicsUnit.Pixel,att);
+                    image.DrawImage(g, rectImage, 0, 0, image.ActualWidth, image.ActualHeight, GraphicsUnit.Pixel, att);
+                }
+                else if (state == ThemeButtonStates.PushButtonNormal && !image.IsIcon)
+                {
+                    // Draw image little bit lighter, I decied to use gamma it is easy
+                    System.Drawing.Imaging.ImageAttributes lightImageAttr = new System.Drawing.Imaging.ImageAttributes();
+                    lightImageAttr.SetGamma(.7f, System.Drawing.Imaging.ColorAdjustType.Bitmap);
+                    //g.DrawImage(image,rectImage,0,0,image.Width,image.Height,GraphicsUnit.Pixel,lightImageAttr);
+                    image.DrawImage(g, rectImage, 0, 0, image.Width, image.Height, GraphicsUnit.Pixel, lightImageAttr);
+                }
+                else
+                {
+                    image.DrawImage(g, rectImage);
+                }
+            }
+
+            // Draw Text
+            if (button.ButtonStyle == eButtonStyle.ImageAndText || button.ButtonStyle == eButtonStyle.TextOnlyAlways || image == null)
+            {
+                Rectangle rectText = button.TextDrawRect;
+                if (button.ImagePosition == eImagePosition.Top || button.ImagePosition == eImagePosition.Bottom)
+                {
+                    if (button.Orientation == eOrientation.Vertical)
+                    {
+                        rectText = new Rectangle(button.TextDrawRect.X, button.TextDrawRect.Y, button.TextDrawRect.Width, button.TextDrawRect.Height);
+                    }
+                    else
+                    {
+                        rectText = new Rectangle(button.TextDrawRect.X, button.TextDrawRect.Y, button.TextDrawRect.Width, button.TextDrawRect.Height);
+                        //if ((button.SubItems.Count > 0 || button.PopupType == ePopupType.Container) && button.ShowSubItems)
+                        //    rectText.Width -= 10;
+                    }
+                    format |= eTextFormat.HorizontalCenter;
+                }
+
+                rectText.Offset(itemRect.Left, itemRect.Top);
+
+                if (button.Orientation == eOrientation.Vertical)
+                {
+                    g.RotateTransform(90);
+                    TextDrawing.DrawStringLegacy(g, ButtonItemPainter.GetDrawText(button.Text), font, textColor, new Rectangle(rectText.Top, -rectText.Right, rectText.Height, rectText.Width), format);
+                    g.ResetTransform();
+                }
+                else
+                {
+                    if (rectText.Right > button.DisplayRectangle.Right)
+                        rectText.Width = button.DisplayRectangle.Right - rectText.Left;
+                    TextDrawing.DrawString(g, ButtonItemPainter.GetDrawText(button.Text), font, textColor, rectText, format);
+                    if (!button.DesignMode && button.Focused && paintFocusCues && !pa.IsOnMenu && !pa.IsOnMenuBar)
+                    {
+                        Rectangle r = button.Bounds;
+                        r.Inflate(-3, -3);
+                        System.Windows.Forms.ControlPaint.DrawFocusRectangle(g, r);
+                    }
+                }
+            }
+
+            // If it has subitems draw the triangle to indicate that
+            if (bSplitButton)
+            {
+                ButtonItemPainter.PaintButtonExpandIndicator(button, pa);
+            }
+
+            if (image != null)
+                image.Dispose();
+        }
+
+        private static eTextFormat GetStringFormat(ButtonItem button, ItemPaintArgs pa, CompositeImage image)
+        {
+            eTextFormat stringFormat = pa.ButtonStringFormat;
+            bool isOnMenu = IsOnMenu(button, pa);
+            if (!isOnMenu)
+            {
+                if (image == null || button.ImagePosition == eImagePosition.Top || button.ImagePosition == eImagePosition.Bottom)
+                    stringFormat |= eTextFormat.HorizontalCenter;
+            }
+            return stringFormat;
+        }
+
+        private static bool IsOnMenu(ButtonItem button, ItemPaintArgs pa)
+        {
+            bool isOnMenu = pa.IsOnMenu;
+            if (isOnMenu && button.Parent is ItemContainer)
+                isOnMenu = false;
+            return isOnMenu;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Calculator.ico b/PROMS/DotNetBar Source Code/Calculator.ico
new file mode 100644
index 00000000..af20d9d6
Binary files /dev/null and b/PROMS/DotNetBar Source Code/Calculator.ico differ
diff --git a/PROMS/DotNetBar Source Code/CheckBoxItem/CheckBoxItem.cs b/PROMS/DotNetBar Source Code/CheckBoxItem/CheckBoxItem.cs
new file mode 100644
index 00000000..8c3516fe
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/CheckBoxItem/CheckBoxItem.cs	
@@ -0,0 +1,812 @@
+using System;
+using System.Text;
+using System.ComponentModel;
+using System.Drawing;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.Controls;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represents the Check-box item. Use a CheckBox to give the user an option, such as true/false or yes/no.
+    /// </summary>
+    [ToolboxItem(false), DesignTimeVisible(false), DefaultEvent("Click"), Designer("DevComponents.DotNetBar.Design.CheckBoxItemDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+    public class CheckBoxItem : BaseItem
+    {
+        #region Private Variables
+        private bool m_Checked = false;
+        private eCheckBoxStyle m_CheckBoxStyle = eCheckBoxStyle.CheckBox;
+        private Size m_CheckSignSize = new Size(13, 13);
+        private eCheckBoxPosition m_CheckBoxPosition = eCheckBoxPosition.Left;
+        private int m_CheckTextSpacing = 6;
+        private int m_VerticalPadding = 3;
+        private bool m_MouseDown = false;
+        private bool m_MouseOver = false;
+        private bool m_TextVisible = true;
+        private Color m_TextColor = Color.Empty;
+        private bool m_ThreeState = false;
+        private CheckState m_CheckState = CheckState.Unchecked;
+        #endregion
+
+        #region Events
+        /// <summary>
+        /// Occurs before Checked property is changed and allows you to cancel the change.
+        /// </summary>
+        public event CheckBoxChangeEventHandler CheckedChanging;
+        /// <summary>
+        /// Occurs after Checked property is changed. Action cannot be cancelled.
+        /// </summary>
+        public event CheckBoxChangeEventHandler CheckedChanged;
+        /// <summary>
+        /// Occurs when CheckState property has changed.
+        /// </summary>
+        public event EventHandler CheckStateChanged;
+        /// <summary>
+        /// Occurs when CheckedBindable property has changed.
+        /// </summary>
+        public event EventHandler CheckedBindableChanged;
+        #endregion
+
+        #region Constructor, Copy
+        /// <summary>
+		/// Creates new instance of CheckBoxItem.
+		/// </summary>
+		public CheckBoxItem():this("","") {}
+		/// <summary>
+		/// Creates new instance of CheckBoxItem and assigns the name to it.
+		/// </summary>
+		/// <param name="sItemName">Item name.</param>
+		public CheckBoxItem(string sItemName):this(sItemName,"") {}
+		/// <summary>
+        /// Creates new instance of CheckBoxItem and assigns the name and text to it.
+		/// </summary>
+		/// <param name="sItemName">Item name.</param>
+		/// <param name="ItemText">item text.</param>
+        public CheckBoxItem(string sItemName, string ItemText)
+            : base(sItemName, ItemText)
+        {
+        }
+
+        /// <summary>
+        /// Returns copy of the item.
+        /// </summary>
+        public override BaseItem Copy()
+        {
+            CheckBoxItem objCopy = new CheckBoxItem(m_Name);
+            this.CopyToItem(objCopy);
+            return objCopy;
+        }
+
+        /// <summary>
+        /// Copies the CheckBoxItem specific properties to new instance of the item.
+        /// </summary>
+        /// <param name="copy">New CheckBoxItem instance.</param>
+        internal void InternalCopyToItem(CheckBoxItem copy)
+        {
+            CopyToItem(copy);
+        }
+
+        /// <summary>
+        /// Copies the CheckBoxItem specific properties to new instance of the item.
+        /// </summary>
+        /// <param name="copy">New CheckBoxItem instance.</param>
+        protected override void CopyToItem(BaseItem copy)
+        {
+            CheckBoxItem objCopy = copy as CheckBoxItem;
+
+            if (objCopy != null)
+            {
+                objCopy.CheckBoxPosition = this.CheckBoxPosition;
+                objCopy.CheckBoxStyle = this.CheckBoxStyle;
+                objCopy.Checked = this.Checked;
+                objCopy.CheckState = this.CheckState;
+                objCopy.TextColor = this.TextColor;
+                objCopy.TextVisible = this.TextVisible;
+
+                objCopy.ThreeState = this.ThreeState;
+                objCopy.EnableMarkup = this.EnableMarkup;
+
+                objCopy.CheckBoxImageChecked = this.CheckBoxImageChecked;
+                objCopy.CheckBoxImageIndeterminate = this.CheckBoxImageIndeterminate;
+                objCopy.CheckBoxImageUnChecked = this.CheckBoxImageUnChecked;
+
+                base.CopyToItem(objCopy);
+            }
+        }
+        #endregion
+
+        #region Internal Implementation
+        private bool _AutoCheck = true;
+        /// <summary>
+        /// Gets or set whether the Checked values and the item appearance are automatically changed when the Check-Box is clicked. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether the Checked values and the item appearance are automatically changed when the Check-Box is clicked.")]
+        public bool AutoCheck
+        {
+            get { return _AutoCheck; }
+            set
+            {
+                if (value != _AutoCheck)
+                {
+                    bool oldValue = _AutoCheck;
+                    _AutoCheck = value;
+                    OnAutoCheckChanged(oldValue, value);
+                }
+            }
+        }
+        private void OnAutoCheckChanged(bool oldValue, bool newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("AutoCheck"));
+        }
+
+        public override void Paint(ItemPaintArgs p)
+        {
+            Rendering.BaseRenderer renderer = p.Renderer;
+            if (renderer != null)
+            {
+                CheckBoxItemRenderEventArgs e = new CheckBoxItemRenderEventArgs(p.Graphics, this, p.Colors, p.Font, p.RightToLeft);
+                e.ItemPaintArgs = p;
+                renderer.DrawCheckBoxItem(e);
+            }
+            else
+            {
+                Rendering.CheckBoxItemPainter painter = PainterFactory.CreateCheckBoxItemPainter(this);
+                if (painter != null)
+                {
+                    CheckBoxItemRenderEventArgs  e = new CheckBoxItemRenderEventArgs(p.Graphics, this, p.Colors, p.Font, p.RightToLeft);
+                    e.ItemPaintArgs = p;
+                    painter.Paint(e);
+                }
+            }
+
+            this.DrawInsertMarker(p.Graphics);
+        }
+
+        internal int CheckTextSpacing
+        {
+            get { return m_CheckTextSpacing; }
+        }
+
+        internal int VerticalPadding
+        {
+            get { return m_VerticalPadding; }
+            set { m_VerticalPadding = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the size of the check or radio sign. Default value is 13x13. Minimum value is 6x6.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates size of the check or radio sign. Default value is 13x13.")]
+        public Size CheckSignSize
+        {
+            get { return m_CheckSignSize; }
+            set 
+            {
+                if (value.Width < 6) value.Width = 6;
+                if (value.Height < 6) value.Height = 6;
+
+                m_CheckSignSize = value; this.NeedRecalcSize = true; this.Refresh(); 
+            }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeCheckSignSize()
+        {
+            return m_CheckSignSize.Width != 13 || m_CheckSignSize.Height != 13;
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetCheckSignSize()
+        {
+            this.CheckSignSize = new Size(13, 13);
+        }
+
+        internal Size GetCheckSignSize()
+        {
+            Size checkSignSize = m_CheckSignSize;
+            if (_CheckBoxImageChecked != null || _CheckBoxImageIndeterminate != null || _CheckBoxImageUnChecked != null)
+            {
+                checkSignSize = Size.Empty;
+                if (_CheckBoxImageChecked != null)
+                    checkSignSize = new Size(Math.Max(checkSignSize.Width, _CheckBoxImageChecked.Width),
+                        Math.Max(checkSignSize.Height, _CheckBoxImageChecked.Height));
+                if (_CheckBoxImageIndeterminate != null)
+                    checkSignSize = new Size(Math.Max(checkSignSize.Width, _CheckBoxImageIndeterminate.Width),
+                        Math.Max(checkSignSize.Height, _CheckBoxImageIndeterminate.Height));
+                if (_CheckBoxImageUnChecked != null)
+                    checkSignSize = new Size(Math.Max(checkSignSize.Width, _CheckBoxImageUnChecked.Width),
+                        Math.Max(checkSignSize.Height, _CheckBoxImageUnChecked.Height));
+                return Dpi.ImageSize(checkSignSize);
+            }
+            return Dpi.Size(checkSignSize);
+        }
+
+        private bool _IsTextMultiLine = false;
+
+        internal bool IsTextMultiLine
+        {
+            get { return _IsTextMultiLine; }
+        }
+        private Size _TextSize = Size.Empty;
+        internal Size TextSize
+        {
+            get
+            {
+                return _TextSize;
+            }
+        }
+        public override void RecalcSize()
+        {
+            Control objCtrl = this.ContainerControl as Control;
+            if (objCtrl == null || objCtrl.Disposing || objCtrl.IsDisposed)
+                return;
+
+            int verticalPadding = Dpi.Height(m_VerticalPadding);
+            int checkTextSpacing = Dpi.Width(m_CheckTextSpacing);
+
+            Graphics g = BarFunctions.CreateGraphics(objCtrl);
+            if (g == null) return;
+
+            Size checkSignSize = GetCheckSignSize();
+
+            if (m_TextVisible)
+            {
+                try
+                {
+                    Size textSize = Size.Empty;
+                    _IsTextMultiLine = false;
+                    if (objCtrl is CheckBoxX && !((CheckBoxX) objCtrl).AutoSize)
+                    {
+                        textSize = ButtonItemLayout.MeasureItemText(this, g,
+                            m_Rect.Width - checkSignSize.Width - CheckTextSpacing, objCtrl.Font, eTextFormat.Default,
+                            objCtrl.RightToLeft == RightToLeft.Yes);
+                        Size singleLine = TextDrawing.MeasureString(g,"Abc", objCtrl.Font);
+                        _IsTextMultiLine = (textSize.Height > singleLine.Height);
+                    }
+                    else
+                        textSize = ButtonItemLayout.MeasureItemText(this, g, 0, objCtrl.Font, eTextFormat.Default,
+                            objCtrl.RightToLeft == RightToLeft.Yes);
+                    textSize.Width += 1;
+                    _TextSize = textSize;
+                    if (m_CheckBoxPosition == eCheckBoxPosition.Left || m_CheckBoxPosition == eCheckBoxPosition.Right)
+                    {
+                        m_Rect = new Rectangle(m_Rect.X, m_Rect.Y,
+                            textSize.Width + checkTextSpacing + checkSignSize.Width,
+                            Math.Max(checkSignSize.Height, textSize.Height) + verticalPadding * 2);
+                    }
+                    else
+                    {
+                        m_Rect = new Rectangle(m_Rect.X, m_Rect.Y,
+                            Math.Max(textSize.Width, checkSignSize.Width) + verticalPadding * 2,
+                            textSize.Height + checkTextSpacing + checkSignSize.Height);
+                    }
+                }
+                finally
+                {
+                    g.Dispose();
+                }
+            }
+            else
+            {
+                Size s = checkSignSize;
+                s.Width += verticalPadding * 2;
+                s.Height += verticalPadding * 2;
+                m_Rect = new Rectangle(m_Rect.Location, s);
+            }
+
+            base.RecalcSize();
+        }
+
+        /// <summary>
+        /// Gets or sets the text associated with this item.
+        /// </summary>
+        [Browsable(true), Editor("DevComponents.DotNetBar.Design.TextMarkupUIEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), Category("Appearance"), Description("The text contained in the item."), Localizable(true), DefaultValue("")]
+        public override string Text
+        {
+            get
+            {
+                return base.Text;
+            }
+            set
+            {
+                base.Text = value;
+            }
+        }
+
+        #region Markup Implementation
+        /// <summary>
+        /// Gets whether item supports text markup. Default is false.
+        /// </summary>
+        protected override bool IsMarkupSupported
+        {
+            get { return _EnableMarkup; }
+        }
+
+        private bool _EnableMarkup = true;
+        /// <summary>
+        /// Gets or sets whether text-markup support is enabled for items Text property. Default value is true.
+        /// Set this property to false to display HTML or other markup in the item instead of it being parsed as text-markup.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance"), Description("Indicates whether text-markup support is enabled for items Text property.")]
+        public bool EnableMarkup
+        {
+            get { return _EnableMarkup; }
+            set
+            {
+                if (_EnableMarkup != value)
+                {
+                    _EnableMarkup = value;
+                    NeedRecalcSize = true;
+                    OnTextChanged();
+                }
+            }
+        }
+        #endregion
+
+        /// <summary>
+        /// Gets or sets whether text assigned to the check box is visible. Default value is true.
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Appearance"), Description("Indicates whether text assigned to the check box is visible.")]
+        public bool TextVisible
+        {
+            get { return m_TextVisible; }
+            set
+            {
+                m_TextVisible = value;
+                this.NeedRecalcSize = true;
+                OnAppearanceChanged();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the text color. Default value is Color.Empty which indicates that default color is used.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), Description("Indicates text color.")]
+        public Color TextColor
+        {
+            get { return m_TextColor; }
+            set
+            {
+                m_TextColor = value;
+                OnAppearanceChanged();
+            }
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeTextColor()
+        {
+            return !m_TextColor.IsEmpty;
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetTextColor()
+        {
+            this.TextColor = Color.Empty;
+        }
+
+        /// <summary>
+        /// Gets or sets the appearance style of the item. Default value is CheckBox. Item can also assume the style of radio-button.
+        /// </summary>
+        [Browsable(true), DefaultValue(eCheckBoxStyle.CheckBox), Category("Appearance"), Description("Indicates appearance style of the item. Default value is CheckBox. Item can also assume the style of radio-button.")]
+        public eCheckBoxStyle CheckBoxStyle
+        {
+            get { return m_CheckBoxStyle; }
+            set
+            {
+                m_CheckBoxStyle = value;
+                OnAppearanceChanged();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the check box position relative to the text. Default value is Left.
+        /// </summary>
+        [Browsable(true), DefaultValue(eCheckBoxPosition.Left), Category("Appearance"), Description("Indicates the check box position relative to the text.")]
+        public eCheckBoxPosition CheckBoxPosition
+        {
+            get { return m_CheckBoxPosition; }
+            set
+            {
+                m_CheckBoxPosition = value;
+                this.NeedRecalcSize = true;
+                OnAppearanceChanged();
+            }
+        }
+
+        public override void InternalMouseEnter()
+        {
+            base.InternalMouseEnter();
+            if (!this.DesignMode && _AutoCheck)
+            {
+                m_MouseOver = true;
+                if (this.GetEnabled())
+                    this.Refresh();
+            }
+        }
+
+        public override void InternalMouseLeave()
+        {
+            base.InternalMouseLeave();
+            if (!this.DesignMode)
+            {
+                m_MouseOver = false;
+                m_MouseDown = false;
+                if (this.GetEnabled())
+                    this.Refresh();
+            }
+        }
+
+        public override void InternalMouseDown(MouseEventArgs objArg)
+        {
+            base.InternalMouseDown(objArg);
+            if (objArg.Button == MouseButtons.Left && !this.DesignMode && _AutoCheck)
+            {
+                m_MouseDown = true;
+                if (this.GetEnabled())
+                    this.Refresh();
+            }
+        }
+
+        public override void InternalMouseUp(MouseEventArgs objArg)
+        {
+            base.InternalMouseUp(objArg);
+
+            if (m_MouseDown && !this.DesignMode)
+            {
+                m_MouseDown = false;
+                if (this.GetEnabled())
+                    this.Refresh();
+            }
+        }
+
+        /// <summary>
+        /// Gets whether mouse is over the item.
+        /// </summary>
+        [Browsable(false)]
+        public bool IsMouseOver
+        {
+            get { return m_MouseOver; }
+            internal set { m_MouseOver = value; }
+        }
+
+        /// <summary>
+        /// Gets whether left mouse button is pressed on the item.
+        /// </summary>
+        [Browsable(false)]
+        public bool IsMouseDown
+        {
+            get { return m_MouseDown; }
+            internal set { m_MouseDown = value; }
+        }
+
+        /// <summary>
+        /// Gets or set a value indicating whether the button is in the checked state.
+        /// </summary>
+        [Browsable(true), RefreshProperties(RefreshProperties.All), Category("Appearance"), Description("Indicates whether item is checked or not."), DefaultValue(false), Bindable(false)]
+        public virtual bool Checked
+        {
+            get
+            {
+                return m_Checked;
+            }
+            set
+            {
+                if (m_Checked != value)
+                {
+                    if (m_ThreeState && value && m_CheckState != CheckState.Unchecked) return;
+
+                    SetChecked(value, eEventSource.Code);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or set a value indicating whether the button is in the checked state.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), RefreshProperties(RefreshProperties.All), Category("Appearance"), Description("Indicates whether item is checked or not."), DefaultValue(false), Bindable(true)]
+        public virtual bool CheckedBindable
+        {
+            get
+            {
+                return this.Checked;
+            }
+            set
+            {
+                this.Checked = value;
+            }
+        }
+
+        /// <summary>
+        /// Raises the click event and provide the information about the source of the event.
+        /// </summary>
+        /// <param name="source"></param>
+        public override void RaiseClick(eEventSource source)
+        {
+            if (_AutoCheck && CanRaiseClick && !(this.CheckBoxStyle == eCheckBoxStyle.RadioButton && this.Checked))
+            {
+                if (this.ThreeState)
+                {
+                    if (this.CheckState == CheckState.Unchecked)
+                        SetChecked(CheckState.Checked, source);
+                    else if (this.CheckState == CheckState.Checked)
+                        SetChecked(CheckState.Indeterminate, source);
+                    else if (this.CheckState == CheckState.Indeterminate)
+                        SetChecked(CheckState.Unchecked, source);
+                }
+                else
+                    SetChecked(!this.Checked, source);
+
+                ExecuteCommand();
+            }
+            base.RaiseClick(source);
+        }
+
+        /// <summary>
+        /// Sets the Checked property of the item, raises appropriate events and provides the information about the source of the change.
+        /// </summary>
+        /// <param name="newValue">New value for Checked property</param>
+        /// <param name="source">Source of the change.</param>
+        public virtual void SetChecked(bool newValue, eEventSource source)
+        {
+            // Allow user to cancel the checking
+            if (m_CheckBoxStyle == eCheckBoxStyle.RadioButton && newValue && this.Parent != null)
+            {
+                CheckBoxItem b = null;
+                foreach (BaseItem item in this.Parent.SubItems)
+                {
+                    if (item == this)
+                        continue;
+                    b = item as CheckBoxItem;
+                    if (b != null && b.Checked && b.CheckBoxStyle == eCheckBoxStyle.RadioButton)
+                    {
+                        break;
+                    }
+                }
+                CheckBoxChangeEventArgs e = new CheckBoxChangeEventArgs(b, this, source);
+                InvokeCheckedChanging(e);
+                if (e.Cancel)
+                    return;
+            }
+            else
+            {
+                CheckBoxChangeEventArgs e = new CheckBoxChangeEventArgs(null, this, source);
+                InvokeCheckedChanging(e);
+                if (e.Cancel)
+                    return;
+            }
+
+            m_Checked = newValue;
+            if (m_Checked && m_CheckState == CheckState.Unchecked || !m_Checked && m_CheckState != CheckState.Unchecked)
+            {
+                m_CheckState = m_Checked ? CheckState.Checked : CheckState.Unchecked;
+            }
+
+            if (this.Command != null)
+                this.Command.Checked = m_Checked;
+
+            this.OnCheckedChanged(source);
+            OnCheckedBindableChanged(EventArgs.Empty);
+
+            if (ShouldSyncProperties)
+                BarFunctions.SyncProperty(this, "Checked");
+
+            if (this.Displayed)
+                this.Refresh();
+        }
+
+        /// <summary>
+        /// Called when Command property value changes.
+        /// </summary>
+        protected override void OnCommandChanged()
+        {
+            Command command = this.Command;
+            if (command != null && command.Checked != this.Checked)
+            {
+                SetChecked(command.Checked, eEventSource.Code);
+            }
+            base.OnCommandChanged();
+        }
+
+        /// <summary>
+        /// Sets the Checked property of the item, raises appropriate events and provides the information about the source of the change.
+        /// </summary>
+        /// <param name="newValue">New value for Checked property</param>
+        /// <param name="source">Source of the change.</param>
+        public virtual void SetChecked(CheckState newValue, eEventSource source)
+        {
+            CheckBoxChangeEventArgs e = new CheckBoxChangeEventArgs(null, this, source);
+            InvokeCheckedChanging(e);
+            if (e.Cancel)
+                return;
+
+            m_CheckState = newValue;
+            m_Checked = (newValue != CheckState.Unchecked);
+            if (this.Command != null)
+                this.Command.Checked = m_Checked;
+            this.OnCheckedChanged(source);
+            OnCheckStateChanged(EventArgs.Empty);
+
+            if (ShouldSyncProperties)
+                BarFunctions.SyncProperty(this, "CheckState");
+
+            if (this.Displayed)
+                this.Refresh();
+        }
+
+        /// <summary>
+        /// Raises CheckState changed event.
+        /// </summary>
+        /// <param name="eventArgs">Event arguments.</param>
+        protected virtual void OnCheckStateChanged(EventArgs eventArgs)
+        {
+            if (CheckStateChanged != null)
+                CheckStateChanged(this, eventArgs);
+        }
+
+        /// <summary>
+        /// Raises CheckedBindableChanged changed event.
+        /// </summary>
+        /// <param name="eventArgs">Event arguments.</param>
+        protected virtual void OnCheckedBindableChanged(EventArgs eventArgs)
+        {
+            if (CheckedBindableChanged != null)
+                CheckedBindableChanged(this, eventArgs);
+        }
+
+        /// <summary>
+        /// Called after Checked property has changed.
+        /// </summary>
+        protected virtual void OnCheckedChanged(eEventSource source)
+        {
+            CheckBoxItem previous = null;
+            if (m_CheckBoxStyle == eCheckBoxStyle.RadioButton && m_Checked && this.Parent != null)
+            {
+                BaseItem[] items = new BaseItem[this.Parent.SubItems.Count];
+                this.Parent.SubItems.CopyTo(items, 0);
+                foreach (BaseItem item in items)
+                {
+                    if (item == this)
+                        continue;
+                    CheckBoxItem b = item as CheckBoxItem;
+                    if (b != null && b.Checked && b.CheckBoxStyle == eCheckBoxStyle.RadioButton)
+                    {
+                        b.Checked = false;
+                        previous = b;
+                    }
+                }
+            }
+
+            InvokeCheckedChanged(new CheckBoxChangeEventArgs(previous, this, source));
+        }
+
+        /// <summary>
+        /// Raises the CheckedChanging event.
+        /// </summary>
+        protected virtual void InvokeCheckedChanging(CheckBoxChangeEventArgs e)
+        {
+            if (CheckedChanging != null)
+                CheckedChanging(this, e);
+        }
+
+        /// <summary>
+        /// Raises the CheckedChanged event.
+        /// </summary>
+        protected virtual void InvokeCheckedChanged(CheckBoxChangeEventArgs e)
+        {
+            if (CheckedChanged != null)
+                CheckedChanged(this, e);
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the CheckBox will allow three check states rather than two. If the ThreeState property is set to true
+        /// CheckState property should be used instead of Checked property to set the extended state of the control.
+        /// </summary>
+        [Browsable(true), Category("Behavior"), DefaultValue(false), Description("Indicates whether the CheckBox will allow three check states rather than two.")]
+        public bool ThreeState
+        {
+            get { return m_ThreeState; }
+            set { m_ThreeState = value; }
+        }
+
+        /// <summary>
+        /// Specifies the state of a control, such as a check box, that can be checked, unchecked, or set to an indeterminate state. 
+        /// </summary>
+        [Browsable(true), Category("Behavior"), DefaultValue(CheckState.Unchecked), RefreshProperties(RefreshProperties.All), Description("Specifies the state of a control, such as a check box, that can be checked, unchecked, or set to an indeterminate state"), Bindable(true)]
+        public CheckState CheckState
+        {
+            get { return m_CheckState; }
+            set
+            {
+                if (value != m_CheckState)
+                    SetChecked(value, eEventSource.Code);
+            }
+        }
+
+        private Image _CheckBoxImageChecked = null;
+        /// <summary>
+        /// Gets or sets the custom image that is displayed instead default check box representation when check box is checked.
+        /// </summary>
+        [DefaultValue(null), Category("CheckBox Images"), Description("Indicates custom image that is displayed instead default check box representation when check box is checked")]
+        public Image CheckBoxImageChecked
+        {
+            get { return _CheckBoxImageChecked; }
+            set
+            {
+                _CheckBoxImageChecked = value;
+                OnCheckBoxImageChanged();
+            }
+        }
+        private Image _CheckBoxImageUnChecked = null;
+        /// <summary>
+        /// Gets or sets the custom image that is displayed instead default check box representation when check box is unchecked.
+        /// </summary>
+        [DefaultValue(null), Category("CheckBox Images"), Description("Indicates custom image that is displayed instead default check box representation when check box is unchecked")]
+        public Image CheckBoxImageUnChecked
+        {
+            get { return _CheckBoxImageUnChecked; }
+            set
+            {
+                _CheckBoxImageUnChecked = value;
+                OnCheckBoxImageChanged();
+            }
+        }
+        private Image _CheckBoxImageIndeterminate = null;
+        /// <summary>
+        /// Gets or sets the custom image that is displayed instead default check box representation when check box is in indeterminate state.
+        /// </summary>
+        [DefaultValue(null), Category("CheckBox Images"), Description("Indicates custom image that is displayed instead default check box representation when check box is in indeterminate state")]
+        public Image CheckBoxImageIndeterminate
+        {
+            get { return _CheckBoxImageIndeterminate; }
+            set
+            {
+                _CheckBoxImageIndeterminate = value;
+                OnCheckBoxImageChanged();
+            }
+        }
+        private void OnCheckBoxImageChanged()
+        {
+            NeedRecalcSize = true;
+            Refresh();
+        }
+        #endregion
+    }
+
+    /// <summary>
+    /// Delegate for OptionGroupChanging event.
+    /// </summary>
+    public delegate void CheckBoxChangeEventHandler(object sender, CheckBoxChangeEventArgs e);
+
+    #region CheckBoxChangeEventArgs
+    /// <summary>
+    /// Represents event arguments for OptionGroupChanging event.
+    /// </summary>
+    public class CheckBoxChangeEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Set to true to cancel the checking on NewChecked button.
+        /// </summary>
+        public bool Cancel = false;
+        /// <summary>
+        /// Check-box that will become checked if operation is not cancelled.
+        /// </summary>
+        public readonly CheckBoxItem NewChecked;
+        /// <summary>
+        /// Check-box that is currently checked and which will be unchecked if operation is not cancelled. This property will have only valid values for eCheckBoxStyle.RadioButton style CheckBoxItems.
+        /// </summary>
+        public readonly CheckBoxItem OldChecked;
+        /// <summary>
+        /// Indicates the action that has caused the event.
+        /// </summary>
+        public readonly eEventSource EventSource = eEventSource.Code;
+
+        /// <summary>
+        /// Default constructor.
+        /// </summary>
+        public CheckBoxChangeEventArgs(CheckBoxItem oldchecked, CheckBoxItem newchecked, eEventSource eventSource)
+        {
+            NewChecked = newchecked;
+            OldChecked = oldchecked;
+            EventSource = eventSource;
+        }
+    }
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/CheckBoxItem/CheckBoxItemPainter.cs b/PROMS/DotNetBar Source Code/CheckBoxItem/CheckBoxItemPainter.cs
new file mode 100644
index 00000000..9515523f
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/CheckBoxItem/CheckBoxItemPainter.cs	
@@ -0,0 +1,17 @@
+using System;
+using System.Text;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    /// <summary>
+    /// Represents painter for CheckBoxItem.
+    /// </summary>
+    internal class CheckBoxItemPainter
+    {
+        /// <summary>
+        /// Paints CheckBoxItem.
+        /// </summary>
+        /// <param name="e">Provides arguments for the operation.</param>
+        public virtual void Paint(CheckBoxItemRenderEventArgs e) { }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/CheckBoxItem/Office2007CheckBoxItemPainter.cs b/PROMS/DotNetBar Source Code/CheckBoxItem/Office2007CheckBoxItemPainter.cs
new file mode 100644
index 00000000..af9611b3
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/CheckBoxItem/Office2007CheckBoxItemPainter.cs	
@@ -0,0 +1,391 @@
+using System;
+using System.Text;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.Ribbon;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    internal class Office2007CheckBoxItemPainter : CheckBoxItemPainter, IOffice2007Painter
+    {
+        #region Private Variables
+
+        #endregion
+
+        #region IOffice2007Painter
+        private Office2007ColorTable m_ColorTable = null;
+
+        /// <summary>
+        /// Gets or sets color table used by renderer.
+        /// </summary>
+        public Office2007ColorTable ColorTable
+        {
+            get { return m_ColorTable; }
+            set { m_ColorTable = value; }
+        }
+        #endregion
+
+        #region Internal Implementation
+        public override void Paint(CheckBoxItemRenderEventArgs e)
+        {
+            Graphics g = e.Graphics;
+            CheckBoxItem item = e.CheckBoxItem;
+            bool rtl = e.RightToLeft;
+            Font font = e.Font;
+            Office2007CheckBoxStateColorTable ct = this.GetCheckBoxStateColorTable(e);
+            bool standalone = e.ItemPaintArgs.ContainerControl is DevComponents.DotNetBar.Controls.CheckBoxX;
+
+            Rectangle checkBoxPosition = Rectangle.Empty;
+            Rectangle textRect = Rectangle.Empty;
+            eTextFormat tf = eTextFormat.Default;
+            if (!(e.ItemPaintArgs != null && e.ItemPaintArgs.ContainerControl is DevComponents.DotNetBar.Controls.CheckBoxX ||
+                (e.ItemPaintArgs != null && e.ItemPaintArgs.ContainerControl is ItemControl) ||
+                (e.ItemPaintArgs != null && e.ItemPaintArgs.ContainerControl is Bar) ||
+                (e.ItemPaintArgs != null && e.ItemPaintArgs.ContainerControl is MenuPanel)))
+            {
+                tf |= eTextFormat.NoPrefix;
+            }
+
+            Size checkSignSize = item.GetCheckSignSize();
+
+            float baselineOffsetPixels = g.DpiY / 72f * (font.SizeInPoints / font.FontFamily.GetEmHeight(font.Style) * font.FontFamily.GetCellAscent(font.Style)) + .5f;
+            //float fontDescentPixels = g.DpiY / 72f * (font.SizeInPoints / font.FontFamily.GetEmHeight(font.Style) * font.FontFamily.GetCellDescent(font.Style));
+
+            if (item.CheckBoxPosition == eCheckBoxPosition.Left && !rtl || item.CheckBoxPosition == eCheckBoxPosition.Right && rtl)
+            {
+                checkBoxPosition = new Rectangle(item.DisplayRectangle.X + (standalone ? 0 : item.CheckTextSpacing / 2),
+                    item.DisplayRectangle.Y + (item.DisplayRectangle.Height - checkSignSize.Height) / 2,
+                    checkSignSize.Width, checkSignSize.Height);
+                textRect = new Rectangle(checkBoxPosition.Right + item.CheckTextSpacing / 2, item.DisplayRectangle.Y,
+                    item.DisplayRectangle.Right - (checkBoxPosition.Right + item.CheckTextSpacing / 2), item.DisplayRectangle.Height);
+
+                if (item.TextMarkupBody == null)
+                {
+                    if (!(item.Text.Contains(Environment.NewLine) || item.IsTextMultiLine) && item.TextSize.Width <= textRect.Width)
+                        textRect.Y = checkBoxPosition.Bottom - (int)baselineOffsetPixels - Dpi.Height(3);
+                    else
+                        tf |= eTextFormat.VerticalCenter | eTextFormat.WordBreak;
+                }
+                else
+                    tf |= eTextFormat.VerticalCenter;
+            }
+            else if (item.CheckBoxPosition == eCheckBoxPosition.Right && !rtl || item.CheckBoxPosition == eCheckBoxPosition.Left && rtl)
+            {
+                checkBoxPosition = new Rectangle(item.DisplayRectangle.Right - (standalone ? 1 : item.CheckTextSpacing / 2) - checkSignSize.Width,
+                    item.DisplayRectangle.Y + (item.DisplayRectangle.Height - checkSignSize.Height) / 2,
+                    checkSignSize.Width, checkSignSize.Height);
+                textRect = new Rectangle(item.DisplayRectangle.X, item.DisplayRectangle.Y,
+                    checkBoxPosition.X - (item.DisplayRectangle.X + item.CheckTextSpacing / 2), item.DisplayRectangle.Height);
+
+                if (item.TextMarkupBody == null)
+                {
+                    if (!item.Text.Contains(Environment.NewLine) && item.TextSize.Width <= textRect.Width)
+                        textRect.Y = checkBoxPosition.Bottom - (int)baselineOffsetPixels - Dpi.Height(3);
+                    else
+                        tf |= eTextFormat.VerticalCenter | eTextFormat.WordBreak;
+                }
+                else
+                    tf |= eTextFormat.VerticalCenter;
+
+                tf |= eTextFormat.Right;
+            }
+            else if (item.CheckBoxPosition == eCheckBoxPosition.Top)
+            {
+                checkBoxPosition = new Rectangle(item.DisplayRectangle.X + (item.DisplayRectangle.Width - checkSignSize.Width) / 2,
+                    item.DisplayRectangle.Y + item.VerticalPadding, checkSignSize.Width, checkSignSize.Height);
+                textRect = new Rectangle(item.DisplayRectangle.X, checkBoxPosition.Bottom,
+                    item.DisplayRectangle.Width, item.DisplayRectangle.Bottom - checkBoxPosition.Bottom);
+                tf |= eTextFormat.VerticalCenter | eTextFormat.HorizontalCenter;
+            }
+            else if (item.CheckBoxPosition == eCheckBoxPosition.Bottom)
+            {
+                checkBoxPosition = new Rectangle(item.DisplayRectangle.X + (item.DisplayRectangle.Width - checkSignSize.Width) / 2,
+                    item.DisplayRectangle.Bottom - item.VerticalPadding - checkSignSize.Height - 1, checkSignSize.Width, checkSignSize.Height);
+                textRect = new Rectangle(item.DisplayRectangle.X, item.DisplayRectangle.Y,
+                    item.DisplayRectangle.Width, checkBoxPosition.Y - (item.DisplayRectangle.Y + item.VerticalPadding));
+
+                tf |= eTextFormat.VerticalCenter | eTextFormat.HorizontalCenter;
+            }
+
+            if (item.CheckState == CheckState.Unchecked && item.CheckBoxImageUnChecked != null)
+                g.DrawImage(item.CheckBoxImageUnChecked, checkBoxPosition);
+            else if (item.CheckState == CheckState.Checked && item.CheckBoxImageChecked != null)
+                g.DrawImage(item.CheckBoxImageChecked, checkBoxPosition);
+            else if (item.CheckState == CheckState.Indeterminate && item.CheckBoxImageIndeterminate != null)
+                g.DrawImage(item.CheckBoxImageIndeterminate, checkBoxPosition);
+            else
+            {
+                if (item.CheckBoxStyle == eCheckBoxStyle.CheckBox)
+                {
+                    PaintCheckBox(g, checkBoxPosition, ct, item.CheckState);
+                }
+                else
+                {
+                    PaintRadioButton(g, checkBoxPosition, ct, item.Checked);
+                }
+            }
+
+            Color textColor = ct.Text;
+            if (!item.TextColor.IsEmpty) textColor = item.TextColor;
+            if (item.Text != "" && !textRect.IsEmpty && !textColor.IsEmpty && item.Orientation != eOrientation.Vertical && item.TextVisible)
+            {
+                if (item.TextMarkupBody != null)
+                {
+                    TextMarkup.MarkupDrawContext d = new TextMarkup.MarkupDrawContext(g, font, textColor, rtl);
+                    d.HotKeyPrefixVisible = !((tf & eTextFormat.HidePrefix) == eTextFormat.HidePrefix);
+                    if ((tf & eTextFormat.VerticalCenter) == eTextFormat.VerticalCenter)
+                    {
+                        textRect.Y = item.TopInternal + (item.Bounds.Height - item.TextMarkupBody.Bounds.Height) / 2;
+                        textRect.Height = item.TextMarkupBody.Bounds.Height;
+                    }
+                    else if ((tf & eTextFormat.Bottom) == eTextFormat.Bottom)
+                    {
+                        textRect.Y += (item.Bounds.Height - item.TextMarkupBody.Bounds.Height) + 1;
+                        textRect.Height = item.TextMarkupBody.Bounds.Height;
+                    }
+
+                    item.TextMarkupBody.Bounds = textRect;
+                    item.TextMarkupBody.Render(d);
+                }
+                else
+                {
+#if FRAMEWORK20
+                    if (e.ItemPaintArgs != null && e.ItemPaintArgs.GlassEnabled && item.Parent is CaptionItemContainer && !(e.ItemPaintArgs.ContainerControl is QatToolbar))
+                    {
+                        if (!e.ItemPaintArgs.CachedPaint)
+                            Office2007RibbonControlPainter.PaintTextOnGlass(g, item.Text, font, textRect, TextDrawing.GetTextFormat(tf));
+                    }
+                    else
+#endif
+                        TextDrawing.DrawString(g, item.Text, font, textColor, textRect, tf);
+                }
+            }
+
+            if (item.Focused && item.DesignMode)
+            {
+                Rectangle r = item.DisplayRectangle;
+                r.Inflate(-1, -1);
+                DesignTime.DrawDesignTimeSelection(g, r, e.ColorScheme.ItemDesignTimeBorder);
+            }
+        }
+
+        public void PaintRadioButton(Graphics g, Rectangle checkBoxPosition, Office2007CheckBoxStateColorTable ct, bool isChecked)
+        {
+            Rectangle r = checkBoxPosition;
+            r.Inflate(-1, -1);
+            using (GraphicsPath path = new GraphicsPath())
+            {
+                path.AddEllipse(r);
+                DisplayHelp.FillPath(g, path, ct.CheckBackground);
+            }
+            using (Pen pen = new Pen(ct.CheckBorder, 1))
+            {
+                g.DrawEllipse(pen, checkBoxPosition);
+            }
+            // Draw inner border
+            checkBoxPosition.Inflate(-3, -3);
+            using (Pen pen = new Pen(ct.CheckInnerBorder, 1))
+            {
+                g.DrawEllipse(pen, checkBoxPosition);
+            }
+
+            if (!ct.CheckInnerBackground.IsEmpty)
+            {
+                if (ct.CheckInnerBackground.End.IsEmpty)
+                {
+                    r = checkBoxPosition;
+                    r.Inflate(-1, -1);
+                    using (SolidBrush brush = new SolidBrush(ct.CheckInnerBackground.Start))
+                        g.FillEllipse(brush, r);
+                }
+                else
+                {
+                    // Draw gradient
+                    Region old = g.Clip;
+                    g.SetClip(checkBoxPosition, System.Drawing.Drawing2D.CombineMode.Replace);
+
+                    using (GraphicsPath path = new GraphicsPath())
+                    {
+                        path.AddEllipse(checkBoxPosition);
+
+                        using (PathGradientBrush brush = new PathGradientBrush(path))
+                        {
+                            brush.CenterColor = ct.CheckInnerBackground.Start;
+                            brush.SurroundColors = new Color[] { ct.CheckInnerBackground.End };
+                            brush.CenterPoint = new PointF(checkBoxPosition.X, checkBoxPosition.Y);
+                            g.FillEllipse(brush, checkBoxPosition);
+                        }
+                    }
+                    g.Clip = old;
+                }
+            }
+
+            if (isChecked && !ct.CheckSign.IsEmpty)
+            {
+                r = checkBoxPosition;
+                //r.Inflate(-1, -1);
+                using (GraphicsPath path = new GraphicsPath())
+                {
+                    path.AddEllipse(r);
+                    DisplayHelp.FillPath(g, path, ct.CheckSign);
+                }
+            }
+        }
+
+        public void PaintCheckBox(Graphics g, Rectangle checkBoxPosition, Office2007CheckBoxStateColorTable ct, CheckState checkState)
+        {
+            Rectangle r = checkBoxPosition;
+            r.Inflate(-1, -1);
+            if (checkBoxPosition.Width < 5 || checkBoxPosition.Height < 5) return;
+
+            DisplayHelp.FillRectangle(g, r, ct.CheckBackground);
+            DisplayHelp.DrawRectangle(g, ct.CheckBorder, checkBoxPosition);
+
+            // Inside rectangle
+            checkBoxPosition.Inflate(-2, -2);
+
+            if (!ct.CheckInnerBackground.IsEmpty)
+            {
+                if (ct.CheckInnerBackground.End.IsEmpty)
+                {
+                    r = checkBoxPosition;
+                    r.Inflate(-1, -1);
+                    DisplayHelp.FillRectangle(g, r, ct.CheckInnerBackground.Start);
+                }
+                else
+                {
+                    // Draw gradient
+                    Region old = g.Clip;
+                    g.SetClip(checkBoxPosition, System.Drawing.Drawing2D.CombineMode.Intersect);
+
+                    using (GraphicsPath path = new GraphicsPath())
+                    {
+                        path.AddRectangle(checkBoxPosition);
+
+                        using (PathGradientBrush brush = new PathGradientBrush(path))
+                        {
+                            brush.CenterColor = ct.CheckInnerBackground.Start;
+                            brush.SurroundColors = new Color[] { ct.CheckInnerBackground.End };
+                            brush.CenterPoint = new PointF(checkBoxPosition.X, checkBoxPosition.Y);
+                            g.FillRectangle(brush, checkBoxPosition);
+                        }
+                    }
+                    g.Clip = old;
+                }
+            }
+
+            DisplayHelp.DrawRectangle(g, ct.CheckInnerBorder, checkBoxPosition);
+
+            if (checkState == CheckState.Indeterminate)
+            {
+                checkBoxPosition.Inflate(-2, -2);
+                SmoothingMode sm = g.SmoothingMode;
+                g.SmoothingMode = SmoothingMode.None;
+                DisplayHelp.FillRectangle(g, checkBoxPosition, ct.CheckSign);
+                g.SmoothingMode = sm;
+            }
+            else if (checkState == CheckState.Checked && !ct.CheckSign.IsEmpty)
+            {
+                using (GraphicsPath path = GetCheckSign(checkBoxPosition))
+                    DisplayHelp.FillPath(g, path, ct.CheckSign);
+            }
+        }
+
+        private GraphicsPath GetCheckSign(Rectangle outterRect)
+        {
+            GraphicsPath path = new GraphicsPath();
+
+            Rectangle r = outterRect;
+            r.Inflate(-1, -1);
+
+            path.AddLine(r.X, r.Y + r.Height * .75f, r.X + r.Width * .3f, r.Bottom);
+            path.AddLine(r.X + r.Width * .4f, r.Bottom, r.Right, r.Y + r.Height * .05f);
+            path.AddLine(r.Right - r.Width * .3f, r.Y, r.X + r.Width * .25f, r.Y + r.Height * .75f);
+            path.AddLine(r.X + r.Width * .1f, r.Y + r.Height * .5f, r.X, r.Y + r.Height * .55f);
+            path.CloseAllFigures();
+
+            return path;
+        }
+        protected virtual Office2007CheckBoxColorTable GetColorTable(CheckBoxItem item, System.Windows.Forms.Control container)
+        {
+            if (container == null)
+                return m_ColorTable.CheckBoxItem;
+
+            Office2007ColorTable table = m_ColorTable;
+
+            string key = Office2007ColorTable.GetContextualKey(typeof(Office2007CheckBoxColorTable), container.GetType());
+            object st = null;
+
+            if (container is Bar)
+            {
+                if (table.ContextualTables.TryGetValue(key + "+" + ((Bar)container).BarType.ToString(), out st))
+                    return (Office2007CheckBoxColorTable)st;
+            }
+
+            if (table.ContextualTables.TryGetValue(key, out st))
+                return (Office2007CheckBoxColorTable)st;
+
+            return m_ColorTable.CheckBoxItem;
+        }
+        private Office2007CheckBoxStateColorTable GetCheckBoxStateColorTable(CheckBoxItemRenderEventArgs e)
+        {
+            CheckBoxItem item = e.CheckBoxItem;
+            if (m_ColorTable != null && BarFunctions.IsOffice2007Style(e.CheckBoxItem.EffectiveStyle))
+            {
+                Office2007CheckBoxColorTable ct = GetColorTable(e.CheckBoxItem, e.ItemPaintArgs.ContainerControl); // m_ColorTable.CheckBoxItem;
+                if (!item.GetEnabled())
+                    return ct.Disabled;
+                else if (item.IsMouseDown)
+                    return ct.Pressed;
+                else if (item.IsMouseOver)
+                    return ct.MouseOver;
+                return ct.Default;
+            }
+            else
+            {
+                ColorScheme cs = e.ColorScheme;
+                // Create color table based on the ColorScheme object...
+                Office2007CheckBoxStateColorTable ct = new Office2007CheckBoxStateColorTable();
+                if (!item.GetEnabled())
+                {
+                    ct.CheckBackground = new LinearGradientColorTable(cs.MenuBackground, Color.Empty);
+                    ct.CheckBorder = cs.ItemDisabledText;
+                    ct.CheckInnerBorder = cs.ItemDisabledText;
+                    ct.CheckInnerBackground = new LinearGradientColorTable();
+                    ct.CheckSign = new LinearGradientColorTable(cs.ItemDisabledText, Color.Empty);
+                    ct.Text = cs.ItemDisabledText;
+                }
+                else if (item.IsMouseDown)
+                {
+                    ct.CheckBackground = new LinearGradientColorTable(cs.MenuBackground, Color.Empty);
+                    ct.CheckBorder = cs.ItemPressedBorder;
+                    ct.CheckInnerBorder = cs.ItemPressedBorder;
+                    ct.CheckInnerBackground = new LinearGradientColorTable(cs.ItemPressedBackground, cs.ItemPressedBackground2);
+                    ct.CheckSign = new LinearGradientColorTable(cs.ItemPressedText, Color.Empty);
+                    ct.Text = cs.ItemPressedText;
+                }
+                else if (item.IsMouseOver)
+                {
+                    ct.CheckBackground = new LinearGradientColorTable(cs.MenuBackground, Color.Empty);
+                    ct.CheckBorder = cs.ItemHotBorder;
+                    ct.CheckInnerBorder = cs.ItemHotBorder;
+                    ct.CheckInnerBackground = new LinearGradientColorTable(cs.ItemHotBackground, cs.ItemHotBackground2);
+                    ct.CheckSign = new LinearGradientColorTable(cs.ItemHotText, Color.Empty);
+                    ct.Text = cs.ItemHotText;
+                }
+                else
+                {
+                    ct.CheckBackground = new LinearGradientColorTable(cs.MenuBackground, Color.Empty);
+                    ct.CheckBorder = cs.PanelBorder;
+                    ct.CheckInnerBorder = ColorBlendFactory.SoftLight(cs.PanelBorder, Color.White);
+                    ct.CheckInnerBackground = new LinearGradientColorTable(cs.MenuBackground, Color.Empty);
+                    ct.CheckSign = new LinearGradientColorTable(cs.ItemText, Color.Empty);
+                    ct.Text = cs.ItemText;
+                }
+                return ct;
+            }
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/CircularProgressItem.cs b/PROMS/DotNetBar Source Code/CircularProgressItem.cs
new file mode 100644
index 00000000..69636f0f
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/CircularProgressItem.cs	
@@ -0,0 +1,1339 @@
+using System;
+using System.Drawing;
+using System.ComponentModel;
+using System.Drawing.Drawing2D;
+using System.Windows.Forms;
+using System.Threading;
+using DevComponents.DotNetBar.Controls;
+using DevComponents.DotNetBar.Rendering;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represents circular progress indicator.
+    /// </summary>
+    [ToolboxItem(false), Designer("DevComponents.DotNetBar.Design.SimpleItemDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+    public class CircularProgressItem : BaseItem
+    {
+        #region Events
+
+        #endregion
+
+        #region Constructor
+        /// <summary>
+        /// Creates new instance of circular progress indicator.
+        /// </summary>
+        public CircularProgressItem() : this("", "") { }
+        /// <summary>
+        /// Creates new instance of circular progress indicator and assigns the name to it.
+        /// </summary>
+        /// <param name="sItemName">Item name.</param>
+        public CircularProgressItem(string sItemName) : this(sItemName, "") { }
+        /// <summary>
+        /// Creates new instance of circular progress indicator and assigns the name and text to it.
+        /// </summary>
+        /// <param name="sItemName">Item name.</param>
+        /// <param name="ItemText">item text.</param>
+        public CircularProgressItem(string sItemName, string ItemText)
+            : base(sItemName, ItemText)
+        {
+            _SpokeAngles = GetSpokeAngles(_SpokeCount);
+        }
+        /// <summary>
+        /// Returns copy of the item.
+        /// </summary>
+        public override BaseItem Copy()
+        {
+            CircularProgressItem objCopy = new CircularProgressItem(m_Name);
+            this.CopyToItem(objCopy);
+            return objCopy;
+        }
+
+        /// <summary>
+        /// Copies the ProgressBarItem specific properties to new instance of the item.
+        /// </summary>
+        /// <param name="copy">New ProgressBarItem instance.</param>
+        internal void InternalCopyToItem(ProgressBarItem copy)
+        {
+            CopyToItem(copy);
+        }
+
+        /// <summary>
+        /// Copies the ProgressBarItem specific properties to new instance of the item.
+        /// </summary>
+        /// <param name="copy">New ProgressBarItem instance.</param>
+        protected override void CopyToItem(BaseItem copy)
+        {
+            CircularProgressItem objCopy = copy as CircularProgressItem;
+            base.CopyToItem(objCopy);
+
+            
+        }
+
+        private bool _IsDisposing = false;
+        protected override void Dispose(bool disposing)
+        {
+            _IsDisposing = true;
+            Stop(true);
+            base.Dispose(disposing);
+            _IsDisposing = false;
+        }
+        #endregion
+
+        #region Implementation
+        public override void Paint(ItemPaintArgs e)
+        {
+            //e.Graphics.SmoothingMode = SmoothingMode.HighQuality;
+            //e.Graphics.TextRenderingHint = System.Drawing.Text.TextRenderingHint.ClearTypeGridFit;
+
+            if (_ProgressBarType == eCircularProgressType.Line)
+            {
+                PaintLineProgressBar(e);
+            }
+            else if (_ProgressBarType == eCircularProgressType.Dot)
+            {
+                PaintDotProgressBar(e);
+            }
+            else if (_ProgressBarType == eCircularProgressType.Donut)
+            {
+                PaintDonutProgressBar(e);
+            }
+            else if (_ProgressBarType == eCircularProgressType.Spoke)
+            {
+                PaintSpokeProgressBar(e);
+            }
+            else if (_ProgressBarType == eCircularProgressType.Pie)
+            {
+                PaintPieProgressBar(e);
+            }
+
+            PaintLabel(e);
+            
+            if (this.Focused && this.DesignMode)
+            {
+                Rectangle r = this.DisplayRectangle;
+                r.Inflate(-1, -1);
+                DesignTime.DrawDesignTimeSelection(e.Graphics, r, e.Colors.ItemDesignTimeBorder);
+            }
+
+            this.DrawInsertMarker(e.Graphics);
+        }
+
+        private void PaintLabel(ItemPaintArgs e)
+        {
+            if (!_TextVisible || string.IsNullOrEmpty(this.Text))
+                return;
+            Font font = e.Font;
+            Graphics g = e.Graphics;
+            Color textColor = GetTextColor(e);
+            Rectangle textBounds = Rectangle.Empty;
+            Rectangle bounds = m_Rect;
+            Rectangle progressBounds = GetProgressBarBounds();
+            eTextFormat format = eTextFormat.Default | eTextFormat.NoClipping;
+
+            int textContentSpacing = Dpi.Width(TextContentSpacing);
+            if (_TextPosition == eTextPosition.Left)
+            {
+                textBounds = new Rectangle(bounds.X + _TextPadding.Left, bounds.Y + _TextPadding.Top,
+                    m_Rect.Width - _TextPadding.Horizontal - textContentSpacing - progressBounds.Width,
+                    m_Rect.Height - _TextPadding.Vertical);
+                format |= eTextFormat.VerticalCenter;
+            }
+            else if (_TextPosition == eTextPosition.Right)
+            {
+                textBounds = new Rectangle(bounds.X + _TextPadding.Left + textContentSpacing + progressBounds.Width, bounds.Y + _TextPadding.Top, 
+                    m_Rect.Width - _TextPadding.Horizontal - textContentSpacing - progressBounds.Width,
+                    m_Rect.Height - _TextPadding.Vertical);
+                format |= eTextFormat.VerticalCenter;
+            }
+            else if (_TextPosition == eTextPosition.Top)
+            {
+                textBounds = new Rectangle(bounds.X + _TextPadding.Left, bounds.Y + _TextPadding.Top,
+                    m_Rect.Width - _TextPadding.Horizontal,
+                    m_Rect.Height - _TextPadding.Vertical - progressBounds.Height - textContentSpacing);
+                format |= eTextFormat.HorizontalCenter;
+            }
+            else if (_TextPosition == eTextPosition.Bottom)
+            {
+                textBounds = new Rectangle(bounds.X + _TextPadding.Left, bounds.Y + _TextPadding.Top + textContentSpacing + progressBounds.Height,
+                     m_Rect.Width - _TextPadding.Horizontal,
+                    m_Rect.Height - _TextPadding.Vertical - progressBounds.Height - textContentSpacing);
+                format |= eTextFormat.HorizontalCenter;
+            }
+            if (_TextWidth > 0)
+            {
+                textBounds.Width = _TextWidth;
+                format |= eTextFormat.WordBreak;
+            }
+            //g.FillRectangle(Brushes.WhiteSmoke, textBounds);
+            TextDrawing.DrawString(g, this.Text, font, textColor, textBounds, format);
+        }
+
+        private Color GetTextColor(ItemPaintArgs e)
+        {
+            if (!_TextColor.IsEmpty) return _TextColor;
+            return LabelItem.GetTextColor(e, this.EffectiveStyle, this.GetEnabled(), _TextColor);
+        }
+
+        private bool RenderesProgressText
+        {
+            get
+            {
+                return _ProgressTextVisible && (!_IsEndlessProgressBar || !string.IsNullOrEmpty(_ProgressText));
+            }
+        }
+        private void PaintPieProgressBar(ItemPaintArgs e)
+        {
+            Graphics g = e.Graphics;
+            Rectangle bounds = GetProgressBarBounds();
+            PointF centerPoint = new PointF(bounds.X + bounds.Width / 2, bounds.Y + bounds.Height / 2);
+            float penWidth = (float)Math.Max(1.5f, bounds.Height * .2);
+            bounds.Inflate(-1, -1);
+            bounds.Width--;
+            bounds.Height--;
+
+            float borderWidth = 1f;
+            if (bounds.Height > 31)
+                borderWidth = bounds.Height * .05f;
+
+            if (!_IsEndlessProgressBar)
+            {
+                int value = GetValue();
+                Rectangle pieBounds = bounds;
+                pieBounds.Inflate(-(int)borderWidth, -(int)borderWidth);
+
+                int sweepAngle = (int)(360 * ((double)value / Math.Max(1, (_Maximum - _Minimum))));
+                using (SolidBrush brush = new SolidBrush(_ProgressColor))
+                {
+                    g.FillPie(brush, pieBounds, 270, sweepAngle);
+                }
+            }
+            else
+            {
+                Rectangle pieBounds = bounds;
+                pieBounds.Inflate(-(int)borderWidth, -(int)borderWidth);
+
+                int startAngle = (int)(360 * _EndlessProgressValue / (double)_SpokeCount);
+                int sweepAngle = 90;
+                using (SolidBrush brush = new SolidBrush(_ProgressColor))
+                {
+                    g.FillPie(brush, pieBounds, startAngle, sweepAngle);
+                }
+            }
+
+            Rectangle borderBounds = bounds;
+            borderBounds.Width--;
+            borderBounds.Height--;
+
+            borderBounds.Offset(1, 1);
+            using (Pen pen = new Pen(_PieBorderDark, borderWidth))
+            {
+                pen.Alignment = PenAlignment.Inset;
+                g.DrawEllipse(pen, borderBounds);
+            }
+            borderBounds.Offset(-1, -1);
+            //using (Pen pen = new Pen(_PieBorderLight, borderWidth))
+            //    g.DrawEllipse(pen, borderBounds);
+
+            using (Pen pen = new Pen(_PieBorderLight, borderWidth + .5f))
+            {
+                pen.Alignment = PenAlignment.Inset;
+                g.DrawEllipse(pen, borderBounds);
+                g.DrawEllipse(pen, borderBounds);
+            }
+
+            if (RenderesProgressText)
+            {
+                bounds.Offset(1, 0);
+                PaintProgressText(g, bounds, (int)(bounds.Height * .4f), e.Font);
+            }
+        }
+
+        private void PaintSpokeProgressBar(ItemPaintArgs e)
+        {
+            Graphics g = e.Graphics;
+            Rectangle bounds = GetProgressBarBounds();
+            // Account for border and shade
+            bounds.Width -= 2;
+            bounds.Height -= 2;
+
+            PointF centerPoint = new PointF(bounds.X + bounds.Width / 2, bounds.Y + bounds.Height / 2);
+            float penWidth = (float)Math.Max(1.5f, bounds.Height * .2);
+            //bounds.Inflate(-(int)(penWidth / 2), -(int)(penWidth / 2));
+            GraphicsPath clipPath = new GraphicsPath();
+            Rectangle clipPathEllipse = bounds;
+            clipPathEllipse.Inflate(-(int)((float)bounds.Height / 3f), -(int)((float)bounds.Height / 3f));
+            clipPath.AddEllipse(clipPathEllipse);
+            Region oldClip = g.Clip;
+            g.SetClip(clipPath, CombineMode.Exclude);
+
+            if (!_IsEndlessProgressBar)
+            {
+                int value = GetValue();
+
+                int sweepAngle = (int)(360 * ((double)value / Math.Max(1, (_Maximum - _Minimum))));
+                using (SolidBrush brush = new SolidBrush(_ProgressColor))
+                {
+                    g.FillPie(brush, bounds, 270, sweepAngle);
+                }
+            }
+            else
+            {
+                int startAngle = (int)(360 * _EndlessProgressValue / (double)_SpokeCount);
+                int sweepAngle = 90;
+                using (SolidBrush brush = new SolidBrush(_ProgressColor))
+                {
+                    g.FillPie(brush, bounds, startAngle, sweepAngle);
+                }
+            }
+
+            int radius = bounds.Width / 2;
+
+            PointF shadeCenterPoint = centerPoint;
+            float shadeSpokeWidth = 1f;
+            float circleWidth = 1f;
+            float shadeCircleWidth = 1f;
+            //if (bounds.Height < 28)
+            //{
+            //    shadeSpokeWidth = 1f;
+            //    circleWidth = 1f;
+            //    shadeCircleWidth = 1f;
+            //}
+            radius--;
+            using (Pen pen = new Pen(_SpokeBorderDark, shadeSpokeWidth))
+            {
+                pen.Alignment = PenAlignment.Right;
+                PointF p1 = GetCoordinate(centerPoint, radius, 315); p1.X++;
+                PointF p2 = GetCoordinate(shadeCenterPoint, radius, 135); p2.X++;
+                g.DrawLine(pen, p1, p2); g.DrawLine(pen, p1, p2);
+                p1 = GetCoordinate(centerPoint, radius, 270); p1.X++;
+                p2 = GetCoordinate(shadeCenterPoint, radius, 90); p2.X++;
+                g.DrawLine(pen, p1, p2);
+                p1 = GetCoordinate(centerPoint, radius, 225); p1.Y++;
+                p2 = GetCoordinate(shadeCenterPoint, radius, 45); p2.Y++;
+                g.DrawLine(pen, p1, p2);
+                p1 = GetCoordinate(centerPoint, radius, 180); p1.Y++;
+                p2 = GetCoordinate(shadeCenterPoint, radius, 0); p2.Y++;
+                g.DrawLine(pen, p1, p2);
+            }
+
+            using (Pen pen = new Pen(_SpokeBorderDark, shadeCircleWidth))
+            {
+                pen.Alignment = PenAlignment.Inset;
+                Rectangle shadeBounds = bounds;
+                shadeBounds.Offset(1, 1);
+                //shadeBounds.Width--;
+                //shadeBounds.Height--;
+                g.DrawEllipse(pen, shadeBounds);
+            }
+
+            using (Pen pen = new Pen(_SpokeBorderLight, shadeSpokeWidth))
+            {
+                g.DrawLine(pen, GetCoordinate(centerPoint, radius, 315), GetCoordinate(centerPoint, radius, 135));
+                g.DrawLine(pen, GetCoordinate(centerPoint, radius, 270), GetCoordinate(centerPoint, radius, 90));
+                g.DrawLine(pen, GetCoordinate(centerPoint, radius, 225), GetCoordinate(centerPoint, radius, 45));
+                g.DrawLine(pen, GetCoordinate(centerPoint, radius, 180), GetCoordinate(centerPoint, radius, 0));
+            }
+
+            using (Pen pen = new Pen(_SpokeBorderLight, circleWidth))
+            {
+                pen.Alignment = PenAlignment.Inset;
+                g.DrawEllipse(pen, bounds);
+                g.DrawEllipse(pen, bounds);
+            }
+            g.Clip = oldClip;
+            oldClip.Dispose();
+
+            float innerCircleWidth = 1f;
+            using (Pen pen = new Pen(Color.White, innerCircleWidth))
+            {
+                pen.Alignment = PenAlignment.Inset;
+                g.DrawEllipse(pen, clipPathEllipse);
+                g.DrawEllipse(pen, clipPathEllipse);
+            }
+
+            if (RenderesProgressText)
+            {
+                //bounds.Y--;
+                PaintProgressText(g, bounds, (int)(bounds.Height * .35f), e.Font);
+            }
+        }
+
+        private int GetValue()
+        {
+            int value = Math.Min(_Maximum, Math.Max(_Minimum, _Value));
+            if (this.DesignMode && value == _Minimum) value = (int)(_Maximum * .75d);
+            return value;
+        }
+
+        private void PaintDonutProgressBar(ItemPaintArgs e)
+        {
+            Graphics g = e.Graphics;
+            RectangleF bounds = GetProgressBarBounds();
+            PointF centerPoint = new PointF(bounds.X + bounds.Width / 2, bounds.Y + bounds.Height / 2);
+            float penWidth = (float)Math.Max(1.5f, bounds.Height * .2);
+            bounds.Inflate(-Math.Max(1, penWidth / 2), -Math.Max(1, penWidth / 2));
+            bounds.Width--;
+            bounds.Height--;
+            if (!_IsEndlessProgressBar)
+            {
+                int value = GetValue();
+
+                int sweepAngle = (int)(360 * ((double)value / Math.Max(1, (_Maximum - _Minimum))));
+                using (Pen pen = new Pen(_ProgressColor, penWidth))
+                {
+
+                    g.DrawArc(pen, bounds, 270, sweepAngle);
+                }
+            }
+            else
+            {
+                int startAngle = (int)(360 * _EndlessProgressValue / (double)_SpokeCount);
+                int sweepAngle = 140;
+                using (Pen pen = new Pen(_ProgressColor, penWidth))
+                {
+                    pen.EndCap = LineCap.Round;
+                    pen.StartCap = LineCap.Round;
+                    g.DrawArc(pen, bounds, startAngle, sweepAngle);
+                }
+            }
+
+            if (RenderesProgressText)
+            {
+                PaintProgressText(g, bounds, (int)(bounds.Height * .4f), e.Font);
+            }
+        }
+
+        private void PaintDotProgressBar(ItemPaintArgs e)
+        {
+            Graphics g = e.Graphics;
+            Rectangle bounds = GetProgressBarBounds();
+            PointF centerPoint = new PointF(bounds.X + bounds.Width / 2, bounds.Y + bounds.Height / 2);
+
+            int outerRadius = 14;
+            int circleSize = 2;
+
+            outerRadius = (int)Math.Round(bounds.Width * .40d);
+            circleSize = Math.Max(1, (int)Math.Round(outerRadius * .25d));
+
+            int value = GetValue();
+
+            if (!_IsEndlessProgressBar)
+            {
+                int spoke = (int)Math.Round(_SpokeCount * ((double)value / Math.Max(1, (_Maximum - _Minimum))));
+                for (int i = 0; i < spoke; i++)
+                {
+                    PointF endPoint = GetCoordinate(centerPoint, outerRadius, _SpokeAngles[i]);
+                    RectangleF circleBounds = new RectangleF(endPoint, Size.Empty);
+                    circleBounds.Inflate(circleSize, circleSize);
+                    using (SolidBrush brush = new SolidBrush(ColorFromSpokeIndex(i)))
+                    {
+                        g.FillEllipse(brush, circleBounds);
+                    }
+                }
+            }
+            else if (_IsRunning) // Endless Progress Bar
+            {
+                int position = _EndlessProgressValue;
+                for (int i = 0; i < _SpokeCount; i++)
+                {
+                    position = position % _SpokeCount;
+
+                    PointF endPoint = GetCoordinate(centerPoint, outerRadius, _SpokeAngles[position]);
+                    RectangleF circleBounds = new RectangleF(endPoint, Size.Empty);
+                    circleBounds.Inflate(circleSize, circleSize);
+                    using (SolidBrush brush = new SolidBrush(ColorFromSpokeIndex(i)))
+                    {
+                        g.FillEllipse(brush, circleBounds);
+                    }
+
+                    position++;
+
+                }
+            }
+
+            if (RenderesProgressText)
+            {
+                PaintProgressText(g, bounds, (int)(bounds.Height * .35f), e.Font);
+            }
+        }
+
+        private int _SpokeCount = 12;
+        private int _EndlessProgressValue = 0;
+        private void PaintLineProgressBar(ItemPaintArgs e)
+        {
+            //e.Graphics.DrawRectangle(Pens.Green, new Rectangle(0, 0, this.Width - 1, this.Height - 1));
+            Graphics g = e.Graphics;
+            Rectangle bounds = GetProgressBarBounds();
+            PointF centerPoint = new PointF(bounds.X + bounds.Width / 2, bounds.Y + bounds.Height / 2);
+
+            int innerRadius = 6;
+            int outerRadius = 14;
+            int spokeSize = 2;
+
+            outerRadius = (int)Math.Round(bounds.Width * .45d);
+            innerRadius = (int)Math.Round(outerRadius * .45d);
+            spokeSize = Math.Max(2, (int)Math.Round(outerRadius * .15d));
+
+            int value = GetValue();
+
+            if (!_IsEndlessProgressBar)
+            {
+                int spoke = (int)Math.Round(_SpokeCount * ((double)value / Math.Max(1, (_Maximum - _Minimum))));
+                for (int i = 0; i < spoke; i++)
+                {
+                    PointF startPoint = GetCoordinate(centerPoint, innerRadius, _SpokeAngles[i]);
+                    PointF endPoint = GetCoordinate(centerPoint, outerRadius, _SpokeAngles[i]);
+                    using (Pen pen = new Pen(ColorFromSpokeIndex(i), spokeSize))
+                    {
+                        pen.EndCap = System.Drawing.Drawing2D.LineCap.Round;
+                        pen.StartCap = System.Drawing.Drawing2D.LineCap.Round;
+                        g.DrawLine(pen, startPoint, endPoint);
+                    }
+                }
+            }
+            else if (_IsRunning) // Endless Progress Bar
+            {
+                int position = _EndlessProgressValue;
+                for (int i = 0; i < _SpokeCount; i++)
+                {
+                    position = position % _SpokeCount;
+
+                    PointF startPoint = GetCoordinate(centerPoint, innerRadius, _SpokeAngles[position]);
+                    PointF endPoint = GetCoordinate(centerPoint, outerRadius, _SpokeAngles[position]);
+                    using (Pen pen = new Pen(ColorFromSpokeIndex(i), spokeSize))
+                    {
+                        pen.EndCap = System.Drawing.Drawing2D.LineCap.Round;
+                        pen.StartCap = System.Drawing.Drawing2D.LineCap.Round;
+                        g.DrawLine(pen, startPoint, endPoint);
+                    }
+
+                    position++;
+
+                }
+            }
+
+            if (RenderesProgressText)
+            {
+                PaintProgressText(g, bounds, innerRadius, e.Font);
+            }
+
+        }
+
+        private string GetProgressValueText()
+        {
+            try
+            {
+                if (!string.IsNullOrEmpty(_ProgressText)) return _ProgressText;
+                return string.Format(_ProgressTextFormat, _Value);
+            }
+            catch
+            {
+                return "Format Error";
+            }
+        }
+        private void PaintProgressText(Graphics g, RectangleF bounds, int innerRadius, Font baseFont)
+        {
+            //StringFormat format = (StringFormat)StringFormat.GenericDefault.Clone();
+            //format.Alignment = StringAlignment.Center;
+            //format.LineAlignment = StringAlignment.Center;
+            //format.FormatFlags = StringFormatFlags.NoWrap;
+            //format.Trimming = StringTrimming.None;
+            eTextFormat format = eTextFormat.HorizontalCenter | eTextFormat.VerticalCenter | eTextFormat.NoPadding | eTextFormat.SingleLine | eTextFormat.NoClipping;
+            float fontSize = Math.Max(1f, innerRadius / 1.8f);
+            Color textColor = _ProgressTextColor.IsEmpty ? _ProgressColor : _ProgressTextColor;
+
+            using (Font font = new Font(baseFont.FontFamily, fontSize, FontStyle.Regular))
+            {
+                TextDrawing.DrawString(g, GetProgressValueText(), font, textColor, Rectangle.Round(bounds), format);
+                //using (SolidBrush brush = new SolidBrush(textColor))
+                //    g.DrawString(string.Format("{0}%", _Value), font, brush, bounds, format);
+            }
+        }
+        private Color ColorFromSpokeIndex(int spokeIndex, int spokeCount)
+        {
+            return Color.FromArgb((int)(210 * (double)spokeIndex / spokeCount) + 45, _ProgressColor);
+        }
+        private Color ColorFromSpokeIndex(int spokeIndex)
+        {
+            return ColorFromSpokeIndex(spokeIndex, _SpokeCount);
+        }
+
+        private PointF GetCoordinate(PointF centerPoint, int radius, double angle)
+        {
+            double dblAngle = Math.PI * angle / 180;
+
+            return new PointF(centerPoint.X + radius * (float)Math.Cos(dblAngle),
+                              centerPoint.Y + radius * (float)Math.Sin(dblAngle));
+        }
+
+        internal static readonly int TextContentSpacing = 3;
+        private Size _TextSize = Size.Empty;
+        public override void RecalcSize()
+        {
+            int diameter = _Diameter;
+            if (!(this.ContainerControl is CircularProgress))
+                diameter = Dpi.Width(_Diameter);
+            Rectangle r = new Rectangle(m_Rect.X, m_Rect.Y, diameter, diameter);
+            if (_TextVisible && !string.IsNullOrEmpty(this.Text))
+            {
+                Control parent = this.ContainerControl as Control;
+                if (parent != null)
+                {
+                    Font font = parent.Font;
+                    using (Graphics g = parent.CreateGraphics())
+                    {
+                        Size textSize = ButtonItemLayout.MeasureItemText(this, g, _TextWidth, font, (_TextWidth > 0 ? eTextFormat.WordBreak : eTextFormat.SingleLine), parent.RightToLeft == RightToLeft.Yes);
+                        _TextSize = textSize;
+                        textSize.Width += _TextPadding.Horizontal;
+                        textSize.Height += _TextPadding.Vertical;
+                        int textContentSpacing = Dpi.Width(TextContentSpacing);
+                        if (_TextPosition == eTextPosition.Left || _TextPosition == eTextPosition.Right)
+                        {
+                            textSize.Width += textContentSpacing;
+                            r.Width += textSize.Width;
+                            r.Height = Math.Max(r.Height, textSize.Height);
+                        }
+                        else
+                        {
+                            textSize.Height += textContentSpacing;
+                            r.Height += textSize.Height;
+                            r.Width = Math.Max(r.Width, textSize.Width);
+                        }
+
+                    }
+                }
+            }
+
+            m_Rect = r;
+            base.RecalcSize();
+        }
+
+        private Rectangle _ProgressBarBounds = Rectangle.Empty;
+        private Rectangle GetProgressBarBounds()
+        {
+            int diameter = _Diameter;
+            if (!(this.ContainerControl is CircularProgress))
+                diameter = Dpi.Width(_Diameter);
+            if (string.IsNullOrEmpty(Text) || !_TextVisible)
+            {
+                return new Rectangle(m_Rect.X + (m_Rect.Width - diameter) / 2, m_Rect.Y + (m_Rect.Height - diameter) / 2, diameter, diameter);
+            }
+
+            if (_TextPosition == eTextPosition.Top)
+            {
+                return new Rectangle(m_Rect.X + (m_Rect.Width - diameter) / 2, m_Rect.Y + (m_Rect.Height - diameter), diameter, diameter);
+            }
+            else if (_TextPosition == eTextPosition.Right)
+            {
+                return new Rectangle(m_Rect.X, m_Rect.Y + (m_Rect.Height - diameter) / 2, diameter, diameter);
+            }
+            else if (_TextPosition == eTextPosition.Left)
+            {
+                return new Rectangle(m_Rect.Right - diameter, 
+                    m_Rect.Y + (m_Rect.Height - diameter) / 2, 
+                    diameter, diameter);
+            }
+            else if (_TextPosition == eTextPosition.Bottom)
+            {
+                return new Rectangle(m_Rect.X + (m_Rect.Width - diameter) / 2, m_Rect.Y, diameter, diameter);
+            }
+            return new Rectangle(m_Rect.X, m_Rect.Y, diameter, diameter);
+        }
+
+        private double[] _SpokeAngles = null;
+        private double[] GetSpokeAngles(int numberOfSpokes)
+        {
+            double[] angles = new double[numberOfSpokes];
+            double angleStep = 360d / numberOfSpokes;
+
+            for (int i = 0; i < numberOfSpokes; i++)
+                angles[i] = (i == 0 ? 270 + angleStep : angles[i - 1] + angleStep);
+
+            return angles;
+        }
+
+        private eCircularProgressType _ProgressBarType = eCircularProgressType.Line;
+        /// <summary>
+        /// Gets or sets the circular progress bar type.
+        /// </summary>
+        [DefaultValue(eCircularProgressType.Line), Category("Appearance"), Description("Indicates circular progress bar type.")]
+        public eCircularProgressType ProgressBarType
+        {
+            get { return _ProgressBarType; }
+            set
+            {
+                if (value != _ProgressBarType)
+                {
+                    eCircularProgressType oldValue = _ProgressBarType;
+                    _ProgressBarType = value;
+                    OnProgressBarTypeChanged(oldValue, value);
+                }
+            }
+        }
+
+        private void OnProgressBarTypeChanged(eCircularProgressType oldValue, eCircularProgressType newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("ProgressBarType"));
+            this.Refresh();
+        }
+
+        private int _Maximum = 100;
+        /// <summary>
+        /// Gets or sets the maximum value of the progress bar.
+        /// </summary>
+        [Description("Indicates maximum value of the progress bar."), Category("Behavior"), DefaultValue(100)]
+        public int Maximum
+        {
+            get { return _Maximum; }
+            set
+            {
+                if (value != _Maximum)
+                {
+                    int oldValue = _Maximum;
+                    _Maximum = value;
+                    OnMaximumChanged(oldValue, value);
+                }
+            }
+        }
+        private void OnMaximumChanged(int oldValue, int newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("Maximum"));
+            CoerceValue();
+        }
+
+        private int _Minimum = 0;
+        /// <summary>
+        /// Gets or sets the minimum value of the progress bar.
+        /// </summary>
+        [Description("Indicates minimum value of the progress bar."), Category("Behavior"), DefaultValue(0)]
+        public int Minimum
+        {
+            get { return _Minimum; }
+            set
+            {
+                if (value != _Minimum)
+                {
+                    int oldValue = _Minimum;
+                    _Minimum = value;
+                    OnMinimumChanged(oldValue, value);
+                }
+            }
+        }
+        private void OnMinimumChanged(int oldValue, int newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("Minimum"));
+            CoerceValue();
+        }
+
+        private void CoerceValue()
+        {
+            int newValue = _Value;
+            if (_Value < _Minimum)
+                newValue = _Minimum;
+            else if (_Value > _Maximum)
+                newValue = _Maximum;
+            Value = newValue;
+        }
+
+        private Color _ProgressTextColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets the color of the progress percentage text.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates color of progress percentage text")]
+        public Color ProgressTextColor
+        {
+            get { return _ProgressTextColor; }
+            set { _ProgressTextColor = value; this.Refresh(); }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeProgressTextColor()
+        {
+            return !_ProgressTextColor.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetProgressTextColor()
+        {
+            this.ProgressTextColor = Color.Empty;
+        }
+
+        private bool _ProgressTextVisible = false;
+        /// <summary>
+        /// Gets or sets whether text that displays the progress bar completion percentage text is visible. Default value is false.
+        /// </summary>
+        [DefaultValue(false), Category("Appearance"), Description("Indicates whether text that displays the progress bar completion percentage text is visible")]
+        public bool ProgressTextVisible
+        {
+            get { return _ProgressTextVisible; }
+            set
+            {
+                if (value != _ProgressTextVisible)
+                {
+                    bool oldValue = _ProgressTextVisible;
+                    _ProgressTextVisible = value;
+                    OnProgressTextVisibleChanged(oldValue, value);
+                }
+            }
+        }
+
+        private void OnProgressTextVisibleChanged(bool oldValue, bool newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("ProgressTextVisible"));
+            this.Refresh();
+        }
+
+        private string _ProgressText = "";
+        /// <summary>
+        /// Gets or sets the text displayed on top of the circular progress bar.
+        /// </summary>
+        [DefaultValue(""), Category("Appearance"), Description("Indicates text displayed on top of the circular progress bar.")]
+        public string ProgressText
+        {
+            get { return _ProgressText; }
+            set
+            {
+                if (value != _ProgressText)
+                {
+                    string oldValue = _ProgressText;
+                    _ProgressText = value;
+                    OnProgressTextChanged(oldValue, value);
+                }
+            }
+        }
+
+        private void OnProgressTextChanged(string oldValue, string newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("ProgressText"));
+            Refresh();
+        }
+
+        private int _Value;
+        /// <summary>
+        /// Gets or sets the current value of the progress bar.
+        /// </summary>
+        [Description("Indicates current value of the progress bar."), Category("Behavior"), DefaultValue(0)]
+        public int Value
+        {
+            get { return _Value; }
+            set
+            {
+                value = Math.Min(_Maximum, Math.Max(value, _Minimum));
+
+                if (value != _Value)
+                {
+                    int oldValue = _Value;
+                    _Value = value;
+                    OnValueChanged(oldValue, value);
+                }
+            }
+        }
+
+        private void OnValueChanged(int oldValue, int newValue)
+        {
+            if (!_IsEndlessProgressBar)
+                this.Refresh();
+            OnValueChanged(EventArgs.Empty);
+            OnPropertyChanged(new PropertyChangedEventArgs("Value"));
+        }
+
+        /// <summary>
+        /// Occurs when Value property has changed.
+        /// </summary>
+        public event EventHandler ValueChanged;
+        /// <summary>
+        /// Raises ValueChanged event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnValueChanged(EventArgs e)
+        {
+            EventHandler handler = ValueChanged;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        /// <summary>
+        /// Called when property on CircularProgressBar changes.
+        /// </summary>
+        /// <param name="propertyChangedEventArgs">Property Change Arguments</param>
+        protected virtual void OnPropertyChanged(PropertyChangedEventArgs e)
+        {
+        }
+
+        private void MoveEndlessProgressBar()
+        {
+            if (!this.IsRunning || this.IsDisposed || _IsDisposing) return;
+
+            if (this.InvokeRequired)
+            {
+                this.BeginInvoke(new MethodInvoker(delegate()
+                {
+                    MoveEndlessProgressBar();
+                }));
+                return;
+            }
+
+            _EndlessProgressValue = ++_EndlessProgressValue % _SpokeCount;
+            this.Refresh();
+            Control container = this.ContainerControl as Control;
+            if (container != null)
+                container.Update();
+        }
+
+        private bool _IsEndlessProgressBar = false;
+        private BackgroundWorker _LoopWorker = null;
+        /// <summary>
+        /// Starts the progress bar loop for endless type progress bar. Progress bar will continue to run until Stop() method is called.
+        /// </summary>
+        public void Start()
+        {
+            if (_IsRunning) return;
+
+            _IsEndlessProgressBar = true;
+            _IsRunning = true;
+            _LoopWorker = new BackgroundWorker();
+            _LoopWorker.WorkerSupportsCancellation = true;
+            _LoopWorker.DoWork += LoopWorkerDoWork;
+            _LoopWorker.RunWorkerAsync();
+        }
+
+        void LoopWorkerDoWork(object sender, DoWorkEventArgs e)
+        {
+            BackgroundWorker worker = (BackgroundWorker)sender;
+            while (!worker.CancellationPending)
+            {
+                MoveEndlessProgressBar();
+                try
+                {
+                    using (
+                                        System.Threading.ManualResetEvent wait =
+                                            new System.Threading.ManualResetEvent(false))
+                        wait.WaitOne(_AnimationSpeed);
+                    //Thread.Sleep(_AnimationSpeed);
+                }
+                catch
+                {
+                    e.Cancel = true;
+                }
+            }
+            e.Cancel = true;
+        }
+
+        /// <summary>
+        /// Stops the progress bar loop for endless type progress bar.
+        /// </summary>
+        public void Stop()
+        {
+            Stop(false);
+        }
+        public void Stop(bool disposing)
+        {
+            if (!_IsRunning) return;
+
+            _IsEndlessProgressBar = false;
+
+            _IsRunning = false;
+            BackgroundWorker worker = _LoopWorker;
+            _LoopWorker = null;
+
+            worker.CancelAsync();
+            while (worker.IsBusy)
+                Application.DoEvents();
+            worker.DoWork -= LoopWorkerDoWork;
+            worker.Dispose();
+            if (!disposing)
+                this.Refresh();
+        }
+
+        private bool _IsRunning = false;
+        /// <summary>
+        /// Gets or sets whether endless type progress bar is running.
+        /// </summary>
+        [Browsable(false), DefaultValue(false)]
+        public bool IsRunning
+        {
+            get { return _IsRunning; }
+            set
+            {
+                if (_IsRunning != value)
+                {
+                    if (value)
+                        Start();
+                    else
+                        Stop();
+                }
+            }
+        }
+
+        private static readonly Color DefaultProgressColor = Color.DarkSlateGray;//Color.FromArgb(143, 223, 95);
+        private Color _ProgressColor = DefaultProgressColor;
+        /// <summary>
+        /// Gets or sets the color of the color of progress indicator.
+        /// </summary>
+        [Category("Columns"), Description("Indicates color of progress indicator.")]
+        public Color ProgressColor
+        {
+            get { return _ProgressColor; }
+            set { _ProgressColor = value; this.Refresh(); }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeProgressColor()
+        {
+            return _ProgressColor != DefaultProgressColor;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetProgressColor()
+        {
+            this.ProgressColor = DefaultProgressColor;
+        }
+
+        private int _Diameter = 24;
+        /// <summary>
+        /// Gets or sets circular progress indicator diameter in pixels.
+        /// </summary>
+        [DefaultValue(24), Category("Appearance"), Description("Indicates circular progress indicator diameter in pixels.")]
+        public int Diameter
+        {
+            get { return _Diameter; }
+            set
+            {
+                if (value != _Diameter)
+                {
+                    int oldValue = _Diameter;
+                    _Diameter = value;
+                    OnDiameterChanged(oldValue, value);
+                }
+            }
+        }
+        private void OnDiameterChanged(int oldValue, int newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("Diameter"));
+            NeedRecalcSize = true;
+            this.Refresh();
+        }
+
+        private eTextPosition _TextPosition = eTextPosition.Left;
+        /// <summary>
+        /// Gets or sets the text position in relation to the circular progress indicator.
+        /// </summary>
+        [DefaultValue(eTextPosition.Left), Category("Appearance"), Description("Indicatesd text position in relation to the circular progress indicator.")]
+        public eTextPosition TextPosition
+        {
+            get { return _TextPosition; }
+            set
+            {
+                if (value != _TextPosition)
+                {
+                    eTextPosition oldValue = _TextPosition;
+                    _TextPosition = value;
+                    OnTextPositionChanged(oldValue, value);
+                }
+            }
+        }
+        private void OnTextPositionChanged(eTextPosition oldValue, eTextPosition newValue)
+        {
+            NeedRecalcSize = true;
+            this.Refresh();
+            OnPropertyChanged(new PropertyChangedEventArgs("TextPosition"));
+        }
+
+        private bool _TextVisible = true;
+        /// <summary>
+        /// Gets or sets whether text/label displayed next to the item is visible. 
+        /// </summary>
+        [DefaultValue(true), Category("Appearance"), Description("Indicates whether caption/label set using Text property is visible.")]
+        public bool TextVisible
+        {
+            get { return _TextVisible; }
+            set
+            {
+                if (value != _TextVisible)
+                {
+                    bool oldValue = _TextVisible;
+                    _TextVisible = value;
+                    OnTextVisibleChanged(oldValue, value);
+                }
+            }
+        }
+
+        private void OnTextVisibleChanged(bool oldValue, bool newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("TextVisible"));
+            NeedRecalcSize = true;
+            this.Refresh();
+        }
+
+        private int _TextWidth = 0;
+        /// <summary>
+        /// Gets or sets the suggested text-width. If you want to make sure that text you set wraps over multiple lines you can set suggested text-width so word break is performed.
+        /// </summary>
+        [DefaultValue(0), Category("Appearance"), Description("Indicates suggested text-width. If you want to make sure that text you set wraps over multiple lines you can set suggested text-width so word break is performed.")]
+        public int TextWidth
+        {
+            get { return _TextWidth; }
+            set
+            {
+                if (value != _TextWidth)
+                {
+                    int oldValue = _TextWidth;
+                    _TextWidth = value;
+                    OnTextWidthChanged(oldValue, value);
+                }
+            }
+        }
+        private void OnTextWidthChanged(int oldValue, int newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("TextWidth"));
+            NeedRecalcSize = true;
+            Refresh();
+        }
+
+        private Padding _TextPadding = new Padding(0, 0, 0, 0);
+        /// <summary>
+        /// Gets or sets text padding.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), Description("Gets or sets text padding."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public Padding TextPadding
+        {
+            get { return _TextPadding; }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeTextPadding()
+        {
+            return _TextPadding.Bottom != 0 || _TextPadding.Top != 0 || _TextPadding.Left != 0 || _TextPadding.Right != 0;
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetTextPadding()
+        {
+            _TextPadding = new Padding(0, 0, 0, 0);
+        }
+        private void TextPaddingPropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            NeedRecalcSize = true;
+            this.Refresh();
+        }
+
+        private Color _TextColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets the color of the text label.
+        /// </summary>
+        [Category("Columns"), Description("Indicates color of text label.")]
+        public Color TextColor
+        {
+            get { return _TextColor; }
+            set { _TextColor = value; this.Refresh(); }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeTextColor()
+        {
+            return !_TextColor.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetTextColor()
+        {
+            this.TextColor = Color.Empty;
+        }
+
+        private static readonly Color DefaultPieBorderDarkColor = Color.FromArgb(50, Color.Black);
+        private Color _PieBorderDark = DefaultPieBorderDarkColor;
+        /// <summary>
+        /// Gets or sets the color of the pie progress bar dark border. 
+        /// </summary>
+        [Category("Pie"), Description("Indicates color of pie progress bar dark border.")]
+        public Color PieBorderDark
+        {
+            get { return _PieBorderDark; }
+            set { _PieBorderDark = value; this.Refresh(); }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializePieBorderDark()
+        {
+            return _PieBorderDark != DefaultPieBorderDarkColor;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetPieBorderDark()
+        {
+            this.PieBorderDark = DefaultPieBorderDarkColor;
+        }
+
+        private static readonly Color DefaultPieBorderLightColor = Color.FromArgb(255, Color.White);
+        private Color _PieBorderLight = DefaultPieBorderLightColor;
+        /// <summary>
+        /// Gets or sets the color of the pie progress bar light border. 
+        /// </summary>
+        [Category("Pie"), Description("Indicates color of pie progress bar light border. ")]
+        public Color PieBorderLight
+        {
+            get { return _PieBorderLight; }
+            set { _PieBorderLight = value; this.Refresh(); }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializePieBorderLight()
+        {
+            return _PieBorderLight != DefaultPieBorderLightColor;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetPieBorderLight()
+        {
+            this.PieBorderLight = DefaultPieBorderLightColor;
+        }
+
+        private static readonly Color DefaultSpokeBorderDarkColor = Color.FromArgb(48, Color.Black);
+        private Color _SpokeBorderDark = DefaultSpokeBorderDarkColor;
+        /// <summary>
+        /// Gets or sets the color of the spoke progress bar dark border.
+        /// </summary>
+        [Category("Spoke"), Description("Indicates color of spoke progress bar dark border.")]
+        public Color SpokeBorderDark
+        {
+            get { return _SpokeBorderDark; }
+            set { _SpokeBorderDark = value; this.Refresh(); }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeSpokeBorderDark()
+        {
+            return _SpokeBorderDark != DefaultSpokeBorderDarkColor;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetSpokeBorderDark()
+        {
+            this.SpokeBorderDark = DefaultSpokeBorderDarkColor;
+        }
+
+        private static readonly Color DefaultSpokeBorderLightColor = Color.FromArgb(255, Color.White);
+        private Color _SpokeBorderLight = DefaultSpokeBorderLightColor;
+        /// <summary>
+        /// Gets or sets the color of the spoke progress bar light border.
+        /// </summary>
+        [Category("Spoke"), Description("Indicates color of spoke progress bar light border..")]
+        public Color SpokeBorderLight
+        {
+            get { return _SpokeBorderLight; }
+            set { _SpokeBorderLight = value; this.Refresh(); }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeSpokeBorderLight()
+        {
+            return _SpokeBorderLight != DefaultSpokeBorderLightColor;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetSpokeBorderLight()
+        {
+            this.SpokeBorderLight = DefaultSpokeBorderLightColor;
+        }
+
+        private string _ProgressTextFormat = "{0}%";
+        /// <summary>
+        /// Gets or sets format string for progress value.
+        /// </summary>
+        [DefaultValue("{0}%"), Category("Appearance"), Description("Indicates format string for progress value.")]
+        public string ProgressTextFormat
+        {
+            get { return _ProgressTextFormat; }
+            set
+            {
+                if (value != _ProgressTextFormat)
+                {
+                    string oldValue = _ProgressTextFormat;
+                    _ProgressTextFormat = value;
+                    OnProgressTextFormatChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when ProgressTextFormat property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnProgressTextFormatChanged(string oldValue, string newValue)
+        {
+            this.Refresh();
+            OnPropertyChanged(new PropertyChangedEventArgs("ProgressTextFormat"));
+        }
+
+        private int _AnimationSpeed = 100;
+        /// <summary>
+        /// Gets or sets the animation speed for endless running progress. Lower number means faster running.
+        /// </summary>
+        [DefaultValue(100), Description("Indicates the animation speed for endless running progress. Lower number means faster running."), Category("Behavior")]
+        public int AnimationSpeed
+        {
+            get { return _AnimationSpeed; }
+            set 
+            {
+                if (value < 1)
+                    value = 1;
+                _AnimationSpeed = value; 
+            }
+        }
+        #endregion
+    }
+
+    /// <summary>
+    /// Defines available circular progress bar types.
+    /// </summary>
+    public enum eCircularProgressType
+    {
+        /// <summary>
+        /// Line spokes progress bar.
+        /// </summary>
+        Line,
+        /// <summary>
+        /// Dot type/FireFox progress bar.
+        /// </summary>
+        Dot,
+        /// <summary>
+        /// Donut type progress bar.
+        /// </summary>
+        Donut,
+        /// <summary>
+        /// Spoke type progress bar.
+        /// </summary>
+        Spoke,
+        /// <summary>
+        /// Pie type progress bar.
+        /// </summary>
+        Pie
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/ColorFunctions.cs b/PROMS/DotNetBar Source Code/ColorFunctions.cs
new file mode 100644
index 00000000..d1ab3f8a
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/ColorFunctions.cs	
@@ -0,0 +1,441 @@
+namespace DevComponents.DotNetBar
+{
+    using System;
+    using System.Drawing;
+
+    /// <summary>
+    ///    Summary description for ColorFunctions.
+    /// </summary>
+    public class ColorFunctions
+    {
+        private static Color m_HoverBackColor;
+        private static Color m_HoverBackColor2;
+        private static Color m_HoverBackColor3;
+        private static Color m_CheckBoxBackColor;
+        private static Color m_MenuBackColor;
+        private static Color m_MenuFocusBorderColor;
+        private static Color m_PressedBackColor;
+        private static Color m_ToolMenuFocusBackColor;
+        private static Color m_SideRecentlyBackColor;
+        private static Color m_RecentlyUsedOfficeBackColor;
+
+        private static Bitmap m_PushedBrushBmp = null;
+
+        internal static bool ColorsLoaded = false;
+
+        public static void LoadColors()
+        {
+            RefreshColors();
+            if (!ColorsLoaded)
+                Microsoft.Win32.SystemEvents.UserPreferenceChanged += new Microsoft.Win32.UserPreferenceChangedEventHandler(ColorFunctions.PreferenceChanged);
+            ColorsLoaded = true;
+        }
+
+        private static void PreferenceChanged(object sender, Microsoft.Win32.UserPreferenceChangedEventArgs e)
+        {
+            RefreshColors();
+            NativeFunctions.RefreshSettings();
+            BarFunctions.RefreshScreens();
+        }
+
+        private static void RefreshColors()
+        {
+            if (NativeFunctions.ColorDepth >= 16)
+            {
+                int red = (int)((System.Drawing.SystemColors.Highlight.R - System.Drawing.SystemColors.Window.R) * .30 + System.Drawing.SystemColors.Window.R);
+                int green = (int)((System.Drawing.SystemColors.Highlight.G - System.Drawing.SystemColors.Window.G) * .30 + System.Drawing.SystemColors.Window.G);
+                int blue = (int)((System.Drawing.SystemColors.Highlight.B - System.Drawing.SystemColors.Window.B) * .30 + System.Drawing.SystemColors.Window.B);
+                m_HoverBackColor = Color.FromArgb(red, green, blue);
+
+                red = (int)((System.Drawing.SystemColors.Highlight.R - System.Drawing.SystemColors.Window.R) * .45 + System.Drawing.SystemColors.Window.R);
+                green = (int)((System.Drawing.SystemColors.Highlight.G - System.Drawing.SystemColors.Window.G) * .45 + System.Drawing.SystemColors.Window.G);
+                blue = (int)((System.Drawing.SystemColors.Highlight.B - System.Drawing.SystemColors.Window.B) * .45 + System.Drawing.SystemColors.Window.B);
+                m_HoverBackColor2 = Color.FromArgb(red, green, blue);
+
+                red = (int)((System.Drawing.SystemColors.Highlight.R - System.Drawing.SystemColors.Window.R) * .10 + System.Drawing.SystemColors.Window.R);
+                green = (int)((System.Drawing.SystemColors.Highlight.G - System.Drawing.SystemColors.Window.G) * .10 + System.Drawing.SystemColors.Window.G);
+                blue = (int)((System.Drawing.SystemColors.Highlight.B - System.Drawing.SystemColors.Window.B) * .10 + System.Drawing.SystemColors.Window.B);
+                m_HoverBackColor3 = Color.FromArgb(red, green, blue);
+
+                red = (int)((System.Drawing.SystemColors.Highlight.R - System.Drawing.SystemColors.Window.R) * .25 + System.Drawing.SystemColors.Window.R);
+                green = (int)((System.Drawing.SystemColors.Highlight.G - System.Drawing.SystemColors.Window.G) * .25 + System.Drawing.SystemColors.Window.G);
+                blue = (int)((System.Drawing.SystemColors.Highlight.B - System.Drawing.SystemColors.Window.B) * .25 + System.Drawing.SystemColors.Window.B);
+                m_CheckBoxBackColor = Color.FromArgb(red, green, blue);
+
+                if (NativeFunctions.ColorDepth <= 16)
+                {
+                    m_MenuBackColor = System.Drawing.SystemColors.ControlLightLight;
+                }
+                else
+                {
+                    red = (int)((System.Drawing.SystemColors.Control.R - System.Drawing.Color.White.R) * .20 + System.Drawing.Color.White.R);
+                    green = (int)((System.Drawing.SystemColors.Control.G - System.Drawing.Color.White.G) * .20 + System.Drawing.Color.White.G);
+                    blue = (int)((System.Drawing.SystemColors.Control.B - System.Drawing.Color.White.B) * .20 + System.Drawing.Color.White.B);
+                    m_MenuBackColor = Color.FromArgb(red, green, blue);
+                }
+
+                red = (int)(System.Drawing.SystemColors.ControlDark.R * .80);
+                green = (int)(System.Drawing.SystemColors.ControlDark.G * .80);
+                blue = (int)(System.Drawing.SystemColors.ControlDark.B * .80);
+                m_MenuFocusBorderColor = Color.FromArgb(red, green, blue);
+
+                // and Highlight color
+                red = (int)((System.Drawing.SystemColors.Highlight.R - System.Drawing.SystemColors.Window.R) * .25 + System.Drawing.SystemColors.Window.R);
+                green = (int)((System.Drawing.SystemColors.Highlight.G - System.Drawing.SystemColors.Window.G) * .25 + System.Drawing.SystemColors.Window.G);
+                blue = (int)((System.Drawing.SystemColors.Highlight.B - System.Drawing.SystemColors.Window.B) * .25 + System.Drawing.SystemColors.Window.B);
+                m_PressedBackColor = Color.FromArgb(red, green, blue);
+
+                red = (int)((System.Drawing.SystemColors.Control.R - System.Drawing.Color.White.R) * .80 + System.Drawing.Color.White.R);
+                green = (int)((System.Drawing.SystemColors.Control.G - System.Drawing.Color.White.G) * .80 + System.Drawing.Color.White.G);
+                blue = (int)((System.Drawing.SystemColors.Control.B - System.Drawing.Color.White.B) * .80 + System.Drawing.Color.White.B);
+                m_ToolMenuFocusBackColor = Color.FromArgb(red, green, blue);
+
+                red = (int)((System.Drawing.SystemColors.Control.R - System.Drawing.Color.White.R) * .50 + System.Drawing.Color.White.R);
+                green = (int)((System.Drawing.SystemColors.Control.G - System.Drawing.Color.White.G) * .50 + System.Drawing.Color.White.G);
+                blue = (int)((System.Drawing.SystemColors.Control.B - System.Drawing.Color.White.B) * .50 + System.Drawing.Color.White.B);
+                m_RecentlyUsedOfficeBackColor = Color.FromArgb(red, green, blue);
+
+                m_SideRecentlyBackColor = System.Drawing.SystemColors.Control;
+            }
+            else
+            {
+                m_HoverBackColor = System.Drawing.SystemColors.ControlLightLight;
+                m_HoverBackColor2 = m_HoverBackColor;
+                m_HoverBackColor3 = m_HoverBackColor;
+                m_CheckBoxBackColor = System.Drawing.SystemColors.ControlLight;
+                m_MenuBackColor = System.Drawing.SystemColors.ControlLightLight;
+                m_MenuFocusBorderColor = System.Drawing.SystemColors.ControlDark;
+                m_PressedBackColor = System.Drawing.SystemColors.ControlLight;
+                m_ToolMenuFocusBackColor = System.Drawing.SystemColors.ControlLight;
+                m_RecentlyUsedOfficeBackColor = System.Drawing.SystemColors.ControlLight;
+                m_SideRecentlyBackColor = System.Drawing.SystemColors.Control;
+            }
+
+            if (m_PushedBrushBmp != null)
+            {
+                m_PushedBrushBmp.Dispose();
+                m_PushedBrushBmp = new System.Drawing.Bitmap(2, 2);
+                m_PushedBrushBmp.SetPixel(0, 0, System.Drawing.SystemColors.Control);
+                m_PushedBrushBmp.SetPixel(1, 0, System.Drawing.SystemColors.ControlLightLight);
+                m_PushedBrushBmp.SetPixel(0, 1, System.Drawing.SystemColors.ControlLightLight);
+                m_PushedBrushBmp.SetPixel(1, 1, System.Drawing.SystemColors.Control);
+            }
+        }
+
+        public static Color GetShade(Color color, int shadePercent)
+        {
+            HLSColor hls = RGBToHSL(color);
+            if (hls.Lightness == 0)
+                return HLSToRGB(hls.Hue, shadePercent / 100, hls.Saturation);
+            else
+                return HLSToRGB(hls.Hue, Math.Max(0, (hls.Lightness - shadePercent / 100)), hls.Saturation);
+        }
+
+        public struct HLSColor
+        {
+            public double Hue;
+            public double Lightness;
+            public double Saturation;
+        }
+        //public struct RGBColor
+        //{
+        //    public int Red;
+        //    public int Green;
+        //    public int Blue;
+        //}
+        public static HLSColor RGBToHSL(int Red, int Green, int Blue)
+        {
+            double Max, Min, delta;
+            double rR, rG, rB;
+            HLSColor ret = new HLSColor();
+
+            rR = (double)Red / 255;
+            rG = (double)Green / 255;
+            rB = (double)Blue / 255;
+
+            // Given: rgb each in [0,1].
+            // Desired: h in [0,360] and s in [0,1], except if s=0, then h=UNDEFINED.}
+            Max = Maximum(rR, rG, rB);
+            Min = Minimum(rR, rG, rB);
+            delta = Max - Min;
+            ret.Lightness = (Max + Min) / 2;    // {This is the lightness}
+            // {Next calculate saturation}
+
+            if (Max == Min)
+            {
+                // begin {Acrhomatic case}
+                ret.Saturation = 0;
+                ret.Hue = 0;
+                // end {Acrhomatic case}	
+            }
+            else
+            {
+                // begin {Chromatic case}
+                // {First calculate the saturation.}
+                if (ret.Lightness <= 0.5)
+                    ret.Saturation = (Max - Min) / (Max + Min);
+                else
+                    ret.Saturation = (Max - Min) / (2 - Max - Min);
+                // {Next calculate the hue.}
+                
+                double delr = (((Max - rR) / 6) + (delta / 2)) / delta;
+                double delg = (((Max - rG) / 6) + (delta / 2)) / delta;
+                double delb = (((Max - rB) / 6) + (delta / 2)) / delta;
+
+                if (rR == Max)
+                    ret.Hue = delb - delg;		//{Resulting color is between yellow and magenta}
+                else if (rG == Max)
+                    ret.Hue = (1d / 3d) + delr - delb;	// {Resulting color is between cyan and yellow}
+                else if (rB == Max)
+                    ret.Hue = (2d / 3d) + delg - delr;;	// {Resulting color is between magenta and cyan}
+
+                if (ret.Hue < 0) ret.Hue += 1;
+                if (ret.Hue > 1) ret.Hue -= 1;
+            }
+            return ret;
+        }
+
+        public static HLSColor RGBToHSL(Color color)
+        {
+            return RGBToHSL(color.R, color.G, color.B);
+        }
+
+        private static double Maximum(double rR, double rG, double rB)
+        {
+            double ret = 0;
+            if (rR > rG)
+            {
+                if (rR > rB)
+                    ret = rR;
+                else
+                    ret = rB;
+            }
+            else
+            {
+                if (rB > rG)
+                    ret = rB;
+                else
+                    ret = rG;
+            }
+            return ret;
+        }
+
+        private static double Minimum(double rR, double rG, double rB)
+        {
+            double ret = 0;
+            if (rR < rG)
+            {
+                if (rR < rB)
+                    ret = rR;
+                else
+                    ret = rB;
+            }
+            else
+            {
+                if (rB < rG)
+                    ret = rB;
+                else
+                    ret = rG;
+            }
+            return ret;
+        }
+
+        public static Color HLSToRGB(double Hue, double Lightness, double Saturation)
+        {
+            if (Lightness < 0) Lightness = 0; else if (Lightness > 1) Lightness = 1;
+            if (Saturation < 0) Saturation = 0; else if (Saturation > 1) Saturation = 1;
+
+            int r, g, b;
+            double var1, var2;
+            if (Saturation == 0)
+            {
+                r = (int)(Lightness * 255);
+                g = (int)(Lightness * 255);
+                b = (int)(Lightness * 255);
+            }
+            else
+            {
+                if (Lightness < 0.5)
+                {
+                    var2 = Lightness * (1 + Saturation);
+                }
+                else
+                {
+                    var2 = (Lightness + Saturation) - (Saturation * Lightness);
+                }
+
+                var1 = 2 * Lightness - var2;
+                r = (int)(255 * hue_2_rgb(var1, var2, Hue + (1d / 3d)));
+                g = (int)(255 * hue_2_rgb(var1, var2, Hue));
+                b = (int)(255 * hue_2_rgb(var1, var2, Hue - (1d / 3d)));
+            }
+
+            return Color.FromArgb(r, g, b);
+        }
+
+        private static double hue_2_rgb(double v1, double v2,double vh)
+        {
+            if (vh < 0)
+            {
+                vh += 1;
+            }
+
+            if (vh > 1)
+            {
+                vh -= 1;
+            }
+
+            if ((6 * vh) < 1)
+            {
+                return (v1 + (v2 - v1) * 6 * vh);
+            };
+
+            if ((2 * vh) < 1)
+            {
+                return (v2);
+            };
+
+            if ((3 * vh) < 2)
+            {
+                return (v1 + (v2 - v1) * ((2d / 3d - vh) * 6));
+            };
+
+            return (v1);
+        }
+
+        public static Color HLSToRGB(HLSColor clr)
+        {
+            return HLSToRGB(clr.Hue, clr.Lightness, clr.Saturation);
+        }
+
+        public static System.Drawing.Color HoverBackColor()
+        {
+            return m_HoverBackColor;
+        }
+
+        public static System.Drawing.Color HoverBackColor2()
+        {
+            return m_HoverBackColor2;
+        }
+
+        public static System.Drawing.Color HoverBackColor3()
+        {
+            return m_HoverBackColor3;
+        }
+
+        public static System.Drawing.Color HoverBackColor(System.Drawing.Graphics g)
+        {
+            return g.GetNearestColor(HoverBackColor());
+        }
+
+        public static System.Drawing.Color PressedBackColor()
+        {
+            return m_PressedBackColor;
+        }
+
+        public static System.Drawing.Color PressedBackColor(System.Drawing.Graphics g)
+        {
+            return g.GetNearestColor(PressedBackColor());
+        }
+
+        public static System.Drawing.Color CheckBoxBackColor()
+        {
+            return m_CheckBoxBackColor;
+        }
+
+        public static System.Drawing.Color CheckBoxBackColor(System.Drawing.Graphics g)
+        {
+            return g.GetNearestColor(CheckBoxBackColor());
+        }
+
+        public static System.Drawing.Color ToolMenuFocusBackColor()
+        {
+            return m_ToolMenuFocusBackColor;
+        }
+
+        public static System.Drawing.Color RecentlyUsedOfficeBackColor()
+        {
+            return m_RecentlyUsedOfficeBackColor;
+        }
+
+        public static System.Drawing.Color RecentlyUsedOfficeBackColor(System.Drawing.Graphics g)
+        {
+            return g.GetNearestColor(RecentlyUsedOfficeBackColor());
+        }
+
+        public static System.Drawing.Color SideRecentlyBackColor(System.Drawing.Graphics g)
+        {
+            return g.GetNearestColor(SideRecentlyBackColor());
+        }
+
+        public static System.Drawing.Color SideRecentlyBackColor()
+        {
+            return m_SideRecentlyBackColor;
+        }
+
+        public static System.Drawing.Color ToolMenuFocusBackColor(System.Drawing.Graphics g)
+        {
+            return g.GetNearestColor(ToolMenuFocusBackColor());
+        }
+
+        public static System.Drawing.Color MenuFocusBorderColor()
+        {
+            return m_MenuFocusBorderColor;
+        }
+
+        public static System.Drawing.Color MenuFocusBorderColor(System.Drawing.Graphics g)
+        {
+            return g.GetNearestColor(MenuFocusBorderColor());
+        }
+
+        public static System.Drawing.Color MenuBackColor()
+        {
+            return m_MenuBackColor;
+        }
+
+        public static System.Drawing.Color MenuBackColor(System.Drawing.Graphics g)
+        {
+            return g.GetNearestColor(MenuBackColor());
+        }
+        public static System.Drawing.Brush GetPushedBrush(BaseItem item)
+        {
+            if (item.Parent is GenericItemContainer)
+            {
+                if (!((GenericItemContainer)item.Parent).m_BackgroundColor.IsEmpty)
+                {
+                    return new SolidBrush(((GenericItemContainer)item.Parent).m_BackgroundColor);
+                }
+            }
+            else if (item.Parent is SideBarPanelItem)
+            {
+                if (((SideBarPanelItem)item.Parent).BackgroundStyle.ShouldSerializeBackColor1())
+                {
+                    return new SolidBrush(((SideBarPanelItem)item.Parent).BackgroundStyle.BackColor1.Color);
+                }
+                else if (((SideBarPanelItem)item.Parent).BackgroundStyle.ShouldSerializeBackColor1())
+                {
+                    return new SolidBrush(((SideBarPanelItem)item.Parent).BackgroundStyle.BackColor1.Color);
+                }
+            }
+
+            return ColorFunctions.GetPushedBrush();
+        }
+        public static System.Drawing.TextureBrush GetPushedBrush()
+        {
+            if (m_PushedBrushBmp == null)
+            {
+                m_PushedBrushBmp = new System.Drawing.Bitmap(2, 2);
+                m_PushedBrushBmp.SetPixel(0, 0, System.Drawing.SystemColors.Control);
+                m_PushedBrushBmp.SetPixel(1, 0, System.Drawing.SystemColors.ControlLightLight);
+                m_PushedBrushBmp.SetPixel(0, 1, System.Drawing.SystemColors.ControlLightLight);
+                m_PushedBrushBmp.SetPixel(1, 1, System.Drawing.SystemColors.Control);
+            }
+            return (new System.Drawing.TextureBrush(m_PushedBrushBmp));
+        }
+
+        public static bool IsEqual(Color color1, Color color2)
+        {
+            return color1.A == color2.A && color1.R == color2.R && color1.G == color2.G && color1.B == color2.B;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/ColorPicker.cs b/PROMS/DotNetBar Source Code/ColorPicker.cs
new file mode 100644
index 00000000..0be40a33
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/ColorPicker.cs	
@@ -0,0 +1,659 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Reflection;
+using System.Windows.Forms;
+using System.Windows.Forms.Design;
+
+namespace DevComponents.UI
+{
+	/// <summary>
+	/// Provides popup color picker.
+	/// </summary>
+	[ToolboxItem(false)]
+	internal class ColorPicker : UserControl
+	{
+		#region Private Variables
+		private Color[] m_CustomColors=new Color[48];
+		private Rectangle[] m_CustomColorsPos=new Rectangle[48];
+		private object m_ColorScheme=null;
+		private string m_TransText="";
+
+		private TabControl tabControl1;
+		private TabPage tabPage1;
+		private TabPage tabPage2;
+		private TabPage tabPage3;
+		private TabPage tabPage4;
+		private Label label1;
+		private ListBox listScheme;
+		private Button btnOK;
+		private Button btnCancel;
+		private Panel colorPanel;
+		private ListBox listSystem;
+		private ListBox listWeb;
+
+		private Color m_SelectedColor=Color.Empty;
+		private string m_SelectedColorSchemeName="";
+		private Panel colorPreview;
+		private TrackBar transparencyTrack;
+
+		private bool m_Canceled=false;
+
+		private IWindowsFormsEditorService m_EditorService=null;
+
+		/// <summary> 
+		/// Required designer variable.
+		/// </summary>
+		private Container components = null;
+		#endregion
+
+		#region Constructor and Dispose
+		public ColorPicker()
+		{
+			// This call is required by the Windows.Forms Form Designer.
+			InitializeComponent();
+
+			InitCustomColors();
+			InitOtherColors();
+			m_TransText=label1.Text;
+		}
+
+		/// <summary> 
+		/// Clean up any resources being used.
+		/// </summary>
+		protected override void Dispose( bool disposing )
+		{
+			if( disposing )
+			{
+				if(components != null)
+				{
+					components.Dispose();
+				}
+			}
+			base.Dispose( disposing );
+		}
+		#endregion
+
+		#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.tabControl1 = new System.Windows.Forms.TabControl();
+			this.tabPage1 = new System.Windows.Forms.TabPage();
+			this.listScheme = new System.Windows.Forms.ListBox();
+			this.tabPage2 = new System.Windows.Forms.TabPage();
+			this.listSystem = new System.Windows.Forms.ListBox();
+			this.tabPage3 = new System.Windows.Forms.TabPage();
+			this.listWeb = new System.Windows.Forms.ListBox();
+			this.tabPage4 = new System.Windows.Forms.TabPage();
+			this.colorPanel = new System.Windows.Forms.Panel();
+			this.transparencyTrack = new System.Windows.Forms.TrackBar();
+			this.label1 = new System.Windows.Forms.Label();
+			this.colorPreview = new System.Windows.Forms.Panel();
+			this.btnOK = new System.Windows.Forms.Button();
+			this.btnCancel = new System.Windows.Forms.Button();
+			this.tabControl1.SuspendLayout();
+			this.tabPage1.SuspendLayout();
+			this.tabPage2.SuspendLayout();
+			this.tabPage3.SuspendLayout();
+			this.tabPage4.SuspendLayout();
+			((System.ComponentModel.ISupportInitialize)(this.transparencyTrack)).BeginInit();
+			this.SuspendLayout();
+			// 
+			// tabControl1
+			// 
+			this.tabControl1.Controls.Add(this.tabPage1);
+			this.tabControl1.Controls.Add(this.tabPage2);
+			this.tabControl1.Controls.Add(this.tabPage3);
+			this.tabControl1.Controls.Add(this.tabPage4);
+			this.tabControl1.Location = new System.Drawing.Point(1, 1);
+			this.tabControl1.Name = "tabControl1";
+			this.tabControl1.SelectedIndex = 0;
+			this.tabControl1.Size = new System.Drawing.Size(208, 192);
+			this.tabControl1.TabIndex = 0;
+			this.tabControl1.SelectedIndexChanged += new System.EventHandler(this.tabControl1_SelectedIndexChanged);
+			// 
+			// tabPage1
+			// 
+			this.tabPage1.Controls.Add(this.listScheme);
+			this.tabPage1.Location = new System.Drawing.Point(4, 22);
+			this.tabPage1.Name = "tabPage1";
+			this.tabPage1.Size = new System.Drawing.Size(200, 166);
+			this.tabPage1.TabIndex = 0;
+			this.tabPage1.Text = "Scheme";
+			// 
+			// listScheme
+			// 
+			this.listScheme.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.listScheme.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed;
+			this.listScheme.IntegralHeight = false;
+			this.listScheme.Location = new System.Drawing.Point(0, 0);
+			this.listScheme.Name = "listScheme";
+			this.listScheme.Size = new System.Drawing.Size(200, 166);
+			this.listScheme.TabIndex = 0;
+			this.listScheme.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.DrawColorItem);
+			this.listScheme.SelectedIndexChanged += new System.EventHandler(this.ListSelectionChange);
+			// 
+			// tabPage2
+			// 
+			this.tabPage2.Controls.Add(this.listSystem);
+			this.tabPage2.Location = new System.Drawing.Point(4, 22);
+			this.tabPage2.Name = "tabPage2";
+			this.tabPage2.Size = new System.Drawing.Size(200, 166);
+			this.tabPage2.TabIndex = 1;
+			this.tabPage2.Text = "System";
+			// 
+			// listSystem
+			// 
+			this.listSystem.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.listSystem.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed;
+			this.listSystem.IntegralHeight = false;
+			this.listSystem.Location = new System.Drawing.Point(0, 0);
+			this.listSystem.Name = "listSystem";
+			this.listSystem.Size = new System.Drawing.Size(200, 166);
+			this.listSystem.TabIndex = 1;
+			this.listSystem.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.DrawColorItem);
+			this.listSystem.SelectedIndexChanged += new System.EventHandler(this.ListSelectionChange);
+			// 
+			// tabPage3
+			// 
+			this.tabPage3.Controls.Add(this.listWeb);
+			this.tabPage3.Location = new System.Drawing.Point(4, 22);
+			this.tabPage3.Name = "tabPage3";
+			this.tabPage3.Size = new System.Drawing.Size(200, 166);
+			this.tabPage3.TabIndex = 2;
+			this.tabPage3.Text = "Web";
+			// 
+			// listWeb
+			// 
+			this.listWeb.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.listWeb.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed;
+			this.listWeb.IntegralHeight = false;
+			this.listWeb.Location = new System.Drawing.Point(0, 0);
+			this.listWeb.Name = "listWeb";
+			this.listWeb.Size = new System.Drawing.Size(200, 166);
+			this.listWeb.TabIndex = 1;
+			this.listWeb.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.DrawColorItem);
+			this.listWeb.SelectedIndexChanged += new System.EventHandler(this.ListSelectionChange);
+			// 
+			// tabPage4
+			// 
+			this.tabPage4.Controls.Add(this.colorPanel);
+			this.tabPage4.Location = new System.Drawing.Point(4, 22);
+			this.tabPage4.Name = "tabPage4";
+			this.tabPage4.Size = new System.Drawing.Size(200, 166);
+			this.tabPage4.TabIndex = 3;
+			this.tabPage4.Text = "Custom";
+			// 
+			// colorPanel
+			// 
+			this.colorPanel.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.colorPanel.Location = new System.Drawing.Point(0, 0);
+			this.colorPanel.Name = "colorPanel";
+			this.colorPanel.Size = new System.Drawing.Size(200, 166);
+			this.colorPanel.TabIndex = 0;
+			this.colorPanel.MouseUp += new System.Windows.Forms.MouseEventHandler(this.CustomColorMouseUp);
+			this.colorPanel.Paint += new System.Windows.Forms.PaintEventHandler(this.PaintCustomColors);
+			// 
+			// transparencyTrack
+			// 
+			this.transparencyTrack.Enabled = false;
+			this.transparencyTrack.Location = new System.Drawing.Point(1, 204);
+			this.transparencyTrack.Maximum = 255;
+			this.transparencyTrack.Name = "transparencyTrack";
+			this.transparencyTrack.Size = new System.Drawing.Size(200, 45);
+			this.transparencyTrack.TabIndex = 1;
+			this.transparencyTrack.TickFrequency = 16;
+			this.transparencyTrack.Value = 255;
+			this.transparencyTrack.ValueChanged += new System.EventHandler(this.transparencyTrack_ValueChanged);
+			// 
+			// label1
+			// 
+			this.label1.Location = new System.Drawing.Point(1, 194);
+			this.label1.Name = "label1";
+			this.label1.Size = new System.Drawing.Size(136, 16);
+			this.label1.TabIndex = 2;
+			this.label1.Text = "Transparency";
+			// 
+			// colorPreview
+			// 
+			this.colorPreview.BackColor = System.Drawing.Color.White;
+			this.colorPreview.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+			this.colorPreview.Location = new System.Drawing.Point(8, 240);
+			this.colorPreview.Name = "colorPreview";
+			this.colorPreview.Size = new System.Drawing.Size(40, 32);
+			this.colorPreview.TabIndex = 3;
+			this.colorPreview.Paint += new System.Windows.Forms.PaintEventHandler(this.colorPreview_Paint);
+			// 
+			// btnOK
+			// 
+			this.btnOK.FlatStyle = System.Windows.Forms.FlatStyle.System;
+			this.btnOK.Location = new System.Drawing.Point(72, 248);
+			this.btnOK.Name = "btnOK";
+			this.btnOK.Size = new System.Drawing.Size(64, 24);
+			this.btnOK.TabIndex = 4;
+			this.btnOK.Text = "OK";
+			this.btnOK.Click += new System.EventHandler(this.btnOK_Click);
+			// 
+			// btnCancel
+			// 
+			this.btnCancel.FlatStyle = System.Windows.Forms.FlatStyle.System;
+			this.btnCancel.Location = new System.Drawing.Point(142, 248);
+			this.btnCancel.Name = "btnCancel";
+			this.btnCancel.Size = new System.Drawing.Size(64, 24);
+			this.btnCancel.TabIndex = 5;
+			this.btnCancel.Text = "Cancel";
+			this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
+			// 
+			// ColorPicker
+			// 
+			this.Controls.Add(this.btnCancel);
+			this.Controls.Add(this.btnOK);
+			this.Controls.Add(this.colorPreview);
+			this.Controls.Add(this.label1);
+			this.Controls.Add(this.tabControl1);
+			this.Controls.Add(this.transparencyTrack);
+			this.DockPadding.All = 1;
+			this.Name = "ColorPicker";
+			this.Size = new System.Drawing.Size(211, 280);
+			this.Paint += new System.Windows.Forms.PaintEventHandler(this.ColorPicker_Paint);
+			this.tabControl1.ResumeLayout(false);
+			this.tabPage1.ResumeLayout(false);
+			this.tabPage2.ResumeLayout(false);
+			this.tabPage3.ResumeLayout(false);
+			this.tabPage4.ResumeLayout(false);
+			((System.ComponentModel.ISupportInitialize)(this.transparencyTrack)).EndInit();
+			this.ResumeLayout(false);
+
+		}
+		#endregion
+
+		#region Color Init
+		private void InitCustomColors()
+		{
+			m_CustomColors[0]=Color.FromArgb(255,255,255);
+			m_CustomColors[1]=Color.FromArgb(255,195,198);
+			m_CustomColors[2]=Color.FromArgb(255,227,198);
+			m_CustomColors[3]=Color.FromArgb(255,255,198);
+			m_CustomColors[4]=Color.FromArgb(198,255,198);
+			m_CustomColors[5]=Color.FromArgb(198,255,255);
+			m_CustomColors[6]=Color.FromArgb(198,195,255);
+			m_CustomColors[7]=Color.FromArgb(255,195,255);
+
+			m_CustomColors[8]=Color.FromArgb(231,227,231);
+			m_CustomColors[9]=Color.FromArgb(255,130,132);
+			m_CustomColors[10]=Color.FromArgb(255,195,132);
+			m_CustomColors[11]=Color.FromArgb(255,255,132);
+			m_CustomColors[12]=Color.FromArgb(132,255,132);
+			m_CustomColors[13]=Color.FromArgb(132,255,255);
+			m_CustomColors[14]=Color.FromArgb(132,130,255);
+			m_CustomColors[15]=Color.FromArgb(255,130,255);
+
+			m_CustomColors[16]=Color.FromArgb(198,195,198);
+			m_CustomColors[17]=Color.FromArgb(255,0,0);
+			m_CustomColors[18]=Color.FromArgb(255,130,0);
+			m_CustomColors[19]=Color.FromArgb(255,255,0);
+			m_CustomColors[20]=Color.FromArgb(0,255,0);
+			m_CustomColors[21]=Color.FromArgb(0,255,255);
+			m_CustomColors[22]=Color.FromArgb(0,0,255);
+			m_CustomColors[23]=Color.FromArgb(255,0,255);
+
+			m_CustomColors[24]=Color.FromArgb(132,130,132);
+			m_CustomColors[25]=Color.FromArgb(198,0,0);
+			m_CustomColors[26]=Color.FromArgb(198,65,0);
+			m_CustomColors[27]=Color.FromArgb(198,195,0);
+			m_CustomColors[28]=Color.FromArgb(0,195,0);
+			m_CustomColors[29]=Color.FromArgb(0,195,198);
+			m_CustomColors[30]=Color.FromArgb(0,0,198);
+			m_CustomColors[31]=Color.FromArgb(198,0,198);
+
+			m_CustomColors[32]=Color.FromArgb(66,65,66);
+			m_CustomColors[33]=Color.FromArgb(132,0,0);
+			m_CustomColors[34]=Color.FromArgb(132,65,0);
+			m_CustomColors[35]=Color.FromArgb(132,130,0);
+			m_CustomColors[36]=Color.FromArgb(0,130,0);
+			m_CustomColors[37]=Color.FromArgb(0,130,132);
+			m_CustomColors[38]=Color.FromArgb(0,0,132);
+			m_CustomColors[39]=Color.FromArgb(132,0,132);
+
+			m_CustomColors[40]=Color.FromArgb(0,0,0);
+			m_CustomColors[41]=Color.FromArgb(66,0,0);
+			m_CustomColors[42]=Color.FromArgb(132,65,66);
+			m_CustomColors[43]=Color.FromArgb(66,65,0);
+			m_CustomColors[44]=Color.FromArgb(0,65,0);
+			m_CustomColors[45]=Color.FromArgb(0,65,66);
+			m_CustomColors[46]=Color.FromArgb(0,0,66);
+			m_CustomColors[47]=Color.FromArgb(66,0,66);
+		}
+
+		private void InitOtherColors()
+		{
+			listWeb.BeginUpdate();
+			listWeb.Items.Clear();
+			Type type = typeof(Color);
+			PropertyInfo[] fields=type.GetProperties(BindingFlags.Public | BindingFlags.Static);
+			Color clr=new Color();
+			foreach(PropertyInfo pi in fields)
+				listWeb.Items.Add(pi.GetValue(clr,null));
+			listWeb.EndUpdate();
+
+			listSystem.BeginUpdate();
+			listSystem.Items.Clear();
+			type=typeof(SystemColors);
+			fields=type.GetProperties(BindingFlags.Public | BindingFlags.Static);
+			foreach(PropertyInfo pi in fields)
+				listSystem.Items.Add(pi.GetValue(clr,null));
+			listSystem.EndUpdate();
+		}
+
+		private void InitColorSchemeColors()
+		{
+			if(m_ColorScheme!=null)
+			{
+				if(!tabControl1.TabPages.Contains(tabPage1))
+				{
+					tabControl1.TabPages.Add(tabPage1);
+				}
+				listScheme.BeginUpdate();
+				listScheme.Items.Clear();
+				Type type=m_ColorScheme.GetType();
+				PropertyInfo[] fields=type.GetProperties();
+				foreach(PropertyInfo pi in fields)
+				{
+					if(pi.PropertyType==typeof(Color))
+						listScheme.Items.Add(pi.Name);
+				}
+				listScheme.EndUpdate();
+			}
+			else
+			{
+				if(tabControl1.TabPages.Contains(tabPage1))
+					tabControl1.TabPages.Remove(tabPage1);
+			}
+		}
+		#endregion
+
+		#region Public Interface
+
+		/// <summary>
+		/// Gets or sets the reference to the IWindowsFormsEditorService interface used for Windows Forms design time support.
+		/// </summary>
+		internal IWindowsFormsEditorService EditorService
+		{
+			get {return m_EditorService;}
+			set {m_EditorService=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets the ColorScheme object for Scheme colors.
+		/// </summary>
+		[Browsable(false),DefaultValue(null)]
+		public object ColorScheme
+		{
+			get {return m_ColorScheme;}
+			set
+			{
+				m_ColorScheme=value;
+				InitColorSchemeColors();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets currently selected color.
+		/// </summary>
+		public Color SelectedColor
+		{
+			get {return m_SelectedColor;}
+			set
+			{
+				m_SelectedColor=value;
+				OnSelectedColorChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets the selected color color scheme name if color scheme color is selected otherwise it returns an empty string.
+		/// </summary>
+		public string SelectedColorSchemeName
+		{
+			get {return m_SelectedColorSchemeName;}
+			set {m_SelectedColorSchemeName=value;}
+		}
+
+		/// <summary>
+		/// Returns true if color selection was cancelled.
+		/// </summary>
+		public bool Canceled
+		{
+			get {return m_Canceled;}
+		}
+		#endregion
+
+		#region Painting
+		private void PaintCustomColors(object sender, PaintEventArgs e)
+		{
+			Rectangle r=Rectangle.Empty;
+			int x=6, y=12;
+			Graphics g=e.Graphics;
+			Border3DSide side=(Border3DSide.Left | Border3DSide.Right | Border3DSide.Top | Border3DSide.Bottom);
+			int width=colorPanel.ClientRectangle.Width;
+			int iIndex=0;
+			foreach(Color clr in m_CustomColors)
+			{
+				r=new Rectangle(x,y,21,21);
+				if(r.Right>width)
+				{
+					y+=25;
+					x=6;
+					r.X=x;
+					r.Y=y;
+				}
+				ControlPaint.DrawBorder3D(g,x,y,21,21,Border3DStyle.Sunken,side);
+				r.Inflate(-2,-2);
+				g.FillRectangle(new SolidBrush(clr),r);
+
+				m_CustomColorsPos[iIndex]=r;
+				iIndex++;
+
+				x+=24;
+			}
+		}
+
+		private void DrawColorItem(object sender, DrawItemEventArgs e)
+		{
+			Rectangle r=e.Bounds;
+			Rectangle rClr=new Rectangle(r.X+1,r.Y+2,24,r.Height-4);
+			ListBox list=sender as ListBox;
+			
+			Color textColor=SystemColors.ControlText;
+			if((e.State & DrawItemState.Selected)!=0)
+			{
+				textColor=SystemColors.HighlightText;
+				e.Graphics.FillRectangle(SystemBrushes.Highlight,e.Bounds);
+			}
+			else
+				e.Graphics.FillRectangle(SystemBrushes.Window,e.Bounds);
+
+			Color clr=Color.Empty;
+			string colorName="";
+			if(list.Items[e.Index].GetType()==typeof(Color))
+			{
+				clr=(Color)list.Items[e.Index];
+				colorName=clr.Name;
+			}
+			else
+			{
+				colorName=list.Items[e.Index].ToString();
+				clr=(Color)m_ColorScheme.GetType().GetProperty(colorName).GetValue(m_ColorScheme,null);
+			}
+
+			e.Graphics.FillRectangle(new SolidBrush(clr),rClr);
+			e.Graphics.DrawRectangle(SystemPens.ControlText,rClr);
+			r.Offset(30,0);
+			r.Width-=30;
+			DevComponents.DotNetBar.TextDrawing.DrawString(e.Graphics,colorName,list.Font,textColor,r,DevComponents.DotNetBar.eTextFormat.Default);
+		}
+		#endregion
+
+		#region Internals
+
+		private void CustomColorMouseUp(object sender, MouseEventArgs e)
+		{
+			for(int i=0;i<48;i++)
+			{
+				if(m_CustomColorsPos[i].Contains(e.X,e.Y))
+				{
+					this.SelectedColor=m_CustomColors[i];
+					m_SelectedColorSchemeName="";
+					break;					
+				}
+			}
+		}
+
+		private void ListSelectionChange(object sender, EventArgs e)
+		{
+			ListBox list=sender as ListBox;
+
+			if(list.SelectedItem!=null)
+			{
+				if(list.SelectedItem is Color)
+				{
+					this.SelectedColor=(Color)list.SelectedItem;
+					m_SelectedColorSchemeName="";
+				}
+				else
+				{
+                    m_SelectedColorSchemeName = list.SelectedItem.ToString();
+					this.SelectedColor=(Color)m_ColorScheme.GetType().GetProperty(this.SelectedColorSchemeName).GetValue(m_ColorScheme,null);
+				}
+			}
+			else
+			{
+				this.SelectedColor=Color.Empty;
+                m_SelectedColorSchemeName = "";
+			}
+		}
+
+		private void OnSelectedColorChanged()
+		{
+			colorPreview.BackColor=m_SelectedColor;
+			transparencyTrack.Value=m_SelectedColor.A;
+			UpdateTransparencyText();
+		}
+
+        public void UpdateUIWithSelection()
+        {
+            listSystem.SelectedIndex = -1;
+            listWeb.SelectedIndex = -1;
+            listScheme.SelectedIndex = -1;
+            if (m_SelectedColor.IsSystemColor)
+            {
+                tabControl1.SelectedTab = tabPage2;
+                SelectListBoxItem(listSystem, m_SelectedColor.Name);
+            }
+            else if (m_SelectedColor.IsNamedColor)
+            {
+                tabControl1.SelectedTab = tabPage3;
+                SelectListBoxItem(listWeb, m_SelectedColor.Name);
+            }
+            else if (m_SelectedColorSchemeName != "")
+            {
+                tabControl1.SelectedTab = tabPage1;
+                SelectListBoxItem(listScheme, m_SelectedColorSchemeName);
+            }
+            else
+            {
+                tabControl1.SelectedTab = tabPage4;
+            }
+        }
+
+        private void SelectListBoxItem(ListBox listBox, string item)
+        {
+            foreach (object o in listBox.Items)
+            {
+                if (o.ToString() == item)
+                {
+                    listBox.SelectedItem = o;
+                    return;
+                }
+            }
+        }
+
+		private void UpdateTransparencyText()
+		{
+			if(!this.SelectedColor.IsEmpty)
+			{
+				label1.Text=m_TransText + " (" + this.SelectedColor.A.ToString()+")";
+			}
+			else
+				label1.Text=m_TransText;
+		}
+
+		private void transparencyTrack_ValueChanged(object sender, EventArgs e)
+		{
+			if(!this.SelectedColor.IsEmpty && this.SelectedColor.A!=transparencyTrack.Value)
+			{
+				this.SelectedColor=Color.FromArgb(transparencyTrack.Value,this.SelectedColor);
+				m_SelectedColorSchemeName="";
+			}
+			UpdateTransparencyText();
+		}
+
+		private void colorPreview_Paint(object sender, PaintEventArgs e)
+		{
+			if(this.SelectedColor.IsEmpty)
+			{
+				Rectangle r=this.colorPreview.ClientRectangle;
+				r.Inflate(-2,-2);
+				e.Graphics.DrawLine(SystemPens.ControlText,r.X,r.Y,r.Right,r.Bottom);
+				e.Graphics.DrawLine(SystemPens.ControlText,r.Right,r.Y,r.X,r.Bottom);
+			}
+		}
+
+		private void btnOK_Click(object sender, EventArgs e)
+		{
+			this.ClosePicker();
+		}
+
+		private void btnCancel_Click(object sender, EventArgs e)
+		{
+			m_Canceled=true;
+			this.ClosePicker();
+		}
+
+		private void ClosePicker()
+		{
+			if(m_EditorService!=null)
+			{
+				m_EditorService.CloseDropDown();
+			}
+			else
+			{
+				if(this.Parent!=null)
+					this.Parent.Hide();
+				else
+					this.Hide();
+			}
+		}
+
+		private void ColorPicker_Paint(object sender, PaintEventArgs e)
+		{
+			Rectangle r=this.ClientRectangle;
+			r.Width--;
+			r.Height--;
+			e.Graphics.DrawRectangle(SystemPens.ControlDarkDark,r);
+		}
+
+		private void tabControl1_SelectedIndexChanged(object sender, System.EventArgs e)
+		{
+			if(tabControl1.SelectedIndex==0 && m_ColorScheme!=null && m_SelectedColorSchemeName!="")
+				transparencyTrack.Enabled=false;
+			else
+				transparencyTrack.Enabled=true;
+		}
+		#endregion
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/ColorPicker.resx b/PROMS/DotNetBar Source Code/ColorPicker.resx
new file mode 100644
index 00000000..ddae5a77
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/ColorPicker.resx	
@@ -0,0 +1,319 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 1.3
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">1.3</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1">this is my long string</data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        [base64 mime encoded serialized .NET Framework object]
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        [base64 mime encoded string representing a byte array form of the .NET Framework object]
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used forserialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>1.3</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="tabControl1.SnapToGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="tabControl1.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+  <data name="tabControl1.DrawGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+  <data name="tabControl1.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="tabControl1.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="tabControl1.GridSize" type="System.Drawing.Size, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>8, 8</value>
+  </data>
+  <data name="tabPage1.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+  <data name="tabPage1.SnapToGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="tabPage1.DrawGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+  <data name="tabPage1.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="tabPage1.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="tabPage1.GridSize" type="System.Drawing.Size, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>8, 8</value>
+  </data>
+  <data name="listScheme.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="listScheme.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="listScheme.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+  <data name="tabPage2.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+  <data name="tabPage2.SnapToGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="tabPage2.DrawGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+  <data name="tabPage2.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="tabPage2.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="tabPage2.GridSize" type="System.Drawing.Size, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>8, 8</value>
+  </data>
+  <data name="listSystem.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="listSystem.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+  <data name="listSystem.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="tabPage3.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+  <data name="tabPage3.SnapToGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="tabPage3.DrawGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+  <data name="tabPage3.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="tabPage3.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="tabPage3.GridSize" type="System.Drawing.Size, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>8, 8</value>
+  </data>
+  <data name="listWeb.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+  <data name="listWeb.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="listWeb.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="tabPage4.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+  <data name="tabPage4.SnapToGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="tabPage4.DrawGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+  <data name="tabPage4.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="tabPage4.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="tabPage4.GridSize" type="System.Drawing.Size, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>8, 8</value>
+  </data>
+  <data name="colorPanel.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+  <data name="colorPanel.SnapToGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="colorPanel.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="colorPanel.GridSize" type="System.Drawing.Size, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>8, 8</value>
+  </data>
+  <data name="colorPanel.DrawGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+  <data name="colorPanel.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="transparencyTrack.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+  <data name="transparencyTrack.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="transparencyTrack.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="label1.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+  <data name="label1.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="label1.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="colorPreview.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+  <data name="colorPreview.SnapToGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="colorPreview.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="colorPreview.GridSize" type="System.Drawing.Size, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>8, 8</value>
+  </data>
+  <data name="colorPreview.DrawGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+  <data name="colorPreview.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="btnOK.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+  <data name="btnOK.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="btnOK.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="btnCancel.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+  <data name="btnCancel.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="btnCancel.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="$this.TrayLargeIcon" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="$this.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+  <data name="$this.SnapToGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="$this.DrawGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+  <data name="$this.TrayHeight" type="System.Int32, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>80</value>
+  </data>
+  <data name="$this.Language" type="System.Globalization.CultureInfo, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>(Default)</value>
+  </data>
+  <data name="$this.Localizable" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="$this.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="$this.GridSize" type="System.Drawing.Size, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>8, 8</value>
+  </data>
+  <data name="$this.Name">
+    <value>ColorPicker</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/ColorPickers/ColorCombControl.cs b/PROMS/DotNetBar Source Code/ColorPickers/ColorCombControl.cs
new file mode 100644
index 00000000..0fbef30c
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/ColorPickers/ColorCombControl.cs	
@@ -0,0 +1,427 @@
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.Drawing;
+using System.Data;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.ColorPickers
+{
+    /// <summary>
+    /// Represents the color comb control that allows color choice from pre-defined color comb palette.
+    /// </summary>
+    [ToolboxItem(true), DefaultEvent("SelectedColorChanged"), DefaultProperty("SelectedColor"), ToolboxBitmap(typeof(ColorCombControl), "ColorPickerItem.ColorCombControl.ico")]
+    public class ColorCombControl : System.Windows.Forms.Control
+    {
+        #region Events
+        /// <summary>
+        /// Occurs when SelectedColor has changed.
+        /// </summary>
+        public event EventHandler SelectedColorChanged;
+        /// <summary>
+        /// Raises SelectedColorChanged event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnSelectedColorChanged(EventArgs e)
+        {
+            EventHandler handler = SelectedColorChanged;
+            if (handler != null)
+                handler(this, e);
+        }
+        #endregion
+
+        #region Private Variables
+        private CombCell[] m_ColorCombs = new CombCell[144];
+        private const float YOffset = .824f;
+        private float[] arrXOffset = new float[] { -0.5f, -1.0f, -0.5f, 0.5f, 1.0f, 0.5f };
+        private float[] arrYOffset = new float[] { YOffset, 0.0f, -YOffset, -YOffset, 0.0f, YOffset };
+        private int CombDepth = 7;
+        private int m_MouseOverIndex = -1;
+        private int m_SelectedIndex = -1;
+
+        /// <summary> 
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.Container components = null;
+        #endregion
+
+        #region Constructor, Dispose
+        /// <summary>
+        /// Creates new instance of the control.
+        /// </summary>
+        public ColorCombControl()
+        {
+            for (int i = 0; i < m_ColorCombs.Length; i++)
+                m_ColorCombs[i] = new CombCell();
+
+            this.SetStyle(ControlStyles.AllPaintingInWmPaint, true);
+            this.SetStyle(ControlStyles.UserPaint, true);
+            this.SetStyle(ControlStyles.Opaque, true);
+            this.SetStyle(DisplayHelp.DoubleBufferFlag, true);
+            this.SetStyle(ControlStyles.ResizeRedraw, true);
+            this.SetStyle(ControlStyles.SupportsTransparentBackColor, true);
+            InitializeComponent();
+        }
+
+        /// <summary> 
+        /// Clean up any resources being used.
+        /// </summary>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                if (components != null)
+                {
+                    components.Dispose();
+                }
+            }
+            base.Dispose(disposing);
+        }
+        #endregion
+
+        #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();
+        }
+        #endregion
+
+        #region Internal Implementation
+        private bool m_AntiAlias = true;
+        /// <summary>
+        /// Gets or sets whether anti-alias smoothing is used while painting. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Browsable(true), Category("Appearance"), Description("Gets or sets whether anti-aliasing is used while painting.")]
+        public bool AntiAlias
+        {
+            get { return m_AntiAlias; }
+            set
+            {
+                if (m_AntiAlias != value)
+                {
+                    m_AntiAlias = value;
+                    this.Invalidate();
+                }
+            }
+        }
+
+        private int GetCellSize(int height)
+        {
+            int cellSize = height / (2 * CombDepth - 1) + 1;
+            if ((int)(Math.Floor((double)cellSize / 2)) * 2 < cellSize)
+                cellSize--;
+            return cellSize;
+        }
+
+        private void InitializeColorComb()
+        {
+            Rectangle clientRect = this.ClientRectangle;
+            clientRect.Inflate(-8, -8);
+            clientRect.Height -= GetCellSize(Math.Min(clientRect.Height, clientRect.Width));
+
+            // Normalize...
+            if (clientRect.Height < clientRect.Width)
+                clientRect.Inflate(-(clientRect.Width - clientRect.Height) / 2, 0);
+            else
+                clientRect.Inflate(0, -(clientRect.Height - clientRect.Width) / 2);
+
+            int cellSize = GetCellSize(clientRect.Height);
+            clientRect.Height -= cellSize * 2;
+            //clientRect.Inflate(-cellSize, 0);
+            int x = (clientRect.Left + clientRect.Right) / 2;
+            int y = (clientRect.Top + clientRect.Bottom) / 2;
+
+            // Center White Comb
+            m_ColorCombs[0].Color = Color.White;
+            m_ColorCombs[0].SetPosition(x, y, cellSize);
+
+            int index = 1;
+            for (int nLevel = 1; nLevel < CombDepth; nLevel++)
+            {
+                float posX = x + (cellSize * nLevel);
+                float posY = y;
+
+                for (int nSide = 0; nSide < CombDepth - 1; nSide++)
+                {
+                    int xIncrease = (int)((cellSize) * arrXOffset[nSide]);
+                    int yIncrease = (int)((cellSize) * arrYOffset[nSide]);
+
+                    for (int nCell = 0; nCell < nLevel; nCell++)
+                    {
+                        float nAngle = GetAngleFromPoint(posX - x, posY - y);
+                        double L = .936 * (CombDepth - nLevel) / CombDepth + .12;
+
+                        m_ColorCombs[index].Color = GetRGBFromHLSExtend((float)nAngle, L, 1.0F);
+                        m_ColorCombs[index].SetPosition(posX, posY, cellSize);
+                        index++;
+
+                        posX += xIncrease;
+                        posY += yIncrease;
+                    }
+                }
+            }
+
+            m_ColorCombs[index].Color = Color.Black;
+            index++;
+            m_ColorCombs[index].Color = Color.White;
+
+            int RGBOffset = 255 / (15 + 2);
+
+            int rgb = 255 - RGBOffset;
+
+            x = clientRect.X + cellSize * 3;
+            y = clientRect.Bottom + cellSize;
+
+            for (int i = 0; i < 15; i++)
+            {
+                Color color = Color.FromArgb(rgb, rgb, rgb);
+                m_ColorCombs[index].Color = color;
+                m_ColorCombs[index].SetPosition(x, y, cellSize);
+                x += cellSize;
+                index++;
+                if (i == 7)
+                {
+                    x = clientRect.X + (int)(cellSize * 3.5);
+                    y += (int)(cellSize * YOffset);
+                }
+                rgb -= RGBOffset;
+            }
+            m_ColorCombs[index].Color = Color.Black;
+        }
+
+
+        private Color GetRGBFromHLSExtend(double H, double L, double S)
+        {
+            int R, G, B;
+
+            if (S == 0.0)
+            {
+                R = G = B = (int)(L * 255.0);
+            }
+            else
+            {
+                float rm1, rm2;
+
+                if (L <= 0.5f)
+                    rm2 = (float)(L + L * S);
+                else
+                    rm2 = (float)(L + S - L * S);
+
+                rm1 = (float)(2.0f * L - rm2);
+
+                R = GetRGBFromHue(rm1, rm2, (float)(H + 120.0f));
+                G = GetRGBFromHue(rm1, rm2, (float)(H));
+                B = GetRGBFromHue(rm1, rm2, (float)(H - 120.0f));
+            }
+
+            return Color.FromArgb(R, G, B);
+        }
+
+        private float GetAngleFromPoint(float nX, float nY)
+        {
+            double dAngle = Math.Atan2(nY, nX);
+            return (float)(dAngle * 180.0 / Math.PI);
+        }
+
+        private int GetRGBFromHue(float rm1, float rm2, float rh)
+        {
+            if (rh > 360.0f)
+                rh -= 360.0f;
+            else if (rh < 0.0f)
+                rh += 360.0f;
+
+            if (rh < 60.0f)
+                rm1 = rm1 + (rm2 - rm1) * rh / 60.0f;
+            else if (rh < 180.0f)
+                rm1 = rm2;
+            else if (rh < 240.0f)
+                rm1 = rm1 + (rm2 - rm1) * (240.0f - rh) / 60.0f;
+
+            return (int)(rm1 * 255);
+        }
+
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            Graphics g = e.Graphics;
+
+            if (m_AntiAlias)
+            {
+                e.Graphics.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.AntiAlias;
+                e.Graphics.TextRenderingHint = DisplayHelp.AntiAliasTextRenderingHint;
+            }
+
+            using (SolidBrush brush = new SolidBrush(this.BackColor))
+                g.FillRectangle(brush, -1, -1, this.Width + 1, this.Height + 1);
+
+            if (this.BackColor == Color.Transparent || this.BackgroundImage != null)
+            {
+                base.OnPaintBackground(e);
+            }
+
+
+            foreach (CombCell c in m_ColorCombs)
+                c.Draw(g);
+
+            if (m_MouseOverIndex >= 0)
+                m_ColorCombs[m_MouseOverIndex].Draw(g);
+            if (m_SelectedIndex >= 0)
+                m_ColorCombs[m_SelectedIndex].Draw(g);
+
+            base.OnPaint(e);
+        }
+
+        protected override void OnResize(EventArgs e)
+        {
+            InitializeColorComb();
+            base.OnResize(e);
+        }
+
+        protected override void OnMouseMove(MouseEventArgs e)
+        {
+            base.OnMouseMove(e);
+
+            int newMouseOver = GetCellAt(e.X, e.Y);
+            SetMouseOver(newMouseOver);
+        }
+
+        protected override void OnMouseDown(MouseEventArgs e)
+        {
+            if (e.Button == MouseButtons.Left)
+            {
+                if (m_SelectedIndex >= 0)
+                {
+                    m_ColorCombs[m_SelectedIndex].Selected = false;
+                    this.Invalidate(m_ColorCombs[m_SelectedIndex].Bounds);
+                }
+                m_SelectedIndex = -1;
+
+                if (m_MouseOverIndex >= 0)
+                {
+                    m_SelectedIndex = m_MouseOverIndex;
+                    m_ColorCombs[m_SelectedIndex].Selected = true;
+                    this.Invalidate(m_ColorCombs[m_SelectedIndex].Bounds);
+                    OnSelectedColorChanged(EventArgs.Empty);
+                }
+            }
+            base.OnMouseDown(e);
+        }
+
+        /// <summary>
+        /// Gets the color mouse is currently over. If mouse is not over any color in comb Color.Empty is returned.
+        /// </summary>
+        [Browsable(false)]
+        public Color MouseOverColor
+        {
+            get
+            {
+                if (m_MouseOverIndex < 0)
+                    return Color.Empty;
+                return m_ColorCombs[m_MouseOverIndex].Color;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the selected color. When setting the color note that color must be already present in the color comb otherwise the selected color will be reset to Color.Empty.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public Color SelectedColor
+        {
+            get
+            {
+                if (m_SelectedIndex < 0)
+                    return Color.Empty;
+                return m_ColorCombs[m_SelectedIndex].Color;
+            }
+            set
+            {
+                if (value == Color.Empty && m_SelectedIndex >= 0)
+                {
+                    m_ColorCombs[m_SelectedIndex].Selected = false;
+                    m_SelectedIndex = -1;
+                    this.Invalidate();
+                    OnSelectedColorChanged(EventArgs.Empty);
+                }
+                else
+                {
+                    int colorIndex = GetCombColorIndex(value);
+                    if (colorIndex != m_SelectedIndex)
+                    {
+                        if (m_SelectedIndex >= 0)
+                            m_ColorCombs[m_SelectedIndex].Selected = false;
+                        m_SelectedIndex = colorIndex;
+                        if (m_SelectedIndex >= 0)
+                            m_ColorCombs[m_SelectedIndex].Selected = true;
+                        this.Invalidate();
+                        OnSelectedColorChanged(EventArgs.Empty);
+                    }
+                }
+            }
+        }
+        private int GetCombColorIndex(Color value)
+        {
+            for (int i = 0; i < m_ColorCombs.Length; i++)
+            {
+                if (m_ColorCombs[i].Color.Equals(value))
+                    return i;
+            }
+            return -1;
+        }
+
+        /// <summary>
+        /// Occurs when MouseOverColor property has changed.
+        /// </summary>
+        public event EventHandler MouseOverColorChanged;
+        /// <summary>
+        /// Raises MouseOverColorChanged event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnMouseOverColorChanged(EventArgs e)
+        {
+            EventHandler handler = MouseOverColorChanged;
+            if (handler != null)
+                handler(this, e);
+        }
+        private void SetMouseOver(int newMouseOver)
+        {
+            if (newMouseOver != m_MouseOverIndex)
+            {
+                if (m_MouseOverIndex >= 0)
+                {
+                    m_ColorCombs[m_MouseOverIndex].MouseOver = false;
+                    this.Invalidate(m_ColorCombs[m_MouseOverIndex].Bounds);
+                }
+                m_MouseOverIndex = newMouseOver;
+                if (m_MouseOverIndex >= 0)
+                {
+                    m_ColorCombs[m_MouseOverIndex].MouseOver = true;
+                    this.Invalidate(m_ColorCombs[m_MouseOverIndex].Bounds);
+                }
+                OnMouseOverColorChanged(EventArgs.Empty);
+            }
+        }
+
+        protected override void OnMouseLeave(EventArgs e)
+        {
+            base.OnMouseLeave(e);
+            SetMouseOver(-1);
+        }
+
+        private int GetCellAt(int x, int y)
+        {
+            for (int i = 0; i < m_ColorCombs.Length; i++)
+            {
+                if (m_ColorCombs[i].Bounds.Contains(x, y))
+                {
+                    return i;
+                }
+            }
+
+            return -1;
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/ColorPickers/ColorCombControl.ico b/PROMS/DotNetBar Source Code/ColorPickers/ColorCombControl.ico
new file mode 100644
index 00000000..8167ada4
Binary files /dev/null and b/PROMS/DotNetBar Source Code/ColorPickers/ColorCombControl.ico differ
diff --git a/PROMS/DotNetBar Source Code/ColorPickers/ColorContrastControl.cs b/PROMS/DotNetBar Source Code/ColorPickers/ColorContrastControl.cs
new file mode 100644
index 00000000..710c61c7
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/ColorPickers/ColorContrastControl.cs	
@@ -0,0 +1,290 @@
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.Drawing;
+using System.Data;
+using System.Drawing.Drawing2D;
+using System.Drawing.Imaging;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.ColorPickerItem
+{
+    /// <summary>
+    /// Represents the color selection control.
+    /// </summary>
+    [ToolboxItem(false)]
+	internal class ColorContrastControl : System.Windows.Forms.Control
+	{
+		#region Events
+        /// <summary>
+        /// Occurs when SelectedColor has changed.
+        /// </summary>
+        public event EventHandler SelectedColorChanged;
+        /// <summary>
+        /// Raises SelectedColorChanged event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnSelectedColorChanged(EventArgs e)
+        {
+            EventHandler handler = SelectedColorChanged;
+            if (handler != null)
+                handler(this, e);
+        }
+		#endregion
+		
+		#region Private Variables
+		/// <summary> 
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.Container components = null;
+		private Color m_SelectedColor = Color.White;
+		private Bitmap m_BlendBitmap=null;
+		private double m_SelectedLuminance = -1;
+		#endregion
+		
+		#region Constructor, Dispose
+		public ColorContrastControl()
+		{
+			this.SetStyle(ControlStyles.AllPaintingInWmPaint, true);
+			this.SetStyle(ControlStyles.UserPaint, true);
+			this.SetStyle(ControlStyles.Opaque, true);
+			this.SetStyle(DisplayHelp.DoubleBufferFlag, true);
+			this.SetStyle(ControlStyles.ResizeRedraw, true);
+			this.SetStyle(ControlStyles.SupportsTransparentBackColor, true);
+			
+			// This call is required by the Windows.Forms Form Designer.
+			InitializeComponent();
+		}
+
+		/// <summary> 
+		/// Clean up any resources being used.
+		/// </summary>
+		protected override void Dispose( bool disposing )
+		{
+			if( disposing )
+			{
+				if(components != null)
+				{
+					components.Dispose();
+				}
+			}
+			base.Dispose( disposing );
+		}
+		#endregion
+		
+		#region Internal Implementation
+		protected override void OnPaint(PaintEventArgs e)
+		{
+			Graphics g = e.Graphics;
+			
+			if(this.BackColor == Color.Transparent)
+			{
+				base.OnPaintBackground(e);
+			}
+			else
+			{
+				using(SolidBrush brush=new SolidBrush(this.BackColor))
+					g.FillRectangle(brush, this.ClientRectangle);
+			}
+			
+			if(m_BlendBitmap!=null)
+				g.DrawImageUnscaled(m_BlendBitmap, 0, 0);
+			
+			if(m_SelectedLuminance>=0)
+			{
+				int y = (int)(this.ClientRectangle.Height * (1 - m_SelectedLuminance));
+				int x = m_BlendBitmap.Width + 4;
+				GraphicsPath path = new GraphicsPath();
+				path.AddLine(x, y, x + 7, y - 4);
+				path.AddLine(x+ 7 , y - 4, x + 7, y + 4);
+				path.CloseAllFigures();
+				using(SolidBrush brush=new SolidBrush(Color.Black))
+					g.FillPath(brush, path);
+				path.Dispose();
+			}
+		}
+		
+		protected override void OnResize(EventArgs e)
+		{
+			CreateBlendBitmap();
+			base.OnResize (e);
+		}
+
+		
+		private void CreateBlendBitmap()
+		{
+			Rectangle clientRect = this.ClientRectangle;
+
+			Bitmap bmp = new Bitmap(12, clientRect.Height, PixelFormat.Format24bppRgb);
+			using (Graphics graph = Graphics.FromImage(bmp))
+			{
+				graph.FillRectangle(SystemBrushes.Control, clientRect);
+				
+				Color color = m_SelectedColor;
+				int ry = color.R, gy = color.G, by = color.B;
+				
+				int pointHeight = 4;
+				int pointWidth = 12;
+				
+				int x = clientRect.X;
+				int y = clientRect.Y;
+				double h = 0, s = 0, l = 0;
+				GetHSLFromRGB(m_SelectedColor, ref h, ref s, ref l);
+
+				for (int j = clientRect.Y; j < clientRect.Height; j += pointHeight)
+				{
+					double lumCurrent = 1 - (double) j / (double) clientRect.Height;
+					Color c = GetColorFromHSL(h, s, lumCurrent);
+					using (SolidBrush brush = new SolidBrush(c))
+						graph.FillRectangle(brush, new Rectangle(x, y, pointWidth, pointHeight));
+					y += pointHeight;					
+				}
+			}
+			
+			if(m_BlendBitmap!=null)
+				m_BlendBitmap.Dispose();
+			m_BlendBitmap = bmp;
+		}
+		
+        /// <summary>
+        /// Gets or sets the selected color.
+        /// </summary>
+		[Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public Color SelectedColor
+		{
+			get
+			{
+				if(m_SelectedLuminance>=0)
+				{
+					double h = 0, s = 0, l = 0;
+					GetHSLFromRGB(m_SelectedColor, ref h, ref s, ref l);
+					return GetColorFromHSL(h, s, m_SelectedLuminance);
+				}
+				return m_SelectedColor;
+			}
+			set
+			{
+				m_SelectedColor = value;
+				double h = 0, s = 0, l = 0;
+				GetHSLFromRGB(m_SelectedColor, ref h, ref s, ref l);
+                //if(m_SelectedLuminance<0)
+				    m_SelectedLuminance = l;
+				CreateBlendBitmap();
+				this.Invalidate();
+			}
+		}
+		
+		private int GetRGBFromHue(float rm1, float rm2, float rh)
+		{
+			if (rh > 360.0f)
+				rh -= 360.0f;
+			else if (rh < 0.0f)
+				rh += 360.0f;
+
+			if (rh <  60.0f)
+				rm1 = rm1 + (rm2 - rm1) * rh / 60.0f;   
+			else if (rh < 180.0f)
+				rm1 = rm2;
+			else if (rh < 240.0f)
+				rm1 = rm1 + (rm2 - rm1) * (240.0f - rh) / 60.0f;      
+
+			return (int)(rm1 * 255);
+		}
+		
+		private Color GetColorFromHSL( double H, double S, double L)
+		{
+			double r=0,g=0,b=0;
+			double temp1,temp2; 
+			if(L==0) 
+			{ 
+				r=g=b=0; 
+			} 
+			else
+			{
+				if(S==0) 
+				{ 
+					r=g=b=L; 
+				} 
+				else 
+				{ 
+					temp2 = ((L<=0.5) ? L*(1.0+S) : L+S-(L*S)); 
+					temp1 = 2.0*L-temp2; 
+					double[] t3=new double[]{H+1.0/3.0,H,H-1.0/3.0}; 
+					double[] clr=new double[]{0,0,0}; 
+					for(int i=0;i<3;i++) 
+					{ 
+						if(t3[i]<0) 
+							t3[i]+=1.0; 
+
+						if(t3[i]>1) 
+							t3[i]-=1.0; 
+
+						if(6.0*t3[i] < 1.0) 
+							clr[i]=temp1+(temp2-temp1)*t3[i]*6.0; 
+						else if(2.0*t3[i] < 1.0) 
+							clr[i]=temp2; 
+						else if(3.0*t3[i] < 2.0) 
+							clr[i]=(temp1+(temp2-temp1)*((2.0/3.0)-t3[i])*6.0); 
+						else 
+							clr[i]=temp1; 
+					} 
+
+					r=clr[0]; 
+					g=clr[1]; 
+					b=clr[2]; 
+				}
+			}
+			
+			return Color.FromArgb((int)(255*r),(int)(255*g),(int)(255*b));
+		}
+		
+		private void GetHSLFromRGB(Color color, ref double H, ref double S, ref double L )
+		{   
+			H=color.GetHue()/360.0; // we store hue as 0-1 as opposed to 0-360 
+			L=color.GetBrightness(); 
+			S=color.GetSaturation(); 
+		}
+		
+		protected override void OnMouseDown(MouseEventArgs e)
+		{
+			double d = 1 - (double) e.Y / (double) ClientRectangle.Height;
+			SetLuminance(d);
+			base.OnMouseDown (e);
+		}
+		
+		protected override void OnMouseMove(MouseEventArgs e)
+		{
+			if(e.Button==MouseButtons.Left && e.Y>=0  && e.Y<ClientRectangle.Bottom)
+			{
+				double d = 1 - (double) e.Y / (double) ClientRectangle.Height;
+				SetLuminance(d);
+			}
+			base.OnMouseMove (e);
+		}
+		
+		private void SetLuminance(double d)
+		{
+			m_SelectedLuminance = d;
+			this.Invalidate();
+			if(SelectedColorChanged!=null)
+				SelectedColorChanged(this, new EventArgs());
+		}
+		#endregion
+		
+		#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()
+		{
+			// 
+			// ColorContrastControl
+			// 
+			this.Name = "ColorContrastControl";
+			this.Size = new System.Drawing.Size(24, 248);
+
+		}
+		#endregion
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/ColorPickers/ColorItem.cs b/PROMS/DotNetBar Source Code/ColorPickers/ColorItem.cs
new file mode 100644
index 00000000..56b28a07
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/ColorPickers/ColorItem.cs	
@@ -0,0 +1,198 @@
+using System;
+using System.Text;
+using System.Drawing;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represents color item used for color picker control. Color item can only be used as part of the color picker DotNetBar feature.
+    /// </summary>
+    public class ColorItem : BaseItem
+    {
+        #region Private Variables
+        private Color m_Color = Color.Black;
+        private Size m_DesiredSize = new Size(13, 13);
+        private bool m_MouseOver = false;
+        private eColorItemBorder m_Border = eColorItemBorder.All;
+        #endregion
+
+        #region Internal Implementation
+        public ColorItem():this("","") {}
+		public ColorItem(string sName):this(sName,""){}
+        public ColorItem(string sName, string ItemText)
+            : base(sName, ItemText)
+		{
+			this.IsAccessible=false;
+            this.CanCustomize = false;
+		}
+
+        public ColorItem(string sName, string ItemText, Color color)
+            : base(sName, ItemText)
+        {
+            this.IsAccessible = false;
+            this.CanCustomize = false;
+            m_Color = color;
+        }
+
+		public override BaseItem Copy()
+		{
+            ColorItem copy = new ColorItem(m_Name);
+			this.CopyToItem(copy);
+
+			return copy;
+		}
+		protected override void CopyToItem(BaseItem copy)
+		{
+            ColorItem ci = copy as ColorItem;
+			base.CopyToItem(ci);
+            ci.DesiredSize = this.DesiredSize;
+            ci.Color = this.Color;
+            ci.Border = this.Border;
+		    if (this.ShouldSerializeDesiredSize())
+		        ci.DesiredSize = this.DesiredSize;
+		}
+
+        public override void Paint(ItemPaintArgs p)
+        {
+            Rendering.BaseRenderer renderer = p.Renderer;
+            if (renderer != null)
+            {
+                ColorItemRendererEventArgs e = new ColorItemRendererEventArgs(p.Graphics, this);
+                renderer.DrawColorItem(e);
+            }
+            else
+            {
+                Rendering.ColorItemPainter painter = PainterFactory.CreateColorItemPainter(this);
+                if (painter != null)
+                {
+                    ColorItemRendererEventArgs e = new ColorItemRendererEventArgs(p.Graphics, this);
+                    painter.PaintColorItem(e);
+                }
+            }
+        }
+
+        public override void RecalcSize()
+        {
+            m_Rect.Size = Dpi.Size(m_DesiredSize);
+            base.RecalcSize();
+        }
+
+        /// <summary>
+        /// Gets or sets the color represented by this item. Default value is Color.Black.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), DevCoSerialize(), Category("Appearance"), Description("Indicates the color represented by this item.")]
+        public System.Drawing.Color Color
+        {
+            get { return m_Color; }
+            set
+            {
+                m_Color = value;
+                OnAppearanceChanged();
+            }
+        }
+        private bool ShouldSerializeColor()
+        {
+            return (m_Color != Color.Black);
+        }
+
+        /// <summary>
+        /// Gets or sets the size of the item when displayed. Default value is 13x13 pixels.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), DevCoSerialize(), Category("Appearance"), Description("Indicates the size of the item when displayed.")]
+        public System.Drawing.Size DesiredSize
+        {
+            get { return m_DesiredSize; }
+            set
+            {
+                if (value.Width > 0 && value.Height > 0)
+                {
+                    m_DesiredSize = value;
+                    NeedRecalcSize = true;
+                    OnAppearanceChanged();
+                }
+            }
+        }
+        private bool ShouldSerializeDesiredSize()
+        {
+            return (m_DesiredSize.Width!=13 || m_DesiredSize.Height!=13);
+        }
+
+        /// <summary>
+        /// Gets or sets border drawn around the item. Default value is eColorItemBorder.All which indicates that border is drawn
+        /// on all four sides.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), DefaultValue(eColorItemBorder.All), Description("Indicate border drawn around the item"), DevCoSerialize()]
+        public eColorItemBorder Border
+        {
+            get { return m_Border; }
+            set
+            {
+                m_Border = value;
+                OnAppearanceChanged();
+            }
+        }
+
+        /// <summary>
+        /// Gets whether mouse is over the item.
+        /// </summary>
+        public bool IsMouseOver
+        {
+            get { return m_MouseOver; }
+        }
+
+        [System.ComponentModel.Browsable(false), System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+        public override void InternalMouseEnter()
+        {
+            base.InternalMouseEnter();
+            SetMouseOver(true);
+            BaseItem parent = this.Parent;
+            while (parent != null && !(parent is ColorPickerDropDown))
+                parent = parent.Parent;
+            if (parent != null && parent is ColorPickerDropDown)
+                ((ColorPickerDropDown)parent).InvokeColorPreview(new ColorPreviewEventArgs(this.Color, this));
+        }
+
+
+        [System.ComponentModel.Browsable(false), System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+        public override void InternalMouseLeave()
+        {
+            base.InternalMouseLeave();
+            SetMouseOver(false);
+        }
+
+        private void SetMouseOver(bool value)
+        {
+            if (value != m_MouseOver)
+            {
+                m_MouseOver = value;
+                this.Refresh();
+            }
+        }
+        #endregion
+
+        #region Serialization
+		/// <summary>
+		/// Overloaded. Serializes the item and all sub-items into the XmlElement.
+		/// </summary>
+		/// <param name="ThisItem">XmlElement to serialize the item to.</param>
+        protected internal override void Serialize(ItemSerializationContext context)
+        {
+            base.Serialize(context);
+            System.Xml.XmlElement xml = context.ItemXmlElement;
+            ElementSerializer.Serialize(this, xml);
+        }
+
+        // <summary>
+		/// Overloaded. Deserializes the Item from the XmlElement.
+		/// </summary>
+		/// <param name="ItemXmlSource">Source XmlElement.</param>
+        public override void Deserialize(ItemSerializationContext context)
+        {
+            base.Deserialize(context);
+            System.Xml.XmlElement xml = context.ItemXmlElement;
+            ElementSerializer.Deserialize(this, xml);
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/ColorPickers/ColorPickerDropDown.cs b/PROMS/DotNetBar Source Code/ColorPickers/ColorPickerDropDown.cs
new file mode 100644
index 00000000..525f5107
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/ColorPickers/ColorPickerDropDown.cs	
@@ -0,0 +1,978 @@
+using System;
+using System.Text;
+using System.Collections;
+using System.Drawing;
+using System.ComponentModel;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.Rendering;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represents the color picker drop down button.
+    /// </summary>
+    [DefaultEvent("SelectedColorChanged")]
+    public class ColorPickerDropDown : ButtonItem
+    {
+        #region Events
+        /// <summary>
+        /// Occurs when color is chosen from drop-down color picker or from Custom Colors dialog box. Selected color can be accessed through SelectedColor property.
+        /// </summary>
+        [Description("Occurs when color is chosen from drop-down color picker or from Custom Colors dialog box.")]
+        public event EventHandler SelectedColorChanged;
+
+        /// <summary>
+        /// Occurs when mouse is moving over the colors presented by the color picker. You can use it to preview the color before it is selected.
+        /// </summary>
+        [Description("Occurs when mouse is moving over the colors presented by the color picker")]
+        public event ColorPreviewEventHandler ColorPreview;
+
+        /// <summary>
+        /// Occurs before color picker dialog is shown. Data property of the event arguments will hold the reference to the Form about to be shown.
+        /// </summary>
+        public event CancelObjectValueEventHandler BeforeColorDialog;
+        #endregion
+
+        #region Private Variables
+        private bool m_ColorsInitialized = false;
+        private bool m_DisplayThemeColors = true;
+        private bool m_DisplayStandardColors = true;
+        private bool m_DisplayMoreColors = true;
+
+        private bool m_Localized = false;
+        private string m_ThemeColorsLabel = "Theme Colors";
+        private string m_StandardColorsLabel = "Standard Colors";
+        private string m_MoreColorsLabel = "&More Colors...";
+        private Color m_SelectedColor = System.Drawing.Color.Empty;
+        private Rectangle m_SelectedColorRectangle = Rectangle.Empty;
+        private bool m_SelectedImageCreated = false;
+        #endregion
+
+        #region Constructor
+        /// <summary>
+        /// Creates new instance of ButtonItem.
+        /// </summary>
+        public ColorPickerDropDown() : this("", "") { }
+        /// <summary>
+        /// Creates new instance of ButtonItem and assigns the name to it.
+        /// </summary>
+        /// <param name="sItemName">Item name.</param>
+        public ColorPickerDropDown(string sItemName) : this(sItemName, "") { }
+        /// <summary>
+        /// Creates new instance of ButtonItem and assigns the name and text to it.
+        /// </summary>
+        /// <param name="sItemName">Item name.</param>
+        /// <param name="ItemText">item text.</param>
+        public ColorPickerDropDown(string sItemName, string ItemText)
+            : base(sItemName, ItemText)
+        {
+            //this.AutoExpandOnClick = true;
+            this.SubItems.Add(new ButtonItem("tempColorPickerItem"));
+        }
+        #endregion
+
+        #region Internal Implementation
+        /// <summary>
+        /// Returns copy of the item.
+        /// </summary>
+        public override BaseItem Copy()
+        {
+            ColorPickerDropDown objCopy = new ColorPickerDropDown();
+            this.CopyToItem(objCopy);
+            return objCopy;
+        }
+        /// <summary>
+        /// Copies the ButtonItem specific properties to new instance of the item.
+        /// </summary>
+        /// <param name="c">New ButtonItem instance.</param>
+        protected override void CopyToItem(BaseItem c)
+        {
+            ColorPickerDropDown copy = c as ColorPickerDropDown;
+            copy.DisplayMoreColors = this.DisplayMoreColors;
+            copy.DisplayStandardColors = this.DisplayStandardColors;
+            copy.DisplayThemeColors = this.DisplayThemeColors;
+            copy.SelectedColorChanged = this.SelectedColorChanged;
+            copy.CustomStandardColors = GetCopy(this.CustomStandardColors);
+            copy.CustomThemeColors = GetCopy(this.CustomThemeColors);
+            copy.SelectedColorImageRectangle = this.SelectedColorImageRectangle;
+            copy.SelectedColor = this.SelectedColor;
+
+            base.CopyToItem(copy);
+        }
+
+        private ColorItem[][] GetCopy(ColorItem[][] colorItems)
+        {
+            if (colorItems == null || colorItems.Length == 0)
+                return null;
+            ColorItem[][] copies=new ColorItem[colorItems.Length][];
+            for (int i = 0; i < colorItems.Length; i++)
+            {
+                ColorItem[] items = colorItems[i];
+                copies[i]=new ColorItem[items.Length];
+                for (int j = 0; j < items.Length; j++)
+                {
+                    copies[i][j] = (ColorItem) items[j].Copy();
+                }
+            }
+
+            return copies;
+        }
+
+
+        /// <summary>
+        /// Raises the ColorPreview event.
+        /// </summary>
+        /// <param name="e">Provides the data for the event.</param>
+        protected virtual void OnColorPreview(ColorPreviewEventArgs e)
+        {
+            if (ColorPreview != null)
+                ColorPreview(this, e);
+        }
+
+        /// <summary>
+        /// Invokes the ColorPreview event.
+        /// </summary>
+        /// <param name="e">Provides data for the event.</param>
+        public void InvokeColorPreview(ColorPreviewEventArgs e)
+        {
+            OnColorPreview(e);
+        }
+
+        /// <summary>
+        /// Gets or sets the last selected color from either the drop-down or Custom Color dialog box. Default value is
+        /// Color.Empty. You can use SelectedColorChanged event to be notified when this property changes.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public Color SelectedColor
+        {
+            get { return m_SelectedColor; }
+            set { SetSelectedColor(value, false); }
+        }
+
+        /// <summary>
+        /// Gets or sets whether theme colors are displayed on drop-down. Default value is true.
+        /// </summary>
+        [Browsable(true), DefaultValue(true), DevCoBrowsable(true), DevCoSerialize(), Category("Appearance"), Description("Indicates whether theme colors are displayed on drop-down.")]
+        public bool DisplayThemeColors
+        {
+            get { return m_DisplayThemeColors; }
+            set { m_DisplayThemeColors = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether standard colors are displayed on drop-down. Default value is true.
+        /// </summary>
+        [Browsable(true), DefaultValue(true), DevCoBrowsable(true), DevCoSerialize(), Category("Appearance"), Description("Indicates whether standard colors are displayed on drop-down.")]
+        public bool DisplayStandardColors
+        {
+            get { return m_DisplayStandardColors; }
+            set { m_DisplayStandardColors = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets more colors menu item is visible which allows user to open Custom Colors dialog box. Default value is true.
+        /// </summary>
+        [Browsable(true), DefaultValue(true), DevCoBrowsable(true), DevCoSerialize(), Category("Appearance"), Description("Indicates more colors menu item is visible which allows user to open Custom Colors dialog box.")]
+        public bool DisplayMoreColors
+        {
+            get { return m_DisplayMoreColors; }
+            set { m_DisplayMoreColors = value; }
+        }
+
+        /// <summary>
+        /// Indicates whether SubItems collection is serialized. ColorPickerDropDown does not serialize the sub items.
+        /// </summary>
+        protected override bool ShouldSerializeSubItems()
+        {
+            return false;
+        }
+
+        /// <summary>
+        /// Gets or sets the rectangle in Image coordinates where selected color will be painted. Setting this property will
+        /// have an effect only if Image property is used to set the image. Default value is an empty rectangle which indicates
+        /// that selected color will not be painted on the image.
+        /// </summary>
+        [Browsable(true), Description("Indicates rectangle in Image coordinates where selected color will be painted. Property will have effect only if Image property is used to set the image."), Category("Behaviour")]
+        public Rectangle SelectedColorImageRectangle
+        {
+            get { return m_SelectedColorRectangle; }
+            set
+            {
+                m_SelectedColorRectangle = value;
+                UpdateSelectedColorImage();
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeSelectedColorImageRectangle()
+        {
+            return !m_SelectedColorRectangle.IsEmpty;
+        }
+
+        /// <summary>
+        /// Resets the property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetSelectedColorImageRectangle()
+        {
+            SelectedColorImageRectangle = Rectangle.Empty;
+        }
+
+        ///// <summary>
+        ///// Indicates whether the item will auto-expand when clicked. 
+        ///// When item is on top level bar and not on menu and contains sub-items, sub-items will be shown only if user
+        ///// click the expand part of the button. Setting this property to true will expand the button and show sub-items when user
+        ///// clicks anywhere inside of the button. Default value is true which indicates that button is expanded only
+        ///// if its expand part is clicked.
+        ///// </summary>
+        //[DefaultValue(true), Browsable(true), DevCoBrowsable(true), Category("Behavior"), Description("Indicates whether the item will auto-expand (display pop-up menu or toolbar) when clicked.")]
+        //public override bool AutoExpandOnClick
+        //{
+        //    get { return base.AutoExpandOnClick; }
+        //    set { base.AutoExpandOnClick = value; }
+        //}
+
+        /// <summary>
+        /// Gets whether internal representation of color items on popup has been initialized.
+        /// </summary>
+        [Browsable(false)]
+        public bool ColorsInitialized
+        {
+            get
+            {
+                return m_ColorsInitialized;
+            }
+        }
+
+        protected override void OnStyleChanged()
+        {
+            m_ColorsInitialized = false;
+            base.OnStyleChanged();
+        }
+
+        protected override void OnPopupOpen(PopupOpenEventArgs e)
+        {
+            base.OnPopupOpen(e); // Fire events first then initialize
+            if (!m_ColorsInitialized)
+                InitializeColorDropDown();
+        }
+
+        private void InitializeColorDropDown()
+        {
+            this.SubItems.Clear();
+
+            LoadResources();
+            if (m_DisplayThemeColors)
+            {
+                LabelItem label = new LabelItem();
+                label.CanCustomize = false;
+                label.Text = m_ThemeColorsLabel;
+                if (GlobalManager.Renderer is Office2007Renderer)
+                {
+                    label.BackColor = ((Office2007Renderer)GlobalManager.Renderer).ColorTable.Gallery.GroupLabelBackground;
+                    label.ForeColor = ((Office2007Renderer)GlobalManager.Renderer).ColorTable.Gallery.GroupLabelText;
+                    label.SingleLineColor = ((Office2007Renderer)GlobalManager.Renderer).ColorTable.Gallery.GroupLabelBorder;
+                }
+                else
+                {
+                    label.BackColor = ColorScheme.GetColor("DDE7EE");
+                    label.ForeColor = ColorScheme.GetColor("00156E");
+                    label.SingleLineColor = ColorScheme.GetColor("C5C5C5");
+                }
+                label.PaddingBottom = 1;
+                label.PaddingLeft = 0;
+                label.PaddingRight = 0;
+                label.PaddingTop = 1;
+                label.BorderSide = eBorderSide.Bottom;
+                label.BorderType = eBorderType.SingleLine;
+                this.SubItems.Add(label);
+                ArrayList colors = this.GetThemeColors();
+                AddColors(colors);
+            }
+
+            if (m_DisplayStandardColors)
+            {
+                LabelItem label = new LabelItem();
+                label.CanCustomize = false;
+                label.Text = m_StandardColorsLabel;
+                if (GlobalManager.Renderer is Office2007Renderer)
+                {
+                    label.BackColor = ((Office2007Renderer)GlobalManager.Renderer).ColorTable.QuickAccessToolbar.QatCustomizeMenuLabelBackground;
+                    label.ForeColor = ((Office2007Renderer)GlobalManager.Renderer).ColorTable.QuickAccessToolbar.QatCustomizeMenuLabelText;
+                    label.SingleLineColor = ((Office2007Renderer)GlobalManager.Renderer).ColorTable.Gallery.GroupLabelBorder;
+                }
+                else
+                {
+                    label.BackColor = ColorScheme.GetColor("DDE7EE");
+                    label.ForeColor = ColorScheme.GetColor("00156E");
+                    label.SingleLineColor = ColorScheme.GetColor("C5C5C5");
+                }
+                label.PaddingBottom = 1;
+                label.PaddingLeft = 0;
+                label.PaddingRight = 0;
+                label.PaddingTop = 1;
+                label.BorderSide = eBorderSide.Bottom;
+                label.BorderType = eBorderType.SingleLine;
+                this.SubItems.Add(label);
+                ArrayList colors = this.GetStandardColors();
+                AddColors(colors);
+            }
+
+            if (m_DisplayMoreColors)
+            {
+                ButtonItem button = new ButtonItem("sys_CPMoreColors", m_MoreColorsLabel);
+                button.CanCustomize = false;
+                button.Image = BarFunctions.LoadBitmap("SystemImages.ColorPickerCustomColors.png");
+                button.Click += new EventHandler(MoreColorsButtonClick);
+                button.BeginGroup = true;
+                this.SubItems.Add(button);
+            }
+
+            m_ColorsInitialized = true;
+
+            OnColorItemsInitialized(EventArgs.Empty);
+        }
+
+        /// <summary>
+        /// "Occurs after popup colors have been added to the SubItems collection. This event can be used to effectively add custom items to the popup.
+        /// </summary>
+        [Description("Occurs after popup colors have been added to the SubItems collection. This event can be used to effectively add custom items to the popup.")]
+        public event EventHandler ColorItemsInitialized;
+
+        /// <summary>
+        /// Raises RemovingToken event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnColorItemsInitialized(EventArgs e)
+        {
+            EventHandler handler = ColorItemsInitialized;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        private void MoreColorsButtonClick(object sender, EventArgs e)
+        {
+            DisplayMoreColorsDialog();
+        }
+
+        /// <summary>
+        /// Displays the Colors dialog that allows user to choose the color or create a custom color. If new color is chosen the
+        /// SelectedColorChanged event is raised.
+        /// </summary>
+        public DialogResult DisplayMoreColorsDialog()
+        {
+            DialogResult result = DialogResult.Cancel;
+
+            if (StyleManager.IsMetro(this.EffectiveStyle))
+            {
+                ColorPickerItem.CustomColorDialogMetro d = new ColorPickerItem.CustomColorDialogMetro();
+                d.SetStyle(this.EffectiveStyle);
+                d.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+                if (!this.SelectedColor.IsEmpty)
+                    d.CurrentColor = this.SelectedColor;
+                LocalizeDialog(d);
+                CancelObjectValueEventArgs e = new CancelObjectValueEventArgs(d);
+                OnBeforeColorDialog(e);
+                if (e.Cancel)
+                {
+                    d.Dispose();
+                    return DialogResult.None;
+                }
+                if (_OwnerWindow != null)
+                {
+                    if (_OwnerWindow is Form && ((Form)_OwnerWindow).TopMost)
+                        d.TopMost = true;
+                    d.ShowDialog(_OwnerWindow);
+                }
+                else
+                    d.ShowDialog();
+
+                result = d.DialogResult;
+                if (result == System.Windows.Forms.DialogResult.OK)
+                {
+                    if (!d.NewColor.IsEmpty)
+                    {
+                        this.SetSelectedColor(d.NewColor);
+                    }
+                }
+
+                d.Dispose();
+            }
+            else
+            {
+                ColorPickerItem.CustomColorDialog d = new ColorPickerItem.CustomColorDialog();
+                d.SetStyle(this.EffectiveStyle);
+                d.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+                if (!this.SelectedColor.IsEmpty)
+                    d.CurrentColor = this.SelectedColor;
+                LocalizeDialog(d);
+                CancelObjectValueEventArgs e = new CancelObjectValueEventArgs(d);
+                OnBeforeColorDialog(e);
+                if (e.Cancel)
+                {
+                    d.Dispose();
+                    return DialogResult.None;
+                }
+                if (_OwnerWindow != null)
+                {
+                    if (_OwnerWindow is Form && ((Form)_OwnerWindow).TopMost)
+                        d.TopMost = true;
+                    d.ShowDialog(_OwnerWindow);
+                }
+                else
+                    d.ShowDialog();
+
+                result = d.DialogResult;
+                if (result == System.Windows.Forms.DialogResult.OK)
+                {
+                    if (!d.NewColor.IsEmpty)
+                    {
+                        this.SetSelectedColor(d.NewColor);
+                    }
+                }
+
+                d.Dispose();
+            }
+            return result;
+        }
+
+        /// <summary>
+        /// Raises the BeforeColorDialog event.
+        /// </summary>
+        /// <param name="e"></param>
+        protected virtual void OnBeforeColorDialog(CancelObjectValueEventArgs e)
+        {
+            CancelObjectValueEventHandler h = this.BeforeColorDialog;
+            if (h != null)
+                h(this, e);
+        }
+
+        private IWin32Window _OwnerWindow = null;
+        /// <summary>
+        /// Gets or sets the Owner Window that will be used as owner for the colors modal dialog when displayed.
+        /// </summary>
+        [Browsable(false), DefaultValue(null)]
+        public IWin32Window OwnerWindow
+        {
+            get { return _OwnerWindow; }
+            set { _OwnerWindow = value; }
+        }
+
+        private void LocalizeDialog(ColorPickerItem.CustomColorDialog d)
+        {
+            if (this.GetOwner() != null)
+                m_Localized = true;
+            using (LocalizationManager lm = new LocalizationManager(this.GetOwner() as IOwnerLocalize))
+            {
+                string s = lm.GetLocalizedString(LocalizationKeys.ColorPickerDialogOKButton);
+                if (s != "") d.buttonOK.Text = s;
+                s = lm.GetLocalizedString(LocalizationKeys.ColorPickerDialogCancelButton);
+                if (s != "") d.buttonCancel.Text = s;
+                s = lm.GetLocalizedString(LocalizationKeys.ColorPickerDialogNewColorLabel);
+                if (s != "") d.labelNewColor.Text = s;
+                s = lm.GetLocalizedString(LocalizationKeys.ColorPickerDialogCurrentColorLabel);
+                if (s != "") d.labelCurrentColor.Text = s;
+                s = lm.GetLocalizedString(LocalizationKeys.ColorPickerDialogStandardColorsLabel);
+                if (s != "") d.labelStandardColors.Text = s;
+                s = lm.GetLocalizedString(LocalizationKeys.ColorPickerDialogCustomColorsLabel);
+                if (s != "") d.labelCustomColors.Text = s;
+                s = lm.GetLocalizedString(LocalizationKeys.ColorPickerDialogGreenLabel);
+                if (s != "") d.labelGreen.Text = s;
+                s = lm.GetLocalizedString(LocalizationKeys.ColorPickerDialogBlueLabel);
+                if (s != "") d.labelBlue.Text = s;
+                s = lm.GetLocalizedString(LocalizationKeys.ColorPickerDialogRedLabel);
+                if (s != "") d.labelRed.Text = s;
+                s = lm.GetLocalizedString(LocalizationKeys.ColorPickerTabStandard);
+                if (s != "") d.tabItemStandard.Text = s;
+                s = lm.GetLocalizedString(LocalizationKeys.ColorPickerTabCustom);
+                if (s != "") d.tabItemCustom.Text = s;
+                s = lm.GetLocalizedString(LocalizationKeys.ColorPickerCaption);
+                if (s != "") d.Text = s;
+                s = lm.GetLocalizedString(LocalizationKeys.ColorPickerDialogColorModelLabel);
+                if (s != "") d.labelColorModel.Text = s;
+                s = lm.GetLocalizedString(LocalizationKeys.ColorPickerDialogRgbLabel);
+                if (s != "") d.comboColorModel.Items[0] = s;
+            }
+        }
+        private void LocalizeDialog(ColorPickerItem.CustomColorDialogMetro d)
+        {
+            if (this.GetOwner() != null)
+                m_Localized = true;
+            using (LocalizationManager lm = new LocalizationManager(this.GetOwner() as IOwnerLocalize))
+            {
+                string s = lm.GetLocalizedString(LocalizationKeys.ColorPickerDialogOKButton);
+                if (s != "") d.buttonOK.Text = s;
+                s = lm.GetLocalizedString(LocalizationKeys.ColorPickerDialogCancelButton);
+                if (s != "") d.buttonCancel.Text = s;
+                s = lm.GetLocalizedString(LocalizationKeys.ColorPickerDialogNewColorLabel);
+                if (s != "") d.labelNewColor.Text = s;
+                s = lm.GetLocalizedString(LocalizationKeys.ColorPickerDialogCurrentColorLabel);
+                if (s != "") d.labelCurrentColor.Text = s;
+                s = lm.GetLocalizedString(LocalizationKeys.ColorPickerDialogStandardColorsLabel);
+                if (s != "") d.labelStandardColors.Text = s;
+                s = lm.GetLocalizedString(LocalizationKeys.ColorPickerDialogCustomColorsLabel);
+                if (s != "") d.labelCustomColors.Text = s;
+                s = lm.GetLocalizedString(LocalizationKeys.ColorPickerDialogGreenLabel);
+                if (s != "") d.labelGreen.Text = s;
+                s = lm.GetLocalizedString(LocalizationKeys.ColorPickerDialogBlueLabel);
+                if (s != "") d.labelBlue.Text = s;
+                s = lm.GetLocalizedString(LocalizationKeys.ColorPickerDialogRedLabel);
+                if (s != "") d.labelRed.Text = s;
+                s = lm.GetLocalizedString(LocalizationKeys.ColorPickerTabStandard);
+                if (s != "") d.tabItemStandard.Text = s;
+                s = lm.GetLocalizedString(LocalizationKeys.ColorPickerTabCustom);
+                if (s != "") d.tabItemCustom.Text = s;
+                s = lm.GetLocalizedString(LocalizationKeys.ColorPickerCaption);
+                if (s != "") d.Text = s;
+                s = lm.GetLocalizedString(LocalizationKeys.ColorPickerDialogColorModelLabel);
+                if (s != "") d.labelColorModel.Text = s;
+                s = lm.GetLocalizedString(LocalizationKeys.ColorPickerDialogRgbLabel);
+                if (s != "") d.comboColorModel.Items[0] = s;
+            }
+        }
+
+        private void AddColors(ArrayList colors)
+        {
+            int colorItemSpacing = 3;
+            for (int i = 0; i < colors.Count; i++)
+            {
+                ItemContainer cont = new ItemContainer();
+                cont.Orientation = eOrientation.Horizontal;
+                cont.ItemSpacing = colorItemSpacing;
+                if (i == 0)
+                {
+                    cont.BackgroundStyle.MarginBottom = 5;
+                    cont.BackgroundStyle.MarginTop = 3;
+                }
+                if (i == colors.Count - 1)
+                    cont.BackgroundStyle.MarginBottom = 3;
+
+                ColorItem[] colorLine = (ColorItem[])colors[i];
+                foreach (ColorItem ci in colorLine)
+                {
+                    cont.SubItems.Add(ci);
+                    ci.Click += new EventHandler(ColorItemClick);
+                    ci.AutoCollapseOnClick = false;
+                }
+                this.SubItems.Add(cont);
+            }
+        }
+
+        private void ColorItemClick(object sender, EventArgs e)
+        {
+            ColorItem ci = sender as ColorItem;
+            if (ci == null)
+                return;
+
+            SetSelectedColor(ci.Color);
+            if (AutoCollapseOnClick)
+                BaseItem.CollapseAll(this);
+            else if (this.PopupControl != null)
+                this.PopupControl.Invalidate();
+        }
+
+        private void SetSelectedColor(Color c)
+        {
+            SetSelectedColor(c, true);
+        }
+
+        private void SetSelectedColor(Color c, bool raiseClick)
+        {
+            bool valueChanged = (m_SelectedColor != c);
+            m_SelectedColor = c;
+
+            OnSelectedColorChanged(new EventArgs());
+            if (raiseClick)
+                RaiseClick();
+
+            if (valueChanged && ShouldSyncProperties)
+                BarFunctions.SyncProperty(this, "SelectedColor");
+
+            UpdateSelectedColorImage();
+        }
+
+        protected override void ScaleItem(SizeF factor)
+        {
+            base.ScaleItem(factor);
+            UpdateSelectedColorImage();
+        }
+
+        /// <summary>
+        /// Update the selected color image if the SelectedColorImageRectangle has been set and button is using Image property to display the image.
+        /// </summary>
+        public void UpdateSelectedColorImage()
+        {
+            if (m_SelectedColorRectangle.IsEmpty || m_SelectedColorRectangle.Width <= 0 || m_SelectedColorRectangle.Height <= 0 ||
+                this.Image == null || this.DesignMode) return;
+
+            Bitmap bmp = new Bitmap(this.Image.Width, this.Image.Height, System.Drawing.Imaging.PixelFormat.Format32bppArgb);
+            using (Graphics g = Graphics.FromImage(bmp))
+            {
+                Rectangle r = m_SelectedColorRectangle;
+                g.DrawImage(this.Image, 0, 0, this.Image.Width, this.Image.Height);
+                Color selColor = this.SelectedColor;
+                bool noColor = false;
+                if (selColor.IsEmpty || selColor == Color.Transparent)
+                {
+                    selColor = Color.White;
+                    noColor = true;
+                }
+                using (SolidBrush b = new SolidBrush(selColor))
+                {
+                    g.FillRectangle(b, r);
+                }
+                if (noColor && r.Height > 5)
+                {
+                    r.Width--;
+                    r.Height--;
+                    using (Pen p = new Pen(Color.Black))
+                    {
+                        g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.HighQuality;
+                        g.DrawLine(p, r.X, r.Y, r.Right, r.Bottom);
+                        g.DrawLine(p, r.Right, r.Y, r.X, r.Bottom);
+                        g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.Default;
+                    }
+                }
+            }
+            if (m_SelectedImageCreated)
+            {
+                Image img = this.Image;
+                this.Image = bmp;
+                img.Dispose();
+            }
+            else
+                this.Image = bmp;
+            m_SelectedImageCreated = true;
+        }
+
+#if FRAMEWORK20
+        private ColorItem[][] _CustomThemeColors = null;
+        /// <summary>
+        /// Gets or sets the array of ColorItem objects that will be used as theme colors instead of built-in color palette.
+        /// See: http://www.devcomponents.com/kb2/?p=79 for instructions.
+        /// </summary>
+        [DefaultValue(null), Category("Colors"), Description("Array of ColorItem objects that will be used as theme colors instead of built-in color palette.")]
+        public ColorItem[][] CustomThemeColors
+        {
+            get { return _CustomThemeColors; }
+            set
+            {
+                _CustomThemeColors = value;
+                m_ColorsInitialized = false;
+            }
+        }
+#endif
+
+        /// <summary>
+        /// Gets collection of ColorItem[] arrays that represent themed colors. Each ColorItem[] array is used to represent single line of theme colors. 
+        /// </summary>
+        /// <returns>Collection of ColorItem[] arrays.</returns>
+        protected virtual ArrayList GetThemeColors()
+        {
+            ArrayList colors = new ArrayList();
+#if FRAMEWORK20
+            if (_CustomThemeColors == null || _CustomThemeColors.Length == 0)
+#endif
+            {
+                eDotNetBarStyle effectiveStyle = EffectiveStyle;
+                if (effectiveStyle == eDotNetBarStyle.Office2010 || StyleManager.IsMetro(effectiveStyle))
+                {
+                    colors.Add(new ColorItem[] {
+                        GetColorItem("FFFFFF"),
+                        GetColorItem("000000"),
+                        GetColorItem("EEECE1"),
+                        GetColorItem("1F497D"),
+                        GetColorItem("4F81BD"),
+                        GetColorItem("C0504D"),
+                        GetColorItem("9BBB59"),
+                        GetColorItem("8064A2"),
+                        GetColorItem("4BACC6"),
+                        GetColorItem("F79646")});
+
+                    colors.Add(new ColorItem[] {
+                        GetColorItemTop("F2F2F2"),
+                        GetColorItemTop("7F7F7F"),
+                        GetColorItemTop("DDD9C3"),
+                        GetColorItemTop("C6D9F0"),
+                        GetColorItemTop("DBE5F1"),
+                        GetColorItemTop("F2DCDB"),
+                        GetColorItemTop("EBF1DD"),
+                        GetColorItemTop("E5E0EC"),
+                        GetColorItemTop("DBEEF3"),
+                        GetColorItemTop("FDEADA")});
+
+                    colors.Add(new ColorItem[] {
+                        GetColorItemMiddle("D8D8D8"),
+                        GetColorItemMiddle("595959"),
+                        GetColorItemMiddle("C4BD97"),
+                        GetColorItemMiddle("8DB3E2"),
+                        GetColorItemMiddle("B8CCE4"),
+                        GetColorItemMiddle("E5B9B7"),
+                        GetColorItemMiddle("D7E3BC"),
+                        GetColorItemMiddle("CCC1D9"),
+                        GetColorItemMiddle("B7DDE8"),
+                        GetColorItemMiddle("FBD5B5")});
+
+                    colors.Add(new ColorItem[] {
+                        GetColorItemMiddle("BFBFBF"),
+                        GetColorItemMiddle("3F3F3F"),
+                        GetColorItemMiddle("938953"),
+                        GetColorItemMiddle("548DD4"),
+                        GetColorItemMiddle("95B3D7"),
+                        GetColorItemMiddle("D99694"),
+                        GetColorItemMiddle("C3D69B"),
+                        GetColorItemMiddle("B2A1C7"),
+                        GetColorItemMiddle("92CDDC"),
+                        GetColorItemMiddle("FAC08F")});
+
+                    colors.Add(new ColorItem[] {
+                        GetColorItemMiddle("A5A5A5"),
+                        GetColorItemMiddle("262626"),
+                        GetColorItemMiddle("494429"),
+                        GetColorItemMiddle("17365D"),
+                        GetColorItemMiddle("366092"),
+                        GetColorItemMiddle("953734"),
+                        GetColorItemMiddle("76923C"),
+                        GetColorItemMiddle("5F497A"),
+                        GetColorItemMiddle("31859B"),
+                        GetColorItemMiddle("E36C09")});
+
+                    colors.Add(new ColorItem[] {
+                        GetColorItemBottom("7F7F7F"),
+                        GetColorItemBottom("0C0C0C"),
+                        GetColorItemBottom("1D1B10"),
+                        GetColorItemBottom("0F243E"),
+                        GetColorItemBottom("244061"),
+                        GetColorItemBottom("632423"),
+                        GetColorItemBottom("4F6128"),
+                        GetColorItemBottom("3F3151"),
+                        GetColorItemBottom("205867"),
+                        GetColorItemBottom("974806")});
+                }
+                else
+                {
+                    colors.Add(new ColorItem[] {
+                        GetColorItem("FFFFFF"),
+                        GetColorItem("000000"),
+                        GetColorItem("FAF3E8"),
+                        GetColorItem("1F497D"),
+                        GetColorItem("5C83B4"),
+                        GetColorItem("C0504D"),
+                        GetColorItem("9DBB61"),
+                        GetColorItem("8066A0"),
+                        GetColorItem("4BACC6"),
+                        GetColorItem("F59D56")});
+
+                    colors.Add(new ColorItem[] {
+                        GetColorItemTop("D8D8D8"),
+                        GetColorItemTop("7F7F7F"),
+                        GetColorItemTop("BBB6AE"),
+                        GetColorItemTop("C7D1DE"),
+                        GetColorItemTop("D6E0EC"),
+                        GetColorItemTop("EFD3D2"),
+                        GetColorItemTop("E6EED7"),
+                        GetColorItemTop("DFD8E7"),
+                        GetColorItemTop("D2EAF0"),
+                        GetColorItemTop("FCE6D4")});
+
+                    colors.Add(new ColorItem[] {
+                        GetColorItemMiddle("BFBFBF"),
+                        GetColorItemMiddle("727272"),
+                        GetColorItemMiddle("A29D96"),
+                        GetColorItemMiddle("8FA4BE"),
+                        GetColorItemMiddle("ADC1D9"),
+                        GetColorItemMiddle("DFA7A6"),
+                        GetColorItemMiddle("CEDDB0"),
+                        GetColorItemMiddle("BFB2CF"),
+                        GetColorItemMiddle("A5D5E2"),
+                        GetColorItemMiddle("FACEAA")});
+
+                    colors.Add(new ColorItem[] {
+                        GetColorItemMiddle("A5A5A5"),
+                        GetColorItemMiddle("595959"),
+                        GetColorItemMiddle("7D7974"),
+                        GetColorItemMiddle("57769D"),
+                        GetColorItemMiddle("84A2C6"),
+                        GetColorItemMiddle("CF7B79"),
+                        GetColorItemMiddle("B5CC88"),
+                        GetColorItemMiddle("9F8CB7"),
+                        GetColorItemMiddle("78C0D4"),
+                        GetColorItemMiddle("F7B580")});
+
+                    colors.Add(new ColorItem[] {
+                        GetColorItemMiddle("8C8C8C"),
+                        GetColorItemMiddle("3F3F3F"),
+                        GetColorItemMiddle("575551"),
+                        GetColorItemMiddle("17365D"),
+                        GetColorItemMiddle("456287"),
+                        GetColorItemMiddle("903C39"),
+                        GetColorItemMiddle("758C48"),
+                        GetColorItemMiddle("604C78"),
+                        GetColorItemMiddle("388194"),
+                        GetColorItemMiddle("B77540")});
+
+                    colors.Add(new ColorItem[] {
+                        GetColorItemBottom("7F7F7F"),
+                        GetColorItemBottom("262626"),
+                        GetColorItemBottom("3E3C3A"),
+                        GetColorItemBottom("0F243E"),
+                        GetColorItemBottom("2E415A"),
+                        GetColorItemBottom("602826"),
+                        GetColorItemBottom("4E5D30"),
+                        GetColorItemBottom("403350"),
+                        GetColorItemBottom("255663"),
+                        GetColorItemBottom("7A4E2B")});
+                }
+            }
+#if FRAMEWORK20
+            else
+                colors.AddRange(_CustomThemeColors);
+#endif
+
+            return colors;
+        }
+
+        /// <summary>
+        /// Returns an array that represents the standard colors. Usually instances of ColorItem are included. 
+        /// </summary>
+        /// <returns>ArrayList containing objects that describe standard colors.</returns>
+        protected virtual ArrayList GetStandardColors()
+        {
+            ArrayList colors = new ArrayList();
+#if FRAMEWORK20
+            if (_CustomStandardColors == null || _CustomStandardColors.Length == 0)
+#endif
+            {
+                eDotNetBarStyle effectiveStyle = EffectiveStyle;
+                if (effectiveStyle == eDotNetBarStyle.Office2010 || StyleManager.IsMetro(effectiveStyle))
+                {
+                    colors.Add(new ColorItem[] {
+                        GetColorItem("C00000"),
+                        GetColorItem("FF0000"),
+                        GetColorItem("FFC000"),
+                        GetColorItem("FFFF00"),
+                        GetColorItem("92D050"),
+                        GetColorItem("00B050"),
+                        GetColorItem("00B0F0"),
+                        GetColorItem("0070C0"),
+                        GetColorItem("002060"),
+                        GetColorItem("7030A0")});
+                }
+                else
+                {
+                    colors.Add(new ColorItem[] {
+                        GetColorItem("BA1419"),
+                        GetColorItem("ED1C24"),
+                        GetColorItem("FFC20E"),
+                        GetColorItem("FFF200"),
+                        GetColorItem("9DDA4E"),
+                        GetColorItem("22B14C"),
+                        GetColorItem("00B7EF"),
+                        GetColorItem("0072BC"),
+                        GetColorItem("2F3699"),
+                        GetColorItem("6F3198")});
+                }
+            }
+#if FRAMEWORK20
+            else
+                colors.AddRange(_CustomStandardColors);
+#endif
+
+            return colors;
+        }
+#if FRAMEWORK20
+        private ColorItem[][] _CustomStandardColors = null;
+        /// <summary>
+        /// Gets or sets the array of ColorItem objects that will be used as standard colors instead of built-in color palette.
+        /// See: http://www.devcomponents.com/kb2/?p=79 for instructions.
+        /// </summary>
+        [DefaultValue(null), Category("Colors"), Description("Array of ColorItem objects that will be used as standard colors instead of built-in color palette.")]
+        public ColorItem[][] CustomStandardColors
+        {
+            get { return _CustomStandardColors; }
+            set
+            {
+                _CustomStandardColors = value;
+                m_ColorsInitialized = false;
+            }
+        }
+#endif
+
+        private ColorItem GetColorItem(string color)
+        {
+            ColorItem c = new ColorItem("", "", ColorScheme.GetColor(color));
+
+            return c;
+        }
+
+        private ColorItem GetColorItemTop(string color)
+        {
+            ColorItem c = new ColorItem("", "", ColorScheme.GetColor(color));
+            eColorItemBorder border = eColorItemBorder.Top | eColorItemBorder.Left | eColorItemBorder.Right;
+            c.Border = border;
+            return c;
+        }
+
+        private ColorItem GetColorItemMiddle(string color)
+        {
+            ColorItem c = new ColorItem("", "", ColorScheme.GetColor(color));
+            eColorItemBorder border = eColorItemBorder.Left | eColorItemBorder.Right;
+            c.Border = border;
+            return c;
+        }
+
+        private ColorItem GetColorItemBottom(string color)
+        {
+            ColorItem c = new ColorItem("", "", ColorScheme.GetColor(color));
+            eColorItemBorder border = eColorItemBorder.Bottom | eColorItemBorder.Left | eColorItemBorder.Right;
+            c.Border = border;
+            return c;
+        }
+
+        private void LoadResources()
+        {
+            if (!m_Localized)
+            {
+                if (this.GetOwner() != null)
+                    m_Localized = true;
+                using (LocalizationManager lm = new LocalizationManager(this.GetOwner() as IOwnerLocalize))
+                {
+                    string s = lm.GetLocalizedString(LocalizationKeys.ColorPickerThemeColorsLabel);
+                    if (s != "") m_ThemeColorsLabel = s;
+                    s = lm.GetLocalizedString(LocalizationKeys.ColorPickerStandardColorsLabel);
+                    if (s != "") m_StandardColorsLabel = s;
+                    s = lm.GetLocalizedString(LocalizationKeys.ColorPickerMoreColorsMenuItem);
+                    if (s != "") m_MoreColorsLabel = s;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Invokes SelectedColorChanged event.
+        /// </summary>
+        protected virtual void OnSelectedColorChanged(EventArgs e)
+        {
+            if (SelectedColorChanged != null)
+                SelectedColorChanged(this, e);
+            DotNetBarManager manager = this.GetOwner() as DotNetBarManager;
+            if (manager != null)
+                manager.InvokeColorPickerSelectedColorChanged(this);
+        }
+
+        /// <summary>
+        /// Indicates whether button should popup when clicked automatically.
+        /// </summary>
+        protected override bool ShouldAutoExpandOnClick
+        {
+            get { return base.ShouldAutoExpandOnClick || m_SelectedColor.IsEmpty; }
+        }
+
+        protected override void OnCommandChanged()
+        {
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/ColorPickers/ColorSelectionPreviewControl.cs b/PROMS/DotNetBar Source Code/ColorPickers/ColorSelectionPreviewControl.cs
new file mode 100644
index 00000000..e92f1570
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/ColorPickers/ColorSelectionPreviewControl.cs	
@@ -0,0 +1,86 @@
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.Drawing;
+using System.Data;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.ColorPickerItem
+{
+    [ToolboxItem(false)]
+	internal class ColorSelectionPreviewControl : System.Windows.Forms.UserControl
+	{
+		#region Private Variables
+		private Color m_CurrentColor = Color.Black;
+		private Color m_NewColor = Color.Empty;
+		#endregion
+		
+		#region Constructor
+		public ColorSelectionPreviewControl()
+		{
+			this.SetStyle(ControlStyles.AllPaintingInWmPaint, true);
+			this.SetStyle(ControlStyles.UserPaint, true);
+			this.SetStyle(ControlStyles.Opaque, true);
+			this.SetStyle(DisplayHelp.DoubleBufferFlag, true);
+			this.SetStyle(ControlStyles.ResizeRedraw, true);
+		}
+		#endregion
+		
+		#region Internal Implementation
+		protected override void OnPaint(PaintEventArgs e)
+		{
+			if(this.BackColor == Color.Transparent)
+			{
+				base.OnPaintBackground(e);
+			}
+
+			Graphics g = e.Graphics;
+			
+			Rectangle r = this.ClientRectangle;
+			
+			g.FillRectangle(SystemBrushes.Control, r);
+			
+			if(!m_NewColor.IsEmpty)
+			{
+				using(SolidBrush brush = new SolidBrush(m_NewColor))
+					g.FillRectangle(brush, r.X, r.Y, r.Width, r.Height / 2);
+			}
+			
+			if(!m_CurrentColor.IsEmpty)
+			{
+				using(SolidBrush brush = new SolidBrush(m_CurrentColor))
+					g.FillRectangle(brush, r.X, r.Y + r.Height / 2, r.Width, r.Height / 2);
+			}
+			
+			using(Pen pen=new Pen(Color.Black))
+			{
+				r.Width--;
+				r.Height--;
+				g.DrawRectangle(pen, r);
+				
+				g.DrawLine(pen, r.X, r.Y + r.Height / 2, r.Right, r.Y + r.Height / 2);
+			}
+		}
+		
+		public Color NewColor
+		{
+			get { return m_NewColor;}
+			set
+			{
+				m_NewColor = value;
+				this.Invalidate();
+			}
+		}
+		
+		public Color CurrentColor
+		{
+			get { return m_CurrentColor;}
+			set
+			{
+				m_CurrentColor = value;
+				this.Invalidate();
+			}
+		}
+		#endregion
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/ColorPickers/CombCell.cs b/PROMS/DotNetBar Source Code/ColorPickers/CombCell.cs
new file mode 100644
index 00000000..854a0d5b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/ColorPickers/CombCell.cs	
@@ -0,0 +1,100 @@
+using System;
+using System.Text;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+
+namespace DevComponents.DotNetBar.ColorPickers
+{
+    internal class CombCell
+    {
+        #region Private Variables
+        private Color m_Color = Color.Empty;
+        private Point[] m_HexagonPoints=new Point[6];
+        private const float Tan30 = 0.57735026918962F;
+        private bool m_MouseOver = false;
+        private bool m_Selected = false;
+        private Rectangle m_Bounds = Rectangle.Empty;
+        #endregion
+
+        #region Internal Implementation
+        public Color Color
+        {
+            get { return m_Color; }
+            set { m_Color=value; }
+        }
+
+        public void SetPosition(float x, float y, int nWidth)
+        {
+            float nSideLength = (float)((float)nWidth * Tan30);
+            m_HexagonPoints[0] = new Point((int)Math.Floor(x - (float)(nWidth / 2)), (int)Math.Floor(y - (nSideLength / 2))-1);
+            m_HexagonPoints[1] = new Point((int)Math.Floor((float)x), (int)Math.Floor(y - (float)(nWidth / 2))-1);
+            m_HexagonPoints[2] = new Point((int)Math.Floor(x + (float)(nWidth / 2)), (int)Math.Floor(y - (nSideLength / 2))-1);
+            m_HexagonPoints[3] = new Point((int)Math.Floor(x + (float)(nWidth / 2)), (int)Math.Floor(y + (nSideLength / 2)) + 1);
+            m_HexagonPoints[4] = new Point((int)Math.Floor((float)x), (int)Math.Floor(y + (float)(nWidth / 2)) + 1);
+            m_HexagonPoints[5] = new Point((int)Math.Floor(x - (float)(nWidth / 2)), (int)Math.Floor(y + (nSideLength / 2)) + 1);
+
+            GraphicsPath path = new GraphicsPath();
+            path.AddPolygon(m_HexagonPoints);
+            m_Bounds = Rectangle.Round(path.GetBounds());
+            m_Bounds.Inflate(2, 2);
+        }
+
+        public void Draw(Graphics g)
+        {
+            GraphicsPath path = new GraphicsPath();
+            path.AddPolygon(m_HexagonPoints);
+            path.CloseAllFigures();
+
+            using (SolidBrush brush = new SolidBrush(m_Color))
+            {
+                g.FillPath(brush, path);
+            }
+
+            if (m_MouseOver || m_Selected)
+            {
+                SmoothingMode sm = g.SmoothingMode;
+                g.SmoothingMode = SmoothingMode.AntiAlias;
+                using (Pen pen = new Pen(Color.FromArgb(41, 92, 150), 2))
+                    g.DrawPath(pen, path);
+                using (Pen pen = new Pen(Color.FromArgb(149, 178, 239), 1))
+                    g.DrawPath(pen, path);
+                g.SmoothingMode = sm;
+            }
+
+            path.Dispose();
+        }
+
+        public void Draw(Graphics g, Color c)
+        {
+            GraphicsPath path = new GraphicsPath();
+            path.AddPolygon(m_HexagonPoints);
+            using (SolidBrush brush = new SolidBrush(c))
+            {
+                g.FillPath(brush, path);
+            }
+            path.Dispose();
+        }
+
+        public Rectangle Bounds
+        {
+            get
+            {
+                return m_Bounds;
+            }
+        }
+
+        public bool MouseOver
+        {
+            get { return m_MouseOver; }
+            set { m_MouseOver = value; }
+        }
+
+        public bool Selected
+        {
+            get { return m_Selected; }
+            set { m_Selected = value; }
+        }
+        #endregion
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/ColorPickers/CustomColorBlender.cs b/PROMS/DotNetBar Source Code/ColorPickers/CustomColorBlender.cs
new file mode 100644
index 00000000..2c413af1
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/ColorPickers/CustomColorBlender.cs	
@@ -0,0 +1,340 @@
+using System;
+using System.Text;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Windows.Forms;
+using System.Drawing.Imaging;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar.ColorPickers
+{
+    /// <summary>
+    /// Represents custom color blend selection control.
+    /// </summary>
+    [ToolboxItem(true), DefaultEvent("SelectedColorChanged"), DefaultProperty("SelectedColor"), ToolboxBitmap(typeof(CustomColorBlender), "ColorPickerItem.CustomColorBlender.ico")]
+    public class CustomColorBlender : System.Windows.Forms.Control
+    {
+        #region Events
+        /// <summary>
+        /// Occurs when SelectedColor has changed.
+        /// </summary>
+        public event EventHandler SelectedColorChanged;
+        /// <summary>
+        /// Raises SelectedColorChanged event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnSelectedColorChanged(EventArgs e)
+        {
+            EventHandler handler = SelectedColorChanged;
+            if (handler != null)
+                handler(this, e);
+        }
+        #endregion
+    	
+        #region Private Variables
+        private Bitmap m_ColorBlendBitmap = null;
+        private Point m_SelectedPoint = new Point(-1, -1);
+        #endregion
+
+        #region Constructor, Dispose
+        public CustomColorBlender()
+		{
+            this.SetStyle(ControlStyles.AllPaintingInWmPaint, true);
+            this.SetStyle(ControlStyles.UserPaint, true);
+            this.SetStyle(ControlStyles.Opaque, true);
+            this.SetStyle(DisplayHelp.DoubleBufferFlag, true);
+            this.SetStyle(ControlStyles.ResizeRedraw, true);
+		}
+
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                if (m_ColorBlendBitmap != null)
+                {
+                    m_ColorBlendBitmap.Dispose();
+                    m_ColorBlendBitmap = null;
+                }
+            }
+            base.Dispose(disposing);
+        }
+
+        private void CreateBlendBitmap()
+        {
+            int stripeCount = 6;
+            Rectangle clientRect = this.ClientRectangle;
+
+            int stripeWidth = clientRect.Width / stripeCount;
+            int ySteps=127;
+            int xStart = clientRect.X;
+            Bitmap bmp = new Bitmap(clientRect.Width, clientRect.Height, PixelFormat.Format24bppRgb);
+            using (Graphics graph = Graphics.FromImage(bmp))
+            {
+                graph.FillRectangle(SystemBrushes.Control, clientRect);
+
+                for (int stripe = 0; stripe < stripeCount; stripe++)
+                {
+                    // Calculate X steps and point Width
+                    int pointWidth = 4;
+                    int colorStepX = 255 / (stripeWidth / pointWidth);
+
+                    if (colorStepX<1)
+                    {
+                        pointWidth = stripeWidth / 255;
+                        colorStepX = 1;
+                    }
+
+                    int pointHeight = 4;
+                    int colorStepY = ySteps / (clientRect.Height / pointHeight);
+                    
+                    if (colorStepY<1)
+                    {
+                        pointHeight = clientRect.Height / ySteps;
+                        colorStepY = 1;
+                    }
+
+                    int x = xStart;
+                    int y = clientRect.Y;
+                    int r = 0, g = 0, b = 0;
+                    int rXInc = 0, gXInc = 0, bXInc = 0;
+                    int rYInc = 0, gYInc = 0, bYInc = 0;
+
+                    if (stripe == 0)
+                    {
+                        r = 255;
+                        g = 0;
+                        b = 0;
+                        gXInc = colorStepX;
+                    }
+                    else if (stripe == 1)
+                    {
+                        r = 255;
+                        g = 255;
+                        b = 0;
+                        rXInc = - colorStepX;
+                    }
+                    else if (stripe == 2)
+                    {
+                        r = 0;
+                        g = 255;
+                        b = 0;
+                        bXInc = colorStepX;
+                    }
+                    else if (stripe == 3)
+                    {
+                        r = 0;
+                        g = 255;
+                        b = 255;
+                        gXInc = -colorStepX;
+                    }
+                    else if (stripe == 4)
+                    {
+                        r = 0;
+                        g = 0;
+                        b = 255;
+                        rXInc = colorStepX;
+                    }
+                    else if (stripe == 5)
+                    {
+                        r = 255;
+                        g = 0;
+                        b = 255;
+                        bXInc = -colorStepX;
+                    }
+                    
+                    for (int i = 0; i < stripeWidth; i += pointWidth)
+                    {
+                        int ry = r, gy = g, by = b;
+                        rYInc = 127-r;
+                        gYInc = 127-g;
+                        bYInc = 127-b;
+
+                        for (int j = clientRect.Y; j < clientRect.Height; j += pointHeight)
+                        {
+                            using (SolidBrush brush = new SolidBrush(Color.FromArgb(ry, gy, by)))
+                                graph.FillRectangle(brush, new Rectangle(x, y, pointWidth, pointHeight));
+                            y += pointHeight;
+
+                            ry = r + (int)(rYInc * ((float)j / (float)clientRect.Height));
+                            gy = g + (int)(gYInc * ((float)j / (float)clientRect.Height));
+                            by = b + (int)(bYInc * ((float)j / (float)clientRect.Height));
+                        }
+
+                        x += pointWidth;
+                        y = clientRect.Y;
+                        r += rXInc;
+                        g += gXInc;
+                        b += bXInc;
+
+                    }
+                    xStart = x;
+                    if (stripe == 5)
+                        break;
+                }
+            }
+
+            if (m_ColorBlendBitmap != null)
+                m_ColorBlendBitmap.Dispose();
+            m_ColorBlendBitmap = bmp;
+        }
+
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            Graphics g = e.Graphics;
+
+            if (!this.BackColor.IsEmpty && this.BackColor != Color.Transparent)
+            {
+                using (SolidBrush brush = new SolidBrush(this.BackColor))
+                    g.FillRectangle(brush, -1, -1, this.Width + 1, this.Height + 1);
+            }
+
+            if (this.BackColor == Color.Transparent || this.BackgroundImage != null)
+            {
+                base.OnPaintBackground(e);
+            }
+
+            if (m_ColorBlendBitmap == null) return;
+
+            g.DrawImageUnscaled(m_ColorBlendBitmap, 0, 0);
+
+            if (m_SelectedPoint.X >= 0 && m_SelectedPoint.Y >= 0)
+            {
+                Color clr = Color.White;
+                using (SolidBrush brush = new SolidBrush(clr))
+                {
+                    Rectangle r = new Rectangle(m_SelectedPoint.X - 2, m_SelectedPoint.Y - 9, 3, 5);
+                    g.FillRectangle(brush, r);
+                    r.Offset(0, 10);
+                    g.FillRectangle(brush, r);
+                    r = new Rectangle(m_SelectedPoint.X - 8, m_SelectedPoint.Y - 3, 5, 3);
+                    g.FillRectangle(brush, r);
+                    r.Offset(10, 0);
+                    g.FillRectangle(brush, r);
+                }
+
+            }
+
+            base.OnPaint(e);
+        }
+
+        private void SetSelectedPoint(Point p)
+        {
+            Rectangle r = this.ClientRectangle;
+
+            if (m_ColorBlendBitmap != null)
+            {
+                r.Width = m_ColorBlendBitmap.Width;
+                r.Height = m_ColorBlendBitmap.Height;
+            }
+
+            if (p.X < 0)
+                p.X = 0;
+            if (p.Y < 0)
+                p.Y = 0;
+            if (p.X > r.Right)
+                p.X = r.Right - 1;
+            if (p.Y > r.Bottom)
+                p.Y = r.Bottom - 1;
+
+            if (p != m_SelectedPoint)
+            {
+                if (m_SelectedPoint.X >= 0 && m_SelectedPoint.Y >= 0)
+                {
+                    Rectangle inv = new Rectangle(m_SelectedPoint, Size.Empty);
+                    inv.Inflate(10, 10);
+                    this.Invalidate(inv);
+                }
+                m_SelectedPoint = p;
+                if (m_SelectedPoint.X >= 0 && m_SelectedPoint.Y >= 0)
+                {
+                    Rectangle inv = new Rectangle(m_SelectedPoint, Size.Empty);
+                    inv.Inflate(10, 10);
+                    this.Invalidate(inv);
+                }
+                OnSelectedColorChanged(EventArgs.Empty);
+            }
+        }
+
+        protected override void OnMouseDown(MouseEventArgs e)
+        {
+            base.OnMouseDown(e);
+            SetSelectedPoint(new Point(e.X, e.Y));
+        }
+
+        protected override void OnMouseMove(MouseEventArgs e)
+        {
+            base.OnMouseMove(e);
+            if (e.Button == MouseButtons.Left)
+            {
+            	int x = e.X;
+            	int y = e.Y;
+            	if(x<0)
+            		x = 0;
+            	if(x>=this.ClientRectangle.Width)
+            		x = this.ClientRectangle.Width - 1;
+				if(y<0)
+					y = 0;
+				if(y>=this.ClientRectangle.Height)
+					y = this.ClientRectangle.Height - 1;
+            	SetSelectedPoint(new Point(x, y));
+            }
+        }
+
+        protected override void OnResize(EventArgs e)
+        {
+            CreateBlendBitmap();
+            base.OnResize(e);
+        }
+
+        /// <summary>
+        /// Gets or sets the color selected by the control. Color that is assigned must be visible on the face of the control otherwise the SelectedColor will be set to Color.Empty
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public Color SelectedColor
+        {
+            get
+            {
+                if (m_SelectedPoint.X < 0 || m_SelectedPoint.Y < 0 || m_ColorBlendBitmap==null)
+                    return Color.Empty;
+                return m_ColorBlendBitmap.GetPixel(m_SelectedPoint.X, m_SelectedPoint.Y);
+            }
+            set
+            {
+                if (value.Equals(Color.Transparent) || value.IsEmpty)
+                {
+                    if (!m_SelectedPoint.IsEmpty)
+                    {
+                        m_SelectedPoint = new Point(-1, -1);
+                        this.Invalidate();
+                        OnSelectedColorChanged(EventArgs.Empty);
+                    }
+                }
+                else
+                {
+                    Point colorPoint = FindColorPoint(value);
+                    if (m_SelectedPoint != colorPoint)
+                    {
+                        m_SelectedPoint = colorPoint;
+                        this.Invalidate();
+                        OnSelectedColorChanged(EventArgs.Empty);
+                    }
+                }
+            }
+        }
+        private Point FindColorPoint(Color value)
+        {
+            if (m_ColorBlendBitmap == null || value.IsEmpty || value == Color.Transparent) return new Point(-1, -1);
+            for (int x = 0; x < m_ColorBlendBitmap.Width; x++)
+            {
+                for (int y = 0; y < m_ColorBlendBitmap.Height; y++)
+                {
+                    Color color = m_ColorBlendBitmap.GetPixel(x, y);
+                    if (Math.Abs(color.R-value.R)<=30 && Math.Abs(color.G-value.G)<=30 && Math.Abs(color.B-value.B)<=30)
+                        return new Point(x, y);
+                }
+            }
+            return new Point(-1, -1);
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/ColorPickers/CustomColorBlender.ico b/PROMS/DotNetBar Source Code/ColorPickers/CustomColorBlender.ico
new file mode 100644
index 00000000..849d5562
Binary files /dev/null and b/PROMS/DotNetBar Source Code/ColorPickers/CustomColorBlender.ico differ
diff --git a/PROMS/DotNetBar Source Code/ColorPickers/CustomColorDialog.cs b/PROMS/DotNetBar Source Code/ColorPickers/CustomColorDialog.cs
new file mode 100644
index 00000000..9ba808bb
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/ColorPickers/CustomColorDialog.cs	
@@ -0,0 +1,1079 @@
+using System;
+using System.Drawing;
+using System.Collections;
+using System.ComponentModel;
+using System.Windows.Forms;
+using System.Data;
+using DevComponents.DotNetBar.Controls;
+using DevComponents.Editors;
+using DevComponents.DotNetBar.ColorPickers;
+
+namespace DevComponents.DotNetBar.ColorPickerItem
+{
+    [ToolboxItem(false)]
+	internal class CustomColorDialog : DevComponents.DotNetBar.OfficeForm
+	{
+		#region Private Variables
+		internal ButtonX buttonOK;
+		internal ButtonX buttonCancel;
+		internal System.Windows.Forms.Label labelNewColor;
+		internal System.Windows.Forms.Label labelCurrentColor;
+		
+		private Color m_CurrentColor = Color.Black;
+		private Color m_NewColor = Color.Empty;
+		private ColorCombControl colorCombControl1;
+		internal System.Windows.Forms.Label labelStandardColors;
+		internal System.Windows.Forms.Label labelCustomColors;
+		internal System.Windows.Forms.Label labelGreen;
+		internal System.Windows.Forms.Label labelBlue;
+		private DevComponents.DotNetBar.TabControl tabControl2;
+		internal DevComponents.DotNetBar.TabItem tabItemStandard;
+		private DevComponents.DotNetBar.TabControlPanel tabControlPanel1;
+        internal DevComponents.DotNetBar.TabItem tabItemCustom;
+		private DevComponents.DotNetBar.TabControlPanel tabControlPanel2;
+		private CustomColorBlender customColorBlender3;
+		internal System.Windows.Forms.Label labelRed;
+		internal System.Windows.Forms.Label labelColorModel;
+        internal ComboBoxEx comboColorModel;
+#if FRAMEWORK20
+        private IntegerInput numericBlue;
+        private IntegerInput numericGreen;
+        private IntegerInput numericRed;
+#else
+        private System.Windows.Forms.NumericUpDown numericBlue;
+		private System.Windows.Forms.NumericUpDown numericGreen;
+		private System.Windows.Forms.NumericUpDown numericRed;
+#endif
+		private ColorContrastControl colorContrastControl1;
+		private ColorSelectionPreviewControl colorSelectionPreview;
+		private System.ComponentModel.IContainer components;
+		#endregion
+		
+		#region Constructor, Dispose
+		public CustomColorDialog()
+		{
+			//
+			// Required for Windows Form Designer support
+			//
+			InitializeComponent();
+
+			//
+			// TODO: Add any constructor code after InitializeComponent call
+			//
+		}
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		protected override void Dispose( bool disposing )
+		{
+			if( disposing )
+			{
+				if (components != null) 
+				{
+					components.Dispose();
+				}
+			}
+			base.Dispose( disposing );
+		}
+		#endregion
+
+		#region Windows Form 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.labelStandardColors = new System.Windows.Forms.Label();
+			this.colorCombControl1 = new ColorCombControl();
+			this.labelBlue = new System.Windows.Forms.Label();
+			this.labelGreen = new System.Windows.Forms.Label();
+#if (FRAMEWORK20)
+            this.numericBlue = new IntegerInput();
+            this.numericGreen = new IntegerInput();
+            this.numericRed = new IntegerInput();
+#else
+            this.numericBlue = new System.Windows.Forms.NumericUpDown();
+			this.numericGreen = new System.Windows.Forms.NumericUpDown();
+			this.numericRed = new System.Windows.Forms.NumericUpDown();
+#endif
+            this.labelCustomColors = new System.Windows.Forms.Label();
+			this.buttonOK = new ButtonX();
+			this.buttonCancel = new ButtonX();
+			this.labelNewColor = new System.Windows.Forms.Label();
+			this.labelCurrentColor = new System.Windows.Forms.Label();
+			this.tabControl2 = new DevComponents.DotNetBar.TabControl();
+			this.tabControlPanel1 = new DevComponents.DotNetBar.TabControlPanel();
+			this.tabItemStandard = new DevComponents.DotNetBar.TabItem(this.components);
+			this.tabControlPanel2 = new DevComponents.DotNetBar.TabControlPanel();
+			this.colorContrastControl1 = new ColorContrastControl();
+			this.customColorBlender3 = new CustomColorBlender();
+			this.comboColorModel = new ComboBoxEx();
+			this.labelRed = new System.Windows.Forms.Label();
+			this.labelColorModel = new System.Windows.Forms.Label();
+			this.tabItemCustom = new DevComponents.DotNetBar.TabItem(this.components);
+			this.colorSelectionPreview = new ColorSelectionPreviewControl();
+			((System.ComponentModel.ISupportInitialize)(this.numericBlue)).BeginInit();
+			((System.ComponentModel.ISupportInitialize)(this.numericGreen)).BeginInit();
+			((System.ComponentModel.ISupportInitialize)(this.numericRed)).BeginInit();
+			((System.ComponentModel.ISupportInitialize)(this.tabControl2)).BeginInit();
+			this.tabControl2.SuspendLayout();
+			this.tabControlPanel1.SuspendLayout();
+			this.tabControlPanel2.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// label3
+			// 
+			this.labelStandardColors.BackColor = System.Drawing.Color.Transparent;
+			this.labelStandardColors.Dock = System.Windows.Forms.DockStyle.Top;
+			this.labelStandardColors.Location = new System.Drawing.Point(1, 1);
+            this.labelStandardColors.Name = "labelStandardColors";
+			this.labelStandardColors.Size = new System.Drawing.Size(224, 19);
+			this.labelStandardColors.TabIndex = 1;
+			this.labelStandardColors.Text = " Colors:";
+			this.labelStandardColors.TextAlign = System.Drawing.ContentAlignment.BottomLeft;
+			// 
+			// colorCombControl1
+			// 
+			this.colorCombControl1.BackColor = System.Drawing.Color.Transparent;
+			this.colorCombControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.colorCombControl1.Location = new System.Drawing.Point(1, 20);
+			this.colorCombControl1.Name = "colorCombControl1";
+			this.colorCombControl1.Size = new System.Drawing.Size(224, 267);
+			this.colorCombControl1.TabIndex = 0;
+			this.colorCombControl1.SelectedColorChanged += new System.EventHandler(this.colorCombControl1_SelectedColorChanged);
+			// 
+			// label8
+			// 
+			this.labelBlue.BackColor = System.Drawing.Color.Transparent;
+			this.labelBlue.Location = new System.Drawing.Point(4, 256);
+            this.labelBlue.Name = "labelBlue";
+			this.labelBlue.Size = new System.Drawing.Size(90, 16);
+			this.labelBlue.TabIndex = 10;
+			this.labelBlue.Text = "&Blue:";
+			// 
+			// label7
+			// 
+			this.labelGreen.BackColor = System.Drawing.Color.Transparent;
+			this.labelGreen.Location = new System.Drawing.Point(4, 232);
+            this.labelGreen.Name = "labelGreen";
+			this.labelGreen.Size = new System.Drawing.Size(90, 16);
+			this.labelGreen.TabIndex = 8;
+			this.labelGreen.Text = "&Green:";
+			// 
+			// numericBlue
+			// 
+			this.numericBlue.Location = new System.Drawing.Point(98, 260);
+#if (FRAMEWORK20)
+            this.numericBlue.MaxValue = 255;
+            this.numericBlue.MinValue = 0;
+            this.numericBlue.ShowUpDown = true;
+            this.numericBlue.AllowEmptyState = false;
+#else
+            this.numericBlue.Maximum = new System.Decimal(new int[] {
+																		255,
+																		0,
+																		0,
+																		0});
+#endif
+            this.numericBlue.Name = "numericBlue";
+			this.numericBlue.Size = new System.Drawing.Size(47, 20);
+			this.numericBlue.TabIndex = 11;
+			this.numericBlue.ValueChanged += new System.EventHandler(this.numericRGBValueChanged);
+			// 
+			// numericGreen
+			// 
+			this.numericGreen.Location = new System.Drawing.Point(98, 236);
+#if (FRAMEWORK20)
+            this.numericGreen.MaxValue = 255;
+            this.numericGreen.MinValue = 0;
+            this.numericGreen.ShowUpDown = true;
+            this.numericGreen.AllowEmptyState = false;
+#else
+            this.numericGreen.Maximum = new System.Decimal(new int[] {
+																		255,
+																		0,
+																		0,
+																		0});
+#endif
+            this.numericGreen.Name = "numericGreen";
+			this.numericGreen.Size = new System.Drawing.Size(47, 20);
+			this.numericGreen.TabIndex = 9;
+			this.numericGreen.ValueChanged += new System.EventHandler(this.numericRGBValueChanged);
+			// 
+			// numericRed
+			// 
+			this.numericRed.Location = new System.Drawing.Point(98, 212);
+#if (FRAMEWORK20)
+            this.numericRed.MaxValue = 255;
+            this.numericRed.MinValue = 0;
+            this.numericRed.ShowUpDown = true;
+            this.numericRed.AllowEmptyState = false;
+#else
+            this.numericRed.Maximum = new System.Decimal(new int[] {
+																		255,
+																		0,
+																		0,
+																		0});
+#endif
+            this.numericRed.Name = "numericRed";
+			this.numericRed.Size = new System.Drawing.Size(47, 20);
+			this.numericRed.TabIndex = 7;
+			this.numericRed.ValueChanged += new System.EventHandler(this.numericRGBValueChanged);
+			// 
+			// label4
+			// 
+			this.labelCustomColors.BackColor = System.Drawing.Color.Transparent;
+			this.labelCustomColors.Dock = System.Windows.Forms.DockStyle.Top;
+			this.labelCustomColors.Location = new System.Drawing.Point(1, 1);
+            this.labelCustomColors.Name = "labelCustomColors";
+			this.labelCustomColors.Size = new System.Drawing.Size(224, 20);
+			this.labelCustomColors.TabIndex = 2;
+			this.labelCustomColors.Text = " Colors:";
+			this.labelCustomColors.TextAlign = System.Drawing.ContentAlignment.BottomLeft;
+			// 
+			// button1
+			// 
+			this.buttonOK.DialogResult = System.Windows.Forms.DialogResult.OK;
+			this.buttonOK.Location = new System.Drawing.Point(242, 6);
+            this.buttonOK.ColorTable = eButtonColor.OrangeWithBackground;
+            this.buttonOK.Name = "buttonOK";
+			this.buttonOK.Size = new System.Drawing.Size(74, 24);
+			this.buttonOK.TabIndex = 1;
+			this.buttonOK.Text = "OK";
+			// 
+			// button2
+			// 
+			this.buttonCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.buttonCancel.Location = new System.Drawing.Point(242, 36);
+            this.buttonCancel.ColorTable = eButtonColor.OrangeWithBackground;
+            this.buttonCancel.Name = "buttonCancel";
+			this.buttonCancel.Size = new System.Drawing.Size(74, 24);
+			this.buttonCancel.TabIndex = 2;
+			this.buttonCancel.Text = "Cancel";
+			// 
+			// label1
+			// 
+			this.labelNewColor.Location = new System.Drawing.Point(246, 232);
+            this.labelNewColor.Name = "labelNewColor";
+			this.labelNewColor.Size = new System.Drawing.Size(70, 12);
+			this.labelNewColor.TabIndex = 4;
+			this.labelNewColor.Text = "New";
+			this.labelNewColor.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+			// 
+			// label2
+			// 
+			this.labelCurrentColor.Location = new System.Drawing.Point(246, 306);
+            this.labelCurrentColor.Name = "labelCurrentColor";
+			this.labelCurrentColor.Size = new System.Drawing.Size(70, 16);
+			this.labelCurrentColor.TabIndex = 5;
+			this.labelCurrentColor.Text = "Current";
+			this.labelCurrentColor.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+			// 
+			// tabControl2
+			// 
+            this.tabControl2.BackColor = Color.Transparent;
+            this.tabControl2.CanReorderTabs = true;
+			this.tabControl2.ColorScheme.TabBackground = Color.Transparent;
+			this.tabControl2.Controls.Add(this.tabControlPanel2);
+			this.tabControl2.Controls.Add(this.tabControlPanel1);
+			this.tabControl2.FixedTabSize = new System.Drawing.Size(60, 0);
+			this.tabControl2.Location = new System.Drawing.Point(8, 8);
+			this.tabControl2.Name = "tabControl2";
+			this.tabControl2.SelectedTabFont = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold);
+			this.tabControl2.SelectedTabIndex = 0;
+			this.tabControl2.Size = new System.Drawing.Size(226, 314);
+			this.tabControl2.Style = DevComponents.DotNetBar.eTabStripStyle.VS2005;
+			this.tabControl2.TabIndex = 6;
+			this.tabControl2.TabLayoutType = DevComponents.DotNetBar.eTabLayoutType.FixedWithNavigationBox;
+			this.tabControl2.Tabs.Add(this.tabItemStandard);
+			this.tabControl2.Tabs.Add(this.tabItemCustom);
+			this.tabControl2.ThemeAware = true;
+			// 
+			// tabControlPanel1
+			// 
+			this.tabControlPanel1.Controls.Add(this.colorCombControl1);
+			this.tabControlPanel1.Controls.Add(this.labelStandardColors);
+			this.tabControlPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.tabControlPanel1.DockPadding.All = 1;
+			this.tabControlPanel1.Location = new System.Drawing.Point(0, 26);
+			this.tabControlPanel1.Name = "tabControlPanel1";
+			this.tabControlPanel1.Size = new System.Drawing.Size(226, 288);
+			this.tabControlPanel1.Style.BackColor1.Color = System.Drawing.SystemColors.Control;
+			this.tabControlPanel1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+			this.tabControlPanel1.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) 
+				| DevComponents.DotNetBar.eBorderSide.Bottom)));
+			this.tabControlPanel1.Style.GradientAngle = 90;
+			this.tabControlPanel1.TabIndex = 1;
+			this.tabControlPanel1.TabItem = this.tabItemStandard;
+			this.tabControlPanel1.ThemeAware = true;
+			// 
+			// tabItem1
+			// 
+			this.tabItemStandard.AttachedControl = this.tabControlPanel1;
+			this.tabItemStandard.CloseButtonBounds = new System.Drawing.Rectangle(0, 0, 0, 0);
+            this.tabItemStandard.Name = "tabItemStandard";
+			this.tabItemStandard.Text = "Standard";
+			// 
+			// tabControlPanel2
+			// 
+			this.tabControlPanel2.Controls.Add(this.colorContrastControl1);
+			this.tabControlPanel2.Controls.Add(this.numericGreen);
+			this.tabControlPanel2.Controls.Add(this.labelGreen);
+			this.tabControlPanel2.Controls.Add(this.numericRed);
+			this.tabControlPanel2.Controls.Add(this.customColorBlender3);
+			this.tabControlPanel2.Controls.Add(this.comboColorModel);
+			this.tabControlPanel2.Controls.Add(this.labelRed);
+			this.tabControlPanel2.Controls.Add(this.labelColorModel);
+			this.tabControlPanel2.Controls.Add(this.numericBlue);
+			this.tabControlPanel2.Controls.Add(this.labelBlue);
+			this.tabControlPanel2.Controls.Add(this.labelCustomColors);
+			this.tabControlPanel2.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.tabControlPanel2.DockPadding.All = 1;
+			this.tabControlPanel2.Location = new System.Drawing.Point(0, 26);
+			this.tabControlPanel2.Name = "tabControlPanel2";
+			this.tabControlPanel2.Size = new System.Drawing.Size(226, 288);
+			this.tabControlPanel2.Style.BackColor1.Color = System.Drawing.SystemColors.Control;
+			this.tabControlPanel2.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+			this.tabControlPanel2.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right) 
+				| DevComponents.DotNetBar.eBorderSide.Bottom)));
+			this.tabControlPanel2.Style.GradientAngle = 90;
+			this.tabControlPanel2.TabIndex = 2;
+			this.tabControlPanel2.TabItem = this.tabItemCustom;
+			this.tabControlPanel2.ThemeAware = true;
+			// 
+			// colorContrastControl1
+			// 
+			this.colorContrastControl1.BackColor = System.Drawing.Color.Transparent;
+			this.colorContrastControl1.Location = new System.Drawing.Point(188, 28);
+			this.colorContrastControl1.Name = "colorContrastControl1";
+			this.colorContrastControl1.SelectedColor = System.Drawing.Color.FromArgb(((System.Byte)(255)), ((System.Byte)(255)), ((System.Byte)(255)));
+			this.colorContrastControl1.Size = new System.Drawing.Size(32, 152);
+			this.colorContrastControl1.TabIndex = 12;
+			this.colorContrastControl1.SelectedColorChanged += new System.EventHandler(this.colorContrastControl1_SelectedColorChanged);
+			// 
+			// customColorBlender3
+			// 
+			this.customColorBlender3.Location = new System.Drawing.Point(8, 28);
+			this.customColorBlender3.Name = "customColorBlender3";
+			this.customColorBlender3.Size = new System.Drawing.Size(174, 152);
+			this.customColorBlender3.TabIndex = 3;
+			this.customColorBlender3.SelectedColorChanged += new System.EventHandler(this.customColorBlender3_SelectedColorChanged);
+			// 
+			// comboColorModel
+			// 
+            this.comboColorModel.DrawMode = DrawMode.OwnerDrawFixed;
+			this.comboColorModel.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+			this.comboColorModel.Items.AddRange(new object[] {
+																 "RGB"});
+			this.comboColorModel.Location = new System.Drawing.Point(98, 188);
+			this.comboColorModel.Name = "comboColorModel";
+			this.comboColorModel.Size = new System.Drawing.Size(89, 21);
+			this.comboColorModel.TabIndex = 5;
+			// 
+			// label9
+			// 
+			this.labelRed.BackColor = System.Drawing.Color.Transparent;
+			this.labelRed.Location = new System.Drawing.Point(4, 212);
+            this.labelRed.Name = "labelRed";
+			this.labelRed.Size = new System.Drawing.Size(90, 16);
+			this.labelRed.TabIndex = 6;
+			this.labelRed.Text = "&Red:";
+			// 
+			// label10
+			// 
+			this.labelColorModel.BackColor = System.Drawing.Color.Transparent;
+			this.labelColorModel.Location = new System.Drawing.Point(4, 192);
+            this.labelColorModel.Name = "labelColorModel";
+			this.labelColorModel.Size = new System.Drawing.Size(90, 16);
+			this.labelColorModel.TabIndex = 4;
+			this.labelColorModel.Text = "Color Mo&del:";
+			// 
+			// tabItem2
+			// 
+			this.tabItemCustom.AttachedControl = this.tabControlPanel2;
+			this.tabItemCustom.CloseButtonBounds = new System.Drawing.Rectangle(0, 0, 0, 0);
+            this.tabItemCustom.Name = "tabItemCustom";
+			this.tabItemCustom.Text = "Custom";
+			// 
+			// colorSelectionPreview
+			// 
+			this.colorSelectionPreview.CurrentColor = System.Drawing.Color.Black;
+			this.colorSelectionPreview.Location = new System.Drawing.Point(252, 252);
+			this.colorSelectionPreview.Name = "colorSelectionPreview";
+			this.colorSelectionPreview.NewColor = System.Drawing.Color.Empty;
+			this.colorSelectionPreview.Size = new System.Drawing.Size(56, 48);
+			this.colorSelectionPreview.TabIndex = 7;
+			// 
+			// CustomColorDialog
+			// 
+			this.AcceptButton = this.buttonOK;
+			this.AutoScaleBaseSize = new System.Drawing.Size(5, 13);
+			this.CancelButton = this.buttonCancel;
+			this.ClientSize = new System.Drawing.Size(324, 326);
+			this.Controls.Add(this.colorSelectionPreview);
+			this.Controls.Add(this.tabControl2);
+			this.Controls.Add(this.labelCurrentColor);
+			this.Controls.Add(this.labelNewColor);
+			this.Controls.Add(this.buttonCancel);
+			this.Controls.Add(this.buttonOK);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.Name = "CustomColorDialog";
+			this.ShowInTaskbar = false;
+			this.Text = "Colors";
+			this.Load += new System.EventHandler(this.Form1_Load);
+			((System.ComponentModel.ISupportInitialize)(this.numericBlue)).EndInit();
+			((System.ComponentModel.ISupportInitialize)(this.numericGreen)).EndInit();
+			((System.ComponentModel.ISupportInitialize)(this.numericRed)).EndInit();
+			((System.ComponentModel.ISupportInitialize)(this.tabControl2)).EndInit();
+			this.tabControl2.ResumeLayout(false);
+			this.tabControlPanel1.ResumeLayout(false);
+			this.tabControlPanel2.ResumeLayout(false);
+			this.ResumeLayout(false);
+
+		}
+
+		#endregion
+
+		#region Internal Implementation
+        protected override void OnLoad(EventArgs e)
+        {
+            base.OnLoad(e);
+            Size fixedSize = tabControl2.FixedTabSize;
+            using (Graphics g = this.CreateGraphics())
+            {
+                System.Drawing.Size s = TextDrawing.MeasureString(g, tabItemCustom.Text, this.Font);
+                System.Drawing.Size s1 = TextDrawing.MeasureString(g, tabItemStandard.Text, this.Font);
+                fixedSize.Width = Math.Max(fixedSize.Width, s.Width + 5);
+                fixedSize.Width = Math.Max(fixedSize.Width, s1.Width + 5);
+            }
+            tabControl2.FixedTabSize = fixedSize;
+            if (fixedSize.Width > tabControl2.Width / 2)
+            {
+                tabControl2.FixedTabSize = Size.Empty;
+            }
+        }
+        internal void SetStyle(eDotNetBarStyle style)
+        {
+            if (BarFunctions.IsOffice2007Style(style))
+            {
+                this.EnableCustomStyle = true;
+                tabControl2.Style = eTabStripStyle.Office2007Dock;
+            }
+            else
+            {
+                this.EnableCustomStyle = false;
+                this.tabControl2.Style = DevComponents.DotNetBar.eTabStripStyle.VS2005;
+            }
+
+            buttonCancel.Style = style;
+            buttonOK.Style = style;
+
+            tabControl2.BackColor = Color.Transparent;
+            tabControl2.ColorScheme.TabBackground = Color.Transparent;
+            tabControl2.ColorScheme.TabBackground2 = Color.Empty;
+        }
+		private void colorCombControl1_SelectedColorChanged(object sender, System.EventArgs e)
+		{
+			SetNewColor(colorCombControl1.SelectedColor);
+			colorContrastControl1.SelectedColor = colorCombControl1.SelectedColor;
+		}
+
+		private void customColorBlender3_SelectedColorChanged(object sender, System.EventArgs e)
+		{
+            colorContrastControl1.SelectedColor = customColorBlender3.SelectedColor;
+            SetNewColor(colorContrastControl1.SelectedColor);
+		}
+		
+		private bool m_SettingColor = false;
+		private void SetNewColor(Color color)
+		{
+			if(m_SettingColor) return;
+			m_SettingColor = true;
+			try
+			{
+				m_NewColor = color;
+				colorSelectionPreview.NewColor = color;
+			
+				numericRed.Value = m_NewColor.R;
+				numericGreen.Value = m_NewColor.G;
+				numericBlue.Value = m_NewColor.B;
+			}
+			finally
+			{
+				m_SettingColor = false;
+			}
+		}
+
+		private void Form1_Load(object sender, System.EventArgs e)
+		{
+			comboColorModel.SelectedIndex = 0;
+		}
+
+		private void numericRGBValueChanged(object sender, System.EventArgs e)
+		{
+			SetNewColor(Color.FromArgb((int)numericRed.Value, (int)numericGreen.Value, (int)numericBlue.Value));
+		}
+
+		private void colorContrastControl1_SelectedColorChanged(object sender, System.EventArgs e)
+		{
+			SetNewColor(colorContrastControl1.SelectedColor);
+		}
+
+		public Color CurrentColor
+		{
+			get { return m_CurrentColor;}
+			set
+			{
+				m_CurrentColor = value;
+				colorSelectionPreview.CurrentColor = value;
+                customColorBlender3.SelectedColor = m_CurrentColor;
+                colorContrastControl1.SelectedColor = m_CurrentColor;
+                if (!value.IsEmpty)
+                {
+                    numericRed.Value = value.R;
+                    numericBlue.Value = value.B;
+                    numericGreen.Value = value.G;
+                }
+			}
+		}
+		
+		public Color NewColor
+		{
+			get { return m_NewColor;}
+		}
+		#endregion
+	}
+
+    [ToolboxItem(false)]
+    internal class CustomColorDialogMetro : DevComponents.DotNetBar.Metro.MetroForm
+    {
+        #region Private Variables
+        internal ButtonX buttonOK;
+        internal ButtonX buttonCancel;
+        internal System.Windows.Forms.Label labelNewColor;
+        internal System.Windows.Forms.Label labelCurrentColor;
+
+        private Color m_CurrentColor = Color.Black;
+        private Color m_NewColor = Color.Empty;
+        private ColorCombControl colorCombControl1;
+        internal System.Windows.Forms.Label labelStandardColors;
+        internal System.Windows.Forms.Label labelCustomColors;
+        internal System.Windows.Forms.Label labelGreen;
+        internal System.Windows.Forms.Label labelBlue;
+        private DevComponents.DotNetBar.TabControl tabControl2;
+        internal DevComponents.DotNetBar.TabItem tabItemStandard;
+        private DevComponents.DotNetBar.TabControlPanel tabControlPanel1;
+        internal DevComponents.DotNetBar.TabItem tabItemCustom;
+        private DevComponents.DotNetBar.TabControlPanel tabControlPanel2;
+        private CustomColorBlender customColorBlender3;
+        internal System.Windows.Forms.Label labelRed;
+        internal System.Windows.Forms.Label labelColorModel;
+        internal ComboBoxEx comboColorModel;
+#if FRAMEWORK20
+        private IntegerInput numericBlue;
+        private IntegerInput numericGreen;
+        private IntegerInput numericRed;
+#else
+        private System.Windows.Forms.NumericUpDown numericBlue;
+		private System.Windows.Forms.NumericUpDown numericGreen;
+		private System.Windows.Forms.NumericUpDown numericRed;
+#endif
+        private ColorContrastControl colorContrastControl1;
+        private ColorSelectionPreviewControl colorSelectionPreview;
+        private System.ComponentModel.IContainer components;
+        #endregion
+
+        #region Constructor, Dispose
+        public CustomColorDialogMetro()
+        {
+            //
+            // Required for Windows Form Designer support
+            //
+            InitializeComponent();
+
+            //
+            // TODO: Add any constructor code after InitializeComponent call
+            //
+        }
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                if (components != null)
+                {
+                    components.Dispose();
+                }
+            }
+            base.Dispose(disposing);
+        }
+        #endregion
+
+        #region Windows Form 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.labelStandardColors = new System.Windows.Forms.Label();
+            this.colorCombControl1 = new ColorCombControl();
+            this.labelBlue = new System.Windows.Forms.Label();
+            this.labelGreen = new System.Windows.Forms.Label();
+#if (FRAMEWORK20)
+            this.numericBlue = new IntegerInput();
+            this.numericGreen = new IntegerInput();
+            this.numericRed = new IntegerInput();
+#else
+            this.numericBlue = new System.Windows.Forms.NumericUpDown();
+			this.numericGreen = new System.Windows.Forms.NumericUpDown();
+			this.numericRed = new System.Windows.Forms.NumericUpDown();
+#endif
+            this.labelCustomColors = new System.Windows.Forms.Label();
+            this.buttonOK = new ButtonX();
+            this.buttonCancel = new ButtonX();
+            this.labelNewColor = new System.Windows.Forms.Label();
+            this.labelCurrentColor = new System.Windows.Forms.Label();
+            this.tabControl2 = new DevComponents.DotNetBar.TabControl();
+            this.tabControlPanel1 = new DevComponents.DotNetBar.TabControlPanel();
+            this.tabItemStandard = new DevComponents.DotNetBar.TabItem(this.components);
+            this.tabControlPanel2 = new DevComponents.DotNetBar.TabControlPanel();
+            this.colorContrastControl1 = new ColorContrastControl();
+            this.customColorBlender3 = new CustomColorBlender();
+            this.comboColorModel = new ComboBoxEx();
+            this.labelRed = new System.Windows.Forms.Label();
+            this.labelColorModel = new System.Windows.Forms.Label();
+            this.tabItemCustom = new DevComponents.DotNetBar.TabItem(this.components);
+            this.colorSelectionPreview = new ColorSelectionPreviewControl();
+            ((System.ComponentModel.ISupportInitialize)(this.numericBlue)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericGreen)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericRed)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.tabControl2)).BeginInit();
+            this.tabControl2.SuspendLayout();
+            this.tabControlPanel1.SuspendLayout();
+            this.tabControlPanel2.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // label3
+            // 
+            this.labelStandardColors.BackColor = System.Drawing.Color.Transparent;
+            this.labelStandardColors.Dock = System.Windows.Forms.DockStyle.Top;
+            this.labelStandardColors.Location = new System.Drawing.Point(1, 1);
+            this.labelStandardColors.Name = "labelStandardColors";
+            this.labelStandardColors.Size = new System.Drawing.Size(224, 19);
+            this.labelStandardColors.TabIndex = 1;
+            this.labelStandardColors.Text = " Colors:";
+            this.labelStandardColors.TextAlign = System.Drawing.ContentAlignment.BottomLeft;
+            // 
+            // colorCombControl1
+            // 
+            this.colorCombControl1.BackColor = System.Drawing.Color.Transparent;
+            this.colorCombControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.colorCombControl1.Location = new System.Drawing.Point(1, 20);
+            this.colorCombControl1.Name = "colorCombControl1";
+            this.colorCombControl1.Size = new System.Drawing.Size(224, 267);
+            this.colorCombControl1.TabIndex = 0;
+            this.colorCombControl1.SelectedColorChanged += new System.EventHandler(this.colorCombControl1_SelectedColorChanged);
+            // 
+            // label8
+            // 
+            this.labelBlue.BackColor = System.Drawing.Color.Transparent;
+            this.labelBlue.Location = new System.Drawing.Point(4, 256);
+            this.labelBlue.Name = "labelBlue";
+            this.labelBlue.Size = new System.Drawing.Size(90, 16);
+            this.labelBlue.TabIndex = 10;
+            this.labelBlue.Text = "&Blue:";
+            // 
+            // label7
+            // 
+            this.labelGreen.BackColor = System.Drawing.Color.Transparent;
+            this.labelGreen.Location = new System.Drawing.Point(4, 232);
+            this.labelGreen.Name = "labelGreen";
+            this.labelGreen.Size = new System.Drawing.Size(90, 16);
+            this.labelGreen.TabIndex = 8;
+            this.labelGreen.Text = "&Green:";
+            // 
+            // numericBlue
+            // 
+            this.numericBlue.Location = new System.Drawing.Point(98, 260);
+#if (FRAMEWORK20)
+            this.numericBlue.MaxValue = 255;
+            this.numericBlue.MinValue = 0;
+            this.numericBlue.ShowUpDown = true;
+            this.numericBlue.AllowEmptyState = false;
+#else
+            this.numericBlue.Maximum = new System.Decimal(new int[] {
+																		255,
+																		0,
+																		0,
+																		0});
+#endif
+            this.numericBlue.Name = "numericBlue";
+            this.numericBlue.Size = new System.Drawing.Size(47, 20);
+            this.numericBlue.TabIndex = 11;
+            this.numericBlue.ValueChanged += new System.EventHandler(this.numericRGBValueChanged);
+            // 
+            // numericGreen
+            // 
+            this.numericGreen.Location = new System.Drawing.Point(98, 236);
+#if (FRAMEWORK20)
+            this.numericGreen.MaxValue = 255;
+            this.numericGreen.MinValue = 0;
+            this.numericGreen.ShowUpDown = true;
+            this.numericGreen.AllowEmptyState = false;
+#else
+            this.numericGreen.Maximum = new System.Decimal(new int[] {
+																		255,
+																		0,
+																		0,
+																		0});
+#endif
+            this.numericGreen.Name = "numericGreen";
+            this.numericGreen.Size = new System.Drawing.Size(47, 20);
+            this.numericGreen.TabIndex = 9;
+            this.numericGreen.ValueChanged += new System.EventHandler(this.numericRGBValueChanged);
+            // 
+            // numericRed
+            // 
+            this.numericRed.Location = new System.Drawing.Point(98, 212);
+#if (FRAMEWORK20)
+            this.numericRed.MaxValue = 255;
+            this.numericRed.MinValue = 0;
+            this.numericRed.ShowUpDown = true;
+            this.numericRed.AllowEmptyState = false;
+#else
+            this.numericRed.Maximum = new System.Decimal(new int[] {
+																		255,
+																		0,
+																		0,
+																		0});
+#endif
+            this.numericRed.Name = "numericRed";
+            this.numericRed.Size = new System.Drawing.Size(47, 20);
+            this.numericRed.TabIndex = 7;
+            this.numericRed.ValueChanged += new System.EventHandler(this.numericRGBValueChanged);
+            // 
+            // label4
+            // 
+            this.labelCustomColors.BackColor = System.Drawing.Color.Transparent;
+            this.labelCustomColors.Dock = System.Windows.Forms.DockStyle.Top;
+            this.labelCustomColors.Location = new System.Drawing.Point(1, 1);
+            this.labelCustomColors.Name = "labelCustomColors";
+            this.labelCustomColors.Size = new System.Drawing.Size(224, 20);
+            this.labelCustomColors.TabIndex = 2;
+            this.labelCustomColors.Text = " Colors:";
+            this.labelCustomColors.TextAlign = System.Drawing.ContentAlignment.BottomLeft;
+            // 
+            // button1
+            // 
+            this.buttonOK.DialogResult = System.Windows.Forms.DialogResult.OK;
+            this.buttonOK.Location = new System.Drawing.Point(242, 6);
+            this.buttonOK.ColorTable = eButtonColor.OrangeWithBackground;
+            this.buttonOK.Name = "buttonOK";
+            this.buttonOK.Size = new System.Drawing.Size(74, 24);
+            this.buttonOK.TabIndex = 1;
+            this.buttonOK.Text = "OK";
+            // 
+            // button2
+            // 
+            this.buttonCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+            this.buttonCancel.Location = new System.Drawing.Point(242, 36);
+            this.buttonCancel.ColorTable = eButtonColor.OrangeWithBackground;
+            this.buttonCancel.Name = "buttonCancel";
+            this.buttonCancel.Size = new System.Drawing.Size(74, 24);
+            this.buttonCancel.TabIndex = 2;
+            this.buttonCancel.Text = "Cancel";
+            // 
+            // label1
+            // 
+            this.labelNewColor.Location = new System.Drawing.Point(256, 232);
+            this.labelNewColor.Name = "labelNewColor";
+            this.labelNewColor.Size = new System.Drawing.Size(44, 12);
+            this.labelNewColor.TabIndex = 4;
+            this.labelNewColor.Text = "New";
+            this.labelNewColor.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // label2
+            // 
+            this.labelCurrentColor.Location = new System.Drawing.Point(256, 306);
+            this.labelCurrentColor.Name = "labelCurrentColor";
+            this.labelCurrentColor.Size = new System.Drawing.Size(44, 16);
+            this.labelCurrentColor.TabIndex = 5;
+            this.labelCurrentColor.Text = "Current";
+            this.labelCurrentColor.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // tabControl2
+            // 
+            this.tabControl2.BackColor = Color.White;
+            this.tabControl2.ForeColor = System.Drawing.Color.Black;
+            this.tabControl2.CanReorderTabs = false;
+            this.tabControl2.Controls.Add(this.tabControlPanel2);
+            this.tabControl2.Controls.Add(this.tabControlPanel1);
+            this.tabControl2.FixedTabSize = new System.Drawing.Size(60, 0);
+            this.tabControl2.Location = new System.Drawing.Point(8, 8);
+            this.tabControl2.Name = "tabControl2";
+            this.tabControl2.SelectedTabFont = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold);
+            this.tabControl2.SelectedTabIndex = 0;
+            this.tabControl2.Size = new System.Drawing.Size(226, 314);
+            this.tabControl2.Style = DevComponents.DotNetBar.eTabStripStyle.Metro;
+            this.tabControl2.TabIndex = 6;
+            this.tabControl2.TabLayoutType = DevComponents.DotNetBar.eTabLayoutType.FixedWithNavigationBox;
+            this.tabControl2.Tabs.Add(this.tabItemStandard);
+            this.tabControl2.Tabs.Add(this.tabItemCustom);
+            this.tabControl2.ThemeAware = true;
+            // 
+            // tabControlPanel1
+            // 
+            this.tabControlPanel1.Controls.Add(this.colorCombControl1);
+            this.tabControlPanel1.Controls.Add(this.labelStandardColors);
+            this.tabControlPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tabControlPanel1.DockPadding.All = 1;
+            this.tabControlPanel1.Location = new System.Drawing.Point(0, 26);
+            this.tabControlPanel1.Name = "tabControlPanel1";
+            this.tabControlPanel1.Size = new System.Drawing.Size(226, 288);
+            this.tabControlPanel1.Style.BackColor1.Color = System.Drawing.Color.White;
+            this.tabControlPanel1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+            this.tabControlPanel1.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right)
+                | DevComponents.DotNetBar.eBorderSide.Bottom)));
+            this.tabControlPanel1.Style.GradientAngle = 90;
+            this.tabControlPanel1.TabIndex = 1;
+            this.tabControlPanel1.TabItem = this.tabItemStandard;
+            this.tabControlPanel1.ThemeAware = false;
+            // 
+            // tabItem1
+            // 
+            this.tabItemStandard.AttachedControl = this.tabControlPanel1;
+            this.tabItemStandard.CloseButtonBounds = new System.Drawing.Rectangle(0, 0, 0, 0);
+            this.tabItemStandard.Name = "tabItemStandard";
+            this.tabItemStandard.Text = "Standard";
+            // 
+            // tabControlPanel2
+            // 
+            this.tabControlPanel2.Controls.Add(this.colorContrastControl1);
+            this.tabControlPanel2.Controls.Add(this.numericGreen);
+            this.tabControlPanel2.Controls.Add(this.labelGreen);
+            this.tabControlPanel2.Controls.Add(this.numericRed);
+            this.tabControlPanel2.Controls.Add(this.customColorBlender3);
+            this.tabControlPanel2.Controls.Add(this.comboColorModel);
+            this.tabControlPanel2.Controls.Add(this.labelRed);
+            this.tabControlPanel2.Controls.Add(this.labelColorModel);
+            this.tabControlPanel2.Controls.Add(this.numericBlue);
+            this.tabControlPanel2.Controls.Add(this.labelBlue);
+            this.tabControlPanel2.Controls.Add(this.labelCustomColors);
+            this.tabControlPanel2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tabControlPanel2.DockPadding.All = 1;
+            this.tabControlPanel2.Location = new System.Drawing.Point(0, 26);
+            this.tabControlPanel2.Name = "tabControlPanel2";
+            this.tabControlPanel2.Size = new System.Drawing.Size(226, 288);
+            this.tabControlPanel2.Style.BackColor1.Color = System.Drawing.Color.White;
+            this.tabControlPanel2.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+            this.tabControlPanel2.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right)
+                | DevComponents.DotNetBar.eBorderSide.Bottom)));
+            this.tabControlPanel2.Style.GradientAngle = 90;
+            this.tabControlPanel2.TabIndex = 2;
+            this.tabControlPanel2.TabItem = this.tabItemCustom;
+            this.tabControlPanel2.ThemeAware = true;
+            // 
+            // colorContrastControl1
+            // 
+            this.colorContrastControl1.BackColor = System.Drawing.Color.Transparent;
+            this.colorContrastControl1.Location = new System.Drawing.Point(188, 28);
+            this.colorContrastControl1.Name = "colorContrastControl1";
+            this.colorContrastControl1.SelectedColor = System.Drawing.Color.FromArgb(((System.Byte)(255)), ((System.Byte)(255)), ((System.Byte)(255)));
+            this.colorContrastControl1.Size = new System.Drawing.Size(32, 152);
+            this.colorContrastControl1.TabIndex = 12;
+            this.colorContrastControl1.SelectedColorChanged += new System.EventHandler(this.colorContrastControl1_SelectedColorChanged);
+            // 
+            // customColorBlender3
+            // 
+            this.customColorBlender3.Location = new System.Drawing.Point(8, 28);
+            this.customColorBlender3.Name = "customColorBlender3";
+            this.customColorBlender3.Size = new System.Drawing.Size(174, 152);
+            this.customColorBlender3.TabIndex = 3;
+            this.customColorBlender3.SelectedColorChanged += new System.EventHandler(this.customColorBlender3_SelectedColorChanged);
+            // 
+            // comboColorModel
+            // 
+            this.comboColorModel.DrawMode = DrawMode.OwnerDrawFixed;
+            this.comboColorModel.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboColorModel.Items.AddRange(new object[] {
+																 "RGB"});
+            this.comboColorModel.Location = new System.Drawing.Point(98, 188);
+            this.comboColorModel.Name = "comboColorModel";
+            this.comboColorModel.Size = new System.Drawing.Size(89, 21);
+            this.comboColorModel.TabIndex = 5;
+            // 
+            // label9
+            // 
+            this.labelRed.BackColor = System.Drawing.Color.Transparent;
+            this.labelRed.Location = new System.Drawing.Point(4, 212);
+            this.labelRed.Name = "labelRed";
+            this.labelRed.Size = new System.Drawing.Size(90, 16);
+            this.labelRed.TabIndex = 6;
+            this.labelRed.Text = "&Red:";
+            // 
+            // label10
+            // 
+            this.labelColorModel.BackColor = System.Drawing.Color.Transparent;
+            this.labelColorModel.Location = new System.Drawing.Point(4, 192);
+            this.labelColorModel.Name = "labelColorModel";
+            this.labelColorModel.Size = new System.Drawing.Size(90, 16);
+            this.labelColorModel.TabIndex = 4;
+            this.labelColorModel.Text = "Color Mo&del:";
+            // 
+            // tabItem2
+            // 
+            this.tabItemCustom.AttachedControl = this.tabControlPanel2;
+            this.tabItemCustom.CloseButtonBounds = new System.Drawing.Rectangle(0, 0, 0, 0);
+            this.tabItemCustom.Name = "tabItemCustom";
+            this.tabItemCustom.Text = "Custom";
+            // 
+            // colorSelectionPreview
+            // 
+            this.colorSelectionPreview.CurrentColor = System.Drawing.Color.Black;
+            this.colorSelectionPreview.Location = new System.Drawing.Point(252, 252);
+            this.colorSelectionPreview.Name = "colorSelectionPreview";
+            this.colorSelectionPreview.NewColor = System.Drawing.Color.Empty;
+            this.colorSelectionPreview.Size = new System.Drawing.Size(56, 48);
+            this.colorSelectionPreview.TabIndex = 7;
+            // 
+            // CustomColorDialog
+            // 
+            this.AcceptButton = this.buttonOK;
+            this.AutoScaleBaseSize = new System.Drawing.Size(5, 13);
+            this.CancelButton = this.buttonCancel;
+            this.ClientSize = new System.Drawing.Size(324, 326);
+            this.Controls.Add(this.colorSelectionPreview);
+            this.Controls.Add(this.tabControl2);
+            this.Controls.Add(this.labelCurrentColor);
+            this.Controls.Add(this.labelNewColor);
+            this.Controls.Add(this.buttonCancel);
+            this.Controls.Add(this.buttonOK);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.Name = "CustomColorDialog";
+            this.ShowInTaskbar = false;
+            this.Text = "Colors";
+            this.Load += new System.EventHandler(this.Form1_Load);
+            ((System.ComponentModel.ISupportInitialize)(this.numericBlue)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericGreen)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericRed)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.tabControl2)).EndInit();
+            this.tabControl2.ResumeLayout(false);
+            this.tabControlPanel1.ResumeLayout(false);
+            this.tabControlPanel2.ResumeLayout(false);
+            this.ResumeLayout(false);
+
+        }
+        #endregion
+
+        #region Internal Implementation
+        protected override void OnLoad(EventArgs e)
+        {
+            base.OnLoad(e);
+            Size fixedSize = tabControl2.FixedTabSize;
+            using (Graphics g = this.CreateGraphics())
+            {
+                System.Drawing.Size s = TextDrawing.MeasureString(g, tabItemCustom.Text, this.Font);
+                System.Drawing.Size s1 = TextDrawing.MeasureString(g, tabItemStandard.Text, this.Font);
+                fixedSize.Width = Math.Max(fixedSize.Width, s.Width + 5);
+                fixedSize.Width = Math.Max(fixedSize.Width, s1.Width + 5);
+            }
+            tabControl2.FixedTabSize = fixedSize;
+            if (fixedSize.Width > tabControl2.Width / 2)
+            {
+                tabControl2.FixedTabSize = Size.Empty;
+            }
+        }
+        internal void SetStyle(eDotNetBarStyle style)
+        {
+            buttonCancel.Style = style;
+            buttonOK.Style = style;
+
+            //tabControl2.BackColor = Color.Transparent;
+            //tabControl2.ColorScheme.TabBackground = Color.Transparent;
+            //tabControl2.ColorScheme.TabBackground2 = Color.Empty;
+        }
+        private void colorCombControl1_SelectedColorChanged(object sender, System.EventArgs e)
+        {
+            SetNewColor(colorCombControl1.SelectedColor);
+            colorContrastControl1.SelectedColor = colorCombControl1.SelectedColor;
+        }
+
+        private void customColorBlender3_SelectedColorChanged(object sender, System.EventArgs e)
+        {
+            colorContrastControl1.SelectedColor = customColorBlender3.SelectedColor;
+            SetNewColor(colorContrastControl1.SelectedColor);
+        }
+
+        private bool m_SettingColor = false;
+        private void SetNewColor(Color color)
+        {
+            if (m_SettingColor) return;
+            m_SettingColor = true;
+            try
+            {
+                m_NewColor = color;
+                colorSelectionPreview.NewColor = color;
+
+                numericRed.Value = m_NewColor.R;
+                numericGreen.Value = m_NewColor.G;
+                numericBlue.Value = m_NewColor.B;
+            }
+            finally
+            {
+                m_SettingColor = false;
+            }
+        }
+
+        private void Form1_Load(object sender, System.EventArgs e)
+        {
+            comboColorModel.SelectedIndex = 0;
+        }
+
+        private void numericRGBValueChanged(object sender, System.EventArgs e)
+        {
+            SetNewColor(Color.FromArgb((int)numericRed.Value, (int)numericGreen.Value, (int)numericBlue.Value));
+        }
+
+        private void colorContrastControl1_SelectedColorChanged(object sender, System.EventArgs e)
+        {
+            SetNewColor(colorContrastControl1.SelectedColor);
+        }
+
+        public Color CurrentColor
+        {
+            get { return m_CurrentColor; }
+            set
+            {
+                m_CurrentColor = value;
+                colorSelectionPreview.CurrentColor = value;
+                customColorBlender3.SelectedColor = value;
+                colorContrastControl1.SelectedColor = value;
+                if (!value.IsEmpty)
+                {
+                    numericRed.Value = value.R;
+                    numericBlue.Value = value.B;
+                    numericGreen.Value = value.G;
+                }
+
+            }
+        }
+
+        public Color NewColor
+        {
+            get { return m_NewColor; }
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/ColorScheme.cs b/PROMS/DotNetBar Source Code/ColorScheme.cs
new file mode 100644
index 00000000..f59b1b5b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/ColorScheme.cs	
@@ -0,0 +1,4764 @@
+using System;
+using System.Drawing;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Represents the Color scheme used by items on the Bar.
+	/// </summary>
+	public class ColorScheme
+	{
+		#region Private Variables
+		private Color m_MenuBarBackground;
+		private bool m_MenuBarBackgroundCustom=false;
+
+		private Color m_MenuBarBackground2=Color.Empty;
+		private bool m_MenuBarBackground2Custom=false;
+
+		private int m_MenuBarBackgroundGradientAngle=90;
+
+		private Color m_BarBackground;
+		private bool m_BarBackgroundCustom=false;
+
+		private Color m_BarBackground2=Color.Empty;
+		private bool m_BarBackground2Custom=false;
+
+		private int m_BarBackgroundGradientAngle=90;
+
+		private Color m_BarCaptionBackground;
+		private bool m_BarCaptionBackgroundCustom=false;
+
+		private Color m_BarCaptionBackground2=Color.Empty;
+		private bool m_BarCaptionBackground2Custom=false;
+
+		private int m_BarCaptionBackgroundGradientAngle=90;
+
+		private Color m_BarCaptionText;
+		private bool m_BarCaptionTextCustom=false;
+
+		private Color m_BarCaptionInactiveBackground;
+		private bool m_BarCaptionInactiveBackgroundCustom=false;
+
+		private Color m_BarCaptionInactiveBackground2=Color.Empty;
+		private bool m_BarCaptionInactiveBackground2Custom=false;
+
+		private int m_BarCaptionInactiveBackgroundGAngle=90;
+
+		private Color m_BarCaptionInactiveText;
+		private bool m_BarCaptionInactiveTextCustom=false;
+
+		private Color m_BarPopupBackground;
+		private bool m_BarPopupBackgroundCustom=false;
+
+		private Color m_BarPopupBorder;
+		private bool m_BarPopupBorderCustom=false;
+
+		private Color m_BarDockedBorder;
+		private bool m_BarDockedBorderCustom=false;
+
+		private Color m_BarStripeColor;
+		private bool m_BarStripeColorCustom=false;
+
+		private Color m_BarFloatingBorder;
+		private bool m_BarFloatingBorderCustom=false;
+
+		private Color m_ItemBackground;
+		private bool m_ItemBackgroundCustom=false;
+
+		private Color m_ItemBackground2;
+		private bool m_ItemBackground2Custom=false;
+
+		private int m_ItemBackgroundGradientAngle=90;
+
+		private Color m_ItemText;
+		private bool m_ItemTextCustom=false;
+
+		private Color m_ItemDisabledBackground;
+		private bool m_ItemDisabledBackgroundCustom=false;
+
+		private Color m_ItemDisabledText;
+		private bool m_ItemDisabledTextCustom=false;
+
+		private Color m_ItemHotBackground;
+		private bool m_ItemHotBackgroundCustom=false;
+
+		private Color m_ItemHotBackground2=Color.Empty;
+		private bool m_ItemHotBackground2Custom=false;
+
+		private int m_ItemHotBackgroundGradientAngle=90;
+
+		private Color m_ItemHotText;
+		private bool m_ItemHotTextCustom=false;
+
+		private Color m_ItemHotBorder;
+		private bool m_ItemHotBorderCustom=false;
+
+		private Color m_ItemPressedBackground;
+		private bool m_ItemPressedBackgroundCustom=false;
+
+		private Color m_ItemPressedBackground2=Color.Empty;
+		private bool m_ItemPressedBackground2Custom=false;
+		private int m_ItemPressedBackgroundGradientAngle=90;
+
+		private Color m_ItemPressedText;
+		private bool m_ItemPressedTextCustom=false;
+
+		private Color m_ItemPressedBorder;
+		private bool m_ItemPressedBorderCustom=false;
+		
+		private Color m_ItemSeparator;
+		private bool m_ItemSeparatorCustom=false;
+
+		private Color m_ItemSeparatorShade=Color.Empty;
+		private bool m_ItemSeparatorShadeCustom=false;
+
+		private Color m_ItemExpandedBackground;
+		private bool m_ItemExpandedBackgroundCustom=false;
+
+		private Color m_ItemExpandedBackground2=Color.Empty;
+		private bool m_ItemExpandedBackground2Custom=false;
+		private int m_ItemExpandedBackgroundGradientAngle=90;
+
+		private Color m_ItemExpandedText;
+		private bool m_ItemExpandedTextCustom=false;
+
+		private Color m_ItemExpandedShadow;
+		private bool m_ItemExpandedShadowCustom=false;
+
+		private Color m_ItemExpandedBorder;
+		private bool m_ItemExpandedBorderCustom=false;
+
+		private Color m_ItemCheckedBackground;
+		private bool m_ItemCheckedBackgroundCustom=false;
+
+		private int m_ItemCheckedBackgroundGradientAngle=90;
+
+		private Color m_ItemCheckedBackground2=Color.Empty;
+		private bool m_ItemCheckedBackground2Custom=false;
+
+		private Color m_ItemCheckedBorder;
+		private bool m_ItemCheckedBorderCustom=false;
+
+		private Color m_ItemCheckedText;
+		private bool m_ItemCheckedTextCustom=false;
+
+		private Color m_MenuBorder;
+		private bool m_MenuBorderCustom=false;
+
+		private Color m_MenuBackground;
+		private bool m_MenuBackgroundCustom=false;
+
+		private Color m_MenuBackground2=Color.Empty;
+		private bool m_MenuBackground2Custom=false;
+
+		private int m_MenuBackgroundGradientAngle=0;
+
+		private Color m_MenuSide;
+		private bool m_MenuSideCustom=false;
+
+		private Color m_MenuSide2=Color.Empty;
+		private bool m_MenuSide2Custom=false;
+
+		private int m_MenuSideGradientAngle=0;
+		
+		private Color m_MenuUnusedBackground;
+		private bool m_MenuUnusedBackgroundCustom=false;
+
+		private Color m_MenuUnusedSide;
+		private bool m_MenuUnusedSideCustom=false;
+
+		private Color m_MenuUnusedSide2=Color.Empty;
+		private bool m_MenuUnusedSide2Custom=false;
+
+		private int m_MenuUnusedSideGradientAngle=0;
+
+		private Color m_ItemDesignTimeBorder;
+		private bool m_ItemDesignTimeBorderCustom=false;
+
+		private Color m_CustomizeBackground=Color.Empty;
+		private bool m_CustomizeBackgroundCustom=false;
+		private Color m_CustomizeBackground2=Color.Empty;
+		private bool m_CustomizeBackground2Custom=false;
+		private int m_CustomizeBackgroundGradientAngle=90;
+		private Color m_CustomizeText=Color.Empty;
+		private bool m_CustomizeTextCustom=false;
+
+		// Panel Colors
+		private Color m_PanelBackground=Color.Empty;
+		private bool m_PanelBackgroundCustom=false;
+
+		private Color m_PanelBackground2=Color.Empty;
+		private bool m_PanelBackground2Custom=false;
+
+		private int m_PanelBackgroundGradientAngle=90;
+
+		private Color m_PanelText=Color.Empty;
+		private bool m_PanelTextCustom=false;
+
+		private Color m_PanelBorder=Color.Empty;
+		private bool m_PanelBorderCustom=false;
+
+        // Splitter Colors
+        private Color m_SplitterBackground = Color.Empty;
+        private bool m_SplitterBackgroundCustom = false;
+
+        private Color m_SplitterBackground2 = Color.Empty;
+        private bool m_SplitterBackground2Custom = false;
+
+        private int m_SplitterBackgroundGradientAngle = 90;
+
+        private Color m_SplitterText = Color.Empty;
+        private bool m_SplitterTextCustom = false;
+
+        private Color m_SplitterBorder = Color.Empty;
+        private bool m_SplitterBorderCustom = false;
+
+		private Color m_ExplorerBarBackground=Color.Empty;
+		private bool m_ExplorerBarBackgroundCustom=false;
+		private Color m_ExplorerBarBackground2=Color.Empty;
+		private bool m_ExplorerBarBackground2Custom=false;
+		private int m_ExplorerBarBackgroundGradientAngle=90;
+
+		internal bool _DesignTimeSchemeChanged=false;
+
+		private eDotNetBarStyle m_Style=eDotNetBarStyle.OfficeXP;
+
+		private Color m_DockSiteBackColor=Color.Empty;
+		private bool m_DockSiteBackColorCustom=false;
+		private Color m_DockSiteBackColor2=Color.Empty;
+		private bool m_DockSiteBackColor2Custom=false;
+		private int m_DockSiteBackColorGradientAngle=0;
+
+		private ePredefinedColorScheme m_PredefinedColorScheme=ePredefinedColorScheme.AutoGenerated;
+
+        private Color m_MdiSystemItemForeground = Color.Empty;
+		#endregion
+
+		#region Public Interface
+		public ColorScheme()
+		{
+			Refresh(null,false);
+		}
+		public ColorScheme(System.Drawing.Graphics graphics)
+		{
+			Refresh(graphics,false);
+		}
+
+		public ColorScheme(eDotNetBarStyle style)
+		{
+			m_Style=style;
+			Refresh(null,true);
+		}
+
+#if !NOTREE
+        public ColorScheme(DevComponents.AdvTree.eColorSchemeStyle cs)
+        {
+            eDotNetBarStyle style = eDotNetBarStyle.Office2003;
+            if (cs == DevComponents.AdvTree.eColorSchemeStyle.VS2005)
+                style = eDotNetBarStyle.VS2005;
+            else if (cs == DevComponents.AdvTree.eColorSchemeStyle.Office2007)
+                style = eDotNetBarStyle.Office2007;
+            m_Style = style;
+            Refresh(null, true);
+        }
+#endif
+
+		internal eDotNetBarStyle Style
+		{
+			get {return m_Style;}
+			set
+			{
+				if(m_Style!=value)
+				{
+					m_Style=value;
+					this.Refresh();
+				}
+			}
+		}
+
+		internal void SwitchStyle(eDotNetBarStyle style)
+		{
+			if(m_Style!=style)
+			{
+				m_Style=style;
+				this.Refresh(null,true);
+			}
+		}
+
+		/// <summary>
+		/// Specifies Dock Site BackColor.
+		/// </summary>
+		[Browsable(true), DevCoBrowsable(true), System.ComponentModel.Category("Panel Colors"), System.ComponentModel.Description("Specifies starting color of dock site.")]
+		public Color DockSiteBackColor
+		{
+			get { return m_DockSiteBackColor; }
+			set 
+			{
+				if(m_DockSiteBackColor != value)
+				{
+					m_DockSiteBackColor = value; 
+					m_DockSiteBackColorCustom=true;
+				}
+			}
+		}
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeDockSiteBackColor()
+		{
+			return m_DockSiteBackColorCustom;
+		}
+		/// <summary>
+		/// Specifies Dock Site BackColor2.
+		/// </summary>
+		[Browsable(true), DevCoBrowsable(true), System.ComponentModel.Category("Panel Colors"), System.ComponentModel.Description("Specifies ending gradient color of dock site.")]
+		public Color DockSiteBackColor2
+		{
+			get { return m_DockSiteBackColor2; }
+			set 
+			{
+				if(m_DockSiteBackColor2 != value)
+				{
+					m_DockSiteBackColor2 = value; 
+					m_DockSiteBackColor2Custom=true;
+				}
+			}
+		}
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeDockSiteBackColor2()
+		{
+			return m_DockSiteBackColor2Custom;
+		}
+
+		/// <summary>
+		/// Specifies the gradient angle.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Panel Colors"),System.ComponentModel.Description("Specifies the gradient angle."),DefaultValue(0)]
+		public int DockSiteBackColorGradientAngle
+		{
+			get {return m_DockSiteBackColorGradientAngle;}
+			set {m_DockSiteBackColorGradientAngle=value;}
+		}
+
+		/// <summary>
+		/// Specifies the menu bar background color.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Bar Colors"),System.ComponentModel.Description("Specifies the menu bar background color.")]
+		public Color MenuBarBackground
+		{
+			get{return m_MenuBarBackground;}
+			set
+			{
+				if(m_MenuBarBackground!=value)
+				{
+					m_MenuBarBackground=value;
+					m_MenuBarBackgroundCustom=true;
+				}
+			}
+		}
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeMenuBarBackground()
+		{
+			return m_MenuBarBackgroundCustom;
+		}
+		/// <summary>
+		/// Specifies the target menu bar gradient background color.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Bar Colors"),System.ComponentModel.Description("Specifies the target menu bar gradient background color.")]
+		public Color MenuBarBackground2
+		{
+			get{return m_MenuBarBackground2;}
+			set
+			{
+				if(m_MenuBarBackground2!=value)
+				{
+					m_MenuBarBackground2=value;
+					m_MenuBarBackground2Custom=true;
+				}
+			}
+		}
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeMenuBarBackground2()
+		{
+			return m_MenuBarBackground2Custom;
+		}
+		/// <summary>
+		/// Specifies the gradient angle.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Bar Colors"),System.ComponentModel.Description("Specifies the gradient angle."),DefaultValue(90)]
+		public int MenuBarBackgroundGradientAngle
+		{
+			get {return m_MenuBarBackgroundGradientAngle;}
+			set {m_MenuBarBackgroundGradientAngle=value;}
+		}
+		/// <summary>
+		/// Specifies the background color for the bar when floating or when docked.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Bar Colors"),System.ComponentModel.Description("Specifies the background color for the bar when floating or when docked.")]
+		public Color BarBackground
+		{
+			get {return m_BarBackground;}
+			set 
+			{
+				if(m_BarBackground!=value)
+				{
+					m_BarBackground=value;
+					m_BarBackgroundCustom=true;
+				}
+			}
+		}
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeBarBackground()
+		{
+			return m_BarBackgroundCustom;
+		}
+		/// <summary>
+		/// Specifies the target gradient background color for the bar when floating or when docked.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Bar Colors"),System.ComponentModel.Description("Specifies the target gradient background color for the bar when floating or when docked.")]
+		public Color BarBackground2
+		{
+			get {return m_BarBackground2;}
+			set 
+			{
+				if(m_BarBackground2!=value)
+				{
+					m_BarBackground2=value;
+					m_BarBackground2Custom=true;
+				}
+			}
+		}
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeBarBackground2()
+		{
+			return m_BarBackground2Custom;
+		}
+
+		/// <summary>
+		/// Specifies the gradient angle.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Bar Colors"),System.ComponentModel.Description("Specifies the gradient angle."),DefaultValue(90)]
+		public int BarBackgroundGradientAngle
+		{
+			get {return m_BarBackgroundGradientAngle;}
+			set {m_BarBackgroundGradientAngle=value;}
+		}
+
+		/// <summary>
+		/// Specifies the background color for the bar Caption.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Bar Colors"),System.ComponentModel.Description("Specifies the background color for the bar Caption.")]
+		public Color BarCaptionBackground
+		{
+			get{return m_BarCaptionBackground;}
+			set
+			{
+				if(m_BarCaptionBackground!=value)
+				{
+					m_BarCaptionBackground=value;
+					m_BarCaptionBackgroundCustom=true;
+				}
+			}
+		}
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeBarCaptionBackground()
+		{
+			return m_BarCaptionBackgroundCustom;
+		}
+		/// <summary>
+		/// Specifies the target gradient background color for the bar Caption.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Bar Colors"),System.ComponentModel.Description("Specifies the target bar gradient background color for the bar Caption.")]
+		public Color BarCaptionBackground2
+		{
+			get{return m_BarCaptionBackground2;}
+			set
+			{
+				if(m_BarCaptionBackground2!=value)
+				{
+					m_BarCaptionBackground2=value;
+					m_BarCaptionBackground2Custom=true;
+				}
+			}
+		}
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeBarCaptionBackground2()
+		{
+			return m_BarCaptionBackground2Custom;
+		}
+		/// <summary>
+		/// Specifies the gradient angle.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Bar Colors"),System.ComponentModel.Description("Specifies the gradient angle."),DefaultValue(90)]
+		public int BarCaptionBackgroundGradientAngle
+		{
+			get {return m_BarCaptionBackgroundGradientAngle;}
+			set{m_BarCaptionBackgroundGradientAngle=value;}
+		}
+		/// <summary>
+		/// Specifies the color for text of the Caption.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Bar Colors"),System.ComponentModel.Description("Specifies the color for text of the Caption.")]
+		public Color BarCaptionText
+		{
+			get {return m_BarCaptionText;}
+			set
+			{
+				if(m_BarCaptionText!=value)
+				{
+					m_BarCaptionText=value;
+					m_BarCaptionTextCustom=true;
+				}
+			}
+		}
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeBarCaptionText()
+		{
+			return m_BarCaptionTextCustom;
+		}
+		/// <summary>
+		/// Specifies the Bar Caption inactive (lost focus) background color.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Bar Colors"),System.ComponentModel.Description("Specifies the Bar Caption inactive (lost focus) background color.")]
+		public Color BarCaptionInactiveBackground
+		{
+			get {return m_BarCaptionInactiveBackground;}
+			set
+			{
+				if(m_BarCaptionInactiveBackground!=value)
+				{
+					m_BarCaptionInactiveBackground=value;
+					m_BarCaptionInactiveBackgroundCustom=true;
+				}
+			}
+		}
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeBarCaptionInactiveBackground()
+		{
+			return m_BarCaptionInactiveBackgroundCustom;
+		}
+		/// <summary>
+		/// Specifies the target background gradient Bar Caption inactive (lost focus) color.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Bar Colors"),System.ComponentModel.Description("Specifies the target background gradient Bar Caption inactive (lost focus) color.")]
+		public Color BarCaptionInactiveBackground2
+		{
+			get {return m_BarCaptionInactiveBackground2;}
+			set
+			{
+				if(m_BarCaptionInactiveBackground2!=value)
+				{
+					m_BarCaptionInactiveBackground2=value;
+					m_BarCaptionInactiveBackground2Custom=true;
+				}
+			}
+		}
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeBarCaptionInactiveBackground2()
+		{
+			return m_BarCaptionInactiveBackground2Custom;
+		}
+		/// <summary>
+		/// Specifies the gradient angle.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Bar Colors"),System.ComponentModel.Description("Specifies the gradient angle."),DefaultValue(90)]
+		internal int BarCaptionInactiveBackgroundGAngle
+		{
+			get {return m_BarCaptionInactiveBackgroundGAngle;}
+			set {m_BarCaptionInactiveBackgroundGAngle=value;}
+		}
+		/// <summary>
+		/// Specifies the Bar inactive (lost focus) text color.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Bar Colors"),System.ComponentModel.Description("Specifies the Bar inactive (lost focus) text color.")]
+		public Color BarCaptionInactiveText
+		{
+			get {return m_BarCaptionInactiveText;}
+			set
+			{
+				if(m_BarCaptionInactiveText!=value)
+				{
+					m_BarCaptionInactiveText=value;
+					m_BarCaptionInactiveTextCustom=true;
+				}
+			}
+		}
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeBarCaptionInactiveText()
+		{
+			return m_BarCaptionInactiveTextCustom;
+		}
+		/// <summary>
+		/// Specifies the background color for popup bars.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Bar Colors"),System.ComponentModel.Description("Specifies the background color for popup bars.")]
+		public Color BarPopupBackground
+		{
+			get {return m_BarPopupBackground;}
+			set
+			{
+				if(m_BarPopupBackground!=value)
+				{
+					m_BarPopupBackground=value;
+					m_BarPopupBackgroundCustom=true;
+				}
+			}
+		}
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeBarPopupBackground()
+		{
+			return m_BarPopupBackgroundCustom;
+		}
+		/// <summary>
+		/// Specifies the border color for popup bars.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Bar Colors"),System.ComponentModel.Description("Specifies the border color for popup bars.")]
+		public Color BarPopupBorder
+		{
+			get {return m_BarPopupBorder;}
+			set
+			{
+				if(m_BarPopupBorder!=value)
+				{
+					m_BarPopupBorder=value;
+					m_BarPopupBorderCustom=true;
+				}
+			}
+		}
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeBarPopupBorder()
+		{
+			return m_BarPopupBorderCustom;
+		}
+		/// <summary>
+		/// Specifies the border color for docked bars.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Bar Colors"),System.ComponentModel.Description("Specifies the border color for docked bars.")]
+		public Color BarDockedBorder
+		{
+			get {return m_BarDockedBorder;}
+			set
+			{
+				if(m_BarDockedBorder!=value)
+				{
+					m_BarDockedBorder=value;
+					m_BarDockedBorderCustom=true;
+				}
+			}
+		}
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeBarDockedBorder()
+		{
+			return m_BarDockedBorderCustom;
+		}
+		/// <summary>
+		/// Specifies the color of the grab handle stripes.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Bar Colors"),System.ComponentModel.Description("Specifies the color of the grab handle stripes.")]
+		public Color BarStripeColor
+		{
+			get {return m_BarStripeColor;}
+			set
+			{
+				if(m_BarStripeColor!=value)
+				{
+					m_BarStripeColor=value;
+					m_BarStripeColorCustom=true;
+				}
+			}
+		}
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeBarStripeColor()
+		{
+			return m_BarStripeColorCustom;
+		}
+		/// <summary>
+		///  Specifies the border color for floating bars.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Bar Colors"),System.ComponentModel.Description("Specifies the border color for floating bars.")]
+		public Color BarFloatingBorder
+		{
+			get {return m_BarFloatingBorder;}
+			set
+			{
+				if(m_BarFloatingBorder!=value)
+				{
+					m_BarFloatingBorder=value;
+					m_BarFloatingBorderCustom=true;
+				}
+			}
+		}
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeBarFloatingBorder()
+		{
+			return m_BarFloatingBorderCustom;
+		}
+		/// <summary>
+		/// Specifies the item background color.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Item Colors"),System.ComponentModel.Description("Specifies the item background color.")]
+		public Color ItemBackground
+		{
+			get {return m_ItemBackground;}
+			set
+			{
+				if(m_ItemBackground!=value)
+				{
+					m_ItemBackground=value;
+					m_ItemBackgroundCustom=true;
+				}
+			}
+		}
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeItemBackground()
+		{
+			return m_ItemBackgroundCustom;
+		}
+		/// <summary>
+		/// Specifies the target item background gradient color.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Item Colors"),System.ComponentModel.Description("Specifies the target item background gradient color.")]
+		public Color ItemBackground2
+		{
+			get {return m_ItemBackground2;}
+			set
+			{
+				if(m_ItemBackground2!=value)
+				{
+					m_ItemBackground2=value;
+					m_ItemBackground2Custom=true;
+				}
+			}
+		}
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeItemBackground2()
+		{
+			return m_ItemBackground2Custom;
+		}
+		/// <summary>
+		/// Specifies the gradient angle.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Item Colors"),System.ComponentModel.Description("Specifies the gradient angle."),DefaultValue(90)]
+		public int ItemBackgroundGradientAngle
+		{
+			get {return m_ItemBackgroundGradientAngle;}
+			set {m_ItemBackgroundGradientAngle=value;}
+		}
+
+		/// <summary>
+		/// Specifies the item text color.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Item Colors"),System.ComponentModel.Description("Specifies the item text color.")]
+		public Color ItemText
+		{
+			get {return m_ItemText;}
+			set
+			{
+				if(m_ItemText!=value)
+				{
+					m_ItemText=value;
+					m_ItemTextCustom=true;
+				}
+			}
+		}
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeItemText()
+		{
+			return m_ItemTextCustom;
+		}
+		/// <summary>
+		/// Specifies the background color for the item that is disabled.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Item Colors"),System.ComponentModel.Description("Specifies the background color for the item that is disabled.")]
+		public Color ItemDisabledBackground
+		{
+			get {return m_ItemDisabledBackground;}
+			set
+			{
+				if(m_ItemDisabledBackground!=value)
+				{
+					m_ItemDisabledBackground=value;
+					m_ItemDisabledBackgroundCustom=true;
+				}
+			}
+		}
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeItemDisabledBackground()
+		{
+			return m_ItemDisabledBackgroundCustom;
+		}
+		/// <summary>
+		/// Specifies the text color for the item that is disabled.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Item Colors"),System.ComponentModel.Description("Specifies the text color for the item that is disabled.")]
+		public Color ItemDisabledText
+		{
+			get {return m_ItemDisabledText;}
+			set
+			{
+				if(m_ItemDisabledText!=value)
+				{
+					m_ItemDisabledText=value;
+					m_ItemDisabledTextCustom=true;
+				}
+			}
+		}
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeItemDisabledText()
+		{
+			return m_ItemDisabledTextCustom;
+		}
+		/// <summary>
+		/// Specifies the background color when mouse is over the item.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Item Colors"),System.ComponentModel.Description("Specifies the background color when mouse is over the item.")]
+		public Color ItemHotBackground
+		{
+			get {return m_ItemHotBackground;}
+			set
+			{
+				if(m_ItemHotBackground!=value)
+				{
+					m_ItemHotBackground=value;
+					m_ItemHotBackgroundCustom=true;
+				}
+			}
+		}
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeItemHotBackground()
+		{
+			return m_ItemHotBackgroundCustom;
+		}
+		/// <summary>
+		/// Specifies the target gradient background color when mouse is over the item.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Item Colors"),System.ComponentModel.Description("Specifies the target gradient background color when mouse is over the item.")]
+		public Color ItemHotBackground2
+		{
+			get {return m_ItemHotBackground2;}
+			set
+			{
+				if(m_ItemHotBackground2!=value)
+				{
+					m_ItemHotBackground2=value;
+					m_ItemHotBackground2Custom=true;
+				}
+			}
+		}
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeItemHotBackground2()
+		{
+			return m_ItemHotBackground2Custom;
+		}
+		/// <summary>
+		/// Specifies the gradient angle.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Item Colors"),System.ComponentModel.Description("Specifies the gradient angle."),DefaultValue(90)]
+		public int ItemHotBackgroundGradientAngle
+		{
+			get {return m_ItemHotBackgroundGradientAngle;}
+			set {m_ItemHotBackgroundGradientAngle=value;}
+		}
+		/// <summary>
+		/// Specifies the text color when mouse is over the item.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Item Colors"),System.ComponentModel.Description("Specifies the text color when mouse is over the item.")]
+		public Color ItemHotText
+		{
+			get {return m_ItemHotText;}
+			set
+			{
+				if(m_ItemHotText!=value)
+				{
+					m_ItemHotText=value;
+					m_ItemHotTextCustom=true;
+				}
+			}
+		}
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeItemHotText()
+		{
+			return m_ItemHotTextCustom;
+		}
+		/// <summary>
+		/// Specifies the border color when mouse is over the item.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Item Colors"),System.ComponentModel.Description("Specifies the border color when mouse is over the item.")]
+		public Color ItemHotBorder
+		{
+			get {return m_ItemHotBorder;}
+			set
+			{
+				if(m_ItemHotBorder!=value)
+				{
+					m_ItemHotBorder=value;
+					m_ItemHotBorderCustom=true;
+				}
+			}
+		}
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeItemHotBorder()
+		{
+			return m_ItemHotBorderCustom;
+		}
+		/// <summary>
+		/// Specifies the background color when item is pressed.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Item Colors"),System.ComponentModel.Description("Specifies the background color when item is pressed.")]
+		public Color ItemPressedBackground
+		{
+			get {return m_ItemPressedBackground;}
+			set
+			{
+				if(m_ItemPressedBackground!=value)
+				{
+					m_ItemPressedBackground=value;
+					m_ItemPressedBackgroundCustom=true;
+				}
+			}
+		}
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeItemPressedBackground()
+		{
+			return m_ItemPressedBackgroundCustom;
+		}
+		/// <summary>
+		/// Specifies the target gradient background color when item is pressed.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Item Colors"),System.ComponentModel.Description("Specifies the target gradient background color when item is pressed.")]
+		public Color ItemPressedBackground2
+		{
+			get {return m_ItemPressedBackground2;}
+			set
+			{
+				if(m_ItemPressedBackground2!=value)
+				{
+					m_ItemPressedBackground2=value;
+					m_ItemPressedBackground2Custom=true;
+				}
+			}
+		}
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeItemPressedBackground2()
+		{
+			return m_ItemPressedBackground2Custom;
+		}
+		/// <summary>
+		/// Specifies the gradient angle.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Item Colors"),System.ComponentModel.Description("Specifies the gradient angle."),DefaultValue(90)]
+		public int ItemPressedBackgroundGradientAngle
+		{
+			get {return m_ItemPressedBackgroundGradientAngle;}
+			set {m_ItemPressedBackgroundGradientAngle=value;}
+		}
+		/// <summary>
+		/// Specifies the text color when item is pressed.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Item Colors"),System.ComponentModel.Description("Specifies the text color when item is pressed.")]
+		public Color ItemPressedText
+		{
+			get {return m_ItemPressedText;}
+			set
+			{
+				if(m_ItemPressedText!=value)
+				{
+					m_ItemPressedText=value;
+					m_ItemPressedTextCustom=true;
+				}
+			}
+		}
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeItemPressedText()
+		{
+			return m_ItemPressedTextCustom;
+		}
+		/// <summary>
+		/// Specifies the border color when item is pressed.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Item Colors"),System.ComponentModel.Description("Specifies the border color when item is pressed.")]
+		public Color ItemPressedBorder
+		{
+			get {return m_ItemPressedBorder;}
+			set
+			{
+				if(m_ItemPressedBorder!=value)
+				{
+					m_ItemPressedBorder=value;
+					m_ItemPressedBorderCustom=true;
+				}
+			}
+		}
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeItemPressedBorder()
+		{
+			return m_ItemPressedBorderCustom;
+		}
+		/// <summary>
+		/// Specifies the color for the item group separator.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Item Colors"),System.ComponentModel.Description("Specifies the color for the item group separator.")]
+		public Color ItemSeparator
+		{
+			get {return m_ItemSeparator;}
+			set
+			{
+				if(m_ItemSeparator!=value)
+				{
+					m_ItemSeparator=value;
+					m_ItemSeparatorCustom=true;
+				}
+			}
+		}
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeItemSeparator()
+		{
+			return m_ItemSeparatorCustom;
+		}
+		/// <summary>
+		/// Specifies the color for the item group separator shade.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Item Colors"),System.ComponentModel.Description("Specifies the color for the item group separator shade.")]
+		public Color ItemSeparatorShade
+		{
+			get {return m_ItemSeparatorShade;}
+			set
+			{
+				if(m_ItemSeparatorShade!=value)
+				{
+					m_ItemSeparatorShade=value;
+					m_ItemSeparatorShadeCustom=true;
+				}
+			}
+		}
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeItemSeparatorShade()
+		{
+			return m_ItemSeparatorShadeCustom;
+		}
+		/// <summary>
+		/// Specifies the background color for the shadow of expanded item.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Item Colors"),System.ComponentModel.Description("Specifies the background color for the shadow of expanded item.")]
+		public Color ItemExpandedShadow
+		{
+			get {return m_ItemExpandedShadow;}
+			set
+			{
+				if(m_ItemExpandedShadow!=value)
+				{
+					m_ItemExpandedShadow=value;
+					m_ItemExpandedShadowCustom=true;
+				}
+			}
+		}
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeItemExpandedShadow()
+		{
+			return m_ItemExpandedShadowCustom;
+		}
+		/// <summary>
+		/// Specifies the background color for the expanded item.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Item Colors"),System.ComponentModel.Description("Specifies the background color for the expanded item.")]
+		public Color ItemExpandedBackground
+		{
+			get {return m_ItemExpandedBackground;}
+			set
+			{
+				if(m_ItemExpandedBackground!=value)
+				{
+					m_ItemExpandedBackground=value;
+					m_ItemExpandedBackgroundCustom=true;
+				}
+			}
+		}
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeItemExpandedBackground()
+		{
+			return m_ItemExpandedBackgroundCustom;
+		}
+		/// <summary>
+		/// Specifies the target gradient background color for the expanded item.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Item Colors"),System.ComponentModel.Description("Specifies the target gradient background color for the expanded item.")]
+		public Color ItemExpandedBackground2
+		{
+			get {return m_ItemExpandedBackground2;}
+			set
+			{
+				if(m_ItemExpandedBackground2!=value)
+				{
+					m_ItemExpandedBackground2=value;
+					m_ItemExpandedBackground2Custom=true;
+				}
+			}
+		}
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeItemExpandedBackground2()
+		{
+			return m_ItemExpandedBackground2Custom;
+		}
+		/// <summary>
+		/// Specifies the gradient angle.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Item Colors"),System.ComponentModel.Description("Specifies the gradient angle."),DefaultValue(90)]
+		public int ItemExpandedBackgroundGradientAngle
+		{
+			get {return m_ItemExpandedBackgroundGradientAngle;}
+			set {m_ItemExpandedBackgroundGradientAngle=value;}
+		}
+
+		/// <summary>
+		/// Specifies the text color for the expanded item.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Item Colors"),System.ComponentModel.Description("Specifies the text color for the expanded item.")]
+		public Color ItemExpandedText
+		{
+			get {return m_ItemExpandedText;}
+			set
+			{
+				if(m_ItemExpandedText!=value)
+				{
+					m_ItemExpandedText=value;
+					m_ItemExpandedTextCustom=true;
+				}
+			}
+		}
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeItemExpandedText()
+		{
+			return m_ItemExpandedTextCustom;
+		}
+		/// <summary>
+		/// Specifies the border color for the expanded item.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Item Colors"),System.ComponentModel.Description("Specifies the border color for the expanded item.")]
+		public Color ItemExpandedBorder
+		{
+			get {return m_ItemExpandedBorder;}
+			set
+			{
+				if(m_ItemExpandedBorder!=value)
+				{
+					m_ItemExpandedBorder=value;
+					m_ItemExpandedBorderCustom=true;
+				}
+			}
+		}
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeItemExpandedBorder()
+		{
+			return m_ItemExpandedBorderCustom;
+		}
+
+		/// <summary>
+		/// Specifies the background color for the checked item.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Item Colors"),System.ComponentModel.Description("Specifies the background color for the checked item.")]
+		public Color ItemCheckedBackground
+		{
+			get {return m_ItemCheckedBackground;}
+			set
+			{
+				if(m_ItemCheckedBackground!=value)
+				{
+					m_ItemCheckedBackground=value;
+					m_ItemCheckedBackgroundCustom=true;
+				}
+			}
+		}
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeItemCheckedBackground()
+		{
+			return m_ItemCheckedBackgroundCustom;
+		}
+		/// <summary>
+		/// Specifies the target gradient background color for the checked item.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Item Colors"),System.ComponentModel.Description("Specifies the target gradient background color for the checked item.")]
+		public Color ItemCheckedBackground2
+		{
+			get {return m_ItemCheckedBackground2;}
+			set
+			{
+				if(m_ItemCheckedBackground2!=value)
+				{
+					m_ItemCheckedBackground2=value;
+					m_ItemCheckedBackground2Custom=true;
+				}
+			}
+		}
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeItemCheckedBackground2()
+		{
+			return m_ItemCheckedBackground2Custom;
+		}
+		/// <summary>
+		/// Specifies the gradient angle.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Item Colors"),System.ComponentModel.Description("Specifies the gradient angle."),DefaultValue(90)]
+		public int ItemCheckedBackgroundGradientAngle
+		{
+			get {return m_ItemCheckedBackgroundGradientAngle;}
+			set {m_ItemCheckedBackgroundGradientAngle=value;}
+		}
+
+		/// <summary>
+		/// Specifies the border color for the checked item.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Item Colors"),System.ComponentModel.Description("Specifies the border color for the checked item.")]
+		public Color ItemCheckedBorder
+		{
+			get {return m_ItemCheckedBorder;}
+			set
+			{
+				if(m_ItemCheckedBorder!=value)
+				{
+					m_ItemCheckedBorder=value;
+					m_ItemCheckedBorderCustom=true;
+				}
+			}
+		}
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeItemCheckedBorder()
+		{
+			return m_ItemCheckedBorderCustom;
+		}
+		/// <summary>
+		/// Specifies the text color for the checked item.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Item Colors"),System.ComponentModel.Description("Specifies the text color for the checked item.")]
+		public Color ItemCheckedText
+		{
+			get {return m_ItemCheckedText;}
+			set
+			{
+				if(m_ItemCheckedText!=value)
+				{
+					m_ItemCheckedText=value;
+					m_ItemCheckedTextCustom=true;
+				}
+			}
+
+		}
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeItemCheckedText()
+		{
+			return m_ItemCheckedTextCustom;
+		}
+		/// <summary>
+		/// Specifies the customize item background color. Applies to Office2003 style only.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Special Item Colors"),System.ComponentModel.Description("Specifies the customize item background color.")]
+		public Color CustomizeBackground
+		{
+			get {return m_CustomizeBackground;}
+			set
+			{
+				if(m_CustomizeBackground!=value)
+				{
+					m_CustomizeBackground=value;
+					m_CustomizeBackgroundCustom=true;
+				}
+			}
+		}
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeCustomizeBackground()
+		{
+			return m_CustomizeBackgroundCustom;
+		}
+		/// <summary>
+		/// Specifies the customize item target gradient background color. Applies to Office2003 style only.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Special Item Colors"),System.ComponentModel.Description("Specifies the customize item target gradient background color.")]
+		public Color CustomizeBackground2
+		{
+			get {return m_CustomizeBackground2;}
+			set
+			{
+				if(m_CustomizeBackground2!=value)
+				{
+					m_CustomizeBackground2=value;
+					m_CustomizeBackground2Custom=true;
+				}
+			}
+		}
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeCustomizeBackground2()
+		{
+			return m_CustomizeBackground2Custom;
+		}
+		/// <summary>
+		/// Specifies the customize item background color gradient angle. Applies to Office2003 style only.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Special Item Colors"),System.ComponentModel.Description("Specifies the customize item background color gradient angle."),DefaultValue(90)]
+		public int CustomizeBackgroundGradientAngle
+		{
+			get {return m_CustomizeBackgroundGradientAngle;}
+			set {m_CustomizeBackgroundGradientAngle=value;}
+		}
+		/// <summary>
+		/// Specifies the customize item text color. Applies to Office2003 style only.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Special Item Colors"),System.ComponentModel.Description("Specifies the customize item text color.")]
+		public Color CustomizeText
+		{
+			get {return m_CustomizeText;}
+			set
+			{
+				if(m_CustomizeText!=value)
+				{
+					m_CustomizeText=value;
+					m_CustomizeTextCustom=true;
+				}
+			}
+		}
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeCustomizeText()
+		{
+			return m_CustomizeTextCustom;
+		}
+		/// <summary>
+		/// Specifies the color of the menu border.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Menu Colors"),System.ComponentModel.Description("Specifies the color of the menu border.")]
+		public Color MenuBorder
+		{
+			get {return m_MenuBorder;}
+			set
+			{
+				if(m_MenuBorder!=value)
+				{
+					m_MenuBorder=value;
+					m_MenuBorderCustom=true;
+				}
+			}
+		}
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeMenuBorder()
+		{
+			return m_MenuBorderCustom;
+		}
+		/// <summary>
+		/// Specifies the background color of the menu.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Menu Colors"),System.ComponentModel.Description("Specifies the background color of the menu.")]
+		public Color MenuBackground
+		{
+			get {return m_MenuBackground;}
+			set
+			{
+				if(m_MenuBackground!=value)
+				{
+					m_MenuBackground=value;
+					m_MenuBackgroundCustom=true;
+				}
+			}
+		}
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeMenuBackground()
+		{
+			return m_MenuBackgroundCustom;
+		}
+		/// <summary>
+		/// Specifies the target gradient background color of the menu.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Menu Colors"),System.ComponentModel.Description("Specifies the target gradient background color of the menu.")]
+		public Color MenuBackground2
+		{
+			get {return m_MenuBackground2;}
+			set
+			{
+				if(m_MenuBackground2!=value)
+				{
+					m_MenuBackground2=value;
+					m_MenuBackground2Custom=true;
+				}
+			}
+		}
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeMenuBackground2()
+		{
+			return m_MenuBackground2Custom;
+		}
+		/// <summary>
+		/// Specifies the angle of the gradient fill for the menu background.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Menu Colors"),System.ComponentModel.Description("Specifies the angle of the gradient fill for the menu background."),DefaultValue(0)]
+		public int MenuBackgroundGradientAngle
+		{
+			get {return m_MenuBackgroundGradientAngle;}
+			set
+			{
+				if(m_MenuBackgroundGradientAngle!=value)
+				{
+					m_MenuBackgroundGradientAngle=value;
+				}
+			}
+		}
+		/// <summary>
+		/// Specifies the background color of the menu part (left side)  that is showing the images.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Menu Colors"),System.ComponentModel.Description("Specifies the background color of the menu part (left side)  that is showing the images.")]
+		public Color MenuSide
+		{
+			get {return m_MenuSide;}
+			set
+			{
+				if(m_MenuSide!=value)
+				{
+					m_MenuSide=value;
+					m_MenuSideCustom=true;
+				}
+			}
+		}
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeMenuSide()
+		{
+			return m_MenuSideCustom;
+		}
+		/// <summary>
+		/// Specifies the target gradient background color of the menu part (left side)  that is showing the images.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Menu Colors"),System.ComponentModel.Description("Specifies the target gradient background color of the menu part (left side)  that is showing the images.")]
+		public Color MenuSide2
+		{
+			get {return m_MenuSide2;}
+			set
+			{
+				if(m_MenuSide2!=value)
+				{
+					m_MenuSide2=value;
+					m_MenuSide2Custom=true;
+				}
+			}
+		}
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeMenuSide2()
+		{
+			return m_MenuSide2Custom;
+		}
+		/// <summary>
+		/// Specifies the angle of the gradient fill for the menu part (left side) that is showing the images.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Menu Colors"),System.ComponentModel.Description("Specifies the angle of the gradient fill for the menu part (left side) that is showing the images."),DefaultValue(0)]
+		public int MenuSideGradientAngle
+		{
+			get {return m_MenuSideGradientAngle;}
+			set
+			{
+				if(m_MenuSideGradientAngle!=value)
+				{
+					m_MenuSideGradientAngle=value;
+				}
+			}
+		}
+		/// <summary>
+		/// Specifies the background color for the items that were not recently used.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Menu Colors"),System.ComponentModel.Description("Specifies the background color for the items that were not recently used.")]
+		public Color MenuUnusedBackground
+		{
+			get {return m_MenuUnusedBackground;}
+			set
+			{
+				if(m_MenuUnusedBackground!=value)
+				{
+					m_MenuUnusedBackground=value;
+					m_MenuUnusedBackgroundCustom=true;
+				}
+			}
+		}
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeMenuUnusedBackground()
+		{
+			return m_MenuUnusedBackgroundCustom;
+		}
+		/// <summary>
+		/// Specifies the side bar color for the items that were not recently used.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Menu Colors"),System.ComponentModel.Description("Specifies the side bar color for the items that were not recently used.")]
+		public Color MenuUnusedSide
+		{
+			get {return m_MenuUnusedSide;}
+			set
+			{
+				if(m_MenuUnusedSide!=value)
+				{
+					m_MenuUnusedSide=value;
+					m_MenuUnusedSideCustom=true;
+				}
+			}
+		}
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeMenuUnusedSide()
+		{
+			return m_MenuUnusedSideCustom;
+		}
+		/// <summary>
+		/// Specifies the target gradient side bar color for the items that were not recently used.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Menu Colors"),System.ComponentModel.Description("Specifies the target gradient side bar color for the items that were not recently used.")]
+		public Color MenuUnusedSide2
+		{
+			get {return m_MenuUnusedSide2;}
+			set
+			{
+				if(m_MenuUnusedSide2!=value)
+				{
+					m_MenuUnusedSide2=value;
+					m_MenuUnusedSide2Custom=true;
+				}
+			}
+		}
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeMenuUnusedSide2()
+		{
+			return m_MenuUnusedSide2Custom;
+		}
+		/// <summary>
+		/// Specifies the angle of the gradient fill for the menu part (left side) that is showing the images.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Menu Colors"),System.ComponentModel.Description("Specifies the angle of the gradient fill for the menu part (left side) that is showing the images."),DefaultValue(0)]
+		public int MenuUnusedSideGradientAngle
+		{
+			get {return m_MenuUnusedSideGradientAngle;}
+			set
+			{
+				if(m_MenuUnusedSideGradientAngle!=value)
+				{
+					m_MenuUnusedSideGradientAngle=value;
+				}
+			}
+		}
+		/// <summary>
+		/// Specifies the border color for focused design-time item.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Design Colors"),System.ComponentModel.Description("Specifies the border color for focused design-time item.")]
+		public Color ItemDesignTimeBorder
+		{
+			get {return m_ItemDesignTimeBorder;}
+			set
+			{
+				if(m_ItemDesignTimeBorder!=value)
+				{
+					m_ItemDesignTimeBorder=value;
+					m_ItemDesignTimeBorderCustom=true;
+				}
+			}
+		}
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeItemDesignTimeBorder()
+		{
+			return m_ItemDesignTimeBorderCustom;
+		}
+
+		/// <summary>
+		/// Gets or sets predefined color scheme. By default DotNetBar will automatically change and generate color scheme depending on system colors.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Color Scheme"),System.ComponentModel.Description("Indicates predefined color scheme. By default DotNetBar will automatically change and generate color scheme depending on system colors."),DefaultValue(ePredefinedColorScheme.AutoGenerated)]
+		public ePredefinedColorScheme PredefinedColorScheme
+		{
+			get {return m_PredefinedColorScheme;}
+			set
+			{
+				if(m_PredefinedColorScheme!=value)
+				{
+					m_PredefinedColorScheme=value;
+					this.Refresh();
+				}
+			}
+		}
+		
+		/// <summary>
+		/// Specifies the background color of the panel.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Panel Colors"),System.ComponentModel.Description("Specifies the background color of the panel.")]
+		public Color PanelBackground
+		{
+			get {return m_PanelBackground;}
+			set
+			{
+				if(m_PanelBackground!=value)
+				{
+					m_PanelBackground=value;
+					m_PanelBackgroundCustom=true;
+				}
+			}
+		}
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializePanelBackground()
+		{
+			return m_PanelBackgroundCustom;
+		}
+		/// <summary>
+		/// Specifies the target background gradient color of the panel.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Panel Colors"),System.ComponentModel.Description("Specifies the target background gradient color of the panel.")]
+		public Color PanelBackground2
+		{
+			get {return m_PanelBackground2;}
+			set
+			{
+				if(m_PanelBackground2!=value)
+				{
+					m_PanelBackground2=value;
+					m_PanelBackground2Custom=true;
+				}
+			}
+		}
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializePanelBackground2()
+		{
+			return m_PanelBackground2Custom;
+		}
+		/// <summary>
+		/// Specifies the angle of the gradient fill for the panel background.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Panel Colors"),System.ComponentModel.Description("Specifies the angle of the gradient fill for the panel background."),DefaultValue(90)]
+		public int PanelBackgroundGradientAngle
+		{
+			get {return m_PanelBackgroundGradientAngle;}
+			set
+			{
+				if(m_PanelBackgroundGradientAngle!=value)
+				{
+					m_PanelBackgroundGradientAngle=value;
+				}
+			}
+		}
+		/// <summary>
+		/// Specifies border color of the panel.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Panel Colors"),System.ComponentModel.Description("Specifies border color of the panel.")]
+		public Color PanelBorder
+		{
+			get {return m_PanelBorder;}
+			set
+			{
+				if(m_PanelBorder!=value)
+				{
+					m_PanelBorder=value;
+					m_PanelBorderCustom=true;
+				}
+			}
+		}
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializePanelBorder()
+		{
+			return m_PanelBorderCustom;
+		}
+		/// <summary>
+		/// Specifies color of the text on the panel.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Panel Colors"),System.ComponentModel.Description("Specifies color of the text on the panel.")]
+		public Color PanelText
+		{
+			get {return m_PanelText;}
+			set
+			{
+				if(m_PanelText!=value)
+				{
+					m_PanelText=value;
+					m_PanelTextCustom=true;
+				}
+			}
+		}
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializePanelText()
+		{
+			return m_PanelTextCustom;
+		}
+
+		/// <summary>
+		/// Specifies the background color of the explorer bar.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Explorer Bar Colors"),System.ComponentModel.Description("Specifies the background color of the explorer bar.")]
+		public Color ExplorerBarBackground
+		{
+			get {return m_ExplorerBarBackground;}
+			set
+			{
+				if(m_ExplorerBarBackground!=value)
+				{
+					m_ExplorerBarBackground=value;
+					m_ExplorerBarBackgroundCustom=true;
+				}
+			}
+		}
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeExplorerBarBackground()
+		{
+			return m_ExplorerBarBackgroundCustom;
+		}
+		/// <summary>
+		/// Specifies the target gradient background color of the explorer bar.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Explorer Bar Colors"),System.ComponentModel.Description("Specifies target gradient background color of the explorer bar.")]
+		public Color ExplorerBarBackground2
+		{
+			get {return m_ExplorerBarBackground2;}
+			set
+			{
+				if(m_ExplorerBarBackground2!=value)
+				{
+					m_ExplorerBarBackground2=value;
+					m_ExplorerBarBackground2Custom=true;
+				}
+			}
+		}
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeExplorerBarBackground2()
+		{
+			return m_ExplorerBarBackground2Custom;
+		}
+		/// <summary>
+		/// Specifies the angle of the gradient fill for the explorer bar background.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Explorer Bar Colors"),System.ComponentModel.Description("Specifies the angle of the gradient fill for the explorer bar background."),DefaultValue(90)]
+		public int ExplorerBarBackgroundGradientAngle
+		{
+			get {return m_ExplorerBarBackgroundGradientAngle;}
+			set
+			{
+				if(m_ExplorerBarBackgroundGradientAngle!=value)
+				{
+					m_ExplorerBarBackgroundGradientAngle=value;
+				}
+			}
+		}
+
+        /// <summary>
+        /// Specifies the foreground color of MDI System Item buttons.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), System.ComponentModel.Category("Item Colors"), System.ComponentModel.Description("Specifies the foreground color of MDI System Item buttons.")]
+        public Color MdiSystemItemForeground
+        {
+            get { return m_MdiSystemItemForeground; }
+            set
+            {
+                m_MdiSystemItemForeground = value;
+            }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeMdiSystemItemForeground()
+        {
+            return !m_MdiSystemItemForeground.IsEmpty;
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetMdiSystemItemForeground()
+        {
+            MdiSystemItemForeground = Color.Empty;
+        }
+
+
+        /// <summary>
+        /// Specifies the background color of the Splitter.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), System.ComponentModel.Category("Splitter Colors"), System.ComponentModel.Description("Specifies the background color of the Splitter.")]
+        public Color SplitterBackground
+        {
+            get { return m_SplitterBackground; }
+            set
+            {
+                if (m_SplitterBackground != value)
+                {
+                    m_SplitterBackground = value;
+                    m_SplitterBackgroundCustom = true;
+                }
+            }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeSplitterBackground()
+        {
+            return m_SplitterBackgroundCustom;
+        }
+        /// <summary>
+        /// Specifies the target background gradient color of the Splitter.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), System.ComponentModel.Category("Splitter Colors"), System.ComponentModel.Description("Specifies the target background gradient color of the Splitter.")]
+        public Color SplitterBackground2
+        {
+            get { return m_SplitterBackground2; }
+            set
+            {
+                if (m_SplitterBackground2 != value)
+                {
+                    m_SplitterBackground2 = value;
+                    m_SplitterBackground2Custom = true;
+                }
+            }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeSplitterBackground2()
+        {
+            return m_SplitterBackground2Custom;
+        }
+        /// <summary>
+        /// Specifies the angle of the gradient fill for the Splitter background.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), System.ComponentModel.Category("Splitter Colors"), System.ComponentModel.Description("Specifies the angle of the gradient fill for the Splitter background."), DefaultValue(90)]
+        public int SplitterBackgroundGradientAngle
+        {
+            get { return m_SplitterBackgroundGradientAngle; }
+            set
+            {
+                if (m_SplitterBackgroundGradientAngle != value)
+                {
+                    m_SplitterBackgroundGradientAngle = value;
+                }
+            }
+        }
+        /// <summary>
+        /// Specifies border color of the Splitter.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), System.ComponentModel.Category("Splitter Colors"), System.ComponentModel.Description("Specifies border color of the Splitter.")]
+        public Color SplitterBorder
+        {
+            get { return m_SplitterBorder; }
+            set
+            {
+                if (m_SplitterBorder != value)
+                {
+                    m_SplitterBorder = value;
+                    m_SplitterBorderCustom = true;
+                }
+            }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeSplitterBorder()
+        {
+            return m_SplitterBorderCustom;
+        }
+        /// <summary>
+        /// Specifies color of the text on the Splitter.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), System.ComponentModel.Category("Splitter Colors"), System.ComponentModel.Description("Specifies color of the text on the Splitter.")]
+        public Color SplitterText
+        {
+            get { return m_SplitterText; }
+            set
+            {
+                if (m_SplitterText != value)
+                {
+                    m_SplitterText = value;
+                    m_SplitterTextCustom = true;
+                }
+            }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeSplitterText()
+        {
+            return m_SplitterTextCustom;
+        }
+
+		public void Refresh()
+		{
+			this.Refresh(null,false);
+		}
+		public void ResetChangedFlag()
+		{
+			m_BarCaptionBackgroundCustom=false;
+			m_BarCaptionBackground2Custom=false;
+			m_BarStripeColorCustom=false;
+			m_BarCaptionInactiveBackgroundCustom=false;
+			m_BarCaptionInactiveBackground2Custom=false;
+			m_BarCaptionInactiveTextCustom=false;
+			m_BarCaptionTextCustom=false;
+			m_BarFloatingBorderCustom=false;
+			m_BarPopupBackgroundCustom=false;
+			m_BarPopupBorderCustom=false;
+			m_BarDockedBorderCustom=false;
+			m_BarBackgroundCustom=false;
+			m_BarBackground2Custom=false;
+			m_ItemBackgroundCustom=false;
+			m_ItemBackground2Custom=false;
+			m_ItemCheckedBackgroundCustom=false;
+			m_ItemCheckedBackground2Custom=false;
+			m_ItemCheckedBorderCustom=false;
+			m_ItemCheckedTextCustom=false;
+			m_ItemDisabledBackgroundCustom=false;
+			m_ItemDisabledTextCustom=false;
+			m_ItemExpandedShadowCustom=false;
+			m_ItemExpandedBackgroundCustom=false;
+			m_ItemExpandedBackground2Custom=false;
+			m_ItemExpandedTextCustom=false;
+			m_ItemExpandedBorderCustom=false;
+			m_ItemHotBackgroundCustom=false;
+			m_ItemHotBackground2Custom=false;
+			m_ItemHotBorderCustom=false;
+			m_ItemHotTextCustom=false;
+			m_ItemPressedBackgroundCustom=false;
+			m_ItemPressedBackground2Custom=false;
+			m_ItemPressedBorderCustom=false;
+			m_ItemPressedTextCustom=false;
+			m_ItemSeparatorCustom=false;
+			m_ItemSeparatorShadeCustom=false;
+			m_ItemTextCustom=false;
+			m_MenuBackgroundCustom=false;
+			m_MenuBackground2Custom=false;
+			m_MenuBarBackgroundCustom=false;
+			m_MenuBarBackground2Custom=false;
+			m_MenuBorderCustom=false;
+			m_MenuSideCustom=false;
+			m_MenuSide2Custom=false;
+			m_MenuUnusedBackgroundCustom=false;
+			m_MenuUnusedSideCustom=false;
+			m_MenuUnusedSide2Custom=false;
+			m_ItemDesignTimeBorderCustom=false;
+			m_CustomizeBackgroundCustom=false;
+			m_CustomizeBackground2Custom=false;
+			m_CustomizeTextCustom=false;
+			m_PanelBackgroundCustom=false;
+			m_PanelBackground2Custom=false;
+			m_PanelBorderCustom=false;
+			m_PanelTextCustom=false;
+            m_SplitterBackgroundCustom = false;
+            m_SplitterBackground2Custom = false;
+            m_SplitterBorderCustom = false;
+            m_SplitterTextCustom = false;
+			m_ExplorerBarBackgroundCustom=false;
+			m_ExplorerBarBackground2Custom=false;
+            m_MdiSystemItemForeground = Color.Empty;
+		}
+
+		[Browsable(false),DevCoBrowsable(false)]
+		public bool SchemeChanged
+		{
+			get
+			{
+                return m_BarCaptionBackgroundCustom ||
+                    m_BarCaptionBackground2Custom ||
+                    m_BarStripeColorCustom ||
+                    m_BarCaptionInactiveBackgroundCustom ||
+                    m_BarCaptionInactiveBackground2Custom ||
+                    m_BarCaptionInactiveTextCustom ||
+                    m_BarCaptionTextCustom ||
+                    m_BarFloatingBorderCustom ||
+                    m_BarPopupBackgroundCustom ||
+                    m_BarDockedBorderCustom ||
+                    m_BarPopupBorderCustom ||
+                    m_BarBackgroundCustom ||
+                    m_BarBackground2Custom ||
+                    m_ItemBackgroundCustom ||
+                    m_ItemCheckedBackgroundCustom ||
+                    m_ItemCheckedBackground2Custom ||
+                    m_ItemCheckedBorderCustom ||
+                    m_ItemCheckedTextCustom ||
+                    m_ItemDisabledBackgroundCustom ||
+                    m_ItemDisabledTextCustom ||
+                    m_ItemExpandedShadowCustom ||
+                    m_ItemExpandedBackgroundCustom ||
+                    m_ItemExpandedBackground2Custom ||
+                    m_ItemExpandedTextCustom ||
+                    m_ItemExpandedBorderCustom ||
+                    m_ItemHotBackgroundCustom ||
+                    m_ItemHotBackground2Custom ||
+                    m_ItemHotBorderCustom ||
+                    m_ItemHotTextCustom ||
+                    m_ItemPressedBackgroundCustom ||
+                    m_ItemPressedBackground2Custom ||
+                    m_ItemPressedBorderCustom ||
+                    m_ItemPressedTextCustom ||
+                    m_ItemSeparatorCustom ||
+                    m_ItemTextCustom ||
+                    m_MenuBackgroundCustom ||
+                    m_MenuBackground2Custom ||
+                    m_MenuBarBackgroundCustom ||
+                    m_MenuBarBackground2Custom ||
+                    m_MenuBorderCustom ||
+                    m_MenuSideCustom ||
+                    m_MenuSide2Custom ||
+                    m_MenuUnusedBackgroundCustom ||
+                    m_MenuUnusedSideCustom ||
+                    m_MenuUnusedSide2Custom ||
+                    m_ItemDesignTimeBorderCustom ||
+                    m_CustomizeBackgroundCustom ||
+                    m_CustomizeBackground2Custom ||
+                    m_DockSiteBackColorCustom ||
+                    m_DockSiteBackColor2Custom ||
+                    !m_MdiSystemItemForeground.IsEmpty ||
+                    (m_PredefinedColorScheme != ePredefinedColorScheme.AutoGenerated);
+			}
+		}
+
+        private Image _AutoHidePanelBackgroundImage = null;
+        /// <summary>
+        /// Indicates auto-hide panel background image if any.
+        /// </summary>
+        [DefaultValue(null), Description("Indicates auto-hide panel background image if any."), Category("Auto-Hide Panel")]
+        public Image AutoHidePanelBackgroundImage
+        {
+            get { return _AutoHidePanelBackgroundImage; }
+            set { _AutoHidePanelBackgroundImage = value; }
+        }
+        private Color _AutoHidePanelBackground = Color.Empty;
+        /// <summary>
+        /// Gets or sets the color of the auto-hide panel background.
+        /// </summary>
+        [Category("Auto-Hide Panel"), Description("Indicates color of auto-hide panel background.")]
+        public Color AutoHidePanelBackground
+        {
+            get { return _AutoHidePanelBackground; }
+            set { _AutoHidePanelBackground = value; }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeAutoHidePanelBackground()
+        {
+            return !_AutoHidePanelBackground.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetAutoHidePanelBackground()
+        {
+            this.AutoHidePanelBackground = Color.Empty;
+        }
+        private Color _AutoHidePanelBackground2 = Color.Empty;
+        /// <summary>
+        /// Gets or sets the color of the auto-hide panel background.
+        /// </summary>
+        [Category("Auto-Hide Panel"), Description("Indicates color of auto-hide panel background.")]
+        public Color AutoHidePanelBackground2
+        {
+            get { return _AutoHidePanelBackground2; }
+            set { _AutoHidePanelBackground2 = value; }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeAutoHidePanelBackground2()
+        {
+            return !_AutoHidePanelBackground2.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetAutoHidePanelBackground2()
+        {
+            this.AutoHidePanelBackground2 = Color.Empty;
+        }
+
+        private Color _AutoHideTabBackground = Color.Empty;
+        /// <summary>
+        /// Gets or sets the color of the auto-hide tab.
+        /// </summary>
+        [Category("Auto-Hide Panel"), Description("Indicates color of the auto-hide tab.")]
+        public Color AutoHideTabBackground
+        {
+            get { return _AutoHideTabBackground; }
+            set { _AutoHideTabBackground = value; }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeAutoHideTabBackground()
+        {
+            return !_AutoHideTabBackground.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetAutoHideTabBackground()
+        {
+            this.AutoHideTabBackground = Color.Empty;
+        }
+
+        private Color _AutoHideTabBackground2 = Color.Empty;
+        /// <summary>
+        /// Gets or sets the color of the auto-hide tab.
+        /// </summary>
+        [Category("Auto-Hide Panel"), Description("Indicates color of auto-hide tab.")]
+        public Color AutoHideTabBackground2
+        {
+            get { return _AutoHideTabBackground2; }
+            set { _AutoHideTabBackground2 = value; }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeAutoHideTabBackground2()
+        {
+            return !_AutoHideTabBackground2.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetAutoHideTabBackground2()
+        {
+            this.AutoHideTabBackground2 = Color.Empty;
+        }
+        private int _AutoHideTabBackgroundGradientAngle = 90;
+        /// <summary>
+        /// Gets or sets the auto-hide tab background gradient angle.
+        /// </summary>
+        [DefaultValue(90), Category("Auto-Hide Panel"), Description("Gets or sets the auto-hide tab background gradient angle.")]
+        public int AutoHideTabBackgroundGradientAngle
+        {
+            get { return _AutoHideTabBackgroundGradientAngle; }
+            set { _AutoHideTabBackgroundGradientAngle = value; }
+        }
+        private Color _AutoHideTabText = Color.Empty;
+        /// <summary>
+        /// Gets or sets the color of the auto-hide tab text.
+        /// </summary>
+        [Category("Auto-Hide Panel"), Description("Indicates color of auto-hide tab text.")]
+        public Color AutoHideTabText
+        {
+            get { return _AutoHideTabText; }
+            set { _AutoHideTabText = value; }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeAutoHideTabText()
+        {
+            return !_AutoHideTabText.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetAutoHideTabText()
+        {
+            this.AutoHideTabText = Color.Empty;
+        }
+        private Color _AutoHideTabBorder = Color.Empty;
+        /// <summary>
+        /// Gets or sets the color of the auto-hide tab border.
+        /// </summary>
+        [Category("Auto-Hide Panel"), Description("Indicates color of auto-hide tab border.")]
+        public Color AutoHideTabBorder
+        {
+            get { return _AutoHideTabBorder; }
+            set { _AutoHideTabBorder = value; }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeAutoHideTabBorder()
+        {
+            return !_AutoHideTabBorder.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetAutoHideTabBorder()
+        {
+            this.AutoHideTabBorder = Color.Empty;
+        }
+
+        private Color _AutoHideSelectedTabBackground = Color.Empty;
+        /// <summary>
+        /// Gets or sets the color of the auto-hide tab.
+        /// </summary>
+        [Category("Auto-Hide Panel"), Description("Indicates color of the auto-hide tab.")]
+        public Color AutoHideSelectedTabBackground
+        {
+            get { return _AutoHideSelectedTabBackground; }
+            set { _AutoHideSelectedTabBackground = value; }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeAutoHideSelectedTabBackground()
+        {
+            return !_AutoHideSelectedTabBackground.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetAutoHideSelectedTabBackground()
+        {
+            this.AutoHideSelectedTabBackground = Color.Empty;
+        }
+
+        private Color _AutoHideSelectedTabBackground2 = Color.Empty;
+        /// <summary>
+        /// Gets or sets the color of the auto-hide tab.
+        /// </summary>
+        [Category("Auto-Hide Panel"), Description("Indicates color of auto-hide tab.")]
+        public Color AutoHideSelectedTabBackground2
+        {
+            get { return _AutoHideSelectedTabBackground2; }
+            set { _AutoHideSelectedTabBackground2 = value; }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeAutoHideSelectedTabBackground2()
+        {
+            return !_AutoHideSelectedTabBackground2.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetAutoHideSelectedTabBackground2()
+        {
+            this.AutoHideSelectedTabBackground2 = Color.Empty;
+        }
+
+        private Color _AutoHideSelectedTabText = Color.Empty;
+        /// <summary>
+        /// Gets or sets the color of the auto-hide tab text.
+        /// </summary>
+        [Category("Auto-Hide Panel"), Description("Indicates color of auto-hide tab text.")]
+        public Color AutoHideSelectedTabText
+        {
+            get { return _AutoHideSelectedTabText; }
+            set { _AutoHideSelectedTabText = value; }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeAutoHideSelectedTabText()
+        {
+            return !_AutoHideSelectedTabText.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetAutoHideSelectedTabText()
+        {
+            this.AutoHideSelectedTabText = Color.Empty;
+        }
+
+        private Color _AutoHideSelectedTabBorder = Color.Empty;
+        /// <summary>
+        /// Gets or sets the color of the tab border.
+        /// </summary>
+        [Category("Auto-Hide Panel"), Description("Indicates color of tab border.")]
+        public Color AutoHideSelectedTabBorder
+        {
+            get { return _AutoHideSelectedTabBorder; }
+            set { _AutoHideSelectedTabBorder = value; }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeAutoHideSelectedTabBorder()
+        {
+            return !_AutoHideSelectedTabBorder.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetAutoHideSelectedTabBorder()
+        {
+            this.AutoHideSelectedTabBorder = Color.Empty;
+        }
+		#endregion
+
+		#region Color Scheme Generation
+		public void Refresh(System.Drawing.Graphics graphics, bool bSystemColorEvent)
+		{
+			if(!bSystemColorEvent)
+			{
+				ResetChangedFlag();
+			}
+
+            if (m_PredefinedColorScheme == ePredefinedColorScheme.Blue2003)
+                SchemeXpBlue2003();
+            else if (m_PredefinedColorScheme == ePredefinedColorScheme.OliveGreen2003)
+                SchemeXpOliveGreen2003();
+            else if (m_PredefinedColorScheme == ePredefinedColorScheme.Silver2003)
+                SchemeXpSilver2003();
+            else if (m_PredefinedColorScheme == ePredefinedColorScheme.SystemColors)
+                GenerateScheme();
+            else
+            {
+                if (Style == eDotNetBarStyle.Office2007)
+                    SchemeOffice2007();
+                else
+                {
+                    eWinXPColorScheme xpc = BarFunctions.WinXPColorScheme;
+                    if (xpc != eWinXPColorScheme.Undetermined)
+                    {
+                        if (xpc == eWinXPColorScheme.Blue)
+                        {
+                            if (Style == eDotNetBarStyle.Office2003)
+                                SchemeXpBlue2003();
+                            else if (Style == eDotNetBarStyle.VS2005)
+                                SchemeXpBlueVS2005();
+                            else
+                                SchemeXpBlue();
+                        }
+                        else if (xpc == eWinXPColorScheme.Silver)
+                        {
+                            if (Style == eDotNetBarStyle.Office2003)
+                                SchemeXpSilver2003();
+                            else if (Style == eDotNetBarStyle.VS2005)
+                                SchemeXpSilverVS2005();
+                            else
+                                SchemeXpSilver();
+                        }
+                        else if (xpc == eWinXPColorScheme.OliveGreen)
+                        {
+                            if (Style == eDotNetBarStyle.Office2003)
+                                SchemeXpOliveGreen2003();
+                            else if (Style == eDotNetBarStyle.VS2005)
+                                SchemeXpOliveGreenVS2005();
+                            else
+                                SchemeXpOliveGreen();
+                        }
+                        else
+                            GenerateScheme();
+                    }
+                    else
+                        GenerateScheme();
+                }
+            }
+
+			bool bDisposeGraphics=false;
+			if(graphics==null)
+			{
+				IntPtr wnd=NativeFunctions.GetDesktopWindow();
+				if(wnd!=IntPtr.Zero)
+				{
+					graphics=System.Drawing.Graphics.FromHwnd(wnd);
+					bDisposeGraphics=true;
+				}
+			}
+			try
+			{
+				if(graphics!=null)
+				{
+					if(!m_BarCaptionBackground.IsSystemColor && !m_BarCaptionBackground.IsEmpty)
+						m_BarCaptionBackground=graphics.GetNearestColor(m_BarCaptionBackground);
+					if(!m_BarCaptionBackground2.IsSystemColor && !m_BarCaptionBackground2.IsEmpty)
+						m_BarCaptionBackground2=graphics.GetNearestColor(m_BarCaptionBackground2);
+					if(!m_BarStripeColor.IsSystemColor && !m_BarStripeColor.IsEmpty)
+						m_BarStripeColor=graphics.GetNearestColor(m_BarStripeColor);
+					if(!m_BarCaptionInactiveBackground.IsSystemColor && !m_BarCaptionInactiveBackground.IsEmpty)
+						m_BarCaptionInactiveBackground=graphics.GetNearestColor(m_BarCaptionInactiveBackground);
+					if(!m_BarCaptionInactiveBackground2.IsSystemColor && !m_BarCaptionInactiveBackground2.IsEmpty)
+						m_BarCaptionInactiveBackground2=graphics.GetNearestColor(m_BarCaptionInactiveBackground2);
+					if(!m_BarCaptionInactiveText.IsSystemColor && !m_BarCaptionInactiveText.IsEmpty)
+						m_BarCaptionInactiveText=graphics.GetNearestColor(m_BarCaptionInactiveText);
+					if(!m_BarCaptionText.IsSystemColor && !m_BarCaptionText.IsEmpty)
+						m_BarCaptionText=graphics.GetNearestColor(m_BarCaptionText);
+					if(!m_BarFloatingBorder.IsSystemColor && !m_BarFloatingBorder.IsEmpty)
+						m_BarFloatingBorder=graphics.GetNearestColor(m_BarFloatingBorder);
+					if(!m_BarPopupBackground.IsSystemColor && !m_BarPopupBackground.IsEmpty)
+						m_BarPopupBackground=graphics.GetNearestColor(m_BarPopupBackground);
+					if(!m_BarPopupBorder.IsSystemColor && !m_BarPopupBorder.IsEmpty)
+						m_BarPopupBorder=graphics.GetNearestColor(m_BarPopupBorder);
+					if(!m_BarDockedBorder.IsSystemColor && !m_BarDockedBorder.IsEmpty)
+						m_BarDockedBorder=graphics.GetNearestColor(m_BarDockedBorder);
+					if(!m_BarBackground.IsSystemColor && !m_BarBackground.IsEmpty)
+						m_BarBackground=graphics.GetNearestColor(m_BarBackground);
+					if(!m_BarBackground2.IsEmpty && !m_BarBackground2.IsSystemColor)
+						m_BarBackground2=graphics.GetNearestColor(m_BarBackground2);
+					if(!m_ItemBackground.IsEmpty)
+						m_ItemBackground=graphics.GetNearestColor(m_ItemBackground);
+					if(!m_ItemBackground2.IsEmpty)
+						m_ItemBackground2=graphics.GetNearestColor(m_ItemBackground2);
+					if(!m_ItemCheckedBackground.IsSystemColor)
+						m_ItemCheckedBackground=graphics.GetNearestColor(m_ItemCheckedBackground);
+					if(!m_ItemCheckedBackground2.IsEmpty && !m_ItemCheckedBackground2.IsSystemColor)
+						m_ItemCheckedBackground2=graphics.GetNearestColor(m_ItemCheckedBackground2);
+					if(!m_ItemCheckedBorder.IsSystemColor)
+						m_ItemCheckedBorder=graphics.GetNearestColor(m_ItemCheckedBorder);
+					if(!m_ItemCheckedText.IsSystemColor)
+						m_ItemCheckedText=graphics.GetNearestColor(m_ItemCheckedText);
+					if(!m_ItemDisabledBackground.IsEmpty && !m_ItemDisabledBackground.IsSystemColor)
+						m_ItemDisabledBackground=graphics.GetNearestColor(m_ItemDisabledBackground);
+					if(!m_ItemDisabledText.IsSystemColor)
+						m_ItemDisabledText=graphics.GetNearestColor(m_ItemDisabledText);
+					if(!m_ItemExpandedShadow.IsSystemColor && !m_ItemExpandedShadow.IsEmpty)
+						m_ItemExpandedShadow=graphics.GetNearestColor(m_ItemExpandedShadow);
+					if(!m_ItemExpandedBackground.IsSystemColor)
+						m_ItemExpandedBackground=graphics.GetNearestColor(m_ItemExpandedBackground);
+					if(!m_ItemExpandedText.IsSystemColor)
+						m_ItemExpandedText=graphics.GetNearestColor(m_ItemExpandedText);
+					if(!m_ItemExpandedBorder.IsSystemColor)
+						m_ItemExpandedBorder=graphics.GetNearestColor(m_ItemExpandedBorder);
+					if(!m_ItemHotBackground.IsSystemColor)
+						m_ItemHotBackground=graphics.GetNearestColor(m_ItemHotBackground);
+					if(!m_ItemHotBackground2.IsEmpty && !m_ItemHotBackground2.IsSystemColor)
+						m_ItemHotBackground2=graphics.GetNearestColor(m_ItemHotBackground2);
+					if(!m_ItemHotBorder.IsSystemColor)
+						m_ItemHotBorder=graphics.GetNearestColor(m_ItemHotBorder);
+					if(!m_ItemHotText.IsSystemColor)
+						m_ItemHotText=graphics.GetNearestColor(m_ItemHotText);
+					if(!m_ItemPressedBackground.IsSystemColor)
+						m_ItemPressedBackground=graphics.GetNearestColor(m_ItemPressedBackground);
+					if(!m_ItemPressedBackground2.IsEmpty && !m_ItemPressedBackground2.IsSystemColor)
+						m_ItemPressedBackground2=graphics.GetNearestColor(m_ItemPressedBackground2);
+					if(!m_ItemPressedBorder.IsSystemColor)
+						m_ItemPressedBorder=graphics.GetNearestColor(m_ItemPressedBorder);
+					if(!m_ItemPressedText.IsSystemColor)
+						m_ItemPressedText=graphics.GetNearestColor(m_ItemPressedText);
+					if(!m_ItemSeparator.IsSystemColor)
+						m_ItemSeparator=graphics.GetNearestColor(m_ItemSeparator);
+					if(!m_ItemSeparatorShade.IsSystemColor && !m_ItemSeparatorShade.IsEmpty)
+						m_ItemSeparatorShade=graphics.GetNearestColor(m_ItemSeparatorShade);
+					if(!m_ItemText.IsSystemColor)
+						m_ItemText=graphics.GetNearestColor(m_ItemText);
+					if(!m_MenuBackground.IsSystemColor)
+						m_MenuBackground=graphics.GetNearestColor(m_MenuBackground);
+					if(!m_MenuBarBackground.IsSystemColor)
+						m_MenuBarBackground=graphics.GetNearestColor(m_MenuBarBackground);
+					if(!m_MenuBarBackground2.IsEmpty && !m_MenuBarBackground2.IsSystemColor)
+						m_MenuBarBackground2=graphics.GetNearestColor(m_MenuBarBackground2);
+					if(!m_MenuBorder.IsSystemColor)
+						m_MenuBorder=graphics.GetNearestColor(m_MenuBorder);
+					if(!m_MenuSide.IsSystemColor)
+						m_MenuSide=graphics.GetNearestColor(m_MenuSide);
+					if(!m_MenuUnusedBackground.IsSystemColor)
+						m_MenuUnusedBackground=graphics.GetNearestColor(m_MenuUnusedBackground);
+					if(!m_MenuUnusedSide.IsSystemColor)
+						m_MenuUnusedSide=graphics.GetNearestColor(m_MenuUnusedSide);
+					if(!m_ItemDesignTimeBorder.IsSystemColor)
+						m_ItemDesignTimeBorder=graphics.GetNearestColor(m_ItemDesignTimeBorder);
+					if(!m_CustomizeBackground.IsEmpty && !m_CustomizeBackground.IsSystemColor)
+						m_CustomizeBackground=graphics.GetNearestColor(m_CustomizeBackground);
+					if(!m_CustomizeBackground2.IsEmpty && !m_CustomizeBackground2.IsSystemColor)
+						m_CustomizeBackground2=graphics.GetNearestColor(m_CustomizeBackground2);
+					if(!m_CustomizeText.IsEmpty && !m_CustomizeText.IsSystemColor)
+						m_CustomizeText=graphics.GetNearestColor(m_CustomizeText);
+				}
+			}
+			finally
+			{
+				if(bDisposeGraphics)
+					graphics.Dispose();
+			}
+		}
+		private void GenerateScheme()
+		{
+			if(m_Style==eDotNetBarStyle.Office2003 || m_Style==eDotNetBarStyle.VS2005)
+				GenerateScheme2003();
+			else
+				GenerateSchemeDefault();
+		}
+		private void GenerateSchemeDefault()
+		{
+			if(!m_BarCaptionBackgroundCustom)
+				m_BarCaptionBackground=ColorFunctions.MenuFocusBorderColor();
+			m_BarCaptionBackground2=Color.Empty;
+			if(!m_BarStripeColorCustom)
+				m_BarStripeColor=SystemColors.ControlDark;
+			if(!m_BarCaptionInactiveBackgroundCustom)
+				m_BarCaptionInactiveBackground=SystemColors.Control;
+			m_BarCaptionInactiveBackground2=Color.Empty;
+			if(!m_BarCaptionInactiveTextCustom)
+				m_BarCaptionInactiveText=SystemColors.ControlText;
+			if(!m_BarCaptionTextCustom)
+				m_BarCaptionText=SystemColors.ActiveCaptionText;
+			if(!m_BarFloatingBorderCustom)
+				m_BarFloatingBorder=ColorFunctions.MenuFocusBorderColor();
+			if(!m_BarPopupBackgroundCustom)
+				m_BarPopupBackground=SystemColors.Control;
+			if(!m_BarPopupBorderCustom)
+				m_BarPopupBorder=ColorFunctions.MenuFocusBorderColor();
+			if(!m_BarBackgroundCustom)
+				m_BarBackground=ColorFunctions.ToolMenuFocusBackColor();
+			if(!m_ItemBackgroundCustom)
+				m_ItemBackground=Color.Empty;
+			if(!m_ItemBackground2Custom)
+				m_ItemBackground2=Color.Empty;
+			if(!m_ItemCheckedBackgroundCustom)
+				m_ItemCheckedBackground=ColorFunctions.CheckBoxBackColor();
+			if(!m_ItemCheckedBorderCustom)
+				m_ItemCheckedBorder=SystemColors.Highlight;
+			if(!m_ItemCheckedTextCustom)
+				m_ItemCheckedText=SystemColors.ControlText;
+			if(!m_ItemDisabledBackgroundCustom)
+				m_ItemDisabledBackground=Color.Empty;
+			if(!m_ItemDisabledTextCustom)
+				m_ItemDisabledText=SystemColors.ControlDark;
+			if(!m_ItemExpandedShadowCustom)
+				m_ItemExpandedShadow=SystemColors.ControlDark;
+			if(!m_ItemExpandedBackgroundCustom)
+				m_ItemExpandedBackground=ColorFunctions.ToolMenuFocusBackColor();
+			if(!m_ItemExpandedTextCustom)
+				m_ItemExpandedText=SystemColors.ControlText;
+			if(!m_ItemHotBackgroundCustom)
+				m_ItemHotBackground=ColorFunctions.HoverBackColor();
+			if(!m_ItemHotBorderCustom)
+				m_ItemHotBorder=SystemColors.Highlight;
+			if(!m_ItemHotTextCustom)
+				m_ItemHotText=SystemColors.ControlText;
+			if(!m_ItemPressedBackgroundCustom)
+				m_ItemPressedBackground=ColorFunctions.PressedBackColor();
+			if(!m_ItemPressedBorderCustom)
+				m_ItemPressedBorder=SystemColors.Highlight;
+			if(!m_ItemPressedTextCustom)
+				m_ItemPressedText=SystemColors.ControlDarkDark;
+			if(!m_ItemSeparatorCustom)
+				m_ItemSeparator=SystemColors.ControlDark;
+			if(!m_ItemTextCustom)
+				m_ItemText=SystemColors.ControlText;
+			if(!m_MenuBackgroundCustom)
+				m_MenuBackground=ColorFunctions.MenuBackColor();
+			if(!m_MenuBarBackgroundCustom)
+				m_MenuBarBackground=SystemColors.Control;
+			if(!m_MenuBorderCustom)
+				m_MenuBorder=SystemColors.ControlDark;
+			if(!m_ItemExpandedBorderCustom)
+				m_ItemExpandedBorder=m_MenuBorder;
+			if(!m_MenuSideCustom)
+				m_MenuSide=ColorFunctions.ToolMenuFocusBackColor();
+			if(!m_MenuUnusedBackgroundCustom)
+				m_MenuUnusedBackground=m_MenuBackground;
+			if(!m_MenuUnusedSideCustom)
+				m_MenuUnusedSide=ColorFunctions.SideRecentlyBackColor();
+			if(!m_ItemDesignTimeBorderCustom)
+				m_ItemDesignTimeBorder=SystemColors.Highlight;
+
+			if(!m_BarBackground2Custom)
+				m_BarBackground2=Color.Empty;
+			if(!m_MenuBarBackground2Custom)
+				m_MenuBarBackground2=Color.Empty;
+			if(!m_ItemHotBackground2Custom)
+				m_ItemHotBackground2=Color.Empty;
+			if(!m_ItemPressedBackground2Custom)
+				m_ItemPressedBackground2=Color.Empty;
+			if(!m_ItemExpandedBackground2Custom)
+				m_ItemExpandedBackground2=Color.Empty;
+			if(!m_ItemCheckedBackground2Custom)
+				m_ItemCheckedBackground2=Color.Empty;
+			if(!m_MenuBackground2Custom)
+				m_MenuBackground2=Color.Empty;
+			if(!m_MenuSide2Custom)
+				m_MenuSide2=Color.Empty;
+			if(!m_MenuUnusedSide2Custom)
+				m_MenuUnusedSide2=Color.Empty;
+			if(!m_BarDockedBorderCustom)
+				m_BarDockedBorder=Color.Empty;
+			if(!m_ItemSeparatorShadeCustom)
+				m_ItemSeparatorShade=Color.Empty;
+
+			if(!m_DockSiteBackColorCustom)
+				m_DockSiteBackColor=Color.Empty;
+			if(!m_DockSiteBackColor2Custom)
+				m_DockSiteBackColor2=Color.Empty;
+
+			if(!m_CustomizeBackgroundCustom)
+				m_CustomizeBackground=Color.Empty;
+			if(!m_CustomizeBackground2Custom)
+				m_CustomizeBackground2=Color.Empty;
+			if(!m_CustomizeTextCustom)
+				m_CustomizeText=Color.Empty;
+
+			if(!m_PanelBackgroundCustom)
+				m_PanelBackground=System.Windows.Forms.ControlPaint.Dark(m_BarBackground);
+			if(!m_PanelBackground2Custom)
+				m_PanelBackground2=System.Windows.Forms.ControlPaint.DarkDark(m_BarBackground);
+			if(!m_PanelTextCustom)
+				m_PanelText=System.Windows.Forms.ControlPaint.LightLight(m_BarBackground);
+			if(!m_PanelBorderCustom)
+				m_PanelBorder=System.Windows.Forms.ControlPaint.DarkDark(m_BarBackground);
+
+            if (!m_SplitterBackgroundCustom)
+                m_SplitterBackground = System.Windows.Forms.ControlPaint.Dark(m_BarBackground);
+            if (!m_SplitterBackground2Custom)
+                m_SplitterBackground2 = System.Windows.Forms.ControlPaint.DarkDark(m_BarBackground);
+            if (!m_SplitterTextCustom)
+                m_SplitterText = System.Windows.Forms.ControlPaint.LightLight(m_BarBackground);
+            if (!m_SplitterBorderCustom)
+                m_SplitterBorder = System.Windows.Forms.ControlPaint.DarkDark(m_BarBackground);
+
+			if(!m_ExplorerBarBackgroundCustom) m_ExplorerBarBackground=m_MenuBarBackground;
+			if(!m_ExplorerBarBackground2Custom) m_ExplorerBarBackground2=m_ItemSeparator;
+
+		}
+
+		private void GenerateScheme2003()
+		{
+			if(!m_BarCaptionBackgroundCustom)
+				m_BarCaptionBackground=ColorFunctions.MenuFocusBorderColor();
+            if (!m_BarCaptionBackground2Custom)
+                m_BarCaptionBackground2 = System.Windows.Forms.ControlPaint.Light(m_BarCaptionBackground);
+			if(!m_BarStripeColorCustom)
+				m_BarStripeColor=SystemColors.ControlDark;
+			if(!m_BarCaptionInactiveBackgroundCustom)
+				m_BarCaptionInactiveBackground=SystemColors.Control;
+			m_BarCaptionInactiveBackground2=Color.Empty;
+			if(!m_BarCaptionInactiveTextCustom)
+				m_BarCaptionInactiveText=SystemColors.ControlText;
+			if(!m_BarCaptionTextCustom)
+				m_BarCaptionText=SystemColors.ActiveCaptionText;
+			if(!m_BarFloatingBorderCustom)
+				m_BarFloatingBorder=ColorFunctions.MenuFocusBorderColor();
+			if(!m_BarPopupBackgroundCustom)
+				m_BarPopupBackground=SystemColors.Control;
+			if(!m_BarPopupBorderCustom)
+				m_BarPopupBorder=ColorFunctions.MenuFocusBorderColor();
+			if(!m_BarBackgroundCustom)
+				m_BarBackground=ColorFunctions.MenuBackColor();
+			if(!m_ItemBackgroundCustom)
+				m_ItemBackground=Color.Empty;
+			if(!m_ItemBackground2Custom)
+				m_ItemBackground2=Color.Empty;
+			if(!m_ItemCheckedBackgroundCustom)
+				m_ItemCheckedBackground=ColorFunctions.CheckBoxBackColor();
+			if(!m_ItemCheckedBackground2Custom)
+				m_ItemCheckedBackground2=Color.Empty;
+			if(!m_ItemCheckedBorderCustom)
+				m_ItemCheckedBorder=SystemColors.Highlight;
+			if(!m_ItemCheckedTextCustom)
+				m_ItemCheckedText=SystemColors.ControlText;
+			if(!m_ItemDisabledBackgroundCustom)
+				m_ItemDisabledBackground=Color.Empty;
+			if(!m_ItemDisabledTextCustom)
+				m_ItemDisabledText=SystemColors.ControlDark;
+			if(!m_ItemExpandedShadowCustom)
+				m_ItemExpandedShadow=Color.Empty;
+			if(!m_ItemExpandedBackgroundCustom)
+				m_ItemExpandedBackground=ColorFunctions.ToolMenuFocusBackColor();
+			if(!m_ItemExpandedTextCustom)
+				m_ItemExpandedText=SystemColors.ControlText;
+			if(!m_ItemHotBackgroundCustom)
+				m_ItemHotBackground=ColorFunctions.HoverBackColor3();
+			if(!m_ItemHotBorderCustom)
+				m_ItemHotBorder=SystemColors.Highlight;
+			if(!m_ItemHotTextCustom)
+				m_ItemHotText=SystemColors.ControlText;
+			if(!m_ItemPressedBackgroundCustom)
+				m_ItemPressedBackground=ColorFunctions.HoverBackColor2();
+			if(!m_ItemPressedBorderCustom)
+				m_ItemPressedBorder=SystemColors.Highlight;
+			if(!m_ItemPressedTextCustom)
+				m_ItemPressedText=SystemColors.ControlDarkDark;
+			if(!m_ItemSeparatorCustom)
+				m_ItemSeparator=SystemColors.ControlDark;
+			if(!m_ItemTextCustom)
+				m_ItemText=SystemColors.ControlText;
+			if(!m_MenuBackgroundCustom)
+				m_MenuBackground=ColorFunctions.MenuBackColor();
+			if(!m_MenuBarBackgroundCustom)
+				m_MenuBarBackground=SystemColors.Control;
+			if(!m_MenuBorderCustom)
+				m_MenuBorder=SystemColors.ControlDark;
+			if(!m_ItemExpandedBorderCustom)
+				m_ItemExpandedBorder=m_MenuBorder;
+			if(!m_MenuSideCustom)
+				m_MenuSide=ColorFunctions.MenuBackColor();
+			if(!m_MenuUnusedBackgroundCustom)
+				m_MenuUnusedBackground=m_MenuBackground;
+			if(!m_MenuUnusedSideCustom)
+				m_MenuUnusedSide=ColorFunctions.SideRecentlyBackColor();
+			if(!m_ItemDesignTimeBorderCustom)
+				m_ItemDesignTimeBorder=SystemColors.Highlight;
+
+			if(!m_BarBackground2Custom)
+				m_BarBackground2=SystemColors.Control;
+			if(!m_MenuBarBackground2Custom)
+				m_MenuBarBackground2=Color.Empty;
+			if(!m_ItemHotBackground2Custom)
+				m_ItemHotBackground2=ColorFunctions.HoverBackColor2();
+			if(!m_ItemPressedBackground2Custom)
+				m_ItemPressedBackground2=ColorFunctions.HoverBackColor3();
+			if(!m_ItemExpandedBackground2Custom)
+				m_ItemExpandedBackground2=Color.Empty;
+			if(!m_ItemCheckedBackground2Custom)
+				m_ItemCheckedBackground2=Color.Empty;
+			if(!m_MenuBackground2Custom)
+				m_MenuBackground2=Color.Empty;
+			if(!m_MenuSide2Custom)
+				m_MenuSide2=ColorFunctions.ToolMenuFocusBackColor();
+			if(!m_MenuUnusedSide2Custom)
+				m_MenuUnusedSide2=Color.Empty;
+			if(!m_BarDockedBorderCustom)
+				m_BarDockedBorder=SystemColors.Control;
+			if(!m_ItemSeparatorShadeCustom)
+				m_ItemSeparatorShade=SystemColors.ControlLightLight;
+
+			if(!m_DockSiteBackColorCustom)
+				m_DockSiteBackColor=SystemColors.Control;
+			if(!m_DockSiteBackColor2Custom)
+				m_DockSiteBackColor2=ColorFunctions.MenuBackColor();
+
+			if(!m_CustomizeBackgroundCustom)
+				m_CustomizeBackground=SystemColors.ControlDark;
+			if(!m_CustomizeBackground2Custom)
+				m_CustomizeBackground2=ColorFunctions.MenuFocusBorderColor();
+			if(!m_CustomizeTextCustom)
+				m_CustomizeText=SystemColors.ControlText;
+
+			if(!m_PanelBackgroundCustom)
+				m_PanelBackground=(m_BarBackground2);
+			if(!m_PanelBackground2Custom)
+				m_PanelBackground2=System.Windows.Forms.ControlPaint.Dark(m_BarBackground2);
+			if(!m_PanelTextCustom)
+				m_PanelText=System.Windows.Forms.ControlPaint.LightLight(m_BarBackground);
+			if(!m_PanelBorderCustom)
+				m_PanelBorder=System.Windows.Forms.ControlPaint.DarkDark(m_BarBackground2);
+
+            if (!m_SplitterBackgroundCustom)
+                m_SplitterBackground = (m_BarBackground2);
+            if (!m_SplitterBackground2Custom)
+                m_SplitterBackground2 = System.Windows.Forms.ControlPaint.Dark(m_BarBackground2);
+            if (!m_SplitterTextCustom)
+                m_SplitterText = System.Windows.Forms.ControlPaint.LightLight(m_BarBackground);
+            if (!m_SplitterBorderCustom)
+                m_SplitterBorder = System.Windows.Forms.ControlPaint.DarkDark(m_BarBackground2);
+
+			if(!m_ExplorerBarBackgroundCustom) m_ExplorerBarBackground=m_MenuBarBackground;
+			if(!m_ExplorerBarBackground2Custom) m_ExplorerBarBackground2=m_ItemSeparator;
+		}
+
+		private void SchemeXpBlue()
+		{
+			if(!m_BarBackgroundCustom)
+				m_BarBackground=Color.FromArgb(239,237,222);
+			if(!m_BarStripeColorCustom)
+				m_BarStripeColor=Color.FromArgb(191,188,177);
+			if(!m_BarCaptionBackgroundCustom)
+				m_BarCaptionBackground=Color.FromArgb(172,168,153);
+			m_BarCaptionBackground2=Color.Empty;
+			if(!m_BarCaptionInactiveBackgroundCustom)
+				m_BarCaptionInactiveBackground=SystemColors.Control;
+			m_BarCaptionInactiveBackground2=Color.Empty;
+			if(!m_BarCaptionInactiveTextCustom)
+				m_BarCaptionInactiveText=SystemColors.ControlText;
+			if(!m_BarCaptionTextCustom)
+				m_BarCaptionText=Color.FromArgb(64,64,64);
+			if(!m_BarFloatingBorderCustom)
+				m_BarFloatingBorder=Color.FromArgb(172,168,153);
+			if(!m_BarPopupBackgroundCustom)
+				m_BarPopupBackground=Color.FromArgb(252,252,249);
+			if(!m_BarPopupBorderCustom)
+				m_BarPopupBorder=Color.FromArgb(138,134,122);
+			if(!m_ItemBackgroundCustom)
+				m_ItemBackground=Color.Empty;
+			if(!m_ItemBackground2Custom)
+				m_ItemBackground2=Color.Empty;
+			if(!m_ItemCheckedBackgroundCustom)
+				m_ItemCheckedBackground=Color.FromArgb(225,230,232);
+			if(!m_ItemCheckedBorderCustom)
+				m_ItemCheckedBorder=SystemColors.Highlight;
+			if(!m_ItemCheckedTextCustom)
+				m_ItemCheckedText=SystemColors.ControlText;
+			if(!m_ItemDisabledBackgroundCustom)
+				m_ItemDisabledBackground=Color.Empty;
+			if(!m_ItemDisabledTextCustom)
+				m_ItemDisabledText=SystemColors.ControlDark;
+			if(!m_ItemExpandedShadowCustom)
+				m_ItemExpandedShadow=SystemColors.ControlDark;
+			if(!m_ItemExpandedBackgroundCustom)
+				m_ItemExpandedBackground=Color.FromArgb(239,237,222);
+			if(!m_ItemExpandedTextCustom)
+				m_ItemExpandedText=SystemColors.ControlText;
+			if(!m_ItemHotBackgroundCustom)
+				m_ItemHotBackground=Color.FromArgb(193,210,238);
+			if(!m_ItemHotBorderCustom)
+				m_ItemHotBorder=SystemColors.Highlight;
+			if(!m_ItemHotTextCustom)
+				m_ItemHotText=SystemColors.ControlText;
+			if(!m_ItemPressedBackgroundCustom)
+				m_ItemPressedBackground=Color.FromArgb(152,181,226);
+			if(!m_ItemPressedBorderCustom)
+				m_ItemPressedBorder=SystemColors.Highlight;
+			if(!m_ItemPressedTextCustom)
+				m_ItemPressedText=Color.FromArgb(73,73,73);
+			if(!m_ItemSeparatorCustom)
+				m_ItemSeparator=Color.FromArgb(197,194,184);
+			if(!m_ItemTextCustom)
+				m_ItemText=SystemColors.ControlText;
+			if(!m_MenuBackgroundCustom)
+				m_MenuBackground=Color.FromArgb(252,252,249);
+			if(!m_MenuBarBackgroundCustom)
+				m_MenuBarBackground=SystemColors.Control;
+			if(!m_MenuBorderCustom)
+				m_MenuBorder=SystemColors.ControlDark;
+			if(!m_ItemExpandedBorderCustom)
+				m_ItemExpandedBorder=m_MenuBorder;
+			if(!m_MenuSideCustom)
+				m_MenuSide=Color.FromArgb(239,237,222);
+			if(!m_MenuUnusedBackgroundCustom)
+				m_MenuUnusedBackground=m_MenuBackground;
+			if(!m_MenuUnusedSideCustom)
+				m_MenuUnusedSide=Color.FromArgb(230,227,210);
+			if(!m_ItemDesignTimeBorderCustom)
+				m_ItemDesignTimeBorder=SystemColors.Highlight;
+
+			if(!m_BarBackground2Custom)
+				m_BarBackground2=Color.Empty;
+			if(!m_MenuBarBackground2Custom)
+				m_MenuBarBackground2=Color.Empty;
+			if(!m_ItemHotBackground2Custom)
+				m_ItemHotBackground2=Color.Empty;
+			if(!m_ItemPressedBackground2Custom)
+				m_ItemPressedBackground2=Color.Empty;
+			if(!m_ItemExpandedBackground2Custom)
+				m_ItemExpandedBackground2=Color.Empty;
+			if(!m_ItemCheckedBackground2Custom)
+				m_ItemCheckedBackground2=Color.Empty;
+			if(!m_MenuBackground2Custom)
+				m_MenuBackground2=Color.Empty;
+			if(!m_MenuSide2Custom)
+                m_MenuSide2=Color.Empty;
+			if(!m_MenuUnusedSide2Custom)
+				m_MenuUnusedSide2=Color.Empty;
+			if(!m_BarDockedBorderCustom)
+				m_BarDockedBorder=Color.Empty;
+			if(!m_ItemSeparatorShadeCustom)
+				m_ItemSeparatorShade=Color.Empty;
+
+			if(!m_DockSiteBackColorCustom)
+				m_DockSiteBackColor=Color.Empty;
+			if(!m_DockSiteBackColor2Custom)
+				m_DockSiteBackColor2=Color.Empty;
+
+			if(!m_CustomizeBackgroundCustom)
+				m_CustomizeBackground=Color.Empty;
+			if(!m_CustomizeBackground2Custom)
+				m_CustomizeBackground2=Color.Empty;
+			if(!m_CustomizeTextCustom)
+				m_CustomizeText=Color.Empty;
+
+			if(!m_PanelBackgroundCustom)
+				m_PanelBackground=Color.FromArgb(89,135,214);
+			if(!m_PanelBackground2Custom)
+				m_PanelBackground2=Color.FromArgb(3,56,148);
+			if(!m_PanelTextCustom)
+				m_PanelText=Color.White;
+			if(!m_PanelBorderCustom)
+				m_PanelBorder=Color.FromArgb(0,45,150);
+
+            if (!m_SplitterBackgroundCustom)
+                m_SplitterBackground = Color.FromArgb(89, 135, 214);
+            if (!m_SplitterBackground2Custom)
+                m_SplitterBackground2 = Color.FromArgb(3, 56, 148);
+            if (!m_SplitterTextCustom)
+                m_SplitterText = Color.White;
+            if (!m_SplitterBorderCustom)
+                m_SplitterBorder = Color.FromArgb(0, 45, 150);
+
+			if(!m_ExplorerBarBackgroundCustom) m_ExplorerBarBackground=Color.FromArgb(123,162,231);
+			if(!m_ExplorerBarBackground2Custom) m_ExplorerBarBackground2=Color.FromArgb(99,117,214);
+		}
+		private void SchemeXpOliveGreen()
+		{
+			if(!m_BarBackgroundCustom)
+				m_BarBackground=Color.FromArgb(239,237,222);
+			if(!m_BarStripeColorCustom)
+				m_BarStripeColor=Color.FromArgb(191,188,177);
+			if(!m_BarCaptionBackgroundCustom)
+				m_BarCaptionBackground=Color.FromArgb(153,153,153);
+			m_BarCaptionBackground2=Color.Empty;
+			if(!m_BarCaptionInactiveBackgroundCustom)
+				m_BarCaptionInactiveBackground=SystemColors.Control;
+			m_BarCaptionInactiveBackground2=Color.Empty;
+			if(!m_BarCaptionInactiveTextCustom)
+				m_BarCaptionInactiveText=SystemColors.ControlText;
+			if(!m_BarCaptionTextCustom)
+				m_BarCaptionText=Color.FromArgb(64,64,64);
+			if(!m_BarFloatingBorderCustom)
+				m_BarFloatingBorder=Color.FromArgb(153,153,153);
+			if(!m_BarPopupBackgroundCustom)
+				m_BarPopupBackground=Color.FromArgb(252,252,249);
+			if(!m_BarPopupBorderCustom)
+				m_BarPopupBorder=Color.FromArgb(138,134,122);
+			if(!m_ItemBackgroundCustom)
+				m_ItemBackground=Color.Empty;
+			if(!m_ItemBackground2Custom)
+				m_ItemBackground2=Color.Empty;
+			if(!m_ItemCheckedBackgroundCustom)
+				m_ItemCheckedBackground=Color.FromArgb(234,235,223);
+			if(!m_ItemCheckedBorderCustom)
+				m_ItemCheckedBorder=SystemColors.Highlight;
+			if(!m_ItemCheckedTextCustom)
+				m_ItemCheckedText=SystemColors.ControlText;
+			if(!m_ItemDisabledBackgroundCustom)
+				m_ItemDisabledBackground=Color.Empty;
+			if(!m_ItemDisabledTextCustom)
+				m_ItemDisabledText=SystemColors.ControlDark;
+			if(!m_ItemExpandedShadowCustom)
+				m_ItemExpandedShadow=SystemColors.ControlDark;
+			if(!m_ItemExpandedBackgroundCustom)
+				m_ItemExpandedBackground=Color.FromArgb(239,237,222);
+			if(!m_ItemExpandedTextCustom)
+				m_ItemExpandedText=SystemColors.ControlText;
+			if(!m_ItemHotBackgroundCustom)
+				m_ItemHotBackground=Color.FromArgb(206,209,195);
+			if(!m_ItemHotBorderCustom)
+				m_ItemHotBorder=SystemColors.Highlight;
+			if(!m_ItemHotTextCustom)
+				m_ItemHotText=SystemColors.ControlText;
+			if(!m_ItemPressedBackgroundCustom)
+				m_ItemPressedBackground=Color.FromArgb(201,208,184);
+			if(!m_ItemPressedBorderCustom)
+				m_ItemPressedBorder=SystemColors.Highlight;
+			if(!m_ItemPressedTextCustom)
+				m_ItemPressedText=Color.FromArgb(102,102,102);
+			if(!m_ItemSeparatorCustom)
+				m_ItemSeparator=Color.FromArgb(197,194,184);
+			if(!m_ItemTextCustom)
+				m_ItemText=SystemColors.ControlText;
+			if(!m_MenuBackgroundCustom)
+				m_MenuBackground=Color.FromArgb(252,252,249);
+			if(!m_MenuBarBackgroundCustom)
+				m_MenuBarBackground=SystemColors.Control;
+			if(!m_MenuBorderCustom)
+				m_MenuBorder=SystemColors.ControlDark;
+			if(!m_ItemExpandedBorderCustom)
+				m_ItemExpandedBorder=m_MenuBorder;
+			if(!m_MenuSideCustom)
+				m_MenuSide=Color.FromArgb(239,237,222);
+			if(!m_MenuUnusedBackgroundCustom)
+				m_MenuUnusedBackground=m_MenuBackground;
+			if(!m_MenuUnusedSideCustom)
+				m_MenuUnusedSide=Color.FromArgb(230,227,210);
+			if(!m_ItemDesignTimeBorderCustom)
+				m_ItemDesignTimeBorder=SystemColors.Highlight;
+
+			if(!m_BarBackground2Custom)
+				m_BarBackground2=Color.Empty;
+			if(!m_MenuBarBackground2Custom)
+				m_MenuBarBackground2=Color.Empty;
+			if(!m_ItemHotBackground2Custom)
+				m_ItemHotBackground2=Color.Empty;
+			if(!m_ItemPressedBackground2Custom)
+				m_ItemPressedBackground2=Color.Empty;
+			if(!m_ItemExpandedBackground2Custom)
+				m_ItemExpandedBackground2=Color.Empty;
+			if(!m_ItemCheckedBackground2Custom)
+				m_ItemCheckedBackground2=Color.Empty;
+			if(!m_MenuBackground2Custom)
+				m_MenuBackground2=Color.Empty;
+			if(!m_MenuSide2Custom)
+				m_MenuSide2=Color.Empty;
+			if(!m_MenuUnusedSide2Custom)
+				m_MenuUnusedSide2=Color.Empty;
+			if(!m_BarDockedBorderCustom)
+				m_BarDockedBorder=Color.Empty;
+			if(!m_ItemSeparatorShadeCustom)
+				m_ItemSeparatorShade=Color.Empty;
+
+			if(!m_DockSiteBackColorCustom)
+				m_DockSiteBackColor=Color.Empty;
+			if(!m_DockSiteBackColor2Custom)
+				m_DockSiteBackColor2=Color.Empty;
+
+			if(!m_CustomizeBackgroundCustom)
+				m_CustomizeBackground=Color.Empty;
+			if(!m_CustomizeBackground2Custom)
+				m_CustomizeBackground2=Color.Empty;
+			if(!m_CustomizeTextCustom)
+				m_CustomizeText=Color.Empty;
+
+			if(!m_PanelBackgroundCustom)
+				m_PanelBackground=Color.FromArgb(175,192,130);
+			if(!m_PanelBackground2Custom)
+				m_PanelBackground2=Color.FromArgb(99,122,68);
+			if(!m_PanelTextCustom)
+				m_PanelText=Color.White;
+			if(!m_PanelBorderCustom)
+				m_PanelBorder=Color.FromArgb(96,128,88);
+
+            if (!m_SplitterBackgroundCustom)
+                m_SplitterBackground = Color.FromArgb(175, 192, 130);
+            if (!m_SplitterBackground2Custom)
+                m_SplitterBackground2 = Color.FromArgb(99, 122, 68);
+            if (!m_SplitterTextCustom)
+                m_SplitterText = Color.White;
+            if (!m_SplitterBorderCustom)
+                m_SplitterBorder = Color.FromArgb(96, 128, 88);
+
+			if(!m_ExplorerBarBackgroundCustom) m_ExplorerBarBackground=Color.FromArgb(204,217,173);
+			if(!m_ExplorerBarBackground2Custom) m_ExplorerBarBackground2=Color.FromArgb(165,189,132);
+		}
+		private void SchemeXpSilver()
+		{
+			if(!m_BarBackgroundCustom)
+				m_BarBackground=Color.FromArgb(229,228,232);
+			if(!m_BarStripeColorCustom)
+				m_BarStripeColor=Color.FromArgb(179,179,182);
+			if(!m_BarCaptionBackgroundCustom)
+				m_BarCaptionBackground=Color.FromArgb(157,157,161);
+			m_BarCaptionBackground2=Color.Empty;
+			if(!m_BarCaptionInactiveBackgroundCustom)
+				m_BarCaptionInactiveBackground=SystemColors.Control;
+			m_BarCaptionInactiveBackground2=Color.Empty;
+			if(!m_BarCaptionInactiveTextCustom)
+				m_BarCaptionInactiveText=SystemColors.ControlText;
+			if(!m_BarCaptionTextCustom)
+				m_BarCaptionText=Color.FromArgb(53,53,53);
+			if(!m_BarFloatingBorderCustom)
+				m_BarFloatingBorder=Color.FromArgb(157,157,161);
+			if(!m_BarPopupBackgroundCustom)
+				m_BarPopupBackground=Color.FromArgb(251,250,251);
+			if(!m_BarPopupBorderCustom)
+				m_BarPopupBorder=Color.FromArgb(126,126,129);
+			if(!m_ItemBackgroundCustom)
+				m_ItemBackground=Color.Empty;
+			if(!m_ItemBackground2Custom)
+				m_ItemBackground2=Color.Empty;
+			if(!m_ItemCheckedBackgroundCustom)
+				m_ItemCheckedBackground=Color.FromArgb(233,234,237);
+			if(!m_ItemCheckedBorderCustom)
+				m_ItemCheckedBorder=SystemColors.Highlight;
+			if(!m_ItemCheckedTextCustom)
+				m_ItemCheckedText=SystemColors.ControlText;
+			if(!m_ItemDisabledBackgroundCustom)
+				m_ItemDisabledBackground=Color.Empty;
+			if(!m_ItemDisabledTextCustom)
+				m_ItemDisabledText=SystemColors.ControlDark;
+			if(!m_ItemExpandedShadowCustom)
+				m_ItemExpandedShadow=SystemColors.ControlDark;
+			if(!m_ItemExpandedBackgroundCustom)
+				m_ItemExpandedBackground=Color.FromArgb(229,228,232);
+			if(!m_ItemExpandedTextCustom)
+				m_ItemExpandedText=SystemColors.ControlText;
+			if(!m_ItemHotBackgroundCustom)
+				m_ItemHotBackground=Color.FromArgb(199,199,202);
+			if(!m_ItemHotBorderCustom)
+				m_ItemHotBorder=Color.FromArgb(169,171,181);
+			if(!m_ItemHotTextCustom)
+				m_ItemHotText=SystemColors.ControlText;
+			if(!m_ItemPressedBackgroundCustom)
+				m_ItemPressedBackground=Color.FromArgb(210,211,216);
+			if(!m_ItemPressedBorderCustom)
+				m_ItemPressedBorder=SystemColors.Highlight;
+			if(!m_ItemPressedTextCustom)
+				m_ItemPressedText=SystemColors.ControlText;
+			if(!m_ItemSeparatorCustom)
+				m_ItemSeparator=Color.FromArgb(186,186,189);
+			if(!m_ItemTextCustom)
+				m_ItemText=SystemColors.ControlText;
+			if(!m_MenuBackgroundCustom)
+				m_MenuBackground=Color.FromArgb(251,250,251);
+			if(!m_MenuBarBackgroundCustom)
+				m_MenuBarBackground=SystemColors.Control;
+			if(!m_MenuBorderCustom)
+				m_MenuBorder=SystemColors.ControlDark;
+			if(!m_ItemExpandedBorderCustom)
+				m_ItemExpandedBorder=m_MenuBorder;
+			if(!m_MenuSideCustom)
+				m_MenuSide=Color.FromArgb(229,228,232);
+			if(!m_MenuUnusedBackgroundCustom)
+				m_MenuUnusedBackground=m_MenuBackground;
+			if(!m_MenuUnusedSideCustom)
+				m_MenuUnusedSide=Color.FromArgb(217,216,220);
+			if(!m_ItemDesignTimeBorderCustom)
+				m_ItemDesignTimeBorder=SystemColors.Highlight;
+
+			if(!m_BarBackground2Custom)
+				m_BarBackground2=Color.Empty;
+			if(!m_MenuBarBackground2Custom)
+				m_MenuBarBackground2=Color.Empty;
+			if(!m_ItemHotBackground2Custom)
+				m_ItemHotBackground2=Color.Empty;
+			if(!m_ItemPressedBackground2Custom)
+				m_ItemPressedBackground2=Color.Empty;
+			if(!m_ItemExpandedBackground2Custom)
+				m_ItemExpandedBackground2=Color.Empty;
+			if(!m_ItemCheckedBackground2Custom)
+				m_ItemCheckedBackground2=Color.Empty;
+			if(!m_MenuBackground2Custom)
+				m_MenuBackground2=Color.Empty;
+			if(!m_MenuSide2Custom)
+				m_MenuSide2=Color.Empty;
+			if(!m_MenuUnusedSide2Custom)
+				m_MenuUnusedSide2=Color.Empty;
+			if(!m_BarDockedBorderCustom)
+				m_BarDockedBorder=Color.Empty;
+			if(!m_ItemSeparatorShadeCustom)
+				m_ItemSeparatorShade=Color.Empty;
+
+			if(!m_DockSiteBackColorCustom)
+				m_DockSiteBackColor=Color.Empty;
+			if(!m_DockSiteBackColor2Custom)
+				m_DockSiteBackColor2=Color.Empty;
+
+			if(!m_CustomizeBackgroundCustom)
+				m_CustomizeBackground=Color.Empty;
+			if(!m_CustomizeBackground2Custom)
+				m_CustomizeBackground2=Color.Empty;
+			if(!m_CustomizeTextCustom)
+				m_CustomizeText=Color.Empty;
+
+			if(!m_PanelBackgroundCustom)
+				m_PanelBackground=Color.FromArgb(168,167,191);
+			if(!m_PanelBackground2Custom)
+				m_PanelBackground2=Color.FromArgb(112,111,145);
+			if(!m_PanelTextCustom)
+				m_PanelText=Color.White;
+			if(!m_PanelBorderCustom)
+				m_PanelBorder=Color.FromArgb(124,124,148);
+
+            if (!m_SplitterBackgroundCustom)
+                m_SplitterBackground = Color.FromArgb(168, 167, 191);
+            if (!m_SplitterBackground2Custom)
+                m_SplitterBackground2 = Color.FromArgb(112, 111, 145);
+            if (!m_SplitterTextCustom)
+                m_SplitterText = Color.White;
+            if (!m_SplitterBorderCustom)
+                m_SplitterBorder = Color.FromArgb(124, 124, 148);
+
+			if(!m_ExplorerBarBackgroundCustom) m_ExplorerBarBackground=Color.FromArgb(196,200,212);
+			if(!m_ExplorerBarBackground2Custom) m_ExplorerBarBackground2=Color.FromArgb(177,179,200);
+		}
+
+		private void SchemeXpBlue2003()
+		{
+			if(!m_BarBackgroundCustom)
+				m_BarBackground=Color.FromArgb(223,237,254);
+			if(!m_BarBackground2Custom)
+				m_BarBackground2=Color.FromArgb(142,179,231);
+			if(!m_BarStripeColorCustom)
+				m_BarStripeColor=Color.FromArgb(39,65,118);
+            if (!m_BarCaptionBackgroundCustom)
+                m_BarCaptionBackground = GetColor(0x6690E0);
+            if (!m_BarCaptionBackground2Custom)
+                m_BarCaptionBackground2 = Color.FromArgb(42, 102, 201);
+			if(!m_BarCaptionInactiveBackgroundCustom)
+                m_BarCaptionInactiveBackground = GetColor(0x6699FF);
+            if (!m_BarCaptionInactiveBackground2Custom)
+                m_BarCaptionInactiveBackground2 = GetColor(0x557BC2);
+			if(!m_BarCaptionInactiveTextCustom)
+				m_BarCaptionInactiveText=Color.White;
+			if(!m_BarCaptionTextCustom)
+				m_BarCaptionText=Color.White;
+			if(!m_BarFloatingBorderCustom)
+				m_BarFloatingBorder=Color.FromArgb(42,102,201);
+			if(!m_BarPopupBackgroundCustom)
+				m_BarPopupBackground=Color.FromArgb(246,246,246);
+			if(!m_BarPopupBorderCustom)
+				m_BarPopupBorder=Color.FromArgb(0,45,150);
+			if(!m_ItemBackgroundCustom)
+				m_ItemBackground=Color.Empty;
+			if(!m_ItemBackground2Custom)
+				m_ItemBackground2=Color.Empty;
+			if(!m_ItemCheckedBackgroundCustom)
+				m_ItemCheckedBackground=Color.FromArgb(255,213,140);
+			if(!m_ItemCheckedBackground2Custom)
+				m_ItemCheckedBackground2=Color.FromArgb(255,173,85);
+			if(!m_ItemCheckedBorderCustom)
+				m_ItemCheckedBorder=Color.FromArgb(0,0,128);
+			if(!m_ItemCheckedTextCustom)
+				m_ItemCheckedText=SystemColors.ControlText;
+			if(!m_ItemDisabledBackgroundCustom)
+				m_ItemDisabledBackground=Color.Empty;
+			if(!m_ItemDisabledTextCustom)
+				m_ItemDisabledText=Color.FromArgb(141,141,141);
+			if(!m_ItemExpandedShadowCustom)
+				m_ItemExpandedShadow=Color.Empty;
+			if(!m_ItemExpandedBackgroundCustom)
+				m_ItemExpandedBackground=Color.FromArgb(227,239,255);
+			if(!m_ItemExpandedBackground2Custom)
+				m_ItemExpandedBackground2=Color.FromArgb(147,181,231);
+			if(!m_ItemExpandedTextCustom)
+				m_ItemExpandedText=SystemColors.ControlText;
+			if(!m_ItemHotBackgroundCustom)
+				m_ItemHotBackground=Color.FromArgb(255,244,204);
+			if(!m_ItemHotBackground2Custom)
+				m_ItemHotBackground2=Color.FromArgb(255,208,145);
+			if(!m_ItemHotBorderCustom)
+				m_ItemHotBorder=Color.FromArgb(0,0,128);
+			if(!m_ItemHotTextCustom)
+				m_ItemHotText=SystemColors.ControlText;
+			if(!m_ItemPressedBackgroundCustom)
+				m_ItemPressedBackground=Color.FromArgb(254,142,75);
+			if(!m_ItemPressedBackground2Custom)
+				m_ItemPressedBackground2=Color.FromArgb(255,207,139);
+			if(!m_ItemPressedBorderCustom)
+				m_ItemPressedBorder=Color.FromArgb(0,0,128);
+			if(!m_ItemPressedTextCustom)
+				m_ItemPressedText=SystemColors.ControlText;
+			if(!m_ItemSeparatorCustom)
+				m_ItemSeparator=Color.FromArgb(106,140,203);
+			if(!m_ItemSeparatorShadeCustom)
+				m_ItemSeparatorShade=Color.FromArgb(241,249,255);
+			if(!m_ItemTextCustom)
+				m_ItemText=SystemColors.ControlText;
+			if(!m_MenuBackgroundCustom)
+				m_MenuBackground=Color.FromArgb(246,246,246);
+			if(!m_MenuBackground2Custom)
+				m_MenuBackground2=Color.Empty;// Color.FromArgb(246,246,246);
+			if(!m_MenuBarBackgroundCustom)
+				m_MenuBarBackground=Color.FromArgb(158,190,245);
+			if(!m_MenuBorderCustom)
+				m_MenuBorder=Color.FromArgb(0,45,150);
+			if(!m_ItemExpandedBorderCustom)
+				m_ItemExpandedBorder=m_MenuBorder;
+			if(!m_MenuSideCustom)
+				m_MenuSide=Color.FromArgb(227,239,255);
+			if(!m_MenuSide2Custom)
+				m_MenuSide2=Color.FromArgb(135,173,228);
+			if(!m_MenuUnusedBackgroundCustom)
+				m_MenuUnusedBackground=m_MenuBackground;
+			if(!m_MenuUnusedSideCustom)
+				m_MenuUnusedSide=Color.FromArgb(203,221,246);
+			if(!m_MenuUnusedSide2Custom)
+				m_MenuUnusedSide2=Color.FromArgb(121,161,220);
+			if(!m_ItemDesignTimeBorderCustom)
+				m_ItemDesignTimeBorder=Color.FromArgb(0,0,128);
+			if(!m_BarDockedBorderCustom)
+				m_BarDockedBorder=Color.FromArgb(59,97,156);
+
+			if(!m_DockSiteBackColorCustom)
+				m_DockSiteBackColor=Color.FromArgb(158,190,245);
+			if(!m_DockSiteBackColor2Custom)
+				m_DockSiteBackColor2=Color.FromArgb(195,218,249);
+
+			if(!m_CustomizeBackgroundCustom)
+				m_CustomizeBackground=Color.FromArgb(117,166,241);
+			if(!m_CustomizeBackground2Custom)
+				m_CustomizeBackground2=Color.FromArgb(0,53,145);
+			if(!m_CustomizeTextCustom)
+				m_CustomizeText=SystemColors.ControlText;
+
+			if(!m_PanelBackgroundCustom)
+				m_PanelBackground=Color.FromArgb(89,135,214);
+			if(!m_PanelBackground2Custom)
+				m_PanelBackground2=Color.FromArgb(3,56,148);
+			if(!m_PanelTextCustom)
+				m_PanelText=Color.White;
+			if(!m_PanelBorderCustom)
+				m_PanelBorder=Color.FromArgb(0,45,150);
+
+
+            if (!m_SplitterBackgroundCustom)
+                m_SplitterBackground = Color.FromArgb(89, 135, 214);
+            if (!m_SplitterBackground2Custom)
+                m_SplitterBackground2 = Color.FromArgb(3, 56, 148);
+            if (!m_SplitterTextCustom)
+                m_SplitterText = Color.White;
+            if (!m_SplitterBorderCustom)
+                m_SplitterBorder = Color.FromArgb(0, 45, 150);
+
+			if(!m_ExplorerBarBackgroundCustom) m_ExplorerBarBackground=Color.FromArgb(123,162,231);
+			if(!m_ExplorerBarBackground2Custom) m_ExplorerBarBackground2=Color.FromArgb(99,117,214);
+		}
+
+		private void SchemeXpOliveGreen2003()
+		{
+			if(!m_BarBackgroundCustom)
+				m_BarBackground=Color.FromArgb(244,247,222);
+			if(!m_BarBackground2Custom)
+				m_BarBackground2=Color.FromArgb(183,198,145);
+			if(!m_BarStripeColorCustom)
+				m_BarStripeColor=Color.FromArgb(81,94,51);
+			if(!m_BarCaptionBackgroundCustom)
+                m_BarCaptionBackground = Color.FromArgb(183, 198, 145); //Color.FromArgb(116, 134, 94);
+            if (!m_BarCaptionBackground2Custom)
+                m_BarCaptionBackground2 = Color.FromArgb(116, 134, 94);
+			if(!m_BarCaptionInactiveBackgroundCustom)
+                m_BarCaptionInactiveBackground = GetColor(0xD1DBB6); // Color.FromArgb(183, 198, 145);
+            if (!m_BarCaptionInactiveBackground2Custom)
+                m_BarCaptionInactiveBackground2 = Color.FromArgb(116, 134, 94);
+			if(!m_BarCaptionInactiveTextCustom)
+				m_BarCaptionInactiveText=Color.White;
+			if(!m_BarCaptionTextCustom)
+				m_BarCaptionText=Color.White;
+			if(!m_BarFloatingBorderCustom)
+				m_BarFloatingBorder=Color.FromArgb(116,134,94);
+			if(!m_BarPopupBackgroundCustom)
+				m_BarPopupBackground=Color.FromArgb(244,244,238);
+			if(!m_BarPopupBorderCustom)
+				m_BarPopupBorder=Color.FromArgb(117,141,94);
+			if(!m_ItemBackgroundCustom)
+				m_ItemBackground=Color.Empty;
+			if(!m_ItemBackground2Custom)
+				m_ItemBackground2=Color.Empty;
+			if(!m_ItemCheckedBackgroundCustom)
+				m_ItemCheckedBackground=Color.FromArgb(255,213,140);
+			if(!m_ItemCheckedBackground2Custom)
+				m_ItemCheckedBackground2=Color.FromArgb(255,173,85);
+			if(!m_ItemCheckedBorderCustom)
+				m_ItemCheckedBorder=Color.FromArgb(63,93,56);
+			if(!m_ItemCheckedTextCustom)
+				m_ItemCheckedText=SystemColors.ControlText;
+			if(!m_ItemDisabledBackgroundCustom)
+				m_ItemDisabledBackground=Color.Empty;
+			if(!m_ItemDisabledTextCustom)
+				m_ItemDisabledText=Color.FromArgb(141,141,141);
+			if(!m_ItemExpandedShadowCustom)
+				m_ItemExpandedShadow=Color.Empty;
+			if(!m_ItemExpandedBackgroundCustom)
+				m_ItemExpandedBackground=Color.FromArgb(236,240,213);
+			if(!m_ItemExpandedBackground2Custom)
+				m_ItemExpandedBackground2=Color.FromArgb(194,206,159);
+			if(!m_ItemExpandedTextCustom)
+				m_ItemExpandedText=SystemColors.ControlText;
+			if(!m_ItemHotBackgroundCustom)
+				m_ItemHotBackground=Color.FromArgb(255,244,204);
+			if(!m_ItemHotBackground2Custom)
+				m_ItemHotBackground2=Color.FromArgb(255,208,145);
+			if(!m_ItemHotBorderCustom)
+				m_ItemHotBorder=Color.FromArgb(63,93,56);
+			if(!m_ItemHotTextCustom)
+				m_ItemHotText=SystemColors.ControlText;
+			if(!m_ItemPressedBackgroundCustom)
+				m_ItemPressedBackground=Color.FromArgb(254,142,75);
+			if(!m_ItemPressedBackground2Custom)
+				m_ItemPressedBackground2=Color.FromArgb(255,207,139);
+			if(!m_ItemPressedBorderCustom)
+				m_ItemPressedBorder=Color.FromArgb(63,93,56);
+			if(!m_ItemPressedTextCustom)
+				m_ItemPressedText=SystemColors.ControlText;
+			if(!m_ItemSeparatorCustom)
+				m_ItemSeparator=Color.FromArgb(96,128,88);
+			if(!m_ItemSeparatorShadeCustom)
+				m_ItemSeparatorShade=Color.FromArgb(244,247,222);
+			if(!m_ItemTextCustom)
+				m_ItemText=SystemColors.ControlText;
+			if(!m_MenuBackgroundCustom)
+				m_MenuBackground=Color.FromArgb(244,244,238);
+			if(!m_MenuBackground2Custom)
+				m_MenuBackground2=Color.Empty;
+			if(!m_MenuBarBackgroundCustom)
+				m_MenuBarBackground=Color.FromArgb(217,217,168);
+			if(!m_MenuBorderCustom)
+				m_MenuBorder=Color.FromArgb(117,141,94);
+			if(!m_ItemExpandedBorderCustom)
+				m_ItemExpandedBorder=m_MenuBorder;
+			if(!m_MenuSideCustom)
+				m_MenuSide=Color.FromArgb(255,255,237);
+			if(!m_MenuSide2Custom)
+				m_MenuSide2=Color.FromArgb(184,199,146);
+			if(!m_MenuUnusedBackgroundCustom)
+				m_MenuUnusedBackground=m_MenuBackground;
+			if(!m_MenuUnusedSideCustom)
+				m_MenuUnusedSide=Color.FromArgb(230,230,239);
+			if(!m_MenuUnusedSide2Custom)
+				m_MenuUnusedSide2=Color.FromArgb(164,180,120);
+			if(!m_ItemDesignTimeBorderCustom)
+				m_ItemDesignTimeBorder=Color.FromArgb(63,93,56);
+			if(!m_BarDockedBorderCustom)
+				m_BarDockedBorder=Color.FromArgb(96,128,88);
+
+			if(!m_DockSiteBackColorCustom)
+				m_DockSiteBackColor=Color.FromArgb(217,217,167);
+			if(!m_DockSiteBackColor2Custom)
+				m_DockSiteBackColor2=Color.FromArgb(242,240,228);
+
+			if(!m_CustomizeBackgroundCustom)
+				m_CustomizeBackground=Color.FromArgb(176,194,140);
+			if(!m_CustomizeBackground2Custom)
+				m_CustomizeBackground2=Color.FromArgb(96,119,107);
+			if(!m_CustomizeTextCustom)
+				m_CustomizeText=SystemColors.ControlText;
+
+			if(!m_PanelBackgroundCustom)
+				m_PanelBackground=Color.FromArgb(175,192,130);
+			if(!m_PanelBackground2Custom)
+				m_PanelBackground2=Color.FromArgb(99,122,68);
+			if(!m_PanelTextCustom)
+				m_PanelText=Color.White;
+			if(!m_PanelBorderCustom)
+				m_PanelBorder=Color.FromArgb(96,128,88);
+
+            if (!m_SplitterBackgroundCustom)
+                m_SplitterBackground = Color.FromArgb(175, 192, 130);
+            if (!m_SplitterBackground2Custom)
+                m_SplitterBackground2 = Color.FromArgb(99, 122, 68);
+            if (!m_SplitterTextCustom)
+                m_SplitterText = Color.White;
+            if (!m_SplitterBorderCustom)
+                m_SplitterBorder = Color.FromArgb(96, 128, 88);
+
+			if(!m_ExplorerBarBackgroundCustom) m_ExplorerBarBackground=Color.FromArgb(204,217,173);
+			if(!m_ExplorerBarBackground2Custom) m_ExplorerBarBackground2=Color.FromArgb(165,189,132);
+		}
+
+		private void SchemeXpSilver2003()
+		{
+			if(!m_BarBackgroundCustom)
+				m_BarBackground=Color.FromArgb(243,244,250);
+			if(!m_BarBackground2Custom)
+				m_BarBackground2=Color.FromArgb(153,151,181);
+			if(!m_BarStripeColorCustom)
+				m_BarStripeColor=Color.FromArgb(84,84,117);
+			if(!m_BarCaptionBackgroundCustom)
+                m_BarCaptionBackground = Color.FromArgb(153, 151, 181);  //Color.FromArgb(122, 121, 153);
+            if (!m_BarCaptionBackground2Custom)
+                m_BarCaptionBackground2 = Color.FromArgb(122, 121, 153);
+			if(!m_BarCaptionInactiveBackgroundCustom)
+                m_BarCaptionInactiveBackground = GetColor(0xA6A6B7); // Color.FromArgb(243, 244, 250); //Color.FromArgb(122, 121, 153);
+            if (!m_BarCaptionInactiveBackground2Custom)
+                m_BarCaptionInactiveBackground2 = Color.FromArgb(122, 121, 153);
+			if(!m_BarCaptionInactiveTextCustom)
+				m_BarCaptionInactiveText=Color.White;
+			if(!m_BarCaptionTextCustom)
+				m_BarCaptionText=Color.White;
+			if(!m_BarFloatingBorderCustom)
+				m_BarFloatingBorder=Color.FromArgb(122,121,153);
+			if(!m_BarPopupBackgroundCustom)
+				m_BarPopupBackground=Color.FromArgb(253,250,255);
+			if(!m_BarPopupBorderCustom)
+				m_BarPopupBorder=Color.FromArgb(124,124,148);
+			if(!m_ItemBackgroundCustom)
+				m_ItemBackground=Color.Empty;
+			if(!m_ItemBackground2Custom)
+				m_ItemBackground2=Color.Empty;
+			if(!m_ItemCheckedBackgroundCustom)
+				m_ItemCheckedBackground=Color.FromArgb(255,213,140);
+			if(!m_ItemCheckedBackground2Custom)
+				m_ItemCheckedBackground2=Color.FromArgb(255,173,85);
+			if(!m_ItemCheckedBorderCustom)
+				m_ItemCheckedBorder=Color.FromArgb(75,75,111);
+			if(!m_ItemCheckedTextCustom)
+				m_ItemCheckedText=SystemColors.ControlText;
+			if(!m_ItemDisabledBackgroundCustom)
+				m_ItemDisabledBackground=Color.Empty;
+			if(!m_ItemDisabledTextCustom)
+				m_ItemDisabledText=Color.FromArgb(141,141,141);
+			if(!m_ItemExpandedShadowCustom)
+				m_ItemExpandedShadow=Color.Empty;
+			if(!m_ItemExpandedBackgroundCustom)
+				m_ItemExpandedBackground=Color.FromArgb(232,233,241);
+			if(!m_ItemExpandedBackground2Custom)
+				m_ItemExpandedBackground2=Color.FromArgb(177,176,198);
+			if(!m_ItemExpandedTextCustom)
+				m_ItemExpandedText=SystemColors.ControlText;
+			if(!m_ItemHotBackgroundCustom)
+				m_ItemHotBackground=Color.FromArgb(255,244,204);
+			if(!m_ItemHotBackground2Custom)
+				m_ItemHotBackground2=Color.FromArgb(255,208,145);
+			if(!m_ItemHotBorderCustom)
+				m_ItemHotBorder=Color.FromArgb(75,75,111);
+			if(!m_ItemHotTextCustom)
+				m_ItemHotText=SystemColors.ControlText;
+			if(!m_ItemPressedBackgroundCustom)
+				m_ItemPressedBackground=Color.FromArgb(254,142,75);
+			if(!m_ItemPressedBackground2Custom)
+				m_ItemPressedBackground2=Color.FromArgb(255,207,139);
+			if(!m_ItemPressedBorderCustom)
+				m_ItemPressedBorder=Color.FromArgb(75,75,111);
+			if(!m_ItemPressedTextCustom)
+				m_ItemPressedText=SystemColors.ControlText;
+			if(!m_ItemSeparatorCustom)
+				m_ItemSeparator=Color.FromArgb(110,109,143);
+			if(!m_ItemSeparatorShadeCustom)
+				m_ItemSeparatorShade=Color.White;
+			if(!m_ItemTextCustom)
+				m_ItemText=SystemColors.ControlText;
+			if(!m_MenuBackgroundCustom)
+				m_MenuBackground=Color.FromArgb(253,250,255);
+			if(!m_MenuBackground2Custom)
+				m_MenuBackground2=Color.Empty;
+			if(!m_MenuBarBackgroundCustom)
+				m_MenuBarBackground=Color.FromArgb(215,215,229);
+			if(!m_MenuBorderCustom)
+				m_MenuBorder=Color.FromArgb(124,124,148);
+			if(!m_ItemExpandedBorderCustom)
+				m_ItemExpandedBorder=m_MenuBorder;
+			if(!m_MenuSideCustom)
+				m_MenuSide=Color.FromArgb(249,249,255);
+			if(!m_MenuSide2Custom)
+				m_MenuSide2=Color.FromArgb(159,157,185);
+			if(!m_MenuUnusedBackgroundCustom)
+				m_MenuUnusedBackground=m_MenuBackground;
+			if(!m_MenuUnusedSideCustom)
+				m_MenuUnusedSide=Color.FromArgb(215,215,226);
+			if(!m_MenuUnusedSide2Custom)
+				m_MenuUnusedSide2=Color.FromArgb(128,126,158);
+			if(!m_ItemDesignTimeBorderCustom)
+				m_ItemDesignTimeBorder=Color.FromArgb(84,84,117);
+			if(!m_BarDockedBorderCustom)
+				m_BarDockedBorder=Color.FromArgb(124,124,148);
+
+			if(!m_DockSiteBackColorCustom)
+				m_DockSiteBackColor=Color.FromArgb(215,215,229);
+			if(!m_DockSiteBackColor2Custom)
+				m_DockSiteBackColor2=Color.FromArgb(243,243,247);
+
+			if(!m_CustomizeBackgroundCustom)
+				m_CustomizeBackground=Color.FromArgb(179,178,200);
+			if(!m_CustomizeBackground2Custom)
+				m_CustomizeBackground2=Color.FromArgb(118,116,146);
+			if(!m_CustomizeTextCustom)
+				m_CustomizeText=SystemColors.ControlText;
+
+			if(!m_PanelBackgroundCustom)
+				m_PanelBackground=Color.FromArgb(168,167,191);
+			if(!m_PanelBackground2Custom)
+				m_PanelBackground2=Color.FromArgb(112,111,145);
+			if(!m_PanelTextCustom)
+				m_PanelText=Color.White;
+			if(!m_PanelBorderCustom)
+				m_PanelBorder=Color.FromArgb(124,124,148);
+
+            if (!m_SplitterBackgroundCustom)
+                m_SplitterBackground = Color.FromArgb(168, 167, 191);
+            if (!m_SplitterBackground2Custom)
+                m_SplitterBackground2 = Color.FromArgb(112, 111, 145);
+            if (!m_SplitterTextCustom)
+                m_SplitterText = Color.White;
+            if (!m_SplitterBorderCustom)
+                m_SplitterBorder = Color.FromArgb(124, 124, 148);
+
+			if(!m_ExplorerBarBackgroundCustom) m_ExplorerBarBackground=Color.FromArgb(196,200,212);
+			if(!m_ExplorerBarBackground2Custom) m_ExplorerBarBackground2=Color.FromArgb(177,179,200);
+		}
+
+		/// <summary>
+		/// VS.NET 2005 Blue Color Scheme
+		/// </summary>
+		private void SchemeXpBlueVS2005()
+		{
+			if(!m_BarBackgroundCustom)
+				m_BarBackground=Color.FromArgb(251,250,247);
+			if(!m_BarBackground2Custom)
+				m_BarBackground2=Color.FromArgb(181,181,154);
+			if(!m_BarStripeColorCustom)
+				m_BarStripeColor=Color.FromArgb(193,190,179);
+			if(!m_BarCaptionBackgroundCustom)
+				m_BarCaptionBackground=Color.FromArgb(0,84,227);
+			if(!m_BarCaptionBackground2Custom)
+				m_BarCaptionBackground2=Color.FromArgb(60,148,254);
+			if(!m_BarCaptionInactiveBackgroundCustom)
+				m_BarCaptionInactiveBackground=GetColor(0xCCC7BA);
+			if(!m_BarCaptionInactiveBackground2Custom)
+				m_BarCaptionInactiveBackground2=Color.Empty;
+			if(!m_BarCaptionInactiveTextCustom)
+				m_BarCaptionInactiveText=Color.Black;
+			if(!m_BarCaptionTextCustom)
+				m_BarCaptionText=Color.White;
+			if(!m_BarFloatingBorderCustom)
+				m_BarFloatingBorder=Color.FromArgb(146,143,130);
+			if(!m_BarPopupBackgroundCustom)
+				m_BarPopupBackground=Color.FromArgb(252,252,249);
+			if(!m_BarPopupBorderCustom)
+				m_BarPopupBorder=Color.FromArgb(138,134,122);
+			if(!m_ItemBackgroundCustom)
+				m_ItemBackground=Color.Empty;
+			if(!m_ItemBackground2Custom)
+				m_ItemBackground2=Color.Empty;
+			if(!m_ItemCheckedBackgroundCustom)
+				m_ItemCheckedBackground=Color.FromArgb(225,230,232);
+			if(!m_ItemCheckedBackground2Custom)
+				m_ItemCheckedBackground2=Color.Empty;
+			if(!m_ItemCheckedBorderCustom)
+				m_ItemCheckedBorder=Color.FromArgb(49,106,197);
+			if(!m_ItemCheckedTextCustom)
+				m_ItemCheckedText=SystemColors.ControlText;
+			if(!m_ItemDisabledBackgroundCustom)
+				m_ItemDisabledBackground=Color.Empty;
+			if(!m_ItemDisabledTextCustom)
+				m_ItemDisabledText=Color.FromArgb(180,177,163);
+			if(!m_ItemExpandedShadowCustom)
+				m_ItemExpandedShadow=Color.Empty;
+			if(!m_ItemExpandedBackgroundCustom)
+				m_ItemExpandedBackground=Color.FromArgb(251,250,247);
+			if(!m_ItemExpandedBackground2Custom)
+				m_ItemExpandedBackground2=Color.Empty;
+			if(!m_ItemExpandedTextCustom)
+				m_ItemExpandedText=SystemColors.ControlText;
+			if(!m_ItemHotBackgroundCustom)
+				m_ItemHotBackground=Color.FromArgb(193,210,238);
+			if(!m_ItemHotBackground2Custom)
+				m_ItemHotBackground2=Color.Empty;
+			if(!m_ItemHotBorderCustom)
+				m_ItemHotBorder=Color.FromArgb(49,106,197);
+			if(!m_ItemHotTextCustom)
+				m_ItemHotText=SystemColors.ControlText;
+			if(!m_ItemPressedBackgroundCustom)
+				m_ItemPressedBackground=Color.FromArgb(152,181,226);
+			if(!m_ItemPressedBackground2Custom)
+				m_ItemPressedBackground2=Color.Empty;
+			if(!m_ItemPressedBorderCustom)
+				m_ItemPressedBorder=Color.FromArgb(75,75,111);
+			if(!m_ItemPressedTextCustom)
+				m_ItemPressedText=SystemColors.ControlText;
+			if(!m_ItemSeparatorCustom)
+				m_ItemSeparator=Color.FromArgb(197,194,184);
+			if(!m_ItemSeparatorShadeCustom)
+				m_ItemSeparatorShade=Color.Empty;
+			if(!m_ItemTextCustom)
+				m_ItemText=SystemColors.ControlText;
+			if(!m_MenuBackgroundCustom)
+				m_MenuBackground=Color.FromArgb(252,252,249);
+			if(!m_MenuBackground2Custom)
+				m_MenuBackground2=Color.Empty;
+			if(!m_MenuBarBackgroundCustom)
+				m_MenuBarBackground=Color.FromArgb(229,229,215);
+			if(!m_MenuBorderCustom)
+				m_MenuBorder=Color.FromArgb(138,134,122);
+			if(!m_ItemExpandedBorderCustom)
+				m_ItemExpandedBorder=m_MenuBorder;
+			if(!m_MenuSideCustom)
+				m_MenuSide=m_MenuBackground;
+			if(!m_MenuSide2Custom)
+				m_MenuSide2=Color.FromArgb(186,186,160);
+			if(!m_MenuUnusedBackgroundCustom)
+				m_MenuUnusedBackground=m_MenuBackground;
+			if(!m_MenuUnusedSideCustom)
+				m_MenuUnusedSide=m_MenuBackground;
+			if(!m_MenuUnusedSide2Custom)
+				m_MenuUnusedSide2=System.Windows.Forms.ControlPaint.Light(Color.FromArgb(186,186,160));
+			if(!m_ItemDesignTimeBorderCustom)
+				m_ItemDesignTimeBorder=Color.Black;
+			if(!m_BarDockedBorderCustom)
+				m_BarDockedBorder=Color.FromArgb(146,146,118);
+
+			if(!m_DockSiteBackColorCustom)
+				m_DockSiteBackColor=Color.FromArgb(229,229,215);
+			if(!m_DockSiteBackColor2Custom)
+				m_DockSiteBackColor2=Color.FromArgb(250,250,247);
+
+			if(!m_CustomizeBackgroundCustom)
+				m_CustomizeBackground=Color.FromArgb(239,238,235);
+			if(!m_CustomizeBackground2Custom)
+				m_CustomizeBackground2=Color.FromArgb(152,152,126);
+			if(!m_CustomizeTextCustom)
+				m_CustomizeText=SystemColors.ControlText;
+
+			if(!m_PanelBackgroundCustom)
+				m_PanelBackground=GetColor(0xBFBFA2);
+			if(!m_PanelBackground2Custom)
+				m_PanelBackground2=Color.FromArgb(152,152,126);
+			if(!m_PanelTextCustom)
+				m_PanelText=Color.Black;
+			if(!m_PanelBorderCustom)
+				m_PanelBorder=Color.FromArgb(82,82,79);
+
+            if (!m_SplitterBackgroundCustom)
+                m_SplitterBackground = GetColor(0xBFBFA2);
+            if (!m_SplitterBackground2Custom)
+                m_SplitterBackground2 = Color.FromArgb(152, 152, 126);
+            if (!m_SplitterTextCustom)
+                m_SplitterText = Color.Black;
+            if (!m_SplitterBorderCustom)
+                m_SplitterBorder = Color.FromArgb(82, 82, 79);
+
+			if(!m_ExplorerBarBackgroundCustom) m_ExplorerBarBackground=Color.FromArgb(123,162,231);
+			if(!m_ExplorerBarBackground2Custom) m_ExplorerBarBackground2=Color.FromArgb(99,117,214);
+		}
+
+		private void SchemeXpOliveGreenVS2005()
+		{
+			if(!m_BarBackgroundCustom)
+				m_BarBackground=GetColor(0xFAFAF6);
+			if(!m_BarBackground2Custom)
+				m_BarBackground2=GetColor(0xEDEADB);
+			if(!m_BarStripeColorCustom)
+				m_BarStripeColor=GetColor(0xC1BEB3);
+			if(!m_BarCaptionBackgroundCustom)
+				m_BarCaptionBackground=GetColor(0x8BA169);
+			if(!m_BarCaptionBackground2Custom)
+				m_BarCaptionBackground2=GetColor(0xC5D1A1);
+            if (!m_BarCaptionInactiveBackgroundCustom)
+                m_BarCaptionInactiveBackground = GetColor(0xCCC7BA);
+            if (!m_BarCaptionInactiveBackground2Custom)
+                m_BarCaptionInactiveBackground2 = Color.Empty;
+			if(!m_BarCaptionInactiveTextCustom)
+				m_BarCaptionInactiveText=Color.Black;
+			if(!m_BarCaptionTextCustom)
+				m_BarCaptionText=Color.White;
+			if(!m_BarFloatingBorderCustom)
+				m_BarFloatingBorder=GetColor(0x928F82);
+			if(!m_BarPopupBackgroundCustom)
+				m_BarPopupBackground=GetColor(0xFCFCF9);
+			if(!m_BarPopupBorderCustom)
+				m_BarPopupBorder=GetColor(0x8A867A);
+			if(!m_ItemBackgroundCustom)
+				m_ItemBackground=Color.Empty;
+			if(!m_ItemBackground2Custom)
+				m_ItemBackground2=Color.Empty;
+			if(!m_ItemCheckedBackgroundCustom)
+				m_ItemCheckedBackground=GetColor(0xB6C68D);
+			if(!m_ItemCheckedBackground2Custom)
+				m_ItemCheckedBackground2=Color.Empty;
+			if(!m_ItemCheckedBorderCustom)
+				m_ItemCheckedBorder=GetColor(0x93A070);
+			if(!m_ItemCheckedTextCustom)
+				m_ItemCheckedText=SystemColors.ControlText;
+			if(!m_ItemDisabledBackgroundCustom)
+				m_ItemDisabledBackground=Color.Empty;
+			if(!m_ItemDisabledTextCustom)
+				m_ItemDisabledText=GetColor(0xB4B1A3);
+			if(!m_ItemExpandedShadowCustom)
+				m_ItemExpandedShadow=Color.Empty;
+			if(!m_ItemExpandedBackgroundCustom)
+				m_ItemExpandedBackground=GetColor(0xF9F9F4);
+			if(!m_ItemExpandedBackground2Custom)
+				m_ItemExpandedBackground2=Color.Empty;
+			if(!m_ItemExpandedTextCustom)
+				m_ItemExpandedText=SystemColors.ControlText;
+			if(!m_ItemHotBackgroundCustom)
+				m_ItemHotBackground=GetColor(0xB6C68D);
+			if(!m_ItemHotBackground2Custom)
+				m_ItemHotBackground2=Color.Empty;
+			if(!m_ItemHotBorderCustom)
+				m_ItemHotBorder=GetColor(0x93A070);
+			if(!m_ItemHotTextCustom)
+				m_ItemHotText=SystemColors.ControlText;
+			if(!m_ItemPressedBackgroundCustom)
+				m_ItemPressedBackground=GetColor(0x93A070);
+			if(!m_ItemPressedBackground2Custom)
+				m_ItemPressedBackground2=Color.Empty;
+			if(!m_ItemPressedBorderCustom)
+				m_ItemPressedBorder=GetColor(0x93A070);
+			if(!m_ItemPressedTextCustom)
+				m_ItemPressedText=Color.White;
+			if(!m_ItemSeparatorCustom)
+				m_ItemSeparator=GetColor(0xC5C2B8);
+			if(!m_ItemSeparatorShadeCustom)
+				m_ItemSeparatorShade=Color.Empty;
+			if(!m_ItemTextCustom)
+				m_ItemText=SystemColors.ControlText;
+			if(!m_MenuBackgroundCustom)
+				m_MenuBackground=GetColor(0xFCFCF9);
+			if(!m_MenuBackground2Custom)
+				m_MenuBackground2=Color.Empty;
+			if(!m_MenuBarBackgroundCustom)
+				m_MenuBarBackground=GetColor(0xECE9D8);
+			if(!m_MenuBorderCustom)
+				m_MenuBorder=GetColor(0x8A867A);
+			if(!m_ItemExpandedBorderCustom)
+				m_ItemExpandedBorder=m_MenuBorder;
+			if(!m_MenuSideCustom)
+				m_MenuSide=GetColor(0xFCFCF9);
+			if(!m_MenuSide2Custom)
+				m_MenuSide2=GetColor(0xEDEADB);
+			if(!m_MenuUnusedBackgroundCustom)
+				m_MenuUnusedBackground=m_MenuBackground;
+			if(!m_MenuUnusedSideCustom)
+				m_MenuUnusedSide=m_MenuSide;
+			if(!m_MenuUnusedSide2Custom)
+				m_MenuUnusedSide2=System.Windows.Forms.ControlPaint.Light(m_MenuSide2);
+			if(!m_ItemDesignTimeBorderCustom)
+				m_ItemDesignTimeBorder=Color.Black;
+			if(!m_BarDockedBorderCustom)
+				m_BarDockedBorder=GetColor(0xEFEDDE);
+
+			if(!m_DockSiteBackColorCustom)
+				m_DockSiteBackColor=GetColor(0xECE9D8);
+			if(!m_DockSiteBackColor2Custom)
+				m_DockSiteBackColor2=GetColor(0xFAF9F6);
+
+			if(!m_CustomizeBackgroundCustom)
+				m_CustomizeBackground=GetColor(0xEFEEEB);
+			if(!m_CustomizeBackground2Custom)
+				m_CustomizeBackground2=GetColor(0xACA899);
+			if(!m_CustomizeTextCustom)
+				m_CustomizeText=SystemColors.ControlText;
+
+			if(!m_PanelBackgroundCustom)
+				m_PanelBackground=GetColor(0xF3F2EA);
+			if(!m_PanelBackground2Custom)
+				m_PanelBackground2=GetColor(0xE4E2D5);
+			if(!m_PanelTextCustom)
+				m_PanelText=Color.Black;
+			if(!m_PanelBorderCustom)
+				m_PanelBorder=GetColor(0xACA899);
+
+            if (!m_SplitterBackgroundCustom)
+                m_SplitterBackground = GetColor(0xF3F2EA);
+            if (!m_SplitterBackground2Custom)
+                m_SplitterBackground2 = GetColor(0xE4E2D5);
+            if (!m_SplitterTextCustom)
+                m_SplitterText = Color.Black;
+            if (!m_SplitterBorderCustom)
+                m_SplitterBorder = GetColor(0xACA899);
+
+			if(!m_ExplorerBarBackgroundCustom) m_ExplorerBarBackground=Color.FromArgb(204,217,173);
+			if(!m_ExplorerBarBackground2Custom) m_ExplorerBarBackground2=Color.FromArgb(165,189,132);
+		}
+
+		private void SchemeXpSilverVS2005()
+		{
+			if(!m_BarBackgroundCustom)
+				m_BarBackground=GetColor(0xF3F4FA);
+			if(!m_BarBackground2Custom)
+				m_BarBackground2=GetColor(0x9997B5);
+			if(!m_BarStripeColorCustom)
+				m_BarStripeColor=GetColor(0x545475);
+			if(!m_BarCaptionBackgroundCustom)
+				m_BarCaptionBackground=GetColor(0xA09EBA);
+			if(!m_BarCaptionBackground2Custom)
+				m_BarCaptionBackground2=GetColor(0xE1E2EC);
+			if(!m_BarCaptionInactiveBackgroundCustom)
+                m_BarCaptionInactiveBackground = GetColor(0xCECECE);
+			if(!m_BarCaptionInactiveBackground2Custom)
+				m_BarCaptionInactiveBackground2=GetColor(0xF2F2F6);
+			if(!m_BarCaptionInactiveTextCustom)
+				m_BarCaptionInactiveText=Color.Black;
+			if(!m_BarCaptionTextCustom)
+				m_BarCaptionText=Color.Black;
+			if(!m_BarFloatingBorderCustom)
+				m_BarFloatingBorder=GetColor(0x7A7999);
+			if(!m_BarPopupBackgroundCustom)
+				m_BarPopupBackground=GetColor(0xFDFAFF);
+			if(!m_BarPopupBorderCustom)
+				m_BarPopupBorder=GetColor(0x7C7C94);
+			if(!m_ItemBackgroundCustom)
+				m_ItemBackground=Color.Empty;
+			if(!m_ItemBackground2Custom)
+				m_ItemBackground2=Color.Empty;
+			if(!m_ItemCheckedBackgroundCustom)
+				m_ItemCheckedBackground=GetColor(0xFFD58C);
+			if(!m_ItemCheckedBackground2Custom)
+				m_ItemCheckedBackground2=GetColor(0xFFAD55);
+			if(!m_ItemCheckedBorderCustom)
+				m_ItemCheckedBorder=GetColor(0x4B4B6F);
+			if(!m_ItemCheckedTextCustom)
+				m_ItemCheckedText=SystemColors.ControlText;
+			if(!m_ItemDisabledBackgroundCustom)
+				m_ItemDisabledBackground=Color.Empty;
+			if(!m_ItemDisabledTextCustom)
+				m_ItemDisabledText=GetColor(0x8D8D8D);
+			if(!m_ItemExpandedShadowCustom)
+				m_ItemExpandedShadow=Color.Empty;
+			if(!m_ItemExpandedBackgroundCustom)
+				m_ItemExpandedBackground=GetColor(0xE8E9F1);
+			if(!m_ItemExpandedBackground2Custom)
+				m_ItemExpandedBackground2=GetColor(0xBAB9CD);
+			if(!m_ItemExpandedTextCustom)
+				m_ItemExpandedText=SystemColors.ControlText;
+			if(!m_ItemHotBackgroundCustom)
+				m_ItemHotBackground=GetColor(0xFFF4CC);
+			if(!m_ItemHotBackground2Custom)
+				m_ItemHotBackground2=GetColor(0xFFD091);
+			if(!m_ItemHotBorderCustom)
+				m_ItemHotBorder=GetColor(0x4B4B6F);
+			if(!m_ItemHotTextCustom)
+				m_ItemHotText=SystemColors.ControlText;
+			if(!m_ItemPressedBackgroundCustom)
+				m_ItemPressedBackground=GetColor(0xFE914E);
+			if(!m_ItemPressedBackground2Custom)
+				m_ItemPressedBackground2=GetColor(0xFFD38E);
+			if(!m_ItemPressedBorderCustom)
+				m_ItemPressedBorder=GetColor(0x4B4B6F);
+			if(!m_ItemPressedTextCustom)
+				m_ItemPressedText=Color.Black;
+			if(!m_ItemSeparatorCustom)
+				m_ItemSeparator=GetColor(0x6E6D8F);
+			if(!m_ItemSeparatorShadeCustom)
+				m_ItemSeparatorShade=Color.Empty;
+			if(!m_ItemTextCustom)
+				m_ItemText=SystemColors.ControlText;
+			if(!m_MenuBackgroundCustom)
+				m_MenuBackground=GetColor(0xFDFAFF);
+			if(!m_MenuBackground2Custom)
+				m_MenuBackground2=Color.Empty;
+			if(!m_MenuBarBackgroundCustom)
+				m_MenuBarBackground=GetColor(0xD7D7E5);
+			if(!m_MenuBorderCustom)
+				m_MenuBorder=GetColor(0x7C7C94);
+			if(!m_ItemExpandedBorderCustom)
+				m_ItemExpandedBorder=m_MenuBorder;
+			if(!m_MenuSideCustom)
+				m_MenuSide=GetColor(0xF9F9FF);
+			if(!m_MenuSide2Custom)
+				m_MenuSide2=GetColor(0x9F9DB9);
+			if(!m_MenuUnusedBackgroundCustom)
+				m_MenuUnusedBackground=m_MenuBackground;
+			if(!m_MenuUnusedSideCustom)
+				m_MenuUnusedSide=m_MenuSide;
+			if(!m_MenuUnusedSide2Custom)
+				m_MenuUnusedSide2=System.Windows.Forms.ControlPaint.Light(m_MenuSide2);
+			if(!m_ItemDesignTimeBorderCustom)
+				m_ItemDesignTimeBorder=Color.Black;
+			if(!m_BarDockedBorderCustom)
+				m_BarDockedBorder=GetColor(0x7C7C94);
+
+			if(!m_DockSiteBackColorCustom)
+				m_DockSiteBackColor=GetColor(0xD7D7E5);
+			if(!m_DockSiteBackColor2Custom)
+				m_DockSiteBackColor2=GetColor(0xF3F3F7);
+
+			if(!m_CustomizeBackgroundCustom)
+				m_CustomizeBackground=GetColor(0xB3B2C8);
+			if(!m_CustomizeBackground2Custom)
+				m_CustomizeBackground2=GetColor(0x797794);
+			if(!m_CustomizeTextCustom)
+				m_CustomizeText=SystemColors.ControlText;
+
+			if(!m_PanelBackgroundCustom)
+				m_PanelBackground=GetColor(0xEEEEEE);
+			if(!m_PanelBackground2Custom)
+				m_PanelBackground2=GetColor(0xFFFFFF);
+			if(!m_PanelTextCustom)
+				m_PanelText=Color.Black;
+			if(!m_PanelBorderCustom)
+				m_PanelBorder=GetColor(0x9D9DA1);
+
+            if (!m_SplitterBackgroundCustom)
+                m_SplitterBackground = GetColor(0xEEEEEE);
+            if (!m_SplitterBackground2Custom)
+                m_SplitterBackground2 = GetColor(0xFFFFFF);
+            if (!m_SplitterTextCustom)
+                m_SplitterText = Color.Black;
+            if (!m_SplitterBorderCustom)
+                m_SplitterBorder = GetColor(0x9D9DA1);
+
+			if(!m_ExplorerBarBackgroundCustom) m_ExplorerBarBackground=Color.FromArgb(196,200,212);
+			if(!m_ExplorerBarBackground2Custom) m_ExplorerBarBackground2=Color.FromArgb(177,179,200);
+		}
+
+        private void SchemeOffice2007()
+        {
+            if (!m_BarBackgroundCustom)
+                m_BarBackground = GetColor(0xE3EFFF);
+            if (!m_BarBackground2Custom)
+                m_BarBackground2 = GetColor(0xA9CEFE);
+            if (!m_BarStripeColorCustom)
+                m_BarStripeColor = GetColor(0x6F9DD9);
+            if (!m_BarCaptionBackgroundCustom)
+                m_BarCaptionBackground = GetColor(0x6593CF);
+            if (!m_BarCaptionBackground2Custom)
+                m_BarCaptionBackground2 = GetColor(0x3764A0);
+            if (!m_BarCaptionInactiveBackgroundCustom)
+                m_BarCaptionInactiveBackground = GetColor(0xE3EFFF);
+            if (!m_BarCaptionInactiveBackground2Custom)
+                m_BarCaptionInactiveBackground2 = GetColor(0xAFD2FF);
+            if (!m_BarCaptionInactiveTextCustom)
+                m_BarCaptionInactiveText = GetColor(0x083772);
+            if (!m_BarCaptionTextCustom)
+                m_BarCaptionText = GetColor(0xFFFFFF);
+            if (!m_BarFloatingBorderCustom)
+                m_BarFloatingBorder = GetColor(0x3764A0);
+            if (!m_BarPopupBackgroundCustom)
+                m_BarPopupBackground = GetColor(0xF6F6F6);
+            if (!m_BarPopupBorderCustom)
+                m_BarPopupBorder = GetColor(0x6593CF);
+            if (!m_ItemBackgroundCustom)
+                m_ItemBackground = Color.Empty;
+            if (!m_ItemBackground2Custom)
+                m_ItemBackground2 = Color.Empty;
+            if (!m_ItemCheckedBackgroundCustom)
+                m_ItemCheckedBackground = GetColor(0xFCD578);
+            if (!m_ItemCheckedBackground2Custom)
+                m_ItemCheckedBackground2 = GetColor(0xFBC84F);
+            if (!m_ItemCheckedBorderCustom)
+                m_ItemCheckedBorder = GetColor(0xBB5503);
+            if (!m_ItemCheckedTextCustom)
+                m_ItemCheckedText = GetColor(0x000000);
+            if (!m_ItemDisabledBackgroundCustom)
+                m_ItemDisabledBackground = Color.Empty;
+            if (!m_ItemDisabledTextCustom)
+                m_ItemDisabledText = GetColor(0x8D8D8D);
+            if (!m_ItemExpandedShadowCustom)
+                m_ItemExpandedShadow = Color.Empty;
+            if (!m_ItemExpandedBackgroundCustom)
+                m_ItemExpandedBackground = GetColor(0xE3EFFE);
+            if (!m_ItemExpandedBackground2Custom)
+                m_ItemExpandedBackground2 = GetColor(0x99BFF0);
+            if (!m_ItemExpandedTextCustom)
+                m_ItemExpandedText = GetColor(0x000000);
+            if (!m_ItemHotBackgroundCustom)
+                m_ItemHotBackground = GetColor(0xFFF5CC);
+            if (!m_ItemHotBackground2Custom)
+                m_ItemHotBackground2 = GetColor(0xFFDB75);
+            if (!m_ItemHotBorderCustom)
+                m_ItemHotBorder = GetColor(0xFFBD69);
+            if (!m_ItemHotTextCustom)
+                m_ItemHotText = GetColor(0x000000);
+            if (!m_ItemPressedBackgroundCustom)
+                m_ItemPressedBackground = GetColor(0xFC973D);
+            if (!m_ItemPressedBackground2Custom)
+                m_ItemPressedBackground2 = GetColor(0xFFB85E);
+            if (!m_ItemPressedBorderCustom)
+                m_ItemPressedBorder = GetColor(0xFB8C3C);
+            if (!m_ItemPressedTextCustom)
+                m_ItemPressedText = GetColor(0x000000);
+            if (!m_ItemSeparatorCustom)
+                m_ItemSeparator = Color.FromArgb(80, GetColor(0x9AC6FF));
+            if (!m_ItemSeparatorShadeCustom)
+                m_ItemSeparatorShade = Color.FromArgb(250, GetColor(0xFFFFFF));
+            if (!m_ItemTextCustom)
+                m_ItemText = GetColor(0x000000); // SystemColors.ControlTet;
+            if (!m_MenuBackgroundCustom)
+                m_MenuBackground = GetColor(0xF6F6F6);
+            if (!m_MenuBackground2Custom)
+                m_MenuBackground2 = Color.Empty; // Color.White;
+            if (!m_MenuBarBackgroundCustom)
+                m_MenuBarBackground = GetColor(0xBFDBFF);
+            if (!m_MenuBorderCustom)
+                m_MenuBorder = GetColor(0x6593CF);
+            if (!m_ItemExpandedBorderCustom)
+                m_ItemExpandedBorder = m_MenuBorder;
+            if (!m_MenuSideCustom)
+                m_MenuSide = GetColor(0xE9EEEE);
+            if (!m_MenuSide2Custom)
+                m_MenuSide2 = Color.Empty; // GetColor(0xDDE0E8);
+            if (!m_MenuUnusedBackgroundCustom)
+                m_MenuUnusedBackground = m_MenuBackground;
+            if (!m_MenuUnusedSideCustom)
+                m_MenuUnusedSide = GetColor(0xDADADA);
+            if (!m_MenuUnusedSide2Custom)
+                m_MenuUnusedSide2 = Color.Empty;// System.Windows.Forms.ControlPaint.Light(m_MenuSide2);
+            if (!m_ItemDesignTimeBorderCustom)
+                m_ItemDesignTimeBorder = Color.Black;
+            if (!m_BarDockedBorderCustom)
+                m_BarDockedBorder = GetColor(0x6F9DD9);
+
+            if (!m_DockSiteBackColorCustom)
+                m_DockSiteBackColor = GetColor(0xBFDBFF);
+            if (!m_DockSiteBackColor2Custom)
+                m_DockSiteBackColor2 = Color.Empty;
+
+            if (!m_CustomizeBackgroundCustom)
+                m_CustomizeBackground = GetColor(0xD7E8FF);
+            if (!m_CustomizeBackground2Custom)
+                m_CustomizeBackground2 = GetColor(0x6F9DD9);
+            if (!m_CustomizeTextCustom)
+                m_CustomizeText = GetColor(0x000000);
+
+            if (!m_PanelBackgroundCustom)
+                m_PanelBackground = GetColor(0xE3EFFF);
+            if (!m_PanelBackground2Custom)
+                m_PanelBackground2 = GetColor(0xAFD2FF);
+            if (!m_PanelTextCustom)
+                m_PanelText = GetColor(0x083772);
+            if (!m_PanelBorderCustom)
+                m_PanelBorder = GetColor(0x6593CF);
+
+            if (!m_SplitterBackgroundCustom)
+                m_SplitterBackground = GetColor(0xE3EFFF);
+            if (!m_SplitterBackground2Custom)
+                m_SplitterBackground2 = GetColor(0xAFD2FF);
+            if (!m_SplitterTextCustom)
+                m_SplitterText = GetColor(0x083772);
+            if (!m_SplitterBorderCustom)
+                m_SplitterBorder = GetColor(0x6593CF);
+
+            if (!m_ExplorerBarBackgroundCustom) m_ExplorerBarBackground = Color.FromArgb(196, 200, 212);
+            if (!m_ExplorerBarBackground2Custom) m_ExplorerBarBackground2 = Color.FromArgb(177, 179, 200);
+        }
+
+		/// <summary>
+		/// Converts hex string to Color type.
+		/// </summary>
+		/// <param name="rgbHex">Hexadecimal color representation.</param>
+		/// <returns>Reference to Color object.</returns>
+		public static Color GetColor(string rgbHex)
+		{
+			if(string.IsNullOrEmpty(rgbHex))
+				return Color.Empty;
+            if(rgbHex.Length == 8)
+                return Color.FromArgb(Convert.ToInt32(rgbHex.Substring(0, 2), 16),
+                Convert.ToInt32(rgbHex.Substring(2, 2), 16),
+                Convert.ToInt32(rgbHex.Substring(4, 2), 16),
+                Convert.ToInt32(rgbHex.Substring(6, 2), 16));
+
+			return Color.FromArgb(Convert.ToInt32(rgbHex.Substring(0,2),16),
+				Convert.ToInt32(rgbHex.Substring(2,2),16),
+				Convert.ToInt32(rgbHex.Substring(4,2),16));
+		}
+
+        /// <summary>
+        /// Converts hex string to Color type.
+        /// </summary>
+        /// <param name="rgb">Color representation as 32-bit RGB value.</param>
+        /// <returns>Reference to Color object.</returns>
+        public static Color GetColor(int rgb)
+        {
+            if (rgb == -1) return Color.Empty;
+            return Color.FromArgb((rgb & 0xFF0000) >> 16, (rgb & 0xFF00) >> 8, rgb & 0xFF);
+        }
+
+        /// <summary>
+        /// Converts hex string to Color type.
+        /// </summary>
+        /// <param name="rgb">Color representation as 32-bit RGB value.</param>
+        /// <returns>Reference to Color object.</returns>
+        public static Color GetColor(int alpha, int rgb)
+        {
+            if (rgb == -1) return Color.Empty;
+            return Color.FromArgb(alpha, (rgb & 0xFF0000) >> 16, (rgb & 0xFF00) >> 8, rgb & 0xFF);
+        }
+		#endregion
+
+		#region Serialization
+		public void Serialize(System.Xml.XmlElement xmlElem)
+		{
+			if(m_BarBackgroundCustom)
+				xmlElem.SetAttribute("barback",BarFunctions.ColorToString(m_BarBackground));
+			if(m_BarBackground2Custom)
+				xmlElem.SetAttribute("barback2",BarFunctions.ColorToString(m_BarBackground2));
+			if(m_BarBackgroundGradientAngle!=90)
+				xmlElem.SetAttribute("barbackga",m_BarBackgroundGradientAngle.ToString());
+			if(m_BarStripeColorCustom)
+				xmlElem.SetAttribute("barstripeclr",BarFunctions.ColorToString(m_BarStripeColor));
+			if(m_BarCaptionBackgroundCustom)
+				xmlElem.SetAttribute("barcapback",BarFunctions.ColorToString(m_BarCaptionBackground));
+			if(m_BarCaptionBackground2Custom)
+				xmlElem.SetAttribute("barcapback2",BarFunctions.ColorToString(m_BarCaptionBackground2));
+			if(m_BarCaptionBackgroundGradientAngle!=90)
+				xmlElem.SetAttribute("barcapbackga",m_BarCaptionBackgroundGradientAngle.ToString());
+			if(m_BarCaptionInactiveBackgroundCustom)
+				xmlElem.SetAttribute("barcapiback",BarFunctions.ColorToString(m_BarCaptionInactiveBackground));
+			if(m_BarCaptionInactiveBackground2Custom)
+				xmlElem.SetAttribute("barcapiback2",BarFunctions.ColorToString(m_BarCaptionInactiveBackground2));
+			if(m_BarCaptionInactiveBackgroundGAngle!=90)
+				xmlElem.SetAttribute("barcapibackga",m_BarCaptionInactiveBackgroundGAngle.ToString());
+			if(m_BarDockedBorderCustom)
+				xmlElem.SetAttribute("bardockborder",BarFunctions.ColorToString(m_BarDockedBorder));
+			if(m_BarCaptionInactiveTextCustom)
+				xmlElem.SetAttribute("barcapitext",BarFunctions.ColorToString(m_BarCaptionInactiveText));
+			if(m_BarCaptionTextCustom)
+				xmlElem.SetAttribute("barcaptext",BarFunctions.ColorToString(m_BarCaptionText));
+			if(m_BarFloatingBorderCustom)
+				xmlElem.SetAttribute("barfloatb",BarFunctions.ColorToString(m_BarFloatingBorder));
+			if(m_BarPopupBackgroundCustom)
+				xmlElem.SetAttribute("barpopupback",BarFunctions.ColorToString(m_BarPopupBackground));
+			if(m_BarPopupBorderCustom)
+				xmlElem.SetAttribute("barpopupb",BarFunctions.ColorToString(m_BarPopupBorder));
+			if(m_ItemBackgroundCustom)
+				xmlElem.SetAttribute("itemback",BarFunctions.ColorToString(m_ItemBackground));
+			if(m_ItemBackground2Custom)
+				xmlElem.SetAttribute("itemback2",BarFunctions.ColorToString(m_ItemBackground2));
+			if(m_ItemBackgroundGradientAngle!=90)
+				xmlElem.SetAttribute("itembackga",m_ItemBackgroundGradientAngle.ToString());
+			if(m_ItemCheckedBackgroundCustom)
+				xmlElem.SetAttribute("itemchkback",BarFunctions.ColorToString(m_ItemCheckedBackground));
+			if(m_ItemCheckedBackground2Custom)
+				xmlElem.SetAttribute("itemchkback2",BarFunctions.ColorToString(m_ItemCheckedBackground2));
+			if(m_ItemCheckedBackgroundGradientAngle!=90)
+				xmlElem.SetAttribute("itemchkbackga",m_ItemCheckedBackgroundGradientAngle.ToString());
+			if(m_ItemCheckedBorderCustom)
+				xmlElem.SetAttribute("itemchkb",BarFunctions.ColorToString(m_ItemCheckedBorder));
+			if(m_ItemCheckedTextCustom)
+				xmlElem.SetAttribute("itemchktext",BarFunctions.ColorToString(m_ItemCheckedText));
+			if(m_ItemDisabledBackgroundCustom && !m_ItemDisabledBackground.IsEmpty)
+				xmlElem.SetAttribute("itemdisback",BarFunctions.ColorToString(m_ItemDisabledBackground));
+			if(m_ItemDisabledTextCustom)
+				xmlElem.SetAttribute("itemdistext",BarFunctions.ColorToString(m_ItemDisabledText));
+			if(m_ItemExpandedShadowCustom)
+				xmlElem.SetAttribute("itemexpshadow",BarFunctions.ColorToString(m_ItemExpandedShadow));
+			if(m_ItemExpandedBackgroundCustom)
+				xmlElem.SetAttribute("itemexpback",BarFunctions.ColorToString(m_ItemExpandedBackground));
+			if(m_ItemExpandedBackground2Custom)
+				xmlElem.SetAttribute("itemexpback2",BarFunctions.ColorToString(m_ItemExpandedBackground2));
+			if(m_ItemExpandedBackgroundGradientAngle!=90)
+				xmlElem.SetAttribute("itemexpbackga",m_ItemExpandedBackgroundGradientAngle.ToString());
+			if(m_ItemExpandedTextCustom)
+				xmlElem.SetAttribute("itemexptext",BarFunctions.ColorToString(m_ItemExpandedText));
+			if(m_ItemExpandedBorderCustom)
+				xmlElem.SetAttribute("itemexpborder",BarFunctions.ColorToString(m_ItemExpandedBorder));
+			if(m_ItemHotBackgroundCustom)
+				xmlElem.SetAttribute("itemhotback",BarFunctions.ColorToString(m_ItemHotBackground));
+			if(m_ItemHotBackground2Custom)
+				xmlElem.SetAttribute("itemhotback2",BarFunctions.ColorToString(m_ItemHotBackground2));
+			if(m_ItemHotBackgroundGradientAngle!=90)
+				xmlElem.SetAttribute("itemhotbackga",m_ItemHotBackgroundGradientAngle.ToString());
+			if(m_ItemHotBorderCustom)
+				xmlElem.SetAttribute("itemhotb",BarFunctions.ColorToString(m_ItemHotBorder));
+			if(m_ItemHotTextCustom)
+				xmlElem.SetAttribute("itemhottext",BarFunctions.ColorToString(m_ItemHotText));
+			if(m_ItemPressedBackgroundCustom)
+				xmlElem.SetAttribute("itempressback",BarFunctions.ColorToString(m_ItemPressedBackground));
+			if(m_ItemPressedBackground2Custom)
+				xmlElem.SetAttribute("itempressback2",BarFunctions.ColorToString(m_ItemPressedBackground2));
+			if(m_ItemPressedBackgroundGradientAngle!=90)
+				xmlElem.SetAttribute("itempressbackga",m_ItemPressedBackgroundGradientAngle.ToString());
+			if(m_ItemPressedBorderCustom)
+				xmlElem.SetAttribute("itempressb",BarFunctions.ColorToString(m_ItemPressedBorder));
+			if(m_ItemPressedTextCustom)
+				xmlElem.SetAttribute("itempresstext",BarFunctions.ColorToString(m_ItemPressedText));
+			if(m_ItemSeparatorCustom)
+				xmlElem.SetAttribute("itemsep",BarFunctions.ColorToString(m_ItemSeparator));
+			if(m_ItemTextCustom)
+				xmlElem.SetAttribute("itemtext",BarFunctions.ColorToString(m_ItemText));
+			if(m_MenuBackgroundCustom)
+				xmlElem.SetAttribute("menuback",BarFunctions.ColorToString(m_MenuBackground));
+			if(m_MenuBackground2Custom)
+				xmlElem.SetAttribute("menuback2",BarFunctions.ColorToString(m_MenuBackground2));
+			if(m_MenuBackgroundGradientAngle!=0)
+				xmlElem.SetAttribute("menubackga",m_MenuBackgroundGradientAngle.ToString());
+			if(m_MenuBarBackgroundCustom)
+				xmlElem.SetAttribute("menubarback",BarFunctions.ColorToString(m_MenuBarBackground));
+			if(m_MenuBarBackground2Custom)
+				xmlElem.SetAttribute("menubarback2",BarFunctions.ColorToString(m_MenuBarBackground2));
+			if(m_MenuBarBackgroundGradientAngle!=90)
+				xmlElem.SetAttribute("menubarbackga",m_MenuBarBackgroundGradientAngle.ToString());
+			if(m_MenuBorderCustom)
+				xmlElem.SetAttribute("menub",BarFunctions.ColorToString(m_MenuBorder));
+			if(m_MenuSideCustom)
+				xmlElem.SetAttribute("menuside",BarFunctions.ColorToString(m_MenuSide));
+			if(m_MenuSide2Custom)
+				xmlElem.SetAttribute("menuside2",BarFunctions.ColorToString(m_MenuSide2));
+			if(m_MenuSideGradientAngle!=0)
+				xmlElem.SetAttribute("menusidega",m_MenuSideGradientAngle.ToString());
+			if(m_MenuUnusedBackgroundCustom)
+				xmlElem.SetAttribute("menuuback",BarFunctions.ColorToString(m_MenuUnusedBackground));
+			if(m_MenuUnusedSideCustom)
+				xmlElem.SetAttribute("menuuside",BarFunctions.ColorToString(m_MenuUnusedSide));
+			if(m_MenuUnusedSide2Custom)
+				xmlElem.SetAttribute("menuuside2",BarFunctions.ColorToString(m_MenuUnusedSide2));
+			if(m_MenuSideGradientAngle!=0)
+				xmlElem.SetAttribute("menuusidega",m_MenuSideGradientAngle.ToString());
+			if(m_ItemDesignTimeBorderCustom)
+				xmlElem.SetAttribute("menudtb",BarFunctions.ColorToString(m_ItemDesignTimeBorder));
+			if(m_CustomizeBackgroundCustom)
+				xmlElem.SetAttribute("customback",BarFunctions.ColorToString(m_CustomizeBackground));
+			if(m_CustomizeBackground2Custom)
+				xmlElem.SetAttribute("customback2",BarFunctions.ColorToString(m_CustomizeBackground2));
+			if(m_CustomizeTextCustom)
+				xmlElem.SetAttribute("customtext",BarFunctions.ColorToString(m_CustomizeText));
+			if(m_CustomizeBackgroundGradientAngle!=90)
+				xmlElem.SetAttribute("custombackga",m_CustomizeBackgroundGradientAngle.ToString());
+
+			// Panel Colors
+			if(m_PanelBackgroundCustom)
+				xmlElem.SetAttribute("panelback",BarFunctions.ColorToString(m_PanelBackground));
+			if(m_PanelBackground2Custom)
+				xmlElem.SetAttribute("panelback2",BarFunctions.ColorToString(m_PanelBackground2));
+			if(m_PanelBorderCustom)
+				xmlElem.SetAttribute("panelborder",BarFunctions.ColorToString(m_PanelBorder));
+			if(m_PanelTextCustom)
+				xmlElem.SetAttribute("paneltext",BarFunctions.ColorToString(m_PanelText));
+			if(m_PanelBackgroundGradientAngle!=90)
+				xmlElem.SetAttribute("panelbackga",m_PanelBackgroundGradientAngle.ToString());
+
+            // Splitter Colors
+            if (m_SplitterBackgroundCustom)
+                xmlElem.SetAttribute("splitterback", BarFunctions.ColorToString(m_SplitterBackground));
+            if (m_SplitterBackground2Custom)
+                xmlElem.SetAttribute("splitterback2", BarFunctions.ColorToString(m_SplitterBackground2));
+            if (m_SplitterBorderCustom)
+                xmlElem.SetAttribute("splitterborder", BarFunctions.ColorToString(m_SplitterBorder));
+            if (m_SplitterTextCustom)
+                xmlElem.SetAttribute("splittertext", BarFunctions.ColorToString(m_SplitterText));
+            if (m_SplitterBackgroundGradientAngle != 90)
+                xmlElem.SetAttribute("splitterbackga", m_SplitterBackgroundGradientAngle.ToString());
+
+			// Explorer Bar
+			if(m_ExplorerBarBackgroundCustom)
+				xmlElem.SetAttribute("exbarback",BarFunctions.ColorToString(m_ExplorerBarBackground));
+			if(m_ExplorerBarBackground2Custom)
+				xmlElem.SetAttribute("exbarback2",BarFunctions.ColorToString(m_ExplorerBarBackground2));
+			if(m_ExplorerBarBackgroundGradientAngle!=90)
+				xmlElem.SetAttribute("exbarbackga",m_ExplorerBarBackgroundGradientAngle.ToString());
+
+			// Dock Site colors
+			if(m_DockSiteBackColorCustom)
+				xmlElem.SetAttribute("dsback",BarFunctions.ColorToString(m_DockSiteBackColor));
+			if(m_DockSiteBackColor2Custom)
+				xmlElem.SetAttribute("dsback2",BarFunctions.ColorToString(m_DockSiteBackColor2));
+			if(m_DockSiteBackColorGradientAngle!=0)
+				xmlElem.SetAttribute("dsbackga",m_DockSiteBackColorGradientAngle.ToString());
+
+            if (!m_MdiSystemItemForeground.IsEmpty)
+                xmlElem.SetAttribute("mdisystemitemforeground", BarFunctions.ColorToString(m_MdiSystemItemForeground));
+
+			if(m_PredefinedColorScheme!=ePredefinedColorScheme.AutoGenerated)
+				xmlElem.SetAttribute("predefcolorscheme",System.Xml.XmlConvert.ToString(((int)m_PredefinedColorScheme)));
+		}
+
+		public void Deserialize(System.Xml.XmlElement xmlElem)
+		{
+			if(xmlElem.HasAttribute("predefcolorscheme"))
+				m_PredefinedColorScheme=(ePredefinedColorScheme)System.Xml.XmlConvert.ToInt32(xmlElem.GetAttribute("predefcolorscheme"));
+
+			this.Refresh();
+
+			if(xmlElem.HasAttribute("barback"))
+			{
+				m_BarBackground=BarFunctions.ColorFromString(xmlElem.GetAttribute("barback"));
+				m_BarBackgroundCustom=true;
+			}
+			if(xmlElem.HasAttribute("barback2"))
+			{
+				m_BarBackground2=BarFunctions.ColorFromString(xmlElem.GetAttribute("barback2"));
+				m_BarBackground2Custom=true;
+			}
+			if(xmlElem.HasAttribute("barbackga"))
+			{
+				m_BarBackgroundGradientAngle=System.Xml.XmlConvert.ToInt32(xmlElem.GetAttribute("barbackga"));
+			}
+			if(xmlElem.HasAttribute("barstripeclr"))
+			{
+				m_BarStripeColor=BarFunctions.ColorFromString(xmlElem.GetAttribute("barstripeclr"));
+				m_BarStripeColorCustom=true;
+			}
+			if(xmlElem.HasAttribute("barcapback"))
+			{
+				m_BarCaptionBackground=BarFunctions.ColorFromString(xmlElem.GetAttribute("barcapback"));
+				m_BarCaptionBackgroundCustom=true;
+			}
+			if(xmlElem.HasAttribute("barcapback2"))
+			{
+				m_BarCaptionBackground2=BarFunctions.ColorFromString(xmlElem.GetAttribute("barcapback2"));
+				m_BarCaptionBackground2Custom=true;
+			}
+			if(xmlElem.HasAttribute("barcapbackga"))
+			{
+				m_BarCaptionBackgroundGradientAngle=System.Xml.XmlConvert.ToInt32(xmlElem.GetAttribute("barcapbackga"));
+			}
+			if(xmlElem.HasAttribute("barcapiback"))
+			{
+				m_BarCaptionInactiveBackground=BarFunctions.ColorFromString(xmlElem.GetAttribute("barcapiback"));
+				m_BarCaptionInactiveBackgroundCustom=true;
+			}
+			if(xmlElem.HasAttribute("barcapiback2"))
+			{
+				m_BarCaptionInactiveBackground2=BarFunctions.ColorFromString(xmlElem.GetAttribute("barcapiback2"));
+				m_BarCaptionInactiveBackground2Custom=true;
+			}
+			if(xmlElem.HasAttribute("barcapibackga"))
+			{
+				m_BarCaptionInactiveBackgroundGAngle=System.Xml.XmlConvert.ToInt32(xmlElem.GetAttribute("barcapibackga"));
+			}
+			if(xmlElem.HasAttribute("barcapitext"))
+			{
+				m_BarCaptionInactiveText=BarFunctions.ColorFromString(xmlElem.GetAttribute("barcapitext"));
+				m_BarCaptionInactiveTextCustom=true;
+			}
+			if(xmlElem.HasAttribute("barcaptext"))
+			{
+				m_BarCaptionText=BarFunctions.ColorFromString(xmlElem.GetAttribute("barcaptext"));
+				m_BarCaptionTextCustom=true;
+			}
+			if(xmlElem.HasAttribute("barfloatb"))
+			{
+				m_BarFloatingBorder=BarFunctions.ColorFromString(xmlElem.GetAttribute("barfloatb"));
+				m_BarFloatingBorderCustom=true;
+			}
+			if(xmlElem.HasAttribute("bardockborder"))
+			{
+				m_BarDockedBorder=BarFunctions.ColorFromString(xmlElem.GetAttribute("bardockborder"));
+				m_BarDockedBorderCustom=true;
+			}
+			if(xmlElem.HasAttribute("barpopupback"))
+			{
+				m_BarPopupBackground=BarFunctions.ColorFromString(xmlElem.GetAttribute("barpopupback"));
+				m_BarPopupBackgroundCustom=true;
+			}
+			if(xmlElem.HasAttribute("barpopupb"))
+			{
+				m_BarPopupBorder=BarFunctions.ColorFromString(xmlElem.GetAttribute("barpopupb"));
+				m_BarPopupBorderCustom=true;
+			}
+			if(xmlElem.HasAttribute("itemback"))
+			{
+				m_ItemBackground=BarFunctions.ColorFromString(xmlElem.GetAttribute("itemback"));
+				m_ItemBackgroundCustom=true;
+			}
+			if(xmlElem.HasAttribute("itemback2"))
+			{
+				m_ItemBackground2=BarFunctions.ColorFromString(xmlElem.GetAttribute("itemback2"));
+				m_ItemBackground2Custom=true;
+			}
+			if(xmlElem.HasAttribute("itembackga"))
+			{
+				m_ItemBackgroundGradientAngle=System.Xml.XmlConvert.ToInt32(xmlElem.GetAttribute("itembackga"));
+			}
+
+			if(xmlElem.HasAttribute("itemchkback"))
+			{
+				m_ItemCheckedBackground=BarFunctions.ColorFromString(xmlElem.GetAttribute("itemchkback"));
+				m_ItemCheckedBackgroundCustom=true;
+			}
+			if(xmlElem.HasAttribute("itemchkback2"))
+			{
+				m_ItemCheckedBackground2=BarFunctions.ColorFromString(xmlElem.GetAttribute("itemchkback2"));
+				m_ItemCheckedBackground2Custom=true;
+			}
+			if(xmlElem.HasAttribute("itemchkbackga"))
+			{
+				m_ItemCheckedBackgroundGradientAngle=System.Xml.XmlConvert.ToInt32(xmlElem.GetAttribute("itemchkbackga"));
+			}
+			if(xmlElem.HasAttribute("itemchkb"))
+			{
+				m_ItemCheckedBorder=BarFunctions.ColorFromString(xmlElem.GetAttribute("itemchkb"));
+				m_ItemCheckedBorderCustom=true;
+			}
+			if(xmlElem.HasAttribute("itemchktext"))
+			{
+				m_ItemCheckedText=BarFunctions.ColorFromString(xmlElem.GetAttribute("itemchktext"));
+				m_ItemCheckedTextCustom=true;
+			}
+			if(xmlElem.HasAttribute("itemdisback"))
+			{
+				m_ItemDisabledBackground=BarFunctions.ColorFromString(xmlElem.GetAttribute("itemdisback"));
+				m_ItemDisabledBackgroundCustom=true;
+			}
+			if(xmlElem.HasAttribute("itemdistext"))
+			{
+				m_ItemDisabledText=BarFunctions.ColorFromString(xmlElem.GetAttribute("itemdistext"));
+				m_ItemDisabledTextCustom=true;
+			}
+			if(xmlElem.HasAttribute("itemexpshadow"))
+			{
+				m_ItemExpandedShadow=BarFunctions.ColorFromString(xmlElem.GetAttribute("itemexpshadow"));
+				m_ItemExpandedShadowCustom=true;
+			}
+			if(xmlElem.HasAttribute("itemexpback"))
+			{
+				m_ItemExpandedBackground=BarFunctions.ColorFromString(xmlElem.GetAttribute("itemexpback"));
+				m_ItemExpandedBackgroundCustom=true;
+			}
+			if(xmlElem.HasAttribute("itemexpback2"))
+			{
+				m_ItemExpandedBackground2=BarFunctions.ColorFromString(xmlElem.GetAttribute("itemexpback2"));
+				m_ItemExpandedBackground2Custom=true;
+			}
+			if(xmlElem.HasAttribute("itemexpbackga"))
+			{
+				m_ItemExpandedBackgroundGradientAngle=System.Xml.XmlConvert.ToInt32(xmlElem.GetAttribute("itemexpbackga"));
+			}
+			if(xmlElem.HasAttribute("itemexptext"))
+			{
+				m_ItemExpandedText=BarFunctions.ColorFromString(xmlElem.GetAttribute("itemexptext"));
+				m_ItemExpandedTextCustom=true;
+			}
+			if(xmlElem.HasAttribute("itemexpborder"))
+			{
+				m_ItemExpandedBorder=BarFunctions.ColorFromString(xmlElem.GetAttribute("itemexpborder"));
+				m_ItemExpandedBorderCustom=true;
+			}
+			if(xmlElem.HasAttribute("itemhotback"))
+			{
+				m_ItemHotBackground=BarFunctions.ColorFromString(xmlElem.GetAttribute("itemhotback"));
+				m_ItemHotBackgroundCustom=true;
+			}
+			if(xmlElem.HasAttribute("itemhotback2"))
+			{
+				m_ItemHotBackground2=BarFunctions.ColorFromString(xmlElem.GetAttribute("itemhotback2"));
+				m_ItemHotBackground2Custom=true;
+			}
+			if(xmlElem.HasAttribute("itemhotbackga"))
+			{
+				m_ItemHotBackgroundGradientAngle=System.Xml.XmlConvert.ToInt32(xmlElem.GetAttribute("itemhotbackga"));
+			}
+			if(xmlElem.HasAttribute("itemhotb"))
+			{
+				m_ItemHotBorder=BarFunctions.ColorFromString(xmlElem.GetAttribute("itemhotb"));
+				m_ItemHotBorderCustom=true;
+			}
+			if(xmlElem.HasAttribute("itemhottext"))
+			{
+				m_ItemHotText=BarFunctions.ColorFromString(xmlElem.GetAttribute("itemhottext"));
+				m_ItemHotTextCustom=true;
+			}
+			if(xmlElem.HasAttribute("itempressback"))
+			{
+				m_ItemPressedBackground=BarFunctions.ColorFromString(xmlElem.GetAttribute("itempressback"));
+				m_ItemPressedBackgroundCustom=true;
+			}
+			if(xmlElem.HasAttribute("itempressback2"))
+			{
+				m_ItemPressedBackground2=BarFunctions.ColorFromString(xmlElem.GetAttribute("itempressback2"));
+				m_ItemPressedBackground2Custom=true;
+			}
+			if(xmlElem.HasAttribute("itempressbackga"))
+			{
+				m_ItemPressedBackgroundGradientAngle=System.Xml.XmlConvert.ToInt32(xmlElem.GetAttribute("itempressbackga"));
+			}
+			if(xmlElem.HasAttribute("itempressb"))
+			{
+				m_ItemPressedBorder=BarFunctions.ColorFromString(xmlElem.GetAttribute("itempressb"));
+				m_ItemPressedBorderCustom=true;
+			}
+			if(xmlElem.HasAttribute("itempresstext"))
+			{
+				m_ItemPressedText=BarFunctions.ColorFromString(xmlElem.GetAttribute("itempresstext"));
+				m_ItemPressedTextCustom=true;
+			}
+			if(xmlElem.HasAttribute("itemsep"))
+			{
+				m_ItemSeparator=BarFunctions.ColorFromString(xmlElem.GetAttribute("itemsep"));
+				m_ItemSeparatorCustom=true;
+			}
+			if(xmlElem.HasAttribute("itemtext"))
+			{
+				m_ItemText=BarFunctions.ColorFromString(xmlElem.GetAttribute("itemtext"));
+				m_ItemTextCustom=true;
+			}
+			if(xmlElem.HasAttribute("menuback"))
+			{
+				m_MenuBackground=BarFunctions.ColorFromString(xmlElem.GetAttribute("menuback"));
+				m_MenuBackgroundCustom=true;
+			}
+			if(xmlElem.HasAttribute("menuback2"))
+			{
+				m_MenuBackground2=BarFunctions.ColorFromString(xmlElem.GetAttribute("menuback2"));
+				m_MenuBackground2Custom=true;
+			}
+			if(xmlElem.HasAttribute("menubackga"))
+			{
+				m_MenuBackgroundGradientAngle=System.Xml.XmlConvert.ToInt32(xmlElem.GetAttribute("menubackga"));
+			}
+			if(xmlElem.HasAttribute("menubarback"))
+			{
+				m_MenuBarBackground=BarFunctions.ColorFromString(xmlElem.GetAttribute("menubarback"));
+				m_MenuBarBackgroundCustom=true;
+			}
+			if(xmlElem.HasAttribute("menubarback2"))
+			{
+				m_MenuBarBackground2=BarFunctions.ColorFromString(xmlElem.GetAttribute("menubarback2"));
+				m_MenuBarBackground2Custom=true;
+			}
+			if(xmlElem.HasAttribute("menubarbackga"))
+			{
+				m_MenuBarBackgroundGradientAngle=System.Xml.XmlConvert.ToInt32(xmlElem.GetAttribute("menubarbackga"));
+			}
+			else m_MenuBarBackgroundGradientAngle=90;
+			if(xmlElem.HasAttribute("menub"))
+			{
+				m_MenuBorder=BarFunctions.ColorFromString(xmlElem.GetAttribute("menub"));
+				m_MenuBorderCustom=true;
+			}
+			if(xmlElem.HasAttribute("menuside"))
+			{
+				m_MenuSide=BarFunctions.ColorFromString(xmlElem.GetAttribute("menuside"));
+				m_MenuSideCustom=true;
+			}
+			if(xmlElem.HasAttribute("menuside2"))
+			{
+				m_MenuSide2=BarFunctions.ColorFromString(xmlElem.GetAttribute("menuside2"));
+				m_MenuSide2Custom=true;
+			}
+			if(xmlElem.HasAttribute("menusidega"))
+			{
+				m_MenuSideGradientAngle=System.Xml.XmlConvert.ToInt32(xmlElem.GetAttribute("menusidega"));
+			}
+			if(xmlElem.HasAttribute("menuuback"))
+			{
+				m_MenuUnusedBackground=BarFunctions.ColorFromString(xmlElem.GetAttribute("menuuback"));
+				m_MenuUnusedBackgroundCustom=true;
+			}
+			if(xmlElem.HasAttribute("menuuside"))
+			{
+				m_MenuUnusedSide=BarFunctions.ColorFromString(xmlElem.GetAttribute("menuuside"));
+				m_MenuUnusedSideCustom=true;
+			}
+			if(xmlElem.HasAttribute("menuuside2"))
+			{
+				m_MenuUnusedSide2=BarFunctions.ColorFromString(xmlElem.GetAttribute("menuuside2"));
+				m_MenuUnusedSide2Custom=true;
+			}
+			if(xmlElem.HasAttribute("menuusidega"))
+			{
+				m_MenuUnusedSideGradientAngle=System.Xml.XmlConvert.ToInt32(xmlElem.GetAttribute("menuusidega"));
+			}
+			if(xmlElem.HasAttribute("menudtb"))
+			{
+				m_ItemDesignTimeBorder=BarFunctions.ColorFromString(xmlElem.GetAttribute("menudtb"));
+				m_ItemDesignTimeBorderCustom=true;
+			}
+			if(xmlElem.HasAttribute("customback"))
+			{
+				m_CustomizeBackground=BarFunctions.ColorFromString(xmlElem.GetAttribute("customback"));
+				m_CustomizeBackgroundCustom=true;
+			}
+			if(xmlElem.HasAttribute("customback2"))
+			{
+				m_CustomizeBackground2=BarFunctions.ColorFromString(xmlElem.GetAttribute("customback2"));
+				m_CustomizeBackground2Custom=true;
+			}
+			if(xmlElem.HasAttribute("customtext"))
+			{
+				m_CustomizeText=BarFunctions.ColorFromString(xmlElem.GetAttribute("customtext"));
+				m_CustomizeTextCustom=true;
+			}
+			if(xmlElem.HasAttribute("custombackga"))
+			{
+				m_CustomizeBackgroundGradientAngle=System.Xml.XmlConvert.ToInt32(xmlElem.GetAttribute("custombackga"));
+			}
+
+			// Panel Colors
+			if(xmlElem.HasAttribute("panelback"))
+			{
+				m_PanelBackgroundCustom=true;
+				m_PanelBackground=BarFunctions.ColorFromString(xmlElem.GetAttribute("panelback"));
+			}
+			if(xmlElem.HasAttribute("panelback2"))
+			{
+				m_PanelBackground2Custom=true;
+				m_PanelBackground2=BarFunctions.ColorFromString(xmlElem.GetAttribute("panelback2"));
+			}
+			if(xmlElem.HasAttribute("panelborder"))
+			{
+				m_PanelBorderCustom=true;
+				m_PanelBorder=BarFunctions.ColorFromString(xmlElem.GetAttribute("panelborder"));
+			}
+			if(xmlElem.HasAttribute("paneltext"))
+			{
+				m_PanelTextCustom=true;
+				m_PanelText=BarFunctions.ColorFromString(xmlElem.GetAttribute("paneltext"));
+			}
+			if(xmlElem.HasAttribute("panelbackga"))
+			{
+				m_PanelBackgroundGradientAngle=System.Xml.XmlConvert.ToInt32(xmlElem.GetAttribute("panelbackga"));
+			}
+
+            // Splitter Colors
+            if (xmlElem.HasAttribute("splitterback"))
+            {
+                m_SplitterBackgroundCustom = true;
+                m_SplitterBackground = BarFunctions.ColorFromString(xmlElem.GetAttribute("Splitterback"));
+            }
+            if (xmlElem.HasAttribute("splitterback2"))
+            {
+                m_SplitterBackground2Custom = true;
+                m_SplitterBackground2 = BarFunctions.ColorFromString(xmlElem.GetAttribute("Splitterback2"));
+            }
+            if (xmlElem.HasAttribute("splitterborder"))
+            {
+                m_SplitterBorderCustom = true;
+                m_SplitterBorder = BarFunctions.ColorFromString(xmlElem.GetAttribute("Splitterborder"));
+            }
+            if (xmlElem.HasAttribute("splittertext"))
+            {
+                m_SplitterTextCustom = true;
+                m_SplitterText = BarFunctions.ColorFromString(xmlElem.GetAttribute("Splittertext"));
+            }
+            if (xmlElem.HasAttribute("splitterbackga"))
+            {
+                m_SplitterBackgroundGradientAngle = System.Xml.XmlConvert.ToInt32(xmlElem.GetAttribute("Splitterbackga"));
+            }
+
+			// Explorer Bar Colors
+			if(xmlElem.HasAttribute("exbarback"))
+			{
+				m_ExplorerBarBackgroundCustom=true;
+				m_ExplorerBarBackground=BarFunctions.ColorFromString(xmlElem.GetAttribute("exbarback"));
+			}
+			if(xmlElem.HasAttribute("exbarback2"))
+			{
+				m_ExplorerBarBackground2Custom=true;
+				m_ExplorerBarBackground2=BarFunctions.ColorFromString(xmlElem.GetAttribute("exbarback2"));
+			}
+			if(xmlElem.HasAttribute("exbarbackga"))
+			{
+				m_ExplorerBarBackgroundGradientAngle=System.Xml.XmlConvert.ToInt32(xmlElem.GetAttribute("exbarbackga"));
+			}
+
+			// Dock Site colors
+			// Explorer Bar Colors
+			if(xmlElem.HasAttribute("dsback"))
+			{
+				m_DockSiteBackColorCustom=true;
+				m_DockSiteBackColor=BarFunctions.ColorFromString(xmlElem.GetAttribute("dsback"));
+			}
+			if(xmlElem.HasAttribute("dsback2"))
+			{
+				m_DockSiteBackColor2Custom=true;
+				m_DockSiteBackColor2=BarFunctions.ColorFromString(xmlElem.GetAttribute("dsback2"));
+			}
+			if(xmlElem.HasAttribute("dsbackga"))
+				m_DockSiteBackColorGradientAngle=System.Xml.XmlConvert.ToInt32(xmlElem.GetAttribute("dsbackga"));
+
+            if (xmlElem.HasAttribute("mdisystemitemforeground"))
+            {
+                m_MdiSystemItemForeground = BarFunctions.ColorFromString(xmlElem.GetAttribute("mdisystemitemforeground"));
+            }
+            else
+                m_MdiSystemItemForeground = Color.Empty;
+		}
+		#endregion
+	}
+
+	#region Enums
+	/// <summary>
+	/// Specifies the type of predefined color scheme in ColorScheme object.
+	/// </summary>
+	public enum ePredefinedColorScheme
+	{
+		/// <summary>
+		/// Default value. DotNetBar will automatically change and generate color scheme depending on system colors.
+		/// </summary>
+		AutoGenerated=0,
+		/// <summary>
+		/// Blue Office 2003 Color Scheme. This setting specifies that this color scheme will be used regardless of system color setting on user machine.
+		/// </summary>
+		Blue2003=1,
+		/// <summary>
+		/// Olive Green Office 2003 Color Scheme. This setting specifies that this color scheme will be used regardless of system color setting on user machine.
+		/// </summary>
+		OliveGreen2003=2,
+		/// <summary>
+		/// Silver Office 2003 Color Scheme. This setting specifies that this color scheme will be used regardless of system color setting on user machine.
+		/// </summary>
+		Silver2003=3,
+        /// <summary>
+        /// Always use system colors to auto-generate color scheme.
+        /// </summary>
+        SystemColors
+	}
+
+	/// <summary>
+	///     Specifies a color scheme member.
+	/// </summary>
+	public enum eColorSchemePart
+	{
+		BarBackground,
+		BarBackground2,
+		BarCaptionBackground,
+        BarCaptionBackground2,
+		BarCaptionInactiveBackground,
+        BarCaptionInactiveBackground2,
+		BarCaptionInactiveText,
+		BarCaptionText,
+		BarDockedBorder,
+		BarFloatingBorder,
+		BarPopupBackground,
+		BarPopupBorder,
+		BarStripeColor,
+		CustomizeBackground,
+		CustomizeBackground2,
+		CustomizeText,
+		ItemBackground,
+        ItemBackground2,
+		ItemCheckedBackground,
+		ItemCheckedBackground2,
+		ItemCheckedBorder,
+		ItemCheckedText,
+		ItemDesignTimeBorder,
+		ItemDisabledBackground,
+		ItemDisabledText,
+		ItemExpandedBackground,
+		ItemExpandedBackground2,
+        ItemExpandedBorder,
+		ItemExpandedShadow,
+		ItemExpandedText,
+		ItemHotBackground,
+		ItemHotBackground2,
+		ItemHotBorder,
+		ItemHotText,
+		ItemPressedBackground,
+		ItemPressedBackground2,
+        ItemPressedBorder,
+        ItemPressedText,
+		ItemSeparator,
+		ItemSeparatorShade,
+        ItemText,
+        MenuBackground,
+		MenuBackground2,
+		MenuBarBackground,
+        MenuBarBackground2,
+		MenuBorder,
+        MenuSide,
+		MenuSide2,
+        MenuUnusedBackground,
+		MenuUnusedSide,
+		MenuUnusedSide2,
+		PanelBackground,
+		PanelBackground2,
+		PanelBorder,
+		PanelText,
+        SplitterBackground,
+        SplitterBackground2,
+        SplitterBorder,
+        SplitterText,
+		ExplorerBarBackground,
+		ExplorerBarBackground2,
+		Custom,
+		None,
+		DockSiteBackColor,
+		DockSiteBackColor2
+	}
+	#endregion
+}
diff --git a/PROMS/DotNetBar Source Code/ColorSchemeEditor.cs b/PROMS/DotNetBar Source Code/ColorSchemeEditor.cs
new file mode 100644
index 00000000..f9d4f46b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/ColorSchemeEditor.cs	
@@ -0,0 +1,384 @@
+using System;
+using System.Drawing;
+using System.Collections;
+using System.ComponentModel;
+using System.Windows.Forms;
+using System.Xml;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Summary description for ColorSchemeEditor.
+	/// </summary>
+	public class ColorSchemeEditor : System.Windows.Forms.Form
+	{
+		private System.Windows.Forms.PropertyGrid propertyGrid1;
+		private System.Windows.Forms.GroupBox groupBox1;
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.Container components = null;
+		private ColorScheme m_ColorScheme=null;
+		private System.Windows.Forms.Button button1;
+		private System.Windows.Forms.Button button2;
+		private MenuPanel m_Menu=null;
+		private Bar m_SimpleBar=null;
+		private Bar m_FloatBar=null;
+		private System.Windows.Forms.Button button3;
+		private Bar m_PopupBar=null;
+		private System.Windows.Forms.Button btnSaveScheme;
+		private System.Windows.Forms.Button btnLoadScheme;
+		private System.Windows.Forms.OpenFileDialog openFileDialog1;
+		private System.Windows.Forms.SaveFileDialog saveFileDialog1;
+		public bool ColorSchemeChanged=false;
+
+		public ColorSchemeEditor()
+		{
+			//
+			// Required for Windows Form Designer support
+			//
+			InitializeComponent();
+			this.StartPosition=FormStartPosition.CenterScreen;
+		}
+
+		private void AddDotNetBarControls()
+		{
+			if(m_Menu!=null)
+			{
+				m_Menu.RecalcSize();
+				m_SimpleBar.Size=new Size(groupBox1.ClientRectangle.Width-12,16);
+				m_SimpleBar.RecalcSize();
+				m_FloatBar.Size=new Size(groupBox1.ClientRectangle.Width,16);
+				m_FloatBar.RecalcSize();
+				m_PopupBar.Size=new Size(groupBox1.ClientRectangle.Width,24);
+				m_PopupBar.RecalcSize();
+				return;
+			}
+
+			m_Menu=new MenuPanel();
+			m_Menu.PopupMenu=false;
+			m_Menu.Location=new Point(8,135);
+
+			// Create Simple Toolbar
+			m_SimpleBar=new Bar();
+			m_SimpleBar.PassiveBar=true;
+			m_SimpleBar.Location=new Point(4,16);
+			m_SimpleBar.ThemeAware=false;
+
+			m_FloatBar=new Bar();
+			m_FloatBar.PassiveBar=true;
+			m_FloatBar.Location=new Point(4,46);
+			m_FloatBar.ThemeAware=false;
+
+			m_PopupBar=new Bar();
+			m_PopupBar.PassiveBar=true;
+			m_PopupBar.Location=new Point(4,96);
+			m_PopupBar.ThemeAware=false;
+
+			ButtonItem menuItem=new ButtonItem();
+			ButtonItem item, item2;
+			Bitmap bmp=null;
+
+			item=new ButtonItem("new","&New...");
+			bmp=BarFunctions.LoadBitmap("BarEditorImages.FileNew.bmp");
+			bmp.MakeTransparent(Color.Magenta);
+			item.Image=bmp;
+			m_SimpleBar.Items.Add(item.Copy());
+			m_FloatBar.Items.Add(item.Copy());
+			m_PopupBar.Items.Add(item.Copy());
+			menuItem.SubItems.Add(item);
+			item=new ButtonItem("open","&Open");
+			bmp=BarFunctions.LoadBitmap("BarEditorImages.FileOpen.bmp");
+			bmp.MakeTransparent(Color.Magenta);
+			item.Image=bmp;
+			item2=(ButtonItem)item.Copy();
+			item2.ButtonStyle=eButtonStyle.ImageAndText;
+			m_SimpleBar.Items.Add(item2);
+			m_FloatBar.Items.Add(item2.Copy());
+			m_PopupBar.Items.Add(item2.Copy());
+			menuItem.SubItems.Add(item);
+			item=new ButtonItem("close","&Close");
+			bmp=BarFunctions.LoadBitmap("BarEditorImages.FileClose.bmp");
+			bmp.MakeTransparent(Color.Magenta);
+			item.Image=bmp;
+			item2=(ButtonItem)item.Copy();
+			item2.Checked=true;
+			item2.ButtonStyle=eButtonStyle.ImageAndText;
+			m_SimpleBar.Items.Add(item2);
+			m_PopupBar.Items.Add(item2.Copy());
+			item2=(ButtonItem)item2.Copy();
+			item2.Enabled=false;
+			m_FloatBar.Items.Add(item2.Copy());
+			menuItem.SubItems.Add(item);
+			item=new ButtonItem("open","Add Ne&w Item...");
+			menuItem.SubItems.Add(item);
+			item=new ButtonItem("open","Add Existin&g Item...");
+			menuItem.SubItems.Add(item);
+			item=new ButtonItem("opensol","Open Solution...");
+			item.BeginGroup=true;
+			bmp=BarFunctions.LoadBitmap("BarEditorImages.FileOpenSol.bmp");
+			bmp.MakeTransparent(Color.Magenta);
+			item.Image=bmp;
+			item2=(ButtonItem)item.Copy();
+			item2.Enabled=false;
+			m_SimpleBar.Items.Add(item2);
+			m_FloatBar.Items.Add(item2.Copy());
+			m_PopupBar.Items.Add(item2.Copy());
+			menuItem.SubItems.Add(item);
+			item=new ButtonItem("open","Close Solution");
+			bmp=BarFunctions.LoadBitmap("BarEditorImages.FileCloseSol.bmp");
+			bmp.MakeTransparent(Color.Magenta);
+			item.Image=bmp;
+			item.Enabled=false;
+			menuItem.SubItems.Add(item);
+
+			m_Menu.ParentItem=menuItem;
+
+			groupBox1.Controls.Add(m_Menu);
+			m_Menu.RecalcSize();
+			m_Menu.Show();
+            
+			//m_SimpleBar.SetBarState(eBarState.Docked);
+			m_SimpleBar.Size=new Size(groupBox1.ClientRectangle.Width,16);
+			m_SimpleBar.GrabHandleStyle=eGrabHandleStyle.StripeFlat;
+			groupBox1.Controls.Add(m_SimpleBar);
+			m_SimpleBar.RecalcSize();
+			m_SimpleBar.Show();
+
+			m_FloatBar.SetBarState(eBarState.Floating);
+			m_FloatBar.Size=new Size(groupBox1.ClientRectangle.Width,16);
+			groupBox1.Controls.Add(m_FloatBar);
+			m_FloatBar.Text="Bar Caption";
+			m_FloatBar.RecalcSize();
+			m_FloatBar.Show();
+
+			m_PopupBar.SetBarState(eBarState.Popup);
+			m_PopupBar.Size=new Size(groupBox1.ClientRectangle.Width,24);
+			m_PopupBar.PopupWidth=groupBox1.ClientRectangle.Width;
+			groupBox1.Controls.Add(m_PopupBar);
+			m_PopupBar.RecalcSize();
+			m_PopupBar.Show();
+		}
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		protected override void Dispose( bool disposing )
+		{
+			if( disposing )
+			{
+				if(components != null)
+				{
+					components.Dispose();
+				}
+			}
+			base.Dispose( disposing );
+		}
+
+		#region Windows Form 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.propertyGrid1 = new System.Windows.Forms.PropertyGrid();
+			this.groupBox1 = new System.Windows.Forms.GroupBox();
+			this.button1 = new System.Windows.Forms.Button();
+			this.button2 = new System.Windows.Forms.Button();
+			this.button3 = new System.Windows.Forms.Button();
+			this.btnSaveScheme = new System.Windows.Forms.Button();
+			this.btnLoadScheme = new System.Windows.Forms.Button();
+			this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog();
+			this.saveFileDialog1 = new System.Windows.Forms.SaveFileDialog();
+			this.SuspendLayout();
+			// 
+			// propertyGrid1
+			// 
+			this.propertyGrid1.CommandsVisibleIfAvailable = true;
+			this.propertyGrid1.LargeButtons = false;
+			this.propertyGrid1.LineColor = System.Drawing.SystemColors.ScrollBar;
+			this.propertyGrid1.Location = new System.Drawing.Point(208, 4);
+			this.propertyGrid1.Name = "propertyGrid1";
+			this.propertyGrid1.Size = new System.Drawing.Size(352, 299);
+			this.propertyGrid1.TabIndex = 0;
+			this.propertyGrid1.Text = "propertyGrid1";
+			this.propertyGrid1.ViewBackColor = System.Drawing.SystemColors.Window;
+			this.propertyGrid1.ViewForeColor = System.Drawing.SystemColors.WindowText;
+			this.propertyGrid1.PropertyValueChanged += new System.Windows.Forms.PropertyValueChangedEventHandler(this.propertyGrid1_PropertyValueChanged);
+			// 
+			// groupBox1
+			// 
+			this.groupBox1.Location = new System.Drawing.Point(10, 0);
+			this.groupBox1.Name = "groupBox1";
+			this.groupBox1.Size = new System.Drawing.Size(190, 303);
+			this.groupBox1.TabIndex = 1;
+			this.groupBox1.TabStop = false;
+			this.groupBox1.Text = "Color Scheme Preview:";
+			// 
+			// button1
+			// 
+			this.button1.FlatStyle = System.Windows.Forms.FlatStyle.System;
+			this.button1.Location = new System.Drawing.Point(404, 307);
+			this.button1.Name = "button1";
+			this.button1.Size = new System.Drawing.Size(76, 24);
+			this.button1.TabIndex = 2;
+			this.button1.Text = "OK";
+			this.button1.Click += new System.EventHandler(this.button1_Click);
+			// 
+			// button2
+			// 
+			this.button2.FlatStyle = System.Windows.Forms.FlatStyle.System;
+			this.button2.Location = new System.Drawing.Point(316, 307);
+			this.button2.Name = "button2";
+			this.button2.Size = new System.Drawing.Size(76, 24);
+			this.button2.TabIndex = 3;
+			this.button2.Text = "&Reset";
+			this.button2.Click += new System.EventHandler(this.button2_Click);
+			// 
+			// button3
+			// 
+			this.button3.FlatStyle = System.Windows.Forms.FlatStyle.System;
+			this.button3.Location = new System.Drawing.Point(484, 307);
+			this.button3.Name = "button3";
+			this.button3.Size = new System.Drawing.Size(76, 24);
+			this.button3.TabIndex = 4;
+			this.button3.Text = "Cancel";
+			this.button3.Click += new System.EventHandler(this.button3_Click);
+			// 
+			// btnSaveScheme
+			// 
+			this.btnSaveScheme.FlatStyle = System.Windows.Forms.FlatStyle.System;
+			this.btnSaveScheme.Location = new System.Drawing.Point(10, 308);
+			this.btnSaveScheme.Name = "btnSaveScheme";
+			this.btnSaveScheme.Size = new System.Drawing.Size(92, 24);
+			this.btnSaveScheme.TabIndex = 5;
+			this.btnSaveScheme.Text = "Save Scheme...";
+			this.btnSaveScheme.Click += new System.EventHandler(this.btnSaveScheme_Click);
+			// 
+			// btnLoadScheme
+			// 
+			this.btnLoadScheme.FlatStyle = System.Windows.Forms.FlatStyle.System;
+			this.btnLoadScheme.Location = new System.Drawing.Point(107, 308);
+			this.btnLoadScheme.Name = "btnLoadScheme";
+			this.btnLoadScheme.Size = new System.Drawing.Size(92, 24);
+			this.btnLoadScheme.TabIndex = 6;
+			this.btnLoadScheme.Text = "Load Scheme...";
+			this.btnLoadScheme.Click += new System.EventHandler(this.btnLoadScheme_Click);
+			// 
+			// openFileDialog1
+			// 
+			this.openFileDialog1.DefaultExt = "*.dcs";
+			this.openFileDialog1.Filter = "DotNetBar Color Scheme files|*.dcs|All files|*.*";
+			this.openFileDialog1.Title = "Open DotNetBar Color Scheme File";
+			// 
+			// saveFileDialog1
+			// 
+			this.saveFileDialog1.DefaultExt = "dcs";
+			this.saveFileDialog1.FileName = "colorscheme1";
+			this.saveFileDialog1.Filter = "DotNetBar Color Scheme files|*.dcs|All files|*.*";
+			this.saveFileDialog1.Title = "Save DotNetBar Color Scheme File";
+			// 
+			// ColorSchemeEditor
+			// 
+			this.AutoScaleBaseSize = new System.Drawing.Size(5, 13);
+			this.ClientSize = new System.Drawing.Size(567, 338);
+			this.Controls.AddRange(new System.Windows.Forms.Control[] {
+																		  this.btnLoadScheme,
+																		  this.btnSaveScheme,
+																		  this.button3,
+																		  this.button2,
+																		  this.button1,
+																		  this.groupBox1,
+																		  this.propertyGrid1});
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.Name = "ColorSchemeEditor";
+			this.Text = "ColorScheme Editor";
+			this.Load += new System.EventHandler(this.ColorSchemeEditorLoad);
+			this.ResumeLayout(false);
+
+		}
+		#endregion
+
+		private void ColorSchemeEditorLoad(object sender, EventArgs e)
+		{
+			AddDotNetBarControls();
+		}
+
+		private void propertyGrid1_PropertyValueChanged(object s, System.Windows.Forms.PropertyValueChangedEventArgs e)
+		{
+			m_Menu.Refresh();
+			m_SimpleBar.Refresh();
+			m_FloatBar.Refresh();
+			m_PopupBar.Refresh();
+			ColorSchemeChanged=true;
+		}
+
+		private void button1_Click(object sender, System.EventArgs e)
+		{
+			this.Hide();
+		}
+
+		private void button2_Click(object sender, System.EventArgs e)
+		{
+			if(MessageBox.Show("Reseting the Color Scheme will destroy any changes you made. Are you sure you want to reset the Color Scheme?","Color Scheme Editor",MessageBoxButtons.YesNo)==DialogResult.Yes)
+			{
+				this.ColorScheme=new ColorScheme(this.ColorScheme.Style);
+				ColorSchemeChanged=true;
+			}
+		}
+
+		private void button3_Click(object sender, System.EventArgs e)
+		{
+			ColorSchemeChanged=false;
+			this.Hide();
+		}
+
+		private void btnSaveScheme_Click(object sender, System.EventArgs e)
+		{
+			if(saveFileDialog1.ShowDialog()==DialogResult.OK)
+			{
+				XmlDocument doc=new XmlDocument();
+				XmlElement elem1=doc.CreateElement("colorschemes");
+				doc.AppendChild(elem1);
+				XmlElement elem2=doc.CreateElement("colorscheme");
+				elem1.AppendChild(elem2);
+				m_ColorScheme.Serialize(elem2);
+				doc.Save(saveFileDialog1.FileName);
+				MessageBox.Show("Color Scheme has been saved.","DotNetBar Color Scheme Editor",MessageBoxButtons.OK,MessageBoxIcon.Information);
+			}
+		}
+
+		private void btnLoadScheme_Click(object sender, System.EventArgs e)
+		{
+			if(openFileDialog1.ShowDialog()==DialogResult.OK && System.IO.File.Exists(openFileDialog1.FileName))
+			{
+				DevComponents.DotNetBar.ColorScheme scheme=new ColorScheme();
+				XmlDocument doc=new XmlDocument();
+				doc.Load(openFileDialog1.FileName);
+				scheme.Deserialize(doc.FirstChild.FirstChild as XmlElement);
+				this.ColorScheme=scheme;
+				ColorSchemeChanged=true;
+			}
+		}
+
+		public DevComponents.DotNetBar.ColorScheme ColorScheme
+		{
+			get {return m_ColorScheme;}
+			set
+			{
+				if(m_Menu==null)
+					AddDotNetBarControls();
+				m_ColorScheme=value;
+				propertyGrid1.SelectedObject=m_ColorScheme;
+				m_Menu.ColorScheme=m_ColorScheme;
+				m_SimpleBar.ColorScheme=m_ColorScheme;
+				m_FloatBar.ColorScheme=m_ColorScheme;
+				m_PopupBar.ColorScheme=m_ColorScheme;
+				ColorSchemeChanged=false;
+			}
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/ColorSchemeEditor.resx b/PROMS/DotNetBar Source Code/ColorSchemeEditor.resx
new file mode 100644
index 00000000..87c738c3
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/ColorSchemeEditor.resx	
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+            Microsoft ResX Schema 
+        
+            Version 1.3
+                
+            The primary goals of this format is to allow a simple XML format 
+            that is mostly human readable. The generation and parsing of the 
+            various data types are done through the TypeConverter classes 
+            associated with the data types.
+        
+            Example:
+        
+                ... ado.net/XML headers & schema ...
+                <resheader name="resmimetype">text/microsoft-resx</resheader>
+                <resheader name="version">1.3</resheader>
+                <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+                <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+                <data name="Name1">this is my long string</data>
+                <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+                <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+                    [base64 mime encoded serialized .NET Framework object]
+                </data>
+                <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+                    [base64 mime encoded string representing a byte array form of the .NET Framework object]
+                </data>
+        
+            There are any number of "resheader" rows that contain simple 
+            name/value pairs.
+            
+            Each data row contains a name, and value. The row also contains a 
+            type or mimetype. Type corresponds to a .NET class that support 
+            text/value conversion through the TypeConverter architecture. 
+            Classes that don't support this are serialized and stored with the 
+            mimetype set.
+                     
+            The mimetype is used for serialized objects, and tells the 
+            ResXResourceReader how to depersist the object. This is currently not 
+            extensible. For a given mimetype the value must be set accordingly:
+        
+            Note - application/x-microsoft.net.object.binary.base64 is the format 
+                   that the ResXResourceWriter will generate, however the reader can 
+                   read any of the formats listed below.
+        
+            mimetype: application/x-microsoft.net.object.binary.base64
+            value   : The object must be serialized with 
+                    : System.Serialization.Formatters.Binary.BinaryFormatter
+                    : and then encoded with base64 encoding.
+        
+            mimetype: application/x-microsoft.net.object.soap.base64
+            value   : The object must be serialized with 
+                    : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+                    : and then encoded with base64 encoding.
+            mimetype: application/x-microsoft.net.object.bytearray.base64
+            value   : The object must be serialized into a byte array 
+                    : using a System.ComponentModel.TypeConverter
+                    : and then encoded with base64 encoding.
+        -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>1.3</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="openFileDialog1.Location" type="System.Drawing.Point, System.Drawing, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </data>
+  <data name="saveFileDialog1.Location" type="System.Drawing.Point, System.Drawing, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>147, 17</value>
+  </data>
+  <data name="$this.Name">
+    <value>ColorSchemeEditor</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/ColorSchemeVSEditor.cs b/PROMS/DotNetBar Source Code/ColorSchemeVSEditor.cs
new file mode 100644
index 00000000..52494321
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/ColorSchemeVSEditor.cs	
@@ -0,0 +1,66 @@
+using System;
+using System.Drawing.Design;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Summary description for ColorSchemeVSEditor.
+	/// </summary>
+	public sealed class ColorSchemeVSEditor:UITypeEditor
+	{
+		private System.Windows.Forms.Design.IWindowsFormsEditorService m_EditorService=null;
+		public ColorSchemeVSEditor()
+		{
+		}
+		public override System.Drawing.Design.UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext context) 
+		{
+			if (context != null && context.Instance != null) 
+			{
+				return System.Drawing.Design.UITypeEditorEditStyle.Modal;
+			}
+			return base.GetEditStyle(context);
+		}
+		public override object EditValue(ITypeDescriptorContext context, IServiceProvider provider, object value) 
+		{
+			if (context!=null && context.Instance!=null && provider!=null) 
+			{
+				m_EditorService=(System.Windows.Forms.Design.IWindowsFormsEditorService)provider.GetService(typeof(System.Windows.Forms.Design.IWindowsFormsEditorService));
+				
+				if(m_EditorService!=null) 
+				{
+					if(context.Instance is Bar)
+					{
+						Bar bar=context.Instance as Bar;
+						if(bar.Owner is DotNetBarManager && ((DotNetBarManager)bar.Owner).UseGlobalColorScheme)
+							System.Windows.Forms.MessageBox.Show("Please note that your DotNetBarManager has its UseGlobalColorScheme set to true and any changes you make to ColorScheme object on the bar will not be used.");
+					}
+					else if(context.Instance is DotNetBarManager && !((DotNetBarManager)context.Instance).UseGlobalColorScheme)
+					{
+						System.Windows.Forms.MessageBox.Show("Please note that you need to set UseGlobalColorScheme=true in order for all bars to use ColorScheme you change on this dialog.");
+					}
+
+					if(value==null)
+						value=new ColorScheme();
+					ColorSchemeEditor editor=new ColorSchemeEditor();
+					editor.CreateControl();
+					editor.ColorScheme=(ColorScheme)value;
+					m_EditorService.ShowDialog(editor);
+					if(editor.ColorSchemeChanged)
+					{
+						value=editor.ColorScheme;
+						context.OnComponentChanged();
+						((ColorScheme)value)._DesignTimeSchemeChanged=true;
+						if(context.Instance is Bar)
+						{
+							((Bar)context.Instance).Refresh();
+						}
+					}
+					editor.Close();
+				}
+			}
+			
+			return value;
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/ColorTypeEditor.cs b/PROMS/DotNetBar Source Code/ColorTypeEditor.cs
new file mode 100644
index 00000000..ef7a4ad8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/ColorTypeEditor.cs	
@@ -0,0 +1,131 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Reflection;
+using System.Windows.Forms.Design;
+using DevComponents.UI;
+using System.Windows.Forms;
+
+#if AdvTree
+namespace DevComponents.Tree
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar
+#endif
+{
+	/// <summary>
+	/// Represents Color type editor with support for color schemes.
+	/// </summary>
+	public class ColorTypeEditor:UITypeEditor 
+	{
+		private IWindowsFormsEditorService m_EditorService=null;
+
+		/// <summary>
+		/// Edits the value of the specified object using the editor style indicated by GetEditStyle.
+		/// </summary>
+		/// <param name="context">An ITypeDescriptorContext that can be used to gain additional context information.</param>
+		/// <param name="provider">An IServiceProvider that this editor can use to obtain services.</param>
+		/// <param name="value">The object to edit.</param>
+		/// <returns>The new value of the object.</returns>
+		public override object EditValue(ITypeDescriptorContext context, IServiceProvider provider, object value) 
+		{
+			if (context != null && context.Instance != null && provider != null) 
+			{
+				m_EditorService = provider.GetService(typeof(IWindowsFormsEditorService)) as IWindowsFormsEditorService;
+
+				ColorScheme cs=null;
+				if(context.Instance!=null)
+				{
+                    MethodInfo method = null;
+                    if (context.Instance is object[])
+                    {
+                        method = ((object[])context.Instance)[0].GetType().GetMethod("GetColorScheme", BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance);
+                        if (method != null)
+                        {
+                            cs = method.Invoke(((object[])context.Instance)[0], null) as ColorScheme;
+                        }
+                    }
+                    else
+                    {
+                        method = context.Instance.GetType().GetMethod("GetColorScheme", BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance);
+                        if (method != null)
+                        {
+                            cs = method.Invoke(context.Instance, null) as ColorScheme;
+                        }
+                    }
+                    
+				}
+				
+				Color colorValue=(Color)value;
+
+				if(m_EditorService!=null)
+				{
+					ColorPicker colorPicker=new ColorPicker();
+					colorPicker.EditorService=m_EditorService;
+					colorPicker.BackColor=SystemColors.Control;
+					colorPicker.ColorScheme=cs;
+					colorPicker.SelectedColor=colorValue;
+
+					string propertyName=context.PropertyDescriptor.Name;
+                    PropertyInfo property = null;
+                    if (context.Instance is object[])
+                        property = ((object[])context.Instance)[0].GetType().GetProperty(propertyName + "SchemePart", BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance);
+                    else
+    					property=context.Instance.GetType().GetProperty(propertyName+"SchemePart",BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance);
+					
+                    if(property!=null)
+					{
+                        if (context.Instance is object[])
+                            colorPicker.SelectedColorSchemeName = property.GetValue(((object[])context.Instance)[0], null).ToString();
+                        else
+    						colorPicker.SelectedColorSchemeName=property.GetValue(context.Instance,null).ToString();
+					}
+                    colorPicker.UpdateUIWithSelection();
+
+					m_EditorService.DropDownControl(colorPicker);
+					if(!colorPicker.Canceled)
+					{
+						Color returnColor=colorPicker.SelectedColor;
+						eColorSchemePart schemePart=eColorSchemePart.None;
+						if(colorPicker.SelectedColorSchemeName!="")
+						{
+							schemePart=(eColorSchemePart)Enum.Parse(typeof(eColorSchemePart),colorPicker.SelectedColorSchemeName);
+						}
+						if(property!=null)
+						{
+                            if (context.Instance is object[])
+                            {
+                                object[] objects = (object[])context.Instance;
+                                foreach (object item in objects)
+                                {
+                                    property = item.GetType().GetProperty(propertyName + "SchemePart", BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance);
+                                    property.SetValue(item, schemePart, null);
+                                }
+                            }
+                            else
+                                property.SetValue(context.Instance, schemePart, null);
+						}
+						return returnColor;
+					}
+				}
+			}
+
+			return value;
+		}
+
+		/// <summary>
+		/// Gets the editor style used by the EditValue method.
+		/// </summary>
+		/// <param name="context">An ITypeDescriptorContext that can be used to gain additional context information.</param>
+		/// <returns>A UITypeEditorEditStyle value that indicates the style of editor used by EditValue. If the UITypeEditor does not support this method, then GetEditStyle will return None.
+		/// </returns>
+		public override UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext context) 
+		{
+			if (context != null && context.Instance != null) 
+			{
+				return UITypeEditorEditStyle.DropDown;
+			}
+			return base.GetEditStyle(context);
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/ComboBoxItem.cs b/PROMS/DotNetBar Source Code/ComboBoxItem.cs
new file mode 100644
index 00000000..e629e0a2
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/ComboBoxItem.cs	
@@ -0,0 +1,1538 @@
+using System;
+using System.Drawing;
+using System.ComponentModel;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.Controls;
+using DevComponents.DotNetBar.Rendering;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Summary description for ComboBoxItem.
+	/// </summary>
+    [System.ComponentModel.ToolboxItem(false), DefaultEvent("Click"), System.ComponentModel.DesignTimeVisible(false), Designer("DevComponents.DotNetBar.Design.ComboBoxItemDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+	public class ComboBoxItem:ImageItem,IPersonalizedMenuItem
+	{
+		private Controls.ComboBoxEx m_ComboBox=null;
+		private int m_ComboWidth=64;
+		private bool m_MouseOver=false;
+		//private string m_ControlText="";
+		private bool m_AlwaysShowCaption;
+		private bool m_FontCombo=false;
+
+		// IPersonalizedMenuItem Implementation
+		private eMenuVisibility m_MenuVisibility=eMenuVisibility.VisibleAlways;
+		private bool m_RecentlyUsed=false;
+		internal bool _CopyInProgress=false;
+
+		private bool m_PreventEnterBeep=false;
+
+        /// <summary>
+        /// Occurs when underlining control ComboBox.Text property has changed.
+        /// </summary>
+        public event EventHandler ComboBoxTextChanged;
+
+        /// <summary>
+        /// Occurs when selected item on combo box has changed.
+        /// </summary>
+        public event EventHandler SelectedIndexChanged;
+
+		/// <summary>
+		/// Creates new instance of ComboBoxItem.
+		/// </summary>
+		public ComboBoxItem():this("","") {}
+		/// <summary>
+		/// Creates new instance of ComboBoxItem and assigns item name.
+		/// </summary>
+		/// <param name="sName">Item Name.</param>
+		public ComboBoxItem(string sName):this(sName,""){}
+		/// <summary>
+		/// Creates new instance of ComboBoxItem and assigns item name and item text.
+		/// </summary>
+		/// <param name="sName">Item Name</param>
+		/// <param name="ItemText">Item Text.</param>
+		public ComboBoxItem(string sName, string ItemText):base(sName,ItemText)
+		{
+			CreateComboBox();
+			m_ComboWidth=64;
+			m_SupportedOrientation=eSupportedOrientation.Horizontal;
+			this.IsAccessible=true;
+            this.AccessibleRole = AccessibleRole.ComboBox;
+		}
+		private void CreateComboBox()
+		{
+			if(m_ComboBox!=null)
+			{
+				m_ComboBox.Dispose();
+				m_ComboBox=null;
+			}
+            m_ComboBox = new Controls.ComboBoxEx();
+            m_ComboBox.IsStandalone = false;
+            m_ComboBox.TabStop = false;
+            m_ComboBox.TabIndex = 9999;
+            m_ComboBox.Style = this.Style;
+            m_ComboBox.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed;
+            m_ComboBox.IntegralHeight = false;
+            //m_ComboBox.ItemHeight = 13;
+            m_ComboBox.ThemeAware = false;
+            m_ComboBox.Visible = false;
+            m_ComboBox.Text = this.Text;
+            m_ComboBox.SelectionStart = 0;
+            m_ComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+
+            m_ComboBox.LostFocus += new EventHandler(this.ComboLostFocus);
+            m_ComboBox.GotFocus += new EventHandler(this.ComboGotFocus);
+            m_ComboBox.MouseHover += new EventHandler(this.ComboMouseHover);
+            m_ComboBox.MouseEnter += new EventHandler(this.ComboMouseEnter);
+            m_ComboBox.MouseLeave += new EventHandler(this.ComboMouseLeave);
+            m_ComboBox.VisibleChanged += new EventHandler(ComboBoxVisibleChanged);
+            m_ComboBox.DropDownChange += new Controls.ComboBoxEx.OnDropDownChangeEventHandler(this.ComboDropDownChange);
+            m_ComboBox.TextChanged += new EventHandler(this.InternalComboTextChanged);
+            m_ComboBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.ComboKeyDown);
+            m_ComboBox.SelectedIndexChanged += new System.EventHandler(this.ComboSelChanged);
+            m_ComboBox.PreventEnterBeep = m_PreventEnterBeep;
+            m_ComboBox.ParentItem = this;
+			if(m_FontCombo)
+				m_ComboBox.LoadFonts();
+
+			if(this.ContainerControl!=null)
+			{
+				System.Windows.Forms.Control objCtrl=this.ContainerControl as System.Windows.Forms.Control;
+				if(objCtrl!=null)
+				{
+					objCtrl.Controls.Add(m_ComboBox);
+					m_ComboBox.Refresh();
+				}
+			}
+
+			if(this.Displayed)
+			{
+				m_ComboBox.Visible=true;
+			}
+		}
+
+		public override BaseItem Copy()
+		{
+			ComboBoxItem objCopy=new ComboBoxItem(this.Name);
+			this.CopyToItem(objCopy);
+			objCopy.DropDownStyle=this.DropDownStyle;
+			objCopy.AlwaysShowCaption=this.AlwaysShowCaption;
+			objCopy.FontCombo=this.FontCombo;
+			objCopy.ItemHeight=this.ItemHeight;
+            objCopy.Caption = this.Caption;
+            
+			return objCopy;
+		}
+		protected override void CopyToItem(BaseItem copy)
+		{
+			((ComboBoxItem)copy)._CopyInProgress=true;
+			try
+			{
+				ComboBoxItem objCopy=copy as ComboBoxItem;
+				base.CopyToItem(objCopy);
+
+				
+				objCopy.ComboWidth=m_ComboWidth;
+				objCopy.FontCombo=m_FontCombo;
+				objCopy.PreventEnterBeep=m_PreventEnterBeep;
+                if (m_ComboBox != null)
+                {
+                    objCopy.DisplayMember = m_ComboBox.DisplayMember;
+
+                    Controls.ComboBoxEx cb = objCopy.ComboBoxEx;
+                    if (!m_FontCombo)
+                    {
+                        foreach (object o in m_ComboBox.Items)
+                            cb.Items.Add(o);
+                    }
+                    cb.SelectedIndex = m_ComboBox.SelectedIndex;
+                }
+			}
+			finally
+			{
+				((ComboBoxItem)copy)._CopyInProgress=false;
+			}
+		}
+        protected override void Dispose(bool disposing)
+		{
+            base.Dispose(disposing);
+            // Control gets disposed by the parent control it is added to
+            //if (m_ComboBox != null)
+            //{
+            //    if (m_ComboBox.Parent == null && !m_ComboBox.IsDisposed)
+            //        m_ComboBox.Dispose();
+            //}
+		}
+        protected override System.Windows.Forms.AccessibleObject CreateAccessibilityInstance()
+        {
+            return m_ComboBox.AccessibilityObject;
+        }
+        /// <summary>
+        /// Gets or sets the accessible role of the item.
+        /// </summary>
+        [Browsable(true), Category("Accessibility"), Description("Gets or sets the accessible role of the item."), DefaultValue(System.Windows.Forms.AccessibleRole.ComboBox)]
+        public override System.Windows.Forms.AccessibleRole AccessibleRole
+        {
+            get { return base.AccessibleRole; }
+            set { base.AccessibleRole = value; }
+        }
+		protected internal override void Serialize(ItemSerializationContext context)
+		{
+			base.Serialize(context);
+            System.Xml.XmlElement ThisItem = context.ItemXmlElement;
+			ThisItem.SetAttribute("ComboWidth",System.Xml.XmlConvert.ToString(m_ComboWidth));
+			ThisItem.SetAttribute("FontCombo",System.Xml.XmlConvert.ToString(m_FontCombo));
+
+			ThisItem.SetAttribute("MenuVisibility",System.Xml.XmlConvert.ToString((int)m_MenuVisibility));
+			ThisItem.SetAttribute("RecentlyUsed",System.Xml.XmlConvert.ToString(m_RecentlyUsed));
+			ThisItem.SetAttribute("DropDownStyle",System.Xml.XmlConvert.ToString((int)m_ComboBox.DropDownStyle));
+			//ThisItem.SetAttribute("CText",m_ControlText);
+			ThisItem.SetAttribute("ThemeAware",System.Xml.XmlConvert.ToString(m_ComboBox.ThemeAware));
+
+			ThisItem.SetAttribute("AlwaysShowCaption",System.Xml.XmlConvert.ToString(m_AlwaysShowCaption));
+			ThisItem.SetAttribute("ItemHeight",System.Xml.XmlConvert.ToString(m_ComboBox.ItemHeight));
+
+            if(m_ComboBox.DisplayMember!="")
+                ThisItem.SetAttribute("DisplayMembers", m_ComboBox.DisplayMember);
+
+			if(m_PreventEnterBeep)
+				ThisItem.SetAttribute("nobeep",System.Xml.XmlConvert.ToString(m_PreventEnterBeep));
+			
+			if(!m_FontCombo && m_ComboBox.Items.Count>0)
+			{
+				System.Xml.XmlElement xmlItems=ThisItem.OwnerDocument.CreateElement("cbitems");
+				ThisItem.AppendChild(xmlItems);
+				foreach(object item in m_ComboBox.Items)
+				{
+					DevComponents.Editors.ComboItem ci=item as DevComponents.Editors.ComboItem;
+					if(ci!=null)
+					{
+						System.Xml.XmlElement xmlChild=ThisItem.OwnerDocument.CreateElement("ci");
+
+						if(!ci.BackColor.IsEmpty)
+							xmlChild.SetAttribute("bc",BarFunctions.ColorToString(ci.BackColor));
+						if(ci.FontName!="")
+							xmlChild.SetAttribute("fn",ci.FontName);
+						if(ci.FontSize!=8)
+							xmlChild.SetAttribute("fs",System.Xml.XmlConvert.ToString(ci.FontSize));
+						
+						xmlChild.SetAttribute("fy",System.Xml.XmlConvert.ToString((int)ci.FontStyle));
+
+						if(!ci.ForeColor.IsEmpty)
+							xmlChild.SetAttribute("fc",BarFunctions.ColorToString(ci.ForeColor));
+
+						BarFunctions.SerializeImage(ci.Image,xmlChild);
+
+						if(ci.ImageIndex>=0)
+							xmlChild.SetAttribute("img",System.Xml.XmlConvert.ToString(ci.ImageIndex));
+
+						if(ci.ImagePosition!=System.Windows.Forms.HorizontalAlignment.Left)
+							xmlChild.SetAttribute("ip",System.Xml.XmlConvert.ToString((int)ci.ImagePosition));
+						
+						xmlChild.SetAttribute("text",ci.Text);
+
+						xmlChild.SetAttribute("ta",System.Xml.XmlConvert.ToString((int)ci.TextAlignment));
+						xmlChild.SetAttribute("tla",System.Xml.XmlConvert.ToString((int)ci.TextLineAlignment));
+						
+						if(m_ComboBox.SelectedItem==item)
+							xmlChild.SetAttribute("selected","1");
+
+						xmlItems.AppendChild(xmlChild);
+					}
+					else
+					{
+						System.Xml.XmlElement xmlChild=ThisItem.OwnerDocument.CreateElement("co");
+						xmlChild.InnerText=item.ToString();
+						xmlItems.AppendChild(xmlChild);
+
+						if(m_ComboBox.SelectedItem==item)
+							xmlChild.SetAttribute("selected","1");
+					}	
+				}
+			}
+		}
+
+		public override void Deserialize(ItemSerializationContext context)
+		{
+			base.Deserialize(context);
+            System.Xml.XmlElement ItemXmlSource = context.ItemXmlElement;
+			m_ComboWidth=System.Xml.XmlConvert.ToInt32(ItemXmlSource.GetAttribute("ComboWidth"));
+			m_FontCombo=System.Xml.XmlConvert.ToBoolean(ItemXmlSource.GetAttribute("FontCombo"));
+
+			m_MenuVisibility=(eMenuVisibility)System.Xml.XmlConvert.ToInt32(ItemXmlSource.GetAttribute("MenuVisibility"));
+			m_RecentlyUsed=System.Xml.XmlConvert.ToBoolean(ItemXmlSource.GetAttribute("RecentlyUsed"));
+			if(ItemXmlSource.HasAttribute("DropDownStyle"))
+				m_ComboBox.DropDownStyle=(System.Windows.Forms.ComboBoxStyle)System.Xml.XmlConvert.ToInt32(ItemXmlSource.GetAttribute("DropDownStyle"));
+
+			if(ItemXmlSource.HasAttribute("CText"))
+				this.Text=ItemXmlSource.GetAttribute("CText");
+
+			if(ItemXmlSource.HasAttribute("ThemeAware"))
+				m_ComboBox.ThemeAware=System.Xml.XmlConvert.ToBoolean(ItemXmlSource.GetAttribute("ThemeAware"));
+			else
+                m_ComboBox.ThemeAware=true;
+
+			if(ItemXmlSource.HasAttribute("AlwaysShowCaption"))
+				m_AlwaysShowCaption=System.Xml.XmlConvert.ToBoolean(ItemXmlSource.GetAttribute("AlwaysShowCaption"));
+
+            if(ItemXmlSource.HasAttribute("nobeep"))
+				this.PreventEnterBeep=System.Xml.XmlConvert.ToBoolean(ItemXmlSource.GetAttribute("nobeep"));
+
+			System.Xml.XmlNodeList list=ItemXmlSource.GetElementsByTagName("cbitems");
+			if(!m_FontCombo && list.Count>0)
+			{
+				foreach(System.Xml.XmlElement xmlChild in list[0].ChildNodes)
+				{
+					if(xmlChild.Name=="ci")
+					{
+						DevComponents.Editors.ComboItem ci=new DevComponents.Editors.ComboItem();
+						if(xmlChild.HasAttribute("bc"))
+							ci.BackColor=BarFunctions.ColorFromString(xmlChild.GetAttribute("bk"));
+						if(xmlChild.HasAttribute("fn"))
+							ci.FontName=xmlChild.GetAttribute("fn");
+						if(xmlChild.HasAttribute("fs"))
+							ci.FontSize=System.Xml.XmlConvert.ToSingle(xmlChild.GetAttribute("fs"));
+						if(xmlChild.HasAttribute("fy"))
+							ci.FontStyle=(FontStyle)System.Xml.XmlConvert.ToInt32(xmlChild.GetAttribute("fy"));
+						if(xmlChild.HasAttribute("fc"))
+							ci.ForeColor=BarFunctions.ColorFromString(xmlChild.GetAttribute("fc"));
+						
+						ci.Image=BarFunctions.DeserializeImage(xmlChild);
+
+						if(xmlChild.HasAttribute("img"))
+							ci.ImageIndex=System.Xml.XmlConvert.ToInt32(xmlChild.GetAttribute("img"));
+
+						if(xmlChild.HasAttribute("ip"))
+							ci.ImagePosition=(System.Windows.Forms.HorizontalAlignment)System.Xml.XmlConvert.ToInt32(xmlChild.GetAttribute("ip"));
+
+						if(xmlChild.HasAttribute("ItemHeight"))
+							m_ComboBox.ItemHeight=System.Xml.XmlConvert.ToInt32(xmlChild.GetAttribute("ItemHeight"));
+						
+						ci.Text=xmlChild.GetAttribute("text");
+
+						ci.TextAlignment=(StringAlignment)System.Xml.XmlConvert.ToInt32(xmlChild.GetAttribute("ta"));
+						ci.TextLineAlignment=(StringAlignment)System.Xml.XmlConvert.ToInt32(xmlChild.GetAttribute("tla"));
+
+						m_ComboBox.Items.Add(ci);
+
+						if(xmlChild.HasAttribute("selected") && xmlChild.GetAttribute("selected")=="1")
+							m_ComboBox.SelectedItem=ci;
+					}
+					else if(xmlChild.Name=="co")
+					{
+						m_ComboBox.Items.Add(xmlChild.InnerText);
+						if(xmlChild.HasAttribute("selected") && xmlChild.GetAttribute("selected")=="1")
+							m_ComboBox.SelectedItem=m_ComboBox.Items[m_ComboBox.Items.Count-1];
+					}
+				}
+			}
+			if(m_FontCombo)
+				m_ComboBox.LoadFonts();
+
+			if(m_ComboBox!=null)
+				m_ComboBox.Enabled=this.Enabled;
+
+            if (ItemXmlSource.HasAttribute("DisplayMembers") && m_ComboBox!=null)
+                m_ComboBox.DisplayMember = ItemXmlSource.GetAttribute("DisplayMembers");
+		}
+
+		/// <summary>
+		/// Gets or sets whether combo box generates the audible alert when Enter key is pressed.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Behavior"),System.ComponentModel.Description("Indicates whether combo box generates the audible alert when Enter key is pressed."),System.ComponentModel.DefaultValue(false)]
+		public bool PreventEnterBeep
+		{
+			get
+			{
+				return m_PreventEnterBeep;
+			}
+			set
+			{
+				m_PreventEnterBeep=value;
+				if(m_ComboBox!=null)
+					m_ComboBox.PreventEnterBeep=value;
+			}
+		}
+
+        private Color _LabelForeColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets the text color of the combo box label.
+        /// </summary>
+        [Category("Columns"), Description("Indicates color of combo box label.")]
+        public Color LabelForeColor
+        {
+            get { return _LabelForeColor; }
+            set { _LabelForeColor = value; this.Refresh(); }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeLabelForeColor()
+        {
+            return !_LabelForeColor.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetLabelForeColor()
+        {
+            this.LabelForeColor = Color.Empty;
+        }
+
+		public override void Paint(ItemPaintArgs pa)
+		{
+			if(this.SuspendLayout)
+				return;
+			System.Drawing.Graphics g=pa.Graphics;
+			Rectangle r=this.DisplayRectangle;
+			Size objImageSize=GetMaxImageSize();
+            bool bOnMenu = this.IsOnMenu && !(this.Parent is ItemContainer);
+            bool enabled = GetEnabled(pa.ContainerControl);
+            Color textColor = enabled ? SystemColors.ControlText : SystemColors.ControlDark;
+            if (BarFunctions.IsOffice2007Style(this.EffectiveStyle) && pa.Renderer is Rendering.Office2007Renderer &&
+                ((Rendering.Office2007Renderer)pa.Renderer).ColorTable.ButtonItemColors.Count > 0)
+            {
+                textColor = enabled ? ((Rendering.Office2007Renderer)pa.Renderer).ColorTable.ButtonItemColors[0].Default.Text : pa.Colors.ItemDisabledText;
+            }
+            if (!_LabelForeColor.IsEmpty)
+                textColor = _LabelForeColor;
+
+			if(this.Orientation==eOrientation.Horizontal)
+			{
+                if (bOnMenu && (EffectiveStyle == eDotNetBarStyle.OfficeXP || EffectiveStyle == eDotNetBarStyle.Office2003 || EffectiveStyle == eDotNetBarStyle.VS2005 || BarFunctions.IsOffice2007Style(EffectiveStyle)))
+				{
+					objImageSize.Width+=7;
+					r.Width-=objImageSize.Width;
+					r.X+=objImageSize.Width;
+					if(this.IsOnCustomizeMenu)
+						objImageSize.Width+=objImageSize.Height+8;
+					// Draw side bar
+                    Rectangle sideRect = new Rectangle(m_Rect.Left, m_Rect.Top, objImageSize.Width, m_Rect.Height);
+					if(this.MenuVisibility==eMenuVisibility.VisibleIfRecentlyUsed && !this.RecentlyUsed)
+					{
+						if(!pa.Colors.MenuUnusedSide2.IsEmpty)
+						{
+							System.Drawing.Drawing2D.LinearGradientBrush gradient=BarFunctions.CreateLinearGradientBrush(sideRect,pa.Colors.MenuUnusedSide,pa.Colors.MenuUnusedSide2,pa.Colors.MenuUnusedSideGradientAngle);
+							g.FillRectangle(gradient,sideRect);
+							gradient.Dispose();
+						}
+						else
+                            g.FillRectangle(new SolidBrush(pa.Colors.MenuUnusedSide), sideRect);
+					}
+					else
+					{
+						if(!pa.Colors.MenuSide2.IsEmpty)
+						{
+                            System.Drawing.Drawing2D.LinearGradientBrush gradient = BarFunctions.CreateLinearGradientBrush(sideRect, pa.Colors.MenuSide, pa.Colors.MenuSide2, pa.Colors.MenuSideGradientAngle);
+                            g.FillRectangle(gradient, sideRect);
+							gradient.Dispose();
+						}
+						else
+                            g.FillRectangle(new SolidBrush(pa.Colors.MenuSide), sideRect);
+					}
+                    if (BarFunctions.IsOffice2007Style(EffectiveStyle) && GlobalManager.Renderer is Office2007Renderer)
+                    {
+                        Office2007MenuColorTable mt = ((Office2007Renderer)GlobalManager.Renderer).ColorTable.Menu;
+                        if (mt != null && !mt.SideBorder.IsEmpty)
+                        {
+                            if (pa.RightToLeft)
+                                DisplayHelp.DrawGradientLine(g, sideRect.X + 1, sideRect.Y, sideRect.X + 1, sideRect.Bottom - 1, mt.SideBorder, 1);
+                            else
+                                DisplayHelp.DrawGradientLine(g, sideRect.Right - 2, sideRect.Y, sideRect.Right - 2, sideRect.Bottom - 1, mt.SideBorder, 1);
+                        }
+                        if (mt != null && !mt.SideBorderLight.IsEmpty)
+                        {
+                            if (pa.RightToLeft)
+                                DisplayHelp.DrawGradientLine(g, sideRect.X, sideRect.Y, sideRect.X, sideRect.Bottom - 1, mt.SideBorder, 1);
+                            else
+                                DisplayHelp.DrawGradientLine(g, sideRect.Right - 1, sideRect.Y, sideRect.Right - 1, sideRect.Bottom - 1, mt.SideBorderLight, 1);
+                        }
+                    }
+				}
+
+				if(this.IsOnCustomizeMenu)
+				{
+                    if (this.EffectiveStyle == eDotNetBarStyle.OfficeXP || this.EffectiveStyle == eDotNetBarStyle.Office2003 || EffectiveStyle == eDotNetBarStyle.VS2005 || BarFunctions.IsOffice2007Style(EffectiveStyle))
+					{
+						r.X+=(objImageSize.Height+8);
+						r.Width-=(objImageSize.Height+8);
+					}
+					else
+					{
+						r.X+=(objImageSize.Height+4);
+						r.Width-=(objImageSize.Height+4);
+					}
+				}
+
+                if (bOnMenu && (this.EffectiveStyle == eDotNetBarStyle.OfficeXP || this.EffectiveStyle == eDotNetBarStyle.Office2003 || EffectiveStyle == eDotNetBarStyle.VS2005 || BarFunctions.IsOffice2007Style(EffectiveStyle)))
+				{
+					if(m_MouseOver)
+					{
+						Rectangle rHover=this.DisplayRectangle;
+						rHover.Inflate(-1,0);
+                        if (BarFunctions.IsOffice2007Style(EffectiveStyle) && !(pa.Owner is DotNetBarManager) && GlobalManager.Renderer is Office2007Renderer)
+                        {
+                            Office2007ButtonItemStateColorTable bt = ((Office2007Renderer)GlobalManager.Renderer).ColorTable.ButtonItemColors[0].MouseOver;
+                            Office2007ButtonItemPainter.PaintBackground(g, bt, rHover, RoundRectangleShapeDescriptor.RoundCorner3);
+                        }
+                        else
+                        {
+                            if (!pa.Colors.ItemHotBackground2.IsEmpty)
+                            {
+                                System.Drawing.Drawing2D.LinearGradientBrush gradient = BarFunctions.CreateLinearGradientBrush(rHover, pa.Colors.ItemHotBackground, pa.Colors.ItemHotBackground2, pa.Colors.ItemHotBackgroundGradientAngle);
+                                g.FillRectangle(gradient, rHover);
+                                gradient.Dispose();
+                            }
+                            else
+                                g.FillRectangle(new SolidBrush(pa.Colors.ItemHotBackground), rHover);
+                            NativeFunctions.DrawRectangle(g, new Pen(pa.Colors.ItemHotBorder), rHover);
+                        }
+					}
+				}
+
+				// Draw text if needed
+                if (Caption != "" && (m_AlwaysShowCaption || bOnMenu))
+				{
+					eTextFormat objStringFormat=GetStringFormat();
+					Font objFont=this.GetFont();
+					Rectangle rText=new Rectangle(r.X+8,r.Y,r.Width,r.Height);
+
+                    if (pa.GlassEnabled && this.Parent is CaptionItemContainer && !(this.ContainerControl is Ribbon.QatToolbar))
+                    {
+                        if (!pa.CachedPaint)
+                            Office2007RibbonControlPainter.PaintTextOnGlass(g, Caption, objFont,
+                                rText, TextDrawing.GetTextFormat(objStringFormat), textColor, true, true, 7);
+                    }
+                    else
+                    {
+                        TextDrawing.DrawString(g, Caption, objFont, textColor, rText, objStringFormat);
+                    }
+
+                    Size textSize = TextDrawing.MeasureString(g, Caption, objFont, 0, objStringFormat);
+					r.X+=(int)textSize.Width+8;
+					r.Width-=((int)textSize.Width+8);
+				}
+
+				if(m_ComboBox==null || this.IsOnCustomizeMenu || this.IsOnCustomizeDialog || this.DesignMode)
+				{
+					r.Inflate(-3,-2);
+					g.FillRectangle(SystemBrushes.Window,r);
+					NativeFunctions.DrawRectangle(g,SystemPens.ControlDark,r);
+					r.X=r.Right-(System.Windows.Forms.SystemInformation.HorizontalScrollBarThumbWidth-2);
+					r.Width=System.Windows.Forms.SystemInformation.HorizontalScrollBarThumbWidth-2;
+					System.Windows.Forms.ControlPaint.DrawComboButton(g,r,System.Windows.Forms.ButtonState.Flat);
+				}
+				else
+				{
+                    int selLength = m_ComboBox.SelectionLength;
+                    r.Inflate(-2,-2);
+                    if(m_ComboBox.Width!=r.Width)
+					    m_ComboBox.Width=r.Width;
+					Point loc=r.Location;
+					loc.Offset((r.Width-m_ComboBox.Width)/2,(r.Height-m_ComboBox.Height)/2);
+
+                    ScrollableControl scc = pa.ContainerControl as ScrollableControl;
+                    if (scc != null && scc.AutoScroll)
+                        loc.Offset(scc.AutoScrollPosition.X, scc.AutoScrollPosition.Y);
+                    if (m_ComboBox.Location != loc)
+                        m_ComboBox.Location = loc;
+                    
+                    if (selLength > 0 && selLength < 1000 && m_ComboBox.SelectionLength != selLength && m_ComboBox.Text.Length > selLength && m_ComboBox.DropDownStyle == ComboBoxStyle.DropDown)
+                    {
+                        m_ComboBox.SelectionLength = selLength;
+                    }
+				}
+
+				if(this.IsOnCustomizeMenu && this.Visible)
+				{
+					// Draw check box if this item is visible
+					Rectangle rBox=new Rectangle(m_Rect.Left,m_Rect.Top,m_Rect.Height,m_Rect.Height);
+                    if (EffectiveStyle == eDotNetBarStyle.OfficeXP || EffectiveStyle == eDotNetBarStyle.Office2003 || EffectiveStyle == eDotNetBarStyle.VS2005 || BarFunctions.IsOffice2007Style(EffectiveStyle))
+						rBox.Inflate(-1,-1);
+                    BarFunctions.DrawMenuCheckBox(pa, rBox, EffectiveStyle, m_MouseOver);
+				}
+			}
+			else
+			{
+				string Caption=this.Text;
+				if(Caption=="")
+					Caption="...";
+				else
+					Caption+=" �";
+
+                if (EffectiveStyle == eDotNetBarStyle.OfficeXP || EffectiveStyle == eDotNetBarStyle.Office2003 || EffectiveStyle == eDotNetBarStyle.VS2005 || BarFunctions.IsOffice2007Style(EffectiveStyle))
+					g.FillRectangle(new SolidBrush(ColorFunctions.ToolMenuFocusBackColor(g)),this.DisplayRectangle);
+				else
+					g.FillRectangle(SystemBrushes.Control,this.DisplayRectangle);
+
+				if(m_MouseOver && !this.DesignMode)
+				{
+                    if (EffectiveStyle == eDotNetBarStyle.Office2000)
+					{
+						//r.Inflate(-1,-1);
+						System.Windows.Forms.ControlPaint.DrawBorder3D(g,r,System.Windows.Forms.Border3DStyle.RaisedInner,System.Windows.Forms.Border3DSide.All);
+					}
+                    else if (EffectiveStyle == eDotNetBarStyle.OfficeXP || EffectiveStyle == eDotNetBarStyle.Office2003 || EffectiveStyle == eDotNetBarStyle.VS2005 || BarFunctions.IsOffice2007Style(EffectiveStyle))
+					{
+						r.Inflate(-1,-1);
+						g.FillRectangle(new SolidBrush(ColorFunctions.HoverBackColor(g)),r);
+						NativeFunctions.DrawRectangle(g,SystemPens.Highlight,r);
+					}
+				}
+
+				r=new Rectangle(m_Rect.Top,-m_Rect.Right,m_Rect.Height,m_Rect.Width);
+				g.RotateTransform(90);
+				eTextFormat sf=GetStringFormat();
+                sf |= eTextFormat.HorizontalCenter;
+                TextDrawing.DrawStringLegacy(g, Caption, GetFont(), textColor, r, sf);
+				g.ResetTransform();
+			}
+
+			if(this.Focused && this.DesignMode)
+			{
+				r=this.DisplayRectangle;
+				r.Inflate(-1,-1);
+				DesignTime.DrawDesignTimeSelection(g,r,pa.Colors.ItemDesignTimeBorder);
+			}
+
+			//if(this.DesignMode)
+			this.DrawInsertMarker(g);
+		}
+
+        /// <summary>
+        /// IBlock member implementation
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), EditorBrowsable(EditorBrowsableState.Never)]
+        public override System.Drawing.Rectangle Bounds
+        {
+            get { return base.Bounds; }
+            set
+            {
+                if (base.Bounds != value)
+                {
+                    bool topLocationChanged = base.Bounds.Top != value.Top;
+                    bool leftLocationChanged = base.Bounds.Left != value.Left;
+                    base.Bounds = value;
+                    if ((topLocationChanged || leftLocationChanged) && (this.ContainerControl is ItemPanel || this.ContainerControl is ExplorerBar))
+                        UpdateControlLocation();
+                }
+            }
+        }
+
+        private void UpdateControlLocation()
+        {
+            if (m_ComboBox == null) return;
+            Rectangle r = this.DisplayRectangle;
+            r.Inflate(-2, -2);
+            m_ComboBox.Location = r.Location;
+        }
+
+        public override void RecalcSize()
+        {
+            if (this.SuspendLayout)
+                return;
+
+            bool bOnMenu = this.IsOnMenu;
+
+            if (this.Orientation == eOrientation.Horizontal)
+            {
+                // Default Height
+                if (this.Parent != null && this.Parent is ImageItem)
+                    m_Rect.Height = ((ImageItem)this.Parent).SubItemsImageSize.Height + Dpi.Height(4);
+                else
+                    m_Rect.Height = this.SubItemsImageSize.Height + Dpi.Height(4);
+
+                eDotNetBarStyle effectiveStyle = EffectiveStyle;
+                if (effectiveStyle == eDotNetBarStyle.OfficeXP || effectiveStyle == eDotNetBarStyle.Office2003 || effectiveStyle == eDotNetBarStyle.VS2005 || BarFunctions.IsOffice2007Style(effectiveStyle))
+                {
+                    if (m_ComboBox != null && m_Rect.Height < (m_ComboBox.Height + 2))
+                        m_Rect.Height = m_ComboBox.Height + 2;
+                }
+                else
+                {
+                    if (m_ComboBox != null && m_Rect.Height < (m_ComboBox.Height + 2))
+                        m_Rect.Height = m_ComboBox.Height + 2;
+                }
+
+                // Default width
+                m_Rect.Width = Dpi.Width(m_ComboWidth + 4);
+
+                // Calculate Item Height
+                if (Caption != "" && (m_AlwaysShowCaption || bOnMenu))
+                {
+                    System.Windows.Forms.Control objCtrl = this.ContainerControl as System.Windows.Forms.Control;
+                    if (objCtrl != null && IsHandleValid(objCtrl))
+                    {
+                        Graphics g = BarFunctions.CreateGraphics(objCtrl);
+                        try
+                        {
+                            Size textSize = Size.Empty;
+                            if (m_Orientation == eOrientation.Vertical && !bOnMenu)
+                                textSize = TextDrawing.MeasureStringLegacy(g, Caption, GetFont(), Size.Empty, GetStringFormat());
+                            else
+                                textSize = TextDrawing.MeasureString(g, Caption, GetFont(), 0, GetStringFormat());
+                            if (textSize.Height > this.SubItemsImageSize.Height && textSize.Height > m_Rect.Height)
+                                m_Rect.Height = (int)textSize.Height + 4;
+                            m_Rect.Width = Dpi.Width(m_ComboWidth + 4) + (int)textSize.Width + 8;
+                        }
+                        finally
+                        {
+                            g.Dispose();
+                        }
+                    }
+                }
+
+                Size objImageSize = GetMaxImageSize();
+                if (this.IsOnMenu && (effectiveStyle == eDotNetBarStyle.OfficeXP || effectiveStyle == eDotNetBarStyle.Office2003 || effectiveStyle == eDotNetBarStyle.VS2005 || BarFunctions.IsOffice2007Style(effectiveStyle)))
+                {
+                    // THis is side bar that will need to be drawn for DotNet style
+                    m_Rect.Width += (objImageSize.Width + 7);
+                }
+
+                if (this.IsOnCustomizeMenu)
+                    m_Rect.Width += (objImageSize.Height + 2);
+            }
+            else
+            {
+                // Default width
+                m_Rect.Width = Dpi.Width(this.SubItemsImageSize.Width + 4);
+                string caption = this.Caption;
+                if (caption == "")
+                    caption = "...";
+                else
+                    caption += " �";
+                System.Windows.Forms.Control objCtrl = this.ContainerControl as System.Windows.Forms.Control;
+                if (objCtrl != null && IsHandleValid(objCtrl))
+                {
+                    Graphics g = BarFunctions.CreateGraphics(objCtrl);
+                    try
+                    {
+                        SizeF textSize = TextDrawing.MeasureString(g, caption, GetFont(), 0, GetStringFormat());
+                        if (textSize.Height > this.SubItemsImageSize.Height)
+                            m_Rect.Width = (int)textSize.Height + 4;
+                        m_Rect.Height = (int)textSize.Width + 8;
+                    }
+                    finally
+                    {
+                        g.Dispose();
+                    }
+                }
+
+            }
+
+            // Always call base implementation to reset resize flag
+            base.RecalcSize();
+        }
+		protected internal override void OnContainerChanged(object objOldContainer)
+		{	
+			base.OnContainerChanged(objOldContainer);
+			if(m_ComboBox!=null)
+			{
+				if(m_ComboBox.Parent!=null)
+				{
+					//bool bVisible=false;
+					if(m_ComboBox.Visible)
+					{
+						m_ComboBox.Visible=false;
+						//bVisible=true;
+					}
+					System.Windows.Forms.Control parent=m_ComboBox.Parent;
+					parent.Controls.Remove(m_ComboBox);
+					//if(bVisible)
+						//m_ComboBox.Visible=true;
+				}
+
+				System.Windows.Forms.Control objCtrl=null;
+				if(this.ContainerControl!=null)
+				{
+					objCtrl=this.ContainerControl as System.Windows.Forms.Control;
+					if(objCtrl!=null)
+					{
+						objCtrl.Controls.Add(m_ComboBox);
+						OnDisplayedChanged();
+						m_ComboBox.Refresh();
+					}
+				}
+			}
+		}
+        protected internal override void OnAfterItemRemoved(BaseItem item, int itemIndex)
+		{
+            base.OnAfterItemRemoved(item, itemIndex);
+			this.ContainerControl=null;
+		}
+		protected internal override void OnVisibleChanged(bool newValue)
+		{
+			if(m_ComboBox!=null && !newValue)
+				m_ComboBox.Visible=newValue;
+			base.OnVisibleChanged(newValue);
+		}
+		protected override void OnDisplayedChanged()
+		{
+			if(m_ComboBox!=null && !(this.IsOnCustomizeMenu || this.IsOnCustomizeDialog || this.DesignMode))
+			{
+				m_ComboBox.Visible=this.Displayed;
+			}
+		}
+        [EditorBrowsable(EditorBrowsableState.Never)]
+		public override void OnGotFocus()
+		{
+			base.OnGotFocus();
+			if(m_ComboBox==null)
+				return;
+			if(m_ComboBox.Focused || this.IsOnCustomizeMenu || this.IsOnCustomizeDialog || this.DesignMode)
+				return;
+			m_ComboBox.Focus();
+		}
+
+		private void ComboLostFocus(object sender, EventArgs e)
+		{
+			this.HideToolTip();
+			this.Text=m_ComboBox.Text;
+			this.ReleaseFocus();
+			if(!m_MouseOver)
+				return;
+			m_MouseOver=false;
+			this.Refresh();
+		}
+
+		private void ComboMouseHover(object sender, EventArgs e)
+		{
+			if(this.DesignMode)
+				return;
+			if(System.Windows.Forms.Control.MouseButtons==System.Windows.Forms.MouseButtons.None)
+				ShowToolTip();
+		}
+
+		private void ComboMouseEnter(object sender, EventArgs e)
+		{
+			if(!m_MouseOver)
+			{
+				m_MouseOver=true;			
+				this.Refresh();
+			}
+		}
+
+		private void ComboMouseLeave(object sender, EventArgs e)
+		{
+			this.HideToolTip();
+			if(m_ComboBox.Focused)
+				return;
+			if(m_MouseOver)
+			{
+				m_MouseOver=false;
+				this.Refresh();
+			}
+		}
+        private void ComboBoxVisibleChanged(object sender, EventArgs e)
+        {
+            this.HideToolTip();
+        }
+
+		private void ComboGotFocus(object sender, EventArgs e)
+		{
+			this.HideToolTip();
+			this.Focus();
+
+            if (GetEnabled() && !this.DesignMode)
+			{
+				if(m_MenuVisibility==eMenuVisibility.VisibleIfRecentlyUsed && !m_RecentlyUsed && this.IsOnMenu)
+				{
+					// Propagate to the top
+					m_RecentlyUsed=true;
+					BaseItem objItem=this.Parent;
+					while(objItem!=null)
+					{
+						IPersonalizedMenuItem ipm=objItem as IPersonalizedMenuItem;
+						if(ipm!=null)
+							ipm.RecentlyUsed=true;
+						objItem=objItem.Parent;
+					}
+				}
+			}
+		}
+
+		private void ComboSelChanged(object sender, EventArgs e)
+		{
+            if (!_CopyInProgress)
+            {
+                this.RaiseClick();
+                if (SelectedIndexChanged != null)
+                    SelectedIndexChanged(this, e);
+                if (ShouldSyncProperties)
+                    BarFunctions.SyncProperty(this, "SelectedIndex");
+                ExecuteCommand();
+            }
+            
+		}
+
+		private void ComboKeyDown(object sender,System.Windows.Forms.KeyEventArgs e)
+		{
+			this.HideToolTip();
+			if(e.KeyCode==System.Windows.Forms.Keys.Enter && this.Parent is PopupItem)
+			{
+				((PopupItem)this.Parent).ClosePopup();
+			}
+		}
+		private void ComboDropDownChange(object sender,bool bExpanded)
+		{
+			this.Expanded=bExpanded;
+			if(!bExpanded)
+				this.ReleaseFocus();
+		}
+		protected override void OnIsOnCustomizeDialogChanged()
+		{
+			base.OnIsOnCustomizeDialogChanged();
+			CustomizeChanged();
+		}
+
+		protected override void OnDesignModeChanged()
+		{
+			base.OnDesignModeChanged();
+			CustomizeChanged();
+		}
+
+		protected override void OnIsOnCustomizeMenuChanged()
+		{
+			base.OnIsOnCustomizeMenuChanged();
+			CustomizeChanged();
+		}
+
+		private void CustomizeChanged()
+		{
+			if(this.IsOnCustomizeMenu || this.IsOnCustomizeDialog || this.DesignMode)
+			{
+				m_ComboBox.Visible=false;
+			}
+			else
+			{
+				m_ComboBox.Visible=this.Displayed;
+			}
+		}
+
+        /// <summary>
+        /// Gets or sets the width of the of the drop-down portion of a combo box. 
+        /// </summary>
+        [Category("Layout"), Browsable(true), Description("Indicates width of the of the drop-down portion of a combo box.")]
+        public int DropDownWidth
+        {
+            get { return m_ComboBox.DropDownWidth; }
+            set { m_ComboBox.DropDownWidth = value; }
+        }
+
+        /// <summary>
+        /// Returns whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeDropDownWidth()
+        {
+            return m_ComboBox.Width != m_ComboBox.DropDownWidth;
+        }
+
+        /// <summary>
+        /// Gets or sets the height of the of the drop-down portion of a combo box. 
+        /// </summary>
+        [Category("Layout"), Browsable(true), DefaultValue(0), Description("Indicates height of the of the drop-down portion of a combo box.")]
+        public int DropDownHeight
+        {
+            get { return m_ComboBox.DropDownHeight; }
+            set { m_ComboBox.DropDownHeight = value; }
+        }
+
+		/// <summary>
+		/// Indicates the Width of the combo box part of the item.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Layout"),System.ComponentModel.Description("Indicates the Width of the combo box part of the item."),System.ComponentModel.DefaultValue(64)]
+		public int ComboWidth
+		{
+			get
+			{
+				return m_ComboWidth;
+			}
+			set
+			{
+				if(m_ComboWidth!=value)
+				{
+					m_ComboWidth=value;
+					if(this.Name!="" && this.GlobalItem)
+					{
+						BarFunctions.SetProperty(this.GetOwner(),this.GetType(),m_Name,System.ComponentModel.TypeDescriptor.GetProperties(this)["ComboWidth"],m_ComboWidth);
+					}
+					NeedRecalcSize=true;
+					this.Refresh();
+				}
+				OnAppearanceChanged();
+			}
+		}
+
+		/// <summary>
+		/// Overridden. Releases the input focus.
+		/// </summary>
+		public override void ReleaseFocus()
+		{
+			if(m_ComboBox!=null && m_ComboBox.Focused)
+				m_ComboBox.ReleaseFocus();
+			base.ReleaseFocus();
+		}
+
+        /// <summary>
+        /// Indicates whether control automatically releases its input focus when selection is made using keyboard.
+        /// </summary>
+        [DefaultValue(true), Browsable(true), Category("Behavior"), Description("Indicates whether control automatically releases its input focus when selection is made using keyboard.")]
+        public bool AutoReleaseFocus
+        {
+            get
+            {
+                return m_ComboBox.AutoReleaseFocus;
+            }
+            set
+            {
+                m_ComboBox.AutoReleaseFocus = value;
+            }
+        }
+
+		/// <summary>
+		/// Returns the reference to the inner combo box control.
+		/// </summary>
+		[Browsable(false)]
+		public ComboBoxEx ComboBoxEx
+		{
+			get
+			{
+				return m_ComboBox;
+			}
+		}
+
+//		[System.ComponentModel.Browsable(true),System.ComponentModel.Category("Appearance"),System.ComponentModel.Description("The caption of the item.")]
+//		public string Caption
+//		{
+//			get
+//			{
+//				return m_Caption;
+//			}
+//			set
+//			{
+//				if(m_Caption!=value)
+//				{
+//					m_Caption=value;
+//					if(this.Name!="" && this.GlobalItem)
+//					{
+//						BarFunctions.SetProperty(this.GetOwner(),this.GetType(),m_Name,System.ComponentModel.TypeDescriptor.GetProperties(this)["Caption"],m_Caption);
+//					}
+//					m_NeedRecalcSize=true;
+//					this.Refresh();
+//				}
+//			}
+//		}
+
+		/// <summary>
+		/// Indicates whether item caption is always shown.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Behavior"),System.ComponentModel.Description("Indicates whether item caption is always shown."), System.ComponentModel.DefaultValue(false)]
+		public bool AlwaysShowCaption
+		{
+			get
+			{
+				return m_AlwaysShowCaption;
+			}
+			set
+			{
+				if(m_AlwaysShowCaption!=value)
+				{
+					m_AlwaysShowCaption=value;
+				}
+				NeedRecalcSize=true;
+			}
+		}
+		private Size GetMaxImageSize()
+		{
+			if(m_Parent!=null)
+			{
+				ImageItem objParentImageItem=m_Parent as ImageItem;
+				if(objParentImageItem!=null)
+					return objParentImageItem.SubItemsImageSize;
+				else
+					return this.ImageSize;
+			}
+			else
+				return this.ImageSize;
+		}
+        private eTextFormat GetStringFormat()
+		{
+            eTextFormat format = eTextFormat.Default;
+            format |= eTextFormat.SingleLine;
+            format |= eTextFormat.EndEllipsis;
+            format |= eTextFormat.VerticalCenter;
+            return format;
+            //sfmt.HotkeyPrefix=System.Drawing.Text.HotkeyPrefix.Show;
+			//sfmt.FormatFlags=sfmt.FormatFlags | StringFormatFlags.NoWrap;
+            //sfmt.Trimming=StringTrimming.EllipsisCharacter;
+            //sfmt.Alignment=System.Drawing.StringAlignment.Near;
+            //sfmt.LineAlignment=System.Drawing.StringAlignment.Center;
+
+			//return sfmt;
+		}
+		protected virtual Font GetFont()
+		{
+			System.Windows.Forms.Control objCtrl=this.ContainerControl as System.Windows.Forms.Control;
+			if(objCtrl!=null)
+				return (Font)objCtrl.Font;
+            return SystemFonts.DefaultFont;
+		}
+		[System.ComponentModel.Browsable(false),System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+		public override void InternalMouseEnter()
+		{
+			base.InternalMouseEnter();
+			//if(this.DesignMode || this.IsOnCustomizeMenu || this.IsOnCustomizeDialog || this.Orientation==eOrientation.Vertical)
+			if(!m_MouseOver)
+			{
+				m_MouseOver=true;
+				this.Refresh();
+			}
+		}
+		[System.ComponentModel.Browsable(false),System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+		public override void InternalMouseLeave()
+		{
+			base.InternalMouseLeave();
+			if(m_MouseOver)
+			{
+				m_MouseOver=false;
+				this.Refresh();
+			}
+		}
+		protected internal override bool IsAnyOnHandle(IntPtr iHandle)
+		{
+			bool bRet=base.IsAnyOnHandle(iHandle);
+			if(!bRet && m_ComboBox!=null && m_ComboBox.DroppedDown && m_ComboBox.DropDownHandle!=IntPtr.Zero && m_ComboBox.DropDownHandle==iHandle)
+				bRet=true;
+			return bRet;
+		}
+		protected override void OnStyleChanged()
+		{
+			base.OnStyleChanged();
+			m_ComboBox.Style=this.Style;
+		}
+
+		/// <summary>
+		/// Gets an object representing the collection of the items contained in inner ComboBoxEx.
+		/// </summary>
+        [System.ComponentModel.Editor("DevComponents.DotNetBar.Design.ComboItemsEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), System.ComponentModel.Category("Data"), DevCoBrowsable(true), Browsable(true), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+		public System.Windows.Forms.ComboBox.ObjectCollection Items
+		{
+			get
+			{
+				return m_ComboBox.Items;
+				
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets a value specifying the style of the combo box.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Appearance"),DefaultValue(System.Windows.Forms.ComboBoxStyle.DropDownList),System.ComponentModel.Description("Gets or sets a value specifying the style of the combo box.")]
+		public System.Windows.Forms.ComboBoxStyle DropDownStyle
+		{
+			get
+			{
+				return m_ComboBox.DropDownStyle;
+			}
+			set
+			{
+                m_ComboBox.DropDownStyle=value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the starting index of text selected in the combo box.
+		/// </summary>
+		[Browsable(false),System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden),System.ComponentModel.DefaultValue(0)]
+		public int SelectionStart
+		{
+			get
+			{
+				return m_ComboBox.SelectionStart;
+			}
+			set
+			{
+				m_ComboBox.SelectionStart=value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the number of characters selected in the editable portion of the combo box.
+		/// </summary>
+		[Browsable(false),System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden),System.ComponentModel.DefaultValue(0)]
+		public int SelectionLength
+		{
+			get
+			{
+				return m_ComboBox.SelectionLength;
+			}
+			set
+			{
+				m_ComboBox.SelectionLength=value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the text that is selected in the editable portion of a combo box.
+		/// </summary>
+		[Browsable(false),System.ComponentModel.DefaultValue(""),System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
+		public string SelectedText
+		{
+			get
+			{
+				return m_ComboBox.SelectedText;
+			}
+			set
+			{
+				m_ComboBox.SelectedText=value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets currently selected item in the combo box.
+		/// </summary>
+		[Browsable(false),System.ComponentModel.DefaultValue(null),System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
+		public object SelectedItem
+		{
+			get
+			{
+				return m_ComboBox.SelectedItem;
+			}
+			set
+			{
+				m_ComboBox.SelectedItem=value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the index specifying the currently selected item.
+		/// </summary>
+		[Browsable(false),System.ComponentModel.DefaultValue(-1),System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
+		public int SelectedIndex
+		{
+			get
+			{
+				return m_ComboBox.SelectedIndex;
+			}
+			set
+			{
+				m_ComboBox.SelectedIndex=value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the value indicating whether the item automatically loads all the fonts available into the combo box.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Behavior"),System.ComponentModel.Description("Automatically loads all the fonts available into the combo box."),System.ComponentModel.DefaultValue(false)]
+		public bool FontCombo
+		{
+			get
+			{
+				return m_FontCombo;
+			}
+			set
+			{
+				if(m_FontCombo!=value)
+				{
+					m_FontCombo=value;
+					if(m_FontCombo)
+					{
+						m_ComboBox.LoadFonts();
+						m_ComboBox.DropDownStyle=System.Windows.Forms.ComboBoxStyle.DropDownList;
+						//m_ComboBox.DrawMode=System.Windows.Forms.DrawMode.OwnerDrawVariable;
+					}
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the height of an item in the combo box.
+		/// </summary>
+		[DefaultValue(15), System.ComponentModel.Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Behavior"),System.ComponentModel.Description("Indicates the height of an item in the combo box.")]
+		public int ItemHeight
+		{
+			get
+			{
+				return m_ComboBox.ItemHeight;
+			}
+			set
+			{
+				m_ComboBox.ItemHeight=value;
+			}
+		}
+
+		// IPersonalizedMenuItem Implementation
+		/// <summary>
+		/// Indicates item's visibility when on pop-up menu.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Appearance"),System.ComponentModel.Description("Indicates item's visiblity when on pop-up menu."),System.ComponentModel.DefaultValue(eMenuVisibility.VisibleAlways)]
+		public eMenuVisibility MenuVisibility
+		{
+			get
+			{
+				return m_MenuVisibility;
+			}
+			set
+			{
+				if(m_MenuVisibility!=value)
+				{
+					m_MenuVisibility=value;
+					if(m_Name!="" && this.GlobalItem)
+					{
+						BarFunctions.SetProperty(this.GetOwner(),this.GetType(),m_Name,System.ComponentModel.TypeDescriptor.GetProperties(this)["MenuVisibility"],m_MenuVisibility);
+					}
+				}
+			}
+		}
+		/// <summary>
+		/// Gets or sets the value that indicates whether the item was recently used.
+		/// </summary>
+		[System.ComponentModel.Browsable(false),System.ComponentModel.DefaultValue(false)]
+		public bool RecentlyUsed
+		{
+			get
+			{
+				return m_RecentlyUsed;
+			}
+			set
+			{
+				if(m_RecentlyUsed!=value)
+				{
+					m_RecentlyUsed=value;
+					if(m_Name!="" && this.GlobalItem)
+					{
+						BarFunctions.SetProperty(this.GetOwner(),this.GetType(),m_Name,System.ComponentModel.TypeDescriptor.GetProperties(this)["RecentlyUsed"],m_RecentlyUsed);
+					}
+				}
+			}
+		}
+
+		protected override void OnEnabledChanged()
+		{
+			base.OnEnabledChanged();
+			if(m_ComboBox!=null)
+				m_ComboBox.Enabled=this.Enabled;
+		}
+
+		private void InternalComboTextChanged(object sender, EventArgs e)
+		{
+            if(!_SettingText)
+                this.Text = m_ComboBox.Text;
+            OnComboBoxTextChanged(e);
+		}
+
+        /// <summary>
+        /// Raises the ComboBoxTextChanged event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnComboBoxTextChanged(EventArgs e)
+        {
+            if (ComboBoxTextChanged != null)
+                ComboBoxTextChanged(this, e);
+        }
+
+		/// <summary>
+		/// Overridden. Gets or sets the text associated with this item.
+		/// </summary>
+		[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), Browsable(false), Obsolete("Please use Text property instead to access ComboBox text.")]
+		public virtual string ControlText
+		{
+			get
+			{
+				return this.Text;
+			}
+			set
+			{
+                this.Text = value;
+            }
+		}
+
+        /// <summary>
+        /// Gets or sets the text associated with this item.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), Description("The text contained in the underlining Control portion of the item."), DefaultValue("")]
+        public override string Text
+        {
+            get
+            {
+                return base.Text;
+            }
+            set
+            {
+                base.Text = value;
+            }
+        }
+        private bool _SettingText = false;
+        protected override void OnTextChanged()
+        {
+            if (m_ComboBox != null && m_ComboBox.Text != this.Text)
+            {
+                try
+                {
+                    _SettingText = true;
+                    m_ComboBox.Text = this.Text;
+                }
+                finally
+                {
+                    _SettingText = false;
+                }
+            }
+            base.OnTextChanged();
+        }
+
+        private string _Caption = "";
+        /// <summary>
+        /// Gets or sets the item caption text displayed next to the combo box.
+        /// </summary>
+        [DefaultValue(""), System.ComponentModel.Category("Appearance"), Description("Indicates the item Caption displayed next to the combo box."), Localizable(true)]
+        public string Caption
+        {
+            get { return _Caption; }
+            set
+            {
+                if (value == null) value = "";
+                _Caption = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a string that specifies the property of the data source whose contents you want to display. When ComboBoxItem is used in DropDown mode
+        /// and objects like ComboItem are added to ComboBoxItems.Items collection DisplayMembers should be set to the name of the property you would
+        /// like to use as text representation in editable portion of ComboBox. For example in case of ComboItem objects property should be set to Text.
+        /// </summary>
+        [System.ComponentModel.Browsable(true), DevCoBrowsable(true), System.ComponentModel.Category("Data"), System.ComponentModel.Description("Indicates string that specifies the property of the data source whose contents you want to display."), System.ComponentModel.DefaultValue("")]
+        public virtual string DisplayMember
+        {
+            get
+            {
+                if(m_ComboBox!=null)
+                    return m_ComboBox.DisplayMember;
+                return "";
+            }
+            set
+            {
+                if (m_ComboBox != null)
+                    m_ComboBox.DisplayMember = value;
+            }
+        }
+
+		/// <summary>
+		/// Specifies whether combo box is drawn using themes when running on OS that supports themes like Windows XP
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Appearance"),System.ComponentModel.Description("Specifies whether combo box is drawn using themes when running on OS that supports themes like Windows XP.")]
+		public override bool ThemeAware
+		{
+			get
+			{
+				return m_ComboBox.ThemeAware;
+			}
+			set
+			{
+				m_ComboBox.ThemeAware=value;
+			}
+		}
+
+		[System.ComponentModel.Browsable(false),System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+		public override bool IsWindowed
+		{
+			get {return true;}
+		}
+
+        /// <summary>
+        /// Gets or sets the watermark font.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), Description("Indicates watermark font."), DefaultValue(null)]
+        public Font WatermarkFont
+        {
+            get { return m_ComboBox.WatermarkFont; }
+            set { m_ComboBox.WatermarkFont = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the watermark text color.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), Description("Indicates watermark text color.")]
+        public Color WatermarkColor
+        {
+            get { return m_ComboBox.WatermarkColor; }
+            set { m_ComboBox.WatermarkColor = value; }
+        }
+        /// <summary>
+        /// Indicates whether property should be serialized by Windows Forms designer.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeWatermarkColor()
+        {
+            return m_ComboBox.WatermarkColor != SystemColors.GrayText;
+        }
+        /// <summary>
+        /// Resets the property to default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetWatermarkColor()
+        {
+            this.WatermarkColor = SystemColors.GrayText;
+        }
+
+        /// <summary>
+        /// Gets or sets whether watermark text is displayed when control is empty. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Description("Indicates whether watermark text is displayed when control is empty.")]
+        public virtual bool WatermarkEnabled
+        {
+            get { return m_ComboBox.WatermarkEnabled; }
+            set { m_ComboBox.WatermarkEnabled = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the watermark (tip) text displayed inside of the control when Text is not set and control does not have input focus. This property supports text-markup.
+        /// Note that WatermarkText is not compatible with the auto-complete feature of .NET Framework 2.0.
+        /// </summary>
+        [Browsable(true), DefaultValue(""), Localizable(true), Category("Appearance"), Description("Indicates watermark text displayed inside of the control when Text is not set and control does not have input focus."), Editor("DevComponents.DotNetBar.Design.TextMarkupUIEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor))]
+        public string WatermarkText
+        {
+            get { return m_ComboBox.WatermarkText; }
+            set
+            {
+                m_ComboBox.WatermarkText = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the watermark hiding behaviour. Default value indicates that watermark is hidden when control receives input focus.
+        /// </summary>
+        [DefaultValue(eWatermarkBehavior.HideOnFocus), Category("Behavior"), Description("Indicates watermark hiding behaviour.")]
+        public eWatermarkBehavior WatermarkBehavior
+        {
+            get { return m_ComboBox.WatermarkBehavior; }
+            set { m_ComboBox.WatermarkBehavior = value; }
+        }
+
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content), RefreshProperties(RefreshProperties.All), ParenthesizePropertyName(true)]
+        public ControlBindingsCollection DataBindings
+        {
+            get { return m_ComboBox.DataBindings; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether control is stand-alone control. Stand-alone flag affects the appearance of the control in Office 2007 style.
+        /// </summary>
+        [Browsable(true), DefaultValue(false), Category("Appearance"), Description("Indicates the appearance of the control.")]
+        public bool IsStandalone
+        {
+            get { return m_ComboBox.IsStandalone; }
+            set
+            {
+                m_ComboBox.IsStandalone = value;
+            }
+        }
+
+        public override string ToString()
+        {
+            return m_Text;
+        }
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/ComboItem.cs b/PROMS/DotNetBar Source Code/ComboItem.cs
new file mode 100644
index 00000000..a05145da
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/ComboItem.cs	
@@ -0,0 +1,354 @@
+using System;
+using System.Windows.Forms;
+using System.Drawing.Drawing2D;
+using System.Drawing;
+using System.ComponentModel;
+using DevComponents.DotNetBar.Controls;
+using DevComponents.DotNetBar;
+
+namespace DevComponents.Editors
+{
+	/// <summary>
+	/// Summary description for ComboItem.
+	/// </summary>
+	[System.ComponentModel.ToolboxItem(false),System.ComponentModel.DesignTimeVisible(false)]
+	public class ComboItem:Component
+	{
+		private string m_Text="";
+		private int m_ImageIndex=-1;
+		private Image m_Image;
+		private StringFormat m_TextFormat;
+		private HorizontalAlignment m_ImagePosition=HorizontalAlignment.Left;
+		
+		private string m_FontName="";
+		private FontStyle m_FontStyle=FontStyle.Regular;
+		private float m_FontSize=8;
+
+		private Color m_ForeColor=Color.Empty;
+		private Color m_BackColor=Color.Empty;
+
+        private object m_Tag;
+
+		internal ComboBoxEx m_ComboBox=null;
+		internal bool IsFontItem=false;
+
+		/// <summary>
+		/// Creates new instance of ComboItem.
+		/// </summary>
+		public ComboItem()
+		{
+			m_TextFormat=DevComponents.DotNetBar.BarFunctions.CreateStringFormat(); //new StringFormat(StringFormat.GenericDefault);
+			m_TextFormat.Alignment=StringAlignment.Near;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the ComboItem class.
+        /// </summary>
+        /// <param name="text"></param>
+        public ComboItem(string text) : this()
+        {
+            this.m_Text = text;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the ComboItem class.
+        /// </summary>
+        /// <param name="text"></param>
+        /// <param name="foreColor"></param>
+        public ComboItem(string text, Color foreColor) : this()
+        {
+            this.m_Text = text;
+            this.m_ForeColor = foreColor;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the ComboItem class.
+        /// </summary>
+        /// <param name="text"></param>
+        /// <param name="foreColor"></param>
+        /// <param name="backColor"></param>
+        public ComboItem(string text, Color foreColor, Color backColor)
+            : this()
+        {
+            this.m_Text = text;
+            this.m_ForeColor = foreColor;
+            this.m_BackColor = backColor;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the ComboItem class.
+        /// </summary>
+        /// <param name="text"></param>
+        /// <param name="image"></param>
+        public ComboItem(string text, Image image)
+            : this()
+        {
+            this.m_Text = text;
+            this.m_Image = image;
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            if (BarUtilities.DisposeItemImages && !this.DesignMode)
+            {
+                BarUtilities.DisposeImage(ref m_Image);
+            }
+            base.Dispose(disposing);
+        }
+
+        /// <summary>
+		/// Gets or sets the text associated with this item.
+		/// </summary>
+		[DefaultValue(""),Browsable(true), Localizable(true)]
+		public string Text
+		{
+			get
+			{
+				return m_Text;
+			}
+			set
+			{
+				m_Text=value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the index value of the image assigned to the item.
+		/// </summary>
+        [DefaultValue(-1), System.ComponentModel.Editor("DevComponents.DotNetBar.Design.ImageIndexEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), TypeConverter(typeof(System.Windows.Forms.ImageIndexConverter)), Localizable(true)]
+		public int ImageIndex
+		{
+			get
+			{
+				return m_ImageIndex;
+			}
+			set
+			{
+				m_ImageIndex=value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the text alignment..
+		/// </summary>
+		[DefaultValue(StringAlignment.Near)]
+		public StringAlignment TextAlignment
+		{
+			get
+			{
+				return m_TextFormat.Alignment;
+			}
+			set
+			{
+				m_TextFormat.Alignment=value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the line alignment for the item.
+		/// </summary>
+		[DefaultValue(StringAlignment.Near)]
+		public StringAlignment TextLineAlignment
+		{
+			get
+			{
+				return m_TextFormat.LineAlignment;
+			}
+			set
+			{
+				m_TextFormat.LineAlignment=value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the value that encapsulates text layout information (such as alignment, orientation, tab stops, and clipping) and display manipulations.
+		/// </summary>
+		[Browsable(false),DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public StringFormat TextFormat
+		{
+			get
+			{
+				return m_TextFormat;
+			}
+			set
+			{
+				m_TextFormat=value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the image horizontal image position.
+		/// </summary>
+		[DefaultValue(HorizontalAlignment.Left)]
+		public HorizontalAlignment ImagePosition
+		{
+			get
+			{
+				return m_ImagePosition;
+			}
+			set
+			{
+				m_ImagePosition=value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the font name used to draw the item text.
+		/// </summary>
+		[DefaultValue("")]
+		public String FontName
+		{
+			get
+			{
+				return m_FontName;
+			}
+			set
+			{
+				m_FontName=value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the text color.
+		/// </summary>
+		public Color ForeColor
+		{
+			get
+			{
+				return m_ForeColor;
+			}
+			set
+			{
+				m_ForeColor=value;
+			}
+		}
+
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeForeColor()
+		{
+			return !m_ForeColor.IsEmpty;
+		}
+
+		/// <summary>
+		/// Gets or sets the background color of the item.
+		/// </summary>
+		public Color BackColor
+		{
+			get
+			{
+				return m_BackColor;
+			}
+			set
+			{
+				m_BackColor=value;
+			}
+		}
+
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeBackColor()
+		{
+			return !m_BackColor.IsEmpty;
+		}
+
+		/// <summary>
+		/// Specifies style information applied to text.
+		/// </summary>
+		[DefaultValue(FontStyle.Regular)]
+		public System.Drawing.FontStyle FontStyle
+		{
+			get
+			{
+				return m_FontStyle;
+			}
+			set
+			{
+				m_FontStyle=value;
+			}
+		}
+
+		/// <summary>
+		/// Gets the em-size of this Font object in design units.
+		/// </summary>
+		[DefaultValue(8f)]
+		public float FontSize
+		{
+			get
+			{
+				return m_FontSize;
+			}
+			set
+			{
+				m_FontSize=value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the image assigned to this item.
+        /// </summary>
+        [DefaultValue(null), Localizable(true)]
+		public System.Drawing.Image Image
+		{
+			get
+			{
+				return m_Image;
+			}
+			set
+			{
+				m_Image=value;
+			}
+		}
+
+		/// <summary>
+		/// Overridden. Returns a human-readable string representation of this object.
+		/// </summary>
+		/// <returns>A string that represents this object.</returns>
+		public override string ToString()
+		{
+			return m_Text;
+		}
+
+		/// <summary>
+		/// Gets or sets an object that contains data to associate with the item.
+		/// </summary>
+		[Browsable(false),DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public object Tag
+		{
+			get
+			{
+				return m_Tag;
+			}
+			set
+			{
+				m_Tag=value;
+			}
+		}
+		[Browsable(false),EditorBrowsable(EditorBrowsableState.Never)]
+		public System.Windows.Forms.ImageList ImageList
+		{
+			get
+			{
+				if(m_ComboBox!=null)
+				{
+					return m_ComboBox.Images;
+				}
+				return null;
+			}
+		}
+		[Browsable(false),EditorBrowsable(EditorBrowsableState.Never)]
+		public ComboBoxEx Parent
+		{
+			get
+			{
+				return m_ComboBox;
+			}
+		}
+
+        private object _Value = null;
+        [DefaultValue(null), Category("Data"),  TypeConverter(typeof(StringConverter)), Localizable(true)]
+        public object Value
+        {
+            get { return _Value; }
+            set { _Value = value; }
+        }
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/Command.ico b/PROMS/DotNetBar Source Code/Command.ico
new file mode 100644
index 00000000..236756d7
Binary files /dev/null and b/PROMS/DotNetBar Source Code/Command.ico differ
diff --git a/PROMS/DotNetBar Source Code/CommandLink.cs b/PROMS/DotNetBar Source Code/CommandLink.cs
new file mode 100644
index 00000000..25b62cf3
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/CommandLink.cs	
@@ -0,0 +1,144 @@
+using System;
+using System.Text;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represents the base class that provides link between DotNetBar BaseItem commands and typed code representation for them.
+    /// </summary>
+    [ToolboxItem(false), DesignTimeVisible(false), DefaultEvent("Click")]
+    public class CommandLink : Component
+    {
+        #region Private Variables
+        private string m_Name = "";
+        private DotNetBarManager m_Manager = null;
+        private static string CommandPrefix = "cmd";
+        #endregion
+
+        #region Events
+        /// <summary>
+        /// Occurs when item connected to the command link is clicked.
+        /// </summary>
+        public event EventHandler Click;
+        #endregion
+
+        /// <summary>
+        /// Returns name of the item that can be used to identify item from the code. You should not set this property directly since it is populated by DotNetBar designer.
+        /// </summary>
+        [Browsable(false), Category("Design"), Description("Indicates the name used to identify item command link is connected to.")]
+        public string Name
+        {
+            get
+            {
+                if (this.Site != null)
+                    m_Name = this.Site.Name;
+                return m_Name;
+            }
+            set
+            {
+                if (this.Site != null)
+                    this.Site.Name = value;
+                if (value == null)
+                    m_Name = "";
+                else
+                    m_Name = value;
+            }
+        }
+
+        protected virtual BaseItem GetItem(Type expectedItemType)
+        {
+            if (this.Manager == null)
+                throw new InvalidOperationException("Manager property is not assigned to the instance of DotNetBarManager this CommandLink is linking to.");
+
+            string itemName = GetItemName(this.Name);
+            if (itemName == "")
+            {
+                throw new InvalidOperationException("Command link name is not in expected format. Could not retrive item.");
+            }
+
+            BaseItem item = this.Manager.GetItem(itemName, true);
+
+            if (item == null)
+                throw new InvalidOperationException("Item '" + itemName + "' cannot be found. DotNetBarManager definition might not be loaded. Try moving your code to Load event.");
+
+            if (item.GetType() != expectedItemType)
+                throw new InvalidOperationException("This CommandLink type can only by connected to " + expectedItemType.Name + " type. Currently link is connecting to " + item.GetType().ToString());
+
+            return item;
+        }
+
+        /// <summary>
+        /// Disconnects the CommandLink object to the DotNetBarManager.
+        /// </summary>
+        protected virtual void DisconnectManager()
+        {
+            if (m_Manager == null)
+                return;
+            m_Manager.ItemClick -= new EventHandler(ItemClick);
+            m_Manager.CommandLinks.Remove(this);
+        }
+
+        /// <summary>
+        /// Connects the CommandLink object to the DotNetBarManager.
+        /// </summary>
+        protected virtual void ConnectManager()
+        {
+            if (m_Manager == null)
+                return;
+            m_Manager.ItemClick += new EventHandler(ItemClick);
+            m_Manager.CommandLinks.Add(this);
+        }
+
+        private void ItemClick(object sender, EventArgs e)
+        {
+			if(sender is BaseItem)
+			{
+				BaseItem item = sender as BaseItem;
+				if(item.Name == GetItemName(this.Name))
+				{
+					if (Click != null)
+						Click(sender, e);
+				}
+			}
+        }
+
+        /// <summary>
+        /// Gets or sets the instance of DotNetBarManager associated with the command link.
+        /// </summary>
+        [Browsable(false), DefaultValue(null)]
+        public DotNetBarManager Manager
+        {
+            get { return m_Manager; }
+            set
+            {
+                if (m_Manager != null)
+                    DisconnectManager();
+                m_Manager = value;
+
+                if (m_Manager != null)
+                    ConnectManager();
+            }
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing)
+                this.Manager = null;
+            base.Dispose(disposing);
+        }
+
+        internal static string GetCommandLinkName(string itemName)
+        {
+            return CommandPrefix + itemName;
+        }
+
+        internal static string GetItemName(string commandLinkName)
+        {
+            if (commandLinkName.StartsWith(CommandPrefix))
+                return commandLinkName.Substring(CommandPrefix.Length);
+
+            return "";
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/CommandLinkButtonItem.cs b/PROMS/DotNetBar Source Code/CommandLinkButtonItem.cs
new file mode 100644
index 00000000..8eeb0456
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/CommandLinkButtonItem.cs	
@@ -0,0 +1,25 @@
+using System;
+using System.Text;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represents the typed command link for ButtonItem type.
+    /// </summary>
+    public class CommandLinkButtonItem : CommandLink
+    {
+        /// <summary>
+        /// Gets reference to the ButtonItem this CommandLink is linked to. Note that this is the first ButtonItem object found by DotNetBarManager.
+        /// It is possible that multiple buttons have same name see Global Items under DotNetBar Fundamentals in help file for more details.
+        /// </summary>
+        [Browsable(false)]
+        public ButtonItem Item
+        {
+            get
+            {
+                return this.GetItem(typeof(ButtonItem)) as ButtonItem;
+            }
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/CommandLinkColorPickerDropDown.cs b/PROMS/DotNetBar Source Code/CommandLinkColorPickerDropDown.cs
new file mode 100644
index 00000000..3598430e
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/CommandLinkColorPickerDropDown.cs	
@@ -0,0 +1,53 @@
+using System;
+using System.Text;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represents the typed command link for ColorPickerDropDown type.
+    /// </summary>
+    public class CommandLinkColorPickerDropDown : CommandLink
+    {
+        #region Events
+        /// <summary>
+        /// Occurs when color is choosen from drop-down color picker or from Custom Colors dialog box. Selected color can be accessed through SelectedColor property.
+        /// </summary>
+        [Description("Occurs when color is choosen from drop-down color picker or from Custom Colors dialog box.")]
+        public event EventHandler SelectedColorChanged;
+        #endregion
+
+        /// <summary>
+        /// Gets reference to the ColorPickerDropDown this CommandLink is linked to. Note that this is the first ColorPickerDropDown object found by DotNetBarManager.
+        /// It is possible that multiple buttons have same name see Global Items under DotNetBar Fundamentals in help file for more details.
+        /// </summary>
+        [Browsable(false)]
+        public ColorPickerDropDown Item
+        {
+            get
+            {
+                return this.GetItem(typeof(ColorPickerDropDown)) as ColorPickerDropDown;
+            }
+        }
+
+        protected override void ConnectManager()
+        {
+            base.ConnectManager();
+            if(this.Manager!=null)
+                this.Manager.ColorPickerSelectedColorChanged += new EventHandler(ManagerColorPickerSelectedColorChanged);
+        }
+
+        private void ManagerColorPickerSelectedColorChanged(object sender, EventArgs e)
+        {
+            if (SelectedColorChanged != null)
+                SelectedColorChanged(sender, e);
+        }
+
+        protected override void DisconnectManager()
+        {
+            base.DisconnectManager();
+            if(this.Manager!=null)
+                this.Manager.ColorPickerSelectedColorChanged -= new EventHandler(ManagerColorPickerSelectedColorChanged);
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/CommandLinkComboBoxItem.cs b/PROMS/DotNetBar Source Code/CommandLinkComboBoxItem.cs
new file mode 100644
index 00000000..9c6d9491
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/CommandLinkComboBoxItem.cs	
@@ -0,0 +1,25 @@
+using System;
+using System.Text;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represents the command link for a combo box item
+    /// </summary>
+    public class CommandLinkComboBoxItem : CommandLink
+    {
+        /// <summary>
+        /// Gets reference to the ComboBoxItem this CommandLink is linked to. Note that this is the first ComboBoxItem object found by DotNetBarManager.
+        /// It is possible that multiple buttons have same name see Global Items under DotNetBar Fundamentals in help file for more details.
+        /// </summary>
+        [Browsable(false)]
+        public ComboBoxItem Item
+        {
+            get
+            {
+                return this.GetItem(typeof(ComboBoxItem)) as ComboBoxItem;
+            }
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/CommandLinkControlContainerItem.cs b/PROMS/DotNetBar Source Code/CommandLinkControlContainerItem.cs
new file mode 100644
index 00000000..0807ec6d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/CommandLinkControlContainerItem.cs	
@@ -0,0 +1,25 @@
+using System;
+using System.Text;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represents the typed command link for ControlContainerItem type.
+    /// </summary>
+    public class CommandLinkControlContainerItem : CommandLink
+    {
+        /// <summary>
+        /// Gets reference to the ControlContainerItem this CommandLink is linked to. Note that this is the first ControlContainerItem object found by DotNetBarManager.
+        /// It is possible that multiple buttons have same name see Global Items under DotNetBar Fundamentals in help file for more details.
+        /// </summary>
+        [Browsable(false)]
+        public ControlContainerItem Item
+        {
+            get
+            {
+                return this.GetItem(typeof(ControlContainerItem)) as ControlContainerItem;
+            }
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/CommandLinkDockContainerItem.cs b/PROMS/DotNetBar Source Code/CommandLinkDockContainerItem.cs
new file mode 100644
index 00000000..326e8210
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/CommandLinkDockContainerItem.cs	
@@ -0,0 +1,25 @@
+using System;
+using System.Text;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represents the typed command link for DockContainerItem type.
+    /// </summary>
+    public class CommandLinkDockContainerItem : CommandLink
+    {
+        /// <summary>
+        /// Gets reference to the ControlContainerItem this CommandLink is linked to. Note that this is the first ControlContainerItem object found by DotNetBarManager.
+        /// It is possible that multiple buttons have same name see Global Items under DotNetBar Fundamentals in help file for more details.
+        /// </summary>
+        [Browsable(false)]
+        public DockContainerItem Item
+        {
+            get
+            {
+                return this.GetItem(typeof(DockContainerItem)) as DockContainerItem;
+            }
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/CommandLinkLabelItem.cs b/PROMS/DotNetBar Source Code/CommandLinkLabelItem.cs
new file mode 100644
index 00000000..a09e3fde
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/CommandLinkLabelItem.cs	
@@ -0,0 +1,25 @@
+using System;
+using System.Text;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represents the command link for a label item
+    /// </summary>
+    public class CommandLinkLabelItem : CommandLink
+    {
+        /// <summary>
+        /// Gets reference to the LabelItem this CommandLink is linked to. Note that this is the first LabelItem object found by DotNetBarManager.
+        /// It is possible that multiple buttons have same name see Global Items under DotNetBar Fundamentals in help file for more details.
+        /// </summary>
+        [Browsable(false)]
+        public LabelItem Item
+        {
+            get
+            {
+                return this.GetItem(typeof(LabelItem)) as LabelItem;
+            }
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/CommandLinkProgressBarItem.cs b/PROMS/DotNetBar Source Code/CommandLinkProgressBarItem.cs
new file mode 100644
index 00000000..f280b2c2
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/CommandLinkProgressBarItem.cs	
@@ -0,0 +1,25 @@
+using System;
+using System.Text;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represents the typed command link for ProgressBarItem type.
+    /// </summary>
+    public class CommandLinkProgressBarItem : CommandLink
+    {
+        /// <summary>
+        /// Gets reference to the ControlContainerItem this CommandLink is linked to. Note that this is the first ControlContainerItem object found by DotNetBarManager.
+        /// It is possible that multiple buttons have same name see Global Items under DotNetBar Fundamentals in help file for more details.
+        /// </summary>
+        [Browsable(false)]
+        public ProgressBarItem Item
+        {
+            get
+            {
+                return this.GetItem(typeof(ProgressBarItem)) as ProgressBarItem;
+            }
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/CommandLinkTextBoxItem.cs b/PROMS/DotNetBar Source Code/CommandLinkTextBoxItem.cs
new file mode 100644
index 00000000..8b14f9e6
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/CommandLinkTextBoxItem.cs	
@@ -0,0 +1,55 @@
+using System;
+using System.Text;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represents the command link for a text box item
+    /// </summary>
+    public class CommandLinkTextBoxItem : CommandLink
+    {
+        #region Events
+        /// <summary>
+        /// Occurs when text in text box item has changed.
+        /// </summary>
+        public event EventHandler InputTextChanged;
+        #endregion
+
+        /// <summary>
+        /// Gets reference to the TextBoxItem this CommandLink is linked to. Note that this is the first TextBoxItem object found by DotNetBarManager.
+        /// It is possible that multiple buttons have same name see Global Items under DotNetBar Fundamentals in help file for more details.
+        /// </summary>
+        [Browsable(false)]
+        public TextBoxItem Item
+        {
+            get
+            {
+                return this.GetItem(typeof(TextBoxItem)) as TextBoxItem;
+            }
+        }
+
+        protected override void ConnectManager()
+        {
+            base.ConnectManager();
+
+            if (this.Manager != null)
+            {
+                this.Manager.TextBoxItemTextChanged += new EventHandler(this.ItemInputTextChanged);
+            }
+        }
+
+        protected override void DisconnectManager()
+        {
+            base.DisconnectManager();
+            if(this.Manager!=null)
+                this.Manager.TextBoxItemTextChanged -= new EventHandler(this.ItemInputTextChanged);
+        }
+
+        private void ItemInputTextChanged(object sender, EventArgs e)
+        {
+            if (InputTextChanged != null)
+                InputTextChanged(sender, e);
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/CommandManager.cs b/PROMS/DotNetBar Source Code/CommandManager.cs
new file mode 100644
index 00000000..2c244bfb
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/CommandManager.cs	
@@ -0,0 +1,148 @@
+using System;
+using System.Text;
+using System.Collections;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Provides command related utility methods that register and unregister commands.
+    /// </summary>
+    public class CommandManager
+    {
+        private static Hashtable _CommandBindings = new Hashtable();
+        private static bool _UseReflection = true;
+
+        /// <summary>
+        /// Gets or sets whether commands use Reflection to find the property names when applying value to the unknown types. Default value is true.
+        /// Setting this value to false will increase performance if Unknown types are used but it will at same time disable the
+        /// command setting value for these types.
+        /// </summary>
+        public static bool UseReflection
+        {
+            get
+            {
+                return _UseReflection;
+            }
+            set
+            {
+                _UseReflection = value;
+            }
+        }
+
+        private static bool _AutoUpdateLayout = true;
+        /// <summary>
+        /// Gets or sets whether layout on the items of type BaseItem is automatically updated when command text or other property changes which requires layout updated. Default value is true.
+        /// </summary>
+        public static bool AutoUpdateLayout
+        {
+            get { return _AutoUpdateLayout; }
+            set
+            {
+                if (_AutoUpdateLayout != value)
+                {
+                    _AutoUpdateLayout = value;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Connects the Command Source to the Command.
+        /// </summary>
+        /// <param name="commandSource">Command source to connect to the command.</param>
+        /// <param name="command">Reference to the command.</param>
+        public static void RegisterCommand(ICommandSource commandSource, ICommand command)
+        {
+            if (commandSource == null)
+                throw new NullReferenceException("commandSource cannot be null");
+            if (command == null)
+                throw new NullReferenceException("command cannot be null");
+
+            ArrayList subscribers = null;
+            if (_CommandBindings.Contains(command))
+            {
+                subscribers = (ArrayList)_CommandBindings[command];
+                if (!subscribers.Contains(commandSource))
+                    subscribers.Add(commandSource);
+            }
+            else
+            {
+                subscribers = new ArrayList();
+                subscribers.Add(commandSource);
+                _CommandBindings.Add(command, subscribers);
+            }
+            command.CommandSourceRegistered(commandSource);
+        }
+
+        /// <summary>
+        /// Disconnects command source from the command.
+        /// </summary>
+        /// <param name="commandSource">Reference to command source.</param>
+        /// <param name="command">Reference to the command.</param>
+        public static void UnRegisterCommandSource(ICommandSource commandSource, ICommand command)
+        {
+            if (commandSource == null)
+                throw new NullReferenceException("commandSource cannot be null");
+            if (command == null)
+                throw new NullReferenceException("command cannot be null");
+            if (_CommandBindings.Contains(command))
+            {
+                ArrayList subscribers = (ArrayList)_CommandBindings[command];
+                if (subscribers.Contains(commandSource))
+                    subscribers.Remove(commandSource);
+            }
+            command.CommandSourceUnregistered(commandSource);
+        }
+
+        /// <summary>
+        /// Unregister command from all subscribers. Called when command is disposed.
+        /// </summary>
+        /// <param name="command">Command to unregister.</param>
+        public static void UnRegisterCommand(ICommand command)
+        {
+            if (command == null)
+                throw new NullReferenceException("command cannot be null");
+
+            if (_CommandBindings.Contains(command))
+                _CommandBindings.Remove(command);
+        }
+
+        /// <summary>
+        /// Gets an array of Command Sources that are connected with the command. 
+        /// </summary>
+        /// <param name="command">Reference to command</param>
+        /// <returns>An array of command sources.</returns>
+        public static ArrayList GetSubscribers(ICommand command)
+        {
+            if (command == null)
+                throw new NullReferenceException("command cannot be null");
+            ArrayList subscribers = null;
+            if (_CommandBindings.Contains(command))
+                subscribers = (ArrayList)((ArrayList)_CommandBindings[command]).Clone();
+            else
+                subscribers = new ArrayList();
+
+            return subscribers;
+        }
+
+        internal static void ExecuteCommand(ICommandSource commandSource)
+        {
+            if (commandSource == null)
+                throw new NullReferenceException("commandSource cannot be null");
+            ICommand command=commandSource.Command;
+            if(command == null)
+                throw new NullReferenceException("commandSource.Command cannot be null");
+
+            command.Execute(commandSource);
+        }
+
+        internal static void ExecuteCommand(ICommandSource commandSource, ICommand command)
+        {
+            if (commandSource == null)
+                throw new NullReferenceException("commandSource cannot be null");
+            if (command == null)
+                throw new NullReferenceException("commandSource.Command cannot be null");
+
+            command.Execute(commandSource);
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/CompositeImage.cs b/PROMS/DotNetBar Source Code/CompositeImage.cs
new file mode 100644
index 00000000..12969cdc
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/CompositeImage.cs	
@@ -0,0 +1,262 @@
+using System;
+using System.Drawing;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Serves as integration of regular Image class and Icon class
+    /// </summary>
+    internal class CompositeImage : IDisposable
+    {
+        private bool m_DisposeImage = false;
+
+        private Image m_Image = null;
+        private Icon m_Icon = null;
+        private Size m_ImageSizeOverride = Size.Empty;
+        private ImageList m_ImageList = null;
+        private int m_ImageIndex = -1;
+
+        public CompositeImage(int imageIndex, ImageList imageList)
+        {
+            m_ImageIndex = imageIndex;
+            m_ImageList = imageList;
+        }
+
+        public CompositeImage(Image image, bool dispose)
+        {
+            m_Image = image;
+            m_DisposeImage = dispose;
+        }
+        public CompositeImage(Icon icon, bool dispose)
+        {
+            m_Icon = icon;
+            m_DisposeImage = dispose;
+        }
+        public CompositeImage(Image image, bool dispose, Size overrideSize)
+        {
+            m_Image = image;
+            m_DisposeImage = dispose;
+            m_ImageSizeOverride = overrideSize;
+        }
+        public CompositeImage(Icon icon, bool dispose, Size overrideSize)
+        {
+            m_Icon = icon;
+            m_DisposeImage = dispose;
+            m_ImageSizeOverride = overrideSize;
+        }
+        ~CompositeImage()  // destructor
+        {
+            if (m_DisposeImage && (m_Image != null || m_Icon != null))
+            {
+                Dispose();
+            }
+        }
+
+        public void Dispose()
+        {
+            if (m_DisposeImage)
+            {
+                if (m_Image != null)
+                    m_Image.Dispose();
+                if (m_Icon != null)
+                    m_Icon.Dispose();
+            }
+
+            m_Image = null;
+            m_Icon = null;
+        }
+
+        public void DrawImage(Graphics g, Rectangle rect)
+        {
+            if (m_Image != null)
+                g.DrawImage(m_Image, rect);
+            else if (m_Icon != null)
+                DrawIcon(g, rect);
+            else if (m_ImageIndex >= 0 && m_ImageList != null && m_ImageIndex < m_ImageList.Images.Count)
+                m_ImageList.Draw(g, rect.X, rect.Y, rect.Width, rect.Height, m_ImageIndex);
+        }
+
+        private void DrawIcon(Graphics g, Rectangle rect)
+        {
+            if (System.Environment.Version.Build <= 3705 && System.Environment.Version.Revision == 288 && System.Environment.Version.Major == 1 && System.Environment.Version.Minor == 0)
+            {
+                if (g.ClipBounds.IntersectsWith(rect) && rect.Width > 0 && rect.Height > 0 && m_Icon.Handle != IntPtr.Zero)
+                {
+                    IntPtr hdc = g.GetHdc();
+                    try
+                    {
+                        NativeFunctions.DrawIconEx(hdc, rect.X, rect.Y, m_Icon.Handle, rect.Width, rect.Height, 0, IntPtr.Zero, 3);
+                    }
+                    finally
+                    {
+                        g.ReleaseHdc(hdc);
+                    }
+                }
+            }
+            else if (rect.Width > 0 && rect.Height > 0 && m_Icon.Handle != IntPtr.Zero)
+            {
+                try
+                {
+                    g.DrawIcon(m_Icon, rect);
+                }
+                catch { }
+            }
+        }
+
+        public void DrawImage(Graphics g, Rectangle destRect, int srcX, int srcY, int srcWidth, int srcHeight, GraphicsUnit srcUnit, System.Drawing.Imaging.ImageAttributes imageAttrs)
+        {
+            if (m_Image != null)
+            {
+                g.DrawImage(m_Image, destRect, srcX, srcY, srcWidth, srcHeight, srcUnit, imageAttrs);
+            }
+            else if (m_Icon != null)
+            {
+                // Attempt to solve issues with icon drawing...
+                //DrawIcon(g,destRect);
+                Bitmap bmp = new Bitmap(this.Width, this.Height, System.Drawing.Imaging.PixelFormat.Format32bppArgb);
+                bmp.MakeTransparent();
+                Graphics gBmp = Graphics.FromImage(bmp);
+                gBmp.DrawIcon(m_Icon, 0, 0);
+                gBmp.Dispose();
+                g.DrawImage(bmp, destRect, srcX, srcY, srcWidth, srcHeight, srcUnit, imageAttrs);
+                bmp.Dispose();
+            }
+            else if (m_ImageIndex >= 0 && m_ImageList != null && m_ImageIndex < m_ImageList.Images.Count)
+                m_ImageList.Draw(g, srcX, srcY, srcWidth, srcHeight, m_ImageIndex);
+        }
+
+        public bool IsIcon
+        {
+            get { return (m_Icon != null); }
+        }
+
+        public int Width
+        {
+            get
+            {
+                if (!m_ImageSizeOverride.IsEmpty)
+                    return GetSize(m_ImageSizeOverride.Width);
+                if (m_Image != null)
+                    return GetSize(m_Image.Width);
+                if (m_Icon != null)
+                    return GetSize(m_Icon.Width);
+                if (m_ImageIndex >= 0 && m_ImageList != null)
+                    return GetSize(m_ImageList.ImageSize.Width);
+                return 0;
+            }
+        }
+
+        public int Height
+        {
+            get
+            {
+                if (!m_ImageSizeOverride.IsEmpty)
+                    return GetSize(m_ImageSizeOverride.Height);
+                if (m_Image != null)
+                    return GetSize(m_Image.Height);
+                if (m_Icon != null)
+                    return GetSize(m_Icon.Height);
+                if (m_ImageIndex >= 0 && m_ImageList != null)
+                    return GetSize(m_ImageList.ImageSize.Height);
+                return 0;
+            }
+        }
+
+        private int GetSize(int height)
+        {
+            return (Dpi.AutoScaleImages ? Dpi.Height(height) : height);
+        }
+        private Size GetSize(Size size)
+        {
+            return (Dpi.AutoScaleImages ? Dpi.Size(size) : size);
+        }
+
+        public System.Drawing.Size Size
+        {
+            get
+            {
+                if (!m_ImageSizeOverride.IsEmpty)
+                    return GetSize(m_ImageSizeOverride);
+                if (m_Image != null)
+                    return GetSize(m_Image.Size);
+                if (m_Icon != null)
+                    return GetSize(m_Icon.Size);
+                if (m_ImageIndex >= 0 && m_ImageList != null)
+                    return GetSize(m_ImageList.ImageSize);
+                return System.Drawing.Size.Empty;
+            }
+        }
+
+        public System.Drawing.Image Image
+        {
+            get
+            {
+                if (m_ImageIndex >= 0 && m_ImageList != null)
+                    return m_ImageList.Images[m_ImageIndex];
+                return m_Image;
+            }
+        }
+
+        public System.Drawing.Icon Icon
+        {
+            get { return m_Icon; }
+        }
+
+        internal int RealHeight
+        {
+            get
+            {
+                if (m_Image != null)
+                    return GetSize(m_Image.Height);
+                if (m_Icon != null)
+                    return GetSize(m_Icon.Height);
+                if (m_ImageIndex >= 0 && m_ImageList != null)
+                    return GetSize(m_ImageList.ImageSize.Height);
+                return 0;
+            }
+        }
+
+        internal int RealWidth
+        {
+            get
+            {
+                if (m_Image != null)
+                    return GetSize(m_Image.Width);
+                if (m_Icon != null)
+                    return GetSize(m_Icon.Width);
+                if (m_ImageIndex >= 0 && m_ImageList != null)
+                    return GetSize(m_ImageList.ImageSize.Width);
+                return 0;
+            }
+        }
+
+        internal int ActualHeight
+        {
+            get
+            {
+                if (m_Image != null)
+                    return m_Image.Height;
+                if (m_Icon != null)
+                    return m_Icon.Height;
+                if (m_ImageIndex >= 0 && m_ImageList != null)
+                    return m_ImageList.ImageSize.Height;
+                return 0;
+            }
+        }
+
+        internal int ActualWidth
+        {
+            get
+            {
+                if (m_Image != null)
+                    return (m_Image.Width);
+                if (m_Icon != null)
+                    return (m_Icon.Width);
+                if (m_ImageIndex >= 0 && m_ImageList != null)
+                    return (m_ImageList.ImageSize.Width);
+                return 0;
+            }
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/ContainerKeyboardNavigation.cs b/PROMS/DotNetBar Source Code/ContainerKeyboardNavigation.cs
new file mode 100644
index 00000000..1f89a151
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/ContainerKeyboardNavigation.cs	
@@ -0,0 +1,206 @@
+using System;
+using System.Text;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar
+{
+    internal class ContainerKeyboardNavigation
+    {
+        internal static void ProcessKeyDown(BaseItem container, System.Windows.Forms.KeyEventArgs objArg)
+        {
+            if (container.SubItems.Count == 0 || objArg.Handled)
+                return;
+
+            BaseItem objExpanded = container.ExpandedItem();
+
+            if (objExpanded != null)
+            {
+                objExpanded.InternalKeyDown(objArg);
+                if (objArg.Handled)
+                    return;
+            }
+
+            eOrientation containerOrientation = container.Orientation;
+            if (container is ItemContainer)
+                containerOrientation = ((ItemContainer)container).LayoutOrientation;
+
+            if (containerOrientation == eOrientation.Horizontal && (objArg.KeyCode == Keys.Left || objArg.KeyCode == Keys.Right || container.HotSubItem == null && (objArg.KeyCode == Keys.Down || objArg.KeyCode == Keys.Up)) ||
+               (containerOrientation == eOrientation.Vertical && (objArg.KeyCode == Keys.Up || objArg.KeyCode == Keys.Down || container.HotSubItem == null && (objArg.KeyCode == Keys.Right || objArg.KeyCode == Keys.Left))))
+            {
+                // Select next object
+                if (container.HotSubItem != null)
+                {
+                    container.HotSubItem.InternalMouseLeave();
+                    if (container.AutoExpand && container.HotSubItem.Expanded)
+                    {
+                        container.HotSubItem.Expanded = false;
+                    }
+                }
+                if (objArg.KeyCode == System.Windows.Forms.Keys.Left || objArg.KeyCode == Keys.Up)
+                {
+                    int iIndex = 0;
+                    if (container.HotSubItem != null)
+                        iIndex = container.SubItems.IndexOf(container.HotSubItem) - 1;
+                    if (iIndex < 0)
+                        iIndex = container.SubItems.Count - 1;
+                    BaseItem objNew = null;
+                    bool bRepeat = false;
+                    do
+                    {
+                        for (int i = iIndex; i >= 0; i--)
+                        {
+                            objNew = container.SubItems[i];
+                            if (CanFocus(objNew))
+                            {
+                                iIndex = i;
+                                break;
+                            }
+                        }
+                        if (!CanFocus(container.SubItems[iIndex]))
+                        {
+                            if (!bRepeat)
+                            {
+                                iIndex = container.SubItems.Count - 1;
+                                bRepeat = true;
+                            }
+                            else
+                                bRepeat = false;
+                        }
+                        else
+                            bRepeat = false;
+                    } while (bRepeat);
+                    container.HotSubItem = container.SubItems[iIndex];
+                }
+                else
+                {
+                    int iIndex = 0;
+                    if (container.HotSubItem != null)
+                        iIndex = container.SubItems.IndexOf(container.HotSubItem) + 1;
+
+                    while (iIndex < container.SubItems.Count && !CanFocus(container.SubItems[iIndex]))
+                        iIndex++;
+                    if (iIndex >= container.SubItems.Count)
+                        iIndex = 0;
+                    BaseItem objNew = null;
+                    for (int i = iIndex; i < container.SubItems.Count; i++)
+                    {
+                        objNew = container.SubItems[i];
+                        if (CanFocus(objNew))
+                        {
+                            iIndex = i;
+                            break;
+                        }
+                    }
+                    container.HotSubItem = container.SubItems[iIndex];
+                }
+                
+                if (container.HotSubItem != null)
+                {
+                    if (container.HotSubItem is ItemContainer)
+                    {
+                        ((ItemContainer)container.HotSubItem).SelectFirstItem();
+                    }
+                    else
+                    {
+                        container.HotSubItem.InternalMouseEnter();
+                        container.HotSubItem.InternalMouseMove(new MouseEventArgs(MouseButtons.None, 0, container.HotSubItem.LeftInternal + 1, container.HotSubItem.TopInternal + 1, 0));
+                        IScrollableItemControl isc = container.ContainerControl as IScrollableItemControl;
+                        if (isc != null)
+                            isc.KeyboardItemSelected(container.HotSubItem);
+                    }
+                }
+
+                objArg.Handled = true;
+            }
+            else if (objArg.KeyCode == System.Windows.Forms.Keys.Escape)
+            {
+                if (objExpanded != null)
+                {
+                    objExpanded.Expanded = false;
+                    objArg.Handled = true;
+                }
+                else
+                {
+                    Control cc = container.ContainerControl as Control;
+                    if (cc is Bar)
+                    {
+                        Bar bar = cc as Bar;
+                        if (bar.BarState == eBarState.Popup)
+                        {
+                            bar.ParentItem.Expanded = false;
+                        }
+                        else
+                        {
+                            if (container.AutoExpand)
+                                container.AutoExpand = false;
+                            else if (bar.Focused || bar.MenuFocus)
+                            {
+                                bar.MenuFocus = false;
+                                bar.ReleaseFocus();
+                            }
+                        }
+                        objArg.Handled = true;
+                    }
+                    else if (cc is ItemControl)
+                    {
+                        ItemControl ic = cc as ItemControl;
+                        if (container.AutoExpand)
+                            container.AutoExpand = false;
+                        else if (ic.Focused || ic.MenuFocus)
+                        {
+                            ic.MenuFocus = false;
+                            ic.ReleaseFocus();
+                        }
+                    }
+                }
+            }
+            else
+            {
+                BaseItem objItem = container.ExpandedItem();
+                if (objItem != null)
+                    objItem.InternalKeyDown(objArg);
+                else
+                {
+                    int key = 0;
+                    if (objArg.Shift)
+                    {
+                        try
+                        {
+                            byte[] keyState = new byte[256];
+                            if (NativeFunctions.GetKeyboardState(keyState))
+                            {
+                                byte[] chars = new byte[2];
+                                if (NativeFunctions.ToAscii((uint)objArg.KeyValue, 0, keyState, chars, 0) != 0)
+                                {
+                                    key = chars[0];
+                                }
+                            }
+                        }
+                        catch (Exception)
+                        {
+                            key = 0;
+                        }
+                    }
+
+                    if (key == 0)
+                        key = (int)NativeFunctions.MapVirtualKey((uint)objArg.KeyValue, 2);
+
+                    if (container.HotSubItem != null)
+                        container.HotSubItem.InternalKeyDown(objArg);
+                }
+            }
+        }
+
+        private static bool CanFocus(BaseItem objNew)
+        {
+            if (objNew == null) return false;
+            if (!objNew.Visible || !objNew.GetEnabled() || objNew is ListBoxItem && ((ListBoxItem)objNew).IsSelected)
+                return false;
+
+            if (objNew is LabelItem)
+                return false;
+
+            return true;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/ContentManager/BlockLayoutManager.cs b/PROMS/DotNetBar Source Code/ContentManager/BlockLayoutManager.cs
new file mode 100644
index 00000000..c828e842
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/ContentManager/BlockLayoutManager.cs	
@@ -0,0 +1,46 @@
+using System.Collections;
+using System.Drawing;
+
+#if AdvTree
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.UI.ContentManager
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#elif LAYOUT
+namespace DevComponents.DotNetBar.Layout.TextMarkup
+#endif
+{
+	/// <summary>
+	/// Represents block layout manager responsible for sizing the content blocks.
+	/// </summary>
+	public abstract class BlockLayoutManager
+	{
+		private Graphics m_Graphics;
+
+	    /// <summary>
+		/// Resizes the content block and sets it's Bounds property to reflect new size.
+		/// </summary>
+		/// <param name="block">Content block to resize.</param>
+        /// <param name="availableSize">Content size available for the block in the given line.</param>
+		public abstract void Layout(IBlock block, Size availableSize);
+
+        /// <summary>
+        /// Performs layout finalization
+        /// </summary>
+        /// <param name="containerBounds"></param>
+        /// <param name="blocksBounds"></param>
+        /// <param name="lines"></param>
+        /// <returns></returns>
+        public abstract Rectangle FinalizeLayout(Rectangle containerBounds, Rectangle blocksBounds, ArrayList lines);
+
+		/// <summary>
+		/// Gets or sets the graphics object used by layout manager.
+		/// </summary>
+		public System.Drawing.Graphics Graphics
+		{
+			get {return m_Graphics;}
+			set {m_Graphics=value;}
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/ContentManager/Enums.cs b/PROMS/DotNetBar Source Code/ContentManager/Enums.cs
new file mode 100644
index 00000000..e61ff8a7
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/ContentManager/Enums.cs	
@@ -0,0 +1,66 @@
+using System;
+
+#if AdvTree
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.UI.ContentManager
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#elif LAYOUT
+namespace DevComponents.DotNetBar.Layout.TextMarkup
+#endif
+
+{
+	/// <summary>
+	/// Specifies orientation of content.
+	/// </summary>
+	public enum eContentOrientation
+	{
+		/// <summary>
+		/// Indicates Horizontal orientation of the content.
+		/// </summary>
+		Horizontal,
+		/// <summary>
+		/// Indicates Vertical orientation of the content.
+		/// </summary>
+		Vertical
+	}
+
+	/// <summary>
+	/// Specifies content horizontal alignment.
+	/// </summary>
+	public enum eContentAlignment
+	{
+		/// <summary>
+		/// Content is left aligned.UI
+		/// </summary>
+		Left,
+		/// <summary>
+		/// Content is right aligned.
+		/// </summary>
+		Right,
+		/// <summary>
+		/// Content is centered.
+		/// </summary>
+		Center
+	}
+
+	/// <summary>
+	/// Specifies content vertical alignment.
+	/// </summary>
+	public enum eContentVerticalAlignment
+	{
+		/// <summary>
+		/// Content is top aligned.
+		/// </summary>
+		Top,
+		/// <summary>
+		/// Content is bottom aligned.
+		/// </summary>
+		Bottom,
+		/// <summary>
+		/// Content is in the middle.
+		/// </summary>
+		Middle
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/ContentManager/IBlock.cs b/PROMS/DotNetBar Source Code/ContentManager/IBlock.cs
new file mode 100644
index 00000000..a321c68d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/ContentManager/IBlock.cs	
@@ -0,0 +1,34 @@
+using System;
+using System.Drawing;
+using DevComponents.DotNetBar;
+
+#if AdvTree
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.UI.ContentManager
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#elif LAYOUT
+namespace DevComponents.DotNetBar.Layout.TextMarkup
+#endif
+
+{
+	/// <summary>
+	/// Represents a content block interface.
+	/// </summary>
+	public interface IBlock
+	{
+		/// <summary>
+		/// Gets or sets the bounds of the content block.
+		/// </summary>
+		Rectangle Bounds {get;set;}
+		/// <summary>
+		/// Gets or sets whether content block is visible.
+		/// </summary>
+		bool Visible {get;set;}
+        /// <summary>
+        /// Gets or sets the block margins.
+        /// </summary>
+        DevComponents.DotNetBar.Padding Margin { get;set;}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/ContentManager/IBlockExtended.cs b/PROMS/DotNetBar Source Code/ContentManager/IBlockExtended.cs
new file mode 100644
index 00000000..a263b22b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/ContentManager/IBlockExtended.cs	
@@ -0,0 +1,28 @@
+using System;
+using System.Text;
+
+#if AdvTree
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.UI.ContentManager
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#elif LAYOUT
+namespace DevComponents.DotNetBar.Layout.TextMarkup
+#endif
+
+{
+    /// <summary>
+    /// Represents a extended content block interface for advanced layout information.
+    /// </summary>
+    public interface IBlockExtended : IBlock
+    {
+        bool IsBlockElement { get;}
+        bool IsNewLineAfterElement { get;}
+        bool CanStartNewLine { get; }
+        /// <summary>
+        /// Returns whether element is an container so it receives full available size of parent control for layout.
+        /// </summary>
+        bool IsBlockContainer { get; }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/ContentManager/IContentLayoutManager.cs b/PROMS/DotNetBar Source Code/ContentManager/IContentLayoutManager.cs
new file mode 100644
index 00000000..d9426e1b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/ContentManager/IContentLayoutManager.cs	
@@ -0,0 +1,29 @@
+using System;
+using System.Drawing;
+
+#if AdvTree
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.UI.ContentManager
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#elif LAYOUT
+namespace DevComponents.DotNetBar.Layout.TextMarkup
+#endif
+
+{
+	/// <summary>
+	/// Represents interface for block layout.
+	/// </summary>
+	public interface IContentLayout
+	{
+		/// <summary>
+		/// Performs layout of the content block.
+		/// </summary>
+		/// <param name="containerBounds">Container bounds to layout content blocks in.</param>
+		/// <param name="contentBlocks">Content blocks to layout.</param>
+		/// <param name="blockLayout">Block layout manager that resizes the content blocks.</param>
+		/// <returns>The bounds of the content blocks within the container bounds.</returns>
+		Rectangle Layout(Rectangle containerBounds, IBlock[] contentBlocks, BlockLayoutManager blockLayout);
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/ContentManager/SerialContentLayoutManager.cs b/PROMS/DotNetBar Source Code/ContentManager/SerialContentLayoutManager.cs
new file mode 100644
index 00000000..31bb509f
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/ContentManager/SerialContentLayoutManager.cs	
@@ -0,0 +1,742 @@
+using System;
+using System.Collections;
+using System.Drawing;
+
+#if AdvTree
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.UI.ContentManager
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#elif LAYOUT
+namespace DevComponents.DotNetBar.Layout.TextMarkup
+#endif
+
+{
+	/// <summary>
+	/// Represents the serial content layout manager that arranges content blocks in series next to each other.
+	/// </summary>
+	public class SerialContentLayoutManager:IContentLayout
+    {
+        #region Events
+        /// <summary>
+        /// Occurs when X, Y position of next block is calcualted.
+        /// </summary>
+        public event LayoutManagerPositionEventHandler NextPosition;
+
+        /// <summary>
+        /// Occurs before new block is layed out.
+        /// </summary>
+        public event LayoutManagerLayoutEventHandler BeforeNewBlockLayout;
+        #endregion
+
+        #region Private Variables
+        private int m_BlockSpacing=0;
+		private bool m_FitContainerOversize=false;
+        private bool m_FitContainer = false;
+        private bool m_VerticalFitContainerWidth = false;
+        private bool m_HorizontalFitContainerHeight = false;
+		private eContentOrientation m_ContentOrientation=eContentOrientation.Horizontal;
+		private eContentAlignment m_ContentAlignment=eContentAlignment.Left;
+		private eContentVerticalAlignment m_ContentVerticalAlignment=eContentVerticalAlignment.Middle;
+        private eContentVerticalAlignment m_BlockLineAlignment = eContentVerticalAlignment.Middle;
+		private bool m_EvenHeight=false;
+		private bool m_MultiLine=false;
+        private bool m_RightToLeft = false;
+        private bool m_OversizeDistribute = false;
+		#endregion
+
+		/// <summary>
+		/// Creates new instance of the class.
+		/// </summary>
+		public SerialContentLayoutManager()
+		{
+		}
+
+		#region IContentLayout Members
+		/// <summary>
+		/// Performs layout of the content block.
+		/// </summary>
+		/// <param name="containerBounds">Container bounds to layout content blocks in.</param>
+		/// <param name="contentBlocks">Content blocks to layout.</param>
+		/// <param name="blockLayout">Block layout manager that resizes the content blocks.</param>
+		/// <returns>The bounds of the content blocks within the container bounds.</returns>
+		public virtual Rectangle Layout(Rectangle containerBounds, IBlock[] contentBlocks, BlockLayoutManager blockLayout)
+		{
+			Rectangle blocksBounds=Rectangle.Empty;
+			Point position=containerBounds.Location;
+			ArrayList lines=new ArrayList();
+			lines.Add(new BlockLineInfo());
+			BlockLineInfo currentLine=lines[0] as BlockLineInfo;
+            bool switchToNewLine = false;
+            bool canStartOnNewLine = true;
+            int visibleIndex = 0;
+		    bool callLayout = true;
+
+		    if (_EqualItemSize)
+		    {
+		        Size largestItemSize = Size.Empty;
+		        foreach (IBlock block in contentBlocks)
+		        {
+		            if (!block.Visible)
+		            {
+		                block.Bounds = Rectangle.Empty;
+		                continue;
+		            }
+
+		            if (BeforeNewBlockLayout != null)
+		            {
+		                LayoutManagerLayoutEventArgs e = new LayoutManagerLayoutEventArgs(block, position, visibleIndex);
+		                BeforeNewBlockLayout(this, e);
+		                position = e.CurrentPosition;
+		                if (e.CancelLayout)
+		                    continue;
+		            }
+		            visibleIndex++;
+
+		            Size availableSize = containerBounds.Size;
+                    blockLayout.Layout(block, availableSize);
+		            if (block.Bounds.Width > largestItemSize.Width)
+		                largestItemSize.Width = block.Bounds.Width;
+		            if (block.Bounds.Height > largestItemSize.Height)
+		                largestItemSize.Height = block.Bounds.Height;
+		        }
+
+		        foreach (IBlock block in contentBlocks)
+		        {
+		            if (!block.Visible)
+		                continue;
+                    block.Bounds=new Rectangle(block.Bounds.Location, largestItemSize);
+
+		        }
+		        callLayout = false;
+		    }
+
+			foreach(IBlock block in contentBlocks)
+			{
+				if(!block.Visible)
+                {
+                    block.Bounds = Rectangle.Empty;
+					continue;
+                }
+
+                if (BeforeNewBlockLayout != null)
+                {
+                    LayoutManagerLayoutEventArgs e = new LayoutManagerLayoutEventArgs(block, position, visibleIndex);
+                    BeforeNewBlockLayout(this, e);
+                    position = e.CurrentPosition;
+                    if (e.CancelLayout)
+                        continue;
+                }
+                visibleIndex++;
+
+                Size availableSize = containerBounds.Size;
+                bool isBlockElement = false;
+                bool isNewLineTriggger = false;
+                bool isContainer = false;
+                if (block is IBlockExtended)
+                {
+                    IBlockExtended ex = block as IBlockExtended;
+                    isBlockElement = ex.IsBlockElement;
+                    isNewLineTriggger = ex.IsNewLineAfterElement;
+                    canStartOnNewLine = ex.CanStartNewLine;
+                    isContainer = ex.IsBlockContainer;
+                }
+                else
+                    canStartOnNewLine = true;
+
+                if (!isBlockElement && !isContainer)
+                {
+                    if (m_ContentOrientation == eContentOrientation.Horizontal)
+                        availableSize.Width = (containerBounds.Right - position.X);
+                    else
+                        availableSize.Height = (containerBounds.Bottom - position.Y);
+                }
+
+				// Resize the content block
+                if(callLayout)
+                    blockLayout.Layout(block, availableSize);
+
+				if(m_MultiLine && currentLine.Blocks.Count > 0)
+				{
+                    if (m_ContentOrientation == eContentOrientation.Horizontal && (position.X + block.Bounds.Width > containerBounds.Right && canStartOnNewLine || isBlockElement || switchToNewLine))
+					{
+						position.X=containerBounds.X;
+						position.Y+=(currentLine.LineSize.Height+m_BlockSpacing);
+						currentLine=new BlockLineInfo();
+						currentLine.Line=lines.Count;
+						lines.Add(currentLine);
+					}
+                    else if (m_ContentOrientation == eContentOrientation.Vertical && (position.Y + block.Bounds.Height > containerBounds.Bottom && canStartOnNewLine || isBlockElement || switchToNewLine))
+					{
+						position.Y=containerBounds.Y;
+						position.X+=(currentLine.LineSize.Width+m_BlockSpacing);
+						currentLine=new BlockLineInfo();
+						currentLine.Line=lines.Count;
+						lines.Add(currentLine);
+					}
+				}
+
+				if(m_ContentOrientation==eContentOrientation.Horizontal)
+				{
+					if(block.Bounds.Height>currentLine.LineSize.Height)
+						currentLine.LineSize.Height=block.Bounds.Height;
+					currentLine.LineSize.Width=position.X+block.Bounds.Width-containerBounds.X;
+				}
+				else if(m_ContentOrientation==eContentOrientation.Vertical)
+				{
+					if(block.Bounds.Width>currentLine.LineSize.Width)
+						currentLine.LineSize.Width=block.Bounds.Width;
+					currentLine.LineSize.Height=position.Y+block.Bounds.Height-containerBounds.Y;
+				}
+
+				currentLine.Blocks.Add(block);
+                if (block.Visible) currentLine.VisibleItemsCount++;
+                Rectangle r = new Rectangle(position, block.Bounds.Size);
+                r.X += block.Margin.Left;
+                r.Y += block.Margin.Top;
+                block.Bounds = r;
+
+                if (blocksBounds.IsEmpty)
+                {
+                    r = block.Bounds; // Make sure that blocks bounds take in account any margin
+                    r.X -= block.Margin.Left;
+                    r.Y -= block.Margin.Top;
+                    r.Width += block.Margin.Horizontal;
+                    r.Height += block.Margin.Vertical;
+                    blocksBounds = r;
+                }
+                else
+                    blocksBounds = Rectangle.Union(blocksBounds, block.Bounds);
+
+                switchToNewLine = isBlockElement | isNewLineTriggger;
+
+                position = GetNextPosition(block, position, ref switchToNewLine);    
+			}
+
+			blocksBounds=AlignResizeBlocks(containerBounds, blocksBounds, lines);
+
+            if (m_RightToLeft)
+                blocksBounds = MirrorContent(containerBounds, blocksBounds, contentBlocks);
+
+            blocksBounds = blockLayout.FinalizeLayout(containerBounds, blocksBounds, lines);
+
+			return blocksBounds;
+		}
+
+		#endregion
+
+		#region Internals
+        private struct SizeExtended
+        {
+            public int Width;
+            public int Height;
+            public float WidthReduction;
+            public float HeightReduction;
+            public bool UseAbsoluteWidth;
+        }
+
+		private Rectangle AlignResizeBlocks(Rectangle containerBounds,Rectangle blocksBounds,ArrayList lines)
+		{
+			Rectangle newBounds=Rectangle.Empty;
+			if(containerBounds.IsEmpty || blocksBounds.IsEmpty || ((BlockLineInfo)lines[0]).Blocks.Count==0)
+				return newBounds;
+
+            //Reverting to EventHeight property check so the buttons on RibbonBar are properly stretched so they consume same height. 
+            // Be very careful when changing this code!
+            if (m_ContentAlignment == eContentAlignment.Left && m_ContentVerticalAlignment == eContentVerticalAlignment.Top &&
+                !m_FitContainer && !m_FitContainerOversize && !m_EvenHeight && m_BlockLineAlignment == eContentVerticalAlignment.Top &&
+                (!(m_ContentOrientation == eContentOrientation.Vertical && (m_VerticalFitContainerWidth || m_EvenHeight)) || m_MultiLine))
+                return blocksBounds;
+
+            Point[] offset=new Point[lines.Count];
+            SizeExtended[] sizeOffset = new SizeExtended[lines.Count];
+			foreach(BlockLineInfo lineInfo in lines)
+			{
+				if(m_ContentOrientation==eContentOrientation.Horizontal)
+				{
+					if(m_FitContainer && containerBounds.Width>lineInfo.LineSize.Width ||
+						m_FitContainerOversize && lineInfo.LineSize.Width>containerBounds.Width)
+					{
+                        if (m_OversizeDistribute && containerBounds.Width < lineInfo.LineSize.Width * .75)
+                        {
+                            sizeOffset[lineInfo.Line].Width = (int)Math.Floor((float)(containerBounds.Width - lineInfo.VisibleItemsCount * m_BlockSpacing) / (float)lineInfo.VisibleItemsCount);
+                            sizeOffset[lineInfo.Line].UseAbsoluteWidth = true;
+                        }
+                        else
+                            sizeOffset[lineInfo.Line].Width = ((containerBounds.Width - lineInfo.VisibleItemsCount * m_BlockSpacing) - lineInfo.LineSize.Width) / lineInfo.VisibleItemsCount;
+                        sizeOffset[lineInfo.Line].WidthReduction = (float)(containerBounds.Width - lineInfo.VisibleItemsCount * m_BlockSpacing) / (float)lineInfo.LineSize.Width;
+						blocksBounds.Width=containerBounds.Width;
+					}
+
+                    if (m_HorizontalFitContainerHeight && containerBounds.Height > blocksBounds.Height && lines.Count == 1)
+                        sizeOffset[lineInfo.Line].Height = (containerBounds.Height - lineInfo.LineSize.Height) / lines.Count;
+				}
+				else
+				{
+					if(m_FitContainer && containerBounds.Height>lineInfo.LineSize.Height ||
+						m_FitContainerOversize && lineInfo.LineSize.Height>containerBounds.Height)
+					{
+                        if (m_OversizeDistribute && containerBounds.Width < lineInfo.LineSize.Width * .75)
+                        {
+                            sizeOffset[lineInfo.Line].Height = (int)Math.Floor((float)(containerBounds.Height - lineInfo.VisibleItemsCount * m_BlockSpacing) / (float)lineInfo.VisibleItemsCount);
+                            sizeOffset[lineInfo.Line].UseAbsoluteWidth = true;
+                        }
+                        else
+                        sizeOffset[lineInfo.Line].Height = ((containerBounds.Height - lineInfo.VisibleItemsCount * m_BlockSpacing) - lineInfo.LineSize.Height) / lineInfo.VisibleItemsCount;
+                        sizeOffset[lineInfo.Line].HeightReduction = (float)(containerBounds.Height - lineInfo.VisibleItemsCount * m_BlockSpacing) / (float)lineInfo.LineSize.Height;
+						blocksBounds.Height=containerBounds.Height;
+					}
+
+                    if (m_VerticalFitContainerWidth && containerBounds.Width > blocksBounds.Width && lines.Count==1)
+                        sizeOffset[lineInfo.Line].Width = (containerBounds.Width - lineInfo.LineSize.Width) / lines.Count;
+				}
+
+
+				if(m_ContentOrientation==eContentOrientation.Horizontal && !m_FitContainer)
+				{
+					if(containerBounds.Width>blocksBounds.Width && m_FitContainerOversize || !m_FitContainerOversize)
+					{
+						switch(m_ContentAlignment)
+						{
+							case eContentAlignment.Right:
+                                if (containerBounds.Width > lineInfo.LineSize.Width)
+                                    offset[lineInfo.Line].X = containerBounds.Width - lineInfo.LineSize.Width;
+								break;
+							case eContentAlignment.Center:
+                                if (containerBounds.Width > lineInfo.LineSize.Width)
+                                    offset[lineInfo.Line].X = (containerBounds.Width - lineInfo.LineSize.Width) / 2;
+								break;
+						}
+					}
+				}
+
+				if(m_ContentOrientation==eContentOrientation.Vertical && !m_FitContainer)
+				{
+					if(containerBounds.Height>blocksBounds.Height && m_FitContainerOversize || !m_FitContainerOversize)
+					{
+						switch(m_ContentVerticalAlignment)
+						{
+							case eContentVerticalAlignment.Bottom:
+                                if (containerBounds.Height > lineInfo.LineSize.Height)
+                                    offset[lineInfo.Line].Y = containerBounds.Height - lineInfo.LineSize.Height;
+								break;
+							case eContentVerticalAlignment.Middle:
+                                if (containerBounds.Height > lineInfo.LineSize.Height)
+                                    offset[lineInfo.Line].Y = (containerBounds.Height - lineInfo.LineSize.Height) / 2;
+								break;
+						}
+					}
+				}
+			}
+
+            if (m_VerticalFitContainerWidth && containerBounds.Width > blocksBounds.Width && m_ContentOrientation==eContentOrientation.Vertical)
+                blocksBounds.Width = containerBounds.Width;
+            else if(m_HorizontalFitContainerHeight && containerBounds.Height>blocksBounds.Height && m_ContentOrientation==eContentOrientation.Horizontal)
+                blocksBounds.Height = containerBounds.Height;
+
+			if(m_ContentOrientation==eContentOrientation.Horizontal)
+			{
+				foreach(BlockLineInfo lineInfo in lines)
+				{
+					foreach(IBlock block in lineInfo.Blocks)
+					{
+						if(!block.Visible)
+							continue;
+						Rectangle r=block.Bounds;
+						if(m_EvenHeight && lineInfo.LineSize.Height>0)
+							r.Height=lineInfo.LineSize.Height;
+						r.Offset(offset[lineInfo.Line]);
+						
+						if(m_ContentVerticalAlignment==eContentVerticalAlignment.Middle)
+						{
+							// Takes care of offset rounding error when both content is vertically centered and blocks in line are centered
+							if (m_BlockLineAlignment == eContentVerticalAlignment.Middle)
+								r.Offset(0,((containerBounds.Height-blocksBounds.Height)+(lineInfo.LineSize.Height-r.Height))/2);
+							else
+								r.Offset(0,(containerBounds.Height-blocksBounds.Height)/2);
+
+							// Line alignment of the block
+							if (m_BlockLineAlignment == eContentVerticalAlignment.Bottom)
+								r.Offset(0, lineInfo.LineSize.Height - r.Height);
+						}
+						else if(m_ContentVerticalAlignment==eContentVerticalAlignment.Bottom)
+							r.Offset(0,containerBounds.Height-blocksBounds.Height);
+						
+						// To avoid rounding offset errors when dividing this is split see upper part
+						if(m_ContentVerticalAlignment!=eContentVerticalAlignment.Middle)
+						{
+							// Line alignment of the block
+							if (m_BlockLineAlignment == eContentVerticalAlignment.Middle)
+								r.Offset(0, (lineInfo.LineSize.Height - r.Height) / 2);
+							else if (m_BlockLineAlignment == eContentVerticalAlignment.Bottom)
+								r.Offset(0, lineInfo.LineSize.Height - r.Height);
+						}
+
+						if(sizeOffset[lineInfo.Line].Width!=0)
+						{
+                            if (m_OversizeDistribute)
+                            {
+                                int nw = sizeOffset[lineInfo.Line].UseAbsoluteWidth ? sizeOffset[lineInfo.Line].Width : (int)Math.Floor(r.Width * sizeOffset[lineInfo.Line].WidthReduction);
+                                offset[lineInfo.Line].X += nw - r.Width;
+                                r.Width = nw;
+                            }
+                            else
+                            {
+                                r.Width += sizeOffset[lineInfo.Line].Width;
+                                offset[lineInfo.Line].X += sizeOffset[lineInfo.Line].Width;
+                            }
+						}
+						r.Height+=sizeOffset[lineInfo.Line].Height;
+						block.Bounds=r;
+						if(newBounds.IsEmpty)
+							newBounds=block.Bounds;
+						else
+							newBounds=Rectangle.Union(newBounds,block.Bounds);
+					}
+					// Adjust for left-over size adjustment for odd difference between container width and the total block width
+                    if (!m_OversizeDistribute && sizeOffset[lineInfo.Line].Width != 0 && containerBounds.Width - (lineInfo.LineSize.Width + sizeOffset[lineInfo.Line].Width * lineInfo.Blocks.Count) != 0)
+					{
+						Rectangle r=((IBlock)lineInfo.Blocks[lineInfo.Blocks.Count-1]).Bounds;
+						r.Width+=containerBounds.Width-(lineInfo.LineSize.Width+sizeOffset[lineInfo.Line].Width*lineInfo.Blocks.Count);
+						((IBlock)lineInfo.Blocks[lineInfo.Blocks.Count-1]).Bounds=r;
+					}
+                    if (!m_FitContainer && m_ContentAlignment != eContentAlignment.Left && _ReserveLeftSpace)
+                    {
+                        // For block elements they should consume the space available to the left otherwise
+                        // the parent is not aware that the space has been consumed
+                        newBounds.Width += (newBounds.X - containerBounds.X);
+                        newBounds.X = containerBounds.X;
+                    }
+				}
+			}
+			else
+			{
+				foreach(BlockLineInfo lineInfo in lines)
+				{
+					foreach(IBlock block in lineInfo.Blocks)
+					{
+						if(!block.Visible)
+							continue;
+						Rectangle r=block.Bounds;
+						if(m_EvenHeight && lineInfo.LineSize.Width>0)
+							r.Width=lineInfo.LineSize.Width - block.Margin.Horizontal;
+						r.Offset(offset[lineInfo.Line]);
+						if(m_ContentAlignment==eContentAlignment.Center)
+							r.Offset(((containerBounds.Width-blocksBounds.Width)+(lineInfo.LineSize.Width-r.Width))/2,0); //r.Offset((containerBounds.Width-blocksBounds.Width)/2+(lineInfo.LineSize.Width-r.Width)/2,0);
+						else if(m_ContentAlignment==eContentAlignment.Right)
+							r.Offset((containerBounds.Width-blocksBounds.Width)+lineInfo.LineSize.Width-r.Width,0);
+						r.Width+=sizeOffset[lineInfo.Line].Width;
+						if(sizeOffset[lineInfo.Line].Height!=0)
+						{
+                            if (m_OversizeDistribute)
+                            {
+                                int nw = sizeOffset[lineInfo.Line].UseAbsoluteWidth ? sizeOffset[lineInfo.Line].Height : (int)Math.Floor(r.Height * sizeOffset[lineInfo.Line].HeightReduction);
+                                offset[lineInfo.Line].Y += nw - r.Height;
+                                r.Height = nw;
+                            }
+                            else
+                            {
+                                r.Height += sizeOffset[lineInfo.Line].Height;
+                                offset[lineInfo.Line].Y += sizeOffset[lineInfo.Line].Height;
+                            }
+						}
+						block.Bounds=r;
+                        if (newBounds.IsEmpty)
+                        {
+                            r.Y -= block.Margin.Top; // Account for any margin set on first element
+                            r.X -= block.Margin.Left;
+                            r.Width += block.Margin.Horizontal;
+                            r.Height += block.Margin.Vertical;
+                            newBounds = r;
+                        }
+                        else
+                            newBounds = Rectangle.Union(newBounds, block.Bounds);
+					}
+                    if (!m_OversizeDistribute && sizeOffset[lineInfo.Line].Height != 0 && containerBounds.Height - (lineInfo.LineSize.Height + sizeOffset[lineInfo.Line].Height * lineInfo.Blocks.Count) != 0)
+					{
+						Rectangle r=((IBlock)lineInfo.Blocks[lineInfo.Blocks.Count-1]).Bounds;
+						r.Height+=containerBounds.Height-(lineInfo.LineSize.Height+sizeOffset[lineInfo.Line].Height*lineInfo.Blocks.Count);
+						((IBlock)lineInfo.Blocks[lineInfo.Blocks.Count-1]).Bounds=r;
+					}
+				}
+			}
+			return newBounds;
+		}
+
+        private Point GetNextPosition(IBlock block, Point position, ref bool switchToNewLine)
+		{
+            if (NextPosition != null)
+            {
+                LayoutManagerPositionEventArgs e = new LayoutManagerPositionEventArgs();
+
+                e.Block = block;
+                e.CurrentPosition = position;
+                e.SwitchToNewLine = switchToNewLine;
+
+                NextPosition(this, e);
+
+                switchToNewLine = e.SwitchToNewLine;
+
+                if (e.Cancel)
+                    return e.NextPosition;
+            }
+
+            if (m_ContentOrientation == eContentOrientation.Horizontal)
+                position.X += block.Bounds.Width + m_BlockSpacing + block.Margin.Horizontal;
+            else
+                position.Y += block.Bounds.Height + m_BlockSpacing + block.Margin.Vertical;
+
+			return position;
+		}
+
+		internal class BlockLineInfo
+		{
+			public BlockLineInfo() {}
+			public ArrayList Blocks=new ArrayList();
+			public Size LineSize=Size.Empty;
+			public int Line=0;
+            public int VisibleItemsCount = 0;
+		}
+
+        private Rectangle MirrorContent(Rectangle containerBounds, Rectangle blockBounds, IBlock[] contentBlocks)
+        {
+            int xOffset = (blockBounds.X - containerBounds.X);
+
+            if (blockBounds.Width < containerBounds.Width)
+                blockBounds.X = containerBounds.Right - ((blockBounds.X - containerBounds.X) + blockBounds.Width);
+            else if (blockBounds.Width > containerBounds.Width)
+                containerBounds.Width = blockBounds.Width;
+            foreach (IBlock block in contentBlocks)
+            {
+                if (!block.Visible)
+                    continue;
+                Rectangle r = block.Bounds;
+                block.Bounds = new Rectangle(containerBounds.Right - ((r.X - containerBounds.X) + r.Width), r.Y, r.Width, r.Height);
+            }
+
+            return blockBounds;
+        }
+		#endregion
+
+		#region Properties
+
+        private bool _ReserveLeftSpace = false;
+
+        /// <summary>
+        /// Indicates whether space to the left of center and right aligned blocks is blocked out by stretching the block so it consumes that space.
+        /// </summary>
+        public bool ReserveLeftSpace
+        {
+            get { return _ReserveLeftSpace; }
+            set { _ReserveLeftSpace = value; }
+        }
+
+		/// <summary>
+		/// Gets or sets the spacing in pixels between content blocks. Default value is 0.
+		/// </summary>
+		public virtual int BlockSpacing
+		{
+			get {return m_BlockSpacing;}
+			set {m_BlockSpacing=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets whether content blocks are forced to fit the container bounds if they 
+		/// occupy more space than it is available by container. Default value is false.
+		/// </summary>
+		public virtual bool FitContainerOversize
+		{
+			get {return m_FitContainerOversize;}
+			set {m_FitContainerOversize=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets whether content blocks are resized to fit the container bound if they
+		/// occupy less space than it is available by container. Default value is false.
+		/// </summary>
+		public virtual bool FitContainer
+		{
+			get {return m_FitContainer;}
+			set {m_FitContainer=value;}
+		}
+
+        /// <summary>
+        /// Gets or sets whether content blocks are resized (Width) to fit container bounds if they
+        /// occupy less space than the actual container width. Applies to the Vertical orientation only. Default value is false.
+        /// </summary>
+        public virtual bool VerticalFitContainerWidth
+        {
+            get { return m_VerticalFitContainerWidth; }
+            set { m_VerticalFitContainerWidth = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether content blocks are resized (Height) to fit container bounds if they
+        /// occupy less space than the actual container height. Applies to the Horizontal orientation only. Default value is false.
+        /// </summary>
+        public virtual bool HorizontalFitContainerHeight
+        {
+            get { return m_HorizontalFitContainerHeight; }
+            set { m_HorizontalFitContainerHeight = value; }
+        }
+
+		/// <summary>
+		/// Gets or sets the content orientation. Default value is Horizontal.
+		/// </summary>
+		public virtual eContentOrientation ContentOrientation
+		{
+			get {return m_ContentOrientation;}
+			set {m_ContentOrientation=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets the content vertical alignment. Default value is Middle.
+		/// </summary>
+		public virtual eContentVerticalAlignment ContentVerticalAlignment
+		{
+			get {return m_ContentVerticalAlignment;}
+			set {m_ContentVerticalAlignment=value;}
+		}
+
+        /// <summary>
+        /// Gets or sets the block line vertical alignment. Default value is Middle.
+        /// </summary>
+        public virtual eContentVerticalAlignment BlockLineAlignment
+        {
+            get { return m_BlockLineAlignment; }
+            set { m_BlockLineAlignment = value; }
+        }
+
+		/// <summary>
+		/// Gets or sets the content horizontal alignment. Default value is Left.
+		/// </summary>
+		public virtual eContentAlignment ContentAlignment
+		{
+			get {return m_ContentAlignment;}
+			set {m_ContentAlignment=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets whether all content blocks are resized so they have same height which is height of the tallest content block. Default value is false.
+		/// </summary>
+		public virtual bool EvenHeight
+		{
+			get {return m_EvenHeight;}
+			set {m_EvenHeight=value;}
+		}
+
+        /// <summary>
+        /// Gets or sets whether oversized blocks are resized based on the percentage reduction instead of based on equal pixel distribution. Default value is false.
+        /// </summary>
+        public virtual bool OversizeDistribute
+        {
+            get { return m_OversizeDistribute; }
+            set { m_OversizeDistribute = value; }
+        }
+
+		/// <summary>
+		/// Gets or sets whether content is wrapped into new line if it exceeds the width of the container.
+		/// </summary>
+		public bool MultiLine
+		{
+			get {return m_MultiLine;}
+			set {m_MultiLine=value;}
+		}
+
+        /// <summary>
+        /// Gets or sets whether layout is right-to-left.
+        /// </summary>
+        public bool RightToLeft
+        {
+            get { return m_RightToLeft; }
+            set { m_RightToLeft = value; }
+        }
+
+        private bool _EqualItemSize = false;
+
+        /// <summary>
+        /// Gets or sets whether all items are equaly sized based on the size of the largest item in the list.
+        /// </summary>
+        public bool EqualItemSize
+        {
+            get { return _EqualItemSize; }
+            set { _EqualItemSize = value; }
+        }
+
+		#endregion
+	}
+
+    /// <summary>
+    /// Represents event arguments for SerialContentLayoutManager.NextPosition event.
+    /// </summary>
+    public class LayoutManagerPositionEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets or sets the block that is layed out.
+        /// </summary>
+        public IBlock Block = null;
+        /// <summary>
+        /// Gets or sets the current block position.
+        /// </summary>
+        public Point CurrentPosition = Point.Empty;
+        /// <summary>
+        /// Gets or sets the calculated next block position.
+        /// </summary>
+        public Point NextPosition = Point.Empty;
+        /// <summary>
+        /// Cancels default position calculation.
+        /// </summary>
+        public bool Cancel = false;
+
+        public bool SwitchToNewLine;
+    }
+
+    /// <summary>
+    /// Represents event arguments for the SerialContentLayoutManager layout events.
+    /// </summary>
+    public class LayoutManagerLayoutEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets or sets the reference block object.
+        /// </summary>
+        public IBlock Block = null;
+
+        /// <summary>
+        /// Gets or sets the position block will assume.
+        /// </summary>
+        public Point CurrentPosition = Point.Empty;
+
+        /// <summary>
+        /// Cancel the layout of the block, applies only to BeforeXXX layout event.
+        /// </summary>
+        public bool CancelLayout = false;
+
+        /// <summary>
+        /// Gets or sets the visibility index of the block.
+        /// </summary>
+        public int BlockVisibleIndex = 0;
+
+        /// <summary>
+        /// Creates new instance of the class and initializes it with default values.
+        /// </summary>
+        public LayoutManagerLayoutEventArgs(IBlock block, Point currentPosition, int visibleIndex)
+        {
+            this.Block = block;
+            this.CurrentPosition = currentPosition;
+            this.BlockVisibleIndex = visibleIndex;
+        }
+    }
+
+    /// <summary>
+    /// Delegate for SerialContentLayoutManager.NextPosition event.
+    /// </summary>
+    public delegate void LayoutManagerPositionEventHandler(object sender, LayoutManagerPositionEventArgs e);
+
+    /// <summary>
+    /// Delegate for the SerialContentLayoutManager layout events.
+    /// </summary>
+    public delegate void LayoutManagerLayoutEventHandler(object sender, LayoutManagerLayoutEventArgs e);
+    
+
+}
diff --git a/PROMS/DotNetBar Source Code/ContextExMenuTypeEditor.cs b/PROMS/DotNetBar Source Code/ContextExMenuTypeEditor.cs
new file mode 100644
index 00000000..fe761086
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/ContextExMenuTypeEditor.cs	
@@ -0,0 +1,89 @@
+using System;
+using System.ComponentModel;
+using System.Collections;
+using System.Diagnostics;
+using System.Windows.Forms;
+using System.Windows.Forms.Design;
+using System.Drawing.Design;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Summary description for ContextExMenuTypeEditor.
+	/// </summary>
+	public class ContextExMenuTypeEditor : System.Drawing.Design.UITypeEditor 
+	{
+		private IWindowsFormsEditorService edSvc = null;
+		public override object EditValue(ITypeDescriptorContext context, IServiceProvider provider, object value) 
+		{
+			if (context != null
+				&& context.Instance != null
+				&& provider != null) 
+			{				
+				edSvc = provider.GetService(typeof(IWindowsFormsEditorService)) as IWindowsFormsEditorService;
+
+                ContextMenuBar cb = null;
+                GridItem pg = provider as GridItem;
+                string propLabel = "";
+                if (pg != null)
+                    propLabel = pg.Label;
+                
+                foreach (IComponent c in context.Container.Components)
+                {
+                    if (c is ContextMenuBar)
+                    {
+                        if(propLabel.EndsWith(((ContextMenuBar)c).Name) || propLabel=="")
+                        {
+                            cb = c as ContextMenuBar;
+                            break;
+                        }
+                    }
+                }
+				
+				BaseItem  selectedItem=null;
+				if(value!=null && value is BaseItem)
+                    selectedItem = (BaseItem)value;
+				if(cb!=null && edSvc!=null)
+				{
+					ListBox lb=new ListBox();
+					lb.SelectedIndexChanged+=new EventHandler(this.SelectedChanged);
+					foreach(BaseItem item in cb.Items)
+					{
+						if(item.Name!="")
+						{
+							int i=lb.Items.Add(item.Name);
+                            if (item == selectedItem)
+								lb.SelectedIndex=i;
+						}
+					}
+					edSvc.DropDownControl(lb);
+					if(lb.SelectedItem!=null)
+						return cb.Items[lb.SelectedItem.ToString()];
+				}
+			}
+
+			return value;
+		}
+
+		private void SelectedChanged(object sender, EventArgs e)
+		{
+			if(edSvc!=null)
+				edSvc.CloseDropDown();
+		}
+
+		/// <summary>
+		/// Gets the editor style used by the EditValue method.
+		/// </summary>
+		/// <param name="context">An ITypeDescriptorContext that can be used to gain additional context information.</param>
+		/// <returns>A UITypeEditorEditStyle value that indicates the style of editor used by EditValue. If the UITypeEditor does not support this method, then GetEditStyle will return None</returns>
+		public override UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext context) 
+		{
+			if (context != null && context.Instance != null) 
+			{
+				return UITypeEditorEditStyle.DropDown;
+			}
+			return base.GetEditStyle(context);
+		}
+
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/ContextMenuBar.cs b/PROMS/DotNetBar Source Code/ContextMenuBar.cs
new file mode 100644
index 00000000..889f5673
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/ContextMenuBar.cs	
@@ -0,0 +1,387 @@
+using System;
+using System.Text;
+using System.ComponentModel;
+using System.Collections;
+using System.Windows.Forms;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represents the context menu bar that provides the context menus for the System.Windows.Forms.Control inherited controls on the form.
+    /// </summary>
+    [ToolboxItem(true), Designer("DevComponents.DotNetBar.Design.ContextMenuBarDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf"), ProvideProperty("ContextMenuEx", typeof(Control)), System.Runtime.InteropServices.ComVisible(false), DefaultEvent("ItemClick")]
+    public class ContextMenuBar : Bar, System.ComponentModel.IExtenderProvider
+    {
+        #region Private Variables
+        private Hashtable m_ContextExMenus = new Hashtable();
+        private Hashtable m_ContextExHandlers = new Hashtable();
+        private bool m_ContextMenuSubclass = true;
+        #endregion
+
+        #region Internal Implementation
+        public ContextMenuBar() : base()
+        {
+            this.Visible = false;
+            this.WrapItemsDock = true;
+            this.WrapItemsFloat = true;
+        }
+
+        protected override bool IsContextPopup(BaseItem popup)
+        {
+            if (this.Items.Contains(popup)) return true;
+            return base.IsContextPopup(popup);
+        }
+        #endregion
+
+        #region Property Hiding
+        /// <summary>
+        /// Gets/Sets whether Bar is visible or not.
+        /// </summary>
+        [DevCoBrowsable(false), Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public new bool Visible
+        {
+            get { return base.Visible; }
+            set { base.Visible = value; }
+        }
+        #endregion
+
+        #region Extender Implementation
+        // *********************************************************************
+        //
+        // Extended Property ContextMenuEx implementation code
+        //
+        // *********************************************************************
+        bool IExtenderProvider.CanExtend(object target)
+        {
+            if (target is Control)
+                return true;
+            return false;
+        }
+
+        private delegate void WmContextEventHandler(object sender, WmContextEventArgs e);
+        /// <summary>
+        /// Returns the instance of the BaseItem that is assigned as context menu to the control.
+        /// </summary>
+        /// <param name="control">Control to return context menu for.</param>
+        /// <returns>Instance of the BaseItem used as context menu for the control.</returns>
+        [DefaultValue(null), Editor(typeof(ContextExMenuTypeEditor), typeof(System.Drawing.Design.UITypeEditor))]
+        public BaseItem GetContextMenuEx(Control control)
+        {
+            if (control is DevComponents.DotNetBar.Controls.RichTextBoxEx)
+                control = ((DevComponents.DotNetBar.Controls.RichTextBoxEx)control).RichTextBox;
+
+            BaseItem item = (BaseItem)m_ContextExMenus[control];
+            return item;
+        }
+        /// <summary>
+        /// Assigns the context menu to a control.
+        /// </summary>
+        /// <param name="control">Control to assign the context menu to.</param>
+        /// <param name="value">Instance of PopupItem derived class usually ButtonItem to act as context menu for a control. The SubItems collection of the item specified here actually defines the visible context menu items.</param>
+        public void SetContextMenuEx(Control control, BaseItem value)
+        {
+            if (control is DevComponents.DotNetBar.Controls.RichTextBoxEx)
+                control = ((DevComponents.DotNetBar.Controls.RichTextBoxEx)control).RichTextBox;
+            if (value == null)
+            {
+                if (m_ContextExMenus.Contains(control))
+                {
+                    if (m_ContextExHandlers.Contains(control))
+                    {
+                        ContextMessageHandler h = m_ContextExHandlers[control] as ContextMessageHandler;
+                        if (h != null)
+                        {
+                            h.ContextMenu -= new WmContextEventHandler(this.OnContextMenu);
+                            h.ReleaseHandle();
+                            h = null;
+                        }
+                        m_ContextExHandlers.Remove(control);
+                    }
+
+                    m_ContextExMenus.Remove(control);
+                    control.MouseUp -= new MouseEventHandler(this.ContextExMouseUp);
+                    try
+                    {
+                        control.HandleDestroyed -= new EventHandler(this.ContextExHandleDestroy);
+                    }
+                    catch { }
+                    try
+                    {
+                        control.HandleCreated -= new EventHandler(this.ContextExHandleCreate);
+                    }
+                    catch { }
+                    try { control.MouseUp -= new MouseEventHandler(this.ContextExMouseUp); }
+                    catch { }
+                }
+            }
+            else
+            {
+                if (m_ContextExMenus.Contains(control))
+                {
+                    m_ContextExMenus[control] = value;
+                }
+                else
+                {
+                    m_ContextExMenus[control] = value;
+                    if (!m_ContextExHandlers.Contains(control) && !this.DesignMode)
+                    {
+                        if (!(control is System.Windows.Forms.TreeView) && !(control is System.Windows.Forms.Form) && 
+                            !(control is System.Windows.Forms.Panel
+#if FRAMEWORK20
+                            || control is System.Windows.Forms.DataGridView
+#endif
+                            ) && 
+                            m_ContextMenuSubclass)
+                        {
+                            if (control.IsHandleCreated)
+                            {
+                                ContextMessageHandler h = new ContextMessageHandler();
+                                h.ContextMenu += new WmContextEventHandler(this.OnContextMenu);
+                                h.ParentControl = control;
+                                h.AssignHandle(control.Handle);
+                                m_ContextExHandlers[control] = h;
+                            }
+                            control.HandleDestroyed += new EventHandler(this.ContextExHandleDestroy);
+                            control.HandleCreated += new EventHandler(this.ContextExHandleCreate);
+                        }
+                        if (control is ComboBox)
+                        {
+                            ComboBox cbo = control as ComboBox;
+                            cbo.ContextMenu = new ContextMenu();
+                        }
+                    }
+                    try { control.MouseUp += new MouseEventHandler(this.ContextExMouseUp); }
+                    catch { }
+                }
+            }
+        }
+
+        internal bool HasContextMenu(Control ctrl)
+        {
+            return m_ContextExMenus.Contains(ctrl);
+        }
+
+        private void ContextExHandleDestroy(object sender, EventArgs e)
+        {
+            Control control = sender as Control;
+            if (control == null)
+                return;
+            ContextMessageHandler h = m_ContextExHandlers[control] as ContextMessageHandler;
+            if (h != null)
+            {
+                h.ContextMenu -= new WmContextEventHandler(this.OnContextMenu);
+                h.ReleaseHandle();
+                h = null;
+            }
+            m_ContextExHandlers.Remove(control);
+        }
+
+        private void ContextExHandleCreate(object sender, EventArgs e)
+        {
+            Control control = sender as Control;
+            if (control == null)
+                return;
+            if (m_ContextExHandlers.Contains(control))
+                return;
+
+            ContextMessageHandler h = new ContextMessageHandler();
+            h.ContextMenu += new WmContextEventHandler(this.OnContextMenu);
+            h.ParentControl = control;
+            h.AssignHandle(control.Handle);
+            m_ContextExHandlers[control] = h;
+        }
+
+        private void ContextExMouseUp(object sender, MouseEventArgs e)
+        {
+            if (e.Button != MouseButtons.Right)
+                return;
+            Control ctrl = sender as Control;
+            if (ctrl == null)
+                return;
+            // Find it in pop-ups
+            PopupItem popup = GetContextExItem(ctrl) as PopupItem;
+            if (popup == null) return;
+
+            if (!popup.Expanded)
+            {
+                popup.Style = this.Style;
+                popup.SetSourceControl(ctrl);
+                popup.Popup(ctrl.PointToScreen(new Point(e.X, e.Y)));
+            }
+        }
+
+        private Control FindControl(Control parent, IntPtr handle)
+        {
+            foreach (Control ctrl in parent.Controls)
+            {
+                if (ctrl.Handle == handle)
+                    return ctrl;
+                if (ctrl.Controls.Count > 0)
+                {
+                    Control ret = FindControl(ctrl, handle);
+                    if (ret != null)
+                        return ret;
+                }
+            }
+            return parent;
+        }
+
+        private BaseItem GetContextExItem(Control ctrl)
+        {
+            BaseItem item = (BaseItem)m_ContextExMenus[ctrl];
+            return item;
+        }
+        private void OnContextMenu(object sender, WmContextEventArgs e)
+        {
+            ContextMessageHandler h = sender as ContextMessageHandler;
+            if (h == null)
+                return;
+
+            BaseItem contextItem = GetContextExItem(h.ParentControl);
+            if (contextItem == null)
+                return;
+
+            // Check whether context menu originated elsewhere in particular a Panel which handles MouseUp
+            if (e.Handle != e.SourceHandle && e.SourceHandle != IntPtr.Zero)
+            {
+                Control ctrl = Control.FromChildHandle(e.Handle);
+                if (ctrl != null && ctrl is Panel && this.GetContextExItem(ctrl) != null) return; // WM_CONTEXT bubbles up and Panel handles MouseUp
+            }
+
+            // Find it in pop-ups
+            PopupItem popup = contextItem as PopupItem;
+            popup.Style = this.Style;
+
+            if (e.Button == MouseButtons.None)
+            {
+                // Get the control with focus
+                Control ctrl = Control.FromChildHandle(e.Handle);
+                if (ctrl != null && ctrl.Handle != e.Handle)
+                {
+                    ctrl = FindControl(ctrl, e.Handle);
+                }
+                popup.SetSourceControl(h.ParentControl);
+                if (ctrl != null)
+                {
+                    if (ctrl.ClientRectangle.Contains(ctrl.PointToClient(Control.MousePosition)))
+                        popup.Popup(Control.MousePosition);
+                    else
+                        popup.Popup(ctrl.PointToScreen(Point.Empty));
+                }
+                else
+                    popup.Popup(Control.MousePosition);
+
+                // We need to eat the message in OnSysKeyUp for Shift+F10 case
+                if (this.IgnoreSysKeyUp)
+                {
+                    this.IgnoreSysKeyUp = false;
+                    this.EatSysKeyUp = true;
+                }
+            }
+            else
+            {
+                // This is handled by the WM_RBUTTONUP just eat it
+                if (!e.WmContext)
+                {
+                    popup.SetSourceControl(h.ParentControl);
+                    popup.Popup(e.X, e.Y);
+                }
+            }
+            e.Handled = true;
+        }
+        private class ContextMessageHandler : NativeWindow
+        {
+            public event WmContextEventHandler ContextMenu;
+            private const int WM_CONTEXTMENU = 0x007B;
+            private const int WM_RBUTTONUP = 0x0205;
+            private const int WM_NCRBUTTONUP = 0x00A5;
+            private const int WM_RBUTTONDOWN = 0x0204;
+            public Control ParentControl = null;
+            protected override void WndProc(ref Message m)
+            {
+                if (m.Msg == WM_CONTEXTMENU)
+                {
+                    if (ContextMenu != null)
+                    {
+                        int ilParam = WinApi.ToInt(m.LParam);
+                        int y = ilParam >> 16;
+                        int x = (short)(ilParam & 0xFFFF);
+                        IntPtr hWnd = m.WParam;
+                        if (hWnd == IntPtr.Zero)
+                            hWnd = m.HWnd;
+                        bool context = true;
+                        if (m.HWnd != m.WParam)
+                            context = false;
+                        WmContextEventArgs e = new WmContextEventArgs(hWnd, x, y, ((x == -1 && y == -1) ? MouseButtons.None : MouseButtons.Right), context, m.HWnd);
+                        ContextMenu(this, e);
+                        if (e.Handled)
+                            return;
+                    }
+                }
+                // This case was taken out becouse the message was not generated for the listview control and possibly for
+                // treview control so this code was moved to the MouseUp event of the Control see ContextExMouseUp
+                //				else if(m.Msg==WM_RBUTTONUP || m.Msg==WM_NCRBUTTONUP)
+                //				{
+                //					if(ContextMenu!=null)
+                //					{
+                //						int ilParam=m.LParam.ToInt32();
+                //						int y=ilParam>>16;
+                //						int x=ilParam & 0xFFFF;
+                //						Point p=ParentControl.PointToScreen(new Point(x,y));
+                //						WmContextEventArgs e=new WmContextEventArgs(m.HWnd,p.X,p.Y,MouseButtons.Right,false);
+                //						ContextMenu(this,e);
+                //					}
+                //				}
+                base.WndProc(ref m);
+            }
+        }
+        private class WmContextEventArgs : EventArgs
+        {
+            private readonly int x;
+            private readonly int y;
+            private readonly MouseButtons button = 0;
+            private readonly IntPtr hwnd;
+            private readonly bool wmcontext;
+            public bool Handled = false;
+            private IntPtr sourceHandle;
+            public WmContextEventArgs(IntPtr phwnd, int ix, int iy, MouseButtons eButton, bool WmContextMessage, IntPtr sourceHandle)
+            {
+                this.x = ix;
+                this.y = iy;
+                this.button = eButton;
+                this.hwnd = phwnd;
+                this.wmcontext = WmContextMessage;
+                this.sourceHandle = sourceHandle;
+            }
+            public int X
+            {
+                get { return this.x; }
+            }
+            public int Y
+            {
+                get { return this.y; }
+            }
+            public MouseButtons Button
+            {
+                get { return this.button; }
+            }
+            public IntPtr Handle
+            {
+                get { return this.hwnd; }
+            }
+            public bool WmContext
+            {
+                get { return this.wmcontext; }
+            }
+            public IntPtr SourceHandle
+            {
+                get
+                {
+                    return this.sourceHandle;
+                }
+            }
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/ContextMenusCollection.cs b/PROMS/DotNetBar Source Code/ContextMenusCollection.cs
new file mode 100644
index 00000000..1a45552b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/ContextMenusCollection.cs	
@@ -0,0 +1,101 @@
+using System;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Summary description for Popups.
+	/// </summary>
+	public class ContextMenusCollection:System.Collections.CollectionBase
+	{
+		private DotNetBarManager m_Owner;
+		public ContextMenusCollection(DotNetBarManager owner)
+		{
+			m_Owner=owner;
+		}
+		public int Add(BaseItem item)
+		{
+			item.SetOwner(m_Owner);
+			item.Visible=false;
+			item.Displayed=false;
+			return List.Add(item);
+		}
+		public BaseItem this[int index]
+		{
+			get {return (BaseItem)(List[index]);}
+			set {List[index] = value;}
+		}
+		public BaseItem this[string name]
+		{
+			get {return (BaseItem)(List[this.IndexOf(name)]);}
+			set {List[this.IndexOf(name)] = value;}
+		}
+
+		public void Insert(int index, BaseItem value) 
+		{
+			value.Visible=false;
+			value.Displayed=false;
+			List.Insert(index, value);
+		}
+
+		public int IndexOf(BaseItem value) 
+		{
+			return List.IndexOf(value);
+		}
+
+		public int IndexOf(string name)
+		{
+			int i=-1;
+			foreach(BaseItem item in List)
+			{
+				i++;
+				if(item.Name==name)
+					return i;
+			}
+			return -1;
+		}
+
+		public bool Contains(BaseItem value) 
+		{
+			return List.Contains(value);
+		}
+
+		public bool Contains(string name)
+		{
+			foreach(BaseItem item in List)
+			{
+				if(item.Name==name)
+					return true;
+			}
+			return false;
+		}
+
+		public void Remove(BaseItem value) 
+		{
+			List.Remove(value);
+		}
+
+		public void CopyTo(BaseItem[] array, int index) 
+		{
+			List.CopyTo(array, index);
+		}
+
+		protected override void OnClear()
+		{
+			IOwner owner=m_Owner as IOwner;
+			if(List.Count>0 && owner!=null)
+			{
+				foreach(BaseItem objSub in this)
+				{
+					if(owner!=null)
+						owner.RemoveShortcutsFromItem(objSub);
+				}
+			}
+			base.OnClear();
+		}
+
+		internal void SetOwner(DotNetBarManager owner)
+		{
+			m_Owner=owner;
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/ControlContainerItem.cs b/PROMS/DotNetBar Source Code/ControlContainerItem.cs
new file mode 100644
index 00000000..5bae8deb
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/ControlContainerItem.cs	
@@ -0,0 +1,746 @@
+using System;
+using System.Drawing;
+using System.ComponentModel;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.Rendering;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Summary description for ControlContainerItem.
+	/// </summary>
+    [System.ComponentModel.ToolboxItem(false), System.ComponentModel.DesignTimeVisible(false), Designer("DevComponents.DotNetBar.Design.SimpleBaseItemDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+	public class ControlContainerItem:ImageItem,IPersonalizedMenuItem
+	{
+		/// <summary>
+		/// Occurs when container control needs to be assigned to the item.
+		/// </summary>
+		public event EventHandler ContainerLoadControl;
+		public delegate void ControlContainerSerializationEventHandler(object sender, ControlContainerSerializationEventArgs e);
+		public event ControlContainerSerializationEventHandler ContainerControlSerialize;
+		public event ControlContainerSerializationEventHandler ContainerControlDeserialize;
+
+		// IPersonalizedMenuItem Implementation
+		private eMenuVisibility m_MenuVisibility=eMenuVisibility.VisibleAlways;
+		private bool m_RecentlyUsed=false;
+		private System.Windows.Forms.Control m_Control=null;
+		private bool m_MouseOver=false;
+		private bool m_AllowItemResize=true;
+
+		/// <summary>
+		/// Creates new instance of ControlContainerItem and assigns item name.
+		/// </summary>
+		public ControlContainerItem():this("","") {}
+		/// <summary>
+		/// Creates new instance of ControlContainerItem and assigns item name.
+		/// </summary>
+		/// <param name="sName">Item name.</param>
+		public ControlContainerItem(string sName):this(sName,""){}
+		/// <summary>
+		/// Creates new instance of ControlContainerItem and assigns item name and item text.
+		/// </summary>
+		/// <param name="sName">Item name.</param>
+		/// <param name="ItemText">Item text.</param>
+		public ControlContainerItem(string sName, string ItemText):base(sName,ItemText)
+		{
+			m_SupportedOrientation=eSupportedOrientation.Horizontal;
+		}
+
+		internal void InitControl()
+		{
+			EventArgs e=new EventArgs();
+			if(ContainerLoadControl!=null)
+				ContainerLoadControl(this,e);
+			IOwnerItemEvents owner=this.GetIOwnerItemEvents();
+			if(owner!=null)
+				owner.InvokeContainerLoadControl(this,e);
+			CustomizeChanged();
+		}
+
+		/// <summary>
+		/// Overridden. Returns the copy of the ControlContainerItem.
+		/// </summary>
+		/// <returns>Copy of the ControlContainerItem.</returns>
+		public override BaseItem Copy()
+		{
+			ControlContainerItem objCopy=new ControlContainerItem(this.Name);
+            objCopy.AllowItemResize = this.AllowItemResize;
+			this.CopyToItem(objCopy);
+			return objCopy;
+		}
+		protected override void CopyToItem(BaseItem copy)
+		{
+			ControlContainerItem objCopy=copy as ControlContainerItem;
+			base.CopyToItem(objCopy);
+			objCopy.ContainerLoadControl=this.ContainerLoadControl;
+			objCopy.InitControl();
+		}
+        protected override void Dispose(bool disposing)
+		{
+			if(m_Control!=null)
+			{
+                m_Control.Enter -= new EventHandler(HostedControlEnter);
+                m_Control.GotFocus -= new EventHandler(HostedControlGotFocus);
+                m_Control.Resize -= new EventHandler(HostedControlResized);
+//				if(m_Control.Parent!=null && (!m_Control.Parent.Disposing && !(m_Control.Parent is Bar && ((Bar)m_Control.Parent).IsDisposing)))
+//				{
+//					m_Control.Parent.Controls.Remove(m_Control);
+//				}
+				m_Control=null;
+			}
+			base.Dispose(disposing);
+		}
+		protected internal override void Serialize(ItemSerializationContext context)
+		{
+			base.Serialize(context);
+            System.Xml.XmlElement ThisItem = context.ItemXmlElement;
+			ThisItem.SetAttribute("AllowResize",System.Xml.XmlConvert.ToString(m_AllowItemResize));
+
+			if(ContainerControlSerialize!=null)
+				this.ContainerControlSerialize(this,new ControlContainerSerializationEventArgs(ThisItem));
+			IOwnerItemEvents owner=this.GetIOwnerItemEvents();
+			if(owner!=null)
+				owner.InvokeContainerControlSerialize(this,new ControlContainerSerializationEventArgs(ThisItem));
+
+		}
+		public override void Deserialize(ItemSerializationContext context)
+		{
+			base.Deserialize(context);
+            System.Xml.XmlElement ItemXmlSource = context.ItemXmlElement;
+			m_AllowItemResize=System.Xml.XmlConvert.ToBoolean(ItemXmlSource.GetAttribute("AllowResize"));
+			InitControl();
+
+			if(ContainerControlDeserialize!=null)
+				this.ContainerControlDeserialize(this,new ControlContainerSerializationEventArgs(ItemXmlSource));
+			IOwnerItemEvents owner=this.GetIOwnerItemEvents();
+			if(owner!=null)
+				owner.InvokeContainerControlDeserialize(this,new ControlContainerSerializationEventArgs(ItemXmlSource));
+		}
+
+		// IPersonalizedMenuItem Impementation
+		/// <summary>
+		/// Indicates item's visiblity when on pop-up menu.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Appearance"),System.ComponentModel.Description("Indicates item's visiblity when on pop-up menu.")]
+		public eMenuVisibility MenuVisibility
+		{
+			get
+			{
+				return m_MenuVisibility;
+			}
+			set
+			{
+				if(m_MenuVisibility!=value)
+				{
+					m_MenuVisibility=value;
+                    if(ShouldSyncProperties)
+                        BarFunctions.SyncProperty(this, "MenuVisibility");
+				}
+			}
+		}
+		/// <summary>
+		/// Indicates whether item was recently used.
+		/// </summary>
+		[System.ComponentModel.Browsable(false),System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
+		public bool RecentlyUsed
+		{
+			get
+			{
+				return m_RecentlyUsed;
+			}
+			set
+			{
+				if(m_RecentlyUsed!=value)
+				{
+					m_RecentlyUsed=value;
+                    if(ShouldSyncProperties)
+                        BarFunctions.SyncProperty(this, "RecentlyUsed");
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets/Sets informational text (tooltip) for the item.
+		/// </summary>
+		[System.ComponentModel.Browsable(false),DevCoBrowsable(false),System.ComponentModel.DefaultValue(""),System.ComponentModel.Category("Appearance"),System.ComponentModel.Description("Indicates the text that is displayed when mouse hovers over the item."),System.ComponentModel.Localizable(true)]
+		public override string Tooltip
+		{
+			get
+			{
+			
+				return base.Tooltip;
+			}
+			set
+			{
+				base.Tooltip=value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the reference to the control that is managed by the item.
+		/// </summary>
+		[Category("Data"), DefaultValue(null), Description("Indicates the control that is managed by the item.")]
+		public System.Windows.Forms.Control Control
+		{
+			get
+			{
+				return m_Control;
+			}
+			set
+			{
+				if(m_Control!=null)
+				{
+					if(m_Control.Parent!=null)
+						m_Control.Parent.Controls.Remove(m_Control);
+                    m_Control.Enter -= new EventHandler(HostedControlEnter);
+                    m_Control.GotFocus -= new EventHandler(HostedControlGotFocus);
+                    m_Control.Resize -= new EventHandler(HostedControlResized);
+				}
+				m_Control=value;
+				if(m_Control!=null)
+				{
+                    m_Control.Enter += new EventHandler(HostedControlEnter);
+                    m_Control.GotFocus += new EventHandler(HostedControlGotFocus);
+                    m_Control.Resize += new EventHandler(HostedControlResized);
+					if(m_Control.Parent!=null)
+						m_Control.Parent.Controls.Remove(m_Control);
+					m_Control.Dock=System.Windows.Forms.DockStyle.None;
+
+                    //if (m_Control is System.Windows.Forms.ListBox)
+                    //{
+                    //    TypeDescriptor.GetProperties(m_Control)["IntegralHeight"].SetValue(m_Control, false);
+                    //}
+                    //if (!(m_Control is ItemControl) && TypeDescriptor.GetProperties(m_Control).Find("AutoSize", true) != null)
+                    //    TypeDescriptor.GetProperties(m_Control)["AutoSize"].SetValue(m_Control, false);
+
+					System.Windows.Forms.Control objCtrl=null;
+					if(this.ContainerControl!=null)
+					{
+						objCtrl=this.ContainerControl as System.Windows.Forms.Control;
+						if(objCtrl!=null)
+						{
+							objCtrl.Controls.Add(m_Control);
+							m_Control.Refresh();
+						}
+					}
+					if(!this.Displayed)
+						m_Control.Visible=false;
+				}
+			}
+		}
+
+        void HostedControlResized(object sender, EventArgs e)
+        {
+            NeedRecalcSize = true;
+            if (this.ContainerControl is MenuPanel)
+                ((MenuPanel)this.ContainerControl).RecalcLayout();
+        }
+
+        private void HostedControlGotFocus(object sender, EventArgs e)
+        {
+            SetMenuHotSubItem();
+        }
+
+        private void SetMenuHotSubItem()
+        {
+            if (this.IsOnMenu)
+            {
+                MenuPanel panel = this.ContainerControl as MenuPanel;
+                if (panel != null && panel.HotSubItem != this)
+                    panel.HotSubItem = this;
+            }
+        }
+        private void HostedControlEnter(object sender, EventArgs e)
+        {
+            SetMenuHotSubItem();
+        }
+
+		/// <summary>
+		/// Overridden. Draws the item.
+		/// </summary>
+		/// <param name="g">Target Graphics object.</param>
+		public override void Paint(ItemPaintArgs pa)
+		{
+			if(this.SuspendLayout)
+				return;
+
+            System.Drawing.Graphics g = pa.Graphics;
+
+            if (m_Control != null && m_Control.Visible != this.Displayed && !m_Control.Visible)
+                CustomizeChanged();  // Determine based on customize status				
+
+            Rectangle r = this.DisplayRectangle;
+
+            Size objImageSize = GetMaxImageSize();
+            bool bOnMenu = this.IsOnMenu;
+            if (bOnMenu && this.Parent is ItemContainer)
+                bOnMenu = false;
+
+            if (this.Orientation == eOrientation.Horizontal)
+            {
+                if (bOnMenu && !this.Stretch)
+                {
+                    objImageSize.Width += 7;
+                    r.Width -= objImageSize.Width;
+                    r.X += objImageSize.Width;
+                    if (this.IsOnCustomizeMenu)
+                        objImageSize.Width += objImageSize.Height + 8;
+
+                    // Draw side bar
+                    Rectangle sideRect = new Rectangle(m_Rect.Left, m_Rect.Top, objImageSize.Width, m_Rect.Height);
+                    if (this.MenuVisibility == eMenuVisibility.VisibleIfRecentlyUsed && !this.RecentlyUsed)
+                    {
+                        if (!pa.Colors.MenuUnusedSide2.IsEmpty)
+                        {
+                            System.Drawing.Drawing2D.LinearGradientBrush gradient = BarFunctions.CreateLinearGradientBrush(sideRect, pa.Colors.MenuUnusedSide, pa.Colors.MenuUnusedSide2, pa.Colors.MenuUnusedSideGradientAngle);
+                            g.FillRectangle(gradient, sideRect);
+                            gradient.Dispose();
+                        }
+                        else
+                            g.FillRectangle(new SolidBrush(pa.Colors.MenuUnusedSide), sideRect);
+                    }
+                    else
+                    {
+                        if (!pa.Colors.MenuSide2.IsEmpty)
+                        {
+                            System.Drawing.Drawing2D.LinearGradientBrush gradient = BarFunctions.CreateLinearGradientBrush(sideRect, pa.Colors.MenuSide, pa.Colors.MenuSide2, pa.Colors.MenuSideGradientAngle);
+                            g.FillRectangle(gradient, sideRect);
+                            gradient.Dispose();
+                        }
+                        else
+                            g.FillRectangle(new SolidBrush(pa.Colors.MenuSide), sideRect);
+                    }
+                    if (BarFunctions.IsOffice2007Style(EffectiveStyle) && GlobalManager.Renderer is Office2007Renderer)
+                    {
+                        Office2007MenuColorTable mt = ((Office2007Renderer)GlobalManager.Renderer).ColorTable.Menu;
+                        if (mt != null && !mt.SideBorder.IsEmpty)
+                        {
+                            if (pa.RightToLeft)
+                                DisplayHelp.DrawGradientLine(g, sideRect.X + 1, sideRect.Y, sideRect.X + 1, sideRect.Bottom - 1, mt.SideBorder, 1);
+                            else
+                                DisplayHelp.DrawGradientLine(g, sideRect.Right - 2, sideRect.Y, sideRect.Right - 2, sideRect.Bottom - 1, mt.SideBorder, 1);
+                        }
+                        if (mt != null && !mt.SideBorderLight.IsEmpty)
+                        {
+                            if (pa.RightToLeft)
+                                DisplayHelp.DrawGradientLine(g, sideRect.X, sideRect.Y, sideRect.X, sideRect.Bottom - 1, mt.SideBorder, 1);
+                            else
+                                DisplayHelp.DrawGradientLine(g, sideRect.Right - 1, sideRect.Y, sideRect.Right - 1, sideRect.Bottom - 1, mt.SideBorderLight, 1);
+                        }
+                    }
+                }
+
+				if(this.IsOnCustomizeMenu)
+				{
+                    if (EffectiveStyle != eDotNetBarStyle.Office2000)
+					{
+						r.X+=(objImageSize.Height+8);
+						r.Width-=(objImageSize.Height+8);
+					}
+					else
+					{
+						r.X+=(objImageSize.Height+4);
+						r.Width-=(objImageSize.Height+4);
+					}
+				}
+
+                if (bOnMenu && EffectiveStyle != eDotNetBarStyle.Office2000)
+				{
+					//g.FillRectangle(new SolidBrush(pa.Colors.MenuBackground),r);
+				}
+				//else if(this.Style==eDotNetBarStyle.OfficeXP && !this.IsOnMenuBar)
+				//	g.FillRectangle(new SolidBrush(ColorFunctions.ToolMenuFocusBackColor(g)),this.DisplayRectangle);
+				//else
+				//	g.FillRectangle(SystemBrushes.Control,this.DisplayRectangle);
+
+                // Draw text if needed
+                if (m_Control == null || this.GetDesignMode() || this.IsOnCustomizeMenu)
+				{
+					string text=m_Text;
+					if(text=="")
+						text="Container";
+					eTextFormat objStringFormat=GetStringFormat();
+					Font objFont=this.GetFont();
+					Rectangle rText=new Rectangle(r.X+8,r.Y,r.Width,r.Height);
+                    if (EffectiveStyle == eDotNetBarStyle.Office2000)
+					{
+                        TextDrawing.DrawString(g, text, objFont, SystemColors.ControlText, rText, objStringFormat);
+                    }
+                    else
+                    {
+                        TextDrawing.DrawString(g, text, objFont, SystemColors.ControlText, rText, objStringFormat);
+                    }
+                    Size textSize = TextDrawing.MeasureString(g, text, objFont, 0, objStringFormat);
+                    r.X += (int)textSize.Width + 8;
+                    r.Width -= ((int)textSize.Width + 8);
+                }
+                else if (m_Control != null)
+                {
+                    r.Inflate(-2, -2);
+                    if (m_AllowItemResize)
+                    {
+                        m_Control.Width = r.Width;
+                    }
+                    Point loc = r.Location;
+                    loc.Offset((r.Width - m_Control.Width) / 2, (r.Height - m_Control.Height) / 2);
+
+                    ScrollableControl scc = pa.ContainerControl as ScrollableControl;
+                    if (scc != null && scc.AutoScroll /*&& !(scc is ItemPanel)*/)
+                        loc.Offset(scc.AutoScrollPosition.X, scc.AutoScrollPosition.Y);
+
+                    if (m_Control.Location != loc &&
+                        (!(m_Control is Controls.ComboBoxEx && ContainerControl is RibbonBar) || IsOnPopup(this)) || _ControlLocationUpdatePending)
+                    {
+                        m_Control.Location = loc;
+                        _ControlLocationUpdatePending = false;
+                    }
+                }
+
+				if(this.IsOnCustomizeMenu && this.Visible)
+				{
+					// Draw check box if this item is visible
+					Rectangle rBox=new Rectangle(m_Rect.Left,m_Rect.Top,m_Rect.Height,m_Rect.Height);
+                    if (EffectiveStyle != eDotNetBarStyle.Office2000)
+						rBox.Inflate(-1,-1);
+                    BarFunctions.DrawMenuCheckBox(pa, rBox, EffectiveStyle, m_MouseOver);
+				}
+			}
+
+            if (this.Focused && (this.GetDesignMode() || m_Control == null && this.DesignMode))
+            {
+                r = this.DisplayRectangle;
+                r.Inflate(-1, -1);
+                DesignTime.DrawDesignTimeSelection(g, r, pa.Colors.ItemDesignTimeBorder);
+            }
+		}
+
+        /// <summary>
+        /// IBlock member implementation
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), EditorBrowsable(EditorBrowsableState.Never)]
+        public override System.Drawing.Rectangle Bounds
+        {
+            get { return base.Bounds; }
+            set
+            {
+                if (base.Bounds != value)
+                {
+                    bool topLocationChanged = base.Bounds.Top != value.Top;
+                    bool leftLocationChanged = base.Bounds.Left != value.Left;
+                    base.Bounds = value;
+                    if (topLocationChanged || leftLocationChanged)
+                        UpdateControlLocation();
+                }
+            }
+        }
+
+	    private bool _ControlLocationUpdatePending = false;
+        private void UpdateControlLocation()
+        {
+            if (m_Control == null) return;
+            if (this.IsLayoutPassInProgress)
+            {
+                _ControlLocationUpdatePending = true;
+                return;
+            }
+            Rectangle r = this.DisplayRectangle;
+            r.Inflate(-2, -2);
+            m_Control.Location = r.Location;
+            _ControlLocationUpdatePending = false;
+        }
+
+		/// <summary>
+		/// Overridden. Recalculates the size of the item.
+		/// </summary>
+		public override void RecalcSize()
+		{
+			if(this.SuspendLayout)
+				return;
+
+			bool bOnMenu=this.IsOnMenu;
+
+			if(m_Control==null && !this.DesignMode)
+				InitControl();
+
+            // Default Height
+			if(this.Parent!=null && this.Parent is ImageItem)
+				m_Rect.Height=((ImageItem)this.Parent).SubItemsImageSize.Height+4;
+			else
+				m_Rect.Height=this.SubItemsImageSize.Height+4;
+
+            if (EffectiveStyle == eDotNetBarStyle.OfficeXP || EffectiveStyle == eDotNetBarStyle.Office2003 || EffectiveStyle == eDotNetBarStyle.VS2005)
+			{
+				if(m_Control!=null && m_Rect.Height<(m_Control.Height+2))
+					m_Rect.Height=m_Control.Height+2;
+			}
+			else
+			{
+				if(m_Control!=null && m_Rect.Height<(m_Control.Height+2))
+					m_Rect.Height=m_Control.Height+2;
+			}
+                
+			// Default width
+			if(m_Control!=null)
+			{
+                if (this.Stretch)
+                    m_Rect.Width = 32;
+                else
+                {
+                    m_Rect.Width = m_Control.Width + 4;
+                }
+			}
+			else
+				m_Rect.Width=64+4;
+
+			// Calculate Item Height
+			if(m_Control==null)
+			{
+				string text=m_Text;
+				if(text=="")
+					text="Container";
+				System.Windows.Forms.Control objCtrl=this.ContainerControl as System.Windows.Forms.Control;
+				if(objCtrl!=null && IsHandleValid(objCtrl))
+				{
+					Graphics g=BarFunctions.CreateGraphics(objCtrl);
+                    try
+                    {
+                        Size textSize = TextDrawing.MeasureString(g, text, GetFont(), 0, GetStringFormat());
+                        if (textSize.Height > this.SubItemsImageSize.Height && textSize.Height > m_Rect.Height)
+                            m_Rect.Height = (int)textSize.Height + 4;
+                        m_Rect.Width = (int)textSize.Width + 8;
+                    }
+                    finally
+                    {
+                        g.Dispose();
+                    }
+				}
+			}
+
+			Size objImageSize=GetMaxImageSize();
+            if (this.IsOnMenu && EffectiveStyle != eDotNetBarStyle.Office2000 && !this.Stretch && !(this.Parent is ItemContainer))
+			{
+				// THis is side bar that will need to be drawn for DotNet style
+				m_Rect.Width+=(objImageSize.Width+7);
+			}
+
+			if(this.IsOnCustomizeMenu)
+				m_Rect.Width+=(objImageSize.Height+2);
+
+			// Always call base implementation to reset resize flag
+			base.RecalcSize();
+		}
+
+		/// <summary>
+		/// Called when size of the item is changed externally.
+		/// </summary>
+		protected override void OnExternalSizeChange()
+		{
+			base.OnExternalSizeChange();
+            if(m_AllowItemResize)
+			    NeedRecalcSize=true;
+		}
+
+		protected internal override void OnContainerChanged(object objOldContainer)
+		{	
+			base.OnContainerChanged(objOldContainer);
+			if(m_Control!=null)
+			{
+				System.Windows.Forms.Control objCtrl=this.ContainerControl as System.Windows.Forms.Control;
+				if(m_Control.Parent!=null && objCtrl!=m_Control.Parent)
+					m_Control.Parent.Controls.Remove(m_Control);
+
+				if(objCtrl!=null && m_Control.Parent==null)
+				{
+					objCtrl.Controls.Add(m_Control);
+					m_Control.Refresh();
+				}
+			}
+		}
+
+		protected internal override void OnVisibleChanged(bool newValue)
+		{
+			if(m_Control!=null && !newValue)
+				m_Control.Visible=newValue;
+			base.OnVisibleChanged(newValue);
+		}
+		protected override void OnDisplayedChanged()
+		{
+            if (!this.Displayed && m_Control != null && !(this.IsOnCustomizeMenu || this.IsOnCustomizeDialog || this.GetDesignMode()))
+			{
+				m_Control.Visible=this.Displayed;
+			}
+		}
+
+		protected override void OnIsOnCustomizeDialogChanged()
+		{
+			base.OnIsOnCustomizeDialogChanged();
+			CustomizeChanged();
+		}
+
+		protected override void OnDesignModeChanged()
+		{
+			base.OnDesignModeChanged();
+			CustomizeChanged();
+		}
+
+		protected override void OnIsOnCustomizeMenuChanged()
+		{
+			base.OnIsOnCustomizeMenuChanged();
+			CustomizeChanged();
+		}
+
+        private bool m_CustomizeChangedExecuting = false;
+        private void CustomizeChanged()
+        {
+	        if(m_Control!=null)
+	        {
+                if (m_CustomizeChangedExecuting) return;
+                m_CustomizeChangedExecuting = true;
+                try
+                {
+                    if (this.IsOnCustomizeMenu || this.IsOnCustomizeDialog || this.GetDesignMode())
+                    {
+                        m_Control.Visible = false;
+                    }
+                    else
+                    {
+                        m_Control.Visible = this.Displayed;
+                    }
+                }
+                finally
+                {
+                    m_CustomizeChangedExecuting = false;
+                }
+	        }
+        }
+
+		private Size GetMaxImageSize()
+		{
+			if(m_Parent!=null)
+			{
+				ImageItem objParentImageItem=m_Parent as ImageItem;
+				if(objParentImageItem!=null)
+					return objParentImageItem.SubItemsImageSize;
+				else
+					return this.ImageSize;
+			}
+			else
+				return this.ImageSize;
+		}
+        private eTextFormat GetStringFormat()
+		{
+            eTextFormat format = eTextFormat.Default;
+            format |= eTextFormat.SingleLine;
+            format |= eTextFormat.EndEllipsis;
+            format |= eTextFormat.VerticalCenter;
+            return format;
+
+
+            //StringFormat sfmt=BarFunctions.CreateStringFormat(); //new StringFormat(StringFormat.GenericDefault);
+            //sfmt.HotkeyPrefix=System.Drawing.Text.HotkeyPrefix.Show;
+            ////sfmt.FormatFlags=sfmt.FormatFlags & ~(sfmt.FormatFlags & StringFormatFlags.DisableKerning);
+            //sfmt.FormatFlags=sfmt.FormatFlags | StringFormatFlags.NoWrap;
+            //sfmt.Trimming=StringTrimming.EllipsisCharacter;
+            //sfmt.Alignment=System.Drawing.StringAlignment.Near;
+            //sfmt.LineAlignment=System.Drawing.StringAlignment.Center;
+
+            //return sfmt;
+		}
+
+		/// <summary>
+		/// Returns the Font object to be used for drawing the item text.
+		/// </summary>
+		/// <returns>Font object.</returns>
+		protected virtual Font GetFont()
+		{
+			System.Windows.Forms.Control objCtrl=this.ContainerControl as System.Windows.Forms.Control;
+			if(objCtrl!=null)
+				return (Font)objCtrl.Font;
+            return SystemFonts.DefaultFont;
+		}
+		protected internal override bool IsAnyOnHandle(IntPtr iHandle)
+		{
+			bool bRet=base.IsAnyOnHandle(iHandle);
+			if(!bRet && m_Control!=null && m_Control.Handle==iHandle)
+				bRet=true;
+			return bRet;
+		}
+		protected override void OnEnabledChanged()
+		{
+			base.OnEnabledChanged();
+			if(m_Control!=null)
+				m_Control.Enabled=this.Enabled;
+		}
+
+		[System.ComponentModel.Browsable(false),System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+		public override void InternalMouseEnter()
+		{
+			base.InternalMouseEnter();
+			if(!m_MouseOver)
+			{
+				m_MouseOver=true;
+                if(this.IsOnCustomizeMenu && this.Visible)
+				    this.Refresh();
+			}
+		}
+
+		[System.ComponentModel.Browsable(false),System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+		public override void InternalMouseLeave()
+		{
+			base.InternalMouseLeave();
+			if(m_MouseOver)
+			{
+				m_MouseOver=false;
+                if (this.IsOnCustomizeMenu && this.Visible)
+				    this.Refresh();
+			}
+		}
+
+		/// <summary>
+		/// Specifies whether contained control can be automatically resized to fill the item container.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Behavior"),System.ComponentModel.Description("Specifies whether contained control can be automatically resized to fill the item container.")]
+		public bool AllowItemResize
+		{
+			get {return m_AllowItemResize;}
+			set {m_AllowItemResize=value;}
+		}
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+		public override void OnGotFocus()
+		{
+			base.OnGotFocus();
+			if(m_Control==null)
+				return;
+            if (m_Control.Focused || this.IsOnCustomizeMenu || this.IsOnCustomizeDialog || this.GetDesignMode())
+				return;
+			m_Control.Focus();
+		}
+
+		[System.ComponentModel.Browsable(false),System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+		public override bool IsWindowed
+		{
+			get {return true;}
+		}
+
+        private bool GetDesignMode()
+        {
+            if (this.ContainerControl is IBarDesignerServices && ((IBarDesignerServices)this.ContainerControl).Designer != null)
+                return false;
+            return base.DesignMode;
+        }
+	}
+
+	public class ControlContainerSerializationEventArgs : EventArgs 
+	{
+		private readonly System.Xml.XmlElement xmlstore;
+		public ControlContainerSerializationEventArgs(System.Xml.XmlElement xmlstorage) 
+		{
+			this.xmlstore=xmlstorage;
+		}
+		public System.Xml.XmlElement XmlStorage
+		{
+			get{return this.xmlstore;}
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/AnalogClockControl.bmp b/PROMS/DotNetBar Source Code/Controls/AnalogClockControl.bmp
new file mode 100644
index 00000000..783bb5c9
Binary files /dev/null and b/PROMS/DotNetBar Source Code/Controls/AnalogClockControl.bmp differ
diff --git a/PROMS/DotNetBar Source Code/Controls/BaseItemControl.cs b/PROMS/DotNetBar Source Code/Controls/BaseItemControl.cs
new file mode 100644
index 00000000..61796360
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/BaseItemControl.cs	
@@ -0,0 +1,667 @@
+using System;
+using System.Text;
+using System.Windows.Forms;
+using System.Drawing;
+using System.ComponentModel;
+using System.Drawing.Drawing2D;
+using System.Drawing.Text;
+using DevComponents.DotNetBar.Rendering;
+using System.Reflection;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represents the class for the BaseItem non-popup based control host.
+    /// </summary>
+    [ToolboxItem(false)]
+    public abstract class BaseItemControl : Control
+    {
+        #region Private Variables
+        private BaseItem m_Item = null;
+        private ElementStyle m_BackgroundStyle = null;
+        private ColorScheme m_ColorScheme = null;
+        private bool m_DesignModeInternal = false;
+        private bool m_AntiAlias = true;
+        #endregion
+
+        #region Constructor Dispose
+        /// <summary>
+        /// Creates new instance of the object.
+        /// </summary>
+        public BaseItemControl()
+        {
+            if (!ColorFunctions.ColorsLoaded)
+            {
+                NativeFunctions.RefreshSettings();
+                NativeFunctions.OnDisplayChange();
+                ColorFunctions.LoadColors();
+            }
+
+            this.SetStyle(ControlStyles.UserPaint, true);
+            this.SetStyle(ControlStyles.AllPaintingInWmPaint, true);
+            this.SetStyle(ControlStyles.Opaque, true);
+            this.SetStyle(ControlStyles.ResizeRedraw, true);
+            this.SetStyle(ControlStyles.StandardDoubleClick, true);
+            this.SetStyle(DisplayHelp.DoubleBufferFlag, true);
+            this.SetStyle(ControlStyles.SupportsTransparentBackColor, true);
+
+            m_ColorScheme = new ColorScheme(eDotNetBarStyle.Office2007);
+            m_BackgroundStyle = new ElementStyle();
+            m_BackgroundStyle.SetColorScheme(m_ColorScheme);
+            m_BackgroundStyle.StyleChanged += new EventHandler(this.VisualPropertyChanged);
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && m_Item != null)
+                m_Item.Dispose();
+            base.Dispose(disposing);
+        }
+        #endregion
+
+        #region Internal Implementation
+
+        protected override void ScaleControl(SizeF factor, BoundsSpecified specified)
+        {
+            if (Dpi.RecordScalePerControl)
+                Dpi.SetScaling(factor);
+            if (m_Item != null)
+            {
+                m_Item.NotifyScaleItem(factor);
+                RecalcLayout();
+            }
+            base.ScaleControl(factor, specified);
+        }
+
+        internal bool IsValidationCancelled
+        {
+            get
+            {
+                PropertyInfo pi=this.GetType().GetProperty("ValidationCancelled", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance);
+                if (pi != null)
+                    return (bool)pi.GetValue(this, null);
+                return false;
+            }
+        }
+
+
+#if FRAMEWORK20
+        protected override void OnBindingContextChanged(EventArgs e)
+        {
+            base.OnBindingContextChanged(e);
+            if (m_Item != null)
+                m_Item.UpdateBindings();
+        }
+#endif
+
+        protected bool GetDesignMode()
+        {
+            if (!m_DesignModeInternal)
+                return this.DesignMode;
+            return m_DesignModeInternal;
+        }
+
+        protected virtual ElementStyle GetBackgroundStyle()
+        {
+            return m_BackgroundStyle;
+        }
+
+        internal void SetDesignMode(bool mode)
+        {
+            m_DesignModeInternal = mode;
+            if(m_Item!=null)
+                m_Item.SetDesignMode(mode);
+        }
+
+        /// <summary>
+        /// Gets or sets the instance of BaseItem object hosted by this control.
+        /// </summary>
+        protected virtual BaseItem HostItem
+        {
+            get { return m_Item; }
+            set
+            {
+                m_Item = value;
+                if (m_Item != null)
+                {
+                    m_Item.Displayed = true;
+                    m_Item.ContainerControl = this;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Returns the color scheme used by control. Color scheme for Office2007 style will be retrieved from the current renderer instead of
+        /// local color scheme referenced by ColorScheme property.
+        /// </summary>
+        /// <returns>An instance of ColorScheme object.</returns>
+        protected virtual ColorScheme GetColorScheme()
+        {
+            if (m_Item != null && BarFunctions.IsOffice2007Style(m_Item.EffectiveStyle))
+            {
+                BaseRenderer r = GetRenderer();
+                if (r is Office2007Renderer)
+                    return ((Office2007Renderer)r).ColorTable.LegacyColors;
+            }
+            return m_ColorScheme;
+        }
+
+        private bool _CallBasePaintBackground = true;
+        /// <summary>
+        /// Gets or sets whether during painting OnPaintBackground on base control is called when BackColor=Transparent.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool CallBasePaintBackground
+        {
+            get { return _CallBasePaintBackground; }
+            set
+            {
+                _CallBasePaintBackground = value;
+            }
+        }
+
+        internal void InternalPaint(PaintEventArgs e)
+        {
+            OnPaint(e);
+        }
+
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            if ((this.BackColor.IsEmpty || this.BackColor == Color.Transparent) && _CallBasePaintBackground)
+            {
+                base.OnPaintBackground(e);
+            }
+
+            if (m_BackgroundStyle != null)
+                m_BackgroundStyle.SetColorScheme(this.GetColorScheme());
+
+            PaintBackground(e);
+            PaintControl(e);
+
+            if (this.Focused && /*this.ShowFocusCues &&*/ this.FocusCuesEnabled)
+            {
+                PaintFocusCues(e);
+            }
+
+            base.OnPaint(e);
+        }
+
+        private bool _FocusCuesEnabled = true;
+        /// <summary>
+        /// Gets or sets whether control displays focus cues when focused.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether control displays focus cues when focused.")]
+        public virtual bool FocusCuesEnabled
+        {
+            get { return _FocusCuesEnabled; }
+            set
+            {
+                _FocusCuesEnabled = value;
+                if (this.Focused) this.Invalidate();
+            }
+        }
+
+        /// <summary>
+        /// Paints the control focus cues.
+        /// </summary>
+        /// <param name="e">Paint event information.</param>
+        protected virtual void PaintFocusCues(PaintEventArgs e)
+        {
+            ControlPaint.DrawFocusRectangle(e.Graphics, this.ClientRectangle);
+        }
+
+        protected virtual void PaintBackground(PaintEventArgs e)
+        {
+            Graphics g = e.Graphics;
+            Rectangle r = this.ClientRectangle;
+            ElementStyle style = this.GetBackgroundStyle();
+
+            if (!this.BackColor.IsEmpty && this.BackColor != Color.Transparent)
+            {
+                DisplayHelp.FillRectangle(g, r, this.BackColor);
+            }
+
+            if (this.BackgroundImage != null)
+                base.OnPaintBackground(e);
+
+            if (style.Custom)
+            {
+                SmoothingMode sm = g.SmoothingMode;
+                if (m_AntiAlias)
+                    g.SmoothingMode = SmoothingMode.HighQuality;
+                ElementStyleDisplayInfo displayInfo = new ElementStyleDisplayInfo(style, e.Graphics, r);
+                ElementStyleDisplay.Paint(displayInfo);
+                if (m_AntiAlias)
+                    g.SmoothingMode = sm;
+            }
+        }
+
+        protected virtual void PaintControl(PaintEventArgs e)
+        {
+            SmoothingMode sm = e.Graphics.SmoothingMode;
+            TextRenderingHint th = e.Graphics.TextRenderingHint;
+            Graphics g = e.Graphics;
+
+            if (m_AntiAlias)
+            {
+                g.SmoothingMode = SmoothingMode.AntiAlias;
+                g.TextRenderingHint = DisplayHelp.AntiAliasTextRenderingHint;
+            }
+
+            ItemPaintArgs pa = GetItemPaintArgs(g);
+            pa.ClipRectangle = e.ClipRectangle;
+
+            if (m_Item != null) m_Item.Paint(pa);
+            
+            if (m_AntiAlias)
+            {
+                g.SmoothingMode = sm;
+                g.TextRenderingHint = th;
+            }
+        }
+
+        /// <summary>
+        /// Creates the Graphics object for the control.
+        /// </summary>
+        /// <returns>The Graphics object for the control.</returns>
+        public new Graphics CreateGraphics()
+        {
+            Graphics g = base.CreateGraphics();
+            if (m_AntiAlias)
+            {
+                g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.AntiAlias;
+                #if FRAMEWORK20
+                if (!SystemInformation.IsFontSmoothingEnabled)
+                #endif
+                    g.TextRenderingHint = DisplayHelp.AntiAliasTextRenderingHint;
+            }
+            return g;
+        }
+
+        protected virtual ItemPaintArgs GetItemPaintArgs(Graphics g)
+        {
+            ItemPaintArgs pa = new ItemPaintArgs(this as IOwner, this, g, GetColorScheme());
+            pa.Renderer = this.GetRenderer();
+            pa.DesignerSelection = false;
+            pa.GlassEnabled = !this.DesignMode && WinApi.IsGlassEnabled;
+            return pa;
+        }
+
+        private Rendering.BaseRenderer m_DefaultRenderer = null;
+        private Rendering.BaseRenderer m_Renderer = null;
+        private eRenderMode m_RenderMode = eRenderMode.Global;
+        /// <summary>
+        /// Returns the renderer control will be rendered with.
+        /// </summary>
+        /// <returns>The current renderer.</returns>
+        public virtual Rendering.BaseRenderer GetRenderer()
+        {
+            if (m_RenderMode == eRenderMode.Global && Rendering.GlobalManager.Renderer != null)
+                return Rendering.GlobalManager.Renderer;
+            else if (m_RenderMode == eRenderMode.Custom && m_Renderer != null)
+                return m_Renderer;
+
+            if (m_DefaultRenderer == null)
+                m_DefaultRenderer = new Rendering.Office2007Renderer();
+
+            return m_Renderer;
+        }
+
+        /// <summary>
+        /// Gets or sets the redering mode used by control. Default value is eRenderMode.Global which means that static GlobalManager.Renderer is used. If set to Custom then Renderer property must
+        /// also be set to the custom renderer that will be used.
+        /// </summary>
+        [Browsable(false), DefaultValue(eRenderMode.Global)]
+        public eRenderMode RenderMode
+        {
+            get { return m_RenderMode; }
+            set
+            {
+                if (m_RenderMode != value)
+                {
+                    m_RenderMode = value;
+                    this.Invalidate(true);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the custom renderer used by the items on this control. RenderMode property must also be set to eRenderMode.Custom in order renderer
+        /// specified here to be used.
+        /// </summary>
+        [Browsable(false), DefaultValue(null)]
+        public DevComponents.DotNetBar.Rendering.BaseRenderer Renderer
+        {
+            get
+            {
+                return m_Renderer;
+            }
+            set { m_Renderer = value; }
+        }
+
+        /// <summary>
+        /// Specifies the background style of the control.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Category("Style"), Description("Gets or sets bar background style."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ElementStyle BackgroundStyle
+        {
+            get { return m_BackgroundStyle; }
+        }
+
+        /// <summary>
+        /// Resets style to default value. Used by windows forms designer.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetBackgroundStyle()
+        {
+            m_BackgroundStyle.StyleChanged -= new EventHandler(this.VisualPropertyChanged);
+            m_BackgroundStyle = new ElementStyle();
+            m_BackgroundStyle.StyleChanged += new EventHandler(this.VisualPropertyChanged);
+            OnBackgroundStyleChanged();
+            this.Invalidate();
+        }
+
+        protected virtual void OnBackgroundStyleChanged()
+        {
+        }
+
+        private void VisualPropertyChanged(object sender, EventArgs e)
+        {
+            OnVisualPropertyChanged();
+        }
+
+        /// <summary>
+        /// Called when visual property of the control has changed so the control can be updated.
+        /// </summary>
+        protected virtual void OnVisualPropertyChanged()
+        {
+            if (this.GetDesignMode() ||
+                this.Parent != null && this.Parent.Site != null && this.Parent.Site.DesignMode)
+            {
+                this.RecalcLayout();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets Bar Color Scheme.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), Category("Appearance"), Description("Gets or sets Bar Color Scheme."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ColorScheme ColorScheme
+        {
+            get { return m_ColorScheme; }
+            set
+            {
+                if (value == null)
+                    throw new ArgumentException("NULL is not a valid value for this property.");
+                m_ColorScheme = value;
+                if (this.Visible)
+                    this.Refresh();
+            }
+        }
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeColorScheme()
+        {
+            return m_ColorScheme.SchemeChanged;
+        }
+
+        /// <summary>
+        /// Gets or sets whether anti-alias smoothing is used while painting. Default value is false.
+        /// </summary>
+        [DefaultValue(true), Browsable(true), Category("Appearance"), Description("Gets or sets whether anti-aliasing is used while painting.")]
+        public bool AntiAlias
+        {
+            get { return m_AntiAlias; }
+            set
+            {
+                if (m_AntiAlias != value)
+                {
+                    m_AntiAlias = value;
+                    this.Invalidate();
+                }
+            }
+        }
+
+        protected override void OnParentChanged(EventArgs e)
+        {
+            base.OnParentChanged(e);
+            //if (this.Parent != null && (this.Images != null || this.ImagesLarge != null || this.ImagesMedium != null))
+            //{
+            //    foreach (BaseItem panel in m_BaseItemContainer.SubItems)
+            //    {
+            //        foreach (BaseItem item in panel.SubItems)
+            //        {
+            //            if (item is ImageItem)
+            //                ((ImageItem)item).OnImageChanged();
+            //        }
+            //    }
+            //}
+
+            if (this.DesignMode && m_Item!=null)
+                m_Item.SetDesignMode(this.DesignMode);
+        }
+
+        /// <summary>
+        /// Forces the button to perform internal layout.
+        /// </summary>
+        public virtual void RecalcLayout()
+        {
+            if (m_Item == null) return;
+
+            Rectangle r = GetItemBounds();
+            m_Item.Bounds = r;
+            this.RecalcSize();
+            m_Item.Bounds = r;
+            this.Invalidate();
+        }
+
+        /// <summary>
+        /// Recalculates the size of the internal item.
+        /// </summary>
+        protected virtual void RecalcSize()
+        {
+            m_Item.RecalcSize();
+        }
+
+        protected virtual Rectangle GetItemBounds()
+        {
+            Rectangle r = this.ClientRectangle;
+            r.X += ElementStyleLayout.LeftWhiteSpace(this.BackgroundStyle);
+            r.Width -= ElementStyleLayout.HorizontalStyleWhiteSpace(this.BackgroundStyle);
+            r.Y += ElementStyleLayout.TopWhiteSpace(this.BackgroundStyle);
+            r.Height -= ElementStyleLayout.VerticalStyleWhiteSpace(this.BackgroundStyle);
+
+            return r;
+        }
+
+        protected override void OnResize(EventArgs e)
+        {
+            RecalcLayout();
+            base.OnResize(e);
+        }
+
+        protected override void OnTextChanged(EventArgs e)
+        {
+            m_Item.Text = this.Text;
+            this.RecalcLayout();
+            base.OnTextChanged(e);
+        }
+
+        protected override void OnFontChanged(EventArgs e)
+        {
+            base.OnFontChanged(e);
+            BarUtilities.InvalidateFontChange(m_Item);
+            this.RecalcLayout();
+        }
+
+        protected override void OnEnabledChanged(EventArgs e)
+        {
+            m_Item.Enabled = this.Enabled;
+            base.OnEnabledChanged(e);
+        }
+
+        private bool m_MouseFocus = false;
+        protected override void OnGotFocus(EventArgs e)
+        {
+            if (!m_MouseFocus)
+                m_Item.OnGotFocus();
+            m_MouseFocus = false;
+            base.OnGotFocus(e);
+        }
+
+        protected override void OnLostFocus(EventArgs e)
+        {
+            m_Item.OnLostFocus();
+            base.OnLostFocus(e);
+        }
+
+        protected override void OnMouseEnter(EventArgs e)
+        {
+            m_Item.InternalMouseEnter();
+            base.OnMouseEnter(e);
+        }
+
+        protected override void OnMouseMove(MouseEventArgs e)
+        {
+            m_Item.InternalMouseMove(e);
+            base.OnMouseMove(e);
+        }
+
+        protected override void OnMouseLeave(EventArgs e)
+        {
+            m_Item.InternalMouseLeave();
+            base.OnMouseLeave(e);
+        }
+
+        protected override void OnMouseHover(EventArgs e)
+        {
+            m_Item.InternalMouseHover();
+            base.OnMouseHover(e);
+        }
+
+        protected virtual MouseButtons MouseDownFocusButtons
+        {
+            get { return MouseButtons.Left; }
+        }
+
+        protected override void OnMouseDown(MouseEventArgs e)
+        {
+            if ((e.Button & MouseDownFocusButtons) != 0)
+            {
+                if (!this.Focused && this.GetStyle(ControlStyles.Selectable))
+                {
+                    m_MouseFocus = true;
+                    this.Select();
+                }
+            }
+
+            m_Item.InternalMouseDown(e);
+            base.OnMouseDown(e);
+        }
+
+        protected override void OnMouseUp(MouseEventArgs e)
+        {
+            m_Item.InternalMouseUp(e);
+            base.OnMouseUp(e);
+        }
+
+        protected override void OnClick(EventArgs e)
+        {
+            m_Item.InternalClick(Control.MouseButtons, this.PointToClient(Control.MousePosition));
+            base.OnClick(e);
+        }
+
+        protected override void OnDoubleClick(EventArgs e)
+        {
+            m_Item.InternalDoubleClick(Control.MouseButtons, this.PointToClient(Control.MousePosition));
+            base.OnDoubleClick(e);
+        }
+
+        protected override void OnKeyDown(KeyEventArgs e)
+        {
+            m_Item.InternalKeyDown(e);
+            base.OnKeyDown(e);
+        }
+
+        /// <summary>
+        /// Gets/Sets the visual style for the control.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), Description("Specifies the visual style of the control."), DefaultValue(eDotNetBarStyle.Office2007)]
+        public virtual eDotNetBarStyle Style
+        {
+            get
+            {
+                return m_Item.Style;
+            }
+            set
+            {
+                m_Item.Style = value;
+                if(!BarFunctions.IsOffice2007Style(value))
+                    this.GetColorScheme().Style = value;
+                this.RecalcLayout();
+            }
+        }
+
+        protected override bool ProcessMnemonic(char charCode)
+        {
+            if (IsMnemonic(charCode, m_Item.Text))
+            {
+                if (ProcessAccelerator())
+                    return true;
+            }
+            return base.ProcessMnemonic(charCode);
+        }
+
+        protected virtual bool ProcessAccelerator()
+        {
+            m_Item.RaiseClick(eEventSource.Keyboard);
+            return true;
+        }
+        #endregion
+
+        #region Layout Support
+        private int m_UpdateSuspendCount = 0;
+        /// <summary>
+        /// Indicates to control that all further update operations should not result in layout and refresh of control content.
+        /// Use this method to optimize the addition of new items to the control. This method supports nested calls meaning
+        /// that multiple calls are allowed but they must be ended with appropriate number of EndUpdate calls.
+        /// IsUpdateSuspended property returns whether update is suspended.
+        /// </summary>
+        public void BeginUpdate()
+        {
+            m_UpdateSuspendCount++;
+        }
+
+        /// <summary>
+        /// Indicates that update operation is complete and that control should perform layout and refresh to show changes. See BeginUpdate
+        /// for more details.
+        /// </summary>
+        public void EndUpdate()
+        {
+            EndUpdate(true);
+        }
+
+        /// <summary>
+        /// Indicates that update operation is complete and that control should perform layout and refresh to show changes. See BeginUpdate
+        /// for more details.
+        /// </summary>
+        public void EndUpdate(bool callRecalcLayout)
+        {
+            if (m_UpdateSuspendCount > 0)
+            {
+                m_UpdateSuspendCount--;
+                if (m_UpdateSuspendCount == 0 && callRecalcLayout)
+                    this.RecalcLayout();
+            }
+        }
+
+        /// <summary>
+        /// Gets whether control layout is suspended becouse of the call to BeginUpdate method.
+        /// </summary>
+        [Browsable(false)]
+        public bool IsUpdateSuspended
+        {
+            get { return m_UpdateSuspendCount > 0; }
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/BindingNavigatorEx.cs b/PROMS/DotNetBar Source Code/Controls/BindingNavigatorEx.cs
new file mode 100644
index 00000000..c8f04a89
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/BindingNavigatorEx.cs	
@@ -0,0 +1,671 @@
+using System.ComponentModel;
+
+using System.Globalization;
+using System.Drawing;
+using System.Runtime.InteropServices;
+using DevComponents.DotNetBar;
+using System.Windows.Forms;
+using System;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    /// <summary>
+    /// Represents the bound data navigator in current DotNetBar style.
+    /// </summary>
+    [DefaultEvent("RefreshItems"), Description("DotNetBar Binding Navigator Control"), ClassInterface(ClassInterfaceType.AutoDispatch), DefaultProperty("BindingSource")]
+    [Designer("DevComponents.DotNetBar.Design.BindingNavigatorExDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+    [ToolboxBitmap(typeof(BindingNavigatorEx), "Controls.BindingNavigatorEx.ico"), ToolboxItem(true)]
+    public class BindingNavigatorEx : Bar, ISupportInitialize
+    {
+        #region Private Variables
+        private ButtonItem _AddNewButton;
+        private bool _AddNewItemUserEnabled;
+        private BindingSource _BindingSource;
+        private LabelItem _CountLabel;
+        private string _CountLabelFormat;
+        private ButtonItem _DeleteButton;
+        private bool _DeleteButtonUserEnabled;
+        private bool _Initializing;
+        private ButtonItem _MoveFirstButton;
+        private ButtonItem _MoveLastButton;
+        private ButtonItem _MoveNextButton;
+        private ButtonItem _MovePreviousButton;
+        private TextBoxItem _PositionTextBox;
+        #endregion
+
+        #region Constructor
+        /// <summary>
+        /// Creates new instance of BindingNavigatorEx
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public BindingNavigatorEx()
+            : this(false)
+        {
+        }
+        /// <summary>
+        /// Creates new instance of BindingNavigatorEx
+        /// </summary>
+        public BindingNavigatorEx(bool addStandardItems)
+        {
+            _CountLabelFormat = "of {0}";
+            _AddNewItemUserEnabled = true;
+            _DeleteButtonUserEnabled = true;
+            if (addStandardItems)
+            {
+                this.AddDefaultItems();
+            }
+        }
+        /// <summary>
+        /// Creates new instance of BindingNavigatorEx
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public BindingNavigatorEx(IContainer container)
+            : this(false)
+        {
+            if (container == null)
+            {
+                throw new ArgumentNullException("container");
+            }
+            container.Add(this);
+
+        }
+        /// <summary>
+        /// Creates new instance of BindingNavigatorEx
+        /// </summary>
+        public BindingNavigatorEx(BindingSource bindingSource)
+            : this(true)
+        {
+            this.BindingSource = bindingSource;
+        }
+        #endregion
+
+        #region Internal Implementation
+
+        private void AcceptNewPosition()
+        {
+            if (_PositionTextBox != null && _BindingSource != null)
+            {
+                int position = this._BindingSource.Position;
+                try
+                {
+                    position = Convert.ToInt32(this._PositionTextBox.Text, CultureInfo.CurrentCulture) - 1;
+                }
+                catch (FormatException)
+                {
+                }
+                catch (OverflowException)
+                {
+                }
+                if (position != this._BindingSource.Position)
+                {
+                    this._BindingSource.Position = position;
+                }
+                this.RefreshStateInternal();
+            }
+        }
+        /// <summary>
+        /// Adds default items that make up the binding navigation control.
+        /// </summary>
+        public virtual void AddDefaultItems()
+        {
+            this.MoveFirstButton = new ButtonItem();
+            this.MovePreviousButton = new ButtonItem();
+            this.MoveNextButton = new ButtonItem();
+            this.MoveLastButton = new ButtonItem();
+            this.PositionTextBox = new TextBoxItem();
+            this.CountLabel = new LabelItem();
+            this.AddNewRecordButton = new ButtonItem();
+            this.DeleteButton = new ButtonItem();
+            char ch = (string.IsNullOrEmpty(base.Name) || char.IsLower(base.Name[0])) ? 'b' : 'B';
+            this.MoveFirstButton.Name = ch + "indingNavigatorMoveFirstItem";
+            this.MovePreviousButton.Name = ch + "indingNavigatorMovePreviousItem";
+            this.MoveNextButton.Name = ch + "indingNavigatorMoveNextItem";
+            this.MoveLastButton.Name = ch + "indingNavigatorMoveLastItem";
+            this.PositionTextBox.Name = ch + "indingNavigatorPositionItem";
+            this.CountLabel.Name = ch + "indingNavigatorCountItem";
+            this.AddNewRecordButton.Name = ch + "indingNavigatorAddNewItem";
+            this.DeleteButton.Name = ch + "indingNavigatorDeleteItem";
+            this.MoveFirstButton.Text = "Move first";
+            this.MovePreviousButton.Text = "Move previous";
+            this.MoveNextButton.Text = "Move next";
+            this.MoveLastButton.Text = "Move last";
+            this.AddNewRecordButton.Text = "Add new";
+            this.DeleteButton.Text = "Delete";
+            this.PositionTextBox.AccessibleName = "Position";
+
+            _PositionTextBox.BeginGroup = true;
+            _MoveNextButton.BeginGroup = true;
+            _MoveFirstButton.Image = BarFunctions.LoadBitmap("SystemImages.FirstRecord.png");
+            _MovePreviousButton.Image = BarFunctions.LoadBitmap("SystemImages.PreviousRecord.png");
+            _MoveNextButton.Image = BarFunctions.LoadBitmap("SystemImages.NextRecord.png"); ;
+            _MoveLastButton.Image = BarFunctions.LoadBitmap("SystemImages.LastRecord.png"); ;
+            _AddNewButton.Image = BarFunctions.LoadBitmap("SystemImages.NewRecord.png"); ;
+            _DeleteButton.Image = BarFunctions.LoadBitmap("SystemImages.Delete.png"); ;
+
+            _PositionTextBox.TextBoxWidth = 54;
+            this.Items.AddRange(new BaseItem[] { this.MoveFirstButton, this.MovePreviousButton, this.PositionTextBox, this.CountLabel, this.MoveNextButton, this.MoveLastButton, this.AddNewRecordButton, this.DeleteButton });
+        }
+
+
+        private void CancelNewPosition()
+        {
+            this.RefreshStateInternal();
+        }
+
+        private bool _IsDisposing = false;
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                _IsDisposing = true;
+                try
+                {
+                    this.BindingSource = null;
+                }
+                finally
+                {
+                    _IsDisposing = false;
+                }
+            }
+            base.Dispose(disposing);
+        }
+
+        private void OnAddNew(object sender, EventArgs e)
+        {
+            if (this.Validate() && _BindingSource != null)
+            {
+                _BindingSource.EndEdit();
+                _BindingSource.AddNew();
+                RefreshStateInternal();
+            }
+        }
+
+        private void OnAddNewItemEnabledChanged(object sender, EventArgs e)
+        {
+            if (AddNewRecordButton != null)
+            {
+                _AddNewItemUserEnabled = _AddNewButton.Enabled;
+            }
+        }
+
+        private void OnBindingSourceListChanged(object sender, ListChangedEventArgs e)
+        {
+            RefreshStateInternal();
+        }
+
+        private void OnBindingSourceStateChanged(object sender, EventArgs e)
+        {
+            RefreshStateInternal();
+        }
+
+        private void OnDelete(object sender, EventArgs e)
+        {
+            if (this.Validate() && _BindingSource != null)
+            {
+                _BindingSource.RemoveCurrent();
+                RefreshStateInternal();
+            }
+        }
+
+        private void OnDeleteItemEnabledChanged(object sender, EventArgs e)
+        {
+            if (DeleteButton != null)
+            {
+                _DeleteButtonUserEnabled = _DeleteButton.Enabled;
+            }
+        }
+
+        private void OnMoveFirst(object sender, EventArgs e)
+        {
+            if (Validate() && _BindingSource != null)
+            {
+                _BindingSource.MoveFirst();
+                RefreshStateInternal();
+            }
+        }
+
+        private void OnMoveLast(object sender, EventArgs e)
+        {
+            if (Validate() && _BindingSource != null)
+            {
+                _BindingSource.MoveLast();
+                RefreshStateInternal();
+            }
+        }
+
+        private void OnMoveNext(object sender, EventArgs e)
+        {
+            if (Validate() && this._BindingSource != null)
+            {
+                _BindingSource.MoveNext();
+                RefreshStateInternal();
+            }
+        }
+
+        private void OnMovePrevious(object sender, EventArgs e)
+        {
+            if (Validate() && _BindingSource != null)
+            {
+                _BindingSource.MovePrevious();
+                RefreshStateInternal();
+            }
+        }
+
+        private void OnPositionKey(object sender, KeyEventArgs e)
+        {
+            Keys keyCode = e.KeyCode;
+            if (keyCode != Keys.Return)
+            {
+                if (keyCode != Keys.Escape)
+                {
+                    return;
+                }
+            }
+            else
+            {
+                AcceptNewPosition();
+                return;
+            }
+            CancelNewPosition();
+        }
+
+        private void OnPositionLostFocus(object sender, EventArgs e)
+        {
+            AcceptNewPosition();
+        }
+
+        protected virtual void OnRefreshState()
+        {
+            RefreshState();
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Advanced)]
+        protected virtual void RefreshState()
+        {
+            int count;
+            int currentPosition;
+            bool allowNew;
+            bool allowRemove;
+            if (_BindingSource == null)
+            {
+                count = 0;
+                currentPosition = 0;
+                allowNew = false;
+                allowRemove = false;
+            }
+            else if (_BindingSource.Position == -1)
+            {
+                count = -1;
+                currentPosition = -1;
+                allowNew = true;
+                allowRemove = false;
+            }
+            else
+            {
+                count = _BindingSource.Count;
+                currentPosition = _BindingSource.Position + 1;
+                allowNew = _BindingSource.AllowNew;
+                allowRemove = _BindingSource.AllowRemove;
+            }
+            if (!base.DesignMode)
+            {
+                if (MoveFirstButton != null)
+                {
+                    _MoveFirstButton.Enabled = currentPosition > 1;
+                }
+                if (MovePreviousButton != null)
+                {
+                    _MovePreviousButton.Enabled = currentPosition > 1;
+                }
+                if (MoveNextButton != null)
+                {
+                    _MoveNextButton.Enabled = currentPosition < count;
+                }
+                if (MoveLastButton != null)
+                {
+                    _MoveLastButton.Enabled = currentPosition < count;
+                }
+                if (AddNewRecordButton != null)
+                {
+                    EventHandler handler = this.OnAddNewItemEnabledChanged;
+                    _AddNewButton.EnabledChanged -= handler;
+                    _AddNewButton.Enabled = _AddNewItemUserEnabled && allowNew;
+                    _AddNewButton.EnabledChanged += handler;
+                }
+                if (DeleteButton != null)
+                {
+                    EventHandler handler2 = OnDeleteItemEnabledChanged;
+                    _DeleteButton.EnabledChanged -= handler2;
+                    _DeleteButton.Enabled = (this._DeleteButtonUserEnabled && allowRemove) && (count > 0);
+                    _DeleteButton.EnabledChanged += handler2;
+                }
+                if (PositionTextBox != null)
+                {
+                    _PositionTextBox.Enabled = (currentPosition > 0) && (count > 0);
+                }
+                if (CountLabel != null)
+                {
+                    _CountLabel.Enabled = count > 0;
+                }
+            }
+            if (_PositionTextBox != null)
+            {
+                _PositionTextBox.Text = currentPosition.ToString(CultureInfo.CurrentCulture);
+            }
+            if (_CountLabel != null)
+            {
+                _CountLabel.Text = base.DesignMode ? CountLabelFormat : string.Format(CultureInfo.CurrentCulture, CountLabelFormat, new object[] { count });
+            }
+        }
+
+        private void RefreshStateInternal()
+        {
+            if (!_Initializing && !_IsDisposing)
+                OnRefreshState();
+        }
+
+        public bool Validate()
+        {
+            bool flag = false;
+            System.Reflection.MethodInfo mi = ((Control)this).GetType().GetMethod("ValidateActiveControl", System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.NonPublic);
+            if (mi != null)
+            {
+                return (bool)mi.Invoke(this, new object[] { flag });
+            }
+            return true;
+        }
+
+        private void WireUpBindingSource(ref BindingSource oldBindingSource, BindingSource newBindingSource)
+        {
+            if (oldBindingSource != newBindingSource)
+            {
+                if (oldBindingSource != null)
+                {
+                    oldBindingSource.PositionChanged -= OnBindingSourceStateChanged;
+                    oldBindingSource.CurrentChanged -= OnBindingSourceStateChanged;
+                    oldBindingSource.CurrentItemChanged -= OnBindingSourceStateChanged;
+                    oldBindingSource.DataSourceChanged -= OnBindingSourceStateChanged;
+                    oldBindingSource.DataMemberChanged -= OnBindingSourceStateChanged;
+                    oldBindingSource.ListChanged -= OnBindingSourceListChanged;
+                }
+                if (newBindingSource != null)
+                {
+                    newBindingSource.PositionChanged += OnBindingSourceStateChanged;
+                    newBindingSource.CurrentChanged += OnBindingSourceStateChanged;
+                    newBindingSource.CurrentItemChanged += OnBindingSourceStateChanged;
+                    newBindingSource.DataSourceChanged += OnBindingSourceStateChanged;
+                    newBindingSource.DataMemberChanged += OnBindingSourceStateChanged;
+                    newBindingSource.ListChanged += OnBindingSourceListChanged;
+                }
+                oldBindingSource = newBindingSource;
+                this.RefreshStateInternal();
+            }
+        }
+
+        private void WireUpButton(ref ButtonItem oldButton, ButtonItem newButton, EventHandler clickHandler)
+        {
+            if (oldButton != newButton)
+            {
+                if (oldButton != null)
+                {
+                    oldButton.Click -= clickHandler;
+                }
+                if (newButton != null)
+                {
+                    newButton.Click += clickHandler;
+                }
+                oldButton = newButton;
+                this.RefreshStateInternal();
+            }
+        }
+
+        private void WireUpLabel(ref LabelItem oldLabel, LabelItem newLabel)
+        {
+            if (oldLabel != newLabel)
+            {
+                oldLabel = newLabel;
+                this.RefreshStateInternal();
+            }
+        }
+
+        private void WireUpTextBox(ref TextBoxItem oldTextBox, TextBoxItem newTextBox, KeyEventHandler keyUpHandler, EventHandler lostFocusHandler)
+        {
+            if (oldTextBox != newTextBox)
+            {
+                if (oldTextBox != null)
+                {
+                    oldTextBox.KeyUp -= keyUpHandler;
+                    oldTextBox.LostFocus -= lostFocusHandler;
+                }
+                if (newTextBox != null)
+                {
+                    newTextBox.KeyUp += keyUpHandler;
+                    newTextBox.LostFocus += lostFocusHandler;
+                }
+                oldTextBox = newTextBox;
+                this.RefreshStateInternal();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the reference to Add New record button.
+        /// </summary>
+        [DefaultValue(null), Category("Items"), TypeConverter(typeof(ReferenceConverter)), Description("BindingNavigatorAddNewItemPropDescr")]
+        public ButtonItem AddNewRecordButton
+        {
+            get
+            {
+                if (_AddNewButton != null && _AddNewButton.IsDisposed)
+                {
+                    _AddNewButton = null;
+                }
+                return _AddNewButton;
+            }
+            set
+            {
+                if ((_AddNewButton != value) && (value != null))
+                {
+                    value.EnabledChanged += OnAddNewItemEnabledChanged;
+                    _AddNewItemUserEnabled = value.Enabled;
+                }
+                WireUpButton(ref _AddNewButton, value, OnAddNew);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the binding source for the navigator.
+        /// </summary>
+        [Category("Data"), Description("Gets or sets the binding source for the navigator."), DefaultValue((string)null), TypeConverter(typeof(ReferenceConverter))]
+        public BindingSource BindingSource
+        {
+            get
+            {
+                return _BindingSource;
+            }
+            set
+            {
+                WireUpBindingSource(ref _BindingSource, value);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the label which represents the items count.
+        /// </summary>
+        [TypeConverter(typeof(ReferenceConverter)), Category("Items"), Description("Indicates label which represents the items count.")]
+        public LabelItem CountLabel
+        {
+            get
+            {
+                if (_CountLabel != null && _CountLabel.IsDisposed)
+                {
+                    _CountLabel = null;
+                }
+                return _CountLabel;
+            }
+            set
+            {
+                this.WireUpLabel(ref _CountLabel, value);
+            }
+        }
+
+        /// <summary>
+        /// Indicates the format string for the label which displays the number of items bound.
+        /// </summary>
+        [Description("Indicates the format string for the label which displays the number of items bound."), Category("Appearance")]
+        public string CountLabelFormat
+        {
+            get
+            {
+                return _CountLabelFormat;
+            }
+            set
+            {
+                if (_CountLabelFormat != value)
+                {
+                    _CountLabelFormat = value;
+                    RefreshStateInternal();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the item which deletes current record.
+        /// </summary>
+        [DefaultValue(null), Description("Indicates item which deletes current record."), TypeConverter(typeof(ReferenceConverter)), Category("Items")]
+        public ButtonItem DeleteButton
+        {
+            get
+            {
+                if ((this._DeleteButton != null) && this._DeleteButton.IsDisposed)
+                {
+                    _DeleteButton = null;
+                }
+                return _DeleteButton;
+            }
+            set
+            {
+                if ((this._DeleteButton != value) && (value != null))
+                {
+                    value.EnabledChanged += new EventHandler(this.OnDeleteItemEnabledChanged);
+                    _DeleteButtonUserEnabled = value.Enabled;
+                }
+                this.WireUpButton(ref _DeleteButton, value, new EventHandler(this.OnDelete));
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the item which moves to first record.
+        /// </summary>
+        [DefaultValue(null), TypeConverter(typeof(ReferenceConverter)), Category("Items"), Description("Indicates item which moves to first record.")]
+        public ButtonItem MoveFirstButton
+        {
+            get
+            {
+                if (_MoveFirstButton != null && _MoveFirstButton.IsDisposed)
+                {
+                    _MoveFirstButton = null;
+                }
+                return _MoveFirstButton;
+            }
+            set
+            {
+                WireUpButton(ref _MoveFirstButton, value, this.OnMoveFirst);
+            }
+        }
+        /// <summary>
+        /// Gets or sets the item which moves to last record.
+        /// </summary>
+        [DefaultValue(null), Category("Items"), Description("Indicates item which moves to last record."), TypeConverter(typeof(ReferenceConverter))]
+        public ButtonItem MoveLastButton
+        {
+            get
+            {
+                if ((_MoveLastButton != null) && _MoveLastButton.IsDisposed)
+                {
+                    _MoveLastButton = null;
+                }
+                return _MoveLastButton;
+            }
+            set
+            {
+                this.WireUpButton(ref _MoveLastButton, value, OnMoveLast);
+            }
+        }
+        /// <summary>
+        /// Gets or sets the item which moves to next record.
+        /// </summary>
+        [DefaultValue(null), TypeConverter(typeof(ReferenceConverter)), Category("Items"), Description("Indicates item which moves to next record")]
+        public ButtonItem MoveNextButton
+        {
+            get
+            {
+                if (_MoveNextButton != null && _MoveNextButton.IsDisposed)
+                {
+                    _MoveNextButton = null;
+                }
+                return _MoveNextButton;
+            }
+            set
+            {
+                this.WireUpButton(ref _MoveNextButton, value, new EventHandler(this.OnMoveNext));
+            }
+        }
+        /// <summary>
+        /// Gets or sets the item which moves to previous record.
+        /// </summary>
+        [DefaultValue(null), Description("Indicates item which moves to previous record"), TypeConverter(typeof(ReferenceConverter)), Category("Items")]
+        public ButtonItem MovePreviousButton
+        {
+            get
+            {
+                if (_MovePreviousButton != null && this._MovePreviousButton.IsDisposed)
+                {
+                    _MovePreviousButton = null;
+                }
+                return _MovePreviousButton;
+            }
+            set
+            {
+                this.WireUpButton(ref _MovePreviousButton, value, OnMovePrevious);
+            }
+        }
+        /// <summary>
+        /// Gets or sets the text-box which shows current position.
+        /// </summary>
+        [DefaultValue(null), Category("Items"), Description("Indicates text-box which shows current position."), TypeConverter(typeof(ReferenceConverter))]
+        public TextBoxItem PositionTextBox
+        {
+            get
+            {
+                if (_PositionTextBox != null && _PositionTextBox.IsDisposed)
+                {
+                    _PositionTextBox = null;
+                }
+                return _PositionTextBox;
+            }
+            set
+            {
+                this.WireUpTextBox(ref _PositionTextBox, value, OnPositionKey, OnPositionLostFocus);
+            }
+        }
+        #endregion
+
+        #region ISupportInitialize Members
+
+        void ISupportInitialize.BeginInit()
+        {
+            _Initializing = true;
+        }
+
+        void ISupportInitialize.EndInit()
+        {
+
+            _Initializing = false;
+            this.RefreshStateInternal();
+        }
+
+
+        #endregion
+
+    }
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/Controls/BindingNavigatorEx.ico b/PROMS/DotNetBar Source Code/Controls/BindingNavigatorEx.ico
new file mode 100644
index 00000000..732ac22e
Binary files /dev/null and b/PROMS/DotNetBar Source Code/Controls/BindingNavigatorEx.ico differ
diff --git a/PROMS/DotNetBar Source Code/Controls/CheckBoxX.cs b/PROMS/DotNetBar Source Code/Controls/CheckBoxX.cs
new file mode 100644
index 00000000..4e0270de
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/CheckBoxX.cs	
@@ -0,0 +1,786 @@
+using System;
+using System.Text;
+using System.Drawing;
+using System.ComponentModel;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    /// <summary>
+    /// Represents the Check Box control with extended styles.
+    /// </summary>
+    [ToolboxBitmap(typeof(CheckBoxX), "Controls.CheckBoxX.ico"), ToolboxItem(true), DefaultEvent("CheckedChanged"), System.Runtime.InteropServices.ComVisible(false), Designer("DevComponents.DotNetBar.Design.CheckBoxXDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+    public class CheckBoxX : BaseItemControl, ICommandSource
+    {
+        #region Private Variables
+        private const string DefaultCheckValueUnchecked = "N";
+        private const string DefaultCheckValueChecked = "Y";
+        private const object DefaultCheckValueIndeterminate = null;
+
+        private CheckBoxItem m_CheckBox = null;
+        private object m_CheckValue = DefaultCheckValueUnchecked;
+
+        private object m_CheckValueUnchecked = DefaultCheckValueUnchecked;
+        private object m_CheckValueChecked = DefaultCheckValueChecked;
+        private object m_CheckValueIndeterminate = DefaultCheckValueIndeterminate;
+        private bool m_ConsiderEmptyStringAsNull = true;
+        #endregion
+
+        #region Events
+        /// <summary>
+        /// Occurs before Checked property is changed and allows you to cancel the change.
+        /// </summary>
+        public event CheckBoxXChangeEventHandler CheckedChanging;
+        
+        /// <summary>
+        /// Occurs after Checked property is changed with extended information.
+        /// </summary>
+        public event CheckBoxXChangeEventHandler CheckedChangedEx;
+
+        /// <summary>
+        /// Occurs after Checked property is changed. This event is provided for the Windows Forms data binding support. You can use CheckedChangedEx to get extended information about the changed.
+        /// </summary>
+        public event EventHandler CheckedChanged;
+
+        /// <summary>
+        /// Occurs after Checked property is changed. This event is provided for the Windows Forms data binding support. You can use CheckedChangedEx to get extended information about the changed.
+        /// </summary>
+        public event EventHandler CheckValueChanged;
+        #endregion
+
+        #region Constructor, Dispose
+        public CheckBoxX()
+        {
+            this.SetStyle(ControlStyles.Selectable, true);
+            m_CheckBox = new CheckBoxItem();
+            m_CheckBox.VerticalPadding = 0;
+            m_CheckBox.Style = eDotNetBarStyle.Office2007;
+            m_CheckBox.CheckedChanging += new CheckBoxChangeEventHandler(OnCheckedChanging);
+            m_CheckBox.CheckedChanged += new CheckBoxChangeEventHandler(OnCheckedChanged);
+            this.HostItem = m_CheckBox;
+        }
+
+        #endregion
+
+        #region Internal Implementation
+        /// <summary>
+        /// Gets or sets the size of the check or radio sign. Default value is 13x13. Minimum value is 6x6.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates size of the check or radio sign. Default value is 13x13.")]
+        public Size CheckSignSize
+        {
+            get { return m_CheckBox.CheckSignSize; }
+            set { m_CheckBox.CheckSignSize = value; this.RecalcLayout(); this.Invalidate(); }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeCheckSignSize()
+        {
+            return m_CheckBox.ShouldSerializeCheckSignSize();
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetCheckSignSize()
+        {
+            this.CheckSignSize = new Size(13, 13);
+        }
+
+        /// <summary>
+        /// Gets or sets whether text-markup support is enabled for controls Text property. Default value is true.
+        /// Set this property to false to display HTML or other markup in the control instead of it being parsed as text-markup.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance"), Description("Indicates whether text-markup support is enabled for controls Text property.")]
+        public bool EnableMarkup
+        {
+            get { return m_CheckBox.EnableMarkup; }
+            set
+            {
+                m_CheckBox.EnableMarkup = value;
+            }
+        }
+        protected override MouseButtons MouseDownFocusButtons
+        {
+            get { return MouseButtons.Left | MouseButtons.Right | MouseButtons.Middle | MouseButtons.XButton1 | MouseButtons.XButton2; }
+        }
+        //protected override void OnMouseDown(MouseEventArgs e)
+        //{
+        //    if (!this.Focused)
+        //        this.Select();
+        //    base.OnMouseDown(e);
+        //}
+
+        //protected override void OnEnter(EventArgs e)
+        //{
+        //    if (this.CheckBoxStyle == eCheckBoxStyle.RadioButton && Control.MouseButtons == MouseButtons.None && WinApi.GetKeyState(9) < 0 && this.AutoCheck)
+        //    {
+        //        m_CheckBox.SetChecked(true, eEventSource.Keyboard);
+        //    }
+        //    base.OnEnter(e);
+        //}
+
+        /// <summary>
+        /// Invokes the CheckedChanged event.
+        /// </summary>
+        private void OnCheckedChanged(object sender, CheckBoxChangeEventArgs e)
+        {
+            CheckBoxX previous = null;
+            if (m_CheckBox.CheckBoxStyle == eCheckBoxStyle.RadioButton && m_CheckBox.Checked && this.Parent != null)
+            {
+                foreach (Control c in this.Parent.Controls)
+                {
+                    if (c == this)
+                    {
+                        //c.TabStop = true;
+                        continue;
+                    }
+                    CheckBoxX b = c as CheckBoxX;
+                    if (b != null && b.Checked && b.CheckBoxStyle == eCheckBoxStyle.RadioButton)
+                    {
+                        b.Checked = false;
+                        //b.TabStop = false;
+                        previous = b;
+                    }
+                }
+            }
+
+            if (this.Command != null)
+                this.Command.Checked = this.Checked;
+
+            CheckBoxXChangeEventArgs e1 = new CheckBoxXChangeEventArgs(previous, this, e.EventSource);
+
+            if (CheckedChangedEx != null)
+                CheckedChangedEx(this, e1);
+
+            if (CheckedChanged != null)
+                CheckedChanged(this, new EventArgs());
+
+            if (GetCheckState(m_CheckValue) != this.CheckState)
+                m_CheckValue = GetCheckValue(this.CheckState);
+
+            if (CheckValueChanged != null)
+                CheckValueChanged(this, new EventArgs());
+
+            ExecuteCommand();
+        }
+
+        /// <summary>
+        /// Invokes CheckedChanging event.
+        /// </summary>
+        private void OnCheckedChanging(object sender, CheckBoxChangeEventArgs e)
+        {
+            CheckBoxXChangeEventArgs e1 = new CheckBoxXChangeEventArgs(null, this, e.EventSource);
+
+            if (m_CheckBox.CheckBoxStyle == eCheckBoxStyle.RadioButton && !m_CheckBox.Checked && this.Parent != null)
+            {
+                CheckBoxX b = null;
+                foreach (Control c in this.Parent.Controls)
+                {
+                    if (c == this)
+                        continue;
+                    b = c as CheckBoxX;
+                    if (b != null && b.Checked && b.CheckBoxStyle == eCheckBoxStyle.RadioButton)
+                    {
+                        break;
+                    }
+                }
+                e1 = new CheckBoxXChangeEventArgs(b, this, e.EventSource);
+            }
+
+            if (CheckedChanging != null)
+            {
+                CheckedChanging(this, e1);
+                e.Cancel = e1.Cancel;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the appearance style of the item. Default value is CheckBox. Item can also assume the style of radio-button.
+        /// </summary>
+        [Browsable(true), DefaultValue(eCheckBoxStyle.CheckBox), Category("Appearance"), Description("Indicates appearance style of the item. Default value is CheckBox. Item can also assume the style of radio-button.")]
+        public eCheckBoxStyle CheckBoxStyle
+        {
+            get { return m_CheckBox.CheckBoxStyle; }
+            set
+            {
+                m_CheckBox.CheckBoxStyle = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the check box position relative to the text. Default value is Left.
+        /// </summary>
+        [Browsable(true), DefaultValue(eCheckBoxPosition.Left), Category("Appearance"), Description("Indicates the check box position relative to the text.")]
+        public eCheckBoxPosition CheckBoxPosition
+        {
+            get { return m_CheckBox.CheckBoxPosition; }
+            set
+            {
+                m_CheckBox.CheckBoxPosition = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or set a value indicating whether the button is in the checked state.
+        /// </summary>
+        [Browsable(true), Bindable(true), DevCoBrowsable(true), Category("Appearance"), Description("Indicates whether item is checked or not."), DefaultValue(false)]
+        public virtual bool Checked
+        {
+            get
+            {
+                return m_CheckBox.Checked;
+            }
+            set
+            {
+                m_CheckBox.Checked = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether text assigned to the check box is visible. Default value is true.
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Appearance"), Description("Indicates whether text assigned to the check box is visible.")]
+        public bool TextVisible
+        {
+            get { return m_CheckBox.TextVisible; }
+            set
+            {
+                m_CheckBox.TextVisible = value;
+                this.RecalcLayout();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the text color. Default value is Color.Empty which indicates that default color is used.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), Description("Indicates text color.")]
+        public Color TextColor
+        {
+            get { return m_CheckBox.TextColor; }
+            set
+            {
+                m_CheckBox.TextColor = value;
+            }
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeTextColor()
+        {
+            return !m_CheckBox.TextColor.IsEmpty;
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetTextColor()
+        {
+            this.TextColor = Color.Empty;
+        }
+
+        [Browsable(false)]
+        public override Color ForeColor
+        {
+            get
+            {
+                return base.ForeColor;
+            }
+            set
+            {
+                base.ForeColor = value;
+            }
+        }
+
+        protected override void OnKeyDown(KeyEventArgs e)
+        {
+            if (e.KeyCode == Keys.Space && this.Enabled && this.AutoCheck)
+            {
+                if (this.CheckBoxStyle == eCheckBoxStyle.CheckBox)
+                    SetChecked(!this.Checked, eEventSource.Keyboard);
+                else if (!this.Checked)
+                    SetChecked(true, eEventSource.Keyboard);
+            }
+            base.OnKeyDown(e);
+        }
+
+        private void SetChecked(bool newValue, eEventSource source)
+        {
+            m_CheckBox.SetChecked(newValue, source);
+        }
+
+        private void SetChecked(CheckState newValue, eEventSource source)
+        {
+            m_CheckBox.SetChecked(newValue, source);
+        }
+
+        /// <summary>
+        /// Gets or sets the text associated with the control.
+        /// </summary>
+        [Browsable(true), Editor("DevComponents.DotNetBar.Design.TextMarkupUIEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), Category("Appearance"), Description("Indicates text associated with this button.."), Localizable(true), DefaultValue("")]
+        public override string Text
+        {
+            get { return base.Text; }
+            set { base.Text = value; }
+        }
+
+#if FRAMEWORK20
+        [Localizable(true), Browsable(false)]
+        public new System.Windows.Forms.Padding Padding
+        {
+            get { return base.Padding; }
+            set { base.Padding = value; }
+        }
+
+        public override Size GetPreferredSize(Size proposedSize)
+        {
+            if (!BarFunctions.IsHandleValid(this))
+                return base.GetPreferredSize(proposedSize);
+            if (this.Text.Length == 0)
+                return base.GetPreferredSize(proposedSize);
+
+            m_CheckBox.RecalcSize();
+            Size s = m_CheckBox.Size;
+            s.Width += 2;
+            s.Height += 2;
+            if (!this.TextVisible) s.Width += 2;
+            m_CheckBox.Bounds = GetItemBounds();
+            return s;
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the control is automatically resized to display its entire contents. You can set MaximumSize.Width property to set the maximum width used by the control.
+        /// </summary>
+        [Browsable(true), DefaultValue(false), EditorBrowsable(EditorBrowsableState.Always), DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
+        public override bool AutoSize
+        {
+            get
+            {
+                return base.AutoSize;
+            }
+            set
+            {
+                if (this.AutoSize != value)
+                {
+                    base.AutoSize = value;
+                    AdjustSize();
+                }
+            }
+        }
+
+        protected override void SetBoundsCore(int x, int y, int width, int height, BoundsSpecified specified)
+        {
+            if (this.AutoSize)
+            {
+                Size preferredSize = base.PreferredSize;
+                width = preferredSize.Width;
+                height = preferredSize.Height;
+            }
+            base.SetBoundsCore(x, y, width, height, specified);
+        }
+
+        private void AdjustSize()
+        {
+            if (this.AutoSize)
+            {
+                this.Size = base.PreferredSize;
+            }
+        }
+
+        protected override void OnTextChanged(EventArgs e)
+        {
+            base.OnTextChanged(e);
+            this.AdjustSize();
+        }
+
+        protected override void OnHandleCreated(EventArgs e)
+        {
+            base.OnHandleCreated(e);
+            if (this.AutoSize)
+                this.AdjustSize();
+        }
+#endif
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the CheckBox will allow three check states rather than two. If the ThreeState property is set to true
+        /// CheckState property should be used instead of Checked property to set the extended state of the control.
+        /// </summary>
+        [Browsable(true), Category("Behavior"), DefaultValue(false), Description("Indicates whether the CheckBox will allow three check states rather than two.")]
+        public bool ThreeState
+        {
+            get { return m_CheckBox.ThreeState; }
+            set { m_CheckBox.ThreeState = value; }
+        }
+
+        /// <summary>
+        /// Specifies the state of a control, such as a check box, that can be checked, unchecked, or set to an indeterminate state. 
+        /// </summary>
+        [Browsable(true), Category("Behavior"), DefaultValue(CheckState.Unchecked), Description("Specifies the state of a control, such as a check box, that can be checked, unchecked, or set to an indeterminate state")]
+        public CheckState CheckState
+        {
+            get { return m_CheckBox.CheckState; }
+            set { m_CheckBox.CheckState = value; }
+        }
+
+        /// <summary>
+        /// Gets the underlying CheckBoxItem
+        /// </summary>
+        internal CheckBoxItem CheckBoxItem
+        {
+            get { return (m_CheckBox); }
+        }
+
+        private bool _EnableMnemonicWithAltKeyOnly = false;
+        /// <summary>
+        /// Gets or sets whether mnemonic character assigned to control is processed only if Alt key is pressed. Default value is false which indicate that Alt key is not required.
+        /// </summary>
+        [DefaultValue(false), Category("Behavior"), Description("Indicates whether mnemonic character assigned to control is processed only if Alt key is pressed")]
+        public bool EnableMnemonicWithAltKeyOnly
+        {
+            get { return _EnableMnemonicWithAltKeyOnly; }
+            set
+            {
+                _EnableMnemonicWithAltKeyOnly = value;
+            }
+        }
+
+        protected override bool ProcessMnemonic(char charCode)
+        {
+            if (AutoCheck && CanSelect && IsMnemonic(charCode, this.Text) && this.Enabled &&
+                (!_EnableMnemonicWithAltKeyOnly || Control.ModifierKeys == Keys.Alt || this.Focused) && !m_CheckBox.IsUsingTextMarkup)
+            {
+                if (Focus())
+                {
+                    if (this.CheckBoxStyle == eCheckBoxStyle.CheckBox)
+                        SetChecked(!this.Checked, eEventSource.Keyboard);
+                    else if (!this.Checked)
+                        SetChecked(true, eEventSource.Keyboard);
+                    return true;
+                }
+            }
+            return false;
+        }
+        #endregion
+
+        #region Data-Binding Support
+        /// <summary>
+        /// Gets or set whether the Checked values and the item appearance are automatically changed when the Check-Box is clicked. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether the Checked values and the item appearance are automatically changed when the Check-Box is clicked.")]
+        public bool AutoCheck
+        {
+            get { return m_CheckBox.AutoCheck; }
+            set
+            {
+                m_CheckBox.AutoCheck = value;
+            }
+        }
+        /// <summary>
+        /// Gets or sets the object that represents the Checked state of control.
+        /// </summary>
+        [DefaultValue("N"), Bindable(true), RefreshProperties(RefreshProperties.All), TypeConverter(typeof(StringConverter)), Description("Indicates object that represents the Checked state of control.")]
+        public object CheckValue
+        {
+            get { return m_CheckValue; }
+            set
+            {
+                m_CheckValue = value;
+                OnCheckValueChanged();
+            }
+        }
+
+        private void OnCheckValueChanged()
+        {
+            CheckState cs = GetCheckState(m_CheckValue);
+            this.CheckState = cs;
+        }
+
+        private bool IsNull(object value)
+        {
+            return value == null || value is string && (string)value == string.Empty && m_ConsiderEmptyStringAsNull ||
+                value == DBNull.Value;
+        }
+
+        private object GetCheckValue(CheckState cs)
+        {
+            if (cs == CheckState.Indeterminate)
+                return m_CheckValueIndeterminate;
+
+            if (cs == CheckState.Unchecked)
+                return m_CheckValueUnchecked;
+
+            return m_CheckValueChecked;
+        }
+
+        private CheckState GetCheckState(object value)
+        {
+            if (m_CheckValueIndeterminate == null && IsNull(value) || m_CheckValueIndeterminate!=null && m_CheckValueIndeterminate.Equals(value))
+            {
+                return CheckState.Indeterminate;
+            }
+            else if (m_CheckValueChecked == null && IsNull(value) || m_CheckValueChecked!=null && m_CheckValueChecked.Equals(value))
+            {
+                return CheckState.Checked;
+            }
+            else if (m_CheckValueUnchecked == null && IsNull(value) || m_CheckValueUnchecked!=null && m_CheckValueUnchecked.Equals(value))
+            {
+                return CheckState.Unchecked;
+            }
+            else
+            {
+                if (value is System.Data.SqlTypes.SqlBoolean)
+                {
+                    System.Data.SqlTypes.SqlBoolean sqlBool = (System.Data.SqlTypes.SqlBoolean)value;
+                    if (sqlBool.IsTrue)
+                        return CheckState.Checked;
+                    else if (sqlBool.IsNull)
+                        return CheckState.Indeterminate;
+                    else
+                        return CheckState.Unchecked;
+                }
+                else if (value is int? && this.ThreeState)
+                {
+                    if (value == null) return CheckState.Indeterminate;
+                    if (((int?)value).Value == 0)
+                        return CheckState.Unchecked;
+                    return CheckState.Checked;
+                }
+                else if (value is int)
+                {
+                    if (this.ThreeState && (int)value == -1)
+                        return CheckState.Indeterminate;
+                    return ((int)value) == 0 ? CheckState.Unchecked : CheckState.Checked;
+                }
+                else if (value is long)
+                {
+                    if (this.ThreeState && (long)value == -1)
+                        return CheckState.Indeterminate;
+                    return ((long)value) == 0 ? CheckState.Unchecked : CheckState.Checked;
+                }
+                else if (value is short)
+                {
+                    if (this.ThreeState && (short)value == -1)
+                        return CheckState.Indeterminate;
+                    return ((short)value) == 0 ? CheckState.Unchecked : CheckState.Checked;
+                }
+                else if (value is float)
+                {
+                    if (this.ThreeState && (float)value == -1)
+                        return CheckState.Indeterminate;
+                    return ((float)value) == 0 ? CheckState.Unchecked : CheckState.Checked;
+                }
+                else if (value is double)
+                {
+                    if (this.ThreeState && (double)value == -1)
+                        return CheckState.Indeterminate;
+                    return ((double)value) == 0 ? CheckState.Unchecked : CheckState.Checked;
+                }
+                else if (value is byte)
+                {
+                    return ((byte)value) == 0 ? CheckState.Unchecked : CheckState.Checked;
+                }
+                else if (value is uint)
+                {
+                    return ((uint)value) == 0 ? CheckState.Unchecked : CheckState.Checked;
+                }
+                else if (value is ulong)
+                {
+                    return ((ulong)value) == 0 ? CheckState.Unchecked : CheckState.Checked;
+                }
+                else if (value is bool)
+                {
+                    return ((bool)value) == false ? CheckState.Unchecked : CheckState.Checked;
+                }
+                
+                return CheckState.Indeterminate;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether empty string is consider as null value during CheckValue value comparison. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Browsable(true), Description("Indicates whether empty string is consider as null value during CheckValue value comparison.")]
+        public bool ConsiderEmptyStringAsNull
+        {
+            get { return m_ConsiderEmptyStringAsNull; }
+            set { m_ConsiderEmptyStringAsNull = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the value that represents the Indeterminate state of check box when CheckValue property is set to that value. Default value is null.
+        /// </summary>
+        [Browsable(true), DefaultValue(null), Category("Behavior"), TypeConverter(typeof(StringConverter)), Description("Represents the Indeterminate state value of check box when CheckValue property is set to that value")]
+        public object CheckValueIndeterminate
+        {
+            get { return m_CheckValueIndeterminate; }
+            set { m_CheckValueIndeterminate = value; OnCheckValueChanged(); }
+        }
+
+        /// <summary>
+        /// Gets or sets the value that represents the Checked state of check box when CheckValue property is set to that value. Default value is null.
+        /// </summary>
+        [Browsable(true), DefaultValue("Y"), Category("Behavior"), TypeConverter(typeof(StringConverter)), Description("Represents the Checked state value of check box when CheckValue property is set to that value")]
+        public object CheckValueChecked
+        {
+            get { return m_CheckValueChecked; }
+            set { m_CheckValueChecked = value; OnCheckValueChanged(); }
+        }
+
+        /// <summary>
+        /// Gets or sets the value that represents the Unchecked state of check box when CheckValue property is set to that value. Default value is null.
+        /// </summary>
+        [Browsable(true), DefaultValue("N"), Category("Behavior"), TypeConverter(typeof(StringConverter)), Description("Represents the Unchecked state value of check box when CheckValue property is set to that value")]
+        public object CheckValueUnchecked
+        {
+            get { return m_CheckValueUnchecked; }
+            set { m_CheckValueUnchecked = value; OnCheckValueChanged(); }
+        }
+
+        /// <summary>
+        /// Gets or sets the custom image that is displayed instead default check box representation when check box is checked.
+        /// </summary>
+        [DefaultValue(null), Category("CheckBox Images"), Description("Indicates custom image that is displayed instead default check box representation when check box is checked")]
+        public Image CheckBoxImageChecked
+        {
+            get { return m_CheckBox.CheckBoxImageChecked; }
+            set
+            {
+                m_CheckBox.CheckBoxImageChecked = value;
+            }
+        }
+        /// <summary>
+        /// Gets or sets the custom image that is displayed instead default check box representation when check box is unchecked.
+        /// </summary>
+        [DefaultValue(null), Category("CheckBox Images"), Description("Indicates custom image that is displayed instead default check box representation when check box is unchecked")]
+        public Image CheckBoxImageUnChecked
+        {
+            get { return m_CheckBox.CheckBoxImageUnChecked; }
+            set
+            {
+                m_CheckBox.CheckBoxImageUnChecked = value;
+            }
+        }
+        /// <summary>
+        /// Gets or sets the custom image that is displayed instead default check box representation when check box is in indeterminate state.
+        /// </summary>
+        [DefaultValue(null), Category("CheckBox Images"), Description("Indicates custom image that is displayed instead default check box representation when check box is in indeterminate state")]
+        public Image CheckBoxImageIndeterminate
+        {
+            get { return m_CheckBox.CheckBoxImageIndeterminate; }
+            set
+            {
+                m_CheckBox.CheckBoxImageIndeterminate = value;
+            }
+        }
+        #endregion
+
+        #region ICommandSource Members
+        protected virtual void ExecuteCommand()
+        {
+            if (_Command == null) return;
+            CommandManager.ExecuteCommand(this);
+        }
+
+        /// <summary>
+        /// Gets or sets the command assigned to the item. Default value is null.
+        /// <remarks>Note that if this property is set to null Enabled property will be set to false automatically to disable the item.</remarks>
+        /// </summary>
+        [DefaultValue(null), Category("Commands"), Description("Indicates the command assigned to the item.")]
+        public Command Command
+        {
+            get { return (Command)((ICommandSource)this).Command; }
+            set
+            {
+                ((ICommandSource)this).Command = value;
+            }
+        }
+
+        private ICommand _Command = null;
+        //[Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        ICommand ICommandSource.Command
+        {
+            get
+            {
+                return _Command;
+            }
+            set
+            {
+                bool changed = false;
+                if (_Command != value)
+                    changed = true;
+
+                if (_Command != null)
+                    CommandManager.UnRegisterCommandSource(this, _Command);
+                _Command = value;
+                if (value != null)
+                    CommandManager.RegisterCommand(this, value);
+                if (changed)
+                    OnCommandChanged();
+            }
+        }
+
+        /// <summary>
+        /// Called when Command property value changes.
+        /// </summary>
+        protected virtual void OnCommandChanged()
+        {
+            Command command = this.Command;
+            if (command != null && command.Checked != this.Checked)
+            {
+                SetChecked(command.Checked, eEventSource.Code);
+            }
+        }
+
+        private object _CommandParameter = null;
+        /// <summary>
+        /// Gets or sets user defined data value that can be passed to the command when it is executed.
+        /// </summary>
+        [Browsable(true), DefaultValue(null), Category("Commands"), Description("Indicates user defined data value that can be passed to the command when it is executed."), System.ComponentModel.TypeConverter(typeof(System.ComponentModel.StringConverter)), System.ComponentModel.Localizable(true)]
+        public object CommandParameter
+        {
+            get
+            {
+                return _CommandParameter;
+            }
+            set
+            {
+                _CommandParameter = value;
+            }
+        }
+
+        #endregion
+    }
+
+    /// <summary>
+    /// Delegate for OptionGroupChanging event.
+    /// </summary>
+    public delegate void CheckBoxXChangeEventHandler(object sender, CheckBoxXChangeEventArgs e);
+
+    #region CheckBoxXChangeEventArgs
+    /// <summary>
+    /// Represents event arguments for OptionGroupChanging event.
+    /// </summary>
+    public class CheckBoxXChangeEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Set to true to cancel the checking on NewChecked button.
+        /// </summary>
+        public bool Cancel = false;
+        /// <summary>
+        /// Check-box that will become checked if operation is not cancelled.
+        /// </summary>
+        public readonly CheckBoxX NewChecked;
+        /// <summary>
+        /// Check-box that is currently checked and which will be unchecked if operation is not cancelled. This property will have only valid values for eCheckBoxStyle.RadioButton style CheckBoxItems.
+        /// </summary>
+        public readonly CheckBoxX OldChecked;
+        /// <summary>
+        /// Indicates the action that has caused the event.
+        /// </summary>
+        public readonly eEventSource EventSource = eEventSource.Code;
+
+        /// <summary>
+        /// Default constructor.
+        /// </summary>
+        public CheckBoxXChangeEventArgs(CheckBoxX oldchecked, CheckBoxX newchecked, eEventSource eventSource)
+        {
+            NewChecked = newchecked;
+            OldChecked = oldchecked;
+            EventSource = eventSource;
+        }
+    }
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/CheckBoxX.ico b/PROMS/DotNetBar Source Code/Controls/CheckBoxX.ico
new file mode 100644
index 00000000..4d82de2b
Binary files /dev/null and b/PROMS/DotNetBar Source Code/Controls/CheckBoxX.ico differ
diff --git a/PROMS/DotNetBar Source Code/Controls/CircularProgress.cs b/PROMS/DotNetBar Source Code/Controls/CircularProgress.cs
new file mode 100644
index 00000000..f9e6a162
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/CircularProgress.cs	
@@ -0,0 +1,474 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel;
+using System.Drawing;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    [ToolboxBitmap(typeof(CircularProgress), "Controls.CircularProgress.ico"), ToolboxItem(true), DefaultEvent("ValueChanged")]
+    public class CircularProgress : BaseItemControl
+    {
+        #region Constructor
+        private CircularProgressItem _Item = null;
+        /// <summary>
+        /// Initializes a new instance of the CircularProgress class.
+        /// </summary>
+        public CircularProgress()
+        {
+            _Item = new CircularProgressItem();
+            _Item.ValueChanged += new EventHandler(ItemValueChanged);
+            _Item.TextVisible = false;
+            this.HostItem = _Item;
+        }
+        #endregion
+
+        #region Implementation
+        protected override void Dispose(bool disposing)
+        {
+            _Item.Dispose();
+            base.Dispose(disposing);
+        }
+        protected override void RecalcSize()
+        {
+            _Item.Diameter = Math.Min(this.Width, this.Height);
+            base.RecalcSize();
+        }
+        private void ItemValueChanged(object sender, EventArgs e)
+        {
+            OnValueChanged(e);
+        }
+        /// <summary>
+        /// Occurs when Value property has changed.
+        /// </summary>
+        public event EventHandler ValueChanged;
+        /// <summary>
+        /// Raises ValueChanged event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnValueChanged(EventArgs e)
+        {
+            EventHandler handler = ValueChanged;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        /// <summary>
+        /// Gets or sets the circular progress bar type.
+        /// </summary>
+        [DefaultValue(eCircularProgressType.Line), Category("Appearance"), Description("Indicates circular progress bar type.")]
+        public eCircularProgressType ProgressBarType
+        {
+            get { return _Item.ProgressBarType; }
+            set
+            {
+                _Item.ProgressBarType = value;
+            }
+        }
+        /// <summary>
+        /// Gets or sets the maximum value of the progress bar.
+        /// </summary>
+        [Description("Indicates maximum value of the progress bar."), Category("Behavior"), DefaultValue(100)]
+        public int Maximum
+        {
+            get { return _Item.Maximum; }
+            set
+            {
+                _Item.Maximum = value;
+            }
+        }
+        /// <summary>
+        /// Gets or sets the minimum value of the progress bar.
+        /// </summary>
+        [Description("Indicates minimum value of the progress bar."), Category("Behavior"), DefaultValue(0)]
+        public int Minimum
+        {
+            get { return _Item.Minimum; }
+            set
+            {
+                _Item.Minimum = value;
+            }
+        }
+        /// <summary>
+        /// Gets or sets the color of the progress percentage text.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates color of progress percentage text")]
+        public Color ProgressTextColor
+        {
+            get { return _Item.ProgressTextColor; }
+            set { _Item.ProgressTextColor = value; }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeProgressTextColor()
+        {
+            return _Item.ShouldSerializeProgressTextColor();
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetProgressTextColor()
+        {
+            _Item.ResetProgressTextColor();
+        }
+
+        /// <summary>
+        /// Gets or sets whether text that displays the progress bar completion percentage text is visible. Default value is false.
+        /// </summary>
+        [DefaultValue(false), Category("Appearance"), Description("Indicates whether text that displays the progress bar completion percentage text is visible")]
+        public bool ProgressTextVisible
+        {
+            get { return _Item.ProgressTextVisible; }
+            set
+            {
+                _Item.ProgressTextVisible = value;
+            }
+        }
+        /// <summary>
+        /// Gets or sets the text displayed on top of the circular progress bar.
+        /// </summary>
+        [DefaultValue(""), Category("Appearance"), Description("Indicates text displayed on top of the circular progress bar.")]
+        public string ProgressText
+        {
+            get { return _Item.ProgressText; }
+            set
+            {
+                _Item.ProgressText = value;
+            }
+        }
+        /// <summary>
+        /// Gets or sets the current value of the progress bar.
+        /// </summary>
+        [Description("Indicates current value of the progress bar."), Category("Behavior"), DefaultValue(0)]
+        public int Value
+        {
+            get { return _Item.Value; }
+            set
+            {
+                _Item.Value = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether endless type progress bar is running.
+        /// </summary>
+        [Browsable(false), DefaultValue(false)]
+        public bool IsRunning
+        {
+            get { return _Item.IsRunning; }
+            set
+            {
+                _Item.IsRunning = value;
+            }
+        }
+        /// <summary>
+        /// Gets or sets the color of the color of progress indicator.
+        /// </summary>
+        [Category("Columns"), Description("Indicates color of progress indicator.")]
+        public Color ProgressColor
+        {
+            get { return _Item.ProgressColor; }
+            set { _Item.ProgressColor = value; }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeProgressColor()
+        {
+            return _Item.ShouldSerializeProgressColor();
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetProgressColor()
+        {
+            _Item.ResetProgressColor();
+        }
+
+        ///// <summary>
+        ///// Gets or sets circular progress indicator diameter in pixels.
+        ///// </summary>
+        //[DefaultValue(24), Category("Appearance"), Description("Indicates circular progress indicator diameter in pixels.")]
+        //public int Diameter
+        //{
+        //    get { return _Item.Diameter; }
+        //    set
+        //    {
+        //        _Item.Diameter = value;
+        //        this.RecalcLayout();
+        //    }
+        //}
+        ///// <summary>
+        ///// Gets or sets the text position in relation to the circular progress indicator.
+        ///// </summary>
+        //[DefaultValue(eTextPosition.Left), Category("Appearance"), Description("Indicatesd text position in relation to the circular progress indicator.")]
+        //public eTextPosition TextPosition
+        //{
+        //    get { return _Item.TextPosition; }
+        //    set
+        //    {
+        //        _Item.TextPosition = value;
+        //    }
+        //}
+        ///// <summary>
+        ///// Gets or sets whether text/label displayed next to the item is visible. 
+        ///// </summary>
+        //[DefaultValue(true), Category("Appearance"), Description("Indicates whether caption/label set using Text property is visible.")]
+        //public bool TextVisible
+        //{
+        //    get { return _Item.TextVisible; }
+        //    set
+        //    {
+        //        _Item.TextVisible = value;
+        //    }
+        //}
+        ///// <summary>
+        ///// Gets or sets the suggested text-width. If you want to make sure that text you set wraps over multiple lines you can set suggested text-width so word break is performed.
+        ///// </summary>
+        //[DefaultValue(0), Category("Appearance"), Description("Indicates suggested text-width. If you want to make sure that text you set wraps over multiple lines you can set suggested text-width so word break is performed.")]
+        //public int TextWidth
+        //{
+        //    get { return _Item.TextWidth; }
+        //    set
+        //    {
+        //        _Item.TextWidth = value;
+        //    }
+        //}
+
+        ///// <summary>
+        ///// Gets or sets text padding.
+        ///// </summary>
+        //[Browsable(true), Category("Appearance"), Description("Gets or sets text padding."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        //public Padding TextPadding
+        //{
+        //    get { return _Item.TextPadding; }
+        //}
+        //[EditorBrowsable(EditorBrowsableState.Never)]
+        //public bool ShouldSerializeTextPadding()
+        //{
+        //    return _Item.ShouldSerializeTextPadding();
+        //}
+        //[EditorBrowsable(EditorBrowsableState.Never)]
+        //public void ResetTextPadding()
+        //{
+        //    _Item.ResetTextPadding();
+        //}
+
+        //protected override void OnForeColorChanged(EventArgs e)
+        //{
+        //    _Item.TextColor = this.ForeColor;
+        //    base.OnForeColorChanged(e);
+        //}
+
+        /// <summary>
+        /// Gets or sets the color of the pie progress bar dark border. 
+        /// </summary>
+        [Category("Pie"), Description("Indicates color of pie progress bar dark border.")]
+        public Color PieBorderDark
+        {
+            get { return _Item.PieBorderDark; }
+            set { _Item.PieBorderDark = value; }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializePieBorderDark()
+        {
+            return _Item.ShouldSerializePieBorderDark();
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetPieBorderDark()
+        {
+            _Item.ResetPieBorderDark();
+        }
+        /// <summary>
+        /// Gets or sets the color of the pie progress bar light border. 
+        /// </summary>
+        [Category("Pie"), Description("Indicates color of pie progress bar light border. ")]
+        public Color PieBorderLight
+        {
+            get { return _Item.PieBorderLight; }
+            set { _Item.PieBorderLight = value; }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializePieBorderLight()
+        {
+            return _Item.ShouldSerializePieBorderLight();
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetPieBorderLight()
+        {
+            _Item.ResetPieBorderLight();
+        }
+
+        /// <summary>
+        /// Gets or sets the color of the spoke progress bar dark border.
+        /// </summary>
+        [Category("Spoke"), Description("Indicates color of spoke progress bar dark border.")]
+        public Color SpokeBorderDark
+        {
+            get { return _Item.SpokeBorderDark; }
+            set { _Item.SpokeBorderDark = value; }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeSpokeBorderDark()
+        {
+            return _Item.ShouldSerializeSpokeBorderDark();
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetSpokeBorderDark()
+        {
+            _Item.ResetSpokeBorderDark();
+        }
+        /// <summary>
+        /// Gets or sets the color of the spoke progress bar light border.
+        /// </summary>
+        [Category("Spoke"), Description("Indicates color of spoke progress bar light border..")]
+        public Color SpokeBorderLight
+        {
+            get { return _Item.SpokeBorderLight; }
+            set { _Item.SpokeBorderLight = value; }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeSpokeBorderLight()
+        {
+            return _Item.ShouldSerializeSpokeBorderLight();
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetSpokeBorderLight()
+        {
+            _Item.ResetSpokeBorderLight();
+        }
+
+        /// <summary>
+        /// Gets or sets format string for progress value.
+        /// </summary>
+        [DefaultValue("{0}%"), Category("Appearance"), Description("Indicates format string for progress value.")]
+        public string ProgressTextFormat
+        {
+            get { return _Item.ProgressTextFormat; }
+            set
+            {
+                _Item.ProgressTextFormat = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the animation speed for endless running progress. Lower number means faster running.
+        /// </summary>
+        [DefaultValue(100), Description("Indicates the animation speed for endless running progress. Lower number means faster running."), Category("Behavior")]
+        public int AnimationSpeed
+        {
+            get
+            {
+                return _Item.AnimationSpeed;
+            }
+            set
+            {
+            	_Item.AnimationSpeed = value;
+            }
+        }
+
+        /// <summary>
+        /// Starts the progress bar loop for endless type progress bar. Progress bar will continue to run until Stop() method is called.
+        /// </summary>
+        public void Start()
+        {
+            _Item.Start();
+        }
+
+        /// <summary>
+        /// Stops the progress bar loop for endless type progress bar.
+        /// </summary>
+        public void Stop()
+        {
+            _Item.Stop(false);
+        }
+        #endregion
+
+        #region Property-Hiding
+        [Browsable(false)]
+        public override eDotNetBarStyle Style
+        {
+            get { return base.Style; }
+            set { base.Style = value;}
+        }
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override Color ForeColor
+        {
+            get { return base.ForeColor; }
+            set { base.ForeColor = value; }
+        }
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override RightToLeft RightToLeft
+        {
+            get { return base.RightToLeft; }
+            set { base.RightToLeft = value; }
+        }
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override string Text
+        {
+            get
+            {
+                return base.Text;
+            }
+            set
+            {
+                base.Text = value;
+            }
+        }
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override Image BackgroundImage
+        {
+            get
+            {
+                return base.BackgroundImage;
+            }
+            set
+            {
+                base.BackgroundImage = value;
+            }
+        }
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override ImageLayout BackgroundImageLayout
+        {
+            get
+            {
+                return base.BackgroundImageLayout;
+            }
+            set
+            {
+                base.BackgroundImageLayout = value;
+            }
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/CircularProgress.ico b/PROMS/DotNetBar Source Code/Controls/CircularProgress.ico
new file mode 100644
index 00000000..83dae94e
Binary files /dev/null and b/PROMS/DotNetBar Source Code/Controls/CircularProgress.ico differ
diff --git a/PROMS/DotNetBar Source Code/Controls/CollapsibleSplitContainer.cs b/PROMS/DotNetBar Source Code/Controls/CollapsibleSplitContainer.cs
new file mode 100644
index 00000000..2a5f91dd
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/CollapsibleSplitContainer.cs	
@@ -0,0 +1,558 @@
+using DevComponents.DotNetBar.Rendering;
+using DevComponents.Editors;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Reflection;
+using System.Text;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    [ToolboxBitmap(typeof(CollapsibleSplitContainer), "Controls.CollapsibleSplitContainer.ico")]
+    public class CollapsibleSplitContainer : SplitContainer
+    {
+        #region Constructor
+        /// <summary>
+        /// Initializes a new instance of the CollapsibleSplitContainer class.
+        /// </summary>
+        public CollapsibleSplitContainer()
+        {
+            ControlStyles cs = ControlStyles.ResizeRedraw | ControlStyles.AllPaintingInWmPaint | ControlStyles.UserPaint | ControlStyles.OptimizedDoubleBuffer;
+            this.SetStyle(cs, true);
+            object[] objArgs = new object[] { cs, true };
+            MethodInfo mi = typeof(Control).GetMethod("SetStyle", BindingFlags.NonPublic | BindingFlags.Instance);
+            if (mi != null)
+            {
+                mi.Invoke(this.Panel1, objArgs);
+                mi.Invoke(this.Panel2, objArgs);
+            }
+            this.SplitterWidth = 20;
+            _OverrideCursorPropInfo = typeof(SplitContainer).GetProperty("OverrideCursor", BindingFlags.NonPublic | BindingFlags.Instance);
+
+            this.SplitterMoved += SplitterMovedHandler;
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            this.SplitterMoved -= SplitterMovedHandler;
+            base.Dispose(disposing);
+        }
+        #endregion
+
+        #region Implementation
+        private Rectangle _NearCollapseButton = Rectangle.Empty;
+        private Rectangle _FarCollapseButton = Rectangle.Empty;
+        private eButtonState _NearCollapseButtonState = eButtonState.Normal, _FarCollapseButtonState = eButtonState.Normal;
+        private const int ButtonSpacing = 2;
+
+        private void UpdateButtonLayout()
+        {
+            Rectangle r = this.SplitterRectangle;
+            Size buttonSize = new Size(this.SplitterWidth, this.SplitterWidth);
+            if (this.Orientation == System.Windows.Forms.Orientation.Horizontal)
+            {
+                if (_ButtonPosition == eSplitterButtonPosition.Near)
+                {
+                    _NearCollapseButton = new Rectangle(r.X, r.Y, buttonSize.Width, buttonSize.Height);
+                    _FarCollapseButton = new Rectangle(_NearCollapseButton.Right + ButtonSpacing, r.Y, buttonSize.Width, buttonSize.Height);
+                }
+                else if (_ButtonPosition == eSplitterButtonPosition.Center)
+                {
+                    _NearCollapseButton = new Rectangle(r.X + (r.Width - (buttonSize.Width * 2 + ButtonSpacing)) / 2, r.Y, buttonSize.Width, buttonSize.Height);
+                    _FarCollapseButton = new Rectangle(_NearCollapseButton.Right + ButtonSpacing, r.Y, buttonSize.Width, buttonSize.Height);
+                }
+                else if (_ButtonPosition == eSplitterButtonPosition.Far)
+                {
+                    _NearCollapseButton = new Rectangle(r.Right - buttonSize.Width * 2 - ButtonSpacing, r.Y, buttonSize.Width, buttonSize.Height);
+                    _FarCollapseButton = new Rectangle(_NearCollapseButton.Right + ButtonSpacing, r.Y, buttonSize.Width, buttonSize.Height);
+                }
+            }
+            else
+            {
+                if (_ButtonPosition == eSplitterButtonPosition.Near)
+                {
+                    _NearCollapseButton = new Rectangle(r.X, r.Y, buttonSize.Width, buttonSize.Height);
+                    _FarCollapseButton = new Rectangle(r.X, _NearCollapseButton.Bottom + ButtonSpacing, buttonSize.Width, buttonSize.Height);
+                }
+                else if (_ButtonPosition == eSplitterButtonPosition.Center)
+                {
+                    _NearCollapseButton = new Rectangle(r.X, r.Y + (r.Height - (buttonSize.Height * 2 + ButtonSpacing)) / 2, buttonSize.Width, buttonSize.Height);
+                    _FarCollapseButton = new Rectangle(r.X, _NearCollapseButton.Bottom + ButtonSpacing, buttonSize.Width, buttonSize.Height);
+                }
+                else if (_ButtonPosition == eSplitterButtonPosition.Far)
+                {
+                    _NearCollapseButton = new Rectangle(r.X, r.Bottom - buttonSize.Height * 2 - ButtonSpacing, buttonSize.Width, buttonSize.Height);
+                    _FarCollapseButton = new Rectangle(r.X, _NearCollapseButton.Bottom + ButtonSpacing, buttonSize.Width, buttonSize.Height);
+                }
+            }
+        }
+
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            UpdateButtonLayout();
+
+            base.OnPaint(e);
+
+            Graphics g = e.Graphics;
+            bool isHorizontal = this.Orientation == System.Windows.Forms.Orientation.Horizontal;
+
+            if (_NearCollapseButtonState != eButtonState.Hidden)
+            {
+                Office2007ButtonItemStateColorTable ct = GetOffice2007StateColorTable(_NearCollapseButtonState);
+                Office2007ButtonItemPainter.PaintBackground(g, ct, _NearCollapseButton, RoundRectangleShapeDescriptor.RectangleShape);
+                Rectangle r = _NearCollapseButton;
+                r.Inflate(-2, -2);
+                TextDrawing.DrawStringLegacy(g, isHorizontal ? "\uf077" : "\uf053", Symbols.GetFont(9f, eSymbolSet.Awesome),
+                    ct.Text, r, eTextFormat.HorizontalCenter | eTextFormat.VerticalCenter);
+            }
+            if (_FarCollapseButtonState != eButtonState.Hidden)
+            {
+                Office2007ButtonItemStateColorTable ct = GetOffice2007StateColorTable(_FarCollapseButtonState);
+                Office2007ButtonItemPainter.PaintBackground(g, ct, _FarCollapseButton, RoundRectangleShapeDescriptor.RectangleShape);
+                Rectangle r = _FarCollapseButton;
+                r.Inflate(-2, -2);
+                TextDrawing.DrawStringLegacy(g, isHorizontal ? "\uf078" : "\uf054", Symbols.GetFont(9f, eSymbolSet.Awesome),
+                    ct.Text, r, eTextFormat.HorizontalCenter | eTextFormat.VerticalCenter);
+            }
+
+            
+        }
+
+        protected Office2007ButtonItemStateColorTable GetOffice2007StateColorTable(eButtonState state)
+        {
+            if (GlobalManager.Renderer is Office2007Renderer)
+            {
+                Office2007ColorTable ct = ((Office2007Renderer)GlobalManager.Renderer).ColorTable;
+                Office2007ButtonItemColorTable buttonColorTable = ct.ButtonItemColors[Enum.GetName(typeof(eButtonColor), eButtonColor.OrangeWithBackground)];
+                if (!this.Enabled || state == eButtonState.Disabled)
+                    return buttonColorTable.Disabled;
+                else if (state == eButtonState.MouseDownLeft)
+                    return buttonColorTable.Pressed;
+                else if (state == eButtonState.MouseOver)
+                    return buttonColorTable.MouseOver;
+                else
+                    return buttonColorTable.Default;
+            }
+
+            return null;
+        }
+
+        private Orientation _CurrentOrientation = Orientation.Vertical;
+        protected override void OnLayout(LayoutEventArgs e)
+        {
+            base.OnLayout(e);
+
+            if (_CurrentOrientation != this.Orientation)
+            {
+                _CurrentOrientation = this.Orientation;
+                UpdateButtonLayout();
+            }
+            Invalidate();
+        }
+
+        private bool IsButtonActive(eButtonState state)
+        {
+            return state != eButtonState.Hidden && state != eButtonState.Disabled;
+        }
+        private Cursor _OriginalCursor = null;
+        protected override void OnMouseMove(MouseEventArgs e)
+        {
+            if (IsButtonActive(_NearCollapseButtonState))
+            {
+                if (_NearCollapseButton.Contains(e.Location))
+                {
+                    if (_NearCollapseButtonState == eButtonState.Normal)
+                    {
+                        _NearCollapseButtonState = eButtonState.MouseOver;
+                        this.Invalidate();
+                    }
+                }
+                else
+                {
+                    _NearCollapseButtonState = eButtonState.Normal;
+                    this.Invalidate();
+                }
+            }
+            if (IsButtonActive(_FarCollapseButtonState))
+            {
+                if (_FarCollapseButton.Contains(e.Location))
+                {
+                    if (_FarCollapseButtonState == eButtonState.Normal)
+                    {
+                        _FarCollapseButtonState = eButtonState.MouseOver;
+                        this.Invalidate();
+                    }
+                }
+                else
+                {
+                    _FarCollapseButtonState = eButtonState.Normal;
+                    this.Invalidate();
+                }
+            }
+            if (_NearCollapseButton.Contains(e.Location) || _FarCollapseButton.Contains(e.Location))
+            {
+                if (_OriginalCursor == null && _OverrideCursorPropInfo != null)
+                {
+                    _OriginalCursor = (Cursor)_OverrideCursorPropInfo.GetValue(this, null);
+                    _OverrideCursorPropInfo.SetValue(this, Cursors.Default, null);
+                }
+                return;
+            }
+
+            RestoreOriginalCursor();
+
+            base.OnMouseMove(e);
+        }
+
+        private PropertyInfo _OverrideCursorPropInfo = null;
+        private void RestoreOriginalCursor()
+        {
+            if (_OriginalCursor != null)
+            {
+                _OverrideCursorPropInfo.SetValue(this, _OriginalCursor, null); ;
+                _OriginalCursor = null;
+            }
+        }
+        protected override void OnMouseDown(MouseEventArgs e)
+        {
+            if (IsButtonActive(_NearCollapseButtonState))
+            {
+                if (_NearCollapseButton.Contains(e.Location) && e.Button == System.Windows.Forms.MouseButtons.Left)
+                {
+                    _NearCollapseButtonState = eButtonState.MouseDownLeft;
+                    this.Invalidate();
+                }
+            }
+            if (IsButtonActive(_FarCollapseButtonState))
+            {
+                if (_FarCollapseButton.Contains(e.Location) && e.Button == System.Windows.Forms.MouseButtons.Left)
+                {
+                    _FarCollapseButtonState = eButtonState.MouseDownLeft;
+                    this.Invalidate();
+                }
+            }
+            if (_NearCollapseButton.Contains(e.Location) || _FarCollapseButton.Contains(e.Location))
+                return;
+            base.OnMouseDown(e);
+        }
+
+        protected override void OnMouseUp(MouseEventArgs e)
+        {
+            if (IsButtonActive(_NearCollapseButtonState))
+            {
+                if (_NearCollapseButton.Contains(e.Location))
+                {
+                    if (_NearCollapseButtonState == eButtonState.MouseDownLeft)
+                    {
+                        _NearCollapseButtonState = eButtonState.MouseOver;
+                        // Trigger button action
+                        NearCollapseButtonClick();
+                    }
+                    this.Invalidate();
+                }
+            }
+            if (IsButtonActive(_FarCollapseButtonState))
+            {
+                if (_FarCollapseButton.Contains(e.Location))
+                {
+                    if (_FarCollapseButtonState == eButtonState.MouseDownLeft)
+                    {
+                        _FarCollapseButtonState = eButtonState.MouseOver;
+                        // Trigger button action
+                        FarCollapseButtonClick();
+                    }
+                    this.Invalidate();
+                }
+            }
+
+            if (_NearCollapseButton.Contains(e.Location) || _FarCollapseButton.Contains(e.Location))
+                return;
+
+            base.OnMouseUp(e);
+        }
+
+        protected override void OnKeyUp(KeyEventArgs e)
+        {
+            base.OnKeyUp(e);
+            this.Invalidate();
+        }
+
+        // <summary>
+        /// Occurs before near collapse button is clicked and allows you to cancel its action.
+        /// </summary>
+        [Description("Occurs before near collapse button is clicked and allows you to cancel its action.")]
+        public event CancelEventHandler BeforeNearCollapseButtonClick;
+        /// <summary>
+        /// Raises BeforeNearCollapseButtonClick event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnBeforeNearCollapseButtonClick(CancelEventArgs e)
+        {
+            CancelEventHandler handler = BeforeNearCollapseButtonClick;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        /// <summary>
+        /// Occurs after near collapse button is clicked.
+        /// </summary>
+        [Description("Occurs after near collapse button is clicked.")]
+        public event EventHandler NearCollapseButtonClicked;
+        /// <summary>
+        /// Raises NearCollapseButtonClick event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnNearCollapseButtonClicked(EventArgs e)
+        {
+            EventHandler handler = NearCollapseButtonClicked;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        private int _OriginalSplitterDistance = 0;
+        private bool _IsPanel1Minimized = false;
+        private bool _IsPanel2Minimized = false;
+        private bool _InternalDistanceChange = false;
+        private void NearCollapseButtonClick()
+        {
+            CancelEventArgs e = new CancelEventArgs();
+            OnBeforeNearCollapseButtonClick(e);
+            if (e.Cancel) return;
+
+            if (_CollapseMode == eCollapseMode.PanelMinSize)
+            {
+                _InternalDistanceChange = true;
+                try
+                {
+                    if (_IsPanel2Minimized)
+                    {
+                        this.SplitterDistance = _OriginalSplitterDistance;
+                        _IsPanel2Minimized = false;
+                        _FarCollapseButtonState = eButtonState.Normal;
+                    }
+                    else if (!_IsPanel1Minimized)
+                    {
+                        _OriginalSplitterDistance = this.SplitterDistance;
+                        this.SplitterDistance = this.Panel1MinSize;
+                        _IsPanel1Minimized = true;
+                        _NearCollapseButtonState = eButtonState.Disabled;
+                    }
+                }
+                finally
+                {
+                    _InternalDistanceChange = false;
+                }
+            }
+            else
+            {
+                this.Panel1Collapsed = true;
+            }
+
+            OnNearCollapseButtonClicked(EventArgs.Empty);
+        }
+
+        /// <summary>
+        /// Occurs before far collapse button is clicked and allows you to cancel its action.
+        /// </summary>
+        [Description("Occurs before far collapse button is clicked and allows you to cancel its action.")]
+        public event CancelEventHandler BeforeFarCollapseButtonClick;
+        /// <summary>
+        /// Raises BeforeFarCollapseButtonClick event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnBeforeFarCollapseButtonClick(CancelEventArgs e)
+        {
+            CancelEventHandler handler = BeforeFarCollapseButtonClick;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        /// <summary>
+        /// Occurs after far collapse button is clicked.
+        /// </summary>
+        [Description("Occurs after far collapse button is clicked.")]
+        public event EventHandler FarCollapseButtonClicked;
+        /// <summary>
+        /// Raises FarCollapseButtonClick event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnFarCollapseButtonClicked(EventArgs e)
+        {
+            EventHandler handler = FarCollapseButtonClicked;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        private void FarCollapseButtonClick()
+        {
+            CancelEventArgs e=new CancelEventArgs();
+            OnBeforeFarCollapseButtonClick(e);
+            if (e.Cancel) return;
+
+            if (_CollapseMode == eCollapseMode.PanelMinSize)
+            {
+                _InternalDistanceChange = true;
+
+                try
+                {
+                    if (_IsPanel1Minimized)
+                    {
+                        this.SplitterDistance = _OriginalSplitterDistance;
+                        _IsPanel1Minimized = false;
+                        _NearCollapseButtonState = eButtonState.Normal;
+                    }
+                    else if (!_IsPanel2Minimized)
+                    {
+                        _OriginalSplitterDistance = this.SplitterDistance;
+                        if (this.Orientation == System.Windows.Forms.Orientation.Vertical)
+                            this.SplitterDistance = this.Width - this.Panel2MinSize;
+                        else
+                            this.SplitterDistance = this.Height - this.Panel2MinSize;
+                        _IsPanel2Minimized = true;
+                        _FarCollapseButtonState = eButtonState.Disabled;
+                    }
+                }
+                finally
+                {
+                    _InternalDistanceChange = false;
+                }
+            }
+            else
+            {
+                this.Panel2Collapsed = true;
+            }
+
+            OnFarCollapseButtonClicked(EventArgs.Empty);
+        }
+
+        private void SplitterMovedHandler(object sender, SplitterEventArgs e)
+        {
+            if (_InternalDistanceChange) return;
+            if(_IsPanel1Minimized)
+            {
+                _IsPanel1Minimized = false;
+                _NearCollapseButtonState = eButtonState.Normal;
+            }
+            else if (_IsPanel2Minimized)
+            {
+                _IsPanel2Minimized = false;
+                _FarCollapseButtonState = eButtonState.Normal;
+            }
+        }
+
+        protected override void OnMouseEnter(EventArgs e)
+        {
+            base.OnMouseEnter(e);
+        }
+
+        protected override void OnMouseLeave(EventArgs e)
+        {
+            if (IsButtonActive(_NearCollapseButtonState))
+            {
+                _NearCollapseButtonState = eButtonState.Normal;
+            }
+            if (IsButtonActive(_FarCollapseButtonState))
+            {
+                _FarCollapseButtonState = eButtonState.Normal;
+            }
+            RestoreOriginalCursor();
+            Invalidate();
+            base.OnMouseLeave(e);
+        }
+
+        private eSplitterButtonPosition _ButtonPosition = eSplitterButtonPosition.Near;
+        /// <summary>
+        /// Indicates position of buttons inside container.
+        /// </summary>
+        [DefaultValue(eSplitterButtonPosition.Near), Category("Appearance"), Description("Indicates position of buttons inside container.")]
+        public eSplitterButtonPosition ButtonPosition
+        {
+            get { return _ButtonPosition; }
+            set
+            {
+                if (value != _ButtonPosition)
+                {
+                    eSplitterButtonPosition oldValue = _ButtonPosition;
+                    _ButtonPosition = value;
+                    OnButtonPositionChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when ButtonPosition property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnButtonPositionChanged(eSplitterButtonPosition oldValue, eSplitterButtonPosition newValue)
+        {
+            UpdateButtonLayout();
+            this.Invalidate();
+            //OnPropertyChanged(new PropertyChangedEventArgs("ButtonPosition"));
+        }
+
+        private eCollapseMode _CollapseMode = eCollapseMode.PanelMinSize;
+        /// <summary>
+        /// Specifies how panels are collapsed when collapse buttons are pressed.
+        /// </summary>
+        [DefaultValue(eCollapseMode.PanelMinSize), Category("Behavior"), Description("Specifies how panels are collapsed when collapse buttons are pressed.")]
+        public eCollapseMode CollapseMode
+        {
+            get { return _CollapseMode; }
+            set
+            {
+                if (value !=_CollapseMode)
+                {
+                    eCollapseMode oldValue = _CollapseMode;
+                    _CollapseMode = value;
+                    OnCollapseModeChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when CollapseMode property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnCollapseModeChanged(eCollapseMode oldValue, eCollapseMode newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("CollapseMode"));
+        }
+        #endregion
+    }
+
+    /// <summary>
+    /// Defines available positions for buttons inside CollapsibleSplitterContainer.
+    /// </summary>
+    public enum eSplitterButtonPosition
+    {
+        /// <summary>
+        /// Buttons are positioned on left or top side depending on orientation.
+        /// </summary>
+        Near,
+        /// <summary>
+        /// Buttons are positioned in center of container.
+        /// </summary>
+        Center,
+        /// <summary>
+        /// Buttons are positioned on right or bottom side depending on orientation.
+        /// </summary>
+        Far,
+    }
+
+    /// <summary>
+    /// Defines collapse mode for the CollapsibleSplitContainer control.
+    /// </summary>
+    public enum eCollapseMode
+    {
+        /// <summary>
+        /// When buttons are pressed the splitter is positioned at the PanelMinSize.
+        /// </summary>
+        PanelMinSize,
+        /// <summary>
+        /// When buttons are pressed associated panel is collapsed through Panel1Collapsed or Panel2Collapsed properties.
+        /// </summary>
+        PanelCollapse
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/CollapsibleSplitContainer.ico b/PROMS/DotNetBar Source Code/Controls/CollapsibleSplitContainer.ico
new file mode 100644
index 00000000..8d7682bc
Binary files /dev/null and b/PROMS/DotNetBar Source Code/Controls/CollapsibleSplitContainer.ico differ
diff --git a/PROMS/DotNetBar Source Code/Controls/ColorPickerButton.cs b/PROMS/DotNetBar Source Code/Controls/ColorPickerButton.cs
new file mode 100644
index 00000000..4b01ea46
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/ColorPickerButton.cs	
@@ -0,0 +1,240 @@
+using System;
+using System.Text;
+using System.ComponentModel;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represents the color picker button control.
+    /// </summary>
+    [ToolboxBitmap(typeof(ColorPickerButton), "Controls.ColorPickerButton.ico"), ToolboxItem(true), DefaultEvent("SelectedColorChanged"), Designer("DevComponents.DotNetBar.Design.ColorPickerButtonDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf"), System.Runtime.InteropServices.ComVisible(false)]
+    public class ColorPickerButton : ButtonX
+    {
+        #region Private Variables
+        #endregion
+
+        #region Events
+        /// <summary>
+        /// Occurs when color is chosen from drop-down color picker or from Custom Colors dialog box. Selected color can be accessed through SelectedColor property.
+        /// </summary>
+        [Description("Occurs when color is chosen from drop-down color picker or from Custom Colors dialog box.")]
+        public event EventHandler SelectedColorChanged;
+
+        /// <summary>
+        /// Occurs when mouse is moving over the colors presented by the color picker. You can use it to preview the color before it is selected.
+        /// </summary>
+        [Description("Occurs when mouse is moving over the colors presented by the color picker")]
+        public event ColorPreviewEventHandler ColorPreview;
+        #endregion
+
+        #region Constructor
+        /// <summary>
+        /// Creates new instance of the object.
+        /// </summary>
+        public ColorPickerButton()
+            : base()
+        {
+            ColorPickerDropDown cp = GetColorPickerDropDown();
+            cp.SelectedColorChanged += new EventHandler(InternalSelectedColorChanged);
+            cp.ColorPreview += new ColorPreviewEventHandler(InternalColorPreview);
+        }
+        #endregion
+
+        #region Internal Implementation
+#if FRAMEWORK20
+        /// <summary>
+        /// Gets or sets the array of ColorItem objects that will be used as standard colors instead of built-in color palette.
+        /// See: http://www.devcomponents.com/kb2/?p=79 for instructions.
+        /// </summary>
+        [DefaultValue(null), Browsable(false), Category("Colors"), Description("Array of ColorItem objects that will be used as standard colors instead of built-in color palette.")]
+        public ColorItem[][] CustomStandardColors
+        {
+            get { return GetColorPickerDropDown().CustomStandardColors; }
+            set
+            {
+                GetColorPickerDropDown().CustomStandardColors = value;
+            }
+        }
+        /// <summary>
+        /// Gets or sets the array of ColorItem objects that will be used as theme colors instead of built-in color palette.
+        /// See: http://www.devcomponents.com/kb2/?p=79 for instructions.
+        /// </summary>
+        [DefaultValue(null), Browsable(false), Category("Colors"), Description("Array of ColorItem objects that will be used as theme colors instead of built-in color palette.")]
+        public ColorItem[][] CustomThemeColors
+        {
+            get { return GetColorPickerDropDown().CustomThemeColors; }
+            set
+            {
+                GetColorPickerDropDown().CustomThemeColors = value;
+            }
+        }
+#endif
+
+        /// <summary>
+        /// Displays the Colors dialog that allows user to choose the color or create a custom color. If new color is chosen the
+        /// SelectedColorChanged event is raised.
+        /// </summary>
+        public System.Windows.Forms.DialogResult DisplayMoreColorsDialog()
+        {
+            return GetColorPickerDropDown().DisplayMoreColorsDialog();
+        }
+
+        protected override ButtonItem CreateButtonItem()
+        {
+            return new ColorPickerDropDown();
+        }
+
+        private ColorPickerDropDown GetColorPickerDropDown()
+        {
+            return InternalItem as ColorPickerDropDown;
+        }
+
+        private void InternalColorPreview(object sender, ColorPreviewEventArgs e)
+        {
+            OnColorPreview(e);
+        }
+
+        /// <summary>
+        /// Raises the ColorPreview event.
+        /// </summary>
+        /// <param name="e">Provides event data.</param>
+        protected virtual void OnColorPreview(ColorPreviewEventArgs e)
+        {
+            if (ColorPreview != null)
+                ColorPreview(this, e);
+        }
+
+        private void InternalSelectedColorChanged(object sender, EventArgs e)
+        {
+            OnSelectedColorChanged(e);
+            ExecuteCommand();
+        }
+
+        /// <summary>
+        /// Gets whether command is executed when button is clicked.
+        /// </summary>
+        protected virtual bool ExecuteCommandOnClick
+        {
+            get { return false; }
+        }
+
+        /// <summary>
+        /// Raises the SelectedColorChanged event.
+        /// </summary>
+        /// <param name="e">Provides event data.</param>
+        protected virtual void OnSelectedColorChanged(EventArgs e)
+        {
+            if (SelectedColorChanged != null)
+                SelectedColorChanged(this, e);
+        }
+
+        /// <summary>
+        /// Gets or sets the Owner Window that will be used as owner for the colors modal dialog when displayed.
+        /// </summary>
+        [Browsable(false), DefaultValue(null)]
+        public System.Windows.Forms.IWin32Window OwnerWindow
+        {
+            get { return GetColorPickerDropDown().OwnerWindow; }
+            set { GetColorPickerDropDown().OwnerWindow = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets more colors menu item is visible which allows user to open Custom Colors dialog box. Default value is true.
+        /// </summary>
+        [Browsable(true), DefaultValue(true), DevCoSerialize(), Category("Appearance"), Description("Indicates more colors menu item is visible which allows user to open Custom Colors dialog box.")]
+        public bool DisplayMoreColors
+        {
+            get { return GetColorPickerDropDown().DisplayMoreColors; }
+            set { GetColorPickerDropDown().DisplayMoreColors = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the last selected color from either the drop-down or Custom Color dialog box. Default value is
+        /// Color.Empty. You can use SelectedColorChanged event to be notified when this property changes.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public Color SelectedColor
+        {
+            get { return GetColorPickerDropDown().SelectedColor; }
+            set { GetColorPickerDropDown().SelectedColor = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether theme colors are displayed on drop-down. Default value is true.
+        /// </summary>
+        [Browsable(true), DefaultValue(true), DevCoSerialize(), Category("Appearance"), Description("Indicates whether theme colors are displayed on drop-down.")]
+        public bool DisplayThemeColors
+        {
+            get { return GetColorPickerDropDown().DisplayThemeColors; }
+            set { GetColorPickerDropDown().DisplayThemeColors = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether standard colors are displayed on drop-down. Default value is true.
+        /// </summary>
+        [Browsable(true), DefaultValue(true), DevCoSerialize(), Category("Appearance"), Description("Indicates whether standard colors are displayed on drop-down.")]
+        public bool DisplayStandardColors
+        {
+            get { return GetColorPickerDropDown().DisplayStandardColors; }
+            set { GetColorPickerDropDown().DisplayStandardColors = value; }
+        }
+
+        /// <summary>
+        /// Indicates whether SubItems collection is serialized. ColorPickerDropDown does not serialize the sub items.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeSubItems()
+        {
+            return false;
+        }
+
+        /// <summary>
+        /// Gets or sets the rectangle in Image coordinates where selected color will be painted. Setting this property will
+        /// have an effect only if Image property is used to set the image. Default value is an empty rectangle which indicates
+        /// that selected color will not be painted on the image.
+        /// </summary>
+        [Browsable(true), Description("Indicates rectangle in Image coordinates where selected color will be painted. Property will have effect only if Image property is used to set the image."), Category("Behaviour")]
+        public Rectangle SelectedColorImageRectangle
+        {
+            get { return GetColorPickerDropDown().SelectedColorImageRectangle; }
+            set { GetColorPickerDropDown().SelectedColorImageRectangle = value; }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeSelectedColorImageRectangle()
+        {
+            return GetColorPickerDropDown().ShouldSerializeSelectedColorImageRectangle();
+        }
+
+        /// <summary>
+        /// Resets the property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetSelectedColorImageRectangle()
+        {
+            GetColorPickerDropDown().ResetSelectedColorImageRectangle();
+        }
+
+        /// <summary>
+        /// Invokes the ColorPreview event.
+        /// </summary>
+        /// <param name="e">Provides data for the event.</param>
+        public void InvokeColorPreview(ColorPreviewEventArgs e)
+        {
+            GetColorPickerDropDown().InvokeColorPreview(e);
+        }
+
+        /// <summary>
+        /// Update the selected color image if the SelectedColorImageRectangle has been set and button is using Image property to display the image.
+        /// </summary>
+        public void UpdateSelectedColorImage()
+        {
+            GetColorPickerDropDown().UpdateSelectedColorImage();
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/ColorPickerButton.ico b/PROMS/DotNetBar Source Code/Controls/ColorPickerButton.ico
new file mode 100644
index 00000000..ef4b5644
Binary files /dev/null and b/PROMS/DotNetBar Source Code/Controls/ColorPickerButton.ico differ
diff --git a/PROMS/DotNetBar Source Code/Controls/ComboBoxEx.bmp b/PROMS/DotNetBar Source Code/Controls/ComboBoxEx.bmp
new file mode 100644
index 00000000..2195b5f9
Binary files /dev/null and b/PROMS/DotNetBar Source Code/Controls/ComboBoxEx.bmp differ
diff --git a/PROMS/DotNetBar Source Code/Controls/ComboBoxEx.cs b/PROMS/DotNetBar Source Code/Controls/ComboBoxEx.cs
new file mode 100644
index 00000000..3706d754
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/ComboBoxEx.cs	
@@ -0,0 +1,2796 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Windows.Forms;
+using System.Runtime.InteropServices;
+using DevComponents.DotNetBar.Rendering;
+using DevComponents.Editors;
+using DevComponents.DotNetBar.TextMarkup;
+using DevComponents.AdvTree;
+using System.Reflection;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    /// <summary>
+    /// Represents enhanced Windows combo box control.
+    /// </summary>
+    [ToolboxBitmap(typeof(ComboBoxEx), "Controls.ComboBoxEx.ico"), ToolboxItem(true), Designer("DevComponents.DotNetBar.Design.ComboBoxExDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+    public class ComboBoxEx : System.Windows.Forms.ComboBox, ICommandSource
+    {
+        #region Constructor
+        /// <summary>
+        /// Represents the method that will handle the DropDownChange event.
+        /// </summary>
+        public delegate void OnDropDownChangeEventHandler(object sender, bool Expanded);
+        /// <summary>
+        /// Occurs when drop down portion of combo box is shown or hidden.
+        /// </summary>
+        public event OnDropDownChangeEventHandler DropDownChange;
+
+        private eDotNetBarStyle m_Style = eDotNetBarStyle.Office2007;
+        private bool m_DefaultStyle = false;			// Disables our drawing in WndProc
+        private bool m_MouseOver = false;
+        private bool m_MouseOverThumb = false;
+        private bool _DroppedDown = false;
+        //private System.Windows.Forms.Timer m_Timer;
+        private bool m_WindowsXPAware = false;
+        private bool m_DisableInternalDrawing = false;
+        private ImageList m_ImageList = null;
+        private int m_DropDownHeight = 0;
+        private IntPtr m_LastFocusWindow;
+        private IntPtr m_DropDownHandle = IntPtr.Zero;
+        private ComboTextBoxMsgHandler m_TextWindowMsgHandler = null;
+        //private ComboListBoxMsgHandler m_ListBoxMsgHandler = null;
+
+        [DllImport("user32")]
+        private static extern bool ValidateRect(IntPtr hWnd, ref NativeFunctions.RECT pRect);
+
+        [DllImport("user32", SetLastError = true, CharSet = CharSet.Auto)]
+        private static extern IntPtr GetWindow(IntPtr hWnd, uint uCmd);
+        private const uint GW_CHILD = 5;
+
+        private bool m_PreventEnterBeep = false;
+
+        private string m_WatermarkText = "";
+        private bool m_Focused = false;
+        private Font m_WatermarkFont = null;
+        private Color m_WatermarkColor = SystemColors.GrayText;
+        private bool m_IsStandalone = true;
+        private Timer m_MouseOverTimer = null;
+        private Rectangle m_ThumbRect = Rectangle.Empty;
+        private bool _FocusHighlightEnabled = false;
+        private static Color _DefaultHighlightColor = Color.FromArgb(0xFF, 0xFF, 0x88);
+        private Color _FocusHighlightColor = _DefaultHighlightColor;
+
+        /// <summary>
+        /// Creates new instance of ComboBoxEx.
+        /// </summary>
+        public ComboBoxEx()
+            : base()
+        {
+            if (!ColorFunctions.ColorsLoaded)
+            {
+                NativeFunctions.RefreshSettings();
+                NativeFunctions.OnDisplayChange();
+                ColorFunctions.LoadColors();
+            }
+            m_MouseOverTimer = new Timer();
+            m_MouseOverTimer.Interval = 10;
+            m_MouseOverTimer.Enabled = false;
+            m_MouseOverTimer.Tick += new EventHandler(MouseOverTimerTick);
+#if FRAMEWORK20
+            this.FlatStyle = FlatStyle.Flat;
+#endif
+            StyleManager.Register(this);
+        }
+        #endregion
+
+        #region Implementation
+        /// <summary>
+        /// Called by StyleManager to notify control that style on manager has changed and that control should refresh its appearance if
+        /// its style is controlled by StyleManager.
+        /// </summary>
+        /// <param name="newStyle">New active style.</param>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void StyleManagerStyleChanged(eDotNetBarStyle newStyle)
+        {
+            // Metro needs BackColor and ForeColor set
+            if (StyleManager.IsMetro(newStyle) || StyleManager.IsMetro(StyleManager.PreviousStyle) && !StyleManager.IsMetro(newStyle))
+                StyleManager.UpdateAmbientColors(this);
+        }
+
+        private bool _FocusCuesEnabled = true;
+        /// <summary>
+        /// Gets or sets whether control displays focus cues when focused.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether control displays focus cues when focused.")]
+        public virtual bool FocusCuesEnabled
+        {
+            get { return _FocusCuesEnabled; }
+            set
+            {
+                _FocusCuesEnabled = value;
+                if (this.Focused) this.Invalidate();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether control is stand-alone control. Stand-alone flag affects the appearance of the control in Office 2007 style.
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Appearance"), Description("Indicates the appearance of the control.")]
+        public bool IsStandalone
+        {
+            get { return m_IsStandalone; }
+            set
+            {
+                m_IsStandalone = value;
+            }
+        }
+
+        private bool _WatermarkEnabled = true;
+        /// <summary>
+        /// Gets or sets whether watermark text is displayed when control is empty. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Description("Indicates whether watermark text is displayed when control is empty.")]
+        public virtual bool WatermarkEnabled
+        {
+            get { return _WatermarkEnabled; }
+            set { _WatermarkEnabled = value; this.Invalidate(); }
+        }
+
+        /// <summary>
+        /// Gets or sets the watermark (tip) text displayed inside of the control when Text is not set and control does not have input focus. This property supports text-markup.
+        /// Note that WatermarkText is not compatible with the auto-complete feature of .NET Framework 2.0.
+        /// </summary>
+        [Browsable(true), DefaultValue(""), Localizable(true), Category("Appearance"), Description("Indicates watermark text displayed inside of the control when Text is not set and control does not have input focus."), Editor("DevComponents.DotNetBar.Design.TextMarkupUIEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor))]
+        public string WatermarkText
+        {
+            get { return m_WatermarkText; }
+            set
+            {
+                if (value == null) value = "";
+                m_WatermarkText = value;
+                MarkupTextChanged();
+                this.Invalidate();
+            }
+        }
+
+        private eWatermarkBehavior _WatermarkBehavior = eWatermarkBehavior.HideOnFocus;
+        /// <summary>
+        /// Gets or sets the watermark hiding behaviour. Default value indicates that watermark is hidden when control receives input focus.
+        /// </summary>
+        [DefaultValue(eWatermarkBehavior.HideOnFocus), Category("Behavior"), Description("Indicates watermark hiding behaviour.")]
+        public eWatermarkBehavior WatermarkBehavior
+        {
+            get { return _WatermarkBehavior; }
+            set { _WatermarkBehavior = value; this.Invalidate(); }
+        }
+
+        private TextMarkup.BodyElement m_TextMarkup = null;
+        private void MarkupTextChanged()
+        {
+            m_TextMarkup = null;
+
+            if (!TextMarkup.MarkupParser.IsMarkup(ref m_WatermarkText))
+                return;
+
+            m_TextMarkup = TextMarkup.MarkupParser.Parse(m_WatermarkText);
+            ResizeMarkup();
+        }
+
+        private void ResizeMarkup()
+        {
+            if (m_TextMarkup != null)
+            {
+                using (Graphics g = this.CreateGraphics())
+                {
+                    MarkupDrawContext dc = GetMarkupDrawContext(g);
+                    m_TextMarkup.Measure(GetWatermarkBounds().Size, dc);
+                    Size sz = m_TextMarkup.Bounds.Size;
+                    m_TextMarkup.Arrange(new Rectangle(GetWatermarkBounds().Location, sz), dc);
+                }
+            }
+        }
+        private MarkupDrawContext GetMarkupDrawContext(Graphics g)
+        {
+            return new MarkupDrawContext(g, (m_WatermarkFont == null ? this.Font : m_WatermarkFont), m_WatermarkColor, this.RightToLeft == RightToLeft.Yes);
+        }
+
+        /// <summary>
+        /// Gets or sets the watermark font.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), Description("Indicates watermark font."), DefaultValue(null)]
+        public Font WatermarkFont
+        {
+            get { return m_WatermarkFont; }
+            set { m_WatermarkFont = value; this.Invalidate(true); }
+        }
+
+        /// <summary>
+        /// Gets or sets the watermark text color.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), Description("Indicates watermark text color.")]
+        public Color WatermarkColor
+        {
+            get { return m_WatermarkColor; }
+            set { m_WatermarkColor = value; this.Invalidate(true); }
+        }
+        /// <summary>
+        /// Indicates whether property should be serialized by Windows Forms designer.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeWatermarkColor()
+        {
+            return m_WatermarkColor != SystemColors.GrayText;
+        }
+        /// <summary>
+        /// Resets the property to default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetWatermarkColor()
+        {
+            this.WatermarkColor = SystemColors.GrayText;
+        }
+
+        /// <summary>
+        /// Gets or sets the combo box background color. Note that in Office 2007 style back color of the control is automatically managed.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override Color BackColor
+        {
+            get
+            {
+                return base.BackColor;
+            }
+            set
+            {
+                base.BackColor = value;
+            }
+        }
+
+        private bool m_UseCustomBackColor = false;
+        /// <summary>
+        /// Gets or sets whether the BackColor value you set is used instead of the style back color automatically provided by the control. Default
+        /// value is false which indicates that BackColor property is automatically managed. Set this property to true and then set BackColor property
+        /// to make control use your custom back color.
+        /// </summary>
+        [Browsable(false), DefaultValue(false)]
+        public bool UseCustomBackColor
+        {
+            get { return m_UseCustomBackColor; }
+            set { m_UseCustomBackColor = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets value indicating whether system combo box appearance is used. Default value is false.
+        /// </summary>
+        [Browsable(false), Category("Behavior"), Description("Makes Combo box appear the same as built-in Combo box."), DefaultValue(false)]
+        public bool DefaultStyle
+        {
+            get
+            {
+                return m_DefaultStyle;
+            }
+            set
+            {
+                if (m_DefaultStyle != value)
+                {
+                    m_DefaultStyle = value;
+                    this.Invalidate(true);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets value indicating whether the combo box is draw using the Windows XP Theme manager when running on Windows XP or theme aware OS.
+        /// </summary>
+        [Browsable(false), Category("Behavior"), Description("When running on WindowsXP draws control using the Windows XP Themes if theme manager is enabled."), DefaultValue(false)]
+        public bool ThemeAware
+        {
+            get
+            {
+                return m_WindowsXPAware;
+            }
+            set
+            {
+                if (m_WindowsXPAware != value)
+                {
+                    m_WindowsXPAware = value;
+                    if (!m_WindowsXPAware)
+                        m_DefaultStyle = false;
+                    else if (m_WindowsXPAware && BarFunctions.ThemedOS)
+                    {
+                        m_DefaultStyle = true;
+#if FRAMEWORK20
+                        this.FlatStyle = FlatStyle.Standard;
+#endif
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Disables internal drawing support for the List-box portion of Combo-box. Default value is false which means that internal drawing code is used. If
+        /// you plan to provide your own drawing for combo box items you must set this property to True.
+        /// </summary>
+        [Browsable(true), Category("Behavior"), Description("Disables internal drawing support for the List-box portion of Combo-box."), DefaultValue(false)]
+        public bool DisableInternalDrawing
+        {
+            get
+            {
+                return m_DisableInternalDrawing;
+            }
+            set
+            {
+                if (m_DisableInternalDrawing != value)
+                    m_DisableInternalDrawing = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether combo box generates the audible alert when Enter key is pressed.
+        /// </summary>
+        [System.ComponentModel.Browsable(true), DevCoBrowsable(true), System.ComponentModel.Category("Behavior"), System.ComponentModel.Description("Indicates whether combo box generates the audible alert when Enter key is pressed."), System.ComponentModel.DefaultValue(false)]
+        public bool PreventEnterBeep
+        {
+            get
+            {
+                return m_PreventEnterBeep;
+            }
+            set
+            {
+                m_PreventEnterBeep = value;
+            }
+        }
+
+        /// <summary>
+        /// The ImageList control used by Combo box to draw images.
+        /// </summary>
+        [Browsable(true), Category("Behavior"), Description("The ImageList control used by Combo box to draw images."), DefaultValue(null)]
+        public System.Windows.Forms.ImageList Images
+        {
+            get
+            {
+                return m_ImageList;
+            }
+            set
+            {
+                m_ImageList = value;
+            }
+        }
+
+        /// <summary>
+        /// Determines the visual style applied to the combo box when shown. Default style is Office 2007.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), DefaultValue(eDotNetBarStyle.Office2007), Description("Determines the display of the item when shown.")]
+        public eDotNetBarStyle Style
+        {
+            get
+            {
+                return m_Style;
+            }
+            set
+            {
+                m_Style = value;
+                UpdateBackColor();
+                this.Invalidate(true);
+            }
+        }
+
+        protected override void OnHandleCreated(EventArgs e)
+        {
+            base.OnHandleCreated(e);
+            UpdateBackColor();
+            SetupTextBoxMessageHandler();
+            RemoveTheme(this.Handle);
+            if (_AutoItemHeight)
+                UpdateItemHeight();
+        }
+
+        /*protected override void OnHandleDestroyed(EventArgs e)
+        {
+            if(m_Timer!=null)
+                m_Timer.Enabled=false;
+            base.OnHandleDestroyed(e);
+        }*/
+
+        protected override void OnResize(EventArgs e)
+        {
+            ResizeMarkup();
+            this.Invalidate();
+            base.OnResize(e);
+        }
+
+        private void MouseOverTimerTick(object sender, EventArgs e)
+        {
+            bool over = false;
+
+            if (this.IsHandleCreated && this.Visible)
+            {
+                WinApi.RECT rw = new WinApi.RECT();
+                WinApi.GetWindowRect(this.Handle, ref rw);
+                Rectangle r = rw.ToRectangle();
+                if (r.Contains(Control.MousePosition))
+                    over = true;
+                Point p = this.PointToClient(Control.MousePosition);
+                if (m_ThumbRect.Contains(p))
+                    MouseOverThumb = true;
+                else
+                    MouseOverThumb = false;
+            }
+
+            if (!over)
+            {
+                SetMouseOverTimerEnabled(false);
+                m_MouseOver = false;
+                UpdateBackColor();
+                this.Invalidate();
+                if (this.ParentItem != null) this.ParentItem.HideToolTip();
+            }
+        }
+        internal BaseItem ParentItem = null;
+
+        private bool MouseOverThumb
+        {
+            get { return m_MouseOverThumb; }
+            set
+            {
+                if (m_MouseOverThumb != value)
+                {
+                    m_MouseOverThumb = value;
+                    this.Invalidate();
+                }
+            }
+        }
+
+        protected override void OnGotFocus(EventArgs e)
+        {
+            base.OnGotFocus(e);
+            if (!m_MouseOver)
+                m_MouseOver = true;
+            UpdateBackColor();
+            this.Invalidate(true);
+        }
+
+        protected override void OnLostFocus(EventArgs e)
+        {
+            //if(!this.ClientRectangle.Contains(this.PointToClient(Control.MousePosition)))
+            //m_MouseOver=false;
+            SetMouseOverTimerEnabled(true);
+            //Color c = GetComboColors().Background;
+            //if (this.BackColor != c)
+            //this.BackColor = c;
+            //if(!m_MouseOver)
+            //	this.Refresh();
+            m_LastFocusWindow = IntPtr.Zero;
+            base.OnLostFocus(e);
+        }
+
+        private Timer m_DropDownTrackTimer = null;
+        private void StartDropDownTrackTimer()
+        {
+            if (m_DropDownTrackTimer == null)
+            {
+                m_DropDownTrackTimer = new Timer();
+                m_DropDownTrackTimer.Tick += new EventHandler(DropDownTrackTimerTick);
+                m_DropDownTrackTimer.Interval = 200;
+            }
+            m_DropDownTrackTimer.Start();
+        }
+        private void StopDropDownTrackTimer()
+        {
+            Timer t = m_DropDownTrackTimer;
+            m_DropDownTrackTimer = null;
+            if (t != null)
+            {
+                t.Stop();
+                t.Dispose();
+            }
+        }
+
+        private void DropDownTrackTimerTick(object sender, EventArgs e)
+        {
+            DroppedDownInternal = (WinApi.SendMessage(this.Handle, (int)WinApi.WindowsMessages.CB_GETDROPPEDSTATE, IntPtr.Zero, IntPtr.Zero) != 0);
+        }
+
+        private bool DroppedDownInternal
+        {
+            get
+            {
+                return _DroppedDown;
+            }
+            set
+            {
+                if (IsMultiColumnDropDown)
+                {
+                    _DroppedDown = value;
+                    return;
+                }
+                if (_DroppedDown != value)
+                {
+                    StopDropDownTrackTimer();
+                    _DroppedDown = value;
+                    this.Invalidate();
+
+                    if (DropDownChange != null)
+                        DropDownChange(this, _DroppedDown);
+#if !FRAMEWORK20
+                    if(m_DroppedDown)
+                    {
+                        StartDropDownTrackTimer();
+                    }
+#endif
+                    if (!_DroppedDown)
+                        ReleasePopupHandler();
+                }
+            }
+        }
+
+#if FRAMEWORK20
+        protected override void OnDropDownClosed(EventArgs e)
+        {
+            if (!IsMultiColumnDropDown)
+            {
+                DroppedDownInternal = false;
+                m_SelectedIndexInternal = this.SelectedIndex;
+            }
+            base.OnDropDownClosed(e);
+        }
+#endif
+
+        protected override void OnDropDown(EventArgs e)
+        {
+            base.OnDropDown(e);
+            if (!IsMultiColumnDropDown)
+            {
+                DroppedDownInternal = true;
+            }
+        }
+
+        [DllImport("user32", CharSet = CharSet.Unicode)]
+        private static extern int SetWindowTheme(IntPtr hWnd, [MarshalAs(UnmanagedType.LPWStr)] String pszSubAppName, [MarshalAs(UnmanagedType.LPWStr)] String pszSubIdList);
+
+        private void RemoveTheme(IntPtr handle)
+        {
+            bool isXp = false;
+            if (System.Environment.Version.Major > 5)
+                isXp = true;
+            else if ((System.Environment.Version.Major == 5) &&
+               (System.Environment.Version.Minor >= 1))
+                isXp = true;
+            if (isXp)
+                SetWindowTheme(handle, " ", " ");
+        }
+
+        #region Internal Combo Colors
+        private class InternalComboColors
+        {
+            public Color Background = SystemColors.Window;
+            public Color Border = SystemColors.Window;
+            public LinearGradientColorTable ThumbBackground = null;
+            public Color ThumbText = SystemColors.ControlText;
+            public LinearGradientColorTable ThumbBorderOuter = null;
+            public LinearGradientColorTable ThumbBorderInner = null;
+        }
+
+        private InternalComboColors GetComboColors()
+        {
+            InternalComboColors c = new InternalComboColors();
+
+            bool bFocus = (m_MouseOverThumb || this.Focused || this.DroppedDownInternal && this.DropDownStyle != ComboBoxStyle.Simple);
+            if (bFocus && !this.Enabled)
+                bFocus = false;
+
+            if (BarFunctions.IsOffice2007Style(this.Style) && GlobalManager.Renderer is Office2007Renderer)
+            {
+                Office2007ComboBoxColorTable colorTable = ((Office2007Renderer)GlobalManager.Renderer).ColorTable.ComboBox;
+                Office2007ComboBoxStateColorTable stateColors = (IsToolbarStyle && !m_MouseOver ? colorTable.Default : colorTable.DefaultStandalone);
+                if (bFocus)
+                {
+                    if (this.DroppedDown)
+                        stateColors = colorTable.DroppedDown;
+                    else if (bFocus)
+                        stateColors = colorTable.MouseOver;
+                }
+
+                c.Background = stateColors.Background;
+                c.Border = stateColors.Border;
+                c.ThumbBackground = stateColors.ExpandBackground;
+                c.ThumbText = stateColors.ExpandText;
+                c.ThumbBorderOuter = stateColors.ExpandBorderOuter;
+                c.ThumbBorderInner = stateColors.ExpandBorderInner;
+            }
+            else
+            {
+                ColorScheme cs = new ColorScheme(this.Style);
+                if (bFocus)
+                {
+                    if (DroppedDownInternal)
+                    {
+                        c.ThumbBackground = new LinearGradientColorTable(cs.ItemPressedBackground, cs.ItemPressedBackground2, cs.ItemPressedBackgroundGradientAngle);
+                        c.Border = cs.ItemPressedBorder;
+                        c.ThumbText = cs.ItemPressedText;
+                    }
+                    else
+                    {
+                        if (m_MouseOverThumb)
+                            c.ThumbBackground = new LinearGradientColorTable(cs.ItemHotBackground, cs.ItemHotBackground2, cs.ItemHotBackgroundGradientAngle);
+                        else
+                            c.ThumbBackground = new LinearGradientColorTable(cs.BarBackground, cs.BarBackground2, cs.BarBackgroundGradientAngle);
+                        c.Border = cs.ItemHotBorder;
+                        c.ThumbText = cs.ItemHotText;
+                    }
+                }
+                else
+                {
+                    c.ThumbBackground = new LinearGradientColorTable(cs.BarBackground, cs.BarBackground2, cs.BarBackgroundGradientAngle);
+                    if (m_MouseOver || !IsToolbarStyle)
+                    {
+                        c.Border = cs.ItemHotBorder;
+                    }
+                }
+            }
+
+            if (_FocusHighlightEnabled && this.Enabled && this.Focused)
+                c.Background = _FocusHighlightColor;
+            else if (!this.Enabled)
+            {
+                c.Background = _DisabledBackColor.IsEmpty ? SystemColors.Control : _DisabledBackColor;
+                c.ThumbText = _DisabledForeColor.IsEmpty ? SystemColors.ControlDark : _DisabledForeColor; ;
+            }
+
+            return c;
+        }
+        #endregion
+        private ComboBoxPopupMsgHandler _PopupMsgHandler = null;
+        private void ReleasePopupHandler()
+        {
+            ComboBoxPopupMsgHandler handler = _PopupMsgHandler;
+            _PopupMsgHandler = null;
+            if (handler != null)
+            {
+                handler.ReleaseHandle();
+            }
+        }
+        private void CreatePopupHandler(IntPtr handle)
+        {
+            if (_PopupMsgHandler == null)
+            {
+                _PopupMsgHandler = new ComboBoxPopupMsgHandler();
+                _PopupMsgHandler.AssignHandle(handle);
+            }
+        }
+        protected override bool ProcessDialogKey(Keys keyData)
+        {
+            if (keyData == Keys.F4 && IsMultiColumnDropDown)
+            {
+                IsPopupOpen = !IsPopupOpen;
+                return true;
+            }
+            return base.ProcessDialogKey(keyData);
+        }
+        protected override void WndProc(ref Message m)
+        {
+            const int WM_PAINT = 0xF;
+            const int WM_PRINTCLIENT = 0x0318;
+            const int WM_CTLCOLORLISTBOX = 0x0134;
+            const int CB_ADDSTRING = 0x143;
+            const int CB_INSERTSTRING = 0x14A;
+            const int CB_DELETESTRING = 0x0144;
+
+            WinApi.RECT rect = new WinApi.RECT();
+
+            switch (m.Msg)
+            {
+                case WM_CTLCOLORLISTBOX:
+                    if (IsMultiColumnDropDown && base.DroppedDown)
+                    {
+                        BarUtilities.InvokeDelayed(new MethodInvoker(delegate { base.DroppedDown = false; }), 10);
+                        break;
+                    }
+
+                    if (BarFunctions.IsWindows7 && !IsMultiColumnDropDown)
+                    {
+                        if (m_DropDownHandle != m.LParam)
+                            ReleasePopupHandler();
+
+                        if (_PopupMsgHandler == null)
+                            CreatePopupHandler(m.LParam);
+                    }
+
+                    m_DropDownHandle = m.LParam;
+
+                    if (!IsMultiColumnDropDown && (m_DropDownHeight > 0 || this.Items.Count == 0)) // Reason for zero items check here is to set the height of popup in case that it was visible before with large number of items and now its deleted. The ComboBox has bug and it displays popup in last large size even though its empty.
+                    {
+                        WinApi.GetWindowRect(m.LParam, ref rect);
+                        int height = m_DropDownHeight;
+                        if (this.Items.Count == 0)
+                            height = Math.Max(18, this.ItemHeight);
+                        Point thisLocation = this.PointToScreen(Point.Empty);
+                        if (rect.Top < thisLocation.Y)
+                            rect.Top = thisLocation.Y + this.Height;
+                        NativeFunctions.SetWindowPos(m.LParam, IntPtr.Zero, rect.Left, rect.Top, rect.Width,
+                                                     height, NativeFunctions.SWP_NOACTIVATE);
+                    }
+                    break;
+
+                case (int)WinApi.WindowsMessages.CB_GETDROPPEDSTATE:
+
+                    base.WndProc(ref m);
+
+                    if (m.Result == IntPtr.Zero && DroppedDownInternal && !IsMultiColumnDropDown)
+                        DroppedDownInternal = false;
+                    return;
+
+                case NativeFunctions.WM_SETFOCUS:
+                    if (m.WParam != this.Handle)
+                        m_LastFocusWindow = m.WParam;
+
+                    break;
+
+                case CB_ADDSTRING:
+                    if (this.Items.Count > 0)
+                    {
+                        ComboItem cb = this.Items[this.Items.Count - 1] as ComboItem;
+
+                        if (cb != null)
+                            cb.m_ComboBox = this;
+                    }
+                    break;
+
+                case CB_INSERTSTRING:
+                    int index = WinApi.ToInt(m.WParam);
+
+                    if (index >= 0 && index < this.Items.Count)
+                    {
+                        ComboItem cb = this.Items[index] as ComboItem;
+
+                        if (cb != null)
+                            cb.m_ComboBox = this;
+                    }
+
+                    m_SelectedIndexInternal = -1;
+                    break;
+
+                case CB_DELETESTRING:
+                    m_SelectedIndexInternal = -1;
+                    break;
+
+                case NativeFunctions.WM_USER + 7:
+                    if (this.DropDownStyle == ComboBoxStyle.DropDown && !m_Focused)
+                        this.SelectionLength = 0;
+
+                    this.Invalidate(true);
+                    return;
+                case (int)WinApi.WindowsMessages.WM_LBUTTONDOWN:
+                    {
+                        if (IsMultiColumnDropDown)
+                        {
+                            if (IsPopupOpen)
+                                CloseMultiColumnDropDown();
+                            else if (DateTime.Now.Subtract(_MultiDropDownClosedAtTime).TotalMilliseconds > 500 && (this.Focused || this.Focus()))
+                            {
+                                OpenMultiColumnDropDown();
+                            }
+                            return; // Don't call base
+                        }
+                        break;
+                    }
+                case (int)WinApi.WindowsMessages.WM_REFLECTCOMMAND:
+                    {
+                        if (IsMultiColumnDropDown)
+                        {
+                            int wp = WinApi.HIWORD(m.WParam);
+                            if (wp == CBN_DROPDOWN)
+                            {
+                                OpenMultiColumnDropDown();
+                                return; // Don't call base
+                            }
+                            else if (wp == CBN_CLOSEUP)
+                            {
+                                if (DateTime.Now.Subtract(_MultiDropDownOpenedAtTime).TotalMilliseconds > 900)
+                                {
+                                    CloseMultiColumnDropDown();
+                                    return; // Don't call base
+                                }
+                            }
+                        }
+                        break;
+                    }
+            }
+
+            if (m_DefaultStyle)
+            {
+                base.WndProc(ref m);
+                return;
+            }
+
+            if ((m.Msg == WM_PAINT || m.Msg == WM_PRINTCLIENT) && DrawMode != DrawMode.Normal)
+            {
+                WinApi.GetWindowRect(m.HWnd, ref rect);
+                Rectangle r = new Rectangle(0, 0, rect.Width, rect.Height);
+
+                if (m.Msg == WM_PAINT)
+                {
+                    WinApi.PAINTSTRUCT ps = new WinApi.PAINTSTRUCT();
+
+                    IntPtr hdc = WinApi.BeginPaint(m.HWnd, ref ps);
+
+                    using (Graphics gHdc = Graphics.FromHdc(hdc))
+                    {
+                        using (BufferedBitmap bmp = new BufferedBitmap(gHdc, r))
+                        {
+                            PaintComboBox(bmp.Graphics, r);
+
+                            bmp.Render(gHdc);
+                        }
+                    }
+
+                    WinApi.EndPaint(m.HWnd, ref ps);
+                }
+                else
+                {
+                    using (Graphics g = Graphics.FromHdc(m.WParam))
+                        PaintComboBox(g, r);
+                }
+
+                if (this.Parent is ItemControl)
+                    ((ItemControl)this.Parent).UpdateKeyTipsCanvas();
+            }
+            else
+            {
+                base.WndProc(ref m);
+            }
+        }
+        private const uint CBN_DROPDOWN = 7;
+        private const uint CBN_CLOSEUP = 8;
+        public override bool PreProcessMessage(ref Message m)
+        {
+            if (m.Msg == (int)WinApi.WindowsMessages.WM_REFLECTCOMMAND && IsMultiColumnDropDown)
+            {
+                if (WinApi.HIWORD(m.WParam) == CBN_DROPDOWN)
+                    return false;
+            }
+            return base.PreProcessMessage(ref m);
+        }
+
+        private void PaintComboBox(Graphics g, Rectangle r)
+        {
+            InternalComboColors colors = GetComboColors();
+
+            PaintComboBackground(g, r, colors);
+            PaintComboBorder(g, r, colors);
+
+            Rectangle contentRect = PaintComboThumb(g, r, colors);
+
+            int selectedIndex = SelectedIndex == -1 ? -1 : m_SelectedIndexInternal;
+
+            if (m_SelectedIndexInternal == -1 && SelectedIndex >= 0)
+                selectedIndex = SelectedIndex;
+
+            if (DropDownStyle == ComboBoxStyle.DropDownList)
+            {
+                if (Items.Count > 0 && (uint)selectedIndex < Items.Count)
+                {
+                    DrawItemState state = DrawItemState.ComboBoxEdit;
+
+                    if (Enabled == false)
+                        state |= DrawItemState.Disabled;
+
+                    else if (Focused == true)
+                        state |= (DrawItemState.Focus | DrawItemState.Selected);
+
+                    g.SetClip(contentRect);
+                    contentRect.Inflate(-1, -1);
+                    OnDrawItem(new DrawItemEventArgs(g, Font, contentRect,
+                                                     selectedIndex, state, ForeColor, BackColor));
+                    g.ResetClip();
+                }
+
+                if (ShouldDrawWatermark() == true)
+                    DrawWatermark(g);
+            }
+        }
+
+        private Rectangle PaintComboThumb(Graphics g, Rectangle r, InternalComboColors colors)
+        {
+            Rectangle contentRect = r;
+            contentRect.Inflate(-2, -2);
+
+            if (this.DropDownStyle == ComboBoxStyle.Simple || !_RenderThumb) return contentRect;
+
+            int thumbWidth = SystemInformation.HorizontalScrollBarThumbWidth;
+            Rectangle thumbRect = new Rectangle(r.Width - thumbWidth, r.Y, thumbWidth, r.Height);
+            if (RightToLeft == RightToLeft.Yes)
+                thumbRect = new Rectangle(r.X + 1, r.Y + 1, thumbWidth, r.Height - 2);
+            if (!this.IsToolbarStyle)
+            {
+                thumbRect.Y += 2;
+                thumbRect.Height -= 4;
+                thumbRect.Width -= 2; ;
+                if (RightToLeft == RightToLeft.Yes)
+                    thumbRect.X += 2;
+            }
+            else if (!BarFunctions.IsOffice2007Style(this.Style))
+                thumbRect.Inflate(-1, -1);
+
+            if (RightToLeft == RightToLeft.Yes)
+            {
+                int diff = thumbRect.Right - contentRect.X + 2;
+                contentRect.Width -= diff;
+                contentRect.X += diff;
+            }
+            else
+            {
+                int diff = contentRect.Right - thumbRect.X + 2;
+                contentRect.Width -= diff;
+            }
+            //contentRect.Y++;
+            //contentRect.Height--;
+
+            if (!this.IsToolbarStyle && BarFunctions.IsOffice2007Style(this.Style))
+            {
+                Office2007ButtonItemPainter.PaintBackground(g, GetOffice2007StateColorTable(), thumbRect, RoundRectangleShapeDescriptor.RectangleShape);
+            }
+            else
+            {
+                if (colors.ThumbBackground != null)
+                    DisplayHelp.FillRectangle(g, thumbRect, colors.ThumbBackground);
+                if (colors.ThumbBorderOuter != null)
+                    DisplayHelp.DrawGradientRectangle(g, thumbRect, colors.ThumbBorderOuter, 1);
+                Rectangle innerBorder = thumbRect;
+                innerBorder.Inflate(-1, -1);
+                if (colors.ThumbBorderInner != null)
+                    DisplayHelp.DrawGradientRectangle(g, innerBorder, colors.ThumbBorderInner, 1);
+            }
+
+            using (SolidBrush brush = new SolidBrush(colors.ThumbText))
+                DrawArrow(thumbRect, g, brush);
+
+            m_ThumbRect = thumbRect;
+            return contentRect;
+        }
+
+        internal Rectangle GetThumbRect(Rectangle r)
+        {
+            if (this.DropDownStyle == ComboBoxStyle.Simple || !_RenderThumb)
+                return (Rectangle.Empty);
+
+            int thumbWidth = SystemInformation.HorizontalScrollBarThumbWidth;
+            Rectangle thumbRect = new Rectangle(r.Width - thumbWidth, r.Y, thumbWidth, r.Height);
+
+            if (RightToLeft == RightToLeft.Yes)
+                thumbRect = new Rectangle(r.X + 1, r.Y + 1, thumbWidth, r.Height - 2);
+
+            if (!this.IsToolbarStyle)
+            {
+                thumbRect.Y += 2;
+                thumbRect.Height -= 4;
+                thumbRect.Width -= 2;
+
+                if (RightToLeft == RightToLeft.Yes)
+                    thumbRect.X += 2;
+            }
+            else if (!BarFunctions.IsOffice2007Style(this.Style))
+                thumbRect.Inflate(-1, -1);
+
+            return (thumbRect);
+        }
+
+        [Browsable(false)]
+        public bool IsToolbarStyle
+        {
+            get { return !m_IsStandalone; }
+        }
+
+        private bool _RenderThumb = true;
+        /// <summary>
+        /// Gets or sets whether ComboBoxEx thumb button that displays drop-down is rendered. Default value is true.
+        /// </summary>
+        internal bool RenderThumb
+        {
+            get { return _RenderThumb; }
+            set
+            {
+                _RenderThumb = value;
+            }
+        }
+
+
+        private bool _RenderBorder = true;
+        /// <summary>
+        /// Gets or sets whether ComboBoxEx border is rendered. Default value is true.
+        /// </summary>
+        internal bool RenderBorder
+        {
+            get { return _RenderBorder; }
+            set
+            {
+                _RenderBorder = value;
+            }
+        }
+
+
+        protected Office2007ButtonItemStateColorTable GetOffice2007StateColorTable()
+        {
+            bool bFocus = (m_MouseOverThumb || this.DroppedDownInternal && this.DropDownStyle != ComboBoxStyle.Simple);
+
+            if (GlobalManager.Renderer is Office2007Renderer)
+            {
+                Office2007ColorTable ct = ((Office2007Renderer)GlobalManager.Renderer).ColorTable;
+                Office2007ButtonItemColorTable buttonColorTable = ct.ButtonItemColors[Enum.GetName(typeof(eButtonColor), eButtonColor.OrangeWithBackground)];
+                if (!this.Enabled)
+                    return buttonColorTable.Disabled;
+                else if (this.DroppedDownInternal)
+                    return buttonColorTable.Checked;
+                else if (bFocus)
+                    return buttonColorTable.MouseOver;
+                else
+                    return buttonColorTable.Default;
+            }
+
+            return null;
+        }
+
+        private void PaintComboBorder(Graphics g, Rectangle controlBounds, InternalComboColors colors)
+        {
+            if (!_RenderBorder) return;
+            DisplayHelp.DrawRectangle(g, colors.Border, controlBounds);
+        }
+
+        private void PaintComboBackground(Graphics g, Rectangle controlBounds, InternalComboColors colors)
+        {
+            if (this.UseCustomBackColor && !BackColor.IsEmpty)
+                DisplayHelp.FillRectangle(g, controlBounds, BackColor);
+            else
+                DisplayHelp.FillRectangle(g, controlBounds, colors.Background);
+        }
+
+        private bool ShouldDrawWatermark()
+        {
+            if (_WatermarkEnabled && this.Enabled && (!this.Focused || _WatermarkBehavior == eWatermarkBehavior.HideNonEmpty) && this.Text == "" && this.SelectedIndex == -1)
+                return true;
+            return false;
+        }
+
+        private void DrawWatermark(Graphics g)
+        {
+            if (m_TextMarkup != null)
+            {
+                MarkupDrawContext dc = GetMarkupDrawContext(g);
+                m_TextMarkup.Render(dc);
+            }
+            else
+            {
+                eTextFormat tf = eTextFormat.Left | eTextFormat.VerticalCenter;
+
+                if (this.RightToLeft == RightToLeft.Yes) tf |= eTextFormat.RightToLeft;
+                //if (this.TextAlign == HorizontalAlignment.Left)
+                //    tf |= eTextFormat.Left;
+                //else if (this.TextAlign == HorizontalAlignment.Right)
+                //    tf |= eTextFormat.Right;
+                //else if (this.TextAlign == HorizontalAlignment.Center)
+                //    tf |= eTextFormat.HorizontalCenter;
+                tf |= eTextFormat.EndEllipsis;
+                tf |= eTextFormat.WordBreak;
+                TextDrawing.DrawString(g, m_WatermarkText, (m_WatermarkFont == null ? this.Font : m_WatermarkFont),
+                    m_WatermarkColor, GetWatermarkBounds(), tf);
+            }
+        }
+
+        private Rectangle GetWatermarkBounds()
+        {
+            if (this.DropDownStyle != ComboBoxStyle.DropDownList && m_TextWindowMsgHandler != null)
+            {
+                WinApi.RECT rect = new WinApi.RECT();
+                WinApi.GetWindowRect(m_TextWindowMsgHandler.Handle, ref rect);
+                return new Rectangle(0, 0, rect.Width, rect.Height);
+            }
+
+            Rectangle r = new Rectangle(2, 0, this.Width - 2, this.Height);
+            r.Inflate(-2, -1);
+            int thumbSize = SystemInformation.HorizontalScrollBarThumbWidth;
+            r.Width -= thumbSize;
+            if (this.RightToLeft == RightToLeft.Yes)
+                r.X += thumbSize;
+
+            return r;
+        }
+
+        //private void CreateListBoxMsgHandler(IntPtr m_DropDownHandle)
+        //{
+        //    DisposeListBoxMsgHandler();
+        //    m_ListBoxMsgHandler = new ComboListBoxMsgHandler();
+        //    m_ListBoxMsgHandler.AssignHandle(m_DropDownHandle);
+        //}
+
+        //private void DisposeListBoxMsgHandler()
+        //{
+        //    if (m_ListBoxMsgHandler != null)
+        //    {
+        //        m_ListBoxMsgHandler.ReleaseHandle();
+        //        m_ListBoxMsgHandler = null;
+        //    }
+        //}
+
+        private void DrawArrow(Rectangle r, Graphics g, Brush b)
+        {
+            Point[] p = new Point[3];
+            p[0].X = r.Left + (r.Width - Dpi.Width4) / 2;
+            p[0].Y = r.Top + (r.Height - Dpi.Height3) / 2 + 1;
+            p[1].X = p[0].X + Dpi.Width5;
+            p[1].Y = p[0].Y;
+            p[2].X = p[0].X + Dpi.Width2;
+            p[2].Y = p[0].Y + Dpi.Height3;
+            g.FillPolygon(b, p);
+        }
+
+        /*private void OnTimer(object sender, EventArgs e)
+        {
+            bool bRefresh=false;
+
+            if(m_DroppedDown && !this.DroppedDown)
+            {
+                m_DroppedDown=false;
+				
+                if(DropDownChange!=null)
+                    this.DropDownChange(this,false);
+
+                m_DropDownHandle=IntPtr.Zero;
+                bRefresh=true;
+            }
+
+            Point mousePos=this.PointToClient(Control.MousePosition);
+            if(!this.ClientRectangle.Contains(mousePos))
+            {
+                if(m_MouseOver && !m_DroppedDown)
+                {
+                    m_MouseOver=false;
+                    bRefresh=true;
+                }
+            }
+            else if(!m_MouseOver)
+            {
+                m_MouseOver=true;
+                bRefresh=true;
+            }
+
+            if(bRefresh)
+                this.Refresh();
+        }*/
+
+        protected override void OnVisibleChanged(EventArgs e)
+        {
+            base.OnVisibleChanged(e);
+            m_MouseOver = false;
+            if (this.DropDownStyle == ComboBoxStyle.DropDown && this.Items.Count > 0 && this.Items[0] is ComboItem && this.DisplayMember != "")
+            {
+                string s = this.DisplayMember;
+                this.DisplayMember = "";
+                this.DisplayMember = s;
+            }
+            if (this.IsHandleCreated && !this.IsDisposed)
+            {
+                UpdateBackColor();
+            }
+            if (!this.Visible && IsMultiColumnDropDown && IsPopupOpen)
+                IsPopupOpen = false;
+        }
+
+        private int m_SelectedIndexInternal = -1;
+        private bool _InSelectedIndexChanged = false;
+        protected override void OnSelectedIndexChanged(EventArgs e)
+        {
+            m_SelectedIndexInternal = this.SelectedIndex;
+
+            if (!this.DroppedDownInternal)
+            {
+                if (DroppedDownInternal)
+                {
+                    DroppedDownInternal = false;
+                }
+                if (!m_MouseOver)
+                    this.Invalidate(true);
+            }
+            if (this.SelectedIndex == -1 && _WatermarkBehavior == eWatermarkBehavior.HideNonEmpty && m_WatermarkText.Length > 0 && this.Text == "")
+                this.Invalidate(true);
+            else if (this.DropDownStyle == ComboBoxStyle.DropDownList)
+                this.Invalidate();
+
+            base.OnSelectedIndexChanged(e);
+
+            if (!_InSelectedIndexChanged && this.DropDownStyle != ComboBoxStyle.DropDown && !(this.SelectedItem is string))
+            {
+                try
+                {
+                    _InSelectedIndexChanged = true;
+                    if (this.SelectedItem == null)
+                        this.Text = "";
+                    else
+                    {
+                        this.Text = GetItemText(this.SelectedItem);
+                    }
+                }
+                finally
+                {
+                    _InSelectedIndexChanged = false;
+                }
+            }
+
+            ExecuteCommand();
+        }
+
+        public override string Text
+        {
+            get
+            {
+                if (this.DropDownStyle == ComboBoxStyle.DropDownList && this.SelectedItem != null && !(this.SelectedItem is string))
+                    return GetItemText(this.SelectedItem);
+                return base.Text;
+            }
+            set
+            {
+                base.Text = value;
+            }
+        }
+
+        protected override void OnTextChanged(EventArgs e)
+        {
+            if (this.SelectedIndex == -1 && _WatermarkBehavior == eWatermarkBehavior.HideNonEmpty && m_WatermarkText.Length > 0 && this.Text == "")
+                this.Invalidate(true);
+            base.OnTextChanged(e);
+        }
+
+        /*protected override void OnEnabledChanged(EventArgs e)
+        {
+            base.OnEnabledChanged(e);
+            SyncTimerEnabled();
+        }*/
+
+        /*private void SyncTimerEnabled()
+        {
+            if(this.Visible)
+            {
+                if(!m_Timer.Enabled && this.Enabled && !this.DesignMode)
+                    m_Timer.Enabled=true;
+            }
+            else
+            {
+                if(m_Timer.Enabled)
+                    m_Timer.Enabled=false;
+            }
+        }*/
+
+        protected override void ScaleControl(SizeF factor, BoundsSpecified specified)
+        {
+            if (Dpi.RecordScalePerControl)
+                Dpi.SetScaling(factor);
+            base.ScaleControl(factor, specified);
+
+            if (_AutoItemHeight && !this.DesignMode)
+                UpdateItemHeight();
+        }
+
+        /// <summary> 
+        /// Clean up any resources being used.
+        /// </summary>
+        protected override void Dispose(bool disposing)
+        {
+            /*if(m_Timer!=null)
+            {
+                if(m_Timer.Enabled)
+                    m_Timer.Enabled=false;
+                m_Timer.Dispose();
+                m_Timer=null;
+            }*/
+            if (m_MouseOverTimer != null)
+            {
+                m_MouseOverTimer.Enabled = false;
+                m_MouseOverTimer.Dispose();
+                m_MouseOverTimer = null;
+            }
+            m_DisableInternalDrawing = true;
+            if (m_TextWindowMsgHandler != null)
+            {
+                m_TextWindowMsgHandler.ReleaseHandle();
+                m_TextWindowMsgHandler = null;
+            }
+            ReleasePopupHandler();
+            if (_MultiColumnDisplay != null)
+            {
+                _MultiColumnDisplay.AfterNodeSelect -= TreeAfterNodeSelect;
+                _MultiColumnDisplay.BeforeNodeSelect -= TreeBeforeNodeSelect;
+                _MultiColumnDisplay.NodeMouseDown -= TreeNodeMouseDown;
+                _MultiColumnDisplay.DataColumnCreated -= TreeDataColumnCreated;
+                _MultiColumnDisplay.KeyDown -= TreeKeyDown;
+                _MultiColumnDisplay.Dispose();
+                _MultiColumnDisplay = null;
+            }
+            if (_PopupController != null)
+            {
+                _PopupController.Closed -= PopupControllerClosed;
+                _PopupController.Dispose();
+                _PopupController = null;
+            }
+            base.Dispose(disposing);
+        }
+
+        protected override void OnFontChanged(EventArgs e)
+        {
+            base.OnFontChanged(e);
+            UpdateItemHeight();
+        }
+
+        private bool _AutoItemHeight = true;
+        /// <summary>
+        /// Indicates whether ItemHeight property is set automatically based on the current font when DrawMode=OwnerDrawFixed
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether ItemHeight property is set automatically based on the current font when DrawMode=OwnerDrawFixed")]
+        public bool AutoItemHeight
+        {
+            get
+            {
+                return _AutoItemHeight;
+            }
+            set
+            {
+                _AutoItemHeight = value;
+                if (this.IsHandleCreated && value)
+                    UpdateItemHeight();
+            }
+        }
+
+        private void UpdateItemHeight()
+        {
+            if (this.Disposing || this.IsDisposed)
+                return;
+            if (!m_DisableInternalDrawing && this.DrawMode == DrawMode.OwnerDrawFixed)
+            {
+                if (this.IsHandleCreated && this.Parent != null && !this.Parent.IsDisposed)
+                {
+                    this.ItemHeight = this.FontHeight + 2;
+                }
+            }
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public int GetFontHeight()
+        {
+            return this.FontHeight;
+        }
+
+        protected override void OnMeasureItem(MeasureItemEventArgs e)
+        {
+            base.OnMeasureItem(e);
+            if (!m_DisableInternalDrawing)
+            {
+                if (this.DrawMode == DrawMode.OwnerDrawFixed)
+                {
+                    e.ItemHeight = this.ItemHeight - 2;
+                }
+                else
+                {
+                    object o = this.Items[e.Index];
+                    if (o is ComboItem)
+                    {
+                        if (((ComboItem)o).IsFontItem)
+                            MeasureFontItem(e);
+                        else
+                        {
+                            Size sz = GetComboItemSize(o as ComboItem);
+                            e.ItemHeight = sz.Height;
+                            e.ItemWidth = sz.Width;
+                            if (BarFunctions.IsOffice2007Style(m_Style))
+                            {
+                                e.ItemHeight += 6;
+                                e.ItemWidth += 6;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        protected override void OnDrawItem(DrawItemEventArgs e)
+        {
+            base.OnDrawItem(e);
+            InternalDrawItem(e);
+        }
+
+        private void InternalDrawItem(DrawItemEventArgs e)
+        {
+            if (!m_DisableInternalDrawing && e.Index >= 0)
+            {
+                object o = this.Items[e.Index];
+                if (o is ComboItem)
+                    DrawComboItem(e);
+                else
+                    DrawObjectItem(e);
+            }
+        }
+
+        protected virtual Size GetComboItemSize(ComboItem item)
+        {
+            Size size = Size.Empty;
+            if (BarFunctions.IsHandleValid(this))
+            {
+                Graphics g = this.CreateGraphics();
+                try
+                {
+                    size = GetComboItemSize(item, g);
+                }
+                finally
+                {
+                    g.Dispose();
+                }
+            }
+            return size;
+        }
+
+        protected virtual void DrawObjectItem(DrawItemEventArgs e)
+        {
+            Graphics g = e.Graphics;
+            string text = GetItemText(this.Items[e.Index]);
+            Color textColor = Color.Empty;
+            Office2007ButtonItemStateColorTable ct = null;
+
+            if (BarFunctions.IsOffice2007Style(m_Style))
+            {
+                Office2007ButtonItemColorTable bct = GetComboItemColor();
+                if ((e.State & DrawItemState.Selected) != 0 || (e.State & DrawItemState.HotLight) != 0)
+                {
+                    ct = bct.MouseOver;
+                    if (textColor.IsEmpty)
+                        textColor = ct.Text;
+                }
+                else if ((e.State & DrawItemState.Disabled) != 0 || !this.Enabled)
+                    ct = bct.Disabled;
+                else
+                    ct = bct.Default;
+
+                //if (ct != null)
+                //    textColor = ct.Text;
+                if ((e.State & DrawItemState.Disabled) != 0 || !this.Enabled)
+                    textColor = _DisabledForeColor.IsEmpty ? SystemColors.ControlDark : _DisabledForeColor;
+                else if (textColor.IsEmpty)
+                    textColor = this.ForeColor;
+                if ((e.State & DrawItemState.HotLight) != 0 || (e.State & DrawItemState.Selected) != 0)
+                {
+                    Rectangle r = e.Bounds;
+                    //r.Width--;
+                    //r.Height--;
+                    if ((e.State & DrawItemState.ComboBoxEdit) != 0) r.Inflate(1, 1);
+                    Office2007ButtonItemPainter.PaintBackground(g, ct, r, 
+                        (StyleManager.IsMetro(this.Style) ? RoundRectangleShapeDescriptor.RectangleShape : RoundRectangleShapeDescriptor.RoundCorner2));
+                }
+                else
+                    e.DrawBackground();
+            }
+            else
+            {
+                e.DrawBackground();
+
+                if ((e.State & DrawItemState.HotLight) != 0 || (e.State & DrawItemState.Selected) != 0)
+                {
+                    g.FillRectangle(SystemBrushes.Highlight, e.Bounds);
+                    textColor = SystemColors.HighlightText;
+                }
+                else if ((e.State & DrawItemState.Disabled) != 0 || (e.State & DrawItemState.Grayed) != 0)
+                    textColor = _DisabledForeColor.IsEmpty ? SystemColors.ControlDark : _DisabledForeColor;
+                else if (this.ForeColor.IsEmpty)
+                    textColor = SystemColors.ControlText;
+                else
+                    textColor = this.ForeColor;
+            }
+
+            if ((e.State & DrawItemState.Focus) != 0)
+                DrawFocusRectangle(e);
+            Rectangle rText = e.Bounds;
+
+            if ((e.State & DrawItemState.ComboBoxEdit) == DrawItemState.ComboBoxEdit)
+            {
+                //rText.Inflate(-1, 0);
+
+            }
+            else if (BarFunctions.IsOffice2007Style(m_Style))
+                rText.Inflate(-3, 0);
+            else
+                rText.Inflate(-2, 0);
+            TextDrawing.DrawString(g, text, this.Font, textColor, rText, eTextFormat.Default | eTextFormat.NoClipping | eTextFormat.NoPrefix);
+        }
+
+        private Office2007ButtonItemColorTable _ComboItemColors = null;
+        /// <summary>
+        /// Gets or sets the custom color table used to render combo-box items
+        /// </summary>
+        [DefaultValue(null), Browsable(false)]
+        public Office2007ButtonItemColorTable ComboItemColors
+        {
+            get { return _ComboItemColors; }
+            set { _ComboItemColors = value; }
+        }
+
+        protected virtual Office2007ButtonItemColorTable GetComboItemColor()
+        {
+            if (_ComboItemColors != null) return _ComboItemColors;
+            return ((Office2007Renderer)GlobalManager.Renderer).ColorTable.ButtonItemColors[0];
+        }
+
+        private void DrawFocusRectangle(DrawItemEventArgs e)
+        {
+            if (_FocusCuesEnabled && ((e.State & DrawItemState.Focus) == DrawItemState.Focus) && ((e.State & DrawItemState.NoFocusRect) != DrawItemState.NoFocusRect)
+                && ((e.State & DrawItemState.NoFocusRect) == DrawItemState.ComboBoxEdit))
+            {
+                Rectangle r = e.Bounds;
+                r.Inflate(2, 2);
+                //r.Width--;
+                //r.Height--;
+                ControlPaint.DrawFocusRectangle(e.Graphics, r, e.ForeColor, e.BackColor);
+            }
+        }
+
+        private Color _DisabledForeColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets the text color for the text in combo-box when control Enabled property is set to false.
+        /// Setting this property is effective only for DropDownList ComboBox style.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates text color for the text in combo-box when control Enabled property is set to false. Setting this property is effective only for DropDownList ComboBox style.")]
+        public Color DisabledForeColor
+        {
+            get { return _DisabledForeColor; }
+            set
+            {
+                _DisabledForeColor = value;
+                if (!this.Enabled)
+                    this.Invalidate();
+            }
+        }
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool ShouldSerializeDisabledForeColor()
+        {
+            return !_DisabledForeColor.IsEmpty;
+        }
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public void ResetDisabledForeColor()
+        {
+            DisabledForeColor = Color.Empty;
+        }
+
+        private Color _DisabledBackColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets the control background color when control is disabled. Default value is an empty color which indicates that system background color is used when control is disabled.
+        /// </summary>
+        [Description("Indicates control background color when control is disabled"), Category("Appearance")]
+        public Color DisabledBackColor
+        {
+            get { return _DisabledBackColor; }
+            set
+            {
+                if (_DisabledBackColor != value)
+                {
+                    _DisabledBackColor = value;
+                    if (!this.Enabled) this.Invalidate();
+                }
+            }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeDisabledBackColor()
+        {
+            return !_DisabledBackColor.IsEmpty;
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetDisabledBackColor()
+        {
+            DisabledBackColor = Color.Empty;
+        }
+
+        protected virtual void DrawComboItem(DrawItemEventArgs e)
+        {
+            ComboItem item = this.Items[e.Index] as ComboItem;
+            if (item.IsFontItem)
+            {
+                this.DrawFontItem(e);
+                return;
+            }
+
+            Graphics g = e.Graphics;
+            Image img = null;
+            Color clr;
+            Color textColor = item.ForeColor;
+
+            if (item.ImageIndex >= 0 && m_ImageList != null && m_ImageList.Images.Count > item.ImageIndex)
+                img = m_ImageList.Images[item.ImageIndex];
+            else if (item.Image != null)
+                img = item.Image;
+
+            Office2007ButtonItemStateColorTable ct = null;
+            if (BarFunctions.IsOffice2007Style(m_Style))
+            {
+                Office2007ButtonItemColorTable bct = GetComboItemColor();
+                if ((e.State & DrawItemState.Selected) != 0 || (e.State & DrawItemState.HotLight) != 0)
+                {
+                    ct = bct.MouseOver;
+                    if (textColor.IsEmpty)
+                        textColor = ct.Text;
+                }
+                else if ((e.State & DrawItemState.Disabled) != 0 || !this.Enabled)
+                    ct = bct.Disabled;
+                else
+                    ct = bct.Default;
+                //if (ct == null)
+                if (!this.Enabled)
+                    textColor = _DisabledForeColor.IsEmpty ? SystemColors.ControlDark : _DisabledForeColor;
+            }
+
+            if (textColor.IsEmpty)
+                textColor = this.ForeColor;
+
+            int contWidth = this.DropDownWidth;
+            if (item.ImagePosition != HorizontalAlignment.Center && img != null)
+            {
+                contWidth -= img.Width;
+                if (contWidth <= 0)
+                    contWidth = this.DropDownWidth;
+            }
+
+            // Back Color
+            if ((e.State & DrawItemState.Selected) != 0 || (e.State & DrawItemState.HotLight) != 0)
+            {
+                Rectangle backBounds = e.Bounds;
+                if ((e.State & DrawItemState.ComboBoxEdit) != 0)
+                    backBounds.Inflate(1, 1);
+                if (BarFunctions.IsOffice2007Style(m_Style))
+                    Office2007ButtonItemPainter.PaintBackground(g, ct, backBounds,
+                        (StyleManager.IsMetro(this.Style) ? RoundRectangleShapeDescriptor.RectangleShape : RoundRectangleShapeDescriptor.RoundCorner2));
+                else
+                    e.DrawBackground();
+                DrawFocusRectangle(e);
+            }
+            else
+            {
+                clr = item.BackColor;
+                if (item.BackColor.IsEmpty)
+                    clr = e.BackColor;
+                using (SolidBrush clrb = new SolidBrush(clr))
+                    g.FillRectangle(clrb, e.Bounds);
+            }
+
+            // Draw Image
+            Rectangle rImg = e.Bounds;
+            Rectangle rText = e.Bounds;
+            //if (e.State != DrawItemState.ComboBoxEdit)
+            {
+                if ((e.State & DrawItemState.ComboBoxEdit) == DrawItemState.ComboBoxEdit)
+                {
+                    if (img != null)
+                    {
+                        rText.X += 3;
+                        rText.Width -= 3;
+                    }
+                    //rText.Inflate(-1, 0);
+                    //rText.Y++;
+                    //rText.Height--;
+                }
+                else if (BarFunctions.IsOffice2007Style(m_Style))
+                    rText.Inflate(-3, 0);
+                else
+                    rText.Inflate(-2, 0);
+            }
+            if (img != null)
+            {
+                rImg.Width = img.Width;
+                rImg.Height = img.Height;
+                if (item.ImagePosition == HorizontalAlignment.Left)
+                {
+                    // Left
+                    if (e.Bounds.Height > img.Height)
+                        rImg.Y += (e.Bounds.Height - img.Height) / 2;
+                    rText.Width -= rImg.Width;
+                    rText.X += rImg.Width;
+                }
+                else if (item.ImagePosition == HorizontalAlignment.Right)
+                {
+                    // Right
+                    if (e.Bounds.Height > img.Height)
+                        rImg.Y += (e.Bounds.Height - img.Height) / 2;
+                    rImg.X = e.Bounds.Right - img.Width;
+                    rText.Width -= rImg.Width;
+                }
+                else
+                {
+                    // Center
+                    rImg.X += (e.Bounds.Width - img.Width) / 2;
+                    rText.Y = rImg.Bottom;
+                }
+                g.DrawImage(img, rImg);
+            }
+
+            // Draw Text
+            if (item.Text != "")
+            {
+                System.Drawing.Font f = e.Font;
+                bool bDisposeFont = false;
+                try
+                {
+                    if (item.FontName != "")
+                    {
+                        f = new Font(item.FontName, item.FontSize, item.FontStyle);
+                        bDisposeFont = true;
+                    }
+                    else if (item.FontStyle != f.Style)
+                    {
+                        f = new Font(f, item.FontStyle);
+                        bDisposeFont = true;
+                    }
+                }
+                catch
+                {
+                    f = e.Font;
+                    if (f == null)
+                    {
+                        f = SystemFonts.DefaultFont; // System.Windows.Forms.SystemInformation.MenuFont.Clone() as Font;
+                        bDisposeFont = true;
+                    }
+                }
+
+                eTextFormat format = eTextFormat.Default | eTextFormat.NoClipping | eTextFormat.NoPrefix;
+                if (item.TextFormat.Alignment == StringAlignment.Center)
+                    format = eTextFormat.HorizontalCenter;
+                else if (item.TextFormat.Alignment == StringAlignment.Far)
+                    format = eTextFormat.Right;
+                if (item.TextLineAlignment == StringAlignment.Center)
+                    format |= eTextFormat.VerticalCenter;
+                else if (item.TextLineAlignment == StringAlignment.Far)
+                    format |= eTextFormat.Bottom;
+                TextDrawing.DrawString(g, item.Text, f, textColor, rText, format);
+
+                if (bDisposeFont)
+                    f.Dispose();
+            }
+
+        }
+
+        protected virtual Size GetComboItemSize(ComboItem item, Graphics g)
+        {
+            if (this.DrawMode == DrawMode.OwnerDrawFixed)
+                return new Size(this.DropDownWidth, this.ItemHeight);
+
+            Size sz = Size.Empty;
+            Size textSize = Size.Empty;
+            Image img = null;
+            if (item.ImageIndex >= 0)
+                img = m_ImageList.Images[item.ImageIndex];
+            else if (item.Image != null)
+                img = item.Image;
+
+            int contWidth = this.DropDownWidth;
+            if (item.ImagePosition != HorizontalAlignment.Center && img != null)
+            {
+                contWidth -= img.Width;
+                if (contWidth <= 0)
+                    contWidth = this.DropDownWidth;
+            }
+
+            Font font = this.Font;
+            if (item.FontName != "")
+            {
+                try
+                {
+                    font = new Font(item.FontName, item.FontSize, item.FontStyle);
+                }
+                catch
+                {
+                    font = this.Font;
+                }
+            }
+
+            eTextFormat format = eTextFormat.Default;
+            if (item.TextFormat.Alignment == StringAlignment.Center)
+                format = eTextFormat.HorizontalCenter;
+            else if (item.TextFormat.Alignment == StringAlignment.Far)
+                format = eTextFormat.Right;
+            if (item.TextLineAlignment == StringAlignment.Center)
+                format |= eTextFormat.VerticalCenter;
+            else if (item.TextLineAlignment == StringAlignment.Far)
+                format |= eTextFormat.Bottom;
+
+            textSize = TextDrawing.MeasureString(g, item.Text, font, this.DropDownWidth, format);
+            textSize.Width += 2;
+            sz.Width = textSize.Width;
+            sz.Height = textSize.Height;
+            if (sz.Width < this.DropDownWidth)
+                sz.Width = this.DropDownWidth;
+
+            if (item.ImagePosition == HorizontalAlignment.Center && img != null)
+                sz.Height += img.Height;
+            else if (img != null && img.Height > sz.Height)
+                sz.Height = img.Height;
+
+            return sz;
+        }
+
+        /// <summary>
+        /// Loads all fonts available on system into the combo box.
+        /// </summary>
+        public void LoadFonts()
+        {
+            this.Items.Clear();
+
+            System.Drawing.Text.InstalledFontCollection colInstalledFonts = new System.Drawing.Text.InstalledFontCollection();
+            FontFamily[] aFamilies = colInstalledFonts.Families;
+            foreach (FontFamily ff in aFamilies)
+            {
+                ComboItem item = new ComboItem();
+                item.IsFontItem = true;
+                item.FontName = ff.GetName(0);
+                item.FontSize = this.Font.Size;
+                item.Text = ff.GetName(0);
+                this.Items.Add(item);
+            }
+            this.DropDownWidth = this.Width * 2;
+        }
+
+        private void DrawFontItem(DrawItemEventArgs e)
+        {
+            FontStyle[] styles = new FontStyle[4] { FontStyle.Regular, FontStyle.Bold, FontStyle.Italic, FontStyle.Bold | FontStyle.Italic };
+            if (!BarFunctions.IsOffice2007Style(m_Style))
+                e.DrawBackground();
+            string fontname = this.Items[e.Index].ToString();
+            FontFamily family = new FontFamily(fontname);
+
+            int iWidth = this.DropDownWidth / 2 - 4;
+            if (iWidth <= 0)
+                iWidth = this.Width;
+            foreach (FontStyle style in styles)
+            {
+                if (family.IsStyleAvailable(style))
+                {
+                    eTextFormat format = eTextFormat.Default | eTextFormat.NoPrefix;
+                    Color textColor = (e.State & DrawItemState.Selected) != 0 ? SystemColors.HighlightText : SystemColors.ControlText;
+
+                    Office2007ButtonItemStateColorTable ct = null;
+                    if (BarFunctions.IsOffice2007Style(m_Style))
+                    {
+                        Office2007ButtonItemColorTable bct = GetComboItemColor();
+                        if ((e.State & DrawItemState.Selected) != 0 || (e.State & DrawItemState.HotLight) != 0)
+                            ct = bct.MouseOver;
+                        else if ((e.State & DrawItemState.Disabled) != 0 || !this.Enabled)
+                            ct = bct.Disabled;
+                        else
+                            ct = bct.Default;
+                        //if (ct == null)
+                        if (!this.Enabled)
+                            textColor = _DisabledForeColor.IsEmpty ? SystemColors.ControlDark : _DisabledForeColor;
+                        else if (StyleManager.IsMetro(StyleManager.Style))
+                            textColor = ct.Text;
+                        else if (this.ForeColor.IsEmpty)
+                            textColor = SystemColors.ControlText;
+                        else
+                            textColor = this.ForeColor;
+
+                        if ((e.State & DrawItemState.Selected) != 0 || (e.State & DrawItemState.HotLight) != 0)
+                            Office2007ButtonItemPainter.PaintBackground(e.Graphics, ct, e.Bounds,
+                                (StyleManager.IsMetro(this.Style) ? RoundRectangleShapeDescriptor.RectangleShape : RoundRectangleShapeDescriptor.RoundCorner2));
+                        else
+                        {
+                            e.DrawBackground();
+                        }
+                    }
+
+                    if ((e.State & DrawItemState.ComboBoxEdit) == DrawItemState.ComboBoxEdit)
+                    {
+                        Rectangle rt = e.Bounds;
+                        rt.Height = 0; // Prevents clipping based on height
+                        format |= eTextFormat.NoClipping | eTextFormat.NoPadding;
+                        TextDrawing.DrawString(e.Graphics, fontname, this.Font, textColor, rt, format);
+                    }
+                    else
+                    {
+                        Size szFont = TextDrawing.MeasureString(e.Graphics, fontname, this.Font);
+                        int iDiff = (int)((e.Bounds.Height - szFont.Height) / 2);
+                        Rectangle rFontName = new Rectangle(e.Bounds.X, e.Bounds.Y + iDiff,
+                            ((e.State & DrawItemState.Disabled) == DrawItemState.Disabled ? e.Bounds.Width : Math.Max(e.Bounds.Width - 100, 32)), e.Bounds.Height - iDiff);
+                        TextDrawing.DrawString(e.Graphics, fontname, this.Font, textColor, rFontName, format);
+                        Rectangle rRemainder = new Rectangle(e.Bounds.X + iWidth + 4, e.Bounds.Y, e.Bounds.Width + 100, e.Bounds.Height);
+                        //using(Font f = new Font(family, (float)e.Bounds.Height - 8, style))
+                        using (Font f = new Font(family, this.Font.Size, style))
+                            TextDrawing.DrawString(e.Graphics, fontname, f, textColor, rRemainder, format);
+                    }
+                    break;
+                }
+            }
+            if (family != null) family.Dispose();
+        }
+
+        private void MeasureFontItem(MeasureItemEventArgs e)
+        {
+            e.ItemHeight = Dpi.Height18;
+        }
+
+#if !FRAMEWORK20
+		/// <summary>
+		/// Specifies the height of the drop-down portion of combo box.
+		/// </summary>
+		[Browsable(true),Category("Behavior"),Description("The height, in pixels, of drop down box in a combo box."), DefaultValue(0)]
+		public int DropDownHeight
+		{
+			get
+			{
+				return m_DropDownHeight;
+			}
+			set
+			{
+				m_DropDownHeight=value;
+			}
+		}
+#endif
+        private bool _AutoReleaseFocus = true;
+        [DefaultValue(true), Browsable(false)]
+        public bool AutoReleaseFocus
+        {
+            get
+            {
+                return _AutoReleaseFocus;
+            }
+            set
+            {
+                _AutoReleaseFocus = value;
+            }
+        }
+        /// <summary>
+        /// Releases the focus from combo box. The control that last had focus will receive focus back when this method is called.
+        /// </summary>
+        public void ReleaseFocus()
+        {
+            if (_AutoReleaseFocus && this.Focused && m_LastFocusWindow != IntPtr.Zero)
+            {
+                Control ctrl = Control.FromChildHandle(m_LastFocusWindow);
+                if (ctrl != this)
+                {
+                    if (ctrl != null)
+                        ctrl.Focus();
+                    else
+                    {
+                        NativeFunctions.SetFocus(m_LastFocusWindow);
+                    }
+                    this.OnLostFocus(new System.EventArgs());
+                }
+                m_LastFocusWindow = IntPtr.Zero;
+
+            }
+        }
+
+        protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
+        {
+            if (keyData == Keys.Enter && m_PreventEnterBeep)
+            {
+                this.OnKeyPress(new KeyPressEventArgs((char)13));
+                return true;
+            }
+            return base.ProcessCmdKey(ref msg, keyData);
+        }
+
+        protected override void OnKeyDown(KeyEventArgs e)
+        {
+            if (!IsStandalone)
+            {
+                if (e.KeyCode == Keys.Enter)
+                    ReleaseFocus();
+                else if (e.KeyCode == Keys.Escape)
+                {
+                    ReleaseFocus();
+                }
+            }
+
+            base.OnKeyDown(e);
+        }
+
+        /// <summary>
+        /// Gets the window handle that the drop down list is bound to.
+        /// </summary>
+        [Browsable(false)]
+        public IntPtr DropDownHandle
+        {
+            get
+            {
+                return m_DropDownHandle;
+            }
+        }
+
+        internal bool MouseOver
+        {
+            get
+            {
+                return m_MouseOver;
+            }
+            set
+            {
+                if (m_MouseOver != value)
+                {
+                    m_MouseOver = value;
+                    this.Invalidate(true);
+                }
+            }
+        }
+
+        [System.ComponentModel.Editor("DevComponents.DotNetBar.Design.ComboItemsEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), Localizable(true)]
+        public new ComboBox.ObjectCollection Items
+        {
+            get { return base.Items; }
+        }
+
+        protected override void OnEnabledChanged(EventArgs e)
+        {
+            UpdateBackColor();
+            base.OnEnabledChanged(e);
+        }
+
+        private void UpdateBackColor()
+        {
+            if (!m_UseCustomBackColor)
+            {
+                Color c = GetComboColors().Background;
+                if (this.BackColor != c)
+                    this.BackColor = c;
+            }
+        }
+
+        protected override void OnMouseEnter(EventArgs e)
+        {
+            if (!m_MouseOver)
+            {
+                m_MouseOver = true;
+                UpdateBackColor();
+                this.Invalidate(true);
+            }
+            SetMouseOverTimerEnabled(true);
+            base.OnMouseEnter(e);
+        }
+        protected override void OnMouseLeave(EventArgs e)
+        {
+            //if(this.DroppedDown)
+            //{
+            //    m_MouseOver=false;
+            //}
+            //else if(this.DropDownStyle!=ComboBoxStyle.DropDownList && m_MouseOver)
+            //{
+            //    // Get the mouse position
+            //    Point p=this.PointToClient(Control.MousePosition);
+            //    if(!this.ClientRectangle.Contains(p))
+            //    {
+            //        m_MouseOver=false;
+            //    }
+            //}
+            //else if(m_MouseOver)
+            //{
+            //    m_MouseOver=false;
+            //}
+            SetMouseOverTimerEnabled(true);
+            //Color c = GetComboColors().Background;
+            //if (this.BackColor != c)
+            //    this.BackColor = c;
+            //this.Refresh();
+            base.OnMouseLeave(e);
+        }
+
+        protected override void OnMouseMove(MouseEventArgs e)
+        {
+            base.OnMouseMove(e);
+            if (!m_MouseOver)
+            {
+                //if (!m_Focused)
+                {
+                    m_MouseOver = true;
+                    this.Invalidate();
+                    SetMouseOverTimerEnabled(true);
+                }
+            }
+        }
+
+        private void SetMouseOverTimerEnabled(bool value)
+        {
+            if (m_MouseOverTimer != null) m_MouseOverTimer.Enabled = value;
+        }
+
+        private void SetupTextBoxMessageHandler()
+        {
+#if FRAMEWORK20
+            if (this.DropDownStyle != ComboBoxStyle.DropDownList && this.AutoCompleteMode == AutoCompleteMode.None)
+#else
+            if (this.DropDownStyle != ComboBoxStyle.DropDownList)
+#endif
+            {
+                if (m_TextWindowMsgHandler == null)
+                {
+                    // Get hold of the text box
+                    IntPtr hwnd = GetWindow(this.Handle, GW_CHILD);
+                    // Subclass so we can track messages
+                    if (hwnd != IntPtr.Zero)
+                    {
+                        m_TextWindowMsgHandler = new ComboTextBoxMsgHandler();
+                        m_TextWindowMsgHandler.MouseLeave += new EventHandler(this.TextBoxMouseLeave);
+                        m_TextWindowMsgHandler.Paint += new PaintEventHandler(TextBoxPaint);
+                        m_TextWindowMsgHandler.AssignHandle(hwnd);
+                    }
+                }
+            }
+            else if (m_TextWindowMsgHandler != null)
+            {
+                m_TextWindowMsgHandler.ReleaseHandle();
+                m_TextWindowMsgHandler = null;
+            }
+        }
+
+        protected override void OnDropDownStyleChanged(EventArgs e)
+        {
+            SetupTextBoxMessageHandler();
+            base.OnDropDownStyleChanged(e);
+        }
+
+        private void TextBoxPaint(object sender, PaintEventArgs e)
+        {
+            if (ShouldDrawWatermark())
+                DrawWatermark(e.Graphics);
+        }
+
+        private void TextBoxMouseLeave(object sender, EventArgs e)
+        {
+            if (!m_MouseOver)
+                return;
+            SetMouseOverTimerEnabled(true);
+        }
+
+        /// <summary>
+        /// Gets or sets whether FocusHighlightColor is used as background color to highlight text box when it has input focus. Default value is false.
+        /// </summary>
+        [DefaultValue(false), Browsable(true), Category("Appearance"), Description("Indicates whether FocusHighlightColor is used as background color to highlight text box when it has input focus.")]
+        public virtual bool FocusHighlightEnabled
+        {
+            get { return _FocusHighlightEnabled; }
+            set
+            {
+                if (_FocusHighlightEnabled != value)
+                {
+                    _FocusHighlightEnabled = value;
+                    if (this.Focused)
+                        this.Invalidate();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the color used as background color to highlight text box when it has input focus and focus highlight is enabled.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), Description("Indicates color used as background color to highlight text box when it has input focus and focus highlight is enabled.")]
+        public virtual Color FocusHighlightColor
+        {
+            get { return _FocusHighlightColor; }
+            set
+            {
+                if (_FocusHighlightColor != value)
+                {
+                    _FocusHighlightColor = value;
+                    if (this.Focused)
+                        this.Invalidate();
+                }
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeFocusHighlightColor()
+        {
+            return !_FocusHighlightColor.Equals(_DefaultHighlightColor);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetFocusHighlightColor()
+        {
+            FocusHighlightColor = _DefaultHighlightColor;
+        }
+        #endregion
+
+        #region Multi-Column DropDown
+        protected override void OnLeave(EventArgs e)
+        {
+            if (IsMultiColumnDropDown && IsPopupOpen)
+                IsPopupOpen = false;
+
+            base.OnLeave(e);
+        }
+
+        private string _DropDownColumns = "";
+        /// <summary>
+        /// Gets or sets comma separated list of field names that are displayed on drop down. When set it activates ComboBoxEx multi-column drop-down mode.
+        /// DataSource must be set in order for drop-down to display data.
+        /// </summary>
+        [DefaultValue(""), Category("Multi-Column"), Description("Indicates comma separated list of field names that are displayed on drop down. When set it activates ComboBoxEx multi-column drop-down mode.")]
+        [Editor("DevComponents.DotNetBar.Design.DataMembersSelector, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor))]
+        public string DropDownColumns
+        {
+            get { return _DropDownColumns; }
+            set
+            {
+                if (value != _DropDownColumns)
+                {
+                    string oldValue = _DropDownColumns;
+                    _DropDownColumns = value;
+                    OnDropDownColumnsChanged(oldValue, value);
+                }
+            }
+        }
+        private AdvTree.AdvTree _MultiColumnDisplay = null;
+        /// <summary>
+        /// Called when DropDownColumns property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnDropDownColumnsChanged(string oldValue, string newValue)
+        {
+            _DataChangeType |= eDataChange.DropDownColumnsChanged;
+        }
+
+        private string _DropDownColumnsHeaders = "";
+        /// <summary>
+        /// Indicates custom column names with each column separated by new line, i.e. \r\n escape sequence.
+        /// </summary>
+        [DefaultValue(""), Category("Multi-Column"), Description("Indicates custom column names with each column separated by new line, i.e. \r\n escape sequence.")]
+        [Editor("DevComponents.DotNetBar.Design.ColumnNamesEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor))]
+        [TypeConverter("DevComponents.DotNetBar.Design.ColumnNamesConverter, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+        public string DropDownColumnsHeaders
+        {
+            get { return _DropDownColumnsHeaders; }
+            set
+            {
+                if (value != _DropDownColumnsHeaders)
+                {
+                    string oldValue = _DropDownColumnsHeaders;
+                    _DropDownColumnsHeaders = value;
+                    OnDropDownColumnsHeadersChanged(oldValue, value);
+                }
+            }
+        }
+
+        private string[] _ColumnsHeaders = new string[0];
+        /// <summary>
+        /// Called when DropDownColumnsHeaders property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnDropDownColumnsHeadersChanged(string oldValue, string newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("DropDownColumnsHeaders"));
+            _DataChangeType |= eDataChange.DropDownColumnsChanged;
+
+            if (!string.IsNullOrEmpty(_DropDownColumnsHeaders))
+            {
+                _ColumnsHeaders = _DropDownColumnsHeaders.Split('\r');
+                for (int i = 0; i < _ColumnsHeaders.Length; i++)
+                {
+                    _ColumnsHeaders[i] = _ColumnsHeaders[i].Replace("\n", "");
+                }
+            }
+            else
+                _ColumnsHeaders = new string[0];
+        }
+
+        private bool IsMultiColumnDropDown
+        {
+            get
+            {
+                return !string.IsNullOrEmpty(_DropDownColumns);
+            }
+        }
+
+        /// <summary>
+        /// Occurs before the multi-column popup is opened and it allows canceling of popup by setting CancelEventArgs.Cancel=true.
+        /// </summary>
+        [Description("Occurs before the multi-column popup is opened and it allows canceling of popup by setting CancelEventArgs.Cancel=true.")]
+        public event CancelEventHandler BeforeMultiColumnPopupOpen;
+        /// <summary>
+        /// Raises BeforeMultiColumnPopupOpen event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnBeforeMultiColumnPopupOpen(CancelEventArgs e)
+        {
+            CancelEventHandler handler = BeforeMultiColumnPopupOpen;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        private eDataChange _DataChangeType = eDataChange.None;
+        private DateTime _MultiDropDownOpenedAtTime = DateTime.MinValue;
+        private DateTime _MultiDropDownClosedAtTime = DateTime.MinValue;
+        private PopupHostController _PopupController = null;
+        private void OpenMultiColumnDropDown()
+        {
+            if (_PopupController == null)
+            {
+                _PopupController = new PopupHostController();
+                _PopupController.Closed += PopupControllerClosed;
+            }
+
+            if (_MultiColumnDisplay == null)
+            {
+                _MultiColumnDisplay = CreateMultiColumnDisplayControl();
+                _DataChangeType = eDataChange.All;
+            }
+            if (IsDataChange(eDataChange.BindingContextChanged))
+                _MultiColumnDisplay.BindingContext = this.BindingContext;
+            if (IsDataChange(eDataChange.DataSourceChanged))
+                _MultiColumnDisplay.DataSource = this.DataSource;
+            if (IsDataChange(eDataChange.DropDownColumnsChanged))
+                _MultiColumnDisplay.DisplayMembers = _DropDownColumns;
+
+            if (!_PopupController.PopupUserSize || !_PreservePopupSize)
+            {
+                _MultiColumnDisplay.Height = Dpi.Height(this.DropDownHeight);
+                _MultiColumnDisplay.Width = Dpi.Width(this.DropDownWidth);
+            }
+            _PopupController.CloseButtonVisible = _PopupCloseButtonVisible;
+            CancelEventArgs cancelArgs = new CancelEventArgs();
+            OnBeforeMultiColumnPopupOpen(cancelArgs);
+            if (cancelArgs.Cancel)
+                return;
+
+            _MultiColumnDisplay.SelectedIndex = this.SelectedIndex;
+
+            Point location = PointToScreen(new Point(0, Height));
+
+            ePopupResizeEdge resize = _EnablePopupResize ? ePopupResizeEdge.BottomRight : ePopupResizeEdge.None;
+            _PopupController.Show(_MultiColumnDisplay, location.X, location.Y, 0, 0, resize);
+            if (_MultiColumnDisplay.SelectedNode != null)
+                _MultiColumnDisplay.SelectedNode.EnsureVisible();
+            _DroppedDown = true;
+            _MultiDropDownOpenedAtTime = DateTime.Now;
+
+            _DataChangeType = eDataChange.None;
+
+            base.OnDropDown(EventArgs.Empty);
+        }
+        private bool _DisconnectedPopupDataSource = false;
+        protected bool DisconnectedPopupDataSource
+        {
+            get { return _DisconnectedPopupDataSource; }
+            set { _DisconnectedPopupDataSource = value; }
+        }
+        void PopupControllerClosed(object sender, ToolStripDropDownClosedEventArgs e)
+        {
+            _DroppedDown = false;
+
+            m_SelectedIndexInternal = this.SelectedIndex;
+            _MultiDropDownClosedAtTime = DateTime.Now;
+            if (DisconnectedPopupDataSource && _MultiColumnDisplay != null)
+            {
+                _MultiColumnDisplay.DataSource = null;
+                _MultiColumnDisplay.DisplayMembers = string.Empty;
+                _MultiColumnDisplay.BindingContext = null;
+                _DataChangeType = eDataChange.All;
+            }
+            base.OnDropDownClosed(e);
+        }
+        private void CloseMultiColumnDropDown()
+        {
+            if (_PopupController != null && _DroppedDown)
+            {
+                _PopupController.Hide();
+            }
+        }
+        private AdvTree.AdvTree CreateMultiColumnDisplayControl()
+        {
+            AdvTree.AdvTree tree = new DevComponents.AdvTree.AdvTree();
+#if (!TRIAL)
+            tree.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F";
+#endif
+            tree.EnableDataPositionChange = false;
+            tree.BackgroundStyle.Reset();
+            tree.BackgroundStyle.BackColor = SystemColors.Window;
+            tree.BackgroundStyle.Border = eStyleBorderType.None;
+            tree.ExpandButtonType = eExpandButtonType.Triangle;
+            tree.DragDropEnabled = false;
+            tree.HotTracking = true;
+            tree.Indent = 0;
+            tree.ExpandWidth = 0;
+            tree.SelectionFocusAware = false;
+            ElementStyle nodeStyle = new ElementStyle();
+            nodeStyle.Name = "nodeElementStyle";
+            nodeStyle.TextColor = System.Drawing.SystemColors.ControlText;
+            tree.NodeStyle = nodeStyle;
+            tree.PathSeparator = ";";
+            tree.Styles.Add(nodeStyle);
+            tree.AfterNodeSelect += TreeAfterNodeSelect;
+            tree.BeforeNodeSelect += TreeBeforeNodeSelect;
+            tree.NodeMouseDown += TreeNodeMouseDown;
+            tree.NodeClick += new TreeNodeMouseEventHandler(TreeNodeClick);
+            tree.DataColumnCreated += TreeDataColumnCreated;
+            tree.KeyDown += TreeKeyDown;
+            if (_MultiColumnControlFont != null)
+                tree.Font = _MultiColumnControlFont;
+            return tree;
+        }
+
+        void TreeKeyDown(object sender, KeyEventArgs e)
+        {
+            if (_DroppedDown && e.KeyCode == Keys.Enter)
+            {
+                //if (this.SelectionClosesPopup)
+                //    CloseMultiColumnDropDown();
+                //else
+                {
+                    this.SelectedIndex = _MultiColumnDisplay.SelectedIndex;
+                    CloseMultiColumnDropDown();
+                    OnSelectionChangeCommitted(e);
+                }
+            }
+        }
+        /// <summary>
+        /// Occurs when ColumnHeader is automatically created by control as result of data binding for multi-column drop-down and provides you with opportunity to modify it.
+        /// </summary>
+        [Description("Occurs when ColumnHeader is automatically created by control as result of data binding for multi-column drop down and provides you with opportunity to modify it.")]
+        public event DevComponents.DotNetBar.Controls.DataColumnEventHandler DataColumnCreated;
+        /// <summary>
+        /// Raises the DataColumnCreated event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnDataColumnCreated(DevComponents.DotNetBar.Controls.DataColumnEventArgs e)
+        {
+            if (DataColumnCreated != null)
+                DataColumnCreated(this, e);
+        }
+        void TreeDataColumnCreated(object sender, DataColumnEventArgs e)
+        {
+            if (_ColumnsHeaders.Length > 0)
+            {
+                int i = e.ColumnHeader.Parent.IndexOf(e.ColumnHeader);
+                if (i < _ColumnsHeaders.Length)
+                    e.ColumnHeader.Text = _ColumnsHeaders[i];
+            }
+            OnDataColumnCreated(e);
+        }
+        private void TreeNodeMouseDown(object sender, TreeNodeMouseEventArgs e)
+        {
+            //if (this.SelectionClosesPopup && e.Button == MouseButtons.Left && e.Node != null &&
+            //    e.Node.IsSelected && _DroppedDown)
+            //{
+            //    CloseMultiColumnDropDown();
+            //}
+        }
+        void TreeNodeClick(object sender, TreeNodeMouseEventArgs e)
+        {
+            if (e.Button == MouseButtons.Left && e.Node != null &&
+                e.Node.IsSelected && _DroppedDown)
+            {
+                this.SelectedIndex = _MultiColumnDisplay.SelectedIndex;
+                if (this.SelectionClosesPopup)
+                    CloseMultiColumnDropDown();
+                OnSelectionChangeCommitted(e);
+            }
+        }
+        private void TreeAfterNodeSelect(object sender, AdvTreeNodeEventArgs e)
+        {
+            //if (_DroppedDown && (e.Action == eTreeAction.Keyboard))
+            //{
+            //    this.SelectedIndex = _MultiColumnDisplay.SelectedIndex;
+            //}
+
+            //if (this.SelectionClosesPopup && _DroppedDown && e.Action == eTreeAction.Keyboard)
+            //{
+            //    CloseMultiColumnDropDown();
+            //}
+
+            //if (/*e.Action == eTreeAction.Mouse || */ e.Action == eTreeAction.Keyboard)
+            //    OnSelectionChangeCommitted(e); 
+        }
+        private void TreeBeforeNodeSelect(object sender, AdvTreeNodeCancelEventArgs e)
+        {
+            OnSelectionChanging(e);
+        }
+        /// <summary>
+        /// Occurs before selection on multi-column drop-down has changed and allows canceling of the change. Applies to multi-column drop-down only.
+        /// </summary>
+        [Description("Occurs before selection on multi-column drop-down has changed and allows canceling of the change.")]
+        public event AdvTreeNodeCancelEventHandler SelectionChanging;
+        /// <summary>
+        /// Raises SelectionChanging event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnSelectionChanging(AdvTreeNodeCancelEventArgs e)
+        {
+            AdvTreeNodeCancelEventHandler handler = SelectionChanging;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        private bool _SelectionClosesPopup = true;
+        /// <summary>
+        /// Gets or sets whether selection change on multi-column drop-down closes the popup. Default value is true. Applies to multi-column drop-down only.
+        /// </summary>
+        [DefaultValue(true), Category("Multi-Column"), Description("Indicates whether selection change on multi-column drop-down closes the popup. Default value is true. Applies to multi-column drop-down only.")]
+        public bool SelectionClosesPopup
+        {
+            get { return _SelectionClosesPopup; }
+            set
+            {
+                _SelectionClosesPopup = value;
+            }
+        }
+
+        private bool _PreservePopupSize = true;
+        /// <summary>
+        /// Indicates whether multi-column popup size is preserved between popup displays if popup is resized by end-user. Applies to multi-column drop-down only.
+        /// </summary>
+        [DefaultValue(true), Category("Multi-Column"), Description("Indicates whether multi-column popup size is preserved between popup displays if popup is resized by end-user. Applies to multi-column drop-down only.")]
+        public bool PreservePopupSize
+        {
+            get { return _PreservePopupSize; }
+            set
+            {
+                _PreservePopupSize = value;
+            }
+        }
+
+        private bool _EnablePopupResize = true;
+        /// <summary>
+        /// Indicates whether multi-column popup can be resized by end user. Applies to multi-column drop-down only.
+        /// </summary>
+        [DefaultValue(true), Category("Multi-Column"), Description("Indicates whether multi-column popup can be resized by end user. Applies to multi-column drop-down only.")]
+        public bool EnablePopupResize
+        {
+            get { return _EnablePopupResize; }
+            set
+            {
+                _EnablePopupResize = value;
+            }
+        }
+
+        private bool _PopupCloseButtonVisible = true;
+        /// <summary>
+        /// Indicates whether multi-column popup close button is visible.
+        /// </summary>
+        [DefaultValue(true), Category("Multi-Column"), Description("Indicates whether multi-column popup close button is visible.")]
+        public bool PopupCloseButtonVisible
+        {
+            get { return _PopupCloseButtonVisible; }
+            set
+            {
+                _PopupCloseButtonVisible = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether multi-column popup window is open. Applies to multi-column drop-down only.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsPopupOpen
+        {
+            get { return _DroppedDown; }
+            set
+            {
+                if (value != _DroppedDown)
+                {
+                    if (IsMultiColumnDropDown)
+                    {
+                        if (value)
+                            OpenMultiColumnDropDown();
+                        else
+                            CloseMultiColumnDropDown();
+                    }
+                }
+            }
+        }
+
+        protected override void OnDataSourceChanged(EventArgs e)
+        {
+            if (_MultiColumnDisplay != null)
+                _MultiColumnDisplay.DataSource = null;
+            _DataChangeType |= eDataChange.DataSourceChanged;
+            base.OnDataSourceChanged(e);
+        }
+        protected override void OnBindingContextChanged(EventArgs e)
+        {
+            _DataChangeType |= eDataChange.BindingContextChanged;
+            base.OnBindingContextChanged(e);
+        }
+
+        private bool IsDataChange(eDataChange changeType)
+        {
+            return ((_DataChangeType & changeType) == changeType);
+        }
+        [Flags()]
+        private enum eDataChange
+        {
+            None = 0,
+            DataSourceChanged = 1,
+            DropDownColumnsChanged = 2,
+            BindingContextChanged = 4,
+            All = DataSourceChanged | DropDownColumnsChanged | BindingContextChanged
+        }
+        /// <summary>
+        /// Gets the reference to the control which is used to display multi-column data on popup. Control is created just before the popup is opened.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public AdvTree.AdvTree MultiColumnDisplayControl
+        {
+            get
+            {
+                return _MultiColumnDisplay;
+            }
+        }
+
+        private Font _MultiColumnControlFont = null;
+        /// <summary>
+        /// Indicates the font used by the multi-column control on the popup.
+        /// </summary>
+        [DefaultValue(null), Category("Appearance"), Description("Indicates the font used by the multi-column control on the popup.")]
+        public Font MultiColumnControlFont
+        {
+            get { return _MultiColumnControlFont; }
+            set
+            {
+                if (value != _MultiColumnControlFont)
+                {
+                    Font oldValue = _MultiColumnControlFont;
+                    _MultiColumnControlFont = value;
+                    OnMultiColumnControlFontChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when MultiColumnControlFont property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnMultiColumnControlFontChanged(Font oldValue, Font newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("MultiColumnControlFont"));
+            if (_MultiColumnDisplay != null)
+                _MultiColumnDisplay.Font = _MultiColumnControlFont;
+        }
+        #endregion
+
+        #region ICommandSource Members
+        protected virtual void ExecuteCommand()
+        {
+            if (_Command == null) return;
+            CommandManager.ExecuteCommand(this);
+        }
+
+        /// <summary>
+        /// Gets or sets the command assigned to the item. Default value is null.
+        /// <remarks>Note that if this property is set to null Enabled property will be set to false automatically to disable the item.</remarks>
+        /// </summary>
+        [DefaultValue(null), Category("Commands"), Description("Indicates the command assigned to the item.")]
+        public Command Command
+        {
+            get { return (Command)((ICommandSource)this).Command; }
+            set
+            {
+                ((ICommandSource)this).Command = value;
+            }
+        }
+
+        private ICommand _Command = null;
+        //[Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        ICommand ICommandSource.Command
+        {
+            get
+            {
+                return _Command;
+            }
+            set
+            {
+                bool changed = false;
+                if (_Command != value)
+                    changed = true;
+
+                if (_Command != null)
+                    CommandManager.UnRegisterCommandSource(this, _Command);
+                _Command = value;
+                if (value != null)
+                    CommandManager.RegisterCommand(this, value);
+                if (changed)
+                    OnCommandChanged();
+            }
+        }
+
+        /// <summary>
+        /// Called when Command property value changes.
+        /// </summary>
+        protected virtual void OnCommandChanged()
+        {
+        }
+
+        private object _CommandParameter = null;
+        /// <summary>
+        /// Gets or sets user defined data value that can be passed to the command when it is executed.
+        /// </summary>
+        [Browsable(true), DefaultValue(null), Category("Commands"), Description("Indicates user defined data value that can be passed to the command when it is executed."), System.ComponentModel.TypeConverter(typeof(System.ComponentModel.StringConverter)), System.ComponentModel.Localizable(true)]
+        public object CommandParameter
+        {
+            get
+            {
+                return _CommandParameter;
+            }
+            set
+            {
+                _CommandParameter = value;
+            }
+        }
+
+        #endregion
+
+        #region ComboTextBoxMsgHandler
+        private class ComboTextBoxMsgHandler : NativeWindow
+        {
+            private const int WM_MOUSELEAVE = 0x02A3;
+            private const int WM_MOUSEMOVE = 0x0200;
+            private const int TME_LEAVE = 0x02;
+            [DllImport("user32", SetLastError = true, CharSet = CharSet.Auto)]
+            private static extern bool TrackMouseEvent(ref TRACKMOUSEEVENT lpEventTrack);
+
+            public event EventHandler MouseLeave;
+            public event PaintEventHandler Paint;
+
+            private struct TRACKMOUSEEVENT
+            {
+                public int cbSize;
+                public int dwFlags;
+                public IntPtr hwndTrack;
+                public int dwHoverTime;
+            }
+
+            private bool m_MouseTracking = false;
+
+            protected override void WndProc(ref Message m)
+            {
+                const int WM_PAINT = 0xF;
+                if (m.Msg == WM_MOUSEMOVE && !m_MouseTracking)
+                {
+                    m_MouseTracking = true;
+                    TRACKMOUSEEVENT tme = new TRACKMOUSEEVENT();
+                    tme.dwFlags = TME_LEAVE;
+                    tme.cbSize = Marshal.SizeOf(tme);
+                    tme.hwndTrack = this.Handle;
+                    tme.dwHoverTime = 0;
+                    m_MouseTracking = TrackMouseEvent(ref tme);
+                }
+                else if (m.Msg == WM_MOUSELEAVE)
+                {
+                    if (MouseLeave != null)
+                        MouseLeave(this, new EventArgs());
+                    m_MouseTracking = false;
+                }
+                else if (m.Msg == WM_PAINT)
+                {
+                    base.WndProc(ref m);
+                    if (Paint != null)
+                    {
+                        using (Graphics g = Graphics.FromHwnd(m.HWnd))
+                            Paint(this, new PaintEventArgs(g, Rectangle.Empty));
+                    }
+                    return;
+                }
+                base.WndProc(ref m);
+            }
+        }
+        #endregion
+
+        #region ComboBoxPopupMsgHandler
+        private class ComboBoxPopupMsgHandler : NativeWindow
+        {
+            protected override void WndProc(ref Message m)
+            {
+                if (m.Msg == (int)WinApi.WindowsMessages.WM_VSCROLL)
+                {
+                    base.WndProc(ref m);
+                    WinApi.RedrawWindow(m.HWnd,
+                        IntPtr.Zero,
+                        IntPtr.Zero,
+                        WinApi.RedrawWindowFlags.RDW_INVALIDATE | WinApi.RedrawWindowFlags.RDW_UPDATENOW);
+                    return;
+                }
+                base.WndProc(ref m);
+            }
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/ComboBoxEx.ico b/PROMS/DotNetBar Source Code/Controls/ComboBoxEx.ico
new file mode 100644
index 00000000..fbe135b6
Binary files /dev/null and b/PROMS/DotNetBar Source Code/Controls/ComboBoxEx.ico differ
diff --git a/PROMS/DotNetBar Source Code/Controls/ComboTree.cs b/PROMS/DotNetBar Source Code/Controls/ComboTree.cs
new file mode 100644
index 00000000..4b598559
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/ComboTree.cs	
@@ -0,0 +1,3447 @@
+#if FRAMEWORK20
+using System;
+using System.Text;
+using System.ComponentModel;
+using System.Drawing;
+using DevComponents.Editors;
+using System.Windows.Forms;
+using System.Drawing.Drawing2D;
+using System.Collections;
+using System.Drawing.Design;
+using DevComponents.AdvTree;
+using System.Security;
+using System.Globalization;
+using System.Threading;
+using System.Collections.Generic;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    /// <summary>
+    /// Represents the combo box like control which shows the AdvTree control on popup. Tree control
+    /// can be configured to display multiple columns as well.
+    /// </summary>
+    [ToolboxBitmap(typeof(ComboTree), "Controls.ComboTree.ico"), ToolboxItem(true), DefaultProperty("Text"), DefaultBindingProperty("Text"), DefaultEvent("TextChanged"), Designer("DevComponents.DotNetBar.Design.ComboTreeDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+    public class ComboTree : PopupItemControl, IInputButtonControl, ICommandSource
+    {
+        #region Private Variables
+        //private TextBoxX _TextBox = null;
+        private AdvTree.AdvTree _AdvTree = null;
+        private ButtonItem _PopupItem = null;
+        private static string _DropDownItemContainerName = "sysPopupItemContainer";
+        private static string _DropDownControlContainerName = "sysPopupControlContainer";
+        private Color _FocusHighlightColor = ColorScheme.GetColor(0xFFFF88);
+        private bool _FocusHighlightEnabled = false;
+        #endregion
+
+        #region Events
+        /// <summary>
+        /// Occurs when Clear button is clicked and allows you to cancel the default action performed by the button.
+        /// </summary>
+        public event CancelEventHandler ButtonClearClick;
+        /// <summary>
+        /// Occurs when Drop-Down button that shows popup is clicked and allows you to cancel showing of the popup.
+        /// </summary>
+        public event CancelEventHandler ButtonDropDownClick;
+        /// <summary>
+        /// Occurs when ButtonCustom control is clicked.
+        /// </summary>
+        public event EventHandler ButtonCustomClick;
+        /// <summary>
+        /// Occurs when ButtonCustom2 control is clicked.
+        /// </summary>
+        public event EventHandler ButtonCustom2Click;
+        /// <summary>
+        /// Occurs when the text alignment in text box has changed.
+        /// </summary>
+        [Description("Occurs when the text alignment in text box has changed.")]
+        public event EventHandler TextAlignChanged;
+        ///// <summary>
+        ///// Occurs when the value of the Modified property has changed.
+        ///// </summary>
+        //public event EventHandler ModifiedChanged;
+        /// <summary>
+        /// Occurs before Node has been selected by user or through the SelectedNode property. Event can be canceled.
+        /// </summary>
+        public event AdvTreeNodeCancelEventHandler SelectionChanging;
+        /// <summary>
+        /// Occurs after node has been selected by user or through the SelectedNode property.
+        /// </summary>
+        public event AdvTreeNodeEventHandler SelectionChanged;
+        /// <summary>
+        /// Occurs when the DataSource changes.
+        /// </summary>
+        [Description("Occurs when the DataSource changes.")]
+        public event EventHandler DataSourceChanged;
+        /// <summary>
+        /// Occurs when the DisplayMembers property changes.
+        /// </summary>
+        [Description("Occurs when the DisplayMembers property changes")]
+        public event EventHandler DisplayMembersChanged;
+        /// <summary>
+        /// Occurs when the control is bound to a data value that need to be converted.
+        /// </summary>
+        [Description("Occurs when the control is bound to a data value that need to be converted.")]
+        public event TreeConvertEventHandler Format;
+        /// <summary>
+        /// Occurs when FormattingEnabled property changes.
+        /// </summary>
+        [Description("Occurs when FormattingEnabled property changes.")]
+        public event EventHandler FormattingEnabledChanged;
+        /// <summary>
+        /// Occurs when FormatString property changes.
+        /// </summary>
+        [Description("Occurs when FormatString property changes.")]
+        public event EventHandler FormatStringChanged;
+        /// <summary>
+        /// Occurs when FormatInfo property has changed.
+        /// </summary>
+        [Description("Occurs when FormatInfo property has changed.")]
+        public event EventHandler FormatInfoChanged;
+        /// <summary>
+        /// Occurs when a Node for an data-bound object item has been created and provides you with opportunity to modify the node.
+        /// </summary>
+        [Description("Occurs when a Node for an data-bound object item has been created and provides you with opportunity to modify the node")]
+        public event DataNodeEventHandler DataNodeCreated;
+        /// <summary>
+        /// Occurs when a group Node is created as result of GroupingMembers property setting and provides you with opportunity to modify the node.
+        /// </summary>
+        [Description("Occurs when a group Node is created as result of GroupingMembers property setting and provides you with opportunity to modify the node")]
+        public event DataNodeEventHandler GroupNodeCreated;
+        /// <summary>
+        /// Occurs when value of ValueMember property has changed.
+        /// </summary>
+        [Description("Occurs when value of ValueMember property has changed.")]
+        public event EventHandler ValueMemberChanged;
+        /// <summary>
+        /// Occurs when value of SelectedValue property has changed.
+        /// </summary>
+        [Description("Occurs when value of SelectedValue property has changed.")]
+        public event EventHandler SelectedValueChanged;
+        /// <summary>
+        /// Occurs when value of SelectedIndex property has changed.
+        /// </summary>
+        [Description("Occurs when value of SelectedValue property has changed.")]
+        public event EventHandler SelectedIndexChanged;
+        /// <summary>
+        /// Occurs when ColumnHeader is automatically created by control as result of data binding and provides you with opportunity to modify it.
+        /// </summary>
+        [Description("Occurs when ColumnHeader is automatically created by control as result of data binding and provides you with opportunity to modify it.")]
+        public event DataColumnEventHandler DataColumnCreated;
+        #endregion
+
+        #region Constructor
+         /// <summary>
+        /// Initializes a new instance of the TextBoxDropDown class.
+        /// </summary>
+        public ComboTree()
+        {
+            this.SetStyle(ControlStyles.Selectable, true);
+            InitControl();
+            this.BackColor = SystemColors.Window;
+        }
+        private void InitControl()
+        {
+            _BackgroundStyle.SetColorScheme(this.ColorScheme);
+            _BackgroundStyle.StyleChanged += new EventHandler(this.VisualPropertyChanged);
+
+            _ButtonCustom = new InputButtonSettings(this);
+            _ButtonCustom2 = new InputButtonSettings(this);
+            _ButtonClear = new InputButtonSettings(this);
+            _ButtonDropDown = new InputButtonSettings(this);
+            CreateButtonGroup();
+
+            //_TextBox = new TextBoxX();
+            //_TextBox.BorderStyle = BorderStyle.None;
+            //_TextBox.TextChanged += new EventHandler(TextBoxTextChanged);
+            //_TextBox.TextAlignChanged += new EventHandler(TextBoxTextAlignChanged);
+            //_TextBox.SizeChanged += new EventHandler(TextBoxSizeChanged);
+            //_TextBox.Visible=false;
+            ////_TextBox.ModifiedChanged += new EventHandler(TextBoxModifiedChanged);
+            //this.Controls.Add(_TextBox);
+
+            // Init popup tree
+            _AdvTree = new DevComponents.AdvTree.AdvTree();
+#if (!TRIAL)
+            _AdvTree.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F";
+#endif
+            _AdvTree.BackgroundStyle.Reset();
+            _AdvTree.BackgroundStyle.BackColor = SystemColors.Window;
+            _AdvTree.BackgroundStyle.Border = eStyleBorderType.None;
+            _AdvTree.ExpandButtonType = eExpandButtonType.Triangle;
+            _AdvTree.DragDropEnabled = false;
+            _AdvTree.HotTracking = true;
+            _AdvTree.Indent = 6;
+            _AdvTree.SelectionFocusAware = false;
+            ElementStyle nodeStyle = new ElementStyle();
+            nodeStyle.Name = "nodeElementStyle";
+            nodeStyle.TextColor = System.Drawing.SystemColors.ControlText;
+            _AdvTree.NodeStyle = nodeStyle;
+            _AdvTree.PathSeparator = ";";
+            _AdvTree.Styles.Add(nodeStyle);
+            _AdvTree.AfterNodeSelect += new AdvTreeNodeEventHandler(TreeAfterNodeSelect);
+            _AdvTree.BeforeNodeSelect += new AdvTreeNodeCancelEventHandler(TreeBeforeNodeSelect);
+            _AdvTree.NodeMouseDown += new TreeNodeMouseEventHandler(TreeNodeMouseDown);
+
+            this.DropDownControl = _AdvTree;
+        }
+        #endregion
+
+        #region Internal Implementation
+        protected override void ScaleControl(SizeF factor, BoundsSpecified specified)
+        {
+            base.ScaleControl(factor, specified);
+            if (_ButtonGroup!=null)
+                _ButtonGroup.InvalidateArrange();
+        }
+
+        protected override void OnBackColorChanged(EventArgs e)
+        {
+            _AdvTree.BackgroundStyle.BackColor = this.BackColor;
+            base.OnBackColorChanged(e);
+        }
+        protected override void InvalidateAutoSize()
+        {
+            if (_AdvTree != null)
+                _AdvTree.AntiAlias = this.AntiAlias;
+        }
+        /// <summary>
+        /// Gets or sets the tree node that is currently selected in the tree control.
+        /// </summary>
+        /// <remarks>
+        /// 	<para>If no <see cref="Node">Node</see> is currently selected, the
+        ///     <b>SelectedNode</b> property is a null reference (<b>Nothing</b> in Visual
+        ///     Basic).</para>
+        /// </remarks>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public Node SelectedNode
+        {
+            get
+            {
+                return _AdvTree.SelectedNode;
+            }
+            set
+            {
+                _AdvTree.SelectedNode = value;
+            }
+        }
+
+        void TreeNodeMouseDown(object sender, TreeNodeMouseEventArgs e)
+        {
+            if (this.SelectionClosesPopup && e.Button == MouseButtons.Left && e.Node != null && 
+                e.Node.IsSelected && this.IsPopupOpen && !e.Node.ExpandPartRectangle.Contains(e.X, e.Y))
+            {
+                this.IsPopupOpen = false;
+            }
+        }
+
+        private void TreeBeforeNodeSelect(object sender, AdvTreeNodeCancelEventArgs e)
+        {
+            if (SelectionChanging != null)
+                SelectionChanging(this, e);
+        }
+        private void TreeAfterNodeSelect(object sender, AdvTreeNodeEventArgs e)
+        {
+            if (SelectionChanged != null)
+                SelectionChanged(this, e);
+
+            if (_DataManager != null)
+            {
+                Node selectedNode = _AdvTree.SelectedNode;
+                if (selectedNode != null && selectedNode.BindingIndex > -1 && _DataManager.Position != selectedNode.BindingIndex)
+                {
+                    _DataManager.Position = selectedNode.BindingIndex;
+                }
+                //else if (selectedNode == null)
+                //    _DataManager.Position = -1;
+            }
+
+            if (this.SelectionClosesPopup && this.IsPopupOpen && e.Action == eTreeAction.Mouse)
+            {
+                this.IsPopupOpen = false;
+            }
+
+            if (e.Node != null) this.Text = e.Node.ToString();
+            this.Invalidate();
+
+            OnSelectedIndexChanged(EventArgs.Empty);
+            if(!string.IsNullOrEmpty(this.ValueMember))
+                this.OnSelectedValueChanged(EventArgs.Empty);
+        }
+
+        private bool _SelectionClosesPopup = true;
+        /// <summary>
+        /// Gets or sets whether selection change on popup tree closes the popup. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether selection change on popup tree closes the popup.")]
+        public bool SelectionClosesPopup
+        {
+            get { return _SelectionClosesPopup; }
+            set
+            {
+                _SelectionClosesPopup = value;
+            }
+        }
+
+        private string _SelectedDisplayMember = "";
+        /// <summary>
+        /// Gets or sets the field name that holds the text that will be displayed in the control for selected item. When not set all items set in DisplayMembers will be displayed in control.
+        /// </summary>
+        [DefaultValue(""), Category("Data"), Description("Indicates field name that holds the text that will be displayed in the control for selected item. When not set all items set in DisplayMembers will be displayed in control.")]
+        [Editor("System.Windows.Forms.Design.DataMemberFieldEditor, System.Design, Version= 2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", typeof(System.Drawing.Design.UITypeEditor))]
+        public string SelectedDisplayMember
+        {
+            get { return _SelectedDisplayMember; }
+            set
+            {
+                _SelectedDisplayMember = value;
+                this.Invalidate();
+            }
+        }
+        
+        /// <summary>
+        /// Gets or sets the field name that holds the text that will be displayed in the control for selected item. When not set all items set in DisplayMembers will be displayed in control.
+        /// </summary>
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), Obsolete("This property name was misspelled. Use SelectedDisplayMember instead.")]
+        public string SelectedDisplayMemeber
+        {
+            get { return _SelectedDisplayMember; }
+            set
+            {
+                _SelectedDisplayMember = value;
+                this.Invalidate();
+            }
+        }
+        
+        
+        private List<BindingMemberInfo> _DisplayMembers = null;
+        /// <summary>
+        /// Gets or sets the comma separated list of property or column names to display on popup tree control.
+        /// </summary>
+        [DefaultValue(""), Category("Data"), Description("Indicates comma separated list of property or column names to display on popup tree control")]
+        [Editor("DevComponents.DotNetBar.Design.DataMembersSelector, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor))]
+        public string DisplayMembers
+        {
+            get
+            {
+                if (_DisplayMembers == null || _DisplayMembers.Count == 0)
+                    return "";
+                StringBuilder members = new StringBuilder();
+                for (int i = 0; i < _DisplayMembers.Count; i++)
+                {
+                    BindingMemberInfo item = _DisplayMembers[i];
+                    members.Append(item.BindingMember);
+                    if (i + 1 < _DisplayMembers.Count)
+                        members.Append(',');
+                }
+                return members.ToString();
+            }
+            set
+            {
+                List<BindingMemberInfo> displayMembers = _DisplayMembers;
+
+                List<BindingMemberInfo> newMembers = null;
+
+                if (!string.IsNullOrEmpty(value))
+                {
+                    newMembers = new List<BindingMemberInfo>();
+                    // Parse the members comma separated list expected...
+                    string[] members = value.Split(',');
+                    for (int i = 0; i < members.Length; i++)
+                    {
+                        newMembers.Add(new BindingMemberInfo(members[i].Trim()));
+                    }
+                }
+
+                try
+                {
+                    this.SetDataConnection(_DataSource, newMembers, false);
+                }
+                catch
+                {
+                    _DisplayMembers = displayMembers;
+                }
+            }
+        }
+
+        private object _DataSource = null;
+        /// <summary>
+        /// Gets or sets the data source for the ComboTree. Expected is an object that implements the IList or IListSource interfaces, 
+        /// such as a DataSet or an Array. The default is null.
+        /// </summary>
+        [AttributeProvider(typeof(IListSource)), Description("Indicates data source for the ComboTree."), Category("Data"), DefaultValue(null), RefreshProperties(RefreshProperties.Repaint)]
+        public object DataSource
+        {
+            get
+            {
+                return _DataSource;
+            }
+            set
+            {
+                if (((value != null) && !(value is IList)) && !(value is IListSource))
+                {
+                    throw new ArgumentException("Data type is not supported for complex data binding");
+                }
+                if (_DataSource != value)
+                {
+                    try
+                    {
+                        this.SetDataConnection(value, _DisplayMembers, true);
+                    }
+                    catch
+                    {
+                        this.DisplayMembers = "";
+                    }
+                    if (value == null)
+                    {
+                        this.DisplayMembers = "";
+                    }
+                }
+            }
+        }
+
+        private bool _FormattingEnabled = false;
+        /// <summary>
+        /// Gets or sets a value indicating whether formatting is applied to the DisplayMembers property of the control.
+        /// </summary>
+        [DefaultValue(false), Description("Indicates whether formatting is applied to the DisplayMembers property of the control.")]
+        public bool FormattingEnabled
+        {
+            get
+            {
+                return _FormattingEnabled;
+            }
+            set
+            {
+                if (value != _FormattingEnabled)
+                {
+                    _FormattingEnabled = value;
+                    RefreshItems();
+                    OnFormattingEnabledChanged(EventArgs.Empty);
+                }
+            }
+        }
+        /// <summary>
+        /// Raises FormattingEnabledChanged event.
+        /// </summary>
+        /// <param name="e">Event arguments.</param>
+        protected virtual void OnFormattingEnabledChanged(EventArgs e)
+        {
+            EventHandler handler = FormattingEnabledChanged;
+            if (handler != null)
+            {
+                handler(this, e);
+            }
+        }
+
+        private string _FormatString = "";
+        /// <summary>
+        /// Gets or sets the format-specifier characters that indicate how a value is to be displayed.
+        /// </summary>
+        [MergableProperty(false), Editor("System.Windows.Forms.Design.FormatStringEditor, System.Design, Version= 2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", typeof(UITypeEditor)), DefaultValue(""), Description("Indicates format-specifier characters that indicate how a value is to be displayed.")]
+        public string FormatString
+        {
+            get
+            {
+                return _FormatString;
+            }
+            set
+            {
+                if (value == null)
+                {
+                    value = string.Empty;
+                }
+                if (!value.Equals(_FormatString))
+                {
+                    _FormatString = value;
+                    RefreshItems();
+                    OnFormatStringChanged(EventArgs.Empty);
+                }
+            }
+        }
+        /// <summary>
+        /// Raises FormatStringChanged event.
+        /// </summary>
+        /// <param name="e">Event arguments.</param>
+        protected virtual void OnFormatStringChanged(EventArgs e)
+        {
+            EventHandler handler = FormatStringChanged;
+            if (handler != null)
+            {
+                handler(this, e);
+            }
+        }
+
+        private IFormatProvider _FormatInfo = null;
+        /// <summary>
+        /// Gets or sets the IFormatProvider that provides custom formatting behavior. 
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Advanced), Browsable(false), DefaultValue((string)null)]
+        public IFormatProvider FormatInfo
+        {
+            get
+            {
+                return _FormatInfo;
+            }
+            set
+            {
+                if (value != _FormatInfo)
+                {
+                    _FormatInfo = value;
+                    RefreshItems();
+                    OnFormatInfoChanged(EventArgs.Empty);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Raises FormatInfoChanged event.
+        /// </summary>
+        /// <param name="e">Event arguments.</param>
+        protected virtual void OnFormatInfoChanged(EventArgs e)
+        {
+            EventHandler handler = FormatInfoChanged;
+            if (handler != null)
+            {
+                handler(this, e);
+            }
+        }
+
+
+        private bool _InSetDataConnection = false;
+        private void SetDataConnection(object newDataSource, List<BindingMemberInfo> newDisplayMembers, bool force)
+        {
+            bool dataSourceChanged = _DataSource != newDataSource;
+            bool displayMemberChanged = _DisplayMembers != newDisplayMembers;
+
+            if (!_InSetDataConnection)
+            {
+                try
+                {
+                    if ((force || dataSourceChanged) || displayMemberChanged)
+                    {
+                        _InSetDataConnection = true;
+                        IList list = (this.DataManager != null) ? this.DataManager.List : null;
+                        bool isDataManagerNull = this.DataManager == null;
+                        this.UnwireDataSource();
+                        _DataSource = newDataSource;
+                        _DisplayMembers = newDisplayMembers;
+                        this.WireDataSource();
+                        if (_IsDataSourceInitialized)
+                        {
+                            CurrencyManager manager = null;
+                            if (((newDataSource != null) && (this.BindingContext != null)) && (newDataSource != Convert.DBNull))
+                            {
+                                string bindingPath = "";
+                                if (_DisplayMembers != null && _DisplayMembers.Count > 0)
+                                    bindingPath = newDisplayMembers[0].BindingPath;
+                                manager = (CurrencyManager)this.BindingContext[newDataSource, bindingPath];
+                            }
+                            if (_DataManager != manager)
+                            {
+                                if (_DataManager != null)
+                                {
+                                    _DataManager.ItemChanged -= new ItemChangedEventHandler(this.DataManager_ItemChanged);
+                                    _DataManager.PositionChanged -= new EventHandler(this.DataManager_PositionChanged);
+                                }
+                                _DataManager = manager;
+                                if (_DataManager != null)
+                                {
+                                    _DataManager.ItemChanged += new ItemChangedEventHandler(this.DataManager_ItemChanged);
+                                    _DataManager.PositionChanged += new EventHandler(this.DataManager_PositionChanged);
+                                }
+                            }
+                            if (((_DataManager != null) && (displayMemberChanged || dataSourceChanged)) && !ValidateDisplayMembers(_DisplayMembers))
+                            {
+                                throw new ArgumentException("Wrong DisplayMembers parameter", "newDisplayMember");
+                            }
+                            if (((_DataManager != null) && ((dataSourceChanged || displayMemberChanged) || force)) && (displayMemberChanged || (force && ((list != _DataManager.List) || isDataManagerNull || dataSourceChanged))))
+                            {
+                                DataManager_ItemChanged(_DataManager, null);
+                            }
+                        }
+                        _Converters.Clear();
+                    }
+                    if (dataSourceChanged)
+                    {
+                        this.OnDataSourceChanged(EventArgs.Empty);
+                    }
+                    if (displayMemberChanged)
+                    {
+                        this.OnDisplayMembersChanged(EventArgs.Empty);
+                    }
+                }
+                finally
+                {
+                    _InSetDataConnection = false;
+                }
+            }
+        }
+
+        private bool ValidateDisplayMembers(List<BindingMemberInfo> members)
+        {
+            if (members == null || members.Count == 0) return true;
+
+            foreach (BindingMemberInfo item in members)
+            {
+                if (item.BindingMember != null && !BindingMemberInfoInDataManager(item))
+                    return false;
+            }
+            return true;
+        }
+        private bool BindingMemberInfoInDataManager(BindingMemberInfo bindingMemberInfo)
+        {
+            if (_DataManager != null)
+            {
+                PropertyDescriptorCollection itemProperties = _DataManager.GetItemProperties();
+                int count = itemProperties.Count;
+                for (int i = 0; i < count; i++)
+                {
+                    if (!typeof(IList).IsAssignableFrom(itemProperties[i].PropertyType) && itemProperties[i].Name.Equals(bindingMemberInfo.BindingField))
+                    {
+                        return true;
+                    }
+                }
+                for (int j = 0; j < count; j++)
+                {
+                    if (!typeof(IList).IsAssignableFrom(itemProperties[j].PropertyType) && (string.Compare(itemProperties[j].Name, bindingMemberInfo.BindingField, true, CultureInfo.CurrentCulture) == 0))
+                    {
+                        return true;
+                    }
+                }
+            }
+            return false;
+        }
+        /// <summary>
+        /// Raises the DataSourceChanged event.
+        /// </summary>
+        /// <param name="e">An EventArgs that contains the event data. </param>
+        protected virtual void OnDataSourceChanged(EventArgs e)
+        {
+            EventHandler handler = DataSourceChanged;
+            if (handler != null)
+            {
+                handler(this, e);
+            }
+        }
+        /// <summary>
+        /// Raises the DisplayMemberChanged event.
+        /// </summary>
+        /// <param name="e">An EventArgs that contains the event data. </param>
+        protected virtual void OnDisplayMembersChanged(EventArgs e)
+        {
+            EventHandler handler = DisplayMembersChanged;
+            if (handler != null)
+            {
+                handler(this, e);
+            }
+        }
+
+        private Hashtable _Converters = new Hashtable();
+        private TypeConverter GetFieldConverter(string fieldName)
+        {
+            if (_Converters.ContainsKey(fieldName))
+                return (TypeConverter)_Converters[fieldName];
+            if (this.DataManager != null)
+            {
+                PropertyDescriptorCollection itemProperties = this.DataManager.GetItemProperties();
+                if (itemProperties != null)
+                {
+                    PropertyDescriptor descriptor = itemProperties.Find(fieldName, true);
+                    if (descriptor != null)
+                    {
+                        _Converters.Add(fieldName, descriptor.Converter);
+                        return descriptor.Converter;
+                    }
+                }
+            }
+
+            return null;
+        }
+
+        private void DataManager_ItemChanged(object sender, ItemChangedEventArgs e)
+        {
+            if (this.InvokeRequired)
+            {
+                this.Invoke(new ItemChangedEventHandler(DataManager_ItemChanged), sender, e);
+                return;
+            }
+            if (_DataManager != null)
+            {
+                if (e==null || e.Index == -1)
+                {
+                    this.SetItemsCore(_DataManager.List);
+                    if (this.AllowSelection)
+                    {
+                        if (_DataManager.Position == -1)
+                            this.SelectedNode = null;
+                        else
+                            this.SelectedNode = _AdvTree.FindNodeByBindingIndex(_DataManager.Position);
+                    }
+                }
+                else
+                {
+                    this.SetItemCore(e.Index, _DataManager.List[e.Index]);
+                }
+            }
+        }
+        private void DataManager_PositionChanged(object sender, EventArgs e)
+        {
+            if ((_DataManager != null) && this.AllowSelection)
+            {
+                if (_DataManager.Position == -1)
+                    this.SelectedNode = null;
+                else
+                    this.SelectedNode = _AdvTree.FindNodeByBindingIndex(_DataManager.Position);
+                //this.SelectedIndex = _DataManager.Position;
+            }
+        }
+
+        /// <summary>
+        /// When overridden in a derived class, resynchronizes the item data with the contents of the data source.
+        /// </summary>
+        public virtual void RefreshItems()
+        {
+            if (_DataManager != null)
+            {
+                SetItemsCore(_DataManager.List);
+                if (this.AllowSelection)
+                {
+                    if (_DataManager.Position == -1)
+                        this.SelectedNode = null;
+                    else
+                        this.SelectedNode = _AdvTree.FindNodeByBindingIndex(_DataManager.Position);
+                }
+            }
+        }
+
+        private bool IsSimpleType(object current)
+        {
+            if (current == null) return false;
+            return current is string || current.GetType().IsPrimitive;
+        }
+        /// <summary>
+        /// When overridden in a derived class, sets the specified array of objects in a collection in the derived class.
+        /// </summary>
+        /// <param name="items">An array of items.</param>
+        protected virtual void SetItemsCore(IList items)
+        {
+            if(this.DesignMode) return;
+            _AdvTree.BeginUpdate();
+            _AdvTree.ClearAndDisposeAllNodes();
+
+            bool isGrouping = !string.IsNullOrEmpty(_GroupingMembers);
+
+            List<string> fieldNames = new List<string>();
+            // Create Columns
+            if (string.IsNullOrEmpty(this.DisplayMembers))
+            {
+                if (_AdvTree.Columns.Count > 0)
+                {
+                    foreach (DevComponents.AdvTree.ColumnHeader columnHeader in _AdvTree.Columns)
+                    {
+                        if(!string.IsNullOrEmpty(columnHeader.DataFieldName))
+                            fieldNames.Add(columnHeader.DataFieldName);
+                    }
+                }
+                if (fieldNames.Count == 0)
+                {
+                    _AdvTree.Columns.Clear();
+                    if (_DataManager.List is Array)
+                    {
+                        DevComponents.AdvTree.ColumnHeader ch = new DevComponents.AdvTree.ColumnHeader("Items");
+                        ch.Width.Relative = 100;
+                        _AdvTree.Columns.Add(ch);
+                        OnDataColumnCreated(new DataColumnEventArgs(ch));
+                    }
+                    else if (_DataManager != null)
+                    {
+                        if (_DataManager.Current != null && IsSimpleType(_DataManager.Current))
+                        {
+                            DevComponents.AdvTree.ColumnHeader ch = new DevComponents.AdvTree.ColumnHeader();
+                            ch.Width.Relative = 100;
+                            _AdvTree.Columns.Add(ch);
+                            OnDataColumnCreated(new DataColumnEventArgs(ch));
+                        }
+                        else
+                        {
+                            PropertyDescriptorCollection properties = _DataManager.GetItemProperties();
+                            foreach (PropertyDescriptor prop in properties)
+                            {
+                                fieldNames.Add(prop.Name);
+                                DevComponents.AdvTree.ColumnHeader ch = new DevComponents.AdvTree.ColumnHeader(StringHelper.GetFriendlyName(prop.Name));
+                                ch.DataFieldName = prop.Name;
+                                ch.Width.Relative = Math.Max(10, 100 / properties.Count);
+                                _AdvTree.Columns.Add(ch);
+                                OnDataColumnCreated(new DataColumnEventArgs(ch));
+                            }
+                        }
+                    }
+                }
+            }
+            else
+            {
+                _AdvTree.Columns.Clear();
+                if (_DisplayMembers != null && _DisplayMembers.Count > 0)
+                {
+                    foreach (BindingMemberInfo item in _DisplayMembers)
+                    {
+                        DevComponents.AdvTree.ColumnHeader ch = new DevComponents.AdvTree.ColumnHeader(StringHelper.GetFriendlyName(item.BindingMember));
+                        ch.Tag = item;
+                        ch.Width.Relative = Math.Max(10, 100 / _DisplayMembers.Count);
+                        _AdvTree.Columns.Add(ch);
+                        fieldNames.Add(item.BindingMember);
+                        OnDataColumnCreated(new DataColumnEventArgs(ch));
+                    }
+                }
+            }
+
+            if (string.IsNullOrEmpty(_GroupingMembers) && string.IsNullOrEmpty(_ParentFieldNames))
+            {
+                for (int i = 0; i < items.Count; i++)
+                {
+                    object item = items[i];
+                    Node node = CreateNode(_AdvTree.Nodes, item, i, fieldNames);
+                }
+            }
+            else if (!string.IsNullOrEmpty(_ParentFieldNames))
+            {
+                isGrouping = true;
+
+                Dictionary<string, Node> nodeParentCollection = new Dictionary<string, Node>();
+                Dictionary<string, List<Node>> nodeNeedsParentCollection = new Dictionary<string, List<Node>>();
+                string[] parentFields = _ParentFieldNames.Split(',');
+
+                for (int i = 0; i < items.Count; i++)
+                {
+                    object item = items[i];
+                    string nodeKey = GetItemText(item, parentFields[0]);
+                    string parentKey = GetItemText(item, parentFields[1]);
+                    Node parentNode = null;
+                    if (nodeParentCollection.TryGetValue(parentKey, out parentNode))
+                    {
+                        Node node = CreateNode(parentNode.Nodes, item, i, fieldNames);
+                        nodeParentCollection.Add(nodeKey, node);
+                    }
+                    else
+                    {
+                        Node node = CreateNode(this.Nodes, item, i, fieldNames);
+                        List<Node> list = null;
+                        if (!nodeNeedsParentCollection.TryGetValue(parentKey, out list))
+                        {
+                            list = new List<Node>();
+                            nodeNeedsParentCollection.Add(parentKey, list);
+                        }
+                        list.Add(node);
+                        nodeParentCollection.Add(nodeKey, node);
+                    }
+                }
+                // If there are nodes that needed a parent process them now
+                foreach (KeyValuePair<string, List<Node>> keyValue in nodeNeedsParentCollection)
+                {
+                    Node parentNode = null;
+                    if (nodeParentCollection.TryGetValue(keyValue.Key, out parentNode))
+                    {
+                        foreach (Node node in keyValue.Value)
+                        {
+                            node.Remove();
+                            parentNode.Nodes.Add(node);
+                        }
+                    }
+                }
+            }
+            else
+            {
+                string[] groupFields = _GroupingMembers.Split(',');
+                for (int i = 0; i < groupFields.Length; i++)
+                {
+                    groupFields[i] = groupFields[i].Trim();
+                }
+                Dictionary<string, Node> _GroupTable = new Dictionary<string, Node>();
+                for (int i = 0; i < items.Count; i++)
+                {
+                    object item = items[i];
+                    NodeCollection parentCollection = _AdvTree.Nodes;
+
+                    // Find the parent collection to add item to
+                    string key = "";
+                    for (int gi = 0; gi < groupFields.Length; gi++)
+                    {
+                        string text = GetItemText(item, groupFields[gi]);
+                        key += text.ToLower() + "/";
+                        Node groupNode = null;
+                        if (!_GroupTable.TryGetValue(key, out groupNode))
+                        {
+                            groupNode = CreateGroupNode(parentCollection, text);
+                            _GroupTable.Add(key, groupNode);
+                        }
+                        parentCollection = groupNode.Nodes;
+                    }
+
+                    Node node = CreateNode(parentCollection, item, i, fieldNames);
+                }
+            }
+
+            // If not grouping then remove the expand part space on left-hand side
+            if (isGrouping)
+            {
+                _AdvTree.ExpandWidth = 14;
+            }
+            else
+            {
+                _AdvTree.ExpandWidth = 0;
+            }
+
+            _AdvTree.EndUpdate();
+        }
+        /// <summary>
+        /// Raises the DataColumnCreated event.
+        /// </summary>
+        /// <param name="args">Provides event arguments.</param>
+        protected virtual void OnDataColumnCreated(DataColumnEventArgs args)
+        {
+            if (DataColumnCreated != null)
+                DataColumnCreated(this, args);
+        }
+
+        private Node CreateGroupNode(NodeCollection parentCollection, string text)
+        {
+            Node node = new Node();
+            node.Text = text;
+            node.Style = _GroupNodeStyle;
+            node.Expanded = true;
+            node.Selectable = false;
+            parentCollection.Add(node);
+            DataNodeEventArgs eventArgs = new DataNodeEventArgs(node, null);
+            OnGroupNodeCreated(eventArgs);
+            return node;
+        }
+        /// <summary>
+        /// Raises the DataNodeCreated event.
+        /// </summary>
+        /// <param name="dataNodeEventArgs">Provides event arguments.</param>
+        protected virtual void OnGroupNodeCreated(DataNodeEventArgs dataNodeEventArgs)
+        {
+            if (GroupNodeCreated != null) GroupNodeCreated(this, dataNodeEventArgs);
+        }
+
+        /// <summary>
+        /// Creates a new node for the data item.
+        /// </summary>
+        /// <param name="item">Item to create node for.</param>
+        /// <returns>New instance of the node.</returns>
+        private Node CreateNode(NodeCollection parentCollection, object item, int itemIndex, List<string> fieldNames)
+        {
+            Node node = new Node();
+            parentCollection.Add(node);
+
+            SetNodeData(node, item, fieldNames, itemIndex);
+
+            DataNodeEventArgs eventArgs = new DataNodeEventArgs(node, item);
+
+            OnDataNodeCreated(eventArgs);
+
+            return eventArgs.Node;
+        }
+
+        private void SetNodeData(Node node, object item, List<string> fieldNames, int bindingIndex)
+        {
+            node.DataKey = item;
+            node.BindingIndex = bindingIndex;
+
+            node.CreateCells();
+
+            if (fieldNames.Count > 0)
+            {
+                for (int i = 0; i < fieldNames.Count; i++)
+                {
+                    object propertyValue = GetPropertyValue(item, fieldNames[i]);
+                    if (propertyValue is Image)
+                    {
+                        node.Cells[i].Images.Image = (Image)propertyValue;
+                        //node.Cells[i].Images.AutoDispose = true;
+                    }
+                    else
+                        node.Cells[i].Text = GetItemText(item, fieldNames[i]);
+                }
+            }
+            else if (item != null)
+                node.Text = item.ToString();
+        }
+
+
+        /// <summary>
+        /// Raises the DataNodeCreated event.
+        /// </summary>
+        /// <param name="dataNodeEventArgs">Provides event arguments.</param>
+        protected virtual void OnDataNodeCreated(DataNodeEventArgs dataNodeEventArgs)
+        {
+            if (DataNodeCreated != null) DataNodeCreated(this, dataNodeEventArgs);
+        }
+        
+        /// <summary>
+        /// When overridden in a derived class, sets the object with the specified index in the derived class.
+        /// </summary>
+        /// <param name="index">The array index of the object.</param>
+        /// <param name="value">The object.</param>
+        protected virtual void SetItemCore(int index, object value)
+        {
+            Node node = _AdvTree.FindNodeByBindingIndex(index);
+            if (node == null) return;
+
+            List<string> fieldNames = new List<string>();
+
+            foreach (DevComponents.AdvTree.ColumnHeader column in _AdvTree.Columns)
+            {
+                if (!string.IsNullOrEmpty(column.DataFieldName))
+                    fieldNames.Add(column.DataFieldName);
+            }
+
+            SetNodeData(node, value, fieldNames, index);
+        }
+
+        private string _ParentFieldNames = "";
+        /// <summary>
+        /// Gets or sets comma separated field or property names that holds the value that is used to identify node and parent node. Format expected is: FieldNodeId,ParentNodeFieldId. For example if your table represents departments, you have DepartmentId field which uniquely identifies a department and ParentDepartmentId field which identifies parent of the department if any you would set this property to DepartmentId,ParentDepartmentId.
+        /// Note that you can only use ParentFieldNames or GroupingMembers property but not both. If both are set ParentFieldName take precedence.
+        /// </summary>
+        [DefaultValue(""), Category("Data"), Description("Indicates comma separated field or property names that holds the value that is used to identify node and parent node. Format expected is: FieldNodeId,ParentNodeFieldId. For example if your table represents departments, you have DepartmentId field which uniquely identifies a department and ParentDepartmentId field which identifies parent of the department if any you would set this property to DepartmentId,ParentDepartmentId.")]
+        public string ParentFieldNames
+        {
+            get { return _ParentFieldNames; }
+            set
+            {
+                if (value == null) value = "";
+                if (!string.IsNullOrEmpty(value))
+                {
+                    string[] fields = value.Split(',');
+                    if (fields.Length != 2)
+                        throw new ArgumentException("ParentFieldNames excepts two and only two fields/property names separated by comma character.");
+                    if (string.IsNullOrEmpty(fields[0]))
+                        throw new ArgumentException("ParentFieldNames excepts two and only two fields/property names separated by comma character. First field name is empty.");
+                    if (string.IsNullOrEmpty(fields[1]))
+                        throw new ArgumentException("ParentFieldNames excepts two and only two fields/property names separated by comma character. Second field name is empty.");
+                }
+                _ParentFieldNames = value;
+                OnParentFieldNamesChanged();
+            }
+        }
+
+        /// <summary>
+        /// Called when ParentFieldName property has changed.
+        /// </summary>
+        protected virtual void OnParentFieldNamesChanged()
+        {
+            RefreshItems();
+        }
+
+        private string _GroupingMembers = "";
+        /// <summary>
+        /// Gets or sets comma separated list of field or property names that are used for grouping when data-binding is used.
+        /// </summary>
+        [DefaultValue(""), Category("Data"), Description("Indicates comma separated list of field or property names that are used for grouping when data-binding is used")]
+        public string GroupingMembers
+        {
+            get { return _GroupingMembers; }
+            set
+            {
+                if (value == null) value = "";
+                _GroupingMembers = value;
+                OnGroupingMembersChanged();
+            }
+        }
+
+        /// <summary>
+        /// Called when GroupingMembers property has changed.
+        /// </summary>
+        protected virtual void OnGroupingMembersChanged()
+        {
+            RefreshItems();
+        }
+
+        private ElementStyle _GroupNodeStyle = null;
+        /// <summary>
+        /// Gets or sets style for automatically created group nodes when data-binding is used and GroupingMembers property is set.
+        /// </summary>
+        /// <value>
+        /// Name of the style assigned or null value indicating that no style is used.
+        /// Default value is null.
+        /// </value>
+        [Browsable(true), Category("Node Style"), DefaultValue(null), Editor("DevComponents.AdvTree.Design.ElementStyleTypeEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), Description("Gets or sets default style for the node.")]
+        public ElementStyle GroupNodeStyle
+        {
+            get { return _GroupNodeStyle; }
+            set
+            {
+                if (_GroupNodeStyle != value)
+                {
+                    _GroupNodeStyle = value;
+                    if (_DataManager != null && _AdvTree.Nodes != null)
+                        RefreshItems();
+                }
+            }
+        }
+
+        private bool AllowSelection
+        {
+            get
+            {
+                return true;
+            }
+        }
+
+ 
+        private CurrencyManager _DataManager = null;
+        protected CurrencyManager DataManager
+        {
+            get
+            {
+                return _DataManager;
+            }
+        }
+        private bool _IsDataSourceInitEventHooked = false;
+        private void UnwireDataSource()
+        {
+            if (_DataSource is IComponent)
+            {
+                ((IComponent)_DataSource).Disposed -= new EventHandler(DataSourceDisposed);
+            }
+            ISupportInitializeNotification dataSource = _DataSource as ISupportInitializeNotification;
+            if ((dataSource != null) && _IsDataSourceInitEventHooked)
+            {
+                dataSource.Initialized -= new EventHandler(DataSourceInitialized);
+                _IsDataSourceInitEventHooked = false;
+            }
+        }
+        private void DataSourceDisposed(object sender, EventArgs e)
+        {
+            this.SetDataConnection(null, null, true);
+        }
+        private bool _IsDataSourceInitialized = false;
+        private void WireDataSource()
+        {
+            if (_DataSource is IComponent)
+            {
+                ((IComponent)_DataSource).Disposed += new EventHandler(DataSourceDisposed);
+            }
+            ISupportInitializeNotification dataSource = _DataSource as ISupportInitializeNotification;
+            if ((dataSource != null) && !dataSource.IsInitialized)
+            {
+                dataSource.Initialized += new EventHandler(DataSourceInitialized);
+                _IsDataSourceInitEventHooked = true;
+                _IsDataSourceInitialized = false;
+            }
+            else
+            {
+                _IsDataSourceInitialized = true;
+            }
+        }
+        private void DataSourceInitialized(object sender, EventArgs e)
+        {
+            this.SetDataConnection(_DataSource, _DisplayMembers, true);
+        }
+        /// <summary>
+        /// Raises the Format event.
+        /// </summary>
+        /// <param name="e">Event parameters</param>
+        protected virtual void OnFormat(TreeConvertEventArgs e)
+        {
+            TreeConvertEventHandler handler = Format;
+            if (handler != null)
+            {
+                handler(this, e);
+            }
+        }
+
+        private static TypeConverter stringTypeConverter;
+        public string GetItemText(object item, string fieldName)
+        {
+            object propertyValue = GetPropertyValue(item, fieldName);
+            if (!_FormattingEnabled)
+            {
+                if (item == null)
+                {
+                    return string.Empty;
+                }
+                if (propertyValue == null)
+                {
+                    return "";
+                }
+                return Convert.ToString(propertyValue, CultureInfo.CurrentCulture);
+            }
+            
+            TreeConvertEventArgs e = new TreeConvertEventArgs(propertyValue, typeof(string), item, fieldName);
+            this.OnFormat(e);
+            if ((e.Value != item) && (e.Value is string))
+            {
+                return (string)e.Value;
+            }
+            if (stringTypeConverter == null)
+            {
+                stringTypeConverter = TypeDescriptor.GetConverter(typeof(string));
+            }
+            try
+            {
+                return (string)FormatHelper.FormatObject(propertyValue, typeof(string), GetFieldConverter(fieldName), stringTypeConverter, _FormatString, _FormatInfo, null, DBNull.Value);
+            }
+            catch (Exception ex)
+            {
+                if (ex is SecurityException || IsCriticalException(ex))
+                {
+                    throw;
+                }
+                return ((propertyValue != null) ? Convert.ToString(item, CultureInfo.CurrentCulture) : "");
+            }
+        }
+        private static bool IsCriticalException(Exception ex)
+        {
+            return (((((ex is NullReferenceException) || (ex is StackOverflowException)) || ((ex is OutOfMemoryException) || (ex is ThreadAbortException))) || ((ex is ExecutionEngineException) || (ex is IndexOutOfRangeException))) || (ex is AccessViolationException));
+        }
+        protected object GetPropertyValue(object item, string fieldName)
+        {
+            if ((item != null) && (fieldName.Length > 0))
+            {
+                try
+                {
+                    PropertyDescriptor descriptor;
+                    if (_DataManager != null)
+                    {
+                        descriptor = _DataManager.GetItemProperties().Find(fieldName, true);
+                    }
+                    else
+                    {
+                        descriptor = TypeDescriptor.GetProperties(item).Find(fieldName, true);
+                    }
+                    if (descriptor != null)
+                    {
+                        item = descriptor.GetValue(item);
+                    }
+                }
+                catch
+                {
+                }
+            }
+            return item;
+        }
+        /// <summary>
+        /// Gets or sets the index specifying the currently selected item.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), Description("Gets or sets the index specifying the currently selected item.")]
+        public int SelectedIndex
+        {
+            get
+            {
+                if (_DataManager != null)
+                {
+                    if (_AdvTree.SelectedNode == null || _AdvTree.SelectedNode.BindingIndex < 0)
+                        return -1;
+                    return _AdvTree.SelectedNode.BindingIndex;
+                }
+                if (_AdvTree.SelectedNode == null) return -1;
+                return _AdvTree.GetNodeFlatIndex(_AdvTree.SelectedNode);
+            }
+            set
+            {
+                SetSelectedIndex(value);
+            }
+        }
+        private void SetSelectedIndex(int value)
+        {
+            if (value == -1)
+            {
+                _AdvTree.SelectedNode = null;
+                return;
+            }
+            Node node = null;
+            if (_DataManager != null)
+            {
+                node = _AdvTree.FindNodeByBindingIndex(value);
+            }
+            else
+            {
+                node = _AdvTree.GetNodeByFlatIndex(value);
+            }
+            _AdvTree.SelectedNode = node;
+        }
+        /// <summary>
+        /// Raises the SelectedIndexChanged event.
+        /// </summary>
+        /// <param name="e">Event arguments.</param>
+        protected virtual void OnSelectedIndexChanged(EventArgs e)
+        {
+            EventHandler handler = SelectedIndexChanged;
+            if (handler != null)
+            {
+                handler(this, e);
+            }
+        }
+
+        protected override void OnParentChanged(EventArgs e)
+        {
+            if (this.DataSource != null && _AdvTree.Nodes.Count == 0 && _DisplayMembers!=null && _DisplayMembers.Count>0)
+            {
+                this.SetDataConnection(this.DataSource, _DisplayMembers, true);
+                _AdvTree.SetPendingLayout();
+            }
+
+            base.OnParentChanged(e);
+        }
+
+        private BindingMemberInfo _ValueMember = new BindingMemberInfo();
+        /// <summary>
+        /// Gets or sets the property to use as the actual value for the items in the control. Applies to data-binding scenarios. SelectedValue property will return the value of selected node as indicated by this property.
+        /// </summary>
+        [Category("Data"), DefaultValue(""), Editor("System.Windows.Forms.Design.DataMemberFieldEditor, System.Design, Version= 2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", typeof(UITypeEditor)), Description("property to use as the actual value for the items in the control. Applies to data-binding scenarios. SelectedValue property will return the value of selected node as indicated by this property.")]
+        public string ValueMember
+        {
+            get
+            {
+                return _ValueMember.BindingMember;
+            }
+            set
+            {
+                if (value == null)
+                {
+                    value = "";
+                }
+                BindingMemberInfo newValueMember = new BindingMemberInfo(value);
+                if (!newValueMember.Equals(_ValueMember))
+                {
+                    if (this.DisplayMembers.Length == 0 && this.Columns.Count == 0)
+                    {
+                        List<BindingMemberInfo> list = new List<BindingMemberInfo>();
+                        list.Add(newValueMember);
+                        this.SetDataConnection(this.DataSource, list, false);
+                    }
+                    if (((_DataManager != null) && (value != null)) && ((value.Length != 0) && !this.BindingMemberInfoInDataManager(newValueMember)))
+                    {
+                        throw new ArgumentException("Invalid value for ValueMember", "value");
+                    }
+                    _ValueMember = newValueMember;
+                    this.OnValueMemberChanged(EventArgs.Empty);
+                    this.OnSelectedValueChanged(EventArgs.Empty);
+                }
+            }
+        }
+        /// <summary>
+        /// Raises the ValueMemberChanged event.
+        /// </summary>
+        /// <param name="e">Event arguments.</param>
+        protected virtual void OnValueMemberChanged(EventArgs e)
+        {
+            EventHandler handler = ValueMemberChanged;
+            if (handler != null)
+            {
+                handler(this, e);
+            }
+        }
+        /// <summary>
+        /// Raises the SelectedValueChanged event.
+        /// </summary>
+        /// <param name="e">Event arguments.</param>
+        protected virtual void OnSelectedValueChanged(EventArgs e)
+        {
+            EventHandler handler = SelectedValueChanged;
+            if (handler != null)
+            {
+                handler(this, e);
+            }
+        }
+        /// <summary>
+        /// Gets or sets the value of the member property specified by the ValueMember property.
+        /// </summary>
+        [Browsable(false), DefaultValue(null), Bindable(true), Category("Data"), Description("Indicates value of the member property specified by the ValueMember property."), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public object SelectedValue
+        {
+            get
+            {
+                if (_DataManager != null && this.SelectedIndex != -1)
+                {
+                    object item = _DataManager.List[this.SelectedIndex];
+                    return this.GetPropertyValue(item, _ValueMember.BindingField);
+                }
+                return null;
+            }
+            set
+            {
+                if (_DataManager != null)
+                {
+                    string bindingField = _ValueMember.BindingField;
+                    if (string.IsNullOrEmpty(bindingField))
+                    {
+                        throw new InvalidOperationException("ValueMember property must be set to be able to set SelectedValue");
+                    }
+                    PropertyDescriptor property = _DataManager.GetItemProperties().Find(bindingField, true);
+                    System.Reflection.MethodInfo mi = _DataManager.GetType().GetMethod("Find", System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.NonPublic);
+                    int num = -1;
+                    if (mi != null)
+                    {
+                        num = (int)mi.Invoke(_DataManager, new object[] { property, value, true });
+                    }
+                    else
+                    {
+                        //int num = _DataManager.Find(property, value, true);
+                        // Provide an alternate implementation...
+                    }
+                    this.SelectedIndex = num;
+                }
+            }
+        }
+ 
+
+        //private void TextBoxSizeChanged(object sender, EventArgs e)
+        //{
+        //    if (!_InternalSizeUpdate)
+        //        UpdateLayout();
+        //}
+
+        //private void TextBoxTextChanged(object sender, EventArgs e)
+        //{
+        //    base.Text = _TextBox.Text;
+        //}
+
+        //private void TextBoxTextAlignChanged(object sender, EventArgs e)
+        //{
+        //    OnTextAlignChanged(e);
+        //}
+        ///// <summary>
+        ///// Raises the TextAlignChanged event.
+        ///// </summary>
+        //protected virtual void OnTextAlignChanged(EventArgs e)
+        //{
+        //    EventHandler eh = TextAlignChanged;
+        //    if (eh != null)
+        //        eh(this, e);
+        //}
+
+        private Font _WatermarkFont = null;
+        /// <summary>
+        /// Gets or sets the watermark font.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), Description("Indicates watermark font."), DefaultValue(null)]
+        public virtual Font WatermarkFont
+        {
+            get { return _WatermarkFont; }
+            set { _WatermarkFont = value; this.Invalidate(); }
+        }
+
+        private Color _WatermarkColor = SystemColors.GrayText;
+        /// <summary>
+        /// Gets or sets the watermark text color.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), Description("Indicates watermark text color.")]
+        public virtual Color WatermarkColor
+        {
+            get { return _WatermarkColor; }
+            set { _WatermarkColor = value; this.Invalidate(); }
+        }
+        /// <summary>
+        /// Indicates whether property should be serialized by Windows Forms designer.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeWatermarkColor()
+        {
+            return _WatermarkColor != SystemColors.GrayText;
+        }
+        /// <summary>
+        /// Resets the property to default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetWatermarkColor()
+        {
+            this.WatermarkColor = SystemColors.GrayText;
+        }
+
+        private bool _WatermarkEnabled = true;
+        /// <summary>
+        /// Gets or sets whether watermark text is displayed if set for the input items. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Description("Indicates whether watermark text is displayed if set for the input items.")]
+        public virtual bool WatermarkEnabled
+        {
+            get { return _WatermarkEnabled; }
+            set { _WatermarkEnabled = value; this.Invalidate(); }
+        }
+
+        private string _WatermarkText = "";
+        /// <summary>
+        /// Gets or sets the watermark text displayed on the input control when control is empty.
+        /// </summary>
+        [DefaultValue(""), Localizable(true), Description("Indicates watermark text displayed on the input control when control is empty."), Category("Watermark")]
+        public string WatermarkText
+        {
+            get { return _WatermarkText; }
+            set
+            {
+                if (value != null)
+                {
+                    _WatermarkText = value;
+                    this.Invalidate();
+                }
+            }
+        }
+
+        private eTextAlignment _WatermarkAlignment = eTextAlignment.Left;
+        /// <summary>
+        /// Gets or sets the watermark text alignment. Default value is left.
+        /// </summary>
+        [Browsable(true), DefaultValue(eTextAlignment.Left), Description("Indicates watermark text alignment."), Category("Watermark")]
+        public eTextAlignment WatermarkAlignment
+        {
+            get { return _WatermarkAlignment; }
+            set
+            {
+                if (_WatermarkAlignment != value)
+                {
+                    _WatermarkAlignment = value;
+                    this.Invalidate();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether FocusHighlightColor is used as background color to highlight text box when it has input focus. Default value is false.
+        /// </summary>
+        [DefaultValue(false), Browsable(true), Category("Appearance"), Description("Indicates whether FocusHighlightColor is used as background color to highlight text box when it has input focus.")]
+        public bool FocusHighlightEnabled
+        {
+            get { return _FocusHighlightEnabled; }
+            set
+            {
+                if (_FocusHighlightEnabled != value)
+                {
+                    _FocusHighlightEnabled = value;
+                    //_TextBox.FocusHighlightEnabled = value;
+                    if (this.Focused)
+                        this.Invalidate(true);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the color used as background color to highlight text box when it has input focus and focus highlight is enabled.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), Description("Indicates color used as background color to highlight text box when it has input focus and focus highlight is enabled.")]
+        public Color FocusHighlightColor
+        {
+            get { return _FocusHighlightColor; }
+            set
+            {
+                if (_FocusHighlightColor != value)
+                {
+                    _FocusHighlightColor = value;
+                    //_TextBox.FocusHighlightColor = value;
+                    if (this.Focused)
+                        this.Invalidate(true);
+                }
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeFocusHighlightColor()
+        {
+            return !_FocusHighlightColor.Equals(ColorScheme.GetColor(0xFFFF88));
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetFocusHighlightColor()
+        {
+            FocusHighlightColor = ColorScheme.GetColor(0xFFFF88);
+        }
+
+        private ElementStyle _BackgroundStyle = new ElementStyle();
+        /// <summary>
+        /// Specifies the background style of the control.
+        /// </summary>
+        [Category("Style"), Description("Gets or sets control background style."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ElementStyle BackgroundStyle
+        {
+            get { return _BackgroundStyle; }
+        }
+
+        /// <summary>
+        /// Resets style to default value. Used by windows forms designer.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetBackgroundStyle()
+        {
+            _BackgroundStyle.StyleChanged -= new EventHandler(this.VisualPropertyChanged);
+            _BackgroundStyle = new ElementStyle();
+            _BackgroundStyle.StyleChanged += new EventHandler(this.VisualPropertyChanged);
+            this.Invalidate();
+        }
+
+        private void VisualPropertyChanged(object sender, EventArgs e)
+        {
+            OnVisualPropertyChanged();
+        }
+
+        protected virtual void OnVisualPropertyChanged()
+        {
+            _ButtonGroup.InvalidateArrange();
+            this.Invalidate();
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            if (_BackgroundStyle != null) _BackgroundStyle.StyleChanged -= new EventHandler(VisualPropertyChanged);
+            System.Windows.Forms.Timer timer = _SearchBufferExpireTimer;
+            _SearchBufferExpireTimer = null;
+            if (timer != null)
+            {
+                timer.Stop();
+                timer.Dispose();
+            }
+            if (_AdvTree != null)
+            {
+                _AdvTree.AfterNodeSelect -= new AdvTreeNodeEventHandler(TreeAfterNodeSelect);
+                _AdvTree.BeforeNodeSelect -= new AdvTreeNodeCancelEventHandler(TreeBeforeNodeSelect);
+                _AdvTree.NodeMouseDown -= new TreeNodeMouseEventHandler(TreeNodeMouseDown);
+            }
+            if(_DropDownControl!=null)
+            {
+                _DropDownControl.Dispose();
+                _DropDownControl = null;
+            }
+            base.Dispose(disposing);
+        }
+
+        private InputButtonSettings _ButtonDropDown = null;
+        /// <summary>
+        /// Gets the object that describes the settings for the button that shows drop-down when clicked.
+        /// </summary>
+        [Category("Buttons"), Description("Describes the settings for the button that shows drop-down when clicked."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public InputButtonSettings ButtonDropDown
+        {
+            get
+            {
+                return _ButtonDropDown;
+            }
+        }
+
+        private InputButtonSettings _ButtonClear = null;
+        /// <summary>
+        /// Gets the object that describes the settings for the button that clears the content of the control when clicked.
+        /// </summary>
+        [Category("Buttons"), Description("Describes the settings for the button that clears the content of the control when clicked."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public InputButtonSettings ButtonClear
+        {
+            get
+            {
+                return _ButtonClear;
+            }
+        }
+
+
+        private InputButtonSettings _ButtonCustom = null;
+        /// <summary>
+        /// Gets the object that describes the settings for the custom button that can execute an custom action of your choosing when clicked.
+        /// </summary>
+        [Category("Buttons"), Description("Describes the settings for the custom button that can execute an custom action of your choosing when clicked."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public InputButtonSettings ButtonCustom
+        {
+            get
+            {
+                return _ButtonCustom;
+            }
+        }
+
+        private InputButtonSettings _ButtonCustom2 = null;
+        /// <summary>
+        /// Gets the object that describes the settings for the custom button that can execute an custom action of your choosing when clicked.
+        /// </summary>
+        [Category("Buttons"), Description("Describes the settings for the custom button that can execute an custom action of your choosing when clicked."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public InputButtonSettings ButtonCustom2
+        {
+            get
+            {
+                return _ButtonCustom2;
+            }
+        }
+
+
+        void IInputButtonControl.InputButtonSettingsChanged(InputButtonSettings inputButtonSettings)
+        {
+            OnInputButtonSettingsChanged(inputButtonSettings);
+        }
+
+        protected virtual void OnInputButtonSettingsChanged(InputButtonSettings inputButtonSettings)
+        {
+            UpdateButtons();
+        }
+
+        private VisualGroup _ButtonGroup = null;
+        private void UpdateButtons()
+        {
+            RecreateButtons();
+            _ButtonGroup.InvalidateArrange();
+            this.Invalidate();
+        }
+
+        protected virtual void RecreateButtons()
+        {
+            VisualItem[] buttons = CreateOrderedButtonList();
+            // Remove all system buttons that are already in the list
+            VisualGroup group = _ButtonGroup;
+            VisualItem[] items = new VisualItem[group.Items.Count];
+            group.Items.CopyTo(items);
+            foreach (VisualItem item in items)
+            {
+                if (item.ItemType == eSystemItemType.SystemButton)
+                {
+                    group.Items.Remove(item);
+                    if (item == _ButtonCustom.ItemReference)
+                        item.MouseUp -= new MouseEventHandler(CustomButtonClick);
+                    else if (item == _ButtonCustom2.ItemReference)
+                        item.MouseUp -= new MouseEventHandler(CustomButton2Click);
+                }
+            }
+
+            // Add new buttons to the list
+            group.Items.AddRange(buttons);
+        }
+
+        private void CustomButtonClick(object sender, MouseEventArgs e)
+        {
+            if (_ButtonCustom.ItemReference.RenderBounds.Contains(e.X, e.Y))
+                OnButtonCustomClick(e);
+        }
+
+        protected virtual void OnButtonCustomClick(EventArgs e)
+        {
+            if (ButtonCustomClick != null)
+                ButtonCustomClick(this, e);
+        }
+
+        private void CustomButton2Click(object sender, MouseEventArgs e)
+        {
+            if (_ButtonCustom2.ItemReference.RenderBounds.Contains(e.X, e.Y))
+                OnButtonCustom2Click(e);
+        }
+
+        protected virtual void OnButtonCustom2Click(EventArgs e)
+        {
+            if (ButtonCustom2Click != null)
+                ButtonCustom2Click(this, e);
+        }
+
+        private VisualItem[] CreateOrderedButtonList()
+        {
+            SortedList list = CreateSortedButtonList();
+
+            VisualItem[] items = new VisualItem[list.Count];
+            list.Values.CopyTo(items, 0);
+
+            return items;
+        }
+
+        protected virtual SortedList CreateSortedButtonList()
+        {
+            SortedList list = new SortedList(4);
+            if (_ButtonCustom.Visible)
+            {
+                VisualItem button = CreateButton(_ButtonCustom);
+                if (_ButtonCustom.ItemReference != null)
+                {
+                    _ButtonCustom.ItemReference.MouseUp -= new MouseEventHandler(CustomButtonClick);
+                    _ButtonCustom.ItemReference.Click -= CustomButtonKeyClick;
+                }
+                _ButtonCustom.ItemReference = button;
+                button.Click += CustomButtonKeyClick;
+                button.MouseUp += new MouseEventHandler(CustomButtonClick);
+                button.Enabled = _ButtonCustom.Enabled;
+                list.Add(_ButtonCustom, button);
+            }
+
+            if (_ButtonCustom2.Visible)
+            {
+                VisualItem button = CreateButton(_ButtonCustom2);
+                if (_ButtonCustom2.ItemReference != null)
+                {
+                    _ButtonCustom2.ItemReference.MouseUp -= new MouseEventHandler(CustomButton2Click);
+                    _ButtonCustom2.ItemReference.Click -= CustomButton2KeyClick;
+                }
+                _ButtonCustom2.ItemReference = button;
+                button.Click += CustomButton2KeyClick;
+                button.MouseUp += new MouseEventHandler(CustomButton2Click);
+                button.Enabled = _ButtonCustom2.Enabled;
+                list.Add(_ButtonCustom2, button);
+            }
+
+            if (_ButtonClear.Visible)
+            {
+                VisualItem button = CreateButton(_ButtonClear);
+                if (_ButtonClear.ItemReference != null)
+                {
+                    _ButtonClear.ItemReference.MouseUp -= ClearButtonClick;
+                    _ButtonClear.ItemReference.Click -= ClearButtonKeyClick;
+                }
+                _ButtonClear.ItemReference = button;
+                button.MouseUp += ClearButtonClick;
+                button.Click += ClearButtonKeyClick;
+                list.Add(_ButtonClear, button);
+            }
+
+            if (_ButtonDropDown.Visible)
+            {
+                VisualItem button = CreateButton(_ButtonDropDown);
+                if (_ButtonDropDown.ItemReference != null)
+                {
+                    _ButtonDropDown.ItemReference.MouseDown -= new MouseEventHandler(DropDownButtonMouseDown);
+                    _ButtonDropDown.ItemReference.Click -= DropDownButtonKeyClick;
+                }
+                _ButtonDropDown.ItemReference = button;
+                button.MouseDown += new MouseEventHandler(DropDownButtonMouseDown);
+                button.Click += DropDownButtonKeyClick;
+                list.Add(_ButtonDropDown, button);
+            }
+
+            return list;
+        }
+
+        private void ClearButtonKeyClick(object sender, EventArgs e)
+        {
+            if (e is KeyEventArgs)
+                ClearButtonClick(sender, e);
+        }
+        private void CustomButtonKeyClick(object sender, EventArgs e)
+        {
+            if (e is KeyEventArgs)
+                OnButtonCustomClick(e);
+        }
+        private void CustomButton2KeyClick(object sender, EventArgs e)
+        {
+            if (e is KeyEventArgs)
+                OnButtonCustom2Click(e);
+        }
+        private void DropDownButtonKeyClick(object sender, EventArgs e)
+        {
+            if (e is KeyEventArgs)
+                IsPopupOpen = !IsPopupOpen;
+        }
+        protected virtual VisualItem CreateButton(InputButtonSettings buttonSettings)
+        {
+            VisualItem item = null;
+
+            if (buttonSettings == _ButtonDropDown)
+            {
+                item = new VisualDropDownButton();
+                ApplyButtonSettings(buttonSettings, item as VisualButton);
+            }
+            else
+            {
+                item = new VisualCustomButton();
+                ApplyButtonSettings(buttonSettings, item as VisualButton);
+            }
+
+            VisualButton button = item as VisualButton;
+            button.ClickAutoRepeat = false;
+
+            if (buttonSettings == _ButtonClear)
+            {
+                if (buttonSettings.Image == null && string.IsNullOrEmpty(buttonSettings.Text))
+                {
+                    //if (Dpi.Factor.Width > 1)
+                        button.Symbol = "\uf00d";
+                    //else
+                    //    button.Image = DevComponents.DotNetBar.BarFunctions.LoadBitmap("SystemImages.DateReset.png");
+                }
+            }
+
+            return item;
+        }
+
+        protected virtual void ApplyButtonSettings(InputButtonSettings buttonSettings, VisualButton button)
+        {
+            button.Text = buttonSettings.Text;
+            button.Image = buttonSettings.Image;
+            button.ItemType = eSystemItemType.SystemButton;
+            button.Enabled = buttonSettings.Enabled;
+            button.Shortcut = buttonSettings.Shortcut;
+            button.Tooltip = buttonSettings.Tooltip;
+            button.Symbol = buttonSettings.Symbol;
+            button.SymbolSet = buttonSettings.SymbolSet;
+            button.SymbolColor = buttonSettings.SymbolColor;
+        }
+
+        private void CreateButtonGroup()
+        {
+            VisualGroup group = new VisualGroup();
+            group.HorizontalItemSpacing = 0;
+            group.ArrangeInvalid += new EventHandler(ButtonGroupArrangeInvalid);
+            group.RenderInvalid += new EventHandler(ButtonGroupRenderInvalid);
+            group.ResetMouseHover += ButtonGroupRenderMouseHover;
+            _ButtonGroup = group;
+        }
+
+        private void ButtonGroupRenderInvalid(object sender, EventArgs e)
+        {
+            Invalidate();
+        }
+
+        private void ButtonGroupArrangeInvalid(object sender, EventArgs e)
+        {
+            Invalidate();
+        }
+
+        private void ButtonGroupRenderMouseHover(object sender, EventArgs e)
+        {
+            DevComponents.AdvTree.Interop.WinApi.ResetHover(this);
+        }
+
+        private bool _MouseOver = false;
+        private PaintInfo CreatePaintInfo(Graphics g)
+        {
+            PaintInfo p = new PaintInfo();
+            p.Graphics = g;
+            p.DefaultFont = this.Font;
+            p.ForeColor = this.ForeColor;
+            p.RenderOffset = new System.Drawing.Point();
+            Size s = this.Size;
+            bool disposeStyle = false;
+            ElementStyle style = GetBackgroundStyle(out disposeStyle);
+            s.Height -= (ElementStyleLayout.TopWhiteSpace(style, eSpacePart.Border) + ElementStyleLayout.BottomWhiteSpace(style, eSpacePart.Border)) + 2;
+            s.Width -= (ElementStyleLayout.LeftWhiteSpace(style, eSpacePart.Border) + ElementStyleLayout.RightWhiteSpace(style, eSpacePart.Border)) + 2;
+            p.AvailableSize = s;
+            p.ParentEnabled = this.Enabled;
+            p.MouseOver = _MouseOver || this.Focused;
+            if(disposeStyle) style.Dispose();
+            return p;
+        }
+
+        private ElementStyle GetBackgroundStyle(out bool disposeStyle)
+        {
+            disposeStyle = false;
+            _BackgroundStyle.SetColorScheme(this.GetColorScheme());
+            return ElementStyleDisplay.GetElementStyle(_BackgroundStyle, out disposeStyle);
+        }
+
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            base.OnPaint(e);
+            Graphics g = e.Graphics;
+            Rectangle clientRect = this.ClientRectangle;
+            bool enabled = this.Enabled;
+
+#if !TRIAL
+            if (NativeFunctions.keyValidated2 != 266)
+                TextDrawing.DrawString(e.Graphics, "Invalid License", this.Font, Color.FromArgb(180, Color.Red), this.ClientRectangle, eTextFormat.Bottom | eTextFormat.HorizontalCenter);
+#else
+            if (NativeFunctions.ColorExpAlt() || !NativeFunctions.CheckedThrough)
+		    {
+			    e.Graphics.Clear(SystemColors.Control);
+                return;
+            }
+#endif
+
+            if (!this.Enabled)
+            {
+                if (!_DisabledBackColor.IsEmpty)
+                {
+                    using(SolidBrush brush=new SolidBrush(_DisabledBackColor))
+                        e.Graphics.FillRectangle(brush, clientRect);
+                }
+                else
+                    e.Graphics.FillRectangle(SystemBrushes.Control, clientRect);
+            }
+            else
+            {
+                using (SolidBrush brush = new SolidBrush(this.BackColor))
+                    e.Graphics.FillRectangle(brush, clientRect);
+            }
+
+            bool disposeStyle = false;
+            ElementStyle style = GetBackgroundStyle(out disposeStyle);
+
+            if (style.Custom)
+            {
+                SmoothingMode sm = g.SmoothingMode;
+                if (this.AntiAlias)
+                    g.SmoothingMode = SmoothingMode.AntiAlias;
+                ElementStyleDisplayInfo displayInfo = new ElementStyleDisplayInfo(style, g, clientRect);
+                if (!enabled)
+                {
+                    ElementStyleDisplay.PaintBorder(displayInfo);
+                }
+                else
+                    ElementStyleDisplay.Paint(displayInfo);
+                if (this.AntiAlias)
+                    g.SmoothingMode = sm;
+            }
+
+            Rectangle buttonBounds = PaintButtons(g);
+            // Paint selected content
+            Rectangle selectionRect = GetSelectionRectangle(style, clientRect);
+            if (!buttonBounds.IsEmpty)
+            {
+                Rectangle[] split = DisplayHelp.ExcludeRectangle(selectionRect, buttonBounds);
+                if (split.Length >= 1)
+                    selectionRect = split[0];
+                selectionRect.Width--;
+            }
+
+            if (this.WatermarkEnabled && this.WatermarkText.Length > 0 && this.IsWatermarkRendered)
+            {
+                Rectangle watermarkBounds = selectionRect;
+                watermarkBounds.Inflate(-1, -1);
+                DrawWatermark(g, watermarkBounds);
+            }
+
+            PaintSelection(g, selectionRect);
+
+            if(disposeStyle) style.Dispose();
+        }
+
+        private void DrawWatermark(Graphics g, Rectangle r)
+        {
+            if (this.WatermarkText.Length == 0) return;
+            Font font = this.Font;
+            if (this.WatermarkFont != null) font = this.WatermarkFont;
+
+            eTextFormat format = eTextFormat.Default;
+            if (_WatermarkAlignment == eTextAlignment.Center)
+                format |= eTextFormat.HorizontalCenter;
+            else if (_WatermarkAlignment == eTextAlignment.Right)
+                format |= eTextFormat.Right;
+
+            TextDrawing.DrawString(g, this.WatermarkText, font, this.WatermarkColor, r, format);
+        }
+
+        protected virtual bool IsWatermarkRendered
+        {
+            get
+            {
+                return !this.Focused && this.SelectedNode == null;
+            }
+        }
+
+        private Rectangle GetSelectionRectangle(ElementStyle style, Rectangle clientRect)
+        {
+            return new Rectangle(ElementStyleLayout.LeftWhiteSpace(style, eSpacePart.Border) + 1,
+                ElementStyleLayout.TopWhiteSpace(style, eSpacePart.Border) + 1,
+                clientRect.Width-(ElementStyleLayout.RightWhiteSpace(style, eSpacePart.Border) + ElementStyleLayout.LeftWhiteSpace(style, eSpacePart.Border) + 2),
+                clientRect.Height-(ElementStyleLayout.TopWhiteSpace(style, eSpacePart.Border) + ElementStyleLayout.BottomWhiteSpace(style, eSpacePart.Border) + 2));
+
+        }
+
+        protected string GetSelectedDisplayMemberText(Node node)
+        {
+            int index = _AdvTree.Columns.IndexOfField(_SelectedDisplayMember);
+            if (index >= 0)
+            {
+                return node.Cells[index].Text;
+            }
+            // Try to get it from data
+            return GetItemText(node.DataKey, _SelectedDisplayMember);
+        }
+
+        /// <summary>
+        /// Renders the selected node inside the combo box.
+        /// </summary>
+        /// <param name="g">Graphics reference.</param>
+        /// <param name="bounds">Render bounds.</param>
+        protected virtual void PaintSelection(Graphics g, Rectangle bounds)
+        {
+            if (bounds.Width < 2 || bounds.Height < 2) return;
+
+            if (this.Focused && !this.IsPopupOpen)
+            {
+                SelectionRendererEventArgs selectionArgs = new SelectionRendererEventArgs();
+                selectionArgs.Bounds = bounds;
+                selectionArgs.Graphics = g;
+                selectionArgs.SelectionBoxStyle = eSelectionStyle.HighlightCells;
+                selectionArgs.TreeActive = true;
+                ((DevComponents.AdvTree.Display.NodeTreeDisplay)_AdvTree.NodeDisplay).GetTreeRenderer().DrawSelection(selectionArgs);
+            }
+
+            Node node = _AdvTree.SelectedNode;
+            if (node != null)
+            {
+                if (node.BoundsRelative.IsEmpty || _AdvTree.IsLayoutPending || node.BoundsRelative.Width <= 0 || _AdvTree.Width <= 0)
+                {
+                    UpdateTreeSize();
+                    if (_AdvTree.IsLayoutPending) _AdvTree.RecalcLayout();
+                }
+
+                Region oldClip = g.Clip;
+                g.SetClip(bounds);
+
+                Rectangle nodeRenderBounds = bounds;
+
+                if (!string.IsNullOrEmpty(_SelectedDisplayMember))
+                {
+                    string text = GetSelectedDisplayMemberText(node);
+
+                    if (string.IsNullOrEmpty(text) == false)
+                    {
+                        nodeRenderBounds.Y--;
+                        nodeRenderBounds.X++;
+                        nodeRenderBounds.Width--;
+
+                        TextDrawing.DrawString(g, text, Font, Enabled ? ForeColor : SystemColors.ControlDark,
+                            nodeRenderBounds, eTextFormat.Left | eTextFormat.NoClipping | eTextFormat.NoPadding | eTextFormat.VerticalCenter);
+                    }
+                }
+                else
+                {
+
+                    if (DevComponents.AdvTree.Display.NodeDisplay.DrawExpandPart(node))
+                    {
+                        nodeRenderBounds.X -= _AdvTree.ExpandWidth;
+                    }
+                    else
+                        nodeRenderBounds.X -= (node.Bounds.X - node.BoundsRelative.X - 2);
+                    if (nodeRenderBounds.Height > node.BoundsRelative.Height)
+                        nodeRenderBounds.Y += (nodeRenderBounds.Height - node.BoundsRelative.Height) / 2;
+                    else
+                        nodeRenderBounds.Y += 1;
+                    bool oldEnabled = node.Enabled;
+                    if (node.Enabled != this.Enabled)
+                        node.Enabled = this.Enabled;
+                    bool oldSelectionVisible = node.IsSelectionVisible;
+                    node.IsSelectionVisible = this.Focused  && !this.IsPopupOpen;
+                    ((DevComponents.AdvTree.Display.NodeTreeDisplay)_AdvTree.NodeDisplay).ExternalPaintNode(node, g, nodeRenderBounds);
+                    node.Enabled = oldEnabled;
+                    node.IsSelectionVisible = oldSelectionVisible;
+                }
+
+                g.Clip = oldClip;
+                if(oldClip!=null) oldClip.Dispose();
+            }
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeBackColor()
+        {
+            return this.BackColor != SystemColors.Window;
+        }
+
+        //protected override void OnBackColorChanged(EventArgs e)
+        //{
+        //    base.OnBackColorChanged(e);
+        //    _TextBox.BackColor = this.BackColor;
+        //}
+
+        private Rectangle PaintButtons(Graphics g)
+        {
+            PaintInfo p = CreatePaintInfo(g);
+
+            if (!_ButtonGroup.IsLayoutValid)
+            {
+                UpdateLayout(p);
+            }
+
+            bool disposeStyle = false;
+            ElementStyle style = GetBackgroundStyle(out disposeStyle);
+            _ButtonGroup.RenderBounds = GetButtonsRenderBounds(style);
+            _ButtonGroup.ProcessPaint(p);
+            if(disposeStyle) style.Dispose();
+            return _ButtonGroup.RenderBounds;
+        }
+
+        private Rectangle GetButtonsRenderBounds(ElementStyle style)
+        {
+            if (this.RightToLeft == RightToLeft.Yes)
+            {
+                return new Rectangle((ElementStyleLayout.LeftWhiteSpace(style, eSpacePart.Border) + 1), ElementStyleLayout.TopWhiteSpace(style, eSpacePart.Border) + 1,
+                _ButtonGroup.Size.Width, _ButtonGroup.Size.Height);
+            }
+
+            return new Rectangle(this.Width - (ElementStyleLayout.RightWhiteSpace(style, eSpacePart.Border) + 1) - _ButtonGroup.Size.Width, ElementStyleLayout.TopWhiteSpace(style, eSpacePart.Border) + 1,
+                _ButtonGroup.Size.Width, _ButtonGroup.Size.Height);
+        }
+
+        protected override void OnResize(EventArgs e)
+        {
+            _ButtonGroup.InvalidateArrange();
+            UpdateLayout();
+            this.Invalidate();
+            base.OnResize(e);
+        }
+
+        protected override void OnEnter(EventArgs e)
+        {
+            this.Invalidate();
+            base.OnEnter(e);
+        }
+
+        protected override void OnLeave(EventArgs e)
+        {
+            if (this.IsPopupOpen) this.IsPopupOpen = false;
+            this.Invalidate();
+            base.OnLeave(e);
+        }
+
+        //protected override void OnGotFocus(EventArgs e)
+        //{
+        //    if(_TextBox.Visible)
+        //        _TextBox.Focus();
+        //    base.OnGotFocus(e);
+        //}
+
+        protected override void OnKeyDown(KeyEventArgs e)
+        {
+            _ButtonGroup.ProcessKeyDown(e);
+            base.OnKeyDown(e);
+        }
+
+        private bool _EnterKeyTogglesPopup = true;
+        /// <summary>
+        /// Indicates whether Enter key when pressed while control has input focus toggles the popup. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether Enter key when pressed while control has input focus toggles the popup.")]
+        public bool EnterKeyTogglesPopup
+        {
+            get { return _EnterKeyTogglesPopup; }
+            set
+            {
+                _EnterKeyTogglesPopup = value;
+            }
+        }
+        
+
+        protected override bool OnKeyDown(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+            if (this.Focused)
+            {
+                Keys key = (Keys)NativeFunctions.MapVirtualKey((uint)wParam, 2);
+                if (key == Keys.None)
+                    key = (Keys)WinApi.ToInt(wParam);
+                if (key == Keys.F4)
+                {
+                    this.IsPopupOpen = !this.IsPopupOpen;
+                    return true;
+                }
+                else if (((key == Keys.Down && (Control.ModifierKeys & Keys.Alt) != 0) || key == Keys.Enter && _EnterKeyTogglesPopup) && !this.IsPopupOpen)
+                {
+                    this.IsPopupOpen = !this.IsPopupOpen;
+                    return true;
+                }
+                else if (this.IsPopupOpen && (key == Keys.Tab || key == Keys.Enter))
+                {
+                    this.IsPopupOpen = false;
+                    if(key == Keys.Enter)
+                        return true;
+                }
+                else if (this.IsPopupOpen)
+                {
+                    if (key == Keys.Up)
+                    {
+                        this.SelectPreviousNode(eTreeAction.Keyboard);
+                        return true;
+                    }
+                    else if (key == Keys.Down)
+                    {
+                        this.SelectNextNode(eTreeAction.Keyboard);
+                        return true;
+                    }
+                    else
+                    {
+                        try
+                        {
+                            byte[] keyState = new byte[256];
+                            if (NativeFunctions.GetKeyboardState(keyState))
+                            {
+                                byte[] chars = new byte[2];
+                                if (NativeFunctions.ToAscii((uint)key, 0, keyState, chars, 0) != 0)
+                                {
+                                    char[] characters = new char[2];
+                                    System.Text.Encoding.Default.GetDecoder().GetChars(chars, 0, 2, characters, 0);
+                                    if (ProcessKeyboardCharacter(characters[0]))
+                                        return true;
+                                }
+                            }
+                        }
+                        catch (Exception)
+                        {
+
+                        }
+                    }
+                }
+            }
+            return base.OnKeyDown(hWnd, wParam, lParam);
+        }
+
+        protected override void OnKeyUp(KeyEventArgs e)
+        {
+            _ButtonGroup.ProcessKeyUp(e);
+            base.OnKeyUp(e);
+        }
+
+        protected override bool IsInputChar(char charCode)
+        {
+            if(_KeyboardSearchEnabled && char.IsLetterOrDigit(charCode))
+                return true;
+            return base.IsInputChar(charCode);
+        }
+
+        protected override void OnKeyPress(KeyPressEventArgs e)
+        {
+            if(_KeyboardSearchEnabled)
+                e.Handled = ProcessKeyboardCharacter(e.KeyChar);
+            if(!e.Handled)
+                _ButtonGroup.ProcessKeyPress(e);
+            base.OnKeyPress(e);
+        }
+
+        private bool _KeyboardSearchEnabled = true;
+        /// <summary>
+        /// Gets or sets whether keyboard incremental search is enabled. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether keyboard incremental search is enabled.")]
+        public bool KeyboardSearchEnabled
+        {
+            get { return _KeyboardSearchEnabled; }
+            set
+            {
+                _KeyboardSearchEnabled = value;
+            }
+        }
+
+        private bool _KeyboardSearchNoSelectionAllowed = true;
+        /// <summary>
+        /// Gets or sets whether during keyboard search selected node can be set to nothing/null if there is no match found. 
+        /// Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether during keyboard search selected node can be set to nothing/null if there is no match found.")]
+        public bool KeyboardSearchNoSelectionAllowed
+        {
+            get { return _KeyboardSearchNoSelectionAllowed; }
+            set
+            {
+                _KeyboardSearchNoSelectionAllowed = value;
+            }
+        }
+        
+        
+
+        private System.Windows.Forms.Timer _SearchBufferExpireTimer = null;
+        private bool ProcessKeyboardCharacter(char p)
+        {
+            if (!char.IsLetterOrDigit(p)) return false;
+            string searchString = UpdateSearchBuffer(p.ToString());
+            Node node = _AdvTree.FindNodeByText(searchString, _AdvTree.SelectedNode, true);
+            if (node == null && _AdvTree.SelectedNode != null)
+            {
+                // Try from top searching
+                node = _AdvTree.FindNodeByText(searchString, true);
+            }
+            // If binding to data do not select the groupping virtual nodes
+            if (_DataSource != null && node != null && node.BindingIndex == -1)
+            {
+                while (node != null && node.BindingIndex == -1)
+                    node = _AdvTree.FindNodeByText(searchString, node, true);
+            }
+            if (!_KeyboardSearchNoSelectionAllowed && node == null) return false;
+
+            SelectNode(node, eTreeAction.Keyboard);
+            return false;
+        }
+
+        private int _SearchBufferExpireTimeout = 1000;
+        /// <summary>
+        /// Gets or sets the keyboard search buffer expiration timeout. Default value is 1000 which indicates that
+        /// key pressed within 1 second will add to the search buffer and control will be searched for node text
+        /// that begins with resulting string. Setting this value to 0 will disable the search buffer.
+        /// </summary>
+        [DefaultValue(1000), Category("Behavior"), Description("Indicates keyboard search buffer expiration timeout.")]
+        public int SearchBufferExpireTimeout
+        {
+            get { return _SearchBufferExpireTimeout; }
+            set
+            {
+                if (value < 0) value = 0;
+                _SearchBufferExpireTimeout = value;
+            }
+        }
+
+        private string _SearchBuffer = "";
+        private string UpdateSearchBuffer(string s)
+        {
+            if (_SearchBufferExpireTimeout <= 0)
+                return s;
+
+            if (_SearchBufferExpireTimer == null)
+            {
+                _SearchBufferExpireTimer = new System.Windows.Forms.Timer();
+                _SearchBufferExpireTimer.Interval = _SearchBufferExpireTimeout;
+                _SearchBufferExpireTimer.Tick += new EventHandler(SearchBufferExpireTimerTick);
+                _SearchBufferExpireTimer.Start();
+            }
+            else
+                _SearchBufferExpireTimer.Start();
+            _SearchBuffer += s;
+            return _SearchBuffer;
+        }
+
+        private void SearchBufferExpireTimerTick(object sender, EventArgs e)
+        {
+            _SearchBufferExpireTimer.Stop();
+            _SearchBuffer = "";
+        }
+
+        protected override bool ProcessMnemonic(char charCode)
+        {
+            if (this.Focused && Control.ModifierKeys != Keys.Alt)
+                return true;
+            return base.ProcessMnemonic(charCode);
+        }
+
+        protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
+        {
+            if ((keyData & Keys.Down) == Keys.Down && (Control.ModifierKeys & Keys.Alt) != 0 && !this.IsPopupOpen)
+            {
+                this.IsPopupOpen = !this.IsPopupOpen;
+                return true;
+            }
+            else if (keyData == Keys.Up)
+            {
+                this.SelectPreviousNode(eTreeAction.Keyboard);
+                return true;
+            }
+            else if (keyData == Keys.Down)
+            {
+                this.SelectNextNode(eTreeAction.Keyboard);
+                return true;
+            }
+            if (_ButtonGroup.ProcessCmdKey(ref msg, keyData))
+                return true;
+            return base.ProcessCmdKey(ref msg, keyData);
+        }
+
+        private void SelectNextNode(eTreeAction action)
+        {
+            Node node = null;
+            if (this.SelectedNode == null)
+                node = NodeOperations.GetFirstVisibleNode(_AdvTree);
+            else
+                node = NodeOperations.GetNextVisibleNode(this.SelectedNode);
+
+            if (node != null && !node.CanSelect)
+            {
+                int counter = 0;
+                while (node != null && counter < 100)
+                {
+                    node = NodeOperations.GetNextVisibleNode(node);
+                    if (node != null && node.CanSelect) break;
+                }
+            }
+            
+            if (node != null)
+            {
+                if (_DataManager != null)
+                {
+                    while (node != null && node.DataKey == null)
+                        node = NodeOperations.GetNextVisibleNode(node);
+                    if (node != null)
+                        SelectNode(node, action);
+                }
+                else
+                    SelectNode(node, action);
+            }
+        }
+
+        private void SelectPreviousNode(eTreeAction action)
+        {
+            Node node = null;
+            if (this.SelectedNode == null)
+                node = NodeOperations.GetLastVisibleNode(_AdvTree);
+            else
+                node = NodeOperations.GetPreviousVisibleNode(this.SelectedNode);
+
+            if (node != null && !node.CanSelect)
+            {
+                int counter = 0;
+                while (node != null && counter < 100)
+                {
+                    node = NodeOperations.GetPreviousVisibleNode(node);
+                    if (node != null && node.CanSelect) break;
+                }
+            }
+
+            if (node != null)
+            {
+                if (_DataManager != null)
+                {
+                while (node != null && node.DataKey == null)
+                    node = NodeOperations.GetNextVisibleNode(node);
+                if (node != null)
+                    SelectNode(node, action);
+            }
+            else
+                SelectNode(node, action);
+            }
+        }
+
+        private void SelectNode(Node node, eTreeAction action)
+        {
+            _AdvTree.SelectNode(node, action);
+        }
+
+        protected override void OnRightToLeftChanged(EventArgs e)
+        {
+            _ButtonGroup.InvalidateArrange();
+            UpdateLayout();
+            this.Invalidate();
+            base.OnRightToLeftChanged(e);
+        }
+
+        protected override void OnFontChanged(EventArgs e)
+        {
+            _ButtonGroup.InvalidateArrange();
+            _AdvTree.Font = this.Font;
+            UpdateLayout();
+            this.Invalidate();
+            base.OnFontChanged(e);
+        }
+
+        private void UpdateLayout()
+        {
+            using (Graphics g = BarFunctions.CreateGraphics(this))
+                UpdateLayout(CreatePaintInfo(g));
+        }
+
+        private bool _InternalSizeUpdate = false;
+        private void UpdateLayout(PaintInfo p)
+        {
+            if (_InternalSizeUpdate) return;
+
+            _InternalSizeUpdate = true;
+
+            try
+            {
+                if (!_ButtonGroup.IsLayoutValid)
+                {
+                    _ButtonGroup.PerformLayout(p);
+                }
+
+                bool disposeStyle = false;
+                ElementStyle style = GetBackgroundStyle(out disposeStyle);
+
+                Rectangle textBoxControlRect = ElementStyleLayout.GetInnerRect(style, this.ClientRectangle);
+                if (RenderButtons)
+                {
+                    Rectangle buttonsRect = GetButtonsRenderBounds(style);
+                    if (this.RightToLeft == RightToLeft.Yes)
+                    {
+                        textBoxControlRect.X += buttonsRect.Right;
+                        textBoxControlRect.Width -= buttonsRect.Right;
+                    }
+                    else
+                    {
+                        textBoxControlRect.Width -= (textBoxControlRect.Right - buttonsRect.X);
+                    }
+                }
+
+                if (disposeStyle) style.Dispose();
+                //if (_TextBox.PreferredHeight < textBoxControlRect.Height)
+                //{
+                //    textBoxControlRect.Y += (textBoxControlRect.Height - _TextBox.PreferredHeight) / 2;
+                //}
+                //_TextBox.Bounds = textBoxControlRect;
+            }
+            finally
+            {
+                _InternalSizeUpdate = false;
+            }
+        }
+
+        private Control _PreviousDropDownControlParent = null;
+        private void DropDownButtonMouseDown(object sender, MouseEventArgs e)
+        {
+            if (e.Button != MouseButtons.Left || _CloseTime != DateTime.MinValue && DateTime.Now.Subtract(_CloseTime).TotalMilliseconds < 250)
+            {
+                _CloseTime = DateTime.MinValue;
+                return;
+            }
+
+            ShowDropDown();
+        }
+        /// <summary>
+        /// Updates popup tree size based on its content.
+        /// </summary>
+        public void UpdateTreeSize()
+        {
+            _AdvTree.BeginUpdate();
+            bool recalcLayout = false;
+            if (_DropDownWidth == 0)
+            {
+                if (_AdvTree.Width != this.Width - 4)
+                {
+                    _AdvTree.Width = this.Width - 4;
+                    recalcLayout = true;
+                }
+            }
+            
+            if (_DropDownHeight == 0)
+                _AdvTree.Height = 600;
+            else
+                _AdvTree.Height = _DropDownHeight;
+            _AdvTree.EndUpdate(false);
+
+            if (_DropDownHeight == 0)
+            {
+                // Auto calculate height based on content
+                _AdvTree.RecalcLayout();
+                ScreenInformation screenInfo = BarFunctions.ScreenFromControl(this);
+                if (screenInfo != null && _AdvTree.NodeLayout.Height > screenInfo.WorkingArea.Height / 2)
+                {
+                    _AdvTree.Height = screenInfo.WorkingArea.Height / 2;
+                }
+                else if (_AdvTree.Nodes.Count > 0)
+                {
+                    int height=_AdvTree.NodeLayout.Height + 4;//(_AdvTree.ColumnHeaderHeight > 0 ? (_AdvTree.ColumnHeaderHeight + 4) : 4);
+                    if (_AdvTree.HScrollBar != null)
+                        height += _AdvTree.HScrollBar.Height + 1;
+                    _AdvTree.Height = height;
+                }
+                else
+                    _AdvTree.Height = this.Height;
+            }
+            else
+            {
+                _AdvTree.Height = _DropDownHeight;
+                if (recalcLayout)
+                    _AdvTree.RecalcLayout();
+            }
+        }
+
+        private bool _ShowingPopup = false;
+        /// <summary>
+        /// Shows drop-down popup. Note that popup will be shown only if there is a DropDownControl assigned or DropDownItems collection has at least one item.
+        /// </summary>
+        public void ShowDropDown()
+        {
+
+            if (_DropDownControl == null && _PopupItem.SubItems.Count == 0 || _ShowingPopup || _PopupItem.Expanded)
+                return;
+
+            _ShowingPopup = true;
+            try
+            {
+                ControlContainerItem cc = null;
+                ItemContainer ic = null;
+                if (_DropDownControl != null)
+                {
+                    ic = new ItemContainer();
+                    ic.Name = _DropDownItemContainerName;
+                    cc = new ControlContainerItem(_DropDownControlContainerName);
+                    ic.SubItems.Add(cc);
+                    _PopupItem.SubItems.Insert(0, ic);
+                }
+
+                CancelEventArgs cancelArgs = new CancelEventArgs();
+                OnButtonDropDownClick(cancelArgs);
+                if (cancelArgs.Cancel || _PopupItem.SubItems.Count == 0)
+                {
+                    if (ic != null)
+                        _PopupItem.SubItems.Remove(ic);
+                    ic.Dispose();
+                    return;
+                }
+                
+                UpdateTreeSize();
+
+                _PreviousDropDownControlParent = _DropDownControl.Parent;
+                cc.Control = _DropDownControl;
+
+                _PopupItem.SetDisplayRectangle(this.ClientRectangle);
+                if (_PopupLocation != null)
+                    _PopupItem.PopupLocation = _PopupLocation.Value;
+                else if (this.RightToLeft == RightToLeft.No)
+                {
+                    Point pl = new Point(this.Width - _PopupItem.PopupSize.Width, this.Height);
+                    ScreenInformation screen = BarFunctions.ScreenFromControl(this);
+                    Point ps = PointToScreen(pl);
+                    if (screen != null && screen.WorkingArea.X > ps.X)
+                    {
+                        pl.X = 0;
+                    }
+                    _PopupItem.PopupLocation = pl;
+                }
+                if (!IsPopupOpen && this.SelectedNode != null)
+                    this.SelectedNode.EnsureVisible();
+                    
+                _PopupItem.Expanded = !_PopupItem.Expanded;
+            }
+            finally
+            {
+                _ShowingPopup = false;
+            }
+            this.Invalidate();
+        }
+
+        /// <summary>
+        /// Closes the drop-down popup if it is open.
+        /// </summary>
+        public void CloseDropDown()
+        {
+            if (_PopupItem.Expanded) _PopupItem.Expanded = false;
+        }
+
+        private DateTime _CloseTime = DateTime.MinValue;
+        private void DropDownPopupClose(object sender, EventArgs e)
+        {
+            _CloseTime = DateTime.Now;
+            ItemContainer ic = _PopupItem.SubItems[_DropDownItemContainerName] as ItemContainer;
+            if (ic != null)
+            {
+                ControlContainerItem cc = ic.SubItems[_DropDownControlContainerName] as ControlContainerItem;
+                if (cc != null)
+                {
+                    cc.Control = null;
+                    ic.SubItems.Remove(cc);
+                    cc.Dispose();
+                    if (_DropDownControl != null)
+                    {
+                        _DropDownControl.Parent = _PreviousDropDownControlParent;
+                        _PreviousDropDownControlParent = null;
+                    }
+                }
+                _PopupItem.SubItems.Remove(ic);
+                ic.Dispose();
+            }
+            this.Invalidate();
+        }
+
+        private Point? _PopupLocation = null;
+        /// <summary>
+        /// Indicates the custom popup location for the ComboTree popup
+        /// </summary>
+        [Browsable(false),DefaultValue(null), Category("Behavior"), Description("Indicates the custom popup location for the ComboTree popup"), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public Point? PopupLocation
+        {
+            get { return _PopupLocation; }
+            set
+            {
+                if (value != _PopupLocation)
+                {
+                    Point? oldValue = _PopupLocation;
+                    _PopupLocation = value;
+                    OnPopupLocationChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when PopupLocation property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnPopupLocationChanged(Point? oldValue, Point? newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("PopupLocation"));
+            
+        }
+
+        private void ClearButtonClick(object sender, EventArgs e)
+        {
+            if (_ButtonClear.Enabled)
+            {
+                CancelEventArgs cancelArgs = new CancelEventArgs();
+                OnButtonClearClick(cancelArgs);
+                if (cancelArgs.Cancel) return;
+
+                this.SelectedNode = null;
+            }
+        }
+
+        /// <summary>
+        /// Raises the ButtonClearClick event.
+        /// </summary>
+        /// <param name="e"></param>
+        protected virtual void OnButtonClearClick(CancelEventArgs e)
+        {
+            if (ButtonClearClick != null)
+                ButtonClearClick(this, e);
+        }
+
+        /// <summary>
+        /// Raises the ButtonDropDownClick event.
+        /// </summary>
+        /// <param name="e"></param>
+        protected virtual void OnButtonDropDownClick(CancelEventArgs e)
+        {
+            if (ButtonDropDownClick != null)
+                ButtonDropDownClick(this, e);
+        }
+
+        private Control _DropDownControl = null;
+        /// <summary>
+        /// Gets or sets the reference of the control that will be displayed on popup that is shown when drop-down button is clicked.
+        /// </summary>
+        [DefaultValue(null), Description("Indicates reference of the control that will be displayed on popup that is shown when drop-down button is clicked.")]
+        internal Control DropDownControl
+        {
+            get { return _DropDownControl; }
+            set
+            {
+                _DropDownControl = value;
+            }
+        }
+
+        protected override PopupItem CreatePopupItem()
+        {
+            ButtonItem button = new ButtonItem("sysPopupProvider");
+            button.PopupFinalized += new EventHandler(DropDownPopupClose);
+            _PopupItem = button;
+            return button;
+        }
+
+        /// <summary>
+        /// Gets the collection of BaseItem derived items displayed on popup menu.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public SubItemsCollection DropDownItems
+        {
+            get { return _PopupItem.SubItems; }
+        }
+
+        protected override void RecalcSize()
+        {
+        }
+
+        public override void PerformClick()
+        {
+        }
+
+        private bool RenderButtons
+        {
+            get
+            {
+                return _ButtonCustom != null && _ButtonCustom.Visible || _ButtonCustom2 != null && _ButtonCustom2.Visible ||
+                    _ButtonDropDown != null && _ButtonDropDown.Visible || _ButtonClear != null && _ButtonClear.Visible;
+            }
+        }
+
+        protected override void OnMouseMove(MouseEventArgs e)
+        {
+            if (RenderButtons)
+            {
+                _ButtonGroup.ProcessMouseMove(e);
+            }
+            base.OnMouseMove(e);
+        }
+        protected override void OnMouseHover(EventArgs e)
+        {
+            if (RenderButtons)
+            {
+                _ButtonGroup.ProcessMouseHover(e);
+            }
+            base.OnMouseHover(e);
+        }
+        protected override void OnMouseLeave(EventArgs e)
+        {
+            if (RenderButtons)
+            {
+                _ButtonGroup.ProcessMouseLeave();
+            }
+            base.OnMouseLeave(e);
+        }
+        protected override void OnMouseDown(MouseEventArgs e)
+        {
+            this.Focus();
+            if (RenderButtons)
+            {
+                _ButtonGroup.ProcessMouseDown(e);
+            }
+
+            Rectangle r = this.ClientRectangle;
+            r.Inflate(1, 1);
+            if (this.RenderButtons && !_ButtonGroup.RenderBounds.Contains(e.X, e.Y) && r.Contains(e.X, e.Y) && !IsPopupOpen)
+            {
+                if (_CloseTime != DateTime.MinValue && DateTime.Now.Subtract(_CloseTime).TotalMilliseconds < 150)
+                {
+                    _CloseTime = DateTime.MinValue;
+                }
+                else if(e.Button == MouseButtons.Left)
+                    IsPopupOpen = true;
+            }
+
+            base.OnMouseDown(e);
+        }
+        protected override void OnMouseUp(MouseEventArgs e)
+        {
+            if (RenderButtons)
+                _ButtonGroup.ProcessMouseUp(e);
+            base.OnMouseUp(e);
+        }
+
+        ///// <summary>
+        ///// Gets the reference to internal TextBox control. Use it to get access to the text box events and properties.
+        ///// </summary>
+        //[Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        //public TextBox TextBox
+        //{
+        //    get
+        //    {
+        //        return _TextBox;
+        //    }
+        //}
+        /// <summary>
+        /// Gets the reference to internal AdvTree control that is displayed on popup Use it to get access to the AdvTree events and properties.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public AdvTree.AdvTree AdvTree
+        {
+            get
+            {
+                return _AdvTree;
+            }
+        }
+
+        ///// <summary>
+        ///// Gets or sets whether watermark text is displayed when control is empty. Default value is true.
+        ///// </summary>
+        //[DefaultValue(true), Description("Indicates whether watermark text is displayed when control is empty.")]
+        //public virtual bool WatermarkEnabled
+        //{
+        //    get { return _TextBox.WatermarkEnabled; }
+        //    set { _TextBox.WatermarkEnabled = value; this.Invalidate(true); }
+        //}
+
+        ///// <summary>
+        ///// Gets or sets the watermark (tip) text displayed inside of the control when Text is not set and control does not have input focus. This property supports text-markup.
+        ///// </summary>
+        //[Browsable(true), DefaultValue(""), Localizable(true), Category("Appearance"), Description("Indicates watermark text displayed inside of the control when Text is not set and control does not have input focus."), Editor("DevComponents.DotNetBar.Design.TextMarkupUIEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor))]
+        //public string WatermarkText
+        //{
+        //    get { return _TextBox.WatermarkText; }
+        //    set
+        //    {
+        //        if (value == null) value = "";
+        //        _TextBox.WatermarkText = value;
+        //        this.Invalidate(true);
+        //    }
+        //}
+
+        ///// <summary>
+        ///// Gets or sets the watermark font.
+        ///// </summary>
+        //[Browsable(true), Category("Appearance"), Description("Indicates watermark font."), DefaultValue(null)]
+        //public Font WatermarkFont
+        //{
+        //    get { return _TextBox.WatermarkFont; }
+        //    set { _TextBox.WatermarkFont = value; this.Invalidate(true); }
+        //}
+
+        ///// <summary>
+        ///// Gets or sets the watermark text color.
+        ///// </summary>
+        //[Browsable(true), Category("Appearance"), Description("Indicates watermark text color.")]
+        //public Color WatermarkColor
+        //{
+        //    get { return _TextBox.WatermarkColor; }
+        //    set { _TextBox.WatermarkColor = value; this.Invalidate(); }
+        //}
+        ///// <summary>
+        ///// Indicates whether property should be serialized by Windows Forms designer.
+        ///// </summary>
+        //[EditorBrowsable(EditorBrowsableState.Never)]
+        //public bool ShouldSerializeWatermarkColor()
+        //{
+        //    return _TextBox.WatermarkColor != SystemColors.GrayText;
+        //}
+        ///// <summary>
+        ///// Resets the property to default value.
+        ///// </summary>
+        //[EditorBrowsable(EditorBrowsableState.Never)]
+        //public void ResetWatermarkColor()
+        //{
+        //    this.WatermarkColor = SystemColors.GrayText;
+        //}
+
+        ///// <summary>
+        ///// Gets or sets the watermark hiding behaviour. Default value indicates that watermark is hidden when control receives input focus.
+        ///// </summary>
+        //[DefaultValue(eWatermarkBehavior.HideOnFocus), Category("Behavior"), Description("Indicates watermark hiding behaviour.")]
+        //public eWatermarkBehavior WatermarkBehavior
+        //{
+        //    get { return _TextBox.WatermarkBehavior; }
+        //    set { _TextBox.WatermarkBehavior = value; this.Invalidate(true); }
+        //}
+
+        private int _DropDownHeight = 0;
+        /// <summary>
+        /// Gets or sets the height in pixels of the drop-down portion of the ComboTreeBox control.
+        /// </summary>
+        [DefaultValue(0), Category("Behavior"), Description("Indicates height in pixels of the drop-down portion of the ComboTreeBox control.")]
+        public int DropDownHeight
+        {
+            get { return _DropDownHeight; }
+            set
+            {
+                if (value < 0)
+                    throw new ArgumentException("DropDownHeight Value must be equal or greater than zero.");
+                _DropDownHeight = value;
+                OnDropDownSizeChanged();
+            }
+        }
+        private int _DropDownWidth = 0;
+        /// <summary>
+        /// Gets or sets the width in pixels of the drop-down portion of the ComboTreeBox control.
+        /// </summary>
+        [DefaultValue(0), Category("Behavior"), Description("Indicates width in pixels of the drop-down portion of the ComboTreeBox control.")]
+        public int DropDownWidth
+        {
+            get { return _DropDownWidth; }
+            set
+            {
+                if (value < 0)
+                    throw new ArgumentException("DropDownWidth Value must be equal or greater than zero.");
+                _DropDownWidth = value;
+                OnDropDownSizeChanged();
+            }
+        }
+        private void OnDropDownSizeChanged()
+        {
+            _AdvTree.BeginUpdate();
+            if (_DropDownWidth > 0)
+                _AdvTree.Width = _DropDownWidth;
+            if (_DropDownHeight > 0)
+                _AdvTree.Height = _DropDownHeight;
+            _AdvTree.EndUpdate(false);
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the combo box is displaying its drop-down portion.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsPopupOpen
+        {
+            get 
+            {
+                return _PopupItem.Expanded; 
+            }
+            set
+            {
+                if (value != _PopupItem.Expanded)
+                {
+                    if (value)
+                        ShowDropDown();
+                    else
+                        CloseDropDown();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets the collection of tree nodes that are assigned to the popup tree view control.
+        /// </summary>
+        /// <value>
+        /// A <see cref="NodeCollection">NodeCollection</see> that represents the tree nodes
+        /// assigned to the tree control.
+        /// </value>
+        /// <remarks>
+        /// 	<para>The Nodes property holds a collection of Node objects, each of which has a
+        ///     Nodes property that can contain its own NodeCollection.</para>
+        /// </remarks>
+        [Browsable(true), DesignerSerializationVisibility(DesignerSerializationVisibility.Content), Description("Gets the collection of tree nodes that are assigned to the tree control.")]
+        public AdvTree.NodeCollection Nodes
+        {
+            get { return _AdvTree.Nodes; }
+        }
+
+        /// <summary>
+        /// Gets the collection of column headers that appear in the popup tree.
+        /// </summary>
+        /// <remarks>
+        /// 	<para>By default there are no column headers defined. In that case tree control
+        ///     functions as regular tree control where text has unrestricted width.</para>
+        /// 	<para>If you want to restrict the horizontal width of the text but not display
+        ///     column header you can create one column and set its width to the width desired and
+        ///     set its Visible property to false.</para>
+        /// </remarks>
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content), Category("Columns"), Description("Gets collection of column headers that appear in the popup tree.")]
+        public ColumnHeaderCollection Columns
+        {
+            get
+            {
+                return _AdvTree.Columns;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether column headers are visible if they are defined through Columns collection. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Columns"), Description("Indicates whether column headers are visible if they are defined through Columns collection.")]
+        public bool ColumnsVisible
+        {
+            get { return _AdvTree.ColumnsVisible; }
+            set
+            {
+                _AdvTree.ColumnsVisible = value;
+            }
+        }
+        /// <summary>
+        /// Gets or sets whether grid lines are displayed when columns are defined. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Columns"), Description("Indicates whether grid lines are displayed when columns are defined.")]
+        public bool GridColumnLines
+        {
+            get { return _AdvTree.GridColumnLines; }
+            set
+            {
+                _AdvTree.GridColumnLines = value;
+            }
+        }
+        /// <summary>
+        /// Gets or sets the grid lines color.
+        /// </summary>
+        [Category("Columns"), Description("Indicates grid lines color.")]
+        public Color GridLinesColor
+        {
+            get { return _AdvTree.GridLinesColor; }
+            set { _AdvTree.GridLinesColor = value; }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeGridLinesColor()
+        {
+            return _AdvTree.ShouldSerializeGridLinesColor();
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetGridLinesColor()
+        {
+            _AdvTree.ResetGridLinesColor();
+        }
+        /// <summary>
+        /// Gets or sets whether horizontal grid lines between each row are displayed. Default value is false.
+        /// </summary>
+        [DefaultValue(false), Category("Columns"), Description("")]
+        public bool GridRowLines
+        {
+            get { return _AdvTree.GridRowLines; }
+            set
+            {
+               _AdvTree.GridRowLines = value;
+            }
+        }
+        /// <summary>
+        /// Gets or sets whether node is highlighted when mouse enters the node. Default value is false.
+        /// </summary>
+        /// <remarks>
+        /// There are two ways to enable the node hot-tracking. You can set the HotTracking property to true in which case the
+        /// mouse tracking is enabled using system colors specified in TreeColorTable. You can also define the NodeStyleMouseOver 
+        /// style which gets applied to the node when mouse is over the node.
+        /// </remarks>
+        [DefaultValue(true), Category("Appearance"), Description("Indicates whether node is highlighted when mouse enters the node.")]
+        public bool HotTracking
+        {
+            get { return _AdvTree.HotTracking; }
+            set
+            {
+                _AdvTree.HotTracking = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the node selection box style for popup tree control.
+        /// </summary>
+        /// <seealso cref="SelectionBox">SelectionBox Property</seealso>
+        /// <seealso cref="SelectionBoxSize">SelectionBoxSize Property</seealso>
+        /// <seealso cref="SelectionBoxFillColor">SelectionBoxFillColor Property</seealso>
+        /// <seealso cref="SelectionBoxBorderColor">SelectionBoxBorderColor Property</seealso>
+        [DefaultValue(eSelectionStyle.HighlightCells), Category("Selection"), Description("Indicates node selection box style of popup tree control.")]
+        public eSelectionStyle SelectionBoxStyle
+        {
+            get { return _AdvTree.SelectionBoxStyle; }
+            set { _AdvTree.SelectionBoxStyle = value; }
+        }
+
+        /// <summary>
+		/// Gets or sets the ImageList that contains the Image objects used by the tree nodes.
+		/// </summary>
+		[Browsable(true),DefaultValue(null),Category("Images"),Description("Indicates the ImageList that contains the Image objects used by the tree nodes.")]
+		public ImageList ImageList
+		{
+			get
+			{
+				return _AdvTree.ImageList;
+			}
+			set
+			{
+				_AdvTree.ImageList=value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the image-list index value of the default image that is displayed by the tree nodes.
+		/// </summary>
+        [Browsable(true), Category("Images"), Description("Indicates the image-list index value of the default image that is displayed by the tree nodes."), Editor("DevComponents.AdvTree.Design.ImageIndexEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), TypeConverter(typeof(ImageIndexConverter)), DefaultValue(-1)]
+        public int ImageIndex
+        {
+            get { return _AdvTree.ImageIndex; }
+            set
+            {
+                _AdvTree.ImageIndex = value;
+            }
+        }
+
+        private Color _DisabledBackColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets the control background color when control is disabled. Default value is an empty color which indicates that system background color is used when control is disabled.
+        /// </summary>
+        [Description("Indicates control background color when control is disabled"), Category("Appearance")]
+        public Color DisabledBackColor
+        {
+            get { return _DisabledBackColor; }
+            set
+            {
+                if (_DisabledBackColor != value)
+                {
+                    _DisabledBackColor = value;
+                    if (!this.Enabled) this.Invalidate();
+                }
+            }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeDisabledBackColor()
+        {
+            return !_DisabledBackColor.IsEmpty;
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetDisabledBackColor()
+        {
+            DisabledBackColor = Color.Empty;
+        }
+        #endregion
+
+        #region Property Forwarding
+        ///// <summary>
+        ///// Gets or sets a custom StringCollection to use when the AutoCompleteSource property is set to CustomSource.
+        ///// <value>A StringCollection to use with AutoCompleteSource.</value>
+        ///// </summary>
+        //[Browsable(true), EditorBrowsable(EditorBrowsableState.Always), DesignerSerializationVisibility(DesignerSerializationVisibility.Content), Localizable(true), Description("Indicates custom StringCollection to use when the AutoCompleteSource property is set to CustomSource."), Editor("System.Windows.Forms.Design.ListControlStringCollectionEditor, System.Design, Version=14.1.0.37, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", typeof(UITypeEditor))]
+        //private AutoCompleteStringCollection AutoCompleteCustomSource
+        //{
+        //    get
+        //    {
+        //        return _TextBox.AutoCompleteCustomSource;
+        //    }
+        //    set
+        //    {
+        //        _TextBox.AutoCompleteCustomSource = value;
+        //    }
+        //}
+
+        ///// <summary>
+        ///// Gets or sets an option that controls how automatic completion works for the TextBox.
+        ///// <value>One of the values of AutoCompleteMode. The values are Append, None, Suggest, and SuggestAppend. The default is None.</value>
+        ///// </summary>
+        //[Description("Gets or sets an option that controls how automatic completion works for the TextBox."), Browsable(true), EditorBrowsable(EditorBrowsableState.Always), DefaultValue(0)]
+        //private AutoCompleteMode AutoCompleteMode
+        //{
+        //    get
+        //    {
+        //        return _TextBox.AutoCompleteMode;
+        //    }
+        //    set
+        //    {
+        //        _TextBox.AutoCompleteMode = value;
+        //    }
+        //}
+
+        ///// <summary>
+        ///// Gets or sets a value specifying the source of complete strings used for automatic completion.
+        ///// <value>One of the values of AutoCompleteSource. The options are AllSystemSources, AllUrl, FileSystem, HistoryList, RecentlyUsedList, CustomSource, and None. The default is None.</value>
+        ///// </summary>
+        //[DefaultValue(0x80), TypeConverter(typeof(TextBoxAutoCompleteSourceConverter)), Browsable(true), EditorBrowsable(EditorBrowsableState.Always), Description("Gets or sets a value specifying the source of complete strings used for automatic completion.")]
+        //private AutoCompleteSource AutoCompleteSource
+        //{
+        //    get
+        //    {
+        //        return _TextBox.AutoCompleteSource;
+        //    }
+        //    set
+        //    {
+        //        _TextBox.AutoCompleteSource = value;
+        //    }
+        //}
+        #endregion
+
+        #region ICommandSource Members
+        protected virtual void ExecuteCommand()
+        {
+            if (_Command == null) return;
+            CommandManager.ExecuteCommand(this);
+        }
+
+        /// <summary>
+        /// Gets or sets the command assigned to the item. Default value is null.
+        /// <remarks>Note that if this property is set to null Enabled property will be set to false automatically to disable the item.</remarks>
+        /// </summary>
+        [DefaultValue(null), Category("Commands"), Description("Indicates the command assigned to the item.")]
+        public Command Command
+        {
+            get { return (Command)((ICommandSource)this).Command; }
+            set
+            {
+                ((ICommandSource)this).Command = value;
+            }
+        }
+
+        private ICommand _Command = null;
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        ICommand ICommandSource.Command
+        {
+            get
+            {
+                return _Command;
+            }
+            set
+            {
+                bool changed = false;
+                if (_Command != value)
+                    changed = true;
+
+                if (_Command != null)
+                    CommandManager.UnRegisterCommandSource(this, _Command);
+                _Command = value;
+                if (value != null)
+                    CommandManager.RegisterCommand(this, value);
+                if (changed)
+                    OnCommandChanged();
+            }
+        }
+
+        /// <summary>
+        /// Called when Command property value changes.
+        /// </summary>
+        protected virtual void OnCommandChanged()
+        {
+        }
+
+        private object _CommandParameter = null;
+        /// <summary>
+        /// Gets or sets user defined data value that can be passed to the command when it is executed.
+        /// </summary>
+        [Browsable(true), DefaultValue(null), Category("Commands"), Description("Indicates user defined data value that can be passed to the command when it is executed."), System.ComponentModel.TypeConverter(typeof(System.ComponentModel.StringConverter)), System.ComponentModel.Localizable(true)]
+        public object CommandParameter
+        {
+            get
+            {
+                return _CommandParameter;
+            }
+            set
+            {
+                _CommandParameter = value;
+            }
+        }
+
+        #endregion
+
+        #region Licensing
+#if !TRIAL
+        private string _LicenseKey = "";
+        [Browsable(false), DefaultValue("")]
+        public string LicenseKey
+        {
+            get { return _LicenseKey; }
+            set
+            {
+                if (NativeFunctions.ValidateLicenseKey(value))
+                    return;
+                _LicenseKey = (!NativeFunctions.CheckLicenseKey(value) ? "9dsjkhds7" : value);
+            }
+        }
+#endif
+        #endregion
+    }
+    /// <summary>
+    /// Represents the method that will handle converting for ComboTree control.
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    public delegate void TreeConvertEventHandler(object sender, TreeConvertEventArgs e);
+
+    public class TreeConvertEventArgs : ConvertEventArgs
+    {
+        // Fields
+        private object _ListItem;
+
+        // Methods
+        public TreeConvertEventArgs(object value, Type desiredType, object listItem, string fieldName)
+            : base(value, desiredType)
+        {
+            _ListItem = listItem;
+            _FieldName = fieldName;
+        }
+
+        /// <summary>
+        /// Gets the reference to the item being converted.
+        /// </summary>
+        public object ListItem
+        {
+            get
+            {
+                return _ListItem;
+            }
+        }
+
+        private string _FieldName = "";
+        /// <summary>
+        /// Get the reference to the name of the field or property on the item that needs conversion.
+        /// </summary>
+        public string FieldName
+        {
+            get { return _FieldName; }
+        }
+    }
+    /// <summary>
+    /// Defines delegate for data node based events.
+    /// </summary>
+    public delegate void DataNodeEventHandler(object sender, DataNodeEventArgs e);
+    /// <summary>
+    /// Defines event arguments for data node based events.
+    /// </summary>
+    public class DataNodeEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets or sets the node that is created for data item.
+        /// </summary>
+        public Node Node = null;
+        /// <summary>
+        /// Gets the data-item node is being created for.
+        /// </summary>
+        public readonly object DataItem = null;
+
+        /// <summary>
+        /// Initializes a new instance of the DataNodeEventArgs class.
+        /// </summary>
+        /// <param name="node"></param>
+        /// <param name="dataItem"></param>
+        public DataNodeEventArgs(Node node, object dataItem)
+        {
+            Node = node;
+            DataItem = dataItem;
+        }
+    }
+    /// <summary>
+    /// Defines delegate for data column based events.
+    /// </summary>
+    public delegate void DataColumnEventHandler(object sender, DataColumnEventArgs e);
+    /// <summary>
+    /// Defines event arguments for data column based events.
+    /// </summary>
+    public class DataColumnEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets or sets the column header that is created for data.
+        /// </summary>
+        public DevComponents.AdvTree.ColumnHeader ColumnHeader = null;
+
+        /// <summary>
+        /// Initializes a new instance of the DataColumnEventArgs class.
+        /// </summary>
+        /// <param name="header"></param>
+        public DataColumnEventArgs(DevComponents.AdvTree.ColumnHeader header)
+        {
+            ColumnHeader = header;
+        }
+    }
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/Controls/ComboTree.ico b/PROMS/DotNetBar Source Code/Controls/ComboTree.ico
new file mode 100644
index 00000000..9bed9b81
Binary files /dev/null and b/PROMS/DotNetBar Source Code/Controls/ComboTree.ico differ
diff --git a/PROMS/DotNetBar Source Code/Controls/ControlWithBackgroundStyle.cs b/PROMS/DotNetBar Source Code/Controls/ControlWithBackgroundStyle.cs
new file mode 100644
index 00000000..04ffa602
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/ControlWithBackgroundStyle.cs	
@@ -0,0 +1,156 @@
+using System;
+using System.Text;
+using System.Windows.Forms;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    [ToolboxItem(false)]
+    public class ControlWithBackgroundStyle : Control
+    {
+        #region Private Variables
+        private ElementStyle _BackgroundStyle = null;
+        private bool _AntiAlias = true;
+        #endregion
+
+        #region Events
+        #endregion
+
+        #region Constructor
+        /// <summary>
+        /// Initializes a new instance of the ControlWithBackgroundStyle class.
+        /// </summary>
+        public ControlWithBackgroundStyle()
+        {
+            this.SetStyle(ControlStyles.UserPaint, true);
+            this.SetStyle(ControlStyles.AllPaintingInWmPaint, true);
+            this.SetStyle(ControlStyles.Opaque, true);
+            this.SetStyle(ControlStyles.ResizeRedraw, true);
+            this.SetStyle(ControlStyles.StandardDoubleClick, true);
+            this.SetStyle(DisplayHelp.DoubleBufferFlag, true);
+            this.SetStyle(ControlStyles.SupportsTransparentBackColor, true);
+
+            _BackgroundStyle = new ElementStyle();
+            _BackgroundStyle.StyleChanged += new EventHandler(this.VisualPropertyChanged);
+        }
+        #endregion
+
+        #region Internal Implementation
+        /// <summary>
+        /// Gets or sets whether anti-alias smoothing is used while painting. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance"), Description("Gets or sets whether anti-aliasing is used while painting.")]
+        public virtual bool AntiAlias
+        {
+            get { return _AntiAlias; }
+            set
+            {
+                if (_AntiAlias != value)
+                {
+                    _AntiAlias = value;
+                    this.Invalidate();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Specifies the background style of the control.
+        /// </summary>
+        [Category("Style"), Description("Indicates control background style."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ElementStyle BackgroundStyle
+        {
+            get { return _BackgroundStyle; }
+        }
+
+        /// <summary>
+        /// Resets style to default value. Used by windows forms designer.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetBackgroundStyle()
+        {
+            _BackgroundStyle.StyleChanged -= new EventHandler(this.VisualPropertyChanged);
+            _BackgroundStyle = new ElementStyle();
+            _BackgroundStyle.StyleChanged += new EventHandler(this.VisualPropertyChanged);
+            this.Invalidate();
+        }
+
+        private void VisualPropertyChanged(object sender, EventArgs e)
+        {
+            OnVisualPropertyChanged();
+        }
+
+        protected virtual void OnVisualPropertyChanged()
+        {
+            this.Invalidate();
+        }
+
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            if (this.BackColor.IsEmpty || this.BackColor == Color.Transparent)
+            {
+                base.OnPaintBackground(e);
+            }
+
+            PaintBackground(e);
+            PaintContent(e);
+
+            base.OnPaint(e);
+        }
+
+        protected virtual void PaintContent(PaintEventArgs e)
+        {
+            
+        }
+
+        protected virtual Rectangle GetContentRectangle()
+        {
+            bool disposeStyle = false;
+            ElementStyle style = this.GetBackgroundStyle(out disposeStyle);
+            Rectangle r = ElementStyleLayout.GetInnerRect(style, this.ClientRectangle);
+            if (disposeStyle) style.Dispose();
+            //Rectangle r=this.ClientRectangle;
+            //r.X += ElementStyleLayout.LeftWhiteSpace(style);
+            //r.Y += ElementStyleLayout.TopWhiteSpace(style);
+            //r.Width -= ElementStyleLayout.HorizontalStyleWhiteSpace(style);
+            //r.Height -= ElementStyleLayout.VerticalStyleWhiteSpace(style);
+
+            return r;
+        }
+
+        protected virtual ElementStyle GetBackgroundStyle(out bool disposeStyle)
+        {
+            disposeStyle = false;
+            return ElementStyleDisplay.GetElementStyle(_BackgroundStyle, out disposeStyle);
+        }
+
+        protected virtual void PaintBackground(PaintEventArgs e)
+        {
+            Graphics g = e.Graphics;
+            Rectangle r = this.ClientRectangle;
+            bool disposeStyle = false;
+            ElementStyle style = this.GetBackgroundStyle(out disposeStyle);
+
+            if (!this.BackColor.IsEmpty)
+            {
+                DisplayHelp.FillRectangle(g, r, this.BackColor);
+            }
+
+            if (style.Custom)
+            {
+                SmoothingMode sm = g.SmoothingMode;
+                if (this.AntiAlias)
+                    g.SmoothingMode = SmoothingMode.HighQuality;
+                ElementStyleDisplayInfo displayInfo = new ElementStyleDisplayInfo(style, e.Graphics, r);
+                ElementStyleDisplay.Paint(displayInfo);
+                if (this.AntiAlias)
+                    g.SmoothingMode = sm;
+            }
+
+            if (disposeStyle) style.Dispose();
+        }
+        #endregion
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/CursorHelper.cs b/PROMS/DotNetBar Source Code/Controls/CursorHelper.cs
new file mode 100644
index 00000000..e87c752b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/CursorHelper.cs	
@@ -0,0 +1,76 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    internal struct IconInfo
+    {
+        public bool fIcon;
+        public int xHotspot;
+        public int yHotspot;
+        public IntPtr hbmMask;
+        public IntPtr hbmColor;
+    }
+    internal class CursorHelper
+    {
+        [DllImport("user32.dll")]
+        public static extern IntPtr CreateIconIndirect(ref IconInfo icon);
+        [DllImport("user32.dll")]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        public static extern bool GetIconInfo(IntPtr hIcon, ref IconInfo pIconInfo);
+        [DllImport("gdi32.dll")]
+        public static extern bool DeleteObject(IntPtr handle);
+        [DllImport("user32.dll", CharSet = CharSet.Auto)]
+        extern static bool DestroyIcon(IntPtr handle);
+        public static Cursor CreateCursor(Bitmap bm, int xHotspot, int yHotspot, bool resize = true)
+        {
+            IntPtr ptr = (resize) ? ((Bitmap)ResizeBitmap(bm, 32, 32)).GetHicon() : bm.GetHicon();
+            IconInfo inf = new IconInfo();
+            GetIconInfo(ptr, ref inf);
+            inf.xHotspot = xHotspot;
+            inf.yHotspot = yHotspot;
+            inf.fIcon = false;
+            IntPtr cursorPtr = CreateIconIndirect(ref inf);
+            if (inf.hbmColor != IntPtr.Zero) { DeleteObject(inf.hbmColor); }
+            if (inf.hbmMask != IntPtr.Zero) { DeleteObject(inf.hbmMask); }
+            if (ptr != IntPtr.Zero) { DestroyIcon(ptr); }
+            Cursor c = new Cursor(cursorPtr);
+            c.Tag = (resize) ? new Size(32, 32) : bm.Size;
+            return c;
+        }
+        public static Bitmap ResizeBitmap(Image image, int maxWidth, int maxHeight)
+        {
+            double ratio = System.Math.Min((double)maxHeight / image.Height, (double)maxWidth / image.Width);
+            var propWidth = (int)(image.Width * ratio);
+            var propHeight = (int)(image.Height * ratio);
+            var newImage = new Bitmap(propWidth, propHeight);
+            using (var g = Graphics.FromImage(newImage))
+            {
+                g.DrawImage(image, 0, 0, propWidth, propHeight);
+            }
+            return newImage;
+        }
+        public static Bitmap GetControlBitmap(Control c, Color transparent)
+        {
+            var bm = new Bitmap(c.Width, c.Height);
+            c.DrawToBitmap(bm, new Rectangle(0, 0, c.Width, c.Height));
+            if (!transparent.IsEmpty)
+            {
+                bm.MakeTransparent(transparent);
+            }
+            return bm;
+        }
+        public static Bitmap OverlayBitmap(Bitmap baseBitmap, Bitmap overlay, Point atPosition)
+        {
+            using (var g = Graphics.FromImage(baseBitmap))
+            {
+                g.DrawImage(overlay, new Rectangle(atPosition, overlay.Size));
+            }
+            return baseBitmap;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/DGHScrollBar.cs b/PROMS/DotNetBar Source Code/Controls/DGHScrollBar.cs
new file mode 100644
index 00000000..4200b4e4
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/DGHScrollBar.cs	
@@ -0,0 +1,196 @@
+#if FRAMEWORK20
+using System;
+using System.Text;
+using System.Windows.Forms;
+using System.Drawing;
+using DevComponents.DotNetBar.ScrollBar;
+using System.ComponentModel;
+using DevComponents.DotNetBar.Rendering;
+using System.Runtime.InteropServices;
+using System.Reflection;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    internal class DGHScrollBar : HScrollBar, ScrollBarReplacement.IScrollBarExtender
+    {
+        #region Private Variables
+        private ScrollBarReplacement m_ScrollBarImpl = null;
+        private bool m_EnableStyling = true;
+        #endregion
+
+        #region Constructor
+        public DGHScrollBar()
+        {
+            m_ScrollBarImpl = new ScrollBarReplacement(this);
+
+            this.SetStyle(ControlStyles.UserPaint, true);
+            this.SetStyle(ControlStyles.AllPaintingInWmPaint, true);
+            this.SetStyle(ControlStyles.Opaque, true);
+            this.SetStyle(ControlStyles.ResizeRedraw, true);
+            this.SetStyle(DisplayHelp.DoubleBufferFlag, true);
+            this.SetStyle(ControlStyles.SupportsTransparentBackColor, false);
+        }
+        #endregion
+
+        #region Internal Implementation
+        protected override CreateParams CreateParams
+        {
+            get
+            {
+                CreateParams p = base.CreateParams;
+                if (m_EnableStyling)
+                {
+                    p.ClassName = null;
+                    p.Style = 0x2000000;
+                    p.Style |= 0x44000000;
+                    if (this.Visible)
+                        p.Style |= 0x10000000;
+                    if (!this.Enabled)
+                        p.Style |= 0x8000000;
+                    if (this.RightToLeft == RightToLeft.Yes)
+                    {
+                        p.ExStyle |= 0x2000;
+                        p.ExStyle |= 0x1000;
+                        p.ExStyle |= 0x4000;
+                    }
+                }
+                return p;
+            }
+        }
+        protected override void Dispose(bool disposing)
+        {
+            m_ScrollBarImpl.Dispose();
+            base.Dispose(disposing);
+        }
+
+        /// <summary>
+        /// Gets or sets whether custom styling (Office 2007 style) is enabled. Default value is true.
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Appearance"), Description("Indicates whether custom styling (Office 2007 style) is enabled.")]
+        public bool EnableStyling
+        {
+            get { return m_EnableStyling; }
+            set
+            {
+                if (m_EnableStyling != value)
+                {
+                    m_EnableStyling = value;
+                    if (this.IsHandleCreated)
+                        this.RecreateHandle();
+                }
+            }
+        }
+
+        ///// <summary>
+        ///// Gets or sets whether scroll bar appears as application style scroll bar which usually uses darker colors. Default value is true.
+        ///// </summary>
+        //[Browsable(true), DefaultValue(true), Category("Appearance"), Description("Indicates whether scroll bar appears as application style scroll bar which usually uses darker colors.")]
+        //public bool IsAppScrollBarStyle
+        //{
+        //    get { return m_ScrollBarImpl.IsAppScrollBarStyle; }
+        //    set { m_ScrollBarImpl.IsAppScrollBarStyle = value; }
+        //}
+
+        protected override void OnHandleCreated(EventArgs e)
+        {
+            m_ScrollBarImpl.OnHandleCreated();
+            base.OnHandleCreated(e);
+        }
+
+        protected override void OnMouseDown(MouseEventArgs e)
+        {
+            if (m_EnableStyling)
+                m_ScrollBarImpl.OnMouseDown(e);
+            base.OnMouseDown(e);
+        }
+
+        protected override void OnMouseUp(MouseEventArgs e)
+        {
+            if (m_EnableStyling)
+                m_ScrollBarImpl.OnMouseUp(e);
+            base.OnMouseUp(e);
+        }
+
+        protected override void OnMouseEnter(EventArgs e)
+        {
+            if (m_EnableStyling)
+                m_ScrollBarImpl.OnMouseEnter(e);
+            base.OnMouseEnter(e);
+        }
+
+        protected override void OnMouseLeave(EventArgs e)
+        {
+            if (m_EnableStyling)
+                m_ScrollBarImpl.OnMouseLeave(e);
+            base.OnMouseLeave(e);
+        }
+
+        protected override void OnMouseMove(MouseEventArgs e)
+        {
+            if (m_EnableStyling)
+                m_ScrollBarImpl.OnMouseMove(e);
+            base.OnMouseMove(e);
+        }
+
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            if(m_EnableStyling)
+                m_ScrollBarImpl.OnPaint(e);
+            base.OnPaint(e);
+        }
+
+        protected override void NotifyInvalidate(Rectangle invalidatedArea)
+        {
+            if (m_EnableStyling)
+                m_ScrollBarImpl.NotifyInvalidate(invalidatedArea);
+            base.NotifyInvalidate(invalidatedArea);
+        }
+
+        public void UpdateScrollValues()
+        {
+            m_ScrollBarImpl.UpdateScrollValues();
+        }
+
+        protected override void OnParentChanged(EventArgs e)
+        {
+            if (this.Parent is DataGridView)
+            {
+                m_ScrollBarImpl.ScrollBarCore.SideBorderOnly = true;
+                m_ScrollBarImpl.ScrollBarCore.HasBorder = false;
+            }
+            else
+            {
+                m_ScrollBarImpl.ScrollBarCore.SideBorderOnly = false;
+                m_ScrollBarImpl.ScrollBarCore.HasBorder = true;
+            }
+            base.OnParentChanged(e);
+        }
+
+        protected override void OnResize(EventArgs e)
+        {
+            base.OnResize(e);
+            UpdateScrollValues();
+        }
+
+        public bool AppStyleScrollBar
+        {
+            get { return m_ScrollBarImpl.AppStyleScrollBar; }
+            set { m_ScrollBarImpl.AppStyleScrollBar = value; }
+        }
+        #endregion
+
+        #region IScrollBarExtender Members
+        void ScrollBarReplacement.IScrollBarExtender.SetValue(int newValue, ScrollEventType type)
+        {
+            if (newValue != this.Value)
+            {
+                int v = this.Value;
+                this.Value = newValue;
+                ScrollEventArgs se = new ScrollEventArgs(type, v, newValue, ScrollOrientation.HorizontalScroll);
+                OnScroll(se);
+            }
+        }
+        #endregion
+    }
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/Controls/DGVScrollBar.cs b/PROMS/DotNetBar Source Code/Controls/DGVScrollBar.cs
new file mode 100644
index 00000000..f18bff33
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/DGVScrollBar.cs	
@@ -0,0 +1,206 @@
+#if FRAMEWORK20
+using System;
+using System.Text;
+using System.Windows.Forms;
+using System.ComponentModel;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    /// <summary>
+    /// Represents the Vertical Office 2007 Style Scroll Bar control.
+    /// </summary>
+    internal class DGVScrollBar : VScrollBar, ScrollBarReplacement.IScrollBarExtender
+    {
+        #region Private Variables
+        private ScrollBarReplacement m_ScrollBarImpl = null;
+        private bool m_EnableStyling = true;
+        #endregion
+
+        #region Constructor
+        public DGVScrollBar()
+        {
+            m_ScrollBarImpl = new ScrollBarReplacement(this);
+
+            this.SetStyle(ControlStyles.UserPaint, true);
+            this.SetStyle(ControlStyles.AllPaintingInWmPaint, true);
+            this.SetStyle(ControlStyles.Opaque, true);
+            this.SetStyle(ControlStyles.ResizeRedraw, true);
+            this.SetStyle(DisplayHelp.DoubleBufferFlag, true);
+            this.SetStyle(ControlStyles.SupportsTransparentBackColor, false);
+        }
+        #endregion
+
+        #region Internal Implementation
+        protected override CreateParams CreateParams
+        {
+            get
+            {
+                CreateParams p = base.CreateParams;
+                if (m_EnableStyling)
+                {
+                    p.ClassName = null;
+                    p.Style = 0x2000000;
+                    p.Style |= 0x44000000;
+                    if (this.Visible)
+                        p.Style |= 0x10000000;
+                    if (!this.Enabled)
+                        p.Style |= 0x8000000;
+                    if (this.RightToLeft == RightToLeft.Yes)
+                    {
+                        p.ExStyle |= 0x2000;
+                        p.ExStyle |= 0x1000;
+                        p.ExStyle |= 0x4000;
+                    }
+                }
+                return p;
+            }
+        }
+        protected override void Dispose(bool disposing)
+        {
+            m_ScrollBarImpl.Dispose();
+            base.Dispose(disposing);
+        }
+
+        /// <summary>
+        /// Gets or sets whether custom styling (Office 2007 style) is enabled. Default value is true.
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Appearance"), Description("Indicates whether custom styling (Office 2007 style) is enabled.")]
+        public bool EnableStyling
+        {
+            get { return m_EnableStyling; }
+            set
+            {
+                if (m_EnableStyling != value)
+                {
+                    m_EnableStyling = value;
+                    if (this.IsHandleCreated)
+                        this.RecreateHandle();
+                }
+            }
+        }
+
+        ///// <summary>
+        ///// Gets or sets whether scroll bar appears as application style scroll bar which usually uses darker colors. Default value is true.
+        ///// </summary>
+        //[Browsable(true), DefaultValue(true), Category("Appearance"), Description("Indicates whether scroll bar appears as application style scroll bar which usually uses darker colors.")]
+        //public bool IsAppScrollBarStyle
+        //{
+        //    get { return m_ScrollBarImpl.IsAppScrollBarStyle; }
+        //    set { m_ScrollBarImpl.IsAppScrollBarStyle = value; }
+        //}
+
+        protected override void OnHandleCreated(EventArgs e)
+        {
+            m_ScrollBarImpl.OnHandleCreated();
+            base.OnHandleCreated(e);
+        }
+
+        protected override void OnMouseDown(MouseEventArgs e)
+        {
+            if (m_EnableStyling)
+                m_ScrollBarImpl.OnMouseDown(e);
+            base.OnMouseDown(e);
+        }
+
+        protected override void OnMouseUp(MouseEventArgs e)
+        {
+            if (m_EnableStyling)
+                m_ScrollBarImpl.OnMouseUp(e);
+            base.OnMouseUp(e);
+        }
+
+        protected override void OnMouseEnter(EventArgs e)
+        {
+            if (m_EnableStyling)
+                m_ScrollBarImpl.OnMouseEnter(e);
+            base.OnMouseEnter(e);
+        }
+
+        protected override void OnMouseLeave(EventArgs e)
+        {
+            if (m_EnableStyling)
+                m_ScrollBarImpl.OnMouseLeave(e);
+            base.OnMouseLeave(e);
+        }
+
+        protected override void OnMouseMove(MouseEventArgs e)
+        {
+            if (m_EnableStyling)
+            {
+                m_ScrollBarImpl.UpdateScrollValues();
+                m_ScrollBarImpl.OnMouseMove(e);
+            }
+            base.OnMouseMove(e);
+        }
+
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            if(m_EnableStyling)
+                m_ScrollBarImpl.OnPaint(e);
+            base.OnPaint(e);
+        }
+
+        protected override void NotifyInvalidate(Rectangle invalidatedArea)
+        {
+            if (m_EnableStyling)
+                m_ScrollBarImpl.NotifyInvalidate(invalidatedArea);
+            base.NotifyInvalidate(invalidatedArea);
+        }
+
+        protected override void OnResize(EventArgs e)
+        {
+            UpdateScrollValues();
+            base.OnResize(e);
+        }
+
+        public void UpdateScrollValues()
+        {
+            m_ScrollBarImpl.UpdateScrollValues();
+        }
+
+        protected override void OnParentChanged(EventArgs e)
+        {
+            if (this.Parent is DataGridView)
+            {
+                m_ScrollBarImpl.ScrollBarCore.SideBorderOnly = true;
+                m_ScrollBarImpl.ScrollBarCore.HasBorder = false;
+            }
+            else
+            {
+                m_ScrollBarImpl.ScrollBarCore.SideBorderOnly = false;
+                m_ScrollBarImpl.ScrollBarCore.HasBorder = true;
+            }
+            base.OnParentChanged(e);
+        }
+
+        public bool AppStyleScrollBar
+        {
+            get { return m_ScrollBarImpl.AppStyleScrollBar; }
+            set { m_ScrollBarImpl.AppStyleScrollBar = value; }
+        }
+        #endregion
+
+        #region IScrollBarExtender Members
+        void ScrollBarReplacement.IScrollBarExtender.SetValue(int newValue, ScrollEventType type)
+        {
+            //if (newValue != this.Value)
+            {
+                // Fix for scrolling to the last row
+                if (type== ScrollEventType.SmallIncrement && 
+                    (this.Maximum - this.LargeChange) - newValue < 21)
+                {
+                    newValue = this.Maximum - this.LargeChange + 1;
+                    type = ScrollEventType.Last;
+                }
+
+                int v = this.Value;
+                this.Value = newValue;
+                ScrollEventArgs se = new ScrollEventArgs(type, v, newValue, ScrollOrientation.VerticalScroll);
+                OnScroll(se);
+            }
+        }
+        #endregion
+    }
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/Controls/DataGridViewX.bmp b/PROMS/DotNetBar Source Code/Controls/DataGridViewX.bmp
new file mode 100644
index 00000000..d474c2e2
Binary files /dev/null and b/PROMS/DotNetBar Source Code/Controls/DataGridViewX.bmp differ
diff --git a/PROMS/DotNetBar Source Code/Controls/DataGridViewX.cs b/PROMS/DotNetBar Source Code/Controls/DataGridViewX.cs
new file mode 100644
index 00000000..bd24e17b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/DataGridViewX.cs	
@@ -0,0 +1,812 @@
+#if FRAMEWORK20
+using System;
+using System.Windows.Forms;
+using System.Drawing;
+using DevComponents.DotNetBar.Rendering;
+using System.Drawing.Drawing2D;
+using System.Reflection;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    /// <summary>
+    /// Represents the DataGridView control with enhanced Office 2007 style.
+    /// </summary>
+    [ToolboxBitmap(typeof(DataGridViewX), "Controls.DataGridViewX.bmp")]
+    public class DataGridViewX : DataGridView
+    {
+        #region Private Variables
+        private int m_MouseOverColumnHeader = -2;
+        private int m_MouseDownColumnHeader = -2;
+        private int m_MouseDownRowIndex = -2;
+        private int m_MouseOverRowIndex = -2;
+        private bool m_Office2007StyleEnabled = true;
+        private Office2007DataGridViewColorTable m_ColorTable = null;
+        private Office2007ButtonItemStateColorTable m_ButtonStateColorTable = null;
+        private SelectionInfo[] m_ColumnSelectionState = new SelectionInfo[1];
+        //private int m_CurrentCellRowIndex = -1;
+        private int m_SelectedRowIndex = -2;
+        private bool m_HighlightSelectedColumnHeaders = true;
+        private bool m_SelectAllSignVisible = true;
+        private bool m_PaintEnhancedSelection = true;
+        #endregion
+
+        #region Constructor
+        public DataGridViewX()
+            : base()
+        {
+            SetupScrollBars();
+            SetStyle(ControlStyles.OptimizedDoubleBuffer | 
+                ControlStyles.AllPaintingInWmPaint |
+                ControlStyles.ResizeRedraw, true);
+            this.DoubleBuffered = true;
+            StyleManager.Register(this);
+        }
+        #endregion
+
+        #region internal properties
+
+        internal Office2007ButtonItemStateColorTable ButtonStateColorTable
+        {
+            get { return (m_ButtonStateColorTable); }
+        }
+
+        #endregion
+
+        #region Internal Implementation
+        /// <summary>
+        /// Called by StyleManager to notify control that style on manager has changed and that control should refresh its appearance if
+        /// its style is controlled by StyleManager.
+        /// </summary>
+        /// <param name="newStyle">New active style.</param>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void StyleManagerStyleChanged(eDotNetBarStyle newStyle)
+        {
+            DGVScrollBar vsb = GetVScrollBar();
+            if (vsb != null && vsb.Visible) vsb.Invalidate();
+
+            DGHScrollBar hsb = GetHScrollBar();
+            if (hsb != null && hsb.Visible) hsb.Invalidate();
+
+            // Update Style
+            Office2007ColorTable ct = null;
+            if (GlobalManager.Renderer is Office2007Renderer)
+            {
+                ct = ((Office2007Renderer)GlobalManager.Renderer).ColorTable;
+                m_ColorTable = ct.DataGridView;
+                m_ButtonStateColorTable = ct.ButtonItemColors[0].Checked;
+            }
+            try // Don't like to do this but bug in GridColor setter requires it
+            {
+                if (!_UseCustomBackgroundColor)
+                    this.BackgroundColor = m_ColorTable.BackgroundColor;
+                this.ColumnHeadersDefaultCellStyle.ForeColor = m_ColorTable.ColumnHeaderNormalText;
+                this.ColumnHeadersDefaultCellStyle.SelectionForeColor = m_ColorTable.ColumnHeaderSelectedText;
+                this.DefaultCellStyle.BackColor = m_ColorTable.DefaultCellBackground;
+                this.DefaultCellStyle.ForeColor = m_ColorTable.DefaultCellText;
+                if (this.PaintEnhancedSelection)
+                    this.DefaultCellStyle.SelectionForeColor = m_ButtonStateColorTable.Text;
+                this.GridColor = m_ColorTable.GridColor;
+                this.RowHeadersDefaultCellStyle.ForeColor = m_ColorTable.ColumnHeaderNormalText;
+                this.RowHeadersDefaultCellStyle.SelectionForeColor = m_ColorTable.ColumnHeaderSelectedText;
+                this.EnableHeadersVisualStyles = false;
+            }
+            catch { }
+        }
+
+        protected override void OnCellPainting(DataGridViewCellPaintingEventArgs e)
+        {
+            bool enabled = this.Enabled;
+            Office2007DataGridViewColorTable ct = GetColorTable();
+            if (!m_Office2007StyleEnabled || ct == null ||
+                e.Handled || e.ColumnIndex >= 0 && e.RowIndex >= 0 &&
+                (!m_PaintEnhancedSelection || (e.State & DataGridViewElementStates.Selected) != DataGridViewElementStates.Selected))
+            {
+                base.OnCellPainting(e);
+                return;
+            }
+
+            Rectangle r = e.CellBounds;
+            Graphics g = e.Graphics;
+            LinearGradientColorTable bt = null;
+            Color borderColor = Color.Empty;
+            DataGridViewColumn column = null;
+            int displayIndex = -1;
+            if (e.ColumnIndex >= 0)
+            {
+                column = this.Columns[e.ColumnIndex];
+                displayIndex = column.DisplayIndex;
+            }
+            
+            if (e.ColumnIndex == -1 && e.RowIndex == -1)
+            {
+                // Paint top-left corner
+                if (m_MouseOverColumnHeader == -1)
+                {
+                    bt = ct.SelectorMouseOverBackground;
+                    borderColor = ct.SelectorMouseOverBorder;
+                }
+                else
+                {
+                    bt = ct.SelectorBackground;
+                    borderColor = ct.SelectorBorder;
+                }
+                DisplayHelp.FillRectangle(g, r, bt);
+                DisplayHelp.DrawRectangle(g, borderColor, r);
+                if (m_MouseOverColumnHeader == -1)
+                    borderColor = ct.SelectorMouseOverBorderLight;
+                else
+                    borderColor = ct.SelectorBorderLight;
+                Rectangle inner = r;
+                inner.Inflate(-1, -1);
+                using (Pen p = new Pen(borderColor))
+                {
+                    g.DrawLine(p, inner.X, inner.Bottom - 1, inner.X, inner.Y);
+                    g.DrawLine(p, inner.X, inner.Y, inner.Right - 1, inner.Y);
+                }
+                if (m_MouseOverColumnHeader == -1)
+                    borderColor = ct.SelectorMouseOverBorderDark;
+                else
+                    borderColor = ct.SelectorBorderDark;
+                using (Pen p = new Pen(borderColor))
+                {
+                    g.DrawLine(p, inner.Right - 1, inner.Y, inner.Right - 1, inner.Bottom - 1);
+                    g.DrawLine(p, inner.X, inner.Bottom - 1, inner.Right - 1, inner.Bottom - 1);
+                }
+
+                if (m_SelectAllSignVisible)
+                {
+                    GraphicsPath path = GetSelectorPath(inner);
+                    if (path != null)
+                    {
+                        DisplayHelp.FillPath(g, path, (m_MouseOverColumnHeader == -1 ? ct.SelectorMouseOverSign : ct.SelectorSign));
+                        path.Dispose();
+                    }
+                }
+            }
+            else if (e.ColumnIndex == -1)
+            {
+                // Paint Rows
+                bt = ct.RowNormalBackground;
+                borderColor = ct.RowNormalBorder;
+
+                if (m_MouseDownRowIndex == e.RowIndex)
+                {
+                    bt = ct.RowPressedBackground;
+                    borderColor = ct.RowPressedBorder;
+                }
+                else if (m_SelectedRowIndex == e.RowIndex && enabled)
+                {
+                    if (m_MouseOverRowIndex == e.RowIndex)
+                    {
+                        bt = ct.RowSelectedMouseOverBackground;
+                        borderColor = ct.RowSelectedMouseOverBorder;
+                    }
+                    else
+                    {
+                        bt = ct.RowSelectedBackground;
+                        borderColor = ct.RowSelectedBorder;
+                    }
+                }
+                else if (this.Rows[e.RowIndex].Selected && enabled)
+                {
+                    if (m_MouseOverRowIndex == e.RowIndex)
+                    {
+                        bt = ct.RowPressedBackground;
+                        borderColor = ct.RowPressedBorder;
+                    }
+                    else
+                    {
+                        bt = ct.RowPressedBackground;
+                        borderColor = ct.RowPressedBorder;
+                    }
+                }
+                else if (m_MouseOverRowIndex == e.RowIndex)
+                {
+                    bt = ct.RowMouseOverBackground;
+                    borderColor = ct.RowMouseOverBorder;
+                }
+
+                DisplayHelp.FillRectangle(g, r, bt);
+                // Paint border
+                using (Pen p = new Pen(borderColor))
+                {
+                    g.DrawLine(p, r.Right - 1, r.Y, r.Right - 1, r.Bottom - 1);
+
+                    if (m_SelectedRowIndex == e.RowIndex + 1 && enabled)
+                    {
+                        Color bc = ct.RowSelectedBorder;
+                        if (m_MouseDownRowIndex == e.RowIndex  + 1)
+                            bc = ct.RowPressedBorder;
+                        else if (m_MouseOverRowIndex == e.RowIndex + 1)
+                            bc = ct.RowSelectedMouseOverBorder;
+                        using (Pen p2 = new Pen(bc))
+                            g.DrawLine(p2, r.X, r.Bottom - 1, r.Right - 1, r.Bottom - 1);
+                    }
+                    else
+                        g.DrawLine(p, r.X, r.Bottom - 1, r.Right - 1, r.Bottom - 1);
+                }
+
+                e.PaintContent(r);
+            }
+            else if (e.RowIndex == -1)
+            {
+                // Determine Colors
+                if (m_MouseDownColumnHeader == e.ColumnIndex)
+                {
+                    bt = ct.ColumnHeaderPressedBackground;
+                    borderColor = ct.ColumnHeaderPressedBorder;
+                }
+                else if (m_MouseOverColumnHeader == e.ColumnIndex)
+                {
+                    if (m_HighlightSelectedColumnHeaders && (displayIndex >= 0 && e.ColumnIndex >= 0 && (m_ColumnSelectionState.Length > displayIndex && m_ColumnSelectionState[displayIndex].Selected || this.Columns[e.ColumnIndex].Selected)))
+                    {
+                        bt = ct.ColumnHeaderSelectedMouseOverBackground;
+                        borderColor = ct.ColumnHeaderSelectedMouseOverBorder;
+                    }
+                    else
+                    {
+                        bt = ct.ColumnHeaderMouseOverBackground;
+                        borderColor = ct.ColumnHeaderMouseOverBorder;
+                    }
+                }
+                else if (!m_HighlightSelectedColumnHeaders)
+                {
+                    bt = ct.ColumnHeaderNormalBackground;
+                    borderColor = ct.ColumnHeaderNormalBorder;
+                }
+                else if (displayIndex >= 0 && e.ColumnIndex >= 0 && (m_ColumnSelectionState.Length > displayIndex && m_ColumnSelectionState[displayIndex].Selected || this.Columns[e.ColumnIndex].Selected) && enabled)
+                {
+                    bt = ct.ColumnHeaderSelectedBackground;
+                    borderColor = ct.ColumnHeaderSelectedBorder;
+                }
+                else
+                {
+                    if (this.Columns[e.ColumnIndex].Selected && enabled)
+                    {
+                        bt = ct.ColumnHeaderPressedBackground;
+                        borderColor = ct.ColumnHeaderPressedBorder;
+                    }
+                    else
+                    {
+                        bt = ct.ColumnHeaderNormalBackground;
+                        borderColor = ct.ColumnHeaderNormalBorder;
+                    }
+                }
+
+                // Paint row markers
+                DisplayHelp.FillRectangle(g, r, bt);
+                // Paint border
+                using (Pen p = new Pen(borderColor))
+                {
+                    g.DrawLine(p, r.X, r.Bottom-1, r.Right - 1, r.Bottom-1);
+                    //if (displayIndex == 0)
+                    //    g.DrawLine(p, r.X, r.Y, r.X, r.Bottom - 1);
+
+                    if (enabled && (m_HighlightSelectedColumnHeaders && (displayIndex>=0 && m_ColumnSelectionState.Length > displayIndex + 1 && (m_ColumnSelectionState[displayIndex + 1].Selected ||
+                        m_ColumnSelectionState[displayIndex + 1].ColumnIndex == m_MouseDownColumnHeader))))
+                    {
+                        Color bc = ct.ColumnHeaderSelectedBorder;
+                        if (m_ColumnSelectionState[displayIndex + 1].ColumnIndex == m_MouseDownColumnHeader)
+                            bc = ct.ColumnHeaderPressedBorder;
+                        else if (m_MouseOverColumnHeader == displayIndex + 1)
+                            bc = ct.ColumnHeaderSelectedMouseOverBorder;
+                        using (Pen p2 = new Pen(bc))
+                            g.DrawLine(p2, r.Right - 1, r.Y, r.Right - 1, r.Bottom - 1);
+                    }
+                    else
+                        g.DrawLine(p, r.Right - 1, r.Y, r.Right - 1, r.Bottom - 1);
+                }
+                e.PaintContent(r);
+            }
+            else if ((e.State & DataGridViewElementStates.Selected) == DataGridViewElementStates.Selected)
+            {
+                IDataGridViewColumn ic = this.Columns[e.ColumnIndex] as IDataGridViewColumn;
+
+                if (ic != null && ic.OwnerPaintCell == true)
+                {
+                    base.OnCellPainting(e);
+                    return;
+                }
+
+                e.PaintBackground(r, false);
+
+                if (enabled)
+                {
+                    r.Height--;
+                    Office2007ButtonItemPainter.PaintBackground(g, m_ButtonStateColorTable, r, RoundRectangleShapeDescriptor.RectangleShape, false, false);
+                    r.Height++;
+
+                    if (CurrentCellAddress.X==e.ColumnIndex && CurrentCellAddress.Y==e.RowIndex && (e.PaintParts & DataGridViewPaintParts.Focus) == DataGridViewPaintParts.Focus &&
+                        ShowFocusCues && Focused && r.Width > 0 && r.Height > 0)
+                    {
+                        if (m_ButtonStateColorTable.TopBackground != null)
+                            ControlPaint.DrawFocusRectangle(g, r, Color.Empty, m_ButtonStateColorTable.TopBackground.End);
+                        else if (m_ButtonStateColorTable.Background != null)
+                            ControlPaint.DrawFocusRectangle(g, r, Color.Empty, m_ButtonStateColorTable.Background.Start);
+                        else
+                            ControlPaint.DrawFocusRectangle(g, r, Color.Empty, this.BackgroundColor);
+                    }
+                }
+
+                e.PaintContent(r);
+
+            }
+            e.Handled = true;
+            base.OnCellPainting(e);
+        }
+
+        private GraphicsPath GetSelectorPath(Rectangle inner)
+        {
+            inner.Inflate(-3, -3);
+            if (inner.Width > 2 && inner.Height > 2)
+            {
+                GraphicsPath path = new GraphicsPath();
+                path.AddLine(inner.Right, inner.Y, inner.Right, inner.Bottom);
+                path.AddLine(inner.Right, inner.Bottom, inner.Right - inner.Height, inner.Bottom);
+                path.CloseAllFigures();
+                return path;
+            }
+
+            return null;
+        }
+
+        protected override void OnHandleCreated(EventArgs e)
+        {
+            if (GlobalManager.Renderer is Office2007Renderer)
+            {
+                Office2007DataGridViewColorTable ct = ((Office2007Renderer)GlobalManager.Renderer).ColorTable.DataGridView;
+                UpdateOffice2007Styles(ct);
+            }
+            base.OnHandleCreated(e);
+        }
+
+        private void UpdateOffice2007Styles(Office2007DataGridViewColorTable ct)
+        {
+            if (this.GridColor != ct.GridColor)
+                this.GridColor = ct.GridColor;
+            if(m_PaintEnhancedSelection)
+                this.DefaultCellStyle.SelectionForeColor = this.DefaultCellStyle.ForeColor;
+        }
+
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            Office2007ColorTable ct = null;
+            if (GlobalManager.Renderer is Office2007Renderer)
+            {
+                ct = ((Office2007Renderer)GlobalManager.Renderer).ColorTable;
+                m_ColorTable = ct.DataGridView;
+                if(StyleManager.IsVisualStudio2012(StyleManager.Style))
+                    m_ButtonStateColorTable = ct.ButtonItemColors[0].Pressed;
+                else
+                    m_ButtonStateColorTable = ct.ButtonItemColors[0].Checked;
+            }
+
+            if (this.CurrentCell != null)
+                m_SelectedRowIndex = this.CurrentCell.RowIndex;
+            else
+                m_SelectedRowIndex = -1;
+
+            base.OnPaint(e);
+
+            if (this.VerticalScrollBar.Visible && this.HorizontalScrollBar.Visible)
+            {
+                Rectangle r = new Rectangle(this.VerticalScrollBar.Left, this.VerticalScrollBar.Bottom, this.VerticalScrollBar.Width, this.HorizontalScrollBar.Height);
+                Color c = ct.AppScrollBar.Default.Background.End;
+                if (c.IsEmpty) c = ct.AppScrollBar.Default.Background.Start;
+                DisplayHelp.FillRectangle(e.Graphics, r, c);
+                //e.Graphics.FillRectangle(Brushes.BlueViolet, r);
+            }
+
+            m_ColorTable = null;
+            m_ButtonStateColorTable = null;
+        }
+
+        protected override void OnCurrentCellChanged(EventArgs e)
+        {
+            if (this.SelectionMode == DataGridViewSelectionMode.FullRowSelect)
+                UpdateSelectionState();
+            base.OnCurrentCellChanged(e);
+        }
+
+        protected override void OnSelectionChanged(EventArgs e)
+        {
+            UpdateSelectionState();
+            base.OnSelectionChanged(e);
+        }
+
+        protected override void OnDataSourceChanged(EventArgs e)
+        {
+            base.OnDataSourceChanged(e);
+            UpdateSelectionState();
+        }
+
+        private void UpdateSelectionState()
+        {
+            SelectionInfo[] newSelection = new SelectionInfo[this.Columns.Count];
+            for (int i = 0; i < this.Columns.Count; i++)
+                newSelection[this.Columns[i].DisplayIndex].ColumnIndex = i;
+            int columnCount = this.Columns.Count;
+
+            if (this.SelectionMode == DataGridViewSelectionMode.FullRowSelect)
+            {
+                if (this.CurrentCell != null)
+                {
+                    int displayIndex = this.Columns[this.CurrentCell.ColumnIndex].DisplayIndex;
+                    newSelection[displayIndex].Selected = true;
+                    newSelection[displayIndex].ColumnIndex = this.CurrentCell.ColumnIndex;
+                }
+            }
+            else
+            {
+                foreach (DataGridViewCell cell in this.SelectedCells)
+                {
+                    if (cell.ColumnIndex == -1) continue;
+                    int displayIndex = this.Columns[cell.ColumnIndex].DisplayIndex;
+                    if (!newSelection[displayIndex].Selected)
+                    {
+                        columnCount--;
+                        newSelection[displayIndex].Selected = true;
+                        newSelection[displayIndex].ColumnIndex = cell.ColumnIndex;
+                        if (columnCount == 0) break;
+                    }
+                }
+            }
+
+            for (int i = 0; i < newSelection.Length; i++)
+            {
+                if (m_ColumnSelectionState.Length > i && newSelection[i].Selected != m_ColumnSelectionState[i].Selected)
+                {
+                    int ci = m_ColumnSelectionState[i].ColumnIndex;
+                    if (!(ci < 0 || ci >= this.Columns.Count))
+                    {
+                        this.InvalidateColumn(ci);
+                        if (ci > 0) this.InvalidateColumn(ci - 1);
+                    }
+                }
+            }
+            if (m_SelectedRowIndex > 0 && m_SelectedRowIndex < this.Rows.Count)
+                this.InvalidateRow(m_SelectedRowIndex - 1);
+            if (this.CurrentCell != null && this.CurrentCell.RowIndex > 0)
+            {
+                m_SelectedRowIndex = this.CurrentCell.RowIndex;
+                this.InvalidateRow(m_SelectedRowIndex - 1);
+            }
+            else
+                m_SelectedRowIndex = -2;
+            m_ColumnSelectionState = newSelection;
+        }
+
+        protected virtual Office2007DataGridViewColorTable GetColorTable()
+        {
+            return m_ColorTable;
+        }
+
+        protected override void OnCellMouseDown(DataGridViewCellMouseEventArgs e)
+        {
+            // Disable double buffer so column resize drag markers will work
+            if (e.ColumnIndex == -1 || e.RowIndex == -1)
+            {
+                this.DoubleBuffered = false;
+            }
+
+            if (e.RowIndex == -1)
+            {
+                m_MouseDownColumnHeader = e.ColumnIndex;
+                if (e.ColumnIndex >= 0)
+                    this.InvalidatePreviousColumn(this.Columns[e.ColumnIndex].DisplayIndex);
+            }
+            else
+                m_MouseDownColumnHeader = -2;
+
+            if (e.ColumnIndex == -1)
+            {
+                m_MouseDownRowIndex = e.RowIndex;
+                if (m_MouseDownRowIndex > 0 && m_MouseDownRowIndex < this.Rows.Count)
+                    this.InvalidateRow(m_MouseDownRowIndex - 1);
+            }
+            else
+                m_MouseDownRowIndex = -2;
+
+            base.OnCellMouseDown(e);
+        }
+
+        private void InvalidatePreviousColumn(int displayIndex)
+        {
+            displayIndex--;
+            for (int i = 0; i < this.Columns.Count; i++)
+            {
+                DataGridViewColumn c = this.Columns[i];
+                if (c.Displayed && c.DisplayIndex == displayIndex)
+                {
+                    this.InvalidateColumn(i);
+                    break;
+                }
+            }
+        }
+
+        protected override void OnDragDrop(DragEventArgs drgevent)
+        {
+            CleanUpOnCellMouseUp();
+            base.OnDragDrop(drgevent);
+        }
+
+        private void CleanUpOnCellMouseUp()
+        {
+            // Enable double buffering that was disabled in CellMouseDown
+            if (!this.DoubleBuffered)
+                this.DoubleBuffered = true;
+
+            if (m_MouseDownRowIndex > 0 && m_MouseDownRowIndex < this.Rows.Count)
+                this.InvalidateRow(m_MouseDownRowIndex - 1);
+            if (m_MouseDownRowIndex >= 0 && m_MouseDownRowIndex < this.Rows.Count)
+                this.InvalidateRow(m_MouseDownRowIndex);
+
+            m_MouseDownRowIndex = -2;
+            m_MouseDownColumnHeader = -2;
+        }
+        protected override void OnCellMouseUp(DataGridViewCellMouseEventArgs e)
+        {
+            CleanUpOnCellMouseUp();
+            base.OnCellMouseUp(e);
+        }
+
+        protected override void OnCellMouseEnter(DataGridViewCellEventArgs e)
+        {
+            if (e.RowIndex == -1)
+                m_MouseOverColumnHeader = e.ColumnIndex;
+            else
+                m_MouseOverColumnHeader = -2;
+            if (e.ColumnIndex == -1)
+            {
+                if (m_MouseOverRowIndex != e.RowIndex)
+                {
+                    m_MouseOverRowIndex = e.RowIndex;
+                    if (m_MouseOverRowIndex > 0)
+                        this.InvalidateRow(m_MouseOverRowIndex - 1);
+                }
+            }
+            else
+                m_MouseOverRowIndex = -2;
+            base.OnCellMouseEnter(e);
+        }
+
+        protected override void OnCellMouseLeave(DataGridViewCellEventArgs e)
+        {
+            m_MouseOverColumnHeader = -2;
+            m_MouseOverRowIndex = -2;
+            base.OnCellMouseLeave(e);
+        }
+
+        private struct SelectionInfo
+        {
+            public bool Selected;
+            public int ColumnIndex;
+        }
+
+        protected override void OnScroll(ScrollEventArgs e)
+        {
+            base.OnScroll(e);
+            DGVScrollBar vsb = GetVScrollBar();
+            if (vsb != null && vsb.Visible) vsb.UpdateScrollValues();
+
+            DGHScrollBar hsb = GetHScrollBar();
+            if (hsb != null && hsb.Visible) hsb.UpdateScrollValues();
+        }
+
+        private DGVScrollBar GetVScrollBar()
+        {
+            return this.VerticalScrollBar as DGVScrollBar;
+            //Type t = typeof(System.Windows.Forms.DataGridView);
+            //FieldInfo fi = t.GetField("vertScrollBar", BindingFlags.NonPublic | BindingFlags.Instance);
+            //if (fi == null) return null;
+            //DGVScrollBar sb = fi.GetValue(this) as DGVScrollBar;
+            //return sb;
+        }
+
+        private DGHScrollBar GetHScrollBar()
+        {
+            return this.HorizontalScrollBar as DGHScrollBar;
+            //Type t = typeof(System.Windows.Forms.DataGridView);
+            //FieldInfo fi = t.GetField("horizScrollBar", BindingFlags.NonPublic | BindingFlags.Instance);
+            //if (fi == null) return null;
+            //DGHScrollBar sb = fi.GetValue(this) as DGHScrollBar;
+            //return sb;
+        }
+
+        private void InvokeDelayed(MethodInvoker method)
+        {
+            Timer delayedInvokeTimer = new Timer();
+            delayedInvokeTimer = new Timer();
+            delayedInvokeTimer.Tag = method;
+            delayedInvokeTimer.Interval = 10;
+            delayedInvokeTimer.Tick += new EventHandler(DelayedInvokeTimerTick);
+            delayedInvokeTimer.Start();
+        }
+        void DelayedInvokeTimerTick(object sender, EventArgs e)
+        {
+            Timer timer = (Timer)sender;
+            MethodInvoker method = (MethodInvoker)timer.Tag;
+            timer.Stop();
+            timer.Dispose();
+            method.Invoke();
+        }
+
+        protected override void OnResize(EventArgs e)
+        {
+            if (_DelayResizeCallWhenMdiChild)
+            {
+                Form form = this.FindForm();
+                if (form != null && form.IsMdiChild)
+                    InvokeDelayed(new MethodInvoker(delegate { CallBaseOnResize(e); }));
+                else
+                    base.OnResize(e);
+            }
+            else
+                base.OnResize(e);
+        }
+
+        private void CallBaseOnResize(EventArgs e)
+        {
+            base.OnResize(e);
+        }
+
+        private bool _DelayResizeCallWhenMdiChild = true;
+        /// <summary>
+        /// Indicates whether control will delay call to OnResize base DataGridView method when control is running on MDI Child which was introduced as workaround to an issue in control.
+        /// </summary>
+        [DefaultValue(true), Browsable(false)]
+        public bool DelayResizeCallWhenMdiChild
+        {
+            get { return _DelayResizeCallWhenMdiChild; }
+            set { _DelayResizeCallWhenMdiChild = value; }
+        }
+
+        private eScrollBarAppearance _ScrollBarAppearance = eScrollBarAppearance.ApplicationScroll;
+        /// <summary>
+        /// Gets or sets the scroll-bar visual style.
+        /// </summary>
+        [DefaultValue(eScrollBarAppearance.ApplicationScroll), Category("Appearance"), Description("Gets or sets the scroll-bar visual style.")]
+        public eScrollBarAppearance ScrollBarAppearance
+        {
+            get { return _ScrollBarAppearance; }
+            set
+            {
+                _ScrollBarAppearance = value;
+                OnScrollBarAppearance();
+            }
+        }
+        private void OnScrollBarAppearance()
+        {
+            DGVScrollBar sbv = GetVScrollBar();
+            if (sbv != null)
+                sbv.AppStyleScrollBar = (_ScrollBarAppearance == eScrollBarAppearance.ApplicationScroll);
+
+            DGHScrollBar sbh = GetHScrollBar();
+            if (sbh != null)
+                sbh.AppStyleScrollBar = (_ScrollBarAppearance == eScrollBarAppearance.ApplicationScroll);
+        }
+
+        private void SetupScrollBars()
+        {
+            // Vertical Scroll Bar Replacement
+            Type t = typeof(System.Windows.Forms.DataGridView);
+            FieldInfo fi = t.GetField("vertScrollBar", BindingFlags.NonPublic | BindingFlags.Instance);
+            if(fi==null) return;
+            System.Windows.Forms.ScrollBar sb = fi.GetValue(this) as System.Windows.Forms.ScrollBar;
+            if (sb == null) return;
+            //sb.Scroll += new ScrollEventHandler(sb_Scroll); return;
+            MethodInfo mi = t.GetMethod("DataGridViewVScrolled", BindingFlags.NonPublic | BindingFlags.Instance);
+            if (mi == null) return;
+
+            DGVScrollBar newVSb = new DGVScrollBar();
+            newVSb.AppStyleScrollBar = (_ScrollBarAppearance == eScrollBarAppearance.ApplicationScroll);
+            newVSb.Minimum = sb.Minimum;
+            newVSb.Maximum = sb.Maximum;
+            newVSb.SmallChange = sb.SmallChange;
+            newVSb.LargeChange = sb.LargeChange;
+            newVSb.Top = sb.Top;
+            newVSb.AccessibleName = sb.AccessibleName;
+            newVSb.Left = sb.Left;
+            newVSb.Visible = sb.Visible;
+            newVSb.Scroll += (ScrollEventHandler)ScrollEventHandler.CreateDelegate(typeof(ScrollEventHandler), this, mi);
+            fi.SetValue(this, newVSb);
+            sb.Dispose();
+            this.Controls.Remove(sb);
+            this.Controls.Add(newVSb);
+
+            // Horizontal Scroll Bar Replacement
+            fi = t.GetField("horizScrollBar", BindingFlags.NonPublic | BindingFlags.Instance);
+            if (fi == null) return;
+            sb = fi.GetValue(this) as System.Windows.Forms.ScrollBar;
+            if (sb == null) return;
+            mi = t.GetMethod("DataGridViewHScrolled", BindingFlags.NonPublic | BindingFlags.Instance);
+            if (mi == null) return;
+
+            DGHScrollBar newHSb = new DGHScrollBar();
+            newHSb.AppStyleScrollBar = (_ScrollBarAppearance == eScrollBarAppearance.ApplicationScroll); ;
+            newHSb.Minimum = sb.Minimum;
+            newHSb.Maximum = sb.Maximum;
+            newHSb.SmallChange = sb.SmallChange;
+            newHSb.LargeChange = sb.LargeChange;
+            newHSb.Top = sb.Top;
+            newHSb.AccessibleName = sb.AccessibleName;
+            newHSb.Left = sb.Left;
+            newHSb.Visible = sb.Visible;
+            newHSb.RightToLeft = sb.RightToLeft;
+            newHSb.Scroll += (ScrollEventHandler)ScrollEventHandler.CreateDelegate(typeof(ScrollEventHandler), this, mi);
+            fi.SetValue(this, newHSb);
+            sb.Dispose();
+            this.Controls.Remove(sb);
+            this.Controls.Add(newHSb);
+
+            base.PerformLayout();
+        }
+
+        //void sb_Scroll(object sender, ScrollEventArgs e)
+        //{
+        //    Console.WriteLine(e.NewValue);
+        //}
+
+        /// <summary>
+        /// Gets or sets whether selected column header is highlighted. Default value is true.
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Behavior"), Description("Indicates whether selected column header is highlighted.")]
+        public bool HighlightSelectedColumnHeaders
+        {
+            get { return m_HighlightSelectedColumnHeaders; }
+            set
+            {
+                m_HighlightSelectedColumnHeaders = value;
+                if(BarFunctions.IsHandleValid(this))
+                    this.Invalidate();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether select all sign displayed in top-left corner of the grid is visible. Default value is true.
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Behavior"), Description("Indicates whether select all sign displayed in top-left corner of the grid is visible.")]
+        public bool SelectAllSignVisible
+        {
+            get { return m_SelectAllSignVisible; }
+            set
+            {
+                m_SelectAllSignVisible = value;
+                if (BarFunctions.IsHandleValid(this))
+                    this.Invalidate();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether enhanced selection for the cells is painted in Office 2007 style. Default value is true.
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Appearance"), Description("Indicates whether enhanced selection for the cells is painted in Office 2007 style")]
+        public bool PaintEnhancedSelection
+        {
+            get { return m_PaintEnhancedSelection; }
+            set
+            {
+                m_PaintEnhancedSelection = value;
+                if (BarFunctions.IsHandleValid(this))
+                    this.Invalidate();
+            }
+        }
+
+        private bool _UseCustomBackgroundColor = false;
+        /// <summary>
+        /// Indicates whether BackgroundColor property set on DataGridView is obeyed instead of using system color scheme color.
+        /// </summary>
+        [DefaultValue(false), Category("Appearance"), Description("Indicates whether BackgroundColor property set on DataGridView is obeyed instead of using system color scheme color.")]
+        public bool UseCustomBackgroundColor
+        {
+            get { return _UseCustomBackgroundColor; }
+            set
+            {
+                _UseCustomBackgroundColor = value;
+            }
+        }
+        #endregion
+    }
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewButtonX/DataGridViewButtonXCell.cs b/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewButtonX/DataGridViewButtonXCell.cs
new file mode 100644
index 00000000..ad03a29f
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewButtonX/DataGridViewButtonXCell.cs	
@@ -0,0 +1,498 @@
+using System;
+using System.Drawing;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    public class DataGridViewButtonXCell : DataGridViewButtonCell
+    {
+        #region Public properties
+
+        #region EditType
+
+        /// <summary>
+        /// Gets the Type of the editing control associated with the cell
+        /// </summary>
+        public override Type EditType
+        {
+            get { return (null); }
+        }
+
+        #endregion
+
+        #region FormattedValueType
+
+        /// <summary>
+        /// FormattedValueType
+        /// </summary>
+        public override Type FormattedValueType
+        {
+            get { return (typeof (string)); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetContentBounds
+
+        /// <summary>
+        /// GetContentBounds
+        /// </summary>
+        /// <param name="graphics"></param>
+        /// <param name="cellStyle"></param>
+        /// <param name="rowIndex"></param>
+        /// <returns></returns>
+        protected override Rectangle GetContentBounds(Graphics graphics, DataGridViewCellStyle cellStyle, int rowIndex)
+        {
+            Rectangle cellBounds = DataGridView.GetCellDisplayRectangle(ColumnIndex, rowIndex, false);
+            cellBounds.Location = new Point(0, 0);
+
+            DataGridViewButtonXColumn oc = (DataGridViewButtonXColumn)OwningColumn;
+            ButtonX bx = oc.ButtonX;
+
+            Rectangle rBt = GetButtonBounds(cellBounds, true);
+
+            if (bx.ButtonItem.SubItems.Count > 0)
+                rBt.Width -= bx.ButtonItem.SubItemsExpandWidth;
+
+            return (rBt);
+        }
+
+        #endregion
+
+        #region Paint
+
+        #region Paint
+
+        /// <summary>
+        /// Cell painting
+        /// </summary>
+        /// <param name="graphics"></param>
+        /// <param name="clipBounds"></param>
+        /// <param name="cellBounds"></param>
+        /// <param name="rowIndex"></param>
+        /// <param name="elementState"></param>
+        /// <param name="value"></param>
+        /// <param name="formattedValue"></param>
+        /// <param name="errorText"></param>
+        /// <param name="cellStyle"></param>
+        /// <param name="advancedBorderStyle"></param>
+        /// <param name="paintParts"></param>
+        protected override void Paint(Graphics graphics,
+            Rectangle clipBounds, Rectangle cellBounds, int rowIndex, DataGridViewElementStates elementState,
+            object value, object formattedValue, string errorText, DataGridViewCellStyle cellStyle,
+            DataGridViewAdvancedBorderStyle advancedBorderStyle, DataGridViewPaintParts paintParts)
+        {
+            if (DataGridView != null)
+            {
+                // First paint the borders of the cell
+
+                if (PartsSet(paintParts, DataGridViewPaintParts.Border))
+                    PaintBorder(graphics, clipBounds, cellBounds, cellStyle, advancedBorderStyle);
+
+                // Now paint the background and content
+
+                if (PartsSet(paintParts, DataGridViewPaintParts.Background))
+                {
+                    Rectangle rBk = GetBackBounds(cellBounds, advancedBorderStyle);
+
+                    if (rBk.Height > 0 && rBk.Width > 0)
+                    {
+                        DataGridViewButtonXColumn oc = (DataGridViewButtonXColumn)OwningColumn;
+                        Bitmap bm = oc.GetCellBitmap(cellBounds);
+
+                        if (bm != null)
+                        {
+                            using (Graphics g = Graphics.FromImage(bm))
+                            {
+                                PaintButtonBackground(g, cellStyle, rBk);
+                                PaintButtonContent(cellBounds, rowIndex, formattedValue, cellStyle, paintParts, bm);
+
+                                graphics.DrawImageUnscaledAndClipped(bm, rBk);
+                            }
+
+                            if ((DataGridView.ShowCellErrors == true) &&
+                                (paintParts & DataGridViewPaintParts.ErrorIcon) == DataGridViewPaintParts.ErrorIcon)
+                            {
+                                base.PaintErrorIcon(graphics, clipBounds, cellBounds, errorText);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region PaintButtonBackground
+
+        /// <summary>
+        /// Paints the Button background
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="cellStyle"></param>
+        /// <param name="rBack"></param>
+        private void PaintButtonBackground(Graphics g,
+            DataGridViewCellStyle cellStyle, Rectangle rBack)
+        {
+            Rectangle r = rBack;
+            r.Location = new Point(0, 0);
+
+            DataGridViewX dx = DataGridView as DataGridViewX;
+
+            if (dx != null && dx.Enabled == true && Selected == true &&
+                dx.PaintEnhancedSelection == true)
+            {
+                Office2007ButtonItemPainter.PaintBackground(g, dx.ButtonStateColorTable,
+                    r, RoundRectangleShapeDescriptor.RectangleShape, false,
+                    false);
+            }
+            else
+            {
+                Color color = (Selected == true)
+                    ? cellStyle.SelectionBackColor : cellStyle.BackColor;
+
+                using (Brush br = new SolidBrush(color))
+                    g.FillRectangle(br, r);
+            }
+        }
+
+        #endregion
+
+        #region PaintButtonContent
+
+        /// <summary>
+        /// Paints the button background and content
+        /// </summary>
+        /// <param name="cellBounds"></param>
+        /// <param name="rowIndex"></param>
+        /// <param name="value"></param>
+        /// <param name="cellStyle"></param>
+        /// <param name="paintParts"></param>
+        /// <param name="bm"></param>
+        private void PaintButtonContent(Rectangle cellBounds, int rowIndex, object value, 
+            DataGridViewCellStyle cellStyle, DataGridViewPaintParts paintParts, Bitmap bm)
+        {
+            DataGridViewButtonXColumn oc = (DataGridViewButtonXColumn)OwningColumn;
+            ButtonX bx = oc.ButtonX;
+
+            Rectangle rBt = GetButtonBounds(cellBounds, true);
+
+            if (rBt.Width > 0 && rBt.Height > 0)
+            {
+                bool mouseIsOver = bx.ButtonItem.MouseIsOver;
+                bool mouerIsOverExpand = bx.ButtonItem.MouseIsOverExpand;
+                bool mouseIsDown = bx.ButtonItem.MouseIsDown;
+                bool buttonIsExpanded = bx.ButtonItem.ButtonIsExpanded;
+
+                try
+                {
+                    string s = oc.Text;
+
+                    oc.InCellCallBack = true;
+
+                    if (rowIndex != oc.ActiveRowIndex)
+                    {
+                        bx.ButtonItem.MouseIsOver = false;
+                        bx.ButtonItem.MouseIsOverExpand = false;
+                        bx.ButtonItem.MouseIsDown = false;
+                        bx.ButtonItem.ButtonIsExpanded = false;
+                    }
+
+                    bx.Font = cellStyle.Font;
+                    bx.ForeColor = cellStyle.ForeColor;
+                    bx.BackColor = cellStyle.BackColor;
+
+                    if (rowIndex < DataGridView.RowCount)
+                    {
+                        bx.Text = UseColumnTextForButtonValue ? s : GetValue(value);
+
+                        if (PartsSet(paintParts, DataGridViewPaintParts.ContentForeground))
+                            oc.OnBeforeCellPaint(rowIndex, ColumnIndex);
+                    }
+                    else
+                    {
+                        bx.Text = "";
+                    }
+
+                    bx.Bounds = rBt;
+                    bx.RecalcLayout();
+                    bx.DrawToBitmap(bm, rBt);
+                }
+                finally
+                {
+                    bx.ButtonItem.MouseIsOver = mouseIsOver;
+                    bx.ButtonItem.MouseIsOverExpand = mouerIsOverExpand;
+                    bx.ButtonItem.MouseIsDown = mouseIsDown;
+                    bx.ButtonItem.ButtonIsExpanded = buttonIsExpanded;
+
+                    oc.InCellCallBack = false;
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Mouse processing
+
+        #region OnMouseEnter
+
+        /// <summary>
+        /// OnMouseEnter
+        /// </summary>
+        /// <param name="rowIndex"></param>
+        protected override void OnMouseEnter(int rowIndex)
+        {
+            base.OnMouseEnter(rowIndex);
+
+            DoMouseEnter(rowIndex);
+        }
+
+        /// <summary>
+        /// Establishes the given rowIndex as the
+        /// ActiveRowIndex.
+        /// </summary>
+        /// <param name="rowIndex"></param>
+        internal void DoMouseEnter(int rowIndex)
+        {
+            DataGridViewButtonXColumn oc = (DataGridViewButtonXColumn)OwningColumn;
+            ButtonX bx = oc.ButtonX;
+
+            oc.CurrentRowIndex = rowIndex;
+
+            if (bx.Expanded == false)
+            {
+                oc.ActiveRowIndex = rowIndex;
+
+                bx.ButtonItem.InternalMouseEnter();
+
+                RefreshButton(ColumnIndex, rowIndex);
+            }
+        }
+
+        #endregion
+
+        #region OnMouseLeave
+
+        /// <summary>
+        /// Processes MouseLeave events
+        /// </summary>
+        /// <param name="rowIndex"></param>
+        protected override void OnMouseLeave(int rowIndex)
+        {
+            base.OnMouseLeave(rowIndex);
+
+            DataGridViewButtonXColumn oc = (DataGridViewButtonXColumn)OwningColumn;
+            ButtonX bx = oc.ButtonX;
+
+            oc.CurrentRowIndex = -1;
+
+            if (bx.Expanded == false)
+            {
+                oc.ActiveRowIndex = -1;
+
+                bx.ButtonItem.InternalMouseLeave();
+
+                RefreshButton(ColumnIndex, rowIndex);
+            }
+        }
+
+        #endregion
+
+        #region OnMouseMove
+
+        /// <summary>
+        /// Processes MouseMove events
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnMouseMove(DataGridViewCellMouseEventArgs e)
+        {
+            base.OnMouseMove(e);
+
+            DataGridViewButtonXColumn oc = (DataGridViewButtonXColumn) OwningColumn;
+            ButtonX bx = oc.ButtonX;
+
+            if (oc.ActiveRowIndex == e.RowIndex || bx.Expanded == false)
+            {
+                bx.ButtonItem.InternalMouseMove(
+                    new MouseEventArgs(e.Button, e.Clicks, e.X, e.Y, e.Delta));
+
+                RefreshButton(e.ColumnIndex, e.RowIndex);
+            }
+        }
+
+        #endregion
+
+        #region OnMouseDown
+
+        /// <summary>
+        /// Processes MouseDown events
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnMouseDown(DataGridViewCellMouseEventArgs e)
+        {
+            base.OnMouseDown(e);
+
+            DataGridViewButtonXColumn oc = (DataGridViewButtonXColumn) OwningColumn;
+            ButtonX bx = oc.ButtonX;
+
+            if (DataGridView.Controls.Contains(bx) == false)
+                DataGridView.Controls.Add(bx);
+
+            if (oc.ExpandClosed == false || bx.ButtonItem.MouseIsOverExpand == false)
+            {
+                Rectangle cellBounds = DataGridView.GetCellDisplayRectangle(e.ColumnIndex, e.RowIndex, false);
+                Rectangle rBt = GetButtonBounds(cellBounds, false);
+
+                Point pt = e.Location;
+                pt.Offset(rBt.Location);
+
+                if (rBt.Contains(pt) == true)
+                {
+                    bx.Bounds = rBt;
+
+                    bx.ButtonItem.InternalMouseDown(
+                        new MouseEventArgs(e.Button, e.Clicks, e.X, e.Y, e.Delta));
+
+                    DataGridView.Invalidate(rBt);
+                }
+            }
+
+            oc.ExpandClosed = false;
+        }
+
+        #endregion
+
+        #region OnMouseUp
+
+        /// <summary>
+        /// Processes MouseUp events
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnMouseUp(DataGridViewCellMouseEventArgs e)
+        {
+            base.OnMouseUp(e);
+
+            DataGridViewButtonXColumn oc = (DataGridViewButtonXColumn) OwningColumn;
+            ButtonX bx = oc.ButtonX;
+
+            Rectangle cellBounds = DataGridView.GetCellDisplayRectangle(e.ColumnIndex, e.RowIndex, false);
+            Rectangle rBt = GetButtonBounds(cellBounds, false);
+
+            DataGridView.Invalidate(rBt);
+
+            bx.Bounds = rBt;
+            bx.ButtonItem.InternalMouseUp(
+                new MouseEventArgs(e.Button, e.Clicks, e.X, e.Y, e.Delta));
+        }
+
+        #endregion
+
+        #endregion
+
+        #region PartsSet
+
+        /// <summary>
+        /// Determines if the given part is set
+        /// </summary>
+        /// <param name="paintParts"></param>
+        /// <param name="parts"></param>
+        /// <returns></returns>
+        private bool PartsSet(DataGridViewPaintParts paintParts, DataGridViewPaintParts parts)
+        {
+            return ((paintParts & parts) == parts);
+        }
+
+        #endregion
+
+        #region GetBackBounds
+
+        /// <summary>
+        /// Gets the background bounds for the given cell
+        /// </summary>
+        /// <param name="cellBounds"></param>
+        /// <param name="advancedBorderStyle"></param>
+        /// <returns></returns>
+        private Rectangle GetBackBounds(
+            Rectangle cellBounds, DataGridViewAdvancedBorderStyle advancedBorderStyle)
+        {
+            DataGridViewButtonXColumn oc = (DataGridViewButtonXColumn)OwningColumn;
+
+            Rectangle r = BorderWidths(advancedBorderStyle);
+
+            cellBounds.Offset(r.X, r.Y);
+            cellBounds.Width -= r.Right;
+            cellBounds.Height -= r.Bottom;
+
+            if (Selected == true)
+                cellBounds.Width += oc.DividerWidth;
+
+            return (cellBounds);
+        }
+
+        #endregion
+
+        #region GetButtonBounds
+
+        /// <summary>
+        /// Gets the button bounds for the given cell
+        /// </summary>
+        /// <param name="cellBounds"></param>
+        /// <param name="localize"></param>
+        /// <returns></returns>
+        private Rectangle GetButtonBounds(Rectangle cellBounds, bool localize)
+        {
+            DataGridViewButtonXColumn oc = (DataGridViewButtonXColumn)OwningColumn;
+
+            cellBounds.Width -= (oc.DividerWidth + 3);
+            cellBounds.Height -= 3;
+
+            if (localize == true)
+                cellBounds.Location = new Point(0, 0);
+
+            cellBounds.X++;
+            cellBounds.Y++;
+
+            return (cellBounds);
+        }
+
+        #endregion
+
+        #region GetValue
+
+        /// <summary>
+        /// GetValue
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        private string GetValue(object value)
+        {
+            return (value != Convert.DBNull ? Convert.ToString(value) : "" );
+        }
+
+        #endregion
+
+        #region RefreshButton
+
+        /// <summary>
+        /// Initiates the refresh of the cell button
+        /// </summary>
+        /// <param name="columnIndex"></param>
+        /// <param name="rowIndex"></param>
+        private void RefreshButton(int columnIndex, int rowIndex)
+        {
+            if (DataGridView != null)
+            {
+                Rectangle cellBounds = DataGridView.GetCellDisplayRectangle(columnIndex, rowIndex, false);
+                Rectangle rBt = GetButtonBounds(cellBounds, false);
+
+                DataGridView.Invalidate(rBt);
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewButtonX/DataGridViewButtonXColumn.cs b/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewButtonX/DataGridViewButtonXColumn.cs
new file mode 100644
index 00000000..f2592174
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewButtonX/DataGridViewButtonXColumn.cs	
@@ -0,0 +1,751 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Runtime.InteropServices;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    [ToolboxBitmap(typeof(DataGridViewButtonXColumn), "ButtonX.ButtonX.ico"), ToolboxItem(false), ComVisible(false)]
+    public class DataGridViewButtonXColumn : DataGridViewButtonColumn, IDataGridViewColumn
+    {
+        #region Events
+
+        [Description("Occurs right before a Button Cell is painted.")]
+        public event EventHandler<BeforeCellPaintEventArgs> BeforeCellPaint;
+
+        [Description("Occurs when a Button Cell is Clicked.")]
+        public event EventHandler<EventArgs> Click;
+
+        #endregion
+
+        #region Private variables
+
+        private ButtonX _ButtonX;
+
+        private int _ActiveRowIndex = -1;
+        private int _CurrentRowIndex = -1;
+
+        private bool _ExpandClosed;
+        private bool _InCellCallBack;
+
+        private Bitmap _CellBitmap;
+
+        #endregion
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        public DataGridViewButtonXColumn()
+        {
+            CellTemplate = new DataGridViewButtonXCell();
+
+            _ButtonX = new ButtonX();
+
+            _ButtonX.Visible = false;
+            _ButtonX.FadeEffect = false;
+
+            HookEvents(true);
+        }
+
+        #region Internal properties
+
+        #region ActiveRowIndex
+
+        /// <summary>
+        /// Gets or sets the active row index
+        /// </summary>
+        internal int ActiveRowIndex
+        {
+            get { return (_ActiveRowIndex); }
+            set { _ActiveRowIndex = value; }
+        }
+
+        #endregion
+
+        #region ButtonX
+
+        /// <summary>
+        /// Gets the Control Button
+        /// </summary>
+        internal ButtonX ButtonX
+        {
+            get { return (_ButtonX); }
+        }
+
+        #endregion
+
+        #region CurrentRowIndex
+
+        /// <summary>
+        /// Gets or sets the Current row index
+        /// </summary>
+        internal int CurrentRowIndex
+        {
+            get { return (_CurrentRowIndex); }
+            set { _CurrentRowIndex = value; }
+        }
+
+        #endregion
+
+        #region ExpandClosed
+
+        /// <summary>
+        /// Gets or sets a expanded button
+        /// was just closed
+        /// </summary>
+        internal bool ExpandClosed
+        {
+            get { return (_ExpandClosed); }
+            set { _ExpandClosed = value; }
+        }
+
+        #endregion
+
+        #region InCellCallBack
+
+        /// <summary>
+        /// Gets or sets the cell callback state
+        /// </summary>
+        internal bool InCellCallBack
+        {
+            get { return (_InCellCallBack); }
+            set { _InCellCallBack = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Public properties
+
+        #region AutoCheckOnClick
+
+        /// <summary>
+        /// Gets or sets whether Checked property is automatically inverted, button checked/unchecked, when button is clicked. Default value is false.
+        /// </summary>
+        [Browsable(true), DefaultValue(false), Category("Behavior")]
+        [Description("Indicates whether Checked property is automatically inverted when button is clicked.")]
+        public bool AutoCheckOnClick
+        {
+            get { return (_ButtonX.AutoCheckOnClick); }
+            set { _ButtonX.AutoCheckOnClick = value; }
+        }
+
+        #endregion
+
+        #region AutoExpandOnClick
+
+        /// <summary>
+        /// Indicates whether the button will auto-expand when clicked. 
+        /// When button contains sub-items, sub-items will be shown only if user
+        /// click the expand part of the button. Setting this property to true will expand the button and show sub-items when user
+        /// clicks anywhere inside of the button. Default value is false which indicates that button is expanded only
+        /// if its expand part is clicked.
+        /// </summary>
+        [DefaultValue(false), Browsable(true), DevCoBrowsable(true), Category("Behavior")]
+        [Description("Indicates whether the button will auto-expand (display pop-up menu or toolbar) when clicked.")]
+        public virtual bool AutoExpandOnClick
+        {
+            get { return (_ButtonX.AutoExpandOnClick); }
+            set { _ButtonX.AutoExpandOnClick = value; }
+        }
+
+        #endregion
+
+        #region Checked
+
+        /// <summary>
+        /// Gets or set a value indicating whether the button is in the checked state.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Category("Appearance"), DefaultValue(false)]
+        [Description("Indicates whether item is checked or not.")]
+        public virtual bool Checked
+        {
+            get { return (_ButtonX.Checked); }
+            set { _ButtonX.Checked = value; }
+        }
+
+        #endregion
+
+        #region ColorScheme
+
+        /// <summary>
+        /// Gets or sets button Color Scheme. ColorScheme does not apply to Office2007 styled buttons.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), Category("Appearance")]
+        [Description("Gets or sets Bar Color Scheme."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ColorScheme ColorScheme
+        {
+            get { return (_ButtonX.ColorScheme); }
+            set { _ButtonX.ColorScheme = value; }
+        }
+
+        #endregion
+
+        #region ColorTable
+
+        /// <summary>
+        /// Gets or sets the predefined color of the button. Color specified applies to buttons with Office 2007 style only. It does not have
+        /// any effect on other styles. Default value is eButtonColor.BlueWithBackground
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(false), DefaultValue(eButtonColor.BlueWithBackground), Category("Appearance")]
+        [Description("Indicates predefined color of button when Office 2007 style is used.")]
+        [NotifyParentProperty(true)]
+        public eButtonColor ColorTable
+        {
+            get { return (_ButtonX.ColorTable); }
+            set { _ButtonX.ColorTable = value; }
+        }
+
+        #endregion
+
+        #region CustomColorName
+
+        /// <summary>
+        /// Gets or sets the custom color name. Name specified here must be represented by the corresponding object with the same name that is part
+        /// of the Office2007ColorTable.ButtonItemColors collection. See documentation for Office2007ColorTable.ButtonItemColors for more information.
+        /// If color table with specified name cannot be found default color will be used. Valid settings for this property override any
+        /// setting to the Color property. Applies to items with Office 2007 style only.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(false), DefaultValue(""), Category("Appearance")]
+        [Description("Indicates custom color table name for the button when Office 2007 style is used.")]
+        public string CustomColorName
+        {
+            get { return (_ButtonX.CustomColorName); }
+            set { _ButtonX.CustomColorName = value; }
+        }
+
+        #endregion
+
+        #region DisabledImage
+
+        /// <summary>
+        /// Specifies the image for the button when items Enabled property is set to false.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), DefaultValue(null), Category("Appearance")]
+        [Description("The image that will be displayed when item is disabled.")]
+        public Image DisabledImage
+        {
+            get { return (_ButtonX.DisabledImage); }
+            set { _ButtonX.DisabledImage = value; }
+        }
+
+        #endregion
+
+        #region EnableMarkup
+
+        /// <summary>
+        /// Gets or sets whether text-markup support is enabled for items Text property. Default value is true.
+        /// Set this property to false to display HTML or other markup in the item instead of it being parsed as text-markup.
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Appearance")]
+        [Description("Indicates whether text-markup support is enabled for items Text property.")]
+        public bool EnableMarkup
+        {
+            get { return (_ButtonX.EnableMarkup); }
+            set { _ButtonX.EnableMarkup = value; }
+        }
+
+        #endregion
+
+        #region Enabled
+
+        /// <summary>
+        /// Gets or sets whether the control can respond to user interaction
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Behavior")]
+        [Description("Indicates whether the control can respond to user interaction.")]
+        public bool Enabled
+        {
+            get { return (_ButtonX.Enabled); }
+            set { _ButtonX.Enabled = value; }
+        }
+
+        #endregion
+
+        #region HotTrackingStyle
+
+        /// <summary>
+        /// Indicates the way button is rendering the mouse over state. Setting the value to
+        /// Color will render the image in gray-scale when mouse is not over the item.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), DefaultValue(eHotTrackingStyle.Default), Category("Appearance")]
+        [Description("Indicates the button mouse over tracking style. Setting the value to Color will render the image in gray-scale when mouse is not over the item.")]
+        public eHotTrackingStyle HotTrackingStyle
+        {
+            get { return (_ButtonX.HotTrackingStyle); }
+            set { _ButtonX.HotTrackingStyle = value; }
+        }
+
+        #endregion
+
+        #region HoverImage
+
+        /// <summary>
+        /// Specifies the image for the button when mouse is over the item.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), DefaultValue(null), Category("Appearance")]
+        [Description("The image that will be displayed when mouse hovers over the item.")]
+        public Image HoverImage
+        {
+            get { return (_ButtonX.HoverImage); }
+            set { _ButtonX.HoverImage = value; }
+        }
+
+        #endregion
+
+        #region Image
+
+        /// <summary>
+        /// Specifies the Button image.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), DefaultValue(null), Category("Appearance")]
+        [Description("The image that will be displayed on the face of the button.")]
+        public Image Image
+        {
+            get { return (_ButtonX.Image); }
+            set { _ButtonX.Image = value; }
+        }
+
+        #endregion
+
+        #region ImageFixedSize
+
+        /// <summary>
+        /// Sets fixed size of the image. Image will be scaled and painted it size specified.
+        /// </summary>
+        [Browsable(true)]
+        public Size ImageFixedSize
+        {
+            get { return (_ButtonX.ImageFixedSize); }
+            set { _ButtonX.ImageFixedSize = value; }
+        }
+
+        /// <summary>
+        /// Gets whether ImageFixedSize property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeImageFixedSize()
+        {
+            return (_ButtonX.ShouldSerializeImageFixedSize());
+        }
+
+        #endregion
+
+        #region ImagePosition
+
+        /// <summary>
+        /// Gets/Sets the image position inside the button.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), DefaultValue(eImagePosition.Left), Category("Appearance")]
+        [Description("The alignment of the image in relation to text displayed by this item.")]
+        public eImagePosition ImagePosition
+        {
+            get { return (_ButtonX.ImagePosition); }
+            set { _ButtonX.ImagePosition = value; }
+        }
+
+        #endregion
+
+        #region ImageTextSpacing
+
+        /// <summary>
+        /// Gets or sets the amount of spacing between button image if specified and text.
+        /// </summary>
+        [Browsable(true), DefaultValue(0), Category("Layout")]
+        [Description("Indicates amount of spacing between button image if specified and text.")]
+        public int ImageTextSpacing
+        {
+            get { return (_ButtonX.ImageTextSpacing); }
+            set { _ButtonX.ImageTextSpacing = value; }
+
+        }
+
+        #endregion
+
+        #region PopupSide
+
+        /// <summary>
+        /// Gets or sets the location of popup in relation to it's parent.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(false), DefaultValue(ePopupSide.Default)]
+        [Description("Indicates location of popup in relation to it's parent.")]
+        public ePopupSide PopupSide
+        {
+            get { return (_ButtonX.PopupSide); }
+            set { _ButtonX.PopupSide = value; }
+        }
+
+        #endregion
+
+        #region PressedImage
+
+        /// <summary>
+        /// Specifies the image for the button when mouse left button is pressed.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), DefaultValue(null), Category("Appearance")]
+        [Description("The image that will be displayed when item is pressed.")]
+        public Image PressedImage
+        {
+            get { return (_ButtonX.PressedImage); }
+            set { _ButtonX.PressedImage = value; }
+        }
+
+        #endregion
+
+        #region Shape
+
+        /// <summary>
+        /// Gets or sets an shape descriptor for the button
+        /// which describes the shape of the button. Default value is null
+        /// which indicates that system default shape is used.
+        /// </summary>
+        [DefaultValue(null)]
+        [Editor("DevComponents.DotNetBar.Design.ShapeTypeEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(UITypeEditor))]
+        [TypeConverter("DevComponents.DotNetBar.Design.ShapeStringConverter, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+        public ShapeDescriptor Shape
+        {
+            get { return (_ButtonX.Shape); }
+            set { _ButtonX.Shape = value; }
+        }
+
+        #endregion
+
+        #region ShowSubItems
+
+        /// <summary>
+        /// Gets or sets whether button displays the expand part that indicates that button has popup.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), DefaultValue(true), Category("Behavior")]
+        [Description("Determines whether sub-items are displayed.")]
+        public bool ShowSubItems
+        {
+            get { return (_ButtonX.ShowSubItems); }
+            set { _ButtonX.ShowSubItems = value; }
+        }
+
+        #endregion
+
+        #region SplitButton
+
+        /// <summary>
+        /// Gets or sets whether button appears as split button. Split button appearance
+        /// divides button into two parts. Image which raises the click event when clicked
+        /// and text and expand sign which shows button sub items on popup menu when clicked.
+        /// Button must have both text and image visible (ButtonStyle property) in order to
+        /// appear as a full split button.
+        /// </summary>
+        [Browsable(true), DefaultValue(false), Category("Appearance")]
+        [Description("Indicates whether button appears as split button.")]
+        public bool SplitButton
+        {
+            get { return (_ButtonX.SplitButton); }
+            set { _ButtonX.SplitButton = value; }
+        }
+
+        #endregion
+
+        #region Style
+
+        /// <summary>
+        /// Gets/Sets the visual style for the button.
+        /// </summary>
+        [Category("Appearance"), Description("Specifies the visual style of the button.")]
+        [DefaultValue(eDotNetBarStyle.Office2007)]
+        public eDotNetBarStyle Style
+        {
+            get { return (_ButtonX.Style); }
+            set { _ButtonX.Style = value; }
+        }
+
+        #endregion
+
+        #region SubItems
+
+        /// <summary>
+        /// Returns the collection of sub items.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public SubItemsCollection SubItems
+        {
+            get { return (_ButtonX.SubItems); }
+        }
+
+        #endregion
+
+        #region SubItemsExpandWidth
+
+        /// <summary>
+        /// Gets or sets the width of the expand part of the button item.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), DefaultValue(12), Category("Behavior")]
+        [Description("Indicates the width of the expand part of the button item.")]
+        public int SubItemsExpandWidth
+        {
+            get { return (_ButtonX.SubItemsExpandWidth); }
+            set { _ButtonX.SubItemsExpandWidth = value; }
+        }
+
+        #endregion
+
+        #region Text
+
+        /// <summary>
+        /// Gets or sets the default Text to display on the Button
+        /// </summary>
+        [Browsable(true), Category("Appearance"), DefaultValue("")]
+        [Description("Indicates the default Text to display on the Button.")]
+        public new string Text
+        {
+            get
+            {
+                return (_InCellCallBack == true ?
+                    _ButtonX.Text : base.Text);
+            }
+
+            set
+            {
+                if (_InCellCallBack == true)
+                    _ButtonX.Text = value;
+                else
+                    base.Text = value;
+            }
+        }
+
+        #endregion
+
+        #region TextAlignment
+
+        /// <summary>
+        /// Gets or sets the text alignment. Applies only when button text is not composed using text markup. Default value is center.
+        /// </summary>
+        [Browsable(true), DefaultValue(eButtonTextAlignment.Center), Category("Appearance")]
+        [Description("Indicates text alignment. Applies only when button text is not composed using text markup. Default value is center.")]
+        public eButtonTextAlignment TextAlignment
+        {
+            get { return (_ButtonX.TextAlignment); }
+            set { _ButtonX.TextAlignment = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region HookEvents
+
+        /// <summary>
+        /// Hooks or unhooks our system events
+        /// </summary>
+        /// <param name="hook"></param>
+        private void HookEvents(bool hook)
+        {
+            if (hook == true)
+            {
+                _ButtonX.ButtonItem.Click += ButtonItem_Click;
+                _ButtonX.ButtonItem.ExpandChange += ButtonItem_ExpandChange;
+            }
+            else
+            {
+                _ButtonX.ButtonItem.Click -= ButtonItem_Click;
+                _ButtonX.ButtonItem.ExpandChange -= ButtonItem_ExpandChange;
+            }
+        }
+
+        #endregion
+
+        #region Event processing
+
+        #region ButtonItem_ExpandChange
+
+        /// <summary>
+        /// Processes Button expand changes
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void ButtonItem_ExpandChange(object sender, EventArgs e)
+        {
+            if (_ButtonX.ButtonItem.Expanded == false)
+            {
+                DataGridView.InvalidateCell(Index, ActiveRowIndex);
+
+                _ExpandClosed = (_ActiveRowIndex == _CurrentRowIndex);
+                _ActiveRowIndex = -1;
+
+                if (_CurrentRowIndex >= 0)
+                {
+                    DataGridViewButtonXCell cell =
+                        DataGridView.Rows[_CurrentRowIndex].Cells[Index] as DataGridViewButtonXCell;
+
+                    if (cell != null)
+                        cell.DoMouseEnter(_CurrentRowIndex);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ButtonItem_Click
+
+        /// <summary>
+        /// ButtonItem_Click
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void ButtonItem_Click(object sender, EventArgs e)
+        {
+            if (Click != null)
+                Click(sender, e);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetCellBitmap
+
+        /// <summary>
+        /// Gets the cell paint bitmap
+        /// </summary>
+        /// <param name="cellBounds"></param>
+        /// <returns></returns>
+        internal Bitmap GetCellBitmap(Rectangle cellBounds)
+        {
+            if (_CellBitmap == null ||
+                (_CellBitmap.Width != cellBounds.Width || _CellBitmap.Height < cellBounds.Height))
+            {
+                if (_CellBitmap != null)
+                    _CellBitmap.Dispose();
+
+                _CellBitmap = new Bitmap(cellBounds.Width, cellBounds.Height);
+            }
+
+            return (_CellBitmap);
+        }
+
+        #endregion
+
+        #region OnBeforeCellPaint
+
+        /// <summary>
+        /// Invokes BeforeCellPaint user events
+        /// </summary>
+        /// <param name="rowIndex">Row index</param>
+        /// <param name="columnIndex">Column index</param>
+        internal void OnBeforeCellPaint(int rowIndex, int columnIndex)
+        {
+            if (BeforeCellPaint != null)
+                BeforeCellPaint(this, new BeforeCellPaintEventArgs(rowIndex, columnIndex));
+        }
+
+        #endregion
+
+        #region ICloneable members
+
+        /// <summary>
+        /// Clones the ButtonX Column
+        /// </summary>
+        /// <returns></returns>
+        public override object Clone()
+        {
+            DataGridViewButtonXColumn bc = base.Clone() as DataGridViewButtonXColumn;
+
+            if (bc != null)
+            {
+                _ButtonX.ButtonItem.InternalCopyToItem(bc.ButtonX.ButtonItem);
+
+                bc.Enabled = Enabled;
+                bc.TextAlignment = TextAlignment;
+                bc.ImageTextSpacing = ImageTextSpacing;
+
+                bc.Shape = Shape;
+            }
+
+            return (bc);
+        }
+
+        #endregion
+
+        #region IDataGridViewColumn Members
+
+        /// <summary>
+        /// Gets the Cell paint setting for the ButtonX control
+        /// </summary>
+        [Browsable(false)]
+        public bool OwnerPaintCell
+        {
+            get { return (true); }
+        }
+
+        #endregion
+
+        #region Dispose
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        /// <param name="disposing"></param>
+        protected override void Dispose(bool disposing)
+        {
+            HookEvents(false);
+
+            if (disposing == true)
+                _ButtonX.Dispose();
+
+            if (_CellBitmap != null)
+            {
+                _CellBitmap.Dispose();
+                _CellBitmap = null;
+            }
+
+            base.Dispose(disposing);
+        }
+
+        #endregion
+    }
+
+    #region BeforeCellPaintEventArgs
+
+    /// <summary>
+    /// BeforeCellPaintEventArgs
+    /// </summary>
+    public class BeforeCellPaintEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private int _RowIndex;
+        private int _ColumnIndex;
+
+        #endregion
+
+        public BeforeCellPaintEventArgs(int rowIndex, int columnIndex)
+        {
+            _RowIndex = rowIndex;
+            _ColumnIndex = columnIndex;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// RowIndex of cell being painted
+        /// </summary>
+        public int RowIndex
+        {
+            get { return (_RowIndex); }
+        }
+
+        /// <summary>
+        /// ColumnIndex of cell being painted
+        /// </summary>
+        public int ColumnIndex
+        {
+            get { return (_ColumnIndex); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewCheckBoxX/DataGridViewCheckBoxXCell.cs b/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewCheckBoxX/DataGridViewCheckBoxXCell.cs
new file mode 100644
index 00000000..d78e8aba
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewCheckBoxX/DataGridViewCheckBoxXCell.cs	
@@ -0,0 +1,696 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    public class DataGridViewCheckBoxXCell : DataGridViewCell
+    {
+        #region Private variables
+
+        private bool _MouseEntered;
+        private string _Text;
+
+        #endregion
+
+        #region Public properties
+
+        #region EditType
+
+        /// <summary>
+        /// Gets the Type of the editing control associated with the cell
+        /// </summary>
+        public override Type EditType
+        {
+            get { return (null); }
+        }
+
+        #endregion
+
+        #region FormattedValueType
+
+        /// <summary>
+        /// FormattedValueType
+        /// </summary>
+        public override Type FormattedValueType
+        {
+            get { return (typeof(string)); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetAdjustedEditingControlBounds
+
+        /// <summary>
+        /// GetAdjustedEditingControlBounds
+        /// </summary>
+        /// <param name="editingControlBounds"></param>
+        /// <param name="cellStyle"></param>
+        /// <returns></returns>
+        private Rectangle GetAdjustedEditingControlBounds(
+            Rectangle editingControlBounds, DataGridViewCellStyle cellStyle)
+        {
+            // Add a 1 pixel padding around the editing control
+
+            editingControlBounds.X += 1;
+            editingControlBounds.Y += 1;
+            editingControlBounds.Width = Math.Max(0, editingControlBounds.Width - 2);
+            editingControlBounds.Height = Math.Max(0, editingControlBounds.Height - 2);
+
+            // Adjust the vertical location of the editing control
+
+            Rectangle r = GetContentBounds(editingControlBounds);
+
+            if (cellStyle != null)
+            {
+                switch (cellStyle.Alignment)
+                {
+                    case DataGridViewContentAlignment.TopCenter:
+                        editingControlBounds.X += (editingControlBounds.Width - r.Width) / 2;
+                        break;
+
+                    case DataGridViewContentAlignment.TopRight:
+                        editingControlBounds.X = (editingControlBounds.Right - r.Width);
+                        break;
+
+                    case DataGridViewContentAlignment.MiddleLeft:
+                        editingControlBounds.Y += (editingControlBounds.Height - r.Height) / 2;
+                        break;
+
+                    case DataGridViewContentAlignment.MiddleCenter:
+                        editingControlBounds.X += (editingControlBounds.Width - r.Width) / 2;
+                        editingControlBounds.Y += (editingControlBounds.Height - r.Height) / 2;
+                        break;
+
+                    case DataGridViewContentAlignment.MiddleRight:
+                        editingControlBounds.X = (editingControlBounds.Right - r.Width);
+                        editingControlBounds.Y += (editingControlBounds.Height - r.Height) / 2;
+                        break;
+
+                    case DataGridViewContentAlignment.BottomLeft:
+                        editingControlBounds.Y += (editingControlBounds.Height - r.Height);
+                        break;
+
+                    case DataGridViewContentAlignment.BottomCenter:
+                        editingControlBounds.X += (editingControlBounds.Width - r.Width) / 2;
+                        editingControlBounds.Y += (editingControlBounds.Height - r.Height);
+                        break;
+
+                    case DataGridViewContentAlignment.BottomRight:
+                        editingControlBounds.X = (editingControlBounds.Right - r.Width);
+                        editingControlBounds.Y += (editingControlBounds.Height - r.Height);
+                        break;
+                }
+            }
+
+            if (editingControlBounds.Y < 1)
+                editingControlBounds.Y = 1;
+
+            editingControlBounds.Width = Math.Max(1, editingControlBounds.Width);
+            editingControlBounds.Height = Math.Max(1, r.Height);
+
+            return (editingControlBounds);
+        }
+
+        #endregion
+
+        #region GetPreferredSize
+
+        #region GetPreferredSize
+
+        /// <summary>
+        /// GetPreferredSize
+        /// </summary>
+        /// <param name="graphics"></param>
+        /// <param name="cellStyle"></param>
+        /// <param name="rowIndex"></param>
+        /// <param name="constraintSize"></param>
+        /// <returns></returns>
+        protected override Size GetPreferredSize(Graphics graphics,
+               DataGridViewCellStyle cellStyle, int rowIndex, Size constraintSize)
+        {
+            if (DataGridView == null)
+                return (new Size(-1, -1));
+
+            Size preferredSize = Size.Empty;
+
+            if (constraintSize.Width == 0)
+            {
+                DataGridViewCheckBoxXColumn oc = OwningColumn as DataGridViewCheckBoxXColumn;
+
+                if (oc != null)
+                {
+                    GetFormattedValue(GetValue(rowIndex), rowIndex,
+                                      ref cellStyle, null, null, new DataGridViewDataErrorContexts());
+
+                    if (rowIndex < DataGridView.RowCount)
+                        oc.OnBeforeCellPaint(rowIndex, ColumnIndex);
+
+                    CheckBoxX cb = oc.CheckBoxX;
+
+                    SizeF sf = graphics.MeasureString(cb.Text, cellStyle.Font);
+
+                    preferredSize.Width = (int) sf.Width + 4;
+                    preferredSize.Height = cb.Height;
+
+                    preferredSize.Width += cb.CheckBoxItem.CheckSignSize.Width;
+                }
+            }
+
+            return (preferredSize);
+        }
+
+        #endregion
+
+        #region GetFormattedValue
+
+        protected override object GetFormattedValue(object value, int rowIndex,
+            ref DataGridViewCellStyle cellStyle, TypeConverter valueTypeConverter,
+            TypeConverter formattedValueTypeConverter, DataGridViewDataErrorContexts context)
+        {
+            return (base.GetFormattedValue(value, rowIndex,
+                ref cellStyle, valueTypeConverter, formattedValueTypeConverter, context));
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Paint
+
+        #region Paint
+
+        /// <summary>
+        /// Cell painting
+        /// </summary>
+        /// <param name="graphics"></param>
+        /// <param name="clipBounds"></param>
+        /// <param name="cellBounds"></param>
+        /// <param name="rowIndex"></param>
+        /// <param name="elementState"></param>
+        /// <param name="value"></param>
+        /// <param name="formattedValue"></param>
+        /// <param name="errorText"></param>
+        /// <param name="cellStyle"></param>
+        /// <param name="advancedBorderStyle"></param>
+        /// <param name="paintParts"></param>
+        protected override void Paint(Graphics graphics,
+            Rectangle clipBounds, Rectangle cellBounds, int rowIndex, DataGridViewElementStates elementState,
+            object value, object formattedValue, string errorText, DataGridViewCellStyle cellStyle,
+            DataGridViewAdvancedBorderStyle advancedBorderStyle, DataGridViewPaintParts paintParts)
+        {
+            if (DataGridView != null)
+            {
+                // First paint the borders of the cell
+
+                if (PartsSet(paintParts, DataGridViewPaintParts.Border))
+                    PaintBorder(graphics, clipBounds, cellBounds, cellStyle, advancedBorderStyle);
+
+                // Now paint the background and content
+
+                if (PartsSet(paintParts, DataGridViewPaintParts.Background))
+                {
+                    Rectangle rBk = GetBackBounds(cellBounds, advancedBorderStyle);
+
+                    if (rBk.Height > 0 && rBk.Width > 0)
+                    {
+                        DataGridViewCheckBoxXColumn oc = (DataGridViewCheckBoxXColumn)OwningColumn;
+                        Bitmap bm = oc.GetCellBitmap(cellBounds);
+
+                        if (bm != null)
+                        {
+                            using (Graphics g = Graphics.FromImage(bm))
+                            {
+                                PaintButtonBackground(g, cellStyle, rBk);
+                                PaintButtonContent(cellBounds, rowIndex, value, cellStyle, paintParts, g);
+
+                                graphics.DrawImageUnscaledAndClipped(bm, rBk);
+                            }
+
+                            if ((DataGridView.ShowCellErrors == true) &&
+                                (paintParts & DataGridViewPaintParts.ErrorIcon) == DataGridViewPaintParts.ErrorIcon)
+                            {
+                                base.PaintErrorIcon(graphics, clipBounds, cellBounds, errorText);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region PaintButtonBackground
+
+        /// <summary>
+        /// Paints the Button background
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="cellStyle"></param>
+        /// <param name="rBack"></param>
+        private void PaintButtonBackground(Graphics g,
+            DataGridViewCellStyle cellStyle, Rectangle rBack)
+        {
+            Rectangle r = rBack;
+            r.Location = new Point(0, 0);
+
+            DataGridViewX dx = DataGridView as DataGridViewX;
+
+            if (dx != null && dx.Enabled == true && Selected == true &&
+                dx.PaintEnhancedSelection == true)
+            {
+                Office2007ButtonItemPainter.PaintBackground(g, dx.ButtonStateColorTable,
+                    r, RoundRectangleShapeDescriptor.RectangleShape, false,
+                    false);
+            }
+            else
+            {
+                Color color = (Selected == true)
+                    ? cellStyle.SelectionBackColor : cellStyle.BackColor;
+
+                using (Brush br = new SolidBrush(color))
+                    g.FillRectangle(br, r);
+            }
+        }
+
+        #endregion
+
+        #region PaintButtonContent
+
+        /// <summary>
+        /// Paints the button background and content
+        /// </summary>
+        /// <param name="cellBounds"></param>
+        /// <param name="rowIndex"></param>
+        /// <param name="value"></param>
+        /// <param name="cellStyle"></param>
+        /// <param name="paintParts"></param>
+        /// <param name="g"></param>
+        private void PaintButtonContent(Rectangle cellBounds, int rowIndex, object value,
+             DataGridViewCellStyle cellStyle, DataGridViewPaintParts paintParts, Graphics g)
+        {
+            DataGridViewCheckBoxXColumn oc = (DataGridViewCheckBoxXColumn) OwningColumn;
+            CheckBoxX bx = oc.CheckBoxX;
+
+            string text = bx.Text;
+            bool isChecked = bx.Checked;
+            object checkValue = bx.CheckValue;
+            CheckState checkState = bx.CheckState;
+            bool isMouseOver = bx.CheckBoxItem.IsMouseOver;
+            bool isMouseDown = bx.CheckBoxItem.IsMouseDown;
+
+            GraphicsState gs = g.Save();
+
+            try
+            {
+                oc.InCellCallBack = true;
+
+                cellBounds.X = 0;
+                cellBounds.Y = 0;
+                cellBounds.Width -= (oc.DividerWidth + 1);
+                cellBounds.Height -= 1;
+
+                bx.CheckValue = (oc.ThreeState == true) ? value : GetCheckValue(oc, value);
+
+                bx.Font = cellStyle.Font;
+                bx.ForeColor = cellStyle.ForeColor;
+                bx.BackColor = Selected ? Color.Transparent : cellStyle.BackColor;
+
+                if (rowIndex != oc.ActiveRowIndex)
+                {
+                    bx.CheckBoxItem.IsMouseOver = false;
+                    bx.CheckBoxItem.IsMouseDown = false;
+                }
+
+                if (rowIndex < DataGridView.RowCount)
+                {
+                    bx.Text = text;
+
+                    if (PartsSet(paintParts, DataGridViewPaintParts.ContentForeground))
+                        oc.OnBeforeCellPaint(rowIndex, ColumnIndex);
+                }
+                else
+                {
+                    bx.Text = "";
+                }
+
+                _Text = bx.Text;
+
+                Rectangle r = GetAdjustedEditingControlBounds(cellBounds, cellStyle);
+
+                bx.CallBasePaintBackground = false;
+
+                g.TranslateTransform(r.X, r.Y);
+
+                bx.Bounds = r;
+                bx.RecalcLayout();
+                bx.InternalPaint(new PaintEventArgs(g, Rectangle.Empty));
+            }
+            finally
+            {
+                bx.Text = text;
+
+                if (bx.ThreeState == true)
+                    bx.CheckValue = checkValue;
+
+                bx.Checked = isChecked;
+                bx.CheckState = checkState;
+
+                bx.CheckBoxItem.IsMouseOver = isMouseOver;
+                bx.CheckBoxItem.IsMouseDown = isMouseDown;
+
+                g.Restore(gs);
+
+                oc.InCellCallBack = false;
+            }
+        }
+
+        #region GetCheckValue
+
+        private bool GetCheckValue(DataGridViewCheckBoxXColumn oc, object value)
+        {
+            if (value == null || value == DBNull.Value)
+                return (false);
+
+            Type type = value.GetType();
+
+            if (type == typeof(bool))
+                return ((bool)value);
+
+            if (type == typeof(string))
+            {
+                string s = (string)value;
+
+                if (oc.CheckValueChecked is string && s.Equals(oc.CheckValueChecked))
+                    return (true);
+
+                if (oc.CheckValueUnchecked is string && s.Equals(oc.CheckValueUnchecked))
+                    return (false);
+            }
+            else
+            {
+                int n = Convert.ToInt32(value);
+
+                if (n == 1)
+                    return (true);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region Mouse processing
+
+        #region OnMouseEnter
+
+        /// <summary>
+        /// OnMouseEnter
+        /// </summary>
+        /// <param name="rowIndex"></param>
+        protected override void OnMouseEnter(int rowIndex)
+        {
+            base.OnMouseEnter(rowIndex);
+
+            DataGridViewCheckBoxXColumn oc = OwningColumn as DataGridViewCheckBoxXColumn;
+
+            if (oc != null && DataGridView != null)
+            {
+                _MouseEntered = false;
+
+                oc.ActiveRowIndex = rowIndex;
+                ToolTipText = _Text;
+
+                RefreshCell(ColumnIndex, rowIndex);
+            }
+        }
+
+        #endregion
+
+        #region OnMouseLeave
+
+        /// <summary>
+        /// Processes MouseLeave events
+        /// </summary>
+        /// <param name="rowIndex"></param>
+        protected override void OnMouseLeave(int rowIndex)
+        {
+            base.OnMouseLeave(rowIndex);
+
+            DataGridViewCheckBoxXColumn oc = OwningColumn as DataGridViewCheckBoxXColumn;
+
+            if (oc != null && DataGridView != null)
+            {
+                oc.ActiveRowIndex = -1;
+
+                if (_MouseEntered == true)
+                {
+                    _MouseEntered = false;
+
+                    oc.CheckBoxX.CheckBoxItem.InternalMouseLeave();
+                }
+
+                RefreshCell(ColumnIndex, rowIndex);
+            }
+        }
+
+        #endregion
+
+        #region OnMouseMove
+
+        /// <summary>
+        /// Processes MouseMove events
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnMouseMove(DataGridViewCellMouseEventArgs e)
+        {
+            base.OnMouseMove(e);
+
+            DataGridViewCheckBoxXColumn oc = OwningColumn as DataGridViewCheckBoxXColumn;
+
+            if (oc != null && DataGridView != null)
+            {
+                if (this.ReadOnly == true || oc.ReadOnly == true || DataGridView.ReadOnly == true)
+                    return;
+
+                Rectangle cellBounds = DataGridView.GetCellDisplayRectangle(e.ColumnIndex, e.RowIndex, false);
+
+                cellBounds.X = 0;
+                cellBounds.Y = 0;
+
+                DataGridViewCellStyle cellStyle = DataGridView.Columns[e.ColumnIndex].InheritedStyle;
+
+                Rectangle r = GetAdjustedEditingControlBounds(cellBounds, cellStyle);
+                Point pt = new Point(e.X - r.X, e.Y - r.Y);
+
+                if (oc.CheckBoxX.CheckBoxItem.DisplayRectangle.Contains(pt) == true)
+                {
+                    if (_MouseEntered == false)
+                    {
+                        _MouseEntered = true;
+                        oc.CheckBoxX.CheckBoxItem.InternalMouseEnter();
+                    }
+                }
+                else
+                {
+                    if (_MouseEntered == true)
+                    {
+                        _MouseEntered = false;
+                        oc.CheckBoxX.CheckBoxItem.InternalMouseLeave();
+                    }
+                }
+
+                oc.CheckBoxX.CheckBoxItem.InternalMouseMove(
+                    new MouseEventArgs(e.Button, e.Clicks, pt.X, pt.Y, e.Delta));
+
+                RefreshCell(e.ColumnIndex, e.RowIndex);
+            }
+        }
+
+        #endregion
+
+        #region OnMouseDown
+
+        /// <summary>
+        /// Processes MouseDown events
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnMouseDown(DataGridViewCellMouseEventArgs e)
+        {
+            base.OnMouseDown(e);
+
+            if (_MouseEntered == true)
+            {
+                DataGridViewCheckBoxXColumn oc = OwningColumn as DataGridViewCheckBoxXColumn;
+
+                if (oc != null && !oc.ReadOnly && DataGridView != null)
+                {
+                    oc.DownRowIndex = e.RowIndex;
+
+                    Rectangle cellBounds = DataGridView.GetCellDisplayRectangle(e.ColumnIndex, e.RowIndex, false);
+
+                    cellBounds.X = 0;
+                    cellBounds.Y = 0;
+
+                    DataGridViewCellStyle cellStyle = DataGridView.Columns[e.ColumnIndex].InheritedStyle;
+
+                    Rectangle r = GetAdjustedEditingControlBounds(cellBounds, cellStyle);
+                    Point pt = new Point(e.X - r.X, e.Y - r.Y);
+
+                    if (oc.CheckBoxX.CheckBoxItem.DisplayRectangle.Contains(pt) == true)
+                    {
+                        oc.CheckBoxX.CheckValue = GetValue(e.RowIndex);
+
+                        oc.CheckBoxX.CheckBoxItem.InternalMouseDown(
+                            new MouseEventArgs(e.Button, e.Clicks, pt.X, pt.Y, e.Delta));
+
+                        RefreshCell(e.ColumnIndex, e.RowIndex);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region OnMouseUp
+
+        /// <summary>
+        /// Processes MouseUp events
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnMouseUp(DataGridViewCellMouseEventArgs e)
+        {
+            base.OnMouseUp(e);
+
+            DataGridViewCheckBoxXColumn oc = OwningColumn as DataGridViewCheckBoxXColumn;
+
+            if (oc != null && !oc.ReadOnly && DataGridView != null)
+            {
+                Rectangle cellBounds = DataGridView.GetCellDisplayRectangle(e.ColumnIndex, e.RowIndex, false);
+
+                cellBounds.X = 0;
+                cellBounds.Y = 0;
+
+                DataGridViewCellStyle cellStyle = DataGridView.Columns[e.ColumnIndex].InheritedStyle;
+
+                Rectangle r = GetAdjustedEditingControlBounds(cellBounds, cellStyle);
+                Point pt = new Point(e.X - r.X, e.Y - r.Y);
+
+                oc.CheckBoxX.CheckBoxItem.InternalMouseUp(
+                    new MouseEventArgs(e.Button, e.Clicks, pt.X, pt.Y, e.Delta));
+
+                if (e.RowIndex == oc.DownRowIndex)
+                {
+                    if (r.Contains(e.Location) == true)
+                        Value = oc.CheckBoxX.CheckValue;
+
+                    RefreshCell(e.ColumnIndex, e.RowIndex);
+                }
+
+                oc.DownRowIndex = -1;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region PartsSet
+
+        /// <summary>
+        /// Determines if the given part is set
+        /// </summary>
+        /// <param name="paintParts"></param>
+        /// <param name="parts"></param>
+        /// <returns></returns>
+        private bool PartsSet(DataGridViewPaintParts paintParts, DataGridViewPaintParts parts)
+        {
+            return ((paintParts & parts) == parts);
+        }
+
+        #endregion
+
+        #region GetBackBounds
+
+        /// <summary>
+        /// Gets the background bounds for the given cell
+        /// </summary>
+        /// <param name="cellBounds"></param>
+        /// <param name="advancedBorderStyle"></param>
+        /// <returns></returns>
+        private Rectangle GetBackBounds(
+            Rectangle cellBounds, DataGridViewAdvancedBorderStyle advancedBorderStyle)
+        {
+            DataGridViewCheckBoxXColumn oc = (DataGridViewCheckBoxXColumn)OwningColumn;
+
+            Rectangle r = BorderWidths(advancedBorderStyle);
+
+            cellBounds.Offset(r.X, r.Y);
+            cellBounds.Width -= r.Right;
+            cellBounds.Height -= r.Bottom;
+
+            if (Selected == true)
+                cellBounds.Width += oc.DividerWidth;
+
+            return (cellBounds);
+        }
+
+        #endregion
+
+        #region GetContentBounds
+
+        /// <summary>
+        /// Gets the Content bounds for the given cell
+        /// </summary>
+        /// <param name="cellBounds"></param>
+        /// <returns></returns>
+        private Rectangle GetContentBounds(Rectangle cellBounds)
+        {
+            DataGridViewCheckBoxXColumn oc = OwningColumn as DataGridViewCheckBoxXColumn;
+
+            if (oc != null)
+            {
+                if (oc.CheckBoxX.Parent == null)
+                {
+                    Form form = oc.DataGridView.FindForm();
+
+                    if (form != null)
+                        oc.CheckBoxX.Parent = form;
+                }
+
+                oc.CheckBoxX.CheckBoxItem.RecalcSize();
+
+                cellBounds.Width = Math.Min(oc.CheckBoxX.CheckBoxItem.WidthInternal, cellBounds.Width);
+                cellBounds.Width -= (oc.DividerWidth + 3);
+                cellBounds.Height = oc.CheckBoxX.CheckBoxItem.HeightInternal;
+            }
+
+            return (cellBounds);
+        }
+
+        #endregion
+
+        #region RefreshCell
+
+        /// <summary>
+        /// Initiates the refresh of the cell
+        /// </summary>
+        /// <param name="columnIndex"></param>
+        /// <param name="rowIndex"></param>
+        private void RefreshCell(int columnIndex, int rowIndex)
+        {
+            if (DataGridView != null)
+                DataGridView.InvalidateCell(columnIndex, rowIndex);
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewCheckBoxX/DataGridViewCheckBoxXColumn.cs b/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewCheckBoxX/DataGridViewCheckBoxXColumn.cs
new file mode 100644
index 00000000..c55cc11c
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewCheckBoxX/DataGridViewCheckBoxXColumn.cs	
@@ -0,0 +1,562 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Runtime.InteropServices;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    [ToolboxBitmap(typeof(DataGridViewButtonXColumn), "Controls.CheckBoxX.ico"), ToolboxItem(false), ComVisible(false)]
+    public class DataGridViewCheckBoxXColumn : DataGridViewColumn, IDataGridViewColumn
+    {
+        #region Events
+
+        [Description("Occurs right before a CheckBoxX Cell is painted.")]
+        public event EventHandler<BeforeCellPaintEventArgs> BeforeCellPaint;
+
+        [Description("Occurs when a CheckBoxX Cell is Clicked.")]
+        public event EventHandler<EventArgs> Click;
+
+        [Description("Occurs when a CheckBoxX Cell is DoubleClicked.")]
+        public event EventHandler<EventArgs> DoubleClicked;
+
+        #endregion
+
+        #region Private variables
+
+        private CheckBoxX _CheckBoxX;
+
+        private int _ActiveRowIndex = -1;
+        private int _CurrentRowIndex = -1;
+        private int _DownRowIndex = -1;
+
+        private bool _InCellCallBack;
+
+        private Bitmap _CellBitmap;
+
+        #endregion
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        public DataGridViewCheckBoxXColumn()
+        {
+            CellTemplate = new DataGridViewCheckBoxXCell();
+
+            _CheckBoxX = new CheckBoxX();
+            _CheckBoxX.Visible = false;
+
+            _CheckBoxX.CheckValueChecked = true;
+            _CheckBoxX.CheckValueUnchecked = false;
+
+            HookEvents(true);
+        }
+
+        #region Internal properties
+
+        #region ActiveRowIndex
+
+        /// <summary>
+        /// Gets or sets the active row index
+        /// </summary>
+        internal int ActiveRowIndex
+        {
+            get { return (_ActiveRowIndex); }
+            set { _ActiveRowIndex = value; }
+        }
+
+        #endregion
+
+        #region CheckBoxX
+
+        /// <summary>
+        /// Gets the Control Button
+        /// </summary>
+        internal CheckBoxX CheckBoxX
+        {
+            get { return (_CheckBoxX); }
+        }
+
+        #endregion
+
+        #region CurrentRowIndex
+
+        /// <summary>
+        /// Gets or sets the Current row index
+        /// </summary>
+        internal int CurrentRowIndex
+        {
+            get { return (_CurrentRowIndex); }
+            set { _CurrentRowIndex = value; }
+        }
+
+        #endregion
+
+        #region DownRowIndex
+
+        /// <summary>
+        /// Gets or sets the MouseDown row index
+        /// </summary>
+        internal int DownRowIndex
+        {
+            get { return (_DownRowIndex); }
+            set { _DownRowIndex = value; }
+        }
+
+        #endregion
+
+        #region InCellCallBack
+
+        /// <summary>
+        /// Gets or sets the cell callback state
+        /// </summary>
+        internal bool InCellCallBack
+        {
+            get { return (_InCellCallBack); }
+            set { _InCellCallBack = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Public properties
+
+        #region CheckBoxImageChecked
+        /// <summary>
+        /// Gets or sets the custom image that is displayed instead default check box representation when check box is checked.
+        /// </summary>
+        [DefaultValue(null), Category("CheckBox Images"), Description("Indicates custom image that is displayed instead default check box representation when check box is checked")]
+        public Image CheckBoxImageChecked
+        {
+            get { return _CheckBoxX.CheckBoxImageChecked; }
+            set
+            {
+                _CheckBoxX.CheckBoxImageChecked = value;
+            }
+        }
+        #endregion
+        #region CheckBoxImageUnChecked
+        /// <summary>
+        /// Gets or sets the custom image that is displayed instead default check box representation when check box is unchecked.
+        /// </summary>
+        [DefaultValue(null), Category("CheckBox Images"), Description("Indicates custom image that is displayed instead default check box representation when check box is unchecked")]
+        public Image CheckBoxImageUnChecked
+        {
+            get { return _CheckBoxX.CheckBoxImageUnChecked; }
+            set
+            {
+                _CheckBoxX.CheckBoxImageUnChecked = value;
+            }
+        }
+        #endregion
+        #region CheckBoxImageIndeterminate
+        /// <summary>
+        /// Gets or sets the custom image that is displayed instead default check box representation when check box is in indeterminate state.
+        /// </summary>
+        [DefaultValue(null), Category("CheckBox Images"), Description("Indicates custom image that is displayed instead default check box representation when check box is in indeterminate state")]
+        public Image CheckBoxImageIndeterminate
+        {
+            get { return _CheckBoxX.CheckBoxImageIndeterminate; }
+            set
+            {
+                _CheckBoxX.CheckBoxImageIndeterminate = value;
+            }
+        }
+        #endregion
+
+        #region CheckBoxPosition
+
+        /// <summary>
+        /// Gets or sets the check box position relative to the text.
+        /// Default value is Left.
+        /// </summary>
+        [Browsable(true), DefaultValue(eCheckBoxPosition.Left), Category("Appearance")]
+        [Description("Indicates the check box position relative to the text.")]
+        public eCheckBoxPosition CheckBoxPosition
+        {
+            get { return (_CheckBoxX.CheckBoxPosition); }
+            set { _CheckBoxX.CheckBoxPosition = value; }
+        }
+
+        #endregion
+
+        #region Checked
+
+        /// <summary>
+        /// Gets or set a value indicating whether the button is in the checked state.
+        /// </summary>
+        [Browsable(false)]
+        public virtual bool Checked
+        {
+            get { return (_CheckBoxX.Checked); }
+            set { _CheckBoxX.Checked = value; }
+        }
+
+        #endregion
+
+        #region CheckState
+
+        /// <summary>
+        /// Specifies the state of the control, that can be
+        /// checked, unchecked, or set to an indeterminate state. 
+        /// </summary>
+        [Browsable(false)]
+        public CheckState CheckState
+        {
+            get { return (_CheckBoxX.CheckState); }
+            set { _CheckBoxX.CheckState = value; }
+        }
+
+        #endregion
+
+        #region CheckValue
+
+        /// <summary>
+        /// CheckValue
+        /// </summary>
+        [Browsable(false)]
+        public object CheckValue
+        {
+            get { return (_CheckBoxX.CheckValue); }
+            set { _CheckBoxX.CheckValue = value; }
+        }
+
+        #endregion
+
+        #region CheckValueChecked
+
+        /// <summary>
+        /// Gets or sets the value that represents the Checked state value of the check
+        /// box when CheckValue property is set to that value. Default value is null.
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Behavior"), TypeConverter(typeof(StringConverter))]
+        [Description("Represents the Checked state value of the check box when CheckValue property is set to that value. Note that in the designer, this value type is always a string.")]
+        public object CheckValueChecked
+        {
+            get { return (_CheckBoxX.CheckValueChecked); }
+            set { _CheckBoxX.CheckValueChecked = value; }
+        }
+
+        #endregion
+
+        #region CheckValueIndeterminate
+
+        /// <summary>
+        /// Gets or sets the value that represents the Indeterminate state of the check
+        /// box when CheckValue property is set to that value. Default value is null.
+        /// </summary>
+        [Browsable(true), DefaultValue(null), Category("Behavior"), TypeConverter(typeof(StringConverter))]
+        [Description("Represents the Indeterminate state value of the check box when CheckValue property is set to that value. Note that in the designer, this value type is always a string.")]
+        public object CheckValueIndeterminate
+        {
+            get { return (_CheckBoxX.CheckValueIndeterminate); }
+            set { _CheckBoxX.CheckValueIndeterminate = value; }
+        }
+
+        #endregion
+
+        #region CheckValueUnchecked
+
+        /// <summary>
+        /// Gets or sets the value that represents the Unchecked state value of check
+        /// box when CheckValue property is set to that value. Default value is 'N'.
+        /// </summary>
+        [Browsable(true), DefaultValue(false), Category("Behavior"), TypeConverter(typeof(StringConverter))]
+        [Description("Represents the Unchecked state value of the check box when CheckValue property is set to that value.  Note that in the designer, this value type is always a string.")]
+        public object CheckValueUnchecked
+        {
+            get { return (_CheckBoxX.CheckValueUnchecked); }
+            set { _CheckBoxX.CheckValueUnchecked = value; }
+        }
+
+        #endregion
+
+        #region ConsiderEmptyStringAsNull
+
+        /// <summary>
+        /// Gets or sets whether empty string is consider as null value
+        /// during CheckValue value comparison. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Browsable(true)]
+        [Description("Indicates whether empty string is consider as null value during CheckValue value comparison.")]
+        public bool ConsiderEmptyStringAsNull
+        {
+            get { return (_CheckBoxX.ConsiderEmptyStringAsNull); }
+            set { _CheckBoxX.ConsiderEmptyStringAsNull = value; }
+        }
+
+        #endregion
+
+        #region Enabled
+
+        /// <summary>
+        /// Gets or sets whether the control can respond to user interaction
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Behavior")]
+        [Description("Indicates whether the control can respond to user interaction.")]
+        public bool Enabled
+        {
+            get { return (_CheckBoxX.Enabled); }
+            set { _CheckBoxX.Enabled = value; }
+        }
+
+        #endregion
+
+        #region EnableMarkup
+
+        /// <summary>
+        /// Gets or sets whether text-markup support is enabled for controls
+        /// Text property. Default value is true. Set this property to false to
+        /// display HTML or other markup in the control instead of it being parsed as text-markup.
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Appearance")]
+        [Description("Indicates whether text-markup support is enabled for controls Text property.")]
+        public bool EnableMarkup
+        {
+            get { return (_CheckBoxX.EnableMarkup); }
+            set { _CheckBoxX.EnableMarkup = value; }
+        }
+
+        #endregion
+
+        #region Text
+
+        /// <summary>
+        /// Gets or sets the default Text to display
+        /// </summary>
+        [Browsable(true), Category("Appearance"), DefaultValue("")]
+        [Description("Indicates the default Text to display.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
+        public string Text
+        {
+            get { return (_CheckBoxX.Text); }
+            set { _CheckBoxX.Text = value; }
+        }
+
+        #endregion
+
+        #region TextColor
+
+        /// <summary>
+        /// Gets or sets the text color. Default value is
+        /// Color.Empty which indicates that default color is used.
+        /// </summary>
+        [Browsable(true), Category("Appearance")]
+        [Description("Indicates control text color.")]
+        public Color TextColor
+        {
+            get { return (_CheckBoxX.TextColor); }
+            set { _CheckBoxX.TextColor = value; }
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeTextColor()
+        {
+            return (_CheckBoxX.TextColor.IsEmpty == false);
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetTextColor()
+        {
+            TextColor = Color.Empty;
+        }
+
+        #endregion
+
+        #region TextVisible
+
+        /// <summary>
+        /// Gets or sets whether text assigned to the check box is visible.
+        /// Default value is true.
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Appearance")]
+        [Description("Indicates whether text assigned to the check box is visible.")]
+        public bool TextVisible
+        {
+            get { return (_CheckBoxX.TextVisible); }
+            set { _CheckBoxX.TextVisible = value; }
+        }
+
+        #endregion
+
+        #region ThreeState
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the CheckBox will allow
+        /// three check states rather than two. If the ThreeState property is
+        /// set to true  CheckState property should be used instead of Checked
+        /// property to set the extended state of the control.
+        /// </summary>
+        [Browsable(true), Category("Behavior"), DefaultValue(false)]
+        [Description("Indicates whether the CheckBox will allow three check states rather than two.")]
+        public bool ThreeState
+        {
+            get { return (_CheckBoxX.ThreeState); }
+            set { _CheckBoxX.ThreeState = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region HookEvents
+
+        /// <summary>
+        /// HookEvents
+        /// </summary>
+        /// <param name="hook"></param>
+        private void HookEvents(bool hook)
+        {
+            if (hook == true)
+            {
+                _CheckBoxX.CheckBoxItem.Click += CheckBoxItem_Click;
+                _CheckBoxX.CheckBoxItem.DoubleClick += CheckBoxItem_DoubleClick;
+            }
+            else
+            {
+                _CheckBoxX.CheckBoxItem.Click -= CheckBoxItem_Click;
+                _CheckBoxX.CheckBoxItem.DoubleClick -= CheckBoxItem_DoubleClick;
+            }
+        }
+
+        #endregion
+
+        #region Event processing
+
+        #region CheckBoxItem_Click
+
+        /// <summary>
+        /// CheckBoxItem_Click
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void CheckBoxItem_Click(object sender, EventArgs e)
+        {
+            if (Click != null)
+                Click(sender, e);
+        }
+
+        #endregion
+
+        #region CheckBoxItem_DoubleClick
+
+        /// <summary>
+        /// CheckBoxItem_DoubleClick
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void CheckBoxItem_DoubleClick(object sender, EventArgs e)
+        {
+            if (DoubleClicked != null)
+                DoubleClicked(sender, e);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetCellBitmap
+
+        /// <summary>
+        /// Gets the cell paint bitmap
+        /// </summary>
+        /// <param name="cellBounds"></param>
+        /// <returns></returns>
+        internal Bitmap GetCellBitmap(Rectangle cellBounds)
+        {
+            if (_CellBitmap == null ||
+                (_CellBitmap.Width != cellBounds.Width || _CellBitmap.Height < cellBounds.Height))
+            {
+                if (_CellBitmap != null)
+                    _CellBitmap.Dispose();
+
+                _CellBitmap = new Bitmap(cellBounds.Width, cellBounds.Height);
+            }
+
+            return (_CellBitmap);
+        }
+
+        #endregion
+
+        #region OnBeforeCellPaint
+
+        /// <summary>
+        /// Invokes BeforeCellPaint user events
+        /// </summary>
+        /// <param name="rowIndex">Row index</param>
+        /// <param name="columnIndex">Column index</param>
+        internal void OnBeforeCellPaint(int rowIndex, int columnIndex)
+        {
+            if (BeforeCellPaint != null)
+                BeforeCellPaint(this, new BeforeCellPaintEventArgs(rowIndex, columnIndex));
+        }
+
+        #endregion
+
+        #region ICloneable members
+
+        /// <summary>
+        /// Clones the ButtonX Column
+        /// </summary>
+        /// <returns></returns>
+        public override object Clone()
+        {
+            DataGridViewCheckBoxXColumn cb = base.Clone() as DataGridViewCheckBoxXColumn;
+
+            if (cb != null)
+            {
+                _CheckBoxX.CheckBoxItem.InternalCopyToItem(cb.CheckBoxX.CheckBoxItem);
+
+                cb.CheckValue = CheckValue;
+                cb.CheckValueChecked = CheckValueChecked;
+                cb.CheckValueIndeterminate = CheckValueIndeterminate;
+                cb.CheckValueUnchecked = CheckValueUnchecked;
+                cb.ConsiderEmptyStringAsNull = ConsiderEmptyStringAsNull;
+                cb.Enabled = Enabled;
+                cb.Text = Text;
+            }
+
+            return (cb);
+        }
+
+        #endregion
+
+        #region IDataGridViewColumn Members
+
+        /// <summary>
+        /// Gets the Cell paint setting for the ButtonX control
+        /// </summary>
+        [Browsable(false)]
+        public bool OwnerPaintCell
+        {
+            get { return (true); }
+        }
+
+        #endregion
+
+        #region Dispose
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        /// <param name="disposing"></param>
+        protected override void Dispose(bool disposing)
+        {
+            HookEvents(false);
+
+            if (disposing == true)
+                _CheckBoxX.Dispose();
+
+            if (_CellBitmap != null)
+            {
+                _CellBitmap.Dispose();
+                _CellBitmap = null;
+            }
+
+            base.Dispose(disposing);
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewComboBoxEx/DataGridViewComboBoxExCell.cs b/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewComboBoxEx/DataGridViewComboBoxExCell.cs
new file mode 100644
index 00000000..0cc6f5db
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewComboBoxEx/DataGridViewComboBoxExCell.cs	
@@ -0,0 +1,895 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    public class DataGridViewComboBoxExCell : DataGridViewTextBoxCell
+    {
+        #region Public properties
+
+        #region EditType
+
+        /// <summary>
+        /// Gets the Type of the editing control associated with the cell
+        /// </summary>
+        public override Type EditType
+        {
+            get { return (typeof(DataGridViewComboBoxExEditingControl)); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InitializeEditingControl
+
+        /// <summary>
+        /// InitializeEditingControl
+        /// </summary>
+        /// <param name="rowIndex"></param>
+        /// <param name="initialFormattedValue"></param>
+        /// <param name="dataGridViewCellStyle"></param>
+        public override void InitializeEditingControl(int rowIndex,
+            object initialFormattedValue, DataGridViewCellStyle dataGridViewCellStyle)
+        {
+            DetachEditingControl();
+
+            base.InitializeEditingControl(rowIndex, initialFormattedValue, dataGridViewCellStyle);
+
+            DataGridViewComboBoxExEditingControl ctl =
+                (DataGridViewComboBoxExEditingControl) DataGridView.EditingControl;
+
+            DataGridViewComboBoxExColumn oc = (DataGridViewComboBoxExColumn) OwningColumn;
+            ComboBoxEx cb = oc.ComboBoxEx;
+
+            ctl.DropDownStyle = cb.DropDownStyle;
+            ctl.AutoCompleteCustomSource = cb.AutoCompleteCustomSource;
+            ctl.AutoCompleteMode = cb.AutoCompleteMode;
+            ctl.AutoCompleteSource = cb.AutoCompleteSource;
+            ctl.DrawMode = cb.DrawMode;
+            ctl.DropDownHeight = cb.DropDownHeight;
+            ctl.Enabled = cb.Enabled;
+            ctl.FlatStyle = cb.FlatStyle;
+            ctl.FocusCuesEnabled = cb.FocusCuesEnabled;
+            ctl.FormatString = cb.FormatString;
+            ctl.FormattingEnabled = cb.FormattingEnabled;
+            ctl.Images = cb.Images;
+            ctl.ImeMode = cb.ImeMode;
+            ctl.IntegralHeight = cb.IntegralHeight;
+            ctl.IsStandalone = cb.IsStandalone;
+            ctl.ItemHeight = cb.ItemHeight;
+            ctl.MaxDropDownItems = cb.MaxDropDownItems;
+            ctl.MaxLength = cb.MaxLength;
+            ctl.RenderBorder = cb.RenderBorder;
+            ctl.RightToLeft = cb.RightToLeft;
+            ctl.Style = cb.Style;
+            ctl.WatermarkBehavior = cb.WatermarkBehavior;
+            ctl.WatermarkColor = cb.WatermarkColor;
+            ctl.WatermarkEnabled = cb.WatermarkEnabled;
+            ctl.WatermarkFont = cb.WatermarkFont;
+            ctl.WatermarkText = cb.WatermarkText;
+
+            ctl.DataSource = cb.DataSource;
+
+            if (ctl.DataSource is List<string> == false)
+                ctl.ValueMember = cb.ValueMember;      
+    
+            ctl.DisplayMember = cb.DisplayMember;
+
+            if (ctl.DataSource == null)
+            {
+                object[] items = new object[cb.Items.Count];
+                cb.Items.CopyTo(items, 0);
+
+                ctl.Items.Clear();
+                ctl.Items.AddRange(items);
+
+                ctl.Text = Convert.ToString(initialFormattedValue);
+            }
+            else
+            {
+                object o = GetValue(rowIndex);
+                object value = GetDataSourceValueEx(oc, cb, o);
+
+                if (value == null)
+                {
+                    ctl.SelectedIndex = -1;
+                    ctl.SelectedIndex = -1;
+                }
+                else
+                {
+                    ctl.SelectedItem = value;
+                }
+            }
+
+            ctl.Click += Click;
+            ctl.DrawItem += DrawItem;
+            ctl.DropDownChange += DropDownChange;
+            ctl.MeasureItem += MeasureItem;
+        }
+
+        #endregion
+
+        #region DetachEditingControl
+
+        /// <summary>
+        /// DetachEditingControl
+        /// </summary>
+        public override void DetachEditingControl()
+        {
+            if (DataGridView != null && DataGridView.EditingControl != null)
+            {
+                DataGridViewComboBoxExEditingControl cb =
+                    DataGridView.EditingControl as DataGridViewComboBoxExEditingControl;
+
+                if (cb != null)
+                {
+                    cb.Click -= Click;
+                    cb.DrawItem -= DrawItem;
+                    cb.DropDownChange -= DropDownChange;
+                    cb.MeasureItem -= MeasureItem;
+                }
+            }
+
+            base.DetachEditingControl();
+        }
+
+        #endregion
+
+        #region Event processing
+
+        #region Click
+
+        /// <summary>
+        /// Click
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void Click(object sender, EventArgs e)
+        {
+            ((DataGridViewComboBoxExColumn)OwningColumn).DoComboBoxEx_Click(sender, e);
+        }
+
+        #endregion
+
+        #region DrawItem
+
+        /// <summary>
+        /// DrawItem
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void DrawItem(object sender, DrawItemEventArgs e)
+        {
+            ((DataGridViewComboBoxExColumn)OwningColumn).DoComboBoxEx_DrawItem(sender, e);
+        }
+
+        #endregion
+
+        #region DropDownChange
+
+        /// <summary>
+        /// DropDownChange
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="expanded"></param>
+        void DropDownChange(object sender, bool expanded)
+        {
+            ((DataGridViewComboBoxExColumn)OwningColumn).DoComboBoxEx_DropDownChange(
+                sender, new DropDownChangeEventArgs(RowIndex, ColumnIndex, expanded));
+        }
+
+        #endregion
+
+        #region MeasureItem
+
+        /// <summary>
+        /// MeasureItem
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void MeasureItem(object sender, MeasureItemEventArgs e)
+        {
+            ((DataGridViewComboBoxExColumn)OwningColumn).DoComboBoxEx_MeasureItem(sender, e);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region PositionEditingControl
+
+        /// <summary>
+        /// PositionEditingControl
+        /// </summary>
+        /// <param name="setLocation"></param>
+        /// <param name="setSize"></param>
+        /// <param name="cellBounds"></param>
+        /// <param name="cellClip"></param>
+        /// <param name="cellStyle"></param>
+        /// <param name="singleVerticalBorderAdded"></param>
+        /// <param name="singleHorizontalBorderAdded"></param>
+        /// <param name="isFirstDisplayedColumn"></param>
+        /// <param name="isFirstDisplayedRow"></param>
+        public override void PositionEditingControl(bool setLocation, bool setSize, Rectangle cellBounds,
+            Rectangle cellClip, DataGridViewCellStyle cellStyle, bool singleVerticalBorderAdded,
+            bool singleHorizontalBorderAdded, bool isFirstDisplayedColumn, bool isFirstDisplayedRow)
+        {
+            Rectangle editingControlBounds =
+                PositionEditingPanel(cellBounds, cellClip, cellStyle, singleVerticalBorderAdded,
+                                     singleHorizontalBorderAdded, isFirstDisplayedColumn, isFirstDisplayedRow);
+
+            editingControlBounds = GetAdjustedEditingControlBounds(editingControlBounds, cellStyle);
+
+            DataGridView.EditingControl.Location = new Point(editingControlBounds.X, editingControlBounds.Y);
+            DataGridView.EditingControl.Size = new Size(editingControlBounds.Width, editingControlBounds.Height);
+        }
+
+        #endregion
+
+        #region GetAdjustedEditingControlBounds
+
+        /// <summary>
+        /// GetAdjustedEditingControlBounds
+        /// </summary>
+        /// <param name="editingControlBounds"></param>
+        /// <param name="cellStyle"></param>
+        /// <returns></returns>
+        private Rectangle GetAdjustedEditingControlBounds(
+            Rectangle editingControlBounds, DataGridViewCellStyle cellStyle)
+        {
+            // Add a 1 pixel padding around the editing control
+
+            editingControlBounds.X += 1;
+            editingControlBounds.Y += 1;
+            editingControlBounds.Width = Math.Max(0, editingControlBounds.Width - 2);
+            editingControlBounds.Height = Math.Max(0, editingControlBounds.Height - 2);
+
+            // Adjust the vertical location of the editing control
+
+            Rectangle r = GetCellBounds(editingControlBounds);
+
+            if (r.Height < editingControlBounds.Height)
+            {
+                switch (cellStyle.Alignment)
+                {
+                    case DataGridViewContentAlignment.MiddleLeft:
+                    case DataGridViewContentAlignment.MiddleCenter:
+                    case DataGridViewContentAlignment.MiddleRight:
+                        editingControlBounds.Y += (editingControlBounds.Height - r.Height) / 2;
+                        break;
+
+                    case DataGridViewContentAlignment.BottomLeft:
+                    case DataGridViewContentAlignment.BottomCenter:
+                    case DataGridViewContentAlignment.BottomRight:
+                        editingControlBounds.Y += (editingControlBounds.Height - r.Height);
+                        break;
+                }
+            }
+
+            editingControlBounds.Width = Math.Max(1, editingControlBounds.Width);
+            editingControlBounds.Height = Math.Max(1, r.Height);
+
+            return (editingControlBounds);
+        }
+
+        #endregion
+
+        #region GetPreferredSize
+
+        #region GetPreferredSize
+
+        /// <summary>
+        /// GetPreferredSize
+        /// </summary>
+        /// <param name="graphics"></param>
+        /// <param name="cellStyle"></param>
+        /// <param name="rowIndex"></param>
+        /// <param name="constraintSize"></param>
+        /// <returns></returns>
+        protected override Size GetPreferredSize(Graphics graphics,
+               DataGridViewCellStyle cellStyle, int rowIndex, Size constraintSize)
+        {
+            if (DataGridView == null)
+                return (new Size(-1, -1));
+
+            Size preferredSize = base.GetPreferredSize(graphics, cellStyle, rowIndex, constraintSize);
+
+            DataGridViewComboBoxExColumn oc = OwningColumn as DataGridViewComboBoxExColumn;
+
+            if (oc != null)
+            {
+                ComboBoxEx cb = oc.ComboBoxEx;
+
+                preferredSize.Height = cb.Height;
+
+                if (constraintSize.Width == 0)
+                {
+                    Rectangle r = DataGridView.GetCellDisplayRectangle(ColumnIndex, rowIndex, true);
+                    preferredSize.Width += cb.GetThumbRect(r).Width;
+                }
+            }
+
+            return (preferredSize);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ParseFormattedValue
+
+        /// <summary>
+        /// ParseFormattedValue
+        /// </summary>
+        /// <param name="formattedValue"></param>
+        /// <param name="cellStyle"></param>
+        /// <param name="formattedValueTypeConverter"></param>
+        /// <param name="valueTypeConverter"></param>
+        /// <returns></returns>
+        public override object ParseFormattedValue(object formattedValue,
+            DataGridViewCellStyle cellStyle, TypeConverter formattedValueTypeConverter, TypeConverter valueTypeConverter)
+        {
+            DataGridViewComboBoxExColumn oc = (DataGridViewComboBoxExColumn)OwningColumn;
+            ComboBoxEx di = oc.ComboBoxEx;
+
+            if (di.DataSource != null)
+                return (GetDataSourceValue(oc, di, formattedValue));
+
+            return (base.ParseFormattedValue(formattedValue,
+                cellStyle, formattedValueTypeConverter, valueTypeConverter));
+        }
+
+        #endregion
+
+        #region Paint
+
+        #region Paint
+
+        /// <summary>
+        /// Cell painting
+        /// </summary>
+        /// <param name="graphics"></param>
+        /// <param name="clipBounds"></param>
+        /// <param name="cellBounds"></param>
+        /// <param name="rowIndex"></param>
+        /// <param name="elementState"></param>
+        /// <param name="value"></param>
+        /// <param name="formattedValue"></param>
+        /// <param name="errorText"></param>
+        /// <param name="cellStyle"></param>
+        /// <param name="advancedBorderStyle"></param>
+        /// <param name="paintParts"></param>
+        protected override void Paint(Graphics graphics,
+            Rectangle clipBounds, Rectangle cellBounds, int rowIndex,
+            DataGridViewElementStates elementState, object value, object formattedValue,
+            string errorText, DataGridViewCellStyle cellStyle,
+            DataGridViewAdvancedBorderStyle advancedBorderStyle,
+            DataGridViewPaintParts paintParts)
+        {
+            if (DataGridView != null)
+            {
+                // First paint the borders of the cell
+
+                if (PartsSet(paintParts, DataGridViewPaintParts.Border))
+                    PaintBorder(graphics, clipBounds, cellBounds, cellStyle, advancedBorderStyle);
+
+                // Now paint the background and content
+
+                if (PartsSet(paintParts, DataGridViewPaintParts.Background))
+                {
+                    Rectangle rBk = GetBackBounds(cellBounds, advancedBorderStyle);
+
+                    if (rBk.Height > 0 && rBk.Width > 0)
+                    {
+                        DataGridViewComboBoxExColumn oc = (DataGridViewComboBoxExColumn)OwningColumn;
+                        Bitmap bm = oc.GetCellBitmap(cellBounds);
+
+                        if (bm != null)
+                        {
+                            using (Graphics g = Graphics.FromImage(bm))
+                            {
+                                PaintCellBackground(g, cellStyle, rBk);
+                                PaintCellContent(g, cellBounds, rowIndex, value, cellStyle, paintParts, bm);
+
+                                graphics.DrawImageUnscaledAndClipped(bm, rBk);
+                            }
+
+                            if ((DataGridView.ShowCellErrors == true) &&
+                                (paintParts & DataGridViewPaintParts.ErrorIcon) == DataGridViewPaintParts.ErrorIcon)
+                            {
+                                base.PaintErrorIcon(graphics, clipBounds, cellBounds, errorText);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region PaintCellBackground
+
+        /// <summary>
+        /// Paints the cell background
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="cellStyle"></param>
+        /// <param name="rBack"></param>
+        private void PaintCellBackground(Graphics g,
+            DataGridViewCellStyle cellStyle, Rectangle rBack)
+        {
+            Rectangle r = rBack;
+            r.Location = new Point(0, 0);
+
+            DataGridViewX dx = DataGridView as DataGridViewX;
+
+            if (dx != null && dx.Enabled == true && Selected == true &&
+                dx.PaintEnhancedSelection == true)
+            {
+                Office2007ButtonItemPainter.PaintBackground(g, dx.ButtonStateColorTable,
+                    r, RoundRectangleShapeDescriptor.RectangleShape, false,
+                    false);
+            }
+            else
+            {
+                Color color = (Selected == true)
+                    ? cellStyle.SelectionBackColor : cellStyle.BackColor;
+
+                using (Brush br = new SolidBrush(color))
+                    g.FillRectangle(br, r);
+            }
+        }
+
+        #endregion
+
+        #region PaintCellContent
+
+        private BindingContext _BindingContext = new BindingContext();
+        /// <summary>
+        /// Paints the cell content
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="cellBounds"></param>
+        /// <param name="rowIndex"></param>
+        /// <param name="value"></param>
+        /// <param name="cellStyle"></param>
+        /// <param name="paintParts"></param>
+        /// <param name="bm"></param>
+        private void PaintCellContent(Graphics g, Rectangle cellBounds, int rowIndex, object value,
+            DataGridViewCellStyle cellStyle, DataGridViewPaintParts paintParts, Bitmap bm)
+        {
+            DataGridViewComboBoxExColumn oc = (DataGridViewComboBoxExColumn)OwningColumn;
+            ComboBoxEx di = oc.ComboBoxEx;
+
+            Point ptCurrentCell = DataGridView.CurrentCellAddress;
+            bool cellCurrent = ptCurrentCell.X == ColumnIndex && ptCurrentCell.Y == rowIndex;
+            bool cellEdited = cellCurrent && DataGridView.EditingControl != null;
+
+            // If the cell is in editing mode, there is nothing else to paint
+
+            if (cellEdited == false && rowIndex < DataGridView.RowCount)
+            {
+                if (PartsSet(paintParts, DataGridViewPaintParts.ContentForeground))
+                {
+                    cellBounds.X = 0;
+                    cellBounds.Y = 0;
+                    cellBounds.Width -= (oc.DividerWidth + 1);
+                    cellBounds.Height -= 1;
+
+                    if (di.DataSource == null)
+                    {
+                        di.DisplayMember = "Text";
+                        di.ValueMember = null;
+                    }
+                    else
+                    {
+                        value = GetDataSourceDisplayValue(oc, di, value);
+                        di.BindingContext = _BindingContext;
+                    }
+
+                    di.Font = cellStyle.Font;
+                    di.ForeColor = cellStyle.ForeColor;
+                    di.BackColor = cellStyle.BackColor;
+
+                    string s = (value == Convert.DBNull ||
+                        string.IsNullOrEmpty(Convert.ToString(value))) ? null : Convert.ToString(value);
+                    
+                    oc.OnBeforeCellPaint(rowIndex, ColumnIndex);
+
+                    Rectangle r = GetAdjustedEditingControlBounds(cellBounds, cellStyle);
+
+                    if (oc.DisplayControlForCurrentCellOnly == false)
+                        DrawControl(di, r, bm, g, oc, s);
+                    else
+                        DrawText(di, r, g, s);
+                }
+            }
+        }
+
+        #region DrawControl
+
+        /// <summary>
+        /// DrawControl
+        /// </summary>
+        /// <param name="di"></param>
+        /// <param name="r"></param>
+        /// <param name="bm"></param>
+        /// <param name="g"></param>
+        /// <param name="oc"></param>
+        /// <param name="s"></param>
+        private void DrawControl(ComboBoxEx di, Rectangle r,
+            Bitmap bm, Graphics g, DataGridViewComboBoxExColumn oc, string s)
+        {
+            Rectangle t = di.GetThumbRect(new Rectangle(0, 0, r.Width, r.Height));
+
+            if (t.IsEmpty == false)
+            {
+                // Work around Windows XP and Windows DropDownList 
+                // DrawToBitmap problems
+
+                if (MustRenderVisibleControl(di.DropDownStyle) == true)
+                {
+                    di.Location = oc.DataGridView.Location;
+
+                    if (di.Parent == null)
+                    {
+                        Form form = oc.DataGridView.FindForm();
+
+                        if (form != null)
+                            di.Parent = form;
+                    }
+
+                    di.SendToBack();
+                    di.Visible = true;
+                }
+
+                using (Bitmap bm2 = new Bitmap(bm))
+                {
+                    di.Bounds = r;
+                    di.DrawToBitmap(bm2, r);
+
+                    t.X += r.X;
+                    t.Y += r.Y;
+
+                    g.DrawImage(bm2, t, t, GraphicsUnit.Pixel);
+
+                    if (t.Left < r.Right)
+                        r.Width -= (r.Right - t.Left - 3);
+                }
+
+                di.Visible = false;
+            }
+
+            DrawText(di, r, g, s);
+        }
+
+        #endregion
+
+        #region DrawText
+
+        /// <summary>
+        /// DrawText
+        /// </summary>
+        /// <param name="di"></param>
+        /// <param name="r"></param>
+        /// <param name="g"></param>
+        /// <param name="s"></param>
+        private void DrawText(ComboBoxEx di, Rectangle r, Graphics g, string s)
+        {
+            r.Inflate(-2, 0);
+
+            TextDrawing.DrawString(g, s, di.Font, di.ForeColor, r,
+                eTextFormat.VerticalCenter | eTextFormat.EndEllipsis | eTextFormat.NoPrefix);
+        }
+
+        #endregion
+
+        #region GetDataSource
+
+        #region GetDataSourceDisplayValue
+
+        private object GetDataSourceDisplayValue(
+            DataGridViewComboBoxExColumn oc, ComboBoxEx di, object key)
+        {
+            if (key != null &&
+                string.IsNullOrEmpty(di.ValueMember) == false &&
+                string.IsNullOrEmpty(di.DisplayMember) == false)
+            {
+                CurrencyManager cm = GetCurrencyManager(oc, di);
+
+                if (cm != null)
+                {
+                    string t = key.ToString();
+
+                    for (int i = 0; i < cm.List.Count; i++)
+                    {
+                        if (cm.List[i] is DataRowView)
+                        {
+                            DataRowView drView = (DataRowView) cm.List[i];
+
+                            string s = drView[di.ValueMember].ToString();
+
+                            if (t.Equals(s) == true)
+                                return (drView[di.DisplayMember]);
+                        }
+                        else if (cm.List[i] is string)
+                        {
+                            if (t.Equals(cm.List[i]) == true)
+                                return (key);
+                        }
+                        else
+                        {
+                            object o = cm.List[i];
+                            object value = o.GetType().GetProperty(di.ValueMember).GetValue(o, null);
+
+                            //if (value is string)
+                            {
+                                if (key.Equals(value) == true)
+                                {
+                                    value = o.GetType().GetProperty(di.DisplayMember).GetValue(o, null);
+
+                                    return (value);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
+            return ((key == Convert.DBNull) ? "" : key);
+        }
+
+        #endregion
+
+        #region GetDataSourceValueEx
+
+        private object GetDataSourceValueEx(
+            DataGridViewComboBoxExColumn oc, ComboBoxEx di, object key)
+        {
+            if (key != null &&
+                string.IsNullOrEmpty(di.ValueMember) == false &&
+                string.IsNullOrEmpty(di.DisplayMember) == false)
+            {
+                CurrencyManager cm = GetCurrencyManager(oc, di);
+
+                if (cm != null)
+                {
+                    string t = key.ToString();
+
+                    for (int i = 0; i < cm.List.Count; i++)
+                    {
+                        if (cm.List[i] is DataRowView)
+                        {
+                            DataRowView drView = (DataRowView)cm.List[i];
+
+                            string s = drView[di.ValueMember].ToString();
+
+                            if (t.Equals(s) == true)
+                                return (drView);
+                        }
+                        else if (cm.List[i] is string)
+                        {
+                            if (t.Equals(cm.List[i]) == true)
+                                return (key);
+                        }
+                        else
+                        {
+                            object o = cm.List[i];
+                            object value = o.GetType().GetProperty(di.ValueMember).GetValue(o, null);
+
+                            if (key.Equals(value) == true)
+                                return (o);
+                        }
+                    }
+                }
+            }
+
+            return ((key == Convert.DBNull) ? null : key);
+        }
+
+        #endregion
+
+        #region GetDataSourceValue
+
+        private object GetDataSourceValue(
+            DataGridViewComboBoxExColumn oc, ComboBoxEx di, object key)
+        {
+            if (key != null &&
+                string.IsNullOrEmpty(di.ValueMember) == false &&
+                string.IsNullOrEmpty(di.DisplayMember) == false)
+            {
+                CurrencyManager cm = GetCurrencyManager(oc, di);
+
+                if (cm != null)
+                {
+                    string t = key.ToString();
+
+                    for (int i = 0; i < cm.List.Count; i++)
+                    {
+                        if (cm.List[i] is DataRowView)
+                        {
+                            DataRowView drView = (DataRowView) cm.List[i];
+
+                            string s = drView[di.DisplayMember].ToString();
+
+                            if (t.Equals(s) == true)
+                                return (drView[di.ValueMember]);
+                        }
+                        else if (cm.List[i] is string)
+                        {
+                            if (t.Equals(cm.List[i]) == true)
+                                return (key);
+                        }
+                        else
+                        {
+                            object o = cm.List[i];
+                            object value = o.GetType().GetProperty(di.DisplayMember).GetValue(o, null);
+
+                            if (value is string)
+                            {
+                                if (t.Equals(value) == true)
+                                {
+                                    value = o.GetType().GetProperty(di.ValueMember).GetValue(o, null);
+
+                                    return (value);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
+            return (key);
+        }
+
+        #endregion
+
+        #region GetCurrencyManager
+
+        private CurrencyManager GetCurrencyManager(
+            DataGridViewComboBoxExColumn oc, ComboBoxEx di)
+        {
+            if (oc.CurrencyManager == null)
+            {
+                if (DataGridView != null && DataGridView.BindingContext != null &&
+                    di.DataSource != null && di.DataSource != Convert.DBNull)
+                {
+                    oc.CurrencyManager = (CurrencyManager) DataGridView.BindingContext[di.DataSource];
+                }
+            }
+
+            return (oc.CurrencyManager);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region MustRenderVisibleControl
+
+        /// <summary>
+        /// MustRenderVisibleControl
+        /// </summary>
+        /// <param name="style"></param>
+        /// <returns></returns>
+        private bool MustRenderVisibleControl(ComboBoxStyle style)
+        {
+            if (style == ComboBoxStyle.DropDownList)
+                return (true);
+
+            OperatingSystem osInfo = Environment.OSVersion;
+
+            return (osInfo.Platform == PlatformID.Win32Windows ||
+                (osInfo.Platform == PlatformID.Win32NT && osInfo.Version.Major < 6));
+
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region Mouse support
+
+        #region OnMouseEnter
+
+        /// <summary>
+        /// OnMouseEnter
+        /// </summary>
+        /// <param name="rowIndex"></param>
+        protected override void OnMouseEnter(int rowIndex)
+        {
+            DataGridViewComboBoxExColumn oc = (DataGridViewComboBoxExColumn) OwningColumn;
+            ComboBoxEx di = oc.ComboBoxEx;
+
+            if (DataGridView != null)
+            {
+                if ((uint)RowIndex < DataGridView.Rows.Count)
+                {
+                    if (di.DataSource != null)
+                        this.ToolTipText = Convert.ToString(GetDataSourceDisplayValue(oc, di, Value));
+                    else
+                        this.ToolTipText = Convert.ToString(Value);
+                }
+            }
+
+            base.OnMouseEnter(rowIndex);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetBackBounds
+
+        /// <summary>
+        /// Gets the background bounds for the given cell
+        /// </summary>
+        /// <param name="cellBounds"></param>
+        /// <param name="advancedBorderStyle"></param>
+        /// <returns></returns>
+        private Rectangle GetBackBounds(
+            Rectangle cellBounds, DataGridViewAdvancedBorderStyle advancedBorderStyle)
+        {
+            DataGridViewComboBoxExColumn oc = (DataGridViewComboBoxExColumn)OwningColumn;
+
+            Rectangle r = BorderWidths(advancedBorderStyle);
+
+            cellBounds.Offset(r.X, r.Y);
+            cellBounds.Width -= r.Right;
+            cellBounds.Height -= r.Bottom;
+
+            if (Selected == true)
+                cellBounds.Width += oc.DividerWidth;
+
+            return (cellBounds);
+        }
+
+        #endregion
+
+        #region GetCellBounds
+
+        /// <summary>
+        /// Gets the button bounds for the given cell
+        /// </summary>
+        /// <param name="cellBounds"></param>
+        /// <returns></returns>
+        private Rectangle GetCellBounds(Rectangle cellBounds)
+        {
+            DataGridViewComboBoxExColumn oc = (DataGridViewComboBoxExColumn)OwningColumn;
+
+            Size size = oc.ComboBoxEx.Size;
+
+            cellBounds.Location = new Point(1, 1);
+
+            cellBounds.Width -= oc.DividerWidth;
+            cellBounds.Height = Math.Min(size.Height, cellBounds.Height);
+
+            return (cellBounds);
+        }
+
+        #endregion
+
+        #region PartsSet
+
+        /// <summary>
+        /// Determines if the given part is set
+        /// </summary>
+        /// <param name="paintParts"></param>
+        /// <param name="parts"></param>
+        /// <returns></returns>
+        private bool PartsSet(DataGridViewPaintParts paintParts, DataGridViewPaintParts parts)
+        {
+            return ((paintParts & parts) == parts);
+        }
+
+        #endregion
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewComboBoxEx/DataGridViewComboBoxExColumn.cs b/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewComboBoxEx/DataGridViewComboBoxExColumn.cs
new file mode 100644
index 00000000..5bdf2500
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewComboBoxEx/DataGridViewComboBoxExColumn.cs	
@@ -0,0 +1,954 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Globalization;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    [ToolboxBitmap(typeof(DataGridViewButtonXColumn), "Controls.ComboBoxEx.ico"), ToolboxItem(false), ComVisible(false)]
+    public class DataGridViewComboBoxExColumn : DataGridViewTextBoxColumn, IDataGridViewColumn
+    {
+        #region Events
+
+        /// <summary>
+        /// Occurs right before a ComboBox Cell is painted
+        /// </summary>
+        [Description("Occurs right before a ComboBox Cell is painted.")]
+        public event EventHandler<BeforeCellPaintEventArgs> BeforeCellPaint;
+
+        /// <summary>
+        /// Occurs when the ComboBox is clicked
+        /// </summary>
+        [Description("Occurs when the ComboBox is clicked.")]
+        public event EventHandler<EventArgs> Click;
+
+        /// <summary>
+        /// Occurs when a visual aspect of an owner-drawn ComboBox  changes
+        /// </summary>
+        [Description("Occurs when a visual aspect of an owner-drawn ComboBox  changes.")]
+        public event EventHandler<DrawItemEventArgs> DrawItem;
+
+        /// <summary>
+        /// Occurs when drop down portion of the ComboBox is shown or hidden.
+        /// </summary>
+        [Description("Occurs when drop down portion of the ComboBox is shown or hidden.")]
+        public event EventHandler<DropDownChangeEventArgs> DropDownChange;
+
+        /// <summary>
+        /// Occurs each time an owner-drawn ComboBox item needs
+        /// to be drawn and when the sizes of the list items are determined
+        /// </summary>
+        [Description("Occurs each time an owner-drawn ComboBox item needs to be drawn and when the sizes of the list items are determined.")]
+        public event EventHandler<MeasureItemEventArgs> MeasureItem;
+
+        #endregion
+
+        #region Private variables
+
+        private ComboBoxEx _ComboBoxEx;
+        private Bitmap _CellBitmap;
+        private CurrencyManager _CurrencyManager;
+        private bool _DisplayControlForCurrentCellOnly = true;
+
+        #endregion
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        public DataGridViewComboBoxExColumn()
+        {
+            CellTemplate = new DataGridViewComboBoxExCell();
+
+            _ComboBoxEx = new ComboBoxEx();
+
+            _ComboBoxEx.RenderBorder = false;
+            _ComboBoxEx.Visible = false;
+
+            HookEvents(true);
+        }
+
+        #region Internal properties
+
+        #region ComboBoxEx
+
+        /// <summary>
+        /// Gets the underlying ComboBoxEx control
+        /// </summary>
+        internal ComboBoxEx ComboBoxEx
+        {
+            get { return (_ComboBoxEx); }
+        }
+
+        #endregion
+
+        #region CurrencyManager
+
+        /// <summary>
+        /// Gets or sets the ComboBox CurrencyManager
+        /// </summary>
+        internal CurrencyManager CurrencyManager
+        {
+            get { return (_CurrencyManager); }
+            set { _CurrencyManager = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Public properties
+
+        #region AutoCompleteCustomSource
+
+        /// <summary>
+        /// Gets or sets a custom System.Collections.Specialized.StringCollection
+        /// to use when the AutoCompleteSource  property is set to CustomSource.
+        /// </summary>
+        [Browsable(true), DefaultValue(null)]
+        [Description("Gets or sets a custom Specialized.StringCollection to use when the AutoCompleteSource property is set to CustomSource.")]
+        public AutoCompleteStringCollection AutoCompleteCustomSource
+        {
+            get { return (_ComboBoxEx.AutoCompleteCustomSource); }
+            set { _ComboBoxEx.AutoCompleteCustomSource = value; }
+        }
+
+        #endregion
+
+        #region AutoCompleteMode
+
+        /// <summary>
+        /// Gets or sets an option that controls how automatic completion works for the ComboBox.
+        /// </summary>
+        [Browsable(true), DefaultValue(AutoCompleteMode.None)]
+        [Description("Indicates how automatic completion works for the ComboBox.")]
+        public AutoCompleteMode AutoCompleteMode
+        {
+            get { return (_ComboBoxEx.AutoCompleteMode); }
+            set { _ComboBoxEx.AutoCompleteMode = value; }
+        }
+
+        #endregion
+
+        #region AutoCompleteSource
+
+        /// <summary>
+        /// Gets or sets a value specifying the source of complete strings used for automatic completion.
+        /// </summary>
+        [Browsable(true), DefaultValue(AutoCompleteSource.None)]
+        [Description("Indicates the source of complete strings used for automatic completion.")]
+        public AutoCompleteSource AutoCompleteSource
+        {
+            get { return (_ComboBoxEx.AutoCompleteSource); }
+            set { _ComboBoxEx.AutoCompleteSource = value; }
+        }
+
+        #endregion
+
+        #region DataSource
+
+        /// <summary>
+        /// Gets or sets the data source that populates the selections for the combo box
+        /// </summary>
+        [Browsable(true), Category("Data"), DefaultValue((string)null)]
+        [AttributeProvider(typeof(IListSource))]
+        [Description("Indicates the data source that populates the selections for the combo box.")]
+        public object DataSource
+        {
+            get { return (_ComboBoxEx.DataSource); }
+
+            set
+            {
+                _ComboBoxEx.DataSource = value;
+
+                CurrencyManager = null;
+            }
+        }
+
+        #endregion
+
+        #region DisplayMember
+
+        /// <summary>
+        /// Gets or sets a string that specifies the property or column
+        /// from which to retrieve strings for display in the combo box.
+        /// </summary>
+        [Browsable(true), DefaultValue(""), Category("Data")]
+        [Description("Indicates a string that specifies the property or column from which to retrieve strings for display in the combo box")]
+        [Editor("System.Windows.Forms.Design.DataMemberFieldEditor, System.Design, Version= 2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", typeof(UITypeEditor))]
+        [TypeConverter("System.Windows.Forms.Design.DataMemberFieldConverter, System.Design, Version= 2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
+        public string DisplayMember
+        {
+            get { return (_ComboBoxEx.DisplayMember); }
+            set { _ComboBoxEx.DisplayMember = value; }
+        }
+
+        #endregion
+
+        #region DisplayControlForCurrentCellOnly
+
+        /// <summary>
+        /// Gets or sets whether the control
+        /// will be displayed for the current cell only.
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Appearance")]
+        [Description("Indicates whether the control will be displayed for the current cell only.")]
+        public bool DisplayControlForCurrentCellOnly
+        {
+            get { return (_DisplayControlForCurrentCellOnly); }
+
+            set
+            {
+                if (_DisplayControlForCurrentCellOnly != value)
+                {
+                    _DisplayControlForCurrentCellOnly = value;
+                    _ComboBoxEx.Invalidate();
+                }
+            }
+        }
+
+        #endregion
+
+        #region DrawMode
+
+        /// <summary>
+        /// Gets or sets a value indicating whether user code or 
+        /// operating system code will handle drawing of elements in the list.
+        /// </summary>
+        [Browsable(true), DefaultValue(DrawMode.Normal)]
+        [Description("Indicates whether user code or operating system code will handle drawing of elements in the list.")]
+        public DrawMode DrawMode
+        {
+            get { return (_ComboBoxEx.DrawMode); }
+            set { _ComboBoxEx.DrawMode = value; }
+        }
+
+        #endregion
+
+        #region DropDownStyle
+
+        /// <summary>
+        /// Gets or sets a value specifying the style of the combo box.
+        /// </summary>
+        [Browsable(true), DefaultValue(ComboBoxStyle.DropDown)]
+        [Description("Indicates the style of the combo box.")]
+        public ComboBoxStyle DropDownStyle
+        {
+            get { return (_ComboBoxEx.DropDownStyle); }
+            set { _ComboBoxEx.DropDownStyle = value; }
+        }
+
+        #endregion
+
+        #region DropDownHeight
+
+        /// <summary>
+        /// Gets or sets the height in pixels of the drop-down portion of the ComboBox.
+        /// </summary>
+        [Browsable(true), DefaultValue(100)]
+        [Description("Indicates the height in pixels of the drop-down portion of the ComboBox.")]
+        public int DropDownHeight
+        {
+            get { return (_ComboBoxEx.DropDownHeight); }
+            set { _ComboBoxEx.DropDownHeight = value; }
+        }
+
+        #endregion
+
+        #region DropDownWidth
+
+        /// <summary>
+        /// Gets or sets the width of the drop-down lists of the combo box.
+        /// </summary>
+        [Browsable(true), Category("Behavior"), DefaultValue(1)]
+        [Description("Indicates the width of the drop-down lists of the combo box")]
+        public int DropDownWidth
+        {
+            get { return (_ComboBoxEx.DropDownWidth); }
+            set { _ComboBoxEx.DropDownWidth = value; }
+        }
+
+        #endregion
+
+        #region Enabled
+
+        /// <summary>
+        /// Gets or sets whether the control can respond to user interaction
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Behavior")]
+        [Description("Indicates whether the control can respond to user interaction.")]
+        public bool Enabled
+        {
+            get { return (_ComboBoxEx.Enabled); }
+            set { _ComboBoxEx.Enabled = value; }
+        }
+
+        #endregion
+
+        #region FlatStyle
+
+        /// <summary>
+        /// Gets or sets the flat style appearance of the column's cells.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), DefaultValue(FlatStyle.Standard)]
+        [Description("Indicates the flat style appearance of the column's cells")]
+        public FlatStyle FlatStyle
+        {
+            get { return (_ComboBoxEx.FlatStyle); }
+            set { _ComboBoxEx.FlatStyle = value; }
+        }
+
+        #endregion
+
+        #region FocusCuesEnabled
+
+        /// <summary>
+        /// Gets or sets whether control displays focus cues when focused.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior")]
+        [Description("Indicates whether control displays focus cues when focused.")]
+        public bool FocusCuesEnabled
+        {
+            get { return (_ComboBoxEx.FocusCuesEnabled); }
+            set { _ComboBoxEx.FocusCuesEnabled = value; }
+        }
+
+        #endregion
+
+        #region FormatString
+
+        /// <summary>
+        /// Gets or sets the format-specifier
+        /// characters that indicate how a value is to be displayed.
+        /// </summary>
+        [Browsable(true), DefaultValue("")]
+        [Description("Indicates the format-specifier characters that indicate how a value is to be displayed.")]
+        public string FormatString
+        {
+            get { return (_ComboBoxEx.FormatString); }
+            set { _ComboBoxEx.FormatString = value; }
+        }
+
+        #endregion
+
+        #region FormattingEnabled
+
+        /// <summary>
+        /// Gets or sets a value indicating whether formatting is applied to the DisplayMember property.
+        /// </summary>
+        [Browsable(true), DefaultValue(false)]
+        [Description("Indicates whether formatting is applied to the DisplayMember.")]
+        public bool FormattingEnabled
+        {
+            get { return (_ComboBoxEx.FormattingEnabled); }
+            set { _ComboBoxEx.FormattingEnabled = value; }
+        }
+
+        #endregion
+
+        #region Images
+
+        /// <summary>
+        /// Gets or sets the ImageList control used by Combo box to draw images.
+        /// </summary>
+        [Browsable(true), Category("Behavior"), DefaultValue(null)]
+        [Description("The ImageList control used by Combo box to draw images.")]
+        public ImageList Images
+        {
+            get { return (_ComboBoxEx.Images); }
+            set { _ComboBoxEx.Images = value; }
+        }
+
+        #endregion
+
+        #region ImeMode
+
+        /// <summary>
+        /// Gets or sets the Input Method Editor (IME) mode of the control.
+        /// </summary>
+        [Browsable(true), DefaultValue(ImeMode.Inherit)]
+        [Description("Indicates the Input Method Editor (IME) mode of the control.")]
+        public ImeMode ImeMode
+        {
+            get { return (_ComboBoxEx.ImeMode); }
+            set { _ComboBoxEx.ImeMode = value; }
+        }
+
+        #endregion
+
+        #region IntegralHeight
+
+        /// <summary>
+        /// Gets or sets a value indicating whether
+        /// the control should resize to avoid showing partial items.
+        /// </summary>
+        [Browsable(true), DefaultValue(true)]
+        [Description("Indicates whether the control should resize to avoid showing partial items.")]
+        public bool IntegralHeight
+        {
+            get { return (_ComboBoxEx.IntegralHeight); }
+            set { _ComboBoxEx.IntegralHeight = value; }
+        }
+
+        #endregion
+
+        #region IsStandalone
+
+        /// <summary>
+        /// Gets or sets whether control is stand-alone control.
+        /// Stand-alone flag affects the appearance of the control in Office 2007 style.
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Appearance")]
+        [Description("Indicates the appearance of the control.")]
+        public bool IsStandalone
+        {
+            get { return (_ComboBoxEx.IsStandalone); }
+            set { _ComboBoxEx.IsStandalone = value; }
+        }
+
+        #endregion
+
+        #region ItemHeight
+
+        /// <summary>
+        /// Gets or sets the height of an item in the combo box.
+        /// </summary>
+        [Browsable(true), DefaultValue(12)]
+        [Description("Indicates the height of an item in the combo box.")]
+        public int ItemHeight
+        {
+            get { return (_ComboBoxEx.ItemHeight); }
+            set { _ComboBoxEx.ItemHeight = value; }
+        }
+
+        #endregion
+
+        #region Items
+
+        /// <summary>
+        /// Gets the collection of objects used as selections in the combo box.
+        /// </summary>
+        [Browsable(true), Category("Data")]
+        [Description("Indicates the collection of objects used as selections in the combo box")]
+        [Editor("System.Windows.Forms.Design.StringCollectionEditor, System.Design, Version= 2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", typeof(UITypeEditor))]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ComboBox.ObjectCollection Items
+        {
+            get { return (_ComboBoxEx.Items); }
+        }
+
+        #endregion
+
+        #region MaxDropDownItems
+
+        /// <summary>
+        /// Gets or sets the maximum number of items
+        /// in the drop-down list of the cells in the column.
+        /// </summary>
+        [Browsable(true), DefaultValue(8), Category("Behavior")]
+        [Description("Indicates the maximum number of items in the drop-down list of the cells in the column.")]
+        public int MaxDropDownItems
+        {
+            get { return (_ComboBoxEx.MaxDropDownItems); }
+            set { _ComboBoxEx.MaxDropDownItems = value; }
+        }
+
+        #endregion
+
+        #region MaxLength
+
+        /// <summary>
+        /// Gets or sets the number of characters a user can type into the ComboBox.
+        /// </summary>
+        [Browsable(true), DefaultValue(0)]
+        [Description("Indicates the number of characters a user can type into the ComboBox.")]
+        public int MaxLength
+        {
+            get { return (_ComboBoxEx.MaxLength); }
+            set { _ComboBoxEx.MaxLength = value; }
+        }
+
+        #endregion
+
+        #region RightToLeft
+
+        /// <summary>
+        /// Gets or sets a value indicating whether control's
+        /// elements are aligned to support locales using right-to-left fonts.
+        /// </summary>
+        [Browsable(true), DefaultValue(RightToLeft.Inherit)]
+        [Description("Indicates control's elements are aligned to support locales using right-to-left fonts.")]
+        public RightToLeft RightToLeft
+        {
+            get { return (_ComboBoxEx.RightToLeft); }
+            set { _ComboBoxEx.RightToLeft = value; }
+        }
+
+        #endregion
+
+        #region Sorted
+
+        /// <summary>
+        /// Gets or sets whether the items in the combo box are sorted.
+        /// </summary>
+        [Browsable(true), DefaultValue(false), Category("Behavior")]
+        [Description("Indicates whether the items in the combo box are sorted.")]
+        public bool Sorted
+        {
+            get { return (_ComboBoxEx.Sorted); }
+            set { _ComboBoxEx.Sorted = value; }
+        }
+
+        #endregion
+
+        #region Style
+
+        /// <summary>
+        /// Determines the visual style applied to
+        /// the combo box when shown. Default style is Office 2007.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), DefaultValue(eDotNetBarStyle.Office2007)]
+        [Description("Determines the display of the item when shown.")]
+        public eDotNetBarStyle Style
+        {
+            get { return (_ComboBoxEx.Style); }
+            set { _ComboBoxEx.Style = value; }
+        }
+
+        #endregion
+
+        #region Text
+
+        /// <summary>
+        /// Gets or sets the text associated with this control.
+        /// </summary>
+        [Browsable(true), DefaultValue("")]
+        [Description("Indicates the text associated with this control.")]
+        public string Text
+        {
+            get { return (_ComboBoxEx.Text); }
+            set { _ComboBoxEx.Text = value; }
+        }
+
+        #endregion
+
+        #region ValueMember
+
+        /// <summary>
+        /// Gets or sets a string that specifies the property or column
+        /// from which to get values that correspond to the selections in the drop-down list.
+        /// </summary>
+        [Browsable(true), Category("Data"), DefaultValue("")]
+        [Description("Indicates a string that specifies the property or column from which to get values that correspond to the selections in the drop-down list.")]
+        [Editor("System.Windows.Forms.Design.DataMemberFieldEditor, System.Design, Version= 2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", typeof(UITypeEditor))]
+        [TypeConverter("System.Windows.Forms.Design.DataMemberFieldConverter, System.Design, Version= 2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
+        public string ValueMember
+        {
+            get { return (_ComboBoxEx.ValueMember); }
+            set { _ComboBoxEx.ValueMember = value; }
+        }
+
+        #endregion
+
+        #region WatermarkBehavior
+
+        /// <summary>
+        /// Gets or sets the watermark hiding behaviour. Default value
+        /// indicates that watermark is hidden when control receives input focus.
+        /// </summary>
+        [DefaultValue(eWatermarkBehavior.HideOnFocus), Category("Behavior")]
+        [Description("Indicates watermark hiding behaviour.")]
+        public eWatermarkBehavior WatermarkBehavior
+        {
+            get { return (_ComboBoxEx.WatermarkBehavior); }
+            set { _ComboBoxEx.WatermarkBehavior = value; }
+        }
+
+        #endregion
+
+        #region WatermarkColor
+
+        /// <summary>
+        /// Gets or sets the watermark text color.
+        /// </summary>
+        [Browsable(true), Category("Appearance")]
+        [Description("Indicates watermark text color.")]
+        public Color WatermarkColor
+        {
+            get { return (_ComboBoxEx.WatermarkColor); }
+            set { _ComboBoxEx.WatermarkColor = value; }
+        }
+        /// <summary>
+        /// Indicates whether property should be serialized by Windows Forms designer.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeWatermarkColor()
+        {
+            return (_ComboBoxEx.ShouldSerializeWatermarkColor());
+        }
+        /// <summary>
+        /// Resets the property to default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetWatermarkColor()
+        {
+            _ComboBoxEx.ResetWatermarkColor();
+        }
+
+        #endregion
+
+        #region WatermarkEnabled
+
+        /// <summary>
+        /// Gets or sets whether watermark text is
+        /// displayed when control is empty. Default value is true.
+        /// </summary>
+        [Browsable(true), DefaultValue(true)]
+        [Description("Indicates whether watermark text is displayed when control is empty.")]
+        public virtual bool WatermarkEnabled
+        {
+            get { return (_ComboBoxEx.WatermarkEnabled); }
+            set { _ComboBoxEx.WatermarkEnabled = value; }
+        }
+
+        #endregion
+
+        #region WatermarkFont
+
+        /// <summary>
+        /// Gets or sets the watermark font.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), DefaultValue(null)]
+        [Description("Indicates watermark font.")]
+        public Font WatermarkFont
+        {
+            get { return (_ComboBoxEx.WatermarkFont); }
+            set { _ComboBoxEx.WatermarkFont = value; }
+        }
+
+        #endregion
+
+        #region WatermarkText
+
+        /// <summary>
+        /// Gets or sets the watermark (tip) text displayed inside of the control when Text
+        /// is not set and control does not have input focus. This property supports text-markup.
+        /// Note that WatermarkText is not compatible with the auto-complete feature of .NET Framework 2.0.
+        /// </summary>
+        [Browsable(true), DefaultValue(""), Localizable(true), Category("Appearance")]
+        [Description("Indicates watermark text displayed inside of the control when Text is not set and control does not have input focus.")]
+        [Editor("DevComponents.DotNetBar.Design.TextMarkupUIEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(UITypeEditor))]
+        public string WatermarkText
+        {
+            get { return (_ComboBoxEx.WatermarkText); }
+            set { _ComboBoxEx.WatermarkText = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region HookEvents
+
+        /// <summary>
+        /// HookEvents
+        /// </summary>
+        /// <param name="hook"></param>
+        private void HookEvents(bool hook)
+        {
+            if (hook == true)
+                _ComboBoxEx.DataSourceChanged += ComboBoxEx_DataSourceChanged;
+            else
+                _ComboBoxEx.DataSourceChanged -= ComboBoxEx_DataSourceChanged;
+        }
+
+        #endregion
+
+        #region Event processing
+
+        #region ComboBoxEx_DataSourceChanged
+
+        /// <summary>
+        /// ComboBoxEx_DataSourceChanged
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void ComboBoxEx_DataSourceChanged(object sender, EventArgs e)
+        {
+            _CurrencyManager = null;
+
+            _ComboBoxEx.Items.Clear();
+            _ComboBoxEx.DisplayMember = null;
+            _ComboBoxEx.ValueMember = null;
+        }
+
+        #endregion
+
+        #region DoComboBoxEx_Click
+
+        /// <summary>
+        /// DoComboBoxEx_Click
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        internal void DoComboBoxEx_Click(object sender, EventArgs e)
+        {
+            if (Click != null)
+                Click(sender, e);
+        }
+
+        #endregion
+
+        #region DoComboBoxEx_DrawItem
+
+        /// <summary>
+        /// DoComboBoxEx_DrawItem
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        internal void DoComboBoxEx_DrawItem(object sender, DrawItemEventArgs e)
+        {
+            if (DrawItem != null)
+                DrawItem(sender, e);
+        }
+
+        #endregion
+
+        #region DoComboBoxEx_DropDownChange
+
+        /// <summary>
+        /// DoComboBoxEx_DropDownChange
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        internal void DoComboBoxEx_DropDownChange(object sender, DropDownChangeEventArgs e)
+        {
+            if (DropDownChange != null)
+                DropDownChange(sender, e);
+        }
+
+        #endregion
+
+        #region DoComboBoxEx_MeasureItem
+
+        /// <summary>
+        /// DoComboBoxEx_MeasureItem
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        internal void DoComboBoxEx_MeasureItem(object sender, MeasureItemEventArgs e)
+        {
+            if (MeasureItem != null)
+                MeasureItem(sender, e);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetCellBitmap
+
+        /// <summary>
+        /// Gets the cell paint bitmap
+        /// </summary>
+        /// <param name="cellBounds"></param>
+        /// <returns></returns>
+        internal Bitmap GetCellBitmap(Rectangle cellBounds)
+        {
+            if (_CellBitmap == null ||
+                (_CellBitmap.Width != cellBounds.Width || _CellBitmap.Height < cellBounds.Height))
+            {
+                if (_CellBitmap != null)
+                    _CellBitmap.Dispose();
+
+                _CellBitmap = new Bitmap(cellBounds.Width, cellBounds.Height);
+            }
+
+            return (_CellBitmap);
+        }
+
+        #endregion
+
+        #region OnBeforeCellPaint
+
+        /// <summary>
+        /// Invokes BeforeCellPaint user events
+        /// </summary>
+        /// <param name="rowIndex">Row index</param>
+        /// <param name="columnIndex">Column index</param>
+        internal void OnBeforeCellPaint(int rowIndex, int columnIndex)
+        {
+            if (BeforeCellPaint != null)
+                BeforeCellPaint(this, new BeforeCellPaintEventArgs(rowIndex, columnIndex));
+        }
+
+        #endregion
+
+        #region ToString
+
+        public override string ToString()
+        {
+            StringBuilder builder = new StringBuilder();
+
+            builder.Append("DataGridViewComboBoxExColumn { Name=");
+            builder.Append(Name);
+            builder.Append(", Index=");
+            builder.Append(Index.ToString(CultureInfo.CurrentCulture));
+            builder.Append(" }");
+
+            return (builder.ToString());
+        }
+
+        #endregion
+
+        #region ICloneable members
+
+        /// <summary>
+        /// Clones the ButtonX Column
+        /// </summary>
+        /// <returns></returns>
+        public override object Clone()
+        {
+            DataGridViewComboBoxExColumn cb = base.Clone() as DataGridViewComboBoxExColumn;
+
+            if (cb != null)
+            {
+                cb.AutoCompleteCustomSource = AutoCompleteCustomSource;
+                cb.AutoCompleteMode = AutoCompleteMode;
+                cb.AutoCompleteSource = AutoCompleteSource;
+                cb.DrawMode = DrawMode;
+                cb.DropDownHeight = DropDownHeight;
+                cb.DropDownStyle = DropDownStyle;
+                cb.Enabled = Enabled;
+                cb.FlatStyle = FlatStyle;
+                cb.FocusCuesEnabled = FocusCuesEnabled;
+                cb.FormatString = FormatString;
+                cb.FormattingEnabled = FormattingEnabled;
+                cb.Images = Images;
+                cb.ImeMode = ImeMode;
+                cb.IntegralHeight = IntegralHeight;
+                cb.IsStandalone = IsStandalone;
+                cb.ItemHeight = ItemHeight;
+                cb.MaxDropDownItems = MaxDropDownItems;
+                cb.MaxLength = MaxLength;
+                cb.RightToLeft = RightToLeft;
+                cb.Style = Style;
+                cb.Text = Text;
+                cb.WatermarkBehavior = WatermarkBehavior;
+                cb.WatermarkColor = WatermarkColor;
+                cb.WatermarkEnabled = WatermarkEnabled;
+                cb.WatermarkFont = WatermarkFont;
+                cb.WatermarkText = WatermarkText;
+
+                cb.DataSource = DataSource;
+                cb.DisplayMember = DisplayMember;
+                cb.ValueMember = ValueMember;
+
+                if (cb.DataSource == null)
+                {
+                    for (int i = 0; i < Items.Count; i++)
+                        cb.Items.Add(Items[i]);
+                }
+
+                cb.DisplayControlForCurrentCellOnly = DisplayControlForCurrentCellOnly;
+            }
+
+            return (cb);
+        }
+
+        #endregion
+
+        #region Dispose
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        /// <param name="disposing"></param>
+        protected override void Dispose(bool disposing)
+        {
+            HookEvents(false);
+
+            if (disposing == true)
+                _ComboBoxEx.Dispose();
+
+            if (_CellBitmap != null)
+            {
+                _CellBitmap.Dispose();
+                _CellBitmap = null;
+            }
+
+            base.Dispose(disposing);
+        }
+
+        #endregion
+
+        #region IDataGridViewColumn Members
+
+        /// <summary>
+        /// Gets the Cell paint setting for the control
+        /// </summary>
+        [Browsable(false)]
+        public bool OwnerPaintCell
+        {
+            get { return (true); }
+        }
+
+        #endregion
+    }
+
+    #region DropDownChangeEventArgs
+
+    /// <summary>
+    /// DropDownChangeEventArgs
+    /// </summary>
+    public class DropDownChangeEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private int _RowIndex;
+        private int _ColumnIndex;
+        private bool _Expanded;
+
+        #endregion
+
+        public DropDownChangeEventArgs(int rowIndex, int columnIndex, bool expanded)
+        {
+            _RowIndex = rowIndex;
+            _ColumnIndex = columnIndex;
+            _Expanded = expanded;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// ColumnIndex
+        /// </summary>
+        public int ColumnIndex
+        {
+            get { return (_ColumnIndex); }
+        }
+
+        /// <summary>
+        /// Expanded state
+        /// </summary>
+        public bool Expanded
+        {
+            get { return (_Expanded); }
+        }
+
+        /// <summary>
+        /// RowIndex
+        /// </summary>
+        public int RowIndex
+        {
+            get { return (_RowIndex); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewComboBoxEx/DataGridViewComboBoxExEditingControl.cs b/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewComboBoxEx/DataGridViewComboBoxExEditingControl.cs
new file mode 100644
index 00000000..3374a6dc
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewComboBoxEx/DataGridViewComboBoxExEditingControl.cs	
@@ -0,0 +1,240 @@
+using System;
+using System.ComponentModel;
+using System.Globalization;
+using System.Runtime.InteropServices;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    [ToolboxItem(false), ComVisible(false)]
+    public class DataGridViewComboBoxExEditingControl : ComboBoxEx, IDataGridViewEditingControl
+    {
+        #region Private variables
+
+        private DataGridView _DataGridView;
+
+        private int _RowIndex;
+        private bool _ValueChanged;
+
+        #endregion
+
+        public DataGridViewComboBoxExEditingControl()
+        {
+            TabStop = false;
+        }
+
+        #region OnTextChanged
+
+        /// <summary>
+        /// Handles OnTextChanged events
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnTextChanged(EventArgs e)
+        {
+            NotifyDataGridViewOfValueChange();
+
+            base.OnTextChanged(e);
+        }
+
+        #endregion
+
+        #region OnSelectedIndexChanged
+
+        /// <summary>
+        /// OnSelectedIndexChanged
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnSelectedIndexChanged(EventArgs e)
+        {
+            base.OnSelectedIndexChanged(e);
+
+            if (SelectedIndex != -1)
+                NotifyDataGridViewOfValueChange();
+        }
+
+        /// <summary>
+        /// NotifyDataGridViewOfValueChange
+        /// </summary>
+        private void NotifyDataGridViewOfValueChange()
+        {
+            if (_DataGridView.EditingControl == this)
+            {
+                _ValueChanged = true;
+                _DataGridView.NotifyCurrentCellDirty(true);
+            }
+        }
+
+        #endregion
+
+        #region IDataGridViewEditingControl Members
+
+        #region Public properties
+
+        #region EditingControlDataGridView
+
+        /// <summary>
+        /// Gets or sets the DataGridView
+        /// </summary>
+        public DataGridView EditingControlDataGridView
+        {
+            get { return (_DataGridView); }
+            set { _DataGridView = value; }
+        }
+
+        #endregion
+
+        #region EditingControlFormattedValue
+
+        /// <summary>
+        /// Gets or sets the Control Formatted Value
+        /// </summary>
+        public object EditingControlFormattedValue
+        {
+            get { return (GetEditingControlFormattedValue(DataGridViewDataErrorContexts.Formatting)); }
+
+            set
+            {
+                string s = value as string;
+
+                if (s != null)
+                {
+                    Text = s;
+
+                    if (string.Compare(s, this.Text, true, CultureInfo.CurrentCulture) != 0)
+                        SelectedIndex = -1;
+                }
+            }
+        }
+
+        #endregion
+
+        #region EditingControlRowIndex
+
+        /// <summary>
+        /// Gets or sets the Control RoeIndex
+        /// </summary>
+        public int EditingControlRowIndex
+        {
+            get { return (_RowIndex); }
+            set { _RowIndex = value; }
+        }
+
+        #endregion
+
+        #region EditingControlValueChanged
+
+        /// <summary>
+        /// Gets or sets the Control ValueChanged state
+        /// </summary>
+        public bool EditingControlValueChanged
+        {
+            get { return (_ValueChanged); }
+            set { _ValueChanged = value; }
+        }
+
+        #endregion
+
+        #region EditingPanelCursor
+
+        /// <summary>
+        /// Gets the Panel Cursor
+        /// </summary>
+        public Cursor EditingPanelCursor
+        {
+            get { return (Cursors.Default); }
+        }
+
+        #endregion
+
+        #region RepositionEditingControlOnValueChange
+
+        /// <summary>
+        /// Gets whether to RepositionEditingControlOnValueChange
+        /// </summary>
+        public bool RepositionEditingControlOnValueChange
+        {
+            get { return (false); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ApplyCellStyleToEditingControl
+
+        /// <summary>
+        /// ApplyCellStyleToEditingControl
+        /// </summary>
+        /// <param name="dataGridViewCellStyle"></param>
+        public void ApplyCellStyleToEditingControl(DataGridViewCellStyle dataGridViewCellStyle)
+        {
+            Font = dataGridViewCellStyle.Font;
+
+            ForeColor = dataGridViewCellStyle.ForeColor;
+            BackColor = dataGridViewCellStyle.BackColor;
+        }
+
+        #endregion
+
+        #region GetEditingControlFormattedValue
+
+        /// <summary>
+        /// Gets EditingControlFormattedValue
+        /// </summary>
+        /// <param name="context"></param>
+        /// <returns></returns>
+        public object GetEditingControlFormattedValue(DataGridViewDataErrorContexts context)
+        {
+            return (Text);
+        }
+
+        #endregion
+
+        #region EditingControlWantsInputKey
+
+        /// <summary>
+        /// Gets whether the given key wants to be processed
+        /// by the Control
+        /// </summary>
+        /// <param name="keyData"></param>
+        /// <param name="dataGridViewWantsInputKey"></param>
+        /// <returns></returns>
+        public bool EditingControlWantsInputKey(Keys keyData, bool dataGridViewWantsInputKey)
+        {
+            if (DroppedDown == false)
+            {
+                if ((keyData & Keys.Right) == Keys.Right)
+                    return (true);
+
+                if ((keyData & Keys.Left) == Keys.Left)
+                    return (true);
+            }
+
+            if (((((keyData & Keys.KeyCode) != Keys.Down) && ((keyData & Keys.KeyCode) != Keys.Up)) &&
+                (!DroppedDown || ((keyData & Keys.KeyCode) != Keys.Escape))) && ((keyData & Keys.KeyCode) != Keys.Return))
+            {
+                return (dataGridViewWantsInputKey == false);
+            }
+
+            return (true);
+        }
+
+        #endregion
+
+        #region PrepareEditingControlForEdit
+
+        /// <summary>
+        /// PrepareEditingControlForEdit
+        /// </summary>
+        /// <param name="selectAll"></param>
+        public void PrepareEditingControlForEdit(bool selectAll)
+        {
+            if (selectAll)
+                SelectAll();
+        }
+
+        #endregion
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewDateTimeInput/DataGridViewDateTimeInputCell.cs b/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewDateTimeInput/DataGridViewDateTimeInputCell.cs
new file mode 100644
index 00000000..ab0528b3
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewDateTimeInput/DataGridViewDateTimeInputCell.cs	
@@ -0,0 +1,746 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Media;
+using System.Windows.Forms;
+using DevComponents.Editors;
+using DevComponents.Editors.DateTimeAdv;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    public class DataGridViewDateTimeInputCell : DataGridViewTextBoxCell
+    {
+        #region Public properties
+
+        #region EditType
+
+        /// <summary>
+        /// Gets the Type of the editing control associated with the cell
+        /// </summary>
+        public override Type EditType
+        {
+            get { return (typeof(DataGridViewDateTimeInputEditingControl)); }
+        }
+
+        #endregion
+
+        #region FormattedValueType
+
+        /// <summary>
+        /// FormattedValueType
+        /// </summary>
+        public override Type FormattedValueType
+        {
+            get { return (typeof(string)); }
+        }
+
+        #endregion
+
+        #region ValueType
+
+        public override Type ValueType
+        {
+            get { return (typeof(DateTime)); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InitializeEditingControl
+
+        /// <summary>
+        /// InitializeEditingControl
+        /// </summary>
+        /// <param name="rowIndex"></param>
+        /// <param name="initialFormattedValue"></param>
+        /// <param name="dataGridViewCellStyle"></param>
+        public override void InitializeEditingControl(int rowIndex,
+            object initialFormattedValue, DataGridViewCellStyle dataGridViewCellStyle)
+        {
+            DetachEditingControl();
+
+            base.InitializeEditingControl(rowIndex, initialFormattedValue, dataGridViewCellStyle);
+
+            DataGridViewDateTimeInputEditingControl ctl =
+                (DataGridViewDateTimeInputEditingControl)DataGridView.EditingControl;
+
+            DataGridViewDateTimeInputColumn oc = OwningColumn as DataGridViewDateTimeInputColumn;
+
+            if (oc != null)
+            {
+                DateTimeInput di = oc.DateTimeInput;
+
+                ctl.AllowEmptyState = di.AllowEmptyState;
+                ctl.AutoAdvance = di.AutoAdvance;
+                ctl.AutoOverwrite = di.AutoOverwrite;
+                ctl.AutoSelectDate = di.AutoSelectDate;
+                ctl.CustomFormat = di.CustomFormat;
+                ctl.DefaultInputValues = di.DefaultInputValues;
+                ctl.Enabled = di.Enabled;
+                ctl.Format = di.Format;
+                ctl.InputHorizontalAlignment = GetHorizontalAlignment(dataGridViewCellStyle.Alignment);
+                ctl.IsInputReadOnly = di.IsInputReadOnly;
+                ctl.LockUpdateChecked = di.LockUpdateChecked;
+                ctl.MinDate = di.MinDate;
+                ctl.MaxDate = di.MaxDate;
+                ctl.SelectNextInputCharacters = di.SelectNextInputCharacters;
+                ctl.ShowCheckBox = di.ShowCheckBox;
+                ctl.ShowUpDown = di.ShowUpDown;
+
+                ctl.BackgroundStyle.ApplyStyle(di.BackgroundStyle);
+                ctl.BackgroundStyle.Class = di.BackgroundStyle.Class;
+
+                di.ButtonClear.CopyToItem(ctl.ButtonClear);
+                di.ButtonDropDown.CopyToItem(ctl.ButtonDropDown);
+                di.ButtonFreeText.CopyToItem(ctl.ButtonFreeText);
+                di.ButtonCustom.CopyToItem(ctl.ButtonCustom);
+                di.ButtonCustom2.CopyToItem(ctl.ButtonCustom2);
+                di.MonthCalendar.InternalCopyToItem(ctl.MonthCalendar);
+
+                ctl.ButtonClearClick += ButtonClearClick;
+                ctl.ButtonCustomClick += ButtonCustomClick;
+                ctl.ButtonCustom2Click += ButtonCustom2Click;
+                ctl.ButtonDropDownClick += ButtonDropDownClick;
+                ctl.ButtonFreeTextClick += ButtonFreeTextClick;
+                ctl.ConvertFreeTextEntry += ConvertFreeTextEntry;
+
+                //ctl.Value = GetValue(initialFormattedValue);
+                ctl.ValueObject = Value;
+
+                ctl.EditCancelled = false;
+            }
+        }
+
+        #endregion
+
+        #region DetachEditingControl
+
+        /// <summary>
+        /// DetachEditingControl
+        /// </summary>
+        public override void DetachEditingControl()
+        {
+            if (DataGridView != null && DataGridView.EditingControl != null)
+            {
+                DataGridViewDateTimeInputEditingControl di =
+                    DataGridView.EditingControl as DataGridViewDateTimeInputEditingControl;
+
+                if (di != null)
+                {
+                    di.ButtonClearClick -= ButtonClearClick;
+                    di.ButtonCustomClick -= ButtonCustomClick;
+                    di.ButtonCustom2Click -= ButtonCustom2Click;
+                    di.ButtonDropDownClick -= ButtonDropDownClick;
+                    di.ButtonFreeTextClick -= ButtonFreeTextClick;
+                    di.ConvertFreeTextEntry -= ConvertFreeTextEntry;
+
+                    if (di.EditCancelled == true)
+                    {
+                        di.EditCancelled = false;
+
+                        SystemSounds.Beep.Play();
+                    }
+                }
+            }
+
+            base.DetachEditingControl();
+        }
+
+        #endregion
+
+        #region Event processing
+
+        #region ButtonClearClick
+
+        /// <summary>
+        /// ButtonClearClick
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void ButtonClearClick(object sender, CancelEventArgs e)
+        {
+            ((DataGridViewDateTimeInputColumn)OwningColumn).DoButtonClearClick(sender, e);
+        }
+
+        #endregion
+
+        #region ButtonCustomClick
+
+        /// <summary>
+        /// ButtonCustomClick
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void ButtonCustomClick(object sender, EventArgs e)
+        {
+            ((DataGridViewDateTimeInputColumn)OwningColumn).DoButtonCustomClick(sender, e);
+        }
+
+        #endregion
+
+        #region ButtonCustom2Click
+
+        /// <summary>
+        /// ButtonCustom2Click
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void ButtonCustom2Click(object sender, EventArgs e)
+        {
+            ((DataGridViewDateTimeInputColumn)OwningColumn).DoButtonCustom2Click(sender, e);
+        }
+
+        #endregion
+
+        #region ButtonDropDownClick
+
+        /// <summary>
+        /// ButtonDropDownClick
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void ButtonDropDownClick(object sender, CancelEventArgs e)
+        {
+            ((DataGridViewDateTimeInputColumn)OwningColumn).DoButtonDropDownClick(sender, e);
+        }
+
+        #endregion
+
+        #region ButtonFreeTextClick
+
+        /// <summary>
+        /// ButtonFreeTextClick
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void ButtonFreeTextClick(object sender, CancelEventArgs e)
+        {
+            ((DataGridViewDateTimeInputColumn)OwningColumn).DoButtonFreeTextClick(sender, e);
+        }
+
+        #endregion
+
+        #region ConvertFreeTextEntry
+
+        /// <summary>
+        /// ConvertFreeTextEntry
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void ConvertFreeTextEntry(object sender, FreeTextEntryConversionEventArgs e)
+        {
+            ((DataGridViewDateTimeInputColumn)OwningColumn).DoConvertFreeTextEntry(sender, e);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region PositionEditingControl
+
+        /// <summary>
+        /// PositionEditingControl
+        /// </summary>
+        /// <param name="setLocation"></param>
+        /// <param name="setSize"></param>
+        /// <param name="cellBounds"></param>
+        /// <param name="cellClip"></param>
+        /// <param name="cellStyle"></param>
+        /// <param name="singleVerticalBorderAdded"></param>
+        /// <param name="singleHorizontalBorderAdded"></param>
+        /// <param name="isFirstDisplayedColumn"></param>
+        /// <param name="isFirstDisplayedRow"></param>
+        public override void PositionEditingControl(bool setLocation, bool setSize, Rectangle cellBounds,
+            Rectangle cellClip, DataGridViewCellStyle cellStyle, bool singleVerticalBorderAdded,
+            bool singleHorizontalBorderAdded, bool isFirstDisplayedColumn, bool isFirstDisplayedRow)
+        {
+            Rectangle editingControlBounds =
+                PositionEditingPanel(cellBounds, cellClip, cellStyle, singleVerticalBorderAdded,
+                                     singleHorizontalBorderAdded, isFirstDisplayedColumn, isFirstDisplayedRow);
+
+            editingControlBounds = GetAdjustedEditingControlBounds(editingControlBounds, cellStyle);
+
+            DataGridView.EditingControl.Location = new Point(editingControlBounds.X, editingControlBounds.Y);
+            DataGridView.EditingControl.Size = new Size(editingControlBounds.Width, editingControlBounds.Height);
+        }
+
+        #endregion
+
+        #region GetAdjustedEditingControlBounds
+
+        /// <summary>
+        /// GetAdjustedEditingControlBounds
+        /// </summary>
+        /// <param name="editingControlBounds"></param>
+        /// <param name="cellStyle"></param>
+        /// <returns></returns>
+        private Rectangle GetAdjustedEditingControlBounds(
+            Rectangle editingControlBounds, DataGridViewCellStyle cellStyle)
+        {
+            // Add a 1 pixel padding around the editing control
+
+            editingControlBounds.X += 1;
+            editingControlBounds.Y += 1;
+            editingControlBounds.Width = Math.Max(0, editingControlBounds.Width - 2);
+            editingControlBounds.Height = Math.Max(0, editingControlBounds.Height - 2);
+
+            // Adjust the vertical location of the editing control
+
+            Rectangle r = GetCellBounds(editingControlBounds);
+
+            if (cellStyle != null && r.Height < editingControlBounds.Height)
+            {
+                switch (cellStyle.Alignment)
+                {
+                    case DataGridViewContentAlignment.MiddleLeft:
+                    case DataGridViewContentAlignment.MiddleCenter:
+                    case DataGridViewContentAlignment.MiddleRight:
+                        editingControlBounds.Y += (editingControlBounds.Height - r.Height) / 2;
+                        break;
+
+                    case DataGridViewContentAlignment.BottomLeft:
+                    case DataGridViewContentAlignment.BottomCenter:
+                    case DataGridViewContentAlignment.BottomRight:
+                        editingControlBounds.Y += (editingControlBounds.Height - r.Height);
+                        break;
+                }
+            }
+
+            editingControlBounds.Width = Math.Max(1, editingControlBounds.Width);
+            editingControlBounds.Height = Math.Max(1, r.Height);
+
+            return (editingControlBounds);
+        }
+
+        #endregion
+
+        #region GetPreferredSize
+
+        #region GetPreferredSize
+
+        /// <summary>
+        /// GetPreferredSize
+        /// </summary>
+        /// <param name="graphics"></param>
+        /// <param name="cellStyle"></param>
+        /// <param name="rowIndex"></param>
+        /// <param name="constraintSize"></param>
+        /// <returns></returns>
+        protected override Size GetPreferredSize(Graphics graphics,
+               DataGridViewCellStyle cellStyle, int rowIndex, Size constraintSize)
+        {
+            if (DataGridView == null)
+                return (new Size(-1, -1));
+
+            Size preferredSize = base.GetPreferredSize(graphics, cellStyle, rowIndex, constraintSize);
+
+            DataGridViewDateTimeInputColumn oc = OwningColumn as DataGridViewDateTimeInputColumn;
+
+            if (oc != null)
+            {
+                DateTimeInput dt = oc.DateTimeInput;
+
+                preferredSize.Width += 6;
+                preferredSize.Height = dt.Height;
+
+                if (constraintSize.Width == 0)
+                {
+                    preferredSize.Width += GetImageWidth(dt.ButtonClear);
+                    preferredSize.Width += GetImageWidth(dt.ButtonCustom);
+                    preferredSize.Width += GetImageWidth(dt.ButtonCustom2);
+                    preferredSize.Width += GetImageWidth(dt.ButtonDropDown);
+                    preferredSize.Width += GetImageWidth(dt.ButtonFreeText);
+
+                    if (dt.ShowUpDown == true)
+                        preferredSize.Width += 16;
+
+                    if (dt.ShowCheckBox == true)
+                        preferredSize.Width += 16;
+                }
+            }
+
+            return (preferredSize);
+        }
+
+        #endregion
+
+        #region GetFormattedValue
+
+        protected override object GetFormattedValue(object value, int rowIndex,
+            ref DataGridViewCellStyle cellStyle, TypeConverter valueTypeConverter,
+            TypeConverter formattedValueTypeConverter, DataGridViewDataErrorContexts context)
+        {
+            DataGridViewDateTimeInputColumn oc = OwningColumn as DataGridViewDateTimeInputColumn;
+
+            if (oc != null)
+            {
+                DateTimeInput dt = oc.DateTimeInput;
+                dt.Value = GetValue(value);
+
+                return (dt.Text);
+            }
+
+            return (base.GetFormattedValue(value, rowIndex,
+                ref cellStyle, valueTypeConverter, formattedValueTypeConverter, context));
+        }
+
+        #endregion
+
+        #region GetImageWidth
+
+        private int GetImageWidth(InputButtonSettings ibs)
+        {
+            if (ibs.Visible == true)
+                return (ibs.Image != null ? ibs.Image.Width : 16);
+
+            return (0);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Paint
+
+        #region Paint
+
+        /// <summary>
+        /// Cell painting
+        /// </summary>
+        /// <param name="graphics"></param>
+        /// <param name="clipBounds"></param>
+        /// <param name="cellBounds"></param>
+        /// <param name="rowIndex"></param>
+        /// <param name="elementState"></param>
+        /// <param name="value"></param>
+        /// <param name="formattedValue"></param>
+        /// <param name="errorText"></param>
+        /// <param name="cellStyle"></param>
+        /// <param name="advancedBorderStyle"></param>
+        /// <param name="paintParts"></param>
+        protected override void Paint(Graphics graphics,
+            Rectangle clipBounds, Rectangle cellBounds, int rowIndex,
+            DataGridViewElementStates elementState, object value, object formattedValue,
+            string errorText, DataGridViewCellStyle cellStyle,
+            DataGridViewAdvancedBorderStyle advancedBorderStyle,
+            DataGridViewPaintParts paintParts)
+        {
+            if (DataGridView != null)
+            {
+                // First paint the borders of the cell
+
+                if (PartsSet(paintParts, DataGridViewPaintParts.Border))
+                    PaintBorder(graphics, clipBounds, cellBounds, cellStyle, advancedBorderStyle);
+
+                // Now paint the background and content
+
+                if (PartsSet(paintParts, DataGridViewPaintParts.Background))
+                {
+                    Rectangle rBk = GetBackBounds(cellBounds, advancedBorderStyle);
+
+                    if (rBk.Height > 0 && rBk.Width > 0)
+                    {
+                        DataGridViewDateTimeInputColumn oc = (DataGridViewDateTimeInputColumn)OwningColumn;
+                        Bitmap bm = oc.GetCellBitmap(cellBounds);
+
+                        if (bm != null)
+                        {
+                            using (Graphics g = Graphics.FromImage(bm))
+                            {
+                                PaintCellBackground(g, cellStyle, rBk);
+                                PaintCellContent(g, cellBounds, rowIndex, formattedValue, cellStyle, paintParts);
+
+                                graphics.DrawImageUnscaledAndClipped(bm, rBk);
+                            }
+
+                            if ((DataGridView.ShowCellErrors == true) &&
+                                (paintParts & DataGridViewPaintParts.ErrorIcon) == DataGridViewPaintParts.ErrorIcon)
+                            {
+                                base.PaintErrorIcon(graphics, clipBounds, cellBounds, errorText);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region PaintCellBackground
+
+        /// <summary>
+        /// Paints the cell background
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="cellStyle"></param>
+        /// <param name="rBack"></param>
+        private void PaintCellBackground(Graphics g,
+            DataGridViewCellStyle cellStyle, Rectangle rBack)
+        {
+            Rectangle r = rBack;
+            r.Location = new Point(0, 0);
+
+            DataGridViewX dx = DataGridView as DataGridViewX;
+
+            if (dx != null && dx.Enabled == true && Selected == true &&
+                dx.PaintEnhancedSelection == true)
+            {
+                Office2007ButtonItemPainter.PaintBackground(g, dx.ButtonStateColorTable,
+                    r, RoundRectangleShapeDescriptor.RectangleShape, false,
+                    false);
+            }
+            else
+            {
+                Color color = (Selected == true)
+                    ? cellStyle.SelectionBackColor : cellStyle.BackColor;
+
+                using (Brush br = new SolidBrush(color))
+                    g.FillRectangle(br, r);
+            }
+        }
+
+        #endregion
+
+        #region PaintCellContent
+
+        /// <summary>
+        /// Paints the cell content
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="cellBounds"></param>
+        /// <param name="rowIndex"></param>
+        /// <param name="value"></param>
+        /// <param name="cellStyle"></param>
+        /// <param name="paintParts"></param>
+        private void PaintCellContent(Graphics g, Rectangle cellBounds, int rowIndex, object value,
+            DataGridViewCellStyle cellStyle, DataGridViewPaintParts paintParts)
+        {
+            DataGridViewDateTimeInputColumn oc = (DataGridViewDateTimeInputColumn)OwningColumn;
+            DateTimeInput di = oc.DateTimeInput;
+
+            Point ptCurrentCell = DataGridView.CurrentCellAddress;
+            bool cellCurrent = ptCurrentCell.X == ColumnIndex && ptCurrentCell.Y == rowIndex;
+            bool cellEdited = cellCurrent && DataGridView.EditingControl != null;
+
+            // If the cell is in editing mode, there is nothing else to paint
+
+            if (cellEdited == false && rowIndex < DataGridView.RowCount)
+            {
+                if (PartsSet(paintParts, DataGridViewPaintParts.ContentForeground))
+                {
+                    cellBounds.X = 0;
+                    cellBounds.Y = 0;
+                    cellBounds.Width -= (oc.DividerWidth + 1);
+                    cellBounds.Height -= 1;
+
+                    di.Font = cellStyle.Font;
+                    di.ForeColor = cellStyle.ForeColor;
+                    di.BackColor = Selected ? Color.Transparent : cellStyle.BackColor;
+
+                    di.BackgroundStyle.TextColor = cellStyle.ForeColor;
+                    di.BackgroundStyle.BackColor = Selected ? Color.Transparent : cellStyle.BackColor;
+
+                    di.InputHorizontalAlignment = GetHorizontalAlignment(cellStyle.Alignment);
+
+                    di.Value = GetValue(value);
+
+                    oc.OnBeforeCellPaint(rowIndex, ColumnIndex);
+
+                    Rectangle r = GetAdjustedEditingControlBounds(cellBounds, cellStyle);
+
+                    if (oc.DisplayControlForCurrentCellOnly == false)
+                        DrawControl(di, r, g);
+                    else
+                        DrawText(di, r, g);
+                }
+            }
+        }
+
+        #region DrawControl
+
+        /// <summary>
+        /// DrawControl
+        /// </summary>
+        /// <param name="di"></param>
+        /// <param name="r"></param>
+        /// <param name="g"></param>
+        private void DrawControl(DateTimeInput di, Rectangle r, Graphics g)
+        {
+            GraphicsState gs = g.Save();
+
+            try
+            {
+                g.TranslateTransform(r.X, r.Y);
+
+                di.Width = r.Width;
+                di.InternalPaint(new PaintEventArgs(g, Rectangle.Empty));
+            }
+            finally
+            {
+                g.Restore(gs);
+            }
+        }
+        
+        #endregion
+
+        #region DrawText
+
+        /// <summary>
+        /// DrawText
+        /// </summary>
+        /// <param name="di"></param>
+        /// <param name="r"></param>
+        /// <param name="g"></param>
+        private void DrawText(DateTimeInput di, Rectangle r, Graphics g)
+        {
+            r.Inflate(-2, 0);
+
+            eTextFormat tf = eTextFormat.VerticalCenter;
+
+            switch (di.InputHorizontalAlignment)
+            {
+                case eHorizontalAlignment.Center:
+                    tf |= eTextFormat.HorizontalCenter;
+                    break;
+
+                case eHorizontalAlignment.Right:
+                    tf |= eTextFormat.Right;
+                    break;
+            }
+
+            TextDrawing.DrawString(g, di.Text, di.Font, di.ForeColor, r, tf);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region GetBackBounds
+
+        /// <summary>
+        /// Gets the background bounds for the given cell
+        /// </summary>
+        /// <param name="cellBounds"></param>
+        /// <param name="advancedBorderStyle"></param>
+        /// <returns></returns>
+        private Rectangle GetBackBounds(
+            Rectangle cellBounds, DataGridViewAdvancedBorderStyle advancedBorderStyle)
+        {
+            DataGridViewDateTimeInputColumn oc = (DataGridViewDateTimeInputColumn)OwningColumn;
+
+            Rectangle r = BorderWidths(advancedBorderStyle);
+
+            cellBounds.Offset(r.X, r.Y);
+            cellBounds.Width -= r.Right;
+            cellBounds.Height -= r.Bottom;
+
+            if (Selected == true)
+                cellBounds.Width += oc.DividerWidth;
+
+            return (cellBounds);
+        }
+
+        #endregion
+
+        #region GetCellBounds
+
+        /// <summary>
+        /// Gets the button bounds for the given cell
+        /// </summary>
+        /// <param name="cellBounds"></param>
+        /// <returns></returns>
+        private Rectangle GetCellBounds(Rectangle cellBounds)
+        {
+            DataGridViewDateTimeInputColumn oc = (DataGridViewDateTimeInputColumn)OwningColumn;
+
+            Size size = oc.DateTimeInput.Size;
+
+            cellBounds.Location = new Point(1, 1);
+
+            cellBounds.Width = Math.Min(size.Width, cellBounds.Width);
+            cellBounds.Width -= oc.DividerWidth;
+            cellBounds.Height = size.Height;
+
+            return (cellBounds);
+        }
+
+        #endregion
+
+        #region GetValue
+
+        /// <summary>
+        /// GetValue
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        private DateTime GetValue(object value)
+        {
+            if (value == Convert.DBNull ||
+                (value is string && String.IsNullOrEmpty((string)value) == true))
+            {
+                return (DateTime.MinValue);
+            }
+
+            if (value is DateTime)
+                return (Convert.ToDateTime(value));
+            else if (value is string && DevComponents.Editors.DateTimeAdv.DateTimeInput.CurrentCulture != null)
+            {
+                System.DateTime d = new System.DateTime();
+                if (System.DateTime.TryParse(value.ToString(), DevComponents.Editors.DateTimeAdv.DateTimeInput.GetActiveCulture().DateTimeFormat,
+                    System.Globalization.DateTimeStyles.None, out d))
+                    return d;
+            }
+
+            return (Convert.ToDateTime(value));
+        }
+
+        #endregion
+
+        #region GetHorizontalAlignment
+
+        /// <summary>
+        /// GetHorizontalAlignment
+        /// </summary>
+        /// <param name="alignment"></param>
+        /// <returns></returns>
+        private eHorizontalAlignment GetHorizontalAlignment(DataGridViewContentAlignment alignment)
+        {
+            switch (alignment)
+            {
+                case DataGridViewContentAlignment.TopCenter:
+                case DataGridViewContentAlignment.MiddleCenter:
+                case DataGridViewContentAlignment.BottomCenter:
+                    return (eHorizontalAlignment.Center);
+
+                case DataGridViewContentAlignment.TopRight:
+                case DataGridViewContentAlignment.MiddleRight:
+                case DataGridViewContentAlignment.BottomRight:
+                    return (eHorizontalAlignment.Right);
+
+                default:
+                    return (eHorizontalAlignment.Left);
+            }
+        }
+
+        #endregion
+
+        #region PartsSet
+
+        /// <summary>
+        /// Determines if the given part is set
+        /// </summary>
+        /// <param name="paintParts"></param>
+        /// <param name="parts"></param>
+        /// <returns></returns>
+        private bool PartsSet(DataGridViewPaintParts paintParts, DataGridViewPaintParts parts)
+        {
+            return ((paintParts & parts) == parts);
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewDateTimeInput/DataGridViewDateTimeInputColumn.cs b/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewDateTimeInput/DataGridViewDateTimeInputColumn.cs
new file mode 100644
index 00000000..a21a75d8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewDateTimeInput/DataGridViewDateTimeInputColumn.cs	
@@ -0,0 +1,750 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Runtime.InteropServices;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.Rendering;
+using DevComponents.Editors;
+using DevComponents.Editors.DateTimeAdv;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    [ToolboxBitmap(typeof(DataGridViewButtonXColumn), "DateTimeInput.ico"), ToolboxItem(false), ComVisible(false)]
+    public class DataGridViewDateTimeInputColumn : DataGridViewTextBoxColumn, IDataGridViewColumn
+    {
+        #region Events
+
+        /// <summary>
+        /// Occurs right before a DateTimeInput Cell is painted
+        /// </summary>
+        [Description("Occurs right before a DateTimeInput Cell is painted.")]
+        public event EventHandler<BeforeCellPaintEventArgs> BeforeCellPaint;
+
+        /// <summary>
+        /// Occurs when Clear button is clicked and allows you
+        /// to cancel the default action performed by the button
+        /// </summary>
+        [Description("Occurs when Clear button is clicked and allows you to cancel the default action performed by the button.")]
+        public event EventHandler<CancelEventArgs> ButtonClearClick;
+
+        /// <summary>
+        /// Occurs when ButtonCustom control is clicked
+        /// </summary>
+        [Description("Occurs when ButtonCustom control is clicked.")]
+        public event EventHandler<EventArgs> ButtonCustomClick;
+
+        /// <summary>
+        /// Occurs when ButtonCustom2 control is clicked
+        /// </summary>
+        [Description("Occurs when ButtonCustom2 control is clicked.")]
+        public event EventHandler<EventArgs> ButtonCustom2Click;
+
+        /// <summary>
+        /// Occurs when Drop-Down button that shows calendar
+        /// is clicked and allows you to cancel showing of the popup
+        /// </summary>
+        [Description("Occurs when Drop-Down button that shows calendar is clicked and allows you to cancel showing of the popup.")]
+        public event EventHandler<CancelEventArgs> ButtonDropDownClick;
+
+        /// <summary>
+        /// Occurs when Free-Text button is clicked
+        /// and allows you to cancel its default action
+        /// </summary>
+        [Description("Occurs when Free-Text button is clicked and allows you to cancel its default action.")]
+        public event EventHandler<CancelEventArgs> ButtonFreeTextClick;
+
+        /// <summary>
+        /// Occurs if Free-Text entry value is not natively recognized by
+        /// the control and provides you with opportunity to convert that
+        /// value to the value the control expects
+        /// </summary>
+        [Description("Occurs if Free-Text entry value is not natively recognized by the control and provides you with opportunity to convert that value to the value the control expects.")]
+        public event EventHandler<FreeTextEntryConversionEventArgs> ConvertFreeTextEntry;
+
+        #endregion
+
+        #region Private variables
+
+        private DateTimeInput _DateTimeInput;
+        private Bitmap _CellBitmap;
+        private bool _DisplayControlForCurrentCellOnly = true;
+
+        #endregion
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        public DataGridViewDateTimeInputColumn()
+        {
+            CellTemplate = new DataGridViewDateTimeInputCell();
+
+            _DateTimeInput = new DateTimeInput();
+
+            _DateTimeInput.BackgroundStyle.Class = ElementStyleClassKeys.DataGridViewDateTimeBorderKey;
+            _DateTimeInput.Visible = false;
+        }
+
+        #region Dispose
+
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing == true) 
+                _DateTimeInput.Dispose();
+
+            if (_CellBitmap != null)
+            {
+                _CellBitmap.Dispose();
+                _CellBitmap = null;
+            }
+
+            base.Dispose(disposing);
+        }
+
+        #endregion
+
+        #region Internal properties
+
+        #region DateTimeInput
+
+        /// <summary>
+        /// Gets the underlying DateTimeInput control
+        /// </summary>
+        internal DateTimeInput DateTimeInput
+        {
+            get { return (_DateTimeInput); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Public properties
+
+        #region AllowEmptyState
+
+        /// <summary>
+        /// Gets or sets whether empty null/nothing state of the control is
+        /// allowed. Default value is true which means that IsEmpty property may
+        /// return true if input value is resets or ValueObject set to null/nothing.
+        /// </summary>
+        [Browsable(true), DefaultValue(true)]
+        [Description("Indicates whether empty null/nothing state of the control is allowed.")]
+        public bool AllowEmptyState
+        {
+            get { return (_DateTimeInput.AllowEmptyState); }
+            set { _DateTimeInput.AllowEmptyState = value; }
+        }
+
+        #endregion
+
+        #region AutoAdvance
+
+        /// <summary>
+        /// Gets or sets whether input focus is automatically advanced
+        /// to next input field when input is complete in current one.
+        /// </summary>
+        [Browsable(true), DefaultValue(false), Category("Behavior")]
+        [Description("Indicates whether input focus is automatically advanced to next input field when input is complete in current one.")]
+        public bool AutoAdvance
+        {
+            get { return (_DateTimeInput.AutoAdvance); }
+            set { _DateTimeInput.AutoAdvance = value; }
+        }
+
+        #endregion
+
+        #region AutoSelectDate
+
+        /// <summary>
+        /// Gets or sets whether first day in month is automatically
+        /// selected on popup date picker when month or year is changed.
+        /// </summary>
+        [Browsable(true), DefaultValue(false), Category("Behavior")]
+        [Description("Indicates whether first day in month is automatically selected on popup date picker when month or year is changed.")]
+        public bool AutoSelectDate
+        {
+            get { return (_DateTimeInput.AutoSelectDate); }
+            set { _DateTimeInput.AutoSelectDate = value; }
+        }
+
+        #endregion
+
+        #region AutoOverwrite
+
+        /// <summary>
+        /// Gets or sets whether auto-overwrite functionality for input is enabled.
+        /// When in auto-overwrite mode input field will erase existing entry
+        /// and start new one if typing is continued after InputComplete method is called.
+        /// </summary>
+        [Browsable(true), DefaultValue(true)]
+        [Description("Indicates whether auto-overwrite functionality for input is enabled.")]
+        public bool AutoOverwrite
+        {
+            get { return (_DateTimeInput.AutoOverwrite); }
+            set { _DateTimeInput.AutoOverwrite = value; }
+        }
+
+        #endregion
+
+        #region BackgroundStyle
+
+        /// <summary>
+        /// Specifies the background style of the control.
+        /// </summary>
+        [Browsable(true), Category("Style")]
+        [Description("Gets or sets control background style.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ElementStyle BackgroundStyle
+        {
+            get { return (_DateTimeInput.BackgroundStyle); }
+        }
+
+        /// <summary>
+        /// Resets style to default value. Used by windows forms designer.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetBackgroundStyle()
+        {
+            _DateTimeInput.ResetBackgroundStyle();
+
+            _DateTimeInput.BackgroundStyle.Class = "TextBoxBorder";
+            _DateTimeInput.BackgroundStyle.CornerType = eCornerType.Square;
+        }
+
+        #endregion
+
+        #region ButtonClear
+
+        /// <summary>
+        /// Gets the object that describes the settings for the button
+        /// that clears the content of the control when clicked.
+        /// </summary>
+        [Browsable(true), Category("Buttons")]
+        [Description("Describes the settings for the button that clears the content of the control when clicked.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public InputButtonSettings ButtonClear
+        {
+            get { return (_DateTimeInput.ButtonClear); }
+        }
+
+        #endregion
+
+        #region ButtonCustom
+
+        /// <summary>
+        /// Gets the object that describes the settings for the custom button
+        /// that can execute an custom action of your choosing when clicked.
+        /// </summary>
+        [Browsable(true), Category("Buttons")]
+        [Description("Describes the settings for the custom button that can execute an custom action of your choosing when clicked.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public InputButtonSettings ButtonCustom
+        {
+            get { return (_DateTimeInput.ButtonCustom); }
+        }
+
+        #endregion
+
+        #region ButtonCustom2
+
+        /// <summary>
+        /// Gets the object that describes the settings for the custom button that can execute an custom action of your choosing when clicked.
+        /// </summary>
+        [Browsable(true), Category("Buttons")]
+        [Description("Describes the settings for the custom button that can execute an custom action of your choosing when clicked.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public InputButtonSettings ButtonCustom2
+        {
+            get { return (_DateTimeInput.ButtonCustom2); }
+        }
+
+        #endregion
+
+        #region ButtonDropDown
+
+        /// <summary>
+        /// Gets the object that describes the settings for the button
+        /// that shows drop-down when clicked.
+        /// </summary>
+        [Browsable(true), Category("Buttons")]
+        [Description("Describes the settings for the button that shows drop-down when clicked.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public InputButtonSettings ButtonDropDown
+        {
+            get { return (_DateTimeInput.ButtonDropDown); }
+        }
+
+        #endregion
+
+        #region ButtonFreeText
+
+        /// <summary>
+        /// Gets the object that describes the settings for the button
+        /// that switches the control into the free-text entry mode when clicked.
+        /// </summary>
+        [Browsable(true), Category("Buttons")]
+        [Description("Describes the settings for the button that switches the control into the free-text entry mode when clicked.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public InputButtonSettings ButtonFreeText
+        {
+            get { return (_DateTimeInput.ButtonFreeText); }
+        }
+
+        #endregion
+
+        #region CustomFormat
+
+        /// <summary>
+        /// Gets or sets the custom date/time format string. 
+        /// </summary>
+        [Browsable(true), DefaultValue("")]
+        [Description("Indicates the custom date/time format string. "), Localizable(true)]
+        public string CustomFormat
+        {
+            get { return (_DateTimeInput.CustomFormat); }
+            set { _DateTimeInput.CustomFormat = value; }
+        }
+
+        #endregion
+
+        #region DisplayControlForCurrentCellOnly
+
+        /// <summary>
+        /// Gets or sets whether the control
+        /// will be displayed for the current cell only.
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Appearance")]
+        [Description("Indicates whether the control will be displayed for the current cell only.")]
+        public bool DisplayControlForCurrentCellOnly
+        {
+            get { return (_DisplayControlForCurrentCellOnly); }
+
+            set
+            {
+                if (_DisplayControlForCurrentCellOnly != value)
+                {
+                    _DisplayControlForCurrentCellOnly = value;
+                    _DateTimeInput.Invalidate();
+                }
+            }
+        }
+
+        #endregion
+
+        #region DefaultInputValues
+
+        /// <summary>
+        /// Gets or sets whether empty input values (year, month or day) are
+        /// set to defaults while user is entering data. Default value is true.
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Behavior")]
+        [Description("Indicates whether empty input values (year, month or day) are set to defaults while user is entering data")]
+        public bool DefaultInputValues
+        {
+            get { return (_DateTimeInput.DefaultInputValues); }
+            set { _DateTimeInput.DefaultInputValues = value; }
+        }
+
+        #endregion
+
+        #region Enabled
+
+        /// <summary>
+        /// Gets or sets whether the control can respond to user interaction
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Behavior")]
+        [Description("Indicates whether the control can respond to user interaction.")]
+        public bool Enabled
+        {
+            get { return (_DateTimeInput.Enabled); }
+            set { _DateTimeInput.Enabled = value; }
+        }
+
+        #endregion
+
+        #region Format
+
+        /// <summary>
+        /// Gets or sets the format date/time is displayed in. To specify
+        /// custom format set this value to Custom and specify custom format
+        /// using CustomFormat property.
+        /// </summary>
+        [Browsable(true), DefaultValue(eDateTimePickerFormat.Short)]
+        [Description("Indicates the format date/time is displayed in. To specify custom format set this value to Custom and specify custom format using CustomFormat property.")]
+        public eDateTimePickerFormat Format
+        {
+            get { return (_DateTimeInput.Format); }
+            set { _DateTimeInput.Format = value; }
+        }
+
+        #endregion
+
+        #region InputHorizontalAlignment
+
+        /// <summary>
+        /// Gets or sets the input field alignment inside the control
+        /// </summary>
+        [Browsable(true), DefaultValue(eHorizontalAlignment.Right), Category("Appearance")]
+        [Description("Indicates alignment of input fields inside of the control.")]
+        public eHorizontalAlignment InputHorizontalAlignment
+        {
+            get { return (_DateTimeInput.InputHorizontalAlignment); }
+            set { _DateTimeInput.InputHorizontalAlignment = value; }
+        }
+
+        #endregion
+
+        #region IsInputReadOnly
+
+        /// <summary>
+        /// Gets or sets whether input part of the control is read-only. When set
+        /// to true the input part of the control becomes read-only and does not allow
+        /// the typing. However, drop-down part if visible still allows user to change
+        /// the value of the control. Use this property to allow change of the value
+        /// through drop-down picker only.
+        /// </summary>
+        [Browsable(true), DefaultValue(false)]
+        [Description("Indicates whether input part of the control is read-only.")]
+        public bool IsInputReadOnly
+        {
+            get { return (_DateTimeInput.IsInputReadOnly); }
+            set { _DateTimeInput.IsInputReadOnly = value; }
+        }
+
+        #endregion
+
+        #region LockUpdateChecked
+
+        /// <summary>
+        /// Gets or sets whether check box shown using ShowCheckBox
+        /// property which locks/unlocks the control update is checked.
+        /// </summary>
+        [Browsable(true), DefaultValue(true)]
+        [Description("Indicates whether check box shown using ShowCheckBox property which locks/unlocks the control update is checked.")]
+        public bool LockUpdateChecked
+        {
+            get { return (_DateTimeInput.LockUpdateChecked); }
+            set { _DateTimeInput.LockUpdateChecked = value; }
+        }
+
+        #endregion
+
+        #region MaxDate
+
+        /// <summary>
+        /// Gets or sets the maximum date and time that can be selected in the control.
+        /// </summary>
+        [Browsable(true)]
+        [Description("Indicates maximum date and time that can be selected in the control.")]
+        public DateTime MaxDate
+        {
+            get { return (_DateTimeInput.MaxDate); }
+            set { _DateTimeInput.MaxDate = value; }
+        }
+
+        /// <summary>
+        /// Gets whether Value property should be serialized by Windows Forms designer.
+        /// </summary>
+        /// <returns>true if value serialized otherwise false.</returns>
+        public bool ShouldSerializeMaxDate()
+        {
+            return (MaxDate.Equals(DateTimeGroup.MaxDateTime) == false);
+        }
+
+        #endregion
+
+        #region MinDate
+
+        /// <summary>
+        /// Gets or sets the minimum date and time that can be selected in the control.
+        /// </summary>
+        [Browsable(true)]
+        [Description("Indicates minimum date and time that can be selected in the control.")]
+        public DateTime MinDate
+        {
+            get { return (_DateTimeInput.MinDate); }
+            set { _DateTimeInput.MinDate = value; }
+        }
+
+        /// <summary>
+        /// Gets whether Value property should be serialized by Windows Forms designer.
+        /// </summary>
+        /// <returns>true if value serialized otherwise false.</returns>
+        public bool ShouldSerializeMinDate()
+        {
+            return (MinDate.Equals(DateTimeGroup.MinDateTime) == false);
+        }
+
+        #endregion
+
+        #region MonthCalendar
+
+        /// <summary>
+        /// Gets the reference to the internal MonthCalendarItem control which is used to display calendar when drop-down is open.
+        /// </summary>
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        [Description("Gets the reference to the internal MonthCalendarAdv control which is used to display calendar when drop-down is open.")]
+        public MonthCalendarItem MonthCalendar
+        {
+            get { return (_DateTimeInput.MonthCalendar); }
+        }
+
+        #endregion
+
+        #region SelectNextInputCharacters
+
+        /// <summary>
+        /// List of characters that when pressed would select next input field. For example if you are
+        /// allowing time input you could set this property to : so when user presses the : character,
+        /// the input is forwarded to the next input field.
+        /// </summary>
+        [Browsable(true), DefaultValue(""), Category("Behavior")]
+        [Description("List of characters that when pressed would select next input field.")]
+        public string SelectNextInputCharacters
+        {
+            get { return (_DateTimeInput.SelectNextInputCharacters); }
+            set { _DateTimeInput.SelectNextInputCharacters = value; }
+        }
+
+        #endregion
+
+        #region ShowCheckBox
+
+        /// <summary>
+        /// Gets or sets a value indicating whether a check box is
+        /// displayed to the left of the input value. Set to true if a check box
+        /// is displayed to the left of the input value; otherwise, false. The default is false.
+        /// <remarks>
+        /// When the ShowCheckBox property is set to true, a check box is displayed
+        /// to the left of the input in the control. When the check box is selected, the value
+        /// can be updated. When the check box is cleared, the value is unable to be changed.
+        /// You can handle the LockUpdateChanged event to be notified when this check box is checked
+        /// and unchecked. Use LockUpdateChecked property to get or sets whether check box is checked.
+        /// </remarks>
+        /// </summary>
+        [Browsable(true), DefaultValue(false)]
+        [Description("Indicates whether a check box is displayed to the left of the input value which allows locking of the control.")]
+        public bool ShowCheckBox
+        {
+            get { return (_DateTimeInput.ShowCheckBox); }
+            set { _DateTimeInput.ShowCheckBox = value; }
+        }
+
+        #endregion
+
+        #region ShowUpDown
+
+        /// <summary>
+        /// Gets or sets a value indicating whether a spin button control
+        /// (up-down control) is used to adjust the current value. The default is false. 
+        /// <remarks>
+        /// When the ShowUpDown property is set to true, a spin button control
+        /// is shown to adjust value of currently focused input item. The value can
+        /// be adjusted by using the up and down buttons to change the value.
+        /// </remarks>
+        /// </summary>
+        [Browsable(true), DefaultValue(false)]
+        public bool ShowUpDown
+        {
+            get { return (_DateTimeInput.ShowUpDown); }
+            set { _DateTimeInput.ShowUpDown = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Event processing
+
+        #region DoButtonClearClick
+
+        /// <summary>
+        /// DoButtonClearClick
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        internal void DoButtonClearClick(object sender, CancelEventArgs e)
+        {
+            if (ButtonClearClick != null)
+                ButtonClearClick(this, e);
+        }
+
+        #endregion
+
+        #region DoButtonCustomClick
+
+        /// <summary>
+        /// DoButtonCustomClick
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        internal void DoButtonCustomClick(object sender, EventArgs e)
+        {
+            if (ButtonCustomClick != null)
+                ButtonCustomClick(this, e);
+        }
+
+        #endregion
+
+        #region DoButtonCustom2Click
+
+        /// <summary>
+        /// DoButtonCustom2Click
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        internal void DoButtonCustom2Click(object sender, EventArgs e)
+        {
+            if (ButtonCustom2Click != null)
+                ButtonCustom2Click(this, e);
+        }
+
+        #endregion
+
+        #region DoButtonDropDownClick
+
+        /// <summary>
+        /// DoButtonDropDownClick
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        internal void DoButtonDropDownClick(object sender, CancelEventArgs e)
+        {
+            if (ButtonDropDownClick != null)
+                ButtonDropDownClick(this, e);
+        }
+
+        #endregion
+
+        #region DoButtonFreeTextClick
+
+        /// <summary>
+        /// DoButtonFreeTextClick
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        internal void DoButtonFreeTextClick(object sender, CancelEventArgs e)
+        {
+            if (ButtonFreeTextClick != null)
+                ButtonFreeTextClick(this, e);
+        }
+
+        #endregion
+
+        #region DoConvertFreeTextEntry
+
+        /// <summary>
+        /// DoConvertFreeTextEntry
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        internal void DoConvertFreeTextEntry(object sender, FreeTextEntryConversionEventArgs e)
+        {
+            if (ConvertFreeTextEntry != null)
+                ConvertFreeTextEntry(this, e);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetCellBitmap
+
+        /// <summary>
+        /// Gets the cell paint bitmap
+        /// </summary>
+        /// <param name="cellBounds"></param>
+        /// <returns></returns>
+        internal Bitmap GetCellBitmap(Rectangle cellBounds)
+        {
+            if (_CellBitmap == null ||
+                (_CellBitmap.Width != cellBounds.Width || _CellBitmap.Height < cellBounds.Height))
+            {
+                if (_CellBitmap != null)
+                    _CellBitmap.Dispose();
+
+                _CellBitmap = new Bitmap(cellBounds.Width, cellBounds.Height);
+            }
+
+            return (_CellBitmap);
+        }
+
+        #endregion
+
+        #region OnBeforeCellPaint
+
+        /// <summary>
+        /// Invokes BeforeCellPaint user events
+        /// </summary>
+        /// <param name="rowIndex">Row index</param>
+        /// <param name="columnIndex">Column index</param>
+        internal void OnBeforeCellPaint(int rowIndex, int columnIndex)
+        {
+            if (BeforeCellPaint != null)
+                BeforeCellPaint(this, new BeforeCellPaintEventArgs(rowIndex, columnIndex));
+        }
+
+        #endregion
+
+        #region ICloneable members
+
+        /// <summary>
+        /// Clones the ButtonX Column
+        /// </summary>
+        /// <returns></returns>
+        public override object Clone()
+        {
+            DataGridViewDateTimeInputColumn dc = base.Clone() as DataGridViewDateTimeInputColumn;
+
+            if (dc != null)
+            {
+                dc.AllowEmptyState = AllowEmptyState;
+                dc.AutoAdvance = AutoAdvance;
+                dc.AutoOverwrite = AutoOverwrite;
+                dc.AutoSelectDate = AutoSelectDate;
+                dc.CustomFormat = CustomFormat;
+                dc.DefaultInputValues = DefaultInputValues;
+                dc.Enabled = Enabled;
+                dc.Format = Format;
+                dc.InputHorizontalAlignment = InputHorizontalAlignment;
+                dc.IsInputReadOnly = IsInputReadOnly;
+                dc.LockUpdateChecked = LockUpdateChecked;
+                dc.MinDate = MinDate;
+                dc.MaxDate = MaxDate;
+                dc.SelectNextInputCharacters = SelectNextInputCharacters;
+                dc.ShowCheckBox = ShowCheckBox;
+                dc.ShowUpDown = ShowUpDown;
+
+                dc.DisplayControlForCurrentCellOnly = DisplayControlForCurrentCellOnly;
+
+                DateTimeInput.MonthCalendar.InternalCopyToItem(dc.DateTimeInput.MonthCalendar);
+
+                dc.BackgroundStyle.ApplyStyle(DateTimeInput.BackgroundStyle);
+                dc.BackgroundStyle.Class = DateTimeInput.BackgroundStyle.Class;
+
+                DateTimeInput.ButtonClear.CopyToItem(dc.DateTimeInput.ButtonClear);
+                DateTimeInput.ButtonDropDown.CopyToItem(dc.DateTimeInput.ButtonDropDown);
+                DateTimeInput.ButtonFreeText.CopyToItem(dc.DateTimeInput.ButtonFreeText);
+                DateTimeInput.ButtonCustom.CopyToItem(dc.DateTimeInput.ButtonCustom);
+                DateTimeInput.ButtonCustom2.CopyToItem(dc.DateTimeInput.ButtonCustom2);
+            }
+
+            return (dc);
+        }
+
+        #endregion
+
+        #region IDataGridViewColumn Members
+
+        /// <summary>
+        /// Gets the Cell paint setting for the control
+        /// </summary>
+        [Browsable(false)]
+        public bool OwnerPaintCell
+        {
+            get { return (true); }
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewDateTimeInput/DataGridViewDateTimeInputEditingControl.cs b/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewDateTimeInput/DataGridViewDateTimeInputEditingControl.cs
new file mode 100644
index 00000000..3e61ea96
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewDateTimeInput/DataGridViewDateTimeInputEditingControl.cs	
@@ -0,0 +1,218 @@
+using System;
+using System.ComponentModel;
+using System.Runtime.InteropServices;
+using System.Windows.Forms;
+using DevComponents.Editors.DateTimeAdv;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    [ToolboxItem(false), ComVisible(false)]
+    public class DataGridViewDateTimeInputEditingControl : DateTimeInput, IDataGridViewEditingControl
+    {
+        #region Private variables
+
+        private DataGridView _DataGridView;
+
+        private int _RowIndex;
+        private bool _ValueChanged;
+        private bool _EditCancelled;
+
+        #endregion
+
+        #region OnValueChanged
+
+        /// <summary>
+        /// Handles OnValueChanged events
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnValueChanged(EventArgs e)
+        {
+            _ValueChanged = true;
+
+            _DataGridView.NotifyCurrentCellDirty(true);
+
+            base.OnValueChanged(e);
+        }
+
+        #endregion
+
+        #region Internal properties
+
+        /// <summary>
+        /// Gets or sets the Edit state
+        /// </summary>
+        internal bool EditCancelled
+        {
+            get { return (_EditCancelled); }
+            set { _EditCancelled = value; }
+        }
+
+        #endregion
+
+        #region IDataGridViewEditingControl Members
+
+        #region Public properties
+
+        #region EditingControlDataGridView
+
+        /// <summary>
+        /// Gets or sets the DataGridView
+        /// </summary>
+        public DataGridView EditingControlDataGridView
+        {
+            get { return (_DataGridView); }
+            set { _DataGridView = value; }
+        }
+
+        #endregion
+
+        #region EditingControlFormattedValue
+
+        /// <summary>
+        /// Gets or sets the Control Formatted Value
+        /// </summary>
+        public object EditingControlFormattedValue
+        {
+            get
+            {
+                DateTime date = Value;
+
+                if (date.Equals(DateTime.MinValue))
+                    return (String.Empty);
+
+                return (this.Value.ToString());
+            }
+
+            set
+            {
+                string newValue = value as string;
+
+                if (newValue != null)
+                    Value = DateTime.Parse(newValue);
+            }
+        }
+
+        #endregion
+
+        #region EditingControlRowIndex
+
+        /// <summary>
+        /// Gets or sets the Control RoeIndex
+        /// </summary>
+        public int EditingControlRowIndex
+        {
+            get { return (_RowIndex); }
+            set { _RowIndex = value; }
+        }
+
+        #endregion
+
+        #region EditingControlValueChanged
+
+        /// <summary>
+        /// Gets or sets the Control ValueChanged state
+        /// </summary>
+        public bool EditingControlValueChanged
+        {
+            get { return (_ValueChanged); }
+            set { _ValueChanged = value; }
+        }
+
+        #endregion
+
+        #region EditingPanelCursor
+
+        /// <summary>
+        /// Gets the Panel Cursor
+        /// </summary>
+        public Cursor EditingPanelCursor
+        {
+            get { return (base.Cursor); }
+        }
+
+        #endregion
+
+        #region RepositionEditingControlOnValueChange
+
+        /// <summary>
+        /// Gets whether to RepositionEditingControlOnValueChange
+        /// </summary>
+        public bool RepositionEditingControlOnValueChange
+        {
+            get { return (false); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ApplyCellStyleToEditingControl
+
+        /// <summary>
+        /// ApplyCellStyleToEditingControl
+        /// </summary>
+        /// <param name="dataGridViewCellStyle"></param>
+        public void ApplyCellStyleToEditingControl(DataGridViewCellStyle dataGridViewCellStyle)
+        {
+            Font = dataGridViewCellStyle.Font;
+
+            ForeColor = dataGridViewCellStyle.ForeColor;
+            BackColor = dataGridViewCellStyle.BackColor;
+        }
+
+        #endregion
+
+        #region GetEditingControlFormattedValue
+
+        /// <summary>
+        /// Gets EditingControlFormattedValue
+        /// </summary>
+        /// <param name="context"></param>
+        /// <returns></returns>
+        public object GetEditingControlFormattedValue(DataGridViewDataErrorContexts context)
+        {
+            return (EditingControlFormattedValue);
+        }
+
+        #endregion
+
+        #region EditingControlWantsInputKey
+
+        /// <summary>
+        /// Gets whether the given key wants to be processed
+        /// by the Control
+        /// </summary>
+        /// <param name="keyData"></param>
+        /// <param name="dataGridViewWantsInputKey"></param>
+        /// <returns></returns>
+        public bool EditingControlWantsInputKey(Keys keyData, bool dataGridViewWantsInputKey)
+        {
+            if ((keyData & Keys.Right) == Keys.Right)
+                return (true);
+
+            if ((keyData & Keys.Left) == Keys.Left)
+                return (true);
+
+            if ((keyData & Keys.Escape) == Keys.Escape)
+                _EditCancelled = true;
+
+            return (dataGridViewWantsInputKey == false);
+        }
+
+        #endregion
+
+        #region PrepareEditingControlForEdit
+
+        /// <summary>
+        /// PrepareEditingControlForEdit
+        /// </summary>
+        /// <param name="selectAll"></param>
+        public void PrepareEditingControlForEdit(bool selectAll)
+        {
+        }
+
+        #endregion
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewDoubleInput/DataGridViewDoubleInputCell.cs b/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewDoubleInput/DataGridViewDoubleInputCell.cs
new file mode 100644
index 00000000..5a562188
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewDoubleInput/DataGridViewDoubleInputCell.cs	
@@ -0,0 +1,730 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Media;
+using System.Windows.Forms;
+using DevComponents.Editors;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    public class DataGridViewDoubleInputCell : DataGridViewTextBoxCell
+    {
+        #region Public properties
+
+        #region EditType
+
+        /// <summary>
+        /// Gets the Type of the editing control associated with the cell
+        /// </summary>
+        public override Type EditType
+        {
+            get { return (typeof(DataGridViewDoubleInputEditingControl)); }
+        }
+
+        #endregion
+
+        #region FormattedValueType
+
+        /// <summary>
+        /// FormattedValueType
+        /// </summary>
+        public override Type FormattedValueType
+        {
+            get { return (typeof(string)); }
+        }
+
+        #endregion
+
+        #region ValueType
+
+        public override Type ValueType
+        {
+            get { return (typeof(double)); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InitializeEditingControl
+
+        /// <summary>
+        /// InitializeEditingControl
+        /// </summary>
+        /// <param name="rowIndex"></param>
+        /// <param name="initialFormattedValue"></param>
+        /// <param name="dataGridViewCellStyle"></param>
+        public override void InitializeEditingControl(int rowIndex,
+            object initialFormattedValue, DataGridViewCellStyle dataGridViewCellStyle)
+        {
+            DetachEditingControl();
+
+            base.InitializeEditingControl(rowIndex, initialFormattedValue, dataGridViewCellStyle);
+
+            DataGridViewDoubleInputEditingControl ctl =
+                (DataGridViewDoubleInputEditingControl)DataGridView.EditingControl;
+
+            DataGridViewDoubleInputColumn oc = OwningColumn as DataGridViewDoubleInputColumn;
+
+            if (oc != null)
+            {
+                DoubleInput di = oc.DoubleInput;
+
+                ctl.Value = GetValue(di.Value);
+
+                ctl.DisplayFormat = di.DisplayFormat;
+                ctl.Enabled = di.Enabled;
+                ctl.Increment = di.Increment;
+                ctl.LockUpdateChecked = di.LockUpdateChecked;
+                ctl.MaxValue = di.MaxValue;
+                ctl.MinValue = di.MinValue;
+                ctl.ShowCheckBox = di.ShowCheckBox;
+                ctl.ShowUpDown = di.ShowUpDown;
+
+                ctl.BackgroundStyle.ApplyStyle(di.BackgroundStyle);
+                ctl.BackgroundStyle.Class = di.BackgroundStyle.Class;
+
+                ctl.InputHorizontalAlignment = GetHorizontalAlignment(dataGridViewCellStyle.Alignment);
+
+                di.ButtonClear.CopyToItem(ctl.ButtonClear);
+                di.ButtonCustom.CopyToItem(ctl.ButtonCustom);
+                di.ButtonCustom2.CopyToItem(ctl.ButtonCustom2);
+                di.ButtonDropDown.CopyToItem(ctl.ButtonDropDown);
+                di.ButtonFreeText.CopyToItem(ctl.ButtonFreeText);
+
+                ctl.ButtonClearClick += ButtonClearClick;
+                ctl.ButtonCustomClick += ButtonCustomClick;
+                ctl.ButtonCustom2Click += ButtonCustom2Click;
+                ctl.ButtonDropDownClick += ButtonDropDownClick;
+                ctl.ButtonFreeTextClick += ButtonFreeTextClick;
+                ctl.ConvertFreeTextEntry += ConvertFreeTextEntry;
+
+                ctl.EditCancelled = false;
+            }
+        }
+
+        #endregion
+
+        #region DetachEditingControl
+
+        /// <summary>
+        /// DetachEditingControl
+        /// </summary>
+        public override void DetachEditingControl()
+        {
+            if (DataGridView != null && DataGridView.EditingControl != null)
+            {
+                DataGridViewDoubleInputEditingControl di =
+                    DataGridView.EditingControl as DataGridViewDoubleInputEditingControl;
+
+                if (di != null)
+                {
+                    di.ButtonClearClick -= ButtonClearClick;
+                    di.ButtonDropDownClick -= ButtonDropDownClick;
+                    di.ButtonFreeTextClick -= ButtonFreeTextClick;
+                    di.ButtonCustomClick -= ButtonCustomClick;
+                    di.ButtonCustom2Click -= ButtonCustom2Click;
+                    di.ConvertFreeTextEntry -= ConvertFreeTextEntry;
+
+                    if (di.EditCancelled == true)
+                    {
+                        di.EditCancelled = false;
+
+                        SystemSounds.Beep.Play();
+                    }
+                }
+            }
+
+            base.DetachEditingControl();
+        }
+
+        #endregion
+
+        #region Event processing
+
+        #region ButtonClearClick
+
+        /// <summary>
+        /// ButtonClearClick
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void ButtonClearClick(object sender, CancelEventArgs e)
+        {
+            ((DataGridViewDoubleInputColumn)OwningColumn).DoButtonClearClick(sender, e);
+        }
+
+        #endregion
+
+        #region ButtonCustomClick
+
+        /// <summary>
+        /// ButtonCustomClick
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void ButtonCustomClick(object sender, EventArgs e)
+        {
+            ((DataGridViewDoubleInputColumn)OwningColumn).DoButtonCustomClick(sender, e);
+        }
+
+        #endregion
+
+        #region ButtonCustom2Click
+
+        /// <summary>
+        /// ButtonCustom2Click
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void ButtonCustom2Click(object sender, EventArgs e)
+        {
+            ((DataGridViewDoubleInputColumn)OwningColumn).DoButtonCustom2Click(sender, e);
+        }
+
+        #endregion
+
+        #region ButtonDropDownClick
+
+        /// <summary>
+        /// ButtonDropDownClick
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void ButtonDropDownClick(object sender, CancelEventArgs e)
+        {
+            ((DataGridViewDoubleInputColumn)OwningColumn).DoButtonDropDownClick(sender, e);
+        }
+
+        #endregion
+
+        #region ButtonFreeTextClick
+
+        /// <summary>
+        /// ButtonFreeTextClick
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void ButtonFreeTextClick(object sender, CancelEventArgs e)
+        {
+            ((DataGridViewDoubleInputColumn)OwningColumn).DoButtonFreeTextClick(sender, e);
+        }
+
+        #endregion
+
+        #region ConvertFreeTextEntry
+
+        /// <summary>
+        /// ConvertFreeTextEntry
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void ConvertFreeTextEntry(object sender, FreeTextEntryConversionEventArgs e)
+        {
+            ((DataGridViewDoubleInputColumn)OwningColumn).DoConvertFreeTextEntry(sender, e);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region PositionEditingControl
+
+        /// <summary>
+        /// PositionEditingControl
+        /// </summary>
+        /// <param name="setLocation"></param>
+        /// <param name="setSize"></param>
+        /// <param name="cellBounds"></param>
+        /// <param name="cellClip"></param>
+        /// <param name="cellStyle"></param>
+        /// <param name="singleVerticalBorderAdded"></param>
+        /// <param name="singleHorizontalBorderAdded"></param>
+        /// <param name="isFirstDisplayedColumn"></param>
+        /// <param name="isFirstDisplayedRow"></param>
+        public override void PositionEditingControl(bool setLocation, bool setSize, Rectangle cellBounds,
+            Rectangle cellClip, DataGridViewCellStyle cellStyle, bool singleVerticalBorderAdded,
+            bool singleHorizontalBorderAdded, bool isFirstDisplayedColumn, bool isFirstDisplayedRow)
+        {
+            Rectangle editingControlBounds =
+                PositionEditingPanel(cellBounds, cellClip, cellStyle, singleVerticalBorderAdded,
+                                     singleHorizontalBorderAdded, isFirstDisplayedColumn, isFirstDisplayedRow);
+
+            editingControlBounds = GetAdjustedEditingControlBounds(editingControlBounds, cellStyle);
+
+            DataGridView.EditingControl.Location = new Point(editingControlBounds.X, editingControlBounds.Y);
+            DataGridView.EditingControl.Size = new Size(editingControlBounds.Width, editingControlBounds.Height);
+        }
+
+        #endregion
+
+        #region GetAdjustedEditingControlBounds
+
+        /// <summary>
+        /// GetAdjustedEditingControlBounds
+        /// </summary>
+        /// <param name="editingControlBounds"></param>
+        /// <param name="cellStyle"></param>
+        /// <returns></returns>
+        private Rectangle GetAdjustedEditingControlBounds(
+            Rectangle editingControlBounds, DataGridViewCellStyle cellStyle)
+        {
+            // Add a 1 pixel padding around the editing control
+
+            editingControlBounds.X += 1;
+            editingControlBounds.Y += 1;
+            editingControlBounds.Width = Math.Max(0, editingControlBounds.Width - 2);
+            editingControlBounds.Height = Math.Max(0, editingControlBounds.Height - 2);
+
+            // Adjust the vertical location of the editing control
+
+            Rectangle r = GetCellBounds(editingControlBounds);
+
+            if (cellStyle != null && r.Height < editingControlBounds.Height)
+            {
+                switch (cellStyle.Alignment)
+                {
+                    case DataGridViewContentAlignment.MiddleLeft:
+                    case DataGridViewContentAlignment.MiddleCenter:
+                    case DataGridViewContentAlignment.MiddleRight:
+                        editingControlBounds.Y += (editingControlBounds.Height - r.Height) / 2;
+                        break;
+
+                    case DataGridViewContentAlignment.BottomLeft:
+                    case DataGridViewContentAlignment.BottomCenter:
+                    case DataGridViewContentAlignment.BottomRight:
+                        editingControlBounds.Y += (editingControlBounds.Height - r.Height);
+                        break;
+                }
+            }
+
+            editingControlBounds.Width = Math.Max(1, editingControlBounds.Width);
+            editingControlBounds.Height = Math.Max(1, r.Height);
+
+            return (editingControlBounds);
+        }
+
+        #endregion
+
+        #region GetPreferredSize
+
+        #region GetPreferredSize
+
+        /// <summary>
+        /// GetPreferredSize
+        /// </summary>
+        /// <param name="graphics"></param>
+        /// <param name="cellStyle"></param>
+        /// <param name="rowIndex"></param>
+        /// <param name="constraintSize"></param>
+        /// <returns></returns>
+        protected override Size GetPreferredSize(Graphics graphics,
+               DataGridViewCellStyle cellStyle, int rowIndex, Size constraintSize)
+        {
+            if (DataGridView == null)
+                return (new Size(-1, -1));
+
+            Size preferredSize = base.GetPreferredSize(graphics, cellStyle, rowIndex, constraintSize);
+
+            DataGridViewDoubleInputColumn oc = OwningColumn as DataGridViewDoubleInputColumn;
+
+            if (oc != null)
+            {
+                DoubleInput di = oc.DoubleInput;
+
+                preferredSize.Height = di.Height;
+
+                if (constraintSize.Width == 0)
+                {
+                    preferredSize.Width += GetImageWidth(di.ButtonClear);
+                    preferredSize.Width += GetImageWidth(di.ButtonCustom);
+                    preferredSize.Width += GetImageWidth(di.ButtonCustom2);
+                    preferredSize.Width += GetImageWidth(di.ButtonDropDown);
+                    preferredSize.Width += GetImageWidth(di.ButtonFreeText);
+
+                    if (di.ShowUpDown == true)
+                        preferredSize.Width += 16;
+
+                    if (di.ShowCheckBox == true)
+                        preferredSize.Width += 16;
+                }
+            }
+
+            return (preferredSize);
+        }
+
+        #endregion
+
+        #region GetFormattedValue
+
+        protected override object GetFormattedValue(object value, int rowIndex,
+            ref DataGridViewCellStyle cellStyle, TypeConverter valueTypeConverter,
+            TypeConverter formattedValueTypeConverter, DataGridViewDataErrorContexts context)
+        {
+            DataGridViewDoubleInputColumn oc = OwningColumn as DataGridViewDoubleInputColumn;
+
+            if (oc != null)
+            {
+                DoubleInput di = oc.DoubleInput;
+                di.Value = GetValue(value);
+
+                return (di.Text);
+            }
+
+            return (base.GetFormattedValue(value, rowIndex,
+                ref cellStyle, valueTypeConverter, formattedValueTypeConverter, context));
+        }
+
+        #endregion
+
+        #region GetImageWidth
+
+        private int GetImageWidth(InputButtonSettings ibs)
+        {
+            if (ibs.Visible == true)
+                return (ibs.Image != null ? ibs.Image.Width : 16);
+
+            return (0);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Paint
+
+        #region Paint
+
+        /// <summary>
+        /// Cell painting
+        /// </summary>
+        /// <param name="graphics"></param>
+        /// <param name="clipBounds"></param>
+        /// <param name="cellBounds"></param>
+        /// <param name="rowIndex"></param>
+        /// <param name="elementState"></param>
+        /// <param name="value"></param>
+        /// <param name="formattedValue"></param>
+        /// <param name="errorText"></param>
+        /// <param name="cellStyle"></param>
+        /// <param name="advancedBorderStyle"></param>
+        /// <param name="paintParts"></param>
+        protected override void Paint(Graphics graphics,
+            Rectangle clipBounds, Rectangle cellBounds, int rowIndex,
+            DataGridViewElementStates elementState, object value, object formattedValue,
+            string errorText, DataGridViewCellStyle cellStyle,
+            DataGridViewAdvancedBorderStyle advancedBorderStyle,
+            DataGridViewPaintParts paintParts)
+        {
+            if (DataGridView != null)
+            {
+                // First paint the borders of the cell
+
+                if (PartsSet(paintParts, DataGridViewPaintParts.Border))
+                    PaintBorder(graphics, clipBounds, cellBounds, cellStyle, advancedBorderStyle);
+
+                // Now paint the background and content
+
+                if (PartsSet(paintParts, DataGridViewPaintParts.Background))
+                {
+                    Rectangle rBk = GetBackBounds(cellBounds, advancedBorderStyle);
+
+                    if (rBk.Height > 0 && rBk.Width > 0)
+                    {
+                        DataGridViewDoubleInputColumn oc = (DataGridViewDoubleInputColumn)OwningColumn;
+                        Bitmap bm = oc.GetCellBitmap(cellBounds);
+
+                        if (bm != null)
+                        {
+                            using (Graphics g = Graphics.FromImage(bm))
+                            {
+                                PaintCellBackground(g, cellStyle, rBk);
+                                PaintCellContent(g, cellBounds, rowIndex, value, cellStyle, paintParts);
+
+                                graphics.DrawImageUnscaledAndClipped(bm, rBk);
+                            }
+
+                            if ((DataGridView.ShowCellErrors == true) &&
+                                (paintParts & DataGridViewPaintParts.ErrorIcon) == DataGridViewPaintParts.ErrorIcon)
+                            {
+                                base.PaintErrorIcon(graphics, clipBounds, cellBounds, errorText);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region PaintCellBackground
+
+        /// <summary>
+        /// Paints the cell background
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="cellStyle"></param>
+        /// <param name="rBack"></param>
+        private void PaintCellBackground(Graphics g,
+            DataGridViewCellStyle cellStyle, Rectangle rBack)
+        {
+            Rectangle r = rBack;
+            r.Location = new Point(0, 0);
+
+            DataGridViewX dx = DataGridView as DataGridViewX;
+
+            if (dx != null && dx.Enabled == true && Selected == true &&
+                dx.PaintEnhancedSelection == true)
+            {
+                Office2007ButtonItemPainter.PaintBackground(g, dx.ButtonStateColorTable,
+                    r, RoundRectangleShapeDescriptor.RectangleShape, false,
+                    false);
+            }
+            else
+            {
+                Color color = (Selected == true)
+                    ? cellStyle.SelectionBackColor : cellStyle.BackColor;
+
+                using (Brush br = new SolidBrush(color))
+                    g.FillRectangle(br, r);
+            }
+        }
+
+        #endregion
+
+        #region PaintCellContent
+
+        /// <summary>
+        /// Paints the cell content
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="cellBounds"></param>
+        /// <param name="rowIndex"></param>
+        /// <param name="value"></param>
+        /// <param name="cellStyle"></param>
+        /// <param name="paintParts"></param>
+        private void PaintCellContent(Graphics g, Rectangle cellBounds, int rowIndex, object value,
+            DataGridViewCellStyle cellStyle, DataGridViewPaintParts paintParts)
+        {
+            DataGridViewDoubleInputColumn oc = (DataGridViewDoubleInputColumn)OwningColumn;
+            DoubleInput di = oc.DoubleInput;
+
+            Point ptCurrentCell = DataGridView.CurrentCellAddress;
+            bool cellCurrent = ptCurrentCell.X == ColumnIndex && ptCurrentCell.Y == rowIndex;
+            bool cellEdited = cellCurrent && DataGridView.EditingControl != null;
+
+            // If the cell is in editing mode, there is nothing else to paint
+
+            if (cellEdited == false && rowIndex < DataGridView.RowCount)
+            {
+                if (PartsSet(paintParts, DataGridViewPaintParts.ContentForeground))
+                {
+                    cellBounds.X = 0;
+                    cellBounds.Y = 0;
+                    cellBounds.Width -= (oc.DividerWidth + 1);
+                    cellBounds.Height -= 1;
+
+                    di.Font = cellStyle.Font;
+                    di.ForeColor = cellStyle.ForeColor;
+                    di.BackColor = Selected ? Color.Transparent : cellStyle.BackColor;
+
+                    di.BackgroundStyle.TextColor = cellStyle.ForeColor;
+                    di.BackgroundStyle.BackColor = Selected ? Color.Transparent : cellStyle.BackColor;
+
+                    di.InputHorizontalAlignment = GetHorizontalAlignment(cellStyle.Alignment);
+
+                    di.Value = GetValue(value);
+
+                    oc.OnBeforeCellPaint(rowIndex, ColumnIndex);
+
+                    Rectangle r = GetAdjustedEditingControlBounds(cellBounds, cellStyle);
+
+                    if (oc.DisplayControlForCurrentCellOnly == false)
+                        DrawControl(di, r, g);
+                    else
+                        DrawText(di, r, g);
+                }
+            }
+        }
+
+        #region DrawControl
+
+        /// <summary>
+        /// DrawControl
+        /// </summary>
+        /// <param name="di"></param>
+        /// <param name="r"></param>
+        /// <param name="g"></param>
+        private void DrawControl(DoubleInput di, Rectangle r, Graphics g)
+        {
+            GraphicsState gs = g.Save();
+
+            try
+            {
+                g.TranslateTransform(r.X, r.Y);
+
+                di.Width = r.Width;
+                di.InternalPaint(new PaintEventArgs(g, Rectangle.Empty));
+            }
+            finally
+            {
+                g.Restore(gs);
+            }
+        }
+
+        #endregion
+
+        #region DrawText
+
+        /// <summary>
+        /// DrawText
+        /// </summary>
+        /// <param name="di"></param>
+        /// <param name="r"></param>
+        /// <param name="g"></param>
+        private void DrawText(DoubleInput di, Rectangle r, Graphics g)
+        {
+            r.Inflate(-2, 0);
+
+            eTextFormat tf = eTextFormat.VerticalCenter;
+
+            switch (di.InputHorizontalAlignment)
+            {
+                case eHorizontalAlignment.Center:
+                    tf |= eTextFormat.HorizontalCenter;
+                    break;
+
+                case eHorizontalAlignment.Right:
+                    tf |= eTextFormat.Right;
+                    break;
+            }
+
+            TextDrawing.DrawString(g, di.Text, di.Font, di.ForeColor, r, tf);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region GetBackBounds
+
+        /// <summary>
+        /// Gets the background bounds for the given cell
+        /// </summary>
+        /// <param name="cellBounds"></param>
+        /// <param name="advancedBorderStyle"></param>
+        /// <returns></returns>
+        private Rectangle GetBackBounds(
+            Rectangle cellBounds, DataGridViewAdvancedBorderStyle advancedBorderStyle)
+        {
+            DataGridViewDoubleInputColumn oc = (DataGridViewDoubleInputColumn)OwningColumn;
+
+            Rectangle r = BorderWidths(advancedBorderStyle);
+
+            cellBounds.Offset(r.X, r.Y);
+            cellBounds.Width -= r.Right;
+            cellBounds.Height -= r.Bottom;
+
+            if (Selected == true)
+                cellBounds.Width += oc.DividerWidth;
+
+            return (cellBounds);
+        }
+
+        #endregion
+
+        #region GetCellBounds
+
+        /// <summary>
+        /// Gets the button bounds for the given cell
+        /// </summary>
+        /// <param name="cellBounds"></param>
+        /// <returns></returns>
+        private Rectangle GetCellBounds(Rectangle cellBounds)
+        {
+            DataGridViewDoubleInputColumn oc = (DataGridViewDoubleInputColumn)OwningColumn;
+
+            Size size = oc.DoubleInput.Size;
+
+            cellBounds.Location = new Point(1, 1);
+
+            cellBounds.Width = Math.Min(size.Width, cellBounds.Width);
+            cellBounds.Width -= oc.DividerWidth;
+            cellBounds.Height = size.Height;
+
+            return (cellBounds);
+        }
+
+        #endregion
+
+        #region GetValue
+
+        /// <summary>
+        /// GetValue
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        private double GetValue(object value)
+        {
+            if (value == Convert.DBNull ||
+                (value is string && String.IsNullOrEmpty((string)value) == true))
+            {
+                return (0);
+            }
+            if (value is string)
+            {
+                string svalue = value.ToString();
+                return Convert.ToDouble(svalue.Replace(" ", ""));
+            }
+            return (Convert.ToDouble(value));
+        }
+
+        #endregion
+
+        #region GetHorizontalAlignment
+
+        /// <summary>
+        /// GetHorizontalAlignment
+        /// </summary>
+        /// <param name="alignment"></param>
+        /// <returns></returns>
+        private eHorizontalAlignment GetHorizontalAlignment(DataGridViewContentAlignment alignment)
+        {
+            switch (alignment)
+            {
+                case DataGridViewContentAlignment.TopCenter:
+                case DataGridViewContentAlignment.MiddleCenter:
+                case DataGridViewContentAlignment.BottomCenter:
+                    return (eHorizontalAlignment.Center);
+
+                case DataGridViewContentAlignment.TopRight:
+                case DataGridViewContentAlignment.MiddleRight:
+                case DataGridViewContentAlignment.BottomRight:
+                    return (eHorizontalAlignment.Right);
+
+                default:
+                    return (eHorizontalAlignment.Left);
+            }
+        }
+
+        #endregion
+
+        #region PartsSet
+
+        /// <summary>
+        /// Determines if the given part is set
+        /// </summary>
+        /// <param name="paintParts"></param>
+        /// <param name="parts"></param>
+        /// <returns></returns>
+        private bool PartsSet(DataGridViewPaintParts paintParts, DataGridViewPaintParts parts)
+        {
+            return ((paintParts & parts) == parts);
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewDoubleInput/DataGridViewDoubleInputColumn.cs b/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewDoubleInput/DataGridViewDoubleInputColumn.cs
new file mode 100644
index 00000000..0aa6d49b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewDoubleInput/DataGridViewDoubleInputColumn.cs	
@@ -0,0 +1,597 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Runtime.InteropServices;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.Rendering;
+using DevComponents.Editors;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    [ToolboxBitmap(typeof(DataGridViewButtonXColumn), "DoubleInput.ico"), ToolboxItem(false), ComVisible(false)]
+    public class DataGridViewDoubleInputColumn : DataGridViewTextBoxColumn, IDataGridViewColumn
+    {
+        #region Events
+
+        /// <summary>
+        /// Occurs right before a DoubleInput Cell is painted
+        /// </summary>
+        [Description("Occurs right before a DoubleInput Cell is painted.")]
+        public event EventHandler<BeforeCellPaintEventArgs> BeforeCellPaint;
+
+        /// <summary>
+        /// Occurs when Clear button is clicked and allows you
+        /// to cancel the default action performed by the button
+        /// </summary>
+        [Description("Occurs when Clear button is clicked and allows you to cancel the default action performed by the button.")]
+        public event EventHandler<CancelEventArgs> ButtonClearClick;
+
+        /// <summary>
+        /// Occurs when ButtonCustom control is clicked
+        /// </summary>
+        [Description("Occurs when ButtonCustom control is clicked.")]
+        public event EventHandler<EventArgs> ButtonCustomClick;
+
+        /// <summary>
+        /// Occurs when ButtonCustom2 control is clicked
+        /// </summary>
+        [Description("Occurs when ButtonCustom2 control is clicked.")]
+        public event EventHandler<EventArgs> ButtonCustom2Click;
+
+        /// <summary>
+        /// Occurs when Drop-Down button that shows calendar
+        /// is clicked and allows you to cancel showing of the popup
+        /// </summary>
+        [Description("Occurs when Drop-Down button that shows calendar is clicked and allows you to cancel showing of the popup.")]
+        public event EventHandler<CancelEventArgs> ButtonDropDownClick;
+
+        /// <summary>
+        /// Occurs when Free-Text button is clicked
+        /// and allows you to cancel its default action
+        /// </summary>
+        [Description("Occurs when Free-Text button is clicked and allows you to cancel its default action.")]
+        public event EventHandler<CancelEventArgs> ButtonFreeTextClick;
+
+        /// <summary>
+        /// Occurs if Free-Text entry value is not natively recognized by
+        /// the control and provides you with opportunity to convert that
+        /// value to the value the control expects
+        /// </summary>
+        [Description("Occurs if Free-Text entry value is not natively recognized by the control and provides you with opportunity to convert that value to the value the control expects.")]
+        public event EventHandler<FreeTextEntryConversionEventArgs> ConvertFreeTextEntry;
+
+        #endregion
+
+        #region Private variables
+
+        private DoubleInput _DoubleInput;
+        private Bitmap _CellBitmap;
+        private bool _DisplayControlForCurrentCellOnly = true;
+
+        #endregion
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        public DataGridViewDoubleInputColumn()
+        {
+            CellTemplate = new DataGridViewDoubleInputCell();
+
+            _DoubleInput = new DoubleInput();
+
+            _DoubleInput.BackgroundStyle.Class = ElementStyleClassKeys.DataGridViewNumericBorderKey;
+            _DoubleInput.Visible = false;
+        }
+
+        #region Internal properties
+
+        #region DoubleInput
+
+        /// <summary>
+        /// DoubleInput
+        /// </summary>
+        internal DoubleInput DoubleInput
+        {
+            get { return (_DoubleInput); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Public properties
+
+        #region BackgroundStyle
+
+        /// <summary>
+        /// Specifies the background style of the control.
+        /// </summary>
+        [Browsable(true), Category("Style")]
+        [Description("Gets or sets control background style.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ElementStyle BackgroundStyle
+        {
+            get { return (_DoubleInput.BackgroundStyle); }
+        }
+
+        /// <summary>
+        /// Resets style to default value. Used by windows forms designer.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetBackgroundStyle()
+        {
+            _DoubleInput.ResetBackgroundStyle();
+
+            _DoubleInput.BackgroundStyle.Class = "TextBoxBorder";
+            _DoubleInput.BackgroundStyle.CornerType = eCornerType.Square;
+        }
+
+        #endregion
+
+        #region ButtonClear
+
+        /// <summary>
+        /// Gets the object that describes the settings for the button
+        /// that clears the content of the control when clicked.
+        /// </summary>
+        [Browsable(true), Category("Buttons")]
+        [Description("Describes the settings for the button that clears the content of the control when clicked.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public InputButtonSettings ButtonClear
+        {
+            get { return (_DoubleInput.ButtonClear); }
+        }
+
+        #endregion
+
+        #region ButtonCustom
+
+        /// <summary>
+        /// Gets the object that describes the settings for the custom button
+        /// that can execute an custom action of your choosing when clicked.
+        /// </summary>
+        [Browsable(true), Category("Buttons")]
+        [Description("Describes the settings for the custom button that can execute an custom action of your choosing when clicked.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public InputButtonSettings ButtonCustom
+        {
+            get { return (_DoubleInput.ButtonCustom); }
+        }
+
+        #endregion
+
+        #region ButtonCustom2
+
+        /// <summary>
+        /// Gets the object that describes the settings for the custom button that can execute an custom action of your choosing when clicked.
+        /// </summary>
+        [Browsable(true), Category("Buttons")]
+        [Description("Describes the settings for the custom button that can execute an custom action of your choosing when clicked.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public InputButtonSettings ButtonCustom2
+        {
+            get { return (_DoubleInput.ButtonCustom2); }
+        }
+
+        #endregion
+
+        #region ButtonDropDown
+
+        /// <summary>
+        /// Gets the object that describes the settings for the button
+        /// that shows drop-down when clicked.
+        /// </summary>
+        [Browsable(true), Category("Buttons")]
+        [Description("Describes the settings for the button that shows drop-down when clicked.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public InputButtonSettings ButtonDropDown
+        {
+            get { return (_DoubleInput.ButtonDropDown); }
+        }
+
+        #endregion
+
+        #region ButtonFreeText
+
+        /// <summary>
+        /// Gets the object that describes the settings for the button
+        /// that switches the control into the free-text entry mode when clicked.
+        /// </summary>
+        [Browsable(true), Category("Buttons")]
+        [Description("Describes the settings for the button that switches the control into the free-text entry mode when clicked.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public InputButtonSettings ButtonFreeText
+        {
+            get { return (_DoubleInput.ButtonFreeText); }
+        }
+
+        #endregion
+
+        #region DisplayFormat
+
+        /// <summary>
+        /// Gets or sets the Numeric String Format that is used to format
+        /// the numeric value entered for display purpose. Read more about
+        /// available formats in MSDN under "Standard Numeric Format Strings"
+        /// and "Custom Numeric Format Strings" topics.
+        /// <remarks>
+        /// The format specified here indicates the format for display purpose
+        /// only, not for the input purpose. For example to display the number
+        /// in system Currency format set the DisplayFormat to 'C'.
+        /// </remarks>
+        /// </summary>
+        [Browsable(true), DefaultValue("")]
+        [Description("Indicates Numeric String Format that is used to format the numeric value entered for display purpose.")]
+        public string DisplayFormat
+        {
+            get { return (_DoubleInput.DisplayFormat); }
+            set { _DoubleInput.DisplayFormat = value; }
+        }
+
+        #endregion
+
+        #region DisplayControlForCurrentCellOnly
+
+        /// <summary>
+        /// Gets or sets whether the control
+        /// will be displayed for the current cell only.
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Appearance")]
+        [Description("Indicates whether the control will be displayed for the current cell only.")]
+        public bool DisplayControlForCurrentCellOnly
+        {
+            get { return (_DisplayControlForCurrentCellOnly); }
+
+            set
+            {
+                if (_DisplayControlForCurrentCellOnly != value)
+                {
+                    _DisplayControlForCurrentCellOnly = value;
+                    _DoubleInput.Invalidate();
+                }
+            }
+        }
+
+        #endregion
+
+        #region Enabled
+
+        /// <summary>
+        /// Gets or sets whether the control can respond to user interaction
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Behavior")]
+        [Description("Indicates whether the control can respond to user interaction.")]
+        public bool Enabled
+        {
+            get { return (_DoubleInput.Enabled); }
+            set { _DoubleInput.Enabled = value; }
+        }
+
+        #endregion
+
+        #region Increment
+
+        /// <summary>
+        /// Gets or sets the value to increment or decrement the value of the
+        /// control when the up or down buttons are clicked. 
+        /// </summary>
+        [Browsable(true), DefaultValue(1)]
+        [Description("Indicates value to increment or decrement the value of the control when the up or down buttons are clicked. ")]
+        public double Increment
+        {
+            get { return (_DoubleInput.Increment); }
+            set { _DoubleInput.Increment = value; }
+        }
+
+        #endregion
+
+        #region InputHorizontalAlignment
+
+        /// <summary>
+        /// Gets or sets the input field alignment inside the control
+        /// </summary>
+        [Browsable(true), DefaultValue(eHorizontalAlignment.Right), Category("Appearance")]
+        [Description("Indicates alignment of input fields inside of the control.")]
+        public eHorizontalAlignment InputHorizontalAlignment
+        {
+            get { return (_DoubleInput.InputHorizontalAlignment); }
+            set { _DoubleInput.InputHorizontalAlignment = value; }
+        }
+
+        #endregion
+
+        #region LockUpdateChecked
+
+        /// <summary>
+        /// Gets or sets whether check box shown using ShowCheckBox
+        /// property which locks/unlocks the control update is checked.
+        /// </summary>
+        [Browsable(true), DefaultValue(true)]
+        [Description("Indicates whether check box shown using ShowCheckBox property which locks/unlocks the control update is checked.")]
+        public bool LockUpdateChecked
+        {
+            get { return (_DoubleInput.LockUpdateChecked); }
+            set { _DoubleInput.LockUpdateChecked = value; }
+        }
+
+        #endregion
+
+        #region MaxValue
+
+        /// <summary>
+        /// Gets or sets the maximum value that can be entered.
+        /// </summary>
+        [Browsable(true), DefaultValue(double.MaxValue)]
+        [Description("Indicates maximum value that can be entered.")]
+        public double MaxValue
+        {
+            get { return (_DoubleInput.MaxValue); }
+            set { _DoubleInput.MaxValue = value; }
+        }
+
+        #endregion
+
+        #region MinValue
+
+        /// <summary>
+        /// Gets or sets the minimum value that can be entered.
+        /// </summary>
+        [Browsable(true), DefaultValue(double.MinValue)]
+        [Description("Indicates minimum value that can be entered.")]
+        public double MinValue
+        {
+            get { return (_DoubleInput.MinValue); }
+            set { _DoubleInput.MinValue = value; }
+        }
+
+        #endregion
+
+        #region ShowCheckBox
+
+        /// <summary>
+        /// Gets or sets a value indicating whether a check box is
+        /// displayed to the left of the input value. Set to true if a check box
+        /// is displayed to the left of the input value; otherwise, false. The default is false.
+        /// <remarks>
+        /// When the ShowCheckBox property is set to true, a check box is displayed
+        /// to the left of the input in the control. When the check box is selected, the value
+        /// can be updated. When the check box is cleared, the value is unable to be changed.
+        /// You can handle the LockUpdateChanged event to be notified when this check box is checked
+        /// and unchecked. Use LockUpdateChecked property to get or sets whether check box is checked.
+        /// </remarks>
+        /// </summary>
+        [Browsable(true), DefaultValue(false)]
+        [Description("Indicates whether a check box is displayed to the left of the input value which allows locking of the control.")]
+        public bool ShowCheckBox
+        {
+            get { return (_DoubleInput.ShowCheckBox); }
+            set { _DoubleInput.ShowCheckBox = value; }
+        }
+
+        #endregion
+
+        #region ShowUpDown
+
+        /// <summary>
+        /// Gets or sets a value indicating whether a spin button control
+        /// (up-down control) is used to adjust the current value. The default is false. 
+        /// <remarks>
+        /// When the ShowUpDown property is set to true, a spin button control
+        /// is shown to adjust value of currently focused input item. The value can
+        /// be adjusted by using the up and down buttons to change the value.
+        /// </remarks>
+        /// </summary>
+        [Browsable(true), DefaultValue(false)]
+        public bool ShowUpDown
+        {
+            get { return (_DoubleInput.ShowUpDown); }
+            set { _DoubleInput.ShowUpDown = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Event processing
+
+        #region DoButtonClearClick
+
+        /// <summary>
+        /// DoButtonClearClick
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        internal void DoButtonClearClick(object sender, CancelEventArgs e)
+        {
+            if (ButtonClearClick != null)
+                ButtonClearClick(this, e);
+        }
+
+        #endregion
+
+        #region DoButtonCustomClick
+
+        /// <summary>
+        /// DoButtonCustomClick
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        internal void DoButtonCustomClick(object sender, EventArgs e)
+        {
+            if (ButtonCustomClick != null)
+                ButtonCustomClick(this, e);
+        }
+
+        #endregion
+
+        #region DoButtonCustom2Click
+
+        /// <summary>
+        /// DoButtonCustom2Click
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        internal void DoButtonCustom2Click(object sender, EventArgs e)
+        {
+            if (ButtonCustom2Click != null)
+                ButtonCustom2Click(this, e);
+        }
+
+        #endregion
+
+        #region DoButtonDropDownClick
+
+        /// <summary>
+        /// DoButtonDropDownClick
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        internal void DoButtonDropDownClick(object sender, CancelEventArgs e)
+        {
+            if (ButtonDropDownClick != null)
+                ButtonDropDownClick(this, e);
+        }
+
+        #endregion
+
+        #region DoButtonFreeTextClick
+
+        /// <summary>
+        /// DoButtonFreeTextClick
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        internal void DoButtonFreeTextClick(object sender, CancelEventArgs e)
+        {
+            if (ButtonFreeTextClick != null)
+                ButtonFreeTextClick(this, e);
+        }
+
+        #endregion
+
+        #region DoConvertFreeTextEntry
+
+        /// <summary>
+        /// DoConvertFreeTextEntry
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        internal void DoConvertFreeTextEntry(object sender, FreeTextEntryConversionEventArgs e)
+        {
+            if (ConvertFreeTextEntry != null)
+                ConvertFreeTextEntry(this, e);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetCellBitmap
+
+        /// <summary>
+        /// Gets the cell paint bitmap
+        /// </summary>
+        /// <param name="cellBounds"></param>
+        /// <returns></returns>
+        internal Bitmap GetCellBitmap(Rectangle cellBounds)
+        {
+            if (_CellBitmap == null ||
+                (_CellBitmap.Width != cellBounds.Width || _CellBitmap.Height < cellBounds.Height))
+            {
+                if (_CellBitmap != null)
+                    _CellBitmap.Dispose();
+
+                _CellBitmap = new Bitmap(cellBounds.Width, cellBounds.Height);
+            }
+
+            return (_CellBitmap);
+        }
+
+        #endregion
+
+        #region OnBeforeCellPaint
+
+        /// <summary>
+        /// Invokes BeforeCellPaint user events
+        /// </summary>
+        /// <param name="rowIndex">Row index</param>
+        /// <param name="columnIndex">Column index</param>
+        internal void OnBeforeCellPaint(int rowIndex, int columnIndex)
+        {
+            if (BeforeCellPaint != null)
+                BeforeCellPaint(this, new BeforeCellPaintEventArgs(rowIndex, columnIndex));
+        }
+
+        #endregion
+
+        #region ICloneable members
+
+        /// <summary>
+        /// Clones the ButtonX Column
+        /// </summary>
+        /// <returns></returns>
+        public override object Clone()
+        {
+            DataGridViewDoubleInputColumn dc = base.Clone() as DataGridViewDoubleInputColumn;
+
+            if (dc != null)
+            {
+                dc.DisplayFormat = DisplayFormat;
+                dc.Enabled = Enabled;
+                dc.Increment = Increment;
+                dc.InputHorizontalAlignment = InputHorizontalAlignment;
+                dc.LockUpdateChecked = LockUpdateChecked;
+                dc.MaxValue = MaxValue;
+                dc.MinValue = MinValue;
+                dc.ShowCheckBox = ShowCheckBox;
+                dc.ShowUpDown = ShowUpDown;
+
+                dc.DisplayControlForCurrentCellOnly = DisplayControlForCurrentCellOnly;
+
+                dc.BackgroundStyle.ApplyStyle(DoubleInput.BackgroundStyle);
+                dc.BackgroundStyle.Class = DoubleInput.BackgroundStyle.Class;
+
+                DoubleInput.ButtonClear.CopyToItem(dc.DoubleInput.ButtonClear);
+                DoubleInput.ButtonDropDown.CopyToItem(dc.DoubleInput.ButtonDropDown);
+                DoubleInput.ButtonFreeText.CopyToItem(dc.DoubleInput.ButtonFreeText);
+                DoubleInput.ButtonCustom.CopyToItem(dc.DoubleInput.ButtonCustom);
+                DoubleInput.ButtonCustom2.CopyToItem(dc.DoubleInput.ButtonCustom2);
+            }
+
+            return (dc);
+        }
+
+        #endregion
+
+        #region Dispose
+
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing == true)
+                _DoubleInput.Dispose();
+
+            if (_CellBitmap != null)
+            {
+                _CellBitmap.Dispose();
+                _CellBitmap = null;
+            }
+
+            base.Dispose(disposing);
+        }
+
+        #endregion
+
+        #region IDataGridViewColumn Members
+
+        /// <summary>
+        /// Gets the Cell paint setting for the control
+        /// </summary>
+        [Browsable(false)]
+        public bool OwnerPaintCell
+        {
+            get { return (true); }
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewDoubleInput/DataGridViewDoubleInputEditingControl.cs b/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewDoubleInput/DataGridViewDoubleInputEditingControl.cs
new file mode 100644
index 00000000..69c1015f
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewDoubleInput/DataGridViewDoubleInputEditingControl.cs	
@@ -0,0 +1,211 @@
+using System;
+using System.ComponentModel;
+using System.Runtime.InteropServices;
+using System.Windows.Forms;
+using DevComponents.Editors;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    [ToolboxItem(false), ComVisible(false)]
+    public class DataGridViewDoubleInputEditingControl : DoubleInput, IDataGridViewEditingControl
+    {
+        #region Private variables
+
+        private DataGridView _DataGridView;
+
+        private int _RowIndex;
+        private bool _ValueChanged;
+        private bool _EditCancelled;
+
+        #endregion
+
+        #region OnValueChanged
+
+        /// <summary>
+        /// Handles OnValueChanged events
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnValueChanged(EventArgs e)
+        {
+            _ValueChanged = true;
+
+            _DataGridView.NotifyCurrentCellDirty(true);
+
+            base.OnValueChanged(e);
+        }
+
+        #endregion
+
+        #region Internal properties
+
+        /// <summary>
+        /// Gets or sets the Edit state
+        /// </summary>
+        internal bool EditCancelled
+        {
+            get { return (_EditCancelled); }
+            set { _EditCancelled = value; }
+        }
+
+        #endregion
+
+        #region IDataGridViewEditingControl Members
+
+        #region Public properties
+
+        #region EditingControlDataGridView
+
+        /// <summary>
+        /// Gets or sets the DataGridView
+        /// </summary>
+        public DataGridView EditingControlDataGridView
+        {
+            get { return (_DataGridView); }
+            set {_DataGridView = value; }
+        }
+
+        #endregion
+
+        #region EditingControlFormattedValue
+
+        /// <summary>
+        /// Gets or sets the Control Formatted Value
+        /// </summary>
+        public object EditingControlFormattedValue
+        {
+            get { return (Value.ToString()); }
+
+            set
+            {
+                string newValue = value as string;
+
+                if (newValue != null)
+                    Value = int.Parse(newValue);
+            }
+        }
+
+        #endregion
+
+        #region EditingControlRowIndex
+
+        /// <summary>
+        /// Gets or sets the Control RoeIndex
+        /// </summary>
+        public int EditingControlRowIndex
+        {
+            get { return (_RowIndex); } 
+            set { _RowIndex = value; }
+        }
+
+        #endregion
+
+        #region EditingControlValueChanged
+
+        /// <summary>
+        /// Gets or sets the Control ValueChanged state
+        /// </summary>
+        public bool EditingControlValueChanged
+        {
+            get { return (_ValueChanged); }
+            set { _ValueChanged = value; }
+        }
+
+        #endregion
+
+        #region EditingPanelCursor
+
+        /// <summary>
+        /// Gets the Panel Cursor
+        /// </summary>
+        public Cursor EditingPanelCursor
+        {
+            get { return (base.Cursor); }
+        }
+
+        #endregion
+
+        #region RepositionEditingControlOnValueChange
+
+        /// <summary>
+        /// Gets whether to RepositionEditingControlOnValueChange
+        /// </summary>
+        public bool RepositionEditingControlOnValueChange
+        {
+            get { return (false); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ApplyCellStyleToEditingControl
+
+        /// <summary>
+        /// ApplyCellStyleToEditingControl
+        /// </summary>
+        /// <param name="dataGridViewCellStyle"></param>
+        public void ApplyCellStyleToEditingControl(DataGridViewCellStyle dataGridViewCellStyle)
+        {
+            Font = dataGridViewCellStyle.Font;
+
+            ForeColor = dataGridViewCellStyle.ForeColor;
+            BackColor = dataGridViewCellStyle.BackColor;
+        }
+
+        #endregion
+
+        #region GetEditingControlFormattedValue
+
+        /// <summary>
+        /// Gets EditingControlFormattedValue
+        /// </summary>
+        /// <param name="context"></param>
+        /// <returns></returns>
+        public object GetEditingControlFormattedValue(DataGridViewDataErrorContexts context)
+        {
+            return (EditingControlFormattedValue);
+        }
+
+        #endregion
+
+        #region EditingControlWantsInputKey
+
+        /// <summary>
+        /// Gets whether the given key wants to be processed
+        /// by the Control
+        /// </summary>
+        /// <param name="keyData"></param>
+        /// <param name="dataGridViewWantsInputKey"></param>
+        /// <returns></returns>
+        public bool EditingControlWantsInputKey(Keys keyData, bool dataGridViewWantsInputKey)
+        {
+            if ((keyData & Keys.Right) == Keys.Right)
+                return (true);
+
+            if ((keyData & Keys.Left) == Keys.Left)
+                return (true);
+
+            if ((keyData & Keys.Escape) == Keys.Escape)
+                _EditCancelled = true;
+
+            return (dataGridViewWantsInputKey == false);
+        }
+
+        #endregion
+
+        #region PrepareEditingControlForEdit
+
+        /// <summary>
+        /// PrepareEditingControlForEdit
+        /// </summary>
+        /// <param name="selectAll"></param>
+        public void PrepareEditingControlForEdit(bool selectAll)
+        {
+        }
+
+        #endregion
+
+        #endregion
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewIntegerInput/DataGridViewIntegerInputCell.cs b/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewIntegerInput/DataGridViewIntegerInputCell.cs
new file mode 100644
index 00000000..0901f033
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewIntegerInput/DataGridViewIntegerInputCell.cs	
@@ -0,0 +1,724 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Media;
+using System.Windows.Forms;
+using DevComponents.Editors;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    public class DataGridViewIntegerInputCell : DataGridViewTextBoxCell
+    {
+        #region Public properties
+
+        #region EditType
+
+        /// <summary>
+        /// Gets the Type of the editing control associated with the cell
+        /// </summary>
+        public override Type EditType
+        {
+            get { return (typeof(DataGridViewIntegerInputEditingControl)); }
+        }
+
+        #endregion
+
+        #region FormattedValueType
+
+        /// <summary>
+        /// FormattedValueType
+        /// </summary>
+        public override Type FormattedValueType
+        {
+            get { return (typeof(string)); }
+        }
+
+        #endregion
+
+        #region ValueType
+
+        public override Type ValueType
+        {
+            get { return (typeof(int)); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InitializeEditingControl
+
+        /// <summary>
+        /// InitializeEditingControl
+        /// </summary>
+        /// <param name="rowIndex"></param>
+        /// <param name="initialFormattedValue"></param>
+        /// <param name="dataGridViewCellStyle"></param>
+        public override void InitializeEditingControl(int rowIndex,
+            object initialFormattedValue, DataGridViewCellStyle dataGridViewCellStyle)
+        {
+            DetachEditingControl();
+
+            base.InitializeEditingControl(rowIndex, initialFormattedValue, dataGridViewCellStyle);
+
+            DataGridViewIntegerInputEditingControl ctl =
+                (DataGridViewIntegerInputEditingControl)DataGridView.EditingControl;
+
+            DataGridViewIntegerInputColumn oc = OwningColumn as DataGridViewIntegerInputColumn;
+
+            if (oc != null)
+            {
+                IntegerInput di = oc.IntegerInput;
+
+                ctl.Value = GetValue(DataGridView[OwningColumn.Index, rowIndex].Value);
+
+                ctl.DisplayFormat = di.DisplayFormat;
+                ctl.Enabled = di.Enabled;
+                ctl.Increment = di.Increment;
+                ctl.InputHorizontalAlignment = GetHorizontalAlignment(dataGridViewCellStyle.Alignment);
+                ctl.LockUpdateChecked = di.LockUpdateChecked;
+                ctl.MaxValue = di.MaxValue;
+                ctl.MinValue = di.MinValue;
+                ctl.ShowCheckBox = di.ShowCheckBox;
+                ctl.ShowUpDown = di.ShowUpDown;
+
+                ctl.BackgroundStyle.ApplyStyle(di.BackgroundStyle);
+                ctl.BackgroundStyle.Class = di.BackgroundStyle.Class;
+
+                di.ButtonClear.CopyToItem(ctl.ButtonClear);
+                di.ButtonCustom.CopyToItem(ctl.ButtonCustom);
+                di.ButtonCustom2.CopyToItem(ctl.ButtonCustom2);
+                di.ButtonDropDown.CopyToItem(ctl.ButtonDropDown);
+                di.ButtonFreeText.CopyToItem(ctl.ButtonFreeText);
+
+                ctl.ButtonClearClick += ButtonClearClick;
+                ctl.ButtonCustomClick += ButtonCustomClick;
+                ctl.ButtonCustom2Click += ButtonCustom2Click;
+                ctl.ButtonDropDownClick += ButtonDropDownClick;
+                ctl.ButtonFreeTextClick += ButtonFreeTextClick;
+                ctl.ConvertFreeTextEntry += ConvertFreeTextEntry;
+
+                ctl.EditCancelled = false;
+            }
+        }
+
+        #endregion
+
+        #region DetachEditingControl
+
+        /// <summary>
+        /// DetachEditingControl
+        /// </summary>
+        public override void DetachEditingControl()
+        {
+            if (DataGridView != null && DataGridView.EditingControl != null)
+            {
+                DataGridViewIntegerInputEditingControl di =
+                    DataGridView.EditingControl as DataGridViewIntegerInputEditingControl;
+
+                if (di != null)
+                {
+                    di.ButtonClearClick -= ButtonClearClick;
+                    di.ButtonDropDownClick -= ButtonDropDownClick;
+                    di.ButtonFreeTextClick -= ButtonFreeTextClick;
+                    di.ButtonCustomClick -= ButtonCustomClick;
+                    di.ButtonCustom2Click -= ButtonCustom2Click;
+                    di.ConvertFreeTextEntry -= ConvertFreeTextEntry;
+
+                    if (di.EditCancelled == true)
+                    {
+                        di.EditCancelled = false;
+
+                        SystemSounds.Beep.Play();
+                    }
+                }
+            }
+
+            base.DetachEditingControl();
+        }
+
+        #endregion
+
+        #region Event processing
+
+        #region ButtonClearClick
+
+        /// <summary>
+        /// ButtonClearClick
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void ButtonClearClick(object sender, CancelEventArgs e)
+        {
+            ((DataGridViewIntegerInputColumn)OwningColumn).DoButtonClearClick(sender, e);
+        }
+
+        #endregion
+
+        #region ButtonCustomClick
+
+        /// <summary>
+        /// ButtonCustomClick
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void ButtonCustomClick(object sender, EventArgs e)
+        {
+            ((DataGridViewIntegerInputColumn)OwningColumn).DoButtonCustomClick(sender, e);
+        }
+
+        #endregion
+
+        #region ButtonCustom2Click
+
+        /// <summary>
+        /// ButtonCustom2Click
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void ButtonCustom2Click(object sender, EventArgs e)
+        {
+            ((DataGridViewIntegerInputColumn)OwningColumn).DoButtonCustom2Click(sender, e);
+        }
+
+        #endregion
+
+        #region ButtonDropDownClick
+
+        /// <summary>
+        /// ButtonDropDownClick
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void ButtonDropDownClick(object sender, CancelEventArgs e)
+        {
+            ((DataGridViewIntegerInputColumn)OwningColumn).DoButtonDropDownClick(sender, e);
+        }
+
+        #endregion
+
+        #region ButtonFreeTextClick
+
+        /// <summary>
+        /// ButtonFreeTextClick
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void ButtonFreeTextClick(object sender, CancelEventArgs e)
+        {
+            ((DataGridViewIntegerInputColumn)OwningColumn).DoButtonFreeTextClick(sender, e);
+        }
+
+        #endregion
+
+        #region ConvertFreeTextEntry
+
+        /// <summary>
+        /// ConvertFreeTextEntry
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void ConvertFreeTextEntry(object sender, FreeTextEntryConversionEventArgs e)
+        {
+            ((DataGridViewIntegerInputColumn)OwningColumn).DoConvertFreeTextEntry(sender, e);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region PositionEditingControl
+
+        /// <summary>
+        /// PositionEditingControl
+        /// </summary>
+        /// <param name="setLocation"></param>
+        /// <param name="setSize"></param>
+        /// <param name="cellBounds"></param>
+        /// <param name="cellClip"></param>
+        /// <param name="cellStyle"></param>
+        /// <param name="singleVerticalBorderAdded"></param>
+        /// <param name="singleHorizontalBorderAdded"></param>
+        /// <param name="isFirstDisplayedColumn"></param>
+        /// <param name="isFirstDisplayedRow"></param>
+        public override void PositionEditingControl(bool setLocation, bool setSize, Rectangle cellBounds,
+            Rectangle cellClip, DataGridViewCellStyle cellStyle, bool singleVerticalBorderAdded,
+            bool singleHorizontalBorderAdded, bool isFirstDisplayedColumn, bool isFirstDisplayedRow)
+        {
+            Rectangle editingControlBounds =
+                PositionEditingPanel(cellBounds, cellClip, cellStyle, singleVerticalBorderAdded,
+                                     singleHorizontalBorderAdded, isFirstDisplayedColumn, isFirstDisplayedRow);
+
+            editingControlBounds = GetAdjustedEditingControlBounds(editingControlBounds, cellStyle);
+
+            DataGridView.EditingControl.Location = new Point(editingControlBounds.X, editingControlBounds.Y);
+            DataGridView.EditingControl.Size = new Size(editingControlBounds.Width, editingControlBounds.Height);
+        }
+
+        #endregion
+
+        #region GetAdjustedEditingControlBounds
+
+        /// <summary>
+        /// GetAdjustedEditingControlBounds
+        /// </summary>
+        /// <param name="editingControlBounds"></param>
+        /// <param name="cellStyle"></param>
+        /// <returns></returns>
+        private Rectangle GetAdjustedEditingControlBounds(
+            Rectangle editingControlBounds, DataGridViewCellStyle cellStyle)
+        {
+            // Add a 1 pixel padding around the editing control
+
+            editingControlBounds.X += 1;
+            editingControlBounds.Y += 1;
+            editingControlBounds.Width = Math.Max(0, editingControlBounds.Width - 2);
+            editingControlBounds.Height = Math.Max(0, editingControlBounds.Height - 2);
+
+            // Adjust the vertical location of the editing control
+
+            Rectangle r = GetCellBounds(editingControlBounds);
+
+            if (r.Height < editingControlBounds.Height)
+            {
+                switch (cellStyle.Alignment)
+                {
+                    case DataGridViewContentAlignment.MiddleLeft:
+                    case DataGridViewContentAlignment.MiddleCenter:
+                    case DataGridViewContentAlignment.MiddleRight:
+                        editingControlBounds.Y += (editingControlBounds.Height - r.Height) / 2;
+                        break;
+
+                    case DataGridViewContentAlignment.BottomLeft:
+                    case DataGridViewContentAlignment.BottomCenter:
+                    case DataGridViewContentAlignment.BottomRight:
+                        editingControlBounds.Y += (editingControlBounds.Height - r.Height);
+                        break;
+                }
+            }
+
+            editingControlBounds.Width = Math.Max(1, editingControlBounds.Width);
+            editingControlBounds.Height = Math.Max(1, r.Height);
+
+            return (editingControlBounds);
+        }
+
+        #endregion
+
+        #region GetPreferredSize
+
+        #region GetPreferredSize
+
+        /// <summary>
+        /// GetPreferredSize
+        /// </summary>
+        /// <param name="graphics"></param>
+        /// <param name="cellStyle"></param>
+        /// <param name="rowIndex"></param>
+        /// <param name="constraintSize"></param>
+        /// <returns></returns>
+        protected override Size GetPreferredSize(Graphics graphics,
+               DataGridViewCellStyle cellStyle, int rowIndex, Size constraintSize)
+        {
+            if (DataGridView == null)
+                return (new Size(-1, -1));
+
+            Size preferredSize = base.GetPreferredSize(graphics, cellStyle, rowIndex, constraintSize);
+
+            DataGridViewIntegerInputColumn oc = OwningColumn as DataGridViewIntegerInputColumn;
+
+            if (oc != null)
+            {
+                IntegerInput ip = oc.IntegerInput;
+
+                preferredSize.Height = ip.Height;
+
+                if (constraintSize.Width == 0)
+                {
+                    preferredSize.Width += GetImageWidth(ip.ButtonClear);
+                    preferredSize.Width += GetImageWidth(ip.ButtonCustom);
+                    preferredSize.Width += GetImageWidth(ip.ButtonCustom2);
+                    preferredSize.Width += GetImageWidth(ip.ButtonDropDown);
+                    preferredSize.Width += GetImageWidth(ip.ButtonFreeText);
+
+                    if (ip.ShowUpDown == true)
+                        preferredSize.Width += 16;
+
+                    if (ip.ShowCheckBox == true)
+                        preferredSize.Width += 16;
+                }
+            }
+
+            return (preferredSize);
+        }
+
+        #endregion
+
+        #region GetFormattedValue
+
+        protected override object GetFormattedValue(object value, int rowIndex,
+            ref DataGridViewCellStyle cellStyle, TypeConverter valueTypeConverter,
+            TypeConverter formattedValueTypeConverter, DataGridViewDataErrorContexts context)
+        {
+            DataGridViewIntegerInputColumn oc = OwningColumn as DataGridViewIntegerInputColumn;
+
+            if (oc != null)
+            {
+                IntegerInput ip = oc.IntegerInput;
+                ip.Value = GetValue(value);
+
+                return (ip.Text);
+            }
+
+            return (base.GetFormattedValue(value, rowIndex,
+                ref cellStyle, valueTypeConverter, formattedValueTypeConverter, context));
+        }
+
+        #endregion
+
+        #region GetImageWidth
+
+        private int GetImageWidth(InputButtonSettings ibs)
+        {
+            if (ibs.Visible == true)
+                return (ibs.Image != null ? ibs.Image.Width : 16);
+
+            return (0);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Paint
+
+        #region Paint
+
+        /// <summary>
+        /// Cell painting
+        /// </summary>
+        /// <param name="graphics"></param>
+        /// <param name="clipBounds"></param>
+        /// <param name="cellBounds"></param>
+        /// <param name="rowIndex"></param>
+        /// <param name="elementState"></param>
+        /// <param name="value"></param>
+        /// <param name="formattedValue"></param>
+        /// <param name="errorText"></param>
+        /// <param name="cellStyle"></param>
+        /// <param name="advancedBorderStyle"></param>
+        /// <param name="paintParts"></param>
+        protected override void Paint(Graphics graphics,
+            Rectangle clipBounds, Rectangle cellBounds, int rowIndex,
+            DataGridViewElementStates elementState, object value, object formattedValue,
+            string errorText, DataGridViewCellStyle cellStyle,
+            DataGridViewAdvancedBorderStyle advancedBorderStyle,
+            DataGridViewPaintParts paintParts)
+        {
+            if (DataGridView != null)
+            {
+                // First paint the borders of the cell
+
+                if (PartsSet(paintParts, DataGridViewPaintParts.Border))
+                    PaintBorder(graphics, clipBounds, cellBounds, cellStyle, advancedBorderStyle);
+
+                // Now paint the background and content
+
+                if (PartsSet(paintParts, DataGridViewPaintParts.Background))
+                {
+                    Rectangle rBk = GetBackBounds(cellBounds, advancedBorderStyle);
+
+                    if (rBk.Height > 0 && rBk.Width > 0)
+                    {
+                        DataGridViewIntegerInputColumn oc = (DataGridViewIntegerInputColumn)OwningColumn;
+                        Bitmap bm = oc.GetCellBitmap(cellBounds);
+
+                        if (bm != null)
+                        {
+                            using (Graphics g = Graphics.FromImage(bm))
+                            {
+                                PaintCellBackground(g, cellStyle, rBk);
+                                PaintCellContent(g, cellBounds, rowIndex, value, cellStyle, paintParts);
+
+                                graphics.DrawImageUnscaledAndClipped(bm, rBk);
+                            }
+
+                            if ((DataGridView.ShowCellErrors == true) &&
+                                (paintParts & DataGridViewPaintParts.ErrorIcon) == DataGridViewPaintParts.ErrorIcon)
+                            {
+                                base.PaintErrorIcon(graphics, clipBounds, cellBounds, errorText);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region PaintCellBackground
+
+        /// <summary>
+        /// Paints the cell background
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="cellStyle"></param>
+        /// <param name="rBack"></param>
+        private void PaintCellBackground(Graphics g,
+            DataGridViewCellStyle cellStyle, Rectangle rBack)
+        {
+            Rectangle r = rBack;
+            r.Location = new Point(0, 0);
+
+            DataGridViewX dx = DataGridView as DataGridViewX;
+
+            if (dx != null && dx.Enabled == true && Selected == true &&
+                dx.PaintEnhancedSelection == true)
+            {
+                Office2007ButtonItemPainter.PaintBackground(g, dx.ButtonStateColorTable,
+                    r, RoundRectangleShapeDescriptor.RectangleShape, false,
+                    false);
+            }
+            else
+            {
+                Color color = (Selected == true)
+                    ? cellStyle.SelectionBackColor : cellStyle.BackColor;
+
+                using (Brush br = new SolidBrush(color))
+                    g.FillRectangle(br, r);
+            }
+        }
+
+        #endregion
+
+        #region PaintCellContent
+
+        /// <summary>
+        /// Paints the cell content
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="cellBounds"></param>
+        /// <param name="rowIndex"></param>
+        /// <param name="value"></param>
+        /// <param name="cellStyle"></param>
+        /// <param name="paintParts"></param>
+        private void PaintCellContent(Graphics g, Rectangle cellBounds, int rowIndex, object value,
+            DataGridViewCellStyle cellStyle, DataGridViewPaintParts paintParts)
+        {
+            DataGridViewIntegerInputColumn oc = (DataGridViewIntegerInputColumn)OwningColumn;
+            IntegerInput di = oc.IntegerInput;
+
+            Point ptCurrentCell = DataGridView.CurrentCellAddress;
+            bool cellCurrent = ptCurrentCell.X == ColumnIndex && ptCurrentCell.Y == rowIndex;
+            bool cellEdited = cellCurrent && DataGridView.EditingControl != null;
+
+            // If the cell is in editing mode, there is nothing else to paint
+
+            if (cellEdited == false && rowIndex < DataGridView.RowCount)
+            {
+                if (PartsSet(paintParts, DataGridViewPaintParts.ContentForeground))
+                {
+                    cellBounds.X = 0;
+                    cellBounds.Y = 0;
+                    cellBounds.Width -= (oc.DividerWidth + 1);
+                    cellBounds.Height -= 1;
+
+                    di.Font = cellStyle.Font;
+                    di.ForeColor = cellStyle.ForeColor;
+                    di.BackColor = Selected ? Color.Transparent : cellStyle.BackColor;
+
+                    di.BackgroundStyle.TextColor = cellStyle.ForeColor;
+                    di.BackgroundStyle.BackColor = Selected ? Color.Transparent : cellStyle.BackColor;
+                    di.InputHorizontalAlignment = GetHorizontalAlignment(cellStyle.Alignment);
+
+                    di.Value = GetValue(value);
+
+                    oc.OnBeforeCellPaint(rowIndex, ColumnIndex);
+
+                    Rectangle r = GetAdjustedEditingControlBounds(cellBounds, cellStyle);
+
+                    if (oc.DisplayControlForCurrentCellOnly == false)
+                        DrawControl(di, r, g);
+                    else
+                        DrawText(di, r, g);
+                }
+            }
+        }
+
+        #region DrawControl
+
+        /// <summary>
+        /// DrawControl
+        /// </summary>
+        /// <param name="di"></param>
+        /// <param name="r"></param>
+        /// <param name="g"></param>
+        private void DrawControl(IntegerInput di, Rectangle r, Graphics g)
+        {
+            GraphicsState gs = g.Save();
+
+            try
+            {
+                g.TranslateTransform(r.X, r.Y);
+
+                di.Width = r.Width;
+                di.InternalPaint(new PaintEventArgs(g, Rectangle.Empty));
+            }
+            finally
+            {
+                g.Restore(gs);
+            }
+        }
+
+        #endregion
+
+        #region DrawText
+
+        /// <summary>
+        /// DrawText
+        /// </summary>
+        /// <param name="di"></param>
+        /// <param name="r"></param>
+        /// <param name="g"></param>
+        private void DrawText(IntegerInput di, Rectangle r, Graphics g)
+        {
+            r.Inflate(-2, 0);
+
+            eTextFormat tf = eTextFormat.VerticalCenter;
+
+            switch (di.InputHorizontalAlignment)
+            {
+                case eHorizontalAlignment.Center:
+                    tf |= eTextFormat.HorizontalCenter;
+                    break;
+
+                case eHorizontalAlignment.Right:
+                    tf |= eTextFormat.Right;
+                    break;
+            }
+
+            TextDrawing.DrawString(g, di.Text, di.Font, di.ForeColor, r, tf);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region GetBackBounds
+
+        /// <summary>
+        /// Gets the background bounds for the given cell
+        /// </summary>
+        /// <param name="cellBounds"></param>
+        /// <param name="advancedBorderStyle"></param>
+        /// <returns></returns>
+        private Rectangle GetBackBounds(
+            Rectangle cellBounds, DataGridViewAdvancedBorderStyle advancedBorderStyle)
+        {
+            DataGridViewIntegerInputColumn oc = (DataGridViewIntegerInputColumn)OwningColumn;
+
+            Rectangle r = BorderWidths(advancedBorderStyle);
+
+            cellBounds.Offset(r.X, r.Y);
+            cellBounds.Width -= r.Right;
+            cellBounds.Height -= r.Bottom;
+
+            if (Selected == true)
+                cellBounds.Width += oc.DividerWidth;
+
+            return (cellBounds);
+        }
+
+        #endregion
+
+        #region GetCellBounds
+
+        /// <summary>
+        /// Gets the button bounds for the given cell
+        /// </summary>
+        /// <param name="cellBounds"></param>
+        /// <returns></returns>
+        private Rectangle GetCellBounds(Rectangle cellBounds)
+        {
+            DataGridViewIntegerInputColumn oc = (DataGridViewIntegerInputColumn)OwningColumn;
+
+            Size size = oc.IntegerInput.Size;
+
+            cellBounds.Location = new Point(1, 1);
+
+            cellBounds.Width = Math.Min(size.Width, cellBounds.Width);
+            cellBounds.Width -= oc.DividerWidth;
+            cellBounds.Height = size.Height;
+
+            return (cellBounds);
+        }
+
+        #endregion
+
+        #region GetValue
+
+        /// <summary>
+        /// GetValue
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        private int GetValue(object value)
+        {
+            if (value == Convert.DBNull ||
+                (value is string && String.IsNullOrEmpty((string) value) == true))
+            {
+                return (0);
+            }
+
+            return (Convert.ToInt32(value));
+        }
+
+        #endregion
+
+        #region GetHorizontalAlignment
+
+        /// <summary>
+        /// GetHorizontalAlignment
+        /// </summary>
+        /// <param name="alignment"></param>
+        /// <returns></returns>
+        private eHorizontalAlignment GetHorizontalAlignment(DataGridViewContentAlignment alignment)
+        {
+            switch (alignment)
+            {
+                case DataGridViewContentAlignment.TopCenter:
+                case DataGridViewContentAlignment.MiddleCenter:
+                case DataGridViewContentAlignment.BottomCenter:
+                    return (eHorizontalAlignment.Center);
+
+                case DataGridViewContentAlignment.TopRight:
+                case DataGridViewContentAlignment.MiddleRight:
+                case DataGridViewContentAlignment.BottomRight:
+                    return (eHorizontalAlignment.Right);
+
+                default:
+                    return (eHorizontalAlignment.Left);
+            }
+        }
+
+        #endregion
+
+        #region PartsSet
+
+        /// <summary>
+        /// Determines if the given part is set
+        /// </summary>
+        /// <param name="paintParts"></param>
+        /// <param name="parts"></param>
+        /// <returns></returns>
+        private bool PartsSet(DataGridViewPaintParts paintParts, DataGridViewPaintParts parts)
+        {
+            return ((paintParts & parts) == parts);
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewIntegerInput/DataGridViewIntegerInputColumn.cs b/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewIntegerInput/DataGridViewIntegerInputColumn.cs
new file mode 100644
index 00000000..e40feae0
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewIntegerInput/DataGridViewIntegerInputColumn.cs	
@@ -0,0 +1,597 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Runtime.InteropServices;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.Rendering;
+using DevComponents.Editors;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    [ToolboxBitmap(typeof(DataGridViewButtonXColumn), "IntegerInput.ico"), ToolboxItem(false), ComVisible(false)]
+    public class DataGridViewIntegerInputColumn : DataGridViewTextBoxColumn, IDataGridViewColumn
+    {
+        #region Events
+
+        /// <summary>
+        /// Occurs right before a DateTimeInput Cell is painted
+        /// </summary>
+        [Description("Occurs right before an IntegerInput Cell is painted.")]
+        public event EventHandler<BeforeCellPaintEventArgs> BeforeCellPaint;
+
+        /// <summary>
+        /// Occurs when Clear button is clicked and allows you
+        /// to cancel the default action performed by the button
+        /// </summary>
+        [Description("Occurs when Clear button is clicked and allows you to cancel the default action performed by the button.")]
+        public event EventHandler<CancelEventArgs> ButtonClearClick;
+
+        /// <summary>
+        /// Occurs when ButtonCustom control is clicked
+        /// </summary>
+        [Description("Occurs when ButtonCustom control is clicked.")]
+        public event EventHandler<EventArgs> ButtonCustomClick;
+
+        /// <summary>
+        /// Occurs when ButtonCustom2 control is clicked
+        /// </summary>
+        [Description("Occurs when ButtonCustom2 control is clicked.")]
+        public event EventHandler<EventArgs> ButtonCustom2Click;
+
+        /// <summary>
+        /// Occurs when Drop-Down button that shows calendar
+        /// is clicked and allows you to cancel showing of the popup
+        /// </summary>
+        [Description("Occurs when Drop-Down button that shows calendar is clicked and allows you to cancel showing of the popup.")]
+        public event EventHandler<CancelEventArgs> ButtonDropDownClick;
+
+        /// <summary>
+        /// Occurs when Free-Text button is clicked
+        /// and allows you to cancel its default action
+        /// </summary>
+        [Description("Occurs when Free-Text button is clicked and allows you to cancel its default action.")]
+        public event EventHandler<CancelEventArgs> ButtonFreeTextClick;
+
+        /// <summary>
+        /// Occurs if Free-Text entry value is not natively recognized by
+        /// the control and provides you with opportunity to convert that
+        /// value to the value the control expects
+        /// </summary>
+        [Description("Occurs if Free-Text entry value is not natively recognized by the control and provides you with opportunity to convert that value to the value the control expects.")]
+        public event EventHandler<FreeTextEntryConversionEventArgs> ConvertFreeTextEntry;
+
+        #endregion
+
+        #region Private variables
+
+        private IntegerInput _IngegerInput;
+        private Bitmap _CellBitmap;
+        private bool _DisplayControlForCurrentCellOnly = true;
+
+        #endregion
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        public DataGridViewIntegerInputColumn()
+        {
+            CellTemplate = new DataGridViewIntegerInputCell();
+
+            _IngegerInput = new IntegerInput();
+
+            _IngegerInput.BackgroundStyle.Class = ElementStyleClassKeys.DataGridViewNumericBorderKey;
+            _IngegerInput.Visible = false;
+        }
+
+        #region Internal properties
+
+        #region IntegerInput
+
+        /// <summary>
+        /// IntegerInput
+        /// </summary>
+        internal IntegerInput IntegerInput
+        {
+            get { return (_IngegerInput); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Public properties
+
+        #region BackgroundStyle
+
+        /// <summary>
+        /// Specifies the background style of the control.
+        /// </summary>
+        [Browsable(true), Category("Style")]
+        [Description("Gets or sets control background style.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ElementStyle BackgroundStyle
+        {
+            get { return (_IngegerInput.BackgroundStyle); }
+        }
+
+        /// <summary>
+        /// Resets style to default value. Used by windows forms designer.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetBackgroundStyle()
+        {
+            _IngegerInput.ResetBackgroundStyle();
+
+            _IngegerInput.BackgroundStyle.Class = "TextBoxBorder";
+            _IngegerInput.BackgroundStyle.CornerType = eCornerType.Square;
+        }
+
+        #endregion
+
+        #region ButtonClear
+
+        /// <summary>
+        /// Gets the object that describes the settings for the button
+        /// that clears the content of the control when clicked.
+        /// </summary>
+        [Browsable(true), Category("Buttons")]
+        [Description("Describes the settings for the button that clears the content of the control when clicked.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public InputButtonSettings ButtonClear
+        {
+            get { return (_IngegerInput.ButtonClear); }
+        }
+
+        #endregion
+
+        #region ButtonCustom
+
+        /// <summary>
+        /// Gets the object that describes the settings for the custom button
+        /// that can execute an custom action of your choosing when clicked.
+        /// </summary>
+        [Browsable(true), Category("Buttons")]
+        [Description("Describes the settings for the custom button that can execute an custom action of your choosing when clicked.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public InputButtonSettings ButtonCustom
+        {
+            get { return (_IngegerInput.ButtonCustom); }
+        }
+
+        #endregion
+
+        #region ButtonCustom2
+
+        /// <summary>
+        /// Gets the object that describes the settings for the custom button that can execute an custom action of your choosing when clicked.
+        /// </summary>
+        [Browsable(true), Category("Buttons")]
+        [Description("Describes the settings for the custom button that can execute an custom action of your choosing when clicked.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public InputButtonSettings ButtonCustom2
+        {
+            get { return (_IngegerInput.ButtonCustom2); }
+        }
+
+        #endregion
+
+        #region ButtonDropDown
+
+        /// <summary>
+        /// Gets the object that describes the settings for the button
+        /// that shows drop-down when clicked.
+        /// </summary>
+        [Browsable(true), Category("Buttons")]
+        [Description("Describes the settings for the button that shows drop-down when clicked.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public InputButtonSettings ButtonDropDown
+        {
+            get { return (_IngegerInput.ButtonDropDown); }
+        }
+
+        #endregion
+
+        #region ButtonFreeText
+
+        /// <summary>
+        /// Gets the object that describes the settings for the button
+        /// that switches the control into the free-text entry mode when clicked.
+        /// </summary>
+        [Browsable(true), Category("Buttons")]
+        [Description("Describes the settings for the button that switches the control into the free-text entry mode when clicked.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public InputButtonSettings ButtonFreeText
+        {
+            get { return (_IngegerInput.ButtonFreeText); }
+        }
+
+        #endregion
+
+        #region DisplayFormat
+
+        /// <summary>
+        /// Gets or sets the Numeric String Format that is used to format
+        /// the numeric value entered for display purpose. Read more about
+        /// available formats in MSDN under "Standard Numeric Format Strings"
+        /// and "Custom Numeric Format Strings" topics.
+        /// <remarks>
+        /// The format specified here indicates the format for display purpose
+        /// only, not for the input purpose. For example to display the number
+        /// in system Currency format set the DisplayFormat to 'C'.
+        /// </remarks>
+        /// </summary>
+        [Browsable(true), DefaultValue("")]
+        [Description("Indicates Numeric String Format that is used to format the numeric value entered for display purpose.")]
+        public string DisplayFormat
+        {
+            get { return (_IngegerInput.DisplayFormat); }
+            set { _IngegerInput.DisplayFormat = value; }
+        }
+
+        #endregion
+
+        #region DisplayControlForCurrentCellOnly
+
+        /// <summary>
+        /// Gets or sets whether the control
+        /// will be displayed for the current cell only.
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Appearance")]
+        [Description("Indicates whether the control will be displayed for the current cell only.")]
+        public bool DisplayControlForCurrentCellOnly
+        {
+            get { return (_DisplayControlForCurrentCellOnly); }
+
+            set
+            {
+                if (_DisplayControlForCurrentCellOnly != value)
+                {
+                    _DisplayControlForCurrentCellOnly = value;
+                    _IngegerInput.Invalidate();
+                }
+            }
+        }
+
+        #endregion
+
+        #region Enabled
+
+        /// <summary>
+        /// Gets or sets whether the control can respond to user interaction
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Behavior")]
+        [Description("Indicates whether the control can respond to user interaction.")]
+        public bool Enabled
+        {
+            get { return (_IngegerInput.Enabled); }
+            set { _IngegerInput.Enabled = value; }
+        }
+
+        #endregion
+
+        #region Increment
+
+        /// <summary>
+        /// Gets or sets the value to increment or decrement the value of the
+        /// control when the up or down buttons are clicked. 
+        /// </summary>
+        [Browsable(true), DefaultValue(1)]
+        [Description("Indicates value to increment or decrement the value of the control when the up or down buttons are clicked. ")]
+        public int Increment
+        {
+            get { return (_IngegerInput.Increment); }
+            set { _IngegerInput.Increment = value; }
+        }
+
+        #endregion
+
+        #region InputHorizontalAlignment
+
+        /// <summary>
+        /// Gets or sets the input field alignment inside the control
+        /// </summary>
+        [Browsable(true), DefaultValue(eHorizontalAlignment.Right), Category("Appearance")]
+        [Description("Indicates alignment of input fields inside of the control.")]
+        public eHorizontalAlignment InputHorizontalAlignment
+        {
+            get { return (_IngegerInput.InputHorizontalAlignment); }
+            set { _IngegerInput.InputHorizontalAlignment = value; }
+        }
+
+        #endregion
+
+        #region LockUpdateChecked
+
+        /// <summary>
+        /// Gets or sets whether check box shown using ShowCheckBox
+        /// property which locks/unlocks the control update is checked.
+        /// </summary>
+        [Browsable(true), DefaultValue(true)]
+        [Description("Indicates whether check box shown using ShowCheckBox property which locks/unlocks the control update is checked.")]
+        public bool LockUpdateChecked
+        {
+            get { return (_IngegerInput.LockUpdateChecked); }
+            set { _IngegerInput.LockUpdateChecked = value; }
+        }
+
+        #endregion
+
+        #region MaxValue
+
+        /// <summary>
+        /// Gets or sets the maximum value that can be entered.
+        /// </summary>
+        [Browsable(true), DefaultValue(int.MaxValue)]
+        [Description("Indicates maximum value that can be entered.")]
+        public int MaxValue
+        {
+            get { return (_IngegerInput.MaxValue); }
+            set { _IngegerInput.MaxValue = value; }
+        }
+
+        #endregion
+
+        #region MinValue
+
+        /// <summary>
+        /// Gets or sets the minimum value that can be entered.
+        /// </summary>
+        [Browsable(true), DefaultValue(int.MinValue)]
+        [Description("Indicates minimum value that can be entered.")]
+        public int MinValue
+        {
+            get { return (_IngegerInput.MinValue); }
+            set { _IngegerInput.MinValue = value; }
+        }
+
+        #endregion
+
+        #region ShowCheckBox
+
+        /// <summary>
+        /// Gets or sets a value indicating whether a check box is
+        /// displayed to the left of the input value. Set to true if a check box
+        /// is displayed to the left of the input value; otherwise, false. The default is false.
+        /// <remarks>
+        /// When the ShowCheckBox property is set to true, a check box is displayed
+        /// to the left of the input in the control. When the check box is selected, the value
+        /// can be updated. When the check box is cleared, the value is unable to be changed.
+        /// You can handle the LockUpdateChanged event to be notified when this check box is checked
+        /// and unchecked. Use LockUpdateChecked property to get or sets whether check box is checked.
+        /// </remarks>
+        /// </summary>
+        [Browsable(true), DefaultValue(false)]
+        [Description("Indicates whether a check box is displayed to the left of the input value which allows locking of the control.")]
+        public bool ShowCheckBox
+        {
+            get { return (_IngegerInput.ShowCheckBox); }
+            set { _IngegerInput.ShowCheckBox = value; }
+        }
+
+        #endregion
+
+        #region ShowUpDown
+
+        /// <summary>
+        /// Gets or sets a value indicating whether a spin button control
+        /// (up-down control) is used to adjust the current value. The default is false. 
+        /// <remarks>
+        /// When the ShowUpDown property is set to true, a spin button control
+        /// is shown to adjust value of currently focused input item. The value can
+        /// be adjusted by using the up and down buttons to change the value.
+        /// </remarks>
+        /// </summary>
+        [Browsable(true), DefaultValue(false)]
+        public bool ShowUpDown
+        {
+            get { return (_IngegerInput.ShowUpDown); }
+            set { _IngegerInput.ShowUpDown = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Event processing
+
+        #region DoButtonClearClick
+
+        /// <summary>
+        /// DoButtonClearClick
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        internal void DoButtonClearClick(object sender, CancelEventArgs e)
+        {
+            if (ButtonClearClick != null)
+                ButtonClearClick(this, e);
+        }
+
+        #endregion
+
+        #region DoButtonCustomClick
+
+        /// <summary>
+        /// DoButtonCustomClick
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        internal void DoButtonCustomClick(object sender, EventArgs e)
+        {
+            if (ButtonCustomClick != null)
+                ButtonCustomClick(this, e);
+        }
+
+        #endregion
+
+        #region DoButtonCustom2Click
+
+        /// <summary>
+        /// DoButtonCustom2Click
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        internal void DoButtonCustom2Click(object sender, EventArgs e)
+        {
+            if (ButtonCustom2Click != null)
+                ButtonCustom2Click(this, e);
+        }
+
+        #endregion
+
+        #region DoButtonDropDownClick
+
+        /// <summary>
+        /// DoButtonDropDownClick
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        internal void DoButtonDropDownClick(object sender, CancelEventArgs e)
+        {
+            if (ButtonDropDownClick != null)
+                ButtonDropDownClick(this, e);
+        }
+
+        #endregion
+
+        #region DoButtonFreeTextClick
+
+        /// <summary>
+        /// DoButtonFreeTextClick
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        internal void DoButtonFreeTextClick(object sender, CancelEventArgs e)
+        {
+            if (ButtonFreeTextClick != null)
+                ButtonFreeTextClick(this, e);
+        }
+
+        #endregion
+
+        #region DoConvertFreeTextEntry
+
+        /// <summary>
+        /// DoConvertFreeTextEntry
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        internal void DoConvertFreeTextEntry(object sender, FreeTextEntryConversionEventArgs e)
+        {
+            if (ConvertFreeTextEntry != null)
+                ConvertFreeTextEntry(this, e);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetCellBitmap
+
+        /// <summary>
+        /// Gets the cell paint bitmap
+        /// </summary>
+        /// <param name="cellBounds"></param>
+        /// <returns></returns>
+        internal Bitmap GetCellBitmap(Rectangle cellBounds)
+        {
+            if (_CellBitmap == null ||
+                (_CellBitmap.Width != cellBounds.Width || _CellBitmap.Height < cellBounds.Height))
+            {
+                if (_CellBitmap != null)
+                    _CellBitmap.Dispose();
+
+                _CellBitmap = new Bitmap(cellBounds.Width, cellBounds.Height);
+            }
+
+            return (_CellBitmap);
+        }
+
+        #endregion
+
+        #region OnBeforeCellPaint
+
+        /// <summary>
+        /// Invokes BeforeCellPaint user events
+        /// </summary>
+        /// <param name="rowIndex">Row index</param>
+        /// <param name="columnIndex">Column index</param>
+        internal void OnBeforeCellPaint(int rowIndex, int columnIndex)
+        {
+            if (BeforeCellPaint != null)
+                BeforeCellPaint(this, new BeforeCellPaintEventArgs(rowIndex, columnIndex));
+        }
+
+        #endregion
+
+        #region ICloneable members
+
+        /// <summary>
+        /// Clones the ButtonX Column
+        /// </summary>
+        /// <returns></returns>
+        public override object Clone()
+        {
+            DataGridViewIntegerInputColumn dc = base.Clone() as DataGridViewIntegerInputColumn;
+
+            if (dc != null)
+            {
+                dc.DisplayFormat = DisplayFormat;
+                dc.Enabled = Enabled;
+                dc.Increment = Increment;
+                dc.InputHorizontalAlignment = InputHorizontalAlignment;
+                dc.LockUpdateChecked = LockUpdateChecked;
+                dc.MaxValue = MaxValue;
+                dc.MinValue = MinValue;
+                dc.ShowCheckBox = ShowCheckBox;
+                dc.ShowUpDown = ShowUpDown;
+
+                dc.DisplayControlForCurrentCellOnly = DisplayControlForCurrentCellOnly;
+
+                dc.BackgroundStyle.ApplyStyle(IntegerInput.BackgroundStyle);
+                dc.BackgroundStyle.Class = IntegerInput.BackgroundStyle.Class;
+
+                IntegerInput.ButtonClear.CopyToItem(dc.IntegerInput.ButtonClear);
+                IntegerInput.ButtonDropDown.CopyToItem(dc.IntegerInput.ButtonDropDown);
+                IntegerInput.ButtonFreeText.CopyToItem(dc.IntegerInput.ButtonFreeText);
+                IntegerInput.ButtonCustom.CopyToItem(dc.IntegerInput.ButtonCustom);
+                IntegerInput.ButtonCustom2.CopyToItem(dc.IntegerInput.ButtonCustom2);
+            }
+
+            return (dc);
+        }
+
+        #endregion
+
+        #region Dispose
+
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing == true)
+                _IngegerInput.Dispose();
+
+            if (_CellBitmap != null)
+            {
+                _CellBitmap.Dispose();
+                _CellBitmap = null;
+            }
+
+            base.Dispose(disposing);
+        }
+
+        #endregion
+
+        #region IDataGridViewColumn Members
+
+        /// <summary>
+        /// Gets the Cell paint setting for the control
+        /// </summary>
+        [Browsable(false)]
+        public bool OwnerPaintCell
+        {
+            get { return (true); }
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewIntegerInput/DataGridViewIntegerInputEditingControl.cs b/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewIntegerInput/DataGridViewIntegerInputEditingControl.cs
new file mode 100644
index 00000000..dfaa04b7
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewIntegerInput/DataGridViewIntegerInputEditingControl.cs	
@@ -0,0 +1,210 @@
+using System;
+using System.ComponentModel;
+using System.Runtime.InteropServices;
+using System.Windows.Forms;
+using DevComponents.Editors;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    [ToolboxItem(false), ComVisible(false)]
+    public class DataGridViewIntegerInputEditingControl : IntegerInput, IDataGridViewEditingControl
+    {
+        #region Private variables
+
+        private DataGridView _DataGridView;
+
+        private int _RowIndex;
+        private bool _ValueChanged;
+        private bool _EditCancelled;
+
+        #endregion
+
+        #region OnValueChanged
+
+        /// <summary>
+        /// Handles OnValueChanged events
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnValueChanged(EventArgs e)
+        {
+            _ValueChanged = true;
+
+            _DataGridView.NotifyCurrentCellDirty(true);
+
+            base.OnValueChanged(e);
+        }
+
+        #endregion
+
+        #region Internal properties
+
+        /// <summary>
+        /// Gets or sets the Edit state
+        /// </summary>
+        internal bool EditCancelled
+        {
+            get { return (_EditCancelled); }
+            set { _EditCancelled = value; }
+        }
+
+        #endregion
+
+        #region IDataGridViewEditingControl Members
+
+        #region Public properties
+
+        #region EditingControlDataGridView
+
+        /// <summary>
+        /// Gets or sets the DataGridView
+        /// </summary>
+        public DataGridView EditingControlDataGridView
+        {
+            get { return (_DataGridView); }
+            set { _DataGridView = value; }
+        }
+
+        #endregion
+
+        #region EditingControlFormattedValue
+
+        /// <summary>
+        /// Gets or sets the Control Formatted Value
+        /// </summary>
+        public object EditingControlFormattedValue
+        {
+            get { return (this.Value.ToString()); }
+
+            set
+            {
+                string newValue = value as string;
+
+                if (newValue != null)
+                    Value = int.Parse(newValue);
+            }
+        }
+
+        #endregion
+
+        #region EditingControlRowIndex
+
+        /// <summary>
+        /// Gets or sets the Control RoeIndex
+        /// </summary>
+        public int EditingControlRowIndex
+        {
+            get { return (_RowIndex); }
+            set { _RowIndex = value; }
+        }
+
+        #endregion
+
+        #region EditingControlValueChanged
+
+        /// <summary>
+        /// Gets or sets the Control ValueChanged state
+        /// </summary>
+        public bool EditingControlValueChanged
+        {
+            get { return (_ValueChanged); }
+            set { _ValueChanged = value; }
+        }
+
+        #endregion
+
+        #region EditingPanelCursor
+
+        /// <summary>
+        /// Gets the Panel Cursor
+        /// </summary>
+        public Cursor EditingPanelCursor
+        {
+            get { return (base.Cursor); }
+        }
+
+        #endregion
+
+        #region RepositionEditingControlOnValueChange
+
+        /// <summary>
+        /// Gets whether to RepositionEditingControlOnValueChange
+        /// </summary>
+        public bool RepositionEditingControlOnValueChange
+        {
+            get { return (false); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ApplyCellStyleToEditingControl
+
+        /// <summary>
+        /// ApplyCellStyleToEditingControl
+        /// </summary>
+        /// <param name="dataGridViewCellStyle"></param>
+        public void ApplyCellStyleToEditingControl(DataGridViewCellStyle dataGridViewCellStyle)
+        {
+            Font = dataGridViewCellStyle.Font;
+
+            ForeColor = dataGridViewCellStyle.ForeColor;
+            BackColor = dataGridViewCellStyle.BackColor;
+        }
+
+        #endregion
+
+        #region GetEditingControlFormattedValue
+
+        /// <summary>
+        /// Gets EditingControlFormattedValue
+        /// </summary>
+        /// <param name="context"></param>
+        /// <returns></returns>
+        public object GetEditingControlFormattedValue(DataGridViewDataErrorContexts context)
+        {
+            return (EditingControlFormattedValue);
+        }
+
+        #endregion
+
+        #region EditingControlWantsInputKey
+
+        /// <summary>
+        /// Gets whether the given key wants to be processed
+        /// by the Control
+        /// </summary>
+        /// <param name="keyData"></param>
+        /// <param name="dataGridViewWantsInputKey"></param>
+        /// <returns></returns>
+        public bool EditingControlWantsInputKey(Keys keyData, bool dataGridViewWantsInputKey)
+        {
+            if ((keyData & Keys.Right) == Keys.Right)
+                return (true);
+
+            if ((keyData & Keys.Left) == Keys.Left)
+                return (true);
+
+            if ((keyData & Keys.Escape) == Keys.Escape)
+                _EditCancelled = true;
+
+            return (dataGridViewWantsInputKey == false);
+        }
+
+        #endregion
+
+        #region PrepareEditingControlForEdit
+
+        /// <summary>
+        /// PrepareEditingControlForEdit
+        /// </summary>
+        /// <param name="selectAll"></param>
+        public void PrepareEditingControlForEdit(bool selectAll)
+        {
+        }
+
+        #endregion
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewIpAddressInput/DataGridViewIpAddressInputCell.cs b/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewIpAddressInput/DataGridViewIpAddressInputCell.cs
new file mode 100644
index 00000000..4d27e7c8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewIpAddressInput/DataGridViewIpAddressInputCell.cs	
@@ -0,0 +1,711 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Media;
+using System.Windows.Forms;
+using DevComponents.Editors;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    public class DataGridViewIpAddressInputCell : DataGridViewTextBoxCell
+    {
+        #region Public properties
+
+        #region EditType
+
+        /// <summary>
+        /// Gets the Type of the editing control associated with the cell
+        /// </summary>
+        public override Type EditType
+        {
+            get { return (typeof(DataGridViewIpAddressInputEditingControl)); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InitializeEditingControl
+
+        /// <summary>
+        /// InitializeEditingControl
+        /// </summary>
+        /// <param name="rowIndex"></param>
+        /// <param name="initialFormattedValue"></param>
+        /// <param name="dataGridViewCellStyle"></param>
+        public override void InitializeEditingControl(int rowIndex,
+            object initialFormattedValue, DataGridViewCellStyle dataGridViewCellStyle)
+        {
+            DetachEditingControl();
+
+            base.InitializeEditingControl(rowIndex, initialFormattedValue, dataGridViewCellStyle);
+
+            DataGridViewIpAddressInputEditingControl ctl =
+                (DataGridViewIpAddressInputEditingControl)DataGridView.EditingControl;
+
+            DataGridViewIpAddressInputColumn oc = (DataGridViewIpAddressInputColumn)OwningColumn;
+            IpAddressInput tb = oc.IpAddressInput;
+
+            ctl.Font = dataGridViewCellStyle.Font;
+            ctl.ForeColor = dataGridViewCellStyle.ForeColor;
+            ctl.BackColor = dataGridViewCellStyle.BackColor;
+
+            ctl.AllowEmptyState = tb.AllowEmptyState;
+            ctl.AutoOffFreeTextEntry = tb.AutoOffFreeTextEntry;
+            ctl.AutoOverwrite = tb.AutoOverwrite;
+            ctl.AutoResolveFreeTextEntries = tb.AutoResolveFreeTextEntries;
+            ctl.DropDownControl = tb.DropDownControl;
+            ctl.Enabled = tb.Enabled;
+            ctl.FocusHighlightColor = tb.FocusHighlightColor;
+            ctl.FocusHighlightEnabled = tb.FocusHighlightEnabled;
+            ctl.FreeTextEntryMode = tb.FreeTextEntryMode;
+            ctl.ImeMode = tb.ImeMode;
+            ctl.InputHorizontalAlignment = GetHorizontalAlignment(dataGridViewCellStyle.Alignment);
+            ctl.IsInputReadOnly = tb.IsInputReadOnly;
+            ctl.LockUpdateChecked = tb.LockUpdateChecked;
+            ctl.RightToLeft = tb.RightToLeft;
+            ctl.SelectNextInputCharacters = tb.SelectNextInputCharacters;
+            ctl.ShowCheckBox = tb.ShowCheckBox;
+            ctl.WatermarkColor = tb.WatermarkColor;
+            ctl.WatermarkEnabled = tb.WatermarkEnabled;
+            ctl.WatermarkFont = tb.WatermarkFont;
+            ctl.WatermarkText = tb.WatermarkText;
+
+            ctl.DropDownItems.Clear();
+
+            if (tb.DropDownItems.Count > 0)
+            {
+                for (int i = 0; i < tb.DropDownItems.Count; i++)
+                    ctl.DropDownItems.Add(tb.DropDownItems[i]);
+            }
+
+            ctl.BackgroundStyle.ApplyStyle(tb.BackgroundStyle);
+            ctl.BackgroundStyle.Class = tb.BackgroundStyle.Class;
+
+            tb.ButtonClear.CopyToItem(ctl.ButtonClear);
+            tb.ButtonCustom.CopyToItem(ctl.ButtonCustom);
+            tb.ButtonCustom2.CopyToItem(ctl.ButtonCustom2);
+            tb.ButtonDropDown.CopyToItem(ctl.ButtonDropDown);
+
+            ctl.ButtonClearClick += ButtonClearClick;
+            ctl.ButtonCustomClick += ButtonCustomClick;
+            ctl.ButtonCustom2Click += ButtonCustom2Click;
+            ctl.ButtonDropDownClick += ButtonDropDownClick;
+
+            ctl.Value = GetValue(initialFormattedValue);
+
+            ctl.EditCancelled = false;
+        }
+
+        #endregion
+
+        #region DetachEditingControl
+
+        /// <summary>
+        /// DetachEditingControl
+        /// </summary>
+        public override void DetachEditingControl()
+        {
+            if (DataGridView != null && DataGridView.EditingControl != null)
+            {
+                DataGridViewIpAddressInputEditingControl di =
+                    DataGridView.EditingControl as DataGridViewIpAddressInputEditingControl;
+
+                if (di != null)
+                {
+                    di.ButtonClearClick -= ButtonClearClick;
+                    di.ButtonCustomClick -= ButtonCustomClick;
+                    di.ButtonCustom2Click -= ButtonCustom2Click;
+                    di.ButtonDropDownClick -= ButtonDropDownClick;
+
+                    if (di.EditCancelled == true)
+                    {
+                        di.EditCancelled = false;
+
+                        SystemSounds.Beep.Play();
+                    }
+                }
+            }
+
+            base.DetachEditingControl();
+        }
+
+        #endregion
+
+        #region Event processing
+
+        #region ButtonClearClick
+
+        /// <summary>
+        /// ButtonClearClick
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void ButtonClearClick(object sender, CancelEventArgs e)
+        {
+            ((DataGridViewIpAddressInputColumn)OwningColumn).DoButtonClearClick(sender, e);
+        }
+
+        #endregion
+
+        #region ButtonCustomClick
+
+        /// <summary>
+        /// ButtonCustomClick
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void ButtonCustomClick(object sender, EventArgs e)
+        {
+            ((DataGridViewIpAddressInputColumn)OwningColumn).DoButtonCustomClick(sender, e);
+        }
+
+        #endregion
+
+        #region ButtonCustom2Click
+
+        /// <summary>
+        /// ButtonCustom2Click
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void ButtonCustom2Click(object sender, EventArgs e)
+        {
+            ((DataGridViewIpAddressInputColumn)OwningColumn).DoButtonCustom2Click(sender, e);
+        }
+
+        #endregion
+
+        #region ButtonDropDownClick
+
+        /// <summary>
+        /// ButtonDropDownClick
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void ButtonDropDownClick(object sender, CancelEventArgs e)
+        {
+            ((DataGridViewIpAddressInputColumn)OwningColumn).DoButtonDropDownClick(sender, e);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region PositionEditingControl
+
+        /// <summary>
+        /// PositionEditingControl
+        /// </summary>
+        /// <param name="setLocation"></param>
+        /// <param name="setSize"></param>
+        /// <param name="cellBounds"></param>
+        /// <param name="cellClip"></param>
+        /// <param name="cellStyle"></param>
+        /// <param name="singleVerticalBorderAdded"></param>
+        /// <param name="singleHorizontalBorderAdded"></param>
+        /// <param name="isFirstDisplayedColumn"></param>
+        /// <param name="isFirstDisplayedRow"></param>
+        public override void PositionEditingControl(bool setLocation, bool setSize, Rectangle cellBounds,
+            Rectangle cellClip, DataGridViewCellStyle cellStyle, bool singleVerticalBorderAdded,
+            bool singleHorizontalBorderAdded, bool isFirstDisplayedColumn, bool isFirstDisplayedRow)
+        {
+            Rectangle editingControlBounds =
+                PositionEditingPanel(cellBounds, cellClip, cellStyle, singleVerticalBorderAdded,
+                                     singleHorizontalBorderAdded, isFirstDisplayedColumn, isFirstDisplayedRow);
+
+            editingControlBounds = GetAdjustedEditingControlBounds(editingControlBounds, cellStyle);
+
+            DataGridView.EditingControl.Location = new Point(editingControlBounds.X, editingControlBounds.Y);
+            DataGridView.EditingControl.Size = new Size(editingControlBounds.Width, editingControlBounds.Height);
+        }
+
+        #endregion
+
+        #region GetAdjustedEditingControlBounds
+
+        /// <summary>
+        /// GetAdjustedEditingControlBounds
+        /// </summary>
+        /// <param name="editingControlBounds"></param>
+        /// <param name="cellStyle"></param>
+        /// <returns></returns>
+        private Rectangle GetAdjustedEditingControlBounds(
+            Rectangle editingControlBounds, DataGridViewCellStyle cellStyle)
+        {
+            // Add a 1 pixel padding around the editing control
+
+            editingControlBounds.X += 1;
+            editingControlBounds.Y += 1;
+            editingControlBounds.Width = Math.Max(0, editingControlBounds.Width - 2);
+            editingControlBounds.Height = Math.Max(0, editingControlBounds.Height - 2);
+
+            // Adjust the vertical location of the editing control
+
+            Rectangle r = GetCellBounds(editingControlBounds);
+
+            if (cellStyle != null && r.Height < editingControlBounds.Height)
+            {
+                switch (cellStyle.Alignment)
+                {
+                    case DataGridViewContentAlignment.MiddleLeft:
+                    case DataGridViewContentAlignment.MiddleCenter:
+                    case DataGridViewContentAlignment.MiddleRight:
+                        editingControlBounds.Y += (editingControlBounds.Height - r.Height) / 2;
+                        break;
+
+                    case DataGridViewContentAlignment.BottomLeft:
+                    case DataGridViewContentAlignment.BottomCenter:
+                    case DataGridViewContentAlignment.BottomRight:
+                        editingControlBounds.Y += (editingControlBounds.Height - r.Height);
+                        break;
+                }
+            }
+
+            editingControlBounds.Width = Math.Max(1, editingControlBounds.Width);
+            editingControlBounds.Height = Math.Max(1, r.Height);
+
+            return (editingControlBounds);
+        }
+
+        #endregion
+
+        #region GetPreferredSize
+
+        #region GetPreferredSize
+
+        /// <summary>
+        /// GetPreferredSize
+        /// </summary>
+        /// <param name="graphics"></param>
+        /// <param name="cellStyle"></param>
+        /// <param name="rowIndex"></param>
+        /// <param name="constraintSize"></param>
+        /// <returns></returns>
+        protected override Size GetPreferredSize(Graphics graphics,
+               DataGridViewCellStyle cellStyle, int rowIndex, Size constraintSize)
+        {
+            if (DataGridView == null)
+                return (new Size(-1, -1));
+
+            Size preferredSize = base.GetPreferredSize(graphics, cellStyle, rowIndex, constraintSize);
+
+            DataGridViewIpAddressInputColumn oc = OwningColumn as DataGridViewIpAddressInputColumn;
+
+            if (oc != null)
+            {
+                IpAddressInput ip = oc.IpAddressInput;
+
+                preferredSize.Width += 6;
+                preferredSize.Height = ip.Height;
+
+                if (constraintSize.Width == 0)
+                {
+                    preferredSize.Width += GetImageWidth(ip.ButtonClear);
+                    preferredSize.Width += GetImageWidth(ip.ButtonCustom);
+                    preferredSize.Width += GetImageWidth(ip.ButtonCustom2);
+                    preferredSize.Width += GetImageWidth(ip.ButtonDropDown);
+                    preferredSize.Width += GetImageWidth(ip.ButtonFreeText);
+
+                    if (ip.ShowCheckBox == true)
+                        preferredSize.Width += 16;
+                }
+            }
+
+            return (preferredSize);
+        }
+
+        #endregion
+
+        #region GetFormattedValue
+
+        protected override object GetFormattedValue(object value, int rowIndex,
+            ref DataGridViewCellStyle cellStyle, TypeConverter valueTypeConverter,
+            TypeConverter formattedValueTypeConverter, DataGridViewDataErrorContexts context)
+        {
+            DataGridViewIpAddressInputColumn oc = OwningColumn as DataGridViewIpAddressInputColumn;
+
+            if (oc != null)
+            {
+                IpAddressInput ip = oc.IpAddressInput;
+                ip.Value = GetValue(value);
+
+                return (ip.Text);
+            }
+
+            return (base.GetFormattedValue(value, rowIndex,
+                ref cellStyle, valueTypeConverter, formattedValueTypeConverter, context));
+        }
+
+        #endregion
+
+        #region GetImageWidth
+
+        private int GetImageWidth(InputButtonSettings ibs)
+        {
+            if (ibs.Visible == true)
+                return (ibs.Image != null ? ibs.Image.Width : 16);
+
+            return (0);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Paint
+
+        #region Paint
+
+        /// <summary>
+        /// Cell painting
+        /// </summary>
+        /// <param name="graphics"></param>
+        /// <param name="clipBounds"></param>
+        /// <param name="cellBounds"></param>
+        /// <param name="rowIndex"></param>
+        /// <param name="elementState"></param>
+        /// <param name="value"></param>
+        /// <param name="formattedValue"></param>
+        /// <param name="errorText"></param>
+        /// <param name="cellStyle"></param>
+        /// <param name="advancedBorderStyle"></param>
+        /// <param name="paintParts"></param>
+        protected override void Paint(Graphics graphics,
+            Rectangle clipBounds, Rectangle cellBounds, int rowIndex,
+            DataGridViewElementStates elementState, object value, object formattedValue,
+            string errorText, DataGridViewCellStyle cellStyle,
+            DataGridViewAdvancedBorderStyle advancedBorderStyle,
+            DataGridViewPaintParts paintParts)
+        {
+            if (DataGridView != null)
+            {
+                // First paint the borders of the cell
+
+                if (PartsSet(paintParts, DataGridViewPaintParts.Border))
+                    PaintBorder(graphics, clipBounds, cellBounds, cellStyle, advancedBorderStyle);
+
+                // Now paint the background and content
+
+                if (PartsSet(paintParts, DataGridViewPaintParts.Background))
+                {
+                    Rectangle rBk = GetBackBounds(cellBounds, advancedBorderStyle);
+
+                    if (rBk.Height > 0 && rBk.Width > 0)
+                    {
+                        DataGridViewIpAddressInputColumn oc = (DataGridViewIpAddressInputColumn)OwningColumn;
+                        Bitmap bm = oc.GetCellBitmap(cellBounds);
+
+                        if (bm != null)
+                        {
+                            using (Graphics g = Graphics.FromImage(bm))
+                            {
+                                PaintCellBackground(g, cellStyle, rBk);
+                                PaintCellContent(g, cellBounds, rowIndex, formattedValue, cellStyle, paintParts);
+
+                                graphics.DrawImageUnscaledAndClipped(bm, rBk);
+                            }
+
+                            if ((DataGridView.ShowCellErrors == true) &&
+                                (paintParts & DataGridViewPaintParts.ErrorIcon) == DataGridViewPaintParts.ErrorIcon)
+                            {
+                                base.PaintErrorIcon(graphics, clipBounds, cellBounds, errorText);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region PaintCellBackground
+
+        /// <summary>
+        /// Paints the cell background
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="cellStyle"></param>
+        /// <param name="rBack"></param>
+        private void PaintCellBackground(Graphics g,
+            DataGridViewCellStyle cellStyle, Rectangle rBack)
+        {
+            Rectangle r = rBack;
+            r.Location = new Point(0, 0);
+
+            DataGridViewX dx = DataGridView as DataGridViewX;
+
+            if (dx != null && dx.Enabled == true && Selected == true &&
+                dx.PaintEnhancedSelection == true)
+            {
+                Office2007ButtonItemPainter.PaintBackground(g, dx.ButtonStateColorTable,
+                    r, RoundRectangleShapeDescriptor.RectangleShape, false,
+                    false);
+            }
+            else
+            {
+                Color color = (Selected == true)
+                    ? cellStyle.SelectionBackColor : cellStyle.BackColor;
+
+                using (Brush br = new SolidBrush(color))
+                    g.FillRectangle(br, r);
+            }
+        }
+
+        #endregion
+
+        #region PaintCellContent
+
+        /// <summary>
+        /// Paints the cell content
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="cellBounds"></param>
+        /// <param name="rowIndex"></param>
+        /// <param name="value"></param>
+        /// <param name="cellStyle"></param>
+        /// <param name="paintParts"></param>
+        private void PaintCellContent(Graphics g, Rectangle cellBounds, int rowIndex, object value,
+            DataGridViewCellStyle cellStyle, DataGridViewPaintParts paintParts)
+        {
+            DataGridViewIpAddressInputColumn oc = (DataGridViewIpAddressInputColumn)OwningColumn;
+            IpAddressInput di = oc.IpAddressInput;
+
+            Point ptCurrentCell = DataGridView.CurrentCellAddress;
+            bool cellCurrent = ptCurrentCell.X == ColumnIndex && ptCurrentCell.Y == rowIndex;
+            bool cellEdited = cellCurrent && DataGridView.EditingControl != null;
+
+            // If the cell is in editing mode, there is nothing else to paint
+
+            if (cellEdited == false && rowIndex < DataGridView.RowCount)
+            {
+                if (PartsSet(paintParts, DataGridViewPaintParts.ContentForeground))
+                {
+                    cellBounds.X = 0;
+                    cellBounds.Y = 0;
+                    cellBounds.Width -= (oc.DividerWidth + 1);
+                    cellBounds.Height -= 1;
+
+                    di.Font = cellStyle.Font;
+                    di.ForeColor = cellStyle.ForeColor;
+                    di.BackColor = Selected ? Color.Transparent : cellStyle.BackColor;
+                    di.InputHorizontalAlignment = GetHorizontalAlignment(cellStyle.Alignment);
+
+                    di.Value = GetValue(value);
+
+                    oc.OnBeforeCellPaint(rowIndex, ColumnIndex);
+
+                    Rectangle r = GetAdjustedEditingControlBounds(cellBounds, cellStyle);
+
+                    if (oc.DisplayControlForCurrentCellOnly == false)
+                        DrawControl(di, r, g);
+                    else
+                        DrawText(di, r, g);
+                }
+            }
+        }
+
+        #region DrawControl
+
+        /// <summary>
+        /// DrawControl
+        /// </summary>
+        /// <param name="di"></param>
+        /// <param name="r"></param>
+        /// <param name="g"></param>
+        private void DrawControl(IpAddressInput di, Rectangle r, Graphics g)
+        {
+            GraphicsState gs = g.Save();
+
+            try
+            {
+                g.TranslateTransform(r.X, r.Y);
+
+                di.Width = r.Width;
+                di.InternalPaint(new PaintEventArgs(g, Rectangle.Empty));
+            }
+            finally
+            {
+                g.Restore(gs);
+            }
+        }
+
+        #endregion
+
+        #region DrawText
+
+        /// <summary>
+        /// DrawText
+        /// </summary>
+        /// <param name="di"></param>
+        /// <param name="r"></param>
+        /// <param name="g"></param>
+        private void DrawText(IpAddressInput di, Rectangle r, Graphics g)
+        {
+            r.Inflate(-2, 0);
+
+            eTextFormat tf = eTextFormat.VerticalCenter;
+
+            switch (di.InputHorizontalAlignment)
+            {
+                case eHorizontalAlignment.Center:
+                    tf |= eTextFormat.HorizontalCenter;
+                    break;
+
+                case eHorizontalAlignment.Right:
+                    tf |= eTextFormat.Right;
+                    break;
+            }
+
+            TextDrawing.DrawString(g, di.Text, di.Font, di.ForeColor, r, tf);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region GetBackBounds
+
+        /// <summary>
+        /// Gets the background bounds for the given cell
+        /// </summary>
+        /// <param name="cellBounds"></param>
+        /// <param name="advancedBorderStyle"></param>
+        /// <returns></returns>
+        private Rectangle GetBackBounds(
+            Rectangle cellBounds, DataGridViewAdvancedBorderStyle advancedBorderStyle)
+        {
+            DataGridViewIpAddressInputColumn oc = (DataGridViewIpAddressInputColumn)OwningColumn;
+
+            Rectangle r = BorderWidths(advancedBorderStyle);
+
+            cellBounds.Offset(r.X, r.Y);
+            cellBounds.Width -= r.Right;
+            cellBounds.Height -= r.Bottom;
+
+            if (Selected == true)
+                cellBounds.Width += oc.DividerWidth;
+
+            return (cellBounds);
+        }
+
+        #endregion
+
+        #region GetCellBounds
+
+        /// <summary>
+        /// Gets the button bounds for the given cell
+        /// </summary>
+        /// <param name="cellBounds"></param>
+        /// <returns></returns>
+        private Rectangle GetCellBounds(Rectangle cellBounds)
+        {
+            DataGridViewIpAddressInputColumn oc = (DataGridViewIpAddressInputColumn)OwningColumn;
+
+            oc.IpAddressInput.RecalcLayout();
+            Size size = oc.IpAddressInput.PreferredSize;
+
+            if (oc.IpAddressInput.ButtonClear.Visible == true)
+            {
+                if (oc.IpAddressInput.ButtonClear.Image != null)
+                    size.Width += oc.IpAddressInput.ButtonClear.Image.Size.Width;
+                else
+                    size.Width += 16;
+            }
+
+            if (oc.IpAddressInput.ButtonCustom.Visible == true)
+            {
+                if (oc.IpAddressInput.ButtonCustom.Image != null)
+                    size.Width += oc.IpAddressInput.ButtonCustom.Image.Size.Width;
+                else
+                    size.Width += 16;
+            }
+
+            if (oc.IpAddressInput.ButtonCustom2.Visible == true)
+            {
+                if (oc.IpAddressInput.ButtonCustom2.Image != null)
+                    size.Width += oc.IpAddressInput.ButtonCustom2.Image.Size.Width;
+                else
+                    size.Width += 16;
+            }
+
+            if (oc.IpAddressInput.ButtonDropDown.Visible == true)
+            {
+                if (oc.IpAddressInput.ButtonDropDown.Image != null)
+                    size.Width += oc.IpAddressInput.ButtonDropDown.Image.Size.Width;
+                else
+                    size.Width += 16;
+            }
+
+            cellBounds.Location = new Point(1, 1);
+
+            cellBounds.Width = Math.Min(size.Width, cellBounds.Width);
+            cellBounds.Width -= oc.DividerWidth;
+            cellBounds.Height = size.Height;
+
+            return (cellBounds);
+        }
+
+        #endregion
+
+        #region GetValue
+
+        /// <summary>
+        /// GetValue
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        private string GetValue(object value)
+        {
+            return (value != Convert.DBNull ? Convert.ToString(value) : "");
+        }
+
+        #endregion
+
+        #region GetHorizontalAlignment
+
+        /// <summary>
+        /// GetHorizontalAlignment
+        /// </summary>
+        /// <param name="alignment"></param>
+        /// <returns></returns>
+        private eHorizontalAlignment GetHorizontalAlignment(DataGridViewContentAlignment alignment)
+        {
+            switch (alignment)
+            {
+                case DataGridViewContentAlignment.TopCenter:
+                case DataGridViewContentAlignment.MiddleCenter:
+                case DataGridViewContentAlignment.BottomCenter:
+                    return (eHorizontalAlignment.Center);
+
+                case DataGridViewContentAlignment.TopRight:
+                case DataGridViewContentAlignment.MiddleRight:
+                case DataGridViewContentAlignment.BottomRight:
+                    return (eHorizontalAlignment.Right);
+
+                default:
+                    return (eHorizontalAlignment.Left);
+            }
+        }
+
+        #endregion
+
+        #region PartsSet
+
+        /// <summary>
+        /// Determines if the given part is set
+        /// </summary>
+        /// <param name="paintParts"></param>
+        /// <param name="parts"></param>
+        /// <returns></returns>
+        private bool PartsSet(DataGridViewPaintParts paintParts, DataGridViewPaintParts parts)
+        {
+            return ((paintParts & parts) == parts);
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewIpAddressInput/DataGridViewIpAddressInputColumn.cs b/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewIpAddressInput/DataGridViewIpAddressInputColumn.cs
new file mode 100644
index 00000000..dc546459
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewIpAddressInput/DataGridViewIpAddressInputColumn.cs	
@@ -0,0 +1,781 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Runtime.InteropServices;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.Rendering;
+using DevComponents.Editors;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    [ToolboxBitmap(typeof(DataGridViewButtonXColumn), "IpAddressInput.ico"), ToolboxItem(false), ComVisible(false)]
+    public class DataGridViewIpAddressInputColumn : DataGridViewTextBoxColumn, IDataGridViewColumn
+    {
+        #region Events
+
+        /// <summary>
+        /// Occurs right before a IpAddressInput Cell is painted
+        /// </summary>
+        [Description("Occurs right before a IpAddressInput Cell is painted.")]
+        public event EventHandler<BeforeCellPaintEventArgs> BeforeCellPaint;
+
+        /// <summary>
+        /// Occurs when Clear button is clicked and allows you
+        /// to cancel the default action performed by the button
+        /// </summary>
+        [Description("Occurs when Clear button is clicked and allows you to cancel the default action performed by the button.")]
+        public event EventHandler<CancelEventArgs> ButtonClearClick;
+
+        /// <summary>
+        /// Occurs when ButtonCustom control is clicked
+        /// </summary>
+        [Description("Occurs when ButtonCustom control is clicked.")]
+        public event EventHandler<EventArgs> ButtonCustomClick;
+
+        /// <summary>
+        /// Occurs when ButtonCustom2 control is clicked
+        /// </summary>
+        [Description("Occurs when ButtonCustom2 control is clicked.")]
+        public event EventHandler<EventArgs> ButtonCustom2Click;
+
+        /// <summary>
+        /// Occurs when Drop-Down button that shows calendar
+        /// is clicked and allows you to cancel showing of the popup
+        /// </summary>
+        [Description("Occurs when Drop-Down button that shows calendar is clicked and allows you to cancel showing of the popup.")]
+        public event EventHandler<CancelEventArgs> ButtonDropDownClick;
+
+        #endregion
+
+        #region Private variables
+
+        private IpAddressInput _IpAddressInput;
+        private Bitmap _CellBitmap;
+        private bool _DisplayControlForCurrentCellOnly = true;
+
+        #endregion
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        public DataGridViewIpAddressInputColumn()
+        {
+            CellTemplate = new DataGridViewIpAddressInputCell();
+
+            _IpAddressInput = new IpAddressInput();
+
+            _IpAddressInput.BackgroundStyle.Class = ElementStyleClassKeys.DataGridViewIpAddressBorderKey;
+        }
+
+        #region Internal properties
+
+        #region IpAddressInput
+
+        /// <summary>
+        /// Gets the underlying IpAddressInput control
+        /// </summary>
+        [Browsable(false)]
+        internal IpAddressInput IpAddressInput
+        {
+            get { return (_IpAddressInput); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Public properties
+
+        #region AllowEmptyState
+
+        /// <summary>
+        /// Gets or sets whether empty null/nothing state of the control
+        /// is allowed. Default value is true which means that Text property
+        /// may return null if there is no input value.
+        /// </summary>
+        [Browsable(true), DefaultValue(true)]
+        [Description("Indicates whether empty null/nothing state of the control is allowed.")]
+        public bool AllowEmptyState
+        {
+            get { return (_IpAddressInput.AllowEmptyState); }
+            set { _IpAddressInput.AllowEmptyState = value; }
+        }
+
+        #endregion
+
+        #region AutoOffFreeTextEntry
+
+        /// <summary>
+        /// Gets or sets whether free-text entry is automatically
+        /// turned off when control loses input focus. Default value is false.
+        /// </summary>
+        [Browsable(true), DefaultValue(false), Category("Free-Text")]
+        [Description("Indicates whether free-text entry is automatically turned off when control loses input focus.")]
+        public bool AutoOffFreeTextEntry
+        {
+            get { return (_IpAddressInput.AutoOffFreeTextEntry); }
+            set { _IpAddressInput.AutoOffFreeTextEntry = value; }
+        }
+
+        #endregion
+
+        #region AutoOverwrite
+
+        /// <summary>
+        /// Gets or sets whether auto-overwrite functionality for input
+        /// is enabled. When in auto-overwrite mode input field will erase existing entry
+        /// and start new one if typing is continued after InputComplete method is called.
+        /// </summary>
+        [Browsable(true), DefaultValue(false)]
+        [Description("Indicates whether auto-overwrite functionality for input is enabled.")]
+        public bool AutoOverwrite
+        {
+            get { return (_IpAddressInput.AutoOverwrite); }
+            set { _IpAddressInput.AutoOverwrite = value; }
+        }
+
+        #endregion
+
+        #region AutoResolveFreeTextEntries
+
+        /// <summary>
+        /// Gets or sets whether free text entries are attempted to be
+        /// auto-resolved to IP address as host/domain names. Default value is true.
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Free-Text")]
+        [Description("Indicates whether free text entries are attempted to be auto-resolved to IP address as host/domain names.")]
+        public bool AutoResolveFreeTextEntries
+        {
+            get { return (_IpAddressInput.AutoResolveFreeTextEntries); }
+            set { _IpAddressInput.AutoResolveFreeTextEntries = value; }
+        }
+
+        #endregion
+
+        #region BackColor
+
+        /// <summary>
+        /// Gets or sets the Background color.
+        /// </summary>
+        [Browsable(false)]
+        public Color BackColor
+        {
+            get { return (_IpAddressInput.BackColor); }
+            set { _IpAddressInput.BackColor = value; }
+        }
+
+        #endregion
+
+        #region BackgroundStyle
+
+        /// <summary>
+        /// Specifies the background style of the control.
+        /// </summary>
+        [Browsable(true), Category("Style")]
+        [Description("Gets or sets control background style.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ElementStyle BackgroundStyle
+        {
+            get { return (_IpAddressInput.BackgroundStyle); }
+        }
+
+        /// <summary>
+        /// Resets style to default value. Used by windows forms designer.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetBackgroundStyle()
+        {
+            _IpAddressInput.ResetBackgroundStyle();
+
+            _IpAddressInput.BackgroundStyle.Class = "TextBoxBorder";
+            _IpAddressInput.BackgroundStyle.CornerType = eCornerType.Square;
+        }
+
+        #endregion
+
+        #region ButtonClear
+
+        /// <summary>
+        /// Gets the object that describes the settings for the button
+        /// that clears the content of the control when clicked.
+        /// </summary>
+        [Browsable(true), Category("Buttons")]
+        [Description("Describes the settings for the button that clears the content of the control when clicked.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public InputButtonSettings ButtonClear
+        {
+            get { return (_IpAddressInput.ButtonClear); }
+        }
+
+        #endregion
+
+        #region ButtonCustom
+
+        /// <summary>
+        /// Gets the object that describes the settings for the custom button
+        /// that can execute an custom action of your choosing when clicked.
+        /// </summary>
+        [Browsable(true), Category("Buttons")]
+        [Description("Describes the settings for the custom button that can execute an custom action of your choosing when clicked.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public InputButtonSettings ButtonCustom
+        {
+            get { return (_IpAddressInput.ButtonCustom); }
+        }
+
+        #endregion
+
+        #region ButtonCustom2
+
+        /// <summary>
+        /// Gets the object that describes the settings for the custom button that can execute an custom action of your choosing when clicked.
+        /// </summary>
+        [Browsable(true), Category("Buttons")]
+        [Description("Describes the settings for the custom button that can execute an custom action of your choosing when clicked.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public InputButtonSettings ButtonCustom2
+        {
+            get { return (_IpAddressInput.ButtonCustom2); }
+        }
+
+        #endregion
+
+        #region ButtonDropDown
+
+        /// <summary>
+        /// Gets the object that describes the settings for the button
+        /// that shows drop-down when clicked.
+        /// </summary>
+        [Browsable(true), Category("Buttons")]
+        [Description("Describes the settings for the button that shows drop-down when clicked.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public InputButtonSettings ButtonDropDown
+        {
+            get { return (_IpAddressInput.ButtonDropDown); }
+        }
+
+        #endregion
+
+        #region DisplayControlForCurrentCellOnly
+
+        /// <summary>
+        /// Gets or sets whether the control
+        /// will be displayed for the current cell only.
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Appearance")]
+        [Description("Indicates whether the control will be displayed for the current cell only.")]
+        public bool DisplayControlForCurrentCellOnly
+        {
+            get { return (_DisplayControlForCurrentCellOnly); }
+
+            set
+            {
+                if (_DisplayControlForCurrentCellOnly != value)
+                {
+                    _DisplayControlForCurrentCellOnly = value;
+                    _IpAddressInput.Invalidate();
+                }
+            }
+        }
+
+        #endregion
+
+        #region DropDownControl
+
+        /// <summary>
+        /// Gets or sets the reference of the control that will be
+        /// displayed on popup that is shown when the drop-down button is clicked.
+        /// </summary>
+        [DefaultValue(null)]
+        [Description("Indicates reference of the control that will be displayed on popup that is shown when the drop-down button is clicked.")]
+        public Control DropDownControl
+        {
+            get { return (_IpAddressInput.DropDownControl); }
+            set { _IpAddressInput.DropDownControl = value; }
+        }
+
+        #endregion
+
+        #region DropDownItems
+
+        /// <summary>
+        /// Returns the collection of DropDownItems.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public SubItemsCollection DropDownItems
+        {
+            get { return (_IpAddressInput.DropDownItems); }
+        }
+
+        #endregion
+
+        #region Enabled
+
+        /// <summary>
+        /// Gets or sets whether the control can respond to user interaction
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Behavior")]
+        [Description("Indicates whether the control can respond to user interaction.")]
+        public bool Enabled
+        {
+            get { return (_IpAddressInput.Enabled); }
+            set { _IpAddressInput.Enabled = value; }
+        }
+
+        #endregion
+
+        #region FocusHighlightColor
+
+        /// <summary>
+        /// Gets or sets the color used as background color to highlight
+        /// the text box when it has input focus and FocusHighlight is enabled.
+        /// </summary>
+        [Browsable(true), Category("Appearance")]
+        [Description("Indicates color used as background color to highlight the text box when it has input focus and FocusHighlight is enabled.")]
+        public Color FocusHighlightColor
+        {
+            get { return (_IpAddressInput.FocusHighlightColor); }
+            set { _IpAddressInput.FocusHighlightColor = value; }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeFocusHighlightColor()
+        {
+            return (_IpAddressInput.ShouldSerializeFocusHighlightColor());
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetFocusHighlightColor()
+        {
+            _IpAddressInput.ResetFocusHighlightColor();
+        }
+
+        #endregion
+
+        #region FocusHighlightEnabled
+
+        /// <summary>
+        /// Gets or sets whether FocusHighlightColor is used as
+        /// background color to highlight the text box when it has
+        /// input focus. Default value is false.
+        /// </summary>
+        [Browsable(true), DefaultValue(false), Category("Appearance")]
+        [Description("Indicates whether FocusHighlightColor is used as background color to highlight the text box when it has input focus.")]
+        public bool FocusHighlightEnabled
+        {
+            get { return (_IpAddressInput.FocusHighlightEnabled); }
+            set { _IpAddressInput.FocusHighlightEnabled = value; }
+        }
+
+        #endregion
+
+        #region ForeColor
+
+        /// <summary>
+        /// Gets or sets the foreground color.
+        /// </summary>
+        [Browsable(false)]
+        public Color ForeColor
+        {
+            get { return (_IpAddressInput.ForeColor); }
+            set { _IpAddressInput.ForeColor = value; }
+        }
+
+        #endregion
+
+        #region FreeTextEntryMode
+
+        /// <summary>
+        /// Gets or sets whether control input is in
+        /// free-text input mode. Default value is false.
+        /// </summary>
+        [Browsable(true), DefaultValue(false), Category("Free-Text")]
+        [Description("Indicates whether control input is in free-text input mode.")]
+        public bool FreeTextEntryMode
+        {
+            get { return (_IpAddressInput.FreeTextEntryMode); }
+            set { _IpAddressInput.FreeTextEntryMode = value; }
+        }
+
+        #endregion
+
+        #region ImeMode
+
+        /// <summary>
+        /// Gets or sets the Input Method Editor (IME) mode of the control.
+        /// </summary>
+        [Browsable(true), DefaultValue(ImeMode.Inherit)]
+        [Description("Indicates the Input Method Editor (IME) mode of the control.")]
+        public ImeMode ImeMode
+        {
+            get { return (_IpAddressInput.ImeMode); }
+            set { _IpAddressInput.ImeMode = value; }
+        }
+
+        #endregion
+
+        #region IsInputReadOnly
+
+        /// <summary>
+        /// Gets or sets whether input part of the control is read-only. When
+        /// set to true the input part of the control becomes read-only and does
+        /// not allow the typing. However, drop-down part if visible still allows
+        /// user to possibly change the value of the control through the method you
+        /// can provide on drop-down. Use this property to allow change of the value
+        /// through drop-down button only.
+        /// </summary>
+        [Browsable(true), DefaultValue(false)]
+        [Description("Indicates whether input part of the control is read-only.")]
+        public bool IsInputReadOnly
+        {
+            get { return (_IpAddressInput.IsInputReadOnly); }
+            set { _IpAddressInput.IsInputReadOnly = value; }
+        }
+
+        #endregion
+
+        #region LockUpdateChecked
+
+        /// <summary>
+        /// Gets or sets whether check box shown using ShowCheckBox
+        /// property which locks/unlocks the control update is checked.
+        /// </summary>
+        [Browsable(true), DefaultValue(false)]
+        [Description("Indicates whether check box shown using ShowCheckBox property which locks/unlocks the control update is checked.")]
+        public bool LockUpdateChecked
+        {
+            get { return (_IpAddressInput.LockUpdateChecked); }
+            set { _IpAddressInput.LockUpdateChecked = value; }
+        }
+
+        #endregion
+
+        #region RightToLeft
+
+        /// <summary>
+        /// Gets or sets a value indicating whether control's
+        /// elements are aligned to support locales using right-to-left fonts.
+        /// </summary>
+        [Browsable(true), DefaultValue(RightToLeft.Inherit)]
+        [Description("Indicates the control's elements are aligned to support locales using right-to-left fonts.")]
+        public RightToLeft RightToLeft
+        {
+            get { return (_IpAddressInput.RightToLeft); }
+            set { _IpAddressInput.RightToLeft = value; }
+        }
+
+        #endregion
+
+        #region SelectNextInputCharacters
+
+        /// <summary>
+        /// List of characters that when pressed would select next input field. For example if you are
+        /// allowing time input you could set this property to : so when user presses the : character,
+        /// the input is forwarded to the next input field.
+        /// </summary>
+        [DefaultValue("."), Category("Behavior")]
+        [Description("List of characters that when pressed would select next input field.")]
+        public string SelectNextInputCharacters
+        {
+            get { return (_IpAddressInput.SelectNextInputCharacters); }
+            set { _IpAddressInput.SelectNextInputCharacters = value; }
+        }
+
+        #endregion
+
+        #region ShowCheckBox
+
+        /// <summary>
+        /// Gets or sets a value indicating whether a check box is displayed to
+        /// the left of the input value. Set to true if a check box is displayed
+        /// to the left of the input value; otherwise, false. The default is false.
+        /// </summary>
+        [Browsable(true), DefaultValue(false)]
+        [Description("Indicates whether a check box is displayed to the left of the input value which allows locking of the control.")]
+        public bool ShowCheckBox
+        {
+            get { return (_IpAddressInput.ShowCheckBox); }
+            set { _IpAddressInput.ShowCheckBox = value; }
+        }
+
+        #endregion
+
+        #region Text
+
+        /// <summary>
+        /// Gets or sets the text as it is currently displayed to the user.
+        /// </summary>
+        [Browsable(false)]
+        public string Text
+        {
+            get { return (_IpAddressInput.Text); }
+            set { _IpAddressInput.Text = value; }
+        }
+
+        #endregion
+
+        #region WatermarkColor
+
+        /// <summary>
+        /// Gets or sets the watermark text color.
+        /// </summary>
+        [Browsable(true), Category("Appearance")]
+        [Description("Indicates watermark text color.")]
+        public Color WatermarkColor
+        {
+            get { return (_IpAddressInput.WatermarkColor); }
+            set { _IpAddressInput.WatermarkColor = value; }
+        }
+        /// <summary>
+        /// Indicates whether property should be serialized by Windows Forms designer.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeWatermarkColor()
+        {
+            return (_IpAddressInput.ShouldSerializeWatermarkColor());
+        }
+        /// <summary>
+        /// Resets the property to default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetWatermarkColor()
+        {
+            _IpAddressInput.ResetWatermarkColor();
+        }
+
+        #endregion
+
+        #region WatermarkEnabled
+
+        /// <summary>
+        /// Gets or sets whether watermark text is
+        /// displayed when control is empty. Default value is true.
+        /// </summary>
+        [Browsable(true), DefaultValue(true)]
+        [Description("Indicates whether watermark text is displayed when control is empty.")]
+        public virtual bool WatermarkEnabled
+        {
+            get { return (_IpAddressInput.WatermarkEnabled); }
+            set { _IpAddressInput.WatermarkEnabled = value; }
+        }
+
+        #endregion
+
+        #region WatermarkFont
+
+        /// <summary>
+        /// Gets or sets the watermark font.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), DefaultValue(null)]
+        [Description("Indicates watermark font.")]
+        public Font WatermarkFont
+        {
+            get { return (_IpAddressInput.WatermarkFont); }
+            set { _IpAddressInput.WatermarkFont = value; }
+        }
+
+        #endregion
+
+        #region WatermarkText
+
+        /// <summary>
+        /// Gets or sets the watermark (tip) text displayed inside of
+        /// the control when Text is not set and control does not have
+        /// input focus. This property supports text-markup.
+        /// </summary>
+        [Browsable(true), DefaultValue(""), Localizable(true), Category("Appearance")]
+        [Description("Indicates watermark text displayed inside of the control when Text is not set and control does not have input focus.")]
+        [Editor("DevComponents.DotNetBar.Design.TextMarkupUIEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor))]
+        public string WatermarkText
+        {
+            get { return (_IpAddressInput.WatermarkText); }
+            set { _IpAddressInput.WatermarkText = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Event processing
+
+        #region DoButtonClearClick
+
+        /// <summary>
+        /// DoButtonClearClick
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        internal void DoButtonClearClick(object sender, CancelEventArgs e)
+        {
+            if (ButtonClearClick != null)
+                ButtonClearClick(this, e);
+        }
+
+        #endregion
+
+        #region DoButtonCustomClick
+
+        /// <summary>
+        /// DoButtonCustomClick
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        internal void DoButtonCustomClick(object sender, EventArgs e)
+        {
+            if (ButtonCustomClick != null)
+                ButtonCustomClick(this, e);
+        }
+
+        #endregion
+
+        #region DoButtonCustom2Click
+
+        /// <summary>
+        /// DoButtonCustom2Click
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        internal void DoButtonCustom2Click(object sender, EventArgs e)
+        {
+            if (ButtonCustom2Click != null)
+                ButtonCustom2Click(this, e);
+        }
+
+        #endregion
+
+        #region DoButtonDropDownClick
+
+        /// <summary>
+        /// DoButtonDropDownClick
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        internal void DoButtonDropDownClick(object sender, CancelEventArgs e)
+        {
+            if (ButtonDropDownClick != null)
+                ButtonDropDownClick(this, e);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetCellBitmap
+
+        /// <summary>
+        /// Gets the cell paint bitmap
+        /// </summary>
+        /// <param name="cellBounds"></param>
+        /// <returns></returns>
+        internal Bitmap GetCellBitmap(Rectangle cellBounds)
+        {
+            if (_CellBitmap == null ||
+                (_CellBitmap.Width != cellBounds.Width || _CellBitmap.Height < cellBounds.Height))
+            {
+                if (_CellBitmap != null)
+                    _CellBitmap.Dispose();
+
+                _CellBitmap = new Bitmap(cellBounds.Width, cellBounds.Height);
+            }
+
+            return (_CellBitmap);
+        }
+
+        #endregion
+
+        #region OnBeforeCellPaint
+
+        /// <summary>
+        /// Invokes BeforeCellPaint user events
+        /// </summary>
+        /// <param name="rowIndex">Row index</param>
+        /// <param name="columnIndex">Column index</param>
+        internal void OnBeforeCellPaint(int rowIndex, int columnIndex)
+        {
+            if (BeforeCellPaint != null)
+                BeforeCellPaint(this, new BeforeCellPaintEventArgs(rowIndex, columnIndex));
+        }
+
+        #endregion
+
+        #region ICloneable members
+
+        /// <summary>
+        /// Clones the ButtonX Column
+        /// </summary>
+        /// <returns></returns>
+        public override object Clone()
+        {
+            DataGridViewIpAddressInputColumn dc = base.Clone() as DataGridViewIpAddressInputColumn;
+
+            if (dc != null)
+            {
+                dc.AllowEmptyState = AllowEmptyState;
+                dc.AutoOffFreeTextEntry = AutoOffFreeTextEntry;
+                dc.AutoOverwrite = AutoOverwrite;
+                dc.AutoResolveFreeTextEntries = AutoResolveFreeTextEntries;
+                dc.DropDownControl = DropDownControl;
+                dc.Enabled = Enabled;
+                dc.FocusHighlightColor = FocusHighlightColor;
+                dc.FocusHighlightEnabled = FocusHighlightEnabled;
+                dc.FreeTextEntryMode = FreeTextEntryMode;
+                dc.ImeMode = ImeMode;
+                dc.IsInputReadOnly = IsInputReadOnly;
+                dc.LockUpdateChecked = LockUpdateChecked;
+                dc.RightToLeft = RightToLeft;
+                dc.SelectNextInputCharacters = SelectNextInputCharacters;
+                dc.ShowCheckBox = ShowCheckBox;
+                dc.WatermarkColor = WatermarkColor;
+                dc.WatermarkEnabled = WatermarkEnabled;
+                dc.WatermarkFont = WatermarkFont;
+                dc.WatermarkText = WatermarkText;
+
+                dc.DisplayControlForCurrentCellOnly = DisplayControlForCurrentCellOnly;
+
+                dc.BackgroundStyle.ApplyStyle(IpAddressInput.BackgroundStyle);
+                dc.BackgroundStyle.Class = IpAddressInput.BackgroundStyle.Class;
+
+                IpAddressInput.ButtonClear.CopyToItem(dc.IpAddressInput.ButtonClear);
+                IpAddressInput.ButtonDropDown.CopyToItem(dc.IpAddressInput.ButtonDropDown);
+                IpAddressInput.ButtonCustom.CopyToItem(dc.IpAddressInput.ButtonCustom);
+                IpAddressInput.ButtonCustom2.CopyToItem(dc.IpAddressInput.ButtonCustom2);
+            }
+
+            return (dc);
+        }
+
+        #endregion
+
+        #region Dispose
+
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing == true)
+                _IpAddressInput.Dispose();
+
+            if (_CellBitmap != null)
+            {
+                _CellBitmap.Dispose();
+                _CellBitmap = null;
+            }
+
+            base.Dispose(disposing);
+        }
+
+        #endregion
+
+        #region IDataGridViewColumn Members
+
+        /// <summary>
+        /// Gets the Cell paint setting for the control
+        /// </summary>
+        [Browsable(false)]
+        public bool OwnerPaintCell
+        {
+            get { return (true); }
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewIpAddressInput/DataGridViewIpAddressInputEditingControl.cs b/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewIpAddressInput/DataGridViewIpAddressInputEditingControl.cs
new file mode 100644
index 00000000..1b7e8b8e
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewIpAddressInput/DataGridViewIpAddressInputEditingControl.cs	
@@ -0,0 +1,199 @@
+using System;
+using System.ComponentModel;
+using System.Runtime.InteropServices;
+using System.Windows.Forms;
+using DevComponents.Editors;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    [ToolboxItem(false), ComVisible(false)]
+    public class DataGridViewIpAddressInputEditingControl : IpAddressInput, IDataGridViewEditingControl
+    {
+        #region Private variables
+
+        private DataGridView _DataGridView;
+
+        private int _RowIndex;
+        private bool _ValueChanged;
+        private bool _EditCancelled;
+
+        #endregion
+
+        #region Internal properties
+
+        /// <summary>
+        /// Gets or sets the Edit state
+        /// </summary>
+        internal bool EditCancelled
+        {
+            get { return (_EditCancelled); }
+            set { _EditCancelled = value; }
+        }
+
+        #endregion
+
+        #region OnTextChanged
+
+        /// <summary>
+        /// Handles OnTextChanged events
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnTextChanged(EventArgs e)
+        {
+            _ValueChanged = true;
+
+            _DataGridView.NotifyCurrentCellDirty(true);
+
+            base.OnTextChanged(e);
+        }
+
+        #endregion
+
+        #region IDataGridViewEditingControl Members
+
+        #region Public properties
+
+        #region EditingControlDataGridView
+
+        /// <summary>
+        /// Gets or sets the DataGridView
+        /// </summary>
+        public DataGridView EditingControlDataGridView
+        {
+            get { return (_DataGridView); }
+            set { _DataGridView = value; }
+        }
+
+        #endregion
+
+        #region EditingControlFormattedValue
+
+        /// <summary>
+        /// Gets or sets the Control Formatted Value
+        /// </summary>
+        public object EditingControlFormattedValue
+        {
+            get { return (Value ?? ""); }
+            set { Value = (string)value; }
+        }
+
+        #endregion
+
+        #region EditingControlRowIndex
+
+        /// <summary>
+        /// Gets or sets the Control RoeIndex
+        /// </summary>
+        public int EditingControlRowIndex
+        {
+            get { return (_RowIndex); }
+            set { _RowIndex = value; }
+        }
+
+        #endregion
+
+        #region EditingControlValueChanged
+
+        /// <summary>
+        /// Gets or sets the Control ValueChanged state
+        /// </summary>
+        public bool EditingControlValueChanged
+        {
+            get { return (_ValueChanged); }
+            set { _ValueChanged = value; }
+        }
+
+        #endregion
+
+        #region EditingPanelCursor
+
+        /// <summary>
+        /// Gets the Panel Cursor
+        /// </summary>
+        public Cursor EditingPanelCursor
+        {
+            get { return (base.Cursor); }
+        }
+
+        #endregion
+
+        #region RepositionEditingControlOnValueChange
+
+        /// <summary>
+        /// Gets whether to RepositionEditingControlOnValueChange
+        /// </summary>
+        public bool RepositionEditingControlOnValueChange
+        {
+            get { return (false); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ApplyCellStyleToEditingControl
+
+        /// <summary>
+        /// ApplyCellStyleToEditingControl
+        /// </summary>
+        /// <param name="dataGridViewCellStyle"></param>
+        public void ApplyCellStyleToEditingControl(DataGridViewCellStyle dataGridViewCellStyle)
+        {
+        }
+
+        #endregion
+
+        #region GetEditingControlFormattedValue
+
+        /// <summary>
+        /// Gets EditingControlFormattedValue
+        /// </summary>
+        /// <param name="context"></param>
+        /// <returns></returns>
+        public object GetEditingControlFormattedValue(DataGridViewDataErrorContexts context)
+        {
+            return (EditingControlFormattedValue);
+        }
+
+        #endregion
+
+        #region EditingControlWantsInputKey
+
+        /// <summary>
+        /// Gets whether the given key wants to be processed
+        /// by the Control
+        /// </summary>
+        /// <param name="keyData"></param>
+        /// <param name="dataGridViewWantsInputKey"></param>
+        /// <returns></returns>
+        public bool EditingControlWantsInputKey(Keys keyData, bool dataGridViewWantsInputKey)
+        {
+            if ((keyData & Keys.Right) == Keys.Right)
+                return (true);
+
+            if ((keyData & Keys.Left) == Keys.Left)
+                return (true);
+
+            if ((keyData & Keys.Escape) == Keys.Escape)
+                _EditCancelled = true;
+
+            return (dataGridViewWantsInputKey == false);
+        }
+
+        #endregion
+
+        #region PrepareEditingControlForEdit
+
+        /// <summary>
+        /// PrepareEditingControlForEdit
+        /// </summary>
+        /// <param name="selectAll"></param>
+        public void PrepareEditingControlForEdit(bool selectAll)
+        {
+        }
+
+        #endregion
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewLabelX/DataGridViewLabelXCell.cs b/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewLabelX/DataGridViewLabelXCell.cs
new file mode 100644
index 00000000..b7bb3405
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewLabelX/DataGridViewLabelXCell.cs	
@@ -0,0 +1,666 @@
+using System;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    public class DataGridViewLabelXCell : DataGridViewButtonCell
+    {
+        #region Private variables
+
+        private DataGridViewCellStyle _CellStyle;
+
+        #endregion
+
+        #region Public properties
+
+        #region EditType
+
+        /// <summary>
+        /// Gets the Type of the editing control associated with the cell
+        /// </summary>
+        public override Type EditType
+        {
+            get { return (null); }
+        }
+
+        #endregion
+
+        #region FormattedValueType
+
+        /// <summary>
+        /// FormattedValueType
+        /// </summary>
+        public override Type FormattedValueType
+        {
+            get { return (typeof(string)); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetAdjustedEditingControlBounds
+
+        /// <summary>
+        /// GetAdjustedEditingControlBounds
+        /// </summary>
+        /// <param name="editingControlBounds"></param>
+        /// <param name="cellStyle"></param>
+        /// <param name="rowIndex"></param>
+        /// <returns></returns>
+        private Rectangle GetAdjustedEditingControlBounds(
+            Rectangle editingControlBounds, DataGridViewCellStyle cellStyle, int rowIndex)
+        {
+            // Add a 1 pixel padding around the editing control
+
+            editingControlBounds.X += 1;
+            editingControlBounds.Y += 1;
+            editingControlBounds.Width = Math.Max(0, editingControlBounds.Width - 2);
+            editingControlBounds.Height = Math.Max(0, editingControlBounds.Height - 2);
+
+            // Adjust the vertical location of the editing control
+
+            Rectangle r = GetContentBounds(rowIndex);
+
+            if (cellStyle != null)
+            {
+                switch (cellStyle.Alignment)
+                {
+                    case DataGridViewContentAlignment.TopCenter:
+                        editingControlBounds.X += (editingControlBounds.Width - r.Width) / 2;
+                        break;
+
+                    case DataGridViewContentAlignment.TopRight:
+                        editingControlBounds.X = (editingControlBounds.Right - r.Width);
+                        break;
+
+                    case DataGridViewContentAlignment.MiddleLeft:
+                        editingControlBounds.Y += (editingControlBounds.Height - r.Height)/2;
+                        break;
+
+                    case DataGridViewContentAlignment.MiddleCenter:
+                        editingControlBounds.X += (editingControlBounds.Width - r.Width)/2;
+                        editingControlBounds.Y += (editingControlBounds.Height - r.Height)/2;
+                        break;
+
+                    case DataGridViewContentAlignment.MiddleRight:
+                        editingControlBounds.X = (editingControlBounds.Right - r.Width);
+                        editingControlBounds.Y += (editingControlBounds.Height - r.Height)/2;
+                        break;
+
+                    case DataGridViewContentAlignment.BottomLeft:
+                        editingControlBounds.Y += (editingControlBounds.Height - r.Height);
+                        break;
+
+                    case DataGridViewContentAlignment.BottomCenter:
+                        editingControlBounds.X += (editingControlBounds.Width - r.Width)/2;
+                        editingControlBounds.Y += (editingControlBounds.Height - r.Height);
+                        break;
+
+                    case DataGridViewContentAlignment.BottomRight:
+                        editingControlBounds.X = (editingControlBounds.Right - r.Width);
+                        editingControlBounds.Y += (editingControlBounds.Height - r.Height);
+                        break;
+                }
+            }
+
+            if (editingControlBounds.Y < 1)
+                editingControlBounds.Y = 1;
+
+            editingControlBounds.Width = Math.Max(1, r.Width);
+            editingControlBounds.Height = Math.Max(1, r.Height);
+
+            return (editingControlBounds);
+        }
+
+        #endregion
+
+        #region GetPreferredSize
+
+        /// <summary>
+        /// GetPreferredSize
+        /// </summary>
+        /// <param name="graphics"></param>
+        /// <param name="cellStyle"></param>
+        /// <param name="rowIndex"></param>
+        /// <param name="constraintSize"></param>
+        /// <returns></returns>
+        protected override Size GetPreferredSize(Graphics graphics,
+               DataGridViewCellStyle cellStyle, int rowIndex, Size constraintSize)
+        {
+            Size size = Size.Empty;
+            
+            if (DataGridView == null)
+                return new Size(-1, -1);
+
+            DataGridViewLabelXColumn oc = OwningColumn as DataGridViewLabelXColumn;
+
+            if (oc != null)
+            {
+                LabelX lx = oc.LabelX;
+
+                if (oc.LabelX.IsHandleCreated == false)
+                {
+                    if (oc.LabelX.Parent == null)
+                    {
+                        Form form = oc.DataGridView.FindForm();
+
+                        if (form != null)
+                            oc.LabelX.Parent = form;
+                    }
+
+                    oc.LabelX.Visible = true;
+                    oc.LabelX.Visible = false;
+                }
+
+                FreeDimension fd = GetDFromConstraint(constraintSize);
+
+                if (fd != FreeDimension.Width)
+                    constraintSize.Width -= 2;
+
+                lx.Font = cellStyle.Font;
+                lx.WordWrap = GetWordWrap(oc, cellStyle);
+                lx.TextAlignment = GetTextAlignment(cellStyle.Alignment);
+                lx.MaximumSize = Size.Empty;
+                lx.Image = oc.Image;
+
+                string s = lx.Text = @" ";
+
+                if (rowIndex < DataGridView.RowCount)
+                    s = GetValue(DataGridView.Rows[rowIndex].Cells[ColumnIndex].Value);
+
+                if (string.IsNullOrEmpty(s) == true)
+                    s = " ";
+
+                lx.Text = s;
+
+                size = lx.GetPreferredSize(constraintSize);
+
+                Rectangle stdBorderWidths = BorderWidths(new DataGridViewAdvancedBorderStyle());
+
+                int hpad = (stdBorderWidths.Left + stdBorderWidths.Width) + cellStyle.Padding.Horizontal;
+                int vpad = (stdBorderWidths.Top + stdBorderWidths.Height) + cellStyle.Padding.Vertical;
+
+                switch (fd)
+                {
+                    case FreeDimension.Height:
+                        size.Width = 0;
+                        break;
+
+                    case FreeDimension.Width:
+                        size.Height = 0;
+                        break;
+                }
+
+                if (fd != FreeDimension.Height)
+                    size.Width += (hpad + 4);
+
+                if (fd != FreeDimension.Width)
+                    size.Height += (vpad + 2);
+            }
+
+            return size;
+        }
+
+        #region GetDFromConstraint
+
+        private enum FreeDimension
+        {
+            Both,
+            Height,
+            Width
+        }
+
+        private FreeDimension GetDFromConstraint(Size constraintSize)
+        {
+            if (constraintSize.Width == 0)
+            {
+                if (constraintSize.Height == 0)
+                    return (FreeDimension.Both);
+
+                return (FreeDimension.Width);
+            }
+
+            return (FreeDimension.Height);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Paint
+
+        #region Paint
+
+        /// <summary>
+        /// Cell painting
+        /// </summary>
+        /// <param name="graphics"></param>
+        /// <param name="clipBounds"></param>
+        /// <param name="cellBounds"></param>
+        /// <param name="rowIndex"></param>
+        /// <param name="elementState"></param>
+        /// <param name="value"></param>
+        /// <param name="formattedValue"></param>
+        /// <param name="errorText"></param>
+        /// <param name="cellStyle"></param>
+        /// <param name="advancedBorderStyle"></param>
+        /// <param name="paintParts"></param>
+        protected override void Paint(Graphics graphics,
+            Rectangle clipBounds, Rectangle cellBounds, int rowIndex, DataGridViewElementStates elementState,
+            object value, object formattedValue, string errorText, DataGridViewCellStyle cellStyle,
+            DataGridViewAdvancedBorderStyle advancedBorderStyle, DataGridViewPaintParts paintParts)
+        {
+            if (DataGridView != null)
+            {
+                // First paint the borders of the cell
+
+                if (PartsSet(paintParts, DataGridViewPaintParts.Border))
+                    PaintBorder(graphics, clipBounds, cellBounds, cellStyle, advancedBorderStyle);
+
+                // Now paint the background and content
+
+                if (PartsSet(paintParts, DataGridViewPaintParts.Background))
+                {
+                    Rectangle rBk = GetBackBounds(cellBounds, advancedBorderStyle);
+
+                    if (rBk.Height > 0 && rBk.Width > 0)
+                    {
+                        DataGridViewLabelXColumn oc = (DataGridViewLabelXColumn)OwningColumn;
+                        Bitmap bm = oc.GetCellBitmap(cellBounds);
+
+                        if (bm != null)
+                        {
+                            using (Graphics g = Graphics.FromImage(bm))
+                            {
+                                PaintLabelBackground(g, cellStyle, rBk);
+                                PaintLabelContent(cellBounds, rowIndex, formattedValue, cellStyle, paintParts, g);
+
+                                graphics.DrawImageUnscaledAndClipped(bm, rBk);
+                            }
+
+                            if ((DataGridView.ShowCellErrors == true) && 
+                                (paintParts & DataGridViewPaintParts.ErrorIcon) == DataGridViewPaintParts.ErrorIcon)
+                            {
+                                base.PaintErrorIcon(graphics, clipBounds, cellBounds, errorText);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region PaintLabelBackground
+
+        /// <summary>
+        /// Paints the Label background
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="cellStyle"></param>
+        /// <param name="rBack"></param>
+        private void PaintLabelBackground(Graphics g,
+            DataGridViewCellStyle cellStyle, Rectangle rBack)
+        {
+            Rectangle r = rBack;
+            r.Location = new Point(0, 0);
+
+            DataGridViewX dx = DataGridView as DataGridViewX;
+
+            if (dx != null && dx.Enabled == true && Selected == true &&
+                dx.PaintEnhancedSelection == true)
+            {
+                Office2007ButtonItemPainter.PaintBackground(g, dx.ButtonStateColorTable,
+                    r, RoundRectangleShapeDescriptor.RectangleShape, false,
+                    false);
+            }
+            else
+            {
+                Color color = (Selected == true) 
+                    ? cellStyle.SelectionBackColor : cellStyle.BackColor;
+
+                using (Brush br = new SolidBrush(color))
+                    g.FillRectangle(br, r);
+            }
+        }
+
+        #endregion
+
+        #region PaintLabelContent
+
+        /// <summary>
+        /// Paints the Label background and content
+        /// </summary>
+        /// <param name="cellBounds"></param>
+        /// <param name="rowIndex"></param>
+        /// <param name="value"></param>
+        /// <param name="cellStyle"></param>
+        /// <param name="paintParts"></param>
+        /// <param name="g"></param>
+        private void PaintLabelContent(Rectangle cellBounds, int rowIndex, object value,
+            DataGridViewCellStyle cellStyle, DataGridViewPaintParts paintParts, Graphics g)
+        {
+            DataGridViewLabelXColumn oc = (DataGridViewLabelXColumn) OwningColumn;
+            LabelX lx = oc.LabelX;
+
+            _CellStyle = cellStyle;
+
+            string s = GetValue(value);
+
+            oc.InCallBack = true;
+            bool wordWrap = lx.WordWrap;
+            StringAlignment textAlignment = lx.TextAlignment;
+
+            GraphicsState gs = g.Save();
+
+            try
+            {
+                cellBounds.X = 0;
+                cellBounds.Y = 0;
+                cellBounds.Width -= (oc.DividerWidth + 1);
+                cellBounds.Height -= 1;
+
+                lx.Font = cellStyle.Font;
+                lx.ForeColor = cellStyle.ForeColor;
+                lx.BackColor = Selected ? Color.Transparent : cellStyle.BackColor;
+
+                lx.WordWrap = GetWordWrap(oc, cellStyle);
+                lx.TextAlignment = GetTextAlignment(cellStyle.Alignment);
+
+                Rectangle r = cellBounds;
+
+                if (rowIndex < DataGridView.RowCount)
+                {
+                    lx.Text = s;
+
+                    if (PartsSet(paintParts, DataGridViewPaintParts.ContentForeground))
+                        oc.OnBeforeCellPaint(rowIndex, ColumnIndex);
+
+                    r = GetAdjustedEditingControlBounds(cellBounds, cellStyle, rowIndex);
+                }
+                else
+                {
+                    lx.Text = " ";
+                }
+
+                lx.CallBasePaintBackground = false;
+
+                g.TranslateTransform(r.X, r.Y);
+
+                lx.Bounds = r;
+                lx.RecalcLayout();
+                lx.InternalPaint(new PaintEventArgs(g, Rectangle.Empty));
+            }
+            finally
+            {
+                lx.WordWrap = wordWrap;
+                lx.TextAlignment = textAlignment;
+                oc.InCallBack = false;
+
+                g.Restore(gs);
+            }
+        }
+
+        #region GetWordWrap
+
+        private bool GetWordWrap(DataGridViewLabelXColumn oc, DataGridViewCellStyle cellStyle)
+        {
+            if (oc.WordWrap == true)
+                return (true);
+
+            switch (cellStyle.WrapMode)
+            {
+                case DataGridViewTriState.True:
+                    return (true);
+
+                case DataGridViewTriState.False:
+                    return (false);
+            }
+
+            return (DataGridView.DefaultCellStyle.WrapMode == DataGridViewTriState.True);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region Mouse processing
+
+        #region OnMouseEnter
+
+        /// <summary>
+        /// OnMouseEnter
+        /// </summary>
+        /// <param name="rowIndex"></param>
+        protected override void OnMouseEnter(int rowIndex)
+        {
+            base.OnMouseEnter(rowIndex);
+
+            DataGridViewLabelXColumn oc = (DataGridViewLabelXColumn)OwningColumn;
+            LabelX bx = oc.LabelX;
+
+            bx.LabelItem.InternalMouseEnter();
+        }
+
+        #endregion
+
+        #region OnMouseLeave
+
+        /// <summary>
+        /// Processes MouseLeave events
+        /// </summary>
+        /// <param name="rowIndex"></param>
+        protected override void OnMouseLeave(int rowIndex)
+        {
+            base.OnMouseLeave(rowIndex);
+
+            DataGridViewLabelXColumn oc = (DataGridViewLabelXColumn)OwningColumn;
+            LabelX bx = oc.LabelX;
+
+            bx.LabelItem.InternalMouseLeave();
+        }
+
+        #endregion
+
+        #region OnMouseMove
+
+        /// <summary>
+        /// Processes MouseMove events
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnMouseMove(DataGridViewCellMouseEventArgs e)
+        {
+            base.OnMouseMove(e);
+
+            DataGridViewLabelXColumn oc = OwningColumn as DataGridViewLabelXColumn;
+
+            if (oc != null)
+            {
+                if ((uint)e.RowIndex < DataGridView.Rows.Count)
+                {
+                    Point pt = CellAlignPoint(e);
+
+                    oc.LabelX.LabelItem.InternalMouseMove(
+                        new MouseEventArgs(e.Button, e.Clicks, pt.X, pt.Y, e.Delta));
+                }
+            }
+        }
+
+        #endregion
+
+        #region OnMouseDown
+
+        /// <summary>
+        /// Processes MouseDown events
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnMouseDown(DataGridViewCellMouseEventArgs e)
+        {
+            base.OnMouseDown(e);
+
+            DataGridViewLabelXColumn oc = OwningColumn as DataGridViewLabelXColumn;
+
+            if (oc != null)
+            {
+                Point pt = CellAlignPoint(e);
+
+                oc.LabelX.LabelItem.InternalMouseDown(
+                    new MouseEventArgs(e.Button, e.Clicks, pt.X, pt.Y, e.Delta));
+
+                RefreshCell(e.ColumnIndex, e.RowIndex);
+            }
+        }
+
+        #endregion
+
+        #region OnMouseUp
+
+        /// <summary>
+        /// Processes MouseUp events
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnMouseUp(DataGridViewCellMouseEventArgs e)
+        {
+            base.OnMouseUp(e);
+
+            DataGridViewLabelXColumn oc = OwningColumn as DataGridViewLabelXColumn;
+
+            if (oc != null)
+            {
+                Point pt = CellAlignPoint(e);
+
+                oc.LabelX.LabelItem.InternalMouseUp(
+                    new MouseEventArgs(e.Button, e.Clicks, pt.X, pt.Y, e.Delta));
+
+                RefreshCell(e.ColumnIndex, e.RowIndex);
+            }
+        }
+
+        #endregion
+
+        #region CellAlignPoint
+
+        /// <summary>
+        /// CellAlignPoint
+        /// </summary>
+        /// <param name="e"></param>
+        /// <returns></returns>
+        private Point CellAlignPoint(DataGridViewCellMouseEventArgs e)
+        {
+            Rectangle bounds = DataGridView.GetCellDisplayRectangle(e.ColumnIndex, e.RowIndex, true);
+            bounds.Location = new Point(0, 0);
+
+            Rectangle r = GetAdjustedEditingControlBounds(bounds, _CellStyle, e.RowIndex);
+
+            return (new Point(e.X - r.X, e.Y - r.Y));
+        }
+
+        #endregion
+
+        #endregion
+
+        #region PartsSet
+
+        /// <summary>
+        /// Determines if the given part is set
+        /// </summary>
+        /// <param name="paintParts"></param>
+        /// <param name="parts"></param>
+        /// <returns></returns>
+        private bool PartsSet(DataGridViewPaintParts paintParts, DataGridViewPaintParts parts)
+        {
+            return ((paintParts & parts) == parts);
+        }
+
+        #endregion
+
+        #region GetBackBounds
+
+        /// <summary>
+        /// Gets the background bounds for the given cell
+        /// </summary>
+        /// <param name="cellBounds"></param>
+        /// <param name="advancedBorderStyle"></param>
+        /// <returns></returns>
+        private Rectangle GetBackBounds(
+            Rectangle cellBounds, DataGridViewAdvancedBorderStyle advancedBorderStyle)
+        {
+            DataGridViewLabelXColumn oc = (DataGridViewLabelXColumn)OwningColumn;
+
+            Rectangle r = BorderWidths(advancedBorderStyle);
+
+            cellBounds.Offset(r.X, r.Y);
+            cellBounds.Width -= r.Right;
+            cellBounds.Height -= r.Bottom;
+
+            if (Selected == true)
+                cellBounds.Width += oc.DividerWidth;
+
+            return (cellBounds);
+        }
+
+        #endregion
+
+        #region GetValue
+
+        /// <summary>
+        /// GetValue
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        private string GetValue(object value)
+        {
+            return (value != Convert.DBNull ? Convert.ToString(value) : "");
+        }
+
+        #endregion
+
+        #region GetTextAlignment
+
+        /// <summary>
+        /// GetHorizontalAlignment
+        /// </summary>
+        /// <param name="alignment"></param>
+        /// <returns></returns>
+        private StringAlignment GetTextAlignment(DataGridViewContentAlignment alignment)
+        {
+            switch (alignment)
+            {
+                case DataGridViewContentAlignment.TopCenter:
+                case DataGridViewContentAlignment.MiddleCenter:
+                case DataGridViewContentAlignment.BottomCenter:
+                    return (StringAlignment.Center);
+
+                case DataGridViewContentAlignment.TopRight:
+                case DataGridViewContentAlignment.MiddleRight:
+                case DataGridViewContentAlignment.BottomRight:
+                    return (StringAlignment.Far);
+
+                default:
+                    return (StringAlignment.Near);
+            }
+        }
+
+        #endregion
+
+        #region RefreshCell
+
+        /// <summary>
+        /// Initiates the refresh of the cell label
+        /// </summary>
+        /// <param name="columnIndex"></param>
+        /// <param name="rowIndex"></param>
+        internal void RefreshCell(int columnIndex, int rowIndex)
+        {
+            DataGridView.InvalidateCell(columnIndex, rowIndex);
+        }
+
+        #endregion
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewLabelX/DataGridViewLabelXColumn.cs b/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewLabelX/DataGridViewLabelXColumn.cs
new file mode 100644
index 00000000..39a5fb1f
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewLabelX/DataGridViewLabelXColumn.cs	
@@ -0,0 +1,515 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Runtime.InteropServices;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    [ToolboxBitmap(typeof(DataGridViewLabelXColumn), "Controls.LabelX.ico"), ToolboxItem(false), ComVisible(false)]
+    public class DataGridViewLabelXColumn : DataGridViewButtonColumn, IDataGridViewColumn
+    {
+        #region Events
+
+        [Description("Occurs right before a LabelX Cell is painted.")]
+        public event EventHandler<BeforeCellPaintEventArgs> BeforeCellPaint;
+
+        [Description("Occurs when a LabelX Cell is Clicked.")]
+        public event EventHandler<EventArgs> Click;
+
+        #endregion
+
+        #region Private variables
+
+        private LabelX _LabelX;
+        private Bitmap _CellBitmap;
+
+        private bool _InCellCallBack;
+
+        #endregion
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        public DataGridViewLabelXColumn()
+        {
+            CellTemplate = new DataGridViewLabelXCell();
+
+            _LabelX = new LabelX();
+            _LabelX.CreateControl();
+
+            _LabelX.Visible = false;
+
+            HookEvents(true);
+        }
+
+        #region Hidden properties
+
+        /// <summary>
+        /// Button FlatStyle
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public new FlatStyle FlatStyle
+        {
+            get { return base.FlatStyle; }
+            set { base.FlatStyle = value; }
+        }
+
+        /// <summary>
+        /// Button UseColumnTextForButtonValue
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public new bool UseColumnTextForButtonValue
+        {
+            get { return base.UseColumnTextForButtonValue; }
+            set { base.UseColumnTextForButtonValue = value; }
+        }
+
+        #endregion
+
+        #region Internal properties
+
+        #region InCallBack
+
+        /// <summary>
+        /// InCallBack
+        /// </summary>
+        internal bool InCallBack
+        {
+            get { return (_InCellCallBack); }
+            set { _InCellCallBack = value; }
+        }
+
+        #endregion
+
+        #region LabelX
+
+        /// <summary>
+        /// Gets the Control LabelX
+        /// </summary>
+        internal LabelX LabelX
+        {
+            get { return (_LabelX); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Public properties
+
+        #region EnableMarkup
+
+        /// <summary>
+        /// Gets or sets whether text-markup support is enabled for items Text property. Default value is true.
+        /// Set this property to false to display HTML or other markup in the item instead of it being parsed as text-markup.
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Appearance")]
+        [Description("Indicates whether text-markup support is enabled for the item's Text property.")]
+        public bool EnableMarkup
+        {
+            get { return (_LabelX.EnableMarkup); }
+            set { _LabelX.EnableMarkup = value; }
+        }
+
+        #endregion
+
+        #region FocusCuesEnabled
+
+        /// <summary>
+        /// Gets or sets whether control displays focus cues when focused.
+        /// </summary>
+        [Browsable(true), DefaultValue(false), Category("Behavior")]
+        [Description("Indicates whether control displays focus cues when focused.")]
+        public bool FocusCuesEnabled
+        {
+            get { return (_LabelX.FocusCuesEnabled); }
+            set { _LabelX.FocusCuesEnabled = value; }
+        }
+
+        #endregion
+
+        #region BorderSide
+
+        /// <summary>
+        /// Gets or sets the border sides that are displayed.
+        /// Default value specifies border on all 4 sides.
+        /// </summary>
+        [Browsable(false), Category("Appearance"), DefaultValue(LabelItem.DEFAULT_BORDERSIDE)]
+        [Description("Specifies border sides that are displayed.")]
+        public eBorderSide BorderSide
+        {
+            get { return (_LabelX.BorderSide); }
+            set { _LabelX.BorderSide = value; }
+        }
+
+        #endregion
+
+        #region BorderType
+
+        /// <summary>
+        /// Gets or sets the type of the border drawn around the label.
+        /// </summary>
+        [Browsable(false), Category("Appearance"), DefaultValue(eBorderType.None)]
+        [Description("Indicates the type of the border drawn around the label.")]
+        public eBorderType BorderType
+        {
+            get { return (_LabelX.BorderType); }
+            set { _LabelX.BorderType = value; }
+        }
+
+        #endregion
+
+        #region Image
+
+        /// <summary>
+        /// Specifies label image.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), DefaultValue(null)]
+        [Description("The image that will be displayed on the face of the item.")]
+        public Image Image
+        {
+            get { return (_LabelX.Image); }
+            set { _LabelX.Image = value; }
+        }
+
+        #endregion
+
+        #region ImagePosition
+
+        /// <summary>
+        /// Gets/Sets the image position inside the label.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), DefaultValue(eImagePosition.Left)]
+        [Description("The alignment of the image in relation to text displayed by this item.")]
+        public eImagePosition ImagePosition
+        {
+            get { return (_LabelX.ImagePosition); }
+            set { _LabelX.ImagePosition = value; }
+        }
+
+        #endregion
+
+        #region PaddingBottom
+
+        /// <summary>
+        /// Gets or sets the bottom padding in pixels.
+        /// </summary>
+        [Browsable(true), DefaultValue(0), Category("Layout")]
+        [Description("Indicates bottom padding in pixels.")]
+        public int PaddingBottom
+        {
+            get { return (_LabelX.PaddingBottom); }
+            set { _LabelX.PaddingBottom = value; }
+        }
+
+        #endregion
+
+        #region PaddingLeft
+
+        /// <summary>
+        /// Gets or sets the left padding in pixels.
+        /// </summary>
+        [Browsable(true), DefaultValue(0), Category("Layout")]
+        [Description("Indicates left padding in pixels.")]
+        public int PaddingLeft
+        {
+            get { return (_LabelX.PaddingLeft); }
+            set { _LabelX.PaddingLeft = value; }
+        }
+
+        #endregion
+
+        #region PaddingTop
+
+        /// <summary>
+        /// Gets or sets the top padding in pixels.
+        /// </summary>
+        [Browsable(true), DefaultValue(0), Category("Layout")]
+        [Description("Indicates top padding in pixels.")]
+        public int PaddingTop
+        {
+            get { return (_LabelX.PaddingTop); }
+            set { _LabelX.PaddingTop = value; }
+        }
+
+        #endregion
+
+        #region PaddingRight
+
+        /// <summary>
+        /// Gets or sets the right padding in pixels.
+        /// </summary>
+        [Browsable(true), DefaultValue(0), Category("Layout")]
+        [Description("Indicates right padding in pixels.")]
+        public int PaddingRight
+        {
+            get { return (_LabelX.PaddingRight); }
+            set { _LabelX.PaddingRight = value; }
+        }
+
+        #endregion
+
+        #region SingleLineColor
+
+        /// <summary>
+        /// Gets or sets the border line color when border is single line.
+        /// </summary>
+        [Browsable(true), Category("Appearance")]
+        [Description("Indicates border line color when border is single line.")]
+        public Color SingleLineColor
+        {
+            get { return (_LabelX.SingleLineColor); }
+            set { _LabelX.SingleLineColor = value; }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeSingleLineColor()
+        {
+            return (_LabelX.ShouldSerializeSingleLineColor());
+        }
+
+        /// <summary>
+        /// Resets the SingleLineColor property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetSingleLineColor()
+        {
+            _LabelX.ResetSingleLineColor();
+        }
+
+        #endregion
+
+        #region Text
+
+        /// <summary>
+        /// Gets or sets the text associated with this item.
+        /// </summary>
+        [Browsable(true), Category("Appearance")]
+        [Editor("DevComponents.DotNetBar.Design.TextMarkupUIEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor))]
+        [Description("The text contained in the item.")]
+        public new string Text
+        {
+            get
+            {
+                return (_InCellCallBack == true ?
+                    _LabelX.Text : base.Text);
+            }
+
+            set
+            {
+                if (_InCellCallBack == true)
+                    _LabelX.Text = value;
+                else
+                    base.Text = value;
+            }
+        }
+
+        #endregion
+
+        #region TextAlignment
+
+        /// <summary>
+        /// Gets or sets the horizontal text alignment.
+        /// </summary>
+        [Browsable(true), DefaultValue(StringAlignment.Near), DevCoBrowsable(true), Category("Layout")]
+        [Description("Indicates the horizontal text alignment.")]
+        public StringAlignment TextAlignment
+        {
+            get { return (_LabelX.TextAlignment); }
+            set { _LabelX.TextAlignment = value; }
+        }
+
+        #endregion
+
+        #region TextLineAlignment
+
+        /// <summary>
+        /// Gets or sets the vertical text alignment.
+        /// </summary>
+        [Browsable(true), DefaultValue(StringAlignment.Center), DevCoBrowsable(true), Category("Layout")]
+        [Description("Indicates vertical text line alignment.")]
+        public StringAlignment TextLineAlignment
+        {
+            get { return (_LabelX.TextLineAlignment); }
+            set { _LabelX.TextLineAlignment = value; }
+        }
+
+        #endregion
+
+        #region UseMnemonic
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the control interprets an
+        /// ampersand character (&) in the control's Text property to be an
+        /// access key prefix character.
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Appearance")]
+        [Description("Indicates whether the control interprets an ampersand character (&) in the control's Text property to be an access key prefix character.")]
+        public bool UseMnemonic
+        {
+            get { return (_LabelX.UseMnemonic); }
+            set { _LabelX.UseMnemonic = value; }
+        }
+
+        #endregion
+
+        #region WordWrap
+
+        /// <summary>
+        /// Gets or sets a value that determines whether text is displayed in multiple lines or one long line.
+        /// </summary>
+        [Browsable(true), Category("Style"), DefaultValue(false)]
+        [Description("Indicates whether text is displayed in multiple lines or one long line.")]
+        public bool WordWrap
+        {
+            get { return (_LabelX.WordWrap); }
+            set { _LabelX.WordWrap = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region HookEvents
+
+        /// <summary>
+        /// Hooks or unhooks our system events
+        /// </summary>
+        /// <param name="hook"></param>
+        private void HookEvents(bool hook)
+        {
+            if (hook == true)
+            {
+                _LabelX.LabelItem.Click += LabelItemClick;
+            }
+            else
+            {
+                _LabelX.LabelItem.Click -= LabelItemClick;
+            }
+        }
+
+        #endregion
+
+        #region Event processing
+
+        #region LabelItem_Click
+
+        /// <summary>
+        /// LabelItem_Click
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void LabelItemClick(object sender, EventArgs e)
+        {
+            if (Click != null)
+                Click(sender, e);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetCellBitmap
+
+        /// <summary>
+        /// Gets the cell paint bitmap
+        /// </summary>
+        /// <param name="cellBounds"></param>
+        /// <returns></returns>
+        internal Bitmap GetCellBitmap(Rectangle cellBounds)
+        {
+            if (_CellBitmap == null ||
+                (_CellBitmap.Width != cellBounds.Width || _CellBitmap.Height < cellBounds.Height))
+            {
+                if (_CellBitmap != null)
+                    _CellBitmap.Dispose();
+
+                _CellBitmap = new Bitmap(cellBounds.Width, cellBounds.Height);
+            }
+
+            return (_CellBitmap);
+        }
+
+        #endregion
+
+        #region OnBeforeCellPaint
+
+        /// <summary>
+        /// Invokes BeforeCellPaint user events
+        /// </summary>
+        /// <param name="rowIndex">Row index</param>
+        /// <param name="columnIndex">Column index</param>
+        internal void OnBeforeCellPaint(int rowIndex, int columnIndex)
+        {
+            if (BeforeCellPaint != null)
+                BeforeCellPaint(this, new BeforeCellPaintEventArgs(rowIndex, columnIndex));
+        }
+
+        #endregion
+
+        #region ICloneable members
+
+        /// <summary>
+        /// Clones the LabelX Column
+        /// </summary>
+        /// <returns></returns>
+        public override object Clone()
+        {
+            DataGridViewLabelXColumn bc = base.Clone() as DataGridViewLabelXColumn;
+
+            if (bc != null)
+            {
+                _LabelX.LabelItem.InternalCopyToItem(bc.LabelX.LabelItem);
+
+                bc.FocusCuesEnabled = FocusCuesEnabled;
+                bc.Text = Text;
+                bc.UseMnemonic = UseMnemonic;
+            }
+
+            return (bc);
+        }
+
+        #endregion
+
+        #region IDataGridViewColumn Members
+
+        /// <summary>
+        /// Gets the Cell paint setting for the ButtonX control
+        /// </summary>
+        [Browsable(false)]
+        public bool OwnerPaintCell
+        {
+            get { return (true); }
+        }
+
+        #endregion
+
+        #region Dispose
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        /// <param name="disposing"></param>
+        protected override void Dispose(bool disposing)
+        {
+            HookEvents(false);
+
+            if (disposing == true)
+                _LabelX.Dispose();
+
+            if (_CellBitmap != null)
+            {
+                _CellBitmap.Dispose();
+                _CellBitmap = null;
+            }
+
+            base.Dispose(disposing);
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewMaskedTextBoxAdv/DataGridViewMaskedTextBoxAdvCell.cs b/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewMaskedTextBoxAdv/DataGridViewMaskedTextBoxAdvCell.cs
new file mode 100644
index 00000000..66d58574
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewMaskedTextBoxAdv/DataGridViewMaskedTextBoxAdvCell.cs	
@@ -0,0 +1,790 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Runtime.InteropServices;
+using System.Windows.Forms;
+using DevComponents.Editors;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    public class DataGridViewMaskedTextBoxAdvCell : DataGridViewTextBoxCell
+    {
+        [DllImport("user32.dll", CharSet = CharSet.Auto, SetLastError = false)]
+        static extern IntPtr PostMessage(IntPtr hWnd, int msg, int wParam, int lParam);
+
+        #region Public properties
+
+        #region EditType
+
+        /// <summary>
+        /// Gets the Type of the editing control associated with the cell
+        /// </summary>
+        public override Type EditType
+        {
+            get { return (typeof(DataGridViewMaskedTextBoxAdvEditingControl)); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InitializeEditingControl
+
+        /// <summary>
+        /// InitializeEditingControl
+        /// </summary>
+        /// <param name="rowIndex"></param>
+        /// <param name="initialFormattedValue"></param>
+        /// <param name="dataGridViewCellStyle"></param>
+        public override void InitializeEditingControl(int rowIndex,
+            object initialFormattedValue, DataGridViewCellStyle dataGridViewCellStyle)
+        {
+            DetachEditingControl();
+
+            base.InitializeEditingControl(rowIndex, initialFormattedValue, dataGridViewCellStyle);
+
+            DataGridViewMaskedTextBoxAdvEditingControl ctl =
+                (DataGridViewMaskedTextBoxAdvEditingControl) DataGridView.EditingControl;
+
+            DataGridViewMaskedTextBoxAdvColumn oc = OwningColumn as DataGridViewMaskedTextBoxAdvColumn;
+
+            if (oc != null)
+            {
+                MaskedTextBoxAdv tb = oc.MaskedTextBoxAdv;
+
+                ctl.AllowPromptAsInput = tb.AllowPromptAsInput;
+                ctl.AsciiOnly = tb.AsciiOnly;
+                ctl.BeepOnError = false;
+                ctl.Culture = tb.Culture;
+                ctl.CutCopyMaskFormat = tb.CutCopyMaskFormat;
+                ctl.DropDownControl = tb.DropDownControl;
+                ctl.Enabled = tb.Enabled;
+                ctl.FocusHighlightColor = tb.FocusHighlightColor;
+                ctl.FocusHighlightEnabled = tb.FocusHighlightEnabled;
+                ctl.HidePromptOnLeave = tb.HidePromptOnLeave;
+                ctl.ImeMode = tb.ImeMode;
+                ctl.InsertKeyMode = tb.InsertKeyMode;
+                ctl.Mask = tb.Mask;
+                ctl.PasswordChar = tb.PasswordChar;
+                ctl.PromptChar = tb.PromptChar;
+                ctl.RejectInputOnFirstFailure = tb.RejectInputOnFirstFailure;
+                ctl.ResetOnPrompt = tb.ResetOnPrompt;
+                ctl.ResetOnSpace = tb.ResetOnSpace;
+                ctl.RightToLeft = tb.RightToLeft;
+                ctl.SkipLiterals = tb.SkipLiterals;
+                ctl.TextAlign = GetTextAlignment(dataGridViewCellStyle.Alignment);
+                ctl.TextMaskFormat = tb.TextMaskFormat;
+                ctl.UseSystemPasswordChar = tb.UseSystemPasswordChar;
+                ctl.ValidatingType = tb.ValidatingType;
+                ctl.WatermarkBehavior = tb.WatermarkBehavior;
+                ctl.WatermarkColor = tb.WatermarkColor;
+                ctl.WatermarkEnabled = tb.WatermarkEnabled;
+                ctl.WatermarkFont = tb.WatermarkFont;
+                ctl.WatermarkText = tb.WatermarkText;
+
+                // The underlying MaskedTextBox's MultiLine property
+                // is "not fully supported" - but we'll set it anyway.
+
+                ctl.MaskedTextBox.Multiline = (dataGridViewCellStyle.WrapMode == DataGridViewTriState.True);
+
+                ctl.BackgroundStyle.ApplyStyle(tb.BackgroundStyle);
+                ctl.BackgroundStyle.Class = tb.BackgroundStyle.Class;
+
+                tb.ButtonClear.CopyToItem(ctl.ButtonClear);
+                tb.ButtonCustom.CopyToItem(ctl.ButtonCustom);
+                tb.ButtonCustom2.CopyToItem(ctl.ButtonCustom2);
+                tb.ButtonDropDown.CopyToItem(ctl.ButtonDropDown);
+
+                ctl.ButtonClearClick += ButtonClearClick;
+                ctl.ButtonCustomClick += ButtonCustomClick;
+                ctl.ButtonCustom2Click += ButtonCustom2Click;
+                ctl.ButtonDropDownClick += ButtonDropDownClick;
+                ctl.KeyDown += KeyDown;
+
+                ctl.Text = GetValue(initialFormattedValue);
+
+                ctl.BeepOnError = tb.BeepOnError;
+            }
+        }
+
+        #endregion
+
+        #region DetachEditingControl
+
+        /// <summary>
+        /// DetachEditingControl
+        /// </summary>
+        public override void DetachEditingControl()
+        {
+            if (DataGridView != null && DataGridView.EditingControl != null)
+            {
+                DataGridViewMaskedTextBoxAdvEditingControl di =
+                    DataGridView.EditingControl as DataGridViewMaskedTextBoxAdvEditingControl;
+
+                if (di != null)
+                {
+                    di.ButtonClearClick -= ButtonClearClick;
+                    di.ButtonCustomClick -= ButtonCustomClick;
+                    di.ButtonCustom2Click -= ButtonCustom2Click;
+                    di.ButtonDropDownClick -= ButtonDropDownClick;
+                    di.KeyDown -= KeyDown;
+                }
+            }
+
+            base.DetachEditingControl();
+        }
+
+        #endregion
+
+        #region Event processing
+
+        #region ButtonClearClick
+
+        /// <summary>
+        /// ButtonClearClick
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void ButtonClearClick(object sender, CancelEventArgs e)
+        {
+            ((DataGridViewMaskedTextBoxAdvColumn)OwningColumn).DoButtonClearClick(sender, e);
+        }
+
+        #endregion
+
+        #region ButtonCustomClick
+
+        /// <summary>
+        /// ButtonCustomClick
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void ButtonCustomClick(object sender, EventArgs e)
+        {
+            ((DataGridViewMaskedTextBoxAdvColumn)OwningColumn).DoButtonCustomClick(sender, e);
+        }
+
+        #endregion
+
+        #region ButtonCustom2Click
+
+        /// <summary>
+        /// ButtonCustom2Click
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void ButtonCustom2Click(object sender, EventArgs e)
+        {
+            ((DataGridViewMaskedTextBoxAdvColumn)OwningColumn).DoButtonCustom2Click(sender, e);
+        }
+
+        #endregion
+
+        #region ButtonDropDownClick
+
+        /// <summary>
+        /// ButtonDropDownClick
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void ButtonDropDownClick(object sender, CancelEventArgs e)
+        {
+            ((DataGridViewMaskedTextBoxAdvColumn)OwningColumn).DoButtonDropDownClick(sender, e);
+        }
+
+        #endregion
+
+        #region KeyDown
+
+        /// <summary>
+        /// KeyDown routine forwards all DataGridView sent keys to
+        /// the underlying focusable control
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void KeyDown(object sender, KeyEventArgs e)
+        {
+            if (DataGridView != null && DataGridView.EditingControl != null)
+            {
+                DataGridViewMaskedTextBoxAdvEditingControl di =
+                    DataGridView.EditingControl as DataGridViewMaskedTextBoxAdvEditingControl;
+
+                if (di != null)
+                {
+                    di.MaskedTextBox.SelectAll();
+
+                    PostMessage(di.MaskedTextBox.Handle, 256, (int) e.KeyCode, 1);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region PositionEditingControl
+
+        /// <summary>
+        /// PositionEditingControl
+        /// </summary>
+        /// <param name="setLocation"></param>
+        /// <param name="setSize"></param>
+        /// <param name="cellBounds"></param>
+        /// <param name="cellClip"></param>
+        /// <param name="cellStyle"></param>
+        /// <param name="singleVerticalBorderAdded"></param>
+        /// <param name="singleHorizontalBorderAdded"></param>
+        /// <param name="isFirstDisplayedColumn"></param>
+        /// <param name="isFirstDisplayedRow"></param>
+        public override void PositionEditingControl(bool setLocation, bool setSize, Rectangle cellBounds,
+            Rectangle cellClip, DataGridViewCellStyle cellStyle, bool singleVerticalBorderAdded,
+            bool singleHorizontalBorderAdded, bool isFirstDisplayedColumn, bool isFirstDisplayedRow)
+        {
+            Rectangle editingControlBounds =
+                PositionEditingPanel(cellBounds, cellClip, cellStyle, singleVerticalBorderAdded,
+                                     singleHorizontalBorderAdded, isFirstDisplayedColumn, isFirstDisplayedRow);
+
+            editingControlBounds = GetAdjustedEditingControlBounds(editingControlBounds, cellStyle);
+
+            DataGridView.EditingControl.Location = new Point(editingControlBounds.X, editingControlBounds.Y);
+            DataGridView.EditingControl.Size = new Size(editingControlBounds.Width, editingControlBounds.Height);
+        }
+
+        #endregion
+
+        #region GetAdjustedEditingControlBounds
+
+        /// <summary>
+        /// GetAdjustedEditingControlBounds
+        /// </summary>
+        /// <param name="editingControlBounds"></param>
+        /// <param name="cellStyle"></param>
+        /// <returns></returns>
+        private Rectangle GetAdjustedEditingControlBounds(
+            Rectangle editingControlBounds, DataGridViewCellStyle cellStyle)
+        {
+            // Add a 1 pixel padding around the editing control
+
+            editingControlBounds.X += 1;
+            editingControlBounds.Y += 1;
+            editingControlBounds.Width = Math.Max(0, editingControlBounds.Width - 2);
+            editingControlBounds.Height = Math.Max(0, editingControlBounds.Height - 2);
+
+            // Adjust the vertical location of the editing control
+
+            Rectangle r = GetCellBounds(editingControlBounds);
+
+            if (cellStyle.WrapMode != DataGridViewTriState.True)
+            {
+                if (r.Height < editingControlBounds.Height)
+                {
+                    switch (cellStyle.Alignment)
+                    {
+                        case DataGridViewContentAlignment.MiddleLeft:
+                        case DataGridViewContentAlignment.MiddleCenter:
+                        case DataGridViewContentAlignment.MiddleRight:
+                            editingControlBounds.Y += (editingControlBounds.Height - r.Height)/2;
+                            break;
+
+                        case DataGridViewContentAlignment.BottomLeft:
+                        case DataGridViewContentAlignment.BottomCenter:
+                        case DataGridViewContentAlignment.BottomRight:
+                            editingControlBounds.Y += (editingControlBounds.Height - r.Height);
+                            break;
+                    }
+                }
+
+                editingControlBounds.Height = Math.Max(1, r.Height);
+            }
+
+            editingControlBounds.Width = Math.Max(1, editingControlBounds.Width);
+
+            return (editingControlBounds);
+        }
+
+        #endregion
+
+        #region GetPreferredSize
+
+        #region GetPreferredSize
+
+        /// <summary>
+        /// GetPreferredSize
+        /// </summary>
+        /// <param name="graphics"></param>
+        /// <param name="cellStyle"></param>
+        /// <param name="rowIndex"></param>
+        /// <param name="constraintSize"></param>
+        /// <returns></returns>
+        protected override Size GetPreferredSize(Graphics graphics,
+               DataGridViewCellStyle cellStyle, int rowIndex, Size constraintSize)
+        {
+            if (DataGridView == null)
+                return (new Size(-1, -1));
+
+            Size preferredSize = base.GetPreferredSize(graphics, cellStyle, rowIndex, constraintSize);
+
+            DataGridViewMaskedTextBoxAdvColumn oc = OwningColumn as DataGridViewMaskedTextBoxAdvColumn;
+
+            if (oc != null)
+            {
+                MaskedTextBoxAdv msk = oc.MaskedTextBoxAdv;
+
+                preferredSize.Height = msk.Height;
+
+                if (constraintSize.Width == 0)
+                {
+                    preferredSize.Width += GetImageWidth(msk.ButtonClear);
+                    preferredSize.Width += GetImageWidth(msk.ButtonCustom);
+                    preferredSize.Width += GetImageWidth(msk.ButtonCustom2);
+                    preferredSize.Width += GetImageWidth(msk.ButtonDropDown);
+                }
+            }
+
+            return (preferredSize);
+        }
+
+        #endregion
+
+        #region GetFormattedValue
+
+        protected override object GetFormattedValue(object value, int rowIndex,
+            ref DataGridViewCellStyle cellStyle, TypeConverter valueTypeConverter,
+            TypeConverter formattedValueTypeConverter, DataGridViewDataErrorContexts context)
+        {
+            DataGridViewMaskedTextBoxAdvColumn oc = OwningColumn as DataGridViewMaskedTextBoxAdvColumn;
+
+            if (oc != null)
+            {
+                MaskedTextBoxAdv msk = oc.MaskedTextBoxAdv;
+                msk.Text = GetValue(value);
+
+                return (msk.Text);
+            }
+
+            return (base.GetFormattedValue(value, rowIndex,
+                ref cellStyle, valueTypeConverter, formattedValueTypeConverter, context));
+        }
+
+        #endregion
+
+        #region GetImageWidth
+
+        private int GetImageWidth(InputButtonSettings ibs)
+        {
+            if (ibs.Visible == true)
+                return (ibs.Image != null ? ibs.Image.Width : 16);
+
+            return (0);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Paint
+
+        #region Paint
+
+        /// <summary>
+        /// Cell painting
+        /// </summary>
+        /// <param name="graphics"></param>
+        /// <param name="clipBounds"></param>
+        /// <param name="cellBounds"></param>
+        /// <param name="rowIndex"></param>
+        /// <param name="elementState"></param>
+        /// <param name="value"></param>
+        /// <param name="formattedValue"></param>
+        /// <param name="errorText"></param>
+        /// <param name="cellStyle"></param>
+        /// <param name="advancedBorderStyle"></param>
+        /// <param name="paintParts"></param>
+        protected override void Paint(Graphics graphics,
+            Rectangle clipBounds, Rectangle cellBounds, int rowIndex,
+            DataGridViewElementStates elementState, object value, object formattedValue,
+            string errorText, DataGridViewCellStyle cellStyle,
+            DataGridViewAdvancedBorderStyle advancedBorderStyle,
+            DataGridViewPaintParts paintParts)
+        {
+            if (DataGridView != null)
+            {
+                // First paint the borders of the cell
+
+                if (PartsSet(paintParts, DataGridViewPaintParts.Border))
+                    PaintBorder(graphics, clipBounds, cellBounds, cellStyle, advancedBorderStyle);
+
+                // Now paint the background and content
+
+                if (PartsSet(paintParts, DataGridViewPaintParts.Background))
+                {
+                    Rectangle rBk = GetBackBounds(cellBounds, advancedBorderStyle);
+
+                    if (rBk.Height > 0 && rBk.Width > 0)
+                    {
+                        DataGridViewMaskedTextBoxAdvColumn oc = (DataGridViewMaskedTextBoxAdvColumn)OwningColumn;
+                        Bitmap bm = oc.GetCellBitmap(cellBounds);
+
+                        if (bm != null)
+                        {
+                            using (Graphics g = Graphics.FromImage(bm))
+                            {
+                                PaintCellBackground(g, cellStyle, rBk);
+                                PaintCellContent(g, cellBounds, rowIndex, formattedValue, cellStyle, paintParts, bm);
+
+                                graphics.DrawImageUnscaledAndClipped(bm, rBk);
+                            }
+
+                            if ((DataGridView.ShowCellErrors == true) &&
+                                (paintParts & DataGridViewPaintParts.ErrorIcon) == DataGridViewPaintParts.ErrorIcon)
+                            {
+                                base.PaintErrorIcon(graphics, clipBounds, cellBounds, errorText);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region PaintCellBackground
+
+        /// <summary>
+        /// Paints the cell background
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="cellStyle"></param>
+        /// <param name="rBack"></param>
+        private void PaintCellBackground(Graphics g,
+            DataGridViewCellStyle cellStyle, Rectangle rBack)
+        {
+            Rectangle r = rBack;
+            r.Location = new Point(0, 0);
+
+            DataGridViewX dx = DataGridView as DataGridViewX;
+
+            if (dx != null && dx.Enabled == true && Selected == true &&
+                dx.PaintEnhancedSelection == true)
+            {
+                Office2007ButtonItemPainter.PaintBackground(g, dx.ButtonStateColorTable,
+                    r, RoundRectangleShapeDescriptor.RectangleShape, false,
+                    false);
+            }
+            else
+            {
+                Color color = (Selected == true)
+                    ? cellStyle.SelectionBackColor : cellStyle.BackColor;
+
+                using (Brush br = new SolidBrush(color))
+                    g.FillRectangle(br, r);
+            }
+        }
+
+        #endregion
+
+        #region PaintCellContent
+
+        /// <summary>
+        /// Paints the cell content
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="cellBounds"></param>
+        /// <param name="rowIndex"></param>
+        /// <param name="value"></param>
+        /// <param name="cellStyle"></param>
+        /// <param name="paintParts"></param>
+        /// <param name="bm"></param>
+        private void PaintCellContent(Graphics g, Rectangle cellBounds, int rowIndex, object value,
+            DataGridViewCellStyle cellStyle, DataGridViewPaintParts paintParts, Bitmap bm)
+        {
+            DataGridViewMaskedTextBoxAdvColumn oc = (DataGridViewMaskedTextBoxAdvColumn)OwningColumn;
+            MaskedTextBoxAdv di = oc.MaskedTextBoxAdv;
+
+            Point ptCurrentCell = DataGridView.CurrentCellAddress;
+            bool cellCurrent = ptCurrentCell.X == ColumnIndex && ptCurrentCell.Y == rowIndex;
+            bool cellEdited = cellCurrent && DataGridView.EditingControl != null;
+
+            // If the cell is in editing mode, there is nothing else to paint
+
+            if (cellEdited == false && rowIndex < DataGridView.RowCount)
+            {
+                if (PartsSet(paintParts, DataGridViewPaintParts.ContentForeground))
+                {
+                    cellBounds.X = 0;
+                    cellBounds.Y = 0;
+                    cellBounds.Width -= (oc.DividerWidth + 1);
+                    cellBounds.Height -= 1;
+
+                    di.Font = cellStyle.Font;
+                    di.ForeColor = cellStyle.ForeColor;
+                    di.BackColor = cellStyle.BackColor;
+
+                    di.TextAlign = GetTextAlignment(cellStyle.Alignment);
+                    di.Text = GetValue(value);
+
+                    Rectangle r = GetAdjustedEditingControlBounds(cellBounds, cellStyle);
+
+                    oc.OnBeforeCellPaint(rowIndex, ColumnIndex);
+
+                    if (oc.DisplayControlForCurrentCellOnly == false)
+                        DrawControl(di, cellStyle, r, bm, g, oc);
+                    else
+                        DrawText(di, cellStyle, r, g);
+                }
+            }
+        }
+
+        #region DrawControl
+
+        /// <summary>
+        /// DrawControl
+        /// </summary>
+        /// <param name="di"></param>
+        /// <param name="cellStyle"></param>
+        /// <param name="r"></param>
+        /// <param name="bm"></param>
+        /// <param name="g"></param>
+        /// <param name="oc"></param>
+        private void DrawControl(MaskedTextBoxAdv di, DataGridViewCellStyle cellStyle, Rectangle r,
+            Bitmap bm, Graphics g, DataGridViewMaskedTextBoxAdvColumn oc)
+        {
+            if (di.ButtonGroup.Items.Count > 0)
+            {
+                // Determine if we must perform some tom-foolery in order
+                // to get the control to DrawToBitmap correctly in older
+                // Windows versions
+
+                if (MustRenderVisibleControl() == true)
+                {
+                    di.Location = oc.DataGridView.Location;
+
+                    if (di.Parent == null)
+                    {
+                        Form form = oc.DataGridView.FindForm();
+
+                        if (form != null)
+                            di.Parent = form;
+                    }
+
+                    di.SendToBack();
+                    di.Visible = true;
+                }
+
+                using (Bitmap bm2 = new Bitmap(bm))
+                {
+                    di.Bounds = r;
+                    di.DrawToBitmap(bm2, r);
+
+                    foreach (VisualItem item in di.ButtonGroup.Items)
+                    {
+                        if (item.Visible == true)
+                        {
+                            Rectangle t = item.RenderBounds;
+                            t.X += r.X;
+                            t.Y += r.Y;
+
+                            g.DrawImage(bm2, t, t, GraphicsUnit.Pixel);
+
+                            if (t.Left < r.Right)
+                                r.Width -= (r.Right - t.Left - 1);
+                        }
+                    }
+                }
+
+                di.Visible = false;
+            }
+
+            DrawText(di, cellStyle, r, g);
+        }
+
+        #endregion
+
+        #region DrawText
+
+        /// <summary>
+        /// DrawText
+        /// </summary>
+        /// <param name="di"></param>
+        /// <param name="cellStyle"></param>
+        /// <param name="r"></param>
+        /// <param name="g"></param>
+        private void DrawText(MaskedTextBoxAdv di, DataGridViewCellStyle cellStyle, Rectangle r, Graphics g)
+        {
+            r.Inflate(-2, 0);
+
+            eTextFormat tf = eTextFormat.Default | eTextFormat.NoPrefix;
+
+            switch (di.TextAlign)
+            {
+                case HorizontalAlignment.Center:
+                    tf |= eTextFormat.HorizontalCenter;
+                    break;
+
+                case HorizontalAlignment.Right:
+                    tf |= eTextFormat.Right;
+                    break;
+            }
+
+            if (cellStyle.WrapMode == DataGridViewTriState.True)
+                tf |= eTextFormat.WordBreak;
+
+            switch (cellStyle.Alignment)
+            {
+                case DataGridViewContentAlignment.TopLeft:
+                case DataGridViewContentAlignment.TopCenter:
+                case DataGridViewContentAlignment.TopRight:
+                    tf |= eTextFormat.Top;
+                    break;
+
+                case DataGridViewContentAlignment.BottomLeft:
+                case DataGridViewContentAlignment.BottomCenter:
+                case DataGridViewContentAlignment.BottomRight:
+                    tf |= eTextFormat.Bottom;
+                    break;
+
+                default:
+                    tf |= eTextFormat.VerticalCenter;
+                    break;
+            }
+
+            DataGridViewMaskedTextBoxAdvColumn oc = (DataGridViewMaskedTextBoxAdvColumn)OwningColumn;
+
+            string text = di.Text;
+
+            if (oc.PasswordChar != '\0')
+                text = "".PadRight(text.Length, oc.PasswordChar);
+
+            TextDrawing.DrawString(g, text, di.Font, di.ForeColor, r, tf);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region MustRenderVisibleControl
+
+        /// <summary>
+        /// MustRenderVisibleControl
+        /// </summary>
+        /// <returns></returns>
+        private bool MustRenderVisibleControl()
+        {
+            OperatingSystem osInfo = Environment.OSVersion;
+
+            return (osInfo.Platform == PlatformID.Win32Windows ||
+                (osInfo.Platform == PlatformID.Win32NT && osInfo.Version.Major < 6));
+
+        }
+
+        #endregion
+
+        #region GetBackBounds
+
+        /// <summary>
+        /// Gets the background bounds for the given cell
+        /// </summary>
+        /// <param name="cellBounds"></param>
+        /// <param name="advancedBorderStyle"></param>
+        /// <returns></returns>
+        private Rectangle GetBackBounds(
+            Rectangle cellBounds, DataGridViewAdvancedBorderStyle advancedBorderStyle)
+        {
+            DataGridViewMaskedTextBoxAdvColumn oc = (DataGridViewMaskedTextBoxAdvColumn)OwningColumn;
+
+            Rectangle r = BorderWidths(advancedBorderStyle);
+
+            cellBounds.Offset(r.X, r.Y);
+            cellBounds.Width -= r.Right;
+            cellBounds.Height -= r.Bottom;
+
+            if (Selected == true)
+                cellBounds.Width += oc.DividerWidth;
+
+            return (cellBounds);
+        }
+        #endregion
+
+        #region GetCellBounds
+
+        /// <summary>
+        /// Gets the button bounds for the given cell
+        /// </summary>
+        /// <param name="cellBounds"></param>
+        /// <returns></returns>
+        private Rectangle GetCellBounds(Rectangle cellBounds)
+        {
+            DataGridViewMaskedTextBoxAdvColumn oc = (DataGridViewMaskedTextBoxAdvColumn)OwningColumn;
+
+            Size size = oc.MaskedTextBoxAdv.PreferredSize;
+
+            cellBounds.Location = new Point(1, 1);
+
+            cellBounds.Width -= oc.DividerWidth;
+            cellBounds.Height = size.Height - 1;
+
+            return (cellBounds);
+        }
+
+        #endregion
+
+        #region GetValue
+
+        /// <summary>
+        /// GetValue
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        private string GetValue(object value)
+        {
+            return ((value != Convert.DBNull ? Convert.ToString(value) : ""));
+        }
+
+        #endregion
+
+        #region GetTextAlignment
+
+        /// <summary>
+        /// GetTextAlignment
+        /// </summary>
+        /// <param name="alignment"></param>
+        /// <returns></returns>
+        private HorizontalAlignment GetTextAlignment(DataGridViewContentAlignment alignment)
+        {
+            switch (alignment)
+            {
+                case DataGridViewContentAlignment.TopCenter:
+                case DataGridViewContentAlignment.MiddleCenter:
+                case DataGridViewContentAlignment.BottomCenter:
+                    return (HorizontalAlignment.Center);
+
+                case DataGridViewContentAlignment.TopRight:
+                case DataGridViewContentAlignment.MiddleRight:
+                case DataGridViewContentAlignment.BottomRight:
+                    return (HorizontalAlignment.Right);
+
+                default:
+                    return (HorizontalAlignment.Left);
+            }
+        }
+
+        #endregion
+
+        #region PartsSet
+
+        /// <summary>
+        /// Determines if the given part is set
+        /// </summary>
+        /// <param name="paintParts"></param>
+        /// <param name="parts"></param>
+        /// <returns></returns>
+        private bool PartsSet(DataGridViewPaintParts paintParts, DataGridViewPaintParts parts)
+        {
+            return ((paintParts & parts) == parts);
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewMaskedTextBoxAdv/DataGridViewMaskedTextBoxAdvColumn.cs b/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewMaskedTextBoxAdv/DataGridViewMaskedTextBoxAdvColumn.cs
new file mode 100644
index 00000000..c5503143
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewMaskedTextBoxAdv/DataGridViewMaskedTextBoxAdvColumn.cs	
@@ -0,0 +1,924 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Globalization;
+using System.Runtime.InteropServices;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.Rendering;
+using DevComponents.Editors;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    [ToolboxBitmap(typeof(DataGridViewMaskedTextBoxAdvColumn), "Controls.MaskedTextBoxAdv.ico"), ToolboxItem(false), ComVisible(false)]
+    public class DataGridViewMaskedTextBoxAdvColumn : DataGridViewTextBoxColumn, IDataGridViewColumn
+    {
+        #region Events
+
+        /// <summary>
+        /// Occurs right before a MaskedTextBoxAdv Cell is painted
+        /// </summary>
+        [Description("Occurs right before a MaskedTextBoxAdv Cell is painted.")]
+        public event EventHandler<BeforeCellPaintEventArgs> BeforeCellPaint;
+
+        /// <summary>
+        /// Occurs when Clear button is clicked and allows you
+        /// to cancel the default action performed by the button
+        /// </summary>
+        [Description("Occurs when Clear button is clicked and allows you to cancel the default action performed by the button.")]
+        public event EventHandler<CancelEventArgs> ButtonClearClick;
+
+        /// <summary>
+        /// Occurs when ButtonCustom control is clicked
+        /// </summary>
+        [Description("Occurs when ButtonCustom control is clicked.")]
+        public event EventHandler<EventArgs> ButtonCustomClick;
+
+        /// <summary>
+        /// Occurs when ButtonCustom2 control is clicked
+        /// </summary>
+        [Description("Occurs when ButtonCustom2 control is clicked.")]
+        public event EventHandler<EventArgs> ButtonCustom2Click;
+
+        /// <summary>
+        /// Occurs when Drop-Down button is clicked and allows you to cancel showing of the popup
+        /// </summary>
+        [Description("Occurs when Drop-Down button is clicked and allows you to cancel showing of the popup.")]
+        public event EventHandler<CancelEventArgs> ButtonDropDownClick;
+
+        #endregion
+
+        #region Private variables
+
+        private MaskedTextBoxAdv _MaskedTextBoxAdv;
+        private Bitmap _CellBitmap;
+        private bool _DisplayControlForCurrentCellOnly = true;
+
+        #endregion
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        public DataGridViewMaskedTextBoxAdvColumn()
+        {
+            CellTemplate = new DataGridViewMaskedTextBoxAdvCell();
+
+            _MaskedTextBoxAdv = new MaskedTextBoxAdv();
+
+            _MaskedTextBoxAdv.BackgroundStyle.Class = ElementStyleClassKeys.DataGridViewBorderKey;
+        }
+
+        #region Internal properties
+
+        #region MaskedTextBoxAdv
+
+        /// <summary>
+        /// Gets the underlying MaskedTextBoxAdv control
+        /// </summary>
+        [Browsable(false)]
+        internal MaskedTextBoxAdv MaskedTextBoxAdv
+        {
+            get { return (_MaskedTextBoxAdv); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Public properties
+
+        #region AllowPromptAsInput
+
+        /// <summary>
+        /// Gets or sets a value indicating whether PromptChar can be entered as valid data.
+        /// </summary>
+        [Browsable(true), DefaultValue(true)]
+        [Description("Indicates whether PromptChar can be entered as valid data.")]
+        public bool AllowPromptAsInput
+        {
+            get { return (_MaskedTextBoxAdv.AllowPromptAsInput); }
+            set { _MaskedTextBoxAdv.AllowPromptAsInput = value; }
+        }
+
+        #endregion
+
+        #region AsciiOnly
+
+        /// <summary>
+        /// Gets or sets a value indicating whether characters outside of the ASCII character set will be accepted.
+        /// </summary>
+        [Browsable(true), DefaultValue(false)]
+        [Description("Indicates whether whether characters outside of the ASCII character set will be accepted.")]
+        public bool AsciiOnly
+        {
+            get { return (_MaskedTextBoxAdv.AsciiOnly); }
+            set { _MaskedTextBoxAdv.AsciiOnly = value; }
+        }
+
+        #endregion
+
+        #region BackColor
+
+        /// <summary>
+        /// Gets or sets the Background color.
+        /// </summary>
+        [Browsable(false)]
+        public Color BackColor
+        {
+            get { return (_MaskedTextBoxAdv.BackColor); }
+            set { _MaskedTextBoxAdv.BackColor = value; }
+        }
+
+        #endregion
+
+        #region BackgroundStyle
+
+        /// <summary>
+        /// Specifies the background style of the control.
+        /// </summary>
+        [Browsable(true), Category("Style")]
+        [Description("Gets or sets control background style.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ElementStyle BackgroundStyle
+        {
+            get { return (_MaskedTextBoxAdv.BackgroundStyle); }
+        }
+
+        /// <summary>
+        /// Resets style to default value. Used by windows forms designer.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetBackgroundStyle()
+        {
+            _MaskedTextBoxAdv.ResetBackgroundStyle();
+
+            _MaskedTextBoxAdv.BackgroundStyle.Class = "TextBoxBorder";
+            _MaskedTextBoxAdv.BackgroundStyle.CornerType = eCornerType.Square;
+        }
+
+        #endregion
+
+        #region BeepOnError
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the masked text box
+        /// control raises the system beep for each user key stroke that it rejects.
+        /// </summary>
+        [Browsable(true), DefaultValue(false)]
+        [Description("Indicates whether the masked text box control raises the system beep for each user key stroke that it rejects.")]
+        public bool BeepOnError
+        {
+            get { return (_MaskedTextBoxAdv.BeepOnError); }
+            set { _MaskedTextBoxAdv.BeepOnError = value; }
+        }
+
+        #endregion
+
+        #region ButtonClear
+
+        /// <summary>
+        /// Gets the object that describes the settings for the button
+        /// that clears the content of the control when clicked.
+        /// </summary>
+        [Browsable(true), Category("Buttons")]
+        [Description("Describes the settings for the button that clears the content of the control when clicked.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public InputButtonSettings ButtonClear
+        {
+            get { return (_MaskedTextBoxAdv.ButtonClear); }
+        }
+
+        #endregion
+
+        #region ButtonCustom
+
+        /// <summary>
+        /// Gets the object that describes the settings for the custom button
+        /// that can execute an custom action of your choosing when clicked.
+        /// </summary>
+        [Browsable(true), Category("Buttons")]
+        [Description("Describes the settings for the custom button that can execute an custom action of your choosing when clicked.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public InputButtonSettings ButtonCustom
+        {
+            get { return (_MaskedTextBoxAdv.ButtonCustom); }
+        }
+
+        #endregion
+
+        #region ButtonCustom2
+
+        /// <summary>
+        /// Gets the object that describes the settings for the custom button that can execute an custom action of your choosing when clicked.
+        /// </summary>
+        [Browsable(true), Category("Buttons")]
+        [Description("Describes the settings for the custom button that can execute an custom action of your choosing when clicked.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public InputButtonSettings ButtonCustom2
+        {
+            get { return (_MaskedTextBoxAdv.ButtonCustom2); }
+        }
+
+        #endregion
+
+        #region ButtonDropDown
+
+        /// <summary>
+        /// Gets the object that describes the settings for the button
+        /// that shows drop-down when clicked.
+        /// </summary>
+        [Browsable(true), Category("Buttons")]
+        [Description("Describes the settings for the button that shows drop-down when clicked.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public InputButtonSettings ButtonDropDown
+        {
+            get { return (_MaskedTextBoxAdv.ButtonDropDown); }
+        }
+
+        #endregion
+
+        #region Culture
+
+        /// <summary>
+        /// Gets or sets the culture information associated with the masked text box.
+        /// </summary>
+        [Browsable(true), DefaultValue(false)]
+        [Description("Indicates the culture information associated with the masked text box.")]
+        public CultureInfo Culture
+        {
+            get { return (_MaskedTextBoxAdv.Culture); }
+            set { _MaskedTextBoxAdv.Culture = value; }
+        }
+
+        #endregion
+
+        #region CutCopyMaskFormat
+
+        /// <summary>
+        /// Gets or sets a value that determines whether
+        /// literals and prompt characters are copied to the clipboard
+        /// </summary>
+        [Browsable(true), DefaultValue(MaskFormat.IncludeLiterals)]
+        [Description("Indicates whether literals and prompt characters are copied to the clipboard.")]
+        public MaskFormat CutCopyMaskFormat
+        {
+            get { return (_MaskedTextBoxAdv.CutCopyMaskFormat); }
+            set { _MaskedTextBoxAdv.CutCopyMaskFormat = value; }
+        }
+
+        #endregion
+
+        #region DisplayControlForCurrentCellOnly
+
+        /// <summary>
+        /// Gets or sets whether the control
+        /// will be displayed for the current cell only.
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Appearance")]
+        [Description("Indicates whether the control will be displayed for the current cell only.")]
+        public bool DisplayControlForCurrentCellOnly
+        {
+            get { return (_DisplayControlForCurrentCellOnly); }
+
+            set
+            {
+                if (_DisplayControlForCurrentCellOnly != value)
+                {
+                    _DisplayControlForCurrentCellOnly = value;
+                    _MaskedTextBoxAdv.Invalidate();
+                }
+            }
+        }
+
+        #endregion
+
+        #region DropDownControl
+
+        /// <summary>
+        /// Gets or sets the reference of the control that will be
+        /// displayed on popup that is shown when the drop-down button is clicked.
+        /// </summary>
+        [DefaultValue(null)]
+        [Description("Indicates reference of the control that will be displayed on popup that is shown when the drop-down button is clicked.")]
+        public Control DropDownControl
+        {
+            get { return (_MaskedTextBoxAdv.DropDownControl); }
+            set { _MaskedTextBoxAdv.DropDownControl = value; }
+        }
+
+        #endregion
+
+        #region Enabled
+
+        /// <summary>
+        /// Gets or sets whether the control can respond to user interaction
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Behavior")]
+        [Description("Indicates whether the control can respond to user interaction.")]
+        public bool Enabled
+        {
+            get { return (_MaskedTextBoxAdv.Enabled); }
+            set { _MaskedTextBoxAdv.Enabled = value; }
+        }
+
+        #endregion
+
+        #region FocusHighlightColor
+
+        /// <summary>
+        /// Gets or sets the color used as background color to highlight
+        /// the text box when it has input focus and FocusHighlight is enabled.
+        /// </summary>
+        [Browsable(true), Category("Appearance")]
+        [Description("Indicates color used as background color to highlight the text box when it has input focus and FocusHighlight is enabled.")]
+        public Color FocusHighlightColor
+        {
+            get { return (_MaskedTextBoxAdv.FocusHighlightColor); }
+            set { _MaskedTextBoxAdv.FocusHighlightColor = value; }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeFocusHighlightColor()
+        {
+            return (_MaskedTextBoxAdv.ShouldSerializeFocusHighlightColor());
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetFocusHighlightColor()
+        {
+            _MaskedTextBoxAdv.ResetFocusHighlightColor();
+        }
+
+        #endregion
+
+        #region FocusHighlightEnabled
+
+        /// <summary>
+        /// Gets or sets whether FocusHighlightColor is used as
+        /// background color to highlight the text box when it has
+        /// input focus. Default value is false.
+        /// </summary>
+        [Browsable(true), DefaultValue(false), Category("Appearance")]
+        [Description("Indicates whether FocusHighlightColor is used as background color to highlight the text box when it has input focus.")]
+        public bool FocusHighlightEnabled
+        {
+            get { return (_MaskedTextBoxAdv.FocusHighlightEnabled); }
+            set { _MaskedTextBoxAdv.FocusHighlightEnabled = value; }
+        }
+
+        #endregion
+
+        #region ForeColor
+
+        /// <summary>
+        /// Gets or sets the foreground color.
+        /// </summary>
+        [Browsable(false)]
+        public Color ForeColor
+        {
+            get { return (_MaskedTextBoxAdv.ForeColor); }
+            set { _MaskedTextBoxAdv.ForeColor = value; }
+        }
+
+        #endregion
+
+        #region HidePromptOnLeave
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the prompt characters
+        /// in the input mask are hidden when the masked text box loses focus.
+        /// </summary>
+        [Browsable(true), DefaultValue(false)]
+        [Description("Indicates whether the prompt characters in the input mask are hidden when the masked text box loses focus.")]
+        public bool HidePromptOnLeave
+        {
+            get { return (_MaskedTextBoxAdv.HidePromptOnLeave); }
+            set { _MaskedTextBoxAdv.HidePromptOnLeave = value; }
+        }
+
+        #endregion
+
+        #region ImeMode
+
+        /// <summary>
+        /// Gets or sets the Input Method Editor (IME) mode of the control.
+        /// </summary>
+        [Browsable(true), DefaultValue(ImeMode.Inherit)]
+        [Description("Indicates the Input Method Editor (IME) mode of the control.")]
+        public ImeMode ImeMode
+        {
+            get { return (_MaskedTextBoxAdv.ImeMode); }
+            set { _MaskedTextBoxAdv.ImeMode = value; }
+        }
+
+        #endregion
+
+        #region InsertKeyMode
+
+        /// <summary>
+        /// Gets or sets the text insertion mode of the masked text box control.
+        /// </summary>
+        [Browsable(true), DefaultValue(InsertKeyMode.Default)]
+        [Description("Indicates the text insertion mode of the masked text box control.")]
+        public InsertKeyMode InsertKeyMode
+        {
+            get { return (_MaskedTextBoxAdv.InsertKeyMode); }
+            set { _MaskedTextBoxAdv.InsertKeyMode = value; }
+        }
+
+        #endregion
+
+        #region Mask
+
+        /// <summary>
+        /// Gets or sets the input mask to use at run time.
+        /// </summary>
+        [Browsable(true), DefaultValue(null)]
+        [Description("Indicates the input mask to use at run time.")]
+        public string Mask
+        {
+            get { return (_MaskedTextBoxAdv.Mask); }
+            set { _MaskedTextBoxAdv.Mask = value; }
+        }
+
+        #endregion
+
+        #region PasswordChar
+
+        /// <summary>
+        /// Gets or sets the character to be displayed in substitute for user input.
+        /// </summary>
+        [Browsable(true), DefaultValue(null)]
+        [Description("Indicates the character to be displayed in substitute for user input.")]
+        public char PasswordChar
+        {
+            get { return (_MaskedTextBoxAdv.PasswordChar); }
+            set { _MaskedTextBoxAdv.PasswordChar = value; }
+        }
+
+        #endregion
+
+        #region PromptChar
+
+        /// <summary>
+        /// Gets or sets the character used to represent the absence of user input.
+        /// </summary>
+        [Browsable(true), DefaultValue('_')]
+        [Description("Indicates the character used to represent the absence of user input.")]
+        public char PromptChar
+        {
+            get { return (_MaskedTextBoxAdv.PromptChar); }
+            set { _MaskedTextBoxAdv.PromptChar = value; }
+        }
+
+        #endregion
+
+        #region RejectInputOnFirstFailure
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the parsing of
+        /// user input should stop after the first invalid character is reached.
+        /// </summary>
+        [Browsable(true), DefaultValue(false)]
+        [Description("Indicates the parsing of user input should stop after the first invalid character is reached.")]
+        public bool RejectInputOnFirstFailure
+        {
+            get { return (_MaskedTextBoxAdv.RejectInputOnFirstFailure); }
+            set { _MaskedTextBoxAdv.RejectInputOnFirstFailure = value; }
+        }
+
+        #endregion
+
+        #region ResetOnPrompt
+
+        /// <summary>
+        /// Gets or sets a value that determines how an input
+        /// character that matches the prompt character should be handled.
+        /// </summary>
+        [Browsable(true), DefaultValue(true)]
+        [Description("Indicates how an input character that matches the prompt character should be handled.")]
+        public bool ResetOnPrompt
+        {
+            get { return (_MaskedTextBoxAdv.ResetOnPrompt); }
+            set { _MaskedTextBoxAdv.ResetOnPrompt = value; }
+        }
+
+        #endregion
+
+        #region ResetOnSpace
+
+        /// <summary>
+        /// Gets or sets a value that determines how
+        /// a space input character should be handled.
+        /// </summary>
+        [Browsable(true), DefaultValue(true)]
+        [Description("Indicates how a space input character should be handled.")]
+        public bool ResetOnSpace
+        {
+            get { return (_MaskedTextBoxAdv.ResetOnSpace); }
+            set { _MaskedTextBoxAdv.ResetOnSpace = value; }
+        }
+
+        #endregion
+
+        #region RightToLeft
+
+        /// <summary>
+        /// Gets or sets a value indicating whether control's
+        /// elements are aligned to support locales using right-to-left fonts.
+        /// </summary>
+        [Browsable(true), DefaultValue(RightToLeft.Inherit)]
+        [Description("Indicates the control's elements are aligned to support locales using right-to-left fonts.")]
+        public RightToLeft RightToLeft
+        {
+            get { return (_MaskedTextBoxAdv.RightToLeft); }
+            set { _MaskedTextBoxAdv.RightToLeft = value; }
+        }
+
+        #endregion
+
+        #region SkipLiterals
+
+        /// <summary>
+        /// Gets or sets a value indicating
+        /// whether the user is allowed to reenter literal values.
+        /// </summary>
+        [Browsable(true), DefaultValue(true)]
+        [Description("Indicates the user is allowed to reenter literal values.")]
+        public bool SkipLiterals
+        {
+            get { return (_MaskedTextBoxAdv.SkipLiterals); }
+            set { _MaskedTextBoxAdv.SkipLiterals = value; }
+        }
+
+        #endregion
+
+        #region Text
+
+        /// <summary>
+        /// Gets or sets the text as it is currently displayed to the user.
+        /// </summary>
+        [Browsable(false)]
+        public string Text
+        {
+            get { return (_MaskedTextBoxAdv.Text); }
+            set { _MaskedTextBoxAdv.Text = value; }
+        }
+
+        #endregion
+
+        #region TextAlign
+
+        /// <summary>
+        /// Gets or sets how text is aligned in a masked text box control.
+        /// </summary>
+        [Browsable(true), DefaultValue(HorizontalAlignment.Left)]
+        [Description("Indicates how text is aligned in a masked text box control.")]
+        public HorizontalAlignment TextAlign
+        {
+            get { return (_MaskedTextBoxAdv.TextAlign); }
+            set { _MaskedTextBoxAdv.TextAlign = value; }
+        }
+
+        #endregion
+
+        #region TextMaskFormat
+
+        /// <summary>
+        /// Gets or sets a value that determines whether literals
+        /// and prompt characters are included in the formatted string.
+        /// </summary>
+        [Browsable(true), DefaultValue(MaskFormat.IncludeLiterals)]
+        [Description("Indicates whether literals and prompt characters are included in the formatted string.")]
+        public MaskFormat TextMaskFormat
+        {
+            get { return (_MaskedTextBoxAdv.TextMaskFormat); }
+            set { _MaskedTextBoxAdv.TextMaskFormat = value; }
+        }
+
+        #endregion
+
+        #region UseSystemPasswordChar
+
+        /// <summary>
+        /// Gets or sets a value indicating whether
+        /// the operating system-supplied password character should be used.
+        /// </summary>
+        [Browsable(true), DefaultValue(false)]
+        [Description("Indicates whether the operating system-supplied password character should be used.")]
+        public bool UseSystemPasswordChar
+        {
+            get { return (_MaskedTextBoxAdv.UseSystemPasswordChar); }
+            set { _MaskedTextBoxAdv.UseSystemPasswordChar = value; }
+        }
+
+        #endregion
+
+        #region ValidatingType
+
+        /// <summary>
+        /// Gets or sets the data type used to verify the data input by the user.
+        /// </summary>
+        [Browsable(false), DefaultValue(null)]
+        [Description("Indicates the data type used to verify the data input by the user.")]
+        public Type ValidatingType
+        {
+            get { return (_MaskedTextBoxAdv.ValidatingType); }
+            set { _MaskedTextBoxAdv.ValidatingType = value; }
+        }
+
+        #endregion
+
+        #region WatermarkBehavior
+
+        /// <summary>
+        /// Gets or sets the watermark hiding behaviour. Default value
+        /// indicates that watermark is hidden when control receives input focus.
+        /// </summary>
+        [Browsable(true), DefaultValue(eWatermarkBehavior.HideOnFocus), Category("Behavior")]
+        [Description("Indicates watermark hiding behaviour.")]
+        public eWatermarkBehavior WatermarkBehavior
+        {
+            get { return (_MaskedTextBoxAdv.WatermarkBehavior); }
+            set { _MaskedTextBoxAdv.WatermarkBehavior = value; }
+        }
+
+        #endregion
+
+        #region WatermarkColor
+
+        /// <summary>
+        /// Gets or sets the watermark text color.
+        /// </summary>
+        [Browsable(true), Category("Appearance")]
+        [Description("Indicates watermark text color.")]
+        public Color WatermarkColor
+        {
+            get { return (_MaskedTextBoxAdv.WatermarkColor); }
+            set { _MaskedTextBoxAdv.WatermarkColor = value; }
+        }
+        /// <summary>
+        /// Indicates whether property should be serialized by Windows Forms designer.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeWatermarkColor()
+        {
+            return (_MaskedTextBoxAdv.ShouldSerializeWatermarkColor());
+        }
+        /// <summary>
+        /// Resets the property to default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetWatermarkColor()
+        {
+            _MaskedTextBoxAdv.ResetWatermarkColor();
+        }
+
+        #endregion
+
+        #region WatermarkEnabled
+
+        /// <summary>
+        /// Gets or sets whether watermark text is
+        /// displayed when control is empty. Default value is true.
+        /// </summary>
+        [Browsable(true), DefaultValue(true)]
+        [Description("Indicates whether watermark text is displayed when control is empty.")]
+        public virtual bool WatermarkEnabled
+        {
+            get { return (_MaskedTextBoxAdv.WatermarkEnabled); }
+            set { _MaskedTextBoxAdv.WatermarkEnabled = value; }
+        }
+
+        #endregion
+
+        #region WatermarkFont
+
+        /// <summary>
+        /// Gets or sets the watermark font.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), DefaultValue(null)]
+        [Description("Indicates watermark font.")]
+        public Font WatermarkFont
+        {
+            get { return (_MaskedTextBoxAdv.WatermarkFont); }
+            set { _MaskedTextBoxAdv.WatermarkFont = value; }
+        }
+
+        #endregion
+
+        #region WatermarkText
+
+        /// <summary>
+        /// Gets or sets the watermark (tip) text displayed inside of
+        /// the control when Text is not set and control does not have
+        /// input focus. This property supports text-markup.
+        /// </summary>
+        [Browsable(true), DefaultValue(""), Localizable(true), Category("Appearance")]
+        [Description("Indicates watermark text displayed inside of the control when Text is not set and control does not have input focus.")]
+        [Editor("DevComponents.DotNetBar.Design.TextMarkupUIEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor))]
+        public string WatermarkText
+        {
+            get { return (_MaskedTextBoxAdv.WatermarkText); }
+            set { _MaskedTextBoxAdv.WatermarkText = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Event processing
+
+        #region DoButtonClearClick
+
+        /// <summary>
+        /// DoButtonClearClick
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        internal void DoButtonClearClick(object sender, CancelEventArgs e)
+        {
+            if (ButtonClearClick != null)
+                ButtonClearClick(this, e);
+        }
+
+        #endregion
+
+        #region DoButtonCustomClick
+
+        /// <summary>
+        /// DoButtonCustomClick
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        internal void DoButtonCustomClick(object sender, EventArgs e)
+        {
+            if (ButtonCustomClick != null)
+                ButtonCustomClick(this, e);
+        }
+
+        #endregion
+
+        #region DoButtonCustom2Click
+
+        /// <summary>
+        /// DoButtonCustom2Click
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        internal void DoButtonCustom2Click(object sender, EventArgs e)
+        {
+            if (ButtonCustom2Click != null)
+                ButtonCustom2Click(this, e);
+        }
+
+        #endregion
+
+        #region DoButtonDropDownClick
+
+        /// <summary>
+        /// DoButtonDropDownClick
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        internal void DoButtonDropDownClick(object sender, CancelEventArgs e)
+        {
+            if (ButtonDropDownClick != null)
+                ButtonDropDownClick(this, e);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetCellBitmap
+
+        /// <summary>
+        /// Gets the cell paint bitmap
+        /// </summary>
+        /// <param name="cellBounds"></param>
+        /// <returns></returns>
+        internal Bitmap GetCellBitmap(Rectangle cellBounds)
+        {
+            if (_CellBitmap == null ||
+                (_CellBitmap.Width != cellBounds.Width || _CellBitmap.Height < cellBounds.Height))
+            {
+                if (_CellBitmap != null)
+                    _CellBitmap.Dispose();
+
+                _CellBitmap = new Bitmap(cellBounds.Width, cellBounds.Height);
+            }
+
+            return (_CellBitmap);
+        }
+
+        #endregion
+
+        #region OnBeforeCellPaint
+
+        /// <summary>
+        /// Invokes BeforeCellPaint user events
+        /// </summary>
+        /// <param name="rowIndex">Row index</param>
+        /// <param name="columnIndex">Column index</param>
+        internal void OnBeforeCellPaint(int rowIndex, int columnIndex)
+        {
+            if (BeforeCellPaint != null)
+                BeforeCellPaint(this, new BeforeCellPaintEventArgs(rowIndex, columnIndex));
+        }
+
+        #endregion
+
+        #region ICloneable members
+
+        /// <summary>
+        /// Clones the ButtonX Column
+        /// </summary>
+        /// <returns></returns>
+        public override object Clone()
+        {
+            DataGridViewMaskedTextBoxAdvColumn dc = base.Clone() as DataGridViewMaskedTextBoxAdvColumn;
+
+            if (dc != null)
+            {
+                dc.AllowPromptAsInput = AllowPromptAsInput;
+                dc.AsciiOnly = AsciiOnly;
+                dc.BeepOnError = BeepOnError;
+                dc.Culture = Culture;
+                dc.CutCopyMaskFormat = CutCopyMaskFormat;
+                dc.DropDownControl = DropDownControl;
+                dc.Enabled = Enabled;
+                dc.FocusHighlightColor = FocusHighlightColor;
+                dc.FocusHighlightEnabled = FocusHighlightEnabled;
+                dc.HidePromptOnLeave = HidePromptOnLeave;
+                dc.ImeMode = ImeMode;
+                dc.InsertKeyMode = InsertKeyMode;
+                dc.Mask = Mask;
+                dc.PasswordChar = PasswordChar;
+                dc.PromptChar = PromptChar;
+                dc.RejectInputOnFirstFailure = RejectInputOnFirstFailure;
+                dc.ResetOnPrompt = ResetOnPrompt;
+                dc.ResetOnSpace = ResetOnSpace;
+                dc.RightToLeft = RightToLeft;
+                dc.SkipLiterals = SkipLiterals;
+                dc.TextAlign = TextAlign;
+                dc.TextMaskFormat = TextMaskFormat;
+                dc.UseSystemPasswordChar = UseSystemPasswordChar;
+                dc.ValidatingType = ValidatingType;
+                dc.WatermarkBehavior = WatermarkBehavior;
+                dc.WatermarkColor = WatermarkColor;
+                dc.WatermarkEnabled = WatermarkEnabled;
+                dc.WatermarkFont = WatermarkFont;
+                dc.WatermarkText = WatermarkText;
+
+                dc.DisplayControlForCurrentCellOnly = DisplayControlForCurrentCellOnly;
+
+                dc.BackgroundStyle.ApplyStyle(MaskedTextBoxAdv.BackgroundStyle);
+                dc.BackgroundStyle.Class = MaskedTextBoxAdv.BackgroundStyle.Class;
+
+                MaskedTextBoxAdv.ButtonClear.CopyToItem(dc.MaskedTextBoxAdv.ButtonClear);
+                MaskedTextBoxAdv.ButtonDropDown.CopyToItem(dc.MaskedTextBoxAdv.ButtonDropDown);
+                MaskedTextBoxAdv.ButtonCustom.CopyToItem(dc.MaskedTextBoxAdv.ButtonCustom);
+                MaskedTextBoxAdv.ButtonCustom2.CopyToItem(dc.MaskedTextBoxAdv.ButtonCustom2);
+            }
+
+            return (dc);
+        }
+
+        #endregion
+
+        #region Dispose
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        /// <param name="disposing"></param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing == true)
+                _MaskedTextBoxAdv.Dispose();
+
+            if (_CellBitmap != null)
+            {
+                _CellBitmap.Dispose();
+                _CellBitmap = null;
+            }
+
+            base.Dispose(disposing);
+        }
+
+        #endregion
+
+        #region IDataGridViewColumn Members
+
+        /// <summary>
+        /// Gets the Cell paint setting for the control
+        /// </summary>
+        [Browsable(false)]
+        public bool OwnerPaintCell
+        {
+            get { return (true); }
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewMaskedTextBoxAdv/DataGridViewMaskedTextBoxAdvEditingControl.cs b/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewMaskedTextBoxAdv/DataGridViewMaskedTextBoxAdvEditingControl.cs
new file mode 100644
index 00000000..74df2d7f
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewMaskedTextBoxAdv/DataGridViewMaskedTextBoxAdvEditingControl.cs	
@@ -0,0 +1,185 @@
+using System;
+using System.ComponentModel;
+using System.Runtime.InteropServices;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    [ToolboxItem(false), ComVisible(false)]
+    public class DataGridViewMaskedTextBoxAdvEditingControl : MaskedTextBoxAdv, IDataGridViewEditingControl
+    {
+        #region Private variables
+
+        private DataGridView _DataGridView;
+
+        private int _RowIndex;
+        private bool _ValueChanged;
+
+        #endregion
+
+        #region OnTextChanged
+
+        /// <summary>
+        /// Handles OnTextChanged events
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnTextChanged(EventArgs e)
+        {
+            _ValueChanged = true;
+
+            _DataGridView.NotifyCurrentCellDirty(true);
+
+            base.OnTextChanged(e);
+        }
+
+        #endregion
+
+        #region IDataGridViewEditingControl Members
+
+        #region Public properties
+
+        #region EditingControlDataGridView
+
+        /// <summary>
+        /// Gets or sets the DataGridView
+        /// </summary>
+        public DataGridView EditingControlDataGridView
+        {
+            get { return (_DataGridView); }
+            set { _DataGridView = value; }
+        }
+
+        #endregion
+
+        #region EditingControlFormattedValue
+
+        /// <summary>
+        /// Gets or sets the Control Formatted Value
+        /// </summary>
+        public object EditingControlFormattedValue
+        {
+            get { return (Text); }
+            set { Text = (string) value; }
+        }
+
+        #endregion
+
+        #region EditingControlRowIndex
+
+        /// <summary>
+        /// Gets or sets the Control RoeIndex
+        /// </summary>
+        public int EditingControlRowIndex
+        {
+            get { return (_RowIndex); }
+            set { _RowIndex = value; }
+        }
+
+        #endregion
+
+        #region EditingControlValueChanged
+
+        /// <summary>
+        /// Gets or sets the Control ValueChanged state
+        /// </summary>
+        public bool EditingControlValueChanged
+        {
+            get { return (_ValueChanged); }
+            set { _ValueChanged = value; }
+        }
+
+        #endregion
+
+        #region EditingPanelCursor
+
+        /// <summary>
+        /// Gets the Panel Cursor
+        /// </summary>
+        public Cursor EditingPanelCursor
+        {
+            get { return (base.Cursor); }
+        }
+
+        #endregion
+
+        #region RepositionEditingControlOnValueChange
+
+        /// <summary>
+        /// Gets whether to RepositionEditingControlOnValueChange
+        /// </summary>
+        public bool RepositionEditingControlOnValueChange
+        {
+            get { return (false); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ApplyCellStyleToEditingControl
+
+        /// <summary>
+        /// ApplyCellStyleToEditingControl
+        /// </summary>
+        /// <param name="dataGridViewCellStyle"></param>
+        public void ApplyCellStyleToEditingControl(DataGridViewCellStyle dataGridViewCellStyle)
+        {
+            Font = dataGridViewCellStyle.Font;
+
+            ForeColor = dataGridViewCellStyle.ForeColor;
+            BackColor = dataGridViewCellStyle.BackColor;
+        }
+
+        #endregion
+
+        #region GetEditingControlFormattedValue
+
+        /// <summary>
+        /// Gets EditingControlFormattedValue
+        /// </summary>
+        /// <param name="context"></param>
+        /// <returns></returns>
+        public object GetEditingControlFormattedValue(DataGridViewDataErrorContexts context)
+        {
+            return (EditingControlFormattedValue);
+        }
+
+        #endregion
+
+        #region EditingControlWantsInputKey
+
+        /// <summary>
+        /// Gets whether the given key wants to be processed
+        /// by the Control
+        /// </summary>
+        /// <param name="keyData"></param>
+        /// <param name="dataGridViewWantsInputKey"></param>
+        /// <returns></returns>
+        public bool EditingControlWantsInputKey(Keys keyData, bool dataGridViewWantsInputKey)
+        {
+            if ((keyData & Keys.Right) == Keys.Right)
+                return (true);
+
+            if ((keyData & Keys.Left) == Keys.Left)
+                return (true);
+
+            return (dataGridViewWantsInputKey == false);
+        }
+
+        #endregion
+
+        #region PrepareEditingControlForEdit
+
+        /// <summary>
+        /// PrepareEditingControlForEdit
+        /// </summary>
+        /// <param name="selectAll"></param>
+        public void PrepareEditingControlForEdit(bool selectAll)
+        {
+        }
+
+        #endregion
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewProgressBarX/DataGridViewProgressBarXCell.cs b/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewProgressBarX/DataGridViewProgressBarXCell.cs
new file mode 100644
index 00000000..84f3adae
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewProgressBarX/DataGridViewProgressBarXCell.cs	
@@ -0,0 +1,402 @@
+using System;
+using System.Drawing;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    public class DataGridViewProgressBarXCell : DataGridViewButtonCell
+    {
+        #region Public properties
+
+        #region EditType
+
+        /// <summary>
+        /// Gets the Type of the editing control associated with the cell
+        /// </summary>
+        public override Type EditType
+        {
+            get { return (null); }
+        }
+
+        #endregion
+
+        #region FormattedValueType
+
+        /// <summary>
+        /// FormattedValueType
+        /// </summary>
+        public override Type FormattedValueType
+        {
+            get { return (typeof(string)); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Paint
+
+        #region Paint
+
+        /// <summary>
+        /// Cell painting
+        /// </summary>
+        /// <param name="graphics"></param>
+        /// <param name="clipBounds"></param>
+        /// <param name="cellBounds"></param>
+        /// <param name="rowIndex"></param>
+        /// <param name="elementState"></param>
+        /// <param name="value"></param>
+        /// <param name="formattedValue"></param>
+        /// <param name="errorText"></param>
+        /// <param name="cellStyle"></param>
+        /// <param name="advancedBorderStyle"></param>
+        /// <param name="paintParts"></param>
+        protected override void Paint(Graphics graphics,
+            Rectangle clipBounds, Rectangle cellBounds, int rowIndex, DataGridViewElementStates elementState,
+            object value, object formattedValue, string errorText, DataGridViewCellStyle cellStyle,
+            DataGridViewAdvancedBorderStyle advancedBorderStyle, DataGridViewPaintParts paintParts)
+        {
+            if (DataGridView != null)
+            {
+                // First paint the borders of the cell
+
+                if (PartsSet(paintParts, DataGridViewPaintParts.Border))
+                    PaintBorder(graphics, clipBounds, cellBounds, cellStyle, advancedBorderStyle);
+
+                // Now paint the background and content
+
+                if (PartsSet(paintParts, DataGridViewPaintParts.Background))
+                {
+                    Rectangle rBk = GetBackBounds(cellBounds, advancedBorderStyle);
+
+                    if (rBk.Height > 0 && rBk.Width > 0)
+                    {
+                        DataGridViewProgressBarXColumn oc = (DataGridViewProgressBarXColumn)OwningColumn;
+                        Bitmap bm = oc.GetCellBitmap(cellBounds);
+
+                        if (bm != null)
+                        {
+                            using (Graphics g = Graphics.FromImage(bm))
+                            {
+                                PaintButtonBackground(g, cellStyle, rBk);
+                                PaintButtonContent(cellBounds, rowIndex, formattedValue, cellStyle, paintParts, bm);
+
+                                graphics.DrawImageUnscaledAndClipped(bm, rBk);
+                            }
+
+                            if ((DataGridView.ShowCellErrors == true) &&
+                                (paintParts & DataGridViewPaintParts.ErrorIcon) == DataGridViewPaintParts.ErrorIcon)
+                            {
+                                base.PaintErrorIcon(graphics, clipBounds, cellBounds, errorText);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region PaintButtonBackground
+
+        /// <summary>
+        /// Paints the Button background
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="cellStyle"></param>
+        /// <param name="rBack"></param>
+        private void PaintButtonBackground(Graphics g,
+            DataGridViewCellStyle cellStyle, Rectangle rBack)
+        {
+            Rectangle r = rBack;
+            r.Location = new Point(0, 0);
+
+            DataGridViewX dx = DataGridView as DataGridViewX;
+
+            if (dx != null && dx.Enabled == true && Selected == true &&
+                dx.PaintEnhancedSelection == true)
+            {
+                Office2007ButtonItemPainter.PaintBackground(g, dx.ButtonStateColorTable,
+                    r, RoundRectangleShapeDescriptor.RectangleShape, false,
+                    false);
+            }
+            else
+            {
+                Color color = (Selected == true)
+                    ? cellStyle.SelectionBackColor : cellStyle.BackColor;
+
+                using (Brush br = new SolidBrush(color))
+                    g.FillRectangle(br, r);
+            }
+        }
+
+        #endregion
+
+        #region PaintButtonContent
+
+        /// <summary>
+        /// Paints the button background and content
+        /// </summary>
+        /// <param name="cellBounds"></param>
+        /// <param name="rowIndex"></param>
+        /// <param name="value"></param>
+        /// <param name="cellStyle"></param>
+        /// <param name="paintParts"></param>
+        /// <param name="bm"></param>
+        private void PaintButtonContent(Rectangle cellBounds, int rowIndex, object value, 
+            DataGridViewCellStyle cellStyle, DataGridViewPaintParts paintParts, Bitmap bm)
+        {
+            DataGridViewProgressBarXColumn oc = (DataGridViewProgressBarXColumn)OwningColumn;
+            ProgressBarX bx = oc.ProgressBarX;
+
+            Rectangle rBt = GetContentBounds(cellBounds, true);
+
+            if (rBt.Width > 0 && rBt.Height > 0)
+            {
+                string s = oc.Text;
+
+                oc.InCallBack = true;
+
+                try
+                {
+                    bx.Font = cellStyle.Font;
+                    bx.ForeColor = cellStyle.ForeColor;
+                    bx.BackColor = cellStyle.BackColor;
+
+                    bx.Value = GetValue(value, bx.Minimum);
+
+                    if (rowIndex < DataGridView.RowCount)
+                    {
+                        bx.Text = s;
+
+                        if (PartsSet(paintParts, DataGridViewPaintParts.ContentForeground))
+                            oc.OnBeforeCellPaint(rowIndex, ColumnIndex);
+                    }
+                    else
+                    {
+                        bx.Text = "";
+                    }
+
+                    bx.Bounds = rBt;
+                    bx.RecalcLayout();
+                    bx.DrawToBitmap(bm, rBt);
+                }
+                finally
+                {
+                    oc.InCallBack = false;
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Mouse processing
+
+        #region OnMouseEnter
+
+        /// <summary>
+        /// OnMouseEnter
+        /// </summary>
+        /// <param name="rowIndex"></param>
+        protected override void OnMouseEnter(int rowIndex)
+        {
+            base.OnMouseEnter(rowIndex);
+
+            DataGridViewProgressBarXColumn oc = (DataGridViewProgressBarXColumn) OwningColumn;
+            ProgressBarX bx = oc.ProgressBarX;
+
+            bx.ProgressBarItem.InternalMouseEnter();
+        }
+
+        #endregion
+
+        #region OnMouseLeave
+
+        /// <summary>
+        /// Processes MouseLeave events
+        /// </summary>
+        /// <param name="rowIndex"></param>
+        protected override void OnMouseLeave(int rowIndex)
+        {
+            base.OnMouseLeave(rowIndex);
+
+            DataGridViewProgressBarXColumn oc = (DataGridViewProgressBarXColumn)OwningColumn;
+            ProgressBarX bx = oc.ProgressBarX;
+
+            bx.ProgressBarItem.InternalMouseLeave();
+        }
+
+        #endregion
+
+        #region OnMouseMove
+
+        /// <summary>
+        /// Processes MouseMove events
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnMouseMove(DataGridViewCellMouseEventArgs e)
+        {
+            base.OnMouseMove(e);
+
+            DataGridViewProgressBarXColumn oc = (DataGridViewProgressBarXColumn)OwningColumn;
+            ProgressBarX bx = oc.ProgressBarX;
+
+            bx.ProgressBarItem.InternalMouseMove(
+                new MouseEventArgs(e.Button, e.Clicks, e.X, e.Y, e.Delta));
+        }
+
+        #endregion
+
+        #region OnMouseDown
+
+        /// <summary>
+        /// Processes MouseDown events
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnMouseDown(DataGridViewCellMouseEventArgs e)
+        {
+            base.OnMouseDown(e);
+
+            DataGridViewProgressBarXColumn oc = (DataGridViewProgressBarXColumn)OwningColumn;
+            ProgressBarX bx = oc.ProgressBarX;
+
+            Rectangle cellBounds = DataGridView.GetCellDisplayRectangle(e.ColumnIndex, e.RowIndex, false);
+            Rectangle rBt = GetContentBounds(cellBounds, false);
+
+            Point pt = e.Location;
+            pt.Offset(rBt.Location);
+
+            if (rBt.Contains(pt) == true)
+            {
+                bx.Bounds = rBt;
+
+                bx.ProgressBarItem.InternalMouseDown(
+                    new MouseEventArgs(e.Button, e.Clicks, e.X, e.Y, e.Delta));
+
+                DataGridView.Invalidate(rBt);
+            }
+        }
+
+        #endregion
+
+        #region OnMouseUp
+
+        /// <summary>
+        /// Processes MouseUp events
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnMouseUp(DataGridViewCellMouseEventArgs e)
+        {
+            base.OnMouseUp(e);
+
+            DataGridViewProgressBarXColumn oc = (DataGridViewProgressBarXColumn)OwningColumn;
+            ProgressBarX bx = oc.ProgressBarX;
+
+            Rectangle cellBounds = DataGridView.GetCellDisplayRectangle(e.ColumnIndex, e.RowIndex, false);
+            Rectangle rBt = GetContentBounds(cellBounds, false);
+
+            bx.Bounds = rBt;
+
+            bx.ProgressBarItem.InternalMouseUp(
+                new MouseEventArgs(e.Button, e.Clicks, e.X, e.Y, e.Delta));
+
+            DataGridView.Invalidate(rBt);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region PartsSet
+
+        /// <summary>
+        /// Determines if the given part is set
+        /// </summary>
+        /// <param name="paintParts"></param>
+        /// <param name="parts"></param>
+        /// <returns></returns>
+        private bool PartsSet(DataGridViewPaintParts paintParts, DataGridViewPaintParts parts)
+        {
+            return ((paintParts & parts) == parts);
+        }
+
+        #endregion
+
+        #region GetBackBounds
+
+        /// <summary>
+        /// Gets the background bounds for the given cell
+        /// </summary>
+        /// <param name="cellBounds"></param>
+        /// <param name="advancedBorderStyle"></param>
+        /// <returns></returns>
+        private Rectangle GetBackBounds(
+            Rectangle cellBounds, DataGridViewAdvancedBorderStyle advancedBorderStyle)
+        {
+            DataGridViewProgressBarXColumn oc = (DataGridViewProgressBarXColumn)OwningColumn;
+
+            Rectangle r = BorderWidths(advancedBorderStyle);
+
+            cellBounds.Offset(r.X, r.Y);
+            cellBounds.Width -= r.Right;
+            cellBounds.Height -= r.Bottom;
+
+            if (Selected == true)
+                cellBounds.Width += oc.DividerWidth;
+
+            return (cellBounds);
+        }
+
+        #endregion
+
+        #region GetContentBounds
+
+        /// <summary>
+        /// Gets the content bounds for the given cell
+        /// </summary>
+        /// <param name="cellBounds"></param>
+        /// <param name="localize"></param>
+        /// <returns></returns>
+        private Rectangle GetContentBounds(Rectangle cellBounds, bool localize)
+        {
+            DataGridViewProgressBarXColumn oc = (DataGridViewProgressBarXColumn)OwningColumn;
+
+            cellBounds.Width -= (oc.DividerWidth + 3);
+            cellBounds.Height -= 3;
+
+            if (localize == true)
+                cellBounds.Location = new Point(0, 0);
+
+            cellBounds.X++;
+            cellBounds.Y++;
+
+            return (cellBounds);
+        }
+
+        #endregion
+
+        #region GetValue
+
+        /// <summary>
+        /// GetValue
+        /// </summary>
+        /// <param name="value"></param>
+        /// <param name="minimum"></param>
+        /// <returns></returns>
+        private int GetValue(object value, int minimum)
+        {
+            if (value == Convert.DBNull ||
+                (value is string && String.IsNullOrEmpty((string) value) == true))
+            {
+                return (minimum);
+            }
+
+            return (Convert.ToInt32(value));
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewProgressBarX/DataGridViewProgressBarXColumn.cs b/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewProgressBarX/DataGridViewProgressBarXColumn.cs
new file mode 100644
index 00000000..67997259
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewProgressBarX/DataGridViewProgressBarXColumn.cs	
@@ -0,0 +1,433 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Runtime.InteropServices;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    [ToolboxBitmap(typeof(DataGridViewButtonXColumn), "Controls.ProgressBarX.ico"), ToolboxItem(false), ComVisible(false)]
+    public class DataGridViewProgressBarXColumn : DataGridViewButtonColumn, IDataGridViewColumn
+    {
+        #region Events
+
+        [Description("Occurs right before a ProgressBarX Cell is painted.")]
+        public event EventHandler<BeforeCellPaintEventArgs> BeforeCellPaint;
+
+        [Description("Occurs when a ProgressBarX Cell is Clicked.")]
+        public event EventHandler<EventArgs> Click;
+
+        #endregion
+
+        #region Private variables
+
+        private ProgressBarX _ProgressBarX;
+        private Bitmap _CellBitmap;
+
+        private bool _InCellCallBack;
+
+        #endregion
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        public DataGridViewProgressBarXColumn()
+        {
+            CellTemplate = new DataGridViewProgressBarXCell();
+
+            _ProgressBarX = new ProgressBarX();
+            _ProgressBarX.Visible = false;
+
+            HookEvents(true);
+        }
+
+        #region Hidden properties
+
+        /// <summary>
+        /// Button FlatStyle
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public new FlatStyle FlatStyle
+        {
+            get { return base.FlatStyle; }
+            set { base.FlatStyle = value; }
+        }
+
+        /// <summary>
+        /// Button UseColumnTextForButtonValue
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public new bool UseColumnTextForButtonValue
+        {
+            get { return base.UseColumnTextForButtonValue; }
+            set { base.UseColumnTextForButtonValue = value; }
+        }
+
+        #endregion
+
+        #region Internal properties
+
+        #region InCallBack
+
+        /// <summary>
+        /// InCallBack
+        /// </summary>
+        internal bool InCallBack
+        {
+            get { return (_InCellCallBack); }
+            set { _InCellCallBack = value; }
+        }
+
+        #endregion
+
+        #region ProgressBarX
+
+        /// <summary>
+        /// Gets the Control ProgressBarX
+        /// </summary>
+        internal ProgressBarX ProgressBarX
+        {
+            get { return (_ProgressBarX); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Public properties
+
+        #region ChunkColor
+
+        /// <summary>
+        /// Gets or sets the color of the progress chunk.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Category("Appearance")]
+        [Description("Gets or sets the color of the progress chunk.")]
+        public Color ChunkColor
+        {
+            get { return (_ProgressBarX.ChunkColor); }
+            set { _ProgressBarX.ChunkColor = value; }
+        }
+
+        /// <summary>
+        /// Gets whether ChunkColor property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeChunkColor()
+        {
+            return (_ProgressBarX.ChunkColor.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets the ChunkColor property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetChunkColor()
+        {
+            _ProgressBarX.ChunkColor = Color.Empty;
+        }
+
+        #endregion
+
+        #region ChunkColor2
+
+        /// <summary>
+        /// Gets or sets the target gradient color of the progress chunk.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Category("Appearance")]
+        [Description("Gets or sets the target gradient color of the progress chunk.")]
+        public Color ChunkColor2
+        {
+            get { return (_ProgressBarX.ChunkColor2); }
+            set { _ProgressBarX.ChunkColor2 = value; }
+        }
+
+        /// <summary>
+        /// Gets whether ChunkColor property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeChunkColor2()
+        {
+            return (_ProgressBarX.ChunkColor2.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets the ChunkColor property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetChunkColor2()
+        {
+            _ProgressBarX.ChunkColor2 = Color.Empty;
+        }
+
+        #endregion
+
+        #region ChunkGradientAngle
+
+        /// <summary>
+        /// Gets or sets the gradient angle of the progress chunk.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), DefaultValue(0), Category("Appearance")]
+        [Description("Gets or sets the gradient angle of the progress chunk.")]
+        public int ChunkGradientAngle
+        {
+            get { return (_ProgressBarX.ChunkGradientAngle); }
+            set { _ProgressBarX.ChunkGradientAngle = value; }
+        }
+
+        #endregion
+
+        #region ColorTable
+
+        /// <summary>
+        /// Gets or sets the predefined color state table for progress bar. Color
+        /// specified applies to items with Office 2007 style only. It does not have
+        /// any effect on other styles. You can use ColorTable to indicate the state
+        /// of the operation that Progress Bar is tracking. Default value is eProgressBarItemColor.Normal.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(false), DefaultValue(eProgressBarItemColor.Normal), Category("Appearance")]
+        [Description("Indicates predefined color of item when Office 2007 style is used.")]
+        public eProgressBarItemColor ColorTable
+        {
+            get { return (_ProgressBarX.ColorTable); }
+            set { _ProgressBarX.ColorTable = value; }
+        }
+
+        #endregion
+
+        #region Maximum
+
+        /// <summary>
+        /// Gets or sets the maximum value of the range of the control.
+        /// </summary>
+        [Browsable(true), Category("Behavior"), DefaultValue(100)]
+        [Description("Indicates the maximum value of the range of the control.")]
+        public int Maximum
+        {
+            get { return (_ProgressBarX.Maximum); }
+            set { _ProgressBarX.Maximum = value; }
+        }
+
+        #endregion
+
+        #region Minimum
+
+        /// <summary>
+        /// Gets or sets the minimum value of the range of the control.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Category("Behavior"), DefaultValue(0)]
+        [Description("Indicates the minimum value of the range of the control.")]
+        public int Minimum
+        {
+            get { return (_ProgressBarX.Minimum); }
+            set { _ProgressBarX.Minimum = value; }
+        }
+
+        #endregion
+
+        #region Style
+
+        /// <summary>
+        /// Gets/Sets the visual style for the control.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), DefaultValue(eDotNetBarStyle.Office2007)]
+        [Description("Specifies the visual style of the control.")]
+        public virtual eDotNetBarStyle Style
+        {
+            get { return (_ProgressBarX.Style); }
+            set { _ProgressBarX.Style = value; }
+        }
+
+        #endregion
+
+        #region Text
+
+        /// <summary>
+        /// Gets or sets the default Text to display on the Progress Bar
+        /// </summary>
+        [Browsable(true), Category("Appearance"), DefaultValue("")]
+        [Description("Indicates the default Text to display on the Progress Bar.")]
+        public new string Text
+        {
+            get
+            {
+                return (_InCellCallBack == true ?
+                    _ProgressBarX.Text : base.Text);
+            }
+
+            set
+            {
+                if (_InCellCallBack == true)
+                    _ProgressBarX.Text = value;
+                else
+                    base.Text = value;
+            }
+        }
+
+        #endregion
+
+        #region TextVisible
+
+        /// <summary>
+        /// Gets or sets whether the text inside the progress bar is displayed.
+        /// </summary>
+        [Browsable(true), Category("Behavior"), DefaultValue(false)]
+        [Description("Gets or sets whether the text inside the progress bar is displayed.")]
+        public bool TextVisible
+        {
+            get { return (_ProgressBarX.TextVisible); }
+            set { _ProgressBarX.TextVisible = value; }
+        }
+
+        #endregion
+
+        #region Value
+
+        /// <summary>
+        /// Gets or sets the current position of the progress bar.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Category("Behavior"), DefaultValue(0)]
+        [Description("Indicates the current position of the progress bar.")]
+        public int Value
+        {
+            get { return (_ProgressBarX.Value); }
+            set { _ProgressBarX.Value = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region HookEvents
+
+        /// <summary>
+        /// Hooks or unhooks our system events
+        /// </summary>
+        /// <param name="hook"></param>
+        private void HookEvents(bool hook)
+        {
+            if (hook == true)
+            {
+                _ProgressBarX.ProgressBarItem.Click += ProgressBarItem_Click;
+            }
+            else
+            {
+                _ProgressBarX.ProgressBarItem.Click -= ProgressBarItem_Click;
+            }
+        }
+
+        #endregion
+
+        #region Event processing
+
+        #region ProgressBarItem_Click
+
+        /// <summary>
+        /// ProgressBarItem_Click
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void ProgressBarItem_Click(object sender, EventArgs e)
+        {
+            if (Click != null)
+                Click(sender, e);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetCellBitmap
+
+        /// <summary>
+        /// Gets the cell paint bitmap
+        /// </summary>
+        /// <param name="cellBounds"></param>
+        /// <returns></returns>
+        internal Bitmap GetCellBitmap(Rectangle cellBounds)
+        {
+            if (_CellBitmap == null ||
+                (_CellBitmap.Width != cellBounds.Width || _CellBitmap.Height < cellBounds.Height))
+            {
+                if (_CellBitmap != null)
+                    _CellBitmap.Dispose();
+
+                _CellBitmap = new Bitmap(cellBounds.Width, cellBounds.Height);
+            }
+
+            return (_CellBitmap);
+        }
+
+        #endregion
+
+        #region OnBeforeCellPaint
+
+        /// <summary>
+        /// Invokes BeforeCellPaint user events
+        /// </summary>
+        /// <param name="rowIndex">Row index</param>
+        /// <param name="columnIndex">Column index</param>
+        internal void OnBeforeCellPaint(int rowIndex, int columnIndex)
+        {
+            if (BeforeCellPaint != null)
+                BeforeCellPaint(this, new BeforeCellPaintEventArgs(rowIndex, columnIndex));
+        }
+
+        #endregion
+
+        #region ICloneable members
+
+        /// <summary>
+        /// Clones the ButtonX Column
+        /// </summary>
+        /// <returns></returns>
+        public override object Clone()
+        {
+            DataGridViewProgressBarXColumn bc = base.Clone() as DataGridViewProgressBarXColumn;
+
+            if (bc != null)
+                _ProgressBarX.ProgressBarItem.InternalCopyToItem(bc.ProgressBarX.ProgressBarItem);
+
+            return (bc);
+        }
+
+        #endregion
+
+        #region IDataGridViewColumn Members
+
+        /// <summary>
+        /// Gets the Cell paint setting for the ButtonX control
+        /// </summary>
+        [Browsable(false)]
+        public bool OwnerPaintCell
+        {
+            get { return (true); }
+        }
+
+        #endregion
+
+        #region Dispose
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        /// <param name="disposing"></param>
+        protected override void Dispose(bool disposing)
+        {
+            HookEvents(false);
+
+            if (disposing == true)
+                _ProgressBarX.Dispose();
+
+            if (_CellBitmap != null)
+            {
+                _CellBitmap.Dispose();
+                _CellBitmap = null;
+            }
+
+            base.Dispose(disposing);
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewSlider/DataGridViewSliderCell.cs b/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewSlider/DataGridViewSliderCell.cs
new file mode 100644
index 00000000..8f352326
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewSlider/DataGridViewSliderCell.cs	
@@ -0,0 +1,604 @@
+using System;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    public class DataGridViewSliderCell : DataGridViewTextBoxCell
+    {
+        #region Private variables
+
+        private DataGridViewCellStyle _CellStyle;
+
+        #endregion
+
+        #region Public properties
+
+        #region EditType
+
+        /// <summary>
+        /// Gets the Type of the editing control associated with the cell
+        /// </summary>
+        public override Type EditType
+        {
+            get { return (null); }
+        }
+
+        #endregion
+
+        #region ValueType
+
+        /// <summary>
+        /// Gets the type of the underlying data
+        /// (i.e., the type of the cell's Value property)
+        /// </summary>
+        public override Type ValueType
+        {
+            get { return (base.ValueType ?? typeof(Int32)); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetAdjustedEditingControlBounds
+
+        /// <summary>
+        /// GetAdjustedEditingControlBounds
+        /// </summary>
+        /// <param name="editingControlBounds"></param>
+        /// <param name="cellStyle"></param>
+        /// <returns></returns>
+        private Rectangle GetAdjustedEditingControlBounds(
+            Rectangle editingControlBounds, DataGridViewCellStyle cellStyle)
+        {
+            // Add a 1 pixel padding around the editing control
+
+            editingControlBounds.X += 1;
+            editingControlBounds.Y += 1;
+            editingControlBounds.Width = Math.Max(0, editingControlBounds.Width - 2);
+            editingControlBounds.Height = Math.Max(0, editingControlBounds.Height - 2);
+
+            // Adjust the vertical location of the editing control
+
+            Rectangle r = GetContentBounds(editingControlBounds);
+
+            if (r.Height < editingControlBounds.Height)
+            {
+                switch (cellStyle.Alignment)
+                {
+                    case DataGridViewContentAlignment.MiddleLeft:
+                    case DataGridViewContentAlignment.MiddleCenter:
+                    case DataGridViewContentAlignment.MiddleRight:
+                        editingControlBounds.Y += (editingControlBounds.Height - r.Height) / 2;
+                        break;
+
+                    case DataGridViewContentAlignment.BottomLeft:
+                    case DataGridViewContentAlignment.BottomCenter:
+                    case DataGridViewContentAlignment.BottomRight:
+                        editingControlBounds.Y += (editingControlBounds.Height - r.Height);
+                        break;
+                }
+            }
+
+            editingControlBounds.Width = Math.Max(1, editingControlBounds.Width);
+            editingControlBounds.Height = Math.Max(1, r.Height);
+
+            return (editingControlBounds);
+        }
+
+        #endregion
+
+        #region GetPreferredSize
+
+        #region GetPreferredSize
+
+        /// <summary>
+        /// GetPreferredSize
+        /// </summary>
+        /// <param name="graphics"></param>
+        /// <param name="cellStyle"></param>
+        /// <param name="rowIndex"></param>
+        /// <param name="constraintSize"></param>
+        /// <returns></returns>
+        protected override Size GetPreferredSize(Graphics graphics,
+               DataGridViewCellStyle cellStyle, int rowIndex, Size constraintSize)
+        {
+            Size preferredSize = new Size(-1, -1);
+
+            if (DataGridView != null)
+            {
+                DataGridViewSliderColumn oc = OwningColumn as DataGridViewSliderColumn;
+
+                if (oc != null)
+                {
+                    Slider sc = oc.Slider;
+
+                    preferredSize.Height = sc.Height;
+
+                    if (constraintSize.Width == 0)
+                    {
+                        preferredSize.Width += 80;
+
+                        if (sc.LabelVisible == true)
+                            preferredSize.Width += sc.LabelWidth;
+                    }
+                }
+            }
+
+            return (preferredSize);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Paint
+
+        #region Paint
+
+        /// <summary>
+        /// Cell painting
+        /// </summary>
+        /// <param name="graphics"></param>
+        /// <param name="clipBounds"></param>
+        /// <param name="cellBounds"></param>
+        /// <param name="rowIndex"></param>
+        /// <param name="elementState"></param>
+        /// <param name="value"></param>
+        /// <param name="formattedValue"></param>
+        /// <param name="errorText"></param>
+        /// <param name="cellStyle"></param>
+        /// <param name="advancedBorderStyle"></param>
+        /// <param name="paintParts"></param>
+        protected override void Paint(Graphics graphics,
+            Rectangle clipBounds, Rectangle cellBounds, int rowIndex, DataGridViewElementStates elementState,
+            object value, object formattedValue, string errorText, DataGridViewCellStyle cellStyle,
+            DataGridViewAdvancedBorderStyle advancedBorderStyle, DataGridViewPaintParts paintParts)
+        {
+            if (DataGridView != null)
+            {
+                // First paint the borders of the cell
+
+                if (PartsSet(paintParts, DataGridViewPaintParts.Border))
+                    PaintBorder(graphics, clipBounds, cellBounds, cellStyle, advancedBorderStyle);
+
+                // Now paint the background and content
+
+                if (PartsSet(paintParts, DataGridViewPaintParts.Background))
+                {
+                    Rectangle rBk = GetBackBounds(cellBounds, advancedBorderStyle);
+
+                    if (rBk.Height > 0 && rBk.Width > 0)
+                    {
+                        DataGridViewSliderColumn oc = (DataGridViewSliderColumn)OwningColumn;
+                        Bitmap bm = oc.GetCellBitmap(cellBounds);
+
+                        if (bm != null)
+                        {
+                            using (Graphics g = Graphics.FromImage(bm))
+                            {
+                                PaintSliderBackground(g, cellStyle, rBk);
+                                PaintSliderContent(cellBounds, rowIndex, formattedValue, cellStyle, paintParts, g);
+
+                                graphics.DrawImageUnscaledAndClipped(bm, rBk);
+                            }
+
+                            if ((DataGridView.ShowCellErrors == true) &&
+                                (paintParts & DataGridViewPaintParts.ErrorIcon) == DataGridViewPaintParts.ErrorIcon)
+                            {
+                                base.PaintErrorIcon(graphics, clipBounds, cellBounds, errorText);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region PaintSliderBackground
+
+        /// <summary>
+        /// Paints the Slider background
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="cellStyle"></param>
+        /// <param name="rBack"></param>
+        private void PaintSliderBackground(Graphics g,
+            DataGridViewCellStyle cellStyle, Rectangle rBack)
+        {
+            Rectangle r = rBack;
+            r.Location = new Point(0, 0);
+
+            DataGridViewX dx = DataGridView as DataGridViewX;
+
+            if (dx != null && dx.Enabled == true && Selected == true &&
+                dx.PaintEnhancedSelection == true)
+            {
+                Office2007ButtonItemPainter.PaintBackground(g, dx.ButtonStateColorTable,
+                    r, RoundRectangleShapeDescriptor.RectangleShape, false, false);
+            }
+            else
+            {
+                Color color = (Selected == true)
+                    ? cellStyle.SelectionBackColor : cellStyle.BackColor;
+
+                using (Brush br = new SolidBrush(color))
+                    g.FillRectangle(br, r);
+            }
+        }
+
+        #endregion
+
+        #region PaintSliderContent
+
+        /// <summary>
+        /// Paints the Slider content
+        /// </summary>
+        /// <param name="cellBounds"></param>
+        /// <param name="rowIndex"></param>
+        /// <param name="value"></param>
+        /// <param name="cellStyle"></param>
+        /// <param name="paintParts"></param>
+        /// <param name="g"></param>
+        private void PaintSliderContent(Rectangle cellBounds,
+            int rowIndex, object value, DataGridViewCellStyle cellStyle,
+            DataGridViewPaintParts paintParts, Graphics g)
+        {
+            DataGridViewSliderColumn oc = (DataGridViewSliderColumn) OwningColumn;
+            Slider slider = oc.Slider;
+
+            _CellStyle = cellStyle;
+
+            int saveValue = slider.Value;
+
+            eSliderPart mouseOverPart = slider.SliderItem.MouseOverPart;
+            eSliderPart mouseDownPart = slider.SliderItem.MouseDownPart;
+
+            GraphicsState gs = g.Save();
+
+            try
+            {
+                cellBounds.X = 0;
+                cellBounds.Y = 0;
+                cellBounds.Width -= (oc.DividerWidth + 1);
+                cellBounds.Height -= 1;
+
+                if (rowIndex != oc.ActiveRowIndex)
+                {
+                    slider.SliderItem.MouseOverPart = eSliderPart.None;
+                    slider.SliderItem.MouseDownPart = eSliderPart.None;
+                }
+
+                slider.Font = cellStyle.Font;
+                slider.ForeColor = cellStyle.ForeColor;
+                slider.BackColor = Selected ? Color.Transparent : cellStyle.BackColor;
+
+                if (rowIndex < DataGridView.RowCount)
+                {
+                    slider.Text = oc.Text;
+
+                    if (rowIndex != oc.ActiveRowIndex)
+                        slider.Value = GetSliderValue(value);
+
+                    if (PartsSet(paintParts, DataGridViewPaintParts.ContentForeground))
+                        oc.OnBeforeCellPaint(rowIndex, ColumnIndex);
+                }
+                else
+                {
+                    slider.Text = "";
+                    slider.Value = GetSliderValue(value);
+                }
+
+                Rectangle r = GetAdjustedEditingControlBounds(cellBounds, cellStyle);
+
+                g.TranslateTransform(r.X, r.Y);
+
+                slider.CallBasePaintBackground = false;
+
+                slider.Bounds = r;
+                slider.InternalPaint(new PaintEventArgs(g, Rectangle.Empty));
+            }
+            finally
+            {
+                g.Restore(gs);
+
+                slider.Value = saveValue;
+
+                slider.SliderItem.MouseOverPart = mouseOverPart;
+                slider.SliderItem.MouseDownPart = mouseDownPart;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Mouse processing
+
+        #region OnMouseEnter
+
+        /// <summary>
+        /// OnMouseEnter
+        /// </summary>
+        /// <param name="rowIndex"></param>
+        protected override void OnMouseEnter(int rowIndex)
+        {
+            base.OnMouseEnter(rowIndex);
+
+            DoMouseEnter(rowIndex, true);
+        }
+
+        #region DoMouseEnter
+
+        /// <summary>
+        /// Process MouseEnter state
+        /// </summary>
+        /// <param name="rowIndex"></param>
+        /// <param name="refresh"></param>
+        private void DoMouseEnter(int rowIndex, bool refresh)
+        {
+            DataGridViewSliderColumn oc = (DataGridViewSliderColumn) OwningColumn;
+            Slider slider = oc.Slider;
+
+            // Work around an issue where we get notified of a mouse enter, but
+            // we will fault if we try to get the Value associated with the cell
+
+            if (Visible == true)
+            {
+                oc.ActiveRowIndex = rowIndex;
+
+                slider.Value = GetSliderValue(Value);
+
+                slider.SliderItem.InternalMouseEnter();
+
+                if (refresh == true)
+                    RefreshSlider(ColumnIndex, rowIndex);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region OnMouseLeave
+
+        /// <summary>
+        /// Processes MouseLeave events
+        /// </summary>
+        /// <param name="rowIndex"></param>
+        protected override void OnMouseLeave(int rowIndex)
+        {
+            base.OnMouseLeave(rowIndex);
+
+            DataGridViewSliderColumn oc = (DataGridViewSliderColumn)OwningColumn;
+            Slider slider = oc.Slider;
+
+            if (oc.ActiveRowIndex >= 0)
+            {
+                oc.ActiveRowIndex = -1;
+
+                slider.SliderItem.InternalMouseLeave();
+
+                Value = slider.Value;
+
+                RefreshSlider(ColumnIndex, rowIndex);
+            }
+        }
+
+        #endregion
+
+        #region OnMouseMove
+
+        /// <summary>
+        /// Processes MouseMove events
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnMouseMove(DataGridViewCellMouseEventArgs e)
+        {
+            base.OnMouseMove(e);
+
+            DataGridViewSliderColumn oc = OwningColumn as DataGridViewSliderColumn;
+
+            if (oc != null)
+            {
+                // Work around an issue where we get notified of a mouse enter / move, but
+                // we will fault if we try to get the Value associated with the cell
+
+                if (oc.ActiveRowIndex == -1)
+                    DoMouseEnter(e.RowIndex, false);
+
+                if (oc.ActiveRowIndex >= 0)
+                {
+                    Point pt = CellAlignPoint(e.X, e.Y);
+
+                    oc.Slider.SliderItem.InternalMouseMove(
+                        new MouseEventArgs(e.Button, e.Clicks, pt.X, pt.Y, e.Delta));
+
+                    RefreshSlider(e.ColumnIndex, e.RowIndex);
+                }
+            }
+        }
+
+        #endregion
+
+        #region OnMouseDown
+
+        /// <summary>
+        /// Processes MouseDown events
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnMouseDown(DataGridViewCellMouseEventArgs e)
+        {
+            base.OnMouseDown(e);
+
+            DataGridViewSliderColumn oc = OwningColumn as DataGridViewSliderColumn;
+
+            if (oc != null)
+            {
+                Point pt = CellAlignPoint(e.X, e.Y);
+
+                oc.Slider.SliderItem.InternalMouseDown(
+                    new MouseEventArgs(e.Button, e.Clicks, pt.X, pt.Y, e.Delta));
+
+                RefreshSlider(e.ColumnIndex, e.RowIndex);
+            }
+        }
+
+        #endregion
+
+        #region OnMouseUp
+
+        /// <summary>
+        /// Processes MouseUp events
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnMouseUp(DataGridViewCellMouseEventArgs e)
+        {
+            base.OnMouseUp(e);
+
+            DataGridViewSliderColumn oc = OwningColumn as DataGridViewSliderColumn;
+
+            if (oc != null)
+            {
+                Point pt = CellAlignPoint(e.X, e.Y);
+
+                oc.Slider.SliderItem.InternalMouseUp(
+                    new MouseEventArgs(e.Button, e.Clicks, pt.X, pt.Y, e.Delta));
+
+                Value = oc.Slider.Value;
+
+                RefreshSlider(e.ColumnIndex, e.RowIndex);
+            }
+        }
+
+        #endregion
+
+        #region CellAlignPoint
+
+        /// <summary>
+        /// CellAlignPoint
+        /// </summary>
+        /// <param name="x"></param>
+        /// <param name="y"></param>
+        /// <returns></returns>
+        private Point CellAlignPoint(int x, int y)
+        {
+            Rectangle r = GetAdjustedEditingControlBounds(ContentBounds, _CellStyle);
+
+            return (new Point(x, y - r.Y));
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetSliderValue
+
+        /// <summary>
+        /// GetSliderValue
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        internal int GetSliderValue(object value)
+        {
+            if (value == Convert.DBNull ||
+                (value is string && String.IsNullOrEmpty((string) value) == true))
+            {
+                return (0);
+            }
+
+            return (Convert.ToInt32(value));
+        }
+
+        #endregion
+
+        #region PartsSet
+
+        /// <summary>
+        /// Determines if the given part is set
+        /// </summary>
+        /// <param name="paintParts"></param>
+        /// <param name="parts"></param>
+        /// <returns></returns>
+        private bool PartsSet(DataGridViewPaintParts paintParts, DataGridViewPaintParts parts)
+        {
+            return ((paintParts & parts) == parts);
+        }
+
+        #endregion
+
+        #region GetBackBounds
+
+        /// <summary>
+        /// Gets the background bounds for the given cell
+        /// </summary>
+        /// <param name="cellBounds"></param>
+        /// <param name="advancedBorderStyle"></param>
+        /// <returns></returns>
+        private Rectangle GetBackBounds(
+            Rectangle cellBounds, DataGridViewAdvancedBorderStyle advancedBorderStyle)
+        {
+            DataGridViewSliderColumn oc = (DataGridViewSliderColumn)OwningColumn;
+
+            Rectangle r = BorderWidths(advancedBorderStyle);
+
+            cellBounds.Offset(r.X, r.Y);
+            cellBounds.Width -= r.Right;
+            cellBounds.Height -= r.Bottom;
+
+            if (Selected == true)
+                cellBounds.Width += oc.DividerWidth;
+
+            return (cellBounds);
+        }
+
+        #endregion
+
+        #region GetContentBounds
+
+        /// <summary>
+        /// Gets the content bounds for the given cell
+        /// </summary>
+        /// <param name="cellBounds"></param>
+        /// <returns></returns>
+        private Rectangle GetContentBounds(Rectangle cellBounds)
+        {
+            DataGridViewSliderColumn oc = (DataGridViewSliderColumn)OwningColumn;
+
+            if (oc.Slider.Parent == null)
+            {
+                Form form = oc.DataGridView.FindForm();
+
+                if (form != null)
+                    oc.Slider.Parent = form;
+            }
+
+            oc.Slider.SliderItem.RecalcSize();
+
+            cellBounds.Width -= (oc.DividerWidth + 3);
+            cellBounds.Height = oc.Slider.SliderItem.HeightInternal;
+
+            return (cellBounds);
+        }
+
+        #endregion
+
+        #region RefreshSlider
+
+        /// <summary>
+        /// Initiates the refresh of the cell slider
+        /// </summary>
+        /// <param name="columnIndex"></param>
+        /// <param name="rowIndex"></param>
+        internal void RefreshSlider(int columnIndex, int rowIndex)
+        {
+            if (DataGridView != null)
+                DataGridView.InvalidateCell(columnIndex, rowIndex);
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewSlider/DataGridViewSliderColumn.cs b/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewSlider/DataGridViewSliderColumn.cs
new file mode 100644
index 00000000..40ba6be8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewSlider/DataGridViewSliderColumn.cs	
@@ -0,0 +1,462 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Runtime.InteropServices;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    [ToolboxBitmap(typeof(DataGridViewButtonXColumn), "Controls.Slider.ico"), ToolboxItem(false), ComVisible(false)]
+    public class DataGridViewSliderColumn : DataGridViewTextBoxColumn, IDataGridViewColumn
+    {
+        #region Events
+
+        /// <summary>
+        /// Occurs right before a Slider Cell is painted
+        /// </summary>
+        [Description("Occurs right before a Slider Cell is painted.")]
+        public event EventHandler<BeforeCellPaintEventArgs> BeforeCellPaint;
+
+        [Description("Occurs when a Slider Cell is Clicked.")]
+        public event EventHandler<EventArgs> Click;
+
+        #endregion
+
+        #region Private variables
+
+        private Slider _Slider;
+        private Bitmap _CellBitmap;
+
+        private int _ActiveRowIndex = -1;
+        private bool _BindingComplete;
+
+        #endregion
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        public DataGridViewSliderColumn()
+        {
+            CellTemplate = new DataGridViewSliderCell();
+
+            _Slider = new Slider();
+            _Slider.Visible = false;
+
+            HookEvents(true);
+        }
+
+        #region Internal properties
+
+        #region ActiveRowIndex
+
+        /// <summary>
+        /// Gets or sets the active row index
+        /// </summary>
+        internal int ActiveRowIndex
+        {
+            get { return (_ActiveRowIndex); }
+            set { _ActiveRowIndex = value; }
+        }
+
+        #endregion
+
+        #region BindingComplete
+
+        /// <summary>
+        /// Gets or sets the DataBindingComplete state
+        /// </summary>
+        internal bool BindingComplete
+        {
+            get { return (_BindingComplete); }
+            set { _BindingComplete = value; }
+        }
+
+        #endregion
+
+        #region Slider
+
+        /// <summary>
+        /// Gets the Control Slider
+        /// </summary>
+        internal Slider Slider
+        {
+            get { return (_Slider); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Public properties
+
+        #region Enabled
+
+        /// <summary>
+        /// Gets or sets whether the control can respond to user interaction
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Behavior")]
+        [Description("Indicates whether the control can respond to user interaction.")]
+        public bool Enabled
+        {
+            get { return (_Slider.Enabled); }
+            set { _Slider.Enabled = value; }
+        }
+
+        #endregion
+
+        #region EnableMarkup
+
+        /// <summary>
+        /// Gets or sets whether text-markup support is enabled for items Text property. Default value is true.
+        /// Set this property to false to display HTML or other markup in the item instead of it being parsed as text-markup.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance")]
+        [Description("Indicates whether text-markup support is enabled for items Text property.")]
+        public bool EnableMarkup
+        {
+            get { return (_Slider.EnableMarkup); }
+            set { _Slider.EnableMarkup = value; }
+        }
+
+        #endregion
+
+        #region LabelPosition
+
+        /// <summary>
+        /// Gets or sets the text label position in relationship to the slider. Default value is Left.
+        /// </summary>
+        [Browsable(true), DefaultValue(eSliderLabelPosition.Left), Category("Layout")]
+        [Description("Indicates text label position in relationship to the slider")]
+        public eSliderLabelPosition LabelPosition
+        {
+            get { return (_Slider.LabelPosition); }
+            set { _Slider.LabelPosition = value; }
+        }
+
+        #endregion
+
+        #region LabelVisible
+
+        /// <summary>
+        /// Gets or sets whether the text label next to the slider is displayed.
+        /// </summary>
+        [DevCoBrowsable(true), Browsable(true)]
+        [Description("Gets or sets whether the label text is displayed."), Category("Behavior"), DefaultValue(true)]
+        public bool LabelVisible
+        {
+            get { return (_Slider.LabelVisible); }
+            set { _Slider.LabelVisible = value; }
+        }
+
+        #endregion
+
+        #region LabelWidth
+
+        /// <summary>
+        /// Gets or sets the width of the label part of the item in pixels. Value must be greater than 0. Default value is 38.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), DefaultValue(38), Category("Layout")]
+        [Description("Indicates width of the label part of the item in pixels.")]
+        public int LabelWidth
+        {
+            get { return (_Slider.LabelWidth); }
+            set { _Slider.LabelWidth = value; }
+        }
+
+        #endregion
+
+        #region Maximum
+
+        /// <summary>
+        /// Gets or sets the maximum value of the range of the control.
+        /// </summary>
+        [DevCoBrowsable(true), Browsable(true), Category("Behavior"), DefaultValue(100)]
+        [Description("Gets or sets the maximum value of the range of the control.")]
+        public int Maximum
+        {
+            get { return (_Slider.Maximum); }
+            set { _Slider.Maximum = value; }
+        }
+
+        #endregion
+
+        #region Minimum
+
+        /// <summary>
+        /// Gets or sets the minimum value of the range of the control.
+        /// </summary>
+        [DevCoBrowsable(true), Browsable(true), Category("Behavior"), DefaultValue(0)]
+        [Description("Gets or sets the minimum value of the range of the control.")]
+        public int Minimum
+        {
+            get { return (_Slider.Minimum); }
+            set { _Slider.Minimum = value; }
+        }
+
+        #endregion
+
+        #region Step
+
+        /// <summary>
+        /// Gets or sets the amount by which a call to the PerformStep method increases the current position of the slider. Value must be greater than 0.
+        /// </summary>
+        [DevCoBrowsable(true), Browsable(true), Category("Behavior"), DefaultValue(1)]
+        [Description("Gets or sets the amount by which a call to the PerformStep method increases the current position of the slider.")]
+        public int Step
+        {
+            get { return (_Slider.Step); }
+            set { _Slider.Step = value; }
+        }
+
+        #endregion
+
+        #region Text
+
+        /// <summary>
+        /// Gets or sets the text associated with this item.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), DefaultValue(""), Category("Appearance")]
+        [Description("The text contained in the item.")]
+        public string Text
+        {
+            get { return (_Slider.Text); }
+            set { _Slider.Text = value; }
+        }
+
+        #endregion
+
+        #region TextColor
+
+        /// <summary>
+        /// Gets or sets the color of the label text.
+        /// </summary>
+        [Browsable(true), Category("Appearance")]
+        [Description("Indicates color of the label text.")]
+        public Color TextColor
+        {
+            get { return (_Slider.TextColor); }
+            set { _Slider.TextColor = value; }
+        }
+
+        /// <summary>
+        /// Returns whether property should be serialized. Used by Windows Forms designer.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeTextColor()
+        {
+            return (_Slider.TextColor.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets the property to default value. Used by Windows Forms designer.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetTextColor()
+        {
+            _Slider.TextColor = Color.Empty;
+        }
+
+        #endregion
+
+        #region TrackMarker
+
+        /// <summary>
+        /// Gets or sets whether vertical line track marker is displayed on the slide line. Default value is true.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), DefaultValue(true)]
+        [Description("Indicates whether vertical line track marker is displayed on the slide line.")]
+        public virtual bool TrackMarker
+        {
+            get { return (_Slider.TrackMarker); }
+            set { _Slider.TrackMarker = value; }
+        }
+
+        #endregion
+
+        #region Value
+
+        /// <summary>
+        /// Gets or sets the current position of the slider.
+        /// </summary>
+        [Browsable(false)]
+        [Description("Indicates the current position of the slider.")]
+        public int Value
+        {
+            get { return (_Slider.Value); }
+            set { _Slider.Value = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region HookEvents
+
+        /// <summary>
+        /// Hooks or unhooks our system events
+        /// </summary>
+        /// <param name="hook"></param>
+        private void HookEvents(bool hook)
+        {
+            if (hook == true)
+            {
+                _Slider.SliderItem.Click += SliderItem_Click;
+                _Slider.SliderItem.ValueChanged += SliderItem_ValueChanged;
+            }
+            else
+            {
+                _Slider.SliderItem.Click -= SliderItem_Click;
+                _Slider.SliderItem.ValueChanged -= SliderItem_ValueChanged;
+            }
+        }
+
+        #endregion
+
+        #region Event processing
+
+        #region SliderItem_Click
+
+        /// <summary>
+        /// SliderItem_Click
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void SliderItem_Click(object sender, EventArgs e)
+        {
+            if (Click != null)
+                Click(sender, e);
+        }
+
+        #endregion
+
+        #region SliderItem_ValueChanged
+
+        /// <summary>
+        /// SliderItem_ValueChanged
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void SliderItem_ValueChanged(object sender, EventArgs e)
+        {
+            if (_Slider.SliderItem.MouseDownPart == eSliderPart.IncreaseButton ||
+                _Slider.SliderItem.MouseDownPart == eSliderPart.DecreaseButton)
+            {
+                DataGridViewSliderCell cell = DataGridView.Rows[ActiveRowIndex].Cells[Index] as DataGridViewSliderCell;
+
+                if (cell != null)
+                {
+                    int value = cell.GetSliderValue(cell.Value);
+
+                    if (value != _Slider.SliderItem.Value)
+                    {
+                        cell.Value = _Slider.SliderItem.Value;
+                        cell.RefreshSlider(Index, ActiveRowIndex);
+
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetCellBitmap
+
+        /// <summary>
+        /// Gets the cell paint bitmap
+        /// </summary>
+        /// <param name="cellBounds"></param>
+        /// <returns></returns>
+        internal Bitmap GetCellBitmap(Rectangle cellBounds)
+        {
+            if (_CellBitmap == null ||
+                (_CellBitmap.Width != cellBounds.Width || _CellBitmap.Height < cellBounds.Height))
+            {
+                if (_CellBitmap != null)
+                    _CellBitmap.Dispose();
+
+                _CellBitmap = new Bitmap(cellBounds.Width, cellBounds.Height);
+            }
+
+            return (_CellBitmap);
+        }
+
+        #endregion
+
+        #region OnBeforeCellPaint
+
+        /// <summary>
+        /// Invokes BeforeCellPaint user events
+        /// </summary>
+        /// <param name="rowIndex">Row index</param>
+        /// <param name="columnIndex">Column index</param>
+        internal void OnBeforeCellPaint(int rowIndex, int columnIndex)
+        {
+            if (BeforeCellPaint != null)
+                BeforeCellPaint(this, new BeforeCellPaintEventArgs(rowIndex, columnIndex));
+        }
+
+        #endregion
+
+        #region ICloneable members
+
+        /// <summary>
+        /// Clones the ButtonX Column
+        /// </summary>
+        /// <returns></returns>
+        public override object Clone()
+        {
+            DataGridViewSliderColumn sc = base.Clone() as DataGridViewSliderColumn;
+
+            if (sc != null)
+            {
+                _Slider.SliderItem.InternalCopyToItem(sc.Slider.SliderItem);
+
+                sc.Enabled = Enabled;
+            }
+
+            return (sc);
+        }
+
+        #endregion
+
+        #region IDataGridViewColumn Members
+
+        /// <summary>
+        /// Gets the Cell paint setting for the ButtonX control
+        /// </summary>
+        [Browsable(false)]
+        public bool OwnerPaintCell
+        {
+            get { return (true); }
+        }
+
+        #endregion
+
+        #region Dispose
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        /// <param name="disposing"></param>
+        protected override void Dispose(bool disposing)
+        {
+            HookEvents(false);
+
+            if (disposing == true)
+                _Slider.Dispose();
+
+            if (_CellBitmap != null)
+            {
+                _CellBitmap.Dispose();
+                _CellBitmap = null;
+            }
+
+            base.Dispose(disposing);
+        }
+
+        #endregion
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewTextBoxDropDown/DataGridViewTextBoxDropDownCell.cs b/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewTextBoxDropDown/DataGridViewTextBoxDropDownCell.cs
new file mode 100644
index 00000000..c067e9fe
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewTextBoxDropDown/DataGridViewTextBoxDropDownCell.cs	
@@ -0,0 +1,670 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Runtime.InteropServices;
+using System.Windows.Forms;
+using DevComponents.Editors;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    public class DataGridViewTextBoxDropDownCell : DataGridViewTextBoxCell
+    {
+        [DllImport("user32.dll", CharSet = CharSet.Auto, SetLastError = false)]
+        static extern IntPtr PostMessage(IntPtr hWnd, int msg, int wParam, int lParam);
+
+        #region Public properties
+
+        #region EditType
+
+        /// <summary>
+        /// Gets the Type of the editing control associated with the cell
+        /// </summary>
+        public override Type EditType
+        {
+            get { return (typeof(DataGridViewTextBoxDropDownEditingControl)); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InitializeEditingControl
+
+        /// <summary>
+        /// InitializeEditingControl
+        /// </summary>
+        /// <param name="rowIndex"></param>
+        /// <param name="initialFormattedValue"></param>
+        /// <param name="dataGridViewCellStyle"></param>
+        public override void InitializeEditingControl(int rowIndex,
+            object initialFormattedValue, DataGridViewCellStyle dataGridViewCellStyle)
+        {
+            DetachEditingControl();
+
+            base.InitializeEditingControl(rowIndex, initialFormattedValue, dataGridViewCellStyle);
+
+            DataGridViewTextBoxDropDownEditingControl ctl =
+                (DataGridViewTextBoxDropDownEditingControl)DataGridView.EditingControl;
+
+            DataGridViewTextBoxDropDownColumn oc = (DataGridViewTextBoxDropDownColumn)OwningColumn;
+            TextBoxDropDown tb = oc.TextBoxDropDown;
+
+            ctl.AutoCompleteCustomSource = tb.AutoCompleteCustomSource;
+            ctl.AutoCompleteMode = tb.AutoCompleteMode;
+            ctl.AutoCompleteSource = tb.AutoCompleteSource;
+            ctl.BackColor = tb.BackColor;
+            ctl.CharacterCasing = tb.CharacterCasing;
+            ctl.DropDownControl = tb.DropDownControl;
+            ctl.Enabled = tb.Enabled;
+            ctl.FocusHighlightColor = tb.FocusHighlightColor;
+            ctl.FocusHighlightEnabled = tb.FocusHighlightEnabled;
+            ctl.ForeColor = tb.ForeColor;
+            ctl.HideSelection = tb.HideSelection;
+            ctl.ImeMode = tb.ImeMode;
+            ctl.MaxLength = tb.MaxLength;
+            ctl.PasswordChar = tb.PasswordChar;
+            ctl.RightToLeft = tb.RightToLeft;
+            ctl.TextAlign = GetTextAlignment(dataGridViewCellStyle.Alignment);
+            ctl.UseSystemPasswordChar = tb.UseSystemPasswordChar;
+            ctl.WatermarkBehavior = tb.WatermarkBehavior;
+            ctl.WatermarkColor = tb.WatermarkColor;
+            ctl.WatermarkEnabled = tb.WatermarkEnabled;
+            ctl.WatermarkFont = tb.WatermarkFont;
+            ctl.WatermarkText = tb.WatermarkText;
+
+            ctl.TextBox.Multiline = (dataGridViewCellStyle.WrapMode == DataGridViewTriState.True);
+
+            ctl.BackgroundStyle.ApplyStyle(tb.BackgroundStyle);
+            ctl.BackgroundStyle.Class = tb.BackgroundStyle.Class;
+
+            tb.ButtonClear.CopyToItem(ctl.ButtonClear);
+            tb.ButtonCustom.CopyToItem(ctl.ButtonCustom);
+            tb.ButtonCustom2.CopyToItem(ctl.ButtonCustom2);
+            tb.ButtonDropDown.CopyToItem(ctl.ButtonDropDown);
+
+            ctl.ButtonClearClick += ButtonClearClick;
+            ctl.ButtonCustomClick += ButtonCustomClick;
+            ctl.ButtonCustom2Click += ButtonCustom2Click;
+            ctl.ButtonDropDownClick += ButtonDropDownClick;
+            ctl.KeyDown += KeyDown;
+
+            ctl.Text = (initialFormattedValue != null && initialFormattedValue != Convert.DBNull
+                ? Convert.ToString(initialFormattedValue) : "");
+        }
+
+        #endregion
+
+        #region DetachEditingControl
+
+        /// <summary>
+        /// DetachEditingControl
+        /// </summary>
+        public override void DetachEditingControl()
+        {
+            if (DataGridView != null && DataGridView.EditingControl != null)
+            {
+                DataGridViewTextBoxDropDownEditingControl di =
+                    DataGridView.EditingControl as DataGridViewTextBoxDropDownEditingControl;
+
+                if (di != null)
+                {
+                    di.ButtonClearClick -= ButtonClearClick;
+                    di.ButtonCustomClick -= ButtonCustomClick;
+                    di.ButtonCustom2Click -= ButtonCustom2Click;
+                    di.ButtonDropDownClick -= ButtonDropDownClick;
+                    di.KeyDown -= KeyDown;
+                }
+            }
+
+            base.DetachEditingControl();
+        }
+
+        #endregion
+
+        #region Event processing
+
+        #region ButtonClearClick
+
+        /// <summary>
+        /// ButtonClearClick
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void ButtonClearClick(object sender, CancelEventArgs e)
+        {
+            ((DataGridViewTextBoxDropDownColumn)OwningColumn).DoButtonClearClick(sender, e);
+        }
+
+        #endregion
+
+        #region ButtonCustomClick
+
+        /// <summary>
+        /// ButtonCustomClick
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void ButtonCustomClick(object sender, EventArgs e)
+        {
+            ((DataGridViewTextBoxDropDownColumn)OwningColumn).DoButtonCustomClick(sender, e);
+        }
+
+        #endregion
+
+        #region ButtonCustom2Click
+
+        /// <summary>
+        /// ButtonCustom2Click
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void ButtonCustom2Click(object sender, EventArgs e)
+        {
+            ((DataGridViewTextBoxDropDownColumn)OwningColumn).DoButtonCustom2Click(sender, e);
+        }
+
+        #endregion
+
+        #region ButtonDropDownClick
+
+        /// <summary>
+        /// ButtonDropDownClick
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void ButtonDropDownClick(object sender, CancelEventArgs e)
+        {
+            ((DataGridViewTextBoxDropDownColumn)OwningColumn).DoButtonDropDownClick(sender, e);
+        }
+
+        #endregion
+
+        #region KeyDown
+
+        /// <summary>
+        /// KeyDown routine forwards all DataGridView sent keys to
+        /// the underlying focusable control
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void KeyDown(object sender, KeyEventArgs e)
+        {
+            if (DataGridView != null && DataGridView.EditingControl != null)
+            {
+                DataGridViewTextBoxDropDownEditingControl di =
+                    DataGridView.EditingControl as DataGridViewTextBoxDropDownEditingControl;
+
+                if (di != null)
+                    PostMessage(di.TextBox.Handle, 256, (int) e.KeyCode, 1);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region PositionEditingControl
+
+        /// <summary>
+        /// PositionEditingControl
+        /// </summary>
+        /// <param name="setLocation"></param>
+        /// <param name="setSize"></param>
+        /// <param name="cellBounds"></param>
+        /// <param name="cellClip"></param>
+        /// <param name="cellStyle"></param>
+        /// <param name="singleVerticalBorderAdded"></param>
+        /// <param name="singleHorizontalBorderAdded"></param>
+        /// <param name="isFirstDisplayedColumn"></param>
+        /// <param name="isFirstDisplayedRow"></param>
+        public override void PositionEditingControl(bool setLocation, bool setSize, Rectangle cellBounds,
+            Rectangle cellClip, DataGridViewCellStyle cellStyle, bool singleVerticalBorderAdded,
+            bool singleHorizontalBorderAdded, bool isFirstDisplayedColumn, bool isFirstDisplayedRow)
+        {
+            Rectangle editingControlBounds =
+                PositionEditingPanel(cellBounds, cellClip, cellStyle, singleVerticalBorderAdded,
+                                     singleHorizontalBorderAdded, isFirstDisplayedColumn, isFirstDisplayedRow);
+
+            editingControlBounds = GetAdjustedEditingControlBounds(editingControlBounds, cellStyle);
+
+            DataGridView.EditingControl.Location = new Point(editingControlBounds.X, editingControlBounds.Y);
+            DataGridView.EditingControl.Size = new Size(editingControlBounds.Width, editingControlBounds.Height);
+        }
+
+        #endregion
+
+        #region GetAdjustedEditingControlBounds
+
+        /// <summary>
+        /// GetAdjustedEditingControlBounds
+        /// </summary>
+        /// <param name="editingControlBounds"></param>
+        /// <param name="cellStyle"></param>
+        /// <returns></returns>
+        private Rectangle GetAdjustedEditingControlBounds(
+            Rectangle editingControlBounds, DataGridViewCellStyle cellStyle)
+        {
+            // Add a 1 pixel padding around the editing control
+
+            editingControlBounds.X += 1;
+            editingControlBounds.Y += 1;
+            editingControlBounds.Width = Math.Max(0, editingControlBounds.Width - 2);
+            editingControlBounds.Height = Math.Max(0, editingControlBounds.Height - 2);
+
+            // Adjust the vertical location of the editing control
+
+            Rectangle r = GetCellBounds(editingControlBounds);
+
+            if (cellStyle.WrapMode != DataGridViewTriState.True)
+            {
+                if (r.Height < editingControlBounds.Height)
+                {
+                    switch (cellStyle.Alignment)
+                    {
+                        case DataGridViewContentAlignment.MiddleLeft:
+                        case DataGridViewContentAlignment.MiddleCenter:
+                        case DataGridViewContentAlignment.MiddleRight:
+                            editingControlBounds.Y += (editingControlBounds.Height - r.Height)/2;
+                            break;
+
+                        case DataGridViewContentAlignment.BottomLeft:
+                        case DataGridViewContentAlignment.BottomCenter:
+                        case DataGridViewContentAlignment.BottomRight:
+                            editingControlBounds.Y += (editingControlBounds.Height - r.Height);
+                            break;
+                    }
+                }
+
+                editingControlBounds.Height = Math.Max(1, r.Height);
+            }
+
+            editingControlBounds.Width = Math.Max(1, editingControlBounds.Width);
+
+            return (editingControlBounds);
+        }
+
+        #endregion
+
+        #region GetPreferredSize
+
+        ///// <summary>
+        ///// GetPreferredSize
+        ///// </summary>
+        ///// <param name="graphics"></param>
+        ///// <param name="cellStyle"></param>
+        ///// <param name="rowIndex"></param>
+        ///// <param name="constraintSize"></param>
+        ///// <returns></returns>
+        //protected override Size GetPreferredSize(Graphics graphics,
+        //       DataGridViewCellStyle cellStyle, int rowIndex, Size constraintSize)
+        //{
+        //    if (DataGridView == null)
+        //        return (new Size(-1, -1));
+
+        //    DataGridViewTextBoxDropDownColumn oc = (DataGridViewTextBoxDropDownColumn)OwningColumn;
+
+        //    Size size = oc.TextBoxDropDown.PreferredSize;
+        //    size.Height += 3;
+
+        //    return (size);
+        //}
+
+        #endregion
+
+        #region Paint
+
+        #region Paint
+
+        /// <summary>
+        /// Cell painting
+        /// </summary>
+        /// <param name="graphics"></param>
+        /// <param name="clipBounds"></param>
+        /// <param name="cellBounds"></param>
+        /// <param name="rowIndex"></param>
+        /// <param name="elementState"></param>
+        /// <param name="value"></param>
+        /// <param name="formattedValue"></param>
+        /// <param name="errorText"></param>
+        /// <param name="cellStyle"></param>
+        /// <param name="advancedBorderStyle"></param>
+        /// <param name="paintParts"></param>
+        protected override void Paint(Graphics graphics,
+            Rectangle clipBounds, Rectangle cellBounds, int rowIndex,
+            DataGridViewElementStates elementState, object value, object formattedValue,
+            string errorText, DataGridViewCellStyle cellStyle,
+            DataGridViewAdvancedBorderStyle advancedBorderStyle,
+            DataGridViewPaintParts paintParts)
+        {
+            if (DataGridView != null)
+            {
+                // First paint the borders of the cell
+
+                if (PartsSet(paintParts, DataGridViewPaintParts.Border))
+                    PaintBorder(graphics, clipBounds, cellBounds, cellStyle, advancedBorderStyle);
+
+                // Now paint the background and content
+
+                if (PartsSet(paintParts, DataGridViewPaintParts.Background))
+                {
+                    Rectangle rBk = GetBackBounds(cellBounds, advancedBorderStyle);
+
+                    if (rBk.Height > 0 && rBk.Width > 0)
+                    {
+                        DataGridViewTextBoxDropDownColumn oc = (DataGridViewTextBoxDropDownColumn)OwningColumn;
+                        Bitmap bm = oc.GetCellBitmap(cellBounds);
+
+                        if (bm != null)
+                        {
+                            using (Graphics g = Graphics.FromImage(bm))
+                            {
+                                PaintCellBackground(g, cellStyle, rBk);
+                                PaintCellContent(g, cellBounds, rowIndex, formattedValue, cellStyle, paintParts, bm);
+
+                                graphics.DrawImageUnscaledAndClipped(bm, rBk);
+                            }
+
+                            if ((DataGridView.ShowCellErrors == true) &&
+                                (paintParts & DataGridViewPaintParts.ErrorIcon) == DataGridViewPaintParts.ErrorIcon)
+                            {
+                                base.PaintErrorIcon(graphics, clipBounds, cellBounds, errorText);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region PaintCellBackground
+
+        /// <summary>
+        /// Paints the cell background
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="cellStyle"></param>
+        /// <param name="rBack"></param>
+        private void PaintCellBackground(Graphics g,
+            DataGridViewCellStyle cellStyle, Rectangle rBack)
+        {
+            Rectangle r = rBack;
+            r.Location = new Point(0, 0);
+
+            DataGridViewX dx = DataGridView as DataGridViewX;
+
+            if (dx != null && dx.Enabled == true && Selected == true &&
+                dx.PaintEnhancedSelection == true)
+            {
+                Office2007ButtonItemPainter.PaintBackground(g, dx.ButtonStateColorTable,
+                    r, RoundRectangleShapeDescriptor.RectangleShape, false, false);
+            }
+            else
+            {
+                Color color = (Selected == true)
+                    ? cellStyle.SelectionBackColor : cellStyle.BackColor;
+
+                using (Brush br = new SolidBrush(color))
+                    g.FillRectangle(br, r);
+            }
+        }
+
+        #endregion
+
+        #region PaintCellContent
+
+        /// <summary>
+        /// Paints the cell content
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="cellBounds"></param>
+        /// <param name="rowIndex"></param>
+        /// <param name="value"></param>
+        /// <param name="cellStyle"></param>
+        /// <param name="paintParts"></param>
+        /// <param name="bm"></param>
+        private void PaintCellContent(Graphics g, Rectangle cellBounds, int rowIndex, object value,
+            DataGridViewCellStyle cellStyle, DataGridViewPaintParts paintParts, Bitmap bm)
+        {
+            DataGridViewTextBoxDropDownColumn oc = (DataGridViewTextBoxDropDownColumn)OwningColumn;
+            TextBoxDropDown di = oc.TextBoxDropDown;
+
+            Point ptCurrentCell = DataGridView.CurrentCellAddress;
+            bool cellCurrent = ptCurrentCell.X == ColumnIndex && ptCurrentCell.Y == rowIndex;
+            bool cellEdited = cellCurrent && DataGridView.EditingControl != null;
+
+            // If the cell is in editing mode, there is nothing else to paint
+
+            if (cellEdited == false && rowIndex < DataGridView.RowCount)
+            {
+                if (PartsSet(paintParts, DataGridViewPaintParts.ContentForeground))
+                {
+                    cellBounds.X = 0;
+                    cellBounds.Y = 0;
+                    cellBounds.Width -= (oc.DividerWidth + 1);
+                    cellBounds.Height -= 1;
+
+                    di.Font = cellStyle.Font;
+                    di.ForeColor = cellStyle.ForeColor;
+                    di.BackColor = cellStyle.BackColor;
+
+                    di.TextAlign = GetTextAlignment(cellStyle.Alignment);
+                    di.Text = GetValue(value);
+
+                    oc.OnBeforeCellPaint(rowIndex, ColumnIndex);
+
+                    Rectangle r = GetAdjustedEditingControlBounds(cellBounds, cellStyle);
+
+                    if (oc.DisplayControlForCurrentCellOnly == false)
+                        DrawControl(di, cellStyle, r, bm, g);
+                    else
+                        DrawText(di, cellStyle, r, g);
+                }
+            }
+        }
+
+        #region DrawControl
+
+        /// <summary>
+        /// DrawControl
+        /// </summary>
+        /// <param name="di"></param>
+        /// <param name="cellStyle"></param>
+        /// <param name="r"></param>
+        /// <param name="bm"></param>
+        /// <param name="g"></param>
+        private void DrawControl(TextBoxDropDown di, DataGridViewCellStyle cellStyle, Rectangle r, Bitmap bm, Graphics g)
+        {
+            if (di.ButtonGroup.Items.Count > 0)
+            {
+                using (Bitmap bm2 = new Bitmap(bm))
+                {
+                    di.Bounds = r;
+                    di.DrawToBitmap(bm2, r);
+
+                    foreach (VisualItem item in di.ButtonGroup.Items)
+                    {
+                        if (item.Visible == true)
+                        {
+                            Rectangle t = item.RenderBounds;
+                            t.X += r.X;
+                            t.Y += r.Y;
+
+                            g.DrawImage(bm2, t, t, GraphicsUnit.Pixel);
+
+                            if (t.Left < r.Right)
+                                r.Width -= (r.Right - t.Left - 1);
+                        }
+                    }
+                }
+            }
+
+            DrawText(di, cellStyle, r, g);
+        }
+
+        #endregion
+
+        #region DrawText
+
+        /// <summary>
+        /// DrawText
+        /// </summary>
+        /// <param name="di"></param>
+        /// <param name="r"></param>
+        /// <param name="g"></param>
+        /// <param name="cellStyle"></param>
+        private void DrawText(TextBoxDropDown di, DataGridViewCellStyle cellStyle, Rectangle r, Graphics g)
+        {
+            r.Inflate(-2, 0);
+
+            eTextFormat tf = eTextFormat.Default | eTextFormat.NoPrefix;
+
+            switch (di.TextAlign)
+            {
+                case HorizontalAlignment.Center:
+                    tf |= eTextFormat.HorizontalCenter;
+                    break;
+
+                case HorizontalAlignment.Right:
+                    tf |= eTextFormat.Right;
+                    break;
+            }
+
+            if (cellStyle.WrapMode == DataGridViewTriState.True)
+                tf |= eTextFormat.WordBreak;
+
+            switch (cellStyle.Alignment)
+            {
+                case DataGridViewContentAlignment.TopLeft:
+                case DataGridViewContentAlignment.TopCenter:
+                case DataGridViewContentAlignment.TopRight:
+                    tf |= eTextFormat.Top;
+                    break;
+
+                case DataGridViewContentAlignment.BottomLeft:
+                case DataGridViewContentAlignment.BottomCenter:
+                case DataGridViewContentAlignment.BottomRight:
+                    tf |= eTextFormat.Bottom;
+                    break;
+
+                default:
+                    tf |= eTextFormat.VerticalCenter;
+                    break;
+            }
+
+            TextDrawing.DrawString(g, di.Text, di.Font, di.ForeColor, r, tf);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region GetBackBounds
+
+        /// <summary>
+        /// Gets the background bounds for the given cell
+        /// </summary>
+        /// <param name="cellBounds"></param>
+        /// <param name="advancedBorderStyle"></param>
+        /// <returns></returns>
+        private Rectangle GetBackBounds(
+            Rectangle cellBounds, DataGridViewAdvancedBorderStyle advancedBorderStyle)
+        {
+            DataGridViewTextBoxDropDownColumn oc = (DataGridViewTextBoxDropDownColumn)OwningColumn;
+
+            Rectangle r = BorderWidths(advancedBorderStyle);
+
+            cellBounds.Offset(r.X, r.Y);
+            cellBounds.Width -= r.Right;
+            cellBounds.Height -= r.Bottom;
+
+            if (Selected == true)
+                cellBounds.Width += oc.DividerWidth;
+
+            return (cellBounds);
+        }
+        #endregion
+
+        #region GetCellBounds
+
+        /// <summary>
+        /// Gets the button bounds for the given cell
+        /// </summary>
+        /// <param name="cellBounds"></param>
+        /// <returns></returns>
+        private Rectangle GetCellBounds(Rectangle cellBounds)
+        {
+            DataGridViewTextBoxDropDownColumn oc = (DataGridViewTextBoxDropDownColumn)OwningColumn;
+
+            Size size = oc.TextBoxDropDown.PreferredSize;
+
+            cellBounds.Location = new Point(1, 1);
+
+            cellBounds.Width -= oc.DividerWidth;
+            cellBounds.Height = size.Height - 1;
+
+            return (cellBounds);
+        }
+
+        #endregion
+
+        #region GetValue
+
+        /// <summary>
+        /// GetValue
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        private string GetValue(object value)
+        {
+            return (value != Convert.DBNull ? Convert.ToString(value) : "");
+        }
+
+        #endregion
+
+        #region GetTextAlignment
+
+        /// <summary>
+        /// GetTextAlignment
+        /// </summary>
+        /// <param name="alignment"></param>
+        /// <returns></returns>
+        private HorizontalAlignment GetTextAlignment(DataGridViewContentAlignment alignment)
+        {
+            switch (alignment)
+            {
+                case DataGridViewContentAlignment.TopCenter:
+                case DataGridViewContentAlignment.MiddleCenter:
+                case DataGridViewContentAlignment.BottomCenter:
+                    return (HorizontalAlignment.Center);
+
+                case DataGridViewContentAlignment.TopRight:
+                case DataGridViewContentAlignment.MiddleRight:
+                case DataGridViewContentAlignment.BottomRight:
+                    return (HorizontalAlignment.Right);
+
+                default:
+                    return (HorizontalAlignment.Left);
+            }
+        }
+
+        #endregion
+
+        #region PartsSet
+
+        /// <summary>
+        /// Determines if the given part is set
+        /// </summary>
+        /// <param name="paintParts"></param>
+        /// <param name="parts"></param>
+        /// <returns></returns>
+        private bool PartsSet(DataGridViewPaintParts paintParts, DataGridViewPaintParts parts)
+        {
+            return ((paintParts & parts) == parts);
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewTextBoxDropDown/DataGridViewTextBoxDropDownColumn.cs b/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewTextBoxDropDown/DataGridViewTextBoxDropDownColumn.cs
new file mode 100644
index 00000000..e6ea6117
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewTextBoxDropDown/DataGridViewTextBoxDropDownColumn.cs	
@@ -0,0 +1,1058 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Runtime.InteropServices;
+using System.Security.Permissions;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.Rendering;
+using DevComponents.Editors;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    [ToolboxBitmap(typeof(DataGridViewTextBoxDropDownColumn), "Controls.TextBoxDropDown.ico"), ToolboxItem(false), ComVisible(false)]
+    public class DataGridViewTextBoxDropDownColumn : DataGridViewTextBoxColumn, IDataGridViewColumn
+    {
+        #region Events
+
+        /// <summary>
+        /// Occurs right before a TextBoxDropDown Cell is painted
+        /// </summary>
+        [Description("Occurs right before a TextBoxDropDown Cell is painted.")]
+        public event EventHandler<BeforeCellPaintEventArgs> BeforeCellPaint;
+
+        /// <summary>
+        /// Occurs when Clear button is clicked and allows you
+        /// to cancel the default action performed by the button
+        /// </summary>
+        [Description("Occurs when Clear button is clicked and allows you to cancel the default action performed by the button.")]
+        public event EventHandler<CancelEventArgs> ButtonClearClick;
+
+        /// <summary>
+        /// Occurs when ButtonCustom control is clicked
+        /// </summary>
+        [Description("Occurs when ButtonCustom control is clicked.")]
+        public event EventHandler<EventArgs> ButtonCustomClick;
+
+        /// <summary>
+        /// Occurs when ButtonCustom2 control is clicked
+        /// </summary>
+        [Description("Occurs when ButtonCustom2 control is clicked.")]
+        public event EventHandler<EventArgs> ButtonCustom2Click;
+
+        /// <summary>
+        /// Occurs when Drop-Down button is clicked and allows you to cancel showing of the popup
+        /// </summary>
+        [Description("Occurs when Drop-Down button is clicked and allows you to cancel showing of the popup.")]
+        public event EventHandler<CancelEventArgs> ButtonDropDownClick;
+
+        #endregion
+
+        #region Private variables
+
+        private TextBoxDropDown _TextBoxDropDown;
+        private Bitmap _CellBitmap;
+        private bool _DisplayControlForCurrentCellOnly = true;
+
+        #endregion
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        public DataGridViewTextBoxDropDownColumn()
+        {
+            CellTemplate = new DataGridViewTextBoxDropDownCell();
+
+            _TextBoxDropDown = new TextBoxDropDown();
+
+            _TextBoxDropDown.BackgroundStyle.Class = ElementStyleClassKeys.DataGridViewIpAddressBorderKey;
+        }
+
+        #region Internal properties
+
+        #region TextBoxDropDown
+
+        /// <summary>
+        /// Gets the underlying TextBoxDropDown control
+        /// </summary>
+        [Browsable(false)]
+        internal TextBoxDropDown TextBoxDropDown
+        {
+            get { return (_TextBoxDropDown); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Public properties
+
+        #region AutoCompleteCustomSource
+
+        /// <summary>
+        /// Gets or sets a custom StringCollection to use when
+        /// the AutoCompleteSource property is set to CustomSource.
+        /// <value>A StringCollection to use with AutoCompleteSource.</value>
+        /// </summary>
+        [Browsable(true), EditorBrowsable(EditorBrowsableState.Always)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content), Localizable(true)]
+        [Description("Indicates custom StringCollection to use when the AutoCompleteSource property is set to CustomSource.")]
+        [Editor("System.Windows.Forms.Design.ListControlStringCollectionEditor, System.Design, Version= 2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", typeof(UITypeEditor))]
+        public AutoCompleteStringCollection AutoCompleteCustomSource
+        {
+            get { return (_TextBoxDropDown.AutoCompleteCustomSource); }
+            set { _TextBoxDropDown.AutoCompleteCustomSource = value; }
+        }
+
+        #endregion
+
+        #region AutoCompleteMode
+
+        /// <summary>
+        /// Gets or sets an option that controls
+        /// how automatic completion works for the TextBox.
+        /// <value>One of the values of AutoCompleteMode. The values are Append,
+        /// None, Suggest, and SuggestAppend. The default is None.</value>
+        /// </summary>
+        [Browsable(true), EditorBrowsable(EditorBrowsableState.Always), DefaultValue(0)]
+        [Description("Gets or sets an option that controls how automatic completion works for the TextBox.")]
+        public AutoCompleteMode AutoCompleteMode
+        {
+            get { return (_TextBoxDropDown.AutoCompleteMode); }
+            set { _TextBoxDropDown.AutoCompleteMode = value; }
+        }
+
+        #endregion
+
+        #region AutoCompleteSource
+
+        /// <summary>
+        /// Gets or sets a value specifying the source of complete strings used for automatic completion.
+        /// <value>One of the values of AutoCompleteSource. The options are AllSystemSources, AllUrl, FileSystem, HistoryList, RecentlyUsedList, CustomSource, and None. The default is None.</value>
+        /// </summary>
+        [ Browsable(true), DefaultValue(0x80), TypeConverter(typeof(TextBoxAutoCompleteSourceConverter))]
+        [EditorBrowsable(EditorBrowsableState.Always)]
+        [Description("Gets or sets a value specifying the source of complete strings used for automatic completion.")]
+        public AutoCompleteSource AutoCompleteSource
+        {
+            get { return (_TextBoxDropDown.AutoCompleteSource); }
+            set { _TextBoxDropDown.AutoCompleteSource = value; }
+        }
+
+        #endregion
+
+        #region BackColor
+
+        /// <summary>
+        /// Gets or sets the Background color.
+        /// </summary>
+        [Browsable(false)]
+        public Color BackColor
+        {
+            get { return (_TextBoxDropDown.BackColor); }
+            set { _TextBoxDropDown.BackColor = value; }
+        }
+
+        #endregion
+
+        #region BackgroundStyle
+
+        /// <summary>
+        /// Specifies the background style of the control.
+        /// </summary>
+        [Browsable(true), Category("Style")]
+        [Description("Gets or sets control background style.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ElementStyle BackgroundStyle
+        {
+            get { return (_TextBoxDropDown.BackgroundStyle); }
+        }
+
+        /// <summary>
+        /// Resets style to default value. Used by windows forms designer.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetBackgroundStyle()
+        {
+            _TextBoxDropDown.ResetBackgroundStyle();
+
+            _TextBoxDropDown.BackgroundStyle.Class = "TextBoxBorder";
+            _TextBoxDropDown.BackgroundStyle.CornerType = eCornerType.Square;
+        }
+
+        #endregion
+
+        #region ButtonClear
+
+        /// <summary>
+        /// Gets the object that describes the settings for the button
+        /// that clears the content of the control when clicked.
+        /// </summary>
+        [Browsable(true), Category("Buttons")]
+        [Description("Describes the settings for the button that clears the content of the control when clicked.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public InputButtonSettings ButtonClear
+        {
+            get { return (_TextBoxDropDown.ButtonClear); }
+        }
+
+        #endregion
+
+        #region ButtonCustom
+
+        /// <summary>
+        /// Gets the object that describes the settings for the custom button
+        /// that can execute an custom action of your choosing when clicked.
+        /// </summary>
+        [Browsable(true), Category("Buttons")]
+        [Description("Describes the settings for the custom button that can execute an custom action of your choosing when clicked.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public InputButtonSettings ButtonCustom
+        {
+            get { return (_TextBoxDropDown.ButtonCustom); }
+        }
+
+        #endregion
+
+        #region ButtonCustom2
+
+        /// <summary>
+        /// Gets the object that describes the settings for the custom button that can execute an custom action of your choosing when clicked.
+        /// </summary>
+        [Browsable(true), Category("Buttons")]
+        [Description("Describes the settings for the custom button that can execute an custom action of your choosing when clicked.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public InputButtonSettings ButtonCustom2
+        {
+            get { return (_TextBoxDropDown.ButtonCustom2); }
+        }
+
+        #endregion
+
+        #region ButtonDropDown
+
+        /// <summary>
+        /// Gets the object that describes the settings for the button
+        /// that shows drop-down when clicked.
+        /// </summary>
+        [Browsable(true), Category("Buttons")]
+        [Description("Describes the settings for the button that shows drop-down when clicked.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public InputButtonSettings ButtonDropDown
+        {
+            get { return (_TextBoxDropDown.ButtonDropDown); }
+        }
+
+        #endregion
+
+        #region CharacterCasing
+
+        /// <summary>
+        /// Gets or sets whether the TextBox control
+        /// modifies the case of characters as they are typed.
+        /// <value>One of the CharacterCasing enumeration values that specifies
+        /// whether the TextBox control modifies the case of characters.
+        /// The default is CharacterCasing.Normal.</value>
+        /// </summary>
+        [Browsable(true), Category("Behavior"), DefaultValue(0)]
+        [Description("Indicates whether the TextBox control modifies the case of characters as they are typed.")]
+        public CharacterCasing CharacterCasing
+        {
+            get { return (_TextBoxDropDown.CharacterCasing); }
+            set { _TextBoxDropDown.CharacterCasing = value; }
+        }
+
+        #endregion
+
+        #region DisplayControlForCurrentCellOnly
+
+        /// <summary>
+        /// Gets or sets whether the control
+        /// will be displayed for the current cell only.
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Appearance")]
+        [Description("Indicates whether the control will be displayed for the current cell only.")]
+        public bool DisplayControlForCurrentCellOnly
+        {
+            get { return (_DisplayControlForCurrentCellOnly); }
+
+            set
+            {
+                if (_DisplayControlForCurrentCellOnly != value)
+                {
+                    _DisplayControlForCurrentCellOnly = value;
+                    _TextBoxDropDown.Invalidate();
+                }
+            }
+        }
+
+        #endregion
+
+        #region DropDownControl
+
+        /// <summary>
+        /// Gets or sets the reference of the control that will be
+        /// displayed on popup that is shown when the drop-down button is clicked.
+        /// </summary>
+        [DefaultValue(null)]
+        [Description("Indicates reference of the control that will be displayed on popup that is shown when the drop-down button is clicked.")]
+        public Control DropDownControl
+        {
+            get { return (_TextBoxDropDown.DropDownControl); }
+            set { _TextBoxDropDown.DropDownControl = value; }
+        }
+
+        #endregion
+
+        #region Enabled
+
+        /// <summary>
+        /// Gets or sets whether the control can respond to user interaction
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Behavior")]
+        [Description("Indicates whether the control can respond to user interaction.")]
+        public bool Enabled
+        {
+            get { return (_TextBoxDropDown.Enabled); }
+            set { _TextBoxDropDown.Enabled = value; }
+        }
+
+        #endregion
+
+        #region FocusHighlightColor
+
+        /// <summary>
+        /// Gets or sets the color used as background color to highlight
+        /// the text box when it has input focus and FocusHighlight is enabled.
+        /// </summary>
+        [Browsable(true), Category("Appearance")]
+        [Description("Indicates color used as background color to highlight the text box when it has input focus and FocusHighlight is enabled.")]
+        public Color FocusHighlightColor
+        {
+            get { return (_TextBoxDropDown.FocusHighlightColor); }
+            set { _TextBoxDropDown.FocusHighlightColor = value; }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeFocusHighlightColor()
+        {
+            return (_TextBoxDropDown.ShouldSerializeFocusHighlightColor());
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetFocusHighlightColor()
+        {
+            _TextBoxDropDown.ResetFocusHighlightColor();
+        }
+
+        #endregion
+
+        #region FocusHighlightEnabled
+
+        /// <summary>
+        /// Gets or sets whether FocusHighlightColor is used as
+        /// background color to highlight the text box when it has
+        /// input focus. Default value is false.
+        /// </summary>
+        [Browsable(true), DefaultValue(false), Category("Appearance")]
+        [Description("Indicates whether FocusHighlightColor is used as background color to highlight the text box when it has input focus.")]
+        public bool FocusHighlightEnabled
+        {
+            get { return (_TextBoxDropDown.FocusHighlightEnabled); }
+            set { _TextBoxDropDown.FocusHighlightEnabled = value; }
+        }
+
+        #endregion
+
+        #region ForeColor
+
+        /// <summary>
+        /// Gets or sets the foreground color.
+        /// </summary>
+        [Browsable(false)]
+        public Color ForeColor
+        {
+            get { return (_TextBoxDropDown.ForeColor); }
+            set { _TextBoxDropDown.ForeColor = value; }
+        }
+
+        #endregion
+
+        #region HideSelection
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the selected text in
+        /// the text box control remains highlighted when the control loses focus.
+        /// <value>true if the selected text does not appear highlighted when the
+        /// text box control loses focus; false, if the selected text remains
+        /// highlighted when the text box control loses focus. The default is true.</value>
+        /// </summary>
+        [Browsable(true), Category("Behavior"), DefaultValue(true)]
+        [Description("Gets or sets a value indicating whether the selected text in the text box control remains highlighted when the control loses focus.")]
+        public bool HideSelection
+        {
+            get { return (_TextBoxDropDown.HideSelection); }
+            set { _TextBoxDropDown.HideSelection = value; }
+        }
+
+        #endregion
+
+        #region ImeMode
+
+        /// <summary>
+        /// Gets or sets the Input Method Editor (IME) mode of the control.
+        /// </summary>
+        [Browsable(true), DefaultValue(ImeMode.Inherit)]
+        [Description("Indicates the Input Method Editor (IME) mode of the control.")]
+        public ImeMode ImeMode
+        {
+            get { return (_TextBoxDropDown.ImeMode); }
+            set { _TextBoxDropDown.ImeMode = value; }
+        }
+
+        #endregion
+
+        #region MaxLength
+
+        /// <summary>
+        /// Gets or sets the maximum number of characters the user can type or paste into the text box control.
+        /// <value>The number of characters that can be entered into the control. The default is 32767.</value>
+        /// </summary>
+        [Category("Behavior"), DefaultValue(0x7fff), Localizable(true)]
+        [Description("Gets or sets the maximum number of characters the user can type or paste into the text box control.")]
+        public int MaxLength
+        {
+            get { return (_TextBoxDropDown.MaxLength); }
+            set { _TextBoxDropDown.MaxLength = value; }
+        }
+
+        #endregion
+
+        #region PasswordChar
+
+        /// <summary>
+        /// Gets or sets the character to be displayed in substitute for user input.
+        /// </summary>
+        [Browsable(true), DefaultValue(null)]
+        [Description("Indicates the character to be displayed in substitute for user input.")]
+        public char PasswordChar
+        {
+            get { return (_TextBoxDropDown.PasswordChar); }
+            set { _TextBoxDropDown.PasswordChar = value; }
+        }
+
+        #endregion
+
+        #region RightToLeft
+
+        /// <summary>
+        /// Gets or sets a value indicating whether control's
+        /// elements are aligned to support locales using right-to-left fonts.
+        /// </summary>
+        [Browsable(true), DefaultValue(RightToLeft.Inherit)]
+        [Description("Indicates the control's elements are aligned to support locales using right-to-left fonts.")]
+        public RightToLeft RightToLeft
+        {
+            get { return (_TextBoxDropDown.RightToLeft); }
+            set { _TextBoxDropDown.RightToLeft = value; }
+        }
+
+        #endregion
+
+        #region SelectedText
+
+        /// <summary>
+        /// Gets or sets a value indicating the currently selected text in the control.
+        /// <value>A string that represents the currently selected text in the text box.</value>
+        /// </summary>
+        [Browsable(false), Category("Appearance"), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        [Description("Gets or sets a value indicating the currently selected text in the control.")]
+        public virtual string SelectedText
+        {
+            get { return (_TextBoxDropDown.SelectedText); }
+            set { _TextBoxDropDown.SelectedText = value; }
+        }
+
+        #endregion
+
+        #region SelectionLength
+
+        /// <summary>
+        /// Gets or sets the number of characters selected in the text box.
+        /// <value>The number of characters selected in the text box.</value>
+        /// </summary>
+        [Browsable(false), Category("Appearance")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        [Description("Gets or sets the number of characters selected in the text box.")]
+        public int SelectionLength
+        {
+            get { return (_TextBoxDropDown.SelectionLength); }
+            set { _TextBoxDropDown.SelectionLength = value; }
+        }
+
+        #endregion
+
+        #region SelectionStart
+
+        /// <summary>
+        /// Gets or sets the starting point of text selected in the text box.
+        /// <value>The starting position of text selected in the text box.</value>
+        /// </summary>
+        [Browsable(false), Category("Appearance")]
+        [Description("Gets or sets the starting point of text selected in the text box.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public int SelectionStart
+        {
+            get { return (_TextBoxDropDown.SelectionStart); }
+            set { _TextBoxDropDown.SelectionStart = value; }
+        }
+
+        #endregion
+
+        #region Text
+
+        /// <summary>
+        /// Gets or sets the text as it is currently displayed to the user.
+        /// </summary>
+        [Browsable(false)]
+        public string Text
+        {
+            get { return (_TextBoxDropDown.Text); }
+            set { _TextBoxDropDown.Text = value; }
+        }
+
+        #endregion
+
+        #region TextAlign
+
+        /// <summary>
+        /// Gets or sets how text is aligned in a masked text box control.
+        /// </summary>
+        [Browsable(true), DefaultValue(HorizontalAlignment.Left)]
+        [Description("Indicates how text is aligned in a masked text box control.")]
+        public HorizontalAlignment TextAlign
+        {
+            get { return (_TextBoxDropDown.TextAlign); }
+            set { _TextBoxDropDown.TextAlign = value; }
+        }
+
+        #endregion
+
+        #region TextLength
+
+        /// <summary>
+        /// Gets the length of text in the control.
+        /// Returns number of characters contained in the text of the control.
+        /// </summary>
+        [Browsable(false)]
+        public virtual int TextLength
+        {
+            get { return (_TextBoxDropDown.TextLength); }
+        }
+
+        #endregion
+
+        #region UseSystemPasswordChar
+
+        /// <summary>
+        /// Gets or sets a value indicating whether
+        /// the operating system-supplied password character should be used.
+        /// </summary>
+        [Browsable(true), DefaultValue(false)]
+        [Description("Indicates whether the operating system-supplied password character should be used.")]
+        public bool UseSystemPasswordChar
+        {
+            get { return (_TextBoxDropDown.UseSystemPasswordChar); }
+            set { _TextBoxDropDown.UseSystemPasswordChar = value; }
+        }
+
+        #endregion
+
+        #region WatermarkBehavior
+
+        /// <summary>
+        /// Gets or sets the watermark hiding behaviour. Default value
+        /// indicates that watermark is hidden when control receives input focus.
+        /// </summary>
+        [Browsable(true), DefaultValue(eWatermarkBehavior.HideOnFocus), Category("Behavior")]
+        [Description("Indicates watermark hiding behaviour.")]
+        public eWatermarkBehavior WatermarkBehavior
+        {
+            get { return (_TextBoxDropDown.WatermarkBehavior); }
+            set { _TextBoxDropDown.WatermarkBehavior = value; }
+        }
+
+        #endregion
+
+        #region WatermarkColor
+
+        /// <summary>
+        /// Gets or sets the watermark text color.
+        /// </summary>
+        [Browsable(true), Category("Appearance")]
+        [Description("Indicates watermark text color.")]
+        public Color WatermarkColor
+        {
+            get { return (_TextBoxDropDown.WatermarkColor); }
+            set { _TextBoxDropDown.WatermarkColor = value; }
+        }
+        /// <summary>
+        /// Indicates whether property should be serialized by Windows Forms designer.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeWatermarkColor()
+        {
+            return (_TextBoxDropDown.ShouldSerializeWatermarkColor());
+        }
+        /// <summary>
+        /// Resets the property to default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetWatermarkColor()
+        {
+            _TextBoxDropDown.ResetWatermarkColor();
+        }
+
+        #endregion
+
+        #region WatermarkEnabled
+
+        /// <summary>
+        /// Gets or sets whether watermark text is
+        /// displayed when control is empty. Default value is true.
+        /// </summary>
+        [Browsable(true), DefaultValue(true)]
+        [Description("Indicates whether watermark text is displayed when control is empty.")]
+        public virtual bool WatermarkEnabled
+        {
+            get { return (_TextBoxDropDown.WatermarkEnabled); }
+            set { _TextBoxDropDown.WatermarkEnabled = value; }
+        }
+
+        #endregion
+
+        #region WatermarkFont
+
+        /// <summary>
+        /// Gets or sets the watermark font.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), DefaultValue(null)]
+        [Description("Indicates watermark font.")]
+        public Font WatermarkFont
+        {
+            get { return (_TextBoxDropDown.WatermarkFont); }
+            set { _TextBoxDropDown.WatermarkFont = value; }
+        }
+
+        #endregion
+
+        #region WatermarkText
+
+        /// <summary>
+        /// Gets or sets the watermark (tip) text displayed inside of
+        /// the control when Text is not set and control does not have
+        /// input focus. This property supports text-markup.
+        /// </summary>
+        [Browsable(true), DefaultValue(""), Localizable(true), Category("Appearance")]
+        [Description("Indicates watermark text displayed inside of the control when Text is not set and control does not have input focus.")]
+        [Editor("DevComponents.DotNetBar.Design.TextMarkupUIEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(UITypeEditor))]
+        public string WatermarkText
+        {
+            get { return (_TextBoxDropDown.WatermarkText); }
+            set { _TextBoxDropDown.WatermarkText = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Method forwarding
+
+        #region AppendText
+
+        /// <summary>
+        /// Appends text to the current text of a text box.
+        /// </summary>
+        /// <param name="text">The text to append to the current contents of the text box. </param>
+        public void AppendText(string text)
+        {
+            _TextBoxDropDown.AppendText(text);
+        }
+
+        #endregion
+
+        #region Clear
+
+        /// <summary>
+        /// Clears all text from the text box control.
+        /// </summary>
+        public void Clear()
+        {
+            _TextBoxDropDown.Clear();
+        }
+
+        #endregion
+
+        #region ClearUndo
+
+        /// <summary>
+        /// Clears information about the most recent operation from the undo buffer of the text box.
+        /// </summary>
+        public void ClearUndo()
+        {
+            _TextBoxDropDown.ClearUndo();
+        }
+
+        #endregion
+
+        #region Copy
+
+        /// <summary>
+        /// Copies the current selection in the text box to the Clipboard.
+        /// </summary>
+        [UIPermission(SecurityAction.Demand, Clipboard = UIPermissionClipboard.OwnClipboard)]
+        public void Copy()
+        {
+            _TextBoxDropDown.Copy();
+        }
+
+        #endregion
+
+        #region Cut
+
+        /// <summary>
+        /// Moves the current selection in the text box to the Clipboard.
+        /// </summary>
+        public void Cut()
+        {
+            _TextBoxDropDown.Cut();
+        }
+
+        #endregion
+
+        #region DeselectAll
+
+        /// <summary>
+        /// Specifies that the value of the SelectionLength
+        /// property is zero so that no characters are selected in the control.
+        /// </summary>
+        public void DeselectAll()
+        {
+            _TextBoxDropDown.DeselectAll();
+        }
+
+        #endregion
+
+        #region GetCharFromPosition
+
+        /// <summary>
+        /// Retrieves the character that is closest to the specified location within the control.
+        /// </summary>
+        /// <param name="pt">The location from which to seek the nearest character. </param>
+        /// <returns>The character at the specified location.</returns>
+        public char GetCharFromPosition(Point pt)
+        {
+            return (_TextBoxDropDown.GetCharFromPosition(pt));
+        }
+
+        #endregion
+
+        #region GetCharIndexFromPosition
+
+        /// <summary>
+        /// Retrieves the index of the character nearest to the specified location.
+        /// </summary>
+        /// <param name="pt">The location to search.</param>
+        /// <returns>The zero-based character index at the specified location.</returns>
+        public int GetCharIndexFromPosition(Point pt)
+        {
+            return (_TextBoxDropDown.GetCharIndexFromPosition(pt));
+        }
+
+        #endregion
+
+        #region GetFirstCharIndexFromLine
+
+        /// <summary>
+        /// Retrieves the index of the first character of a given line.
+        /// </summary>
+        /// <param name="lineNumber">The line for which to get the index of its first character. </param>
+        /// <returns>The zero-based character index in the specified line.</returns>
+        public int GetFirstCharIndexFromLine(int lineNumber)
+        {
+            return (_TextBoxDropDown.GetFirstCharIndexFromLine(lineNumber));
+        }
+
+        #endregion
+
+        #region GetFirstCharIndexOfCurrentLine
+
+        /// <summary>
+        /// Retrieves the index of the first character of the current line.
+        /// </summary>
+        /// <returns>The zero-based character index in the current line.</returns>
+        public int GetFirstCharIndexOfCurrentLine()
+        {
+            return (_TextBoxDropDown.GetFirstCharIndexOfCurrentLine());
+        }
+
+        #endregion
+
+        #region GetLineFromCharIndex
+
+        /// <summary>
+        /// Retrieves the line number from the specified character position within the text of the control.
+        /// </summary>
+        /// <param name="index">The character index position to search. </param>
+        /// <returns>The zero-based line number in which the character index is located.</returns>
+        public int GetLineFromCharIndex(int index)
+        {
+            return (_TextBoxDropDown.GetLineFromCharIndex(index));
+        }
+
+        /// <summary>
+        /// Retrieves the location within the control at the specified character index.
+        /// </summary>
+        /// <param name="index">The index of the character for which to retrieve the location. </param>
+        /// <returns>The location of the specified character.</returns>
+        public virtual Point GetPositionFromCharIndex(int index)
+        {
+            return _TextBoxDropDown.GetPositionFromCharIndex(index);
+        }
+
+        /// <summary>
+        /// Replaces the current selection in the text box with the contents of the Clipboard.
+        /// </summary>
+        [UIPermission(SecurityAction.Demand, Clipboard = UIPermissionClipboard.OwnClipboard)]
+        public void Paste()
+        {
+            _TextBoxDropDown.Paste();
+        }
+
+        /// <summary>
+        /// Selects a range of text in the text box.
+        /// </summary>
+        /// <param name="start">The position of the first character in the current text selection within the text box. </param>
+        /// <param name="length">The number of characters to select. </param>
+        public void Select(int start, int length)
+        {
+            _TextBoxDropDown.Select(start, length);
+        }
+
+        /// <summary>
+        /// Selects all text in the text box.
+        /// </summary>
+        public void SelectAll()
+        {
+            _TextBoxDropDown.SelectAll();
+        }
+
+        /// <summary>
+        /// Undoes the last edit operation in the text box.
+        /// </summary>
+        public void Undo()
+        {
+            _TextBoxDropDown.Undo();
+        }
+
+        /// <summary>
+        /// Replaces the specified selection in the TextBox with the contents of the Clipboard.
+        /// </summary>
+        /// <param name="text">The text to replace.</param>
+        public void Paste(string text)
+        {
+            _TextBoxDropDown.Paste(text);
+        }
+        #endregion
+
+        #endregion
+
+        #region Event processing
+
+        #region DoButtonClearClick
+
+        /// <summary>
+        /// DoButtonClearClick
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        internal void DoButtonClearClick(object sender, CancelEventArgs e)
+        {
+            if (ButtonClearClick != null)
+                ButtonClearClick(this, e);
+        }
+
+        #endregion
+
+        #region DoButtonCustomClick
+
+        /// <summary>
+        /// DoButtonCustomClick
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        internal void DoButtonCustomClick(object sender, EventArgs e)
+        {
+            if (ButtonCustomClick != null)
+                ButtonCustomClick(this, e);
+        }
+
+        #endregion
+
+        #region DoButtonCustom2Click
+
+        /// <summary>
+        /// DoButtonCustom2Click
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        internal void DoButtonCustom2Click(object sender, EventArgs e)
+        {
+            if (ButtonCustom2Click != null)
+                ButtonCustom2Click(this, e);
+        }
+
+        #endregion
+
+        #region DoButtonDropDownClick
+
+        /// <summary>
+        /// DoButtonDropDownClick
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        internal void DoButtonDropDownClick(object sender, CancelEventArgs e)
+        {
+            if (ButtonDropDownClick != null)
+                ButtonDropDownClick(this, e);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetCellBitmap
+
+        /// <summary>
+        /// Gets the cell paint bitmap
+        /// </summary>
+        /// <param name="cellBounds"></param>
+        /// <returns></returns>
+        internal Bitmap GetCellBitmap(Rectangle cellBounds)
+        {
+            if (_CellBitmap == null ||
+                (_CellBitmap.Width != cellBounds.Width || _CellBitmap.Height < cellBounds.Height))
+            {
+                if (_CellBitmap != null)
+                    _CellBitmap.Dispose();
+
+                _CellBitmap = new Bitmap(cellBounds.Width, cellBounds.Height);
+            }
+
+            return (_CellBitmap);
+        }
+
+        #endregion
+
+        #region OnBeforeCellPaint
+
+        /// <summary>
+        /// Invokes BeforeCellPaint user events
+        /// </summary>
+        /// <param name="rowIndex">Row index</param>
+        /// <param name="columnIndex">Column index</param>
+        internal void OnBeforeCellPaint(int rowIndex, int columnIndex)
+        {
+            if (BeforeCellPaint != null)
+                BeforeCellPaint(this, new BeforeCellPaintEventArgs(rowIndex, columnIndex));
+        }
+
+        #endregion
+
+        #region ICloneable members
+
+        /// <summary>
+        /// Clones the ButtonX Column
+        /// </summary>
+        /// <returns></returns>
+        public override object Clone()
+        {
+            DataGridViewTextBoxDropDownColumn dc = base.Clone() as DataGridViewTextBoxDropDownColumn;
+
+            if (dc != null)
+            {
+                dc.AutoCompleteCustomSource = AutoCompleteCustomSource;
+                dc.AutoCompleteMode = AutoCompleteMode;
+                dc.AutoCompleteSource = AutoCompleteSource;
+                dc.BackColor = BackColor;
+                dc.CharacterCasing = CharacterCasing;
+                dc.DropDownControl = DropDownControl;
+                dc.Enabled = Enabled;
+                dc.FocusHighlightColor = FocusHighlightColor;
+                dc.FocusHighlightEnabled = FocusHighlightEnabled;
+                dc.ForeColor = ForeColor;
+                dc.HideSelection = HideSelection;
+                dc.ImeMode = ImeMode;
+                dc.MaxLength = MaxLength;
+                dc.PasswordChar = PasswordChar;
+                dc.RightToLeft = RightToLeft;
+                dc.TextAlign = TextAlign;
+                dc.UseSystemPasswordChar = UseSystemPasswordChar;
+                dc.WatermarkBehavior = WatermarkBehavior;
+                dc.WatermarkColor = WatermarkColor;
+                dc.WatermarkEnabled = WatermarkEnabled;
+                dc.WatermarkFont = WatermarkFont;
+                dc.WatermarkText = WatermarkText;
+
+                dc.DisplayControlForCurrentCellOnly = DisplayControlForCurrentCellOnly;
+
+                dc.BackgroundStyle.ApplyStyle(TextBoxDropDown.BackgroundStyle);
+                dc.BackgroundStyle.Class = TextBoxDropDown.BackgroundStyle.Class;
+
+                TextBoxDropDown.ButtonClear.CopyToItem(dc.TextBoxDropDown.ButtonClear);
+                TextBoxDropDown.ButtonDropDown.CopyToItem(dc.TextBoxDropDown.ButtonDropDown);
+                TextBoxDropDown.ButtonCustom.CopyToItem(dc.TextBoxDropDown.ButtonCustom);
+                TextBoxDropDown.ButtonCustom2.CopyToItem(dc.TextBoxDropDown.ButtonCustom2);
+            }
+
+            return (dc);
+        }
+
+        #endregion
+
+        #region Dispose
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        /// <param name="disposing"></param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing == true)
+                _TextBoxDropDown.Dispose();
+
+            if (_CellBitmap != null)
+            {
+                _CellBitmap.Dispose();
+                _CellBitmap = null;
+            }
+
+            base.Dispose(disposing);
+        }
+
+        #endregion
+
+        #region IDataGridViewColumn Members
+
+        /// <summary>
+        /// Gets the Cell paint setting for the control
+        /// </summary>
+        [Browsable(false)]
+        public bool OwnerPaintCell
+        {
+            get { return (true); }
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewTextBoxDropDown/DataGridViewTextBoxDropDownEditingControl.cs b/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewTextBoxDropDown/DataGridViewTextBoxDropDownEditingControl.cs
new file mode 100644
index 00000000..3b0bab39
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/DataGridViewX/DataGridViewTextBoxDropDown/DataGridViewTextBoxDropDownEditingControl.cs	
@@ -0,0 +1,185 @@
+using System;
+using System.ComponentModel;
+using System.Runtime.InteropServices;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    [ToolboxItem(false), ComVisible(false)]
+    public class DataGridViewTextBoxDropDownEditingControl : TextBoxDropDown, IDataGridViewEditingControl
+    {
+        #region Private variables
+
+        private DataGridView _DataGridView;
+
+        private int _RowIndex;
+        private bool _ValueChanged;
+
+        #endregion
+
+        #region OnTextChanged
+
+        /// <summary>
+        /// Handles OnTextChanged events
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnTextChanged(EventArgs e)
+        {
+            _ValueChanged = true;
+
+            _DataGridView.NotifyCurrentCellDirty(true);
+
+            base.OnTextChanged(e);
+        }
+
+        #endregion
+
+        #region IDataGridViewEditingControl Members
+
+        #region Public properties
+
+        #region EditingControlDataGridView
+
+        /// <summary>
+        /// Gets or sets the DataGridView
+        /// </summary>
+        public DataGridView EditingControlDataGridView
+        {
+            get { return (_DataGridView); }
+            set { _DataGridView = value; }
+        }
+
+        #endregion
+
+        #region EditingControlFormattedValue
+
+        /// <summary>
+        /// Gets or sets the Control Formatted Value
+        /// </summary>
+        public object EditingControlFormattedValue
+        {
+            get { return (Text); }
+            set { Text = (string)value; }
+        }
+
+        #endregion
+
+        #region EditingControlRowIndex
+
+        /// <summary>
+        /// Gets or sets the Control RoeIndex
+        /// </summary>
+        public int EditingControlRowIndex
+        {
+            get { return (_RowIndex); }
+            set { _RowIndex = value; }
+        }
+
+        #endregion
+
+        #region EditingControlValueChanged
+
+        /// <summary>
+        /// Gets or sets the Control ValueChanged state
+        /// </summary>
+        public bool EditingControlValueChanged
+        {
+            get { return (_ValueChanged); }
+            set { _ValueChanged = value; }
+        }
+
+        #endregion
+
+        #region EditingPanelCursor
+
+        /// <summary>
+        /// Gets the Panel Cursor
+        /// </summary>
+        public Cursor EditingPanelCursor
+        {
+            get { return (base.Cursor); }
+        }
+
+        #endregion
+
+        #region RepositionEditingControlOnValueChange
+
+        /// <summary>
+        /// Gets whether to RepositionEditingControlOnValueChange
+        /// </summary>
+        public bool RepositionEditingControlOnValueChange
+        {
+            get { return (false); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ApplyCellStyleToEditingControl
+
+        /// <summary>
+        /// ApplyCellStyleToEditingControl
+        /// </summary>
+        /// <param name="dataGridViewCellStyle"></param>
+        public void ApplyCellStyleToEditingControl(DataGridViewCellStyle dataGridViewCellStyle)
+        {
+            Font = dataGridViewCellStyle.Font;
+
+            ForeColor = dataGridViewCellStyle.ForeColor;
+            BackColor = dataGridViewCellStyle.BackColor;
+        }
+
+        #endregion
+
+        #region GetEditingControlFormattedValue
+
+        /// <summary>
+        /// Gets EditingControlFormattedValue
+        /// </summary>
+        /// <param name="context"></param>
+        /// <returns></returns>
+        public object GetEditingControlFormattedValue(DataGridViewDataErrorContexts context)
+        {
+            return (EditingControlFormattedValue);
+        }
+
+        #endregion
+
+        #region EditingControlWantsInputKey
+
+        /// <summary>
+        /// Gets whether the given key wants to be processed
+        /// by the Control
+        /// </summary>
+        /// <param name="keyData"></param>
+        /// <param name="dataGridViewWantsInputKey"></param>
+        /// <returns></returns>
+        public bool EditingControlWantsInputKey(Keys keyData, bool dataGridViewWantsInputKey)
+        {
+            if ((keyData & Keys.Right) == Keys.Right)
+                return (true);
+
+            if ((keyData & Keys.Left) == Keys.Left)
+                return (true);
+
+            return (dataGridViewWantsInputKey == false);
+        }
+
+        #endregion
+
+        #region PrepareEditingControlForEdit
+
+        /// <summary>
+        /// PrepareEditingControlForEdit
+        /// </summary>
+        /// <param name="selectAll"></param>
+        public void PrepareEditingControlForEdit(bool selectAll)
+        {
+        }
+
+        #endregion
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/DataGridViewX/IDataGridViewColumn.cs b/PROMS/DotNetBar Source Code/Controls/DataGridViewX/IDataGridViewColumn.cs
new file mode 100644
index 00000000..8414b50e
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/DataGridViewX/IDataGridViewColumn.cs	
@@ -0,0 +1,14 @@
+namespace DevComponents.DotNetBar.Controls
+{
+    internal interface IDataGridViewColumn
+    {
+        /// <summary>
+        /// Gets whether the Column cells will fully paint
+        /// their cell background and content
+        /// </summary>
+        bool OwnerPaintCell
+        {
+            get;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/DesktopAlert/DesktopAlert.cs b/PROMS/DotNetBar Source Code/Controls/DesktopAlert/DesktopAlert.cs
new file mode 100644
index 00000000..0bdc9a82
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/DesktopAlert/DesktopAlert.cs	
@@ -0,0 +1,511 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    /// <summary>
+    /// Displays the desktop alerts with optional image or symbol. Text on alerts supports text-markup.
+    /// </summary>
+    public static class DesktopAlert
+    {
+        /// <summary>
+        /// Shows desktop alert. 
+        /// </summary>
+        /// <param name="text">Text to show on the alert. Text supports text-markup.</param>
+        public static void Show(string text)
+        {
+            Show(text, _AlertColor, _AlertPosition, null);
+        }
+
+        /// <summary>
+        /// Shows desktop alert. 
+        /// </summary>
+        /// <param name="text">Text to show on the alert. Text supports text-markup.</param>
+        /// <param name="referenceControl">Specifies reference control which is used to find target screen alert is displayed on.</param>
+        public static void Show(string text, Control referenceControl)
+        {
+            Show(text, _AlertColor, _AlertPosition, null, referenceControl);
+        }
+
+        /// <summary>
+        /// Shows desktop alert.
+        /// </summary>
+        /// <param name="text">Text to show on the alert. Text supports text-markup.</param>
+        /// <param name="markupLinkClickHandler">Text-markup link click event handler.</param>
+        public static void Show(string text, MarkupLinkClickEventHandler markupLinkClickHandler)
+        {
+            Show(text, _AlertColor, _AlertPosition, markupLinkClickHandler);
+        }
+
+        /// <summary>
+        /// Shows desktop alert.
+        /// </summary>
+        /// <param name="text">Text to show on the alert. Text supports text-markup.</param>
+        /// <param name="alertColor">Specifies alert color.</param>
+        public static void Show(string text, eDesktopAlertColor alertColor)
+        {
+            Show(text, alertColor, _AlertPosition, null);
+        }
+
+        /// <summary>
+        /// Shows desktop alert.
+        /// </summary>
+        /// <param name="text">Text to show on the alert. Text supports text-markup.</param>
+        /// <param name="alertColor">Specifies alert color.</param>
+        /// <param name="referenceControl">Specifies reference control which is used to find target screen alert is displayed on.</param>
+        public static void Show(string text, eDesktopAlertColor alertColor, Control referenceControl)
+        {
+            Show(text, alertColor, _AlertPosition, null, referenceControl);
+        }
+
+        /// <summary>
+        /// Shows desktop alert at specific screen position.
+        /// </summary>
+        /// <param name="text">Text to show on the alert. Text supports text-markup.</param>
+        /// <param name="position">Alert position on the screen.</param>
+        public static void Show(string text, eAlertPosition position)
+        {
+            Show(text, _AlertColor, position, null);
+        }
+
+        /// <summary>
+        /// Shows desktop alert at specific screen position.
+        /// </summary>
+        /// <param name="text">Text to show on the alert. Text supports text-markup.</param>
+        /// <param name="position">Alert position on the screen.</param>
+        /// <param name="referenceControl">Specifies reference control which is used to find target screen alert is displayed on.</param>
+        public static void Show(string text, eAlertPosition position, Control referenceControl)
+        {
+            Show(text, _AlertColor, position, null, referenceControl);
+        }
+
+        /// <summary>
+        /// Shows desktop alert at specific screen position.
+        /// </summary>
+        /// <param name="text">Text to show on the alert. Text supports text-markup.</param>
+        /// <param name="image">Image to display on alert.</param>
+        public static void Show(string text, Image image)
+        {
+            Show(text, image, _AlertColor, _AlertPosition, _AutoCloseTimeOut, 0, null);
+        }
+
+        /// <summary>
+        /// Shows desktop alert.
+        /// </summary>
+        /// <param name="text">Text to show on the alert. Text supports text-markup.</param>
+        /// <param name="alertColor">Alert color.</param>
+        /// <param name="position">Alert position on the screen.</param>
+        public static void Show(string text, eDesktopAlertColor alertColor, eAlertPosition position)
+        {
+            Show(text, alertColor, position, null);
+        }
+
+        /// <summary>
+        /// Shows desktop alert.
+        /// </summary>
+        /// <param name="text">Text to show on the alert. Text supports text-markup.</param>
+        /// <param name="alertColor">Alert color</param>
+        /// <param name="position">Alert position on the screen</param>
+        /// <param name="markupLinkClickHandler">Text-markup link click event handler.</param>
+        /// <param name="referenceControl">Specifies reference control which is used to find target screen alert is displayed on.</param>
+        public static void Show(string text, eDesktopAlertColor alertColor, eAlertPosition position, MarkupLinkClickEventHandler markupLinkClickHandler, Control referenceControl)
+        {
+            DesktopAlertWindow alert = new DesktopAlertWindow();
+            alert.Text = text;
+            alert.MaximumSize = Dpi.Size(_MaximumAlertSize);
+            alert.AlertPosition = position;
+            alert.AutoCloseTimeOut = _AutoCloseTimeOut;
+            alert.TextMarkupEnabled = _TextMarkupEnabled;
+            if (markupLinkClickHandler != null)
+                alert.MarkupLinkClick += markupLinkClickHandler;
+            alert.AlertAnimationDuration = _AlertAnimationDuration;
+            alert.PlaySound = _PlaySound;
+            alert.ReferenceControl = referenceControl;
+            SetColors(alert, alertColor);
+            alert.Show();
+        }
+
+        /// <summary>
+        /// Shows desktop alert.
+        /// </summary>
+        /// <param name="text">Text to show on the alert. Text supports text-markup.</param>
+        /// <param name="alertColor">Alert color</param>
+        /// <param name="position">Alert position on the screen</param>
+        /// <param name="markupLinkClickHandler">Text-markup link click event handler.</param>
+        public static void Show(string text, eDesktopAlertColor alertColor, eAlertPosition position, MarkupLinkClickEventHandler markupLinkClickHandler)
+        {
+            Show(text, alertColor, position, markupLinkClickHandler, null);
+        }
+
+        /// <summary>
+        /// Shows desktop alert.
+        /// </summary>
+        /// <param name="text">Text to show on the alert. Text supports text-markup.</param>
+        /// <param name="alertId">Alert ID used to recognize alert if clicked and specified Action is called</param>
+        /// <param name="alertClickAction">Action method to call if alert is clicked.</param>
+        public static void Show(string text, long alertId, Action<long> alertClickAction)
+        {
+            Show(text, null, _AlertColor, _AlertPosition, _AutoCloseTimeOut, alertId, alertClickAction);
+        }
+
+        /// <summary>
+        /// Shows desktop alert.
+        /// </summary>
+        /// <param name="text">Text to show on the alert. Text supports text-markup.</param>
+        /// <param name="alertColor">Alert color</param>
+        /// <param name="alertId">Alert ID used to recognize alert if clicked and specified Action is called</param>
+        /// <param name="alertClickAction">Action method to call if alert is clicked.</param>
+        public static void Show(string text, eDesktopAlertColor alertColor, long alertId, Action<long> alertClickAction)
+        {
+            Show(text, null, alertColor, _AlertPosition, _AutoCloseTimeOut, alertId, alertClickAction);
+        }
+
+        /// <summary>
+        /// Shows desktop alert.
+        /// </summary>
+        /// <param name="text">Text to show on the alert. Text supports text-markup.</param>
+        /// <param name="symbol">Symbol to show on the alert, see http://www.devcomponents.com/kb2/?p=1347 </param>
+        /// <param name="symbolSet">Symbol set to use</param>
+        /// <param name="symbolColor">Symbol color or Color.Empty to use default text color</param>
+        /// <param name="alertColor">Alert color</param>
+        /// <param name="position">Alert position on the screen</param>
+        /// <param name="alertDurationSeconds">Duration of alert in the seconds.</param>
+        /// <param name="alertId">Alert ID used to recognize alert if clicked and specified Action is called</param>
+        /// <param name="alertClickAction">Action method to call if alert is clicked.</param>
+        public static void Show(string text, string symbol, eSymbolSet symbolSet, Color symbolColor, eDesktopAlertColor alertColor, eAlertPosition position,
+            int alertDurationSeconds, long alertId, Action<long> alertClickAction)
+        {
+            Show(text, symbol, symbolSet, symbolColor, alertColor,position, alertDurationSeconds, alertId, alertClickAction, null);
+        }
+
+        /// <summary>
+        /// Shows desktop alert.
+        /// </summary>
+        /// <param name="text">Text to show on the alert. Text supports text-markup.</param>
+        /// <param name="symbol">Symbol to show on the alert, see http://www.devcomponents.com/kb2/?p=1347 </param>
+        /// <param name="symbolSet">Symbol set to use</param>
+        /// <param name="symbolColor">Symbol color or Color.Empty to use default text color</param>
+        /// <param name="position">Alert position on the screen</param>
+        /// <param name="alertColor">Alert color</param>
+        /// <param name="alertDurationSeconds">Duration of alert in the seconds.</param>
+        /// <param name="alertId">Alert ID used to recognize alert if clicked and specified Action is called</param>
+        /// <param name="alertClickAction">Action method to call if alert is clicked.</param>
+        /// <param name="markupLinkClickHandler">Text-markup link click event handler.</param>
+        public static void Show(string text, string symbol, eSymbolSet symbolSet, Color symbolColor, eDesktopAlertColor alertColor, eAlertPosition position,
+            int alertDurationSeconds, long alertId, Action<long> alertClickAction, MarkupLinkClickEventHandler markupLinkClickHandler)
+        {
+            Show(text, symbol, symbolSet, symbolColor, alertColor, position, alertDurationSeconds, alertId, alertClickAction, markupLinkClickHandler, null);
+        }
+
+        /// <summary>
+        /// Shows desktop alert.
+        /// </summary>
+        /// <param name="text">Text to show on the alert. Text supports text-markup.</param>
+        /// <param name="symbol">Symbol to show on the alert, see http://www.devcomponents.com/kb2/?p=1347 </param>
+        /// <param name="symbolSet">Symbol set to use</param>
+        /// <param name="symbolColor">Symbol color or Color.Empty to use default text color</param>
+        /// <param name="position">Alert position on the screen</param>
+        /// <param name="alertColor">Alert color</param>
+        /// <param name="alertDurationSeconds">Duration of alert in the seconds.</param>
+        /// <param name="alertId">Alert ID used to recognize alert if clicked and specified Action is called</param>
+        /// <param name="alertClickAction">Action method to call if alert is clicked.</param>
+        /// <param name="markupLinkClickHandler">Text-markup link click event handler.</param>
+        /// <param name="referenceControl">Specifies reference control which is used to find target screen alert is displayed on.</param>
+        public static void Show(string text, string symbol, eSymbolSet symbolSet, Color symbolColor, eDesktopAlertColor alertColor, eAlertPosition position,
+            int alertDurationSeconds, long alertId, Action<long> alertClickAction, MarkupLinkClickEventHandler markupLinkClickHandler, Control referenceControl)
+        {
+            DesktopAlertWindow alert = new DesktopAlertWindow();
+            alert.Text = text;
+            alert.MaximumSize = Dpi.Size(_MaximumAlertSize);
+            alert.AlertPosition = position;
+            alert.Symbol = symbol;
+            alert.SymbolSet = symbolSet;
+            alert.SymbolColor = symbolColor;
+            alert.AlertId = alertId;
+            alert.ClickAction = alertClickAction;
+            alert.AutoCloseTimeOut = alertDurationSeconds;
+            alert.TextMarkupEnabled = _TextMarkupEnabled;
+            if (markupLinkClickHandler != null)
+                alert.MarkupLinkClick += markupLinkClickHandler;
+            alert.AlertAnimationDuration = _AlertAnimationDuration;
+            alert.PlaySound = _PlaySound;
+            alert.ReferenceControl = referenceControl;
+            SetColors(alert, alertColor);
+            alert.Show();
+        }
+
+        /// <summary>
+        /// Shows desktop alert.
+        /// </summary>
+        /// <param name="text">Text to show on the alert. Text supports text-markup.</param>
+        /// <param name="image">Image to display on the alert</param>
+        /// <param name="position">Alert screen position</param>
+        /// <param name="alertColor">Alert color</param>
+        /// <param name="alertDurationSeconds">Duration of alert in seconds</param>
+        /// <param name="alertId">Alert ID used to recognize alert if clicked and specified Action is called</param>
+        /// <param name="alertClickAction">Action method to call if alert is clicked.</param>
+        public static void Show(string text, Image image, eDesktopAlertColor alertColor, eAlertPosition position,
+            int alertDurationSeconds, long alertId, Action<long> alertClickAction)
+        {
+            Show(text, image, alertColor, position, alertDurationSeconds, alertId, alertClickAction, null);
+        }
+
+        /// <summary>
+        /// Shows desktop alert.
+        /// </summary>
+        /// <param name="text">Text to show on the alert. Text supports text-markup.</param>
+        /// <param name="image">Image to display on the alert</param>
+        /// <param name="position">Alert screen position</param>
+        /// <param name="alertColor">Alert color</param>
+        /// <param name="alertDurationSeconds">Duration of alert in seconds</param>
+        /// <param name="alertId">Alert ID used to recognize alert if clicked and specified Action is called</param>
+        /// <param name="alertClickAction">Action method to call if alert is clicked.</param>
+        /// <param name="markupLinkClickHandler">Text-markup link click event handler.</param>
+        public static void Show(string text, Image image, eDesktopAlertColor alertColor, eAlertPosition position,
+            int alertDurationSeconds, long alertId, Action<long> alertClickAction, MarkupLinkClickEventHandler markupLinkClickHandler)
+        {
+            Show(text, image, alertColor, position, alertDurationSeconds, alertId, alertClickAction, markupLinkClickHandler, null);
+        }
+
+        /// <summary>
+        /// Shows desktop alert.
+        /// </summary>
+        /// <param name="text">Text to show on the alert. Text supports text-markup.</param>
+        /// <param name="image">Image to display on the alert</param>
+        /// <param name="position">Alert screen position</param>
+        /// <param name="alertColor">Alert color</param>
+        /// <param name="alertDurationSeconds">Duration of alert in seconds</param>
+        /// <param name="alertId">Alert ID used to recognize alert if clicked and specified Action is called</param>
+        /// <param name="alertClickAction">Action method to call if alert is clicked.</param>
+        /// <param name="markupLinkClickHandler">Text-markup link click event handler.</param>
+        /// <param name="referenceControl">Specifies reference control which is used to find target screen alert is displayed on.</param>
+        public static void Show(string text, Image image, eDesktopAlertColor alertColor, eAlertPosition position,
+            int alertDurationSeconds, long alertId, Action<long> alertClickAction, MarkupLinkClickEventHandler markupLinkClickHandler, Control referenceControl)
+        {
+            DesktopAlertWindow alert = new DesktopAlertWindow();
+            alert.Text = text;
+            alert.MaximumSize = Dpi.Size(_MaximumAlertSize);
+            alert.AlertPosition = position;
+            alert.Image = image;
+            alert.AlertId = alertId;
+            alert.ClickAction = alertClickAction;
+            alert.AutoCloseTimeOut = alertDurationSeconds;
+            alert.TextMarkupEnabled = _TextMarkupEnabled;
+            if (markupLinkClickHandler != null)
+                alert.MarkupLinkClick += markupLinkClickHandler;
+            alert.AlertAnimationDuration = _AlertAnimationDuration;
+            alert.PlaySound = _PlaySound;
+            alert.ReferenceControl = referenceControl;
+            SetColors(alert, alertColor);
+            alert.Show();
+        }
+
+        private static void SetColors(DesktopAlertWindow w, eDesktopAlertColor c)
+        {
+            if (c == eDesktopAlertColor.Default)
+            {
+                w.BackColor = ColorScheme.GetColor(0x0078D7);
+                w.ForeColor = Color.White;
+            }
+            else if (c == eDesktopAlertColor.Black)
+            {
+                w.BackColor = Color.Black;
+                w.ForeColor = Color.White;
+            }
+            else if (c == eDesktopAlertColor.Blue)
+            {
+                w.BackColor = ColorScheme.GetColor(0x5B9BD5);
+                w.ForeColor = Color.White;
+            }
+            else if (c == eDesktopAlertColor.BlueGray)
+            {
+                w.BackColor = ColorScheme.GetColor(0x44546A);
+                w.ForeColor = Color.White;
+            }
+            else if (c == eDesktopAlertColor.DarkBlue)
+            {
+                w.BackColor = ColorScheme.GetColor(0x4472C4);
+                w.ForeColor = Color.White;
+            }
+            else if (c == eDesktopAlertColor.DarkRed)
+            {
+                w.BackColor = ColorScheme.GetColor(0xC00000);
+                w.ForeColor = Color.White;
+            }
+            else if (c == eDesktopAlertColor.Gold)
+            {
+                w.BackColor = ColorScheme.GetColor(0xFFC000);
+                w.ForeColor = Color.Black;
+            }
+            else if (c == eDesktopAlertColor.Gray)
+            {
+                w.BackColor = ColorScheme.GetColor(0xE7E6E6);
+                w.ForeColor = Color.Black;
+            }
+            else if (c == eDesktopAlertColor.Green)
+            {
+                w.BackColor = ColorScheme.GetColor(0x375623);
+                w.ForeColor = Color.White;
+            }
+            else if (c == eDesktopAlertColor.Orange)
+            {
+                w.BackColor = ColorScheme.GetColor(0xCA5010);
+                w.ForeColor = Color.White;
+            }
+            else if (c == eDesktopAlertColor.Red)
+            {
+                w.BackColor = ColorScheme.GetColor(0xE81123);
+                w.ForeColor = Color.White;
+            }
+        }
+
+        private static Size _MaximumAlertSize = new Size(400, 128);
+        /// <summary>
+        /// Indicates maximum alert size.
+        /// </summary>
+        public static Size MaximumAlertSize
+        {
+            get { return _MaximumAlertSize; }
+            set { _MaximumAlertSize = value; }
+        }
+
+        private static eAlertPosition _AlertPosition = eAlertPosition.BottomRight;
+        /// <summary>
+        /// Specifies default alert screen position.
+        /// </summary>
+        public static eAlertPosition AlertPosition
+        {
+            get { return _AlertPosition; }
+            set { _AlertPosition = value; }
+        }
+
+        private static eDesktopAlertColor _AlertColor = eDesktopAlertColor.Default;
+        /// <summary>
+        /// Specifies default alert color.
+        /// </summary>
+        public static eDesktopAlertColor AlertColor
+        {
+            get { return _AlertColor; }
+            set { _AlertColor = value; }
+        }
+
+        private static int _AlertAnimationDuration = 200;
+        /// <summary>
+        /// Gets or sets the total time in milliseconds alert animation takes.
+        /// Default value is 200.
+        /// </summary>
+        public static int AlertAnimationDuration
+        {
+            get { return _AlertAnimationDuration; }
+            set { _AlertAnimationDuration = value; }
+        }
+
+        private static int _AutoCloseTimeOut = 6;
+        /// <summary>
+        /// Gets or sets time period in seconds after alert closes automatically.
+        /// </summary>
+        public static int AutoCloseTimeOut
+        {
+            get { return _AutoCloseTimeOut; }
+            set { _AutoCloseTimeOut = value; }
+        }
+
+        private static bool _TextMarkupEnabled = true;
+        /// <summary>
+        /// Gets or sets whether text-markup can be used in alert text, default value is true.
+        /// </summary>
+        public static bool TextMarkupEnabled
+        {
+            get { return _TextMarkupEnabled; }
+            set { _TextMarkupEnabled = value; }
+        }
+
+        private static bool _PlaySound = true;
+        /// <summary>
+        /// Indicates whether alert plays exclamation sound when shown.
+        /// </summary>
+        public static bool PlaySound
+        {
+            get { return _PlaySound; }
+            set { _PlaySound = value; }
+        }
+
+        /// <summary>
+        /// Occurs before alert is displayed and allows access to the alert Window through sender.
+        /// </summary>
+        [Description("Occurs before alert is displayed and allows access to the alert Window through sender.")]
+        public static event EventHandler BeforeAlertDisplayed;
+
+        /// <summary>
+        /// Raises BeforeAlertDisplayed event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        internal static void OnBeforeAlertDisplayed(DesktopAlertWindow w, EventArgs e)
+        {
+            EventHandler h = BeforeAlertDisplayed;
+            if (h != null)
+                h(w, e);
+        }
+
+        /// <summary>
+        /// Occurs after alert as been closed.
+        /// </summary>
+        [Description("Occurs after alert has been closed.")]
+        public static event AlertClosedEventHandler AlertClosed;
+
+        /// <summary>
+        /// Raises RemovingToken event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        internal static void OnAlertClosed(object sender, AlertClosedEventArgs e)
+        {
+            AlertClosedEventHandler handler = AlertClosed;
+            if (handler != null)
+                handler(sender, e);
+        }
+    }
+
+    /// <summary>
+    /// Defines delegate for AlertClosed event.
+    /// </summary>
+    /// <param name="sender">Sender.</param>
+    /// <param name="args">Event arguments</param>
+    public delegate void AlertClosedEventHandler(object sender, AlertClosedEventArgs args);
+    /// <summary>
+    /// Defines event arguments for AlertClosed event.
+    /// </summary>
+    public class AlertClosedEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Specifies alert closure source.
+        /// </summary>
+        public readonly eAlertClosureSource ClosureSource;
+
+        public AlertClosedEventArgs(eAlertClosureSource source)
+        {
+            ClosureSource = source;
+        }
+    }
+
+    /// <summary>
+    /// Defines predefined desktop alert colors.
+    /// </summary>
+    public enum eDesktopAlertColor
+    {
+        Default,
+        DarkRed,
+        Black,
+        Gray,
+        BlueGray,
+        Blue,
+        Orange,
+        Gold,
+        DarkBlue,
+        Green,
+        Red
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/DesktopAlert/DesktopAlertWindow.cs b/PROMS/DotNetBar Source Code/Controls/DesktopAlert/DesktopAlertWindow.cs
new file mode 100644
index 00000000..f2460c19
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/DesktopAlert/DesktopAlertWindow.cs	
@@ -0,0 +1,1478 @@
+using DevComponents.DotNetBar.Rendering;
+using DevComponents.DotNetBar.TextMarkup;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Text;
+using System.Threading;
+using System.Windows.Forms;
+using System.Windows.Forms.VisualStyles;
+using DevComponents.DotNetBar.Metro.Helpers;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    public class DesktopAlertWindow : Form
+    {
+        #region Constructor
+        public DesktopAlertWindow()
+        {
+            this.SetStyle(ControlStyles.UserPaint | ControlStyles.AllPaintingInWmPaint | ControlStyles.Opaque |
+                ControlStyles.ResizeRedraw | ControlStyles.DoubleBuffer, true);
+
+            this.AccessibleRole = System.Windows.Forms.AccessibleRole.Alert;
+            this.ClientSize = DefaultAlertSizeValue;
+            this.AutoScaleDimensions = new SizeF(96f, 96f);
+            this.AutoScaleMode = AutoScaleMode.Dpi;
+            this.ControlBox = false;
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.ShowInTaskbar = false;
+            this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
+            this.StartPosition = FormStartPosition.Manual;
+            this.Padding = new System.Windows.Forms.Padding(8);
+            this.Font = new Font("Segoe UI", 10.125F);
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            DestroyAutoCloseTimer();
+            base.Dispose(disposing);
+        }
+        #endregion
+
+        #region Implementation
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            Graphics g = e.Graphics;
+            Color backColor = this.BackColor;
+            Color foreColor = this.ForeColor;
+
+            using (SolidBrush brush = new SolidBrush(backColor))
+                g.FillRectangle(brush, this.ClientRectangle);
+
+            if (_CloseButtonVisible)
+            {
+                Font symFont = Symbols.GetFont(12f, eSymbolSet.Material);
+                TextDrawing.DrawStringLegacy(g, "\uE14C", symFont,
+                    (_CloseButtonMouseOver ? ColorHelpers.GetShadeColor(foreColor) : foreColor),
+                        _CloseButtonBounds,
+                        eTextFormat.Default | eTextFormat.NoClipping);
+            }
+
+            if (!string.IsNullOrEmpty(_SymbolRealized))
+            {
+                Font symFont = Symbols.GetFont(_SymbolSize, _SymbolSet);
+
+                TextDrawing.DrawStringLegacy(g, _SymbolRealized, symFont, _SymbolColor.IsEmpty ? foreColor : _SymbolColor,
+                        _ImageBounds,
+                        eTextFormat.Default | eTextFormat.NoClipping | eTextFormat.VerticalCenter);
+            }
+            else if (_Image != null)
+            {
+                g.DrawImage(_Image, _ImageBounds);
+            }
+
+            Rectangle r = _TextBounds;
+            if (r.Bottom > this.ClientRectangle.Bottom - this.Padding.Bottom)
+                r.Height -= (r.Bottom - (this.ClientRectangle.Bottom - this.Padding.Bottom));
+            eTextFormat format = TextFormat;
+            if (_TextMarkup == null)
+            {
+                if (this.RightToLeft == RightToLeft.Yes) format |= eTextFormat.RightToLeft;
+                if (UseTextRenderer)
+                {
+                    TextRenderer.DrawText(g, Text, Font, r, foreColor, backColor,
+                        TextDrawing.GetTextFormatFlags(format));
+                }
+                else
+                    TextDrawing.DrawString(g, Text, this.Font, foreColor, r, format);
+            }
+            else
+            {
+                TextMarkup.MarkupDrawContext d = new TextMarkup.MarkupDrawContext(g, this.Font, foreColor,
+                    (this.RightToLeft == RightToLeft.Yes), r, true);
+                Size markupSize = _TextMarkup.Bounds.Size;
+                if (!markupSize.IsEmpty && (format & eTextFormat.VerticalCenter) == eTextFormat.VerticalCenter && r.Height>markupSize.Height)
+                {
+                    r.Y += (r.Height - markupSize.Height) / 2;
+                    r.Height = markupSize.Height;
+                }
+                _TextMarkup.Arrange(r, d);
+                _TextMarkup.Render(d);
+            }
+
+            base.OnPaint(e);
+        }
+        private eTextFormat TextFormat
+        {
+            get
+            {
+                return eTextFormat.Default | eTextFormat.WordBreak | eTextFormat.VerticalCenter | eTextFormat.EndEllipsis;
+            }
+        }
+
+        protected override void OnMouseEnter(EventArgs e)
+        {
+            if (_AutoClose && _AutoCloseTimer != null)
+                _AutoCloseTimer.Enabled = false;
+            base.OnMouseEnter(e);
+        }
+
+        protected override void OnMouseLeave(EventArgs e)
+        {
+            if (_TextMarkup != null)
+                _TextMarkup.MouseLeave(this);
+            if (_AutoClose && _AutoCloseTimer != null)
+                _AutoCloseTimer.Enabled = true;
+            base.OnMouseLeave(e);
+        }
+
+        private bool _CloseButtonMouseOver = false;
+        protected override void OnMouseMove(MouseEventArgs e)
+        {
+            if (_CloseButtonVisible && _CloseButtonBounds.Contains(e.Location))
+            {
+                _CloseButtonMouseOver = true;
+                Invalidate(_CloseButtonBounds);
+            }
+            else if (_CloseButtonMouseOver)
+            {
+                _CloseButtonMouseOver = false;
+                Invalidate(_CloseButtonBounds);
+            }
+
+            if (_TextMarkup != null)
+                _TextMarkup.MouseMove(this, e);
+
+            base.OnMouseMove(e);
+        }
+
+        protected override void OnMouseDown(MouseEventArgs e)
+        {
+            if (_TextMarkup != null)
+                _TextMarkup.MouseDown(this, e);
+            base.OnMouseDown(e);
+        }
+
+        protected override void OnMouseUp(MouseEventArgs e)
+        {
+            if (_TextMarkup != null)
+                _TextMarkup.MouseUp(this, e);
+
+            if (_CloseButtonMouseOver && e.Button == MouseButtons.Left)
+                this.HideAlert(eAlertClosureSource.CloseButton);
+            base.OnMouseUp(e);
+        }
+
+        private bool _AutoSize = true;
+        [DefaultValue(true)]
+        public override bool AutoSize
+        {
+            get
+            {
+                return _AutoSize;
+            }
+            set
+            {
+                _AutoSize = value;
+            }
+        }
+
+        private Rectangle _ImageBounds = Rectangle.Empty;
+        private Rectangle _TextBounds = Rectangle.Empty;
+        private Rectangle _CloseButtonBounds = Rectangle.Empty;
+        /// <summary>
+        /// Sets alert size based on its content, it respects MinimumSize and MaximumSize property settings.
+        /// </summary>
+        public void PerformAutoSize()
+        {
+            Size size = Dpi.Size(_DefaultAlertSize);
+            if (!this.MinimumSize.IsEmpty)
+                size = Dpi.Size(this.MinimumSize);
+
+            if (!this.IsHandleCreated)
+                this.CreateHandle();
+
+            size = LayoutAlert(size);
+
+            Size maximumSize = this.MaximumSize;
+            if (!maximumSize.IsEmpty)
+            {
+                if (maximumSize.Width > 0 && size.Width > maximumSize.Width)
+                    size.Width = maximumSize.Width;
+                if (maximumSize.Height > 0 && size.Height > maximumSize.Height)
+                    size.Height = maximumSize.Height;
+                size = LayoutAlert(size);
+            }
+
+            this.Size = size;
+        }
+
+        private Size LayoutAlert(Size size)
+        {
+            Rectangle r = new Rectangle(Point.Empty, size);
+            r.X += Dpi.Width(this.Padding.Left);
+            r.Width -= Dpi.Width(this.Padding.Horizontal);
+            r.Y += Dpi.Height(this.Padding.Top);
+            r.Height -= Dpi.Height(this.Padding.Vertical);
+
+            if (!string.IsNullOrEmpty(Text) || !string.IsNullOrEmpty(_SymbolRealized) || _Image != null)
+            {
+                using (Graphics g = BarFunctions.CreateGraphics(this))
+                {
+                    if (_CloseButtonVisible)
+                    {
+                        Font symFont = Symbols.GetFont(12f, eSymbolSet.Material);
+                        Size closeSize = TextDrawing.MeasureString(g, "\uE14C", symFont); // Need to do this to get consistent size for the symbol since they are not all the same width we pick widest
+                        _CloseButtonBounds = new Rectangle(r.Right - closeSize.Width - Dpi.Width4, r.Y + Dpi.Height4, closeSize.Width, closeSize.Height);
+                        r.Width -= closeSize.Width + Dpi.Width8;
+                    }
+
+
+                    _ImageBounds = Rectangle.Empty;
+                    if (!string.IsNullOrEmpty(_SymbolRealized))
+                    {
+                        Size symSize = GetSymbolSize(g);
+                        symSize.Width += Dpi.Width2;
+                        _ImageBounds = new Rectangle(r.X, r.Y, symSize.Width, symSize.Height);
+                        r.X += symSize.Width + _ImageTextPadding;
+                        r.Width -= symSize.Width + _ImageTextPadding;
+                        if (symSize.Height > r.Height)
+                        {
+                            size.Height += (symSize.Height - r.Height);
+                            r.Height = symSize.Height;
+                        }
+                        else
+                        {
+                            _ImageBounds.Height = r.Height;
+                        }
+                    }
+                    else if (_Image != null)
+                    {
+                        _ImageBounds = new Rectangle(r.X, r.Y, _Image.Width, _Image.Height);
+                        r.X += _Image.Width + _ImageTextPadding;
+                        r.Width -= _Image.Width + _ImageTextPadding;
+                        if (_Image.Height > r.Height)
+                        {
+                            size.Height += (_Image.Height - r.Height);
+                            r.Height = _Image.Height;
+                        }
+                    }
+
+                    _TextBounds = Rectangle.Empty;
+
+                    if (_TextMarkup != null)
+                    {
+                        MarkupDrawContext dc = GetMarkupDrawContext(g);
+                        _TextMarkup.Measure(r.Size, dc);
+                        Size sz = _TextMarkup.Bounds.Size;
+                        _TextMarkup.Arrange(new Rectangle(r.Location, sz), dc);
+                        if (sz.Width > r.Width)
+                        {
+                            size.Width += (sz.Width - r.Width);
+                            r.Width = size.Width;
+                        }
+                        if (sz.Height > r.Height)
+                        {
+                            size.Height += (sz.Height - r.Height);
+                            r.Height = size.Height;
+                        }
+                        _TextBounds = r;
+                    }
+                    else if (!string.IsNullOrEmpty(this.Text))
+                    {
+                        Size sz = (UseTextRenderer ? TextRenderer.MeasureText(g, this.Text, this.Font, r.Size, TextDrawing.GetTextFormatFlags(TextFormat)) : TextDrawing.MeasureString(g, this.Text, this.Font, size, TextFormat));
+                        if (sz.Width > r.Width)
+                        {
+                            size.Width += (sz.Width - r.Width);
+                            r.Width = size.Width;
+                        }
+                        if (sz.Height > r.Height)
+                        {
+                            size.Height += (sz.Height - r.Height);
+                            r.Height = size.Height;
+                        }
+                        _TextBounds = r;
+                    }
+                }
+            }
+
+            return size;
+        }
+
+        private MarkupDrawContext GetMarkupDrawContext(Graphics g)
+        {
+            return new MarkupDrawContext(g, this.Font, this.ForeColor, this.RightToLeft == RightToLeft.Yes);
+        }
+        private Size GetSymbolSize(Graphics g)
+        {
+            Size symbolSize = Size.Empty;
+            if (g == null || string.IsNullOrEmpty(_Symbol)) return symbolSize;
+            Font symFont = Symbols.GetFont(this.SymbolSize, this.SymbolSet);
+            symbolSize = TextDrawing.MeasureString(g, "\uF00A", symFont); // Need to do this to get consistent size for the symbol since they are not all the same width we pick widest
+            //int descent = (int)Math.Ceiling((symFont.FontFamily.GetCellDescent(symFont.Style) *
+            //    symFont.Size / symFont.FontFamily.GetEmHeight(symFont.Style)));
+            //symbolSize.Height -= descent;
+            return symbolSize;
+        }
+
+        //private Color[] _BackColors = null;
+        ///// <summary>
+        ///// Indicates the array of colors that when set are used to draw the background of the alert.
+        ///// </summary>
+        //[DefaultValue(null), Category("Appearance"), Description("Indicates the array of colors that when set are used to draw the background of the alert."), TypeConverter(typeof(ArrayConverter))]
+        //public Color[] BackColors
+        //{
+        //    get
+        //    {
+        //        return _BackColors;
+        //    }
+        //    set
+        //    {
+        //        if (_BackColors != value)
+        //        {
+        //            _BackColors = value;
+        //            this.Invalidate();
+        //        }
+        //    }
+        //}
+
+        //private Color[] _BorderColors = null;
+        ///// <summary>
+        ///// Indicates the array of colors that when set are used to draw the border of the alert.
+        ///// </summary>
+        //[DefaultValue(null), Category("Appearance"), Description("Indicates the array of colors that when set are used to draw the border of the alert."), TypeConverter(typeof(ArrayConverter))]
+        //public Color[] BorderColors
+        //{
+        //    get
+        //    {
+        //        return _BorderColors;
+        //    }
+        //    set
+        //    {
+        //        if (_BorderColors != value)
+        //        {
+        //            _BorderColors = value;
+        //            //OnPropertyChanged(new PropertyChangedEventArgs("Colors"));
+        //            this.Invalidate();
+        //        }
+        //    }
+        //}
+
+        private Color _SymbolColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets the color of the Symbol.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates color of the Symbol.")]
+        public Color SymbolColor
+        {
+            get { return _SymbolColor; }
+            set { _SymbolColor = value; this.Invalidate(); }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeSymbolColor()
+        {
+            return !_SymbolColor.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetSymbolColor()
+        {
+            this.SymbolColor = Color.Empty;
+        }
+
+        /// <summary>
+        /// Gets the realized symbol string.
+        /// </summary>
+        [Browsable(false)]
+        public string SymbolRealized
+        {
+            get { return _SymbolRealized; }
+        }
+        private string _Symbol = "", _SymbolRealized = "";
+        /// <summary>
+        /// Indicates the symbol displayed on face of the button instead of the image. Setting the symbol overrides the image setting.
+        /// </summary>
+        [DefaultValue(""), Category("Appearance"), Description("Indicates the symbol displayed on face of the button instead of the image. Setting the symbol overrides the image setting.")]
+        [Editor("DevComponents.DotNetBar.Design.SymbolTypeEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor))]
+        public string Symbol
+        {
+            get { return _Symbol; }
+            set
+            {
+                if (value != _Symbol)
+                {
+                    string oldValue = _Symbol;
+                    _Symbol = value;
+                    OnSymbolChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when Symbol property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnSymbolChanged(string oldValue, string newValue)
+        {
+            if (string.IsNullOrEmpty(newValue))
+                _SymbolRealized = "";
+            else
+                _SymbolRealized = Symbols.GetSymbol(newValue);
+            this.Invalidate();
+        }
+
+        private eSymbolSet _SymbolSet = eSymbolSet.Awesome;
+        /// <summary>
+        /// Gets or sets the symbol set used to represent the Symbol.
+        /// </summary>
+        [Browsable(false), DefaultValue(eSymbolSet.Awesome)]
+        public eSymbolSet SymbolSet
+        {
+            get { return _SymbolSet; }
+            set
+            {
+                if (_SymbolSet != value)
+                {
+                    eSymbolSet oldValue = _SymbolSet;
+                    _SymbolSet = value;
+                    OnSymbolSetChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when SymbolSet property value changes.
+        /// </summary>
+        /// <param name="oldValue">Indciates old value</param>
+        /// <param name="newValue">Indicates new value</param>
+        protected virtual void OnSymbolSetChanged(eSymbolSet oldValue, eSymbolSet newValue)
+        {
+            this.Invalidate();
+            this.Refresh();
+        }
+
+
+        private float _SymbolSize = 22f;
+        /// <summary>
+        /// Indicates the size of the symbol in points.
+        /// </summary>
+        [DefaultValue(22f), Category("Appearance"), Description("Indicates the size of the symbol in points.")]
+        public float SymbolSize
+        {
+            get { return _SymbolSize; }
+            set
+            {
+                if (value != _SymbolSize)
+                {
+                    float oldValue = _SymbolSize;
+                    _SymbolSize = value;
+                    OnSymbolSizeChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when SymbolSize property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnSymbolSizeChanged(float oldValue, float newValue)
+        {
+            this.Invalidate();
+        }
+
+        private Image _Image = null;
+        /// <summary>
+        /// Indicates image displayed on alert.
+        /// </summary>
+        [DefaultValue(null), Category("Appearance"), Description("Indicates image displayed on alert.")]
+        public Image Image
+        {
+            get { return _Image; }
+            set
+            {
+                _Image = value;
+                this.Invalidate();
+            }
+        }
+
+        protected override void OnTextChanged(EventArgs e)
+        {
+            // Markup support
+            MarkupTextChanged();
+            base.OnTextChanged(e);
+        }
+
+        //private string _TitleText = "";
+        ///// <summary>
+        ///// Gets or sets the tile title text displayed by default in lower left corner.
+        ///// </summary>
+        //[DefaultValue(""), Category("Appearance"), Description("Indicates tile title text displayed by default in lower left corner"), Editor("DevComponents.DotNetBar.Design.TextMarkupUIEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor))]
+        //public string TitleText
+        //{
+        //    get { return _TitleText; }
+        //    set
+        //    {
+        //        if (value != _TitleText)
+        //        {
+        //            string oldValue = _TitleText;
+        //            _TitleText = value;
+        //            OnTitleTextChanged(oldValue, value);
+        //        }
+        //    }
+        //}
+        ///// <summary>
+        ///// Called when TitleText property has changed.
+        ///// </summary>
+        ///// <param name="oldValue">Old property value</param>
+        ///// <param name="newValue">New property value</param>
+        //protected virtual void OnTitleTextChanged(string oldValue, string newValue)
+        //{
+        //    TitleTextMarkupUpdate();
+        //    this.Invalidate();
+        //    //OnPropertyChanged(new PropertyChangedEventArgs("TitleText"));
+        //}
+        ///// <summary>
+        ///// Gets reference to parsed markup body element if text was markup otherwise returns null.
+        ///// </summary>
+        //internal TextMarkup.BodyElement TitleTextMarkupBody
+        //{
+        //    get { return _TitleTextMarkup; }
+        //}
+        //private TextMarkup.BodyElement _TitleTextMarkup = null;
+        //private void TitleTextMarkupUpdate()
+        //{
+        //    if (_TitleTextMarkup != null)
+        //        _TitleTextMarkup.HyperLinkClick -= TitleTextMarkupLinkClicked;
+        //    _TitleTextMarkup = null;
+
+        //    if (!_TextMarkupEnabled)
+        //        return;
+
+        //    if (!TextMarkup.MarkupParser.IsMarkup(ref _TitleText))
+        //        return;
+
+        //    _TitleTextMarkup = TextMarkup.MarkupParser.Parse(_TitleText);
+
+        //    if (_TitleTextMarkup != null)
+        //        _TitleTextMarkup.HyperLinkClick += TitleTextMarkupLinkClicked;
+        //}
+        //private void TitleTextMarkupLinkClicked(object sender, EventArgs e)
+        //{
+        //    DevComponents.DotNetBar.TextMarkup.HyperLink link = sender as DevComponents.DotNetBar.TextMarkup.HyperLink;
+
+        //    if (link != null)
+        //        OnTitleTextMarkupLinkClick(new MarkupLinkClickEventArgs(link.Name, link.HRef));
+        //    else
+        //        OnTitleTextMarkupLinkClick(e);
+        //}
+        ///// <summary>
+        ///// Occurs when an hyperlink in title text markup is clicked.
+        ///// </summary>
+        //public event EventHandler TitleTextMarkupLinkClick;
+        ///// <summary>
+        ///// Raises TitleTextMarkupLinkClick event.
+        ///// </summary>
+        ///// <param name="e">Provides event arguments.</param>
+        //protected virtual void OnTitleTextMarkupLinkClick(EventArgs e)
+        //{
+        //    EventHandler handler = TitleTextMarkupLinkClick;
+        //    if (handler != null)
+        //        handler(this, e);
+        //}
+
+
+        //private Font _TitleTextFont = null;
+        ///// <summary>
+        ///// Gets or sets the title text font.
+        ///// </summary>
+        //[DefaultValue(null), Category("Appearance"), Description("Gets or sets the title text font.")]
+        //public Font TitleTextFont
+        //{
+        //    get { return _TitleTextFont; }
+        //    set
+        //    {
+        //        if (value != _TitleTextFont)
+        //        {
+        //            Font oldValue = _TitleTextFont;
+        //            _TitleTextFont = value;
+        //            OnTitleTextFontChanged(oldValue, value);
+        //        }
+        //    }
+        //}
+        ///// <summary>
+        ///// Called when TitleTextFont property has changed.
+        ///// </summary>
+        ///// <param name="oldValue">Old property value</param>
+        ///// <param name="newValue">New property value</param>
+        //protected virtual void OnTitleTextFontChanged(Font oldValue, Font newValue)
+        //{
+        //    this.Invalidate();
+        //    //OnPropertyChanged(new PropertyChangedEventArgs("TitleTextFont"));
+        //}
+        //private Rectangle _TitleTextBounds = Rectangle.Empty;
+        //internal Rectangle TitleTextBounds
+        //{
+        //    get
+        //    {
+        //        return _TitleTextBounds;
+        //    }
+        //    set
+        //    {
+        //        _TitleTextBounds = value;
+        //    }
+        //}
+
+        //private Color _TitleTextColor = Color.Empty;
+        ///// <summary>
+        ///// Gets or sets the color of the title text.
+        ///// </summary>
+        //[Category("Columns"), Description("Indicates color of title text.")]
+        //public Color TitleTextColor
+        //{
+        //    get { return _TitleTextColor; }
+        //    set
+        //    {
+        //        if (_TitleTextColor != value)
+        //        {
+        //            Color oldValue = _TitleTextColor;
+        //            _TitleTextColor = value;
+        //            OnTitleTextColorChanged(oldValue, value);
+        //        }
+        //    }
+        //}
+        ///// <summary>
+        ///// Called when TitleTextColor property has changed.
+        ///// </summary>
+        ///// <param name="oldValue">Old property value</param>
+        ///// <param name="newValue">New property value</param>
+        //protected virtual void OnTitleTextColorChanged(Color oldValue, Color newValue)
+        //{
+        //    this.Invalidate();
+        //    //OnPropertyChanged(new PropertyChangedEventArgs("TitleTextColor"));
+        //}
+        ///// <summary>
+        ///// Gets whether property should be serialized.
+        ///// </summary>
+        //[EditorBrowsable(EditorBrowsableState.Never)]
+        //public bool ShouldSerializeTitleTextColor()
+        //{
+        //    return !_TitleTextColor.IsEmpty;
+        //}
+        ///// <summary>
+        ///// Resets property to its default value.
+        ///// </summary>
+        //[EditorBrowsable(EditorBrowsableState.Never)]
+        //public void ResetTitleTextColor()
+        //{
+        //    this.TitleTextColor = Color.Empty;
+        //}
+
+        //private ContentAlignment _TitleTextAlignment = ContentAlignment.BottomLeft;
+        ///// <summary>
+        ///// Gets or sets title text alignment.
+        ///// </summary>
+        //[DefaultValue(ContentAlignment.BottomLeft), Category("Appearance"), Description("Indicates title text alignment.")]
+        //public ContentAlignment TitleTextAlignment
+        //{
+        //    get { return _TitleTextAlignment; }
+        //    set
+        //    {
+        //        if (value != _TitleTextAlignment)
+        //        {
+        //            ContentAlignment oldValue = _TitleTextAlignment;
+        //            _TitleTextAlignment = value;
+        //            OnTitleTextAlignmentChanged(oldValue, value);
+        //        }
+        //    }
+        //}
+        ///// <summary>
+        ///// Called when TitleTextAlignment property has changed.
+        ///// </summary>
+        ///// <param name="oldValue">Old property value</param>
+        ///// <param name="newValue">New property value</param>
+        //protected virtual void OnTitleTextAlignmentChanged(ContentAlignment oldValue, ContentAlignment newValue)
+        //{
+        //    //OnPropertyChanged(new PropertyChangedEventArgs("TitleTextAlignment"));
+        //    this.Invalidate();
+        //}
+
+        protected override void OnClick(EventArgs e)
+        {
+            if (_TextMarkup != null && _TextMarkup.MouseOverElement is HyperLink)
+            {
+                _TextMarkup.Click(this);
+                base.OnClick(e);
+                return;
+            }
+            else if (_CloseButtonMouseOver)
+            {
+                base.OnClick(e);
+                return;
+            }
+
+            if (_ClickAction != null)
+            {
+                _ClickAction.Invoke(_AlertId);
+                this.HideAlert(eAlertClosureSource.AlertClicked);
+            }
+            base.OnClick(e);
+        }
+
+        private long _AlertId = 0;
+        /// <summary>
+        /// Indicates optional Alert Id.
+        /// </summary>
+        [Browsable(false), DefaultValue(0)]
+        public long AlertId {
+            get { return _AlertId; }
+            set { _AlertId = value; }
+        }
+
+        private Action<long> _ClickAction = null;
+        /// <summary>
+        /// Indicates the method that will be invoked if user clicks the alert.
+        /// </summary>
+        [Browsable(false), DefaultValue(null)]
+        public Action<long> ClickAction
+        {
+            get { return _ClickAction; }
+            set { _ClickAction = value; }
+        }
+
+        private bool _TextMarkupEnabled = true;
+        /// <summary>
+        /// Gets or sets whether text-markup can be used in Text property.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance"), Description("Indicates whether text-markup can be used in Text property.")]
+        public bool TextMarkupEnabled
+        {
+            get { return _TextMarkupEnabled; }
+            set
+            {
+                if (value != _TextMarkupEnabled)
+                {
+                    bool oldValue = _TextMarkupEnabled;
+                    _TextMarkupEnabled = value;
+                    OnTextMarkupEnabledChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when TextMarkupEnabled property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnTextMarkupEnabledChanged(bool oldValue, bool newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("TextMarkupEnabled"));
+            this.Invalidate();
+        }
+        #endregion
+
+        #region Markup Implementation
+        private TextMarkup.BodyElement _TextMarkup = null;
+
+        private void MarkupTextChanged()
+        {
+            if (_TextMarkup != null)
+                _TextMarkup.HyperLinkClick -= TextMarkupLinkClick;
+
+            _TextMarkup = null;
+
+            if (!_TextMarkupEnabled)
+                return;
+            string text = this.Text;
+            if (!TextMarkup.MarkupParser.IsMarkup(ref text))
+                return;
+
+            _TextMarkup = TextMarkup.MarkupParser.Parse(text);
+
+            if (_TextMarkup != null)
+                _TextMarkup.HyperLinkClick += TextMarkupLinkClick;
+        }
+
+        /// <summary>
+        /// Occurs when text markup link is clicked.
+        /// </summary>
+        protected virtual void TextMarkupLinkClick(object sender, EventArgs e)
+        {
+            TextMarkup.HyperLink link = sender as TextMarkup.HyperLink;
+            if (link != null)
+                OnMarkupLinkClick(new MarkupLinkClickEventArgs(link.Name, link.HRef));
+        }
+        /// <summary>
+        /// Occurs when text markup link is clicked. Markup links can be created using "a" tag, for example:
+        /// <a name="MyLink">Markup link</a>
+        /// </summary>
+        [Description("Occurs when text markup link is clicked. Markup links can be created using a tag.")]
+        public event MarkupLinkClickEventHandler MarkupLinkClick;
+        /// <summary>
+        /// Raises MarkupLinkClick event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnMarkupLinkClick(MarkupLinkClickEventArgs e)
+        {
+            MarkupLinkClickEventHandler handler = MarkupLinkClick;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        /// <summary>
+        /// Gets reference to parsed markup body element if text was markup otherwise returns null.
+        /// </summary>
+        internal TextMarkup.BodyElement TextMarkupBody
+        {
+            get { return _TextMarkup; }
+        }
+
+        internal static Size MeasureText(DesktopAlertWindow item, Graphics g, int containerWidth, Font font, eTextFormat stringFormat, bool rightToLeft)
+        {
+            if (item.Text == "" && item.TextMarkupBody == null) return Size.Empty;
+
+            Size textSize = Size.Empty;
+
+            if (item.TextMarkupBody == null)
+            {
+                textSize = TextDrawing.MeasureString(g, ButtonItemPainter.GetDrawText(item.Text), font, containerWidth, stringFormat);
+            }
+            else
+            {
+                Size availSize = new Size(containerWidth, 1);
+                if (containerWidth == 0)
+                    availSize.Width = 1600;
+                TextMarkup.MarkupDrawContext d = new TextMarkup.MarkupDrawContext(g, font, Color.Empty, false);
+                item.TextMarkupBody.Measure(availSize, d);
+                availSize = item.TextMarkupBody.Bounds.Size;
+                if (containerWidth != 0)
+                    availSize.Width = containerWidth;
+                d.RightToLeft = rightToLeft;
+                item.TextMarkupBody.Arrange(new Rectangle(0, 0, availSize.Width, availSize.Height), d);
+
+                textSize = item.TextMarkupBody.Bounds.Size;
+            }
+
+            return textSize;
+        }
+
+        private static readonly Size DefaultAlertSizeValue = new Size(360, 64);
+        private Size _DefaultAlertSize = DefaultAlertSizeValue;
+        /// <summary>
+        /// Gets or sets the default alert size.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates default alert size.")]
+        public Size DefaultAlertSize
+        {
+            get { return _DefaultAlertSize; }
+            set
+            {
+                if (value != _DefaultAlertSize)
+                {
+                    Size oldValue = _DefaultAlertSize;
+                    _DefaultAlertSize = value;
+                    OnDefaultAlertSizeChanged(oldValue, value);
+                }
+            }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeDefaultAlertSize()
+        {
+            return _DefaultAlertSize.Width != DefaultAlertSizeValue.Width || _DefaultAlertSize.Height != DefaultAlertSizeValue.Height;
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetDefaultAlertSize()
+        {
+            DefaultAlertSize = DefaultAlertSizeValue;
+        }
+        private void OnDefaultAlertSizeChanged(Size oldValue, Size newValue)
+        {
+            if (_AutoSize && this.IsHandleCreated)
+                PerformAutoSize();
+        }
+
+        //private eAlertAnimation _AlertAnimation = eAlertAnimation.RightToLeft;
+        ///// <summary>
+        ///// Gets or sets the animation type used to display Alert.
+        ///// </summary>
+        //[Browsable(true), Description("Gets or sets the animation type used to display Alert."), Category("Behavior"), DefaultValue(eAlertAnimation.RightToLeft)]
+        //public eAlertAnimation AlertAnimation
+        //{
+        //    get { return _AlertAnimation; }
+        //    set { _AlertAnimation = value; }
+        //}
+
+        private int _AlertAnimationDuration = 200;
+        /// <summary>
+        /// Gets or sets the total time in milliseconds alert animation takes.
+        /// Default value is 200.
+        /// </summary>
+        [Browsable(true), Description("Gets or sets the total time in milliseconds alert animation takes."), Category("Behavior"), DefaultValue(200)]
+        public int AlertAnimationDuration
+        {
+            get { return _AlertAnimationDuration; }
+            set { _AlertAnimationDuration = value; }
+        }
+
+        private bool _AutoClose = true;
+        /// <summary>
+        /// Gets or sets whether balloon will close automatically when user click the close button.
+        /// </summary>
+        [Description("Indicates whether balloon will close automatically when user click the close button."), Category("Behavior"), DefaultValue(true)]
+        public bool AutoClose
+        {
+            get { return _AutoClose; }
+            set { _AutoClose = value; }
+        }
+
+        private int _AutoCloseTimeOut = 6;
+        /// <summary>
+        /// Gets or sets time period in seconds after alert closes automatically.
+        /// </summary>
+        [Description("Indicates time period in seconds after balloon closes automatically."), Category("Behavior"), DefaultValue(6)]
+        public int AutoCloseTimeOut
+        {
+            get { return _AutoCloseTimeOut; }
+            set
+            {
+                _AutoCloseTimeOut = value;
+                OnAutoCloseTimeOutChanged();
+            }
+        }
+
+        private System.Windows.Forms.Timer _AutoCloseTimer = null;
+        protected void OnAutoCloseTimeOutChanged()
+        {
+            if (_AutoCloseTimeOut > 0 && !this.DesignMode)
+            {
+                StartAutoCloseTimer();
+            }
+            else
+            {
+                DestroyAutoCloseTimer();
+            }
+        }
+
+        private void StartAutoCloseTimer()
+        {
+            if (_AutoCloseTimer == null)
+            {
+                _AutoCloseTimer = new System.Windows.Forms.Timer();
+                _AutoCloseTimer.Enabled = false;
+                _AutoCloseTimer.Tick += new EventHandler(this.AutoCloseTimeOutEllapsed);
+            }
+            _AutoCloseTimer.Interval = _AutoCloseTimeOut * 1000;
+            if (this.Visible)
+            {
+                _AutoCloseTimer.Enabled = true;
+                _AutoCloseTimer.Start();
+            }
+        }
+
+        protected virtual void AutoCloseTimeOutEllapsed(object sender, EventArgs e)
+        {
+            if (this.IsDisposed)
+                return;
+            DestroyAutoCloseTimer();
+            this.HideAlert(eAlertClosureSource.Timeout);
+            this.Close();
+        }
+
+        private void DestroyAutoCloseTimer()
+        {
+            if (_AutoCloseTimer != null)
+            {
+                _AutoCloseTimer.Enabled = false;
+                _AutoCloseTimer.Tick -= new EventHandler(this.AutoCloseTimeOutEllapsed);
+                _AutoCloseTimer.Dispose();
+                _AutoCloseTimer = null;
+            }
+        }
+
+        protected override void OnVisibleChanged(EventArgs e)
+        {
+            base.OnVisibleChanged(e);
+            if (this.Visible)
+            {
+                if (_AutoCloseTimeOut > 0)
+                    StartAutoCloseTimer();
+
+                if (_AutoCloseTimer != null && !_AutoCloseTimer.Enabled)
+                {
+                    _AutoCloseTimer.Enabled = true;
+                    _AutoCloseTimer.Start();
+                }
+            }
+            else
+            {
+                if (_AutoCloseTimer != null && _AutoCloseTimer.Enabled)
+                {
+                    _AutoCloseTimer.Stop();
+                    _AutoCloseTimer.Enabled = false;
+                }
+            }
+        }
+
+        private Control _ReferenceControl = null;
+        /// <summary>
+         /// Specifies the reference control which is used to find which screen the alert is displayed on. If not specified alert is displayed on primary screen.
+        /// </summary>
+        [DefaultValue(null), Browsable(false)]
+        public Control ReferenceControl
+        {
+            get { return _ReferenceControl; }
+            set { _ReferenceControl = value; }
+        }
+
+        private static Semaphore _DisplayPositionsSemaphore = new Semaphore(1, 1);
+        private static List<Rectangle> _DisplayPositions = new List<Rectangle>();
+        private Rectangle GetAlertBounds()
+        {
+            Rectangle r = this.Bounds;
+
+            ScreenInformation si = null;
+            if (_ReferenceControl == null)
+                si = BarFunctions.PrimaryScreen;
+            else
+                si = BarFunctions.ScreenFromControl(_ReferenceControl);
+            
+            if (_AlertPosition == eAlertPosition.BottomRight)
+            {
+                r = new Rectangle(si.WorkingArea.Right - this.Width, si.WorkingArea.Bottom - this.Height - Dpi.Height12, this.Width, this.Height);
+            }
+            else if (_AlertPosition == eAlertPosition.BottomLeft)
+            {
+                r = new Rectangle(si.WorkingArea.Left, si.WorkingArea.Bottom - this.Height - Dpi.Height12, this.Width, this.Height);
+            }
+            else if (_AlertPosition == eAlertPosition.TopRight)
+            {
+                r = new Rectangle(si.WorkingArea.Right - this.Width, si.WorkingArea.Top + Dpi.Height12, this.Width, this.Height);
+            }
+            else if (_AlertPosition == eAlertPosition.TopLeft)
+            {
+                r = new Rectangle(si.WorkingArea.Left, si.WorkingArea.Top + Dpi.Height12, this.Width, this.Height);
+            }
+
+            // Now adjust display position
+            if (_DisplayPositions.Count > 0)
+            {
+                if(_AlertPosition == eAlertPosition.TopLeft || _AlertPosition == eAlertPosition.TopRight)
+                    _DisplayPositions.Sort(_RectangleComparer);
+                else
+                    _DisplayPositions.Sort(_RectangleReverseComparer);
+                Rectangle originalBounds = r;
+                for (int i = 0; i < _DisplayPositions.Count; i++)
+                {
+                    if (_DisplayPositions[i].IntersectsWith(r))
+                    {
+                        if (_AlertPosition == eAlertPosition.BottomLeft || _AlertPosition == eAlertPosition.BottomRight)
+                            r.Y -= _DisplayPositions[i].Height + _AlertsSpacing;
+                        else
+                            r.Y += _DisplayPositions[i].Height + _AlertsSpacing;
+                    }
+                    else
+                        break;
+                    if (!si.WorkingArea.Contains(r))
+                    {
+                        r = originalBounds;
+                        break;
+                    }
+                    if (i == _DisplayPositions.Count - 1)
+                        break;
+                }
+            }
+
+            _DisplayPositionsSemaphore.WaitOne();
+            try
+            {
+                _DisplayPositions.Add(r);
+            }
+            finally
+            {
+                _DisplayPositionsSemaphore.Release();
+            }
+            return r;
+        }
+
+        private static readonly RectangleComparer _RectangleComparer = new RectangleComparer();
+        private static readonly RectangleReverseComparer _RectangleReverseComparer = new RectangleReverseComparer();
+        private class RectangleComparer : IComparer<Rectangle>
+        {
+            public int Compare(Rectangle x, Rectangle y)
+            {
+                return x.Y - y.Y;
+            }
+        }
+        private class RectangleReverseComparer : IComparer<Rectangle>
+        {
+            public int Compare(Rectangle x, Rectangle y)
+            {
+                return y.Y - x.Y;
+            }
+        }
+
+        protected override void OnClosed(EventArgs e)
+        {
+            _DisplayPositionsSemaphore.WaitOne();
+            try
+            {
+                for (int i = _DisplayPositions.Count - 1; i >= 0; i--)
+                {
+                    if (_DisplayPositions[i] == this.Bounds)
+                    {
+                        _DisplayPositions.RemoveAt(i);
+                        break;
+                    }
+                }
+            }
+            finally
+            {
+                _DisplayPositionsSemaphore.Release();
+            }
+            base.OnClosed(e);
+        }
+
+        /// <summary>
+        /// Display balloon.
+        /// </summary>
+        /// <param name="focusAlert">Indicates whether alert receives input focus upon showing.</param>
+        public void Show(bool focusAlert)
+        {
+            PerformAutoSize();
+
+            this.Bounds = GetAlertBounds();
+            Rectangle rEnd = this.Bounds;
+
+            DesktopAlert.OnBeforeAlertDisplayed(this, EventArgs.Empty);
+            if(this.IsDisposed)
+                return;
+
+            if (ShouldAnimate())
+            {
+                try
+                {
+                    _AnimationInProgress = true;
+                    eAlertAnimation alertAnimation = GetAlertAnimation();
+                    if (alertAnimation == eAlertAnimation.RightToLeft)
+                        NativeFunctions.AnimateWindow(this.Handle, _AlertAnimationDuration, (NativeFunctions.AW_SLIDE | NativeFunctions.AW_HOR_NEGATIVE));
+                    else if (alertAnimation == eAlertAnimation.LeftToRight)
+                        NativeFunctions.AnimateWindow(this.Handle, _AlertAnimationDuration, (NativeFunctions.AW_SLIDE | NativeFunctions.AW_HOR_POSITIVE));
+                    else if (alertAnimation == eAlertAnimation.BottomToTop)
+                        NativeFunctions.AnimateWindow(this.Handle, _AlertAnimationDuration, (NativeFunctions.AW_SLIDE | NativeFunctions.AW_VER_NEGATIVE));
+                    else if (alertAnimation == eAlertAnimation.TopToBottom)
+                        NativeFunctions.AnimateWindow(this.Handle, _AlertAnimationDuration, (NativeFunctions.AW_SLIDE | NativeFunctions.AW_VER_POSITIVE));
+                }
+                finally
+                {
+                    _AnimationInProgress = false;
+                }
+            }
+            base.Show();
+
+            if (_TopMost)
+                NativeFunctions.SetWindowPos(this.Handle,
+                    new IntPtr(NativeFunctions.HWND_TOPMOST), 0, 0, 0, 0,
+                    NativeFunctions.SWP_NOACTIVATE | NativeFunctions.SWP_NOMOVE | NativeFunctions.SWP_NOSIZE);
+            //this.Visible = true;
+
+            if (_PlaySound)
+                System.Media.SystemSounds.Beep.Play();
+        }
+
+        protected override bool ShowWithoutActivation
+        {
+            get
+            {
+                return true;
+            }
+        }
+
+        private eAlertAnimation GetAlertAnimation()
+        {
+            if (_AlertPosition == eAlertPosition.TopLeft || _AlertPosition == eAlertPosition.BottomLeft)
+                return eAlertAnimation.LeftToRight;
+            else
+                return eAlertAnimation.RightToLeft;
+        }
+
+        /// <summary>
+        /// Displays balloon.
+        /// </summary>
+        public new void Show()
+        {
+            this.Show(false);
+        }
+
+        private bool _AnimationInProgress = false;
+        /// <summary>
+        /// Called when alert needs to be hidden.
+        /// </summary>
+        protected virtual void HideAlert(eAlertClosureSource source)
+        {
+            DestroyAutoCloseTimer();
+            if (ShouldAnimate())
+            {
+                Rectangle rStart = this.Bounds;
+                //Rectangle rEnd = GetAnimationRectangle();
+                try
+                {
+                    _AnimationInProgress = true;
+                    eAlertAnimation alertAnimation = GetAlertAnimation();
+                    if (alertAnimation == eAlertAnimation.RightToLeft)
+                        NativeFunctions.AnimateWindow(this.Handle, _AlertAnimationDuration, (NativeFunctions.AW_SLIDE | NativeFunctions.AW_HOR_POSITIVE | NativeFunctions.AW_HIDE));
+                    else if (alertAnimation == eAlertAnimation.LeftToRight)
+                        NativeFunctions.AnimateWindow(this.Handle, _AlertAnimationDuration, (NativeFunctions.AW_SLIDE | NativeFunctions.AW_HOR_NEGATIVE | NativeFunctions.AW_HIDE));
+                    else if (alertAnimation == eAlertAnimation.BottomToTop)
+                        NativeFunctions.AnimateWindow(this.Handle, _AlertAnimationDuration, (NativeFunctions.AW_SLIDE | NativeFunctions.AW_VER_POSITIVE | NativeFunctions.AW_HIDE));
+                    else if (alertAnimation == eAlertAnimation.TopToBottom)
+                        NativeFunctions.AnimateWindow(this.Handle, _AlertAnimationDuration, (NativeFunctions.AW_SLIDE | NativeFunctions.AW_VER_NEGATIVE | NativeFunctions.AW_HIDE));
+                }
+                finally
+                {
+                    _AnimationInProgress = false;
+                }
+            }
+            else
+                base.Hide();
+            this.Close();
+            DesktopAlert.OnAlertClosed(this, new AlertClosedEventArgs(source));
+            _ClickAction = null;
+            this.Dispose();
+        }
+
+        /// <summary>
+        /// Hides balloon.
+        /// </summary>
+        public new void Hide()
+        {
+            HideAlert(eAlertClosureSource.Timeout);
+        }
+
+        private bool ShouldAnimate()
+        {
+            if (_AlertAnimationDuration > 0 && !this.DesignMode && !this.IsDisposed)
+                return true;
+            return false;
+        }
+
+        private int _AlertsSpacing = 8;
+        /// <summary>
+        /// Indicates spacing between alerts on the screen
+        /// </summary>
+        [DefaultValue(8), Category("Behavior"), Description("Indicates spacing between alerts on the screen")]
+        public int AlertsSpacing
+        {
+            get { return _AlertsSpacing; }
+            set
+            {
+                if (_AlertsSpacing != value)
+                {
+                    int oldValue = _AlertsSpacing;
+                    _AlertsSpacing = value;
+                    OnAlertsSpacingChanged(value, oldValue);
+                }
+            }
+        }
+
+        protected virtual void OnAlertsSpacingChanged(int newValue, int oldValue)
+        {
+            throw new NotImplementedException();
+        }
+
+        //private Rectangle GetAnimationRectangle()
+        //{
+        //    Rectangle r = new Rectangle(this.Location, this.Size);
+        //    if (_AlertAnimation == eAlertAnimation.BottomToTop)
+        //    {
+        //        r.Y = r.Bottom - 1;
+        //        r.Height = 1;
+        //    }
+        //    else if (_AlertAnimation == eAlertAnimation.TopToBottom)
+        //    {
+        //        r.Height = 1;
+        //    }
+        //    else if (_AlertAnimation == eAlertAnimation.LeftToRight)
+        //    {
+        //        r.Width = 2;
+        //    }
+        //    else if (_AlertAnimation == eAlertAnimation.RightToLeft)
+        //    {
+        //        r.X = r.Right - 1;
+        //        r.Width = 1;
+        //    }
+        //    return r;
+        //}
+
+        private eAlertPosition _AlertPosition = eAlertPosition.BottomRight;
+        /// <summary>
+        /// Indicates the request screen position for the alert
+        /// </summary>
+        [DefaultValue(eAlertPosition.BottomRight), Category("Behavior"), Description("Indicates the request screen position for the alert")]
+        public eAlertPosition AlertPosition
+        {
+            get { return _AlertPosition; }
+            set
+            {
+                if (_AlertPosition != value)
+                {
+                    eAlertPosition oldValue = _AlertPosition;
+                    _AlertPosition = value;
+                    OnAlertPositionChanged(value, oldValue);
+                }
+            }
+        }
+        protected virtual void OnAlertPositionChanged(eAlertPosition newValue, eAlertPosition oldValue)
+        {
+            //throw new NotImplementedException();
+        }
+
+        private bool _TopMost = true;
+        [DefaultValue(true)]
+        public new bool TopMost
+        {
+            get { return _TopMost; }
+            set
+            {
+                if (_TopMost != value)
+                {
+                    bool oldValue = _TopMost;
+                    _TopMost = value;
+                    OnTopMostChanged(value, oldValue);
+                }
+            }
+        }
+
+        protected virtual void OnTopMostChanged(bool newValue, bool oldValue)
+        {
+            if (IsHandleCreated && Visible)
+                NativeFunctions.SetWindowPos(this.Handle,
+                    new IntPtr(newValue ? NativeFunctions.HWND_TOPMOST : NativeFunctions.HWND_NOTOPMOST), 0, 0, 0, 0,
+                    NativeFunctions.SWP_NOACTIVATE | NativeFunctions.SWP_NOMOVE | NativeFunctions.SWP_NOSIZE);
+        }
+
+        private int _ImageTextPadding = 11;
+        /// <summary>
+        /// Indicates spacing in pixels between image and text
+        /// </summary>
+        [DefaultValue(11), Category("Appearance"), Description("Indicates spacing in pixels between image and text")]
+        public int ImageTextPadding
+        {
+            get { return _ImageTextPadding; }
+            set
+            {
+                if (_ImageTextPadding != value)
+                {
+                    int oldValue = _ImageTextPadding;
+                    _ImageTextPadding = value;
+                    OnImageTextPaddingChanged(value, oldValue);
+                }
+            }
+        }
+
+        protected virtual void OnImageTextPaddingChanged(int newValue, int oldValue)
+        {
+
+        }
+
+        private bool UseTextRenderer
+        {
+            get { return true; /*_BackColors == null || _BackColors.Length < 2;*/ }
+        }
+
+        private bool _PlaySound = true;
+        /// <summary>
+        /// Indicates whether alert plays exclamation sound when shown.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether alert plays exclamation sound when shown.")]
+        public bool PlaySound
+        {
+            get { return _PlaySound; }
+            set
+            {
+                if (_PlaySound != value)
+                {
+                    bool oldValue = _PlaySound;
+                    _PlaySound = value;
+                    OnPlaySoundChanged(value, oldValue);
+                }
+            }
+        }
+
+        protected virtual void OnPlaySoundChanged(bool newValue, bool oldValue)
+        {
+            //throw new NotImplementedException();
+        }
+
+        private bool _CloseButtonVisible = true;
+        /// <summary>
+        /// Indicates whether close button on alert is visible
+        /// </summary>
+        [DefaultValue(true), Category("Appearance"), Description("Indicates whether close button on alert is visible")]
+        public bool CloseButtonVisible
+        {
+            get { return _CloseButtonVisible; }
+            set
+            {
+                if (_CloseButtonVisible != value)
+                {
+                    bool oldValue = _CloseButtonVisible;
+                    _CloseButtonVisible = value;
+                    OnCloseButtonVisibleChanged(value, oldValue);
+                }
+            }
+        }
+
+        protected virtual void OnCloseButtonVisibleChanged(bool newValue, bool oldValue)
+        {
+            //throw new NotImplementedException();
+        }
+        #endregion
+    }
+
+    /// <summary>
+    /// Defines the alert positions.
+    /// </summary>
+    public enum eAlertPosition
+    {
+        /// <summary>
+        /// Top-left screen position.
+        /// </summary>
+        TopLeft,
+        /// <summary>
+        /// Top-right screen position.
+        /// </summary>
+        TopRight,
+        /// <summary>
+        /// Bottom-right screen position.
+        /// </summary>
+        BottomRight,
+        /// <summary>
+        /// Bottom left screen position.
+        /// </summary>
+        BottomLeft
+    }
+    /// <summary>
+    /// Defines closure sources for the alert.
+    /// </summary>
+    public enum eAlertClosureSource
+    {
+        /// <summary>
+        /// Alert is closed becouse of timeout
+        /// </summary>
+        Timeout,
+        /// <summary>
+        /// Alert is closed becouse user clicked close button.
+        /// </summary>
+        CloseButton,
+        /// <summary>
+        /// Alert is closed becouse user clicked on the alert.
+        /// </summary>
+        AlertClicked
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/Flyout.ico b/PROMS/DotNetBar Source Code/Controls/Flyout.ico
new file mode 100644
index 00000000..f6992446
Binary files /dev/null and b/PROMS/DotNetBar Source Code/Controls/Flyout.ico differ
diff --git a/PROMS/DotNetBar Source Code/Controls/Flyout/Flyout.cs b/PROMS/DotNetBar Source Code/Controls/Flyout/Flyout.cs
new file mode 100644
index 00000000..e5c0fea0
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/Flyout/Flyout.cs	
@@ -0,0 +1,1342 @@
+using DevComponents.DotNetBar;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    /// <summary>
+    /// Component to display flyout popup.
+    /// </summary>
+    [ToolboxBitmap(typeof(Flyout), "Controls.Flyout.ico")]
+    [ToolboxItem(true), Designer("DevComponents.DotNetBar.Design.FlyoutDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+    [DefaultEvent("PrepareContent")]
+    public partial class Flyout : Component, IMessageHandlerClient
+    {
+        #region Constructor
+        public Flyout()
+        {
+            InitializeComponent();
+        }
+
+        public Flyout(IContainer container)
+        {
+            container.Add(this);
+
+            InitializeComponent();
+        }
+        #endregion
+
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            Close();
+            if (_MessageHandlerInstalled)
+            {
+                MessageHandler.UnregisterMessageClient(this);
+                _MessageHandlerInstalled = false;
+            }
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+
+            base.Dispose(disposing);
+        }
+
+        #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();
+        }
+
+        #endregion
+
+        #region Implementation
+        private bool _DropShadow;
+        private bool _TopMost;
+        private Control _Content = null;
+        /// <summary>
+        /// Indicates a control, usually panel with other controls inside of it, that is displayed on the flyout popup.
+        /// </summary>
+        [DefaultValue(null), Category("Appearance"), Description("Indicates a control, usually panel with other controls inside of it, that is displayed on the flyout popup.")]
+        public Control Content
+        {
+            get { return _Content; }
+            set
+            {
+                if (value != _Content)
+                {
+                    Control oldValue = _Content;
+                    _Content = value;
+                    OnContentChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when Content property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnContentChanged(Control oldValue, Control newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("Content"));
+
+        }
+
+        private ePointerSide _PointerSide = ePointerSide.Bottom;
+        /// <summary>
+        /// Indicates the side of the flyout triangle pointer is displayed on.
+        /// </summary>
+        [DefaultValue(ePointerSide.Bottom), Category("Appearance"), Description("Indicates the side of the flyout triangle pointer is displayed on.")]
+        public ePointerSide PointerSide
+        {
+            get { return _PointerSide; }
+            set
+            {
+                if (value != _PointerSide)
+                {
+                    ePointerSide oldValue = _PointerSide;
+                    _PointerSide = value;
+                    OnPointerSideChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when PointerSide property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnPointerSideChanged(ePointerSide oldValue, ePointerSide newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("PointerSide"));
+        }
+
+        private Control _TargetControl = null;
+        /// <summary>
+        /// Indicates the target control for the flyout display and positioning.
+        /// </summary>
+        [DefaultValue(null), Category("Behavior"), Description("Indicates the target control for the flyout display and positioning.")]
+        public Control TargetControl
+        {
+            get { return _TargetControl; }
+            set
+            {
+                if (value != _TargetControl)
+                {
+                    Control oldValue = _TargetControl;
+                    _TargetControl = value;
+                    OnTargetControlChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when TargetControl property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnTargetControlChanged(Control oldValue, Control newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("TargetControl"));
+            if (!this.DesignMode)
+            {
+                DetachFromControl(oldValue, _DisplayMode, _DeepIntegration);
+                AttachToControl(newValue, _DisplayMode, _DeepIntegration);
+            }
+        }
+
+        private void AttachToControl(Control c, eFlyoutDisplayMode displayMode, bool deepIntegration)
+        {
+            if (c == null) return;
+            if (displayMode == eFlyoutDisplayMode.MouseClick)
+            {
+                if (deepIntegration && c is SuperTabControl)
+                {
+                    SuperTabControl tab = (SuperTabControl)c;
+                    tab.TabStrip.ItemClick += TabStripMouseEvent;
+                }
+                else if (deepIntegration && c is AdvTree.AdvTree)
+                {
+                    AdvTree.AdvTree tree = (AdvTree.AdvTree)c;
+                    tree.NodeClick += TreeMouseEvent;
+                }
+                else if (deepIntegration && c is TokenEditor)
+                {
+                    TokenEditor token = (TokenEditor)c;
+                    token.TokenMouseClick += TokenMouseEvent;
+                }
+                else if (deepIntegration && c is TabStrip)
+                {
+                    TabStrip strip = (TabStrip)c;
+                    strip.TabMouseClick += TabItemMouseEvent;
+                }
+                else if (deepIntegration && c is TabControl)
+                {
+                    TabControl strip = (TabControl)c;
+                    strip.TabStrip.TabMouseClick += TabItemMouseEvent;
+                }
+                else if (deepIntegration && c is Bar)
+                {
+                    Bar bar = (Bar)c;
+                    bar.ItemClick += BaseItemMouseEvent;
+                }
+                else
+                    c.MouseClick += TargetMouseClick;
+            }
+            else if (displayMode == eFlyoutDisplayMode.MouseHover)
+            {
+                if (deepIntegration && c is SuperTabControl)
+                {
+                    SuperTabControl tab = (SuperTabControl)c;
+                    tab.TabStrip.MouseHover += TabStripMouseEvent;
+                    tab.TabStrip.MouseLeave += TargetMouseLeave;
+                }
+                else if (deepIntegration && c is AdvTree.AdvTree)
+                {
+                    AdvTree.AdvTree tree = (AdvTree.AdvTree)c;
+                    tree.NodeMouseHover += TreeMouseEvent;
+                    tree.NodeMouseLeave += TargetMouseLeave;
+                }
+                else if (deepIntegration && c is TokenEditor)
+                {
+                    TokenEditor token = (TokenEditor)c;
+                    token.TokenMouseHover += TokenMouseEvent;
+                    token.TokenMouseLeave += TargetMouseLeave;
+                }
+                else if (deepIntegration && c is TabStrip)
+                {
+                    TabStrip tab = (TabStrip)c;
+                    tab.TabMouseHover += TabItemMouseEvent;
+                    tab.TabMouseLeave += TargetMouseLeave;
+                }
+                else if (deepIntegration && c is TabControl)
+                {
+                    TabControl tab = (TabControl)c;
+                    tab.TabStrip.TabMouseHover += TabItemMouseEvent;
+                    tab.TabStrip.TabMouseLeave += TargetMouseLeave;
+                }
+                else if (deepIntegration && c is Bar)
+                {
+                    Bar bar = (Bar)c;
+                    bar.MouseHover += BaseItemMouseEvent;
+                    bar.MouseLeave += TargetMouseLeave;
+                }
+                else
+                    c.MouseHover += TargetMouseHover;
+            }
+            else if (displayMode == eFlyoutDisplayMode.MouseOver)
+            {
+                if (deepIntegration && c is SuperTabControl)
+                {
+                    SuperTabControl tab = (SuperTabControl)c;
+                    tab.TabStrip.MouseEnter += TabStripMouseEvent;
+                    tab.TabStrip.MouseLeave += TargetMouseLeave;
+                }
+                else if (deepIntegration && c is AdvTree.AdvTree)
+                {
+                    AdvTree.AdvTree tree = (AdvTree.AdvTree)c;
+                    tree.NodeMouseEnter += TreeMouseEvent;
+                    tree.NodeMouseLeave += TargetMouseLeave;
+                }
+                else if (deepIntegration && c is TokenEditor)
+                {
+                    TokenEditor token = (TokenEditor)c;
+                    token.TokenMouseEnter += TokenMouseEvent;
+                    token.TokenMouseLeave += TargetMouseLeave;
+                }
+                else if (deepIntegration && c is TabStrip)
+                {
+                    TabStrip tab = (TabStrip)c;
+                    tab.TabMouseEnter += TabItemMouseEvent;
+                    tab.TabMouseLeave += TargetMouseLeave;
+                }
+                else if (deepIntegration && c is TabControl)
+                {
+                    TabControl tab = (TabControl)c;
+                    tab.TabStrip.TabMouseEnter += TabItemMouseEvent;
+                    tab.TabStrip.TabMouseLeave += TargetMouseLeave;
+                }
+                else if (deepIntegration && c is Bar)
+                {
+                    Bar bar = (Bar)c;
+                    bar.MouseMove += BaseItemMouseEvent;
+                    bar.MouseLeave += TargetMouseLeave;
+                }
+                else
+                    c.MouseEnter += TargetMouseEnter;
+            }
+            c.Leave += TargetLeaveFocus;
+            c.VisibleChanged += TargetVisibleChanged;
+        }
+
+        private void DetachFromControl(Control c, eFlyoutDisplayMode displayMode, bool deepIntegration)
+        {
+            if (c == null) return;
+            if (displayMode == eFlyoutDisplayMode.MouseClick)
+            {
+                if (deepIntegration && c is SuperTabControl)
+                {
+                    SuperTabControl tab = (SuperTabControl)c;
+                    tab.TabStrip.ItemClick -= TabStripMouseEvent;
+                }
+                else if (deepIntegration && c is AdvTree.AdvTree)
+                {
+                    AdvTree.AdvTree tree = (AdvTree.AdvTree)c;
+                    tree.NodeClick -= TreeMouseEvent;
+                }
+                else if (deepIntegration && c is TokenEditor)
+                {
+                    TokenEditor token = (TokenEditor)c;
+                    token.TokenMouseClick -= TokenMouseEvent;
+                }
+                else if (deepIntegration && c is TabStrip)
+                {
+                    TabStrip strip = (TabStrip)c;
+                    strip.TabMouseClick -= TabItemMouseEvent;
+                }
+                else if (deepIntegration && c is TabControl)
+                {
+                    TabControl strip = (TabControl)c;
+                    strip.TabStrip.TabMouseClick -= TabItemMouseEvent;
+                }
+                else if (deepIntegration && c is Bar)
+                {
+                    Bar bar = (Bar)c;
+                    bar.ItemClick -= BaseItemMouseEvent;
+                }
+                else
+                    c.MouseClick -= TargetMouseClick;
+            }
+            else if (displayMode == eFlyoutDisplayMode.MouseHover)
+            {
+                if (deepIntegration && c is SuperTabControl)
+                {
+                    SuperTabControl tab = (SuperTabControl)c;
+                    tab.TabStrip.MouseHover -= TabStripMouseEvent;
+                    tab.TabStrip.MouseLeave -= TargetMouseLeave;
+                }
+                else if (deepIntegration && c is AdvTree.AdvTree)
+                {
+                    AdvTree.AdvTree tree = (AdvTree.AdvTree)c;
+                    tree.NodeMouseHover -= TreeMouseEvent;
+                    tree.NodeMouseLeave -= TargetMouseLeave;
+                }
+                else if (deepIntegration && c is TokenEditor)
+                {
+                    TokenEditor token = (TokenEditor)c;
+                    token.TokenMouseHover -= TokenMouseEvent;
+                    token.TokenMouseLeave -= TargetMouseLeave;
+                }
+                else if (deepIntegration && c is TabStrip)
+                {
+                    TabStrip tab = (TabStrip)c;
+                    tab.TabMouseHover -= TabItemMouseEvent;
+                    tab.TabMouseLeave -= TargetMouseLeave;
+                }
+                else if (deepIntegration && c is TabControl)
+                {
+                    TabControl tab = (TabControl)c;
+                    tab.TabStrip.TabMouseHover -= TabItemMouseEvent;
+                    tab.TabStrip.TabMouseLeave -= TargetMouseLeave;
+                }
+                else if (deepIntegration && c is Bar)
+                {
+                    Bar bar = (Bar)c;
+                    bar.MouseHover -= BaseItemMouseEvent;
+                    bar.MouseLeave -= TargetMouseLeave;
+                }
+                else
+                    c.MouseHover -= TargetMouseHover;
+            }
+            else if (displayMode == eFlyoutDisplayMode.MouseOver)
+            {
+                if (deepIntegration && c is SuperTabControl)
+                {
+                    SuperTabControl tab = (SuperTabControl)c;
+                    tab.TabStrip.MouseEnter -= TabStripMouseEvent;
+                    tab.TabStrip.MouseLeave -= TargetMouseLeave;
+                }
+                else if (deepIntegration && c is AdvTree.AdvTree)
+                {
+                    AdvTree.AdvTree tree = (AdvTree.AdvTree)c;
+                    tree.NodeMouseEnter -= TreeMouseEvent;
+                    tree.NodeMouseLeave -= TargetMouseLeave;
+                }
+                else if (deepIntegration && c is TokenEditor)
+                {
+                    TokenEditor token = (TokenEditor)c;
+                    token.TokenMouseEnter -= TokenMouseEvent;
+                    token.TokenMouseLeave -= TargetMouseLeave;
+                }
+                else if (deepIntegration && c is TabStrip)
+                {
+                    TabStrip tab = (TabStrip)c;
+                    tab.TabMouseEnter -= TabItemMouseEvent;
+                    tab.TabMouseLeave -= TargetMouseLeave;
+                }
+                else if (deepIntegration && c is TabControl)
+                {
+                    TabControl tab = (TabControl)c;
+                    tab.TabStrip.TabMouseEnter -= TabItemMouseEvent;
+                    tab.TabStrip.TabMouseLeave -= TargetMouseLeave;
+                }
+                else if (deepIntegration && c is Bar)
+                {
+                    Bar bar = (Bar)c;
+                    bar.MouseEnter -= BaseItemMouseEvent;
+                    bar.MouseLeave -= TargetMouseLeave;
+                }
+                else
+                    c.MouseEnter -= TargetMouseEnter;
+            }
+            c.Leave -= TargetLeaveFocus;
+            c.VisibleChanged -= TargetVisibleChanged;
+        }
+        private bool _CloseDelayed = false;
+        private void TargetMouseLeave(object sender, EventArgs e)
+        {
+            if (_IsFlyoutFormShown)
+            {
+                _CloseDelayed = true;
+                BarUtilities.InvokeDelayed(new MethodInvoker(delegate { CloseFlyoutDelayed(); }), 1000);
+                //Close();
+            }
+        }
+        private void CloseFlyoutDelayed()
+        {
+            if (!_CloseDelayed) return;
+            _CloseDelayed = false;
+            if (_IsFlyoutFormShown && _Flyout!=null && !_Flyout.Bounds.Contains(Control.MousePosition) && 
+                _TargetControl!=null && !(new Rectangle(_TargetControl.PointToScreen(_TargetControl.Location), _TargetControl.Size).Contains(Control.MousePosition)))
+            {
+                Close();
+            }
+        }
+        private void TokenMouseEvent(object sender, EventArgs e)
+        {
+            if (_IsFlyoutFormShown)
+                Close();
+            Show(sender);
+        }
+        private void TreeMouseEvent(object sender, AdvTree.TreeNodeMouseEventArgs e)
+        {
+            if (_IsFlyoutFormShown)
+                Close();
+            Show(e.Node);
+        }
+        private void TabItemMouseEvent(object sender, EventArgs e)
+        {
+            if (sender is TabItem)
+            {
+                if (_IsFlyoutFormShown)
+                    Close();
+                if (!_IsFlyoutFormShown)
+                {
+                    Show(sender);
+                }
+            }
+            else
+                Close();
+        }
+        private void BaseItemMouseEvent(object sender, EventArgs e)
+        {
+            if (sender is BaseItem)
+            {
+                if (_IsFlyoutFormShown)
+                    Close();
+                if (!_IsFlyoutFormShown)
+                {
+                    Show(sender);
+                }
+            }
+            else if (sender is Bar)
+            {
+                Bar bar = (Bar)sender;
+                Point p = bar.PointToClient(Control.MousePosition);
+                BaseItem item = bar.ItemsContainer.ItemAtLocation(p.X, p.Y);
+                if (item != null)
+                {
+                    if (_TargetItem != null && _TargetItem.IsAlive && _TargetItem.Target == item)
+                        return;
+                    
+                    if (_IsFlyoutFormShown)
+                        Close();
+                    
+                    if (!_IsFlyoutFormShown)
+                    {
+                        Show(item);
+                    }
+                }
+                else
+                    Close();
+            }
+            else
+                Close();
+        }
+        private void TabStripMouseEvent(object sender, EventArgs e)
+        {
+            if (sender is SuperTabItem)
+            {
+                if (_IsFlyoutFormShown)
+                    Close();
+                if (!_IsFlyoutFormShown)
+                {
+                    Show(sender);
+                }
+            }
+            else
+                Close();
+        }
+
+        private bool _DeepIntegration = true;
+        /// <summary>
+        /// Indicates whether Flyout integrates on item level with DotNetBar controls it recognizes like SuperTabControl, AdvTree etc.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether Flyout integrates on item level with DotNetBar controls it recognizes like SuperTabControl, AdvTree etc.")]
+        public bool DeepIntegration
+        {
+            get { return _DeepIntegration; }
+            set
+            {
+                if (value != _DeepIntegration)
+                {
+                    bool oldValue = _DeepIntegration;
+                    _DeepIntegration = value;
+                    OnDeepControlIntegrationChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when DeepControlIntegration property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnDeepControlIntegrationChanged(bool oldValue, bool newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("DeepControlIntegration"));
+            DetachFromControl(_TargetControl, _DisplayMode, oldValue);
+            AttachToControl(_TargetControl, _DisplayMode, newValue);
+        }
+
+        private void TargetVisibleChanged(object sender, EventArgs e)
+        {
+            if ((_CloseMode & eFlyoutCloseMode.TargetControlHidden) == eFlyoutCloseMode.TargetControlHidden && _TargetControl != null && !_TargetControl.Visible)
+                Close();
+        }
+        void TargetLeaveFocus(object sender, EventArgs e)
+        {
+            if ((_CloseMode & eFlyoutCloseMode.TargetControlLostFocus) == eFlyoutCloseMode.TargetControlLostFocus)
+                Close();
+        }
+
+        void TargetMouseEnter(object sender, EventArgs e)
+        {
+            if (!_IsFlyoutFormShown)
+                Show();
+        }
+
+        void TargetMouseHover(object sender, EventArgs e)
+        {
+            if (!_IsFlyoutFormShown)
+                Show();
+        }
+        private void TargetMouseClick(object sender, MouseEventArgs e)
+        {
+            if (!_IsFlyoutFormShown)
+                Show();
+        }
+        private eFlyoutDisplayMode _DisplayMode = eFlyoutDisplayMode.MouseOver;
+        /// <summary>
+        /// Specifies when the flyout is displayed.
+        /// </summary>
+        [DefaultValue(eFlyoutDisplayMode.MouseOver), Category("Behavior"), Description("Specifies when the flyout is displayed.")]
+        public eFlyoutDisplayMode DisplayMode
+        {
+            get { return _DisplayMode; }
+            set
+            {
+                if (value != _DisplayMode)
+                {
+                    eFlyoutDisplayMode oldValue = _DisplayMode;
+                    _DisplayMode = value;
+                    OnDisplayModeChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when DisplayMode property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnDisplayModeChanged(eFlyoutDisplayMode oldValue, eFlyoutDisplayMode newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("DisplayMode"));
+            DetachFromControl(_TargetControl, oldValue, _DeepIntegration);
+            AttachToControl(_TargetControl, newValue, _DeepIntegration);
+        }
+
+        private eFlyoutCloseMode _CloseMode = eFlyoutCloseMode.ClickOutside | eFlyoutCloseMode.ParentFormDeactivate;
+        /// <summary>
+        /// Indicates when Flyout is automatically closed.
+        /// </summary>
+        [DefaultValue(eFlyoutCloseMode.ClickOutside | eFlyoutCloseMode.ParentFormDeactivate), Category("Behavior"), Description("Indicates when Flyout is automatically closed.")]
+        public eFlyoutCloseMode CloseMode
+        {
+            get { return _CloseMode; }
+            set
+            {
+                if (value != _CloseMode)
+                {
+                    eFlyoutCloseMode oldValue = _CloseMode;
+                    _CloseMode = value;
+                    OnCloseModeChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when CloseMode property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnCloseModeChanged(eFlyoutCloseMode oldValue, eFlyoutCloseMode newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("CloseMode"));
+
+        }
+
+        private Rectangle GetTargetBounds(object targetItem)
+        {
+            if (targetItem is BaseItem)
+            {
+                BaseItem item = (BaseItem)targetItem;
+                return new Rectangle(_TargetControl.PointToScreen(item.Bounds.Location), item.Bounds.Size);
+            }
+            else if (targetItem is DevComponents.AdvTree.Node)
+            {
+                DevComponents.AdvTree.Node node = (DevComponents.AdvTree.Node)targetItem;
+                return new Rectangle(_TargetControl.PointToScreen(node.Bounds.Location), node.Bounds.Size);
+            }
+            else if(targetItem is EditToken)
+            {
+                EditToken token = (EditToken)targetItem;
+                return new Rectangle(_TargetControl.PointToScreen(token.Bounds.Location), token.Bounds.Size);
+            }
+            else if (targetItem is TabItem)
+            {
+                TabItem tab = (TabItem)targetItem;
+                return new Rectangle(_TargetControl.PointToScreen(tab.DisplayRectangle.Location), tab.DisplayRectangle.Size);
+            }
+
+            return new Rectangle(_TargetControl.PointToScreen(Point.Empty), _TargetControl.Size);
+        }
+
+        /// <summary>
+        /// Occurs before the flyout is shown for specific target and allows you to prepare Content for it. Sender of event will be the targeted control or item.
+        /// </summary>
+        [Description("Occurs before the flyout is shown for specific target and allows you to prepare Content for it. Sender of event will be the targeted control or item.")]
+        public event EventHandler PrepareContent;
+        /// <summary>
+        /// Raises PrepareContent event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnPrepareContent(object sender, EventArgs e)
+        {
+            EventHandler handler = PrepareContent;
+            if (handler != null)
+                handler(sender, e);
+        }
+
+        public virtual void Show(object targetItem)
+        {
+            OnPrepareContent(targetItem, EventArgs.Empty);
+
+            Rectangle r = new Rectangle();
+            ePointerSide pointerSide = _PointerSide;
+            int pointerOffset = 10;
+
+            if (_TargetControl != null)
+            {
+                Rectangle targetBounds = GetTargetBounds(targetItem ?? _TargetControl);
+                ScreenInformation si = BarFunctions.ScreenFromControl(_TargetControl);
+                if (pointerSide == ePointerSide.Top)
+                {
+                    // Displaying callout below the control
+                    r.Size = GetFlyoutFormSize();
+                    if (targetBounds.Bottom + r.Height > si.WorkingArea.Bottom)
+                    {
+                        // Move flyout above the control
+                        pointerSide = ePointerSide.Bottom;
+                        r.Location = new Point(targetBounds.X, targetBounds.Y - r.Height);
+                    }
+                    else
+                        r.Location = new Point(targetBounds.X, targetBounds.Bottom);
+                    if (targetBounds.Width > r.Width)
+                        r.X += (targetBounds.Width - r.Width) / 2;
+                    else if (targetBounds.Width < r.Width)
+                        r.X -= (r.Width - targetBounds.Width) / 2;
+                    if (r.X < si.WorkingArea.X)
+                        r.X = si.WorkingArea.X;
+                    else if (r.Right > si.WorkingArea.Right)
+                        r.X = si.WorkingArea.Right - r.Width;
+                    Rectangle intersect = Rectangle.Intersect(r, new Rectangle(targetBounds.X, r.Y, targetBounds.Width, r.Height));
+                    if (intersect.IsEmpty)
+                        pointerOffset = (Math.Min(targetBounds.Width, r.Width) - FlyoutForm.PointerSize.Width) / 2;
+                    else
+                        pointerOffset = Math.Abs(intersect.X - r.X) + (intersect.Width - FlyoutForm.PointerSize.Width) / 2;
+                }
+                else if (pointerSide == ePointerSide.Bottom)
+                {
+                    // Displaying callout above the control
+                    r.Size = GetFlyoutFormSize();
+                    if (targetBounds.Y - r.Height < si.WorkingArea.Y)
+                    {
+                        // Move flyout below the control
+                        pointerSide = ePointerSide.Top;
+                        r.Location = new Point(targetBounds.X, targetBounds.Bottom);
+                    }
+                    else
+                        r.Location = new Point(targetBounds.X, targetBounds.Y - r.Height);
+                    if (targetBounds.Width > r.Width)
+                        r.X += (targetBounds.Width - r.Width) / 2;
+                    else if (targetBounds.Width < r.Width)
+                        r.X -= (r.Width - targetBounds.Width) / 2;
+                    if (r.X < si.WorkingArea.X)
+                        r.X = si.WorkingArea.X;
+                    else if (r.Right > si.WorkingArea.Right)
+                        r.X = si.WorkingArea.Right - r.Width;
+                    Rectangle intersect = Rectangle.Intersect(r, new Rectangle(targetBounds.X, r.Y, targetBounds.Width, r.Height));
+                    if (intersect.IsEmpty)
+                        pointerOffset = (Math.Min(targetBounds.Width, r.Width) - FlyoutForm.PointerSize.Width) / 2;
+                    else
+                        pointerOffset = Math.Abs(intersect.X - r.X) + (intersect.Width - FlyoutForm.PointerSize.Width) / 2;
+                }
+                else if (pointerSide == ePointerSide.Left)
+                {
+                    // Displaying callout to the right of the target control
+                    r.Size = GetFlyoutFormSize();
+                    if (targetBounds.Right + r.Width > si.WorkingArea.Right)
+                    {
+                        // Move flyout to the left of the control
+                        pointerSide = ePointerSide.Right;
+                        r.Location = new Point(targetBounds.X - r.Width, targetBounds.Y);
+                    }
+                    else
+                        r.Location = new Point(targetBounds.Right, targetBounds.Y);
+
+                    if (targetBounds.Height > r.Height)
+                        r.Y += (targetBounds.Height - r.Height) / 2;
+                    pointerOffset = (Math.Min(targetBounds.Height, r.Height) - FlyoutForm.PointerSize.Width) / 2;
+                }
+                else if (pointerSide == ePointerSide.Right)
+                {
+                    // Displaying callout to the Left of the target control
+                    r.Size = GetFlyoutFormSize();
+                    if (targetBounds.X - r.Width < si.WorkingArea.X)
+                    {
+                        // Move flyout to the right of the control
+                        pointerSide = ePointerSide.Left;
+                        r.Location = new Point(targetBounds.Right, targetBounds.Y);
+                    }
+                    else
+                        r.Location = new Point(targetBounds.X - r.Width, targetBounds.Y);
+
+                    if (targetBounds.Height > r.Height)
+                        r.Y += (targetBounds.Height - r.Height) / 2;
+                    pointerOffset = (Math.Min(targetBounds.Height, r.Height) - FlyoutForm.PointerSize.Width) / 2;
+                }
+            }
+            Show(r, pointerSide, pointerOffset, targetItem);
+        }
+
+        /// <summary>
+        /// Shows flyout with the Content. 
+        /// </summary>
+        public virtual void Show()
+        {
+            Show(_TargetControl);
+        }
+
+        /// <summary>
+        /// Returns the flyout size based on Content size.
+        /// </summary>
+        /// <returns>Proposed flyout size.</returns>
+        public virtual Size GetFlyoutFormSize()
+        {
+            if (_Content != null)
+            {
+                Size size = _Content.Size;
+                if (_PointerSide == ePointerSide.Bottom || _PointerSide == ePointerSide.Top)
+                {
+                    size.Height += FlyoutForm.PointerSize.Height + 4;
+                    size.Width += 2;
+                }
+                else
+                {
+                    size.Width += FlyoutForm.PointerSize.Height + 4;
+                    size.Height += 2;
+                }
+                return size;
+            }
+            return new Size(100, 100);
+        }
+        /// <summary>
+        /// Shows flyout at specified location and with specified size. Size can be empty (0,0) and flyout will be automatically sized based on the content.
+        /// </summary>
+        /// <param name="screenFlyoutBounds"></param>
+        public virtual void Show(Rectangle screenFlyoutBounds)
+        {
+            Show(screenFlyoutBounds, _PointerSide, 10, _TargetControl);
+        }
+        [Description("Occurs before the flyout form is shown and allows you to cancel the showing.")]
+        public event FlyoutShowingEventHandler FlyoutShowing;
+        /// <summary>
+        /// Raises FlyoutShowing event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnFlyoutShowing(FlyoutShowingEventArgs e)
+        {
+            FlyoutShowingEventHandler handler = FlyoutShowing;
+            if (handler != null)
+                handler(this, e);
+        }
+        /// <summary>
+        /// Occurs after flyout has been shown.
+        /// </summary>
+        [Description("Occurs after flyout has been shown.")]
+        public event EventHandler FlyoutShown;
+        /// <summary>
+        /// Raises FlyoutShown event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnFlyoutShown(EventArgs e)
+        {
+            EventHandler handler = FlyoutShown;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        /// <summary>
+        /// Provides opportunity to cancel showing of the flyout before any objects are created and allocated. This is preferred event to cancel flyout showing.
+        /// </summary>
+        [Description("Provides opportunity to cancel showing of the flyout before any objects are created and allocated. This is preferred event to cancel flyout showing.")]
+        public event CancelEventHandler QueryShowFlyout;
+        /// <summary>
+        /// Raises QueryShowFlyout event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnQueryShowFlyout(object sender, CancelEventArgs e)
+        {
+            CancelEventHandler handler = QueryShowFlyout;
+            if (handler != null)
+                handler(sender, e);
+        }
+
+        private bool _IsFlyoutFormShown = false;
+        private Control _OldContentParent = null;
+        private WeakReference _TargetItem = null;
+        private FlyoutForm _Flyout = null;
+
+        /// <summary>
+        /// Gets reference to active FlyoutForm or return null/nothing if flyout is not currently shown.
+        /// </summary>
+        [Browsable(false)]
+        public FlyoutForm FlyoutForm
+        {
+            get { return _Flyout; }
+        }
+
+        /// <summary>
+        /// Shows flyout at specified location and with specified size. Size can be empty (0,0) and flyout will be automatically sized based on the content.
+        /// </summary>
+        /// <param name="screenFlyoutBounds">Screen bounds to display flyout at.</param>
+        /// <param name="pointerSide">Side of the flyout which will have pointer triangle</param>
+        /// <param name="pointerOffset">Pointer position either x or y depending on which side pointer is displayed on.</param>
+        /// <param name="targetItem">Target item for the flyout.</param>
+        public virtual void Show(Rectangle screenFlyoutBounds, ePointerSide pointerSide, int pointerOffset, object targetItem)
+        {
+            _CloseDelayed = false;
+            if (_IsFlyoutFormShown)
+            {
+                if (_Flyout != null) _Flyout.Activate();
+                return;
+            }
+
+            CancelEventArgs cancelShow = new CancelEventArgs();
+            OnQueryShowFlyout(targetItem??_TargetControl,cancelShow);
+            if (cancelShow.Cancel) return;
+
+            FlyoutForm form = new FlyoutForm();
+            if (!_BorderColor.IsEmpty)
+                form.BorderColor = _BorderColor;
+            if (!_BackColor.IsEmpty)
+                form.BackColor = _BackColor;
+            form.PointerSide = pointerSide;
+            form.ActivateOnShow = _ActivateOnShow;
+            form.TopMost = _TopMost;
+            form.DropShadow = _DropShadow;
+            form.PointerOffset = pointerOffset;
+            if (_Content != null)
+            {
+                if (screenFlyoutBounds.Size.IsEmpty)
+                {
+                    screenFlyoutBounds.Size = GetFlyoutFormSize();
+                }
+
+                if (_Content.Parent != null)
+                {
+                    _OldContentParent = _Content.Parent;
+                    _OldContentParent.Controls.Remove(_Content);
+                }
+
+                form.Controls.Add(_Content);
+                _Content.Location = new Point(
+                    (pointerSide == ePointerSide.Left) ? FlyoutForm.PointerSize.Height + 1 : 1,
+                    (pointerSide == ePointerSide.Top) ? FlyoutForm.PointerSize.Height + 1 : 1);
+                _Content.Visible = true;
+            }
+
+            form.Size = Size.Empty;
+            form.Location = screenFlyoutBounds.Location;
+            form.FormClosed += FlyoutFormClosed;
+            form.FormClosing += FlyoutFormClosing;
+            FlyoutShowingEventArgs eargs = new FlyoutShowingEventArgs(form, targetItem);
+            OnFlyoutShowing(eargs);
+            if (eargs.Cancel)
+            {
+                FlyoutCloseCleanup(form);
+                form.Close();
+                form.Dispose();
+                return;
+            }
+            _IsFlyoutFormShown = true;
+            form.Visible = true;
+            form.Size = screenFlyoutBounds.Size;
+            _Flyout = form;
+            _TargetItem = new WeakReference(targetItem);
+            OnFlyoutShown(EventArgs.Empty);
+
+            if (!_MessageHandlerInstalled && (_CloseMode & eFlyoutCloseMode.ClickOutside) == eFlyoutCloseMode.ClickOutside)
+            {
+                MessageHandler.RegisterMessageClient(this);
+                _MessageHandlerInstalled = true;
+            }
+
+            if (_Parent != null && (_CloseMode & eFlyoutCloseMode.ParentFormDeactivate) == eFlyoutCloseMode.ParentFormDeactivate)
+            {
+                Form parentForm = null;
+                if (_Parent is Form)
+                    parentForm = (Form)_Parent;
+                else
+                    parentForm = _Parent.FindForm();
+                if (parentForm != null)
+                {
+                    parentForm.Deactivate += ParentFormDeactivate;
+                    _ParentForm = parentForm;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Occurs before flyout is closed and allows you to cancel the closing.
+        /// </summary>
+        [Description("Occurs before flyout is closed and allows you to cancel the closing.")]
+        public event FormClosingEventHandler FlyoutClosing;
+        /// <summary>
+        /// Raises FlyoutClosing event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnFlyoutClosing(FormClosingEventArgs e)
+        {
+            FormClosingEventHandler handler = FlyoutClosing;
+            if (handler != null)
+                handler(this, e);
+        }
+        private void FlyoutFormClosing(object sender, FormClosingEventArgs e)
+        {
+            OnFlyoutClosing(e);
+        }
+
+        /// <summary>
+        /// Occurs after flyout is closed.
+        /// </summary>
+        [Description("Occurs after flyout is closed.")]
+        public event FormClosedEventHandler FlyoutClosed;
+        /// <summary>
+        /// Raises FlyoutClosed event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnFlyoutClosed(FormClosedEventArgs e)
+        {
+            FormClosedEventHandler handler = FlyoutClosed;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        private Form _ParentForm = null;
+        void ParentFormDeactivate(object sender, EventArgs e)
+        {
+            if (_Flyout != null && _Flyout.Bounds.Contains(Control.MousePosition))
+                return;
+            Close();
+        }
+
+        /// <summary>
+        /// Closes the flyout form if it was open.
+        /// </summary>
+        public virtual void Close()
+        {
+            FlyoutForm flyout = _Flyout;
+            if (flyout != null)
+            {
+                flyout.Close();
+                flyout.Dispose();
+            }
+        }
+
+        private void FlyoutCloseCleanup(FlyoutForm form)
+        {
+            _TargetItem = null;
+            _IsFlyoutFormShown = false;
+            form.FormClosed -= FlyoutFormClosed;
+            form.Controls.Remove(_Content);
+            if (_OldContentParent != null)
+            {
+                _Content.Visible = false;
+                _OldContentParent.Controls.Add(_Content);
+                _OldContentParent = null;
+            }
+            _Flyout = null;
+            if (_ParentForm != null)
+            {
+                _ParentForm.Deactivate -= ParentFormDeactivate;
+                _ParentForm = null;
+            }
+        }
+        private void FlyoutFormClosed(object sender, FormClosedEventArgs e)
+        {
+            FlyoutForm form = (FlyoutForm)sender;
+            OnFlyoutClosed(e);
+            FlyoutCloseCleanup(form);
+        }
+
+        private bool _ActivateOnShow = false;
+        /// <summary>
+        /// Indicates whether flyout is active/focused when its shown, default value is false.
+        /// </summary>
+        [DefaultValue(false), Category("Behavior"), Description("Indicates whether flyout is active/focused when its shown, default value is false.")]
+        public bool ActivateOnShow
+        {
+            get { return _ActivateOnShow; }
+            set
+            {
+                if (value != _ActivateOnShow)
+                {
+                    bool oldValue = _ActivateOnShow;
+                    _ActivateOnShow = value;
+                    OnActivateOnShowChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when ActivateOnShow property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnActivateOnShowChanged(bool oldValue, bool newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("ActivateOnShow"));
+
+        }
+
+        /// <summary>
+        /// Indicates whether flyout is made top-most window when shown
+        /// </summary>
+        [DefaultValue(false), Category("Behavior"), Description("Indicates whether flyout is made top-most window when shown.")]
+        public bool TopMost
+        {
+            get { return _TopMost; }
+            set
+            {
+                if (value != _TopMost)
+                {
+                    bool oldValue = _TopMost;
+                    _TopMost = value;
+                    OnTopMostChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when TopMost property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnTopMostChanged(bool oldValue, bool newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("TopMost"));
+
+        }
+
+        private Color _BackColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets the background flyout color. Default value is Color.Empty which indicates that current color scheme will be used.
+        /// </summary>
+        [Category("Columns"), Description("Indicates background flyout color. Default value is Color.Empty which indicates that current color scheme will be used.")]
+        public Color BackColor
+        {
+            get { return _BackColor; }
+            set { _BackColor = value; }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeBackColor()
+        {
+            return !_BackColor.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetBackColor()
+        {
+            this.BackColor = Color.Empty;
+        }
+
+        private Color _BorderColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets the flyout border color. Default value of Color.Empty indicates that color scheme will be used.
+        /// </summary>
+        [Category("Columns"), Description("Indicates flyout border color. Default value of Color.Empty indicates that color scheme will be used.")]
+        public Color BorderColor
+        {
+            get { return _BorderColor; }
+            set { _BorderColor = value; }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeBorderColor()
+        {
+            return !_BorderColor.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetBorderColor()
+        {
+            this.BorderColor = Color.Empty;
+        }
+
+        /// <summary>
+        /// Indicates whether flyout displays drop shadow.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance"), Description("Indicates whether flyout displays drop shadow")]
+        public bool DropShadow
+        {
+            get { return _DropShadow; }
+            set
+            {
+                if (value != _DropShadow)
+                {
+                    bool oldValue = _DropShadow;
+                    _DropShadow = value;
+                    OnDropShadowChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when DropShadow property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnDropShadowChanged(bool oldValue, bool newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("DropShadow"));
+
+        }
+
+        private Control _Parent = null;
+        /// <summary>
+        /// Gets or sets the parent control for the Flyout. Parent is used to find the parent form so flyout can be closed when form is de-activated.
+        /// </summary>
+        [Browsable(false), DefaultValue(null)]
+        public Control Parent
+        {
+            get { return _Parent; }
+            set
+            {
+                if (value != _Parent)
+                {
+                    Control oldValue = _Parent;
+                    _Parent = value;
+                    OnParentChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when Parent property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnParentChanged(Control oldValue, Control newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("Parent"));
+        }
+        #endregion
+
+        #region IMessageHandlerClient
+        private bool _MessageHandlerInstalled = false;
+        bool IMessageHandlerClient.OnSysKeyDown(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+            return false;
+        }
+
+        bool IMessageHandlerClient.OnSysKeyUp(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+            return false;
+        }
+
+        bool IMessageHandlerClient.OnKeyDown(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+            return false;
+        }
+
+        bool IMessageHandlerClient.OnMouseDown(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+            if ((_CloseMode & eFlyoutCloseMode.ClickOutside) == eFlyoutCloseMode.ClickOutside)
+            {
+                FlyoutForm form = _Flyout;
+                if (form != null && form.Visible)
+                {
+                    if (!form.Bounds.Contains(Control.MousePosition))
+                    {
+                        // Ignore clicks on ComboBox popup
+                        string s = NativeFunctions.GetClassName(hWnd);
+                        s = s.ToLower();
+                        if (s.IndexOf("combolbox") < 0)
+                            Close();
+                    }
+                }
+            }
+            return false;
+        }
+
+        bool IMessageHandlerClient.OnMouseMove(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+            return false;
+        }
+
+        bool IMessageHandlerClient.OnMouseWheel(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+            return false;
+        }
+
+        bool IMessageHandlerClient.IsModal
+        {
+            get { return false; }
+        }
+        #endregion
+    }
+    /// <summary>
+    /// Defines delegate for the FlyoutShowing event.
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="ea"></param>
+    public delegate void FlyoutShowingEventHandler(object sender, FlyoutShowingEventArgs e);
+    public class FlyoutShowingEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets the reference to the flyout form.
+        /// </summary>
+        public FlyoutForm Flyout;
+        /// <summary>
+        /// Gets the reference to the flyout target usually TargetControl.
+        /// </summary>
+        public object Target;
+        /// <summary>
+        /// Allows you to cancel showing of the flyout by setting this value to true.
+        /// </summary>
+        public bool Cancel;
+        /// <summary>
+        /// Initializes a new instance of the FlyoutShowingEventArgs class.
+        /// </summary>
+        /// <param name="flyout"></param>
+        /// <param name="target"></param>
+        public FlyoutShowingEventArgs(FlyoutForm flyout, object target)
+        {
+            Flyout = flyout;
+            Target = target;
+        }
+    }
+
+    /// <summary>
+    /// Defines the modes for Flyout display.
+    /// </summary>
+    public enum eFlyoutDisplayMode
+    {
+        /// <summary>
+        /// Flyout is displayed manually using flyout.Show() method.
+        /// </summary>
+        Manual,
+        /// <summary>
+        /// Flyout is displayed when mouse is over TargetControl.
+        /// </summary>
+        MouseOver,
+        /// <summary>
+        /// Flyout is displayed when mouse is hovering over TargetControl.
+        /// </summary>
+        MouseHover,
+        /// <summary>
+        /// Flyout is displayed when left mouse button is clicked on TargetControl.
+        /// </summary>
+        MouseClick
+    }
+
+    /// <summary>
+    /// Defines Flyout closing condition.
+    /// </summary>
+    [Flags()]
+    public enum eFlyoutCloseMode
+    {
+        /// <summary>
+        /// Flyout is closed manually using flyout.Close() method.
+        /// </summary>
+        Manual,
+        /// <summary>
+        /// Flyout is closed when user clicks outside of flyout bounds.
+        /// </summary>
+        ClickOutside,
+        /// <summary>
+        /// Flyout is closed when TargetControl is hidden.
+        /// </summary>
+        TargetControlHidden,
+        /// <summary>
+        /// Flyout is closed when TargetControl loses focus.
+        /// </summary>
+        TargetControlLostFocus,
+        /// <summary>
+        /// Flyout is closed when parent forms deactivates.
+        /// </summary>
+        ParentFormDeactivate
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/Flyout/FlyoutColorTable.cs b/PROMS/DotNetBar Source Code/Controls/Flyout/FlyoutColorTable.cs
new file mode 100644
index 00000000..b51be9a0
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/Flyout/FlyoutColorTable.cs	
@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Text;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    /// <summary>
+    /// Defines colors for the Flyout control.
+    /// </summary>
+    public class FlyoutColorTable
+    {
+        /// <summary>
+        /// Specifies Flyout background color.
+        /// </summary>
+        public Color BackColor = Color.White;
+        /// <summary>
+        /// Specifies Flyout border color.
+        /// </summary>
+        public Color BorderColor = ColorScheme.GetColor(0x2B579A);
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/Flyout/FlyoutForm.Designer.cs b/PROMS/DotNetBar Source Code/Controls/Flyout/FlyoutForm.Designer.cs
new file mode 100644
index 00000000..75850a60
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/Flyout/FlyoutForm.Designer.cs	
@@ -0,0 +1,53 @@
+namespace DevComponents.DotNetBar.Controls
+{
+    partial class FlyoutForm
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form 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.SuspendLayout();
+            // 
+            // FlyoutForm
+            // 
+            
+            this.ControlBox = false;
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.Name = "FlyoutForm";
+            this.ShowInTaskbar = false;
+            this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
+            this.StartPosition = System.Windows.Forms.FormStartPosition.Manual;
+            this.Load += new System.EventHandler(this.Form1_Load);
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+    }
+}
+
diff --git a/PROMS/DotNetBar Source Code/Controls/Flyout/FlyoutForm.cs b/PROMS/DotNetBar Source Code/Controls/Flyout/FlyoutForm.cs
new file mode 100644
index 00000000..d12d80ec
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/Flyout/FlyoutForm.cs	
@@ -0,0 +1,323 @@
+using DevComponents.DotNetBar.Rendering;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Text;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    public partial class FlyoutForm : Form
+    {
+        public FlyoutForm()
+        {
+            this.SetStyle(ControlStyles.UserPaint, true);
+            this.SetStyle(ControlStyles.AllPaintingInWmPaint, true);
+            this.SetStyle(ControlStyles.ResizeRedraw, true);
+            this.SetStyle(ControlStyles.OptimizedDoubleBuffer, true);
+
+            InitializeComponent();
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.BackColor = Color.White;
+
+            //_PointerSide = ePointerSide.Top;
+            _PointerOffset = this.Width-50;
+        }
+
+        private int _PointerOffset;
+        private const int CS_DROPSHADOW = 0x00020000;
+        protected override CreateParams CreateParams
+        {
+            get
+            {
+                // add the drop shadow flag for automatically drawing
+                // a drop shadow around the form
+                CreateParams cp = base.CreateParams;
+                if(_DropShadow)
+                    cp.ClassStyle |= CS_DROPSHADOW;
+                return cp;
+            }
+        }
+        protected override bool ShowWithoutActivation
+        {
+            get
+            {
+                return !_ActivateOnShow;
+            }
+        }
+
+        private bool _DropShadow = true;
+        /// <summary>
+        /// Indicates whether flyout displays a drop shadow.
+        /// </summary>
+        [DefaultValue(true)]
+        public bool DropShadow
+        {
+            get { return _DropShadow; }
+            set
+            {
+                _DropShadow = value;
+            }
+        }
+        
+
+        private bool _ActivateOnShow = false;
+        /// <summary>
+        /// Gets or sets whether form is made active/focused when shown.
+        /// </summary>
+        [DefaultValue(false)]
+        public bool ActivateOnShow
+        {
+            get { return _ActivateOnShow; }
+            set
+            {
+                _ActivateOnShow = value;
+            }
+        }
+        
+        private GraphicsPath GetFormPath(Rectangle r)
+        {
+            return GetFormPath(r, false);
+        }
+
+        private static readonly Size _PointerSize = new Size(24, 12);
+        internal static Size PointerSize
+        {
+            get
+            {
+                return _PointerSize;
+            }
+        }
+        private GraphicsPath GetFormPath(Rectangle r, bool isBorder)
+        {
+            Size calloutSize = _PointerSize; // new Size(24, 12);
+            GraphicsPath path = new GraphicsPath();
+
+            if (_PointerSide == ePointerSide.Top)
+            {
+                int cX = Math.Min(Math.Max(3, _PointerOffset), r.Width - calloutSize.Width + 3); //r.Right - (calloutSize.Width + 10);
+                path.AddLine(r.X, r.Y + calloutSize.Height, cX + (isBorder ? 1 : 0), r.Y + calloutSize.Height);
+                path.AddLine(cX, r.Y + calloutSize.Height, cX + calloutSize.Width / 2, r.Y);
+                path.AddLine(cX + calloutSize.Width / 2, r.Y, cX + calloutSize.Width, r.Y + calloutSize.Height);
+                path.AddLine(cX + calloutSize.Width, r.Y + calloutSize.Height, r.Right, r.Y + calloutSize.Height);
+                path.AddLine(r.Right, r.Y + calloutSize.Height, r.Right, r.Bottom);
+                path.AddLine(r.Right, r.Bottom, r.X, r.Bottom);
+                path.AddLine(r.X, r.Bottom, r.X, r.Y + calloutSize.Height);
+                path.CloseAllFigures();
+            }
+            else if (_PointerSide == ePointerSide.Bottom)
+            {
+                int cX = Math.Min(Math.Max(3, _PointerOffset), r.Width - calloutSize.Width + 3); //r.Right - (calloutSize.Width + 10);
+                path.AddLine(r.X, r.Bottom - calloutSize.Height, cX + (isBorder ? 1 : 0), r.Bottom - calloutSize.Height);
+                path.AddLine(cX, r.Bottom - calloutSize.Height, cX + calloutSize.Width / 2, r.Bottom);
+                path.AddLine(cX + calloutSize.Width / 2, r.Bottom, cX + calloutSize.Width, r.Bottom - calloutSize.Height);
+                path.AddLine(cX + calloutSize.Width, r.Bottom - calloutSize.Height, r.Right, r.Bottom - calloutSize.Height);
+                path.AddLine(r.Right, r.Bottom - calloutSize.Height, r.Right, r.Y);
+                path.AddLine(r.Right, r.Y, r.X, r.Y);
+                path.AddLine(r.X, r.Y, r.X, r.Bottom - calloutSize.Height);
+                path.CloseAllFigures();
+            }
+            else if (_PointerSide == ePointerSide.Left)
+            {
+                int cY = Math.Min(Math.Max(3, _PointerOffset), r.Height - calloutSize.Width + 3); //r.Bottom - (calloutSize.Width + 10);
+                path.AddLine(r.X + calloutSize.Height, r.Bottom, r.X + calloutSize.Height, cY + (isBorder ? 1 : 0));
+                path.AddLine(r.X + calloutSize.Height, cY + (isBorder ? 1 : 0), r.X, cY + calloutSize.Width / 2);
+                path.AddLine(r.X, cY + calloutSize.Width / 2, r.X + calloutSize.Height, cY + calloutSize.Width);
+                path.AddLine(r.X + calloutSize.Height, cY + calloutSize.Width, r.X + calloutSize.Height, r.Y);
+                path.AddLine(r.X + calloutSize.Height, r.Y, r.Right, r.Y);
+                path.AddLine(r.Right, r.Y, r.Right, r.Bottom);
+                path.AddLine(r.Right, r.Bottom, r.X + calloutSize.Height, r.Bottom);
+                path.CloseAllFigures();
+            }
+            else if (_PointerSide == ePointerSide.Right)
+            {
+                int cY = Math.Min(Math.Max(3, _PointerOffset), r.Width - calloutSize.Height + 3); //r.Bottom - (calloutSize.Width + 10);
+                path.AddLine(r.Right - calloutSize.Height, r.Y, r.Right - calloutSize.Height, cY + (isBorder ? 1 : 0));
+                path.AddLine(r.Right - calloutSize.Height, cY + (isBorder ? 1 : 0), r.Right - (isBorder ? 1 : 0), cY + calloutSize.Width / 2);
+                path.AddLine(r.Right - (isBorder ? 1 : 0), cY + calloutSize.Width / 2, r.Right - calloutSize.Height, cY + calloutSize.Width);
+                path.AddLine(r.Right - calloutSize.Height, cY + calloutSize.Width, r.Right - calloutSize.Height, r.Bottom);
+                path.AddLine(r.Right - calloutSize.Height, r.Bottom, r.X, r.Bottom);
+                path.AddLine(r.X, r.Bottom, r.X, r.Y);
+                path.AddLine(r.X, r.Y, r.Right - calloutSize.Height, r.Y);
+                path.CloseAllFigures();
+            }
+
+            return path;
+        }
+        private Region GetFormRegion()
+        {
+            return new Region(GetFormPath(this.ClientRectangle));
+        }
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            Rectangle r = this.ClientRectangle;
+            r.Inflate(-1, -1);
+
+            FlyoutColorTable table = GetColorTable();
+
+            Color backColor = this.BackColor;
+            if (backColor.IsEmpty)
+                backColor = table.BackColor;
+            Color borderColor = _BorderColor;
+            if(borderColor == Color.Empty)
+            {
+                borderColor = table.BorderColor;
+            }
+
+            using (GraphicsPath path = GetFormPath(r, true))
+            {
+                using(SolidBrush borderBrush=new SolidBrush(borderColor))
+                   e.Graphics.FillRectangle(borderBrush, this.ClientRectangle);
+                e.Graphics.SetClip(path);
+                using (SolidBrush brush = new SolidBrush(backColor))
+                    e.Graphics.FillRectangle(brush, this.ClientRectangle);
+                e.Graphics.SmoothingMode = SmoothingMode.HighQuality;
+                //e.Graphics.DrawPath(Pens.Red, path);
+            }
+            //base.OnPaint(e);
+        }
+        private FlyoutColorTable GetColorTable()
+        {
+            return ((Office2007Renderer)GlobalManager.Renderer).ColorTable.Flyout;
+        }
+        private void Form1_Load(object sender, EventArgs e)
+        {
+            //UpdateFormRegion();
+        }
+
+        protected override void OnHandleCreated(EventArgs e)
+        {
+            UpdateFormRegion();
+            base.OnHandleCreated(e);
+        }
+
+        protected override void OnResize(EventArgs e)
+        {
+            UpdateFormRegion();
+            base.OnResize(e);
+        }
+
+        private void UpdateFormRegion()
+        {
+            this.Region = GetFormRegion();
+        }
+
+        /// <summary>
+        /// Gets or sets the pointer offset from the top-left corner
+        /// </summary>
+        public int PointerOffset
+        {
+            get { return _PointerOffset; }
+            set
+            {
+                if (value !=_PointerOffset)
+                {
+                    int oldValue = _PointerOffset;
+                    _PointerOffset = value;
+                    OnPointerOffsetChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when PointerOffset property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnPointerOffsetChanged(int oldValue, int newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("PointerOffset"));
+            if (this.IsHandleCreated)
+                UpdateFormRegion();
+        }
+
+        private ePointerSide _PointerSide = ePointerSide.Bottom;
+        /// <summary>
+        /// Gets or sets the side pointer triangle is displayed on.
+        /// </summary>
+        public ePointerSide PointerSide
+        {
+            get { return _PointerSide; }
+            set
+            {
+                if (value != _PointerSide)
+                {
+                    ePointerSide oldValue = _PointerSide;
+                    _PointerSide = value;
+                    OnPointerSideChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when PointerSide property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnPointerSideChanged(ePointerSide oldValue, ePointerSide newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("PointerSide"));
+            if (this.IsHandleCreated)
+                UpdateFormRegion();
+        }
+
+        private Color _BorderColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets the flyout border color. Default value of Color.Empty indicates that color scheme will be used.
+        /// </summary>
+        [Category("Columns"), Description("Indicates flyout border color. Default value of Color.Empty indicates that color scheme will be used.")]
+        public Color BorderColor
+        {
+            get { return _BorderColor; }
+            set { _BorderColor = value; }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeBorderColor()
+        {
+            return !_BorderColor.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetBorderColor()
+        {
+            this.BorderColor = Color.Empty;
+        }
+
+        private bool _IsActive = false;
+        protected override void OnActivated(EventArgs e)
+        {
+            _IsActive = true;
+            base.OnActivated(e);
+        }
+
+        protected override void OnDeactivate(EventArgs e)
+        {
+            _IsActive = false;
+            base.OnDeactivate(e);
+        }
+        [Browsable(false)]
+        public bool IsActive
+        {
+            get
+            {
+                return _IsActive;
+            }
+        }
+    }
+    /// <summary>
+    /// Defines the side of triangle pointer displayed on flyout popup.
+    /// </summary>
+    public enum ePointerSide
+    {
+        Top,
+        Bottom,
+        Left,
+        Right
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/Flyout/FlyoutForm.resx b/PROMS/DotNetBar Source Code/Controls/Flyout/FlyoutForm.resx
new file mode 100644
index 00000000..1af7de15
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/Flyout/FlyoutForm.resx	
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/Controls/GroupPanel.cs b/PROMS/DotNetBar Source Code/Controls/GroupPanel.cs
new file mode 100644
index 00000000..d4ee18ab
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/GroupPanel.cs	
@@ -0,0 +1,837 @@
+using System;
+using System.Text;
+using System.Windows.Forms;
+using System.Drawing;
+using System.ComponentModel;
+using System.Drawing.Drawing2D;
+using System.Drawing.Text;
+using System.ComponentModel.Design;
+using System.Reflection;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    [ToolboxBitmap(typeof(GroupPanel), "Controls.GroupPanel.ico"), ToolboxItem(true), Designer("DevComponents.DotNetBar.Design.GroupPanelDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+    public class GroupPanel : PanelControl, INonClientControl
+    {
+        #region Private Variables
+        private NonClientPaintHandler m_NCPainter = null;
+        private Image m_TitleImage = null;
+        private eTitleImagePosition m_TitleImagePosition = eTitleImagePosition.Left;
+        private bool m_DrawTitleBox = true;
+        private bool m_IsShadowEnabled = false;
+        #endregion
+
+        #region Constructor
+        public GroupPanel()
+        {
+            m_NCPainter = new NonClientPaintHandler(this, eScrollBarSkin.Optimized);
+            m_NCPainter.BeforeBorderPaint += new CustomNCPaintEventHandler(NCBeforeBorderPaint);
+            m_NCPainter.AfterBorderPaint += new CustomNCPaintEventHandler(NCAfterBorderPaint);
+            
+            this.SetStyle(ControlStyles.StandardDoubleClick, true);
+        }
+        #endregion
+
+        #region Internal Implementation
+        private ePanelColorTable _ColorTable = ePanelColorTable.Default;
+        /// <summary>
+        /// Gets or sets the panel color scheme.
+        /// </summary>
+        [DefaultValue(ePanelColorTable.Default), Category("Appearance"), Description("Indicates panel color scheme.")]
+        public ePanelColorTable ColorTable
+        {
+            get { return _ColorTable; }
+            set 
+            {
+                _ColorTable = value;
+                SetColorTable(value);
+            }
+        }
+
+        protected override void OnResize(EventArgs e)
+        {
+            InvalidateNonClient();
+            base.OnResize(e);
+        }
+        /// <summary>
+        /// Gets or sets the image that appears in title with text.
+        /// </summary>
+        [Browsable(true), DefaultValue(null), Category("Visual"), Description("Indicates image that appears in title with text.")]
+        public Image TitleImage
+        {
+            get { return m_TitleImage; }
+            set
+            {
+                m_TitleImage = value;
+                RefreshTextClientRectangle();
+                this.Invalidate();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the position of the title image. Default value is left.
+        /// </summary>
+        [Browsable(true), DefaultValue(eTitleImagePosition.Left), Category("Visual"), Description("Indicates position of the title image.")]
+        public eTitleImagePosition TitleImagePosition
+        {
+            get { return m_TitleImagePosition; }
+            set
+            {
+                m_TitleImagePosition = value;
+                RefreshTextClientRectangle();
+                this.Invalidate();
+            }
+        }
+
+        [Browsable(true), EditorBrowsable(EditorBrowsableState.Always), DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
+        public override Color BackColor
+        {
+            get { return base.BackColor; }
+            set { base.BackColor = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the scrollbar skining type when control is using Office 2007 style.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public eScrollBarSkin ScrollbarSkin
+        {
+            get { return m_NCPainter.SkinScrollbars; }
+            set { m_NCPainter.SkinScrollbars = value; }
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            if (m_NCPainter != null)
+            {
+                m_NCPainter.Dispose();
+                //m_NCPainter = null;
+            }
+            if (BarUtilities.DisposeItemImages && !this.DesignMode)
+            {
+                BarUtilities.DisposeImage(ref m_TitleImage);
+            }
+            base.Dispose(disposing);
+        }
+        /// <summary>
+        /// Specifies whether item is drawn using Themes when running on OS that supports themes like Windows XP.
+        /// </summary>
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never), DefaultValue(false), Category("Appearance"), Description("Specifies whether item is drawn using Themes when running on OS that supports themes like Windows XP.")]
+        public override bool ThemeAware
+        {
+            get
+            {
+                return base.ThemeAware;
+            }
+            set
+            {
+                base.ThemeAware = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether box around the title of the group is drawn. Default value is true.
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Appearance"), Description("")]
+        public bool DrawTitleBox
+        {
+            get { return m_DrawTitleBox; }
+            set
+            {
+                if (m_DrawTitleBox != value)
+                {
+                    m_DrawTitleBox = value;
+                    this.InvalidateNonClient();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Invalidates non-client area of the control.
+        /// </summary>
+        public void InvalidateNonClient()
+        {
+            if (!BarFunctions.IsHandleValid(this)) return;
+            const int RDW_INVALIDATE = 0x0001;
+            const int RDW_FRAME = 0x0400;
+            NativeFunctions.RECT r = new NativeFunctions.RECT(0, 0, this.Width, this.Height);
+            NativeFunctions.RedrawWindow(this.Handle, ref r, IntPtr.Zero, RDW_INVALIDATE | RDW_FRAME);
+        }
+
+        /// <summary>
+        /// Paints insides of the control.
+        /// </summary>
+        /// <param name="e">Paint event arguments.</param>
+        protected override void PaintInnerContent(PaintEventArgs e, ElementStyle style, bool paintText)
+        {
+            Graphics g = e.Graphics;
+            if (this.TextMarkupElement == null)
+                RefreshTextClientRectangle();
+            Rectangle r = this.DisplayRectangle;
+#if FRAMEWORK20
+            r.X -= this.Padding.Left;
+            r.Y -= this.Padding.Top;
+            r.Width += this.Padding.Horizontal;
+            r.Height += this.Padding.Vertical;
+#else
+            r.X -= this.DockPadding.Left;
+            r.Y -= this.DockPadding.Top;
+            r.Width += this.DockPadding.Left + this.DockPadding.Right;
+            r.Height += this.DockPadding.Top + this.DockPadding.Bottom;
+#endif
+            r.Inflate(2, 2);
+            ElementStyleDisplayInfo info = new ElementStyleDisplayInfo(style, g, r);
+            info.RightToLeft = (this.RightToLeft == RightToLeft.Yes);
+            ElementStyleDisplay.PaintBackground(info, false);
+            if (style.BackgroundImage != null) ElementStyleDisplay.PaintBackgroundImage(info);
+            if (!m_IsShadowEnabled) return;
+            ShadowPaintInfo pi = new ShadowPaintInfo();
+            pi.Graphics = g;
+            pi.Size = 6;
+            foreach (Control c in this.Controls)
+            {
+                if (!c.Visible || c.BackColor == Color.Transparent && !(c is GroupPanel)) continue;
+                if (c is GroupPanel)
+                {
+                    GroupPanel p = c as GroupPanel;
+                    pi.Rectangle = new Rectangle(c.Bounds.X, c.Bounds.Y + p.GetInternalClientRectangle().Y / 2, c.Bounds.Width, c.Bounds.Height - p.GetInternalClientRectangle().Y / 2);
+                }
+                else
+                    pi.Rectangle = c.Bounds;
+                ShadowPainter.Paint2(pi);
+            }
+        }
+
+        private void NCAfterBorderPaint(object sender, CustomNCPaintEventArgs e)
+        {
+            Graphics g = e.Graphics;
+
+            TextRenderingHint th = g.TextRenderingHint;
+            SmoothingMode sm = g.SmoothingMode;
+            if (this.AntiAlias)
+            {
+                g.TextRenderingHint = DisplayHelp.AntiAliasTextRenderingHint;
+                g.SmoothingMode = SmoothingMode.AntiAlias;
+            }
+            g.ResetClip();
+            ElementStyle style = this.Style;
+
+            if (!this.Enabled)
+            {
+                style = style.Copy();
+                style.TextColor = GetColorScheme().ItemDisabledText;
+            }
+
+            if (m_DrawTitleBox && !m_TitleArea.IsEmpty)
+            {
+                DisplayHelp.FillRoundedRectangle(g, m_TitleArea, 2, style.BackColor, style.BackColor2, -90);
+                DisplayHelp.DrawRoundedRectangle(g, this.Style.BorderColor, m_TitleArea, 2);
+            }
+
+            Rectangle rText = new Rectangle(m_NCPainter.ClientRectangle.X + 4, 1, this.ClientRectangle.Width - 8, m_NCPainter.ClientRectangle.Y - 1);
+            if (m_TitleImage != null)
+            {
+                Size textSize = GetAutoSize(rText.Width);
+                if (m_TitleImagePosition == eTitleImagePosition.Left && this.RightToLeft == RightToLeft.No || m_TitleImagePosition == eTitleImagePosition.Right && this.RightToLeft == RightToLeft.Yes)
+                {
+                    g.DrawImage(m_TitleImage, rText.X - 1, rText.Y, m_TitleImage.Width, m_TitleImage.Height);
+                    rText.X += m_TitleImage.Width;
+                    rText.Width -= m_TitleImage.Width;
+                }
+                else if (m_TitleImagePosition == eTitleImagePosition.Right && this.RightToLeft == RightToLeft.No || m_TitleImagePosition == eTitleImagePosition.Left && this.RightToLeft == RightToLeft.Yes)
+                {
+                    g.DrawImage(m_TitleImage, rText.Right - m_TitleImage.Width, rText.Y, m_TitleImage.Width, m_TitleImage.Height);
+                    rText.Width -= m_TitleImage.Width;
+                }
+                else if (m_TitleImagePosition == eTitleImagePosition.Center)
+                {
+                    g.DrawImage(m_TitleImage, rText.X + (rText.Width - m_TitleImage.Width) / 2, rText.Y, m_TitleImage.Width, m_TitleImage.Height);
+                }
+                rText.Y = rText.Bottom - textSize.Height - 2;
+            }
+
+            // Paint text
+            if (this.TextMarkupElement == null)
+            {
+                ElementStyleDisplayInfo info = new ElementStyleDisplayInfo(style, g, rText);
+                info.RightToLeft = (this.RightToLeft == RightToLeft.Yes);
+                ElementStyleDisplay.PaintText(info, this.Text, this.Font);
+            }
+            else
+            {
+                TextRenderingHint tr = g.TextRenderingHint;
+                if (this.AntiAlias)
+                    g.TextRenderingHint = DisplayHelp.AntiAliasTextRenderingHint;
+                TextMarkup.MarkupDrawContext d = new TextMarkup.MarkupDrawContext(g, this.Font, style.TextColor, (this.RightToLeft == RightToLeft.Yes), Rectangle.Empty, true);
+                Rectangle r = this.TextMarkupElement.Bounds;
+                if (style.TextAlignment == eStyleTextAlignment.Center)
+                    this.TextMarkupElement.Bounds = new Rectangle(this.TextMarkupElement.Bounds.X + (rText.Width - this.TextMarkupElement.Bounds.Width) / 2, this.TextMarkupElement.Bounds.Y,
+                        this.TextMarkupElement.Bounds.Width, this.TextMarkupElement.Bounds.Height);
+                else if(style.TextAlignment == eStyleTextAlignment.Far && this.RightToLeft == RightToLeft.No || this.RightToLeft == RightToLeft.Yes && style.TextAlignment== eStyleTextAlignment.Near)
+                    this.TextMarkupElement.Bounds = new Rectangle(rText.Right - this.TextMarkupElement.Bounds.Width, this.TextMarkupElement.Bounds.Y,
+                        this.TextMarkupElement.Bounds.Width, this.TextMarkupElement.Bounds.Height);
+                this.TextMarkupElement.Render(d);
+                g.TextRenderingHint = tr;
+                this.TextMarkupElement.Bounds = r;
+            }
+
+            g.TextRenderingHint = th;
+            g.SmoothingMode = sm;
+        }
+        private Rectangle m_TitleArea = Rectangle.Empty;
+        private void NCBeforeBorderPaint(object sender, CustomNCPaintEventArgs e)
+        {
+            m_TitleArea = Rectangle.Empty;
+            // Exclude text area from border rendering
+            if (this.Text != null && this.Text.Length > 0)
+            {
+                Size s = GetAutoSize(this.ClientRectangle.Width - 8);
+                Rectangle r = new Rectangle(m_NCPainter.ClientRectangle.X  + 3, 0, s.Width, m_NCPainter.ClientRectangle.Y);
+                Size availSize = new Size(m_NCPainter.ClientRectangle.Width - 8, m_NCPainter.ClientRectangle.Y);
+                
+                    if (m_TitleImage != null && (m_TitleImagePosition == eTitleImagePosition.Left && this.RightToLeft == RightToLeft.Yes ||
+                            m_TitleImagePosition == eTitleImagePosition.Right && this.RightToLeft == RightToLeft.No))
+                    {
+                        //r.X -= m_TitleImage.Width;
+                        availSize.Width -= m_TitleImage.Width;
+                    }
+                    else if (m_TitleImage != null && (m_TitleImagePosition == eTitleImagePosition.Right && this.RightToLeft == RightToLeft.Yes ||
+                            m_TitleImagePosition == eTitleImagePosition.Left && this.RightToLeft == RightToLeft.No))
+                    {
+                        r.X += m_TitleImage.Width;
+                        availSize.Width -= m_TitleImage.Width;
+                    }
+                //if (this.TextMarkupElement == null)
+                {
+                    if (this.Style.TextAlignment == eStyleTextAlignment.Center)
+                    {
+                        //r.X = m_NCPainter.ClientRectangle.X;
+                        r.X += (availSize.Width - r.Width) / 2;
+                    }
+                    else if (this.Style.TextAlignment == eStyleTextAlignment.Far || this.RightToLeft == RightToLeft.Yes && this.Style.TextAlignment == eStyleTextAlignment.Near)
+                    {
+                        r.X = r.X + (availSize.Width - r.Width);
+                    }
+                }
+                
+                if (!r.IsEmpty)
+                {
+                    r.Inflate(3, 0);
+                    r.Width += 3;
+                }
+
+                e.Graphics.SetClip(r, System.Drawing.Drawing2D.CombineMode.Exclude);
+                m_TitleArea = r;
+            }
+
+            if (m_TitleImage != null)
+            {
+                Rectangle r = new Rectangle(m_NCPainter.ClientRectangle.X + 3, 0, m_TitleImage.Width, m_TitleImage.Height);
+                if (m_TitleImagePosition == eTitleImagePosition.Left && this.RightToLeft == RightToLeft.Yes ||
+                    m_TitleImagePosition == eTitleImagePosition.Right && this.RightToLeft == RightToLeft.No)
+                {
+                    r.X = m_NCPainter.ClientRectangle.Right - r.Width - 4;
+                }
+                else if (m_TitleImagePosition == eTitleImagePosition.Center)
+                {
+                    r.X = m_NCPainter.ClientRectangle.X;
+                    r.X += (m_NCPainter.ClientRectangle.Width - r.Width) / 2;
+                }
+
+                e.Graphics.SetClip(r, System.Drawing.Drawing2D.CombineMode.Exclude);
+                if (m_TitleArea.IsEmpty)
+                    m_TitleArea = r;
+                else
+                    m_TitleArea = Rectangle.Union(r, m_TitleArea);
+            }
+        }
+
+        /// <summary>
+        /// Returns the size of the panel calculated based on the text assigned.
+        /// </summary>
+        /// <returns>Calculated size of the panel or Size.Empty if panel size cannot be calculated.</returns>
+        private Size GetAutoSize(int preferedWidth)
+        {
+            Size size = Size.Empty;
+            if (!this.IsHandleCreated) return size;
+            
+            if (TextMarkupElement != null)
+            {
+                if (preferedWidth == 0)
+                {
+                    size = TextMarkupElement.Bounds.Size;
+                }
+                else
+                {
+                    size = GetMarkupSize(preferedWidth);
+                }
+                size.Width += 4;
+                //size.Height += 1;
+            }
+            else if (this.Text.Length > 0)
+            {
+                Font font = this.Font;
+                if (this.Style.Font != null) font = this.Style.Font;
+                eTextFormat tf = eTextFormat.Default | eTextFormat.SingleLine | eTextFormat.NoPrefix;
+                using (Graphics g = BarFunctions.CreateGraphics(this))
+                {
+                    if (preferedWidth <= 0)
+                        size = TextDrawing.MeasureString(g, this.Text, font, 0, tf);
+                    else
+                        size = TextDrawing.MeasureString(g, this.Text, font, preferedWidth, tf);
+                }
+                size.Width += 2;
+                size.Height += 2;
+            }
+
+            if (size.IsEmpty) return size;
+
+            size.Width += this.Style.MarginLeft + this.Style.MarginRight;
+            size.Height += this.Style.MarginTop + this.Style.MarginBottom;
+
+            return size;
+        }
+
+        private Size GetMarkupSize(int proposedWidth)
+        {
+            Size size = Size.Empty;
+            if (TextMarkupElement != null)
+            {
+                Rectangle r = new Rectangle(0, 0, proposedWidth, 500);
+                r.Inflate(-2, -2);
+                Graphics g = this.CreateGraphics();
+                TextMarkup.BodyElement markup = TextMarkup.MarkupParser.Parse(this.Text);
+                try
+                {
+                    if (AntiAlias)
+                    {
+                        g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.AntiAlias;
+                        g.TextRenderingHint = DisplayHelp.AntiAliasTextRenderingHint;
+                    }
+                    TextMarkup.MarkupDrawContext d = new TextMarkup.MarkupDrawContext(g, this.Font, SystemColors.Control, (this.RightToLeft == RightToLeft.Yes));
+                    markup.Measure(r.Size, d);
+                    size = markup.Bounds.Size;
+                }
+                finally
+                {
+                    g.Dispose();
+                }
+            }
+
+            return size;
+        }
+
+        protected override void RefreshTextClientRectangle()
+        {
+            if (m_NCPainter != null)
+            {
+                Rectangle r = new Rectangle(m_NCPainter.ClientRectangle.X, 0, m_NCPainter.ClientRectangle.Width, this.Height / 2);
+                r.Inflate(-2, 0);
+                if (m_TitleImage != null)
+                {
+                    if (m_TitleImagePosition == eTitleImagePosition.Left && this.RightToLeft == RightToLeft.No ||
+                        m_TitleImagePosition == eTitleImagePosition.Right && this.RightToLeft == RightToLeft.Yes)
+                    {
+                        r.X += m_TitleImage.Width;
+                        r.Width -= m_TitleImage.Width;
+                    }
+                    else if (m_TitleImagePosition == eTitleImagePosition.Left && this.RightToLeft == RightToLeft.Yes ||
+                        m_TitleImagePosition == eTitleImagePosition.Right && this.RightToLeft == RightToLeft.No)
+                    {
+                        r.Width -= m_TitleImage.Width;
+                    }
+                    Size s = GetMarkupSize(r.Width);
+                    r.Y = Math.Max(0, m_NCPainter.ClientRectangle.Y - s.Height - 4);
+                }
+                this.ClientTextRectangle = r;
+            }
+            else
+                this.ClientTextRectangle = this.ClientRectangle;
+            
+            ResizeMarkup();
+        }
+
+        /// <summary>
+        /// Gets or sets whether text rectangle painted on panel is considering docked controls inside the panel. 
+        /// </summary>
+        [Browsable(false), DefaultValue(true), Category("Appearance"), Description("Indicates whether text rectangle painted on panel is considering docked controls inside the panel.")]
+        public override bool TextDockConstrained
+        {
+            get { return base.TextDockConstrained; }
+            set { base.TextDockConstrained = value; }
+
+        }
+
+        /// <summary>
+        /// Gets or sets whether panel automatically provides shadows for child controls. Default value is false.
+        /// </summary>
+        [Browsable(true), DefaultValue(false), Category("Appearance"), Description("Indicates whether panel automatically provides shadows for child controls.")]
+        public bool IsShadowEnabled
+        {
+            get { return m_IsShadowEnabled; }
+            set
+            {
+                if (m_IsShadowEnabled != value)
+                {
+                    m_IsShadowEnabled = value;
+                    this.Invalidate();
+                }
+            }
+        }
+        /// <summary>
+        /// Applies color scheme to the panel.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void SetColorTable(ePanelColorTable colorScheme)
+        {
+            GroupPanel p = this;
+            DevComponents.DotNetBar.Rendering.ColorFactory factory = DevComponents.DotNetBar.Rendering.ColorFactory.Empty;
+            p.CanvasColor = SystemColors.Control;
+            p.ResetStyle();
+            p.ColorSchemeStyle = eDotNetBarStyle.Office2007;
+
+            if (colorScheme == ePanelColorTable.Default)
+                SetDefaultPanelStyle();
+            else if (colorScheme == ePanelColorTable.Green)
+            {
+                p.Style.BackColor2 = factory.GetColor(0x9CBF8B);
+                p.Style.BackColorGradientAngle = 90;
+                p.Style.BackColor = factory.GetColor(0xC3D9B9);
+                p.Style.Border = DevComponents.DotNetBar.eStyleBorderType.Solid;
+                p.Style.BorderWidth = 1;
+                p.Style.BorderColor = factory.GetColor(0x72A45A);
+                p.Style.CornerDiameter = 4;
+                p.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
+                p.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
+                p.Style.TextColor = factory.GetColor(0x3C4A1F);
+                p.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
+            }
+            else if (colorScheme == ePanelColorTable.Orange)
+            {
+                p.Style.BackColor = factory.GetColor(0xFAC08F);
+                p.Style.BackColor2 = factory.GetColor(0xF79646);
+                p.Style.BorderColor = factory.GetColor(0x974806);
+                p.Style.TextColor = factory.GetColor(0x7F3D06);
+                p.Style.BackColorGradientAngle = 90;
+                p.Style.Border = DevComponents.DotNetBar.eStyleBorderType.Solid;
+                p.Style.BorderWidth = 1;
+                p.Style.CornerDiameter = 4;
+                p.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
+                p.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
+                p.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
+            }
+            else if (colorScheme == ePanelColorTable.Red)
+            {
+                p.Style.BackColor = factory.GetColor(0xE5BFBF);
+                p.Style.BackColor2 = factory.GetColor(0xD39696);
+                p.Style.BorderColor = factory.GetColor(0x953734);
+                p.Style.TextColor = factory.GetColor(0x632423);
+                p.Style.BackColorGradientAngle = 90;
+                p.Style.Border = DevComponents.DotNetBar.eStyleBorderType.Solid;
+                p.Style.BorderWidth = 1;
+                p.Style.CornerDiameter = 4;
+                p.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
+                p.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
+                p.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
+            }
+            else if (colorScheme == ePanelColorTable.Yellow)
+            {
+                p.Style.BackColor = factory.GetColor(0xFFF3B2);
+                p.Style.BackColor2 = factory.GetColor(0xFAD945);
+                p.Style.BorderColor = factory.GetColor(0xEE9311);
+                p.Style.TextColor = factory.GetColor(0x3F3F00);
+                p.Style.BackColorGradientAngle = 90;
+                p.Style.Border = DevComponents.DotNetBar.eStyleBorderType.Solid;
+                p.Style.BorderWidth = 1;
+                p.Style.CornerDiameter = 4;
+                p.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
+                p.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
+                p.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
+            }
+            else if (colorScheme == ePanelColorTable.Magenta)
+            {
+                p.Style.BackColor = factory.GetColor(0xEF91B4);
+                p.Style.BackColor2 = factory.GetColor(0xE66896);
+                p.Style.BorderColor = factory.GetColor(0xB12753);
+                p.Style.TextColor = factory.GetColor(0x8E2648);
+                p.Style.BackColorGradientAngle = 90;
+                p.Style.Border = DevComponents.DotNetBar.eStyleBorderType.Solid;
+                p.Style.BorderWidth = 1;
+                p.Style.CornerDiameter = 4;
+                p.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
+                p.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
+                p.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
+            }
+        }
+
+        /// <summary>
+        /// Applies default group panel style to the control.
+        /// </summary>
+        public void SetDefaultPanelStyle()
+        {
+            GroupPanel p = this;
+
+            p.CanvasColor = SystemColors.Control;
+            p.ResetStyle();
+            p.ColorSchemeStyle = eDotNetBarStyle.Office2007;
+            p.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
+            p.Style.BackColorGradientAngle = 90;
+            p.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
+            p.Style.Border = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            p.Style.BorderWidth = 1;
+            p.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+            p.Style.CornerDiameter = 4;
+            p.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
+            p.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
+            p.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
+            p.Style.TextLineAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Near;
+        }
+
+        protected override void SetBoundsCore(int x, int y, int width, int height, BoundsSpecified specified)
+        {
+            base.SetBoundsCore(x, y, width, height, specified);
+
+            UpdateInternalClientSize(width, height, specified);
+        }
+
+        protected override void OnTextChanged(EventArgs e)
+        {
+            if (IsHandleCreated)
+            {
+                UpdateInternalClientSize(this.Width, this.Height, BoundsSpecified.Width | BoundsSpecified.Height);
+                InvalidateNonClient();
+            }
+            base.OnTextChanged(e);
+        }
+
+        private void UpdateInternalClientSize(int width, int height, BoundsSpecified specified)
+        {
+            if (((specified & BoundsSpecified.Height) == BoundsSpecified.Height || (specified & BoundsSpecified.Width) == BoundsSpecified.Width))
+            {
+                ElementStyle style = this.Style;
+                Rectangle r = new Rectangle(0, 0, width, height);
+                if (m_NCPainter != null)
+                {
+                    Rectangle cr = m_NCPainter.GetClientRectangleForBorderStyle(r, style);
+                    if ((specified & BoundsSpecified.Height) == BoundsSpecified.Height)
+                        height = cr.Height;
+                    if ((specified & BoundsSpecified.Width) == BoundsSpecified.Width)
+                        width = cr.Width;
+
+                    Type type = typeof(Control);
+                    try // try with ignore catch is bad idea but in this case its for future proofing, just in case M$ removes these members
+                    {
+                        type.InvokeMember("clientWidth", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.SetField, null, this, new object[] { width });
+                        type.InvokeMember("clientHeight", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.SetField, null, this, new object[] { height });
+                    }
+                    catch { }
+                }
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool AutoScroll
+        {
+            get
+            {
+                return base.AutoScroll;
+            }
+            set
+            {
+                base.AutoScroll = value;
+            }
+        }
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public override Point AutoScrollOffset
+        {
+            get
+            {
+                return base.AutoScrollOffset;
+            }
+            set
+            {
+                base.AutoScrollOffset = value;
+            }
+        }
+        #endregion
+
+        #region INonClientControl Members
+
+        protected override void WndProc(ref System.Windows.Forms.Message m)
+        {
+            if (m_NCPainter == null)
+            {
+                base.WndProc(ref m);
+                return;
+            }
+
+            if (m.Msg == (int)WinApi.WindowsMessages.WM_HSCROLL || m.Msg == (int)WinApi.WindowsMessages.WM_VSCROLL ||
+                m.Msg == (int)WinApi.WindowsMessages.WM_MOUSEWHEEL)
+            {
+                //Region reg = new Region(new Rectangle(0, 0, this.Width, this.Height));
+                //SuspendPaint = true;
+                //try
+                //{
+                bool callBase = m_NCPainter.WndProc(ref m);
+                if (callBase)
+                    BaseWndProc(ref m);
+                //}
+                //finally
+                //{
+                //SuspendPaint = false;
+                //}
+                //foreach (Control c in this.Controls)
+                //{
+                //    if (c.Visible)
+                //        reg.Exclude(c.Bounds);
+                //}
+                RefreshTextClientRectangle();
+                //this.Invalidate(reg, false);
+                //if (this.Controls.Count > 0)
+                //    this.Update();
+                //reg.Dispose();
+            }
+            else
+            {
+                bool callBase = m_NCPainter.WndProc(ref m);
+                //if (m.Msg == (int)WinApi.WindowsMessages.WM_NCCALCSIZE)
+                //    UpdateInternalClientSize(this.Width, this.Height, BoundsSpecified.Width | BoundsSpecified.Height);
+                if (callBase)
+                    BaseWndProc(ref m);
+            }
+        }
+
+        void INonClientControl.BaseWndProc(ref Message m)
+        {
+            BaseWndProc(ref m);
+        }
+
+        /// <summary>
+        /// Returns the renderer control will be rendered with.
+        /// </summary>
+        /// <returns>The current renderer.</returns>
+        public virtual Rendering.BaseRenderer GetRenderer()
+        {
+            if (Rendering.GlobalManager.Renderer != null)
+                return Rendering.GlobalManager.Renderer;
+            return null;
+        }
+
+        ItemPaintArgs INonClientControl.GetItemPaintArgs(System.Drawing.Graphics g)
+        {
+            ItemPaintArgs pa = new ItemPaintArgs(this as IOwner, this, g, GetColorScheme());
+            pa.Renderer = this.GetRenderer();
+            pa.DesignerSelection = false; // m_DesignerSelection;
+            pa.GlassEnabled = !this.DesignMode && WinApi.IsGlassEnabled;
+            return pa;
+        }
+
+        ElementStyle INonClientControl.BorderStyle
+        {
+            get { return this.Style; }
+        }
+
+        void INonClientControl.PaintBackground(PaintEventArgs e)
+        {
+            base.OnPaintBackground(e);
+        }
+
+        IntPtr INonClientControl.Handle
+        {
+            get { return this.Handle; }
+        }
+
+        int INonClientControl.Width
+        {
+            get { return this.Width; }
+        }
+
+        int INonClientControl.Height
+        {
+            get { return this.Height; }
+        }
+
+        bool INonClientControl.IsHandleCreated
+        {
+            get { return this.IsHandleCreated; }
+        }
+
+        System.Drawing.Point INonClientControl.PointToScreen(System.Drawing.Point client)
+        {
+            return this.PointToScreen(client);
+        }
+
+        System.Drawing.Color INonClientControl.BackColor
+        {
+            get { return this.BackColor; }
+        }
+
+        void DevComponents.DotNetBar.Controls.INonClientControl.RenderNonClient(Graphics g) { }
+
+        void DevComponents.DotNetBar.Controls.INonClientControl.AdjustClientRectangle(ref Rectangle r)
+        {
+            Size textSize = GetAutoSize(r.Width);
+            if (m_TitleImage != null)
+            {
+                textSize.Height = Math.Max(m_TitleImage.Height, textSize.Height);
+            }
+            if (textSize.Height > r.Height) textSize.Height = r.Height - 8;
+            r.Y += textSize.Height;
+            r.Height -= textSize.Height;
+        }
+
+        void INonClientControl.AdjustBorderRectangle(ref Rectangle r)
+        {
+            if (this.Text != "")
+            {
+                int h = GetNonClientTopHeight();
+                r.Y += h;
+                r.Height -= h;
+            }
+        }
+
+        private int GetNonClientTopHeight()
+        {
+            Font f = this.Font;
+            if (this.Style.Font != null)
+                f = this.Style.Font;
+            int h = (int)(f.Height * .7f);
+            if (m_TitleImage != null)
+            {
+                h = Math.Max(m_TitleImage.Height - (f.Height - h - 1), h);
+            }
+            return h;
+        }
+        internal Rectangle GetInternalClientRectangle()
+        {
+            return m_NCPainter.ClientRectangle;
+        }
+        private Color _DisabledBackColor = Color.Empty;
+        /// <summary>
+        /// Specifies back color when Enabled=false
+        /// </summary>
+        [Browsable(false), Category("Appearance"), Description("Specifies back color when Enabled=false")]
+        public Color DisabledBackColor
+        {
+            get { return _DisabledBackColor; }
+            set
+            {
+                _DisabledBackColor = value;
+                if (!Enabled) this.Invalidate();
+            }
+        }
+        #endregion
+    }
+    /// <summary>
+    /// Defines predefined color schemes for panel control.
+    /// </summary>
+    public enum ePanelColorTable
+    {
+        Default,
+        Green,
+        Orange,
+        Red,
+        Yellow,
+        Magenta
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/GroupPanel.ico b/PROMS/DotNetBar Source Code/Controls/GroupPanel.ico
new file mode 100644
index 00000000..d810f802
Binary files /dev/null and b/PROMS/DotNetBar Source Code/Controls/GroupPanel.ico differ
diff --git a/PROMS/DotNetBar Source Code/Controls/LabelX.cs b/PROMS/DotNetBar Source Code/Controls/LabelX.cs
new file mode 100644
index 00000000..1fe70dc2
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/LabelX.cs	
@@ -0,0 +1,696 @@
+using System;
+using System.Text;
+using System.Windows.Forms;
+using System.ComponentModel;
+using System.Drawing;
+using System.Security.Permissions;
+
+namespace DevComponents.DotNetBar
+{
+#if FRAMEWORK20
+    [Designer("DevComponents.DotNetBar.Design.LabelXDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+#endif
+    [ToolboxBitmap(typeof(LabelX), "Controls.LabelX.ico"), ToolboxItem(true), System.Runtime.InteropServices.ComVisible(false)]
+    public class LabelX : BaseItemControl, ICommandSource
+    {
+        #region Private Variables
+        private LabelItem m_Label = null;
+        private bool m_UseMnemonic = true;
+        private Size m_PreferredSize = Size.Empty;
+        #endregion
+
+        #region Events
+        /// <summary>
+        /// Occurs when text markup link is clicked. Markup links can be created using "a" tag, for example:
+        /// <a name="MyLink">Markup link</a>
+        /// </summary>
+        public event MarkupLinkClickEventHandler MarkupLinkClick;
+        #endregion
+
+        #region Constructor, Dispose
+        public LabelX()
+        {
+            m_Label = new LabelItem();
+            m_Label.Style = eDotNetBarStyle.Office2007;
+            m_Label.MarkupLinkClick += new MarkupLinkClickEventHandler(LabelMarkupLinkClick);
+            this.FocusCuesEnabled = false;
+            this.HostItem = m_Label;
+            this.TabStop = false;
+            this.SetStyle(ControlStyles.Selectable, false);
+        }
+        #endregion
+
+        #region Internal Implementation
+        /// <summary>
+        /// Specifies spacing between label image and text.
+        /// </summary>
+        [DefaultValue(2), Category("Appearance"), Description("Specifies spacing between label image and text.")]
+        public int ImageTextSpacing
+        {
+            get { return m_Label.ImageTextSpacing; }
+            set { m_Label.ImageTextSpacing = value; }
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never), Browsable(false)]
+        protected string PlainText
+        {
+            get
+            {
+                return m_Label.PlainText;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether text-markup support is enabled for controls Text property. Default value is true.
+        /// Set this property to false to display HTML or other markup in the control instead of it being parsed as text-markup.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance"), Description("Indicates whether text-markup support is enabled for controls Text property.")]
+        public bool EnableMarkup
+        {
+            get { return m_Label.EnableMarkup; }
+            set
+            {
+                m_Label.EnableMarkup = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether control displays focus cues when focused.
+        /// </summary>
+        [DefaultValue(false), Category("Behavior"), Description("Indicates whether control displays focus cues when focused.")]
+        public override bool FocusCuesEnabled
+        {
+            get
+            {
+                return base.FocusCuesEnabled;
+            }
+            set
+            {
+                base.FocusCuesEnabled = value;
+            }
+        }
+        protected override void OnHandleCreated(EventArgs e)
+        {
+#if FRAMEWORK20
+            if (this.AutoSize)
+                this.AdjustSize();
+#endif
+            this.RecalcLayout();
+            base.OnHandleCreated(e);
+        }
+        /// <summary>
+        /// Recalculates the size of the internal item.
+        /// </summary>
+        protected override void RecalcSize()
+        {
+            m_Label.SuspendPaint = true;
+            m_Label.Width = Dpi.DescaleWidth(m_Label.Bounds.Width);
+            m_Label.Height = Dpi.DescaleHeight(m_Label.Bounds.Height);
+            m_Label.SuspendPaint = false;
+            base.RecalcSize();
+        }
+
+        protected override void OnBackColorChanged(EventArgs e)
+        {
+            m_Label.BackColor = this.BackColor;
+            base.OnBackColorChanged(e);
+        }
+
+        protected override void OnForeColorChanged(EventArgs e)
+        {
+            if (this.ForeColor == SystemColors.ControlText)
+                m_Label.ForeColor = Color.Empty;
+            else
+                m_Label.ForeColor = this.ForeColor;
+            base.OnForeColorChanged(e);
+        }
+
+        /// <summary>
+        /// Gets or sets the border sides that are displayed. Default value specifies border on all 4 sides.
+        /// </summary>
+        [Browsable(false), Category("Appearance"), DefaultValue(LabelItem.DEFAULT_BORDERSIDE), Description("Specifies border sides that are displayed.")]
+        public eBorderSide BorderSide
+        {
+            get { return m_Label.BorderSide; }
+            set { m_Label.BorderSide = value; InvalidateAutoSize(); }
+        }
+
+        /// <summary>
+        /// Gets or sets the type of the border drawn around the label.
+        /// </summary>
+        [Browsable(false), Category("Appearance"), DefaultValue(eBorderType.None), Description("Indicates the type of the border drawn around the label.")]
+        public eBorderType BorderType
+        {
+            get { return m_Label.BorderType; }
+            set { m_Label.BorderType = value; InvalidateAutoSize(); }
+        }
+
+        /// <summary>
+        /// Specifies label image.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), Description("The image that will be displayed on the face of the item."), DefaultValue(null)]
+        public System.Drawing.Image Image
+        {
+            get { return m_Label.Image; }
+            set { m_Label.Image = value; InvalidateAutoSize(); }
+        }
+
+        /// <summary>
+        /// Gets/Sets the image position inside the label.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), Description("The alignment of the image in relation to text displayed by this item."), DefaultValue(eImagePosition.Left)]
+        public eImagePosition ImagePosition
+        {
+            get { return m_Label.ImagePosition; }
+            set { m_Label.ImagePosition = value; InvalidateAutoSize(); }
+        }
+
+        /// <summary>
+        /// Gets or sets the border line color when border is single line.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), Description("Indicates border line color when border is single line.")]
+        public Color SingleLineColor
+        {
+            get { return m_Label.SingleLineColor; }
+            set { m_Label.SingleLineColor = value; }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeSingleLineColor()
+        {
+            return m_Label.ShouldSerializeSingleLineColor();
+        }
+
+        /// <summary>
+        /// Resets the SingleLineColor property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetSingleLineColor()
+        {
+            m_Label.ResetSingleLineColor();
+        }
+
+        /// <summary>
+        /// Gets or sets the text associated with this item.
+        /// </summary>
+        [Browsable(true), Editor("DevComponents.DotNetBar.Design.TextMarkupUIEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), Category("Appearance"), Description("The text contained in the item.")]
+        public override string Text
+        {
+            get { return base.Text; }
+            set { base.Text = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the horizontal text alignment.
+        /// </summary>
+        [Browsable(true), DefaultValue(StringAlignment.Near), DevCoBrowsable(true), Category("Layout"), Description("Indicates text alignment.")]
+        public System.Drawing.StringAlignment TextAlignment
+        {
+            get { return m_Label.TextAlignment; }
+            set
+            {
+                m_Label.TextAlignment = value;
+                this.RecalcLayout();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the text vertical alignment.
+        /// </summary>
+        [Browsable(true), DefaultValue(System.Drawing.StringAlignment.Center), DevCoBrowsable(true), Category("Layout"), Description("Indicates text line alignment.")]
+        public System.Drawing.StringAlignment TextLineAlignment
+        {
+            get { return m_Label.TextLineAlignment; }
+            set
+            {
+                m_Label.TextLineAlignment = value;
+                this.RecalcLayout();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value that determines whether text is displayed in multiple lines or one long line.
+        /// </summary>
+        [Browsable(true), Category("Style"), DefaultValue(false), Description("Gets or sets a value that determines whether text is displayed in multiple lines or one long line.")]
+        public bool WordWrap
+        {
+            get { return m_Label.WordWrap; }
+            set { m_Label.WordWrap = value; RecalcLayout(); }
+        }
+
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public new bool TabStop
+        {
+            get { return base.TabStop; }
+            set { base.TabStop = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the left padding in pixels.
+        /// </summary>
+        [Browsable(true), DefaultValue(0), Category("Layout"), Description("Indicates left padding in pixels.")]
+        public int PaddingLeft
+        {
+            get { return m_Label.PaddingLeft; }
+            set { m_Label.PaddingLeft = value; InvalidateAutoSize(); }
+        }
+
+        /// <summary>
+        /// Gets or sets the right padding in pixels.
+        /// </summary>
+        [Browsable(true), DefaultValue(0), Category("Layout"), Description("Indicates right padding in pixels.")]
+        public int PaddingRight
+        {
+            get
+            {
+                return m_Label.PaddingRight;
+            }
+            set
+            {
+                m_Label.PaddingRight = value;
+                InvalidateAutoSize();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the top padding in pixels.
+        /// </summary>
+        [Browsable(true), DefaultValue(0), Category("Layout"), Description("Indicates top padding in pixels.")]
+        public int PaddingTop
+        {
+            get
+            {
+                return m_Label.PaddingTop;
+            }
+            set
+            {
+                m_Label.PaddingTop = value;
+                InvalidateAutoSize();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the bottom padding in pixels.
+        /// </summary>
+        [Browsable(true), DefaultValue(0), Category("Layout"), Description("Indicates bottom padding in pixels.")]
+        public int PaddingBottom
+        {
+            get
+            {
+                return m_Label.PaddingBottom;
+            }
+            set
+            {
+                m_Label.PaddingBottom = value;
+                InvalidateAutoSize();
+            }
+        }
+
+        private void LabelMarkupLinkClick(object sender, MarkupLinkClickEventArgs e)
+        {
+            OnMarkupLinkClick(e);
+        }
+
+        /// <summary>
+        /// Invokes the MarkupLinkClick event.
+        /// </summary>
+        /// <param name="e">Provides additional data about event.</param>
+        protected virtual void OnMarkupLinkClick(MarkupLinkClickEventArgs e)
+        {
+            if (MarkupLinkClick != null)
+                MarkupLinkClick(this, e);
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the control interprets an ampersand character (&) in the control's Text property to be an access key prefix character.
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Appearance"), Description("Indicates whether the control interprets an ampersand character (&) in the control's Text property to be an access key prefix character.")]
+        public bool UseMnemonic
+        {
+            get { return m_UseMnemonic; }
+            set
+            {
+                m_UseMnemonic = value;
+                InvalidateAutoSize();
+                this.Invalidate();
+            }
+        }
+
+        protected void InvalidateAutoSize()
+        {
+            m_PreferredSize = Size.Empty;
+        }
+
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            if (m_UseMnemonic)
+                m_Label.ShowPrefix = true;
+            else
+                m_Label.ShowPrefix = false;
+
+            if (m_Label.NeedRecalcSize) m_Label.RecalcSize();
+
+            base.OnPaint(e);
+        }
+
+        private bool CanProcessMnemonic()
+        {
+            if (!this.Enabled || !this.Visible)
+                return false;
+            return true;
+        }
+
+        [UIPermission(SecurityAction.LinkDemand, Window = UIPermissionWindow.AllWindows)]
+        protected override bool ProcessMnemonic(char charCode)
+        {
+            if ((!this.UseMnemonic || !Control.IsMnemonic(charCode, this.Text)) || !this.CanProcessMnemonic() || Control.ModifierKeys != Keys.Alt || m_Label.IsUsingTextMarkup)
+            {
+                return false;
+            }
+            Control parent = this.Parent;
+            if (parent != null)
+            {
+                if (parent.SelectNextControl(this, true, false, true, false) && !parent.ContainsFocus)
+                {
+                    parent.Focus();
+                }
+            }
+            return true;
+        }
+
+#if FRAMEWORK20
+        [Localizable(true), Browsable(false)]
+        public new System.Windows.Forms.Padding Padding
+        {
+            get { return base.Padding; }
+            set { base.Padding = value; }
+        }
+
+        internal bool IsUsingTextMarkup
+        {
+            get
+            {
+                if (m_Label != null)
+                    return m_Label.TextMarkupBody != null;
+                return false;
+            }
+        }
+
+        public override Size GetPreferredSize(Size proposedSize)
+        {
+            if (!m_PreferredSize.IsEmpty && (proposedSize.Width == m_PreferredSize.Width || proposedSize.Width == 0 || this.AutoSize)) return m_PreferredSize;
+
+            if (!BarFunctions.IsHandleValid(this) || this.DesignMode && !this.AutoSize)
+                return base.GetPreferredSize(proposedSize);
+            if (this.Text.Length == 0)
+                return base.GetPreferredSize(proposedSize);
+
+            int oldWidth = m_Label.Width, oldHeight = m_Label.Height;
+            m_Label.SuspendPaint = true;
+            m_Label.Width = 0;
+            m_Label.Height = 0;
+            if ((proposedSize.Width > 0 && proposedSize.Width < 500000 || this.MaximumSize.Width > 0) && m_Label.TextMarkupBody != null)
+            {
+                if (TextOrientation == eOrientation.Horizontal)
+                    m_Label.RecalcSizeMarkup((this.MaximumSize.Width > 0 ? this.MaximumSize.Width : proposedSize.Width));
+                else
+                    m_Label.RecalcSizeMarkup((this.MaximumSize.Height > 0 ? this.MaximumSize.Height : proposedSize.Height));
+            }
+            else
+            {
+                m_Label.RecalcSize();
+                if (this.WordWrap && m_Label.WidthInternal > this.MaximumSize.Width && this.MaximumSize.Width > 0)
+                {
+                    m_Label.Height = 0;
+                    m_Label.Width = Dpi.DescaleWidth(this.MaximumSize.Width);
+                    m_Label.RecalcSize();
+                }
+                else if (this.WordWrap && m_Label.WidthInternal > proposedSize.Width && proposedSize.Width > 0)
+                {
+                    m_Label.Height = 0;
+                    m_Label.Width = Dpi.DescaleWidth(proposedSize.Width);
+                    m_Label.RecalcSize();
+                }
+            }
+            Size s = m_Label.Size;
+            s.Height += 2;
+            if (this.TextOrientation == eOrientation.Vertical)
+            {
+                s.Width += Dpi.Width2;
+            }
+            if (this.Font.Size > 13)
+                s.Height += 2;
+            m_Label.Width = oldWidth;
+            m_Label.Height = oldHeight;
+            m_Label.SuspendPaint = false;
+            m_PreferredSize = s;
+
+            return m_PreferredSize;
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the control is automatically resized to display its entire contents. You can set MaximumSize.Width property to set the maximum width used by the control.
+        /// </summary>
+        [Browsable(true), DefaultValue(false), EditorBrowsable(EditorBrowsableState.Always), DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
+        public override bool AutoSize
+        {
+            get
+            {
+                return base.AutoSize;
+            }
+            set
+            {
+                if (this.AutoSize != value)
+                {
+                    base.AutoSize = value;
+                    AdjustSize();
+                }
+            }
+        }
+
+        protected override void SetBoundsCore(int x, int y, int width, int height, BoundsSpecified specified)
+        {
+            if (this.AutoSize)
+            {
+                Size preferredSize = Size.Empty;
+                if (width != m_PreferredSize.Width && width > 0)
+                {
+                    InvalidateAutoSize();
+                    preferredSize = this.GetPreferredSize(new Size(width, 0));
+                }
+                else
+                    preferredSize = this.PreferredSize;
+                width = preferredSize.Width;
+                height = preferredSize.Height;
+            }
+            base.SetBoundsCore(x, y, width, height, specified);
+        }
+
+        private void AdjustSize()
+        {
+            if (this.AutoSize)
+            {
+                this.Size = base.PreferredSize;
+            }
+        }
+
+        protected override void OnFontChanged(EventArgs e)
+        {
+            InvalidateAutoSize();
+            base.OnFontChanged(e);
+        }
+
+        protected override void OnTextChanged(EventArgs e)
+        {
+            InvalidateAutoSize();
+            base.OnTextChanged(e);
+            this.AdjustSize();
+        }
+#endif
+        /// <summary>
+        /// Gets or sets text-orientation. Default is horizontal.
+        /// </summary>
+        [DefaultValue(eOrientation.Horizontal), Category("Appearance"), Description("Indicates text-orientation")]
+        public eOrientation TextOrientation
+        {
+            get { return m_Label.TextOrientation; }
+            set
+            {
+                m_Label.TextOrientation = value;
+                InvalidateAutoSize();
+                this.AdjustSize();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets how vertical text is rotated when TextOrientation = Vertical.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance"), Description("Indicates how vertical text is rotated when TextOrientation = Vertical.")]
+        public bool VerticalTextTopUp
+        {
+            get { return m_Label.VerticalTextTopUp; }
+            set
+            {
+                m_Label.VerticalTextTopUp = value;
+                if (TextOrientation == eOrientation.Vertical)
+                {
+                    this.Invalidate();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets the underlying LabelItem
+        /// </summary>
+        internal LabelItem LabelItem
+        {
+            get { return (m_Label); }
+        }
+
+        /// <summary>
+        /// Indicates the symbol displayed on label instead of the image. Setting the symbol overrides the image setting.
+        /// </summary>
+        [DefaultValue(""), Category("Appearance"), Description("Indicates the symbol displayed on face of the tile instead of the image. Setting the symbol overrides the image setting.")]
+        [Editor("DevComponents.DotNetBar.Design.SymbolTypeEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor))]
+        public string Symbol
+        {
+            get { return m_Label.Symbol; }
+            set { m_Label.Symbol = value; }
+        }
+        /// <summary>
+        /// Gets or sets the symbol set used to represent the Symbol.
+        /// </summary>
+        [Browsable(false), DefaultValue(eSymbolSet.Awesome)]
+        public eSymbolSet SymbolSet
+        {
+            get { return m_Label.SymbolSet; }
+            set { m_Label.SymbolSet = value; }
+        }
+        /// <summary>
+        /// Indicates the size of the symbol in points.
+        /// </summary>
+        [DefaultValue(0f), Category("Appearance"), Description("Indicates the size of the symbol in points.")]
+        public float SymbolSize
+        {
+            get { return m_Label.SymbolSize; }
+            set { m_Label.SymbolSize = value; }
+        }
+        /// <summary>
+        /// Gets or sets the color of the symbol.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates color of the symbol.")]
+        public Color SymbolColor
+        {
+            get { return m_Label.SymbolColor; }
+            set { m_Label.SymbolColor = value; }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeSymbolColor()
+        {
+            return m_Label.ShouldSerializeSymbolColor();
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetSymbolColor()
+        {
+            m_Label.ResetSymbolColor();
+        }
+
+        /// <summary>
+        /// Indicates whether label text is rendered using bold font unless the Font property is specifically set to different font.
+        /// </summary>
+        [DefaultValue(false), Category("Appearance"), Description("Indicates whether label text is rendered using bold font unless the Font property is specifically set to different font.")]
+        public bool FontBold
+        {
+            get { return m_Label.FontBold; }
+            set
+            {
+                if (m_Label.FontBold != value)
+                {
+                    m_Label.FontBold = value;
+                    this.Invalidate();
+                }
+            }
+        }
+        #endregion
+
+        #region ICommandSource Members
+        protected virtual void ExecuteCommand()
+        {
+            if (_Command == null) return;
+            CommandManager.ExecuteCommand(this);
+        }
+
+        /// <summary>
+        /// Gets or sets the command assigned to the item. Default value is null.
+        /// <remarks>Note that if this property is set to null Enabled property will be set to false automatically to disable the item.</remarks>
+        /// </summary>
+        [DefaultValue(null), Category("Commands"), Description("Indicates the command assigned to the item.")]
+        public Command Command
+        {
+            get { return (Command)((ICommandSource)this).Command; }
+            set
+            {
+                ((ICommandSource)this).Command = value;
+            }
+        }
+
+        private ICommand _Command = null;
+        //[Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        ICommand ICommandSource.Command
+        {
+            get
+            {
+                return _Command;
+            }
+            set
+            {
+                bool changed = false;
+                if (_Command != value)
+                    changed = true;
+
+                if (_Command != null)
+                    CommandManager.UnRegisterCommandSource(this, _Command);
+                _Command = value;
+                if (value != null)
+                    CommandManager.RegisterCommand(this, value);
+                if (changed)
+                    OnCommandChanged();
+            }
+        }
+
+        /// <summary>
+        /// Called when Command property value changes.
+        /// </summary>
+        protected virtual void OnCommandChanged()
+        {
+        }
+
+        private object _CommandParameter = null;
+        /// <summary>
+        /// Gets or sets user defined data value that can be passed to the command when it is executed.
+        /// </summary>
+        [Browsable(true), DefaultValue(null), Category("Commands"), Description("Indicates user defined data value that can be passed to the command when it is executed."), System.ComponentModel.TypeConverter(typeof(System.ComponentModel.StringConverter)), System.ComponentModel.Localizable(true)]
+        public object CommandParameter
+        {
+            get
+            {
+                return _CommandParameter;
+            }
+            set
+            {
+                _CommandParameter = value;
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/LabelX.ico b/PROMS/DotNetBar Source Code/Controls/LabelX.ico
new file mode 100644
index 00000000..4e97915d
Binary files /dev/null and b/PROMS/DotNetBar Source Code/Controls/LabelX.ico differ
diff --git a/PROMS/DotNetBar Source Code/Controls/Line.cs b/PROMS/DotNetBar Source Code/Controls/Line.cs
new file mode 100644
index 00000000..9c978945
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/Line.cs	
@@ -0,0 +1,489 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows.Forms;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    /// <summary>
+    /// A single horizontal or vertical line control.
+    /// </summary>
+    [ToolboxBitmap(typeof(Line), "Controls.Line.ico"), ToolboxItem(true), Description("Horizontal or Vertical Line Control")]
+    public class Line : Control
+    {
+        #region Constructor
+        /// <summary>
+        /// Initializes a new instance of the Line class.
+        /// </summary>
+        public Line()
+        {
+            this.SetStyle(ControlStyles.AllPaintingInWmPaint
+                        | ControlStyles.OptimizedDoubleBuffer
+                        | ControlStyles.UserPaint
+                        | ControlStyles.SupportsTransparentBackColor
+                        , true);
+        }
+        #endregion
+
+        #region Implementation
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            Graphics g = e.Graphics;
+            SmoothingMode sm = g.SmoothingMode;
+            g.SmoothingMode = SmoothingMode.None;
+
+            using (Pen pen = new Pen(ForeColor, _Thickness))
+            {
+                pen.DashStyle = _DashStyle;
+                pen.DashOffset = _DashOffset;
+
+                Point lineStart = LineStartPoint;
+                Point lineEnd = LineEndPoint;
+
+                if (_StartLineCap != eLineEndType.None && _Thickness > 1)
+                {
+                    if (_VerticalLine)
+                        lineStart.Y += _StartLineCapSize.Height / 2;
+                    else
+                        lineStart.X += _StartLineCapSize.Width / 2;
+                }
+                if (_EndLineCap != eLineEndType.None && _Thickness > 1)
+                {
+                    if (_VerticalLine)
+                        lineEnd.Y -= _EndLineCapSize.Height / 2;
+                    else
+                        lineEnd.X -= _EndLineCapSize.Width / 2;
+                }
+
+                g.DrawLine(pen, lineStart, lineEnd);
+            }
+
+            if (_StartLineCap != eLineEndType.None && _StartLineCapSize.Width > 0 && _StartLineCapSize.Height > 0)
+                DrawLineCap(g, LineStartPoint, _StartLineCap, _StartLineCapSize, true);
+
+            if (_EndLineCap != eLineEndType.None && _EndLineCapSize.Width > 0 && _EndLineCapSize.Height > 0)
+                DrawLineCap(g, LineEndPoint, _EndLineCap, _EndLineCapSize, false);
+
+            g.SmoothingMode = sm;
+
+            base.OnPaint(e);
+        }
+        private void DrawLineCap(Graphics g, Point linePoint, eLineEndType lineCap, Size capSize, bool isStartCap)
+        {
+            if (lineCap == eLineEndType.Arrow)
+            {
+                SmoothingMode sm = g.SmoothingMode;
+                g.SmoothingMode = SmoothingMode.HighQuality;
+                using (GraphicsPath path = new GraphicsPath())
+                {
+                    if (isStartCap)
+                    {
+                        if (VerticalLine)
+                            path.AddLines(new Point[] { 
+                                new Point(linePoint.X, linePoint.Y), 
+                                new Point(linePoint.X - capSize.Width/2, linePoint.Y+capSize.Height),
+                                new Point(linePoint.X+capSize.Width / 2, linePoint.Y+capSize.Height)});
+                        else
+                            path.AddLines(new Point[] { 
+                                new Point(linePoint.X, linePoint.Y), 
+                                new Point(linePoint.X + capSize.Width, linePoint.Y-capSize.Height/2),
+                                new Point(linePoint.X+capSize.Width, linePoint.Y+ capSize.Height/2)});
+                    }
+                    else
+                    {
+                        if (VerticalLine)
+                            path.AddLines(new Point[] { 
+                                new Point(linePoint.X, linePoint.Y), 
+                                new Point(linePoint.X + capSize.Width / 2, linePoint.Y - capSize.Height),
+                                new Point(linePoint.X - capSize.Width / 2, linePoint.Y - capSize.Height)});
+                        else
+                            path.AddLines(new Point[] { 
+                                new Point(linePoint.X, linePoint.Y), 
+                                new Point(linePoint.X - capSize.Width, linePoint.Y + capSize.Height / 2),
+                                new Point(linePoint.X - capSize.Width, linePoint.Y - capSize.Height/2)});
+                    }
+                    path.CloseAllFigures();
+                    using (SolidBrush brush = new SolidBrush(ForeColor))
+                        g.FillPath(brush, path);
+                }
+                g.SmoothingMode = sm;
+            }
+            else if (lineCap == eLineEndType.Circle)
+            {
+                SmoothingMode sm = g.SmoothingMode;
+                g.SmoothingMode = SmoothingMode.HighQuality;
+                using (SolidBrush brush = new SolidBrush(ForeColor))
+                {
+                    if (VerticalLine && isStartCap)
+                        g.FillEllipse(brush, new Rectangle(linePoint.X - capSize.Width/2, linePoint.Y , capSize.Width, capSize.Height));
+                    else if (VerticalLine)
+                        g.FillEllipse(brush, new Rectangle(linePoint.X - capSize.Width/2, linePoint.Y - capSize.Height - 1, capSize.Width, capSize.Height));
+                    else if (isStartCap)
+                        g.FillEllipse(brush, new Rectangle(linePoint.X, linePoint.Y - capSize.Height / 2, capSize.Width, capSize.Height));
+                    else
+                        g.FillEllipse(brush, new Rectangle(linePoint.X - capSize.Width - 1, linePoint.Y - capSize.Height / 2, capSize.Width, capSize.Height));
+                }
+                g.SmoothingMode = sm;
+            }
+            else if (lineCap == eLineEndType.Diamond)
+            {
+                SmoothingMode sm = g.SmoothingMode;
+                g.SmoothingMode = SmoothingMode.HighQuality;
+                using (GraphicsPath path = new GraphicsPath())
+                {
+                    if (isStartCap)
+                    {
+                        if (VerticalLine)
+                            path.AddLines(new Point[] { 
+                                new Point(linePoint.X, linePoint.Y), 
+                                new Point(linePoint.X - capSize.Width/2, linePoint.Y+capSize.Height / 2),
+                                new Point(linePoint.X, linePoint.Y+capSize.Height),
+                                new Point(linePoint.X+capSize.Width / 2, linePoint.Y+capSize.Height / 2)});
+                        else
+                            path.AddLines(new Point[] { 
+                                new Point(linePoint.X, linePoint.Y), 
+                                new Point(linePoint.X + capSize.Width/2, linePoint.Y-capSize.Height/2),
+                                new Point(linePoint.X + capSize.Width, linePoint.Y),
+                                new Point(linePoint.X+capSize.Width / 2, linePoint.Y+ capSize.Height/2)});
+                    }
+                    else
+                    {
+                        if (VerticalLine)
+                        {
+                            linePoint.Y--;
+                            path.AddLines(new Point[] { 
+                                new Point(linePoint.X, linePoint.Y), 
+                                new Point(linePoint.X + capSize.Width / 2, linePoint.Y - capSize.Height / 2),
+                                new Point(linePoint.X, linePoint.Y - capSize.Height),
+                                new Point(linePoint.X - capSize.Width / 2, linePoint.Y - capSize.Height / 2)});
+                        }
+                        else
+                        {
+                            linePoint.X--;
+                            path.AddLines(new Point[] { 
+                                new Point(linePoint.X, linePoint.Y), 
+                                new Point(linePoint.X - capSize.Width / 2, linePoint.Y - capSize.Height / 2),
+                                new Point(linePoint.X - capSize.Width, linePoint.Y),
+                                new Point(linePoint.X - capSize.Width / 2, linePoint.Y + capSize.Height/2)});
+                        }
+                    }
+                    path.CloseAllFigures();
+                    using (SolidBrush brush = new SolidBrush(ForeColor))
+                        g.FillPath(brush, path);
+                }
+                g.SmoothingMode = sm;
+            }
+            else if (lineCap == eLineEndType.Rectangle)
+            {
+                SmoothingMode sm = g.SmoothingMode;
+                g.SmoothingMode = SmoothingMode.HighQuality;
+                using (SolidBrush brush = new SolidBrush(ForeColor))
+                {
+                    if (VerticalLine && isStartCap)
+                        g.FillRectangle(brush, new Rectangle(linePoint.X - capSize.Width / 2, linePoint.Y, capSize.Width, capSize.Height));
+                    else if (VerticalLine)
+                        g.FillRectangle(brush, new Rectangle(linePoint.X - capSize.Width / 2, linePoint.Y - capSize.Height - 1, capSize.Width, capSize.Height));
+                    else if (isStartCap)
+                        g.FillRectangle(brush, new Rectangle(linePoint.X, linePoint.Y - capSize.Height / 2, capSize.Width, capSize.Height));
+                    else
+                        g.FillRectangle(brush, new Rectangle(linePoint.X - capSize.Width - 1, linePoint.Y - capSize.Height / 2, capSize.Width, capSize.Height));
+                }
+                g.SmoothingMode = sm;
+            }
+        }
+        private Point LineStartPoint
+        {
+            get
+            {
+                if (!_VerticalLine)
+                {
+                    if (_LineAlignment == eItemAlignment.Center)
+                        return new Point(0, this.Height / 2);
+                    else if (_LineAlignment == eItemAlignment.Near)
+                        return new Point(0, _Thickness / 2 + ((_StartLineCap != eLineEndType.None) ? _StartLineCapSize.Height / 2 : 0));
+                    else if (_LineAlignment == eItemAlignment.Far)
+                        return new Point(0, this.Height - _Thickness / 2 - ((_StartLineCap != eLineEndType.None) ? _StartLineCapSize.Height / 2 : 0));
+                }
+                else
+                {
+                    if (_LineAlignment == eItemAlignment.Center)
+                        return new Point(this.Width / 2, 0);
+                    else if (_LineAlignment == eItemAlignment.Near)
+                    {
+                        return new Point(_Thickness / 2 + ((_EndLineCap != eLineEndType.None) ? _EndLineCapSize.Width / 2 : 0), 0);
+                    }
+                    else if (_LineAlignment == eItemAlignment.Far)
+                        return new Point(this.Width - _Thickness / 2 - ((_EndLineCap != eLineEndType.None) ? _EndLineCapSize.Width / 2 : 0), 0);
+                }
+                return Point.Empty;
+            }
+        }
+        private Point LineEndPoint
+        {
+            get
+            {
+                if (!_VerticalLine)
+                {
+                    return new Point(this.Width, LineStartPoint.Y);
+                }
+                else
+                {
+                    return new Point(LineStartPoint.X, this.Height);
+                }
+
+            }
+        }
+
+        private eItemAlignment _LineAlignment = eItemAlignment.Center;
+        /// <summary>
+        /// Specifies the line alignment within control bounds.
+        /// </summary>
+        [DefaultValue(eItemAlignment.Center), Category("Appearance"), Description("Specifies the line alignment within control bounds.")]
+        public eItemAlignment LineAlignment
+        {
+            get { return _LineAlignment; }
+            set { _LineAlignment = value; this.Invalidate(); }
+        }
+
+        private float _DashOffset;
+        /// <summary>
+        /// Specifies distance from the start of a line to the beginning of a dash pattern.
+        /// </summary>
+        [DefaultValue(0f), Category("Appearance"), Description("Specifies distance from the start of a line to the beginning of a dash pattern.")]
+        public float DashOffset
+        {
+            get { return _DashOffset; }
+            set { _DashOffset = value; this.Invalidate(); }
+        }
+
+        private DashStyle _DashStyle = DashStyle.Solid;
+        /// <summary>
+        /// Specifies the line dash style.
+        /// </summary>
+        [DefaultValue(DashStyle.Solid), Category("Appearance"), Description("Specifies the line dash style.")]
+        public DashStyle DashStyle
+        {
+            get { return _DashStyle; }
+            set { _DashStyle = value; this.Invalidate(); }
+        }
+
+        //private LineCap _LineCap = System.Drawing.Drawing2D.LineCap.Round;
+        ///// <summary>
+        ///// Gets or sets the line cap i.e. line ending.
+        ///// </summary>
+        //[DefaultValue(LineCap.Round), Category("Appearance"), Description("Specifies line cap i.e. line ending.")]
+        //public LineCap LineCap
+        //{
+        //    get { return _LineCap; }
+        //    set { _LineCap = value; this.Invalidate(); }
+        //}
+
+        private int _Thickness = 1;
+        /// <summary>
+        /// Gets or sets the line thickness in pixels.
+        /// </summary>
+        [DefaultValue(1), Category("Appearance"), Description("Indicates line thickness in pixels.")]
+        public int Thickness
+        {
+            get { return _Thickness; }
+            set
+            {
+                _Thickness = value;
+                this.Invalidate();
+                if (this.AutoSize) AdjustSize();
+            }
+        }
+
+
+        private bool _VerticalLine = false;
+        /// <summary>
+        /// Gets or sets whether vertical line is drawn. Default value is false which means horizontal line is drawn.
+        /// </summary>
+        [DefaultValue(false), Category("Appearance"), Description("Indicates whether vertical line is drawn.")]
+        public bool VerticalLine
+        {
+            get { return _VerticalLine; }
+            set
+            {
+                _VerticalLine = value;
+                this.Invalidate();
+            }
+        }
+        /// <summary>
+        /// Gets or sets a value indicating whether the control is automatically resized to display its entire contents. You can set MaximumSize.Width property to set the maximum width used by the control.
+        /// </summary>
+        [Browsable(true), DefaultValue(false), EditorBrowsable(EditorBrowsableState.Always), DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
+        public override bool AutoSize
+        {
+            get
+            {
+                return base.AutoSize;
+            }
+            set
+            {
+                if (this.AutoSize != value)
+                {
+                    base.AutoSize = value;
+                    AdjustSize();
+                }
+            }
+        }
+        private void AdjustSize()
+        {
+            this.Size = GetPreferredSize(this.Size);
+        }
+        public override Size GetPreferredSize(Size proposedSize)
+        {
+            if (this.VerticalLine)
+                return new Size(_Thickness, this.Height);
+            else
+                return new Size(this.Width, _Thickness);
+            //return base.GetPreferredSize(proposedSize);
+        }
+
+        private eLineEndType _StartLineCap = eLineEndType.None;
+        /// <summary>
+        /// Indicates the start of the line cap.
+        /// </summary>
+        [DefaultValue(eLineEndType.None), Category("Appearance"), Description("Indicates the start of the line cap.")]
+        public eLineEndType StartLineCap
+        {
+            get { return _StartLineCap; }
+            set
+            {
+                if (value != _StartLineCap)
+                {
+                    eLineEndType oldValue = _StartLineCap;
+                    _StartLineCap = value;
+                    OnStartLineCapChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when StartLineCap property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnStartLineCapChanged(eLineEndType oldValue, eLineEndType newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("StartLineCap"));
+            this.Refresh();
+        }
+        private static readonly Size DefaultCapSize = new Size(6, 6);
+        private Size _StartLineCapSize = DefaultCapSize;
+        /// <summary>
+        /// Indicates the size of the start cap.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates the size of the start cap.")]
+        public Size StartLineCapSize
+        {
+            get { return _StartLineCapSize; }
+            set
+            {
+                if (value != _StartLineCapSize)
+                {
+                    Size oldValue = _StartLineCapSize;
+                    _StartLineCapSize = value;
+                    OnStartLineCapSizeChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when StartLineCapSize property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnStartLineCapSizeChanged(Size oldValue, Size newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("StartLineCapSize"));
+            this.Refresh();
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeStartLineCapSize()
+        {
+            return _StartLineCapSize != DefaultCapSize;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetStartLineCapSize()
+        {
+            this.StartLineCapSize = DefaultCapSize;
+        }
+
+        private eLineEndType _EndLineCap = eLineEndType.None;
+        /// <summary>
+        /// Indicates the start of the line cap.
+        /// </summary>
+        [DefaultValue(eLineEndType.None), Category("Appearance"), Description("Indicates the start of the line cap.")]
+        public eLineEndType EndLineCap
+        {
+            get { return _EndLineCap; }
+            set
+            {
+                if (value != _EndLineCap)
+                {
+                    eLineEndType oldValue = _EndLineCap;
+                    _EndLineCap = value;
+                    OnEndLineCapChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when EndLineCap property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnEndLineCapChanged(eLineEndType oldValue, eLineEndType newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("EndLineCap"));
+            this.Refresh();
+        }
+
+        private Size _EndLineCapSize = DefaultCapSize;
+        /// <summary>
+        /// Indicates end line cap size.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates end line cap size.")]
+        public Size EndLineCapSize
+        {
+            get { return _EndLineCapSize; }
+            set { _EndLineCapSize = value; this.Refresh(); }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeEndLineCapSize()
+        {
+            return _EndLineCapSize != DefaultCapSize;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetEndLineCapSize()
+        {
+            this.EndLineCapSize = DefaultCapSize;
+        }
+        #endregion
+    }
+    /// <summary>
+    /// Defined line end types.
+    /// </summary>
+    public enum eLineEndType
+    {
+        None,
+        Arrow,
+        Rectangle,
+        Circle,
+        Diamond
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/Line.ico b/PROMS/DotNetBar Source Code/Controls/Line.ico
new file mode 100644
index 00000000..074e3392
Binary files /dev/null and b/PROMS/DotNetBar Source Code/Controls/Line.ico differ
diff --git a/PROMS/DotNetBar Source Code/Controls/ListBoxAdv/CheckStateConvertEventArgs.cs b/PROMS/DotNetBar Source Code/Controls/ListBoxAdv/CheckStateConvertEventArgs.cs
new file mode 100644
index 00000000..9b757274
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/ListBoxAdv/CheckStateConvertEventArgs.cs	
@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Provides data for CheckStateConvert event.
+    /// </summary>
+    public class CheckStateConvertEventArgs : EventArgs
+    {
+        public readonly object Value;
+        public CheckState? CheckState = null;
+        /// <summary>
+        /// Initializes a new instance of the CheckStateConvertEventArgs class.
+        /// </summary>
+        /// <param name="value"></param>
+        public CheckStateConvertEventArgs(object value)
+        {
+            Value = value;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/ListBoxAdv/ListBoxAdv.cs b/PROMS/DotNetBar Source Code/Controls/ListBoxAdv/ListBoxAdv.cs
new file mode 100644
index 00000000..5c77e9b5
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/ListBoxAdv/ListBoxAdv.cs	
@@ -0,0 +1,1051 @@
+using System;
+using System.Text;
+using System.Windows.Forms;
+using System.ComponentModel;
+using System.Drawing;
+using System.Runtime.InteropServices;
+using System.Collections.Generic;
+using System.Collections;
+using DevComponents.DotNetBar.Primitives;
+using System.Drawing.Design;
+
+namespace DevComponents.DotNetBar
+{
+    [ToolboxItem(true), Designer("DevComponents.DotNetBar.Design.ListBoxAdvDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf"), System.Runtime.InteropServices.ComVisible(false)]
+    [ToolboxBitmap(typeof(ToolboxIconResFinder), "ListBoxAdv.ico")]
+    public class ListBoxAdv : ItemPanelBase
+    {
+        #region Constructor
+        /// <summary>
+        /// Initializes a new instance of the ListBoxAdv class.
+        /// </summary>
+        public ListBoxAdv()
+        {
+            _SelectedItems = new CustomCollection<ListBoxItem>();
+            m_ItemContainer.LayoutOrientation = eOrientation.Vertical;
+            EnsureBindingGenerator();
+            ItemVisualGenerator generator = ItemGenerator;
+            generator.CustomCollectionBinding = true;
+            generator.DataSource = _Items;
+        }
+        #endregion
+
+        #region Implementation
+        private string _CheckStateMember;
+        private CustomCollection<object> _Items = new CustomCollection<object>();
+        /// <summary>
+        /// Gets the list of items displayed in list box.
+        /// </summary>
+        [Category("Appearance"), Description("List of items displayed in list box."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content), MergableProperty(false), Localizable(true)]
+        [Editor("System.Windows.Forms.Design.ListControlStringCollectionEditor, System.Design, Version= 2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", typeof(UITypeEditor))]
+        public CustomCollection<object> Items
+        {
+            get { return _Items; }
+        }
+        /// <summary>
+        /// Gets the collection of view items which are created to represent each data item in Items collection.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public IList Views
+        {
+            get { return  GetItemsCollection();}
+        }
+
+        protected override void OnDataSourceChanged(object newDataSource)
+        {
+            ClearDescriptorsCache();
+            EnsureBindingGenerator();
+
+            ItemVisualGenerator generator = ItemGenerator;
+            if (newDataSource == null && generator.CustomCollectionBinding) return; // Nothing changed
+
+            if (newDataSource == null)
+            {
+                generator.CustomCollectionBinding = true;
+                generator.DataSource = _Items;
+            }
+            else
+            {
+                generator.CustomCollectionBinding = false;
+                generator.DataSource = newDataSource;
+            }
+            if (generator.DataSource != newDataSource)
+            {
+                generator.DataSource = newDataSource;
+                OnDataSourceChanged(EventArgs.Empty);
+            }
+        }
+
+        // Fields...
+        private bool _CheckBoxesVisible = false;
+        /// <summary>
+        /// Indicates whether check-boxes are visible inside list box items.
+        /// </summary>
+        [DefaultValue(false), Category("Appearance"), Description("Indicates whether check-boxes are visible inside list box items.")]
+        public bool CheckBoxesVisible
+        {
+            get { return _CheckBoxesVisible; }
+            set
+            {
+                if (value != _CheckBoxesVisible)
+                {
+                    bool oldValue = _CheckBoxesVisible;
+                    _CheckBoxesVisible = value;
+                    OnCheckBoxesVisibleChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when CheckBoxesVisible property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnCheckBoxesVisibleChanged(bool oldValue, bool newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("CheckBoxesVisible"));
+            m_ItemContainer.NeedRecalcSize = true;
+            this.RecalcLayout();
+        }
+
+        private int _ItemHeight = 20;
+        /// <summary>
+        /// Indicates fixed item height. Maybe set to 0 to indicate that each item should be sized based on its content.
+        /// </summary>
+        [DefaultValue(20), Category("Appearance"), Description("Indicates fixed item height. Maybe set to 0 to indicate that each item should be sized based on its content.")]
+        public int ItemHeight
+        {
+            get { return _ItemHeight; }
+            set
+            {
+                if (value != _ItemHeight)
+                {
+                    int oldValue = _ItemHeight;
+                    _ItemHeight = value;
+                    OnItemHeightChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when ItemHeight property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnItemHeightChanged(int oldValue, int newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("ItemHeight"));
+
+        }
+
+        protected override BaseItem GetDefaultItemTemplate()
+        {
+            ListBoxItem item = new ListBoxItem();
+            return item;
+        }
+
+        private eSelectionMode _SelectionMode = eSelectionMode.One;
+        /// <summary>
+        /// Specifies the selection mode used by the control.
+        /// </summary>
+        [DefaultValue(eSelectionMode.One), Category("Behavior"), Description("Specifies the selection mode used by the control.")]
+        public eSelectionMode SelectionMode
+        {
+            get { return _SelectionMode; }
+            set
+            {
+                if (value != _SelectionMode)
+                {
+                    eSelectionMode oldValue = _SelectionMode;
+                    _SelectionMode = value;
+                    OnSelectionModeChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when SelectionMode property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnSelectionModeChanged(eSelectionMode oldValue, eSelectionMode newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("SelectionMode"));
+        }
+
+        protected override void OnItemAdded(BaseItem item, EventArgs e)
+        {
+            ListBoxItem listItem = item as ListBoxItem;
+            bool selectedItemsChanged = false;
+            if (listItem != null)
+            {
+                if (listItem.IsSelected)
+                {
+                    if (_SelectionMode == eSelectionMode.One)
+                    {
+                        if (_SelectedItems.Count > 0)
+                        {
+                            ListBoxItem[] selItems = new ListBoxItem[_SelectedItems.Count];
+                            _SelectedItems.CopyTo(selItems);
+                            foreach (ListBoxItem selItem in selItems)
+                            {
+                                selItem.IsSelected = false;
+                            }
+                        }
+                        _SelectedItems.Add(listItem);
+                        UpdateSelectedIndex();
+                        selectedItemsChanged = true;
+                    }
+                    else if (_SelectionMode == eSelectionMode.MultiSimple)
+                    {
+                        _SelectedItems.Add(listItem);
+                        UpdateSelectedIndex();
+                        selectedItemsChanged = true;
+                    }
+                }
+            }
+
+            if (selectedItemsChanged)
+                RaiseSelectionChangedEvents();
+
+            base.OnItemAdded(item, e);
+        }
+
+        private void RaiseSelectionChangedEvents()
+        {
+            OnSelectedIndexChanged(EventArgs.Empty);
+        }
+
+        private void UpdateSelectedIndex()
+        {
+            if (_SelectedItems.Count == 0)
+                _SelectedIndex = -1;
+            else
+            {
+                ListBoxItem item = _SelectedItems[_SelectedItems.Count - 1];
+                _SelectedIndex = m_ItemContainer.SubItems.IndexOf(item);
+            }
+        }
+        protected override void OnItemRemoved(BaseItem item, ItemRemovedEventArgs e)
+        {
+            ListBoxItem listItem = item as ListBoxItem;
+            bool selectedItemsChanged = false;
+            if (listItem != null)
+            {
+                if (listItem.IsSelected)
+                {
+                    if (_SelectedItems.Contains(listItem))
+                    {
+                        _SelectedItems.Remove(listItem);
+                        UpdateSelectedIndex();
+                        selectedItemsChanged = true;
+                    }
+                }
+            }
+
+            if (selectedItemsChanged)
+                RaiseSelectionChangedEvents();
+
+            base.OnItemRemoved(item, e);
+        }
+
+        private bool _HandlingSelectedChanged = false;
+        internal void OnListBoxItemSelectedChanged(ListBoxItem item, eEventSource source)
+        {
+            if (_HandlingSelectedChanged) return;
+            _HandlingSelectedChanged = true;
+
+            bool selectedItemsChanged = false;
+            if (item.IsSelected)
+            {
+                if (_SelectionMode == eSelectionMode.One && _SelectedItems.Count > 0)
+                {
+                    ClearSelectedItems(source);
+                }
+                if (!_SelectedItems.Contains(item))
+                {
+                    _SelectedItems.Add(item);
+                    selectedItemsChanged = true;
+                    UpdateSelectedIndex();
+                }
+            }
+            else
+            {
+                if (_SelectedItems.Contains(item))
+                {
+                    _SelectedItems.Remove(item);
+                    selectedItemsChanged = true;
+                    UpdateSelectedIndex();
+                }
+            }
+
+            if (selectedItemsChanged)
+            {
+                this.Invalidate();
+                RaiseSelectionChangedEvents();
+            }
+
+            _HandlingSelectedChanged = false;
+        }
+
+        internal void ClearSelectedItems(eEventSource source)
+        {
+            if (_SelectedItems.Count == 0) return;
+            ListBoxItem[] selItems = new ListBoxItem[_SelectedItems.Count];
+            _SelectedItems.CopyTo(selItems);
+            foreach (ListBoxItem selItem in selItems)
+            {
+                selItem.SetIsSelected(false, source);
+            }
+            _SelectedItems.Clear();
+        }
+
+        /// <summary>
+        /// Selects or clears the selection for the specified item in a ListBoxAdv. Use this property to set the selection of items in a multiple-selection ListBoxAdv. To select an item in a single-selection ListBox, use the SelectedIndex property.
+        /// </summary>
+        /// <param name="index">The zero-based index of the item in a ListBox to select or clear the selection for. You can pass -1 to clear the selection.</param>
+        /// <param name="value">true to select the specified item; otherwise, false.</param>
+        public void SetSelected(int index, bool value)
+        {
+            SetSelected(index, value, eEventSource.Code);
+        }
+
+        /// <summary>
+        /// Selects or clears the selection for the specified item in a ListBoxAdv. Use this property to set the selection of items in a multiple-selection ListBoxAdv. To select an item in a single-selection ListBox, use the SelectedIndex property.
+        /// </summary>
+        /// <param name="index">The zero-based index of the item in a ListBox to select or clear the selection for. You can pass -1 to clear the selection.</param>
+        /// <param name="value">true to select the specified item; otherwise, false.</param>
+        /// <param name="source">Indicates the source of the change.</param>
+        public void SetSelected(int index, bool value, eEventSource source)
+        {
+            if (index == -1)
+            {
+                ClearSelectedItems(source);
+                return;
+            }
+            ListBoxItem item = m_ItemContainer.SubItems[index] as ListBoxItem;
+            if (item != null)
+                item.SetIsSelected(value, source);
+        }
+
+        /// <summary>
+        /// Gets or sets the zero-based index of the currently selected item in a ListBoxAdv. Negative one (-1) is returned if no item is selected.
+        /// </summary>
+        [Bindable(true), Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override int SelectedIndex
+        {
+            get
+            {
+                return _SelectedIndex;
+            }
+            set
+            {
+                if (_SelectedItems.Count > 0) ClearSelectedItems(eEventSource.Code);
+                SetSelected(value, true);
+            }
+        }
+
+        /// <summary>
+        /// Selects next visible list box item.
+        /// </summary>
+        public void SelectNextItem()
+        {
+            int startIndex = this.SelectedIndex == -1 ? 0 : this.SelectedIndex + 1;
+            if (startIndex >= m_ItemContainer.SubItems.Count)
+                return;
+            for (int i = startIndex; i < m_ItemContainer.SubItems.Count; i++)
+            {
+                ListBoxItem item = m_ItemContainer.SubItems[i] as ListBoxItem;
+                if (item == null) continue;
+                if (item.Visible)
+                {
+                    item.IsSelected = true;
+                    EnsureVisible(item);
+                    break;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Selects previous visible list box item.
+        /// </summary>
+        public void SelectPreviousItem()
+        {
+            int startIndex = this.SelectedIndex == -1 ? 0 : this.SelectedIndex - 1;
+            if (startIndex < 0)
+                return;
+            for (int i = startIndex; i >= 0; i--)
+            {
+                ListBoxItem item = m_ItemContainer.SubItems[i] as ListBoxItem;
+                if (item == null) continue;
+                if (item.Visible)
+                {
+                    item.IsSelected = true;
+                    EnsureVisible(item);
+                    break;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets a collection that contains the zero-based indexes of all currently selected items in the ListBoxAdv. Do not modify items in this collection. To select or deselect list items while in multi-selection mode use SetSelected method.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public List<int> SelectedIndices
+        {
+            get
+            {
+                return GetSelectedIndices();
+            }
+        }
+
+        private List<int> GetSelectedIndices()
+        {
+            List<int> list = new List<int>();
+            if (_SelectedItems.Count == 0) return list;
+            foreach (ListBoxItem item in _SelectedItems)
+            {
+                list.Add(m_ItemContainer.SubItems.IndexOf(item));
+            }
+
+            return list;
+        }
+
+        /// <summary>
+        /// Gets a collection containing the currently selected items in the ListBoxAdv. Do not modify items in this collection. To select or deselect list items while in multi-selection mode use SetSelected method.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public CustomCollection<ListBoxItem> SelectedItems
+        {
+            get
+            {
+                return _SelectedItems;
+            }
+        }
+
+        private CustomCollection<ListBoxItem> _SelectedItems;
+        /// <summary>
+        /// Gets or sets the selected item.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public object SelectedItem
+        {
+            get
+            {
+                if (_SelectedItems.Count == 0) return null;
+                ListBoxItem item = _SelectedItems[0];
+                if (item.Tag is ItemBindingData)
+                    return ((ItemBindingData)item.Tag).DataItem;
+                return item;
+            }
+            set
+            {
+                if (value == null)
+                {
+                    foreach (ListBoxItem item in _SelectedItems)
+                    {
+                        item.SetIsSelected(false, eEventSource.Code);
+                    }
+                }
+                else
+                {
+                    ListBoxItem item = FindListBoxItem(value);
+                    if (item == null)
+                        throw new InvalidOperationException("SelectedValue set cannot be found in Items collection");
+                    item.SetIsSelected(true, eEventSource.Code);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets ListBoxItem which represents an object value from Items collection when Items collection contains non ListBoxItem objects.
+        /// </summary>
+        /// <param name="value">Value to get ListBoxItem for.</param>
+        /// <returns></returns>
+        public ListBoxItem FindListBoxItem(object value)
+        {
+            if (value is ListBoxItem)
+                return (ListBoxItem)value;
+            foreach (BaseItem visual in m_ItemContainer.SubItems)
+            {
+                ListBoxItem item = visual as ListBoxItem;
+                if (item != null && item.Tag is ItemBindingData && ((ItemBindingData)item.Tag).DataItem == value)
+                    return item;
+            }
+            return null;
+        }
+
+        private ListBoxItem _FocusItem = null;
+        protected override void OnKeyboardItemSelected(BaseItem item)
+        {
+            base.OnKeyboardItemSelected(item);
+            if (item is ListBoxItem)
+            {
+                ListBoxItem listItem = (ListBoxItem)item;
+                if (_SelectionMode == eSelectionMode.One)
+                {
+                    listItem.SetIsSelected(true, eEventSource.Keyboard);
+                }
+                else
+                {
+                    if (_SelectionMode == eSelectionMode.MultiExtended)
+                    {
+                        if ((Control.ModifierKeys & Keys.Shift) == Keys.None)
+                        {
+                            ClearSelectedItems(eEventSource.Keyboard);
+                            listItem.SetIsSelected(true, eEventSource.Keyboard);
+                        }
+                        else
+                        {
+                            if (listItem.IsSelected && _FocusItem != null && _FocusItem.IsSelected)
+                            {
+                                _FocusItem.SetIsSelected(false, eEventSource.Keyboard);
+                            }
+                            else
+                            {
+                                listItem.SetIsSelected(true, eEventSource.Keyboard);
+                            }
+                        }
+                    }
+                    if (_FocusItem != null) _FocusItem.OnLostFocus();
+                    _FocusItem = listItem;
+                    _FocusItem.OnGotFocus();
+                }
+            }
+            else
+            {
+                if (_FocusItem != null) _FocusItem.OnLostFocus();
+                _FocusItem = null;
+            }
+        }
+
+        protected override void OnLostFocus(EventArgs e)
+        {
+            if (_FocusItem != null) _FocusItem.OnLostFocus();
+            _FocusItem = null;
+            base.OnLostFocus(e);
+        }
+
+        protected override void OnKeyDown(KeyEventArgs e)
+        {
+            if (e.KeyCode == Keys.Space && _SelectionMode == eSelectionMode.MultiSimple && _FocusItem != null)
+            {
+                _FocusItem.SetIsSelected(!_FocusItem.IsSelected, eEventSource.Keyboard);
+            }
+            base.OnKeyDown(e);
+        }
+
+        protected override bool ProcessDialogKey(Keys keyData)
+        {
+            if ((keyData & (Keys.Control | Keys.Alt)) == Keys.None)
+            {
+                Keys keys = keyData & Keys.KeyCode;
+                if (keys == Keys.Left || keys == Keys.Right || keys == Keys.Up || keys == Keys.Down)
+                {
+                    ExKeyDown(new KeyEventArgs(keys));
+                    return true;
+                }
+            }
+            return base.ProcessDialogKey(keyData);
+        }
+
+        private string _DisplayMember = "";
+        /// <summary>
+        /// Indicates property name which will provide the value to display for this list box when data-binding is used and DataSource is set.
+        /// </summary>
+        [DefaultValue(""), Category("Data"), Description("Indicates property name which will provide the value to display for this list box when data-binding is used and DataSource is set.")]
+        [TypeConverter("System.Windows.Forms.Design.DataMemberFieldConverter, System.Design, Version= 2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
+        [Editor("System.Windows.Forms.Design.DataMemberFieldEditor, System.Design, Version= 2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", typeof(UITypeEditor))]
+        public string DisplayMember
+        {
+            get { return _DisplayMember; }
+            set
+            {
+                if (value == null) value = "";
+                if (value != _DisplayMember)
+                {
+                    string oldValue = _DisplayMember;
+                    _DisplayMember = value;
+                    OnDisplayMemberChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when DisplayMember property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnDisplayMemberChanged(string oldValue, string newValue)
+        {
+            EnsureBindingGenerator();
+            ItemVisualGenerator generator = ItemGenerator;
+
+            foreach (BindingDef item in generator.Bindings)
+            {
+                if (item.PropertyName == "Text")
+                {
+                    generator.Bindings.Remove(item);
+                    break;
+                }
+            }
+
+            if (!string.IsNullOrEmpty(newValue))
+            {
+                BindingDef bindDef = new BindingDef("Text", newValue);
+                generator.Bindings.Add(bindDef);
+            }
+            generator.RefreshItems();
+            //OnPropertyChanged(new PropertyChangedEventArgs("DisplayMember"));
+        }
+
+        /// <summary>
+        /// Indicates property name which will provide the value for CheckState of the list box item when data-binding is used and DataSource is set.
+        /// </summary>
+        [DefaultValue(""), Category("Data"), Description("Indicates property name which will provide the value for CheckState of the list box item when data-binding is used and DataSource is set.")]
+        [TypeConverter("System.Windows.Forms.Design.DataMemberFieldConverter, System.Design, Version= 2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
+        [Editor("System.Windows.Forms.Design.DataMemberFieldEditor, System.Design, Version= 2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", typeof(UITypeEditor))]
+        public string CheckStateMember
+        {
+            get { return _CheckStateMember; }
+            set
+            {
+                if (value == null) value = "";
+                if (value != _CheckStateMember)
+                {
+                    string oldValue = _CheckStateMember;
+                    _CheckStateMember = value;
+                    OnCheckStateMemberChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when CheckStateMember property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnCheckStateMemberChanged(string oldValue, string newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("CheckStateMember"));
+            EnsureBindingGenerator();
+            ItemVisualGenerator generator = ItemGenerator;
+
+            foreach (BindingDef item in generator.Bindings)
+            {
+                if (item.PropertyName == "CheckState")
+                {
+                    item.Format -= CheckStateBindingFormat;
+                    generator.Bindings.Remove(item);
+                    break;
+                }
+            }
+
+            if (!string.IsNullOrEmpty(newValue))
+            {
+                BindingDef bindDef = new BindingDef("CheckState", newValue);
+                bindDef.FormattingEnabled = true;
+                bindDef.Format += CheckStateBindingFormat;
+                generator.Bindings.Add(bindDef);
+            }
+            generator.RefreshItems();
+        }
+
+        /// <summary>
+        /// Occurs when using data-binding with CheckStateMember specified and it allows you to convert a property value to CheckState.
+        /// </summary>
+        [Description("Occurs when using data-binding with CheckStateMember specified and it allows you to convert a property value to CheckState.")]
+        public event CheckStateConvertEventHandler CheckStateConvert;
+        /// <summary>
+        /// Raises CheckStateConvert event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnCheckStateConvert(CheckStateConvertEventArgs e)
+        {
+            CheckStateConvertEventHandler handler = CheckStateConvert;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        private void CheckStateBindingFormat(object sender, DataConvertEventArgs e)
+        {
+            if (CheckStateConvert != null)
+            {
+                CheckStateConvertEventArgs cea = new CheckStateConvertEventArgs(e.Value);
+                OnCheckStateConvert(cea);
+                if (cea.CheckState != null)
+                {
+                    e.Value = cea.CheckState.Value;
+                    return;
+                }
+            }
+            e.Value = GetCheckState(e.Value);
+        }
+
+        private CheckState GetCheckState(object value)
+        {
+            if (value is System.Data.SqlTypes.SqlBoolean)
+            {
+                System.Data.SqlTypes.SqlBoolean sqlBool = (System.Data.SqlTypes.SqlBoolean)value;
+                if (sqlBool.IsTrue)
+                    return CheckState.Checked;
+                else if (sqlBool.IsNull)
+                    return CheckState.Indeterminate;
+                else
+                    return CheckState.Unchecked;
+            }
+            else if (value is int?)
+            {
+                if (value == null) return CheckState.Indeterminate;
+                if (((int?)value).Value == 0)
+                    return CheckState.Unchecked;
+                return CheckState.Checked;
+            }
+            else if (value is int)
+            {
+                if ((int)value == -1)
+                    return CheckState.Indeterminate;
+                return ((int)value) == 0 ? CheckState.Unchecked : CheckState.Checked;
+            }
+            else if (value is long)
+            {
+                if ((long)value == -1)
+                    return CheckState.Indeterminate;
+                return ((long)value) == 0 ? CheckState.Unchecked : CheckState.Checked;
+            }
+            else if (value is short)
+            {
+                if ((short)value == -1)
+                    return CheckState.Indeterminate;
+                return ((short)value) == 0 ? CheckState.Unchecked : CheckState.Checked;
+            }
+            else if (value is float)
+            {
+                if ((float)value == -1)
+                    return CheckState.Indeterminate;
+                return ((float)value) == 0 ? CheckState.Unchecked : CheckState.Checked;
+            }
+            else if (value is double)
+            {
+                if ((double)value == -1)
+                    return CheckState.Indeterminate;
+                return ((double)value) == 0 ? CheckState.Unchecked : CheckState.Checked;
+            }
+            else if (value is byte)
+            {
+                return ((byte)value) == 0 ? CheckState.Unchecked : CheckState.Checked;
+            }
+            else if (value is uint)
+            {
+                return ((uint)value) == 0 ? CheckState.Unchecked : CheckState.Checked;
+            }
+            else if (value is ulong)
+            {
+                return ((ulong)value) == 0 ? CheckState.Unchecked : CheckState.Checked;
+            }
+            else if (value is bool)
+            {
+                return ((bool)value) == false ? CheckState.Unchecked : CheckState.Checked;
+            }
+
+            return CheckState.Indeterminate;
+        }
+
+        private bool IsNull(object value)
+        {
+            return value == null ||
+                value == DBNull.Value;
+        }
+
+        /// <summary>
+        /// Returns the enumerator with selected values if any
+        /// </summary>
+        [Browsable(false)]
+        public IEnumerable<object> SelectedValues
+        {
+            get
+            {
+                List<int> selectedIndexes = SelectedIndices;
+                foreach (int index in selectedIndexes)
+                {
+                    yield return GetValueByIndex(index);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the value of the member property specified by the ValueMember property. If ValueMember specifies property that cannot be found on selected object this property returns null.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public object SelectedValue
+        {
+            get
+            {
+                if (this.DataSource == null)
+                    return null;
+
+                int selIndex = this.SelectedIndex;
+                return GetValueByIndex(selIndex);
+            }
+            set
+            {
+                if (string.IsNullOrEmpty(_ValueMember))
+                    throw new InvalidOperationException("ValueMember property not set");
+                int index = FindValueMemberIndexOf(value);
+                if (index < 0)
+                    throw new InvalidPropertyValueException("value not found.");
+
+                this.SelectedItem = m_ItemContainer.SubItems[index];
+            }
+        }
+
+        private object GetValueByIndex(int selIndex)
+        {
+            if (selIndex < 0) return null;
+            ItemVisualGenerator generator = ItemGenerator;
+            if (generator.DataManager == null || generator.DataManager.List == null)
+                return null;
+
+            object item = generator.DataManager.List[selIndex];
+
+            return GetPropertyValue(item, _ValueMember);
+        }
+        private int FindValueMemberIndexOf(object value)
+        {
+            ItemVisualGenerator generator = ItemGenerator;
+            if (generator.DataManager == null || generator.DataManager.List == null)
+                return -1;
+            IList list = generator.DataManager.List;
+            for (int i = 0; i < list.Count; i++)
+            {
+                object itemValue = GetPropertyValue(list[i], _ValueMember);
+                if (itemValue.Equals(value))
+                    return i;
+            }
+            return -1;
+        }
+        private string _ValueMember = "";
+        /// <summary>
+        /// Indicates property name which will return the value for the selected item when SelectedValue property is accessed.
+        /// </summary>
+        [Description("Indicates property name which will return the value for the selected item when SelectedValue property is accessed.")]
+        [DefaultValue("")]
+        [Editor("System.Windows.Forms.Design.DataMemberFieldEditor, System.Design, Version= 2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", typeof(UITypeEditor))]
+        [Category("Data")]
+        public string ValueMember
+        {
+            get { return _ValueMember; }
+            set
+            {
+                if (value == null) value = "";
+                if (value != _ValueMember)
+                {
+                    string oldValue = _ValueMember;
+                    _ValueMember = value;
+                    OnValueMemberChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when ValueMember property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnValueMemberChanged(string oldValue, string newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("ValueMember"));   
+        }
+
+        Dictionary<string, PropertyDescriptor> _DescriptorsCache = new Dictionary<string, PropertyDescriptor>();
+        /// <summary>
+        /// Clears internal property descriptors cache when data-binding is used. In most cases it is not needed that you call this method. Do so only if instructed by DevComponents support.
+        /// </summary>
+        public void ClearDescriptorsCache()
+        {
+            _DescriptorsCache.Clear();
+        }
+        protected object GetPropertyValue(object item, string fieldName)
+        {
+            if ((item != null) && (fieldName.Length > 0))
+            {
+                try
+                {
+                    PropertyDescriptor descriptor = null;
+                    string key = item.GetType().ToString() + ":" + fieldName;
+                    if (!_DescriptorsCache.TryGetValue(key, out descriptor))
+                    {
+                        ItemVisualGenerator generator = ItemGenerator;
+                        if (generator.DataManager != null)
+                        {
+                            descriptor = generator.DataManager.GetItemProperties().Find(fieldName, true);
+                        }
+                        else
+                        {
+                            descriptor = TypeDescriptor.GetProperties(item).Find(fieldName, true);
+                        }
+                        if (descriptor != null)
+                            _DescriptorsCache.Add(key, descriptor);
+                    }
+                    if (descriptor != null)
+                    {
+                        item = descriptor.GetValue(item);
+                    }
+                }
+                catch
+                {
+                }
+            }
+            return item;
+        }
+
+        /// <summary>
+        /// Finds the first item in the ListBox that starts with the specified string. The search starts at a specific starting index.
+        /// </summary>
+        /// <param name="s">The text to search for.</param>
+        /// <returns>The zero-based index of the first item found; returns ListBox.NoMatches if no match is found.</returns>
+        public int FindString(string s)
+        {
+            return FindString(s, 0);
+        }
+
+        /// <summary>
+        /// Finds the first item in the ListBox that starts with the specified string. The search starts at a specific starting index.
+        /// </summary>
+        /// <param name="s">The text to search for.</param>
+        /// <param name="startIndex">The zero-based index of the item before the first item to be searched. Set to negative one (-1) to search from the beginning of the control. </param>
+        /// <returns>The zero-based index of the first item found; returns ListBox.NoMatches if no match is found.</returns>
+        public int FindString(string s, int startIndex)
+        {
+            if (startIndex < 0)
+                startIndex = 0;
+
+            for (int i = startIndex; i < m_ItemContainer.SubItems.Count; i++)
+            {
+                if (m_ItemContainer.SubItems[i].Text.StartsWith(s))
+                    return i;
+            }
+
+            return ListBox.NoMatches;
+        }
+
+        /// <summary>
+        /// Finds the first item in the ListBox that exactly matches the specified string. The search starts at a specific starting index.
+        /// </summary>
+        /// <param name="s">The text to search for.</param>
+        /// <returns>The zero-based index of the first item found; returns ListBox.NoMatches if no match is found.</returns>
+        public int FindStringExact(string s)
+        {
+            return FindStringExact(s, 0);
+        }
+
+        /// <summary>
+        /// Finds the first item in the ListBox that exactly matches the specified string. The search starts at a specific starting index.
+        /// </summary>
+        /// <param name="s">The text to search for.</param>
+        /// <param name="startIndex">The zero-based index of the item before the first item to be searched. Set to negative one (-1) to search from the beginning of the control. </param>
+        /// <returns>The zero-based index of the first item found; returns ListBox.NoMatches if no match is found.</returns>
+        public int FindStringExact(string s, int startIndex)
+        {
+            if (startIndex < 0)
+                startIndex = 0;
+
+            for (int i = startIndex; i < m_ItemContainer.SubItems.Count; i++)
+            {
+                if (m_ItemContainer.SubItems[i].Text == s)
+                    return i;
+            }
+
+            return ListBox.NoMatches;
+        }
+
+        internal void ListItemCheckStateChanged(ListBoxAdvItemCheckEventArgs e)
+        {
+            OnItemCheck(e);
+        }
+
+        /// <summary>
+        /// Occurs when CheckState of an ListBoxItem changes and it allows you to cancel the change.
+        /// </summary>
+        [Description("Occurs when CheckState of an ListBoxItem changes and it allows you to cancel the change.")]
+        public event ListBoxAdvItemCheckEventHandler ItemCheck;
+        /// <summary>
+        /// Raises ItemCheck event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnItemCheck(ListBoxAdvItemCheckEventArgs e)
+        {
+            ListBoxAdvItemCheckEventHandler handler = ItemCheck;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        /// <summary>
+        /// Gets collection of checked items in the list. Modifying this collection does not have any effect on actual checked items. Use SetItemCheckState to set checked state of an item or access ListBoxItem directly and set its CheckState property.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public List<ListBoxItem> CheckedItems
+        {
+            get
+            {
+                List<ListBoxItem> items = new List<ListBoxItem>();
+                foreach (BaseItem item in m_ItemContainer.SubItems)
+                {
+                    ListBoxItem listItem = item as ListBoxItem;
+                    if (listItem == null) continue;
+                    if (listItem.CheckState != CheckState.Unchecked)
+                        items.Add(listItem);
+                }
+                return items;
+            }
+        }
+
+        /// <summary>
+        /// Sets the check state of the item at the specified index.
+        /// </summary>
+        /// <param name="index">The index of the item to set the state for. </param>
+        /// <param name="value">One of the CheckState values. </param>
+        public void SetItemCheckState(int index, CheckState value)
+        {
+            ListBoxItem item = m_ItemContainer.SubItems[index] as ListBoxItem;
+            item.CheckState = value;
+        }
+
+        private bool _UseMnemonic = false;
+        /// <summary>
+        /// Gets or sets a value indicating whether the items interprets an ampersand character (&) in the control's Text property to be an access key prefix character.
+        /// </summary>
+        [Browsable(true), DefaultValue(false), Category("Appearance"), Description("Indicates whether the items interprets an ampersand character (&) in the control's Text property to be an access key prefix character.")]
+        public bool UseMnemonic
+        {
+            get { return _UseMnemonic; }
+            set
+            {
+                _UseMnemonic = value;
+                m_ItemContainer.NeedRecalcSize = true;
+            }
+        }
+        #endregion
+    }
+
+
+
+    /// <summary>
+    /// Defines selection modes for list control.
+    /// </summary>
+    public enum eSelectionMode
+    {
+        /// <summary>
+        /// Items cannot be selected.
+        /// </summary>
+        None,
+        /// <summary>
+        /// Only one item at the time can be selected.
+        /// </summary>
+        One,
+        /// <summary>
+        /// Multiple items can be selected.  A mouse click or pressing the SPACEBAR selects or deselects an item in the list.
+        /// </summary>
+        MultiSimple,
+        /// <summary>
+        /// Multiple items can be selected. Pressing SHIFT and clicking the mouse or pressing SHIFT and one of the arrow keys (UP ARROW, DOWN ARROW, LEFT ARROW, and RIGHT ARROW) extends the selection from the previously selected item to the current item. Pressing CTRL and clicking the mouse selects or deselects an item in the list. 
+        /// </summary>
+        MultiExtended
+    }
+
+    public delegate void CheckStateConvertEventHandler(object sender, CheckStateConvertEventArgs ea);
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/ListBoxAdv/ListBoxAdvItemCheckEventArgs.cs b/PROMS/DotNetBar Source Code/Controls/ListBoxAdv/ListBoxAdvItemCheckEventArgs.cs
new file mode 100644
index 00000000..83d0ef75
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/ListBoxAdv/ListBoxAdvItemCheckEventArgs.cs	
@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace DevComponents.DotNetBar
+{
+    public class ListBoxAdvItemCheckEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Indicates that CheckState change of the item should be canceled.
+        /// </summary>
+        public bool Cancel = false;
+        /// <summary>
+        /// Specifies the ListBoxItem that was changing.
+        /// </summary>
+        public readonly ListBoxItem Item;
+        /// <summary>
+        /// When data-bound provides the object which was used to generate an ListBoxItem.
+        /// </summary>
+        public readonly object Value;
+
+        /// <summary>
+        /// Initializes a new instance of the ListBoxAdvItemCheckEventArgs class.
+        /// </summary>
+        /// <param name="item"></param>
+        /// <param name="value"></param>
+        public ListBoxAdvItemCheckEventArgs(ListBoxItem item, object value)
+        {
+            Item = item;
+            Value = value;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/ListBoxAdv/ListBoxAdvItemCheckEventHandler.cs b/PROMS/DotNetBar Source Code/Controls/ListBoxAdv/ListBoxAdvItemCheckEventHandler.cs
new file mode 100644
index 00000000..eae885b2
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/ListBoxAdv/ListBoxAdvItemCheckEventHandler.cs	
@@ -0,0 +1,8 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace DevComponents.DotNetBar
+{
+    public delegate void ListBoxAdvItemCheckEventHandler(object sender, ListBoxAdvItemCheckEventArgs e);
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/ListBoxAdv/ListBoxItem.cs b/PROMS/DotNetBar Source Code/Controls/ListBoxAdv/ListBoxItem.cs
new file mode 100644
index 00000000..6705a4a7
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/ListBoxAdv/ListBoxItem.cs	
@@ -0,0 +1,727 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represents the ListBoxAdv item for internal use. Not for public usage.
+    /// </summary>
+    public class ListBoxItem : BaseItem
+    {
+        #region Constructor
+
+        #endregion
+
+        #region Implementation
+        /// <summary>
+        /// Returns copy of the item.
+        /// </summary>
+        public override BaseItem Copy()
+        {
+            ListBoxItem copy = new ListBoxItem();
+            this.CopyToItem(copy);
+            return copy;
+        }
+
+        /// <summary>
+        /// Copies the ListBoxItem specific properties to new instance of the item.
+        /// </summary>
+        /// <param name="copy">New ListBoxItem instance.</param>
+        internal void InternalCopyToItem(ListBoxItem copy)
+        {
+            CopyToItem(copy);
+        }
+
+        /// <summary>
+        /// Copies the ListBoxItem specific properties to new instance of the item.
+        /// </summary>
+        /// <param name="copy">New item instance.</param>
+        protected override void CopyToItem(BaseItem copy)
+        {
+            base.CopyToItem(copy);
+
+            ListBoxItem item = copy as ListBoxItem;
+            item.IsSelected = _IsSelected;
+            item.Symbol = _Symbol;
+            item.SymbolSet = _SymbolSet;
+            item.SymbolColor = _SymbolColor;
+            item.SymbolSize = _SymbolSize;
+        }
+
+        public override void Paint(ItemPaintArgs p)
+        {
+            Rendering.BaseRenderer renderer = p.Renderer;
+            if (renderer != null)
+            {
+                ListBoxItemRendererEventArgs e = new ListBoxItemRendererEventArgs(this, p.Graphics);
+                e.ItemPaintArgs = p;
+                renderer.DrawListBoxItem(e);
+            }
+            else
+            {
+                Rendering.ListBoxItemPainter painter = PainterFactory.CreateListBoxItemPainter(this);
+                if (painter != null)
+                {
+                    ListBoxItemRendererEventArgs e = new ListBoxItemRendererEventArgs(this, p.Graphics);
+                    e.ItemPaintArgs = p;
+                    painter.Paint(e);
+                }
+            }
+
+            if (this.DesignMode && this.Focused)
+            {
+                Rectangle r = m_Rect;
+                r.Inflate(-1, -1);
+                DesignTime.DrawDesignTimeSelection(p.Graphics, r, p.Colors.ItemDesignTimeBorder);
+            }
+            else if (this.Focused)
+            {
+                Rectangle r = m_Rect;
+                r.Inflate(-1, -1);
+                Color c = SystemColors.Control;
+                if (renderer is Rendering.Office2007Renderer) c = ((Rendering.Office2007Renderer)renderer).ColorTable.ListBoxItem.Default.TextColor;
+                using (Pen pen = new Pen(c, 1))
+                {
+                    pen.DashStyle = System.Drawing.Drawing2D.DashStyle.Dot;
+                    System.Drawing.Drawing2D.SmoothingMode sm = p.Graphics.SmoothingMode;
+                    p.Graphics.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.None;
+                    p.Graphics.DrawRectangle(pen, r);
+                    p.Graphics.SmoothingMode = sm;
+                }
+            }
+
+            this.DrawInsertMarker(p.Graphics);
+
+        }
+
+        private CheckState _CheckState = CheckState.Unchecked;
+        private bool _HotTracking;
+        private Size _CheckBoxSize = new Size(13, 13);
+        private const int DefaultPadding = 2;
+        private Padding _Padding = new Padding(DefaultPadding);
+        internal const int ImageTextSpacing = 4;
+        internal const int CheckBoxTextSpacing = 6;
+        public override void RecalcSize()
+        {
+            ListBoxAdv cont = this.ContainerControl as ListBoxAdv;
+            if (cont == null || cont.Disposing || cont.IsDisposed) return;
+
+            bool checkBox = cont.CheckBoxesVisible;
+            int itemHeight = Dpi.Height(cont.ItemHeight);
+            Size size = Size.Empty;
+
+            Graphics g = BarFunctions.CreateGraphics(cont);
+            if (g == null) return;
+
+            try
+            {
+                if (!string.IsNullOrEmpty(_Symbol))
+                {
+                    _ActualSymbolSize = GetSymbolSize(g);
+                    size = _ActualSymbolSize;
+                }
+                else if (_Image != null)
+                {
+                    size = Dpi.ImageSize(_Image.Size);
+                }
+                if (!string.IsNullOrEmpty(this.Text))
+                {
+                    Size textSize = ButtonItemLayout.MeasureItemText(this, g, 0, cont.Font, eTextFormat.Default, cont.RightToLeft == RightToLeft.Yes);
+                    size.Width += textSize.Width;
+                    size.Height = Math.Max(size.Height, textSize.Height);
+                    if (_Image != null || !string.IsNullOrEmpty(_Symbol))
+                        size.Width += Dpi.Width(ImageTextSpacing);
+                }
+                else if (string.IsNullOrEmpty(_Symbol) && _Image == null)
+                    size = new System.Drawing.Size(Dpi.Width16, Dpi.Height16);
+
+                size.Width += _Padding.Horizontal;
+                size.Height += _Padding.Vertical;
+
+                base.RecalcSize();
+            }
+            finally
+            {
+                g.Dispose();
+            }
+
+            if (checkBox)
+            {
+                size.Width += Dpi.Width(_CheckBoxSize.Width + CheckBoxTextSpacing);
+                size.Height = Math.Max(Dpi.Height(_CheckBoxSize.Height), size.Height);
+            }
+
+            if (itemHeight > 0) size.Height = itemHeight;
+
+            _CheckBoxBounds = Rectangle.Empty;
+            m_Rect.Size = size;
+
+            base.RecalcSize();
+        }
+
+        private Rectangle _CheckBoxBounds = Rectangle.Empty;
+        internal Rectangle CheckBoxBounds
+        {
+            get
+            {
+                return _CheckBoxBounds;
+            }
+            set
+            {
+                _CheckBoxBounds = value;
+            }
+        }
+
+        public override void InternalMouseEnter()
+        {
+            base.InternalMouseEnter();
+            if (!this.DesignMode)
+            {
+                _MouseOver = true;
+                if (this.GetEnabled() && _HotTracking)
+                    this.Refresh();
+            }
+        }
+
+        public override void InternalMouseLeave()
+        {
+            base.InternalMouseLeave();
+            if (!this.DesignMode)
+            {
+                _MouseOver = false;
+                CheckBoxMouseState = eMouseState.None;
+                if (this.GetEnabled() && _HotTracking)
+                    this.Refresh();
+            }
+        }
+
+        public override void InternalMouseMove(MouseEventArgs objArg)
+        {
+            if (_CheckBoxBounds.Contains(objArg.Location))
+                CheckBoxMouseState = eMouseState.Hot;
+            else
+                CheckBoxMouseState = eMouseState.None;
+            base.InternalMouseMove(objArg);
+        }
+
+        public override void InternalMouseDown(MouseEventArgs objArg)
+        {
+            if (objArg.Button == MouseButtons.Left && !_CheckBoxBounds.IsEmpty && _CheckBoxBounds.Contains(objArg.Location))
+                CheckBoxMouseState = eMouseState.Down;
+            base.InternalMouseDown(objArg);
+        }
+
+        public override void InternalMouseUp(MouseEventArgs objArg)
+        {
+            if (objArg.Button == MouseButtons.Left && !_CheckBoxBounds.IsEmpty && _CheckBoxBounds.Contains(objArg.Location))
+            {
+                this.CheckState = this.CheckState == System.Windows.Forms.CheckState.Checked ? System.Windows.Forms.CheckState.Unchecked : System.Windows.Forms.CheckState.Checked;
+                CheckBoxMouseState = eMouseState.Hot;
+            }
+            else if (objArg.Button == MouseButtons.Left)
+            {
+                if (this.Bounds.Contains(objArg.Location))
+                {
+                    ListBoxAdv listBox = this.ContainerControl as ListBoxAdv;
+                    if (listBox != null)
+                    {
+                        if (listBox.SelectionMode != eSelectionMode.None)
+                        {
+                            if (listBox.SelectionMode == eSelectionMode.MultiSimple)
+                                this.SetIsSelected(!this.IsSelected, eEventSource.Mouse);
+                            else if (listBox.SelectionMode == eSelectionMode.MultiExtended)
+                            {
+                                if ((Control.ModifierKeys & Keys.Control) == Keys.Control)
+                                {
+                                    this.SetIsSelected(!this.IsSelected, eEventSource.Mouse);
+                                }
+                                else if ((Control.ModifierKeys & Keys.Shift) == Keys.Shift)
+                                {
+                                    BaseItem itemContainer = listBox.GetBaseItemContainer();
+                                    int index = itemContainer.SubItems.IndexOf(this);
+                                    int hiSel = -1, lowSel = -1;
+                                    for (int i = 0; i < listBox.SelectedItems.Count; i++)
+                                    {
+                                        int itemIndex = itemContainer.SubItems.IndexOf(listBox.SelectedItems[i]);
+                                        if (itemIndex > hiSel || hiSel < 0) hiSel = itemIndex;
+                                        if (itemIndex < lowSel || lowSel < 0) lowSel = itemIndex;
+                                    }
+                                    if (hiSel < 0 || lowSel < 0)
+                                        this.SetIsSelected(true, eEventSource.Mouse);
+                                    else
+                                    {
+                                        if (index < lowSel)
+                                        {
+                                            for (int i = lowSel; i >= index; i--)
+                                            {
+                                                ListBoxItem listItem = itemContainer.SubItems[i] as ListBoxItem;
+                                                if (listItem != null) listItem.SetIsSelected(true, eEventSource.Mouse);
+                                            }
+                                        }
+                                        else if (index > hiSel)
+                                        {
+                                            for (int i = hiSel; i <= index; i++)
+                                            {
+                                                ListBoxItem listItem = itemContainer.SubItems[i] as ListBoxItem;
+                                                if (listItem != null) listItem.SetIsSelected(true, eEventSource.Mouse);
+                                            }
+                                        }
+                                    }
+                                }
+                                else
+                                {
+                                    listBox.ClearSelectedItems(eEventSource.Mouse);
+                                    this.SetIsSelected(true, eEventSource.Mouse);
+                                }
+                            }
+                            else if(!this.IsSelected)
+                                this.SetIsSelected(true, eEventSource.Mouse);
+                        }
+                    }
+                    else
+                        this.SetIsSelected(true, eEventSource.Mouse);
+                }
+            }
+            base.InternalMouseUp(objArg);
+        }
+
+        private Size GetSymbolSize(Graphics g)
+        {
+            Size symbolSize = Size.Empty;
+            if (g == null || string.IsNullOrEmpty(_Symbol)) return symbolSize;
+            Font symFont = Symbols.GetFont(this.SymbolSize, this.SymbolSet);
+            symbolSize = TextDrawing.MeasureString(g, "\uF00A", symFont); // Need to do this to get consistent size for the symbol since they are not all the same width we pick widest
+            int descent = (int)Math.Ceiling((symFont.FontFamily.GetCellDescent(symFont.Style) *
+                symFont.Size / symFont.FontFamily.GetEmHeight(symFont.Style)));
+            symbolSize.Height -= descent;
+            return symbolSize;
+        }
+        private Size _ActualSymbolSize = Size.Empty;
+        internal Size ActualSymbolSize
+        {
+            get
+            {
+                return _ActualSymbolSize;
+            }
+        }
+
+        private bool _MouseOver = false;
+        /// <summary>
+        /// Gets whether mouse is over the item.
+        /// </summary>
+        [Browsable(false)]
+        public bool IsMouseOver
+        {
+            get { return _MouseOver; }
+            internal set { _MouseOver = value; }
+        }
+
+        internal Size CheckBoxSize
+        {
+            get
+            {
+                return _CheckBoxSize;
+            }
+        }
+
+        private eMouseState _CheckBoxMouseState = eMouseState.None;
+        /// <summary>
+        /// Gets the mouse state of the check box part of item if visible.
+        /// </summary>
+        [Browsable(false)]
+        public eMouseState CheckBoxMouseState
+        {
+            get { return _CheckBoxMouseState; }
+            internal set
+            {
+                if (_CheckBoxMouseState != value)
+                {
+                    _CheckBoxMouseState = value;
+                    this.Refresh();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Indicates check-box state if visible.
+        /// </summary>
+        [DefaultValue(CheckState.Unchecked), Category("Appearance"), Description("Indicates check-box state if visible.")]
+        public CheckState CheckState
+        {
+            get { return _CheckState; }
+            set
+            {
+                if (value != _CheckState)
+                {
+                    CheckState oldValue = _CheckState;
+                    _CheckState = value;
+                    OnCheckStateChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when CheckState property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnCheckStateChanged(CheckState oldValue, CheckState newValue)
+        {
+            ListBoxAdv listBox = this.ContainerControl as ListBoxAdv;
+            if (listBox != null)
+            {
+                ListBoxAdvItemCheckEventArgs e = new ListBoxAdvItemCheckEventArgs(this, newValue);
+                listBox.ListItemCheckStateChanged(e);
+                if (e.Cancel)
+                    _CheckState = oldValue;
+            }
+            //OnPropertyChanged(new PropertyChangedEventArgs("CheckState"));
+            this.Refresh();
+        }
+
+        // Fields...
+        private Image _Image;
+        private bool _IsSelected = false;
+        /// <summary>
+        /// Gets or sets whether item is selected.
+        /// </summary>
+        [Browsable(false), DefaultValue(false)]
+        public bool IsSelected
+        {
+            get { return _IsSelected; }
+            set
+            {
+                if (value != _IsSelected)
+                {
+                    SetIsSelected(value, eEventSource.Code);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when IsSelected property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnIsSelectedChanged(bool oldValue, bool newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("IsSelected"));
+            this.Refresh();
+        }
+        /// <summary>
+        /// Sets selected state of the item including the source of the action that caused the change.
+        /// </summary>
+        /// <param name="isSelected"></param>
+        /// <param name="source"></param>
+        public void SetIsSelected(bool isSelected, eEventSource source)
+        {
+            bool oldValue = _IsSelected;
+            ListBoxAdv listBox = this.ContainerControl as ListBoxAdv;
+            _IsSelected = isSelected;
+            if (listBox != null)
+            {
+                listBox.OnListBoxItemSelectedChanged(this, source);
+            }
+            OnIsSelectedChanged(oldValue, isSelected);
+        }
+        /// <summary>
+        /// Indicates whether item changes its background colors when mouse is over the item.
+        /// </summary>
+        [DefaultValue(false), Category("Behavior"), Description("Indicates whether item changes its background colors when mouse is over the item")]
+        public bool HotTracking
+        {
+            get { return _HotTracking; }
+            set
+            {
+                if (value != _HotTracking)
+                {
+                    bool oldValue = _HotTracking;
+                    _HotTracking = value;
+                    OnHotTrackingChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when HotTracking property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnHotTrackingChanged(bool oldValue, bool newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("HotTracking"));
+        }
+
+        /// <summary>
+        /// Specifies image displayed on the item.
+        /// </summary>
+        [DefaultValue(null), Category("Appearance"), Description("Specifies image displayed on the item.")]
+        public Image Image
+        {
+            get { return _Image; }
+            set
+            {
+                if (value != _Image)
+                {
+                    Image oldValue = _Image;
+                    _Image = value;
+                    OnImageChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when Image property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnImageChanged(Image oldValue, Image newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("Image"));
+            NeedRecalcSize = true;
+            OnAppearanceChanged();
+            this.Refresh();
+        }
+
+        private Color _SymbolColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets the color of the Symbol.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates color of the Symbol.")]
+        public Color SymbolColor
+        {
+            get { return _SymbolColor; }
+            set { _SymbolColor = value; this.Refresh(); }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeSymbolColor()
+        {
+            return !_SymbolColor.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetSymbolColor()
+        {
+            this.SymbolColor = Color.Empty;
+        }
+
+        /// <summary>
+        /// Gets the realized symbol string.
+        /// </summary>
+        [Browsable(false)]
+        public string SymbolRealized
+        {
+            get { return _SymbolRealized; }
+        }
+        private string _Symbol = "", _SymbolRealized = "";
+        /// <summary>
+        /// Indicates the symbol displayed on face of the button instead of the image. Setting the symbol overrides the image setting.
+        /// </summary>
+        [DefaultValue(""), Category("Appearance"), Description("Indicates the symbol displayed on face of the button instead of the image. Setting the symbol overrides the image setting.")]
+        [Editor("DevComponents.DotNetBar.Design.SymbolTypeEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor))]
+        public string Symbol
+        {
+            get { return _Symbol; }
+            set
+            {
+                if (value != _Symbol)
+                {
+                    string oldValue = _Symbol;
+                    _Symbol = value;
+                    OnSymbolChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when Symbol property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnSymbolChanged(string oldValue, string newValue)
+        {
+            if (string.IsNullOrEmpty(newValue))
+                _SymbolRealized = "";
+            else
+                _SymbolRealized = Symbols.GetSymbol(newValue);
+            //OnPropertyChanged(new PropertyChangedEventArgs("Symbol"));
+            NeedRecalcSize = true;
+            OnAppearanceChanged();
+            this.Refresh();
+        }
+
+        private eSymbolSet _SymbolSet = eSymbolSet.Awesome;
+        /// <summary>
+        /// Gets or sets the symbol set used to represent the Symbol.
+        /// </summary>
+        [Browsable(false), DefaultValue(eSymbolSet.Awesome)]
+        public eSymbolSet SymbolSet
+        {
+            get { return _SymbolSet; }
+            set
+            {
+                if (_SymbolSet != value)
+                {
+                    eSymbolSet oldValue = _SymbolSet;
+                    _SymbolSet = value;
+                    OnSymbolSetChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when SymbolSet property value changes.
+        /// </summary>
+        /// <param name="oldValue">Indciates old value</param>
+        /// <param name="newValue">Indicates new value</param>
+        protected virtual void OnSymbolSetChanged(eSymbolSet oldValue, eSymbolSet newValue)
+        {
+            NeedRecalcSize = true;
+            OnAppearanceChanged();
+            this.Refresh();
+        }
+
+        private float _SymbolSize = 13f;
+        /// <summary>
+        /// Indicates the size of the symbol in points.
+        /// </summary>
+        [DefaultValue(13f), Category("Appearance"), Description("Indicates the size of the symbol in points.")]
+        public float SymbolSize
+        {
+            get { return _SymbolSize; }
+            set
+            {
+                if (value != _SymbolSize)
+                {
+                    float oldValue = _SymbolSize;
+                    _SymbolSize = value;
+                    OnSymbolSizeChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when SymbolSize property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnSymbolSizeChanged(float oldValue, float newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("SymbolSize"));
+            NeedRecalcSize = true;
+            OnAppearanceChanged();
+            this.Refresh();
+        }
+
+        private Color[] _BackColors = null;
+        /// <summary>
+        /// Indicates the array of colors that when set are used to draw the background of the item.
+        /// </summary>
+        [DefaultValue(null), Category("Appearance"), Description("Indicates the array of colors that when set are used to draw the background of the item."), TypeConverter(typeof(ArrayConverter))]
+        public Color[] BackColors
+        {
+            get
+            {
+                return _BackColors;
+            }
+            set
+            {
+                if (_BackColors != value)
+                {
+                    _BackColors = value;
+                    //OnPropertyChanged(new PropertyChangedEventArgs("Colors"));
+                    this.Refresh();
+                }
+            }
+        }
+        private Color _TextColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets the color of the text.
+        /// </summary>
+        [Category("Columns"), Description("Indicates color of text.")]
+        public Color TextColor
+        {
+            get { return _TextColor; }
+            set { _TextColor = value; this.Refresh(); }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeTextColor()
+        {
+            return !_TextColor.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetTextColor()
+        {
+            this.TextColor = Color.Empty;
+        }
+        /// <summary>
+        /// Gets or sets the text associated with this item.
+        /// </summary>
+        [System.ComponentModel.Browsable(true), DevCoBrowsable(true), Editor("DevComponents.DotNetBar.Design.TextMarkupUIEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), System.ComponentModel.Category("Appearance"), System.ComponentModel.Description("The text contained in the item."), System.ComponentModel.Localizable(true), System.ComponentModel.DefaultValue("")]
+        public override string Text
+        {
+            get
+            {
+                return base.Text;
+            }
+            set
+            {
+                base.Text = value;
+            }
+        }
+
+        private eButtonTextAlignment _TextAlignment = eButtonTextAlignment.Left;
+        /// <summary>
+        /// Gets or sets the text alignment. Default value is left.
+        /// </summary>
+        [Browsable(true), DefaultValue(eButtonTextAlignment.Left), Category("Appearance"), Description("Indicates text alignment.")]
+        public eButtonTextAlignment TextAlignment
+        {
+            get { return _TextAlignment; }
+            set
+            {
+                _TextAlignment = value;
+                this.Refresh();
+            }
+        }
+        #endregion
+
+        #region Markup Implementation
+        /// <summary>
+        /// Gets whether item supports text markup. Default is false.
+        /// </summary>
+        protected override bool IsMarkupSupported
+        {
+            get { return _EnableMarkup; }
+        }
+
+        private bool _EnableMarkup = true;
+        /// <summary>
+        /// Gets or sets whether text-markup support is enabled for items Text property. Default value is true.
+        /// Set this property to false to display HTML or other markup in the item instead of it being parsed as text-markup.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance"), Description("Indicates whether text-markup support is enabled for items Text property.")]
+        public bool EnableMarkup
+        {
+            get { return _EnableMarkup; }
+            set
+            {
+                if (_EnableMarkup != value)
+                {
+                    _EnableMarkup = value;
+                    NeedRecalcSize = true;
+                    OnTextChanged();
+                }
+            }
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/ListBoxAdv/ListBoxItemPainter.cs b/PROMS/DotNetBar Source Code/Controls/ListBoxAdv/ListBoxItemPainter.cs
new file mode 100644
index 00000000..6f90767d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/ListBoxAdv/ListBoxItemPainter.cs	
@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    internal class ListBoxItemPainter : IOffice2007Painter
+    {
+        /// <summary>
+        /// Paints ListBoxItem.
+        /// </summary>
+        /// <param name="e">Provides arguments for the operation.</param>
+        public virtual void Paint(ListBoxItemRendererEventArgs e) { }
+
+        #region IOffice2007Painter Members
+        private Office2007ColorTable _ColorTable = null; //new Office2007ColorTable();
+        public Office2007ColorTable ColorTable
+        {
+            get
+            {
+                return _ColorTable;
+            }
+            set
+            {
+                _ColorTable = value;
+            }
+        }
+
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/ListBoxAdv/ListBoxItemRendererEventArgs.cs b/PROMS/DotNetBar Source Code/Controls/ListBoxAdv/ListBoxItemRendererEventArgs.cs
new file mode 100644
index 00000000..5725933a
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/ListBoxAdv/ListBoxItemRendererEventArgs.cs	
@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Text;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Provides data for the Slider item rendering events.
+    /// </summary>
+    public class ListBoxItemRendererEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets or sets the reference to the item being rendered.
+        /// </summary>
+        public ListBoxItem Item = null;
+
+        /// <summary>
+        /// Gets or sets the reference to graphics object.
+        /// </summary>
+        public Graphics Graphics = null;
+
+        internal ItemPaintArgs ItemPaintArgs = null;
+
+        /// <summary>
+        /// Creates new instance of the object and initializes it with default values.
+        /// </summary>
+        /// <param name="item">Reference to the ListBoxItem being rendered.</param>
+        /// <param name="g">Reference to the graphics object.</param>
+        public ListBoxItemRendererEventArgs(ListBoxItem item, Graphics g)
+        {
+            this.Item = item;
+            this.Graphics = g;
+        }
+    }
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/Controls/ListBoxAdv/OfficeListBoxItemColorTable.cs b/PROMS/DotNetBar Source Code/Controls/ListBoxAdv/OfficeListBoxItemColorTable.cs
new file mode 100644
index 00000000..0c2c509c
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/ListBoxAdv/OfficeListBoxItemColorTable.cs	
@@ -0,0 +1,76 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Text;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    /// <summary>
+    /// Defines color table for ListBoxItem.
+    /// </summary>
+    public class OfficeListBoxItemColorTable
+    {
+        /// <summary>
+        /// Specifies default state color table.
+        /// </summary>
+        public OfficeListBoxItemStateColorTable Default = new OfficeListBoxItemStateColorTable();
+        /// <summary>
+        /// Specifies mouse over state color table.
+        /// </summary>
+        public OfficeListBoxItemStateColorTable MouseOver = new OfficeListBoxItemStateColorTable();
+        /// <summary>
+        /// Specifies selected state color table.
+        /// </summary>
+        public OfficeListBoxItemStateColorTable Selected = new OfficeListBoxItemStateColorTable();
+    }
+    /// <summary>
+    /// Defines single state color table for ListBoxItem.
+    /// </summary>
+    public class OfficeListBoxItemStateColorTable
+    {
+        /// <summary>
+        /// Initializes a new instance of the OfficeListBoxItemStateColorTable class.
+        /// </summary>
+        public OfficeListBoxItemStateColorTable()
+        {
+        }
+        /// <summary>
+        /// Initializes a new instance of the OfficeListBoxItemStateColorTable class.
+        /// </summary>
+        /// <param name="textColor"></param>
+        /// <param name="backColors"></param>
+        /// <param name="backColorsGradientAngle"></param>
+        /// <param name="backColorsPositions"></param>
+        public OfficeListBoxItemStateColorTable(Color textColor, Color[] backColors, int backColorsGradientAngle, float[] backColorsPositions)
+        {
+            TextColor = textColor;
+            BackColors = backColors;
+            BackColorsGradientAngle = backColorsGradientAngle;
+            BackColorsPositions = backColorsPositions;
+        }
+        /// <summary>
+        /// Initializes a new instance of the OfficeListBoxItemStateColorTable class.
+        /// </summary>
+        /// <param name="textColor"></param>
+        public OfficeListBoxItemStateColorTable(Color textColor)
+        {
+            TextColor = textColor;
+        }
+        /// <summary>
+        /// Indicates item text color.
+        /// </summary>
+        public Color TextColor = Color.Black;
+        /// <summary>
+        /// Gets or sets the background colors for the item.
+        /// </summary>
+        public Color[] BackColors = new Color[0];
+        /// <summary>
+        /// Gets or sets the back colors gradient angle if there is more than one color in BackColors array.
+        /// </summary>
+        public int BackColorsGradientAngle = 90;
+        /// <summary>
+        /// Gets or sets the gradient colors positions if there is more than one color in BackColors array.
+        /// </summary>
+        public float[] BackColorsPositions = new float[0];
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/ListBoxAdv/OfficeListBoxItemPainter.cs b/PROMS/DotNetBar Source Code/Controls/ListBoxAdv/OfficeListBoxItemPainter.cs
new file mode 100644
index 00000000..51d37b57
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/ListBoxAdv/OfficeListBoxItemPainter.cs	
@@ -0,0 +1,128 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Text;
+using DevComponents.Editors.DateTimeAdv;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    internal class OfficeListBoxItemPainter : ListBoxItemPainter
+    {
+        #region Implementation
+        /// <summary>
+        /// Paints StepItem.
+        /// </summary>
+        /// <param name="e">Provides arguments for the operation.</param>
+        public override void Paint(ListBoxItemRendererEventArgs e)
+        {
+            Graphics g = e.ItemPaintArgs.Graphics;
+            ListBoxItem item = e.Item;
+            ListBoxAdv listBox = e.ItemPaintArgs.ContainerControl as ListBoxAdv;
+            bool checkBoxes = false;
+            bool useMnemonic = true;
+            if (listBox != null)
+            {
+                checkBoxes = listBox.CheckBoxesVisible;
+                useMnemonic = listBox.UseMnemonic;
+            }
+            OfficeListBoxItemColorTable table = ColorTable.ListBoxItem;
+            OfficeListBoxItemStateColorTable ct = item.IsSelected ? table.Selected : table.Default;
+            if (item.HotTracking && item.IsMouseOver)
+                ct = table.MouseOver;
+
+            Rectangle r = item.Bounds;
+
+            if (checkBoxes)
+            {
+                Office2007CheckBoxStateColorTable cbt = GetCheckBoxStateColorTable(item.CheckBoxMouseState);
+                Size checkBoxSize = Dpi.Size(item.CheckBoxSize);
+                Rectangle cbr = new Rectangle(r.X + 2, r.Y + (r.Height - checkBoxSize.Height) / 2, checkBoxSize.Width, checkBoxSize.Height);
+                _CheckBoxPainter.PaintCheckBox(g, cbr, cbt, item.CheckState);
+                int checkBoxTextSpacing = Dpi.Width(ListBoxItem.CheckBoxTextSpacing);
+                r.X += checkBoxSize.Width + checkBoxTextSpacing - 1;
+                r.Width -= checkBoxSize.Width + checkBoxTextSpacing - 1;
+                item.CheckBoxBounds = cbr;
+            }
+
+            if (ct.BackColors != null && ct.BackColors.Length > 0 || item.BackColors != null && item.BackColors.Length > 0)
+            {
+                using (Brush brush = DisplayHelp.CreateBrush(r, (item.BackColors != null && item.BackColors.Length > 0) ? item.BackColors : ct.BackColors, ct.BackColorsGradientAngle, ct.BackColorsPositions))
+                {
+                    g.FillRectangle(brush, r);
+                }
+            }
+
+            Color textColor = ct.TextColor;
+
+            if (!string.IsNullOrEmpty(item.SymbolRealized))
+            {
+                Color symbolColor = item.SymbolColor;
+                if (symbolColor.IsEmpty) symbolColor = textColor;
+                TextDrawing.DrawStringLegacy(g, item.SymbolRealized, Symbols.GetFont(item.SymbolSize, item.SymbolSet), 
+                    symbolColor, new Rectangle(r.X, r.Y + r.Height / 2, 0, 0), eTextFormat.Default | eTextFormat.VerticalCenter);
+                int imageSize = item.ActualSymbolSize.Width + Dpi.Width(ListBoxItem.ImageTextSpacing);
+                r.Width -= imageSize;
+                r.X += imageSize;
+            }
+            else if (item.Image != null)
+            {
+                Size imgSize = Dpi.ImageSize(item.Image.Size);
+                g.DrawImage(item.Image, new Rectangle(r.X, r.Y + (r.Height - imgSize.Height) / 2, imgSize.Width, imgSize.Height));
+                int imageSize = imgSize.Width + Dpi.Width(ListBoxItem.ImageTextSpacing);
+                r.Width -= imageSize;
+                r.X += imageSize;
+            }
+                        
+            if (!string.IsNullOrEmpty(item.Text))
+            {
+                if (checkBoxes) { r.X += 1; r.Width -= 1; }
+                if (!item.TextColor.IsEmpty) textColor = item.TextColor;
+                Font font = e.ItemPaintArgs.Font;
+                if (item.TextMarkupBody == null)
+                {
+                    eTextFormat textFormat = eTextFormat.Default | eTextFormat.VerticalCenter;
+                    if (item.TextAlignment == eButtonTextAlignment.Center)
+                    {
+                        textFormat |= eTextFormat.HorizontalCenter;
+                    }
+                    else if (item.TextAlignment == eButtonTextAlignment.Right)
+                    {
+                        textFormat |= eTextFormat.Right;
+                    }
+                    if (!useMnemonic)
+                        textFormat |= eTextFormat.NoPrefix;
+                    TextDrawing.DrawString(g, item.Text, font, textColor, r, textFormat);
+                }
+                else
+                {
+                    TextMarkup.MarkupDrawContext d = new TextMarkup.MarkupDrawContext(g, font, textColor, e.ItemPaintArgs.RightToLeft);
+                    d.HotKeyPrefixVisible = false;
+                    d.ContextObject = item;
+                    Rectangle mr = new Rectangle(r.X, r.Y + (r.Height - item.TextMarkupBody.Bounds.Height) / 2, item.TextMarkupBody.Bounds.Width, item.TextMarkupBody.Bounds.Height);
+                    item.TextMarkupBody.Bounds = mr;
+                    item.TextMarkupBody.Render(d);
+                }
+
+            }
+        }
+
+        private Office2007CheckBoxStateColorTable GetCheckBoxStateColorTable(eMouseState state)
+        {
+            if (state == eMouseState.Down)
+                return ColorTable.CheckBoxItem.Pressed;
+            if (state == eMouseState.Hot)
+                return ColorTable.CheckBoxItem.MouseOver;
+            return ColorTable.CheckBoxItem.Default;
+        }
+
+        private Office2007CheckBoxItemPainter _CheckBoxPainter;
+        public Office2007CheckBoxItemPainter CheckBoxPainter
+        {
+            get { return _CheckBoxPainter; }
+            set { _CheckBoxPainter = value; }
+        }
+        #endregion
+    }
+}
+
diff --git a/PROMS/DotNetBar Source Code/Controls/ListViewEx.cs b/PROMS/DotNetBar Source Code/Controls/ListViewEx.cs
new file mode 100644
index 00000000..606e1006
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/ListViewEx.cs	
@@ -0,0 +1,1229 @@
+#if FRAMEWORK20
+using System;
+using System.Text;
+using System.Windows.Forms;
+using System.Drawing;
+using System.ComponentModel;
+using DevComponents.DotNetBar.Rendering;
+using System.Globalization;
+using System.Drawing.Drawing2D;
+using System.Runtime.InteropServices;
+using System.Collections;
+using System.Reflection;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    /// <summary>
+    /// Represents the extended ListView control with the Office 2007 Style.
+    /// </summary>
+    [ToolboxBitmap(typeof(ListViewEx), "Controls.ListViewEx.ico"), ToolboxItem(true)]
+    public class ListViewEx : ListView, INonClientControl
+    {
+        #region Private Variables
+        private NonClientPaintHandler m_NCPainter = null;
+        private ElementStyle m_BorderStyle = null;
+        #endregion
+
+        #region Constructor, Dispose
+        public ListViewEx()
+            : base()
+        {
+            m_BorderStyle = new ElementStyle();
+            m_BorderStyle.Class = ElementStyleClassKeys.ListViewBorderKey;
+            m_BorderStyle.StyleChanged += new EventHandler(BorderStyle_StyleChanged);
+            m_NCPainter = new NonClientPaintHandler(this, eScrollBarSkin.Optimized);
+            this.OwnerDraw = true;
+            this.DoubleBuffered = true;
+            this.BorderStyle = BorderStyle.None;
+            StyleManager.Register(this);
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            StyleManager.Unregister(this);
+            if (m_NCPainter != null)
+            {
+                m_NCPainter.Dispose();
+                //m_NCPainter = null;
+            }
+            if (m_BorderStyle != null) m_BorderStyle.StyleChanged -= new EventHandler(BorderStyle_StyleChanged);
+            base.Dispose(disposing);
+        }
+        #endregion
+
+        #region Inernal Implementation
+        private Font _ColumnHeaderFont = null;
+        /// <summary>
+        /// Gets or sets the column header font. Default value is null which means controls Font property is used.
+        /// </summary>
+        [DefaultValue(null), Category("Appearance"), Description("Indicates column header font.")]
+        public Font ColumnHeaderFont
+        {
+            get { return _ColumnHeaderFont; }
+            set
+            {
+                if (value != _ColumnHeaderFont)
+                {
+                    Font oldValue = _ColumnHeaderFont;
+                    _ColumnHeaderFont = value;
+                    OnColumnHeaderFontChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when ColumnHeaderFont property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnColumnHeaderFontChanged(Font oldValue, Font newValue)
+        {
+            if (this.IsHandleCreated)
+                this.Invalidate(true);
+            //OnPropertyChanged(new PropertyChangedEventArgs("ColumnHeaderFont"));
+        }
+
+        /// <summary>
+        /// Called by StyleManager to notify control that style on manager has changed and that control should refresh its appearance if
+        /// its style is controlled by StyleManager.
+        /// </summary>
+        /// <param name="newStyle">New active style.</param>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void StyleManagerStyleChanged(eDotNetBarStyle newStyle)
+        {
+            this.Invalidate(true);
+            ResetCachedColorTableReference();
+        }
+
+        private void PaintHeaderBackground(Graphics g, Rectangle r)
+        {
+            Office2007ListViewColorTable ct = GetColorTable();
+            DisplayHelp.FillRectangle(g, r, ct.ColumnBackground);
+            using (Pen pen = new Pen(ct.Border))
+            {
+                g.DrawLine(pen, r.X, r.Bottom - 1, r.Right, r.Bottom - 1);
+            }
+        }
+        private HeaderHandler m_HeaderHandler = null;
+        protected override void OnHandleCreated(EventArgs e)
+        {
+            m_HeaderHandler = new HeaderHandler(this);
+            base.OnHandleCreated(e);
+        }
+        protected override void OnHandleDestroyed(EventArgs e)
+        {
+            if (m_HeaderHandler != null)
+            {
+                m_HeaderHandler.ReleaseHandle();
+                m_HeaderHandler = null;
+            }
+            base.OnHandleDestroyed(e);
+        }
+        /// <summary>
+        /// Resets internal Column Header handler. This method should be called after you change the View property
+        /// at run-time. If your control is always in single view there is no need to call this method. This method
+        /// will work only when controls handle has already been created.
+        /// </summary>
+        public void ResetHeaderHandler()
+        {
+            if (!this.IsHandleCreated) return;
+
+            if (m_HeaderHandler != null)
+            {
+                m_HeaderHandler.ReleaseHandle();
+                m_HeaderHandler = null;
+            }
+            m_HeaderHandler = new HeaderHandler(this);
+        }
+
+        protected override void OnVisibleChanged(EventArgs e)
+        {
+            if (System.Environment.OSVersion.Version.Major < 6 && this.Visible)
+                WinApi.PostMessage(this.Handle, 0x120, IntPtr.Zero, IntPtr.Zero);
+            base.OnVisibleChanged(e);
+        }
+
+        /// <summary>
+        /// Resets the internal color table reference. This method is usually called automatically by 
+        /// </summary>
+        public void ResetCachedColorTableReference()
+        {
+            m_ListViewColorTable = null;
+            m_CheckBoxColorTable = null;
+        }
+
+        private Office2007ListViewColorTable m_ListViewColorTable = null;
+        private Office2007ListViewColorTable GetColorTable()
+        {
+            if (m_ListViewColorTable == null)
+            {
+                Office2007Renderer r = this.GetRenderer() as Office2007Renderer;
+                if (r != null)
+                {
+                    m_ListViewColorTable = r.ColorTable.ListViewEx;
+                }
+            }
+
+            return m_ListViewColorTable;
+        }
+
+        private Office2007CheckBoxColorTable m_CheckBoxColorTable = null;
+        private Office2007CheckBoxColorTable GetCheckBoxColorTable()
+        {
+            if (m_CheckBoxColorTable == null)
+            {
+                Office2007Renderer r = this.GetRenderer() as Office2007Renderer;
+                if (r != null)
+                {
+                    m_CheckBoxColorTable = r.ColorTable.CheckBoxItem;
+                }
+            }
+
+            return m_CheckBoxColorTable;
+        }
+
+
+        private void DrawColumnHeaderInternal(DrawListViewColumnHeaderEventArgs e)
+        {
+            Graphics g = e.Graphics;
+            Rectangle r = e.Bounds;
+            Office2007ListViewColorTable ct = GetColorTable();
+
+            Color c1 = ct.ColumnBackground.Start;
+            Color c2 = ct.ColumnBackground.End;
+            if ((e.State & ListViewItemStates.Selected) == ListViewItemStates.Selected && !c2.IsEmpty)
+            {
+                Color csw = c1;
+                c1 = c2;
+                c2 = csw;
+            }
+
+            DisplayHelp.FillRectangle(g, r, c1, c2, ct.ColumnBackground.GradientAngle);
+
+            using (Pen pen = new Pen(ct.Border))
+            {
+                g.DrawLine(pen, r.X, r.Bottom - 1, r.Right, r.Bottom - 1);
+            }
+            using (Pen pen = new Pen(ct.ColumnSeparator))
+                g.DrawLine(pen, r.Right - 1, r.Y + 3, r.Right - 1, r.Bottom - 4);
+
+            TextFormatFlags flags = TextFormatFlags.Left | TextFormatFlags.SingleLine | TextFormatFlags.VerticalCenter | TextFormatFlags.WordEllipsis | TextFormatFlags.NoPrefix;
+            switch (e.Header.TextAlign)
+            {
+                case HorizontalAlignment.Center:
+                    flags |= TextFormatFlags.HorizontalCenter;
+                    break;
+                case HorizontalAlignment.Right:
+                    flags |= TextFormatFlags.Right;
+                    break;
+            }
+
+            if (e.Header.ImageList != null && (e.Header.ImageIndex >= 0 || e.Header.ImageKey != null && e.Header.ImageKey.Length > 0))
+            {
+                Image img = null;
+                if (e.Header.ImageIndex >= 0)
+                    img = e.Header.ImageList.Images[e.Header.ImageIndex];
+                else
+                    img = e.Header.ImageList.Images[e.Header.ImageKey];
+                if (img != null)
+                {
+                    Rectangle imageRect = new Rectangle(r.X + 2, r.Y + (r.Height - img.Height) / 2, img.Width, img.Height);
+                    if (this.RightToLeft == RightToLeft.Yes)
+                    {
+                        imageRect.X = r.Right - imageRect.Width - 2;
+                        r.Width -= imageRect.Width + 2;
+                    }
+                    else
+                    {
+                        r.Width -= imageRect.Width;
+                        r.X += imageRect.Width;
+                    }
+                    g.DrawImage(img, imageRect);
+                }
+            }
+
+            Color foreColor = e.ForeColor;
+            if (!ct.ColumnForeColor.IsEmpty)
+                foreColor = ct.ColumnForeColor;
+            DrawHeaderText(g, e.Font, foreColor, flags, e.Header.Text, r);
+            //e.DrawText(flags);
+        }
+
+
+        protected override void OnDrawColumnHeader(DrawListViewColumnHeaderEventArgs e)
+        {
+            //DrawColumnHeaderInternal(e);   
+            base.OnDrawColumnHeader(e);
+        }
+
+        private void DrawHeaderText(Graphics g, Font font, Color c, TextFormatFlags flags, string text, Rectangle r)
+        {
+            Size sz = TextRenderer.MeasureText(" ", font);
+            int w = sz.Width;
+            r.Inflate(-(w / 2), 0);
+            TextRenderer.DrawText(g, text, font, r, c, flags);
+        }
+
+        private void DrawItemBackground(Graphics g, Rectangle r, ListViewItem item, ListViewItemStates state)
+        {
+            if (!this.Enabled) return;
+            // Bug fix in ListView for this specific state
+            if (state == 0 && item.Selected && this.View == View.Details && this.FullRowSelect && this.Focused)
+                r.X++;
+
+            if (!item.BackColor.IsEmpty)
+            {
+                using (SolidBrush brush = new SolidBrush(item.BackColor))
+                {
+                    g.FillRectangle(brush, r);
+                }
+            }
+            bool selected = IsInState(state, ListViewItemStates.Selected) || state == 0 && item.Selected;
+            if (selected)
+            {
+                Office2007ListViewColorTable ct = GetColorTable();
+                // Draw the background for selected item.
+                r.Height--;
+                r.Width--;
+                using (Pen pen = new Pen(ct.SelectionBorder))
+                    g.DrawRectangle(pen, r);
+                r.Height++;
+                r.Width++;
+                Rectangle ir = new Rectangle(r.X, r.Y + 1, r.Width, r.Height - 2);
+                DisplayHelp.FillRectangle(g, ir, ct.SelectionBackground);
+            }
+            else if (IsInState(state, ListViewItemStates.Hot) && this.HotTracking)
+            {
+                Office2007Renderer rnd = this.GetRenderer() as Office2007Renderer;
+                Office2007ButtonItemPainter.PaintBackground(g, rnd.ColorTable.ButtonItemColors[0].MouseOver, r, RoundRectangleShapeDescriptor.RectangleShape);
+            }
+
+            if (IsInState(state, ListViewItemStates.Focused) && (!IsInState(state, ListViewItemStates.Hot) && this.View != View.LargeIcon || selected))
+            {
+                Rectangle rFocus = item.Bounds;
+                if (this.View == View.Details && !this.FullRowSelect || this.View == View.List)
+                    rFocus = item.GetBounds(ItemBoundsPortion.Label);
+                else if (this.View == View.Details && this.FullRowSelect)
+                    rFocus = r;
+                else if (this.View == View.SmallIcon)
+                    rFocus = r;
+
+                if (selected)
+                {
+                    rFocus.Y++;
+                    rFocus.Height -= 2;
+                }
+
+                DrawFocusRectangle(g, rFocus, item);
+            }
+            else if (selected && this.View == View.Details && this.FullRowSelect && this.Focused) // Bug fix in ListView for this specific state
+            {
+                Rectangle rFocus = r;
+                rFocus.Y++;
+                rFocus.Height -= 2;
+                Region oldClip = g.Clip;
+                Rectangle rClip = rFocus;
+                rClip.Width--;
+                g.SetClip(rClip);
+                DrawFocusRectangle(g, rFocus, item);
+                g.Clip = oldClip;
+            }
+        }
+
+        private bool IsInState(ListViewItemStates currentState, ListViewItemStates testState)
+        {
+            return ((currentState & testState) == testState);
+        }
+
+        protected override void OnDrawItem(DrawListViewItemEventArgs e)
+        {
+            if (e.State == 0 && this.View != View.List && this.View != View.Tile && this.View != View.SmallIcon && this.View != View.LargeIcon || this.View == View.Details)
+            {
+                base.OnDrawItem(e);
+                return;
+            }
+
+            FixStateForHideSelection(e);
+
+            Graphics g = e.Graphics;
+            Rectangle r = e.Bounds;
+
+            if (this.View == View.List)
+                r = e.Item.GetBounds(ItemBoundsPortion.Label);
+            else if (this.View == View.SmallIcon)
+            {
+                r = e.Item.GetBounds(ItemBoundsPortion.Label);
+                //Size sz = TextDrawing.MeasureString(g, e.Item.Text, e.Item.Font);
+                //sz.Width += 2;
+                //if (sz.Width > r.Width)
+                //    r.Width = sz.Width;
+            }
+            DrawItemBackground(g, r, e.Item, e.State);
+            Color foreColor = e.Item.ForeColor;
+            if (IsInState(e.State, ListViewItemStates.Selected) && this.Enabled)
+            {
+                Office2007ListViewColorTable ct = GetColorTable();
+                if (!ct.SelectionForeColor.IsEmpty)
+                    foreColor = ct.SelectionForeColor;
+            }
+            DrawListViewItem(g, e.Item, null, e.Item.Font, foreColor, e.State);
+
+            base.OnDrawItem(e);
+        }
+
+        private bool HasImage(ListViewItem item)
+        {
+            if (item.ImageList != null && (item.ImageIndex >= 0 || item.ImageKey.Length > 0))
+                return true;
+            return false;
+        }
+
+        private Size m_CheckSignSize = new Size(13, 13);
+        private void DrawListViewItem(Graphics g, ListViewItem item, ColumnHeader header, Font font, Color color, ListViewItemStates state)
+        {
+            bool hasImage = HasImage(item);
+            // Draw Image if any
+            if (hasImage && (header == null || header.Width > 4))
+            {
+                Rectangle rImage = item.GetBounds(ItemBoundsPortion.Icon);
+                int index = item.ImageIndex;
+                if (index < 0)
+                    index = item.ImageList.Images.IndexOfKey(item.ImageKey);
+                if (this.View != View.Details && this.View != View.List && this.StateImageList != null)
+                    rImage.X += this.StateImageList.ImageSize.Width + 3;
+                else if (this.View == View.SmallIcon && this.CheckBoxes && this.Groups.Count == 0)
+                    rImage.X += this.SmallImageList.ImageSize.Width;
+                else if (this.View == View.LargeIcon && (item.ImageList.ImageSize.Width < rImage.Width || item.ImageList.ImageSize.Height < rImage.Height))
+                {
+                    if (item.ImageList.ImageSize.Width < rImage.Width)
+                        rImage.X += (rImage.Width - item.ImageList.ImageSize.Width) / 2;
+                    if (item.ImageList.ImageSize.Height < rImage.Height)
+                        rImage.Y += (rImage.Height - item.ImageList.ImageSize.Height) / 2;
+                }
+
+                Region oldClip = null;
+                if (header != null && header.Width < rImage.Width)
+                {
+                    Rectangle rClip = rImage;
+                    rClip.Width = header.Width;
+                    oldClip = g.Clip;
+                    g.SetClip(rClip);
+                }
+                if (rImage.Width > 2)
+                {
+                    g.DrawImage(item.ImageList.Images[index], rImage.Location); // item.ImageList.Draw(g, rImage.Location, index);
+                }
+
+                if (oldClip != null) g.Clip = oldClip;
+            }
+            //Console.WriteLine("{0} - {1} " ,DateTime.Now, item.SubItems[0].Text);
+            // Draw text
+            Rectangle rText = item.GetBounds(ItemBoundsPortion.Label);
+            if (rText.Width > 2)
+            {
+                // Draw the item text for views other than the Details view.
+                eTextFormat flags = eTextFormat.Left | eTextFormat.SingleLine | eTextFormat.NoPrefix;
+                if (this.View == View.Tile && item.SubItems.Count > 1)
+                    flags |= eTextFormat.Top;
+                else
+                    flags |= eTextFormat.VerticalCenter;
+                if (this.View == View.LargeIcon)
+                {
+                    flags = eTextFormat.HorizontalCenter | eTextFormat.WordBreak | eTextFormat.EndEllipsis | eTextFormat.NoClipping;
+                }
+                else if (this.View == View.Details && header != null)
+                {
+                    flags |= eTextFormat.EndEllipsis;
+                    if (header.TextAlign == HorizontalAlignment.Center)
+                        flags |= eTextFormat.HorizontalCenter;
+                    else if (header.TextAlign == HorizontalAlignment.Right)
+                        flags |= eTextFormat.Right;
+
+                    rText.X += 2;
+                }
+                else if (this.View == View.List || this.View == View.SmallIcon)
+                    rText.X += 2;
+                if (!BarFunctions.IsVista) rText.Inflate(0, 1);
+                TextDrawing.DrawString(g, item.Text, font, color, rText, flags);
+
+                if (this.View == View.Tile && item.SubItems.Count > 1)
+                {
+                    Size sz = TextDrawing.MeasureString(g, item.Text, font);
+                    rText.Y += sz.Height;
+                    rText.Height -= sz.Height;
+                    Color c1 = item.SubItems[1].ForeColor;
+                    if (!c1.IsEmpty && c1 != color)
+                        color = c1;
+                    else
+                        color = SystemColors.ControlDarkDark;
+                    TextDrawing.DrawString(g, item.SubItems[1].Text, font, color, rText, flags);
+                }
+            }
+
+            if (this.View == View.Details || this.StateImageList != null)
+            {
+                if (this.StateImageList != null)
+                {
+                    if (item.StateImageIndex >= 0 && item.StateImageIndex < this.StateImageList.Images.Count)
+                    {
+                        Rectangle r = item.GetBounds(ItemBoundsPortion.Icon);
+                        if (this.View == View.Details || this.View == View.List)
+                            r.X -= 19;
+                        else if (this.View == View.LargeIcon && r.Width > this.StateImageList.ImageSize.Width)
+                        {
+                            r.X += (r.Width - this.StateImageList.ImageSize.Width) / 2;
+                            r.Y++;
+                        }
+                        else if (this.View == View.Tile && r.Height > this.StateImageList.ImageSize.Height)
+                        {
+                            r.Y += (r.Height - this.StateImageList.ImageSize.Height) / 2;
+                            r.X++;
+                        }
+                        this.StateImageList.Draw(g, r.Location, item.StateImageIndex);
+                    }
+                }
+            }
+
+            if (this.CheckBoxes && (this.View == View.Details || this.View == View.List || this.View == View.SmallIcon || this.View == View.LargeIcon) && this.StateImageList == null)
+            {
+                Rectangle r = item.GetBounds(ItemBoundsPortion.Icon);
+                if (this.View == View.LargeIcon)
+                    r.X += 9;
+                else if (this.View == View.List)
+                    r.X -= 18;
+                else if (this.View == View.SmallIcon && hasImage && this.Groups.Count > 0)
+                    r.X -= 20;
+                else if (this.View == View.SmallIcon)
+                    r.X -= 3;
+                else
+                    r.X -= 21;
+                Office2007CheckBoxItemPainter p = PainterFactory.CreateCheckBoxItemPainter(null);
+                Office2007CheckBoxColorTable ctt = GetCheckBoxColorTable();
+                Office2007CheckBoxStateColorTable ct = ctt.Default;
+                if ((state & ListViewItemStates.Grayed) != 0 || !this.Enabled)
+                    ct = ctt.Disabled;
+                //else if ((state & ListViewItemStates.Hot) != 0)
+                //    ct = ctt.MouseOver;
+                p.PaintCheckBox(g, new Rectangle(r.X + 4, r.Y + (r.Height - m_CheckSignSize.Height) / 2, m_CheckSignSize.Width, m_CheckSignSize.Height),
+                    ct, item.Checked ? CheckState.Checked : CheckState.Unchecked);
+            }
+        }
+
+        protected override void OnDrawSubItem(DrawListViewSubItemEventArgs e)
+        {
+            FixStateForHideSelection(e);
+
+            Graphics g = e.Graphics;
+            bool backgroundErased = false;
+            //if (e.ItemState == 0 && this.View == View.Details && this.FullRowSelect) return; Can't do this can cause items not be displayed at all
+            if (this.FullRowSelect && IsInState(e.ItemState, ListViewItemStates.Selected) && e.Header != null &&
+                (e.Header.DisplayIndex == 0 || e.Bounds.X <= 0 && e.Header.DisplayIndex > 0 && this.Scrollable))
+            {
+                Rectangle r = e.Item.Bounds;
+                if ((HasImage(e.Item) || e.Header.DisplayIndex != e.Header.Index) && e.Header.DisplayIndex == 0)
+                {
+                    Rectangle rLabel = e.Item.GetBounds(ItemBoundsPortion.Icon);
+                    int w = Math.Min(e.Header.Width, (rLabel.Right - r.X) + 1);
+                    r.Width -= w;
+                    r.X += w;
+                }
+                DrawItemBackground(g, r, e.Item, e.ItemState);
+                backgroundErased = true;
+            }
+
+            if (e.ColumnIndex == 0)
+            {
+                if (!(this.FullRowSelect && IsInState(e.ItemState, ListViewItemStates.Selected)))
+                {
+                    Rectangle r = e.Item.GetBounds(ItemBoundsPortion.Label);
+
+                    //if (System.Environment.OSVersion.Version.Major < 6)
+                    //    r.Height += 2;
+                    //else
+                    //    r.Height++;
+                    DrawItemBackground(g, r, e.Item, e.ItemState);
+                    backgroundErased = true;
+                }
+                Color foreColor = e.Item.ForeColor;
+                Office2007ListViewColorTable ct = GetColorTable();
+                if (IsInState(e.ItemState, ListViewItemStates.Selected) && !ct.SelectionForeColor.IsEmpty) foreColor = ct.SelectionForeColor;
+                if (!this.Enabled) foreColor = _DisabledForeColor.IsEmpty ? SystemColors.ControlDark : _DisabledForeColor;
+                DrawListViewItem(g, e.Item, e.Header, e.Item.Font, foreColor, e.ItemState);
+
+                // This was added to address issue in Detail view where with row selected for first time, mouse over the second
+                // column would erase the text in subsequent columns without them getting paint call so text was was visible
+                if (backgroundErased && this.FullRowSelect && IsInState(e.ItemState, ListViewItemStates.Selected) && this.View == View.Details)
+                {
+                    // Paint SubItems
+                    for (int i = 1; i < e.Item.SubItems.Count; i++)
+                    {
+                        System.Windows.Forms.ListViewItem.ListViewSubItem subItem = e.Item.SubItems[i];
+                        Rectangle r = subItem.Bounds;
+                        if (r.IntersectsWith(this.DisplayRectangle))
+                            PaintSubItem(g, subItem, r, e.ItemState, (i < this.Columns.Count ? this.Columns[i] : null), e.Item.BackColor, i);
+                    }
+                }
+
+                //int start = m_FirstVisibleColumnIndex;
+                //if (start == 0) start++;
+                // Paint SubItems
+                //for (int i = start; i < e.Item.SubItems.Count; i++)
+                //{
+                //    System.Windows.Forms.ListViewItem.ListViewSubItem subItem = e.Item.SubItems[i];
+                //    Rectangle r = subItem.Bounds;
+                //    if (r.IntersectsWith(this.DisplayRectangle))
+                //        PaintSubItem(g, subItem, r, e.ItemState, (i < this.Columns.Count ? this.Columns[i] : null), e.Item.BackColor);
+                //}
+            }
+            else
+            {
+                if (this.FullRowSelect && IsInState(e.ItemState, ListViewItemStates.Selected) && e.Header.DisplayIndex != e.Header.Index)
+                {
+                    Rectangle r = e.Bounds;
+                    DrawItemBackground(g, r, e.Item, e.ItemState);
+                    backgroundErased = true;
+                }
+                if (e.Header.Width > 0)
+                    PaintSubItem(g, e.SubItem, e.Bounds, e.ItemState, this.Columns[e.ColumnIndex], e.Item.BackColor, e.ColumnIndex);
+            }
+            base.OnDrawSubItem(e);
+        }
+
+        private Color _DisabledForeColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets the item foreground color when control or item is disabled. By default SystemColors.Dark is used.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates item foreground color when control or item is disabled.")]
+        public Color DisabledForeColor
+        {
+            get { return _DisabledForeColor; }
+            set { _DisabledForeColor = value; }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized by VS.NET designer.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeDisabledForeColor()
+        {
+            return !_DisabledForeColor.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetDisabledForeColor()
+        {
+            DisabledForeColor = Color.Empty;
+        }
+
+        //[Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        //public new bool HideSelection
+        //{
+        //    get { return base.HideSelection; }
+        //    set { base.HideSelection = false; }
+        //}
+
+        //private int m_FirstVisibleColumnIndex = 0;
+        //private void UpdateFirstVisibleColumnIndex()
+        //{
+        //    m_FirstVisibleColumnIndex = 0;
+        //    if (this.View == View.Details && this.Columns.Count > 0 && this.Items.Count>0)
+        //    {
+        //        ListViewItem item = this.Items[0];
+        //        if (item.Bounds.X < 0)
+        //        {
+        //            int x = item.Bounds.X;
+        //            IList list = GetOrderedColumnList();
+        //            for (int i = 0; i < list.Count; i++)
+        //            {
+        //                ColumnHeader h = list[i] as ColumnHeader;
+        //                if (x + h.Width > 0)
+        //                {
+        //                    m_FirstVisibleColumnIndex = i;
+        //                    break;
+        //                }
+        //                else
+        //                    x += h.Width;
+        //            }
+        //        }
+        //    }
+        //}
+
+        private IList GetOrderedColumnList()
+        {
+            IList columns = this.Columns;
+            if (this.AllowColumnReorder)
+            {
+                ArrayList ca = new ArrayList(this.Columns);
+                foreach (ColumnHeader h in columns)
+                {
+                    if (h.DisplayIndex < 0) continue;
+                    ca[h.DisplayIndex] = h;
+                }
+                columns = ca;
+            }
+
+            return columns;
+        }
+
+        private void PaintSubItem(Graphics g, ListViewItem.ListViewSubItem subitem, Rectangle r, ListViewItemStates state, ColumnHeader header, Color itemBackColor, int columnIndex)
+        {
+            if (!IsInState(state, ListViewItemStates.Selected) && this.Enabled)
+            {
+                Rectangle rFill = r;
+                //rFill.Height++;
+                if (!subitem.BackColor.IsEmpty /*&& !(subitem.BackColor == this.BackColor && !itemBackColor.IsEmpty)*/)
+                {
+                    using (SolidBrush brush = new SolidBrush(subitem.BackColor))
+                        g.FillRectangle(brush, rFill);
+                }
+                else if (!itemBackColor.IsEmpty)
+                {
+                    using (SolidBrush brush = new SolidBrush(itemBackColor))
+                        g.FillRectangle(brush, rFill);
+                }
+            }
+
+            eTextFormat flags = eTextFormat.Left | eTextFormat.SingleLine | eTextFormat.VerticalCenter | eTextFormat.EndEllipsis | eTextFormat.NoClipping | eTextFormat.NoPrefix;
+
+            if (header != null)
+            {
+                if (header.TextAlign == HorizontalAlignment.Center)
+                    flags |= eTextFormat.HorizontalCenter;
+                else if (header.TextAlign == HorizontalAlignment.Right)
+                    flags |= eTextFormat.Right;
+            }
+
+            Color foreColor = subitem.ForeColor;
+            if (IsInState(state, ListViewItemStates.Selected) && this.Enabled && (columnIndex == 0 || this.FullRowSelect))
+            {
+                Office2007ListViewColorTable ct = GetColorTable();
+                if (!ct.SelectionForeColor.IsEmpty)
+                    foreColor = ct.SelectionForeColor;
+            }
+            if (!this.Enabled) foreColor = _DisabledForeColor.IsEmpty ? SystemColors.ControlDark : _DisabledForeColor;
+            Rectangle rText = Rectangle.Inflate(r, -2, BarFunctions.IsVista ? 0 : 1); // Rectangle.Inflate(r, -sz.Width, 0);
+            TextDrawing.DrawString(g, subitem.Text, subitem.Font, foreColor, rText, flags);
+            //Console.WriteLine("{0}-Sub {1} {2}",DateTime.Now, subitem.Text,rText);
+
+        }
+
+        private void DrawFocusRectangle(Graphics g, Rectangle r, ListViewItem item)
+        {
+            if (_FocusCuesEnabled)
+                ControlPaint.DrawFocusRectangle(g, r, item.ForeColor, item.BackColor);
+        }
+        private bool _FocusCuesEnabled = true;
+        /// <summary>
+        /// Gets or sets whether control displays focus cues when focused.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether control displays focus cues when focused.")]
+        public virtual bool FocusCuesEnabled
+        {
+            get { return _FocusCuesEnabled; }
+            set
+            {
+                _FocusCuesEnabled = value;
+                if (this.Focused) this.Invalidate();
+            }
+        }
+        private Rectangle UpdateBounds(Rectangle originalBounds, bool drawText, ListViewItem item)
+        {
+            Rectangle r = originalBounds;
+            if (this.View == View.Details)
+            {
+                if (!this.FullRowSelect && (item.SubItems.Count > 0))
+                {
+                    ListViewItem.ListViewSubItem subItem = item.SubItems[0];
+                    Size textSize = TextRenderer.MeasureText(subItem.Text, subItem.Font);
+                    r = new Rectangle(originalBounds.X, originalBounds.Y, textSize.Width, textSize.Height);
+                    r.X += 4;
+                    r.Width++;
+                }
+                else
+                {
+                    r.X += 4;
+                    r.Width -= 4;
+                }
+                if (drawText)
+                {
+                    r.X--;
+                }
+            }
+            return r;
+        }
+
+        private Point m_MouseDown = Point.Empty;
+        protected override void OnMouseDown(MouseEventArgs e)
+        {
+            m_MouseDown = new Point(e.X, e.Y);
+            if (this.View == View.LargeIcon && this.CheckBoxes)
+            {
+                ListViewHitTestInfo info = HitTest(m_MouseDown);
+                if (info.Item == null)
+                    info = HitTest(new Point(e.X + 9, e.Y));
+                if (info.Item != null)
+                {
+                    Rectangle r = info.Item.GetBounds(ItemBoundsPortion.Icon);
+                    r.X += 9;
+                    r = new Rectangle(r.X + 4, r.Y + (r.Height - m_CheckSignSize.Height) / 2, m_CheckSignSize.Width-4,
+                        m_CheckSignSize.Height);
+                    if (r.Contains(m_MouseDown))
+                        info.Item.Checked = !info.Item.Checked;
+
+                }
+            }
+            base.OnMouseDown(e);
+        }
+        protected override void OnMouseUp(MouseEventArgs e)
+        {
+            base.OnMouseUp(e);
+            if (this.View == View.Details && this.FullRowSelect && !this.IsDisposed && !this.CheckBoxes)
+            {
+                ListViewItem clickedItem = GetItemAt(5, e.Y);
+                ListViewItem mouseDownItem = GetItemAt(5, m_MouseDown.Y);
+                if (clickedItem != null && clickedItem == mouseDownItem)
+                {
+                    //clickedItem.Selected = true; // There was a bug when this is executed that did not allow an item to be Ctrl+Mouse Click deselected
+                    if (clickedItem.Selected)
+                        clickedItem.Focused = true;
+                }
+            }
+        }
+
+        private bool m_FirstMouseEnter = true;
+        protected override void OnMouseEnter(EventArgs e)
+        {
+            if (m_FirstMouseEnter)
+            {
+                this.Refresh();
+                m_FirstMouseEnter = false;
+            }
+            base.OnMouseEnter(e);
+        }
+
+        protected override void OnLostFocus(EventArgs e)
+        {
+            if (this.HideSelection)
+            {
+                if (!this.VirtualMode && this.SelectedItems.Count > 0)
+                {
+                    foreach (ListViewItem item in this.SelectedItems)
+                    {
+                        Rectangle r = item.Bounds;
+                        if (this.View == View.Details)
+                        {
+                            r.X = 0;
+                            r.Width = this.Width;
+                        }
+                        else if (this.View == View.LargeIcon)
+                        {
+                            r.Inflate(32, 32);
+                        }
+                        this.Invalidate(r);
+                    }
+                }
+            }
+
+            base.OnLostFocus(e);
+        }
+
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public new bool OwnerDraw
+        {
+            get { return base.OwnerDraw; }
+            set { base.OwnerDraw = value; }
+        }
+
+        [System.Runtime.InteropServices.StructLayout(System.Runtime.InteropServices.LayoutKind.Sequential)]
+        private struct NMHDR
+        {
+            public IntPtr hwndFrom;
+            public IntPtr idFrom;
+            public int code;
+        }
+        [System.Runtime.InteropServices.StructLayout(System.Runtime.InteropServices.LayoutKind.Sequential)]
+        private struct NMCUSTOMDRAW
+        {
+            public NMHDR nmcd;
+            public int dwDrawStage;
+            public IntPtr hdc;
+            public WinApi.RECT rc;
+            public IntPtr dwItemSpec;
+            public int uItemState;
+            public IntPtr lItemlParam;
+        }
+
+        protected override void WndProc(ref Message m)
+        {
+            if (m_NCPainter != null)
+            {
+                bool callBase = m_NCPainter.WndProc(ref m);
+
+                if (callBase)
+                    base.WndProc(ref m);
+            }
+            else
+            {
+                base.WndProc(ref m);
+            }
+
+            //if (m.Msg == (int)WinApi.WindowsMessages.WM_HSCROLL)
+            //{
+            //    UpdateFirstVisibleColumnIndex();
+            //}
+        }
+
+        private Rendering.BaseRenderer m_DefaultRenderer = null;
+        private Rendering.BaseRenderer m_Renderer = null;
+        private eRenderMode m_RenderMode = eRenderMode.Global;
+        /// <summary>
+        /// Returns the renderer control will be rendered with.
+        /// </summary>
+        /// <returns>The current renderer.</returns>
+        public virtual Rendering.BaseRenderer GetRenderer()
+        {
+            if (m_RenderMode == eRenderMode.Global && Rendering.GlobalManager.Renderer != null)
+                return Rendering.GlobalManager.Renderer;
+            else if (m_RenderMode == eRenderMode.Custom && m_Renderer != null)
+                return m_Renderer;
+
+            if (m_DefaultRenderer == null)
+                m_DefaultRenderer = new Rendering.Office2007Renderer();
+
+            return m_DefaultRenderer;
+        }
+
+        /// <summary>
+        /// Gets or sets the redering mode used by control. Default value is eRenderMode.Global which means that static GlobalManager.Renderer is used. If set to Custom then Renderer property must
+        /// also be set to the custom renderer that will be used.
+        /// </summary>
+        [Browsable(false), DefaultValue(eRenderMode.Global)]
+        public eRenderMode RenderMode
+        {
+            get { return m_RenderMode; }
+            set
+            {
+                if (m_RenderMode != value)
+                {
+                    m_RenderMode = value;
+                    m_ListViewColorTable = null;
+                    this.Invalidate(true);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the custom renderer used by the items on this control. RenderMode property must also be set to eRenderMode.Custom in order renderer
+        /// specified here to be used.
+        /// </summary>
+        [Browsable(false), DefaultValue(null)]
+        public DevComponents.DotNetBar.Rendering.BaseRenderer Renderer
+        {
+            get
+            {
+                return m_Renderer;
+            }
+            set
+            {
+                m_Renderer = value;
+                m_ListViewColorTable = null;
+            }
+        }
+
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public new BorderStyle BorderStyle
+        {
+            get { return base.BorderStyle; }
+            set { }
+        }
+
+        private ElementStyle GetBorderStyle()
+        {
+            m_BorderStyle.SetColorScheme(this.GetColorScheme());
+            bool disposeStyle = false;
+            return ElementStyleDisplay.GetElementStyle(m_BorderStyle,out disposeStyle);
+        }
+
+        /// <summary>
+        /// Specifies the control border style. Default value has Class property set so the system style for the control is used.
+        /// </summary>
+        [Browsable(true), Category("Style"), Description("Specifies the control border style. Default value has Class property set so the system style for the control is used."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ElementStyle Border
+        {
+            get { return m_BorderStyle; }
+        }
+        private void BorderStyle_StyleChanged(object sender, EventArgs e)
+        {
+            if (!BarFunctions.IsHandleValid(this)) return;
+            const int RDW_INVALIDATE = 0x0001;
+            const int RDW_FRAME = 0x0400;
+            NativeFunctions.RECT r = new NativeFunctions.RECT(0, 0, this.Width, this.Height);
+            NativeFunctions.RedrawWindow(this.Handle, ref r, IntPtr.Zero, RDW_INVALIDATE | RDW_FRAME);
+        }
+
+        protected override CreateParams CreateParams
+        {
+            get
+            {
+                CreateParams p = base.CreateParams;
+                p.ExStyle = p.ExStyle & ~(p.ExStyle & 0x200);
+                return p;
+            }
+        }
+
+        #endregion
+
+        #region INonClientControl Members
+        void INonClientControl.BaseWndProc(ref Message m)
+        {
+            base.WndProc(ref m);
+        }
+
+        ItemPaintArgs INonClientControl.GetItemPaintArgs(System.Drawing.Graphics g)
+        {
+            ItemPaintArgs pa = new ItemPaintArgs(this as IOwner, this, g, GetColorScheme());
+            pa.Renderer = this.GetRenderer();
+            pa.DesignerSelection = false; // m_DesignerSelection;
+            pa.GlassEnabled = !this.DesignMode && WinApi.IsGlassEnabled;
+            return pa;
+        }
+
+        ElementStyle INonClientControl.BorderStyle
+        {
+            get { return GetBorderStyle(); }
+        }
+
+        void INonClientControl.PaintBackground(PaintEventArgs e)
+        {
+            //if (this.Parent == null) return;
+            //Type t = typeof(Control);
+            //MethodInfo mi = t.GetMethod("PaintTransparentBackground", BindingFlags.InvokeMethod | BindingFlags.NonPublic | BindingFlags.Instance, null, new Type[] { typeof(PaintEventArgs), typeof(Rectangle) }, null);
+            //if (mi != null)
+            //{
+            //    mi.Invoke(this, new object[] { e, new Rectangle(0, 0, this.Width, this.Height) });
+            //}
+        }
+
+        private ColorScheme m_ColorScheme = null;
+        /// <summary>
+        /// Returns the color scheme used by control. Color scheme for Office2007 style will be retrived from the current renderer instead of
+        /// local color scheme referenced by ColorScheme property.
+        /// </summary>
+        /// <returns>An instance of ColorScheme object.</returns>
+        protected virtual ColorScheme GetColorScheme()
+        {
+            BaseRenderer r = GetRenderer();
+            if (r is Office2007Renderer)
+                return ((Office2007Renderer)r).ColorTable.LegacyColors;
+            if (m_ColorScheme == null)
+                m_ColorScheme = new ColorScheme(eDotNetBarStyle.Office2007);
+            return m_ColorScheme;
+        }
+
+        IntPtr INonClientControl.Handle
+        {
+            get { return this.Handle; }
+        }
+
+        int INonClientControl.Width
+        {
+            get { return this.Width; }
+        }
+
+        int INonClientControl.Height
+        {
+            get { return this.Height; }
+        }
+
+        bool INonClientControl.IsHandleCreated
+        {
+            get { return this.IsHandleCreated; }
+        }
+
+        Point INonClientControl.PointToScreen(Point client)
+        {
+            return this.PointToScreen(client);
+        }
+
+        Color INonClientControl.BackColor
+        {
+            get { return this.BackColor; }
+        }
+
+        void INonClientControl.AdjustClientRectangle(ref Rectangle r) { }
+
+        void INonClientControl.AdjustBorderRectangle(ref Rectangle r) { }
+
+        void INonClientControl.RenderNonClient(Graphics g) { }
+
+        private Color _DisabledBackColor = Color.Empty;
+        /// <summary>
+        /// Specifies back color when Enabled=false
+        /// </summary>
+        [Browsable(false), Category("Appearance"), Description("Specifies back color when Enabled=false")]
+        public Color DisabledBackColor
+        {
+            get { return _DisabledBackColor; }
+            set
+            {
+                _DisabledBackColor = value;
+                if (!Enabled) this.Invalidate();
+            }
+        }
+        #endregion
+
+        #region HeaderNativeWindowHandler
+        private class HeaderHandler : NativeWindow
+        {
+            private ListViewEx m_Parent = null;
+            private bool m_MouseDown = false;
+            private Point m_MouseDownPoint = Point.Empty;
+            public HeaderHandler(ListViewEx parent)
+            {
+                m_Parent = parent;
+                IntPtr h = new IntPtr(WinApi.SendMessage(parent.Handle, (0x1000 + 31), IntPtr.Zero, IntPtr.Zero));
+                if (h != IntPtr.Zero)
+                    AssignHandle(h);
+            }
+
+            protected override void WndProc(ref Message m)
+            {
+                if (m.Msg == (int)WinApi.WindowsMessages.WM_PAINT)
+                {
+                    WinApi.PAINTSTRUCT ps = new WinApi.PAINTSTRUCT();
+                    IntPtr hdc = WinApi.BeginPaint(m.HWnd, ref ps);
+                    try
+                    {
+                        Graphics g = Graphics.FromHdc(hdc);
+                        try
+                        {
+                            WinApi.RECT r = new WinApi.RECT();
+                            WinApi.GetWindowRect(m.HWnd, ref r);
+                            Rectangle rc = new Rectangle(0, 0, r.Width, r.Height);
+                            using (BufferedBitmap bb = new BufferedBitmap(hdc, rc))
+                            {
+                                m_Parent.PaintHeaderBackground(bb.Graphics, rc);
+
+                                IList columns = m_Parent.GetOrderedColumnList();
+
+                                int x = 0;
+                                foreach (ColumnHeader h in columns)
+                                {
+
+                                    Rectangle hr = new Rectangle(x, 0, h.Width, r.Height);
+                                    ListViewItemStates state = ListViewItemStates.ShowKeyboardCues;
+                                    if (m_MouseDown && hr.Contains(m_MouseDownPoint))
+                                    {
+                                        Rectangle rt = hr;
+                                        rt.Inflate(-6, 0);
+                                        if (rt.Contains(m_MouseDownPoint))
+                                            state |= ListViewItemStates.Selected;
+                                    }
+
+                                    m_Parent.DrawColumnHeaderInternal(new DrawListViewColumnHeaderEventArgs(bb.Graphics, hr, h.DisplayIndex, h,
+                                        state, SystemColors.ControlText, Color.Empty, m_Parent.ColumnHeaderFont ?? m_Parent.Font));
+                                    x += h.Width;
+                                }
+                                bb.Render(g);
+                            }
+                        }
+                        finally
+                        {
+                            g.Dispose();
+                        }
+                    }
+                    finally
+                    {
+                        WinApi.EndPaint(m.HWnd, ref ps);
+                    }
+                    return;
+                }
+                else if (m.Msg == (int)WinApi.WindowsMessages.WM_LBUTTONDOWN)
+                {
+                    if (m_Parent.HeaderStyle == ColumnHeaderStyle.Clickable)
+                    {
+                        m_MouseDown = true;
+                        m_MouseDownPoint = new Point(WinApi.LOWORD(m.LParam), WinApi.HIWORD(m.LParam));
+                        WinApi.RedrawWindow(m.HWnd, IntPtr.Zero, IntPtr.Zero, WinApi.RedrawWindowFlags.RDW_INVALIDATE);
+                    }
+                }
+                else if (m.Msg == (int)WinApi.WindowsMessages.WM_LBUTTONUP)
+                {
+                    m_MouseDown = false;
+                    m_MouseDownPoint = Point.Empty;
+                }
+                else if (m.Msg == (int)WinApi.WindowsMessages.WM_MOUSEMOVE && m_MouseDown)
+                {
+                    m_MouseDownPoint = new Point(WinApi.LOWORD(m.LParam), WinApi.HIWORD(m.LParam));
+                }
+
+                base.WndProc(ref m);
+            }
+        }
+        #endregion
+
+        #region Hide-Selection ListView Bug Hacking
+        bool _IsItemInitialized = false;
+        bool _IsSubItemInitialized = false;
+        FieldInfo _ItemStateField = null;
+        FieldInfo _SubItemStateField = null;
+
+        private void FixStateForHideSelection(DrawListViewItemEventArgs e)
+        {
+            if (HideSelection) return;
+            if (!this._IsItemInitialized)
+            {
+                _ItemStateField = e.GetType().GetField("state",BindingFlags.NonPublic | BindingFlags.Instance);
+                _IsItemInitialized = true;
+            }
+
+            if (_ItemStateField != null)
+            {
+                UpdateStateBit(e, _ItemStateField, e.Item.Selected,e.State);
+            }
+        }
+
+        private void FixStateForHideSelection(DrawListViewSubItemEventArgs e)
+        {
+            if (HideSelection) return;
+            if (!_IsSubItemInitialized)
+            {
+
+                _SubItemStateField =e.GetType().GetField("itemState", BindingFlags.NonPublic |BindingFlags.Instance);
+                _IsSubItemInitialized = true;
+            }
+
+            if (_SubItemStateField != null)
+            {
+                UpdateStateBit(e, _SubItemStateField,e.Item.Selected, e.ItemState);
+            }
+        }
+
+        private void UpdateStateBit(object o, FieldInfo f, bool itemSelected, ListViewItemStates currentState)
+        {
+            bool stateSelected = (currentState & ListViewItemStates.Selected) != 0;
+
+            if (itemSelected != stateSelected)
+            {
+                ListViewItemStates newState = currentState;
+                if (itemSelected)
+                {
+                    newState |= ListViewItemStates.Selected;
+                }
+                else
+                {
+                    newState &= ~(ListViewItemStates.Selected);
+                }
+                try
+                {
+                    f.SetValue(o, newState);
+                }
+                catch { }
+            }
+        }
+
+
+        #endregion
+    }
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/Controls/ListViewEx.ico b/PROMS/DotNetBar Source Code/Controls/ListViewEx.ico
new file mode 100644
index 00000000..6cd7112a
Binary files /dev/null and b/PROMS/DotNetBar Source Code/Controls/ListViewEx.ico differ
diff --git a/PROMS/DotNetBar Source Code/Controls/MaskedTextBoxAdv.cs b/PROMS/DotNetBar Source Code/Controls/MaskedTextBoxAdv.cs
new file mode 100644
index 00000000..45c03048
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/MaskedTextBoxAdv.cs	
@@ -0,0 +1,1894 @@
+#if FRAMEWORK20
+using System;
+using System.Text;
+using System.ComponentModel;
+using System.Windows.Forms;
+using DevComponents.Editors;
+using System.Collections;
+using System.Drawing;
+using System.Globalization;
+using System.Drawing.Design;
+using System.Drawing.Drawing2D;
+using System.Diagnostics;
+using DevComponents.DotNetBar.TextMarkup;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    [ToolboxBitmap(typeof(MaskedTextBoxAdv), "Controls.MaskedTextBoxAdv.ico"), System.ComponentModel.ToolboxItem(true), DefaultProperty("Mask"), DefaultBindingProperty("Text"), DefaultEvent("MaskInputRejected"), Designer("DevComponents.DotNetBar.Design.MaskedTextBoxAdvDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+    public class MaskedTextBoxAdv : PopupItemControl, IInputButtonControl, ICommandSource
+    {
+        #region Private Variables
+        private MaskedTextBox _MaskedTextBox = null;
+        private ButtonItem _PopupItem = null;
+        private static string _DropDownItemContainerName = "sysPopupItemContainer";
+        private static string _DropDownControlContainerName = "sysPopupControlContainer";
+        private Color _FocusHighlightColor = ColorScheme.GetColor(0xFFFF88);
+        private bool _FocusHighlightEnabled = false;
+        private string _WatermarkText = "";
+        private Font _WatermarkFont = null;
+        private Color _WatermarkColor = SystemColors.GrayText;
+        #endregion
+
+        #region Events
+        /// <summary>
+        /// Occurs when Clear button is clicked and allows you to cancel the default action performed by the button.
+        /// </summary>
+        public event CancelEventHandler ButtonClearClick;
+        /// <summary>
+        /// Occurs when Drop-Down button that shows popup is clicked and allows you to cancel showing of the popup.
+        /// </summary>
+        public event CancelEventHandler ButtonDropDownClick;
+        /// <summary>
+        /// Occurs when ButtonCustom control is clicked.
+        /// </summary>
+        public event EventHandler ButtonCustomClick;
+        /// <summary>
+        /// Occurs when ButtonCustom2 control is clicked.
+        /// </summary>
+        public event EventHandler ButtonCustom2Click;
+        /// <summary>
+        /// Occurs after the insert mode has changed
+        /// </summary>
+        [Description("Occurs after the insert mode has changed")]
+        public event EventHandler IsOverwriteModeChanged;
+        /// <summary>
+        /// Occurs after the input mask is changed.
+        /// </summary>
+        [Description("Occurs after the input mask is changed.")]
+        public event EventHandler MaskChanged;
+        /// <summary>
+        /// Occurs when the user's input or assigned character does not match the corresponding format element of the input mask.
+        /// </summary>
+        [Category("Behavior"), Description("Occurs when the user's input or assigned character does not match the corresponding format element of the input mask.")]
+        public event MaskInputRejectedEventHandler MaskInputRejected;
+        /// <summary>
+        /// Occurs when the text alignment is changed.
+        /// </summary>
+        [Description("Occurs when the text alignment is changed.")]
+        public event EventHandler TextAlignChanged;
+        /// <summary>
+        /// Occurs when MaskedTextBox has finished parsing the current value using the ValidatingType property.
+        /// </summary>
+        [Category("Focus"), Description("Occurs when MaskedTextBox has finished parsing the current value using the ValidatingType property.")]
+        public event TypeValidationEventHandler TypeValidationCompleted;
+
+ 
+
+        #endregion
+
+        #region Constructor
+        /// <summary>
+        /// Initializes a new instance of the MaskedTextBoxAdv class.
+        /// </summary>
+        public MaskedTextBoxAdv()
+        {
+            this.SetStyle(ControlStyles.Selectable, false);
+            _MaskedTextBox = new MaskedTextBoxInternal();
+            this.BackColor = SystemColors.Window;
+            InitControl();
+        }
+
+
+        /// <summary>
+        /// Initializes a new instance of the MaskedTextBoxAdv class using the specified input mask.
+        /// </summary>
+        /// <param name="maskedTextProvider">A custom mask language provider, derived from the MaskedTextProvider class. </param>
+        public MaskedTextBoxAdv(MaskedTextProvider maskedTextProvider)
+        {
+            _MaskedTextBox = new MaskedTextBox(maskedTextProvider);
+            InitControl();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the MaskedTextBoxAdv class using the specified input mask.
+        /// </summary>
+        /// <param name="mask">Initializes a new instance of the MaskedTextBox class using the specified input mask.</param>
+        public MaskedTextBoxAdv(string mask)
+        {
+            _MaskedTextBox = new MaskedTextBox(mask);
+            InitControl();
+        }
+
+        private void InitControl()
+        {
+            _BackgroundStyle.SetColorScheme(this.ColorScheme);
+            _BackgroundStyle.StyleChanged += new EventHandler(this.VisualPropertyChanged);
+
+            _ButtonCustom = new InputButtonSettings(this);
+            _ButtonCustom2 = new InputButtonSettings(this);
+            _ButtonClear = new InputButtonSettings(this);
+            _ButtonDropDown = new InputButtonSettings(this);
+            CreateButtonGroup();
+
+            _MaskedTextBox.BorderStyle = BorderStyle.None;
+            _MaskedTextBox.TextChanged += new EventHandler(MaskedTextBoxTextChanged);
+            _MaskedTextBox.IsOverwriteModeChanged += new EventHandler(MaskedTextBoxIsOverwriteModeChanged);
+            _MaskedTextBox.MaskChanged += new EventHandler(MaskedTextBoxMaskChanged);
+            _MaskedTextBox.MaskInputRejected += new MaskInputRejectedEventHandler(MaskedTextBoxMaskInputRejected);
+            _MaskedTextBox.TextAlignChanged += new EventHandler(MaskedTextBoxTextAlignChanged);
+            _MaskedTextBox.TypeValidationCompleted += new TypeValidationEventHandler(MaskedTextBoxTypeValidationCompleted);
+            _MaskedTextBox.SizeChanged += new EventHandler(MaskedTextBoxSizeChanged);
+            this.Controls.Add(_MaskedTextBox);
+        }
+
+        private void MaskedTextBoxSizeChanged(object sender, EventArgs e)
+        {
+            if (!_InternalSizeUpdate)
+                UpdateLayout();
+        }
+        #endregion
+
+        #region Internal Implementation
+        private Color _EnabledBackColor = Color.Empty;
+        protected override void OnEnabledChanged(EventArgs e)
+        {
+            if (_WatermarkText.Length > 0)
+                this.Invalidate();
+            UpdateEnabledBackColor();
+            base.OnEnabledChanged(e);
+        }
+        private void UpdateEnabledBackColor()
+        {
+            if (!_DisabledBackColor.IsEmpty)
+            {
+                if (!this.Enabled)
+                {
+                    _EnabledBackColor = this.BackColor;
+                    this.BackColor = _DisabledBackColor;
+                    _MaskedTextBox.BackColor = _DisabledBackColor;
+                }
+                else if (!_EnabledBackColor.IsEmpty)
+                {
+                    this.BackColor = _EnabledBackColor;
+                    _MaskedTextBox.BackColor = _EnabledBackColor;
+                    _EnabledBackColor = Color.Empty;
+                }
+            }
+        }
+        private Color _DisabledBackColor = Color.Empty;
+        /// <summary>
+        /// Specifies back color when Enabled=false
+        /// </summary>
+        [Browsable(true), Category("Appearance"), Description("Specifies back color when Enabled=false")]
+        public Color DisabledBackColor
+        {
+            get { return _DisabledBackColor; }
+            set
+            {
+                _DisabledBackColor = value;
+                if (!Enabled) this.Invalidate();
+            }
+        }
+        public bool ShouldSerializeDisabledBackColor()
+        {
+            return !_DisabledBackColor.IsEmpty;
+        }
+        public void ResetDisabledBackColor()
+        {
+            DisabledBackColor = Color.Empty;
+        }
+        /// <summary>
+        /// Gets or sets whether FocusHighlightColor is used as background color to highlight text box when it has input focus. Default value is false.
+        /// </summary>
+        [DefaultValue(false), Browsable(true), Category("Appearance"), Description("Indicates whether FocusHighlightColor is used as background color to highlight text box when it has input focus.")]
+        public bool FocusHighlightEnabled
+        {
+            get { return _FocusHighlightEnabled; }
+            set
+            {
+                if (_FocusHighlightEnabled != value)
+                {
+                    _FocusHighlightEnabled = value;
+                    if (this.Focused)
+                        this.Invalidate(true);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the color used as background color to highlight text box when it has input focus and focus highlight is enabled.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), Description("Indicates color used as background color to highlight text box when it has input focus and focus highlight is enabled.")]
+        public Color FocusHighlightColor
+        {
+            get { return _FocusHighlightColor; }
+            set
+            {
+                if (_FocusHighlightColor != value)
+                {
+                    _FocusHighlightColor = value;
+                    if (this.Focused)
+                        this.Invalidate(true);
+                }
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeFocusHighlightColor()
+        {
+            return !_FocusHighlightColor.Equals(ColorScheme.GetColor(0xFFFF88));
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetFocusHighlightColor()
+        {
+            FocusHighlightColor = ColorScheme.GetColor(0xFFFF88);
+        }
+
+        private void MaskedTextBoxTypeValidationCompleted(object sender, TypeValidationEventArgs e)
+        {
+            OnTypeValidationCompleted(e);
+        }
+
+        /// <summary>
+        /// Raises TypeValidationCompleted event.
+        /// </summary>
+        protected virtual void OnTypeValidationCompleted(TypeValidationEventArgs e)
+        {
+            TypeValidationEventHandler eh = TypeValidationCompleted;
+            if (eh != null)
+                eh(this, e);
+        }
+
+        private void MaskedTextBoxTextAlignChanged(object sender, EventArgs e)
+        {
+            OnTextAlignChanged(e);
+        }
+        /// <summary>
+        /// Raises the TextAlignChanged event.
+        /// </summary>
+        protected virtual void OnTextAlignChanged(EventArgs e)
+        {
+            EventHandler eh = TextAlignChanged;
+            if (eh != null)
+                eh(this, e);
+        }
+
+        private void MaskedTextBoxMaskInputRejected(object sender, MaskInputRejectedEventArgs e)
+        {
+            OnMaskInputRejected(e);
+        }
+        /// <summary>
+        /// Raises MaskInputRejected event.
+        /// </summary>
+        /// <param name="e"></param>
+        protected virtual void OnMaskInputRejected(MaskInputRejectedEventArgs e)
+        {
+            MaskInputRejectedEventHandler eh = MaskInputRejected;
+            if (eh != null)
+                eh(this, e);
+        }
+
+        private void MaskedTextBoxMaskChanged(object sender, EventArgs e)
+        {
+            OnMaskChanged(e);
+        }
+
+        /// <summary>
+        /// Raises the MaskChanged event.
+        /// </summary>
+        protected virtual void OnMaskChanged(EventArgs e)
+        {
+            EventHandler eh = MaskChanged;
+            if (eh != null)
+                eh(this, e);
+        }
+
+        void MaskedTextBoxIsOverwriteModeChanged(object sender, EventArgs e)
+        {
+            OnIsOverwriteModeChanged(e);
+        }
+
+        /// <summary>
+        /// Raises IsOverwriteModeChanged event.
+        /// </summary>
+        protected virtual void OnIsOverwriteModeChanged(EventArgs e)
+        {
+            EventHandler eh = IsOverwriteModeChanged;
+            if (eh != null)
+                eh(this, e);
+        }
+
+        private void MaskedTextBoxTextChanged(object sender, EventArgs e)
+        {
+            base.Text = _MaskedTextBox.Text;
+            //OnTextChanged(e);
+        }
+
+        private ElementStyle _BackgroundStyle = new ElementStyle();
+        /// <summary>
+        /// Specifies the background style of the control.
+        /// </summary>
+        [Category("Style"), Description("Gets or sets control background style."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ElementStyle BackgroundStyle
+        {
+            get { return _BackgroundStyle; }
+        }
+
+        /// <summary>
+        /// Resets style to default value. Used by windows forms designer.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetBackgroundStyle()
+        {
+            _BackgroundStyle.StyleChanged -= new EventHandler(this.VisualPropertyChanged);
+            _BackgroundStyle = new ElementStyle();
+            _BackgroundStyle.StyleChanged += new EventHandler(this.VisualPropertyChanged);
+            this.Invalidate();
+        }
+
+        private void VisualPropertyChanged(object sender, EventArgs e)
+        {
+            OnVisualPropertyChanged();
+        }
+
+        protected virtual void OnVisualPropertyChanged()
+        {
+            _ButtonGroup.InvalidateArrange();
+            this.Invalidate();
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            if (_BackgroundStyle != null) _BackgroundStyle.StyleChanged -= new EventHandler(VisualPropertyChanged);
+            base.Dispose(disposing);
+        }
+
+        private InputButtonSettings _ButtonDropDown = null;
+        /// <summary>
+        /// Gets the object that describes the settings for the button that shows drop-down when clicked.
+        /// </summary>
+        [Category("Buttons"), Description("Describes the settings for the button that shows drop-down when clicked."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public InputButtonSettings ButtonDropDown
+        {
+            get
+            {
+                return _ButtonDropDown;
+            }
+        }
+
+        private InputButtonSettings _ButtonClear = null;
+        /// <summary>
+        /// Gets the object that describes the settings for the button that clears the content of the control when clicked.
+        /// </summary>
+        [Category("Buttons"), Description("Describes the settings for the button that clears the content of the control when clicked."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public InputButtonSettings ButtonClear
+        {
+            get
+            {
+                return _ButtonClear;
+            }
+        }
+
+
+        private InputButtonSettings _ButtonCustom = null;
+        /// <summary>
+        /// Gets the object that describes the settings for the custom button that can execute an custom action of your choosing when clicked.
+        /// </summary>
+        [Category("Buttons"), Description("Describes the settings for the custom button that can execute an custom action of your choosing when clicked."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public InputButtonSettings ButtonCustom
+        {
+            get
+            {
+                return _ButtonCustom;
+            }
+        }
+
+        private InputButtonSettings _ButtonCustom2 = null;
+        /// <summary>
+        /// Gets the object that describes the settings for the custom button that can execute an custom action of your choosing when clicked.
+        /// </summary>
+        [Category("Buttons"), Description("Describes the settings for the custom button that can execute an custom action of your choosing when clicked."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public InputButtonSettings ButtonCustom2
+        {
+            get
+            {
+                return _ButtonCustom2;
+            }
+        }
+
+
+        void IInputButtonControl.InputButtonSettingsChanged(InputButtonSettings inputButtonSettings)
+        {
+            OnInputButtonSettingsChanged(inputButtonSettings);
+        }
+
+        protected virtual void OnInputButtonSettingsChanged(InputButtonSettings inputButtonSettings)
+        {
+            UpdateButtons();
+        }
+
+        private VisualGroup _ButtonGroup = null;
+        private void UpdateButtons()
+        {
+            RecreateButtons();
+            _ButtonGroup.InvalidateArrange();
+            this.Invalidate();
+        }
+
+        protected virtual void RecreateButtons()
+        {
+            VisualItem[] buttons = CreateOrderedButtonList();
+            // Remove all system buttons that are already in the list
+            VisualGroup group = _ButtonGroup;
+            VisualItem[] items = new VisualItem[group.Items.Count];
+            group.Items.CopyTo(items);
+            foreach (VisualItem item in items)
+            {
+                if (item.ItemType == eSystemItemType.SystemButton)
+                {
+                    group.Items.Remove(item);
+                    if (item == _ButtonCustom.ItemReference)
+                        item.MouseUp -= new MouseEventHandler(CustomButtonClick);
+                    else if (item == _ButtonCustom2.ItemReference)
+                        item.MouseUp -= new MouseEventHandler(CustomButton2Click);
+                }
+            }
+
+            // Add new buttons to the list
+            group.Items.AddRange(buttons);
+        }
+
+        private void CustomButtonClick(object sender, MouseEventArgs e)
+        {
+            if (_ButtonCustom.ItemReference.RenderBounds.Contains(e.X, e.Y))
+                OnButtonCustomClick(e);
+        }
+
+        protected virtual void OnButtonCustomClick(EventArgs e)
+        {
+            if (ButtonCustomClick != null)
+                ButtonCustomClick(this, e);
+        }
+
+        private void CustomButton2Click(object sender, MouseEventArgs e)
+        {
+            if (_ButtonCustom2.ItemReference.RenderBounds.Contains(e.X, e.Y))
+                OnButtonCustom2Click(e);
+        }
+
+        protected virtual void OnButtonCustom2Click(EventArgs e)
+        {
+            if (ButtonCustom2Click != null)
+                ButtonCustom2Click(this, e);
+        }
+
+        private VisualItem[] CreateOrderedButtonList()
+        {
+            SortedList list = CreateSortedButtonList();
+
+            VisualItem[] items = new VisualItem[list.Count];
+            list.Values.CopyTo(items, 0);
+
+            return items;
+        }
+
+        protected virtual SortedList CreateSortedButtonList()
+        {
+            SortedList list = new SortedList(4);
+            if (_ButtonCustom.Visible)
+            {
+                VisualItem button = CreateButton(_ButtonCustom);
+                if (_ButtonCustom.ItemReference != null)
+                    _ButtonCustom.ItemReference.MouseUp -= new MouseEventHandler(CustomButtonClick);
+                _ButtonCustom.ItemReference = button;
+                //button.Click += new EventHandler(CustomButtonClick);
+                button.MouseUp += new MouseEventHandler(CustomButtonClick);
+                button.Enabled = _ButtonCustom.Enabled;
+                list.Add(_ButtonCustom, button);
+            }
+
+            if (_ButtonCustom2.Visible)
+            {
+                VisualItem button = CreateButton(_ButtonCustom2);
+                if (_ButtonCustom.ItemReference != null)
+                    _ButtonCustom.ItemReference.MouseUp -= new MouseEventHandler(CustomButton2Click);
+                _ButtonCustom2.ItemReference = button;
+                //button.Click += new EventHandler(CustomButton2Click);
+                button.MouseUp += new MouseEventHandler(CustomButton2Click);
+                button.Enabled = _ButtonCustom2.Enabled;
+                list.Add(_ButtonCustom2, button);
+            }
+
+            if (_ButtonClear.Visible)
+            {
+                VisualItem button = CreateButton(_ButtonClear);
+                if (_ButtonClear.ItemReference != null)
+                    _ButtonClear.ItemReference.Click -= new EventHandler(ClearButtonClick);
+                _ButtonClear.ItemReference = button;
+                button.MouseUp += new MouseEventHandler(ClearButtonClick);
+                list.Add(_ButtonClear, button);
+            }
+
+            if (_ButtonDropDown.Visible)
+            {
+                VisualItem button = CreateButton(_ButtonDropDown);
+                if (_ButtonDropDown.ItemReference != null)
+                {
+                    _ButtonDropDown.ItemReference.MouseDown -= new MouseEventHandler(DropDownButtonMouseDown);
+                }
+                _ButtonDropDown.ItemReference = button;
+                button.MouseDown += new MouseEventHandler(DropDownButtonMouseDown);
+                list.Add(_ButtonDropDown, button);
+            }
+
+            return list;
+        }
+
+        protected virtual VisualItem CreateButton(InputButtonSettings buttonSettings)
+        {
+            VisualItem item = null;
+
+            if (buttonSettings == _ButtonDropDown)
+            {
+                item = new VisualDropDownButton();
+                ApplyButtonSettings(buttonSettings, item as VisualButton);
+            }
+            else
+            {
+                item = new VisualCustomButton();
+                ApplyButtonSettings(buttonSettings, item as VisualButton);
+            }
+
+            VisualButton button = item as VisualButton;
+            button.ClickAutoRepeat = false;
+
+            if (buttonSettings == _ButtonClear)
+            {
+                if (buttonSettings.Image == null && string.IsNullOrEmpty(buttonSettings.Text))
+                {
+                    //if (Dpi.Factor.Width > 1)
+                        button.Symbol = "\uf00d";
+                    //else
+                    //    button.Image = DevComponents.DotNetBar.BarFunctions.LoadBitmap("SystemImages.DateReset.png");
+                }
+            }
+
+            return item;
+        }
+
+        protected virtual void ApplyButtonSettings(InputButtonSettings buttonSettings, VisualButton button)
+        {
+            button.Text = buttonSettings.Text;
+            button.Image = buttonSettings.Image;
+            button.ItemType = eSystemItemType.SystemButton;
+            button.Enabled = buttonSettings.Enabled;
+            button.Tooltip = buttonSettings.Tooltip;
+            button.Shortcut = buttonSettings.Shortcut;
+            button.Symbol = buttonSettings.Symbol;
+            button.SymbolSet = buttonSettings.SymbolSet;
+            button.SymbolColor = buttonSettings.SymbolColor;
+        }
+
+        private void CreateButtonGroup()
+        {
+            VisualGroup group = new VisualGroup();
+            group.HorizontalItemSpacing = 0;
+            group.ArrangeInvalid += new EventHandler(ButtonGroupArrangeInvalid);
+            group.RenderInvalid += new EventHandler(ButtonGroupRenderInvalid);
+            group.ResetMouseHover += ButtonGroupRenderMouseHover;
+            _ButtonGroup = group;
+        }
+
+        internal VisualGroup ButtonGroup
+        {
+            get { return (_ButtonGroup); }
+        }
+
+        private void ButtonGroupRenderInvalid(object sender, EventArgs e)
+        {
+            Invalidate();
+        }
+
+        private void ButtonGroupArrangeInvalid(object sender, EventArgs e)
+        {
+            Invalidate();
+        }
+
+        private void ButtonGroupRenderMouseHover(object sender, EventArgs e)
+        {
+            DevComponents.AdvTree.Interop.WinApi.ResetHover(this);
+        }
+
+        private bool _MouseOver = false;
+        private PaintInfo CreatePaintInfo(Graphics g)
+        {
+            PaintInfo p = new PaintInfo();
+            p.Graphics = g;
+            p.DefaultFont = this.Font;
+            p.ForeColor = this.ForeColor;
+            p.RenderOffset = new System.Drawing.Point();
+            Size s = this.Size;
+            bool disposeStyle = false;
+            ElementStyle style = GetBackgroundStyle(out disposeStyle);
+            s.Height -= (ElementStyleLayout.TopWhiteSpace(style, eSpacePart.Border) + ElementStyleLayout.BottomWhiteSpace(style, eSpacePart.Border)) + 2;
+            s.Width -= (ElementStyleLayout.LeftWhiteSpace(style, eSpacePart.Border) + ElementStyleLayout.RightWhiteSpace(style, eSpacePart.Border)) + 2;
+            p.AvailableSize = s;
+            p.ParentEnabled = this.Enabled;
+            p.MouseOver = _MouseOver || this.Focused;
+
+            if(disposeStyle) style.Dispose();
+
+            return p;
+        }
+
+        private ElementStyle GetBackgroundStyle(out bool disposeStyle)
+        {
+            _BackgroundStyle.SetColorScheme(this.GetColorScheme());
+            disposeStyle = false;
+            return ElementStyleDisplay.GetElementStyle(_BackgroundStyle, out disposeStyle);
+        }
+
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            base.OnPaint(e);
+            Graphics g = e.Graphics;
+            Rectangle clientRect = this.ClientRectangle;
+            bool enabled = this.Enabled;
+
+            if (!this.Enabled)
+            {
+                if(_DisabledBackColor.IsEmpty)
+                    e.Graphics.FillRectangle(SystemBrushes.Control, clientRect);
+                else
+                    using(SolidBrush brush=new SolidBrush(_DisabledBackColor))
+                        e.Graphics.FillRectangle(brush, clientRect);
+            }
+            else
+            {
+                using (SolidBrush brush = new SolidBrush(this.BackColor))
+                    e.Graphics.FillRectangle(brush, clientRect);
+            }
+
+            bool disposeStyle = false;
+            ElementStyle style = GetBackgroundStyle(out disposeStyle);
+
+            if (style.Custom)
+            {
+                SmoothingMode sm = g.SmoothingMode;
+                if(this.AntiAlias)
+                    g.SmoothingMode = SmoothingMode.AntiAlias;
+                ElementStyleDisplayInfo displayInfo = new ElementStyleDisplayInfo(style, g, clientRect);
+                if (!enabled)
+                {
+                    ElementStyleDisplay.PaintBorder(displayInfo);
+                }
+                else
+                    ElementStyleDisplay.Paint(displayInfo);
+                if (this.AntiAlias)
+                    g.SmoothingMode = sm;
+            }
+
+            PaintButtons(g);
+
+            if(disposeStyle) style.Dispose();
+        }
+
+
+        public override Color BackColor
+        {
+            get
+            {
+                return base.BackColor;
+            }
+            set
+            {
+                base.BackColor = value;
+            }
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeBackColor()
+        {
+            return this.BackColor != SystemColors.Window;
+        }
+
+        protected override void OnBackColorChanged(EventArgs e)
+        {
+            base.OnBackColorChanged(e);
+            _MaskedTextBox.BackColor = this.BackColor;
+        }
+
+        private void PaintButtons(Graphics g)
+        {
+            PaintInfo p = CreatePaintInfo(g);
+
+            if (!_ButtonGroup.IsLayoutValid)
+            {
+                UpdateLayout(p);
+            }
+
+            bool disposeStyle = false;
+            ElementStyle style = GetBackgroundStyle(out disposeStyle);
+            //p.RenderOffset = new Point(this.Width - ElementStyleLayout.RightWhiteSpace(style, eSpacePart.Border) - _ButtonGroup.Size.Width, ElementStyleLayout.TopWhiteSpace(style, eSpacePart.Border));
+            _ButtonGroup.RenderBounds = GetButtonsRenderBounds(style);
+            _ButtonGroup.ProcessPaint(p);
+
+            if(disposeStyle) style.Dispose();
+        }
+
+        private Rectangle GetButtonsRenderBounds(ElementStyle style)
+        {
+            if (this.RightToLeft == RightToLeft.Yes)
+            {
+                return new Rectangle((ElementStyleLayout.LeftWhiteSpace(style, eSpacePart.Border) + 1), ElementStyleLayout.TopWhiteSpace(style, eSpacePart.Border) + 1,
+                _ButtonGroup.Size.Width, _ButtonGroup.Size.Height);
+            }
+            
+            return new Rectangle(this.Width - (ElementStyleLayout.RightWhiteSpace(style, eSpacePart.Border) + 1) - _ButtonGroup.Size.Width, ElementStyleLayout.TopWhiteSpace(style, eSpacePart.Border) + 1,
+                _ButtonGroup.Size.Width, _ButtonGroup.Size.Height);
+        }
+
+        protected override void OnResize(EventArgs e)
+        {
+            _ButtonGroup.InvalidateArrange();
+            UpdateLayout();
+            this.Invalidate();
+            base.OnResize(e);
+        }
+
+        protected override void OnGotFocus(EventArgs e)
+        {
+            _MaskedTextBox.Focus();
+            base.OnGotFocus(e);
+        }
+
+        protected override void OnRightToLeftChanged(EventArgs e)
+        {
+            _ButtonGroup.InvalidateArrange();
+            UpdateLayout();
+            this.Invalidate();
+            base.OnRightToLeftChanged(e);
+        }
+
+        protected override void OnFontChanged(EventArgs e)
+        {
+            _ButtonGroup.InvalidateArrange();
+            UpdateLayout();
+            this.Invalidate();
+            base.OnFontChanged(e);
+        }
+
+        private void UpdateLayout()
+        {
+            using(Graphics g = BarFunctions.CreateGraphics(this))
+                UpdateLayout(CreatePaintInfo(g));
+        }
+
+        private bool _InternalSizeUpdate = false;
+        private void UpdateLayout(PaintInfo p)
+        {
+            if (_InternalSizeUpdate) return;
+
+            _InternalSizeUpdate = true;
+
+            try
+            {
+                if (!_ButtonGroup.IsLayoutValid)
+                {
+                    _ButtonGroup.PerformLayout(p);
+                }
+
+                bool disposeStyle = false;
+                ElementStyle style = GetBackgroundStyle(out disposeStyle);
+                Rectangle maskedControlRect = ElementStyleLayout.GetInnerRect(style, this.ClientRectangle);
+                if (RenderButtons)
+                {
+                    Rectangle buttonsRect = GetButtonsRenderBounds(style);
+                    if (this.RightToLeft == RightToLeft.Yes)
+                    {
+                        maskedControlRect.X += buttonsRect.Right;
+                        maskedControlRect.Width -= buttonsRect.Right;
+                    }
+                    else
+                    {
+                        maskedControlRect.Width -= (maskedControlRect.Right - buttonsRect.X);
+                    }
+                }
+                if (_MaskedTextBox.PreferredHeight < maskedControlRect.Height)
+                {
+                    maskedControlRect.Y += (maskedControlRect.Height - _MaskedTextBox.PreferredHeight) / 2;
+                }
+                _MaskedTextBox.Bounds = maskedControlRect;
+
+                if(disposeStyle) style.Dispose();
+            }
+            finally
+            {
+                _InternalSizeUpdate = false;
+            }
+        }
+
+        private Control _PreviousDropDownControlParent = null;
+        private void DropDownButtonMouseDown(object sender, MouseEventArgs e)
+        {
+            if (e.Button != MouseButtons.Left || _CloseTime != DateTime.MinValue && DateTime.Now.Subtract(_CloseTime).TotalMilliseconds < 250)
+            {
+                _CloseTime = DateTime.MinValue;
+                return;
+            }
+
+            ShowDropDown();
+        }
+
+        private bool _ShowingPopup = false;
+        /// <summary>
+        /// Shows drop-down popup. Note that popup will be shown only if there is a DropDownControl assigned or DropDownItems collection has at least one item.
+        /// </summary>
+        public void ShowDropDown()
+        {
+
+            if (_DropDownControl == null && _PopupItem.SubItems.Count == 0 || _ShowingPopup || _PopupItem.Expanded)
+                return;
+
+            _ShowingPopup = true;
+            try
+            {
+                ControlContainerItem cc = null;
+                ItemContainer ic = null;
+                if (_DropDownControl != null)
+                {
+                    ic = new ItemContainer();
+                    ic.Name = _DropDownItemContainerName;
+                    cc = new ControlContainerItem(_DropDownControlContainerName);
+                    ic.SubItems.Add(cc);
+                    _PopupItem.SubItems.Insert(0, ic);
+                }
+
+                CancelEventArgs cancelArgs = new CancelEventArgs();
+                OnButtonDropDownClick(cancelArgs);
+                if (cancelArgs.Cancel || _PopupItem.SubItems.Count == 0)
+                {
+                    if (ic != null)
+                        _PopupItem.SubItems.Remove(ic);
+                    return;
+                }
+
+                if (_DropDownControl != null)
+                {
+                    _PreviousDropDownControlParent = _DropDownControl.Parent;
+                    cc.Control = _DropDownControl;
+                }
+
+                _PopupItem.SetDisplayRectangle(this.ClientRectangle);
+                if (this.RightToLeft == RightToLeft.No)
+                {
+                    Point pl = new Point(this.Width - _PopupItem.PopupSize.Width, this.Height);
+                    ScreenInformation screen = BarFunctions.ScreenFromControl(this);
+                    Point ps = PointToScreen(pl);
+                    if (screen != null && screen.WorkingArea.X > ps.X)
+                    {
+                        pl.X = 0;
+                    }
+                    _PopupItem.PopupLocation = pl;
+                }
+
+                _PopupItem.Expanded = !_PopupItem.Expanded;
+            }
+            finally
+            {
+                _ShowingPopup = false;
+            }
+        }
+
+        /// <summary>
+        /// Closes the drop-down popup if it is open.
+        /// </summary>
+        public void CloseDropDown()
+        {
+            if (_PopupItem.Expanded) _PopupItem.Expanded = false;
+        }
+
+        private DateTime _CloseTime = DateTime.MinValue;
+        private void DropDownPopupClose(object sender, EventArgs e)
+        {
+            _CloseTime = DateTime.Now;
+            if (_PopupItem.SubItems.Contains(_DropDownItemContainerName))
+            {
+                ItemContainer ic = _PopupItem.SubItems[_DropDownItemContainerName] as ItemContainer;
+                if (ic != null)
+                {
+                    ControlContainerItem cc = ic.SubItems[_DropDownControlContainerName] as ControlContainerItem;
+                    if (cc != null)
+                    {
+                        cc.Control = null;
+                        ic.SubItems.Remove(cc);
+                        if (_DropDownControl != null)
+                        {
+                            _DropDownControl.Parent = _PreviousDropDownControlParent;
+                            _PreviousDropDownControlParent = null;
+                        }
+                    }
+                    _PopupItem.SubItems.Remove(ic);
+                }
+            }
+        }
+
+        private void ClearButtonClick(object sender, EventArgs e)
+        {
+            CancelEventArgs cancelArgs = new CancelEventArgs();
+            OnButtonClearClick(cancelArgs);
+            if (cancelArgs.Cancel) return;
+
+            _MaskedTextBox.Text = "";
+        }
+
+        /// <summary>
+        /// Raises the ButtonClearClick event.
+        /// </summary>
+        /// <param name="e"></param>
+        protected virtual void OnButtonClearClick(CancelEventArgs e)
+        {
+            if (ButtonClearClick != null)
+                ButtonClearClick(this, e);
+        }
+
+        /// <summary>
+        /// Raises the ButtonDropDownClick event.
+        /// </summary>
+        /// <param name="e"></param>
+        protected virtual void OnButtonDropDownClick(CancelEventArgs e)
+        {
+            if (ButtonDropDownClick != null)
+                ButtonDropDownClick(this, e);
+        }
+
+        private Control _DropDownControl = null;
+        /// <summary>
+        /// Gets or sets the reference of the control that will be displayed on popup that is shown when drop-down button is clicked.
+        /// </summary>
+        [DefaultValue(null), Description("Indicates reference of the control that will be displayed on popup that is shown when drop-down button is clicked.")]
+        public Control DropDownControl
+        {
+            get { return _DropDownControl; }
+            set
+            {
+                _DropDownControl = value;
+            }
+        }
+
+        protected override PopupItem CreatePopupItem()
+        {
+            ButtonItem button = new ButtonItem("sysPopupProvider");
+            button.PopupFinalized += new EventHandler(DropDownPopupClose);
+            _PopupItem = button;
+            return button;
+        }
+
+        /// <summary>
+        /// Gets the collection of BaseItem derived items displayed on popup menu.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public SubItemsCollection DropDownItems
+        {
+            get { return _PopupItem.SubItems; }
+        }
+
+        protected override void RecalcSize()
+        {
+        }
+
+        public override void PerformClick()
+        {
+        }
+
+        private bool RenderButtons
+        {
+            get
+            {
+                return _ButtonCustom != null && _ButtonCustom.Visible || _ButtonCustom2 != null && _ButtonCustom2.Visible ||
+                    _ButtonDropDown != null && _ButtonDropDown.Visible || _ButtonClear != null && _ButtonClear.Visible;
+            }
+        }
+
+        protected override void OnMouseMove(MouseEventArgs e)
+        {
+            if (RenderButtons)
+            {
+                _ButtonGroup.ProcessMouseMove(e);
+            }
+            base.OnMouseMove(e);
+        }
+        protected override void OnMouseHover(EventArgs e)
+        {
+            if (RenderButtons)
+            {
+                _ButtonGroup.ProcessMouseHover(e);
+            }
+            base.OnMouseHover(e);
+        }
+        protected override void OnMouseLeave(EventArgs e)
+        {
+            if (RenderButtons)
+            {
+                _ButtonGroup.ProcessMouseLeave();
+            }
+            base.OnMouseLeave(e);
+        }
+        protected override void OnMouseDown(MouseEventArgs e)
+        {
+            if (RenderButtons)
+                _ButtonGroup.ProcessMouseDown(e);
+            base.OnMouseDown(e);
+        }
+        protected override void OnMouseUp(MouseEventArgs e)
+        {
+            if (RenderButtons)
+                _ButtonGroup.ProcessMouseUp(e);
+            base.OnMouseUp(e);
+        }
+
+        protected override void OnForeColorChanged(EventArgs e)
+        {
+            if (_MaskedTextBox != null) _MaskedTextBox.ForeColor = this.ForeColor;
+            base.OnForeColorChanged(e);
+        }
+
+        /// <summary>
+        /// Gets the reference to internal MaskedTextBox control.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public MaskedTextBox MaskedTextBox
+        {
+            get
+            {
+                return _MaskedTextBox;
+            }
+        }
+
+        private bool _WatermarkEnabled = true;
+        /// <summary>
+        /// Gets or sets whether watermark text is displayed when control is empty. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Description("Indicates whether watermark text is displayed when control is empty.")]
+        public virtual bool WatermarkEnabled
+        {
+            get { return _WatermarkEnabled; }
+            set { _WatermarkEnabled = value; this.Invalidate(true); }
+        }
+
+        /// <summary>
+        /// Gets or sets the watermark (tip) text displayed inside of the control when Text is not set and control does not have input focus. This property supports text-markup.
+        /// </summary>
+        [Browsable(true), DefaultValue(""), Localizable(true), Category("Appearance"), Description("Indicates watermark text displayed inside of the control when Text is not set and control does not have input focus."), Editor("DevComponents.DotNetBar.Design.TextMarkupUIEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor))]
+        public string WatermarkText
+        {
+            get { return _WatermarkText; }
+            set
+            {
+                if (value == null) value = "";
+                _WatermarkText = value;
+                MarkupTextChanged();
+                this.Invalidate(true);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the watermark font.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), Description("Indicates watermark font."), DefaultValue(null)]
+        public Font WatermarkFont
+        {
+            get { return _WatermarkFont; }
+            set { _WatermarkFont = value; this.Invalidate(true); }
+        }
+
+        /// <summary>
+        /// Gets or sets the watermark text color.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), Description("Indicates watermark text color.")]
+        public Color WatermarkColor
+        {
+            get { return _WatermarkColor; }
+            set { _WatermarkColor = value; this.Invalidate(); }
+        }
+        /// <summary>
+        /// Indicates whether property should be serialized by Windows Forms designer.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeWatermarkColor()
+        {
+            return _WatermarkColor != SystemColors.GrayText;
+        }
+        /// <summary>
+        /// Resets the property to default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetWatermarkColor()
+        {
+            this.WatermarkColor = SystemColors.GrayText;
+        }
+
+        private eWatermarkBehavior _WatermarkBehavior = eWatermarkBehavior.HideOnFocus;
+        /// <summary>
+        /// Gets or sets the watermark hiding behaviour. Default value indicates that watermark is hidden when control receives input focus.
+        /// </summary>
+        [DefaultValue(eWatermarkBehavior.HideOnFocus), Category("Behavior"), Description("Indicates watermark hiding behaviour.")]
+        public eWatermarkBehavior WatermarkBehavior
+        {
+            get { return _WatermarkBehavior; }
+            set { _WatermarkBehavior = value; this.Invalidate(); }
+        }
+
+        private TextMarkup.BodyElement _TextMarkup = null;
+        private void MarkupTextChanged()
+        {
+            _TextMarkup = null;
+
+            if (!TextMarkup.MarkupParser.IsMarkup(ref _WatermarkText))
+                return;
+
+            _TextMarkup = TextMarkup.MarkupParser.Parse(_WatermarkText);
+            ResizeMarkup();
+        }
+
+        private void ResizeMarkup()
+        {
+            if (_TextMarkup != null)
+            {
+                using (Graphics g = this.CreateGraphics())
+                {
+                    MarkupDrawContext dc = GetMarkupDrawContext(g);
+                    _TextMarkup.Measure(GetWatermarkBounds().Size, dc);
+                    Size sz = _TextMarkup.Bounds.Size;
+                    _TextMarkup.Arrange(new Rectangle(GetWatermarkBounds().Location, sz), dc);
+                }
+            }
+        }
+
+        private Rectangle GetWatermarkBounds()
+        {
+            Rectangle r = this.ClientRectangle;
+            r.Inflate(-1, 0);
+            return r;
+        }
+
+        private MarkupDrawContext GetMarkupDrawContext(Graphics g)
+        {
+            return new MarkupDrawContext(g, (_WatermarkFont == null ? this.Font : _WatermarkFont), _WatermarkColor, this.RightToLeft == RightToLeft.Yes);
+        }
+        #endregion
+
+        #region Masked Edit Property Forwarding
+        /// <summary>
+        /// Gets or sets a value indicating whether PromptChar can be entered as valid data by the user. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether PromptChar can be entered as valid data by the user")]
+        public bool AllowPromptAsInput
+        {
+            get
+            {
+                return _MaskedTextBox.AllowPromptAsInput;
+            }
+            set
+            {
+                _MaskedTextBox.AllowPromptAsInput=value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the MaskedTextBox control accepts characters outside of the ASCII character set.
+        /// <remarks>true if only ASCII is accepted; false if the MaskedTextBox control can accept any arbitrary Unicode character. The default is false.</remarks>
+        /// </summary>
+        [DefaultValue(false), Category("Behavior"), Description("Indicates whether the MaskedTextBox control accepts characters outside of the ASCII character set"), RefreshProperties(RefreshProperties.Repaint)]
+        public bool AsciiOnly
+        {
+            get
+            {
+                return _MaskedTextBox.AsciiOnly;
+            }
+            set
+            {
+                _MaskedTextBox.AsciiOnly = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the masked text box control raises the system beep for each user key stroke that it rejects.
+        /// </summary>
+        [Description("Indicates whether the masked text box control raises the system beep for each user key stroke that it rejects"), DefaultValue(false), Category("Behavior")]
+        public bool BeepOnError
+        {
+            get
+            {
+                return _MaskedTextBox.BeepOnError;
+            }
+            set
+            {
+                _MaskedTextBox.BeepOnError = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the culture information associated with the masked text box.
+        /// </summary>
+        [Description("Indicates culture information associated with the masked text box."), Category("Behavior"), RefreshProperties(RefreshProperties.Repaint)]
+        public CultureInfo Culture
+        {
+            get
+            {
+                return _MaskedTextBox.Culture;
+            }
+            set
+            {
+                _MaskedTextBox.Culture = value;
+            }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized by Windows Forms designer.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeCulture()
+        {
+            return !CultureInfo.CurrentCulture.Equals(this.Culture);
+        }
+
+        /// <summary>
+        /// Gets or sets a value that determines whether literals and prompt characters are copied to the clipboard.
+        /// </summary>
+        [DefaultValue(2), Category("Behavior"), Description("Indicates a value that determines whether literals and prompt characters are copied to the clipboard"), RefreshProperties(RefreshProperties.Repaint)]
+        public MaskFormat CutCopyMaskFormat
+        {
+            get { return _MaskedTextBox.CutCopyMaskFormat; }
+            set
+            {
+                _MaskedTextBox.CutCopyMaskFormat = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the IFormatProvider to use when performing type validation.
+        /// </summary>
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), Browsable(false)]
+        public IFormatProvider FormatProvider
+        {
+            get
+            {
+                return _MaskedTextBox.FormatProvider;
+            }
+            set
+            {
+                _MaskedTextBox.FormatProvider = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the prompt characters in the input mask are hidden when the masked text box loses focus.
+        /// </summary>
+        [Description("Indicates whether the prompt characters in the input mask are hidden when the masked text box loses focus."), RefreshProperties(RefreshProperties.Repaint), DefaultValue(false), Category("Behavior")]
+        public bool HidePromptOnLeave
+        {
+            get
+            {
+                return _MaskedTextBox.HidePromptOnLeave;
+            }
+            set
+            {
+                _MaskedTextBox.HidePromptOnLeave = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the text insertion mode of the masked text box control.
+        /// </summary>
+        [DefaultValue(0), Description("Indicates text insertion mode of the masked text box control."), Category("Behavior")]
+        public InsertKeyMode InsertKeyMode
+        {
+            get
+            {
+                return _MaskedTextBox.InsertKeyMode;
+            }
+            set
+            {
+                _MaskedTextBox.InsertKeyMode = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the input mask to use at run time. The default value is the empty string which allows any input
+        /// </summary>
+        [RefreshProperties(RefreshProperties.Repaint), Editor("DevComponents.DotNetBar.Design.MaskAdvPropertyEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(UITypeEditor)), Description("Indicates input mask to use at run time."), MergableProperty(false), Category("Behavior"), DefaultValue(""), Localizable(true)]
+        public string Mask
+        {
+            get
+            {
+                return _MaskedTextBox.Mask;
+            }
+            set
+            {
+                _MaskedTextBox.Mask = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether all required inputs have been entered into the input mask. Returns true if all required input has been entered into the mask; otherwise, false.
+        /// </summary>
+        [Browsable(false)]
+        public bool MaskCompleted
+        {
+            get
+            {
+                return _MaskedTextBox.MaskCompleted;
+            }
+        }
+
+        /// <summary>
+        /// Gets a clone of the mask provider associated with this instance of the masked text box control. Returns masking language provider of type MaskedTextProvider.
+        /// </summary>
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), Browsable(false)]
+        public MaskedTextProvider MaskedTextProvider
+        {
+            get
+            {
+                return _MaskedTextBox.MaskedTextProvider;
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether all required and optional inputs have been entered into the input mask. Returns true if all required and optional inputs have been entered; otherwise, false. 
+        /// </summary>
+        [Browsable(false)]
+        public bool MaskFull
+        {
+            get
+            {
+                return _MaskedTextBox.MaskFull;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the character to be displayed in substitute for user input.
+        /// </summary>
+        [DefaultValue('\0'), Category("Behavior"), RefreshProperties(RefreshProperties.Repaint), Description("Indicates character to be displayed in substitute for user input.")]
+        public char PasswordChar
+        {
+            get
+            {
+                return _MaskedTextBox.PasswordChar;
+            }
+            set
+            {
+                _MaskedTextBox.PasswordChar = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the character used to represent the absence of user input in MaskedTextBox. Returns character used to prompt the user for input. The default is an underscore (_). 
+        /// </summary>
+        [Category("Appearance"), Localizable(true), DefaultValue('_'), RefreshProperties(RefreshProperties.Repaint), Description("Indicates character used to represent the absence of user input in MaskedTextBox.")]
+        public char PromptChar
+        {
+            get
+            {
+                return _MaskedTextBox.PromptChar;
+            }
+            set
+            {
+                _MaskedTextBox.PromptChar = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether text in control is read only. Default value is false.
+        /// </summary>
+        [DefaultValue(false), Description("Indicates whether text in control is read only."), Category("Behavior")]
+        public bool ReadOnly
+        {
+            get
+            {
+                return _MaskedTextBox.ReadOnly;
+            }
+            set
+            {
+                _MaskedTextBox.ReadOnly = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the parsing of user input should stop after the first invalid character is reached. Returns true if processing of the input string should be terminated at the first parsing error; otherwise, false if processing should ignore all errors. The default is false.
+        /// </summary>
+        [Description("Indicates whether the parsing of user input should stop after the first invalid character is reached."), DefaultValue(false), Category("Behavior")]
+        public bool RejectInputOnFirstFailure
+        {
+            get
+            {
+                return _MaskedTextBox.RejectInputOnFirstFailure;
+            }
+            set
+            {
+                _MaskedTextBox.RejectInputOnFirstFailure = value;
+            }
+        }
+
+
+        /// <summary>
+        /// Gets or sets a value that determines how an input character that matches the prompt character should be handled. Returns true if the prompt character entered as input causes the current editable position in the mask to be reset; otherwise, false to indicate that the prompt character is to be processed as a normal input character. The default is true.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates value that determines how an input character that matches the prompt character should be handled.")]
+        public bool ResetOnPrompt
+        {
+            get
+            {
+                return _MaskedTextBox.ResetOnPrompt;
+            }
+            set
+            {
+                _MaskedTextBox.ResetOnPrompt = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value that determines how a space input character should be handled. Returns true if the space input character causes the current editable position in the mask to be reset; otherwise, false to indicate that it is to be processed as a normal input character. The default is true.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates value that determines how a space input character should be handled.")]
+        public bool ResetOnSpace
+        {
+            get
+            {
+                return _MaskedTextBox.ResetOnSpace;
+            }
+            set
+            {
+                _MaskedTextBox.ResetOnSpace = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating the currently selected text in the control.
+        /// </summary>
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), Browsable(false)]
+        public virtual string SelectedText
+        {
+            get
+            {
+                return _MaskedTextBox.SelectedText;
+            }
+            set
+            {
+                _MaskedTextBox.SelectedText = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the number of characters selected in the text box.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public virtual int SelectionLength
+        {
+            get
+            {
+                return _MaskedTextBox.SelectionLength;
+            }
+            set
+            {
+                _MaskedTextBox.SelectionLength = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the starting point of text selected in the text box.
+        /// </summary>
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), Browsable(false)]
+        public int SelectionStart
+        {
+            get
+            {
+                return _MaskedTextBox.SelectionStart;
+            }
+            set
+            {
+                _MaskedTextBox.SelectionStart = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the defined shortcuts are enabled.
+        /// </summary>
+        [Description("Indicates whether the defined shortcuts are enabled."), Category("Behavior"), DefaultValue(true)]
+        public virtual bool ShortcutsEnabled
+        {
+            get
+            {
+                return _MaskedTextBox.ShortcutsEnabled;
+            }
+            set
+            {
+                _MaskedTextBox.ShortcutsEnabled = value;
+            }
+        }
+ 
+        [Description("MaskedTextBoxSkipLiterals"), Category("CatBehavior"), DefaultValue(true)]
+        public bool SkipLiterals
+        {
+            get
+            {
+                return _MaskedTextBox.SkipLiterals;
+            }
+            set
+            {
+                _MaskedTextBox.SkipLiterals = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the text as it is currently displayed to the user. 
+        /// </summary>
+        [Category("Appearance"), DefaultValue("Indicates text as it is currently displayed to the user"), Bindable(true), RefreshProperties(RefreshProperties.Repaint), Editor("System.Windows.Forms.Design.MaskedTextBoxTextEditor, System.Design, Version= 2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", typeof(UITypeEditor)), Localizable(true)]
+        public override string Text
+        {
+            get
+            {
+                return base.Text;
+            }
+            set
+            {
+                _MaskedTextBox.Text = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets how text is aligned in a masked text box control.
+        /// </summary>
+        [DefaultValue(0), Localizable(true), Description("Indicates how text is aligned in a masked text box control."), Category("Appearance")]
+        public HorizontalAlignment TextAlign
+        {
+            get
+            {
+                return _MaskedTextBox.TextAlign;
+            }
+            set
+            {
+                _MaskedTextBox.TextAlign = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the length of the displayed text. 
+        /// </summary>
+        [Browsable(false)]
+        public virtual int TextLength
+        {
+            get
+            {
+                return _MaskedTextBox.TextLength;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value that determines whether literals and prompt characters are included in the formatted string.
+        /// </summary>
+        [Category("Behavior"), RefreshProperties(RefreshProperties.Repaint), DefaultValue(2), Description("Indicates a value that determines whether literals and prompt characters are included in the formatted string.")]
+        public MaskFormat TextMaskFormat
+        {
+            get
+            {
+                return _MaskedTextBox.TextMaskFormat;
+            }
+            set
+            {
+                _MaskedTextBox.TextMaskFormat = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the operating system-supplied password character should be used.
+        /// </summary>
+        [DefaultValue(false), RefreshProperties(RefreshProperties.Repaint), Category("Behavior"), Description("Indicates whether the operating system-supplied password character should be used")]
+        public bool UseSystemPasswordChar
+        {
+            get
+            {
+                return _MaskedTextBox.UseSystemPasswordChar;
+            }
+            set
+            {
+                _MaskedTextBox.UseSystemPasswordChar = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the data type used to verify the data input by the user. Returns Type representing the data type used in validation. The default is null.
+        /// </summary>
+        [DefaultValue((string)null), Browsable(false)]
+        public Type ValidatingType
+        {
+            get
+            {
+                return _MaskedTextBox.ValidatingType;
+            }
+            set
+            {
+                _MaskedTextBox.ValidatingType = value;
+            }
+        }
+
+        /// <summary>
+        /// Converts the user input string to an instance of the validating type.
+        /// </summary>
+        /// <returns>If successful, an Object of the type specified by the ValidatingType property; otherwise, null to indicate conversion failure.</returns>
+        public object ValidateText()
+        {
+            return _MaskedTextBox.ValidateText();
+        }
+
+        /// <summary>
+        /// Returns a string that represents the current masked text box. This method overrides ToString.
+        /// </summary>
+        /// <returns>A String that contains information about the current MaskedTextBox. The string includes the type, a simplified view of the input string, and the formatted input string.</returns>
+        public override string ToString()
+        {
+            return _MaskedTextBox.ToString();
+        }
+
+        /// <summary>
+        /// Gets the preferred height for a masked text box. 
+        /// </summary>
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), Browsable(false), EditorBrowsable(EditorBrowsableState.Advanced)]
+        public int PreferredHeight
+        {
+            get
+            {
+                int height = _MaskedTextBox.PreferredHeight;
+                bool disposeStyle = false;
+                ElementStyle style = GetBackgroundStyle(out disposeStyle);
+                height += ElementStyleLayout.VerticalStyleWhiteSpace(style);
+                if (disposeStyle)
+                {
+                    style.Dispose();
+                }
+                return height;
+            }
+        }
+
+        public override Size  GetPreferredSize(Size proposedSize)
+        {
+            Size ps = _MaskedTextBox.GetPreferredSize(proposedSize);
+            ps.Height = PreferredHeight;
+ 	        return ps;
+        }
+        #endregion
+
+        #region Masked Edit Custom
+        private class MaskedTextBoxInternal : MaskedTextBox
+        {
+            private bool _IgnoreFocus = false;
+            private bool _Focused = false;
+            private Color _LastBackColor = Color.Empty;
+
+            private bool RenderWatermark
+            {
+                get
+                {
+                    MaskedTextBoxAdv parent = MaskedTextBoxAdv;
+                    if (parent == null) return false;
+
+                    if (!parent.WatermarkEnabled)
+                        return false;
+                    if (parent.WatermarkBehavior == eWatermarkBehavior.HideOnFocus)
+                        return !_Focused && this.Enabled && this.Text != null && this.Text.Length == 0 && parent.WatermarkText.Length > 0;
+                    else
+                        return this.Enabled && this.Text != null && this.Text.Length == 0 && parent.WatermarkText.Length > 0;
+                }
+            }
+
+            private void DrawWatermark()
+            {
+                MaskedTextBoxAdv parent = MaskedTextBoxAdv;
+                if (parent == null) return;
+
+                using (Graphics g = this.CreateGraphics())
+                {
+                    if (parent._TextMarkup != null)
+                    {
+                        MarkupDrawContext dc = parent.GetMarkupDrawContext(g);
+                        parent._TextMarkup.Render(dc);
+                    }
+                    else
+                    {
+                        eTextFormat format = eTextFormat.Left;
+
+                        if (this.RightToLeft == RightToLeft.Yes) format |= eTextFormat.RightToLeft;
+                        if (this.TextAlign == HorizontalAlignment.Left)
+                            format |= eTextFormat.Left;
+                        else if (this.TextAlign == HorizontalAlignment.Right)
+                            format |= eTextFormat.Right;
+                        else if (this.TextAlign == HorizontalAlignment.Center)
+                            format |= eTextFormat.HorizontalCenter;
+                        format |= eTextFormat.EndEllipsis;
+                        format |= eTextFormat.WordBreak;
+                        TextDrawing.DrawString(g, parent.WatermarkText, (parent.WatermarkFont == null ? this.Font : parent.WatermarkFont),
+                            parent.WatermarkColor, parent.GetWatermarkBounds(), format);
+                    }
+                }
+            }
+
+            protected override void OnTextChanged(EventArgs e)
+            {
+                base.OnTextChanged(e);
+
+                MaskedTextBoxAdv parent = MaskedTextBoxAdv;
+                if (parent == null) return;
+                if (parent.WatermarkText.Length > 0)
+                    this.Invalidate();
+            }
+
+            protected override void WndProc(ref Message m)
+            {
+                base.WndProc(ref m);
+                MaskedTextBoxAdv parent = MaskedTextBoxAdv;
+                if (parent == null) return;
+
+                switch (m.Msg)
+                {
+                    //case (int)WinApi.WindowsMessages.WM_NCPAINT:
+                    //    {
+                    //        if (!this.Enabled && this.Parent is MaskedTextBoxAdv && !((MaskedTextBoxAdv)this.Parent).DisabledBackColor.IsEmpty)
+                    //        {
+                    //            Rectangle r = this.ClientRectangle;
+                    //            IntPtr dc = WinApi.GetWindowDC(this.Handle);
+                    //            try
+                    //            {
+                    //                using (Graphics g = Graphics.FromHdc(dc))
+                    //                {
+                    //                    using (SolidBrush brush = new SolidBrush(this.BackColor))
+                    //                        g.FillRectangle(brush, 0, 0, this.Width, this.Height);
+                    //                }
+                    //            }
+                    //            finally
+                    //            {
+                    //                WinApi.ReleaseDC(this.Handle, dc);
+                    //            }
+                    //        }
+                    //        break;
+                    //    }
+                    case (int)WinApi.WindowsMessages.WM_SETFOCUS:
+                        {
+                            if (_IgnoreFocus)
+                            {
+                                _IgnoreFocus = false;
+                            }
+                            else
+                            {
+                                _Focused = true;
+                                if (parent.FocusHighlightEnabled && this.Enabled)
+                                {
+                                    _LastBackColor = this.BackColor;
+                                    this.BackColor = parent.FocusHighlightColor;
+                                    parent.BackColor = parent.FocusHighlightColor;
+                                    parent.Invalidate(true);
+                                }
+                            }
+                            break;
+                        }
+                    case (int)WinApi.WindowsMessages.WM_KILLFOCUS:
+                        {
+                            if (!_Focused)
+                            {
+                                _IgnoreFocus = true;
+                            }
+                            else
+                            {
+                                _Focused = false;
+                                if (this.Text == null || this.Text.Length == 0)
+                                    parent.Invalidate(true);
+                                if (parent.FocusHighlightEnabled && !_LastBackColor.IsEmpty)
+                                {
+                                    this.BackColor = _LastBackColor;
+                                    parent.BackColor = _LastBackColor;
+                                    parent.Invalidate(true);
+                                }
+                            }
+                            break;
+                        }
+                    case (int)WinApi.WindowsMessages.WM_PAINT:
+                        {
+                            if (RenderWatermark)
+                                DrawWatermark();
+                            break;
+                        }
+                }
+            }
+
+            private MaskedTextBoxAdv MaskedTextBoxAdv
+            {
+                get
+                {
+                    return Parent as MaskedTextBoxAdv;
+                }
+            }
+        }
+        #endregion
+
+        #region ICommandSource Members
+        protected virtual void ExecuteCommand()
+        {
+            if (_Command == null) return;
+            CommandManager.ExecuteCommand(this);
+        }
+
+        /// <summary>
+        /// Gets or sets the command assigned to the item. Default value is null.
+        /// <remarks>Note that if this property is set to null Enabled property will be set to false automatically to disable the item.</remarks>
+        /// </summary>
+        [DefaultValue(null), Category("Commands"), Description("Indicates the command assigned to the item.")]
+        public Command Command
+        {
+            get { return (Command)((ICommandSource)this).Command; }
+            set
+            {
+                ((ICommandSource)this).Command = value;
+            }
+        }
+
+        private ICommand _Command = null;
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        ICommand ICommandSource.Command
+        {
+            get
+            {
+                return _Command;
+            }
+            set
+            {
+                bool changed = false;
+                if (_Command != value)
+                    changed = true;
+
+                if (_Command != null)
+                    CommandManager.UnRegisterCommandSource(this, _Command);
+                _Command = value;
+                if (value != null)
+                    CommandManager.RegisterCommand(this, value);
+                if (changed)
+                    OnCommandChanged();
+            }
+        }
+
+        /// <summary>
+        /// Called when Command property value changes.
+        /// </summary>
+        protected virtual void OnCommandChanged()
+        {
+        }
+
+        private object _CommandParameter = null;
+        /// <summary>
+        /// Gets or sets user defined data value that can be passed to the command when it is executed.
+        /// </summary>
+        [Browsable(true), DefaultValue(null), Category("Commands"), Description("Indicates user defined data value that can be passed to the command when it is executed."), System.ComponentModel.TypeConverter(typeof(System.ComponentModel.StringConverter)), System.ComponentModel.Localizable(true)]
+        public object CommandParameter
+        {
+            get
+            {
+                return _CommandParameter;
+            }
+            set
+            {
+                _CommandParameter = value;
+            }
+        }
+
+        #endregion
+    }
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/Controls/MaskedTextBoxAdv.ico b/PROMS/DotNetBar Source Code/Controls/MaskedTextBoxAdv.ico
new file mode 100644
index 00000000..47ebea51
Binary files /dev/null and b/PROMS/DotNetBar Source Code/Controls/MaskedTextBoxAdv.ico differ
diff --git a/PROMS/DotNetBar Source Code/Controls/NonClientHook.cs b/PROMS/DotNetBar Source Code/Controls/NonClientHook.cs
new file mode 100644
index 00000000..b71f6cda
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/NonClientHook.cs	
@@ -0,0 +1,249 @@
+using System;
+using System.Windows.Forms;
+using System.Collections;
+using System.Threading;
+using System.Drawing;
+using System.Runtime.InteropServices;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Summary description for MessageHandler.
+    /// </summary>
+    internal class NonClientHook
+    {
+        private static ArrayList m_Clients = new ArrayList();
+        private static Hashtable m_FilterOnThread = new Hashtable();
+        private static ReaderWriterLock rwClientsListLock;
+        private static MouseProc m_MouseHook = null;
+
+        private delegate IntPtr MouseProc(int nCode, IntPtr wParam, IntPtr lParam);
+
+        [DllImport("user32.dll", CharSet = CharSet.Auto, SetLastError = true)]
+        private static extern IntPtr SetWindowsHookEx(int hookid, MouseProc pfnhook, IntPtr hinst, int threadid);
+
+        //[DllImport("user32.dll", CharSet = CharSet.Auto, SetLastError = true, EntryPoint = "SetWindowsHookEx")]
+        //private static extern IntPtr SetWindowsHookExKeyboard(int hookid, KeyboardProc pfnhook, IntPtr hinst, int threadid);
+
+        [DllImport("user32.dll", ExactSpelling = true, CharSet = CharSet.Auto)]
+        private static extern bool UnhookWindowsHookEx(IntPtr hhook);
+
+        [DllImport("user32.dll", ExactSpelling = true, CharSet = CharSet.Auto)]
+        private static extern IntPtr CallNextHookEx(IntPtr hhook, int code, IntPtr wparam, IntPtr lparam);
+        [DllImport("kernel32.dll", ExactSpelling = true, CharSet = CharSet.Auto)]
+        private static extern int GetCurrentThreadId();
+
+        private const int WH_MOUSE = 7;
+        private const int HC_ACTION = 0;
+        private const int WH_CALLWNDPROCRET = 12;
+        private const int WH_CALLWNDPROC = 4;
+
+        // Methods
+        static NonClientHook()
+        {
+            NonClientHook.rwClientsListLock = new ReaderWriterLock();
+            m_MouseHook = new MouseProc(OnMouseHook);
+        }
+
+        public static void RegisterHook(ISkinHook client)
+        {
+            if (m_Clients.Contains(client))
+                return;
+
+            if (!m_FilterOnThread.ContainsKey(System.Threading.Thread.CurrentThread.GetHashCode()))
+                HookThread();
+
+            LockCookie cookie1 = new LockCookie();
+            bool readerLockHeld = NonClientHook.rwClientsListLock.IsReaderLockHeld;
+
+            if (readerLockHeld)
+            {
+                cookie1 = NonClientHook.rwClientsListLock.UpgradeToWriterLock(-1);
+            }
+            else
+            {
+                NonClientHook.rwClientsListLock.AcquireWriterLock(-1);
+            }
+
+            try
+            {
+                m_Clients.Add(client);
+            }
+            finally
+            {
+                if (readerLockHeld)
+                {
+                    NonClientHook.rwClientsListLock.DowngradeFromWriterLock(ref cookie1);
+                }
+                else
+                {
+                    NonClientHook.rwClientsListLock.ReleaseWriterLock();
+                }
+            }
+        }
+
+        public static void UnregisterHook(ISkinHook client)
+        {
+            if (m_Clients.Contains(client))
+            {
+                LockCookie cookie1 = new LockCookie();
+                bool readerLockHeld = NonClientHook.rwClientsListLock.IsReaderLockHeld;
+
+                if (readerLockHeld)
+                {
+                    cookie1 = NonClientHook.rwClientsListLock.UpgradeToWriterLock(-1);
+                }
+                else
+                {
+                    NonClientHook.rwClientsListLock.AcquireWriterLock(-1);
+                }
+
+                try
+                {
+                    m_Clients.Remove(client);
+                    if (m_Clients.Count == 0)
+                        UnHookThread();
+                }
+                finally
+                {
+                    if (readerLockHeld)
+                    {
+                        NonClientHook.rwClientsListLock.DowngradeFromWriterLock(ref cookie1);
+                    }
+                    else
+                    {
+                        NonClientHook.rwClientsListLock.ReleaseWriterLock();
+                    }
+                }
+            }
+        }
+
+        private static void HookThread()
+        {
+            if (m_FilterOnThread.ContainsKey(System.Threading.Thread.CurrentThread.GetHashCode()))
+                return;
+
+            int id = GetCurrentThreadId();
+            IntPtr hook = SetWindowsHookEx(WH_MOUSE, m_MouseHook, IntPtr.Zero, id);
+            m_FilterOnThread.Add(System.Threading.Thread.CurrentThread.GetHashCode(), hook);
+        }
+
+        private static void UnHookThread()
+        {
+            if (!m_FilterOnThread.ContainsKey(System.Threading.Thread.CurrentThread.GetHashCode()))
+                return;
+            IntPtr hook = (IntPtr)m_FilterOnThread[System.Threading.Thread.CurrentThread.GetHashCode()];
+            UnhookWindowsHookEx(hook);
+            m_FilterOnThread.Remove(System.Threading.Thread.CurrentThread.GetHashCode());
+        }
+
+        private static ISkinHook[] GetMessageClients()
+        {
+            ISkinHook[] messageClients;
+            NonClientHook.rwClientsListLock.AcquireReaderLock(-1);
+            try
+            {
+                messageClients = (ISkinHook[])m_Clients.ToArray(typeof(ISkinHook));
+            }
+            finally
+            {
+                NonClientHook.rwClientsListLock.ReleaseReaderLock();
+            }
+
+            return messageClients;
+        }
+
+        private static unsafe IntPtr OnMouseHook(int nCode, IntPtr wParam, IntPtr lParam)
+        {
+            try
+            {
+                if (nCode == HC_ACTION)
+                {
+                    int wParamInt = WinApi.ToInt(wParam);
+                    if (wParamInt == (int)WinApi.WindowsMessages.WM_MOUSEMOVE)
+                    {
+                        MOUSEHOOKSTRUCT* ws = (MOUSEHOOKSTRUCT*)lParam;
+                        PostMouseMove(ws->hwnd, ws->pt.ToPoint());
+                    }
+                    if (wParamInt == (int)WinApi.WindowsMessages.WM_LBUTTONUP)
+                    {
+                        MOUSEHOOKSTRUCT* ws = (MOUSEHOOKSTRUCT*)lParam;
+                        PostMouseUp(ws->hwnd, ws->pt.ToPoint());
+                    }
+                    //CWPRETSTRUCT* ws = (CWPRETSTRUCT*)lParam;
+                    //if (ws->message == (uint)WinApi.WindowsMessages.WM_MOUSEMOVE || ws->message == 0x118)
+                    //{
+                    //    PostMouseMove(ws->hwnd, ws->wParam, ws->lParam);
+                    //}
+
+                }
+
+
+
+                IntPtr h = (IntPtr)m_FilterOnThread[System.Threading.Thread.CurrentThread.GetHashCode()];
+                IntPtr res = CallNextHookEx(h, nCode, wParam, lParam);
+
+                return res;
+            }
+            catch
+            { }
+            return IntPtr.Zero;
+        }
+
+        public static bool PostMouseMove(IntPtr hWnd, Point mousePos)
+        {
+            ISkinHook[] messageClients = GetMessageClients();
+            foreach (ISkinHook client in messageClients)
+            {
+                client.PostMouseMove(hWnd, mousePos);
+            }
+            return false;
+        }
+
+        public static bool PostMouseUp(IntPtr hWnd, Point mousePos)
+        {
+            ISkinHook[] messageClients = GetMessageClients();
+            foreach (ISkinHook client in messageClients)
+            {
+                client.PostMouseUp(hWnd, mousePos);
+            }
+            return false;
+        }
+
+        private struct POINT
+        {
+            public POINT(int x, int y)
+            {
+                this.x = x;
+                this.y = y;
+            }
+            public int x;
+            public int y;
+
+            public Point ToPoint()
+            {
+                return new Point(x, y);
+            }
+        }
+        private struct MOUSEHOOKSTRUCT
+        {
+            public MOUSEHOOKSTRUCT(POINT pt, IntPtr hwnd, ushort wHitTestCode, IntPtr dwExtraInfo)
+            {
+                this.pt = pt;
+                this.hwnd = hwnd;
+                this.wHitTestCode = wHitTestCode;
+                this.dwExtraInfo = dwExtraInfo;
+            }
+            public POINT pt;
+            public IntPtr hwnd;
+            public ushort wHitTestCode;
+            public IntPtr dwExtraInfo;
+        }
+    }
+
+    internal interface ISkinHook
+    {
+        void PostMouseMove(IntPtr hWnd, Point mousePos);
+        void PostMouseUp(IntPtr hWnd, Point mousePos);
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/NonClientPaintHandler.cs b/PROMS/DotNetBar Source Code/Controls/NonClientPaintHandler.cs
new file mode 100644
index 00000000..1917f63b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/NonClientPaintHandler.cs	
@@ -0,0 +1,1236 @@
+using System;
+using System.Text;
+using System.Windows.Forms;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Runtime.InteropServices;
+using DevComponents.DotNetBar.ScrollBar;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    internal class NonClientPaintHandler : ISkinHook
+    {
+        #region Private Variables
+        private INonClientControl m_Control = null;
+        private Rectangle m_ClientRectangle = Rectangle.Empty;
+        private ScrollBarCore m_VScrollBar = null;
+        private ScrollBarCore m_HScrollBar = null;
+        private const int HC_ACTION = 0;
+        private eScrollBarSkin m_SkinScrollbars = eScrollBarSkin.Optimized;
+        private bool m_SuspendPaint = false;
+        private bool m_IsVista = false;
+        private bool m_IsListView = false;
+        private bool m_IsAppScrollBarStyle = false;
+        #endregion
+
+        #region Events
+        public event CustomNCPaintEventHandler BeforeBorderPaint;
+        public event CustomNCPaintEventHandler AfterBorderPaint;
+        #endregion
+
+        #region Internal Implementation
+        public bool IsAppScrollBarStyle
+        {
+            get { return m_IsAppScrollBarStyle; }
+            set { m_IsAppScrollBarStyle = value; }
+        }
+
+        public NonClientPaintHandler(INonClientControl c, eScrollBarSkin skinScrollbars)
+        {
+            m_IsVista = System.Environment.OSVersion.Version.Major >= 6;
+            //#if DEBUG
+            //            m_IsVista = false;
+            //#endif
+            m_SkinScrollbars = skinScrollbars;
+            m_Control = c;
+            if (m_Control is Control)
+            {
+                ((Control)m_Control).HandleCreated += new EventHandler(Control_HandleCreated);
+                ((Control)m_Control).HandleDestroyed += new EventHandler(Control_HandleDestroyed);
+            }
+            m_IsListView = m_Control is ListView;
+            if (ShouldSkinScrollbars)
+            {
+                CreateScrollbars();
+            }
+            if (m_Control.IsHandleCreated && ShouldSkinScrollbars)
+                RegisterHook();
+        }
+
+        private bool ShouldSkinScrollbars
+        {
+            get { return m_SkinScrollbars != eScrollBarSkin.None && !m_IsVista; }
+        }
+
+        public void Dispose()
+        {
+            UnRegisterHook();
+        }
+
+        private void CreateScrollbars()
+        {
+            m_VScrollBar = new ScrollBarCore(m_Control as Control, true);
+            m_VScrollBar.IsAppScrollBarStyle = m_IsAppScrollBarStyle;
+            m_HScrollBar = new ScrollBarCore(m_Control as Control, true);
+            m_HScrollBar.IsAppScrollBarStyle = m_IsAppScrollBarStyle;
+            m_HScrollBar.Orientation = eOrientation.Horizontal;
+            m_HScrollBar.Enabled = false;
+        }
+
+        public bool SuspendPaint
+        {
+            get { return m_SuspendPaint; }
+            set { m_SuspendPaint = value; }
+        }
+
+        public eScrollBarSkin SkinScrollbars
+        {
+            get { return m_SkinScrollbars; }
+            set
+            {
+                if (m_SkinScrollbars != value)
+                {
+                    if (m_SkinScrollbars != eScrollBarSkin.None)
+                    {
+                        if (m_VScrollBar != null)
+                        {
+                            m_VScrollBar.Dispose();
+                            m_VScrollBar = null;
+                        }
+                        if (m_HScrollBar != null)
+                        {
+                            m_HScrollBar.Dispose();
+                            m_HScrollBar = null;
+                        }
+                        UnRegisterHook();
+                    }
+
+                    m_SkinScrollbars = value;
+                    if (ShouldSkinScrollbars)
+                    {
+                        CreateScrollbars();
+                        if (m_Control.IsHandleCreated)
+                            RegisterHook();
+                    }
+                }
+            }
+        }
+
+        private void Control_HandleDestroyed(object sender, EventArgs e)
+        {
+            UnRegisterHook();
+        }
+
+        private void Control_HandleCreated(object sender, EventArgs e)
+        {
+            if (ShouldSkinScrollbars)
+                RegisterHook();
+        }
+
+        private void RegisterHook()
+        {
+            UpdateScrollValues();
+            NonClientHook.RegisterHook(this);
+        }
+
+        private void UnRegisterHook()
+        {
+            if (ShouldSkinScrollbars)
+                NonClientHook.UnregisterHook(this);
+        }
+
+        public Rectangle ClientRectangle
+        {
+            get { return m_ClientRectangle; }
+        }
+
+        public virtual bool WndProc(ref Message m)
+        {
+            bool callBase = true;
+
+            switch (m.Msg)
+            {
+                case (int)WinApi.WindowsMessages.WM_NCPAINT:
+                    {
+                        callBase = WindowsMessageNCPaint(ref m);
+                        break;
+                    }
+                case (int)WinApi.WindowsMessages.WM_CTLCOLORSCROLLBAR:
+                    {
+                        PaintNonClientAreaBuffered();
+                        callBase = false;
+                        break;
+                    }
+                case (int)WinApi.WindowsMessages.WM_NCCALCSIZE:
+                    {
+                        callBase = WindowsMessageNCCalcSize(ref m);
+                        break;
+                    }
+                case (int)WinApi.WindowsMessages.WM_VSCROLL:
+                    {
+                        callBase = WindowsMessageVScroll(ref m);
+                        break;
+                    }
+                case (int)WinApi.WindowsMessages.WM_HSCROLL:
+                    {
+                        callBase = WindowsMessageHScroll(ref m);
+                        break;
+                    }
+                case (int)WinApi.WindowsMessages.SBM_SETPOS:
+                    {
+                        callBase = WindowsMessageSbmSetPos(ref m);
+                        break;
+                    }
+                case (int)WinApi.WindowsMessages.WM_ERASEBKGND:
+                    {
+                        callBase = WindowsMessageEraseBkgnd(ref m);
+                        break;
+                    }
+                case (int)WinApi.WindowsMessages.EM_GETMODIFY:
+                    {
+                        callBase = WindowsMessageEmGetModify(ref m);
+                        break;
+                    }
+                case (int)WinApi.WindowsMessages.WM_NCLBUTTONDOWN:
+                    {
+                        callBase = WindowsMessageNcLButtonDown(ref m);
+                        break;
+                    }
+                case (int)WinApi.WindowsMessages.WM_NCLBUTTONUP:
+                    {
+                        callBase = WindowsMessageNcLButtonUp(ref m);
+                        break;
+                    }
+                case (int)WinApi.WindowsMessages.WM_NCMOUSELEAVE:
+                    {
+                        callBase = WindowsMessageNcMouseLeave(ref m);
+                        break;
+                    }
+                case (int)WinApi.WindowsMessages.WM_NCMOUSEMOVE:
+                    {
+                        callBase = WindowsMessageNcMouseMove(ref m);
+                        break;
+                    }
+                case (int)WinApi.WindowsMessages.WM_MOUSEWHEEL:
+                    {
+                        callBase = WindowsMessageMouseWheel(ref m);
+                        break;
+                    }
+                case (int)WinApi.WindowsMessages.WM_SIZE:
+                    {
+                        callBase = WindowsMessageSize(ref m);
+                        break;
+                    }
+                case (int)WinApi.WindowsMessages.WM_COMMAND:
+                    {
+                        if (WinApi.HIWORD(m.WParam) == 0x100)
+                        {
+                            CallBaseWndProcAndPaint(ref m);
+                            callBase = false;
+                        }
+                        break;
+                    }
+                case (int)WinApi.WindowsMessages.WM_CTLCOLORBTN:
+                    {
+                        CallBaseWndProcAndPaint(ref m);
+                        callBase = false;
+                        break;
+                    }
+                case 0x120:
+                    {
+                        WindowsMessageCustomNotify(ref m);
+                        callBase = false;
+                        break;
+                    }
+            }
+
+            return callBase;
+        }
+
+        private bool WindowsMessageSize(ref Message m)
+        {
+            if (m_IsListView)
+            {
+                CallBaseWndProcAndPaint(ref m);
+                return false;
+            }
+
+            return true;
+        }
+
+        private void WindowsMessageCustomNotify(ref Message m)
+        {
+            int wParamInt = WinApi.ToInt(m.WParam);
+            if (wParamInt == 0)
+            {
+                PaintNonClientAreaBuffered();
+            }
+            else if (wParamInt == 1)
+            {
+                Point p = ScreenToNonClientPoint(Control.MousePosition);
+                if (m_VScrollBar.Visible)
+                {
+                    if (m_VScrollBar.IsMouseDown)
+                        m_VScrollBar.MouseUp(new MouseEventArgs(MouseButtons.Left, 0, p.X, p.Y, 0));
+                    else if (!m_VScrollBar.DisplayRectangle.Contains(p))
+                        m_VScrollBar.MouseLeave();
+                }
+
+                if (m_HScrollBar.Visible)
+                {
+                    if (m_HScrollBar.IsMouseDown)
+                        m_HScrollBar.MouseUp(new MouseEventArgs(MouseButtons.Left, 0, p.X, p.Y, 0));
+                    else if (!m_HScrollBar.DisplayRectangle.Contains(p))
+                        m_HScrollBar.MouseLeave();
+                }
+
+                PaintNonClientAreaBuffered();
+            }
+        }
+
+        private bool WindowsMessageMouseWheel(ref Message m)
+        {
+            CallBaseWndProcAndPaint(ref m);
+            return false;
+        }
+
+        private bool WindowsMessageNcMouseLeave(ref Message m)
+        {
+            if (!ShouldSkinScrollbars) return true;
+            if (m_VScrollBar.Visible)
+                m_VScrollBar.MouseLeave();
+            if (m_HScrollBar.Visible)
+                m_HScrollBar.MouseLeave();
+            CallBaseWndProcAndPaint(ref m);
+            return false;
+        }
+
+        private bool WindowsMessageNcMouseMove(ref Message m)
+        {
+            if (!ShouldSkinScrollbars) return true;
+            Point p = ScreenToNonClientPoint(new Point(WinApi.LOWORD(m.LParam), WinApi.HIWORD(m.LParam)));
+            if (m_VScrollBar.Visible)
+                m_VScrollBar.MouseMove(new MouseEventArgs(Control.MouseButtons, 0, p.X, p.Y, 0));
+            if (m_HScrollBar.Visible)
+                m_HScrollBar.MouseMove(new MouseEventArgs(Control.MouseButtons, 0, p.X, p.Y, 0));
+            CallBaseWndProcAndPaint(ref m);
+            return false;
+        }
+
+        private bool WindowsMessageNcLButtonUp(ref Message m)
+        {
+            if (!ShouldSkinScrollbars) return true;
+            Point p = ScreenToNonClientPoint(new Point(WinApi.LOWORD(m.LParam), WinApi.HIWORD(m.LParam)));
+            if (m_VScrollBar.Visible)
+                m_VScrollBar.MouseUp(new MouseEventArgs(MouseButtons.Left, 0, p.X, p.Y, 0));
+            if (m_HScrollBar.Visible)
+                m_HScrollBar.MouseUp(new MouseEventArgs(MouseButtons.Left, 0, p.X, p.Y, 0));
+            CallBaseWndProcAndPaint(ref m);
+            return false;
+        }
+
+        private bool WindowsMessageNcLButtonDown(ref Message m)
+        {
+            if (!ShouldSkinScrollbars) return true;
+            Point p = ScreenToNonClientPoint(new Point(WinApi.LOWORD(m.LParam), WinApi.HIWORD(m.LParam)));
+            if (m_VScrollBar.Visible)
+                m_VScrollBar.MouseDown(new MouseEventArgs(MouseButtons.Left, 0, p.X, p.Y, 0));
+            if (m_HScrollBar.Visible)
+                m_HScrollBar.MouseDown(new MouseEventArgs(MouseButtons.Left, 0, p.X, p.Y, 0));
+            CallBaseWndProcAndPaint(ref m);
+            return false;
+        }
+
+        private bool WindowsMessageEmGetModify(ref Message m)
+        {
+            if (!ShouldSkinScrollbars) return true;
+            CallBaseWndProcAndPaint(ref m);
+            return false;
+        }
+
+        private bool WindowsMessageEraseBkgnd(ref Message m)
+        {
+            if (!m_IsListView || !ShouldSkinScrollbars) return true;
+            CallBaseWndProcAndPaint(ref m);
+            return false;
+        }
+
+        private void WindowsMessageMouseMove(IntPtr hWnd, Point mousePosition)
+        {
+            if (Control.MouseButtons == MouseButtons.Left && hWnd == m_Control.Handle && ShouldSkinScrollbars)
+            {
+                WinApi.PostMessage(hWnd, 0x120, IntPtr.Zero, IntPtr.Zero);
+            }
+        }
+
+        private bool WindowsMessageSbmSetPos(ref Message m)
+        {
+            if (!ShouldSkinScrollbars) return true;
+            CallBaseWndProcAndPaint(ref m);
+            return false;
+        }
+
+        private void CallBaseWndProcAndPaintWndStyle(ref Message m)
+        {
+            const int WS_VISIBLE = 0x10000000;
+            IntPtr style = WinApi.GetWindowLongPtr(m_Control.Handle, (int)WinApi.GWL.GWL_STYLE);
+            IntPtr newStyle;
+            if (IntPtr.Size == 8)
+            {
+                long ns = style.ToInt64();
+                newStyle = new IntPtr(ns & ~(ns & WS_VISIBLE));
+            }
+            else
+            {
+                int ns = WinApi.ToInt(style);
+                newStyle = new IntPtr(ns & ~(ns & WS_VISIBLE));
+            }
+            WinApi.SetWindowLongPtr(m_Control.Handle, (int)WinApi.GWL.GWL_STYLE, newStyle);
+            //PaintUnBuffered();
+            using (BufferedBitmap bmp = GetNonClientAreaBitmap())
+            {
+                ((INonClientControl)m_Control).BaseWndProc(ref m);
+                WinApi.SetWindowLongPtr(m_Control.Handle, (int)WinApi.GWL.GWL_STYLE, style);
+                RenderNonClientAreaBitmap(bmp);
+            }
+            if (m_Control is Control)
+                ((Control)m_Control).Invalidate(true);
+        }
+
+        private bool WindowsMessageVScroll(ref Message m)
+        {
+            if (!ShouldSkinScrollbars) return true;
+
+            if (m_SkinScrollbars == eScrollBarSkin.Optimized)
+                CallBaseWndProcAndPaintWndStyle(ref m);
+            else
+                CallBaseWndProcAndPaint(ref m);
+
+            return false;
+        }
+
+        private bool WindowsMessageHScroll(ref Message m)
+        {
+            if (!ShouldSkinScrollbars) return true;
+            if (m_SkinScrollbars == eScrollBarSkin.Optimized)
+                CallBaseWndProcAndPaintWndStyle(ref m);
+            else
+                CallBaseWndProcAndPaint(ref m);
+            return false;
+        }
+
+        private void CallBaseWndProcAndPaint(ref Message m)
+        {
+            //PaintUnBuffered();
+            using (BufferedBitmap bmp = GetNonClientAreaBitmap())
+            {
+                ((INonClientControl)m_Control).BaseWndProc(ref m);
+                RenderNonClientAreaBitmap(bmp);
+            }
+        }
+
+        /// <summary>
+        /// Calculates the size of non-client area of the control.
+        /// </summary>
+        protected virtual bool WindowsMessageNCCalcSize(ref Message m)
+        {
+            ElementStyle style = ((INonClientControl)m_Control).BorderStyle;
+            if (style != null && style.PaintBorder)
+            {
+                ((INonClientControl)m_Control).BaseWndProc(ref m);
+                if (m.WParam == IntPtr.Zero)
+                {
+                    WinApi.RECT r = (WinApi.RECT)Marshal.PtrToStructure(m.LParam, typeof(WinApi.RECT));
+                    Rectangle rc = GetClientRectangleForBorderStyle(r.ToRectangle(), style);
+                    WinApi.RECT newClientRect = WinApi.RECT.FromRectangle(rc);
+                    Marshal.StructureToPtr(newClientRect, m.LParam, false);
+
+                    // Store the client rectangle in Window coordinates non-client coordinates
+                    m_ClientRectangle = rc;
+                    m_ClientRectangle.X = m_ClientRectangle.X - r.Left;
+                    m_ClientRectangle.Y = m_ClientRectangle.Y - r.Top;
+                }
+                else
+                {
+                    WinApi.NCCALCSIZE_PARAMS csp;
+                    csp = (WinApi.NCCALCSIZE_PARAMS)Marshal.PtrToStructure(m.LParam, typeof(WinApi.NCCALCSIZE_PARAMS));
+
+                    WinApi.WINDOWPOS pos = (WinApi.WINDOWPOS)Marshal.PtrToStructure(csp.lppos, typeof(WinApi.WINDOWPOS));
+                    WinApi.RECT rgrc0 = csp.rgrc0;
+                    WinApi.RECT newClientRect = WinApi.RECT.FromRectangle(GetClientRectangleForBorderStyle(new Rectangle(rgrc0.Left, rgrc0.Top, rgrc0.Width, rgrc0.Height), style));
+                    csp.rgrc0 = newClientRect;
+                    csp.rgrc1 = newClientRect;
+                    Marshal.StructureToPtr(csp, m.LParam, false);
+
+                    // Store the client rectangle in Window coordinates non-client coordinates
+                    m_ClientRectangle = csp.rgrc0.ToRectangle();
+                    m_ClientRectangle.X = m_ClientRectangle.X - pos.x;
+                    m_ClientRectangle.Y = m_ClientRectangle.Y - pos.y;
+                }
+            }
+            else
+            {
+                // Take client rectangle directly
+                if (m.WParam == IntPtr.Zero)
+                {
+                    WinApi.RECT rWindow = (WinApi.RECT)Marshal.PtrToStructure(m.LParam, typeof(WinApi.RECT));
+                    ((INonClientControl)m_Control).BaseWndProc(ref m);
+                    WinApi.RECT r = (WinApi.RECT)Marshal.PtrToStructure(m.LParam, typeof(WinApi.RECT));
+                    WinApi.RECT newClientRect = WinApi.RECT.FromRectangle(GetClientRectangleForBorderStyle(new Rectangle(r.Left, r.Top, r.Width, r.Height), style));
+                    Marshal.StructureToPtr(newClientRect, m.LParam, false);
+
+                    // Store the client rectangle in Window coordinates non-client coordinates
+                    m_ClientRectangle = newClientRect.ToRectangle();
+                    m_ClientRectangle.X = m_ClientRectangle.X - rWindow.Left;
+                    m_ClientRectangle.Y = m_ClientRectangle.Y - rWindow.Top;
+                }
+                else
+                {
+                    ((INonClientControl)m_Control).BaseWndProc(ref m);
+
+                    WinApi.NCCALCSIZE_PARAMS csp;
+                    csp = (WinApi.NCCALCSIZE_PARAMS)Marshal.PtrToStructure(m.LParam, typeof(WinApi.NCCALCSIZE_PARAMS));
+                    WinApi.WINDOWPOS pos = (WinApi.WINDOWPOS)Marshal.PtrToStructure(csp.lppos, typeof(WinApi.WINDOWPOS));
+                    WinApi.RECT rgrc0 = csp.rgrc0;
+                    WinApi.RECT newClientRect = WinApi.RECT.FromRectangle(GetClientRectangleForBorderStyle(new Rectangle(rgrc0.Left, rgrc0.Top, rgrc0.Width, rgrc0.Height), style));
+                    csp.rgrc0 = newClientRect;
+                    Marshal.StructureToPtr(csp, m.LParam, false);
+
+                    // Store the client rectangle in Window coordinates non-client coordinates
+                    m_ClientRectangle = csp.rgrc0.ToRectangle();
+                    m_ClientRectangle.X = m_ClientRectangle.X - pos.x;
+                    m_ClientRectangle.Y = m_ClientRectangle.Y - pos.y;
+                }
+            }
+            return false;
+        }
+
+        internal int GetLeftBorderWidth(ElementStyle style)
+        {
+            if (style.PaintLeftBorder)
+            {
+                int w = style.BorderLeftWidth;
+                if (style.CornerTypeTopLeft == eCornerType.Rounded || style.CornerTypeTopLeft == eCornerType.Diagonal
+                    || style.CornerTypeBottomLeft == eCornerType.Rounded || style.CornerTypeBottomLeft == eCornerType.Diagonal ||
+                    (style.CornerType == eCornerType.Rounded || style.CornerType == eCornerType.Diagonal) &&
+                    (style.CornerTypeTopLeft == eCornerType.Inherit || style.CornerTypeBottomLeft == eCornerType.Inherit))
+                    w = Math.Max(w, style.CornerDiameter / 2 + 1);
+                return w;
+            }
+            return 0;
+        }
+
+        internal int GetTopBorderWidth(ElementStyle style)
+        {
+            if (style.PaintTopBorder)
+            {
+                int w = style.BorderTopWidth;
+                if (style.CornerTypeTopLeft == eCornerType.Rounded || style.CornerTypeTopLeft == eCornerType.Diagonal
+                    || style.CornerTypeTopRight == eCornerType.Rounded || style.CornerTypeTopRight == eCornerType.Diagonal ||
+                    (style.CornerType == eCornerType.Rounded || style.CornerType == eCornerType.Diagonal) &&
+                    (style.CornerTypeTopLeft == eCornerType.Inherit || style.CornerTypeTopRight == eCornerType.Inherit))
+                    w = Math.Max(w, style.CornerDiameter / 2 + 1);
+                return w;
+            }
+            return 0;
+        }
+
+        internal int GetRightBorderWidth(ElementStyle style)
+        {
+            if (style.PaintRightBorder)
+            {
+                int w = style.BorderRightWidth;
+                if (style.CornerTypeTopRight == eCornerType.Rounded || style.CornerTypeBottomRight == eCornerType.Rounded
+                    || style.CornerTypeTopRight == eCornerType.Diagonal || style.CornerTypeBottomRight == eCornerType.Diagonal ||
+                    (style.CornerType == eCornerType.Rounded || style.CornerType == eCornerType.Diagonal) &&
+                    (style.CornerTypeTopRight == eCornerType.Inherit || style.CornerTypeBottomRight == eCornerType.Inherit))
+                    w = Math.Max(w, style.CornerDiameter / 2 + 1);
+                return w;
+            }
+            return 0;
+        }
+
+        internal int GetBottomBorderWidth(ElementStyle style)
+        {
+            if (style.PaintBottomBorder)
+            {
+                int w = style.BorderBottomWidth;
+                if (style.CornerTypeBottomLeft == eCornerType.Rounded || style.CornerTypeBottomRight == eCornerType.Rounded ||
+                    style.CornerTypeBottomLeft == eCornerType.Diagonal || style.CornerTypeBottomRight == eCornerType.Diagonal ||
+                    (style.CornerType == eCornerType.Rounded || style.CornerType == eCornerType.Diagonal) &&
+                    (style.CornerTypeBottomLeft == eCornerType.Inherit || style.CornerTypeBottomRight == eCornerType.Inherit))
+                    w = Math.Max(w, style.CornerDiameter / 2 + 1);
+                return w;
+            }
+            return 0;
+        }
+
+        internal Rectangle GetClientRectangleForBorderStyle(Rectangle rect, ElementStyle style)
+        {
+            if (style == null)
+                return rect;
+
+            if (style.PaintLeftBorder)
+            {
+                int w = GetLeftBorderWidth(style);
+                rect.X += w;
+                rect.Width -= w;
+            }
+            if (style.PaintTopBorder)
+            {
+                int w = GetTopBorderWidth(style);
+                rect.Y += w;
+                rect.Height -= w;
+            }
+            if (style.PaintRightBorder)
+            {
+                int w = GetRightBorderWidth(style);
+                rect.Width -= w;
+            }
+            if (style.PaintBottomBorder)
+            {
+                int w = GetBottomBorderWidth(style);
+                rect.Height -= w;
+            }
+
+            TextBox tb = m_Control as TextBox;
+            if (tb != null && tb.Multiline && tb.ScrollBars != ScrollBars.None)
+            {
+                if (tb.ScrollBars == ScrollBars.Vertical || tb.ScrollBars == ScrollBars.Both)
+                {
+                    if (tb.RightToLeft == RightToLeft.Yes)
+                        rect.Width -= style.PaddingRight;
+                    else
+                    {
+                        rect.X += style.PaddingLeft;
+                        rect.Width -= style.PaddingLeft;
+                    }
+                }
+
+                return rect;
+            }
+
+            rect.X += style.PaddingLeft;
+            rect.Width -= style.PaddingLeft + style.PaddingRight;
+            rect.Y += style.PaddingTop;
+            //rect.Height -= style.PaddingTop + ((m_Control is TextBox)? 0 : style.PaddingBottom);
+            rect.Height -= style.PaddingTop + style.PaddingBottom;
+
+            m_Control.AdjustClientRectangle(ref rect);
+
+            return rect;
+        }
+
+        private bool m_Painting = false;
+        /// <summary>
+        /// Paints the non-client area of the control.
+        /// </summary>
+        protected virtual bool WindowsMessageNCPaint(ref Message m)
+        {
+            if (!ShouldSkinScrollbars)
+            {
+                ((INonClientControl)m_Control).BaseWndProc(ref m);
+                if (m_Control.IsHandleCreated && m_Control.Handle != IntPtr.Zero)
+                    PaintNonClientAreaBuffered();
+                return false;
+            }
+            //PaintUnBuffered();
+            using (BufferedBitmap bmp = GetNonClientAreaBitmap())
+            {
+                ((INonClientControl)m_Control).BaseWndProc(ref m);
+                RenderNonClientAreaBitmap(bmp);
+            }
+            m.Result = IntPtr.Zero;
+
+            //if (m_Control.IsHandleCreated && m_Control.Handle != IntPtr.Zero)
+            //{
+            //    PaintNonClientAreaBuffered();
+            //}
+
+            return false;
+        }
+
+        /// <summary>
+        /// Draws the non-client area buffered.
+        /// </summary>
+        public void PaintNonClientAreaBuffered()
+        {
+            //PaintUnBuffered();
+
+            if (m_Control.Width <= 0 || m_Control.Height <= 0 || m_SuspendPaint) return;
+
+            using (BufferedBitmap bmp = GetNonClientAreaBitmap())
+            {
+                RenderNonClientAreaBitmap(bmp);
+            }
+        }
+
+        //private Bitmap GetNonClientAreaBitmap()
+        //{
+        //    if (m_Control.Width <= 0 || m_Control.Height <= 0 || m_SuspendPaint || !m_Control.IsHandleCreated) return null;
+        //    Bitmap bmp = new Bitmap(m_Control.Width, m_Control.Height);
+        //    using (Graphics g = Graphics.FromImage(bmp))
+        //    {
+        //        PaintNonClientArea(g);
+        //    }
+        //    return bmp;
+        //}
+
+        private BufferedBitmap GetNonClientAreaBitmap()
+        {
+            if (m_Control.Width <= 0 || m_Control.Height <= 0 || m_SuspendPaint || !m_Control.IsHandleCreated) return null;
+            BufferedBitmap bmp = null;
+            IntPtr hdc = WinApi.GetWindowDC(m_Control.Handle);
+            if (hdc == IntPtr.Zero) return null;
+            Rectangle r = GetControlRectangle();
+            try
+            {
+                bmp = new BufferedBitmap(hdc, new Rectangle(0, 0, r.Width, r.Height));
+                PaintNonClientArea(bmp.Graphics);
+            }
+            finally
+            {
+                WinApi.ReleaseDC(m_Control.Handle, hdc);
+            }
+            return bmp;
+        }
+
+        //private void PaintUnBuffered()
+        //{
+        //    IntPtr dc = WinApi.GetWindowDC(m_Control.Handle);
+        //    try
+        //    {
+        //        using (Graphics g = Graphics.FromHdc(dc))
+        //        {
+        //            g.SetClip(GetClientRectangle(), CombineMode.Exclude);
+        //            if (!ShouldSkinScrollbars)
+        //            {
+        //                WinApi.SCROLLBARINFO psbi = new WinApi.SCROLLBARINFO();
+        //                psbi.cbSize = Marshal.SizeOf(psbi);
+        //                WinApi.GetScrollBarInfo(m_Control.Handle, (uint)WinApi.eObjectId.OBJID_VSCROLL, ref psbi);
+        //                if (psbi.rgstate[0] != (int)WinApi.eStateFlags.STATE_SYSTEM_INVISIBLE)
+        //                {
+        //                    Rectangle rvs = ScreenToNonClientRectangle(psbi.rcScrollBar.ToRectangle());
+        //                    g.SetClip(rvs, System.Drawing.Drawing2D.CombineMode.Exclude);
+        //                }
+        //                psbi = new WinApi.SCROLLBARINFO();
+        //                psbi.cbSize = Marshal.SizeOf(psbi);
+        //                WinApi.GetScrollBarInfo(m_Control.Handle, (uint)WinApi.eObjectId.OBJID_HSCROLL, ref psbi);
+        //                if (psbi.rgstate[0] != (int)WinApi.eStateFlags.STATE_SYSTEM_INVISIBLE)
+        //                {
+        //                    Rectangle rvs = ScreenToNonClientRectangle(psbi.rcScrollBar.ToRectangle());
+        //                    g.SetClip(rvs, System.Drawing.Drawing2D.CombineMode.Exclude);
+        //                }
+        //            }
+
+        //            PaintNonClientArea(g);
+
+        //            g.ResetClip();
+        //        }
+        //    }
+        //    finally
+        //    {
+        //        WinApi.ReleaseDC(m_Control.Handle, dc);
+        //    }
+        //}
+        private void RenderNonClientAreaBitmap(BufferedBitmap bmp)
+        {
+            if (bmp == null) return;
+            IntPtr dc = WinApi.GetWindowDC(m_Control.Handle);
+            try
+            {
+                using (Graphics g = Graphics.FromHdc(dc))
+                {
+                    Rectangle[] clips = new Rectangle[3];
+                    clips[0] = GetClientRectangle();
+
+                    if (!ShouldSkinScrollbars)
+                    {
+                        WinApi.SCROLLBARINFO psbi = new WinApi.SCROLLBARINFO();
+                        psbi.cbSize = Marshal.SizeOf(psbi);
+                        WinApi.GetScrollBarInfo(m_Control.Handle, (uint)WinApi.eObjectId.OBJID_VSCROLL, ref psbi);
+                        if (psbi.rgstate[0] != (int)WinApi.eStateFlags.STATE_SYSTEM_INVISIBLE)
+                        {
+                            Rectangle rvs = ScreenToNonClientRectangle(psbi.rcScrollBar.ToRectangle());
+                            clips[1] = rvs;
+                        }
+                        psbi = new WinApi.SCROLLBARINFO();
+                        psbi.cbSize = Marshal.SizeOf(psbi);
+                        WinApi.GetScrollBarInfo(m_Control.Handle, (uint)WinApi.eObjectId.OBJID_HSCROLL, ref psbi);
+                        if (psbi.rgstate[0] != (int)WinApi.eStateFlags.STATE_SYSTEM_INVISIBLE)
+                        {
+                            Rectangle rvs = ScreenToNonClientRectangle(psbi.rcScrollBar.ToRectangle());
+                            clips[2] = rvs;
+                        }
+                    }
+
+                    bmp.Render(g, clips);
+                }
+            }
+            finally
+            {
+                WinApi.ReleaseDC(m_Control.Handle, dc);
+            }
+        }
+        //private void RenderNonClientAreaBitmap(Bitmap bmp)
+        //{
+        //    if (bmp == null) return;
+        //    IntPtr dc = WinApi.GetWindowDC(m_Control.Handle);
+        //    try
+        //    {
+        //        using (Graphics g = Graphics.FromHdc(dc))
+        //        {
+        //            g.SetClip(GetClientRectangle(), CombineMode.Exclude);
+        //            if (!ShouldSkinScrollbars)
+        //            {
+        //                WinApi.SCROLLBARINFO psbi = new WinApi.SCROLLBARINFO();
+        //                psbi.cbSize = Marshal.SizeOf(psbi);
+        //                WinApi.GetScrollBarInfo(m_Control.Handle, (uint)WinApi.eObjectId.OBJID_VSCROLL, ref psbi);
+        //                if (psbi.rgstate[0] != (int)WinApi.eStateFlags.STATE_SYSTEM_INVISIBLE)
+        //                {
+        //                    Rectangle rvs = ScreenToNonClientRectangle(psbi.rcScrollBar.ToRectangle());
+        //                    g.SetClip(rvs, System.Drawing.Drawing2D.CombineMode.Exclude);
+        //                }
+        //                psbi = new WinApi.SCROLLBARINFO();
+        //                psbi.cbSize = Marshal.SizeOf(psbi);
+        //                WinApi.GetScrollBarInfo(m_Control.Handle, (uint)WinApi.eObjectId.OBJID_HSCROLL, ref psbi);
+        //                if (psbi.rgstate[0] != (int)WinApi.eStateFlags.STATE_SYSTEM_INVISIBLE)
+        //                {
+        //                    Rectangle rvs = ScreenToNonClientRectangle(psbi.rcScrollBar.ToRectangle());
+        //                    g.SetClip(rvs, System.Drawing.Drawing2D.CombineMode.Exclude);
+        //                }
+        //            }
+
+        //            g.DrawImageUnscaled(bmp, 0, 0);
+        //            g.ResetClip();
+        //        }
+        //    }
+        //    finally
+        //    {
+        //        WinApi.ReleaseDC(m_Control.Handle, dc);
+        //    }
+        //}
+
+        //protected virtual void PaintNonClientAreaBuffered(Graphics targetGraphics)
+        //{
+        //    Bitmap bmp = new Bitmap(m_Control.Width, m_Control.Height);
+
+        //    try
+        //    {
+        //        using (Graphics g = Graphics.FromImage(bmp))
+        //        {
+        //            PaintNonClientArea(g);
+        //        }
+
+        //        targetGraphics.SetClip(GetClientRectangle(), CombineMode.Exclude);
+        //        if (!m_SkinScrollbars)
+        //        {
+        //            WinApi.SCROLLBARINFO psbi = new WinApi.SCROLLBARINFO();
+        //            psbi.cbSize = Marshal.SizeOf(psbi);
+        //            WinApi.GetScrollBarInfo(m_Control.Handle, (uint)WinApi.eObjectId.OBJID_VSCROLL, ref psbi);
+        //            if (psbi.rgstate[0] != (int)WinApi.eStateFlags.STATE_SYSTEM_INVISIBLE)
+        //            {
+        //                Rectangle rvs = ScreenToNonClientRectangle(psbi.rcScrollBar.ToRectangle());
+        //                targetGraphics.SetClip(rvs, System.Drawing.Drawing2D.CombineMode.Exclude);
+        //            }
+        //            psbi = new WinApi.SCROLLBARINFO();
+        //            psbi.cbSize = Marshal.SizeOf(psbi);
+        //            WinApi.GetScrollBarInfo(m_Control.Handle, (uint)WinApi.eObjectId.OBJID_HSCROLL, ref psbi);
+        //            if (psbi.rgstate[0] != (int)WinApi.eStateFlags.STATE_SYSTEM_INVISIBLE)
+        //            {
+        //                Rectangle rvs = ScreenToNonClientRectangle(psbi.rcScrollBar.ToRectangle());
+        //                targetGraphics.SetClip(rvs, System.Drawing.Drawing2D.CombineMode.Exclude);
+        //            }
+        //        }
+
+        //        targetGraphics.DrawImageUnscaled(bmp, 0, 0);
+        //        targetGraphics.ResetClip();
+        //    }
+        //    finally
+        //    {
+        //        bmp.Dispose();
+        //    }
+        //}
+
+        private Rectangle GetClientRectangle()
+        {
+            return m_ClientRectangle;
+        }
+
+        public void UpdateScrollValues()
+        {
+            if (!ShouldSkinScrollbars) return;
+
+            WinApi.SCROLLBARINFO psbi = new WinApi.SCROLLBARINFO();
+            psbi.cbSize = Marshal.SizeOf(psbi);
+            WinApi.GetScrollBarInfo(m_Control.Handle, (uint)WinApi.eObjectId.OBJID_VSCROLL, ref psbi);
+            if (psbi.rgstate[0] != (int)WinApi.eStateFlags.STATE_SYSTEM_INVISIBLE)
+            {
+                Rectangle displayRect = ScreenToNonClientRectangle(psbi.rcScrollBar.ToRectangle());
+                if (m_VScrollBar.DisplayRectangle != displayRect)
+                    m_VScrollBar.DisplayRectangle = displayRect;
+
+                Rectangle thumbRect = new Rectangle(displayRect.X, displayRect.Y, displayRect.Width, psbi.dxyLineButton);
+                if (m_VScrollBar.ThumbDecreaseRectangle != thumbRect)
+                    m_VScrollBar.ThumbDecreaseRectangle = thumbRect;
+
+                thumbRect = new Rectangle(displayRect.X, displayRect.Bottom - psbi.dxyLineButton, displayRect.Width, psbi.dxyLineButton);
+                if (m_VScrollBar.ThumbIncreaseRectangle != thumbRect)
+                    m_VScrollBar.ThumbIncreaseRectangle = thumbRect;
+
+                thumbRect = new Rectangle(displayRect.X, displayRect.Y + psbi.xyThumbTop, displayRect.Width, psbi.xyThumbBottom - psbi.xyThumbTop);
+                if (m_VScrollBar.TrackRectangle != thumbRect)
+                    m_VScrollBar.TrackRectangle = thumbRect;
+                if (psbi.rgstate[0] == (int)WinApi.eStateFlags.STATE_SYSTEM_UNAVAILABLE)
+                {
+                    if (m_VScrollBar.Enabled) m_VScrollBar.Enabled = false;
+                }
+                else if (!m_VScrollBar.Enabled)
+                    m_VScrollBar.Enabled = true;
+                m_VScrollBar.Visible = true;
+            }
+            else
+                m_VScrollBar.Visible = false;
+
+
+            // Horizontal scroll bar
+            psbi = new WinApi.SCROLLBARINFO();
+            psbi.cbSize = Marshal.SizeOf(psbi);
+            WinApi.GetScrollBarInfo(m_Control.Handle, (uint)WinApi.eObjectId.OBJID_HSCROLL, ref psbi);
+            if (psbi.rgstate[0] != (int)WinApi.eStateFlags.STATE_SYSTEM_INVISIBLE)
+            {
+                Rectangle displayRect = ScreenToNonClientRectangle(psbi.rcScrollBar.ToRectangle());
+                if (m_HScrollBar.DisplayRectangle != displayRect)
+                    m_HScrollBar.DisplayRectangle = displayRect;
+
+                Rectangle thumbRect = new Rectangle(displayRect.X, displayRect.Y, psbi.dxyLineButton, displayRect.Height);
+                if (m_HScrollBar.ThumbDecreaseRectangle != thumbRect)
+                    m_HScrollBar.ThumbDecreaseRectangle = thumbRect;
+
+                thumbRect = new Rectangle(displayRect.Right - psbi.dxyLineButton, displayRect.Y, psbi.dxyLineButton, displayRect.Height);
+                if (m_HScrollBar.ThumbIncreaseRectangle != thumbRect)
+                    m_HScrollBar.ThumbIncreaseRectangle = thumbRect;
+
+                thumbRect = new Rectangle(displayRect.X + psbi.xyThumbTop, displayRect.Y, psbi.xyThumbBottom - psbi.xyThumbTop, displayRect.Height);
+                if (m_HScrollBar.TrackRectangle != thumbRect)
+                    m_HScrollBar.TrackRectangle = thumbRect;
+                if (psbi.rgstate[0] == (int)WinApi.eStateFlags.STATE_SYSTEM_UNAVAILABLE)
+                {
+                    if (m_HScrollBar.Enabled) m_VScrollBar.Enabled = false;
+                }
+                else if (!m_HScrollBar.Enabled)
+                    m_HScrollBar.Enabled = true;
+                m_HScrollBar.Visible = true;
+            }
+            else
+                m_HScrollBar.Visible = false;
+        }
+
+        protected virtual void PaintNonClientArea(Graphics g)
+        {
+            if (m_Painting) return;
+            m_Painting = true;
+            try
+            {
+                // Paint Background and border
+                PaintBorder(g);
+
+                if (ShouldSkinScrollbars)
+                {
+                    UpdateScrollValues();
+
+                    if (m_VScrollBar.Visible)
+                        m_VScrollBar.Paint(((INonClientControl)m_Control).GetItemPaintArgs(g));
+                    if (m_HScrollBar.Visible)
+                        m_HScrollBar.Paint(((INonClientControl)m_Control).GetItemPaintArgs(g));
+                }
+            }
+            finally
+            {
+                m_Painting = false;
+            }
+        }
+
+        private Rectangle GetControlRectangle()
+        {
+            if (m_Control.IsHandleCreated)
+            {
+                WinApi.RECT r = new WinApi.RECT();
+                WinApi.GetWindowRect(m_Control.Handle, ref r);
+                return new Rectangle(0, 0, r.Width, r.Height);
+            }
+            else
+                return new Rectangle(0, 0, m_Control.Width, m_Control.Height);
+        }
+
+        private void PaintBorder(Graphics g)
+        {
+            ElementStyle style = ((INonClientControl)m_Control).BorderStyle;
+            Rectangle r = GetControlRectangle();
+            if (style == null || r.Width <= 0 || r.Height <= 0) return;
+
+            ElementStyleDisplayInfo displayInfo = new ElementStyleDisplayInfo(style, g, r);
+
+            if (style.BackColor == Color.Transparent && (style.BackColor2.IsEmpty || style.BackColor2 == Color.Transparent))
+            {
+                ((INonClientControl)m_Control).PaintBackground(new PaintEventArgs(g, r));
+            }
+            else
+            {
+                if (style.BackColor.IsEmpty && m_Control.BackColor != Color.Transparent)
+                {
+                    using (SolidBrush brush = new SolidBrush(GetBackColor()))
+                        g.FillRectangle(brush, r);
+                }
+                else
+                {
+                    if (m_Control.BackColor == Color.Transparent || style.PaintBorder && (style.CornerType == eCornerType.Rounded || style.CornerType == eCornerType.Diagonal ||
+                        style.CornerTypeBottomLeft == eCornerType.Rounded || style.CornerTypeBottomLeft == eCornerType.Diagonal ||
+                        style.CornerTypeBottomRight == eCornerType.Rounded || style.CornerTypeBottomRight == eCornerType.Diagonal ||
+                        style.CornerTypeTopLeft == eCornerType.Rounded || style.CornerTypeTopLeft == eCornerType.Diagonal ||
+                        style.CornerTypeTopRight == eCornerType.Rounded || style.CornerTypeTopRight == eCornerType.Diagonal))
+                    {
+                        if (m_Control is TextBox || m_Control.BackColor == Color.Transparent)
+                            ((INonClientControl)m_Control).PaintBackground(new PaintEventArgs(g, r));
+                        else
+                            using (SolidBrush brush = new SolidBrush(m_Control.BackColor))
+                                g.FillRectangle(brush, r);
+                    }
+                    else
+                    {
+                        using (SolidBrush brush = new SolidBrush(m_Control.BackColor))
+                            g.FillRectangle(brush, r);
+                    }
+                }
+
+                Rectangle rback = r;
+                if (style.PaintBorder)
+                {
+                    if (style.PaintRightBorder && style.BorderRightWidth > 1)
+                        rback.Width--;
+                    if (style.PaintBottomBorder && style.BorderBottomWidth > 1)
+                        rback.Height--;
+                }
+                m_Control.AdjustBorderRectangle(ref rback);
+                displayInfo.Bounds = rback;
+                ElementStyleDisplay.PaintBackground(displayInfo);
+                m_Control.RenderNonClient(g);
+            }
+
+            SmoothingMode sm = g.SmoothingMode;
+            if (style.PaintBorder && (style.CornerType == eCornerType.Rounded || style.CornerType == eCornerType.Diagonal))
+                g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.HighQuality;
+            m_Control.AdjustBorderRectangle(ref r);
+            displayInfo.Bounds = r;
+            this.BeforePaintBorder(g, r);
+            ElementStyleDisplay.PaintBorder(displayInfo);
+            g.SmoothingMode = sm;
+            this.AfterPaintBorder(g, r);
+        }
+
+        private Color GetBackColor()
+        {
+            return (m_Control.Enabled ? m_Control.BackColor : (m_Control.DisabledBackColor.IsEmpty ? SystemColors.Control : m_Control.DisabledBackColor));
+        }
+
+        private void AfterPaintBorder(Graphics g, Rectangle r)
+        {
+            if (AfterBorderPaint != null)
+                AfterBorderPaint(this, new CustomNCPaintEventArgs(g, r));
+        }
+
+        private void BeforePaintBorder(Graphics g, Rectangle r)
+        {
+            if (BeforeBorderPaint != null)
+                BeforeBorderPaint(this, new CustomNCPaintEventArgs(g, r));
+        }
+
+        private Point ScreenToNonClientPoint(Point p)
+        {
+            Point pScreen = m_Control.PointToScreen(new Point(-m_ClientRectangle.X, -m_ClientRectangle.Y));
+            p.X = p.X - pScreen.X;
+            p.Y = p.Y - pScreen.Y;
+            return p;
+        }
+
+        private Rectangle ScreenToNonClientRectangle(Rectangle r)
+        {
+            Point p = m_Control.PointToScreen(new Point(-m_ClientRectangle.X, -m_ClientRectangle.Y));
+            r.X = r.X - p.X;
+            r.Y = r.Y - p.Y;
+
+            return r;
+        }
+        #endregion
+
+
+
+        #region ISkinHook Members
+        public delegate void InvokeMouseMethodDelegate(IntPtr handle, Point mousePos);
+
+        public void PostMouseMove(IntPtr hWnd, Point mousePos)
+        {
+            if (m_Control is Control)
+            {
+                Control c = m_Control as Control;
+                if (c == null || c.IsDisposed || !c.IsHandleCreated)
+                    return;
+
+                if (c.InvokeRequired)
+                {
+#if FRAMEWORK20
+                    c.BeginInvoke(new InvokeMouseMethodDelegate(this.PostMouseMoveSafe), hWnd, mousePos);
+#else
+				c.BeginInvoke(new InvokeMouseMethodDelegate(this.PostMouseMoveSafe), new object[]{hWnd, mousePos});
+#endif
+                }
+                else
+                    this.PostMouseMoveSafe(hWnd, mousePos);
+            }
+            else
+                PostMouseMoveSafe(hWnd, mousePos);
+        }
+        private void PostMouseMoveSafe(IntPtr hWnd, Point mousePos)
+        {
+            if (hWnd == m_Control.Handle)
+                WindowsMessageMouseMove(hWnd, mousePos);
+        }
+
+        public void PostMouseUp(IntPtr hWnd, Point mousePos)
+        {
+            if (m_Control is Control)
+            {
+                Control c = m_Control as Control;
+                if (c == null || c.IsDisposed || !c.IsHandleCreated)
+                    return;
+
+                if (c.InvokeRequired)
+                {
+#if FRAMEWORK20
+                    c.BeginInvoke(new InvokeMouseMethodDelegate(this.PostMouseUpSafe), hWnd, mousePos);
+#else
+				c.BeginInvoke(new InvokeMouseMethodDelegate(this.PostMouseUpSafe), new object[] {hWnd, mousePos});
+#endif
+                }
+                else
+                {
+                    this.PostMouseUpSafe(hWnd, mousePos);
+                }
+            }
+            else
+                PostMouseUpSafe(hWnd, mousePos);
+        }
+
+        public void PostMouseUpSafe(IntPtr hWnd, Point mousePos)
+        {
+            if (hWnd == m_Control.Handle && ShouldSkinScrollbars)
+            {
+                if (m_VScrollBar.IsMouseDown)
+                    WinApi.PostMessage(m_Control.Handle, 0x120, (IntPtr)1, (IntPtr)0);
+                else if (m_HScrollBar.IsMouseDown)
+                    WinApi.PostMessage(m_Control.Handle, 0x120, (IntPtr)1, (IntPtr)0);
+            }
+        }
+        #endregion
+    }
+
+    internal delegate void CustomNCPaintEventHandler(object sender, CustomNCPaintEventArgs e);
+    internal class CustomNCPaintEventArgs : EventArgs
+    {
+        public Graphics Graphics = null;
+        public Rectangle Bounds = Rectangle.Empty;
+
+        public CustomNCPaintEventArgs(Graphics g, Rectangle r)
+        {
+            this.Graphics = g;
+            this.Bounds = r;
+        }
+    }
+
+    public interface INonClientControl
+    {
+        /// <summary>
+        /// Calls base WndProc implementation
+        /// </summary>
+        /// <param name="m">Describes Windows Message</param>
+        void BaseWndProc(ref Message m);
+
+        /// <summary>
+        /// Gets the ItemPaintArgs which provide information for rendering.
+        /// </summary>
+        /// <param name="g">Reference to Canvas</param>
+        /// <returns>Returns the new ItemPaintArgs instance</returns>
+        ItemPaintArgs GetItemPaintArgs(Graphics g);
+
+        /// <summary>
+        /// Gets the reference to the BorderStyle used by the control if any.
+        /// </summary>
+        ElementStyle BorderStyle { get; }
+
+        /// <summary>
+        /// Paints the background of the control
+        /// </summary>
+        /// <param name="e">PaintEventArgs arguments</param>
+        void PaintBackground(PaintEventArgs e);
+
+        /// <summary>
+        /// Returns the Windows handle associated with the control.
+        /// </summary>
+        IntPtr Handle { get; }
+
+        /// <summary>
+        /// Returns width of the control.
+        /// </summary>
+        int Width { get; }
+
+        /// <summary>
+        /// Returns the height of the control.
+        /// </summary>
+        int Height { get; }
+
+        /// <summary>
+        /// Returns whether handled for the control has been created.
+        /// </summary>
+        bool IsHandleCreated { get; }
+
+        /// <summary>
+        /// Converts the client point into the screen point.
+        /// </summary>
+        /// <param name="client">Client point</param>
+        /// <returns>Client point converted into screen coordinates.</returns>
+        Point PointToScreen(Point client);
+
+        /// <summary>
+        /// Returns background color of the control.
+        /// </summary>
+        Color BackColor { get; }
+
+        /// <summary>
+        /// Returns background color of the control when Enabled=false.
+        /// </summary>
+        Color DisabledBackColor { get; }
+
+        /// <summary>
+        /// Returns whether control is enabled.
+        /// </summary>
+        bool Enabled { get; set; }
+
+        /// <summary>
+        /// Adjusts the client rectangle for the control.
+        /// </summary>
+        /// <param name="r">Reference to new client rectangle.</param>
+        void AdjustClientRectangle(ref Rectangle r);
+
+        /// <summary>
+        /// Adjusts the border rectangle before the non-client border is rendered.
+        /// </summary>
+        /// <param name="r">Border rectangle</param>
+        void AdjustBorderRectangle(ref Rectangle r);
+
+        /// <summary>
+        /// Occurs after non-client area is rendered and provides opportunity to render on top of it.
+        /// </summary>
+        /// <param name="g">Reference to Graphics object.</param>
+        void RenderNonClient(Graphics g);
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/PageNavigator.cs b/PROMS/DotNetBar Source Code/Controls/PageNavigator.cs
new file mode 100644
index 00000000..3057e739
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/PageNavigator.cs	
@@ -0,0 +1,326 @@
+#if FRAMEWORK20
+using System;
+using System.Runtime.InteropServices;
+using System.Drawing;
+using System.ComponentModel;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    /// <summary>
+    /// Represents the PageNavigator control
+    /// </summary>
+    [ToolboxBitmap(typeof(PageNavigator), "PageNavigator.PageNavigator.ico"), ToolboxItem(true)]
+    [DefaultEvent("ValueChanged"), ComVisible(false)] //, Designer(typeof(Design.PageNavigatorDesigner))]
+    public class PageNavigator : BaseItemControl
+    {
+        #region Private Variables
+
+        private PageNavigatorItem _PageNavItem;     // Navigation item
+
+        #endregion
+
+        #region Events
+
+        /// <summary>
+        /// Occurs when NavigateNextPage button is clicked
+        /// </summary>
+        [Description("Occurs when NavigateNextPage button is clicked.")]
+        public event EventHandler NavigateNextPage;
+
+        /// <summary>
+        /// Occurs when NavigateToday button is clicked
+        /// </summary>
+        [Description("Occurs when NavigateToday button is clicked.")]
+        public event EventHandler NavigateToday;
+
+        /// <summary>
+        /// Occurs when NavigatePreviousPage button is clicked
+        /// </summary>
+        [Description("Occurs when NavigatePreviousPage button is clicked.")]
+        public event EventHandler NavigatePreviousPage;
+
+        #endregion
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        public PageNavigator()
+        {
+            _PageNavItem = new PageNavigatorItem();
+            _PageNavItem.Style = eDotNetBarStyle.StyleManagerControlled;
+            this.Size = _PageNavItem.Size;
+            this.HostItem = _PageNavItem;
+
+            HookEvents(true);
+        }
+
+        #region DefaultSize
+
+        /// <summary>
+        /// DefaultSize
+        /// </summary>
+        protected override Size DefaultSize
+        {
+            get
+            {
+                // Set a default size based upon
+                // the current object layout orientation
+
+                int m = SystemInformation.VerticalScrollBarWidth;
+                int n = m * 3;
+
+                if (_PageNavItem != null &&
+                    _PageNavItem.Orientation == eOrientation.Horizontal)
+                {
+                    return (new Size(n, m));
+                }
+
+                return (new Size(m, n));
+            }
+        }
+        #endregion
+
+        #region Public properties
+
+        #region Orientation
+
+        /// <summary>
+        /// Gets or sets the layout orientation. Default value is horizontal.
+        /// </summary>
+        [DefaultValue(eOrientation.Horizontal), Category("Appearance")]
+        [Description("Indicates control layout orientation.")]
+        public eOrientation Orientation
+        {
+            get { return (_PageNavItem.Orientation); }
+
+            set
+            {
+                if (_PageNavItem.Orientation != value)
+                {
+                    _PageNavItem.Orientation = value;
+
+                    this.RecalcLayout();
+                }
+            }
+        }
+
+        #endregion
+
+        #region PreviousPageTooltip
+
+        /// <summary>
+        /// Gets or sets the tooltip for the PreviousPage button of the control
+        /// </summary>
+        [Browsable(true), DefaultValue(""), Localizable(true), Category("Appearance")]
+        [Description("Indicates tooltip for the PreviousPage button of the control.")]
+        public string PreviousPageTooltip
+        {
+            get { return (_PageNavItem.PreviousPageTooltip); }
+            set { _PageNavItem.PreviousPageTooltip = value; }
+        }
+
+        #endregion
+
+        #region TodayTooltip
+
+        /// <summary>
+        /// Gets or sets the tooltip for the Today button
+        /// </summary>
+        [Browsable(true), DefaultValue(""), Localizable(true), Category("Appearance")]
+        [Description("Indicates tooltip for the TodayPage button of the control.")]
+        public string TodayTooltip
+        {
+            get { return (_PageNavItem.TodayTooltip); }
+            set { _PageNavItem.TodayTooltip = value; }
+        }
+
+        #endregion
+
+        #region NextPageTooltip
+
+        /// <summary>
+        /// Gets or sets the tooltip for the NextPage button
+        /// </summary>
+        [Browsable(true), DefaultValue(""), Localizable(true), Category("Appearance")]
+        [Description("Indicates tooltip for the NextPage button of the control.")]
+        public string NextPageTooltip
+        {
+            get { return (_PageNavItem.NextPageTooltip); }
+            set { _PageNavItem.NextPageTooltip = value; }
+        }
+
+        #endregion
+
+        #region Style
+        /// <summary>
+        /// Gets/Sets the visual style for the control.
+        /// </summary>
+        [Browsable(false), DefaultValue(eDotNetBarStyle.StyleManagerControlled)]
+        public override eDotNetBarStyle Style
+        {
+            get
+            {
+                return base.Style;
+            }
+            set
+            {
+                base.Style = value;
+            }
+        }
+        #endregion
+
+        #endregion
+
+        #region HookEvents
+
+        /// <summary>
+        /// Hooks or unhooks our control events
+        /// </summary>
+        /// <param name="hook">true to hook, false to unhook</param>
+        private void HookEvents(bool hook)
+        {
+            if (hook == true)
+            {
+                _PageNavItem.NavigatePreviousPage += PageNavNavigatePreviousPage;
+                _PageNavItem.NavigateNextPage += PageNavNavigateNextPage;
+                _PageNavItem.NavigateToday += PageNavNavigateToday;
+            }
+            else
+            {
+                _PageNavItem.NavigatePreviousPage -= PageNavNavigatePreviousPage;
+                _PageNavItem.NavigateNextPage -= PageNavNavigateNextPage;
+                _PageNavItem.NavigateToday -= PageNavNavigateToday;
+            }
+        }
+
+        #endregion
+
+        #region Event handling
+
+        #region PageNav_NavigatePreviousPage
+
+        /// <summary>
+        /// Handles NavigatePreviousPage events
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void PageNavNavigatePreviousPage(object sender, EventArgs e)
+        {
+            OnNavigatePreviousPage();
+        }
+
+        /// <summary>
+        /// Raises the NavigatePreviousPage event
+        /// </summary>
+        private void OnNavigatePreviousPage()
+        {
+            if (NavigatePreviousPage != null)
+                NavigatePreviousPage(this, EventArgs.Empty);
+        }
+
+        #endregion
+
+        #region PageNav_NavigateToday
+
+        /// <summary>
+        /// Handles NavigateToday events
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void PageNavNavigateToday(object sender, EventArgs e)
+        {
+            OnNavigateToday();
+        }
+
+        /// <summary>
+        /// Raises the NavigateToday event
+        /// </summary>
+        private void OnNavigateToday()
+        {
+            if (NavigateToday != null)
+                NavigateToday(this, EventArgs.Empty);
+        }
+
+        #endregion
+
+        #region PageNav_NavigateNextPage
+
+        /// <summary>
+        /// Handles NavigateNextPage events
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void PageNavNavigateNextPage(object sender, EventArgs e)
+        {
+            OnNavigateNextPage();
+        }
+
+        /// <summary>
+        /// Raises the NavigateNextPage event
+        /// </summary>
+        private void OnNavigateNextPage()
+        {
+            if (NavigateNextPage != null)
+                NavigateNextPage(this, EventArgs.Empty);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RecalcLayout
+
+        /// <summary>
+        /// Forces the button to perform internal layout.
+        /// </summary>
+        public override void RecalcLayout()
+        {
+            base.RecalcLayout();
+        }
+
+        #endregion
+
+        #region Dispose
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        /// <param name="disposing"></param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing == true)
+                HookEvents(false);
+
+            base.Dispose(disposing);
+        }
+
+        #endregion
+    }
+
+    #region enums
+
+    /// <summary>
+    /// PageNavigator buttons
+    /// </summary>
+    public enum PageNavigatorButton
+    {
+        /// <summary>
+        /// Previous page
+        /// </summary>
+        PreviousPage,
+
+        /// <summary>
+        /// Today
+        /// </summary>
+        Today,
+
+        /// <summary>
+        /// Next page
+        /// </summary>
+        NextPage
+    }
+
+    #endregion
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/Controls/PageNavigator.ico b/PROMS/DotNetBar Source Code/Controls/PageNavigator.ico
new file mode 100644
index 00000000..017d6e9a
Binary files /dev/null and b/PROMS/DotNetBar Source Code/Controls/PageNavigator.ico differ
diff --git a/PROMS/DotNetBar Source Code/Controls/PageNavigatorItem.cs b/PROMS/DotNetBar Source Code/Controls/PageNavigatorItem.cs
new file mode 100644
index 00000000..4af4745e
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/PageNavigatorItem.cs	
@@ -0,0 +1,1116 @@
+#if FRAMEWORK20
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.Rendering;
+using System.Drawing.Drawing2D;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    /// <summary>
+    /// Represents the PageNavigate item
+    /// </summary>
+    [Browsable(false), Designer("DevComponents.DotNetBar.Design.SimpleItemDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+    public class PageNavigatorItem : BaseItem
+    {
+        #region Events
+
+        /// <summary>
+        /// Occurs when NavigateNextPage button is clicked
+        /// </summary>
+        [Description("Occurs when NavigateNextPage button is clicked.")]
+        public event EventHandler NavigateNextPage;
+
+        /// <summary>
+        /// Occurs when NavigateToday button is clicked
+        /// </summary>
+        [Description("Occurs when NavigateToday button is clicked.")]
+        public event EventHandler NavigateToday;
+
+        /// <summary>
+        /// Occurs when NavigatePreviousPage button is clicked
+        /// </summary>
+        [Description("Occurs when NavigatePreviousPage button is clicked.")]
+        public event EventHandler NavigatePreviousPage;
+
+        #endregion
+
+        #region Private Variables
+
+        private ePageNavigatorPart _MouseOverPart = ePageNavigatorPart.None;
+        private ePageNavigatorPart _MouseDownPart = ePageNavigatorPart.None;
+
+        private Rectangle _PreviousPageBounds;
+        private Rectangle _TodayBounds;
+        private Rectangle _NextPageBounds;
+
+        private string _PreviousPageTooltip = "";
+        private string _TodayTooltip = "";
+        private string _NextPageTooltip = "";
+
+        private Bitmap _PreviousPageBitmap;
+        private Bitmap _TodayBitmap;
+        private Bitmap _NextPageBitmap;
+
+        private Timer _ClickTimer;
+        private int _AutoClickCount;
+
+        private int _ButtonSize = SystemInformation.VerticalScrollBarWidth;
+        private int _MinWidth = SystemInformation.VerticalScrollBarWidth * 3;
+
+        #endregion
+
+        /// <summary>
+        /// Creates new instance of PageNavigateItem
+        /// </summary>
+        public PageNavigatorItem() : this("") { }
+
+        /// <summary>
+        /// Creates new instance of PageNavigateItem and assigns the name to it
+        /// </summary>
+        /// <param name="itemName">Item name</param>
+        public PageNavigatorItem(string itemName)
+        {
+            this.Name = itemName;
+
+            this.ClickRepeatInterval = 200;
+
+            this.MouseUpNotification = true;
+            this.MouseDownCapture = true;
+
+            this.Size = new Size(Dpi.Width(_MinWidth), Dpi.Height(_ButtonSize));
+        }
+
+        #region Internal properties
+
+        #region MouseOverPart
+
+        /// <summary>
+        /// Gets or sets the MouseOverPart
+        /// </summary>
+        internal ePageNavigatorPart MouseOverPart
+        {
+            get { return _MouseOverPart; }
+
+            set
+            {
+                if (_MouseOverPart != value)
+                {
+                    _MouseOverPart = value;
+
+                    UpdateTooltip();
+
+                    this.Refresh();
+                }
+            }
+        }
+
+        #endregion
+
+        #region MouseDownPart
+
+        /// <summary>
+        /// Gets or sets the MouseDownPart
+        /// </summary>
+        internal ePageNavigatorPart MouseDownPart
+        {
+            get { return _MouseDownPart; }
+
+            set
+            {
+                if (_MouseDownPart != value)
+                {
+                    _MouseDownPart = value;
+
+                    this.Refresh();
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Public properties
+
+        #region Orientation
+
+        /// <summary>
+        /// Gets or sets the control orientation. Default value is Horizontal
+        /// </summary>
+        [DefaultValue(eOrientation.Horizontal), Category("Appearance")]
+        [Description("Indicates PageNavigator orientation.")]
+        public override eOrientation Orientation
+        {
+            get { return (base.Orientation); }
+
+            set
+            {
+                if (base.Orientation != value)
+                {
+                    base.Orientation = value;
+
+                    // Release our current cached bitmaps
+
+                    ReleaseBitmap(ref _NextPageBitmap);
+                    ReleaseBitmap(ref _PreviousPageBitmap);
+
+                    // Reset our size back to the
+                    // default for the new orientation
+
+                    this.Size = (value == eOrientation.Horizontal) ? 
+                        new Size(Dpi.Width(_MinWidth), Dpi.Height(_ButtonSize)) : new Size(Dpi.Width(_ButtonSize), Dpi.Height(_MinWidth));
+
+                    NeedRecalcSize = true;
+
+                    this.Refresh();
+                }
+            }
+        }
+
+        protected override void ScaleItem(SizeF factor)
+        {
+            ReleaseBitmap(ref _PreviousPageBitmap);
+            ReleaseBitmap(ref _TodayBitmap);
+            ReleaseBitmap(ref _NextPageBitmap);
+
+            this.Size = (Orientation == eOrientation.Horizontal) ?
+                        new Size(Dpi.Width(_MinWidth), Dpi.Height(_ButtonSize)) : new Size(Dpi.Width(_ButtonSize), Dpi.Height(_MinWidth));
+            base.ScaleItem(factor);
+        }
+
+        #endregion
+
+        #region ClickAutoRepeat
+
+        /// <summary>
+        /// Gets or sets whether Click event will be auto repeated
+        /// when mouse button is kept pressed over the item
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), DefaultValue(false), Category("Behavior")]
+        [Description("Gets or sets whether Click event will be auto repeated when the mouse button is kept pressed over the item.")]
+        public override bool ClickAutoRepeat
+        {
+            get { return (base.ClickAutoRepeat); }
+            set { base.ClickAutoRepeat = value; }
+        }
+
+        #endregion
+
+        #region ClickRepeatInterval
+
+        /// <summary>
+        /// Gets or sets the auto-repeat interval for the click event
+        /// when mouse button is kept pressed over the item
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), DefaultValue(200), Category("Behavior")]
+        [Description("Gets or sets the auto-repeat interval for the click event when the mouse button is kept pressed over the item.")]
+        public override int ClickRepeatInterval
+        {
+            get { return (base.ClickRepeatInterval); }
+            set { base.ClickRepeatInterval = value; }
+        }
+
+        #endregion
+
+        #region PreviousPageTooltip
+
+        /// <summary>
+        /// Gets or sets the tooltip for the PreviousPage button of the control
+        /// </summary>
+        [Browsable(true), DefaultValue(""), Localizable(true), Category("Appearance")]
+        [Description("Indicates tooltip for the PreviousPage button of the control.")]
+        public string PreviousPageTooltip
+        {
+            get { return _PreviousPageTooltip; }
+
+            set
+            {
+                _PreviousPageTooltip = value;
+
+                UpdateTooltip();
+            }
+        }
+
+        #endregion
+
+        #region TodayTooltip
+
+        /// <summary>
+        /// Gets or sets the tooltip for the Today button
+        /// </summary>
+        [Browsable(true), DefaultValue(""), Localizable(true), Category("Appearance")]
+        [Description("Indicates tooltip for the TodayPage button of the control.")]
+        public string TodayTooltip
+        {
+            get { return (_TodayTooltip); }
+
+            set
+            {
+                _TodayTooltip = value;
+
+                UpdateTooltip();
+            }
+        }
+
+        #endregion
+
+        #region NextPageTooltip
+
+        /// <summary>
+        /// Gets or sets the tooltip for the NextPage button
+        /// </summary>
+        [Browsable(true), DefaultValue(""), Localizable(true), Category("Appearance")]
+        [Description("Indicates tooltip for the NextPage button of the control.")]
+        public string NextPageTooltip
+        {
+            get { return (_NextPageTooltip); }
+
+            set
+            {
+                _NextPageTooltip = value;
+
+                UpdateTooltip();
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RecalcSize
+
+        /// <summary>
+        /// Handles size recalc
+        /// </summary>
+        public override void RecalcSize()
+        {
+            // Update our layout
+
+            UpdateLayout();
+
+            base.RecalcSize();
+        }
+
+        #endregion
+
+        #region OnExternalSizeChange
+
+        /// <summary>
+        /// Handles external size changes
+        /// </summary>
+        protected override void OnExternalSizeChange()
+        {
+            UpdateLayout();
+
+            base.OnExternalSizeChange();
+        }
+
+        #endregion
+
+        #region UpdateLayout
+
+        /// <summary>
+        /// Lays out our control based upon its
+        /// vertical / horizontal orientation
+        /// </summary>
+        private void UpdateLayout()
+        {
+            Rectangle r = Bounds;
+
+            if (Orientation == eOrientation.Horizontal)
+            {
+                int dx = r.Width / 3;
+
+                _PreviousPageBounds = new Rectangle(r.Left, r.Top, dx, r.Height);
+                _NextPageBounds = new Rectangle(r.Right - dx, r.Top, dx, r.Height);
+
+                _TodayBounds = new Rectangle(r.Left + dx, r.Top, r.Width - dx * 2, r.Height);
+            }
+            else
+            {
+                int dy = r.Height / 3;
+
+                _PreviousPageBounds = new Rectangle(r.Left, r.Top, r.Width, dy);
+                _NextPageBounds = new Rectangle(r.Left, r.Bottom - dy, r.Width, dy);
+
+                _TodayBounds = new Rectangle(r.Left, r.Y + dy, r.Width, r.Height - dy * 2);
+            }
+        }
+
+        #endregion
+
+        #region Paint
+
+        /// <summary>
+        /// Handles control rendering
+        /// </summary>
+        /// <param name="e"></param>
+        public override void Paint(ItemPaintArgs e)
+        {
+            Graphics g = e.Graphics;
+
+            Office2007ScrollBarColorTable colorTable =
+                ((Office2007Renderer)GlobalManager.Renderer).ColorTable.ScrollBar;
+
+            DrawPreviousPage(g, colorTable);
+            DrawToday(g, colorTable);
+            DrawNextPage(g, colorTable);
+        }
+
+        #region DrawPreviousPage
+
+        /// <summary>
+        /// Draws the PreviousPage button
+        /// </summary>
+        /// <param name="g">Graphics</param>
+        /// <param name="ct">Office2007ScrollBarColorTable</param>
+        private void DrawPreviousPage(Graphics g, Office2007ScrollBarColorTable ct)
+        {
+            Office2007ScrollBarStateColorTable cst =
+                GetPageColorTable(ct, ePageNavigatorPart.PreviousPage);
+
+            float angle = (Orientation == eOrientation.Horizontal) ? 90f : 0f;
+            
+            using (LinearGradientBrush lbr = new LinearGradientBrush(
+                _PreviousPageBounds, cst.Background.Start, cst.Background.End, angle))
+            {
+                if (cst.TrackBackground.Count > 0)
+                    lbr.InterpolationColors =
+                        cst.TrackBackground.GetColorBlend();
+
+                g.FillRectangle(lbr, _PreviousPageBounds);
+            }
+
+            g.DrawImageUnscaled(
+                GetPreviousPageBitmap(g, cst),
+                CenterRect(_PreviousPageBounds));
+        }
+
+        #region GetPreviousPageBitmap
+
+        /// <summary>
+        /// Gets the PreviousPage bitmap
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="cst"></param>
+        /// <returns></returns>
+        private Bitmap GetPreviousPageBitmap(
+            Graphics g, Office2007ScrollBarStateColorTable cst)
+        {
+            if (_PreviousPageBitmap == null)
+                _PreviousPageBitmap = CreatePreviousPageBitmap(g, cst);
+
+            return (_PreviousPageBitmap);
+        }
+
+        /// <summary>
+        /// Creates the PreviousPage bitmap
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="cst"></param>
+        /// <returns></returns>
+        private Bitmap CreatePreviousPageBitmap(
+            Graphics g, Office2007ScrollBarStateColorTable cst)
+        {
+            Bitmap bmp = new Bitmap(Dpi.Width10, Dpi.Height10, g);
+
+            using (Graphics gBmp = Graphics.FromImage(bmp))
+            {
+                using (GraphicsPath path = new GraphicsPath())
+                {
+                    float angle;
+
+                    if (Orientation == eOrientation.Horizontal)
+                    {
+                        angle = 90;
+
+                        path.AddLines(new Point[] {
+                            new Point(Dpi.Width8,0),
+                            new Point(Dpi.Width4,Dpi.Height4),
+                            new Point(Dpi.Width8,Dpi.Height8)
+                            });
+
+                        path.CloseFigure();
+
+                        path.AddLines(new Point[] {
+                            new Point(Dpi.Width4,0),
+                            new Point(0,Dpi.Height4),
+                            new Point(Dpi.Width4,Dpi.Height8)
+                            });
+
+                        path.CloseFigure();
+                    }
+                    else
+                    {
+                        angle = 0;
+
+                        path.AddLines(new Point[] {
+                            new Point(0,Dpi.Height5),
+                            new Point(Dpi.Width4,0),
+                            new Point(Dpi.Width8,Dpi.Height5)
+                            });
+
+                        path.CloseFigure();
+
+                        path.AddLines(new Point[] {
+                            new Point(0,Dpi.Height9),
+                            new Point(Dpi.Width4,Dpi.Height4),
+                            new Point(Dpi.Width8,Dpi.Height9)
+                            });
+
+                        path.CloseFigure();
+                    }
+
+                    Rectangle r = new Rectangle(0, 0, Dpi.Width10, Dpi.Height10);
+
+                    using (LinearGradientBrush lbr = new
+                        LinearGradientBrush(r, cst.ThumbSignBackground.Start, cst.ThumbSignBackground.End, angle))
+                    {
+                        gBmp.FillPath(lbr, path);
+                    }
+                }
+            }
+
+            return (bmp);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region DrawToday
+
+        /// <summary>
+        /// Draws the Today button
+        /// </summary>
+        /// <param name="g">Graphics</param>
+        /// <param name="ct">Office2007ScrollBarColorTable</param>
+        private void DrawToday(Graphics g, Office2007ScrollBarColorTable ct)
+        {
+            Office2007ScrollBarStateColorTable cst =
+                GetPageColorTable(ct, ePageNavigatorPart.Today);
+
+            float angle = (Orientation == eOrientation.Horizontal) ? 90f : 0f;
+
+            using (LinearGradientBrush lbr = new LinearGradientBrush(
+                _TodayBounds, cst.Background.Start, cst.Background.End, angle))
+            {
+                if (cst.TrackBackground.Count > 0)
+                    lbr.InterpolationColors = cst.TrackBackground.GetColorBlend();
+
+                g.FillRectangle(lbr, _TodayBounds);
+            }
+
+            g.DrawImageUnscaled(
+                GetTodayBitmap(g, cst),
+                CenterRect(_TodayBounds));
+        }
+
+        #region GetTodayBitmap
+
+        /// <summary>
+        /// Gets the Today Bitmap
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="cst"></param>
+        /// <returns></returns>
+        private Bitmap GetTodayBitmap(
+            Graphics g, Office2007ScrollBarStateColorTable cst)
+        {
+            if (_TodayBitmap == null)
+                _TodayBitmap = CreateTodayBitmap(g, cst);
+
+            return (_TodayBitmap);
+        }
+
+        /// <summary>
+        /// Creates the Today Bitmap
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="cst"></param>
+        /// <returns></returns>
+        private Bitmap CreateTodayBitmap(
+            Graphics g, Office2007ScrollBarStateColorTable cst)
+        {
+            Bitmap bmp = new Bitmap(Dpi.Width10, Dpi.Height10, g);
+
+            using (Graphics gBmp = Graphics.FromImage(bmp))
+            {
+                Rectangle r = new Rectangle(Dpi.Width1, Dpi.Height1, Dpi.Width6, Dpi.Height6);
+
+                gBmp.SmoothingMode = SmoothingMode.HighQuality;
+
+                Color color = ControlPaint.LightLight(cst.ThumbSignBackground.Start);
+
+                using (SolidBrush br = new SolidBrush(color))
+                {
+                    gBmp.FillEllipse(br, r);
+                }
+
+                using (Pen pen = new Pen(cst.ThumbSignBackground.End, Dpi.Width1))
+                {
+                    gBmp.DrawEllipse(pen, r);
+                }
+            }
+
+            return (bmp);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region DrawNextPage
+
+        /// <summary>
+        /// Draws the NextPage button
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="ct"></param>
+        private void DrawNextPage(Graphics g, Office2007ScrollBarColorTable ct)
+        {
+            Office2007ScrollBarStateColorTable cst =
+                GetPageColorTable(ct, ePageNavigatorPart.NextPage);
+
+            float angle = (Orientation == eOrientation.Horizontal) ? 90f : 0f;
+
+            using (LinearGradientBrush lbr = new LinearGradientBrush(
+                _NextPageBounds, cst.Background.Start, cst.Background.End, angle))
+            {
+                if (cst.TrackBackground.Count > 0)
+                    lbr.InterpolationColors = cst.TrackBackground.GetColorBlend();
+
+                g.FillRectangle(lbr, _NextPageBounds);
+            }
+
+            g.DrawImageUnscaled(
+                GetNextPageBitmap(g, cst),
+                CenterRect(_NextPageBounds));
+        }
+
+        #region GetNextPageBitmap
+
+        /// <summary>
+        /// Gets the NextPage Bitmap
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="cst"></param>
+        /// <returns></returns>
+        private Bitmap GetNextPageBitmap(Graphics g, Office2007ScrollBarStateColorTable cst)
+        {
+            if (_NextPageBitmap == null)
+                _NextPageBitmap = CreateNextPageBitmap(g, cst);
+
+            return (_NextPageBitmap);
+        }
+
+        /// <summary>
+        /// Creates the NextPage Bitmap
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="cst"></param>
+        /// <returns></returns>
+        private Bitmap CreateNextPageBitmap(Graphics g, Office2007ScrollBarStateColorTable cst)
+        {
+            Bitmap bmp = new Bitmap(Dpi.Width10, Dpi.Height10, g);
+
+            using (Graphics gBmp = Graphics.FromImage(bmp))
+            {
+                using (GraphicsPath path = new GraphicsPath())
+                {
+                    float angle;
+
+                    if (Orientation == eOrientation.Horizontal)
+                    {
+                        angle = 90;
+
+                        path.AddLines(new Point[] {
+                            new Point(Dpi.Width1,0),
+                            new Point(Dpi.Width5,Dpi.Height4), 
+                            new Point(Dpi.Width1,Dpi.Height8)
+                            });
+
+                        path.CloseFigure();
+
+                        path.AddLines(new Point[] {
+                            new Point(Dpi.Width5,0),
+                            new Point(Dpi.Width9,Dpi.Height4),
+                            new Point(Dpi.Width5,Dpi.Height8)
+                            });
+
+                        path.CloseFigure();
+                    }
+                    else
+                    {
+                        angle = 0;
+
+                        path.AddLines(new Point[] {
+                            new Point(Dpi.Width1,0),
+                            new Point(Dpi.Width8,0),
+                            new Point(Dpi.Width4,Dpi.Height4)
+                            });
+
+                        path.CloseFigure();
+
+                        path.AddLines(new Point[] {
+                            new Point(Dpi.Width1,Dpi.Height4),
+                            new Point(Dpi.Width8,Dpi.Height4),
+                            new Point(Dpi.Width4,Dpi.Height8)
+                            });
+
+                        path.CloseFigure();
+                    }
+
+                    Rectangle r = new Rectangle(0, 0, Dpi.Width10, Dpi.Height10);
+
+                    DisplayHelp.FillPath(gBmp, path, cst.ThumbSignBackground);
+                    //using (LinearGradientBrush lbr = new
+                    //    LinearGradientBrush(r, cst.ThumbSignBackground.Start, cst.ThumbSignBackground.End, angle))
+                    //{
+                    //    gBmp.FillPath(lbr, path);
+                    //}
+                }
+            }
+
+            return (bmp);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetPageColorTable
+
+        private Office2007ScrollBarStateColorTable
+            GetPageColorTable(Office2007ScrollBarColorTable ct, ePageNavigatorPart part)
+        {
+            if (GetEnabled() == false)
+                return (ct.Disabled);
+
+            if (MouseDownPart == part)
+                return (ct.Pressed);
+
+            if (MouseOverPart == part)
+                return (ct.MouseOver);
+
+            return (ct.Default);
+        }
+
+        #endregion
+
+        #region CenterRect
+
+        /// <summary>
+        /// Centers the given rect
+        /// </summary>
+        /// <param name="r"></param>
+        /// <returns></returns>
+        private Rectangle CenterRect(Rectangle r)
+        {
+            r.X += (r.Width - 10) / 2 + 1;
+            r.Y += (r.Height - 10) / 2 + 1;
+
+            if (r.X < 0)
+                r.X = 0;
+
+            if (r.Y < 0)
+                r.Y = 0;
+
+            return (r);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Mouse support
+
+        #region InternalMouseMove
+
+        /// <summary>
+        /// Processes InternalMouseMove events
+        /// </summary>
+        /// <param name="objArg"></param>
+        public override void InternalMouseMove(MouseEventArgs objArg)
+        {
+            if (GetEnabled() == true && DesignMode == false)
+            {
+                if (MouseDownPart == ePageNavigatorPart.None)
+                    MouseOverPart = HitTest(objArg.Location);
+            }
+
+            base.InternalMouseMove(objArg);
+        }
+
+        #region HitTest
+
+        /// <summary>
+        /// Returns the HitText area for the given point
+        /// </summary>
+        /// <param name="pt"></param>
+        /// <returns></returns>
+        public ePageNavigatorPart HitTest(Point pt)
+        {
+            if (_PreviousPageBounds.Contains(pt))
+                return (ePageNavigatorPart.PreviousPage);
+
+            if (_NextPageBounds.Contains(pt))
+                return (ePageNavigatorPart.NextPage);
+
+            if (_TodayBounds.Contains(pt))
+                return (ePageNavigatorPart.Today);
+
+            return (ePageNavigatorPart.None);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InternalMouseLeave
+
+        /// <summary>
+        /// Processes Mouse Leave events
+        /// </summary>
+        public override void InternalMouseLeave()
+        {
+            DisposeClickTimer();
+
+            MouseOverPart = ePageNavigatorPart.None;
+            MouseDownPart = ePageNavigatorPart.None;
+
+            base.InternalMouseLeave();
+        }
+
+        #endregion
+
+        #region InternalMouseDown
+
+        /// <summary>
+        /// Processes Mouse Down events
+        /// </summary>
+        /// <param name="objArg"></param>
+        public override void InternalMouseDown(MouseEventArgs objArg)
+        {
+            if (objArg.Button == MouseButtons.Left)
+            {
+                if (GetEnabled() && DesignMode == false)
+                {
+                    MouseDownPart = HitTest(objArg.Location);
+
+                    if (MouseDownPart != ePageNavigatorPart.None)
+                    {
+                        switch (MouseDownPart)
+                        {
+                            case ePageNavigatorPart.PreviousPage:
+                                OnNavigatePreviousPage();
+                                break;
+
+                            case ePageNavigatorPart.NextPage:
+                                OnNavigateNextPage();
+                                break;
+
+                            default:
+                                OnNavigateToday();
+                                break;
+                        }
+                    }
+                }
+            }
+
+            base.InternalMouseDown(objArg);
+        }
+
+        #endregion
+
+        #region InternalMouseUp
+
+        /// <summary>
+        /// Processes Mouse Up events
+        /// </summary>
+        /// <param name="objArg"></param>
+        public override void InternalMouseUp(MouseEventArgs objArg)
+        {
+            DisposeClickTimer();
+
+            MouseDownPart = ePageNavigatorPart.None;
+
+            base.InternalMouseUp(objArg);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region OnNavigate
+
+        /// <summary>
+        /// Raises the NavigatePreviousPage event
+        /// </summary>
+        protected virtual void OnNavigatePreviousPage()
+        {
+            if (NavigatePreviousPage != null)
+                NavigatePreviousPage(this, EventArgs.Empty);
+
+            EnableClickTimer();
+        }
+
+        /// <summary>
+        /// Raises the NavigateToday event
+        /// </summary>
+        protected virtual void OnNavigateToday()
+        {
+            if (NavigateToday != null)
+                NavigateToday(this, EventArgs.Empty);
+        }
+
+        /// <summary>
+        /// Raises the NavigateNextPage event
+        /// </summary>
+        protected virtual void OnNavigateNextPage()
+        {
+            if (NavigateNextPage != null)
+                NavigateNextPage(this, EventArgs.Empty);
+
+            EnableClickTimer();
+        }
+
+        #endregion
+
+        #region Timer support
+
+        #region ClickTimerTick
+
+        /// <summary>
+        /// Handles timer click events
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ClickTimerTick(object sender, EventArgs e)
+        {
+            switch (MouseDownPart)
+            {
+                case ePageNavigatorPart.PreviousPage:
+                    OnNavigatePreviousPage();
+                    break;
+
+                case ePageNavigatorPart.NextPage:
+                    OnNavigateNextPage();
+                    break;
+            }
+
+            // Auto ramp-up
+
+            if (_ClickTimer != null)
+            {
+                _AutoClickCount++;
+
+                if (_AutoClickCount > 4 && _ClickTimer.Interval > 20)
+                    _ClickTimer.Interval -= 10;
+            }
+        }
+
+        #endregion
+
+        #region UpdateClickTimer
+
+        /// <summary>
+        /// Enables our click timer
+        /// </summary>
+        private void EnableClickTimer()
+        {
+            if (ClickRepeatInterval > 0)
+            {
+                if (_ClickTimer == null)
+                {
+                    _ClickTimer = new Timer();
+
+                    _ClickTimer.Interval = ClickRepeatInterval;
+                    _ClickTimer.Tick += ClickTimerTick;
+
+                    _ClickTimer.Start();
+
+                    _AutoClickCount = 0;
+                }
+            }
+        }
+
+        #endregion
+
+        #region DisposeClickTimer
+
+        /// <summary>
+        /// Disposes of the click timer
+        /// </summary>
+        private void DisposeClickTimer()
+        {
+            if (_ClickTimer != null)
+            {
+                _ClickTimer.Tick -= ClickTimerTick;
+
+                _ClickTimer.Stop();
+                _ClickTimer.Dispose();
+
+                _ClickTimer = null;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region OnTooltipChanged
+
+        /// <summary>
+        /// OnTooltipChanged
+        /// </summary>
+        protected override void OnTooltipChanged()
+        {
+            UpdateTooltip();
+
+            base.OnTooltipChanged();
+        }
+
+        #endregion
+
+        #region UpdateTooltip
+
+        /// <summary>
+        /// Updates the control tooltip
+        /// </summary>
+        private void UpdateTooltip()
+        {
+            if (this.DesignMode == false)
+            {
+                string tip = "";
+
+                switch (MouseOverPart)
+                {
+                    case ePageNavigatorPart.PreviousPage:
+                        tip = _PreviousPageTooltip;
+                        break;
+
+                    case ePageNavigatorPart.Today:
+                        tip = _TodayTooltip;
+                        break;
+
+                    case ePageNavigatorPart.NextPage:
+                        tip = _NextPageTooltip;
+                        break;
+                }
+
+                if (tip.Equals("") == false)
+                {
+                    if (m_Tooltip != tip)
+                    {
+                        m_Tooltip = tip;
+
+                        if (this.ToolTipVisible)
+                            this.ShowToolTip();
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region Copy
+
+        /// <summary>
+        /// Returns copy of the item
+        /// </summary>
+        public override BaseItem Copy()
+        {
+            PageNavigatorItem objCopy = new PageNavigatorItem(Name);
+
+            this.CopyToItem(objCopy);
+
+            return (objCopy);
+        }
+        /// <summary>
+        /// Copies the PageNavigatorItem specific properties to
+        /// new instance of the item
+        /// </summary>
+        /// <param name="copy">New PageNavigatorItem instance</param>
+        protected override void CopyToItem(BaseItem copy)
+        {
+            PageNavigatorItem c = copy as PageNavigatorItem;
+
+            if (c != null)
+            {
+                base.CopyToItem(c);
+
+                c.PreviousPageTooltip = _PreviousPageTooltip;
+                c.TodayTooltip = _TodayTooltip;
+                c.NextPageTooltip = _NextPageTooltip;
+            }
+        }
+
+        #endregion
+
+        #region Dispose
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        protected override void Dispose(bool disposing)
+        {
+            DisposeClickTimer();
+
+            ReleaseBitmap(ref _PreviousPageBitmap);
+            ReleaseBitmap(ref _TodayBitmap);
+            ReleaseBitmap(ref _NextPageBitmap);
+
+            base.Dispose(disposing);
+        }
+
+        /// <summary>
+        /// Releases the given bitmap
+        /// </summary>
+        /// <param name="bmp">Bitmap to release</param>
+        private void ReleaseBitmap(ref Bitmap bmp)
+        {
+            if (bmp != null)
+            {
+                bmp.Dispose();
+                bmp = null;
+            }
+        }
+
+        #endregion
+    }
+
+    #region Enums
+
+    /// <summary>
+    /// Defines the PageNavigator item parts
+    /// </summary>
+    public enum ePageNavigatorPart
+    {
+        /// <summary>
+        /// Indicates no part
+        /// </summary>
+        None,
+
+        /// <summary>
+        /// Indicates the PreviousPage button of the control
+        /// </summary>
+        PreviousPage,
+
+        /// <summary>
+        /// Indicates the TodayPage button of the control
+        /// </summary>
+        Today,
+
+        /// <summary>
+        /// Indicates the NextPage button of the control
+        /// </summary>
+        NextPage,
+    }
+
+    #endregion
+
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/Controls/PageSlider.ico b/PROMS/DotNetBar Source Code/Controls/PageSlider.ico
new file mode 100644
index 00000000..952a8a68
Binary files /dev/null and b/PROMS/DotNetBar Source Code/Controls/PageSlider.ico differ
diff --git a/PROMS/DotNetBar Source Code/Controls/PageSlider/PageSlider.cs b/PROMS/DotNetBar Source Code/Controls/PageSlider/PageSlider.cs
new file mode 100644
index 00000000..8a05b5a0
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/PageSlider/PageSlider.cs	
@@ -0,0 +1,1341 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows.Forms;
+using System.ComponentModel;
+using System.Drawing;
+using DevComponents.DotNetBar.ScrollBar;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    [ToolboxItem(true), Description("Page Slider Control with Touch Support")]
+    [Designer("DevComponents.DotNetBar.Design.PageSliderDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+    [DefaultEvent("SelectedPageChanged"), DefaultProperty("SelectedPageIndex")]
+    [ToolboxBitmap(typeof(StepIndicator), "Controls.PageSlider.ico")]
+    public class PageSlider : Control
+    {
+        #region Constructor
+        private StepIndicator _StepIndicator;
+        private Touch.TouchHandler _TouchHandler = null;
+        private HScrollBarAdv _HorizontalScrollBar = null;
+        private VScrollBarAdv _VerticalScrollBar = null;
+        /// <summary>
+        /// Initializes a new instance of the PageSlider class.
+        /// </summary>
+        public PageSlider()
+        {
+            _StepIndicator = new StepIndicator();
+            _StepIndicator.Dock = DockStyle.Top;
+            this.Controls.Add(_StepIndicator);
+            if (BarFunctions.IsWindows7 && Touch.TouchHandler.IsTouchEnabled)
+            {
+                _TouchHandler = new DevComponents.DotNetBar.Touch.TouchHandler(this);
+                _TouchHandler.PanBegin += new EventHandler<DevComponents.DotNetBar.Touch.GestureEventArgs>(TouchHandlerPanBegin);
+                _TouchHandler.Pan += new EventHandler<DevComponents.DotNetBar.Touch.GestureEventArgs>(TouchHandlerPan);
+                _TouchHandler.PanEnd += new EventHandler<DevComponents.DotNetBar.Touch.GestureEventArgs>(TouchHandlerPanEnd);
+            }
+            _HorizontalScrollBar = new HScrollBarAdv();
+            _HorizontalScrollBar.Dock = DockStyle.Bottom;
+            _HorizontalScrollBar.Height = 12;
+            _HorizontalScrollBar.Scroll += new ScrollEventHandler(ScrollBarScroll);
+            _HorizontalScrollBar.Visible = false;
+            this.Controls.Add(_HorizontalScrollBar);
+
+            _VerticalScrollBar = new VScrollBarAdv();
+            _VerticalScrollBar.Dock = DockStyle.Right;
+            _VerticalScrollBar.Width = 12;
+            _VerticalScrollBar.Scroll += new ScrollEventHandler(ScrollBarScroll);
+            _VerticalScrollBar.Visible = false;
+            this.Controls.Add(_VerticalScrollBar);
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            StopScrollBarTimer();
+
+            _HorizontalScrollBar.Scroll -= new ScrollEventHandler(ScrollBarScroll);
+            _VerticalScrollBar.Scroll -= new ScrollEventHandler(ScrollBarScroll);
+            _HorizontalScrollBar.Dispose();
+            _VerticalScrollBar.Dispose();
+            _VerticalScrollBar = null;
+            _HorizontalScrollBar = null;
+            if (_TouchHandler != null)
+            {
+                _TouchHandler.PanBegin -= new EventHandler<DevComponents.DotNetBar.Touch.GestureEventArgs>(TouchHandlerPanBegin);
+                _TouchHandler.Pan -= new EventHandler<DevComponents.DotNetBar.Touch.GestureEventArgs>(TouchHandlerPan);
+                _TouchHandler.PanEnd -= new EventHandler<DevComponents.DotNetBar.Touch.GestureEventArgs>(TouchHandlerPanEnd);
+                _TouchHandler.Release();
+            }
+
+            base.Dispose(disposing);
+        }
+        
+        #endregion
+
+        #region Events
+        /// <summary>
+        /// Occurs when selected page has changed.
+        /// </summary>
+        [Description("Occurs when selected page has changed.")]
+        public event EventHandler SelectedPageChanged;
+        /// <summary>
+        /// Raises SelectedPageChanged event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnSelectedPageChanged(EventArgs e)
+        {
+            EventHandler handler = SelectedPageChanged;
+            if (handler != null)
+                handler(this, e);
+        }
+        #endregion
+
+        #region Implementation
+
+        protected override void ScaleControl(SizeF factor, BoundsSpecified specified)
+        {
+            if (Dpi.RecordScalePerControl)
+                Dpi.SetScaling(factor);
+            //_StepIndicator.Height = Dpi.Height(_StepIndicator.Height);
+            base.ScaleControl(factor, specified);
+        }
+
+        protected override Size DefaultSize
+        {
+            get
+            {
+                return new Size(300, 200);
+            }
+        }
+        protected override void OnHandleCreated(EventArgs e)
+        {
+            if (_UpdateScrollBarVisibilityDelayed)
+            {
+                _UpdateScrollBarVisibilityDelayed = false;
+                UpdateScrollBarVisibility();
+            }
+            UpdateBoundsForAllPages(false);
+            base.OnHandleCreated(e);
+        }
+        protected override void OnHandleDestroyed(EventArgs e)
+        {
+            StopScrollBarTimer();
+            base.OnHandleDestroyed(e);
+        }
+
+        private bool _IndicatorVisible = true;
+        /// <summary>
+        /// Gets or sets whether current page indicator is visible. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance"), Description("Indicates whether current page indicator is visible.")]
+        public bool IndicatorVisible
+        {
+            get { return _IndicatorVisible; }
+            set
+            {
+                if (value != _IndicatorVisible)
+                {
+                    bool oldValue = _IndicatorVisible;
+                    _IndicatorVisible = value;
+                    OnIndicatorVisibleChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when IndicatorVisible property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnIndicatorVisibleChanged(bool oldValue, bool newValue)
+        {
+            _StepIndicator.Visible = newValue;
+        }
+
+        protected override void OnControlAdded(ControlEventArgs e)
+        {
+            if (e.Control is PageSliderPage)
+            {
+                PageSliderPage page = (PageSliderPage)e.Control;
+                UpdatePageTable();
+                page.Bounds = GetPageBounds(page);
+                UpdateScrollBar();
+            }
+            base.OnControlAdded(e);
+        }
+        protected override void OnControlRemoved(ControlEventArgs e)
+        {
+            if (e.Control is PageSliderPage)
+            {
+                PageSliderPage page = (PageSliderPage)e.Control;
+                int pageIndex = _PageTable.IndexOf(page);
+                _PageTable.Remove(page);
+                UpdatePageTable();
+                if (_SelectedPage == page)
+                {
+                    if (_PageTable.Count > 0)
+                        this.SelectedPage = _PageTable[pageIndex > 0 ? pageIndex-- : 0];
+                    else
+                        this.SelectedPage = null;
+                }
+                UpdateScrollBar();
+                UpdateBoundsForAllPages(false, true);
+            }
+            base.OnControlRemoved(e);
+        }
+        protected override void OnLayout(LayoutEventArgs levent)
+        {
+            base.OnLayout(levent);
+            if (levent.AffectedProperty == "ChildIndex")
+            {
+                UpdatePageTable();
+                UpdateBoundsForAllPages(true, true);
+            }
+        }
+        private void UpdateBoundsForAllPages(bool updateControl)
+        {
+            UpdateBoundsForAllPages(updateControl, false);
+        }
+        private void UpdateBoundsForAllPages(bool updateControl, bool syncPageIndicator)
+        {
+            Rectangle selectedPageBounds = GetSelectedPageBounds();
+            int currentPage = -1;
+            for (int i = 0; i < _PageTable.Count; i++)
+            {
+
+                PageSliderPage page = _PageTable[i];
+                page.Bounds = GetPageBounds(page);
+                if (updateControl && page.Bounds.IntersectsWith(this.ClientRectangle))
+                    this.Update();
+                if (syncPageIndicator && !_PageBoundsOffset.IsEmpty && page.Bounds.IntersectsWith(selectedPageBounds) && currentPage == -1)
+                    currentPage = i + 1;
+            }
+            if (syncPageIndicator && _PageBoundsOffset.IsEmpty)
+                currentPage = this.SelectedPageIndex + 1;
+            if (syncPageIndicator && currentPage > 0)
+                _StepIndicator.CurrentStep = currentPage;
+            UpdateScrollBar();
+        }
+        private void UpdateScrollBar()
+        {
+            int selectedPageIndex = this.SelectedPageIndex;
+            Rectangle selectedPageBounds = GetSelectedPageBounds();
+            Rectangle firstPageBounds = Rectangle.Empty, lastPageBounds = Rectangle.Empty;
+            if (_PageTable.Count > 0)
+            {
+                firstPageBounds = _PageTable[0].Bounds;
+                lastPageBounds = _PageTable[_PageTable.Count - 1].Bounds;
+            }
+
+            if (_Orientation == eOrientation.Horizontal)
+            {
+                _HorizontalScrollBar.Minimum = 0;
+                _HorizontalScrollBar.Maximum = Math.Max(1, lastPageBounds.Right - firstPageBounds.X + (selectedPageIndex == -1 ? firstPageBounds.X : 0));
+                _HorizontalScrollBar.LargeChange = Math.Max(1, selectedPageBounds.Width);
+                _HorizontalScrollBar.SmallChange = 32;
+                if (!_IsScrolling && selectedPageIndex != -1)
+                    _HorizontalScrollBar.Value = Math.Min(Math.Max(_HorizontalScrollBar.Minimum, Math.Abs(firstPageBounds.X)), _HorizontalScrollBar.Maximum);
+            }
+            else
+            {
+                _VerticalScrollBar.Minimum = 0;
+                _VerticalScrollBar.Maximum = Math.Max(1, lastPageBounds.Bottom - firstPageBounds.Y + (selectedPageIndex == -1 ? firstPageBounds.Y : 0));
+                _VerticalScrollBar.LargeChange = Math.Max(1, selectedPageBounds.Height);
+                _VerticalScrollBar.SmallChange = 32;
+                if (!_IsScrolling && selectedPageIndex != -1)
+                    _VerticalScrollBar.Value = Math.Min(Math.Max(_VerticalScrollBar.Minimum, Math.Abs(firstPageBounds.Y)), _VerticalScrollBar.Maximum);
+            }
+        }
+
+        private bool _IsScrolling = false;
+        private int _InitialScrollValue = 0;
+        private void ScrollBarScroll(object sender, ScrollEventArgs e)
+        {
+            if (e.Type == ScrollEventType.EndScroll)
+            {
+                _IsScrolling = false;
+                Rectangle selectedPageBounds = GetSelectedPageBounds();
+                PageSliderPage newSelection = this.SelectedPage;
+                // Find right page to select since control can be scrolled a lot using scroll-bars
+                if (e.NewValue > _InitialScrollValue)
+                {
+                    for (int i = _PageTable.Count - 1; i >= 0; i--)
+                    {
+                        PageSliderPage page = _PageTable[i];
+                        if (page.Bounds.IntersectsWith(selectedPageBounds) && selectedPageBounds.Right - page.Left >= TriggerPageChangeOffset)
+                        {
+                            newSelection = page;
+                            break;
+                        }
+                    }
+                }
+                else
+                {
+                    for (int i = 0; i < _PageTable.Count; i++)
+                    {
+                        PageSliderPage page = _PageTable[i];
+                        if (page.Bounds.IntersectsWith(selectedPageBounds) && page.Right - selectedPageBounds.X >= TriggerPageChangeOffset)
+                        {
+                            newSelection = page;
+                            break;
+                        }
+                    }
+                }
+
+                if (this.SelectedPage != newSelection)
+                {
+                    this.SelectedPage = newSelection;
+                    if (_Orientation == eOrientation.Horizontal)
+                        _HorizontalScrollBar.Value = Math.Abs(_PageTable[0].Left);
+                    else
+                        _VerticalScrollBar.Value = Math.Abs(_PageTable[0].Top);
+                }
+                else
+                    PageBoundsOffset = Point.Empty;
+            }
+            else
+            {
+                if (!_IsScrolling)
+                {
+                    if (_Orientation == eOrientation.Horizontal)
+                        _InitialScrollValue = _HorizontalScrollBar.Value;
+                    else
+                        _InitialScrollValue = _VerticalScrollBar.Value;
+                    _IsScrolling = true;
+                }
+                if (e.ScrollOrientation == ScrollOrientation.HorizontalScroll)
+                    PageBoundsOffset = new Point(_InitialScrollValue - e.NewValue, 0);
+                else
+                    PageBoundsOffset = new Point(0, _InitialScrollValue - e.NewValue);
+            }
+        }
+        protected override void OnResize(EventArgs e)
+        {
+            UpdateBoundsForAllPages(false);
+            base.OnResize(e);
+        }
+
+        private Rectangle GetSelectedPageBounds()
+        {
+            Rectangle selectedPageBounds = DeflateRectangle(this.ClientRectangle, _PagePadding);
+            if (_Orientation == eOrientation.Horizontal)
+                selectedPageBounds.Width -= _PageSpacing + _NextPageVisibleMargin;
+            else
+                selectedPageBounds.Height -= _PageSpacing + _NextPageVisibleMargin;
+
+            if (_IndicatorVisible)
+            {
+                if (_StepIndicator.Dock == DockStyle.Top)
+                {
+                    selectedPageBounds.Y += _StepIndicator.Height;
+                    selectedPageBounds.Height -= _StepIndicator.Height;
+                }
+                else if (_StepIndicator.Dock == DockStyle.Bottom)
+                {
+                    selectedPageBounds.Height -= _StepIndicator.Height;
+                }
+                else if (_StepIndicator.Dock == DockStyle.Left)
+                {
+                    selectedPageBounds.X += _StepIndicator.Width;
+                    selectedPageBounds.Width -= _StepIndicator.Width;
+                }
+                else if (_StepIndicator.Dock == DockStyle.Right)
+                {
+                    selectedPageBounds.Width -= _StepIndicator.Width;
+                }
+            }
+            if (_ScrollBarVisibility == eScrollBarVisibility.AlwaysVisible)
+            {
+                if (_Orientation == eOrientation.Horizontal)
+                    selectedPageBounds.Height -= _HorizontalScrollBar.Height;
+                else
+                    selectedPageBounds.Width -= _HorizontalScrollBar.Width;
+
+            }
+            return selectedPageBounds;
+        }
+
+        private Point PageBoundsOffset
+        {
+            get { return _PageBoundsOffset; }
+            set
+            {
+                if (_PageBoundsOffset != value)
+                {
+                    _PageBoundsOffset = value;
+                    UpdateBoundsForAllPages(true, true);
+                }
+            }
+        }
+        private Point _PageBoundsOffset = Point.Empty;
+        private System.Drawing.Rectangle GetPageBounds(PageSliderPage page)
+        {
+            int pageIndex = _PageTable.IndexOf(page);
+            int selectedPageIndex = this.SelectedPageIndex;
+            Rectangle bounds = Rectangle.Empty;
+
+            Rectangle selectedPageBounds = GetSelectedPageBounds();
+
+            if (pageIndex == selectedPageIndex)
+            {
+                bounds = selectedPageBounds;
+            }
+            else if (pageIndex > selectedPageIndex)
+            {
+                bounds = selectedPageBounds;
+                if (_Orientation == eOrientation.Horizontal)
+                    bounds.X += (_PageSpacing + bounds.Width) * (pageIndex - selectedPageIndex);
+                else
+                    bounds.Y += (_PageSpacing + bounds.Height) * (pageIndex - selectedPageIndex);
+            }
+            else
+            {
+                bounds = selectedPageBounds;
+                if (_Orientation == eOrientation.Horizontal)
+                    bounds.X -= (_PageSpacing + bounds.Width) * (selectedPageIndex - pageIndex);
+                else
+                    bounds.Y -= (_PageSpacing + bounds.Height) * (selectedPageIndex - pageIndex);
+            }
+
+            bounds.Offset(_PageBoundsOffset);
+
+            return bounds;
+        }
+
+        private Rectangle DeflateRectangle(Rectangle rect, Padding padding)
+        {
+            rect.X += padding.Left;
+            rect.Y += padding.Top;
+            rect.Width -= padding.Horizontal;
+            rect.Height -= padding.Vertical;
+            return rect;
+        }
+
+        private List<PageSliderPage> _PageTable = new List<PageSliderPage>();
+        private void UpdatePageTable()
+        {
+            _PageTable.Clear();
+            foreach (Control control in this.Controls)
+            {
+                PageSliderPage page = control as PageSliderPage;
+                if (page == null) continue;
+                bool appendPage = true;
+                for (int i = 0; i < _PageTable.Count; i++)
+                {
+                    if (_PageTable[i].PageNumber > page.PageNumber)
+                    {
+                        _PageTable.Insert(i, page);
+                        appendPage = false;
+                        break;
+                    }
+                }
+                if (appendPage) _PageTable.Add(page);
+            }
+
+            _StepIndicator.StepCount = _PageTable.Count;
+            _StepIndicator.CurrentStep = this.SelectedPageIndex + 1;
+        }
+
+        /// <summary>
+        /// Returns array of all pages in control.
+        /// </summary>
+        /// <returns>Array of pages.</returns>
+        public PageSliderPage[] GetAllPages()
+        {
+            return _PageTable.ToArray();
+        }
+
+        /// <summary>
+        /// Removes and disposes all pages within the control.
+        /// </summary>
+        public void RemoveAllPages()
+        {
+            foreach (PageSliderPage page in _PageTable)
+            {
+                page.Visible = false;
+            }
+            while (_PageTable.Count > 0)
+            {
+                PageSliderPage page = _PageTable[0];
+                this.Controls.Remove(page);
+                page.Dispose();
+            }
+        }
+
+        private PageSliderPage _SelectedPage;
+        /// <summary>
+        /// Indicates selected page.
+        /// </summary>
+        [DefaultValue(null), Category("Appearance"), Description("Indicates selected page.")]
+        public PageSliderPage SelectedPage
+        {
+            get { return _SelectedPage; }
+            set
+            {
+                if (value != _SelectedPage)
+                {
+                    PageSliderPage oldValue = _SelectedPage;
+                    _SelectedPage = value;
+                    OnSelectedPageChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when SelectedPage property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnSelectedPageChanged(PageSliderPage oldValue, PageSliderPage newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("SelectedPage"));
+            if (_AnimationTime > 0)
+                AnimatePageTransition(oldValue, newValue);
+            else
+                UpdateBoundsForAllPages(false);
+            //if (newValue != null)
+            //{
+            //    newValue.Bounds = GetPageBounds(newValue);
+            //    newValue.BringToFront();
+            //}
+            UpdateScrollBar();
+            _StepIndicator.CurrentStep = this.SelectedPageIndex + 1;
+            OnSelectedPageChanged(EventArgs.Empty);
+        }
+
+        private void AnimatePageTransition(PageSliderPage oldValue, PageSliderPage newValue)
+        {
+            int oldIndex = -1;
+            if (oldValue != null)
+                oldIndex = _PageTable.IndexOf(oldValue);
+            int newIndex = -1;
+            if (newValue != null)
+                newIndex = _PageTable.IndexOf(newValue);
+            if (oldIndex == newIndex)
+            {
+                UpdateBoundsForAllPages(false);
+                _PageBoundsOffset = Point.Empty;
+                return;
+            }
+            int totalOffset = 0;
+
+            Rectangle selectedPageBounds = GetSelectedPageBounds();
+
+            if (_Orientation == eOrientation.Horizontal)
+            {
+                totalOffset = ((oldIndex - newIndex) * (selectedPageBounds.Width + _PageSpacing)) - _PageBoundsOffset.X;
+            }
+            else
+            {
+                totalOffset = ((oldIndex - newIndex) * (selectedPageBounds.Height + _PageSpacing)) - _PageBoundsOffset.Y;
+            }
+
+            _PageBoundsOffset = Point.Empty;
+
+            DateTime startingTime = DateTime.Now;
+            int speedFactor = 1;
+            int remainOffset = Math.Abs(totalOffset);
+            int offsetSign = Math.Sign(totalOffset);
+            int animationTimeDuration = _AnimationTime;
+
+            if (_Orientation == eOrientation.Horizontal && remainOffset < selectedPageBounds.Width * .8 ||
+                _Orientation == eOrientation.Vertical && remainOffset < selectedPageBounds.Height * .8)
+            {
+                if (_Orientation == eOrientation.Horizontal)
+                    animationTimeDuration *= (remainOffset / selectedPageBounds.Width);
+                else
+                    animationTimeDuration *= (remainOffset / selectedPageBounds.Height);
+                animationTimeDuration = Math.Max(animationTimeDuration, 50);
+            }
+
+            TimeSpan animationTime = new TimeSpan(0, 0, 0, 0, animationTimeDuration);
+            while (remainOffset > 0)
+            {
+                DateTime startPerMove = DateTime.Now;
+
+                foreach (PageSliderPage page in _PageTable)
+                {
+                    Rectangle bounds = page.Bounds;
+                    if (_Orientation == eOrientation.Horizontal)
+                        bounds.Offset(speedFactor * offsetSign, 0);
+                    else
+                        bounds.Offset(0, speedFactor * offsetSign);
+                    page.Bounds = bounds;
+                    if (bounds.IntersectsWith(this.ClientRectangle))
+                        this.Update();
+                }
+                remainOffset -= speedFactor;
+                TimeSpan elapsedPerMove = DateTime.Now - startPerMove;
+                TimeSpan elapsedTime = DateTime.Now - startingTime;
+                if ((animationTime - elapsedTime).TotalMilliseconds <= 0)
+                    speedFactor = remainOffset;
+                else
+                {
+                    if ((int)(animationTime - elapsedTime).TotalMilliseconds == 0)
+                        speedFactor = 1;
+                    else
+                        speedFactor = remainOffset * (int)elapsedPerMove.TotalMilliseconds / Math.Max(1, (int)((animationTime - elapsedTime).TotalMilliseconds));
+                }
+                if (speedFactor > remainOffset) speedFactor = remainOffset;
+            }
+        }
+
+        private int _AnimationTime = 250;
+        /// <summary>
+        /// Indicates the animation time in milliseconds for operations that perform visual animation of transition. Set to zero to disable animation.
+        /// </summary>
+        [DefaultValue(250), Category("Behavior"), Description("Indicates the animation time in milliseconds for operations that perform visual animation of transition. Set to zero to disable animation.")]
+        public int AnimationTime
+        {
+            get { return _AnimationTime; }
+            set
+            {
+                if (value != _AnimationTime)
+                {
+                    int oldValue = _AnimationTime;
+                    _AnimationTime = value;
+                    OnAnimationTimeChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when AnimationTime property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnAnimationTimeChanged(int oldValue, int newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("AnimationTime"));
+
+        }
+
+        /// <summary>
+        /// Gets or sets zero based selected page index. If there is no page selected returns -1.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public int SelectedPageIndex
+        {
+            get { return _SelectedPage != null ? _PageTable.IndexOf(_SelectedPage) : -1; }
+            set
+            {
+                if (value < 0 || value >= _PageTable.Count)
+                    throw new ArgumentOutOfRangeException("SelectedPageIndex must be greater or equal than 0 and less or equal than number of pages added to control.");
+                this.SelectedPage = _PageTable[value];
+            }
+        }
+
+        private int _PageCount;
+        /// <summary>
+        /// Gets the total number of pages displayed by the control.
+        /// </summary>
+        [Browsable(false)]
+        public int PageCount
+        {
+            get
+            {
+                return _PageTable.Count;
+            }
+        }
+
+        private Padding _PagePadding = new Padding(4);
+        /// <summary>
+        /// Gets or sets the single page padding.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public Padding PagePadding
+        {
+            get { return _PagePadding; }
+            set
+            {
+                if (value != _PagePadding)
+                {
+                    Padding oldValue = _PagePadding;
+                    _PagePadding = value;
+                    OnPagePaddingChanged(oldValue, value);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Called when SelectedPagePadding property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnPagePaddingChanged(Padding oldValue, Padding newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("SelectedPagePadding"));
+            UpdateBoundsForAllPages(false);
+        }
+
+        private const int DefaultPageSpacing = 48;
+        private int _PageSpacing = DefaultPageSpacing;
+        /// <summary>
+        /// Gets or sets the spacing in pixels between pages.
+        /// </summary>
+        [DefaultValue(DefaultPageSpacing), Category("Appearance"), Description("Indicates spacing in pixels between pages.")]
+        public int PageSpacing
+        {
+            get { return _PageSpacing; }
+            set
+            {
+                if (value != _PageSpacing)
+                {
+                    int oldValue = _PageSpacing;
+                    _PageSpacing = value;
+                    OnPageSpacingChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when PageSpacing property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnPageSpacingChanged(int oldValue, int newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("PageSpacing"));
+            UpdateBoundsForAllPages(false);
+        }
+
+        private const int DefaultNextPageVisibleMargin = 50;
+        private int _NextPageVisibleMargin = DefaultNextPageVisibleMargin;
+        [DefaultValue(DefaultNextPageVisibleMargin)]
+        public int NextPageVisibleMargin
+        {
+            get { return _NextPageVisibleMargin; }
+            set
+            {
+                if (value != _NextPageVisibleMargin)
+                {
+                    int oldValue = _NextPageVisibleMargin;
+                    _NextPageVisibleMargin = value;
+                    OnNextPageVisibleMarginChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when NextPageVisibleMargin property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnNextPageVisibleMarginChanged(int oldValue, int newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("NextPageVisibleMargin"));
+            UpdateBoundsForAllPages(false);
+        }
+
+        private eOrientation _Orientation = eOrientation.Horizontal;
+        /// <summary>
+        /// Gets or sets the page layout orientation. Default is horizontal.
+        /// </summary>
+        [DefaultValue(eOrientation.Horizontal), Category("Appearance"), Description("Indicates page layout orientation.")]
+        public eOrientation Orientation
+        {
+            get { return _Orientation; }
+            set
+            {
+                if (value != _Orientation)
+                {
+                    eOrientation oldValue = _Orientation;
+                    _Orientation = value;
+                    OnOrientationChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when Orientation property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnOrientationChanged(eOrientation oldValue, eOrientation newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("Orientation"));
+            UpdateBoundsForAllPages(false);
+        }
+
+        protected override void WndProc(ref Message m)
+        {
+            if (m.Msg == (int)WinApi.WindowsMessages.WM_APPCOMMAND)
+            {
+                int cmd = WinApi.GetAppCommandLParam(m.LParam);
+                if (cmd == (int)WinApi.AppCommands.APPCOMMAND_BROWSER_BACKWARD)
+                {
+                    if (this.SelectedPageIndex > 0)
+                        this.SelectedPageIndex--;
+                    m.Result = new IntPtr(1);
+                }
+                else if (cmd == (int)WinApi.AppCommands.APPCOMMAND_BROWSER_FORWARD)
+                {
+                    if (this.SelectedPageIndex < _PageTable.Count - 1)
+                        this.SelectedPageIndex++;
+                    m.Result = new IntPtr(1);
+                }
+            }
+            base.WndProc(ref m);
+        }
+        private bool _MouseDrag = false;
+        protected override void OnMouseDown(MouseEventArgs e)
+        {
+            if (e.Button == MouseButtons.Left && _TouchHandler == null && _PageTable.Count > 0 && _MouseDragEnabled)
+            {
+                _MouseDrag = true;
+                _TouchStartLocation = e.Location;
+            }
+            base.OnMouseDown(e);
+        }
+
+        private bool _PageMouseDragEnabled = true;
+        /// <summary>
+        /// Indicates whether page can be dragged using mouse to change currently selected page
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether page can be dragged using mouse to change currently selected page")]
+        public bool PageMouseDragEnabled
+        {
+            get { return _PageMouseDragEnabled; }
+            set
+            {
+                _PageMouseDragEnabled = value;
+            }
+        }
+        private bool _MouseDragEnabled = true;
+        /// <summary>
+        /// Indicates whether selected page can be changed by using mouse drag on PageSlider client area which is not covered by pages.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether selected page can be changed by using mouse drag on PageSlider client area which is not covered by pages.")]
+        public bool MouseDragEnabled
+        {
+            get { return _MouseDragEnabled; }
+            set
+            {
+                _MouseDragEnabled = value;
+            }
+        }
+        
+        
+        internal void StartPageDrag()
+        {
+            if (_PageMouseDragEnabled && !_MouseDrag && Control.MouseButtons == MouseButtons.Left && _TouchHandler == null && _PageTable.Count > 0)
+            {
+                this.Capture = true;
+                _MouseDrag = true;
+                _TouchStartLocation = this.PointToClient(Control.MousePosition);
+            }
+        }
+        private int MaximumReversePageOffset
+        {
+            get
+            {
+                return Math.Min(32, this.Width / 6);
+            }
+        }
+        private int TriggerPageChangeOffset
+        {
+            get
+            {
+                return Math.Max(32, this.Width / 5);
+            }
+        }
+        protected override void OnMouseMove(MouseEventArgs e)
+        {
+            if (_ScrollBarVisibility == eScrollBarVisibility.AutoVisible && !_HorizontalScrollBar.Visible && !_VerticalScrollBar.Visible)
+                StartScrollBarTimer();
+
+            if (_MouseDrag)
+            {
+                Rectangle selectedPageBounds = GetSelectedPageBounds();
+                if (_Orientation == eOrientation.Horizontal)
+                {
+                    int offset = e.Location.X - _TouchStartLocation.X;
+                    int offsetChange = offset - _PageBoundsOffset.X;
+                    Rectangle firstPageBounds = GetPageBounds(_PageTable[0]);
+                    if (_PageTable[0].Left + offsetChange > selectedPageBounds.X + MaximumReversePageOffset && SelectedPageIndex >= 0)
+                    {
+                        offset -= (_PageTable[0].Left + offsetChange) - (selectedPageBounds.X + MaximumReversePageOffset);
+                    }
+                    else if (_PageTable[_PageTable.Count - 1].Left + offsetChange < selectedPageBounds.X - MaximumReversePageOffset)
+                    {
+                        offset += (selectedPageBounds.X - MaximumReversePageOffset) - (_PageTable[_PageTable.Count - 1].Left + offsetChange);
+                    }
+                    PageBoundsOffset = new Point(offset, 0);
+                }
+                else
+                {
+                    int offset = e.Location.Y - _TouchStartLocation.Y;
+                    int offsetChange = offset - _PageBoundsOffset.Y;
+                    Rectangle firstPageBounds = GetPageBounds(_PageTable[0]);
+                    if (_PageTable[0].Top + offsetChange > selectedPageBounds.Y + MaximumReversePageOffset && SelectedPageIndex >= 0)
+                    {
+                        offset -= (_PageTable[0].Top + offsetChange) - (selectedPageBounds.Y + MaximumReversePageOffset);
+                    }
+                    else if (_PageTable[_PageTable.Count - 1].Top + offsetChange < selectedPageBounds.Y - MaximumReversePageOffset)
+                    {
+                        offset += (selectedPageBounds.Y - MaximumReversePageOffset) - (_PageTable[_PageTable.Count - 1].Top + offsetChange);
+                    }
+                    PageBoundsOffset = new Point(0, offset);
+                }
+            }
+            base.OnMouseMove(e);
+        }
+        protected override void OnMouseUp(MouseEventArgs e)
+        {
+            if (_MouseDrag)
+            {
+                _MouseDrag = false;
+                int totalMoveOffset = _Orientation == eOrientation.Horizontal ? _PageBoundsOffset.X : _PageBoundsOffset.Y;
+                if (Math.Abs(totalMoveOffset) >= TriggerPageChangeOffset)
+                {
+                    Rectangle selectedPageBounds = GetSelectedPageBounds();
+                    if (totalMoveOffset < 0)
+                    {
+                        if (this.SelectedPageIndex < _PageTable.Count - 1)
+                        {
+                            PageSliderPage newSelection = _PageTable[this.SelectedPageIndex + 1];
+                            // Find right page to select since control can be scrolled a lot through inertia
+                            for (int i = _PageTable.Count - 1; i >= 0; i--)
+                            {
+                                PageSliderPage page = _PageTable[i];
+                                if (page.Bounds.IntersectsWith(selectedPageBounds) && selectedPageBounds.Right - page.Left >= TriggerPageChangeOffset)
+                                {
+                                    newSelection = page;
+                                    break;
+                                }
+                            }
+                            if (this.SelectedPage != newSelection)
+                                this.SelectedPage = newSelection;
+                            else
+                                PageBoundsOffset = Point.Empty;
+                        }
+                        else
+                            PageBoundsOffset = Point.Empty;
+                    }
+                    else
+                    {
+                        if (this.SelectedPageIndex > 0)
+                        {
+                            PageSliderPage newSelection = _PageTable[this.SelectedPageIndex - 1];
+                            // Find right page to select since control can be scrolled a lot through inertia
+                            for (int i = 0; i < _PageTable.Count; i++)
+                            {
+                                PageSliderPage page = _PageTable[i];
+                                if (page.Bounds.IntersectsWith(selectedPageBounds) && page.Right - selectedPageBounds.X >= TriggerPageChangeOffset)
+                                {
+                                    newSelection = page;
+                                    break;
+                                }
+                            }
+                            if (this.SelectedPage != newSelection)
+                                this.SelectedPage = newSelection;
+                            else
+                                PageBoundsOffset = Point.Empty;
+                        }
+                        else
+                            PageBoundsOffset = Point.Empty;
+                    }
+                }
+                else
+                    PageBoundsOffset = Point.Empty;
+            }
+            base.OnMouseUp(e);
+        }
+
+        protected override void OnVisibleChanged(EventArgs e)
+        {
+            if (_ScrollBarVisibility == eScrollBarVisibility.AutoVisible && this.Visible)
+            {
+                StartScrollBarTimer();
+            }
+            base.OnVisibleChanged(e);
+        }
+
+        private eScrollBarVisibility _ScrollBarVisibility = eScrollBarVisibility.AutoVisible;
+        /// <summary>
+        /// Indicates scrollbar visibility.
+        /// </summary>
+        [DefaultValue(eScrollBarVisibility.AutoVisible), Category("Behavior"), Description("Indicates scrollbar visibility.")]
+        public eScrollBarVisibility ScrollBarVisibility
+        {
+            get { return _ScrollBarVisibility; }
+            set
+            {
+                if (value != _ScrollBarVisibility)
+                {
+                    eScrollBarVisibility oldValue = _ScrollBarVisibility;
+                    _ScrollBarVisibility = value;
+                    OnScrollBarVisibilityChanged(oldValue, value);
+                }
+            }
+        }
+        
+        /// <summary>
+        /// Called when ScrollBarVisibility property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnScrollBarVisibilityChanged(eScrollBarVisibility oldValue, eScrollBarVisibility newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("ScrollBarVisibility"));
+            if (this.IsHandleCreated)
+                UpdateScrollBarVisibility();
+            else
+                _UpdateScrollBarVisibilityDelayed = true;
+        }
+
+        private bool _UpdateScrollBarVisibilityDelayed = false;
+        private void UpdateScrollBarVisibility()
+        {
+            if (_ScrollBarVisibility == eScrollBarVisibility.Hidden)
+            {
+                StopScrollBarTimer();
+                _HorizontalScrollBar.Visible = false;
+                _VerticalScrollBar.Visible = false;
+                UpdateBoundsForAllPages(false);
+            }
+            else if (_ScrollBarVisibility == eScrollBarVisibility.AlwaysVisible)
+            {
+                StopScrollBarTimer();
+                if (_Orientation == eOrientation.Horizontal)
+                {
+                    if (!_HorizontalScrollBar.Visible)
+                    {
+                        _HorizontalScrollBar.Visible = true;
+                        if (!this.IsHandleCreated && _HorizontalScrollBar.Width == 0)
+                            _HorizontalScrollBar.Bounds = new Rectangle(this.ClientRectangle.X,
+                                this.ClientRectangle.Bottom - _HorizontalScrollBar.Height, this.ClientRectangle.Width, _HorizontalScrollBar.Height);
+                        UpdateBoundsForAllPages(false);
+                    }
+                    _VerticalScrollBar.Visible = false;
+                }
+                else
+                {
+                    _HorizontalScrollBar.Visible = false;
+                    if (!_VerticalScrollBar.Visible)
+                    {
+                        _VerticalScrollBar.Visible = true;
+                        UpdateBoundsForAllPages(false);
+                    }
+                }
+            }
+            else
+            {
+                Point p = this.PointToClient(Control.MousePosition);
+                if (_ScrollBarTimer == null && this.ClientRectangle.Contains(p))
+                {
+                    StartScrollBarTimer();
+                }
+            }
+        }
+        private int _AutoScrollBarVisibleTime = 3000;
+        /// <summary>
+        /// Gets or sets the time in milliseconds that scrollbar is kept visible when there is no activity in control and mouse is over the control.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public int AutoScrollBarVisibleTime
+        {
+            get { return _AutoScrollBarVisibleTime; }
+            set
+            {
+                _AutoScrollBarVisibleTime = value;
+            }
+        }
+        internal void MouseEnterInternal()
+        {
+            if (_ScrollBarVisibility == eScrollBarVisibility.AutoVisible)
+                StartScrollBarTimer();
+        }
+        protected override void OnMouseEnter(EventArgs e)
+        {
+            MouseEnterInternal();
+            base.OnMouseEnter(e);
+        }
+        protected override void OnMouseLeave(EventArgs e)
+        {
+            MouseLeaveInternal();
+            base.OnMouseLeave(e);
+        }
+
+        internal void MouseLeaveInternal()
+        {
+            if (_ScrollBarVisibility == eScrollBarVisibility.AutoVisible)
+                StartScrollBarTimer();
+        }
+
+        private Timer _ScrollBarTimer = null;
+        private void StartScrollBarTimer()
+        {
+            if (_Orientation == eOrientation.Horizontal)
+            {
+                _HorizontalScrollBar.Visible = true;
+                _VerticalScrollBar.Visible = false;
+            }
+            else
+            {
+                _HorizontalScrollBar.Visible = false;
+                _VerticalScrollBar.Visible = true;
+            }
+
+            if (_ScrollBarTimer == null)
+            {
+                _ScrollBarTimer = new Timer();
+                _ScrollBarTimer.Tick += new EventHandler(ScrollBarTimerTick);
+                _ScrollBarTimer.Interval = _AutoScrollBarVisibleTime;
+            }
+            _ScrollBarTimer.Stop();
+            _ScrollBarTimer.Start();
+        }
+        private Point _LastMousePosition = Point.Empty;
+        void ScrollBarTimerTick(object sender, EventArgs e)
+        {
+            bool hideScrollBars = false;
+            Point p = this.PointToClient(Control.MousePosition);
+            if (this.ClientRectangle.Contains(p))
+            {
+                if (!_LastMousePosition.IsEmpty && _LastMousePosition == p && (!_HorizontalScrollBar.Bounds.Contains(p) && _HorizontalScrollBar.Visible || !_VerticalScrollBar.Bounds.Contains(p) && _VerticalScrollBar.Visible))
+                    hideScrollBars = true;
+            }
+            else
+            {
+                if (!_LastMousePosition.IsEmpty)
+                    hideScrollBars = true;
+            }
+            _LastMousePosition = p;
+
+            if (hideScrollBars)
+            {
+                StopScrollBarTimer();
+                _HorizontalScrollBar.Visible = false;
+                _VerticalScrollBar.Visible = false;
+                _LastMousePosition = Point.Empty;
+            }
+        }
+        private void StopScrollBarTimer()
+        {
+            Timer t = _ScrollBarTimer;
+            _ScrollBarTimer = null;
+            if (t != null)
+            {
+                t.Tick -= new EventHandler(ScrollBarTimerTick);
+                t.Stop();
+                t.Dispose();
+            }
+        }
+        #endregion
+
+        #region Touch Handling
+        private bool ProcessTouch(DevComponents.DotNetBar.Touch.GestureEventArgs e)
+        {
+            if (_TouchEnabled == eTouchHandling.No) return false;
+            if (_TouchEnabled == eTouchHandling.ClientContentOnly)
+            {
+                NativeFunctions.POINT p = new NativeFunctions.POINT(e.Location);
+                IntPtr handle = NativeFunctions.ChildWindowFromPoint(this.Handle, p);
+                if (handle == IntPtr.Zero)
+                    return false;
+                Control c = Control.FromChildHandle(handle);
+                if (c == null) return false;
+                if (c is PageSliderPage)
+                {
+                    handle = NativeFunctions.ChildWindowFromPoint(c.Handle, p);
+                    if (handle == IntPtr.Zero)
+                        return false;
+                    c = Control.FromChildHandle(handle);
+                    if (c == null || c is PageSliderPage || c is StepIndicator
+                        || c is Label || c is LabelX) return true;
+                }
+                if(c == this || c is StepIndicator)
+                    return true;
+                return false;
+            }
+            return true;
+        }
+
+        private bool _TouchDrag = false;
+        private Point _TouchStartLocation = Point.Empty;
+        private void TouchHandlerPanBegin(object sender, DevComponents.DotNetBar.Touch.GestureEventArgs e)
+        {
+            if (!ProcessTouch(e)) return;
+
+            _TouchDrag = true;
+            _TouchStartLocation = e.Location;
+            e.Handled = true;
+        }
+
+        private void TouchHandlerPanEnd(object sender, DevComponents.DotNetBar.Touch.GestureEventArgs e)
+        {
+            if (_TouchDrag)
+            {
+                EndTouchPan();
+                e.Handled = true;
+            }
+        }
+
+        private void EndTouchPan()
+        {
+            _TouchDrag = false;
+            int totalMoveOffset = _Orientation == eOrientation.Horizontal ? _PageBoundsOffset.X : _PageBoundsOffset.Y;
+            if (Math.Abs(totalMoveOffset) >= TriggerPageChangeOffset)
+            {
+                Rectangle selectedPageBounds = GetSelectedPageBounds();
+                if (totalMoveOffset < 0)
+                {
+                    if (this.SelectedPageIndex < _PageTable.Count - 1)
+                    {
+                        PageSliderPage newSelection = _PageTable[this.SelectedPageIndex + 1];
+                        // Find right page to select since control can be scrolled a lot through inertia
+                        for (int i = _PageTable.Count - 1; i >= 0; i--)
+                        {
+                            PageSliderPage page = _PageTable[i];
+                            if (page.Bounds.IntersectsWith(selectedPageBounds) && selectedPageBounds.Right - page.Left >= TriggerPageChangeOffset)
+                            {
+                                newSelection = page;
+                                break;
+                            }
+                        }
+                        if (this.SelectedPage != newSelection)
+                            this.SelectedPage = newSelection;
+                        else
+                            PageBoundsOffset = Point.Empty;
+                    }
+                    else
+                        PageBoundsOffset = Point.Empty;
+                }
+                else
+                {
+                    if (this.SelectedPageIndex > 0)
+                    {
+                        PageSliderPage newSelection = _PageTable[this.SelectedPageIndex - 1];
+                        // Find right page to select since control can be scrolled a lot through inertia
+                        for (int i = 0; i < _PageTable.Count; i++)
+                        {
+                            PageSliderPage page = _PageTable[i];
+                            if (page.Bounds.IntersectsWith(selectedPageBounds) && page.Right - selectedPageBounds.X >= TriggerPageChangeOffset)
+                            {
+                                newSelection = page;
+                                break;
+                            }
+                        }
+                        if (this.SelectedPage != newSelection)
+                            this.SelectedPage = newSelection;
+                        else
+                            PageBoundsOffset = Point.Empty;
+                    }
+                    else
+                        PageBoundsOffset = Point.Empty;
+                }
+            }
+            else
+                PageBoundsOffset = Point.Empty;
+        }
+
+        private void TouchHandlerPan(object sender, DevComponents.DotNetBar.Touch.GestureEventArgs e)
+        {
+            if (_TouchDrag)
+            {
+                Rectangle selectedPageBounds = GetSelectedPageBounds();
+                if (_Orientation == eOrientation.Horizontal)
+                {
+                    int offset = e.Location.X - _TouchStartLocation.X;
+                    int offsetChange = offset - _PageBoundsOffset.X;
+                    Rectangle firstPageBounds = GetPageBounds(_PageTable[0]);
+                    bool overflow = false;
+                    if (_PageTable[0].Left + offsetChange > selectedPageBounds.X + MaximumReversePageOffset && SelectedPageIndex >= 0)
+                    {
+                        offset -= (_PageTable[0].Left + offsetChange) - (selectedPageBounds.X + MaximumReversePageOffset);
+                        overflow = true;
+                    }
+                    else if (_PageTable[_PageTable.Count - 1].Left + offsetChange < selectedPageBounds.X - MaximumReversePageOffset)
+                    {
+                        offset += (selectedPageBounds.X - MaximumReversePageOffset) - (_PageTable[_PageTable.Count - 1].Left + offsetChange);
+                        overflow = true;
+                    }
+                    PageBoundsOffset = new Point(offset, 0);
+                    if (overflow && e.IsInertia) EndTouchPan();
+                }
+                else
+                {
+                    int offset = e.Location.Y - _TouchStartLocation.Y;
+                    int offsetChange = offset - _PageBoundsOffset.Y;
+                    Rectangle firstPageBounds = GetPageBounds(_PageTable[0]);
+                    bool overflow = false;
+                    if (_PageTable[0].Top + offsetChange > selectedPageBounds.Y + MaximumReversePageOffset && SelectedPageIndex >= 0)
+                    {
+                        offset -= (_PageTable[0].Top + offsetChange) - (selectedPageBounds.Y + MaximumReversePageOffset);
+                        overflow = true;
+                    }
+                    else if (_PageTable[_PageTable.Count - 1].Top + offsetChange < selectedPageBounds.Y - MaximumReversePageOffset)
+                    {
+                        offset += (selectedPageBounds.Y - MaximumReversePageOffset) - (_PageTable[_PageTable.Count - 1].Top + offsetChange);
+                        overflow = true;
+                    }
+                    PageBoundsOffset = new Point(0, offset);
+                    if (overflow && e.IsInertia) EndTouchPan();
+                }
+                e.Handled = true;
+            }
+        }
+
+        private eTouchHandling _TouchEnabled = eTouchHandling.Yes;
+        /// <summary>
+        /// Indicates whether native touch support in control is enabled if available on target system.
+        /// </summary>
+        [DefaultValue(eTouchHandling.Yes), Category("Behavior"), Description("Indicates whether native touch support in control is enabled if available on target system.")]
+        public eTouchHandling TouchEnabled
+        {
+            get { return _TouchEnabled; }
+            set
+            {
+                if (value != _TouchEnabled)
+                {
+                    eTouchHandling oldValue = _TouchEnabled;
+                    _TouchEnabled = value;
+                    OnTouchEnabledChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when TouchEnabled property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnTouchEnabledChanged(eTouchHandling oldValue, eTouchHandling newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("TouchEnabled"));
+        }
+        #endregion
+    }
+
+    /// <summary>
+    /// Specifies scrollbar visibility.
+    /// </summary>
+    public enum eScrollBarVisibility
+    {
+        /// <summary>
+        /// Scrollbars are not visible.
+        /// </summary>
+        Hidden,
+        /// <summary>
+        /// Scrollbars are visible only if mouse is inside of the control.
+        /// </summary>
+        AutoVisible,
+        /// <summary>
+        /// Scrollbars are always visible.
+        /// </summary>
+        AlwaysVisible
+    }
+
+    /// <summary>
+    /// Specifies level of touch enabled on the control.
+    /// </summary>
+    public enum eTouchHandling
+    {
+        /// <summary>
+        /// Touch is enabled control wide.
+        /// </summary>
+        Yes,
+        /// <summary>
+        /// Touch is disabled control wide.
+        /// </summary>
+        No,
+        /// <summary>
+        /// Touch is enabled but only for the direct control client content. If touch input occurs on any child control it is not processed.
+        /// </summary>
+        ClientContentOnly
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/PageSlider/PageSliderPage.cs b/PROMS/DotNetBar Source Code/Controls/PageSlider/PageSliderPage.cs
new file mode 100644
index 00000000..2c30e0ff
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/PageSlider/PageSliderPage.cs	
@@ -0,0 +1,59 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows.Forms;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    [ToolboxItem(false)]
+    [Designer("DevComponents.DotNetBar.Design.PageSliderPageDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+    public class PageSliderPage : Panel
+    {
+        #region Constructor
+
+        #endregion
+
+        #region Implementation
+        private int _PageNumber = 1;
+        /// <summary>
+        /// Gets or sets page number. Page number determines the order in which pages are displayed inside of the PageSlider control.
+        /// </summary>
+        [DefaultValue(1), Category("Behavior"), Description("Indicates page number. Page number determines the order in which pages are displayed inside of the PageSlider control.")]
+        public int PageNumber
+        {
+            get { return _PageNumber; }
+            set
+            {
+                if (value != _PageNumber)
+                {
+                    int oldValue = _PageNumber;
+                    _PageNumber = value;
+                    OnPageNumberChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when PageNumber property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnPageNumberChanged(int oldValue, int newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("PageNumber"));
+            
+        }
+
+        protected override void OnMouseDown(MouseEventArgs e)
+        {
+            if (e.Button == MouseButtons.Left)
+            {
+                PageSlider parent = this.Parent as PageSlider;
+                if (parent != null) parent.StartPageDrag();
+            }
+
+            base.OnMouseDown(e);
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/PageSlider/StepIndicator.cs b/PROMS/DotNetBar Source Code/Controls/PageSlider/StepIndicator.cs
new file mode 100644
index 00000000..afff1f1c
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/PageSlider/StepIndicator.cs	
@@ -0,0 +1,267 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows.Forms;
+using System.ComponentModel;
+using System.Drawing;
+using DevComponents.DotNetBar.Rendering;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    /// <summary>
+    /// Represents control which visually indicates current step in a sequence.
+    /// </summary>
+    [ToolboxItem(true)]
+    [ToolboxBitmap(typeof(StepIndicator), "Controls.StepIndicator.ico")]
+    public class StepIndicator : Control
+    {
+        #region Constructor
+        /// <summary>
+        /// Initializes a new instance of the StepIndicator class.
+        /// </summary>
+        public StepIndicator()
+        {
+            this.SetStyle(ControlStyles.UserPaint |
+                ControlStyles.AllPaintingInWmPaint |
+                ControlStyles.Opaque |
+                ControlStyles.ResizeRedraw |
+                ControlStyles.DoubleBuffer |
+                ControlStyles.StandardDoubleClick | ControlStyles.StandardClick, true);
+            this.SetStyle(ControlStyles.Selectable, false);
+        }
+        #endregion
+
+        #region Implementation
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            StepIndicatorColorTable colors = GetColors();
+            Color backColor = colors.BackgroundColor;
+            Color indicatorColor = colors.IndicatorColor;
+            Graphics g = e.Graphics;
+            Rectangle r = this.ClientRectangle;
+
+            using (SolidBrush brush = new SolidBrush(backColor))
+                g.FillRectangle(brush, r);
+
+            int currentStep = GetCurrentStep() - 1;
+            if (currentStep >= 0)
+            {
+                int stepCount = _StepCount;
+                Rectangle indicatorBounds;
+                if (_Orientation == eOrientation.Horizontal)
+                {
+                    int indicatorWidth = (int)Math.Ceiling((double)r.Width / stepCount);
+                    indicatorBounds = new Rectangle(r.X + indicatorWidth * currentStep, r.Y, indicatorWidth, r.Height);
+                }
+                else
+                {
+                    int indicatorHeight = (int)Math.Ceiling((double)r.Height / stepCount);
+                    indicatorBounds = new Rectangle(r.X, r.Y + indicatorHeight * currentStep, r.Width, indicatorHeight);
+                }
+
+                if (r.Width > 0 && r.Height > 0)
+                {
+                    using (SolidBrush brush = new SolidBrush(indicatorColor))
+                        g.FillRectangle(brush, indicatorBounds);
+                }
+            }
+
+            base.OnPaint(e);
+        }
+
+        private StepIndicatorColorTable GetColors()
+        {
+            if (!_IndicatorColor.IsEmpty && !_BackgroundColor.IsEmpty)
+                return new StepIndicatorColorTable(_BackgroundColor, _IndicatorColor);
+            if (GlobalManager.Renderer is Office2007Renderer)
+            {
+                return ((Office2007Renderer)GlobalManager.Renderer).ColorTable.StepIndicator;
+            }
+            else
+                return new StepIndicatorColorTable(Color.White, Color.MediumSeaGreen);
+        }
+
+        private int GetCurrentStep()
+        {
+            return Math.Max(0, Math.Min(_StepCount, _CurrentStep));
+        }
+
+        private int _StepCount = 10;
+        /// <summary>
+        /// Gets or sets the total number of steps that control will track. Default value is 10.
+        /// </summary>
+        [DefaultValue(10), Category("Behavior"), Description("Indicates total number of steps that control will track.")]
+        public int StepCount
+        {
+            get { return _StepCount; }
+            set
+            {
+                value = Math.Max(1, value);
+                if (value != _StepCount)
+                {
+                    int oldValue = _StepCount;
+                    _StepCount = value;
+                    OnStepCountChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when StepCount property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnStepCountChanged(int oldValue, int newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("StepCount"));
+            this.Invalidate();
+        }
+
+        private int _CurrentStep = 1;
+        /// <summary>
+        /// Gets or sets the current step in sequence. Current step should be less or equal than StepCount.
+        /// </summary>
+        [DefaultValue(1), Category("Behavior"), Description("Indicates current step in sequence..")]
+        public int CurrentStep
+        {
+            get { return _CurrentStep; }
+            set
+            {
+                if (value != _CurrentStep)
+                {
+                    int oldValue = _CurrentStep;
+                    _CurrentStep = value;
+                    OnCurrentStepChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when CurrentStep property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnCurrentStepChanged(int oldValue, int newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("CurrentStep"));
+            this.Invalidate();
+        }
+
+        private static readonly Color DefaultBackgroundColor = Color.Empty;
+        private Color _BackgroundColor = DefaultBackgroundColor;
+        /// <summary>
+        /// Gets or sets the background color of the control.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates background color of control.")]
+        public  Color BackgroundColor
+        {
+        	get {	return _BackgroundColor; }
+        	set { _BackgroundColor = value;	}
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeBackgroundColor()
+        {
+            return _BackgroundColor != DefaultBackgroundColor;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetBackgroundColor()
+        {
+            this.BackgroundColor =  DefaultBackgroundColor;
+        }
+
+        private static readonly Color DefaultIndicatorColor = Color.Empty;
+        private Color _IndicatorColor = DefaultIndicatorColor;
+        /// <summary>
+        /// Gets or sets the color of the current step indicator.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates color of current step indicator.")]
+        public  Color IndicatorColor
+        {
+        	get {	return _IndicatorColor; }
+        	set { _IndicatorColor = value;	}
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeIndicatorColor()
+        {
+            return _IndicatorColor != DefaultIndicatorColor;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetIndicatorColor()
+        {
+            this.IndicatorColor =  DefaultIndicatorColor;
+        }
+
+        private eOrientation _Orientation = eOrientation.Horizontal;
+        /// <summary>
+        /// Indicates the control orientation.
+        /// </summary>
+        [Category("Appearance"), DefaultValue(eOrientation.Horizontal), Description("Indicates the control orientation.")]
+        public eOrientation Orientation
+        {
+            get { return _Orientation; }
+            set
+            {
+                if (value != _Orientation)
+                {
+                    eOrientation oldValue = _Orientation;
+                    _Orientation = value;
+                    OnOrientationChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when Orientation property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnOrientationChanged(eOrientation oldValue, eOrientation newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("Orientation"));
+            this.Invalidate();
+        }
+
+        protected override Size DefaultSize
+        {
+            get
+            {
+                return new Size(400,4);
+            }
+        }
+
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), EditorBrowsable(EditorBrowsableState.Never)]
+        public override System.Drawing.Color BackColor
+        {
+            get
+            {
+                return base.BackColor;
+            }
+            set
+            {
+                base.BackColor = value;
+            }
+        }
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), EditorBrowsable(EditorBrowsableState.Never)]
+        public override System.Drawing.Color ForeColor
+        {
+            get
+            {
+                return base.ForeColor;
+            }
+            set
+            {
+                base.ForeColor = value;
+            }
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/PopupControlHost.cs b/PROMS/DotNetBar Source Code/Controls/PopupControlHost.cs
new file mode 100644
index 00000000..fcd59a81
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/PopupControlHost.cs	
@@ -0,0 +1,745 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows.Forms;
+using System.Drawing;
+using System.Security.Permissions;
+using System.Runtime.InteropServices;
+using DevComponents.DotNetBar.Rendering;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    internal class PopupControlHost : ToolStripDropDown
+    {
+        #region Constructor
+        private ePopupResizeEdge _ResizeEdge = ePopupResizeEdge.None;
+        private Rectangle _ResizeGripBounds = Rectangle.Empty;
+        private bool _CanResizeHostControl = false;
+        private bool _CanResizePopup = false;
+        private bool _RefreshSize = false;
+        private static readonly Size ResizeGripSize = new Size(16, 16);
+
+        public PopupControlHost()
+        {
+            this.AutoSize = false;
+            this.Padding = System.Windows.Forms.Padding.Empty;
+            this.Margin = System.Windows.Forms.Padding.Empty;
+        }
+
+        #endregion
+
+        #region Implementation
+
+        protected override void OnClosing(ToolStripDropDownClosingEventArgs e)
+        {
+            Control hostControl = GetHostedControl();
+            if (hostControl != null)
+                hostControl.SizeChanged -= HostControlSizeChanged;
+            base.OnClosing(e);
+        }
+
+        protected override void OnPaint(PaintEventArgs e)
+        {
+
+            ResizeGripBounds = Rectangle.Empty;
+
+            Size resizeGripSize = Dpi.Size(ResizeGripSize);
+            if (IsResizeEnabled(ePopupResizeEdge.BottomLeft))
+            {
+                ResizeGripColors colors = GetColors();
+
+                using (SolidBrush brush = new SolidBrush(colors.BackColor))
+                    e.Graphics.FillRectangle(brush, 1, Height - resizeGripSize.Height, Width - 2, resizeGripSize.Height - 1);
+                ResizeGripBounds = new Rectangle(1, Height - resizeGripSize.Height, resizeGripSize.Width, resizeGripSize.Height);
+                ResizeHandlePainter.DrawResizeHandle(e.Graphics, ResizeGripBounds, colors.GripLightColor, colors.GripColor, true);
+            }
+            else if (IsResizeEnabled(ePopupResizeEdge.BottomRight))
+            {
+                ResizeGripColors colors = GetColors();
+                using (SolidBrush brush = new SolidBrush(colors.BackColor))
+                    e.Graphics.FillRectangle(brush, 1, Height - resizeGripSize.Height, Width - 2, resizeGripSize.Height - 1);
+                ResizeGripBounds = new Rectangle(Width - resizeGripSize.Width - 1, Height - resizeGripSize.Height, resizeGripSize.Width, resizeGripSize.Height);
+                ResizeHandlePainter.DrawResizeHandle(e.Graphics, ResizeGripBounds, colors.GripLightColor, colors.GripColor, false);
+            }
+
+            base.OnPaint(e);
+        }
+        private ResizeGripColors _ResizeGripColors;
+        private ResizeGripColors GetColors()
+        {
+            return _ResizeGripColors;
+        }
+
+        #region ResizeGripColors
+        private struct ResizeGripColors
+        {
+            public Color BackColor;
+            public Color GripLightColor;
+            public Color GripColor;
+            /// <summary>
+            /// Initializes a new instance of the ResizeGripColors structure.
+            /// </summary>
+            /// <param name="backColor"></param>
+            /// <param name="gripLightColor"></param>
+            /// <param name="gripColor"></param>
+            public ResizeGripColors(Color backColor, Color gripLightColor, Color gripColor)
+            {
+                BackColor = backColor;
+                GripLightColor = gripLightColor;
+                GripColor = gripColor;
+            }
+        }
+        #endregion
+
+        private bool _PopupUserSize = false;
+        /// <summary>
+        /// Gets whether popup has been resized by end-user.
+        /// </summary>
+        public bool PopupUserSize
+        {
+            get { return _PopupUserSize; }
+            set { _PopupUserSize = value; }
+        }
+
+        protected override void OnSizeChanged(EventArgs e)
+        {
+            base.OnSizeChanged(e);
+
+            if (!_CanResizePopup)
+            {
+                UpdateHostControlSize();
+                _PopupUserSize = true;
+            }
+        }
+
+        protected void HostControlSizeChanged(object sender, EventArgs e)
+        {
+            if (!_CanResizeHostControl)
+                UpdateContentBasedSize(-1);
+        }
+
+        public new void Show(int x, int y)
+        {
+            Show(x, y, -1, -1);
+        }
+
+        public void Show(int x, int y, int width, int height)
+        {
+            if (GlobalManager.Renderer is Office2007Renderer)
+            {
+                Office2007ColorTable table = ((Office2007Renderer)GlobalManager.Renderer).ColorTable;
+                _ResizeGripColors = new ResizeGripColors(table.Form.BackColor, table.LegacyColors.SplitterBackground2, table.LegacyColors.BarStripeColor);
+            }
+            else
+                _ResizeGripColors = new ResizeGripColors(SystemColors.ButtonFace, Color.White, SystemColors.ControlDark);
+
+            Control hostControl = GetHostedControl();
+            if (hostControl == null)
+                return;
+
+            _CanResizeHostControl = true;
+            _CanResizePopup = true;
+
+            this.Size = new Size(1, 1);
+            base.Show(x, y);
+
+            _CanResizeHostControl = false;
+            _CanResizePopup = false;
+
+            UpdateContentBasedSize(width);
+
+            if (_CloseButtonVisible && IsResizeGripShown)
+            {
+                if (_CloseButtonController == null)
+                {
+                    ButtonItem button = new ButtonItem();
+                    button.Symbol = "\uf00d";
+                    button.SymbolSize = 8;
+                    button.Style = eDotNetBarStyle.StyleManagerControlled;
+                    button.ButtonStyle = eButtonStyle.ImageAndText;
+                    button.LeftInternal = 1;
+                    button.Click += new EventHandler(ClosePopupButtonClick);
+                    _CloseButtonController = new BaseItemController(button, this);
+                    button.RecalcSize();
+                    button.TopInternal = this.Height - button.HeightInternal - 1;
+                }
+            }
+            else if (_CloseButtonController != null)
+            {
+                _CloseButtonController.Dispose();
+                _CloseButtonController = null;
+            }
+
+            if (_RefreshSize)
+                UpdateHostControlSize();
+
+            if (y > Top && y <= Bottom)
+            {
+                if (_ParentControlBounds.IsEmpty)
+                    Top = y - Height - (height != -1 ? height : 0);
+                else
+                    Top = _ParentControlBounds.Y - Height;
+
+                //ePopupResizeEdge previous = ResizeEdge;
+                //if (ResizeEdge == ePopupResizeEdge.BottomLeft)
+                //    ResizeEdge = ePopupResizeEdge.None; // ePopupResizeEdge.TopLeft;
+                //else if (ResizeEdge == ePopupResizeEdge.BottomRight)
+                //    ResizeEdge = ePopupResizeEdge.None; // ePopupResizeEdge.TopRight;
+
+                //if (ResizeEdge != previous)
+                //    UpdateHostControlSize();
+            }
+
+            hostControl.SizeChanged += HostControlSizeChanged;
+        }
+        private Rectangle _ParentControlBounds = Rectangle.Empty;
+        public Rectangle ParentControlBounds
+        {
+            get { return _ParentControlBounds; }
+            set { _ParentControlBounds = value; }
+        }
+        private void ClosePopupButtonClick(object sender, EventArgs e)
+        {
+            this.Close(ToolStripDropDownCloseReason.CloseCalled);
+        }
+
+        BaseItemController _CloseButtonController = null;
+
+        protected void UpdateContentBasedSize(int proposedWidth)
+        {
+            if (_CanResizePopup)
+                return;
+
+            _CanResizeHostControl = true;
+            try
+            {
+                Rectangle bounds = Bounds;
+                bounds.Size = SizeFromContent(proposedWidth);
+
+                if (!IsResizeEnabled(ePopupResizeEdge.None))
+                {
+                    if (proposedWidth > 0 && bounds.Width - 2 > proposedWidth)
+                        if (!IsResizeEnabled(ePopupResizeEdge.Right))
+                            bounds.X -= bounds.Width - 2 - proposedWidth;
+                }
+
+                Bounds = bounds;
+            }
+            finally
+            {
+                _CanResizeHostControl = false;
+            }
+        }
+
+        protected void UpdateHostControlSize()
+        {
+            if (_CanResizeHostControl)
+                return;
+
+            _CanResizePopup = true;
+
+            try
+            {
+                Control hostedControl = GetHostedControl();
+                if (hostedControl != null)
+                {
+                    Rectangle bounds = hostedControl.Bounds;
+                    if (IsResizeEnabled(ePopupResizeEdge.TopLeft) || IsResizeEnabled(ePopupResizeEdge.TopRight))
+                        bounds.Location = new Point(1, Dpi.Height(ResizeGripSize.Height));
+                    else
+                        bounds.Location = new Point(1, 1);
+
+                    bounds.Width = ClientRectangle.Width - 2;
+                    bounds.Height = ClientRectangle.Height - 2;
+                    if (IsResizeGripShown)
+                        bounds.Height -= Dpi.Height(ResizeGripSize.Height);
+
+                    if (bounds.Size != hostedControl.Size)
+                        hostedControl.Size = bounds.Size;
+                    if (bounds.Location != hostedControl.Location)
+                        hostedControl.Location = bounds.Location;
+
+                    if (_CloseButtonController != null)
+                    {
+                        _CloseButtonController.Item.TopInternal = this.Height - _CloseButtonController.Item.HeightInternal - 1;
+                    }
+                }
+            }
+            finally
+            {
+                _CanResizePopup = false;
+            }
+        }
+
+        public Control GetHostedControl()
+        {
+            if (Items.Count > 0)
+            {
+                ToolStripControlHost host = Items[0] as ToolStripControlHost;
+                if (host != null)
+                    return host.Control;
+            }
+            return null;
+        }
+
+        public bool IsResizeEnabled(ePopupResizeEdge edge)
+        {
+            return (ResizeEdge & edge) == edge;
+        }
+
+        protected Size SizeFromContent(int proposedWidth)
+        {
+            Size contentSize = Size.Empty;
+
+            _RefreshSize = false;
+
+            // Fetch hosted control.
+            Control hostedControl = GetHostedControl();
+            if (hostedControl != null)
+            {
+                if (IsResizeEnabled(ePopupResizeEdge.TopLeft) || IsResizeEnabled(ePopupResizeEdge.TopRight))
+                    hostedControl.Location = new Point(1, Dpi.Height16);
+                else
+                    hostedControl.Location = new Point(1, 1);
+                contentSize = SizeFromClientSize(hostedControl.Size);
+
+                // Use minimum width (if specified).
+                if (proposedWidth > 0 && contentSize.Width < proposedWidth)
+                {
+                    contentSize.Width = proposedWidth;
+                    _RefreshSize = true;
+                }
+            }
+
+            // If a grip box is shown then add it into the drop down height.
+            if (IsResizeGripShown)
+                contentSize.Height += Dpi.Height16;
+
+            // Add some additional space to allow for borders.
+            contentSize.Width += 2;
+            contentSize.Height += 2;
+
+            return contentSize;
+        }
+
+        [SecurityPermission(SecurityAction.LinkDemand, Flags = SecurityPermissionFlag.UnmanagedCode)]
+        protected override void WndProc(ref Message m)
+        {
+            if (!ProcessResizeGripMessages(ref m, false))
+                base.WndProc(ref m);
+        }
+
+        /// <summary>
+        /// Processes the resizing messages.
+        /// </summary>
+        /// <param name="m">The message.</param>
+        /// <returns>true, if the WndProc method from the base class shouldn't be invoked.</returns>
+        [SecurityPermission(SecurityAction.LinkDemand, Flags = SecurityPermissionFlag.UnmanagedCode)]
+        public bool ProcessResizeGripMessages(ref Message m)
+        {
+            return ProcessResizeGripMessages(ref m, true);
+        }
+
+        [SecurityPermission(SecurityAction.LinkDemand, Flags = SecurityPermissionFlag.UnmanagedCode)]
+        private bool ProcessResizeGripMessages(ref Message m, bool contentControl)
+        {
+            if (ResizeEdge != ePopupResizeEdge.None)
+            {
+                if (m.Msg == (int)WinApi.WindowsMessages.WM_NCHITTEST)
+                    return ProcessNcHitTest(ref m, contentControl);
+                else if (m.Msg == (int)WinApi.WindowsMessages.WM_GETMINMAXINFO)
+                    return ProcessGetMinMaxInfo(ref m);
+            }
+            return false;
+        }
+
+        [SecurityPermission(SecurityAction.LinkDemand, Flags = SecurityPermissionFlag.UnmanagedCode)]
+        private bool ProcessGetMinMaxInfo(ref Message m)
+        {
+            Control hostedControl = GetHostedControl();
+            if (hostedControl != null)
+            {
+                WinApi.MINMAXINFO minmax = (WinApi.MINMAXINFO)Marshal.PtrToStructure(m.LParam, typeof(WinApi.MINMAXINFO));
+
+                // Maximum size.
+                if (hostedControl.MaximumSize.Width != 0)
+                    minmax.maxTrackSize.Width = hostedControl.MaximumSize.Width;
+                if (hostedControl.MaximumSize.Height != 0)
+                    minmax.maxTrackSize.Height = hostedControl.MaximumSize.Height;
+
+                // Minimum size.
+                minmax.minTrackSize = new Size(32, 32);
+                if (hostedControl.MinimumSize.Width > minmax.minTrackSize.Width)
+                    minmax.minTrackSize.Width = hostedControl.MinimumSize.Width;
+                if (hostedControl.MinimumSize.Height > minmax.minTrackSize.Height)
+                    minmax.minTrackSize.Height = hostedControl.MinimumSize.Height;
+
+                Marshal.StructureToPtr(minmax, m.LParam, false);
+            }
+            return true;
+        }
+
+        private bool ProcessNcHitTest(ref Message m, bool contentControl)
+        {
+            Point location = PointToClient(new Point(WinApi.LOWORD(m.LParam), WinApi.HIWORD(m.LParam)));
+            IntPtr transparent = new IntPtr((int)WinApi.WindowHitTestRegions.TransparentOrCovered);
+
+            if (ResizeGripBounds.Contains(location))
+            {
+                if (IsResizeEnabled(ePopupResizeEdge.BottomLeft))
+                {
+                    m.Result = contentControl ? transparent : (IntPtr)WinApi.WindowHitTestRegions.BottomLeftSizeableCorner;
+                    return true;
+                }
+                else if (IsResizeEnabled(ePopupResizeEdge.BottomRight))
+                {
+                    m.Result = contentControl ? transparent : (IntPtr)WinApi.WindowHitTestRegions.BottomRightSizeableCorner;
+                    return true;
+                }
+                else if (IsResizeEnabled(ePopupResizeEdge.TopLeft))
+                {
+                    m.Result = contentControl ? transparent : (IntPtr)WinApi.WindowHitTestRegions.TopLeftSizeableCorner;
+                    return true;
+                }
+                else if (IsResizeEnabled(ePopupResizeEdge.TopRight))
+                {
+                    m.Result = contentControl ? transparent : (IntPtr)WinApi.WindowHitTestRegions.TopRightSizeableCorner;
+                    return true;
+                }
+            }
+            else
+            {
+                Rectangle rectClient = ClientRectangle;
+                if (location.X > rectClient.Right - 3 && location.X <= rectClient.Right && IsResizeEnabled(ePopupResizeEdge.Right))
+                {
+                    m.Result = contentControl ? transparent : (IntPtr)WinApi.WindowHitTestRegions.RightSizeableBorder;
+                    return true;
+                }
+                else if (location.Y > rectClient.Bottom - 3 && location.Y <= rectClient.Bottom && IsResizeEnabled(ePopupResizeEdge.Bottom))
+                {
+                    m.Result = contentControl ? transparent : (IntPtr)WinApi.WindowHitTestRegions.BottomSizeableBorder;
+                    return true;
+                }
+                else if (location.X > -1 && location.X < 3 && IsResizeEnabled(ePopupResizeEdge.Left))
+                {
+                    m.Result = contentControl ? transparent : (IntPtr)WinApi.WindowHitTestRegions.LeftSizeableBorder;
+                    return true;
+                }
+                else if (location.Y > -1 && location.Y < 3 && IsResizeEnabled(ePopupResizeEdge.Top))
+                {
+                    m.Result = contentControl ? transparent : (IntPtr)WinApi.WindowHitTestRegions.TopSizeableBorder;
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// Type of resize mode, grips are automatically drawn at bottom-left and bottom-right corners.
+        /// </summary>
+        public ePopupResizeEdge ResizeEdge
+        {
+            get { return _ResizeEdge; }
+            set
+            {
+                if (value != _ResizeEdge)
+                {
+                    _ResizeEdge = value;
+                    Invalidate();
+                }
+            }
+        }
+
+        private bool _CloseButtonVisible = true;
+        /// <summary>
+        /// Gets or sets whether Close button is visible in fotter. Resize handle must also be visible in order for close button to render.
+        /// </summary>
+        public bool CloseButtonVisible
+        {
+            get { return _CloseButtonVisible; }
+            set
+            {
+                _CloseButtonVisible = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets resize grip bounds.
+        /// </summary>
+        public Rectangle ResizeGripBounds
+        {
+            get { return _ResizeGripBounds; }
+            private set { _ResizeGripBounds = value; }
+        }
+
+        private bool IsResizeGripShown
+        {
+            get
+            {
+                return (ResizeEdge == ePopupResizeEdge.BottomLeft || ResizeEdge == ePopupResizeEdge.BottomRight);
+            }
+        }
+
+        #endregion
+    }
+
+    #region ePopupResizeEdge
+    /// <summary>
+    /// Specifies the popup resize modes
+    /// </summary>
+    public enum ePopupResizeEdge
+    {
+        None = 0,
+        Left = 1,
+        Top = 2,
+        Right = 4,
+        Bottom = 8,
+        All = (Top | Left | Bottom | Right),
+        TopLeft = (Top | Left),
+        TopRight = (Top | Right),
+        BottomLeft = (Bottom | Left),
+        BottomRight = (Bottom | Right),
+    }
+    #endregion
+
+    #region PopupHostController
+    internal class PopupHostController : IDisposable
+    {
+        #region Constructor
+        private ToolStripControlHost _ControlHost;
+        private PopupControlHost _PopupControlHost;
+        private System.Windows.Forms.Padding _Padding = System.Windows.Forms. Padding. Empty;
+        private System.Windows.Forms.Padding _Margin = new System.Windows.Forms.Padding(1, 1, 1, 1);
+
+        public PopupHostController()
+        {
+            InitializePopupControlHost();
+        }
+
+        #endregion
+
+        #region Implementation
+        /// <summary>
+        /// Occurs after popup is closed.
+        /// </summary>
+        public event ToolStripDropDownClosedEventHandler Closed;
+        /// <summary>
+        /// Raises Closed event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnClosed(ToolStripDropDownClosedEventArgs e)
+        {
+            ToolStripDropDownClosedEventHandler handler = Closed;
+            if (handler != null)
+                handler(this, e);
+        }
+        /// <summary>
+        /// Occurs before popup is closed and allows canceling.
+        /// </summary>
+        public event ToolStripDropDownClosingEventHandler Closing;
+        /// <summary>
+        /// Raises Closing event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnClosing(ToolStripDropDownClosingEventArgs e)
+        {
+            ToolStripDropDownClosingEventHandler handler = Closing;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        private void InitializeHost(Control control)
+        {
+            InitializePopupControlHost();
+
+            if (control != this.Control)
+                DisposeToolstripControlHost();
+
+            if (_ControlHost == null)
+            {
+                _ControlHost = new ToolStripControlHost(control);
+                _ControlHost.AutoSize = false;
+                _ControlHost.Padding = this.Padding;
+                _ControlHost.Margin = this.Margin;
+            }
+            _ControlHost.Size = control.Size;
+            _PopupControlHost.Items.Clear();
+            _PopupControlHost.Padding = _PopupControlHost.Margin = System.Windows.Forms.Padding.Empty;
+            _PopupControlHost.Items.Add(_ControlHost);
+        }
+
+        private void InitializePopupControlHost()
+        {
+            if (_PopupControlHost == null)
+            {
+                _PopupControlHost = new PopupControlHost();
+                _PopupControlHost.Closed += new ToolStripDropDownClosedEventHandler(DropDownClosed);
+                _PopupControlHost.Closing += new ToolStripDropDownClosingEventHandler(DropDownClosing);
+            }
+        }
+
+        private void DropDownClosed(object sender, ToolStripDropDownClosedEventArgs e)
+        {
+            OnClosed(e);
+        }
+        void DropDownClosing(object sender, ToolStripDropDownClosingEventArgs e)
+        {
+            OnClosing(e);
+        }
+
+        /// <summary>
+        /// Show control on popup at specified location.
+        /// </summary>
+        public void Show(Control control, int x, int y)
+        {
+            Show(control, x, y, ePopupResizeEdge.None);
+        }
+
+        /// <summary>
+        /// Shows control on popup at specified location with specified popup resize edges.
+        /// </summary>
+        public void Show(Control control, int x, int y, ePopupResizeEdge resizeEdge)
+        {
+            Show(control, x, y, -1, -1, resizeEdge);
+        }
+
+        /// <summary>
+        /// Shows control on popup at specified location and size with specified popup resize edges.
+        /// </summary>
+        public void Show(Control control, int x, int y, int width, int height, ePopupResizeEdge resizeEdge)
+        {
+            Size controlSize = control.Size;
+
+            InitializeHost(control);
+
+            _PopupControlHost.ResizeEdge = resizeEdge;
+            _PopupControlHost.Show(x, y, width, height);
+            control.Focus();
+        }
+        public Rectangle Bounds
+        {
+            get
+            {
+                return _PopupControlHost.Bounds;
+            }
+        }
+        /// <summary>
+        /// Hides popup if visible.
+        /// </summary>
+        public void Hide()
+        {
+            if (_PopupControlHost != null && _PopupControlHost.Visible)
+            {
+                _PopupControlHost.Hide();
+            }
+        }
+
+        private void DisposeToolstripControlHost()
+        {
+            if (_ControlHost != null)
+            {
+                if (_PopupControlHost != null)
+                    _PopupControlHost.Items.Clear();
+
+                _ControlHost.Dispose();
+                _ControlHost = null;
+            }
+        }
+
+        public bool AutoClose
+        {
+            get
+            {
+                return _PopupControlHost.AutoClose;
+            }
+            set
+            {
+                _PopupControlHost.AutoClose = value;
+            }
+        }
+
+        public Rectangle ParentControlBounds
+        {
+            get { return _PopupControlHost.ParentControlBounds; }
+            set { _PopupControlHost.ParentControlBounds = value; }
+        }
+
+        /// <summary>
+        /// Gets whether popup is visible.
+        /// </summary>
+        public bool Visible
+        {
+            get { return (_PopupControlHost != null && _PopupControlHost.Visible) ? true : false; }
+        }
+        /// <summary>
+        /// Gets the control displayed on popup.
+        /// </summary>
+        public Control Control
+        {
+            get { return (_ControlHost != null) ? _ControlHost.Control : null; }
+        }
+        /// <summary>
+        /// Gets or sets the popup padding.
+        /// </summary>
+        public System.Windows.Forms.Padding Padding
+        {
+            get { return _Padding; }
+            set { _Padding = value; }
+        }
+        /// <summary>
+        /// Gets or sets popup margin.
+        /// </summary>
+        public System.Windows.Forms.Padding Margin
+        {
+            get { return _Margin; }
+            set { _Margin = value; }
+        }
+
+        public bool PopupUserSize
+        {
+            get
+            {
+                if (_PopupControlHost == null) return false;
+                return _PopupControlHost.PopupUserSize;
+            }
+            set
+            {
+                if (_PopupControlHost != null)
+                    _PopupControlHost.PopupUserSize = value;
+            }
+        }
+
+        public bool CloseButtonVisible
+        {
+            get
+            {
+                if (_PopupControlHost == null) return false;
+                return _PopupControlHost.CloseButtonVisible;
+            }
+            set
+            {
+                if (_PopupControlHost != null)
+                    _PopupControlHost.CloseButtonVisible = value;
+            }
+        }
+        #endregion
+
+        #region IDisposable Members
+
+        public void Dispose()
+        {
+            DisposeToolstripControlHost();
+            if (_PopupControlHost != null)
+            {
+                _PopupControlHost.Closed -= new ToolStripDropDownClosedEventHandler(DropDownClosed);
+                _PopupControlHost.Closing -= new ToolStripDropDownClosingEventHandler(DropDownClosing);
+                _PopupControlHost.Dispose();
+                _PopupControlHost = null;
+            }
+
+        }
+
+        #endregion
+    }
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/ProgressBarX.cs b/PROMS/DotNetBar Source Code/Controls/ProgressBarX.cs
new file mode 100644
index 00000000..4cbb436c
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/ProgressBarX.cs	
@@ -0,0 +1,286 @@
+using System;
+using System.Text;
+using System.Drawing;
+using System.ComponentModel;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    /// <summary>
+    /// Represents the stand-alone progress bar control.
+    /// </summary>
+    [ToolboxBitmap(typeof(ProgressBarX), "Controls.ProgressBarX.ico"), ToolboxItem(true), DefaultEvent("Click"), System.Runtime.InteropServices.ComVisible(false)]
+    public class ProgressBarX : BaseItemControl
+    {
+        #region Private Variables
+        private ProgressBarItem m_ProgressBar = null;
+        #endregion
+
+        #region Constructor, Dispose
+        public ProgressBarX()
+        {
+            m_ProgressBar = new ProgressBarItem();
+            m_ProgressBar.Style = eDotNetBarStyle.Office2007;
+            m_ProgressBar.Minimum = 0;
+            m_ProgressBar.Maximum = 100;
+            m_ProgressBar.Value = 0;
+            m_ProgressBar.BackStyle = this.BackgroundStyle;
+
+            this.HostItem = m_ProgressBar;
+        }
+        #endregion
+
+        #region Internal Implementation
+        protected override void PaintBackground(PaintEventArgs e)
+        {
+            // ProgressBarItem shares same background style as control so it will paint itself. This avoids double painting...
+            Graphics g = e.Graphics;
+            Rectangle r = this.ClientRectangle;
+            ElementStyle style = this.GetBackgroundStyle();
+
+            if ((!style.Custom || style.BackColor.IsEmpty)&& !this.BackColor.IsEmpty && this.BackColor!=Color.Transparent)
+            {
+                DisplayHelp.FillRectangle(g, r, this.BackColor);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the maximum value of the range of the control.
+        /// </summary>
+        [Browsable(true), Description("Gets or sets the maximum value of the range of the control."), Category("Behavior"), DefaultValue(100)]
+        public int Maximum
+        {
+            get
+            {
+                return m_ProgressBar.Maximum;
+            }
+            set
+            {
+                m_ProgressBar.Maximum = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the minimum value of the range of the control.
+        /// </summary>
+        [DevCoBrowsable(true), Browsable(true), Description("Gets or sets the minimum value of the range of the control."), Category("Behavior"), DefaultValue(0)]
+        public int Minimum
+        {
+            get
+            {
+                return m_ProgressBar.Minimum;
+            }
+            set
+            {
+                m_ProgressBar.Minimum = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the current position of the progress bar.
+        /// </summary>
+        [DevCoBrowsable(true), Browsable(true), Description("Gets or sets the current position of the progress bar."), Category("Behavior"), DefaultValue(0)]
+        public int Value
+        {
+            get { return m_ProgressBar.Value; }
+            set
+            {
+                m_ProgressBar.Value = value;
+                //this.Invalidate();
+                //this.Update();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the amount by which a call to the PerformStep method increases the current position of the progress bar.
+        /// </summary>
+        [DevCoBrowsable(true), Browsable(true), Description("Gets or sets the amount by which a call to the PerformStep method increases the current position of the progress bar."), Category("Behavior"), DefaultValue(1)]
+        public int Step
+        {
+            get
+            {
+                return m_ProgressBar.Step;
+            }
+            set
+            {
+                m_ProgressBar.Step = value;
+            }
+        }
+
+        /// <summary>
+        /// Advances the current position of the progress bar by the amount of the Step property.
+        /// </summary>
+        public void PerformStep()
+        {
+            this.Value += m_ProgressBar.Step;
+        }
+
+        /// <summary>
+        /// Advances the current position of the progress bar by the specified amount.
+        /// </summary>
+        /// <param name="value">The amount by which to increment the progress bar's current position. </param>
+        public void Increment(int value)
+        {
+            this.Value += value;
+        }
+
+        /// <summary>
+        /// Gets or sets the color of the progress chunk.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Category("Appearance"), Description("Gets or sets the color of the progress chunk.")]
+        public Color ChunkColor
+        {
+            get
+            {
+                return m_ProgressBar.ChunkColor;
+            }
+            set
+            {
+                m_ProgressBar.ChunkColor = value;
+                this.Invalidate();
+            }
+        }
+        /// <summary>
+        /// Gets whether ChunkColor property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeChunkColor()
+        {
+            return (!m_ProgressBar.ChunkColor.IsEmpty);
+        }
+        /// <summary>
+        /// Resets the ChunkColor property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetChunkColor()
+        {
+            m_ProgressBar.ChunkColor = Color.Empty;
+        }
+
+        /// <summary>
+        /// Gets or sets the target gradient color of the progress chunk.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Category("Appearance"), Description("Gets or sets the target gradient color of the progress chunk.")]
+        public Color ChunkColor2
+        {
+            get
+            {
+                return m_ProgressBar.ChunkColor2;
+            }
+            set
+            {
+                m_ProgressBar.ChunkColor2 = value;
+                this.Invalidate();
+            }
+        }
+        /// <summary>
+        /// Gets whether ChunkColor property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeChunkColor2()
+        {
+            return (!m_ProgressBar.ChunkColor2.IsEmpty);
+        }
+        /// <summary>
+        /// Resets the ChunkColor property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetChunkColor2()
+        {
+            m_ProgressBar.ChunkColor2 = Color.Empty;
+        }
+
+        /// <summary>
+        /// Gets or sets the gradient angle of the progress chunk.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Category("Appearance"), Description("Gets or sets the gradient angle of the progress chunk."), DefaultValue(0)]
+        public int ChunkGradientAngle
+        {
+            get
+            {
+                return (int)m_ProgressBar.ChunkGradientAngle;
+            }
+            set
+            {
+                m_ProgressBar.ChunkGradientAngle = value;
+                this.Invalidate();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether the text inside the progress bar is displayed.
+        /// </summary>
+        [Browsable(true), Description("Gets or sets whether the text inside the progress bar is displayed."), Category("Behavior"), DefaultValue(false)]
+        public bool TextVisible
+        {
+            get
+            {
+                return m_ProgressBar.TextVisible;
+            }
+            set
+            {
+                m_ProgressBar.TextVisible = value;
+                this.Invalidate();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the type of progress bar used to indicate progress. The Standard style displays the progress based on Minimum, Maximum and current Value.
+        /// The Marquee type is automatically moving progress bar that is used to indicate an ongoing operation for which the actual duration cannot be estimated.
+        /// </summary>
+        [Browsable(true), Category("Behavior"), DefaultValue(eProgressItemType.Standard), Description("Indicates type of progress bar used to indicate progress.")]
+        public eProgressItemType ProgressType
+        {
+            get { return m_ProgressBar.ProgressType; }
+            set { m_ProgressBar.ProgressType = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the marquee animation speed in milliseconds.
+        /// </summary>
+        [Browsable(true), DefaultValue(100), Category("Behavior"), Description("Indicates marquee animation speed in milliseconds.")]
+        public int MarqueeAnimationSpeed
+        {
+            get { return m_ProgressBar.MarqueeAnimationSpeed; }
+            set { m_ProgressBar.MarqueeAnimationSpeed = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the predefined color state table for progress bar. Color specified applies to items with Office 2007 style only. It does not have
+        /// any effect on other styles. You can use ColorTable to indicate the state of the operation that Progress Bar is tracking. Default value is eProgressBarItemColor.Normal.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(false), DefaultValue(eProgressBarItemColor.Normal), Category("Appearance"), Description("Indicates predefined color of item when Office 2007 style is used.")]
+        public eProgressBarItemColor ColorTable
+        {
+            get { return m_ProgressBar.ColorTable; }
+            set
+            {
+                m_ProgressBar.ColorTable = value;
+            }
+        }
+
+        [DefaultValue(eOrientation.Horizontal)]
+        public eOrientation Orientation
+        {
+            get { return m_ProgressBar.Orientation; }
+            set
+            {
+                if (m_ProgressBar.Orientation != value)
+                {
+                    m_ProgressBar.Orientation = value;
+                    this.Invalidate();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets the underlying ProgressBarItem
+        /// </summary>
+        internal ProgressBarItem ProgressBarItem
+        {
+            get { return (m_ProgressBar); }
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/ProgressBarX.ico b/PROMS/DotNetBar Source Code/Controls/ProgressBarX.ico
new file mode 100644
index 00000000..06f95b78
Binary files /dev/null and b/PROMS/DotNetBar Source Code/Controls/ProgressBarX.ico differ
diff --git a/PROMS/DotNetBar Source Code/Controls/ProgressStepper/MetroStepItemPainter.cs b/PROMS/DotNetBar Source Code/Controls/ProgressStepper/MetroStepItemPainter.cs
new file mode 100644
index 00000000..d032cf54
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/ProgressStepper/MetroStepItemPainter.cs	
@@ -0,0 +1,10 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    internal class MetroStepItemPainter : StepItemPainter
+    {
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/ProgressStepper/OfficeStepItemColorTable.cs b/PROMS/DotNetBar Source Code/Controls/ProgressStepper/OfficeStepItemColorTable.cs
new file mode 100644
index 00000000..459f5a20
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/ProgressStepper/OfficeStepItemColorTable.cs	
@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    /// <summary>
+    /// Defines color table for the StepItem.
+    /// </summary>
+    public class OfficeStepItemColorTable
+    {
+        /// <summary>
+        /// Gets or sets the default state StepItem colors.
+        /// </summary>
+        public OfficeStepItemStateColorTable Default = new OfficeStepItemStateColorTable();
+        /// <summary>
+        /// Gets or sets the mouse over state StepItem colors.
+        /// </summary>
+        public OfficeStepItemStateColorTable MouseOver = new OfficeStepItemStateColorTable();
+        /// <summary>
+        /// Gets or sets the StepItem colors when mouse is pressed over the item.
+        /// </summary>
+        public OfficeStepItemStateColorTable Pressed = new OfficeStepItemStateColorTable();
+        /// <summary>
+        /// Gets or sets the StepItem colors when Value property is greater than Minimum property value, i.e. item is reporting progress.
+        /// Note that only Background color is used when progress indicator is drawn.
+        /// </summary>
+        public OfficeStepItemStateColorTable Progress = new OfficeStepItemStateColorTable();
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/ProgressStepper/OfficeStepItemPainter.cs b/PROMS/DotNetBar Source Code/Controls/ProgressStepper/OfficeStepItemPainter.cs
new file mode 100644
index 00000000..54f3405b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/ProgressStepper/OfficeStepItemPainter.cs	
@@ -0,0 +1,200 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Text;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    internal class OfficeStepItemPainter : StepItemPainter
+    {
+        #region Implementation
+        /// <summary>
+        /// Paints StepItem.
+        /// </summary>
+        /// <param name="e">Provides arguments for the operation.</param>
+        public override void Paint(StepItemRendererEventArgs e)
+        {
+            StepItem item = e.Item;
+            OfficeStepItemColorTable table = ColorTable.StepItem;
+            OfficeStepItemStateColorTable ct = table.Default;
+            if (item.HotTracking && item.IsMouseDown)
+                ct = table.Pressed;
+            else if (item.HotTracking && item.IsMouseOver)
+                ct = table.MouseOver;
+
+            OfficeStepItemStateColorTable ctProgress = table.Progress;
+            Rectangle clip = Rectangle.Empty;
+
+            Rectangle r = item.Bounds;
+            int pointerSize = item.GetPointerSize();
+            Graphics g = e.ItemPaintArgs.Graphics;
+            GraphicsPath path = GetPath(item, pointerSize);
+            item.ItemPath = path;
+            using (Brush brush = DisplayHelp.CreateBrush(path.GetBounds(), (item.BackColors != null && item.BackColors.Length > 0) ? item.BackColors : ct.BackColors, ct.BackColorsGradientAngle, ct.BackColorsPositions))
+            {
+                g.FillPath(brush, path);
+            }
+            if (item.Value > item.Minimum) // Render progress marker
+            {
+                float percent = Math.Min(1, (item.Value / (float)(item.Maximum - item.Minimum)));
+                if (percent > 0)
+                {
+                    clip = item.Bounds;
+                    clip.Width = (int)(clip.Width * percent);
+                }
+                if (!clip.IsEmpty)
+                {
+                    Region oldClip = g.Clip;
+                    g.SetClip(clip, CombineMode.Intersect);
+                    using (Brush brush = DisplayHelp.CreateBrush(path.GetBounds(),
+                        (item.ProgressColors != null && item.ProgressColors.Length > 0) ? item.ProgressColors : ctProgress.BackColors, ctProgress.BackColorsGradientAngle, ctProgress.BackColorsPositions))
+                    {
+                        g.FillPath(brush, path);
+                    }
+                    g.Clip = oldClip;
+                    oldClip.Dispose();
+                }
+            }
+
+            if (ct.BorderColors.Length > 0)
+            {
+                for (int i = ct.BorderColors.Length - 1; i > 0; i--)
+                {
+                    Rectangle rb = item.Bounds;
+                    rb.Inflate(-i, -i);
+                    using (GraphicsPath borderPath = GetPath(item, pointerSize, rb))
+                    {
+                        using (Pen pen = new Pen(ct.BorderColors[i]))
+                            g.DrawPath(pen, borderPath);
+                    }
+                }
+                using (Pen pen = new Pen(ct.BorderColors[0]))
+                    g.DrawPath(pen, path);
+            }
+
+            // Render content
+            r.X += item.Padding.Left;
+            r.Y += item.Padding.Top;
+            r.Width -= item.Padding.Horizontal;
+            r.Height -= item.Padding.Vertical;
+
+            if (!item.IsFirst)
+            {
+                r.X += pointerSize;
+                r.Width -= pointerSize;
+            }
+
+            Color textColor = ct.TextColor;
+            if (!string.IsNullOrEmpty(item.SymbolRealized))
+            {
+                Color symbolColor = item.SymbolColor;
+                if (symbolColor.IsEmpty) symbolColor = textColor;
+                TextDrawing.DrawStringLegacy(g, item.SymbolRealized, Symbols.GetFont(item.SymbolSize, item.SymbolSet), symbolColor, new Rectangle(r.X, r.Y + r.Height / 2, 0, 0), eTextFormat.Default | eTextFormat.VerticalCenter);
+                int imageSize = item.ActualSymbolSize.Width + item.ImageTextSpacing;
+                r.Width -= imageSize;
+                r.X += imageSize;
+            }
+            else if (item.Image != null)
+            {
+                g.DrawImage(item.Image, new Rectangle(r.X, r.Y + (r.Height - item.Image.Height) / 2, item.Image.Width, item.Image.Height));
+                int imageSize = item.Image.Width + item.ImageTextSpacing;
+                r.Width -= imageSize;
+                r.X += imageSize;
+            }
+
+            if (!string.IsNullOrEmpty(item.Text))
+            {
+                if (!item.TextColor.IsEmpty) textColor = item.TextColor;
+                Font font = e.ItemPaintArgs.Font;
+                if (item.TextMarkupBody == null)
+                {
+                    eTextFormat textFormat = eTextFormat.Default | eTextFormat.VerticalCenter;
+                    if (item.TextAlignment == eButtonTextAlignment.Center)
+                    {
+                        textFormat |= eTextFormat.HorizontalCenter;
+                        if (!item.IsLast)
+                            r.Width -= pointerSize;
+                    }
+                    else if (item.TextAlignment == eButtonTextAlignment.Right)
+                    {
+                        textFormat |= eTextFormat.Right;
+                        if (!item.IsLast)
+                            r.Width -= pointerSize;
+                    }
+                    TextDrawing.DrawString(g, item.Text, font, textColor, r, textFormat);
+                }
+                else
+                {
+                    TextMarkup.MarkupDrawContext d = new TextMarkup.MarkupDrawContext(g, font, textColor, e.ItemPaintArgs.RightToLeft);
+                    d.HotKeyPrefixVisible = false;
+                    d.ContextObject = item;
+                    Rectangle mr = new Rectangle(r.X, r.Y + (r.Height - item.TextMarkupBody.Bounds.Height) / 2, item.TextMarkupBody.Bounds.Width, item.TextMarkupBody.Bounds.Height);
+                    item.TextMarkupBody.Bounds = mr;
+                    item.TextMarkupBody.Render(d);
+                }
+
+            }
+        }
+
+        private GraphicsPath GetPath(StepItem item, int arrowSize)
+        {
+            Rectangle r = item.Bounds;
+            return GetPath(item, arrowSize, r);
+        }
+
+        private GraphicsPath GetPath(StepItem item, int arrowSize, Rectangle r)
+        {
+            r.Width--;
+            r.Height--;
+            if (item.IsFirst)
+                return GetFirstItemPath(r, arrowSize);
+            else if (item.IsLast)
+                return GetLastItemPath(r, arrowSize);
+            else
+                return GetItemPath(r, arrowSize);
+        }
+        private GraphicsPath GetItemPath(Rectangle r, int arrowSize)
+        {
+            GraphicsPath path = new GraphicsPath();
+            path.AddLine(r.X, r.Y, r.X + arrowSize, r.Y + r.Height / 2);
+            path.AddLine(r.X + arrowSize, r.Y + r.Height / 2, r.X, r.Bottom);
+            path.AddLine(r.X, r.Bottom, r.Right - arrowSize, r.Bottom);
+            path.AddLine(r.Right - arrowSize, r.Bottom, r.Right, r.Y + r.Height / 2);
+            path.AddLine(r.Right, r.Y + r.Height / 2, r.Right - arrowSize, r.Y);
+            path.CloseAllFigures();
+
+            return path;
+        }
+        private GraphicsPath GetLastItemPath(Rectangle r, int arrowSize)
+        {
+            GraphicsPath path = new GraphicsPath();
+
+            ArcData ad = ElementStyleDisplay.GetCornerArc(r, 2, eCornerArc.TopRight);
+            path.AddArc(ad.X, ad.Y, ad.Width, ad.Height, ad.StartAngle, ad.SweepAngle);
+            ad = ElementStyleDisplay.GetCornerArc(r, 2, eCornerArc.BottomRight);
+            path.AddArc(ad.X, ad.Y, ad.Width, ad.Height, ad.StartAngle, ad.SweepAngle);
+
+            path.AddLine(r.X, r.Bottom, r.X + arrowSize, r.Y + r.Height / 2);
+            path.AddLine(r.X + arrowSize, r.Y + r.Height / 2, r.X, r.Y);
+
+            path.CloseAllFigures();
+
+            return path;
+        }
+        private GraphicsPath GetFirstItemPath(Rectangle r, int arrowSize)
+        {
+            GraphicsPath path = new GraphicsPath();
+            ArcData ad = ElementStyleDisplay.GetCornerArc(r, 2, eCornerArc.BottomLeft);
+            path.AddArc(ad.X, ad.Y, ad.Width, ad.Height, ad.StartAngle, ad.SweepAngle);
+            ad = ElementStyleDisplay.GetCornerArc(r, 2, eCornerArc.TopLeft);
+            path.AddArc(ad.X, ad.Y, ad.Width, ad.Height, ad.StartAngle, ad.SweepAngle);
+            path.AddLine(r.Right - arrowSize, r.Y, r.Right, r.Y + r.Height / 2);
+            path.AddLine(r.Right, r.Y + r.Height / 2, r.Right - arrowSize, r.Bottom);
+            path.CloseAllFigures();
+            return path;
+
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/ProgressStepper/OfficeStepItemStateColorTable.cs b/PROMS/DotNetBar Source Code/Controls/ProgressStepper/OfficeStepItemStateColorTable.cs
new file mode 100644
index 00000000..4af373cb
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/ProgressStepper/OfficeStepItemStateColorTable.cs	
@@ -0,0 +1,69 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    /// <summary>
+    /// Represents the color table for StepItem single state.
+    /// </summary>
+    public class OfficeStepItemStateColorTable
+    {
+        /// <summary>
+        /// Initializes a new instance of the OfficeStepItemStateColorTable class.
+        /// </summary>
+        public OfficeStepItemStateColorTable()
+        {
+            
+        }
+        /// <summary>
+        /// Initializes a new instance of the OfficeStepItemStateColorTable class.
+        /// </summary>
+        /// <param name="backColors"></param>
+        /// <param name="textColor"></param>
+        /// <param name="borderColors"></param>
+        public OfficeStepItemStateColorTable(Color[] backColors, Color textColor, Color[] borderColors)
+        {
+            BackColors = backColors;
+            TextColor = textColor;
+            BorderColors = borderColors;
+        }
+        /// <summary>
+        /// Initializes a new instance of the OfficeStepItemStateColorTable class.
+        /// </summary>
+        /// <param name="backColors"></param>
+        /// <param name="backColorsGradientAngle"></param>
+        /// <param name="backColorsPositions"></param>
+        /// <param name="textColor"></param>
+        /// <param name="borderColors"></param>
+        public OfficeStepItemStateColorTable(Color[] backColors, int backColorsGradientAngle, float[] backColorsPositions, Color textColor, Color[] borderColors)
+        {
+            BackColors = backColors;
+            BackColorsGradientAngle = backColorsGradientAngle;
+            BackColorsPositions = backColorsPositions;
+            TextColor = textColor;
+            BorderColors = borderColors;
+        }
+        /// <summary>
+        /// Gets or sets the background colors for the step item.
+        /// </summary>
+        public Color[] BackColors= new Color[0];
+        /// <summary>
+        /// Gets or sets the back colors gradient angle if there is more than one color in BackColors array.
+        /// </summary>
+        public int BackColorsGradientAngle = 90;
+        /// <summary>
+        /// Gets or sets the gradient colors positions if there is more than one color in BackColors array.
+        /// </summary>
+        public float[] BackColorsPositions = new float[0];
+        /// <summary>
+        /// Gets or sets the text color for the step item.
+        /// </summary>
+        public Color TextColor = Color.Black;
+       /// <summary>
+       /// Gets or sets the border colors of the step item.
+       /// </summary>
+        public Color[] BorderColors = new Color[0];
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/ProgressStepper/ProgressSteps.cs b/PROMS/DotNetBar Source Code/Controls/ProgressStepper/ProgressSteps.cs
new file mode 100644
index 00000000..6af72814
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/ProgressStepper/ProgressSteps.cs	
@@ -0,0 +1,304 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represents the progress steps control.
+    /// </summary>
+    [ToolboxBitmap(typeof(ProgressSteps), "ProgressSteps.ico"), ToolboxItem(true), Designer("DevComponents.DotNetBar.Design.ProgressStepsDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf"), System.Runtime.InteropServices.ComVisible(false), DefaultEvent("ItemClick")]
+    public class ProgressSteps : ItemControl
+    {
+        #region Constructor
+        /// <summary>
+        /// Initializes a new instance of the ProgressSteps class.
+        /// </summary>
+        public ProgressSteps()
+            : base()
+        {
+            _ViewContainer = new StepItemContainer();
+            _ViewContainer.GlobalItem = false;
+            _ViewContainer.ContainerControl = this;
+            _ViewContainer.Displayed = true;
+            _ViewContainer.Style = eDotNetBarStyle.StyleManagerControlled;
+            _ViewContainer.SetOwner(this);
+            this.SetBaseItemContainer(_ViewContainer);
+        }
+        private StepItemContainer _ViewContainer = null;
+        #endregion
+
+        #region Implementation
+        /// <summary>
+        /// Returns collection of items on a bar.
+        /// </summary>
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content), Browsable(false)]
+        public SubItemsCollection Items
+        {
+            get
+            {
+                return _ViewContainer.SubItems;
+            }
+        }
+
+        /// <summary>
+        /// Gets/Sets the visual style for items and color scheme.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Category("Appearance"), Description("Specifies the visual style of the control."), DefaultValue(eDotNetBarStyle.StyleManagerControlled)]
+        public eDotNetBarStyle Style
+        {
+            get
+            {
+                return _ViewContainer.Style;
+            }
+            set
+            {
+                this.ColorScheme.SwitchStyle(value);
+                _ViewContainer.Style = value;
+                this.Invalidate();
+                this.RecalcLayout();
+            }
+        }
+
+        private Size _PreferredSize = Size.Empty;
+        [Localizable(true), Browsable(false)]
+        public new System.Windows.Forms.Padding Padding
+        {
+            get { return base.Padding; }
+            set { base.Padding = value; }
+        }
+
+        public override Size GetPreferredSize(Size proposedSize)
+        {
+            if (!_PreferredSize.IsEmpty) return _PreferredSize;
+
+            if (!BarFunctions.IsHandleValid(this))
+                return base.GetPreferredSize(proposedSize);
+
+            if (this.Items.Count == 0 || !BarFunctions.IsHandleValid(this) || _ViewContainer.SubItems.Count == 0)
+                return new Size(base.GetPreferredSize(proposedSize).Width, Dpi.Height22);
+
+            int height = GetAutoSizePreferredHeight();
+
+            _PreferredSize = new Size(proposedSize.Width, height);
+            return _PreferredSize;
+        }
+
+        private int GetAutoSizePreferredHeight()
+        {
+            int height = ElementStyleLayout.VerticalStyleWhiteSpace(this.GetBackgroundStyle());
+            height += _ViewContainer.CalculatedHeight > 0 ? _ViewContainer.CalculatedHeight : 20;
+            return height;
+        }
+        protected override void RecalcSize()
+        {
+            base.RecalcSize();
+            if (this.AutoSize && this.IsHandleCreated && GetAutoSizePreferredHeight() != this.Height)
+            {
+                InvalidateAutoSize();
+                this.AdjustSize();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the control is automatically resized to display its entire contents. You can set MaximumSize.Width property to set the maximum width used by the control.
+        /// </summary>
+        [Browsable(true), DefaultValue(false), EditorBrowsable(EditorBrowsableState.Always), DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
+        public override bool AutoSize
+        {
+            get
+            {
+                return base.AutoSize;
+            }
+            set
+            {
+                if (this.AutoSize != value)
+                {
+                    base.AutoSize = value;
+                    InvalidateAutoSize();
+                    AdjustSize();
+                }
+            }
+        }
+
+        private void InvalidateAutoSize()
+        {
+            _PreferredSize = Size.Empty;
+        }
+
+        protected override void SetBoundsCore(int x, int y, int width, int height, BoundsSpecified specified)
+        {
+            if (this.AutoSize)
+            {
+                Size preferredSize = base.PreferredSize;
+                if (preferredSize.Width > 0)
+                    width = preferredSize.Width;
+                if (preferredSize.Height > 0)
+                    height = preferredSize.Height;
+            }
+            base.SetBoundsCore(x, y, width, height, specified);
+        }
+
+        private void AdjustSize()
+        {
+            if (this.AutoSize)
+            {
+                System.Drawing.Size prefSize = base.PreferredSize;
+                if (prefSize.Width > 0 && prefSize.Height > 0)
+                    this.Size = base.PreferredSize;
+                else if (prefSize.Height > 0)
+                    this.Size = new Size(this.Width, base.PreferredSize.Height);
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override Image BackgroundImage
+        {
+            get { return base.BackgroundImage; }
+            set { base.BackgroundImage = value; }
+        }
+
+        protected override void OnHandleCreated(EventArgs e)
+        {
+            base.OnHandleCreated(e);
+            if (this.AutoSize)
+                this.AdjustSize();
+        }
+
+        /// <summary>
+        /// Gets or sets the arrow pointer width for the StepItem objects hosted within this container.
+        /// </summary>
+        [DefaultValue(10), Category("Appearance"), Description("Gets or sets the arrow pointer width for the StepItem objects hosted within this container.")]
+        public int PointerSize
+        {
+            get { return _ViewContainer.PointerSize; }
+            set
+            {
+                _ViewContainer.PointerSize = value;
+                
+            }
+        }
+        #endregion
+
+        #region Property Hiding
+        [Browsable(false)]
+        public override eBarImageSize ImageSize
+        {
+            get
+            {
+                return base.ImageSize;
+            }
+            set
+            {
+                base.ImageSize = value;
+            }
+        }
+        [Browsable(false)]
+        public override System.Windows.Forms.ImageList ImagesLarge
+        {
+            get
+            {
+                return base.ImagesLarge;
+            }
+            set
+            {
+                base.ImagesLarge = value;
+            }
+        }
+        [Browsable(false)]
+        public override System.Windows.Forms.ImageList ImagesMedium
+        {
+            get
+            {
+                return base.ImagesMedium;
+            }
+            set
+            {
+                base.ImagesMedium = value;
+            }
+        }
+        [Browsable(false)]
+        public override Font KeyTipsFont
+        {
+            get
+            {
+                return base.KeyTipsFont;
+            }
+            set
+            {
+                base.KeyTipsFont = value;
+            }
+        }
+        [Browsable(false)]
+        public override bool ShowShortcutKeysInToolTips
+        {
+            get
+            {
+                return base.ShowShortcutKeysInToolTips;
+            }
+            set
+            {
+                base.ShowShortcutKeysInToolTips = value;
+            }
+        }
+        [Browsable(false)]
+        public override bool ThemeAware
+        {
+            get
+            {
+                return base.ThemeAware;
+            }
+            set
+            {
+                base.ThemeAware = value;
+            }
+        }
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override string Text
+        {
+            get
+            {
+                return base.Text;
+            }
+            set
+            {
+                base.Text = value;
+            }
+        }
+        #endregion
+
+        #region Licensing
+#if !TRIAL
+        private string m_LicenseKey = "";
+        [Browsable(false), DefaultValue("")]
+        public string LicenseKey
+        {
+            get { return m_LicenseKey; }
+            set
+            {
+                if (NativeFunctions.ValidateLicenseKey(value))
+                    return;
+                m_LicenseKey = (!NativeFunctions.CheckLicenseKey(value) ? "9dsjkhds7" : value);
+            }
+        }
+#endif
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            base.OnPaint(e);
+#if !TRIAL
+            if (NativeFunctions.keyValidated2 != 266)
+                TextDrawing.DrawString(e.Graphics, "Invalid License", this.Font, Color.FromArgb(180, Color.Red), this.ClientRectangle, eTextFormat.Bottom | eTextFormat.HorizontalCenter);
+#else
+            if (NativeFunctions.ColorExpAlt() || !NativeFunctions.CheckedThrough)
+		    {
+			    e.Graphics.Clear(SystemColors.Control);
+                return;
+            }
+#endif
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/ProgressStepper/StepItem.cs b/PROMS/DotNetBar Source Code/Controls/ProgressStepper/StepItem.cs
new file mode 100644
index 00000000..e005f292
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/ProgressStepper/StepItem.cs	
@@ -0,0 +1,845 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+using System.ComponentModel;
+using System.Drawing.Drawing2D;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represents a step item which is used to show single step in multi-step progress control.
+    /// </summary>
+    [ToolboxItem(false), DefaultEvent("Click")]
+    public class StepItem : BaseItem
+    {
+        #region Constructor, Copy
+        /// <summary>
+        /// Creates new instance of StepItem.
+        /// </summary>
+        public StepItem() : this("", "") { }
+        /// <summary>
+        /// Creates new instance of StepItem and assigns the name to it.
+        /// </summary>
+        /// <param name="sItemName">Item name.</param>
+        public StepItem(string sItemName) : this(sItemName, "") { }
+        /// <summary>
+        /// Creates new instance of StepItem and assigns the name and text to it.
+        /// </summary>
+        /// <param name="sItemName">Item name.</param>
+        /// <param name="ItemText">item text.</param>
+        public StepItem(string sItemName, string ItemText)
+            : base(sItemName, ItemText)
+        {
+            //this.ClickRepeatInterval = 200;
+            this.MouseUpNotification = true;
+            //this.MouseDownCapture = true;
+            _Padding.PropertyChanged += PaddingPropertyChanged;
+        }
+
+        /// <summary>
+        /// Returns copy of the item.
+        /// </summary>
+        public override BaseItem Copy()
+        {
+            StepItem objCopy = new StepItem(m_Name);
+            this.CopyToItem(objCopy);
+            return objCopy;
+        }
+
+        /// <summary>
+        /// Copies the StepItem specific properties to new instance of the item.
+        /// </summary>
+        /// <param name="copy">New StepItem instance.</param>
+        internal void InternalCopyToItem(StepItem copy)
+        {
+            CopyToItem(copy);
+        }
+
+        /// <summary>
+        /// Copies the StepItem specific properties to new instance of the item.
+        /// </summary>
+        /// <param name="copy">New StepItem instance.</param>
+        protected override void CopyToItem(BaseItem copy)
+        {
+            StepItem c = copy as StepItem;
+            c.Symbol = _Symbol;
+            c.SymbolSet = _SymbolSet;
+            c.SymbolColor = _SymbolColor;
+            c.SymbolSize = _SymbolSize;
+
+            base.CopyToItem(c);
+
+
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            if (_ItemPath != null)
+            {
+                _ItemPath.Dispose();
+                _ItemPath = null;
+            }
+            base.Dispose(disposing);
+        }
+        #endregion
+
+        #region Internal Implementation
+        public override void Paint(ItemPaintArgs p)
+        {
+            Rendering.BaseRenderer renderer = p.Renderer;
+            if (renderer != null)
+            {
+                StepItemRendererEventArgs e = new StepItemRendererEventArgs(this, p.Graphics);
+                e.ItemPaintArgs = p;
+                renderer.DrawStepItem(e);
+            }
+            else
+            {
+                Rendering.StepItemPainter painter = PainterFactory.CreateStepItemPainter(this);
+                if (painter != null)
+                {
+                    StepItemRendererEventArgs e = new StepItemRendererEventArgs(this, p.Graphics);
+                    e.ItemPaintArgs = p;
+                    painter.Paint(e);
+                }
+            }
+
+            if (this.DesignMode && this.Focused)
+            {
+                Rectangle r = Rectangle.Round(_ItemPath.GetBounds());
+                r.Inflate(-1, -1);
+                DesignTime.DrawDesignTimeSelection(p.Graphics, r, p.Colors.ItemDesignTimeBorder);
+            }
+
+            this.DrawInsertMarker(p.Graphics);
+        }
+
+        public override void RecalcSize()
+        {
+            Font font = GetFont(null);
+            Size size = Size.Empty;
+
+            Control objCtrl = this.ContainerControl as Control;
+            if (objCtrl == null || objCtrl.Disposing || objCtrl.IsDisposed)
+                return;
+            Graphics g = BarFunctions.CreateGraphics(objCtrl);
+            if (g == null) return;
+            try
+            {
+                if (!string.IsNullOrEmpty(_Symbol))
+                {
+                    _ActualSymbolSize = GetSymbolSize(g);
+                    size = _ActualSymbolSize;
+                }
+                else if (_Image != null)
+                {
+                    size = _Image.Size;
+                }
+                if (!string.IsNullOrEmpty(this.Text))
+                {
+                    Size textSize = ButtonItemLayout.MeasureItemText(this, g, 0, objCtrl.Font, eTextFormat.Default, objCtrl.RightToLeft == RightToLeft.Yes);
+                    size.Width += textSize.Width;
+                    size.Height = Math.Max(size.Height, textSize.Height);
+                    if (_Image != null || !string.IsNullOrEmpty(_Symbol))
+                        size.Width += Dpi.Width(_ImageTextSpacing);
+                }
+                else if (string.IsNullOrEmpty(_Symbol) && _Image == null)
+                    size = new System.Drawing.Size(Dpi.Width16, Dpi.Height16);
+
+                size.Width += GetPointerSize();
+                if(!_IsFirst && !_IsLast)
+                    size.Width += Dpi.Width(GetPointerSize());
+
+                size.Width += Dpi.Width(_Padding.Horizontal);
+                size.Height += Dpi.Height(_Padding.Vertical);
+                
+                base.RecalcSize();
+            }
+            finally
+            {
+                g.Dispose();
+            }
+
+            if (!_MinimumSize.IsEmpty)
+            {
+                if (size.Width < _MinimumSize.Width) size.Width = _MinimumSize.Width;
+                if (size.Height < _MinimumSize.Height) size.Height = _MinimumSize.Height;
+            }
+
+            m_Rect.Size = size;
+        }
+
+        internal int GetPointerSize()
+        {
+            if (this.Parent is StepItemContainer)
+                return ((StepItemContainer)this.Parent).PointerSize;
+            return 10;
+        }
+
+        private Size GetSymbolSize(Graphics g)
+        {
+            Size symbolSize = Size.Empty;
+            if (g == null || string.IsNullOrEmpty(_Symbol)) return symbolSize;
+            Font symFont = Symbols.GetFont(this.SymbolSize, this.SymbolSet);
+            symbolSize = TextDrawing.MeasureString(g, "\uF00A", symFont); // Need to do this to get consistent size for the symbol since they are not all the same width we pick widest
+            int descent = (int)Math.Ceiling((symFont.FontFamily.GetCellDescent(symFont.Style) *
+                symFont.Size / symFont.FontFamily.GetEmHeight(symFont.Style)));
+            symbolSize.Height -= descent;
+            return symbolSize;
+        }
+
+        private Size _ActualSymbolSize = Size.Empty;
+        internal Size ActualSymbolSize
+        {
+            get
+            {
+                return _ActualSymbolSize;
+            }
+        }
+
+        /// <summary>
+        /// Returns the Font object to be used for drawing the item text.
+        /// </summary>
+        /// <returns>Font object.</returns>
+        private Font GetFont(ItemPaintArgs pa)
+        {
+            System.Drawing.Font font = null;
+
+            if (pa != null)
+                font = pa.Font;
+
+            if (font == null)
+            {
+                System.Windows.Forms.Control objCtrl = null;
+                if (pa != null)
+                    objCtrl = pa.ContainerControl;
+                if (objCtrl == null)
+                    objCtrl = this.ContainerControl as System.Windows.Forms.Control;
+                if (objCtrl != null && objCtrl.Font != null)
+                    font = (Font)objCtrl.Font;
+                else
+                    font = SystemFonts.DefaultFont; // (Font)System.Windows.Forms.SystemInformation.MenuFont;
+            }
+
+            return font;
+        }
+
+        private GraphicsPath _ItemPath = null;
+        /// <summary>
+        /// Gets the render path of the item.
+        /// </summary>
+        [Browsable(false)]
+        public GraphicsPath ItemPath
+        {
+            get { return _ItemPath; }
+            internal set
+            {
+                if (_ItemPath != null)
+                    _ItemPath.Dispose();
+                _ItemPath = value;
+            }
+        }
+
+        private bool _IsFirst;
+        private int _Minimum = 0;
+        /// <summary>
+        /// Gets or sets the minimum value of the range of the control.
+        /// </summary>
+        [Browsable(true), Description("Gets or sets the minimum value of the range of the control."), Category("Behavior"), DefaultValue(0)]
+        public int Minimum
+        {
+            get { return _Minimum; }
+            set
+            {
+                if (value != _Minimum)
+                {
+                    int oldValue = _Minimum;
+                    _Minimum = value;
+                    OnMinimumChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when Minimum property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnMinimumChanged(int oldValue, int newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("Minimum"));
+            this.OnAppearanceChanged();
+            this.Refresh();
+        }
+
+        private int _Maximum = 100;
+        [Browsable(true), Description("Gets or sets the maximum value of the range of the control."), Category("Behavior"), DefaultValue(100)]
+        public int Maximum
+        {
+            get { return _Maximum; }
+            set
+            {
+                if (value != _Maximum)
+                {
+                    int oldValue = _Maximum;
+                    _Maximum = value;
+                    OnMaximumChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when Maximum property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnMaximumChanged(int oldValue, int newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("Maximum"));
+            this.OnAppearanceChanged();
+            this.Refresh();
+        }
+
+        private int _Value = 0;
+        [Browsable(true), Description("Gets or sets the current position of the progress bar."), Category("Behavior"), DefaultValue(0)]
+        public int Value
+        {
+            get { return _Value; }
+            set
+            {
+                if (value != _Value)
+                {
+                    int oldValue = _Value;
+                    _Value = value;
+                    OnValueChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when Value property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnValueChanged(int oldValue, int newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("Value"));
+            this.OnAppearanceChanged();
+            this.Refresh();
+        }
+
+        private Color _SymbolColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets the color of the Symbol.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates color of the Symbol.")]
+        public Color SymbolColor
+        {
+            get { return _SymbolColor; }
+            set { _SymbolColor = value; this.Refresh(); }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeSymbolColor()
+        {
+            return !_SymbolColor.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetSymbolColor()
+        {
+            this.SymbolColor = Color.Empty;
+        }
+
+        /// <summary>
+        /// Gets the realized symbol string.
+        /// </summary>
+        [Browsable(false)]
+        public string SymbolRealized
+        {
+            get { return _SymbolRealized; }
+        }
+        private string _Symbol = "", _SymbolRealized = "";
+        /// <summary>
+        /// Indicates the symbol displayed on face of the button instead of the image. Setting the symbol overrides the image setting.
+        /// </summary>
+        [DefaultValue(""), Category("Appearance"), Description("Indicates the symbol displayed on face of the button instead of the image. Setting the symbol overrides the image setting.")]
+        [Editor("DevComponents.DotNetBar.Design.SymbolTypeEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor))]
+        public string Symbol
+        {
+            get { return _Symbol; }
+            set
+            {
+                if (value != _Symbol)
+                {
+                    string oldValue = _Symbol;
+                    _Symbol = value;
+                    OnSymbolChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when Symbol property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnSymbolChanged(string oldValue, string newValue)
+        {
+            if (string.IsNullOrEmpty(newValue))
+                _SymbolRealized = "";
+            else
+                _SymbolRealized = Symbols.GetSymbol(newValue);
+            //OnPropertyChanged(new PropertyChangedEventArgs("Symbol"));
+            NeedRecalcSize = true;
+            OnAppearanceChanged();
+            this.Refresh();
+        }
+
+        private eSymbolSet _SymbolSet = eSymbolSet.Awesome;
+        /// <summary>
+        /// Gets or sets the symbol set used to represent the Symbol.
+        /// </summary>
+        [Browsable(false), DefaultValue(eSymbolSet.Awesome)]
+        public eSymbolSet SymbolSet
+        {
+            get { return _SymbolSet; }
+            set
+            {
+                if (_SymbolSet != value)
+                {
+                    eSymbolSet oldValue = _SymbolSet;
+                    _SymbolSet = value;
+                    OnSymbolSetChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when SymbolSet property value changes.
+        /// </summary>
+        /// <param name="oldValue">Indciates old value</param>
+        /// <param name="newValue">Indicates new value</param>
+        protected virtual void OnSymbolSetChanged(eSymbolSet oldValue, eSymbolSet newValue)
+        {
+            NeedRecalcSize = true;
+            OnAppearanceChanged();
+            this.Refresh();
+        }
+
+        private float _SymbolSize = 13f;
+        /// <summary>
+        /// Indicates the size of the symbol in points.
+        /// </summary>
+        [DefaultValue(12f), Category("Appearance"), Description("Indicates the size of the symbol in points.")]
+        public float SymbolSize
+        {
+            get { return _SymbolSize; }
+            set
+            {
+                if (value != _SymbolSize)
+                {
+                    float oldValue = _SymbolSize;
+                    _SymbolSize = value;
+                    OnSymbolSizeChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when SymbolSize property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnSymbolSizeChanged(float oldValue, float newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("SymbolSize"));
+            NeedRecalcSize = true;
+            OnAppearanceChanged();
+            this.Refresh();
+        }
+
+        private Image _Image = null;
+        /// <summary>
+        /// Indicates the image that is displayed next to the item text label.
+        /// </summary>
+        [DefaultValue(null), Category("Appearance"), Description("Indicates the image that is displayed next to the item text label.")]
+        public Image Image
+        {
+            get { return _Image; }
+            set
+            {
+                if (value != _Image)
+                {
+                    Image oldValue = _Image;
+                    _Image = value;
+                    OnImageChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when Image property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnImageChanged(Image oldValue, Image newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("Image"));
+            NeedRecalcSize = true;
+            OnAppearanceChanged();
+            this.Refresh();
+        }
+
+        /// <summary>
+        /// Gets or sets whether this is first item in StepControl.
+        /// </summary>
+        internal bool IsFirst
+        {
+            get { return _IsFirst; }
+            set
+            {
+                _IsFirst = value;
+            }
+        }
+
+        private bool _IsLast = false;
+        /// <summary>
+        /// Gets or sets whether this is laste item in StepControl.
+        /// </summary>
+        internal bool IsLast
+        {
+            get { return _IsLast; }
+            set
+            {
+                _IsLast = value;
+            }
+        }
+
+        private Size _MinimumSize = Size.Empty;
+        /// <summary>
+        /// Indicates minimum size of the item
+        /// </summary>
+        [Category("Appearance"), Description("Indicates minimum size of the item")]
+        public Size MinimumSize
+        {
+            get { return _MinimumSize; }
+            set
+            {
+                if (value != _MinimumSize)
+                {
+                    Size oldValue = _MinimumSize;
+                    _MinimumSize = value;
+                    OnMinimumSizeChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when MinimumSize property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnMinimumSizeChanged(Size oldValue, Size newValue)
+        {
+            // OnPropertyChanged(new PropertyChangedEventArgs("MinimumSize"));
+            NeedRecalcSize = true;
+            OnAppearanceChanged();
+            this.Refresh();
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeMinimumSize()
+        {
+            return !_MinimumSize.IsEmpty;
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetMinimumSize()
+        {
+            this.Size = Size.Empty;
+        }
+
+        private bool _HotTracking = true;
+        /// <summary>
+        /// Specifies whether item changes its appearance when mouse is moved over the item
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Specifies whether item changes its appearance when mouse is moved over the item")]
+        public bool HotTracking
+        {
+            get { return _HotTracking; }
+            set
+            {
+                if (value != _HotTracking)
+                {
+                    bool oldValue = _HotTracking;
+                    _HotTracking = value;
+                    OnHotTrackingChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when HotTracking property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnHotTrackingChanged(bool oldValue, bool newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("HotTracking"));
+        }
+
+        private bool _MouseOver = false, _MouseDown = false;
+        public override void InternalMouseEnter()
+        {
+            base.InternalMouseEnter();
+            if (!this.DesignMode)
+            {
+                _MouseOver = true;
+                if (this.GetEnabled() && _HotTracking)
+                    this.Refresh();
+            }
+        }
+
+        public override void InternalMouseLeave()
+        {
+            base.InternalMouseLeave();
+            if (!this.DesignMode)
+            {
+                _MouseOver = false;
+                _MouseDown = false;
+                if (this.GetEnabled() && _HotTracking)
+                    this.Refresh();
+            }
+        }
+
+        public override void InternalMouseDown(MouseEventArgs objArg)
+        {
+            base.InternalMouseDown(objArg);
+            if (objArg.Button == MouseButtons.Left && !this.DesignMode)
+            {
+                _MouseDown = true;
+                if (this.GetEnabled() && _HotTracking)
+                    this.Refresh();
+            }
+        }
+
+        public override void InternalMouseUp(MouseEventArgs objArg)
+        {
+            base.InternalMouseUp(objArg);
+
+            if (_MouseDown && !this.DesignMode)
+            {
+                _MouseDown = false;
+                if (this.GetEnabled() && _HotTracking)
+                    this.Refresh();
+            }
+        }
+
+        /// <summary>
+        /// Gets whether mouse is over the item.
+        /// </summary>
+        [Browsable(false)]
+        public bool IsMouseOver
+        {
+            get { return _MouseOver; }
+            internal set { _MouseOver = value; }
+        }
+
+        /// <summary>
+        /// Gets whether left mouse button is pressed on the item.
+        /// </summary>
+        [Browsable(false)]
+        public bool IsMouseDown
+        {
+            get { return _MouseDown; }
+            internal set { _MouseDown = value; }
+        }
+
+
+        private int _ImageTextSpacing = 4;
+        /// <summary>
+        /// Indicates the spacing between image and text.
+        /// </summary>
+        [DefaultValue(4), Category("Appearance"), Description("Indicates the spacing between image and text.")]
+        public int ImageTextSpacing
+        {
+            get { return _ImageTextSpacing; }
+            set
+            {
+                if (value != _ImageTextSpacing)
+                {
+                    int oldValue = _ImageTextSpacing;
+                    _ImageTextSpacing = value;
+                    OnImageTextSpacingChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when ImageTextSpacing property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnImageTextSpacingChanged(int oldValue, int newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("ImageTextSpacing"));
+            NeedRecalcSize = true;
+            OnAppearanceChanged();
+            this.Refresh();
+        }
+
+        private const int DefaultPadding = 4;
+        private Padding _Padding = new Padding(DefaultPadding);
+        /// <summary>
+        /// Gets or sets padding around content of the item.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), Description("Gets or sets padding around content of the item."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public Padding Padding
+        {
+            get { return _Padding; }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializePadding()
+        {
+            return _Padding.Bottom != DefaultPadding || _Padding.Top != DefaultPadding || _Padding.Left != DefaultPadding || _Padding.Right != DefaultPadding;
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetPadding()
+        {
+            _Padding.All = DefaultPadding;
+        }
+        private void PaddingPropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            NeedRecalcSize = true;
+            this.Refresh();
+        }
+
+        private Color[] _ProgressColors = null;
+        /// <summary>
+        /// Indicates the array of colors that when set are used to draw the current progress, i.e. Value>Minimum
+        /// </summary>
+        [DefaultValue(null), Category("Appearance"), Description("Indicates the array of colors that when set are used to draw the current progress, i.e. Value>Minimum"), TypeConverter(typeof(ArrayConverter))]
+        public Color[] ProgressColors
+        {
+            get
+            {
+                return _ProgressColors;
+            }
+            set
+            {
+                if (_ProgressColors != value)
+                {
+                    _ProgressColors = value;
+                    //OnPropertyChanged(new PropertyChangedEventArgs("Colors"));
+                    this.Refresh();
+                }
+            }
+        }
+
+        private Color[] _BackColors = null;
+        /// <summary>
+        /// Indicates the array of colors that when set are used to draw the background of the item.
+        /// </summary>
+        [DefaultValue(null), Category("Appearance"), Description("Indicates the array of colors that when set are used to draw the background of the item."), TypeConverter(typeof(ArrayConverter))]
+        public Color[] BackColors
+        {
+            get
+            {
+                return _BackColors;
+            }
+            set
+            {
+                if (_BackColors != value)
+                {
+                    _BackColors = value;
+                    //OnPropertyChanged(new PropertyChangedEventArgs("Colors"));
+                    this.Refresh();
+                }
+            }
+        }
+
+        private eButtonTextAlignment _TextAlignment = eButtonTextAlignment.Left;
+        /// <summary>
+        /// Gets or sets the text alignment. Default value is left.
+        /// </summary>
+        [Browsable(true), DefaultValue(eButtonTextAlignment.Left), Category("Appearance"), Description("Indicates text alignment.")]
+        public eButtonTextAlignment TextAlignment
+        {
+            get { return _TextAlignment; }
+            set
+            {
+                _TextAlignment = value;
+                this.Refresh();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the text associated with this item.
+        /// </summary>
+        [System.ComponentModel.Browsable(true), DevCoBrowsable(true), Editor("DevComponents.DotNetBar.Design.TextMarkupUIEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), System.ComponentModel.Category("Appearance"), System.ComponentModel.Description("The text contained in the item."), System.ComponentModel.Localizable(true), System.ComponentModel.DefaultValue("")]
+        public override string Text
+        {
+            get
+            {
+                return base.Text;
+            }
+            set
+            {
+                base.Text = value;
+            }
+        }
+
+        private Color _TextColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets the color of the text.
+        /// </summary>
+        [Category("Columns"), Description("Indicates color of text.")]
+        public Color TextColor
+        {
+            get { return _TextColor; }
+            set { _TextColor = value; this.Refresh(); }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeTextColor()
+        {
+            return !_TextColor.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetTextColor()
+        {
+            this.TextColor = Color.Empty;
+        }
+        #endregion
+
+        #region Markup Implementation
+        /// <summary>
+        /// Gets whether item supports text markup. Default is false.
+        /// </summary>
+        protected override bool IsMarkupSupported
+        {
+            get { return _EnableMarkup; }
+        }
+
+        private bool _EnableMarkup = true;
+        /// <summary>
+        /// Gets or sets whether text-markup support is enabled for items Text property. Default value is true.
+        /// Set this property to false to display HTML or other markup in the item instead of it being parsed as text-markup.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance"), Description("Indicates whether text-markup support is enabled for items Text property.")]
+        public bool EnableMarkup
+        {
+            get { return _EnableMarkup; }
+            set
+            {
+                if (_EnableMarkup != value)
+                {
+                    _EnableMarkup = value;
+                    NeedRecalcSize = true;
+                    OnTextChanged();
+                }
+            }
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/ProgressStepper/StepItemContainer.cs b/PROMS/DotNetBar Source Code/Controls/ProgressStepper/StepItemContainer.cs
new file mode 100644
index 00000000..12d268aa
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/ProgressStepper/StepItemContainer.cs	
@@ -0,0 +1,221 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Container for the StepItem objects.
+    /// </summary>
+    public class StepItemContainer : ImageItem, IDesignTimeProvider
+    {
+        #region Implementation
+        /// <summary>
+        /// Initializes a new instance of the StepContainer class.
+        /// </summary>
+        public StepItemContainer()
+        {
+            m_IsContainer = true;
+            this.AutoCollapseOnClick = true;
+            this.AccessibleRole = System.Windows.Forms.AccessibleRole.Grouping;
+        }
+        /// <summary>
+        /// Returns copy of the item.
+        /// </summary>
+        public override BaseItem Copy()
+        {
+            StepItemContainer objCopy = new StepItemContainer();
+            objCopy.Name = this.Name;
+            this.CopyToItem(objCopy);
+            return objCopy;
+        }
+
+        /// <summary>
+        /// Copies the StepContainer specific properties to new instance of the item.
+        /// </summary>
+        /// <param name="copy">New StepContainer instance.</param>
+        internal void InternalCopyToItem(StepItemContainer copy)
+        {
+            CopyToItem(copy);
+        }
+
+        /// <summary>
+        /// Copies the StepContainer specific properties to new instance of the item.
+        /// </summary>
+        /// <param name="copy">New StepContainer instance.</param>
+        protected override void CopyToItem(BaseItem copy)
+        {
+            StepItemContainer c = copy as StepItemContainer;
+            base.CopyToItem(c);
+
+
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            base.Dispose(disposing);
+        }
+
+        public override void RecalcSize()
+        {
+            bool first = true;
+            Point loc = this.Bounds.Location;
+            Size totalSize = Size.Empty;
+            bool uniformHeight = true;
+            SubItemsCollection subItems = this.SubItems;
+            bool last = true;
+            int startIndex = subItems.Count - 1;
+            for (int i = startIndex; i >= 0; i--)
+            {
+                StepItem item = subItems[i] as StepItem;
+                if (item != null && item.Visible)
+                {
+                    item.IsLast = last;
+                    last = false;
+                }
+            }
+            foreach (BaseItem item in subItems)
+            {
+                item.DesignMarkerOrientation = eDesignMarkerOrientation.Horizontal;
+                StepItem si = item as StepItem;
+                if (!item.Visible)
+                {
+                    item.Displayed = false;
+                    if (si != null)
+                    {
+                        si.IsLast = false;
+                    }
+                    continue;
+                }
+                item.Displayed = true;
+                if (si != null)
+                {
+                    si.IsFirst = first;
+                    first = false;
+                    si.RecalcSize();
+                    si.SetDisplayRectangle(new Rectangle(loc, si.Size));
+                    int stepWidth = (si.Size.Width - _PointerSize - 1); // 1 is so right hand line overlaps
+                    loc.X += stepWidth;
+                    totalSize.Width += stepWidth;
+                }
+                else
+                {
+                    first = true;
+                    item.RecalcSize();
+                    item.SetDisplayRectangle(new Rectangle(loc, item.Size));
+                    loc.X += item.WidthInternal;
+                    totalSize.Width += item.WidthInternal;
+                }
+                if (uniformHeight && totalSize.Height > 0 && totalSize.Height != item.HeightInternal)
+                    uniformHeight = false;
+                totalSize.Height = Math.Max(totalSize.Height, item.HeightInternal);
+            }
+            totalSize.Width += _PointerSize;
+
+            // Vertically center items if they are all not of same height
+            if (!uniformHeight)
+            {
+                foreach (BaseItem item in subItems)
+                {
+                    if (!item.Visible)
+                        continue;
+                    if (item.HeightInternal < totalSize.Height)
+                        item.TopInternal = (totalSize.Height - item.HeightInternal) / 2;
+                }
+            }
+            m_Rect.Size = totalSize;
+            _CalculatedHeight = totalSize.Height;
+            _CalculatedWidth = totalSize.Width;
+            base.RecalcSize();
+        }
+
+        public override void Paint(ItemPaintArgs p)
+        {
+            ItemDisplay display = GetItemDisplay();
+            display.Paint(this, p);
+        }
+
+        private ItemDisplay m_ItemDisplay = null;
+        internal ItemDisplay GetItemDisplay()
+        {
+            if (m_ItemDisplay == null)
+            {
+                m_ItemDisplay = new ItemDisplay();
+            }
+            return m_ItemDisplay;
+        }
+
+        private int _PointerSize = 10;
+        /// <summary>
+        /// Gets or sets the arrow pointer width for the StepItem objects hosted within this container.
+        /// </summary>
+        [DefaultValue(10), Category("Appearance"), Description("Gets or sets the arrow pointer width for the StepItem objects hosted within this container.")]
+        public int PointerSize
+        {
+            get { return _PointerSize; }
+            set
+            {
+                if (value != _PointerSize)
+                {
+                    int oldValue = _PointerSize;
+                    _PointerSize = value;
+                    OnPointerSizeChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when PointerSize property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnPointerSizeChanged(int oldValue, int newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("PointerSize"));
+
+        }
+
+        private int _CalculatedWidth;
+        internal int CalculatedWidth
+        {
+            get { return _CalculatedWidth; }
+            set
+            {
+                _CalculatedWidth = value;
+            }
+        }
+
+        private int _CalculatedHeight;
+        internal int CalculatedHeight
+        {
+            get { return _CalculatedHeight; }
+            set
+            {
+                _CalculatedHeight = value;
+            }
+        }
+
+        #endregion
+
+        #region IDesignTimeProvider Implementation
+        protected virtual InsertPosition GetContainerInsertPosition(Point pScreen, BaseItem dragItem)
+        {
+            return DesignTimeProviderContainer.GetInsertPosition(this, pScreen, dragItem);
+        }
+        InsertPosition IDesignTimeProvider.GetInsertPosition(Point pScreen, BaseItem dragItem)
+        {
+            return GetContainerInsertPosition(pScreen, dragItem);
+        }
+        void IDesignTimeProvider.DrawReversibleMarker(int iPos, bool Before)
+        {
+            DesignTimeProviderContainer.DrawReversibleMarker(this, iPos, Before);
+        }
+        void IDesignTimeProvider.InsertItemAt(BaseItem objItem, int iPos, bool Before)
+        {
+            DesignTimeProviderContainer.InsertItemAt(this, objItem, iPos, Before);
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/ProgressStepper/StepItemPainter.cs b/PROMS/DotNetBar Source Code/Controls/ProgressStepper/StepItemPainter.cs
new file mode 100644
index 00000000..934a51c1
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/ProgressStepper/StepItemPainter.cs	
@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    internal class StepItemPainter: IOffice2007Painter
+    {
+        /// <summary>
+        /// Paints StepItem.
+        /// </summary>
+        /// <param name="e">Provides arguments for the operation.</param>
+        public virtual void Paint(StepItemRendererEventArgs e) { }
+
+        #region IOffice2007Painter Members
+        private Office2007ColorTable _ColorTable = null; //new Office2007ColorTable();
+        public Office2007ColorTable ColorTable
+        {
+            get
+            {
+                return _ColorTable;
+            }
+            set
+            {
+                _ColorTable = value;
+            }
+        }
+
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/ProgressStepper/StepItemRendererEventArgs.cs b/PROMS/DotNetBar Source Code/Controls/ProgressStepper/StepItemRendererEventArgs.cs
new file mode 100644
index 00000000..8efde40f
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/ProgressStepper/StepItemRendererEventArgs.cs	
@@ -0,0 +1,35 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Provides data for the Slider item rendering events.
+    /// </summary>
+    public class StepItemRendererEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets or sets the reference to the item being rendered.
+        /// </summary>
+        public StepItem Item = null;
+
+        /// <summary>
+        /// Gets or sets the reference to graphics object.
+        /// </summary>
+        public Graphics Graphics = null;
+
+        internal ItemPaintArgs ItemPaintArgs = null;
+
+        /// <summary>
+        /// Creates new instance of the object and initializes it with default values.
+        /// </summary>
+        /// <param name="overflowItem">Reference to the Slider item being rendered.</param>
+        /// <param name="g">Reference to the graphics object.</param>
+        public StepItemRendererEventArgs(StepItem item, Graphics g)
+        {
+            this.Item = item;
+            this.Graphics = g;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/RangeSlider.cs b/PROMS/DotNetBar Source Code/Controls/RangeSlider.cs
new file mode 100644
index 00000000..57981150
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/RangeSlider.cs	
@@ -0,0 +1,448 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+using System.ComponentModel;
+using System.Runtime.InteropServices;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    /// <summary>
+    /// Represents Range Slider Control.
+    /// </summary>
+    [ToolboxBitmap(typeof(RangeSlider), "Controls.RangeSlider.ico"), ToolboxItem(true), DefaultEvent("ValueChanged"), ComVisible(false), Designer("DevComponents.DotNetBar.Design.RangeSliderDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+    public class RangeSlider : BaseItemControl
+    {
+        #region Private Variables
+        private RangeSliderItem _Slider = null;
+        #endregion
+
+        #region Events
+        /// <summary>
+        /// Occurs before Value has changed and allow the cancellation of the change.
+        /// </summary>
+        [Description("Occurs before Value has changed and allow the cancellation of the change.")]
+        public event RangeSliderValueChangingEventHandler ValueChanging;
+        /// <summary>
+        /// Raises ValueChanging event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnValueChanging(RangeSliderValueChangingEventArgs e)
+        {
+            RangeSliderValueChangingEventHandler handler = ValueChanging;
+            if (handler != null)
+                handler(this, e);
+        }
+        /// <summary>
+        /// Occurs after Value property has changed
+        /// </summary>
+        [Description("Occurs after Value property has changed.")]
+        public event EventHandler ValueChanged;
+        /// <summary>
+        /// Raises ValueChanged event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnValueChanged(EventArgs e)
+        {
+            EventHandler handler = ValueChanged;
+            if (handler != null)
+                handler(this, e);
+        }
+        /// <summary>
+        /// Occurs when control is about to display the range tooltip and it allows you to customize tooltip
+        /// </summary>
+        [Description("Occurs when control is about to display the range tooltip and it allows you to customize tooltip")]
+        public event RangeTooltipEventHandler RangeTooltipText;
+        /// <summary>
+        /// Raises GetRangeTooltipText event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnRangeTooltipText(RangeTooltipEventArgs e)
+        {
+            RangeTooltipEventHandler handler = RangeTooltipText;
+            if (handler != null)
+                handler(this, e);
+        }
+        #endregion
+
+        #region Constructor, Dispose
+        public RangeSlider()
+        {
+            _Slider = new RangeSliderItem();
+            _Slider.Style = eDotNetBarStyle.StyleManagerControlled;
+            _Slider.ValueChanging += new RangeSliderValueChangingEventHandler(Slider_ValueChanging);
+            _Slider.ValueChanged += new EventHandler(Slider_ValueChanged);
+            _Slider.RangeTooltipText += new RangeTooltipEventHandler(Slider_RangeTooltipText);
+            this.HostItem = _Slider;
+        }
+
+        void Slider_RangeTooltipText(object sender, RangeTooltipEventArgs e)
+        {
+            OnRangeTooltipText(e);
+        }
+
+        void Slider_ValueChanged(object sender, EventArgs e)
+        {
+            OnValueChanged(e);
+        }
+
+        void Slider_ValueChanging(object sender, RangeSliderValueChangingEventArgs e)
+        {
+            OnValueChanging(e);
+        }
+
+        /// <summary>
+        /// Forces the button to perform internal layout.
+        /// </summary>
+        public override void RecalcLayout()
+        {
+            Rectangle r = GetItemBounds();
+            _Slider.Width = r.Width;
+            _Slider.Height = r.Height;
+            base.RecalcLayout();
+        }
+
+        protected override void OnHandleCreated(EventArgs e)
+        {
+            this.RecalcLayout();
+            base.OnHandleCreated(e);
+        }
+
+        //protected override bool ProcessCmdKey(ref System.Windows.Forms.Message msg, System.Windows.Forms.Keys keyData)
+        //{
+        //    if (keyData == System.Windows.Forms.Keys.Left)
+        //    {
+        //        m_Slider.Increment(-m_Slider.Step, eEventSource.Keyboard);
+        //        return true;
+        //    }
+        //    else if (keyData == System.Windows.Forms.Keys.Right)
+        //    {
+        //        m_Slider.Increment(m_Slider.Step, eEventSource.Keyboard);
+        //        return true;
+        //    }
+        //    return base.ProcessCmdKey(ref msg, keyData);
+        //}
+
+        /// <summary>
+        /// Gets the RangeSliderItem.
+        /// </summary>
+        internal RangeSliderItem SliderItem
+        {
+            get { return (_Slider); }
+        }
+
+        /// <summary>
+        /// Indicates whether clicking the area outside of the range change buttons moves the range change button to the clicked location if possible thus allowing range change.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether clicking the area outside of the range change buttons moves the range change button to the clicked location if possible thus allowing range change.")]
+        public bool ClientClickRangeChangeEnabled
+        {
+            get { return _Slider.ClientClickRangeChangeEnabled; }
+            set
+            {
+                _Slider.ClientClickRangeChangeEnabled = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the maximum value of the range of the control.
+        /// </summary>
+        [Description("Gets or sets the maximum value of the range of the control."), Category("Behavior"), DefaultValue(10)]
+        public int Maximum
+        {
+            get { return _Slider.Maximum; }
+            set
+            {
+                _Slider.Maximum = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the minimum value of the range of the control.
+        /// </summary>
+        [Description("Gets or sets the minimum value of the range of the control."), Category("Behavior"), DefaultValue(0)]
+        public int Minimum
+        {
+            get { return _Slider.Minimum; }
+            set
+            {
+                _Slider.Minimum = value;
+            }
+        }
+
+        /// <summary>
+        /// Indicates image to be used as maximum range slider button instead of built-in button. Image is scaled to size set by RangeButtonSize.
+        /// </summary>
+        [DefaultValue(null), Category("Appearance"), Description("Indicates image to be used as maximum range slider button instead of built-in button. Image is scaled to size set by RangeButtonSize.")]
+        public Image MaxRangeSliderImage
+        {
+            get { return _Slider.MaxRangeSliderImage; }
+            set
+            {
+                _Slider.MaxRangeSliderImage = value;
+            }
+        }
+
+        /// <summary>
+        /// Indicates image to be used as minimum range slider button instead of built-in button. Image is scaled to size set by RangeButtonSize.
+        /// </summary>
+        [DefaultValue(null), Category("Appearance"), Description("Indicates image to be used as minimum range slider button instead of built-in button. Image is scaled to size set by RangeButtonSize.")]
+        public Image MinRangeSliderImage
+        {
+            get { return _Slider.MinRangeSliderImage; }
+            set
+            {
+                _Slider.MinRangeSliderImage = value;
+            }
+        }
+
+        /// <summary>
+        /// Specifies minimum absolute range that user can select. Absolute range is defined as Abs(Value.Max-Value.Min) Applies to user performed selection through mouse only.
+        /// </summary>
+        [DefaultValue(0), Category("Behavior"), Description("Specifies minimum absolute range that user can select. Absolute range is defined as Abs(Value.Max-Value.Min) Applies to user performed selection through mouse only.")]
+        public int MinimumAbsoluteRange
+        {
+            get { return _Slider.MinimumAbsoluteRange; }
+            set
+            {
+                _Slider.MinimumAbsoluteRange = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets current part that is pressed using mouse left button.
+        /// </summary>
+        [Browsable(false)]
+        public eRangeSliderPart MouseDownPart
+        {
+            get { return _Slider.MouseDownPart; }
+        }
+
+        /// <summary>
+        /// Gets mouse over part.
+        /// </summary>
+        [Browsable(false)]
+        public eRangeSliderPart MouseOverPart
+        {
+            get { return _Slider.MouseOverPart; }
+        }
+
+        /// <summary>
+        /// Gets bounds of maximum range sliding button.
+        /// </summary>
+        [Browsable(false)]
+        public Rectangle RangeButtonMaxBounds
+        {
+            get
+            {
+                return _Slider.RangeButtonMaxBounds;
+            }
+        }
+
+        /// <summary>
+        /// Gets bounds of minimum range sliding button.
+        /// </summary>
+        [Browsable(false)]
+        public Rectangle RangeButtonMinBounds
+        {
+            get
+            {
+                return _Slider.RangeButtonMinBounds;
+            }
+        }
+
+        /// <summary>
+        /// Indicates the size of the range change buttons.
+        /// </summary>
+        [Description("Indicates the size of the range change buttons."), Category("Appearance")]
+        public Size RangeButtonSize
+        {
+            get { return _Slider.RangeButtonSize; }
+            set
+            {
+                _Slider.RangeButtonSize = value;
+            }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeRangeButtonSize()
+        {
+            return _Slider.ShouldSerializeRangeButtonSize();
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetRangeButtonSize()
+        {
+            _Slider.ResetRangeButtonSize();
+        }
+
+        /// <summary>
+        /// Specifies the height of the range line
+        /// </summary>
+        [DefaultValue(7), Category("Appearance"), Description("Specifies the height of the range line")]
+        public int RangeLineHeight
+        {
+            get { return _Slider.RangeLineHeight; }
+            set
+            {
+                _Slider.RangeLineHeight = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the string that is used to format the range value to be displayed while user moves the range buttons. Value set here is used in string.Format(RangeTooltipFormat, Value.Min, Value.Max).
+        /// </summary>
+        [DefaultValue("{0} - {1}"), Description("Indicate string that is used to format the range value to be displayed while user moves the range buttons. Value set here is used in string.Format(RangeTooltipFormat, Value.Min, Value.Max)."), Localizable(true), Category("Behavior")]
+        public string RangeTooltipFormat
+        {
+            get { return _Slider.RangeTooltipFormat; }
+            set
+            {
+                _Slider.RangeTooltipFormat = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the color of the range value.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates color of range value.")]
+        public Color RangeValueColor
+        {
+            get { return _Slider.RangeValueColor; }
+            set
+            {
+                _Slider.RangeValueColor = value;
+            }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeRangeValueColor()
+        {
+            return _Slider.ShouldSerializeRangeValueColor();
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetRangeValueColor()
+        {
+            _Slider.ResetRangeValueColor();
+        }
+
+        /// <summary>
+        /// Specifies whether range tooltip is shown while user is changing the range
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Specifies whether range tooltip is shown while user is changing the range")]
+        public bool ShowRangeTooltip
+        {
+            get { return _Slider.ShowRangeTooltip; }
+            set
+            {
+                _Slider.ShowRangeTooltip = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the slider orientation. Default value is horizontal.
+        /// </summary>
+        [DefaultValue(eOrientation.Horizontal), Category("Appearance"), Description("Indicates slider orientation.")]
+        public eOrientation SliderOrientation
+        {
+            get { return _Slider.SliderOrientation; }
+            set
+            {
+                _Slider.SliderOrientation = value;
+            }
+        }
+
+        [Browsable(false)]
+        public override string Text
+        {
+            get
+            {
+                return base.Text;
+            }
+            set
+            {
+                base.Text = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets tick marks bounds.
+        /// </summary>
+        [Browsable(false)]
+        public Rectangle TicksBounds
+        {
+            get
+            {
+                return _Slider.TicksBounds;
+            }
+        }
+        private Rectangle _TicksBounds2 = Rectangle.Empty;
+        /// <summary>
+        /// Gets tick marks bounds for second marker is visible.
+        /// </summary>
+        [Browsable(false)]
+        public Rectangle TicksBounds2
+        {
+            get
+            {
+                return _Slider.TicksBounds2;
+            }
+        }
+
+        /// <summary>
+        /// Specifies the ticks position inside of Range Slider.
+        /// </summary>
+        [DefaultValue(eTicksPosition.Bottom), Category("Appearance"), Description("Specifies the ticks position inside of Range Slider.")]
+        public eTicksPosition TicksPosition
+        {
+            get { return _Slider.TicksPosition; }
+            set
+            {
+                _Slider.TicksPosition = value;
+            }
+        }
+
+        /// <summary>
+        /// Indicates tick display period
+        /// </summary>
+        [DefaultValue(1), Category("Appearance"), Description("Indicates tick display period")]
+        public int TicksStep
+        {
+            get { return _Slider.TicksStep; }
+            set
+            {
+                _Slider.TicksStep = value;
+            }
+        }
+
+        /// <summary>
+        /// Indicates whether tick lines are shown
+        /// </summary>
+        [DefaultValue(true), Category("Appearance"), Description("Indicates whether tick lines are shown")]
+        public bool TicksVisible
+        {
+            get { return _Slider.TicksVisible; }
+            set
+            {
+                _Slider.TicksVisible = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the range displayed by the control.
+        /// </summary>
+        [Description("Specifies range displayed by the control."), Category("Data")]
+        public RangeValue Value
+        {
+            get { return _Slider.Value; }
+            set
+            {
+                _Slider.Value = value;
+            }
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/RangeSlider.ico b/PROMS/DotNetBar Source Code/Controls/RangeSlider.ico
new file mode 100644
index 00000000..53bba306
Binary files /dev/null and b/PROMS/DotNetBar Source Code/Controls/RangeSlider.ico differ
diff --git a/PROMS/DotNetBar Source Code/Controls/RatingStar.cs b/PROMS/DotNetBar Source Code/Controls/RatingStar.cs
new file mode 100644
index 00000000..4c973b5c
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/RatingStar.cs	
@@ -0,0 +1,474 @@
+using System;
+using System.Text;
+using System.ComponentModel;
+using System.Windows.Forms;
+using DevComponents.Editors;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    /// <summary>
+    /// Represents the Rating control.
+    /// </summary>
+    [ToolboxBitmap(typeof(RatingStar), "Controls.RatingStar.ico"), ToolboxItem(true), DefaultEvent("RatingChanged"), System.Runtime.InteropServices.ComVisible(true)]
+    public class RatingStar : BaseItemControl, ICommandSource
+    {
+        #region Private Variables
+        private RatingItem _RatingItem = null;
+        #endregion
+
+        #region Events
+        /// <summary>
+        /// Occurs when Rating property has changed.
+        /// </summary>
+        [Description("Occurs when Rating property has changed.")]
+        public event EventHandler RatingChanged;
+        /// <summary>
+        /// Occurs when RatingValue property has changed.
+        /// </summary>
+        [Description("Occurs when Rating property has changed.")]
+        public event EventHandler RatingValueChanged;
+        /// <summary>
+        /// Occurs when Rating property is about to be changed and provides opportunity to cancel the change.
+        /// </summary>
+        [Description("Occurs when Rating property has changed.")]
+        public event RatingChangeEventHandler RatingChanging;
+        /// <summary>
+        /// Occurs when AverageRating property has changed.
+        /// </summary>
+        [Description("Occurs when AverageRating property has changed.")]
+        public event EventHandler AverageRatingChanged;
+        /// <summary>
+        /// Occurs when AverageRatingValue property has changed.
+        /// </summary>
+        [Description("Occurs when AverageRatingValue property has changed.")]
+        public event EventHandler AverageRatingValueChanged;
+        /// <summary>
+        /// Occurs when text markup link is clicked. Markup links can be created using "a" tag, for example:
+        /// <a name="MyLink">Markup link</a>
+        /// </summary>
+        public event MarkupLinkClickEventHandler MarkupLinkClick;
+        /// <summary>
+        /// Occurs when RatingValue property is set and it allows you to provide custom parsing for the values.
+        /// </summary>
+        public event ParseIntegerValueEventHandler ParseRatingValue;
+        /// <summary>
+        /// Occurs when AverageRatingValue property is set and it allows you to provide custom parsing for the values.
+        /// </summary>
+        public event ParseDoubleValueEventHandler ParseAverageRatingValue;
+        #endregion
+
+        #region Constructor
+        /// <summary>
+        /// Initializes a new instance of the Rating class.
+        /// </summary>
+        public RatingStar()
+        {
+            this.SetStyle(ControlStyles.Selectable, false);
+            _RatingItem = new RatingItem();
+            _RatingItem.Style = eDotNetBarStyle.Office2007;
+            _RatingItem.RatingChanging += new RatingChangeEventHandler(RatingItemRatingChanging);
+            _RatingItem.RatingChanged += new EventHandler(RatingItemRatingChanged);
+            _RatingItem.AverageRatingChanged += new EventHandler(RatingItemAverageRatingChanged);
+            _RatingItem.ParseAverageRatingValue += new DevComponents.Editors.ParseDoubleValueEventHandler(RatingItemParseAverageRatingValue);
+            _RatingItem.ParseRatingValue += new DevComponents.Editors.ParseIntegerValueEventHandler(RatingItemParseRatingValue);
+            this.HostItem = _RatingItem;
+        }
+
+        #endregion
+
+        #region Internal Implementation
+        /// <summary>
+        /// Indicates number of stars used for the rating. Minium value is 2 stars.
+        /// </summary>
+        [DefaultValue(5), Category("Appearance"), Description("Indicates number of stars used for the rating.")]
+        public int NumberOfStars
+        {
+            get { return _RatingItem.NumberOfStars; }
+            set
+            {
+                _RatingItem.NumberOfStars = value;
+                if (this.AutoSize) this.AdjustSize();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the rating value represented by the control. Default value is 0 which indicates
+        /// that there is no rating set. Maximum value is 5.
+        /// </summary>
+        [DefaultValue(0), Category("Data"), Description("Indicates rating value represented by the control.")]
+        public int Rating
+        {
+            get
+            {
+                return _RatingItem.Rating;
+            }
+            set
+            {
+            	_RatingItem.Rating = value;
+            }
+        }
+        /// <summary>
+        /// Gets or sets the average rating shown by control. Control will display average rating (if set) when no explicit
+        /// Rating value is set through Rating property. Minimum value is 0 and Maximum value is 5.
+        /// </summary>
+        [DefaultValue(0d), Category("Data"), Description("Indicates average rating shown by control.")]
+        public double AverageRating
+        {
+            get
+            {
+                return _RatingItem.AverageRating;
+            }
+            set
+            {
+            	_RatingItem.AverageRating = value;
+            }
+        }
+        /// <summary>
+        /// Gets or sets the AverageRating property. This property is provided for Data-Binding with NULL value support.
+        /// </summary>
+        [Bindable(true), Browsable(false), RefreshProperties(RefreshProperties.All), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), System.ComponentModel.TypeConverter(typeof(System.ComponentModel.StringConverter))]
+        public object AverageRatingValue
+        {
+            get
+            {
+                return _RatingItem.AverageRatingValue;
+            }
+            set
+            {
+                _RatingItem.AverageRatingValue = value;
+            }
+        }
+        /// <summary>
+        /// Gets the reference to custom rating images.
+        /// </summary>
+        [Browsable(true), Category("Images"), Description("Gets the reference to custom rating images."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public RatingImages CustomImages
+        {
+            get { return _RatingItem.CustomImages; }
+        }
+        /// <summary>
+        /// Gets or sets whether text assigned to the check box is visible. Default value is true.
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Appearance"), Description("Indicates whether text assigned to the check box is visible.")]
+        public bool TextVisible
+        {
+            get { return _RatingItem.TextVisible; }
+            set
+            {
+                _RatingItem.TextVisible = value;
+            }
+        }
+        /// <summary>
+        /// Gets or sets whether text-markup support is enabled for items Text property. Default value is true.
+        /// Set this property to false to display HTML or other markup in the item instead of it being parsed as text-markup.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance"), Description("Indicates whether text-markup support is enabled for items Text property.")]
+        public bool EnableMarkup
+        {
+            get { return _RatingItem.EnableMarkup; }
+            set
+            {
+                _RatingItem.EnableMarkup = value;
+            }
+        }
+        /// <summary>
+        /// Gets or sets whether rating can be edited. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether rating can be edited.")]
+        public bool IsEditable
+        {
+            get { return _RatingItem.IsEditable; }
+            set
+            {
+                _RatingItem.IsEditable = value;
+            }
+        }
+        /// <summary>
+        /// Gets or sets the orientation of rating control.
+        /// </summary>
+        [DefaultValue(eOrientation.Horizontal), Category("Appearance"), Description("Gets or sets the orientation of rating control.")]
+        public eOrientation RatingOrientation
+        {
+            get { return _RatingItem.RatingOrientation; }
+            set
+            {
+                _RatingItem.RatingOrientation = value;
+            }
+        }
+        /// <summary>
+        /// Gets or sets the Rating property value. This property is provided for Data-Binding with NULL value support.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), RefreshProperties(RefreshProperties.All), Bindable(true)]
+        public object RatingValue
+        {
+            get { return _RatingItem.RatingValue; }
+            set
+            {
+                _RatingItem.RatingValue = value;
+            }
+        }
+        /// <summary>
+        /// Gets or sets the text color. Default value is Color.Empty which indicates that default color is used.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), Description("Indicates text color.")]
+        public Color TextColor
+        {
+            get { return _RatingItem.TextColor; }
+            set
+            {
+                _RatingItem.TextColor = value;
+            }
+        }
+        /// <summary>
+        /// Gets or sets the spacing between optional text and the rating.
+        /// </summary>
+        [DefaultValue(0), Category("Appearance"), Description("Gets or sets the spacing between optional text and the rating.")]
+        public int TextSpacing
+        {
+            get { return _RatingItem.TextSpacing; }
+            set
+            {
+                _RatingItem.TextSpacing = value;
+            }
+        }
+
+        private void RatingItemParseRatingValue(object sender, DevComponents.Editors.ParseIntegerValueEventArgs e)
+        {
+            OnParseRatingValue(e);
+        }
+        /// <summary>
+        /// Raises the ParseRating event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnParseRatingValue(ParseIntegerValueEventArgs e)
+        {
+            if (ParseRatingValue != null)
+                ParseRatingValue(this, e);
+        }
+
+        private void RatingItemParseAverageRatingValue(object sender, DevComponents.Editors.ParseDoubleValueEventArgs e)
+        {
+            OnParseAverageRatingValue(e);
+        }
+        /// <summary>
+        /// Raises the ParseAverageRatingValue event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnParseAverageRatingValue(ParseDoubleValueEventArgs e)
+        {
+            if (ParseAverageRatingValue != null)
+                ParseAverageRatingValue(this, e);
+        }
+
+        private void RatingItemAverageRatingChanged(object sender, EventArgs e)
+        {
+            OnAverageRatingChanged(e);
+        }
+        /// <summary>
+        /// Raises the AverageRatingChanged event.
+        /// </summary>
+        /// <param name="eventArgs">Event data.</param>
+        protected virtual void OnAverageRatingChanged(EventArgs eventArgs)
+        {
+            if (AverageRatingChanged != null) AverageRatingChanged(this, eventArgs);
+            if (AverageRatingValueChanged != null) AverageRatingValueChanged(this, eventArgs);
+        }
+
+        private void RatingItemRatingChanged(object sender, EventArgs e)
+        {
+            OnRatingChanged(e);
+        }
+        /// <summary>
+        /// Raises the RatingChanged event.
+        /// </summary>
+        /// <param name="eventArgs">Event data.</param>
+        protected virtual void OnRatingChanged(EventArgs eventArgs)
+        {
+            EventHandler handler = RatingChanged;
+            if (handler != null) handler(this, eventArgs);
+
+            handler = RatingValueChanged;
+            if (handler != null) handler(this, eventArgs);
+        }
+
+        private void RatingItemRatingChanging(object sender, RatingChangeEventArgs e)
+        {
+            OnRatingChanging(e);
+        }
+        /// <summary>
+        /// Raises RatingChanging event.
+        /// </summary>
+        /// <param name="e">Event data</param>
+        protected virtual void OnRatingChanging(RatingChangeEventArgs e)
+        {
+            if (RatingChanging != null)
+                RatingChanging(this, e);
+        }
+
+#if FRAMEWORK20
+        [Localizable(true), Browsable(false)]
+        public new System.Windows.Forms.Padding Padding
+        {
+            get { return base.Padding; }
+            set { base.Padding = value; }
+        }
+
+        protected override void OnResize(EventArgs e)
+        {
+            base.OnResize(e);
+        }
+
+        public override Size GetPreferredSize(Size proposedSize)
+        {
+            if (!BarFunctions.IsHandleValid(this))
+                return base.GetPreferredSize(proposedSize);
+            
+            _RatingItem.RecalcSize();
+            Size s = _RatingItem.CalcSize;
+            s.Width += 2;
+            s.Height += 2;
+            if (!this.TextVisible) s.Width += 2;
+            s.Width += ElementStyleLayout.HorizontalStyleWhiteSpace(this.GetBackgroundStyle());
+            s.Height += ElementStyleLayout.VerticalStyleWhiteSpace(this.GetBackgroundStyle());
+            _RatingItem.Bounds = GetItemBounds();
+            return s;
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the control is automatically resized to display its entire contents. You can set MaximumSize.Width property to set the maximum width used by the control.
+        /// </summary>
+        [Browsable(true), DefaultValue(false), EditorBrowsable(EditorBrowsableState.Always), DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
+        public override bool AutoSize
+        {
+            get
+            {
+                return base.AutoSize;
+            }
+            set
+            {
+                if (this.AutoSize != value)
+                {
+                    base.AutoSize = value;
+                    AdjustSize();
+                }
+            }
+        }
+
+        protected Size CalcSize
+        {
+            get { return (_RatingItem.CalcSize); } 
+        }
+            
+        protected override void SetBoundsCore(int x, int y, int width, int height, BoundsSpecified specified)
+        {
+            if (this.AutoSize)
+            {
+                Size preferredSize = base.PreferredSize;
+                width = preferredSize.Width;
+                height = preferredSize.Height;
+            }
+            base.SetBoundsCore(x, y, width, height, specified);
+        }
+
+        private void AdjustSize()
+        {
+            if (this.AutoSize)
+            {
+                this.Size = base.PreferredSize;
+            }
+        }
+
+        protected override void OnVisualPropertyChanged()
+        {
+            base.OnVisualPropertyChanged();
+            this.AdjustSize();
+        }
+
+        protected override void OnTextChanged(EventArgs e)
+        {
+            base.OnTextChanged(e);
+            this.AdjustSize();
+        }
+
+        protected override void OnHandleCreated(EventArgs e)
+        {
+            base.OnHandleCreated(e);
+            if (this.AutoSize)
+                this.AdjustSize();
+        }
+#endif
+        #endregion
+
+        #region ICommandSource Members
+        protected virtual void ExecuteCommand()
+        {
+            if (_Command == null) return;
+            CommandManager.ExecuteCommand(this);
+        }
+
+        /// <summary>
+        /// Gets or sets the command assigned to the item. Default value is null.
+        /// <remarks>Note that if this property is set to null Enabled property will be set to false automatically to disable the item.</remarks>
+        /// </summary>
+        [DefaultValue(null), Category("Commands"), Description("Indicates the command assigned to the item.")]
+        public Command Command
+        {
+            get { return (Command)((ICommandSource)this).Command; }
+            set
+            {
+                ((ICommandSource)this).Command = value;
+            }
+        }
+
+        private ICommand _Command = null;
+        //[Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        ICommand ICommandSource.Command
+        {
+            get
+            {
+                return _Command;
+            }
+            set
+            {
+                bool changed = false;
+                if (_Command != value)
+                    changed = true;
+
+                if (_Command != null)
+                    CommandManager.UnRegisterCommandSource(this, _Command);
+                _Command = value;
+                if (value != null)
+                    CommandManager.RegisterCommand(this, value);
+                if (changed)
+                    OnCommandChanged();
+            }
+        }
+
+        /// <summary>
+        /// Called when Command property value changes.
+        /// </summary>
+        protected virtual void OnCommandChanged()
+        {
+        }
+
+        private object _CommandParameter = null;
+        /// <summary>
+        /// Gets or sets user defined data value that can be passed to the command when it is executed.
+        /// </summary>
+        [Browsable(true), DefaultValue(null), Category("Commands"), Description("Indicates user defined data value that can be passed to the command when it is executed."), System.ComponentModel.TypeConverter(typeof(System.ComponentModel.StringConverter)), System.ComponentModel.Localizable(true)]
+        public object CommandParameter
+        {
+            get
+            {
+                return _CommandParameter;
+            }
+            set
+            {
+                _CommandParameter = value;
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/RatingStar.ico b/PROMS/DotNetBar Source Code/Controls/RatingStar.ico
new file mode 100644
index 00000000..67b9f137
Binary files /dev/null and b/PROMS/DotNetBar Source Code/Controls/RatingStar.ico differ
diff --git a/PROMS/DotNetBar Source Code/Controls/ReflectionImage.cs b/PROMS/DotNetBar Source Code/Controls/ReflectionImage.cs
new file mode 100644
index 00000000..6fa8bf96
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/ReflectionImage.cs	
@@ -0,0 +1,261 @@
+using System;
+using System.Text;
+using System.Windows.Forms;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    /// <summary>
+    /// Represents an image control with built-in reflection.
+    /// </summary>
+    [ToolboxBitmap(typeof(ReflectionImage), "Controls.ReflectionImage.ico"), ToolboxItem(true), Designer("DevComponents.DotNetBar.Design.ReflectionImageDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+    public class ReflectionImage : ControlWithBackgroundStyle
+    {
+        #region Private Variables
+        private Bitmap _ReflectionBitmap = null;
+        private Bitmap _DisabledBitmap = null;
+        #endregion
+
+        #region Events
+        /// <summary>
+        /// Initializes a new instance of the ReflectionImage class.
+        /// </summary>
+        public ReflectionImage()
+        {
+        }
+        #endregion
+
+        #region Constructor
+        #endregion
+
+        #region Internal Implementation
+        protected override void Dispose(bool disposing)
+        {
+            DisposeReflectionImage();
+            DisposeDisabledImage();
+            if (BarUtilities.DisposeItemImages && !this.DesignMode)
+            {
+                BarUtilities.DisposeImage(ref _Image);
+            }
+            base.Dispose(disposing);
+        }
+        private Image _Image = null;
+        /// <summary>
+        /// Gets or sets the image displayed on the control.
+        /// </summary>
+        [DefaultValue(null), Description("Indicates image displayed on the control."), Category("Appearance")]
+        public Image Image
+        {
+            get { return _Image; }
+            set
+            {
+                if (_Image != value)
+                {
+                    _Image = value;
+                    OnImageChanged();
+                }
+            }
+        }
+
+        private void OnImageChanged()
+        {
+            DisposeDisabledImage();
+            CreateReflectionImage();
+        }
+
+        private void CreateReflectionImage()
+        {
+            DisposeReflectionImage();
+            Image image = GetImage();
+            if (image != null)
+            {
+                _ReflectionBitmap = ImageHelper.CreateReflectionImage(image);
+            }
+            this.Invalidate();
+        }
+
+        private Image GetImage()
+        {
+            if (this.Enabled) return _Image;
+            if (_DisabledBitmap == null)
+            {
+                _DisabledBitmap = ImageHelper.CreateGrayScaleImage(_Image);
+            }
+            return _DisabledBitmap;
+        }
+
+        private void DisposeReflectionImage()
+        {
+            if (_ReflectionBitmap != null)
+            {
+                _ReflectionBitmap.Dispose();
+                _ReflectionBitmap = null;
+            }
+        }
+
+        private void DisposeDisabledImage()
+        {
+            if (_DisabledBitmap != null)
+            {
+                _DisabledBitmap.Dispose();
+                _DisabledBitmap = null;
+            }
+        }
+
+        protected override void PaintContent(PaintEventArgs e)
+        {
+            Image image = GetImage();
+            if (image == null) return;
+
+            Graphics g = e.Graphics;
+            SmoothingMode sm = g.SmoothingMode;
+            if (AntiAlias)
+                g.SmoothingMode = SmoothingMode.HighQuality;
+
+            bool disposeStyle = false;
+            ElementStyle style = this.GetBackgroundStyle(out disposeStyle);
+
+            Rectangle r = GetContentRectangle();
+            Point imageLocation = r.Location;
+
+            if (style.TextAlignment == eStyleTextAlignment.Center && r.Width > image.Width)
+                imageLocation.X += (r.Width - image.Width) / 2;
+            else if (style.TextAlignment == eStyleTextAlignment.Far && r.Width > image.Width)
+                imageLocation.X += (r.Width - image.Width);
+            float reflectionFactor = .52f;
+            if (style.TextLineAlignment == eStyleTextAlignment.Center && r.Height > (image.Height + image.Height * reflectionFactor))
+                imageLocation.Y += (int)((r.Height - (image.Height + image.Height * reflectionFactor)) / 2);
+            else if (style.TextLineAlignment == eStyleTextAlignment.Far && r.Height > (image.Height + image.Height * reflectionFactor))
+                imageLocation.Y += (int)(r.Height - (image.Height + image.Height * reflectionFactor));
+
+            g.DrawImage(image, imageLocation.X, imageLocation.Y, image.Width, image.Height);
+
+            if (_ReflectionBitmap != null && _ReflectionEnabled)
+            {
+                imageLocation.Y += image.Height;
+                g.DrawImage(_ReflectionBitmap, imageLocation);
+            }
+
+            if (disposeStyle) style.Dispose();
+
+            if (AntiAlias)
+                g.SmoothingMode = sm;
+        }
+
+        protected override Size DefaultSize
+        {
+            get
+            {
+                return new Size(128, 128);
+            }
+        }
+
+        private bool _ReflectionEnabled = true;
+        /// <summary>
+        /// Gets or sets whether reflection effect is enabled. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Description("Indicates whether reflection effect is enabled.")]
+        public bool ReflectionEnabled
+        {
+            get { return _ReflectionEnabled; }
+            set
+            {
+                if (_ReflectionEnabled != value)
+                {
+                    _ReflectionEnabled = value;
+                    this.Invalidate();
+                }
+            }
+        }
+
+        protected override void OnEnabledChanged(EventArgs e)
+        {
+            CreateReflectionImage();
+            base.OnEnabledChanged(e);
+        }
+        #endregion
+
+        #region Property Hiding
+        [Browsable(false)]
+        public override Image BackgroundImage
+        {
+            get
+            {
+                return base.BackgroundImage;
+            }
+            set
+            {
+                base.BackgroundImage = value;
+            }
+        }
+
+        [Browsable(false)]
+        public override Font Font
+        {
+            get
+            {
+                return base.Font;
+            }
+            set
+            {
+                base.Font = value;
+            }
+        }
+        [Browsable(false)]
+        public override Color ForeColor
+        {
+            get
+            {
+                return base.ForeColor;
+            }
+            set
+            {
+                base.ForeColor = value;
+            }
+        }
+
+#if FRAMEWORK20
+		[Browsable(false)]
+        public override ImageLayout BackgroundImageLayout
+        {
+            get
+            {
+                return base.BackgroundImageLayout;
+            }
+            set
+            {
+                base.BackgroundImageLayout = value;
+            }
+        }
+
+        [Browsable(false)]
+        public new System.Windows.Forms.Padding Padding
+        {
+            get
+            {
+                return base.Padding;
+            }
+            set
+            {
+                base.Padding = value;
+            }
+        }
+#endif
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override string Text
+        {
+            get
+            {
+                return base.Text;
+            }
+            set
+            {
+                base.Text = value;
+            }
+        }
+        #endregion
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/ReflectionImage.ico b/PROMS/DotNetBar Source Code/Controls/ReflectionImage.ico
new file mode 100644
index 00000000..4a3e0846
Binary files /dev/null and b/PROMS/DotNetBar Source Code/Controls/ReflectionImage.ico differ
diff --git a/PROMS/DotNetBar Source Code/Controls/ReflectionLabel.cs b/PROMS/DotNetBar Source Code/Controls/ReflectionLabel.cs
new file mode 100644
index 00000000..7cf3ab93
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/ReflectionLabel.cs	
@@ -0,0 +1,430 @@
+using System;
+using System.Text;
+using System.Windows.Forms;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Drawing.Imaging;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    /// <summary>
+    /// Represents an single line of text label control with text-markup support and built-in reflection.
+    /// </summary>
+    [ToolboxItem(true), Designer("DevComponents.DotNetBar.Design.ReflectionLabelDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf"), ToolboxBitmap(typeof(LabelX), "Controls.ReflectionLabel.ico")]
+    public class ReflectionLabel : ControlWithBackgroundStyle
+    {
+        #region Private Variables
+        private TextMarkup.BodyElement _TextMarkup = null;
+        private Bitmap _ReflectionBitmap = null;
+        private float _ReflectionFactor = .52f;
+        private Size _TextSize = Size.Empty;
+        #endregion
+
+        #region Events
+        /// <summary>
+        /// Occurs when text markup link is clicked. Markup links can be created using "a" tag, for example:
+        /// <a name="MyLink">Markup link</a>
+        /// </summary>
+        public event MarkupLinkClickEventHandler MarkupLinkClick;
+        #endregion
+
+        #region Constructor
+        #endregion
+
+        #region Internal Implementation
+        protected override void Dispose(bool disposing)
+        {
+            DisposeReflectionImage();
+            base.Dispose(disposing);
+        }
+
+        protected override void PaintContent(PaintEventArgs e)
+        {
+            Graphics g = e.Graphics;
+            SmoothingMode sm = g.SmoothingMode;
+            if (AntiAlias)
+            {
+                g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.AntiAlias;
+                g.TextRenderingHint = DisplayHelp.AntiAliasTextRenderingHint;
+            }
+
+            Rectangle r = GetContentRectangle();
+            Point reflectionLocation = r.Location;
+            bool disposeStyle = false;
+            ElementStyle style = this.GetBackgroundStyle(out disposeStyle);
+
+            if (_TextMarkup != null)
+            {
+                TextMarkup.MarkupDrawContext d = new TextMarkup.MarkupDrawContext(g, this.Font, (style.TextColor.IsEmpty?this.ForeColor:style.TextColor), 
+                    (this.RightToLeft == RightToLeft.Yes), Rectangle.Empty, true);
+                if (!this.Enabled)
+                {
+                    d.IgnoreFormattingColors = true;
+                    d.CurrentForeColor = SystemColors.ControlDark;
+                }
+                _TextMarkup.Render(d);
+                reflectionLocation.Y = _TextMarkup.Bounds.Bottom;
+                reflectionLocation.X = 0;
+            }
+            else
+            {
+                int totalHeight = (int)(_TextSize.Height * (1 + _ReflectionFactor));
+                int y = r.Y, x = r.X;
+                if (style.TextLineAlignment == eStyleTextAlignment.Center)
+                {
+                    y += (r.Height - totalHeight) / 2;
+                }
+                else if (style.TextLineAlignment == eStyleTextAlignment.Far)
+                {
+                    y += (r.Height - totalHeight);
+                }
+                TextDrawing.DrawString(g, this.Text, this.Font, (style.TextColor.IsEmpty ? this.ForeColor : style.TextColor), new Rectangle(x, y, r.Width, r.Height), GetTextFormat(style));
+                reflectionLocation.Y = y + _TextSize.Height;
+            }
+
+            Rectangle rClip = new Rectangle(0, reflectionLocation.Y, this.Width, this.Height - reflectionLocation.Y);
+            g.SetClip(rClip, CombineMode.Replace);
+
+            int fontBaseOffset = (int)Math.Floor(Font.Size * Font.FontFamily.GetCellDescent(Font.Style) / Font.FontFamily.GetEmHeight(Font.Style));
+            reflectionLocation.Y -= fontBaseOffset;
+
+            if (_ReflectionBitmap != null && _ReflectionEnabled)
+            {
+                g.DrawImage(_ReflectionBitmap, reflectionLocation);
+            }
+            g.ResetClip();
+            if (disposeStyle) style.Dispose();
+            if (AntiAlias)
+                g.SmoothingMode = sm;
+        }
+
+        protected override void OnTextChanged(EventArgs e)
+        {
+            UpdateDisplay();
+            base.OnTextChanged(e);
+        }
+
+        protected override void OnFontChanged(EventArgs e)
+        {
+            UpdateDisplay();
+            base.OnFontChanged(e);
+        }
+
+        protected override void OnForeColorChanged(EventArgs e)
+        {
+            UpdateDisplay();
+            base.OnForeColorChanged(e);
+        }
+
+        protected override void OnVisualPropertyChanged()
+        {
+            UpdateDisplay();
+            base.OnVisualPropertyChanged();
+        }
+
+        protected override void OnResize(EventArgs e)
+        {
+            UpdateDisplay();
+            base.OnResize(e);
+        }
+
+        private void UpdateDisplay()
+        {
+            string text = this.Text;
+
+            if (_TextMarkup != null)
+            {
+                _TextMarkup.MouseLeave(this);
+                _TextMarkup.HyperLinkClick -= new EventHandler(TextMarkupLinkClicked);
+                _TextMarkup = null;
+            }
+
+            if (TextMarkup.MarkupParser.IsMarkup(ref text))
+                _TextMarkup = TextMarkup.MarkupParser.Parse(text);
+
+            if (_TextMarkup != null)
+            {
+                _TextMarkup.HyperLinkClick += new EventHandler(TextMarkupLinkClicked);
+            }
+
+            CreateReflection();
+            this.Invalidate();
+        }
+
+        private void CreateReflection()
+        {
+            DisposeReflectionImage();
+            if (Text.Length == 0 || this.Width <= 0 || this.Height <= 0 || this.Font == null) return;
+
+            // Create image based on the control content
+            Bitmap bmp = null;
+            if (_TextMarkup == null)
+            {
+                using(Graphics g = this.CreateGraphics())
+                {
+                    if (AntiAlias)
+                    {
+                        g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.AntiAlias;
+                        g.TextRenderingHint = DisplayHelp.AntiAliasTextRenderingHint;
+                    }
+                    Size s = TextDrawing.MeasureString(g, this.Text, this.Font);
+                    bmp = new Bitmap(this.Width, s.Height, PixelFormat.Format32bppArgb);
+                    _TextSize = s;
+                }
+                bmp.MakeTransparent();
+
+                Color transparentColor = Color.Empty;
+                using (Graphics g = Graphics.FromImage(bmp))
+                {
+                    bool disposeStyle = false;
+                    ElementStyle style = this.GetBackgroundStyle(out disposeStyle);
+                    
+                    if (AntiAlias)
+                    {
+                        g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.AntiAlias;
+                        g.TextRenderingHint = DisplayHelp.AntiAliasTextRenderingHint;
+                        transparentColor = style.BackColor.IsEmpty ? this.BackColor : style.BackColor;
+                        if (transparentColor.IsEmpty || transparentColor == Color.Transparent) transparentColor = Color.WhiteSmoke;
+                        DisplayHelp.FillRectangle(g, new Rectangle(0, 0, bmp.Width, bmp.Height), transparentColor);
+                    }
+
+                    TextDrawing.DrawString(g, this.Text, this.Font, (style.TextColor.IsEmpty ? this.ForeColor : style.TextColor),
+                        new Rectangle(0, 0, bmp.Width, bmp.Height), GetTextFormat(style));
+
+                    if (disposeStyle) style.Dispose();
+                }
+                if (!transparentColor.IsEmpty)
+                    bmp.MakeTransparent(transparentColor);
+            }
+            else
+            {
+                ResizeMarkup();
+                if (_TextMarkup.Bounds.Height > 0)
+                {
+                    bmp = new Bitmap(this.Width, _TextMarkup.Bounds.Height, PixelFormat.Format32bppArgb);
+                    Color transparentColor = Color.Empty;
+                    using (Graphics g = Graphics.FromImage(bmp))
+                    {
+                        bool disposeStyle = false;
+                        ElementStyle style = this.GetBackgroundStyle(out disposeStyle);
+
+                        if (AntiAlias)
+                        {
+                            g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.AntiAlias;
+                            g.TextRenderingHint = DisplayHelp.AntiAliasTextRenderingHint;
+                            transparentColor = style.BackColor.IsEmpty ? this.BackColor : style.BackColor;
+                            if (transparentColor.IsEmpty || transparentColor == Color.Transparent) transparentColor = Color.WhiteSmoke;
+                            DisplayHelp.FillRectangle(g, new Rectangle(0, 0, bmp.Width, bmp.Height), transparentColor);
+                        }
+                        if (_TextMarkup.Bounds.Top > 0)
+                            g.TranslateTransform(0, -(_TextMarkup.Bounds.Top - GetContentRectangle().Y));
+                        TextMarkup.MarkupDrawContext d = new TextMarkup.MarkupDrawContext(g, this.Font, (style.TextColor.IsEmpty ? this.ForeColor : style.TextColor),
+                        (this.RightToLeft == RightToLeft.Yes), Rectangle.Empty, true);
+                        if (!this.Enabled)
+                        {
+                            d.IgnoreFormattingColors = true;
+                            d.CurrentForeColor = SystemColors.ControlDark;
+                        }
+                        _TextMarkup.Render(d);
+
+                        if (disposeStyle) style.Dispose();
+                    }
+                    if (!transparentColor.IsEmpty)
+                        bmp.MakeTransparent(transparentColor);
+                }
+            }
+
+            if (bmp != null)
+            {
+                _ReflectionBitmap = ImageHelper.CreateReflectionImage(bmp);
+                bmp.Dispose();
+            }
+        }
+
+        private eTextFormat GetTextFormat(ElementStyle style)
+        {
+            if (style.TextAlignment == eStyleTextAlignment.Center)
+                return eTextFormat.HorizontalCenter;
+            else if (style.TextAlignment == eStyleTextAlignment.Far)
+                return eTextFormat.Right;
+            return eTextFormat.Default;
+        }
+
+        private void DisposeReflectionImage()
+        {
+            if (_ReflectionBitmap != null)
+            {
+                _ReflectionBitmap.Dispose();
+                _ReflectionBitmap = null;
+            }
+        }
+
+        private void TextMarkupLinkClicked(object sender, EventArgs e)
+        {
+            TextMarkup.HyperLink link = sender as TextMarkup.HyperLink;
+            if (link != null)
+            {
+                OnMarkupLinkClick(new MarkupLinkClickEventArgs(link.Name, link.HRef));
+            }
+        }
+
+        protected virtual void OnMarkupLinkClick(MarkupLinkClickEventArgs e)
+        {
+            if (this.MarkupLinkClick != null)
+                MarkupLinkClick(this, e);
+        }
+
+        protected virtual void ResizeMarkup()
+        {
+            if (_TextMarkup != null)
+            {
+                Rectangle r = this.GetContentRectangle();
+                if (r.Width <= 0 || r.Height <= 0)
+                    return;
+
+                Graphics g = this.CreateGraphics();
+                try
+                {
+                    if (AntiAlias)
+                    {
+                        g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.AntiAlias;
+                        g.TextRenderingHint = DisplayHelp.AntiAliasTextRenderingHint;
+                    }
+                    TextMarkup.MarkupDrawContext d = new TextMarkup.MarkupDrawContext(g, this.Font, SystemColors.Control, (this.RightToLeft == RightToLeft.Yes));
+                    Size measureSize = new Size(10000, r.Height);
+                    _TextMarkup.Measure(measureSize, d);
+                    bool disposeStyle = false;
+                    ElementStyle style = this.GetBackgroundStyle(out disposeStyle);
+
+                    int totalHeight = (int)(_TextMarkup.Bounds.Height * (1 + _ReflectionFactor));
+                    if (totalHeight < r.Height)
+                    {
+                        if (style.TextLineAlignment == eStyleTextAlignment.Center)
+                        {
+                            r.Y += (r.Height - totalHeight) / 2;
+                            r.Height = _TextMarkup.Bounds.Height;
+                        }
+                        else if (style.TextLineAlignment == eStyleTextAlignment.Far)
+                        {
+                            r.Y = (r.Bottom - totalHeight);
+                            r.Height = _TextMarkup.Bounds.Height;
+                        }
+                    }
+
+                    if (_TextMarkup.Bounds.Width < r.Width)
+                    {
+                        if (style.TextAlignment == eStyleTextAlignment.Center)
+                        {
+                            r.X += (r.Width - _TextMarkup.Bounds.Width) / 2;
+                            r.Width = _TextMarkup.Bounds.Width;
+                        }
+                        else if (style.TextAlignment == eStyleTextAlignment.Far && this.RightToLeft == RightToLeft.No ||
+                            style.TextAlignment == eStyleTextAlignment.Near && this.RightToLeft == RightToLeft.Yes)
+                        {
+                            r.X = (r.Right - _TextMarkup.Bounds.Width);
+                            r.Width = _TextMarkup.Bounds.Width;
+                        }
+                    }
+
+                    _TextMarkup.Arrange(r, d);
+
+                    if (disposeStyle) style.Dispose();
+                }
+                finally
+                {
+                    g.Dispose();
+                }
+            }
+        }
+
+        protected override void OnEnabledChanged(EventArgs e)
+        {
+            CreateReflection();
+            this.Invalidate();
+            base.OnEnabledChanged(e);
+        }
+
+        protected override Size DefaultSize
+        {
+            get
+            {
+                return new Size(175, 70);
+            }
+        }
+
+        private bool _ReflectionEnabled = true;
+        /// <summary>
+        /// Gets or sets whether reflection effect is enabled. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Description("Indicates whether reflection effect is enabled.")]
+        public bool ReflectionEnabled
+        {
+            get { return _ReflectionEnabled; }
+            set
+            {
+                if (_ReflectionEnabled != value)
+                {
+                    _ReflectionEnabled = value;
+                    this.Invalidate();
+                }
+            }
+        }
+        #endregion
+
+        #region Property hiding
+        [Browsable(false)]
+        public override Image BackgroundImage
+        {
+            get
+            {
+                return base.BackgroundImage;
+            }
+            set
+            {
+                base.BackgroundImage = value;
+            }
+        }
+
+#if FRAMEWORK20
+		[Browsable(false)]
+        public override ImageLayout BackgroundImageLayout
+        {
+            get
+            {
+                return base.BackgroundImageLayout;
+            }
+            set
+            {
+                base.BackgroundImageLayout = value;
+            }
+        }
+
+        [Browsable(false)]
+        public new System.Windows.Forms.Padding Padding
+        {
+            get
+            {
+                return base.Padding;
+            }
+            set
+            {
+                base.Padding = value;
+            }
+        }
+#endif
+        [Browsable(true), DefaultValue(""), Editor("DevComponents.DotNetBar.Design.TextMarkupUIEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), EditorBrowsable(EditorBrowsableState.Always), Category("Appearance"), Description("Gets or sets the text displayed on label.")]
+        public override string Text
+        {
+            get
+            {
+                return base.Text;
+            }
+            set
+            {
+                base.Text = value;
+            }
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/ReflectionLabel.ico b/PROMS/DotNetBar Source Code/Controls/ReflectionLabel.ico
new file mode 100644
index 00000000..9cc5d274
Binary files /dev/null and b/PROMS/DotNetBar Source Code/Controls/ReflectionLabel.ico differ
diff --git a/PROMS/DotNetBar Source Code/Controls/RichTextBoxEx.cs b/PROMS/DotNetBar Source Code/Controls/RichTextBoxEx.cs
new file mode 100644
index 00000000..0a782e17
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/RichTextBoxEx.cs	
@@ -0,0 +1,1270 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel;
+using System.Windows.Forms;
+using System.Drawing;
+using System.IO;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    [ToolboxItem(true), Docking(DockingBehavior.Ask)]
+    [Description("Provides rich-text, RTF text editing."), ToolboxBitmap(typeof(RichTextBoxEx), "Controls.RichTextBoxEx.ico"), DefaultEvent("TextChanged"), DefaultProperty("Text")]
+    [DefaultBindingProperty("Text")]
+    [Designer("DevComponents.DotNetBar.Design.RichTextBoxExDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+    public class RichTextBoxEx : ScrollbarControl
+    {
+        #region Constructor
+        /// <summary>
+        /// Initializes a new instance of the RichTextBoxEx class.
+        /// </summary>
+        public RichTextBoxEx()
+        {
+            RichTextBoxScrollEx rtb = new RichTextBoxScrollEx();
+            this.SetStyle(ControlStyles.Selectable, false);
+            rtb.AcceptsTabChanged += OnRichTextBoxAcceptsTabChanged;
+            rtb.TextChanged += OnRichTextBoxTextChanged;
+            rtb.HideSelectionChanged += OnRichTextBoxHideSelectionChanged;
+            rtb.ModifiedChanged += OnRichTextBoxModifiedChanged;
+            rtb.MultilineChanged += OnRichTextBoxMultilineChanged;
+            rtb.ReadOnlyChanged += OnRichTextBoxReadOnlyChanged;
+            rtb.GotFocus += OnRichTextBoxGotFocus;
+            rtb.LostFocus += OnRichTextBoxLostFocus;
+            rtb.KeyDown += OnRichTextBoxKeyDown;
+            rtb.KeyUp += OnRichTextBoxKeyUp;
+            rtb.KeyPress += OnRichTextBoxKeyPress;
+            rtb.PreviewKeyDown += OnRichTextBoxPreviewKeyDown;
+            rtb.LinkClicked += OnRichTextBoxLinkClicked;
+            rtb.Protected += OnRichTextBoxProtected;
+            rtb.SelectionChanged += OnRichTextBoxSelectionChanged;
+            rtb.HScroll += OnRichTextBoxHScroll;
+            rtb.VScroll += OnRichTextBoxVScroll;
+            rtb.Validating += OnRichTextBoxValidating;
+            rtb.Validated += OnRichTextBoxValidated;
+            RichTextBox = rtb;
+            rtb.BorderStyle = System.Windows.Forms.BorderStyle.None;
+            this.ScrollOverrideControl = rtb;
+        }
+        #endregion
+
+        #region Internals
+
+        private RichTextBox _RichTextBox;
+        /// <summary>
+        /// Gets the reference to internal RichTextBox control.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public RichTextBox RichTextBox
+        {
+            get { return _RichTextBox; }
+            internal set { _RichTextBox = value; }
+        }
+        private void OnRichTextBoxAcceptsTabChanged(object sender, EventArgs e)
+        {
+            this.OnAcceptsTabChanged(e);
+        }
+        /// <summary>
+        /// Occurs when the value of the AcceptsTab property changes
+        /// </summary>
+        [Description("Occurs when the value of the AcceptsTab property changes.")]
+        public event EventHandler AcceptsTabChanged;
+        /// <summary>
+        /// Raises AcceptsTabChanged event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnAcceptsTabChanged(EventArgs e)
+        {
+            EventHandler handler = AcceptsTabChanged;
+            if (handler != null)
+                handler(this, e);
+        }
+        private void OnRichTextBoxTextChanged(object sender, EventArgs e)
+        {
+            this.OnTextChanged(e);
+        }
+        private void OnRichTextBoxHideSelectionChanged(object sender, EventArgs e)
+        {
+            this.OnHideSelectionChanged(e);
+        }
+        /// <summary>
+        /// Occurs when the value of the HideSelection property changes.
+        /// </summary>
+        [Description("Occurs when the value of the HideSelection property changes.")]
+        public event EventHandler HideSelectionChanged;
+        /// <summary>
+        /// Raises HideSelectionChanged event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnHideSelectionChanged(EventArgs e)
+        {
+            EventHandler handler = HideSelectionChanged;
+            if (handler != null)
+                handler(this, e);
+        }
+        private void OnRichTextBoxModifiedChanged(object sender, EventArgs e)
+        {
+            this.OnModifiedChanged(e);
+        }
+        /// <summary>
+        /// Occurs when the value of the Modified property changes.
+        /// </summary>
+        [Description("Occurs when the value of the Modified property changes.")]
+        public event EventHandler ModifiedChanged;
+        /// <summary>
+        /// Raises ModifiedChanged event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnModifiedChanged(EventArgs e)
+        {
+            EventHandler handler = ModifiedChanged;
+            if (handler != null)
+                handler(this, e);
+        }
+        private void OnRichTextBoxMultilineChanged(object sender, EventArgs e)
+        {
+            this.OnMultilineChanged(e);
+        }
+        /// <summary>
+        /// Occurs when the value of the Multiline property changes.
+        /// </summary>
+        [Description("Occurs when the value of the Multiline property changes.")]
+        public event EventHandler MultilineChanged;
+        /// <summary>
+        /// Raises MultilineChanged event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnMultilineChanged(EventArgs e)
+        {
+            EventHandler handler = MultilineChanged;
+            if (handler != null)
+                handler(this, e);
+        }
+        private void OnRichTextBoxReadOnlyChanged(object sender, EventArgs e)
+        {
+            this.OnReadOnlyChanged(e);
+        }
+        /// <summary>
+        /// Occurs when the value of the ReadOnly property changes.
+        /// </summary>
+        [Description("Occurs when the value of the ReadOnly property changes.")]
+        public event EventHandler ReadOnlyChanged;
+        /// <summary>
+        /// Raises ReadOnlyChanged event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnReadOnlyChanged(EventArgs e)
+        {
+            EventHandler handler = ReadOnlyChanged;
+            if (handler != null)
+                handler(this, e);
+        }
+        private void OnRichTextBoxGotFocus(object sender, EventArgs e)
+        {
+            this.OnGotFocus(e);
+        }
+        private void OnRichTextBoxLostFocus(object sender, EventArgs e)
+        {
+            this.OnLostFocus(e);
+        }
+        private void OnRichTextBoxKeyDown(object sender, KeyEventArgs e)
+        {
+            this.OnKeyDown(e);
+        }
+        private void OnRichTextBoxKeyUp(object sender, KeyEventArgs e)
+        {
+            this.OnKeyUp(e);
+        }
+        private void OnRichTextBoxKeyPress(object sender, KeyPressEventArgs e)
+        {
+            this.OnKeyPress(e);
+        }
+        private void OnRichTextBoxPreviewKeyDown(object sender, PreviewKeyDownEventArgs e)
+        {
+            this.OnPreviewKeyDown(e);
+        }
+        private void OnRichTextBoxLinkClicked(object sender, LinkClickedEventArgs e)
+        {
+            this.OnLinkClicked(e);
+        }
+        /// <summary>
+        /// Occurs when a hyperlink in the text is clicked.
+        /// </summary>
+        [Description("Occurs when a hyperlink in the text is clicked."), Category("Behavior")]
+        public event LinkClickedEventHandler LinkClicked;
+        /// <summary>
+        /// Raises LinkClicked event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnLinkClicked(LinkClickedEventArgs e)
+        {
+            LinkClickedEventHandler handler = LinkClicked;
+            if (handler != null)
+                handler(this, e);
+        }
+        private void OnRichTextBoxProtected(object sender, EventArgs e)
+        {
+            this.OnProtected(e);
+        }
+        /// <summary>
+        /// Occurs when the user takes an action that would change a protected range of text.
+        /// </summary>
+        [Category("Behavior"), Description("Occurs when the user takes an action that would change a protected range of text.")]
+        public event EventHandler Protected;
+        /// <summary>
+        /// Raises Protected event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnProtected(EventArgs e)
+        {
+            EventHandler handler = Protected;
+            if (handler != null)
+                handler(this, e);
+        }
+        private void OnRichTextBoxSelectionChanged(object sender, EventArgs e)
+        {
+            this.OnSelectionChanged(e);
+        }
+        /// <summary>
+        /// Occurs when the current selection has changed.
+        /// </summary>
+        [Category("Behavior"), Description("Occurs when the current selection has changed.")]
+        public event EventHandler SelectionChanged;
+        /// <summary>
+        /// Raises SelectionChanged event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnSelectionChanged(EventArgs e)
+        {
+            EventHandler handler = SelectionChanged;
+            if (handler != null)
+                handler(this, e);
+        }
+        private void OnRichTextBoxHScroll(object sender, EventArgs e)
+        {
+            this.OnHScroll(e);
+        }
+        /// <summary>
+        /// Occurs when the horizontal scroll bar is clicked.
+        /// </summary>
+        [Description("Occurs when the horizontal scroll bar is clicked."), Category("Behavior")]
+        public event EventHandler HScroll;
+        /// <summary>
+        /// Raises HScroll event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnHScroll(EventArgs e)
+        {
+            EventHandler handler = HScroll;
+            if (handler != null)
+                handler(this, e);
+        }
+        private void OnRichTextBoxVScroll(object sender, EventArgs e)
+        {
+            this.OnVScroll(e);
+        }
+        /// <summary>
+        /// Occurs when the vertical scroll bar is clicked.
+        /// </summary>
+        [Description("Occurs when the vertical scroll bar is clicked."), Category("Behavior")]
+        public event EventHandler VScroll;
+        /// <summary>
+        /// Raises HScroll event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnVScroll(EventArgs e)
+        {
+            EventHandler handler = VScroll;
+            if (handler != null)
+                handler(this, e);
+        }
+        private void OnRichTextBoxValidating(object sender, CancelEventArgs e)
+        {
+            this.OnValidating(e);
+        }
+        private void OnRichTextBoxValidated(object sender, EventArgs e)
+        {
+            this.OnValidated(e);
+        }
+
+        /// <summary>
+        /// Gets or sets whether anti-alias smoothing is used while painting. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance"), Description("Gets or sets whether anti-aliasing is used while painting."), Browsable(false)]
+        public override bool AntiAlias
+        {
+            get { return base.AntiAlias; }
+            set { base.AntiAlias = value; }
+        }
+
+        protected override void OnForeColorChanged(EventArgs e)
+        {
+            _RichTextBox.ForeColor = this.ForeColor;
+            base.OnForeColorChanged(e);
+        }
+
+        //protected override void OnBackColorChanged(EventArgs e)
+        //{
+        //    _RichTextBox.BackColor = this.BackColor;
+        //    base.OnBackColorChanged(e);
+        //}
+
+        private Color _BackColorRichTextBox = SystemColors.Window;
+        /// <summary>
+        /// Gets or sets the back color of the RichTextBox.
+        /// </summary>
+        [Category("Columns"), Description("Indicates back color of RichTextBox.")]
+        public Color BackColorRichTextBox
+        {
+            get { return _BackColorRichTextBox; }
+            set { _BackColorRichTextBox = value; _RichTextBox.BackColor = value; }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeBackColorRichTextBox()
+        {
+            return !_BackColorRichTextBox.Equals(SystemColors.Window);
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetBackColorRichTextBox()
+        {
+            this.BackColorRichTextBox = SystemColors.Window;
+        }
+        #endregion
+
+        #region RichTextBox Forwarding
+        private BorderStyle _BorderStyle;
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public BorderStyle BorderStyle
+        {
+            get { return _BorderStyle; }
+            set { _BorderStyle = value; }
+        }
+        /// <summary>
+        /// Appends text to the current text of a text box
+        /// </summary>
+        public void AppendText(string text)
+        {
+            _RichTextBox.AppendText(text);
+            UpdateScrollBarsDelayed();
+        }
+        /// <summary>
+        /// Determines whether you can paste information from the Clipboard in the specified data format.
+        /// </summary>
+        /// <param name="clipFormat"></param>
+        /// <returns></returns>
+        public bool CanPaste(DataFormats.Format clipFormat)
+        {
+            return _RichTextBox.CanPaste(clipFormat);
+        }
+        /// <summary>
+        /// Clears all text from the text box control.
+        /// </summary>
+        public void Clear()
+        {
+            _RichTextBox.Clear();
+            UpdateScrollBarsDelayed();
+        }
+        /// <summary>
+        /// Clears information about the most recent operation from the undo buffer of the text box.
+        /// </summary>
+        public void ClearUndo()
+        {
+            _RichTextBox.ClearUndo();
+            UpdateScrollBarsDelayed();
+        }
+        /// <summary>
+        /// Copies the current selection in the text box to the Clipboard.
+        /// </summary>
+        public void Copy()
+        {
+            _RichTextBox.Copy();
+        }
+        /// <summary>
+        /// Moves the current selection in the text box to the Clipboard.
+        /// </summary>
+        public void Cut()
+        {
+            _RichTextBox.Cut();
+            UpdateScrollBarsDelayed();
+        }
+        /// <summary>
+        /// Specifies that the value of the SelectionLength property is zero so that no characters are selected in the control.
+        /// </summary>
+        public void DeselectAll()
+        {
+            _RichTextBox.DeselectAll();
+        }
+        /// <summary>
+        /// Searches the text in a RichTextBox control for a string.
+        /// </summary>
+        /// <param name="str"></param>
+        /// <returns></returns>
+        public int Find(string str)
+        {
+            return _RichTextBox.Find(str);
+        }
+        /// <summary>
+        /// Searches the text of a RichTextBox control for the first instance of a character from a list of characters.
+        /// </summary>
+        /// <param name="characterSet"></param>
+        /// <returns></returns>
+        public int Find(char[] characterSet)
+        {
+            return _RichTextBox.Find(characterSet);
+        }
+        /// <summary>
+        /// Searches the text in a RichTextBox control for a string with specific options applied to the search.
+        /// </summary>
+        /// <param name="str"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public int Find(string str, RichTextBoxFinds options)
+        {
+            return _RichTextBox.Find(str, options);
+        }
+        /// <summary>
+        /// Searches the text of a RichTextBox control, at a specific starting point, for the first instance of a character from a list of characters.
+        /// </summary>
+        /// <param name="characterSet"></param>
+        /// <param name="start"></param>
+        /// <returns></returns>
+        public int Find(char[] characterSet, int start)
+        {
+            return _RichTextBox.Find(characterSet, start);
+        }
+        /// <summary>
+        /// Searches the text in a RichTextBox control for a string at a specific location within the control and with specific options applied to the search. 
+        /// </summary>
+        /// <param name="str"></param>
+        /// <param name="start"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public int Find(string str, int start, RichTextBoxFinds options)
+        {
+            return _RichTextBox.Find(str, start, options);
+        }
+        /// <summary>
+        /// Searches a range of text in a RichTextBox control for the first instance of a character from a list of characters.
+        /// </summary>
+        /// <param name="characterSet"></param>
+        /// <param name="start"></param>
+        /// <param name="end"></param>
+        /// <returns></returns>
+        public int Find(char[] characterSet, int start, int end)
+        {
+            return _RichTextBox.Find(characterSet, start, end);
+        }
+        /// <summary>
+        /// Searches the text in a RichTextBox control for a string within a range of text within the control and with specific options applied to the search. 
+        /// </summary>
+        /// <param name="str"></param>
+        /// <param name="start"></param>
+        /// <param name="end"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public int Find(string str, int start, int end, RichTextBoxFinds options)
+        {
+            return _RichTextBox.Find(str, start, end, options);
+        }
+        public bool Focus()
+        {
+            return ((this.RichTextBox != null) && this.RichTextBox.Focus());
+        }
+        /// <summary>
+        /// Retrieves the character that is closest to the specified location within the control.
+        /// </summary>
+        /// <param name="pt"></param>
+        /// <returns></returns>
+        public int GetCharFromPosition(Point pt)
+        {
+            return _RichTextBox.GetCharFromPosition(pt);
+        }
+        /// <summary>
+        /// Retrieves the index of the character nearest to the specified location
+        /// </summary>
+        /// <param name="pt"></param>
+        /// <returns></returns>
+        public int GetCharIndexFromPosition(Point pt)
+        {
+            return _RichTextBox.GetCharIndexFromPosition(pt);
+        }
+        /// <summary>
+        /// Retrieves the index of the first character of a given line. (Inherited from TextBoxBase.)
+        /// </summary>
+        /// <param name="lineNumber"></param>
+        /// <returns></returns>
+        public int GetFirstCharIndexFromLine(int lineNumber)
+        {
+            return _RichTextBox.GetFirstCharIndexFromLine(lineNumber);
+        }
+        /// <summary>
+        /// Retrieves the index of the first character of the current line. (Inherited from TextBoxBase.)
+        /// </summary>
+        /// <returns></returns>
+        public int GetFirstCharIndexOfCurrentLine()
+        {
+            return _RichTextBox.GetFirstCharIndexOfCurrentLine();
+        }
+        /// <summary>
+        /// Retrieves the line number from the specified character position within the text of the RichTextBox control.
+        /// </summary>
+        /// <param name="index"></param>
+        /// <returns></returns>
+        public int GetLineFromCharIndex(int index)
+        {
+            return _RichTextBox.GetLineFromCharIndex(index);
+        }
+        /// <summary>
+        /// Retrieves the location within the control at the specified character index.
+        /// </summary>
+        /// <param name="index"></param>
+        /// <returns></returns>
+        public Point GetPositionFromCharIndex(int index)
+        {
+            return _RichTextBox.GetPositionFromCharIndex(index);
+        }
+        /// <summary>
+        /// Loads a rich text format (RTF) or standard ASCII text file into the RichTextBox control. 
+        /// </summary>
+        /// <param name="path"></param>
+        public void LoadFile(string path)
+        {
+            _RichTextBox.LoadFile(path);
+            UpdateScrollBarsDelayed();
+        }
+        /// <summary>
+        /// Loads the contents of an existing data stream into the RichTextBox control. 
+        /// </summary>
+        /// <param name="data"></param>
+        /// <param name="fileType"></param>
+        public void LoadFile(Stream data, RichTextBoxStreamType fileType)
+        {
+            _RichTextBox.LoadFile(data, fileType);
+            UpdateScrollBarsDelayed();
+        }
+        /// <summary>
+        /// Loads a specific type of file into the RichTextBox control. 
+        /// </summary>
+        /// <param name="path"></param>
+        /// <param name="fileType"></param>
+        public void LoadFile(string path, RichTextBoxStreamType fileType)
+        {
+            _RichTextBox.LoadFile(path, fileType);
+            UpdateScrollBarsDelayed();
+        }
+        /// <summary>
+        /// Replaces the current selection in the text box with the contents of the Clipboard.
+        /// </summary>
+        public void Paste()
+        {
+            _RichTextBox.Paste();
+            UpdateScrollBarsDelayed();
+        }
+        /// <summary>
+        /// Pastes the contents of the Clipboard in the specified Clipboard format. 
+        /// </summary>
+        /// <param name="clipFormat"></param>
+        public void Paste(DataFormats.Format clipFormat)
+        {
+            _RichTextBox.Paste(clipFormat);
+            UpdateScrollBarsDelayed();
+        }
+        /// <summary>
+        /// Reapplies the last operation that was undone in the control. 
+        /// </summary>
+        public void Redo()
+        {
+            _RichTextBox.Redo();
+            UpdateScrollBarsDelayed();
+        }
+        /// <summary>
+        /// Saves the contents of the RichTextBox to a rich text format (RTF) file. 
+        /// </summary>
+        /// <param name="path"></param>
+        public void SaveFile(string path)
+        {
+            _RichTextBox.SaveFile(path);
+        }
+        /// <summary>
+        /// Saves the contents of a RichTextBox control to an open data stream. 
+        /// </summary>
+        /// <param name="data"></param>
+        /// <param name="fileType"></param>
+        public void SaveFile(Stream data, RichTextBoxStreamType fileType)
+        {
+            _RichTextBox.SaveFile(data, fileType);
+        }
+        /// <summary>
+        /// Saves the contents of the RichTextBox to a specific type of file. 
+        /// </summary>
+        /// <param name="path"></param>
+        /// <param name="fileType"></param>
+        public void SaveFile(string path, RichTextBoxStreamType fileType)
+        {
+            _RichTextBox.SaveFile(path, fileType);
+        }
+        /// <summary>
+        /// Scrolls the contents of the control to the current caret position.
+        /// </summary>
+        public void ScrollToCaret()
+        {
+            _RichTextBox.ScrollToCaret();
+        }
+        /// <summary>
+        /// Activates the control. (Inherited from Control.)
+        /// </summary>
+        public void Select()
+        {
+           _RichTextBox.Select();
+        }
+        /// <summary>
+        /// Selects a range of text in the text box.
+        /// </summary>
+        /// <param name="start"></param>
+        /// <param name="length"></param>
+        public void Select(int start, int length)
+        {
+            _RichTextBox.Select(start, length);
+        }
+        /// <summary>
+        /// Selects all text in the text box.
+        /// </summary>
+        public void SelectAll()
+        {
+            _RichTextBox.SelectAll();
+        }
+        /// <summary>
+        /// Undoes the last edit operation in the text box.
+        /// </summary>
+        public void Undo()
+        {
+            _RichTextBox.Undo();
+            UpdateScrollBarsDelayed();
+        }
+
+        /// <summary>
+        /// Gets or sets whether tab characters are accepted as input
+        /// </summary>
+        [DefaultValue(false), Description("Indicates whether tab characters are accepted as input."), Category("Behavior")]
+        public bool AcceptsTab
+        {
+            get
+            {
+                return _RichTextBox.AcceptsTab;
+            }
+            set
+            {
+                _RichTextBox.AcceptsTab = value;
+            }
+        }
+        [Browsable(false)]
+        public override bool AllowDrop
+        {
+            get
+            {
+                return base.AllowDrop;
+            }
+            set
+            {
+                base.AllowDrop = value;
+            }
+        }
+        /// <summary>
+        /// Gets or sets whether automatic word selection is enabled.
+        /// </summary>
+        [Category("Behavior"), DefaultValue(false), Description("Indicates whether automatic word selection is enabled.")]
+        public bool AutoWordSelection
+        {
+            get
+            {
+                return _RichTextBox.AutoWordSelection;
+            }
+            set
+            {
+                _RichTextBox.AutoWordSelection = value;
+            }
+        }
+        [Bindable(false), Browsable(false)]
+        public override Color BackColor
+        {
+            get
+            {
+                return base.BackColor;
+            }
+            set
+            {
+                base.BackColor = value;
+            }
+        }
+        /// <summary>
+        /// Gets or sets indent for bullets in the control.
+        /// </summary>
+        [DefaultValue(0), Category("Behavior"), Description("Indicates the indent for bullets in the control."), Localizable(true)]
+        public int BulletIndent
+        {
+            get
+            {
+                return _RichTextBox.BulletIndent;
+            }
+            set
+            {
+                _RichTextBox.BulletIndent = value;
+            }
+        }
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool CanRedo
+        {
+            get
+            {
+                return _RichTextBox.CanRedo;
+            }
+        }
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool CanUndo
+        {
+            get
+            {
+                return _RichTextBox.CanUndo;
+            }
+        }
+        public override ContextMenuStrip ContextMenuStrip
+        {
+            get
+            {
+                return base.ContextMenuStrip;
+            }
+            set
+            {
+                base.ContextMenuStrip = value;
+                _RichTextBox.ContextMenuStrip = value;
+            }
+        }
+        protected override Size DefaultSize
+        {
+            get
+            {
+                return new Size(100, 100);
+            }
+        }
+        /// <summary>
+        /// Gets or sets whether URLs are automatically formatted as links.
+        /// </summary>
+        [Category("Behavior"), DefaultValue(true), Description("Indicates whether URLs are automatically formatted as links.")]
+        public bool DetectUrls
+        {
+            get
+            {
+                return _RichTextBox.DetectUrls;
+            }
+            set
+            {
+                _RichTextBox.DetectUrls = value;
+            }
+        }
+        /// <summary>
+        /// Gets or sets whether drag/drop of text, pictures and other data is enabled.
+        /// </summary>
+        [DefaultValue(false), Category("Behavior"), Description("Indicates whether drag/drop of text, pictures and other data is enabled.")]
+        public bool EnableAutoDragDrop
+        {
+            get
+            {
+                return _RichTextBox.EnableAutoDragDrop;
+            }
+            set
+            {
+                _RichTextBox.EnableAutoDragDrop = value;
+            }
+        }
+        [Browsable(false)]
+        public override bool Focused
+        {
+            get
+            {
+                return _RichTextBox.Focused;
+            }
+        }
+        /// <summary>
+        /// Gets or sets whether selection should be hidden when the edit control loses focus.
+        /// </summary>
+        [Description("Indicates whether selection should be hidden when the edit control loses focus."), Category("Behavior"), DefaultValue(true)]
+        public bool HideSelection
+        {
+            get
+            {
+                return _RichTextBox.HideSelection;
+            }
+            set
+            {
+                _RichTextBox.HideSelection = value;
+            }
+        }
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public RichTextBoxLanguageOptions LanguageOption
+        {
+            get
+            {
+                return _RichTextBox.LanguageOption;
+            }
+            set
+            {
+                _RichTextBox.LanguageOption = value;
+            }
+        }
+        /// <summary>
+        /// Gets or sets lines of text in a multi-line edit, as an array of String values.
+        /// </summary>
+        [Editor("System.Windows.Forms.Design.StringArrayEditor, System.Design, Version= 2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", typeof(System.Drawing.Design.UITypeEditor)), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), MergableProperty(false), Localizable(true), Category("Appearance"), Description("Indicates lines of text in a multi-line edit, as an array of String values.")]
+        public string[] Lines
+        {
+            get
+            {
+                return _RichTextBox.Lines;
+            }
+            set
+            {
+                _RichTextBox.Lines = value;
+            }
+        }
+        /// <summary>
+        /// Gets or sets maximum number of characters that can be entered into the edit control.
+        /// </summary>
+        [Localizable(true), Category("Behavior"), Description("Indicates maximum number of characters that can be entered into the edit control."), DefaultValue(0x7fffffff)]
+        public int MaxLength
+        {
+            get
+            {
+                return _RichTextBox.MaxLength;
+            }
+            set
+            {
+                _RichTextBox.MaxLength = value;
+            }
+        }
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool Modified
+        {
+            get
+            {
+                return _RichTextBox.Modified;
+            }
+        }
+        /// <summary>
+        /// Gets or sets whether the text in the control can span more than one line.
+        /// </summary>
+        [RefreshProperties(RefreshProperties.All), Description("Indicates whether the text in the control can span more than one line."), DefaultValue(true), Localizable(true), Category("Behavior")]
+        public bool Multiline
+        {
+            get
+            {
+                return _RichTextBox.Multiline;
+            }
+            set
+            {
+                _RichTextBox.Multiline = value;
+            }
+        }
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), Localizable(false), Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public new System.Windows.Forms.Padding Padding
+        {
+            get
+            {
+                return base.Padding;
+            }
+            set
+            {
+                base.Padding = value;
+            }
+        }
+        /// <summary>
+        /// Gets or sets whether the text in the edit control can be changed or not.
+        /// </summary>
+        [DefaultValue(false), Category("Behavior"), Description("Indicates whether the text in the edit control can be changed or not."), RefreshProperties(RefreshProperties.Repaint)]
+        public bool ReadOnly
+        {
+            get
+            {
+                return _RichTextBox.ReadOnly;
+            }
+            set
+            {
+                _RichTextBox.ReadOnly = value;
+            }
+        }
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), Browsable(false)]
+        public string RedoActionName
+        {
+            get
+            {
+                return _RichTextBox.RedoActionName;
+            }
+        }
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), Browsable(false), DefaultValue(true)]
+        public bool RichTextShortcutsEnabled
+        {
+            get
+            {
+                return _RichTextBox.RichTextShortcutsEnabled;
+            }
+            set
+            {
+                _RichTextBox.RichTextShortcutsEnabled = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets right margin dimensions.
+        /// </summary>
+        [Description("Indicates the right margin dimensions."), Localizable(true), Category("Behavior"), DefaultValue(0)]
+        public int RightMargin
+        {
+            get
+            {
+                return _RichTextBox.RightMargin;
+            }
+            set
+            {
+                _RichTextBox.RightMargin = value;
+            }
+        }
+        /// <summary>
+        /// Gets or sets the text of the RichTextBox control, including all rich text format (RTF) codes.
+        /// </summary>
+        [Bindable(true), RefreshProperties(RefreshProperties.All), SettingsBindable(true), DefaultValue(""), Category("Appearance"), Description("Gets or sets the text of the RichTextBox control, including all rich text format (RTF) codes.")]
+        public string Rtf
+        {
+            get
+            {
+                return _RichTextBox.Rtf;
+            }
+            set
+            {
+                _RichTextBox.Rtf = value;
+                UpdateScrollBarsDelayed();
+            }
+        }
+        /// <summary>
+        /// Gets or sets for multi-line edit control, which scroll bars will be shown.
+        /// </summary>
+        [Localizable(true), Description("Indicates, for multi-line edit control, which scroll bars will be shown."), DefaultValue(typeof(RichTextBoxScrollBars), "Both"), Category("Appearance")]
+        public RichTextBoxScrollBars ScrollBars
+        {
+            get
+            {
+                return _RichTextBox.ScrollBars;
+            }
+            set
+            {
+                _RichTextBox.ScrollBars = value;
+            }
+        }
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), DefaultValue("")]
+        public string SelectedRtf
+        {
+            get
+            {
+                return _RichTextBox.SelectedRtf;
+            }
+            set
+            {
+                _RichTextBox.SelectedRtf = value;
+            }
+        }
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), Browsable(false)]
+        public string SelectedText
+        {
+            get
+            {
+                return _RichTextBox.SelectedText;
+            }
+            set
+            {
+                _RichTextBox.SelectedText = value;
+            }
+        }
+        [DefaultValue(typeof(HorizontalAlignment), "Left"), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), Browsable(false)]
+        public HorizontalAlignment SelectionAlignment
+        {
+            get
+            {
+                return _RichTextBox.SelectionAlignment;
+            }
+            set
+            {
+                _RichTextBox.SelectionAlignment = value;
+            }
+        }
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), Browsable(false)]
+        public Color SelectionBackColor
+        {
+            get
+            {
+                return _RichTextBox.SelectionBackColor;
+            }
+            set
+            {
+                _RichTextBox.SelectionBackColor = value;
+            }
+        }
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), Browsable(false)]
+        public bool SelectionBullet
+        {
+            get
+            {
+                return _RichTextBox.SelectionBullet;
+            }
+            set
+            {
+                _RichTextBox.SelectionBullet = value;
+            }
+        }
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public int SelectionCharOffset
+        {
+            get
+            {
+                return _RichTextBox.SelectionCharOffset;
+            }
+            set
+            {
+                _RichTextBox.SelectionCharOffset = value;
+            }
+        }
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public Color SelectionColor
+        {
+            get
+            {
+                return _RichTextBox.SelectionColor;
+            }
+            set
+            {
+                _RichTextBox.SelectionColor = value;
+            }
+        }
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), Browsable(false)]
+        public Font SelectionFont
+        {
+            get
+            {
+                return _RichTextBox.SelectionFont;
+            }
+            set
+            {
+                _RichTextBox.SelectionFont = value;
+            }
+        }
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), Browsable(false)]
+        public int SelectionHangingIndent
+        {
+            get
+            {
+                return _RichTextBox.SelectionHangingIndent;
+            }
+            set
+            {
+                _RichTextBox.SelectionHangingIndent = value;
+            }
+        }
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), Browsable(false)]
+        public int SelectionIndent
+        {
+            get
+            {
+                return _RichTextBox.SelectionIndent;
+            }
+            set
+            {
+                _RichTextBox.SelectionIndent = value;
+            }
+        }
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), Browsable(false)]
+        public int SelectionLength
+        {
+            get
+            {
+                return _RichTextBox.SelectionLength;
+            }
+            set
+            {
+                _RichTextBox.SelectionLength = value;
+            }
+        }
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), Browsable(false)]
+        public int SelectionProtected
+        {
+            get
+            {
+                return _RichTextBox.SelectionLength;
+            }
+            set
+            {
+                _RichTextBox.SelectionLength = value;
+            }
+        }
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public int SelectionRightIndent
+        {
+            get
+            {
+                return _RichTextBox.SelectionRightIndent;
+            }
+            set
+            {
+                _RichTextBox.SelectionRightIndent = value;
+            }
+        }
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), Browsable(false)]
+        public int SelectionStart
+        {
+            get
+            {
+                return _RichTextBox.SelectionStart;
+            }
+            set
+            {
+                _RichTextBox.SelectionStart = value;
+            }
+        }
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public int[] SelectionTabs
+        {
+            get
+            {
+                return _RichTextBox.SelectionTabs;
+            }
+            set
+            {
+                _RichTextBox.SelectionTabs = value;
+            }
+        }
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public RichTextBoxSelectionTypes SelectionType
+        {
+            get
+            {
+                return _RichTextBox.SelectionType;
+            }
+        }
+        /// <summary>
+        /// Gets or sets whether shortcuts defined for the control are enabled.
+        /// </summary>
+        [DefaultValue(true), Description("Indicates whether shortcuts defined for the control are enabled."), Category("Behavior")]
+        public bool ShortcutsEnabled
+        {
+            get
+            {
+                return _RichTextBox.ShortcutsEnabled;
+            }
+            set
+            {
+                _RichTextBox.ShortcutsEnabled = value;
+            }
+        }
+        /// <summary>
+        /// Gets or sets whether selection margin is visible.
+        /// </summary>
+        [DefaultValue(false), Category("Behavior"), Description("Indicates whether selection margin is visible.")]
+        public bool ShowSelectionMargin
+        {
+            get
+            {
+                return _RichTextBox.ShowSelectionMargin;
+            }
+            set
+            {
+                _RichTextBox.ShowSelectionMargin = value;
+            }
+        }
+        public new bool TabStop
+        {
+            get
+            {
+                return _RichTextBox.TabStop;
+            }
+            set
+            {
+                _RichTextBox.TabStop = value;
+            }
+        }
+        [Editor("System.ComponentModel.Design.MultilineStringEditor, System.Design, Version= 2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", typeof(System.Drawing.Design.UITypeEditor))]
+        public override string Text
+        {
+            get
+            {
+                return _RichTextBox.Text;
+            }
+            set
+            {
+                _RichTextBox.Text = value;
+                UpdateScrollBarsDelayed();
+            }
+        }
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), Browsable(false)]
+        public int TextLength
+        {
+            get
+            {
+                return _RichTextBox.TextLength;
+            }
+        }
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), Browsable(false)]
+        public string UndoActionName
+        {
+            get
+            {
+                return _RichTextBox.UndoActionName;
+            }
+        }
+        /// <summary>
+        /// Gets or sets whether lines are automatically word-wrapped.
+        /// </summary>
+        [DefaultValue(true), Description("Indicates whether lines are automatically word-wrapped."), Localizable(true), Category("Behavior")]
+        public bool WordWrap
+        {
+            get
+            {
+                return _RichTextBox.WordWrap;
+            }
+            set
+            {
+                _RichTextBox.WordWrap = value;
+            }
+        }
+        /// <summary>
+        /// Gets or sets current zoom factor for the control content.
+        /// </summary>
+        [Localizable(true), DefaultValue((float)1f), Category("Behavior"), Description("Indicates current zoom factor for the control content.")]
+        public float ZoomFactor
+        {
+            get
+            {
+                return _RichTextBox.ZoomFactor;
+            }
+            set
+            {
+                _RichTextBox.ZoomFactor = value;
+            }
+        }
+
+        public override ContextMenu ContextMenu
+        {
+            get
+            {
+                return _RichTextBox.ContextMenu;
+            }
+            set
+            {
+                _RichTextBox.ContextMenu = value;
+            }
+        }
+
+        
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/RichTextBoxEx.ico b/PROMS/DotNetBar Source Code/Controls/RichTextBoxEx.ico
new file mode 100644
index 00000000..0f0a6962
Binary files /dev/null and b/PROMS/DotNetBar Source Code/Controls/RichTextBoxEx.ico differ
diff --git a/PROMS/DotNetBar Source Code/Controls/RichTextBoxScrollEx.cs b/PROMS/DotNetBar Source Code/Controls/RichTextBoxScrollEx.cs
new file mode 100644
index 00000000..b7085426
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/RichTextBoxScrollEx.cs	
@@ -0,0 +1,1019 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows.Forms;
+using System.Runtime.InteropServices;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    internal class RichTextBoxScrollEx : RichTextBox, IScrollBarOverrideSupport
+    {
+        #region Internal Implementation
+        protected override void WndProc(ref Message m)
+        {
+            //Console.WriteLine("{0} Message {1}", DateTime.Now, MapMessage(m.Msg));
+            if (m.Msg == (int)WinApi.WindowsMessages.WM_VSCROLL || m.Msg == (int)WinApi.WindowsMessages.WM_HSCROLL || m.Msg == (int)WinApi.WindowsMessages.WM_MOUSEWHEEL)
+            {
+                base.WndProc(ref m);
+                OnScrollBarValueChanged(new ScrollValueChangedEventArgs(ScrollbarControl.MapMessageToScrollChange(m.Msg)));
+                return;
+            }
+            else if (m.Msg == (int)WinApi.WindowsMessages.WM_NCCALCSIZE)
+            {
+                base.WndProc(ref m);
+                OnNonClientSizeChanged(EventArgs.Empty);
+                return;
+            }
+            else if (m.Msg == 206 || m.Msg == 8270) // Internal RichTextBox message we use to trigger scroll-bar update
+            {
+                base.WndProc(ref m);
+                OnScrollBarValueChanged(new ScrollValueChangedEventArgs(eScrollBarScrollChange.Horizontal | eScrollBarScrollChange.Vertical));
+                return;
+            }
+            else if (m.Msg == (int)WinApi.WindowsMessages.WM_MOVE) // Internal RichTextBox message we use to trigger scroll-bar update
+            {
+                base.WndProc(ref m);
+                OnControlMoved(EventArgs.Empty);
+                return;
+            }
+            base.WndProc(ref m);
+        }
+
+        
+        //private static Array _EnumValues = Enum.GetValues(typeof(WM));
+        //private object MapMessage(int msg)
+        //{
+        //    foreach (object item in _EnumValues)
+        //    {
+        //        if (item != null && (uint)item == msg)
+        //            return item.ToString();
+        //    }
+        //    return msg;
+        //}
+        #endregion
+        #region IScrollBarOverrideSupport Members
+        public event EventHandler NonClientSizeChanged;
+        /// <summary>
+        /// Raises NonClientSizeChanged event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnNonClientSizeChanged(EventArgs e)
+        {
+            EventHandler handler = NonClientSizeChanged;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        public event ScrollValueChangedHandler ScrollBarValueChanged;
+        /// <summary>
+        /// Raises ScrollBarValueChanged event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnScrollBarValueChanged(ScrollValueChangedEventArgs e)
+        {
+            ScrollValueChangedHandler handler = ScrollBarValueChanged;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        public event EventHandler ControlMoved;
+        /// <summary>
+        /// Raises NonClientSizeChanged event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnControlMoved(EventArgs e)
+        {
+            EventHandler handler = ControlMoved;
+            if (handler != null)
+                handler(this, e);
+        }
+        bool IScrollBarOverrideSupport.DesignMode
+        {
+            get
+            {
+                return this.DesignMode;
+            }
+        }
+        #endregion
+    }
+
+    ///// <summary>
+    ///// Windows Messages
+    ///// Defined in winuser.h from Windows SDK v6.1
+    ///// Documentation pulled from MSDN.
+    ///// </summary>
+    //public enum WM : uint
+    //{
+    //    /// <summary>
+    //    /// The WM_NULL message performs no operation. An application sends the WM_NULL message if it wants to post a message that the recipient window will ignore.
+    //    /// </summary>
+    //    NULL = 0x0000,
+    //    /// <summary>
+    //    /// The WM_CREATE message is sent when an application requests that a window be created by calling the CreateWindowEx or CreateWindow function. (The message is sent before the function returns.) The window procedure of the new window receives this message after the window is created, but before the window becomes visible.
+    //    /// </summary>
+    //    CREATE = 0x0001,
+    //    /// <summary>
+    //    /// The WM_DESTROY message is sent when a window is being destroyed. It is sent to the window procedure of the window being destroyed after the window is removed from the screen.
+    //    /// This message is sent first to the window being destroyed and then to the child windows (if any) as they are destroyed. During the processing of the message, it can be assumed that all child windows still exist.
+    //    /// /// </summary>
+    //    DESTROY = 0x0002,
+    //    /// <summary>
+    //    /// The WM_MOVE message is sent after a window has been moved.
+    //    /// </summary>
+    //    MOVE = 0x0003,
+    //    /// <summary>
+    //    /// The WM_SIZE message is sent to a window after its size has changed.
+    //    /// </summary>
+    //    SIZE = 0x0005,
+    //    /// <summary>
+    //    /// The WM_ACTIVATE message is sent to both the window being activated and the window being deactivated. If the windows use the same input queue, the message is sent synchronously, first to the window procedure of the top-level window being deactivated, then to the window procedure of the top-level window being activated. If the windows use different input queues, the message is sent asynchronously, so the window is activated immediately.
+    //    /// </summary>
+    //    ACTIVATE = 0x0006,
+    //    /// <summary>
+    //    /// The WM_SETFOCUS message is sent to a window after it has gained the keyboard focus.
+    //    /// </summary>
+    //    SETFOCUS = 0x0007,
+    //    /// <summary>
+    //    /// The WM_KILLFOCUS message is sent to a window immediately before it loses the keyboard focus.
+    //    /// </summary>
+    //    KILLFOCUS = 0x0008,
+    //    /// <summary>
+    //    /// The WM_ENABLE message is sent when an application changes the enabled state of a window. It is sent to the window whose enabled state is changing. This message is sent before the EnableWindow function returns, but after the enabled state (WS_DISABLED style bit) of the window has changed.
+    //    /// </summary>
+    //    ENABLE = 0x000A,
+    //    /// <summary>
+    //    /// An application sends the WM_SETREDRAW message to a window to allow changes in that window to be redrawn or to prevent changes in that window from being redrawn.
+    //    /// </summary>
+    //    SETREDRAW = 0x000B,
+    //    /// <summary>
+    //    /// An application sends a WM_SETTEXT message to set the text of a window.
+    //    /// </summary>
+    //    SETTEXT = 0x000C,
+    //    /// <summary>
+    //    /// An application sends a WM_GETTEXT message to copy the text that corresponds to a window into a buffer provided by the caller.
+    //    /// </summary>
+    //    GETTEXT = 0x000D,
+    //    /// <summary>
+    //    /// An application sends a WM_GETTEXTLENGTH message to determine the length, in characters, of the text associated with a window.
+    //    /// </summary>
+    //    GETTEXTLENGTH = 0x000E,
+    //    /// <summary>
+    //    /// The WM_PAINT message is sent when the system or another application makes a request to paint a portion of an application's window. The message is sent when the UpdateWindow or RedrawWindow function is called, or by the DispatchMessage function when the application obtains a WM_PAINT message by using the GetMessage or PeekMessage function.
+    //    /// </summary>
+    //    PAINT = 0x000F,
+    //    /// <summary>
+    //    /// The WM_CLOSE message is sent as a signal that a window or an application should terminate.
+    //    /// </summary>
+    //    CLOSE = 0x0010,
+    //    /// <summary>
+    //    /// The WM_QUERYENDSESSION message is sent when the user chooses to end the session or when an application calls one of the system shutdown functions. If any application returns zero, the session is not ended. The system stops sending WM_QUERYENDSESSION messages as soon as one application returns zero.
+    //    /// After processing this message, the system sends the WM_ENDSESSION message with the wParam parameter set to the results of the WM_QUERYENDSESSION message.
+    //    /// </summary>
+    //    QUERYENDSESSION = 0x0011,
+    //    /// <summary>
+    //    /// The WM_QUERYOPEN message is sent to an icon when the user requests that the window be restored to its previous size and position.
+    //    /// </summary>
+    //    QUERYOPEN = 0x0013,
+    //    /// <summary>
+    //    /// The WM_ENDSESSION message is sent to an application after the system processes the results of the WM_QUERYENDSESSION message. The WM_ENDSESSION message informs the application whether the session is ending.
+    //    /// </summary>
+    //    ENDSESSION = 0x0016,
+    //    /// <summary>
+    //    /// The WM_QUIT message indicates a request to terminate an application and is generated when the application calls the PostQuitMessage function. It causes the GetMessage function to return zero.
+    //    /// </summary>
+    //    QUIT = 0x0012,
+    //    /// <summary>
+    //    /// The WM_ERASEBKGND message is sent when the window background must be erased (for example, when a window is resized). The message is sent to prepare an invalidated portion of a window for painting.
+    //    /// </summary>
+    //    ERASEBKGND = 0x0014,
+    //    /// <summary>
+    //    /// This message is sent to all top-level windows when a change is made to a system color setting.
+    //    /// </summary>
+    //    SYSCOLORCHANGE = 0x0015,
+    //    /// <summary>
+    //    /// The WM_SHOWWINDOW message is sent to a window when the window is about to be hidden or shown.
+    //    /// </summary>
+    //    SHOWWINDOW = 0x0018,
+    //    /// <summary>
+    //    /// An application sends the WM_WININICHANGE message to all top-level windows after making a change to the WIN.INI file. The SystemParametersInfo function sends this message after an application uses the function to change a setting in WIN.INI.
+    //    /// Note  The WM_WININICHANGE message is provided only for compatibility with earlier versions of the system. Applications should use the WM_SETTINGCHANGE message.
+    //    /// </summary>
+    //    WININICHANGE = 0x001A,
+    //    /// <summary>
+    //    /// An application sends the WM_WININICHANGE message to all top-level windows after making a change to the WIN.INI file. The SystemParametersInfo function sends this message after an application uses the function to change a setting in WIN.INI.
+    //    /// Note  The WM_WININICHANGE message is provided only for compatibility with earlier versions of the system. Applications should use the WM_SETTINGCHANGE message.
+    //    /// </summary>
+    //    SETTINGCHANGE = WM.WININICHANGE,
+    //    /// <summary>
+    //    /// The WM_DEVMODECHANGE message is sent to all top-level windows whenever the user changes device-mode settings.
+    //    /// </summary>
+    //    DEVMODECHANGE = 0x001B,
+    //    /// <summary>
+    //    /// The WM_ACTIVATEAPP message is sent when a window belonging to a different application than the active window is about to be activated. The message is sent to the application whose window is being activated and to the application whose window is being deactivated.
+    //    /// </summary>
+    //    ACTIVATEAPP = 0x001C,
+    //    /// <summary>
+    //    /// An application sends the WM_FONTCHANGE message to all top-level windows in the system after changing the pool of font resources.
+    //    /// </summary>
+    //    FONTCHANGE = 0x001D,
+    //    /// <summary>
+    //    /// A message that is sent whenever there is a change in the system time.
+    //    /// </summary>
+    //    TIMECHANGE = 0x001E,
+    //    /// <summary>
+    //    /// The WM_CANCELMODE message is sent to cancel certain modes, such as mouse capture. For example, the system sends this message to the active window when a dialog box or message box is displayed. Certain functions also send this message explicitly to the specified window regardless of whether it is the active window. For example, the EnableWindow function sends this message when disabling the specified window.
+    //    /// </summary>
+    //    CANCELMODE = 0x001F,
+    //    /// <summary>
+    //    /// The WM_SETCURSOR message is sent to a window if the mouse causes the cursor to move within a window and mouse input is not captured.
+    //    /// </summary>
+    //    SETCURSOR = 0x0020,
+    //    /// <summary>
+    //    /// The WM_MOUSEACTIVATE message is sent when the cursor is in an inactive window and the user presses a mouse button. The parent window receives this message only if the child window passes it to the DefWindowProc function.
+    //    /// </summary>
+    //    MOUSEACTIVATE = 0x0021,
+    //    /// <summary>
+    //    /// The WM_CHILDACTIVATE message is sent to a child window when the user clicks the window's title bar or when the window is activated, moved, or sized.
+    //    /// </summary>
+    //    CHILDACTIVATE = 0x0022,
+    //    /// <summary>
+    //    /// The WM_QUEUESYNC message is sent by a computer-based training (CBT) application to separate user-input messages from other messages sent through the WH_JOURNALPLAYBACK Hook procedure.
+    //    /// </summary>
+    //    QUEUESYNC = 0x0023,
+    //    /// <summary>
+    //    /// The WM_GETMINMAXINFO message is sent to a window when the size or position of the window is about to change. An application can use this message to override the window's default maximized size and position, or its default minimum or maximum tracking size.
+    //    /// </summary>
+    //    GETMINMAXINFO = 0x0024,
+    //    /// <summary>
+    //    /// Windows NT 3.51 and earlier: The WM_PAINTICON message is sent to a minimized window when the icon is to be painted. This message is not sent by newer versions of Microsoft Windows, except in unusual circumstances explained in the Remarks.
+    //    /// </summary>
+    //    PAINTICON = 0x0026,
+    //    /// <summary>
+    //    /// Windows NT 3.51 and earlier: The WM_ICONERASEBKGND message is sent to a minimized window when the background of the icon must be filled before painting the icon. A window receives this message only if a class icon is defined for the window; otherwise, WM_ERASEBKGND is sent. This message is not sent by newer versions of Windows.
+    //    /// </summary>
+    //    ICONERASEBKGND = 0x0027,
+    //    /// <summary>
+    //    /// The WM_NEXTDLGCTL message is sent to a dialog box procedure to set the keyboard focus to a different control in the dialog box.
+    //    /// </summary>
+    //    NEXTDLGCTL = 0x0028,
+    //    /// <summary>
+    //    /// The WM_SPOOLERSTATUS message is sent from Print Manager whenever a job is added to or removed from the Print Manager queue.
+    //    /// </summary>
+    //    SPOOLERSTATUS = 0x002A,
+    //    /// <summary>
+    //    /// The WM_DRAWITEM message is sent to the parent window of an owner-drawn button, combo box, list box, or menu when a visual aspect of the button, combo box, list box, or menu has changed.
+    //    /// </summary>
+    //    DRAWITEM = 0x002B,
+    //    /// <summary>
+    //    /// The WM_MEASUREITEM message is sent to the owner window of a combo box, list box, list view control, or menu item when the control or menu is created.
+    //    /// </summary>
+    //    MEASUREITEM = 0x002C,
+    //    /// <summary>
+    //    /// Sent to the owner of a list box or combo box when the list box or combo box is destroyed or when items are removed by the LB_DELETESTRING, LB_RESETCONTENT, CB_DELETESTRING, or CB_RESETCONTENT message. The system sends a WM_DELETEITEM message for each deleted item. The system sends the WM_DELETEITEM message for any deleted list box or combo box item with nonzero item data.
+    //    /// </summary>
+    //    DELETEITEM = 0x002D,
+    //    /// <summary>
+    //    /// Sent by a list box with the LBS_WANTKEYBOARDINPUT style to its owner in response to a WM_KEYDOWN message.
+    //    /// </summary>
+    //    VKEYTOITEM = 0x002E,
+    //    /// <summary>
+    //    /// Sent by a list box with the LBS_WANTKEYBOARDINPUT style to its owner in response to a WM_CHAR message.
+    //    /// </summary>
+    //    CHARTOITEM = 0x002F,
+    //    /// <summary>
+    //    /// An application sends a WM_SETFONT message to specify the font that a control is to use when drawing text.
+    //    /// </summary>
+    //    SETFONT = 0x0030,
+    //    /// <summary>
+    //    /// An application sends a WM_GETFONT message to a control to retrieve the font with which the control is currently drawing its text.
+    //    /// </summary>
+    //    GETFONT = 0x0031,
+    //    /// <summary>
+    //    /// An application sends a WM_SETHOTKEY message to a window to associate a hot key with the window. When the user presses the hot key, the system activates the window.
+    //    /// </summary>
+    //    SETHOTKEY = 0x0032,
+    //    /// <summary>
+    //    /// An application sends a WM_GETHOTKEY message to determine the hot key associated with a window.
+    //    /// </summary>
+    //    GETHOTKEY = 0x0033,
+    //    /// <summary>
+    //    /// The WM_QUERYDRAGICON message is sent to a minimized (iconic) window. The window is about to be dragged by the user but does not have an icon defined for its class. An application can return a handle to an icon or cursor. The system displays this cursor or icon while the user drags the icon.
+    //    /// </summary>
+    //    QUERYDRAGICON = 0x0037,
+    //    /// <summary>
+    //    /// The system sends the WM_COMPAREITEM message to determine the relative position of a new item in the sorted list of an owner-drawn combo box or list box. Whenever the application adds a new item, the system sends this message to the owner of a combo box or list box created with the CBS_SORT or LBS_SORT style.
+    //    /// </summary>
+    //    COMPAREITEM = 0x0039,
+    //    /// <summary>
+    //    /// Active Accessibility sends the WM_GETOBJECT message to obtain information about an accessible object contained in a server application.
+    //    /// Applications never send this message directly. It is sent only by Active Accessibility in response to calls to AccessibleObjectFromPoint, AccessibleObjectFromEvent, or AccessibleObjectFromWindow. However, server applications handle this message.
+    //    /// </summary>
+    //    GETOBJECT = 0x003D,
+    //    /// <summary>
+    //    /// The WM_COMPACTING message is sent to all top-level windows when the system detects more than 12.5 percent of system time over a 30- to 60-second interval is being spent compacting memory. This indicates that system memory is low.
+    //    /// </summary>
+    //    COMPACTING = 0x0041,
+    //    /// <summary>
+    //    /// WM_COMMNOTIFY is Obsolete for Win32-Based Applications
+    //    /// </summary>
+    //    [Obsolete]
+    //    COMMNOTIFY = 0x0044,
+    //    /// <summary>
+    //    /// The WM_WINDOWPOSCHANGING message is sent to a window whose size, position, or place in the Z order is about to change as a result of a call to the SetWindowPos function or another window-management function.
+    //    /// </summary>
+    //    WINDOWPOSCHANGING = 0x0046,
+    //    /// <summary>
+    //    /// The WM_WINDOWPOSCHANGED message is sent to a window whose size, position, or place in the Z order has changed as a result of a call to the SetWindowPos function or another window-management function.
+    //    /// </summary>
+    //    WINDOWPOSCHANGED = 0x0047,
+    //    /// <summary>
+    //    /// Notifies applications that the system, typically a battery-powered personal computer, is about to enter a suspended mode.
+    //    /// Use: POWERBROADCAST
+    //    /// </summary>
+    //    [Obsolete]
+    //    POWER = 0x0048,
+    //    /// <summary>
+    //    /// An application sends the WM_COPYDATA message to pass data to another application.
+    //    /// </summary>
+    //    COPYDATA = 0x004A,
+    //    /// <summary>
+    //    /// The WM_CANCELJOURNAL message is posted to an application when a user cancels the application's journaling activities. The message is posted with a NULL window handle.
+    //    /// </summary>
+    //    CANCELJOURNAL = 0x004B,
+    //    /// <summary>
+    //    /// Sent by a common control to its parent window when an event has occurred or the control requires some information.
+    //    /// </summary>
+    //    NOTIFY = 0x004E,
+    //    /// <summary>
+    //    /// The WM_INPUTLANGCHANGEREQUEST message is posted to the window with the focus when the user chooses a new input language, either with the hotkey (specified in the Keyboard control panel application) or from the indicator on the system taskbar. An application can accept the change by passing the message to the DefWindowProc function or reject the change (and prevent it from taking place) by returning immediately.
+    //    /// </summary>
+    //    INPUTLANGCHANGEREQUEST = 0x0050,
+    //    /// <summary>
+    //    /// The WM_INPUTLANGCHANGE message is sent to the topmost affected window after an application's input language has been changed. You should make any application-specific settings and pass the message to the DefWindowProc function, which passes the message to all first-level child windows. These child windows can pass the message to DefWindowProc to have it pass the message to their child windows, and so on.
+    //    /// </summary>
+    //    INPUTLANGCHANGE = 0x0051,
+    //    /// <summary>
+    //    /// Sent to an application that has initiated a training card with Microsoft Windows Help. The message informs the application when the user clicks an authorable button. An application initiates a training card by specifying the HELP_TCARD command in a call to the WinHelp function.
+    //    /// </summary>
+    //    TCARD = 0x0052,
+    //    /// <summary>
+    //    /// Indicates that the user pressed the F1 key. If a menu is active when F1 is pressed, WM_HELP is sent to the window associated with the menu; otherwise, WM_HELP is sent to the window that has the keyboard focus. If no window has the keyboard focus, WM_HELP is sent to the currently active window.
+    //    /// </summary>
+    //    HELP = 0x0053,
+    //    /// <summary>
+    //    /// The WM_USERCHANGED message is sent to all windows after the user has logged on or off. When the user logs on or off, the system updates the user-specific settings. The system sends this message immediately after updating the settings.
+    //    /// </summary>
+    //    USERCHANGED = 0x0054,
+    //    /// <summary>
+    //    /// Determines if a window accepts ANSI or Unicode structures in the WM_NOTIFY notification message. WM_NOTIFYFORMAT messages are sent from a common control to its parent window and from the parent window to the common control.
+    //    /// </summary>
+    //    NOTIFYFORMAT = 0x0055,
+    //    /// <summary>
+    //    /// The WM_CONTEXTMENU message notifies a window that the user clicked the right mouse button (right-clicked) in the window.
+    //    /// </summary>
+    //    CONTEXTMENU = 0x007B,
+    //    /// <summary>
+    //    /// The WM_STYLECHANGING message is sent to a window when the SetWindowLong function is about to change one or more of the window's styles.
+    //    /// </summary>
+    //    STYLECHANGING = 0x007C,
+    //    /// <summary>
+    //    /// The WM_STYLECHANGED message is sent to a window after the SetWindowLong function has changed one or more of the window's styles
+    //    /// </summary>
+    //    STYLECHANGED = 0x007D,
+    //    /// <summary>
+    //    /// The WM_DISPLAYCHANGE message is sent to all windows when the display resolution has changed.
+    //    /// </summary>
+    //    DISPLAYCHANGE = 0x007E,
+    //    /// <summary>
+    //    /// The WM_GETICON message is sent to a window to retrieve a handle to the large or small icon associated with a window. The system displays the large icon in the ALT+TAB dialog, and the small icon in the window caption.
+    //    /// </summary>
+    //    GETICON = 0x007F,
+    //    /// <summary>
+    //    /// An application sends the WM_SETICON message to associate a new large or small icon with a window. The system displays the large icon in the ALT+TAB dialog box, and the small icon in the window caption.
+    //    /// </summary>
+    //    SETICON = 0x0080,
+    //    /// <summary>
+    //    /// The WM_NCCREATE message is sent prior to the WM_CREATE message when a window is first created.
+    //    /// </summary>
+    //    NCCREATE = 0x0081,
+    //    /// <summary>
+    //    /// The WM_NCDESTROY message informs a window that its nonclient area is being destroyed. The DestroyWindow function sends the WM_NCDESTROY message to the window following the WM_DESTROY message. WM_DESTROY is used to free the allocated memory object associated with the window.
+    //    /// The WM_NCDESTROY message is sent after the child windows have been destroyed. In contrast, WM_DESTROY is sent before the child windows are destroyed.
+    //    /// </summary>
+    //    NCDESTROY = 0x0082,
+    //    /// <summary>
+    //    /// The WM_NCCALCSIZE message is sent when the size and position of a window's client area must be calculated. By processing this message, an application can control the content of the window's client area when the size or position of the window changes.
+    //    /// </summary>
+    //    NCCALCSIZE = 0x0083,
+    //    /// <summary>
+    //    /// The WM_NCHITTEST message is sent to a window when the cursor moves, or when a mouse button is pressed or released. If the mouse is not captured, the message is sent to the window beneath the cursor. Otherwise, the message is sent to the window that has captured the mouse.
+    //    /// </summary>
+    //    NCHITTEST = 0x0084,
+    //    /// <summary>
+    //    /// The WM_NCPAINT message is sent to a window when its frame must be painted.
+    //    /// </summary>
+    //    NCPAINT = 0x0085,
+    //    /// <summary>
+    //    /// The WM_NCACTIVATE message is sent to a window when its nonclient area needs to be changed to indicate an active or inactive state.
+    //    /// </summary>
+    //    NCACTIVATE = 0x0086,
+    //    /// <summary>
+    //    /// The WM_GETDLGCODE message is sent to the window procedure associated with a control. By default, the system handles all keyboard input to the control; the system interprets certain types of keyboard input as dialog box navigation keys. To override this default behavior, the control can respond to the WM_GETDLGCODE message to indicate the types of input it wants to process itself.
+    //    /// </summary>
+    //    GETDLGCODE = 0x0087,
+    //    /// <summary>
+    //    /// The WM_SYNCPAINT message is used to synchronize painting while avoiding linking independent GUI threads.
+    //    /// </summary>
+    //    SYNCPAINT = 0x0088,
+    //    /// <summary>
+    //    /// The WM_NCMOUSEMOVE message is posted to a window when the cursor is moved within the nonclient area of the window. This message is posted to the window that contains the cursor. If a window has captured the mouse, this message is not posted.
+    //    /// </summary>
+    //    NCMOUSEMOVE = 0x00A0,
+    //    /// <summary>
+    //    /// The WM_NCLBUTTONDOWN message is posted when the user presses the left mouse button while the cursor is within the nonclient area of a window. This message is posted to the window that contains the cursor. If a window has captured the mouse, this message is not posted.
+    //    /// </summary>
+    //    NCLBUTTONDOWN = 0x00A1,
+    //    /// <summary>
+    //    /// The WM_NCLBUTTONUP message is posted when the user releases the left mouse button while the cursor is within the nonclient area of a window. This message is posted to the window that contains the cursor. If a window has captured the mouse, this message is not posted.
+    //    /// </summary>
+    //    NCLBUTTONUP = 0x00A2,
+    //    /// <summary>
+    //    /// The WM_NCLBUTTONDBLCLK message is posted when the user double-clicks the left mouse button while the cursor is within the nonclient area of a window. This message is posted to the window that contains the cursor. If a window has captured the mouse, this message is not posted.
+    //    /// </summary>
+    //    NCLBUTTONDBLCLK = 0x00A3,
+    //    /// <summary>
+    //    /// The WM_NCRBUTTONDOWN message is posted when the user presses the right mouse button while the cursor is within the nonclient area of a window. This message is posted to the window that contains the cursor. If a window has captured the mouse, this message is not posted.
+    //    /// </summary>
+    //    NCRBUTTONDOWN = 0x00A4,
+    //    /// <summary>
+    //    /// The WM_NCRBUTTONUP message is posted when the user releases the right mouse button while the cursor is within the nonclient area of a window. This message is posted to the window that contains the cursor. If a window has captured the mouse, this message is not posted.
+    //    /// </summary>
+    //    NCRBUTTONUP = 0x00A5,
+    //    /// <summary>
+    //    /// The WM_NCRBUTTONDBLCLK message is posted when the user double-clicks the right mouse button while the cursor is within the nonclient area of a window. This message is posted to the window that contains the cursor. If a window has captured the mouse, this message is not posted.
+    //    /// </summary>
+    //    NCRBUTTONDBLCLK = 0x00A6,
+    //    /// <summary>
+    //    /// The WM_NCMBUTTONDOWN message is posted when the user presses the middle mouse button while the cursor is within the nonclient area of a window. This message is posted to the window that contains the cursor. If a window has captured the mouse, this message is not posted.
+    //    /// </summary>
+    //    NCMBUTTONDOWN = 0x00A7,
+    //    /// <summary>
+    //    /// The WM_NCMBUTTONUP message is posted when the user releases the middle mouse button while the cursor is within the nonclient area of a window. This message is posted to the window that contains the cursor. If a window has captured the mouse, this message is not posted.
+    //    /// </summary>
+    //    NCMBUTTONUP = 0x00A8,
+    //    /// <summary>
+    //    /// The WM_NCMBUTTONDBLCLK message is posted when the user double-clicks the middle mouse button while the cursor is within the nonclient area of a window. This message is posted to the window that contains the cursor. If a window has captured the mouse, this message is not posted.
+    //    /// </summary>
+    //    NCMBUTTONDBLCLK = 0x00A9,
+    //    /// <summary>
+    //    /// The WM_NCXBUTTONDOWN message is posted when the user presses the first or second X button while the cursor is in the nonclient area of a window. This message is posted to the window that contains the cursor. If a window has captured the mouse, this message is not posted.
+    //    /// </summary>
+    //    NCXBUTTONDOWN = 0x00AB,
+    //    /// <summary>
+    //    /// The WM_NCXBUTTONUP message is posted when the user releases the first or second X button while the cursor is in the nonclient area of a window. This message is posted to the window that contains the cursor. If a window has captured the mouse, this message is not posted.
+    //    /// </summary>
+    //    NCXBUTTONUP = 0x00AC,
+    //    /// <summary>
+    //    /// The WM_NCXBUTTONDBLCLK message is posted when the user double-clicks the first or second X button while the cursor is in the nonclient area of a window. This message is posted to the window that contains the cursor. If a window has captured the mouse, this message is not posted.
+    //    /// </summary>
+    //    NCXBUTTONDBLCLK = 0x00AD,
+    //    /// <summary>
+    //    /// The WM_INPUT_DEVICE_CHANGE message is sent to the window that registered to receive raw input. A window receives this message through its WindowProc function.
+    //    /// </summary>
+    //    INPUT_DEVICE_CHANGE = 0x00FE,
+    //    /// <summary>
+    //    /// The WM_INPUT message is sent to the window that is getting raw input.
+    //    /// </summary>
+    //    INPUT = 0x00FF,
+    //    /// <summary>
+    //    /// This message filters for keyboard messages.
+    //    /// </summary>
+    //    KEYFIRST = 0x0100,
+    //    /// <summary>
+    //    /// The WM_KEYDOWN message is posted to the window with the keyboard focus when a nonsystem key is pressed. A nonsystem key is a key that is pressed when the ALT key is not pressed.
+    //    /// </summary>
+    //    KEYDOWN = 0x0100,
+    //    /// <summary>
+    //    /// The WM_KEYUP message is posted to the window with the keyboard focus when a nonsystem key is released. A nonsystem key is a key that is pressed when the ALT key is not pressed, or a keyboard key that is pressed when a window has the keyboard focus.
+    //    /// </summary>
+    //    KEYUP = 0x0101,
+    //    /// <summary>
+    //    /// The WM_CHAR message is posted to the window with the keyboard focus when a WM_KEYDOWN message is translated by the TranslateMessage function. The WM_CHAR message contains the character code of the key that was pressed.
+    //    /// </summary>
+    //    CHAR = 0x0102,
+    //    /// <summary>
+    //    /// The WM_DEADCHAR message is posted to the window with the keyboard focus when a WM_KEYUP message is translated by the TranslateMessage function. WM_DEADCHAR specifies a character code generated by a dead key. A dead key is a key that generates a character, such as the umlaut (double-dot), that is combined with another character to form a composite character. For example, the umlaut-O character (�) is generated by typing the dead key for the umlaut character, and then typing the O key.
+    //    /// </summary>
+    //    DEADCHAR = 0x0103,
+    //    /// <summary>
+    //    /// The WM_SYSKEYDOWN message is posted to the window with the keyboard focus when the user presses the F10 key (which activates the menu bar) or holds down the ALT key and then presses another key. It also occurs when no window currently has the keyboard focus; in this case, the WM_SYSKEYDOWN message is sent to the active window. The window that receives the message can distinguish between these two contexts by checking the context code in the lParam parameter.
+    //    /// </summary>
+    //    SYSKEYDOWN = 0x0104,
+    //    /// <summary>
+    //    /// The WM_SYSKEYUP message is posted to the window with the keyboard focus when the user releases a key that was pressed while the ALT key was held down. It also occurs when no window currently has the keyboard focus; in this case, the WM_SYSKEYUP message is sent to the active window. The window that receives the message can distinguish between these two contexts by checking the context code in the lParam parameter.
+    //    /// </summary>
+    //    SYSKEYUP = 0x0105,
+    //    /// <summary>
+    //    /// The WM_SYSCHAR message is posted to the window with the keyboard focus when a WM_SYSKEYDOWN message is translated by the TranslateMessage function. It specifies the character code of a system character key � that is, a character key that is pressed while the ALT key is down.
+    //    /// </summary>
+    //    SYSCHAR = 0x0106,
+    //    /// <summary>
+    //    /// The WM_SYSDEADCHAR message is sent to the window with the keyboard focus when a WM_SYSKEYDOWN message is translated by the TranslateMessage function. WM_SYSDEADCHAR specifies the character code of a system dead key � that is, a dead key that is pressed while holding down the ALT key.
+    //    /// </summary>
+    //    SYSDEADCHAR = 0x0107,
+    //    /// <summary>
+    //    /// The WM_UNICHAR message is posted to the window with the keyboard focus when a WM_KEYDOWN message is translated by the TranslateMessage function. The WM_UNICHAR message contains the character code of the key that was pressed.
+    //    /// The WM_UNICHAR message is equivalent to WM_CHAR, but it uses Unicode Transformation Format (UTF)-32, whereas WM_CHAR uses UTF-16. It is designed to send or post Unicode characters to ANSI windows and it can can handle Unicode Supplementary Plane characters.
+    //    /// </summary>
+    //    UNICHAR = 0x0109,
+    //    /// <summary>
+    //    /// This message filters for keyboard messages.
+    //    /// </summary>
+    //    KEYLAST = 0x0109,
+    //    /// <summary>
+    //    /// Sent immediately before the IME generates the composition string as a result of a keystroke. A window receives this message through its WindowProc function.
+    //    /// </summary>
+    //    IME_STARTCOMPOSITION = 0x010D,
+    //    /// <summary>
+    //    /// Sent to an application when the IME ends composition. A window receives this message through its WindowProc function.
+    //    /// </summary>
+    //    IME_ENDCOMPOSITION = 0x010E,
+    //    /// <summary>
+    //    /// Sent to an application when the IME changes composition status as a result of a keystroke. A window receives this message through its WindowProc function.
+    //    /// </summary>
+    //    IME_COMPOSITION = 0x010F,
+    //    IME_KEYLAST = 0x010F,
+    //    /// <summary>
+    //    /// The WM_INITDIALOG message is sent to the dialog box procedure immediately before a dialog box is displayed. Dialog box procedures typically use this message to initialize controls and carry out any other initialization tasks that affect the appearance of the dialog box.
+    //    /// </summary>
+    //    INITDIALOG = 0x0110,
+    //    /// <summary>
+    //    /// The WM_COMMAND message is sent when the user selects a command item from a menu, when a control sends a notification message to its parent window, or when an accelerator keystroke is translated.
+    //    /// </summary>
+    //    COMMAND = 0x0111,
+    //    /// <summary>
+    //    /// A window receives this message when the user chooses a command from the Window menu, clicks the maximize button, minimize button, restore button, close button, or moves the form. You can stop the form from moving by filtering this out.
+    //    /// </summary>
+    //    SYSCOMMAND = 0x0112,
+    //    /// <summary>
+    //    /// The WM_TIMER message is posted to the installing thread's message queue when a timer expires. The message is posted by the GetMessage or PeekMessage function.
+    //    /// </summary>
+    //    TIMER = 0x0113,
+    //    /// <summary>
+    //    /// The WM_HSCROLL message is sent to a window when a scroll event occurs in the window's standard horizontal scroll bar. This message is also sent to the owner of a horizontal scroll bar control when a scroll event occurs in the control.
+    //    /// </summary>
+    //    HSCROLL = 0x0114,
+    //    /// <summary>
+    //    /// The WM_VSCROLL message is sent to a window when a scroll event occurs in the window's standard vertical scroll bar. This message is also sent to the owner of a vertical scroll bar control when a scroll event occurs in the control.
+    //    /// </summary>
+    //    VSCROLL = 0x0115,
+    //    /// <summary>
+    //    /// The WM_INITMENU message is sent when a menu is about to become active. It occurs when the user clicks an item on the menu bar or presses a menu key. This allows the application to modify the menu before it is displayed.
+    //    /// </summary>
+    //    INITMENU = 0x0116,
+    //    /// <summary>
+    //    /// The WM_INITMENUPOPUP message is sent when a drop-down menu or submenu is about to become active. This allows an application to modify the menu before it is displayed, without changing the entire menu.
+    //    /// </summary>
+    //    INITMENUPOPUP = 0x0117,
+    //    /// <summary>
+    //    /// The WM_MENUSELECT message is sent to a menu's owner window when the user selects a menu item.
+    //    /// </summary>
+    //    MENUSELECT = 0x011F,
+    //    /// <summary>
+    //    /// The WM_MENUCHAR message is sent when a menu is active and the user presses a key that does not correspond to any mnemonic or accelerator key. This message is sent to the window that owns the menu.
+    //    /// </summary>
+    //    MENUCHAR = 0x0120,
+    //    /// <summary>
+    //    /// The WM_ENTERIDLE message is sent to the owner window of a modal dialog box or menu that is entering an idle state. A modal dialog box or menu enters an idle state when no messages are waiting in its queue after it has processed one or more previous messages.
+    //    /// </summary>
+    //    ENTERIDLE = 0x0121,
+    //    /// <summary>
+    //    /// The WM_MENURBUTTONUP message is sent when the user releases the right mouse button while the cursor is on a menu item.
+    //    /// </summary>
+    //    MENURBUTTONUP = 0x0122,
+    //    /// <summary>
+    //    /// The WM_MENUDRAG message is sent to the owner of a drag-and-drop menu when the user drags a menu item.
+    //    /// </summary>
+    //    MENUDRAG = 0x0123,
+    //    /// <summary>
+    //    /// The WM_MENUGETOBJECT message is sent to the owner of a drag-and-drop menu when the mouse cursor enters a menu item or moves from the center of the item to the top or bottom of the item.
+    //    /// </summary>
+    //    MENUGETOBJECT = 0x0124,
+    //    /// <summary>
+    //    /// The WM_UNINITMENUPOPUP message is sent when a drop-down menu or submenu has been destroyed.
+    //    /// </summary>
+    //    UNINITMENUPOPUP = 0x0125,
+    //    /// <summary>
+    //    /// The WM_MENUCOMMAND message is sent when the user makes a selection from a menu.
+    //    /// </summary>
+    //    MENUCOMMAND = 0x0126,
+    //    /// <summary>
+    //    /// An application sends the WM_CHANGEUISTATE message to indicate that the user interface (UI) state should be changed.
+    //    /// </summary>
+    //    CHANGEUISTATE = 0x0127,
+    //    /// <summary>
+    //    /// An application sends the WM_UPDATEUISTATE message to change the user interface (UI) state for the specified window and all its child windows.
+    //    /// </summary>
+    //    UPDATEUISTATE = 0x0128,
+    //    /// <summary>
+    //    /// An application sends the WM_QUERYUISTATE message to retrieve the user interface (UI) state for a window.
+    //    /// </summary>
+    //    QUERYUISTATE = 0x0129,
+    //    /// <summary>
+    //    /// The WM_CTLCOLORMSGBOX message is sent to the owner window of a message box before Windows draws the message box. By responding to this message, the owner window can set the text and background colors of the message box by using the given display device context handle.
+    //    /// </summary>
+    //    CTLCOLORMSGBOX = 0x0132,
+    //    /// <summary>
+    //    /// An edit control that is not read-only or disabled sends the WM_CTLCOLOREDIT message to its parent window when the control is about to be drawn. By responding to this message, the parent window can use the specified device context handle to set the text and background colors of the edit control.
+    //    /// </summary>
+    //    CTLCOLOREDIT = 0x0133,
+    //    /// <summary>
+    //    /// Sent to the parent window of a list box before the system draws the list box. By responding to this message, the parent window can set the text and background colors of the list box by using the specified display device context handle.
+    //    /// </summary>
+    //    CTLCOLORLISTBOX = 0x0134,
+    //    /// <summary>
+    //    /// The WM_CTLCOLORBTN message is sent to the parent window of a button before drawing the button. The parent window can change the button's text and background colors. However, only owner-drawn buttons respond to the parent window processing this message.
+    //    /// </summary>
+    //    CTLCOLORBTN = 0x0135,
+    //    /// <summary>
+    //    /// The WM_CTLCOLORDLG message is sent to a dialog box before the system draws the dialog box. By responding to this message, the dialog box can set its text and background colors using the specified display device context handle.
+    //    /// </summary>
+    //    CTLCOLORDLG = 0x0136,
+    //    /// <summary>
+    //    /// The WM_CTLCOLORSCROLLBAR message is sent to the parent window of a scroll bar control when the control is about to be drawn. By responding to this message, the parent window can use the display context handle to set the background color of the scroll bar control.
+    //    /// </summary>
+    //    CTLCOLORSCROLLBAR = 0x0137,
+    //    /// <summary>
+    //    /// A static control, or an edit control that is read-only or disabled, sends the WM_CTLCOLORSTATIC message to its parent window when the control is about to be drawn. By responding to this message, the parent window can use the specified device context handle to set the text and background colors of the static control.
+    //    /// </summary>
+    //    CTLCOLORSTATIC = 0x0138,
+    //    /// <summary>
+    //    /// Use WM_MOUSEFIRST to specify the first mouse message. Use the PeekMessage() Function.
+    //    /// </summary>
+    //    MOUSEFIRST = 0x0200,
+    //    /// <summary>
+    //    /// The WM_MOUSEMOVE message is posted to a window when the cursor moves. If the mouse is not captured, the message is posted to the window that contains the cursor. Otherwise, the message is posted to the window that has captured the mouse.
+    //    /// </summary>
+    //    MOUSEMOVE = 0x0200,
+    //    /// <summary>
+    //    /// The WM_LBUTTONDOWN message is posted when the user presses the left mouse button while the cursor is in the client area of a window. If the mouse is not captured, the message is posted to the window beneath the cursor. Otherwise, the message is posted to the window that has captured the mouse.
+    //    /// </summary>
+    //    LBUTTONDOWN = 0x0201,
+    //    /// <summary>
+    //    /// The WM_LBUTTONUP message is posted when the user releases the left mouse button while the cursor is in the client area of a window. If the mouse is not captured, the message is posted to the window beneath the cursor. Otherwise, the message is posted to the window that has captured the mouse.
+    //    /// </summary>
+    //    LBUTTONUP = 0x0202,
+    //    /// <summary>
+    //    /// The WM_LBUTTONDBLCLK message is posted when the user double-clicks the left mouse button while the cursor is in the client area of a window. If the mouse is not captured, the message is posted to the window beneath the cursor. Otherwise, the message is posted to the window that has captured the mouse.
+    //    /// </summary>
+    //    LBUTTONDBLCLK = 0x0203,
+    //    /// <summary>
+    //    /// The WM_RBUTTONDOWN message is posted when the user presses the right mouse button while the cursor is in the client area of a window. If the mouse is not captured, the message is posted to the window beneath the cursor. Otherwise, the message is posted to the window that has captured the mouse.
+    //    /// </summary>
+    //    RBUTTONDOWN = 0x0204,
+    //    /// <summary>
+    //    /// The WM_RBUTTONUP message is posted when the user releases the right mouse button while the cursor is in the client area of a window. If the mouse is not captured, the message is posted to the window beneath the cursor. Otherwise, the message is posted to the window that has captured the mouse.
+    //    /// </summary>
+    //    RBUTTONUP = 0x0205,
+    //    /// <summary>
+    //    /// The WM_RBUTTONDBLCLK message is posted when the user double-clicks the right mouse button while the cursor is in the client area of a window. If the mouse is not captured, the message is posted to the window beneath the cursor. Otherwise, the message is posted to the window that has captured the mouse.
+    //    /// </summary>
+    //    RBUTTONDBLCLK = 0x0206,
+    //    /// <summary>
+    //    /// The WM_MBUTTONDOWN message is posted when the user presses the middle mouse button while the cursor is in the client area of a window. If the mouse is not captured, the message is posted to the window beneath the cursor. Otherwise, the message is posted to the window that has captured the mouse.
+    //    /// </summary>
+    //    MBUTTONDOWN = 0x0207,
+    //    /// <summary>
+    //    /// The WM_MBUTTONUP message is posted when the user releases the middle mouse button while the cursor is in the client area of a window. If the mouse is not captured, the message is posted to the window beneath the cursor. Otherwise, the message is posted to the window that has captured the mouse.
+    //    /// </summary>
+    //    MBUTTONUP = 0x0208,
+    //    /// <summary>
+    //    /// The WM_MBUTTONDBLCLK message is posted when the user double-clicks the middle mouse button while the cursor is in the client area of a window. If the mouse is not captured, the message is posted to the window beneath the cursor. Otherwise, the message is posted to the window that has captured the mouse.
+    //    /// </summary>
+    //    MBUTTONDBLCLK = 0x0209,
+    //    /// <summary>
+    //    /// The WM_MOUSEWHEEL message is sent to the focus window when the mouse wheel is rotated. The DefWindowProc function propagates the message to the window's parent. There should be no internal forwarding of the message, since DefWindowProc propagates it up the parent chain until it finds a window that processes it.
+    //    /// </summary>
+    //    MOUSEWHEEL = 0x020A,
+    //    /// <summary>
+    //    /// The WM_XBUTTONDOWN message is posted when the user presses the first or second X button while the cursor is in the client area of a window. If the mouse is not captured, the message is posted to the window beneath the cursor. Otherwise, the message is posted to the window that has captured the mouse.
+    //    /// </summary>
+    //    XBUTTONDOWN = 0x020B,
+    //    /// <summary>
+    //    /// The WM_XBUTTONUP message is posted when the user releases the first or second X button while the cursor is in the client area of a window. If the mouse is not captured, the message is posted to the window beneath the cursor. Otherwise, the message is posted to the window that has captured the mouse.
+    //    /// </summary>
+    //    XBUTTONUP = 0x020C,
+    //    /// <summary>
+    //    /// The WM_XBUTTONDBLCLK message is posted when the user double-clicks the first or second X button while the cursor is in the client area of a window. If the mouse is not captured, the message is posted to the window beneath the cursor. Otherwise, the message is posted to the window that has captured the mouse.
+    //    /// </summary>
+    //    XBUTTONDBLCLK = 0x020D,
+    //    /// <summary>
+    //    /// The WM_MOUSEHWHEEL message is sent to the focus window when the mouse's horizontal scroll wheel is tilted or rotated. The DefWindowProc function propagates the message to the window's parent. There should be no internal forwarding of the message, since DefWindowProc propagates it up the parent chain until it finds a window that processes it.
+    //    /// </summary>
+    //    MOUSEHWHEEL = 0x020E,
+    //    /// <summary>
+    //    /// Use WM_MOUSELAST to specify the last mouse message. Used with PeekMessage() Function.
+    //    /// </summary>
+    //    MOUSELAST = 0x020E,
+    //    /// <summary>
+    //    /// The WM_PARENTNOTIFY message is sent to the parent of a child window when the child window is created or destroyed, or when the user clicks a mouse button while the cursor is over the child window. When the child window is being created, the system sends WM_PARENTNOTIFY just before the CreateWindow or CreateWindowEx function that creates the window returns. When the child window is being destroyed, the system sends the message before any processing to destroy the window takes place.
+    //    /// </summary>
+    //    PARENTNOTIFY = 0x0210,
+    //    /// <summary>
+    //    /// The WM_ENTERMENULOOP message informs an application's main window procedure that a menu modal loop has been entered.
+    //    /// </summary>
+    //    ENTERMENULOOP = 0x0211,
+    //    /// <summary>
+    //    /// The WM_EXITMENULOOP message informs an application's main window procedure that a menu modal loop has been exited.
+    //    /// </summary>
+    //    EXITMENULOOP = 0x0212,
+    //    /// <summary>
+    //    /// The WM_NEXTMENU message is sent to an application when the right or left arrow key is used to switch between the menu bar and the system menu.
+    //    /// </summary>
+    //    NEXTMENU = 0x0213,
+    //    /// <summary>
+    //    /// The WM_SIZING message is sent to a window that the user is resizing. By processing this message, an application can monitor the size and position of the drag rectangle and, if needed, change its size or position.
+    //    /// </summary>
+    //    SIZING = 0x0214,
+    //    /// <summary>
+    //    /// The WM_CAPTURECHANGED message is sent to the window that is losing the mouse capture.
+    //    /// </summary>
+    //    CAPTURECHANGED = 0x0215,
+    //    /// <summary>
+    //    /// The WM_MOVING message is sent to a window that the user is moving. By processing this message, an application can monitor the position of the drag rectangle and, if needed, change its position.
+    //    /// </summary>
+    //    MOVING = 0x0216,
+    //    /// <summary>
+    //    /// Notifies applications that a power-management event has occurred.
+    //    /// </summary>
+    //    POWERBROADCAST = 0x0218,
+    //    /// <summary>
+    //    /// Notifies an application of a change to the hardware configuration of a device or the computer.
+    //    /// </summary>
+    //    DEVICECHANGE = 0x0219,
+    //    /// <summary>
+    //    /// An application sends the WM_MDICREATE message to a multiple-document interface (MDI) client window to create an MDI child window.
+    //    /// </summary>
+    //    MDICREATE = 0x0220,
+    //    /// <summary>
+    //    /// An application sends the WM_MDIDESTROY message to a multiple-document interface (MDI) client window to close an MDI child window.
+    //    /// </summary>
+    //    MDIDESTROY = 0x0221,
+    //    /// <summary>
+    //    /// An application sends the WM_MDIACTIVATE message to a multiple-document interface (MDI) client window to instruct the client window to activate a different MDI child window.
+    //    /// </summary>
+    //    MDIACTIVATE = 0x0222,
+    //    /// <summary>
+    //    /// An application sends the WM_MDIRESTORE message to a multiple-document interface (MDI) client window to restore an MDI child window from maximized or minimized size.
+    //    /// </summary>
+    //    MDIRESTORE = 0x0223,
+    //    /// <summary>
+    //    /// An application sends the WM_MDINEXT message to a multiple-document interface (MDI) client window to activate the next or previous child window.
+    //    /// </summary>
+    //    MDINEXT = 0x0224,
+    //    /// <summary>
+    //    /// An application sends the WM_MDIMAXIMIZE message to a multiple-document interface (MDI) client window to maximize an MDI child window. The system resizes the child window to make its client area fill the client window. The system places the child window's window menu icon in the rightmost position of the frame window's menu bar, and places the child window's restore icon in the leftmost position. The system also appends the title bar text of the child window to that of the frame window.
+    //    /// </summary>
+    //    MDIMAXIMIZE = 0x0225,
+    //    /// <summary>
+    //    /// An application sends the WM_MDITILE message to a multiple-document interface (MDI) client window to arrange all of its MDI child windows in a tile format.
+    //    /// </summary>
+    //    MDITILE = 0x0226,
+    //    /// <summary>
+    //    /// An application sends the WM_MDICASCADE message to a multiple-document interface (MDI) client window to arrange all its child windows in a cascade format.
+    //    /// </summary>
+    //    MDICASCADE = 0x0227,
+    //    /// <summary>
+    //    /// An application sends the WM_MDIICONARRANGE message to a multiple-document interface (MDI) client window to arrange all minimized MDI child windows. It does not affect child windows that are not minimized.
+    //    /// </summary>
+    //    MDIICONARRANGE = 0x0228,
+    //    /// <summary>
+    //    /// An application sends the WM_MDIGETACTIVE message to a multiple-document interface (MDI) client window to retrieve the handle to the active MDI child window.
+    //    /// </summary>
+    //    MDIGETACTIVE = 0x0229,
+    //    /// <summary>
+    //    /// An application sends the WM_MDISETMENU message to a multiple-document interface (MDI) client window to replace the entire menu of an MDI frame window, to replace the window menu of the frame window, or both.
+    //    /// </summary>
+    //    MDISETMENU = 0x0230,
+    //    /// <summary>
+    //    /// The WM_ENTERSIZEMOVE message is sent one time to a window after it enters the moving or sizing modal loop. The window enters the moving or sizing modal loop when the user clicks the window's title bar or sizing border, or when the window passes the WM_SYSCOMMAND message to the DefWindowProc function and the wParam parameter of the message specifies the SC_MOVE or SC_SIZE value. The operation is complete when DefWindowProc returns.
+    //    /// The system sends the WM_ENTERSIZEMOVE message regardless of whether the dragging of full windows is enabled.
+    //    /// </summary>
+    //    ENTERSIZEMOVE = 0x0231,
+    //    /// <summary>
+    //    /// The WM_EXITSIZEMOVE message is sent one time to a window, after it has exited the moving or sizing modal loop. The window enters the moving or sizing modal loop when the user clicks the window's title bar or sizing border, or when the window passes the WM_SYSCOMMAND message to the DefWindowProc function and the wParam parameter of the message specifies the SC_MOVE or SC_SIZE value. The operation is complete when DefWindowProc returns.
+    //    /// </summary>
+    //    EXITSIZEMOVE = 0x0232,
+    //    /// <summary>
+    //    /// Sent when the user drops a file on the window of an application that has registered itself as a recipient of dropped files.
+    //    /// </summary>
+    //    DROPFILES = 0x0233,
+    //    /// <summary>
+    //    /// An application sends the WM_MDIREFRESHMENU message to a multiple-document interface (MDI) client window to refresh the window menu of the MDI frame window.
+    //    /// </summary>
+    //    MDIREFRESHMENU = 0x0234,
+    //    /// <summary>
+    //    /// Sent to an application when a window is activated. A window receives this message through its WindowProc function.
+    //    /// </summary>
+    //    IME_SETCONTEXT = 0x0281,
+    //    /// <summary>
+    //    /// Sent to an application to notify it of changes to the IME window. A window receives this message through its WindowProc function.
+    //    /// </summary>
+    //    IME_NOTIFY = 0x0282,
+    //    /// <summary>
+    //    /// Sent by an application to direct the IME window to carry out the requested command. The application uses this message to control the IME window that it has created. To send this message, the application calls the SendMessage function with the following parameters.
+    //    /// </summary>
+    //    IME_CONTROL = 0x0283,
+    //    /// <summary>
+    //    /// Sent to an application when the IME window finds no space to extend the area for the composition window. A window receives this message through its WindowProc function.
+    //    /// </summary>
+    //    IME_COMPOSITIONFULL = 0x0284,
+    //    /// <summary>
+    //    /// Sent to an application when the operating system is about to change the current IME. A window receives this message through its WindowProc function.
+    //    /// </summary>
+    //    IME_SELECT = 0x0285,
+    //    /// <summary>
+    //    /// Sent to an application when the IME gets a character of the conversion result. A window receives this message through its WindowProc function.
+    //    /// </summary>
+    //    IME_CHAR = 0x0286,
+    //    /// <summary>
+    //    /// Sent to an application to provide commands and request information. A window receives this message through its WindowProc function.
+    //    /// </summary>
+    //    IME_REQUEST = 0x0288,
+    //    /// <summary>
+    //    /// Sent to an application by the IME to notify the application of a key press and to keep message order. A window receives this message through its WindowProc function.
+    //    /// </summary>
+    //    IME_KEYDOWN = 0x0290,
+    //    /// <summary>
+    //    /// Sent to an application by the IME to notify the application of a key release and to keep message order. A window receives this message through its WindowProc function.
+    //    /// </summary>
+    //    IME_KEYUP = 0x0291,
+    //    /// <summary>
+    //    /// The WM_MOUSEHOVER message is posted to a window when the cursor hovers over the client area of the window for the period of time specified in a prior call to TrackMouseEvent.
+    //    /// </summary>
+    //    MOUSEHOVER = 0x02A1,
+    //    /// <summary>
+    //    /// The WM_MOUSELEAVE message is posted to a window when the cursor leaves the client area of the window specified in a prior call to TrackMouseEvent.
+    //    /// </summary>
+    //    MOUSELEAVE = 0x02A3,
+    //    /// <summary>
+    //    /// The WM_NCMOUSEHOVER message is posted to a window when the cursor hovers over the nonclient area of the window for the period of time specified in a prior call to TrackMouseEvent.
+    //    /// </summary>
+    //    NCMOUSEHOVER = 0x02A0,
+    //    /// <summary>
+    //    /// The WM_NCMOUSELEAVE message is posted to a window when the cursor leaves the nonclient area of the window specified in a prior call to TrackMouseEvent.
+    //    /// </summary>
+    //    NCMOUSELEAVE = 0x02A2,
+    //    /// <summary>
+    //    /// The WM_WTSSESSION_CHANGE message notifies applications of changes in session state.
+    //    /// </summary>
+    //    WTSSESSION_CHANGE = 0x02B1,
+    //    TABLET_FIRST = 0x02c0,
+    //    TABLET_LAST = 0x02df,
+    //    /// <summary>
+    //    /// An application sends a WM_CUT message to an edit control or combo box to delete (cut) the current selection, if any, in the edit control and copy the deleted text to the clipboard in CF_TEXT format.
+    //    /// </summary>
+    //    CUT = 0x0300,
+    //    /// <summary>
+    //    /// An application sends the WM_COPY message to an edit control or combo box to copy the current selection to the clipboard in CF_TEXT format.
+    //    /// </summary>
+    //    COPY = 0x0301,
+    //    /// <summary>
+    //    /// An application sends a WM_PASTE message to an edit control or combo box to copy the current content of the clipboard to the edit control at the current caret position. Data is inserted only if the clipboard contains data in CF_TEXT format.
+    //    /// </summary>
+    //    PASTE = 0x0302,
+    //    /// <summary>
+    //    /// An application sends a WM_CLEAR message to an edit control or combo box to delete (clear) the current selection, if any, from the edit control.
+    //    /// </summary>
+    //    CLEAR = 0x0303,
+    //    /// <summary>
+    //    /// An application sends a WM_UNDO message to an edit control to undo the last operation. When this message is sent to an edit control, the previously deleted text is restored or the previously added text is deleted.
+    //    /// </summary>
+    //    UNDO = 0x0304,
+    //    /// <summary>
+    //    /// The WM_RENDERFORMAT message is sent to the clipboard owner if it has delayed rendering a specific clipboard format and if an application has requested data in that format. The clipboard owner must render data in the specified format and place it on the clipboard by calling the SetClipboardData function.
+    //    /// </summary>
+    //    RENDERFORMAT = 0x0305,
+    //    /// <summary>
+    //    /// The WM_RENDERALLFORMATS message is sent to the clipboard owner before it is destroyed, if the clipboard owner has delayed rendering one or more clipboard formats. For the content of the clipboard to remain available to other applications, the clipboard owner must render data in all the formats it is capable of generating, and place the data on the clipboard by calling the SetClipboardData function.
+    //    /// </summary>
+    //    RENDERALLFORMATS = 0x0306,
+    //    /// <summary>
+    //    /// The WM_DESTROYCLIPBOARD message is sent to the clipboard owner when a call to the EmptyClipboard function empties the clipboard.
+    //    /// </summary>
+    //    DESTROYCLIPBOARD = 0x0307,
+    //    /// <summary>
+    //    /// The WM_DRAWCLIPBOARD message is sent to the first window in the clipboard viewer chain when the content of the clipboard changes. This enables a clipboard viewer window to display the new content of the clipboard.
+    //    /// </summary>
+    //    DRAWCLIPBOARD = 0x0308,
+    //    /// <summary>
+    //    /// The WM_PAINTCLIPBOARD message is sent to the clipboard owner by a clipboard viewer window when the clipboard contains data in the CF_OWNERDISPLAY format and the clipboard viewer's client area needs repainting.
+    //    /// </summary>
+    //    PAINTCLIPBOARD = 0x0309,
+    //    /// <summary>
+    //    /// The WM_VSCROLLCLIPBOARD message is sent to the clipboard owner by a clipboard viewer window when the clipboard contains data in the CF_OWNERDISPLAY format and an event occurs in the clipboard viewer's vertical scroll bar. The owner should scroll the clipboard image and update the scroll bar values.
+    //    /// </summary>
+    //    VSCROLLCLIPBOARD = 0x030A,
+    //    /// <summary>
+    //    /// The WM_SIZECLIPBOARD message is sent to the clipboard owner by a clipboard viewer window when the clipboard contains data in the CF_OWNERDISPLAY format and the clipboard viewer's client area has changed size.
+    //    /// </summary>
+    //    SIZECLIPBOARD = 0x030B,
+    //    /// <summary>
+    //    /// The WM_ASKCBFORMATNAME message is sent to the clipboard owner by a clipboard viewer window to request the name of a CF_OWNERDISPLAY clipboard format.
+    //    /// </summary>
+    //    ASKCBFORMATNAME = 0x030C,
+    //    /// <summary>
+    //    /// The WM_CHANGECBCHAIN message is sent to the first window in the clipboard viewer chain when a window is being removed from the chain.
+    //    /// </summary>
+    //    CHANGECBCHAIN = 0x030D,
+    //    /// <summary>
+    //    /// The WM_HSCROLLCLIPBOARD message is sent to the clipboard owner by a clipboard viewer window. This occurs when the clipboard contains data in the CF_OWNERDISPLAY format and an event occurs in the clipboard viewer's horizontal scroll bar. The owner should scroll the clipboard image and update the scroll bar values.
+    //    /// </summary>
+    //    HSCROLLCLIPBOARD = 0x030E,
+    //    /// <summary>
+    //    /// This message informs a window that it is about to receive the keyboard focus, giving the window the opportunity to realize its logical palette when it receives the focus.
+    //    /// </summary>
+    //    QUERYNEWPALETTE = 0x030F,
+    //    /// <summary>
+    //    /// The WM_PALETTEISCHANGING message informs applications that an application is going to realize its logical palette.
+    //    /// </summary>
+    //    PALETTEISCHANGING = 0x0310,
+    //    /// <summary>
+    //    /// This message is sent by the OS to all top-level and overlapped windows after the window with the keyboard focus realizes its logical palette.
+    //    /// This message enables windows that do not have the keyboard focus to realize their logical palettes and update their client areas.
+    //    /// </summary>
+    //    PALETTECHANGED = 0x0311,
+    //    /// <summary>
+    //    /// The WM_HOTKEY message is posted when the user presses a hot key registered by the RegisterHotKey function. The message is placed at the top of the message queue associated with the thread that registered the hot key.
+    //    /// </summary>
+    //    HOTKEY = 0x0312,
+    //    /// <summary>
+    //    /// The WM_PRINT message is sent to a window to request that it draw itself in the specified device context, most commonly in a printer device context.
+    //    /// </summary>
+    //    PRINT = 0x0317,
+    //    /// <summary>
+    //    /// The WM_PRINTCLIENT message is sent to a window to request that it draw its client area in the specified device context, most commonly in a printer device context.
+    //    /// </summary>
+    //    PRINTCLIENT = 0x0318,
+    //    /// <summary>
+    //    /// The WM_APPCOMMAND message notifies a window that the user generated an application command event, for example, by clicking an application command button using the mouse or typing an application command key on the keyboard.
+    //    /// </summary>
+    //    APPCOMMAND = 0x0319,
+    //    /// <summary>
+    //    /// The WM_THEMECHANGED message is broadcast to every window following a theme change event. Examples of theme change events are the activation of a theme, the deactivation of a theme, or a transition from one theme to another.
+    //    /// </summary>
+    //    THEMECHANGED = 0x031A,
+    //    /// <summary>
+    //    /// Sent when the contents of the clipboard have changed.
+    //    /// </summary>
+    //    CLIPBOARDUPDATE = 0x031D,
+    //    /// <summary>
+    //    /// The system will send a window the WM_DWMCOMPOSITIONCHANGED message to indicate that the availability of desktop composition has changed.
+    //    /// </summary>
+    //    DWMCOMPOSITIONCHANGED = 0x031E,
+    //    /// <summary>
+    //    /// WM_DWMNCRENDERINGCHANGED is called when the non-client area rendering status of a window has changed. Only windows that have set the flag DWM_BLURBEHIND.fTransitionOnMaximized to true will get this message.
+    //    /// </summary>
+    //    DWMNCRENDERINGCHANGED = 0x031F,
+    //    /// <summary>
+    //    /// Sent to all top-level windows when the colorization color has changed.
+    //    /// </summary>
+    //    DWMCOLORIZATIONCOLORCHANGED = 0x0320,
+    //    /// <summary>
+    //    /// WM_DWMWINDOWMAXIMIZEDCHANGE will let you know when a DWM composed window is maximized. You also have to register for this message as well. You'd have other windowd go opaque when this message is sent.
+    //    /// </summary>
+    //    DWMWINDOWMAXIMIZEDCHANGE = 0x0321,
+    //    /// <summary>
+    //    /// Sent to request extended title bar information. A window receives this message through its WindowProc function.
+    //    /// </summary>
+    //    GETTITLEBARINFOEX = 0x033F,
+    //    HANDHELDFIRST = 0x0358,
+    //    HANDHELDLAST = 0x035F,
+    //    AFXFIRST = 0x0360,
+    //    AFXLAST = 0x037F,
+    //    PENWINFIRST = 0x0380,
+    //    PENWINLAST = 0x038F,
+    //    /// <summary>
+    //    /// The WM_APP constant is used by applications to help define private messages, usually of the form WM_APP+X, where X is an integer value.
+    //    /// </summary>
+    //    APP = 0x8000,
+    //    /// <summary>
+    //    /// The WM_USER constant is used by applications to help define private messages for use by private window classes, usually of the form WM_USER+X, where X is an integer value.
+    //    /// </summary>
+    //    USER = 0x0400,
+
+    //    /// <summary>
+    //    /// An application sends the WM_CPL_LAUNCH message to Windows Control Panel to request that a Control Panel application be started.
+    //    /// </summary>
+    //    CPL_LAUNCH = USER + 0x1000,
+    //    /// <summary>
+    //    /// The WM_CPL_LAUNCHED message is sent when a Control Panel application, started by the WM_CPL_LAUNCH message, has closed. The WM_CPL_LAUNCHED message is sent to the window identified by the wParam parameter of the WM_CPL_LAUNCH message that started the application.
+    //    /// </summary>
+    //    CPL_LAUNCHED = USER + 0x1001,
+    //    /// <summary>
+    //    /// WM_SYSTIMER is a well-known yet still undocumented message. Windows uses WM_SYSTIMER for internal actions like scrolling.
+    //    /// </summary>
+    //    SYSTIMER = 0x118
+
+    //}
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/ScrollBarImplementation.cs b/PROMS/DotNetBar Source Code/Controls/ScrollBarImplementation.cs
new file mode 100644
index 00000000..bf090bdf
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/ScrollBarImplementation.cs	
@@ -0,0 +1,614 @@
+using System;
+using System.Windows.Forms;
+using System.Text;
+using DevComponents.DotNetBar.ScrollBar;
+using System.Drawing;
+using DevComponents.DotNetBar.Rendering;
+using System.Runtime.InteropServices;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    internal class ScrollBarImplementation: IDisposable
+    {
+        #region Private Variables
+        private System.Windows.Forms.ScrollBar m_ParentScrollBar = null;
+        private ScrollBarCore m_ScrollBarCore = null;
+        private bool m_FirstPaint = true;
+        private int m_MouseDownTrackOffset = 0;
+        private Timer m_PaintTimer = null;
+        private bool m_IsVScrollBar = false;
+        private IScrollBarExtender m_ParentScrollBarWndProc = null;
+        private bool m_UseLockWindowUpdate = false;
+        #endregion
+
+        #region Constructor
+        public ScrollBarImplementation(System.Windows.Forms.ScrollBar sb)
+        {
+            m_ParentScrollBar = sb;
+            m_ParentScrollBarWndProc = (IScrollBarExtender)m_ParentScrollBar;
+            m_IsVScrollBar = m_ParentScrollBar is VScrollBar;
+
+            m_PaintTimer = new Timer();
+            m_PaintTimer.Interval = 50;
+            m_PaintTimer.Tick += new EventHandler(PaintTimerTick);
+
+            m_ScrollBarCore = new ScrollBarCore(m_ParentScrollBar, true);
+            //m_ScrollBarCore.IsAppScrollBarStyle = false;
+            if (m_ParentScrollBar is HScrollBar)
+                m_ScrollBarCore.Orientation = eOrientation.Horizontal;
+            else
+                m_ScrollBarCore.Orientation = eOrientation.Vertical;
+            m_ScrollBarCore.Minimum = m_ParentScrollBar.Minimum;
+            m_ScrollBarCore.Maximum = m_ParentScrollBar.Maximum;
+            m_ScrollBarCore.Value = m_ParentScrollBar.Value;
+        }
+        #endregion
+
+        #region Internal Implementation
+        internal void OnHandleCreated()
+        {
+            Themes.SetWindowTheme(m_ParentScrollBar.Handle, "", "");
+            UpdateScrollValues();
+        }
+
+        internal bool WndProc(ref Message m)
+        {
+            if (m.Msg == (int)WinApi.WindowsMessages.SBM_SETSCROLLINFO || m.Msg == 0x2114 || m.Msg == 0x2115 || m.Msg == (int)WinApi.WindowsMessages.WM_MOUSEMOVE)
+            {
+                CallBaseWndProc(ref m);
+                SendDelayPaintMessage();
+                return false;
+            }
+            else if (m.Msg == (int)WinApi.WindowsMessages.WM_SIZE)
+            {
+                CallBaseWndProc(ref m);
+                m_FirstPaint = true;
+                SendDelayPaintMessage();
+                return false;
+            }
+            else if (m.Msg == (int)WinApi.WindowsMessages.WM_ERASEBKGND)
+            {
+                //PaintUsingDC();
+                //m.Result = new IntPtr(1);
+                return false;
+            }
+            else if (m.Msg == (int)WinApi.WindowsMessages.WM_LBUTTONDOWN)
+            {
+                Point p = new Point(WinApi.LOWORD(m.LParam), WinApi.HIWORD(m.LParam));
+                InternalMouseDown(new MouseEventArgs(GetMouseButton(m.WParam.ToInt32()), 0, p.X, p.Y, 0));
+                return false;
+            }
+            else if (m.Msg == (int)WinApi.WindowsMessages.WM_LBUTTONUP)
+            {
+                Point p = new Point(WinApi.LOWORD(m.LParam), WinApi.HIWORD(m.LParam));
+                InternalMouseUp(new MouseEventArgs(GetMouseButton(m.WParam.ToInt32()), 0, p.X, p.Y, 0));
+                return false;
+            }
+            else if (m.Msg == (int)WinApi.WindowsMessages.WM_LBUTTONDBLCLK)
+            {
+                Point p = new Point(WinApi.LOWORD(m.LParam), WinApi.HIWORD(m.LParam));
+                InternalMouseDoubleClick(new MouseEventArgs(GetMouseButton(m.WParam.ToInt32()), 0, p.X, p.Y, 0));
+                return false;
+            }
+            else if (m.Msg == NativeFunctions.WM_USER + 7)
+            {
+                PaintUsingDC();
+            }
+            else if (m.Msg == (int)WinApi.WindowsMessages.WM_SYSTIMER)
+            {
+                if (m_ScrollBarCore.MouseOverPart == ScrollBarCore.eScrollPart.Track && Control.MouseButtons == MouseButtons.Left)
+                {
+                    Point p = m_ParentScrollBar.PointToClient(Control.MousePosition);
+                    OnMouseMove(new MouseEventArgs(Control.MouseButtons, 0, p.X, p.Y, 0));
+                }
+            }
+            else if (m.Msg == (int)WinApi.WindowsMessages.WM_CAPTURECHANGED)
+            {
+                // Recapture the mouse...
+                if (m.LParam == IntPtr.Zero && Control.MouseButtons == MouseButtons.Left && m_ScrollBarCore.MouseOverPart == ScrollBarCore.eScrollPart.Track)
+                {
+                    m_ParentScrollBar.Capture = true;
+                }
+            }
+
+            if (m.Msg == (int)WinApi.WindowsMessages.WM_PAINT)
+            {
+                if (m_FirstPaint)
+                {
+                    // Call to base actually updates values returned by GetScrollBarInfo
+                    CallBaseWndProc(ref m);
+                    // Repaint the control once that is done
+                    SendDelayPaintMessage();
+                    m_FirstPaint = false;
+                }
+                WinApi.PAINTSTRUCT ps = new WinApi.PAINTSTRUCT();
+                IntPtr hdc = WinApi.BeginPaint(m.HWnd, ref ps);
+                try
+                {
+                    Graphics g = Graphics.FromHdc(hdc);
+                    try
+                    {
+                        PaintInternal(g, hdc);
+                    }
+                    finally
+                    {
+                        g.Dispose();
+                    }
+                }
+                finally
+                {
+                    WinApi.EndPaint(m.HWnd, ref ps);
+                }
+                return false;
+            }
+            return true;
+        }
+
+        private void CallBaseWndProc(ref Message m)
+        {
+            m_ParentScrollBarWndProc.CallBaseWndProc(ref m);
+        }
+
+        private void SendDelayPaintMessage()
+        {
+            m_PaintTimer.Start();
+        }
+
+        void PaintTimerTick(object sender, EventArgs e)
+        {
+            m_PaintTimer.Stop();
+            PaintUsingDC();
+        }
+
+        private void InternalMouseDoubleClick(MouseEventArgs me)
+        {
+            PerformThumbClick(me.X, me.Y);
+        }
+
+        private void PerformThumbClick(int mouseX, int mouseY)
+        {
+            if (m_ScrollBarCore.MouseOverPart == ScrollBarCore.eScrollPart.ThumbDecrease)
+                this.SetValue(Math.Max(m_ParentScrollBar.Value - m_ParentScrollBar.SmallChange, m_ParentScrollBar.Minimum), ScrollEventType.SmallDecrement);
+            else if (m_ScrollBarCore.MouseOverPart == ScrollBarCore.eScrollPart.ThumbIncrease)
+                this.SetValue(Math.Min(m_ParentScrollBar.Value + m_ParentScrollBar.SmallChange, m_ParentScrollBar.Maximum), ScrollEventType.SmallIncrement);
+            else if (m_ScrollBarCore.MouseOverPart == ScrollBarCore.eScrollPart.Control)
+            {
+                if (this.IsVScroll)
+                {
+                    if (mouseY < m_ScrollBarCore.TrackRectangle.Y)
+                        this.SetValue(Math.Max(m_ParentScrollBar.Value - m_ParentScrollBar.LargeChange, m_ParentScrollBar.Minimum), ScrollEventType.LargeDecrement);
+                    else if (mouseY > m_ScrollBarCore.TrackRectangle.Bottom)
+                        this.SetValue(Math.Min(m_ParentScrollBar.Value + m_ParentScrollBar.LargeChange, m_ParentScrollBar.Maximum), ScrollEventType.LargeIncrement);
+                }
+                else
+                {
+                    if (mouseX < m_ScrollBarCore.TrackRectangle.X)
+                        this.SetValue(Math.Max(m_ParentScrollBar.Value - m_ParentScrollBar.LargeChange, m_ParentScrollBar.Minimum), ScrollEventType.LargeDecrement);
+                    else if (mouseX > m_ScrollBarCore.TrackRectangle.Right)
+                        this.SetValue(Math.Min(m_ParentScrollBar.Value + m_ParentScrollBar.LargeChange, m_ParentScrollBar.Maximum), ScrollEventType.LargeIncrement);
+                }
+            }
+        }
+
+        private void SetValue(int newValue, ScrollEventType type)
+        {
+            //FieldInfo fi = typeof(System.Windows.Forms.ScrollBar).GetField("value", BindingFlags.NonPublic | BindingFlags.Instance);
+            //if (fi != null)
+            //{
+            //    fi.SetValue(this, newValue);
+            //    UpdateSystemScrollInfo();
+            //}
+            //else
+
+            if (m_ParentScrollBar.Value == newValue) return;
+
+            if (m_UseLockWindowUpdate && m_ParentScrollBar.Parent != null)
+                NativeFunctions.LockWindowUpdate(m_ParentScrollBar.Parent.Handle);
+            else
+                NativeFunctions.SendMessage(m_ParentScrollBar.Handle, NativeFunctions.WM_SETREDRAW, 0, 0);
+
+            m_ParentScrollBarWndProc.SetValue(newValue, type);
+            if (m_UseLockWindowUpdate && m_ParentScrollBar.Parent != null)
+                NativeFunctions.LockWindowUpdate(IntPtr.Zero);
+            else
+                NativeFunctions.SendMessage(m_ParentScrollBar.Handle, NativeFunctions.WM_SETREDRAW, 1, 0);
+
+            if (m_ParentScrollBar.Parent is DataGridView && type == ScrollEventType.ThumbTrack)
+            {
+                if (m_UseLockWindowUpdate)
+                    m_ParentScrollBar.Parent.Refresh();
+                else
+                {
+                    Point p = m_ParentScrollBar.PointToClient(Control.MousePosition);
+                    if (!m_ParentScrollBar.ClientRectangle.Contains(p)) 
+                        m_ParentScrollBar.Parent.Refresh();
+                }
+            }
+
+            PaintUsingDC();
+        }
+
+        //private void UpdateSystemScrollInfo()
+        //{
+        //    if (this.IsHandleCreated && this.Enabled)
+        //    {
+        //        WinApi.SCROLLINFO si = new WinApi.SCROLLINFO();
+        //        si.cbSize = Marshal.SizeOf(typeof(WinApi.SCROLLINFO));
+        //        si.fMask = 0x17;
+        //        si.nMin = this.Minimum;
+        //        si.nMax = this.Maximum;
+        //        si.nPage = this.LargeChange;
+        //        if (this.RightToLeft == RightToLeft.Yes)
+        //        {
+        //            MethodInfo mi = typeof(System.Windows.Forms.ScrollBar).GetMethod("ReflectPosition", BindingFlags.NonPublic | BindingFlags.Instance);
+        //            if(mi!=null)
+        //                si.nPos = (int)mi.Invoke(this, new object[]{this.Value});
+        //            //= this.ReflectPosition(this.value);
+        //        }
+        //        else
+        //        {
+        //            si.nPos = this.Value;
+        //        }
+        //        si.nTrackPos = 0;
+        //        WinApi.SetScrollInfo(new HandleRef(this, this.Handle), 2, ref si, false);
+        //    }
+        //}
+
+        private void InternalMouseUp(MouseEventArgs mouseEventArgs)
+        {
+            StopAutoScrollTimer();
+            m_ScrollBarCore.MouseUp(mouseEventArgs);
+            m_ParentScrollBar.Invalidate();
+            m_MouseDownTrackOffset = 0;
+
+            if (m_ParentScrollBar.Capture)
+                m_ParentScrollBar.Capture = false;
+        }
+
+        private void InternalMouseDown(MouseEventArgs me)
+        {
+            m_MouseDownTrackOffset = 0;
+            m_ScrollBarCore.MouseDown(me);
+            if (m_ScrollBarCore.MouseOverPart != ScrollBarCore.eScrollPart.Track && m_ScrollBarCore.MouseOverPart != ScrollBarCore.eScrollPart.None)
+            {
+                PerformThumbClick(me.X, me.Y);
+                StartAutoScrollTimer();
+            }
+            else if (m_ScrollBarCore.MouseOverPart == ScrollBarCore.eScrollPart.Track)
+            {
+                if (IsVScroll)
+                    m_MouseDownTrackOffset = me.Y - m_ScrollBarCore.TrackRectangle.Y;
+                else
+                    m_MouseDownTrackOffset = me.X - m_ScrollBarCore.TrackRectangle.X;
+            }
+            PaintUsingDC();
+        }
+
+        private Timer m_Timer = null;
+        private void StartAutoScrollTimer()
+        {
+            if (m_Timer == null)
+            {
+                m_Timer = new Timer();
+                m_Timer.Interval = 150;
+                m_Timer.Tick += new EventHandler(TimerScrollTick);
+            }
+            m_Timer.Start();
+        }
+
+        private void TimerScrollTick(object sender, EventArgs e)
+        {
+            Point p = m_ParentScrollBar.PointToClient(Control.MousePosition);
+            PerformThumbClick(p.X, p.Y);
+        }
+
+        private void StopAutoScrollTimer()
+        {
+            if (m_Timer != null)
+            {
+                m_Timer.Stop();
+                m_Timer.Dispose();
+                m_Timer = null;
+            }
+        }
+
+        private MouseButtons GetMouseButton(int wParam)
+        {
+            MouseButtons mb = MouseButtons.None;
+            if ((wParam & (int)WinApi.MouseKeyState.MK_LBUTTON) != 0)
+                mb |= MouseButtons.Left;
+            if ((wParam & (int)WinApi.MouseKeyState.MK_MBUTTON) != 0)
+                mb |= MouseButtons.Middle;
+            if ((wParam & (int)WinApi.MouseKeyState.MK_RBUTTON) != 0)
+                mb |= MouseButtons.Right;
+            if ((wParam & (int)WinApi.MouseKeyState.MK_XBUTTON1) != 0)
+                mb |= MouseButtons.XButton1;
+            if ((wParam & (int)WinApi.MouseKeyState.MK_XBUTTON2) != 0)
+                mb |= MouseButtons.XButton2;
+
+            return mb;
+        }
+
+        private void PaintUsingDC()
+        {
+            IntPtr hdc = WinApi.GetWindowDC(m_ParentScrollBar.Handle);
+            try
+            {
+                Graphics g = Graphics.FromHdc(hdc);
+                try
+                {
+                    PaintInternal(g, hdc);
+                }
+                finally
+                {
+                    g.Dispose();
+                }
+            }
+            finally
+            {
+                WinApi.ReleaseDC(m_ParentScrollBar.Handle, hdc);
+            }
+        }
+
+        private void PaintInternal(Graphics g, IntPtr hdc)
+        {
+            UpdateScrollValues();
+            using (BufferedBitmap bmp = new BufferedBitmap(g, new Rectangle(0, 0, m_ParentScrollBar.Width, m_ParentScrollBar.Height)))
+            {
+                m_ScrollBarCore.Paint(GetItemPaintArgs(bmp.Graphics));
+                bmp.Render(g);
+            }
+        }
+
+        private ItemPaintArgs GetItemPaintArgs(Graphics g)
+        {
+            ItemPaintArgs pa = new ItemPaintArgs(m_ParentScrollBar as IOwner, m_ParentScrollBar, g, GetColorScheme());
+            pa.Renderer = this.GetRenderer();
+            pa.DesignerSelection = false;
+            pa.GlassEnabled = false;
+            return pa;
+        }
+
+        private ColorScheme m_ColorScheme = null;
+        /// <summary>
+        /// Returns the color scheme used by control. Color scheme for Office2007 style will be retrived from the current renderer instead of
+        /// local color scheme referenced by ColorScheme property.
+        /// </summary>
+        /// <returns>An instance of ColorScheme object.</returns>
+        protected virtual ColorScheme GetColorScheme()
+        {
+            BaseRenderer r = GetRenderer();
+            if (r is Office2007Renderer)
+                return ((Office2007Renderer)r).ColorTable.LegacyColors;
+            if (m_ColorScheme == null)
+                m_ColorScheme = new ColorScheme(eDotNetBarStyle.Office2007);
+            return m_ColorScheme;
+        }
+
+        private Rendering.BaseRenderer m_DefaultRenderer = null;
+        private Rendering.BaseRenderer m_Renderer = null;
+        private eRenderMode m_RenderMode = eRenderMode.Global;
+        /// <summary>
+        /// Returns the renderer control will be rendered with.
+        /// </summary>
+        /// <returns>The current renderer.</returns>
+        public virtual Rendering.BaseRenderer GetRenderer()
+        {
+            if (m_RenderMode == eRenderMode.Global && Rendering.GlobalManager.Renderer != null)
+                return Rendering.GlobalManager.Renderer;
+            else if (m_RenderMode == eRenderMode.Custom && m_Renderer != null)
+                return m_Renderer;
+
+            if (m_DefaultRenderer == null)
+                m_DefaultRenderer = new Rendering.Office2007Renderer();
+
+            return m_DefaultRenderer;
+        }
+
+        /// <summary>
+        /// Gets or sets the redering mode used by control. Default value is eRenderMode.Global which means that static GlobalManager.Renderer is used. If set to Custom then Renderer property must
+        /// also be set to the custom renderer that will be used.
+        /// </summary>
+        public eRenderMode RenderMode
+        {
+            get { return m_RenderMode; }
+            set
+            {
+                if (m_RenderMode != value)
+                {
+                    m_RenderMode = value;
+                    m_ParentScrollBar.Invalidate(true);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the custom renderer used by the items on this control. RenderMode property must also be set to eRenderMode.Custom in order renderer
+        /// specified here to be used.
+        /// </summary>
+        public DevComponents.DotNetBar.Rendering.BaseRenderer Renderer
+        {
+            get
+            {
+                return m_Renderer;
+            }
+            set { m_Renderer = value; }
+        }
+
+        internal void OnMouseEnter(EventArgs e)
+        {
+            if (m_ParentScrollBar.Capture)
+                m_ParentScrollBar.Capture = false;
+        }
+
+        internal void OnMouseLeave(EventArgs e)
+        {
+            StopAutoScrollTimer();
+            if (m_ScrollBarCore.MouseOverPart != ScrollBarCore.eScrollPart.None && Control.MouseButtons == MouseButtons.Left)
+                m_ParentScrollBar.Capture = true;
+            if (m_ScrollBarCore.IsMouseDown && Control.MouseButtons == MouseButtons.None)
+            {
+                m_ScrollBarCore.MouseUp(new MouseEventArgs(MouseButtons.Left, 0, -10, -10, 0));
+                SendDelayPaintMessage();
+            }
+            else
+                m_ScrollBarCore.MouseLeave();
+        }
+
+        internal void OnMouseMove(MouseEventArgs e)
+        {
+            m_ScrollBarCore.MouseMove(e);
+            if (m_ScrollBarCore.MouseOverPart == ScrollBarCore.eScrollPart.Track && e.Button == MouseButtons.Left)
+            {
+                Point p = m_ParentScrollBar.PointToClient(Control.MousePosition);
+                SetValue(ValueFromMouseCoordinates(p), ScrollEventType.ThumbTrack);
+            }
+        }
+
+        private int ValueFromMouseCoordinates(Point p)
+        {
+            if (IsVScroll)
+            {
+                int trackY = p.Y - m_MouseDownTrackOffset;
+                trackY = Math.Max(trackY, m_ScrollBarCore.ThumbDecreaseRectangle.Bottom);
+                trackY = Math.Min(trackY, m_ScrollBarCore.ThumbIncreaseRectangle.Y - GetTrackSize());
+                trackY -= m_ScrollBarCore.ThumbDecreaseRectangle.Bottom;
+
+                int totalSize = GetAvailableTrackArea() - GetTrackSize();
+                return (int)((m_ParentScrollBar.Maximum - m_ParentScrollBar.Minimum) * ((float)trackY / (float)totalSize));
+            }
+            else
+            {
+                int trackX = p.X - m_MouseDownTrackOffset;
+                trackX = Math.Max(trackX, m_ScrollBarCore.ThumbDecreaseRectangle.Right);
+                trackX = Math.Min(trackX, m_ScrollBarCore.ThumbIncreaseRectangle.X - GetTrackSize());
+                trackX -= m_ScrollBarCore.ThumbDecreaseRectangle.Right;
+
+                int totalSize = GetAvailableTrackArea() - GetTrackSize();
+                return (int)((m_ParentScrollBar.Maximum - m_ParentScrollBar.Minimum) * ((float)trackX / (float)totalSize));
+            }
+        }
+
+        private int GetTrackSize()
+        {
+            if (IsVScroll)
+                return m_ScrollBarCore.TrackRectangle.Height;
+            else
+                return m_ScrollBarCore.TrackRectangle.Width;
+        }
+
+        private int GetAvailableTrackArea()
+        {
+            if (IsVScroll)
+                return m_ScrollBarCore.DisplayRectangle.Height - m_ScrollBarCore.ThumbDecreaseRectangle.Height - m_ScrollBarCore.ThumbIncreaseRectangle.Height;
+            else
+                return m_ScrollBarCore.DisplayRectangle.Width - m_ScrollBarCore.ThumbDecreaseRectangle.Width - m_ScrollBarCore.ThumbIncreaseRectangle.Width;
+        }
+
+        private bool IsVScroll
+        {
+            get
+            {
+                return m_IsVScrollBar;
+            }
+        }
+
+        private void UpdateScrollValues()
+        {
+            WinApi.SCROLLBARINFO psbi = new WinApi.SCROLLBARINFO();
+            psbi.cbSize = Marshal.SizeOf(psbi);
+
+            WinApi.GetScrollBarInfo(m_ParentScrollBar.Handle, (uint)WinApi.eObjectId.OBJID_CLIENT, ref psbi);
+
+            Rectangle displayRect = new Rectangle(0, 0, m_ParentScrollBar.Width, m_ParentScrollBar.Height);
+
+            if (IsVScroll)
+            {
+                if (m_ScrollBarCore.DisplayRectangle != displayRect)
+                    m_ScrollBarCore.DisplayRectangle = displayRect;
+
+                Rectangle thumbRect = new Rectangle(displayRect.X, displayRect.Y, displayRect.Width, psbi.dxyLineButton);
+                if (m_ScrollBarCore.ThumbDecreaseRectangle != thumbRect)
+                    m_ScrollBarCore.ThumbDecreaseRectangle = thumbRect;
+
+                thumbRect = new Rectangle(displayRect.X, displayRect.Bottom - psbi.dxyLineButton, displayRect.Width, psbi.dxyLineButton);
+                if (m_ScrollBarCore.ThumbIncreaseRectangle != thumbRect)
+                    m_ScrollBarCore.ThumbIncreaseRectangle = thumbRect;
+
+                thumbRect = new Rectangle(displayRect.X, displayRect.Y + psbi.xyThumbTop, displayRect.Width, psbi.xyThumbBottom - psbi.xyThumbTop);
+                if (m_ScrollBarCore.TrackRectangle != thumbRect)
+                    m_ScrollBarCore.TrackRectangle = thumbRect;
+            }
+            else
+            {
+                if (m_ScrollBarCore.DisplayRectangle != displayRect)
+                    m_ScrollBarCore.DisplayRectangle = displayRect;
+
+                Rectangle thumbRect = new Rectangle(displayRect.X, displayRect.Y, psbi.dxyLineButton, displayRect.Height);
+                if (m_ScrollBarCore.ThumbDecreaseRectangle != thumbRect)
+                    m_ScrollBarCore.ThumbDecreaseRectangle = thumbRect;
+
+                thumbRect = new Rectangle(displayRect.Right - psbi.dxyLineButton, displayRect.Y, psbi.dxyLineButton, displayRect.Height);
+                if (m_ScrollBarCore.ThumbIncreaseRectangle != thumbRect)
+                    m_ScrollBarCore.ThumbIncreaseRectangle = thumbRect;
+
+                thumbRect = new Rectangle(displayRect.X + psbi.xyThumbTop, displayRect.Y, psbi.xyThumbBottom - psbi.xyThumbTop, displayRect.Height);
+                if (m_ScrollBarCore.TrackRectangle != thumbRect)
+                    m_ScrollBarCore.TrackRectangle = thumbRect;
+            }
+
+            if (m_ScrollBarCore.Minimum != m_ParentScrollBar.Minimum)
+                m_ScrollBarCore.Minimum = m_ParentScrollBar.Minimum;
+            if (m_ScrollBarCore.Maximum != m_ParentScrollBar.Maximum)
+                m_ScrollBarCore.Maximum = m_ParentScrollBar.Maximum;
+            if (m_ScrollBarCore.SmallChange != m_ParentScrollBar.SmallChange)
+                m_ScrollBarCore.SmallChange = m_ParentScrollBar.SmallChange;
+            if (m_ScrollBarCore.LargeChange != m_ParentScrollBar.LargeChange)
+                m_ScrollBarCore.LargeChange = m_ParentScrollBar.LargeChange;
+            if (m_ScrollBarCore.Value != m_ParentScrollBar.Value)
+                m_ScrollBarCore.Value = m_ParentScrollBar.Value;
+        }
+
+        internal void NotifyInvalidate(Rectangle invalidatedArea)
+        {
+
+        }
+
+        //public bool IsAppScrollBarStyle
+        //{
+        //    get { return m_ScrollBarCore.IsAppScrollBarStyle; }
+        //    set
+        //    {
+        //        m_ScrollBarCore.IsAppScrollBarStyle = value;
+        //        m_ParentScrollBar.Invalidate();
+        //    }
+        //}
+        #endregion
+
+        #region IDisposable Members
+
+        public void Dispose()
+        {
+            if (m_ScrollBarCore != null)
+            {
+                m_ScrollBarCore.Dispose();
+                m_ScrollBarCore = null;
+            }
+            if (m_PaintTimer != null)
+            {
+                m_PaintTimer.Stop();
+                m_PaintTimer.Dispose();
+                m_PaintTimer = null;
+            }
+            StopAutoScrollTimer();
+        }
+
+        #endregion
+
+        internal interface IScrollBarExtender
+        {
+            void CallBaseWndProc(ref Message m);
+            void SetValue(int newValue, ScrollEventType type);
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/ScrollBarReplacement.cs b/PROMS/DotNetBar Source Code/Controls/ScrollBarReplacement.cs
new file mode 100644
index 00000000..2fa62436
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/ScrollBarReplacement.cs	
@@ -0,0 +1,257 @@
+#if FRAMEWORK20
+using System;
+using System.Text;
+using DevComponents.DotNetBar.ScrollBar;
+using System.Drawing;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.Rendering;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    internal class ScrollBarReplacement:IDisposable
+    {
+        #region Private Variables
+        private ScrollBarCore m_ScrollBarCore = null;
+        private System.Windows.Forms.ScrollBar m_ParentScrollBar = null;
+        private IScrollBarExtender m_ParentScrollBarWndProc = null;
+        private bool m_IsVScrollBar = false;
+        #endregion
+
+        #region Constructor
+        public ScrollBarReplacement(System.Windows.Forms.ScrollBar sb)
+        {
+            m_ParentScrollBar = sb;
+            m_ParentScrollBarWndProc = (IScrollBarExtender)m_ParentScrollBar;
+            m_IsVScrollBar = m_ParentScrollBar is VScrollBar;
+
+            m_ScrollBarCore = new ScrollBarCore(m_ParentScrollBar, false);
+            m_ScrollBarCore.ValueChanged += new EventHandler(ScrollBarCore_ValueChanged);
+            if (m_ParentScrollBar is HScrollBar)
+                m_ScrollBarCore.Orientation = eOrientation.Horizontal;
+            else
+                m_ScrollBarCore.Orientation = eOrientation.Vertical;
+            m_ScrollBarCore.Minimum = m_ParentScrollBar.Minimum;
+            m_ScrollBarCore.Maximum = m_ParentScrollBar.Maximum;
+            m_ScrollBarCore.Value = m_ParentScrollBar.Value;
+            m_ScrollBarCore.Enabled = m_ParentScrollBar.Enabled;
+            m_ParentScrollBar.EnabledChanged += new EventHandler(ParentScrollBar_EnabledChanged);
+        }
+        #endregion
+
+        #region Internal Implementation
+        private void ParentScrollBar_EnabledChanged(object sender, EventArgs e)
+        {
+            m_ScrollBarCore.Enabled = m_ParentScrollBar.Enabled;
+        }
+
+        internal void OnHandleCreated()
+        {
+            UpdateScrollValues();
+        }
+
+        internal void UpdateScrollValues()
+        {
+            Rectangle r = new Rectangle(0, 0, m_ParentScrollBar.Width, m_ParentScrollBar.Height);
+
+            if (m_ScrollBarCore.Minimum != m_ParentScrollBar.Minimum)
+                m_ScrollBarCore.Minimum = m_ParentScrollBar.Minimum;
+            if (m_ScrollBarCore.Maximum != m_ParentScrollBar.Maximum)
+                m_ScrollBarCore.Maximum = m_ParentScrollBar.Maximum;
+            if (m_ScrollBarCore.SmallChange != m_ParentScrollBar.SmallChange)
+                m_ScrollBarCore.SmallChange = m_ParentScrollBar.SmallChange;
+            if (m_ScrollBarCore.LargeChange != m_ParentScrollBar.LargeChange)
+                m_ScrollBarCore.LargeChange = m_ParentScrollBar.LargeChange;
+            if (m_ScrollBarCore.Value != m_ParentScrollBar.Value)
+                m_ScrollBarCore.Value = m_ParentScrollBar.Value;
+            if (r != m_ScrollBarCore.DisplayRectangle)
+                m_ScrollBarCore.DisplayRectangle = r;
+        }
+
+        private bool IsVScroll
+        {
+            get
+            {
+                return m_IsVScrollBar;
+            }
+        }
+
+        internal void OnMouseEnter(EventArgs e)
+        {
+            if (m_ParentScrollBar.Capture)
+                m_ParentScrollBar.Capture = false;
+        }
+
+        internal void OnMouseLeave(EventArgs e)
+        {
+            m_ScrollBarCore.MouseLeave();
+        }
+
+        internal void OnMouseMove(System.Windows.Forms.MouseEventArgs e)
+        {
+            m_ScrollBarCore.MouseMove(e);
+        }
+
+        internal void NotifyInvalidate(Rectangle invalidatedArea)
+        {
+            //UpdateScrollValues();
+            m_ScrollBarCore.DisposeCashedView();
+        }
+
+        internal void OnMouseDown(MouseEventArgs e)
+        {
+            m_ScrollBarCore.MouseDown(e);
+        }
+
+        internal void OnMouseUp(MouseEventArgs e)
+        {
+            m_ScrollBarCore.MouseUp(e);
+        }
+
+        private void ScrollBarCore_ValueChanged(object sender, EventArgs e)
+        {
+            SetValue(m_ScrollBarCore.Value);
+        }
+
+        private void SetValue(int v)
+        {
+            //Console.WriteLine(v + "   " + m_ParentScrollBar.LargeChange +"    "+m_ParentScrollBar.Maximum);
+            if (m_ParentScrollBar.Value == v && m_ParentScrollBar.Value != m_ScrollBarCore.GetMaximumValue()) return;
+
+            ScrollEventType t = ScrollEventType.SmallIncrement;
+            if (m_ScrollBarCore.MouseOverPart == ScrollBarCore.eScrollPart.ThumbDecrease)
+                t = ScrollEventType.SmallDecrement;
+            else if (m_ScrollBarCore.MouseOverPart == ScrollBarCore.eScrollPart.Track)
+                t = ScrollEventType.ThumbTrack;
+            else if (m_ScrollBarCore.MouseOverPart == ScrollBarCore.eScrollPart.Control)
+            {
+                if (v > m_ParentScrollBar.Value)
+                    t = ScrollEventType.LargeIncrement;
+                else
+                    t = ScrollEventType.LargeDecrement;
+            }
+            if (t == ScrollEventType.SmallIncrement && m_ParentScrollBar.Value == v && m_ParentScrollBar.Value == m_ScrollBarCore.GetMaximumValue())
+            {
+                t = ScrollEventType.Last;
+            }
+            m_ParentScrollBarWndProc.SetValue(v, t);
+
+            //if (t == ScrollEventType.ThumbTrack && m_ParentScrollBar.Parent is DataGridView)
+            //    m_ParentScrollBar.Parent.Refresh();
+        }
+        #endregion
+
+        #region IDisposable Members
+        public void Dispose()
+        {
+            m_ScrollBarCore.DisposeCashedView();
+        }
+        #endregion
+
+        #region Rendering
+        internal void OnPaint(System.Windows.Forms.PaintEventArgs e)
+        {
+            Graphics g = e.Graphics;
+            UpdateScrollValues();
+            //using (BufferedBitmap bmp = new BufferedBitmap(g, new Rectangle(0, 0, m_ParentScrollBar.Width, m_ParentScrollBar.Height)))
+            //{
+                m_ScrollBarCore.Paint(GetItemPaintArgs(g));
+                //bmp.Render(g);
+            //}
+        }
+
+        private ItemPaintArgs GetItemPaintArgs(Graphics g)
+        {
+            ItemPaintArgs pa = new ItemPaintArgs(m_ParentScrollBar as IOwner, m_ParentScrollBar, g, GetColorScheme());
+            pa.Renderer = this.GetRenderer();
+            pa.DesignerSelection = false;
+            pa.GlassEnabled = false;
+            return pa;
+        }
+
+        private ColorScheme m_ColorScheme = null;
+        /// <summary>
+        /// Returns the color scheme used by control. Color scheme for Office2007 style will be retrived from the current renderer instead of
+        /// local color scheme referenced by ColorScheme property.
+        /// </summary>
+        /// <returns>An instance of ColorScheme object.</returns>
+        protected virtual ColorScheme GetColorScheme()
+        {
+            BaseRenderer r = GetRenderer();
+            if (r is Office2007Renderer)
+                return ((Office2007Renderer)r).ColorTable.LegacyColors;
+            if (m_ColorScheme == null)
+                m_ColorScheme = new ColorScheme(eDotNetBarStyle.Office2007);
+            return m_ColorScheme;
+        }
+
+        private Rendering.BaseRenderer m_DefaultRenderer = null;
+        private Rendering.BaseRenderer m_Renderer = null;
+        private eRenderMode m_RenderMode = eRenderMode.Global;
+        /// <summary>
+        /// Returns the renderer control will be rendered with.
+        /// </summary>
+        /// <returns>The current renderer.</returns>
+        public virtual Rendering.BaseRenderer GetRenderer()
+        {
+            if (m_RenderMode == eRenderMode.Global && Rendering.GlobalManager.Renderer != null)
+                return Rendering.GlobalManager.Renderer;
+            else if (m_RenderMode == eRenderMode.Custom && m_Renderer != null)
+                return m_Renderer;
+
+            if (m_DefaultRenderer == null)
+                m_DefaultRenderer = new Rendering.Office2007Renderer();
+
+            return m_DefaultRenderer;
+        }
+
+        /// <summary>
+        /// Gets or sets the redering mode used by control. Default value is eRenderMode.Global which means that static GlobalManager.Renderer is used. If set to Custom then Renderer property must
+        /// also be set to the custom renderer that will be used.
+        /// </summary>
+        public eRenderMode RenderMode
+        {
+            get { return m_RenderMode; }
+            set
+            {
+                if (m_RenderMode != value)
+                {
+                    m_RenderMode = value;
+                    m_ParentScrollBar.Invalidate(true);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the custom renderer used by the items on this control. RenderMode property must also be set to eRenderMode.Custom in order renderer
+        /// specified here to be used.
+        /// </summary>
+        public DevComponents.DotNetBar.Rendering.BaseRenderer Renderer
+        {
+            get
+            {
+                return m_Renderer;
+            }
+            set { m_Renderer = value; }
+        }
+
+        internal ScrollBarCore ScrollBarCore
+        {
+            get { return m_ScrollBarCore; }
+        }
+
+        public bool AppStyleScrollBar
+        {
+            get { return m_ScrollBarCore.IsAppScrollBarStyle; }
+            set { m_ScrollBarCore.IsAppScrollBarStyle = value; }
+        }
+        #endregion
+
+        #region IScrollBarExtender
+        internal interface IScrollBarExtender
+        {
+            void SetValue(int newValue, ScrollEventType type);
+        }
+        #endregion
+    }
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/Controls/ScrollbarControl.cs b/PROMS/DotNetBar Source Code/Controls/ScrollbarControl.cs
new file mode 100644
index 00000000..f0e99da2
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/ScrollbarControl.cs	
@@ -0,0 +1,496 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.ScrollBar;
+using System.Drawing;
+using System.Runtime.InteropServices;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    /// <summary>
+    /// Represents control which handles scroll-bars.
+    /// </summary>
+    [ToolboxItem(false)]
+    public class ScrollbarControl : ControlWithBackgroundStyle
+    {
+        private const int ScrollPositionUpdateDelay = 400;
+        private HScrollBarAdv _HScrollBar = null;
+        private VScrollBarAdv _VScrollBar = null;
+        private Control _Thumb = null;
+        /// <summary>
+        /// Initializes a new instance of the ScrollbarControl class.
+        /// </summary>
+        public ScrollbarControl()
+        {
+            this.SetStyle(ControlStyles.UserPaint | 
+                ControlStyles.AllPaintingInWmPaint |
+                ControlStyles.Opaque | 
+                ControlStyles.ResizeRedraw |
+                DisplayHelp.DoubleBufferFlag, true);
+            
+            _HScrollBar = new HScrollBarAdv();
+            _HScrollBar.Visible = false;
+            _HScrollBar.Appearance = _ScrollBarAppearance;
+            _HScrollBar.Scroll += HScrollBarScroll;
+            _VScrollBar = new VScrollBarAdv();
+            _VScrollBar.Visible = false;
+            _VScrollBar.Appearance = _ScrollBarAppearance;
+            _VScrollBar.Scroll += VScrollBarScroll;
+            this.Controls.Add(_HScrollBar);
+            this.Controls.Add(_VScrollBar);
+
+            _Thumb = new Control();
+            _Thumb.Visible = false;
+            _Thumb.BackColor = SystemColors.Window;
+            this.Controls.Add(_Thumb);
+        }
+
+        private eScrollBarAppearance _ScrollBarAppearance = eScrollBarAppearance.Default;
+        /// <summary>
+        /// Gets or sets the scroll-bar visual style.
+        /// </summary>
+        [DefaultValue(eScrollBarAppearance.Default), Category("Appearance"), Description("Gets or sets the scroll-bar visual style.")]
+        public eScrollBarAppearance ScrollBarAppearance
+        {
+            get { return _ScrollBarAppearance; }
+            set
+            {
+                _ScrollBarAppearance = value;
+                OnScrollBarAppearanceChanged();
+            }
+        }
+        private void OnScrollBarAppearanceChanged()
+        {
+            if (_VScrollBar != null) _VScrollBar.Appearance = _ScrollBarAppearance;
+            if (_HScrollBar != null) _HScrollBar.Appearance = _ScrollBarAppearance;
+        }
+
+        private void UpdateScrollOverrideControlBounds()
+        {
+            if (_ScrollOverrideControl != null)
+                _ScrollOverrideControl.Bounds = GetScrollOverrideControlBounds();
+        }
+        protected override void OnResize(EventArgs e)
+        {
+            UpdateScrollOverrideControlBounds();
+            UpdateScrollBars();
+            base.OnResize(e);
+        }
+
+        protected override void OnVisualPropertyChanged()
+        {
+            base.OnVisualPropertyChanged();
+            UpdateScrollOverrideControlBounds();
+            UpdateScrollBars();
+        }
+
+        protected override void ScaleControl(SizeF factor, BoundsSpecified specified)
+        {
+            base.ScaleControl(factor, specified);
+            UpdateScrollOverrideControlBounds();
+        }
+
+        private bool _UpdatingScrollbars = false;
+        protected virtual void UpdateScrollBarsDelayed()
+        {
+            InvokeDelayed(new MethodInvoker(delegate { UpdateScrollBars(); }), ScrollPositionUpdateDelay);
+        }
+        protected virtual void UpdateScrollBars()
+        {
+            if (!IsHandleCreated || _UpdatingScrollbars) return;
+            _UpdatingScrollbars = true;
+            try
+            {
+                Control scrollOverrideControl = _ScrollOverrideControl;
+                if (scrollOverrideControl == null)
+                {
+                    if (_HScrollBar.Visible) _HScrollBar.Visible = false;
+                    if (_VScrollBar.Visible) _VScrollBar.Visible = false;
+                    return;
+                }
+                WinApi.SCROLLBARINFO psbi = new WinApi.SCROLLBARINFO();
+                psbi.cbSize = Marshal.SizeOf(psbi);
+                WinApi.GetScrollBarInfo(scrollOverrideControl.Handle, (uint)WinApi.eObjectId.OBJID_VSCROLL, ref psbi);
+                if (psbi.rgstate[0] != (int)WinApi.eStateFlags.STATE_SYSTEM_INVISIBLE)
+                {
+                    Rectangle vsBounds = psbi.rcScrollBar.ToRectangle();
+                    vsBounds.Location = this.PointToClient(vsBounds.Location);
+                    Rectangle scrollCountrolBounds = _ScrollOverrideControl.Bounds;
+                    if (!scrollCountrolBounds.Contains(vsBounds))
+                    {
+                        // We need to guess bounds for best performance and appearance
+                        if (vsBounds.Right > scrollCountrolBounds.Right)
+                        {
+                            vsBounds.X = scrollCountrolBounds.Right - vsBounds.Width;
+                        }
+                        else if (vsBounds.X < scrollCountrolBounds.X)
+                        {
+                            vsBounds.X = 0;
+                        }
+                    }
+                    if (_VScrollBar.Bounds != vsBounds)
+                    {
+                        _VScrollBar.Bounds = vsBounds;
+                        UpdateVerticalScrollBarValues();
+                    }
+                    if (!_VScrollBar.Visible)
+                    {
+                        _VScrollBar.Visible = true;
+                        _VScrollBar.Refresh();
+                        InvokeDelayed(new MethodInvoker(delegate { UpdateVerticalScrollBarValues(); }), ScrollPositionUpdateDelay);
+                    }
+
+                    if (psbi.rgstate[0] == (int)WinApi.eStateFlags.STATE_SYSTEM_UNAVAILABLE)
+                        _VScrollBar.Enabled = false;
+                    else if (!_VScrollBar.Enabled)
+                        _VScrollBar.Enabled = true;
+                    //Console.WriteLine("VscrollBar Bounds detection {0}", vsBounds);
+                }
+                else if (_VScrollBar.Visible)
+                    _VScrollBar.Visible = false;
+
+                psbi = new WinApi.SCROLLBARINFO();
+                psbi.cbSize = Marshal.SizeOf(psbi);
+                WinApi.GetScrollBarInfo(scrollOverrideControl.Handle, (uint)WinApi.eObjectId.OBJID_HSCROLL, ref psbi);
+                if (psbi.rgstate[0] != (int)WinApi.eStateFlags.STATE_SYSTEM_INVISIBLE)
+                {
+                    Rectangle hsBounds = psbi.rcScrollBar.ToRectangle();
+                    hsBounds.Location = this.PointToClient(hsBounds.Location);
+                    Rectangle scrollCountrolBounds = _ScrollOverrideControl.Bounds;
+                    if (!scrollCountrolBounds.Contains(hsBounds))
+                    {
+                        // We need to guess bounds for best performance and appearance
+                        if (hsBounds.Bottom > scrollCountrolBounds.Bottom)
+                        {
+                            hsBounds.Y = scrollCountrolBounds.Bottom - hsBounds.Height;
+                        }
+                    }
+                    if (_VScrollBar.Visible && hsBounds.Width == scrollCountrolBounds.Width)
+                        hsBounds.Width -= _VScrollBar.Width;
+                    if (_HScrollBar.Bounds != hsBounds)
+                    {
+                        _HScrollBar.Bounds = hsBounds;
+                        UpdateHorizontalScrollBarValues();
+                    }
+                    if (!_HScrollBar.Visible)
+                    {
+                        _HScrollBar.Visible = true;
+                        _HScrollBar.Refresh();
+                        InvokeDelayed(new MethodInvoker(delegate { UpdateHorizontalScrollBarValues(); }), ScrollPositionUpdateDelay);
+                    }
+
+                    if (psbi.rgstate[0] == (int)WinApi.eStateFlags.STATE_SYSTEM_UNAVAILABLE)
+                        _HScrollBar.Enabled = false;
+                    else if (!_HScrollBar.Enabled)
+                        _HScrollBar.Enabled = true;
+                }
+                else if (_HScrollBar.Visible)
+                    _HScrollBar.Visible = false;
+
+                if (_HScrollBar.Visible && _VScrollBar.Visible)
+                {
+                    _Thumb.Bounds = new Rectangle(_VScrollBar.Left, _VScrollBar.Bounds.Bottom, _VScrollBar.Width, _HScrollBar.Height);
+                    _Thumb.Visible = true;
+                }
+                else
+                {
+                    _Thumb.Visible = false;
+                }
+            }
+            finally
+            {
+                _UpdatingScrollbars = false;
+            }
+        }
+
+        private System.Drawing.Rectangle GetScrollOverrideControlBounds()
+        {
+            return GetContentRectangle();
+        }
+        
+        private Control _ScrollOverrideControl = null;
+        internal Control ScrollOverrideControl
+        {
+            get { return _ScrollOverrideControl; }
+            set
+            {
+                if (value != _ScrollOverrideControl)
+                {
+                    if (!(value is IScrollBarOverrideSupport))
+                        throw new ArgumentException("ScrollOverrideControl must implement IScrollBarOverrideSupport interface.");
+                    Control oldValue = _ScrollOverrideControl;
+                    _ScrollOverrideControl = value;
+                    OnScrollOverrideControlChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when ScrollOverrideControl property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnScrollOverrideControlChanged(Control oldValue, Control newValue)
+        {
+            if (oldValue != null)
+            {
+                IScrollBarOverrideSupport sbo = (IScrollBarOverrideSupport)newValue;
+                sbo.NonClientSizeChanged -= NonClientSizeChanged;
+                sbo.ScrollBarValueChanged -= ControlScrollBarValueChanged;
+                sbo.ControlMoved -= ScrollControlMoved;
+                this.Controls.Remove(oldValue);
+            }
+            if (newValue != null)
+            {
+                IScrollBarOverrideSupport sbo = (IScrollBarOverrideSupport)newValue;
+                sbo.NonClientSizeChanged += NonClientSizeChanged;
+                sbo.ScrollBarValueChanged += ControlScrollBarValueChanged;
+                sbo.ControlMoved += ScrollControlMoved;
+                this.Controls.Add(newValue);
+            }
+            UpdateScrollOverrideControlBounds();
+ 
+            if (IsHandleCreated)
+            {
+                //InitializeWindowOverride();
+                UpdateScrollBars();
+            }
+        }
+
+        void ScrollControlMoved(object sender, EventArgs e)
+        {
+            UpdateScrollOverrideControlBounds();
+        }
+
+        private bool _InternalVScrollPositionUpdated = false;
+        private void VScrollBarScroll(object sender, ScrollEventArgs e)
+        {
+            if (e.NewValue == e.OldValue && e.Type != ScrollEventType.EndScroll) return;
+            _InternalVScrollPositionUpdated = true;
+            WinApi.SendMessage(_ScrollOverrideControl.Handle, (int)WinApi.WindowsMessages.WM_VSCROLL, WinApi.CreateLParam(MapVScrollType(e.Type), e.NewValue), IntPtr.Zero);
+            _InternalVScrollPositionUpdated = false;
+
+            if (e.Type == ScrollEventType.EndScroll)
+                UpdateVerticalScrollBarValues();
+        }
+        private bool _InternalHScrollPositionUpdated = false;
+        private void HScrollBarScroll(object sender, ScrollEventArgs e)
+        {
+            if (e.NewValue == e.OldValue && e.Type != ScrollEventType.EndScroll) return;
+            _InternalHScrollPositionUpdated = true;
+            //Console.WriteLine("{0} Setting Sys_HScrollBar value {1}, {2}", DateTime.Now, e.NewValue, e.Type);
+            WinApi.SendMessage(_ScrollOverrideControl.Handle, (int)WinApi.WindowsMessages.WM_HSCROLL, WinApi.CreateLParam(MapHScrollType(e.Type), e.NewValue), IntPtr.Zero);
+            _InternalHScrollPositionUpdated = false;
+
+            if (e.Type == ScrollEventType.EndScroll)
+                UpdateHorizontalScrollBarValues();
+        }
+        private static int MapVScrollType(ScrollEventType type)
+        {
+            if (type == ScrollEventType.EndScroll)
+                return (int)WinApi.ScrollBarCommands.SB_ENDSCROLL;
+            else if (type == ScrollEventType.First)
+                return (int)WinApi.ScrollBarCommands.SB_TOP;
+            else if (type == ScrollEventType.LargeDecrement)
+                return (int)WinApi.ScrollBarCommands.SB_PAGEUP;
+            else if (type == ScrollEventType.LargeIncrement)
+                return (int)WinApi.ScrollBarCommands.SB_PAGEDOWN;
+            else if (type == ScrollEventType.Last)
+                return (int)WinApi.ScrollBarCommands.SB_BOTTOM;
+            else if (type == ScrollEventType.SmallDecrement)
+                return (int)WinApi.ScrollBarCommands.SB_LINEUP;
+            else if (type == ScrollEventType.SmallIncrement)
+                return (int)WinApi.ScrollBarCommands.SB_LINEDOWN;
+            else if (type == ScrollEventType.ThumbPosition)
+                return (int)WinApi.ScrollBarCommands.SB_THUMBPOSITION;
+            else if (type == ScrollEventType.ThumbTrack)
+                return (int)WinApi.ScrollBarCommands.SB_THUMBTRACK;
+
+            return 0;
+        }
+        private static int MapHScrollType(ScrollEventType type)
+        {
+            if (type == ScrollEventType.EndScroll)
+                return (int)WinApi.ScrollBarCommands.SB_ENDSCROLL;
+            else if (type == ScrollEventType.First)
+                return (int)WinApi.ScrollBarCommands.SB_LEFT;
+            else if (type == ScrollEventType.LargeDecrement)
+                return (int)WinApi.ScrollBarCommands.SB_PAGELEFT;
+            else if (type == ScrollEventType.LargeIncrement)
+                return (int)WinApi.ScrollBarCommands.SB_PAGERIGHT;
+            else if (type == ScrollEventType.Last)
+                return (int)WinApi.ScrollBarCommands.SB_RIGHT;
+            else if (type == ScrollEventType.SmallDecrement)
+                return (int)WinApi.ScrollBarCommands.SB_LINELEFT;
+            else if (type == ScrollEventType.SmallIncrement)
+                return (int)WinApi.ScrollBarCommands.SB_LINERIGHT;
+            else if (type == ScrollEventType.ThumbPosition)
+                return (int)WinApi.ScrollBarCommands.SB_THUMBPOSITION;
+            else if (type == ScrollEventType.ThumbTrack)
+                return (int)WinApi.ScrollBarCommands.SB_THUMBTRACK;
+
+            return 0;
+        }
+
+
+        private void UpdateVerticalScrollBarValues()
+        {
+            if (_InternalVScrollPositionUpdated) return;
+            WinApi.SCROLLINFO scrollInfo = new WinApi.SCROLLINFO();
+            scrollInfo.cbSize = Marshal.SizeOf(scrollInfo);
+            scrollInfo.fMask = WinApi.ScrollInfoMask.SIF_POS | WinApi.ScrollInfoMask.SIF_RANGE | WinApi.ScrollInfoMask.SIF_PAGE;
+            if (WinApi.GetScrollInfo(_ScrollOverrideControl.Handle, WinApi.SBOrientation.SB_VERT, ref scrollInfo))
+            {
+                //Console.WriteLine("{0}   TRACKPOS={1}", DateTime.Now, scrollInfo.nTrackPos);
+                if (_VScrollBar.Minimum != scrollInfo.nMin)
+                    _VScrollBar.Minimum = scrollInfo.nMin;
+                if (_VScrollBar.Maximum != scrollInfo.nMax)
+                    _VScrollBar.Maximum = scrollInfo.nMax;
+                if (_VScrollBar.Value != scrollInfo.nPos)
+                    _VScrollBar.Value = scrollInfo.nPos;
+                if (_VScrollBar.LargeChange != scrollInfo.nPage)
+                    _VScrollBar.LargeChange = scrollInfo.nPage;
+            }
+        }
+        private void UpdateHorizontalScrollBarValues()
+        {
+            if (_InternalHScrollPositionUpdated) return;
+            WinApi.SCROLLINFO scrollInfo = new WinApi.SCROLLINFO();
+            scrollInfo.cbSize = Marshal.SizeOf(scrollInfo);
+            scrollInfo.fMask = WinApi.ScrollInfoMask.SIF_POS | WinApi.ScrollInfoMask.SIF_RANGE | WinApi.ScrollInfoMask.SIF_PAGE | WinApi.ScrollInfoMask.SIF_TRACKPOS;
+            if (WinApi.GetScrollInfo(_ScrollOverrideControl.Handle, WinApi.SBOrientation.SB_HORZ, ref scrollInfo))
+            {
+                //Console.WriteLine("{0}   TRACKPOS={1}", DateTime.Now, scrollInfo);
+                if (_HScrollBar.Minimum != scrollInfo.nMin)
+                    _HScrollBar.Minimum = scrollInfo.nMin;
+                if (_HScrollBar.Maximum != scrollInfo.nMax)
+                    _HScrollBar.Maximum = scrollInfo.nMax;
+                if (_HScrollBar.Value != scrollInfo.nPos)
+                    _HScrollBar.Value = scrollInfo.nPos;
+                if (_HScrollBar.LargeChange != scrollInfo.nPage)
+                    _HScrollBar.LargeChange = scrollInfo.nPage;
+            }
+        }
+        private void ControlScrollBarValueChanged(object sender, ScrollValueChangedEventArgs e)
+        {
+            if ((e.ScrollChange & eScrollBarScrollChange.Vertical) == eScrollBarScrollChange.Vertical)
+            {
+                UpdateVerticalScrollBarValues();
+            }
+            if ((e.ScrollChange & eScrollBarScrollChange.MouseWheel) == eScrollBarScrollChange.MouseWheel)
+            {
+                UpdateVerticalScrollBarValues();
+                InvokeDelayed(new MethodInvoker(delegate { UpdateVerticalScrollBarValues(); }), ScrollPositionUpdateDelay);
+            }
+            if ((e.ScrollChange & eScrollBarScrollChange.Horizontal) == eScrollBarScrollChange.Horizontal)
+            {
+                UpdateHorizontalScrollBarValues();
+            }
+            UpdateScrollBars();
+        }
+
+        private void NonClientSizeChanged(object sender, EventArgs e)
+        {
+            UpdateScrollBars();
+        }
+
+        protected override void OnHandleCreated(EventArgs e)
+        {
+            UpdateScrollBars();
+            base.OnHandleCreated(e);
+        }
+
+        #region Child Control WndProc Override
+        internal static eScrollBarScrollChange MapMessageToScrollChange(int msg)
+        {
+            if (msg == (int)WinApi.WindowsMessages.WM_VSCROLL)
+                return eScrollBarScrollChange.Vertical;
+            else if (msg == (int)WinApi.WindowsMessages.WM_HSCROLL)
+                return eScrollBarScrollChange.Horizontal;
+            else if (msg == (int)WinApi.WindowsMessages.WM_MOUSEWHEEL)
+                return eScrollBarScrollChange.MouseWheel;
+            throw new ArgumentException("Message not recognized msg=" + msg.ToString());
+        }
+        #endregion
+
+        #region Invoke Delayed
+        protected void InvokeDelayed(MethodInvoker method)
+        {
+            InvokeDelayed(method, 10);
+        }
+        protected void InvokeDelayed(MethodInvoker method, int delayInterval)
+        {
+            if (delayInterval <= 0) { method.Invoke(); return; }
+
+            Timer delayedInvokeTimer = new Timer();
+            delayedInvokeTimer = new Timer();
+            delayedInvokeTimer.Tag = method;
+            delayedInvokeTimer.Interval = delayInterval;
+            delayedInvokeTimer.Tick += new EventHandler(DelayedInvokeTimerTick);
+            delayedInvokeTimer.Start();
+        }
+        void DelayedInvokeTimerTick(object sender, EventArgs e)
+        {
+            Timer timer = (Timer)sender;
+            MethodInvoker method = (MethodInvoker)timer.Tag;
+            timer.Stop();
+            timer.Dispose();
+            if (!this.IsDisposed)
+                method.Invoke();
+        }
+        #endregion
+    }
+
+    public interface IScrollBarOverrideSupport
+    {
+        /// <summary>
+        /// Should be fired when non-client size of the control changes, i.e. when WM_NCCALCSIZE message is received.
+        /// </summary>
+        event EventHandler NonClientSizeChanged;
+        /// <summary>
+        /// Should be fired when scroll-bar value on child control changes.
+        /// </summary>
+        event ScrollValueChangedHandler ScrollBarValueChanged;
+        /// <summary>
+        /// Should be fired when control receives WM_MOVE message.
+        /// </summary>
+        event EventHandler ControlMoved;
+        /// <summary>
+        /// Gets whether control is in design mode.
+        /// </summary>
+        bool DesignMode { get;}
+    }
+    /// <summary>
+    /// Defines arguments for IScrollBarOverrideSupport.ScrollBarValueChanged event.
+    /// </summary>
+    public class ScrollValueChangedEventArgs : System.EventArgs
+    {
+        /// <summary>
+        /// Initializes a new instance of the ScrollValueChangedEventArgs class.
+        /// </summary>
+        /// <param name="scrollChange"></param>
+        public ScrollValueChangedEventArgs(eScrollBarScrollChange scrollChange)
+        {
+            ScrollChange = scrollChange;
+        }
+
+        public readonly eScrollBarScrollChange ScrollChange;
+    }
+    /// <summary>
+    /// Defines information for IScrollBarOverrideSupport.ScrollBarValueChanged event.
+    /// </summary>
+    [Flags()]
+    public enum eScrollBarScrollChange
+    {
+        Vertical = 1,
+        Horizontal = 2,
+        MouseWheel = 4
+    }
+    /// <summary>
+    /// Defines delegate for IScrollBarOverrideSupport.ScrollBarValueChanged event.
+    /// </summary>
+    /// <param name="sender">Sender.</param>
+    /// <param name="e">Event arguments</param>
+    public delegate void ScrollValueChangedHandler(object sender, ScrollValueChangedEventArgs e);
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/ScrollbarSkinner.cs b/PROMS/DotNetBar Source Code/Controls/ScrollbarSkinner.cs
new file mode 100644
index 00000000..9bec3609
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/ScrollbarSkinner.cs	
@@ -0,0 +1,494 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Text;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.ScrollBar;
+using System.Drawing;
+using System.Runtime.InteropServices;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    internal class ScrollbarSkinner : IDisposable
+    {
+        #region Constructor
+        private const int ScrollPositionUpdateDelay = 400;
+        private HScrollBarAdv _HScrollBar = null;
+        private VScrollBarAdv _VScrollBar = null;
+        private Control _Thumb = null;
+        private Control _Parent = null;
+        public ScrollbarSkinner(Control parent)
+        {
+            if(parent == null)
+                throw new ArgumentNullException("Parent cannot be null");
+            if (!(parent is IScrollBarOverrideSupport))
+                throw new ArgumentException("parent must implement IScrollBarOverrideSupport interface.");
+
+            _Parent = parent;
+
+            _HScrollBar = new HScrollBarAdv();
+            _HScrollBar.Visible = false;
+            _HScrollBar.Appearance = _ScrollBarAppearance;
+            _HScrollBar.Scroll += HScrollBarScroll;
+            _VScrollBar = new VScrollBarAdv();
+            _VScrollBar.Visible = false;
+            _VScrollBar.Appearance = _ScrollBarAppearance;
+            _VScrollBar.Scroll += VScrollBarScroll;
+            _Thumb = new Control();
+            _Thumb.Visible = false;
+            _Thumb.BackColor = SystemColors.Window;
+
+            if (_Parent.Parent != null)
+            {
+                AttachScrollbars();
+            }
+            WireParent();
+
+            if(_Parent.IsHandleCreated)
+                UpdateScrollBars();
+        }
+
+        #endregion
+
+        #region Implementation
+
+        private void WireParent()
+        {
+            _Parent.ParentChanged += ParentParentChanged;
+            _Parent.HandleCreated += ParentHandleCreated;
+            _Parent.Resize += ParentResize;
+            IScrollBarOverrideSupport sbo = (IScrollBarOverrideSupport)_Parent;
+            sbo.NonClientSizeChanged += NonClientSizeChanged;
+            sbo.ScrollBarValueChanged += ControlScrollBarValueChanged;
+        }
+
+        void ParentResize(object sender, EventArgs e)
+        {
+            UpdateScrollBars();
+        }
+
+        void ParentHandleCreated(object sender, EventArgs e)
+        {
+            UpdateScrollBars();
+        }
+        private void NonClientSizeChanged(object sender, EventArgs e)
+        {
+            UpdateScrollBars();
+        }
+        private void ControlScrollBarValueChanged(object sender, ScrollValueChangedEventArgs e)
+        {
+            if ((e.ScrollChange & eScrollBarScrollChange.Vertical) == eScrollBarScrollChange.Vertical)
+            {
+                UpdateVerticalScrollBarValues();
+            }
+            if ((e.ScrollChange & eScrollBarScrollChange.MouseWheel) == eScrollBarScrollChange.MouseWheel)
+            {
+                if (_VScrollBar.Visible)
+                {
+                    UpdateVerticalScrollBarValues();
+                    InvokeDelayed(new MethodInvoker(delegate { UpdateVerticalScrollBarValues(); }), ScrollPositionUpdateDelay);
+                }
+                else if (_HScrollBar.Visible)
+                {
+                    UpdateHorizontalScrollBarValues();
+                    InvokeDelayed(new MethodInvoker(delegate { UpdateHorizontalScrollBarValues(); }), ScrollPositionUpdateDelay);
+                }
+            }
+            if ((e.ScrollChange & eScrollBarScrollChange.Horizontal) == eScrollBarScrollChange.Horizontal)
+            {
+                UpdateHorizontalScrollBarValues();
+            }
+            UpdateScrollBars();
+        }
+        private void UnwireParent()
+        {
+            _Parent.ParentChanged -= ParentParentChanged;
+            _Parent.HandleCreated -= ParentHandleCreated;
+            _Parent.Resize -= ParentResize;
+            IScrollBarOverrideSupport sbo = (IScrollBarOverrideSupport)_Parent;
+            sbo.NonClientSizeChanged -= NonClientSizeChanged;
+            sbo.ScrollBarValueChanged -= ControlScrollBarValueChanged;
+        }
+
+        void ParentParentChanged(object sender, EventArgs e)
+        {
+            AttachScrollbars();
+            UpdateScrollBars();
+        }
+
+        private bool _UpdatingScrollbars = false;
+        protected virtual void UpdateScrollBarsDelayed()
+        {
+            InvokeDelayed(new MethodInvoker(delegate { UpdateScrollBars(); }), ScrollPositionUpdateDelay);
+        }
+        protected virtual void UpdateScrollBars()
+        {
+            if (_Parent == null || _Parent.Parent == null || !_Parent.IsHandleCreated || _UpdatingScrollbars) return;
+            _UpdatingScrollbars = true;
+            try
+            {
+                Control scrollOverrideControl = _Parent;
+                if (scrollOverrideControl == null || ((IScrollBarOverrideSupport)scrollOverrideControl).DesignMode)
+                {
+                    if (_HScrollBar.Visible) _HScrollBar.Visible = false;
+                    if (_VScrollBar.Visible) _VScrollBar.Visible = false;
+                    return;
+                }
+                WinApi.SCROLLBARINFO psbi = new WinApi.SCROLLBARINFO();
+                psbi.cbSize = Marshal.SizeOf(psbi);
+                WinApi.GetScrollBarInfo(scrollOverrideControl.Handle, (uint)WinApi.eObjectId.OBJID_VSCROLL, ref psbi);
+                if (psbi.rgstate[0] != (int)WinApi.eStateFlags.STATE_SYSTEM_INVISIBLE)
+                {
+                    Rectangle vsBounds = psbi.rcScrollBar.ToRectangle();
+                    vsBounds.Location = scrollOverrideControl.Parent.PointToClient(vsBounds.Location);
+                    Rectangle scrollCountrolBounds = scrollOverrideControl.Bounds;
+                    if (!scrollCountrolBounds.Contains(vsBounds))
+                    {
+                        // We need to guess bounds for best performance and appearance
+                        if (vsBounds.Right > scrollCountrolBounds.Right)
+                        {
+                            vsBounds.X = scrollCountrolBounds.Right - vsBounds.Width;
+                        }
+                        else if (vsBounds.X < scrollCountrolBounds.X)
+                        {
+                            vsBounds.X = 0;
+                        }
+                    }
+                    if (_VScrollBar.Bounds != vsBounds)
+                    {
+                        _VScrollBar.Bounds = vsBounds;
+                        UpdateVerticalScrollBarValues();
+                    }
+                    if (!_VScrollBar.Visible)
+                    {
+                        _VScrollBar.Visible = true;
+                        _VScrollBar.BringToFront();
+                        _VScrollBar.Refresh();
+                        InvokeDelayed(new MethodInvoker(delegate { UpdateVerticalScrollBarValues(); }), ScrollPositionUpdateDelay);
+                    }
+                    else
+                    {
+                        _VScrollBar.BringToFront();
+                    }
+
+                    if (psbi.rgstate[0] == (int)WinApi.eStateFlags.STATE_SYSTEM_UNAVAILABLE)
+                        _VScrollBar.Enabled = false;
+                    else if (!_VScrollBar.Enabled)
+                        _VScrollBar.Enabled = true;
+                    //Console.WriteLine("VscrollBar Bounds detection {0}", vsBounds);
+                }
+                else if (_VScrollBar.Visible)
+                    _VScrollBar.Visible = false;
+
+                psbi = new WinApi.SCROLLBARINFO();
+                psbi.cbSize = Marshal.SizeOf(psbi);
+                WinApi.GetScrollBarInfo(scrollOverrideControl.Handle, (uint)WinApi.eObjectId.OBJID_HSCROLL, ref psbi);
+                if (psbi.rgstate[0] != (int)WinApi.eStateFlags.STATE_SYSTEM_INVISIBLE)
+                {
+                    Rectangle hsBounds = psbi.rcScrollBar.ToRectangle();
+                    hsBounds.Location = scrollOverrideControl.Parent.PointToClient(hsBounds.Location);
+                    Rectangle scrollCountrolBounds = scrollOverrideControl.Bounds;
+                    if (!scrollCountrolBounds.Contains(hsBounds))
+                    {
+                        // We need to guess bounds for best performance and appearance
+                        if (hsBounds.Bottom > scrollCountrolBounds.Bottom)
+                        {
+                            hsBounds.Y = scrollCountrolBounds.Bottom - hsBounds.Height;
+                        }
+                    }
+                    if (_VScrollBar.Visible && hsBounds.Width == scrollCountrolBounds.Width)
+                        hsBounds.Width -= _VScrollBar.Width;
+                    if (_HScrollBar.Bounds != hsBounds)
+                    {
+                        _HScrollBar.Bounds = hsBounds;
+                        UpdateHorizontalScrollBarValues();
+                    }
+                    if (!_HScrollBar.Visible)
+                    {
+                        _HScrollBar.Visible = true;
+                        _HScrollBar.BringToFront();
+                        _HScrollBar.Refresh();
+                        InvokeDelayed(new MethodInvoker(delegate { UpdateHorizontalScrollBarValues(); }), ScrollPositionUpdateDelay);
+                    }
+                    else
+                    {
+                        _HScrollBar.BringToFront();
+                    }
+
+                    if (psbi.rgstate[0] == (int)WinApi.eStateFlags.STATE_SYSTEM_UNAVAILABLE)
+                        _HScrollBar.Enabled = false;
+                    else if (!_HScrollBar.Enabled)
+                        _HScrollBar.Enabled = true;
+                }
+                else if (_HScrollBar.Visible)
+                    _HScrollBar.Visible = false;
+
+                if (_HScrollBar.Visible && _VScrollBar.Visible)
+                {
+                    _Thumb.Bounds = new Rectangle(_VScrollBar.Left, _VScrollBar.Bounds.Bottom, _VScrollBar.Width, _HScrollBar.Height);
+                    _Thumb.Visible = true;
+                    _Thumb.BringToFront();
+                }
+                else
+                {
+                    _Thumb.Visible = false;
+                }
+            }
+            finally
+            {
+                _UpdatingScrollbars = false;
+            }
+        }
+        private void AttachScrollbars()
+        {
+            DetachScrollbars();
+
+            Control host = _Parent.Parent;
+            if (host != null)
+            {
+                if (host is TableLayoutPanel)
+                {
+                    while (host is TableLayoutPanel)
+                    {
+                        host = host.Parent;
+                    }
+                }
+                if (host != null)
+                {
+                    host.Controls.Add(_VScrollBar);
+                    host.Controls.Add(_HScrollBar);
+                    host.Controls.Add(_Thumb);
+                }
+            }
+        }
+
+        private void DetachScrollbars()
+        {
+            if (_VScrollBar.Parent != null)
+                _VScrollBar.Parent.Controls.Remove(_VScrollBar);
+            if (_HScrollBar.Parent != null)
+                _HScrollBar.Parent.Controls.Remove(_HScrollBar);
+            if (_Thumb.Parent != null)
+                _Thumb.Parent.Controls.Remove(_Thumb);
+
+            _VScrollBar.Visible = false;
+            _HScrollBar.Visible = false;
+            _Thumb.Visible = false;
+        }
+
+        private eScrollBarAppearance _ScrollBarAppearance = eScrollBarAppearance.Default;
+        /// <summary>
+        /// Gets or sets the scroll-bar visual style.
+        /// </summary>
+        [DefaultValue(eScrollBarAppearance.Default), Category("Appearance"), Description("Gets or sets the scroll-bar visual style.")]
+        public eScrollBarAppearance ScrollBarAppearance
+        {
+            get { return _ScrollBarAppearance; }
+            set
+            {
+                _ScrollBarAppearance = value;
+                OnScrollBarAppearanceChanged();
+            }
+        }
+        private void OnScrollBarAppearanceChanged()
+        {
+            if (_VScrollBar != null) _VScrollBar.Appearance = _ScrollBarAppearance;
+            if (_HScrollBar != null) _HScrollBar.Appearance = _ScrollBarAppearance;
+        }
+
+        private bool _InternalVScrollPositionUpdated = false;
+        private void VScrollBarScroll(object sender, ScrollEventArgs e)
+        {
+            if (e.NewValue == e.OldValue && e.Type != ScrollEventType.EndScroll) return;
+            _InternalVScrollPositionUpdated = true;
+            //Console.WriteLine("{0} Setting Sys_VScrollBar value {1}, {2}", DateTime.Now, e.NewValue, e.Type);
+            if (e.Type == ScrollEventType.ThumbTrack) // We need to send this becouse ScrollableControl internally will get the current scroll position using GetScrollInfo instead from window message LParam
+            {
+                WinApi.SCROLLINFO si = new WinApi.SCROLLINFO();
+                si.nTrackPos = e.NewValue;
+                si.nPos = e.NewValue;
+                si.fMask = WinApi.ScrollInfoMask.SIF_POS;
+                si.cbSize = Marshal.SizeOf(si);
+                WinApi.SetScrollInfo(_Parent.Handle, WinApi.SBOrientation.SB_VERT, ref si, false);
+            }
+            WinApi.SendMessage(_Parent.Handle, (int)WinApi.WindowsMessages.WM_VSCROLL, WinApi.CreateLParam(MapVScrollType(e.Type), e.NewValue), IntPtr.Zero);
+            _InternalVScrollPositionUpdated = false;
+            
+            if (e.Type == ScrollEventType.EndScroll)
+                UpdateVerticalScrollBarValues();
+        }
+        private bool _InternalHScrollPositionUpdated = false;
+        private void HScrollBarScroll(object sender, ScrollEventArgs e)
+        {
+            if (e.NewValue == e.OldValue && e.Type != ScrollEventType.EndScroll) return;
+            _InternalHScrollPositionUpdated = true;
+            //Console.WriteLine("{0} Setting Sys_HScrollBar value {1}, {2}", DateTime.Now, e.NewValue, e.Type);
+            if (e.Type == ScrollEventType.ThumbTrack) // We need to send this becouse ScrollableControl internally will get the current scroll position using GetScrollInfo instead from window message LParam
+            {
+                WinApi.SCROLLINFO si = new WinApi.SCROLLINFO();
+                si.nTrackPos = e.NewValue;
+                si.nPos = e.NewValue;
+                si.fMask = WinApi.ScrollInfoMask.SIF_POS;
+                si.cbSize = Marshal.SizeOf(si);
+                WinApi.SetScrollInfo(_Parent.Handle, WinApi.SBOrientation.SB_HORZ, ref si, false);
+            }
+            WinApi.SendMessage(_Parent.Handle, (int)WinApi.WindowsMessages.WM_HSCROLL, WinApi.CreateLParam(MapHScrollType(e.Type), e.NewValue), IntPtr.Zero);
+            _InternalHScrollPositionUpdated = false;
+
+            if (e.Type == ScrollEventType.EndScroll)
+                UpdateHorizontalScrollBarValues();
+        }
+        private static int MapVScrollType(ScrollEventType type)
+        {
+            if (type == ScrollEventType.EndScroll)
+                return (int)WinApi.ScrollBarCommands.SB_ENDSCROLL;
+            else if (type == ScrollEventType.First)
+                return (int)WinApi.ScrollBarCommands.SB_TOP;
+            else if (type == ScrollEventType.LargeDecrement)
+                return (int)WinApi.ScrollBarCommands.SB_PAGEUP;
+            else if (type == ScrollEventType.LargeIncrement)
+                return (int)WinApi.ScrollBarCommands.SB_PAGEDOWN;
+            else if (type == ScrollEventType.Last)
+                return (int)WinApi.ScrollBarCommands.SB_BOTTOM;
+            else if (type == ScrollEventType.SmallDecrement)
+                return (int)WinApi.ScrollBarCommands.SB_LINEUP;
+            else if (type == ScrollEventType.SmallIncrement)
+                return (int)WinApi.ScrollBarCommands.SB_LINEDOWN;
+            else if (type == ScrollEventType.ThumbPosition)
+                return (int)WinApi.ScrollBarCommands.SB_THUMBPOSITION;
+            else if (type == ScrollEventType.ThumbTrack)
+                return (int)WinApi.ScrollBarCommands.SB_THUMBTRACK;
+
+            return 0;
+        }
+        private static int MapHScrollType(ScrollEventType type)
+        {
+            if (type == ScrollEventType.EndScroll)
+                return (int)WinApi.ScrollBarCommands.SB_ENDSCROLL;
+            else if (type == ScrollEventType.First)
+                return (int)WinApi.ScrollBarCommands.SB_LEFT;
+            else if (type == ScrollEventType.LargeDecrement)
+                return (int)WinApi.ScrollBarCommands.SB_PAGELEFT;
+            else if (type == ScrollEventType.LargeIncrement)
+                return (int)WinApi.ScrollBarCommands.SB_PAGERIGHT;
+            else if (type == ScrollEventType.Last)
+                return (int)WinApi.ScrollBarCommands.SB_RIGHT;
+            else if (type == ScrollEventType.SmallDecrement)
+                return (int)WinApi.ScrollBarCommands.SB_LINELEFT;
+            else if (type == ScrollEventType.SmallIncrement)
+                return (int)WinApi.ScrollBarCommands.SB_LINERIGHT;
+            else if (type == ScrollEventType.ThumbPosition)
+                return (int)WinApi.ScrollBarCommands.SB_THUMBPOSITION;
+            else if (type == ScrollEventType.ThumbTrack)
+                return (int)WinApi.ScrollBarCommands.SB_THUMBTRACK;
+
+            return 0;
+        }
+
+
+        private void UpdateVerticalScrollBarValues()
+        {
+            if (_InternalVScrollPositionUpdated) return;
+            WinApi.SCROLLINFO scrollInfo = new WinApi.SCROLLINFO();
+            scrollInfo.cbSize = Marshal.SizeOf(scrollInfo);
+            scrollInfo.fMask = WinApi.ScrollInfoMask.SIF_POS | WinApi.ScrollInfoMask.SIF_RANGE | WinApi.ScrollInfoMask.SIF_PAGE;
+            if (WinApi.GetScrollInfo(_Parent.Handle, WinApi.SBOrientation.SB_VERT, ref scrollInfo))
+            {
+                //Console.WriteLine("{0}   scrollInfo={1}", DateTime.Now, scrollInfo.ToString());
+                if (_VScrollBar.Minimum != scrollInfo.nMin)
+                    _VScrollBar.Minimum = scrollInfo.nMin;
+                if (_VScrollBar.Maximum != scrollInfo.nMax)
+                    _VScrollBar.Maximum = scrollInfo.nMax;
+                if (_VScrollBar.Value != scrollInfo.nPos)
+                    _VScrollBar.Value = scrollInfo.nPos;
+                if (_VScrollBar.LargeChange != scrollInfo.nPage)
+                    _VScrollBar.LargeChange = scrollInfo.nPage;
+            }
+        }
+        private void UpdateHorizontalScrollBarValues()
+        {
+            if (_InternalHScrollPositionUpdated) return;
+            WinApi.SCROLLINFO scrollInfo = new WinApi.SCROLLINFO();
+            scrollInfo.cbSize = Marshal.SizeOf(scrollInfo);
+            scrollInfo.fMask = WinApi.ScrollInfoMask.SIF_POS | WinApi.ScrollInfoMask.SIF_RANGE | WinApi.ScrollInfoMask.SIF_PAGE | WinApi.ScrollInfoMask.SIF_TRACKPOS;
+            if (WinApi.GetScrollInfo(_Parent.Handle, WinApi.SBOrientation.SB_HORZ, ref scrollInfo))
+            {
+                //Console.WriteLine("{0}   TRACKPOS={1}", DateTime.Now, scrollInfo);
+                if (_HScrollBar.Minimum != scrollInfo.nMin)
+                    _HScrollBar.Minimum = scrollInfo.nMin;
+                if (_HScrollBar.Maximum != scrollInfo.nMax)
+                    _HScrollBar.Maximum = scrollInfo.nMax;
+                if (_HScrollBar.Value != scrollInfo.nPos)
+                    _HScrollBar.Value = scrollInfo.nPos;
+                if (_HScrollBar.LargeChange != scrollInfo.nPage)
+                    _HScrollBar.LargeChange = scrollInfo.nPage;
+            }
+        }
+
+        public VScrollBarAdv VScrollBar
+        {
+            get
+            {
+                return _VScrollBar;
+            }
+        }
+
+        public HScrollBarAdv HScrollBar
+        {
+            get
+            {
+                return _HScrollBar;
+            }
+        }
+        
+        #endregion
+
+        #region Invoke Delayed
+        protected void InvokeDelayed(MethodInvoker method)
+        {
+            InvokeDelayed(method, 10);
+        }
+        protected void InvokeDelayed(MethodInvoker method, int delayInterval)
+        {
+            if (delayInterval <= 0) { method.Invoke(); return; }
+
+            Timer delayedInvokeTimer = new Timer();
+            delayedInvokeTimer = new Timer();
+            delayedInvokeTimer.Tag = method;
+            delayedInvokeTimer.Interval = delayInterval;
+            delayedInvokeTimer.Tick += new EventHandler(DelayedInvokeTimerTick);
+            delayedInvokeTimer.Start();
+        }
+        void DelayedInvokeTimerTick(object sender, EventArgs e)
+        {
+            Timer timer = (Timer)sender;
+            MethodInvoker method = (MethodInvoker)timer.Tag;
+            timer.Stop();
+            timer.Dispose();
+            if (!this.IsDisposed)
+                method.Invoke();
+        }
+        #endregion
+
+        private bool _IsDisposed = false;
+
+        public bool IsDisposed
+        {
+            get
+            {
+                return _IsDisposed;
+            }
+        }
+        public void Dispose()
+        {
+            UnwireParent();
+            if(_VScrollBar.Parent == null)
+                _VScrollBar.Dispose();
+            if (_HScrollBar.Parent == null)
+                _HScrollBar.Dispose();
+            if (_Thumb.Parent == null)
+                _Thumb.Dispose();
+            _IsDisposed = true;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/SideNav.ico b/PROMS/DotNetBar Source Code/Controls/SideNav.ico
new file mode 100644
index 00000000..61cd1bad
Binary files /dev/null and b/PROMS/DotNetBar Source Code/Controls/SideNav.ico differ
diff --git a/PROMS/DotNetBar Source Code/Controls/SideNav/OfficeSideNavItemPainter.cs b/PROMS/DotNetBar Source Code/Controls/SideNav/OfficeSideNavItemPainter.cs
new file mode 100644
index 00000000..0b4cad0c
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/SideNav/OfficeSideNavItemPainter.cs	
@@ -0,0 +1,193 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Text;
+using DevComponents.DotNetBar.Controls;
+using System.Drawing.Imaging;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    internal class OfficeSideNavItemPainter : SideNavItemPainter
+    {
+        /// <summary>
+        /// Paints ListBoxItem.
+        /// </summary>
+        /// <param name="e">Provides arguments for the operation.</param>
+        public override void Paint(SideNavItemRendererEventArgs e)
+        {
+            Graphics g = e.ItemPaintArgs.Graphics;
+            SideNavItem item = e.Item;
+            SideNavStrip navStrip = e.ItemPaintArgs.ContainerControl as SideNavStrip;
+
+            SideNavItemColorTable table = ColorTable.SideNav.SideNavItem;
+            SideNavItemStateColorTable ct = item.IsMouseOver ? table.MouseOver : table.Default;
+            if (item.Checked)
+                ct = table.Selected;
+            else if (item.IsMouseDown)
+                ct = table.Pressed;
+
+            Rectangle r = item.Bounds;
+            Rectangle textBounds = item.TextRenderBounds;
+            Rectangle imageBounds = item.ImageRenderBounds;
+            CompositeImage image = item.GetImage();
+
+            if (ct.BackColors != null && ct.BackColors.Length > 0 || item.BackColors != null && item.BackColors.Length > 0)
+            {
+                using (Brush brush = DisplayHelp.CreateBrush(r, (item.BackColors != null && item.BackColors.Length > 0) ? item.BackColors : ct.BackColors, ct.BackColorsGradientAngle, ct.BackColorsPositions))
+                {
+                    DisplayHelp.FillRoundedRectangle(g, brush, r, ct.CornerRadius);
+                    //g.FillRectangle(brush, r);
+                }
+            }
+
+            Region oldClip = null;
+            // For top item do not draw the top border
+            if (r.Y == 0 && item.Checked)
+            {
+                oldClip = g.Clip;
+                g.SetClip(new Rectangle(r.X, r.Y, r.Width, 1), CombineMode.Exclude);
+            }
+            if (item.BorderColors != null && item.BorderColors.Length > 0)
+                DisplayHelp.DrawRoundedRectangle(g, r, item.BorderColors, ct.CornerRadius);
+            else if (ct.BorderColors != null && ct.BorderColors.Length > 0)
+                DisplayHelp.DrawRoundedRectangle(g, r, ct.BorderColors, ct.CornerRadius);
+            if (r.Y == 0 && item.Checked)
+            {
+                g.Clip = oldClip;
+                oldClip.Dispose();
+            }
+
+            Color textColor = ct.TextColor;
+            bool hasImage = false;
+            if ((image != null || !string.IsNullOrEmpty(item.SymbolRealized)) && item.ButtonStyle != eButtonStyle.TextOnlyAlways)
+            {
+                if (imageBounds.IsEmpty)
+                    imageBounds = GetImageRectangle(item, image);
+                if (textBounds.IsEmpty)
+                    textBounds = GetTextRectangle(item, image, imageBounds);
+                hasImage = true;
+
+            }
+            else if (textBounds.IsEmpty)
+            {
+                textBounds = r;
+                r.X += 2;
+                r.Width -= 2;
+            }
+
+            if (!string.IsNullOrEmpty(item.SymbolRealized))
+            {
+                Color symbolColor = item.SymbolColor;
+                if (symbolColor.IsEmpty) symbolColor = textColor;
+                TextDrawing.DrawStringLegacy(g, item.SymbolRealized, Symbols.GetFont(item.SymbolSize, item.SymbolSet),
+                    symbolColor, new Rectangle(imageBounds.X, imageBounds.Y + imageBounds.Height / 2, 0, 0), eTextFormat.Default | eTextFormat.VerticalCenter);
+            }
+            else if (image != null)
+            {
+                if (!item.IsMouseOver && item.HotTrackingStyle == eHotTrackingStyle.Color)
+                {
+                    // Draw gray-scale image for this hover style...
+                    float[][] array = new float[5][];
+                    array[0] = new float[5] { 0.2125f, 0.2125f, 0.2125f, 0, 0 };
+                    array[1] = new float[5] { 0.5f, 0.5f, 0.5f, 0, 0 };
+                    array[2] = new float[5] { 0.0361f, 0.0361f, 0.0361f, 0, 0 };
+                    array[3] = new float[5] { 0, 0, 0, 1, 0 };
+                    array[4] = new float[5] { 0.2f, 0.2f, 0.2f, 0, 1 };
+                    ColorMatrix grayMatrix = new ColorMatrix(array);
+                    ImageAttributes att = new ImageAttributes();
+                    att.SetColorMatrix(grayMatrix);
+                    image.DrawImage(g, imageBounds, 0, 0, image.ActualWidth, image.ActualHeight, GraphicsUnit.Pixel, att);
+                }
+                else
+                {
+                    image.DrawImage(g, imageBounds);
+                }
+            }
+            item.ImageRenderBounds = imageBounds;
+
+            if (!string.IsNullOrEmpty(item.Text) && (item.ButtonStyle!= eButtonStyle.Default || !hasImage))
+            {
+                if (!item.ForeColor.IsEmpty) textColor = item.ForeColor;
+                Font font = e.ItemPaintArgs.Font;
+                if (item.TextMarkupBody == null)
+                {
+                    eTextFormat textFormat = eTextFormat.Default | eTextFormat.VerticalCenter;
+                    //if (item.TextAlignment == eButtonTextAlignment.Center)
+                    //{
+                    //    textFormat |= eTextFormat.HorizontalCenter;
+                    //}
+                    //else if (item.TextAlignment == eButtonTextAlignment.Right)
+                    //{
+                    //    textFormat |= eTextFormat.Right;
+                    //}
+                    TextDrawing.DrawString(g, item.Text, font, textColor, textBounds, textFormat);
+                }
+                else
+                {
+                    TextMarkup.MarkupDrawContext d = new TextMarkup.MarkupDrawContext(g, font, textColor, e.ItemPaintArgs.RightToLeft);
+                    d.HotKeyPrefixVisible = false;
+                    d.ContextObject = item;
+                    Rectangle mr = new Rectangle(textBounds.X, textBounds.Y + (textBounds.Height - item.TextMarkupBody.Bounds.Height) / 2, item.TextMarkupBody.Bounds.Width, item.TextMarkupBody.Bounds.Height);
+                    item.TextMarkupBody.Bounds = mr;
+                    item.TextMarkupBody.Render(d);
+                }
+
+            }
+            item.TextRenderBounds = textBounds;
+        }
+
+        private Rectangle GetImageRectangle(SideNavItem item, CompositeImage image)
+        {
+            Rectangle imageRect = Rectangle.Empty;
+            // Calculate image position
+            if (image != null || !string.IsNullOrEmpty(item.SymbolRealized))
+            {
+                Size imageSize = item.ImageSize;
+
+                if (item.ImagePosition == eImagePosition.Top || item.ImagePosition == eImagePosition.Bottom)
+                    imageRect = new Rectangle(item.ImageDrawRect.X, item.ImageDrawRect.Y, item.DisplayRectangle.Width, item.ImageDrawRect.Height);
+                else if (item.ImagePosition == eImagePosition.Left)
+                {
+                    if (item.ButtonStyle == eButtonStyle.Default)
+                        return new Rectangle(item.Bounds.X + (item.Bounds.Width - imageSize.Width)/2,
+                            item.Bounds.Y + (item.Bounds.Height - imageSize.Height)/2, imageSize.Width, imageSize.Height);
+                    else
+                        imageRect = new Rectangle(item.ImageDrawRect.X + 4, item.ImageDrawRect.Y,
+                            item.ImageDrawRect.Width,
+                            item.ImageDrawRect.Height);
+                }
+                else if (item.ImagePosition == eImagePosition.Right)
+                    imageRect = new Rectangle(item.ImageDrawRect.X + item.ImagePaddingHorizontal + 4,
+                        item.ImageDrawRect.Y, item.ImageDrawRect.Width, item.ImageDrawRect.Height);
+                imageRect.Offset(item.DisplayRectangle.Left, item.DisplayRectangle.Top);
+                imageRect.Offset((imageRect.Width - imageSize.Width) / 2, (imageRect.Height - imageSize.Height) / 2);
+
+                imageRect.Width = imageSize.Width;
+                imageRect.Height = imageSize.Height;
+            }
+
+            return imageRect;
+        }
+
+        private Rectangle GetTextRectangle(SideNavItem item, CompositeImage image, Rectangle imageBounds)
+        {
+            Rectangle itemRect = item.DisplayRectangle;
+            Rectangle textRect = item.TextDrawRect;
+
+            if (item.ImagePosition == eImagePosition.Top || item.ImagePosition == eImagePosition.Bottom)
+            {
+                textRect = new Rectangle(1, textRect.Y, itemRect.Width - 2, textRect.Height);
+            }
+            textRect.Offset(itemRect.Left, itemRect.Top);
+
+            if (item.ImagePosition == eImagePosition.Left)
+                textRect.X = imageBounds.Right + item.ImagePaddingHorizontal;
+
+            if (textRect.Right > itemRect.Right)
+                textRect.Width = itemRect.Right - textRect.Left;
+
+            return textRect;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/SideNav/SideNav.cs b/PROMS/DotNetBar Source Code/Controls/SideNav/SideNav.cs
new file mode 100644
index 00000000..a8982757
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/SideNav/SideNav.cs	
@@ -0,0 +1,776 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data.SqlTypes;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+using System.Windows.Forms.VisualStyles;
+using DevComponents.DotNetBar.Metro;
+using DevComponents.DotNetBar.Rendering;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    /// <summary>
+    /// Represents SideNav control to create "hamburger" menus.
+    /// </summary>
+    [ToolboxBitmap(typeof(SideNav), "Controls.SideNav.ico"), ToolboxItem(true),Designer("DevComponents.DotNetBar.Design.SideNavDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf"), System.Runtime.InteropServices.ComVisible(false)]
+    public class SideNav : System.Windows.Forms.ContainerControl
+    {
+        #region Constructor
+        private SideNavStrip _Strip = null;
+        private Bar _TitleBar = null;
+        private LabelItem _TitleLabel = null;
+        private ButtonItem _CloseButton = null;
+        private ButtonItem _MaximizeButton = null;
+        private ButtonItem _RestoreButton = null;
+        private Control _Splitter = null;
+        public SideNav()
+        {
+            this.SetStyle(ControlStyles.AllPaintingInWmPaint
+                  | ControlStyles.ResizeRedraw
+                  | DisplayHelp.DoubleBufferFlag
+                  | ControlStyles.UserPaint
+                  | ControlStyles.Opaque
+                  , true);
+
+            this.Padding = new System.Windows.Forms.Padding(1);
+
+            _Splitter = new Control();
+            _Splitter.Width = 4;
+            _Splitter.Name = "splitter";
+            _Splitter.Cursor = Cursors.VSplit;
+            _Splitter.Dock = DockStyle.Right;
+            _Splitter.MouseMove += SplitterMouseMove;
+            _Splitter.MouseDown += SplitterMouseDown;
+            this.Controls.Add(_Splitter);
+
+
+            // Title bar and fold/extend buttons
+            Bar titleBar = new Bar();
+            titleBar.Name = "titleBar";
+            titleBar.AntiAlias = true;
+            titleBar.Name = "titleBar";
+            titleBar.PaddingBottom = 7;
+            titleBar.PaddingTop = 5;
+            titleBar.PaddingLeft = 6;
+            titleBar.RoundCorners = false;
+            titleBar.Dock = DockStyle.Top;
+            titleBar.Stretch = true;
+            titleBar.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            titleBar.TabIndex = 0;
+            titleBar.TabStop = false;
+            titleBar.BarType = eBarType.StatusBar;
+            titleBar.ItemsContainer.OverflowEnabled = false;
+            LabelItem titleLabel=new LabelItem();
+            titleLabel.Name = "titleLabel";
+            titleLabel.Text = "Title";
+            titleLabel.FontBold = true;
+            _TitleLabel = titleLabel;
+            titleBar.Items.Add(titleLabel);
+            _TitleBar = titleBar;
+            _CloseButton = new ButtonItem("openCloseButton");
+            _CloseButton.Symbol = "\uf0d9";
+            _CloseButton.ImagePaddingHorizontal = 18;
+            _CloseButton.ItemAlignment= eItemAlignment.Far;
+            _CloseButton.SymbolSize = 12f;
+            _CloseButton.Click+=CloseButtonClick;
+            titleBar.Items.Add(_CloseButton);
+            _MaximizeButton = new ButtonItem("maximizeButton");
+            _MaximizeButton.Symbol = "\uf090";
+            _MaximizeButton.ItemAlignment = eItemAlignment.Far;
+            _MaximizeButton.SymbolSize = 12f;
+            _MaximizeButton.Click += MaximizeButtonClick;
+            titleBar.Items.Add(_MaximizeButton);
+            _RestoreButton = new ButtonItem("restoreButton");
+            _RestoreButton.Symbol = "\uf100";
+            _RestoreButton.ItemAlignment = eItemAlignment.Far;
+            _RestoreButton.SymbolSize = 12f;
+            _RestoreButton.Click += RestoreButtonClick;
+            _RestoreButton.Visible = false;
+            titleBar.Items.Add(_RestoreButton);
+
+            this.Controls.Add(titleBar);
+
+            _Strip = new SideNavStrip();
+            _Strip.Dock = DockStyle.Left;
+            _Strip.AutoSize = true;
+            _Strip.AutoSyncSizeOrientation = eOrientation.Horizontal;
+            _Strip.ButtonCheckedChanged += StripButtonCheckedChanged;
+
+            //SideNavItem menuItem=new SideNavItem();
+            //menuItem.Name = "menuItem";
+            //menuItem.Text = "Menu";
+            //menuItem.Symbol = "\uf0c9";
+            //menuItem.IsSystemMenu = true;
+            //_Strip.Items.Add(menuItem);
+
+            //Separator sep = new Separator();
+            //sep.SeparatorOrientation = eDesignMarkerOrientation.Vertical;
+            //sep.FixedSize = new Size(3,1);
+            //sep.Padding.Left = 6;
+            //sep.Padding.Right = 6;
+            //_Strip.Items.Add(sep);
+
+            //SideNavItem item = new SideNavItem();
+            //item.Text = "Home";
+            //item.Symbol = "\uf015";
+            //_Strip.Items.Add(item);
+            //SideNavPanel panel=new SideNavPanel();
+            //panel.Dock = DockStyle.Fill;
+            //this.Controls.Add(panel);
+            //item.Panel = panel;
+
+            //item = new SideNavItem();
+            //item.Text = "Explore";
+            //item.Symbol = "\uf002";
+            //_Strip.Items.Add(item);
+
+            //ButtonItem button=new ButtonItem();
+            //button.Text = "Button";
+            //button.Symbol = "\uf003";
+            //button.ButtonStyle = eButtonStyle.ImageAndText;
+            //_Strip.Items.Add(button);
+            
+            this.Controls.Add(_Strip);
+            _Strip.Width = 48;
+
+            StyleManager.Register(this);
+            UpdateColors();
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            if (_IsMaximized && disposing && this.Parent!=null)
+            {
+                this.Parent.Resize -= ParentResize;
+            }
+            base.Dispose(disposing);
+        }
+
+        #endregion
+
+        #region Implementation
+        /// <summary>
+        /// Called by StyleManager to notify control that style on manager has changed and that control should refresh its appearance if
+        /// its style is controlled by StyleManager.
+        /// </summary>
+        /// <param name="newStyle">New active style.</param>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void StyleManagerStyleChanged(eDotNetBarStyle newStyle)
+        {
+            UpdateColors();
+        }
+        /// <summary>
+        /// Updates the control colors from the global color table.
+        /// </summary>
+        public void UpdateColors()
+        {
+            SideNavColorTable ct = GetColorTable();
+            _TitleBar.BackColor = ct.TitleBackColor;
+            _TitleBar.BorderColors = ct.TitleBorderColors;
+            this.Invalidate(true);
+        }
+
+        protected override void OnPaint(PaintEventArgs e)
+        {   
+            Graphics g = e.Graphics;
+            DisplayHelp.FillRectangle(g,this.ClientRectangle, this.BackColor);
+            SideNavColorTable table = GetColorTable();
+            DisplayHelp.DrawRoundedRectangle(g, this.ClientRectangle, table.BorderColors, 0);
+        }
+
+        private SideNavColorTable GetColorTable()
+        {
+            return ((Office2007Renderer)GlobalManager.Renderer).ColorTable.SideNav;
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void SetDesignMode()
+        {
+            _Strip.SetDesignMode(true);
+        }
+
+        private bool _EnableSplitter = true;
+        /// <summary>
+        /// Indicates whether splitter that is located on right hand side of open control is visible and enabled.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance"), Description("Indicates whether splitter that is located on right hand side of open control is visible and enabled.")]
+        public bool EnableSplitter
+        {
+            get { return _EnableSplitter; }
+            set
+            {
+                if (_EnableSplitter != value)
+                {
+                    bool oldValue = _EnableSplitter;
+                    _EnableSplitter = value;
+                    OnEnableSplitterChanged(value, oldValue);
+                }
+            }
+        }
+        protected virtual void OnEnableSplitterChanged(bool newValue, bool oldValue)
+        {
+            _Splitter.Visible = newValue;
+        }
+
+        private bool _EnableClose = true;
+        /// <summary>
+        /// Indicates whether button which folds/closes the control is visible.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance"), Description("Indicates whether button which folds/closes the control is visible.")]
+        public bool EnableClose
+        {
+            get { return _EnableClose; }
+            set
+            {
+                if (_EnableClose != value)
+                {
+                    bool oldValue = _EnableClose;
+                    _EnableClose = value;
+                    OnEnableCloseChanged(value, oldValue);
+                }
+            }
+        }
+        protected virtual void OnEnableCloseChanged(bool newValue, bool oldValue)
+        {
+            _CloseButton.Visible = newValue;
+            _TitleBar.RecalcLayout();
+        }
+
+        private bool _EnableMaximize = true;
+        // <summary>
+        /// Indicates whether buttons which maximize and restore the control are visible.
+        /// </summary>
+        [DefaultValue(true), Category("Apeparance"), Description("Indicates whether buttons which maximize and restore the control are visible.")]
+        public bool EnableMaximize
+        {
+            get { return _EnableMaximize; }
+            set
+            {
+                if (_EnableMaximize != value)
+                {
+                    bool oldValue = _EnableMaximize;
+                    _EnableMaximize = value;
+                    OnEnableMaximizeChanged(value, oldValue);
+                }
+            }
+        }
+        protected virtual void OnEnableMaximizeChanged(bool newValue, bool oldValue)
+        {
+            if (!newValue)
+            {
+                _MaximizeButton.Visible = false;
+                _RestoreButton.Visible = false;
+            }
+            else
+            {
+                if (_IsMaximized)
+                    _RestoreButton.Visible = true;
+                else
+                    _MaximizeButton.Visible = true;
+            }
+            _TitleBar.RecalcLayout();
+        }
+
+        /// <summary>
+        /// Returns collection of items on a bar.
+        /// </summary>
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content), Browsable(false)]
+        public SubItemsCollection Items
+        {
+            get
+            {
+                return _Strip.Items;
+            }
+        }
+
+        private void CloseButtonClick(object sender, EventArgs e)
+        {
+            Close(eEventSource.Mouse);
+        }
+
+        private void MaximizeButtonClick(object sender, EventArgs e)
+        {
+            Maximize(eEventSource.Mouse);
+        }
+
+        private bool _IsMaximized = false;
+        private int _RestoredWidth = 0;
+        /// <summary>
+        /// Maximizes control width so it fills up space to the right of the control.
+        /// </summary>
+        /// <param name="source">Source of the event.</param>
+        public void Maximize(eEventSource source)
+        {
+            if(_IsMaximized) return;
+            
+            if (this.Parent == null) 
+                return;
+            if (this.Bounds.Right >= this.Parent.ClientRectangle.Right)
+                return;
+            
+            CancelSourceEventArgs args=new CancelSourceEventArgs(source);
+            OnBeforeMaximize(args);
+            if(args.Cancel) return;
+
+            _IsMaximized = true;
+            int maxWidth = GetMaxWidth();
+            _RestoredWidth = this.Width;
+            BarFunctions.AnimateControl(this, true, _AnimationTime, this.Bounds, new Rectangle(this.Location, new Size(maxWidth, this.Height)));
+            _RestoreButton.Visible = true;
+            _MaximizeButton.Visible = false;
+            _TitleBar.RecalcLayout();
+            _Splitter.Visible = false;
+            this.Invalidate();
+            this.Parent.Resize += ParentResize;
+        }
+
+        void ParentResize(object sender, EventArgs e)
+        {
+            if (this.Parent.Width > 0)
+                this.Width = GetMaxWidth();
+        }
+
+        private int GetMaxWidth()
+        {
+            int width = this.Width + this.Parent.ClientRectangle.Right - this.Bounds.Right;
+            if (this.Parent is MetroAppForm)
+            {
+                MetroAppForm form = (MetroAppForm) this.Parent;
+                if (form.BorderThickness.Right > 0)
+                    width -= (int)form.BorderThickness.Right;
+                else
+                    width -= 3;
+            }
+            
+            return width;
+        }
+
+        private void RestoreButtonClick(object sender, EventArgs e)
+        {
+            Restore(eEventSource.Mouse);
+        }
+
+        /// <summary>
+        /// Restores the control to previous size if it was maximized before.
+        /// </summary>
+        /// <param name="source">Source of event.</param>
+        public void Restore(eEventSource source)
+        {
+            if (!_IsMaximized || _RestoredWidth == 0) return;
+            _IsMaximized = false;
+            
+            CancelSourceEventArgs args = new CancelSourceEventArgs(source);
+            OnBeforeRestore(args);
+            if (args.Cancel) return;
+
+            BarFunctions.AnimateControl(this, true, _AnimationTime, this.Bounds, new Rectangle(this.Location, new Size(_RestoredWidth, this.Height)));
+            _RestoredWidth = 0;
+            _RestoreButton.Visible = false;
+            _MaximizeButton.Visible = true;
+            _TitleBar.RecalcLayout();
+            _Splitter.Visible = _EnableSplitter;
+            this.Invalidate();
+            if(this.Parent!=null)
+                this.Parent.Resize -= ParentResize;
+        }
+
+        private bool _IsOpen = true;
+        private int _OpenWidth = 0;
+        /// <summary>
+        /// Gets or sets whether control is closed, i.e. whether selected item panel is shown or not. When closed
+        /// any selected item is unselected and selected panel hidden.
+        /// </summary>
+        [DefaultValue(false), Browsable(false)]
+        public bool IsClosed
+        {
+            get { return !_IsOpen; }
+            set
+            {
+                if (value)
+                {
+                    if(_IsOpen)
+                        Close(eEventSource.Code);
+                }
+                else
+                {
+                    if (!_IsOpen)
+                    {
+                        SideNavItem item = FirstVisibleSideNavItem??_LastOpenItem;
+                        if (item != null)
+                            Open(item, eEventSource.Code);
+                    }
+                }
+            }
+        }
+
+        private SideNavItem FirstVisibleSideNavItem
+        {
+            get
+            {
+                for (int i = 0; i < _Strip.Items.Count; i++)
+                {
+                    if (_Strip.Items[i] is SideNavItem && _Strip.Items[i].Visible)
+                        return (SideNavItem)_Strip.Items[i];
+                }
+                return null;
+            }
+        }
+
+        private void StripButtonCheckedChanged(object sender, EventArgs e)
+        {
+            if (sender is SideNavItem && ((SideNavItem)sender).Checked)
+            {
+                OnSelectedItemChanged(EventArgs.Empty);
+                if (!_IsOpen)
+                    Open((SideNavItem)sender, eEventSource.Code);
+            }
+        }
+
+        /// <summary>
+        /// Opens the control, i.e. expands it, selects specified item and shows its associated panel.
+        /// </summary>
+        /// <param name="item">Item to select.</param>
+        /// <param name="source">Source of the event.</param>
+        public void Open(SideNavItem item, eEventSource source)
+        {
+            if (item == null)
+                throw new ArgumentException("item must be set to valid item to select");
+
+            if (_IsOpen) return;
+
+            CancelSourceEventArgs args=new CancelSourceEventArgs(source, item);
+            OnBeforeOpen(args);
+            if(args.Cancel) return;
+
+            if (!item.Checked)
+                item.Checked = true;
+            BarFunctions.AnimateControl(this, true, _AnimationTime, this.Bounds, new Rectangle(this.Location, new Size(_OpenWidth, this.Height)));
+            _IsOpen = true;
+            _Splitter.Visible = _EnableSplitter;
+            this.Invalidate();
+        }
+
+        private SideNavItem _LastOpenItem = null;
+        /// <summary>
+        /// Closes the control, i.e. unselects any selected item, hide its associated panel and folds the control.
+        /// </summary>
+        /// <param name="source">Source of the event.</param>
+        public void Close(eEventSource source)
+        {
+            if(!_IsOpen) return;
+
+            CancelSourceEventArgs args = new CancelSourceEventArgs(source);
+            OnBeforeClose(args);
+            if (args.Cancel) return;
+
+            _OpenWidth = this.Width;
+            int closedWidth = _Strip.Width + this.Padding.Horizontal;
+            _Splitter.Visible = false;
+            BarFunctions.AnimateControl(this, true, _AnimationTime, this.Bounds, new Rectangle(this.Location, new Size(closedWidth, this.Height)));
+            _IsOpen = false;
+            if (_Strip.SelectedItem != null)
+            {
+                _LastOpenItem = _Strip.SelectedItem;
+                _Strip.SelectedItem.Checked = false;
+            }
+            else
+                _LastOpenItem = null;
+
+            this.Invalidate();
+        }
+
+        private bool _IsMenuExpanded = true;
+        /// <summary>
+        /// Indicates whether side menu is expanded, i.e. shows both image and text. When menu is collapsed only image is shown.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance"), Description("Indicates whether side menu is expanded, i.e. shows both image and text. When menu is collapsed only image is shown.")]
+        public bool IsMenuExpanded
+        {
+            get { return _IsMenuExpanded; }
+            set
+            {
+                if (_IsMenuExpanded != value)
+                {
+                    bool oldValue = _IsMenuExpanded;
+                    _IsMenuExpanded = value;
+                    OnIsMenuExpandedChanged(value, oldValue);
+                }
+            }
+        }
+
+        protected virtual void OnIsMenuExpandedChanged(bool newValue, bool oldValue)
+        {
+            ExpandMenu(newValue);
+            OnIsMenuExpandedChanged(EventArgs.Empty);
+        }
+
+        /// <summary>
+        /// Occurs when IsMenuExpanded property has changed its value.
+        /// </summary>
+        [Description("Occurs when IsMenuExpanded property has changed.")]
+        public event EventHandler IsMenuExpandedChanged;
+
+        /// <summary>
+        /// Raises IsMenuExpandedChanged event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnIsMenuExpandedChanged(EventArgs e)
+        {
+            EventHandler h = IsMenuExpandedChanged;
+            if (h != null)
+                h(this, e);
+        }
+
+        private bool _IsMenuExpandedDelayedSet = false;
+        /// <summary>
+        /// Expands or collapses the control items menu.
+        /// </summary>
+        /// <param name="expand"></param>
+        private void ExpandMenu(bool expand)
+        {
+            if (!this.IsHandleCreated)
+            {
+                _IsMenuExpandedDelayedSet = true;
+                return;
+            }
+            for (int i = 0; i < _Strip.Items.Count; i++)
+            {
+                ButtonItem button = _Strip.Items[i] as ButtonItem;
+                if (button != null)
+                {
+                    button.ButtonStyle = (expand ? eButtonStyle.ImageAndText : eButtonStyle.Default);
+                }
+            }
+            _Strip.RecalcLayout();
+            if (!_IsOpen)
+                this.Width = _Strip.Width + this.Padding.Horizontal;
+        }
+
+        private int _AnimationTime = 250;
+        /// <summary>
+        /// Indicates the animation time in milliseconds for operations that perform visual animation of transition. Set to zero to disable animation.
+        /// </summary>
+        [DefaultValue(250), Category("Behavior"), Description("Indicates the animation time in milliseconds for operations that perform visual animation of transition. Set to zero to disable animation.")]
+        public int AnimationTime
+        {
+            get { return _AnimationTime; }
+            set
+            {
+                if (value != _AnimationTime)
+                {
+                    int oldValue = _AnimationTime;
+                    _AnimationTime = value;
+                    OnAnimationTimeChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when AnimationTime property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnAnimationTimeChanged(int oldValue, int newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("AnimationTime"));
+
+        }
+
+        /// <summary>
+        /// Occurs before the control is maximized and allows you to cancel that.
+        /// </summary>
+        [Description("Occurs before the control is maximized and allows you to cancel that.")]
+        public event CancelSourceEventHandler BeforeMaximize;
+        /// <summary>
+        /// Raises BeforeMaximize event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnBeforeMaximize(CancelSourceEventArgs e)
+        {
+            CancelSourceEventHandler h = BeforeMaximize;
+            if (h != null)
+                h(this, e);
+        }
+        /// <summary>
+        /// Occurs before the control is restored and allows you to cancel that.
+        /// </summary>
+        [Description("Occurs before the control is restored and allows you to cancel that.")]
+        public event CancelSourceEventHandler BeforeRestore;
+        /// <summary>
+        /// Raises BeforeRestore event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnBeforeRestore(CancelSourceEventArgs e)
+        {
+            CancelSourceEventHandler h = BeforeRestore;
+            if (h != null)
+                h(this, e);
+        }
+
+        /// <summary>
+        /// Occurs before the control is opened and allows you to cancel that.
+        /// </summary>
+        [Description("Occurs before the control is opened and allows you to cancel that.")]
+        public event CancelSourceEventHandler BeforeOpen;
+        /// <summary>
+        /// Raises BeforeOpen event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnBeforeOpen(CancelSourceEventArgs e)
+        {
+            CancelSourceEventHandler h = BeforeOpen;
+            if (h != null)
+                h(this, e);
+        }
+
+        /// <summary>
+        /// Occurs before the control is closed and allows you to cancel that.
+        /// </summary>
+        [Description("Occurs before the control is closed and allows you to cancel that.")]
+        public event CancelSourceEventHandler BeforeClose;
+        /// <summary>
+        /// Raises BeforeClose event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnBeforeClose(CancelSourceEventArgs e)
+        {
+            CancelSourceEventHandler h = BeforeClose;
+            if (h != null)
+                h(this, e);
+        }
+
+        protected override void OnHandleCreated(EventArgs e)
+        {
+            UpdateSelectedItemTitle();
+            UpdateColors();
+            if (_IsMenuExpandedDelayedSet)
+            {
+                ExpandMenu(_IsMenuExpanded);
+                _IsMenuExpandedDelayedSet = false;
+            }
+            base.OnHandleCreated(e);
+        }
+
+        internal void UpdateSelectedItemTitle()
+        {
+            SideNavItem item = _Strip.SelectedItem;
+            if (item == null) return;
+
+            if (!string.IsNullOrEmpty(item.Title))
+                _TitleLabel.Text = item.Title;
+            else
+                _TitleLabel.Text = item.Text;
+        }
+
+        private Point _SplitterMouseDownPoint = Point.Empty;
+        private void SplitterMouseDown(object sender, MouseEventArgs e)
+        {
+            if (e.Button == MouseButtons.Left)
+                _SplitterMouseDownPoint = e.Location;
+        }
+        private void SplitterMouseMove(object sender, MouseEventArgs e)
+        {
+            if (e.Button == MouseButtons.Left)
+            {
+                int maxWidth = GetMaxWidth();
+                int minWidth = _Strip.Width + 64;
+                int newWidth = this.Width + (e.X - _SplitterMouseDownPoint.X);
+                if (newWidth > maxWidth)
+                    newWidth = maxWidth;
+                else if (newWidth < minWidth)
+                    newWidth = minWidth;
+                this.Width = newWidth;
+            }
+        }
+
+        /// <summary>
+        /// Gets currently selected item. Only items with Panel assigned can be selected.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public SideNavItem SelectedItem
+        {
+            get
+            {
+                foreach (BaseItem item in this.Items)
+                {
+                    if (item is SideNavItem && ((SideNavItem)item).Checked)
+                    {
+                        return (SideNavItem)item;
+                    }
+                }
+                return null;
+            }
+            set
+            {
+                if (value != null && value.Panel != null)
+                    value.Checked = true;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when SelectedItem changes.
+        /// </summary>
+        [Description("Occurs when SelectedItem changes.")]
+        public event EventHandler SelectedItemChanged;
+
+        /// <summary>
+        /// Raises SelectedItemChanged event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnSelectedItemChanged(EventArgs e)
+        {
+            EventHandler h = SelectedItemChanged;
+            if (h != null)
+                h(this, e);
+        }
+        /// <summary>
+        /// Gets reference to internal SideNavStrip control.
+        /// </summary>
+        [Browsable(false)]
+        public SideNavStrip SideNavStrip
+        {
+            get { return _Strip; }
+        }
+        #endregion
+    }
+
+    /// <summary>
+    /// Defines delegate for the CancelSource events.
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="ea"></param>
+    public delegate void CancelSourceEventHandler(object sender, CancelSourceEventArgs e);
+    /// <summary>
+    /// Event arguments for CancelSourceEventHandler
+    /// </summary>
+    public class CancelSourceEventArgs : CancelEventArgs
+    {
+        /// <summary>
+        /// Gets the source of the event.
+        /// </summary>
+        public eEventSource Source = eEventSource.Code;
+        /// <summary>
+        /// Gets any optional data that is associated with the event.
+        /// </summary>
+        public object Data = null;
+        /// <summary>
+        /// Creates new instance of the object.
+        /// </summary>
+        /// <param name="source">Source of event</param>
+        public CancelSourceEventArgs(eEventSource source)
+        {
+            this.Source = source;
+        }
+        /// <summary>
+        /// Creates new instance of the object.
+        /// </summary>
+        /// <param name="source">Source of event</param>
+        /// <param name="data">Optional data associated with the event.</param>
+        public CancelSourceEventArgs(eEventSource source, object data)
+        {
+            this.Source = source;
+            this.Data = data;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/SideNav/SideNavItem.cs b/PROMS/DotNetBar Source Code/Controls/SideNav/SideNavItem.cs
new file mode 100644
index 00000000..a1249ac6
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/SideNav/SideNavItem.cs	
@@ -0,0 +1,791 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.Rendering;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    [ToolboxItem(false), DesignTimeVisible(false)]
+    public class SideNavItem : ButtonItem
+    {
+        #region Private Variables & Constructor
+        private SideNavPanel _Panel = null;
+
+        /// <summary>
+        /// Initializes a new instance of the MetroTabItem class.
+        /// </summary>
+        public SideNavItem()
+        {
+            this.ButtonStyle = eButtonStyle.ImageAndText;
+        }
+        #endregion
+
+        #region Internal Implementation
+        public override void Paint(ItemPaintArgs p)
+        {
+            Rendering.BaseRenderer renderer = p.Renderer;
+            if (renderer != null)
+            {
+                SideNavItemRendererEventArgs args = new SideNavItemRendererEventArgs(this, p.Graphics);
+                args.ItemPaintArgs = p;
+                renderer.DrawSideNavItem(args);
+            }
+
+            if (!string.IsNullOrEmpty(NotificationMarkText))
+                DevComponents.DotNetBar.Rendering.NotificationMarkPainter.Paint(p.Graphics, this.Bounds, NotificationMarkPosition,
+                    NotificationMarkText, new Size(NotificationMarkSize, NotificationMarkSize), NotificationMarkOffset, NotificationMarkColor);
+            
+            if (this.DesignMode && this.Focused)
+            {
+                Rectangle r = this.Bounds;
+                r.Inflate(-1, -1);
+                DesignTime.DrawDesignTimeSelection(p.Graphics, r, p.Colors.ItemDesignTimeBorder);
+            }
+
+            this.DrawInsertMarker(p.Graphics);
+        }
+
+        public override void RecalcSize()
+        {
+            _ImageRenderBounds = Rectangle.Empty;
+            _TextRenderBounds = Rectangle.Empty;
+            base.RecalcSize();
+        }
+
+        private Rectangle _ImageRenderBounds = Rectangle.Empty;
+        /// <summary>
+        /// Gets or sets cached image rendering bounds.
+        /// </summary>
+        internal Rectangle ImageRenderBounds
+        {
+            get { return _ImageRenderBounds; }
+            set { _ImageRenderBounds = value; }
+        }
+
+        private Rectangle _TextRenderBounds = Rectangle.Empty;
+        /// <summary>
+        /// Gets or sets cached text rendering bounds.
+        /// </summary>
+        internal Rectangle TextRenderBounds
+        {
+            get { return _TextRenderBounds; }
+            set { _TextRenderBounds = value; }
+        }
+
+        protected override bool IsFadeEnabled
+        {
+            get
+            {
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// Selects the tab.
+        /// </summary>
+        public void Select()
+        {
+            if (AllowSelection)
+                this.Checked = true;
+        }
+
+        /// <summary>
+        /// Gets or sets the panel assigned to this tab item.
+        /// </summary>
+        [Browsable(false), DefaultValue(null)]
+        public SideNavPanel Panel
+        {
+            get { return _Panel; }
+            set
+            {
+                _Panel = value;
+                OnPanelChanged();
+            }
+        }
+
+        private void OnPanelChanged()
+        {
+            ChangePanelVisibility();
+        }
+
+        /// <summary>
+        /// Called after Checked property has changed.
+        /// </summary>
+        protected override void OnCheckedChanged()
+        {
+            if (this.Checked && this.Parent != null)
+            {
+                ChangePanelVisibility();
+                foreach (BaseItem item in this.Parent.SubItems)
+                {
+                    if (item == this)
+                        continue;
+                    SideNavItem b = item as SideNavItem;
+                    if (b != null && b.Checked)
+                    {
+                        if (this.DesignMode)
+                            TypeDescriptor.GetProperties(b)["Checked"].SetValue(b, false);
+                        else
+                            b.Checked = false;
+                    }
+                }
+            }
+
+            if (BarFunctions.IsOffice2007Style(this.EffectiveStyle) && this.ContainerControl is System.Windows.Forms.Control)
+                ((System.Windows.Forms.Control)this.ContainerControl).Invalidate();
+            if (!this.Checked)
+                ChangePanelVisibility();
+
+            InvokeCheckedChanged();
+        }
+
+        private void ChangePanelVisibility()
+        {
+            if (this.Checked && _Panel != null)
+            {
+                if (this.DesignMode)
+                {
+                    if (!_Panel.Visible) _Panel.Visible = true;
+                    TypeDescriptor.GetProperties(_Panel)["Visible"].SetValue(_Panel, true);
+                    _Panel.BringToFront();
+                }
+                else
+                {
+                    if (!_Panel.IsDisposed)
+                    {
+                        // Had to remove this optimization since in certain use-cases it caused
+                        // .NET WinForms layout framework to move child controls inside of the panel
+                        // Following 3 lines reduce flashing of panel's child controls when Dock panel is shown
+                        //System.Windows.Forms.DockStyle oldDock = _Panel.Dock;
+                        //_Panel.Dock = System.Windows.Forms.DockStyle.None;
+                        //_Panel.Location = new Point(-32000, 32000);
+                        _Panel.Enabled = true;
+                        _Panel.Visible = true;
+                        _Panel.BringToFront();
+                        //if (_Panel.Dock != oldDock)
+                        //    _Panel.Dock = oldDock;
+                    }
+
+                }
+            }
+            else if (!this.Checked && _Panel != null)
+            {
+                if (this.DesignMode)
+                    TypeDescriptor.GetProperties(_Panel)["Visible"].SetValue(_Panel, false);
+                else
+                {
+                    _Panel.Visible = false;
+                    _Panel.Enabled = false;
+                }
+            }
+        }
+
+        private bool AllowSelection
+        {
+            get { return _Panel != null; }
+        }
+
+        /// <summary>
+        /// Occurs just before Click event is fired.
+        /// </summary>
+        protected override void OnClick()
+        {
+            base.OnClick();
+            if (_IsSystemMenu)
+            {
+                SideNavStrip strip = this.ContainerControl as SideNavStrip;
+                if(strip!=null && strip.Parent is SideNav)
+                    ((SideNav)strip.Parent).IsMenuExpanded = !((SideNav)strip.Parent).IsMenuExpanded;
+            }
+            else if (!this.Checked && AllowSelection)
+            {
+                if (this.DesignMode)
+                    TypeDescriptor.GetProperties(this)["Checked"].SetValue(this, true);
+                else
+                {
+                    SideNav nav = GetSideNav();
+                    if (nav != null && !nav.ValidateChildren())
+                        return;
+                    this.Checked = true;
+                }
+            }
+        }
+        private SideNav GetSideNav()
+        {
+            SideNavStrip strip = this.ContainerControl as SideNavStrip;
+            if (strip == null) return null;
+            return strip.Parent as SideNav;
+        }
+        /// <summary>
+        /// Called when Visibility of the items has changed.
+        /// </summary>
+        /// <param name="bVisible">New Visible state.</param>
+        protected internal override void OnVisibleChanged(bool bVisible)
+        {
+            base.OnVisibleChanged(bVisible);
+            if (!bVisible && this.Checked)
+            {
+                TypeDescriptor.GetProperties(this)["Checked"].SetValue(this, false);
+                // Try to check first item in the group
+                if (this.Parent != null)
+                {
+                    foreach (BaseItem item in this.Parent.SubItems)
+                    {
+                        if (item == this || !item.GetEnabled() || !item.Visible)
+                            continue;
+                        SideNavItem b = item as SideNavItem;
+                        if (b != null)
+                        {
+                            TypeDescriptor.GetProperties(b)["Checked"].SetValue(this, true);
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or set the Group item belongs to. The groups allows a user to choose from mutually exclusive options within the group. The choice is reflected by Checked property.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), DefaultValue(""), EditorBrowsable(EditorBrowsableState.Never)]
+        public override string OptionGroup
+        {
+            get { return base.OptionGroup; }
+            set { base.OptionGroup = value; }
+        }
+
+        /// <summary>
+        /// Returns the collection of sub items.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Content)]
+        public override SubItemsCollection SubItems
+        {
+            get { return base.SubItems; }
+        }
+
+        internal override void DoAccesibleDefaultAction()
+        {
+            if (AllowSelection)
+                this.Checked = true;
+        }
+
+        protected override void Invalidate(System.Windows.Forms.Control containerControl)
+        {
+            Rectangle r = m_Rect;
+            r.Width++;
+            r.Height++;
+            if (containerControl.InvokeRequired)
+                containerControl.BeginInvoke(new MethodInvoker(delegate { containerControl.Invalidate(r, true); }));
+            else
+                containerControl.Invalidate(r, true);
+        }
+
+        public override bool UseParentSubItemsImageSize
+        {
+            get
+            {
+                return false;
+            }
+        }
+
+        private Color[] _BackColors = null;
+        /// <summary>
+        /// Indicates the array of colors that when set are used to draw the background of the item.
+        /// </summary>
+        [DefaultValue(null), Category("Appearance"), Description("Indicates the array of colors that when set are used to draw the background of the item."), TypeConverter(typeof(ArrayConverter))]
+        public Color[] BackColors
+        {
+            get
+            {
+                return _BackColors;
+            }
+            set
+            {
+                if (_BackColors != value)
+                {
+                    _BackColors = value;
+                    //OnPropertyChanged(new PropertyChangedEventArgs("Colors"));
+                    this.Refresh();
+                }
+            }
+        }
+
+        private Color[] _BorderColors = null;
+        /// <summary>
+        /// Indicates the array of colors that when set are used to draw the border of the item.
+        /// </summary>
+        [DefaultValue(null), Category("Appearance"), Description("Indicates the array of colors that when set are used to draw the border of the item."), TypeConverter(typeof(ArrayConverter))]
+        public Color[] BorderColors
+        {
+            get
+            {
+                return _BorderColors;
+            }
+            set
+            {
+                if (_BorderColors != value)
+                {
+                    _BorderColors = value;
+                    //OnPropertyChanged(new PropertyChangedEventArgs("Colors"));
+                    this.Refresh();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Occurs after item visual style has changed.
+        /// </summary>
+        protected override void OnStyleChanged()
+        {
+            base.OnStyleChanged();
+            UpdateItemAppearance();
+        }
+
+        private int _PaddingHorizontal = 0;
+        /// <summary>
+        /// Gets or sets the additional padding added around the tab item in pixels. Default value is 0.
+        /// </summary>
+        [Browsable(true), DefaultValue(0), Category("Layout"), Description("Indicates additional padding added around the tab item in pixels.")]
+        public int PaddingHorizontal
+        {
+            get { return _PaddingHorizontal; }
+            set
+            {
+                _PaddingHorizontal = value;
+                UpdateItemAppearance();
+            }
+        }
+        private void UpdateItemAppearance()
+        {
+            this.VerticalPadding = 6;
+            this.HorizontalPadding = 14 + _PaddingHorizontal;
+
+            this.NeedRecalcSize = true;
+            this.OnAppearanceChanged();
+        }
+
+        private string _Title = "";
+        /// <summary>
+        /// Indicates an optional title for the associated panel. If not set item text is used.
+        /// </summary>
+        [DefaultValue(""), Category("Appearance"), Description("Indicates an optional title for the associated panel. If not set item text is used.")]
+        public string Title
+        {
+            get { return _Title; }
+            set
+            {
+                if (value == null) value = "";
+                if (_Title != value)
+                {
+                    string oldValue = _Title;
+                    _Title = value;
+                    OnTitleChanged(value, oldValue);
+                }
+            }
+        }
+
+        protected virtual void OnTitleChanged(string newValue, string oldValue)
+        {
+            if (this.Checked)
+            {
+                SideNavStrip strip = this.ContainerControl as SideNavStrip;
+                if (strip != null && strip.Parent is SideNav)
+                    ((SideNav)strip.Parent).UpdateSelectedItemTitle();
+            }
+        }
+
+        private bool _IsSystemMenu = false;
+        /// <summary>
+        /// Gets or sets whether this item acts as the SideNav control system menu which collapses and expands the SideNav items.
+        /// </summary>
+        [DefaultValue(false), Category("Behavior"), Description("Indicates whether this item acts as the SideNav control system menu which collapses and expands the SideNav items.")]
+        public bool IsSystemMenu
+        {
+            get { return _IsSystemMenu; }
+            set
+            {
+                if (_IsSystemMenu != value)
+                {
+                    bool oldValue = _IsSystemMenu;
+                    _IsSystemMenu = value;
+                    OnIsSystemMenuChanged(value, oldValue);
+                }
+            }
+        }
+
+        protected virtual void OnIsSystemMenuChanged(bool newValue, bool oldValue)
+        {
+            if (newValue && this.DesignMode)
+            {
+                if (string.IsNullOrEmpty(this.Symbol))
+                    this.Symbol = "\uf0c9";
+                if (string.IsNullOrEmpty(this.Text))
+                    this.Text = "Menu";
+            }
+
+            //throw new NotImplementedException();
+        }
+        #endregion
+
+        #region Hidden Properties
+        /// <summary>
+        /// Indicates whether the item will auto-collapse (fold) when clicked. 
+        /// When item is on popup menu and this property is set to false, menu will not
+        /// close when item is clicked.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), EditorBrowsable(EditorBrowsableState.Never), Category("Behavior"), DefaultValue(true), Description("Indicates whether the item will auto-collapse (fold) when clicked.")]
+        public override bool AutoCollapseOnClick
+        {
+            get
+            {
+                return base.AutoCollapseOnClick;
+            }
+            set
+            {
+                base.AutoCollapseOnClick = value;
+            }
+        }
+
+        /// <summary>
+        /// Indicates whether the item will auto-expand when clicked. 
+        /// When item is on top level bar and not on menu and contains sub-items, sub-items will be shown only if user
+        /// click the expand part of the button. Setting this propert to true will expand the button and show sub-items when user
+        /// clicks anywhere inside of the button. Default value is false which indicates that button is expanded only
+        /// if its expand part is clicked.
+        /// </summary>
+        [DefaultValue(false), Browsable(false), EditorBrowsable(EditorBrowsableState.Never), DevCoBrowsable(false), Category("Behavior"), Description("Indicates whether the item will auto-collapse (fold) when clicked.")]
+        public override bool AutoExpandOnClick
+        {
+            get
+            {
+                return base.AutoExpandOnClick;
+            }
+            set
+            {
+                base.AutoExpandOnClick = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether item can be customized by end user.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), EditorBrowsable(EditorBrowsableState.Never), DefaultValue(true), System.ComponentModel.Category("Behavior"), System.ComponentModel.Description("Indicates whether item can be customized by user.")]
+        public override bool CanCustomize
+        {
+            get
+            {
+                return base.CanCustomize;
+            }
+            set
+            {
+                base.CanCustomize = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or set a value indicating whether the button is in the checked state.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), Category("Appearance"), Description("Indicates whether item is checked or not."), DefaultValue(false)]
+        public override bool Checked
+        {
+            get
+            {
+                return base.Checked;
+            }
+            set
+            {
+                base.Checked = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether Click event will be auto repeated when mouse button is kept pressed over the item.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), EditorBrowsable(EditorBrowsableState.Never), DefaultValue(false), Category("Behavior"), Description("Gets or sets whether Click event will be auto repeated when mouse button is kept pressed over the item.")]
+        public override bool ClickAutoRepeat
+        {
+            get
+            {
+                return base.ClickAutoRepeat;
+            }
+            set
+            {
+                base.ClickAutoRepeat = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the auto-repeat interval for the click event when mouse button is kept pressed over the item.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), EditorBrowsable(EditorBrowsableState.Never), DefaultValue(600), Category("Behavior"), Description("Gets or sets the auto-repeat interval for the click event when mouse button is kept pressed over the item.")]
+        public override int ClickRepeatInterval
+        {
+            get
+            {
+                return base.ClickRepeatInterval;
+            }
+            set
+            {
+                base.ClickRepeatInterval = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the item is enabled.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), DefaultValue(true), Category("Behavior"), Description("Indicates whether is item enabled.")]
+        public override bool Enabled
+        {
+            get
+            {
+                return base.Enabled;
+            }
+            set
+            {
+                base.Enabled = value;
+            }
+        }
+
+        /// <summary>
+        /// Indicates item's visiblity when on pop-up menu.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), EditorBrowsable(EditorBrowsableState.Never), Category("Appearance"), Description("Indicates item's visiblity when on pop-up menu."), DefaultValue(eMenuVisibility.VisibleAlways)]
+        public override eMenuVisibility MenuVisibility
+        {
+            get
+            {
+                return base.MenuVisibility;
+            }
+            set
+            {
+                base.MenuVisibility = value;
+            }
+        }
+
+        /// <summary>
+        /// Indicates when menu items are displayed when MenuVisiblity is set to VisibleIfRecentlyUsed and RecentlyUsed is true.
+        /// </summary>
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never), DevCoBrowsable(false), Category("Appearance"), Description("Indicates when menu items are displayed when MenuVisiblity is set to VisibleIfRecentlyUsed and RecentlyUsed is true."), DefaultValue(ePersonalizedMenus.Disabled)]
+        public override ePersonalizedMenus PersonalizedMenus
+        {
+            get
+            {
+                return base.PersonalizedMenus;
+            }
+            set
+            {
+                base.PersonalizedMenus = value;
+            }
+        }
+
+        /// <summary>
+        /// Indicates Animation type for Popups.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), EditorBrowsable(EditorBrowsableState.Never), Category("Behavior"), Description("Indicates Animation type for Popups."), DefaultValue(ePopupAnimation.ManagerControlled)]
+        public override ePopupAnimation PopupAnimation
+        {
+            get
+            {
+                return base.PopupAnimation;
+            }
+            set
+            {
+                base.PopupAnimation = value;
+            }
+        }
+
+        /// <summary>
+        /// Indicates the font that will be used on the popup window.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), EditorBrowsable(EditorBrowsableState.Never), Category("Appearance"), Description("Indicates the font that will be used on the popup window."), DefaultValue(null)]
+        public override System.Drawing.Font PopupFont
+        {
+            get
+            {
+                return base.PopupFont;
+            }
+            set
+            {
+                base.PopupFont = value;
+            }
+        }
+
+        /// <summary>
+        /// Indicates whether sub-items are shown on popup Bar or popup menu.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), EditorBrowsable(EditorBrowsableState.Never), Category("Appearance"), Description("Indicates whether sub-items are shown on popup Bar or popup menu."), DefaultValue(ePopupType.Menu)]
+        public override ePopupType PopupType
+        {
+            get
+            {
+                return base.PopupType;
+            }
+            set
+            {
+                base.PopupType = value;
+            }
+        }
+
+        /// <summary>
+        /// Specifies the inital width for the Bar that hosts pop-up items. Applies to PopupType.Toolbar only.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), EditorBrowsable(EditorBrowsableState.Never), Category("Layout"), Description("Specifies the inital width for the Bar that hosts pop-up items. Applies to PopupType.Toolbar only."), DefaultValue(200)]
+        public override int PopupWidth
+        {
+            get
+            {
+                return base.PopupWidth;
+            }
+            set
+            {
+                base.PopupWidth = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether item will display sub items.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), EditorBrowsable(EditorBrowsableState.Never), DefaultValue(true), Category("Behavior"), Description("Determines whether sub-items are displayed.")]
+        public override bool ShowSubItems
+        {
+            get
+            {
+                return base.ShowSubItems;
+            }
+            set
+            {
+                base.ShowSubItems = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether the item expands automatically to fill out the remaining space inside the container. Applies to Items on stretchable, no-wrap Bars only.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), EditorBrowsable(EditorBrowsableState.Never), DefaultValue(false), Category("Appearance"), Description("Indicates whether item will stretch to consume empty space. Items on stretchable, no-wrap Bars only.")]
+        public override bool Stretch
+        {
+            get
+            {
+                return base.Stretch;
+            }
+            set
+            {
+                base.Stretch = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the width of the expand part of the button item.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), EditorBrowsable(EditorBrowsableState.Never), Category("Behavior"), Description("Indicates the width of the expand part of the button item."), DefaultValue(12)]
+        public override int SubItemsExpandWidth
+        {
+            get { return base.SubItemsExpandWidth; }
+            set
+            {
+                base.SubItemsExpandWidth = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or set the alternative shortcut text.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), EditorBrowsable(EditorBrowsableState.Never), DevCoBrowsable(false), System.ComponentModel.Category("Design"), System.ComponentModel.Description("Gets or set the alternative Shortcut Text.  This text appears next to the Text instead of any shortcuts"), System.ComponentModel.DefaultValue("")]
+        public override string AlternateShortCutText
+        {
+            get
+            {
+                return base.AlternateShortCutText;
+            }
+            set
+            {
+                base.AlternateShortCutText = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether item separator is shown before this item.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), DevCoBrowsable(false), System.ComponentModel.DefaultValue(false), System.ComponentModel.Category("Appearance"), System.ComponentModel.Description("Indicates whether this item is beginning of the group.")]
+        public override bool BeginGroup
+        {
+            get
+            {
+                return base.BeginGroup;
+            }
+            set
+            {
+                base.BeginGroup = value;
+            }
+        }
+
+        /// <summary>
+        /// Returns category for this item. If item cannot be customzied using the
+        /// customize dialog category is empty string.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), DevCoBrowsable(false), System.ComponentModel.DefaultValue(""), System.ComponentModel.Category("Design"), System.ComponentModel.Description("Indicates item category used to group similar items at design-time."), EditorBrowsable(EditorBrowsableState.Never)]
+        public override string Category
+        {
+            get
+            {
+
+                return base.Category;
+            }
+            set
+            {
+                base.Category = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the text color of the button when mouse is over the item.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), DevCoBrowsable(false), System.ComponentModel.Category("Appearance"), System.ComponentModel.Description("The foreground color used to display text when mouse is over the item."), EditorBrowsable(EditorBrowsableState.Never)]
+        public override Color HotForeColor
+        {
+            get
+            {
+                return base.HotForeColor;
+            }
+            set
+            {
+                base.HotForeColor = value;
+            }
+        }
+
+        /// <summary>
+        /// Indicates the way item is painting the picture when mouse is over it. Setting the value to Color will render the image in gray-scale when mouse is not over the item.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), DevCoBrowsable(false), System.ComponentModel.Category("Appearance"), System.ComponentModel.Description("Indicates the way item is painting the picture when mouse is over it. Setting the value to Color will render the image in gray-scale when mouse is not over the item."), System.ComponentModel.DefaultValue(eHotTrackingStyle.Default), EditorBrowsable(EditorBrowsableState.Never)]
+        public override eHotTrackingStyle HotTrackingStyle
+        {
+            get { return base.HotTrackingStyle; }
+            set
+            {
+                base.HotTrackingStyle = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets/Sets the button style which controls the appearance of the button elements. Changing the property can display image only, text only or image and text on the button at all times.
+        /// </summary>
+        [Browsable(false), Category("Appearance"), Description("Determines the style of the button."), DefaultValue(eButtonStyle.ImageAndText), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override eButtonStyle ButtonStyle
+        {
+            get
+            {
+                return base.ButtonStyle;
+            }
+            set
+            {
+                base.ButtonStyle = value;
+            }
+        }
+
+        
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/SideNav/SideNavItemPainter.cs b/PROMS/DotNetBar Source Code/Controls/SideNav/SideNavItemPainter.cs
new file mode 100644
index 00000000..bd94e056
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/SideNav/SideNavItemPainter.cs	
@@ -0,0 +1,33 @@
+using DevComponents.DotNetBar.Controls;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    internal class SideNavItemPainter : IOffice2007Painter
+    {
+        /// <summary>
+        /// Paints ListBoxItem.
+        /// </summary>
+        /// <param name="e">Provides arguments for the operation.</param>
+        public virtual void Paint(SideNavItemRendererEventArgs e) { }
+
+        #region IOffice2007Painter Members
+        private Office2007ColorTable _ColorTable = null; //new Office2007ColorTable();
+        public Office2007ColorTable ColorTable
+        {
+            get
+            {
+                return _ColorTable;
+            }
+            set
+            {
+                _ColorTable = value;
+            }
+        }
+
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/SideNav/SideNavItemRendererEventArgs.cs b/PROMS/DotNetBar Source Code/Controls/SideNav/SideNavItemRendererEventArgs.cs
new file mode 100644
index 00000000..55830f2e
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/SideNav/SideNavItemRendererEventArgs.cs	
@@ -0,0 +1,42 @@
+using DevComponents.DotNetBar.Controls;
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Text;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    /// <summary>
+    /// Provides data for the SideNavItem rendering events.
+    /// </summary>
+    public class SideNavItemRendererEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets or sets the reference to the item being rendered.
+        /// </summary>
+        public SideNavItem Item = null;
+
+        /// <summary>
+        /// Gets or sets the reference to graphics object.
+        /// </summary>
+        public Graphics Graphics = null;
+
+        /// <summary>
+        /// Indicates whether to cancel system rendering of the item.
+        /// </summary>
+        public bool Cancel = false;
+
+        internal ItemPaintArgs ItemPaintArgs = null;
+
+        /// <summary>
+        /// Creates new instance of the object and initializes it with default values.
+        /// </summary>
+        /// <param name="item">Reference to the ListBoxItem being rendered.</param>
+        /// <param name="g">Reference to the graphics object.</param>
+        public SideNavItemRendererEventArgs(SideNavItem item, Graphics g)
+        {
+            this.Item = item;
+            this.Graphics = g;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/SideNav/SideNavItemStateColorTable.cs b/PROMS/DotNetBar Source Code/Controls/SideNav/SideNavItemStateColorTable.cs
new file mode 100644
index 00000000..d438cad1
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/SideNav/SideNavItemStateColorTable.cs	
@@ -0,0 +1,115 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Text;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    /// <summary>
+    /// Defines color table for SideNav control.
+    /// </summary>
+    public class SideNavColorTable
+    {
+        /// <summary>
+        /// Gets or sets the color table for SideNavItem
+        /// </summary>
+        public SideNavItemColorTable SideNavItem = new SideNavItemColorTable();
+        /// <summary>
+        /// Gets or sets the background color of SideNav title bar.
+        /// </summary>
+        public Color TitleBackColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets the border color of the title of SideNav control.
+        /// </summary>
+        public Color[] TitleBorderColors = new Color[0];
+        /// <summary>
+        /// Gets or sets the color of the strip which hosts the items.
+        /// </summary>
+        public Color ItemsBackColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets the border color of the SideNav control.
+        /// </summary>
+        public Color[] BorderColors = new Color[0];
+        /// <summary>
+        /// Gets or sets the back color of panels that are attached to SideNavItem and displayed when SideNavItem is selected.
+        /// </summary>
+        public Color PanelBackColor = Color.Empty;
+    }
+
+    /// <summary>
+    /// Defines color table for SideNavItem
+    /// </summary>
+    public class SideNavItemColorTable
+    {
+        /// <summary>
+        /// Gets or sets the color table for Default state.
+        /// </summary>
+        public SideNavItemStateColorTable Default = new SideNavItemStateColorTable();
+        /// <summary>
+        /// Gets or sets the color table for MouseOver state.
+        /// </summary>
+        public SideNavItemStateColorTable MouseOver = new SideNavItemStateColorTable();
+        /// <summary>
+        /// Gets or sets the color table for Pressed state.
+        /// </summary>
+        public SideNavItemStateColorTable Pressed = new SideNavItemStateColorTable();
+        /// <summary>
+        /// Gets or sets the color table for Selected state.
+        /// </summary>
+        public SideNavItemStateColorTable Selected = new SideNavItemStateColorTable();
+    }
+
+    /// <summary>
+    /// Defines state color table for SideNavItem
+    /// </summary>
+    public class SideNavItemStateColorTable
+    {
+        public SideNavItemStateColorTable()
+        {
+            
+        }
+        public SideNavItemStateColorTable(Color textColor)
+        {
+            this.TextColor = textColor;
+        }
+        public SideNavItemStateColorTable(Color textColor, Color[] backColors, Color[] borderColors)
+        {
+            this.TextColor = textColor;
+            this.BackColors = backColors;
+            this.BorderColors = borderColors;
+        }
+
+        public SideNavItemStateColorTable(Color textColor, Color[] backColors, Color[] borderColors, int cornerRadius)
+        {
+            this.TextColor = textColor;
+            this.BackColors = backColors;
+            this.BorderColors = borderColors;
+            this.CornerRadius = cornerRadius;
+        }
+
+        /// <summary>
+        /// Indicates item text color.
+        /// </summary>
+        public Color TextColor = Color.Black;
+        /// <summary>
+        /// Gets or sets the background colors for the item.
+        /// </summary>
+        public Color[] BackColors = new Color[0];
+        /// <summary>
+        /// Gets or sets the back colors gradient angle if there is more than one color in BackColors array.
+        /// </summary>
+        public int BackColorsGradientAngle = 90;
+        /// <summary>
+        /// Gets or sets the gradient colors positions if there is more than one color in BackColors array.
+        /// </summary>
+        public float[] BackColorsPositions = new float[0];
+        /// <summary>
+        /// Gets or sets the border colors for the item.
+        /// </summary>
+        public Color[] BorderColors = new Color[0];
+        /// <summary>
+        /// Indicates the corner radius.
+        /// </summary>
+        public int CornerRadius = 0;
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/SideNav/SideNavPanel.cs b/PROMS/DotNetBar Source Code/Controls/SideNav/SideNavPanel.cs
new file mode 100644
index 00000000..0a46ac77
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/SideNav/SideNavPanel.cs	
@@ -0,0 +1,148 @@
+using DevComponents.DotNetBar.Rendering;
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Reflection;
+using System.Text;
+using System.Windows.Forms;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    /// <summary>
+    /// Represents a panel which hosts controls for the SideNavItem.
+    /// </summary>
+    [ToolboxItem(false)]
+    public class SideNavPanel : Panel, IScrollBarOverrideSupport
+    {
+        private ScrollbarSkinner _ScrollSkinner = null;
+        public SideNavPanel()
+        {
+            this.SetStyle(ControlStyles.AllPaintingInWmPaint
+                 | ControlStyles.ResizeRedraw
+                 | DisplayHelp.DoubleBufferFlag
+                 | ControlStyles.UserPaint
+                 | ControlStyles.Opaque
+                 , true);
+
+            _ScrollSkinner = new ScrollbarSkinner(this);
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            _ScrollSkinner.Dispose();
+            base.Dispose(disposing);
+        }
+
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            Color backColor = GetBackColor();
+            if (!backColor.IsEmpty)
+            {
+                using (SolidBrush brush = new SolidBrush(backColor))
+                    e.Graphics.FillRectangle(brush, this.ClientRectangle);
+            }
+            base.OnPaint(e);
+        }
+
+        private Color _BackColor = Color.Empty;
+        protected override void OnBackColorChanged(EventArgs e)
+        {
+            PropertyInfo prop = typeof (Control).GetProperty("RawBackColor",
+                BindingFlags.GetProperty | BindingFlags.NonPublic | BindingFlags.Instance);
+            if (prop != null)
+            {
+                _BackColor = (Color)prop.GetValue(this, null);
+            }
+            base.OnBackColorChanged(e);
+        }
+        
+        private Color GetBackColor()
+        {
+            if(!_BackColor.IsEmpty)
+                return _BackColor;
+            return GetColorTable().PanelBackColor;
+        }
+
+        private SideNavColorTable GetColorTable()
+        {
+            return ((Office2007Renderer)GlobalManager.Renderer).ColorTable.SideNav;
+        }
+
+        protected override void WndProc(ref Message m)
+        {
+            //Console.WriteLine("{0} Message {1}", DateTime.Now, MapMessage(m.Msg));
+            if (m.Msg == (int)WinApi.WindowsMessages.WM_VSCROLL || m.Msg == (int)WinApi.WindowsMessages.WM_HSCROLL || m.Msg == (int)WinApi.WindowsMessages.WM_MOUSEWHEEL)
+            {
+                base.WndProc(ref m);
+                OnScrollBarValueChanged(new ScrollValueChangedEventArgs(ScrollbarControl.MapMessageToScrollChange(m.Msg)));
+                return;
+            }
+            else if (m.Msg == (int)WinApi.WindowsMessages.WM_NCCALCSIZE)
+            {
+                base.WndProc(ref m);
+                OnNonClientSizeChanged(EventArgs.Empty);
+                return;
+            }
+            else if (m.Msg == 206 || m.Msg == 8270) // Internal RichTextBox message we use to trigger scroll-bar update
+            {
+                base.WndProc(ref m);
+                OnScrollBarValueChanged(new ScrollValueChangedEventArgs(eScrollBarScrollChange.Horizontal | eScrollBarScrollChange.Vertical));
+                return;
+            }
+            else if (m.Msg == (int)WinApi.WindowsMessages.WM_MOVE) // Internal RichTextBox message we use to trigger scroll-bar update
+            {
+                base.WndProc(ref m);
+                OnControlMoved(EventArgs.Empty);
+                return;
+            }
+            base.WndProc(ref m);
+        }
+
+        #region IScrollBarOverrideSupport Members
+        [Browsable(false)]
+        public event EventHandler NonClientSizeChanged;
+        /// <summary>
+        /// Raises NonClientSizeChanged event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnNonClientSizeChanged(EventArgs e)
+        {
+            EventHandler handler = NonClientSizeChanged;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        public event ScrollValueChangedHandler ScrollBarValueChanged;
+        /// <summary>
+        /// Raises ScrollBarValueChanged event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnScrollBarValueChanged(ScrollValueChangedEventArgs e)
+        {
+            ScrollValueChangedHandler handler = ScrollBarValueChanged;
+            if (handler != null)
+                handler(this, e);
+        }
+        [Browsable(false)]
+        public event EventHandler ControlMoved;
+        /// <summary>
+        /// Raises NonClientSizeChanged event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnControlMoved(EventArgs e)
+        {
+            EventHandler handler = ControlMoved;
+            if (handler != null)
+                handler(this, e);
+        }
+        bool IScrollBarOverrideSupport.DesignMode
+        {
+            get
+            {
+                return this.DesignMode;
+            }
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/SideNav/SideNavStrip.cs b/PROMS/DotNetBar Source Code/Controls/SideNav/SideNavStrip.cs
new file mode 100644
index 00000000..ae859976
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/SideNav/SideNavStrip.cs	
@@ -0,0 +1,139 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Text;
+using DevComponents.DotNetBar.Rendering;
+using System.Drawing;
+using DevComponents.AdvTree.Layout;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    [ToolboxItem(false)]
+    public class SideNavStrip : ItemControl
+    {
+        #region Constructor
+        private SimpleItemContainer _ItemContainer = null;
+
+        public SideNavStrip()
+        {
+            _ItemContainer = new SimpleItemContainer();
+            _ItemContainer.GlobalItem = false;
+            _ItemContainer.ContainerControl = this;
+            _ItemContainer.Stretch = true;
+            _ItemContainer.Displayed = true;
+            _ItemContainer.Style = eDotNetBarStyle.StyleManagerControlled;
+            _ItemContainer.LayoutOrientation = eOrientation.Vertical;
+            //base.AutoSize = true;
+            this.ColorScheme.Style = eDotNetBarStyle.StyleManagerControlled;
+            _ItemContainer.SetOwner(this);
+            this.SetBaseItemContainer(_ItemContainer);
+            this.BackgroundStyle.Class = ElementStyleClassKeys.SideNavStripKey;
+            StyleManager.Register(this);
+        }
+        #endregion
+
+        #region Implementation
+        /// <summary>
+        /// Called by StyleManager to notify control that style on manager has changed and that control should refresh its appearance if
+        /// its style is controlled by StyleManager.
+        /// </summary>
+        /// <param name="newStyle">New active style.</param>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void StyleManagerStyleChanged(eDotNetBarStyle newStyle)
+        {
+            _ItemContainer.NeedRecalcSize = true;
+        }
+
+        /// <summary>
+        /// Returns collection of items on a bar.
+        /// </summary>
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content), Browsable(false)]
+        public SubItemsCollection Items
+        {
+            get
+            {
+                return _ItemContainer.SubItems;
+            }
+        }
+
+        /// <summary>
+        /// Gets currently selected item.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public SideNavItem SelectedItem
+        {
+            get
+            {
+                foreach (BaseItem item in this.Items)
+                {
+                    if (item is SideNavItem && ((SideNavItem)item).Checked)
+                    {
+                        return (SideNavItem)item;
+                    }
+                }
+                return null;
+            }
+            set
+            {
+                if (value != null && value.Panel != null)
+                    value.Checked = true;
+            }
+        }
+
+        protected override void PaintControl(ItemPaintArgs pa)
+        {
+            base.PaintControl(pa);
+            SideNavItem selectedItem = this.SelectedItem;
+            if (selectedItem != null)
+            {
+                Color color = GetBorderColor();
+                if (!color.IsEmpty)
+                {
+                    Graphics g = pa.Graphics;
+                    using (Pen pen = new Pen(color))
+                    {
+                        if (selectedItem.TopInternal > 0)
+                            g.DrawLine(pen, this.Width - 1, 0, this.Width - 1, selectedItem.TopInternal - 1);
+                        if (selectedItem.Bounds.Bottom < this.Height)
+                            g.DrawLine(pen, this.Width - 1, selectedItem.Bounds.Bottom, this.Width - 1, this.Height);
+                    }
+
+
+                }
+            }
+        }
+
+        private Color GetBorderColor()
+        {
+            SideNavColorTable ct = GetColorTable();
+            if (ct.BorderColors != null && ct.BorderColors.Length > 0)
+                return ct.BorderColors[0];
+            return Color.Empty;
+        }
+
+        private SideNavColorTable GetColorTable()
+        {
+            return ((Office2007Renderer)GlobalManager.Renderer).ColorTable.SideNav;
+        }
+        internal void SelectFirstItem()
+        {
+            foreach (BaseItem item in this.Items)
+            {
+                if (item.Visible && item.Enabled && item is SideNavItem)
+                {
+                    ((SideNavItem)item).Checked = true;
+                    break;
+                }
+            }
+        }
+
+        protected override void OnButtonCheckedChanged(ButtonItem item, EventArgs e)
+        {
+            if (this.Parent is SideNav)
+                ((SideNav)this.Parent).UpdateSelectedItemTitle();
+            base.OnButtonCheckedChanged(item, e);
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/SlidePanel.ico b/PROMS/DotNetBar Source Code/Controls/SlidePanel.ico
new file mode 100644
index 00000000..06730849
Binary files /dev/null and b/PROMS/DotNetBar Source Code/Controls/SlidePanel.ico differ
diff --git a/PROMS/DotNetBar Source Code/Controls/SlidePanel/SlidePanel.cs b/PROMS/DotNetBar Source Code/Controls/SlidePanel/SlidePanel.cs
new file mode 100644
index 00000000..e3e082af
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/SlidePanel/SlidePanel.cs	
@@ -0,0 +1,772 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows.Forms;
+using System.ComponentModel;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    /// <summary>
+    /// Represents the panel which can slide out and into the view.
+    /// </summary>
+    [ToolboxBitmap(typeof(CircularProgress), "Controls.SlidePanel.ico"), ToolboxItem(true), Designer("DevComponents.DotNetBar.Design.SlidePanelDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+    public class SlidePanel : UserControl
+    {
+        internal const int DefaultAnimationTime = 500;
+        #region Events
+        /// <summary>
+        /// Occurs when IsOpen property value has changed, i.e. slide-panel is shown or hidden.
+        /// </summary>
+        [Description("Occurs when IsOpen property value has changed, i.e. slide-panel is shown or hidden.")]
+        public event EventHandler IsOpenChanged;
+        /// <summary>
+        /// Raises IsOpenChanged event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnIsOpenChanged(EventArgs e)
+        {
+            EventHandler handler = IsOpenChanged;
+            if (handler != null)
+                handler(this, e);
+        }
+        #endregion
+
+        #region Constructor
+        protected override void Dispose(bool disposing)
+        {
+            DisposeSlideOutButton();
+            base.Dispose(disposing);
+        }
+        #endregion
+
+        #region Implementation
+
+        private eSlideSide _SlideSide = eSlideSide.Left;
+        /// <summary>
+        /// Gets or sets side panel slides into.
+        /// </summary>
+        [DefaultValue(eSlideSide.Left), Category("Behavior"), Description("Indicates side panel slides into.")]
+        public eSlideSide SlideSide
+        {
+            get { return _SlideSide; }
+            set
+            {
+                if (value != _SlideSide)
+                {
+                    eSlideSide oldValue = _SlideSide;
+                    _SlideSide = value;
+                    OnSlideSideChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when SlideSide property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnSlideSideChanged(eSlideSide oldValue, eSlideSide newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("SlideSide"));
+            if (!this.IsOpen)
+            {
+                WaitForCurrentAnimationFinish();
+                this.Bounds = GetSlideOutBounds(this.Parent, _OpenBounds);
+
+                if (_SlideOutButtonVisible)
+                    CreateSlideOutButton();
+            }
+        }
+
+        private bool _IsOpen = true;
+        /// <summary>
+        /// Gets or sets whether panel is open. When this property is changed panel will slide in or out of the view.
+        /// </summary>
+        [Browsable(false), DefaultValue(true), Description("Indicates whether panel is open. When this property is changed panel will slide in or out of the view.")]
+        public bool IsOpen
+        {
+            get { return _IsOpen; }
+            set
+            {
+                if (_UsesBlockingAnimation && _CurrentAnimation != null || _IsWaiting) return;
+                if (value != _IsOpen)
+                {
+                    bool oldValue = _IsOpen;
+                    _IsOpen = value;
+                    OnIsOpenChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when IsOpen property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnIsOpenChanged(bool oldValue, bool newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("IsOpen"));
+            if (!newValue)
+                SlideOutOfView();
+            else
+                SlideIntoView();
+            OnIsOpenChanged(EventArgs.Empty);
+        }
+
+        private bool _UsesBlockingAnimation = false;
+        /// <summary>
+        /// Gets or sets whether panel uses modal animation, meaning when IsOpen property is set the call is not returned until animation is complete.
+        /// </summary>
+        [Browsable(false)]
+        public bool UsesBlockingAnimation
+        {
+            get { return _UsesBlockingAnimation; }
+            set
+            {
+                _UsesBlockingAnimation = value;
+            }
+        }
+
+        private Rectangle _OpenBounds = Rectangle.Empty;
+        /// <summary>
+        /// Gets or sets the open panel bounds. When control IsOpen=false and panel is collapsed its original bounds are stored in OpenBounds property and restored once panel is open.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public Rectangle OpenBounds
+        {
+            get { return _OpenBounds; }
+            set
+            {
+                _OpenBounds = value;
+                if (!this.Visible && this.Bounds.Size != _OpenBounds.Size)
+                    this.Bounds = GetSlideOutBounds(this.Parent, _OpenBounds);
+            }
+        }
+        /// <summary>
+        /// Slides panel into the view.
+        /// </summary>
+        private void SlideIntoView()
+        {
+            Animation.Animation current = _CurrentAnimation;
+            if (current != null)
+            {
+                current.Stop();
+                WaitForCurrentAnimationFinish();
+            }
+
+            Rectangle bounds = this.Bounds;
+            Rectangle targetBounds = _OpenBounds;
+            if (_SlideOutButton != null) _SlideOutButton.Visible = false;
+
+            if (_AnimationTime > 0)
+            {
+                _IsAnimating = true;
+                //BarFunctions.AnimateControl(this, true, _AnimationTime, bounds, targetBounds);
+                this.Visible = true;
+                Animation.AnimationRectangle anim = new DevComponents.DotNetBar.Animation.AnimationRectangle(
+                   new Animation.AnimationRequest(this, "Bounds", bounds, targetBounds),
+                   Animation.AnimationEasing.EaseOutExpo, _AnimationTime);
+                anim.AnimationCompleted += new EventHandler(AnimationCompleted);
+                anim.Start();
+                _CurrentAnimation = anim;
+            }
+            else
+                this.Bounds = targetBounds;
+            if (_SlideOutButtonVisible && _SlideOutButton != null)
+            {
+                DisposeSlideOutButton();
+            }
+        }
+
+        internal void AbortAnimation()
+        {
+            Animation.Animation anim = _CurrentAnimation;
+            _CurrentAnimation = null;
+            if (anim != null)
+            {
+                anim.Stop();
+                anim.Dispose();
+                //Console.WriteLine("{0} Animation Forcefully Stopped", DateTime.Now);
+            }
+        }
+
+        private bool _IsWaiting = false;
+        /// <summary>
+        /// Waits for current slide animation to finish and then returns control.
+        /// </summary>
+        public void WaitForCurrentAnimationFinish()
+        {
+            if (_IsWaiting) return;
+
+            _IsWaiting = true;
+            try
+            {
+                if (_CurrentAnimation == null) return;
+                DateTime start = DateTime.Now;
+                while (_CurrentAnimation != null)
+                {
+                    Application.DoEvents();
+                    if (DateTime.Now.Subtract(start).TotalMilliseconds > _AnimationTime * 1.5f)
+                    {
+                        AbortAnimation();
+                        break;
+                    }
+                }
+            }
+            finally
+            {
+                _IsWaiting = false;
+            }
+        }
+        private void DisposeSlideOutButton()
+        {
+            if (_SlideOutButton == null) return;
+
+            Control parent = _SlideOutButton.Parent;
+            if (parent != null)
+            {
+                parent.Resize -= ParentResize;
+                parent.Controls.Remove(_SlideOutButton);
+            }
+            _SlideOutButton.Dispose();
+            _SlideOutButton = null;
+        }
+
+        private Animation.Animation _CurrentAnimation = null;
+        /// <summary>
+        /// Slides panel out of the view.
+        /// </summary>
+        private void SlideOutOfView()
+        {
+            Animation.Animation current = _CurrentAnimation;
+            if (current != null)
+            {
+                current.Stop();
+                WaitForCurrentAnimationFinish();
+            }
+            
+            Rectangle bounds = this.Bounds;
+            Rectangle targetBounds = GetSlideOutBounds();
+
+            if (_AnimationTime > 0 && this.Visible)
+            {
+                _IsAnimating = true;
+                //BarFunctions.AnimateControl(this, true, _AnimationTime, bounds, targetBounds);
+                Animation.AnimationRectangle anim = new DevComponents.DotNetBar.Animation.AnimationRectangle(
+                    new Animation.AnimationRequest(this, "Bounds", bounds, targetBounds),
+                    Animation.AnimationEasing.EaseOutExpo, _AnimationTime);
+                anim.AnimationCompleted += new EventHandler(AnimationCompleted);
+                anim.Start();
+                _CurrentAnimation = anim;
+                //this.Visible = false;
+            }
+            else
+                this.Bounds = targetBounds;
+            _OpenBounds = bounds;
+
+            if (_SlideOutButtonVisible)
+                CreateSlideOutButton();
+        }
+
+        private bool _IsAnimating = false;
+        internal bool IsAnimating
+        {
+            get
+            {
+                return _IsAnimating;
+            }
+        }
+
+        private void AnimationCompleted(object sender, EventArgs e)
+        {
+            //Console.WriteLine("{0} Animation Completed", DateTime.Now);
+            Animation.Animation anim = _CurrentAnimation;
+            _CurrentAnimation = null;
+            if (anim != null)
+                anim.Dispose();
+            if (!_IsOpen)
+            {
+                this.Visible = false;
+            }
+            _IsAnimating = false;
+        }
+        public void SlideOutOfViewSilent(Control parent)
+        {
+            _OpenBounds = this.Bounds;
+            this.Bounds = GetSlideOutBounds(parent);
+            _IsOpen = false;
+        }
+
+        private SliderButton _SlideOutButton = null;
+        private void CreateSlideOutButton()
+        {
+            DisposeSlideOutButton();
+            Control parent = this.Parent;
+            if (parent == null) return;
+
+            _SlideOutButton = new SliderButton(this);
+            if (_SlideOutButtonStyle != null)
+                _SlideOutButton.Style = _SlideOutButtonStyle;
+            else
+                _SlideOutButton.Style = new ElementStyle(DevComponents.DotNetBar.Rendering.ElementStyleClassKeys.SlideOutButtonKey);
+
+            Size activeSlideOutSize = Dpi.Size(_SlideOutActiveButtonSize);
+            Size slideOutSize = Dpi.Size(_SlideOutButtonSize);
+            if (_SlideSide == eSlideSide.Top || _SlideSide == eSlideSide.Bottom) // Flip width/height
+            {
+                activeSlideOutSize = new Size(activeSlideOutSize.Height, activeSlideOutSize.Width);
+                slideOutSize = new Size(slideOutSize.Height, slideOutSize.Width);
+            }
+            _SlideOutButton.ActiveSliderSize = activeSlideOutSize;
+            _SlideOutButton.SliderSize = slideOutSize;
+            _SlideOutButton.Symbol = _Symbol;
+            _SlideOutButton.SymbolColor = _SymbolColor;
+            _SlideOutButton.SymbolSet = _SymbolSet;
+            _SlideOutButton.SymbolSize = _SymbolSize;
+            parent.Controls.Add(_SlideOutButton);
+            parent.Controls.SetChildIndex(_SlideOutButton, 0);
+            parent.Resize += ParentResize;
+        }
+
+        private void ParentResize(object sender, EventArgs e)
+        {
+            if (_SlideOutButton != null) _SlideOutButton.UpdatePosition();
+        }
+
+        private Rectangle GetSlideOutBounds()
+        {
+            return GetSlideOutBounds(this.Parent);
+        }
+        private Rectangle GetSlideOutBounds(Control parent)
+        {
+            return GetSlideOutBounds(parent, this.Bounds);
+        }
+        private Rectangle GetSlideOutBounds(Control parent, Rectangle panelBounds)
+        {
+            if (parent == null) return panelBounds;
+
+            Rectangle r = panelBounds;
+            if (_SlideSide == eSlideSide.Left)
+            {
+                r.X = -r.Width;
+            }
+            else if (_SlideSide == eSlideSide.Right)
+            {
+                r.X = parent.Width;
+            }
+            else if (_SlideSide == eSlideSide.Top)
+            {
+                r.Y = -r.Height;
+            }
+            else if (_SlideSide == eSlideSide.Bottom)
+            {
+                r.Y = parent.Height;
+            }
+            return r;
+        }
+
+        private int _AnimationTime = DefaultAnimationTime;
+        /// <summary>
+        /// Gets or sets the animation duration time in milliseconds. Setting this property to 0 will disable slide animation.
+        /// </summary>
+        [DefaultValue(DefaultAnimationTime), Category("Behavior"), Description("Indicates animation duration time in milliseconds. Setting this property to 0 will disable slide animation.")]
+        public int AnimationTime
+        {
+            get { return _AnimationTime; }
+            set
+            {
+                if (value != _AnimationTime)
+                {
+                    int oldValue = _AnimationTime;
+                    _AnimationTime = value;
+                    OnAnimationTimeChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when AnimationTime property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnAnimationTimeChanged(int oldValue, int newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("AnimationTime"));
+
+        }
+
+        private bool _SlideOutButtonVisible = true;
+        /// <summary>
+        /// Gets or sets whether slide out button is shown when panel is out of the view and which allows panel to be shown.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether slide out button is shown when panel is out of the view and which allows panel to be shown.")]
+        public bool SlideOutButtonVisible
+        {
+            get { return _SlideOutButtonVisible; }
+            set
+            {
+                if (value != _SlideOutButtonVisible)
+                {
+                    bool oldValue = _SlideOutButtonVisible;
+                    _SlideOutButtonVisible = value;
+                    OnSlideOutButtonVisibleChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when SlideOutButtonVisible property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnSlideOutButtonVisibleChanged(bool oldValue, bool newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("SlideOutButtonVisible"));
+            if (_IsOpen) return;
+            if (newValue)
+                CreateSlideOutButton();
+            else
+                DisposeSlideOutButton();
+        }
+
+        private Size _SlideOutButtonSize = SliderButton.DefaultSliderSize;
+        /// <summary>
+        /// Gets or sets the slide-out buttton size in default state.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates slide-out buttton size in default state.")]
+        public Size SlideOutButtonSize
+        {
+            get { return _SlideOutButtonSize; }
+            set
+            {
+                if (value != _SlideOutButtonSize)
+                {
+                    Size oldValue = _SlideOutButtonSize;
+                    _SlideOutButtonSize = value;
+                    OnSlideOutButtonSizeChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when SlideOutButtonSize property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnSlideOutButtonSizeChanged(Size oldValue, Size newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("SlideOutButtonSize"));
+            if (_SlideOutButton != null)
+            {
+                _SlideOutButton.SliderSize = newValue;
+                _SlideOutButton.UpdatePosition();
+            }
+        }
+        /// <summary>
+        /// Returns whether property should be serialized.
+        /// </summary>
+        public bool ShouldSerializeSlideOutButtonSize()
+        {
+            return _SlideOutButtonSize != SliderButton.DefaultSliderSize;
+        }
+        /// <summary>
+        /// Resets property to default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetSlideOutButtonSize()
+        {
+            SlideOutButtonSize = SliderButton.DefaultSliderSize;
+        }
+
+        private Size _SlideOutActiveButtonSize = SliderButton.DefaultActiveSliderSize;
+        /// <summary>
+        /// Gets or sets active (mouse over) slide out button size.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates active (mouse over) slide out button size.")]
+        public Size SlideOutActiveButtonSize
+        {
+            get { return _SlideOutActiveButtonSize; }
+            set
+            {
+                if (value != _SlideOutActiveButtonSize)
+                {
+                    Size oldValue = _SlideOutActiveButtonSize;
+                    _SlideOutActiveButtonSize = value;
+                    OnSlideOutActiveButtonSizeChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when SlideOutActiveButtonSize property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnSlideOutActiveButtonSizeChanged(Size oldValue, Size newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("SlideOutActiveButtonSize"));
+            if (_SlideOutButton != null)
+            {
+                _SlideOutButton.ActiveSliderSize = newValue;
+                _SlideOutButton.UpdatePosition();
+            }
+        }
+        /// <summary>
+        /// Returns whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeSlideOutActiveButtonSize()
+        {
+            return _SlideOutActiveButtonSize != SliderButton.DefaultActiveSliderSize;
+        }
+        /// <summary>
+        /// Resets property to default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetSlideOutActiveButtonSize()
+        {
+            SlideOutActiveButtonSize = SliderButton.DefaultActiveSliderSize;
+        }
+
+        private ElementStyle _SlideOutButtonStyle = null;
+        /// <summary>
+        /// Gets or sets slide-out button style.
+        /// </summary>
+        [DefaultValue(null), Category("Appearance"), Description("Indicates slide-out button style.")]
+        public ElementStyle SlideOutButtonStyle
+        {
+            get { return _SlideOutButtonStyle; }
+            set
+            {
+                if (value != _SlideOutButtonStyle)
+                {
+                    ElementStyle oldValue = _SlideOutButtonStyle;
+                    _SlideOutButtonStyle = value;
+                    OnSlideOutButtonStyleChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when SlideOutButtonStyle property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnSlideOutButtonStyleChanged(ElementStyle oldValue, ElementStyle newValue)
+        {
+            if (newValue != null)
+            {
+                if (_SlideOutButton != null)
+                    _SlideOutButton.Style = newValue;
+            }
+            //OnPropertyChanged(new PropertyChangedEventArgs("SlideOutButtonStyle"));
+        }
+
+        private bool _CenterContent = false;
+        /// <summary>
+        /// Gets or sets whether panel centers the Controls inside of it. Default value is false.
+        /// </summary>
+        internal bool CenterContent
+        {
+            get { return _CenterContent; }
+            set
+            {
+                if (value != _CenterContent)
+                {
+                    bool oldValue = _CenterContent;
+                    _CenterContent = value;
+                    OnCenterContentChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when CenterContent property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnCenterContentChanged(bool oldValue, bool newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("CenterContent"));
+            if (newValue)
+                CenterControls();
+        }
+
+        protected override void OnResize(EventArgs e)
+        {
+            if (_CenterContent)
+                CenterControls();
+            base.OnResize(e);
+        }
+
+        protected override void OnControlAdded(ControlEventArgs e)
+        {
+            if (_CenterContent)
+                CenterControl(e.Control);
+            base.OnControlAdded(e);
+        }
+
+        private void CenterControl(Control item)
+        {
+            Point loc = new Point(Math.Max(0, (this.Width - item.Width) / 2), Math.Max(0, (this.Height - item.Height) / 2));
+            if (item.Location != loc)
+                item.Location = loc;
+        }
+        private void CenterControls()
+        {
+            foreach (Control item in this.Controls)
+            {
+                CenterControl(item);
+            }
+        }
+
+        [Browsable(true), DesignerSerializationVisibility(DesignerSerializationVisibility.Visible), EditorBrowsable(EditorBrowsableState.Always), Bindable(true)]
+        public override string Text
+        {
+            get
+            {
+                return base.Text;
+            }
+            set
+            {
+                base.Text = value;
+            }
+        }
+
+
+
+
+
+
+        private Color _SymbolColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets the color of the Symbol displayed on slideout button.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates color of the Symbol displayed on slideout button.")]
+        public Color SymbolColor
+        {
+            get { return _SymbolColor; }
+            set { _SymbolColor = value; this.Invalidate(); }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeSymbolColor()
+        {
+            return !_SymbolColor.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetSymbolColor()
+        {
+            this.SymbolColor = Color.Empty;
+        }
+
+        /// <summary>
+        /// Gets the realized symbol string.
+        /// </summary>
+        [Browsable(false)]
+        public string SymbolRealized
+        {
+            get { return _SymbolRealized; }
+        }
+        private string _Symbol = "", _SymbolRealized = "";
+        /// <summary>
+        /// Indicates the symbol displayed on face of the slideout button.
+        /// </summary>
+        [DefaultValue(""), Category("Appearance"), Description("Indicates the symbol displayed on face of the slideout button.")]
+        [Editor("DevComponents.DotNetBar.Design.SymbolTypeEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor))]
+        public string Symbol
+        {
+            get { return _Symbol; }
+            set
+            {
+                if (value != _Symbol)
+                {
+                    string oldValue = _Symbol;
+                    _Symbol = value;
+                    OnSymbolChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when Symbol property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnSymbolChanged(string oldValue, string newValue)
+        {
+            if (string.IsNullOrEmpty(newValue))
+                _SymbolRealized = "";
+            else
+                _SymbolRealized = Symbols.GetSymbol(newValue);
+            this.Invalidate();
+        }
+
+        private eSymbolSet _SymbolSet = eSymbolSet.Awesome;
+        /// <summary>
+        /// Gets or sets the symbol set used to represent the Symbol.
+        /// </summary>
+        [Browsable(false), DefaultValue(eSymbolSet.Awesome)]
+        public eSymbolSet SymbolSet
+        {
+            get { return _SymbolSet; }
+            set
+            {
+                if (_SymbolSet != value)
+                {
+                    eSymbolSet oldValue = _SymbolSet;
+                    _SymbolSet = value;
+                    OnSymbolSetChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when SymbolSet property value changes.
+        /// </summary>
+        /// <param name="oldValue">Indciates old value</param>
+        /// <param name="newValue">Indicates new value</param>
+        protected virtual void OnSymbolSetChanged(eSymbolSet oldValue, eSymbolSet newValue)
+        {
+            this.Invalidate();
+            this.Refresh();
+        }
+
+
+        private float _SymbolSize = 10f;
+        /// <summary>
+        /// Indicates the size of the symbol in points.
+        /// </summary>
+        [DefaultValue(10f), Category("Appearance"), Description("Indicates the size of the symbol in points.")]
+        public float SymbolSize
+        {
+            get { return _SymbolSize; }
+            set
+            {
+                if (value != _SymbolSize)
+                {
+                    float oldValue = _SymbolSize;
+                    _SymbolSize = value;
+                    OnSymbolSizeChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when SymbolSize property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnSymbolSizeChanged(float oldValue, float newValue)
+        {
+            this.Invalidate();
+        }
+        #endregion
+    }
+
+    /// <summary>
+    /// Defines the side SlidePanel slides into.
+    /// </summary>
+    public enum eSlideSide
+    {
+        Left,
+        Right,
+        Top,
+        Bottom
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/SlidePanel/SliderButton.cs b/PROMS/DotNetBar Source Code/Controls/SlidePanel/SliderButton.cs
new file mode 100644
index 00000000..f1190721
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/SlidePanel/SliderButton.cs	
@@ -0,0 +1,627 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows.Forms;
+using System.Drawing;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    /// <summary>
+    /// Represents the slider button that is used by SlidePanel when collapsed to slide it back into the view.
+    /// </summary>
+    [ToolboxItem(false)]
+    public class SliderButton : Control
+    {
+        #region Events
+
+        #endregion
+
+        #region Constructor
+        private SlidePanel _SlidePanel = null;
+        /// <summary>
+        /// Initializes a new instance of the SliderButton class.
+        /// </summary>
+        /// <param name="slidePanel"></param>
+        public SliderButton(SlidePanel slidePanel)
+        {
+            _SlidePanel = slidePanel;
+            this.Margin = new System.Windows.Forms.Padding();
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            if (_Style != null)
+                _Style.StyleChanged -= this.ElementStyleChanged;
+            DestroyTopmostCheckTimer();
+            base.Dispose(disposing);
+        }
+        #endregion
+
+        #region Implementation
+        protected override void OnParentChanged(EventArgs e)
+        {
+            if (this.Parent != null)
+                UpdatePosition();
+            base.OnParentChanged(e);
+        }
+        protected override void OnClick(EventArgs e)
+        {
+            if (!_IsSlidingActive)
+                _SlidePanel.IsOpen = true;
+            base.OnClick(e);
+        }
+        private Point _MouseOffset = Point.Empty;
+        private Point _MouseDownPoint = Point.Empty;
+        protected override void OnMouseDown(MouseEventArgs e)
+        {
+            if (e.Button == MouseButtons.Left)
+            {
+                _MouseDownPoint = Control.MousePosition;
+                IsMouseDown = true;
+            }
+            base.OnMouseDown(e);
+        }
+        private Point _OriginalSlidePanelLocation = Point.Empty;
+        private bool _IsSlidingActive = false;
+        private int MaximizedOffset = SystemInformation.FrameBorderSize.Width * 2 - 2;
+        private static readonly Point SlideOffsetStart = new Point(4, 4);
+        private static readonly Point SlideOutSnapOffset = new Point(96, 96);
+        protected override void OnMouseMove(MouseEventArgs e)
+        {
+            if (IsMouseDown && !_IsSlidingActive)
+            {
+                eSlideSide side = _SlidePanel.SlideSide;
+                if (side == eSlideSide.Left && Control.MousePosition.X - _MouseDownPoint.X > SlideOffsetStart.X)
+                    _IsSlidingActive = true;
+                else if (side == eSlideSide.Right && _MouseDownPoint.X - Control.MousePosition.X > SlideOffsetStart.X)
+                    _IsSlidingActive = true;
+                else if (side == eSlideSide.Top && Control.MousePosition.Y - _MouseDownPoint.Y > SlideOffsetStart.Y)
+                    _IsSlidingActive = true;
+                else if (side == eSlideSide.Bottom && _MouseDownPoint.Y - Control.MousePosition.Y > SlideOffsetStart.Y)
+                    _IsSlidingActive = true;
+            }
+            if (IsMouseDown && _IsSlidingActive)
+            {
+                if (!this.Capture)
+                    this.Capture = true;
+                Point p = Control.MousePosition;
+                eSlideSide side = _SlidePanel.SlideSide;
+                if (side == eSlideSide.Left)
+                    _MouseOffset = new Point(Math.Max(0, p.X - _MouseDownPoint.X), 0);
+                else if (side == eSlideSide.Right)
+                    _MouseOffset = new Point(Math.Max(0, _MouseDownPoint.X - p.X), 0);
+                else if (side == eSlideSide.Top)
+                    _MouseOffset = new Point(0, Math.Max(0, p.Y - _MouseDownPoint.Y));
+                else if (side == eSlideSide.Bottom)
+                    _MouseOffset = new Point(0, Math.Max(0, _MouseDownPoint.Y - p.Y));
+
+                if (!_MouseOffset.IsEmpty)
+                {
+                    UpdatePosition();
+
+                    // Slide panel out
+                    if (!_SlidePanel.Visible)
+                    {
+                        _SlidePanel.Visible = true;
+                        _OriginalSlidePanelLocation = _SlidePanel.Location;
+                    }
+                    if (side == eSlideSide.Left)
+                        _SlidePanel.Left = _OriginalSlidePanelLocation.X + _MouseOffset.X;
+                    else if (side == eSlideSide.Right)
+                        _SlidePanel.Left = _OriginalSlidePanelLocation.X - _MouseOffset.X;
+                    else if (side == eSlideSide.Top)
+                        _SlidePanel.Top = _OriginalSlidePanelLocation.Y + _MouseOffset.Y;
+                    else if (side == eSlideSide.Bottom)
+                        _SlidePanel.Top = _OriginalSlidePanelLocation.Y - _MouseOffset.Y;
+                }
+            }
+            base.OnMouseMove(e);
+        }
+        protected override void OnMouseUp(MouseEventArgs e)
+        {
+            if (IsMouseDown)
+            {
+                Point mousePosition = Control.MousePosition;
+                if (this.Capture) this.Capture = false;
+
+                eSlideSide side = _SlidePanel.SlideSide;
+                if (side == eSlideSide.Left && mousePosition.X - _MouseDownPoint.X > SlideOutSnapOffset.X)
+                    _SlidePanel.IsOpen = true;
+                else if (side == eSlideSide.Right && _MouseDownPoint.X - mousePosition.X > SlideOutSnapOffset.X)
+                    _SlidePanel.IsOpen = true;
+                else if (side == eSlideSide.Top && mousePosition.Y - _MouseDownPoint.Y > SlideOutSnapOffset.Y)
+                    _SlidePanel.IsOpen = true;
+                else if (side == eSlideSide.Bottom && _MouseDownPoint.Y - mousePosition.Y > SlideOutSnapOffset.Y)
+                    _SlidePanel.IsOpen = true;
+                else if (_IsSlidingActive)
+                {
+                    _SlidePanel.Location = _OriginalSlidePanelLocation;
+                    _SlidePanel.Visible = false;
+                }
+
+                IsMouseDown = false;
+                UpdatePosition();
+            }
+            base.OnMouseUp(e);
+        }
+        protected override void OnMouseCaptureChanged(EventArgs e)
+        {
+            if (this.IsMouseDown && !this.Capture)
+            {
+            }
+            base.OnMouseCaptureChanged(e);
+        }
+        protected override void OnMouseEnter(EventArgs e)
+        {
+            Size newSize = ActiveSliderSize;
+            if (newSize != this.Size)
+            {
+                this.Size = newSize;
+                UpdatePosition();
+            }
+            base.OnMouseEnter(e);
+        }
+        protected override void OnMouseLeave(EventArgs e)
+        {
+            Size newSize = this.SliderSize;
+            if (newSize != this.Size)
+            {
+                this.Size = newSize;
+                UpdatePosition();
+            }
+            base.OnMouseLeave(e);
+        }
+        protected override void OnResize(EventArgs e)
+        {
+            this.Invalidate();
+            base.OnResize(e);
+        }
+        internal void UpdatePosition()
+        {
+            Control parent = this.Parent;
+            if (parent == null) return;
+            eSlideSide side = _SlidePanel.SlideSide;
+            Point loc = new Point();
+            //bool maximized = false;
+            //if (this.Parent is DevComponents.DotNetBar.Metro.MetroAppForm && ((Form)this.Parent).WindowState == FormWindowState.Maximized) maximized = true;
+            if (side == eSlideSide.Left)
+            {
+                loc.X = this.Margin.Left + _MouseOffset.X;
+                loc.Y = (parent.ClientRectangle.Height - this.Height) / 2 + this.Margin.Top;
+                //if (maximized) loc.X += MaximizedOffset;
+            }
+            else if (side == eSlideSide.Right)
+            {
+                loc.X = parent.ClientRectangle.Width - this.Margin.Right - this.Width - _MouseOffset.X;
+                loc.Y = (parent.ClientRectangle.Height - this.Height) / 2 + this.Margin.Top;
+                //if (maximized) loc.X -= MaximizedOffset;
+            }
+            else if (side == eSlideSide.Top)
+            {
+                loc.X = (parent.ClientRectangle.Width - this.Width) / 2 + this.Margin.Top;
+                loc.Y = this.Margin.Top + _MouseOffset.Y;
+            }
+            else if (side == eSlideSide.Bottom)
+            {
+                loc.X = (parent.ClientRectangle.Width - this.Width) / 2 + this.Margin.Top;
+                loc.Y = parent.ClientRectangle.Height - this.Margin.Bottom - this.Height - _MouseOffset.Y;
+            }
+
+            this.Location = loc;
+        }
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            Graphics g = e.Graphics;
+            if (_Style != null)
+            {
+                ElementStyleDisplayInfo di = new ElementStyleDisplayInfo(_Style, g, this.ClientRectangle);
+                ElementStyleDisplay.Paint(di);
+            }
+
+            if (!string.IsNullOrEmpty(_SymbolRealized))
+            {
+                Font symFont = Symbols.GetFont(_SymbolSize, _SymbolSet);
+                Color foreColor = this.ForeColor;
+                bool disposeStyle = false;
+                ElementStyle style = null;
+                if (_Style != null)
+                {
+                    style = ElementStyleDisplay.GetElementStyle(_Style, out disposeStyle);
+                }
+                if (style != null && !style.TextColor.IsEmpty) foreColor = style.TextColor;
+                if(disposeStyle)
+                    style.Dispose();
+                TextDrawing.DrawStringLegacy(g, _SymbolRealized, symFont, _SymbolColor.IsEmpty ? foreColor : _SymbolColor,
+                        this.ClientRectangle,
+                        eTextFormat.HorizontalCenter | eTextFormat.NoClipping | eTextFormat.VerticalCenter);
+            }
+
+            base.OnPaint(e);
+        }
+
+
+        protected override void OnHandleCreated(EventArgs e)
+        {
+            SetupTopmostCheckTimer();
+            base.OnHandleCreated(e);
+        }
+
+        protected override void OnHandleDestroyed(EventArgs e)
+        {
+            DestroyTopmostCheckTimer();
+            base.OnHandleDestroyed(e);
+        }
+        private Timer _Timer = null;
+        private void SetupTopmostCheckTimer()
+        {
+            if (_Timer != null || !_AutoTopMostEnabled) return;
+            _Timer = new Timer();
+            _Timer.Interval = 800;
+            _Timer.Tick += new EventHandler(CheckAutoTopMostTimerTick);
+            _Timer.Start();
+        }
+        void CheckAutoTopMostTimerTick(object sender, EventArgs e)
+        {
+            if (!this.Visible || this.Parent == null) return;
+
+            Control parent = this.Parent;
+            if (parent.Controls.IndexOf(this) != 0)
+            {
+                parent.Controls.SetChildIndex(this, 0);
+            }
+        }
+        private void DestroyTopmostCheckTimer()
+        {
+            Timer timer = _Timer;
+            _Timer = null;
+            if (timer == null) return;
+            timer.Stop();
+            timer.Dispose();
+        }
+
+        private bool _AutoTopMostEnabled = true;
+        /// <summary>
+        /// Gets or sets whether slider button automatically checks whether its top-most control on the form, i.e. visible at all times on top of other controls
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether slider button automatically checks whether its top-most control on the form, i.e. visible at all times on top of other controls")]
+        public bool AutoTopMostEnabled
+        {
+            get { return _AutoTopMostEnabled; }
+            set
+            {
+                if (value != _AutoTopMostEnabled)
+                {
+                    bool oldValue = _AutoTopMostEnabled;
+                    _AutoTopMostEnabled = value;
+                    OnAutoTopMostEnabledChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when AutoTopMostEnabled property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnAutoTopMostEnabledChanged(bool oldValue, bool newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("AutoTopMostEnabled"));
+            if (!newValue)
+                DestroyTopmostCheckTimer();
+            else if (this.IsHandleCreated)
+                SetupTopmostCheckTimer();
+        }
+
+        internal static readonly Size DefaultSliderSize = new Size(16, 36);
+        private Size _SliderSize = DefaultSliderSize;
+        /// <summary>
+        /// Gets or sets the slider size in default state. Notice that size specified here applies to Left and Right SlidePanel positions. For Top and Bottom positions the Width and Height are interchaged.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates slider size in default state. Notice that size specified here applies to Left and Right SlidePanel positions. For Top and Bottom positions the Width and Height are interchaged.")]
+        public Size SliderSize
+        {
+            get { return _SliderSize; }
+            set
+            {
+                if (value != _SliderSize)
+                {
+                    Size oldValue = _SliderSize;
+                    _SliderSize = value;
+                    OnSliderSizeChanged(oldValue, value);
+                }
+            }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeSliderSize()
+        {
+            return _SliderSize != DefaultSliderSize;
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetSliderSize()
+        {
+            SliderSize = DefaultSliderSize;
+        }
+        /// <summary>
+        /// Called when SliderSize property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnSliderSizeChanged(Size oldValue, Size newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("SliderSize"));
+            this.Size = newValue;
+        }
+
+        internal static readonly Size DefaultActiveSliderSize = new Size(24, 36);
+        private Size _ActiveSliderSize = DefaultActiveSliderSize;
+        /// <summary>
+        /// Gets or sets the slider size in active state. Notice that size specified here applies to Left and Right SlidePanel positions. For Top and Bottom positions the Width and Height are interchaged.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates slider size in active state. Notice that size specified here applies to Left and Right SlidePanel positions. For Top and Bottom positions the Width and Height are interchaged.")]
+        public Size ActiveSliderSize
+        {
+            get { return _ActiveSliderSize; }
+            set
+            {
+                if (value != _ActiveSliderSize)
+                {
+                    Size oldValue = _ActiveSliderSize;
+                    _ActiveSliderSize = value;
+                    OnActiveSliderSizeChanged(oldValue, value);
+                }
+            }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeActiveSliderSize()
+        {
+            return _ActiveSliderSize != DefaultActiveSliderSize;
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetActiveSliderSize()
+        {
+            ActiveSliderSize = DefaultActiveSliderSize;
+        }
+        /// <summary>
+        /// Called when ActiveSliderSize property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnActiveSliderSizeChanged(Size oldValue, Size newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("ActiveSliderSize"));
+
+        }
+
+        private bool _IsActive;
+        /// <summary>
+        /// Gets or sets whether slider button is in active state.
+        /// </summary>
+        [DefaultValue(false), Category("Behavior"), Description("Indicates  whether slider button is in active state.")]
+        public bool IsActive
+        {
+            get { return _IsActive; }
+            set
+            {
+                if (value != _IsActive)
+                {
+                    bool oldValue = _IsActive;
+                    _IsActive = value;
+                    OnIsActiveChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when IsActive property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnIsActiveChanged(bool oldValue, bool newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("IsActive"));
+
+        }
+
+        protected override Size DefaultSize
+        {
+            get
+            {
+                return GetSliderSize();
+            }
+        }
+        private Size GetSliderSize()
+        {
+            Size sliderSize = this.IsActive ? ActiveSliderSize : SliderSize;
+
+            if (_SlidePanel != null)
+            {
+                eSlideSide slideSide = _SlidePanel.SlideSide;
+                if (slideSide == eSlideSide.Left || slideSide == eSlideSide.Right)
+                    return sliderSize;
+                else
+                    return new Size(sliderSize.Height, sliderSize.Width);
+            }
+
+            return sliderSize;
+        }
+
+        private bool _IsMouseDown = false;
+        internal bool IsMouseDown
+        {
+            get { return _IsMouseDown; }
+            set
+            {
+                if (value != _IsMouseDown)
+                {
+                    bool oldValue = _IsMouseDown;
+                    _IsMouseDown = value;
+                    OnIsMouseDownChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when IsMouseDown property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnIsMouseDownChanged(bool oldValue, bool newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("IsMouseDown"));
+            if (!newValue)
+            {
+                _IsSlidingActive = false;
+                _MouseOffset = Point.Empty;
+            }
+            this.Invalidate();
+        }
+
+        private ElementStyle _Style = null;
+        /// <summary>
+        /// Gets or sets the style associated with the control.
+        /// </summary>
+        public ElementStyle Style
+        {
+            get { return _Style; }
+            set
+            {
+                if (_Style != null)
+                    _Style.StyleChanged -= this.ElementStyleChanged;
+                _Style = value;
+                if(_Style!=null)
+                    _Style.StyleChanged += ElementStyleChanged;
+                this.Invalidate();
+            }
+        }
+
+        void ElementStyleChanged(object sender, EventArgs e)
+        {
+            this.Invalidate();
+        }
+
+        private Color _SymbolColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets the color of the Symbol.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates color of the Symbol.")]
+        public Color SymbolColor
+        {
+            get { return _SymbolColor; }
+            set { _SymbolColor = value; this.Invalidate(); }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeSymbolColor()
+        {
+            return !_SymbolColor.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetSymbolColor()
+        {
+            this.SymbolColor = Color.Empty;
+        }
+
+        /// <summary>
+        /// Gets the realized symbol string.
+        /// </summary>
+        [Browsable(false)]
+        public string SymbolRealized
+        {
+            get { return _SymbolRealized; }
+        }
+        private string _Symbol = "", _SymbolRealized = "";
+        /// <summary>
+        /// Indicates the symbol displayed on face of the button instead of the image. Setting the symbol overrides the image setting.
+        /// </summary>
+        [DefaultValue(""), Category("Appearance"), Description("Indicates the symbol displayed on face of the button instead of the image. Setting the symbol overrides the image setting.")]
+        [Editor("DevComponents.DotNetBar.Design.SymbolTypeEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor))]
+        public string Symbol
+        {
+            get { return _Symbol; }
+            set
+            {
+                if (value != _Symbol)
+                {
+                    string oldValue = _Symbol;
+                    _Symbol = value;
+                    OnSymbolChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when Symbol property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnSymbolChanged(string oldValue, string newValue)
+        {
+            if (string.IsNullOrEmpty(newValue))
+                _SymbolRealized = "";
+            else
+                _SymbolRealized = Symbols.GetSymbol(newValue);
+            this.Invalidate();
+        }
+
+        private eSymbolSet _SymbolSet = eSymbolSet.Awesome;
+        /// <summary>
+        /// Gets or sets the symbol set used to represent the Symbol.
+        /// </summary>
+        [Browsable(false), DefaultValue(eSymbolSet.Awesome)]
+        public eSymbolSet SymbolSet
+        {
+            get { return _SymbolSet; }
+            set
+            {
+                if (_SymbolSet != value)
+                {
+                    eSymbolSet oldValue = _SymbolSet;
+                    _SymbolSet = value;
+                    OnSymbolSetChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when SymbolSet property value changes.
+        /// </summary>
+        /// <param name="oldValue">Indciates old value</param>
+        /// <param name="newValue">Indicates new value</param>
+        protected virtual void OnSymbolSetChanged(eSymbolSet oldValue, eSymbolSet newValue)
+        {
+            this.Invalidate();
+            this.Refresh();
+        }
+
+
+        private float _SymbolSize = 10f;
+        /// <summary>
+        /// Indicates the size of the symbol in points.
+        /// </summary>
+        [DefaultValue(10f), Category("Appearance"), Description("Indicates the size of the symbol in points.")]
+        public float SymbolSize
+        {
+            get { return _SymbolSize; }
+            set
+            {
+                if (value != _SymbolSize)
+                {
+                    float oldValue = _SymbolSize;
+                    _SymbolSize = value;
+                    OnSymbolSizeChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when SymbolSize property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnSymbolSizeChanged(float oldValue, float newValue)
+        {
+            this.Invalidate();
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/Slider.cs b/PROMS/DotNetBar Source Code/Controls/Slider.cs
new file mode 100644
index 00000000..7eb5f43b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/Slider.cs	
@@ -0,0 +1,450 @@
+using System;
+using System.Text;
+using System.Runtime.InteropServices;
+using System.Drawing;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    /// <summary>
+    /// Represents the Slider control.
+    /// </summary>
+    [ToolboxBitmap(typeof(Slider), "Controls.Slider.ico"), ToolboxItem(true), DefaultEvent("ValueChanged"), ComVisible(false), Designer("DevComponents.DotNetBar.Design.SliderDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+    public class Slider : BaseItemControl, ICommandSource
+    {
+        #region Private Variables
+        private SliderItem m_Slider = null;
+        #endregion
+
+        #region Events
+        /// <summary>
+        /// Occurs after Value property has changed.
+        /// </summary>
+        public event EventHandler ValueChanged;
+
+        /// <summary>
+        /// Occurs before Value property has changed.
+        /// </summary>
+        public event CancelIntValueEventHandler ValueChanging;
+
+        /// <summary>
+        /// Occurs when Increase button is clicked using mouse.
+        /// </summary>
+        public event EventHandler IncreaseButtonClick;
+        /// <summary>
+        /// Occurs when Decrease button is clicked using mouse.
+        /// </summary>
+        public event EventHandler DecreaseButtonClick;
+        #endregion
+
+        #region Constructor, Dispose
+        public Slider()
+        {
+            m_Slider = new SliderItem();
+            m_Slider.Style = eDotNetBarStyle.Office2007;
+            m_Slider.ValueChanged += new EventHandler(SliderValueChanged);
+            m_Slider.ValueChanging += new CancelIntValueEventHandler(SliderValueChanging);
+            m_Slider.IncreaseButtonClick += new EventHandler(SliderIncreaseButtonClick);
+            m_Slider.DecreaseButtonClick += new EventHandler(SliderDecreaseButtonClick);
+            this.HostItem = m_Slider;
+        }
+
+        void SliderDecreaseButtonClick(object sender, EventArgs e)
+        {
+            OnDecreaseButtonClick(e);
+        }
+
+        void SliderIncreaseButtonClick(object sender, EventArgs e)
+        {
+            OnIncreaseButtonClick(e);
+        }
+
+        /// <summary>
+        /// Raises the IncreaseButtonClick event.
+        /// </summary>
+        /// <param name="e">Provides event arguments</param>
+        protected virtual void OnIncreaseButtonClick(EventArgs e)
+        {
+            EventHandler handler = IncreaseButtonClick;
+            if (handler != null) handler(this, e);
+        }
+        /// <summary>
+        /// Raises the DecreaseButtonClick event.
+        /// </summary>
+        /// <param name="e">Provides event arguments</param>
+        protected virtual void OnDecreaseButtonClick(EventArgs e)
+        {
+            EventHandler handler = DecreaseButtonClick;
+            if (handler != null) handler(this, e);
+        }
+
+
+        /// <summary>
+        /// Gets or sets whether text-markup support is enabled for controls Text property. Default value is true.
+        /// Set this property to false to display HTML or other markup in the control instead of it being parsed as text-markup.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance"), Description("Indicates whether text-markup support is enabled for controls Text property.")]
+        public bool EnableMarkup
+        {
+            get { return m_Slider.EnableMarkup; }
+            set
+            {
+                m_Slider.EnableMarkup = value;
+            }
+        }
+
+        private void SliderValueChanging(object sender, CancelIntValueEventArgs e)
+        {
+            OnValueChanging(e);
+        }
+
+        private void SliderValueChanged(object sender, EventArgs e)
+        {
+            OnValueChanged(e);
+            ExecuteCommand();
+        }
+
+        /// <summary>
+        /// Raises the ValueChanged event.
+        /// </summary>
+        /// <param name="e">Provides event arguments</param>
+        protected virtual void OnValueChanged(EventArgs e)
+        {
+            if (ValueChanged != null)
+                ValueChanged(this, e);
+        }
+
+        /// <summary>
+        /// Raises the ValueChanging event.
+        /// </summary>
+        protected virtual void OnValueChanging(CancelIntValueEventArgs e)
+        {
+            if (ValueChanging != null)
+                ValueChanging(this, e);
+        }
+
+        /// <summary>
+        /// Gets or sets the text label position in relationship to the slider. Default value is Left.
+        /// </summary>
+        [Browsable(true), DefaultValue(eSliderLabelPosition.Left), Category("Layout"), Description("Indicates text label position in relationship to the slider")]
+        public eSliderLabelPosition LabelPosition
+        {
+            get { return m_Slider.LabelPosition; }
+            set
+            {
+                m_Slider.LabelPosition = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether the text label next to the slider is displayed.
+        /// </summary>
+        [DevCoBrowsable(true), Browsable(true), Description("Gets or sets whether the label text is displayed."), Category("Behavior"), DefaultValue(true)]
+        public bool LabelVisible
+        {
+            get
+            {
+                return m_Slider.LabelVisible;
+            }
+            set
+            {
+                m_Slider.LabelVisible = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the width of the label part of the item in pixels. Value must be greater than 0. Default value is 38.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), DefaultValue(38), System.ComponentModel.Category("Layout"), System.ComponentModel.Description("Indicates width of the label part of the item in pixels.")]
+        public int LabelWidth
+        {
+            get
+            {
+                return m_Slider.LabelWidth;
+            }
+            set
+            {
+                m_Slider.LabelWidth = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the maximum value of the range of the control.
+        /// </summary>
+        [DevCoBrowsable(true), Browsable(true), Description("Gets or sets the maximum value of the range of the control."), Category("Behavior"), DefaultValue(100)]
+        public int Maximum
+        {
+            get
+            {
+                return m_Slider.Maximum;
+            }
+            set
+            {
+                m_Slider.Maximum = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the minimum value of the range of the control.
+        /// </summary>
+        [DevCoBrowsable(true), Browsable(true), Description("Gets or sets the minimum value of the range of the control."), Category("Behavior"), DefaultValue(0)]
+        public int Minimum
+        {
+            get
+            {
+                return m_Slider.Minimum;
+            }
+            set
+            {
+                m_Slider.Minimum = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the current position of the slider.
+        /// </summary>
+        [DevCoBrowsable(true), Browsable(true), Description("Gets or sets the current position of the slider."), Category("Behavior")]
+        public int Value
+        {
+            get { return m_Slider.Value; }
+            set
+            {
+                m_Slider.Value = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the amount by which a call to the PerformStep method increases the current position of the slider. Value must be greater than 0.
+        /// </summary>
+        [DevCoBrowsable(true), Browsable(true), Description("Gets or sets the amount by which a call to the PerformStep method increases the current position of the slider."), Category("Behavior"), DefaultValue(1)]
+        public int Step
+        {
+            get
+            {
+                return m_Slider.Step;
+            }
+            set
+            {
+                m_Slider.Step = value;
+            }
+        }
+
+        /// <summary>
+        /// Advances the current position of the slider by the amount of the Step property.
+        /// </summary>
+        public void PerformStep()
+        {
+            m_Slider.PerformStep();
+        }
+
+        /// <summary>
+        /// Gets or sets the color of the label text.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), Description("Indicates color of the label text.")]
+        public Color TextColor
+        {
+            get { return m_Slider.TextColor; }
+            set
+            {
+                m_Slider.TextColor = value;
+            }
+        }
+        /// <summary>
+        /// Returns whether property should be serialized. Used by Windows Forms designer.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeTextColor()
+        {
+            return m_Slider.ShouldSerializeTextColor();
+        }
+        /// <summary>
+        /// Resets the property to default value. Used by Windows Forms designer.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetTextColor()
+        {
+            m_Slider.ResetTextColor();
+        }
+
+        [Browsable(false)]
+        public override Color ForeColor
+        {
+            get
+            {
+                return base.ForeColor;
+            }
+            set
+            {
+                base.ForeColor = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether vertical line track marker is displayed on the slide line. Default value is true.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), DefaultValue(true), Description("Indicates whether vertical line track marker is displayed on the slide line.")]
+        public virtual bool TrackMarker
+        {
+            get { return m_Slider.TrackMarker; }
+            set
+            {
+                m_Slider.TrackMarker = value;
+            }
+        }
+
+        /// <summary>
+        /// Forces the button to perform internal layout.
+        /// </summary>
+        public override void RecalcLayout()
+        {
+            Rectangle r = GetItemBounds();
+            m_Slider.Width = Math.Max(r.Width - (m_Slider.LabelVisible ? m_Slider.LabelWidth : 0), 30);
+            base.RecalcLayout();
+        }
+
+        protected override bool ProcessCmdKey(ref System.Windows.Forms.Message msg, System.Windows.Forms.Keys keyData)
+        {
+            if (keyData == System.Windows.Forms.Keys.Left)
+            {
+                m_Slider.Increment(-m_Slider.Step, eEventSource.Keyboard);
+                return true;
+            }
+            else if (keyData == System.Windows.Forms.Keys.Right)
+            {
+                m_Slider.Increment(m_Slider.Step, eEventSource.Keyboard);
+                return true;
+            }
+            return base.ProcessCmdKey(ref msg, keyData);
+        }
+
+        /// <summary>
+        /// Gets or sets the tooltip for the Increase button of the slider.
+        /// </summary>
+        [Browsable(true), DefaultValue(""), Localizable(true), Category("Appearance"), Description("Indicates tooltip for the Increase button of the slider.")]
+        public string IncreaseTooltip
+        {
+            get { return m_Slider.IncreaseTooltip; }
+            set { m_Slider.IncreaseTooltip = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the tooltip for the Decrease button of the slider.
+        /// </summary>
+        [Browsable(true), DefaultValue(""), Localizable(true), Category("Appearance"), Description("Indicates tooltip for the Increase button of the slider.")]
+        public string DecreaseTooltip
+        {
+            get { return m_Slider.DecreaseTooltip; }
+            set { m_Slider.DecreaseTooltip = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the slider orientation. Default value is horizontal.
+        /// </summary>
+        [DefaultValue(eOrientation.Horizontal), Category("Appearance"), Description("Indicates slider orientation.")]
+        public eOrientation SliderOrientation
+        {
+            get { return m_Slider.SliderOrientation; }
+            set
+            {
+                m_Slider.SliderOrientation = value;
+                this.RecalcLayout();
+            }
+        }
+
+        /// <summary>
+        /// Gets the SliderItem.
+        /// </summary>
+        internal SliderItem SliderItem
+        {
+            get { return (m_Slider); }
+        }
+
+        /// <summary>
+        /// Gets or sets the custom color table for the item. Color table here will override all system color table settings.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public DevComponents.DotNetBar.Rendering.Office2007SliderColorTable ColorTable
+        {
+            get
+            {
+                return m_Slider.ColorTable;
+            }
+            set
+            {
+                m_Slider.ColorTable = value;
+            }
+        }
+        #endregion
+
+        #region ICommandSource Members
+        protected virtual void ExecuteCommand()
+        {
+            if (_Command == null) return;
+            CommandManager.ExecuteCommand(this);
+        }
+
+        /// <summary>
+        /// Gets or sets the command assigned to the item. Default value is null.
+        /// <remarks>Note that if this property is set to null Enabled property will be set to false automatically to disable the item.</remarks>
+        /// </summary>
+        [DefaultValue(null), Category("Commands"), Description("Indicates the command assigned to the item.")]
+        public Command Command
+        {
+            get { return (Command)((ICommandSource)this).Command; }
+            set
+            {
+                ((ICommandSource)this).Command = value;
+            }
+        }
+
+        private ICommand _Command = null;
+        //[Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        ICommand ICommandSource.Command
+        {
+            get
+            {
+                return _Command;
+            }
+            set
+            {
+                bool changed = false;
+                if (_Command != value)
+                    changed = true;
+
+                if (_Command != null)
+                    CommandManager.UnRegisterCommandSource(this, _Command);
+                _Command = value;
+                if (value != null)
+                    CommandManager.RegisterCommand(this, value);
+                if (changed)
+                    OnCommandChanged();
+            }
+        }
+
+        /// <summary>
+        /// Called when Command property value changes.
+        /// </summary>
+        protected virtual void OnCommandChanged()
+        {
+        }
+
+        private object _CommandParameter = null;
+        /// <summary>
+        /// Gets or sets user defined data value that can be passed to the command when it is executed.
+        /// </summary>
+        [Browsable(true), DefaultValue(null), Category("Commands"), Description("Indicates user defined data value that can be passed to the command when it is executed."), System.ComponentModel.TypeConverter(typeof(System.ComponentModel.StringConverter)), System.ComponentModel.Localizable(true)]
+        public object CommandParameter
+        {
+            get
+            {
+                return _CommandParameter;
+            }
+            set
+            {
+                _CommandParameter = value;
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/Slider.ico b/PROMS/DotNetBar Source Code/Controls/Slider.ico
new file mode 100644
index 00000000..64e7a6eb
Binary files /dev/null and b/PROMS/DotNetBar Source Code/Controls/Slider.ico differ
diff --git a/PROMS/DotNetBar Source Code/Controls/StepIndicator.ico b/PROMS/DotNetBar Source Code/Controls/StepIndicator.ico
new file mode 100644
index 00000000..6ff9cd13
Binary files /dev/null and b/PROMS/DotNetBar Source Code/Controls/StepIndicator.ico differ
diff --git a/PROMS/DotNetBar Source Code/Controls/SwitchButton.ico b/PROMS/DotNetBar Source Code/Controls/SwitchButton.ico
new file mode 100644
index 00000000..b0c869e7
Binary files /dev/null and b/PROMS/DotNetBar Source Code/Controls/SwitchButton.ico differ
diff --git a/PROMS/DotNetBar Source Code/Controls/SymbolBox.cs b/PROMS/DotNetBar Source Code/Controls/SymbolBox.cs
new file mode 100644
index 00000000..c0531f89
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/SymbolBox.cs	
@@ -0,0 +1,265 @@
+using DevComponents.DotNetBar.Rendering;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Text;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    /// <summary>
+    /// Represents the control which displays symbol from symbols library.
+    /// </summary>
+   [ToolboxBitmap(typeof(SymbolBox), "Controls.SymbolBox.ico"), ToolboxItem(true)]
+    public class SymbolBox : Control
+    {
+        #region Constructor
+        /// <summary>
+        /// Initializes a new instance of the SymbolBox class.
+        /// </summary>
+        public SymbolBox()
+        {
+            this.SetStyle(ControlStyles.UserPaint | ControlStyles.AllPaintingInWmPaint |
+            ControlStyles.Opaque | ControlStyles.ResizeRedraw | ControlStyles.SupportsTransparentBackColor |
+            ControlStyles.StandardDoubleClick | DisplayHelp.DoubleBufferFlag, true);
+            _BackgroundStyle = new ElementStyle();
+            _BackgroundStyle.StyleChanged += new EventHandler(this.VisualPropertyChanged);
+        }
+        #endregion
+
+        #region Implementation
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            if ((this.BackColor.IsEmpty || this.BackColor == Color.Transparent))
+            {
+                base.OnPaintBackground(e);
+            }
+
+            if (_BackgroundStyle != null)
+                _BackgroundStyle.SetColorScheme(this.GetColorScheme());
+
+            PaintBackground(e);
+            PaintContent(e);
+
+            base.OnPaint(e);
+        }
+
+        private void PaintContent(PaintEventArgs e)
+        {
+            float symbolSize = _SymbolSize;
+            Graphics g = e.Graphics;
+
+            Rectangle r = ElementStyleLayout.GetInnerRect(_BackgroundStyle, this.ClientRectangle);
+
+            if (symbolSize <= 0)
+                symbolSize = Math.Max(1, Math.Min(r.Width, r.Height) * 72 / g.DpiX - 1);
+
+            Color symbolColor = _SymbolColor;
+            if (_SymbolColor.IsEmpty)
+            {
+                if (!_BackgroundStyle.TextColor.IsEmpty)
+                    symbolColor = _BackgroundStyle.TextColor;
+                else if (!this.ForeColor.IsEmpty)
+                    symbolColor = this.ForeColor;
+                else
+                    symbolColor = SystemColors.ControlText;
+            }
+            TextDrawing.DrawStringLegacy(g, _SymbolRealized, Symbols.GetFont(symbolSize, _SymbolSet),
+                symbolColor, r, eTextFormat.HorizontalCenter | eTextFormat.VerticalCenter);
+        }
+
+        protected virtual void PaintBackground(PaintEventArgs e)
+        {
+            Graphics g = e.Graphics;
+            Rectangle r = this.ClientRectangle;
+            ElementStyle style = _BackgroundStyle;
+
+            if (!this.BackColor.IsEmpty && this.BackColor != Color.Transparent)
+            {
+                DisplayHelp.FillRectangle(g, r, this.BackColor);
+            }
+
+            if (this.BackgroundImage != null)
+                base.OnPaintBackground(e);
+
+            if (style.Custom)
+            {
+                SmoothingMode sm = g.SmoothingMode;
+                //if (m_AntiAlias)
+                //    g.SmoothingMode = SmoothingMode.HighQuality;
+                ElementStyleDisplayInfo displayInfo = new ElementStyleDisplayInfo(style, e.Graphics, r);
+                ElementStyleDisplay.Paint(displayInfo);
+                //if (m_AntiAlias)
+                //    g.SmoothingMode = sm;
+            }
+        }
+
+        /// <summary>
+        /// Returns the color scheme used by control. Color scheme for Office2007 style will be retrieved from the current renderer instead of
+        /// local color scheme referenced by ColorScheme property.
+        /// </summary>
+        /// <returns>An instance of ColorScheme object.</returns>
+        protected virtual ColorScheme GetColorScheme()
+        {
+            BaseRenderer r = Rendering.GlobalManager.Renderer;
+            if (r is Office2007Renderer)
+                return ((Office2007Renderer)r).ColorTable.LegacyColors;
+            return new ColorScheme();
+        }
+
+        private ElementStyle _BackgroundStyle = null;
+        /// <summary>
+        /// Specifies the background style of the control.
+        /// </summary>
+        [Browsable(true), Category("Style"), Description("Gets or sets bar background style."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ElementStyle BackgroundStyle
+        {
+            get { return _BackgroundStyle; }
+        }
+
+        /// <summary>
+        /// Resets style to default value. Used by windows forms designer.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetBackgroundStyle()
+        {
+            _BackgroundStyle.StyleChanged -= new EventHandler(this.VisualPropertyChanged);
+            _BackgroundStyle = new ElementStyle();
+            _BackgroundStyle.StyleChanged += new EventHandler(this.VisualPropertyChanged);
+            this.Invalidate();
+        }
+        private void VisualPropertyChanged(object sender, EventArgs e)
+        {
+            this.Invalidate();
+        }
+
+        /// <summary>
+        /// Gets the realized symbol string.
+        /// </summary>
+        [Browsable(false)]
+        public string SymbolRealized
+        {
+            get { return _SymbolRealized; }
+        }
+        private string _Symbol = "\uf015", _SymbolRealized = "\uf015";
+        /// <summary>
+        /// Indicates the symbol displayed on face of the button instead of the image. Setting the symbol overrides the image setting.
+        /// </summary>
+        [DefaultValue("\uf015"), Category("Appearance"), Description("Indicates the symbol displayed on face of the button instead of the image. Setting the symbol overrides the image setting.")]
+        [Editor("DevComponents.DotNetBar.Design.SymbolTypeEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor))]
+        public string Symbol
+        {
+            get { return _Symbol; }
+            set
+            {
+                if (value != _Symbol)
+                {
+                    string oldValue = _Symbol;
+                    _Symbol = value;
+                    OnSymbolChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when Symbol property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnSymbolChanged(string oldValue, string newValue)
+        {
+            if (string.IsNullOrEmpty(newValue))
+                _SymbolRealized = "";
+            else
+                _SymbolRealized = Symbols.GetSymbol(newValue);
+            //OnPropertyChanged(new PropertyChangedEventArgs("Symbol"));
+            this.Invalidate();
+        }
+
+        private eSymbolSet _SymbolSet = eSymbolSet.Awesome;
+        /// <summary>
+        /// Gets or sets the symbol set used to represent the Symbol.
+        /// </summary>
+        [Browsable(false), DefaultValue(eSymbolSet.Awesome)]
+        public eSymbolSet SymbolSet
+        {
+            get { return _SymbolSet; }
+            set
+            {
+                if (_SymbolSet != value)
+                {
+                    eSymbolSet oldValue = _SymbolSet;
+                    _SymbolSet = value;
+                    OnSymbolSetChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when SymbolSet property value changes.
+        /// </summary>
+        /// <param name="oldValue">Indciates old value</param>
+        /// <param name="newValue">Indicates new value</param>
+        protected virtual void OnSymbolSetChanged(eSymbolSet oldValue, eSymbolSet newValue)
+        {
+            this.Invalidate();
+        }
+
+        private Color _SymbolColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets the color of the Symbol.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates color of the Symbol.")]
+        public Color SymbolColor
+        {
+            get { return _SymbolColor; }
+            set { _SymbolColor = value; this.Refresh(); }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeSymbolColor()
+        {
+            return !_SymbolColor.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetSymbolColor()
+        {
+            this.SymbolColor = Color.Empty;
+        }
+
+        private float _SymbolSize = 0f;
+        /// <summary>
+        /// Indicates the size of the symbol in points.
+        /// </summary>
+        [DefaultValue(0f), Category("Appearance"), Description("Indicates the size of the symbol in points.")]
+        public float SymbolSize
+        {
+            get { return _SymbolSize; }
+            set
+            {
+                if (value != _SymbolSize)
+                {
+                    float oldValue = _SymbolSize;
+                    _SymbolSize = value;
+                    OnSymbolSizeChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when SymbolSize property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnSymbolSizeChanged(float oldValue, float newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("SymbolSize"));
+            this.Invalidate();
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/SymbolBox.ico b/PROMS/DotNetBar Source Code/Controls/SymbolBox.ico
new file mode 100644
index 00000000..d50d1b7e
Binary files /dev/null and b/PROMS/DotNetBar Source Code/Controls/SymbolBox.ico differ
diff --git a/PROMS/DotNetBar Source Code/Controls/TabFormControl.ico b/PROMS/DotNetBar Source Code/Controls/TabFormControl.ico
new file mode 100644
index 00000000..39973b9e
Binary files /dev/null and b/PROMS/DotNetBar Source Code/Controls/TabFormControl.ico differ
diff --git a/PROMS/DotNetBar Source Code/Controls/TabbedForm/MultiFormAppContext.cs b/PROMS/DotNetBar Source Code/Controls/TabbedForm/MultiFormAppContext.cs
new file mode 100644
index 00000000..980c0764
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/TabbedForm/MultiFormAppContext.cs	
@@ -0,0 +1,100 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar
+{
+    public class MultiFormAppContext : ApplicationContext
+    {
+        private List<WeakReference> _OpenedForms = new List<WeakReference>();
+
+        public MultiFormAppContext(Form initialForm)
+        {
+            // Handle the ApplicationExit event to know when the application is exiting.
+            Application.ApplicationExit += new EventHandler(this.OnApplicationExit);
+            WeakReference reference=new WeakReference(initialForm);
+            _OpenedForms.Add(reference);
+            initialForm.FormClosed += FormClosed;
+            initialForm.Show();
+        }
+
+        public void RegisterOpenForm(Form form)
+        {
+            bool opened = false;
+            foreach (WeakReference item in _OpenedForms)
+            {
+                object target = item.Target;
+
+                if (target != null && target.Equals(form))
+                {
+                    opened = true;
+                    break;
+                }
+            }
+
+            if (!opened)
+            {
+                WeakReference reference = new WeakReference(form);
+                _OpenedForms.Add(reference);
+                form.FormClosed += FormClosed;
+            }
+        }
+        /// <summary>
+        /// Returns read-only list of opened forms. 
+        /// </summary>
+        public List<Form> OpenedForms
+        {
+            get
+            {
+                List<Form> list=new List<Form>();
+                foreach (WeakReference item in _OpenedForms)
+                {
+                    object target = item.Target;
+                    if (target != null && target is Form)
+                    {
+                        list.Add((Form)target);
+                    }
+                }
+
+                return list;
+            }
+        }
+
+        private void FormClosed(object sender, FormClosedEventArgs e)
+        {
+            Form form = (Form) sender;
+            form.FormClosed -= FormClosed;
+            foreach (WeakReference item in _OpenedForms)
+            {
+                object target = item.Target;
+
+                if (target != null && target.Equals(form))
+                {
+                    _OpenedForms.Remove(item);
+                    break;
+                }
+            }
+
+            if(_OpenedForms.Count==0)
+                ExitThread();
+        }
+
+        protected  virtual void OnApplicationExit(object sender, EventArgs e)
+        {
+            
+        }
+
+        private static MultiFormAppContext _CurrentMultiFormAppContext=null;
+        /// <summary>
+        /// Gets or sets current MultiFormAppContext context. If you are using MultiFormAppContext to start your app then you should also
+        /// set that instance of MultiFormAppContext to this property so internally TabFormControl can register any new deattached forms 
+        /// and prevent application from closing if startup form is closed first.
+        /// </summary>
+        public static MultiFormAppContext Current
+        {
+            get { return _CurrentMultiFormAppContext; }
+            set { _CurrentMultiFormAppContext = value; }
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/TabbedForm/NewTabFormItem.cs b/PROMS/DotNetBar Source Code/Controls/TabbedForm/NewTabFormItem.cs
new file mode 100644
index 00000000..0e425e06
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/TabbedForm/NewTabFormItem.cs	
@@ -0,0 +1,66 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Text;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    public class NewTabFormItem : TabFormItemBase
+    {
+        #region Internal Implementation
+        public override void Paint(ItemPaintArgs p)
+        {
+            Rendering.BaseRenderer renderer = p.Renderer;
+            if (renderer != null)
+            {
+                p.ButtonItemRendererEventArgs.Graphics = p.Graphics;
+                p.ButtonItemRendererEventArgs.ButtonItem = this;
+                p.ButtonItemRendererEventArgs.ItemPaintArgs = p;
+                renderer.DrawNewTabFormItem(p.ButtonItemRendererEventArgs);
+            }
+
+            if (!string.IsNullOrEmpty(NotificationMarkText))
+                DevComponents.DotNetBar.Rendering.NotificationMarkPainter.Paint(p.Graphics, this.Bounds, NotificationMarkPosition,
+                    NotificationMarkText, new Size(NotificationMarkSize, NotificationMarkSize), NotificationMarkOffset, NotificationMarkColor);
+            this.DrawInsertMarker(p.Graphics);
+        }
+
+        public override void RecalcSize()
+        {
+            m_Rect.Width = Dpi.Width32 + TabFormItem.TabOverlap/2;
+            m_Rect.Height = Dpi.Height16;
+            m_NeedRecalcSize = false;
+
+        }
+
+        private string _CashedColorTableName = "Default";
+        internal override string GetColorTableName()
+        {
+            return this.CustomColorName != "" ? this.CustomColorName : _CashedColorTableName;
+        }
+
+        private Color[] _BackColors = null;
+        /// <summary>
+        /// Indicates the array of colors that when set are used to draw the background of the item.
+        /// </summary>
+        [DefaultValue(null), Category("Appearance"), Description("Indicates the array of colors that when set are used to draw the background of the item."), TypeConverter(typeof(ArrayConverter))]
+        public Color[] BackColors
+        {
+            get
+            {
+                return _BackColors;
+            }
+            set
+            {
+                if (_BackColors != value)
+                {
+                    _BackColors = value;
+                    //OnPropertyChanged(new PropertyChangedEventArgs("Colors"));
+                    this.Refresh();
+                }
+            }
+        }
+#endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/TabbedForm/OfficeNewTabFormItemPainter.cs b/PROMS/DotNetBar Source Code/Controls/TabbedForm/OfficeNewTabFormItemPainter.cs
new file mode 100644
index 00000000..8ff823fb
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/TabbedForm/OfficeNewTabFormItemPainter.cs	
@@ -0,0 +1,186 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Text;
+using DevComponents.DotNetBar.Controls;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    internal class OfficeNewTabFormItemPainter : Office2007ButtonItemPainter
+    {
+        protected override void PaintState(ButtonItem button, ItemPaintArgs pa, CompositeImage image, Rectangle r, bool isMouseDown)
+        {
+            if (r.IsEmpty || !IsItemEnabled(button, pa) || r.Width == 0 || r.Height == 0)
+                return;
+
+            NewTabFormItem tab = button as NewTabFormItem;
+            if (tab == null || IsOnMenu(button, pa))
+            {
+                base.PaintState(button, pa, image, r, isMouseDown);
+                return;
+            }
+
+            bool isOnMenu = pa.IsOnMenu;
+            TabFormItemColorTable tabColorTable = GetColorTable(tab);
+            if (tabColorTable == null)
+                return;
+
+            TabFormItemStateColorTable stateColors = GetStateColorTable(tabColorTable, tab);
+
+            if (stateColors == null)
+                return;
+
+            r.X += Overlap;
+            r.Width -= Overlap;
+            
+            Graphics g = pa.Graphics;
+            Region oldClip = g.Clip;
+            try
+            {
+                Rectangle rClip = GetTabBounds(tab);
+                rClip.Inflate(2, 1);
+                g.SetClip(rClip, CombineMode.Intersect);
+
+                if (stateColors.BackColors != null && stateColors.BackColors.Length > 0 || tab.BackColors != null && tab.BackColors.Length > 0)
+                {
+                    using (Brush brush = DisplayHelp.CreateBrush(r, (tab.BackColors != null && tab.BackColors.Length > 0) ? tab.BackColors : stateColors.BackColors, stateColors.BackColorsGradientAngle, stateColors.BackColorsPositions))
+                    {
+                        GraphicsPath path = GetTabPath(r);
+                        g.FillPath(brush, path);
+                        tab.TabPath = path;
+                    }
+                }
+
+                if (stateColors.BorderColors.Length > 0)
+                {
+                    Rectangle borderRect = r;
+                    foreach (Color color in stateColors.BorderColors)
+                    {
+                        using (GraphicsPath path = GetTabPath(borderRect))
+                        {
+                            using (Pen pen = new Pen(color, Dpi.Width1))
+                            {
+                                pen.LineJoin = LineJoin.Round;
+                                g.DrawPath(pen, path);
+                            }
+                        }
+                        borderRect.Inflate(-Dpi.Width1, -Dpi.Width1);
+                    }
+                }
+
+                g.Clip = oldClip;
+            }
+            finally
+            {
+                if (oldClip != null) oldClip.Dispose();
+            }
+        }
+
+        private int Overlap
+        {
+            get { return TabFormItem.TabOverlap / 2; }
+        }
+
+        private Rectangle GetTabBounds(NewTabFormItem tab)
+        {
+            Rectangle r = tab.DisplayRectangle;
+            r.X += Overlap;
+            r.Width -= Overlap;
+            using (GraphicsPath tabPath = GetTabPath(r))
+                r = Rectangle.Round(tabPath.GetBounds());
+            return r;
+        }
+
+        private GraphicsPath GetTabPath(Rectangle r)
+        {
+            GraphicsPath path = new GraphicsPath();
+            //float factor = r.Height / 13.5f;
+
+            path.AddLine(2, 0, 5, 14);
+            path.AddLine(31, 14, 28, 0);
+
+            //path.AddLine(29.5f, 14.5f, 6.5f, 14.5f);
+            //path.AddCurve(new PointF[]
+            //{
+            //    new PointF(5.83333f,14.1667f ),
+            //    new PointF(5.16667f,13.8333f),
+            //    new PointF(4.66667f,13.1667f)
+            //});
+            //path.AddCurve(new PointF[]
+            //{
+            //    new PointF(4.16667f,12.5f),
+            //    new PointF(3.83333f,11.5f),
+            //    new PointF(3.16667f,9.83333f)
+            //});
+            //path.AddCurve(new PointF[]
+            //{
+            //    new PointF(2.5f,8.16667f ),
+            //    new PointF(1.5f,5.83333f ),
+            //    new PointF(1f,4.16667f)
+            //});
+            //path.AddCurve(new PointF[]
+            //{
+            //    new PointF(0.5f,2.5f),
+            //    new PointF(0.5f,1.5f ),
+            //    new PointF(0.5f,0.5f)
+            //});
+            //path.AddLine(0.5f, 0.5f, 25.5f, 0.5f);
+            //path.AddCurve(new PointF[]
+            //{
+            //    new PointF(26.8333f,2.5f ),
+            //    new PointF(28.1667f,4.5f ),
+            //    new PointF(29.1667f,6.83333f)
+            //});
+            //path.AddCurve(new PointF[]
+            //{
+            //    new PointF(30.1667f,9.16667f ),
+            //    new PointF(30.8333f,11.8333f ),
+            //    new PointF(30.8333f,13.1667f)
+            //});
+            //path.AddCurve(new PointF[]
+            //{
+            //    new PointF(30.8333f,14.5f ),
+            //    new PointF(30.1667f,14.5f ),
+            //    new PointF(30.1667f,14.5f )
+            //});
+
+            path.CloseAllFigures();
+
+            Matrix translateMatrix = new Matrix();
+            translateMatrix.Translate(r.X, r.Y);
+            if (Dpi.Factor.Width > 1)
+                translateMatrix.Scale(Dpi.Factor.Width, Dpi.Factor.Width);
+            path.Transform(translateMatrix);
+
+            return path;
+        }
+
+
+        private TabFormItemColorTable GetColorTable(NewTabFormItem tab)
+        {
+            return this.ColorTable.TabFormItemColorTables[tab.GetColorTableName()];
+        }
+
+        internal static TabFormItemStateColorTable GetStateColorTable(TabFormItemColorTable tabColorTable, NewTabFormItem tab)
+        {
+            if (tabColorTable == null)
+                return null;
+
+            TabFormItemStateColorTable stateColors = null;
+
+            if (!tab.RenderTabState)
+                stateColors = tabColorTable.Default;
+            else if (!tab.GetEnabled())
+                stateColors = tabColorTable.Disabled;
+            else if (tab.Checked)
+                stateColors = tabColorTable.Selected;
+            else if (tab.IsMouseOver)
+                stateColors = tabColorTable.MouseOver;
+            else
+                stateColors = tabColorTable.Default;
+
+            return stateColors;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/TabbedForm/OfficeTabFormItemPainter.cs b/PROMS/DotNetBar Source Code/Controls/TabbedForm/OfficeTabFormItemPainter.cs
new file mode 100644
index 00000000..83b7968f
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/TabbedForm/OfficeTabFormItemPainter.cs	
@@ -0,0 +1,426 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Text;
+using DevComponents.DotNetBar.Controls;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    internal class OfficeTabFormItemPainter : Office2007ButtonItemPainter
+    {
+        protected override Rectangle GetTextRectangle(ButtonItem button, ItemPaintArgs pa, eTextFormat stringFormat, CompositeImage image)
+        {
+            Rectangle r = base.GetTextRectangle(button, pa, stringFormat, image);
+            if (image == null && string.IsNullOrEmpty(button.SymbolRealized))
+            {
+                r.Inflate(-(TabFormItem.TabOverlap / 2), 0);
+                //r.Inflate(-3, 0);
+            }
+            else
+                r.X += TabFormItem.TabOverlap / 2 - TabFormItem.Offset;
+
+            return r;
+        }
+
+        public override Rectangle GetImageRectangle(ButtonItem button, ItemPaintArgs pa, CompositeImage image)
+        {
+            Rectangle r = base.GetImageRectangle(button, pa, image);
+            //if (button.ImagePosition == eImagePosition.Left)
+            r.X += TabFormItem.TabOverlap / 2 - TabFormItem.Offset;
+            //else if (button.ImagePosition == eImagePosition.Right)
+            //   r.X -= TabOverlap/2 - Offset;
+            return r;
+        }
+
+        public override eTextFormat GetStringFormat(ButtonItem button, ItemPaintArgs pa, CompositeImage image)
+        {
+            eTextFormat sf = base.GetStringFormat(button, pa, image);
+            sf &= ~(sf & eTextFormat.EndEllipsis);
+            return sf;
+        }
+
+        protected override void PaintState(ButtonItem button, ItemPaintArgs pa, CompositeImage image, Rectangle r, bool isMouseDown)
+        {
+            if (r.IsEmpty || !IsItemEnabled(button, pa) || r.Width == 0 || r.Height == 0)
+                return;
+
+            TabFormItem tab = button as TabFormItem;
+            if (tab == null || IsOnMenu(button, pa))
+            {
+                base.PaintState(button, pa, image, r, isMouseDown);
+                return;
+            }
+
+            bool isOnMenu = pa.IsOnMenu;
+            TabFormItemColorTable tabColorTable = GetColorTable(tab);
+            if (tabColorTable == null)
+                return;
+
+            TabFormItemStateColorTable stateColors = GetStateColorTable(tabColorTable, tab);
+
+            if (stateColors == null)
+                return;
+
+            Graphics g = pa.Graphics;
+            Region oldClip = g.Clip;
+            try
+            {
+                Rectangle rClip = GetTabBounds(tab);
+                rClip.Inflate(1, 0);
+                g.SetClip(rClip, CombineMode.Intersect);
+
+                eTabFormStripControlDock tabAlign = tab.TabAlignment;
+                tab.TabPath = GetTabPath(r, tabAlign, true);
+                if (stateColors.BackColors != null && stateColors.BackColors.Length > 0 || tab.BackColors != null && tab.BackColors.Length > 0)
+                {
+                    using (Brush brush = DisplayHelp.CreateBrush(r, (tab.BackColors != null && tab.BackColors.Length > 0) ? tab.BackColors : stateColors.BackColors, stateColors.BackColorsGradientAngle, stateColors.BackColorsPositions))
+                    {
+                        using (GraphicsPath path = GetTabPath(r, tabAlign, true))
+                        {
+                            g.FillPath(Brushes.White, path);
+                            g.FillPath(brush, path);
+                        }
+                    }
+                }
+
+                if (stateColors.BorderColors.Length > 0)
+                {
+                    Rectangle borderRect = r;
+                    foreach (Color color in stateColors.BorderColors)
+                    {
+                        using (GraphicsPath path = GetTabPath(borderRect, tabAlign, false))
+                        {
+                            using (Pen pen = new Pen(color, Dpi.Width1))
+                                g.DrawPath(pen, path);
+                        }
+                        borderRect.Inflate(-Dpi.Width1, -Dpi.Width1);
+                    }
+
+                }
+
+                if (tab.CloseButtonVisible)
+                {
+                    int closeButtonSize = Dpi.Width(TabFormItem.CloseButtonSize);
+                    Rectangle closeBounds = new Rectangle(r.Right - (TabFormItem.TabOverlap + TabFormItem.Radius - TabFormItem.Offset), r.Y + (r.Height - closeButtonSize) / 2 + Dpi.Height1, closeButtonSize, closeButtonSize);
+                    TabCloseButtonStateColorTable closeButtonColorTable = GetCloseButtonColorTable(tabColorTable, tab);
+                    if (closeButtonColorTable.BackColors.Length > 0)
+                    {
+                        using (
+                            Brush brush = DisplayHelp.CreateBrush(closeBounds, closeButtonColorTable.BackColors,
+                                closeButtonColorTable.BackColorsGradientAngle, closeButtonColorTable.BackColorsPositions)
+                            )
+                        {
+                            g.FillEllipse(brush, closeBounds);
+                        }
+                    }
+
+                    if (!closeButtonColorTable.BorderColor.IsEmpty)
+                    {
+                        using (Pen pen = new Pen(closeButtonColorTable.BorderColor, Dpi.Width1))
+                        {
+                            g.DrawEllipse(pen, closeBounds);
+                        }
+                    }
+                    Color fc = stateColors.TextColor;
+                    if (!closeButtonColorTable.ForeColor.IsEmpty)
+                        fc = closeButtonColorTable.ForeColor;
+
+
+                    using (Pen pen = new Pen(fc, Dpi.Width2))
+                    {
+                        Rectangle rc = closeBounds;
+                        rc.Inflate(-Dpi.Width3, -Dpi.Width3);
+
+                        g.DrawLine(pen, rc.X, rc.Y, rc.Right, rc.Bottom);
+                        g.DrawLine(pen, rc.Right, rc.Y, rc.X, rc.Bottom);
+
+                    }
+
+                    tab.CloseButtonBounds = closeBounds;
+                }
+                else
+                    tab.CloseButtonBounds = Rectangle.Empty;
+
+                if (tab.Checked)
+                {
+                    g.ResetClip();
+                    using (Pen pen = new Pen(stateColors.BorderColors[0], Dpi.Width1))
+                    {
+                        Rectangle tb = GetTabBounds(tab);
+                        tb.Inflate(-Dpi.Width2, 0);
+                        TabFormItemsSimpleContainer cont = tab.Parent as TabFormItemsSimpleContainer;
+                        if (cont == null || cont.ClippingRectangle.IsEmpty || cont.ClippingRectangle.IntersectsWith(tb))
+                        {
+                            if (cont != null && !cont.ClippingRectangle.IsEmpty && cont.ClippingRectangle.IntersectsWith(tb) && tb.Right > cont.ClippingRectangle.Right)
+                                tb.Width = Math.Max(1, cont.ClippingRectangle.Right - tb.X);
+
+                            if (tabAlign == eTabFormStripControlDock.Bottom)
+                            {
+                                g.DrawLine(pen, 0, tb.Y, tb.X, tb.Y);
+                                g.DrawLine(pen, tb.Right, tb.Y, pa.ContainerControl.Width, tb.Y);
+                            }
+                            else
+                            {
+                                g.DrawLine(pen, 0, tb.Bottom - 1, tb.X, tb.Bottom - 1);
+                                g.DrawLine(pen, tb.Right, tb.Bottom - 1, pa.ContainerControl.Width, tb.Bottom - 1);
+                            }
+                        }
+                        else
+                        {
+                            if (tabAlign == eTabFormStripControlDock.Bottom)
+                            {
+                                g.DrawLine(pen, 0, tb.Y, pa.ContainerControl.Width, tb.Y);
+                            }
+                            else
+                            {
+                                g.DrawLine(pen, 0, tb.Bottom - 1, pa.ContainerControl.Width, tb.Bottom - 1);
+                            }
+                        }
+                    }
+                }
+
+                g.Clip = oldClip;
+            }
+            finally
+            {
+                if (oldClip != null) oldClip.Dispose();
+            }
+        }
+
+        private TabCloseButtonStateColorTable GetCloseButtonColorTable(TabFormItemColorTable tabColorTable, TabFormItem tab)
+        {
+            if (tab.CloseButtonState == eButtonState.MouseDownLeft)
+                return tabColorTable.CloseButton.Pressed;
+            else if (tab.CloseButtonState == eButtonState.MouseOver)
+                return tabColorTable.CloseButton.MouseOver;
+
+            return tabColorTable.CloseButton.Normal;
+        }
+
+        private Rectangle GetTabBounds(TabFormItem tab)
+        {
+            Rectangle r = tab.DisplayRectangle;
+            using (GraphicsPath tabPath = GetTabPath(r, tab.TabAlignment, false))
+                r = Rectangle.Round(tabPath.GetBounds());
+            return r;
+        }
+        private GraphicsPath GetTabPath(Rectangle r, eTabFormStripControlDock align, bool bCloseFigure)
+        {
+            return GetTopTabPath(r);
+            Rectangle rbox = r;
+
+            //if (align == eTabFormStripControlDock.Left)
+            //{
+            //    // Left
+            //    rbox = new Rectangle(r.X, r.Y, r.Height, r.Width);
+            //}
+            //else if (align == eTabFormStripControlDock.Right)
+            //{
+            //    // Right
+            //    rbox = new Rectangle(r.Right - r.Height, r.Y, r.Height, r.Width);
+            //}
+
+            GraphicsPath path = new GraphicsPath();
+
+            if (align != eTabFormStripControlDock.Bottom)
+            {
+                Point[] p = new Point[4];
+                int slope = Math.Min(rbox.Width > rbox.Height ? 16 : 10, rbox.Height / 2);
+                p[0].X = rbox.X - (slope + Dpi.Width6);
+                p[0].Y = rbox.Bottom - 1;
+                p[1].X = p[0].X + Dpi.Width6;
+                p[1].Y = p[0].Y - Dpi.Height4;
+                p[2].X = p[1].X + slope - Dpi.Width4;
+                p[2].Y = rbox.Y + Dpi.Height3;
+                p[3].X = rbox.X + Dpi.Width3;
+                p[3].Y = rbox.Y;
+                path.AddCurve(p, 0, 3, Math.Max(.3f, 1f * Math.Min(1, slope / (float)rbox.Height)));
+
+                //path.AddLine(p[3].X + 1, rbox.Y, rbox.Right-Dpi.Width4, rbox.Y);
+
+                p = new Point[4];
+                p[0].X = rbox.Right - Dpi.Width3;
+                p[0].Y = rbox.Y;
+                p[1].X = p[0].X + Dpi.Width7;
+                p[1].Y = p[0].Y + Dpi.Height3;
+                p[2].X = p[1].X + slope - Dpi.Width4;
+                p[2].Y = rbox.Bottom - Dpi.Height4 - 1;
+                p[3].X = p[2].X + Dpi.Width6;
+                p[3].Y = rbox.Bottom - 1;
+                path.AddCurve(p, 0, 3, Math.Max(.1f, 1f * Math.Min(1, slope / (float)rbox.Height)));
+
+                if (bCloseFigure)
+                {
+                    path.AddLine(p[0].X, rbox.Bottom, rbox.Right, rbox.Bottom);
+                    path.CloseAllFigures();
+                }
+            }
+            else
+            {
+                Point[] p = new Point[4];
+                int slope = Math.Min(18, rbox.Height / 2);
+
+                p[0].X = rbox.X - (slope + Dpi.Width6);
+                p[0].Y = rbox.Y;
+                p[1].X = p[0].X + Dpi.Width6;
+                p[1].Y = p[0].Y + Dpi.Height4;
+                p[2].X = p[1].X + slope - Dpi.Width4;
+                p[2].Y = rbox.Bottom - Dpi.Height3 - 1;
+                p[3].X = rbox.X + Dpi.Width3;
+                p[3].Y = rbox.Bottom - 1;
+                path.AddCurve(p, 0, 3, Math.Max(.1f, 1f * Math.Min(1, slope / (float)rbox.Height)));
+
+                //path.AddLine(p[3].X + 1, rbox.Y, rbox.Right-Dpi.Width4, rbox.Y);
+
+                p = new Point[4];
+                p[0].X = rbox.Right - Dpi.Width3;
+                p[0].Y = rbox.Bottom;
+                p[1].X = p[0].X + Dpi.Width6;
+                p[1].Y = p[0].Y - Dpi.Height3;
+                p[2].X = p[1].X + slope - Dpi.Width4;
+                p[2].Y = rbox.Y + Dpi.Height4;
+                p[3].X = p[2].X + Dpi.Width6;
+                p[3].Y = rbox.Y;
+                path.AddCurve(p, 0, 3, Math.Max(.1f, 1f * Math.Min(1, slope / (float)rbox.Height)));
+
+                if (bCloseFigure)
+                {
+                    path.AddLine(p[0].X, rbox.Bottom, rbox.Right, rbox.Bottom);
+                    path.CloseAllFigures();
+                }
+            }
+
+            //if (align == eTabStripAlignment.Left)
+            //{
+            //    // Left
+            //    Matrix m = new Matrix();
+            //    //RectangleF rf=path.GetBounds();
+            //    m.RotateAt(-90, new PointF(rbox.X, rbox.Bottom));
+            //    m.Translate(rbox.Height, rbox.Width - rbox.Height, MatrixOrder.Append);
+            //    path.Transform(m);
+            //}
+            //else if (align == eTabStripAlignment.Right)
+            //{
+            //    // Right
+            //    Matrix m = new Matrix();
+            //    //RectangleF rf=path.GetBounds();
+            //    m.RotateAt(90, new PointF(rbox.Right, rbox.Bottom));
+            //    m.Translate(-rbox.Height, rbox.Width - (rbox.Height - 1), MatrixOrder.Append);
+            //    path.Transform(m);
+            //}
+
+            return path;
+        }
+
+        private GraphicsPath GetTopTabPath(Rectangle tabRect)
+        {
+            Rectangle r = tabRect;
+            r.Width -= Dpi.Width1;
+            //r.Height -= Dpi.Height(StripeBot);
+
+            int k = Math.Min(20, r.Height);
+            float scale = (float)k / 20;
+
+            int delta = (int)(90 * scale) - 25;
+            int n = (int)((TabFormItem.TabOverlap / 2f) * scale);
+
+            // Create the path
+
+            GraphicsPath path = new GraphicsPath();
+
+            int dia = TabFormItem.Dia;
+            Rectangle ar = new Rectangle(r.X - TabFormItem.Radius, r.Bottom - dia, dia, dia);
+            path.AddArc(ar, 90, -delta);
+
+            int offset = TabFormItem.Offset;
+            ar = new Rectangle(r.X + TabFormItem.Radius + offset, r.Y, dia, dia);
+            path.AddArc(ar, 270 - delta, delta);
+
+            ar = new Rectangle(r.Right - (dia + offset + n), r.Y, dia, dia);
+            path.AddArc(ar, 270, delta);
+
+            ar = new Rectangle(r.Right - (dia - offset * 2), r.Bottom - dia, dia, dia);
+            path.AddArc(ar, 90 + delta, -delta);
+
+            return (path);
+        }
+
+
+
+        protected override Color GetTextColor(ButtonItem button, ItemPaintArgs pa)
+        {
+            if (!IsItemEnabled(button, pa) || !(button is TabFormItem))
+                return base.GetTextColor(button, pa);
+
+            TabFormItem tab = button as TabFormItem;
+            if (!tab.ForeColor.IsEmpty)
+                return tab.ForeColor;
+
+            Color textColor = Color.Empty;
+
+            TabFormItemStateColorTable ct = GetStateColorTable(GetColorTable(tab), tab);
+
+            if (ct != null)
+            {
+                //if (pa.GlassEnabled && !ct.GlassText.IsEmpty)
+                //    return ct.GlassText;
+                textColor = ct.TextColor;
+            }
+
+            if (textColor.IsEmpty)
+                return base.GetTextColor(button, pa);
+
+            return textColor;
+        }
+
+        private TabFormItemColorTable GetColorTable(TabFormItem tab)
+        {
+            return this.ColorTable.TabFormItemColorTables[tab.GetColorTableName()];
+        }
+
+        internal static TabFormItemStateColorTable GetStateColorTable(TabFormItemColorTable tabColorTable, TabFormItem tab)
+        {
+            if (tab.CustomColorTable != null)
+                tabColorTable = tab.CustomColorTable;
+
+            if (tabColorTable == null)
+                return null;
+
+            TabFormItemStateColorTable stateColors = null;
+
+            if (!tab.RenderTabState)
+                stateColors = tabColorTable.Default;
+            else if (!tab.GetEnabled())
+                stateColors = tabColorTable.Disabled;
+            else if (tab.Checked)
+                stateColors = tabColorTable.Selected;
+            else if (tab.IsMouseOver)
+                stateColors = tabColorTable.MouseOver;
+            else
+                stateColors = tabColorTable.Default;
+
+            return stateColors;
+        }
+        //#if FRAMEWORK20
+        //        public override void PaintButtonText(ButtonItem button, ItemPaintArgs pa, Color textColor, CompositeImage image)
+        //        {
+        //            eDotNetBarStyle effectiveStyle = button.EffectiveStyle;
+        //            if (!((effectiveStyle == eDotNetBarStyle.Office2010 || StyleManager.IsMetro(effectiveStyle)) && pa.GlassEnabled))
+        //            {
+        //                base.PaintButtonText(button, pa, textColor, image);
+        //                return;
+        //            }
+
+        //            Rectangle r = GetTextRectangle(button, pa, eTextFormat.HorizontalCenter | eTextFormat.VerticalCenter, image);
+        //            //r.Offset(0, 3);
+        //            //r.Height -= 2;
+        //            ThemeTextFormat textFormat = ThemeTextFormat.Center | ThemeTextFormat.VCenter | ThemeTextFormat.HidePrefix | ThemeTextFormat.SingleLine;
+        //            bool renderGlow = true;
+        //            //if (effectiveStyle == eDotNetBarStyle.Office2010 && StyleManager.Style == eStyle.Office2010Black)
+        //            //    renderGlow = false;
+        //            Office2007RibbonControlPainter.PaintTextOnGlass(pa.Graphics, button.Text, pa.Font, r, textFormat, textColor, true, renderGlow, 10);
+        //        }
+        //#endif
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/TabbedForm/OfficeTabFormStripPainter.cs b/PROMS/DotNetBar Source Code/Controls/TabbedForm/OfficeTabFormStripPainter.cs
new file mode 100644
index 00000000..b0dea7a8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/TabbedForm/OfficeTabFormStripPainter.cs	
@@ -0,0 +1,204 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using DevComponents.DotNetBar.Controls;
+using System.Drawing;
+using System.Windows.Forms;
+using System.Drawing.Drawing2D;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    internal class OfficeTabFormStripPainter : TabFormStripPainter, IOffice2007Painter
+    {
+        #region IOffice2007Painter
+        private Office2007ColorTable _ColorTable = null;
+
+        /// <summary>
+        /// Gets or sets color table used by renderer.
+        /// </summary>
+        public Office2007ColorTable ColorTable
+        {
+            get { return _ColorTable; }
+            set { _ColorTable = value; }
+        }
+        #endregion
+
+        public override void Paint(TabFormStripPainterArgs renderingInfo)
+        {
+            TabFormStripControl strip = renderingInfo.TabFormStrip;
+            Graphics g = renderingInfo.Graphics;
+            Rectangle bounds = strip.ClientRectangle;
+            bool isFormActive = true;
+            Form form = strip.FindForm();
+            if (form != null && (form != System.Windows.Forms.Form.ActiveForm && form.MdiParent == null ||
+                    form.MdiParent != null && form.MdiParent.ActiveMdiChild != form))
+                isFormActive = false;
+            
+            //if (ct.BackgroundStyle != null)
+            //{
+            //    ElementStyleDisplayInfo di = new ElementStyleDisplayInfo(ct.BackgroundStyle, g, bounds);
+            //    ElementStyleDisplay.PaintBackground(di);
+            //}
+            TabFormControl tabControl = strip.Parent as TabFormControl;
+            TabFormColorTable formColorTable = ColorTable.TabForm;
+            if (tabControl != null && tabControl.ColorTable != null)
+                formColorTable = tabControl.ColorTable;
+
+            TabFormStateColorTable stateColorTable = isFormActive ? formColorTable.Active : formColorTable.Inactive;
+            if (stateColorTable.CaptionBackColors.Length > 0)
+            {
+                Rectangle cb = strip.ClientRectangle;
+                cb.Inflate(1, 1);
+                using (
+                    Brush brush = DisplayHelp.CreateBrush(cb, stateColorTable.CaptionBackColors,
+                        stateColorTable.CaptionBackColorsGradientAngle, stateColorTable.CaptionBackColorsPositions))
+                    g.FillRectangle(brush, cb);
+            }
+
+            if (strip.CaptionVisible)
+            {
+                if (strip.CaptionBounds.IsEmpty || strip.SystemCaptionItemBounds.IsEmpty)
+                    SetCaptionItemBounds(strip, renderingInfo);
+                Color captionTextColor = stateColorTable.CaptionText;
+                eTextFormat textFormat = formColorTable.CaptionTextFormat;
+
+                Font font = SystemFonts.DefaultFont;
+                bool disposeFont = true;
+                if (strip.CaptionFont != null)
+                {
+                    font.Dispose();
+                    font = strip.CaptionFont;
+                    disposeFont = false;
+                }
+                string text = strip.TitleText;
+                if (string.IsNullOrEmpty(text) && form != null) text = form.Text;
+                bool isTitleTextMarkup = strip.TitleTextMarkupBody != null;
+                Rectangle captionRect = strip.CaptionBounds;
+                const int CAPTION_TEXT_PADDING = 12;
+                captionRect.X += CAPTION_TEXT_PADDING;
+                captionRect.Width -= CAPTION_TEXT_PADDING;
+
+                if (StyleManager.Style == eStyle.OfficeMobile2014)
+                {
+                    captionRect.Y -= 2;
+                    captionRect.Height -= 2;
+                    // Center text in center of window instead of center of available space
+                    if (!strip.SystemCaptionItemBounds.IsEmpty && captionRect.Width > strip.SystemCaptionItemBounds.Width)
+                    {
+                        captionRect.X += strip.SystemCaptionItemBounds.Width / 2 + 18;
+                        captionRect.Width -= strip.SystemCaptionItemBounds.Width / 2 + 18;
+                    }
+                }
+
+                if (!isTitleTextMarkup)
+                    TextDrawing.DrawString(g, text, font, captionTextColor, captionRect, textFormat);
+                else
+                {
+                    TextMarkup.MarkupDrawContext d = new TextMarkup.MarkupDrawContext(g, font, captionTextColor, strip.RightToLeft == System.Windows.Forms.RightToLeft.Yes, captionRect, false);
+                    d.AllowMultiLine = false;
+                    d.IgnoreFormattingColors = !isFormActive;
+                    TextMarkup.BodyElement body = strip.TitleTextMarkupBody;
+                    if (strip.TitleTextMarkupLastArrangeBounds != captionRect)
+                    {
+                        body.Measure(captionRect.Size, d);
+                        body.Arrange(captionRect, d);
+                        strip.TitleTextMarkupLastArrangeBounds = captionRect;
+                        Rectangle mr = body.Bounds;
+                        if (mr.Width < captionRect.Width)
+                            mr.Offset((captionRect.Width - mr.Width) / 2, 0);
+                        if (mr.Height < captionRect.Height)
+                            mr.Offset(0, (captionRect.Height - mr.Height) / 2);
+                        body.Bounds = mr;
+                    }
+                    Region oldClip = g.Clip;
+                    g.SetClip(captionRect, CombineMode.Intersect);
+                    body.Render(d);
+                    g.Clip = oldClip;
+                    if (oldClip != null) oldClip.Dispose();
+                }
+
+                if (disposeFont) font.Dispose();
+            }
+
+        }
+
+        private void SetCaptionItemBounds(TabFormStripControl strip, TabFormStripPainterArgs renderingInfo)
+        {
+            if (!strip.CaptionVisible)
+                return;
+            bool rightToLeft = (strip.RightToLeft == System.Windows.Forms.RightToLeft.Yes);
+
+            System.Windows.Forms.Form form = strip.FindForm();
+
+            // Get right most X position of the Quick Access Toolbar
+            int right = 0, sysLeft = 0;
+            for (int i = strip.CaptionContainerItem.SubItems.Count - 1; i >= 0; i--)
+            {
+                BaseItem item = strip.CaptionContainerItem.SubItems[i];
+                if (!item.Visible || !item.Displayed)
+                    continue;
+                if (item.ItemAlignment == eItemAlignment.Near && item.Visible && i > 0)
+                {
+                    if (rightToLeft)
+                        right = item.DisplayRectangle.X;
+                    else
+                        right = item.DisplayRectangle.Right;
+                    break;
+                }
+                else if (item.ItemAlignment == eItemAlignment.Far && item.Visible)
+                {
+                    if (rightToLeft)
+                        sysLeft = item.DisplayRectangle.Right;
+                    else
+                        sysLeft = item.DisplayRectangle.X;
+                }
+            }
+
+            if (strip.CaptionContainerItem is CaptionItemContainer && ((CaptionItemContainer)strip.CaptionContainerItem).MoreItems != null)
+            {
+                if (rightToLeft)
+                    right = ((CaptionItemContainer)strip.CaptionContainerItem).MoreItems.DisplayRectangle.X;
+                else
+                    right = ((CaptionItemContainer)strip.CaptionContainerItem).MoreItems.DisplayRectangle.Right;
+            }
+
+            Rectangle r = new Rectangle(right, 2, strip.CaptionContainerItem.WidthInternal - right - (strip.CaptionContainerItem.WidthInternal - sysLeft), strip.GetTotalCaptionHeight());
+            strip.CaptionBounds = r;
+
+            if (sysLeft > 0)
+            {
+                if (rightToLeft)
+                    strip.SystemCaptionItemBounds = new Rectangle(r.X, r.Y, sysLeft, r.Height);
+                else
+                    strip.SystemCaptionItemBounds = new Rectangle(sysLeft, r.Y, strip.CaptionContainerItem.WidthInternal - sysLeft, r.Height);
+            }
+
+            //if (right == 0 || r.Height <= 0 || r.Width <= 0)
+            //    return;
+
+            //BaseItem startButton = strip.GetApplicationButton();
+            //if (startButton != null)
+            //{
+            //    int startIndex = strip.QuickToolbarItems.IndexOf(startButton);
+            //    if (strip.QuickToolbarItems.Count - 1 > startIndex)
+            //    {
+            //        BaseItem firstItem = strip.QuickToolbarItems[startIndex + 1];
+            //        if (rightToLeft)
+            //        {
+            //            r.Width -= r.Right - firstItem.DisplayRectangle.Right;
+            //        }
+            //        else
+            //        {
+            //            r.Width -= firstItem.DisplayRectangle.X - r.X;
+            //            r.X = firstItem.DisplayRectangle.X;
+            //        }
+            //    }
+            //}
+
+            //r.Height = ((CaptionItemContainer)strip.CaptionContainerItem).MaxItemHeight + 6;
+            //r.X = 0;
+            //r.Width = right;
+            //strip.QuickToolbarBounds = r;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/TabbedForm/TabFormColorTable.cs b/PROMS/DotNetBar Source Code/Controls/TabbedForm/TabFormColorTable.cs
new file mode 100644
index 00000000..db4361ac
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/TabbedForm/TabFormColorTable.cs	
@@ -0,0 +1,41 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Text;
+using DevComponents.DotNetBar.Metro;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    public class TabFormColorTable
+    {
+        /// <summary>
+        /// Gets or sets the color table for form in active state.
+        /// </summary>
+        public TabFormStateColorTable Active = new TabFormStateColorTable();
+
+        /// <summary>
+        /// Gets or sets the color table for from in inactive state.
+        /// </summary>
+        public TabFormStateColorTable Inactive = new TabFormStateColorTable();
+
+        /// <summary>
+        /// Gets or sets the border thickness.
+        /// </summary>
+        public Thickness BorderThickness = new Thickness(1, 1, 1, 1);
+
+        /// <summary>
+        /// Gets or sets the background color of the form.
+        /// </summary>
+        public Color BackColor = Color.Empty;
+
+        /// <summary>
+        /// Gets or sets the text color of the form.
+        /// </summary>
+        public Color TextColor = Color.Empty;
+
+        /// <summary>
+        /// Gets or sets the text formatting for caption text.
+        /// </summary>
+        public eTextFormat CaptionTextFormat = eTextFormat.VerticalCenter | eTextFormat.Left | eTextFormat.EndEllipsis | eTextFormat.NoPrefix;
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/TabbedForm/TabFormControl.cs b/PROMS/DotNetBar Source Code/Controls/TabbedForm/TabFormControl.cs
new file mode 100644
index 00000000..19cc401c
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/TabbedForm/TabFormControl.cs	
@@ -0,0 +1,905 @@
+using DevComponents.DotNetBar.Rendering;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.Metro;
+using DevComponents.DotNetBar.Primitives;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    /// <summary>
+    /// Represents Tabbed Forms control for creating tabbed user interface as replacement for MDI child forms.
+    /// </summary>
+    [ToolboxBitmap(typeof(TabFormControl), "TabFormControl.ico"), ToolboxItem(true), Designer("DevComponents.DotNetBar.Design.TabFormControlDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf"), System.Runtime.InteropServices.ComVisible(false)]
+    public class TabFormControl : System.Windows.Forms.ContainerControl
+    {
+        #region Events
+
+        /// <summary>
+        /// Occurs 
+        /// </summary>
+        [Description("Occurs ")]
+        public event PaintTabFormItemEventHandler PaintTabFormItem;
+
+        /// <summary>
+        /// Raises RemovingToken event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnPaintTabFormItem(PaintTabFormItemEventArgs e)
+        {
+            PaintTabFormItemEventHandler handler = PaintTabFormItem;
+            if (handler != null)
+                handler(this, e);
+        }
+        /// <summary>
+        /// Occurs when DotNetBar is looking for translated text for one of the internal text that are
+        /// displayed on menus, toolbars and customize forms. You need to set Handled=true if you want
+        /// your custom text to be used instead of the built-in system value.
+        /// </summary>
+        public event DotNetBarManager.LocalizeStringEventHandler LocalizeString;
+
+        /// <summary>
+        /// Occurs when Item on control is clicked.
+        /// </summary>
+        [Description("Occurs when Item on control is clicked.")]
+        public event EventHandler ItemClick;
+
+        /// <summary>
+        ///     Occurs after selected tab has changed. You can use
+        ///     <see cref="SelectedTab">TabFormControl.SelectedTab</see>
+        ///     property to get reference to newly selected tab.
+        /// </summary>
+        public event EventHandler SelectedTabChanged;
+
+        /// <summary>
+        /// Occurs when text markup link from TitleText markup is clicked. Markup links can be created using "a" tag, for example:
+        /// <a name="MyLink">Markup link</a>
+        /// </summary>
+        [Description("Occurs when text markup link from TitleText markup is clicked.")]
+        public event MarkupLinkClickEventHandler TitleTextMarkupLinkClick;
+
+        /// <summary>
+        /// Occurs before TabFormItem is detached and gives you opportunity to cancel the action or provide your own new TabParentForm and TabFormControl.
+        /// </summary>
+        [Description("Occurs before TabFormItem is detached and gives you opportunity to cancel the action or provide your own new TabParentForm and TabFormControl.")]
+        public event TabFormItemDetachEventHandler BeforeTabFormItemDetach;
+
+        /// <summary>
+        /// Raises BeforeTabFormItemDetach event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnBeforeTabFormItemDetach(TabFormItemDetachEventArgs e)
+        {
+            TabFormItemDetachEventHandler handler = BeforeTabFormItemDetach;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        /// <summary>
+        /// Occurs after TabFormItem has been detached and is added to the new form and tab control.
+        /// </summary>
+        [Description("Occurs after TabFormItem has been detached and is added to the new form and tab control.")]
+        public event TabFormItemDetachEventHandler TabFormItemDetach;
+        /// <summary>
+        /// Raises TabFormItemDetach event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnTabFormItemDetach(TabFormItemDetachEventArgs e)
+        {
+            TabFormItemDetachEventHandler handler = TabFormItemDetach;
+            if (handler != null)
+                handler(this, e);
+        }
+        #endregion
+
+        #region Private Variables and Constructor
+        private TabFormStripControl _TabStrip = null;
+        private bool m_AutoSize = false;
+        private ShadowPaintInfo m_ShadowPaintInfo = null;
+        private bool _UseCustomizeDialog = true;
+        //private bool m_EnableQatPlacement = true;
+
+        private int DefaultBottomDockPadding = 0;
+        private DevComponents.DotNetBar.Ribbon.SubItemsQatCollection m_QatSubItemsCollection = null;
+        private RibbonLocalization m_SystemText = new RibbonLocalization();
+        private bool m_MenuTabsEnabled = true;
+        private ContextMenuBar m_GlobalContextMenuBar = null;
+
+        public TabFormControl()
+        {
+            // This forces the initialization out of paint loop which speeds up how fast components show up
+            BaseRenderer renderer = DevComponents.DotNetBar.Rendering.GlobalManager.Renderer;
+
+            this.SetStyle(ControlStyles.AllPaintingInWmPaint
+                  | ControlStyles.ResizeRedraw
+                  | DisplayHelp.DoubleBufferFlag
+                  | ControlStyles.UserPaint
+                  | ControlStyles.Opaque
+                  , true);
+            _TabStrip = new TabFormStripControl();
+            _TabStrip.Dock = DockStyle.Top;
+            _TabStrip.Height = 40;
+            _TabStrip.ItemAdded += new System.EventHandler(TabStripItemAdded);
+            _TabStrip.LocalizeString += new DotNetBarManager.LocalizeStringEventHandler(TabStripLocalizeString);
+            _TabStrip.ItemClick += new System.EventHandler(TabStripItemClick);
+            _TabStrip.ButtonCheckedChanged += new EventHandler(TabStripButtonCheckedChanged);
+            _TabStrip.TitleTextMarkupLinkClick += new MarkupLinkClickEventHandler(TabStripTitleTextMarkupLinkClick);
+            _TabStrip.BeforeTabFormItemDetach += TabStripBeforeTabFormItemDetach;
+            _TabStrip.TabFormItemDetach += TabStripTabFormItemDetach;
+            this.Controls.Add(_TabStrip);
+            this.TabStop = false;
+            this.DockPadding.Bottom = DefaultBottomDockPadding;
+            StyleManager.Register(this);
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            StyleManager.Unregister(this);
+            base.Dispose(disposing);
+        }
+        #endregion
+
+        #region Internal Implementation
+        /// <summary>
+        /// Called by StyleManager to notify control that style on manager has changed and that control should refresh its appearance if
+        /// its style is controlled by StyleManager.
+        /// </summary>
+        /// <param name="newStyle">New active style.</param>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void StyleManagerStyleChanged(eDotNetBarStyle newStyle)
+        {
+            this.DockPadding.Left = 0;
+        }
+
+        internal bool IsDesignMode
+        {
+            get { return this.DesignMode; }
+        }
+
+        internal bool InternalPaintTabFormItem(TabFormItem tab, ItemPaintArgs itemPaintArgs)
+        {
+            PaintTabFormItemEventArgs p = new PaintTabFormItemEventArgs(tab, itemPaintArgs.Graphics);
+            OnPaintTabFormItem(p);
+            return p.PaintDefault;
+        }
+        protected virtual void OnSelectedTabChanged(EventArgs e)
+        {
+            if (SelectedTabChanged != null)
+                SelectedTabChanged(this, e);
+        }
+
+        void TabStripButtonCheckedChanged(object sender, EventArgs e)
+        {
+            if (sender is TabFormItem && ((TabFormItem)sender).Checked)
+            {
+                OnSelectedTabChanged(new EventArgs());
+            }
+        }
+
+        private void TabStripItemClick(object sender, System.EventArgs e)
+        {
+            if (ItemClick != null)
+                ItemClick(sender, e);
+        }
+
+        private void TabStripLocalizeString(object sender, LocalizeEventArgs e)
+        {
+            if (LocalizeString != null)
+                LocalizeString(this, e);
+        }
+
+        /// <summary>
+        /// Gets or sets whether anti-alias smoothing is used while painting. Default value is false.
+        /// </summary>
+        [DefaultValue(true), Browsable(true), Category("Appearance"), Description("Gets or sets whether anti-aliasing is used while painting.")]
+        public bool AntiAlias
+        {
+            get { return _TabStrip.AntiAlias; }
+            set
+            {
+                _TabStrip.AntiAlias = value;
+                this.Invalidate();
+            }
+        }
+
+        internal DevComponents.DotNetBar.Rendering.Office2007ColorTable GetOffice2007ColorTable()
+        {
+            DevComponents.DotNetBar.Rendering.Office2007Renderer r = DevComponents.DotNetBar.Rendering.GlobalManager.Renderer as DevComponents.DotNetBar.Rendering.Office2007Renderer;
+            if (r != null)
+                return r.ColorTable;
+            return new DevComponents.DotNetBar.Rendering.Office2007ColorTable();
+        }
+
+        /// <summary>
+        /// Performs the setup of the TabFormPanel with the current style of the TabFormControl Control.
+        /// </summary>
+        /// <param name="panel">Panel to apply style changes to.</param>
+        public void SetTabPanelStyle(TabFormPanel panel)
+        {
+            if (this.DesignMode)
+            {
+                TypeDescriptor.GetProperties(panel.DockPadding)["Left"].SetValue(panel.DockPadding, 3);
+                TypeDescriptor.GetProperties(panel.DockPadding)["Right"].SetValue(panel.DockPadding, 3);
+                TypeDescriptor.GetProperties(panel.DockPadding)["Bottom"].SetValue(panel.DockPadding, 3);
+            }
+            else
+            {
+                panel.DockPadding.Left = 3;
+                panel.DockPadding.Right = 3;
+                panel.DockPadding.Bottom = 3;
+            }
+            panel.Style.Class = ElementStyleClassKeys.TabFormPanelKey;
+        }
+
+        /// <summary>
+        /// Creates new Tab at specified position, creates new associated panel and adds them to the control.
+        /// </summary>
+        /// <param name="text">Specifies the text displayed on the tab.</param>
+        /// <param name="name">Specifies the name of the tab</param>
+        /// <param name="insertPosition">Specifies the position of the new tab inside of Items collection.</param>
+        /// <returns>New instance of the TabFormItem that was created.</returns>
+        public TabFormItem CreateTab(string text, string name, int insertPosition)
+        {
+            TabFormItem item = new TabFormItem();
+            item.Text = text;
+            item.Name = name;
+
+            TabFormPanel panel = new TabFormPanel();
+            panel.Dock = DockStyle.Fill;
+            SetTabPanelStyle(panel);
+            this.Controls.Add(panel);
+            panel.SendToBack();
+
+            item.Panel = panel;
+            if (insertPosition < 0)
+            {
+                insertPosition = this.Items.Count;
+                for (int i = 0; i < this.Items.Count; i++)
+                {
+                    if (this.Items[i].ItemAlignment == eItemAlignment.Far)
+                    {
+                        insertPosition = i;
+                        break;
+                    }
+                }
+                if (insertPosition >= this.Items.Count)
+                    this.Items.Add(item);
+                else
+                    this.Items.Insert(insertPosition, item);
+            }
+            else if (insertPosition > this.Items.Count - 1)
+                this.Items.Add(item);
+            else
+                this.Items.Insert(insertPosition, item);
+
+            return item;
+        }
+
+        /// <summary>
+        /// Creates new Tab and associated panel and adds them to the control.
+        /// </summary>
+        /// <param name="text">Specifies the text displayed on the tab.</param>
+        /// <param name="name">Specifies the name of the tab</param>
+        /// <returns>New instance of the TabFormItem that was created.</returns>
+        public TabFormItem CreateTab(string text, string name)
+        {
+            return CreateTab(text, name, -1);
+        }
+
+        /// <summary>
+        /// Recalculates layout of the control and applies any changes made to the size or position of the items contained.
+        /// </summary>
+        public void RecalcLayout()
+        {
+            _TabStrip.RecalcLayout();
+        }
+
+        protected override void OnHandleCreated(System.EventArgs e)
+        {
+            base.OnHandleCreated(e);
+            foreach (Control c in this.Controls)
+            {
+                IntPtr h = c.Handle;
+                if (c is TabFormPanel)
+                {
+                    foreach (Control r in c.Controls)
+                        h = r.Handle;
+                }
+            }
+            this.RecalcLayout();
+        }
+
+        protected override void OnControlAdded(ControlEventArgs e)
+        {
+            base.OnControlAdded(e);
+
+            if (this.DesignMode)
+                return;
+            TabFormPanel panel = e.Control as TabFormPanel;
+            if (panel == null)
+                return;
+            if (panel.TabFormItem != null)
+            {
+                if (this.Items.Contains(panel.TabFormItem) && this.SelectedTab == panel.TabFormItem)
+                {
+                    panel.Visible = true;
+                    panel.BringToFront();
+                }
+                else
+                    panel.Visible = false;
+            }
+            else
+                panel.Visible = false;
+        }
+
+        private void TabStripItemAdded(object sender, System.EventArgs e)
+        {
+            if (this.DesignMode)
+                return;
+
+            if (sender is TabFormItem)
+            {
+                TabFormItem tab = sender as TabFormItem;
+                if (tab.Panel != null)
+                {
+                    if (this.Controls.Contains(tab.Panel) && tab.Checked)
+                    {
+                        tab.Panel.Visible = true;
+                        tab.Panel.BringToFront();
+                    }
+                    else
+                        tab.Panel.Visible = false;
+                }
+            }
+        }
+
+        protected override void OnControlRemoved(ControlEventArgs e)
+        {
+            base.OnControlRemoved(e);
+            TabFormPanel panel = e.Control as TabFormPanel;
+            if (panel == null)
+                return;
+            if (panel.TabFormItem != null)
+            {
+                if (this.Items.Contains(panel.TabFormItem))
+                    this.Items.Remove(panel.TabFormItem);
+            }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void SetDesignMode()
+        {
+            _TabStrip.SetDesignMode(true);
+        }
+
+        private ElementStyle GetBackgroundStyle()
+        {
+            return _TabStrip.InternalGetBackgroundStyle();
+        }
+
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            ElementStyle style = GetBackgroundStyle();
+            if (style.BackColor.A < 255 && !style.BackColor.IsEmpty ||
+                this.BackColor == Color.Transparent || this.BackgroundImage != null)
+            {
+                base.OnPaintBackground(e);
+            }
+            else
+            {
+                using (SolidBrush brush = new SolidBrush(this.BackColor))
+                    e.Graphics.FillRectangle(brush, this.ClientRectangle);
+            }
+
+            ElementStyleDisplayInfo info = new ElementStyleDisplayInfo(style, e.Graphics, this.ClientRectangle);
+            ElementStyleDisplay.PaintBackground(info);
+        }
+
+        protected override void WndProc(ref Message m)
+        {
+            if (m.Msg == (int)WinApi.WindowsMessages.WM_NCHITTEST && !this.DesignMode)
+            {
+                // Get position being tested...
+                int x = WinApi.LOWORD(m.LParam);
+                int y = WinApi.HIWORD(m.LParam);
+                Point p = PointToClient(new Point(x, y));
+
+                if (this.CaptionVisible && _TabStrip != null && !_TabStrip.IsMaximized)
+                {
+                    TabParentForm form = this.FindForm() as TabParentForm;
+                    if (form == null || form.Sizable)
+                    {
+                        int formBorderSize = 4;
+                        Rectangle r = new Rectangle(0, 0, this.Width, formBorderSize);
+                        if (r.Contains(p)) // Top side form resizing
+                        {
+                            m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.TransparentOrCovered);
+                            return;
+                        }
+                        r = new Rectangle(0, 0, formBorderSize, this.Height); // Left side form resizing
+                        if (r.Contains(p))
+                        {
+                            m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.TransparentOrCovered);
+                            return;
+                        }
+                        r = new Rectangle(this.Width - formBorderSize, 0, formBorderSize, this.Height); // Right side form resizing
+                        if (r.Contains(p))
+                        {
+                            m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.TransparentOrCovered);
+                            return;
+                        }
+                    }
+                }
+                else if (_TabStrip != null)
+                {
+                    Point pts = _TabStrip.PointToClient(new Point(x, y));
+                    if (_TabStrip.HitTest(pts.X, pts.Y) == null)
+                    {
+                        m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.TransparentOrCovered);
+                        return;
+                    }
+                }
+                //if (BarFunctions.IsWindows7 && _TabStrip != null && _TabStrip.IsMaximized)
+                //{
+                //    Rectangle r = _TabStrip.CaptionBounds;
+                //    if (r.Contains(p))
+                //    {
+                //        m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.TransparentOrCovered);
+                //        return;
+                //    }
+                //}
+                //// System Icon
+                //if ((p.X < 28 && this.RightToLeft == RightToLeft.No || p.X > this.Width - 28 && this.RightToLeft == RightToLeft.Yes) && p.Y < 28)
+                //{
+                //    m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.TransparentOrCovered);
+                //    return;
+                //}
+            }
+            base.WndProc(ref m);
+        }
+
+        /// <summary>
+        /// Returns current number of tabs visible and hidden on the tab strip.
+        /// </summary>
+        [Browsable(false)]
+        public int TabsCount
+        {
+            get { return _TabStrip.TabsCount; }
+        }
+
+        private void TabStripTabFormItemDetach(object sender, TabFormItemDetachEventArgs e)
+        {
+            OnTabFormItemDetach(e);
+        }
+
+        private void TabStripBeforeTabFormItemDetach(object sender, TabFormItemDetachEventArgs e)
+        {
+            OnBeforeTabFormItemDetach(e);
+        }
+        #endregion
+
+        #region Properties
+        /// <summary>
+        /// Indicates whether Form.Icon is shown in top-left corner.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance"), Description("Indicates whether Form.Icon is shown in top-left corner.")]
+        public bool ShowIcon
+        {
+            get
+            {
+                return _TabStrip.ShowIcon;
+            }
+            set
+            {
+                _TabStrip.ShowIcon = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the rich text displayed on title bar instead of the Form.Text property. This property supports text-markup.
+        /// You can use <font color="SysCaptionTextExtra"> markup to instruct the markup renderer to use Office 2007 system caption extra text color which
+        /// changes depending on the currently selected color table. Note that when using this property you should manage also the Form.Text property since
+        /// that is the text that will be displayed in Windows task-bar and elsewhere where system Form.Text property is used.
+        /// You can also use the hyperlinks as part of the text markup and handle the TitleTextMarkupLinkClick event to be notified when they are clicked.
+        /// </summary>
+        [Browsable(true), DefaultValue(""), Editor("DevComponents.DotNetBar.Design.TextMarkupUIEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), EditorBrowsable(EditorBrowsableState.Always), Category("Appearance"), Description("Indicates text displayed on Title bar instead of the Form.Text property.")]
+        public string TitleText
+        {
+            get { return _TabStrip.TitleText; }
+            set { _TabStrip.TitleText = value; }
+        }
+
+        /// <summary>
+        /// Occurs when text markup link is clicked.
+        /// </summary>
+        private void TabStripTitleTextMarkupLinkClick(object sender, MarkupLinkClickEventArgs e)
+        {
+            if (TitleTextMarkupLinkClick != null)
+                TitleTextMarkupLinkClick(this, new MarkupLinkClickEventArgs(e.Name, e.HRef));
+        }
+
+        /// <summary>
+        /// Gets or sets the Context menu bar associated with the this control which is used as part of Global Items feature. The context menu 
+        /// bar assigned here will be used to search for the items with the same Name or GlobalName property so global properties can be propagated when changed.
+        /// You should assign this property to enable the Global Items feature to reach your ContextMenuBar.
+        /// </summary>
+        [DefaultValue(null), Description("Indicates Context menu bar associated with the TabFormControl control which is used as part of Global Items feature."), Category("Data")]
+        public ContextMenuBar GlobalContextMenuBar
+        {
+            get { return m_GlobalContextMenuBar; }
+            set
+            {
+                if (m_GlobalContextMenuBar != null)
+                    m_GlobalContextMenuBar.GlobalParentComponent = null;
+                m_GlobalContextMenuBar = value;
+                if (m_GlobalContextMenuBar != null)
+                    m_GlobalContextMenuBar.GlobalParentComponent = this;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether custom caption and quick access toolbar provided by the control is visible. Default value is false.
+        /// This property should be set to true when control is used on MetroAppForm.
+        /// </summary>
+        [Browsable(true), DefaultValue(false), Category("Caption"), Description("Indicates whether custom caption and quick access toolbar provided by the control is visible.")]
+        public bool CaptionVisible
+        {
+            get { return _TabStrip.CaptionVisible; }
+            set
+            {
+                _TabStrip.CaptionVisible = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the font for the form caption text when CaptionVisible=true. Default value is NULL which means that system font is used.
+        /// </summary>
+        [Browsable(true), DefaultValue(null), Category("Caption"), Description("Indicates font for the form caption text when CaptionVisible=true.")]
+        public Font CaptionFont
+        {
+            get { return _TabStrip.CaptionFont; }
+            set
+            {
+                _TabStrip.CaptionFont = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the explicit height of the caption provided by control. Caption height when set is composed of the TabGroupHeight and
+        /// the value specified here. Default value is 0 which means that system default caption size is used.
+        /// </summary>
+        [Browsable(true), DefaultValue(0), Category("Caption"), Description("Indicates explicit height of the caption provided by control")]
+        public int CaptionHeight
+        {
+            get { return _TabStrip.CaptionHeight; }
+            set
+            {
+                _TabStrip.CaptionHeight = value;
+                this.RecalcLayout();
+            }
+        }
+
+        /// <summary>
+        /// Specifies the background style of the control.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Category("Style"), Description("Gets or sets bar background style."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ElementStyle BackgroundStyle
+        {
+            get { return _TabStrip.BackgroundStyle; }
+        }
+
+        /// <summary>
+        /// Gets or sets the currently selected TabFormItem. TabFormItems are selected using the Checked property. Only a single
+        /// TabFormItem can be selected (Checked) at any given time.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public TabFormItem SelectedTab
+        {
+            get { return _TabStrip.SelectedTab; }
+            set
+            {
+                if (value != null)
+                {
+                    if(!value.Checked)
+                        value.Checked = true;
+                    else if (value.Panel != null && !value.Panel.Visible)
+                        value.Panel.Visible = true;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Indicates whether new tab item which allows creation of new tab when clicked is visible. When visible you need to handle CreateNewTab event and create your new tab in event handler.
+        /// </summary>
+        [DefaultValue(false), Category("Appearance"), Description("Indicates whether new tab item which allows creation of new tab when clicked is visible. When visible you need to handle CreateNewTab event and create your new tab in event handler.")]
+        public bool NewTabItemVisible
+        {
+            get { return _TabStrip.NewTabItemVisible; }
+            set { _TabStrip.NewTabItemVisible = value; }
+        }
+
+        /// <summary>
+        /// Occurs when new tab item is clicked by end user and allows you to create and add new tab to the control.
+        /// </summary>
+        [Description("Occurs when new tab item is clicked by end user and allows you to create and add new tab to the control.")]
+        public event EventHandler CreateNewTab;
+
+        /// <summary>
+        /// Raises CreateNewTab event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected internal virtual void OnCreateNewTab(EventArgs e)
+        {
+            EventHandler handler = CreateNewTab;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        internal void RaiseCreateNewTab(EventArgs e)
+        {
+            OnCreateNewTab(e);
+        }
+
+        /// <summary>
+        /// Returns reference to internal tab-strip control.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public TabFormStripControl TabStrip
+        {
+            get { return _TabStrip; }
+        }
+
+        /// <summary>
+        /// Returns collection of items on a bar.
+        /// </summary>
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content), Browsable(false)]
+        public SubItemsCollection Items
+        {
+            get { return _TabStrip.Items; }
+        }
+
+        ///// <summary>
+        ///// Returns collection of quick toolbar access and caption items.
+        ///// </summary>
+        //[DesignerSerializationVisibility(DesignerSerializationVisibility.Content), Browsable(false)]
+        //public SubItemsCollection QuickToolbarItems
+        //{
+        //    get { return GetQatSubItemsCollection(); }
+        //}
+
+        //private SubItemsCollection GetQatSubItemsCollection()
+        //{
+        //    return _TabStrip.QuickToolbarItems;
+        //}
+        /// <summary>
+        /// Gets collection of items displayed in control captions, if it is visible (CaptionVisible=true).
+        /// </summary>
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content), Browsable(false)]
+        public SubItemsCollection CaptionItems
+        {
+            get { return _TabStrip.TabStripContainer.CaptionItems; }
+        }
+
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public eDotNetBarStyle EffectiveStyle
+        {
+            get
+            {
+                return _TabStrip.EffectiveStyle;
+            }
+        }
+
+        private TabFormColorTable _ColorTable;
+        /// <summary>
+        /// Gets or sets the custom color table for the control. When set this color table overrides all system color settings for control.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public TabFormColorTable ColorTable
+        {
+            get { return _ColorTable; }
+            set { _ColorTable = value; }
+        }
+        //private static BaseItem GetAppButton(TabFormControl tab)
+        //{
+        //    BaseItem appButton = null;
+        //    for (int i = 0; i < tab.QuickToolbarItems.Count; i++)
+        //    {
+        //        if (tab.QuickToolbarItems[i] is MetroAppButton)
+        //        {
+        //            appButton = tab.QuickToolbarItems[i];
+        //            break;
+        //        }
+
+        //    }
+        //    return appButton;
+        //}
+        //protected override void OnBackColorChanged(EventArgs e)
+        //{
+        //    base.OnBackColorChanged(e);
+        //}
+
+#if TRIAL
+        private bool _ShownOnce = false;
+#endif
+        protected override void OnVisibleChanged(EventArgs e)
+        {
+#if TRIAL
+                if(!this.DesignMode && !_ShownOnce)
+                {
+				    RemindForm frm=new RemindForm();
+				    frm.ShowDialog();
+				    frm.Dispose();
+                    _ShownOnce = true;
+                }
+#endif
+
+            base.OnVisibleChanged(e);
+        }
+
+        private bool _MouseWheelTabScrollEnabled = true;
+        /// <summary>
+        /// Gets or sets whether mouse wheel scrolls through the tabs. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether mouse wheel scrolls through the tabs.")]
+        public bool MouseWheelTabScrollEnabled
+        {
+            get { return _MouseWheelTabScrollEnabled; }
+            set
+            {
+                _MouseWheelTabScrollEnabled = value;
+            }
+        }
+
+        /// <summary>
+        /// ImageList for images used on Items. Images specified here will always be used on menu-items and are by default used on all Bars.
+        /// </summary>
+        [Browsable(true), Category("Data"), DefaultValue(null), Description("ImageList for images used on Items. Images specified here will always be used on menu-items and are by default used on all Bars.")]
+        public ImageList Images
+        {
+            get { return _TabStrip.Images; }
+            set { _TabStrip.Images = value; }
+        }
+
+        /// <summary>
+        /// ImageList for medium-sized images used on Items.
+        /// </summary>
+        [Browsable(true), Category("Data"), DefaultValue(null), Description("ImageList for medium-sized images used on Items.")]
+        public ImageList ImagesMedium
+        {
+            get { return _TabStrip.ImagesMedium; }
+            set { _TabStrip.ImagesMedium = value; }
+        }
+
+        /// <summary>
+        /// ImageList for large-sized images used on Items.
+        /// </summary>
+        [Browsable(true), Category("Data"), DefaultValue(null), Description("ImageList for large-sized images used on Items.")]
+        public ImageList ImagesLarge
+        {
+            get { return _TabStrip.ImagesLarge; }
+            set { _TabStrip.ImagesLarge = value; }
+        }
+
+        protected override void OnTabStopChanged(System.EventArgs e)
+        {
+            base.OnTabStopChanged(e);
+            _TabStrip.TabStop = this.TabStop;
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the user can give the focus to this control using the TAB key. Default value is false.
+        /// </summary>
+        [Browsable(true), DefaultValue(false), Category("Behavior"), Description("Indicates whether the user can give the focus to this control using the TAB key.")]
+        public new bool TabStop
+        {
+            get { return base.TabStop; }
+            set { base.TabStop = value; }
+        }
+        #endregion
+
+        #region Metro Customization
+
+        ///// <summary>
+        ///// Gets the reference to the localization object which holds all system text used by the component.
+        ///// </summary>
+        //[Browsable(true), DevCoBrowsable(true), NotifyParentPropertyAttribute(true), Category("Localization"), Description("Gets system text used by the component.."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        //public RibbonLocalization SystemText
+        //{
+        //    get { return m_SystemText; }
+        //}
+
+        protected override Size DefaultSize
+        {
+            get
+            {
+                return new Size(200, 100);
+            }
+        }
+
+        private eTabFormStripControlDock _TabStripDock = eTabFormStripControlDock.Top;
+        /// <summary>
+        /// Gets or sets the side tab-strip is docked to.
+        /// </summary>
+        [DefaultValue(eTabFormStripControlDock.Top), Category("Appearance"), Description("Indicates side tab-strip is docked to.")]
+        public eTabFormStripControlDock TabStripDock
+        {
+            get { return _TabStripDock; }
+            set
+            {
+                _TabStripDock = value;
+                if (_TabStripDock == eTabFormStripControlDock.Top)
+                    _TabStrip.Dock = DockStyle.Top;
+                else if (_TabStripDock == eTabFormStripControlDock.Bottom)
+                    _TabStrip.Dock = DockStyle.Bottom;
+            }
+        }
+        
+        /// <summary>
+        /// Gets or sets the font tab items are displayed with.
+        /// </summary>
+        [AmbientValue((string) null), Localizable(true) , Category("Appearance"), Description("Indicates the font tab items are displayed with.")]
+        public Font TabStripFont
+        {
+            get { return _TabStrip.Font; }
+            set
+            {
+                _TabStrip.Font = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether this TabFormControl was auto-created as result of end-user tearing off the tab.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsAutoCreated { get; set; }
+
+        protected override void ScaleControl(SizeF factor, BoundsSpecified specified)
+        {
+            if (Dpi.RecordScalePerControl)
+                Dpi.SetScaling(factor);
+            base.ScaleControl(factor, specified);
+        }
+        #endregion
+
+    }
+    /// <summary>
+    /// Specifies dock side for tab form strip control.
+    /// </summary>
+    public enum eTabFormStripControlDock
+    {
+        Top,
+        Bottom
+    }
+
+    /// <summary>
+    /// Defines delegate for the PaintTabFormItem event.
+    /// </summary>
+    public delegate void PaintTabFormItemEventHandler(object sender, PaintTabFormItemEventArgs e);
+
+    /// <summary>
+    /// Defines delegate for the PaintTabFormItem event.
+    /// </summary>
+    public class PaintTabFormItemEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets reference to the tab being painted.
+        /// </summary>
+        public readonly TabFormItem Tab;
+        /// <summary>
+        /// Gets reference to the graphic canvas for painting.
+        /// </summary>
+        public readonly Graphics Graphics;
+        /// <summary>
+        /// Gets or sets whether default painting for the item is performed, default value is true. Set to false to disable internal painting.
+        /// </summary>
+        public bool PaintDefault = true;
+        public PaintTabFormItemEventArgs(TabFormItem tab, Graphics g)
+        {
+            this.Tab = tab;
+            this.Graphics = g;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/TabbedForm/TabFormItem.cs b/PROMS/DotNetBar Source Code/Controls/TabbedForm/TabFormItem.cs
new file mode 100644
index 00000000..4a9bf42d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/TabbedForm/TabFormItem.cs	
@@ -0,0 +1,1076 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.Rendering;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    /// <summary>
+    /// Represents a tab in Tabbed Form user interface.
+    /// </summary>
+    public class TabFormItem : TabFormItemBase
+    {
+        #region Private Variables & Constructor
+        private TabFormPanel _Panel = null;
+        private string _CashedColorTableName = "Default";
+        private bool _ReducedSize = false;
+        private int _PaddingHorizontal = 0;
+        /// <summary>
+        /// Initializes a new instance of the TabFormItem class.
+        /// </summary>
+        public TabFormItem()
+        {
+            this.ButtonStyle = eButtonStyle.ImageAndText;
+            //this.MouseDownCapture = true;
+            //this.MouseUpNotification = true;
+        }
+        #endregion
+
+        #region Internal Implementation
+        public override void Paint(ItemPaintArgs p)
+        {
+            if (!PaintCustom(p))
+            {
+                Rendering.BaseRenderer renderer = p.Renderer;
+                if (renderer != null)
+                {
+                    p.ButtonItemRendererEventArgs.Graphics = p.Graphics;
+                    p.ButtonItemRendererEventArgs.ButtonItem = this;
+                    p.ButtonItemRendererEventArgs.ItemPaintArgs = p;
+                    renderer.DrawTabFormItem(p.ButtonItemRendererEventArgs);
+                }
+            }
+
+            if (!string.IsNullOrEmpty(NotificationMarkText))
+                DevComponents.DotNetBar.Rendering.NotificationMarkPainter.Paint(p.Graphics, this.Bounds, NotificationMarkPosition,
+                    NotificationMarkText, new Size(NotificationMarkSize, NotificationMarkSize), NotificationMarkOffset, NotificationMarkColor);
+            this.DrawInsertMarker(p.Graphics);
+        }
+
+        /// <summary>
+        /// Returns true if custom painting is performed and internal painting should be bypassed.
+        /// </summary>
+        /// <param name="itemPaintArgs"></param>
+        /// <returns></returns>
+        private bool PaintCustom(ItemPaintArgs itemPaintArgs)
+        {
+            TabFormControl tc = GetTabFormControl();
+            if (tc == null) return false;
+
+            return !tc.InternalPaintTabFormItem(this,itemPaintArgs);
+        }
+
+        public override void RecalcSize()
+        {
+            _ImageRenderBounds = Rectangle.Empty;
+            _TextRenderBounds = Rectangle.Empty;
+            base.RecalcSize();
+
+        }
+
+        private bool _ItemDrag = false;
+        private InsertPosition _DragInsertPosition = null;
+        public override void InternalMouseMove(MouseEventArgs objArg)
+        {
+            //if (_ItemDrag)
+            //{
+            //    IDesignTimeProvider dtp = (IDesignTimeProvider)this.Parent;
+            //    Point pScreen = this.PointToScreen(objArg.Location);
+            //    InsertPosition pos = dtp.GetInsertPosition(pScreen, this);
+            //    if (_DragInsertPosition != null)
+            //    {
+            //        dtp.DrawReversibleMarker(_DragInsertPosition.Position, _DragInsertPosition.Before);
+            //        _DragInsertPosition = null;
+            //    }
+            //    if (pos != null)
+            //    {
+            //        if (pos.TargetProvider == null)
+            //        {
+            //            // Cursor is over drag item
+            //            System.Windows.Forms.Cursor.Current = System.Windows.Forms.Cursors.No;
+            //        }
+            //        else
+            //        {
+            //            pos.TargetProvider.DrawReversibleMarker(pos.Position, pos.Before);
+            //            System.Windows.Forms.Cursor.Current = System.Windows.Forms.Cursors.Hand;
+            //            _DragInsertPosition = pos;
+            //        }
+            //    }
+            //    else
+            //    {
+            //        System.Windows.Forms.Cursor.Current = System.Windows.Forms.Cursors.No;
+            //    }
+            //}
+            //else 
+            if (objArg.Button == MouseButtons.Left &&
+                     (CloseButtonState == eButtonState.Normal || CloseButtonState == eButtonState.Disabled || CloseButtonState == eButtonState.Hidden) &&
+                     (Math.Abs(objArg.X - this.MouseDownPt.X) > Dpi.Width6 || Math.Abs(objArg.Y - this.MouseDownPt.Y) > Dpi.Width6) && IsItemDragEnabled)
+            {
+                TabFormStripControl parent = this.ContainerControl as TabFormStripControl;
+                if (parent != null)
+                {
+                    parent.StartItemDrag(this);
+                }
+                //IDesignTimeProvider dtp = this.Parent as IDesignTimeProvider;
+                //if (dtp != null)
+                //{
+                //    TabFormStripControl c = this.ContainerControl as TabFormStripControl;
+                //    if (c != null)
+                //    {
+                //        _ItemDrag = true;
+                //        c.DragInProgress = true;
+                //    }
+                //}
+            }
+            else if (_CloseButtonVisible && !_CloseButtonBounds.IsEmpty)
+            {
+                if (_CloseButtonBounds.Contains(objArg.Location))
+                    CloseButtonState = eButtonState.MouseOver;
+                else
+                    CloseButtonState = eButtonState.Normal;
+            }
+            base.InternalMouseMove(objArg);
+        }
+
+        private bool IsItemDragEnabled
+        {
+            get
+            {
+                TabFormStripControl c = this.ContainerControl as TabFormStripControl;
+                if (c == null) return false;
+                return c.IsTabDragEnabled;
+            }
+        }
+
+        public override void InternalMouseDown(MouseEventArgs objArg)
+        {
+            if (_CloseButtonState == eButtonState.MouseOver && objArg.Button == MouseButtons.Left)
+            {
+                CloseButtonState = eButtonState.MouseDownLeft;
+            }
+            base.InternalMouseDown(objArg);
+        }
+
+        public override void InternalMouseUp(MouseEventArgs objArg)
+        {
+            //if (_ItemDrag)
+            //{
+            //    _ItemDrag = false;
+            //    TabFormStripControl c = this.ContainerControl as TabFormStripControl;
+            //    if (c != null)
+            //        c.DragInProgress = false;
+            //    if (_DragInsertPosition != null)
+            //    {
+            //        IDesignTimeProvider dtp = (IDesignTimeProvider) this.Parent;
+            //        // Removes drag marker
+            //        int insertPosition = _DragInsertPosition.Position;
+            //        bool insertBefore = _DragInsertPosition.Before;
+            //        dtp.DrawReversibleMarker(insertPosition, insertBefore);
+            //        if (insertPosition > 0 && dtp == this.Parent)
+            //        {
+            //            if (this.Parent.SubItems.IndexOf(this) < insertPosition)
+            //                insertPosition--;
+            //        }
+            //        BaseItem parent = this.Parent;
+            //        parent.SubItems.Remove(this);
+            //        this.Checked = false;
+            //        dtp.InsertItemAt(this, insertPosition, insertBefore);
+            //        this.Checked = true;
+            //        _DragInsertPosition = null;
+            //    }
+            //}
+            //else 
+            if (_CloseButtonState == eButtonState.MouseDownLeft)
+            {
+                CloseButtonState = eButtonState.Normal;
+                CloseTab(eEventSource.Mouse);
+            }
+            base.InternalMouseUp(objArg);
+        }
+
+        private void CloseTab(eEventSource source)
+        {
+            TabFormStripControl strip = this.ContainerControl as TabFormStripControl;
+            if (strip != null)
+            {
+                strip.CloseTab(this, source);
+            }
+        }
+
+        public override void InternalMouseLeave()
+        {
+            if (_CloseButtonVisible)
+                CloseButtonState = eButtonState.Normal;
+            base.InternalMouseLeave();
+        }
+
+        private eButtonState _CloseButtonState = eButtonState.Hidden;
+        internal eButtonState CloseButtonState
+        {
+            get { return _CloseButtonState; }
+            set
+            {
+                if (value != _CloseButtonState)
+                {
+                    _CloseButtonState = value;
+                    if (!_CloseButtonBounds.IsEmpty)
+                        this.Invalidate();
+                }
+            }
+        }
+
+        private Rectangle _CloseButtonBounds = Rectangle.Empty;
+        /// <summary>
+        /// Gets or sets the close button bounds.
+        /// </summary>
+        internal Rectangle CloseButtonBounds
+        {
+            get { return _CloseButtonBounds; }
+            set { _CloseButtonBounds = value; }
+        }
+
+        private Rectangle _ImageRenderBounds = Rectangle.Empty;
+        /// <summary>
+        /// Gets or sets cached image rendering bounds.
+        /// </summary>
+        internal Rectangle ImageRenderBounds
+        {
+            get { return _ImageRenderBounds; }
+            set { _ImageRenderBounds = value; }
+        }
+
+        private Rectangle _TextRenderBounds = Rectangle.Empty;
+        /// <summary>
+        /// Gets or sets cached text rendering bounds.
+        /// </summary>
+        internal Rectangle TextRenderBounds
+        {
+            get { return _TextRenderBounds; }
+            set { _TextRenderBounds = value; }
+        }
+
+        protected override bool IsFadeEnabled
+        {
+            get
+            {
+                return false;
+            }
+        }
+        /// <summary>
+        /// Gets or sets the additional padding added around the tab item in pixels. Default value is 0.
+        /// </summary>
+        [Browsable(true), DefaultValue(0), Category("Layout"), Description("Indicates additional padding added around the tab item in pixels.")]
+        public int PaddingHorizontal
+        {
+            get { return _PaddingHorizontal; }
+            set
+            {
+                _PaddingHorizontal = value;
+                UpdateTabAppearance();
+            }
+        }
+
+        private bool _CloseButtonVisible = true;
+
+        /// <summary>
+        /// Indicates whether close button is visible on the tabs which when clicked closes the tab. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance"), Description("Indicates whether close button is visible on the tabs which when clicked closes the tab.")]
+        public bool CloseButtonVisible
+        {
+            get { return _CloseButtonVisible; }
+            set
+            {
+                _CloseButtonVisible = value;
+                if (!value)
+                    _CloseButtonState = eButtonState.Hidden;
+                NeedRecalcSize = true;
+                UpdateTabAppearance();
+            }
+        }
+
+        /// <summary>
+        /// Selects the tab.
+        /// </summary>
+        public void Select()
+        {
+            this.Checked = true;
+        }
+        /// <summary>
+        /// Gets or sets whether size of the tab has been reduced below the default calculated size.
+        /// </summary>
+        internal bool ReducedSize
+        {
+            get { return _ReducedSize; }
+            set { _ReducedSize = value; }
+        }
+
+        private eTabFormItemColor _ColorTable = eTabFormItemColor.Default;
+        /// <summary>
+        /// Gets or sets the predefined color of the tab. Default value is eTabFormItemColor.Default
+        /// </summary>
+        [Browsable(true), DefaultValue(eTabFormItemColor.Default), Category("Appearance"), Description("Indicates predefined color of the tab.")]
+        public new eTabFormItemColor ColorTable
+        {
+            get { return _ColorTable; }
+            set
+            {
+                if (_ColorTable != value)
+                {
+                    _ColorTable = value;
+                    _CashedColorTableName = Enum.GetName(typeof(eTabFormItemColor), _ColorTable);
+                    this.Refresh();
+                }
+            }
+        }
+
+        internal override string GetColorTableName()
+        {
+            return this.CustomColorName != "" ? this.CustomColorName : _CashedColorTableName;
+        }
+
+        /// <summary>
+        /// Gets or sets the panel assigned to this tab item.
+        /// </summary>
+        [Browsable(false), DefaultValue(null)]
+        public TabFormPanel Panel
+        {
+            get { return _Panel; }
+            set
+            {
+                _Panel = value;
+                OnPanelChanged();
+            }
+        }
+
+        private void OnPanelChanged()
+        {
+            ChangePanelVisibility();
+        }
+
+        /// <summary>
+        /// Called after Checked property has changed.
+        /// </summary>
+        protected override void OnCheckedChanged()
+        {
+            if (this.Checked && this.Parent != null)
+            {
+                ChangePanelVisibility();
+                foreach (BaseItem item in this.Parent.SubItems)
+                {
+                    if (item == this)
+                        continue;
+                    TabFormItem b = item as TabFormItem;
+                    if (b != null && b.Checked)
+                    {
+                        if (this.DesignMode)
+                            TypeDescriptor.GetProperties(b)["Checked"].SetValue(b, false);
+                        else
+                            b.Checked = false;
+                    }
+                }
+            }
+
+            if (BarFunctions.IsOffice2007Style(this.EffectiveStyle) && this.ContainerControl is System.Windows.Forms.Control)
+                ((System.Windows.Forms.Control)this.ContainerControl).Invalidate();
+            if (!this.Checked)
+                ChangePanelVisibility();
+            InvokeCheckedChanged();
+        }
+
+        private void ChangePanelVisibility()
+        {
+            if (this.Checked && _Panel != null)
+            {
+                if (this.DesignMode)
+                {
+                    if (!_Panel.Visible) _Panel.Visible = true;
+                    TypeDescriptor.GetProperties(_Panel)["Visible"].SetValue(_Panel, true);
+                    _Panel.BringToFront();
+                }
+                else
+                {
+                    if (!_Panel.IsDisposed)
+                    {
+                        // Following 3 lines reduce flashing of panel's child controls when Dock panel is shown
+                        System.Windows.Forms.DockStyle oldDock = _Panel.Dock;
+                        _Panel.Dock = System.Windows.Forms.DockStyle.None;
+                        _Panel.Location = new Point(-32000, 32000);
+                        _Panel.Enabled = true;
+                        _Panel.Visible = true;
+                        _Panel.BringToFront();
+                        if (_Panel.Dock != oldDock)
+                            _Panel.Dock = oldDock;
+                    }
+
+                }
+            }
+            else if (!this.Checked && _Panel != null) // Panels in popup mode will be taken care of by Ribbon
+            {
+                if (this.DesignMode)
+                    TypeDescriptor.GetProperties(_Panel)["Visible"].SetValue(_Panel, false);
+                else
+                {
+                    _Panel.Visible = false;
+                    _Panel.Enabled = false;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Occurs just before Click event is fired.
+        /// </summary>
+        protected override void OnClick()
+        {
+            base.OnClick();
+            if (!this.Checked)
+            {
+                if (this.DesignMode)
+                    TypeDescriptor.GetProperties(this)["Checked"].SetValue(this, true);
+                else
+                {
+                    TabFormControl shell = GetTabFormControl();
+                    if (shell != null && !shell.ValidateChildren())
+                        return;
+                    this.Checked = true;
+                }
+            }
+        }
+        private TabFormControl GetTabFormControl()
+        {
+            TabFormStripControl strip = this.ContainerControl as TabFormStripControl;
+            if (strip == null) return null;
+            return strip.Parent as TabFormControl;
+        }
+        /// <summary>
+        /// Called when Visibility of the items has changed.
+        /// </summary>
+        /// <param name="bVisible">New Visible state.</param>
+        protected internal override void OnVisibleChanged(bool bVisible)
+        {
+            base.OnVisibleChanged(bVisible);
+            if (!bVisible && this.Checked)
+            {
+                TypeDescriptor.GetProperties(this)["Checked"].SetValue(this, false);
+                // Try to check first item in the group
+                if (this.Parent != null)
+                {
+                    foreach (BaseItem item in this.Parent.SubItems)
+                    {
+                        if (item == this || !item.GetEnabled() || !item.Visible)
+                            continue;
+                        TabFormItem b = item as TabFormItem;
+                        if (b != null)
+                        {
+                            TypeDescriptor.GetProperties(b)["Checked"].SetValue(this, true);
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or set the Group item belongs to. The groups allows a user to choose from mutually exclusive options within the group. The choice is reflected by Checked property.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), DefaultValue(""), EditorBrowsable(EditorBrowsableState.Never)]
+        public override string OptionGroup
+        {
+            get { return base.OptionGroup; }
+            set { base.OptionGroup = value; }
+        }
+
+        /// <summary>
+        /// Occurs after item visual style has changed.
+        /// </summary>
+        protected override void OnStyleChanged()
+        {
+            base.OnStyleChanged();
+            UpdateTabAppearance();
+        }
+
+        private void UpdateTabAppearance()
+        {
+            this.VerticalPadding = 2;
+            this.HorizontalPadding = 28 + _PaddingHorizontal + (_CloseButtonVisible ? CloseButtonSize : 0);
+
+            this.NeedRecalcSize = true;
+            this.OnAppearanceChanged();
+        }
+
+        /// <summary>
+        /// Returns the collection of sub items.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Content)]
+        public override SubItemsCollection SubItems
+        {
+            get { return base.SubItems; }
+        }
+
+        internal override void DoAccesibleDefaultAction()
+        {
+            this.Checked = true;
+        }
+
+        protected override void Invalidate(System.Windows.Forms.Control containerControl)
+        {
+            Rectangle r = m_Rect;
+            r.Width++;
+            r.Height++;
+            if (containerControl.InvokeRequired)
+                containerControl.BeginInvoke(new MethodInvoker(delegate { containerControl.Invalidate(r, true); }));
+            else
+                containerControl.Invalidate(r, true);
+        }
+
+        public override bool UseParentSubItemsImageSize
+        {
+            get
+            {
+                return false;
+            }
+        }
+
+        protected override bool ShouldDrawInsertMarker()
+        {
+            IOwner owner = GetOwner() as IOwner;
+            
+            return DesignInsertMarker != eDesignInsertPosition.None && this.Visible && this.Displayed &&
+                   !this.DesignMode;
+        }
+        #endregion
+
+        #region Hidden Properties
+        /// <summary>
+        /// Indicates whether the item will auto-collapse (fold) when clicked. 
+        /// When item is on popup menu and this property is set to false, menu will not
+        /// close when item is clicked.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), EditorBrowsable(EditorBrowsableState.Never), Category("Behavior"), DefaultValue(true), Description("Indicates whether the item will auto-collapse (fold) when clicked.")]
+        public override bool AutoCollapseOnClick
+        {
+            get
+            {
+                return base.AutoCollapseOnClick;
+            }
+            set
+            {
+                base.AutoCollapseOnClick = value;
+            }
+        }
+
+        /// <summary>
+        /// Indicates whether the item will auto-expand when clicked. 
+        /// When item is on top level bar and not on menu and contains sub-items, sub-items will be shown only if user
+        /// click the expand part of the button. Setting this propert to true will expand the button and show sub-items when user
+        /// clicks anywhere inside of the button. Default value is false which indicates that button is expanded only
+        /// if its expand part is clicked.
+        /// </summary>
+        [DefaultValue(false), Browsable(false), EditorBrowsable(EditorBrowsableState.Never), DevCoBrowsable(false), Category("Behavior"), Description("Indicates whether the item will auto-collapse (fold) when clicked.")]
+        public override bool AutoExpandOnClick
+        {
+            get
+            {
+                return base.AutoExpandOnClick;
+            }
+            set
+            {
+                base.AutoExpandOnClick = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether item can be customized by end user.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), EditorBrowsable(EditorBrowsableState.Never), DefaultValue(true), System.ComponentModel.Category("Behavior"), System.ComponentModel.Description("Indicates whether item can be customized by user.")]
+        public override bool CanCustomize
+        {
+            get
+            {
+                return base.CanCustomize;
+            }
+            set
+            {
+                base.CanCustomize = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or set a value indicating whether tab is selected.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), Category("Appearance"), Description("Indicates whether item is checked or not."), DefaultValue(false)]
+        public override bool Checked
+        {
+            get
+            {
+                return base.Checked;
+            }
+            set
+            {
+                base.Checked = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether Click event will be auto repeated when mouse button is kept pressed over the item.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), EditorBrowsable(EditorBrowsableState.Never), DefaultValue(false), Category("Behavior"), Description("Gets or sets whether Click event will be auto repeated when mouse button is kept pressed over the item.")]
+        public override bool ClickAutoRepeat
+        {
+            get
+            {
+                return base.ClickAutoRepeat;
+            }
+            set
+            {
+                base.ClickAutoRepeat = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the auto-repeat interval for the click event when mouse button is kept pressed over the item.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), EditorBrowsable(EditorBrowsableState.Never), DefaultValue(600), Category("Behavior"), Description("Gets or sets the auto-repeat interval for the click event when mouse button is kept pressed over the item.")]
+        public override int ClickRepeatInterval
+        {
+            get
+            {
+                return base.ClickRepeatInterval;
+            }
+            set
+            {
+                base.ClickRepeatInterval = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the item is enabled.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), DefaultValue(true), Category("Behavior"), Description("Indicates whether is item enabled.")]
+        public override bool Enabled
+        {
+            get
+            {
+                return base.Enabled;
+            }
+            set
+            {
+                base.Enabled = value;
+            }
+        }
+
+        /// <summary>
+        /// Indicates item's visiblity when on pop-up menu.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), EditorBrowsable(EditorBrowsableState.Never), Category("Appearance"), Description("Indicates item's visiblity when on pop-up menu."), DefaultValue(eMenuVisibility.VisibleAlways)]
+        public override eMenuVisibility MenuVisibility
+        {
+            get
+            {
+                return base.MenuVisibility;
+            }
+            set
+            {
+                base.MenuVisibility = value;
+            }
+        }
+
+        /// <summary>
+        /// Indicates when menu items are displayed when MenuVisiblity is set to VisibleIfRecentlyUsed and RecentlyUsed is true.
+        /// </summary>
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never), DevCoBrowsable(false), Category("Appearance"), Description("Indicates when menu items are displayed when MenuVisiblity is set to VisibleIfRecentlyUsed and RecentlyUsed is true."), DefaultValue(ePersonalizedMenus.Disabled)]
+        public override ePersonalizedMenus PersonalizedMenus
+        {
+            get
+            {
+                return base.PersonalizedMenus;
+            }
+            set
+            {
+                base.PersonalizedMenus = value;
+            }
+        }
+
+        /// <summary>
+        /// Indicates Animation type for Popups.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), EditorBrowsable(EditorBrowsableState.Never), Category("Behavior"), Description("Indicates Animation type for Popups."), DefaultValue(ePopupAnimation.ManagerControlled)]
+        public override ePopupAnimation PopupAnimation
+        {
+            get
+            {
+                return base.PopupAnimation;
+            }
+            set
+            {
+                base.PopupAnimation = value;
+            }
+        }
+
+        /// <summary>
+        /// Indicates the font that will be used on the popup window.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), EditorBrowsable(EditorBrowsableState.Never), Category("Appearance"), Description("Indicates the font that will be used on the popup window."), DefaultValue(null)]
+        public override System.Drawing.Font PopupFont
+        {
+            get
+            {
+                return base.PopupFont;
+            }
+            set
+            {
+                base.PopupFont = value;
+            }
+        }
+
+        /// <summary>
+        /// Indicates whether sub-items are shown on popup Bar or popup menu.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), EditorBrowsable(EditorBrowsableState.Never), Category("Appearance"), Description("Indicates whether sub-items are shown on popup Bar or popup menu."), DefaultValue(ePopupType.Menu)]
+        public override ePopupType PopupType
+        {
+            get
+            {
+                return base.PopupType;
+            }
+            set
+            {
+                base.PopupType = value;
+            }
+        }
+
+        /// <summary>
+        /// Specifies the inital width for the Bar that hosts pop-up items. Applies to PopupType.Toolbar only.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), EditorBrowsable(EditorBrowsableState.Never), Category("Layout"), Description("Specifies the inital width for the Bar that hosts pop-up items. Applies to PopupType.Toolbar only."), DefaultValue(200)]
+        public override int PopupWidth
+        {
+            get
+            {
+                return base.PopupWidth;
+            }
+            set
+            {
+                base.PopupWidth = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether item will display sub items.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), EditorBrowsable(EditorBrowsableState.Never), DefaultValue(true), Category("Behavior"), Description("Determines whether sub-items are displayed.")]
+        public override bool ShowSubItems
+        {
+            get
+            {
+                return base.ShowSubItems;
+            }
+            set
+            {
+                base.ShowSubItems = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether the item expands automatically to fill out the remaining space inside the container. Applies to Items on stretchable, no-wrap Bars only.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), EditorBrowsable(EditorBrowsableState.Never), DefaultValue(false), Category("Appearance"), Description("Indicates whether item will stretch to consume empty space. Items on stretchable, no-wrap Bars only.")]
+        public override bool Stretch
+        {
+            get
+            {
+                return base.Stretch;
+            }
+            set
+            {
+                base.Stretch = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the width of the expand part of the button item.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), EditorBrowsable(EditorBrowsableState.Never), Category("Behavior"), Description("Indicates the width of the expand part of the button item."), DefaultValue(12)]
+        public override int SubItemsExpandWidth
+        {
+            get { return base.SubItemsExpandWidth; }
+            set
+            {
+                base.SubItemsExpandWidth = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or set the alternative shortcut text.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), EditorBrowsable(EditorBrowsableState.Never), DevCoBrowsable(false), System.ComponentModel.Category("Design"), System.ComponentModel.Description("Gets or set the alternative Shortcut Text.  This text appears next to the Text instead of any shortcuts"), System.ComponentModel.DefaultValue("")]
+        public override string AlternateShortCutText
+        {
+            get
+            {
+                return base.AlternateShortCutText;
+            }
+            set
+            {
+                base.AlternateShortCutText = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether item separator is shown before this item.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), DevCoBrowsable(false), System.ComponentModel.DefaultValue(false), System.ComponentModel.Category("Appearance"), System.ComponentModel.Description("Indicates whether this item is beginning of the group.")]
+        public override bool BeginGroup
+        {
+            get
+            {
+                return base.BeginGroup;
+            }
+            set
+            {
+                base.BeginGroup = value;
+            }
+        }
+
+        /// <summary>
+        /// Returns category for this item. If item cannot be customzied using the
+        /// customize dialog category is empty string.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), DevCoBrowsable(false), System.ComponentModel.DefaultValue(""), System.ComponentModel.Category("Design"), System.ComponentModel.Description("Indicates item category used to group similar items at design-time."), EditorBrowsable(EditorBrowsableState.Never)]
+        public override string Category
+        {
+            get
+            {
+
+                return base.Category;
+            }
+            set
+            {
+                base.Category = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the text color of the button when mouse is over the item.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), DevCoBrowsable(false), System.ComponentModel.Category("Appearance"), System.ComponentModel.Description("The foreground color used to display text when mouse is over the item."), EditorBrowsable(EditorBrowsableState.Never)]
+        public override Color HotForeColor
+        {
+            get
+            {
+                return base.HotForeColor;
+            }
+            set
+            {
+                base.HotForeColor = value;
+            }
+        }
+
+        /// <summary>
+        /// Indicates the way item is painting the picture when mouse is over it. Setting the value to Color will render the image in gray-scale when mouse is not over the item.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), DevCoBrowsable(false), System.ComponentModel.Category("Appearance"), System.ComponentModel.Description("Indicates the way item is painting the picture when mouse is over it. Setting the value to Color will render the image in gray-scale when mouse is not over the item."), System.ComponentModel.DefaultValue(eHotTrackingStyle.Default), EditorBrowsable(EditorBrowsableState.Never)]
+        public override eHotTrackingStyle HotTrackingStyle
+        {
+            get { return base.HotTrackingStyle; }
+            set
+            {
+                base.HotTrackingStyle = value;
+            }
+        }
+
+        ///// <summary>
+        ///// Gets or sets the text color of the button.
+        ///// </summary>
+        //[System.ComponentModel.Browsable(false), DevCoBrowsable(false), EditorBrowsable(EditorBrowsableState.Never), System.ComponentModel.Category("Appearance"), System.ComponentModel.Description("The foreground color used to display text.")]
+        //public override Color ForeColor
+        //{
+        //    get
+        //    {
+        //        return base.ForeColor;
+        //    }
+        //    set
+        //    {
+        //        base.ForeColor = value;
+        //    }
+        //}
+
+        /// <summary>
+        /// Gets/Sets the button style which controls the appearance of the button elements. Changing the property can display image only, text only or image and text on the button at all times.
+        /// </summary>
+        [Browsable(false), Category("Appearance"), Description("Determines the style of the button."), DefaultValue(eButtonStyle.ImageAndText), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override eButtonStyle ButtonStyle
+        {
+            get
+            {
+                return base.ButtonStyle;
+            }
+            set
+            {
+                base.ButtonStyle = value;
+            }
+        }
+
+        public eTabFormStripControlDock TabAlignment
+        {
+            get
+            {
+                TabFormStripControl tabStrip = this.ContainerControl as TabFormStripControl;
+                if (tabStrip == null) return eTabFormStripControlDock.Top;
+                return tabStrip.TabAlignment;
+            }
+        }
+
+        private Color[] _BackColors = null;
+        /// <summary>
+        /// Indicates the array of colors that when set are used to draw the background of the item.
+        /// </summary>
+        [DefaultValue(null), Category("Appearance"), Description("Indicates the array of colors that when set are used to draw the background of the item."), TypeConverter(typeof(ArrayConverter))]
+        public Color[] BackColors
+        {
+            get
+            {
+                return _BackColors;
+            }
+            set
+            {
+                if (_BackColors != value)
+                {
+                    _BackColors = value;
+                    //OnPropertyChanged(new PropertyChangedEventArgs("Colors"));
+                    this.Refresh();
+                }
+            }
+        }
+
+        private TabFormItemColorTable _CustomColorTable = null;
+        /// <summary>
+        /// Gets or sets the custom color table for the tab. When set this color table overrides all color settings for a tab.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public TabFormItemColorTable CustomColorTable
+        {
+            get { return _CustomColorTable; }
+            set { _CustomColorTable = value; }
+        }
+
+        internal static int Radius
+        {
+            get { return Dpi.Width8; }
+        }
+
+        internal static int Dia
+        {
+            get { return Radius * 2; }
+        }
+
+        internal static int Offset { get { return Dpi.Width2; } }
+
+        internal static int TabOverlap
+        {
+            get { return Dpi.Width25; }
+        }
+
+        internal static int CloseButtonSize
+        {
+            get { return 13; }
+        }
+
+        /// <summary>
+        /// Gets color table key for the default tab color table.
+        /// </summary>
+        public static readonly string DefaultColorTableKey = Enum.GetName(typeof(eTabFormItemColor), eTabFormItemColor.Default);
+        /// <summary>
+        /// Gets color table key for the green tab color table.
+        /// </summary>
+        public static readonly string GreenColorTableKey = Enum.GetName(typeof(eTabFormItemColor), eTabFormItemColor.Green);
+        /// <summary>
+        /// Gets color table key for the magenta tab color table.
+        /// </summary>
+        public static readonly string MagentaColorTableKey = Enum.GetName(typeof(eTabFormItemColor), eTabFormItemColor.Magenta);
+        /// <summary>
+        /// Gets color table key for the orange tab color table.
+        /// </summary>
+        public static readonly string OrangeColorTableKey = Enum.GetName(typeof(eTabFormItemColor), eTabFormItemColor.Orange);
+        /// <summary>
+        /// Gets color table key for the red tab color table.
+        /// </summary>
+        public static readonly string RedColorTableKey = Enum.GetName(typeof(eTabFormItemColor), eTabFormItemColor.Red);
+        /// <summary>
+        /// Gets color table key for the blue tab color table.
+        /// </summary>
+        public static readonly string BlueColorTableKey = Enum.GetName(typeof(eTabFormItemColor), eTabFormItemColor.Blue);
+        /// <summary>
+        /// Gets color table key for the yellow tab color table.
+        /// </summary>
+        public static readonly string YellowColorTableKey = Enum.GetName(typeof(eTabFormItemColor), eTabFormItemColor.Yellow);
+        /// <summary>
+        /// Gets color table key for the purple tab color table.
+        /// </summary>
+        public static readonly string PurpleColorTableKey = Enum.GetName(typeof(eTabFormItemColor), eTabFormItemColor.Purple);
+        /// <summary>
+        /// Gets color table key for the cyan tab color table.
+        /// </summary>
+        public static readonly string CyanColorTableKey = Enum.GetName(typeof(eTabFormItemColor), eTabFormItemColor.Cyan);
+        /// <summary>
+        /// Gets color table key for the blue mist tab color table.
+        /// </summary>
+        public static readonly string BlueMistColorTableKey = Enum.GetName(typeof(eTabFormItemColor), eTabFormItemColor.BlueMist);
+        /// <summary>
+        /// Gets color table key for the purple mist tab color table.
+        /// </summary>
+        public static readonly string PurpleMistColorTableKey = Enum.GetName(typeof(eTabFormItemColor), eTabFormItemColor.PurpleMist);
+        /// <summary>
+        /// Gets color table key for the tan tab color table.
+        /// </summary>
+        public static readonly string TanColorTableKey = Enum.GetName(typeof(eTabFormItemColor), eTabFormItemColor.Tan);
+        /// <summary>
+        /// Gets color table key for the lemon lime tab color table.
+        /// </summary>
+        public static readonly string LemonLimeColorTableKey = Enum.GetName(typeof(eTabFormItemColor), eTabFormItemColor.LemonLime);
+        /// <summary>
+        /// Gets color table key for the apple tab color table.
+        /// </summary>
+        public static readonly string AppleColorTableKey = Enum.GetName(typeof(eTabFormItemColor), eTabFormItemColor.Apple);
+        /// <summary>
+        /// Gets color table key for the teal tab color table.
+        /// </summary>
+        public static readonly string TealColorTableKey = Enum.GetName(typeof(eTabFormItemColor), eTabFormItemColor.Teal);
+        /// <summary>
+        /// Gets color table key for the red chalk tab color table.
+        /// </summary>
+        public static readonly string RedChalkColorTableKey = Enum.GetName(typeof(eTabFormItemColor), eTabFormItemColor.RedChalk);
+        /// <summary>
+        /// Gets color table key for the silver tab color table.
+        /// </summary>
+        public static readonly string SilverColorTableKey = Enum.GetName(typeof(eTabFormItemColor), eTabFormItemColor.Silver);
+        #endregion
+    }
+
+    /// <summary>
+    /// Specifies predefined color assigned to Tab Form Item.
+    /// </summary>
+    public enum eTabFormItemColor
+    {
+        Default,
+        Blue,
+        Yellow,
+        Green,
+        Red,
+        Purple,
+        Cyan,
+        Orange,
+        Magenta,
+        BlueMist,
+        PurpleMist,
+        Tan,
+        LemonLime,
+        Apple,
+        Teal,
+        RedChalk,
+        Silver
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/TabbedForm/TabFormItemBase.cs b/PROMS/DotNetBar Source Code/Controls/TabbedForm/TabFormItemBase.cs
new file mode 100644
index 00000000..c5bf642e
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/TabbedForm/TabFormItemBase.cs	
@@ -0,0 +1,56 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing.Drawing2D;
+using System.Text;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    [ToolboxItem(false), DesignTimeVisible(false), Designer("DevComponents.DotNetBar.Design.TabFormItemDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+    public class TabFormItemBase : ButtonItem
+    {
+        protected override void Dispose(bool disposing)
+        {
+            if (_TabPath != null)
+            {
+                _TabPath.Dispose();
+                _TabPath = null;
+            }
+            base.Dispose(disposing);
+        }
+
+        private bool _RenderTabState = true;
+        /// <summary>
+        /// Gets or sets whether tab renders its state. Used internally by DotNetBar. Do not set.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never), Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        internal bool RenderTabState
+        {
+            get { return _RenderTabState; }
+            set
+            {
+                _RenderTabState = value;
+                if (this.ContainerControl is System.Windows.Forms.Control)
+                    ((System.Windows.Forms.Control)this.ContainerControl).Invalidate();
+                else
+                    this.Refresh();
+            }
+        }
+
+        private GraphicsPath _TabPath = null;
+        /// <summary>
+        /// Gets the actual tab path.
+        /// </summary>
+        [Browsable(false)]
+        public GraphicsPath TabPath
+        {
+            get { return _TabPath; }
+            internal set
+            {
+                if(_TabPath!=null)
+                    _TabPath.Dispose();
+                _TabPath = value;
+            }
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/TabbedForm/TabFormItemColorTable.cs b/PROMS/DotNetBar Source Code/Controls/TabbedForm/TabFormItemColorTable.cs
new file mode 100644
index 00000000..2e4913ab
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/TabbedForm/TabFormItemColorTable.cs	
@@ -0,0 +1,135 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Text;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    public class TabFormItemColorTable
+    {
+        /// <summary>
+        /// Gets or sets the name of the color table.
+        /// </summary>
+        public string Name = "";
+        /// <summary>
+        /// Gets or sets the default tab colors.
+        /// </summary>
+        public TabFormItemStateColorTable Default = new TabFormItemStateColorTable();
+        /// <summary>
+        /// Gets or sets the disabled tab colors.
+        /// </summary>
+        public TabFormItemStateColorTable Disabled = new TabFormItemStateColorTable();
+        /// <summary>
+        /// Gets or sets the selected tab colors.
+        /// </summary>
+        public TabFormItemStateColorTable Selected = new TabFormItemStateColorTable();
+        /// <summary>
+        /// Gets or sets the colors when mouse is over the tab but tab is not selected.
+        /// </summary>
+        public TabFormItemStateColorTable MouseOver = new TabFormItemStateColorTable();
+        /// <summary>
+        /// Gets or sets colors for the tab close button.
+        /// </summary>
+        public TabCloseButtonColorTable CloseButton = new TabCloseButtonColorTable();
+    }
+
+    /// <summary>
+    /// Defines the color table for RibbonTabItem states.
+    /// </summary>
+    public class TabFormItemStateColorTable
+    {
+        /// <summary>
+        /// Indicates item text color.
+        /// </summary>
+        public Color TextColor = Color.Black;
+        /// <summary>
+        /// Gets or sets the background colors for the item.
+        /// </summary>
+        public Color[] BackColors = new Color[0];
+        /// <summary>
+        /// Gets or sets the back colors gradient angle if there is more than one color in BackColors array.
+        /// </summary>
+        public int BackColorsGradientAngle = 90;
+        /// <summary>
+        /// Gets or sets the gradient colors positions if there is more than one color in BackColors array.
+        /// </summary>
+        public float[] BackColorsPositions = new float[0];
+        /// <summary>
+        /// Gets or sets the item border colors.
+        /// </summary>
+        public Color[] BorderColors = new Color[0];
+
+        /// <summary>
+        /// Creates a copy of the state color table.
+        /// </summary>
+        public TabFormItemStateColorTable Clone()
+        {
+            TabFormItemStateColorTable t=new TabFormItemStateColorTable();
+            t.BorderColors = BorderColors;
+            t.BackColors = BackColors;
+            t.TextColor = TextColor;
+            t.BackColorsGradientAngle = BackColorsGradientAngle;
+            t.BackColorsPositions = BackColorsPositions;
+            return t;
+        }
+
+    }
+
+    /// <summary>
+    /// Defines color table for TabFormItem close button displayed on tabs.
+    /// </summary>
+    public class TabCloseButtonColorTable
+    {
+        /// <summary>
+        /// Colors for the button in default state.
+        /// </summary>
+        public TabCloseButtonStateColorTable Normal = new TabCloseButtonStateColorTable();
+        /// <summary>
+        /// Colors for button in mouse over state.
+        /// </summary>
+        public TabCloseButtonStateColorTable MouseOver = new TabCloseButtonStateColorTable(new Color[] { ColorScheme.GetColor(0xDB4336) }, ColorScheme.GetColor(0xFDFBFA), ColorScheme.GetColor(0xDB4336));
+        /// <summary>
+        /// Colors for button when pressed with mouse state.
+        /// </summary>
+        public TabCloseButtonStateColorTable Pressed = new TabCloseButtonStateColorTable(new Color[] { ColorScheme.GetColor(0xA8352A) }, ColorScheme.GetColor(0xFDFBFA), ColorScheme.GetColor(0xA8352A));
+    }
+    /// <summary>
+    /// Defines state color table for TabFormItem close button displayed on tabs.
+    /// </summary>
+    public class TabCloseButtonStateColorTable
+    {
+        /// <summary>
+        /// Gets or sets the background colors for the item.
+        /// </summary>
+        public Color[] BackColors = new Color[0];
+        /// <summary>
+        /// Gets or sets the back colors gradient angle if there is more than one color in BackColors array.
+        /// </summary>
+        public int BackColorsGradientAngle = 90;
+        /// <summary>
+        /// Gets or sets the gradient colors positions if there is more than one color in BackColors array.
+        /// </summary>
+        public float[] BackColorsPositions = new float[0];
+        /// <summary>
+        /// Indicates item sign color.
+        /// </summary>
+        public Color ForeColor = Color.Empty;
+        /// <summary>
+        /// Indicates item border color.
+        /// </summary>
+        public Color BorderColor = Color.Empty;
+
+        public TabCloseButtonStateColorTable()
+        {
+
+        }
+
+        public TabCloseButtonStateColorTable(Color[] backColors, Color foreColor, Color borderColor)
+        {
+            BackColors = backColors;
+            ForeColor = foreColor;
+            BorderColor = borderColor;
+        }
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/TabbedForm/TabFormPainter.cs b/PROMS/DotNetBar Source Code/Controls/TabbedForm/TabFormPainter.cs
new file mode 100644
index 00000000..1b2c6ae8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/TabbedForm/TabFormPainter.cs	
@@ -0,0 +1,88 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Text;
+using DevComponents.DotNetBar.Controls;
+using DevComponents.DotNetBar.Metro;
+using DevComponents.DotNetBar.Metro.Rendering;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    internal abstract class TabFormPainter
+    {
+        public abstract void Paint(TabFormPainterArgs args);
+    }
+
+    internal class OfficeTabFormPainter : TabFormPainter, IOffice2007Painter
+    {
+        #region IOffice2007Painter
+        private Office2007ColorTable _ColorTable = null;
+
+        /// <summary>
+        /// Gets or sets color table used by renderer.
+        /// </summary>
+        public Office2007ColorTable ColorTable
+        {
+            get { return _ColorTable; }
+            set { _ColorTable = value; }
+        }
+        #endregion
+
+        public override void Paint(TabFormPainterArgs args)
+        {
+            TabParentForm form = args.TabParentForm;
+            Graphics g = args.Graphics;
+            TabFormColorTable colorTable = GetFormColorTable();
+            if (form.FormTabsControl != null && form.FormTabsControl.ColorTable != null)
+                colorTable = form.FormTabsControl.ColorTable;
+
+            Thickness borderThickness = form.BorderThickness;
+            BorderColors colors = form.BorderColor;
+            if (borderThickness.IsZero && colors.IsEmpty)
+            {
+                // Get it from table
+                borderThickness = colorTable.BorderThickness;
+                colors = form.IsActive ? colorTable.Active.BorderColors : colorTable.Inactive.BorderColors;
+            }
+
+            using (SolidBrush brush = new SolidBrush(colorTable.BackColor.IsEmpty ? form.BackColor : colorTable.BackColor))
+                g.FillRectangle(brush, new Rectangle(0, 0, form.Width, form.Height));
+
+            if (!borderThickness.IsZero && !colors.IsEmpty)
+            {
+                RectangleF br = new RectangleF(0, 0, form.Width, form.Height);
+                DrawingHelpers.DrawBorder(g, br, borderThickness, colors);
+            }
+        }
+
+        private TabFormColorTable GetFormColorTable()
+        {
+            return _ColorTable.TabForm;
+        }
+    }
+
+    public class TabFormPainterArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets or sets Graphics object group is rendered on.
+        /// </summary>
+        public Graphics Graphics = null;
+
+        /// <summary>
+        /// Gets or sets the reference to TabParentForm being rendered.
+        /// </summary>
+        public TabParentForm TabParentForm = null;
+
+
+        /// <summary>
+        /// Indicates whether to cancel system rendering of the item.
+        /// </summary>
+        public bool Cancel = false;
+
+        public TabFormPainterArgs(TabParentForm form, Graphics graphics)
+        {
+            Graphics = graphics;
+            TabParentForm = form;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/TabbedForm/TabFormPanel.cs b/PROMS/DotNetBar Source Code/Controls/TabbedForm/TabFormPanel.cs
new file mode 100644
index 00000000..6189a45e
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/TabbedForm/TabFormPanel.cs	
@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    public class TabFormPanel : PanelControl
+    {
+        #region Internal Implementation
+
+        private TabFormItem _TabFormItem;
+        /// <summary>
+        /// Gets the TabFormItem this panel is associated with
+        /// </summary>
+        public TabFormItem TabFormItem
+        {
+            get { return _TabFormItem; }
+            internal set { _TabFormItem = value; }
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/TabbedForm/TabFormStateColorTable.cs b/PROMS/DotNetBar Source Code/Controls/TabbedForm/TabFormStateColorTable.cs
new file mode 100644
index 00000000..9d3a2ba6
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/TabbedForm/TabFormStateColorTable.cs	
@@ -0,0 +1,49 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Text;
+using DevComponents.DotNetBar.Metro;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    /// <summary>
+    /// Defines state color table for TabParentForm.
+    /// </summary>
+    public class TabFormStateColorTable
+    {
+        /// <summary>
+        /// Gets or sets the colors for the top part of the background.
+        /// </summary>
+        public Color[] CaptionBackColors = new Color[0];
+        /// <summary>
+        /// Gets or sets the back colors gradient angle if there is more than one color in BackColors array.
+        /// </summary>
+        public int CaptionBackColorsGradientAngle = 90;
+        /// <summary>
+        /// Gets or sets the gradient colors positions if there is more than one color in BackColors array.
+        /// </summary>
+        public float[] CaptionBackColorsPositions = new float[0];
+
+        /// <summary>
+        /// Gets or sets the color of caption text.
+        /// </summary>
+        public Color CaptionText = Color.Empty;
+
+        /// <summary>
+        /// Gets or sets the border colors.
+        /// </summary>
+        public BorderColors BorderColors = new BorderColors(ColorScheme.GetColor("696969"));
+
+        public TabFormStateColorTable()
+        {
+            
+        }
+
+        public TabFormStateColorTable(Color[] captionBackColors, Color captionText, BorderColors borderColors)
+        {
+            CaptionBackColors = captionBackColors;
+            CaptionText = captionText;
+            BorderColors = borderColors;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/TabbedForm/TabFormStripContainerItem.cs b/PROMS/DotNetBar Source Code/Controls/TabbedForm/TabFormStripContainerItem.cs
new file mode 100644
index 00000000..e804559b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/TabbedForm/TabFormStripContainerItem.cs	
@@ -0,0 +1,1147 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+using DevComponents.UI.ContentManager;
+using DevComponents.DotNetBar.Primitives;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    /// <summary>
+    /// Defines the internal container item for the ribbon strip control.
+    /// </summary>
+    [System.ComponentModel.ToolboxItem(false), System.ComponentModel.DesignTimeVisible(false)]
+    internal class TabFormStripContainerItem : ImageItem, IDesignTimeProvider
+    {
+        #region Private Variables
+        private TabFormItemsSimpleContainer _ItemContainer = null;
+        private CaptionItemContainer _CaptionContainer = null;
+        private SystemCaptionItem _SystemCaptionItem = null;
+        private TabFormStripControl _TabStrip = null;
+        private SystemCaptionItem _WindowIcon = null;
+        private Separator _IconSeparator = null;
+        #endregion
+
+        #region Constructor
+        /// <summary>
+        /// Creates new instance of the class and initializes it with the parent RibbonStrip control.
+        /// </summary>
+        /// <param name="parent">Reference to parent RibbonStrip control</param>
+        public TabFormStripContainerItem(TabFormStripControl parent)
+        {
+            _TabStrip = parent;
+
+            // We contain other controls
+            m_IsContainer = true;
+            this.AccessibleRole = System.Windows.Forms.AccessibleRole.Grouping;
+            _ItemContainer = new TabFormItemsSimpleContainer();
+            _ItemContainer.ContainerControl = parent;
+            _ItemContainer.GlobalItem = false;
+            _ItemContainer.OverlapSpacing = TabFormItem.TabOverlap;
+            _ItemContainer.OverlapType = typeof(TabFormItemBase);
+            //_ItemContainer.WrapItems = false;
+            //_ItemContainer.EventHeight = false;
+            //_ItemContainer.UseMoreItemsButton = false;
+            _ItemContainer.Stretch = true;
+            _ItemContainer.Displayed = true;
+            //_ItemContainer.SystemContainer = true;
+            //_ItemContainer.PaddingTop = 0;
+            //_ItemContainer.PaddingBottom = 0;
+            //_ItemContainer.PaddingLeft = 0;
+            //_ItemContainer.ItemSpacing = 1;
+
+            _CaptionContainer = new CaptionItemContainer();
+            _CaptionContainer.ContainerControl = parent;
+            _CaptionContainer.GlobalItem = false;
+            _CaptionContainer.WrapItems = false;
+            _CaptionContainer.EventHeight = false;
+            _CaptionContainer.EqualButtonSize = false;
+            _CaptionContainer.ToolbarItemsAlign = eContainerVerticalAlignment.Top;
+            _CaptionContainer.UseMoreItemsButton = false;
+            _CaptionContainer.Stretch = true;
+            _CaptionContainer.Displayed = true;
+            _CaptionContainer.SystemContainer = true;
+            _CaptionContainer.PaddingBottom = 0;
+            _CaptionContainer.PaddingTop = 0;
+            _CaptionContainer.PaddingLeft = 6;
+            _CaptionContainer.ItemSpacing = 1;
+            _CaptionContainer.TrackSubItemsImageSize = false;
+            _CaptionContainer.ItemAdded += new EventHandler(this.CaptionContainerNewItemAdded);
+
+            _CaptionItemsContainer = new CaptionItemContainer();
+            _CaptionItemsContainer.ContainerControl = parent;
+            _CaptionItemsContainer.GlobalItem = false;
+            _CaptionItemsContainer.WrapItems = false;
+            _CaptionItemsContainer.EventHeight = false;
+            _CaptionItemsContainer.EqualButtonSize = false;
+            _CaptionItemsContainer.ToolbarItemsAlign = eContainerVerticalAlignment.Top;
+            _CaptionItemsContainer.UseMoreItemsButton = false;
+            _CaptionItemsContainer.Stretch = true;
+            _CaptionItemsContainer.Displayed = true;
+            _CaptionItemsContainer.SystemContainer = true;
+            _CaptionItemsContainer.PaddingBottom = 0;
+            _CaptionItemsContainer.PaddingTop = 0;
+            _CaptionItemsContainer.PaddingLeft = 6;
+            _CaptionItemsContainer.ItemSpacing = 1;
+            _CaptionItemsContainer.TrackSubItemsImageSize = false;
+
+            this.SubItems.Add(_CaptionContainer);
+            this.SubItems.Add(_CaptionItemsContainer);
+            this.SubItems.Add(_ItemContainer);
+
+            SystemCaptionItem sc = new SystemCaptionItem();
+            sc.RestoreEnabled = false;
+            sc.IsSystemIcon = false;
+            sc.ItemAlignment = eItemAlignment.Far;
+            sc.SetSystemItem(true);
+            _SystemCaptionItem = sc;
+            this.SubItems.Add(_SystemCaptionItem);
+        }
+
+
+        #endregion
+
+        #region Internal Implementation
+        internal void OnCaptionVisibleChanged(bool newCaptionVisible)
+        {
+            if (_SystemCaptionItem != null)
+            {
+                if (newCaptionVisible)
+                {
+                    if (_SystemCaptionItem.Parent != _CaptionContainer)
+                    {
+                        if (_SystemCaptionItem.Parent != null)
+                            _SystemCaptionItem.Parent.SubItems.Remove(_SystemCaptionItem);
+                        _CaptionContainer.SubItems.Add(_SystemCaptionItem);
+                    }
+                }
+                else
+                {
+                    if (_SystemCaptionItem.Parent != this)
+                    {
+                        if (_SystemCaptionItem.Parent != null)
+                            _SystemCaptionItem.Parent.SubItems.Remove(_SystemCaptionItem);
+                        this.SubItems.Add(_SystemCaptionItem);
+                    }
+                }
+            }
+        }
+
+        private CaptionItemContainer _CaptionItemsContainer = null;
+        /// <summary>
+        /// Gets the list of the items displayed in form caption if its visible.
+        /// </summary>
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content), MergableProperty(false)]
+        public SubItemsCollection CaptionItems
+        {
+            get { return _CaptionItemsContainer.SubItems; }
+        }
+
+        /// <summary>
+        /// Occurs after an item has been added to the container. This procedure is called on both item being added and the parent of the item. To distinguish between those two states check the item parameter.
+        /// </summary>
+        /// <param name="item">When occurring on the parent this will hold the reference to the item that has been added. When occurring on the item being added this will be null (Nothing).</param>
+        protected internal override void OnItemAdded(BaseItem item)
+        {
+            if (_SystemCaptionItem != null && _SystemCaptionItem.Parent == this && item != _SystemCaptionItem)
+            {
+                this.SubItems._Remove(_SystemCaptionItem);
+                this.SubItems._Add(_SystemCaptionItem);
+            }
+            base.OnItemAdded(item);
+        }
+
+        private void CaptionContainerNewItemAdded(object sender, EventArgs e)
+        {
+            if (sender is BaseItem)
+            {
+                BaseItem item = sender as BaseItem;
+                if (!(item is SystemCaptionItem))
+                {
+                    if (_CaptionContainer.SubItems.Contains(_SystemCaptionItem))
+                    {
+                        _CaptionContainer.SubItems._Remove(_SystemCaptionItem);
+                        _CaptionContainer.SubItems._Add(_SystemCaptionItem);
+                    }
+                }
+            }
+        }
+
+        internal void ReleaseSystemFocus()
+        {
+            _ItemContainer.ReleaseSystemFocus();
+            if (_TabStrip.CaptionVisible)
+            {
+                _CaptionContainer.ReleaseSystemFocus();
+                _CaptionItemsContainer.ReleaseSystemFocus();
+            }
+        }
+
+        public override void ContainerLostFocus(bool appLostFocus)
+        {
+            base.ContainerLostFocus(appLostFocus);
+            _ItemContainer.ContainerLostFocus(appLostFocus);
+            if (_TabStrip.CaptionVisible)
+            {
+                _CaptionContainer.ContainerLostFocus(appLostFocus);
+                _CaptionItemsContainer.ContainerLostFocus(appLostFocus);
+            }
+        }
+
+        internal void SetSystemFocus()
+        {
+            if (_TabStrip.CaptionVisible && _ItemContainer.ExpandedItem() == null)
+                _CaptionContainer.SetSystemFocus();
+            else
+                _ItemContainer.SetSystemFocus();
+        }
+
+        /// <summary>
+        /// Paints this base container
+        /// </summary>
+        public override void Paint(ItemPaintArgs pa)
+        {
+            if (this.SuspendLayout)
+                return;
+            if (_ScrollEnabled)
+            {
+                pa.Graphics.SetClip(_ScrollClipBounds);
+                _ItemContainer.ClippingRectangle = _ScrollClipBounds;
+            }
+            else
+                _ItemContainer.ClippingRectangle = Rectangle.Empty;
+            _ItemContainer.Paint(pa);
+            if (_TabStrip.CaptionVisible)
+            {
+                _CaptionContainer.Paint(pa);
+                _CaptionItemsContainer.Paint(pa);
+            }
+            if (_SystemCaptionItem.Parent == this)
+                _SystemCaptionItem.Paint(pa);
+
+        }
+
+        private int _ScrollButtonWidth = 22;
+        /// <summary>
+        /// Gets or sets the scroll button width.
+        /// </summary>
+        public int ScrollButtonWidth
+        {
+            get { return _ScrollButtonWidth; }
+            set { _ScrollButtonWidth = value; }
+        }
+        private bool _ScrollEnabled = false;
+        private ButtonX _LeftScrollButton = null, _RightScrollButton = null;
+        private Rectangle _ScrollClipBounds = Rectangle.Empty;
+        private int _MaxScrolPos = 0;
+        private void RepositionScrollButtons()
+        {
+            if (_LeftScrollButton == null || _RightScrollButton == null) return;
+            Rectangle tabsBounds = GetItemContainerBounds();
+            Rectangle itemsBounds = _ItemContainer.Bounds;
+            int scrollButtonWidth = Dpi.Width(_ScrollButtonWidth);
+            _LeftScrollButton.Bounds = new Rectangle(tabsBounds.X, itemsBounds.Y + Dpi.Height2, scrollButtonWidth, itemsBounds.Height - Dpi.Height3);
+            _RightScrollButton.Bounds = new Rectangle(tabsBounds.Right - scrollButtonWidth, itemsBounds.Y + Dpi.Height2, scrollButtonWidth, itemsBounds.Height - Dpi.Height3);
+        }
+
+        public override void RecalcSize()
+        {
+            if (this.SuspendLayout)
+                return;
+            TabFormStripControl strip = this.ContainerControl as TabFormStripControl;
+            Form form = null;
+            if (strip != null)
+                form = strip.FindForm();
+            if (_SystemCaptionItem.Parent == this)
+            {
+                _SystemCaptionItem.Displayed = true;
+                _SystemCaptionItem.RecalcSize();
+                _SystemCaptionItem.LeftInternal = this.Bounds.Right - _SystemCaptionItem.WidthInternal;
+                _SystemCaptionItem.TopInternal = this.Bounds.Y + (IsParentFormMaximized ? Dpi.Height4 : Dpi.Height1);
+            }
+            Rectangle tabsBounds = GetItemContainerBounds();
+            _ItemContainer.Bounds = tabsBounds;
+            _ItemContainer.RecalcSize();
+            if (_ItemContainer.WidthInternal > tabsBounds.Width) // Using scroll buttons
+            {
+                _MaxScrolPos = (tabsBounds.Width - Dpi.Width(_ScrollButtonWidth * 2)) - _ItemContainer.WidthInternal;
+                if (_ScrollEnabled)
+                {
+                    // Just check scroll position
+                    //throw new NotImplementedException();
+                    RepositionScrollButtons();
+                }
+                else
+                {
+                    if (strip != null)
+                    {
+                        _LeftScrollButton = new ButtonX();
+                        _LeftScrollButton.Name = "sysLeftScrollButton";
+                        _LeftScrollButton.Symbol = "\ue314";
+                        _LeftScrollButton.SymbolSet = eSymbolSet.Material;
+                        _LeftScrollButton.Shape = new RoundRectangleShapeDescriptor(0);
+                        _LeftScrollButton.Click += LeftScrollButtonClick;
+                        _RightScrollButton = new ButtonX();
+                        _RightScrollButton.Name = "sysRightScrollButton";
+                        _RightScrollButton.Symbol = "\ue315";
+                        _RightScrollButton.SymbolSet = eSymbolSet.Material;
+                        _RightScrollButton.Shape = new RoundRectangleShapeDescriptor(0);
+                        _RightScrollButton.Click += RightScrollButtonClick;
+                        RepositionScrollButtons();
+                        strip.Controls.Add(_LeftScrollButton);
+                        strip.Controls.Add(_RightScrollButton);
+                        _ScrollEnabled = true;
+                    }
+                }
+                tabsBounds.X += Dpi.Width(_ScrollButtonWidth);
+                tabsBounds.Width -= Dpi.Width(_ScrollButtonWidth) * 2;
+                _ItemContainer.Bounds = tabsBounds;
+                _ItemContainer.RecalcSize();
+                if (_ScrollPos < _MaxScrolPos) _ScrollPos = _MaxScrolPos;
+                _ItemContainer.ScrollPosition = _ScrollPos;
+                _ScrollClipBounds = tabsBounds;
+                //_ScrollClipBounds.X += Dpi.Width(_ScrollButtonWidth);
+                //_ScrollClipBounds.Width -= Dpi.Width(_ScrollButtonWidth) * 2;
+            }
+            else if (_ScrollEnabled)
+            {
+                // Remove scrolling
+                if (_LeftScrollButton != null)
+                {
+                    if (_LeftScrollButton.Parent != null)
+                        _LeftScrollButton.Parent.Controls.Remove(_LeftScrollButton);
+                    _LeftScrollButton.Click -= LeftScrollButtonClick;
+                    _LeftScrollButton.Dispose();
+                    _LeftScrollButton = null;
+                }
+                if (_RightScrollButton != null)
+                {
+                    if (_RightScrollButton.Parent != null)
+                        _RightScrollButton.Parent.Controls.Remove(_RightScrollButton);
+                    _RightScrollButton.Click -= RightScrollButtonClick;
+                    _RightScrollButton.Dispose();
+                    _RightScrollButton = null;
+                }
+                _ScrollEnabled = false;
+            }
+
+            if (_ItemContainer.HeightInternal < 0) _ItemContainer.HeightInternal = 0;
+            bool isMaximized = false;
+            if (_TabStrip.CaptionVisible)
+            {
+                Rectangle captionContainerBounds = GetCaptionContainerBounds();
+                _CaptionContainer.Bounds = captionContainerBounds;
+                _CaptionContainer.RecalcSize();
+                Size frameBorderSize = SystemInformation.FrameBorderSize;
+                if (strip != null)
+                {
+                    if (form != null)
+                    {
+                        if (_WindowIcon != null)
+                            _WindowIcon.SetVisibleDirect(form.ShowIcon && _TabStrip.ShowIcon);
+                        if (_IconSeparator != null)
+                            _IconSeparator.SetVisibleDirect(form.ShowIcon && _TabStrip.ShowIcon);
+                    }
+                    TabParentForm appForm = form as TabParentForm;
+                    if (appForm != null)
+                    {
+                        NonClientInfo nci = appForm.GetNonClientInfo();
+                        frameBorderSize.Width = nci.LeftBorder;
+                        frameBorderSize.Height = nci.BottomBorder;
+                    }
+                }
+                if (_TabStrip.CaptionHeight == 0 && _SystemCaptionItem.TopInternal < (frameBorderSize.Height - 1))
+                {
+                    if (form != null && form.WindowState == FormWindowState.Maximized)
+                        isMaximized = true;
+
+                    if (isMaximized)
+                    {
+                        _SystemCaptionItem.TopInternal = 1;
+                        if (_WindowIcon != null) _WindowIcon.TopInternal = 1;
+                    }
+                    else
+                    {
+                        _SystemCaptionItem.TopInternal = Math.Max(1, frameBorderSize.Height - 6);
+                        if (_WindowIcon != null) _WindowIcon.TopInternal = frameBorderSize.Height - 5;
+                    }
+                }
+
+                // Adjust the Y position of the items inside of the caption container since they are top aligned and
+                // quick access toolbar items should be aligned with the bottom of the system caption item.
+                if (System.Environment.OSVersion.Version.Major >= 6)
+                {
+                    int topOffset = 3;
+                    if (isMaximized)
+                        topOffset += 1;
+                    int maxBottom = 0;
+                    foreach (BaseItem item in _CaptionContainer.SubItems)
+                    {
+                        if (!(item is ApplicationButton || item is DevComponents.DotNetBar.Metro.MetroAppButton) && item != _SystemCaptionItem && item != _IconSeparator)
+                            item.TopInternal += topOffset;
+                        else if (item == _IconSeparator)
+                            item.TopInternal += (isMaximized ? 2 : Dpi.Height4);
+                        maxBottom = Math.Max(item.Bounds.Bottom, maxBottom);
+                    }
+                    if (_CaptionContainer.MoreItems != null)
+                        _CaptionContainer.MoreItems.TopInternal += topOffset;
+                    if (maxBottom > _CaptionContainer.HeightInternal) _CaptionContainer.SetDisplayRectangle(new Rectangle(_CaptionContainer.Bounds.X, _CaptionContainer.Bounds.Y, _CaptionContainer.Bounds.Width, maxBottom));
+                }
+                else
+                {
+                    int maxBottom = 0;
+                    foreach (BaseItem item in _CaptionContainer.SubItems)
+                    {
+                        if (item.HeightInternal < _SystemCaptionItem.HeightInternal && (item != _IconSeparator && item != _WindowIcon))
+                        {
+                            //item.TopInternal += (m_SystemCaptionItem.HeightInternal - item.HeightInternal);
+                            item.TopInternal = (_SystemCaptionItem.Bounds.Bottom - (item.HeightInternal + ((item is LabelItem) ? 2 : 0)));
+                            maxBottom = Math.Max(item.Bounds.Bottom, maxBottom);
+                        }
+                    }
+                    if (_CaptionContainer.MoreItems != null)
+                        _CaptionContainer.MoreItems.TopInternal += (_SystemCaptionItem.HeightInternal - _CaptionContainer.MoreItems.HeightInternal);
+                    if (maxBottom > _CaptionContainer.HeightInternal) _CaptionContainer.SetDisplayRectangle(new Rectangle(_CaptionContainer.Bounds.X, _CaptionContainer.Bounds.Y, _CaptionContainer.Bounds.Width, maxBottom));
+                }
+
+                // Items contained in caption are inside their own container
+                Rectangle captionItemsContainerBounds = captionContainerBounds;
+                if (_IconSeparator != null)
+                {
+                    captionItemsContainerBounds.X = _IconSeparator.Bounds.Right + Dpi.Width6;
+                    captionItemsContainerBounds.Width -= _IconSeparator.Bounds.Right + Dpi.Width6;
+                }
+                if (_SystemCaptionItem != null)
+                {
+                    captionItemsContainerBounds.Width -= (captionItemsContainerBounds.Right -
+                                                          _SystemCaptionItem.Bounds.Left) + Dpi.Width6;
+                }
+
+                if (strip != null)
+                {
+                    Size titleSize = Size.Empty;
+                    using (Graphics g = strip.CreateGraphics())
+                    {
+                        string text = strip.TitleText;
+                        if (string.IsNullOrEmpty(text) && form != null) text = form.Text;
+                        bool isTitleTextMarkup = strip.TitleTextMarkupBody != null;
+                        if (isTitleTextMarkup)
+                        {
+                            TextMarkup.MarkupDrawContext d = new TextMarkup.MarkupDrawContext(g, strip.Font, Color.Black,
+                                strip.RightToLeft == System.Windows.Forms.RightToLeft.Yes, captionItemsContainerBounds, false);
+                            d.AllowMultiLine = false;
+                            TextMarkup.BodyElement body = strip.TitleTextMarkupBody;
+                            body.Measure(captionItemsContainerBounds.Size, d);
+                            titleSize = body.Bounds.Size;
+                            strip.TitleTextMarkupLastArrangeBounds=Rectangle.Empty;
+                        }
+                        else
+                        {
+                            titleSize = TextDrawing.MeasureString(g, text, strip.Font);
+                        }
+                    }
+                    captionItemsContainerBounds.X += titleSize.Width + Dpi.Width4;
+                    captionItemsContainerBounds.Width -= titleSize.Width + Dpi.Width4;
+                }
+
+                if (captionItemsContainerBounds.Width > 0)
+                {
+                    _CaptionItemsContainer.Bounds = captionItemsContainerBounds;
+                    _CaptionItemsContainer.RecalcSize();
+                    // Adjust the Y position of the items inside of the caption container since they are top aligned and
+                    // quick access toolbar items should be aligned with the bottom of the system caption item.
+                    if (_CaptionItemsContainer.SubItems.Count > 0)
+                    {
+                        int topOffset = 3;
+                        if (isMaximized)
+                            topOffset += 1;
+                        int maxBottom = 0;
+                        foreach (BaseItem item in _CaptionItemsContainer.SubItems)
+                        {
+                            item.TopInternal += topOffset;
+                            maxBottom = Math.Max(item.Bounds.Bottom, maxBottom);
+                        }
+                        if (_CaptionItemsContainer.MoreItems != null)
+                            _CaptionItemsContainer.MoreItems.TopInternal += topOffset;
+                        if (maxBottom > _CaptionItemsContainer.HeightInternal)
+                            _CaptionItemsContainer.SetDisplayRectangle(new Rectangle(_CaptionItemsContainer.Bounds.X,
+                                _CaptionItemsContainer.Bounds.Y, _CaptionItemsContainer.Bounds.Width, maxBottom));
+                    }
+                }
+
+                if (_ItemContainer.HeightInternal == 0)
+                    this.HeightInternal = _CaptionContainer.HeightInternal;
+                else
+                    this.HeightInternal = _ItemContainer.Bounds.Bottom;// -m_CaptionContainer.Bounds.Top;
+            }
+            else
+            {
+                int h = _ItemContainer.HeightInternal;
+                this.HeightInternal = h;
+            }
+
+            base.RecalcSize();
+        }
+
+        private bool IsParentFormMaximized
+        {
+            get
+            {
+                Control c = (Control)this.ContainerControl;
+                if (c != null)
+                {
+                    Form form = c.FindForm();
+                    if (form != null)
+                        return (form.WindowState == FormWindowState.Maximized);
+                }
+                return false;
+            }
+        }
+        private int _ScrollStep = 96;
+        /// <summary>
+        /// Indicates the scroll in pixels each time scroll button is pressed.
+        /// </summary>
+        public int ScrollStep
+        {
+            get { return _ScrollStep; }
+            set { _ScrollStep = value; }
+        }
+
+        private Animation.AnimationInt _Animation = null;
+        private int _ScrollPos = 0;
+        void RightScrollButtonClick(object sender, EventArgs e)
+        {
+            int newScrollPos = Math.Max(_MaxScrolPos, _ScrollPos - Dpi.Width(_ScrollStep));
+            if (newScrollPos != _ScrollPos)
+            {
+                WaitForCurrentAnimationToComplete();
+                EnsureAnimation();
+                _ScrollPos = newScrollPos;
+                _Animation.Animations.Add(new Animation.AnimationRequest(_ItemContainer, "ScrollPosition", _ItemContainer.ScrollPosition, newScrollPos));
+                _Animation.Start();
+            }
+        }
+
+        void LeftScrollButtonClick(object sender, EventArgs e)
+        {
+            int newScrollPos = Math.Min(0, _ScrollPos + Dpi.Width(_ScrollStep));
+            if (newScrollPos != _ScrollPos)
+            {
+                WaitForCurrentAnimationToComplete();
+                EnsureAnimation();
+                _ScrollPos = newScrollPos;
+                _Animation.Animations.Add(new Animation.AnimationRequest(_ItemContainer, "ScrollPosition", _ItemContainer.ScrollPosition, newScrollPos));
+                _Animation.Start();
+            }
+        }
+
+        private void EnsureAnimation()
+        {
+            if (_Animation == null)
+            {
+                _Animation = new Animation.AnimationInt(Animation.AnimationEasing.EaseOutQuint, 300);
+                _Animation.AnimationCompleted += AnimationCompleted;
+            }
+        }
+        private void AnimationCompleted(object sender, EventArgs e)
+        {
+            Animation.Animation anim = (Animation.Animation)sender;
+            anim.AnimationCompleted -= AnimationCompleted;
+            anim.Dispose();
+        }
+        private void WaitForCurrentAnimationToComplete()
+        {
+            if (_Animation != null)
+            {
+                DateTime start = DateTime.Now;
+                while (!_Animation.IsDisposed)
+                {
+                    Application.DoEvents();
+                    if (DateTime.Now.Subtract(start).TotalMilliseconds > 1000)
+                    {
+                        AbortCurrentAnimation();
+                        break;
+                    }
+                }
+                _Animation = null;
+            }
+        }
+        private void AbortCurrentAnimation()
+        {
+            Animation.Animation anim = _Animation;
+            _Animation = null;
+            if (anim != null)
+            {
+                anim.Stop();
+                anim.Dispose();
+            }
+        }
+
+        private Rectangle GetItemContainerBounds()
+        {
+            Rectangle r = _TabStrip.GetItemContainerBounds();
+            if (_SystemCaptionItem.Parent == this)
+                r.Width -= _SystemCaptionItem.WidthInternal + Dpi.Width2;
+            return r;
+        }
+
+        private Rectangle GetCaptionContainerBounds()
+        {
+            return _TabStrip.GetCaptionContainerBounds();
+        }
+
+        /// <summary>
+        /// Gets reference to internal ribbon strip container that contains tabs and/or other items.
+        /// </summary>
+        public TabFormItemsSimpleContainer TabsContainer
+        {
+            get { return _ItemContainer; }
+        }
+
+        /// <summary>
+        /// Gets reference to internal caption container item that contains the quick toolbar, start button and system caption item.
+        /// </summary>
+        public GenericItemContainer CaptionContainer
+        {
+            get { return _CaptionContainer; }
+        }
+
+        public SystemCaptionItem SystemCaptionItem
+        {
+            get { return _SystemCaptionItem; }
+        }
+
+        /// <summary>
+        /// Returns copy of GenericItemContainer item
+        /// </summary>
+        public override BaseItem Copy()
+        {
+            TabFormStripContainerItem objCopy = new TabFormStripContainerItem(_TabStrip);
+            this.CopyToItem(objCopy);
+
+            return objCopy;
+        }
+        protected override void CopyToItem(BaseItem copy)
+        {
+            TabFormStripContainerItem objCopy = copy as TabFormStripContainerItem;
+            base.CopyToItem(objCopy);
+        }
+
+
+        public override void InternalClick(MouseButtons mb, Point mpos)
+        {
+            _ItemContainer.InternalClick(mb, mpos);
+            if (_SystemCaptionItem.Parent == this)
+                _SystemCaptionItem.InternalClick(mb, mpos);
+            if (_TabStrip.CaptionVisible)
+            {
+                _CaptionContainer.InternalClick(mb, mpos);
+                _CaptionItemsContainer.InternalClick(mb, mpos);
+            }
+        }
+
+        public override void InternalDoubleClick(MouseButtons mb, Point mpos)
+        {
+            _ItemContainer.InternalDoubleClick(mb, mpos);
+            if (_TabStrip.CaptionVisible)
+            {
+                _CaptionContainer.InternalDoubleClick(mb, mpos);
+                _CaptionItemsContainer.InternalDoubleClick(mb, mpos);
+            }
+        }
+
+        public override void InternalMouseDown(MouseEventArgs objArg)
+        {
+            _ItemContainer.InternalMouseDown(objArg);
+            if (_SystemCaptionItem.Parent == this)
+                _SystemCaptionItem.InternalMouseDown(objArg);
+            if (_TabStrip.CaptionVisible)
+            {
+                if (this.DesignMode && _CaptionContainer.ItemAtLocation(objArg.X, objArg.Y) != null || !this.DesignMode)
+                    _CaptionContainer.InternalMouseDown(objArg);
+                if (this.DesignMode && _CaptionItemsContainer.ItemAtLocation(objArg.X, objArg.Y) != null || !this.DesignMode)
+                    _CaptionItemsContainer.InternalMouseDown(objArg);
+            }
+        }
+
+        public override void InternalMouseHover()
+        {
+            _ItemContainer.InternalMouseHover();
+            if (_SystemCaptionItem.Parent == this)
+                _SystemCaptionItem.InternalMouseHover();
+            if (_TabStrip.CaptionVisible)
+            {
+                _CaptionContainer.InternalMouseHover();
+                _CaptionItemsContainer.InternalMouseHover();
+            }
+        }
+
+        public override void InternalMouseLeave()
+        {
+            _ItemContainer.InternalMouseLeave();
+            if (_SystemCaptionItem.Parent == this)
+                _SystemCaptionItem.InternalMouseLeave();
+            if (_TabStrip.CaptionVisible)
+            {
+                _CaptionContainer.InternalMouseLeave();
+                _CaptionItemsContainer.InternalMouseLeave();
+            }
+        }
+
+        public override void InternalMouseMove(MouseEventArgs objArg)
+        {
+            _ItemContainer.InternalMouseMove(objArg);
+            if (_SystemCaptionItem.Parent == this)
+                _SystemCaptionItem.InternalMouseMove(objArg);
+            if (_TabStrip.CaptionVisible)
+            {
+                _CaptionContainer.InternalMouseMove(objArg);
+                _CaptionItemsContainer.InternalMouseMove(objArg);
+            }
+        }
+
+        public override void InternalMouseUp(MouseEventArgs objArg)
+        {
+            _ItemContainer.InternalMouseUp(objArg);
+            if (_SystemCaptionItem.Parent == this)
+                _SystemCaptionItem.InternalMouseUp(objArg);
+            if (_TabStrip.CaptionVisible)
+            {
+                _CaptionContainer.InternalMouseUp(objArg);
+                _CaptionItemsContainer.InternalMouseUp(objArg);
+            }
+        }
+
+        public override void InternalKeyDown(KeyEventArgs objArg)
+        {
+            BaseItem expanded = this.ExpandedItem();
+            if (expanded == null)
+                expanded = _CaptionContainer.ExpandedItem();
+            if (expanded == null)
+                expanded = _ItemContainer.ExpandedItem();
+
+            if (expanded == null || !_TabStrip.CaptionVisible)
+            {
+                _ItemContainer.InternalKeyDown(objArg);
+                if (!objArg.Handled && _TabStrip.CaptionVisible)
+                {
+                    _CaptionContainer.InternalKeyDown(objArg);
+                    _CaptionItemsContainer.InternalKeyDown(objArg);
+                }
+            }
+            else
+            {
+                if (expanded.Parent == _ItemContainer)
+                {
+                    _ItemContainer.InternalKeyDown(objArg);
+                }
+                else
+                {
+                    _CaptionContainer.InternalKeyDown(objArg);
+                }
+            }
+        }
+
+        private bool _NewTabItemVisible = false;
+        /// <summary>
+        /// Indicates whether new tab item which allows creation of new tab when clicked is visible. When visible you need to handle CreateNewTab event and create your new tab in event handler.
+        /// </summary>
+        [DefaultValue(false), Category("Appearance"), Description("Indicates whether new tab item which allows creation of new tab when clicked is visible. When visible you need to handle CreateNewTab event and create your new tab in event handler.")]
+        public bool NewTabItemVisible
+        {
+            get { return _NewTabItemVisible; }
+            set
+            {
+                _NewTabItemVisible = value;
+                UpdateNewTabItemVisibility();
+            }
+        }
+
+        private NewTabFormItem _NewTabFormItem = null;
+        private void UpdateNewTabItemVisibility()
+        {
+            if (_NewTabItemVisible)
+            {
+                if (_NewTabFormItem == null)
+                {
+                    _NewTabFormItem = new NewTabFormItem();
+                    _ItemContainer.SubItems.Add(_NewTabFormItem);
+                    _NewTabFormItem.Click += NewTabFormItemClick;
+                }
+            }
+            else
+            {
+                if (_NewTabFormItem != null)
+                {
+                    _NewTabFormItem.Parent.SubItems.Remove(_NewTabFormItem);
+                    _NewTabFormItem.Dispose();
+                    _NewTabFormItem = null;
+                }
+            }
+
+            NeedRecalcSize = true;
+            this.RecalcSize();
+        }
+
+        private void NewTabFormItemClick(object sender, EventArgs e)
+        {
+            OnCreateNewTab(EventArgs.Empty);
+        }
+
+        /// <summary>
+        /// Occurs when new tab item is clicked by end user and allows you to create and add new tab to the control.
+        /// </summary>
+        [Description("Occurs when new tab item is clicked by end user and allows you to create and add new tab to the control.")]
+        public event EventHandler CreateNewTab;
+
+        /// <summary>
+        /// Raises CreateNewTab event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnCreateNewTab(EventArgs e)
+        {
+            EventHandler handler = CreateNewTab;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        /// <summary>
+        /// Return Sub Item at specified location
+        /// </summary>
+        public override BaseItem ItemAtLocation(int x, int y)
+        {
+            if (_ItemContainer.DisplayRectangle.Contains(x, y))
+                return _ItemContainer.ItemAtLocation(x, y);
+
+            if (_CaptionContainer.DisplayRectangle.Contains(x, y))
+                return _CaptionContainer.ItemAtLocation(x, y);
+
+            return null;
+        }
+
+        protected override void OnStyleChanged()
+        {
+            eDotNetBarStyle effectiveStyle = this.EffectiveStyle;
+            //if (effectiveStyle == eDotNetBarStyle.Office2010)
+            //{
+            if (_WindowIcon == null)
+            {
+                _IconSeparator = new Separator("sys_caption_separator");
+                _IconSeparator.SetSystemItem(true);
+                _IconSeparator.DesignTimeVisible = false;
+                _IconSeparator.CanCustomize = false;
+                _CaptionContainer.SubItems._Add(_IconSeparator, 0);
+                _WindowIcon = new SystemCaptionItem();
+                _WindowIcon.Name = "sys_caption_icon";
+                _WindowIcon.Enabled = false;
+                _WindowIcon.Style = this.Style;
+                _WindowIcon.IsSystemIcon = true;
+                _WindowIcon.DesignTimeVisible = false;
+                _WindowIcon.CanCustomize = false;
+                _WindowIcon.QueryIconOnPaint = true;
+                _WindowIcon.MouseDown += WindowIconMouseDown;
+                _WindowIcon.DoubleClick += WindowIconDoubleClick;
+                _WindowIcon.SetSystemItem(true);
+                _CaptionContainer.SubItems._Add(_WindowIcon, 0);
+            }
+            //}
+            //else if (effectiveStyle == eDotNetBarStyle.Windows7)
+            //{
+            //    if (_WindowIcon == null)
+            //    {
+            //        _IconSeparator = new Separator("sys_caption_separator");
+            //        _IconSeparator.FixedSize = new Size(3, 12);
+            //        _IconSeparator.SetSystemItem(true);
+            //        _IconSeparator.DesignTimeVisible = false;
+            //        _IconSeparator.CanCustomize = false;
+            //        _CaptionContainer.SubItems._Add(_IconSeparator, 0);
+            //        _WindowIcon = new SystemCaptionItem();
+            //        _WindowIcon.Name = "sys_caption_icon";
+            //        _WindowIcon.Enabled = false;
+            //        _WindowIcon.Style = this.Style;
+            //        _WindowIcon.IsSystemIcon = true;
+            //        _WindowIcon.QueryIconOnPaint = true;
+            //        _WindowIcon.DesignTimeVisible = false;
+            //        _WindowIcon.CanCustomize = false;
+            //        _WindowIcon.SetSystemItem(true);
+            //        _WindowIcon.MouseDown += WindowIconMouseDown;
+            //        _CaptionContainer.SubItems._Add(_WindowIcon, 0);
+            //    }
+            //}
+            //else if (StyleManager.IsMetro(effectiveStyle))
+            //{
+            //    if (_WindowIcon == null)
+            //    {
+            //        _IconSeparator = new Separator("sys_caption_separator");
+            //        _IconSeparator.FixedSize = new Size(3, 14);
+            //        _IconSeparator.SetSystemItem(true);
+            //        _IconSeparator.DesignTimeVisible = false;
+            //        _IconSeparator.CanCustomize = false;
+            //        _CaptionContainer.SubItems._Add(_IconSeparator, 0);
+            //        _WindowIcon = new SystemCaptionItem();
+            //        _WindowIcon.Name = "sys_caption_icon";
+            //        _WindowIcon.Enabled = false;
+            //        _WindowIcon.Style = this.Style;
+            //        _WindowIcon.IsSystemIcon = true;
+            //        _WindowIcon.DesignTimeVisible = false;
+            //        _WindowIcon.CanCustomize = false;
+            //        _WindowIcon.QueryIconOnPaint = true;
+            //        _WindowIcon.MouseDown += WindowIconMouseDown;
+            //        _WindowIcon.DoubleClick += WindowIconDoubleClick;
+            //        _WindowIcon.SetSystemItem(true);
+            //        _CaptionContainer.SubItems._Add(_WindowIcon, 0);
+            //    }
+            //}
+            //else if (_WindowIcon != null)
+            //{
+            //    if (_CaptionContainer.SubItems.Contains(_WindowIcon))
+            //        _CaptionContainer.SubItems._Remove(_WindowIcon);
+            //    _WindowIcon.MouseDown -= WindowIconMouseDown;
+            //    _WindowIcon.DoubleClick -= WindowIconDoubleClick;
+            //    _WindowIcon.Dispose();
+            //    _WindowIcon = null;
+            //    if (_CaptionContainer.SubItems.Contains(_IconSeparator))
+            //        _CaptionContainer.SubItems._Remove(_IconSeparator);
+            //    _IconSeparator.Dispose();
+            //    _IconSeparator = null;
+            //}
+            base.OnStyleChanged();
+        }
+
+        void WindowIconDoubleClick(object sender, EventArgs e)
+        {
+            if (_TabStrip != null)
+            {
+                _TabStrip.CloseParentForm();
+            }
+        }
+
+        void WindowIconMouseDown(object sender, MouseEventArgs e)
+        {
+            TabFormStripControl mts = this.ContainerControl as TabFormStripControl;
+            if (mts != null)
+            {
+                Point p = new Point(_WindowIcon.LeftInternal, _WindowIcon.Bounds.Bottom + 1);
+                p = mts.PointToScreen(p);
+                mts.ShowSystemMenu(p);
+            }
+        }
+        #endregion
+
+        #region IDesignTimeProvider Members
+
+        public InsertPosition GetInsertPosition(Point pScreen, BaseItem DragItem)
+        {
+            InsertPosition pos = _ItemContainer.GetInsertPosition(pScreen, DragItem);
+            //if (pos == null && _TabStrip.CaptionVisible)
+            //    pos = _CaptionItemsContainer.GetInsertPosition(pScreen, DragItem);
+            return pos;
+        }
+
+        public void DrawReversibleMarker(int iPos, bool Before)
+        {
+            //DesignTimeProviderContainer.DrawReversibleMarker(this, iPos, Before);
+        }
+
+        public void InsertItemAt(BaseItem objItem, int iPos, bool Before)
+        {
+            //DesignTimeProviderContainer.InsertItemAt(this, objItem, iPos, Before);
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the item is expanded or not. For Popup items this would indicate whether the item is popped up or not.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), System.ComponentModel.DefaultValue(false), System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
+        public override bool Expanded
+        {
+            get
+            {
+                return base.Expanded;
+            }
+            set
+            {
+                base.Expanded = value;
+                if (!value)
+                {
+                    foreach (BaseItem item in this.SubItems)
+                        item.Expanded = false;
+                }
+            }
+        }
+
+        /// <summary>
+        /// When parent items does recalc size for its sub-items it should query
+        /// image size and store biggest image size into this property.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden), System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+        public override System.Drawing.Size SubItemsImageSize
+        {
+            get
+            {
+                return base.SubItemsImageSize;
+            }
+            set
+            {
+                //m_SubItemsImageSize = value;
+            }
+        }
+        #endregion
+    }
+
+    // <summary>
+    /// Represents simple item container which orders items horizontally and support all ItemAlignment settings.
+    /// </summary>
+    [ToolboxItem(false), EditorBrowsable(EditorBrowsableState.Never)]
+    public class TabFormItemsSimpleContainer : SimpleItemContainer
+    {
+        public override void Paint(ItemPaintArgs p)
+        {
+            TabFormItem selectedTab = null;
+            //foreach (BaseItem item in this.SubItems)
+            for (int i = this.SubItems.Count - 1; i >= 0; i--)
+            {
+                BaseItem item = this.SubItems[i];
+                if (!item.Displayed) continue;
+                if (item.BeginGroup)
+                {
+                    DisplayHelp.DrawLine(p.Graphics, item.LeftInternal - 3, this.TopInternal + 4, item.LeftInternal - 3, this.Bounds.Bottom - 8, p.Colors.ItemSeparator, 1);
+                }
+                TabFormItem tab = item as TabFormItem;
+                if (tab != null && tab.Checked && selectedTab == null)
+                    selectedTab = tab;
+                else
+                {
+                    if (_ClippingRectangle.IsEmpty || _ClippingRectangle.IntersectsWith(item.Bounds))
+                        item.Paint(p);
+                }
+            }
+            if (selectedTab != null)
+            {
+                selectedTab.Paint(p);
+            }
+        }
+
+        public override void RecalcSize()
+        {
+            _ScrollPosition = 0;
+            base.RecalcSize();
+        }
+
+        /// <summary>
+        /// Return Sub Item at specified location
+        /// </summary>
+        public override BaseItem ItemAtLocation(int x, int y)
+        {
+            foreach (BaseItem objSub in SubItems)
+            {
+                TabFormItemBase tab = objSub as TabFormItemBase;
+                if (tab != null && tab.Visible && tab.Displayed && tab.TabPath != null)
+                {
+                    if (tab.TabPath.IsVisible(x, y))
+                        return tab;
+                }
+            }
+
+            return base.ItemAtLocation(x, y);
+        }
+
+        private NewTabFormItem _NewTabFormItem = null;
+        /// <summary>
+        /// Occurs after an item has been added to the container. This procedure is called on both item being added and the parent of the item. To distinguish between those two states check the item parameter.
+        /// </summary>
+        /// <param name="item">When occurring on the parent this will hold the reference to the item that has been added. When occurring on the item being added this will be null (Nothing).</param>
+        protected internal override void OnItemAdded(BaseItem item)
+        {
+            if (item is NewTabFormItem)
+                _NewTabFormItem = (NewTabFormItem)item;
+            else if (_NewTabFormItem != null)
+            {
+                this.SubItems._Remove(_NewTabFormItem);
+                this.SubItems._Add(_NewTabFormItem);
+            }
+            base.OnItemAdded(item);
+        }
+
+        /// <summary>
+        /// Occurs after an item has been removed.
+        /// </summary>
+        /// <param name="item">Item being removed.</param>
+        protected internal override void OnAfterItemRemoved(BaseItem item, int itemIndex)
+        {
+            if (item == _NewTabFormItem)
+                _NewTabFormItem = null;
+            base.OnAfterItemRemoved(item, itemIndex);
+        }
+
+        protected override bool IsVerticallyCentered(BaseItem item)
+        {
+            return !(item is TabFormItem);
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the item is expanded or not. For Popup items this would indicate whether the item is popped up or not.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), System.ComponentModel.DefaultValue(false), System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
+        public override bool Expanded
+        {
+            get
+            {
+                return base.Expanded;
+            }
+            set
+            {
+                base.Expanded = value;
+                if (!value)
+                {
+                    foreach (BaseItem item in this.SubItems)
+                        item.Expanded = false;
+                }
+            }
+        }
+
+        private Rectangle _ClippingRectangle;
+        public Rectangle ClippingRectangle
+        {
+            get { return _ClippingRectangle; }
+            set { _ClippingRectangle = value; }
+        }
+
+        private int _ScrollPosition = 0;
+        [System.Reflection.Obfuscation(Exclude = true)]
+        public int ScrollPosition
+        {
+            get
+            {
+                return _ScrollPosition;
+            }
+            set
+            {
+                value = Math.Min(0, value); // Must be negative number
+                if (_ScrollPosition != value)
+                {
+                    Point offset = new Point(value - _ScrollPosition, 0);
+                    _ScrollPosition = value;
+                    OffsetSubItems(offset);
+                    this.Refresh();
+                }
+            }
+        }
+
+        private void OffsetSubItems(Point offset)
+        {
+            if (offset.IsEmpty)
+                return;
+
+            BaseItem[] items = new BaseItem[this.SubItems.Count];
+            this.SubItems.CopyTo(items, 0);
+            foreach (IBlock b in items)
+            {
+                Rectangle r = b.Bounds;
+                r.Offset(offset);
+                b.Bounds = r;
+            }
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/TabbedForm/TabFormStripControl.cs b/PROMS/DotNetBar Source Code/Controls/TabbedForm/TabFormStripControl.cs
new file mode 100644
index 00000000..7afd00bc
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/TabbedForm/TabFormStripControl.cs	
@@ -0,0 +1,1642 @@
+using DevComponents.DotNetBar.Rendering;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Threading;
+using System.Windows.Forms;
+using System.Windows.Forms.VisualStyles;
+using DevComponents.DotNetBar.Metro;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    /// <summary>
+    /// Represents tabbed UI strip control.
+    /// </summary>
+    [ToolboxItem(false), ComVisible(false)]
+    public class TabFormStripControl : ItemControl
+    {
+        #region Private Variables & Constructor
+        private TabFormStripContainerItem _StripContainer = null;
+        private int _CaptionHeight = 0;
+        private bool _CaptionVisible = false;
+        private Rectangle _CaptionBounds = Rectangle.Empty;
+        private Rectangle _SystemCaptionItemBounds = Rectangle.Empty;
+        private Font _CaptionFont = null;
+        private bool _CanCustomize = true;
+        private ElementStyle _DefaultBackgroundStyle = new ElementStyle();
+        private string _TitleText = "";
+
+        public TabFormStripControl()
+        {
+            this.SetStyle(ControlStyles.StandardDoubleClick, true);
+
+            _StripContainer = new TabFormStripContainerItem(this);
+            _StripContainer.GlobalItem = false;
+            _StripContainer.ContainerControl = this;
+            _StripContainer.Displayed = true;
+            _StripContainer.SetOwner(this);
+            _StripContainer.Style = eDotNetBarStyle.StyleManagerControlled;
+            _StripContainer.CreateNewTab += StripContainerCreateNewTab;
+            this.SetBaseItemContainer(_StripContainer);
+
+            this.ColorScheme.Style = eDotNetBarStyle.Office2003;
+
+            this.AutoSize = true;
+            this.DragDropSupport = true;
+            this.AllowDrop = true;
+            this.AllowExternalDrop = true;
+
+            // Setup system caption item
+            _StripContainer.SystemCaptionItem.Click += new EventHandler(SystemCaptionClick);
+
+            StyleManager.Register(this);
+        }
+
+        void StripContainerCreateNewTab(object sender, EventArgs e)
+        {
+            if (this.Parent is TabFormControl)
+                ((TabFormControl)this.Parent).RaiseCreateNewTab(e);
+        }
+        protected override void Dispose(bool disposing)
+        {
+            StyleManager.Unregister(this);
+            base.Dispose(disposing);
+        }
+        /// <summary>
+        /// Called by StyleManager to notify control that style on manager has changed and that control should refresh its appearance if
+        /// its style is controlled by StyleManager.
+        /// </summary>
+        /// <param name="newStyle">New active style.</param>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void StyleManagerStyleChanged(eDotNetBarStyle newStyle)
+        {
+            this.Style = StyleManager.GetEffectiveStyle();
+        }
+        #endregion
+
+        #region Events
+        /// <summary>
+        /// Occurs when text markup link from TitleText markup is clicked. Markup links can be created using "a" tag, for example:
+        /// <a name="MyLink">Markup link</a>
+        /// </summary>
+        [Description("Occurs when text markup link from TitleText markup is clicked.")]
+        public event MarkupLinkClickEventHandler TitleTextMarkupLinkClick;
+        #endregion
+
+        #region Internal Implementation
+        private TextMarkup.BodyElement _TitleTextMarkup = null;
+        /// <summary>
+        /// Gets or sets the rich text displayed on Ribbon Title instead of the Form.Text property. This property supports text-markup.
+        /// You can use <font color="SysCaptionTextExtra"> markup to instruct the markup renderer to use Office 2007 system caption extra text color which
+        /// changes depending on the currently selected color table. Note that when using this property you should manage also the Form.Text property since
+        /// that is the text that will be displayed in Windows task-bar and elsewhere where system Form.Text property is used.
+        /// You can also use the hyperlinks as part of the text markup and handle the TitleTextMarkupLinkClick event to be notified when they are clicked.
+        /// </summary>
+        [Browsable(true), DefaultValue(""), Editor("DevComponents.DotNetBar.Design.TextMarkupUIEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), EditorBrowsable(EditorBrowsableState.Always), Category("Appearance"), Description("Indicates text displayed on Ribbon Title instead of the Form.Text property.")]
+        public string TitleText
+        {
+            get { return _TitleText; }
+            set
+            {
+                if (value == null) value = "";
+                _TitleText = value;
+                _TitleTextMarkup = null;
+
+                if (!TextMarkup.MarkupParser.IsMarkup(ref _TitleText))
+                    return;
+
+                _TitleTextMarkup = TextMarkup.MarkupParser.Parse(_TitleText);
+
+                if (_TitleTextMarkup != null)
+                    _TitleTextMarkup.HyperLinkClick += new EventHandler(InternalTitleTextMarkupLinkClick);
+                TitleTextMarkupLastArrangeBounds = Rectangle.Empty;
+                this.Invalidate();
+            }
+        }
+
+        /// <summary>
+        /// Occurs when text markup link is clicked.
+        /// </summary>
+        private void InternalTitleTextMarkupLinkClick(object sender, EventArgs e)
+        {
+            TextMarkup.HyperLink link = sender as TextMarkup.HyperLink;
+            if (link != null)
+            {
+                if (TitleTextMarkupLinkClick != null)
+                    TitleTextMarkupLinkClick(this, new MarkupLinkClickEventArgs(link.Name, link.HRef));
+            }
+        }
+
+        /// <summary>
+        /// Gets reference to parsed markup body element if text was markup otherwise returns null.
+        /// </summary>
+        internal TextMarkup.BodyElement TitleTextMarkupBody
+        {
+            get { return _TitleTextMarkup; }
+        }
+
+        internal Rectangle TitleTextMarkupLastArrangeBounds = Rectangle.Empty;
+
+        /// <summary>
+        /// Gets or sets whether control can be customized and items added by end-user using context menu to the quick access toolbar.
+        /// Caption of the control must be visible for customization to be enabled. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Browsable(true), Category("Customization"), Description("Indicates whether control can be customized. Caption must be visible for customization to be fully enabled.")]
+        public bool CanCustomize
+        {
+            get { return _CanCustomize; }
+            set { _CanCustomize = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the explicit height of the caption provided by control. Caption height when set is composed of the TabGroupHeight and
+        /// the value specified here. Default value is 0 which means that system default caption size is used.
+        /// </summary>
+        [Browsable(true), DefaultValue(0), Category("Appearance"), Description("Indicates explicit height of the caption provided by control")]
+        public int CaptionHeight
+        {
+            get { return _CaptionHeight; }
+            set
+            {
+                _CaptionHeight = value;
+                _StripContainer.NeedRecalcSize = true;
+            }
+        }
+
+        internal bool HasVisibleTabs
+        {
+            get
+            {
+                foreach (BaseItem item in this.Items)
+                {
+                    if (item.Visible) return true;
+                }
+                return false;
+            }
+        }
+
+        internal Rectangle CaptionBounds
+        {
+            get { return _CaptionBounds; }
+            set { _CaptionBounds = value; }
+        }
+
+        internal Rectangle SystemCaptionItemBounds
+        {
+            get { return _SystemCaptionItemBounds; }
+            set { _SystemCaptionItemBounds = value; }
+        }
+
+        internal SystemCaptionItem SystemCaptionItem
+        {
+            get { return _StripContainer.SystemCaptionItem; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether custom caption line provided by the control is visible. Default value is false.
+        /// This property should be set to true when control is used on Office2007RibbonForm.
+        /// </summary>
+        [Browsable(true), DefaultValue(false), Category("Appearance"), Description("Indicates whether custom caption line provided by the control is visible.")]
+        public bool CaptionVisible
+        {
+            get { return _CaptionVisible; }
+            set
+            {
+                _CaptionVisible = value;
+                OnCaptionVisibleChanged();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the font for the form caption text when CaptionVisible=true. Default value is NULL which means that system font is used.
+        /// </summary>
+        [Browsable(true), DefaultValue(null), Category("Appearance"), Description("")]
+        public Font CaptionFont
+        {
+            get { return _CaptionFont; }
+            set
+            {
+                _CaptionFont = value;
+                _StripContainer.NeedRecalcSize = true;
+                this.Invalidate();
+            }
+        }
+
+        private void OnCaptionVisibleChanged()
+        {
+            _StripContainer.NeedRecalcSize = true;
+            _StripContainer.OnCaptionVisibleChanged(_CaptionVisible);
+            this.RecalcLayout();
+        }
+
+        internal eDotNetBarStyle EffectiveStyle
+        {
+            get
+            {
+                return _StripContainer.EffectiveStyle;
+            }
+        }
+        /// <summary>
+        /// Gets/Sets the visual style of the control.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Category("Appearance"), Description("Specifies the visual style of the control."), DefaultValue(eDotNetBarStyle.Metro)]
+        public eDotNetBarStyle Style
+        {
+            get
+            {
+                return _StripContainer.Style;
+            }
+            set
+            {
+                this.ColorScheme.Style = value;
+                _StripContainer.Style = value;
+                this.Invalidate();
+                this.RecalcLayout();
+            }
+        }
+
+        /// <summary>
+        /// Returns collection of items on a bar.
+        /// </summary>
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content), Browsable(false)]
+        public SubItemsCollection Items
+        {
+            get
+            {
+                return _StripContainer.TabsContainer.SubItems;
+            }
+        }
+
+        /// <summary>
+        /// Returns currently selected TabFormItem. TabFormItems are selected using the Checked property. Only a single
+        /// TabFormItem can be Checked at any given time.
+        /// </summary>
+        [Browsable(false)]
+        public TabFormItem SelectedTab
+        {
+            get
+            {
+                foreach (BaseItem item in this.Items)
+                {
+                    if (item is TabFormItem && ((TabFormItem)item).Checked)
+                        return (TabFormItem)item;
+                }
+                return null;
+            }
+        }
+
+        protected override void WndProc(ref Message m)
+        {
+            if (m.Msg == (int)WinApi.WindowsMessages.WM_NCHITTEST)
+            {
+                int borderSize = Dpi.Width6;
+                // Get position being tested...
+                int x = WinApi.LOWORD(m.LParam);
+                int y = WinApi.HIWORD(m.LParam);
+                Point p = PointToClient(new Point(x, y));
+                if (IsGlassEnabled && this.CaptionVisible)
+                {
+                    Rectangle r = new Rectangle(this.Width - BarFunctions.CaptionButtonSize.Width * 3, 0, BarFunctions.CaptionButtonSize.Width * 3, BarFunctions.CaptionButtonSize.Height + 6);
+                    if (r.Contains(p))
+                    {
+                        m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.TransparentOrCovered);
+                        return;
+                    }
+
+                    r = new Rectangle(0, 0, this.Width, 4);
+                    if (r.Contains(p))
+                    {
+                        m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.TransparentOrCovered);
+                        return;
+                    }
+
+                    if (_CaptionBounds.Contains(p))
+                    {
+                        m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.TransparentOrCovered);
+                        return;
+                    }
+                }
+                else if (this.CaptionVisible && !this.IsMaximized)
+                {
+                    Rectangle r = new Rectangle(0, 0, this.Width, 4);
+                    if (r.Contains(p))
+                    {
+                        m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.TransparentOrCovered);
+                        return;
+                    }
+                }
+                else if (!SystemCaptionItem.Bounds.Contains(p))
+                {
+                    BaseItem item = HitTest(p.X, p.Y);
+                    if (item == null)
+                    {
+                        m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.TransparentOrCovered);
+                        return;
+                    }
+                }
+                else if (p.X <= borderSize || p.X >= this.Width - borderSize || p.Y <= borderSize || p.Y >= this.Height - borderSize)
+                {
+                    m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.TransparentOrCovered);
+                    return;
+                }
+                if (BarFunctions.IsWindows7 && this.IsMaximized)
+                {
+                    if (this.CaptionBounds.Contains(p))
+                    {
+                        m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.TransparentOrCovered);
+                        return;
+                    }
+                }
+            }
+
+            base.WndProc(ref m);
+        }
+
+        internal bool IsMaximized
+        {
+            get
+            {
+                Form f = this.FindForm();
+                return (f != null && f.WindowState == FormWindowState.Maximized);
+            }
+        }
+
+        /// <summary>
+        /// Returns the color scheme used by control. Color scheme for Office2007 style will be retrived from the current renderer instead of
+        /// local color scheme referenced by ColorScheme property.
+        /// </summary>
+        /// <returns>An instance of ColorScheme object.</returns>
+        protected override ColorScheme GetColorScheme()
+        {
+            BaseRenderer r = GetRenderer();
+            if (r is Office2007Renderer)
+                return ((Office2007Renderer)r).ColorTable.LegacyColors;
+            return base.GetColorScheme();
+        }
+
+        protected override void PaintControlBackground(ItemPaintArgs pa)
+        {
+            base.PaintControlBackground(pa);
+
+            _CaptionBounds = Rectangle.Empty;
+            _SystemCaptionItemBounds = Rectangle.Empty;
+
+            Rendering.BaseRenderer render = GetRenderer();
+            render.DrawTabFormStrip(new TabFormStripPainterArgs(this, pa.Graphics, pa));
+
+#if TRIAL
+            if (NativeFunctions.ColorExpAlt())
+				{
+					pa.Graphics.Clear(Color.White);
+					TextDrawing.DrawString(pa.Graphics, "Your DotNetBar trial has expired :-(", this.Font, Color.FromArgb(128, Color.Black), this.ClientRectangle, eTextFormat.HorizontalCenter | eTextFormat.VerticalCenter);
+				}
+#endif
+        }
+
+        protected override ElementStyle GetBackgroundStyle()
+        {
+            if (this.BackgroundStyle.Custom)
+                return base.GetBackgroundStyle();
+            return _DefaultBackgroundStyle;
+        }
+
+        internal void InitDefaultStyles()
+        {
+            _DefaultBackgroundStyle = new ElementStyle();
+        }
+
+        internal ElementStyle InternalGetBackgroundStyle()
+        {
+            return this.GetBackgroundStyle();
+        }
+
+        internal Rectangle GetItemContainerBounds()
+        {
+            Rectangle r = base.GetItemContainerRectangle();
+            if (_CaptionVisible)
+            {
+                r.Y += GetAbsoluteCaptionHeight();
+            }
+            else
+                r.Y += TopNormalPadding;
+            return r;
+        }
+
+        internal Rectangle GetCaptionContainerBounds()
+        {
+            Rectangle baseRect = base.GetItemContainerRectangle();
+            if (this.IsGlassEnabled)
+                baseRect.Y += 3;
+            return new Rectangle(baseRect.X, baseRect.Y, baseRect.Width, GetAbsoluteCaptionHeight());
+        }
+        /// <summary>
+        /// Returns effective caption height.
+        /// </summary>
+        /// <returns>Caption height.</returns>
+        public int GetCaptionHeight()
+        {
+            if (_CaptionHeight == 0)
+            {
+                //if (StyleManager.Style == eStyle.OfficeMobile2014 || StyleManager.Style == eStyle.Office2016)
+                    return Dpi.Height24;
+                //else
+                //    return Dpi.Height28;
+            }
+            else
+            {
+                return Dpi.Height(_CaptionHeight);
+            }
+        }
+
+        internal int GetAbsoluteCaptionHeight()
+        {
+            return GetCaptionHeight();
+        }
+
+        internal int GetTotalCaptionHeight()
+        {
+            return GetCaptionHeight();
+        }
+
+        internal override bool IsGlassEnabled
+        {
+            get
+            {
+                return false;
+            }
+        }
+
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            if (_StripContainer.NeedRecalcSize) this.RecalcSize();
+            InitDefaultStyles();
+            base.OnPaint(e);
+        }
+
+        protected override void RecalcSize()
+        {
+            _CaptionBounds = Rectangle.Empty;
+            _SystemCaptionItemBounds = Rectangle.Empty;
+            InitDefaultStyles();
+            base.RecalcSize();
+        }
+
+        /// <summary>
+        /// Returns automatically calculated height of the control given current content.
+        /// </summary>
+        /// <returns>Height in pixels.</returns>
+        public override int GetAutoSizeHeight()
+        {
+            int i = base.GetAutoSizeHeight();
+            if (!_CaptionVisible)
+                i += TopNormalPadding;
+            return i;
+        }
+
+        private int TopNormalPadding = 4;
+
+        protected override bool OnMouseWheel(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+            Rectangle r = this.DisplayRectangle;
+            r.Location = this.PointToScreen(r.Location);
+
+            TabFormControl rc = this.Parent as TabFormControl;
+
+            if (rc != null && !rc.MouseWheelTabScrollEnabled) return false;
+
+            Point mousePos = Control.MousePosition;
+
+            bool parentActive = true;
+            Form parentForm = this.FindForm();
+            if (parentForm != null && !BarFunctions.IsFormActive(parentForm))
+                parentActive = false;
+
+            if (parentActive && r.Contains(mousePos) && !this.ShowKeyTips && this.Items.Count > 0)
+            {
+                IntPtr handle = NativeFunctions.WindowFromPoint(new NativeFunctions.POINT(mousePos));
+                Control c = Control.FromChildHandle(handle);
+                if (c == null)
+                    c = Control.FromHandle(handle);
+                if (c is TabFormStripControl || c is TabFormControl || c is TabFormPanel)
+                {
+                    TabFormItem selectedTab = this.SelectedTab;
+                    int start = 0;
+                    int end = this.Items.Count - 1;
+
+                    int direction = 1;
+                    if ((wParam.ToInt64() & 0x80000000) > 0)
+                    {
+                        direction = -1;
+                        end = 0;
+                    }
+                    if (selectedTab != null)
+                    {
+                        start = this.Items.IndexOf(selectedTab) + direction;
+                        if (direction < 0 && start < 0) return false;
+
+                        if (start == this.Items.Count)
+                            start = 0;
+                        else if (start < 0)
+                            start = this.Items.Count - 1;
+                    }
+
+                    int index = start - direction;
+                    do
+                    {
+                        index += direction;
+                        if (index < 0 || index > this.Items.Count - 1) break;
+
+                        if (this.Items[index] is TabFormItem && this.Items[index].Visible)
+                        {
+                            ((TabFormItem)this.Items[index]).Checked = true;
+                            return true;
+                        }
+                    } while (index != end);
+                }
+            }
+
+            return false;
+        }
+
+        /// <summary>
+        /// Returns the collection of items with the specified name.
+        /// </summary>
+        /// <param name="ItemName">Item name to look for.</param>
+        /// <returns></returns>
+        public override ArrayList GetItems(string ItemName)
+        {
+            ArrayList list = new ArrayList(15);
+            BarFunctions.GetSubItemsByName(GetBaseItemContainer(), ItemName, list);
+
+            TabFormControl rc = this.GetTabFormControl();
+
+            if (rc != null && rc.GlobalContextMenuBar != null)
+                BarFunctions.GetSubItemsByName(rc.GlobalContextMenuBar.ItemsContainer, ItemName, list);
+
+            return list;
+        }
+
+        /// <summary>
+        /// Returns the collection of items with the specified name and type.
+        /// </summary>
+        /// <param name="ItemName">Item name to look for.</param>
+        /// <param name="itemType">Item type to look for.</param>
+        /// <returns></returns>
+        public override ArrayList GetItems(string ItemName, Type itemType)
+        {
+            ArrayList list = new ArrayList(15);
+            BarFunctions.GetSubItemsByNameAndType(GetBaseItemContainer(), ItemName, list, itemType);
+
+            TabFormControl rc = this.GetTabFormControl();
+            if (rc != null && rc.GlobalContextMenuBar != null)
+                BarFunctions.GetSubItemsByNameAndType(rc.GlobalContextMenuBar.ItemsContainer, ItemName, list, itemType);
+
+            return list;
+        }
+
+        /// <summary>
+        /// Returns the collection of items with the specified name and type.
+        /// </summary>
+        /// <param name="ItemName">Item name to look for.</param>
+        /// <param name="itemType">Item type to look for.</param>
+        /// <param name="useGlobalName">Indicates whether GlobalName property is used for searching.</param>
+        /// <returns></returns>
+        public override ArrayList GetItems(string ItemName, Type itemType, bool useGlobalName)
+        {
+            ArrayList list = new ArrayList(15);
+            BarFunctions.GetSubItemsByNameAndType(GetBaseItemContainer(), ItemName, list, itemType, useGlobalName);
+
+            TabFormControl rc = this.GetTabFormControl();
+
+            if (rc != null && rc.GlobalContextMenuBar != null)
+                BarFunctions.GetSubItemsByNameAndType(rc.GlobalContextMenuBar.ItemsContainer, ItemName, list, itemType, useGlobalName);
+
+            return list;
+        }
+
+        /// <summary>
+        /// Returns the first item that matches specified name.
+        /// </summary>
+        /// <param name="ItemName">Item name to look for.</param>
+        /// <returns></returns>
+        public override BaseItem GetItem(string ItemName)
+        {
+            BaseItem item = BarFunctions.GetSubItemByName(GetBaseItemContainer(), ItemName);
+            if (item != null)
+                return item;
+
+            TabFormControl rc = this.GetTabFormControl();
+            if (rc != null && rc.GlobalContextMenuBar != null)
+                return BarFunctions.GetSubItemByName(rc.GlobalContextMenuBar.ItemsContainer, ItemName);
+
+            return null;
+        }
+        #endregion
+
+        #region Caption Container Support
+        private bool _ShowIcon = true;
+        /// <summary>
+        /// Indicates whether Form.Icon is shown in top-left corner.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance"), Description("Indicates whether Form.Icon is shown in top-left corner.")]
+        public bool ShowIcon
+        {
+            get
+            {
+                return _ShowIcon;
+            }
+            set
+            {
+                if (_ShowIcon != value)
+                {
+                    _ShowIcon = value;
+                    _StripContainer.NeedRecalcSize = true;
+                    this.RecalcLayout();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Called when item on popup container is right-clicked.
+        /// </summary>
+        /// <param name="item">Instance of the item that is right-clicked.</param>
+        protected override void OnPopupItemRightClick(BaseItem item)
+        {
+            //TabFormControl rc = this.GetTabFormControl();
+            //if (rc != null)
+            //    rc.ShowCustomizeContextMenu(item, false);
+        }
+        //private MetroTab GetTabFormControl()
+        //{
+        //    Control parent = this.Parent;
+        //    while (parent != null && !(parent is MetroTab))
+        //        parent = parent.Parent;
+        //    if (parent is MetroTab)
+        //        return parent as MetroTab;
+        //    return null;
+        //}
+        protected override void OnMouseLeave(EventArgs e)
+        {
+            if (_TitleTextMarkup != null)
+                _TitleTextMarkup.MouseLeave(this);
+            base.OnMouseLeave(e);
+        }
+
+        internal bool MouseDownOnCaption
+        {
+            get
+            {
+                return _MouseDownOnCaption;
+            }
+        }
+
+        private TabFormControl GetTabFormControl()
+        {
+            return this.Parent as TabFormControl;
+        }
+
+        internal void ShowSystemMenu(Point p)
+        {
+            Form form = this.FindForm();
+            if (form is TabParentForm)
+                ((TabParentForm)form).ShowSystemWindowMenu(p);
+            else
+            {
+                const int TPM_RETURNCMD = 0x0100;
+                byte[] bx = BitConverter.GetBytes(p.X);
+                byte[] by = BitConverter.GetBytes(p.Y);
+                byte[] blp = new byte[] { bx[0], bx[1], by[0], by[1] };
+                int lParam = BitConverter.ToInt32(blp, 0);
+                this.Capture = false;
+                NativeFunctions.SendMessage(form.Handle, NativeFunctions.WM_SYSCOMMAND, NativeFunctions.TrackPopupMenu(
+                    NativeFunctions.GetSystemMenu(form.Handle, false), TPM_RETURNCMD, p.X, p.Y, 0, form.Handle, IntPtr.Zero), lParam);
+            }
+        }
+
+        private bool _MouseDownOnCaption = false;
+        private Point _MouseDownPoint = Point.Empty;
+        protected override void OnMouseDown(MouseEventArgs e)
+        {
+            _MouseDownOnCaption = false;
+            _MouseDownPoint = e.Location;
+            if (_CaptionVisible)
+            {
+                _MouseDownOnCaption = HitTestCaption(new Point(e.X, e.Y));
+                if (e.Button == MouseButtons.Right && _MouseDownOnCaption)
+                {
+                    ShowSystemMenu(Control.MousePosition);
+                    return;
+                }
+
+                if (_TitleTextMarkup != null)
+                    _TitleTextMarkup.MouseDown(this, e);
+
+                e = TranslateMouseEventArgs(e);
+            }
+
+            base.OnMouseDown(e);
+        }
+
+        protected override void OnMouseUp(MouseEventArgs e)
+        {
+            if (_CaptionVisible)
+            {
+                if (_TitleTextMarkup != null)
+                    _TitleTextMarkup.MouseUp(this, e);
+
+                e = TranslateMouseEventArgs(e);
+            }
+            _MouseDownOnCaption = false;
+            base.OnMouseUp(e);
+        }
+
+        //internal BaseItem GetApplicationButton()
+        //{
+        //    if (!this.CaptionVisible)
+        //        return null;
+        //    BaseItem cont = this.CaptionContainerItem;
+
+        //    if (this.EffectiveStyle == eDotNetBarStyle.Office2010 && this.Items.Count > 0 && this.Items[0] is MetroAppButton)
+        //        return this.Items[0];
+
+        //    if (cont.SubItems.Count > 0 && cont.SubItems[0] is MetroAppButton)
+        //        return cont.SubItems[0];
+
+        //    if (cont.SubItems.Count > 0 && cont.SubItems[0] is ButtonItem && ((ButtonItem)cont.SubItems[0]).HotTrackingStyle == eHotTrackingStyle.Image)
+        //        return cont.SubItems[0];
+
+        //    return null;
+        //}
+        /// <summary>
+        /// Starts moving of the parent form action which happens when user attempts to drag the form caption.
+        /// </summary>
+        public void StartFormMove()
+        {
+            Form form = this.FindForm();
+            if (form != null && form.WindowState == FormWindowState.Normal)
+            {
+                //PopupItem popup = GetApplicationButton() as PopupItem;
+                //if (popup != null && popup.Expanded) popup.Expanded = false;
+
+                const int HTCAPTION = 2;
+                Point p = Control.MousePosition;
+                byte[] bx = BitConverter.GetBytes(p.X);
+                byte[] by = BitConverter.GetBytes(p.Y);
+                byte[] blp = new byte[] { bx[0], bx[1], by[0], by[1] };
+                int lParam = BitConverter.ToInt32(blp, 0);
+                this.Capture = false;
+                NativeFunctions.SendMessage(form.Handle, NativeFunctions.WM_SYSCOMMAND, NativeFunctions.SC_MOVE + HTCAPTION, lParam);
+                _MouseDownOnCaption = false;
+            }
+        }
+        protected override void OnMouseMove(MouseEventArgs e)
+        {
+            if (_CaptionVisible)
+            {
+                if (e.Button == MouseButtons.Left && (_MouseDownOnCaption && HitTestCaption(new Point(e.X, e.Y)) || HitTest(_MouseDownPoint.X, _MouseDownPoint.Y) == null))
+                {
+                    Form form = this.FindForm();
+                    if (form != null && form.WindowState == FormWindowState.Normal)
+                    {
+                        StartFormMove();
+                        return;
+                    }
+                }
+                if (_TitleTextMarkup != null)
+                    _TitleTextMarkup.MouseMove(this, e);
+                e = TranslateMouseEventArgs(e);
+            }
+            base.OnMouseMove(e);
+        }
+
+        protected override void InternalOnClick(MouseButtons mb, Point mousePos)
+        {
+            if (_CaptionVisible)
+            {
+                MouseEventArgs e = new MouseEventArgs(mb, 0, mousePos.X, mousePos.Y, 0);
+                e = TranslateMouseEventArgs(e);
+                mousePos = new Point(e.X, e.Y);
+            }
+
+            base.InternalOnClick(mb, mousePos);
+        }
+
+        private MouseEventArgs TranslateMouseEventArgs(MouseEventArgs e)
+        {
+            if (e.Y <= 6)
+            {
+                Form form = this.FindForm();
+                if (form != null && form.WindowState == FormWindowState.Maximized && form is RibbonForm)
+                {
+                    if (e.X <= 4)
+                    {
+                        //BaseItem sb = GetApplicationButton();
+                        //if (sb != null)
+                        //{
+                        //    e = new MouseEventArgs(e.Button, e.Clicks, sb.LeftInternal + 1, sb.TopInternal + 1, e.Delta);
+                        //}
+                    }
+                    else if (e.X >= this.Width - 6)
+                        e = new MouseEventArgs(e.Button, e.Clicks, this.SystemCaptionItem.DisplayRectangle.Right - 4, this.SystemCaptionItem.DisplayRectangle.Top + 4, e.Delta);
+                    else
+                        e = new MouseEventArgs(e.Button, e.Clicks, e.X, this.CaptionContainerItem.TopInternal + 5, e.Delta);
+                }
+            }
+            return e;
+        }
+
+        protected override void OnClick(EventArgs e)
+        {
+            if (_CaptionVisible)
+            {
+                if (_TitleTextMarkup != null)
+                    _TitleTextMarkup.Click(this);
+            }
+            base.OnClick(e);
+        }
+
+        protected override void OnDoubleClick(EventArgs e)
+        {
+            if (_CaptionVisible)
+            {
+                // Check whether double click is on caption so window can be maximized/restored
+                Point p = this.PointToClient(Control.MousePosition);
+                if (HitTestCaption(p))
+                {
+                    Form form = this.FindForm();
+                    if (form != null && form.MaximizeBox && (form.FormBorderStyle == FormBorderStyle.Sizable || form.FormBorderStyle == FormBorderStyle.SizableToolWindow))
+                    {
+                        if (form.WindowState == FormWindowState.Normal)
+                        {
+                            NativeFunctions.PostMessage(form.Handle, NativeFunctions.WM_SYSCOMMAND, NativeFunctions.SC_MAXIMIZE, 0);
+                        }
+                        else if (form.WindowState == FormWindowState.Maximized)
+                        {
+                            NativeFunctions.PostMessage(form.Handle, NativeFunctions.WM_SYSCOMMAND, NativeFunctions.SC_RESTORE, 0);
+                        }
+                    }
+                }
+            }
+            base.OnDoubleClick(e);
+        }
+
+        /// <summary>
+        /// Returns true if point is inside the caption area.
+        /// </summary>
+        /// <param name="p">Client point coordinates.</param>
+        /// <returns>True if point is inside of caption area otherwise false.</returns>
+        protected bool HitTestCaption(Point p)
+        {
+            return _CaptionBounds.Contains(p);
+        }
+
+        private void SystemCaptionClick(object sender, EventArgs e)
+        {
+            SystemCaptionItem sci = sender as SystemCaptionItem;
+            Form frm = this.FindForm();
+
+            if (frm == null)
+                return;
+
+            if (sci.LastButtonClick == sci.MouseDownButton)
+            {
+                if (sci.LastButtonClick == SystemButton.Minimize)
+                {
+                    NativeFunctions.PostMessage(frm.Handle, NativeFunctions.WM_SYSCOMMAND, NativeFunctions.SC_MINIMIZE, 0);
+                }
+                else if (sci.LastButtonClick == SystemButton.Maximize)
+                {
+                    NativeFunctions.PostMessage(frm.Handle, NativeFunctions.WM_SYSCOMMAND, NativeFunctions.SC_MAXIMIZE, 0);
+                }
+                else if (sci.LastButtonClick == SystemButton.Restore)
+                {
+                    NativeFunctions.PostMessage(frm.Handle, NativeFunctions.WM_SYSCOMMAND, NativeFunctions.SC_RESTORE, 0);
+                }
+                else if (sci.LastButtonClick == SystemButton.Close)
+                {
+                    NativeFunctions.PostMessage(frm.Handle, NativeFunctions.WM_SYSCOMMAND, NativeFunctions.SC_CLOSE, 0);
+                }
+                else if (sci.LastButtonClick == SystemButton.Help)
+                {
+                    NativeFunctions.PostMessage(frm.Handle, NativeFunctions.WM_SYSCOMMAND, NativeFunctions.SC_CONTEXTHELP, 0);
+                }
+            }
+        }
+
+        internal void CloseParentForm()
+        {
+            Form frm = this.FindForm();
+
+            if (frm == null)
+                return;
+
+            NativeFunctions.PostMessage(frm.Handle, NativeFunctions.WM_SYSCOMMAND, NativeFunctions.SC_CLOSE, 0);
+        }
+
+
+        protected override void OnResize(EventArgs e)
+        {
+            base.OnResize(e);
+
+            Form frm = this.FindForm();
+            if (frm == null)
+                return;
+
+            if (frm.WindowState == FormWindowState.Maximized || frm.WindowState == FormWindowState.Minimized)
+                _StripContainer.SystemCaptionItem.RestoreEnabled = true;
+            else
+                _StripContainer.SystemCaptionItem.RestoreEnabled = false;
+        }
+
+        /// <summary>
+        /// Gets the reference to the internal container item for the items displayed in control caption.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public GenericItemContainer CaptionContainerItem
+        {
+            get { return _StripContainer.CaptionContainer; }
+        }
+
+        /// <summary>
+        /// Gets the reference to the internal container for the ribbon tabs and other items.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public SimpleItemContainer StripContainerItem
+        {
+            get { return _StripContainer.TabsContainer; }
+        }
+
+        internal TabFormStripContainerItem TabStripContainer
+        {
+            get
+            {
+                return _StripContainer;
+            }
+        }
+
+        private Cursor _FloatDragCursor = null;
+        protected override void OnGiveFeedback(GiveFeedbackEventArgs e)
+        {
+            if (e.Effect == DragDropEffects.None)
+            {
+                if (_FloatDragCursor == null) // Try to create drag cursor
+                {
+
+                }
+                if (_FloatDragCursor != null)
+                {
+                    e.UseDefaultCursors = false;
+                    Cursor.Current = _FloatDragCursor;
+                }
+            }
+            base.OnGiveFeedback(e);
+        }
+
+        protected override void OnItemDragAndDropped(BaseItem dragItem)
+        {
+            base.OnItemDragAndDropped(dragItem);
+
+            TabFormItem tab = dragItem as TabFormItem;
+            if (tab != null && tab.Enabled && tab.Visible)
+            {
+                if (tab.Checked) tab.Checked = false;
+                tab.Checked = true;
+            }
+        }
+
+        //protected override void PaintKeyTips(Graphics g)
+        //{
+        //    if (!this.ShowKeyTips)
+        //        return;
+
+        //    KeyTipsRendererEventArgs e = new KeyTipsRendererEventArgs(g, Rectangle.Empty, "", GetKeyTipFont(), null);
+
+        //    DevComponents.DotNetBar.Rendering.BaseRenderer renderer = GetRenderer();
+        //    PaintContainerKeyTips(_StripContainer.TabsContainer, renderer, e);
+        //    if (_CaptionVisible)
+        //        PaintContainerKeyTips(_StripContainer.CaptionContainer, renderer, e);
+        //}
+
+        //protected override Rectangle GetKeyTipRectangle(Graphics g, BaseItem item, Font font, string keyTip)
+        //{
+        //    Rectangle r = base.GetKeyTipRectangle(g, item, font, keyTip);
+        //    if (this.QuickToolbarItems.Contains(item))
+        //        r.Y += 4;
+        //    return r;
+        //}
+        #endregion
+
+        #region Mdi Child System Item
+        internal void ClearMDIChildSystemItems(bool bRecalcLayout)
+        {
+            if (_StripContainer.TabsContainer == null)
+                return;
+            bool recalc = false;
+            try
+            {
+                if (this.Items.Contains("dotnetbarsysiconitem"))
+                {
+                    this.Items.Remove("dotnetbarsysiconitem");
+                    recalc = true;
+                }
+                if (this.Items.Contains("dotnetbarsysmenuitem"))
+                {
+                    this.Items.Remove("dotnetbarsysmenuitem");
+                    recalc = true;
+                }
+                if (bRecalcLayout && recalc)
+                    this.RecalcLayout();
+            }
+            catch (Exception)
+            {
+            }
+        }
+
+        internal void ShowMDIChildSystemItems(System.Windows.Forms.Form objMdiChild, bool bRecalcLayout)
+        {
+            ClearMDIChildSystemItems(bRecalcLayout);
+
+            if (objMdiChild == null)
+                return;
+
+            MDISystemItem mdi = new MDISystemItem("dotnetbarsysmenuitem");
+            if (!objMdiChild.ControlBox)
+                mdi.CloseEnabled = false;
+            if (!objMdiChild.MinimizeBox)
+                mdi.MinimizeEnabled = false;
+            if (!objMdiChild.MaximizeBox)
+            {
+                mdi.RestoreEnabled = false;
+            }
+            mdi.ItemAlignment = eItemAlignment.Far;
+            mdi.Click += new System.EventHandler(this.MDISysItemClick);
+
+            this.Items.Add(mdi);
+
+            if (bRecalcLayout)
+                this.RecalcLayout();
+        }
+
+        private void MDISysItemClick(object sender, System.EventArgs e)
+        {
+            MDISystemItem mdi = sender as MDISystemItem;
+            Form frm = this.FindForm();
+            if (frm != null)
+                frm = frm.ActiveMdiChild;
+            if (frm == null)
+            {
+                ClearMDIChildSystemItems(true);
+                return;
+            }
+            if (mdi.LastButtonClick == SystemButton.Minimize)
+            {
+                NativeFunctions.PostMessage(frm.Handle, NativeFunctions.WM_SYSCOMMAND, NativeFunctions.SC_MINIMIZE, 0);
+            }
+            else if (mdi.LastButtonClick == SystemButton.Restore)
+            {
+                NativeFunctions.PostMessage(frm.Handle, NativeFunctions.WM_SYSCOMMAND, NativeFunctions.SC_RESTORE, 0);
+            }
+            else if (mdi.LastButtonClick == SystemButton.Close)
+            {
+                NativeFunctions.PostMessage(frm.Handle, NativeFunctions.WM_SYSCOMMAND, NativeFunctions.SC_CLOSE, 0);
+            }
+            else if (mdi.LastButtonClick == SystemButton.NextWindow)
+            {
+                NativeFunctions.PostMessage(frm.Handle, NativeFunctions.WM_SYSCOMMAND, NativeFunctions.SC_NEXTWINDOW, 0);
+            }
+        }
+
+        private eTabFormStripControlDock _TabAlignment = eTabFormStripControlDock.Top;
+        /// <summary>
+        /// Indiciates the appearance of the tab form items rendered on the strip
+        /// </summary>
+        [DefaultValue(eTabFormStripControlDock.Top), Category("Appearance"), Description("Indiciates the appearance of the tab form items rendered on the strip")]
+        public eTabFormStripControlDock TabAlignment
+        {
+            get { return _TabAlignment; }
+            set
+            {
+                _TabAlignment = value;
+            }
+        }
+
+        private bool _IsTabDragEnabled = true;
+
+        /// <summary>
+        /// Indicates whether end-user tab reordering is enabled, default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether end-user tab reordering is enabled.")]
+        public bool IsTabDragEnabled
+        {
+            get { return _IsTabDragEnabled; }
+            set { _IsTabDragEnabled = value; }
+        }
+
+        private bool _TabDetachEnabled = true;
+        /// <summary>
+        /// Indicates whether user can detach the tabs into the new forms using drag and drop. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether user can detach the tabs into the new forms using drag and drop. Default value is true.")]
+        public bool TabDetachEnabled
+        {
+            get { return _TabDetachEnabled; }
+            set { _TabDetachEnabled = value; }
+        }
+        #endregion
+
+        internal void InvokeMouseDown(MouseEventArgs e)
+        {
+            OnMouseDown(e);
+        }
+
+        internal void InvokeMouseMove(MouseEventArgs e)
+        {
+            OnMouseMove(e);
+        }
+
+        internal void InvokeMouseUp(MouseEventArgs e)
+        {
+            OnMouseUp(e);
+        }
+
+        internal void InvokeClick(EventArgs e)
+        {
+            OnClick(e);
+        }
+        /// <summary>
+        /// Closes specified tab.
+        /// </summary>
+        /// <param name="tab">Tab to close</param>
+        /// <param name="source">Source of the event</param>
+        public void CloseTab(TabFormItem tab, eEventSource source)
+        {
+            TabFormTabCloseEventArgs e = new TabFormTabCloseEventArgs(tab, source);
+            OnTabClosing(e);
+            if (e.Cancel) return;
+
+            // Close the tab
+            this.Items.Remove(tab);
+            Control c = tab.Panel;
+            if (c != null)
+            {
+                if (c.Parent != null)
+                    c.Parent.Controls.Remove(c);
+                c.Dispose();
+            }
+            tab.Dispose();
+
+            OnTabClosed(e);
+        }
+
+        protected override void OnItemRemoved(BaseItem item, ItemRemovedEventArgs e)
+        {
+            TabFormItem tab = item as TabFormItem;
+            if (tab != null && tab.Checked && this.Items.Count > 0)
+            {
+                bool selected = false;
+                int count = this.Items.Count;
+                int index = Math.Min(Math.Max(0, e.ItemIndex), count - 1);
+                for (int i = index; i < count; i++)
+                {
+                    TabFormItem t1 = this.Items[i] as TabFormItem;
+                    if (t1 != null && t1.Enabled && t1.Visible)
+                    {
+                        t1.Checked = true;
+                        selected = true;
+                        break;
+                    }
+                }
+                if (!selected)
+                {
+                    for (int i = index; i >= 0; i--)
+                    {
+                        TabFormItem t1 = this.Items[i] as TabFormItem;
+                        if (t1 != null && t1.Enabled && t1.Visible)
+                        {
+                            t1.Checked = true;
+                            selected = true;
+                            break;
+                        }
+                    }
+                }
+            }
+            base.OnItemRemoved(item, e);
+        }
+
+        protected override void OnItemAdded(BaseItem item, EventArgs e)
+        {
+            TabFormItem tab = item as TabFormItem;
+            if (tab != null && this.SelectedTab == null && tab.Visible && tab.Enabled)
+                tab.Checked = true;
+
+            base.OnItemAdded(item, e);
+        }
+
+        /// <summary>
+        /// Occurs before tab is closed and it allows canceling of the event.
+        /// </summary>
+        [Description("Occurs before tab is closed and it allows canceling of the event.")]
+        public event TabFormTabCloseEventHandler TabClosing;
+
+        /// <summary>
+        /// Raises RemovingToken event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnTabClosing(TabFormTabCloseEventArgs e)
+        {
+            TabFormTabCloseEventHandler handler = TabClosing;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        /// <summary>
+        /// Occurs after tab is closed.
+        /// </summary>
+        [Description("Occurs after tab is closed.")]
+        public event TabFormTabCloseEventHandler TabClosed;
+
+        /// <summary>
+        /// Raises RemovingToken event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnTabClosed(TabFormTabCloseEventArgs e)
+        {
+            TabFormTabCloseEventHandler handler = TabClosed;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        private Form _OutlineDragForm = null;
+        protected override void MouseDragOver(int x, int y, DragEventArgs dragArgs)
+        {
+            if (!DragInProgress && !ExternalDragInProgress)
+                return;
+            BaseItem dragItem = DragItem;
+            if (!(dragItem is TabFormItem) || UseNativeDragDrop || !_TabDetachEnabled)
+            {
+                base.MouseDragOver(x, y, dragArgs);
+                return;
+            }
+
+            if (ExternalDragInProgress && dragArgs != null)
+                dragItem = dragArgs.Data.GetData(typeof(ButtonItem)) as BaseItem;
+
+            if (DesignTimeProvider != null)
+            {
+                DesignTimeProvider.DrawReversibleMarker(InsertPosition, InsertBefore);
+                DesignTimeProvider = null;
+            }
+
+            if (ExternalDragInProgress && dragItem == null)
+                return;
+
+            Point pScreen = this.PointToScreen(new Point(x, y));
+            BaseItem baseItemContainer = GetBaseItemContainer();
+            InsertPosition pos = ((IDesignTimeProvider)baseItemContainer).GetInsertPosition(pScreen, dragItem);
+
+            if (pos == null || pos.TargetProvider == null)
+            {
+                Rectangle rScreen = new Rectangle(this.PointToScreen(Point.Empty), this.Size);
+                if (!rScreen.Contains(pScreen))
+                {
+                    IntPtr windowAtHandle = NativeFunctions.WindowFromPoint(new NativeFunctions.POINT(pScreen));
+                    if (windowAtHandle != IntPtr.Zero)
+                    {
+                        //Control cat = Control.FromChildHandle(windowAtHandle);
+                        //if(cat!=null)
+                        //    Console.WriteLine("{0} - {1}", cat.Name,cat);
+                        TabFormStripControl stripAt = Control.FromChildHandle(windowAtHandle) as TabFormStripControl;
+                        if (stripAt != null)
+                        {
+                            BaseItem cont = stripAt.GetBaseItemContainer();
+                            pos = ((IDesignTimeProvider)cont).GetInsertPosition(pScreen, dragItem);
+                        }
+                    }
+                }
+            }
+
+            if (pos != null && pos.TargetProvider != null)
+            {
+                DisposeOutlineDragForm();
+                pos.TargetProvider.DrawReversibleMarker(pos.Position, pos.Before);
+                InsertPosition = pos.Position;
+                InsertBefore = pos.Before;
+                DesignTimeProvider = pos.TargetProvider;
+                Cursor.Current = Cursors.Hand;
+            }
+            else
+            {
+                Cursor.Current = Cursors.Hand;
+                if (_OutlineDragForm == null)
+                {
+                    _OutlineDragForm = BarFunctions.CreateTransparentOutlineForm();
+                    _OutlineDragForm.Name = "TabFormItemDragOutline";
+                }
+                Rectangle r = new Rectangle(pScreen.X - 200 / 2, pScreen.Y - 22, 200, 150);
+                NativeFunctions.SetWindowPos(_OutlineDragForm.Handle,
+                    new IntPtr(NativeFunctions.HWND_TOP), r.X, r.Y, r.Width, r.Height, NativeFunctions.SWP_SHOWWINDOW | NativeFunctions.SWP_NOACTIVATE);
+            }
+            OnMouseDragOverProcessed(x, y, dragArgs);
+        }
+
+        protected override void MouseDragDrop(int x, int y, DragEventArgs dragArgs)
+        {
+            if (!DragInProgress && !ExternalDragInProgress)
+                return;
+            DisposeOutlineDragForm();
+            TabFormControl currentTabControl = GetTabFormControl();
+            if (x == -1 && y == -1 || !(DragItem is TabFormItem) || currentTabControl == null || !_TabDetachEnabled || DesignTimeProvider == _StripContainer.TabsContainer)
+            {
+                base.MouseDragDrop(x, y, dragArgs);
+                return;
+            }
+
+            TabFormItem dragItem = (TabFormItem)DragItem;
+            if (ExternalDragInProgress)
+                dragItem = dragArgs.Data.GetData(typeof(ButtonItem)) as TabFormItem;
+
+            if (dragItem != null)
+                dragItem.InternalMouseLeave();
+
+            if (DesignTimeProvider != null)
+                DesignTimeProvider.DrawReversibleMarker(InsertPosition, InsertBefore);
+
+            if (DesignTimeProvider != null && DesignTimeProvider != _StripContainer.TabsContainer)
+            {
+                // Moving to different form or tab strip
+                int index = currentTabControl.Items.IndexOf(dragItem);
+                currentTabControl.Items.Remove(dragItem);
+                if (dragItem.Checked)
+                {
+                    // Select some other tab
+                    if (index < currentTabControl.Items.Count)
+                    {
+                        for (int i = index; i >=0; i--)
+                        {
+                            if (currentTabControl.Items[i] is TabFormItem && currentTabControl.Items[i].Enabled &&
+                                currentTabControl.Items[i].Visible)
+                                ((TabFormItem) currentTabControl.Items[i]).Checked = true;
+                        }
+                    }
+                }
+                if (dragItem.Panel != null && dragItem.Panel.Parent != null)
+                    dragItem.Panel.Parent.Controls.Remove(dragItem.Panel);
+
+                Form formToClose = null;
+                if (currentTabControl.TabsCount == 0 && currentTabControl.IsAutoCreated)
+                    formToClose = currentTabControl.FindForm();
+                else
+                    currentTabControl.RecalcLayout();
+
+                DesignTimeProvider.InsertItemAt(dragItem, InsertPosition, InsertBefore);
+                if (dragItem.Panel != null && DesignTimeProvider is BaseItem)
+                {
+                    TabFormStripControl targetStrip =
+                        ((BaseItem)DesignTimeProvider).ContainerControl as TabFormStripControl;
+                    if (targetStrip != null && targetStrip.Parent is TabFormControl)
+                        targetStrip.Parent.Controls.Add(dragItem.Panel);
+                }
+                OnItemDragAndDropped(dragItem);
+                ((IOwner)this).InvokeUserCustomize(dragItem, new EventArgs());
+
+                if (formToClose != null)
+                {
+                    formToClose.Close();
+                }
+            }
+            else
+            {
+                if (currentTabControl.TabsCount == 1) // There is nothing to detach here just moved the form...
+                {
+                    Form form = currentTabControl.FindForm();
+                    if (form != null)
+                        form.Location = new Point(Control.MousePosition.X - form.Width / 2,
+                            Control.MousePosition.Y - Dpi.Height16);
+                }
+                else
+                {
+                    TabFormItemDetachEventArgs detachArgs = new TabFormItemDetachEventArgs(dragItem);
+                    OnBeforeTabFormItemDetach(detachArgs);
+                    if (!detachArgs.Cancel)
+                    {
+                        TabParentForm form = null;
+                        TabFormControl tabControl = null;
+                        if (detachArgs.TabForm != null && detachArgs.TabControl != null)
+                        {
+                            form = detachArgs.TabForm;
+                            tabControl = detachArgs.TabControl;
+                        }
+                        else
+                        {
+                            form = new TabParentForm();
+                            form.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+                            form.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+                            form.Text = dragItem.Text;
+                            tabControl = new TabFormControl();
+                            tabControl.IsAutoCreated = true;
+                            tabControl.Dock = DockStyle.Fill;
+                            form.Controls.Add(tabControl);
+                        }
+
+                        int index = currentTabControl.Items.IndexOf(dragItem);
+                        currentTabControl.Items.Remove(dragItem);
+                        if (dragItem.Checked)
+                        {
+                            // Select some other tab
+                            if (index < currentTabControl.Items.Count)
+                            {
+                                for (int i = index; i >= 0; i--)
+                                {
+                                    if (currentTabControl.Items[i] is TabFormItem && currentTabControl.Items[i].Enabled &&
+                                        currentTabControl.Items[i].Visible)
+                                        ((TabFormItem)currentTabControl.Items[i]).Checked = true;
+                                }
+                            }
+                        }
+                        if (dragItem.Panel != null && dragItem.Panel.Parent != null)
+                            dragItem.Panel.Parent.Controls.Remove(dragItem.Panel);
+
+                        // Its key to add panel to the new control first otherwise new form could not be moved
+                        if (dragItem.Panel != null)
+                        {
+                            tabControl.Controls.Add(dragItem.Panel);
+                            dragItem.Panel.SendToBack();
+                        }
+                        tabControl.Items.Add(dragItem);
+                        tabControl.SelectedTab = dragItem;
+                        tabControl.RecalcLayout();
+                        form.StartPosition = FormStartPosition.Manual;
+                        form.Location = new Point(Control.MousePosition.X - 800 / 2,
+                            Control.MousePosition.Y - Dpi.Height16);
+                        form.Size = new Size(800, 600);
+
+                        detachArgs.TabForm = form;
+                        detachArgs.TabControl = tabControl;
+                        OnTabFormItemDetach(detachArgs);
+                        if (MultiFormAppContext.Current!=null)
+                            MultiFormAppContext.Current.RegisterOpenForm(form);
+                        form.Show();
+
+                        ((IOwner)this).InvokeUserCustomize(dragItem, EventArgs.Empty);
+                    }
+                }
+            }
+
+            DesignTimeProvider = null;
+            DragInProgress = false;
+            ExternalDragInProgress = false;
+            Cursor.Current = Cursors.Default;
+            this.Capture = false;
+            if (dragItem != null)
+            {
+                dragItem._IgnoreClick = true;
+                dragItem.DragStartPoint = Point.Empty;
+            }
+            GetBaseItemContainer().InternalMouseUp(new MouseEventArgs(MouseButtons.Left, 0, x, y, 0));
+            if (dragItem != null)
+                dragItem._IgnoreClick = false;
+
+            DragItem = null;
+
+            //OnUserCustomize(EventArgs.Empty);
+        }
+
+        /// <summary>
+        /// Returns current number of tabs visile and hiden on the tab strip.
+        /// </summary>
+        [Browsable(false)]
+        public int TabsCount
+        {
+            get
+            {
+                int count = 0;
+                foreach (BaseItem item in Items)
+                {
+                    if (item is TabFormItem)
+                        count++;
+                }
+                return count;
+            }
+        }
+
+        /// <summary>
+        /// Indicates whether new tab item which allows creation of new tab when clicked is visible. When visible you need to handle CreateNewTab event and create your new tab in event handler.
+        /// </summary>
+        [DefaultValue(false), Category("Appearance"), Description("Indicates whether new tab item which allows creation of new tab when clicked is visible. When visible you need to handle CreateNewTab event and create your new tab in event handler.")]
+        public bool NewTabItemVisible
+        {
+            get { return _StripContainer.NewTabItemVisible; }
+            set { _StripContainer.NewTabItemVisible = value; }
+        }
+
+        /// <summary>
+        /// Occurs before TabFormItem is detached and gives you opportunity to cancel the action or provide your own new TabParentForm and TabFormControl.
+        /// </summary>
+        [Description("Occurs before TabFormItem is detached and gives you opportunity to cancel the action or provide your own new TabParentForm and TabFormControl.")]
+        public event TabFormItemDetachEventHandler BeforeTabFormItemDetach;
+
+        /// <summary>
+        /// Raises BeforeTabFormItemDetach event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnBeforeTabFormItemDetach(TabFormItemDetachEventArgs e)
+        {
+            TabFormItemDetachEventHandler handler = BeforeTabFormItemDetach;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        /// <summary>
+        /// Occurs after TabFormItem has been detached and is added to the new form and tab control.
+        /// </summary>
+        [Description("Occurs after TabFormItem has been detached and is added to the new form and tab control.")]
+        public event TabFormItemDetachEventHandler TabFormItemDetach;
+        /// <summary>
+        /// Raises TabFormItemDetach event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnTabFormItemDetach(TabFormItemDetachEventArgs e)
+        {
+            TabFormItemDetachEventHandler handler = TabFormItemDetach;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        private void DisposeOutlineDragForm()
+        {
+            if (_OutlineDragForm != null)
+            {
+                _OutlineDragForm.Close();
+                _OutlineDragForm.Dispose();
+                _OutlineDragForm = null;
+            }
+        }
+    }
+
+    /// <summary>
+    /// Defines delegate for the TabFormCloseTab event.
+    /// </summary>
+    public delegate void TabFormTabCloseEventHandler(object sender, TabFormTabCloseEventArgs e);
+
+    /// <summary>
+    /// Defines delegate for the TabFormCloseTab event.
+    /// </summary>
+    public class TabFormTabCloseEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Allows to cancel the closing of the tab.
+        /// </summary>
+        public bool Cancel = false;
+        /// <summary>
+        /// Reference to tab being closed.
+        /// </summary>
+        public readonly TabFormItem Tab;
+        /// <summary>
+        /// Source of the event.
+        /// </summary>
+        public readonly eEventSource Source;
+
+        public TabFormTabCloseEventArgs(TabFormItem tab, eEventSource source)
+        {
+            Tab = tab;
+            Source = source;
+        }
+    }
+
+    /// <summary>
+    /// Defines delegate for the TabFormItemDetach event.
+    /// </summary>
+    public delegate void TabFormItemDetachEventHandler(object sender, TabFormItemDetachEventArgs e);
+
+    /// <summary>
+    /// Defines delegate for the TabFormItemDetach event.
+    /// </summary>
+    public class TabFormItemDetachEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets or sets the reference to the form which will host newly detached TabFormItem and its panel, an instance of TabParentForm. You can provide your own instance of TabParentForm and TabControl to use instead of controls creating them. You must provide both TabParentForm and TabControl. Provide these in BeforeTabFormItemDetach event.
+        /// </summary>
+        public TabParentForm TabForm = null;
+        /// <summary>
+        /// Gets or sets the reference to TabFormControl which will receive TabFormItem being dragged. If you provide your own TabParentForm and TabControl you must provide both. Provide these in BeforeTabFormItemDetach event.
+        /// </summary>
+        public TabFormControl TabControl = null;
+        /// <summary>
+        /// Gets reference to the TabFormItem being detached.
+        /// </summary>
+        public readonly TabFormItem TabFormItem;
+        /// <summary>
+        /// Enables canceling of TabFormItem detachment from its parent.
+        /// </summary>
+        public bool Cancel = false;
+        public TabFormItemDetachEventArgs(TabFormItem tab)
+        {
+            this.TabFormItem = tab;
+        }
+    }
+
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/TabbedForm/TabFormStripPainter.cs b/PROMS/DotNetBar Source Code/Controls/TabbedForm/TabFormStripPainter.cs
new file mode 100644
index 00000000..1ca0c7c6
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/TabbedForm/TabFormStripPainter.cs	
@@ -0,0 +1,43 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Text;
+using DevComponents.DotNetBar.Controls;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    internal abstract class TabFormStripPainter
+    {
+        public abstract void Paint(TabFormStripPainterArgs renderingInfo);
+    }
+
+    public class TabFormStripPainterArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets or sets Graphics object group is rendered on.
+        /// </summary>
+        public Graphics Graphics = null;
+
+        /// <summary>
+        /// Gets or sets the reference to SwitchButtonItem being rendered.
+        /// </summary>
+        public TabFormStripControl TabFormStrip = null;
+
+        /// <summary>
+        /// Gets or sets the ItemPaintArgs reference.
+        /// </summary>
+        internal ItemPaintArgs ItemPaintArgs;
+
+        /// <summary>
+        /// Indicates whether to cancel system rendering of the item.
+        /// </summary>
+        public bool Cancel = false;
+
+        public TabFormStripPainterArgs(TabFormStripControl tabFormStrip, Graphics graphics, ItemPaintArgs itemPaintArgs)
+        {
+            Graphics = graphics;
+            TabFormStrip = tabFormStrip;
+            ItemPaintArgs = itemPaintArgs;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/TabbedForm/TabParentForm.cs b/PROMS/DotNetBar Source Code/Controls/TabbedForm/TabParentForm.cs
new file mode 100644
index 00000000..8533b6e2
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/TabbedForm/TabParentForm.cs	
@@ -0,0 +1,1321 @@
+using DevComponents.DotNetBar.Metro;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Reflection;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.Metro.Rendering;
+using DevComponents.DotNetBar.Rendering;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    public class TabParentForm : Form
+    {
+        #region System Menu Constants
+        private const string SysMenuRestore = "restore";
+        private const string SysMenuMove = "move";
+        private const string SysMenuSize = "size";
+        private const string SysMenuMinimize = "minimize";
+        private const string SysMenuMaximize = "maximize";
+        private const string SysMenuClose = "close";
+        private const string SysMenu = "sysMenu";
+        #endregion
+
+        #region Events
+        /// <summary>
+        /// Occurs before modal panel is shown and allows change of modal panel bounds.
+        /// </summary>
+        [Description("Occurs before modal panel is shown and allows change of modal panel bounds.")]
+        public event ModalPanelBoundsEventHandler PrepareModalPanelBounds;
+        /// <summary>
+        /// Raises PrepareModalPanelBounds event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnPrepareModalPanelBounds(ModalPanelBoundsEventArgs e)
+        {
+            ModalPanelBoundsEventHandler handler = PrepareModalPanelBounds;
+            if (handler != null)
+                handler(this, e);
+        }
+        #endregion
+
+        #region Constructor
+        private System.Windows.Forms.Padding GlassDefaultPadding = new System.Windows.Forms.Padding(1, 1, 1, 1); //new System.Windows.Forms.Padding(0, 1, 1, 1);
+        private System.Windows.Forms.Padding PlainDefaultPadding = new System.Windows.Forms.Padding(1, 1, 1, 1);
+        
+        /// <summary>
+        /// Initializes a new instance of the MetroForm class.
+        /// </summary>
+        public TabParentForm()
+        {
+            StyleManager.Register(this);
+            _IsGlassEnabled = WinApi.IsGlassEnabled;
+            this.ControlBox = false;
+            if (_IsGlassEnabled)
+                this.Padding = GlassDefaultPadding;
+            else
+                this.Padding = PlainDefaultPadding;
+            //_BorderOverlay = new BorderOverlay();
+            //this.Controls.Add(_BorderOverlay);
+            //UpdateBorderOverlay();
+        }
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing) StyleManager.Unregister(this);
+            base.Dispose(disposing);
+        }
+
+        /// <summary>
+        /// Called by StyleManager to notify control that style on manager has changed and that control should refresh its appearance if
+        /// its style is controlled by StyleManager.
+        /// </summary>
+        /// <param name="newStyle">New active style.</param>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void StyleManagerStyleChanged(eDotNetBarStyle newStyle)
+        {
+            UpdateColorScheme();
+        }
+
+        private void UpdateColorScheme()
+        {
+            StyleManager.UpdateMetroAmbientColors(this);
+        }
+        protected override void OnShown(EventArgs e)
+        {
+            if (this.DesignMode)
+                UpdateColorScheme();
+            else if (_PreRenderShell && _FormTabs != null)
+            {
+                using (Bitmap bmp = new Bitmap(16, 16))
+                    _FormTabs.DrawToBitmap(bmp, new Rectangle(0, 0, this.Width, this.Height));
+            }
+            base.OnShown(e);
+        }
+        private bool _PreRenderShell = true;
+        /// <summary>
+        /// Gets or sets whether MetroShell is pre-rendered when form is shown to make first rendering smoother. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool PreRenderShell
+        {
+            get { return _PreRenderShell; }
+            set { _PreRenderShell = value; }
+        }
+        protected override void OnHandleCreated(EventArgs e)
+        {
+            UpdateColorScheme();
+            base.OnHandleCreated(e);
+        }
+        #endregion
+
+        #region Implementation
+        /// <summary>
+        /// Gets whether at least one modal panel is displayed.
+        /// </summary>
+        [Browsable(false)]
+        public bool IsModalPanelDisplayed
+        {
+            get
+            {
+                return _ModalPanels.Count > 0;
+            }
+        }
+
+        private bool _ModalPanelBoundsExcludeStatusBar = false;
+        /// <summary>
+        /// Indicates whether modal panel when displayed shows MetroStatusBar.
+        /// </summary>
+        [DefaultValue(false), Category("Appearance"), Description("Indicates whether modal panel when displayed shows MetroStatusBar.")]
+        public bool ModalPanelBoundsExcludeStatusBar
+        {
+            get { return _ModalPanelBoundsExcludeStatusBar; }
+            set
+            {
+                _ModalPanelBoundsExcludeStatusBar = value;
+            }
+        }
+        
+
+        /// <summary>
+        /// Shows the panel control in the center of the form and covers all non system controls making the panel effectively modal.
+        /// </summary>
+        /// <param name="panel">Control to show.</param>
+        public void ShowModalPanel(Control panel)
+        {
+            ShowModalPanel(panel, false, eSlideSide.Left, SlidePanel.DefaultAnimationTime);
+        }
+        /// <summary>
+        /// Shows the panel control in the center of the form by sliding it in from specified side and covers all non system controls making the panel effectively modal.
+        /// </summary>
+        /// <param name="panel">Panel to show.</param>
+        /// <param name="slideFromSide">Side to slide panel into the view from.</param>
+        public void ShowModalPanel(Control panel, eSlideSide slideFromSide)
+        {
+            ShowModalPanel(panel, true, slideFromSide, SlidePanel.DefaultAnimationTime);
+        }
+        /// <summary>
+        /// Shows the panel control in the center of the form by sliding it in from specified side and covers all non system controls making the panel effectively modal.
+        /// </summary>
+        /// <param name="panel">Panel to show.</param>
+        /// <param name="slideFromSide">Side to slide panel into the view from.</param>
+        /// <param name="animationTimeMilliseconds">Slide animation speed in milliseconds.</param>
+        public void ShowModalPanel(Control panel, eSlideSide slideFromSide, int animationTimeMilliseconds)
+        {
+            ShowModalPanel(panel, true, slideFromSide, SlidePanel.DefaultAnimationTime);
+        }
+        private List<Control> _ModalPanels = new List<Control>();
+        private List<long> _DisabledItemIds = new List<long>();
+        private void ShowModalPanel(Control panel, bool slideIn, eSlideSide slideFromSide, int animationTimeMilliseconds)
+        {
+            StyleManager.UpdateAmbientColors(panel);
+
+            SlidePanel slidePanel = new SlidePanel();
+            slidePanel.CenterContent = true;
+            slidePanel.AnimationTime = animationTimeMilliseconds;
+            slidePanel.SlideSide = slideFromSide;
+            slidePanel.SlideOutButtonVisible = false;
+
+            if (slideIn)
+            {
+                slidePanel.Bounds = GetModalPanelBounds();
+                slidePanel.SlideOutOfViewSilent(this);
+            }
+            else
+            {
+                slidePanel.Bounds = GetModalPanelBounds();
+            }
+
+            slidePanel.Controls.Add(panel);
+            this.Controls.Add(slidePanel);
+            this.Controls.SetChildIndex(slidePanel, 0);
+            _ModalPanels.Add(slidePanel);
+
+            if (_ModalPanels.Count == 1 && _FormTabs != null)
+            {
+                //_FormTabs.MetroTabStrip.Enabled = false;
+                _FormTabs.TabStrip.StripContainerItem.Enabled = false;
+                for (int i = 0; i < _FormTabs.TabStrip.CaptionContainerItem.SubItems.Count; i++)
+                {
+                    BaseItem item = _FormTabs.TabStrip.CaptionContainerItem.SubItems[i];
+                    if (item.SystemItem && !(item is QatCustomizeItem)) continue;
+                    item.Enabled = false;
+                    _DisabledItemIds.Add(item.Id);
+                }
+                _FormTabs.TabStrip.Invalidate();
+            }
+
+            this.Update();
+            if (slideIn)
+                slidePanel.IsOpen = true;
+
+        }
+        /// <summary>
+        /// Hides the panel control that was previously shown using ShowModalPanel method.
+        /// </summary>
+        /// <param name="panel">Control to hide.</param>
+        public void CloseModalPanel(Control panel)
+        {
+            CloseModalPanel(panel, false, eSlideSide.Left);
+        }
+        /// <summary>
+        /// Hides the panel control that was previously shown using ShowModalPanel method by sliding it out of the view to the specified side.
+        /// </summary>
+        /// <param name="panel">Control to hide.</param>
+        /// <param name="slideOutToSide">Side to slide control into.</param>
+        public void CloseModalPanel(Control panel, eSlideSide slideOutToSide)
+        {
+            CloseModalPanel(panel, true, slideOutToSide);
+        }
+        private void CloseModalPanel(Control panel, bool slideOut, eSlideSide slideOutToSide)
+        {
+            SlidePanel slidePanel = null;
+            foreach (Control modalPanel in _ModalPanels)
+            {
+                if (modalPanel.Contains(panel))
+                {
+                    slidePanel = (SlidePanel)modalPanel;
+                    break;
+                }
+            }
+            if (slidePanel == null) throw new ArgumentException("panel was not shown previously using ShowModalPanel method");
+
+            if (slideOut)
+            {
+                slidePanel.SlideSide = slideOutToSide;
+                slidePanel.IsOpen = false;
+                DateTime start = DateTime.Now;
+                while (slidePanel.IsAnimating)
+                {
+                    Application.DoEvents();
+                    if (DateTime.Now.Subtract(start).TotalMilliseconds > 950)
+                    {
+                        slidePanel.AbortAnimation();
+                        slidePanel.Visible = false;
+                        break;
+                    }
+                }
+            }
+            else
+                slidePanel.Visible = false;
+            slidePanel.Controls.Remove(panel);
+            if (slidePanel.Parent != null)
+                slidePanel.Parent.Controls.Remove(slidePanel);
+            if (_ModalPanels.Contains(slidePanel))
+                _ModalPanels.Remove(slidePanel);
+            if(!slidePanel.IsDisposed)
+                slidePanel.Dispose();
+
+            if (_ModalPanels.Count == 0 && _FormTabs != null)
+            {
+                //_FormTabs.MetroTabStrip.Enabled = true;
+                _FormTabs.TabStrip.StripContainerItem.Enabled = true;
+                for (int i = 0; i < _FormTabs.TabStrip.CaptionContainerItem.SubItems.Count; i++)
+                {
+                    BaseItem item = _FormTabs.TabStrip.CaptionContainerItem.SubItems[i];
+                    if (item.SystemItem) continue;
+                    if(_DisabledItemIds.Contains(item.Id))
+                        item.Enabled = true;
+                }
+
+                _FormTabs.TabStrip.Refresh();
+            }
+        }
+
+        internal NonClientInfo GetNonClientInfo()
+        {
+            WinApi.RECT rect = new WinApi.RECT(0, 0, 200, 200);
+            CreateParams params1 = this.CreateParams;
+            WinApi.AdjustWindowRectEx(ref rect, params1.Style, false, params1.ExStyle);
+
+            NonClientInfo n = new NonClientInfo();
+            n.CaptionTotalHeight = Math.Abs(rect.Top);
+            n.BottomBorder = rect.Height - 200 - n.CaptionTotalHeight;
+            n.LeftBorder = Math.Abs(rect.Left);
+            n.RightBorder = rect.Width - 200 - n.LeftBorder;
+
+            return n;
+        }
+
+        private void UpdateModalPanelsSize()
+        {
+            foreach (Control modalPanel in _ModalPanels)
+            {
+                modalPanel.Bounds = GetModalPanelBounds();
+                if (this.WindowState == FormWindowState.Maximized)
+                {
+                    NonClientInfo nci = GetNonClientInfo();
+                    modalPanel.Padding = new System.Windows.Forms.Padding(nci.LeftBorder + 1);
+                }
+                else
+                    modalPanel.Padding = new System.Windows.Forms.Padding();
+            }
+        }
+        private Rectangle GetModalPanelBounds()
+        {
+            Thickness borderThickness = GetBorderThickness();
+
+            int statusBarHeight = 0;
+            if (_ModalPanelBoundsExcludeStatusBar)
+            {
+                foreach (Control item in this.Controls)
+                {
+                    if (item is MetroStatusBar && item.Dock == DockStyle.Bottom)
+                    {
+                        statusBarHeight = item.Height;
+                        break;
+                    }
+                }
+            }
+
+            Rectangle bounds = Rectangle.Empty;
+            if (_FormTabs != null && _FormTabs.CaptionVisible)
+            {
+                int captionHeight = _FormTabs.TabStrip.GetCaptionHeight() + 2;
+                bounds = new Rectangle((int)borderThickness.Left, captionHeight, this.Width - (int)borderThickness.Horizontal, this.Height - captionHeight - (int)borderThickness.Bottom - statusBarHeight);
+            }
+            else
+            {
+                bounds = new Rectangle((int)borderThickness.Left, (int)borderThickness.Top, this.Width - (int)borderThickness.Horizontal, this.Height - (int)borderThickness.Vertical - statusBarHeight);
+            }
+
+            ModalPanelBoundsEventArgs args = new ModalPanelBoundsEventArgs(bounds);
+            OnPrepareModalPanelBounds(args);
+            bounds = args.ModalPanelBounds;
+
+            return bounds;
+        }
+
+        private bool _IsGlassEnabled = false;
+        /// <summary>
+        /// Returns whether Windows Glass effects are enabled.
+        /// </summary>
+        [Browsable(false)]
+        public bool IsGlassEnabled
+        {
+            get
+            {
+                return _IsGlassEnabled;
+            }
+        }
+        private void UpdateIsGlassEnabled()
+        {
+            bool glassEnabled = WinApi.IsGlassEnabled;
+            if (glassEnabled != _IsGlassEnabled)
+            {
+                _IsGlassEnabled = glassEnabled;
+                OnGlassEnabledChanged();
+            }
+        }
+        private void OnGlassEnabledChanged()
+        {
+            if (_IsGlassEnabled)
+                this.Padding = GlassDefaultPadding;
+            else
+                this.Padding = PlainDefaultPadding;
+            if (_IsGlassEnabled && this.Region != null)
+                this.Region = null;
+            else
+                this.Region = GetPlainFormRegion();
+            this.Refresh();
+        }
+        private Region GetPlainFormRegion()
+        {
+            Region reg = new Region(new Rectangle(0, 0, this.Width, this.Height));
+            return reg;
+        }
+
+        private TabFormControl _FormTabs = null;
+        /// <summary>
+        /// Gets or sets the TabFormControl that is hosted by this form. This property is for internal use only.
+        /// </summary>
+        [Browsable(false)]
+        public virtual TabFormControl FormTabsControl
+        {
+            get { return _FormTabs; }
+            internal set
+            {
+                _FormTabs = value;
+            }
+        }
+
+        protected override void OnStyleChanged(EventArgs e)
+        {
+            UpdateSystemCaptionItem();
+            base.OnStyleChanged(e);
+        }
+
+        protected override void OnControlAdded(ControlEventArgs e)
+        {
+            if (e.Control is TabFormControl)
+            {
+                _FormTabs = e.Control as TabFormControl;
+                UpdateSystemCaptionItem();
+            }
+            base.OnControlAdded(e);
+        }
+
+        protected override void OnControlRemoved(ControlEventArgs e)
+        {
+            if (e.Control == _FormTabs)
+            {
+                _FormTabs = null;
+            }
+            base.OnControlRemoved(e);
+        }
+
+        private bool _Sizable = true;
+        /// <summary>
+        /// Gets or sets whether form can be resized.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether form can be resized.")]
+        public bool Sizable
+        {
+            get { return _Sizable; }
+            set { _Sizable = value; }
+        }
+
+        /// <summary>
+        /// Gets effective Border Thickness for the form.
+        /// </summary>
+        /// <returns>Thickness</returns>
+        public Thickness GetBorderThickness()
+        {
+            if (!_BorderThickness.IsZero) return _BorderThickness;
+            TabFormColorTable ct = GetFormColorTable();
+
+            return ct.BorderThickness;
+        }
+
+        private TabFormColorTable GetFormColorTable()
+        {
+            if (_FormTabs != null && _FormTabs.ColorTable != null)
+                return _FormTabs.ColorTable;
+            Office2007ColorTable table = ((Office2007Renderer) GlobalManager.Renderer).ColorTable;
+            return table.TabForm;
+        }
+
+        private Thickness _BorderThickness = new Thickness();
+        /// <summary>
+        /// Gets or sets the form border thickness. Default value is empty thickness which indicates that thickness is taken from color table.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates form border thickness.")]
+        public Thickness BorderThickness
+        {
+            get { return _BorderThickness; }
+            set
+            {
+                if (value != _BorderThickness)
+                {
+                    Thickness oldValue = _BorderThickness;
+                    _BorderThickness = value;
+                    OnBorderThicknessChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when BorderThickness property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnBorderThicknessChanged(Thickness oldValue, Thickness newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("BorderThickness"));
+            this.Invalidate();
+        }
+
+        private BorderColors _BorderColor;
+        /// <summary>
+        /// Gets or sets the form border colors.
+        /// </summary>
+        public BorderColors BorderColor
+        {
+            get { return _BorderColor; }
+            set
+            {
+                if (value != _BorderColor)
+                {
+                    BorderColors oldValue = _BorderColor;
+                    _BorderColor = value;
+                    OnBorderColorChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when BorderColor property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnBorderColorChanged(BorderColors oldValue, BorderColors newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("BorderColor"));
+            this.Invalidate();
+        }
+
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            if (!_IsGlassEnabled && this.Region == null)
+                this.Region = GetPlainFormRegion();
+            Office2007Renderer renderer = GetRenderer();
+            Graphics g = e.Graphics;
+            renderer.DrawTabParentForm(new TabFormPainterArgs(this, g));
+            base.OnPaint(e);
+        }
+
+        private Office2007Renderer GetRenderer()
+        {
+            return ((Office2007Renderer) GlobalManager.Renderer);
+        }
+
+        protected override void OnActivated(EventArgs e)
+        {
+            ExtendGlass();
+            this.Invalidate();
+            base.OnActivated(e);
+        }
+
+        protected override void OnDeactivate(EventArgs e)
+        {
+            this.Invalidate();
+            base.OnDeactivate(e);
+        }
+
+        private void ExtendGlass()
+        {
+            if (!WinApi.IsGlassEnabled) return;
+
+            WinApi.MARGINS m = new WinApi.MARGINS();
+            m.cyTopHeight = 0;
+            m.cxLeftWidth = 0;
+            m.cxRightWidth = 0;
+            m.cyBottomHeight = NativeFunctions.IsTerminalSession() ? 0 : 1;
+            WinApi.DwmExtendFrameIntoClientArea(this.Handle, ref m);
+        }
+
+        protected virtual bool WindowsMessageSetText(ref Message m)
+        {
+            if (WinApi.IsGlassEnabled) return true;
+
+            bool modified = WinApi.ModifyHwndStyle(m.HWnd, (int)WinApi.WindowStyles.WS_VISIBLE, 0);
+
+            base.DefWndProc(ref m);
+
+            if (_FormTabs != null) _FormTabs.Refresh();
+            if (modified)
+            {
+                WinApi.ModifyHwndStyle(m.HWnd, 0, (int)WinApi.WindowStyles.WS_VISIBLE);
+            }
+            return false;
+        }
+        protected virtual bool WindowsMessageWindowsPosChanged(ref Message m)
+        {
+            if (this.WindowState == FormWindowState.Minimized || this.WindowState == FormWindowState.Maximized)
+            {
+                _TrackSetBoundsCore = true;
+                base.WndProc(ref m);
+                _TrackSetBoundsCore = true;
+                return false;
+            }
+            return true;
+        }
+        protected override void WndProc(ref Message m)
+        {
+            bool callBase = true;
+            if (!PreProcessWndProc(ref m))
+                return;
+
+            if (m.Msg == (int)WinApi.WindowsMessages.WM_NCCALCSIZE)
+            {
+                callBase = WindowsMessageNCCalcSize(ref m);
+            }
+            else if (m.Msg == (int)WinApi.WindowsMessages.WM_NCACTIVATE)
+            {
+                callBase = WindowsMessageNCActivate(ref m);
+            }
+            else if (m.Msg == (int)WinApi.WindowsMessages.WM_DWMCOMPOSITIONCHANGED)
+            {
+                callBase = WindowsMessageDwmCompositionChanged(ref m);
+            }
+            else if (m.Msg == (int)WinApi.WindowsMessages.WM_NCHITTEST)
+            {
+                callBase = WindowsMessageNCHitTest(ref m);
+            }
+            else if (m.Msg == (int)WinApi.WindowsMessages.WM_SETTEXT)
+            {
+                callBase = WindowsMessageSetText(ref m);
+            }
+            else if (m.Msg == (int)WinApi.WindowsMessages.WM_NCPAINT)
+            {
+                callBase = WindowsMessageNCPaint(ref m);
+            }
+            else if (m.Msg == (int)WinApi.WindowsMessages.WM_ERASEBKGND)
+            {
+                if (!WinApi.IsGlassEnabled)
+                {
+                    callBase = false;
+                    m.Result = new IntPtr(1);
+                }
+            }
+            else if (m.Msg == (int)WinApi.WindowsMessages.WM_SETICON)
+            {
+                callBase = WindowsMessageSetIcon(ref m);
+            }
+            else if (m.Msg == (int)WinApi.WindowsMessages.WM_SETTEXT)
+            {
+                callBase = WindowsMessageSetText(ref m);
+            }
+            else if (m.Msg == (int)WinApi.WindowsMessages.WM_SETCURSOR)
+            {
+                callBase = WindowsMessageSetCursor(ref m);
+            }
+            else if (m.Msg == (int)WinApi.WindowsMessages.WM_WINDOWPOSCHANGED)
+            {
+                callBase = WindowsMessageWindowsPosChanged(ref m);
+            }
+
+            if (callBase)
+                base.WndProc(ref m);
+        }
+        protected virtual bool WindowsMessageSetCursor(ref Message m)
+        {
+            // Button down on client area while there is a modal form displayed
+            if (!_IsActive && (WinApi.HIWORD(m.LParam) == (int)WinApi.WindowsMessages.WM_LBUTTONUP || WinApi.HIWORD(m.LParam) == (int)WinApi.WindowsMessages.WM_LBUTTONDOWN) && WinApi.LOWORD(m.LParam) == (int)WinApi.WindowHitTestRegions.Error ||
+                !this.Enabled || BarUtilities.IsModalFormOpen)
+                return true;
+
+            bool modified = WinApi.ModifyHwndStyle(m.HWnd, (int)WinApi.WindowStyles.WS_VISIBLE, 0);
+
+            base.DefWndProc(ref m);
+
+            if (_FormTabs != null && this.DesignMode) _FormTabs.Refresh();
+            if (modified)
+            {
+                WinApi.ModifyHwndStyle(m.HWnd, 0, (int)WinApi.WindowStyles.WS_VISIBLE);
+            }
+
+            return false;
+        }
+        protected virtual bool WindowsMessageSetIcon(ref Message m)
+        {
+            bool modified = WinApi.ModifyHwndStyle(m.HWnd, (int)WinApi.WindowStyles.WS_VISIBLE, 0);
+
+            base.DefWndProc(ref m);
+
+            if (_FormTabs != null) _FormTabs.Refresh();
+            if (modified)
+            {
+                WinApi.ModifyHwndStyle(m.HWnd, 0, (int)WinApi.WindowStyles.WS_VISIBLE);
+            }
+
+            return false;
+        }
+
+        protected virtual bool WindowsMessageNCPaint(ref Message m)
+        {
+            if (WinApi.IsGlassEnabled)
+            {
+                return true;
+            }
+            else
+            {
+                m.Result = IntPtr.Zero;
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// Called when WM_NCHITTEST message is received.
+        /// </summary>
+        /// <param name="m">Reference to message data.</param>
+        /// <returns>Return true to call base form implementation otherwise return false.</returns>
+        protected virtual bool WindowsMessageNCHitTest(ref Message m)
+        {
+            // Get position being tested...
+            int x = WinApi.LOWORD(m.LParam);
+            int y = WinApi.HIWORD(m.LParam);
+            Point p = PointToClient(new Point(x, y));
+
+            Thickness borderResize = FormResizeBorder;
+            if (this.Sizable && !borderResize.IsZero && this.WindowState == FormWindowState.Normal)
+            {
+                Rectangle hitTest = new Rectangle(0, 0, (int)borderResize.Left, (int)borderResize.Top); hitTest.Inflate(1, 1);
+                if (hitTest.Contains(p))
+                {
+                    m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.TopLeftSizeableCorner);
+                    return false;
+                }
+                hitTest = new Rectangle(this.Width - (int)borderResize.Right, 0, (int)borderResize.Right, (int)borderResize.Top); hitTest.Inflate(1, 1);
+                if (hitTest.Contains(p))
+                {
+                    m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.TopRightSizeableCorner);
+                    return false;
+                }
+                hitTest = new Rectangle(this.Width - (int)borderResize.Right, this.Height - (int)borderResize.Bottom, (int)borderResize.Right, (int)borderResize.Bottom); hitTest.Inflate(2, 2);
+                if (hitTest.Contains(p))
+                {
+                    m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.BottomRightSizeableCorner);
+                    return false;
+                }
+                hitTest = new Rectangle(0, this.Height - (int)borderResize.Bottom, (int)borderResize.Left, (int)borderResize.Bottom); hitTest.Inflate(1, 1);
+                if (hitTest.Contains(p))
+                {
+                    m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.BottomLeftSizeableCorner);
+                    return false;
+                }
+
+                hitTest = new Rectangle(0, 0, (int)borderResize.Left, this.Height);
+                if (hitTest.Contains(p))
+                {
+                    m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.LeftSizeableBorder);
+                    return false;
+                }
+                hitTest = new Rectangle(0, 0, this.Width, (int)borderResize.Top);
+                if (hitTest.Contains(p))
+                {
+                    m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.TopSizeableBorder);
+                    return false;
+                }
+                hitTest = new Rectangle(this.Width - (int)borderResize.Right, 0, (int)borderResize.Right, this.Height);
+                if (hitTest.Contains(p))
+                {
+                    m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.RightSizeableBorder);
+                    return false;
+                }
+
+                hitTest = new Rectangle(0, this.Height - (int)borderResize.Bottom, this.Width, (int)borderResize.Bottom);
+                if (hitTest.Contains(p))
+                {
+                    m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.BottomSizeableBorder);
+                    return false;
+                }
+            }
+
+            TabFormControl tab = _FormTabs;
+            //if (tab != null)
+            //{
+            //    Rectangle r = new Rectangle((RightToLeft == RightToLeft.No ? (int)borderResize.Left : this.Width - (int)borderResize.Right - 24), (int)borderResize.Left, 24, 24);
+            //    if (r.Contains(p))
+            //    {
+            //        m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.Menu);
+            //        return false;
+            //    }
+            //}
+
+            if (/*BarFunctions.IsWindows7 && this.WindowState == FormWindowState.Maximized &&*/ tab != null)
+            {
+                p = tab.TabStrip.PointToClient(new Point(x, y));
+                if (tab.TabStrip.CaptionBounds.Contains(p) || tab.TabStrip.HitTest(p.X, p.Y) == null)
+                {
+                    m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.TitleBar);
+                    return false;
+                }
+            }
+
+
+            return true;
+        }
+
+        /// <summary>
+        /// Called when WM_DWMCOMPOSITIONCHANGED message is received.
+        /// </summary>
+        /// <param name="m">Reference to message data.</param>
+        /// <returns>Return true to call base form implementation otherwise return false.</returns>
+        protected virtual bool WindowsMessageDwmCompositionChanged(ref Message m)
+        {
+            UpdateIsGlassEnabled();
+            ExtendGlass();
+            return true;
+        }
+
+        private bool _IsActive = false;
+        /// <summary>
+        /// Gets whether form is active.
+        /// </summary>
+        [Browsable(false)]
+        public bool IsActive
+        {
+            get { return _IsActive; }
+            internal set
+            {
+                if (_IsActive != value)
+                {
+                    _IsActive = value;
+                    OnIsActiveChanged();
+                }
+            }
+        }
+        private void OnIsActiveChanged()
+        {
+            if (_FormTabs != null)
+                _FormTabs.TabStrip.Invalidate(_FormTabs.TabStrip.CaptionBounds);
+        }
+
+        /// <summary>
+        /// Called when WM_NCACTIVATE message is received.
+        /// </summary>
+        /// <param name="m">Reference to message data.</param>
+        /// <returns>Return true to call base form implementation otherwise return false.</returns>
+        protected virtual bool WindowsMessageNCActivate(ref Message m)
+        {
+            if (m.WParam != IntPtr.Zero)
+                IsActive = true;
+            else
+                IsActive = false;
+
+            m.Result = WinApi.DefWindowProc(m.HWnd, WinApi.WindowsMessages.WM_NCACTIVATE, m.WParam, new IntPtr(-1));
+            if (this.DesignMode)
+                RefreshAll();
+
+            return false;
+        }
+        private void RefreshAll()
+        {
+            if (this.IsHandleCreated)
+            {
+                this.Invalidate(true);
+                this.Refresh();
+            }
+        }
+
+        protected override void OnTextChanged(EventArgs e)
+        {
+            if (this.DesignMode)
+            {
+                if (_FormTabs != null) _FormTabs.Refresh();
+            }
+            base.OnTextChanged(e);
+        }
+
+        private bool _Minimized = false;
+        private bool _Maximized = false;
+        private bool _ChangingSize = false;
+        protected override void OnResize(EventArgs e)
+        {
+            if (!_IsGlassEnabled)
+            {
+                this.Region = GetPlainFormRegion();
+                this.Invalidate();
+            }
+
+            UpdateModalPanelsSize();
+            
+            base.OnResize(e);
+        }
+
+        private bool _TrackSetBoundsCore = false;
+        protected override void SetBoundsCore(int x, int y, int width, int height, BoundsSpecified specified)
+        {
+            if (_TrackSetBoundsCore ||
+                this.DesignMode && ((specified & BoundsSpecified.Height) == BoundsSpecified.Height || (specified & BoundsSpecified.Width) == BoundsSpecified.Width))
+            {
+                if (width != this.Width || height != this.Height)
+                {
+                    AdjustBounds(ref width, ref height, specified);
+                }
+                _TrackSetBoundsCore = false;
+            }
+            //else if ((specified & BoundsSpecified.Width) == BoundsSpecified.None)
+            //{
+            //    specified |= BoundsSpecified.Width;
+            //    AdjustBounds(ref width, ref height, specified);
+            //}
+
+            base.SetBoundsCore(x, y, width, height, specified);
+        }
+
+        protected virtual void AdjustBounds(ref int width, ref int height)
+        {
+            AdjustBounds(ref width, ref height, BoundsSpecified.Width | BoundsSpecified.Height);
+        }
+        protected virtual void AdjustBounds(ref int width, ref int height, BoundsSpecified specified)
+        {
+            WinApi.RECT rect = new WinApi.RECT(0, 0, width, height);
+            CreateParams params1 = this.CreateParams;
+            WinApi.AdjustWindowRectEx(ref rect, params1.Style, false, params1.ExStyle);
+
+            if ((specified & BoundsSpecified.Height) == BoundsSpecified.Height)
+            {
+                height -= (rect.Height - height);
+                //if (IsGlassEnabled)
+                //{
+                //    if (this.FormBorderStyle == FormBorderStyle.FixedDialog)
+                //        height += SystemInformation.FixedFrameBorderSize.Height;
+                //    else if (this.FormBorderStyle == FormBorderStyle.Fixed3D)
+                //        height += SystemInformation.FixedFrameBorderSize.Height;
+                //    else if (this.FormBorderStyle == FormBorderStyle.FixedSingle)
+                //        height += 1;
+                //    else if (this.FormBorderStyle == FormBorderStyle.FixedToolWindow)
+                //        height += SystemInformation.FixedFrameBorderSize.Height;
+                //    else
+                //        height += SystemInformation.FrameBorderSize.Height /* * NativeFunctions.BorderMultiplierFactor*/;
+                //}
+            }
+
+            if ((specified & BoundsSpecified.Width) == BoundsSpecified.Width)
+            {
+                width -= (rect.Width - width);
+            }
+        }
+        protected override void SetClientSizeCore(int x, int y)
+        {
+            if (!this.DesignMode)
+            {
+                this.Size = new Size(x, y);
+
+                Type type = typeof(Control);
+                try // try with ignore catch is bad idea but in this case its for future proofing, just in case M$ removes these members
+                {
+                    type.InvokeMember("clientWidth", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.SetField, null, this, new object[] { x });
+                    type.InvokeMember("clientHeight", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.SetField, null, this, new object[] { y });
+                }
+                catch { }
+                OnClientSizeChanged(EventArgs.Empty);
+                return;
+            }
+            base.SetClientSizeCore(x, y);
+        }
+        private FormWindowState GetWindowState()
+        {
+            WinApi.WINDOWPLACEMENT wp = new WinApi.WINDOWPLACEMENT();
+            if (WinApi.GetWindowPlacement(this.Handle, out wp))
+            {
+                if (wp.showCmd == (int)WinApi.ShowWindowCommands.Maximize)
+                    return FormWindowState.Maximized;
+                else if (wp.showCmd == (int)WinApi.ShowWindowCommands.Minimize)
+                    return FormWindowState.Minimized;
+                else if (wp.showCmd == (int)WinApi.ShowWindowCommands.Normal)
+                    return FormWindowState.Normal;
+            }
+
+            return this.WindowState;
+        }
+        /// <summary>
+        /// Called when WM_NCCALCSIZE message is received.
+        /// </summary>
+        /// <param name="m">Message structure.</param>
+        /// <returns>true to call base WndProc otherwise false.</returns>
+        protected virtual bool WindowsMessageNCCalcSize(ref Message m)
+        {
+            // Default implementation of ribbon form does not have non-client area at all...
+            if (m.WParam != IntPtr.Zero && GetWindowState() == FormWindowState.Maximized)
+            {
+                WinApi.NCCALCSIZE_PARAMS csp;
+                csp = (WinApi.NCCALCSIZE_PARAMS)Marshal.PtrToStructure(m.LParam, typeof(WinApi.NCCALCSIZE_PARAMS));
+                NonClientInfo nci = GetNonClientInfo();
+                Size reduction = new Size(nci.LeftBorder, nci.BottomBorder); //SystemInformation.FrameBorderSize;
+                Size frameBorderSize = reduction;
+                if (reduction.Width > 2)
+                    reduction.Width -= reduction.Width - 2;
+                if (reduction.Height > 2)
+                    reduction.Height -= reduction.Height - 2;
+
+                WinApi.WINDOWPOS pos = (WinApi.WINDOWPOS)Marshal.PtrToStructure(csp.lppos, typeof(WinApi.WINDOWPOS));
+                //Console.WriteLine(pos);
+                WinApi.RECT newClientRect = WinApi.RECT.FromRectangle(new Rectangle(pos.x + frameBorderSize.Width - 1, pos.y + reduction.Height,
+                    pos.cx - frameBorderSize.Width * 2 + 3, pos.cy - frameBorderSize.Height - 1));
+                if (_AutoHideTaskBarReduction > 0)
+                {
+                    Taskbar taskBar = new Taskbar();
+                    if (taskBar.AutoHide)
+                    {
+                        if (taskBar.Position == TaskbarPosition.Bottom)
+                            newClientRect.Bottom -= _AutoHideTaskBarReduction;
+                        else if (taskBar.Position == TaskbarPosition.Top)
+                        {
+                            newClientRect.Bottom -= _AutoHideTaskBarReduction;
+                            newClientRect.Top += _AutoHideTaskBarReduction;
+                        }
+                        else if (taskBar.Position == TaskbarPosition.Left)
+                        {
+                            newClientRect.Right -= _AutoHideTaskBarReduction;
+                            newClientRect.Left += _AutoHideTaskBarReduction;
+                        }
+                        else if (taskBar.Position == TaskbarPosition.Right)
+                            newClientRect.Right -= _AutoHideTaskBarReduction;
+                    }
+                }
+
+                csp.rgrc0 = newClientRect;
+                csp.rgrc1 = newClientRect;
+                Marshal.StructureToPtr(csp, m.LParam, false);
+                m.Result = new IntPtr((int)WinApi.WindowsMessages.WVR_VALIDRECTS);
+                this.Invalidate();
+                return false;
+            }
+
+            m.Result = IntPtr.Zero;
+            this.Invalidate();
+            return false;
+        }
+        private int _AutoHideTaskBarReduction = 4;
+        /// <summary>
+        /// Indicates the number of pixels subtracted from form's height or width (depending on taskbar position) when form is maximized and taskbar is in auto-hide state. Default value is 4.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public int AutoHideTaskBarReduction
+        {
+            get { return _AutoHideTaskBarReduction; }
+            set { _AutoHideTaskBarReduction = value; }
+        }
+        private bool PreProcessWndProc(ref Message m)
+        {
+            return true;
+        }
+
+        /// <summary>
+        /// This property is not to be used with MetroForm.
+        /// </summary>
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public new FormBorderStyle FormBorderStyle
+        {
+            get { return base.FormBorderStyle; }
+            set { base.FormBorderStyle = value; }
+        }
+
+        private Thickness _FormResizeBorder = new Thickness(5);
+        /// <summary>
+        /// Gets or sets the size of the border on the edges of the form that when mouse is over allow for form resizing.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public Thickness FormResizeBorder
+        {
+            get { return _FormResizeBorder; }
+            set { _FormResizeBorder = value; }
+        }
+
+        private void UpdateSystemCaptionItem()
+        {
+            SystemCaptionItem captionItem = GetSystemCaptionItem();
+            if (captionItem != null)
+            {
+                captionItem.MinimizeVisible = this.MinimizeBox;
+                captionItem.RestoreMaximizeVisible = this.MaximizeBox;
+                captionItem.CloseVisible = this.CloseBoxVisible;
+                captionItem.HelpVisible = this.HelpButton;
+                if (!this.MaximizeBox && !this.MinimizeBox && !this.CloseBoxVisible)
+                    captionItem.Visible = false;
+                else
+                    captionItem.Visible = true;
+                if (_FormTabs != null)
+                    _FormTabs.RecalcLayout();
+            }
+        }
+        private SystemCaptionItem GetSystemCaptionItem()
+        {
+            if (_FormTabs != null)
+            {
+                return _FormTabs.TabStrip.SystemCaptionItem;
+            }
+            return null;
+        }
+
+        private bool _CloseBoxVisible = true;
+        /// <summary>
+        /// Indicates whether Close button in top-right corner of the form is visible.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance"), Description("Indicates whether Close button in top-right corner of the form is visible.")]
+        public bool CloseBoxVisible
+        {
+            get { return _CloseBoxVisible; }
+            set { _CloseBoxVisible = value; UpdateSystemCaptionItem(); }
+        }
+
+        /// <summary>
+        /// This property cannot be used on MetroAppForm
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override bool AutoScroll
+        {
+            get
+            {
+                return base.AutoScroll;
+            }
+            set
+            {
+                if (value) value = false;
+                base.AutoScroll = value;
+            }
+        }
+        /// <summary>
+        /// This property cannot be used on MetroAppForm
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override Point AutoScrollOffset
+        {
+            get
+            {
+                return base.AutoScrollOffset;
+            }
+            set
+            {
+                base.AutoScrollOffset = value;
+            }
+        }
+        /// <summary>
+        /// This property cannot be used on MetroAppForm
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public new Size AutoScrollMargin
+        {
+            get
+            {
+                return base.AutoScrollMargin;
+            }
+            set
+            {
+                base.AutoScrollMargin = value;
+            }
+        }
+        /// <summary>
+        /// This property cannot be used on MetroAppForm
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public new Size AutoScrollMinSize
+        {
+            get
+            {
+                return base.AutoScrollMinSize;
+            }
+            set
+            {
+                base.AutoScrollMinSize = value;
+            }
+        }
+
+
+        protected override void ScaleControl(SizeF factor, BoundsSpecified specified)
+        {
+            Dpi.SetScaling(factor);
+            base.ScaleControl(factor, specified);
+        }
+ 
+
+        #endregion
+
+        #region System Menu Handling
+        private ContextMenuBar _ContextMenuBar = null;
+        internal void ShowSystemWindowMenu(Point p)
+        {
+            if (this.DesignMode) return;
+            CreateContextMenuBar();
+
+            // Update items enabled state
+            ButtonItem sysMenu = ((ButtonItem)_ContextMenuBar.Items[SysMenu]);
+            sysMenu.SubItems[SysMenuRestore].Enabled = this.WindowState != FormWindowState.Normal;
+            sysMenu.SubItems[SysMenuMove].Enabled = this.WindowState == FormWindowState.Normal;
+            sysMenu.SubItems[SysMenuSize].Enabled = this.WindowState == FormWindowState.Normal && this.Sizable;
+            sysMenu.SubItems[SysMenuMinimize].Enabled = this.WindowState != FormWindowState.Minimized && this.MinimizeBox; ;
+            sysMenu.SubItems[SysMenuMaximize].Enabled = this.WindowState != FormWindowState.Maximized && this.Sizable && this.MaximizeBox; ;
+            sysMenu.SubItems[SysMenuClose].Enabled = true;
+
+            sysMenu.Popup(p);
+        }
+        internal void ShowSystemWindowMenu()
+        {
+            ShowSystemWindowMenu(Control.MousePosition);
+        }
+
+        private string GetLocalizedString(string key)
+        {
+            string text = "";
+            if (key == LocalizationKeys.FormSystemMenuRestore)
+                text = _SystemMenuRestore;
+            else if (key == LocalizationKeys.FormSystemMenuMove)
+                text = _SystemMenuMove;
+            else if (key == LocalizationKeys.FormSystemMenuSize)
+                text = _SystemMenuSize;
+            else if (key == LocalizationKeys.FormSystemMenuMinimize)
+                text = _SystemMenuMinimize;
+            else if (key == LocalizationKeys.FormSystemMenuMaximize)
+                text = _SystemMenuMaximize;
+            else if (key == LocalizationKeys.FormSystemMenuClose)
+                text = _SystemMenuClose;
+
+            return LocalizationManager.GetLocalizedString(key, text);
+        }
+        private void CreateContextMenuBar()
+        {
+            if (_ContextMenuBar != null || this.DesignMode) return;
+            _ContextMenuBar = new ContextMenuBar();
+            _ContextMenuBar.Style = eDotNetBarStyle.StyleManagerControlled;
+            this.Controls.Add(_ContextMenuBar);
+
+            ButtonItem sysMenu = new ButtonItem(SysMenu);
+            _ContextMenuBar.Items.Add(sysMenu);
+            ButtonItem sysItem = new ButtonItem(SysMenuRestore, GetLocalizedString(LocalizationKeys.FormSystemMenuRestore));
+            sysItem.Image = BarFunctions.LoadBitmap("SystemImages.WinRestore.png");
+            sysItem.Click += new EventHandler(SysItemClick);
+            sysMenu.SubItems.Add(sysItem);
+            sysItem = new ButtonItem(SysMenuMove, GetLocalizedString(LocalizationKeys.FormSystemMenuMove));
+            sysItem.Click += new EventHandler(SysItemClick);
+            sysMenu.SubItems.Add(sysItem);
+            sysItem = new ButtonItem(SysMenuSize, GetLocalizedString(LocalizationKeys.FormSystemMenuSize));
+            sysItem.Click += new EventHandler(SysItemClick);
+            sysMenu.SubItems.Add(sysItem);
+            sysItem = new ButtonItem(SysMenuMinimize, GetLocalizedString(LocalizationKeys.FormSystemMenuMinimize));
+            sysItem.Click += new EventHandler(SysItemClick);
+            sysItem.Image = BarFunctions.LoadBitmap("SystemImages.WinMin.png");
+            sysMenu.SubItems.Add(sysItem);
+            sysItem = new ButtonItem(SysMenuMaximize, GetLocalizedString(LocalizationKeys.FormSystemMenuMaximize));
+            sysItem.Click += new EventHandler(SysItemClick);
+            sysItem.Image = BarFunctions.LoadBitmap("SystemImages.WinMax.png");
+            sysMenu.SubItems.Add(sysItem);
+            sysItem = new ButtonItem(SysMenuClose, GetLocalizedString(LocalizationKeys.FormSystemMenuClose));
+            sysItem.Click += new EventHandler(SysItemClick);
+            sysItem.Image = BarFunctions.LoadBitmap("SystemImages.WinClose.png");
+            sysItem.BeginGroup = true;
+            sysItem.FontBold = true;
+            sysItem.HotFontBold = true;
+            sysItem.Shortcuts.Add(eShortcut.CtrlF4);
+            sysMenu.SubItems.Add(sysItem);
+        }
+
+        void SysItemClick(object sender, EventArgs e)
+        {
+            BaseItem item = sender as BaseItem;
+            if (item == null) return;
+            if (item.Name == SysMenuRestore)
+                NativeFunctions.PostMessage(this.Handle, NativeFunctions.WM_SYSCOMMAND, NativeFunctions.SC_RESTORE, 0);
+            else if (item.Name == SysMenuMove)
+                NativeFunctions.PostMessage(this.Handle, NativeFunctions.WM_SYSCOMMAND, NativeFunctions.SC_MOVE, 0);
+            else if (item.Name == SysMenuSize)
+                NativeFunctions.PostMessage(this.Handle, NativeFunctions.WM_SYSCOMMAND, NativeFunctions.SC_SIZE, 0);
+            else if (item.Name == SysMenuMinimize)
+                NativeFunctions.PostMessage(this.Handle, NativeFunctions.WM_SYSCOMMAND, NativeFunctions.SC_MINIMIZE, 0);
+            else if (item.Name == SysMenuMaximize)
+                NativeFunctions.PostMessage(this.Handle, NativeFunctions.WM_SYSCOMMAND, NativeFunctions.SC_MAXIMIZE, 0);
+            else if (item.Name == SysMenuClose)
+                NativeFunctions.PostMessage(this.Handle, NativeFunctions.WM_SYSCOMMAND, NativeFunctions.SC_CLOSE, 0);
+
+        }
+
+        private string _SystemMenuRestore = "Restore";
+        /// <summary>
+        /// Gets or sets text for form system menu Restore item.
+        /// </summary>
+        [DefaultValue("Restore"), Description("Indicates text for form system menu Restore item."), Localizable(true), Category("System Menu")]
+        public string SystemMenuRestore
+        {
+            get { return _SystemMenuRestore; }
+            set { _SystemMenuRestore = value; }
+        }
+        private string _SystemMenuMove = "Move";
+        /// <summary>
+        /// Gets or sets text for form system menu Move item.
+        /// </summary>
+        [DefaultValue("Move"), Description("Indicates text for form system menu Move item."), Localizable(true), Category("System Menu")]
+        public string SystemMenuMove
+        {
+            get { return _SystemMenuMove; }
+            set { _SystemMenuMove = value; }
+        }
+        private string _SystemMenuSize = "Size";
+        /// <summary>
+        /// Gets or sets text for form system menu Size item.
+        /// </summary>
+        [DefaultValue("Size"), Description("Indicates text for form system menu Size item."), Localizable(true), Category("System Menu")]
+        public string SystemMenuSize
+        {
+            get { return _SystemMenuSize; }
+            set { _SystemMenuSize = value; }
+        }
+        private string _SystemMenuMinimize = "Minimize";
+        /// <summary>
+        /// Gets or sets text for form system menu Minimize item.
+        /// </summary>
+        [DefaultValue("Minimize"), Description("Indicates text for form system menu Minimize item."), Localizable(true), Category("System Menu")]
+        public string SystemMenuMinimize
+        {
+            get { return _SystemMenuMinimize; }
+            set { _SystemMenuMinimize = value; }
+        }
+        private string _SystemMenuMaximize = "Maximize";
+        /// <summary>
+        /// Gets or sets text for form system menu Maximize item.
+        /// </summary>
+        [DefaultValue("Maximize"), Description("Indicates text for form system menu Maximize item."), Localizable(true), Category("System Menu")]
+        public string SystemMenuMaximize
+        {
+            get { return _SystemMenuMaximize; }
+            set { _SystemMenuMaximize = value; }
+        }
+        private string _SystemMenuClose = "Close";
+        /// <summary>
+        /// Gets or sets text for form system menu Close item.
+        /// </summary>
+        [DefaultValue("Close"), Description("Indicates text for form system menu Close item."), Localizable(true), Category("System Menu")]
+        public string SystemMenuClose
+        {
+            get { return _SystemMenuClose; }
+            set { _SystemMenuClose = value; }
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/TextBoxDropDown.cs b/PROMS/DotNetBar Source Code/Controls/TextBoxDropDown.cs
new file mode 100644
index 00000000..dee29461
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/TextBoxDropDown.cs	
@@ -0,0 +1,1812 @@
+#if FRAMEWORK20
+using System;
+using System.Text;
+using System.ComponentModel;
+using System.Drawing;
+using DevComponents.Editors;
+using System.Windows.Forms;
+using System.Drawing.Drawing2D;
+using System.Collections;
+using System.Drawing.Design;
+using System.Security.Permissions;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    /// <summary>
+    /// Represents single line text box control with the drop down button to display custom control on popup and additional custom buttons. 
+    /// </summary>
+    [ToolboxBitmap(typeof(TextBoxDropDown), "Controls.TextBoxDropDown.ico"), ToolboxItem(true), DefaultProperty("Text"), DefaultBindingProperty("Text"), DefaultEvent("TextChanged"), Designer("DevComponents.DotNetBar.Design.TextBoxDropDownDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+    public class TextBoxDropDown : PopupItemControl, IInputButtonControl, ICommandSource
+    {
+        #region Private Variables
+        private TextBoxX _TextBox = null;
+        private ButtonItem _PopupItem = null;
+        private static string _DropDownItemContainerName = "sysPopupItemContainer";
+        private static string _DropDownControlContainerName = "sysPopupControlContainer";
+        private Color _FocusHighlightColor = ColorScheme.GetColor(0xFFFF88);
+        private bool _FocusHighlightEnabled = false;
+        #endregion
+
+        #region Events
+        /// <summary>
+        /// Occurs when Clear button is clicked and allows you to cancel the default action performed by the button.
+        /// </summary>
+        public event CancelEventHandler ButtonClearClick;
+        /// <summary>
+        /// Occurs when Drop-Down button that shows popup is clicked and allows you to cancel showing of the popup.
+        /// </summary>
+        public event CancelEventHandler ButtonDropDownClick;
+        /// <summary>
+        /// Occurs when ButtonCustom control is clicked.
+        /// </summary>
+        public event EventHandler ButtonCustomClick;
+        /// <summary>
+        /// Occurs when ButtonCustom2 control is clicked.
+        /// </summary>
+        public event EventHandler ButtonCustom2Click;
+        /// <summary>
+        /// Occurs when the text alignment is changed.
+        /// </summary>
+        [Description("Occurs when the text alignment is changed.")]
+        public event EventHandler TextAlignChanged;
+        /// <summary>
+        /// Occurs when the value of the Modified property has changed.
+        /// </summary>
+        public event EventHandler ModifiedChanged;
+
+        /// <summary>
+        /// Occurs before the popup is opened and it allows canceling of popup by setting CancelEventArgs.Cancel=true.
+        /// </summary>
+        [Description("Occurs before the popup is opened and it allows canceling of popup by setting CancelEventArgs.Cancel=true.")]
+        public event CancelEventHandler BeforePopupOpen;
+        /// <summary>
+        /// Raises BeforeMultiColumnPopupOpen event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnBeforePopupOpen(CancelEventArgs e)
+        {
+            CancelEventHandler handler = BeforePopupOpen;
+            if (handler != null)
+                handler(this, e);
+        }
+        #endregion
+
+        #region Constructor
+        /// <summary>
+        /// Initializes a new instance of the TextBoxDropDown class.
+        /// </summary>
+        public TextBoxDropDown()
+        {
+            this.SetStyle(ControlStyles.Selectable, false);
+            _TextBox = new TextBoxX();
+            base.BackColor = SystemColors.Window;
+            InitControl();
+        }
+        private void InitControl()
+        {
+            _BackgroundStyle.SetColorScheme(this.ColorScheme);
+            _BackgroundStyle.StyleChanged += new EventHandler(this.VisualPropertyChanged);
+
+            _ButtonCustom = new InputButtonSettings(this);
+            _ButtonCustom2 = new InputButtonSettings(this);
+            _ButtonClear = new InputButtonSettings(this);
+            _ButtonDropDown = new InputButtonSettings(this);
+            CreateButtonGroup();
+
+            _TextBox.BorderStyle = BorderStyle.None;
+            _TextBox.TextChanged += new EventHandler(TextBoxTextChanged);
+            _TextBox.TextAlignChanged += new EventHandler(TextBoxTextAlignChanged);
+            _TextBox.SizeChanged += new EventHandler(TextBoxSizeChanged);
+            _TextBox.ModifiedChanged += new EventHandler(TextBoxModifiedChanged);
+            _TextBox.KeyPress += new KeyPressEventHandler(TextBoxKeyPress);
+            _TextBox.KeyDown += new KeyEventHandler(TextBoxKeyDown);
+            this.Controls.Add(_TextBox);
+        }
+        #endregion
+
+        #region Internal Implementation
+        private bool _AutoSelectAll = false;
+        /// <summary>
+        /// Indicates whether all text is auto-selected when control gets input focus. Default value is false.
+        /// </summary>
+        [DefaultValue(false), Category("Behavior"), Description("Indicates whether all text is auto-selected when control gets input focus.")]
+        public bool AutoSelectAll
+        {
+            get { return _AutoSelectAll; }
+            set { _AutoSelectAll = value; }
+        }
+
+        protected override void OnBindingContextChanged(EventArgs e)
+        {
+            if (_DropDownControl != null) _DropDownControl.BindingContext = this.BindingContext;
+            base.OnBindingContextChanged(e);
+        }
+        protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
+        {
+            if (keyData == Keys.F4)
+            {
+                if (_PopupItem.Expanded)
+                    CloseDropDown();
+                else
+                    InvokeShowDropDown();
+                return true;
+            }
+            else if (keyData == Keys.Escape && this.IsPopupOpen)
+            {
+                CloseDropDown();
+                return true;
+            }
+            else if (_ButtonGroup.ProcessCmdKey(ref msg, keyData))
+                return true;
+            return base.ProcessCmdKey(ref msg, keyData);
+        }
+
+        void TextBoxKeyPress(object sender, KeyPressEventArgs e)
+        {
+            if (_InternalReadOnly) e.Handled = true;
+        }
+        void TextBoxKeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode == Keys.Down && e.Modifiers == Keys.Alt)
+            {
+                if (ButtonDropDown.Visible)
+                {
+                    InvokeShowDropDown();
+                    e.Handled = true;
+                }
+            }
+        }
+
+        private void TextBoxModifiedChanged(object sender, EventArgs e)
+        {
+            OnModifiedChanged(e);
+        }
+        protected virtual void OnModifiedChanged(EventArgs e)
+        {
+            EventHandler handler = ModifiedChanged;
+            if (handler != null)
+            {
+                handler(this, e);
+            }
+        }
+
+        private void TextBoxSizeChanged(object sender, EventArgs e)
+        {
+            if (!_InternalSizeUpdate)
+                UpdateLayout();
+        }
+
+        private void TextBoxTextChanged(object sender, EventArgs e)
+        {
+            base.Text = _TextBox.Text;
+            ExecuteCommand();
+        }
+
+        private void TextBoxTextAlignChanged(object sender, EventArgs e)
+        {
+            OnTextAlignChanged(e);
+        }
+        /// <summary>
+        /// Raises the TextAlignChanged event.
+        /// </summary>
+        protected virtual void OnTextAlignChanged(EventArgs e)
+        {
+            EventHandler eh = TextAlignChanged;
+            if (eh != null)
+                eh(this, e);
+        }
+
+        protected override void OnEnabledChanged(EventArgs e)
+        {
+            if (!this.Enabled)
+                _TextBox.ResetBackColor();
+            else if (_TextBox.BackColor != this.BackColor)
+                _TextBox.BackColor = this.BackColor;
+
+            base.OnEnabledChanged(e);
+        }
+
+        private Color _OldBackColor = Color.Empty;
+        protected override void OnEnter(EventArgs e)
+        {
+            if (_FocusHighlightEnabled)
+            {
+                _OldBackColor = this.BackColor;
+                this.BackColor = _FocusHighlightColor;
+            }
+            if (_AutoSelectAll)
+                _TextBox.SelectAll();
+            base.OnEnter(e);
+        }
+
+        protected override void OnLeave(EventArgs e)
+        {
+            if (_FocusHighlightEnabled && !_OldBackColor.IsEmpty)
+            {
+                this.BackColor = _OldBackColor;
+                if (_OldBackColor == SystemColors.Window)
+                    _TextBox.ResetBackColor();
+                _OldBackColor = Color.Empty;
+            }
+            base.OnLeave(e);
+        }
+
+        protected override bool QueryPopupCloseMouseDown()
+        {
+            Point p = this.PointToClient(MousePosition);
+            if(this.ClientRectangle.Contains(p))
+                return false;
+            return base.QueryPopupCloseMouseDown();
+        }
+        /// <summary>
+        /// Gets or sets whether FocusHighlightColor is used as background color to highlight text box when it has input focus. Default value is false.
+        /// </summary>
+        [DefaultValue(false), Browsable(true), Category("Appearance"), Description("Indicates whether FocusHighlightColor is used as background color to highlight text box when it has input focus.")]
+        public bool FocusHighlightEnabled
+        {
+            get { return _FocusHighlightEnabled; }
+            set
+            {
+                if (_FocusHighlightEnabled != value)
+                {
+                    _FocusHighlightEnabled = value;
+                    //_TextBox.FocusHighlightEnabled = value;
+                    if (this.Focused)
+                        this.Invalidate(true);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the color used as background color to highlight text box when it has input focus and focus highlight is enabled.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), Description("Indicates color used as background color to highlight text box when it has input focus and focus highlight is enabled.")]
+        public Color FocusHighlightColor
+        {
+            get { return _FocusHighlightColor; }
+            set
+            {
+                if (_FocusHighlightColor != value)
+                {
+                    _FocusHighlightColor = value;
+                    _TextBox.FocusHighlightColor = value;
+                    if (this.Focused)
+                        this.Invalidate(true);
+                }
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeFocusHighlightColor()
+        {
+            return !_FocusHighlightColor.Equals(ColorScheme.GetColor(0xFFFF88));
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetFocusHighlightColor()
+        {
+            FocusHighlightColor = ColorScheme.GetColor(0xFFFF88);
+        }
+
+        private ElementStyle _BackgroundStyle = new ElementStyle();
+        /// <summary>
+        /// Specifies the background style of the control.
+        /// </summary>
+        [Category("Style"), Description("Gets or sets control background style."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ElementStyle BackgroundStyle
+        {
+            get { return _BackgroundStyle; }
+        }
+
+        /// <summary>
+        /// Resets style to default value. Used by windows forms designer.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetBackgroundStyle()
+        {
+            _BackgroundStyle.StyleChanged -= new EventHandler(this.VisualPropertyChanged);
+            _BackgroundStyle = new ElementStyle();
+            _BackgroundStyle.StyleChanged += new EventHandler(this.VisualPropertyChanged);
+            this.Invalidate();
+        }
+
+        private void VisualPropertyChanged(object sender, EventArgs e)
+        {
+            OnVisualPropertyChanged();
+        }
+
+        protected virtual void OnVisualPropertyChanged()
+        {
+            _ButtonGroup.InvalidateArrange();
+            this.Invalidate();
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            if (_BackgroundStyle != null) _BackgroundStyle.StyleChanged -= new EventHandler(VisualPropertyChanged);
+            base.Dispose(disposing);
+        }
+
+        private InputButtonSettings _ButtonDropDown = null;
+        /// <summary>
+        /// Gets the object that describes the settings for the button that shows drop-down when clicked.
+        /// </summary>
+        [Category("Buttons"), Description("Describes the settings for the button that shows drop-down when clicked."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public InputButtonSettings ButtonDropDown
+        {
+            get
+            {
+                return _ButtonDropDown;
+            }
+        }
+
+        private InputButtonSettings _ButtonClear = null;
+        /// <summary>
+        /// Gets the object that describes the settings for the button that clears the content of the control when clicked.
+        /// </summary>
+        [Category("Buttons"), Description("Describes the settings for the button that clears the content of the control when clicked."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public InputButtonSettings ButtonClear
+        {
+            get
+            {
+                return _ButtonClear;
+            }
+        }
+
+
+        private InputButtonSettings _ButtonCustom = null;
+        /// <summary>
+        /// Gets the object that describes the settings for the custom button that can execute an custom action of your choosing when clicked.
+        /// </summary>
+        [Category("Buttons"), Description("Describes the settings for the custom button that can execute an custom action of your choosing when clicked."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public InputButtonSettings ButtonCustom
+        {
+            get
+            {
+                return _ButtonCustom;
+            }
+        }
+
+        private InputButtonSettings _ButtonCustom2 = null;
+        /// <summary>
+        /// Gets the object that describes the settings for the custom button that can execute an custom action of your choosing when clicked.
+        /// </summary>
+        [Category("Buttons"), Description("Describes the settings for the custom button that can execute an custom action of your choosing when clicked."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public InputButtonSettings ButtonCustom2
+        {
+            get
+            {
+                return _ButtonCustom2;
+            }
+        }
+
+
+        void IInputButtonControl.InputButtonSettingsChanged(InputButtonSettings inputButtonSettings)
+        {
+            OnInputButtonSettingsChanged(inputButtonSettings);
+        }
+
+        protected virtual void OnInputButtonSettingsChanged(InputButtonSettings inputButtonSettings)
+        {
+            UpdateButtons();
+        }
+
+        private VisualGroup _ButtonGroup = null;
+        private void UpdateButtons()
+        {
+            RecreateButtons();
+            _ButtonGroup.InvalidateArrange();
+            this.Invalidate();
+        }
+
+        internal VisualGroup ButtonGroup
+        {
+            get { return (_ButtonGroup); }
+        }
+
+        protected virtual void RecreateButtons()
+        {
+            VisualItem[] buttons = CreateOrderedButtonList();
+            // Remove all system buttons that are already in the list
+            VisualGroup group = _ButtonGroup;
+            VisualItem[] items = new VisualItem[group.Items.Count];
+            group.Items.CopyTo(items);
+            foreach (VisualItem item in items)
+            {
+                if (item.ItemType == eSystemItemType.SystemButton)
+                {
+                    group.Items.Remove(item);
+                    if (item == _ButtonCustom.ItemReference)
+                        item.MouseUp -= new MouseEventHandler(CustomButtonMouseUp);
+                    else if (item == _ButtonCustom2.ItemReference)
+                        item.MouseUp -= new MouseEventHandler(CustomButton2MouseUp);
+                }
+            }
+
+            // Add new buttons to the list
+            group.Items.AddRange(buttons);
+        }
+
+        private void CustomButtonMouseUp(object sender, MouseEventArgs e)
+        {
+            if (_ButtonCustom.ItemReference.RenderBounds.Contains(e.X, e.Y))
+                OnButtonCustomClick(e);
+        }
+
+        protected virtual void OnButtonCustomClick(EventArgs e)
+        {
+            if (ButtonCustomClick != null)
+                ButtonCustomClick(this, e);
+        }
+
+        private void CustomButton2MouseUp(object sender, MouseEventArgs e)
+        {
+            if (_ButtonCustom2.ItemReference.RenderBounds.Contains(e.X, e.Y))
+                OnButtonCustom2Click(e);
+        }
+
+        protected virtual void OnButtonCustom2Click(EventArgs e)
+        {
+            if (ButtonCustom2Click != null)
+                ButtonCustom2Click(this, e);
+        }
+
+        private VisualItem[] CreateOrderedButtonList()
+        {
+            SortedList list = CreateSortedButtonList();
+
+            VisualItem[] items = new VisualItem[list.Count];
+            list.Values.CopyTo(items, 0);
+
+            return items;
+        }
+
+        private void CustomButtonClick(object sender, EventArgs e)
+        {
+            OnButtonCustomClick(e);
+        }
+        private void CustomButton2Click(object sender, EventArgs e)
+        {
+            OnButtonCustom2Click(e);
+        }
+        private void ClearButtonClick(object sender, EventArgs e)
+        {
+            ClearButtonClick();
+        }
+        protected virtual SortedList CreateSortedButtonList()
+        {
+            SortedList list = new SortedList(4);
+            if (_ButtonCustom.Visible)
+            {
+                VisualItem button = CreateButton(_ButtonCustom);
+                if (_ButtonCustom.ItemReference != null)
+                {
+                    _ButtonCustom.ItemReference.MouseUp -= CustomButtonMouseUp;
+                    _ButtonCustom.ItemReference.Click -= CustomButtonClick;
+                }
+                _ButtonCustom.ItemReference = button;
+                button.Click += CustomButtonClick;
+                button.MouseUp += CustomButtonMouseUp;
+                button.Enabled = _ButtonCustom.Enabled;
+                list.Add(_ButtonCustom, button);
+            }
+
+            if (_ButtonCustom2.Visible)
+            {
+                VisualItem button = CreateButton(_ButtonCustom2);
+                if (_ButtonCustom.ItemReference != null)
+                {
+                    _ButtonCustom.ItemReference.MouseUp -= CustomButton2MouseUp;
+                    _ButtonCustom.ItemReference.Click -= CustomButton2Click;
+                }
+                _ButtonCustom2.ItemReference = button;
+                button.Click += CustomButton2Click;
+                button.MouseUp += CustomButton2MouseUp;
+                button.Enabled = _ButtonCustom2.Enabled;
+                list.Add(_ButtonCustom2, button);
+            }
+
+            if (_ButtonClear.Visible)
+            {
+                VisualItem button = CreateButton(_ButtonClear);
+                if (_ButtonClear.ItemReference != null)
+                {
+                    _ButtonClear.ItemReference.MouseUp -= ClearButtonMouseUp;
+                    _ButtonClear.ItemReference.Click -= ClearButtonClick;
+                }
+                _ButtonClear.ItemReference = button;
+                button.MouseUp += ClearButtonMouseUp;
+                button.Click += ClearButtonClick;
+                list.Add(_ButtonClear, button);
+            }
+
+            if (_ButtonDropDown.Visible)
+            {
+                VisualItem button = CreateButton(_ButtonDropDown);
+                if (_ButtonDropDown.ItemReference != null)
+                {
+                    _ButtonDropDown.ItemReference.MouseDown -= DropDownButtonMouseDown;
+                    _ButtonDropDown.ItemReference.Click -= DropDownButtonClick;
+                }
+                _ButtonDropDown.ItemReference = button;
+                button.MouseDown += DropDownButtonMouseDown;
+                button.Click += DropDownButtonClick;
+                list.Add(_ButtonDropDown, button);
+            }
+
+            return list;
+        }
+
+        private void DropDownButtonClick(object sender, EventArgs e)
+        {
+            if (e is KeyEventArgs) // Only if invoked through keyboard shortcut
+            {
+                if (_PopupItem.Expanded)
+                    CloseDropDown();
+                else
+                    InvokeShowDropDown();
+            }
+        }
+
+        protected virtual VisualItem CreateButton(InputButtonSettings buttonSettings)
+        {
+            VisualItem item = null;
+
+            if (buttonSettings == _ButtonDropDown)
+            {
+                item = new VisualDropDownButton();
+                ApplyButtonSettings(buttonSettings, item as VisualButton);
+            }
+            else
+            {
+                item = new VisualCustomButton();
+                ApplyButtonSettings(buttonSettings, item as VisualButton);
+            }
+
+            VisualButton button = item as VisualButton;
+            button.ClickAutoRepeat = false;
+
+            if (buttonSettings == _ButtonClear)
+            {
+                if (buttonSettings.Image == null && string.IsNullOrEmpty(buttonSettings.Text))
+                {
+                    //if (Dpi.Factor.Width > 1)
+                        button.Symbol = "\uf00d";
+                    //else
+                    //    button.Image = DevComponents.DotNetBar.BarFunctions.LoadBitmap("SystemImages.DateReset.png");
+                }
+            }
+
+            return item;
+        }
+
+        protected virtual void ApplyButtonSettings(InputButtonSettings buttonSettings, VisualButton button)
+        {
+            button.Text = buttonSettings.Text;
+            button.Image = buttonSettings.Image;
+            button.ItemType = eSystemItemType.SystemButton;
+            button.Enabled = buttonSettings.Enabled;
+            button.Shortcut = buttonSettings.Shortcut;
+            button.Tooltip = buttonSettings.Tooltip;
+            button.Symbol = buttonSettings.Symbol;
+            button.SymbolSet = buttonSettings.SymbolSet;
+            button.SymbolColor = buttonSettings.SymbolColor;
+        }
+
+        private void CreateButtonGroup()
+        {
+            VisualGroup group = new VisualGroup();
+            group.HorizontalItemSpacing = 0;
+            group.ArrangeInvalid += new EventHandler(ButtonGroupArrangeInvalid);
+            group.RenderInvalid += new EventHandler(ButtonGroupRenderInvalid);
+            group.ResetMouseHover += ButtonGroupResetMouseHover;
+            _ButtonGroup = group;
+        }
+
+        private void ButtonGroupRenderInvalid(object sender, EventArgs e)
+        {
+            Invalidate();
+        }
+
+        private void ButtonGroupArrangeInvalid(object sender, EventArgs e)
+        {
+            Invalidate();
+        }
+
+        private void ButtonGroupResetMouseHover(object sender, EventArgs e)
+        {
+            DevComponents.AdvTree.Interop.WinApi.ResetHover(this);
+        }
+
+        private bool _MouseOver = false;
+        private PaintInfo CreatePaintInfo(Graphics g)
+        {
+            PaintInfo p = new PaintInfo();
+            p.Graphics = g;
+            p.DefaultFont = this.Font;
+            p.ForeColor = this.ForeColor;
+            p.RenderOffset = new System.Drawing.Point();
+            Size s = this.Size;
+            bool disposeStyle = false;
+            ElementStyle style = GetBackgroundStyle(out disposeStyle);
+            int styleSpace = (ElementStyleLayout.TopWhiteSpace(style, eSpacePart.Border) + ElementStyleLayout.BottomWhiteSpace(style, eSpacePart.Border));
+            if (styleSpace > 0) styleSpace += 2;
+            s.Height -= styleSpace;
+            styleSpace = (ElementStyleLayout.LeftWhiteSpace(style, eSpacePart.Border) + ElementStyleLayout.RightWhiteSpace(style, eSpacePart.Border));
+            if (styleSpace > 0) styleSpace += 2;
+            s.Width -= styleSpace;
+            p.AvailableSize = s;
+            p.ParentEnabled = this.Enabled;
+            p.MouseOver = _MouseOver || this.Focused;
+            if (disposeStyle) style.Dispose();
+            return p;
+        }
+
+        private ElementStyle GetBackgroundStyle(out bool disposeStyle)
+        {
+            disposeStyle = false;
+            _BackgroundStyle.SetColorScheme(this.GetColorScheme());
+            return ElementStyleDisplay.GetElementStyle(_BackgroundStyle, out disposeStyle);
+        }
+
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            base.OnPaint(e);
+            Graphics g = e.Graphics;
+            Rectangle clientRect = this.ClientRectangle;
+            bool enabled = this.Enabled;
+
+            if (!this.Enabled)
+                e.Graphics.FillRectangle(SystemBrushes.Control, clientRect);
+            else
+            {
+                using (SolidBrush brush = new SolidBrush(this.BackColor))
+                    e.Graphics.FillRectangle(brush, clientRect);
+            }
+
+            bool disposeStyle = false;
+            ElementStyle style = GetBackgroundStyle(out disposeStyle);
+
+            if (style.Custom)
+            {
+                SmoothingMode sm = g.SmoothingMode;
+                if (this.AntiAlias)
+                    g.SmoothingMode = SmoothingMode.AntiAlias;
+                ElementStyleDisplayInfo displayInfo = new ElementStyleDisplayInfo(style, g, clientRect);
+                if (!enabled)
+                {
+                    ElementStyleDisplay.PaintBorder(displayInfo);
+                }
+                else
+                    ElementStyleDisplay.Paint(displayInfo);
+                if (this.AntiAlias)
+                    g.SmoothingMode = sm;
+            }
+
+            PaintButtons(g);
+
+            if (disposeStyle) style.Dispose();
+        }
+
+
+        public override Color BackColor
+        {
+            get
+            {
+                return base.BackColor;
+            }
+            set
+            {
+                base.BackColor = value;
+            }
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeBackColor()
+        {
+            return this.BackColor != SystemColors.Window;
+        }
+
+        protected override void OnBackColorChanged(EventArgs e)
+        {
+            base.OnBackColorChanged(e);
+            if (_TextBox.Parent != null)
+                _TextBox.BackColor = this.BackColor;
+        }
+
+        private void PaintButtons(Graphics g)
+        {
+            PaintInfo p = CreatePaintInfo(g);
+
+            if (!_ButtonGroup.IsLayoutValid)
+            {
+                UpdateLayout(p);
+            }
+
+            bool disposeStyle = false;
+            ElementStyle style = GetBackgroundStyle(out disposeStyle);
+            _ButtonGroup.RenderBounds = GetButtonsRenderBounds(style);
+            _ButtonGroup.ProcessPaint(p);
+            if (disposeStyle) style.Dispose();
+        }
+
+        private Rectangle GetButtonsRenderBounds(ElementStyle style)
+        {
+            int y = ElementStyleLayout.TopWhiteSpace(style, eSpacePart.Border);
+            if (y > 0) y += 1;
+
+            if (this.RightToLeft == RightToLeft.Yes)
+            {
+                return new Rectangle((ElementStyleLayout.LeftWhiteSpace(style, eSpacePart.Border) + 1), y,
+                _ButtonGroup.Size.Width, _ButtonGroup.Size.Height);
+            }
+
+            return new Rectangle(this.Width - (ElementStyleLayout.RightWhiteSpace(style, eSpacePart.Border) + 1) - _ButtonGroup.Size.Width, y,
+                _ButtonGroup.Size.Width, _ButtonGroup.Size.Height);
+        }
+
+        protected override void OnResize(EventArgs e)
+        {
+            if (BarFunctions.IsHandleValid(this))
+            {
+                _ButtonGroup.InvalidateArrange();
+                UpdateLayout();
+                this.Invalidate();
+            }
+            base.OnResize(e);
+        }
+
+        protected override void OnGotFocus(EventArgs e)
+        {
+            _TextBox.Focus();
+            base.OnGotFocus(e);
+        }
+
+        protected override void OnRightToLeftChanged(EventArgs e)
+        {
+            _ButtonGroup.InvalidateArrange();
+            UpdateLayout();
+            this.Invalidate();
+            base.OnRightToLeftChanged(e);
+        }
+
+        protected override void OnFontChanged(EventArgs e)
+        {
+            _ButtonGroup.InvalidateArrange();
+            UpdateLayout();
+            this.Invalidate();
+            base.OnFontChanged(e);
+        }
+
+        protected override void OnForeColorChanged(EventArgs e)
+        {
+            _TextBox.ForeColor = this.ForeColor;
+            base.OnForeColorChanged(e);
+        }
+
+        private void UpdateLayout()
+        {
+            if (!BarFunctions.IsHandleValid(this))
+                return;
+            using (Graphics g = BarFunctions.CreateGraphics(this))
+                UpdateLayout(CreatePaintInfo(g));
+        }
+
+        private bool _InternalSizeUpdate = false;
+        private void UpdateLayout(PaintInfo p)
+        {
+            if (_InternalSizeUpdate) return;
+
+            _InternalSizeUpdate = true;
+
+            try
+            {
+                if (!_ButtonGroup.IsLayoutValid)
+                {
+                    _ButtonGroup.PerformLayout(p);
+                }
+
+                bool disposeStyle = false;
+                ElementStyle style = GetBackgroundStyle(out disposeStyle);
+                Rectangle textBoxControlRect = ElementStyleLayout.GetInnerRect(style, this.ClientRectangle);
+                if (RenderButtons)
+                {
+                    Rectangle buttonsRect = GetButtonsRenderBounds(style);
+                    if (this.RightToLeft == RightToLeft.Yes)
+                    {
+                        textBoxControlRect.X += buttonsRect.Right;
+                        textBoxControlRect.Width -= buttonsRect.Right;
+                    }
+                    else
+                    {
+                        textBoxControlRect.Width -= (textBoxControlRect.Right - buttonsRect.X);
+                    }
+                }
+                if (_TextBox.Multiline == false && (_TextBox.PreferredHeight < textBoxControlRect.Height))
+                {
+                    textBoxControlRect.Y += (textBoxControlRect.Height - _TextBox.PreferredHeight) / 2;
+                }
+                _TextBox.Bounds = textBoxControlRect;
+
+                if (disposeStyle) style.Dispose();
+            }
+            finally
+            {
+                _InternalSizeUpdate = false;
+            }
+        }
+
+        private Control _PreviousDropDownControlParent = null;
+        private void DropDownButtonMouseDown(object sender, MouseEventArgs e)
+        {
+            if (e.Button != MouseButtons.Left || _CloseTime != DateTime.MinValue && DateTime.Now.Subtract(_CloseTime).TotalMilliseconds < 250)
+            {
+                _CloseTime = DateTime.MinValue;
+                return;
+            }
+
+            InvokeShowDropDown();
+
+            if ((Control.MouseButtons & MouseButtons.Left) == 0)
+                _ButtonGroup.ProcessMouseUp(e);
+        }
+
+        private void InvokeShowDropDown()
+        {
+            CancelEventArgs cancelArgs = new CancelEventArgs();
+            OnButtonDropDownClick(cancelArgs);
+            if (cancelArgs.Cancel) return;
+            if (IsPopupOpen)
+                CloseDropDown();
+            else
+               ShowDropDown();
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the drop-down is open.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsPopupOpen
+        {
+            get
+            {
+                return _PopupItem.Expanded;
+            }
+            set
+            {
+                if (value != _PopupItem.Expanded)
+                {
+                    if (value)
+                        ShowDropDown();
+                    else
+                        CloseDropDown();
+                }
+            }
+        }
+
+        private bool _ShowingPopup = false;
+        /// <summary>
+        /// Shows drop-down popup. Note that popup will be shown only if there is a DropDownControl assigned or DropDownItems collection has at least one item.
+        /// </summary>
+        public void ShowDropDown()
+        {
+            if (_DropDownControl == null && _PopupItem.SubItems.Count == 0 || _ShowingPopup || _PopupItem.Expanded)
+                return;
+
+            CancelEventArgs ce = new CancelEventArgs();
+            OnBeforePopupOpen(ce);
+            if (ce.Cancel) return;
+
+            _ShowingPopup = true;
+            try
+            {
+                ControlContainerItem cc = null;
+                ItemContainer ic = null;
+                if (_DropDownControl != null)
+                {
+                    ic = new ItemContainer();
+                    ic.Name = _DropDownItemContainerName;
+                    cc = new ControlContainerItem(_DropDownControlContainerName);
+                    ic.SubItems.Add(cc);
+                    _PopupItem.SubItems.Insert(0, ic);
+                }
+
+                if (_PopupItem.SubItems.Count == 0)
+                {
+                    if (ic != null)
+                        _PopupItem.SubItems.Remove(ic);
+                    return;
+                }
+                if (_DropDownControl != null)
+                {
+                    _PreviousDropDownControlParent = _DropDownControl.Parent;
+                    cc.Control = _DropDownControl;
+                    if (!_DropDownControl.IsHandleCreated)
+                    {
+                        IntPtr handle = _DropDownControl.Handle; // Forces creation of the control so its size etc. can be accessed reliably
+                    }
+                }
+
+                _PopupItem.SetDisplayRectangle(this.ClientRectangle);
+                if (this.RightToLeft == RightToLeft.No)
+                {
+                    Point pl = new Point(this.Width - _PopupItem.PopupSize.Width, this.Height);
+                    ScreenInformation screen = BarFunctions.ScreenFromControl(this);
+                    Point ps = PointToScreen(pl);
+                    if (screen != null && screen.WorkingArea.X > ps.X)
+                    {
+                        pl.X = 0;
+                    }
+                    _PopupItem.PopupLocation = pl;
+                }
+
+                _PopupItem.Expanded = !_PopupItem.Expanded;
+            }
+            finally
+            {
+                _ShowingPopup = false;
+            }
+
+            if (_DropDownControl != null && _AutoFocusDropDownControl && _DropDownControl.CanFocus)
+                BarUtilities.InvokeDelayed(new MethodInvoker(delegate { _DropDownControl.Focus(); }));
+        }
+
+        /// <summary>
+        /// Closes the drop-down popup if it is open.
+        /// </summary>
+        public void CloseDropDown()
+        {
+            if (_PopupItem.Expanded) _PopupItem.Expanded = false;
+        }
+
+        private DateTime _CloseTime = DateTime.MinValue;
+        private void DropDownPopupClose(object sender, EventArgs e)
+        {
+            _CloseTime = DateTime.Now;
+
+            ItemContainer ic = null;
+            if (_PopupItem.SubItems.Contains(_DropDownItemContainerName))
+                ic = _PopupItem.SubItems[_DropDownItemContainerName] as ItemContainer;
+            if (ic != null)
+            {
+                ControlContainerItem cc = ic.SubItems[_DropDownControlContainerName] as ControlContainerItem;
+                if (cc != null)
+                {
+                    cc.Control = null;
+                    ic.SubItems.Remove(cc);
+                    if (_DropDownControl != null)
+                    {
+                        _DropDownControl.Parent = _PreviousDropDownControlParent;
+                        _PreviousDropDownControlParent = null;
+                    }
+                }
+                _PopupItem.SubItems.Remove(ic);
+                ic.Dispose();
+            }
+        }
+
+        private bool _AutoFocusDropDownControl = false;
+        /// <summary>
+        /// Indicates whether DropDownControl is automatically focused when popup is open.
+        /// </summary>
+        [DefaultValue(false), Category("Behavior"), Description("Indicates whether DropDownControl is automatically focused when popup is open.")]
+        public bool AutoFocusDropDownControl
+        {
+            get { return _AutoFocusDropDownControl; }
+            set
+            {
+                _AutoFocusDropDownControl = value;
+            }
+        }
+        
+
+        private void ClearButtonClick()
+        {
+            CancelEventArgs cancelArgs = new CancelEventArgs();
+            OnButtonClearClick(cancelArgs);
+            if (cancelArgs.Cancel) return;
+
+            _TextBox.Text = "";
+        }
+        private void ClearButtonMouseUp(object sender, EventArgs e)
+        {
+            ClearButtonClick();
+        }
+
+        /// <summary>
+        /// Raises the ButtonClearClick event.
+        /// </summary>
+        /// <param name="e"></param>
+        protected virtual void OnButtonClearClick(CancelEventArgs e)
+        {
+            if (ButtonClearClick != null)
+                ButtonClearClick(this, e);
+        }
+
+        /// <summary>
+        /// Raises the ButtonDropDownClick event.
+        /// </summary>
+        /// <param name="e"></param>
+        protected virtual void OnButtonDropDownClick(CancelEventArgs e)
+        {
+            if (ButtonDropDownClick != null)
+                ButtonDropDownClick(this, e);
+        }
+
+        private Control _DropDownControl = null;
+        /// <summary>
+        /// Gets or sets the reference of the control that will be displayed on popup that is shown when drop-down button is clicked.
+        /// </summary>
+        [DefaultValue(null), Description("Indicates reference of the control that will be displayed on popup that is shown when drop-down button is clicked.")]
+        public Control DropDownControl
+        {
+            get { return _DropDownControl; }
+            set
+            {
+                if (value == this) return;
+                _DropDownControl = value;
+                OnDropDownControlChanged();
+            }
+        }
+        /// <summary>
+        /// Called when DropDownControl property has changed.
+        /// </summary>
+        protected virtual void OnDropDownControlChanged()
+        {
+            if (_DropDownControl != null)
+            {
+                _DropDownControl.BindingContext = this.BindingContext;
+                if (!this.DesignMode)
+                    _DropDownControl.Visible = false;
+            }
+        }
+
+        protected override PopupItem CreatePopupItem()
+        {
+            ButtonItem button = new ButtonItem("sysPopupProvider");
+            button.PopupFinalized += new EventHandler(DropDownPopupClose);
+            _PopupItem = button;
+            return button;
+        }
+
+        /// <summary>
+        /// Gets the collection of BaseItem derived items displayed on popup menu.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public SubItemsCollection DropDownItems
+        {
+            get { return _PopupItem.SubItems; }
+        }
+
+        protected override void RecalcSize()
+        {
+        }
+
+        public override void PerformClick()
+        {
+        }
+
+        private bool RenderButtons
+        {
+            get
+            {
+                return _ButtonCustom != null && _ButtonCustom.Visible || _ButtonCustom2 != null && _ButtonCustom2.Visible ||
+                    _ButtonDropDown != null && _ButtonDropDown.Visible || _ButtonClear != null && _ButtonClear.Visible;
+            }
+        }
+
+        protected override void OnMouseMove(MouseEventArgs e)
+        {
+            if (RenderButtons)
+            {
+                _ButtonGroup.ProcessMouseMove(e);
+            }
+            base.OnMouseMove(e);
+        }
+        protected override void OnMouseLeave(EventArgs e)
+        {
+            if (RenderButtons)
+            {
+                _ButtonGroup.ProcessMouseLeave();
+            }
+            base.OnMouseLeave(e);
+        }
+        protected override void OnMouseHover(EventArgs e)
+        {
+            if (RenderButtons)
+            {
+                _ButtonGroup.ProcessMouseHover(e);
+            }
+            base.OnMouseHover(e);
+        }
+        protected override void OnMouseDown(MouseEventArgs e)
+        {
+            if (RenderButtons)
+                _ButtonGroup.ProcessMouseDown(e);
+            base.OnMouseDown(e);
+        }
+        protected override void OnMouseUp(MouseEventArgs e)
+        {
+            if (RenderButtons)
+                _ButtonGroup.ProcessMouseUp(e);
+            base.OnMouseUp(e);
+        }
+
+        internal void ProcessMouseUpOnGroup()
+        {
+            if (RenderButtons)
+                _ButtonGroup.ProcessMouseUp(new MouseEventArgs(MouseButtons.Left, 0, -10, -10, 0));
+            this.Invalidate();
+        }
+
+        /// <summary>
+        /// Gets the reference to internal TextBox control. Use it to get access to the text box events and properties.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public TextBoxX TextBox
+        {
+            get
+            {
+                return _TextBox;
+            }
+        }
+
+        private bool _InternalReadOnly = false;
+        internal bool InternalReadOnly
+        {
+            get { return _InternalReadOnly; }
+            set
+            {
+                _InternalReadOnly = value;
+            }
+        }
+
+
+        /// <summary>
+        /// Gets or sets whether watermark text is displayed when control is empty. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Description("Indicates whether watermark text is displayed when control is empty.")]
+        public virtual bool WatermarkEnabled
+        {
+            get { return _TextBox.WatermarkEnabled; }
+            set { _TextBox.WatermarkEnabled = value; this.Invalidate(true); }
+        }
+
+        /// <summary>
+        /// Gets or sets the watermark (tip) text displayed inside of the control when Text is not set and control does not have input focus. This property supports text-markup.
+        /// </summary>
+        [Browsable(true), DefaultValue(""), Localizable(true), Category("Appearance"), Description("Indicates watermark text displayed inside of the control when Text is not set and control does not have input focus."), Editor("DevComponents.DotNetBar.Design.TextMarkupUIEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor))]
+        public string WatermarkText
+        {
+            get { return _TextBox.WatermarkText; }
+            set
+            {
+                if (value == null) value = "";
+                _TextBox.WatermarkText = value;
+                this.Invalidate(true);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the watermark font.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), Description("Indicates watermark font."), DefaultValue(null)]
+        public Font WatermarkFont
+        {
+            get { return _TextBox.WatermarkFont; }
+            set { _TextBox.WatermarkFont = value; this.Invalidate(true); }
+        }
+
+        /// <summary>
+        /// Gets or sets the watermark text color.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), Description("Indicates watermark text color.")]
+        public Color WatermarkColor
+        {
+            get { return _TextBox.WatermarkColor; }
+            set { _TextBox.WatermarkColor = value; this.Invalidate(); }
+        }
+        /// <summary>
+        /// Indicates whether property should be serialized by Windows Forms designer.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeWatermarkColor()
+        {
+            return _TextBox.WatermarkColor != SystemColors.GrayText;
+        }
+        /// <summary>
+        /// Resets the property to default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetWatermarkColor()
+        {
+            this.WatermarkColor = SystemColors.GrayText;
+        }
+
+        /// <summary>
+        /// Gets or sets the watermark hiding behaviour. Default value indicates that watermark is hidden when control receives input focus.
+        /// </summary>
+        [DefaultValue(eWatermarkBehavior.HideOnFocus), Category("Behavior"), Description("Indicates watermark hiding behaviour.")]
+        public eWatermarkBehavior WatermarkBehavior
+        {
+            get { return _TextBox.WatermarkBehavior; }
+            set { _TextBox.WatermarkBehavior = value; this.Invalidate(true); }
+        }
+
+        /// <summary>
+        /// Gets or sets the watermark image displayed inside of the control when Text is not set and control does not have input focus.
+        /// </summary>
+        [DefaultValue(null), Category("Appearance"), Description("Indicates watermark image displayed inside of the control when Text is not set and control does not have input focus.")]
+        public Image WatermarkImage
+        {
+            get { return _TextBox.WatermarkImage; }
+            set { _TextBox.WatermarkImage = value; }
+        }
+        /// <summary>
+        /// Gets or sets the watermark image alignment.
+        /// </summary>
+        [DefaultValue(ContentAlignment.MiddleLeft), Category("Appearance"), Description("Indicates watermark image alignment.")]
+        public ContentAlignment WatermarkImageAlignment
+        {
+            get { return _TextBox.WatermarkImageAlignment; }
+            set { _TextBox.WatermarkImageAlignment = value; }
+        }
+
+        #endregion
+
+        #region ICommandSource Members
+        protected virtual void ExecuteCommand()
+        {
+            if (_Command == null) return;
+            CommandManager.ExecuteCommand(this);
+        }
+
+        /// <summary>
+        /// Gets or sets the command assigned to the item. Default value is null.
+        /// <remarks>Note that if this property is set to null Enabled property will be set to false automatically to disable the item.</remarks>
+        /// </summary>
+        [DefaultValue(null), Category("Commands"), Description("Indicates the command assigned to the item.")]
+        public Command Command
+        {
+            get { return (Command)((ICommandSource)this).Command; }
+            set
+            {
+                ((ICommandSource)this).Command = value;
+            }
+        }
+
+        private ICommand _Command = null;
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        ICommand ICommandSource.Command
+        {
+            get
+            {
+                return _Command;
+            }
+            set
+            {
+                bool changed = false;
+                if (_Command != value)
+                    changed = true;
+
+                if (_Command != null)
+                    CommandManager.UnRegisterCommandSource(this, _Command);
+                _Command = value;
+                if (value != null)
+                    CommandManager.RegisterCommand(this, value);
+                if (changed)
+                    OnCommandChanged();
+            }
+        }
+
+        /// <summary>
+        /// Called when Command property value changes.
+        /// </summary>
+        protected virtual void OnCommandChanged()
+        {
+        }
+
+        private object _CommandParameter = null;
+        /// <summary>
+        /// Gets or sets user defined data value that can be passed to the command when it is executed.
+        /// </summary>
+        [Browsable(true), DefaultValue(null), Category("Commands"), Description("Indicates user defined data value that can be passed to the command when it is executed."), System.ComponentModel.TypeConverter(typeof(System.ComponentModel.StringConverter)), System.ComponentModel.Localizable(true)]
+        public object CommandParameter
+        {
+            get
+            {
+                return _CommandParameter;
+            }
+            set
+            {
+                _CommandParameter = value;
+            }
+        }
+
+        #endregion
+
+        #region TextBox Property Forwarding
+        /// <summary>
+        /// Gets or sets the text as it is currently displayed to the user. 
+        /// </summary>
+        [Category("Appearance"), DefaultValue("Indicates text as it is currently displayed to the user"), Bindable(true), RefreshProperties(RefreshProperties.Repaint), Localizable(true)]
+        public override string Text
+        {
+            get
+            {
+                return base.Text;
+            }
+            set
+            {
+                _TextBox.Text = value;
+            }
+        }
+
+
+        /// <summary>
+        /// Returns a string that represents the current text in text box. This method overrides ToString.
+        /// </summary>
+        /// <returns>A String that contains information about the current TextBox. The string includes the type, a simplified view of the input string, and the formatted input string.</returns>
+        public override string ToString()
+        {
+            return _TextBox.ToString();
+        }
+
+        /// <summary>
+        /// Gets the preferred height for a text box. 
+        /// </summary>
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), Browsable(false), EditorBrowsable(EditorBrowsableState.Advanced)]
+        public int PreferredHeight
+        {
+            get
+            {
+                int height = _TextBox.PreferredHeight;
+                bool disposeStyle = false;
+                ElementStyle style = GetBackgroundStyle(out disposeStyle);
+                height += ElementStyleLayout.VerticalStyleWhiteSpace(style);
+                if (disposeStyle)
+                {
+                    style.Dispose();
+                }
+                return height;
+            }
+        }
+        protected override void OnHandleCreated(EventArgs e)
+        {
+            UpdateLayout(); // Fixes an issue where button if visible is not showing under certain use cases
+            base.OnHandleCreated(e);
+        }
+        public override Size GetPreferredSize(Size proposedSize)
+        {
+            Size ps = _TextBox.GetPreferredSize(proposedSize);
+            ps.Height = PreferredHeight;
+            return ps;
+        }
+
+        /// <summary>
+        /// Gets or sets a custom StringCollection to use when the AutoCompleteSource property is set to CustomSource.
+        /// <value>A StringCollection to use with AutoCompleteSource.</value>
+        /// </summary>
+        [Browsable(true), EditorBrowsable(EditorBrowsableState.Always), DesignerSerializationVisibility(DesignerSerializationVisibility.Content), Localizable(true), Description("Indicates custom StringCollection to use when the AutoCompleteSource property is set to CustomSource."), Editor("System.Windows.Forms.Design.ListControlStringCollectionEditor, System.Design, Version= 2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", typeof(UITypeEditor))]
+        public AutoCompleteStringCollection AutoCompleteCustomSource
+        {
+            get
+            {
+                return _TextBox.AutoCompleteCustomSource;
+            }
+            set
+            {
+                _TextBox.AutoCompleteCustomSource = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets an option that controls how automatic completion works for the TextBox.
+        /// <value>One of the values of AutoCompleteMode. The values are Append, None, Suggest, and SuggestAppend. The default is None.</value>
+        /// </summary>
+        [Description("Gets or sets an option that controls how automatic completion works for the TextBox."), Browsable(true), EditorBrowsable(EditorBrowsableState.Always), DefaultValue(0)]
+        public AutoCompleteMode AutoCompleteMode
+        {
+            get
+            {
+                return _TextBox.AutoCompleteMode;
+            }
+            set
+            {
+                _TextBox.AutoCompleteMode = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value specifying the source of complete strings used for automatic completion.
+        /// <value>One of the values of AutoCompleteSource. The options are AllSystemSources, AllUrl, FileSystem, HistoryList, RecentlyUsedList, CustomSource, and None. The default is None.</value>
+        /// </summary>
+        [DefaultValue(0x80), TypeConverter(typeof(TextBoxAutoCompleteSourceConverter)), Browsable(true), EditorBrowsable(EditorBrowsableState.Always), Description("Gets or sets a value specifying the source of complete strings used for automatic completion.")]
+        public AutoCompleteSource AutoCompleteSource
+        {
+            get
+            {
+                return _TextBox.AutoCompleteSource;
+            }
+            set
+            {
+                _TextBox.AutoCompleteSource = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether the TextBox control modifies the case of characters as they are typed.
+        /// <value>One of the CharacterCasing enumeration values that specifies whether the TextBox control modifies the case of characters. The default is CharacterCasing.Normal.</value>
+        /// </summary>
+        [Category("Behavior"), Description("Indicates whether the TextBox control modifies the case of characters as they are typed."), DefaultValue(0)]
+        public CharacterCasing CharacterCasing
+        {
+            get
+            {
+                return _TextBox.CharacterCasing;
+            }
+            set
+            {
+                _TextBox.CharacterCasing = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the character used to mask characters of a password in a single-line TextBox control.
+        /// <value>The character used to mask characters entered in a single-line TextBox control. Set the value of this property to 0 (character value) if you do not want the control to mask characters as they are typed. Equals 0 (character value) by default.</value>
+        /// </summary>
+        [RefreshProperties(RefreshProperties.Repaint), Localizable(true), Description("Gets or sets the character used to mask characters of a password in a single-line TextBox control."), Category("Behavior"), DefaultValue('\0')]
+        public char PasswordChar
+        {
+            get
+            {
+                return _TextBox.PasswordChar;
+            }
+            set
+            {
+                _TextBox.PasswordChar = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets how text is aligned in a TextBox control.
+        /// <value>One of the HorizontalAlignment enumeration values that specifies how text is aligned in the control. The default is HorizontalAlignment.Left.</value>
+        /// </summary>
+        [DefaultValue(0), Category("Appearance"), Localizable(true), Description("Indicates how text is aligned in a TextBox control.")]
+        public HorizontalAlignment TextAlign
+        {
+            get
+            {
+                return _TextBox.TextAlign;
+            }
+            set
+            {
+                _TextBox.TextAlign = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the text in the TextBox control should appear as the default password character.
+        /// <value>true if the text in the TextBox control should appear as the default password character; otherwise, false.</value>
+        /// </summary>
+        [Category("Behavior"), DefaultValue(false), Description("Gets or sets a value indicating whether the text in the TextBox control should appear as the default password character."), RefreshProperties(RefreshProperties.Repaint)]
+        public bool UseSystemPasswordChar
+        {
+            get
+            {
+                return _TextBox.UseSystemPasswordChar;
+            }
+            set
+            {
+                _TextBox.UseSystemPasswordChar = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the selected text in the text box control remains highlighted when the control loses focus.
+        /// <value>true if the selected text does not appear highlighted when the text box control loses focus; false, if the selected text remains highlighted when the text box control loses focus. The default is true.</value>
+        /// </summary>
+        [Category("Behavior"), DefaultValue(true), Description("Gets or sets a value indicating whether the selected text in the text box control remains highlighted when the control loses focus.")]
+        public bool HideSelection
+        {
+            get
+            {
+                return _TextBox.HideSelection;
+            }
+            set
+            {
+                _TextBox.HideSelection = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the maximum number of characters the user can type or paste into the text box control.
+        /// <value>The number of characters that can be entered into the control. The default is 32767.</value>
+        /// </summary>
+        [Category("Behavior"), Description("Gets or sets the maximum number of characters the user can type or paste into the text box control."), DefaultValue(0x7fff), Localizable(true)]
+        public virtual int MaxLength
+        {
+            get
+            {
+                return _TextBox.MaxLength;
+            }
+            set
+            {
+                _TextBox.MaxLength = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value that indicates that the text box control has been modified by the user since the control was created or its contents were last set.
+        /// <value>true if the control's contents have been modified; otherwise, false. The default is false.</value>
+        /// </summary>
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), Browsable(false)]
+        public bool Modified
+        {
+            get
+            {
+                return _TextBox.Modified;
+            }
+            set
+            {
+                _TextBox.Modified = value;
+            }
+        }
+
+
+        /// <summary>
+        /// Gets or sets a value indicating whether text in the text box is read-only.
+        /// <value>true if the text box is read-only; otherwise, false. The default is false.</value>
+        /// </summary>
+        [DefaultValue(false), RefreshProperties(RefreshProperties.Repaint), Category("Behavior"), Description("Gets or sets a value indicating whether text in the text box is read-only.")]
+        public bool ReadOnly
+        {
+            get
+            {
+                return _TextBox.ReadOnly;
+            }
+            set
+            {
+                _TextBox.ReadOnly = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating the currently selected text in the control.
+        /// <value>A string that represents the currently selected text in the text box.</value>
+        /// </summary>
+        [Description("Gets or sets a value indicating the currently selected text in the control."), Browsable(false), Category("Appearance"), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public virtual string SelectedText
+        {
+            get
+            {
+                return _TextBox.SelectedText;
+            }
+            set
+            {
+                _TextBox.SelectedText = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the number of characters selected in the text box.
+        /// <value>The number of characters selected in the text box.</value>
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), Description("Gets or sets the number of characters selected in the text box."), Category("Appearance")]
+        public virtual int SelectionLength
+        {
+            get
+            {
+                return _TextBox.SelectionLength;
+            }
+            set
+            {
+                _TextBox.SelectionLength = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the starting point of text selected in the text box.
+        /// <value>The starting position of text selected in the text box.</value>
+        /// </summary>
+        [Description("Gets or sets the starting point of text selected in the text box."), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), Category("Appearance"), Browsable(false)]
+        public int SelectionStart
+        {
+            get
+            {
+                return _TextBox.SelectionStart;
+            }
+            set
+            {
+                _TextBox.SelectionStart = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the length of text in the control.Returns number of characters contained in the text of the control.
+        /// </summary>
+        [Browsable(false)]
+        public virtual int TextLength
+        {
+            get
+            {
+                return _TextBox.TextLength;
+            }
+        }
+
+        /// <summary>
+        /// Appends text to the current text of a text box.
+        /// </summary>
+        /// <param name="text">The text to append to the current contents of the text box. </param>
+        public void AppendText(string text)
+        {
+            _TextBox.AppendText(text);
+        }
+
+        /// <summary>
+        /// Clears all text from the text box control.
+        /// </summary>
+        public void Clear()
+        {
+            _TextBox.Clear();
+        }
+
+        /// <summary>
+        /// Clears information about the most recent operation from the undo buffer of the text box.
+        /// </summary>
+        public void ClearUndo()
+        {
+            _TextBox.ClearUndo();
+        }
+
+        /// <summary>
+        /// Copies the current selection in the text box to the Clipboard.
+        /// </summary>
+        [UIPermission(SecurityAction.Demand, Clipboard = UIPermissionClipboard.OwnClipboard)]
+        public void Copy()
+        {
+            _TextBox.Copy();
+        }
+        /// <summary>
+        /// Moves the current selection in the text box to the Clipboard.
+        /// </summary>
+        public void Cut()
+        {
+            _TextBox.Cut();
+        }
+        /// <summary>
+        /// Specifies that the value of the SelectionLength property is zero so that no characters are selected in the control.
+        /// </summary>
+        public void DeselectAll()
+        {
+            _TextBox.DeselectAll();
+        }
+        /// <summary>
+        /// Retrieves the character that is closest to the specified location within the control.
+        /// </summary>
+        /// <param name="pt">The location from which to seek the nearest character. </param>
+        /// <returns>The character at the specified location.</returns>
+        public virtual char GetCharFromPosition(Point pt)
+        {
+            return _TextBox.GetCharFromPosition(pt);
+        }
+        /// <summary>
+        /// Retrieves the index of the character nearest to the specified location.
+        /// </summary>
+        /// <param name="pt">The location to search.</param>
+        /// <returns>The zero-based character index at the specified location.</returns>
+        public virtual int GetCharIndexFromPosition(Point pt)
+        {
+            return _TextBox.GetCharIndexFromPosition(pt);
+        }
+        /// <summary>
+        /// Retrieves the index of the first character of a given line.
+        /// </summary>
+        /// <param name="lineNumber">The line for which to get the index of its first character. </param>
+        /// <returns>The zero-based character index in the specified line.</returns>
+        public int GetFirstCharIndexFromLine(int lineNumber)
+        {
+            return _TextBox.GetFirstCharIndexFromLine(lineNumber);
+        }
+        /// <summary>
+        /// Retrieves the index of the first character of the current line.
+        /// </summary>
+        /// <returns>The zero-based character index in the current line.</returns>
+        public int GetFirstCharIndexOfCurrentLine()
+        {
+            return _TextBox.GetFirstCharIndexOfCurrentLine();
+        }
+        /// <summary>
+        /// Retrieves the line number from the specified character position within the text of the control.
+        /// </summary>
+        /// <param name="index">The character index position to search. </param>
+        /// <returns>The zero-based line number in which the character index is located.</returns>
+        public virtual int GetLineFromCharIndex(int index)
+        {
+            return _TextBox.GetLineFromCharIndex(index);
+        }
+
+        /// <summary>
+        /// Retrieves the location within the control at the specified character index.
+        /// </summary>
+        /// <param name="index">The index of the character for which to retrieve the location. </param>
+        /// <returns>The location of the specified character.</returns>
+        public virtual Point GetPositionFromCharIndex(int index)
+        {
+            return _TextBox.GetPositionFromCharIndex(index);
+        }
+
+        /// <summary>
+        /// Replaces the current selection in the text box with the contents of the Clipboard.
+        /// </summary>
+        [UIPermission(SecurityAction.Demand, Clipboard = UIPermissionClipboard.OwnClipboard)]
+        public void Paste()
+        {
+            _TextBox.Paste();
+        }
+
+        /// <summary>
+        /// Selects a range of text in the text box.
+        /// </summary>
+        /// <param name="start">The position of the first character in the current text selection within the text box. </param>
+        /// <param name="length">The number of characters to select. </param>
+        public void Select(int start, int length)
+        {
+            _TextBox.Select(start, length);
+        }
+
+        /// <summary>
+        /// Selects all text in the text box.
+        /// </summary>
+        public void SelectAll()
+        {
+            _TextBox.SelectAll();
+        }
+
+        /// <summary>
+        /// Undoes the last edit operation in the text box.
+        /// </summary>
+        public void Undo()
+        {
+            _TextBox.Undo();
+        }
+
+        /// <summary>
+        /// Replaces the specified selection in the TextBox with the contents of the Clipboard.
+        /// </summary>
+        /// <param name="text">The text to replace.</param>
+        public void Paste(string text)
+        {
+            _TextBox.Paste(text);
+        }
+
+        #endregion
+    }
+
+    #region TextBoxAutoCompleteSourceConverter
+    internal class TextBoxAutoCompleteSourceConverter : EnumConverter
+    {
+        // Methods
+        public TextBoxAutoCompleteSourceConverter(Type type)
+            : base(type)
+        {
+        }
+
+        public override TypeConverter.StandardValuesCollection GetStandardValues(ITypeDescriptorContext context)
+        {
+            TypeConverter.StandardValuesCollection standardValues = base.GetStandardValues(context);
+            ArrayList values = new ArrayList();
+            int count = standardValues.Count;
+            for (int i = 0; i < count; i++)
+            {
+                if (!standardValues[i].ToString().Equals("ListItems"))
+                {
+                    values.Add(standardValues[i]);
+                }
+            }
+            return new TypeConverter.StandardValuesCollection(values);
+        }
+    }
+    #endregion
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/Controls/TextBoxDropDown.ico b/PROMS/DotNetBar Source Code/Controls/TextBoxDropDown.ico
new file mode 100644
index 00000000..6533e2af
Binary files /dev/null and b/PROMS/DotNetBar Source Code/Controls/TextBoxDropDown.ico differ
diff --git a/PROMS/DotNetBar Source Code/Controls/TextBoxX.cs b/PROMS/DotNetBar Source Code/Controls/TextBoxX.cs
new file mode 100644
index 00000000..517159eb
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/TextBoxX.cs	
@@ -0,0 +1,1308 @@
+using System;
+using System.Text;
+using System.Windows.Forms;
+using System.ComponentModel;
+using DevComponents.DotNetBar.Rendering;
+using System.Drawing;
+using DevComponents.DotNetBar.TextMarkup;
+using System.Reflection;
+using DevComponents.Editors;
+using System.Collections;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    [ToolboxBitmap(typeof(TextBoxX), "Controls.TextBoxX.ico"), ToolboxItem(true), Designer("DevComponents.DotNetBar.Design.TextBoxXDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+    public class TextBoxX : TextBox, INonClientControl
+#if FRAMEWORK20
+, IInputButtonControl
+#endif
+    {
+        #region Private Variables
+        private NonClientPaintHandler m_NCPainter = null;
+        private string m_WatermarkText = "";
+        private bool m_Focused = false;
+        private Font m_WatermarkFont = null;
+        private Color m_WatermarkColor = SystemColors.GrayText;
+        private ElementStyle m_BorderStyle = null;
+        private IntPtr m_LastFocusWindow;
+        private string m_OriginalText;
+        private bool m_IsTextBoxItem = false;
+        private Color m_FocusHighlightColor = ColorScheme.GetColor(0xFFFF88);
+        private bool m_FocusHighlightEnabled = false;
+        private Color m_LastBackColor = Color.Empty;
+        #endregion
+
+        #region Events
+#if FRAMEWORK20
+        /// <summary>
+        /// Occurs when ButtonCustom control is clicked.
+        /// </summary>
+        public event EventHandler ButtonCustomClick;
+
+        /// <summary>
+        /// Occurs when ButtonCustom2 control is clicked.
+        /// </summary>
+        public event EventHandler ButtonCustom2Click;
+#endif
+        #endregion
+
+        #region Constructor
+        public TextBoxX()
+        {
+#if FRAMEWORK20
+            _ButtonCustom = new InputButtonSettings(this);
+            _ButtonCustom2 = new InputButtonSettings(this);
+            CreateButtonGroup();
+#endif
+
+            m_BorderStyle = new ElementStyle();
+            m_BorderStyle.StyleChanged += new EventHandler(BorderStyle_StyleChanged);
+            m_NCPainter = new NonClientPaintHandler(this, eScrollBarSkin.Optimized);
+            base.BorderStyle = BorderStyle.None;
+            this.AutoSize = false;
+            StyleManager.Register(this);
+        }
+
+        /// <summary>
+        /// Called by StyleManager to notify control that style on manager has changed and that control should refresh its appearance if
+        /// its style is controlled by StyleManager.
+        /// </summary>
+        /// <param name="newStyle">New active style.</param>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void StyleManagerStyleChanged(eDotNetBarStyle newStyle)
+        {
+            // Metro needs BackColor and ForeColor set
+            if (StyleManager.IsMetro(newStyle) || StyleManager.IsMetro(StyleManager.PreviousStyle) && !StyleManager.IsMetro(newStyle))
+                StyleManager.UpdateAmbientColors(this);
+            UpdateEnabledBackColor();
+        }
+
+        internal TextBoxX(bool isTextBoxItem)
+            : this()
+        {
+            m_IsTextBoxItem = isTextBoxItem;
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            if (m_NCPainter != null)
+            {
+                m_NCPainter.Dispose();
+                //m_NCPainter = null;
+            }
+            if (m_BorderStyle != null) m_BorderStyle.StyleChanged -= new EventHandler(BorderStyle_StyleChanged);
+            StyleManager.Unregister(this);
+            base.Dispose(disposing);
+        }
+        #endregion
+
+        #region Windows Messages Handling
+        private bool m_IgnoreFocus = false;
+        private bool _MouseOverButtons = false;
+        protected override void WndProc(ref Message m)
+        {
+            if (this.IsDisposed)
+            {
+                base.WndProc(ref m);
+                return;
+            }
+            if (m_NCPainter != null)
+            {
+                bool callBase = m_NCPainter.WndProc(ref m);
+
+                if (callBase)
+                    base.WndProc(ref m);
+            }
+            else
+            {
+                base.WndProc(ref m);
+            }
+
+#if FRAMEWORK20
+            if (RenderButtons)
+            {
+                switch (m.Msg)
+                {
+                    case (int)WinApi.WindowsMessages.WM_NCMOUSEMOVE:
+                    case (int)WinApi.WindowsMessages.WM_NCHITTEST:
+                        {
+                            Point p = PointToClient(new Point(WinApi.LOWORD(m.LParam), WinApi.HIWORD(m.LParam)));
+                            if (_ButtonGroup.RenderBounds.Contains(p))
+                            {
+                                m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.ClientArea);
+                                return;
+                            }
+                            break;
+                        }
+                }
+            }
+#endif
+
+            switch (m.Msg)
+            {
+                case (int)WinApi.WindowsMessages.WM_SETFOCUS:
+                    {
+                        if (m_IgnoreFocus)
+                        {
+                            m_IgnoreFocus = false;
+                        }
+                        else
+                        {
+                            m_Focused = true;
+                            m_LastFocusWindow = m.WParam;
+                            m_OriginalText = this.Text;
+                            if (this.FocusHighlightEnabled && this.Enabled)
+                            {
+                                m_LastBackColor = this.BackColor;
+                                this.BackColor = this.FocusHighlightColor;
+                                this.InvalidateNonClient();
+                            }
+                        }
+                        break;
+                    }
+                case (int)WinApi.WindowsMessages.WM_KILLFOCUS:
+                    {
+                        if (!m_Focused)
+                        {
+                            m_IgnoreFocus = true;
+                        }
+                        else
+                        {
+                            m_Focused = false;
+                            if (this.Text.Length == 0)
+                                this.Invalidate();
+                            if (this.FocusHighlightEnabled && !m_LastBackColor.IsEmpty)
+                            {
+                                this.BackColor = m_LastBackColor;
+                                this.InvalidateNonClient();
+                            }
+                        }
+                        break;
+                    }
+                case (int)WinApi.WindowsMessages.WM_PAINT:
+                    {
+                        if (RenderWatermark)
+                            DrawWatermark();
+                        if (this.Parent is ItemControl)
+                            ((ItemControl)this.Parent).UpdateKeyTipsCanvas();
+                        break;
+                    }
+            }
+        }
+
+        private bool RenderWatermark
+        {
+            get
+            {
+                if (!_WatermarkEnabled)
+                    return false;
+                if (_WatermarkBehavior == eWatermarkBehavior.HideOnFocus)
+                    return !m_Focused && this.Enabled && this.Text != null && this.Text.Length == 0 && (m_WatermarkText.Length > 0 || _WatermarkImage != null);
+                else
+                    return this.Enabled && this.Text != null && this.Text.Length == 0 && (m_WatermarkText.Length > 0 || _WatermarkImage != null);
+            }
+        }
+        #endregion
+
+        #region Internal Implementation
+
+        private bool _IsEnterInputKey = false;
+        /// <summary>
+        /// Indicates whether internal override for IsInputKey returns true for the Enter key.
+        /// </summary>
+        [DefaultValue(false), Category("Behavior"), Description("Indicates whether internal override for IsInputKey returns true for the Enter key.")]
+        public bool IsEnterInputKey
+        {
+            get { return _IsEnterInputKey; }
+            set { _IsEnterInputKey = value; }
+        }
+
+        protected override bool IsInputKey(Keys keyData)
+        {
+            if (keyData == Keys.Enter && _IsEnterInputKey)
+                return true;
+            return base.IsInputKey(keyData);
+        }
+
+        private bool _AutoSelectAll = false;
+        /// <summary>
+        /// Indicates whether all text is auto-selected when control gets input focus. Default value is false.
+        /// </summary>
+        [DefaultValue(false), Category("Behavior"), Description("Indicates whether all text is auto-selected when control gets input focus.")]
+        public bool AutoSelectAll
+        {
+            get { return _AutoSelectAll; }
+            set { _AutoSelectAll = value; }
+        }
+        protected override void OnKeyPress(KeyPressEventArgs e)
+        {
+            _ButtonGroup.ProcessKeyPress(e);
+            if (!this.Multiline && _PreventEnterBeep && e.KeyChar == (char)Keys.Enter)
+            {
+                e.Handled = true;
+            }
+            base.OnKeyPress(e);
+        }
+
+        private bool _PreventEnterBeep = false;
+        /// <summary>
+        /// Gets or sets whether control prevents Beep sound when Enter key is pressed.
+        /// </summary>
+        [DefaultValue(false), Category("Behavior"), Description("Gets or sets whether control prevents Beep sound when Enter key is pressed.")]
+        public bool PreventEnterBeep
+        {
+            get { return _PreventEnterBeep; }
+            set
+            {
+                _PreventEnterBeep = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether FocusHighlightColor is used as background color to highlight text box when it has input focus. Default value is false.
+        /// </summary>
+        [DefaultValue(false), Browsable(true), Category("Appearance"), Description("Indicates whether FocusHighlightColor is used as background color to highlight text box when it has input focus.")]
+        public bool FocusHighlightEnabled
+        {
+            get { return m_FocusHighlightEnabled; }
+            set
+            {
+                if (m_FocusHighlightEnabled != value)
+                {
+                    m_FocusHighlightEnabled = value;
+                    if (this.Focused)
+                        this.Invalidate();
+                    if (!m_FocusHighlightEnabled)
+                        this.ResetBackColor();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the color used as background color to highlight text box when it has input focus and focus highlight is enabled.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), Description("Indicates color used as background color to highlight text box when it has input focus and focus highlight is enabled.")]
+        public Color FocusHighlightColor
+        {
+            get { return m_FocusHighlightColor; }
+            set
+            {
+                if (m_FocusHighlightColor != value)
+                {
+                    m_FocusHighlightColor = value;
+                    if (this.Focused)
+                        this.Invalidate();
+                }
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeFocusHighlightColor()
+        {
+            return !m_FocusHighlightColor.Equals(ColorScheme.GetColor(0xFFFF88));
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetFocusHighlightColor()
+        {
+            FocusHighlightColor = ColorScheme.GetColor(0xFFFF88);
+        }
+
+        internal void ReleaseFocus()
+        {
+            if (this.Focused && m_LastFocusWindow != IntPtr.Zero)
+            {
+                IntPtr focus = m_LastFocusWindow;
+                m_LastFocusWindow = IntPtr.Zero;
+                Control ctrl = Control.FromChildHandle(focus);
+                if (ctrl != this)
+                {
+                    Control p = this.Parent;
+                    while (p != null)
+                    {
+                        if (p == ctrl)
+                        {
+                            if (ctrl is MenuPanel)
+                                ctrl.Focus();
+                            return;
+                        }
+                        p = p.Parent;
+                    }
+
+                    if (ctrl != null)
+                        ctrl.Focus();
+                    else
+                    {
+                        NativeFunctions.SetFocus(focus);
+                    }
+                }
+            }
+        }
+
+        protected override void OnKeyUp(KeyEventArgs e)
+        {
+            _ButtonGroup.ProcessKeyUp(e);
+            base.OnKeyUp(e);
+        }
+
+        protected override void OnKeyDown(KeyEventArgs e)
+        {
+            _ButtonGroup.ProcessKeyDown(e);
+
+            base.OnKeyDown(e);
+            if (m_IsTextBoxItem)
+            {
+                /*if (e.KeyCode == Keys.Enter)
+                    ReleaseFocus();
+                else*/
+                if (!e.Handled && e.KeyCode == Keys.Escape)
+                {
+                    this.Text = m_OriginalText;
+                    this.SelectionStart = 0;
+                    ReleaseFocus();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Occurs during preprocessing to handle command keys. Command keys are keys that always take precedence over regular input keys. Examples of command keys include accelerators and menu shortcuts. Set Handled=true to indicate that you handled the key and that it should not be passed for further processing.
+        /// </summary>
+        [Description("Occurs during preprocessing to handle command keys. Command keys are keys that always take precedence over regular input keys. Examples of command keys include accelerators and menu shortcuts. Set Handled=true to indicate that you handled the key and that it should not be passed for further processing.")]
+        public event KeyEventHandler CommandKeyDown;
+        /// <summary>
+        /// Raises CommandKeyDown event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnCommandKeyDown(KeyEventArgs e)
+        {
+            KeyEventHandler handler = CommandKeyDown;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
+        {
+            if ((keyData & Keys.A) == Keys.A && Control.ModifierKeys == Keys.ControlKey)
+            {
+                this.SelectAll();
+                return true;
+            }
+            if (_ButtonGroup.ProcessCmdKey(ref msg, keyData))
+                return true;
+            if (CommandKeyDown != null)
+            {
+                KeyEventArgs args = new KeyEventArgs(keyData);
+                OnCommandKeyDown(args);
+                if (args.Handled) return true;
+            }
+            return base.ProcessCmdKey(ref msg, keyData);
+        }
+
+        protected override void OnGotFocus(EventArgs e)
+        {
+            if (_AutoSelectAll)
+                this.SelectAll();
+            base.OnGotFocus(e);
+        }
+
+        protected override void OnLostFocus(EventArgs e)
+        {
+            m_LastFocusWindow = IntPtr.Zero;
+            base.OnLostFocus(e);
+        }
+
+        /// <summary>
+        /// Gets or sets the scrollbar skinning type when control is using Office 2007 style.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public eScrollBarSkin ScrollbarSkin
+        {
+            get { return m_NCPainter.SkinScrollbars; }
+            set { m_NCPainter.SkinScrollbars = value; }
+        }
+
+        /// <summary>
+        /// Specifies the control border style. Default value has Class property set so the system style for the control is used.
+        /// </summary>
+        [Browsable(true), Category("Style"), Description("Specifies the control border style. Default value has Class property set so the system style for the control is used."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ElementStyle Border
+        {
+            get { return m_BorderStyle; }
+        }
+
+        private void BorderStyle_StyleChanged(object sender, EventArgs e)
+        {
+            InvalidateNonClient();
+        }
+
+        protected override void OnReadOnlyChanged(EventArgs e)
+        {
+            InvalidateNonClient();
+            base.OnReadOnlyChanged(e);
+        }
+
+        /// <summary>
+        /// Invalidates non-client area of the text box as response to the border changes.
+        /// </summary>
+        public void InvalidateNonClient()
+        {
+            if (!BarFunctions.IsHandleValid(this)) return;
+            NativeFunctions.SetWindowPos(this.Handle, IntPtr.Zero, 0, 0, 0, 0, NativeFunctions.SWP_FRAMECHANGED |
+                                NativeFunctions.SWP_NOACTIVATE | NativeFunctions.SWP_NOMOVE | NativeFunctions.SWP_NOSIZE | NativeFunctions.SWP_NOZORDER);
+            SetAutoHeight();
+            const int RDW_INVALIDATE = 0x0001;
+            const int RDW_FRAME = 0x0400;
+            NativeFunctions.RECT r = new NativeFunctions.RECT(0, 0, this.Width, this.Height);
+            NativeFunctions.RedrawWindow(this.Handle, ref r, IntPtr.Zero, RDW_INVALIDATE | RDW_FRAME);
+        }
+
+        private TextMarkup.BodyElement m_TextMarkup = null;
+        private void MarkupTextChanged()
+        {
+            m_TextMarkup = null;
+
+            if (!TextMarkup.MarkupParser.IsMarkup(ref m_WatermarkText))
+                return;
+
+            m_TextMarkup = TextMarkup.MarkupParser.Parse(m_WatermarkText);
+            ResizeMarkup();
+        }
+
+        private void ResizeMarkup()
+        {
+            if (m_TextMarkup != null)
+            {
+                using (Graphics g = this.CreateGraphics())
+                {
+                    MarkupDrawContext dc = GetMarkupDrawContext(g);
+                    m_TextMarkup.Measure(GetWatermarkBounds().Size, dc);
+                    Size sz = m_TextMarkup.Bounds.Size;
+                    m_TextMarkup.Arrange(new Rectangle(GetWatermarkBounds().Location, sz), dc);
+                }
+            }
+        }
+
+        private Rectangle GetWatermarkBounds()
+        {
+            Rectangle r = this.ClientRectangle;
+            r.Inflate(-1, 0);
+            return r;
+        }
+
+        private void DrawWatermark()
+        {
+            using (Graphics g = this.CreateGraphics())
+            {
+                Rectangle bounds = GetWatermarkBounds();
+                if (_WatermarkImage != null)
+                {
+                    Rectangle imageBounds = new Rectangle(Point.Empty, _WatermarkImage.Size);
+                    if (_WatermarkImageAlignment == ContentAlignment.BottomCenter)
+                        imageBounds.Location = new Point(bounds.X + (bounds.Width - imageBounds.Width) / 2, bounds.Bottom - imageBounds.Height);
+                    else if (_WatermarkImageAlignment == ContentAlignment.BottomLeft)
+                        imageBounds.Location = new Point(bounds.X, bounds.Bottom - imageBounds.Height);
+                    else if (_WatermarkImageAlignment == ContentAlignment.BottomRight)
+                        imageBounds.Location = new Point(bounds.Right - imageBounds.Width, bounds.Bottom - imageBounds.Height);
+                    else if (_WatermarkImageAlignment == ContentAlignment.MiddleCenter)
+                        imageBounds.Location = new Point(bounds.X + (bounds.Width - imageBounds.Width) / 2, bounds.Y + (bounds.Height - imageBounds.Height) / 2);
+                    else if (_WatermarkImageAlignment == ContentAlignment.MiddleLeft)
+                        imageBounds.Location = new Point(bounds.X, bounds.Y + (bounds.Height - imageBounds.Height) / 2);
+                    else if (_WatermarkImageAlignment == ContentAlignment.MiddleRight)
+                        imageBounds.Location = new Point(bounds.Right - imageBounds.Width, bounds.Y + (bounds.Height - imageBounds.Height) / 2);
+                    else if (_WatermarkImageAlignment == ContentAlignment.TopCenter)
+                        imageBounds.Location = new Point(bounds.X + (bounds.Width - imageBounds.Width) / 2, bounds.Y);
+                    else if (_WatermarkImageAlignment == ContentAlignment.TopLeft)
+                        imageBounds.Location = new Point(bounds.X, bounds.Y);
+                    else if (_WatermarkImageAlignment == ContentAlignment.TopRight)
+                        imageBounds.Location = new Point(bounds.Right - imageBounds.Width, bounds.Y);
+                    g.DrawImage(_WatermarkImage, imageBounds);
+
+                    if (_WatermarkImageAlignment == ContentAlignment.BottomLeft || _WatermarkImageAlignment == ContentAlignment.MiddleLeft || _WatermarkImageAlignment == ContentAlignment.TopLeft)
+                    {
+                        bounds.X = imageBounds.Right;
+                        bounds.Width = Math.Max(0, bounds.Width - imageBounds.Width);
+                    }
+                    else if (_WatermarkImageAlignment == ContentAlignment.BottomRight || _WatermarkImageAlignment == ContentAlignment.MiddleRight || _WatermarkImageAlignment == ContentAlignment.TopRight)
+                    {
+                        bounds.Width = Math.Max(0, bounds.Width - imageBounds.Width);
+                    }
+                }
+
+                if (bounds.Width <= 0) return;
+
+                if (m_TextMarkup != null)
+                {
+                    MarkupDrawContext dc = GetMarkupDrawContext(g);
+                    m_TextMarkup.Render(dc);
+                }
+                else
+                {
+                    eTextFormat tf = eTextFormat.Left;
+                    if (this.Multiline)
+                    {
+                        if (this.TextAlign == HorizontalAlignment.Center)
+                            tf |= eTextFormat.VerticalCenter;
+                        else if (TextAlign == HorizontalAlignment.Right)
+                            tf |= eTextFormat.Bottom;
+                    }
+
+                    if (this.RightToLeft == RightToLeft.Yes) tf |= eTextFormat.RightToLeft;
+                    if (this.TextAlign == HorizontalAlignment.Left)
+                        tf |= eTextFormat.Left;
+                    else if (this.TextAlign == HorizontalAlignment.Right)
+                        tf |= eTextFormat.Right;
+                    else if (this.TextAlign == HorizontalAlignment.Center)
+                        tf |= eTextFormat.HorizontalCenter;
+                    tf |= eTextFormat.EndEllipsis;
+                    tf |= eTextFormat.WordBreak;
+                    TextDrawing.DrawString(g, m_WatermarkText, (m_WatermarkFont == null ? this.Font : m_WatermarkFont),
+                        m_WatermarkColor, bounds, tf);
+                }
+            }
+        }
+
+        protected override void OnFontChanged(EventArgs e)
+        {
+            SetAutoHeight();
+            base.OnFontChanged(e);
+        }
+        /// <summary>
+        /// Calculates and sets the text-box height based on font and style. This method is used internally and should not be used.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void SetAutoHeight()
+        {
+            if (!this.AutoSize && this.Multiline == false && this.BorderStyle == BorderStyle.None && !this.IsDisposed && this.Parent != null && !m_IsTextBoxItem)
+            {
+                int h = this.FontHeight;
+                if (this.Font != null) h = Math.Max(h, this.Font.Height);
+                h++;
+                // Adjust for DPI other than 96
+                //using (Graphics graphics = Graphics.FromHwnd(IntPtr.Zero))
+                //{
+                //    if (graphics.DpiX != 96f)
+                //    {
+                //        h = (int)Math.Ceiling(h * (graphics.DpiX / 96f));
+                //    }
+                //}
+                bool disposeStyle = false;
+                ElementStyle style = GetBorderStyle(out disposeStyle);
+                if (style != null)
+                {
+                    if (style.PaintTopBorder)
+                    {
+                        if (style.CornerType == eCornerType.Rounded || style.CornerType == eCornerType.Diagonal)
+                            h += Math.Max(style.BorderTopWidth, style.CornerDiameter / 2 + 1);
+                        else
+                            h += style.BorderTopWidth;
+                    }
+
+                    if (style.PaintBottomBorder)
+                    {
+                        if (style.CornerType == eCornerType.Rounded || style.CornerType == eCornerType.Diagonal)
+                            h += Math.Max(style.BorderBottomWidth, style.CornerDiameter / 2 + 1);
+                        else
+                            h += style.BorderBottomWidth;
+                    }
+                    h += style.PaddingTop + style.PaddingBottom;
+                    if (disposeStyle) style.Dispose();
+                }
+#if (FRAMEWORK20)
+                if (_ButtonCustom != null && _ButtonCustom.Visible && _ButtonCustom.Image != null)
+                {
+                    h = Math.Max(h, _ButtonCustom.Image.Height + 6);
+                }
+                if (_ButtonCustom2 != null && _ButtonCustom2.Visible && _ButtonCustom2.Image != null)
+                {
+                    h = Math.Max(h, _ButtonCustom2.Image.Height + 6);
+                }
+#endif
+                this.Height = h;
+            }
+        }
+
+        protected override void OnResize(EventArgs e)
+        {
+            ResizeMarkup();
+#if (FRAMEWORK20)
+            _ButtonGroup.InvalidateArrange();
+#endif
+            base.OnResize(e);
+        }
+
+        private MarkupDrawContext GetMarkupDrawContext(Graphics g)
+        {
+            return new MarkupDrawContext(g, (m_WatermarkFont == null ? this.Font : m_WatermarkFont), m_WatermarkColor, this.RightToLeft == RightToLeft.Yes);
+        }
+
+        protected override void OnTextAlignChanged(EventArgs e)
+        {
+            if (m_WatermarkText.Length > 0)
+                this.Invalidate();
+            base.OnTextAlignChanged(e);
+        }
+
+        protected override void OnHandleCreated(EventArgs e)
+        {
+            base.OnHandleCreated(e);
+        }
+
+        private Color _EnabledBackColor = Color.Empty;
+        protected override void OnEnabledChanged(EventArgs e)
+        {
+            if (m_WatermarkText.Length > 0)
+                this.Invalidate();
+            UpdateEnabledBackColor();
+            base.OnEnabledChanged(e);
+        }
+
+        private void UpdateEnabledBackColor()
+        {
+            if (!_DisabledBackColor.IsEmpty)
+            {
+                if (!this.Enabled)
+                {
+                    _EnabledBackColor = this.BackColor;
+                    this.BackColor = _DisabledBackColor;
+                }
+                else if (!_EnabledBackColor.IsEmpty)
+                {
+                    this.BackColor = _EnabledBackColor;
+                    _EnabledBackColor = Color.Empty;
+                }
+            }
+        }
+
+        protected override void OnTextChanged(EventArgs e)
+        {
+            if (m_WatermarkText.Length > 0)
+                this.Invalidate();
+            base.OnTextChanged(e);
+        }
+
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public new BorderStyle BorderStyle
+        {
+            get { return base.BorderStyle; }
+            set { }
+        }
+
+        private Rendering.BaseRenderer m_DefaultRenderer = null;
+        private Rendering.BaseRenderer m_Renderer = null;
+        private eRenderMode m_RenderMode = eRenderMode.Global;
+        /// <summary>
+        /// Returns the renderer control will be rendered with.
+        /// </summary>
+        /// <returns>The current renderer.</returns>
+        public virtual Rendering.BaseRenderer GetRenderer()
+        {
+            if (m_RenderMode == eRenderMode.Global && Rendering.GlobalManager.Renderer != null)
+                return Rendering.GlobalManager.Renderer;
+            else if (m_RenderMode == eRenderMode.Custom && m_Renderer != null)
+                return m_Renderer;
+
+            if (m_DefaultRenderer == null)
+                m_DefaultRenderer = new Rendering.Office2007Renderer();
+
+            return m_DefaultRenderer;
+        }
+
+        /// <summary>
+        /// Gets or sets the rendering mode used by control. Default value is eRenderMode.Global which means that static GlobalManager.Renderer is used. If set to Custom then Renderer property must
+        /// also be set to the custom renderer that will be used.
+        /// </summary>
+        [Browsable(false), DefaultValue(eRenderMode.Global)]
+        public eRenderMode RenderMode
+        {
+            get { return m_RenderMode; }
+            set
+            {
+                if (m_RenderMode != value)
+                {
+                    m_RenderMode = value;
+                    this.Invalidate(true);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the custom renderer used by the items on this control. RenderMode property must also be set to eRenderMode.Custom in order renderer
+        /// specified here to be used.
+        /// </summary>
+        [Browsable(false), DefaultValue(null)]
+        public DevComponents.DotNetBar.Rendering.BaseRenderer Renderer
+        {
+            get
+            {
+                return m_Renderer;
+            }
+            set { m_Renderer = value; }
+        }
+
+        private bool _WatermarkEnabled = true;
+        /// <summary>
+        /// Gets or sets whether watermark text is displayed when control is empty. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Description("Indicates whether watermark text is displayed when control is empty.")]
+        public virtual bool WatermarkEnabled
+        {
+            get { return _WatermarkEnabled; }
+            set { _WatermarkEnabled = value; this.Invalidate(); }
+        }
+
+        private Image _WatermarkImage = null;
+        /// <summary>
+        /// Gets or sets the watermark image displayed inside of the control when Text is not set and control does not have input focus.
+        /// </summary>
+        [DefaultValue(null), Category("Appearance"), Description("Indicates watermark image displayed inside of the control when Text is not set and control does not have input focus.")]
+        public Image WatermarkImage
+        {
+            get { return _WatermarkImage; }
+            set { _WatermarkImage = value; this.Invalidate(); }
+        }
+        private ContentAlignment _WatermarkImageAlignment = ContentAlignment.MiddleLeft;
+        /// <summary>
+        /// Gets or sets the watermark image alignment.
+        /// </summary>
+        [DefaultValue(ContentAlignment.MiddleLeft), Category("Appearance"), Description("Indicates watermark image alignment.")]
+        public ContentAlignment WatermarkImageAlignment
+        {
+            get { return _WatermarkImageAlignment; }
+            set { _WatermarkImageAlignment = value; this.Invalidate(); }
+        }
+
+        /// <summary>
+        /// Gets or sets the watermark (tip) text displayed inside of the control when Text is not set and control does not have input focus. This property supports text-markup.
+        /// </summary>
+        [Browsable(true), DefaultValue(""), Localizable(true), Category("Appearance"), Description("Indicates watermark text displayed inside of the control when Text is not set and control does not have input focus."), Editor("DevComponents.DotNetBar.Design.TextMarkupUIEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor))]
+        public string WatermarkText
+        {
+            get { return m_WatermarkText; }
+            set
+            {
+                if (value == null) value = "";
+                m_WatermarkText = value;
+                MarkupTextChanged();
+                this.Invalidate();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the watermark font.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), Description("Indicates watermark font."), DefaultValue(null)]
+        public Font WatermarkFont
+        {
+            get { return m_WatermarkFont; }
+            set { m_WatermarkFont = value; this.Invalidate(); }
+        }
+
+        /// <summary>
+        /// Gets or sets the watermark text color.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), Description("Indicates watermark text color.")]
+        public Color WatermarkColor
+        {
+            get { return m_WatermarkColor; }
+            set { m_WatermarkColor = value; this.Invalidate(); }
+        }
+        /// <summary>
+        /// Indicates whether property should be serialized by Windows Forms designer.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeWatermarkColor()
+        {
+            return m_WatermarkColor != SystemColors.GrayText;
+        }
+        /// <summary>
+        /// Resets the property to default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetWatermarkColor()
+        {
+            this.WatermarkColor = SystemColors.GrayText;
+        }
+
+        private eWatermarkBehavior _WatermarkBehavior = eWatermarkBehavior.HideOnFocus;
+        /// <summary>
+        /// Gets or sets the watermark hiding behaviour. Default value indicates that watermark is hidden when control receives input focus.
+        /// </summary>
+        [DefaultValue(eWatermarkBehavior.HideOnFocus), Category("Behavior"), Description("Indicates watermark hiding behaviour.")]
+        public eWatermarkBehavior WatermarkBehavior
+        {
+            get { return _WatermarkBehavior; }
+            set { _WatermarkBehavior = value; this.Invalidate(); }
+        }
+
+        private ElementStyle GetBorderStyle(out bool disposeStyle)
+        {
+            disposeStyle = false;
+            m_BorderStyle.SetColorScheme(this.GetColorScheme());
+            return ElementStyleDisplay.GetElementStyle(m_BorderStyle, out disposeStyle);
+        }
+
+#if FRAMEWORK20
+        private InputButtonSettings _ButtonCustom = null;
+        /// <summary>
+        /// Gets the object that describes the settings for the custom button that can execute an custom action of your choosing when clicked.
+        /// </summary>
+        [Category("Buttons"), Description("Describes the settings for the custom button that can execute an custom action of your choosing when clicked."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public InputButtonSettings ButtonCustom
+        {
+            get
+            {
+                return _ButtonCustom;
+            }
+        }
+
+        private InputButtonSettings _ButtonCustom2 = null;
+        /// <summary>
+        /// Gets the object that describes the settings for the custom button that can execute an custom action of your choosing when clicked.
+        /// </summary>
+        [Category("Buttons"), Description("Describes the settings for the custom button that can execute an custom action of your choosing when clicked."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public InputButtonSettings ButtonCustom2
+        {
+            get
+            {
+                return _ButtonCustom2;
+            }
+        }
+
+
+        void IInputButtonControl.InputButtonSettingsChanged(InputButtonSettings inputButtonSettings)
+        {
+            OnInputButtonSettingsChanged(inputButtonSettings);
+        }
+
+        protected virtual void OnInputButtonSettingsChanged(InputButtonSettings inputButtonSettings)
+        {
+            UpdateButtons();
+        }
+
+        private VisualGroup _ButtonGroup = null;
+        private void UpdateButtons()
+        {
+            RecreateButtons();
+            _ButtonGroup.InvalidateArrange();
+            this.InvalidateNonClient();
+        }
+
+        protected virtual void RecreateButtons()
+        {
+            VisualItem[] buttons = CreateOrderedButtonList();
+            // Remove all system buttons that are already in the list
+            VisualGroup group = _ButtonGroup;
+            VisualItem[] items = new VisualItem[group.Items.Count];
+            group.Items.CopyTo(items);
+            foreach (VisualItem item in items)
+            {
+                if (item.ItemType == eSystemItemType.SystemButton)
+                {
+                    group.Items.Remove(item);
+                    if (item == _ButtonCustom.ItemReference)
+                        item.MouseUp -= new MouseEventHandler(CustomButtonClick);
+                    else if (item == _ButtonCustom2.ItemReference)
+                        item.MouseUp -= new MouseEventHandler(CustomButton2Click);
+                }
+            }
+
+            // Add new buttons to the list
+            group.Items.AddRange(buttons);
+        }
+
+        private void CustomButtonClick(object sender, MouseEventArgs e)
+        {
+            if (_ButtonCustom.ItemReference.RenderBounds.Contains(e.X, e.Y))
+                OnButtonCustomClick(e);
+        }
+
+        /// <summary>
+        /// Invokes ButtonCustomClick event.
+        /// </summary>
+        public void PerformButtonCustomClick()
+        {
+            OnButtonCustomClick(EventArgs.Empty);
+        }
+
+        protected virtual void OnButtonCustomClick(EventArgs e)
+        {
+            if (ButtonCustomClick != null)
+                ButtonCustomClick(this, e);
+        }
+
+        private void CustomButton2Click(object sender, MouseEventArgs e)
+        {
+            if (_ButtonCustom2.ItemReference.RenderBounds.Contains(e.X, e.Y))
+                OnButtonCustom2Click(e);
+        }
+
+        /// <summary>
+        /// Invokes ButtonCustomClick2 event.
+        /// </summary>
+        public void PerformButtonCustom2Click()
+        {
+            OnButtonCustom2Click(EventArgs.Empty);
+        }
+
+        protected virtual void OnButtonCustom2Click(EventArgs e)
+        {
+            if (ButtonCustom2Click != null)
+                ButtonCustom2Click(this, e);
+        }
+
+        private VisualItem[] CreateOrderedButtonList()
+        {
+            SortedList list = CreateSortedButtonList();
+
+            VisualItem[] items = new VisualItem[list.Count];
+            list.Values.CopyTo(items, 0);
+
+            return items;
+        }
+
+        private void CustomButtonKeyClick(object sender, EventArgs e)
+        {
+            if (e is KeyEventArgs)
+                OnButtonCustomClick(e);
+        }
+        private void CustomButton2KeyClick(object sender, EventArgs e)
+        {
+            if (e is KeyEventArgs)
+                OnButtonCustom2Click(e);
+        }
+        protected virtual SortedList CreateSortedButtonList()
+        {
+            SortedList list = new SortedList(4);
+            if (_ButtonCustom.Visible)
+            {
+                VisualItem button = CreateButton(_ButtonCustom);
+                if (_ButtonCustom.ItemReference != null)
+                {
+                    _ButtonCustom.ItemReference.MouseUp -= CustomButtonClick;
+                    _ButtonCustom.ItemReference.Click -= CustomButtonKeyClick;
+                }
+                _ButtonCustom.ItemReference = button;
+                button.Click += CustomButtonKeyClick;
+                button.MouseUp += new MouseEventHandler(CustomButtonClick);
+                button.Enabled = _ButtonCustom.Enabled;
+                list.Add(_ButtonCustom, button);
+            }
+
+            if (_ButtonCustom2.Visible)
+            {
+                VisualItem button = CreateButton(_ButtonCustom2);
+                if (_ButtonCustom2.ItemReference != null)
+                {
+                    _ButtonCustom2.ItemReference.MouseUp -= CustomButton2Click;
+                    _ButtonCustom2.ItemReference.Click -= CustomButton2KeyClick;
+                }
+                _ButtonCustom2.ItemReference = button;
+                button.Click += CustomButton2KeyClick;
+                button.MouseUp += new MouseEventHandler(CustomButton2Click);
+                button.Enabled = _ButtonCustom2.Enabled;
+                list.Add(_ButtonCustom2, button);
+            }
+
+            return list;
+        }
+
+        protected virtual VisualItem CreateButton(InputButtonSettings buttonSettings)
+        {
+            VisualCustomButton button = new VisualCustomButton();
+            ApplyButtonSettings(buttonSettings, button);
+            return button;
+        }
+
+        protected virtual void ApplyButtonSettings(InputButtonSettings buttonSettings, VisualButton button)
+        {
+            button.Text = buttonSettings.Text;
+            button.Image = buttonSettings.Image;
+            button.ItemType = eSystemItemType.SystemButton;
+            button.Enabled = buttonSettings.Enabled;
+            button.Shortcut = buttonSettings.Shortcut;
+            button.Tooltip = buttonSettings.Tooltip;
+            button.Symbol = buttonSettings.Symbol;
+            button.SymbolSet = buttonSettings.SymbolSet;
+            button.SymbolColor = buttonSettings.SymbolColor;
+            button.Checked = buttonSettings.Checked;
+        }
+
+        private void CreateButtonGroup()
+        {
+            VisualGroup group = new VisualGroup();
+            group.HorizontalItemSpacing = 0;
+            group.ArrangeInvalid += ButtonGroupArrangeInvalid;
+            group.RenderInvalid += ButtonGroupRenderInvalid;
+            group.ResetMouseHover += ButtonGroupResetMouseHover;
+            _ButtonGroup = group;
+        }
+
+        private void ButtonGroupRenderInvalid(object sender, EventArgs e)
+        {
+            InvalidateNonClient();
+        }
+
+        private void ButtonGroupArrangeInvalid(object sender, EventArgs e)
+        {
+            InvalidateNonClient();
+        }
+
+        private void ButtonGroupResetMouseHover(object sender, EventArgs e)
+        {
+            DevComponents.AdvTree.Interop.WinApi.ResetHover(this);
+        }
+
+        private bool _MouseOver = false;
+        private PaintInfo CreatePaintInfo(Graphics g)
+        {
+            PaintInfo p = new PaintInfo();
+            p.Graphics = g;
+            p.DefaultFont = this.Font;
+            p.ForeColor = this.ForeColor;
+            p.RenderOffset = new System.Drawing.Point();
+            Size s = this.Size;
+            bool disposeStyle = false;
+            ElementStyle style = GetBorderStyle(out disposeStyle);
+            s.Height -= (ElementStyleLayout.TopWhiteSpace(style, eSpacePart.Border) + ElementStyleLayout.BottomWhiteSpace(style, eSpacePart.Border)) + 2;
+            s.Width -= (ElementStyleLayout.LeftWhiteSpace(style, eSpacePart.Border) + ElementStyleLayout.RightWhiteSpace(style, eSpacePart.Border)) + 2;
+            p.AvailableSize = s;
+            p.ParentEnabled = this.Enabled;
+            p.MouseOver = _MouseOver || this.Focused;
+            if (disposeStyle) style.Dispose();
+            return p;
+        }
+
+        private bool RenderButtons
+        {
+            get
+            {
+                return (this.ScrollBars == ScrollBars.None) && (_ButtonCustom != null && _ButtonCustom.Visible || _ButtonCustom2 != null && _ButtonCustom2.Visible);
+            }
+        }
+
+        private void PaintButtons(Graphics g)
+        {
+            PaintInfo p = CreatePaintInfo(g);
+            if (!_ButtonGroup.IsLayoutValid)
+            {
+                _ButtonGroup.PerformLayout(p);
+            }
+            bool disposeStyle = false;
+            ElementStyle style = GetBorderStyle(out disposeStyle);
+            //p.RenderOffset = new Point(this.Width - ElementStyleLayout.RightWhiteSpace(style, eSpacePart.Border) - _ButtonGroup.Size.Width, ElementStyleLayout.TopWhiteSpace(style, eSpacePart.Border));
+            _ButtonGroup.RenderBounds = new Rectangle(this.Width - (ElementStyleLayout.RightWhiteSpace(style, eSpacePart.Border) + 1) - _ButtonGroup.Size.Width, ElementStyleLayout.TopWhiteSpace(style, eSpacePart.Border) + 1,
+                _ButtonGroup.Size.Width, _ButtonGroup.Size.Height);
+            _ButtonGroup.ProcessPaint(p);
+            if (disposeStyle) style.Dispose();
+        }
+
+        private Cursor _ControlCursor = null;
+        protected override void OnMouseMove(MouseEventArgs e)
+        {
+            if (RenderButtons)
+            {
+                _ButtonGroup.ProcessMouseMove(e);
+                if (_ButtonGroup.RenderBounds.Contains(e.X, e.Y))
+                {
+                    if (_ControlCursor == null)
+                    {
+                        _InternalCursorChange = true;
+                        _ControlCursor = this.Cursor;
+                        this.Cursor = Cursors.Arrow;
+                        _InternalCursorChange = false;
+                    }
+                }
+                else if (_ControlCursor != null)
+                {
+                    _InternalCursorChange = true;
+                    this.Cursor = _ControlCursor;
+                    _ControlCursor = null;
+                    _InternalCursorChange = false;
+                }
+            }
+            base.OnMouseMove(e);
+        }
+        protected override void OnMouseEnter(EventArgs e)
+        {
+            _MouseOver = true;
+            base.OnMouseEnter(e);
+        }
+        protected override void OnMouseLeave(EventArgs e)
+        {
+            _MouseOver = false;
+            if (RenderButtons)
+            {
+                _ButtonGroup.ProcessMouseLeave();
+                if (_ControlCursor != null)
+                {
+                    _InternalCursorChange = true;
+                    this.Cursor = _ControlCursor;
+                    _ControlCursor = null;
+                    _InternalCursorChange = false;
+                }
+            }
+            base.OnMouseLeave(e);
+        }
+        private bool _InternalCursorChange = false;
+        protected override void OnCursorChanged(EventArgs e)
+        {
+            if (_ControlCursor != null && !_InternalCursorChange)
+                _ControlCursor = this.Cursor;
+            base.OnCursorChanged(e);
+        }
+        protected override void OnMouseDown(MouseEventArgs e)
+        {
+            if (RenderButtons)
+                _ButtonGroup.ProcessMouseDown(e);
+            base.OnMouseDown(e);
+        }
+        protected override void OnMouseUp(MouseEventArgs e)
+        {
+            if (RenderButtons)
+                _ButtonGroup.ProcessMouseUp(e);
+            base.OnMouseUp(e);
+        }
+        protected override void OnMouseHover(EventArgs e)
+        {
+            if (RenderButtons)
+                _ButtonGroup.ProcessMouseHover(e);
+            base.OnMouseHover(e);
+        }
+#endif
+        #endregion
+
+        #region INonClientControl Members
+        void INonClientControl.BaseWndProc(ref Message m)
+        {
+            base.WndProc(ref m);
+        }
+
+        //CreateParams INonClientControl.ControlCreateParams
+        //{
+        //    get { return base.CreateParams; }
+        //}
+
+        ItemPaintArgs INonClientControl.GetItemPaintArgs(System.Drawing.Graphics g)
+        {
+            ItemPaintArgs pa = new ItemPaintArgs(this as IOwner, this, g, GetColorScheme());
+            pa.Renderer = this.GetRenderer();
+            pa.DesignerSelection = false; // m_DesignerSelection;
+            pa.GlassEnabled = !this.DesignMode && WinApi.IsGlassEnabled;
+            return pa;
+        }
+
+        ElementStyle INonClientControl.BorderStyle
+        {
+            get { bool disposeStyle = false; return GetBorderStyle(out disposeStyle); }
+        }
+
+        void INonClientControl.PaintBackground(PaintEventArgs e)
+        {
+            if (this.Parent == null) return;
+            Type t = typeof(Control);
+            MethodInfo mi = t.GetMethod("PaintTransparentBackground", BindingFlags.InvokeMethod | BindingFlags.NonPublic | BindingFlags.Instance, null, new Type[] { typeof(PaintEventArgs), typeof(Rectangle) }, null);
+            if (mi != null)
+            {
+                mi.Invoke(this, new object[] { e, new Rectangle(0, 0, this.Width, this.Height) });
+            }
+        }
+
+        private ColorScheme m_ColorScheme = null;
+        /// <summary>
+        /// Returns the color scheme used by control. Color scheme for Office2007 style will be retrived from the current renderer instead of
+        /// local color scheme referenced by ColorScheme property.
+        /// </summary>
+        /// <returns>An instance of ColorScheme object.</returns>
+        protected virtual ColorScheme GetColorScheme()
+        {
+            BaseRenderer r = GetRenderer();
+            if (r is Office2007Renderer)
+                return ((Office2007Renderer)r).ColorTable.LegacyColors;
+            if (m_ColorScheme == null)
+                m_ColorScheme = new ColorScheme(eDotNetBarStyle.Office2007);
+            return m_ColorScheme;
+        }
+
+        IntPtr INonClientControl.Handle
+        {
+            get { return this.Handle; }
+        }
+
+        int INonClientControl.Width
+        {
+            get { return this.Width; }
+        }
+
+        int INonClientControl.Height
+        {
+            get { return this.Height; }
+        }
+
+        bool INonClientControl.IsHandleCreated
+        {
+            get { return this.IsHandleCreated; }
+        }
+
+        Point INonClientControl.PointToScreen(Point client)
+        {
+            return this.PointToScreen(client);
+        }
+
+        Color INonClientControl.BackColor
+        {
+            get { return this.BackColor; }
+        }
+
+        void INonClientControl.AdjustClientRectangle(ref Rectangle r)
+        {
+#if FRAMEWORK20
+            if (RenderButtons)
+            {
+                if (!_ButtonGroup.IsLayoutValid)
+                {
+                    using (Graphics g = this.CreateGraphics())
+                    {
+                        PaintInfo p = CreatePaintInfo(g);
+                        _ButtonGroup.PerformLayout(p);
+                    }
+                }
+                r.Width -= _ButtonGroup.Size.Width + 1;
+            }
+#endif
+        }
+
+        void INonClientControl.AdjustBorderRectangle(ref Rectangle r) { }
+
+        void INonClientControl.RenderNonClient(Graphics g)
+        {
+#if FRAMEWORK20
+            if (RenderButtons)
+                PaintButtons(g);
+#endif
+        }
+
+        private Color _DisabledBackColor = Color.Empty;
+        /// <summary>
+        /// Specifies back color when Enabled=false
+        /// </summary>
+        [Browsable(true), Category("Appearance"), Description("Specifies back color when Enabled=false")]
+        public Color DisabledBackColor
+        {
+            get { return _DisabledBackColor; }
+            set
+            {
+                _DisabledBackColor = value;
+                if (!Enabled) this.Invalidate();
+            }
+        }
+        public bool ShouldSerializeDisabledBackColor()
+        {
+            return !_DisabledBackColor.IsEmpty;
+        }
+        public void ResetDisabledBackColor()
+        {
+            DisabledBackColor = Color.Empty;
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/TextBoxX.ico b/PROMS/DotNetBar Source Code/Controls/TextBoxX.ico
new file mode 100644
index 00000000..71065394
Binary files /dev/null and b/PROMS/DotNetBar Source Code/Controls/TextBoxX.ico differ
diff --git a/PROMS/DotNetBar Source Code/Controls/TokenEditor.ico b/PROMS/DotNetBar Source Code/Controls/TokenEditor.ico
new file mode 100644
index 00000000..58a96c2b
Binary files /dev/null and b/PROMS/DotNetBar Source Code/Controls/TokenEditor.ico differ
diff --git a/PROMS/DotNetBar Source Code/Controls/TokenEditor/EditToken.cs b/PROMS/DotNetBar Source Code/Controls/TokenEditor/EditToken.cs
new file mode 100644
index 00000000..0a18ca01
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/TokenEditor/EditToken.cs	
@@ -0,0 +1,407 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Text;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    /// <summary>
+    /// Class represents single token in TokenEditor control.
+    /// </summary>
+    [ToolboxItem(false)]
+    public class EditToken : Component
+    {
+        #region Constructor
+        /// <summary>
+        /// Initializes a new instance of the EditToken class.
+        /// </summary>
+        /// <param name="value">Indicates token value.</param>
+        public EditToken(string value)
+        {
+            _Value = value;
+        }
+        /// <summary>
+        /// Initializes a new instance of the EditToken class.
+        /// </summary>
+        /// <param name="value">Indicates token value</param>
+        /// <param name="text">Indicates token text</param>
+        public EditToken(string value, string text)
+        {
+            _Value = value;
+            _Text = text;
+        }
+        /// <summary>
+        /// Initializes a new instance of the EditToken class.
+        /// </summary>
+        /// <param name="value">Indicates token value</param>
+        /// <param name="text">Indicates token text</param>
+        /// <param name="image">Indicates token image</param>
+        public EditToken(string value, string text, Image image)
+        {
+            _Value = value;
+            _Text = text;
+            _Image = image;
+        }
+        #endregion
+
+        #region Implementation
+        private eTokenPart _MouseOverPart;
+        private string _Value = "";
+        /// <summary>
+        /// Indicates the token value, for example an email token has email address as token Value and full name as token Text.
+        /// </summary>
+        [DefaultValue(""), Category("Data"), Description("Indicates the token value, for example an email token has email address as token Value and full name as token Text.")]
+        public string Value
+        {
+            get { return _Value; }
+            set
+            {
+                if (value != _Value)
+                {
+                    string oldValue = _Value;
+                    _Value = value;
+                    OnValueChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when Value property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnValueChanged(string oldValue, string newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("Value"));
+        }
+
+        private string _Text = "";
+        /// <summary>
+        /// Indicates the token text, for example an email token has email address as token Value and full name as token Text.
+        /// </summary>
+        [DefaultValue(""), Category("Data"), Description("Indicates the token text, for example an email token has email address as token Value and full name as token Text.")]
+        public string Text
+        {
+            get { return _Text; }
+            set
+            {
+                if (value != _Text)
+                {
+                    string oldValue = _Text;
+                    _Text = value;
+                    OnTextChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when Text property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnTextChanged(string oldValue, string newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("Text"));
+
+        }
+
+        private object _Tag = null;
+        /// <summary>
+        /// Gets or sets custom data associated with the object.
+        /// </summary>
+        [DefaultValue((string)null), Localizable(false), TypeConverter(typeof(StringConverter)), Category("Data"), Description("Custom data associated with the object")]
+        public object Tag
+        {
+            get { return _Tag; }
+            set { _Tag = value; }
+        }
+
+        private Rectangle _Bounds = Rectangle.Empty;
+        /// <summary>
+        /// Gets the display bounds of the token, if displayed, inside of TokenEditor control.
+        /// </summary>
+        [Browsable(false)]
+        public Rectangle Bounds
+        {
+            get { return _Bounds; }
+            internal set { _Bounds = value; }
+        }
+
+        private Image _Image = null;
+        /// <summary>
+        /// Indicates the image that is displayed next to the token
+        /// </summary>
+        [DefaultValue(null), Category("Appearance"), Description("Indicates the image that is displayed next to the token")]
+        public Image Image
+        {
+            get { return _Image; }
+            set
+            {
+                if (value != _Image)
+                {
+                    Image oldValue = _Image;
+                    _Image = value;
+                    OnImageChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when Image property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnImageChanged(Image oldValue, Image newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("Image"));
+        }
+
+        /// <summary>
+        /// Gets the realized symbol string.
+        /// </summary>
+        [Browsable(false)]
+        public string SymbolRealized
+        {
+            get { return _SymbolRealized; }
+        }
+        private string _Symbol = "", _SymbolRealized = "";
+        /// <summary>
+        /// Indicates the symbol displayed on face of the token instead of the image. Setting the symbol overrides the image setting.
+        /// </summary>
+        [DefaultValue(""), Category("Appearance"), Description("Indicates the symbol displayed on face of the token instead of the image. Setting the symbol overrides the image setting.")]
+        [Editor("DevComponents.DotNetBar.Design.SymbolTypeEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor))]
+        public string Symbol
+        {
+            get { return _Symbol; }
+            set
+            {
+                if (value != _Symbol)
+                {
+                    string oldValue = _Symbol;
+                    _Symbol = value;
+                    OnSymbolChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when Symbol property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnSymbolChanged(string oldValue, string newValue)
+        {
+            if (string.IsNullOrEmpty(newValue))
+                _SymbolRealized = "";
+            else
+                _SymbolRealized = Symbols.GetSymbol(newValue);
+            //OnPropertyChanged(new PropertyChangedEventArgs("Symbol"));
+            this.Invalidate();
+        }
+
+        private eSymbolSet _SymbolSet = eSymbolSet.Awesome;
+        /// <summary>
+        /// Gets or sets the symbol set used to represent the Symbol.
+        /// </summary>
+        [Browsable(false), DefaultValue(eSymbolSet.Awesome)]
+        public eSymbolSet SymbolSet
+        {
+            get { return _SymbolSet; }
+            set
+            {
+                if (_SymbolSet != value)
+                {
+                    eSymbolSet oldValue = _SymbolSet;
+                    _SymbolSet = value;
+                    OnSymbolSetChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when SymbolSet property value changes.
+        /// </summary>
+        /// <param name="oldValue">Indciates old value</param>
+        /// <param name="newValue">Indicates new value</param>
+        protected virtual void OnSymbolSetChanged(eSymbolSet oldValue, eSymbolSet newValue)
+        {
+            this.Invalidate();
+        }
+
+        private void Invalidate()
+        {
+            //throw new NotImplementedException();
+        }
+
+        private Color _SymbolColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets the color of the Symbol.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates color of the Symbol.")]
+        public Color SymbolColor
+        {
+            get { return _SymbolColor; }
+            set { _SymbolColor = value; this.Invalidate(); }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeSymbolColor()
+        {
+            return !_SymbolColor.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetSymbolColor()
+        {
+            this.SymbolColor = Color.Empty;
+        }
+
+        private string _Tooltip = "";
+        /// <summary>
+        /// Indicates tooltip that is displayed when mouse is over the token and token is selected.
+        /// </summary>
+        [DefaultValue(""), Category("Behavior"), Description("Indicates tooltip that is displayed when mouse is over the token and token is selected")]
+        public string Tooltip
+        {
+            get { return _Tooltip; }
+            set
+            {
+                if (value !=_Tooltip)
+                {
+                    string oldValue = _Tooltip;
+                    _Tooltip = value;
+                    OnTooltipChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when Tooltip property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnTooltipChanged(string oldValue, string newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("Tooltip"));
+            
+        }
+
+        /// <summary>
+        /// Gets the part of the token mouse is over. Valid only when token is selected.
+        /// </summary>
+        [Browsable(false)]
+        public eTokenPart MouseOverPart
+        {
+            get { return _MouseOverPart; }
+            internal set
+            {
+                if (value !=_MouseOverPart)
+                {
+                    eTokenPart oldValue = _MouseOverPart;
+                    _MouseOverPart = value;
+                    OnMouseOverPartChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when MouseOverPart property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnMouseOverPartChanged(eTokenPart oldValue, eTokenPart newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("MouseOverPart"));
+            
+        }
+
+        private Rectangle _RemoveButtonBounds = Rectangle.Empty;
+        /// <summary>
+        /// Gets the bounds of the remove button if displayed. Valid only when token is selected.
+        /// </summary>
+        [Browsable(false)]
+        public Rectangle RemoveButtonBounds
+        {
+            get
+            {
+                return _RemoveButtonBounds;
+            }
+            internal set
+            {
+                _RemoveButtonBounds = value;
+            }
+        }
+        private Rectangle _ImageBounds = Rectangle.Empty;
+        /// <summary>
+        /// Gets the bounds of the image if displayed. Valid only when token is selected.
+        /// </summary>
+        [Browsable(false)]
+        public Rectangle ImageBounds
+        {
+            get
+            {
+                return _ImageBounds;
+            }
+            internal set
+            {
+                _ImageBounds = value;
+            }
+        }
+
+        private bool _IsSelected = false;
+        /// <summary>
+        /// Indicates whether token is selected.
+        /// </summary>
+        [Browsable(false)]
+        public bool IsSelected
+        {
+            get
+            {
+                return _IsSelected;
+            }
+            internal set
+            {
+                _IsSelected = value;
+            }
+        }
+
+        private bool _IsFocused = false;
+        /// <summary>
+        /// Indicates whether token is focused while selected.
+        /// </summary>
+        [Browsable(false)]
+        public bool IsFocused
+        {
+            get
+            {
+                return _IsFocused;
+            }
+            internal set
+            {
+                _IsFocused = value;
+            }
+        }
+        #endregion
+    }
+
+    /// <summary>
+    /// Defines the token parts.
+    /// </summary>
+    public enum eTokenPart
+    {
+        /// <summary>
+        /// Identifies no token part.
+        /// </summary>
+        None,
+        /// <summary>
+        /// Identifies the token body/text.
+        /// </summary>
+        Token,
+        /// <summary>
+        /// Identifies the remove token button.
+        /// </summary>
+        RemoveButton,
+        /// <summary>
+        /// Identifies the token image.
+        /// </summary>
+        Image
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/TokenEditor/TokenEditor.cs b/PROMS/DotNetBar Source Code/Controls/TokenEditor/TokenEditor.cs
new file mode 100644
index 00000000..28731701
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/TokenEditor/TokenEditor.cs	
@@ -0,0 +1,2382 @@
+using DevComponents.DotNetBar.Primitives;
+using DevComponents.DotNetBar.Rendering;
+using DevComponents.DotNetBar.TextMarkup;
+using DevComponents.Editors;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Drawing.Drawing2D;
+using System.Text;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    [ToolboxItem(true), ToolboxBitmap(typeof(TokenEditor), "Controls.TokenEditor.ico")]
+    [Designer("DevComponents.DotNetBar.Design.TokenEditorDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+    [DefaultEvent("SelectedTokensChanged")]
+    public class TokenEditor : Control, IMessageHandlerClient
+    {
+        #region Constructor
+        private TextBoxX _EditBox;
+        private VScrollBarAdv _VScrollBar = null;
+        /// <summary>
+        /// Initializes a new instance of the TokenEditor class.
+        /// </summary>
+        public TokenEditor()
+        {
+            _SelectedTokens = new CustomCollection<EditToken>();
+            _SelectedTokens.CollectionChanged += SelectedTokensCollectionChanged;
+            _Tokens = new CustomCollection<EditToken>();
+            _Tokens.CollectionChanged += TokensCollectionChanged;
+            this.SetStyle(ControlStyles.UserPaint | ControlStyles.AllPaintingInWmPaint |
+            ControlStyles.Opaque | ControlStyles.ResizeRedraw | ControlStyles.Selectable |
+            ControlStyles.StandardDoubleClick | DisplayHelp.DoubleBufferFlag, true);
+            _BackgroundStyle = new ElementStyle();
+            _BackgroundStyle.Class = ElementStyleClassKeys.DateTimeInputBackgroundKey;
+            _BackgroundStyle.StyleChanged += new EventHandler(this.VisualPropertyChanged);
+
+            _EditBox = new TextBoxX();
+            _EditBox.BorderStyle = BorderStyle.None;
+            _EditBox.Visible = false;
+            _EditBox.TextChanged += EditBoxTextChanged;
+            _EditBox.KeyDown += EditBoxKeyDown;
+            _EditBox.GotFocus += EditBoxGotFocus;
+            this.Controls.Add(_EditBox);
+            _EditBox.SetAutoHeight();
+
+            _VScrollBar = new VScrollBarAdv();
+            _VScrollBar.Visible = false;
+            _VScrollBar.Scroll += VScrollBarScroll;
+            this.Controls.Add(_VScrollBar);
+
+            VisualGroup group = new VisualGroup();
+            group.HorizontalItemSpacing = 0;
+            group.ArrangeInvalid += ButtonGroupArrangeInvalid;
+            group.RenderInvalid += ButtonGroupRenderInvalid;
+            group.ResetMouseHover += ButtonGroupResetMouseHover;
+            _ButtonGroup = group;
+            CreateButtons();
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            if (_MessageHandlerInstalled)
+            {
+                MessageHandler.UnregisterMessageClient(this);
+                _MessageHandlerInstalled = false;
+            }
+            base.Dispose(disposing);
+        }
+        #endregion
+
+        #region Implementation
+
+        protected override void ScaleControl(SizeF factor, BoundsSpecified specified)
+        {
+            if (Dpi.RecordScalePerControl)
+                Dpi.SetScaling(factor);
+            base.ScaleControl(factor, specified);
+            _EditBox.SetAutoHeight();
+            LayoutTokens();
+        }
+
+        private void EditBoxGotFocus(object sender, EventArgs e)
+        {
+            FocusToken = null;
+        }
+        private TokenEditorColorTable GetTokenColorTable()
+        {
+            return ((Office2007Renderer)GlobalManager.Renderer).ColorTable.TokenEditor;
+        }
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            if ((this.BackColor.IsEmpty || this.BackColor == Color.Transparent))
+            {
+                base.OnPaintBackground(e);
+            }
+
+            if (_BackgroundStyle != null)
+                _BackgroundStyle.SetColorScheme(this.GetColorScheme());
+            TokenEditorColorTable colorTable = GetTokenColorTable();
+            PaintBackground(e);
+            Rectangle clientBounds = GetClientBounds();
+            e.Graphics.SetClip(clientBounds);
+
+            if (this.WatermarkEnabled && this.WatermarkText.Length > 0 && this.IsWatermarkRendered)
+            {
+                DrawWatermark(e.Graphics);
+            }
+
+            foreach (EditToken token in _SelectedTokens)
+            {
+                PaintToken(token, e, colorTable);
+            }
+
+            PaintButtons(e.Graphics);
+
+            e.Graphics.ResetClip();
+            base.OnPaint(e);
+        }
+
+        private void PaintToken(EditToken token, PaintEventArgs e, TokenEditorColorTable colorTable)
+        {
+            Graphics g = e.Graphics;
+            Rectangle r = token.Bounds;
+            r.Offset(_AutoScrollPosition);
+
+            SmoothingMode sm = g.SmoothingMode;
+            g.SmoothingMode = SmoothingMode.HighQuality;
+
+            Color textColor = colorTable.Normal.TextColor;
+            LinearGradientColorTable background = colorTable.Normal.Background;
+
+            if (token.IsFocused)
+            {
+                textColor = colorTable.Focused.TextColor;
+                background = colorTable.Focused.Background;
+            }
+            else if (token.MouseOverPart == eTokenPart.Token || token.MouseOverPart == eTokenPart.Image)
+                background = colorTable.MouseOver.Background;
+
+            DisplayHelp.FillRoundedRectangle(g, r, 2, background.Start, background.End, background.GradientAngle);
+
+            g.SmoothingMode = sm;
+            string text = GetTokenText(token);
+            Rectangle rText = r;
+
+            if (EffectiveRemoveTokenButtonVisible)
+            {
+                Rectangle removeBounds = new Rectangle(r.X, r.Y + (r.Height - _RemoveTokenButtonSize.Height) / 2,
+                    _RemoveTokenButtonSize.Width, _RemoveTokenButtonSize.Height);
+                Color closeTextColor = textColor;
+                if (token.MouseOverPart == eTokenPart.RemoveButton)
+                {
+                    Office2007ColorTable ct = ((Office2007Renderer)GlobalManager.Renderer).ColorTable;
+                    Office2007ButtonItemColorTable buttonColorTable = ct.ButtonItemColors[Enum.GetName(typeof(eButtonColor), eButtonColor.OrangeWithBackground)];
+                    Office2007ButtonItemPainter.PaintBackground(g, buttonColorTable.MouseOver, removeBounds, RoundRectangleShapeDescriptor.RectangleShape);
+                    closeTextColor = buttonColorTable.MouseOver.Text;
+                    //g.FillRectangle(Brushes.Red, removeBounds);
+                }
+
+                float symbolSize = Math.Max(1, Math.Min(removeBounds.Width, removeBounds.Height) * 72 / g.DpiX - 1.5f);
+                TextDrawing.DrawStringLegacy(g, "\uf00d", Symbols.GetFont(symbolSize, eSymbolSet.Awesome),
+                    closeTextColor, removeBounds, eTextFormat.HorizontalCenter | eTextFormat.VerticalCenter);
+
+                token.RemoveButtonBounds = removeBounds;
+                rText.X = removeBounds.Right + _TokenPartSpacing;
+                rText.Width -= rText.Right - r.Right;
+            }
+
+            if (!string.IsNullOrEmpty(token.SymbolRealized))
+            {
+                Rectangle imageBounds = new Rectangle(rText.X, r.Y, r.Height, r.Height);
+                float symbolSize = Math.Max(1, Math.Min(imageBounds.Width, imageBounds.Height) * 72 / g.DpiX - 1.5f);
+                TextDrawing.DrawStringLegacy(g, token.SymbolRealized, Symbols.GetFont(symbolSize, token.SymbolSet),
+                    (token.SymbolColor.IsEmpty ? textColor : token.SymbolColor),
+                    imageBounds, eTextFormat.HorizontalCenter | eTextFormat.VerticalCenter);
+                token.ImageBounds = imageBounds;
+                rText.X = imageBounds.Right + _TokenPartSpacing;
+                rText.Width -= rText.Right - r.Right;
+            }
+            else if (token.Image != null)
+            {
+                Rectangle imageBounds = new Rectangle(rText.X, r.Y, token.ImageBounds.Width, token.Image.Height);
+                g.DrawImage(token.Image, imageBounds);
+                token.ImageBounds = imageBounds;
+                rText.X = imageBounds.Right + _TokenPartSpacing;
+                rText.Width -= rText.Right - r.Right;
+            }
+            TextDrawing.DrawString(g, text, this.Font, textColor, rText, eTextFormat.Default | eTextFormat.VerticalCenter);
+        }
+
+        protected virtual void PaintBackground(PaintEventArgs e)
+        {
+            Graphics g = e.Graphics;
+            Rectangle r = this.ClientRectangle;
+            ElementStyle style = _BackgroundStyle;
+
+            if (!this.BackColor.IsEmpty && this.BackColor != Color.Transparent)
+            {
+                DisplayHelp.FillRectangle(g, r, this.BackColor);
+            }
+
+            if (this.BackgroundImage != null)
+                base.OnPaintBackground(e);
+
+            if (style.Custom)
+            {
+                SmoothingMode sm = g.SmoothingMode;
+                //if (m_AntiAlias)
+                //    g.SmoothingMode = SmoothingMode.HighQuality;
+                ElementStyleDisplayInfo displayInfo = new ElementStyleDisplayInfo(style, e.Graphics, r);
+                ElementStyleDisplay.Paint(displayInfo);
+                //if (m_AntiAlias)
+                //    g.SmoothingMode = sm;
+            }
+        }
+
+        protected override void OnResize(EventArgs e)
+        {
+            LayoutTokens();
+            base.OnResize(e);
+        }
+
+        /// <summary>
+        /// Gets or sets the location of the auto-scroll position.
+        /// </summary>
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), Browsable(false), Description("Indicates location of the auto-scroll position.")]
+        public Point AutoScrollPosition
+        {
+            get
+            {
+                return _AutoScrollPosition;
+            }
+            set
+            {
+                if (_AutoScrollPosition == value) return;
+                _AutoScrollPosition = value;
+                if (_VScrollBar != null && _VScrollBar.Value != -_AutoScrollPosition.Y)
+                    _VScrollBar.Value = Math.Min(_VScrollBar.Maximum, Math.Max(_VScrollBar.Minimum, -_AutoScrollPosition.Y));
+                RepositionEditTextBox();
+                Invalidate();
+            }
+        }
+
+        private Rectangle GetClientBounds()
+        {
+            bool disposeStyle = false;
+            ElementStyle style = ElementStyleDisplay.GetElementStyle(_BackgroundStyle, out disposeStyle);
+            Rectangle clientRect = this.ClientRectangle;
+            clientRect.X += style.PaddingLeft;
+            clientRect.Width -= style.PaddingHorizontal;
+            clientRect.Y += style.PaddingTop;
+            clientRect.Height -= style.PaddingVertical;
+            if (disposeStyle)
+                style.Dispose();
+            style = null;
+
+            return clientRect;
+        }
+
+        private Point _AutoScrollPosition = Point.Empty;
+        private int _TokenSpacing = 2;
+        private int _TokenPartSpacing = 2; // Spacing between different parts of the token, like between image and text and image and close button etc. Its spacing between each part.
+        private readonly Size _TokenPadding = new Size(2, 2);
+        private void LayoutTokens()
+        {
+            if (!this.IsHandleCreated || this.IsDisposed || this.Width == 0 || this.Height == 0) return;
+
+            int lineCount = 0;
+            Rectangle clientRect = GetClientBounds();
+            Graphics g = this.CreateGraphics();
+            Size totalSize = LayoutTokens(g, clientRect, out lineCount);
+
+            if (_AutoSizeHeight)
+            {
+                int heightLines = Math.Min(_MaxHeightLines, lineCount);
+                int newHeight = (int)(Math.Ceiling((double)totalSize.Height / lineCount) * heightLines) + (this.Height - clientRect.Height);
+                if (_MaxHeightLines == 1)
+                    newHeight = GetSingleLineTextBoxHeight();
+                if (newHeight != this.Height)
+                {
+                    g.Dispose();
+                    this.Height = newHeight;
+                    return;
+                }
+            }
+
+            if (totalSize.Height > clientRect.Height)
+            {
+                Rectangle reducedBounds = clientRect;
+
+                int visibleLines = (int)(clientRect.Height / (Math.Ceiling((double)totalSize.Height / lineCount)));
+                if (_DropDownButtonVisible && visibleLines <= 2 || visibleLines == 1)
+                {
+                    // Using scroll button due to space limitation
+                    _VScrollBar.Visible = false;
+                    _ScrollButton.Visible = true;
+                    reducedBounds.Width -= SystemInformation.VerticalScrollBarWidth * (_DropDownButtonVisible ? 2 : 1);
+                    if (visibleLines > 1)
+                        _ButtonGroup.Orientation = eOrientation.Vertical;
+                    else
+                        _ButtonGroup.Orientation = eOrientation.Horizontal;
+                }
+                else
+                {
+                    int buttonOffset = (_DropDownButtonVisible ? GetButtonHeight() + 1 : 0);
+                    // Activate Scroll-bar
+                    _VScrollBar.Bounds = new Rectangle(clientRect.Right - SystemInformation.VerticalScrollBarWidth,
+                        clientRect.Y + buttonOffset,
+                        SystemInformation.VerticalScrollBarWidth,
+                        clientRect.Height - buttonOffset);
+                    _VScrollBar.Visible = true;
+                    _ScrollButton.Visible = false;
+                    reducedBounds.Width -= _VScrollBar.Width;
+                }
+
+                totalSize = LayoutTokens(g, reducedBounds, out lineCount);
+
+                _VScrollBar.Maximum = totalSize.Height;
+                _VScrollBar.LargeChange = clientRect.Height;
+                if (this.SelectedTokens.Count > 0)
+                    _VScrollBar.SmallChange = this.SelectedTokens[0].Bounds.Height;
+                else
+                    _VScrollBar.SmallChange = 17;
+            }
+            else
+            {
+                _VScrollBar.Visible = false;
+                _AutoScrollPosition = Point.Empty;
+                _ScrollButton.Visible = false;
+            }
+
+            g.Dispose();
+
+            RepositionEditTextBox();
+            EnsureTextBoxScrollPosition();
+            UpdateButtons();
+
+            this.Invalidate();
+        }
+
+        private int GetSingleLineTextBoxHeight()
+        {
+            Font font = this.Font;
+            return font.Height + ((SystemInformation.BorderSize.Height * 4) + 4);
+        }
+        private Size LayoutTokens(Graphics g, Rectangle clientRect, out int lineCount)
+        {
+            lineCount = 0;
+            if (!this.IsHandleCreated || this.IsDisposed) return Size.Empty;
+
+            clientRect.Inflate(-1, -1);
+            Font font = this.Font;
+            Size totalSize = Size.Empty;
+            int singleLineTextBoxHeight = GetSingleLineTextBoxHeight() - 2; // 2 is for top and bottom border
+
+            if (_SelectedTokens.Count == 0)
+            {
+                lineCount = 1;
+                totalSize = new Size(clientRect.Width, singleLineTextBoxHeight);
+                _EditBoxLocation = new Point(clientRect.X, clientRect.Y + (totalSize.Height - _EditBox.Height) / 2);
+                _EditBox.Width = clientRect.Width - (_DropDownButtonVisible ? SystemInformation.VerticalScrollBarWidth : 0);
+
+                return totalSize;
+            }
+
+            int largestTokenHeight = 0;
+            foreach (EditToken token in _SelectedTokens)
+            {
+                token.RemoveButtonBounds = Rectangle.Empty;
+                token.ImageBounds = Rectangle.Empty;
+                string text = GetTokenText(token);
+                Size size = TextDrawing.MeasureString(g, (string.IsNullOrEmpty(text) ? "A" : text), font);
+                size.Width += _TokenPadding.Width * 2;
+                size.Height += _TokenPadding.Height * 2;
+                if (EffectiveRemoveTokenButtonVisible)
+                {
+                    size.Width += _RemoveTokenButtonSize.Width + _TokenPartSpacing;
+                    if (_RemoveTokenButtonSize.Height > size.Height)
+                        size.Height = _RemoveTokenButtonSize.Height;
+                }
+
+                if (!string.IsNullOrEmpty(token.SymbolRealized))
+                {
+                    size.Width += size.Height + _TokenPartSpacing;
+                }
+                else if (token.Image != null)
+                {
+                    size.Width += token.Image.Width + _TokenPartSpacing;
+                    if (token.Image.Height > size.Height)
+                        size.Height = token.Image.Height;
+                }
+                largestTokenHeight = Math.Max(largestTokenHeight, size.Height);
+                token.Bounds = new Rectangle(Point.Empty, size);
+            }
+
+            lineCount = 1;
+            totalSize.Height = largestTokenHeight;
+            Point currentPos = clientRect.Location;
+
+            foreach (EditToken token in _SelectedTokens)
+            {
+                Rectangle tokenBounds = new Rectangle(currentPos.X, currentPos.Y, token.Bounds.Width, largestTokenHeight);
+                if (tokenBounds.Right > clientRect.Right && currentPos.X > clientRect.X)
+                {
+                    currentPos.Y += largestTokenHeight + _TokenSpacing;
+                    currentPos.X = clientRect.X;
+                    tokenBounds.Y = currentPos.Y;
+                    tokenBounds.X = currentPos.X;
+                    totalSize.Height += largestTokenHeight + _TokenSpacing;
+                    lineCount++;
+                }
+                currentPos.X += tokenBounds.Width + _TokenSpacing;
+                token.Bounds = tokenBounds;
+
+                if (tokenBounds.Right - clientRect.X > totalSize.Width)
+                    totalSize.Width = tokenBounds.Right - clientRect.X;
+            }
+
+            if (clientRect.Right - currentPos.X < _TextBoxMinWidth)
+            {
+                currentPos.Y += largestTokenHeight + _TokenSpacing;
+                currentPos.X = clientRect.X;
+                lineCount++;
+                totalSize.Height += largestTokenHeight + _TokenSpacing;
+            }
+
+            if (lineCount == 1)
+                totalSize.Height = Math.Max(totalSize.Height, singleLineTextBoxHeight);
+
+            _EditBoxLocation = new Point(currentPos.X, currentPos.Y + (largestTokenHeight - _EditBox.Height) / 2);
+            _EditBox.Width = clientRect.Right - currentPos.X - (lineCount == 1 && _DropDownButtonVisible ? SystemInformation.VerticalScrollBarWidth : 0);
+
+            return totalSize;
+        }
+
+        private Point _EditBoxLocation = Point.Empty;
+        private void RepositionEditTextBox()
+        {
+            Point loc = _EditBoxLocation;
+            loc.Offset(_AutoScrollPosition);
+            _EditBox.Location = loc;
+        }
+
+        private void VScrollBarScroll(object sender, ScrollEventArgs e)
+        {
+            if (e.NewValue != e.OldValue)
+            {
+                _AutoScrollPosition.Y = -e.NewValue;
+                RepositionEditTextBox();
+                this.Invalidate();
+            }
+        }
+        private const int _TextBoxMinWidth = 36;
+
+        protected override void OnHandleCreated(EventArgs e)
+        {
+            _EditBox.SetAutoHeight();
+            LayoutTokens();
+            base.OnHandleCreated(e);
+        }
+
+        private string GetTokenText(EditToken token)
+        {
+            if (!string.IsNullOrEmpty(token.Text))
+                return token.Text;
+            return token.Value;
+        }
+
+        /// <summary>
+        /// Returns the color scheme used by control. Color scheme for Office2007 style will be retrieved from the current renderer instead of
+        /// local color scheme referenced by ColorScheme property.
+        /// </summary>
+        /// <returns>An instance of ColorScheme object.</returns>
+        protected virtual ColorScheme GetColorScheme()
+        {
+            BaseRenderer r = Rendering.GlobalManager.Renderer;
+            if (r is Office2007Renderer)
+                return ((Office2007Renderer)r).ColorTable.LegacyColors;
+            return new ColorScheme();
+        }
+
+        private ElementStyle _BackgroundStyle = null;
+        /// <summary>
+        /// Specifies the background style of the control.
+        /// </summary>
+        [Browsable(true), Category("Style"), Description("Gets or sets bar background style."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ElementStyle BackgroundStyle
+        {
+            get { return _BackgroundStyle; }
+        }
+
+        /// <summary>
+        /// Resets style to default value. Used by windows forms designer.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetBackgroundStyle()
+        {
+            _BackgroundStyle.StyleChanged -= new EventHandler(this.VisualPropertyChanged);
+            _BackgroundStyle = new ElementStyle();
+            _BackgroundStyle.StyleChanged += new EventHandler(this.VisualPropertyChanged);
+            this.Invalidate();
+        }
+        private void VisualPropertyChanged(object sender, EventArgs e)
+        {
+            this.Invalidate();
+        }
+
+        private CustomCollection<EditToken> _SelectedTokens;
+        /// <summary>
+        /// Gets the collection of the selected tokens.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public CustomCollection<EditToken> SelectedTokens
+        {
+            get
+            {
+                return _SelectedTokens;
+            }
+        }
+        private void SelectedTokensCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            if (e.Action == NotifyCollectionChangedAction.Add)
+            {
+                foreach (object item in e.NewItems)
+                {
+                    ((EditToken)item).IsSelected = true;
+                }
+            }
+            else if (e.Action == NotifyCollectionChangedAction.Remove)
+            {
+                foreach (object item in e.OldItems)
+                {
+                    ((EditToken)item).IsSelected = false;
+                }
+            }
+            else if (e.Action == NotifyCollectionChangedAction.Replace)
+            {
+                foreach (object item in e.NewItems)
+                {
+                    ((EditToken)item).IsSelected = true;
+                }
+                foreach (object item in e.OldItems)
+                {
+                    ((EditToken)item).IsSelected = false;
+                }
+            }
+            else if (e.Action == NotifyCollectionChangedAction.Reset)
+            {
+                foreach (EditToken item in _Tokens)
+                {
+                    item.IsSelected = false;
+                }
+            }
+
+            LayoutTokens();
+            UpdateText();
+            UpdateEditBoxWatermark();
+            OnSelectedTokensChanged(EventArgs.Empty);
+        }
+
+        /// <summary>
+        /// Occurs when SelectedTokens collection changes.
+        /// </summary>
+        [Description("Occurs when SelectedTokens collection changes.")]
+        public event EventHandler SelectedTokensChanged;
+        /// <summary>
+        /// Raises SelectedTokensChanged event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnSelectedTokensChanged(EventArgs e)
+        {
+            EventHandler handler = SelectedTokensChanged;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        private CustomCollection<EditToken> _Tokens;
+        /// <summary>
+        /// Gets the collection of the tokens available for selection.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public CustomCollection<EditToken> Tokens
+        {
+            get
+            {
+                return _Tokens;
+            }
+        }
+        private void TokensCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+
+        }
+
+        private bool EffectiveRemoveTokenButtonVisible
+        {
+            get
+            {
+                return _RemoveTokenButtonVisible && !_ReadOnly;
+            }
+        }
+        private Size _RemoveTokenButtonSize = new Size(14, 14);
+        private bool _RemoveTokenButtonVisible = true;
+        /// <summary>
+        /// Indicates whether remove token button is displayed on individual tokens so they can be removed from the selection.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether remove token button is displayed on individual tokens so they can be removed from the selection.")]
+        public bool RemoveTokenButtonVisible
+        {
+            get { return _RemoveTokenButtonVisible; }
+            set
+            {
+                if (value != _RemoveTokenButtonVisible)
+                {
+                    bool oldValue = _RemoveTokenButtonVisible;
+                    _RemoveTokenButtonVisible = value;
+                    OnRemoveTokenButtonVisibleChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when RemoveTokenButtonVisible property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnRemoveTokenButtonVisibleChanged(bool oldValue, bool newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("RemoveTokenButtonVisible"));
+            if (_SelectedTokens.Count > 0)
+                LayoutTokens();
+        }
+
+        /// <summary>
+        /// Returns the token from SelectedTokens at specified position or null/nothing if no token is at given location.
+        /// </summary>
+        /// <param name="p">Location in client coordinates to test.</param>
+        /// <returns>EditToken instance or null/nothing</returns>
+        public EditToken GetSelectedTokenAt(Point p)
+        {
+            foreach (EditToken token in _SelectedTokens)
+            {
+                Rectangle tokenBounds = token.Bounds;
+                tokenBounds.Offset(_AutoScrollPosition);
+                if (tokenBounds.Contains(p))
+                    return token;
+            }
+            return null;
+        }
+
+        private EditToken _MouseOverToken = null;
+        private EditToken MouseOverToken
+        {
+            get
+            {
+                return _MouseOverToken;
+            }
+            set
+            {
+                if (_MouseOverToken != value)
+                {
+                    if (_MouseOverToken != null)
+                        _MouseOverToken = value;
+                    this.Invalidate();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Occurs when mouse enters one of the SelectedTokens token.
+        /// </summary>
+        [Description("Occurs when mouse enters one of the SelectedTokens token.")]
+        public event EventHandler TokenMouseEnter;
+        /// <summary>
+        /// Raises TokenMouseEnter event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnTokenMouseEnter(object sender, EventArgs e)
+        {
+            EventHandler handler = TokenMouseEnter;
+            if (handler != null)
+                handler(sender, e);
+        }
+        /// <summary>
+        /// Occurs when mouse leaves one of the SelectedTokens token.
+        /// </summary>
+        [Description("Occurs when mouse leaves one of the SelectedTokens token.")]
+        public event EventHandler TokenMouseLeave;
+        /// <summary>
+        /// Raises TokenMouseLeave event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnTokenMouseLeave(object sender, EventArgs e)
+        {
+            HideToolTip();
+            EventHandler handler = TokenMouseLeave;
+            if (handler != null)
+                handler(sender, e);
+        }
+
+        /// <summary>
+        /// Occurs when mouse clicks one of the SelectedTokens token.
+        /// </summary>
+        [Description("Occurs when mouse clicks one of the SelectedTokens token.")]
+        public event MouseEventHandler TokenMouseClick;
+        /// <summary>
+        /// Raises TokenMouseClick event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnTokenMouseClick(object sender, MouseEventArgs e)
+        {
+            MouseEventHandler handler = TokenMouseClick;
+            if (handler != null)
+                handler(sender, e);
+        }
+
+        /// <summary>
+        /// Occurs when mouse double clicks one of the SelectedTokens token.
+        /// </summary>
+        [Description("Occurs when mouse double clicks one of the SelectedTokens token.")]
+        public event MouseEventHandler TokenMouseDoubleClick;
+        /// <summary>
+        /// Raises TokenMouseClick event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnTokenMouseDoubleClick(object sender, MouseEventArgs e)
+        {
+            MouseEventHandler handler = TokenMouseDoubleClick;
+            if (handler != null)
+                handler(sender, e);
+        }
+
+        /// <summary>
+        /// Occurs when mouse hovers one of the SelectedTokens token.
+        /// </summary>
+        [Description("Occurs when mouse hovers one of the SelectedTokens token.")]
+        public event EventHandler TokenMouseHover;
+        /// <summary>
+        /// Raises TokenMouseHover event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnTokenMouseHover(object sender, EventArgs e)
+        {
+            EventHandler handler = TokenMouseHover;
+            if (handler != null)
+                handler(sender, e);
+        }
+
+        protected override void OnMouseMove(MouseEventArgs e)
+        {
+            EditToken token = GetSelectedTokenAt(e.Location);
+            if (token != _MouseOverToken)
+            {
+                if (_MouseOverToken != null)
+                {
+                    _MouseOverToken.MouseOverPart = eTokenPart.None;
+                    OnTokenMouseLeave(_MouseOverToken, e);
+                }
+                _MouseOverToken = token;
+                this.Invalidate();
+                DevComponents.AdvTree.Interop.WinApi.ResetHover(this);
+                if (_MouseOverToken != null)
+                    OnTokenMouseEnter(_MouseOverToken, e);
+            }
+            if (_MouseOverToken != null)
+            {
+                eTokenPart oldMouseOverPart = _MouseOverToken.MouseOverPart;
+                if (EffectiveRemoveTokenButtonVisible && !_MouseOverToken.RemoveButtonBounds.IsEmpty && _MouseOverToken.RemoveButtonBounds.Contains(e.Location))
+                    _MouseOverToken.MouseOverPart = eTokenPart.RemoveButton;
+                else if (!_MouseOverToken.ImageBounds.IsEmpty && _MouseOverToken.ImageBounds.Contains(e.Location))
+                    _MouseOverToken.MouseOverPart = eTokenPart.Image;
+                else
+                    _MouseOverToken.MouseOverPart = eTokenPart.Token;
+                if (oldMouseOverPart != _MouseOverToken.MouseOverPart)
+                    this.Invalidate();
+            }
+            if (_ButtonGroup.Visible)
+                _ButtonGroup.ProcessMouseMove(e);
+            base.OnMouseMove(e);
+        }
+        protected override void OnMouseDown(MouseEventArgs e)
+        {
+            HideToolTip();
+            if (_MouseOverToken == null && !_ReadOnly && !(_ButtonGroup.Visible && _ButtonGroup.RenderBounds.Contains(e.Location)))
+            {
+                ShowEditTextBox();
+            }
+            else
+                this.Select();
+            if (_ButtonGroup.Visible)
+                _ButtonGroup.ProcessMouseDown(e);
+            base.OnMouseDown(e);
+        }
+        protected override void OnMouseUp(MouseEventArgs e)
+        {
+            if (_ButtonGroup.Visible)
+                _ButtonGroup.ProcessMouseUp(e);
+            base.OnMouseUp(e);
+        }
+        protected override void OnMouseClick(MouseEventArgs e)
+        {
+            if (_MouseOverToken != null && _MouseOverToken.MouseOverPart == eTokenPart.RemoveButton)
+            {
+                EditToken token = _MouseOverToken;
+                RemovingTokenEventArgs args = new RemovingTokenEventArgs(token, eEventSource.Mouse);
+                OnRemovingToken(args);
+                if (args.Cancel) return;
+
+                LeaveMouseOverToken();
+                this.SelectedTokens.Remove(token);
+            }
+            else if (_MouseOverToken != null)
+            {
+                OnTokenMouseClick(_MouseOverToken, e);
+            }
+            if (_ButtonGroup.Visible)
+                _ButtonGroup.ProcessMouseClick(e);
+            base.OnMouseClick(e);
+        }
+        protected override void OnMouseDoubleClick(MouseEventArgs e)
+        {
+            if (_MouseOverToken != null)
+            {
+                OnTokenMouseDoubleClick(_MouseOverToken, e);
+            }
+            base.OnMouseDoubleClick(e);
+        }
+        protected override void OnMouseHover(EventArgs e)
+        {
+            if (_MouseOverToken != null)
+            {
+                OnTokenMouseHover(_MouseOverToken, e);
+                ShowToolTip(_MouseOverToken);
+            }
+
+            if (_ButtonGroup.Visible)
+                _ButtonGroup.ProcessMouseHover(e);
+            base.OnMouseHover(e);
+        }
+        /// <summary>
+        /// Occurs before token is removed from the SelectedTokens by end user.
+        /// </summary>
+        [Description("Occurs before token is removed from the SelectedTokens by end user.")]
+        public event RemovingTokenEventHandler RemovingToken;
+        /// <summary>
+        /// Raises RemovingToken event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnRemovingToken(RemovingTokenEventArgs e)
+        {
+            RemovingTokenEventHandler handler = RemovingToken;
+            if (handler != null)
+                handler(this, e);
+        }
+        private void LeaveMouseOverToken()
+        {
+            HideToolTip();
+            if (_MouseOverToken != null)
+            {
+                _MouseOverToken.MouseOverPart = eTokenPart.None;
+                OnTokenMouseLeave(_MouseOverToken, EventArgs.Empty);
+                _MouseOverToken = null;
+                this.Invalidate();
+            }
+        }
+
+        private bool _IsMouseOver = false;
+        protected override void OnMouseLeave(EventArgs e)
+        {
+            _IsMouseOver = false;
+            LeaveMouseOverToken();
+            if (_ButtonGroup.Visible)
+                _ButtonGroup.ProcessMouseLeave();
+            base.OnMouseLeave(e);
+        }
+        protected override void OnMouseEnter(EventArgs e)
+        {
+            _IsMouseOver = true;
+            base.OnMouseEnter(e);
+        }
+
+        private EditToken _FocusToken = null;
+        private EditToken FocusToken
+        {
+            get { return _FocusToken; }
+            set
+            {
+                if (_FocusToken != value)
+                {
+                    if (_FocusToken != null)
+                        _FocusToken.IsFocused = false;
+                    _FocusToken = value;
+                    if (_FocusToken != null)
+                        _FocusToken.IsFocused = true;
+                    this.Invalidate();
+                }
+            }
+        }
+
+        private void FocusPreviousToken()
+        {
+            if (this.SelectedTokens.Count == 0) return;
+            int index = _SelectedTokens.Count - 1;
+            if (_FocusToken != null)
+                index = Math.Max(0, _SelectedTokens.IndexOf(_FocusToken) - 1);
+            FocusToken = _SelectedTokens[index];
+        }
+        private void FocusNextToken()
+        {
+            if (this.SelectedTokens.Count == 0) return;
+            int index = 0;
+            if (_FocusToken != null)
+            {
+                if (_SelectedTokens.IndexOf(_FocusToken) == _SelectedTokens.Count - 1)
+                {
+                    FocusToken = null;
+                    _EditBox.Select();
+                    return;
+                }
+                index = Math.Min(_SelectedTokens.Count - 1, _SelectedTokens.IndexOf(_FocusToken) + 1);
+            }
+            FocusToken = _SelectedTokens[index];
+        }
+        private void DeleteFocusedToken(bool isBackspace, eEventSource eventSource)
+        {
+            EditToken focusToken = _FocusToken;
+            if (focusToken == null) return;
+            RemovingTokenEventArgs e = new RemovingTokenEventArgs(focusToken, eventSource);
+            OnRemovingToken(e);
+            if (e.Cancel) return;
+            FocusToken = null;
+            int index = Math.Max(0, _SelectedTokens.IndexOf(focusToken) - 1);
+            _SelectedTokens.Remove(focusToken);
+            if (_SelectedTokens.Count > 0)
+            {
+                FocusToken = _SelectedTokens[index];
+            }
+            else
+            {
+                _EditBox.Select();
+            }
+        }
+        protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
+        {
+            if (!_EditBox.Focused)
+            {
+                if (keyData == Keys.Left)
+                {
+                    FocusPreviousToken();
+                    return true;
+                }
+                else if (keyData == Keys.Right)
+                {
+                    FocusNextToken();
+                    return true;
+                }
+                else if (keyData == Keys.Back)
+                {
+                    DeleteFocusedToken(true, eEventSource.Keyboard);
+                    return true;
+                }
+                else if (keyData == Keys.Delete)
+                {
+                    DeleteFocusedToken(false, eEventSource.Keyboard);
+                    return true;
+                }
+            }
+            return base.ProcessCmdKey(ref msg, keyData);
+        }
+
+        protected override void OnKeyDown(KeyEventArgs e)
+        {
+            if (_FocusToken != null)
+            {
+                FocusToken = null;
+                _EditBox.Select();
+            }
+            base.OnKeyDown(e);
+        }
+
+        protected override void OnLeave(EventArgs e)
+        {
+            if (_EditBox.Visible)
+            {
+                _EditBox.Visible = false;
+                if (_ValidateTokenTextOnLostFocus && !string.IsNullOrEmpty(_EditBox.Text))
+                {
+                    ValidateAndConvertEditText(_EditBox.Text);
+                }
+            }
+            _EditBox.Text = "";
+            FocusToken = null;
+            if (IsPopupOpen)
+                CloseAutoCompleteDropDown();
+            HideToolTip();
+            base.OnLeave(e);
+        }
+        protected override void OnEnter(EventArgs e)
+        {
+            if (!_ReadOnly)
+            {
+                ShowEditTextBox();
+            }
+            base.OnEnter(e);
+        }
+
+        private bool _ReadOnly = false;
+        /// <summary>
+        /// Indicates whether tokens can be added or removed by end user. Default value is false.
+        /// </summary>
+        [DefaultValue(false), Category("Behavior"), Description("Indicates whether tokens can be added or removed by end user. Default value is false.")]
+        public bool ReadOnly
+        {
+            get { return _ReadOnly; }
+            set
+            {
+                if (value != _ReadOnly)
+                {
+                    bool oldValue = _ReadOnly;
+                    _ReadOnly = value;
+                    OnReadOnlyChanged(oldValue, value);
+                }
+            }
+        }
+        private void ShowEditTextBox()
+        {
+            _EditBox.Visible = true;
+            _EditBox.Focus();
+            EnsureTextBoxScrollPosition();
+        }
+        private void EnsureTextBoxScrollPosition()
+        {
+            if (!_EditBox.Visible) return;
+            Rectangle clientBounds = GetClientBounds();
+            if (clientBounds.Contains(_EditBox.Bounds))
+                return;
+            // Scroll content vertically to ensure text-box is withing client bounds
+            AutoScrollPosition = new Point(0, AutoScrollPosition.Y + (clientBounds.Bottom - _EditBox.Bounds.Bottom));
+        }
+        /// <summary>
+        /// Called when ReadOnly property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnReadOnlyChanged(bool oldValue, bool newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("ReadOnly"));
+            if (_ReadOnly)
+            {
+                if (_EditBox.Visible)
+                    _EditBox.Visible = false;
+            }
+            else if (this.Focused)
+            {
+                ShowEditTextBox();
+                _EditBox.Focus();
+            }
+            if (_RemoveTokenButtonVisible)
+                LayoutTokens();
+        }
+
+        private int _DropDownHeight = 120;
+        /// <summary>
+        /// Indicates the height of the auto-complete drop-down.
+        /// </summary>
+        [DefaultValue(120), Category("Appearance"), Description("Indicates the height of the auto-complete drop-down")]
+        public int DropDownHeight
+        {
+            get { return _DropDownHeight; }
+            set
+            {
+                if (value != _DropDownHeight)
+                {
+                    int oldValue = _DropDownHeight;
+                    _DropDownHeight = value;
+                    OnDropDownHeightChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when DropDownHeight property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnDropDownHeightChanged(int oldValue, int newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("DropDownHeight"));   
+        }
+
+        private int _DropDownWidth = 180;
+        /// <summary>
+        /// Indicates the width of the auto-complete drop-down.
+        /// </summary>
+        [DefaultValue(180), Category("Appearance"), Description("Indicates the width of the auto-complete drop-down.")]
+        public int DropDownWidth
+        {
+            get { return _DropDownWidth; }
+            set
+            {
+                if (value != _DropDownWidth)
+                {
+                    int oldValue = _DropDownWidth;
+                    _DropDownWidth = value;
+                    OnDropDownWidthChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when DropDownWidth property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnDropDownWidthChanged(int oldValue, int newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("DropDownWidth"));
+
+        }
+
+        private bool _EnterKeyValidatesToken = true;
+        /// <summary>
+        /// Indicates whether when token text is entered into the text-box pressing the Enter key attempts to validate the token and converts the text to token.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether when token text is entered into the text-box pressing the Enter key attempts to validate the token and converts the text to token.")]
+        public bool EnterKeyValidatesToken
+        {
+            get
+            {
+                return _EnterKeyValidatesToken;
+            }
+            set
+            {
+                _EnterKeyValidatesToken = value;
+            }
+        }
+
+        private void EditBoxKeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode == Keys.Escape && IsPopupOpen)
+            {
+                CloseAutoCompleteDropDown();
+            }
+            else if (e.KeyCode == Keys.Enter && IsPopupOpen && _AutoCompleteListBox != null && _AutoCompleteListBox.SelectedIndex >= 0)
+            {
+                SelectToken(_Tokens[_AutoCompleteListBox.SelectedIndex]);
+            }
+            else if (e.KeyCode == Keys.Enter && EnterKeyValidatesToken)
+            {
+                ValidateAndConvertEditText(_EditBox.Text);
+            }
+            else if (e.KeyCode == Keys.Down)
+            {
+                if (IsPopupOpen && _AutoCompleteListBox != null)
+                {
+                    _AutoCompleteListBox.SelectNextItem();
+                    e.Handled = true;
+                }
+                else if (!IsPopupOpen && string.IsNullOrEmpty(_EditBox.Text))
+                {
+                    IsPopupOpen = true;
+                    e.Handled = true;
+                }
+            }
+            else if (_AutoCompleteListBox != null && e.KeyCode == Keys.Up)
+            {
+                _AutoCompleteListBox.SelectPreviousItem();
+                e.Handled = true;
+            }
+            else if ((e.KeyCode == Keys.Left || e.KeyCode == Keys.Back) && string.IsNullOrEmpty(_EditBox.Text))
+            {
+                CloseAutoCompleteDropDown();
+                if (this.SelectedTokens.Count > 0)
+                {
+                    this.Select();
+                    FocusPreviousToken();
+                }
+                e.Handled = true;
+            }
+
+        }
+
+
+        private void AutoCompleteListBoxItemClick(object sender, EventArgs e)
+        {
+            if (_AutoCompleteListBox.SelectedIndex >= 0)
+                SelectToken(_Tokens[_AutoCompleteListBox.SelectedIndex]);
+        }
+
+        private bool SelectToken(EditToken token)
+        {
+            if (token.IsSelected) return false;
+
+            ValidateTokenEventArgs args = new ValidateTokenEventArgs(token, false);
+            if (args.IsValid && args.Token != null)
+            {
+                token = args.Token;
+                this.SelectedTokens.Add(token);
+                _EditBox.Text = "";
+                CloseAutoCompleteDropDown();
+                return true;
+            }
+            return false;
+        }
+
+        private bool ValidateAndConvertEditText(string text)
+        {
+            if (string.IsNullOrEmpty(text))
+                return false;
+            IsPopupOpen = false;
+            bool isNewToken = false;
+            EditToken token = FindOrCreateToken(text, out isNewToken);
+            ValidateTokenEventArgs args = new ValidateTokenEventArgs(token, isNewToken);
+            OnValidateToken(args);
+            if (args.IsValid && args.Token != null)
+            {
+                token = args.Token;
+                this.SelectedTokens.Add(token);
+                _EditBox.Text = "";
+                CloseAutoCompleteDropDown();
+                return true;
+            }
+            return false;
+        }
+
+        private bool IsSelected(EditToken item)
+        {
+            return item.IsSelected;
+
+            //foreach (EditToken selectedToken in _SelectedTokens)
+            //{
+            //    if(selectedToken == item)
+            //        return true;
+            //}
+            //return false;
+        }
+        private EditToken FindOrCreateToken(string text, out bool isNew)
+        {
+            isNew = false;
+            foreach (EditToken item in _Tokens)
+            {
+                if (!item.IsSelected && TokenExactMatch(text, item, _TokenFilterBehavior))
+                {
+                    return item;
+                }
+            }
+            isNew = true;
+            return new EditToken(text);
+        }
+
+        private void EditBoxTextChanged(object sender, EventArgs e)
+        {
+            string text = _EditBox.Text;
+
+            if (!_DroppedDown && FilteredTokenExists(text))
+            {
+                OpenAutoCompleteDropDown();
+            }
+            if (_AutoCompleteListBox != null)
+            {
+                FilterAutoCompleteBox(_AutoCompleteListBox, text);
+            }
+
+            foreach (string separator in _Separators)
+            {
+                if (text.EndsWith(separator))
+                {
+                    text = text.Substring(0, text.Length - separator.Length);
+                    ValidateAndConvertEditText(text);
+                    break;
+                }
+            }
+        }
+
+        private PopupHostController _PopupController = null;
+        private ListBoxAdv _AutoCompleteListBox = null;
+        private DateTime _MultiDropDownOpenedAtTime = DateTime.MinValue;
+        private DateTime _MultiDropDownClosedAtTime = DateTime.MinValue;
+
+        /// <summary>
+        /// Occurs before token auto-complete popup is displayed and allows cancelation of popup display.
+        /// </summary>
+        [Description("Occurs before token auto-complete popup is displayed and allows cancelation of popup display.")]
+        public event CancelEventHandler BeforeAutoCompletePopupOpen;
+        /// <summary>
+        /// Occurs after auto-complete popup is open.
+        /// </summary>
+        [Description("Occurs after auto-complete popup is open.")]
+        public event EventHandler AutoCompletePopupOpened;
+        /// <summary>
+        /// Raises AutoCompletePopupOpened event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnAutoCompletePopupOpened(EventArgs e)
+        {
+            EventHandler handler = AutoCompletePopupOpened;
+            if (handler != null)
+                handler(this, e);
+        }
+        /// <summary>
+        /// Raises BeforeAutoCompletePopupOpen event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnBeforeAutoCompletePopupOpen(CancelEventArgs e)
+        {
+            CancelEventHandler handler = BeforeAutoCompletePopupOpen;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        private void OpenAutoCompleteDropDown()
+        {
+            if (_PopupController == null)
+            {
+                _PopupController = new PopupHostController();
+                _PopupController.Closed += PopupControllerClosed;
+            }
+
+            if (_AutoCompleteListBox == null)
+            {
+                _AutoCompleteListBox = CreateAutoCompleteListBox();
+                //_AutoCompleteListBox.Resize += _AutoCompleteListBox_Resize;
+                //this.Parent.Controls.Add(_AutoCompleteListBox);
+                //_AutoCompleteListBox.Location = new Point(10,100);
+            }
+            
+            if (!_MessageHandlerInstalled && _DropDownButtonVisible)
+            {
+                MessageHandler.RegisterMessageClient(this);
+                _MessageHandlerInstalled = true;
+            }
+
+            LoadAutoCompleteBox(_AutoCompleteListBox);
+
+            if (!_PopupController.PopupUserSize || !_PreservePopupSize)
+            {
+                _AutoCompleteListBox.Height = Dpi.Height(this.DropDownHeight);
+                _AutoCompleteListBox.Width = (this.DropDownWidth > 0 ? Dpi.Width(this.DropDownWidth) : this.Width);
+                //_AutoCompleteListBox.MinimumSize = _AutoCompleteListBox.Size;
+            }
+
+            CancelEventArgs cancelArgs = new CancelEventArgs();
+            OnBeforeAutoCompletePopupOpen(cancelArgs);
+            if (cancelArgs.Cancel)
+                return;
+
+            Point location = PointToScreen(new Point(0, Height));
+            TokenEditorPopupEventArgs popupArgs = new TokenEditorPopupEventArgs(location, _AutoCompleteListBox.Size);
+            OnBeforePopupOpen(popupArgs);
+            location = popupArgs.PopupLocation;
+            ePopupResizeEdge resize = _EnablePopupResize ? ePopupResizeEdge.BottomRight : ePopupResizeEdge.None;
+            _PopupController.AutoClose = false;
+
+            _PopupController.ParentControlBounds = new Rectangle(PointToScreen(Point.Empty), this.Size);
+            _PopupController.Show(_AutoCompleteListBox, location.X, location.Y, 0, 0, resize);
+
+            _EditBox.Focus();
+            _EditBox.SelectionLength = 0; // Clear selection that happens upon focus
+            if (_EditBox.TextLength > 0)
+                _EditBox.SelectionStart = _EditBox.TextLength;
+            _PopupController.AutoClose = true;
+            _DroppedDown = true;
+            _MultiDropDownOpenedAtTime = DateTime.Now;
+
+            OnAutoCompletePopupOpened(EventArgs.Empty);
+        }
+
+        /// <summary>
+        /// Occurs before the auto-complete popup is displayed and allows you to adjust popup location.
+        /// </summary>
+        [Description("Occurs before the auto-complete popup is displayed and allows you to adjust popup location.")]
+        public event TokenEditorPopupEventHandler BeforePopupOpen;
+        /// <summary>
+        /// Raises BeforePopupOpen event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnBeforePopupOpen(TokenEditorPopupEventArgs e)
+        {
+            TokenEditorPopupEventHandler handler = BeforePopupOpen;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        private void LoadAutoCompleteBox(ListBoxAdv listBox)
+        {
+            listBox.BeginUpdate();
+            listBox.Items.Clear();
+            listBox.CheckBoxesVisible = _CheckBoxesVisible;
+            listBox.ShowToolTips = _ShowToolTips;
+            foreach (EditToken item in _Tokens)
+            {
+                ListBoxItem listItem = new ListBoxItem();
+                listItem.Text = GetTokenText(item);
+                listItem.Tooltip = item.Tooltip;
+                if (_CheckBoxesVisible)
+                    listItem.CheckState = (item.IsSelected ? CheckState.Checked : CheckState.Unchecked);
+                else
+                    listItem.Visible = !item.IsSelected;
+                listBox.Items.Add(listItem);
+            }
+            listBox.EndUpdate();
+        }
+        private bool FilteredTokenExists(string text)
+        {
+            foreach (EditToken item in _Tokens)
+            {
+                if (item.IsSelected) continue;
+                if (TokenMatch(text, item, _TokenFilterBehavior))
+                    return true;
+            }
+            return false;
+        }
+
+        private eTokenFilterBehavior _TokenFilterBehavior = eTokenFilterBehavior.TextAndValue;
+        /// <summary>
+        /// Indicates how tokens are filtered based on the entered text
+        /// </summary>
+        [DefaultValue(eTokenFilterBehavior.TextAndValue), Category("Behavior"), Description("Indicates how tokens are filtered based on the entered text")]
+        public eTokenFilterBehavior TokenFilterBehavior
+        {
+            get { return _TokenFilterBehavior; }
+            set { _TokenFilterBehavior = value; }
+        }
+        private static bool TokenMatch(string filterText, EditToken token, eTokenFilterBehavior behavior)
+        {
+            filterText = filterText.ToLower();
+            if(behavior == eTokenFilterBehavior.Text)
+                return !string.IsNullOrEmpty(token.Text) && token.Text.ToLower().Contains(filterText);
+            else if(behavior == eTokenFilterBehavior.Value)
+                return !string.IsNullOrEmpty(token.Value) && token.Value.ToLower().Contains(filterText);
+            return !string.IsNullOrEmpty(token.Text) && token.Text.ToLower().Contains(filterText) || !string.IsNullOrEmpty(token.Value) && token.Value.ToLower().Contains(filterText);
+        }
+        private static bool TokenExactMatch(string filterText, EditToken token, eTokenFilterBehavior behavior)
+        {
+            filterText = filterText.ToLower();
+            if (behavior == eTokenFilterBehavior.Text)
+                return !string.IsNullOrEmpty(token.Text) && token.Text.ToLower() == filterText;
+            else if (behavior == eTokenFilterBehavior.Value)
+                return !string.IsNullOrEmpty(token.Value) && token.Value.ToLower() == filterText;
+            return !string.IsNullOrEmpty(token.Text) && token.Text.ToLower() == filterText || !string.IsNullOrEmpty(token.Value) && token.Value.ToLower() == filterText;
+        }
+        private void FilterAutoCompleteBox(ListBoxAdv listBox, string filterText)
+        {
+            bool oneVisible = false;
+            listBox.BeginUpdate();
+            if (string.IsNullOrEmpty(filterText))
+            {
+                if (!_CheckBoxesVisible)
+                {
+                    foreach (ListBoxItem item in listBox.Items)
+                    {
+                        item.IsSelected = false;
+                        item.Visible = !item.IsSelected;
+                        if (item.Visible)
+                            oneVisible = true;
+                    }
+                }
+            }
+            else
+            {
+                for (int i = 0; i < listBox.Items.Count; i++)
+                {
+                    ListBoxItem item = (ListBoxItem)listBox.Items[i];
+                    EditToken token = _Tokens[i];
+                    if (!token.IsSelected && TokenMatch(filterText, token, _TokenFilterBehavior))
+                    {
+                        if (!_CheckBoxesVisible)
+                            item.Visible = true;
+                        if (!oneVisible)
+                            item.IsSelected = true;
+                        else
+                            item.IsSelected = false;
+                        oneVisible = true;
+                    }
+                    else if (!_CheckBoxesVisible)
+                        item.Visible = false;
+                    else
+                        item.IsSelected = false;
+                }
+            }
+
+            listBox.EndUpdate();
+
+            if (!oneVisible && !_CheckBoxesVisible)
+                CloseAutoCompleteDropDown();
+        }
+
+        private ListBoxAdv CreateAutoCompleteListBox()
+        {
+            ListBoxAdv listBox = new ListBoxAdv();
+#if (!TRIAL)
+            listBox.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F";
+#endif
+            //listBox.BackColor = Color.White;
+            listBox.BackgroundStyle.Class = ElementStyleClassKeys.ListBoxAdvKey;
+            listBox.ItemClick += AutoCompleteListBoxItemClick;
+            listBox.ItemCheck += AutoCompleteListBoxItemCheck;
+            listBox.AutoScroll = true;
+            //listBox.BackgroundStyle.Reset();
+            //listBox.BackgroundStyle.BackColor = SystemColors.Window;
+            //listBox.BackgroundStyle.Border = eStyleBorderType.None;
+            return listBox;
+
+        }
+
+        void AutoCompleteListBoxItemCheck(object sender, ListBoxAdvItemCheckEventArgs e)
+        {
+            int index = _AutoCompleteListBox.Items.IndexOf(e.Item);
+            EditToken token = _Tokens[index];
+            if (e.Item.CheckState == CheckState.Unchecked && token.IsSelected)
+                this.SelectedTokens.Remove(token);
+            else if (!token.IsSelected)
+                this.SelectedTokens.Add(token);
+        }
+        private void PopupControllerClosed(object sender, ToolStripDropDownClosedEventArgs e)
+        {
+            _DroppedDown = false;
+
+            //m_SelectedIndexInternal = this.SelectedIndex;
+            _MultiDropDownClosedAtTime = DateTime.Now;
+            //OnDropDownClosed(e);
+        }
+        private void CloseAutoCompleteDropDown()
+        {
+            if (_PopupController != null && _DroppedDown)
+            {
+                _PopupController.Hide();
+            }
+        }
+
+        private bool _PreservePopupSize = true;
+        /// <summary>
+        /// Indicates whether auto-complete popup size is preserved between popup displays if popup is resized by end-user.
+        /// </summary>
+        [DefaultValue(true), Category("Auto-Complete"), Description("Indicates whether auto-complete popup size is preserved between popup displays if popup is resized by end-user.")]
+        public bool PreservePopupSize
+        {
+            get { return _PreservePopupSize; }
+            set
+            {
+                _PreservePopupSize = value;
+            }
+        }
+
+        private bool _EnablePopupResize = true;
+        /// <summary>
+        /// Indicates whether auto-complete popup can be resized by end user.
+        /// </summary>
+        [DefaultValue(true), Category("Auto-Complete"), Description("Indicates whether auto-complete popup can be resized by end user.")]
+        public bool EnablePopupResize
+        {
+            get { return _EnablePopupResize; }
+            set
+            {
+                _EnablePopupResize = value;
+            }
+        }
+
+        private bool _PopupCloseButtonVisible = true;
+        /// <summary>
+        /// Indicates whether multi-column popup close button is visible.
+        /// </summary>
+        [DefaultValue(true), Category("Auto-Complete"), Description("Indicates whether multi-column popup close button is visible.")]
+        public bool PopupCloseButtonVisible
+        {
+            get { return _PopupCloseButtonVisible; }
+            set
+            {
+                _PopupCloseButtonVisible = value;
+            }
+        }
+
+        private bool _DroppedDown = false;
+        /// <summary>
+        /// Gets or sets whether auto-complete popup window is open.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsPopupOpen
+        {
+            get { return _DroppedDown; }
+            set
+            {
+                if (value != _DroppedDown)
+                {
+                    if (value)
+                        OpenAutoCompleteDropDown();
+                    else
+                        CloseAutoCompleteDropDown();
+                }
+            }
+        }
+
+        private List<string> _Separators = new List<string>();
+        /// <summary>
+        /// Gets the list of separators which are used to divide entered text into the tokens.
+        /// </summary>
+        [Category("Behavior"), Description("Gets the list of separators which are used to divide entered text into the tokens."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content), MergableProperty(false), Localizable(true)]
+        [Editor("System.Windows.Forms.Design.ListControlStringCollectionEditor, System.Design, Version= 2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", typeof(UITypeEditor))]
+        public List<string> Separators
+        {
+            get { return _Separators; }
+        }
+
+        /// <summary>
+        /// Occurs when an token is selected from the auto-complete list or when text entry by end user is parsed into token to validate it.
+        /// </summary>
+        [Description("Occurs when an token is selected from the auto-complete list or when text entry by end user is parsed into token to validate it.")]
+        public event ValidateTokenEventHandler ValidateToken;
+        /// <summary>
+        /// Raises ValidateToken event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnValidateToken(ValidateTokenEventArgs e)
+        {
+            ValidateTokenEventHandler handler = ValidateToken;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        private bool _AutoSizeHeight = true;
+        /// <summary>
+        /// Indicates whether control automatically increases its height as more tokens are selected. MaxHeightLines property controls the maximum number of lines control will grow to before showing scroll-bar.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether control automatically increases its height as more tokens are selected. MaxHeightLines property controls the maximum number of lines control will grow to before showing scroll-bar.")]
+        public bool AutoSizeHeight
+        {
+            get { return _AutoSizeHeight; }
+            set
+            {
+                if (_AutoSizeHeight != value)
+                {
+                    _AutoSizeHeight = value;
+                    if (_AutoSizeHeight)
+                        LayoutTokens();
+                }
+            }
+        }
+
+        private int _MaxHeightLines = 5;
+        /// <summary>
+        /// Indicates maximum number of lines control will grow to when AutoSizeHeight=true. Set to 0 to indicates unlimited growth.
+        /// Default value is 5.
+        /// </summary>
+        [DefaultValue(5), Category("Behavior"), Description("Indicates maximum number of lines control will grow to when AutoSizeHeight=true. Set to 0 to indicates unlimited growth.")]
+        public int MaxHeightLines
+        {
+            get { return _MaxHeightLines; }
+            set { _MaxHeightLines = value; }
+        }
+
+        /// <summary>
+        /// Gets reference to internal text-box control that is used to input the token text.
+        /// </summary>
+        [Browsable(false)]
+        public TextBox EditTextBox
+        {
+            get
+            {
+                return _EditBox;
+            }
+        }
+
+        private bool _ValidateTokenTextOnLostFocus = true;
+        /// <summary>
+        /// Indicates whether any text entered into the token editor is validated and converted to token when control loses focus.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether any text entered into the token editor is validated and converted to token when control loses focus.")]
+        public bool ValidateTokenTextOnLostFocus
+        {
+            get { return _ValidateTokenTextOnLostFocus; }
+            set { _ValidateTokenTextOnLostFocus = value; }
+        }
+
+        private string _WatermarkText = "";
+        private Font _WatermarkFont = null;
+        private Color _WatermarkColor = SystemColors.GrayText;
+
+        private bool _WatermarkEnabled = true;
+        /// <summary>
+        /// Gets or sets whether watermark text is displayed when control is empty. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Description("Indicates whether watermark text is displayed when control is empty.")]
+        public virtual bool WatermarkEnabled
+        {
+            get { return _WatermarkEnabled; }
+            set { _WatermarkEnabled = value; this.Invalidate(); UpdateEditBoxWatermark(); }
+        }
+
+        private Image _WatermarkImage = null;
+        /// <summary>
+        /// Gets or sets the watermark image displayed inside of the control when Text is not set and control does not have input focus.
+        /// </summary>
+        [DefaultValue(null), Category("Appearance"), Description("Indicates watermark image displayed inside of the control when Text is not set and control does not have input focus.")]
+        public Image WatermarkImage
+        {
+            get { return _WatermarkImage; }
+            set { _WatermarkImage = value; this.Invalidate(); UpdateEditBoxWatermark(); }
+        }
+        private ContentAlignment _WatermarkImageAlignment = ContentAlignment.MiddleLeft;
+        /// <summary>
+        /// Gets or sets the watermark image alignment.
+        /// </summary>
+        [DefaultValue(ContentAlignment.MiddleLeft), Category("Appearance"), Description("Indicates watermark image alignment.")]
+        public ContentAlignment WatermarkImageAlignment
+        {
+            get { return _WatermarkImageAlignment; }
+            set { _WatermarkImageAlignment = value; this.Invalidate(); UpdateEditBoxWatermark(); }
+        }
+
+        /// <summary>
+        /// Gets or sets the watermark (tip) text displayed inside of the control when Text is not set and control does not have input focus. This property supports text-markup.
+        /// </summary>
+        [Browsable(true), DefaultValue(""), Localizable(true), Category("Appearance"), Description("Indicates watermark text displayed inside of the control when Text is not set and control does not have input focus."), Editor("DevComponents.DotNetBar.Design.TextMarkupUIEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor))]
+        public string WatermarkText
+        {
+            get { return _WatermarkText; }
+            set
+            {
+                if (value == null) value = "";
+                _WatermarkText = value;
+                MarkupTextChanged();
+                UpdateEditBoxWatermark();
+                this.Invalidate();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the watermark font.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), Description("Indicates watermark font."), DefaultValue(null)]
+        public Font WatermarkFont
+        {
+            get { return _WatermarkFont; }
+            set { _WatermarkFont = value; this.Invalidate(); UpdateEditBoxWatermark(); }
+        }
+
+        /// <summary>
+        /// Gets or sets the watermark text color.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), Description("Indicates watermark text color.")]
+        public Color WatermarkColor
+        {
+            get { return _WatermarkColor; }
+            set { _WatermarkColor = value; this.Invalidate(); UpdateEditBoxWatermark(); }
+        }
+        /// <summary>
+        /// Indicates whether property should be serialized by Windows Forms designer.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeWatermarkColor()
+        {
+            return _WatermarkColor != SystemColors.GrayText;
+        }
+        /// <summary>
+        /// Resets the property to default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetWatermarkColor()
+        {
+            this.WatermarkColor = SystemColors.GrayText;
+        }
+
+        protected virtual bool IsWatermarkRendered
+        {
+            get
+            {
+                return (!this.Focused || _WatermarkBehavior == eWatermarkBehavior.HideNonEmpty) && this.SelectedTokens.Count == 0;
+            }
+        }
+
+        private eWatermarkBehavior _WatermarkBehavior = eWatermarkBehavior.HideOnFocus;
+        /// <summary>
+        /// Gets or sets the watermark hiding behaviour. Default value indicates that watermark is hidden when control receives input focus.
+        /// </summary>
+        [DefaultValue(eWatermarkBehavior.HideOnFocus), Category("Behavior"), Description("Indicates watermark hiding behaviour.")]
+        public eWatermarkBehavior WatermarkBehavior
+        {
+            get { return _WatermarkBehavior; }
+            set { _WatermarkBehavior = value; this.Invalidate();
+                UpdateEditBoxWatermark();
+            }
+        }
+        private void UpdateEditBoxWatermark()
+        {
+            _EditBox.WatermarkText = _WatermarkText;
+            _EditBox.WatermarkColor = _WatermarkColor;
+            _EditBox.WatermarkFont = _WatermarkFont;
+            _EditBox.WatermarkImage = _WatermarkImage;
+            _EditBox.WatermarkImageAlignment = _WatermarkImageAlignment;
+            if (this.SelectedTokens.Count > 0 || !_WatermarkEnabled)
+                _EditBox.WatermarkEnabled = false;
+            else if (_WatermarkBehavior == eWatermarkBehavior.HideNonEmpty)
+            {
+                _EditBox.WatermarkEnabled = true;
+                _EditBox.WatermarkBehavior = eWatermarkBehavior.HideNonEmpty;
+            }
+            else
+            {
+                _EditBox.WatermarkBehavior = eWatermarkBehavior.HideOnFocus;
+            }
+
+        }
+
+        private TextMarkup.BodyElement _TextMarkup = null;
+        private void MarkupTextChanged()
+        {
+            _TextMarkup = null;
+
+            if (!TextMarkup.MarkupParser.IsMarkup(ref _WatermarkText))
+                return;
+
+            _TextMarkup = TextMarkup.MarkupParser.Parse(_WatermarkText);
+            ResizeMarkup();
+        }
+
+        private MarkupDrawContext GetMarkupDrawContext(Graphics g)
+        {
+            return new MarkupDrawContext(g, (_WatermarkFont == null ? this.Font : _WatermarkFont), _WatermarkColor, this.RightToLeft == RightToLeft.Yes);
+        }
+        private void ResizeMarkup()
+        {
+            if (_TextMarkup != null)
+            {
+                using (Graphics g = this.CreateGraphics())
+                {
+                    MarkupDrawContext dc = GetMarkupDrawContext(g);
+                    _TextMarkup.Measure(GetWatermarkBounds().Size, dc);
+                    Size sz = _TextMarkup.Bounds.Size;
+                    _TextMarkup.Arrange(new Rectangle(GetWatermarkBounds().Location, sz), dc);
+                }
+            }
+        }
+
+        private Rectangle GetWatermarkBounds()
+        {
+            Rectangle r = this.ClientRectangle;
+            r.Inflate(-1, 0);
+            r.X += 2;
+            r.Width -= 2;
+            return r;
+        }
+
+        private void DrawWatermark(Graphics g)
+        {
+
+            Rectangle bounds = GetWatermarkBounds();
+            if (_WatermarkImage != null)
+            {
+                Rectangle imageBounds = new Rectangle(Point.Empty, _WatermarkImage.Size);
+                if (_WatermarkImageAlignment == ContentAlignment.BottomCenter)
+                    imageBounds.Location = new Point(bounds.X + (bounds.Width - imageBounds.Width) / 2, bounds.Bottom - imageBounds.Height);
+                else if (_WatermarkImageAlignment == ContentAlignment.BottomLeft)
+                    imageBounds.Location = new Point(bounds.X, bounds.Bottom - imageBounds.Height);
+                else if (_WatermarkImageAlignment == ContentAlignment.BottomRight)
+                    imageBounds.Location = new Point(bounds.Right - imageBounds.Width, bounds.Bottom - imageBounds.Height);
+                else if (_WatermarkImageAlignment == ContentAlignment.MiddleCenter)
+                    imageBounds.Location = new Point(bounds.X + (bounds.Width - imageBounds.Width) / 2, bounds.Y + (bounds.Height - imageBounds.Height) / 2);
+                else if (_WatermarkImageAlignment == ContentAlignment.MiddleLeft)
+                    imageBounds.Location = new Point(bounds.X, bounds.Y + (bounds.Height - imageBounds.Height) / 2);
+                else if (_WatermarkImageAlignment == ContentAlignment.MiddleRight)
+                    imageBounds.Location = new Point(bounds.Right - imageBounds.Width, bounds.Y + (bounds.Height - imageBounds.Height) / 2);
+                else if (_WatermarkImageAlignment == ContentAlignment.TopCenter)
+                    imageBounds.Location = new Point(bounds.X + (bounds.Width - imageBounds.Width) / 2, bounds.Y);
+                else if (_WatermarkImageAlignment == ContentAlignment.TopLeft)
+                    imageBounds.Location = new Point(bounds.X, bounds.Y);
+                else if (_WatermarkImageAlignment == ContentAlignment.TopRight)
+                    imageBounds.Location = new Point(bounds.Right - imageBounds.Width, bounds.Y);
+                g.DrawImage(_WatermarkImage, imageBounds);
+
+                if (_WatermarkImageAlignment == ContentAlignment.BottomLeft || _WatermarkImageAlignment == ContentAlignment.MiddleLeft || _WatermarkImageAlignment == ContentAlignment.TopLeft)
+                {
+                    bounds.X = imageBounds.Right;
+                    bounds.Width = Math.Max(0, bounds.Width - imageBounds.Width);
+                }
+                else if (_WatermarkImageAlignment == ContentAlignment.BottomRight || _WatermarkImageAlignment == ContentAlignment.MiddleRight || _WatermarkImageAlignment == ContentAlignment.TopRight)
+                {
+                    bounds.Width = Math.Max(0, bounds.Width - imageBounds.Width);
+                }
+            }
+
+            if (bounds.Width <= 0) return;
+
+            if (_TextMarkup != null)
+            {
+                MarkupDrawContext dc = GetMarkupDrawContext(g);
+                if (_TextMarkup.Bounds.Height < bounds.Height)
+                    _TextMarkup.Bounds = new Rectangle(bounds.X, bounds.Y + (bounds.Height - _TextMarkup.Bounds.Height) / 2, _TextMarkup.Bounds.Width, _TextMarkup.Bounds.Height);
+                _TextMarkup.Render(dc);
+            }
+            else
+            {
+                eTextFormat tf = eTextFormat.Left | eTextFormat.VerticalCenter;
+
+                if (this.RightToLeft == RightToLeft.Yes) tf |= eTextFormat.RightToLeft;
+
+                tf |= eTextFormat.EndEllipsis;
+                tf |= eTextFormat.WordBreak;
+                TextDrawing.DrawString(g, _WatermarkText, (_WatermarkFont == null ? this.Font : _WatermarkFont),
+                    _WatermarkColor, bounds, tf);
+            }
+
+        }
+
+        protected override void OnTextChanged(EventArgs e)
+        {
+            if (!_UpdatingText)
+            {
+                this.SelectedTokens.Clear();
+                if (!string.IsNullOrEmpty(this.Text))
+                {
+                    if (!string.IsNullOrEmpty(_TextSeparator))
+                    {
+                        string[] tokens = this.Text.Split(new string[] { _TextSeparator }, StringSplitOptions.RemoveEmptyEntries);
+                        foreach (string item in tokens)
+                        {
+                            bool isNew = false;
+                            SelectToken(FindOrCreateToken(this.Text, out isNew));
+                        }
+                    }
+                    else
+                    {
+                        bool isNew = false;
+                        SelectToken(FindOrCreateToken(this.Text, out isNew));
+                    }
+                }
+            }
+
+            base.OnTextChanged(e);
+        }
+
+        private bool _UpdatingText = false;
+        private void UpdateText()
+        {
+            _UpdatingText = true;
+            string text = "";
+            for (int i = 0; i < _SelectedTokens.Count; i++)
+            {
+                text += GetTokenText(_SelectedTokens[i]);
+                if (i < _SelectedTokens.Count - 1)
+                    text += _TextSeparator;
+            }
+
+            this.Text = text;
+
+            _UpdatingText = false;
+        }
+
+        private string _TextSeparator = ",";
+        /// <summary>
+        /// Indicates the character separator that is used to separate tokens when controls Text property is updated or parsed.
+        /// </summary>
+        [DefaultValue(","), Category("Behavior"), Description("Indicates the character separator that is used to separate tokens when controls Text property is updated or parsed.")]
+        public string TextSeparator
+        {
+            get { return _TextSeparator; }
+            set
+            {
+                if (value != _TextSeparator)
+                {
+                    string oldValue = _TextSeparator;
+                    _TextSeparator = value;
+                    OnTextSeparatorChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when TextSeparator property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnTextSeparatorChanged(string oldValue, string newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("TextSeparator"));
+            UpdateText();
+        }
+
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override string Text
+        {
+            get
+            {
+                return base.Text;
+            }
+            set
+            {
+                base.Text = value;
+            }
+        }
+
+        private bool _DropDownButtonVisible = false;
+        /// <summary>
+        /// Indicates whether drop-down button which shows available token popup is displayed
+        /// </summary>
+        [DefaultValue(false), Category("Appearance"), Description("Indicates whether drop-down button which shows available token popup is displayed")]
+        public bool DropDownButtonVisible
+        {
+            get { return _DropDownButtonVisible; }
+            set
+            {
+                if (value != _DropDownButtonVisible)
+                {
+                    bool oldValue = _DropDownButtonVisible;
+                    _DropDownButtonVisible = value;
+                    OnDropDownButtonVisibleChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when DropDownButtonVisible property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnDropDownButtonVisibleChanged(bool oldValue, bool newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("DropDownButtonVisible"));
+            UpdateButtons();
+            LayoutTokens();
+            Invalidate();
+        }
+
+        private bool _CheckBoxesVisible = false;
+        /// <summary>
+        /// Indicates whether check-boxes are displayed on popup token selection list and used for token selection.
+        /// </summary>
+        [DefaultValue(false), Category("Behavior"), Description("Indicates whether check-boxes are displayed on popup token selection list and used for token selection.")]
+        public bool CheckBoxesVisible
+        {
+            get { return _CheckBoxesVisible; }
+            set
+            {
+                if (value != _CheckBoxesVisible)
+                {
+                    bool oldValue = _CheckBoxesVisible;
+                    _CheckBoxesVisible = value;
+                    OnCheckBoxesVisibleChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when CheckBoxesVisible property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnCheckBoxesVisibleChanged(bool oldValue, bool newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("CheckBoxesVisible"));
+
+        }
+
+        private VisualGroup _ButtonGroup = null;
+        private VisualDropDownButton _DropDownButton = null;
+        private VisualUpDownButton _ScrollButton = null;
+        private int GetButtonHeight()
+        {
+            return GetSingleLineTextBoxHeight() - 4;
+        }
+        private void UpdateButtons()
+        {
+            if (!_DropDownButtonVisible && !_ScrollButton.Visible)
+                _ButtonGroup.Visible = false;
+            else
+            {
+                _ButtonGroup.Visible = true;
+                _DropDownButton.Height = GetButtonHeight();
+            }
+            _DropDownButton.Visible = _DropDownButtonVisible;
+            _ButtonGroup.InvalidateArrange();
+        }
+
+        protected virtual void CreateButtons()
+        {
+            _DropDownButton = new VisualDropDownButton();
+            _DropDownButton.MouseClick += DropDownButtonClick;
+            _DropDownButton.Visible = false;
+            _ButtonGroup.Items.Add(_DropDownButton);
+
+            _ScrollButton = new VisualUpDownButton();
+            _ScrollButton.UpClick += ScrollButtonUpClick;
+            _ScrollButton.DownClick += ScrollButtonDownClick;
+            _ScrollButton.Visible = false;
+            _ButtonGroup.Items.Add(_ScrollButton);
+        }
+
+        void ScrollButtonDownClick(object sender, EventArgs e)
+        {
+            if (Math.Abs(_AutoScrollPosition.Y) < (_VScrollBar.Maximum - _VScrollBar.LargeChange - 1))
+                AutoScrollPosition = new Point(_AutoScrollPosition.X, _AutoScrollPosition.Y - _VScrollBar.SmallChange);
+        }
+
+        void ScrollButtonUpClick(object sender, EventArgs e)
+        {
+            if (_AutoScrollPosition.Y < 0)
+                AutoScrollPosition = new Point(_AutoScrollPosition.X, Math.Min(0, _AutoScrollPosition.Y + _VScrollBar.SmallChange));
+        }
+
+        void DropDownButtonClick(object sender, MouseEventArgs e)
+        {
+            IsPopupOpen = !IsPopupOpen;
+        }
+        private void ButtonGroupRenderInvalid(object sender, EventArgs e)
+        {
+            Invalidate();
+        }
+
+        private void ButtonGroupArrangeInvalid(object sender, EventArgs e)
+        {
+            Invalidate();
+        }
+
+        private void ButtonGroupResetMouseHover(object sender, EventArgs e)
+        {
+            DevComponents.AdvTree.Interop.WinApi.ResetHover(this);
+        }
+
+        private void PaintButtons(Graphics g)
+        {
+            PaintInfo p = CreatePaintInfo(g);
+            if (!_ButtonGroup.IsLayoutValid)
+            {
+                _ButtonGroup.PerformLayout(p);
+            }
+            bool disposeStyle = false;
+            ElementStyle style = ElementStyleDisplay.GetElementStyle(_BackgroundStyle, out disposeStyle);
+            _ButtonGroup.RenderBounds = new Rectangle(this.Width - (ElementStyleLayout.RightWhiteSpace(style, eSpacePart.Border) + 1) - _ButtonGroup.Size.Width, ElementStyleLayout.TopWhiteSpace(style, eSpacePart.Border) + 1,
+                _ButtonGroup.Size.Width, _ButtonGroup.Size.Height);
+            _ButtonGroup.ProcessPaint(p);
+            if (disposeStyle) style.Dispose();
+        }
+        private PaintInfo CreatePaintInfo(Graphics g)
+        {
+            PaintInfo p = new PaintInfo();
+            p.Graphics = g;
+            p.DefaultFont = this.Font;
+            p.ForeColor = this.ForeColor;
+            p.RenderOffset = new System.Drawing.Point();
+            Size s = this.Size;
+            bool disposeStyle = false;
+            ElementStyle style = ElementStyleDisplay.GetElementStyle(_BackgroundStyle, out disposeStyle);
+            s.Height -= (ElementStyleLayout.TopWhiteSpace(style, eSpacePart.Border) + ElementStyleLayout.BottomWhiteSpace(style, eSpacePart.Border)) + 2;
+            s.Width -= (ElementStyleLayout.LeftWhiteSpace(style, eSpacePart.Border) + ElementStyleLayout.RightWhiteSpace(style, eSpacePart.Border)) + 2;
+            p.AvailableSize = s;
+            p.ParentEnabled = this.Enabled;
+            p.MouseOver = _IsMouseOver || this.Focused;
+            if (disposeStyle) style.Dispose();
+            return p;
+        }
+        #endregion
+
+        #region Tooltip Support
+        private DevComponents.DotNetBar.ToolTip _ToolTipWnd = null;
+        /// <summary>
+        /// Shows tooltip for this item.
+        /// </summary>
+        public virtual void ShowToolTip(EditToken token)
+        {
+            if (this.DesignMode || token==null || !token.IsSelected)
+                return;
+
+            if (this.Visible && this.ShowToolTips )
+            {
+                string tooltip = token.Tooltip;
+                if (!string.IsNullOrEmpty(tooltip))
+                {
+                    if (_ToolTipWnd == null)
+                        _ToolTipWnd = new DevComponents.DotNetBar.ToolTip();
+                    _ToolTipWnd.Style = StyleManager.GetEffectiveStyle();
+                    _ToolTipWnd.Text = tooltip;
+                    _ToolTipWnd.ReferenceRectangle = new Rectangle(PointToScreen(token.Bounds.Location), token.Bounds.Size);
+
+                    OnToolTipVisibleChanged(new EventArgs());
+                    _ToolTipWnd.ShowToolTip();
+                }
+            }
+        }
+        /// <summary>
+        /// Destroys tooltip window.
+        /// </summary>
+        internal protected void HideToolTip()
+        {
+            if (_ToolTipWnd != null)
+            {
+                System.Drawing.Rectangle tipRect = _ToolTipWnd.Bounds;
+                tipRect.Width += 5;
+                tipRect.Height += 6;
+
+                OnToolTipVisibleChanged(new EventArgs());
+                try
+                {
+                    if (_ToolTipWnd != null)
+                    {
+                        _ToolTipWnd.Hide();
+                        _ToolTipWnd.Dispose();
+                        _ToolTipWnd = null;
+                    }
+                }
+                catch { }
+                this.Invalidate();
+            }
+        }
+        /// <summary>
+        /// Occurs when item's tooltip visibility has changed.
+        /// </summary>
+        [System.ComponentModel.Description("Occurs when item's tooltip visibility has changed.")]
+        public event EventHandler ToolTipVisibleChanged;
+        private void OnToolTipVisibleChanged(EventArgs eventArgs)
+        {
+            EventHandler h = ToolTipVisibleChanged;
+            if (h != null)
+                ToolTipVisibleChanged(this, eventArgs);
+        }
+
+        private bool _ShowToolTips = true;
+        /// <summary>
+        /// Gets or sets whether tooltips are shown when mouse is over the selected token when Tooltip property is set.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether tooltips are shown when mouse is over the cell when Tooltip property is set.")]
+        public bool ShowToolTips
+        {
+            get { return _ShowToolTips; }
+            set
+            {
+                _ShowToolTips = value;
+            }
+        }
+        
+        #endregion
+
+        #region IMessageHandlerClient
+        private bool _MessageHandlerInstalled = false;
+        bool IMessageHandlerClient.OnSysKeyDown(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+            return false;
+        }
+
+        bool IMessageHandlerClient.OnSysKeyUp(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+            return false;
+        }
+
+        bool IMessageHandlerClient.OnKeyDown(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+            return false;
+        }
+
+        bool IMessageHandlerClient.OnMouseDown(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+            if (IsPopupOpen && _PopupController != null)
+            {
+                if (!_PopupController.Bounds.Contains(Control.MousePosition))
+                {
+                    IsPopupOpen = false;
+                }
+            }
+            return false;
+        }
+
+        bool IMessageHandlerClient.OnMouseMove(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+            return false;
+        }
+
+        bool IMessageHandlerClient.OnMouseWheel(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+            return false;
+        }
+
+        bool IMessageHandlerClient.IsModal
+        {
+            get { return false; }
+        }
+        #endregion
+    }
+
+    /// <summary>
+    /// Delegate for the ValidateTokenEvent event.
+    /// </summary>
+    public delegate void ValidateTokenEventHandler(object sender, ValidateTokenEventArgs ea);
+    /// <summary>
+    /// Arguments for the ValidateTokenEvent event.
+    /// </summary>
+    public class ValidateTokenEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Indicates whether validated token is valid. Default value is true. When you set this property to false the token being validated will be discared.
+        /// </summary>
+        public bool IsValid = true;
+        /// <summary>
+        /// Indicates the Token that will be accepted by the control if IsValid=true.
+        /// </summary>
+        public EditToken Token = null;
+        /// <summary>
+        /// Indicates whether token is newly created. When false it means that token was taken from Tokens collection.
+        /// </summary>
+        public readonly bool IsNewToken;
+        /// <summary>
+        /// Initializes a new instance of the ValidateTokenEventArgs class.
+        /// </summary>
+        /// <param name="token"></param>
+        public ValidateTokenEventArgs(EditToken token, bool isNewToken)
+        {
+            Token = token;
+            IsNewToken = isNewToken;
+        }
+    }
+    /// <summary>
+    /// Delegate for RemovingToken event.
+    /// </summary>
+    public delegate void RemovingTokenEventHandler(object sender, RemovingTokenEventArgs ea);
+    /// <summary>
+    /// Defines event arguments for RemovingToken event.
+    /// </summary>
+    public class RemovingTokenEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Indicates the Token that will be removed.
+        /// </summary>
+        public readonly EditToken Token;
+        /// <summary>
+        /// Set to true to cancel removal of the token.
+        /// </summary>
+        public bool Cancel = false;
+        /// <summary>
+        /// Indicates the source of the event.
+        /// </summary>
+        public readonly eEventSource EventSource;
+        /// <summary>
+        /// Initializes a new instance of the RemovingTokenEventArgs class.
+        /// </summary>
+        /// <param name="token"></param>
+        public RemovingTokenEventArgs(EditToken token, eEventSource eventSource)
+        {
+            Token = token;
+            EventSource = eventSource;
+        }
+    }
+
+    /// <summary>
+    /// Specifies the filter behavior on token editor popup list.
+    /// </summary>
+    public enum eTokenFilterBehavior
+    {
+        /// <summary>
+        /// Token text is searched for the match.
+        /// </summary>
+        Text,
+        /// <summary>
+        /// Token value is searched for the match.
+        /// </summary>
+        Value,
+        /// <summary>
+        /// Both token text and value are searched for the match.
+        /// </summary>
+        TextAndValue
+    }
+
+    /// <summary>
+    /// Delegate for TokenEditor.BeforePopupOpen event.
+    /// </summary>
+    public delegate void TokenEditorPopupEventHandler(object sender, TokenEditorPopupEventArgs ea);
+    /// <summary>
+    /// Defines event arguments for BeforePopupOpen event.
+    /// </summary>
+    public class TokenEditorPopupEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets or sets the screen location of the popup in relation to the TokenEditor control.
+        /// </summary>
+        public Point PopupLocation = Point.Empty;
+        /// <summary>
+        /// Gets the suggested popup size.
+        /// </summary>
+        public readonly Size PopupSize;
+        /// <summary>
+        /// Initializes a new instance of the TokenEditorPopupEventArgs class.
+        /// </summary>
+        /// <param name="token"></param>
+        public TokenEditorPopupEventArgs(Point popupLocation, Size popupSize)
+        {
+            PopupLocation = popupLocation;
+            PopupSize = popupSize;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/TokenEditor/TokenEditorColorTable.cs b/PROMS/DotNetBar Source Code/Controls/TokenEditor/TokenEditorColorTable.cs
new file mode 100644
index 00000000..1b4fb127
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/TokenEditor/TokenEditorColorTable.cs	
@@ -0,0 +1,92 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Text;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    /// <summary>
+    /// Represents the color table for TokenEditor control tokens.
+    /// </summary>
+    public class TokenEditorColorTable
+    {
+        /// <summary>
+        /// Initializes a new instance of the TokenEditorColorTable class.
+        /// </summary>
+        public TokenEditorColorTable()
+        {
+            
+        }
+        /// <summary>
+        /// Initializes a new instance of the TokenEditorColorTable class.
+        /// </summary>
+        public TokenEditorColorTable(int normalTextColor, int normalBackground, int mouseOverTextColor, int mouseOverBackground, int focusedTextColor, int focusedBackground)
+        {
+            Normal = new TokenColorTable(normalTextColor, normalBackground);
+            MouseOver = new TokenColorTable(mouseOverTextColor, mouseOverBackground);
+            Focused = new TokenColorTable(focusedTextColor, focusedBackground);
+        }
+        /// <summary>
+        /// Initializes a new instance of the TokenEditorColorTable class.
+        /// </summary>
+        public TokenEditorColorTable(Color normalTextColor, Color normalBackground, Color mouseOverTextColor, Color mouseOverBackground, Color focusedTextColor, Color focusedBackground)
+        {
+            Normal = new TokenColorTable(normalTextColor, normalBackground);
+            MouseOver = new TokenColorTable(mouseOverTextColor, mouseOverBackground);
+            Focused = new TokenColorTable(focusedTextColor, focusedBackground);
+        }
+        /// <summary>
+        /// Gets or sets token default state colors.
+        /// </summary>
+        public TokenColorTable Normal = new TokenColorTable(0x000000, 0xDBE9FC);
+        /// <summary>
+        /// Gets or sets token mouse over state colors.
+        /// </summary>
+        public TokenColorTable MouseOver = new TokenColorTable(0x000000, 0xBFDBFF);
+        /// <summary>
+        /// Gets or sets token focused state colors.
+        /// </summary>
+        public TokenColorTable Focused = new TokenColorTable(0xFFFFFF, 0x0072C6);
+    }
+
+    /// <summary>
+    /// Represents the state color table for token in TokenEditor control.
+    /// </summary>
+    public class TokenColorTable
+    {
+        /// <summary>
+        /// Initializes a new instance of the TokenColorTable class.
+        /// </summary>
+        public TokenColorTable()
+        {
+        }
+        /// <summary>
+        /// Initializes a new instance of the TokenColorTable class.
+        /// </summary>
+        /// <param name="textColor"></param>
+        /// <param name="new"></param>
+        public TokenColorTable(Color textColor, Color background)
+        {
+            TextColor = textColor;
+            Background = new LinearGradientColorTable(background);
+        }
+        /// <summary>
+        /// Initializes a new instance of the TokenColorTable class.
+        /// </summary>
+        /// <param name="textColor"></param>
+        /// <param name="new"></param>
+        public TokenColorTable(int textColor, int background)
+        {
+            TextColor = ColorScheme.GetColor(textColor);
+            Background = new LinearGradientColorTable(background);
+        }
+        /// <summary>
+        /// Gets or sets token text color.
+        /// </summary>
+        public Color TextColor = Color.Black;
+        /// <summary>
+        /// Gets or sets the background color table.
+        /// </summary>
+        public LinearGradientColorTable Background = new LinearGradientColorTable(0xE5EEF8);
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/Toolbox/ToolboxControl.cs b/PROMS/DotNetBar Source Code/Controls/Toolbox/ToolboxControl.cs
new file mode 100644
index 00000000..af74dcf1
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/Toolbox/ToolboxControl.cs	
@@ -0,0 +1,1162 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+using System.Xml;
+using DevComponents.AdvTree;
+using DevComponents.DotNetBar.Primitives;
+using DevComponents.DotNetBar.Rendering;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    /// <summary>
+    /// Represents Toolbox control to create.
+    /// </summary>
+    [ToolboxBitmap(typeof(ToolboxControl), "Controls.ToolboxControl.bmp"), ToolboxItem(true), Designer("DevComponents.DotNetBar.Design.ToolboxControlDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf"), System.Runtime.InteropServices.ComVisible(false)]
+    public class ToolboxControl : ContainerControl
+    {
+        #region Implementation
+
+        private ItemPanel _ItemPanel = null;
+        private Bar _TitleBar = null;
+        private TextBoxX _SearchBox = null;
+        private Bar _MenuBar = null;
+
+        public ToolboxControl()
+        {
+            _BackgroundStyle.StyleChanged += new EventHandler(this.VisualPropertyChanged);
+            _BackgroundStyle.Class = ElementStyleClassKeys.ToolboxControlKey;
+            this.Padding = new System.Windows.Forms.Padding(2);
+
+            this.SetStyle(ControlStyles.UserPaint | ControlStyles.AllPaintingInWmPaint | ControlStyles.Opaque |
+            ControlStyles.ResizeRedraw | ControlStyles.DoubleBuffer | ControlStyles.Selectable, true);
+
+            _ItemPanel = CreateItemsPanel();
+            this.Controls.Add(_ItemPanel);
+
+            _MenuBar = CreateMenuBar();
+            this.Controls.Add(_MenuBar);
+
+            _SearchBox = CreateSearchBox();
+            this.Controls.Add(_SearchBox);
+
+            _TitleBar = CreateTitleBar();
+            this.Controls.Add(_TitleBar);
+
+            _SelectedItems = new CustomCollection<ToolboxItem>();
+
+            _Groups.CollectionChanged += GroupsCollectionChanged;
+        }
+
+        private void GroupsCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            if (e.Action == NotifyCollectionChangedAction.Add)
+            {
+                int index = e.NewStartingIndex;
+                foreach (ToolboxGroup group in e.NewItems)
+                {
+                    _ItemPanel.Items.Insert(index, group);
+                    index++;
+                }
+            }
+            else if (e.Action == NotifyCollectionChangedAction.Remove)
+            {
+                foreach (ToolboxGroup group in e.OldItems)
+                    _ItemPanel.Items.Remove(group);
+            }
+            else if (e.Action == NotifyCollectionChangedAction.Reset)
+            {
+                _ItemPanel.Items.Clear();
+                if (e.NewItems != null)
+                {
+                    foreach (ToolboxGroup group in e.NewItems)
+                        _ItemPanel.Items.Add(group);
+                }
+            }
+            else if (e.Action == NotifyCollectionChangedAction.Replace)
+            {
+                _ItemPanel.Items.Remove(e.NewStartingIndex);
+                _ItemPanel.Items.Insert(e.NewStartingIndex, (BaseItem)e.NewItems[0]);
+            }
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            base.Dispose(disposing);
+        }
+
+        private ButtonItem _MenuButton = null;
+        private Bar CreateMenuBar()
+        {
+            Bar menuBar = new Bar();
+            menuBar.Name = "menuBar";
+            menuBar.AntiAlias = true;
+            menuBar.BackColor = System.Drawing.Color.Transparent;
+            menuBar.Dock = System.Windows.Forms.DockStyle.Top;
+            menuBar.Font = new System.Drawing.Font("Segoe UI", 9F);
+            menuBar.IsMaximized = false;
+            menuBar.Location = new System.Drawing.Point(6, 93);
+            menuBar.PaddingBottom = 4;
+            menuBar.PaddingTop = 4;
+            menuBar.Size = new System.Drawing.Size(365, 61);
+            menuBar.Stretch = true;
+            menuBar.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            menuBar.TabIndex = 2;
+            menuBar.TabStop = false;
+
+            ButtonItem menuButton = new ButtonItem("menuButton");
+            menuButton.AutoExpandOnClick = true;
+            menuButton.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText;
+            menuButton.ImagePaddingHorizontal = 30;
+            menuButton.ImagePaddingVertical = 12;
+            menuButton.ImagePosition = DevComponents.DotNetBar.eImagePosition.Right;
+            menuButton.PopupSide = DevComponents.DotNetBar.ePopupSide.Right;
+            menuButton.Text = "Menu";
+            menuButton.SubItems.Add(new ButtonItem()); // Just placeholder
+            menuButton.PopupOpen += MenuButtonPopupOpen;
+            menuButton.PopupClose += MenuButtonPopupClose;
+            _MenuButton = menuButton;
+
+            menuBar.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+            menuButton});
+
+            return menuBar;
+        }
+
+        /// <summary>
+        /// Gets the Bar control used as menu bar.
+        /// </summary>
+        [Browsable(false)]
+        public Bar MenuBar
+        {
+            get { return _MenuBar; }
+        }
+
+        private void MenuButtonPopupClose(object sender, EventArgs e)
+        {
+            ClearAndDisposeMenuItems();
+            _MenuButton.SubItems.Add(new ButtonItem());
+        }
+
+        private void ClearAndDisposeMenuItems()
+        {
+            foreach (BaseItem item in _MenuButton.SubItems)
+            {
+                item.Dispose();
+            }
+            _MenuButton.SubItems.Clear();
+        }
+
+        private void MenuButtonPopupOpen(object sender, PopupOpenEventArgs e)
+        {
+            ClearAndDisposeMenuItems();
+            foreach (BaseItem item in this.Groups)
+            {
+                ToolboxGroup group = item as ToolboxGroup;
+                if (group != null)
+                {
+                    ButtonItem menuItem = new ButtonItem();
+                    menuItem.Text = group.TitleText;
+                    menuItem.Click += MenuItemClick;
+                    menuItem.Tag = group;
+                    _MenuButton.SubItems.Add(menuItem);
+                }
+            }
+        }
+
+        private void MenuItemClick(object sender, EventArgs e)
+        {
+            ToolboxGroup group = ((BaseItem)sender).Tag as ToolboxGroup;
+            if (group != null)
+                group.Expanded = true;
+        }
+
+        private string _SearchBoxWatermark = "Enter text to search...";
+
+        /// <summary>
+        /// Indicates the search-box watermark text.
+        /// </summary>
+        [DefaultValue("Enter text to search..."), Category("Appearance"), Description("Indicates the search-box watermark text."), Localizable(true)]
+        public string SearchBoxWatermark
+        {
+            get { return _SearchBoxWatermark; }
+            set
+            {
+                if (_SearchBoxWatermark != value)
+                {
+                    string oldValue = value;
+                    _SearchBoxWatermark = value;
+                    OnSearchBoxWatermarkChanged(oldValue, value);
+                }
+            }
+        }
+
+        protected virtual void OnSearchBoxWatermarkChanged(string oldValue, string newValue)
+        {
+            _SearchBox.WatermarkText = newValue;
+        }
+
+        private TextBoxX CreateSearchBox()
+        {
+            TextBoxX searchBox = new TextBoxX();
+            searchBox.Name = "searchBox";
+            searchBox.Border.Class = "TextBoxBorder";
+            searchBox.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            searchBox.ButtonCustom.Symbol = "";
+            searchBox.ButtonCustom.Visible = true;
+            searchBox.ButtonCustomClick += SearchBoxButtonCustomClick;
+            searchBox.Dock = System.Windows.Forms.DockStyle.Top;
+            searchBox.Location = new System.Drawing.Point(6, 55);
+            searchBox.PreventEnterBeep = true;
+            searchBox.Size = new System.Drawing.Size(365, 38);
+            searchBox.TabIndex = 0;
+            searchBox.WatermarkText = "Enter text to search...";
+            searchBox.TextChanged += SearchBoxTextChanged;
+            searchBox.WordWrap = false;
+
+            return searchBox;
+        }
+        /// <summary>
+        /// Returns reference to internal search text-box.
+        /// </summary>
+        [Browsable(false)]
+        public TextBoxX SearchBoxTextBox
+        {
+            get { return _SearchBox; }
+        }
+
+        void SearchBoxButtonCustomClick(object sender, EventArgs e)
+        {
+            _SearchBox.Text = string.Empty;
+        }
+
+        private void SearchBoxTextChanged(object sender, EventArgs e)
+        {
+            if (string.IsNullOrEmpty(_SearchBox.Text))
+                _SearchBox.ButtonCustom.Symbol = "\uf002";
+            else
+                _SearchBox.ButtonCustom.Symbol = "\uf00d";
+            Search(_SearchBox.Text);
+        }
+
+        private ButtonItem _ExpandButton = null;
+        private LabelItem _TitleLabel = null;
+        private Bar CreateTitleBar()
+        {
+            Bar titleBar = new Bar();
+            titleBar.Name = "titleBar";
+            titleBar.AntiAlias = true;
+            titleBar.BackColor = System.Drawing.Color.Transparent;
+            titleBar.Dock = System.Windows.Forms.DockStyle.Top;
+            titleBar.IsMaximized = false;
+            titleBar.Location = new System.Drawing.Point(6, 6);
+            titleBar.PaddingBottom = 4;
+            titleBar.PaddingTop = 4;
+            titleBar.Size = new System.Drawing.Size(365, 49);
+            titleBar.Stretch = true;
+            titleBar.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            titleBar.TabIndex = 0;
+            titleBar.TabStop = false;
+
+            LabelItem toolboxLabel = new LabelItem("toolboxLabel");
+            toolboxLabel.Text = "Toolbox";
+            _TitleLabel = toolboxLabel;
+
+            ButtonItem expandButton = new ButtonItem("expandButton");
+            expandButton.ItemAlignment = DevComponents.DotNetBar.eItemAlignment.Far;
+            expandButton.Symbol = "\uf053";
+            expandButton.SymbolSize = 10F;
+            expandButton.Click += ExpandButtonClick;
+            _ExpandButton = expandButton;
+
+            titleBar.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+            toolboxLabel,
+            expandButton});
+
+            return titleBar;
+        }
+
+        private string _TitleText = "Toolbox";
+
+        /// <summary>
+        /// Indicates the title label text.
+        /// </summary>
+        [DefaultValue("Toolbox"), Category("Appearance"), Description("Indicates the title label text."), Localizable(true)]
+        public string TitleText
+        {
+            get { return _TitleText; }
+            set
+            {
+                if (_TitleText != value)
+                {
+                    string oldValue = value;
+                    _TitleText = value;
+                    OnTitleTextChanged(oldValue, value);
+                }
+            }
+        }
+
+        protected virtual void OnTitleTextChanged(string oldValue, string newValue)
+        {
+            _TitleLabel.Text = newValue;
+        }
+
+        /// <summary>
+        /// Gets the Bar control used as title bar.
+        /// </summary>
+        [Browsable(false)]
+        public Bar TitleBar
+        {
+            get { return _TitleBar; }
+        }
+
+        private void ExpandButtonClick(object sender, EventArgs e)
+        {
+            this.Expanded = !this.Expanded;
+        }
+
+        private ItemPanel CreateItemsPanel()
+        {
+            ItemPanel itemPanel = new ItemPanel();
+            itemPanel.Dock = DockStyle.Fill;
+            itemPanel.LayoutOrientation = eOrientation.Vertical;
+            itemPanel.AutoScroll = true;
+#if !TRIAL
+            itemPanel.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F";
+#endif
+            itemPanel.ItemClick += ItemPanelItemClick;
+            itemPanel.DragDropSupport = true;
+            itemPanel.EnableDragDrop = true;
+            itemPanel.UseNativeDragDrop = true;
+            itemPanel.AllowDrop = true;
+            itemPanel.BeforeItemDrag += ItemsPanelBeforeItemDrag;
+            itemPanel.GetBaseItemContainer().SubItemsChanged += ItemsChanged;
+            itemPanel.DragDropAllowedContainerTypes.Add(typeof(ToolboxGroup));
+            return itemPanel;
+        }
+
+        private void ItemsChanged(object sender, CollectionChangeEventArgs e)
+        {
+            if (!IsUpdateSuspended)
+                this.RecalcLayout();
+        }
+
+        private int _UpdateSuspended = 0;
+        /// <summary>
+        /// Disables any redrawing of the tree control. To maintain performance while items
+        /// are added one at a time to the control, call the BeginUpdate method. The BeginUpdate
+        /// method prevents the control from painting until the
+        /// <see cref="EndUpdate">EndUpdate</see> method is called.
+        /// </summary>
+        public void BeginUpdate()
+        {
+            _UpdateSuspended++;
+        }
+
+        /// <summary>
+        /// Enables the redrawing of the tree view. To maintain performance while items are
+        /// added one at a time to the control, call the <see cref="BeginUpdate">BeginUpdate</see>
+        /// method. The BeginUpdate method prevents the control from painting until the EndUpdate
+        /// method is called.
+        /// </summary>
+        /// <remarks>
+        /// Call to EndUpdate will enable the layout and painting in tree control. If there
+        /// are any pending layouts the EndUpdate will call
+        /// <see cref="RecalcLayout">RecalcLayout</see> method to perform the layout and it will
+        /// repaint the control.
+        /// </remarks>
+        public void EndUpdate()
+        {
+            EndUpdate(true);
+        }
+
+        /// <summary>
+        /// Enables the redrawing of the tree view. To maintain performance while items are
+        /// added one at a time to the control, call the <see cref="BeginUpdate">BeginUpdate</see>
+        /// method. The BeginUpdate method prevents the control from painting until the EndUpdate
+        /// method is called.
+        /// </summary>
+        /// <param name="performLayoutAndRefresh">Gets or sets whether layout and refresh of control is performed if there are no other update blocks pending.</param>
+        public void EndUpdate(bool performLayoutAndRefresh)
+        {
+            if (_UpdateSuspended > 0) _UpdateSuspended--;
+            if (_UpdateSuspended == 0 && performLayoutAndRefresh)
+            {
+                this.RecalcLayout();
+                this.Invalidate(true);
+            }
+        }
+
+        /// <summary>
+        /// Gets whether layout is suspended for tree control. Layout is suspended after
+        /// call to <see cref="BeginUpdate">BeginUpdate</see> method and it is resumed after the
+        /// call to <see cref="EndUpdate">EndUpdate</see> method.
+        /// </summary>
+        [Browsable(false)]
+        public bool IsUpdateSuspended
+        {
+            get { return (_UpdateSuspended > 0); }
+        }
+
+        public void RecalcLayout()
+        {
+            _ItemPanel.RecalcLayout();
+        }
+
+        /// <summary>
+        /// Returns reference to internal item panel used to display the toolbox items and groups.
+        /// </summary>
+        [Browsable(false)]
+        public ItemPanel ItemsPanel
+        {
+            get { return _ItemPanel; }
+        }
+
+        private void ItemsPanelBeforeItemDrag(object sender, CancelEventArgs e)
+        {
+            OnBeforeItemDrag(sender, e);
+        }
+
+        /// <summary>
+        /// Returns collection of toolbox control groups, collection of ToolboxGroup items.
+        /// </summary>
+        //[DesignerSerializationVisibility(DesignerSerializationVisibility.Content), Browsable(false)]
+        //[System.ComponentModel.Editor("DevComponents.DotNetBar.Design.ToolboxControlGroupsEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor))]
+        //public SubItemsCollection Groups
+        //{
+        //    get { return _ItemPanel.GetBaseItemContainer().SubItems; }
+        //}
+
+        private CustomCollection<ToolboxGroup> _Groups = new CustomCollection<ToolboxGroup>();
+        /// <summary>
+        /// Gets the list of items displayed in list box.
+        /// </summary>
+        [Category("Appearance"), Description("List of items displayed in list box."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content), MergableProperty(false), Localizable(false)]
+        public CustomCollection<ToolboxGroup> Groups
+        {
+            get { return _Groups; }
+        }
+
+        private bool _ExpandSingleGroupOnly = true;
+
+        /// <summary>
+        /// Indicates whether single group only is expanded at a time. When new group is expanded currently expanded group is collapsed.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"),
+         Description("Indicates whether single toolbox group only is expanded at a time")]
+        public bool ExpandSingleGroupOnly
+        {
+            get { return _ExpandSingleGroupOnly; }
+            set { _ExpandSingleGroupOnly = value; }
+        }
+
+        /// <summary>
+        /// Occurs after Expanded property value has changed
+        /// </summary>
+        [Description("Occurs after Expanded property value has changed")]
+        public event EventHandler ExpandedChanged;
+
+        /// <summary>
+        /// Raises ExpandedChanged event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnExpandedChanged(EventArgs e)
+        {
+            EventHandler handler = ExpandedChanged;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        private bool _Expanded = true;
+        /// <summary>
+        /// Gets or sets whether control is expanded and shows items in full size with image and text. When collapsed
+        /// control will show only images for toolbox items and will hide other UI elements to minimize its size.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance"), Description("Indicates whether control is expanded and shows items in full size with images and text")]
+        public bool Expanded
+        {
+            get { return _Expanded; }
+            set
+            {
+                if (_Expanded != value)
+                {
+                    _Expanded = value;
+                    OnExpandedChanged();
+                }
+            }
+        }
+
+        private Color _CollapsedSeparatorColor = Color.Gray;
+
+        /// <summary>
+        /// Indicates the collapsed toolbox separator color, the line drawn between the toolbox and menu/expand buttons above.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates the collapsed toolbox separator color, the line drawn between the toolbox and menu/expand buttons above.")]
+        public Color CollapsedSeparatorColor
+        {
+            get { return _CollapsedSeparatorColor; }
+            set
+            {
+                _CollapsedSeparatorColor = value;
+                if (!_Expanded)
+                {
+                    _MenuBar.Invalidate();
+                    _MenuBar.BorderColors = new Color[] { Color.Empty, Color.Empty, Color.Empty, _CollapsedSeparatorColor };
+                }
+            }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeCollapsedSeparatorColor()
+        {
+            return _CollapsedSeparatorColor != Color.Gray;
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetCollapsedSeparatorColor()
+        {
+            CollapsedSeparatorColor = Color.Gray;
+        }
+
+        /// <summary>
+        /// Gets or sets the expanded width of the control. This property value is valid after control has been collapsed. 
+        /// </summary>
+        [Browsable(false)]
+        public int ExpandedWidth
+        {
+            get { return _ExpandedWidth; }
+            set { _ExpandedWidth = value; }
+        }
+
+        private List<BaseItemAutoSizeBag> _CollapsedList = new List<BaseItemAutoSizeBag>();
+        private int _ExpandedWidth = 0;
+        protected virtual void OnExpandedChanged()
+        {
+            OnExpandedChanged(EventArgs.Empty);
+            if (!_Expanded)
+            {
+                _ExpandedWidth = this.Width;
+                _ExpandButton.Symbol = "\uf054";
+                _MenuButton.ButtonStyle = eButtonStyle.Default;
+                _TitleLabel.Visible = false;
+
+                _MenuButton.Symbol = "\ue037";
+                _MenuButton.SymbolSet = eSymbolSet.Material;
+                _MenuButton.SymbolSize = 10f;
+                _MenuButton.ButtonStyle = eButtonStyle.Default;
+                _MenuButton.ImagePaddingHorizontal = 8;
+                _MenuButton.ImagePaddingVertical = 6;
+                _MenuButton.ImagePosition = eImagePosition.Left;
+                _MenuButton.ShowSubItems = false;
+                _MenuBar.BorderColors = new Color[] { Color.Empty, Color.Empty, Color.Empty, _CollapsedSeparatorColor };
+
+                _SearchBox.Visible = false;
+
+                // Collapse everything
+                foreach (BaseItem item in _ItemPanel.Items)
+                {
+                    if (!(item is ToolboxGroup)) continue;
+
+                    ToolboxGroup group = (ToolboxGroup)item;
+                    BaseItemAutoSizeBag bagGroup = AutoSizeBagFactory.CreateAutoSizeBag(group);
+                    bagGroup.RecordSetting(item);
+                    _CollapsedList.Add(bagGroup);
+                    group.TitleVisible = false;
+                    group.LayoutOrientation = eOrientation.Vertical;
+                    group.MultiLine = false;
+                    foreach (BaseItem ti in group.SubItems)
+                    {
+                        ButtonItem tbItem = ti as ButtonItem;
+                        if (tbItem != null)
+                        {
+                            BaseItemAutoSizeBag bagItem = AutoSizeBagFactory.CreateAutoSizeBag(tbItem);
+                            bagItem.RecordSetting(tbItem);
+                            _CollapsedList.Add(bagItem);
+                            tbItem.ButtonStyle = eButtonStyle.Default;
+                        }
+                    }
+                }
+            }
+            else
+            {
+                // Expand everything
+                _ExpandButton.Symbol = "\uf053";
+                _MenuBar.BorderColors = new Color[0];
+                _MenuButton.ButtonStyle = eButtonStyle.ImageAndText;
+                _TitleLabel.Visible = true;
+
+                _MenuButton.Symbol = string.Empty;
+                _MenuButton.ButtonStyle = eButtonStyle.Default;
+                _MenuButton.ImagePaddingHorizontal = 30;
+                _MenuButton.ImagePaddingVertical = 12;
+                _MenuButton.ImagePosition = DevComponents.DotNetBar.eImagePosition.Right;
+                _MenuButton.ShowSubItems = true;
+                _MenuBar.BorderColors = new Color[0];
+
+                _SearchBox.Visible = true;
+
+                BaseItemAutoSizeBag[] bagItems = new BaseItemAutoSizeBag[_CollapsedList.Count];
+                _CollapsedList.CopyTo(bagItems);
+                foreach (BaseItemAutoSizeBag ab in bagItems)
+                    ab.RestoreSettings();
+
+                _CollapsedList.Clear();
+
+                this.Width = _ExpandedWidth;
+            }
+
+            _ItemPanel.RecalcLayout();
+
+            if (_Expanded)
+            {
+                _MenuButton.FixedSize = Size.Empty;
+                _ExpandButton.FixedSize = Size.Empty;
+            }
+            else
+            {
+                int itemsWidth = UpdateCollapsedWidth();
+                _MenuButton.FixedSize = new Size(itemsWidth - Dpi.Width2, _MenuButton.HeightInternal);
+                _ExpandButton.FixedSize = new Size(itemsWidth - Dpi.Width2, _ExpandButton.HeightInternal);
+
+            }
+
+            _MenuBar.RecalcLayout();
+            _TitleBar.RecalcLayout();
+        }
+
+        private int UpdateCollapsedWidth()
+        {
+            int itemsWidth = GetItemsWidth();
+            int width = itemsWidth +
+                    ElementStyleLayout.LeftWhiteSpace(_ItemPanel.BackgroundStyle, eSpacePart.Margin | eSpacePart.Padding) +
+                    ElementStyleLayout.RightWhiteSpace(_ItemPanel.BackgroundStyle, eSpacePart.Padding | eSpacePart.Margin) + this.Padding.Horizontal;
+            _MenuButton.FixedSize = new Size(itemsWidth - Dpi.Width2, _MenuButton.HeightInternal);
+            _ExpandButton.FixedSize = new Size(itemsWidth - Dpi.Width2, _ExpandButton.HeightInternal);
+            this.Width = width;
+            return itemsWidth;
+        }
+
+        private int GetItemsWidth()
+        {
+            int width = 0;
+            bool scrollBar = false;
+            foreach (BaseItem item in _ItemPanel.Items)
+            {
+                if (item is ToolboxGroup)
+                {
+                    foreach (BaseItem ti in item.SubItems)
+                    {
+                        if (ti is ButtonItem && ti.WidthInternal > width)
+                            width = ti.WidthInternal;
+                    }
+                }
+                if (item.Bounds.Bottom > this.ClientRectangle.Height) scrollBar = true;
+            }
+
+            if (scrollBar)
+                width += SystemInformation.VerticalScrollBarWidth;
+
+            if (width == 0)
+                width = 32;
+
+            return width;
+        }
+
+        /// <summary>
+        /// Occurs after toolbox group is expanded
+        /// </summary>
+        [Description("Occurs after toolbox group is expanded")]
+        public event EventHandler ToolboxGroupExpanded;
+
+        /// <summary>
+        /// Raises RemovingToken event.
+        /// </summary>
+        /// <param name="sender">Provides source of the event.</param>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnToolboxGroupExpanded(object sender, EventArgs e)
+        {
+            EventHandler handler = ToolboxGroupExpanded;
+            if (handler != null)
+                handler(sender, e);
+        }
+        internal void InvokeToolboxGroupExpanded(ToolboxGroup toolboxGroup)
+        {
+            if (!_Expanded)
+            {
+                // Adjust width of collapsed control if needed
+                UpdateCollapsedWidth();
+            }
+            OnToolboxGroupExpanded(toolboxGroup, EventArgs.Empty);
+        }
+
+        private eToolboxItemSelectionMode _SelectionMode = eToolboxItemSelectionMode.Single;
+
+        /// <summary>
+        /// Indicates toolbox item selection mode.
+        /// </summary>
+        [DefaultValue(eToolboxItemSelectionMode.Single), Category("Behavior"), Description("Indicates toolbox item selection mode.")]
+        public eToolboxItemSelectionMode SelectionMode
+        {
+            get { return _SelectionMode; }
+            set
+            {
+                if (_SelectionMode != value)
+                {
+                    _SelectionMode = value;
+                    OnSelectionModeChanged();
+                }
+            }
+        }
+
+        protected virtual void OnSelectionModeChanged()
+        {
+
+        }
+
+        void ItemPanelItemClick(object sender, EventArgs e)
+        {
+            if (_SelectionMode == eToolboxItemSelectionMode.NoSelection) return;
+
+            ToolboxItem item = sender as ToolboxItem;
+            if (item == null || item.AutoCheckOnClick || item.Checked && (Control.ModifierKeys & Keys.Control) == Keys.None) return;
+
+            if (item.Checked)
+                SetSelectedItem(item, false);
+            else
+                SetSelectedItem(item, true);
+
+        }
+
+        /// <summary>
+        /// Selects or deselects an item.
+        /// </summary>
+        /// <param name="item">Item to select or deselect.</param>
+        /// <param name="isSelected">Selection state.</param>
+        public void SetSelectedItem(ToolboxItem item, bool isSelected)
+        {
+            if (_SelectionMode == eToolboxItemSelectionMode.Single)
+            {
+                if (_SelectedItem == item && !isSelected)
+                    this.SelectedItem = null;
+                else if (isSelected)
+                    this.SelectedItem = item;
+            }
+            else if (item.Checked != isSelected)
+            {
+                item.Checked = isSelected;
+            }
+        }
+
+        /// <summary>
+        /// Occurs after selected item has changed.
+        /// </summary>
+        [Description("Occurs after selected item has changed. ")]
+        public event EventHandler SelectedItemChanged;
+
+        /// <summary>
+        /// Raises RemovingToken event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnSelectedItemChanged(EventArgs e)
+        {
+            EventHandler handler = SelectedItemChanged;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        private CustomCollection<ToolboxItem> _SelectedItems;
+        /// <summary>
+        /// Gets a collection containing the currently selected items in the ToolboxControl. Do not modify items in this collection. To select or deselect list items while in multi-selection mode use SetSelected method.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public CustomCollection<ToolboxItem> SelectedItems
+        {
+            get
+            {
+                return _SelectedItems;
+            }
+        }
+
+        private ToolboxItem _SelectedItem;
+        /// <summary>
+        /// Gets or sets selected item in toolbox control.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public ToolboxItem SelectedItem
+        {
+            get { return _SelectedItem; }
+            set
+            {
+                if (_SelectedItem != value)
+                {
+                    ToolboxItem oldValue = _SelectedItem;
+                    _SelectedItem = value;
+                    OnSelectedItemChanged(oldValue, value);
+                }
+            }
+        }
+
+        private bool _IgnoreCheckedChange = false;
+        protected virtual void OnSelectedItemChanged(ToolboxItem oldValue, ToolboxItem newValue)
+        {
+            if (oldValue != null)
+            {
+                if (newValue != null) _IgnoreCheckedChange = true;
+                oldValue.Checked = false;
+                _IgnoreCheckedChange = false;
+            }
+            if (newValue != null) newValue.Checked = true;
+        }
+
+        internal void ToolboxItemCheckedChanged(ToolboxItem toolboxItem)
+        {
+            if (_SelectionMode == eToolboxItemSelectionMode.Single)
+            {
+                _SelectedItems.Clear();
+                if (toolboxItem.Checked)
+                    _SelectedItem = toolboxItem;
+            }
+            else
+            {
+                if (!toolboxItem.Checked && _SelectedItems.Contains(toolboxItem))
+                    _SelectedItems.Remove(toolboxItem);
+                else if (toolboxItem.Checked)
+                    _SelectedItems.Add(toolboxItem);
+            }
+            if (!_IgnoreCheckedChange)
+                OnSelectedItemChanged(EventArgs.Empty);
+        }
+
+        private bool _TitleVisible = true;
+
+        /// <summary>
+        /// Indicates whether title bar of the control is visible, default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance"), Description("Indicates whether title bar of the control is visible.")]
+        public bool TitleVisible
+        {
+            get { return _TitleVisible; }
+            set
+            {
+                if (_TitleVisible != value)
+                {
+                    bool oldValue = value;
+                    _TitleVisible = value;
+                    OnTitleVisibleChanged(oldValue, value);
+                }
+            }
+        }
+
+        protected virtual void OnTitleVisibleChanged(bool oldValue, bool newValue)
+        {
+            _TitleBar.Visible = newValue;
+        }
+
+        private bool _MenuVisible = true;
+
+        /// <summary>
+        /// Indicates whether menu bar of the control is visible, default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance"), Description("Indicates whether menu bar of the control is visible")]
+        public bool MenuVisible
+        {
+            get { return _MenuVisible; }
+            set
+            {
+                if (_MenuVisible != value)
+                {
+                    bool oldValue = value;
+                    _MenuVisible = value;
+                    OnMenuVisibleChanged(oldValue, value);
+                }
+            }
+        }
+
+        protected virtual void OnMenuVisibleChanged(bool oldValue, bool newValue)
+        {
+            _MenuBar.Visible = newValue;
+        }
+
+        private bool _SearchBoxVisible = true;
+        /// <summary>
+        /// Gets or set whether search text-box which allows searching for the toolbox items is visible. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance"), Description("Indicates whether search text-box which allows searching for the toolbox items is visible.")]
+        public bool SearchBoxVisible
+        {
+            get { return _SearchBoxVisible; }
+            set
+            {
+                if (_SearchBoxVisible != value)
+                {
+                    _SearchBoxVisible = value;
+                    OnSearchBoxVisibleChanged();
+                }
+            }
+        }
+
+        private bool _SearchForEachWord = true;
+
+        /// <summary>
+        /// Indicates whether search text when entered is split into separate words and items returned that match any of the words entered.
+        /// </summary>
+        [Category("Behavior"), DefaultValue(true), Description("Indicates whether search text when entered is split into separate words and items returned that match any of the words entered.")]
+        public bool SearchForEachWord
+        {
+            get { return _SearchForEachWord; }
+            set
+            {
+                if (_SearchForEachWord != value)
+                {
+                    bool oldValue = value;
+                    _SearchForEachWord = value;
+                    OnSearchForEachWordChanged(oldValue, value);
+                }
+            }
+        }
+
+        protected virtual void OnSearchForEachWordChanged(bool oldValue, bool newValue)
+        {
+
+        }
+
+        private void OnSearchBoxVisibleChanged()
+        {
+            _SearchBox.Visible = _SearchBoxVisible;
+        }
+
+        private bool _IsSearching = false;
+        private List<BaseItem> _HiddenItems = new List<BaseItem>();
+        private List<ToolboxGroup> _ExpandedGroups = new List<ToolboxGroup>();
+        private string _LastSearchText = string.Empty;
+        /// <summary>
+        /// Filters control toolbox items based on specified text. To clear last search and show all items pass string.empty or null/nothing as search text.
+        /// </summary>
+        /// <param name="text">Text to search for</param>
+        public void Search(string text)
+        {
+            _IsSearching = true;
+            RestoreHiddenItems();
+
+            if (!string.IsNullOrEmpty(text))
+            {
+                text = text.ToLower();
+                string[] wordList = text.Split(' ');
+                foreach (BaseItem item in _ItemPanel.Items)
+                {
+                    ToolboxGroup group = item as ToolboxGroup;
+                    if (group == null) continue;
+                    if (group.Expanded) _ExpandedGroups.Add(group);
+                    group.Expanded = true;
+                    foreach (BaseItem groupItem in group.SubItems)
+                    {
+                        ToolboxItem ti = groupItem as ToolboxItem;
+                        if (ti == null)
+                        {
+                            ti.Visible = false;
+                            _HiddenItems.Add(ti);
+                            continue;
+                        }
+                        if (!((!_SearchForEachWord || wordList.Length < 2) && ti.Text.ToLower().Contains(text) ||
+                            _SearchBoxVisible && ContainsAny(ti.Text.ToLower(), wordList)))
+                        {
+                            ti.Visible = false;
+                            _HiddenItems.Add(ti);
+                        }
+                    }
+                    if (group.VisibleSubItems == 0)
+                    {
+                        group.Visible = false;
+                        _HiddenItems.Add(group);
+                    }
+                }
+            }
+            _ItemPanel.RecalcLayout();
+            _IsSearching = false;
+            _LastSearchText = text;
+        }
+
+        /// <summary>
+        /// Gets whether control is performing search operation.
+        /// </summary>
+        [Browsable(false)]
+        public bool IsSearching
+        {
+            get { return _IsSearching; }
+        }
+
+        private void RestoreHiddenItems()
+        {
+            bool restoreExpanded = _HiddenItems.Count > 0 || !string.IsNullOrEmpty(_LastSearchText);
+            if (_HiddenItems.Count > 0)
+            {
+                foreach (BaseItem item in _HiddenItems)
+                {
+                    item.Visible = true;
+                }
+                _HiddenItems.Clear();
+            }
+
+            if (restoreExpanded)
+            {
+                foreach (BaseItem item in _ItemPanel.Items)
+                {
+                    ToolboxGroup group = item as ToolboxGroup;
+                    if (group == null) continue;
+                    if (_ExpandedGroups.Contains(group))
+                        group.Expanded = true;
+                    else
+                        group.Expanded = false;
+                }
+                _ExpandedGroups.Clear();
+            }
+        }
+
+        private ElementStyle _BackgroundStyle = new ElementStyle();
+        /// <summary>
+        /// Specifies the background style of the control.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Category("Style"), Description("Gets or sets bar background style."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ElementStyle BackgroundStyle
+        {
+            get { return _BackgroundStyle; }
+        }
+
+        /// <summary>
+        /// Resets style to default value. Used by windows forms designer.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetBackgroundStyle()
+        {
+            _BackgroundStyle.StyleChanged -= new EventHandler(this.VisualPropertyChanged);
+            _BackgroundStyle = new ElementStyle();
+            _BackgroundStyle.StyleChanged += new EventHandler(this.VisualPropertyChanged);
+            this.Invalidate();
+        }
+
+        private void VisualPropertyChanged(object sender, EventArgs e)
+        {
+            OnVisualPropertyChanged();
+        }
+
+        protected virtual void OnVisualPropertyChanged()
+        {
+            this.Invalidate();
+        }
+
+        private void PaintStyleBackground(Graphics g)
+        {
+            if (!this.BackColor.IsEmpty)
+            {
+                using (SolidBrush brush = new SolidBrush(this.BackColor))
+                    g.FillRectangle(brush, this.ClientRectangle);
+            }
+
+            ElementStyleDisplayInfo info = new ElementStyleDisplayInfo();
+            info.Bounds = this.ClientRectangle;
+            info.Graphics = g;
+            bool disposeStyle = false;
+            ElementStyle style = ElementStyleDisplay.GetElementStyle(_BackgroundStyle, out disposeStyle);
+            info.Style = style;
+            ElementStyleDisplay.Paint(info);
+            if (disposeStyle)
+                style.Dispose();
+        }
+
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            Graphics g = e.Graphics;
+
+            PaintStyleBackground(g);
+
+            base.OnPaint(e);
+        }
+
+        // <summary>
+        /// Occurs before an item drag &amp; drop operation is started and allows cancellation.
+        /// </summary>
+        [Description("Occurs before an item drag & drop operation is started and allows cancellation")]
+        public event CancelEventHandler BeforeItemDrag;
+        /// <summary>
+        /// Raises BeforeItemDrag event.
+        /// </summary>
+        /// <param name="itemSource">Item being dragged.</param>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnBeforeItemDrag(object itemSource, CancelEventArgs e)
+        {
+            CancelEventHandler handler = BeforeItemDrag;
+            if (handler != null)
+                handler(itemSource, e);
+        }
+
+        private static bool ContainsAny(string textToSearch, params string[] wordsList)
+        {
+            foreach (string word in wordsList)
+            {
+                if (textToSearch.Contains(word))
+                    return true;
+            }
+
+            return false;
+        }
+
+        /// <summary>
+        /// Indicates whether item drag and drop is enabled. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether item drag and drop is enabled. Default value is true.")]
+        public bool ItemDragDropEnabled
+        {
+            get { return _ItemPanel.EnableDragDrop; }
+            set { _ItemPanel.EnableDragDrop = value; }
+        }
+
+        /// <summary>
+        /// Indicates whether toolbox items can be rearranged using drag & drop.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether toolbox items can be rearranged using drag & drop.")]
+        public bool ItemRearrangeEnabled
+        {
+            get { return _ItemPanel.AllowDrop; }
+            set { _ItemPanel.AllowDrop = value; }
+        }
+        #endregion
+
+        #region Licensing
+#if !TRIAL
+        private string m_LicenseKey = "";
+        private bool m_DialogDisplayed = false;
+        [Browsable(false), DefaultValue("")]
+        public string LicenseKey
+        {
+            get { return m_LicenseKey; }
+            set
+            {
+                if (NodeOperations.ValidateLicenseKey(value))
+                    return;
+                m_LicenseKey = (!NodeOperations.CheckLicenseKey(value) ? "9dsjkhds7" : value);
+            }
+        }
+#endif
+        #endregion
+
+    }
+
+    /// <summary>
+    /// Defines selection modes for toolbox control items.
+    /// </summary>
+    public enum eToolboxItemSelectionMode
+    {
+        /// <summary>
+        /// No item selection is allowed.
+        /// </summary>
+        NoSelection,
+        /// <summary>
+        /// Only single item can be selected.
+        /// </summary>
+        Single,
+        /// <summary>
+        /// Multiple items can be selected.
+        /// </summary>
+        Multiple
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/Toolbox/ToolboxGroup.cs b/PROMS/DotNetBar Source Code/Controls/Toolbox/ToolboxGroup.cs
new file mode 100644
index 00000000..52b9445f
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/Toolbox/ToolboxGroup.cs	
@@ -0,0 +1,297 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Text;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.Rendering;
+using DevComponents.UI.ContentManager;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    /// <summary>
+    /// Represents a group in ToolboxControl
+    /// </summary>
+    [ToolboxItem(false), DesignTimeVisible(false), DefaultEvent("Click"), Designer("DevComponents.DotNetBar.Design.ToolboxGroupDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+    public class ToolboxGroup : ItemContainer
+    {
+        #region Constructor
+
+        /// <summary>
+        /// Creates new instance of the ItemContainer object.
+        /// </summary>
+        public ToolboxGroup()
+        {
+            this.MultiLine = true;
+            this.ResizeItemsToFit = false;
+            this.TitleStyle.Class = ElementStyleClassKeys.ToolboxGroupTitleKey;
+            this.TitleMouseOverStyle.Class = ElementStyleClassKeys.ToolboxGroupTitleMouseOverKey;
+            this.GlobalItem = false;
+            this.EqualItemSize = true;
+            _TitleGroupExpandedStyle = new ElementStyle();
+            _TitleGroupExpandedStyle.StyleChanged += TitleGroupExpandedStyleChanged;
+            _TitleGroupExpandedStyle.Class = ElementStyleClassKeys.ToolboxGroupExpandedTitleKey;
+            //this.CanCustomize = false;
+        }
+        /// <summary>
+        /// Creates new instance of the ItemContainer object.
+        /// </summary>
+        public ToolboxGroup(string groupText)
+            : this()
+        {
+            this.TitleText = groupText;
+        }
+
+        /// <summary>
+        /// Returns copy of the item.
+        /// </summary>
+        public override BaseItem Copy()
+        {
+            ToolboxGroup objCopy = new ToolboxGroup(this.Name);
+            this.CopyToItem(objCopy);
+            return objCopy;
+        }
+
+        /// <summary>
+        /// Copies the ButtonItem specific properties to new instance of the item.
+        /// </summary>
+        /// <param name="copy">New ButtonItem instance.</param>
+        internal void InternalCopyToItem(ButtonItem copy)
+        {
+            CopyToItem((BaseItem)copy);
+        }
+
+        /// <summary>
+        /// Copies the ButtonItem specific properties to new instance of the item.
+        /// </summary>
+        /// <param name="copy">New ButtonItem instance.</param>
+        protected override void CopyToItem(BaseItem copy)
+        {
+            ToolboxGroup copyGroup = copy as ToolboxGroup;
+            base.CopyToItem(copyGroup);
+            if (copyGroup != null)
+            {
+                copyGroup.ResizeItemsToFit = this.ResizeItemsToFit;
+            }
+        }
+
+        #endregion
+
+            #region Implementation
+        private List<BaseItem> _HiddenItems = new List<BaseItem>();
+        /// <summary>
+        /// Occurs when Expanded state changes. If overridden base implementation must be called so default processing can occur.
+        /// </summary>
+        protected internal override void OnExpandChange()
+        {
+            ApplyExpandedProperty();
+            base.OnExpandChange();
+        }
+
+        private void ApplyExpandedProperty()
+        {
+            ToolboxControl tc = GetToolboxControl();
+            bool supressRecalcLayout = false;
+            if (tc != null && tc.IsSearching) supressRecalcLayout = true;
+
+            if (this.Expanded)
+            {
+                foreach (BaseItem item in _HiddenItems)
+                {
+                    item.Visible = true;
+                }
+                _HiddenItems.Clear();
+                if (tc != null)
+                {
+                    if (tc.ExpandSingleGroupOnly && !tc.IsSearching)
+                    {
+                        foreach (BaseItem item in tc.Groups)
+                        {
+                            ToolboxGroup group = item as ToolboxGroup;
+                            if (group != null && group != this && group.Expanded)
+                                group.Expanded = false;
+                        }
+                    }
+                    if (!supressRecalcLayout)
+                        this.RecalcLayout();
+                    tc.InvokeToolboxGroupExpanded(this);
+                }
+            }
+            else
+            {
+                foreach (BaseItem item in this.SubItems)
+                {
+                    if (item.Visible)
+                    {
+                        item.Visible = false;
+                        _HiddenItems.Add(item);
+                    }
+                }
+            }
+            this.NeedRecalcSize = true;
+            if (!supressRecalcLayout)
+                this.RecalcLayout();
+        }
+
+        /// <summary>
+        /// Returns reference to the parent ToolboxControl.
+        /// </summary>
+        /// <returns></returns>
+        public ToolboxControl GetToolboxControl()
+        {
+            ItemPanel c = this.ContainerControl as ItemPanel;
+            if (c != null)
+                return c.Parent as ToolboxControl;
+            return null;
+        }
+
+        private void RecalcLayout()
+        {
+            System.Windows.Forms.Control c = this.ContainerControl as System.Windows.Forms.Control;
+            if (c != null)
+            {
+                BarFunctions.InvokeRecalcLayout(c, true);
+            }
+        }
+
+        protected override void OnSubItemsChanged(CollectionChangeAction action, BaseItem item)
+        {
+            if (action == CollectionChangeAction.Add)
+            {
+                if (!this.Expanded && item != null && item.Visible)
+                {
+                    item.Visible = false;
+                    _HiddenItems.Add(item);
+                }
+                else if (this.Expanded && item != null && !item.Visible)
+                    item.Visible = true;
+            }
+            else if (action == CollectionChangeAction.Remove)
+            {
+                if (!this.Expanded && item != null && _HiddenItems.Contains(item))
+                {
+                    _HiddenItems.Remove(item);
+                }
+            }
+            else if (action == CollectionChangeAction.Refresh)
+            {
+                _HiddenItems.Clear();
+                if (!this.Expanded)
+                    ApplyExpandedProperty();
+            }
+            base.OnSubItemsChanged(action, item);
+        }
+
+        public override void InternalMouseDown(MouseEventArgs objArg)
+        {
+            if (TitleRectangle.Contains(objArg.Location))
+            {
+                this.Expanded = !this.Expanded;
+            }
+            base.InternalMouseDown(objArg);
+        }
+
+        protected override ElementStyle GetActiveTitleStyle()
+        {
+            if (this.Expanded && _TitleGroupExpandedStyle.Custom)
+                return _TitleGroupExpandedStyle;
+            return base.GetActiveTitleStyle();
+        }
+
+        private ElementStyle _TitleGroupExpandedStyle = null;
+        /// <summary>
+        /// Specifies the title background style when toolbox group is expanded.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Category("Style"), Description("Specifies the title background style when toolbox group is expanded."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ElementStyle TitleGroupExpandedStyle
+        {
+            get { return _TitleGroupExpandedStyle; }
+        }
+        private void TitleGroupExpandedStyleChanged(object sender, EventArgs e)
+        {
+            this.OnAppearanceChanged();
+        }
+
+        protected override IContentLayout GetContentLayout()
+        {
+            SerialContentLayoutManager manager = (SerialContentLayoutManager)base.GetContentLayout();
+            ToolboxControl tc = GetToolboxControl();
+            if (_StretchItems && this.LayoutOrientation == eOrientation.Vertical && !this.MultiLine && tc != null && tc.Expanded)
+            {
+                manager.VerticalFitContainerWidth = true;
+            }
+            return manager;
+        }
+
+        private bool _StretchItems = true;
+        /// <summary>
+        /// Indicates whether items in vertical layout orientation with MultiLine=false are stretched to fill group width. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether items in vertical layout orientation with MultiLine=false are stretched to fill group width. Default value is true.")]
+        public bool StretchItems
+        {
+            get { return _StretchItems; }
+            set { _StretchItems = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the item is expanded or not. For Popup items this would indicate whether the item is popped up or not.
+        /// </summary>
+        [DefaultValue(false), DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Visible)]
+        public override bool Expanded
+        {
+            get { return base.Expanded; }
+
+            set { base.Expanded = value; }
+        }
+
+        public override bool CanExpand
+        {
+            get { return true; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether items in horizontal layout are wrapped into the new line when they cannot fit allotted container size. Default value is false.
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Layout"), Description("Indicates whether items in horizontal layout are wrapped into the new line when they cannot fit allotted container size.")]
+        public override bool MultiLine
+        {
+            get { return base.MultiLine; }
+            set
+            {
+                base.MultiLine = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether items contained by container are resized to fit the container bounds. When container is in horizontal
+        /// layout mode then all items will have the same height. When container is in vertical layout mode then all items
+        /// will have the same width. Default value is true.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), DefaultValue(false), Category("Layout"), Description("Indicates whether items contained by container are resized to fit the container bounds. When container is in horizontal layout mode then all items will have the same height. When container is in vertical layout mode then all items will have the same width.")]
+        public override bool ResizeItemsToFit
+        {
+            get { return base.ResizeItemsToFit; }
+            set { base.ResizeItemsToFit = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether all items are equally sized based on the size of the largest item in the list.
+        /// </summary>
+        [DefaultValue(false), Category("Layout"), Description("Indicates whether all items are equally sized based on the size of the largest item in the list.")]
+        public override bool EqualItemSize
+        {
+            get { return base.EqualItemSize; }
+            set { base.EqualItemSize = value; }
+        }
+
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override bool Visible
+        {
+            get { return base.Visible; }
+            set { base.Visible = value; }
+        }
+
+        #endregion
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/Toolbox/ToolboxItem.cs b/PROMS/DotNetBar Source Code/Controls/Toolbox/ToolboxItem.cs
new file mode 100644
index 00000000..defa993b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/Toolbox/ToolboxItem.cs	
@@ -0,0 +1,94 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Text;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    [ToolboxItem(false), DesignTimeVisible(false), DefaultEvent("Click"), Designer("DevComponents.DotNetBar.Design.ToolboxItemDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+    public class ToolboxItem : ButtonItem
+    {
+        #region Constructor
+        public ToolboxItem()
+        {
+            //this.GlobalItem = false;
+        }
+        public ToolboxItem(string text)
+        {
+            this.Text = text;
+            this.ButtonStyle = eButtonStyle.ImageAndText;
+        }
+        public ToolboxItem(string text, Image image)
+        {
+            this.Text = text;
+            this.Image = image;
+            this.ButtonStyle = eButtonStyle.ImageAndText;
+        }
+
+        public ToolboxItem(string text, string symbol, eSymbolSet symbolSet)
+        {
+            this.Text = text;
+            this.SymbolSet = symbolSet;
+            this.Symbol = symbol;
+            this.ButtonStyle = eButtonStyle.ImageAndText;
+        }
+
+        /// <summary>
+        /// Returns copy of the item.
+        /// </summary>
+        public override BaseItem Copy()
+        {
+            ToolboxItem objCopy = new ToolboxItem(this.Name);
+            this.CopyToItem(objCopy);
+            return objCopy;
+        }
+
+        /// <summary>
+        /// Copies the ButtonItem specific properties to new instance of the item.
+        /// </summary>
+        /// <param name="copy">New ButtonItem instance.</param>
+        internal void InternalCopyToItem(ToolboxItem copy)
+        {
+            CopyToItem((BaseItem)copy);
+        }
+
+        protected override void OnCheckedChanged()
+        {
+            base.OnCheckedChanged();
+            ToolboxControl tc = GetToolboxControl();
+            if (tc != null)
+                tc.ToolboxItemCheckedChanged(this);
+        }
+
+        /// <summary>
+        /// Returns reference to parent ToolboxControl, if group is parented to it.
+        /// </summary>
+        /// <returns>reference to ToolboxControl or null</returns>
+        public ToolboxControl GetToolboxControl()
+        {
+            ItemPanel c = this.ContainerControl as ItemPanel;
+            if (c != null)
+                return c.Parent as ToolboxControl;
+            return null;
+        }
+
+        #endregion
+
+        #region Implementation
+        protected override bool ShouldDrawInsertMarker()
+        {
+            return DesignInsertMarker != eDesignInsertPosition.None && this.Visible && this.Displayed && !this.DesignMode;
+        }
+
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override bool Visible
+        {
+            get { return base.Visible; }
+            set { base.Visible = value; }
+        }
+
+        #endregion
+
+        }
+}
diff --git a/PROMS/DotNetBar Source Code/Controls/ToolboxControl.bmp b/PROMS/DotNetBar Source Code/Controls/ToolboxControl.bmp
new file mode 100644
index 00000000..00a1b33a
Binary files /dev/null and b/PROMS/DotNetBar Source Code/Controls/ToolboxControl.bmp differ
diff --git a/PROMS/DotNetBar Source Code/Controls/WarningBox.Designer.cs b/PROMS/DotNetBar Source Code/Controls/WarningBox.Designer.cs
new file mode 100644
index 00000000..8f301ed8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/WarningBox.Designer.cs	
@@ -0,0 +1,154 @@
+#if FRAMEWORK20
+namespace DevComponents.DotNetBar.Controls
+{
+    partial class WarningBox
+    {
+        /// <summary> 
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing) StyleManager.Unregister(this);
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #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.OptionsButton = new DevComponents.DotNetBar.PanelEx();
+            this.PanelWarning = new DevComponents.DotNetBar.PanelEx();
+            this.WarningLabel = new DevComponents.DotNetBar.LabelX();
+            this.PanelClose = new System.Windows.Forms.Panel();
+            this.CloseButton = new DevComponents.DotNetBar.ButtonX();
+            this.PanelWarning.SuspendLayout();
+            this.PanelClose.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // OptionsButton
+            // 
+            this.OptionsButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.OptionsButton.CanvasColor = System.Drawing.SystemColors.Control;
+            this.OptionsButton.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
+            this.OptionsButton.Location = new System.Drawing.Point(311, 5);
+            this.OptionsButton.Name = "OptionsButton";
+            this.OptionsButton.Size = new System.Drawing.Size(88, 23);
+            this.OptionsButton.Style.Alignment = System.Drawing.StringAlignment.Center;
+            this.OptionsButton.Style.BackColor1.Color = System.Drawing.Color.White;
+            this.OptionsButton.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(229)))), ((int)(((byte)(244)))), ((int)(((byte)(254)))));
+            this.OptionsButton.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+            this.OptionsButton.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.Custom;
+            this.OptionsButton.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(162)))), ((int)(((byte)(188)))), ((int)(((byte)(213)))));
+            this.OptionsButton.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText;
+            this.OptionsButton.Style.GradientAngle = 90;
+            this.OptionsButton.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center;
+            this.OptionsButton.StyleMouseDown.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground;
+            this.OptionsButton.StyleMouseDown.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground2;
+            this.OptionsButton.StyleMouseDown.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBorder;
+            this.OptionsButton.StyleMouseDown.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedText;
+            this.OptionsButton.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
+            this.OptionsButton.StyleMouseOver.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemHotBackground;
+            this.OptionsButton.StyleMouseOver.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemHotBackground2;
+            this.OptionsButton.StyleMouseOver.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemHotBorder;
+            this.OptionsButton.StyleMouseOver.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemHotText;
+            this.OptionsButton.TabIndex = 1;
+            this.OptionsButton.Text = "Options...";
+            this.OptionsButton.Click += new System.EventHandler(this.OptionsButton_Click);
+            // 
+            // PanelWarning
+            // 
+            this.PanelWarning.CanvasColor = System.Drawing.SystemColors.Control;
+            this.PanelWarning.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
+            this.PanelWarning.Controls.Add(this.WarningLabel);
+            this.PanelWarning.Controls.Add(this.OptionsButton);
+            this.PanelWarning.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.PanelWarning.Location = new System.Drawing.Point(0, 0);
+            this.PanelWarning.Name = "PanelWarning";
+            this.PanelWarning.Padding = new System.Windows.Forms.Padding(4);
+            this.PanelWarning.Size = new System.Drawing.Size(405, 33);
+            this.PanelWarning.Style.BackColor1.Color = System.Drawing.Color.White;
+            this.PanelWarning.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(229)))), ((int)(((byte)(244)))), ((int)(((byte)(254)))));
+            this.PanelWarning.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+            this.PanelWarning.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(162)))), ((int)(((byte)(188)))), ((int)(((byte)(213)))));
+            this.PanelWarning.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
+            this.PanelWarning.Style.GradientAngle = 90;
+            this.PanelWarning.Style.MarginLeft = 5;
+            this.PanelWarning.TabIndex = 11;
+            // 
+            // WarningLabel
+            // 
+            this.WarningLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+                        | System.Windows.Forms.AnchorStyles.Left)
+                        | System.Windows.Forms.AnchorStyles.Right)));
+            this.WarningLabel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(50)))), ((int)(((byte)(50)))), ((int)(((byte)(50)))));
+            this.WarningLabel.Location = new System.Drawing.Point(4, 5);
+            this.WarningLabel.Margin = new System.Windows.Forms.Padding(5);
+            this.WarningLabel.Name = "WarningLabel";
+            this.WarningLabel.PaddingLeft = 2;
+            this.WarningLabel.Size = new System.Drawing.Size(304, 22);
+            this.WarningLabel.TabIndex = 0;
+            this.WarningLabel.MarkupLinkClick += new DevComponents.DotNetBar.MarkupLinkClickEventHandler(this.WarningLabel_MarkupLinkClick);
+            // 
+            // PanelClose
+            // 
+            this.PanelClose.BackColor = System.Drawing.Color.Transparent;
+            this.PanelClose.Controls.Add(this.CloseButton);
+            this.PanelClose.Dock = System.Windows.Forms.DockStyle.Right;
+            this.PanelClose.Location = new System.Drawing.Point(405, 0);
+            this.PanelClose.Name = "PanelClose";
+            this.PanelClose.Size = new System.Drawing.Size(22, 33);
+            this.PanelClose.TabIndex = 12;
+            // 
+            // CloseButton
+            // 
+            this.CloseButton.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+            this.CloseButton.ColorTable = DevComponents.DotNetBar.eButtonColor.Flat;
+            this.CloseButton.Dock = System.Windows.Forms.DockStyle.Top;
+            this.CloseButton.FocusCuesEnabled = false;
+            this.CloseButton.Location = new System.Drawing.Point(0, 0);
+            this.CloseButton.Name = "CloseButton";
+            this.CloseButton.Size = new System.Drawing.Size(22, 17);
+            this.CloseButton.TabIndex = 1;
+            this.CloseButton.Tooltip = "Close";
+            this.CloseButton.AntiAlias = true;
+            this.CloseButton.Click += new System.EventHandler(this.CloseButton_Click);
+            // 
+            // WarningBox
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+            this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(196)))), ((int)(((byte)(219)))), ((int)(((byte)(249)))));
+            this.Controls.Add(this.PanelWarning);
+            this.Controls.Add(this.PanelClose);
+            this.Name = "WarningBox";
+            this.Size = new System.Drawing.Size(427, 33);
+            this.PanelWarning.ResumeLayout(false);
+            this.PanelClose.ResumeLayout(false);
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        internal PanelEx PanelWarning;
+        internal System.Windows.Forms.Panel PanelClose;
+        internal ButtonX CloseButton;
+        private PanelEx OptionsButton;
+        private LabelX WarningLabel;
+    }
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/Controls/WarningBox.cs b/PROMS/DotNetBar Source Code/Controls/WarningBox.cs
new file mode 100644
index 00000000..2a8426e8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/WarningBox.cs	
@@ -0,0 +1,450 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Data;
+using System.Text;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.Rendering;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    /// <summary>
+    /// Represents non-intrusive Warning Box control with Options and Close button.
+    /// </summary>
+    [ToolboxBitmap(typeof(WarningBox), "Controls.WarningBox.ico"), ToolboxItem(true), DefaultEvent("OptionsClick"), System.Runtime.InteropServices.ComVisible(false), Designer("DevComponents.DotNetBar.Design.WarningBoxDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+    public partial class WarningBox : UserControl
+    {
+        #region Events
+        /// <summary>
+        /// Occurs when Close button is clicked.
+        /// </summary>
+        [Description("Occurs when Close button is clicked.")]
+        public event EventHandler CloseClick;
+        /// <summary>
+        /// Occurs when Options button is clicked.
+        /// </summary>
+        [Description("Occurs when Options button is clicked.")]
+        public event EventHandler OptionsClick;
+        /// <summary>
+        /// Occurs when warning text markup link is clicked. Markup links can be created using "a" tag, for example:
+        /// <a name="MyLink">Markup link</a>
+        /// </summary>
+        public event MarkupLinkClickEventHandler MarkupLinkClick;
+        #endregion
+
+        #region Constructors
+        public WarningBox()
+        {
+            InitializeComponent();
+            CloseButton.Image = BarFunctions.LoadBitmap("SystemImages.CloseButton.png");
+            StyleManager.Register(this);
+        }
+        #endregion
+
+        #region Internal Implementation
+        /// <summary>
+        /// Called by StyleManager to notify control that style on manager has changed and that control should refresh its appearance if
+        /// its style is controlled by StyleManager.
+        /// </summary>
+        /// <param name="newStyle">New active style.</param>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void StyleManagerStyleChanged(eDotNetBarStyle newStyle)
+        {
+            UpdateColorScheme();
+        }
+
+        /// <summary>
+        /// Raises the CloseClick event.
+        /// </summary>
+        /// <param name="e">Event arguments.</param>
+        protected virtual void OnCloseClick(EventArgs e)
+        {
+            EventHandler handler = CloseClick;
+            if (handler != null) handler(this, e);
+        }
+
+        /// <summary>
+        /// Raises the OptionsClick event.
+        /// </summary>
+        /// <param name="e">Event arguments.</param>
+        protected virtual void OnOptionsClick(EventArgs e)
+        {
+            EventHandler handler = OptionsClick;
+            if (handler != null) handler(this, e);
+        }
+
+        private void OptionsButton_Click(object sender, EventArgs e)
+        {
+            OnOptionsClick(e);
+        }
+
+        private void CloseButton_Click(object sender, EventArgs e)
+        {
+            OnCloseClick(e);
+        }
+
+        /// <summary>
+        /// Gets or sets the text displayed on close button tooltip.
+        /// </summary>
+        [Browsable(true), Category("Warning"), Localizable(true), DefaultValue("Close")]
+        public string CloseButtonTooltip
+        {
+            get
+            {
+                return CloseButton.Tooltip;
+            }
+            set
+            {
+                CloseButton.Tooltip = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the text displayed on warning control label. Supports text-markup.
+        /// </summary>
+        [Browsable(true), Editor("DevComponents.DotNetBar.Design.TextMarkupUIEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), Category("Warning"), Localizable(true), DesignerSerializationVisibility(DesignerSerializationVisibility.Visible), DefaultValue("")]
+        public override string Text
+        {
+            get
+            {
+                return base.Text;
+            }
+            set
+            {
+                base.Text = value;
+            }
+        }
+
+        protected override void OnTextChanged(EventArgs e)
+        {
+            WarningLabel.Text = this.Text;
+            base.OnTextChanged(e);
+        }
+
+        /// <summary>
+        /// Gets or sets whether text is wrapped on multiple lines if it cannot fit the space allocated to the control.
+        /// </summary>
+        [DefaultValue(false), Category("Appearance"), Description("Indicates whether text is wrapped on multiple lines if it cannot fit the space allocated to the control.")]
+        public bool WordWrap
+        {
+            get { return WarningLabel.WordWrap; }
+            set
+            {
+                WarningLabel.WordWrap = value;
+            }
+        }
+
+
+        /// <summary>
+        /// Gets or sets the image displayed next to the warning label text. Default value is null.
+        /// </summary>
+        [Browsable(true), Category("Warning"), DefaultValue(null), Localizable(true)]
+        public Image Image
+        {
+            get { return WarningLabel.Image; }
+            set
+            {
+                WarningLabel.Image = value;
+            }
+        }
+        /// <summary>
+        /// Gets or sets the text for the Options buttons.
+        /// </summary>
+        [Browsable(true), Category("Warning"), DefaultValue("Options..."), Localizable(true)]
+        public string OptionsText
+        {
+            get { return OptionsButton.Text; }
+            set
+            {
+                OptionsButton.Text = value;
+            }
+        }
+
+        private bool _OptionsButtonVisible = true;
+        /// <summary>
+        /// Gets or sets whether Options button is visible. Default value is true.
+        /// </summary>
+        [Browsable(true), Category("Warning"), DefaultValue(true)]
+        public bool OptionsButtonVisible
+        {
+            get { return _OptionsButtonVisible; }
+            set
+            {
+                if (_OptionsButtonVisible != value)
+                {
+                    _OptionsButtonVisible = value;
+                    OptionsButton.Visible = _OptionsButtonVisible;
+                    OnOptionsButtonVisibleChanged();
+                }
+            }
+        }
+
+        private void OnOptionsButtonVisibleChanged()
+        {
+            if (_OptionsButtonVisible)
+            {
+                WarningLabel.Width = PanelWarning.Width - (OptionsButton.Width + 3 + PanelWarning.Padding.Horizontal);
+            }
+            else
+            {
+                WarningLabel.Width = PanelWarning.Width - (PanelWarning.Padding.Right + WarningLabel.Left);
+            }
+        }
+
+        private bool _CloseButtonVisible = true;
+        /// <summary>
+        /// Gets or sets whether Close button is visible. Default value is true.
+        /// </summary>
+        [Browsable(true), Category("Warning"), DefaultValue(true)]
+        public bool CloseButtonVisible
+        {
+            get { return _CloseButtonVisible; }
+            set
+            {
+                if (_CloseButtonVisible != value)
+                {
+                    _CloseButtonVisible = value;
+                    PanelClose.Visible = _CloseButtonVisible;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Updates control color scheme based on currently selected Office 2007 Color Table. Usually it is not necessary to
+        /// call this method manually. You need to call it to update the colors on control if you customize the Office2007ColorTable.WarningBox values.
+        /// </summary>
+        public void UpdateColorScheme()
+        {
+            Office2007Renderer renderer = (Office2007Renderer)GlobalManager.Renderer;
+            Office2007WarningBoxColorTable colorTable = null;
+            if (renderer == null)
+                colorTable = new Office2007WarningBoxColorTable(); // Default blue
+            else
+                colorTable = renderer.ColorTable.WarningBox;
+
+            if (_ColorScheme == eWarningBoxColorScheme.Default)
+            {
+                this.BackColor = colorTable.BackColor;
+
+                this.PanelWarning.Style.BorderColor.Color = colorTable.WarningBorderColor;
+                this.PanelWarning.Style.BackColor1.Color = colorTable.WarningBackColor1;
+                this.PanelWarning.Style.BackColor2.Color = colorTable.WarningBackColor2;
+
+                this.OptionsButton.Style.BackColor1.ColorSchemePart = eColorSchemePart.Custom;
+                this.OptionsButton.Style.BackColor1.Color = colorTable.WarningBackColor1;
+                this.OptionsButton.Style.BackColor2.ColorSchemePart = eColorSchemePart.Custom;
+                this.OptionsButton.Style.BackColor2.Color = colorTable.WarningBackColor2;
+                this.OptionsButton.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.Custom;
+                this.OptionsButton.Style.BorderColor.Color = colorTable.WarningBorderColor;
+            }
+            else if (_ColorScheme == eWarningBoxColorScheme.Green)
+            {
+                this.BackColor = colorTable.GreenBackColor;
+
+                this.PanelWarning.Style.BorderColor.Color = colorTable.GreenWarningBorderColor;
+                this.PanelWarning.Style.BackColor1.Color = colorTable.GreenWarningBackColor1;
+                this.PanelWarning.Style.BackColor2.Color = colorTable.GreenWarningBackColor2;
+
+                this.OptionsButton.Style.BackColor1.ColorSchemePart = eColorSchemePart.Custom;
+                this.OptionsButton.Style.BackColor1.Color = colorTable.GreenWarningBackColor1;
+                this.OptionsButton.Style.BackColor2.ColorSchemePart = eColorSchemePart.Custom;
+                this.OptionsButton.Style.BackColor2.Color = colorTable.GreenWarningBackColor2;
+                this.OptionsButton.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.Custom;
+                this.OptionsButton.Style.BorderColor.Color = colorTable.GreenWarningBorderColor;
+            }
+            else if (_ColorScheme == eWarningBoxColorScheme.Yellow)
+            {
+                this.BackColor = colorTable.YellowBackColor;
+
+                this.PanelWarning.Style.BorderColor.Color = colorTable.YellowWarningBorderColor;
+                this.PanelWarning.Style.BackColor1.Color = colorTable.YellowWarningBackColor1;
+                this.PanelWarning.Style.BackColor2.Color = colorTable.YellowWarningBackColor2;
+
+                this.OptionsButton.Style.BackColor1.ColorSchemePart = eColorSchemePart.Custom;
+                this.OptionsButton.Style.BackColor1.Color = colorTable.YellowWarningBackColor1;
+                this.OptionsButton.Style.BackColor2.ColorSchemePart = eColorSchemePart.Custom;
+                this.OptionsButton.Style.BackColor2.Color = colorTable.YellowWarningBackColor2;
+                this.OptionsButton.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.Custom;
+                this.OptionsButton.Style.BorderColor.Color = colorTable.YellowWarningBorderColor;
+            }
+            else if (_ColorScheme == eWarningBoxColorScheme.Red)
+            {
+                this.BackColor = colorTable.RedBackColor;
+
+                this.PanelWarning.Style.BorderColor.Color = colorTable.RedWarningBorderColor;
+                this.PanelWarning.Style.BackColor1.Color = colorTable.RedWarningBackColor1;
+                this.PanelWarning.Style.BackColor2.Color = colorTable.RedWarningBackColor2;
+
+                this.OptionsButton.Style.BackColor1.ColorSchemePart = eColorSchemePart.Custom;
+                this.OptionsButton.Style.BackColor1.Color = colorTable.RedWarningBackColor1;
+                this.OptionsButton.Style.BackColor2.ColorSchemePart = eColorSchemePart.Custom;
+                this.OptionsButton.Style.BackColor2.Color = colorTable.RedWarningBackColor2;
+                this.OptionsButton.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.Custom;
+                this.OptionsButton.Style.BorderColor.Color = colorTable.RedWarningBorderColor;
+            }
+
+            this.Invalidate(true);
+        }
+
+        private void WarningLabel_MarkupLinkClick(object sender, MarkupLinkClickEventArgs e)
+        {
+            OnMarkupLinkClick(e);
+        }
+
+        /// <summary>
+        /// Invokes the MarkupLinkClick event.
+        /// </summary>
+        /// <param name="e">Provides additional data about event.</param>
+        protected virtual void OnMarkupLinkClick(MarkupLinkClickEventArgs e)
+        {
+            if (MarkupLinkClick != null)
+                MarkupLinkClick(this, e);
+        }
+
+        private int _AutoCloseTimeout = 0;
+        /// <summary>
+        /// Gets or sets the timeout in seconds after which the control automatically closes itself. Default value is 0 which indicates that auto-close
+        /// is disabled.
+        /// </summary>
+        [DefaultValue(0), Category("Behavior"), Description("Indicates timeout in seconds after which the control automatically closes itself.")]
+        public int AutoCloseTimeout
+        {
+            get { return _AutoCloseTimeout; }
+            set
+            {
+                if (value < 0) value = 0;
+                _AutoCloseTimeout = value;
+                OnAutoCloseTimeoutChanged();
+            }
+        }
+
+        protected override void OnHandleDestroyed(EventArgs e)
+        {
+            DestroyAutoCloseTimer();
+            base.OnHandleDestroyed(e);
+        }
+
+        private void OnAutoCloseTimeoutChanged()
+        {
+            if (_AutoCloseTimeout == 0)
+                DestroyAutoCloseTimer();
+            else if (this.Visible)
+                SetupAutoCloseTimer();
+        }
+
+        private Timer _AutoCloseTimer = null;
+        private void SetupAutoCloseTimer()
+        {
+            if (_AutoCloseTimeout == 0 || _AutoCloseTimer != null || this.DesignMode) return;
+
+            _AutoCloseTimer = new Timer();
+            _AutoCloseTimer.Interval = _AutoCloseTimeout * 1000;
+            _AutoCloseTimer.Tick += new EventHandler(AutoCloseTimerTick);
+            _AutoCloseTimer.Start();
+        }
+
+        void AutoCloseTimerTick(object sender, EventArgs e)
+        {
+            _AutoCloseTimer.Stop();
+            DestroyAutoCloseTimer();
+            AutoClose();
+        }
+
+        private void AutoClose()
+        {
+            OnCloseClick(EventArgs.Empty);
+            this.Visible = false;
+        }
+
+        private void DestroyAutoCloseTimer()
+        {
+            Timer timer = _AutoCloseTimer;
+            _AutoCloseTimer = null;
+            if (timer == null) return;
+            timer.Stop();
+            timer.Dispose();
+        }
+
+        protected override void OnVisibleChanged(EventArgs e)
+        {
+            if (this.Visible)
+            {
+                if (_AutoCloseTimeout > 0) SetupAutoCloseTimer();
+            }
+            else
+                DestroyAutoCloseTimer();
+
+            base.OnVisibleChanged(e);
+        }
+
+        protected override void OnHandleCreated(EventArgs e)
+        {
+            if (_ColorScheme == eWarningBoxColorScheme.Default)
+                UpdateColorScheme();
+            base.OnHandleCreated(e);
+        }
+
+        private eWarningBoxColorScheme _ColorScheme = eWarningBoxColorScheme.Default;
+        /// <summary>
+        /// Gets or sets the control's color scheme.
+        /// </summary>
+        [DefaultValue(eWarningBoxColorScheme.Default), Category("Appearance"), Description("Indicates control's color scheme.")]
+        public eWarningBoxColorScheme ColorScheme
+        {
+            get { return _ColorScheme; }
+            set
+            {
+                _ColorScheme = value;
+                UpdateColorScheme();
+                this.Invalidate(true);
+            }
+        }
+
+        private bool _AntiAlias = true;
+        /// <summary>
+        /// Gets or sets whether anti-alias smoothing is used while painting. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance")]
+        public bool AntiAlias
+        {
+            get { return _AntiAlias; }
+            set
+            {
+                if (value != _AntiAlias)
+                {
+                    bool oldValue = _AntiAlias;
+                    _AntiAlias = value;
+                    OnAntiAliasChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when AntiAlias property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnAntiAliasChanged(bool oldValue, bool newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("AntiAlias"));
+            PanelWarning.AntiAlias = newValue;
+            CloseButton.AntiAlias = newValue;
+            OptionsButton.AntiAlias = newValue;
+            WarningLabel.AntiAlias = newValue;
+            this.Invalidate(true);
+        }
+        #endregion
+    }
+    /// <summary>
+    /// Defines available WarningBox control color schemes.
+    /// </summary>
+    public enum eWarningBoxColorScheme
+    {
+        Default,
+        Green,
+        Yellow,
+        Red
+    }
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/Controls/WarningBox.ico b/PROMS/DotNetBar Source Code/Controls/WarningBox.ico
new file mode 100644
index 00000000..bf1e413e
Binary files /dev/null and b/PROMS/DotNetBar Source Code/Controls/WarningBox.ico differ
diff --git a/PROMS/DotNetBar Source Code/Controls/WarningBox.resx b/PROMS/DotNetBar Source Code/Controls/WarningBox.resx
new file mode 100644
index 00000000..19dc0dd8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Controls/WarningBox.resx	
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/CrumbBar/CrumbBar.cs b/PROMS/DotNetBar Source Code/CrumbBar/CrumbBar.cs
new file mode 100644
index 00000000..51980249
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/CrumbBar/CrumbBar.cs	
@@ -0,0 +1,663 @@
+using System;
+using System.Text;
+using System.Drawing;
+using System.Drawing.Design;
+using System.ComponentModel;
+using System.Collections;
+using DevComponents.DotNetBar.Rendering;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represents compact tree bread-crumb control.
+    /// </summary>
+    [ToolboxBitmap(typeof(CrumbBar), "CrumbBar.CrumbBar.ico"), ToolboxItem(true), Designer("DevComponents.DotNetBar.Design.CrumbBarDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf"), System.Runtime.InteropServices.ComVisible(false), DefaultEvent("SelectedItemChanged")]
+    public class CrumbBar : ItemControl
+    {
+        #region Private Variables
+        private CrumbBarItemsCollection _Items = null;
+        private CrumbBarViewContainer _ViewContainer = null;
+        private Office2007Renderer _VistaRenderer = null;
+        #endregion
+
+        #region Events
+        /// <summary>
+        /// Occurs before SelectedItem has changed and provides opportunity to cancel the change. Set Cancel property on event arguments to true to cancel the change.
+        /// </summary>
+        [Description("Occurs before SelectedItem has changed and provides opportunity to cancel the change.")]
+        public event CrumBarSelectionEventHandler SelectedItemChanging;
+        /// <summary>
+        /// Occurs after SelectedItem has changed. The change of the selected item at this point cannot be canceled. For that use SelectedItemChanging event.
+        /// </summary>
+        public event CrumBarSelectionEventHandler SelectedItemChanged;
+        #endregion
+
+        #region Constructor
+        /// <summary>
+        /// Initializes a new instance of the CrumbBar class.
+        /// </summary>
+        public CrumbBar()
+            : base()
+        {
+            _Items = new CrumbBarItemsCollection(this);
+
+            _ViewContainer = new CrumbBarViewContainer();
+            _ViewContainer.GlobalItem = false;
+            _ViewContainer.ContainerControl = this;
+            _ViewContainer.Displayed = true;
+            _ViewContainer.Style = eDotNetBarStyle.StyleManagerControlled;
+            this.ColorScheme.Style = eDotNetBarStyle.StyleManagerControlled;
+            _ViewContainer.SetOwner(this);
+            InitializeVistaRenderer();
+            this.SetBaseItemContainer(_ViewContainer);
+        }
+        #endregion
+
+        #region Internal Implementation
+        private CrumbBarItem FindCrumbBarItem(IList subitems, string name)
+        {
+            foreach (CrumbBarItem item in subitems)
+            {
+                if (item.Name == name)
+                {
+                    return item;
+                }
+                CrumbBarItem childItem = FindCrumbBarItem(item.SubItems, name);
+                if ((childItem != null)) return childItem;
+            }
+            return null;
+        }
+        /// <summary>
+        /// Finds CrumbBarItem with specified name.
+        /// </summary>
+        /// <param name="name">Name of item to look for</param>
+        /// <returns>Item or null if no item was found.</returns>
+        public CrumbBarItem FindByName(string name)
+        {
+            return FindCrumbBarItem(this.Items, name);
+        }
+
+
+        private CrumbBarItem _SelectedItem;
+        /// <summary>
+        /// Gets or sets currently selected item.
+        /// </summary>
+        [DefaultValue(null), Category("Appearance"), Description("Indicates currently selected item")]
+        public CrumbBarItem SelectedItem
+        {
+            get { return _SelectedItem; }
+            set 
+            {
+                SetSelectedItem(value, eEventSource.Code);
+            }
+        }
+
+        internal void OnItemsCleared()
+        {
+            this.SelectedItem = null;
+        }
+        /// <summary>
+        /// Sets the currently selected item in the control.
+        /// </summary>
+        /// <param name="selection">Reference to selected item.</param>
+        /// <param name="source">Source of the event.</param>
+        public void SetSelectedItem(CrumbBarItem selection, eEventSource source)
+        {
+            bool raiseChangedEvents = selection != _SelectedItem;
+
+            if (raiseChangedEvents)
+            {
+                CrumbBarSelectionEventArgs eventArgs = new CrumbBarSelectionEventArgs(selection);
+                OnSelectedItemChanging(eventArgs);
+                if (eventArgs.Cancel) return;
+                selection = eventArgs.NewSelectedItem;
+            }
+
+            if (_SelectedItem != null)
+                _SelectedItem.IsSelected = false;
+
+            ArrayList newItems = new ArrayList();
+            if (selection == null)
+                selection = GetFirstVisibleItem();
+            _ViewContainer.Expanded = false; // closes any open popups
+            _ViewContainer.RestoreOverflowItems();
+
+            if (selection != null)
+            {
+                CrumbBarItem current = selection;
+                while (current != null)
+                {
+                    newItems.Insert(0, GetItemView(current, true));
+                    current = current.Parent as CrumbBarItem;
+                }
+
+                UpdateSelectedItemImage(selection);
+            }
+            else
+                UpdateSelectedItemImage(null);
+
+            // Remove current view items
+            _ViewContainer.ClearViewItems();
+            if (selection != null)
+            {
+                _ViewContainer.SubItems.AddRange((BaseItem[])newItems.ToArray(typeof(BaseItem)));
+            }
+            _ViewContainer.NeedRecalcSize = true;
+
+            _SelectedItem = selection;
+            if (_SelectedItem != null)
+                _SelectedItem.IsSelected = true;
+
+            this.RecalcLayout();
+
+            if (raiseChangedEvents)
+            {
+                CrumbBarSelectionEventArgs eventArgs = new CrumbBarSelectionEventArgs(selection);
+                OnSelectedItemChanged(eventArgs);
+            }
+        }
+
+        internal void RefreshView()
+        {
+            UpdateSelectedItemImage(_SelectedItem);
+        }
+
+        private void UpdateSelectedItemImage(CrumbBarItem selection)
+        {
+            if (selection == null)
+            {
+                _ViewContainer.ImageLabel.Visible = false;
+                return;
+            }
+
+            CompositeImage image = selection.GetImage();
+            if (image != null)
+            {
+                _ViewContainer.ImageLabel.Visible = true;
+                if (image.IsIcon)
+                    _ViewContainer.ImageLabel.Icon = image.Icon;
+                else
+                    _ViewContainer.ImageLabel.Image = image.Image;
+            }
+            else
+            {
+                _ViewContainer.ImageLabel.Visible = false;
+            }            
+        }
+
+        /// <summary>
+        /// Shows the selected item popup menu if it has menu items.
+        /// </summary>
+        /// <returns>true if popup was shown otherwise false</returns>
+        public bool ShowSelectedItemPopupMenu()
+        {
+            CrumbBarItem selectedItem = this.SelectedItem;
+            if (selectedItem == null) throw new NullReferenceException("SelectedItem is null");
+            CrumbBarItemView view = GetItemView(selectedItem, false) as CrumbBarItemView;
+            if (view != null && !view.Expanded && view.AttachedItem != null && view.AttachedItem.SubItems.Count > 0)
+            {
+                view.Expanded = true;
+                return true;
+            }
+            return false;
+        }
+
+        private object GetItemView(CrumbBarItem current, bool canCreateNewView)
+        {
+            for (int i = 2; i < _ViewContainer.SubItems.Count; i++)
+            {
+                CrumbBarItemView view = _ViewContainer.SubItems[i] as CrumbBarItemView;
+                if (view != null && view.AttachedItem == current) return view;
+            }
+            if(canCreateNewView)
+                return CrumbBarItemView.CreateViewForItem(current);
+            return null;
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public CrumbBarItem GetFirstVisibleItem()
+        {
+            foreach (CrumbBarItem crumbBarItem in Items)
+            {
+                if (crumbBarItem.Visible) return crumbBarItem;
+            }
+            return null;
+        }
+
+        /// <summary>
+        /// Gets whether an item is in selected path to the currently selected item as either one of the parents of selected item
+        /// or selected item itself.
+        /// </summary>
+        /// <param name="item">Item to test.</param>
+        /// <returns>true if item is in selected path otherwise false.</returns>
+        public bool GetIsInSelectedPath(CrumbBarItem item)
+        {
+            for (int i = 2; i < _ViewContainer.SubItems.Count; i++)
+            {
+                CrumbBarItemView view = _ViewContainer.SubItems[i] as CrumbBarItemView;
+                if (view != null && view.AttachedItem == item) return true;
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// Gets collection of items assigned to the control.
+        /// </summary>
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content), Editor("DevComponents.DotNetBar.Design.CrumbBarItemCollectionEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor))]
+#if FRAMEWORK20
+        [Browsable(false)]
+#else
+        [Browsable(true)]
+#endif
+        public CrumbBarItemsCollection Items
+        {
+            get { return _Items; }
+        }
+
+        private eCrumbBarStyle _Style = eCrumbBarStyle.Vista;
+        /// <summary>
+        /// Gets or sets the visual style of the control. Default value is Windows Vista style.
+        /// </summary>
+        [DefaultValue(eCrumbBarStyle.Vista), Category("Appearance"), Description("Indicates visual style of the control.")]
+        public eCrumbBarStyle Style
+        {
+            get { return _Style; }
+            set
+            {
+                if (value != _Style)
+                {
+                    eCrumbBarStyle oldValue = _Style;
+                    _Style = value;
+                    OnStyleChanged(oldValue, value);
+                }
+            }
+        }
+        protected virtual void OnStyleChanged(eCrumbBarStyle oldValue, eCrumbBarStyle newValue)
+        {
+            this.Invalidate();
+        }
+
+        /// <summary>
+        /// Gets the color table used by the Vista style renderer.
+        /// </summary>
+        [Browsable(false)]
+        public Office2007ColorTable VistaColorTable
+        {
+            get { return _VistaRenderer.ColorTable; }
+        }
+
+        /// <summary>
+        /// Returns the renderer control will be rendered with.
+        /// </summary>
+        /// <returns>The current renderer.</returns>
+        public override Rendering.BaseRenderer GetRenderer()
+        {
+            if (this.RenderMode == eRenderMode.Global && _Style == eCrumbBarStyle.Vista)
+                return _VistaRenderer;
+            return base.GetRenderer();
+        }
+
+        private void InitializeVistaRenderer()
+        {
+            _VistaRenderer = new Office2007Renderer();
+            Office2007ColorTable colorTable = _VistaRenderer.ColorTable;
+            colorTable.CrumbBarItemView = GetCrumbBarVistaColorTable();
+            // Popup menu style
+            colorTable.Menu.Background = new LinearGradientColorTable(ColorScheme.GetColor("FFF0F0F0"));
+            colorTable.Menu.Border = new LinearGradientColorTable(ColorScheme.GetColor("FF646464"));
+            colorTable.Menu.Side = new LinearGradientColorTable(ColorScheme.GetColor("FFF1F1F1"));
+            colorTable.Menu.SideBorder = new LinearGradientColorTable(ColorScheme.GetColor("FFE2E3E3"));
+            colorTable.Menu.SideBorderLight = new LinearGradientColorTable(ColorScheme.GetColor("FFFFFFFF"));
+            Office2007ButtonItemColorTable menu = colorTable.ButtonItemColors[0];
+            menu.Default.Text = Color.Black;
+            menu.MouseOver.Background = new LinearGradientColorTable(ColorScheme.GetColor("34C5EBFF"), ColorScheme.GetColor("7081D8FF"), 90);
+            menu.MouseOver.OuterBorder = new LinearGradientColorTable(ColorScheme.GetColor("FF96DBFA"));
+            menu.MouseOver.InnerBorder = new LinearGradientColorTable(ColorScheme.GetColor("A0FFFFFF"));
+            menu.MouseOver.Text = Color.Black;
+            menu.Pressed = menu.MouseOver;
+        }
+
+        private CrumbBarItemViewColorTable GetCrumbBarVistaColorTable()
+        {
+            return GetCrumbBarVistaColorTable(new ColorFactory());
+        }
+
+        internal static CrumbBarItemViewColorTable GetCrumbBarVistaColorTable(ColorFactory factory)
+        {
+            CrumbBarItemViewColorTable viewColorTable = new CrumbBarItemViewColorTable();
+            CrumbBarItemViewStateColorTable crumbBarViewTable = new CrumbBarItemViewStateColorTable();
+            viewColorTable.Default = crumbBarViewTable;
+            crumbBarViewTable.Foreground = Color.Black;
+            crumbBarViewTable = new CrumbBarItemViewStateColorTable();
+            viewColorTable.MouseOver = crumbBarViewTable;
+            crumbBarViewTable.Foreground = Color.Black;
+            crumbBarViewTable.Background = new BackgroundColorBlendCollection();
+            crumbBarViewTable.Background.AddRange(new BackgroundColorBlend[]{
+                new BackgroundColorBlend(factory.GetColor(ColorScheme.GetColor("EAF6FD")), 0f),
+                new BackgroundColorBlend(factory.GetColor(ColorScheme.GetColor("D7EFFC")), .5f),
+                new BackgroundColorBlend(factory.GetColor(ColorScheme.GetColor("BDE6FD")), .5f),
+                new BackgroundColorBlend(factory.GetColor(ColorScheme.GetColor("A6D9F4")), 1f)});
+            crumbBarViewTable.Border = factory.GetColor(ColorScheme.GetColor("3C7FB1"));
+            crumbBarViewTable.BorderLight = factory.GetColor(ColorScheme.GetColor("E0FFFFFF"));
+            crumbBarViewTable = new CrumbBarItemViewStateColorTable();
+            viewColorTable.MouseOverInactive = crumbBarViewTable;
+            crumbBarViewTable.Foreground = Color.Black;
+            crumbBarViewTable.Background = new BackgroundColorBlendCollection();
+            crumbBarViewTable.Background.AddRange(new BackgroundColorBlend[]{
+                new BackgroundColorBlend(factory.GetColor(ColorScheme.GetColor("FFF2F2F2")), 0f),
+                new BackgroundColorBlend(factory.GetColor(ColorScheme.GetColor("FFEAEAEA")), .5f),
+                new BackgroundColorBlend(factory.GetColor(ColorScheme.GetColor("FFDCDCDC")), .5f),
+                new BackgroundColorBlend(factory.GetColor(ColorScheme.GetColor("FFCFCFCF")), 1f)});
+            crumbBarViewTable.Border = factory.GetColor(ColorScheme.GetColor("FF8E8F8F"));
+            crumbBarViewTable.BorderLight = factory.GetColor(ColorScheme.GetColor("E0FFFFFF"));
+            crumbBarViewTable = new CrumbBarItemViewStateColorTable();
+            viewColorTable.Pressed = crumbBarViewTable;
+            crumbBarViewTable.Foreground = Color.Black;
+            crumbBarViewTable.Background = new BackgroundColorBlendCollection();
+            crumbBarViewTable.Background.AddRange(new BackgroundColorBlend[]{
+                new BackgroundColorBlend(factory.GetColor(ColorScheme.GetColor("FFC2E4F6")), 0f),
+                new BackgroundColorBlend(factory.GetColor(ColorScheme.GetColor("FFC2E4F6")), .5f),
+                new BackgroundColorBlend(factory.GetColor(ColorScheme.GetColor("FFA9D9F2")), .5f),
+                new BackgroundColorBlend(factory.GetColor(ColorScheme.GetColor("FF90CBEB")), 1f)});
+            crumbBarViewTable.Border = factory.GetColor(ColorScheme.GetColor("FF6E8D9F"));
+            crumbBarViewTable.BorderLight = factory.GetColor(ColorScheme.GetColor("906E8D9F"));
+
+            return viewColorTable;
+        }
+
+        /// <summary>
+        /// Raises the SelectedItemChanging event. 
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnSelectedItemChanging(CrumbBarSelectionEventArgs e)
+        {
+            CrumBarSelectionEventHandler eh = SelectedItemChanging;
+            if (eh != null) eh(this, e);
+        }
+
+        /// <summary>
+        /// Raises the SelectedItemChanged event. 
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnSelectedItemChanged(CrumbBarSelectionEventArgs e)
+        {
+            CrumBarSelectionEventHandler eh = SelectedItemChanged;
+            if (eh != null) eh(this, e);
+        }
+
+        protected override Size DefaultSize
+        {
+            get
+            {
+                return new Size(200, 22);
+            }
+        }
+
+#if FRAMEWORK20
+
+        private Size _PreferredSize = Size.Empty;
+        [Localizable(true), Browsable(false)]
+        public new System.Windows.Forms.Padding Padding
+        {
+            get { return base.Padding; }
+            set { base.Padding = value; }
+        }
+
+        public override Size GetPreferredSize(Size proposedSize)
+        {
+            if (!_PreferredSize.IsEmpty) return _PreferredSize;
+
+            if (!BarFunctions.IsHandleValid(this))
+                return base.GetPreferredSize(proposedSize);
+
+            if (this.Items.Count == 0 || !BarFunctions.IsHandleValid(this) || _ViewContainer.SubItems.Count == 0)
+                return new Size(base.GetPreferredSize(proposedSize).Width, 22);
+
+            int height = ElementStyleLayout.VerticalStyleWhiteSpace(this.GetBackgroundStyle());
+            height += _ViewContainer.CalculatedHeight > 0 ? _ViewContainer.CalculatedHeight : 20;
+
+            _PreferredSize = new Size(proposedSize.Width, height);
+            return _PreferredSize;
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the control is automatically resized to display its entire contents. You can set MaximumSize.Width property to set the maximum width used by the control.
+        /// </summary>
+        [Browsable(true), DefaultValue(false), EditorBrowsable(EditorBrowsableState.Always), DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
+        public override bool AutoSize
+        {
+            get
+            {
+                return base.AutoSize;
+            }
+            set
+            {
+                if (this.AutoSize != value)
+                {
+                    base.AutoSize = value;
+                    InvalidateAutoSize();
+                    AdjustSize();
+                }
+            }
+        }
+
+        private void InvalidateAutoSize()
+        {
+            _PreferredSize = Size.Empty;
+        }
+
+        protected override void SetBoundsCore(int x, int y, int width, int height, BoundsSpecified specified)
+        {
+            if (this.AutoSize)
+            {
+                Size preferredSize = base.PreferredSize;
+                if (preferredSize.Width > 0)
+                    width = preferredSize.Width;
+                if (preferredSize.Height > 0)
+                    height = preferredSize.Height;
+            }
+            base.SetBoundsCore(x, y, width, height, specified);
+        }
+
+        private void AdjustSize()
+        {
+            if (this.AutoSize)
+            {
+                System.Drawing.Size prefSize = base.PreferredSize;
+                if (prefSize.Width > 0 && prefSize.Height > 0)
+                    this.Size = base.PreferredSize;
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override Image BackgroundImage
+        {
+            get { return base.BackgroundImage; }
+            set { base.BackgroundImage = value; }
+        }
+
+        protected override void OnHandleCreated(EventArgs e)
+        {
+            base.OnHandleCreated(e);
+#if FRAMEWORK20
+            if (this.AutoSize)
+                this.AdjustSize();
+#endif
+        }
+#endif
+        private string _PathSeparator = System.IO.Path.PathSeparator.ToString();
+        /// <summary>
+        /// Gets or sets the delimiter string that the tree node path uses.
+        /// </summary>
+        [DefaultValue("\\"), Browsable(false), Description("Indicates the delimiter string that the tree node path uses.")]
+        public string PathSeparator
+        {
+            get { return _PathSeparator; }
+            set { _PathSeparator = value; }
+        }
+        /// <summary>
+        /// Returns full path to the given node.
+        /// </summary>
+        /// <param name="item">Node to return path to.</param>
+        /// <returns>Full path to the node.</returns>
+        internal static string GetFullPath(CrumbBarItem item, string pathSeparator)
+        {
+            if (item == null)
+                throw new ArgumentNullException("node");
+
+            StringBuilder sb = new StringBuilder(item.Text);
+            item = item.Parent as CrumbBarItem;
+            while (item != null)
+            {
+                sb.Insert(0, item.Text + pathSeparator);
+                item = item.Parent as CrumbBarItem;
+            }
+
+            return sb.ToString();
+        }
+        #endregion
+
+        #region Property Hiding
+        [Browsable(false)]
+        public override eBarImageSize ImageSize
+        {
+            get
+            {
+                return base.ImageSize;
+            }
+            set
+            {
+                base.ImageSize = value;
+            }
+        }
+        [Browsable(false)]
+        public override System.Windows.Forms.ImageList ImagesLarge
+        {
+            get
+            {
+                return base.ImagesLarge;
+            }
+            set
+            {
+                base.ImagesLarge = value;
+            }
+        }
+        [Browsable(false)]
+        public override System.Windows.Forms.ImageList ImagesMedium
+        {
+            get
+            {
+                return base.ImagesMedium;
+            }
+            set
+            {
+                base.ImagesMedium = value;
+            }
+        }
+        [Browsable(false)]
+        public override Font KeyTipsFont
+        {
+            get
+            {
+                return base.KeyTipsFont;
+            }
+            set
+            {
+                base.KeyTipsFont = value;
+            }
+        }
+        [Browsable(false)]
+        public override bool ShowShortcutKeysInToolTips
+        {
+            get
+            {
+                return base.ShowShortcutKeysInToolTips;
+            }
+            set
+            {
+                base.ShowShortcutKeysInToolTips = value;
+            }
+        }
+        [Browsable(false)]
+        public override bool ThemeAware
+        {
+            get
+            {
+                return base.ThemeAware;
+            }
+            set
+            {
+                base.ThemeAware = value;
+            }
+        }
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override string Text
+        {
+            get
+            {
+                return base.Text;
+            }
+            set
+            {
+                base.Text = value;
+            }
+        }
+        #endregion
+
+        #region Licensing
+#if !TRIAL
+        private string m_LicenseKey = "";
+        [Browsable(false), DefaultValue("")]
+        public string LicenseKey
+        {
+            get { return m_LicenseKey; }
+            set
+            {
+                if (NativeFunctions.ValidateLicenseKey(value))
+                    return;
+                m_LicenseKey = (!NativeFunctions.CheckLicenseKey(value) ? "9dsjkhds7" : value);
+            }
+        }
+#endif
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            base.OnPaint(e);
+#if !TRIAL
+            if (NativeFunctions.keyValidated2 != 266)
+                TextDrawing.DrawString(e.Graphics, "Invalid License", this.Font, Color.FromArgb(180, Color.Red), this.ClientRectangle, eTextFormat.Bottom | eTextFormat.HorizontalCenter);
+#else
+            if (NativeFunctions.ColorExpAlt() || !NativeFunctions.CheckedThrough)
+		    {
+			    e.Graphics.Clear(SystemColors.Control);
+                return;
+            }
+#endif
+        }
+        #endregion
+    }
+
+    #region Event support
+    /// <summary>
+    /// Defines delegate for CrumbBar selection events.
+    /// </summary>
+    public delegate void CrumBarSelectionEventHandler(object sender, CrumbBarSelectionEventArgs e);
+    /// <summary>
+    /// Provides data for CrumbBar selection events.
+    /// </summary>
+    public class CrumbBarSelectionEventArgs : CancelEventArgs
+    {
+        /// <summary>
+        /// Gets or sets newly selected item.
+        /// </summary>
+        public CrumbBarItem NewSelectedItem = null;
+        /// <summary>
+        /// Initializes a new instance of the CrumbBarSelectionEventArgs class.
+        /// </summary>
+        /// <param name="newSelectedItem"></param>
+        public CrumbBarSelectionEventArgs(CrumbBarItem newSelectedItem)
+        {
+            NewSelectedItem = newSelectedItem;
+        }
+    }
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/CrumbBar/CrumbBar.ico b/PROMS/DotNetBar Source Code/CrumbBar/CrumbBar.ico
new file mode 100644
index 00000000..c4ff831d
Binary files /dev/null and b/PROMS/DotNetBar Source Code/CrumbBar/CrumbBar.ico differ
diff --git a/PROMS/DotNetBar Source Code/CrumbBar/CrumbBarIcon.psd b/PROMS/DotNetBar Source Code/CrumbBar/CrumbBarIcon.psd
new file mode 100644
index 00000000..8b81aca0
Binary files /dev/null and b/PROMS/DotNetBar Source Code/CrumbBar/CrumbBarIcon.psd differ
diff --git a/PROMS/DotNetBar Source Code/CrumbBar/CrumbBarItem.cs b/PROMS/DotNetBar Source Code/CrumbBar/CrumbBarItem.cs
new file mode 100644
index 00000000..16dfae5b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/CrumbBar/CrumbBarItem.cs	
@@ -0,0 +1,713 @@
+using System;
+using System.Text;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represents an item for CrumbBar control.
+    /// </summary>
+    [Designer("DevComponents.DotNetBar.Design.CrumbBarItemDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf"), ToolboxItem(false), DesignTimeVisible(false)]
+    public class CrumbBarItem : ButtonItem
+    {
+        #region Internal Implementation
+        protected override void OnClick()
+        {
+            Select(eEventSource.Mouse);
+            base.OnClick();
+        }
+
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override bool ShowSubItems
+        {
+            get
+            {
+                return false;
+            }
+            set
+            {
+                base.ShowSubItems = value;
+            }
+        }
+
+        private bool _IsSelected = false;
+        /// <summary>
+        /// Gets whether item is selected item in CrumbBar control.
+        /// </summary>
+        [Browsable(false)]
+        public bool IsSelected
+        {
+            get { return _IsSelected; }
+#if FRAMEWORK20
+            internal set
+#else
+			set
+#endif
+            {
+                _IsSelected = value;
+                if (_IsSelected)
+                    this.FontBold = true;
+                else
+                    this.FontBold = false;
+            }
+        }
+        
+
+        private void Select(eEventSource source)
+        {
+            CrumbBar bar = this.GetOwner() as CrumbBar;
+            if (bar != null) bar.SetSelectedItem(this, source);
+        }
+
+        /// <summary>
+        /// Returns the collection of sub items.
+        /// </summary>
+        [Browsable(false), Editor("DevComponents.DotNetBar.Design.CrumbBarItemCollectionEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Content)]
+        public override SubItemsCollection SubItems
+        {
+            get
+            {
+                return base.SubItems;
+            }
+        }
+
+        public override void OnImageChanged()
+        {
+            base.OnImageChanged();
+            CrumbBar bar = this.GetOwner() as CrumbBar;
+            if (bar != null && bar.SelectedItem == this)
+            {
+                bar.RefreshView();
+            }
+        }
+
+        protected override void OnParentChanged()
+        {
+            CrumbBar bar = this.GetOwner() as CrumbBar;
+            if (bar != null)
+            {
+                if (bar.SelectedItem == this || bar.GetIsInSelectedPath(this))
+                    bar.SetSelectedItem(bar.SelectedItem, eEventSource.Code);
+            }
+            base.OnParentChanged();
+        }
+
+        protected internal override void OnAfterItemRemoved(BaseItem objItem, int itemIndex)
+        {
+            if (objItem is CrumbBarItem && ((CrumbBarItem)objItem).IsSelected)
+            {
+                CrumbBar bar = this.GetOwner() as CrumbBar;
+                if (bar != null)
+                    bar.SetSelectedItem(this, eEventSource.Code);
+            }
+            base.OnAfterItemRemoved(objItem, itemIndex);
+        }
+
+        /// <summary>
+        /// Gets the path from the root tree node to the current tree node. The path consists of the labels of all the tree nodes that must be navigated to get to this tree node, starting at the root tree node. The node labels are separated by the delimiter character specified in the PathSeparator property of the Tree control that contains this node.
+        /// </summary>
+        [Browsable(false)]
+        public string FullPath
+        {
+            get
+            {
+                CrumbBar bar = this.GetOwner() as CrumbBar;
+                if (bar == null)
+                    return "";
+                return CrumbBar.GetFullPath(this, bar.PathSeparator);
+            }
+        }
+        #endregion
+
+        #region Property Hiding
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override string AlternateShortCutText
+        {
+            get
+            {
+                return base.AlternateShortCutText;
+            }
+            set
+            {
+                base.AlternateShortCutText = value;
+            }
+        }
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override bool AutoCheckOnClick
+        {
+            get
+            {
+                return base.AutoCheckOnClick;
+            }
+            set
+            {
+                base.AutoCheckOnClick = value;
+            }
+        }
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override bool AutoCollapseOnClick
+        {
+            get
+            {
+                return base.AutoCollapseOnClick;
+            }
+            set
+            {
+                base.AutoCollapseOnClick = value;
+            }
+        }
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override bool AutoExpandOnClick
+        {
+            get
+            {
+                return base.AutoExpandOnClick;
+            }
+            set
+            {
+                base.AutoExpandOnClick = value;
+            }
+        }
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override bool BeginGroup
+        {
+            get
+            {
+                return base.BeginGroup;
+            }
+            set
+            {
+                base.BeginGroup = value;
+            }
+        }
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override eButtonStyle ButtonStyle
+        {
+            get
+            {
+                return base.ButtonStyle;
+            }
+            set
+            {
+                base.ButtonStyle = value;
+            }
+        }
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override bool CanCustomize
+        {
+            get
+            {
+                return base.CanCustomize;
+            }
+            set
+            {
+                base.CanCustomize = value;
+            }
+        }
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override string Category
+        {
+            get
+            {
+                return base.Category;
+            }
+            set
+            {
+                base.Category = value;
+            }
+        }
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override bool Checked
+        {
+            get
+            {
+                return base.Checked;
+            }
+            set
+            {
+                base.Checked = value;
+            }
+        }
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override bool ClickAutoRepeat
+        {
+            get
+            {
+                return base.ClickAutoRepeat;
+            }
+            set
+            {
+                base.ClickAutoRepeat = value;
+            }
+        }
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override int ClickRepeatInterval
+        {
+            get
+            {
+                return base.ClickRepeatInterval;
+            }
+            set
+            {
+                base.ClickRepeatInterval = value;
+            }
+        }
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override eButtonColor ColorTable
+        {
+            get
+            {
+                return base.ColorTable;
+            }
+            set
+            {
+                base.ColorTable = value;
+            }
+        }
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override string CustomColorName
+        {
+            get
+            {
+                return base.CustomColorName;
+            }
+            set
+            {
+                base.CustomColorName = value;
+            }
+        }
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override string Description
+        {
+            get
+            {
+                return base.Description;
+            }
+            set
+            {
+                base.Description = value;
+            }
+        }
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override bool FontBold
+        {
+            get
+            {
+                return base.FontBold;
+            }
+            set
+            {
+                base.FontBold = value;
+            }
+        }
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override bool FontItalic
+        {
+            get
+            {
+                return base.FontItalic;
+            }
+            set
+            {
+                base.FontItalic = value;
+            }
+        }
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override bool FontUnderline
+        {
+            get
+            {
+                return base.FontUnderline;
+            }
+            set
+            {
+                base.FontUnderline = value;
+            }
+        }
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override bool GlobalItem
+        {
+            get
+            {
+                return base.GlobalItem;
+            }
+            set
+            {
+                base.GlobalItem = value;
+            }
+        }
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override string GlobalName
+        {
+            get
+            {
+                return base.GlobalName;
+            }
+            set
+            {
+                base.GlobalName = value;
+            }
+        }
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override bool HotFontBold
+        {
+            get
+            {
+                return base.HotFontBold;
+            }
+            set
+            {
+                base.HotFontBold = value;
+            }
+        }
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override bool HotFontUnderline
+        {
+            get
+            {
+                return base.HotFontUnderline;
+            }
+            set
+            {
+                base.HotFontUnderline = value;
+            }
+        }
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override eHotTrackingStyle HotTrackingStyle
+        {
+            get
+            {
+                return base.HotTrackingStyle;
+            }
+            set
+            {
+                base.HotTrackingStyle = value;
+            }
+        }
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override System.Drawing.Image HoverImage
+        {
+            get
+            {
+                return base.HoverImage;
+            }
+            set
+            {
+                base.HoverImage = value;
+            }
+        }
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override int HoverImageIndex
+        {
+            get
+            {
+                return base.HoverImageIndex;
+            }
+            set
+            {
+                base.HoverImageIndex = value;
+            }
+        }
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override System.Drawing.Icon Icon
+        {
+            get
+            {
+                return base.Icon;
+            }
+            set
+            {
+                base.Icon = value;
+            }
+        }
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override eButtonImageListSelection ImageListSizeSelection
+        {
+            get
+            {
+                return base.ImageListSizeSelection;
+            }
+            set
+            {
+                base.ImageListSizeSelection = value;
+            }
+        }
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override int ImagePaddingHorizontal
+        {
+            get
+            {
+                return base.ImagePaddingHorizontal;
+            }
+            set
+            {
+                base.ImagePaddingHorizontal = value;
+            }
+        }
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override int ImagePaddingVertical
+        {
+            get
+            {
+                return base.ImagePaddingVertical;
+            }
+            set
+            {
+                base.ImagePaddingVertical = value;
+            }
+        }
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override eImagePosition ImagePosition
+        {
+            get
+            {
+                return base.ImagePosition;
+            }
+            set
+            {
+                base.ImagePosition = value;
+            }
+        }
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override System.Drawing.Image ImageSmall
+        {
+            get
+            {
+                return base.ImageSmall;
+            }
+            set
+            {
+                base.ImageSmall = value;
+            }
+        }
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override eItemAlignment ItemAlignment
+        {
+            get
+            {
+                return base.ItemAlignment;
+            }
+            set
+            {
+                base.ItemAlignment = value;
+            }
+        }
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override string KeyTips
+        {
+            get
+            {
+                return base.KeyTips;
+            }
+            set
+            {
+                base.KeyTips = value;
+            }
+        }
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override eMenuVisibility MenuVisibility
+        {
+            get
+            {
+                return base.MenuVisibility;
+            }
+            set
+            {
+                base.MenuVisibility = value;
+            }
+        }
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override string OptionGroup
+        {
+            get
+            {
+                return base.OptionGroup;
+            }
+            set
+            {
+                base.OptionGroup = value;
+            }
+        }
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override ePersonalizedMenus PersonalizedMenus
+        {
+            get
+            {
+                return base.PersonalizedMenus;
+            }
+            set
+            {
+                base.PersonalizedMenus = value;
+            }
+        }
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override ePopupSide PopupSide
+        {
+            get
+            {
+                return base.PopupSide;
+            }
+            set
+            {
+                base.PopupSide = value;
+            }
+        }
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override ePopupType PopupType
+        {
+            get
+            {
+                return base.PopupType;
+            }
+            set
+            {
+                base.PopupType = value;
+            }
+        }
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override int PopupWidth
+        {
+            get
+            {
+                return base.PopupWidth;
+            }
+            set
+            {
+                base.PopupWidth = value;
+            }
+        }
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override System.Drawing.Image PressedImage
+        {
+            get
+            {
+                return base.PressedImage;
+            }
+            set
+            {
+                base.PressedImage = value;
+            }
+        }
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override int PressedImageIndex
+        {
+            get
+            {
+                return base.PressedImageIndex;
+            }
+            set
+            {
+                base.PressedImageIndex = value;
+            }
+        }
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override bool RibbonWordWrap
+        {
+            get
+            {
+                return base.RibbonWordWrap;
+            }
+            set
+            {
+                base.RibbonWordWrap = value;
+            }
+        }
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override ShapeDescriptor Shape
+        {
+            get
+            {
+                return base.Shape;
+            }
+            set
+            {
+                base.Shape = value;
+            }
+        }
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override bool SplitButton
+        {
+            get
+            {
+                return base.SplitButton;
+            }
+            set
+            {
+                base.SplitButton = value;
+            }
+        }
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override bool Stretch
+        {
+            get
+            {
+                return base.Stretch;
+            }
+            set
+            {
+                base.Stretch = value;
+            }
+        }
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override int SubItemsExpandWidth
+        {
+            get
+            {
+                return base.SubItemsExpandWidth;
+            }
+            set
+            {
+                base.SubItemsExpandWidth = value;
+            }
+        }
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override bool ThemeAware
+        {
+            get
+            {
+                return base.ThemeAware;
+            }
+            set
+            {
+                base.ThemeAware = value;
+            }
+        }
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override System.Drawing.Size FixedSize
+        {
+            get
+            {
+                return base.FixedSize;
+            }
+            set
+            {
+                base.FixedSize = value;
+            }
+        }
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override int PulseSpeed
+        {
+            get
+            {
+                return base.PulseSpeed;
+            }
+            set
+            {
+                base.PulseSpeed = value;
+            }
+        }
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override bool StopPulseOnMouseOver
+        {
+            get
+            {
+                return base.StopPulseOnMouseOver;
+            }
+            set
+            {
+                base.StopPulseOnMouseOver = value;
+            }
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/CrumbBar/CrumbBarItemView.cs b/PROMS/DotNetBar Source Code/CrumbBar/CrumbBarItemView.cs
new file mode 100644
index 00000000..6fbf2df7
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/CrumbBar/CrumbBarItemView.cs	
@@ -0,0 +1,235 @@
+using System;
+using System.Text;
+using System.Windows.Forms;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represents a view of CrumbBarItem displayed inside of CrumbBar control.
+    /// </summary>
+    public class CrumbBarItemView : ButtonItem
+    {
+        #region Internal Implementation
+        /// <summary>
+        /// Initializes a new instance of the CrumbBarItemView class.
+        /// </summary>
+        public CrumbBarItemView():base()
+        {
+            this.SubItemsExpandWidth = 15;
+            this.HorizontalPadding = 2;
+        }
+
+        private CrumbBarItem _AttachedItem;
+        /// <summary>
+        /// Gets the item attached to the view.
+        /// </summary>
+        public CrumbBarItem AttachedItem
+        {
+            get { return _AttachedItem; }
+            internal set
+            {
+                if (_AttachedItem != null)
+                {
+                    _AttachedItem.TextChanged -= new EventHandler(AttachedItemTextChanged);
+                    _AttachedItem.SubItemsChanged -= new System.ComponentModel.CollectionChangeEventHandler(AttachedItemSubItemsChanged);
+                    _AttachedItem.PopupClose -= new EventHandler(AttachedItemPopupClose);
+                }
+                _AttachedItem = value;
+
+                if (_AttachedItem != null)
+                {
+                    this.Text = _AttachedItem.Text;
+                    this.Cursor = _AttachedItem.Cursor;
+                    this.ForeColor = _AttachedItem.ForeColor;
+                    this.HotForeColor = _AttachedItem.HotForeColor;
+                    this.Tooltip = _AttachedItem.Tooltip;
+
+                    _AttachedItem.TextChanged += new EventHandler(AttachedItemTextChanged);
+                    _AttachedItem.SubItemsChanged += new System.ComponentModel.CollectionChangeEventHandler(AttachedItemSubItemsChanged);
+                    _AttachedItem.PopupClose += new EventHandler(AttachedItemPopupClose);
+                    if (AnyVisibleItems)
+                        this.PopupType = ePopupType.Container;
+                    else
+                        this.PopupType = ePopupType.Menu;
+                }
+                else
+                    this.PopupType = ePopupType.Menu;
+            }
+        }
+
+        private DateTime _PopupCloseTime = DateTime.MinValue;
+        private void AttachedItemPopupClose(object sender, EventArgs e)
+        {
+            _Expanded = false;
+            CrumbBarViewContainer c = this.Parent as CrumbBarViewContainer;
+            if (c != null)
+                c.OnSubItemExpandChange(this);
+
+            _PopupCloseTime = DateTime.Now;
+            this.Refresh();
+        }
+
+        public override void InternalMouseDown(MouseEventArgs objArg)
+        {
+            if (_PopupCloseTime != DateTime.MinValue && DateTime.Now.Subtract(_PopupCloseTime).TotalMilliseconds < 200)
+            {
+                _PopupCloseTime = DateTime.MinValue;
+                return;
+            }
+            base.InternalMouseDown(objArg);
+        }
+
+        public override void InternalMouseEnter()
+        {
+            CrumbBarViewContainer parent = this.Parent as CrumbBarViewContainer;
+            if (parent != null && parent.Expanded && AnyVisibleItems)
+            {
+                parent.Expanded = false;
+                this.Expanded = true;
+            }
+            base.InternalMouseEnter();
+        }
+
+        private bool AnyVisibleItems
+        {
+            get
+            {
+                if (_AttachedItem != null)
+                {
+                    foreach (BaseItem item in _AttachedItem.SubItems)
+                    {
+                        if (item.Visible) return true;
+                    }
+                }
+                return false;
+            }
+        }
+
+        private void AttachedItemSubItemsChanged(object sender, System.ComponentModel.CollectionChangeEventArgs e)
+        {
+            UpdatePopupType();
+        }
+
+        private void UpdatePopupType()
+        {
+            if (AnyVisibleItems && !(this.Parent is CrumbBarOverflowButton))
+                this.PopupType = ePopupType.Container;
+            else
+                this.PopupType = ePopupType.Menu;
+        }
+
+        protected override void OnParentChanged()
+        {
+            UpdatePopupType();
+            base.OnParentChanged();
+        }
+
+        void AttachedItemTextChanged(object sender, EventArgs e)
+        {
+            this.Text = _AttachedItem.Text;
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            this.AttachedItem = null;
+            base.Dispose(disposing);
+        }
+
+        internal static object CreateViewForItem(CrumbBarItem item)
+        {
+            CrumbBarItemView view = new CrumbBarItemView();
+            view.AttachedItem = item;
+            return view;
+        }
+
+        private bool _Expanded = false;
+        /// <summary>
+        /// Gets or sets a value indicating whether the item is expanded or not. For Popup items this would indicate whether the item is popped up or not.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), System.ComponentModel.DefaultValue(false), System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
+        public override bool Expanded
+        {
+            get
+            {
+                return _Expanded;
+            }
+            set
+            {
+                if (_Expanded != value)
+                {
+                    _Expanded = value;
+                    InternalExpandedChanged();
+                }
+            }
+        }
+
+        private void InternalExpandedChanged()
+        {
+            if (!_Expanded)
+            {
+                _AttachedItem.Expanded = false;
+            }
+            else
+            {
+                Control parent=this.ContainerControl as Control;
+                if(parent==null) return;
+                Point p = new Point(this.SubItemsRect.X - 10, this.SubItemsRect.Bottom - 1);
+                p.Offset(this.DisplayRectangle.Location.X, this.DisplayRectangle.Location.Y);
+                p = parent.PointToScreen(p);
+                _AttachedItem.PopupMenu(p);
+            }
+
+            CrumbBarViewContainer c = this.Parent as CrumbBarViewContainer;
+            if (c != null)
+                c.OnSubItemExpandChange(this);
+        }
+
+        protected override void OnClick()
+        {
+            CrumbBar bar = this.ContainerControl as CrumbBar;
+            if (bar == null) bar = this.GetOwner() as CrumbBar;
+
+            base.OnClick();
+
+            if (bar != null)
+            {
+                bar.SelectedItem = _AttachedItem;
+            }
+        }
+
+        protected override void RenderButton(ItemPaintArgs p)
+        {
+            if (!p.IsOnMenu)
+            {
+                Rendering.BaseRenderer renderer = p.Renderer;
+                if (renderer != null)
+                {
+                    p.ButtonItemRendererEventArgs.Graphics = p.Graphics;
+                    p.ButtonItemRendererEventArgs.ButtonItem = this;
+                    p.ButtonItemRendererEventArgs.ItemPaintArgs = p;
+                    renderer.DrawCrumbBarItemView(p.ButtonItemRendererEventArgs);
+                    return;
+                }
+            }
+            base.RenderButton(p);
+        }
+
+        /// <summary>
+        /// Returns copy of ExplorerBarContainerItem item
+        /// </summary>
+        public override BaseItem Copy()
+        {
+            CrumbBarItemView objCopy = new CrumbBarItemView();
+            this.CopyToItem(objCopy);
+            return objCopy;
+        }
+        protected override void CopyToItem(BaseItem copy)
+        {
+            CrumbBarItemView objCopy = copy as CrumbBarItemView;
+            base.CopyToItem(objCopy);
+        }
+        #endregion
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/CrumbBar/CrumbBarItemViewPainter.cs b/PROMS/DotNetBar Source Code/CrumbBar/CrumbBarItemViewPainter.cs
new file mode 100644
index 00000000..88bd49a6
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/CrumbBar/CrumbBarItemViewPainter.cs	
@@ -0,0 +1,253 @@
+using System;
+using System.Text;
+using DevComponents.DotNetBar.Rendering;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+
+namespace DevComponents.DotNetBar
+{
+    internal class CrumbBarItemViewPainter: IOffice2007Painter
+    {
+        #region IOffice2007Painter
+        private Office2007ColorTable _ColorTable = null;
+
+        /// <summary>
+        /// Gets or sets color table used by renderer.
+        /// </summary>
+        public Office2007ColorTable ColorTable
+        {
+            get { return _ColorTable; }
+            set { _ColorTable = value; }
+        }
+        #endregion
+
+        #region Internal Implementation
+        public void Paint(ButtonItem item, ItemPaintArgs pa)
+        {
+            Paint(item, pa, _ColorTable.CrumbBarItemView);
+        }
+
+        public void Paint(ButtonItem item, ItemPaintArgs pa, CrumbBarItemViewColorTable itemColorTable)
+        {
+            Graphics g =pa.Graphics;
+
+            CrumbBarItemViewStateColorTable stateTable = itemColorTable.Default;
+            CrumbBarItemViewStateColorTable stateTable2 = null;
+            bool isPressed = false;
+            if (item.IsMouseDown || item.Expanded)
+            {
+                stateTable = itemColorTable.Pressed;
+                isPressed = true;
+            }
+            else if (item.IsMouseOverExpand)
+            {
+                stateTable = itemColorTable.MouseOverInactive;
+                stateTable2 = itemColorTable.MouseOver;
+            }
+            else if (item.IsMouseOver)
+                stateTable = itemColorTable.MouseOver;
+            
+            Rectangle rect = item.DisplayRectangle;
+            rect.Width--;
+            rect.Height--;
+            Rectangle expandRect = item.GetTotalSubItemsRect();
+            if (!expandRect.IsEmpty)
+            {
+                expandRect.Offset(rect.Location);
+                expandRect.Width--;
+                expandRect.Height--;
+            }
+
+            PaintBackground(item, g, stateTable, stateTable2, isPressed, ref rect, ref expandRect);
+
+            Color textColor = stateTable.Foreground;
+            if (!item.ForeColor.IsEmpty)
+                textColor = item.ForeColor;
+            if (!textColor.IsEmpty)
+            {
+                // Render text
+                Font font = item.GetFont(pa, false);
+                bool rightToLeft = pa.RightToLeft;
+                rect = GetTextRectangle(item);
+                eTextFormat stringFormat = eTextFormat.Left | eTextFormat.VerticalCenter | eTextFormat.HidePrefix;
+                if (item.TextMarkupBody == null)
+                {
+                    TextDrawing.DrawString(g, ButtonItemPainter.GetDrawText(item.Text), font, textColor, rect, stringFormat);
+                }
+                else
+                {
+                    TextMarkup.MarkupDrawContext d = new TextMarkup.MarkupDrawContext(g, font, textColor, rightToLeft);
+                    d.HotKeyPrefixVisible = !((stringFormat & eTextFormat.HidePrefix) == eTextFormat.HidePrefix);
+                    d.ContextObject = item;
+                    Rectangle mr = new Rectangle(rect.X, rect.Y + (rect.Height - item.TextMarkupBody.Bounds.Height) / 2 + 1, item.TextMarkupBody.Bounds.Width, item.TextMarkupBody.Bounds.Height);
+                    item.TextMarkupBody.Bounds = mr;
+                    item.TextMarkupBody.Render(d);
+                }
+
+                if ((item.SubItems.Count > 0 || item.PopupType == ePopupType.Container) && item.ShowSubItems)
+                {
+                    // Render expand sign
+                    GraphicsPath path = GetExpandPath(item, expandRect);
+                    if (path != null)
+                    {
+                        SmoothingMode sm = g.SmoothingMode;
+                        g.SmoothingMode = SmoothingMode.Default;
+                        using(Brush brush=new SolidBrush(stateTable.Foreground))
+                            g.FillPath(brush, path);
+                        g.SmoothingMode = sm;
+                    }
+                }
+            }
+        }
+
+        private static void PaintBackground(ButtonItem item, Graphics g, CrumbBarItemViewStateColorTable stateTable, CrumbBarItemViewStateColorTable stateTable2, bool isPressed, ref Rectangle rect, ref Rectangle expandRect)
+        {
+            if (stateTable.Background != null && stateTable.Background.Count > 0)
+            {
+                using (Brush brush = DisplayHelp.CreateBrush(rect, stateTable.Background, 90, eGradientType.Linear))
+                    g.FillRectangle(brush, rect);
+                if (item.IsMouseOverExpand && stateTable2 != null && stateTable2.Background != null && stateTable2.Background.Count > 0)
+                {
+                    using (Brush brush = DisplayHelp.CreateBrush(rect, stateTable2.Background, 90, eGradientType.Linear))
+                        g.FillRectangle(brush, expandRect);
+                }
+            }
+
+            if (!stateTable.Border.IsEmpty)
+            {
+                using (Pen pen = new Pen(stateTable.Border, 1))
+                {
+                    g.DrawLine(pen, rect.X, rect.Y, rect.X, rect.Bottom);
+                    Pen pen2 = stateTable2 != null ? new Pen(stateTable2.Border, 1) : pen;
+                    if (!expandRect.IsEmpty)
+                    {
+                        g.DrawLine(pen2, expandRect.X, expandRect.Y, expandRect.X, expandRect.Bottom);
+                    }
+                    if (isPressed)
+                        g.DrawLine(pen, rect.X, rect.Y, rect.Right, rect.Y);
+
+                    g.DrawLine(pen2, rect.Right, rect.Y, rect.Right, rect.Bottom);
+                    if (stateTable2 != null) pen2.Dispose();
+                }
+            }
+
+            if (!stateTable.BorderLight.IsEmpty)
+            {
+                Rectangle rectLight = rect;
+                if (!expandRect.IsEmpty)
+                    rectLight.Width -= expandRect.Width;
+                rectLight.Inflate(-1, 0);
+                using (Pen pen = new Pen(stateTable.BorderLight, 1))
+                {
+                    if (isPressed)
+                    {
+                        g.DrawLine(pen, rectLight.X, rectLight.Y, rectLight.Right, rectLight.Y);
+                        g.DrawLine(pen, rectLight.X, rectLight.Y, rectLight.X, rectLight.Bottom);
+                        if (!expandRect.IsEmpty)
+                        {
+                            rectLight = expandRect;
+                            rectLight.Inflate(-1, 0);
+                            g.DrawLine(pen, rectLight.X, rectLight.Y, rectLight.Right, rectLight.Y);
+                            g.DrawLine(pen, rectLight.X, rectLight.Y, rectLight.X, rectLight.Bottom);
+                        }
+                    }
+                    else
+                    {
+                        g.DrawRectangle(pen, rectLight);
+                        if (!expandRect.IsEmpty)
+                        {
+                            rectLight = expandRect;
+                            rectLight.Inflate(-1, 0);
+                            g.DrawRectangle(pen, rectLight);
+                        }
+                    }
+                }
+            }
+        }
+
+        private GraphicsPath GetExpandPath(ButtonItem item, Rectangle expandRect)
+        {
+            GraphicsPath path = new GraphicsPath();
+            if (item.Expanded)
+            {
+                Point p = new Point(expandRect.X + (expandRect.Width - Dpi.Width6) / 2, expandRect.Y + (expandRect.Height - 1) / 2);
+                if (item.IsMouseDown) p.Offset(1, 1);
+                path.AddLine(p.X, p.Y, p.X + Dpi.Width8, p.Y);
+                path.AddLine(p.X + Dpi.Width8, p.Y, p.X + Dpi.Width4, p.Y + Dpi.Height4);
+                path.CloseAllFigures();
+            }
+            else
+            {
+                Point p = new Point(expandRect.X + (expandRect.Width - Dpi.Width2) / 2, expandRect.Y + (expandRect.Height - Dpi.Height7) / 2);
+                if (item.IsMouseDown) p.Offset(1, 1);
+                path.AddLine(p.X, p.Y, p.X, p.Y + Dpi.Height8);
+                path.AddLine(p.X, p.Y + Dpi.Height8, p.X + Dpi.Width4, p.Y + Dpi.Height4);
+                path.CloseAllFigures();
+            }
+            return path;
+        }
+
+        protected virtual Rectangle GetTextRectangle(ButtonItem button)
+        {
+            Rectangle itemRect = button.DisplayRectangle;
+            Rectangle textRect = button.TextDrawRect;
+            //Rectangle imageRect = button.ImageDrawRect;
+
+            textRect.Offset(itemRect.Left, itemRect.Top);
+
+            if (textRect.Right > itemRect.Right)
+                textRect.Width = itemRect.Right - textRect.Left;
+            textRect.X += 2;
+            textRect.Y--;
+            if (button.IsMouseDown) textRect.Offset(1, 1);
+            return textRect;
+        }
+
+        public void PaintOverflowButton(ButtonItem item, ItemPaintArgs pa)
+        {
+            PaintOverflowButton(item, pa, _ColorTable.CrumbBarItemView);
+        }
+
+        public void PaintOverflowButton(ButtonItem item, ItemPaintArgs pa, CrumbBarItemViewColorTable itemColorTable)
+        {
+            Graphics g =pa.Graphics;
+
+            CrumbBarItemViewStateColorTable stateTable = itemColorTable.Default;
+            CrumbBarItemViewStateColorTable stateTable2 = null;
+            bool isPressed = false;
+            if (item.IsMouseDown || item.Expanded)
+            {
+                stateTable = itemColorTable.Pressed;
+                isPressed = true;
+            }
+            else if (item.IsMouseOver)
+                stateTable = itemColorTable.MouseOver;
+            
+            Rectangle rect = item.DisplayRectangle;
+            rect.Width--;
+            rect.Height--;
+            Rectangle expandRect = Rectangle.Empty;
+
+            PaintBackground(item, g, stateTable, stateTable2, isPressed, ref rect, ref expandRect);
+
+            Color textColor = stateTable.Foreground;
+            if (!textColor.IsEmpty)
+            {
+                SmoothingMode sm = g.SmoothingMode;
+                Point p = new Point(rect.X + (rect.Width - 7) / 2, rect.Y + (rect.Height - 5) / 2);
+                if (isPressed)
+                    p.Offset(1, 1);
+                using (Pen pen = new Pen(textColor, 1))
+                {
+                    for (int i = 0; i < 2; i++)
+                    {
+                        g.DrawLine(pen, p.X + 3, p.Y, p.X, p.Y + 2);
+                        g.DrawLine(pen, p.X, p.Y + 2, p.X + 3, p.Y + 4);
+                        p.X += 4;
+                    }
+                }
+            }
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/CrumbBar/CrumbBarItemsCollection.cs b/PROMS/DotNetBar Source Code/CrumbBar/CrumbBarItemsCollection.cs
new file mode 100644
index 00000000..bba9eb36
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/CrumbBar/CrumbBarItemsCollection.cs	
@@ -0,0 +1,203 @@
+using System;
+using System.Text;
+using System.Collections;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represents collection of CrumbBarItem buttons.
+    /// </summary>
+    public class CrumbBarItemsCollection : CollectionBase
+    {
+        #region Private Variables
+        private CrumbBar _Parent = null;
+        #endregion
+
+        #region Internal Implementation
+        /// <summary>
+        /// Initializes a new instance of the CrumbBarItemsCollection class.
+        /// </summary>
+        /// <param name="parent"></param>
+        public CrumbBarItemsCollection(CrumbBar parent)
+        {
+            _Parent = parent;
+        }
+
+        /// <summary>
+        /// Gets or sets the node this collection is associated with.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public CrumbBar Parent
+        {
+            get { return _Parent; }
+        }
+        /// <summary>
+        /// Sets the node collection belongs to.
+        /// </summary>
+        /// <param name="parent">CrumbBarItem that is parent of this collection.</param>
+        internal void SetParent(CrumbBar parent)
+        {
+            _Parent = parent;
+        }
+
+        /// <summary>
+        /// Adds new object to the collection.
+        /// </summary>
+        /// <param name="ch">Object to add.</param>
+        /// <returns>Index of newly added object.</returns>
+        public int Add(CrumbBarItem ch)
+        {
+            return List.Add(ch);
+        }
+        /// <summary>
+        /// Returns reference to the object in collection based on it's index.
+        /// </summary>
+        public CrumbBarItem this[int index]
+        {
+            get { return (CrumbBarItem)(List[index]); }
+            set { List[index] = value; }
+        }
+        /// <summary>
+        /// Returns reference to the object in collection based on it's name.
+        /// </summary>
+        public CrumbBarItem this[string name]
+        {
+            get { return GetByName(name); }
+            set 
+            {
+                int index = GetIndexByName(name);
+                if (index == -1)
+                    throw new ArgumentException("name cannot be found in this collection");
+
+                List[index] = value; 
+            }
+        }
+
+        /// <summary>
+        /// Inserts new object into the collection.
+        /// </summary>
+        /// <param name="index">Position of the object.</param>
+        /// <param name="value">Object to insert.</param>
+        public void Insert(int index, CrumbBarItem value)
+        {
+            List.Insert(index, value);
+        }
+
+        /// <summary>
+        /// Returns index of the object inside of the collection.
+        /// </summary>
+        /// <param name="value">Reference to the object.</param>
+        /// <returns>Index of the object.</returns>
+        public int IndexOf(CrumbBarItem value)
+        {
+            return List.IndexOf(value);
+        }
+
+        /// <summary>
+        /// Returns whether collection contains specified object.
+        /// </summary>
+        /// <param name="value">Object to look for.</param>
+        /// <returns>true if object is part of the collection, otherwise false.</returns>
+        public bool Contains(CrumbBarItem value)
+        {
+            return List.Contains(value);
+        }
+
+        /// <summary>
+        /// Removes specified object from the collection.
+        /// </summary>
+        /// <param name="value"></param>
+        public void Remove(CrumbBarItem value)
+        {
+            List.Remove(value);
+        }
+
+        protected override void OnSet(int index, object oldValue, object newValue)
+        {
+            CrumbBarItem item = (CrumbBarItem)oldValue;
+            item.SetOwner(null);
+            item = (CrumbBarItem)newValue;
+            item.SetOwner(_Parent);
+
+            base.OnSet(index, oldValue, newValue);
+        }
+
+        protected override void OnRemoveComplete(int index, object value)
+        {
+            CrumbBarItem item = (CrumbBarItem)value;
+            item.SetOwner(null);
+            if (item.IsSelected)
+                _Parent.SetSelectedItem(null, eEventSource.Code);
+
+            base.OnRemoveComplete(index, value);
+        }
+        protected override void OnInsertComplete(int index, object value)
+        {
+            CrumbBarItem item = (CrumbBarItem)value;
+            item.SetOwner(_Parent);
+            item.ContainerControl = _Parent;
+            item.Style = eDotNetBarStyle.Office2007;
+            base.OnInsertComplete(index, value);
+        }
+
+        /// <summary>
+        /// Copies collection into the specified array.
+        /// </summary>
+        /// <param name="array">Array to copy collection to.</param>
+        /// <param name="index">Starting index.</param>
+        public void CopyTo(CrumbBarItem[] array, int index)
+        {
+            List.CopyTo(array, index);
+        }
+
+        /// <summary>
+        /// Copies contained items to the CrumbBarItem array.
+        /// </summary>
+        /// <param name="array">Array to copy to.</param>
+        internal void CopyTo(CrumbBarItem[] array)
+        {
+            List.CopyTo(array, 0);
+        }
+
+        protected override void OnClear()
+        {
+            foreach (CrumbBarItem item in List)
+            {
+                item.SetOwner(null);
+            }
+            
+            base.OnClear();
+        }
+
+        protected override void OnClearComplete()
+        {
+            if (_Parent != null)
+                _Parent.OnItemsCleared();
+            base.OnClearComplete();
+        }
+
+        private CrumbBarItem GetByName(string name)
+        {
+            foreach (CrumbBarItem d in this.List)
+            {
+                if (d.Name == name)
+                    return d;
+            }
+            return null;
+        }
+
+        private int GetIndexByName(string name)
+        {
+            for (int i = 0; i < this.List.Count; i++)
+            {
+                CrumbBarItem item = this[i];
+                if (item.Name == name)
+                    return i;
+            }
+            
+            return -1;
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/CrumbBar/CrumbBarOverflowButton.cs b/PROMS/DotNetBar Source Code/CrumbBar/CrumbBarOverflowButton.cs
new file mode 100644
index 00000000..91d4082c
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/CrumbBar/CrumbBarOverflowButton.cs	
@@ -0,0 +1,81 @@
+using System;
+using System.Text;
+
+namespace DevComponents.DotNetBar
+{
+    public class CrumbBarOverflowButton : ButtonItem
+    {
+        #region Internal Implementation
+        protected override void RenderButton(ItemPaintArgs p)
+        {
+            if (!p.IsOnMenu)
+            {
+                Rendering.BaseRenderer renderer = p.Renderer;
+                if (renderer != null)
+                {
+                    p.ButtonItemRendererEventArgs.Graphics = p.Graphics;
+                    p.ButtonItemRendererEventArgs.ButtonItem = this;
+                    p.ButtonItemRendererEventArgs.ItemPaintArgs = p;
+                    renderer.DrawCrumbBarOverflowItem(p.ButtonItemRendererEventArgs);
+                    return;
+                }
+            }
+            base.RenderButton(p);
+        }
+
+        public override void RecalcSize()
+        {
+            m_Rect.Width = 16;
+            m_Rect.Height = 11;
+            m_NeedRecalcSize = false;
+        }
+
+        public override void InternalMouseEnter()
+        {
+            CrumbBarViewContainer parent = this.Parent as CrumbBarViewContainer;
+            if (parent != null && parent.Expanded)
+            {
+                parent.Expanded = false;
+                this.Expanded = true;
+            }
+            base.InternalMouseEnter();
+        }
+
+        /// <summary>
+		/// Creates new instance of BaseItem.
+		/// </summary>
+		public CrumbBarOverflowButton():this("","") {}
+		/// <summary>
+		/// Creates new instance of BaseItem and assigns item name.
+		/// </summary>
+		/// <param name="sItemName">Item name.</param>
+        public CrumbBarOverflowButton(string sItemName) : this(sItemName, "") { }
+        /// <summary>
+		/// Creates new instance of BaseItem and assigns item name and item text.
+		/// </summary>
+		/// <param name="itemName">Item Name</param>
+		/// <param name="itemText">Item Text</param>
+        public CrumbBarOverflowButton(string itemName, string itemText)
+            : base(itemName, itemText)
+        {
+            this.AutoExpandOnClick = true;
+            this.ShowSubItems = false;
+        }
+
+        /// <summary>
+        /// Returns copy of ExplorerBarContainerItem item
+        /// </summary>
+        public override BaseItem Copy()
+        {
+            CrumbBarOverflowButton objCopy = new CrumbBarOverflowButton();
+            this.CopyToItem(objCopy);
+            return objCopy;
+        }
+        protected override void CopyToItem(BaseItem copy)
+        {
+            CrumbBarOverflowButton objCopy = copy as CrumbBarOverflowButton;
+            base.CopyToItem(objCopy);
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/CrumbBar/CrumbBarViewContainer.cs b/PROMS/DotNetBar Source Code/CrumbBar/CrumbBarViewContainer.cs
new file mode 100644
index 00000000..bbd8763d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/CrumbBar/CrumbBarViewContainer.cs	
@@ -0,0 +1,255 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represents internal CrumbBar view container.
+    /// </summary>
+    internal class CrumbBarViewContainer : ImageItem
+    {
+        #region Internal Implementation
+        /// <summary>
+        /// Initializes a new instance of the CrumbBarViewContainer class.
+        /// </summary>
+        public CrumbBarViewContainer()
+            : base()
+        {
+            LabelItem imageLabel = new LabelItem("sys_crumbbarimagelabel");
+            this.SubItems.Add(imageLabel);
+
+            CrumbBarOverflowButton overflowButton = new CrumbBarOverflowButton("sys_crumbbaroverflowbutton");
+            this.SubItems.Add(overflowButton);
+            m_IsContainer = true;
+        }
+
+        /// <summary>
+        /// Recalculates the size of the item
+        /// </summary>
+        public override void RecalcSize()
+        {
+            if (_InternalRemove) return;
+
+            Point pos = m_Rect.Location;
+            Size containerSize = m_Rect.Size;
+            _CalculatedHeight = 0;
+
+            if (m_SubItems == null)
+                return;
+
+            RestoreOverflowItems();
+            ButtonItem overflowButton = this.OverflowButton;
+            LabelItem imageLabel = this.ImageLabel;
+
+            // Overflow button is hidden by default
+            overflowButton.Visible = false;
+
+            Rectangle itemsRect = m_Rect;
+
+            // Label may be hidden if there is no image assigned to current item
+            if (imageLabel.Visible)
+            {
+                imageLabel.RecalcSize();
+                if (imageLabel.HeightInternal > _CalculatedHeight) _CalculatedHeight = imageLabel.HeightInternal;
+                imageLabel.HeightInternal = containerSize.Height;
+                itemsRect.X += imageLabel.WidthInternal;
+                itemsRect.Width -= imageLabel.WidthInternal;
+                imageLabel.Displayed = true;
+            }
+            Point itemsPos = itemsRect.Location;
+
+            bool overflowState = false;
+            BaseItem[] items = new BaseItem[m_SubItems.Count - 2];
+            if(m_SubItems.Count>2)
+                m_SubItems.CopyToFromIndex(items, 2);
+
+            for (int i = items.Length - 1; i >= 0; i--)
+            {
+                BaseItem item = items[i];
+                if (!item.Visible)
+                {
+                    item.Displayed = false;
+                    continue;
+                }
+
+                if (!overflowState)
+                {
+                    item.LeftInternal = itemsPos.X;
+                    item.TopInternal = itemsPos.Y;
+                    item.HeightInternal = itemsRect.Height;
+                    item.RecalcSize();
+                    if (item.HeightInternal > _CalculatedHeight) _CalculatedHeight = item.HeightInternal;
+                    item.HeightInternal = itemsRect.Height;
+                    if (itemsPos.X + item.WidthInternal > itemsRect.Right || itemsPos.X + item.WidthInternal + 16 > itemsRect.Right && i > 0)
+                    {
+                        // Overflow mode
+                        overflowState = true;
+                    }
+                    else
+                    {
+                        itemsPos.X += item.WidthInternal;
+                        item.Displayed = true;
+                    }
+                }
+
+                if (overflowState)
+                {
+                    _InternalRemove = true;
+                    m_SubItems.Remove(item);
+                    overflowButton.SubItems.Insert(0, item);
+                    _InternalRemove = false;
+                }
+            }
+
+            // Now position the items left inside
+            if (overflowState)
+            {
+                overflowButton.Visible = true;
+                overflowButton.Displayed = true;
+                overflowButton.HeightInternal = itemsRect.Height;
+                overflowButton.RecalcSize();
+                overflowButton.LeftInternal = itemsRect.X;
+                overflowButton.TopInternal = itemsRect.Y;
+                overflowButton.HeightInternal = itemsRect.Height;
+                itemsRect.X += overflowButton.WidthInternal;
+                itemsRect.Width -= overflowButton.WidthInternal;
+            }
+
+            itemsPos = itemsRect.Location;
+            for (int i = 2; i < m_SubItems.Count; i++)
+            {
+                BaseItem item = m_SubItems[i];
+                if (!item.Visible)
+                    continue;
+                if (item.WidthInternal + itemsPos.X > itemsRect.Right)
+                {
+                    item.Displayed = false;
+                    itemsPos.X = itemsRect.Right;
+                    continue;
+                }
+
+                item.LeftInternal = itemsPos.X;
+                itemsPos.X += item.WidthInternal;
+            }
+
+            base.RecalcSize();
+        }
+
+        private int _CalculatedHeight = 0;
+        internal int CalculatedHeight
+        {
+            get { return _CalculatedHeight; }
+        }
+
+        internal void RestoreOverflowItems()
+        {
+            ButtonItem overflowButton = this.OverflowButton;
+            if (overflowButton.SubItems.Count == 0) return;
+
+            BaseItem[] overflowItems = new BaseItem[overflowButton.SubItems.Count];
+            overflowButton.SubItems.CopyTo(overflowItems, 0);
+            overflowButton.SubItems.Clear();
+
+            for (int i = 0; i < overflowItems.Length; i++)
+            {
+                m_SubItems.Insert(i + 2, overflowItems[i]);
+            }
+        }
+
+        internal LabelItem ImageLabel
+        {
+            get
+            {
+                return m_SubItems[0] as LabelItem;
+            }
+        }
+
+        internal CrumbBarOverflowButton OverflowButton
+        {
+            get
+            {
+                return (CrumbBarOverflowButton)m_SubItems[1];
+            }
+        }
+
+        private bool _InternalRemove = false;
+        internal void ClearViewItems()
+        {
+            _InternalRemove = true;
+            while (m_SubItems.Count > 2)
+                m_SubItems.RemoveAt(m_SubItems.Count - 1);
+            _InternalRemove = false;
+        }
+
+        /// <summary>
+        /// Paints this base container
+        /// </summary>
+        public override void Paint(ItemPaintArgs pa)
+        {
+            if (this.SuspendLayout)
+                return;
+            System.Drawing.Graphics g = pa.Graphics;
+            if (m_NeedRecalcSize)
+                RecalcSize();
+
+            if (m_SubItems == null)
+                return;
+
+            foreach (BaseItem item in m_SubItems)
+            {
+                if (item.Visible && item.Displayed)
+                {
+                    item.Paint(pa);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Returns copy of ExplorerBarContainerItem item
+        /// </summary>
+        public override BaseItem Copy()
+        {
+            CrumbBarViewContainer objCopy = new CrumbBarViewContainer();
+            this.CopyToItem(objCopy);
+            return objCopy;
+        }
+        protected override void CopyToItem(BaseItem copy)
+        {
+            CrumbBarViewContainer objCopy = copy as CrumbBarViewContainer;
+            base.CopyToItem(objCopy);
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the item is expanded or not. For Popup items this would indicate whether the item is popped up or not.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), System.ComponentModel.DefaultValue(false), System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
+        public override bool Expanded
+        {
+            get
+            {
+                return m_Expanded;
+            }
+            set
+            {
+                base.Expanded = value;
+                if (!value)
+                    BaseItem.CollapseSubItems(this);
+            }
+        }
+
+        /// <summary>
+        /// Occurs when sub item expanded state has changed.
+        /// </summary>
+        /// <param name="item">Sub item affected.</param>
+        protected internal override void OnSubItemExpandChange(BaseItem item)
+        {
+            base.OnSubItemExpandChange(item);
+            if (item.Expanded)
+                this.Expanded = true;
+            else
+                base.Expanded = false;
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/CustomizeItem.cs b/PROMS/DotNetBar Source Code/CustomizeItem.cs
new file mode 100644
index 00000000..5a1df3ea
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/CustomizeItem.cs	
@@ -0,0 +1,932 @@
+namespace DevComponents.DotNetBar
+{
+    using System;
+	using System.Drawing;
+	using System.Resources;
+    using System.ComponentModel;
+    using DevComponents.DotNetBar.Rendering;
+
+    /// <summary>
+    /// Defines an item that allows the toolbar customization.
+    /// </summary>
+    [System.ComponentModel.ToolboxItem(false),System.ComponentModel.DesignTimeVisible(false)]
+    public class CustomizeItem:PopupItem
+    {
+		private bool m_MouseOver;
+		private string m_CustomizeStr="",m_ResetStr="";
+		
+		private string m_ThisToolTip;
+
+		private bool m_Localized=false;
+
+		private bool m_CustomizeItemVisible=true;
+		private bool m_AutoSizeMenuImages=true;
+		private System.Drawing.Size m_MenuImageSize=Size.Empty;
+
+		/// <summary>
+		/// Creates new instance of CustomizeItem object.
+		/// </summary>
+        public CustomizeItem()//:base()
+        {
+			this.GlobalItem=false;
+			m_MouseOver=false;
+			m_SystemItem=true;
+			this.CanCustomize=false;
+
+			LoadResources();
+
+			this.AutoCollapseOnClick=false;
+
+			m_MenuImageSize=new Size(16,16);
+        }
+
+		/// <summary>
+		/// Returns copy of CustomizeItem item
+		/// </summary>
+		public override BaseItem Copy()
+		{
+			CustomizeItem objCopy=new CustomizeItem();
+			this.CopyToItem(objCopy);
+			objCopy.CustomizeItemVisible=m_CustomizeItemVisible;
+			return objCopy;
+		}
+
+		/// <summary>
+		/// Called when item container has changed. If you override this method you must call the base implementation to allow default processing to occur.
+		/// </summary>
+		/// <param name="objOldContainer">Previous container of the item.</param>
+		protected internal override void OnContainerChanged(object objOldContainer)
+		{
+			base.OnContainerChanged(objOldContainer);
+			LoadResources();
+		}
+
+		/// <summary>
+		/// Occurs when tooltip is about to be shown or hidden.
+		/// </summary>
+		/// <param name="bShow">Specifies whether tooltip is shown or hidden.</param>
+		protected override void OnTooltip(bool bShow)
+		{
+			LoadResources();
+			base.OnTooltip(bShow);
+		}
+
+        /// <summary>
+        /// Loads the resources (text) used by this item.
+        /// </summary>
+		protected virtual void LoadResources()
+		{
+			if(!m_Localized)
+			{
+				if(this.GetOwner()!=null)
+					m_Localized=true;
+				using(LocalizationManager lm=new LocalizationManager(this.GetOwner() as IOwnerLocalize))
+				{
+					m_ThisToolTip=lm.GetLocalizedString(LocalizationKeys.CustomizeItemTooltip);
+					this.Text=lm.GetLocalizedString(LocalizationKeys.CustomizeItemAddRemove);
+                    m_CustomizeStr = lm.GetLocalizedString(LocalizationKeys.CustomizeItemCustomize);
+					m_ResetStr=lm.GetLocalizedString(LocalizationKeys.CustomizeItemReset);
+				}
+			}
+		}
+
+		/// <summary>
+		/// Overriden. Draws the item.
+		/// </summary>
+		/// <param name="g">Target Graphics object.</param>
+        public override void Paint(ItemPaintArgs pa)
+        {
+            if (this.SuspendLayout)
+                return;
+            eDotNetBarStyle effectiveStyle = EffectiveStyle;
+            if (effectiveStyle == eDotNetBarStyle.Office2000)
+                PaintOffice(pa);
+            else
+            {
+                if (this.IsThemed && !this.IsOnMenu)
+                    PaintThemed(pa);
+                else if (effectiveStyle == eDotNetBarStyle.Office2003 || effectiveStyle == eDotNetBarStyle.VS2005 || BarFunctions.IsOffice2007Style(effectiveStyle))
+                {
+                    PaintOffice2003(pa);
+                    return;
+                }
+                else
+                    PaintDotNet(pa);
+            }
+            if (BaseItem.IsOnPopup(this))
+                return;
+
+            Point[] p = new Point[3];
+            if (m_Orientation == eOrientation.Vertical)
+            {
+                p[0].X = m_Rect.Left + Dpi.Width7;
+                p[0].Y = m_Rect.Top + Dpi.Height4;
+                p[1].X = p[0].X - Dpi.Width3;
+                p[1].Y = p[0].Y + Dpi.Height3;
+                p[2].X = p[0].X;
+                p[2].Y = p[0].Y + Dpi.Height6;
+                pa.Graphics.FillPolygon(SystemBrushes.ControlText, p);
+            }
+            else
+            {
+                p[0].X = m_Rect.Left + (m_Rect.Width / 2) - Dpi.Width1;
+                p[0].Y = m_Rect.Bottom - Dpi.Height4;
+                p[1].X = p[0].X - Dpi.Width2;
+                p[1].Y = p[0].Y - Dpi.Height3;
+                p[2].X = p[1].X + Dpi.Width5;
+                p[2].Y = p[1].Y;
+                pa.Graphics.FillPolygon(SystemBrushes.ControlText, p);
+            }
+
+            if (this.DesignMode && this.Focused)
+            {
+                Rectangle r = m_Rect;
+                //r.Inflate(-1,-1);
+                DesignTime.DrawDesignTimeSelection(pa.Graphics, r, pa.Colors.ItemDesignTimeBorder);
+            }
+        }
+
+		private void PaintThemed(ItemPaintArgs pa)
+		{
+			ThemeToolbar theme=pa.ThemeToolbar;
+			ThemeToolbarParts part=ThemeToolbarParts.Button;
+			ThemeToolbarStates state=ThemeToolbarStates.Normal;
+			if(m_Expanded)
+				state=ThemeToolbarStates.Pressed;
+			else if(m_MouseOver)
+				state=ThemeToolbarStates.Hot;
+
+			theme.DrawBackground(pa.Graphics,part,state,m_Rect);
+
+			theme=null;
+
+			if(!BaseItem.IsOnPopup(this))
+				return;
+
+			Font objFont=null;
+			eTextFormat objStringFormat=GetStringFormat();
+			Point[] p;
+
+			objFont=GetFont();
+			Rectangle rect=m_Rect;
+			rect.Inflate(-1,-1);
+			rect.Width-=6;
+			
+			TextDrawing.DrawString(pa.Graphics,m_Text,objFont,SystemColors.ControlText,rect,objStringFormat);
+
+			p=new Point[3];
+			p[0].X=m_Rect.Right-8;
+			p[0].Y=m_Rect.Top+m_Rect.Height/2+3;
+			p[1].X=p[0].X-2;
+			p[1].Y=p[0].Y-3;
+			p[2].X=p[1].X+5;
+			p[2].Y=p[1].Y;
+			pa.Graphics.FillPolygon(SystemBrushes.ControlText,p);
+
+		}
+
+		private void PaintDotNet(ItemPaintArgs pa)
+		{
+            Rectangle r = m_Rect;
+			System.Drawing.Graphics g=pa.Graphics;
+
+            eDotNetBarStyle effectiveStyle = EffectiveStyle;
+            if (effectiveStyle == eDotNetBarStyle.Office2010 || effectiveStyle == eDotNetBarStyle.Office2007 || effectiveStyle == eDotNetBarStyle.Windows7)
+            {
+                Office2007ButtonItemStateColorTable stateColors = null;
+                if (pa.Renderer is Office2007Renderer)
+                {
+                    Office2007ButtonItemColorTable ct = ((Office2007Renderer)pa.Renderer).ColorTable.ButtonItemColors[0];
+                    if (this.Expanded)
+                        stateColors = ct.Expanded;
+                    else if (m_MouseOver)
+                        stateColors = ct.MouseOver;
+                    else
+                        stateColors = ct.Default;
+                }
+                if (stateColors != null)
+                    Office2007ButtonItemPainter.PaintBackground(g, stateColors, r, RoundRectangleShapeDescriptor.RoundCorner2, false, true);
+            }
+            else
+            {
+                if (this.Expanded)
+                {
+                    r = new Rectangle(m_Rect.Left + Dpi.Width2, m_Rect.Top + Dpi.Height2, m_Rect.Width - Dpi.Width2, m_Rect.Height - Dpi.Height2);
+                    g.FillRectangle(SystemBrushes.ControlDark, r);
+                    r.Offset(-Dpi.Width2, -Dpi.Height2);
+                    r.Height += Dpi.Height2;
+                    DisplayHelp.FillRectangle(g, r, pa.Colors.ItemExpandedBackground, pa.Colors.ItemExpandedBackground2, pa.Colors.ItemExpandedBackgroundGradientAngle);
+                    DisplayHelp.DrawRectangle(g, pa.Colors.MenuBorder, r);
+                }
+                else if (m_MouseOver)
+                {
+                    r = new Rectangle(m_Rect.Left, m_Rect.Top, m_Rect.Width - Dpi.Width2, m_Rect.Height);
+
+                    DisplayHelp.FillRectangle(g, r, pa.Colors.ItemHotBackground, pa.Colors.ItemHotBackground2, pa.Colors.ItemHotBackgroundGradientAngle);
+                    DisplayHelp.DrawRectangle(g, pa.Colors.ItemHotBorder, r);
+                }
+                if (!BaseItem.IsOnPopup(this))
+                    return;
+
+                if (this.Expanded)
+                {
+                    DisplayHelp.FillRectangle(g, m_Rect, pa.Colors.ItemExpandedBackground, pa.Colors.ItemExpandedBackground2, pa.Colors.ItemExpandedBackgroundGradientAngle);
+                    DisplayHelp.DrawRectangle(g, pa.Colors.MenuBorder, m_Rect);
+                }
+            }
+            Font objFont = null;
+            eTextFormat objStringFormat = GetStringFormat();
+            Point[] p;
+			objFont=GetFont();
+            Rectangle rect=m_Rect;
+            rect.Inflate(-Dpi.Width1, -Dpi.Height1);
+            rect.Width -= Dpi.Width6;
+            rect.X += Dpi.Width4;
+			
+			TextDrawing.DrawString(g,m_Text,objFont,SystemColors.ControlText,rect,objStringFormat);
+
+			p=new Point[3];
+            p[0].X = m_Rect.Right - Dpi.Width6;
+            p[0].Y = m_Rect.Top + m_Rect.Height / 2 + Dpi.Height3;
+            p[1].X = p[0].X - Dpi.Width2;
+            p[1].Y = p[0].Y - Dpi.Height3;
+            p[2].X = p[1].X + Dpi.Width5;
+			p[2].Y=p[1].Y;
+			g.FillPolygon(SystemBrushes.ControlText,p);
+
+		}
+
+        private void PaintOffice2003(ItemPaintArgs pa)
+        {
+            // When on popup the Customize Item is painted same as in .NET style...
+            if (BaseItem.IsOnPopup(this))
+            {
+                PaintDotNet(pa);
+                return;
+            }
+
+            Graphics g = pa.Graphics;
+            Rectangle r = m_Rect;
+
+            System.Drawing.Drawing2D.GraphicsPath path = new System.Drawing.Drawing2D.GraphicsPath();
+            if (this.Orientation == eOrientation.Vertical)
+            {
+                // When on docked toolbar it has a special look...
+                r.Y += Dpi.Height2;
+                r.Height -= Dpi.Height1;
+                r.X -= Dpi.Width2;
+                r.Width += Dpi.Width2;
+
+                if (pa.RightToLeft)
+                {
+                    path.AddLine(r.Right, r.Y, r.Right - Dpi.Width2, r.Y + Dpi.Height2);
+                    path.AddLine(r.X + Dpi.Width2, r.Y + Dpi.Height2, r.X, r.Y);
+                    path.AddLine(r.X, r.Bottom - Dpi.Height2, r.X + Dpi.Width2, r.Bottom);
+                    path.AddLine(r.Right - Dpi.Width2, r.Bottom, r.Right, r.Bottom - Dpi.Height2);
+                }
+                else
+                {
+                    path.AddLine(r.X, r.Y, r.X + Dpi.Width2, r.Y + Dpi.Height2);
+                    path.AddLine(r.Right - Dpi.Width2, r.Y + Dpi.Height2, r.Right, r.Y);
+                    path.AddLine(r.Right, r.Bottom - Dpi.Height2, r.Right - Dpi.Width2, r.Bottom);
+                    path.AddLine(r.X + Dpi.Width2, r.Bottom, r.X, r.Bottom - Dpi.Height2);
+                }
+                path.CloseAllFigures();
+            }
+            else
+            {
+                // When on docked toolbar it has a special look...
+                r.X += Dpi.Width2;
+                r.Width -= Dpi.Width1;
+                r.Y -= Dpi.Height2;
+                r.Height += Dpi.Height3;
+
+                if (pa.RightToLeft)
+                {
+                    r.X -= Dpi.Width2;
+                    path.AddLine(r.Right, r.Y, r.Right - Dpi.Width2, r.Y + Dpi.Height2);
+                    path.AddLine(r.Right - Dpi.Width2, r.Bottom - Dpi.Height2, r.Right, r.Bottom);
+                    path.AddLine(r.X + Dpi.Width2, r.Bottom, r.X, r.Bottom - Dpi.Height2);
+                    path.AddLine(r.X, r.Y + Dpi.Height2, r.X + Dpi.Width2, r.Y);
+                }
+                else
+                {
+                    path.AddLine(r.X, r.Y, r.X + Dpi.Width2, r.Y + Dpi.Height2);
+                    path.AddLine(r.X + Dpi.Width2, r.Bottom - Dpi.Height2, r.X, r.Bottom);
+                    path.AddLine(r.Right - Dpi.Width2, r.Bottom, r.Right, r.Bottom - Dpi.Height2);
+                    path.AddLine(r.Right, r.Y + Dpi.Height2, r.Right - Dpi.Width2, r.Y);
+                }
+                path.CloseAllFigures();
+            }
+
+            System.Drawing.Drawing2D.SmoothingMode smooth = g.SmoothingMode;
+            g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.AntiAlias;
+
+            if (this.Expanded)
+                DisplayHelp.FillPath(g, path, pa.Colors.ItemPressedBackground, pa.Colors.ItemPressedBackground2, pa.Colors.ItemPressedBackgroundGradientAngle);
+            else if (m_MouseOver)
+                DisplayHelp.FillPath(g, path, pa.Colors.ItemHotBackground, pa.Colors.ItemHotBackground2, pa.Colors.ItemHotBackgroundGradientAngle);
+            else
+                DisplayHelp.FillPath(g, path, pa.Colors.CustomizeBackground, pa.Colors.CustomizeBackground2, pa.Colors.CustomizeBackgroundGradientAngle);
+
+            g.SmoothingMode = smooth;
+
+            //using(Pen pen=new Pen(SystemColors.Window,1))
+            //    g.DrawLine(pen,r.Left+(m_Rect.Width-4)/2+1,r.Bottom-11+1,r.Left+(m_Rect.Width-4)/2+4+1,r.Bottom-11+1);
+
+            if (this.Orientation == eOrientation.Vertical)
+            {
+                // Draw Arrow Shade
+                Point[] p = new Point[3];
+                p[0].X = r.Left + (m_Rect.Width - Dpi.Width4) / 2 + Dpi.Width3;
+                p[0].Y = r.Bottom - Dpi.Height3 + Dpi.Height1;
+                p[1].X = p[0].X - Dpi.Width2;
+                p[1].Y = p[0].Y - Dpi.Height3;
+                p[2].X = p[1].X + Dpi.Width5;
+                p[2].Y = p[1].Y;
+                using (SolidBrush brush = new SolidBrush(SystemColors.Window)) // SystemColors.HighlightText))
+                    g.FillPolygon(brush, p);
+
+                // Draw Arrow
+                using (Pen pen = new Pen(pa.Colors.CustomizeText, 1))
+                    g.DrawLine(pen, r.Left + (m_Rect.Width - Dpi.Width4) / 2, r.Bottom - Dpi.Height9, r.Left + (m_Rect.Width - Dpi.Width4) / 2 + Dpi.Width4, r.Bottom - Dpi.Height9);
+                p = new Point[3];
+                p[0].X = r.Left + (m_Rect.Width - Dpi.Width4) / 2 + Dpi.Width2;
+                p[0].Y = r.Bottom - Dpi.Height3;
+                p[1].X = p[0].X - Dpi.Width2;
+                p[1].Y = p[0].Y - Dpi.Height3;
+                p[2].X = p[1].X + Dpi.Width5;
+                p[2].Y = p[1].Y;
+                using (SolidBrush brush = new SolidBrush(pa.Colors.CustomizeText))
+                    g.FillPolygon(brush, p);
+            }
+            else
+            {
+                // Draw Arrow Shade
+                Point[] p = new Point[3];
+                p[0].X = r.Left + (m_Rect.Width - Dpi.Width4) / 2 + Dpi.Width3;
+                p[0].Y = r.Bottom - Dpi.Height5 + Dpi.Height1;
+                p[1].X = p[0].X - Dpi.Width2;
+                p[1].Y = p[0].Y - Dpi.Height3;
+                p[2].X = p[1].X + Dpi.Width5;
+                p[2].Y = p[1].Y;
+                using (SolidBrush brush = new SolidBrush(SystemColors.Window)) // SystemColors.HighlightText))
+                    g.FillPolygon(brush, p);
+
+                // Draw Arrow
+                using (Pen pen = new Pen(pa.Colors.CustomizeText, 1))
+                    g.DrawLine(pen, r.Left + (m_Rect.Width - Dpi.Width4) / 2, r.Bottom - Dpi.Height11, r.Left + (m_Rect.Width - Dpi.Width4) / 2 + Dpi.Width4, r.Bottom - Dpi.Height11);
+                p = new Point[3];
+                p[0].X = r.Left + (m_Rect.Width - Dpi.Width4) / 2 + Dpi.Width2;
+                p[0].Y = r.Bottom - Dpi.Height5;
+                p[1].X = p[0].X - Dpi.Width2;
+                p[1].Y = p[0].Y - Dpi.Height3;
+                p[2].X = p[1].X + Dpi.Width5;
+                p[2].Y = p[1].Y;
+                using (SolidBrush brush = new SolidBrush(pa.Colors.CustomizeText))
+                    g.FillPolygon(brush, p);
+            }
+        }
+
+		private void PaintOffice(ItemPaintArgs pa)
+		{
+			System.Drawing.Graphics g=pa.Graphics;
+			if(this.Expanded)
+			{
+				System.Windows.Forms.ControlPaint.DrawBorder3D(g,m_Rect,System.Windows.Forms.Border3DStyle.SunkenOuter);
+			}
+			else if(m_MouseOver)
+			{
+				System.Windows.Forms.ControlPaint.DrawBorder3D(g,m_Rect,System.Windows.Forms.Border3DStyle.RaisedInner);
+			}
+			if(!BaseItem.IsOnPopup(this))
+				return;
+			
+			Font objFont=null;
+			eTextFormat objStringFormat=GetStringFormat();
+
+			objFont=GetFont();
+            Rectangle rect=m_Rect;
+			rect.Inflate(-Dpi.Width1,-Dpi.Height1);
+			rect.Width-=Dpi.Width6;
+			if(this.Expanded)
+			{
+                rect.Offset(Dpi.Width1, Dpi.Height1);
+                rect.Width -= Dpi.Width1;
+                rect.Height -= Dpi.Height1;
+			}
+			TextDrawing.DrawString(g,m_Text,objFont,SystemColors.ControlText,rect,objStringFormat);
+
+			Point[] p=new Point[3];
+            p[0].X = m_Rect.Right - Dpi.Width8;
+            p[0].Y = m_Rect.Top + m_Rect.Height / 2 + Dpi.Height3;
+            p[1].X = p[0].X - Dpi.Width2;
+            p[1].Y = p[0].Y - Dpi.Height3;
+            p[2].X = p[1].X + Dpi.Width5;
+			p[2].Y=p[1].Y;
+			g.FillPolygon(SystemBrushes.ControlText,p);
+		}
+
+        /// <summary>
+        /// Sets the custom system tooltip text for the item.
+        /// </summary>
+        /// <param name="text">Tooltip text.</param>
+        protected virtual void SetCustomTooltip(string text)
+        {
+            this.Tooltip = text;
+        }
+
+		/// <summary>
+		/// Overriden. Recalculates the size of the item.
+		/// </summary>
+		public override void RecalcSize()
+		{
+			if(this.SuspendLayout)
+				return;
+
+			if(!BaseItem.IsOnPopup(this))
+			{
+				if(m_Orientation==eOrientation.Vertical)
+				{
+					// Take suggested width
+					m_Rect.Height=Dpi.Width14;
+					m_Rect.Width=Dpi.Height22;
+				}
+				else
+				{
+					// Take suggested height
+                    m_Rect.Width = Dpi.Width14;
+					m_Rect.Height=Dpi.Height22;
+				}
+				m_BeginGroup=false;
+                SetCustomTooltip(GetTooltipText());
+			}
+			else
+			{
+				SetCustomTooltip("");
+				m_BeginGroup=true;
+				System.Windows.Forms.Control objCtrl=this.ContainerControl as System.Windows.Forms.Control;
+				if(!IsHandleValid(objCtrl))
+					return;
+				Graphics g=Graphics.FromHwnd(objCtrl.Handle);
+				// Get the right image size that we will use for calculation
+				Size objImageSize=Size.Empty;
+				if(m_Parent!=null)
+				{
+					ImageItem objParentImageItem=m_Parent as ImageItem;
+					if(objParentImageItem!=null)
+						objImageSize=new Size(objParentImageItem.SubItemsImageSize.Width,objParentImageItem.SubItemsImageSize.Height);
+					else
+						objImageSize=this.ImageSize;
+				}
+				else
+					objImageSize=this.ImageSize;
+
+				// Measure string
+				Font objCurrentFont=null;
+				objCurrentFont=GetFont();
+
+				Size objStringSize=Size.Empty;
+				eTextFormat objStringFormat=GetStringFormat();
+				
+				if(m_Text!="")
+				{
+					objStringSize=TextDrawing.MeasureString(g,m_Text,objCurrentFont,512,objStringFormat);
+					objStringSize.Width+=Dpi.Width2;
+				}
+
+				// Calculate item height				
+				if(objStringSize.Height>objImageSize.Height)
+					m_Rect.Height=(int)objStringSize.Height+Dpi.Height4;
+				else
+					m_Rect.Height=objImageSize.Height+Dpi.Height4;
+				m_Rect.Width=(int)objStringSize.Width+Dpi.Width15;
+			}
+
+			base.RecalcSize();
+		}
+
+        /// <summary>
+        /// Gets localized tooltip text for this instance of the item.
+        /// </summary>
+        /// <returns>Tooltip text.</returns>
+        protected virtual string GetTooltipText()
+        {
+            return m_ThisToolTip;
+        }
+
+		/*private bool IsOnPopUp()
+		{
+			if(this.ContainerControl is PopupMenu)
+				return true;
+			Bar objTlb=this.ContainerControl as Bar;
+			if(objTlb!=null && objTlb.BarState==eBarState.Popup)
+				return true;
+			return false;
+		}*/
+
+		[System.ComponentModel.Browsable(false),System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+		public override void InternalMouseEnter()
+		{
+			base.InternalMouseEnter();
+			m_MouseOver=true;
+			this.Refresh();
+		}
+
+		[System.ComponentModel.Browsable(false),System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+		public override void InternalMouseHover()
+		{
+			base.InternalMouseHover();
+            MouseHoverCustomize();
+		}
+
+		[System.ComponentModel.Browsable(false),System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+		public override void InternalMouseLeave()
+		{
+			base.InternalMouseLeave();
+			m_MouseOver=false;
+			this.Refresh();
+		}
+
+        [System.ComponentModel.Browsable(false),System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+		public override void InternalMouseDown(System.Windows.Forms.MouseEventArgs objArg)
+		{
+			base.InternalMouseDown(objArg);
+			if(objArg.Button != System.Windows.Forms.MouseButtons.Left || this.DesignMode)
+				return;
+            MouseDownAction();
+		}
+
+        protected virtual void MouseDownAction()
+        {
+            this.Expanded = !m_Expanded;
+        }
+
+        /// <summary>
+        /// Called when mouse hovers over the customize item.
+        /// </summary>
+        protected virtual void MouseHoverCustomize()
+        {
+            if (!this.Expanded && BaseItem.IsOnPopup(this))
+                this.Expanded = true;
+        }
+
+        /// <summary>
+        /// Gets whether the mouse is over the item.
+        /// </summary>
+        [Browsable(false)]
+        public bool IsMouseOver
+        {
+            get { return m_MouseOver; }
+        }
+
+		protected internal override void OnExpandChange()
+		{
+            if (this.Expanded)
+                SetupCustomizeItem();
+
+			base.OnExpandChange();
+            if (!this.Expanded)
+                ClearCustomizeItem();
+		}
+
+        protected virtual void SetupCustomizeItem()
+        {
+            if (BaseItem.IsOnPopup(this))
+            {
+                AddCustomizeItems();
+                this.PopupType = ePopupType.Menu;
+            }
+            else
+            {
+                this.SubItems.Clear();
+                CustomizeItem btn = new CustomizeItem();
+                btn.CustomizeItemVisible = this.CustomizeItemVisible;
+                btn.IsRightToLeft = this.IsRightToLeft;
+                this.SubItems.Add(btn);
+                this.PopupType = ePopupType.ToolBar;
+            }
+        }
+
+        protected virtual void ClearCustomizeItem()
+        {
+            this.SubItems.Clear();
+        }
+
+		private void AddRemoveClick(object sender)
+		{
+			((ButtonItem)sender).Expanded=!((ButtonItem)sender).Expanded;
+		}
+
+		private void ShowHideClick(object sender, System.EventArgs e)
+		{
+			BaseItem objBtn=((BaseItem)sender).Tag as BaseItem;
+			bool bGlobal=objBtn.GlobalItem;
+			objBtn.GlobalItem=false;
+			objBtn.SetVisibleDirect(!objBtn.Visible);
+            if (objBtn is TextBoxItem || objBtn is ComboBoxItem || objBtn is ControlContainerItem || objBtn.ContainerControl is NavigationBar)
+                objBtn.OnVisibleChanged(objBtn.Visible);
+            objBtn.UserCustomized = true;
+			objBtn.GlobalItem=bGlobal;
+			((BaseItem)sender).Visible=!((BaseItem)sender).Visible;
+			
+			if(objBtn.ContainerControl is Bar)
+				((Bar)objBtn.ContainerControl).RecalcLayout();
+			else if(objBtn.ContainerControl is MenuPanel)
+				((MenuPanel)objBtn.ContainerControl).RecalcSize();
+			else if(objBtn.ContainerControl is BarBaseControl)
+				((BarBaseControl)objBtn.ContainerControl).RecalcLayout();
+			
+			((BaseItem)sender).Refresh();
+			IOwner owner=this.GetOwner() as IOwner;
+			if(owner!=null)
+			{
+				owner.InvokeUserCustomize(objBtn,new EventArgs());
+				owner.InvokeEndUserCustomize(objBtn,new EndUserCustomizeEventArgs(eEndUserCustomizeAction.ItemVisibilityChanged));
+			}
+		}
+
+		private void CustomizeClick(object sender, System.EventArgs e)
+		{
+			IOwner owner=this.GetOwner() as IOwner;
+			if(owner==null)
+				return;
+			CollapseAll(this);
+			owner.Customize();
+		}
+
+		private void ResetClick(object sender, System.EventArgs e)
+		{
+			IOwner owner=this.GetOwner() as IOwner;
+			if(owner==null)
+				return;
+			BaseItem item=this;
+			if(BaseItem.IsOnPopup(this) && this.Parent!=null)
+				item=this.Parent;
+			CollapseAll(this);
+			owner.InvokeResetDefinition(item,new EventArgs());
+		}
+
+		/// <summary>
+		/// Forces the repaint the item.
+		/// </summary>
+		public override void Refresh()
+		{
+			if(this.SuspendLayout)
+				return;
+            if ((EffectiveStyle == eDotNetBarStyle.Office2003 || EffectiveStyle == eDotNetBarStyle.VS2005 || BarFunctions.IsOffice2007Style(this.EffectiveStyle)) && !BaseItem.IsOnPopup(this))
+			{
+				if((m_Visible || this.IsOnCustomizeMenu) && m_Displayed)
+				{
+					System.Windows.Forms.Control objCtrl=this.ContainerControl as System.Windows.Forms.Control;
+					if(objCtrl!=null && IsHandleValid(objCtrl) && !(objCtrl is ItemsListBox))
+					{
+						if(m_NeedRecalcSize)
+						{
+							RecalcSize();
+							if(m_Parent!=null)
+								m_Parent.SubItemSizeChanged(this);
+						}
+						Rectangle r=m_Rect;
+						r.Inflate(2,2);
+						objCtrl.Invalidate(r,true);
+					}
+				}
+			}
+			else
+				base.Refresh();
+		}
+
+		private void AddCustomizeItems()
+		{
+			BaseItem objTmp;
+			BaseItem objParent;
+
+			this.SubItems.Clear();
+
+			// Find the right parent item
+			/*System.Windows.Forms.Control objCtrl=this.ContainerControl as System.Windows.Forms.Control;
+			if(objCtrl is Bar)
+			{
+				Bar objTlb=objCtrl as Bar;
+				if(objTlb.Parent==null)
+					objParent=this.Parent;
+				else
+					objParent=objTlb.Parent;
+			}
+			else
+			{
+				objParent=this.Parent;
+			}*/
+			objParent=this.Parent;
+
+			while(objParent!=null && objParent.SystemItem && !(objParent.SystemItem && objParent is GenericItemContainer))
+				objParent=objParent.Parent;
+
+			if(objParent==null)
+				return;
+
+			foreach(BaseItem objItem in objParent.SubItems)
+			{
+				if(!objItem.SystemItem && objItem.CanCustomize)
+				{
+					objTmp=objItem.Copy();
+					objTmp.GlobalItem=false;
+					objTmp.ClearClick();
+					objTmp.BeginGroup=false;
+					objTmp.Enabled=true;
+					objTmp.SubItems.Clear();
+					objTmp.Tooltip="";
+					objTmp.SetIsOnCustomizeMenu(true);
+					if(objItem is ButtonItem)
+					{
+						((ButtonItem)objTmp).HotTrackingStyle=eHotTrackingStyle.Default;
+                        if (m_AutoSizeMenuImages && !m_MenuImageSize.IsEmpty && ((ButtonItem)objTmp).ImageSize != m_MenuImageSize)
+                        {
+                            ((ButtonItem)objTmp).ImageFixedSize = m_MenuImageSize;
+                            ((ButtonItem)objTmp).UseSmallImage = true;
+                        }
+					}
+					objTmp.Click+=new System.EventHandler(ShowHideClick);
+					objTmp.Tag=objItem;
+					this.SubItems.Add(objTmp);
+				}
+			}
+			if(objParent is GenericItemContainer && ((GenericItemContainer)objParent).MoreItems!=null)
+			{
+				BaseItem objMore=((GenericItemContainer)objParent).MoreItems;
+				foreach(BaseItem objItem in objMore.SubItems)
+				{
+					if(!objItem.SystemItem)
+					{
+						objTmp=objItem.Copy();
+						objTmp.GlobalItem=false;
+						objTmp.ClearClick();
+						objTmp.BeginGroup=false;
+						objTmp.Enabled=true;
+						objTmp.SubItems.Clear();
+						objTmp.Tooltip="";
+						objTmp.SetIsOnCustomizeMenu(true);
+						objTmp.Click+=new System.EventHandler(ShowHideClick);
+						objTmp.Tag=objItem;
+						this.SubItems.Add(objTmp);
+					}
+				}
+			}
+
+			objTmp=null;
+
+			ButtonItem objBtn=null;
+			IOwner owner=this.GetOwner() as IOwner;
+			if(owner!=null && owner.ShowResetButton)
+			{
+				// Reset Bar Item
+				objBtn=new ButtonItem();
+				objBtn.GlobalItem=false;
+				objBtn.BeginGroup=true;
+				objBtn.Text=m_ResetStr; // "&Reset Bar";
+				objBtn.SetIsOnCustomizeMenu(true);
+				objBtn.SetSystemItem(true);
+				objBtn.Orientation=eOrientation.Horizontal;
+				objBtn.Click+=new System.EventHandler(ResetClick);
+				this.SubItems.Add(objBtn);
+			}
+			if(m_CustomizeItemVisible)
+			{
+				// Customize
+				objBtn=new ButtonItem();
+				objBtn.GlobalItem=false;
+				if(owner==null || owner!=null && !owner.ShowResetButton)
+					objBtn.BeginGroup=true;
+				objBtn.Text=m_CustomizeStr; //"&Customize...";
+				objBtn.SetIsOnCustomizeMenu(true);
+				objBtn.SetSystemItem(true);
+				objBtn.Click+=new System.EventHandler(CustomizeClick);
+				this.SubItems.Add(objBtn);
+			}
+
+			m_NeedRecalcSize=false;
+		}
+
+        private eTextFormat GetStringFormat()
+		{
+            eTextFormat format = eTextFormat.Default;
+            format |= eTextFormat.SingleLine;
+            //format |= eTextFormat.EndEllipsis;
+            format |= eTextFormat.VerticalCenter;
+            return format;
+            //StringFormat sfmt=BarFunctions.CreateStringFormat(); //new StringFormat(StringFormat.GenericDefault);
+            //sfmt.HotkeyPrefix=System.Drawing.Text.HotkeyPrefix.Show;
+            ////sfmt.FormatFlags=sfmt.FormatFlags & ~(sfmt.FormatFlags & StringFormatFlags.DisableKerning);
+            //sfmt.FormatFlags=sfmt.FormatFlags | StringFormatFlags.NoWrap;
+            //sfmt.Alignment=System.Drawing.StringAlignment.Near;
+            //sfmt.LineAlignment=System.Drawing.StringAlignment.Center;
+            //return sfmt;
+		}
+
+		/// <summary>
+		/// Returns the Font object to be used for drawing the item text.
+		/// </summary>
+		/// <returns>Font object.</returns>
+		protected virtual Font GetFont()
+		{
+			System.Windows.Forms.Control objCtrl=this.ContainerControl as System.Windows.Forms.Control;
+			if(objCtrl!=null)
+				return (Font)objCtrl.Font;
+            return SystemFonts.DefaultFont;// (Font)System.Windows.Forms.SystemInformation.MenuFont;
+		}
+
+		/// <summary>
+		/// Gets or sets a value indicating whether the item is visible.
+		/// </summary>
+        [Browsable(true), DevCoBrowsable(true), DefaultValue(true), Category("Behavior"), Description("Determines whether the item is visible or hidden.")]
+        public override bool Visible
+		{
+			get
+			{
+				Bar objTlb=this.ContainerControl as Bar;
+				if(objTlb!=null)
+				{
+					if(objTlb.BarState==eBarState.Docked || objTlb.BarState==eBarState.Popup)
+						return base.Visible;
+					else
+						return false;
+				}
+				return base.Visible;
+			}
+			set
+			{
+				base.Visible=value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets whether Customize menu item is visible.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),Category("Behavior"),Description("Indicates whether Customize menu item is visible."),DefaultValue(true)]
+		public virtual bool CustomizeItemVisible
+		{
+			get {return m_CustomizeItemVisible;}
+			set {m_CustomizeItemVisible=value;}
+		}
+
+		/// <summary>
+		/// Overloaded. Serializes the item and all sub-items into the XmlElement.
+		/// </summary>
+		/// <param name="ThisItem">XmlElement to serialize the item to.</param>
+		protected internal override void Serialize(ItemSerializationContext context)
+		{
+			base.Serialize(context);
+            System.Xml.XmlElement ThisItem = context.ItemXmlElement;
+			if(!m_CustomizeItemVisible)
+				ThisItem.SetAttribute("customizeitemvisible",System.Xml.XmlConvert.ToString(m_CustomizeItemVisible));
+		}
+
+		/// <summary>
+		/// Overloaded. Deserializes the Item from the XmlElement.
+		/// </summary>
+		/// <param name="ItemXmlSource">Source XmlElement.</param>
+		public override void Deserialize(ItemSerializationContext context)
+		{
+			base.Deserialize(context);
+            System.Xml.XmlElement ItemXmlSource = context.ItemXmlElement;
+			if(ItemXmlSource.HasAttribute("customizeitemvisible"))
+				m_CustomizeItemVisible=System.Xml.XmlConvert.ToBoolean(ItemXmlSource.GetAttribute("customizeitemvisible"));
+		}
+
+        /// <summary>
+        /// Indicates whether the item will auto-collapse (fold) when clicked. 
+        /// When item is on popup menu and this property is set to false, menu will not
+        /// close when item is clicked.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), Category("Behavior"), DefaultValue(false), Description("Indicates whether the item will auto-collapse (fold) when clicked.")]
+        public override bool AutoCollapseOnClick
+        {
+            get { return base.AutoCollapseOnClick; }
+            set {base.AutoCollapseOnClick = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether item can be customized by end user.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), DefaultValue(false), Category("Behavior"), Description("Indicates whether item can be customized by user.")]
+        public override bool CanCustomize
+        {
+            get { return base.CanCustomize; }
+            set { base.CanCustomize = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether item is global or not.
+        /// This flag is used to propagate property changes to all items with the same name.
+        /// Setting for example Visible property on the item that has GlobalItem set to true will
+        /// set visible property to the same value on all items with the same name.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), DefaultValue(false), Category("Behavior"), Description("Indicates whether certain global properties are propagated to all items with the same name when changed.")]
+        public override bool GlobalItem
+        {
+            get { return base.GlobalItem; }
+            set { base.GlobalItem = value; }
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DRAGCOPY.CUR b/PROMS/DotNetBar Source Code/DRAGCOPY.CUR
new file mode 100644
index 00000000..981784bf
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DRAGCOPY.CUR differ
diff --git a/PROMS/DotNetBar Source Code/DRAGMOVE.CUR b/PROMS/DotNetBar Source Code/DRAGMOVE.CUR
new file mode 100644
index 00000000..b583cf99
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DRAGMOVE.CUR differ
diff --git a/PROMS/DotNetBar Source Code/DRAGNONE.CUR b/PROMS/DotNetBar Source Code/DRAGNONE.CUR
new file mode 100644
index 00000000..a82ee45f
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DRAGNONE.CUR differ
diff --git a/PROMS/DotNetBar Source Code/DateTimeInput.ico b/PROMS/DotNetBar Source Code/DateTimeInput.ico
new file mode 100644
index 00000000..2b2c4cc3
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DateTimeInput.ico differ
diff --git a/PROMS/DotNetBar Source Code/DefinitionPreviewControl.cs b/PROMS/DotNetBar Source Code/DefinitionPreviewControl.cs
new file mode 100644
index 00000000..6c5da38d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DefinitionPreviewControl.cs	
@@ -0,0 +1,195 @@
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.Drawing;
+using System.Data;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Design
+{
+	/// <summary>
+	/// Summary description for DefinitionPreviewControl.
+	/// </summary>
+	[ToolboxItem(false)]
+	internal class DefinitionPreviewControl : System.Windows.Forms.UserControl
+	{
+		private DevComponents.DotNetBar.DockSite barLeftDockSite;
+		private DevComponents.DotNetBar.DockSite barRightDockSite;
+		private DevComponents.DotNetBar.DockSite barTopDockSite;
+		private DevComponents.DotNetBar.DockSite barBottomDockSite;
+		internal DevComponents.DotNetBar.DotNetBarManager previewManager;
+		private System.ComponentModel.IContainer components;
+
+		public event EventHandler DataChanged;
+
+		public DefinitionPreviewControl()
+		{
+			// This call is required by the Windows.Forms Form Designer.
+			InitializeComponent();
+
+			previewManager.DefinitionLoaded+=new EventHandler(this.DefinitionLoaded);
+
+		}
+
+		/// <summary> 
+		/// Clean up any resources being used.
+		/// </summary>
+		protected override void Dispose( bool disposing )
+		{
+			if( disposing )
+			{
+				if(components != null)
+				{
+					components.Dispose();
+				}
+			}
+			base.Dispose( disposing );
+		}
+
+		#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();
+			#if !TRIAL
+			this.previewManager = new DevComponents.DotNetBar.DotNetBarManager(this.components,true);
+			#else
+			this.previewManager = new DevComponents.DotNetBar.DotNetBarManager(this.components);
+			#endif
+			this.barBottomDockSite = new DevComponents.DotNetBar.DockSite();
+			this.barLeftDockSite = new DevComponents.DotNetBar.DockSite();
+			this.barRightDockSite = new DevComponents.DotNetBar.DockSite();
+			this.barTopDockSite = new DevComponents.DotNetBar.DockSite();
+			this.SuspendLayout();
+			// 
+			// previewManager
+			// 
+			this.previewManager.AutoDispatchShortcuts.Add(DevComponents.DotNetBar.eShortcut.F1);
+			this.previewManager.AutoDispatchShortcuts.Add(DevComponents.DotNetBar.eShortcut.CtrlC);
+			this.previewManager.AutoDispatchShortcuts.Add(DevComponents.DotNetBar.eShortcut.CtrlA);
+			this.previewManager.AutoDispatchShortcuts.Add(DevComponents.DotNetBar.eShortcut.CtrlV);
+			this.previewManager.AutoDispatchShortcuts.Add(DevComponents.DotNetBar.eShortcut.CtrlX);
+			this.previewManager.AutoDispatchShortcuts.Add(DevComponents.DotNetBar.eShortcut.CtrlZ);
+			this.previewManager.AutoDispatchShortcuts.Add(DevComponents.DotNetBar.eShortcut.Del);
+			this.previewManager.AutoDispatchShortcuts.Add(DevComponents.DotNetBar.eShortcut.Ins);
+			this.previewManager.BottomDockSite = this.barBottomDockSite;
+			this.previewManager.DefinitionName = "";
+			this.previewManager.LeftDockSite = this.barLeftDockSite;
+			this.previewManager.ParentForm = null;
+			this.previewManager.RightDockSite = this.barRightDockSite;
+			this.previewManager.Style = DevComponents.DotNetBar.eDotNetBarStyle.Office2003;
+			this.previewManager.TopDockSite = this.barTopDockSite;
+			this.previewManager.UseCustomCustomizeDialog = true;
+			this.previewManager.UseHook = true;
+			this.previewManager.BarClosing += new DevComponents.DotNetBar.DotNetBarManager.BarClosingEventHandler(this.OnBarClosing);
+			this.previewManager.BarUndock += new System.EventHandler(this.OnDefinitionChanged);
+			this.previewManager.BarTearOff += new System.EventHandler(this.OnDefinitionChanged);
+			this.previewManager.BarDock += new System.EventHandler(this.OnDefinitionChanged);
+			this.previewManager.AutoHideChanged += new System.EventHandler(this.OnDefinitionChanged);
+			this.previewManager.EnterCustomize += new System.EventHandler(this.previewManager_EnterCustomize);
+			// 
+			// barBottomDockSite
+			// 
+			this.barBottomDockSite.AccessibleRole = System.Windows.Forms.AccessibleRole.Window;
+			this.barBottomDockSite.BackgroundImageAlpha = ((System.Byte)(255));
+			this.barBottomDockSite.Dock = System.Windows.Forms.DockStyle.Bottom;
+			this.barBottomDockSite.Location = new System.Drawing.Point(0, 176);
+			this.barBottomDockSite.Name = "barBottomDockSite";
+			this.barBottomDockSite.Size = new System.Drawing.Size(240, 0);
+			this.barBottomDockSite.TabIndex = 3;
+			this.barBottomDockSite.TabStop = false;
+			// 
+			// barLeftDockSite
+			// 
+			this.barLeftDockSite.AccessibleRole = System.Windows.Forms.AccessibleRole.Window;
+			this.barLeftDockSite.BackgroundImageAlpha = ((System.Byte)(255));
+			this.barLeftDockSite.Dock = System.Windows.Forms.DockStyle.Left;
+			this.barLeftDockSite.Location = new System.Drawing.Point(0, 0);
+			this.barLeftDockSite.Name = "barLeftDockSite";
+			this.barLeftDockSite.Size = new System.Drawing.Size(0, 176);
+			this.barLeftDockSite.TabIndex = 0;
+			this.barLeftDockSite.TabStop = false;
+			// 
+			// barRightDockSite
+			// 
+			this.barRightDockSite.AccessibleRole = System.Windows.Forms.AccessibleRole.Window;
+			this.barRightDockSite.BackgroundImageAlpha = ((System.Byte)(255));
+			this.barRightDockSite.Dock = System.Windows.Forms.DockStyle.Right;
+			this.barRightDockSite.Location = new System.Drawing.Point(240, 0);
+			this.barRightDockSite.Name = "barRightDockSite";
+			this.barRightDockSite.Size = new System.Drawing.Size(0, 176);
+			this.barRightDockSite.TabIndex = 1;
+			this.barRightDockSite.TabStop = false;
+			// 
+			// barTopDockSite
+			// 
+			this.barTopDockSite.AccessibleRole = System.Windows.Forms.AccessibleRole.Window;
+			this.barTopDockSite.BackgroundImageAlpha = ((System.Byte)(255));
+			this.barTopDockSite.Dock = System.Windows.Forms.DockStyle.Top;
+			this.barTopDockSite.Location = new System.Drawing.Point(0, 0);
+			this.barTopDockSite.Name = "barTopDockSite";
+			this.barTopDockSite.Size = new System.Drawing.Size(240, 0);
+			this.barTopDockSite.TabIndex = 2;
+			this.barTopDockSite.TabStop = false;
+			// 
+			// DefinitionPreviewControl
+			// 
+			this.BackColor = System.Drawing.SystemColors.Control;
+			this.Controls.Add(this.barLeftDockSite);
+			this.Controls.Add(this.barRightDockSite);
+			this.Controls.Add(this.barTopDockSite);
+			this.Controls.Add(this.barBottomDockSite);
+			this.Name = "DefinitionPreviewControl";
+			this.Size = new System.Drawing.Size(240, 176);
+			this.ResumeLayout(false);
+
+		}
+		#endregion
+
+		#region Event Handlers
+		private void DefinitionLoaded(object sender, EventArgs e)
+		{
+			foreach(Bar bar in previewManager.Bars)
+			{
+				bar.SizeChanged+=new EventHandler(this.BarSizeChanged);
+				bar.Disposed+=new EventHandler(this.BarDisposed);
+			}
+		}
+		private void BarDisposed(object sender, EventArgs e)
+		{
+			try
+			{
+				if(sender is Bar)
+					((Bar)sender).SizeChanged-=new EventHandler(this.BarSizeChanged);
+			}
+			catch{}
+		}
+		private void BarSizeChanged(object sender, EventArgs e)
+		{
+			this.InvokeDataChanged();
+		}
+		private void OnBarClosing(object sender, BarClosingEventArgs e)
+		{
+			InvokeDataChanged();
+		}
+		private void OnDefinitionChanged(object sender, EventArgs e)
+		{
+			InvokeDataChanged();
+		}
+		#endregion
+
+		private void InvokeDataChanged()
+		{
+			if(DataChanged!=null)
+				DataChanged(this,new EventArgs());
+		}
+
+		private void previewManager_EnterCustomize(object sender, System.EventArgs e)
+		{
+		
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/DefinitionPreviewControl.resx b/PROMS/DotNetBar Source Code/DefinitionPreviewControl.resx
new file mode 100644
index 00000000..a33028a1
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DefinitionPreviewControl.resx	
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 1.3
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">1.3</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1">this is my long string</data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        [base64 mime encoded serialized .NET Framework object]
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        [base64 mime encoded string representing a byte array form of the .NET Framework object]
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used forserialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>1.3</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="previewManager.Location" type="System.Drawing.Point, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </data>
+  <data name="previewManager.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="previewManager.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Assembly</value>
+  </data>
+  <data name="barBottomDockSite.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="barBottomDockSite.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="barBottomDockSite.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="barLeftDockSite.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="barLeftDockSite.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="barLeftDockSite.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="barRightDockSite.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="barRightDockSite.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="barRightDockSite.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="barTopDockSite.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="barTopDockSite.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="barTopDockSite.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="$this.TrayLargeIcon" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="$this.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="$this.SnapToGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+  <data name="$this.DrawGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+  <data name="$this.TrayHeight" type="System.Int32, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>80</value>
+  </data>
+  <data name="$this.Language" type="System.Globalization.CultureInfo, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>(Default)</value>
+  </data>
+  <data name="$this.Localizable" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="$this.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="$this.Name">
+    <value>DefinitionPreviewControl</value>
+  </data>
+  <data name="$this.GridSize" type="System.Drawing.Size, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>8, 8</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DesignTime.cs b/PROMS/DotNetBar Source Code/DesignTime.cs
new file mode 100644
index 00000000..f3fa107c
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DesignTime.cs	
@@ -0,0 +1,54 @@
+using System;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Collections;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Statis functions for design-time support.
+	/// </summary>
+	internal class DesignTime
+	{
+		public static void DrawDesignTimeSelection(Graphics g, Rectangle r, Color c)
+		{
+			bool antiAlias=false;
+			if(g.SmoothingMode==System.Drawing.Drawing2D.SmoothingMode.AntiAlias)
+			{
+				antiAlias=true;
+				g.SmoothingMode=System.Drawing.Drawing2D.SmoothingMode.Default;
+			}
+            g.DrawRectangle(Pens.White, r);
+			using(Pen pen=new Pen(c,1))
+			{
+				pen.DashStyle=DashStyle.Dot;
+				g.DrawRectangle(pen,r);
+                //r.Inflate(-1,-1);
+                //g.DrawRectangle(pen,r);
+			}
+
+			if(antiAlias)
+				g.SmoothingMode=System.Drawing.Drawing2D.SmoothingMode.AntiAlias;
+		}
+
+        public static void DrawDesignTimeSelection(Graphics g, GraphicsPath path, Color c)
+        {
+            bool antiAlias = false;
+            if (g.SmoothingMode == System.Drawing.Drawing2D.SmoothingMode.AntiAlias)
+            {
+                antiAlias = true;
+                g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.Default;
+            }
+            g.DrawPath(Pens.White, path);
+            using (Pen pen = new Pen(c, 1))
+            {
+                pen.DashStyle = DashStyle.Dot;
+                g.DrawPath(pen, path);
+            }
+
+            if (antiAlias)
+                g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.AntiAlias;
+        }
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/DesignTimeDte.cs b/PROMS/DotNetBar Source Code/DesignTimeDte.cs
new file mode 100644
index 00000000..ce3de38d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DesignTimeDte.cs	
@@ -0,0 +1,427 @@
+using System;
+using System.Reflection;
+using System.Windows.Forms;
+using System.Runtime.InteropServices;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Summary description for DesignTimeDte.
+	/// </summary>
+	public class DesignTimeDte
+	{
+		public static string GetProjectPath(IServiceProvider service)
+		{
+			object dte=DesignTimeDte.GetDTE(service);
+			//EnvDTE.DTE dte=System.Runtime.InteropServices.Marshal.GetActiveObject("VisualStudio.DTE") as EnvDTE.DTE;
+			if(dte!=null)
+			{
+				System.Array pjs=dte.GetType().InvokeMember("ActiveSolutionProjects",BindingFlags.GetProperty,null,dte, new object []{}) as System.Array;
+				if(pjs==null)
+				{
+					//MessageBox.Show("Failed to get ActiveSolutionProjects");
+					return "";
+				}
+				if(pjs.Length>0)
+				{
+					object project=pjs.GetValue(0);
+					//MessageBox.Show(((EnvDTE.Project)project).Properties.Item("FullPath").Value.ToString());
+					object properties=project.GetType().InvokeMember("Properties",BindingFlags.GetProperty,null,project, new object []{});
+					if(properties!=null)
+					{
+						object item=properties.GetType().InvokeMember("Item",BindingFlags.InvokeMethod,null,properties, new object []{"FullPath"});
+						if(item!=null)
+						{
+							object val=item.GetType().InvokeMember("Value",BindingFlags.GetProperty,null,item, new object []{});
+							if(val!=null && val is string)
+                                return val.ToString();
+						}
+						//else
+						//	MessageBox.Show("Failed to get item");
+					}
+					//else
+					//	MessageBox.Show("Failed to get properties");
+				}
+				//else
+				//	MessageBox.Show("PJS length is ZERO");
+			}
+			//else
+			//	MessageBox.Show("Failed to get DTE");
+			return "";
+		}
+
+		public static string GetDefinitionPath(string definitionName, IServiceProvider service)
+		{
+			// In design-time our document has to be open for definition to be loaded
+			//EnvDTE.DTE dte=GetMSDEVFromGIT("VisualStudio.DTE",System.Diagnostics.Process.GetCurrentProcess().Id.ToString()) as EnvDTE.DTE;
+			object dte=DesignTimeDte.GetDTE(service); //GetMSDEVFromGIT("VisualStudio.DTE",System.Diagnostics.Process.GetCurrentProcess().Id.ToString());
+			if(dte==null)
+				return "";
+			//EnvDTE.Document doc=dte.ActiveDocument;
+			object doc=dte.GetType().InvokeMember("ActiveDocument",BindingFlags.GetProperty,null,dte, new object []{});
+			if(doc!=null)
+			{
+				//string docPath=doc.Path;
+				string docPath=(string)doc.GetType().InvokeMember("Path",BindingFlags.GetProperty,null,doc, new object []{});
+				if(!docPath.EndsWith("\\"))
+					docPath+="\\";
+				if(System.IO.File.Exists(docPath+definitionName))
+					return docPath;
+			}
+			// Enumerate open documents and try to find our definition in thier path
+			object documents=dte.GetType().InvokeMember("Documents",BindingFlags.GetProperty,null,dte, new object []{});
+			//foreach(EnvDTE.Document doc1 in dte.Documents)
+			int count=(int)documents.GetType().InvokeMember("Count",BindingFlags.GetProperty,null,documents, new object []{});
+			for(int i=1;i<=count;i++)
+			{
+				object doc1=documents.GetType().InvokeMember("Item",BindingFlags.InvokeMethod,null,documents, new object []{i});
+				//string docPath=doc1.Path;
+				string docPath=(string)doc1.GetType().InvokeMember("Path",BindingFlags.GetProperty,null,doc1, new object []{});
+				if(!docPath.EndsWith("\\"))
+					docPath+="\\";
+				if(System.IO.File.Exists(docPath+definitionName))
+					return docPath;
+			}
+			// In need just return project path...
+			return GetProjectPath(service);
+		}
+
+		public static string GetActiveDocumentPath(IServiceProvider service)
+		{
+			// In design-time our document has to be open for definition to be loaded
+			//EnvDTE.DTE dte=GetMSDEVFromGIT("VisualStudio.DTE",System.Diagnostics.Process.GetCurrentProcess().Id.ToString()) as EnvDTE.DTE;
+			//EnvDTE.Document doc=dte.ActiveDocument;
+			object dte=DesignTimeDte.GetDTE(service); //GetMSDEVFromGIT("VisualStudio.DTE",System.Diagnostics.Process.GetCurrentProcess().Id.ToString());
+			if(dte==null)
+				return "";
+			object doc=dte.GetType().InvokeMember("ActiveDocument",BindingFlags.GetProperty,null,dte, new object []{});
+			if(doc!=null)
+			{
+				string docPath=(string)doc.GetType().InvokeMember("Path",BindingFlags.GetProperty,null,doc, new object []{}); //doc.Path;
+				if(!docPath.EndsWith("\\"))
+					docPath+="\\";
+				return docPath;
+			}
+			// In need just return project path...
+			return GetProjectPath(service);
+		}
+
+		public static bool AddFileToProject(string filename, IServiceProvider service)
+		{
+			bool ret=false;
+			object dte=DesignTimeDte.GetDTE(service); //GetMSDEVFromGIT("VisualStudio.DTE",System.Diagnostics.Process.GetCurrentProcess().Id.ToString());
+			if(dte!=null)
+			{
+//				System.Array pjs=dte.GetType().InvokeMember("ActiveSolutionProjects",BindingFlags.GetProperty,null,dte, new object []{}) as System.Array;
+//				if(pjs==null)
+//					return false;
+//
+//				if(pjs.Length>0)
+//				{
+//					object project=pjs.GetValue(0);					
+//				}
+				object itemOperations=dte.GetType().InvokeMember("ItemOperations",BindingFlags.GetProperty,null,dte, new object []{});
+				if(itemOperations!=null)
+				{
+					object projectItem=itemOperations.GetType().InvokeMember("AddExistingItem",BindingFlags.InvokeMethod,null,itemOperations, new object []{filename});
+					if(projectItem!=null)
+					{
+						try
+						{
+							object props=projectItem.GetType().InvokeMember("Properties",BindingFlags.GetProperty,null,projectItem, new object []{});
+							if(props!=null)
+							{
+								object item=props.GetType().InvokeMember("Item",BindingFlags.InvokeMethod,null,props, new object []{"BuildAction"});
+								if(item!=null)
+								{
+									item.GetType().InvokeMember("Value",BindingFlags.SetProperty,null,item, new object []{3});
+									ret=true;
+								}
+							}
+						}
+						catch
+						{
+							ret=true;
+						}
+					}
+				}
+				//EnvDTE.ProjectItem item=dte.ItemOperations.AddExistingItem(filename);
+				//item.Properties.Item("BuildAction").Value=3;
+//				foreach(EnvDTE.Property prop in item.Properties)
+//				{
+//					MessageBox.Show(prop.Name+"  "+prop.Value);
+//				}
+			}
+			return ret;
+		}
+
+        //public static bool DeleteFromProject(string filename, IServiceProvider service)
+        //{
+        //    try
+        //    {
+        //        object dte=DesignTimeDte.GetDTE(service); //GetMSDEVFromGIT("VisualStudio.DTE",System.Diagnostics.Process.GetCurrentProcess().Id.ToString());
+        //        if(dte==null)
+        //            return false;
+
+        //        System.Array pjs=dte.GetType().InvokeMember("ActiveSolutionProjects",BindingFlags.GetProperty,null,dte, new object []{}) as System.Array;
+        //        if(pjs==null)
+        //            return false;
+
+        //        object project=null;
+        //        if(pjs.Length>0)
+        //            project=pjs.GetValue(0);
+        //        if(project==null)
+        //            return false;
+
+        //        object pjItems=project.GetType().InvokeMember("ProjectItems",BindingFlags.GetProperty,null,project, new object []{});
+        //        if(pjItems==null)
+        //            return false;
+
+        //        object pjItem=pjItems.GetType().InvokeMember("Item",BindingFlags.InvokeMethod,null,pjItems, new object []{filename});
+        //        //project.ProjectItems.Item(filename) as EnvDTE.ProjectItem;
+        //        if(pjItem==null)
+        //            return false;
+
+        //        pjItem.GetType().InvokeMember("Delete",BindingFlags.InvokeMethod,null,pjItem, new object []{});
+        //        return true;
+        //    }
+        //    catch(Exception){}
+        //    return false;
+        //}
+
+		public static bool ExistInProject(string filename, IServiceProvider service)
+		{
+//			EnvDTE.DTE dte=GetMSDEVFromGIT("VisualStudio.DTE",System.Diagnostics.Process.GetCurrentProcess().Id.ToString()) as EnvDTE.DTE;
+//			if(dte==null)
+//				return false;
+//			Array projects=dte.ActiveSolutionProjects as Array;
+			object dte=DesignTimeDte.GetDTE(service); //GetMSDEVFromGIT("VisualStudio.DTE",System.Diagnostics.Process.GetCurrentProcess().Id.ToString());
+			if(dte==null)
+				return false;
+
+			System.Array projects=dte.GetType().InvokeMember("ActiveSolutionProjects",BindingFlags.GetProperty,null,dte, new object []{}) as System.Array;
+			if(projects==null)
+				return false;
+			foreach(object pj in projects)
+			{
+				object pji=pj.GetType().InvokeMember("ProjectItems",BindingFlags.GetProperty,null,pj, new object []{});
+				int count=(int)pji.GetType().InvokeMember("Count",BindingFlags.GetProperty,null,pji, new object []{});
+				//foreach(EnvDTE.ProjectItem pi in pj.ProjectItems)
+				for(int i=1;i<=count;i++)
+				{
+					object pi=pji.GetType().InvokeMember("Item",BindingFlags.InvokeMethod,null,pji, new object []{i});
+					if(CheckProjectItem(pi,filename))
+						return true;
+				}
+			}
+			return false;
+		}
+
+		private static bool CheckProjectItem(object pi,string filename)
+		{
+			try
+			{
+				string name=(string)pi.GetType().InvokeMember("Name",BindingFlags.GetProperty,null,pi, new object []{});
+				if(name.ToLower()==filename.ToLower())
+					return true;
+				short fileCount=(short)pi.GetType().InvokeMember("FileCount",BindingFlags.GetProperty,null,pi, new object []{});
+				for(short i=0;i<fileCount;i++)
+				{
+					//string fn=pi.get_FileNames(i);
+					string fn=(string)pi.GetType().InvokeMember("get_FileNames",BindingFlags.GetProperty,null,pi, new object []{i});
+					if(fn.ToLower().EndsWith(filename.ToLower()))
+						return true;
+				}
+				object pji=pi.GetType().InvokeMember("ProjectItems",BindingFlags.GetProperty,null,pi, new object []{});
+				int count=(int)pji.GetType().InvokeMember("Count",BindingFlags.GetProperty,null,pji, new object []{});
+				for(int i=1;i<=count;i++)
+				//foreach(EnvDTE.ProjectItem item in pi.ProjectItems)
+				{
+					object pItem=pji.GetType().InvokeMember("Item",BindingFlags.InvokeMethod,null,pji, new object []{i});
+					if(CheckProjectItem(pItem,filename))
+						return true;
+				}
+			}
+			catch(Exception){}
+			return false;
+		}
+
+		public static bool ExistInProject2(string filename, IServiceProvider service)
+		{
+			try
+			{
+				object dte=DesignTimeDte.GetDTE(service); //GetMSDEVFromGIT("VisualStudio.DTE",System.Diagnostics.Process.GetCurrentProcess().Id.ToString());
+				if(dte==null)
+					return false;
+
+				System.Array pjs=dte.GetType().InvokeMember("ActiveSolutionProjects",BindingFlags.GetProperty,null,dte, new object []{}) as System.Array;
+				if(pjs==null)
+					return false;
+
+				object project=null;
+				if(pjs.Length>0)
+					project=pjs.GetValue(0);
+				if(project==null)
+					return false;
+
+				object pjItems=project.GetType().InvokeMember("ProjectItems",BindingFlags.GetProperty,null,project, new object []{});
+				if(pjItems==null)
+					return false;
+
+				object pjItem=pjItems.GetType().InvokeMember("Item",BindingFlags.InvokeMethod,null,pjItems, new object []{filename});
+				if(pjItem==null)
+					return false;
+			}
+			catch(Exception)
+			{
+				return false;
+			}
+
+			return true;
+		}
+
+		public static bool CheckOutFile(string filename, IServiceProvider service)
+		{
+			try
+			{
+				object dte=DesignTimeDte.GetDTE(service); //GetMSDEVFromGIT("VisualStudio.DTE",System.Diagnostics.Process.GetCurrentProcess().Id.ToString());
+				if(dte==null)
+					return false;
+				object sctrl=dte.GetType().InvokeMember("SourceControl",BindingFlags.GetProperty,null,dte, new object []{});
+				if(sctrl==null)
+				{
+					return false;
+				}
+				object res=sctrl.GetType().InvokeMember("IsItemUnderSCC",BindingFlags.InvokeMethod,null,sctrl, new object []{filename});
+				if(res!=null && res is bool && (bool)res==true)
+				{
+					res=sctrl.GetType().InvokeMember("CheckOutItem",BindingFlags.InvokeMethod,null,sctrl, new object []{filename});
+					if(res!=null && res is bool)
+						return (bool)res;
+					else
+						return false;
+				}
+				return true;
+			}
+			catch(Exception){}
+            return false;
+		}
+
+		public static object GetDTE(IServiceProvider service)
+		{
+			object dte=GetMSDEVFromGIT("VisualStudio.DTE",System.Diagnostics.Process.GetCurrentProcess().Id.ToString());
+			if(dte==null)
+				dte=GetMSDEVFromGIT(".DTE",System.Diagnostics.Process.GetCurrentProcess().Id.ToString());
+			if(dte==null && service!=null)
+			{
+				Assembly[] loadedAssemblies = AppDomain.CurrentDomain.GetAssemblies();
+				foreach (Assembly a in loadedAssemblies)
+				{
+					if (a.FullName.ToLower().StartsWith("envdte"))
+					{
+						Type t=a.GetType("EnvDTE._DTE", false, true);
+						if (t != null)
+						{
+							dte=service.GetService(t);
+							break;
+						}
+					}
+				}
+			}
+			return dte;
+		}
+
+#if FRAMEWORK20
+		[DllImport("ole32.dll")]		
+		public static extern int GetRunningObjectTable(int reserved, out 
+			System.Runtime.InteropServices.ComTypes.IRunningObjectTable prot);
+        [DllImport("ole32.dll")]
+        public static extern int CreateBindCtx(int reserved, out System.Runtime.InteropServices.ComTypes.IBindCtx
+            ppbc);
+
+        [STAThread]
+        public static object GetMSDEVFromGIT(string strProgID, string processId)
+        {
+            System.Runtime.InteropServices.ComTypes.IRunningObjectTable prot;
+            System.Runtime.InteropServices.ComTypes.IEnumMoniker pMonkEnum;
+            try
+            {
+                GetRunningObjectTable(0, out prot);
+                prot.EnumRunning(out pMonkEnum);
+                pMonkEnum.Reset();          // Churn through enumeration.				
+                IntPtr fetched=IntPtr.Zero;
+                System.Runtime.InteropServices.ComTypes.IMoniker[] pmon = new System.Runtime.InteropServices.ComTypes.IMoniker[1];
+                while (pMonkEnum.Next(1, pmon, fetched) == 0)
+                {
+                    System.Runtime.InteropServices.ComTypes.IBindCtx pCtx;
+                    CreateBindCtx(0, out pCtx);
+                    string str;
+                    pmon[0].GetDisplayName(pCtx, null, out str);
+                    //					#if DEBUG
+                    //					System.Windows.Forms.MessageBox.Show(str+"   strProgId="+strProgID+"  processId="+processId);
+                    //					#endif
+                    if (str.IndexOf(strProgID) > 0 && (str.IndexOf(":" + processId) > 0 || processId == ""))
+                    {
+                        object objReturnObject;
+                        prot.GetObject(pmon[0], out objReturnObject);
+                        object ide = (object)objReturnObject;
+                        return ide;
+                    }
+                }
+            }
+            catch
+            {
+                return null;
+            }
+            return null;
+        }
+#else
+        [DllImport("ole32.dll")]		
+		public static extern int GetRunningObjectTable(int reserved, out 
+			UCOMIRunningObjectTable prot);	
+        [DllImport("ole32.dll")]		
+		public static extern int  CreateBindCtx(int reserved, out UCOMIBindCtx 
+			ppbc);
+
+         [STAThread]		
+		public static object GetMSDEVFromGIT(string strProgID, string processId)		
+		{			
+			UCOMIRunningObjectTable prot;			
+			UCOMIEnumMoniker pMonkEnum;			
+			try			
+			{				
+				GetRunningObjectTable(0,out prot);				
+				prot.EnumRunning(out pMonkEnum);				
+				pMonkEnum.Reset();          // Churn through enumeration.				
+				int fetched;				
+				UCOMIMoniker []pmon = new UCOMIMoniker[1];				
+				while(pMonkEnum.Next(1, pmon, out fetched) == 0) 				
+				{					
+					UCOMIBindCtx pCtx;					
+					CreateBindCtx(0, out pCtx);					
+					string str;					
+					pmon[0].GetDisplayName(pCtx,null,out str);
+//					#if DEBUG
+//					System.Windows.Forms.MessageBox.Show(str+"   strProgId="+strProgID+"  processId="+processId);
+//					#endif
+					if(str.IndexOf(strProgID)>0 && (str.IndexOf(":"+processId)>0 || processId==""))
+					{		
+						object objReturnObject;		
+						prot.GetObject(pmon[0],out objReturnObject);	
+						object ide = (object)objReturnObject;		
+						return ide;		
+					}		
+				}	
+			}	
+			catch	
+			{	
+				return null;	
+			}
+			return null;	
+		}
+#endif
+
+
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevCoLicenseProvider.cs b/PROMS/DotNetBar Source Code/DevCoLicenseProvider.cs
new file mode 100644
index 00000000..95fe6534
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevCoLicenseProvider.cs	
@@ -0,0 +1,221 @@
+using System;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Security.Cryptography;
+using System.Windows.Forms;
+namespace DevComponents.DotNetBar
+{
+	[System.ComponentModel.ToolboxItem(false),System.ComponentModel.DesignTimeVisible(false)]
+	public class DevCoLicenseProvider:LicenseProvider
+	{
+		const string DOTNETBAR="dotnetbar";
+		public DevCoLicenseProvider()
+		{
+		}
+		public override License GetLicense(LicenseContext context,Type type,object instance,bool allowExceptions)
+		{
+			DevCoLicense lic = null;
+			Debug.Assert(context!=null, "No context provided!");
+			#if !TRIAL
+			//if no context is provided, do nothing
+			if (context != null) 
+			{
+				//if this control is in runtime mode
+				if (context.UsageMode == LicenseUsageMode.Runtime) 
+				{
+					//retreive the stored license key
+					string key = context.GetSavedLicenseKey(type, null);
+					//check if the stored license key is null
+					// and call IsKeyValid to make sure its valid
+					if (key != null && IsKeyValid2(key, type)) 
+					{
+						//if the key is valid create a new license
+						lic = new DevCoLicense(key);
+					}
+					else
+					{
+						try
+						{
+							System.Reflection.Assembly[] assemblies=System.AppDomain.CurrentDomain.GetAssemblies();
+							foreach(System.Reflection.Assembly a in assemblies)
+							{
+								string codeBase = a.CodeBase;
+								codeBase = codeBase.Substring(codeBase.LastIndexOf("/") + 1)+".licenses";
+								System.IO.Stream stream=this.GetManifestResourceStream(a,codeBase);
+								if(stream==null)
+									codeBase=codeBase.Replace(".DLL.",".dll.");
+								stream=this.GetManifestResourceStream(a,codeBase);
+								if(stream!=null)
+								{
+									key=DeserializeLicenseKey(stream);
+									if (key != null && key!="") //IsKeyValid2(key, type)) 
+									{
+										lic = new DevCoLicense(key);
+										break;
+									}
+								}
+							}
+						}
+						catch
+						{
+							lic=new DevCoLicense("");
+						}
+					}
+				}
+				else
+				{
+					string sKey="";
+					Microsoft.Win32.RegistryKey regkey=Microsoft.Win32.Registry.LocalMachine;
+					regkey=regkey.OpenSubKey("Software\\DevComponents\\Licenses",false);
+					if(regkey!=null)
+					{
+						sKey=regkey.GetValue("DevComponents.DotNetBar.DotNetBarManager2").ToString();
+					}
+					//check if the key is valid
+					if (IsKeyValid(sKey, type)) 
+					{
+						//valid key so create a new License
+						lic = new DevCoLicense(Key(type));
+					}
+
+					//if we managed to create a license, stuff it into the context
+					if (lic != null) 
+					{
+						context.SetSavedLicenseKey(type, lic.LicenseKey);
+					}
+				}
+			}
+			#else
+			if (context != null) 
+			{
+				lic=new DevCoLicense("");
+				//if this control is in runtime mode
+				if (context.UsageMode == LicenseUsageMode.Runtime) 
+				{
+					RemindForm frm=new RemindForm();
+					frm.ShowDialog();
+				}
+				else
+				{
+					context.SetSavedLicenseKey(type, lic.LicenseKey);
+				}
+			}
+			#endif
+
+			if(lic==null && context!=null)
+			{
+				RemindForm frm=new RemindForm();
+				frm.ShowDialog();
+				lic=new DevCoLicense("");
+			}
+			return lic;
+			
+		}
+
+		private System.IO.Stream GetManifestResourceStream(System.Reflection.Assembly a, string resourceName)
+		{
+			resourceName=resourceName.ToLower();
+			string[] resources=a.GetManifestResourceNames();
+			foreach(string name in resources)
+			{
+				if(name.ToLower()==resourceName)
+				{
+					return a.GetManifestResourceStream(name);
+					//break;
+				}
+			}
+			return null;
+		}
+
+		private string DeserializeLicenseKey(System.IO.Stream o)
+		{
+			System.Runtime.Serialization.IFormatter formatter1;
+			object obj1=null;
+			object[] array1;
+			formatter1 = new System.Runtime.Serialization.Formatters.Binary.BinaryFormatter();
+			try
+			{
+				obj1 = formatter1.Deserialize(o);
+			
+				if((obj1 as object[]) == null)
+					return null;
+				array1 = ((object[]) obj1);
+				if((array1[0] as string) == null)
+					return null;
+				
+				System.Collections.Hashtable h=((System.Collections.Hashtable)array1[1]);
+				
+				//Type t=typeof(DotNetBarManager);
+				string s=DOTNETBAR;
+				foreach(System.Collections.DictionaryEntry entry in h)
+				{
+					string key=entry.Key.ToString().ToLower();
+					if(key.IndexOf(s)>=0)
+						return entry.Value as string;
+				}
+			}
+			catch{}
+			return null;
+ 		}
+
+		#if !TRIAL
+		private bool IsKeyValid2(string key, Type type)
+		{
+			if(key==null || key=="")
+				return false;
+			
+			return (Key(type)==key);
+		}
+
+		internal static string Key(Type type)
+		{
+			Byte[] bi=(new System.Text.UnicodeEncoding()).GetBytes(type.ToString());
+			byte[] res;
+			SHA256 shaM = new SHA256Managed(); 
+			res = shaM.ComputeHash(bi);
+			System.Text.StringBuilder sb=new System.Text.StringBuilder();
+			System.IO.StringWriter sw=new System.IO.StringWriter(sb);
+			System.Xml.XmlTextWriter xt=new System.Xml.XmlTextWriter(sw);
+			xt.WriteBase64(res,0,(int)res.Length);
+			xt.Close();
+			return sb.ToString();
+		}
+
+		private bool IsKeyValid(string key, Type type)
+		{
+			if(key==null || key=="")
+				return false;
+//			Byte[] bi=(new System.Text.UnicodeEncoding()).GetBytes(type.ToString()+System.Windows.Forms.SystemInformation.ComputerName);
+//			byte[] res;
+//			SHA256 shaM = new SHA256Managed(); 
+//			res = shaM.ComputeHash(bi);
+//
+//			System.Text.StringBuilder sb=new System.Text.StringBuilder();
+//			System.IO.StringWriter sw=new System.IO.StringWriter(sb);
+//			System.Xml.XmlTextWriter xt=new System.Xml.XmlTextWriter(sw);
+//			xt.WriteBase64(res,0,(int)res.Length);
+//			xt.Close();
+			return ("F962CEC7-CD8F-4911-A9E9-CAB39962FC1F"==key);
+		}
+		#endif
+	}
+	internal class DevCoLicense:License 
+	{
+		private string key;        
+		public DevCoLicense(string key) 
+		{
+			this.key = key;
+		}
+		public override string LicenseKey 
+		{ 
+			get 
+			{
+				return key;
+			}
+		}
+		public override void Dispose() 
+		{
+		}
+	}
+
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/App.config b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/App.config
new file mode 100644
index 00000000..343984d0
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/App.config	
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+    <startup> 
+        
+    <supportedRuntime version="v2.0.50727"/></startup>
+</configuration>
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/AxisListTypeEditor.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/AxisListTypeEditor.cs
new file mode 100644
index 00000000..71bb10a7
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/AxisListTypeEditor.cs	
@@ -0,0 +1,116 @@
+using System;
+using System.ComponentModel;
+using System.Drawing.Design;
+using System.Windows.Forms;
+using System.Windows.Forms.Design;
+using DevComponents.DotNetBar.Charts;
+
+namespace DevComponents.Charts.Design
+{
+    public class AxisListTypeEditor : UITypeEditor
+    {
+        #region Private variables
+
+        IWindowsFormsEditorService _EditorService;
+
+        #endregion
+
+        #region GetEditStyle
+
+        public override UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext context)
+        {
+            return (UITypeEditorEditStyle.DropDown);
+        }
+
+        #endregion
+
+        #region GetPaintValueSupported
+
+        public override bool GetPaintValueSupported(ITypeDescriptorContext context)
+        {
+            return (false);
+        }
+
+        #endregion
+
+        #region EditValue
+
+        public override object EditValue(
+            ITypeDescriptorContext context, IServiceProvider provider, object value)
+        {
+            _EditorService =
+                provider.GetService(typeof (IWindowsFormsEditorService)) as IWindowsFormsEditorService;
+
+            if (_EditorService != null)
+            {
+                ChartSeries series = context.Instance as ChartSeries;
+
+                if (series != null)
+                {
+                    ChartXy chartXy = series.Parent as ChartXy;
+
+                    if (chartXy != null)
+                    {
+                        ListBox lb = new ListBox();
+                        lb.Dock = DockStyle.Fill;
+                        lb.BorderStyle = BorderStyle.None;
+
+                        lb.MouseClick += ListBoxMouseClick;
+
+                        lb.Items.Add("NotSet");
+
+                        if (context.PropertyDescriptor.Name.Equals("AxisX") == true)
+                            return (EditValueEx(lb, chartXy.AncillaryAxesX, value));
+
+                        return (EditValueEx(lb, chartXy.AncillaryAxesY, value));
+                    }
+                }
+            }
+
+            return (base.EditValue(context, provider, value));
+        }
+
+        private object EditValueEx(ListBox lb, ChartAxesCollection axes, object value)
+        {
+            for (int i = 0; i < axes.Count; i++)
+            {
+                ChartAxis axis = axes[i];
+
+                string s = GetAxisText(axis, i);
+
+                lb.Items.Add(s);
+            }
+
+            _EditorService.DropDownControl(lb);
+
+            if (lb.SelectedIndex >= 0)
+            {
+                if (lb.SelectedIndex == 0)
+                    return (null);
+
+                ChartAxis axis = axes[lb.SelectedIndex - 1];
+
+                return (axis);
+            }
+
+            return (value);
+        }
+
+        private string GetAxisText(ChartAxis axis, int index)
+        {
+            string s = index + " ";
+
+            if (string.IsNullOrEmpty(axis.Name) == false)
+                return (s + "-" + axis.Name);
+
+            return (s + "-" + "(No Name)");
+        }
+
+        private void ListBoxMouseClick(object sender, MouseEventArgs e)
+        {
+            _EditorService.CloseDropDown();
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/AxisReferenceCollectionEditor.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/AxisReferenceCollectionEditor.cs
new file mode 100644
index 00000000..990a07c7
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/AxisReferenceCollectionEditor.cs	
@@ -0,0 +1,111 @@
+using System;
+using System.ComponentModel;
+using System.ComponentModel.Design;
+using DevComponents.DotNetBar.Charts;
+
+namespace DevComponents.Charts.Design
+{
+    public class AxisReferenceCollectionEditor : BaseCollectionEditor
+    {
+        #region Private variables
+
+        private ChartAxis _ChartAxis;
+
+        #endregion
+
+        public AxisReferenceCollectionEditor(Type type)
+            : base(type)
+        {
+        }
+
+        #region EditValue
+
+        public override object EditValue(
+            ITypeDescriptorContext context, IServiceProvider provider, object value)
+        {
+            _ChartAxis = context.Instance as ChartAxis;
+
+            IComponentChangeService cs = BeforeEditValue(context);
+
+            object retval = value;
+
+            try
+            {
+                retval = base.EditValue(context, provider, value);
+            }
+            finally
+            {
+                AfterEditValue(context, cs);
+            }
+
+            return (retval);
+        }
+
+        #endregion
+
+        #region CreateInstance
+
+        protected override object CreateInstance(Type itemType)
+        {
+            if (itemType == typeof(ReferenceLine))
+            {
+                ReferenceLine line = (ReferenceLine)base.CreateInstance(itemType);
+
+                line.Name = _ChartAxis.ReferenceLines.GetUniqueName();
+
+                if (_ChartAxis != null)
+                    line.AxisValue = _ChartAxis.ActualMinValue;
+
+                return (line);
+            }
+
+            return (base.CreateInstance(itemType));
+        }
+
+        #endregion
+
+        #region CopyButton_Click
+
+        protected override void CopyButton_Click(object sender, EventArgs e)
+        {
+            ReferenceLine item = ChartItem as ReferenceLine;
+
+            if (item != null)
+            {
+                if (AddButton != null)
+                {
+                    ChartControlDesigner ccd = GetDesigner(_ChartAxis.ChartControl);
+
+                    ccd.InCopyItem = true;
+
+                    try
+                    {
+                        AddButton.PerformClick();
+
+                        ReferenceLineCollection rlc = _ChartAxis.ReferenceLines;
+                        ReferenceLine clone = rlc[rlc.Count - 1];
+
+                        string name = clone.Name;
+                        item.CopyTo(clone);
+                        clone.Name = name;
+                    }
+                    finally
+                    {
+                        ccd.InCopyItem = false;
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region CreateCollectionItemType
+
+        protected override Type CreateCollectionItemType()
+        {
+            return typeof(ReferenceLine);
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/AxisStripeCollectionEditor.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/AxisStripeCollectionEditor.cs
new file mode 100644
index 00000000..899c982b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/AxisStripeCollectionEditor.cs	
@@ -0,0 +1,115 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.ComponentModel.Design;
+using System.ComponentModel.Design.Serialization;
+using System.Globalization;
+using System.Reflection;
+using DevComponents.DotNetBar.Charts;
+
+namespace DevComponents.Charts.Design
+{
+    public class AxisStripeCollectionEditor : BaseCollectionEditor
+    {
+        #region Private variables
+
+        private ChartAxis _ChartAxis;
+
+        #endregion
+
+        public AxisStripeCollectionEditor(Type type)
+            : base(type)
+        {
+        }
+
+        #region EditValue
+
+        public override object EditValue(
+            ITypeDescriptorContext context, IServiceProvider provider, object value)
+        {
+            _ChartAxis = context.Instance as ChartAxis;
+
+            IComponentChangeService cs = BeforeEditValue(context);
+
+            object retval = value;
+
+            try
+            {
+                retval = base.EditValue(context, provider, value);
+            }
+            finally
+            {
+                AfterEditValue(context, cs);
+            }
+
+            return (retval);
+        }
+        
+        #endregion
+
+        #region CreateInstance
+
+        protected override object CreateInstance(Type itemType)
+        {
+            if (itemType == typeof(AxisStripe))
+            {
+                AxisStripe stripe = (AxisStripe)base.CreateInstance(itemType);
+
+                stripe.Name = _ChartAxis.AxisStripes.GetUniqueName();
+
+                stripe.MinValue = _ChartAxis.ActualMinValue;
+                stripe.MaxValue = _ChartAxis.ActualMaxValue;
+
+                return (stripe);
+            }
+
+            return (base.CreateInstance(itemType));
+        }
+
+        #endregion
+
+        #region CopyButton_Click
+
+        protected override void CopyButton_Click(object sender, EventArgs e)
+        {
+            AxisStripe item = ChartItem as AxisStripe;
+
+            if (item != null)
+            {
+                if (AddButton != null)
+                {
+                    ChartControlDesigner ccd = GetDesigner(_ChartAxis.ChartControl);
+
+                    ccd.InCopyItem = true;
+
+                    try
+                    {
+                        AddButton.PerformClick();
+
+                        AxisStripeCollection asc = _ChartAxis.AxisStripes;
+                        AxisStripe clone = asc[asc.Count - 1];
+
+                        string name = clone.Name;
+                        item.CopyTo(clone);
+                        clone.Name = name;
+                    }
+                    finally
+                    {
+                        ccd.InCopyItem = false;
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region CreateCollectionItemType
+
+        protected override Type CreateCollectionItemType()
+        {
+            return typeof(AxisStripe);
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/BaseCollectionEditor.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/BaseCollectionEditor.cs
new file mode 100644
index 00000000..d682a261
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/BaseCollectionEditor.cs	
@@ -0,0 +1,383 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.ComponentModel.Design;
+using System.Drawing;
+using System.Reflection;
+using System.Resources;
+using System.Windows.Forms;
+using DevComponents.Charts.Design.Properties;
+using DevComponents.DotNetBar.Charts;
+
+namespace DevComponents.Charts.Design
+{
+    public class BaseCollectionEditor : CollectionEditor
+    {
+        #region Static variables
+
+        static Size _lastSize = Size.Empty;
+        static Point _lastLoc = Point.Empty;
+
+        #endregion
+
+        #region Private variables
+        
+        private ListBox _ListBox;
+        private object _ChartItem;
+        private object _LastChartItem;
+        private PropertyGrid _PropertyGrid;
+
+        private Button _AddButton;
+        private Button _RemButton;
+        private Button _CopyButton;
+        private ToolTip _ToolTip;
+
+        private List<object> _RemovedItems;
+
+        private bool _EditCancelled;
+        private bool _ComponentChanged;
+
+        #endregion
+
+        private ChartControlDesigner _ControlDesigner;
+ 
+        public BaseCollectionEditor(Type type)
+            : base(type)
+        {
+        }
+
+        #region Protected properties
+
+        protected Button AddButton
+        {
+            get { return (_AddButton); }
+        }
+
+        protected object ChartItem
+        {
+            get { return (_ChartItem); }
+            set { _ChartItem = value; }
+        }
+
+        protected bool ComponentChanged
+        {
+            get { return (_ComponentChanged); }
+        }
+
+        protected bool EditCancelled
+        {
+            get { return (_EditCancelled); }
+        }
+
+        protected ListBox ListBox
+        {
+            get { return (_ListBox); }
+        }
+
+        #endregion
+
+        #region Private properties
+
+        #region RemovedItems
+
+        private List<object> RemovedItems
+        {
+            get
+            {
+                if (_RemovedItems == null)
+                    _RemovedItems = new List<object>();
+
+                return (_RemovedItems);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region CreateCollectionForm
+
+        protected override CollectionForm CreateCollectionForm()
+        {
+            _EditCancelled = false;
+
+            CollectionForm collectionForm = base.CreateCollectionForm();
+
+            _ChartItem = null;
+
+            if (collectionForm.Controls[0] is TableLayoutPanel)
+            {
+                TableLayoutPanel tlpf = collectionForm.Controls["overArchingTableLayoutPanel"] as TableLayoutPanel;
+
+                if (tlpf != null)
+                {
+                    TableLayoutPanel tlp2 = tlpf.Controls["addRemoveTableLayoutPanel"] as TableLayoutPanel;
+
+                    if (tlp2 != null)
+                    {
+                        _RemButton = tlp2.Controls["removeButton"] as Button;
+
+                        if (_RemButton != null)
+                            _RemButton.Click += CollectionEditor_RemoveClick;
+
+                        _AddButton = tlp2.Controls["addButton"] as Button;
+
+                        if (_AddButton != null)
+                        {
+                            _AddButton.Click += CollectionEditor_AddClick;
+
+                            AddCopyButton(collectionForm);
+                        }
+                    }
+
+                    _ListBox = tlpf.Controls["listbox"] as ListBox;
+
+                    if (_ListBox != null)
+                        _ListBox.SelectedIndexChanged += ListBox_SelectedIndexChanged;
+
+                    _PropertyGrid = tlpf.Controls["propertyBrowser"] as PropertyGrid;
+
+                    if (_PropertyGrid != null)
+                        _PropertyGrid.HelpVisible = true;
+                }
+            }
+
+            collectionForm.Load += CollectionFormLoad;
+            collectionForm.Resize += CollectionFormResize;
+            collectionForm.LocationChanged += CollectionFormLocationChanged;
+
+            return (collectionForm);
+        }
+
+        #region CollectionFormLoad
+
+        void CollectionFormLoad(object sender, EventArgs e)
+        {
+            CollectionForm form = sender as CollectionForm;
+
+            if (form != null)
+            {
+                if (_lastSize != Size.Empty)
+                    form.Size = _lastSize;
+
+                if (_lastLoc != Point.Empty)
+                    form.Location = _lastLoc;
+            }
+        }
+
+        #endregion
+
+        #region CollectionFormResize
+
+        void CollectionFormResize(object sender, EventArgs e)
+        {
+            CollectionForm form = sender as CollectionForm;
+
+            if (form != null && form.Visible == true)
+                _lastSize = form.Size;
+        }
+
+        #endregion
+
+        #region CollectionFormLocationChanged
+
+        void CollectionFormLocationChanged(object sender, EventArgs e)
+        {
+            CollectionForm form = sender as CollectionForm;
+
+            if (form != null && form.Visible == true)
+                _lastLoc = form.Location;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region AddCopyButton
+
+        private void AddCopyButton(CollectionForm collectionForm)
+        {
+            _CopyButton = new Button();
+
+            _CopyButton.Size = new Size(24, 24);
+            _CopyButton.Enabled = false;
+            _CopyButton.Click += CopyButton_Click;
+
+            ResourceManager rm = Resources.ResourceManager;
+            _CopyButton.Image = (Image)rm.GetObject("Copy");
+
+            collectionForm.Controls.Add(_CopyButton);
+
+            _CopyButton.Location = new Point(204, 85);
+            _CopyButton.BringToFront();
+
+            _ToolTip = new ToolTip();
+            _ToolTip.SetToolTip(_CopyButton, "Clone the selected item");
+        }
+
+        #endregion
+
+        #region CopyButton_Click
+
+        protected virtual void CopyButton_Click(object sender, EventArgs e)
+        {
+        }
+
+        #endregion
+
+        #region ListBox_SelectedIndexChanged
+
+        void ListBox_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            if (_ListBox.SelectedItem != null)
+            {
+                PropertyInfo p = _ListBox.SelectedItem.GetType().GetProperty("Value");
+
+                _LastChartItem = _ChartItem;
+                _ChartItem = p.GetValue(_ListBox.SelectedItem, null);
+
+                _CopyButton.Enabled = true;
+            }
+            else
+            {
+                _CopyButton.Enabled = false;
+            }
+        }
+
+        #endregion
+
+        #region CollectionEditor_AddClick
+
+        protected virtual void CollectionEditor_AddClick(object sender, EventArgs e)
+        {
+        }
+
+        #endregion
+
+        #region CollectionEditor_RemoveClick
+
+        protected virtual void CollectionEditor_RemoveClick(object sender, EventArgs e)
+        {
+            if (_LastChartItem != null)
+            {
+                RemovedItems.Add(_LastChartItem);
+
+                if (_LastChartItem is ChartVisualElement)
+                    ((ChartVisualElement)_LastChartItem).Visible = false;
+
+                else if (_LastChartItem is SeriesPoint)
+                    ((SeriesPoint)_LastChartItem).Visible = false;
+
+                _LastChartItem = null;
+            }
+            else if (_ChartItem != null)
+            {
+                RemovedItems.Add(_ChartItem);
+
+                if (_ChartItem is ChartVisualElement)
+                    ((ChartVisualElement)_ChartItem).Visible = false;
+
+                else if (_LastChartItem is SeriesPoint)
+                    ((SeriesPoint)_LastChartItem).Visible = false;
+
+                _ChartItem = null;
+            }
+        }
+
+        #endregion
+
+        #region CancelChanges
+
+        protected override void CancelChanges()
+        {
+            _EditCancelled = true;
+
+            if (_RemovedItems != null)
+            {
+                foreach (object item in _RemovedItems)
+                {
+                    if (item is ChartVisualElement)
+                        ((ChartVisualElement)item).Visible = true;
+
+                    else if (item is SeriesPoint)
+                        ((SeriesPoint)item).Visible = true;
+                }
+            }
+
+            ChartVisualElement cve = _ChartItem as ChartVisualElement;
+
+            if (cve != null)
+                cve.InvalidateLayout();
+
+            base.CancelChanges();
+        }
+
+        #endregion
+
+        #region BeforeEditValue
+
+        protected IComponentChangeService BeforeEditValue(ITypeDescriptorContext context)
+        {
+            ChartVisualElement cve = context.Instance as ChartVisualElement;
+
+            if (cve != null)
+            {
+                ISite site = cve.ChartControl.Site;
+                IComponentChangeService cs = (IComponentChangeService)site.GetService(typeof(IComponentChangeService));
+
+                if (cs != null)
+                    cs.ComponentChanged += cs_ComponentChanged;
+
+                return (cs);
+            }
+
+            return (null);
+        }
+
+        void cs_ComponentChanged(object sender, ComponentChangedEventArgs e)
+        {
+            _ComponentChanged = true;
+        }
+
+        #endregion
+
+        #region AfterEditValue
+
+        protected void AfterEditValue(ITypeDescriptorContext context, IComponentChangeService cs)
+        {
+            if (cs != null)
+                cs.ComponentChanged -= cs_ComponentChanged;
+
+            if (_ComponentChanged == true)
+            {
+                ChartContainer chCont = ((ChartVisualElement)context.Instance).ParentChartContainer;
+
+                if (chCont != null)
+                {
+                    PropertyDescriptorCollection pdc = TypeDescriptor.GetProperties(chCont);
+                    PropertyDescriptor pd = pdc["Name"];
+
+                    cs.OnComponentChanged(chCont, pd, null, null);
+                }
+            }
+        }
+
+        #endregion
+
+        #region GetDesigner
+
+        internal ChartControlDesigner GetDesigner(IComponent component)
+        {
+            if (_ControlDesigner == null)
+            {
+                IDesignerHost dh = (IDesignerHost)GetService(typeof(IDesignerHost));
+
+                _ControlDesigner = dh.GetDesigner(component) as ChartControlDesigner;
+            }
+
+            return (_ControlDesigner);
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/ChartAxesCollectionEditor.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/ChartAxesCollectionEditor.cs
new file mode 100644
index 00000000..bc5feeb6
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/ChartAxesCollectionEditor.cs	
@@ -0,0 +1,94 @@
+using System;
+using System.ComponentModel;
+using DevComponents.DotNetBar.Charts;
+
+namespace DevComponents.Charts.Design
+{
+    public class ChartAxesCollectionEditor : BaseCollectionEditor
+    {
+        #region Private variables
+
+        private ChartXy _ChartXy;
+        private Type _CollectionType;
+
+        #endregion
+
+        public ChartAxesCollectionEditor(Type type)
+            : base(type)
+        {
+            _CollectionType = type;
+        }
+
+        #region EditValue
+
+        public override object EditValue(
+            ITypeDescriptorContext context, IServiceProvider provider, object value)
+        {
+            _ChartXy = context.Instance as ChartXy;
+
+            return (base.EditValue(context, provider, value));
+        }
+
+        #endregion
+
+        #region CreateInstance
+
+        protected override object CreateInstance(Type itemType)
+        {
+            ChartAxis axis = (ChartAxis)base.CreateInstance(itemType);
+
+            axis.Name = (_CollectionType == typeof(ChartAxesXCollection))
+                ? _ChartXy.AncillaryAxesX.GetUniqueName() : _ChartXy.AncillaryAxesY.GetUniqueName();
+
+            return (axis);
+        }
+
+        #endregion
+
+        #region CopyButton_Click
+
+        protected override void CopyButton_Click(object sender, EventArgs e)
+        {
+            ChartAxis item = ChartItem as ChartAxis;
+
+            if (item != null)
+            {
+                if (AddButton != null)
+                {
+                    AddButton.PerformClick();
+
+                    if (_CollectionType == typeof(ChartAxesXCollection))
+                    {
+                        ChartAxesXCollection cac = _ChartXy.AncillaryAxesX;
+                        ChartAxis clone = cac[cac.Count - 1];
+
+                        string name = clone.Name;
+                        item.CopyTo(clone);
+                        clone.Name = name;
+                    }
+                    else
+                    {
+                        ChartAxesYCollection cac = _ChartXy.AncillaryAxesY;
+                        ChartAxis clone = cac[cac.Count - 1];
+
+                        item.CopyTo(clone);
+
+                        clone.Name = cac.GetUniqueName();
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region CreateCollectionItemType
+
+        protected override Type CreateCollectionItemType()
+        {
+            return (_CollectionType == typeof(ChartAxesXCollection)
+                ? typeof(ChartAxisX) : typeof(ChartAxisY));
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/ChartContainerCollectionEditor.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/ChartContainerCollectionEditor.cs
new file mode 100644
index 00000000..e85d8e43
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/ChartContainerCollectionEditor.cs	
@@ -0,0 +1,174 @@
+using System;
+using System.ComponentModel;
+using System.ComponentModel.Design;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Reflection;
+using DevComponents.DotNetBar.Charts;
+using DevComponents.DotNetBar.Charts.Style;
+
+namespace DevComponents.Charts.Design
+{
+    public class ChartContainerCollectionEditor : BaseCollectionEditor
+    {
+        #region Private variables
+
+        private ChartPanel _ChartPanel;
+
+        #endregion
+
+        public ChartContainerCollectionEditor(Type type)
+            : base(type)
+        {
+        }
+
+        #region EditValue
+
+        public override object EditValue(
+            ITypeDescriptorContext context, IServiceProvider provider, object value)
+        {
+            _ChartPanel = context.Instance as ChartPanel;
+
+            object retval = base.EditValue(context, provider, value);
+
+            return (retval);
+        }
+
+        #endregion
+
+        #region CreateInstance
+
+        protected override object CreateInstance(Type itemType)
+        {
+            if (itemType == typeof(ChartXy))
+            {
+                ChartXy chartXy = (ChartXy)base.CreateInstance(itemType);
+
+                if (_ChartPanel != null)
+                    chartXy.Name = _ChartPanel.ChartContainers.GetUniqueName("ChartXy");
+
+                SetChartDefaults(chartXy);
+
+                return (chartXy);
+            }
+
+            if (itemType == typeof(PieChart))
+            {
+                PieChart pieChart = (PieChart)base.CreateInstance(itemType);
+
+                if (_ChartPanel != null)
+                    pieChart.Name = _ChartPanel.ChartContainers.GetUniqueName("PieChart");
+
+                SetChartDefaults(pieChart);
+
+                return (pieChart);
+            }
+
+            if (itemType == typeof(ChartPanel))
+            {
+                ChartPanel panel = (ChartPanel)base.CreateInstance(itemType);
+
+                if (_ChartPanel != null)
+                    panel.Name = _ChartPanel.ChartContainers.GetUniqueName("ChartPanel");
+
+                SetPanelDefaults(panel);
+
+                return (panel);
+            }
+
+            return (base.CreateInstance(itemType));
+        }
+
+        private void SetPanelDefaults(ChartPanel panel)
+        {
+            panel.ContainerVisualStyles.Default.BorderThickness = new Thickness(1);
+            panel.ContainerVisualStyles.Default.BorderColor = new BorderColor(Color.Black);
+            panel.ContainerVisualStyles.Default.Background = new Background(Color.Gray);
+            panel.ContainerVisualStyles.Default.Margin = new Padding(4);
+        }
+
+        private void SetChartDefaults(ChartXy chartXy)
+        {
+            chartXy.ContainerVisualStyles.Default.BorderThickness = new Thickness(1);
+            chartXy.ContainerVisualStyles.Default.BorderColor = new BorderColor(Color.Black);
+            chartXy.ContainerVisualStyles.Default.Background = new Background(Color.White);
+            chartXy.ContainerVisualStyles.Default.Margin = new Padding(4);
+        }
+
+        private void SetChartDefaults(PieChart pieChart)
+        {
+            pieChart.ContainerVisualStyles.Default.BorderThickness = new Thickness(1);
+            pieChart.ContainerVisualStyles.Default.BorderColor = new BorderColor(Color.Black);
+            pieChart.ContainerVisualStyles.Default.Background = new Background(Color.White);
+            pieChart.ContainerVisualStyles.Default.Margin = new Padding(4);
+        }
+
+        #endregion
+
+        #region CopyButton_Click
+
+        protected override void CopyButton_Click(object sender, EventArgs e)
+        {
+            ChartContainer item = ChartItem as ChartContainer;
+
+            if (item != null)
+            {
+                if (AddButton != null)
+                {
+                    ChartControlDesigner ccd = GetDesigner(_ChartPanel.ChartControl);
+                    ChartContainerCollection ccc = _ChartPanel.ChartContainers;
+
+                    ccd.InCopyItem = true;
+
+                    if (item is ChartPanel)
+                        _ItemTypes[0] = typeof(ChartPanel);
+
+                    try
+                    {
+                        AddButton.PerformClick();
+
+                        ChartContainer clone = ccc[ccc.Count - 1];
+
+                        string name = clone.Name;
+                        item.CopyTo(clone);
+                        clone.Name = name;
+                    }
+                    finally
+                    {
+                        if (item is ChartPanel)
+                            _ItemTypes[0] = typeof(ChartXy);
+
+                        ccd.InCopyItem = false;
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region CreateCollectionItemType
+
+        protected override Type CreateCollectionItemType()
+        {
+            return typeof(ChartContainer);
+        }
+
+        #endregion
+
+        #region CreateNewItemTypes
+
+        private Type[] _ItemTypes = new Type[] 
+        {
+                typeof(ChartXy),
+                typeof(PieChart),
+                typeof(ChartPanel),
+        };
+
+        protected override Type[] CreateNewItemTypes()
+        {
+            return (_ItemTypes);
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/ChartControlActionList.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/ChartControlActionList.cs
new file mode 100644
index 00000000..acbcc259
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/ChartControlActionList.cs	
@@ -0,0 +1,192 @@
+using System;
+using System.ComponentModel;
+using System.ComponentModel.Design;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Windows.Forms;
+using System.Windows.Forms.Design;
+using DevComponents.DotNetBar.Charts;
+
+namespace DevComponents.Charts.Design
+{
+    public class ChartControlActionList : DesignerActionList,
+        ITypeDescriptorContext, IWindowsFormsEditorService, IServiceProvider
+    {
+        #region Private variables
+
+        private ChartControl _ChartControl;
+        private PropertyDescriptor _PropertyDescriptor;
+        private IComponentChangeService _ChangeService;
+
+        #endregion
+
+        /// <summary>
+        /// ChartControlActionList
+        /// </summary>
+        /// <param name="chartControl">Associated ChartControl</param>
+        public ChartControlActionList(ChartControl chartControl)
+            : base(chartControl)
+        {
+            _ChartControl = chartControl;
+
+            _ChangeService = Component.Site.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets or sets the GridPanel DataSource
+        /// </summary>
+        [AttributeProvider(typeof(IListSource))]
+        public object DataSource
+        {
+            get { return (_ChartControl.DataSource); }
+            set { SetValue("DataSource", value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the GridPanel DataMember
+        /// </summary>
+        public string DataMember
+        {
+            get { return (_ChartControl.DataMember); }
+            set { SetValue("DataMember", value); }
+        }
+
+        #endregion
+
+        #region GetSortedActionItems
+
+        public override DesignerActionItemCollection GetSortedActionItems()
+        {
+            DesignerActionItemCollection items = new DesignerActionItemCollection();
+
+            items.Add(new DesignerActionHeaderItem("Data"));
+
+            items.Add(new DesignerActionPropertyItem("DataSource",
+                                "DataSource", "Data",
+                                "Sets the default Chart DataSource."));
+
+            items.Add(new DesignerActionPropertyItem("DataMember",
+                                "DataMember", "Data",
+                                "Sets the default Chart DataMamber."));
+            return items;
+        }
+
+        #endregion
+
+        #region SetValue
+
+        private void SetValue(string property, object value)
+        {
+            _ChangeService.OnComponentChanging(_ChartControl, null);
+
+            GetPropertyByName(property).SetValue(_ChartControl, value);
+
+            _ChangeService.OnComponentChanged(_ChartControl, null, null, null);
+        }
+
+        #endregion
+
+        #region GetPropertyByName
+
+        /// <summary>
+        /// Gets the property via the given name
+        /// </summary>
+        /// <param name="propName">Property name</param>
+        /// <returns>PropertyDescriptor</returns>
+        private PropertyDescriptor GetPropertyByName(string propName)
+        {
+            PropertyDescriptor prop =
+                TypeDescriptor.GetProperties(_ChartControl)[propName];
+
+            if (prop == null)
+                throw new ArgumentException("Matching property not found.", propName);
+
+            return (prop);
+        }
+
+        #endregion
+
+        #region EditChartContainers
+
+        /// <summary>
+        /// EditChartContainers
+        /// </summary>
+        private void EditChartContainers()
+        {
+            _PropertyDescriptor = TypeDescriptor.GetProperties(_ChartControl.ChartPanel)["ChartContainers"];
+
+            UITypeEditor editor = (UITypeEditor)_PropertyDescriptor.GetEditor(typeof(UITypeEditor));
+
+            if (editor != null)
+                editor.EditValue(this, this, _ChartControl.ChartPanel.ChartContainers);
+        }
+
+        #endregion
+
+        #region ITypeDescriptorContext Members
+
+        public IContainer Container
+        {
+            get { return (Component.Site.Container); }
+        }
+
+        public object Instance
+        {
+            get { return (Component); }
+        }
+
+        public void OnComponentChanged()
+        {
+            object value = _ChartControl.ChartPanel.ChartContainers;
+
+            _ChangeService.OnComponentChanged(Component, _PropertyDescriptor, value, value);
+        }
+
+        public bool OnComponentChanging()
+        {
+            _ChangeService.OnComponentChanging(Component, _PropertyDescriptor);
+
+            return true;
+        }
+
+        public PropertyDescriptor PropertyDescriptor
+        {
+            get { return (_PropertyDescriptor); }
+        }
+
+        #endregion
+
+        #region IWindowsFormsEditorService Members
+
+        public void CloseDropDown()
+        {
+            throw new Exception("The method or operation is not implemented.");
+        }
+
+        public void DropDownControl(Control control)
+        {
+            throw new Exception("The method or operation is not implemented.");
+        }
+
+        public DialogResult ShowDialog(Form dialog)
+        {
+            return (dialog.ShowDialog());
+        }
+
+        #endregion
+
+        #region IServiceProvider
+
+        object IServiceProvider.GetService(Type serviceType)
+        {
+            if (serviceType.Equals(typeof(IWindowsFormsEditorService)))
+                return (this);
+
+            return GetService(serviceType);
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/ChartControlDesignTime.snk b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/ChartControlDesignTime.snk
new file mode 100644
index 00000000..33a02ddf
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/ChartControlDesignTime.snk differ
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/ChartControlDesigner.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/ChartControlDesigner.cs
new file mode 100644
index 00000000..954abebe
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/ChartControlDesigner.cs	
@@ -0,0 +1,2612 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.ComponentModel.Design;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Drawing.Drawing2D;
+using System.Windows.Forms;
+using System.Windows.Forms.Design;
+using System.Windows.Forms.Design.Behavior;
+using DevComponents.DotNetBar;
+using DevComponents.DotNetBar.Charts;
+using DevComponents.DotNetBar.Charts.Style;
+using Microsoft.Win32;
+
+namespace DevComponents.Charts.Design
+{
+    /// <summary>
+    /// ChartControlDesigner
+    /// </summary>
+    public class ChartControlDesigner : ControlDesigner
+    {
+        static Random _Rand = new Random();
+
+        #region Private variables
+
+        private ChartControl _ChartControl;
+
+        private IDesignerHost _DesignerHost;
+        private DesignerActionListCollection _ActionLists;
+        private DesignerActionUIService _ActionUIService;
+
+        private IComponentChangeService _ChangeService;
+        private ISelectionService _SelectionService;
+        private IMenuCommandService _MenuCommandService;
+        private IMenuEditorService _MenuEditorService;
+        private IToolboxService _ToolboxService;
+
+        private bool _InCopyItem;
+        private bool _DragMoving;
+
+        private bool _UseGlyphs;
+
+        #endregion
+
+        #region Public properties
+
+        #region ChangeService
+
+        public IComponentChangeService ChangeService
+        {
+            get { return (_ChangeService); }
+        }
+
+        #endregion
+
+        #region ControlDesigner
+
+        public ControlDesigner ControlDesigner
+        {
+            get { return (this); }
+        }
+
+        #endregion
+
+        #region DesignerHost
+
+        public IDesignerHost DesignerHost
+        {
+            get { return (_DesignerHost); }
+        }
+
+        #endregion
+
+        #region InCopyItem
+
+        public bool InCopyItem
+        {
+            get { return (_InCopyItem); }
+            set { _InCopyItem = value; }
+        }
+
+        #endregion
+
+        #region InCopyItem
+
+        public bool DragMoving
+        {
+            get { return (_DragMoving); }
+            set { _DragMoving = value; }
+        }
+
+        #endregion
+
+        #region SelectionService
+
+        public ISelectionService SelectionService
+        {
+            get { return (_SelectionService); }
+        }
+
+        #endregion
+
+        #region MenuEditorService
+
+        public IMenuEditorService MenuEditorService
+        {
+            get { return (_MenuEditorService); }
+        }
+
+        #endregion
+
+        #region MenuCommandService
+
+        public IMenuCommandService MenuCommandService
+        {
+            get { return (_MenuCommandService); }
+        }
+
+        #endregion
+
+        #region ToolboxService
+
+        public IToolboxService ToolboxService
+        {
+            get { return (_ToolboxService); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Initialize
+
+        /// <summary>
+        /// Initializes our designer
+        /// </summary>
+        /// <param name="component"></param>
+        public override void Initialize(IComponent component)
+        {
+            base.Initialize(component);
+
+            if (component.Site.DesignMode == true)
+                _ChartControl = component as ChartControl;
+
+            _DesignerHost = GetService(typeof(IDesignerHost)) as IDesignerHost;
+
+            if (_DesignerHost != null)
+                _DesignerHost.LoadComplete += DhLoadComplete;
+
+            InitializeServices();
+        }
+
+        #region InitializeServices
+
+        private void InitializeServices()
+        {
+            _ChangeService = GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+            _SelectionService = GetService(typeof(ISelectionService)) as ISelectionService;
+            _ActionUIService =  GetService(typeof(DesignerActionUIService)) as DesignerActionUIService;
+            _MenuCommandService = GetService(typeof(IMenuCommandService)) as IMenuCommandService;
+            _MenuEditorService = GetService(typeof(IMenuEditorService)) as IMenuEditorService;
+            _ToolboxService = GetService(typeof(IToolboxService)) as IToolboxService;
+
+            _ChangeService.ComponentChanged += ChangeService_ComponentChanged;
+            _ChangeService.ComponentAdded += ChangeService_ComponentAdded;
+            _ChangeService.ComponentRemoved += ChangeService_ComponentRemoved;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InitializeNewComponent
+
+        public override void InitializeNewComponent(IDictionary defaultValues)
+        {
+            base.InitializeNewComponent(defaultValues);
+
+            ChartStyleDialog csd = new ChartStyleDialog();
+
+            csd.ShowDialog();
+
+            if (Component != null && Component.Site != null && Component.Site.DesignMode == true)
+            {
+                if (_ChartControl != null)
+                {
+                    IDesignerHost dh = (IDesignerHost)GetService(typeof(IDesignerHost));
+
+                    if (dh == null)
+                        return;
+
+                    DesignerTransaction dt = dh.CreateTransaction();
+
+                    try
+                    {
+                        IComponentChangeService change =
+                            GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+
+                        if (change != null)
+                            change.OnComponentChanging(this.Component, null);
+
+                        CreateNewChart(csd);
+
+                        if (change != null)
+                            change.OnComponentChanged(_ChartControl, null, null, null);
+                    }
+                    finally
+                    {
+                        dt.Commit();
+                    }
+                }
+            }
+
+#if !TRIAL
+            ChartControl chartControl = Control as ChartControl;
+
+            if (chartControl != null)
+                chartControl.LicenseKey = GetLicenseKey();
+#endif
+        }
+
+        #region CreateNewChart
+
+        private void CreateNewChart(ChartStyleDialog csd)
+        {
+            SetupScrollBarStyles();
+
+            switch (csd.CbSelected)
+            {
+                case "cbPointPlot":
+                    InitDefaultPlot(SeriesType.Point);
+                    break;
+
+                case "cbLinePlot":
+                    InitDefaultPlot(SeriesType.Line);
+                    break;
+
+                case "cbMultiAxis":
+                    InitMultiAxis();
+                    break;
+
+                case "cbVDotPlot":
+                    InitDotPlot(SeriesType.HorizontalDot);
+                    break;
+
+                case "cbHDotPlot":
+                    InitDotPlot(SeriesType.VerticalDot);
+                    break;
+
+                case "cbMultiChart":
+                    InitMultiChart();
+                    break;
+
+                case "cbBubblePlot":
+                    InitBubblePlot();
+                    break;
+
+                case "cbStepLine":
+                    ChartSeries series1 = InitDefaultPlot(SeriesType.Line);
+                    
+                    if (series1 != null)
+                        series1.ChartLineDisplayMode = ChartLineDisplayMode.DisplayStepLine;
+                    break;
+
+                case "cbLineArea":
+                    ChartSeries series2 = InitDefaultPlot(SeriesType.Line);
+                    
+                    if (series2 != null)
+                        series2.ChartLineAreaDisplayMode = ChartLineAreaDisplayMode.DisplayLine;
+                    break;
+
+                case "cbBarV":
+                    InitBar(SeriesType.VerticalBar, false);
+                    break;
+
+                case "cbBarH":
+                    InitBar(SeriesType.HorizontalBar, false);
+                    break;
+
+                case "cbRangeBarV":
+                    InitBar(SeriesType.VerticalBar, true);
+                    break;
+
+                case "cbRangeBarH":
+                    InitBar(SeriesType.HorizontalBar, true);
+                    break;
+
+                case "cbHiLoVBox":
+                    InitHiLoBar(SeriesType.VerticalHiLoBar, HiLoBarType.Box);
+                    break;
+
+                case "cbHiLoHBox":
+                    InitHiLoBar(SeriesType.HorizontalHiLoBar, HiLoBarType.Box);
+                    break;
+
+                case "cbHiLoVLine":
+                    InitHiLoBar(SeriesType.VerticalHiLoBar, HiLoBarType.Line);
+                    break;
+
+                case "cbHiLoHLine":
+                    InitHiLoBar(SeriesType.HorizontalHiLoBar, HiLoBarType.Line);
+                    break;
+
+                case "cbPieSimple":
+                    InitPieSimple();
+                    break;
+
+                case "cbPieDonut":
+                    InitPieDonut();
+                    break;
+
+                case "cbPieExtent":
+                    InitPieExtent();
+                    break;
+
+                case "cbPieExtentFill":
+                    InitPieExtentFill();
+                    break;
+
+                case "cbPieMultiRing":
+                    InitPieMultiRing();
+                    break;
+
+                case "cbPieMultiRingRev":
+                    InitPieMultiRingRev();
+                    break;
+
+                case "cbPieMultiSeries":
+                    InitPieMultiSeries();
+                    break;
+
+                case "cbPieShowSingleRing":
+                    InitPieShowSingleRing();
+                    break;
+
+                case "cbPieGridAngle":
+                    InitPieGridAngle();
+                    break;
+
+                case "cbPieOverlay":
+                    InitPieOverlay();
+                    break;
+
+                default:
+                    InitBlankChart();
+                    break;
+            }
+        }
+
+        #region InitDefaultPie
+
+        private PieChart InitDefaultPie(int seriesCount, int ringCount, bool extent)
+        {
+            PieChart pieChart = AddPieChart();
+
+            if (pieChart != null)
+            {
+                for (int i = 0; i < seriesCount; i++)
+                {
+                    PieSeries series = GetNewPieSeries(pieChart);
+
+                    if (series != null)
+                        AddSimulatedPieData(series, ringCount, extent);
+
+                    pieChart.ChartSeries.Add(series);
+                }
+
+                _ChartControl.ChartPanel.ChartContainers.Add(pieChart);
+            }
+
+            return (pieChart);
+        }
+
+        #endregion
+
+        #region InitPieSimple
+
+        private void InitPieSimple()
+        {
+            InitDefaultPie(1, 1, false);
+        }
+
+        #endregion
+
+        #region InitPieDonut
+
+        private void InitPieDonut()
+        {
+            PieChart pieChart = InitDefaultPie(1, 1, false);
+
+            pieChart.InnerRadius = .2;
+        }
+
+        #endregion
+
+        #region InitPieExtent
+
+        private void InitPieExtent()
+        {
+            InitDefaultPie(1, 1, true);
+        }
+
+        #endregion
+
+        #region InitPieExtentFill
+
+        private void InitPieExtentFill()
+        {
+            PieChart pieChart = InitDefaultPie(1, 1, true);
+
+            pieChart.SubSliceVisualLayout.ShowSliceWhiteSpace = Tbool.True;
+        }
+
+        #endregion
+
+        #region InitPieMultiRing
+
+        private void InitPieMultiRing()
+        {
+            InitDefaultPie(1, 2, false);
+        }
+
+        #endregion
+
+        #region InitPieMultiRingRev
+
+        private void InitPieMultiRingRev()
+        {
+            PieChart pieChart = InitDefaultPie(1, 2, false);
+
+            pieChart.ReverseRingOrder = true;
+        }
+
+        #endregion
+
+        #region InitPieMultiSeries
+
+        private void InitPieMultiSeries()
+        {
+            InitDefaultPie(2, 1, false);
+        }
+
+        #endregion
+
+        #region InitPieShowSingleRing
+
+        private void InitPieShowSingleRing()
+        {
+            PieChart pieChart = InitDefaultPie(1, 2, false);
+
+            pieChart.InnerRadius = .3;
+            pieChart.ShowAllRings = Tbool.False;
+            pieChart.MouseDoubleClickSliceAction = MouseDoubleClickSliceAction.ChangeActiveRing;
+        }
+
+        #endregion
+
+        #region InitPieGridAngle
+
+        private void InitPieGridAngle()
+        {
+            PieChart pieChart = InitDefaultPie(1, 1, true);
+
+            pieChart.ShowPieGrid = true;
+            pieChart.SubSliceVisualLayout.AngleMargin = 2;
+        }
+
+        #endregion
+
+        #region InitPieOverlay
+
+        private void InitPieOverlay()
+        {
+            PieChart pieChart = InitDefaultPie(2, 1, true);
+
+            pieChart.ShowPieGrid = true;
+            pieChart.SeriesOverlayEnabled = true;
+
+            pieChart.ChartControl.UpdateLayout();
+
+            pieChart.SubSliceVisualLayout.AngleMargin = 2;
+
+            for (int i = 0; i < pieChart.ChartSeries.Count; i++)
+            {
+                PieSeries series = pieChart.ChartSeries[i];
+
+                UpdateOverlayBackground(series.SeriesPoints);
+            }
+        }
+
+        #region UpdateOverlayBackground
+
+        private void UpdateOverlayBackground(PieSeriesPointCollection spc)
+        {
+            if (spc.Count > 0)
+            {
+                foreach (PieSeriesPoint psp in spc)
+                {
+                    psp.SliceVisualStyles.Default.Background =
+                        new Background(Color.FromArgb(110, psp.DefaultPaletteColor));
+
+                    UpdateOverlayBackground(psp.SeriesPoints);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region AddPieChart
+
+        private PieChart AddPieChart()
+        {
+            PieChart pieChart = new PieChart();
+
+            if (pieChart != null)
+            {
+                pieChart.Name = _ChartControl.ChartPanel.ChartContainers.GetUniqueName("PieChart");
+
+                pieChart.IsExploded = true;
+
+                SetupPieChartStyle(pieChart);
+                SetupContainerStyle(pieChart);
+                SetupPieLegend(pieChart);
+
+                AddChartTitle(pieChart);
+            }
+
+            return (pieChart);
+        }
+
+        #region SetupPieChartStyle
+
+        private void SetupPieChartStyle(PieChart pieChart)
+        {
+            PieChartVisualStyle pstyle = pieChart.ChartVisualStyle;
+
+            pstyle.Background = new Background(Color.White);
+            pstyle.BorderThickness = new Thickness(1);
+            pstyle.BorderColor = new BorderColor(Color.Black);
+
+            pstyle.Padding = new DevComponents.DotNetBar.Charts.Style.Padding(6);
+        }
+
+        #endregion
+
+        #region SetupPieLegend
+
+        private void SetupPieLegend(BaseChart baseChart)
+        {
+            ChartLegend legend = baseChart.Legend;
+
+            legend.ShowCheckBoxes = false;
+
+            legend.Placement = Placement.Outside;
+            legend.Alignment = Alignment.BottomCenter;
+            legend.Direction = Direction.LeftToRight;
+
+            legend.AlignVerticalItems = true;
+
+            legend.MaxVerticalPct = 90;
+
+            ChartLegendVisualStyle lstyle = legend.ChartLegendVisualStyles.Default;
+
+            lstyle.BorderThickness = new Thickness(1);
+            lstyle.BorderColor = new BorderColor(Color.Black);
+
+            lstyle.Margin = new DevComponents.DotNetBar.Charts.Style.Padding(4);
+            lstyle.Padding = new DevComponents.DotNetBar.Charts.Style.Padding(4);
+
+            lstyle.Background = new Background(Color.FromArgb(200, Color.White));
+        }
+
+        #endregion
+
+        #region AddPieTitle
+
+        private void AddPieTitle(ChartXy chartXy)
+        {
+            ChartTitle title = new ChartTitle();
+
+            title.Name = chartXy.Titles.GetUniqueName();
+
+            title.Text = "PieChart Title";
+            title.XyAlignment = XyAlignment.Top;
+
+            ChartTitleVisualStyle tstyle = title.ChartTitleVisualStyle;
+
+            tstyle.Padding = new DevComponents.DotNetBar.Charts.Style.Padding(8);
+            tstyle.Font = new Font("Georgia", 16);
+            tstyle.TextColor = Color.Navy;
+            tstyle.Alignment = Alignment.MiddleCenter;
+
+            chartXy.Titles.Add(title);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InitBlankChart
+
+        private void InitBlankChart()
+        {
+            ChartPanel chartPanel = _ChartControl.ChartPanel;
+
+            chartPanel.EmptyText = "No Charts Defined.";
+
+            chartPanel.ContainerVisualStyles.Default.BorderColor = new BorderColor(Color.Black);
+            chartPanel.ContainerVisualStyles.Default.BorderThickness = new Thickness(1);
+        }
+
+        #endregion
+
+        #region InitDefaultPlot
+
+        private ChartSeries InitDefaultPlot(SeriesType seriesType)
+        {
+            ChartXy chartXy = AddChartXy();
+
+            if (chartXy != null)
+            {
+                ChartSeries series = GetNewChartSeries(chartXy, seriesType);
+
+                if (series != null)
+                    AddSimulatedData(series);
+
+                _ChartControl.ChartPanel.ChartContainers.Add(chartXy);
+
+                chartXy.ChartSeries.Add(series);
+
+                return (series);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region InitMultiAxis
+
+        private void InitMultiAxis()
+        {
+            ChartXy chartXy = AddChartXy();
+
+            if (chartXy != null)
+            {
+                ChartAxisX axisX = new ChartAxisX();
+                axisX.Name = chartXy.AncillaryAxesX.GetUniqueName();
+
+                chartXy.AncillaryAxesX.Add(axisX);
+
+                ChartAxisY axisY = new ChartAxisY();
+                axisY.Name = chartXy.AncillaryAxesY.GetUniqueName();
+                axisY.AxisAlignment = AxisAlignment.Near;
+
+                chartXy.AncillaryAxesY.Add(axisY);
+
+                ChartSeries series = GetNewChartSeries(chartXy, SeriesType.Line);
+
+                if (series != null)
+                {
+                    series.ChartLineDisplayMode = ChartLineDisplayMode.DisplayPoints;
+
+                    AddSimulatedData(series);
+
+                    series.SeriesPoints.Add(new SeriesPoint(0d, 50d));
+                    series.SeriesPoints.Add(new SeriesPoint(12d, 0d));
+
+                    chartXy.ChartSeries.Add(series);
+                }
+
+                series = GetNewChartSeries(chartXy, SeriesType.Line);
+
+                if (series != null)
+                {
+                    series.ChartLineDisplayMode = ChartLineDisplayMode.DisplaySpline;
+
+                    AddSimulatedData(series);
+
+                    series.SeriesPoints.Add(new SeriesPoint(0d, 0d));
+                    series.SeriesPoints.Add(new SeriesPoint(12d, 50d));
+
+                    series.AxisX = axisX;
+                    series.AxisY = axisY;
+
+                    chartXy.ChartSeries.Add(series);
+                }
+
+                _ChartControl.ChartPanel.ChartContainers.Add(chartXy);
+            }
+        }
+
+        #endregion
+
+        #region InitDotPlot
+
+        private void InitDotPlot(SeriesType chartType)
+        {
+            ChartXy chartXy = AddChartXy();
+
+            if (chartXy != null)
+            {
+                chartXy.Legend.Alignment = Alignment.TopRight;
+
+                chartXy.AxisX.MinGridInterval = 20;
+                chartXy.AxisY.MinGridInterval = 20;
+
+                chartXy.AxisX.MinorTickmarks.TickmarkCount = 0;
+                chartXy.AxisY.MinorTickmarks.TickmarkCount = 0;
+
+                chartXy.MinContentSize = new Size(100, 100);
+
+                ChartSeries series = GetNewChartSeries(chartXy, chartType);
+
+                if (series != null)
+                {
+                    PointMarkerVisualStyle mstyle = series.ChartSeriesVisualStyle.MarkerVisualStyle;
+
+                    mstyle.Size = new Size(10, 10);
+                    mstyle.Background = new Background(Color.CornflowerBlue);
+                    mstyle.BorderColor = Color.Black;
+                    mstyle.BorderWidth = 1;
+
+                    AddSimulatedDotPlotData(series);
+                }
+
+                _ChartControl.ChartPanel.ChartContainers.Add(chartXy);
+
+                chartXy.ChartSeries.Add(series);
+            }
+        }
+
+        #endregion
+
+        #region InitMultiChart
+
+        private void InitMultiChart()
+        {
+            for (int i = 0; i < 4; i++)
+                InitDefaultPlot(SeriesType.Line);
+        }
+
+        #endregion
+
+        #region InitBubblePlot
+
+        private void InitBubblePlot()
+        {
+            ChartXy chartXy = AddChartXy();
+
+            if (chartXy != null)
+            {
+                ChartSeries series = GetNewChartSeries(chartXy, SeriesType.Bubble);
+
+                if (series != null)
+                {
+                    PointMarkerVisualStyle mstyle =
+                        series.ChartSeriesVisualStyle.MarkerVisualStyle;
+
+                    mstyle.Background = new Background(Color.FromArgb(150, Color.DarkGreen));
+                    mstyle.BorderWidth = 1;
+                    mstyle.BorderColor = Color.DarkGreen;
+
+                    AddSimulatedBubbleData(series);
+
+                    chartXy.ChartSeries.Add(series);
+                }
+
+                series = GetNewChartSeries(chartXy, SeriesType.Bubble);
+
+                if (series != null)
+                {
+                    PointMarkerVisualStyle mstyle =
+                        series.ChartSeriesVisualStyle.MarkerVisualStyle;
+
+                    mstyle.Background = new Background(Color.FromArgb(150, Color.DarkBlue));
+                    mstyle.BorderWidth = 1;
+                    mstyle.BorderColor = Color.DarkBlue;
+
+                    AddSimulatedBubbleData(series);
+
+                    chartXy.ChartSeries.Add(series);
+                }
+
+                _ChartControl.ChartPanel.ChartContainers.Add(chartXy);
+            }
+        }
+
+        #endregion
+
+        #region InitBar
+
+        private void InitBar(SeriesType seriesType, bool rangeBar)
+        {
+            ChartXy chartXy = AddChartXy();
+
+            if (chartXy != null)
+            {
+                chartXy.BarShadingEnabled = Tbool.True;
+
+                ChartSeries series = GetNewChartSeries(chartXy, seriesType);
+
+                if (series != null)
+                {
+                    if (rangeBar == true)
+                        AddSimulatedRangeData(series);
+                    else
+                        AddSimulatedData(series);
+
+                    _ChartControl.ChartPanel.ChartContainers.Add(chartXy);
+
+                    chartXy.ChartSeries.Add(series);
+                }
+            }
+        }
+
+        #endregion
+
+        #region InitHiLoBar
+
+        private void InitHiLoBar(SeriesType seriesType, HiLoBarType hiloType)
+        {
+            ChartXy chartXy = AddChartXy();
+
+            if (chartXy != null)
+            {
+                chartXy.BarShadingEnabled = Tbool.True;
+
+                chartXy.AxisX.GridSpacing = 1;
+                chartXy.AxisY.GridSpacing = 1;
+
+                if (seriesType == SeriesType.VerticalHiLoBar)
+                {
+                    chartXy.AxisX.AxisMargins = 0;
+                    chartXy.AxisX.MinorTickmarks.TickmarkCount = 0;
+                    chartXy.AxisY.MinorTickmarks.TickmarkCount = 1;
+                }
+                else
+                {
+                    chartXy.AxisY.AxisMargins = 0;
+                    chartXy.AxisX.MinorTickmarks.TickmarkCount = 1;
+                    chartXy.AxisY.MinorTickmarks.TickmarkCount = 0;
+                }
+
+                ChartSeries series = GetNewChartSeries(chartXy, seriesType);
+
+                if (series != null)
+                {
+                    series.HiLoBarType = hiloType;
+
+                    ChartHiLoBarVisualStyle style = series.ChartSeriesVisualStyle.HiLoBarVisualStyle;
+
+                    style.ShowWhiskerCaps = Tbool.True;
+                    style.UseAlternateSegmentStyle = Tbool.True;
+
+                    style.DefaultSegmentStyle.BoxBackground = new Background(Color.Green);
+                    style.DefaultSegmentStyle.Default.LineColor = Color.Green;
+                    style.DefaultSegmentStyle.Default.LineWidth = 2;
+
+                    style.AlternateSegmentStyle.BoxBackground = new Background(Color.Red);
+                    style.AlternateSegmentStyle.Default.LineColor = Color.Crimson;
+                    style.AlternateSegmentStyle.Default.LineWidth = 2;
+
+                    AddSimulatedHiLoData(series);
+
+                    _ChartControl.ChartPanel.ChartContainers.Add(chartXy);
+
+                    chartXy.ChartSeries.Add(series);
+                }
+            }
+        }
+
+        #endregion
+
+        #region SetupScrollBarStyles
+
+        private void SetupScrollBarStyles()
+        {
+            ScrollBarVisualStyle moStyle =
+                _ChartControl.DefaultVisualStyles.HScrollBarVisualStyles.MouseOver;
+
+            moStyle.ArrowBackground = new Background(Color.AliceBlue);
+            moStyle.ThumbBackground = new Background(Color.AliceBlue);
+
+            ScrollBarVisualStyle smoStyle =
+                _ChartControl.DefaultVisualStyles.HScrollBarVisualStyles.SelectedMouseOver;
+
+            smoStyle.ArrowBackground = new Background(Color.White);
+            smoStyle.ThumbBackground = new Background(Color.White);
+
+            moStyle = _ChartControl.DefaultVisualStyles.VScrollBarVisualStyles.MouseOver;
+
+            moStyle.ArrowBackground = new Background(Color.AliceBlue);
+            moStyle.ThumbBackground = new Background(Color.AliceBlue);
+
+            smoStyle = _ChartControl.DefaultVisualStyles.VScrollBarVisualStyles.SelectedMouseOver;
+
+            smoStyle.ArrowBackground = new Background(Color.White);
+            smoStyle.ThumbBackground = new Background(Color.White);
+        }
+
+        #endregion
+
+        #region AddChartXy
+
+        private ChartXy AddChartXy()
+        {
+            ChartXy chartXy = new ChartXy();
+
+            if (chartXy != null)
+            {
+                chartXy.Name = _ChartControl.ChartPanel.ChartContainers.GetUniqueName("ChartXy");
+
+                chartXy.ChartCrosshair.AxisOrientation = AxisOrientation.X;
+
+                chartXy.ChartCrosshair.ShowValueXLine = true;
+                chartXy.ChartCrosshair.ShowValueYLine = true;
+                chartXy.ChartCrosshair.ShowValueXLabels = true;
+                chartXy.ChartCrosshair.ShowValueYLabels = true;
+
+                chartXy.ChartCrosshair.HighlightPoints = true;
+
+                chartXy.ChartCrosshair.ShowCrosshairLabels = true;
+                chartXy.ChartCrosshair.CrosshairLabelMode = CrosshairLabelMode.NearestSeries;
+
+                chartXy.ChartCrosshair.CrosshairVisualStyle.Background = new Background(Color.White);
+
+                SetupChartStyle(chartXy);
+                SetupContainerStyle(chartXy);
+                SetupChartAxes(chartXy);
+                SetupChartLegend(chartXy);
+
+                AddChartTitle(chartXy);
+            }
+
+            return (chartXy);
+        }
+
+        #region SetupChartAxes
+
+        private void SetupChartAxes(ChartXy chartXy)
+        {
+            // X Axis
+
+            ChartAxis axis = chartXy.AxisX;
+
+            axis.MajorGridLines.GridLinesVisualStyle.LineColor = Color.Gainsboro;
+            axis.MinorGridLines.GridLinesVisualStyle.LineColor = Color.WhiteSmoke;
+
+            // Y Axis
+
+            axis = chartXy.AxisY;
+
+            axis.AxisAlignment = AxisAlignment.Far;
+
+            axis.MajorGridLines.GridLinesVisualStyle.LineColor = Color.Gainsboro;
+            axis.MinorGridLines.GridLinesVisualStyle.LineColor = Color.WhiteSmoke;
+        }
+
+        #endregion
+
+        #region SetupChartStyle
+
+        private void SetupChartStyle(ChartXy chartXy)
+        {
+            ChartXyVisualStyle xystyle = chartXy.ChartVisualStyle;
+
+            xystyle.Background = new Background(Color.White);
+            xystyle.BorderThickness = new Thickness(1);
+            xystyle.BorderColor = new BorderColor(Color.Black);
+
+            xystyle.Padding = new DevComponents.DotNetBar.Charts.Style.Padding(6);
+
+            ChartSeriesVisualStyle cstyle = chartXy.ChartSeriesVisualStyle;
+            PointMarkerVisualStyle pstyle = cstyle.MarkerHighlightVisualStyle;
+
+            pstyle.Background = new Background(Color.Yellow);
+            pstyle.Type = PointMarkerType.Ellipse;
+            pstyle.Size = new Size(15, 15);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region SetupContainerStyle
+
+        private void SetupContainerStyle(BaseChart baseChart)
+        {
+            ContainerVisualStyle dstyle = baseChart.ContainerVisualStyles.Default;
+
+            dstyle.Background = new Background(Color.White);
+            dstyle.BorderColor = new BorderColor(Color.DimGray);
+            dstyle.BorderThickness = new Thickness(1);
+
+            dstyle.DropShadow.Enabled = Tbool.True;
+            dstyle.Padding = new DevComponents.DotNetBar.Charts.Style.Padding(6);
+        }
+
+        #endregion
+
+        #region SetupChartLegend
+
+        private void SetupChartLegend(BaseChart baseChart)
+        {
+            ChartLegend legend = baseChart.Legend;
+
+            legend.ShowCheckBoxes = false;
+            legend.Placement = Placement.Inside;
+            legend.Alignment = Alignment.TopLeft;
+            legend.AlignVerticalItems = true;
+            legend.Direction = Direction.LeftToRight;
+
+            legend.MaxHorizontalPct = 75;
+
+            ChartLegendVisualStyle lstyle = legend.ChartLegendVisualStyles.Default;
+
+            lstyle.BorderThickness = new Thickness(1);
+            lstyle.BorderColor = new BorderColor(Color.Black);
+
+            lstyle.Margin = new DevComponents.DotNetBar.Charts.Style.Padding(8);
+            lstyle.Padding = new DevComponents.DotNetBar.Charts.Style.Padding(4);
+
+            lstyle.Background = new Background(Color.FromArgb(200, Color.White));
+        }
+
+        #endregion
+
+        #region AddChartTitle
+
+        private void AddChartTitle(BaseChart baseChart)
+        {
+            ChartTitle title = new ChartTitle();
+
+            title.Name = baseChart.Titles.GetUniqueName();
+
+            title.Text = "Chart Title";
+            title.XyAlignment = XyAlignment.Top;
+
+            ChartTitleVisualStyle tstyle = title.ChartTitleVisualStyle;
+
+            tstyle.Padding = new DevComponents.DotNetBar.Charts.Style.Padding(8);
+            tstyle.Font = new Font("Georgia", 16);
+            tstyle.TextColor = Color.Navy;
+            tstyle.Alignment = Alignment.MiddleCenter;
+
+            baseChart.Titles.Add(title);
+        }
+
+        #endregion
+
+        #region GetNewChartSeries
+
+        private ChartSeries GetNewChartSeries(ChartXy chartXy, SeriesType chartType)
+        {
+            ChartSeries series = new ChartSeries(chartType);
+
+            if (series != null)
+            {
+                series.Name = chartXy.ChartSeries.GetUniqueName();
+
+                series.CrosshairHighlightPoints = Tbool.True;
+            }
+
+            return (series);
+        }
+
+        #endregion
+
+        #region GetNewPieSeries
+
+        private PieSeries GetNewPieSeries(PieChart pieChart)
+        {
+            PieSeries series = new PieSeries();
+
+            if (series != null)
+                series.Name = pieChart.ChartSeries.GetUniqueName();
+
+            return (series);
+        }
+
+        #endregion
+
+        #region AddSimulatedData
+
+        private void AddSimulatedData(ChartSeries series)
+        {
+            for (int i = 0; i < 10; i++)
+            {
+                double d = Convert.ToDouble(i);
+
+                series.SeriesPoints.Add(
+                    new SeriesPoint(d, Convert.ToDouble(_Rand.Next(2, 50))));
+            }
+        }
+
+        #endregion
+
+        #region AddSimulatedDotPlotData
+
+        private void AddSimulatedDotPlotData(ChartSeries series)
+        {
+            for (int i = 0; i < 10; i++)
+            {
+                series.SeriesPoints.Add(
+                    new SeriesPoint(i, _Rand.Next(0, 10)));
+            }
+        }
+
+        #endregion
+
+        #region AddSimulatedBubbleData
+
+        private void AddSimulatedBubbleData(ChartSeries series)
+        {
+            for (int i = 0; i < 5; i++)
+            {
+                double d = Convert.ToDouble(i);
+
+                series.SeriesPoints.Add(
+                    new SeriesPoint(d, 
+                        Convert.ToDouble(_Rand.Next(0, 10)), 
+                        Convert.ToDouble(_Rand.Next(10, 1000))));
+            }
+        }
+
+        #endregion
+
+        #region AddSimulatedRangeData
+
+        private void AddSimulatedRangeData(ChartSeries series)
+        {
+            for (int i = 0; i < 10; i++)
+            {
+                double d = Convert.ToDouble(i);
+
+                double v1 = Convert.ToDouble(_Rand.Next(2, 50));
+                double v2 = v1 + Convert.ToDouble(_Rand.Next(10, 20));
+
+                series.SeriesPoints.Add(new SeriesPoint(d, v1, v2));
+            }
+        }
+
+        #endregion
+
+        #region AddSimulatedHiLoData
+
+        private void AddSimulatedHiLoData(ChartSeries series)
+        {
+            for (int i = 0; i < 5; i++)
+            {
+                double d = Convert.ToDouble(i);
+
+                double lo = _Rand.NextDouble() * 5;
+                double hi = lo + _Rand.NextDouble() * 5 + 10;
+
+                double mid = Math.Floor((hi + lo) / 2);
+
+                double open = mid - _Rand.NextDouble() * 5;
+                double close = mid + _Rand.NextDouble() * 5;
+
+                if (i % 2 == 1)
+                {
+                    double swap = open;
+
+                    open = close;
+                    close = swap;
+                }
+
+                series.SeriesPoints.Add(new SeriesPoint(d, new object[] { hi, lo, close, open }));
+            }
+        }
+
+        #endregion
+
+        #region AddSimulatedPieData
+
+        private void AddSimulatedPieData(PieSeries series, int ringCount, bool extent)
+        {
+            for (int i = 0; i < 5; i++)
+            {
+                PieSeriesPoint psp = (extent == true) ?
+                    new PieSeriesPoint("PX" + i, _Rand.Next(30, 100), _Rand.Next(30, 100)) :
+                    new PieSeriesPoint("P" + i, _Rand.Next(30, 100));
+
+                series.SeriesPoints.Add(psp);
+
+                AddPieRing(psp, ringCount - 1);
+            }
+        }
+
+        #region AddPieRing
+
+        private void AddPieRing(PieSeriesPoint psp, int ringCount)
+        {
+            if (ringCount > 0)
+            {
+                for (int i = 0; i < 2; i++)
+                {
+                    PieSeriesPoint psp2 = new PieSeriesPoint("P" + i, 50);
+
+                    psp.SeriesPoints.Add(psp2);
+
+                    AddPieRing(psp, ringCount - 1);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region ChangeService
+
+        #region ChangeService_ComponentChanged
+
+        void ChangeService_ComponentChanged(object sender, ComponentChangedEventArgs e)
+        {
+            if (InCopyItem == false)
+            {
+                _ChartControl.UpdateLayout();
+
+                if (e.Member != null)
+                {
+                    switch (e.Member.Name)
+                    {
+                        case "AncillaryAxesX":
+                        case "AncillaryAxesY":
+                        case "ChartContainers":
+                        case "Location":
+                        case "Titles":
+                        case "Visible":
+                            UpdateGlyphs();
+                            break;
+                    }
+                }
+                else
+                {
+                    UpdateGlyphs();
+                }
+            }
+        }
+
+        #endregion
+
+        #region ChangeService_ComponentAdded
+
+        void ChangeService_ComponentAdded(object sender, ComponentEventArgs e)
+        {
+            CheckGlyphUse();
+
+            UpdateGlyphs();
+        }
+
+        #endregion
+
+        #region ChangeService_ComponentRemoved
+
+        void ChangeService_ComponentRemoved(object sender, ComponentEventArgs e)
+        {
+            CheckGlyphUse();
+
+            UpdateGlyphs();
+        }
+
+        #endregion
+
+        #region CheckGlyphUse
+
+        private void CheckGlyphUse()
+        {
+            _UseGlyphs = true;
+
+            if (_DesignerHost is IContainer)
+            {
+                foreach (IComponent comp in ((IContainer)_DesignerHost).Components)
+                {
+                    if (comp is ContextMenuStrip)
+                    {
+                        _UseGlyphs = false;
+                        break;
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region UpdateGlyphs
+
+        private void UpdateGlyphs()
+        {
+            RemoveAdorners();
+
+            AddContainerGlyphs(_ChartControl.ChartPanel);
+
+            ICollection ic = _SelectionService.GetSelectedComponents();
+
+            if (ic != null)
+            {
+                _SelectionService.SetSelectedComponents(null);
+                _SelectionService.SetSelectedComponents(ic);
+            }
+        }
+
+        #endregion
+
+        #region RemoveAdorners
+
+        private void RemoveAdorners()
+        {
+            List<Adorner> adornerList = new List<Adorner>();
+
+            for (int i = 0; i < BehaviorService.Adorners.Count; i++)
+            {
+                Adorner adorner = BehaviorService.Adorners[i];
+
+                if (adorner.Glyphs != null && adorner.Glyphs.Count > 0)
+                {
+                    SelectionGlyph sg = adorner.Glyphs[0] as SelectionGlyph;
+
+                    if (sg != null && sg.ControlDesigner == this)
+                        adornerList.Add(adorner);
+                }
+            }
+
+            foreach (Adorner ad in adornerList)
+            {
+                for (int i = ad.Glyphs.Count - 1; i >= 0; i--)
+                {
+                    SelectionGlyph sg = (SelectionGlyph)ad.Glyphs[i];
+
+                    ad.Glyphs.RemoveAt(i);
+
+                    sg.Dispose();
+                }
+
+                BehaviorService.Adorners.Remove(ad);
+            }
+        }
+
+        #endregion
+
+        #region ActionLists
+
+        /// <summary>
+        /// Gets our DesignerActionListCollection list
+        /// </summary>
+        public override DesignerActionListCollection ActionLists
+        {
+            get
+            {
+                if (_ActionLists == null)
+                {
+                    _ActionLists = new DesignerActionListCollection();
+
+                    _ActionLists.Add(new ChartControlActionList(_ChartControl));
+                }
+
+                return (_ActionLists);
+            }
+        }
+
+        #endregion
+
+        #region Load complete
+
+        private void DhLoadComplete(object sender, EventArgs e)
+        {
+            IDesignerHost dh = GetService(typeof(IDesignerHost)) as IDesignerHost;
+
+            if (dh != null)
+                dh.LoadComplete -= DhLoadComplete;
+
+            ChartControl chartControl = Control as ChartControl;
+
+            if (chartControl != null)
+            {
+                CheckGlyphUse();
+
+                ValidateLicenseKey(chartControl);
+
+                AddContainerGlyphs(chartControl.ChartPanel);
+            }
+        }
+
+        #endregion
+
+        #region AddContainerGlyphs
+
+        private void AddContainerGlyphs(ChartContainer cc)
+        {
+            if (_UseGlyphs == true)
+            {
+                if (cc.Visible == true)
+                {
+                    AddSelectionAdorner(cc);
+
+                    if (cc.Legend.Visible == true)
+                        AddSelectionAdorner(cc.Legend);
+
+                    if (cc.Titles != null)
+                    {
+                        foreach (ChartTitle title in cc.Titles)
+                        {
+                            if (title.Visible == true)
+                                AddSelectionAdorner(title);
+                        }
+                    }
+
+                    if (cc is ChartPanel)
+                    {
+                        ChartPanel cp = (ChartPanel)cc;
+
+                        foreach (ChartContainer cont in cp.ChartContainers)
+                        {
+                            if (cont.Visible == true)
+                                AddContainerGlyphs(cont);
+                        }
+                    }
+                    else if (cc is ChartXy)
+                    {
+                        ChartXy chartXy = (ChartXy)cc;
+
+                        if (chartXy.AxisX.Visible == true)
+                            AddSelectionAdorner(chartXy.AxisX);
+
+                        if (chartXy.AxisY.Visible == true)
+                            AddSelectionAdorner(chartXy.AxisY);
+
+                        foreach (ChartAxis axis in chartXy.AncillaryAxesX)
+                        {
+                            if (axis.Visible == true)
+                                AddSelectionAdorner(axis);
+                        }
+
+                        foreach (ChartAxis axis in chartXy.AncillaryAxesY)
+                        {
+                            if (axis.Visible == true)
+                                AddSelectionAdorner(axis);
+                        }
+                    }
+                }
+            }
+        }
+
+        #region AddSelectionAdorner
+
+        private void AddSelectionAdorner(ChartVisualElement visualItem)
+        {
+            if (visualItem.Visible == true)
+            {
+                Adorner adorner = new Adorner();
+
+                adorner.Glyphs.Add(new SelectionGlyph(this, visualItem, adorner));
+
+                BehaviorService.Adorners.Add(adorner);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region OnSetCursor
+
+        protected override void OnSetCursor()
+        {
+            if (ToolboxService == null ||
+                ToolboxService.GetSelectedToolboxItem() == null)
+            {
+                if (DragMoving == true)
+                {
+                    Cursor.Current = Cursors.SizeAll;
+                }
+                else
+                {
+                    if (SelectionBehavior.ContextMenuActive == true)
+                        Cursor.Current = Cursors.Arrow;
+                    else
+                        base.OnSetCursor();
+                }
+            }
+            else
+            {
+                Control ctl1 = (Control)Component;
+
+                Form form = ctl1.FindForm();
+
+                if (form != null)
+                    base.OnSetCursor();
+            }
+        }
+
+        #endregion
+
+        #region OnMouseDragBegin
+
+        protected override void OnMouseDragBegin(int x, int y)
+        {
+            DragMoving = true;
+
+            base.OnMouseDragBegin(x, y);
+        }
+
+        #endregion
+
+        #region OnMouseDragEnd
+
+        protected override void OnMouseDragEnd(bool cancel)
+        {
+            DragMoving = false;
+
+            base.OnMouseDragEnd(cancel);
+        }
+
+        #endregion
+
+        #region GetLicenseKey
+
+#if !TRIAL
+        private string GetLicenseKey()
+        {
+            string key = "";
+
+            RegistryKey regkey =
+                Registry.LocalMachine.OpenSubKey("Software\\DevComponents\\Licenses", false);
+
+            if (regkey != null)
+            {
+                object keyValue = regkey.GetValue("DevComponents.DotNetBar.DotNetBarManager2");
+
+                if (keyValue != null)
+                    key = keyValue.ToString();
+            }
+
+            return (key);
+        }
+#endif
+
+        #endregion
+
+        #region ValidateLicenseKey
+
+        private void ValidateLicenseKey(ChartControl chartControl)
+        {
+#if !TRIAL
+            string key = GetLicenseKey();
+
+            if (key != "" && chartControl != null && chartControl.LicenseKey == "" && chartControl.LicenseKey != key)
+                TypeDescriptor.GetProperties(chartControl)["LicenseKey"].SetValue(chartControl, key);
+#endif
+        }
+
+        #endregion
+
+        #region SelectionGlyph
+
+        public class SelectionGlyph : Glyph, IDisposable
+        {
+            #region Private variables
+
+            private ChartControlDesigner _ControlDesigner;
+
+            private Adorner _SelectionAdorner;
+            private Control _RelatedControl;
+
+            private Rectangle _Bounds;
+            private ChartVisualElement _VisualItem;
+
+            private bool _IsSelected;
+
+            private Brush _SelBrush;
+            private Brush _SelBrush2;
+
+            #endregion
+
+            public SelectionGlyph(ChartControlDesigner controlDesigner, ChartVisualElement visualItem, Adorner selectionAdorner)
+                : base(new SelectionBehavior(controlDesigner))
+            {
+                _VisualItem = visualItem;
+                _ControlDesigner = controlDesigner;
+                _SelectionAdorner = selectionAdorner;
+
+                _RelatedControl = _ControlDesigner.Component as Control;
+
+                _ControlDesigner.SelectionService.SelectionChanged += SelectionService_SelectionChanged;
+                _ControlDesigner.ChangeService.ComponentChanged += ChangeService_ComponentChanged;
+
+                _VisualItem.ChartControl.UpdateLayout();
+
+                CalcGlyphBounds();
+            }
+
+            #region Public properties
+
+            #region Bounds
+
+            public override Rectangle Bounds
+            {
+                get { return (_Bounds); }
+            }
+
+            #endregion
+
+            #region ControlDesigner
+
+            public ChartControlDesigner ControlDesigner
+            {
+                get { return (_ControlDesigner); }
+            }
+
+            #endregion
+
+            #region SelectionAdorner
+
+            public Adorner SelectionAdorner
+            {
+                get { return (_SelectionAdorner); }
+            }
+
+            #endregion
+
+            #region VisualItem
+
+            public ChartVisualElement VisualItem
+            {
+                get { return (_VisualItem); }
+            }
+
+            #endregion
+
+            #endregion
+
+            #region Private properties
+
+            #region SelBrush
+
+            private Brush SelBrush
+            {
+                get
+                {
+                    if (_SelBrush == null)
+                    {
+                        _SelBrush = new HatchBrush(HatchStyle.BackwardDiagonal,
+                            Color.FromArgb(20, Color.Purple), Color.Transparent);
+                    }
+
+                    return (_SelBrush);
+                }
+
+                set
+                {
+                    if (_SelBrush != null)
+                        _SelBrush.Dispose();
+
+                    _SelBrush = null;
+                }
+            }
+
+            #endregion
+
+            #region SelBrush2
+
+            private Brush SelBrush2
+            {
+                get
+                {
+                    if (_SelBrush2 == null)
+                    {
+                        _SelBrush2 = new HatchBrush(HatchStyle.BackwardDiagonal,
+                            Color.FromArgb(60, Color.White), Color.Transparent);
+                    }
+
+                    return (_SelBrush2);
+                }
+
+                set
+                {
+                    if (_SelBrush2 != null)
+                        _SelBrush2.Dispose();
+
+                    _SelBrush2 = value;
+                }
+            }
+
+            #endregion
+
+            #endregion
+
+            #region Paint
+
+            public override void Paint(PaintEventArgs e)
+            {
+                if (_ControlDesigner.SelectionService.GetComponentSelected(_VisualItem) == true)
+                {
+                    Graphics g = e.Graphics;
+
+                    int n = (_VisualItem is ChartPanel || _VisualItem is ChartXy) ? -2 : 2;
+
+                    Rectangle r = Bounds;
+                    r.Inflate(n, n);
+
+                    g.RenderingOrigin = new Point(1, 0);
+                    g.FillRectangle(SelBrush, r);
+
+                    g.RenderingOrigin = new Point(0, 0);
+                    g.FillRectangle(SelBrush2, r);
+
+                    ControlPaint.DrawFocusRectangle(g, r);
+
+                    r.Inflate(1, 1);
+
+                    using (Pen pen = new Pen(Color.FromArgb(170, Color.White)))
+                    {
+                        pen.DashStyle = DashStyle.Dot;
+
+                        r.Height--;
+                        r.Width--;
+
+                        g.DrawRectangle(pen, r);
+                    }
+                }
+            }
+
+            #endregion
+
+            #region GetHitTest
+
+            public override Cursor GetHitTest(Point p)
+            {
+                Control control = GetIt(p);
+
+                if (control == _RelatedControl)
+                {
+                    if (control.Parent != null && control.Parent.Visible == true)
+                    {
+                        ChartControlDesigner ccd = _ControlDesigner;
+
+                        if (ccd.ToolboxService == null ||
+                            ccd.ToolboxService.GetSelectedToolboxItem() == null)
+                        {
+                            if (ccd.DragMoving == false)
+                            {
+                                if (Bounds.Contains(p))
+                                    return (Cursors.Hand);
+                            }
+                        }
+                    }
+                }
+
+                return (null);
+            }
+
+            #region GetIt
+
+            private Control GetIt(Point pt)
+            {
+                if (_RelatedControl != null)
+                {
+                    Control ctl = _RelatedControl.Parent;
+                    Control ctl2 = _ControlDesigner.DesignerHost.RootComponent as Control;
+
+                    if (ctl != null && ctl2 != null && ctl2.Parent != null)
+                    {
+                        Point pt1 = ctl.PointToScreen(Point.Empty);
+                        Point pt2 = ctl2.Parent.PointToScreen(ctl2.Parent.Location);
+
+                        pt.X -= (pt1.X - pt2.X);
+                        pt.Y -= (pt1.Y - pt2.Y);
+
+                        return (ctl.GetChildAtPoint(pt));
+                    }
+                }
+
+                return (null);
+            }
+
+            #endregion
+
+            #endregion
+
+            #region SelectionService_SelectionChanged
+
+            void SelectionService_SelectionChanged(object sender, EventArgs e)
+            {
+                bool selected = _ControlDesigner.SelectionService.GetComponentSelected(_VisualItem);
+
+                if (selected == true)
+                    CalcGlyphBounds();
+
+                if (_IsSelected != selected)
+                {
+                    _IsSelected = selected;
+
+                    Control ctl = _ControlDesigner.DesignerHost.RootComponent as Control;
+
+                    if (ctl != null)
+                        ctl.Invalidate(true);
+                }
+            }
+
+            #endregion
+
+            #region ChangeService_ComponentChanged
+
+            void ChangeService_ComponentChanged(object sender, ComponentChangedEventArgs e)
+            {
+                if (_ControlDesigner.InCopyItem == false)
+                {
+                    if (_IsSelected == true)
+                    {
+                        if (_VisualItem != null && _VisualItem.ChartControl != null)
+                        {
+                            _VisualItem.ChartControl.UpdateLayout();
+
+                            CalcGlyphBounds();
+
+                            _RelatedControl.Invalidate();
+                        }
+                    }
+                }
+            }
+
+            #endregion
+
+            #region CalcGlyphBounds
+
+            private void CalcGlyphBounds()
+            {
+                Rectangle bounds = _VisualItem.Bounds;
+
+                if (_RelatedControl != null)
+                {
+                    if (_VisualItem is ChartContainer)
+                    {
+                        ChartContainer cc = (ChartContainer)_VisualItem;
+
+                        bounds = GetAdjustedBounds(bounds, cc.EffectiveContainerStyles[StyleType.Default].Margin);
+                    }
+                    else if (_VisualItem is ChartXy)
+                    {
+                        ChartXy bc = (ChartXy)_VisualItem;
+
+                        bounds = GetAdjustedBounds(bounds, bc.EffectiveChartStyle.Margin);
+                    }
+                    else if (_VisualItem is ChartTitle)
+                    {
+                        ChartTitle ct = (ChartTitle)_VisualItem;
+
+                        bounds = GetAdjustedBounds(bounds, ct.EffectiveTitleStyle.Margin);
+                    }
+
+                    Point pt = _ControlDesigner.BehaviorService.ControlToAdornerWindow(_RelatedControl);
+
+                    bounds.Offset(pt);
+                }
+
+                _Bounds = bounds;
+            }
+
+            #region GetAdjustedBounds
+
+            internal Rectangle GetAdjustedBounds(Rectangle bounds, Thickness padding)
+            {
+                if (padding.IsEmpty == false)
+                {
+                    if (bounds.Height > padding.Vertical)
+                    {
+                        bounds.Y += padding.Top;
+                        bounds.Height -= padding.Vertical;
+                    }
+
+                    if (bounds.Width > padding.Horizontal)
+                    {
+                        bounds.X += padding.Left;
+                        bounds.Width -= padding.Horizontal;
+                    }
+                }
+
+                return (bounds);
+            }
+
+            #endregion
+
+            #endregion
+
+            #region Dispose
+
+            public void Dispose()
+            {
+                SelBrush = null;
+                SelBrush2 = null;
+
+                if (_ControlDesigner != null)
+                {
+                    _ControlDesigner.SelectionService.SelectionChanged -= SelectionService_SelectionChanged;
+                    _ControlDesigner.ChangeService.ComponentChanged -= ChangeService_ComponentChanged;
+                }
+            }
+
+            #endregion
+        }
+
+        #endregion
+
+        #region SelectionBehavior
+
+        internal class SelectionBehavior : Behavior
+        {
+            #region Static variables
+
+            static public bool ContextMenuActive;
+
+            #endregion
+
+            #region Private variables
+
+            private IDesigner _ControlDesigner;
+            private Control _RelatedControl;
+            private Point _DragPoint;
+            private bool _MouseDown;
+
+            #endregion
+
+            internal SelectionBehavior(IDesigner controlDesigner)
+            {
+                _ControlDesigner = controlDesigner;
+                _RelatedControl = controlDesigner.Component as Control;
+            }
+
+            #region OnMouseDown
+
+            public override bool OnMouseDown(Glyph g, MouseButtons button, Point mouseLoc)
+            {
+                SelectionGlyph sg = g as SelectionGlyph;
+
+                if (button == MouseButtons.Left)
+                {
+                    if (sg.ControlDesigner.SelectionService.GetComponentSelected(sg.VisualItem) == false)
+                    {
+                        if (ContextMenuActive == false)
+                            SelectVisualElement(sg, sg.VisualItem);
+                    }
+                }
+                else if (button == MouseButtons.Right)
+                {
+                    object primarySelection = sg.ControlDesigner.SelectionService.PrimarySelection;
+
+                    if (CanSelectVisualItem(primarySelection, sg.VisualItem) == true)
+                        SelectVisualElement(sg, sg.VisualItem);
+                }
+
+                ContextMenuActive = false;
+
+                _DragPoint = Control.MousePosition;
+
+                _MouseDown = true;
+
+                return (true);
+            }
+
+            #region CanSelectVisualItem
+
+            private bool CanSelectVisualItem(
+                object primarySelection, ChartVisualElement cve)
+            {
+                if (cve is ChartLegend || cve is ChartTitle || cve is ChartAxis)
+                    return (true);
+
+                if (primarySelection == null)
+                    return (true);
+
+                if (primarySelection is ChartControl)
+                    return (false);
+
+                ChartVisualElement pcve = primarySelection as ChartVisualElement;
+
+                if (pcve == null)
+                    return (true);
+
+                return (IsChildItem(cve, pcve) == false);
+            }
+
+            #region IsChildItem
+
+            private bool IsChildItem(ChartVisualElement cve, ChartVisualElement pcve)
+            {
+                ChartVisualElement parent = cve.Parent as ChartVisualElement;
+
+                while (parent != null)
+                {
+                    if (parent == pcve)
+                        return (true);
+
+                    parent = parent.Parent as ChartVisualElement;
+                }
+
+                return (false);
+            }
+
+            #endregion
+
+            #endregion
+
+            #region SelectVisualElement
+
+            private void SelectVisualElement(SelectionGlyph sg, ChartVisualElement cve)
+            {
+                if (cve != null)
+                    sg.ControlDesigner.SelectionService.SetSelectedComponents(new object[] { cve });
+                else
+                    sg.ControlDesigner.SelectionService.SetSelectedComponents(new object[] { _RelatedControl });
+
+                _RelatedControl.Invalidate();
+            }
+
+            #endregion
+
+            #endregion
+
+            #region OnMouseUp
+
+            public override bool OnMouseUp(Glyph g, MouseButtons button)
+            {
+                ChartControlDesigner ccd = (ChartControlDesigner)_ControlDesigner;
+
+                _MouseDown = false;
+
+                bool value = base.OnMouseUp(g, button);
+
+                if (button == MouseButtons.Right)
+                {
+                    SelectionGlyph sg = g as SelectionGlyph;
+
+                    if (sg != null)
+                    {
+                        if (ShowGlyphContextMenu(g as SelectionGlyph) == true)
+                            return (true);
+
+                        return (true);
+                    }
+                }
+
+                return (value);
+            }
+
+            #region ShowGlyphContextMenu
+
+            private bool ShowGlyphContextMenu(SelectionGlyph sg)
+            {
+                if (sg != null)
+                {
+                    ChartControlDesigner ccd = (ChartControlDesigner)_ControlDesigner;
+
+                    Point pt = _RelatedControl.PointToClient(Control.MousePosition);
+
+                    ContextMenu cm = GetContextMenu(sg, ccd);
+
+                    if (cm != null)
+                    {
+                        ContextMenuActive = true;
+
+                        cm.Show(_RelatedControl, pt);
+
+                        return (true);
+                    }
+                }
+
+                return (false);
+            }
+
+            #region GetContextMenu
+
+            private ContextMenu GetContextMenu(SelectionGlyph sg, ChartControlDesigner ccd)
+            {
+                ContextMenu cm = new ContextMenu();
+
+                MenuItem mi = AddMenuItem(cm, null, "View Code", new EventHandler(MenuViewCode));
+
+                ChartVisualElement cve = ccd.SelectionService.PrimarySelection as ChartVisualElement;
+
+                if (cve != null)
+                {
+                    AddMenuItem(cm, cve, "-", null);
+
+                    if (cve is ChartPanel)
+                    {
+                        AddMenuItem(cm, cve, "Hide Panel", new EventHandler(HideVisualItem));
+
+                        if (cve.Parent != null)
+                            AddMenuItem(cm, cve, "Delete Panel", new EventHandler(DeleteChartPanel));
+                    }
+                    else if (cve is BaseChart)
+                    {
+                        AddMenuItem(cm, cve, "Hide Chart", new EventHandler(HideVisualItem));
+                        AddMenuItem(cm, cve, "Delete Chart", new EventHandler(DeleteChartPanel));
+                    }
+                    else if (cve is ChartTitle)
+                    {
+                        AddMenuItem(cm, cve, "Hide Title", new EventHandler(HideVisualItem));
+                        AddMenuItem(cm, cve, "Delete Title", new EventHandler(DeleteTitle));
+                        AddMenuItem(cm, cve, "-", null);
+
+                        mi = AddMenuItem(cm, cve, "XyAlignment", null);
+
+                        AddSubMenuItem(mi, cve, "Top", new EventHandler(AlignTitleTop));
+                        AddSubMenuItem(mi, cve, "Left", new EventHandler(AlignTitleLeft));
+                        AddSubMenuItem(mi, cve, "Bottom", new EventHandler(AlignTitleBottom));
+                        AddSubMenuItem(mi, cve, "Right", new EventHandler(AlignTitleRight));
+                    }
+                    else if (cve is ChartAxis)
+                    {
+                        ChartAxis axis = (ChartAxis)cve;
+
+                        AddMenuItem(cm, cve, "Hide Axis", new EventHandler(HideVisualItem));
+
+                        if (axis.IsPrimaryAxis == false)
+                            AddMenuItem(cm, cve, "Delete Axis", new EventHandler(DeleteAxis));
+
+                        AddMenuItem(cm, cve, "-", null);
+
+                        mi = AddMenuItem(cm, cve, "Alignment", null);
+
+                        AddSubMenuItem(mi, cve, "Near", new EventHandler(AlignAxisNear));
+                        AddSubMenuItem(mi, cve, "Far", new EventHandler(AlignAxisFar));
+                    }
+                    else if (cve is ChartLegend)
+                    {
+                        ChartLegend legend = (ChartLegend)cve;
+
+                        AddMenuItem(cm, cve, "Hide Legend", new EventHandler(HideVisualItem));
+                    }
+                }
+
+                AddMenuItem(cm, null, "-", null);
+
+                int n = cm.MenuItems.Count;
+
+                AddParentSelect(cm, ccd.SelectionService.PrimarySelection);
+
+                if (cm.MenuItems.Count == n)
+                    cm.MenuItems.RemoveAt(cm.MenuItems.Count - 1);
+
+                return (cm);
+            }
+
+            #region AddMenuItem
+
+            private MenuItem AddMenuItem(ContextMenu cm,
+                ChartVisualElement cve, string text, EventHandler e)
+            {
+                MenuItem mi = new MenuItem(text, e);
+
+                mi.Tag = cve;
+
+                cm.MenuItems.Add(mi);
+
+                return (mi);
+            }
+
+            #endregion
+
+            #region AddSubMenuItem
+
+            private MenuItem AddSubMenuItem(MenuItem mi,
+                ChartVisualElement cve, string text, EventHandler e)
+            {
+                MenuItem submi = new MenuItem(text, e);
+
+                submi.Tag = cve;
+
+                mi.MenuItems.Add(submi);
+
+                return (submi);
+            }
+
+            #endregion
+
+            #region AddParentSelect
+
+            private void AddParentSelect(ContextMenu cm, object psel)
+            {
+                ChartVisualElement cve = psel as ChartVisualElement;
+
+                if (cve != null)
+                {
+                    ChartVisualElement parent = cve.Parent as ChartVisualElement;
+
+                    while (parent != null)
+                    {
+                        if (string.IsNullOrEmpty(parent.Name) == false)
+                        {
+                            AddMenuItem(cm, parent,
+                                "Select '" + parent.Name + "'", new EventHandler(SelectVisualItem));
+                        }
+
+                        parent = parent.Parent as ChartVisualElement;
+                    }
+
+                    string s = string.IsNullOrEmpty(_RelatedControl.Name)
+                        ? "ChartControl" : _RelatedControl.Name;
+
+                    AddMenuItem(cm, null,
+                        "Select '" + s + "'", new EventHandler(SelectVisualItem));
+                }
+
+                Control ctl = _RelatedControl.Parent;
+
+                while (ctl != null)
+                {
+                    if (string.IsNullOrEmpty(ctl.Name) == false)
+                    {
+                        MenuItem mi = AddMenuItem(cm, null,
+                            "Select '" + ctl.Name + "'", new EventHandler(SelectControl));
+
+                        mi.Tag = ctl;
+                    }
+
+                    ctl = ctl.Parent;
+                }
+            }
+
+            #endregion
+
+            #region Item click support
+
+            #region SelectVisualItem
+
+            private void SelectVisualItem(object sender, EventArgs e)
+            {
+                MenuItem mi = sender as MenuItem;
+
+                if (mi != null)
+                {
+                    ChartControlDesigner ccd = (ChartControlDesigner)_ControlDesigner;
+
+                    ChartVisualElement cve = mi.Tag as ChartVisualElement;
+
+                    if (cve != null)
+                        ccd.SelectionService.SetSelectedComponents(new object[] { cve });
+                    else
+                        ccd.SelectionService.SetSelectedComponents(new object[] { _RelatedControl });
+                }
+
+                SelectionBehavior.ContextMenuActive = false;
+            }
+
+            #endregion
+
+            #region SelectControl
+
+            private void SelectControl(object sender, EventArgs e)
+            {
+                MenuItem mi = sender as MenuItem;
+
+                if (mi != null)
+                {
+                    ChartControlDesigner ccd = (ChartControlDesigner)_ControlDesigner;
+
+                    ccd.SelectionService.SetSelectedComponents(new object[] { mi.Tag });
+                }
+
+                SelectionBehavior.ContextMenuActive = false;
+            }
+
+            #endregion
+
+            #region AlignAxis
+
+            #region AlignAxisNear
+
+            private void AlignAxisNear(object sender, EventArgs e)
+            {
+                MenuItem mi = sender as MenuItem;
+
+                if (mi != null)
+                {
+                    ChartAxis axis = mi.Tag as ChartAxis;
+
+                    if (axis != null)
+                        SetValue(axis, "AxisAlignment", AxisAlignment.Near);
+                }
+
+                SelectionBehavior.ContextMenuActive = false;
+            }
+
+            #endregion
+
+            #region AlignAxisFar
+
+            private void AlignAxisFar(object sender, EventArgs e)
+            {
+                MenuItem mi = sender as MenuItem;
+
+                if (mi != null)
+                {
+                    ChartAxis axis = mi.Tag as ChartAxis;
+
+                    if (axis != null)
+                        SetValue(axis, "AxisAlignment", AxisAlignment.Far);
+                }
+
+                SelectionBehavior.ContextMenuActive = false;
+            }
+
+            #endregion
+
+            #endregion
+
+            #region AlignTitle
+
+            private void AlignTitleTop(object sender, EventArgs e)
+            {
+                MenuItem mi = sender as MenuItem;
+
+                if (mi != null)
+                    AlignTitle(mi.Tag as ChartTitle, XyAlignment.Top);
+            }
+
+            private void AlignTitleLeft(object sender, EventArgs e)
+            {
+                MenuItem mi = sender as MenuItem;
+
+                if (mi != null)
+                    AlignTitle(mi.Tag as ChartTitle, XyAlignment.Left);
+            }
+
+            private void AlignTitleBottom(object sender, EventArgs e)
+            {
+                MenuItem mi = sender as MenuItem;
+
+                if (mi != null)
+                    AlignTitle(mi.Tag as ChartTitle, XyAlignment.Bottom);
+            }
+
+            private void AlignTitleRight(object sender, EventArgs e)
+            {
+                MenuItem mi = sender as MenuItem;
+
+                if (mi != null)
+                    AlignTitle(mi.Tag as ChartTitle, XyAlignment.Right);
+            }
+
+            private void AlignTitle(ChartTitle title, XyAlignment xyAlignment)
+            {
+                if (title != null)
+                    SetValue(title, "XyAlignment", xyAlignment);
+
+                SelectionBehavior.ContextMenuActive = false;
+            }
+
+            #endregion
+
+            #region DeleteAxis
+
+            private void DeleteAxis(object sender, EventArgs e)
+            {
+                MenuItem mi = sender as MenuItem;
+
+                if (mi != null)
+                {
+                    ChartAxis axis = mi.Tag as ChartAxis;
+
+                    if (axis != null)
+                    {
+                        ChartXy chartXy = axis.Parent as ChartXy;
+
+                        if (chartXy != null)
+                        {
+                            DialogResult result = MessageBoxEx.Show(
+                                "Are you sure you want to delete the selected Axis?",
+                                "Confirm Delete", MessageBoxButtons.YesNo);
+
+                            if (result == DialogResult.Yes)
+                            {
+                                ChartControlDesigner ccd = (ChartControlDesigner)_ControlDesigner;
+
+                                ccd.ChangeService.OnComponentChanging(chartXy, null);
+
+                                if (axis.AxisOrientation == AxisOrientation.X)
+                                    chartXy.AncillaryAxesX.Remove(axis);
+                                else
+                                    chartXy.AncillaryAxesY.Remove(axis);
+
+                                //axis.Dispose();
+
+                                ccd.ChangeService.OnComponentChanged(chartXy, null, null, null);
+                            }
+                        }
+                    }
+                }
+
+                SelectionBehavior.ContextMenuActive = false;
+            }
+
+            #endregion
+
+            #region DeleteTitle
+
+            private void DeleteTitle(object sender, EventArgs e)
+            {
+                MenuItem mi = sender as MenuItem;
+
+                if (mi != null)
+                {
+                    ChartTitle title = mi.Tag as ChartTitle;
+
+                    if (title != null)
+                    {
+                        ChartContainer parent = title.Parent as ChartContainer;
+
+                        if (parent != null)
+                        {
+                            DialogResult result = MessageBoxEx.Show(
+                                "Are you sure you want to delete the selected Title?",
+                                "Confirm Delete", MessageBoxButtons.YesNo);
+
+                            if (result == DialogResult.Yes)
+                            {
+                                ChartControlDesigner ccd = (ChartControlDesigner)_ControlDesigner;
+
+                                ccd.ChangeService.OnComponentChanging(parent.Titles, null);
+
+                                parent.Titles.Remove(title);
+                                //title.Dispose();
+
+                                ccd.ChangeService.OnComponentChanged(parent.Titles, null, null, null);
+                            }
+                        }
+                    }
+                }
+
+                SelectionBehavior.ContextMenuActive = false;
+            }
+
+            #endregion
+
+            #region DeleteChartPanel
+
+            private void DeleteChartPanel(object sender, EventArgs e)
+            {
+                MenuItem mi = sender as MenuItem;
+
+                if (mi != null)
+                {
+                    ChartContainer cc = mi.Tag as ChartContainer;
+
+                    if (cc != null)
+                    {
+                        ChartPanel parent = cc.Parent as ChartPanel;
+
+                        if (parent != null)
+                        {
+                            DialogResult result = MessageBoxEx.Show(
+                                "Are you sure you want to delete the selected " +
+                                (cc is ChartPanel ? "ChartPanel?" : "Chart?"),
+                                "Confirm Delete", MessageBoxButtons.YesNo);
+
+                            if (result == DialogResult.Yes)
+                            {
+                                ChartControlDesigner ccd = (ChartControlDesigner)_ControlDesigner;
+
+                                ccd.ChangeService.OnComponentChanging(parent.ChartContainers, null);
+
+                                parent.ChartContainers.Remove(cc);
+                                //cc.Dispose();
+
+                                ccd.ChangeService.OnComponentChanged(parent.ChartContainers, null, null, null);
+                            }
+                        }
+                    }
+                }
+
+                SelectionBehavior.ContextMenuActive = false;
+            }
+
+            #endregion
+
+            #region HideVisualItem
+
+            private void HideVisualItem(object sender, EventArgs e)
+            {
+                MenuItem mi = sender as MenuItem;
+
+                if (mi != null)
+                {
+                    ChartVisualElement cve = mi.Tag as ChartVisualElement;
+
+                    if (cve != null)
+                        SetValue(cve, "Visible", false);
+                }
+
+                SelectionBehavior.ContextMenuActive = false;
+            }
+
+            #endregion
+
+            #region MenuViewCode
+
+            private void MenuViewCode(object sender, EventArgs e)
+            {
+                ChartControlDesigner ccd = (ChartControlDesigner)_ControlDesigner;
+                IMenuCommandService mcs = ccd.MenuCommandService;
+
+                mcs.GlobalInvoke(StandardCommands.ViewCode);
+
+                SelectionBehavior.ContextMenuActive = false;
+            }
+
+            #endregion
+
+            #endregion
+
+            #endregion
+
+            #endregion
+
+            #endregion
+
+            #region OnMouseMove
+
+            public override bool OnMouseMove(Glyph g, MouseButtons button, Point mouseLoc)
+            {
+                if (Control.MouseButtons == 0)
+                    _MouseDown = false;
+
+                if (_MouseDown == true && Control.MouseButtons != 0)
+                {
+                    Point pt = Control.MousePosition;
+
+                    if (Math.Abs(_DragPoint.X - pt.X) > 4 || Math.Abs(_DragPoint.Y - pt.Y) > 4)
+                    {
+                        ChartControlDesigner ccd = (ChartControlDesigner)_ControlDesigner;
+
+                        ccd.OnMouseDragBegin(pt.X, pt.Y);
+
+                        return (true);
+                    }
+                }
+
+                return base.OnMouseMove(g, button, mouseLoc);
+            }
+
+            #endregion
+
+            #region SetValue
+
+            private void SetValue(object item, string property, object value)
+            {
+                ChartControlDesigner ccd = (ChartControlDesigner)_ControlDesigner;
+
+                ccd.ChangeService.OnComponentChanging(item, null);
+
+                GetPropertyByName(item, property).SetValue(item, value);
+
+                ccd.ChangeService.OnComponentChanged(item, null, null, null);
+            }
+
+            #endregion
+
+            #region GetPropertyByName
+
+            private PropertyDescriptor GetPropertyByName(object item, string propName)
+            {
+                PropertyDescriptor prop =
+                    TypeDescriptor.GetProperties(item)[propName];
+
+                if (prop == null)
+                    throw new ArgumentException("Matching property not found.", propName);
+
+                return (prop);
+            }
+
+            #endregion
+        }
+
+        #endregion
+
+        #region Dispose
+
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                if (ChangeService != null)
+                {
+                    ChangeService.ComponentChanged -= ChangeService_ComponentChanged;
+                    ChangeService.ComponentAdded -= ChangeService_ComponentAdded;
+                    ChangeService.ComponentRemoved -= ChangeService_ComponentRemoved;
+                }
+
+                if (BehaviorService != null)
+                    RemoveAdorners();
+            }
+
+            base.Dispose(disposing);
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/ChartSeriesCollectionEditor.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/ChartSeriesCollectionEditor.cs
new file mode 100644
index 00000000..e9609bda
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/ChartSeriesCollectionEditor.cs	
@@ -0,0 +1,84 @@
+using System;
+using System.ComponentModel;
+using System.ComponentModel.Design;
+using DevComponents.DotNetBar.Charts;
+
+namespace DevComponents.Charts.Design
+{
+    public class ChartSeriesCollectionEditor : BaseCollectionEditor
+    {
+        #region Private variables
+
+        private BaseChart _BaseChart;
+
+        #endregion
+
+        public ChartSeriesCollectionEditor(Type type)
+            : base(type)
+        {
+        }
+
+        #region EditValue
+
+        public override object EditValue(
+            ITypeDescriptorContext context, IServiceProvider provider, object value)
+        {
+            _BaseChart = context.Instance as BaseChart;
+
+            return (base.EditValue(context, provider, value));
+        }
+
+        #endregion
+
+        #region CreateInstance
+
+        protected override object CreateInstance(Type itemType)
+        {
+            if (itemType == typeof(PieSeries) || itemType == typeof(ChartSeries))
+            {
+                BaseSeries series = (BaseSeries)base.CreateInstance(itemType);
+
+                series.Name = _BaseChart.BaseSeries.GetUniqueName();
+
+                return (series);
+            }
+
+            return (base.CreateInstance(itemType));
+        }
+
+        #endregion
+
+        #region CopyButton_Click
+
+        protected override void CopyButton_Click(object sender, EventArgs e)
+        {
+            BaseSeries item = ChartItem as BaseSeries;
+
+            if (item != null)
+            {
+                if (AddButton != null)
+                {
+                    AddButton.PerformClick();
+
+                    ChartBaseSeriesCollection csc = _BaseChart.BaseSeries;
+                    BaseSeries clone = csc[csc.Count - 1];
+
+                    string name = clone.Name;
+                    item.CopyTo(clone);
+                    clone.Name = name;
+                }
+            }
+        }
+
+        #endregion
+
+        #region CreateCollectionItemType
+
+        protected override Type CreateCollectionItemType()
+        {
+            return (_BaseChart is PieChart ? typeof(PieSeries) : typeof(ChartSeries));
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/ChartStyleDialog.Designer.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/ChartStyleDialog.Designer.cs
new file mode 100644
index 00000000..a85ae423
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/ChartStyleDialog.Designer.cs	
@@ -0,0 +1,688 @@
+namespace DevComponents.Charts.Design
+{
+    partial class ChartStyleDialog
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form 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()
+        {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ChartStyleDialog));
+            this.label1 = new System.Windows.Forms.Label();
+            this.cbLinePlot = new System.Windows.Forms.CheckBox();
+            this.cbPointPlot = new System.Windows.Forms.CheckBox();
+            this.btnOk = new System.Windows.Forms.Button();
+            this.cbBlankChart = new System.Windows.Forms.CheckBox();
+            this.cbMultiAxis = new System.Windows.Forms.CheckBox();
+            this.cbMultiChart = new System.Windows.Forms.CheckBox();
+            this.cbHDotPlot = new System.Windows.Forms.CheckBox();
+            this.cbVDotPlot = new System.Windows.Forms.CheckBox();
+            this.cbBubblePlot = new System.Windows.Forms.CheckBox();
+            this.label2 = new System.Windows.Forms.Label();
+            this.pageSlider1 = new DevComponents.DotNetBar.Controls.PageSlider();
+            this.pageSliderPage1 = new DevComponents.DotNetBar.Controls.PageSliderPage();
+            this.cbStepLine = new System.Windows.Forms.CheckBox();
+            this.cbLineArea = new System.Windows.Forms.CheckBox();
+            this.pageSliderPage2 = new DevComponents.DotNetBar.Controls.PageSliderPage();
+            this.cbRangeBarH = new System.Windows.Forms.CheckBox();
+            this.cbRangeBarV = new System.Windows.Forms.CheckBox();
+            this.cbBarH = new System.Windows.Forms.CheckBox();
+            this.cbBarV = new System.Windows.Forms.CheckBox();
+            this.pageSliderPage3 = new DevComponents.DotNetBar.Controls.PageSliderPage();
+            this.cbHiLoHBox = new System.Windows.Forms.CheckBox();
+            this.cbHiLoVBox = new System.Windows.Forms.CheckBox();
+            this.cbHiLoHLine = new System.Windows.Forms.CheckBox();
+            this.cbHiLoVLine = new System.Windows.Forms.CheckBox();
+            this.pageSliderPage4 = new DevComponents.DotNetBar.Controls.PageSliderPage();
+            this.cbPieMultiRingRev = new System.Windows.Forms.CheckBox();
+            this.cbPieMultiRing = new System.Windows.Forms.CheckBox();
+            this.cbPieExtentFill = new System.Windows.Forms.CheckBox();
+            this.cbPieExtent = new System.Windows.Forms.CheckBox();
+            this.cbPieDonut = new System.Windows.Forms.CheckBox();
+            this.cbPieSimple = new System.Windows.Forms.CheckBox();
+            this.pageSliderPage5 = new DevComponents.DotNetBar.Controls.PageSliderPage();
+            this.cbPieOverlay = new System.Windows.Forms.CheckBox();
+            this.cbPieGridAngle = new System.Windows.Forms.CheckBox();
+            this.cbPieShowSingleRing = new System.Windows.Forms.CheckBox();
+            this.cbPieMultiSeries = new System.Windows.Forms.CheckBox();
+            this.pageSlider1.SuspendLayout();
+            this.pageSliderPage1.SuspendLayout();
+            this.pageSliderPage2.SuspendLayout();
+            this.pageSliderPage3.SuspendLayout();
+            this.pageSliderPage4.SuspendLayout();
+            this.pageSliderPage5.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // label1
+            // 
+            this.label1.BackColor = System.Drawing.SystemColors.ControlLight;
+            this.label1.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.label1.Location = new System.Drawing.Point(0, 445);
+            this.label1.Name = "label1";
+            this.label1.Padding = new System.Windows.Forms.Padding(10, 0, 0, 0);
+            this.label1.Size = new System.Drawing.Size(648, 55);
+            this.label1.TabIndex = 4;
+            this.label1.Text = "Please select your starting Chart template";
+            this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // cbLinePlot
+            // 
+            this.cbLinePlot.Appearance = System.Windows.Forms.Appearance.Button;
+            this.cbLinePlot.AutoSize = true;
+            this.cbLinePlot.Image = ((System.Drawing.Image)(resources.GetObject("cbLinePlot.Image")));
+            this.cbLinePlot.Location = new System.Drawing.Point(347, 3);
+            this.cbLinePlot.Name = "cbLinePlot";
+            this.cbLinePlot.Size = new System.Drawing.Size(166, 173);
+            this.cbLinePlot.TabIndex = 3;
+            this.cbLinePlot.Text = "Line Plot";
+            this.cbLinePlot.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.cbLinePlot.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+            this.cbLinePlot.UseVisualStyleBackColor = true;
+            this.cbLinePlot.Click += new System.EventHandler(this.CbClicked);
+            // 
+            // cbPointPlot
+            // 
+            this.cbPointPlot.Appearance = System.Windows.Forms.Appearance.Button;
+            this.cbPointPlot.AutoSize = true;
+            this.cbPointPlot.Checked = true;
+            this.cbPointPlot.CheckState = System.Windows.Forms.CheckState.Checked;
+            this.cbPointPlot.Image = ((System.Drawing.Image)(resources.GetObject("cbPointPlot.Image")));
+            this.cbPointPlot.Location = new System.Drawing.Point(175, 3);
+            this.cbPointPlot.Name = "cbPointPlot";
+            this.cbPointPlot.Size = new System.Drawing.Size(166, 173);
+            this.cbPointPlot.TabIndex = 2;
+            this.cbPointPlot.Text = "Point Plot";
+            this.cbPointPlot.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.cbPointPlot.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+            this.cbPointPlot.UseVisualStyleBackColor = true;
+            this.cbPointPlot.Click += new System.EventHandler(this.CbClicked);
+            // 
+            // btnOk
+            // 
+            this.btnOk.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnOk.DialogResult = System.Windows.Forms.DialogResult.OK;
+            this.btnOk.Location = new System.Drawing.Point(546, 461);
+            this.btnOk.Name = "btnOk";
+            this.btnOk.Size = new System.Drawing.Size(75, 23);
+            this.btnOk.TabIndex = 1;
+            this.btnOk.Text = "Select";
+            this.btnOk.UseVisualStyleBackColor = true;
+            // 
+            // cbBlankChart
+            // 
+            this.cbBlankChart.Appearance = System.Windows.Forms.Appearance.Button;
+            this.cbBlankChart.AutoSize = true;
+            this.cbBlankChart.Image = ((System.Drawing.Image)(resources.GetObject("cbBlankChart.Image")));
+            this.cbBlankChart.Location = new System.Drawing.Point(3, 3);
+            this.cbBlankChart.Name = "cbBlankChart";
+            this.cbBlankChart.Size = new System.Drawing.Size(166, 173);
+            this.cbBlankChart.TabIndex = 9;
+            this.cbBlankChart.Text = "Blank Chart";
+            this.cbBlankChart.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.cbBlankChart.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+            this.cbBlankChart.UseVisualStyleBackColor = true;
+            this.cbBlankChart.Click += new System.EventHandler(this.CbClicked);
+            // 
+            // cbMultiAxis
+            // 
+            this.cbMultiAxis.Appearance = System.Windows.Forms.Appearance.Button;
+            this.cbMultiAxis.AutoSize = true;
+            this.cbMultiAxis.Image = ((System.Drawing.Image)(resources.GetObject("cbMultiAxis.Image")));
+            this.cbMultiAxis.Location = new System.Drawing.Point(347, 182);
+            this.cbMultiAxis.Name = "cbMultiAxis";
+            this.cbMultiAxis.Size = new System.Drawing.Size(166, 173);
+            this.cbMultiAxis.TabIndex = 4;
+            this.cbMultiAxis.Text = "Multi Axis";
+            this.cbMultiAxis.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.cbMultiAxis.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+            this.cbMultiAxis.UseVisualStyleBackColor = true;
+            this.cbMultiAxis.Click += new System.EventHandler(this.CbClicked);
+            // 
+            // cbMultiChart
+            // 
+            this.cbMultiChart.Appearance = System.Windows.Forms.Appearance.Button;
+            this.cbMultiChart.AutoSize = true;
+            this.cbMultiChart.Image = ((System.Drawing.Image)(resources.GetObject("cbMultiChart.Image")));
+            this.cbMultiChart.Location = new System.Drawing.Point(3, 3);
+            this.cbMultiChart.Name = "cbMultiChart";
+            this.cbMultiChart.Size = new System.Drawing.Size(166, 173);
+            this.cbMultiChart.TabIndex = 5;
+            this.cbMultiChart.Text = "Multi Chart";
+            this.cbMultiChart.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.cbMultiChart.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+            this.cbMultiChart.UseVisualStyleBackColor = true;
+            this.cbMultiChart.Click += new System.EventHandler(this.CbClicked);
+            // 
+            // cbHDotPlot
+            // 
+            this.cbHDotPlot.Appearance = System.Windows.Forms.Appearance.Button;
+            this.cbHDotPlot.AutoSize = true;
+            this.cbHDotPlot.Image = ((System.Drawing.Image)(resources.GetObject("cbHDotPlot.Image")));
+            this.cbHDotPlot.Location = new System.Drawing.Point(347, 3);
+            this.cbHDotPlot.Name = "cbHDotPlot";
+            this.cbHDotPlot.Size = new System.Drawing.Size(166, 173);
+            this.cbHDotPlot.TabIndex = 6;
+            this.cbHDotPlot.Text = "Vertical DotPlot";
+            this.cbHDotPlot.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.cbHDotPlot.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+            this.cbHDotPlot.UseVisualStyleBackColor = true;
+            this.cbHDotPlot.Click += new System.EventHandler(this.CbClicked);
+            // 
+            // cbVDotPlot
+            // 
+            this.cbVDotPlot.Appearance = System.Windows.Forms.Appearance.Button;
+            this.cbVDotPlot.AutoSize = true;
+            this.cbVDotPlot.Image = ((System.Drawing.Image)(resources.GetObject("cbVDotPlot.Image")));
+            this.cbVDotPlot.Location = new System.Drawing.Point(347, 184);
+            this.cbVDotPlot.Name = "cbVDotPlot";
+            this.cbVDotPlot.Size = new System.Drawing.Size(166, 173);
+            this.cbVDotPlot.TabIndex = 7;
+            this.cbVDotPlot.Text = "Horizontal DotPlot";
+            this.cbVDotPlot.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.cbVDotPlot.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+            this.cbVDotPlot.UseVisualStyleBackColor = true;
+            this.cbVDotPlot.Click += new System.EventHandler(this.CbClicked);
+            // 
+            // cbBubblePlot
+            // 
+            this.cbBubblePlot.Appearance = System.Windows.Forms.Appearance.Button;
+            this.cbBubblePlot.AutoSize = true;
+            this.cbBubblePlot.Image = ((System.Drawing.Image)(resources.GetObject("cbBubblePlot.Image")));
+            this.cbBubblePlot.Location = new System.Drawing.Point(3, 182);
+            this.cbBubblePlot.Name = "cbBubblePlot";
+            this.cbBubblePlot.Size = new System.Drawing.Size(166, 173);
+            this.cbBubblePlot.TabIndex = 8;
+            this.cbBubblePlot.Text = "Bubble Plot";
+            this.cbBubblePlot.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.cbBubblePlot.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+            this.cbBubblePlot.UseVisualStyleBackColor = true;
+            this.cbBubblePlot.Click += new System.EventHandler(this.CbClicked);
+            // 
+            // label2
+            // 
+            this.label2.BackColor = System.Drawing.SystemColors.Control;
+            this.label2.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.label2.ForeColor = System.Drawing.Color.DarkBlue;
+            this.label2.Location = new System.Drawing.Point(0, 370);
+            this.label2.Name = "label2";
+            this.label2.Padding = new System.Windows.Forms.Padding(10, 0, 0, 0);
+            this.label2.Size = new System.Drawing.Size(648, 75);
+            this.label2.TabIndex = 48;
+            this.label2.Text = "In the designer you can click and drag to move the chart, or single click to sele" +
+    "ct individual elements for design.\r\nContext menus are also available for each se" +
+    "lected item.";
+            this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // pageSlider1
+            // 
+            this.pageSlider1.Controls.Add(this.pageSliderPage1);
+            this.pageSlider1.Controls.Add(this.pageSliderPage2);
+            this.pageSlider1.Controls.Add(this.pageSliderPage3);
+            this.pageSlider1.Controls.Add(this.pageSliderPage4);
+            this.pageSlider1.Controls.Add(this.pageSliderPage5);
+            this.pageSlider1.Location = new System.Drawing.Point(2, 2);
+            this.pageSlider1.Name = "pageSlider1";
+            this.pageSlider1.SelectedPage = this.pageSliderPage1;
+            this.pageSlider1.Size = new System.Drawing.Size(644, 379);
+            this.pageSlider1.TabIndex = 49;
+            this.pageSlider1.Text = "pageSlider1";
+            // 
+            // pageSliderPage1
+            // 
+            this.pageSliderPage1.Controls.Add(this.cbStepLine);
+            this.pageSliderPage1.Controls.Add(this.cbBlankChart);
+            this.pageSliderPage1.Controls.Add(this.cbMultiAxis);
+            this.pageSliderPage1.Controls.Add(this.cbPointPlot);
+            this.pageSliderPage1.Controls.Add(this.cbLinePlot);
+            this.pageSliderPage1.Controls.Add(this.cbLineArea);
+            this.pageSliderPage1.Location = new System.Drawing.Point(4, 8);
+            this.pageSliderPage1.Name = "pageSliderPage1";
+            this.pageSliderPage1.Size = new System.Drawing.Size(538, 367);
+            this.pageSliderPage1.TabIndex = 3;
+            // 
+            // cbStepLine
+            // 
+            this.cbStepLine.Appearance = System.Windows.Forms.Appearance.Button;
+            this.cbStepLine.AutoSize = true;
+            this.cbStepLine.Image = ((System.Drawing.Image)(resources.GetObject("cbStepLine.Image")));
+            this.cbStepLine.Location = new System.Drawing.Point(3, 182);
+            this.cbStepLine.Name = "cbStepLine";
+            this.cbStepLine.Size = new System.Drawing.Size(166, 173);
+            this.cbStepLine.TabIndex = 50;
+            this.cbStepLine.Text = "Step Line";
+            this.cbStepLine.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.cbStepLine.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+            this.cbStepLine.UseVisualStyleBackColor = true;
+            this.cbStepLine.Click += new System.EventHandler(this.CbClicked);
+            // 
+            // cbLineArea
+            // 
+            this.cbLineArea.Appearance = System.Windows.Forms.Appearance.Button;
+            this.cbLineArea.AutoSize = true;
+            this.cbLineArea.Image = ((System.Drawing.Image)(resources.GetObject("cbLineArea.Image")));
+            this.cbLineArea.Location = new System.Drawing.Point(175, 182);
+            this.cbLineArea.Name = "cbLineArea";
+            this.cbLineArea.Size = new System.Drawing.Size(166, 173);
+            this.cbLineArea.TabIndex = 50;
+            this.cbLineArea.Text = "Line Area";
+            this.cbLineArea.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.cbLineArea.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+            this.cbLineArea.UseVisualStyleBackColor = true;
+            this.cbLineArea.Click += new System.EventHandler(this.CbClicked);
+            // 
+            // pageSliderPage2
+            // 
+            this.pageSliderPage2.Controls.Add(this.cbRangeBarH);
+            this.pageSliderPage2.Controls.Add(this.cbRangeBarV);
+            this.pageSliderPage2.Controls.Add(this.cbBarH);
+            this.pageSliderPage2.Controls.Add(this.cbBubblePlot);
+            this.pageSliderPage2.Controls.Add(this.cbBarV);
+            this.pageSliderPage2.Controls.Add(this.cbMultiChart);
+            this.pageSliderPage2.Location = new System.Drawing.Point(590, 8);
+            this.pageSliderPage2.Name = "pageSliderPage2";
+            this.pageSliderPage2.Size = new System.Drawing.Size(538, 367);
+            this.pageSliderPage2.TabIndex = 4;
+            // 
+            // cbRangeBarH
+            // 
+            this.cbRangeBarH.Appearance = System.Windows.Forms.Appearance.Button;
+            this.cbRangeBarH.AutoSize = true;
+            this.cbRangeBarH.Image = ((System.Drawing.Image)(resources.GetObject("cbRangeBarH.Image")));
+            this.cbRangeBarH.Location = new System.Drawing.Point(347, 182);
+            this.cbRangeBarH.Name = "cbRangeBarH";
+            this.cbRangeBarH.Size = new System.Drawing.Size(166, 173);
+            this.cbRangeBarH.TabIndex = 50;
+            this.cbRangeBarH.Text = "Horizontal Range Bar";
+            this.cbRangeBarH.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.cbRangeBarH.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+            this.cbRangeBarH.UseVisualStyleBackColor = true;
+            this.cbRangeBarH.Click += new System.EventHandler(this.CbClicked);
+            // 
+            // cbRangeBarV
+            // 
+            this.cbRangeBarV.Appearance = System.Windows.Forms.Appearance.Button;
+            this.cbRangeBarV.AutoSize = true;
+            this.cbRangeBarV.Image = ((System.Drawing.Image)(resources.GetObject("cbRangeBarV.Image")));
+            this.cbRangeBarV.Location = new System.Drawing.Point(347, 3);
+            this.cbRangeBarV.Name = "cbRangeBarV";
+            this.cbRangeBarV.Size = new System.Drawing.Size(166, 173);
+            this.cbRangeBarV.TabIndex = 50;
+            this.cbRangeBarV.Text = "Vertical Range Bar";
+            this.cbRangeBarV.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.cbRangeBarV.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+            this.cbRangeBarV.UseVisualStyleBackColor = true;
+            this.cbRangeBarV.Click += new System.EventHandler(this.CbClicked);
+            // 
+            // cbBarH
+            // 
+            this.cbBarH.Appearance = System.Windows.Forms.Appearance.Button;
+            this.cbBarH.AutoSize = true;
+            this.cbBarH.Image = ((System.Drawing.Image)(resources.GetObject("cbBarH.Image")));
+            this.cbBarH.Location = new System.Drawing.Point(175, 182);
+            this.cbBarH.Name = "cbBarH";
+            this.cbBarH.Size = new System.Drawing.Size(166, 173);
+            this.cbBarH.TabIndex = 50;
+            this.cbBarH.Text = "Horizontal Bar";
+            this.cbBarH.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.cbBarH.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+            this.cbBarH.UseVisualStyleBackColor = true;
+            this.cbBarH.Click += new System.EventHandler(this.CbClicked);
+            // 
+            // cbBarV
+            // 
+            this.cbBarV.Appearance = System.Windows.Forms.Appearance.Button;
+            this.cbBarV.AutoSize = true;
+            this.cbBarV.Image = ((System.Drawing.Image)(resources.GetObject("cbBarV.Image")));
+            this.cbBarV.Location = new System.Drawing.Point(175, 3);
+            this.cbBarV.Name = "cbBarV";
+            this.cbBarV.Size = new System.Drawing.Size(166, 173);
+            this.cbBarV.TabIndex = 50;
+            this.cbBarV.Text = "Vertical Bar";
+            this.cbBarV.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.cbBarV.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+            this.cbBarV.UseVisualStyleBackColor = true;
+            this.cbBarV.Click += new System.EventHandler(this.CbClicked);
+            // 
+            // pageSliderPage3
+            // 
+            this.pageSliderPage3.Controls.Add(this.cbHiLoHBox);
+            this.pageSliderPage3.Controls.Add(this.cbHiLoVBox);
+            this.pageSliderPage3.Controls.Add(this.cbHiLoHLine);
+            this.pageSliderPage3.Controls.Add(this.cbHiLoVLine);
+            this.pageSliderPage3.Controls.Add(this.cbVDotPlot);
+            this.pageSliderPage3.Controls.Add(this.cbHDotPlot);
+            this.pageSliderPage3.Location = new System.Drawing.Point(1176, 8);
+            this.pageSliderPage3.Name = "pageSliderPage3";
+            this.pageSliderPage3.Size = new System.Drawing.Size(538, 367);
+            this.pageSliderPage3.TabIndex = 5;
+            // 
+            // cbHiLoHBox
+            // 
+            this.cbHiLoHBox.Appearance = System.Windows.Forms.Appearance.Button;
+            this.cbHiLoHBox.AutoSize = true;
+            this.cbHiLoHBox.Image = ((System.Drawing.Image)(resources.GetObject("cbHiLoHBox.Image")));
+            this.cbHiLoHBox.Location = new System.Drawing.Point(175, 182);
+            this.cbHiLoHBox.Name = "cbHiLoHBox";
+            this.cbHiLoHBox.Size = new System.Drawing.Size(166, 173);
+            this.cbHiLoHBox.TabIndex = 11;
+            this.cbHiLoHBox.Text = "Horizontal HiLoBar (Box)";
+            this.cbHiLoHBox.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.cbHiLoHBox.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+            this.cbHiLoHBox.UseVisualStyleBackColor = true;
+            this.cbHiLoHBox.Click += new System.EventHandler(this.CbClicked);
+            // 
+            // cbHiLoVBox
+            // 
+            this.cbHiLoVBox.Appearance = System.Windows.Forms.Appearance.Button;
+            this.cbHiLoVBox.AutoSize = true;
+            this.cbHiLoVBox.Image = ((System.Drawing.Image)(resources.GetObject("cbHiLoVBox.Image")));
+            this.cbHiLoVBox.Location = new System.Drawing.Point(175, 3);
+            this.cbHiLoVBox.Name = "cbHiLoVBox";
+            this.cbHiLoVBox.Size = new System.Drawing.Size(166, 173);
+            this.cbHiLoVBox.TabIndex = 10;
+            this.cbHiLoVBox.Text = "Vertical HiLoBar (Box)";
+            this.cbHiLoVBox.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.cbHiLoVBox.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+            this.cbHiLoVBox.UseVisualStyleBackColor = true;
+            this.cbHiLoVBox.Click += new System.EventHandler(this.CbClicked);
+            // 
+            // cbHiLoHLine
+            // 
+            this.cbHiLoHLine.Appearance = System.Windows.Forms.Appearance.Button;
+            this.cbHiLoHLine.AutoSize = true;
+            this.cbHiLoHLine.Image = ((System.Drawing.Image)(resources.GetObject("cbHiLoHLine.Image")));
+            this.cbHiLoHLine.Location = new System.Drawing.Point(6, 182);
+            this.cbHiLoHLine.Name = "cbHiLoHLine";
+            this.cbHiLoHLine.Size = new System.Drawing.Size(166, 173);
+            this.cbHiLoHLine.TabIndex = 9;
+            this.cbHiLoHLine.Text = "Horizontal HiLoBar (Line)";
+            this.cbHiLoHLine.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.cbHiLoHLine.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+            this.cbHiLoHLine.UseVisualStyleBackColor = true;
+            this.cbHiLoHLine.Click += new System.EventHandler(this.CbClicked);
+            // 
+            // cbHiLoVLine
+            // 
+            this.cbHiLoVLine.Appearance = System.Windows.Forms.Appearance.Button;
+            this.cbHiLoVLine.AutoSize = true;
+            this.cbHiLoVLine.Image = ((System.Drawing.Image)(resources.GetObject("cbHiLoVLine.Image")));
+            this.cbHiLoVLine.Location = new System.Drawing.Point(3, 3);
+            this.cbHiLoVLine.Name = "cbHiLoVLine";
+            this.cbHiLoVLine.Size = new System.Drawing.Size(166, 173);
+            this.cbHiLoVLine.TabIndex = 8;
+            this.cbHiLoVLine.Text = "Vertical HiLoBar (Line)";
+            this.cbHiLoVLine.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.cbHiLoVLine.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+            this.cbHiLoVLine.UseVisualStyleBackColor = true;
+            this.cbHiLoVLine.Click += new System.EventHandler(this.CbClicked);
+            // 
+            // pageSliderPage4
+            // 
+            this.pageSliderPage4.Controls.Add(this.cbPieMultiRingRev);
+            this.pageSliderPage4.Controls.Add(this.cbPieMultiRing);
+            this.pageSliderPage4.Controls.Add(this.cbPieExtentFill);
+            this.pageSliderPage4.Controls.Add(this.cbPieExtent);
+            this.pageSliderPage4.Controls.Add(this.cbPieDonut);
+            this.pageSliderPage4.Controls.Add(this.cbPieSimple);
+            this.pageSliderPage4.Location = new System.Drawing.Point(1762, 8);
+            this.pageSliderPage4.Name = "pageSliderPage4";
+            this.pageSliderPage4.Size = new System.Drawing.Size(538, 367);
+            this.pageSliderPage4.TabIndex = 6;
+            // 
+            // cbPieMultiRingRev
+            // 
+            this.cbPieMultiRingRev.Appearance = System.Windows.Forms.Appearance.Button;
+            this.cbPieMultiRingRev.AutoSize = true;
+            this.cbPieMultiRingRev.Image = ((System.Drawing.Image)(resources.GetObject("cbPieMultiRingRev.Image")));
+            this.cbPieMultiRingRev.Location = new System.Drawing.Point(350, 182);
+            this.cbPieMultiRingRev.Name = "cbPieMultiRingRev";
+            this.cbPieMultiRingRev.Size = new System.Drawing.Size(166, 173);
+            this.cbPieMultiRingRev.TabIndex = 16;
+            this.cbPieMultiRingRev.Text = "Multi Ring Reversed";
+            this.cbPieMultiRingRev.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.cbPieMultiRingRev.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+            this.cbPieMultiRingRev.UseVisualStyleBackColor = true;
+            this.cbPieMultiRingRev.Click += new System.EventHandler(this.CbClicked);
+            // 
+            // cbPieMultiRing
+            // 
+            this.cbPieMultiRing.Appearance = System.Windows.Forms.Appearance.Button;
+            this.cbPieMultiRing.AutoSize = true;
+            this.cbPieMultiRing.Image = ((System.Drawing.Image)(resources.GetObject("cbPieMultiRing.Image")));
+            this.cbPieMultiRing.Location = new System.Drawing.Point(350, 5);
+            this.cbPieMultiRing.Name = "cbPieMultiRing";
+            this.cbPieMultiRing.Size = new System.Drawing.Size(166, 173);
+            this.cbPieMultiRing.TabIndex = 15;
+            this.cbPieMultiRing.Text = "Multi Ring";
+            this.cbPieMultiRing.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.cbPieMultiRing.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+            this.cbPieMultiRing.UseVisualStyleBackColor = true;
+            this.cbPieMultiRing.Click += new System.EventHandler(this.CbClicked);
+            // 
+            // cbPieExtentFill
+            // 
+            this.cbPieExtentFill.Appearance = System.Windows.Forms.Appearance.Button;
+            this.cbPieExtentFill.AutoSize = true;
+            this.cbPieExtentFill.Image = ((System.Drawing.Image)(resources.GetObject("cbPieExtentFill.Image")));
+            this.cbPieExtentFill.Location = new System.Drawing.Point(178, 182);
+            this.cbPieExtentFill.Name = "cbPieExtentFill";
+            this.cbPieExtentFill.Size = new System.Drawing.Size(166, 173);
+            this.cbPieExtentFill.TabIndex = 14;
+            this.cbPieExtentFill.Text = "Pie Chart - Extent Fill";
+            this.cbPieExtentFill.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.cbPieExtentFill.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+            this.cbPieExtentFill.UseVisualStyleBackColor = true;
+            this.cbPieExtentFill.Click += new System.EventHandler(this.CbClicked);
+            // 
+            // cbPieExtent
+            // 
+            this.cbPieExtent.Appearance = System.Windows.Forms.Appearance.Button;
+            this.cbPieExtent.AutoSize = true;
+            this.cbPieExtent.Image = ((System.Drawing.Image)(resources.GetObject("cbPieExtent.Image")));
+            this.cbPieExtent.Location = new System.Drawing.Point(178, 5);
+            this.cbPieExtent.Name = "cbPieExtent";
+            this.cbPieExtent.Size = new System.Drawing.Size(166, 173);
+            this.cbPieExtent.TabIndex = 13;
+            this.cbPieExtent.Text = "Pie Chart - Varried Extent";
+            this.cbPieExtent.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.cbPieExtent.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+            this.cbPieExtent.UseVisualStyleBackColor = true;
+            this.cbPieExtent.Click += new System.EventHandler(this.CbClicked);
+            // 
+            // cbPieDonut
+            // 
+            this.cbPieDonut.Appearance = System.Windows.Forms.Appearance.Button;
+            this.cbPieDonut.AutoSize = true;
+            this.cbPieDonut.Image = ((System.Drawing.Image)(resources.GetObject("cbPieDonut.Image")));
+            this.cbPieDonut.Location = new System.Drawing.Point(6, 182);
+            this.cbPieDonut.Name = "cbPieDonut";
+            this.cbPieDonut.Size = new System.Drawing.Size(166, 173);
+            this.cbPieDonut.TabIndex = 12;
+            this.cbPieDonut.Text = "Donut";
+            this.cbPieDonut.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.cbPieDonut.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+            this.cbPieDonut.UseVisualStyleBackColor = true;
+            this.cbPieDonut.Click += new System.EventHandler(this.CbClicked);
+            // 
+            // cbPieSimple
+            // 
+            this.cbPieSimple.Appearance = System.Windows.Forms.Appearance.Button;
+            this.cbPieSimple.AutoSize = true;
+            this.cbPieSimple.Image = ((System.Drawing.Image)(resources.GetObject("cbPieSimple.Image")));
+            this.cbPieSimple.Location = new System.Drawing.Point(6, 5);
+            this.cbPieSimple.Name = "cbPieSimple";
+            this.cbPieSimple.Size = new System.Drawing.Size(166, 173);
+            this.cbPieSimple.TabIndex = 11;
+            this.cbPieSimple.Text = "Pie Chart";
+            this.cbPieSimple.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.cbPieSimple.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+            this.cbPieSimple.UseVisualStyleBackColor = true;
+            this.cbPieSimple.Click += new System.EventHandler(this.CbClicked);
+            // 
+            // pageSliderPage5
+            // 
+            this.pageSliderPage5.Controls.Add(this.cbPieOverlay);
+            this.pageSliderPage5.Controls.Add(this.cbPieGridAngle);
+            this.pageSliderPage5.Controls.Add(this.cbPieShowSingleRing);
+            this.pageSliderPage5.Controls.Add(this.cbPieMultiSeries);
+            this.pageSliderPage5.Location = new System.Drawing.Point(2348, 8);
+            this.pageSliderPage5.Name = "pageSliderPage5";
+            this.pageSliderPage5.Size = new System.Drawing.Size(538, 367);
+            this.pageSliderPage5.TabIndex = 7;
+            // 
+            // cbPieOverlay
+            // 
+            this.cbPieOverlay.Appearance = System.Windows.Forms.Appearance.Button;
+            this.cbPieOverlay.AutoSize = true;
+            this.cbPieOverlay.Image = ((System.Drawing.Image)(resources.GetObject("cbPieOverlay.Image")));
+            this.cbPieOverlay.Location = new System.Drawing.Point(178, 184);
+            this.cbPieOverlay.Name = "cbPieOverlay";
+            this.cbPieOverlay.Size = new System.Drawing.Size(166, 173);
+            this.cbPieOverlay.TabIndex = 16;
+            this.cbPieOverlay.Text = "PieChart - Series Overlay";
+            this.cbPieOverlay.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.cbPieOverlay.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+            this.cbPieOverlay.UseVisualStyleBackColor = true;
+            this.cbPieOverlay.Click += new System.EventHandler(this.CbClicked);
+            // 
+            // cbPieGridAngle
+            // 
+            this.cbPieGridAngle.Appearance = System.Windows.Forms.Appearance.Button;
+            this.cbPieGridAngle.AutoSize = true;
+            this.cbPieGridAngle.Image = ((System.Drawing.Image)(resources.GetObject("cbPieGridAngle.Image")));
+            this.cbPieGridAngle.Location = new System.Drawing.Point(178, 5);
+            this.cbPieGridAngle.Name = "cbPieGridAngle";
+            this.cbPieGridAngle.Size = new System.Drawing.Size(166, 173);
+            this.cbPieGridAngle.TabIndex = 15;
+            this.cbPieGridAngle.Text = "PieChart - Angle Margin";
+            this.cbPieGridAngle.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.cbPieGridAngle.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+            this.cbPieGridAngle.UseVisualStyleBackColor = true;
+            this.cbPieGridAngle.Click += new System.EventHandler(this.CbClicked);
+            // 
+            // cbPieShowSingleRing
+            // 
+            this.cbPieShowSingleRing.Appearance = System.Windows.Forms.Appearance.Button;
+            this.cbPieShowSingleRing.AutoSize = true;
+            this.cbPieShowSingleRing.Image = ((System.Drawing.Image)(resources.GetObject("cbPieShowSingleRing.Image")));
+            this.cbPieShowSingleRing.Location = new System.Drawing.Point(6, 184);
+            this.cbPieShowSingleRing.Name = "cbPieShowSingleRing";
+            this.cbPieShowSingleRing.Size = new System.Drawing.Size(166, 173);
+            this.cbPieShowSingleRing.TabIndex = 13;
+            this.cbPieShowSingleRing.Text = "Multi Ring, Single Display";
+            this.cbPieShowSingleRing.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.cbPieShowSingleRing.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+            this.cbPieShowSingleRing.UseVisualStyleBackColor = true;
+            this.cbPieShowSingleRing.Click += new System.EventHandler(this.CbClicked);
+            // 
+            // cbPieMultiSeries
+            // 
+            this.cbPieMultiSeries.Appearance = System.Windows.Forms.Appearance.Button;
+            this.cbPieMultiSeries.AutoSize = true;
+            this.cbPieMultiSeries.Image = ((System.Drawing.Image)(resources.GetObject("cbPieMultiSeries.Image")));
+            this.cbPieMultiSeries.Location = new System.Drawing.Point(6, 5);
+            this.cbPieMultiSeries.Name = "cbPieMultiSeries";
+            this.cbPieMultiSeries.Size = new System.Drawing.Size(166, 173);
+            this.cbPieMultiSeries.TabIndex = 12;
+            this.cbPieMultiSeries.Text = "Multi Series";
+            this.cbPieMultiSeries.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.cbPieMultiSeries.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+            this.cbPieMultiSeries.UseVisualStyleBackColor = true;
+            this.cbPieMultiSeries.Click += new System.EventHandler(this.CbClicked);
+            // 
+            // ChartStyleDialog
+            // 
+            this.AcceptButton = this.btnOk;
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(648, 500);
+            this.ControlBox = false;
+            this.Controls.Add(this.pageSlider1);
+            this.Controls.Add(this.label2);
+            this.Controls.Add(this.btnOk);
+            this.Controls.Add(this.label1);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.Name = "ChartStyleDialog";
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+            this.Text = "Initial Chart Style";
+            this.pageSlider1.ResumeLayout(false);
+            this.pageSliderPage1.ResumeLayout(false);
+            this.pageSliderPage1.PerformLayout();
+            this.pageSliderPage2.ResumeLayout(false);
+            this.pageSliderPage2.PerformLayout();
+            this.pageSliderPage3.ResumeLayout(false);
+            this.pageSliderPage3.PerformLayout();
+            this.pageSliderPage4.ResumeLayout(false);
+            this.pageSliderPage4.PerformLayout();
+            this.pageSliderPage5.ResumeLayout(false);
+            this.pageSliderPage5.PerformLayout();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.CheckBox cbLinePlot;
+        private System.Windows.Forms.CheckBox cbPointPlot;
+        private System.Windows.Forms.Button btnOk;
+        private System.Windows.Forms.CheckBox cbBlankChart;
+        private System.Windows.Forms.CheckBox cbMultiAxis;
+        private System.Windows.Forms.CheckBox cbMultiChart;
+        private System.Windows.Forms.CheckBox cbHDotPlot;
+        private System.Windows.Forms.CheckBox cbVDotPlot;
+        private System.Windows.Forms.CheckBox cbBubblePlot;
+        private System.Windows.Forms.Label label2;
+        private DotNetBar.Controls.PageSlider pageSlider1;
+        private DotNetBar.Controls.PageSliderPage pageSliderPage1;
+        private System.Windows.Forms.CheckBox cbStepLine;
+        private DotNetBar.Controls.PageSliderPage pageSliderPage2;
+        private System.Windows.Forms.CheckBox cbRangeBarV;
+        private System.Windows.Forms.CheckBox cbBarH;
+        private System.Windows.Forms.CheckBox cbBarV;
+        private System.Windows.Forms.CheckBox cbLineArea;
+        private System.Windows.Forms.CheckBox cbRangeBarH;
+        private DotNetBar.Controls.PageSliderPage pageSliderPage3;
+        private System.Windows.Forms.CheckBox cbHiLoHBox;
+        private System.Windows.Forms.CheckBox cbHiLoVBox;
+        private System.Windows.Forms.CheckBox cbHiLoHLine;
+        private System.Windows.Forms.CheckBox cbHiLoVLine;
+        private DotNetBar.Controls.PageSliderPage pageSliderPage4;
+        private System.Windows.Forms.CheckBox cbPieSimple;
+        private System.Windows.Forms.CheckBox cbPieMultiRing;
+        private System.Windows.Forms.CheckBox cbPieExtentFill;
+        private System.Windows.Forms.CheckBox cbPieExtent;
+        private System.Windows.Forms.CheckBox cbPieDonut;
+        private System.Windows.Forms.CheckBox cbPieMultiRingRev;
+        private DotNetBar.Controls.PageSliderPage pageSliderPage5;
+        private System.Windows.Forms.CheckBox cbPieShowSingleRing;
+        private System.Windows.Forms.CheckBox cbPieMultiSeries;
+        private System.Windows.Forms.CheckBox cbPieGridAngle;
+        private System.Windows.Forms.CheckBox cbPieOverlay;
+    }
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/ChartStyleDialog.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/ChartStyleDialog.cs
new file mode 100644
index 00000000..13fa2af2
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/ChartStyleDialog.cs	
@@ -0,0 +1,60 @@
+using System;
+using System.Windows.Forms;
+
+namespace DevComponents.Charts.Design
+{
+    public partial class ChartStyleDialog : Form
+    {
+        #region Private variables
+
+        private CheckBox _CheckedBox;
+        private DateTime _LastClick;
+
+        #endregion
+
+        public ChartStyleDialog()
+        {
+            InitializeComponent();
+
+            _CheckedBox = cbPointPlot;
+        }
+
+        #region Public properties
+
+        public string CbSelected
+        {
+            get { return (_CheckedBox.Name); }
+        }
+
+        #endregion
+
+        #region CbClicked
+
+        private void CbClicked(object sender, EventArgs e)
+        {
+            CheckBox cb = sender as CheckBox;
+
+            if (cb != null)
+            {
+                if (_CheckedBox != cb)
+                {
+                    _CheckedBox.Checked = false;
+
+                    _CheckedBox = cb;
+                    _CheckedBox.Checked = true;
+                }
+                else
+                {
+                    TimeSpan ts = DateTime.Now - _LastClick;
+
+                    if (ts.TotalMilliseconds < SystemInformation.DoubleClickTime)
+                        btnOk.PerformClick();
+                }
+            }
+
+            _LastClick = DateTime.Now;
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/ChartStyleDialog.resx b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/ChartStyleDialog.resx
new file mode 100644
index 00000000..e1f25785
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/ChartStyleDialog.resx	
@@ -0,0 +1,5463 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="cbLinePlot.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        /9j/4AAQSkZJRgABAQEAYABgAAD/4QECRXhpZgAATU0AKgAAAAgABwEaAAUAAAABAAAAYgEbAAUAAAAB
+        AAAAagEoAAMAAAABAAIAAAExAAIAAAAQAAAAcgE7AAIAAAAIAAAAgodpAAQAAAABAAAAipydAAEAAAAQ
+        AAAA6gAAAAAAAABgAAAAAQAAAGAAAAABcGFpbnQubmV0IDQuMC42AEJyaWFudGEAAASQAwACAAAAFAAA
+        AMCQBAACAAAAFAAAANSSkQACAAAAAzc3AACSkgACAAAAAzc3AAAAAAAAMjAxNTowOTowMyAxMTo0MToy
+        OAAyMDE1OjA5OjAzIDExOjQxOjI4AAAAQgByAGkAYQBuAHQAYQAAAP/bAEMAAQEBAQEBAQEBAQEBAQEB
+        AQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAf/bAEMBAQEBAQEB
+        AQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAf/A
+        ABEIAJYAoAMBIgACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMD
+        AgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygp
+        KjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOk
+        paanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQAD
+        AQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFR
+        B2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZ
+        WmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfI
+        ycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/AP6d/gj+zb8CNd+GnhG913Rt
+        B0FodB+03useJPH3xN0ywvGvfGnj/wAPaPpdhZaP8SPCukaYulaV4LWOKG2if7VEykQwm2lkm9A1X9nf
+        9lPRNSXSdVv/AATZXcmiP4jgaXxj8eDZXOioyL9ttdRT40Pp90JGkjS3t7e5kurp3VLaCVztr1D9kO91
+        b/hW+gzWGgtcXTeC9LVrHUNQtbFkj/4Wn8cC8n2i1/tWIvGxjBjGc78hwRg+oePJ7r/hKIzrvwHsvHll
+        PpNjJJeWfh+HWr7T7oyXouLWbVdQ037JfRhI0ks7W1SMQQ2N7JqF3b32r+GdI1nqoRw8n++9pbldvZVq
+        dOXNaHLeE07xbeuzkl7sk1demsNja84UMBTy7ndChUj9bqYaHN+6oTrc06+Io8snKclTU5Rjo4wjK3Kf
+        L8n7PH7J0F9f6Ze6z8O9L1DTLoWV9aax8QfjXo00F211qlpHbFNU+OFp5k00ui6lJAkPmGe0t1v4d9jc
+        WtxNu6b+yl+zTq+k2+u6fdfD6fR7p4o4NSHxE+My2kks9nBqEUImb45hFuHsLq2vBbsVn+y3EM5jEcqM
+        fUvCMC6vrtta69+x/pOg3t/eWV9q3ic6Z4UfSoxqF9qMBvFuZNHt9XvdQs9Kkaa+S6srG7+03FzbTCC3
+        ntru9+n7Lw/pnhHTodN8F+DtH06yDhv7M0xLPQbCH90kYkSCztXgLhIYotojT5I4+SEUVOL+q0qLdD2/
+        trwt7SpGrBJKPP7tB87fNrC32d7ONzKvRzLL8TCjjqWTzhLmd8FWweKbXNaD9rha+Kow0UW1N3km5LR3
+        PgK8/Zg/Zj06fU7a/uPA1jNpEVjPfLe+OfjfZoIdTsRqVhJbS3PxvihvkurFhPE1jJcBlO3If5ahT9mL
+        9mZbeK/nl8HW+l3y289jq194x+OdhosourWS4isodau/jXBpk2pGC0ur2TShdtqsFqklxNaR2y+bX1D4
+        4ku7DXLrUZv2f4PG/wBqhggbWNOt9GvNWmNro5uRFeG8tPtD2ljJJcabZzLJcS3Ek/k29pGYilza8Kw2
+        viXU7LTtf+AEOgWVnJNCupajb6Fc2tjdWVvcTxzWlsLSOT7FdSXE4srr9xdGS9Y3FnbyGdU+cePxUqsq
+        VN0FLn5Ic+FzVRT5oxTnU5FTUbtXkpqNle6SuvSUsu9jCpKjUT5KbquE8skr+yj7T2cdZtSqpygmuaMG
+        oyUpJuXzFY/ssfszan5rWF38P7qO3099UupoPiF8aJLeysEuIbT7Tfzp8cjFYpJdTpbxC7eFpZVmSNWa
+        3n8uO8/Zd/ZjsH0xbq78BpFrCag+nXq+PPjbJpk40p7KK/B1SP43tp8LwS6jZReXPcxSSS3MUUSvI22v
+        0D0nwd4T0G5kvNE8LaNpF3NAtrLc6bpthZTy2yyidbeSW2WN5IBMBKImYp5nz7d3NLrvg/wn4oFoPEnh
+        XRdfFhJJLYjWdL07UxZyzR+VLLaC8WYW8ksX7uR4djPGAjEqAK9SnKv7L966Htk3/DlW9m4prl+KfMpN
+        L3t0ntdHjY/ET53/AGZTwyp8kbLH4aEpupze9eWHcYqHJpH3ZS5ved03E/Oe0/Z2/ZRv7O51Gx1TwBea
+        faXd9YXGoW3jz43TWEV5p0Nnc3du18nxuNp5sdtf2tyg879/byGeDzIopnj29E/ZZ/Zt1i+8PPo+meFP
+        GWjat4hn8P3tz4V+Jfxkl+yTR6B4h1dXjv4fjDrdm0iXGhm0lgaEkbpxvSSEofu4fDvwCtjcaYvgbwyN
+        Ou5muLuxGh6SLS5uGbe09xbiLyppmf52lkVnZ/mLEjNc1q/hzw74Uv8AwDF4c8N6ZokNz4+muLmDRrHT
+        9NS5uG8DeNwZpkgNvFLMdxJklO8gn5ieDpFy5mnyOO0UpT5m7q105W2S23fTRHNgqmZ1K1GnjKeUulKh
+        V+sPD0K1OoqqoyalQc5SSipRT95qSu/ie/jVl+w1+zFJZ20knw/1d5JIIpHb/hZ/xaGWdAxOF8dADk9A
+        OOlWv+GF/wBl/wD6J7q//h0Pi3/83dfT9hdTCxsx/Z94cWtuMh7Eg4iTkZvQf0FW/tc3/QOvf++rH/5N
+        qylsj5V/4YX/AGX/APonur/+HQ+Lf/zd0h/YY/ZeUZPw+1fqB/yVD4t9z/2PdfVZu5R10+9H1aw/+Tq8
+        F8Y69qPxI1TXfh/4fvtV0HwloaTWfxN8eeGvFOk6N4h8Pavbjw5rsHgjSp0+1XWnXut+GNUkufEHiC1u
+        9H1Hwzo9/YT+H9Si1+8jvdE5cVio4aCfK6lWo3ChRi0p1alm1FX+GMUnOpUa5KVOM6k2oQbNaVN1ZWvy
+        xiuac2rqEb2bstZPW0YRvKcmoxTbPCNU/Zu/YY03XNN8L3K6HZ+JtV1iXRtP0G5+O3j+HWb7UtOXTbzV
+        9LtNNl+JIvZ9QsNM1OyvL2zhga6trO/tLmWNYbiN29FX9hn9l1hlfh9q5Hr/AMLQ+Lf/AM3dd1J8NfCG
+        veFtV0WbwDpumeEdae8Wy8MRaHoFtZPJr10P7V8R6lpMmbSfXdceeWaQ6jaT3C29xImoILrUdVt653wH
+        q+t/DbVNJ8G3dhr154G1i5tPC3hKys9LGoD4Y694f8Pyy6j4b8Qa/ca1fao/hHxHa6b/AG54F1nXYHls
+        XvW0LUtZSHVfBemDhhjcXRqweNp0fq1eUIUquH570p1HCEI1o1LOdOdR8sa8ORx54OpQjT9pVpbOjSqR
+        aoOp7SCblCpyvnS5pPkcUlGUYaum+Ze5O1ST5Yyyf+GF/wBl/wD6J7q//h0Pi3/83dH/AAwv+y//ANE9
+        1f8A8Oh8W/8A5u6+qvtcx6afe/8AfVj/APJtH2ub/oHXv/fVj/8AJtewch8q/wDDC/7L/wD0T3V//Dof
+        Fv8A+buvD/2h/wBjr9nbwt8G/ilr2ieBtRt9T0XwZPqOnyXPxA+JWq2q3KyTqwutM1bxhfaZqNrNGvk3
+        NjqNndWN1AzwXNvLFJIjfePjLx9oHgHw9qfijxVJcaVo+k20tzczGOK8u5fKieVbXTtL0+e71TV9SuAj
+        JY6TpVnealqE+22sbW4uHSJvkf4s+JviV4u+A3x88UeK/DkPhTwdrfw60u48AeGLyxuLfx9pmmXFjc3u
+        o6h8RjdX6Wel6xd3V5DZx+ENM026fw5HpMk2oeItWvdWl0zQFzLm5b+9a9u0bbvsm7JX3bVr624546hD
+        GUsCnKpiasJVZU6Uef2FCMZv2+Jd0qNKco+ypOT5q1V8lKM+Wbh1P7MPgnwj4j+BHwxvPEPhjw5rtzHb
+        +L7aKfWdD03U54rdfHfiWUQxzXtvO6RCSWRxGpCB3dwNzsT9Cf8ACp/hh/0TrwJ/4SGgf/IFfNH7OXgU
+        eJP2bvhFZ2fizxz4UudJ1PxNq9pqvhjxLcwX0ktr428To1jqUerJq+m63pN3DcSxXemazp9/aufJuolg
+        vrOyurf04XXxv8BQp/wkOi2fxl0K2t9Qnutb8EX0vg3x/H5W99OtB4E1/XLjwv4hleFQL/V7Dx14allu
+        X26d4N27Ixy1sdPD1OWphsQ6Fo2xNCn9YhH4VapSpKWJhZ/ajRqU1GPPUqQW3s0JV3TjCjjp03DSNCWI
+        q0Uo3v8Au5ykqFla/I6kJ3tGEJXPSf8AhU/ww/6J14E/8JDQP/kCj/hU/wAMP+ideBP/AAkNA/8AkCsj
+        wf8AFH4deNb240XSfEc9t4qsbawutV8F65Pq/h/xpo8WqWv2yybU/C2stZa1bRzQiVY7k2bWkk1teQRX
+        EktpcLH6ULS3IyJrwjr/AMf19/8AH62oYqhiYRqYevSrQle0qU4TV4tJr3b2lFpRlF2lGStJJqxNTEY6
+        jJwq4jF05KztKtWi7OzT96SumknF7NWa3OM/4VP8MP8AonXgT/wkNA/+QKq2/wAKfhk0t8G+HngUhLpV
+        UHwjoHyr9jtGwP8AQOBuZjj1JPeu/wDsMX/PS8/8D73/AOP1UtrOIy3w33YxdqOL69BP+h2hyf3/ACec
+        Z9ABW135fcv8iPreL/6CsT/4Pq+X9/yRyv8Awqf4Yf8AROvAn/hIaB/8gUf8Kn+GH/ROvAn/AISGgf8A
+        yBXZm0gXOZbwY6/6dff/AB+vLfHfxU8AeAZX0zUdX1LVvFraTJrem/D7wqdY8U/ETXNMi1Gz0iW+0TwV
+        or3evX9hBqOo2dve6qLOPR9LSSS91bUbCwtLu7txzUdZSjFaauyXRf5fgc+JzWWDpSr4rMamHowtzVKu
+        LnTitrJOVRXk2koxV5SekU27Pf8A+FT/AAw/6J14E/8ACQ0D/wCQKtWHw1+H2lX9pqul+BvB2m6pp8kk
+        1hqNh4Z0azv7Gaa2nspZbS7trOK4tpJbO6ubWR4ZEaS2uJ4HJimkRvBJ/G/xe8S6ubHQtJ0TwZZ6f4j0
+        4y6bLeat8TfHWveGRA1xqtnqVrpHiHwf4F+EXiG6wsOi3fiTxr4ztnjF1LJo8t3DHp0sWm/s/fEHXGs5
+        /iJ8fPjJerDpmpabdWXh7xpbeEZdUj1G5vJvtN5e/DzQfAttp1zbWl6un2LaLpkGt6VHp9jPD4wv7+Ob
+        UrrN1Zu3JTlJNtKUlGEXa17N3dk1ZNpXtppqeQ+JMfieanl+DzbGxcpUpVa1f6lhfdnTpVI1PrVVYqOk
+        pS5ZYJ+0p0pTipU6lGVb6s0//jxs/wDr2g/9FrVuvke8/Z28X6fbHUfhh+0B8afCd/dWHhyL7D4l8Z3P
+        xM0WO28P2FraxWdhb/EePxVJp0uuxW6R+I9Yl/tPVr6R7jUUmh1e4nv5VT4p/FT4bXn2T44fDrULzw5L
+        f+KbyT4rfCeXVNe8G+GvDWl6XBrOkf8ACY+GLjXb/wCIVpeyxLq+lXeraNoGraRLfaXZ3skOkw62tlpk
+        e1cf4sJU1/NpOCXS8o/D53SS6s5v7cqYWXLm+V4zLad1F46Dhj8tXNVdODqYnC3rYaFuSpUr43CYXDUo
+        z9+uuSbj7p8SPE2o+HtBii0KwvtS8S+INT07w3oMNhpzar/Z17rV5DYv4l1S0+1afD/wj3hS1ml8Ra61
+        zqOnxz2Gnyadb3Q1K/sIZ8LwN4UtbHRdJ8N21zJqWi6Fs/trXbmC1i1L4geMICj6z4j1w2MFrZzTXmsx
+        z6prNxFCDq/iCWZW8izspY9U8p8C3ui/HLxbdfE3w/qOma74OsIdQ8L/AA68ZeH9Y8STO/hG+/sb/hNL
+        yG4ub220+PVfFHifQTp2kXui2LTWng3RLTxHa69dWfjDQwn1FbaVZWkEFtbCeCCCGKCGKG6u4Yo4oYxH
+        HHFGkypHHHGoVEQBUQBVAAArzsI/r9aePvfDvmo4RqUnCdGMo81WCTUWsVOKn7SPMp0IUIp2lUR9TUkq
+        dKFKDV5Wq1WukmvchdSkm6UXZbctSdT4lGnNzXoxFEBx/pdj0H/T9bfWvNviF4P0LxDa6loviWza+8I+
+        OrJfDPia2S4uLN4L2Zwnh/WrW8tJre503UI7to9Pg1WwkTVbXU28NXlpc2h0iOeP0C9s4hHH892c3VkO
+        b69OM3tuMjM/BGc/UA9QKi1TRtOv7C7sb5r1rS6t5ILjGo6hGwjlUqTHJHcrJDIv345o2WSJ1WSNldVY
+        ehiKEcRSlSlCM001yTV6c04uMqVSLTUqdWDlTqRcXeEnZXSaxhNwkp3ceVp8ybTjZqSkn0lCSU4vpKKZ
+        wvwu8W6pq8GteEvFtzozfEHwPfNYeJrXRv7UjtptMv57u58GeI4IdYVrpbfxP4ajtNQnEF7rNlp+vJr3
+        hxda1C+0HUHQ+I/xa8OfDyxla9kivdWZoLaw0eK5SO5vtUvneHR9HhVUmuJ9Z168T7D4e0HTrXUPEPiK
+        88y10DR9TuILiOL5X+KnxRuPCOr+CfFHh+fxVqXiS5vr34ZX2g+E7YaprXxahvJLO803VvD9pI62tnp3
+        gyGRPGc/j3W/M8C+DtA8S+I7ADVZdZurnS/b/hx8F5U1G28f/EmOG/8AF8w0vVNI8Lrqv/CT+G/hZq39
+        gXGla7J4M8R3+j6P4h1nxBr76lqg8SeOtahj17XLGa10gJZaPp8Fm/Bl2InOE8K5c9XD2SqVLuUsNPWh
+        UnrJuvGKnh63O4yniqNWqqcKE4M8fMsdXxFf6rk0YSq1JuGKxbXNhcskowqVOZcqjUqSp1KNbB4VXnOl
+        isNOV8P7bF0sDwJ8Jdb8e+J9L+MXxwt/7S1mwk0LXvhj8Otb0nTIE+Dd8NCnttYubiPS9e8RaPqvjW9v
+        dUvo21WO+v4NC06x0iz0e4fUodW1rVei/amGPgD8ZwOg+H11/wCjbmvf/sEP/PS7/wDA69/+P188ftS2
+        kafAT4zEPckr4AuWG68u3BPmXIwyvMVZe+1gynuK9SEIwVord3bespPRXk927JJdEkopJJI1y7LcPllK
+        dOhz1Ktao6+LxVeTq4rGYiSSlXxFaXvTlZKFOC5aOHoxp4fDU6WHpUqUMr9kK4uX/Z7+GbSWE8LFPGJ8
+        tpbNmU/8Jx4hABaO5dCcYOQ2PfNfT3nXHezlx/10tv8A5Ir5u/ZH/wCTfvhp/u+Mf/U48Q19OVR6Bw/i
+        zwT4U8d2dpYeMfBuleJLXT9StNY06PWLDSr86bq9jv8AsWq6ZJcmSTTtTs/Mk+y6hZvDdwCSVY5lEkgb
+        y0fD74n+BhGfhj45v9Y0q1g1ORfBHxfurvxbaXVzOjvp9tp/xGS+fx3oUNvdmPzrnXB8REWwElvbaVDI
+        YriH6KpCcdf6f1NcVfL8LXn7ZwdLEaWxWHlKhidPhUqtNqVSCaX7qt7SjJLlnTlBuL2hiKtOPs01Kle7
+        o1IqpSf/AG5K6i3/ADw5Jr7M09T5/f45z+F2EHxY8A+I/h6IzottL4ogMXjD4cXOo6taGaWOz8XaGPt+
+        k6bp92k2nT6x8QPDHgO2kuBbeWmNQsRP1eqfFnwN4b8K6t491TxDpKeE7dL7Um1mzv7TVbe6ttL0Y6jf
+        DSo9MnurnWrmGw0+9uhZaTBe30sdrP5NtI0bKOL+IXxnvxr9x8Lvg/ocPjb4tyaQNTDatHrFp8MvBltJ
+        q1vpL3nxA8Z6VYahb2V9Ch1LUbDwZpn2jxVro0eW1EWi2d3HrkHmWnfsWfD46zfePL3Ub7/hcdt4n8Te
+        KdA+I2ladoej23gzxB4q0Kx065n8MeAoNMk8DyWunwQWMVrN4p0XxP4j1H7BDceI/Eet3slzdTcrlmdD
+        mVGVLM6cb39slhcTGzTko1qUfqmIq8r5YUXRwiuoqpiY88px8meaUcfUr4TKaaWIotU62Plz1sowlZpJ
+        0qiU44jEV6aftKmGwtSs4XUcRVwspUlU1E+Ifxi+Md5ZT/Drw/qPgD4eJeeDNfsvFeuW8Wn+J/HeiXGl
+        HW9b8PS6N4m0eSTwBYXct1pWkDX7TSPG2vTC08S6cumeC7uTRfFcPf8AgD4HaH4O0uPT3XU7xBGUuo11
+        TUJ59U3ahfao0niTxNruu67488ZTXF9qepXN8vivxbqul3k+oXko0e188xri2/jf4u/DW+ttG+JWmaP4
+        u0Oe+8J+HtD+IHhjS9egl1jUtV0uVNU1Dxbomj6Rrdr4Hx4iszaWzXbL4Rt7bXNCF34yiujfxWvsenfE
+        Tw5e2dne3cs2jW9/b29zaXeqfZRpF1DeIslo9l4msLq+8LagbuJ1mt4tO1u6mkiJYRgo6reGx2Erycav
+        tKWKin7Sji4qlUpe8oyjya0uSUmlTlTqVKdaNpQqVE+Z5UuGvZ1YYvMMRLOsW41FDFzS+rwhVlGpUo4L
+        C0+WGHoJRpQq0JRnVl7ClLGyq4iCqvo7G0g0y0gsNO0hLCytUEVtaWkdhbW1vEM4igghlSKKMZJCIgAO
+        T1q751x/z5y/9/Lb/wCSKsK6sAVO4MAVKkEEEAhgQSCCDkEE8c9KfXppp7anqJKKUYpRjFWUUrJJaJJW
+        Vku3QyrGaf7FaYtJSPs0HO+2/wCea/8ATwK8d+M2r+JdQsdO+Gng+TXNF8VfEYX2l/8ACWaLBazzeAfD
+        draS3OveMJp3vIY7K5jhWPQvDUu9rk+KtZ0m5htp7Sw1F7fufF/jrw/8OfA994u8TXiWWk6NpD3s8jkg
+        yC2s3uGjiRVeWRxFDLK4hildIYppihjicjgvhL4Rv4LzxB8UvHdppi/ETxyRaS3dg2uLFpfw/wBI1XWr
+        vwL4dS28QNDLpVxb6dq0mo67bW2kaEZNbv7mLU7a/vrA6rd+Zj6rrTjllJtTxFOU8VUjNwlh8E7wm1KP
+        vRrYl82Hw7jKEoL22IjNPDcsuuhGNJfWqluWnJKjFpSVXELlcE09HCm3GdS6kn7tOUWqjtxWofsweGNI
+        1a38VfCi61z4UeK59U8I3Piq+8MXNrDpvxA0fwnZ3OlQ6D4r0aK4t7JVudJult/7b0BdG1lZtI8MR6hc
+        avoGgW/hyfFt/jF8W/hnbw2/xh8GS7LTQ7jVtY8W6Ql94p8Dwi11WTTpwPGnhXw7aataXzWq2msLo+v/
+        AAj8Naba2Oqi3j8a6vLourzReuX3x28LXYuLb4f6drvxV1KPT7+9g/4QW0trzww0unX02m3enXXxH1K7
+        034b6Zq1te2t3Hc6Pf8AiyDWoVs7hxpsjCFJuR/4TH4x+IpZT4esvAmkwG70K5t1022134o3Fxp4sp5f
+        E+lahqMepfDLwRomvW1/Ja2libXxd4liWGC5uZbK8N3bw2uLzHAUFClgvaV9owpYCk61BtRUlDnShhFN
+        RSbj9Zp1Fz0+eLVWmpefLgfHKrWxmCrrhqrVnWr4n61KNPDVa1avTnUxWKyZ/wC11JTrzq1KlfD0KCxL
+        qYurWqVqtLno47/tkfASX7TZ33j7w9pusaddeFxdaE+saPqerRT+KEbVvCtgLfw9qetRzav4l0yxu9R0
+        XQ4Zn1q/sbW6uY9PCW8oXLn8W/Fz42qYPCvgTUvAfhK5bxLpUuvfE7TL7RLjSbrT7QR6XrL/AAx1BdO1
+        r4hx3uqzLb2+j6pqngnwfFY2up6rJqvjZTotlL2ieE/2hrhVu774oeBtOdNRv5Laxj+G0mqxXEN62nR6
+        AmouPFWlT239hXC3cl3BYX07astwsZ1K1WHMmfP45+O/gS1nfxz4O8JePLex0eKRtV8A3Vx4Un1jWjrE
+        C3ENlp3jHVLzw7omnRaDPNctdeLPHXh+FtYsV0+1uLy31MXmmJ5pUilLF4HMcLQ1ftHhqdS/Koy5ZxwW
+        LxtdcyvD+CruMmt48z/1RzXHpYarxfkWOXOoyweVUcVk2IxEXWbgqmPzeX1ZwVGCjWlgqtCpH2zr06tC
+        cYrC6tn8JPDPguHWNS1Gz1HxdcfEDTdP8L/GLxD4ru7PUNR8bWI0v+wLLUdVt08nSNL0uzkub4N4Z8N6
+        d4e8G6PaeJvEl9p2i2KmSKXpvg/rWpwaNfeANahtv7f+G19J4ZMFvrQ1e/uPB8Mtwvw51/V577UbrUjq
+        viDwdBptzrU9/IHn8SQa8sBeGFTWtoXxR8DeN5b/AMNiW70/V2mv9IuPDXizSbzQL/UvJtg98dGg1eGC
+        28W6MbSdJf7c8Kz65oFzbTpJBqU0cgJ+Wvih8ZrL4R+PbZtGt08a/EWw0HTfBvivwXpdhaw6l4i0jxJ4
+        u0fQ/gt4r8X/ABCuLGdvDVjpPiHxBr2jQaddS3Woa/e+JfHF14P8G+JrzRljjfPQ9vRx2EqU6uH5nRxM
+        6TpSjTpVJR9o6k9ORYerFYqs6lSLpU441uM6k1GPuZbw/j245DhMsq0a/LGtRw9SDwtKHPV/3zEYivKn
+        QpUa860lWzDF1I0J1atGtXxMY805fb+pazBo+n3uq6q0Om6Zp1rPfX+oX95YWllZWdrE01zd3d1cXccF
+        tbW8KPLPPNIkUUas7sqgmvjD4w/F3Tfih8Cv2gbnwtoev3HhCw+HuntofxDmg0+HwZ48j1e0utTe78CX
+        o1OXUPEejadaS2DS+JrfTIvDWqSX6Q+HtX1l7LVPsPX6Z8EPFHxT1eDxX8f/ABB/wkWjadrHiebwr8LN
+        Fj1nwr4Ck8O6zBBpunW3xI8Ir4i1rT/Ht/ZabDdGO38TS32nfaNX1G7l0jT2mtND0Hp/2oIVg/Z/+M0S
+        IiRp8PbhI0RQqIqPcKFRRwqqoCqigKoGAAK+glGnBOKlz1NNVdQiuy09+XfVJdmb47D5Nl+H+rUsS84z
+        OrBe2xOH9pQyvLZRrxlyYaVSEMRmderQg4Tr1KWFwmH9rUhTpYyoqWJp5X7IlhZx/s+fDNI4EVAnjABR
+        uwB/wm/iHjrX079itf8Aniv5t/jXzD+yHJfN+z38MjLa2ySbPGO5UvZJEB/4TjxD912somYY6Exqc8Y7
+        n6K1jXrXw/p11q2t3OlaTpdkgku9R1LVY7GxtkaRY1ae6uYI4YgzuiKXdQ0jLGuWYZxv30XVvRL1b2Pn
+        5TjCMpzlGEIpylKTUYxitXKUnZJJbtuy6mhJb2UasWSMbRkgvtOOvdvTnnj8K+Prnx34n/aMuZdA+A+q
+        yeG/hX5P/E5/aJ0l9Pu5r7U9L8Uy6dq3hD4ZaNrOj6haa0bvT9K1CO7+ILsNBsbbUtNvvC516adLqzSC
+        z8dftSSWuq63put/D39niVbDUNJ8L37eJfBXxU+JWq6Tr889tqviKWx1CxvvCvwx1SxstOu7LwjqVjbe
+        KfE1rfyf8JPa+H7SIaVffXOm2CaRZW+nabpmn2FhZwx29pZ2cn2e1treFAkUMEEVosUMSKAFjjVVUdOt
+        Y3lW+FuFLR8yfLUqdfcknenT7Ti1Od3yuCinP5vnxXEOlGdfA5DKLviKUp0MfnMJ2/3aonGrgMsnTuvr
+        UOXH4xVVLCTwFKjDE43j/h58KfAfwv0AeHPBfhrTNC0572+1S9Wyto4ZtU1jU7hrzVNb1SaJIzfatql3
+        JJc317MDJNKwUbYo4407K2s7Yy32Yl+W7UDluB9jtDjr6k1c33f/ADwg/wDAp/8A5FqpbPdebf8A7iD/
+        AI+xn/SX4/0O0/6dfTB7dfxOqSikopJLRJKyS7JI+gw+HoYWjSw2Go06GHowjTpUaMI06dOEVaMYQilG
+        KS2SRYbT7Ngwa3QhhhgckMOhU5PII4I6da8M1D4MTeFlu7/4J6hpngW5/sqSytvAt/phvPhBdXNx4j/4
+        SC/1O48JaVLpV7oniDURda3p7694Z1TT45G1r+0vEOieLH0fSrKH3bfd/wDPCD/wKf8A+RaN93/z7wf+
+        BT//ACLXPiMJQxSXtYe9Dm9nVhKVOtSclaTpVqbjUptpK/LJKVkpJpWOunWqUr8rTjK3NCaU6c7bc8JX
+        jK3RtXj9lo+av7VTQLwWfiD4cfEH4dXU2v3ejaRrnw80+78ceD9Ttg8dxD4hu9N8LWGuWPh601FJzFe3
+        vjzwZpMtjcJdQpqU9va2uqy1IvjzokEEE2m2utfEdbjRr7XbXTvCnw6+INl4pn0+wvrzSjD/AGfeaHLo
+        f9qS6hY3EBj1vW/BqyywzPb2aW/l16547+J+j+A4NMi1GCfUtd8RXU2m+FfCuiJc6n4i8T6rHbS3RsNL
+        sILMhESGIyX2rajNYaDo1uft2uarpunpJdJ5jZ/Dbxv8T3GrfG0WlroFydJ1DT/gno+sC+8L6VfWAkm8
+        3xt4httM0+9+IF680ga40KZYfANq8VvGNF8QXen2niOXwcQ8dSrPCZZio4jFcz51PDKMcNzKMlLG16VS
+        lgqTt7tOmsBiMbVU4S+r1qVGtVXtYXCUKmHjjszvgsA7ulPm9pXxzhP2c6eWYSajXxKi4zVas8ZhsDQn
+        CdGrjaGJq4ejU+e9N+IPir4reLLPxF4d8F6v4yXQI9Rf4daL4U8SSQfDew1C30T7DfxfHPx5aW76E/iK
+        DULq4sbTwL4MuPGmjWGp2i33iC81Oay0HUtA99tvhF428X3kGsfEzxCl0bfU/D+u6Z4XtBIvh3w5qOkW
+        knz6VpOm/wBkRX066nPLqUZ8far8T9Pt7610i70+zs7nS0ln+hdHt3s9MsLe2sbG3ghs7aKKK3lMEKRR
+        xRrGiRR2gSNUVQqooCqBtUADFam+7/54Qf8AgU//AMi1rhchaVSeY46vj6tasq1aCX1fC1JxgoRdSjCU
+        qlbktH2arVp06Xs6XsaVJ04sqrn0aSjHKMDSy3kpulHFVJ/W8xUHJS9zEThTo4Z2XJOWEwuHqVYuarVa
+        qqSicLpXwz8KWFnaWlzpw1WKyigitYNUMcun2i2rH7KdO0C2jtfDekNboRFE2j6RYFY0RcnaDXcCws1A
+        CwIAOABkYHtzTt93/wA8IP8AwKf/AORaN93/AM8IP/Ap/wD5Fr3adGjRSjSpQppJR9yKWkVaKb3dl1bb
+        8zw6tetXfNWq1KrTbTnJys5O8uVPSN30ikvKxSvbO2EceIV5u7IHrzm9twe/cEipLm30y3hlnuvIt7eG
+        N5Z5ppfJhiiRS0kssjuqJGiAs7uQqqpLHAqHUZrmO3Erw26pHcWbsxumCgLeQMSSbYADjqeB19j8bSeK
+        Ne/ah1WKTwRdj/hRuj6npd/pvibRtd1Sy074n6npdxrlprGm+J7STQ7C81r4ZR3yabeaXoei6rDY/E2L
+        TXu/EV+PhbrejwfEDqpUnO7+GELc0tNF2Xm+iXa+yPTyrKKmZLE4mrUWDyvL1SnmGY1Yt0aDrSksPhqV
+        3CNfMcY6dX6ngozjVrRoYjEPlwuExVajzPi1Lb443+jw/CawsNK8EQaxoPinRfiDY6foXiq2+KdukWq3
+        Gut8LdNXV44fA1rZahPo1vq3x1ZNH1l0udQ0vwLcXGqXWheI4uNuPgX4t+CfgvULJNMv/E/gePw54j0a
+        W08J3l+vjrwsnjPU9YuvEXi/Q/iP4h1+31HUPFVi2u3/AIhuPEfjy2bV5biLVrm++Jkaa7Np0P6EeGvC
+        1t4XtvIsbWCSaSK3jur+edReXn2RSlqsnkWMNvBbWqM0dlp1jBa6XpsLta6bZWdrthXpXFxIhjktrd1Y
+        bWVrhypBGCCv2XBBBIIORg4IIry8xy3D4unOGFc8vnKMk62F5acqsnDkTxNNL2WIirJuFSEl25dj6Cpx
+        piKND+x8Dh6b4djVpTll2LvWrYuVCM6cMRiccuXFPFyhVxC+s0pUHRWMxtLAUMvwOKngI+MfAr4meHPi
+        34Ds9bs5AutaVqGp+F/Fml3c0Z1TS/E/h28fTNSivoFtNMeNNR8u31zSbhtK01NS0LV9K1W3sre1v4Er
+        n/2pba2X4B/GYrGuU8AXLKQScN5txz1PNeNX3wj8P6V8d7iKL7H8P/E/i7RblvBHxG8K6rcWHjv/AISK
+        DR2sbzTTZazaa14O8Qadd+AfD1nGmkan4dvhFd/DfUPFWrJcajrOlXGm9H8bj8T7P4D/AB70vx7F4W1S
+        2sfh/bx6J4t0K9vbS+8QxGK7TUbjXfC02lmz0HUIbqFZFXS9d1WwvorrfDFpf2c2Z87J8bj5Qjg8xoKV
+        fD1Hg5Y3DN1KVapQpp+0xFJqNXBVa0LVmmq2EiqlOEMZOpUVKPh5lg8tcXjMsxTjSnCNaeX41wp4qh7W
+        qoKGErQ/cZjQpucIOajhMYpQxEp5fHDYeWKn5t4X+L//AAor9kr4NfEu/wBZ8MaV4R0Pxlqdv8QI/EUs
+        8N5qHgzVfG3i3TNTHhA2sv2i78XaLdXNh4nstGt7LVrrxHpmg6x4b0/TxqmrWN/Ye9eGfBGvfGm80L4j
+        fGTTYLXwzCdM8ReAPghcz+G/E+ieHNWsdQudR0D4geLNd06G7tfEfjv7C+m3WnaXpmp3/gzwPeiZ9Gu/
+        FGsQ2Pi6HJ/ZU8LeGtQ/Z5+FcF74e0S6ism8azWUdxpNhOlnNL4s8V6fJNapLbutvK9jfXtm7xBGe1u7
+        m3YmGeVHv/BAHwP4t8Z/s+63bahfx+C8eLfhzr9/4Vs9J0TUPhd4s1jXH0HwZod9p0txpd9c/Cd7M+C7
+        m3NvouoQeHoPCd3Lo7Q30eqX30fs1Vg72vSTlyrTnjJpOU+snTdko7OMm5K0LrzamS0c/wArrzqqLnw/
+        NYurgKScaebZZiqtCjLFZjHl5cXUybMKlOFPDuooVcJmX1ivQxCymhPB/VKqFUKFAA7AcZ7kfjTqp/2f
+        p/8Az42f/gLD/wDEUf2fp/8Az42f/gLD/wDEVBylyqdr/rb/AP6/F/8ASKz/AMKP7P0//nxs/wDwFh/+
+        IrifFPibwN8PtE17xV411Pw54Y8O6XcI97q+tvaWVlbq1rZpFEJJgvm3E8rLDbWsIe4ubh0ht4pZpERo
+        qVKdGnUrVpwpUqUJVKtWpJQp06cFzTnOcmowhFJuUpNJJXbsaUaVbEVaVDD0qtevWnGnRo0acqlWrUnJ
+        RhTp04JynOcmoxjFNybsj0AsFyScY56Ht+FeG+Jfipd6zrd/4D+EMdh4q8YWEt1pniXWzNb3fg/4W6j/
+        AGd9sspPHIg1Kxv77UZWns3tvBuizLrd7DMJb650HTnGqpwctt4/+Oc8lna6bqnwg+E63viLRNavJ7OX
+        Qfix42it7eGysdR8H3FtcMfBHhq7vpr6RNYv4h4ov7bSo5NMsNPsdatdXi+hPDPgXwl4P0ay0Dw5oOna
+        ZpVhEkUEEVukkkhSNI2ur27nEt5qOoXAQSXupX89zf385e5vLie4kkkfyFXxeZy5cJz4TL01z46cHDFY
+        pWu44CjNXo0pNqEsbXgpSjGosNQkqlPFU/blhcFlCUsa6WPzOzcMup1FUweCne0Z5lXoztiK8dakcvw8
+        vZxl7J42u0q2BnzfgH4Y6X4Nn1HXb64n8TeO/EVvpieLfHOrIv8AaeuS6XbLBbQWlqrPaeHtAtpPtF1p
+        /hjREtNFsLm8vbtLaXUb6/v7v0/A9B+VVP7P0/8A58bP/wABYf8A4ij+z9P/AOfGz/8AAWH/AOIr1MPh
+        6OFpRo4enGnTjzOy3lKT5p1Jyd5VKlSbc6tSblUqTbnOUpNt+PiMTXxdaVfE1JVaslCPNKyUYU4KnSpU
+        4RUYUqNGlGNKhQpRhRoUYQpUYQpwjBLYf8eVp/17Q/8Aotat1k2NhYGytCbK0JNtDkm2hJP7tep2Va/s
+        /T/+fGz/APAWH/4itjAuUhYKMnp9Cf0GTVT+z9P/AOfGz/8AAWH/AOIrzz4seNvCnwk+Hfir4i+IdLmu
+        tL8L6abx7DRdKi1HWtWvJ54bHStE0XT1MH27WNb1a6stI0u0ae3jnv723jluIImeZHFOUoxSu5NJJdW3
+        Y6MJhcTj8VhsDg6NTE4zGYijhcLh6UXKrXxOIqRo0KNOK+KpVqzjCC6ykkeS/FPVbv4seO7f4D+HdV1K
+        w8OaZBpPib4z+KPB/jG30TxHoNsNY0G88I/Dcf2ZI/iXRrr4lW7alfahqls+iXMPg7RdTj0jVo9Q1e3n
+        s/pXSNG0zQ9OstJ0jTrLTNM063itLCwsLWC0s7S2gQRxQW1rbokMMSKMIiKAOwrwX4E/C2+8C+A49Q8c
+        Lo2q/FPx7rdp40+KWu6doOk6Nb6n4t1AaTp4tYLTT4Qh0/w3oOnaP4R0qW4lub+50vQ7a61K8vNSuby8
+        n+gv7P0//nxs/wDwFh/+IrWs0n7KDvCFl/iml70/nJtR10ikrJ3v7Of4nD06lLJMurwr5XlDlSWJoe1V
+        HNcycYRzHOLVmpzp4ivT9jlrlRw86WUYfAwqUYYmWLlVuUVT/s/T/wDnxs//AAFh/wDiKP7P0/8A58bP
+        /wABYf8A4isT548d+OnhnVtU8L2nivwrFH/wmfw51ay8aaBKuh6br2oXNvpU8M3iPQNLtdQ2tHeeKfDc
+        ep+HVm0+60zVHTUXtLTVtPW6lmrz748eJdJ8afss/ETxfoUzXOi+KvhDZeItIuHjaJ5tN1q0Op2MkkL/
+        ADwyNa3MbPG/zxsSjfMpA+oW07TyrD7DZ8g/8u0Pp/uV8KfFjw9deDfhB+1D4JOi6ifDFn4YuvGfgvxD
+        qE8F/ayWvjjVvEmq6z4UsZfIiubD/hEPENtftY6dK1zDYeGdc8NWen3K2tsLDT/MlB4fMo1oqTo46l7G
+        tGMZyUMVh1KpQryUE4wjVoe2o1a00k50cFS5ruCOlNVMM4Ssp4eTnTbaTlSqOMalNXV241OWpGKe06ra
+        elvS/wBkOfVR+zz8MmubPT45dnjEukOp3M0Sn/hOPEPCyvpMDMAOQTChPI28ZMn7RnhLXbqx8K/GHwpp
+        WmT/ABE+C+pz65oTXXiK50qyu/CGuTabY/E7Q9TlNnFbXVhe+FbV9Yt7K6mhgm1/w7oEklzbrC0gwP2e
+        /DD+L/2Zvhroy+JPE3hdJJvFU0+oeEr+20vV5IofHPiF2s0v57K9ltYLjgTS2X2W9CqBDdw5bd6of2dP
+        hPc3lvquuaLrPi/U7TW7LxJZXHjjxx458brpus2DSPZz6VaeKvEerWWlW9tLK08em6dbWumCdYpzZma3
+        gePpnXzGlXj9UwmGqwThepisZLDwlGV1VgoUsLi5ztHS0/YqXPa6UeaXsZBjMFleNw2ZV8ZiYVKM61Or
+        g8PgXiI4rBV6Tw2MwWKqyzLLbYTM8HXxWBxUKc6kpYepVjJRU1fFtP2o/g5J4Y0jxRL498Gpp2r6HL4g
+        hWDxEup3FvptpZTX+oT3aaTY33kxafb2t5Lc3UjC2EFpcXSzNbRPMMm7/aSuNTW5T4e/Czx34/nh07Rd
+        WtpNK026tNC1qx1+OGfTm0Txjd6efCNxcm1uYbu6tLzWrCXT7eRZb77MolMfnnwj8F+FfgL8XNe+FsHh
+        nRtM8N6yZ/Gfw3vtF+HPhvwp4f8ADPhzXdQh0qXwZY6xoMNtb3F5oOvt/ZGqiax0qR9I8UfC6NR4i1rU
+        vF+tL9xhYWHylcHurdfxB54rnxOEzmdSf/CjhMNRm5Ol9XwMqtZQlD3H7fE15UueM5Xb+qNS5LWipSS9
+        POsPw1k+NSwGXZjmWBxFKljctr4/MPq9Cvg68o1aEatDDYGhiOelRvhcVGGMg4YqNXllywUZfNxn/ac8
+        WXUsNtZfDb4X6KmsapaSXV5PqHjPxXcaLapHFp2q6RHbi38OW8mq3HnTrFq8dxJa6etv59gl7cyxWGt4
+        T+DcVjqi+I/Geq6j8TvGtjFBYHxJ4x1SM2UJhuLTWEudE8F6Noml+B/Dt5HdpZLHqmk+HrfXpbTTdNh1
+        LWdSmtTdS+/DaDkEZ6de3pVS2I82/wCRzeKf/JKzqaWU0FNVcTVxWPqxnzxeNryq0qcrxcXTwkI0sDTl
+        DlXJOnhYzinNKVpz5vDq53iXTdDB0cHlVGUeSay3DqhiKsLybhWx9SVbMqtOXNapSnjHQq8sHOleFPka
+        raiBj7JY8dP9On9eP+Yaf8+lO8zUf+fWy/8AA+f/AOVtXNw9R+dG4eo/OvUPHKfmaj/z62X/AIHz/wDy
+        to8zUf8An1sv/A+f/wCVtXNw9R+dG4eo/OgDJsZNQ+xWmLWzx9mhxm/nBx5a9R/Zx5/E1a8zUf8An1sv
+        /A+f/wCVtLYECys8kf8AHtB/6LWrTOiglnVQASSzAAAdSSTgAd6P6/r7wuVDJqIGTa2X/gfP/wDK2vhT
+        40/E7wlqPx98DeA/FesGx0v4TxXfxZPh7w74pbUvEnxM+Idp4a8Tvonw30r4a+HdG1Hxx41u/CXhd7n4
+        napo+nWyPFd3nwyddN1oa/ZG3sfFT9p46n4E8TeKvAPiKTwh8I7LwRq/iVv2gLPSLTxbrGrSaB4k/s3W
+        tL+EPw0v7KRvFRm0jT9UbS/ijrsEvw4h1XWfBV34f0r4nabqmo22n9f+z18Ab3wt4S/tP4kQ6W3jXx3q
+        2u+PviNZaVqOvayuqeK/Gcmn3Go2Ot+K/Ecn/CReItI0XSNI8N+D9L0J49H8Nx+G/DWlaTd6FfW2m6d9
+        j9anhY4KLr45uM71aUcHCXJioTULOVSUqdSnRlCb9nOi1OvBqarU8O5UJz9fKMVUwmW5lnmFhecoyyTJ
+        8ZUjU9hPHZhRSzPE4Vxq0VXeWZPWkp1l7WGHxecZRWp06z5pUmL8a/jl46S9Pwq+ANh/ZUWn6Ff6Z4m+
+        LnxMTwFpGoard3lm15oBsfCXg74m67bX+jl5bbUhJp6raarZXul332CZY5Gvt8Wv2gdG1Ar4r+D/AMPd
+        H0Y+Jp4n1G4+KPimA2XgUTCKHxBc6lbfCTWvBlvr21w0nh3WfGPh61lIBTW4/OCxfUU8EFva21vbxRww
+        Qz6fHHFEqpHFEl5bKkaIgCpGiAKiqAqqAAABWgQh64598fyNZPGYS/LHKcH7PWzdXH+22jHmdV4yUOZ2
+        5moUYQUm1GCi+VfMrCYqyf8AaWJ5uZNr2WE9kle/JGmsPGSh0XNUlNpJubauvlvTv2odJ07S9P1L4o+C
+        PFPwhs7nw9feJL7xH4nFn4g+Gmj6dYald6fNLrHxd+HsvjD4aaIs8VtFqtiniHxNo1zc6ZqFkzW0N/8A
+        a9PtPoXR9fh8QaZYa3odxomsaNqtnbahperaXrQv9N1KwvYUuLO+sL60sZra8s7u3ljntbq3kkgngkSW
+        J2jdWOde+A/Cl3cz3yad/ZmpXUnm3eqaDeX3h/Ur6RfunUb7Q7mwuNTjU4Y2+pPd2zty8L5bPgupfs4D
+        StduPFvw78RyeE/El/4h8N+J/Ed/okFh4O1Lx5f+Go7vTrPTPGt94c0lvDGuaFdaHfXGj6gNd+HfiDXJ
+        rWLT5bXW9P1PSNB1TR21lmIfuupl825NRlz4jDXlJclOPM54ilTgnKLq1K+Im+WN4S5pTpl8fQ1kqeLp
+        q3w2pV+VRs5bKlKTaT5VCEfek+ZWSf1B5mo/8+tl/wCB8/8A8ra+dv2pXvj8BPjNvt7VV/4QC63lbyZy
+        F8y55VTYxhmz/CXQEfxCuNsfjH8cvhSttZ/Hf4Zat418PWekXk+pfF74I+FNT12E6lBqtzHBZXPwa0LU
+        PHHxBW1OhnTrlvEWjPqX9oap/aol8H+F7G2tftD/AI2fEvwD8TP2cvjfqngLxhoHiu1s/AclvqSaPqVr
+        d3mi3syS3S6Zr2nI41DQdXSCRXuNH1m1sdUtCTHdWkMiui5V8BicPD2rjGvh38OLw0vbYaWqjZ1I60Zt
+        tfucRGlXSlFypRUo30oY7D15ezUpUq+l8NiIujXWnNpTnZ1IpJ3qUnUp3TSm7M1/2QtG0i3/AGevhlDB
+        pWnQwqnjBViisraONV/4TnxCwVUWIKqgnIUAAdgK+n/7K0z/AKBth/4B2/8A8br5i/ZBk1Vv2evhkZ7O
+        wim2eMSyRalcTRqf+E48RcLK+lQMwxg5MSHPG3ufqDzNQ/59bP8A8Dpv/ldXEdZ4F+0D8LB4u8IRa94Z
+        8OprPjn4d3V/4z8EaFaatD4Xi8SaxH4c1nQrnwlqWqmF7aLT/E2kazqWlpNeqkGlarPpfiCG5sdQ0eyv
+        7Xq/hV4n8OeOvDFpqFs2h6rLHDAG1CzGkXUOqWsiuLPWIW00z2YW9EM0V7DaySWuna5Z6zosU076VLIf
+        UWfUCpH2Wy5BGDezEHI6Ef2fXyFdRav8FviysdnYqPBPxIufEOu+HtI0DwzBa6R4b1uNLjxL8UNG1PVt
+        DsY57zUPGN1cX3xb8J/2lod/qF34h0v4r6TJ4jSbxZ4Z0lemH72m6b+KL5qfTRJKce21pJvtK7Ttf6jA
+        N5zlNTJpPmx2WRxWY5Q5uvKVTC2dfNMup/xKVNQ5Z5pRhy4WiorNa1avWrfVMNP67/srTP8AoG2H/gHb
+        /wDxuqltpmmmW+B0+xIW7UKDaW5wPsdocD93wMknHvU9ve3N1FHPbRWE0MsaTRSx6hK8UsUqh45I5F08
+        o6OhV0ZSVZWVgSCDUds9/wCbf4trT/j7XOb2YYP2O04H/EvOeMHPHX2rmPl9m0907NdU+z8yx/ZWmf8A
+        QNsP/AO3/wDjdH9laZ/0DbD/AMA7f/43T/M1D/n1s/8AwOm/+V1Hmah/z62f/gdN/wDK6gBn9laZ/wBA
+        2w/8A7f/AON0f2Vpn/QNsP8AwDt//jdP8zUP+fW0/wDA2c/y06vKfiT8Vz4C/sXSLHQJ/FnjjxbfPpPg
+        /wAH6LNqEtxqWoi2ublrzW9Sh0O8s/CXhPT47WWbXPFutrHpmnRKtvbrqOtXel6NqOlKlUr1I0qMHOpK
+        9oqysopylOTbUYQhFOdSpJqEIRlOclGLazq1adGEqlWShCNrt3u22oxjFK7lKUmowjFOU5NRinJpGx4p
+        8V/D74d+GbXxD431Dw14c0p5NK0uC91qbTtPjvtY1aWCx0jR7F7ry/tmr6vfzw2OmadbmS7vruWOC2ik
+        kcLXzHpfhTxj+00+leJPGPhm4+H3wiaTQfEnhz4da/pMOm+K21rRtVvrqz1jxo+heJr/AErxda3EEWm6
+        lpfg7WLb/hCNHvBY6lrNh8SpPs0Xh7vvA3wS1rWNW0P4n/G+60zx78QbaPQtT0Hw3HfX0/wq+E+p6bpd
+        5YLN8NPDmpaazN4hkt9X1SLVfiPr6XPi/V2vr2LTG8KeGJbLwfpfu/inxI/hPQtR1u6tdP8ALsLdXjhf
+        VWtI7i4mkS1srVrqbT1t7UXN5Lb2/wBpuXjtrYSGe5kjgjkdfRVajgbRwT9vjm4qWNV/ZUXo+TARaU5T
+        5rKeLnyybjyYeEaLnPEcsMLicyqwp1YyjQqVIU6GCjdVMRKpKMKf1tp2tJu0cMrxTmnVlKcYxp/KnjHw
+        lpvir4xfDj4S6DaazBoPh67f4wfFnxMnh+31Wx8YTeEZ7K08HfDXxL4nvZoktJr/AF/xFpvjT+x7S1vY
+        4tC8KR6TZWGkaVexTW/2VHpWmbFzptjnaM7rS3J/EmIZPvXzT+zN4a1RdE8UfFfWdP04+KvjHrsviG7v
+        LfxSuv2N54O0qe90z4cXGkXdnb3lla6TrfhgxeN10myvdQtNK1bxnrNna38tpHbxQfTm/UP+fWz/APA6
+        b/5XVx4mbclC7l7P3XJvmbnZc75nq/evFX+zGK0tZfYcRSpYatg8iwsoSwvD2GlgJTpqgoYjM6lWVfOM
+        Vz4dzp108bKWCw+J9rVdbAYHBNShBQo0qF7pmmiOPGn2IzdWQOLS3GQb23BB/d9wSPxq5/ZWmf8AQNsP
+        /AO3/wDjdVr177y4s21oP9KssYvZjz9tt8A/8S8dTjnsM8Vc8zUP+fWz/wDA6b/5XVzHzoz+ytM/6Bth
+        /wCAdv8A/G6P7K0z/oG2H/gHb/8Axun+ZqH/AD62f/gdN/8AK6jzNQ/59bP/AMDpv/ldQAz+ytM/6B1g
+        PpZ2/wD8br5k/ab8K+GNP+C3x11uw8O6FZazqXw8jTUdXtNJsbbU7+PTJdR/s1L2+hgS5u10/wC2Xf2J
+        Z5HW1N1cG3EfnSbvp7zNQ/59bP8A8Dpv/ldXzt+1K97/AMKE+M2+3tgp8AXIcpdyuyp5lzllU2UYZvRd
+        y5/vCmpNJpNpSVpJNpSSd0n3Setn11E0nZtJ8rurq9m1a67O2l1rbQyv2QtU02f9nr4ZSwahYzRMnjEr
+        JHdQPGwHjjxCMq6uVIyCMg4z3r6f+32P/P7af+BMP/xdfN37I/8Ayb98NP8Ad8Y/+px4hr6cpDKn2+x/
+        5/bT/wACYf8A4uuC+JPhDw38S/CWoeFNY1F7aG5uNH1Sw1HTNSSy1TRdf8NazYeJPDWvaVeI5NvqWheI
+        NL03VrJ2WSFp7NI7iG4t3lgk9Iopxk4tSWjTumb4bE18HicPjMLVnQxWFr0sThq9N2nRr0JxqUqsH0nT
+        nGMovo0fMHwD+Jc1/Dqnw+8ZTeHNK8f+DZFsfEug6FqMl5pGjarLa2OqXFjpFxdEXH/COXmnavpHibwY
+        lx89r4U8Qad4ZkeXXPCXiWGz+iLW/svNviby1GbtSM3EIyPsdoP7/qCPwr52+PXgnxPYT6f8Z/hnZajq
+        njrwLaXc2oeB9IbTLT/haeiRwy/Z9Guri8SPzNf8NefqN94PklvLVrm31XxZ4Hj1HQbLx/qWu6b6/wDD
+        bx34c+Ivhi38W+GNStNT0rU55oxNZ3drfR22o6b5ela3pUtzYyzWrX2i6zZX+k6ikMjrDfWVxFuJSt60
+        VJKrCzjKykl9ipbWL62lvF9Vpume7neGoYqhR4iy6lClgsdV9hj8LTqOTyrOOWU6uFlCaVaGExsITxuV
+        VKkq6q4f22Gli8TjcBj/AGfbfb7H/n9tP/AmH/4uj7fY/wDP7af+BMP/AMXVrPGa8M+LHxlXwO1h4Z8J
+        aHfeO/iXr89pBofgzRVtLi9t7K41XS9J1DxZrUdxqGmx2fhXw0dYs77W76e9s4kge3gN3atfW89RQoVc
+        TVjRox5pyu9WoxjGOsqlScmoU6cFrOpNqMVq2j5atWp0IOpVlyxVtk5Sk3oowhFOU5N7Rim32LHxR+Lt
+        v4PbQvDPhmwPi/4h+Mr+HSvDfh3T8T2+mR3AcXXjPxrexTJF4Z8AeHEjku9c1u8mjmvZEtvDXhm31rxh
+        reg6HqMfwr+GmkeB21Xxb4j13T/F/wAXfG1noa/Ej4hvDFpz69Podm9tpmkaFo732oReFPBGg/aLweG/
+        CWn3UttaS3up65qt1rXi7X/EviTWovgr8G5fhzaX3iPxnrVp4/8AjP4ut4U+IvxQbRLPR73xClpqWr6n
+        o3h/TLKAzNo3grwgutXeleEfDwurn7FYA3eoXWpa5e6rq1/7rXXialKhGeCwdT2tJ2jisXFSh9elCUZe
+        5GcY1IYKNSEZ0aVSMJ1pRp4jE04VI0aGF5qFKrVnHFYuHLUWuHw7amsLGUbOUmnKEsXOLcatSDcKceaj
+        QlKDqVK+RZX9ithaj7ZaAraw8G4i4xEvBG/P1r5O+OGs2fxL8WeGvgnZanogTxJcX669Z6laS6pZat4G
+        0htEj+McLxRo1rbB/A3iyz+HdlqF/ILAa38U1ubeSPWPDVvHJ9JeI/EcXhnwm2oF7ZLo2cNvpwvZlgs2
+        vpoCYpL2Yspg0yyRZNR1m7Ab7Bo9nf6g4MVrIR47+z7oGoXsfiP4m6r/AMJRZS+MLldJ8PaB4g1eC8s7
+        Lwb4Y1jX00nxbZaVYwQadpmqfFa71HUPiXrcuLnVZIPEWhaHqN68HhjTLSw56S5YyqvTluoP+87JW72e
+        r8k1c+0yFrLaWK4iqW5svtRy2HPTU6mbV4TWFnGlUp1/aUsHaeNrqdCeHrUsNVwc62GxGIw1Q+hLSTSr
+        KGK2tbiwgt4Io4ILeGW2ihhhhRY4oooo2WOOOKNVjjSNVREVVUAAVZ+32P8Az+2n/gTD/wDF1borBtt3
+        erPmbt6tttu7bbbberbbu231bZkXt9ZGOLF5anF1ZE4uIegvbck/f7AE1c+32P8Az+2n/gTD/wDF02+/
+        1cX/AF92P/pbbVdpAVPt9j/z+2n/AIEw/wDxdH2+x/5/bT/wJh/+Lq3RQBU+32P/AD+2n/gTD/8AF187
+        ftTXtm/wE+MypdW7s/gC5RFSeJmZjLckKArEknsK+lK+dP2p/wDkgfxo/wCyfXX/AKNuaAOf/ZCj1Rf2
+        e/hmJruxklCeMMvHp88SM3/CceIeRG2pzMoxgAeaxHUsa+ntmo/8/Nl/4BT/APyfXxP8A/it4T+Hn7MX
+        wp8Q6vH4o1vTry/8VaZGvw/8D+M/ibqUc1x4y8Uypc3Gi/DvQfE+s2+mKLaRJ9VlsF063meCCa5Sa5t4
+        5eqP7dX7MUGow6Rqnj7VvDeqXXiLWPCdjYeMPhr8VfBl3qfiDQLbT7zVtN0e38V+CNGk1ia0tNV065Mm
+        lrd281vdxS280yHI7aOXZhiaTrYfA4zEUU5J1aGGrVaacFeSc4QlFOK1km7pXb0Ry1cdgqE/Z18ZhaNT
+        3f3dWvSpz974fdnNP3vs6a9D6u2aj/z82X/gFP8A/J9GzUf+fmy/8Ap//k+vHNF/aL+FHiS1t77w9rGv
+        67Z3cDXVpd6N4A+IWp2t1bLPLam4triy8Kzwzwi5t57cyxuyCeGWItvjdRtf8Lm8F97fxyPr8LPij07H
+        /kTehrB4fERbUqFaEk7OM6VSMk1ZNOMoqSabs00mno0aLE4eUVKNejKLV1KNSEotW5rqSbTVk3e+yb6O
+        3ozw38ilWuLPBz0s5x1BB/5f/Q18jeN/hD4s8GeJ/E3xU+C76o+oag27xT8IPD+uWHg3w14v12/1XRbz
+        VfiJpEWpx3XhqP4oJoh1e0b/AIST7F4f8cXD6Rb+KNZ0Z9MtNes/U/EP7SXwi8I2pvfFWu634bs/Ju7j
+        7Tr3gP4g6RAYLC3e7vpVlv8Awtbo0dnaRyXNy6sVgt0aWUqgLV41L8fvE/xv0ye0/Zi0mR9J1u1ttUX4
+        1fE3w/4l8H/Dq0sp9RstIntfDuj6pa6H488a699hi1PW7IaTpWleE7i106G2m8faJd6zpt6nZhcFjXar
+        7KVHCuShUxWKi6OCjzNu069SKpudoTcIQk60pQlyRcotLty/ib+xMRUeHqUcZ7al7PGZPJSxNPM8NeEn
+        hsThaM4V3SlJQaxFKdCvhKns8Rh8Thq8KdWOPr/7ROuT6Q+l/Bfxppfxb8bXUuvaPZeBtW8N6f4d+IEv
+        iDQtW0zQdc0uaK/1bwZFol14Uv8AWtNvPGEuqeCLmPwV4auIvE2t2179r8NaF4v7b4UfDnxr8OL7VfF/
+        jfwzYfED4n+I21Cy1Hx54Yg8PNcad4VbWrzWdH8E2jeILzwbrEWg6TJeFzLcXPiHV9d1NJdV1rVJNulW
+        enxWn7LnhLw6brxZ4O+IvinSfjObbXbax+MOr6ra+JNa/s/WtYg1v/hGNY8LTfYPBWt+BbK5txHp/hV9
+        CtE0mS81fxDoN/o3jrW9X8X3nY2HxR+JHhK9j0r4ifDc+IbS78RWGiad46+Eup2/iDS5tNuYQh8UeLvB
+        msy6V4q8GQLdqVvNJ8PyfE2DTY5Y5n1+6t1uLmParXoqjPC4BRlCcr4irUgqeJxLi/djDWHJhIq0o0VF
+        TnO88RGXLSVP1/7Pw2bSjjcFHBVakFOcMlzKrh8Dj8tsrNYfEYepl2Az+dSM4RhWpU45gpU8RFZTh8PH
+        61jvRB8R9EhI/tbWE8MqWVFk8X+G9d8I28kjf8s4LzxL/ZdndyqeGWzuLgdGDFGVj2sF1Nd28V1Z6npV
+        1bTIskNxbQmeGaNhlXjmi1F4pEYEFWRiCCCDivAl/al+Ft9a2klrpnxemub3SNX1u20t/wBn3472upm0
+        0SS9hvILi0vvhxanT9Tlk0+4TTNK1JrTUNZ8yyl0i2vYdR0+S54270vxP8UdVWTwt4M0r4G6DPf+C9a1
+        H4ia7Dp8HxM8XaFd2MeueJPDmi6D4V13StW8D6tBJJZeFr7X/GWrXF5azp4hW08G3kEWka3ccPsdnOLo
+        W359rLl15XaT1eyTevk2dT4axNKbWaYXG8N0Ic0qmJzrlpRahWjQqRw+Fr0sHj8ZUp1XyToZfRx+ISjU
+        m6UaWHr1KeP4ua6/aA8f3XwdsH0+9+H/AISsrGw+Mbal4f1yTSNZ0DxTomv2Wq+DtD1i2voNNl8S6nPZ
+        WWg619nv0v8Aw74QuvGNtf2u/wAV+H5a+zLezurSGO3tpNPhghRIoYYrCZIooo1CRxRRrfBI441AVEQB
+        VUYUAVwnwu8E+CPhb4J0Twb4NjttN0TTYrm4CXGq3Gp6he6lq99cazresaxq2qXd3qmsa7res31/q+ta
+        xqd3dajqeqXt3e3txLcTySH0P7fY/wDP7af+BMP/AMXWdWafLCF1TgrJPeT0vKS2vJ9Lu2ydjjzrMsPi
+        nhsBlqrQybK4zpYCOIjCnXxNSpyLF5pi6NKU6dLF5hOnGpKjGriFhMPDD4GOLxUcMsTVbs1H/n5sv/AK
+        f/5Po2aj/wA/Nl/4BT//ACfTvt9j/wA/tp/4Ew//ABdH2+x/5/bT/wACYf8A4usTwylepf8Alx7riz/4
+        +rLGLKbr9tt8Z/0/1x+GRVvZqP8Az82X/gFP/wDJ9Vb2+sjHFi8tT/pdkf8Aj4h6C9tyf4+wBP0FXPt9
+        j/z+2n/gTD/8XQA3ZqP/AD82X/gFP/8AJ9GzUf8An5sv/AKf/wCT6d9vsf8An9tP/AmH/wCLo+32P/P7
+        af8AgTD/APF0AN2aj/z82X/gFP8A/J9fO/7Uq3o+Anxm8ye1KjwBclwlpKpZPMuchWa9cK2f4irAf3TX
+        0V9vsf8An9tP/AmH/wCLr52/alvLR/gJ8ZlS6tnZvAFyqhZ4mLN5tx8qgMSzf7IyfagD85/gf+3zZeBf
+        hd8OvDFp8LLjW7P+ytQ1Wz1O68YxaPcTWviLULjxLElzpsXhjWI7SeCLWUtJUh1O8jZ4GlSXa4RfZJf+
+        Ci9tPE8M3wShmhkRo5IpPiArxPG4Kujxt4EKMrqSrBgQwJByCaKKA30ez3Xc8i1v9pf9n/xKXbxB+xV8
+        JNZeTRp/DjS6l/wiV3OPD91q0mvXOhpPN8L3mj0i41yWXWZtOjdbOXVpZdReFryR5mxp/j9+z/cCZH/Z
+        G8LrDPceGrqS1g8eXNtZef4N0yfRvCzLY23hCK0jGh6Vcy2GnxxwJHDb+WmwiCDyyiuyOYY+C5Y43GRS
+        d0o4mslduEm7KaV+anTd+8IPeMbczwWDk+aWEw0na13h6TdmmmruF7NSkvSTXVnU+Hf2rfgr4Svo9V8M
+        fsffDfQdWh13XPFEWr6Xf+HLPVo/EviaLTIPEfiBNUh+Gi3661rtvoujW+r6oLgXuo22kaXb3c8sOnWa
+        Q+gWH/BSSJ7nV40+C237LqKQn/i4YAJfS9OuMqB4G6bZwOcHcG4wASUVhVr1sRLnr1ataVmuarUnUlZt
+        yavNydm221fdt7tmtOlSoxcaNKnSi9XGnCMIuySV1FJaJJeiS6Gp/wAPIRjH/CmeDz/yUT/8BaT/AIeP
+        p1/4UwPx+Imfb/oRfeiisrmny/rf80J/w8djzn/hSy59f+Fhgn/1BffP15pR/wAFH1U5HwYAP/ZRPw/6
+        EaiigLdbfh8vyKGj/wDBSkXWk6bcr8GCqz2NrKob4iDcA8KMAceBiM4POCee5rR/4eRf9UZ/8yJ/+AtF
+        FAB/w8i/6oz/AOZE/wDwFo/4eRf9UZ/8yJ/+AtFFAGZqv/BSlbeCCRvgwxDajpMAC/EME7rnVbG2QnPg
+        YcK0oZu+0HAJwK0/+HkX/VGf/Mif/gLRRQAf8PIv+qM/+ZE//AWj/h5F/wBUZ/8AMif/AIC0UUAH/DyL
+        /qjP/mRP/wABa8V+OX/BQaDxd8NPil4Un+E8ulw3/gKZrrUovG6ajJaWh/tae4mt7B/CWnreXMcFhMYb
+        aS+sop5Wiie7t0Z5oyigD//Z
+</value>
+  </data>
+  <data name="cbPointPlot.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        /9j/4AAQSkZJRgABAQEAYABgAAD/4QECRXhpZgAATU0AKgAAAAgABwEaAAUAAAABAAAAYgEbAAUAAAAB
+        AAAAagEoAAMAAAABAAIAAAExAAIAAAAQAAAAcgE7AAIAAAAIAAAAgodpAAQAAAABAAAAipydAAEAAAAQ
+        AAAA6gAAAAAAAABgAAAAAQAAAGAAAAABcGFpbnQubmV0IDQuMC42AEJyaWFudGEAAASQAwACAAAAFAAA
+        AMCQBAACAAAAFAAAANSSkQACAAAAAzU5AACSkgACAAAAAzU5AAAAAAAAMjAxNTowOTowMyAxMTo0Mzo0
+        NwAyMDE1OjA5OjAzIDExOjQzOjQ3AAAAQgByAGkAYQBuAHQAYQAAAP/bAEMAAQEBAQEBAQEBAQEBAQEB
+        AQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAf/bAEMBAQEBAQEB
+        AQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAf/A
+        ABEIAJYAoAMBIgACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMD
+        AgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygp
+        KjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOk
+        paanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQAD
+        AQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFR
+        B2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZ
+        WmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfI
+        ycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/AP7Hv2ev2cP2ebr4CfAm5uvg
+        b8ILi5vPhF8Nri5nn+G/g+WaWebwLpMs0sssmjs8ksshMkkkjM7yMzMxY165cfs1fs5pDelfgN8G8rFI
+        QT8NPBhxtt1bJB0UggdfTjkHmrf7Occf/DP3wA/dr/yRz4Y5JUf9CFpHX3xj8jXr92kYgvSFUERyEEAL
+        0tlPUY+vpQB40f2aP2ch9nH/AAob4Nncw3f8W08GcDyn5/5Avr+uPamP+zV+zkFul/4UP8G8An/mmng3
+        vBGeCNG9fTpXt7JHm2wifeGflXGPKkxn6VHIkf8ApX7tTz2Vef3EXT+tAHjTfsz/ALOIkQf8KG+DeCGz
+        /wAW08Gccrj/AJg3c8Vn6n+zX+zpHpursnwH+DYeO0umRv8AhWngw7StkXUj/iTYHzfhwSe9e+skXmx/
+        u0+6+TtXHVcfrzWbqqoNM1khVB+yXRUqAORY5Xpjo4zzxxzQB5E/7NP7OSzRkfAf4N8pL/zTTwZjO6Ln
+        A0bHGT7CmD9mj9nLyQ3/AAob4N587p/wrTwYf+XjHP8AxJemPXj8K9vlSMyxfIh/dzc7VP8AFD19f1pg
+        SL7Ov7tcmb+6uf8Aj6OSfbrQB4wf2aP2cQ4/4sP8G8GNj/yTTwZ1yMf8wb0Jqjdfs1/s6LaI6fAf4Nhj
+        qFlH/wAk08Fn5X1aCJhzop+8rEY98CvenSLeP3akeW3RV65XGff8aoXiILJMKoJ1KyHAAO1tYgVh2PKk
+        igDyBP2af2cmlk3fAb4NjEcRwPhp4N6lps/8wbnp259aRP2aP2cfKgY/Af4NjITP/FtPBh/gP/UFzXtk
+        SR+bLlFyYocnA5+abke/5HvRGkXkW48tOiZG1c42GgDxUfs0fs4s8g/4UN8G+EUj/i2ng3uZB0Ojc9Px
+        r53+LX7Dvwq8eeLPhLrnhnwd8NfBWl+D9Znvtb0PTPh7ZWtt4sMmpeFtZgi1AaBqPhy0uo7fTPC+vaKt
+        p4isvEWkS23i2+ll04mAxXH3rGkfmSfu1xtjwCq/3puOf0rPZYw+kDaq5uiGBAAI/sq+IGOh5UHp1Xvi
+        s6tKFaDpzT5ZOLfLJxb5JKcVzRs7cyV1ezWjOzL8fissxUMbg5whXp08RTi6lGjiKfLisPVwtXmo4mnV
+        oybpVZqMpU3KDalBxkkzxqL9mn9nXZc+Z8Bfg7lMld3w08Fgn9yrY40bHBOBgDIGSNxNTP8As0/s5grs
+        +AvwbJHOP+FZ+DDlhn10bBGO2CMdc12fjj4ieCfhxaQXvjHU10m21bUG0+0mGn31+iSR2P2m5vL46faX
+        f9l6Np9vE9xquu6l9k0XSYNs2p39pE6M3cxiF2jZUXbg8lVweCQR1HQ/XscHiq9pCc5RU4ucHFzgpLmj
+        zJuLlG97SSbXMrOz3sYyw1elRoYieHq08PiXW+rVnSnCjXdCUIV1Rm1yT9lOcIzUG1TcoxaWiPjv4c/s
+        c/CrwrqnxKvvF3gX4OeM7TxV4svvEfh/Tz8GvDWlHwhY3ESwW/h63nurnXLe6srPTINJtIv7Ms9Bsmur
+        O91V7CTUta1G4f1N/wBmn9nMahbRj4EfBvY9lfsw/wCFaeC+WSfTQhz/AGLkYDvjGPvHOeMe3NHH/pmI
+        1ztbB2rjH2eP8PQ9DTJFj/tO0G1dv2HUCQANpIuNM25A4yBu6j+lb161TEVZVavJzyUE/Z0qdKFoQjTj
+        anSjGEfdjG9oq7vJ3k2yatWdabqT5OZqKfJThSj7kI00+Smox5nGEeaVrya5pNttnjB/Zp/ZxCY/4UP8
+        G8+ay/8AJNPBvA85gP8AmDemOe3HavIf2iP2b/2ebP4C/G+4tPgX8IILmD4O/E24t54Phv4Pjngng8Ga
+        zJDNDJHo4eOWKRVeORCro6qykFQa+yikWB+7Xd5zYOFwB5/5f3e1eN/tJJGf2fvjphF/5Iv8U+gA/wCZ
+        J1o9u/ArIzIv2cxa/wDDP3wABFvn/hTvwxzkR5z/AMIHpJ59+n6V7Bcrb+TehVh3COTaFEeQfsy4xjnP
+        pjmvIv2dZYx+z78APnTd/wAKc+GH8Y/6EPR/9ruMdO2elbvxG+KPgj4cacbvxhrg0uK/N2lsItO1bV52
+        S1sVku7ma00ey1C5ttPtEkhF1qdxDDp9rNcWVvcXMc97axypyUbczsm4xTeicpvljG+15SskuraNqGHx
+        GKqwoYXD1sTXqX5KOHpSq1Z8sZTfLCCcnaMW3ZOyTb0Ta9GZbXNr8tv9/niP/ni/WvP/ABkfGaaj4bPg
+        6HwtNpX/AAkir45j1trqO8HhV9HuFkl8ONZB4n1mHVG091gv0W1lslu83EcyRQXfhP7Ln7Ucn7T3gC++
+        Iuh+DpNE8O4gl8I6jPdeKUtfE6Ftd0+8ty/izwD4Fmtb/SdU0WW01P8Asy28QaKn2u1uLHXL6CQNXsPw
+        s8SePvEXhq9v/iX4bsvCeu/2ldQwWVpOhFzp8drYsly1uuoat9ikhvJbzTPm1K6F/HpsetQi0t9UisbO
+        KylGq8JUjicNiI1a1OpTnRq0K9Crg6/s61GvSqwjUo1FUhKm6VWEZpqSlGLiduZZFjsvWPo42pQwlfL6
+        2Dp4ilTzDBTxN8VT+tUp4eNOrWhiaUKcY/WpUvaRw6qctb2clOVL1gra+ZD8tv8AdfPEfouP1rO1Rbf+
+        zdZ2rBu+yXZXaI92RYArtxznfgrjndjHOK0pZY8r5cibtkm0s2fmwpUH5gcbsZ56d+9eLfDq7+KUngfX
+        v+Fvf2IniZr3U0s00TyRC1iNIs1y32WWa38mTWhq7aAS66g/hdtB/tyOHxGdWhjbnapCnyTfPGb50lyR
+        UOVe+7ppycko2TTd72OWGGU8JisX9ZwsHhqmGprC1KvLjMS8S6qUsLR5WqsaTpWrPni4OpSSUnPT2SYW
+        omiwtt/q5u0efvQ9OPy568Vydh4y8I6lrereFNP1jQr3xBoP2WfWNItr2zm1LTo7uSKe3a7tI3aWDfDc
+        W0v7wKVS5tXZQtzAZILnxrpuq2HipvBF/oXjDxB4Xh1nT5tDsddsB5fiaztFntfD2rXUclyNFuri48mG
+        Y3sQe0STznhZUYV4JouveFvhroUPxi+J/hN/DHxD8banf+HNSTQ7PWdTmuvsk2q6rHNp/h2HVvEVr4aG
+        t+HvCcOveIIrK6D3kml6emt3V9f6fYJBhWxMaUqesFS5alStWqc6pRpQ5U+WrFcjqqco2g3rH2javCx6
+        mX5PPFUMZz0cXUx3PhsHluX4R4d46vj8Vy4im6uAqv65LA/UqdeUsRRpNKrVwq5uSba+siLXeDttxmJj
+        0j9VqheLb/Yl2rDn+0rIHAjzt/tiAODjts3Bu23IPGa5LxD8U/h14TsND1bxZ428M+FdN8Rog0O78T63
+        p+gR6lJLbxXaQ2h1W5tfOnFvIsrwpmVEYb1BOK6q4mSSzjKyo6nULBgQ2AV/ta3LHqBjaGJPQgnHAyer
+        TX3o3Vrq+qu0lded1b/M8edDEUoUqtXD16VOs6ipVKlGpTp1XRlyVvZTmlGp7GpanVUHJ05tRlZs0Ilt
+        fNkysG4Rw7siPIIabOc85+tJELTybckW/RB0j/uGnxyxCWXMig+XDkb++6b3xRHND5NvmReidH4+4ff/
+        AD9aDIEFqZZeLcgLH2j4+aX/AAqgVt92kbVhx9qYSbRHjb/Zd5gPjjG4JjPG4L3xWF4o8feEfBMmif8A
+        CT67Z6MvifXtN8LaCbp5B/afiDVHuv7N0i2KJIHvr7yZRawMRJOyMkQZhtreZ4t+kMHU4uSXIfIA/su+
+        Azg8DLKPTlR6VKnFylBSi5w5eeKacoc1+XmjfmjzJNrmSutrkKpCU5wjOLnT5faQUk5w5ruPPHePMk2u
+        ZK9nY+S/jv8AHz4I+GtTPhXxd4f0bxVr3hvxRazxw+KtFbTvCfhjWLTwvZ+IrTWpvHHiDQ5/CumalDp2
+        r6Tb6c1hez6s2o+IdM0+BI3nvDbfT3hfXrHxJ4e8PeI47NrGHXtG0zWYrK9jiS8tItV0+3vo7e8jXcqX
+        NulwsVyoZlSVGUM2Mnh/Hdp4L8CW/jP4vWXw4g8R+NbTRp1up/CHhnS7z4ieKLeK106OLQrW/WO31LUn
+        uvsGmW8VjcX5jeOwsY0QmztVj4z456T8a/GXgnw6vwC8T6V4J8UyauNS1a81+/0qwb+xJfCfiKK302O4
+        vfAHxSs47uLxVd+Fr+/iTQ4/tGnaZqVrb6rb/aQJsa06dOvUnh4VqklhaE6uFjThKrOcZShKpCrGME4P
+        mtGlJuUFFtycT28LVwWZrLMi56WX42FfEVa2a5jmWKhl0MHieXkg8O6FWhhJKrRl79FVJ4irKnGpGKac
+        foQvaH7UoW2JZWIwqHgQIOCBjrjGSMkg96fItsNStPlgCfYdQ3cR7dwuNM257ZwWxnnk47188a54d+Ok
+        3xo8J69ovi7QrX4O6do1lb+MPC8moaZDqmq6zHp/jFNQvYrKb4c6rqF1HNdXvgWWzez+IXhaOzTRtUaT
+        Tr4TiK+9c1nxv4W0PxT4Z0XWfEelaZqfiS11SHQtNvLlIbvUporrSYmFuHYZHmXEFuGbar3lzbWkZa5u
+        reKS41uZVJTpzw6hPkTre6p6QtON2rxcp8qWknKLVlpfnrZbVpywcMPXw+Z1cXgP7QdHLPbYqrhacfaO
+        tDFUlSU6NXD0aTxFeCVSNHD/AL2dS11HD8ffFn4ffDbVPAWheK9Ts9P1P4keLo/CXhiBns1e41O4kVYH
+        ljkmjn+xyald6Povn20VyY9V1/RYZY44btriHG/aQ+y/8M//AB02iDI+DHxSxgRg/wDIka307+n4163J
+        9ldRIzKzLMSCcHb++ZjtzkqSXO7GPQkDIryL9ou4gm/Z6+ObJJGwb4L/ABSwQ4Ib/iiNa5HODz6D2PSu
+        qpKi4UY06VWFWEZ/WKkqkZ060pS5oSpU1CMqKhTlGElKdRTmuZSjfkXFKdFwpRhCcasYSdaUp80ajlO9
+        KUIqCVOKptRac6jnL304p8q+e/2Tvhz4s0S0+G/xRv8A4n+KNZ8IeJPgV8ONO0v4aTw+PJtF8Pzn4afC
+        qzjubO0u/FWoeDoGtLnwnr17FPongvRL+5l8Z6kLzUbnyZZNS+vPE+heD/FEUb+I/DFjrr6PdjVNIbWP
+        DMmoNpupwW6GC+smvNPk+yXUTAGO4iKOjBSHGMjxH9kT4j+E/Hn7O3wVu/C+ovqNto3wv+GelXsz2Goa
+        couV+HugXMUtsNUtrJr7T7u3uIZ7DVbFbnTNQgfzbK8nQMR638UviFpPw18DeIvGuuWt/daXpK2qXEOm
+        pZSXTvqVzZ6TaBGvdQsNPt4ze3sC3F7qN9Y6dYQebeX95a2cE1xHwx+qwoSnCUZ0JSnXlOUvaRblNzqT
+        i/eulLm5IR0i1yQtbT2q9TPsVm2DwdWniKOc0oYHKMJhqNCnl+MSVKGHweHcKUMM3Xqxmo+1q/vKymnO
+        bWp2UN/piiBLaGVFSQmRINMvQA7RzM4ZY7TG4tuZtwBLZJ5qR761xdYhvMZPH9l6l/zxjJ/5dCM5JP1z
+        Xzl8APhJ4F8Ht4i+K3gu78Q3CfHN7Dx3f2+tab4W0t7b+3dT8WeObfzIdD0DRb+a9SXx5fWU83iK91vV
+        I7Ky06yN8TazSXH0iLgEXSqpJUtx8meIow2f3nBDdQec81rRqVJ01UqwVOc3NuMajqRcOZ8sudwpt88U
+        qjTjpzLV7vgzTC4bBY6vg8LiZ4ujQcaarVcLPB1PaqlT+sU5YapOpKm6GIdah8b5lSU2o8/KnS39uzKA
+        l8vyOAw0zUcjO0Ar/oh6feGePUevzP4f8DfEWz074yWvjLxvrT6f4v0ubT/DE+j6r4w1fVNCu5YfFy3/
+        AIm0+fXtFtIPC99e2eseHYrTw5pH27QtEuPDiz2txKb2Vl6P4s/tD+Efg14g8Mab4v0/xILHX4pZBquj
+        6Jfa6bZmvLbT7e3stD0hL7xN4nu3vLi2S7sfC+j6xe6VbXNvqOpwW9lcwTN0ln8VPBfjX4N/8Le8Paq8
+        /wAP9d8GT+NNN8QSWN/bbvDk2hPfJqh02eCPVAn2INcfZ2sWuSuDFBK2wPbrx+r4ql7soTg4VrwjzXgo
+        1XCFWVpQvGUOadKaVpJOVmmZVKWIwH9n4qvyYVYuk8fgqlSVGXtMNQxEqNTEKHNJ8kK1KpCUasErKLlC
+        VOcefzD9mTw38JvCWieJ7bwD4xsfiLrlv4m1nRPiH4m0e51nV0tvE2m6vqGrSeFXsZ9a8UnwrbeHH8R3
+        SWPhYaj/AKDDfPez+fd6jc3lz6Z8XZ/AB+H2uah8QvBMHjrw14fVtduNB1nwfBr9rLLYSSeXcJaa9YnS
+        rd4Fmm3alfTWlppts9zdXt5a2UdzMnjn7GXwxT4W/DbVSNR03WpviH4uuviJqOs6dFqUc2ta7q/hrwfo
+        niPXdZbWhFqU2v8AiHxJ4f1XXdVM4dYJ9SFpFNNFbpPJ7F8ZviLY+BPAGvPF4n8J+GvG2q6Rr9n8Nrbx
+        b4h8NeH4de8bpYXL+H9Ksn8S6ppun3c0+ptZxvFJOIAkha5aODzHVcuXzp+zyxVsPgKsILD/ANofV51a
+        arKN6tf2DdCcZVXKonF2dNxcrSUre1jMbjMw4lqZjPM63FGLr42njJZnlssRRrZnCKhXlLByVOVbDxVC
+        LpU/Z0XTw9KmvY01RpwiuRvPD3wv/aO8F+E9a17w54oj0K40q+bTdNS78X+GZl0zVY003UNOuX8IanZW
+        es6FqNvZQmFPtepeH9X002moWP2qyntriT2+e8tkso0Ed6Nmo2OMabqI+VNXt+cNaDkrkkL6lUDHAb5h
+        8JeLPEFz47+FGg/ETx14m8KfEhbLxtdar8Lv7H0S/wBN8X6DrWr+MJfAN34o1/wza6z4R0nxFYeHvAV7
+        qkEei+JbU3c+n6/aJDJFK0VfU2pzstgoCfMNSsiAzICxXV4H2rhz8xwNo4B7sBlgLDzw0qsalJKo+W+J
+        hCKhjoQpQX1ily/FSnJTUNd4uyaevjYnHVcXOdBfWqeW4XFYh5Xg8RjViqWEo4uca8lRnywUbqpCFetK
+        nSniHTVarTUrWuR6hbiSUeXen91CD/xLdR5+afv9l6H6muSj+IvgtvEqeCF8SaY/i+Kxh1CTwqtyD4jj
+        sWiVxfSaD/yFUsykkTi6a08nEkZ34dc/N/7OX7Rvin4la74g8CfEbwbqPhPx9o0Yu5YP+EbvPDWkmzsv
+        DXw41nWdPNlrXiPV9bGp6JqfxIs9Ne6mt4NM1i3jh1LT38uSWOPr/ifZ/D/4SnXP2gtQ0vxHqPiCzm0V
+        YdK06513UbfVfFHiC30T4Y+HltPD2kW2rzm81L7boehTTafpV75NtI18bGa5RpG5qWK+tU6dTBL2qdZ0
+        qkalOtGpFR0nGNH2TqyrczjGFNQvKUkk9Vf08xydcP4vMMDxE8Tha9DLfreCnl7w+Mo4mrWjTrYOcqqm
+        41MBWoe1dSrQVSrGahCNOTdjH8T+KvFetfHjTNM8P+J9NbwJ4KsNJ1Lxv4fu7CwaSyvT/wAJPPqWoXZ1
+        Twrd6t51nZXXg+fTpPD3iDTBpE01zLr0Yt7yzjuvoOx8TaJrdpoWpaPfjUtOuHFza3+mxXF7aXVvNpl9
+        5VxbXVtFLBPFKDlJYpHRwSyOygsvzR4y+MnwS074XaD4/wDiToF5oWiftDeGNA07U49N8OavqOv6to/i
+        TRStvHq39g6bH4nawsdK1wIJLyytNU0q0vWMun6bPDd21tx/h34H/Az4W+AfiP8AEjSPFHihvBHxH8Fe
+        JtY8R67FbaFeajF4V8Waf4q8WXmuWd7pvhSLxNq93BB4kvJNHn8Tza8+laakNpFFFaxzxyYRlisNOrU5
+        I1aLnUq4mdarUofVfd9pQh7OvSlyL2abrQdSLpS9peN4cst40sBieHMNmOc1JZPXpx9jk1XCZCoYDOst
+        o4qUsXXxmOq4qnUlmeBp4mj9YlUoxp2hGhzQk4QPaNH+Hvie0+Nvir4p3HxK8S6n4R1rSZtOsPhzLD49
+        l0bR5m0fwZZR3FtZ3Him58Fhre98OaxqUd7ZeB9P1x5vFF7BPrEkMUiXvl/xT/bS8J+AtXh8KaF4J8de
+        JvEup6vqHhzRbix0vS49Ek1nTfGPh/wHqW+zk16Hxfqsel+IvEVnbPpvhzwvq2san5E/9mWcsTwXMnoP
+        gPwH8MvhZ8J28Jab4vn0bwp48u7iDRtWub7w54Ev5L/xrpMFtY2PhKPw3pvhGz0jVruNBdaTb6Rplvq7
+        6m09+hlv5XmX5E+D/hzxF8IPAXxX+FHgbwVp/ij9pLwDpOuN4M17X7DwjeeMvGNtbReHddh+2+NLi70X
+        R9ek8PL420V/BWk67rHg3T00S/8ADHhm8PhSDTtWbQ6qKEcBTdHGxwGY4vHxvh3RnjqUqVWhOeJq0sXK
+        SjGpCdPD06ND6s1OFSpWjKCpSjL6bJKGX5rjsVjswwr4mybJMBgsJltR4mlw3SxeX0sTSwWFxuLjSpym
+        8vwzr0XmWKnW9vhKdWk60uWo6lH6q/Z6+Per/GFPH0fiLwrL4W1HwjqVnpdxZwxa3cEXU7aja3EDwahp
+        Nlcy/Zm0iOQ6raRSaOby81DwzFO/iLwp4mgtsn9ovwn8QfF/iz4bal8PdD0q4Ph+PWLzUPEM8s+neK9E
+        uIdQ8P3ekjQ9M1rw54h8I+IrWW5tJJp7fxLpki6JqNvpmu6E8WtWtvc23Y/s1+FPFmgfDaPW/iT4K03w
+        j8VvFlxq+rePbXTG0h381tc1m40RLv8AsXWNb0Syu20i8t9T1TSvD2qXugWXiPVtfmsbi6mvby+u/Qfi
+        jofi3xXokmmeBPFn/CE+JWgmksNdOnW+qx20sF3psgMlnJKgmiUlJXi82OO48tLa48y0mnjfOphKry2W
+        HxM62MrQXP7XCezo16zp1lVoxj7aMIRm0oRlFqPvt++tWvmc+zXCZbxLjs04XwMcJhMFWpPCZVh8SsZQ
+        rfVsPSw2OwyrVa8li8vzKrTxMPfryWIwWJ9nOo03UfL6hoF146+D2i+AviZqiweLNe8L+H7fxfPpmleb
+        aX/iCxXS7zxELLTb3SjZ3+j3WrQzQ3FjLYpBcaXcm2khgjm2D5i8Uz6t8M/gh+0X8I5PDOs2fwy8DfAf
+        4wavo3xA1Syl07T7s6/4e1rxHNbKsek2Gg2mk2lxrfiDS7DTNJmKeEdG8H239siK313QnHO/tA/BTwB4
+        31D9n3Sf2gvE/j7W/iRo1lB4ZuPGvgPRPAuneH9V1bxDrWi+CrXXNU0XxTp3iO48Kz3HinxLp82lz+B9
+        uo6Zd3IbU9Ru9K02GWL6v/ao0rTPFH7Mf7R/hjV4Wu9J1/4CfGLRtUto7hreWXTNU+H2vWV7Es9vMlxA
+        ZbeWZFmhZJo9wkjdGRWCw/tK1etV9gsPPCKlShP28atfEU/q8KsqWLj7NRoyjUbTSnUbd5pq9j1a9XC4
+        Ph3JlUniauE4mjjMxzDLK2UvBUOHM0p5gsFDE5TisNjJwzStTyynUozpynDCYaVaNKdGc6arT85+FXwc
+        8PeJP2UPgx4U8Ow2/gSPW/h58LPE2pXHhrTNMs4tT1c+DdCu7271mytRZpq8uqGFPt0t04uJpYre5knd
+        7cBvWPBfgf4leHPFXxDufFPxJufGXw3u9D8G6T8OfB9/o2jJqnhOTQfDn2HxPqmueJ7e1j1bxPqPijUt
+        moNLeTNHaqvkxQBmaRl+A19Bp37NvwNv9QuLXTrCy+Cfw3urzULu8jtLWztYPh/pUs93cXM4jgt4beMN
+        JLLNIkSIjM7hQSIPD/jfRPCl1q3hnxz8avAviLxF4j1HVvEfg7TLnVPDmg6yngzWIbvU9DsrTS01FrjX
+        4rGzsdVEGv2sMMOpWWmzTmBGs7qavWw9V4eriaVDDUaksfgo4fEVJYfD4iVDD4fFYbEQqUY1ozng6sql
+        NUfreEhSrSw88ThqlZUK9aE/jcTmeNr08Nga9fEVaFGvi8wU3Up81LEVqdGnVr16rf1up7SFGnGmm6lG
+        m6V+WD1fuDqAlsgikCjA4MeSBCwGP3vfbt5IAyfcj88/Cnj3QL34zftb/s9/C7xh4vX41f8ACO+JNaTU
+        fEN/4Zi8NeENe1Lw7ofiTw9fWlpa67qnjJktLj4w+H9Pt/Elx4JXSZtE8H2/hi1e+u/Bo/tTQ0P4x/FJ
+        vjnJ8HvBt03xFjTxn4o8TeLNX8TN4Ntj4K8EW2q+AYF0CxtND17TNWi0+DSvFevTeH9W1XStS1XV7200
+        mOHTH0SPVNQg1dY8D/B34X/E74sftQ+DLifxN8SdPsNG+FvjPwpB40tIPDOhy+L/ABf4e1Oe812C20PU
+        9S0e4sbrXm8R6pqV6b+Ox0KXU0hsI7azsoNM4cJOGZ4nDulVjhXhcXWhH2+HhiFia1PDzVPDUHHFUKcP
+        aVeRVK7+sKhS53PD1HovqaGHfDmWY2lxDB0MRxRkFLEZVllHE4PEV1WWY0JYLEZnGFZywkPqdGrmFGgo
+        1qmJpSgqlOl8R0HxR+HWtat+zpbeGfjb4zg0+Wz8Wxaz4hvrDRdV+LkF5C/xBuL/AOHXh22spdF0vxD4
+        pudF1O98EJbNN4dkbU9T0KCz1jSNb0a81O1vfRf+F4fAXw74Gmgj8WeF/BXhPR/ClpdWraxbHwN4d8Pa
+        LPo2lHR7G5Os2mi6d4fuRZazoxi8NXKWWq20F7bRtpMSssdc/wDDHWPiV8X1vJfin8O9Jg+GHiPSYdf0
+        Oy1P/hHtY06dJdXsNZ8Iiwlt9Z1DV9Q+yaXHb6hqV34i8M+G3t9dt7W40mFYUCw/J37Sq/sv3vxGj+Aw
+        sG0rx/qs/hDTr2zudO1DXPhVAmoQeF9A8N6Jqvw8vviH4D0PXdU8q+8E3kVz4M0/VNW0KKw0DUdZdNLs
+        ri2b6api8roVMLheIsY8Ng3j3KU8vjg3CnLMJYf6xGjC1FVsS4QlBUnKcE6cIRapxbXjZflmc54pZflW
+        Ar5jLA4fF5hVo4XDqo6OFpKi8Zia0oQjP2NONOn7Sc5OMfdVleKf1rZ+A/hDpnxo1z4p6Frov/HmkeGH
+        vbvwN4em+HlzeWWg2/hfQ9Eslt7Kz0ePxvBpdxpVtpc2maXN4jj8Ozahf297DZCS5tJV6fVvB/gz49eC
+        vCfi3xx4Z8VeH4J9B1KZtD1vVNS8Ia3pGm+KIrL/AISDw74qs9G1W2KFo9OtoNU0+8mcWstqY5Ft5UmA
+        +YfEn7H3xB8AeF9Ul/Zk+LWuaH8WvEGmeJ7XVPE/jvxLbXtjLc+J/BOl6PqGt2l1q3w8+JGs2N5d+L/B
+        fw51yWx33KWmnaNqmnaFeaSLsmTxvw/8RdQ/YW/ZT+J3hj9pD4s6D4i+Ll/rnxP1bwL4d8O+IvHXxz8U
+        fb/E/hTWfGWk6TqCWvw+0DxnqFi97pHivxLf6tqPhLSvDfh7Q5vLu9XtNIso7iL5nOcZRoVsH9bkquWP
+        AVI4itiHh6OGwmIwlWh7HDSnW5IuVecp/VnOVONqUbptT5fY4N4X4hzxYfGcM5jD/WSnmWCyrCcMZZHM
+        cRxFiHmVOrB5pgY4HAtzwGHhzYfHOM4ToxxEWoz5qftfpL4FweF73x1dfETxz8UPhJ8RfE2o3Ol+Fvhx
+        rXhj4k6b4xvJ7/Qh4pbWXsZzaaJDY6jfab8RraFfBWlJrlr4Wt9UuPsWolPEczTZn7aniCy+FFp4f+OP
+        2LU9f8QaVqmhaP4Y8LWml6ZczS6n4Yu/E3xCuLqLXbzXtKbw3o9zomlauPGy2EGqaj4k0TS7PRLC0F5J
+        bvXxv8E/FmqeD/hz8Bbr4xfCX4yy/FLxT4j1/wAf+LE8LvNd+DvCf/CJ694P1LwDd/G3WPFtz4t8W/D3
+        w/daN4H8IyeGJ7j/AIR++1nTNMb7docU9xqmm2P3N+1L4t8O3nwu+GuveK/BPiG90658TeG/iGvhebxF
+        L4P1hLzw5bR+JYPCmp2a6dqo1bX7/edNi8Ib7H+076G4tv7Th+zyed6OLnXyDC4PEx+tRm8D9dpYfNZ0
+        6yeDeZV8JLDVKmFq4pPD1J4bGUJug4VFG8qL5XSrP0sTk+KnxjP2mW5XxRhaPEGNyapheH8xwOV5Vndb
+        JqVP2sMBjP3f1bDYjDwp4l4udGmqzquFOft6ntKfhKfEH9pT4aeMPiD+0N8QPgl4T07wlfaB4e0yz022
+        0LS9P8dtHPNqt9dXPiPVvhbo/wAcfHerW+iaTougaYrymKG7vrzS9LtvBFtPDJrVhe8IeMdH+Pa+B/2l
+        fjL4lHwk+D0k8/g3xH8C/jW+r6b4M13xB4esvF89nbT6d44vvC3gvWNY0bXJtJ1i/vbjwFfaho3jb4aa
+        rp2i6xe2WiW+sr4xP+2B8S9B8ZePPgB8YvAeqaX8O9SW8nb48/GPSvEVr4NudD+IfjnxLpUc194h1D4Z
+        eCPhn4Y8M+A7MxXmnS6zq2v2PiKB9H8LaDqeov8AZ9SbtPATaH8Yv2Kdd134f6BB4u0nwz8SB4h8AeHf
+        C3xO1Aafpuj3ltoem/EQaF8QrHxT4HfW7y40Hxf8T9V1Oz1rWbdNL8YazqnhO/0661DQY7JvnMnrYfMo
+        16OExsZ4h4+ksJhsyrYzD4zDZhQxntsTKGJoxUKmX8tehCakqlOShSrUJRdWo6n6Pn+AzXI8nwWc8UcB
+        UuGq2aYLJqFfO+GHl2bYChwdnOTV8NhMBRwssxzXA0+IcVVwsaksdTxMcbQnRxMU8JXgqJ+i/imy+Cd1
+        4XuvCviPTPCcvhj4ZaDovi1fDNtDp6DwRofhuy1Cbw9rOlaFozLe6Ja6dY6Nfx+H5NKtIQbbT7q00tXi
+        ilhH5V6x420r9jWXx18dPhX4c1y6/Zy8XQsmv6xf/DHQtPvvB3j37X8fNXtdJk8KHU/hd4//ALD0DxT4
+        r8E2sCa/4X1u71HwjdrpWj+J21MaeLj460nxX+07+0J+0f8ADr42fAb4Dz6Ta+IvBvgPQvj3a6v4T18+
+        HPH+vRfDa7/4Sm7c/G7wj8N5tC0yHwHr/g/SNM07wp4jsvD3jF0iGq6l450v+xLy9/V/4p/ADV/DPwc/
+        aEfxF4m8Na58L/F2k+HvE9n8HtX8DeHLbwh8PNO8K+Hb3UPiZDpV2dA8YDV9Q8WwWs17pt9deFLh9G1W
+        ys547S91W6utdPoYuCxWJzH2WKeEjkFDDZhhq2MwyxVHPcwnDAQxlHLHg54rA4jBReKx9/r+KwksTgcL
+        b2mHxOIhSOTKsky7gijwpl2e5hheIKXiG6GE4j4Vp4uVDHcKYGOa+wq4XOsHVwzzDJeI4+zy/H5Pj8LT
+        xeHnRqv2mHrawPm62+Gnx8/bFsP2R/jRY/FbwZ42+GOj6nFf+Ph4WvfHvhXSvFek2mpW2naxo994E1Kz
+        +HMCaXeWHh++0/xRqV7pLXus6rqr22leBNE8Hk2x/W/xnrng34a6Zr3xL13S2tXhtdMstW1TR9Am1nxL
+        q8Y1D+z9A0iG20W1utd1udtW1kWmjaZBFclLnUpBbxRvPI5/Oj/gnNqf7Onwk/ZVkfwNrOu+EfBMnjqw
+        8K61efEnW/CdlInxE1fT/DWg31rpj+Hbm5g08ar4hvElgstU1K81e3u7mee6vv7PW3u69X/Z3+JPwg8W
+        +CNM+DGm+NPE37RfhGyk8SSa/wDGf4gajY+JPD9/rP8AwkGn+KvDmg6nrmsahM97qk+na7puqeELSxhu
+        PI0LSrG9jFvtDW/pY7F4fEPF4+piMFgczxNfCxwOVwwVGhCVDEU8ZVhiKccCnh6NLDT9kvYyrV5SWLtQ
+        k6eHquH57xO6WGzmvw3goZvj+D+DM4xGVSrRwk8Pm1PB5tm6qUsPm7SlRhjcTUoVsPhsRXpUcHOthIz9
+        koeypR+h/hT8c/D/AMY/hNqPxM06y8SeHNDntNYDyX+nMNRs4bLT1mlv7aza3lurie0glRJ7T+z2uLTW
+        LW90iW0nu7WVH8y8HfETQ/gt8ANK+K2veKPGnxN8MagNG1Gwu7+zTw/rcdp8QPE3gnwlolqsPxL8WWk2
+        l20GpavbarrVz4t8XgQy3ur3tjLBpn9naPafnZ8TvFHxV+AP7X2va1+zt8I/F/i/wPbPYQfEH4eeELe5
+        tfA9l4Z0Xwt4U0q617VdP0HTNaufD+sagmu6xNokGr6d4a0zxNb+G9I8Z6RL4pt/Cuvabqvsnx2/4KL+
+        B7v4fePvDvhbwRZ614nuPDut6Dp+iax4q8D6po2t/wBoWHgG+u4li8PePdOv5lnsPGdtY2TWupadNc6/
+        aX+l6dPc61b2Gmap85WxdfC5dhsxzGeHoYqus5wWBp0av1mvja+AnSjLEUcJhpTrQo4iooLDUa2FnVxM
+        nOnRbVOXN9JDgHPsxzqhgOF8rw2b8PZvTyPiPGZHTzDDwr5XhcwxOJxGU5XmXEWMpUqmDr0snlJ5ji6G
+        Hq4en9Z+sSc40lz9B46/at+E3xmuBZTeA44dN0XwcvjbXfHWtN4a1Dxv8GfB+vWGha7J4wnh0dfE0fg+
+        2g0O5bxVNqN1rljpPijw5plgnhrVdUudf0hFxNI0L4K/BD4FftR6zD4lv/Dcvxg8B/EPSvC2o/EC9+F3
+        h6x+LTw6F438U2fif4ZReHEtNW8R6LrGt/Fm707Rptb1HxDqsmlp4btLe8kLF7nyzXPhx8SFk8XfEOz8
+        KRL8DfiT+zdoGg+KrC38X6ZJBonjPU9S+Dvwm+IHwg0Xw/4q0uLxTN4xt/BvgLxVZL4z8Rxafp8mvajB
+        /bTaLqvh/dccdrPxT8PfFv8AY88E2/h/4A+JfEuk+BPhX49+Fj+IPC3jj4of2Z4Ik8O+GPhQNUk1u68C
+        eDH8N69FaahdDV9fsfiDqekeHZrn4c679m1XVbW7urtKlh/qdHBY7NMwwv8ArDiq1SpgstpwpVuXKkoU
+        IYrEvB18RiMNXlUqqM8LicNSqU5R563srypw9DEZfjs2wVHB8LU8Vg/DenleXUuMKGBx2Hxk48YVsBjs
+        8eWzzLP54OlWp4HEYacozy10qNSNOUlGrUrQUv1W+H2u/D3RP2VfgWnxU8SeFPDPhLWPg/8AC/SZr3xb
+        r1n4X06a6l+HunXkFrbavfalpnkaoiWVxfWUljdxajbNYtf2bwvZiePnvHHwa/Z1+Juvw6bp3iuz074h
+        fCmDTZ7Oy8GeObW81jwjaaNoOu+HrSTVfh9rN54k8JDGi+Ntd0s6t4n8FXt6kOsrPDeRXsOnXVt/Pj8b
+        vjT+0z+1fcfsi/AL4DfDf4hR6L8Kvh/4H0Xx5rnhi6+M+haHpvjbxN4F03SrWTxT4p8Pv4Fs9M0OPwgG
+        itj4sstMt57PxF4nFlqGqeHbpb3VPrD9m+w0Txh/w0n8H/2o/Eviq3+MPhCXxXr+qa14l1nwangfw7Y3
+        EfgRr3wjZp8QPH3xL0z+2fE2va54Y8QXF7f+DbeyhNxpk+k69NdCz1DV/Zy/MpUc5xeBr4PPMlxuGwtC
+        vSx+Iy6vhcNXwOLwmGzGlUVavHC1HQWFxNKtUjD2rlGpGXLpLl+Xzjw1xGS8P8OcTLM8rzOvmtbF4XPc
+        syuvgcXmXDNKjmUcvwX1qNPGynmMMyxMq2HhDBQccLjo/VMVOnUmpr9Lf2TNQ0LwB4V8ceFtX+LkPiTw
+        z8G7TwF4SuvE+v65r934ftLfR/CQifxJH4v8UrY6EttrsElja6hpPhy5fw9oeq6Lcw2giS6j3+U/G/8A
+        bP8A2O/C3inxb8LvEfibxp4Ms/ES6X471j4yfCbQdfvfDOravolt4U12G4/4TT4Zx+INZvrmy0a40d9f
+        1qbSLjQNJ8O2Yt/EGrWVjbWQHxd4M+P/AI/+H3wK8W+HPhl8LdZ+L3w58BeNfAF74/8AGXjGw8QeBb27
+        8FW/gH4dajpPjie/0C/02T4c2vhfw74f0LUBqV5oOrpquiJaeNLyytrP+3YK++rvwF+wj8af2etA+I/i
+        T4eeCfFvgXxxDqhsPEM+hXXib4iR6z4ij1tPFemp4r0FtQ8dReJdLuJfE9hrB0/WGm0UaffRLLBZad+6
+        82pSxE8uzOhRS+vZdi5UK2MzHB4x5NReMqVayUsbCpGVXEyp069J0qeJi7RqVNaSin6ebcG0KOcYLMOM
+        8Nic3yfiyvisPllLhSeQ0+JIulQyt0liOHqOLqTwWIq5Xi6HJTrRpLE+3+sJe0VXCx6rUf2+fgf8LPhB
+        4d+KPxq8feDtE0/xTDqupeFl8FXN547i17w3Za5FoK6lbSaC+sJm0vJH069lu76GeaTT5rm/sfD+tPqf
+        hPQfM/Fnj39knx5458RfEezh0vxBrUOmWmt2XjnRPF+uanbeIr2ax+HGi6RbR+ENBu9cvLTT9S18+DfA
+        uo6jZ+GV1GHxR4el0PVoC9lfW8xZeIf+CeFr4Q8H30uveEtM8JfBLX9Vi8Cf2j4h1a8e6vvF/jbSvFF4
+        fDlja6tqms+Mk1nxhBpt5Lo622o6lFazQRXuk2nh/WoF1DwX9p/9pf4Fa5+zV4Ei/ZI8VfDXVPCHh/4q
+        aGNS+Gujxp8O9OHhXwx4f1z4t6hLonhrUtY+GdwLizn8L20mjQRP/YN9q2pSWcUC+IxpOo6N9LSw+QY7
+        I8NgcPTrYzifmq1Vi8wx+HoZJOHLOjQrKE8MqlDFUMXheenWc50cTz16Kw1KcISn8Pw3l3GvDmbU54mj
+        nuDwbx2EyfHV8uWIyjHRweJp4TE47AY/MK7oYGFWpg5PHezxDo4f6n7LE1YOEFJ+nfs9+D/iT46+Mnib
+        9t74x3N18N9C0jw5FcWeh2WmanPpPizwbZ+Edcs7TUbe1t/EviG6ttKtdEvNK8TLoti/inT5/EGoXdzp
+        dxY6/c+INLtPDf8AgqF4p+HHiL4f2f8Awo74MW/x/wD2lPiNc3eqeHfDd34A+MXia40jwtYR638LfGvj
+        2y8JaJe+H7Wx8WaBHo8Xhu9h1O3lu73S9Ga21zQPEGmafY6dP4ZrMX7UV3eeIv2cviV8RfA37OWo/FD9
+        njxv4qsNA1r4i+INU8P+ELDVfHnjlrP4eJ4Uj8Z+Mn1JNI+CGmeLhp0mj2tnoNtoXh+CO7s18T6NYPoP
+        Y/BH4gfFX9lr4N3tt428F6ddeOl+F3jrSvDnxo8Ima9g8Qnw54p1nxTqtxofhjSoPFVhDrWk+INa+JWj
+        2tu3w/juvDs2h+C7z4rw/wDCPeJY4tB8B5BleHoR4WzuLxma53Xq0cPXweYYHNcDSxOZ0KtHC5zicbgK
+        OaYejGhmE6KngKscDi/YxqNvC3p1Jf0fGvxXgeL+H/FXhvHcM47LeEKmUYanwksxznhGlPg7JlUlVynA
+        1qkcNiOIcrqUcHiXip5XmeYvG0p1Zwc8NCNJfWX7PHg7xN8M5fEfxc8Z/B7TfA37QGvfBmbUPFfxb8Ra
+        14qtvCLW/iLxHoHinT/BEmjanpvhjwnp2paW+p2+hSWi3dh4nvPEfg6fS9fuLfQpNG12bh76z/ag/bE8
+        C/tKfAPxfJ/wi8Z8XHVvhv8AFiDRrm3+GOseENclTw7b+ENMnTwvp76xZ3em6pqHi3w54khvfHM8Mg0f
+        xBqqwvPpeix1f2Hf2jdT/aH8JfFLWPj/AKgtxpvxTOlan8O/B+s6pb+Gopte0/xZ4nv5/DXg/wARJ8UN
+        eQa3B/bHwyHhW/sI/hveuYdNbTPDq6r4d1rWF8m+IP7S/wATNH8M+L/jh+yt4utfFfgX4T6xN4N+L3w+
+        8O3Ul7a/C/RU0LwRB4FuNNPxc8a6H4e1qxu9Z8Npt1HQvBFtq0UureJ7G4up4JrvxJHpUjm2Ey/OMLjM
+        VjcRh8jpf2NmWEnhKWZ5xRp5bmNTK4YTCVFSVbLKFOu6k5Yug6ftcPCEKq5Gov47C5Fh8L4lU8JkWSZF
+        huKM1r5VnPDedrFY/L/DHKMyrVsq4moZrh8xxDxGDr5hmGYzr5FQy3MHLLcTV9l9QoTqwvDW8XeCPhFo
+        3h34RfsKXPiXV/jH4++CWpR23xm1LRPDHizR9Q8NaF8R/EmgeKzPD4gbUoW8P2j2HiyMaP8AYfEet6BY
+        afFBBceCwP7Eg0D0v9pf9lKXXvE3gP8AZs8L/D3xI3wg1PwXp+o6D44ufHx1a4k8YWvxet/Gnj3RtXl8
+        SWXizxlZ6rrOi6rqmuQ69pyLpH9qWXhsa9KNE0a3GgcB8K/2t9M+OHifwV8RPDf7O/g3xN8Vde8eWMHx
+        Futc+HnizVr/AMH6BZX3w88Jx+ItKbw5rvxO8LaZrceuaL4g07R/GreIrXRNUsfh9Z3CXlrc2eqaZYZP
+        7Wk0nwT8Y/C26i+I2pePf2gNJ8RvZ6N4uu/G2v6Ungfw7rum+FvD3i+CC38afEnS7DXfEWsx+N9C8W2/
+        gbw94ht9A8NRWVjqusaJb+Fr+4uLrtyKjgMLjoYbKKtKhi3D6vl+ZUsxpxWT5zl2X4R5ficFmc8wyOOG
+        xqxWCgqeMeJr/VFKKnQxmIw0Kc9sfjuM88xmW0amZYnK8Vh8dm2ZZtg83y7+25ZzmeMzmvV41lmOQ5VQ
+        r0cDluHxWIxGFowxWFwVSvgsxcsJKcUpvyD9sb4rWv7FXxD/AGZPFN98PLrw5B8H9R+F2nfEh/gufCnh
+        nQPHXiG68H6NrHiy9udMutG8B+GNNaTStF1rwpoN9ous6Y1/pH23w94g8O/8I/c6Ba6V+wMH7aP7L/jT
+        w78N9P8AEHjjRLb/AIXD4e0m80jwZ4u0rzP7X03xn4Q1W8XQ9YmMeo+DbpXtYNb0jWXOuXHh6O/0bxFp
+        02oS/wBjar9m+UPE3hDRf+Ew1P8AaA+PnxL8MKNI8dz6x4h+FuleBrf4gWulW+kaDo63Go3/AIS0+z1X
+        xV4X1jV/hh8FZoLvQPEupeMLPSDfeI9ctrhta/sfSdE/Pf8A4KA+NfgH8W/2jPgp8Z/Bep+H9Em8FWd5
+        e6xruuwaPpFh4q0f4c634O8Y6vaaRF4P8Ynx5rPi/wATvfeHPDOm6J4t8OeH5tS0PQvENr4e1nGEl8PK
+        sFGhnmOp18fHD5XjIwoqn9RwUsVh8z9hiKf1rFV6WMdPEZevY0HUqVKEcT7KnWUE5SsscfV/4iFwzwNi
+        MVw7nWXS4ZyvirE59nWCWeYvGYqjg8Tj8fhssy7B4rC1sup4ivjcXhszpTwuJrYbCZbiaiqfVqVOisH+
+        lfif4v8A7OP7SPwxsf2YfCo8a/s+6x8TdIvLH4cX9j8ORoOm/D/xt4g0DxDqvhfUrTT9NubbSJJ52bUP
+        FHh27A0/S9Y1JItR8PeJtL8XWtrqmkc34m/Y4+Hfhr4At+xnpPjnxO/xG1ebxP431DxDoa61pQ8ay+Jz
+        qrap4dutf8dL8aL7SL/Uvhl4YvPDen+Rc3xjXw1bXVx9lttVn0nUvmb9lvx/+z7N8b/EvxQi0VvEvhv4
+        V+BNTtdM8Q6loPifSfF9raeAvhtZ+LJPE83hzxb4luJdP8O6Za/C7WdZ8MaO0k1p4fn+LnhpRq9xdajc
+        Gx+3f2oPjX+zv8Uv2c/FnjXUfiQ/gLShpPjLwn4x8QeHNH1LxP44sPBwtvGGg61olxqXwtvNfurLw5qG
+        q6Pcaxa3z6te+BtXvNDtrDXvtdvNfWK82R4XMc1bx+BoUc3zCpj45RgIZdTr2zaWFm6+Fw1HDSfJUxNS
+        rThXw81RqzjhqcoyUY3iuTNMFkvBue5LluXY3ijLMFmnDnDnFPEOe5gstxmKw+aY7CYqOXcQYmrlWBq1
+        MTleHwuaVYywaxFNYjFYirUjXoQqxlHyr4M/tG2Hwi+Efj34SeMPG3xai+JnhT4ea3NL8RviPd3nxEtN
+        B1Tw14I8H3MOp65qOmaRqvxHsbbT9N8X+Hr/AFfxZ4l+DmieGnbT7pbe11C4sy/iRbxvh5rms+APjp8Y
+        fEvxF+N/hTxhoMulRX3g/wAU6z/wqXRLzR/jWw+H19oUr+H/AIdzWHiLwr4ksPDdn4g8S3934FGnavDp
+        OteVqMzXN3D0P7KXwW/ZY+MnhHW/CVlpPiXx0PBXgttK1TX/ABdpvgDRbfXH+JWp+Mku/F/hex8D3s3i
+        P4fazPNoOriw0jUm8H+IvDdkdH1O50SPxhLqetP0sPx1+Gfg7xjr37Ffw3+DF78Uz4Ih8WTa94N11/FH
+        jGM2M2t+GPFupXfieTxJ4X123vm17xH4/wDDk+i3TazrtjYW2sLr2vT+G9I0d44+3CZ3m+BVX+1a2W0M
+        NmWMrUq0aWBdXNKuLeYRxeIwXPONWNGo6mFc3Xw9OnVo4inOtSlFOcZdVbhThWhmWYYHw7yXjGWd5Jhs
+        VXzdVc0jl2UYLh/HYGthqmeU8fisXVzKg3PMstrxwuZYt0atHGVMDioyqzp8+l+0F8N4fj/+zH4O1/8A
+        Z+0PSvGHg/QNN1j4haL4F1mS/vNZ8R62JovFGm6df2HiOPxDa69rsviBLy71Ww1+WLUtX1mWO2uNevvD
+        +seJNF8R9F8MPhJL8Jf2Cvi/o1xaX2m39/8ACz4xz3Okal4ftvDY0u10HwTqvg7QIrHR4NA8MX9pZ3nh
+        rw1o+riTXdOk127utRub3ULhnnSGD8hP2jP2sf2pPFcmtfBf9mjwJr37LPwu+A3xL+Jvgw694XudS8PT
+        eN7XQNf1HR9DfSZPFnhHw9bXV9aaHpjeIpPBfhbxJrOs2kXjHRvtuk3Z020vbH9UfiPo3xx8Ofsuww+O
+        /iX4Z8EeK/Enw2+L2p+O/AepeI73VWup7nwNHf3Hg/wbd+Kb3xNrPjEabpum61pUkMWt6bFaT+J5PE8E
+        0p8P6fo99xZVj8qzHE5tmtDD4ieOjicFh3jKtCpCOJVp0MU8FXr+ycqNKvCCrOq5Sq1IRdHRK/l8ZeGf
+        Evh1Qy3JcZxPRwmWceRzfiR8KvMaebSyOHD+FwlTKa/EE8kw+OwuFzXNsqr4WphIYGtKnGlzrFU6M6da
+        UPzc8U+Of2+LD9j79lX4xWV/F4IWTQPBmmaLZ6OPAWq6JrPhu/8Ahz4U1rwL4ltbLS7LXdbFzq9l4T1/
+        UG/t3Vp7vQT4jsdHt3uoZdUlm++/2yfjr8H/AA1Do1x4pGs3PxX8Pax4M0zxt4V8/wAXeHfDuj2CaPp/
+        i3W49F+JWneH/DNhrfizRNE8bjS/C9h4W8WWVxret+N9Hs/E9g2nhxo8fwt/ar/Y18aeFv2efg7dfE69
+        Txl8LPgt8OfGiW/hnw/r+q+HbyPw/p2jeF9e0PS9Ys/DWtaXqOq+HvEGkJa6vH4Uli8QaGtpqttbanZR
+        af4ttrb8gfjl8SJf2uv2sf2hPBXww+IOiQfDG08GfFPVrTx78OvDWva9q3jrQBf/AAevfEOo+ItTHj7Q
+        tJ8eXHgybw1oFl8PLawto7jTrP7Klvp+r/2Va38P0/EMM8qSjg8FSlSUsNRlXwKo4ajiMvyPGY/2GIzG
+        bq1o47MoQpYuk61qGNqQw2Hqulh5SjUmu7w04QyrjXO8RS4zy58CYPJcLjuMcr4gw2IzjKqua18PLKp4
+        bB5dGjgcTVwlHLarjUw1bBTeJnVzJ4ipjKdHkpV/1B+HS/ALx38WPGPwnT4gaN8IfCfx/wDgzqvhz4bf
+        Byx0rw74I1/xH4Z8Y+B/+ELj16106y8L6W0Zm0WHUmOl6lrviGfXPEWjW19ZxaBc+F7q11HvviB4A+Df
+        wl8AeHPgV4d+IHi+20L4PazeW954V0vwzouu2bX/AMSNT1X4o6eDYeItUsdBu5NEuRDasmqW3iS8lsPF
+        OkeF9Da18XeJdO1aDwSf9nL4SfDTw58Bp9JtNb0r4t/8IrqFs3xA8cW+p+HfC/gzR9A13XtJF7DH4a/4
+        QDwaml65rnjTxDrvhS+1a3174kW3hdrC98KWVtqcNhNY/Xv7GnxZnn+F3xg+LvxG8eaXrXwr8Mahf2nh
+        3xxMullv+EZ0u/17XILlp9L0G3167sYPAuufDrRorDWvEPjzUl8Q6RrdnpGv67pradrGs+DgaeY43AZ7
+        lH9pYSrltHMsJmU51q1SNbFLF01CnGnha1WlUqYzDSnUjVqUVHD4fC1KdKUadSSPCzOGLpR4e4ow2Nnn
+        OOyjG4zgjPsDhcvwmCqShg5ZlleA+o47AUsVHDY/M8trYDE1KuIp1M3rYqvjMVCUI/VZHztN+wX8N/gH
+        4v03w3rNl4n8Ufs46/pGo+OPjB4g1zxbrem2C+LJ0vk1u1TRvDmm2unf2brXirQvgnfWNvrHiGDXtMvP
+        DVsdMHiexvfHeqeHvkT4Xf8ACo/2Wv2wPDHjLVvDfjqx+DXjnw1quufDvx14c1jSvGehaJ45v/APijwZ
+        eDUPCOnfDvXPjC2hf8IZ4Ti8Ix6XeeKHHhvXknutd8KNfafq+seHvZPgf+1z4xi+Av7X1t8XPiv4Z8cm
+        68VTWfwb1H442Ftb6H408IeMvGPi3wNqU9v4MsPFSeN7jwzNo3hxNdn8H6xaeFtR8P3d/qGmLp1np0CB
+        OO+KHxv1j/hSt7+x98KP2ZobTxL4Ll8N+LNI1LXb+78SeB7bRdb0nxf4j8ZeJ9L1Hx/oHheHSrS7sE1Z
+        28Tm8uvD+seEdX8f6jD4wurm0v77VPQ4kzmnQwlDOeKo1M2zqhHEUsDlTzGpWzLD46GVUquUVcZhcpUq
+        +MlB4qtiMBWxONcK1ejWhUjP2TgvQ4AyPjnAcdcW8E5dnmDzTw9w+Q1I8ZZ1SxcMnx+T5HisZg8tx2aZ
+        VLielQdDK5QwtXLs/rYnLKmPq/VauE9pGjDmPpH/AIKPfA3Wvjt8RfCmkeB9O1GbX4vAsS6trtnD4tju
+        PGnhqLRfi5qNz8Om8Q+HNH1vRPCF7aPPb3+ii50CbxNr/iPxb4Zeyu3t/D66fqHw1pn7X3jv4T/HDRP2
+        arr9mX4o+J9F8NeD7nwZ8B/hZb+FvHWuan421zTddW+1b4jeI/EnieztZPEOl2z3PijxN4ms9M8GaX4l
+        BsvDs15p2l3/AIUn0qH6f8JH4A/GTxX4E1DS7Lx98S/2lPDp8BeNNJ8P+L7BrfwVYfE/wBofww0Dxdq+
+        n6jpt54Hm8QXXg26+H9lov8AwjXjb4tzeFr/AFO212K0t9f1JbazvfqLxL8DdJ+I3jTwZ+1v45j1v9mb
+        xj4E1TSPDPi7S9C0zxTrOpeK7rVbu0tLE6Xd6UPCsup6vN4j8by+FIdWvPA3jSLVb3SbWTRhe6RILnUc
+        MhoZJ9ffEVbDZrnuYzhQeIynB4vB4TDQmqsZ5JCGbRqVcQ8NKlNYrN8DhcJg8Y6cXSo14VcUsZT+Rz/M
+        Mk4iyXhDgzC8eVcs4WyjN8dxDSzClTzHHfWs+weQxdTDYrh2UsVWo5XmEK2U08szCEcJhqlaeJxHJSoz
+        cZ/F3i79si3+E/hyXw7+0l8Ef7d1zw/dXv8AwidjoI1r4XanP4I8G+E/C+pXdlq3hrRPhZo8Mvw60Xwr
+        f+K7i68J3WseObrQf7Kg8JeKtHvxY3niW2+fPgv8HdB+N3xC8SaV+zX4+8b/AAYg8a6PZ6x8QvgH4s8c
+        Ta1q2sy+FfFofxNpeq+FvFei+FrO+0LTL34t3fhTQYvit4G8b2lzf/DbxoZVv5Y5Z5PStCvf2crq6+P/
+        AMXfgx8KPF2r/EfWPiT8R7rWvh/8fB4U1/TPHdnfa74z1zUV034d6d4s8M6je2PjTxj4i0Hw34c0/VtX
+        urzV7F4bbSNI8SR2Ah1b01fAHwD8ffEbwv8AtF2MGm/A74qafcSeAb/4RP4Q03XPCfiXxJ/wmPxR+H+s
+        a34Ogfxt8LdSm0rWLzwJ4gvZ49cFtZf2hpVhrGhR/wBpeKtQ1bxZ8jxHl2YYfiDFSo4jC4illOYUMXVp
+        VeXCYzL6bqr21Snn0lUVWth5VvZqnXajUi7VJyjCdQ/q/hTiXL8j4GwtSjk+Y8JcR57llDD4jGuv/rVw
+        djs0w0cJnGAwP/EOsPU+q4bAZjRhVxOGzKi44bLMbRqzq+yqXpHov7Sn/CIfseQfAn4bR6Rp48A+IpPh
+        1pHxR8U+J/GlrJdJfpc6z4L8Hr4OtfHui+L/AAvp3gfwZrXibxP4t8bpB4NOjeC/Dd1BqOn6RaX9zp6L
+        7349+G/7IHx0+Enhz4T/ABFv08IaxLonw4gbxLqFleadC/8Awh1v4Z1PRdDu/jBD4a8I+GfEH/CR+G9L
+        0iGfSItf0/Utf8MXlndx6NaiCxWx+A3+DXxy+PPiDxV8NrLTtd+JHwO1e6Txf4D+MEfhLXrfVdZv9Jsf
+        jJPZRXXjrU/ifc+ErnxBqHhr4g/2KmpahpnhG10fW4vDOh3cD3PhjUBe/fB8c/DfW/hOvi39pT4d+AZv
+        i1pfj3XPDGuXHhLxZ4Rs/FmhWNtpfxEs/C194k8ceFtXsYdJvNa8GeDdY8ES2ml+ILi08RzhtEmtNLj1
+        PU/CuhfU5ZxBXz9vKa+URpQX1ytk1aNOdCOMzH63VniamPqQ58JiJVHKlicNjML7KtVwloQTlQcz8e4w
+        yzLOB8RwRxRkfGeZ43iqVT+0+Ms+4Zx9XGYulQxVLK8xyDHxp1sVUeXYmNSWMyvMsuxmIp4eGMwGCjUp
+        89SXtPBPgjJ8K/FHhT4tfsw6b4J8c+LviFpel+IPhtpGifFCw+HuueCxeaNp/jjWbF9J8QyomoX/AIwu
+        bG98USazrEmqatodn4utbjTrHxro+garol/dcr8G/wBlv4eaz4R8PaL8a/D9p8Mf25/EXhnxtbeBW0rx
+        P4h8C6TLLLb+Jdf8G6ovg7wdo/gDw5YQaZ4k0DVtKmgPhPUbbVV8Gzaouq+KrDWdA1bWfOvCPxr8A/8A
+        BNrTPCekeB5dJ+MnhrxZ8TNJ0r4h/G61+G2kXvifW7PxHF4FvvC/hzSNV0HxD8PvDWiWFv4CuPEt3oob
+        xX8XNW1TxDNaXUmhaNZ6x/Y6/cX7Wv7J9j+1V41+C/7Rnhf47Xfwt8PfD3QNf8P3mpQ6frEGotNp2uS6
+        pYy28VzdaLe6drFj4j0y70O5ttRiS6sJXuLcaVqd9LFBa45qngMxzz+yqNWKo0auVYrJ8txP9nZVUwGZ
+        4nB46k69XGxlVr/VfZwx6p41+1hKEVO9WipvunnVPG4rJMfieMK/BXCPFGPzPP8AB+IubZdn+PzCvmfC
+        uX4zKc5ox4ewuKp1qOX8QY6nhstgqtLMKHsJyq1MXiqTnGn8/fsLeO7b4daR+0n8IP2l7bQPh34L8M+G
+        YV1HS9L1LT9U+Flt4e17xf4y8PX/AIdsvLhl1oXj+Gde+HGlauuuWEXiO61XUbi1vjbaj5unW3vHirwZ
+        +y3e3fw60P4QeI/CjeDPE2n6p8RdTa/n8f6j4IuNFnvfFOuz69P4ltfBvirwZElpb+Efjc+qfDnxXr3h
+        iw13X9V8S3GtQrrtw7Xnxj8Y/wBl/wDaO/aNsvAY/ay1a4vvh/4f8SR6t/wm/hGHwx4uivfCf9o/DLX9
+        Ynj8feCLfRD8MvDs48O3XiPQvH3ibS0u9E8F6h4z0S8SG61vTda0HW+NPwx8E6/42+Gv7FfwF8D3emQf
+        A7w3ZWGi+LNa0HSvG+o/EW016wn1ZpLzW/GngPVdMu4rTw/rP7Quvaboms/Ef4eW2ueJVvta8NXllFL4
+        R/tWeHc1ll+Grr6tjMGsvdSplEMwnfFV8TicHKph5VW41HCrKpVxWFdVtzrSklGpGL14OJeCuCsyzrJs
+        RlXFWTRzniehjMw42p8JVaGI4UybKcvxkPr+PpVa9ejXzCONzCdHOsRh8PCth8sjLE06iq/2bXt+gX7L
+        Pxj+NfxQ+Avxm8VyXumeLPiD4f1/xmvwvjtNE0jR7HxFo0Hh+0Pg1dR0MjwvcItz4jtda094b640GaO3
+        tk0u41g31leatXR/syapqHxO8f3PxWvYfCui65ceEdd07xpHbfCnVvBPjXUtTuPFceleEfFVvq2uPqlr
+        qng/xb8PPBfhh4l07VfE8Ru9Ds7aHXvI05LSH5Y+O+jftR/s5fs/+DYv2XfDng74J3+onQtQ+J+oppMf
+        iW30O+kfVLa70vRNE1nxT8XJ9I0W0M9n4gm8K+DfCXjzbbTa7/Z2s6bLDNPqfo37F37QFn8e/wBoj43a
+        T8NPA1l8MPhv8K4tF0TULU6L4f08/EIappovNK8S2beGdI8qN5dUi1LUrK+PjPU7AeFrnS7aDw39v1S+
+        1TSdsBh8PTyzK/7QzKni83jVjQhgKeMisT7WioV62YV6NejRxFXD1I4qcaNSEmuXB4mFWHOqbq/I8ScO
+        1q+H4ozrhyNKlwfHMMZjKXEE61GhjnhcNXp5fT4Xx/8AYCpZVJ42bwmNpYKGHeFxFqGIrTaV4fSHw2+L
+        Xi/x3+0N8TfhxcRXQ8BeCYPEKW2t3Hg+LR4L3XLHX/D2kW0OgeILuWRPE4guP+E0tPFE1poltb6dqNjp
+        kMN5JHMDddN+1v8ACrwr4x+DfxK8R+IY9R1HVPBnwj+KF94flN9JZw21wvhmTVwbuy08WVnqkKanoWj6
+        jBb6rBewwX2m2t5bxxXEKSD4p+Hnwa0f4eft/wDjLxZ42DaT9t1LUpPhp4rl0ibw5p3iS91e68TeKbrR
+        11TXfDF/aa9qWqal+0t4h8Lyv4R+IWlXV7c/Czw0NW8JtLCfJ/Rz9o1Af2fPjmSJFP8Awpf4p5Bmkb/m
+        SNaP97Hc5688ZNVlVStiaGJjjaf72jmFdOE5Rqfu1WlVw2llJJQUHDm5tOt7W8rj3C4PIc3yLE8MY3EQ
+        weO4SybE0sbhqDy6c62My5UsziqtCrJ16tWrPEUsbUk6ddylOjiaMZqUqn42+Kv2Q/2Z9e+D37Enh7w9
+        A/hGT4p+B/hjdJNoup2uq+GtblGjeBPCyNFpd/eR6veX0eq/Euz8Um28KeJ9Csr2w8L3N3rdnrEWl2ME
+        X03p/wDwTB+E3w18U3PiL4Saha+GrW6vvD17FDrlra3zeGW8O6ldX7WvhGz0KHwzYzx3miXMOg203ihN
+        c1XSIdO03U7LUXvoTJXn/gPVP2xvBv7OPwH0X4SeA/Dmi+E9K8C/Cu51LWNB0jTvH2o2Gm6toXgfWdUv
+        b7RV8fXXjLU9aun1/wAU+I/FNhpnhbXrvZbWthoV1rX9rvrtv91eKfg/o37RPhP4feKPHsOveFNa0Ow1
+        HUIdKtdK0qzmD6nJo12xutL8d+Fda1jw9dOfD9hc232dNF8U6H9purM6lbzSStXrY6NavLE1/q7rY+ss
+        K8bjvrsZf2lWc54nl+s1OavzUY8yxPuKVScoKpJzpp0+TB8V5w5ZFSxvEWIXD+EpZwslljKGDzfF5bhM
+        fTpUsThcZlUqlapQr4v6hgqNXC167p08PTg6cpYehOK4fxB4V+H/AMJfhpp/gf8AaR+JOreLtK+JnxR0
+        rT9Av5/Efjfw5daZfX2iadaadp1prd98Rtb8W2GlWtzol/rGqXqeKlso5NcvYJbWCxmMUvwl+wHoXw98
+        c/BT4+fAPUPjEut2fjjW9H0XwZ4d1fXPEuoapaeHYPhz4cvfCmqxQ6lqNpq2nReI/A8XhOeHwpp3iSTU
+        dG0PRre207xZeSCHW6/U343fFSz+E2q+BLzxpZ6aPhN4jj8S6B4s1aPSvGPiDxRYa7H4eu/EGijTNA8G
+        +HfEE9zok2jaF4qbxFqN9/ZlrpEcVlcfapA7wN5h8Kv2M/2a/hv8W9Z+JPw+sZofEOi2lxYf8I1/bGn6
+        rYeG5tc0XwWivdSXNlceNriY2nhLTdS0Ww8WeJ9W03S7rUtV1HQtOs2uLOSz86jSor+0MNSeBinHD4ec
+        a+B9piHhlBTlSoZhCr7ajUlz1qinGm4VEp4ecoXVSXnYDO8a5V80z/MeMsGpZrLNeFpZXXeV8PYjiLL8
+        NGVfGYzJ6lOnk+e1MPX/ALMVLFYemquVqhV5KdSpOEYfHfww/Zt+BXwn+HfjT4YfEHQNW8G3ngzx34wk
+        8CfGFdG8UeAHu9W8S614zvNJ1zUZfA1xpdx4hsvAN7Ne6xoGveNfEnjRtO8H+I/Ds2p+LLTVtb1LTYvt
+        HwLpvw7+BH/CMfDX4geP/BEvxL8a2fifRfg3pOu69PdeMr3wl4f8MaFc634O8F33jPWNW8ZeINH0qbTz
+        4h1CzS7ktdP/ALRtbX7OLa0sgfkn4/eD7i38d/tF+Cvi98TprT4bfELQJPiL4A1X4n+ILK0+HXwu8WaT
+        p2nz+CrzSNTgv38R+GrSWPwz8S7XVNOFkvh5zoXh9jYXGteIY21z5r8JXB/bq8FfBHXvCfxJaX4z/COD
+        4w2Oj+M/FWs3tmt9ZXepaC/im38KeJdN0zxPoPjr7T8PvE3hPwr4gOq6EstzYw6rZ6vp0mqw61YaKszo
+        4bh2vl2DlQxmd0quWe1yrHU6zw9LH4xwoxqZVTnmCqJ4nLJYihh68ak69TF06Maiqx/2drtyrE8Tcf43
+        PovPslyrhynj8pebYzNcVmeaVsknVlWrZ3jMzxHsMVisPgsyr4yvisJQwXssNLHY6phsT9XoOnOp7noH
+        jf4d+G/2mf2hfC3gjwNoXxL/AGhPDnijwg1jr2o+F9B8SXPhyPW/Fl5q3jLXtJjbx7J8VYWs/CWu32nz
+        aZoGieHPD8+q/C/yLG6uU1Gwa59I+KfhL4h/DH4B6N4j0jTtPe7+Ieu+G/GvxX0Tx/4y8D+BND8L+OLz
+        V/DGs6RBea74ol0Z4rHQNfj1Oe81iLUtU+LWsanpvhe3k8VX81lDPb/ZL/AnQPFPhT4WaJ4k8Q6hqup/
+        DE2Ltrujvp8Kavq2jeTZ6om3ULTXJdJaPULWaCyu9IuNO8WeHIlmsdK8Raf5t8byX4pfCXX/AIl+LPB5
+        vNfeD4ZaZJLeeIvDdjrOt+HtUutVtvty2E9vqPh77LqVz9pkvbUvINf0b+xk0uQQ2+sxa9fW9py1sLml
+        eGKxVSty42ag8FVy+jRwkcO63I+eVOPtP32HjGFCrXc6jrU6arToupKXN6mWZ1w/ho4HLnisHXoVJ4+v
+        xLj8dgK+J/tijldKtQyehhsNVqVKdWFfCRoVsqoVI4elgMdCjHEV1S/dR+CP2vtA8E/Czwn8Ml+FXhPS
+        IdJvPsPjDwp4q0/4i/EiHTza+FpdC8eSm0i8Ca7cX2saFHo3w+8J6Hok0unatEket6Knhm40WewaW58S
+        +HvhH4M/thW2geEtN1HWfhv+0l4Y+H3w58V/F/QLvwd4M8XeA/FfiPwbrHiPTo9b8Va1r3hzxFe+J/Er
+        eIviVNqdx4ql17UpNQa5Cpd+I9c8Na6+nfTv7RnwR8a/FWPTtH/Z91bXPAms/st6HpVj4Q8FXTrqXhv4
+        gL4d13wdrXhvw9r9vrmuJY3aGz8Cm20E+Mv7TtbqDWbLxLcyzxPdWs3zB+z58M/j1o9prdp4BiisdW8e
+        yaevxD8LanpU2m6fofgfxD8VNIHhT/ibWfjPVvCnha0v9Dsfi3PYx+CvAesjw2t54kQ6Xd3+vaDLB6ry
+        /EVKGJwVTKFi8vlTrV8ZTeKw2Cp/X6uHoyy6vGaovEYqjCWGq0XhKlWj9ZeLrKVRS9hKnrk+YcIYvhLD
+        wy7jDF5Pn+HoYrKMjp4WOeYbCYPAzz+tSzSjnMVh8ThcI8VTnSxMcXk2IdONSklPC/DXxXQeI/Efwc8Z
+        eHbD9nDS/G/gnWvG198VPEy+FovAniLwd8XNKt2sPh/ZWviTRPDya7Yad468Za74UtLyL7Df6D4U0uLw
+        NZXdjoOja7Fo3hCLSm5jw18WfH8EPgT9oj4eeDfGWm6H4j+JPg3SfixaaXp/x40SLYt98MPiVc6XF4Z+
+        IXxDTSLTTfFNl8Y/iTpHh3Ur3SLvwdqdzplgvhOys7/xJZyQ914Z/Zu1zwJ4N+H2jaP+zB4D8O/FyDxO
+        bvTviPonw5ubw6JJe+D9G0DxFaXt9YeN9evtK0nXdY8Qai9zNbeOvhp4Pn0Xw3ql5a6OJ4rTw7r3jv7I
+        n7OH7cvw8/aK8UfD7V/G/inw78AI7WA6npXiNPEH9meIdGt1+H1rq01u+oeDviN8OofEWq+CPEL+HvDy
+        eB/i/dTafd+BLiG4/wCEfs9MudDg9mticizTDV5ZZjMZkVXDYLDU8HLNcLgZKjmVepiK+YUcrwWGwdR4
+        WnVwUMPG1Sao05OpT9opzgqWWTYPMOEsmwkcfl3CvFHssZj6+f5PkOfVqOW5lw3h28vWLWNlXw9PF0MF
+        jJ0sThMDDBRzWliqMMTSwzhOpUn6z4z/AGFbn4c+PvGrab8IvDfxT/Zr1fw/B8QfENpq62T+NdIvfDCf
+        F7xUvhXQvEniTxF4g+JGl+IrC50v4I6F4Z1vwc1np1/YWOpW+s6WLuyE955ZYXfjj9sr4G/Df4IaT8J/
+        FXw9uPB2m/F6O+8GahoWs+KPCPiO8utD8V6P4V1GPxn8RdNuPDms3WnNeano3iLxH43v49Xfxjqeu6xp
+        kc3iS0hnh+jviF8Gvir8K7DxL4esvE2laF8FPEuueJrCy02yv10nxFqviDUfC9jPp/jCDRPh54CtvDOp
+        23hDwt8N4dbGgeILbQNC1/V7jxvoPiTw3rkM/h7xXfe4ap8Mj+zx4v8ADHxl+HFppkPwksfD2jw+KtMX
+        xBqWj69rWo66/wASLjWvEHiDTW0P/hFRpep+IvHPhjxl4h8QX15p7eHYPDOpNp+ipbFbeX4POMBh8TOr
+        Tw88T/Z9Sq45nGTrU8ZXwqlhatDFexU6mIWG5qNadGccRzx5sVSlhnTqRb9bh3PcLxRSo57xDlWIjxpg
+        IrKOB8RiqNTKcqx9XJHGrBYurh8dTpY7HV8fWwuFw9OvSw+GrrBwni5xpV5Qfx9pPwc/a8/Zp+Emu/Dn
+        4Y/CPVviF4H+IXxH13WvGGi+KF8FtrHhjQ9WTxNJaz6TL8Fvir8N7iKaWHQfh1oupaNoei3djDFquq6u
+        /iMpDd6ZJ+qvgzwh8ItNk+E0mueF/AGg/FzR/AHh/TPDFjq82lax8SPD+lafoF/by6HofiDWp9Q8aXmn
+        6LZ6j4l057ldRumltrnWpLu5lF7qMknzbZ+B/wBor4+6HpV54m1nSdG8GS6/4R8Xx6P4w0vwVfX0iz2W
+        tp4i0mfRdB0DULO78P6ZpWpaZFpegeJLnT/FsPieI6jd+KLA6KltqHReNfCN14G/aC+BV9o3gzx74yj0
+        bw34D8Jal4mgm1N9HENrL418DWWt61/Z/wAL/EtpLqfhzS/HniXxHrraj8QfAlpNbX1rdLDqstrFEu+C
+        yjLsowVDGYWpVq0sSsPhaWXY2jFRy3DYepU9nVo8tD2zdf21WqouvKHLyOm47HzeN5c64ozjAzwGUZJm
+        mW5PmVKtmnCjpUcBn1d4bE5rLCzxVfHRXLGpi8TleYckqUIzwlLDUsDVqUpVpZXwk1LxnqXj/wCM/wAI
+        f2l9d+GXi/wpYXPgrStD0vXbqPWbbxB4g1nS9P1TT7e2tPEujaRZX19q11a3mp3PhddJlj0a8t9Gi8MX
+        erRLqVzY95+yL8D/AIlfBL/hNdA8f+JPCOq6RrniXV9d8FaL4LsU0vTfD+nXD2v21HsoNE0OCzlvm+x4
+        sbSO506zjgEdnIkcqoe18A/s6Wmj2mqH4i+J9T+Jd+dRstX07UNQ1fxrHNBPbafCl9DcPq3jbX55dJ1i
+        6itry98Kwz23g5JLaERaArAuaXwc0Px1rvxM8SfFTxjL4j8MWupW+p+HLL4Z6rPqc2m2L21n4IF1qtob
+        ma1sJIbLU9P1TTdNms9DWO+vrjxX4k07xHrXhvxPoNvpvu4rL4yxVDH+0eNxOHrV4yr0nHB0I4fFtOH+
+        zubqYj2CpQhFNL2cm5xUYymn8jDO8Tip5hlOZV8ty7B1MHh8RlNDAYLMXRx2LyulhqM1Uo01VwmAzDFQ
+        l7Svj69WdPGSpTnbCVq1KhH3TxT8MvBvjK/8O6x4j0o3+qeFNVOpaBeLfalZTWNyuoWN9skNhe2qX9k2
+        oaVpOovpepJd6ZLf6Vpl9LZyXdhaTw8n+0hAqfs/fHQbnIHwX+KXDO+P+RJ1rHAYemK9k8uHYP3aZ85s
+        ZVennn/7H8efevG/2kUhH7P3x0xGg/4sv8U/4R/0JGtfX2x9K3UYpyajFObvNqKTk0kk5NJN2SSV9krI
+        5J4jEVaVChUr1qlDCqpHC0J1ak6OGjVqSq1Vh6UpOnR9rVlKpV9nGPtKjc580tTzP9kT4beHvBfwk+HX
+        ijTdT1W7vvH/AMMfhRrOuw6rqMVzZw3lr4FtRE1nAkMJQpZ3sGlxzXcl3dRaPpOg6NHcLpeiaZaW31JJ
+        dWFxb3z2txaTgC4i3280MgEsUXlSx7o2bEkcqPHImdySKyMAwIr8xbH4keOvgb8L/wBlXx/Nqtjc/B4/
+        Cr4Z6BqmkX3iy5sNTmmtP2ffFmpLYzxar4VvbWefUNW0XRJdP12fxiuqX+srZaH/AGeYtQubub7y+Hfg
+        Lwp8MfDOp6H4cm1KW0vrqfUpH1N/tM+9tJ0/TLS2EsFnbRPFYaTpmnadHPIkl7epanUNXvNS1e6v9Su9
+        o4KnhMLSnB04RrudSlChH3FUc5TxVOom04VoylzzcVKE5TclJ3Z58KUsPUo0cLhqMcJL6zUryjPklCrU
+        kppwo8kvautUqVHWk5xafva8zS87/ap+Dfhj44+BPD/hbxD4p8PeFbSx8WW2pW9/ryahLZXF9e+G/E/h
+        W306M6N4y8C6lHd3Z8St9nW315RfeVJpVxZ3tnf3MJ5nV/DHw18W+JfEnw+8I+OdS8K/EyG5sNZ8X6pp
+        Nt4jtZtbt/D2kWemaiLa6nnsNFe5sZ/GWn69/wAU9ql1HpPje50XXvEOn6rdC6s731n4xXPwiv8ATPDu
+        l/FLUUtdOu9Wc6ary6zZM076RqWk38k82loJYNJ/snWr6x1e+vWh0qytdRD3d1ayyW0w5X4g/AjwR4yt
+        vF+paKq6F4s8VNo4vPEN7Fr/AIg0+W007W/B3iDUNNufC1xrWn6adI8T/wDCF6Ppfiez0ttIk1uwQreX
+        LsN5yVSM6uDjTqYeM8NivaV6ksPSnWw9OrTcVOE4fvp1OV/u1K6hTlU5YtSk16U8NHG4OvhOIaGZVMol
+        hKsuGZUa9RYb+0516NPMJ1KWIUKVHCRppwxFTLJvFVKrhGr8Nn5Z8WfEF18UZfFOl6l4dg8LfDn4Y+Jo
+        7X4iz/E/wPfvonxF8Dw3unT3Vx4ZbXvAupW/iaL+1fDWv2CeG/Dc+dahuvBXie18WWh1Cy0e5/Nmax1/
+        4i3fxA+IHjmx8O/DDxZ8HWl/4V58VfhVpGteCNQ1nwfrOpyfC2Cz8YXXhL46eAbhofDem3XgRtOX4meG
+        9Mg0bTdA8VeGPEGgX+t+E9d0rRP05+On7LOn/HL4FeCPgdq3jNtOs/CR0j7XqzeFV1ux19dK8Ga34PaK
+        88J6nqn9mSWxbXRrel22rz67a6RrWl6Perb3dzp1rdxdj8aL2P4XfBO58N+APCly9tLpreBNKs9BvtW8
+        OJ4T0258NakketRarpfhXxfe6fNpotY4tOuhod/5+uXWnrdSRieS5XLGUqf9kYzC4zERzTD1XVxVGliK
+        OIvl2Mw9enLDY/BwhVVOk6+HjChWp4elTq1oUr158rUF6PDcsbWzbhbDYaKWYZZntLnVOGWUMu4iyjGY
+        h4jEZdnVDEUJOpjsBWp4OWWY/F16v1KlSdSilXm5x8Z/Yd8SeGtcj+Ir+EvH/iHxd4Xn1ifWdP0fxJpG
+        uWz6Jc3nibxbo+svaa7eeH9K8KeIVk1jw/f6Pfap4I1XxNp3iXVfDt/8QdV1T+3vHOpeb+gCta/Zxk2+
+        fO45jz/x9HH9RXzl+zX8N/B/w5+HugX+neGLDw/4m8Z6RD4o8XXaeFYPD+v3epeIL+98XyaRr5hgOpXH
+        /CM6j4n1bTdPttYu76606FpoXuHlkndvooXtsbcfvH4nz/qpuv2nnJ8v3pYajh8PhsPSwtOrSpRoU/3d
+        V80oVJwUqsU1tTU21TTfN7PlUtUxcQTwrzrMaeBhQp4LD4qrhMFTw2HpYaisJgpPC4aUaNKlRSnKhTg6
+        1SVNTq1G5ztJyv4brXijU/iBr/xT+EWmaV4v8CS6V4ctIdF+J02ga/DoGp6hqtnE9++gamLbRNPvV0Zb
+        7TbYvovi231q7uTrcWny6JPoUerN8eftL/Db4i/CT9nXQdI+Aep6DpXxJv8AxtHH4u8dWz6p8NYdelvP
+        D3j0WGt+LfEHhDRvGHia7i0PX7zRbmzfxDJ4gvtdu7KwtPE3iG9vNV1LVrz9O2vbXePnfHltj9zP1yuP
+        +Wf1rPvLy3NkgDMSNSsm/wBTMeF1i3YkZjxkKCRjnPTnFc1fBVMRhsTReLrUquIpVqMcTR9yVGnOr7Sk
+        40nKVKdShtCdSMr7tWun0cK8Q4nhvH5ZisThcvz3B5dncM6eV5hgsL9XxjpxdGGDxVWNGVeeG+rP2M4c
+        /LOUYV3BV6dOcPB9C+Inizw58CdD+IHjbw5caz4vl0DQdR1HQ7K3+xX9r/wkOqxQ2R19ILBvsE2haZqN
+        re+OLyy0lbWwlsdcu9P0lbSK2sl+aPE/xs8W/F/406d+zf8A8Ijc+HfhX8RPhclr411fVNK8LR+LvDd9
+        4q+FfiDxZcaaV1H4kz6lbalp/wBs8I6VcabefBrW9Cmub/V7e48TiW1Wzh/RyO8tvNlBdwTFCCBDPgfN
+        N0/d4H4V8+fGP4OQfFe/8E6pDr8OhTeF3vGZp/Dba1LKL+bRLj+0NIn/ALR0qTQvFGmDRTBofiENf/2X
+        FqWpgafcC5IXHGYXGSpUo0cTOcKTwsZ0ZKCqYmFNuNZVK8l8VdOM6jSi/wB37sk3r7fDud8PUcwzGvmm
+        TYPDVsdDOqmBzKMsbVw3D+LxlKNXLK+DyqhGqqry3FUpRwkW+VPEU5VmqeGu+N+Hmj/s+2gvP2Vbq1sf
+        iBd+BJdc8TXnh7xn8NmufDdo+qarp/jC4Wxv7nwfafDaWXSIfix4fjsNK0G7kvNL0rVra2NsPs2omDzX
+        9umTxDD4K8EW3hCz8UXk8d3q8n9leF722srS/tDpUWhanpVxZDTLg69qWoeG9c17S9C8Mf2t4ct9Vju9
+        WkS/Gq2GjTWuz48+DHxiPxm8R/FD4U3Pw28N3etxabb3fiR9P0u08b6noI8OaLoeqeGb24uPhX4hM0k2
+        peHdG1q18Rarr+tqtpoGh+H38Px2mn2V3Z/X+gz6jDpHhJPEVzaXWvx29mNcudMtLyDTZtVXQbpL+bTo
+        LnzriCzkuzKbWGWaaaKBlSWWRwzt0VoYXFRq4Olgq+HowhhoTniYqVOrOhKlJxpOlUhUlQcotQ9+Eoxc
+        3zXvbycxowcMDmmaZvhuIFmdWvmOKwGAzLG4HMcvzLFU6eMeIrOnQjHB4mlinQqOeGlVpzr4dUJRcabb
+        +Rfhr4E+Kfwl/Z0+JVt4j1nSdJ8Xw3Wv+O7G88Ltpus3VtpyaFomo3nh6aK08IeBdDg1eNdM1Tw1aXWj
+        6Mtult/Z+tteXusNd3Mvv/wJ+KWk/FfwYNctJFuX0jUT4cv9Va50G7tNa1G00XR9RutU0650DUNS0t7W
+        c6qsU0MFyTY6lDf6fIiyWjFvX3urVluwS7Ak8eVOP+WEfB/djgn6cVyv/CeeCNM8SWXg2bXrG18SX+97
+        LRW89bm6Y2N9qIitk8kRNctp2l6jqAs42FybKxurwQ+RDJIHhsv9hKmsPOq6NDDKk6M+aq3GE3KE+e+n
+        s+ZqUpRcnpeW7fhxrUp0cXVx6xuZ51ialCSznF5hVlUVGkqssQquEjSWGq1sRKcebEL2VSMKcYJOlThC
+        Pxv+014hm8PfHX4AxJ4+8ReHYfE3iPSrODQ9IvtQs9N1X+zfiX8OdM1G1ubeH4k+FNI1dtdtPGlrpWoW
+        Wo+DvHE9r4atdd1XTrW2urSOO6+kfiTe/FODxd8No/h5p+gXfh+51WaLx5dahLALrTtF/tbw4Z7mCObU
+        bENAdEHiDy5LFdR1P/hIU8M240xtGudcvLL1WWSxma4lILMC7I5t5G2/uQdylosqW3DJXDMNo+6vFmS8
+        tv7TtG3tgWOoDPkzdTPpuMfu88jd049ecU1hLVMTP200sTUo1Y+zfLKn7KMU1zXkmqtmpJJab7nsVM/j
+        Uw2Q0JZZhK0skwWOwc3jEsRh8asZWr1KdSpRp0cLJSwirJ03UrYiXt4e1bt/EfC0XlDe8JYSEZyoz+/y
+        TgnPp9M15F+0i9uf2f8A46YeHP8Awpf4p4wyf9CRrfv9K9fN5bbcl5M+c2P3U+Meef8Apn9ODXjn7SN5
+        bn9n/wCOmHf/AJIx8UgP3U45PgnWgP8AlmMckAGuxu7PnUrK2+rf3tu3yvYd+zoVb9n34Ar5bH/iznwx
+        B+XOceAtHIz6jkc9scVgfGXQvjb4i8QeBrT4a+JNA8J+CrHVrvUfiRe3Nzep4nv7SK1t10qw0G0j0HUL
+        CWGCZrjU7yK/1TT7XUbi30/T9Sh1HQ5dW0y+6D9nOSX/AIZ++AGIHP8AxZz4Y4+aIZ/4oLSD3f3IPHUd
+        uteu3LOYL8NCy5jl5zEcf6MuM4fJA74BOOgJ4rnxNBYmm6Up1qcXOE5SoT9nN8klPl51aVp2tJJq60bs
+        YYnDrFUZUZVK1KMp05SlQm6dRqnNT5OdWkoytaVmrq6d02jgPiVb+AY9E03XfiFpFhqmm6Bq2l3Fg19p
+        H9rzQ6vqN1BpGlxWFrFBPcS3epajfWVjHBGjJcSzQrMrIu5eu0PW9N8QaFZa9o8j3Ok61YWmraZceTND
+        9o0/UbG3vLO48q4jinhM1vNHL5U8cc0ZbZKiuCKs6tpthrenvpGs6Ra6rpeoRPaXunajBZ31he28kDrJ
+        Bd2lyJLe5gkXh4Z4pI27r6SwQx2Nq9nZ2C21raxpb21tALeGCCCK1hSKKGONljijjQBERFVVVQFAGBW6
+        jSSbjDlqSk3Kat70Uko8ztzSkkrXbasaupjp1YU6mIVTL6FFxw2Hk68qlCtUqudaUXOrKjGnVSg5RpUq
+        cpVI81RytE868b+C/F/iLxb8Pta0Hx1qHhbSfC+qy32vaFa211JD4mtXvdImNrdeTqNpbXCyafZanoxi
+        1W11K1t4ddm1azt4NZ0vTbuP0DWh5mlawm0qTa3JBZcBf9BIz7YOSSOgJJ9DqNJL5sf+jvwHwN8XP3c/
+        8tKztVeQ6ZrAMLKDZ3m4loztzYbT0cnAX5jwTjOATgVEacYyqSXNeq053lJq6io+7FtxhdLVQUU3q7u7
+        Oyti61fD4PC1PZOjgadSlh1HD0IT5KtepiZqtUhTjUxD9rUnyuvKo6cLU6fLBKJ88SeDfEPw7+LPxH+O
+        ni74q63L8MB4Q1i+/wCEGmn8YXekeFdP0rw/8Pxdahb6Mdf1Lw/v0+Twd4r1lZdB8J2etX8njO9tpZrm
+        S3/072bwL458OfELwtbeKPC0uo3OkXOoalZRvqWha54cv4rvStYudMv7a60XxHp2k6zZSwXtrPDsvLCD
+        zVVZ4PMt5YpX29e06y1yxvdF1jS4NS0jV9Nv9L1PTb+O1urHUdPvoxa3dleW05eG4tbu3lkguIJVaKaF
+        3jkVlYivmn4FfFHR5te8RfBy0+HR+Hs3hzUPFmoaNY2FpFDouqWmjeJ9NtPFUlvKPIWXULHWvE+lSahf
+        Rwf2drE2rPPpN7qDWWptbZxg6MvdnCNGpUm5Rq1Kkq08TWlBwVFybXsuVVOamvgfLy2imj0a+LWaYaEK
+        uFzDEZrg8PhaNCvgsLQjlWFyLLsM6M5ZnKhhoTp411ZYaNLF4is1iIxrc8qlZTkvq9pAHB2OP3b/AMPq
+        V5461n3b5skwrD/iZWJ3FcDjWbdsAnucYUd2IAq8ZZS4/cP/AKps/PF0yuSP3n6fzqhePIbJQYXA/tKx
+        Od8RyRrNuQMBzyT8ozgZ6kDJG54peR/3soKOSI4udvH3puQfT3pI5P3FufLfomTtIz8h79aSOSQSyhYH
+        IEcIDb4ufmm5xvpI5JfJt8W79I8fPF/cPX94Pf8AwoAmRx5shCOflQjCdPml/I1nM4Z9Iwp+W6JPHLf8
+        Sq+AwP4iM59gGI6Gr6SS+bJ/o78qmfni4+aX/bNZ7PIW0cmFwRdEqpaP5idKvQQGDkZAJPzBRhTznaGA
+        L2/i7xG/U4+XofIT8vw6V4V8S/gB4K+Jeu2Xiq8OtaZ4t042jWGqWut+IH0uN7S01XTw974P/teHwrqU
+        0mla3qunG+udL/tNLe62R3yxxRRj3PzJMXebd+Sc/PEMDyE9X9KeJJN6fuH4DY+eIZ4P/TTtmtKVarQl
+        z0akqcrOLcG03F7xfeL6xd0+qMq9GliaNXD1489GtB06sLySnB7xbi07aLZrYzNMtF0rS4tLE9/enT9P
+        trFb3UJmutQuxaWFvALm+uSqG4vLjYJbmfapmmZ32rnA8l+OXxitvgzo2k+KLnRbfVI7u8u9GC6lrkPh
+        rSrR5rCfV1udQ1qew1KO0jl/sQ6ZZJ9kla71fUtMslMYuGlj9oaSbF4PIfBDbvmi4/0ePv5nXHtUEys+
+        o2mYXDCy1DCloiTmfTckNuwMcZ5BwcDOeMKsalSE1Tq+yqSWlTkU7Scou/K/denMrNW17pHdgKmFw2Kw
+        1TF4NY7B0pxdbB+3q4b29KOjpKvSvVpOS0543at1ItL1NNU0ywvxbT2v26C3vBbzgCaAXWycQTBTgTRe
+        Z5cgGQGU4OCM+VftJMp/Z++OgKNg/Bf4pggrx/yJOtDp+PXrxxXsIMirxA4BmOfniIz5+P8Anpgd/wAu
+        +K8d/aRklP7P3x0zA4H/AApf4p/xxH/mSNa9JPr+VX/kvvtr+Jzt3cmo8qcm4xvflXRX1bt3erPzV+BX
+        /BU74AaL8EvgrpF14O+MUlzo/wAKvh5p9y9voHgloHns/BulWcrQNJ4/jkaJpVZkaSONzGQWRG+Qeo3H
+        /BV79np4rxR4L+M+XilIz4f8D4A8gJ2+IQ5zz9O+aKKBEh/4Kw/s8kwf8UX8aPkIb/kX/A/OUZOP+Lh+
+        pB5zx60x/wDgrB+z1+/H/CF/GfMh+X/in/A2B+6ROf8Ai4Q5yp/AjvRRQBM3/BWL9nnzEP8Awhfxo4Bx
+        /wAU/wCBv4iB/wBFC9Afp71S1D/gq7+z3NY6lCvgz4zAz2tyoLeH/A+BvtDFk7fiECcYzgdRxkUUUAWp
+        v+Cr/wCzw0iMfBfxowqyqQNA8EZyxjIwR8Qx/dOe/T8OS07/AIKSfsh6Rruq+LtL+DvxC07xbr5RNc8T
+        2XgT4a23iDWYI5YXjh1TWIfHKahfxxpbW6xx3VxMieREFAEa4KKTSbi2k3F3i2ruL7xvs/Q0hVq041I0
+        6lSnGtD2daMJyjGrT5oy5Kii0pw5oQlyyvHmjF2vFW68/wDBWL9ngFSPBfxoA2FcDw/4G6Hbj/moWAOP
+        8iqtx/wVc/Z7ktkjHgz4zZ+3WUoLeH/A+MLqkEwHHxCyCQNueQCc4YDBKKZmWU/4Kw/s8q8jDwX8Z8bE
+        UD/hH/A3BQyk/wDNQumGGOc8HNNT/grF+zysUS/8IX8aMx7QT/wj/gbBIXBx/wAXCH4UUUAPT/grF+zy
+        Gd/+EL+NGCqg/wDFP+BgeDITx/wsLHRh3HTtVR/+Crn7PedMY+DPjNiG6P8AzL/gjJP9nXsZA/4uFjq2
+        QSOgxjJBUooAs/8AD2D9nk/aP+KL+NH7wn/mAeBuB5apz/xcL1U/hj6BV/4Kxfs8l1P/AAhfxo4zj/in
+        /Aw7H/qoZ/lRRQAxv+CsP7PJNwP+EM+NGJQwA/4R/wADdTEkfJ/4WF6qemeD6nAa/wDwVf8A2ejfW0v/
+        AAhfxnwlpex4/wCEf8D5JklsGyP+LhYwPK9zk+mclFADz/wVi/Z5xt/4Qv40YEjNj/hH/A3OZd/X/hYW
+        emfTk/jXlvx5/wCCp3wA1z4KfGHR7Xwb8Yo7nVfhT8RNMt3uNB8FJAk+oeEdXtYXmeLx9LIsKySAyskM
+        rhMlUdgFJRQB/9k=
+</value>
+  </data>
+  <data name="cbBlankChart.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        /9j/4AAQSkZJRgABAQEAYABgAAD/4QECRXhpZgAATU0AKgAAAAgABwEaAAUAAAABAAAAYgEbAAUAAAAB
+        AAAAagEoAAMAAAABAAIAAAExAAIAAAAQAAAAcgE7AAIAAAAIAAAAgodpAAQAAAABAAAAipydAAEAAAAQ
+        AAAA6gAAAAAAAABgAAAAAQAAAGAAAAABcGFpbnQubmV0IDQuMC42AEJyaWFudGEAAASQAwACAAAAFAAA
+        AMCQBAACAAAAFAAAANSSkQACAAAAAzc3AACSkgACAAAAAzc3AAAAAAAAMjAxNTowOTowMyAxMTo0MToy
+        OAAyMDE1OjA5OjAzIDExOjQxOjI4AAAAQgByAGkAYQBuAHQAYQAAAP/bAEMAAQEBAQEBAQEBAQEBAQEB
+        AQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAf/bAEMBAQEBAQEB
+        AQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAf/A
+        ABEIAJYAoAMBIgACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMD
+        AgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygp
+        KjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOk
+        paanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQAD
+        AQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFR
+        B2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZ
+        WmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfI
+        ycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/AP73YfDXhy2hit7fw/olvbwR
+        pDBBDpVhFDDFEgjjiiiSBUjjjRQiIihUQBVAAAqX+wdC/wCgLpP/AILrP/4zWtRQBk/2DoX/AEBdJ/8A
+        BdZ//GaP7A0L/oC6T/4LbP8A+M1rUUAZP9g6F/0BdJ/8F1n/APGaP7B0L/oC6T/4LrP/AOM1rUUAZP8A
+        YOhf9AXSf/BdZ/8Axmj+wdC/6Auk/wDgus//AIzWtRQBk/2DoX/QF0n/AMF1n/8AGaP7B0L/AKAuk/8A
+        gus//jNa1FAGT/YGhf8AQF0n/wAFtn/8Zo/sHQv+gLpP/gus/wD4zWtRQBk/2DoX/QF0n/wXWf8A8Zo/
+        sHQv+gLpP/gus/8A4zWtRQBk/wBgaF/0BdJ/8Ftn/wDGaP7B0L/oC6T/AOC6z/8AjNa1FAGT/YOhf9AX
+        Sf8AwXWf/wAZo/sHQv8AoC6T/wCC6z/+M1rUUAZP9g6F/wBAXSf/AAXWf/xmop/DXhy5hlt7nw/olxbz
+        xvDPBPpVhLDNDKhSWKWKSBkkjkRmR0dSroxVgQSK26KACiiigAooooAKKKKACiiigAooooAKKKKACiii
+        gAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiii
+        gAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiii
+        gAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiii
+        gAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiii
+        gAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooA8q074v+Gt
+        TsdKv4LHXEh1ixt9QtlmtrBZUhubeG5RZ1TU5FWURzKHWN5UDhgHYAMdP/hZWhf8+mrf9+LP/wCT6KKA
+        D/hZWhf8+mrf9+LP/wCT6T/hZehZx9k1b/vxZ+3/AE/+9FFAC/8ACytC/wCfTVv+/Fn/APJ9QxfFHQJn
+        uEWz1gG2mEEm63sgC5gguMpjUCSuy4QZIU7gwxgBiUUATf8ACytC/wCfTVv+/Fn/APJ9H/CytC/59NW/
+        78Wf/wAn0UUAH/CytC/59NW/78Wf/wAn0f8ACytC/wCfTVv+/Fn/APJ9FFAEFt8UfD91bw3MdnrASeNJ
+        UD29kHCuoYBguoMA2DzhiM9Can/4WVoX/Ppq3/fiz/8Ak+iigA/4WVoX/Ppq3/fiz/8Ak+j/AIWVoX/P
+        pq3/AH4s/wD5PoooAguPil4ftkR3s9YIea3gGy3sid9zcRW0ZOdQX5RJMpc5JCBiAxAUz/8ACytC/wCf
+        TVv+/Fn/APJ9FFAB/wALK0L/AJ9NW/78Wf8A8n0f8LK0L/n01b/vxZ//ACfRRQAf8LK0L/n01b/vxZ//
+        ACfWVqfxh8M6Va6pd3Fjrrx6Tpkmq3Kw22ns728Ud3KyQB9TjVpitlKAsjRplo8yAFihRQB//9k=
+</value>
+  </data>
+  <data name="cbMultiAxis.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        /9j/4AAQSkZJRgABAQEAYABgAAD/4QECRXhpZgAATU0AKgAAAAgABwEaAAUAAAABAAAAYgEbAAUAAAAB
+        AAAAagEoAAMAAAABAAIAAAExAAIAAAAQAAAAcgE7AAIAAAAIAAAAgodpAAQAAAABAAAAipydAAEAAAAQ
+        AAAA6gAAAAAAAABgAAAAAQAAAGAAAAABcGFpbnQubmV0IDQuMC42AEJyaWFudGEAAASQAwACAAAAFAAA
+        AMCQBAACAAAAFAAAANSSkQACAAAAAzQ2AACSkgACAAAAAzQ2AAAAAAAAMjAxNTowOToyMyAwNzowMjo0
+        MgAyMDE1OjA5OjIzIDA3OjAyOjQyAAAAQgByAGkAYQBuAHQAYQAAAP/bAEMAAQEBAQEBAQEBAQEBAQEB
+        AQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAf/bAEMBAQEBAQEB
+        AQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAf/A
+        ABEIAJYAoAMBIgACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMD
+        AgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygp
+        KjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOk
+        paanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQAD
+        AQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFR
+        B2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZ
+        WmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfI
+        ycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/AP7uPiLd3n9gPp+jeIrvw5rV
+        3rPgyxXU9ITQrrWNMstd8ZaNo1xd2tl4h0vXdKLzWs17bwS6jo19bCQSMkTTQgpxVt8PPG0qylv2hvi8
+        Sl1eRADRPgECEgupYUz/AMWP67EGT3bNWviR4I0i81Cz8Xzz6oNTl1b4aaCqWuo3WnW62cHxK0O8Zv8A
+        iXta3c0kr3OJYri7mtFFvbywWsNwJZ5fJPhbHqPh34zfFv4QeJdf8Va5pl0V+M3wy1TV/F3iW4vo/DHj
+        HxH4g0jxn4ESeTVTPfQfD3xnpSalYTO4j0zwr8RfCPhmCEQaBHNJ20sNCth61SnWvUw8HXlSdJtzp3w9
+        Op7OSqK7pOrGclypOl7SfMvZ2lxTxM6VeFOVK8a1RUYSVRJRm4VqkHJcjsqsaUorW/tOSCu5JHq8Pw58
+        aPczxP8AtC/F/bHDbSLjQ/gHndK90r8/8KP5GIkwMcHPJzwtz8OfGkXkBP2hvi/+8mZGzonwD+6La4l4
+        z8DuDujU59MjvXeweHNNa8ug0+t4FtZn/kZ/EY5Mt9nJ/tbJ4VeKW88N6YrWhFxreftLf8zR4kP/AC53
+        eP8AmLdc9K5Pd/mf/gGnT/p56/8AAOpOr/z7j/4G/LtT8/6ujgv+Fb+Nf+jhfi//AOCT4Bf/ADj6da/D
+        fxnLbW0r/tC/F/fJBDI+NE+AYG541ZsD/hR3AyTgV33/AAjmnf8APbWvx8TeJO3r/wATalsfDWlmytCb
+        jW8ta25P/FUeJBz5Sdv7W/TtSVurfyh/nP8Ar8ATq/8APtf+B+nan53+fojzlfh142ae6T/hoX4v7YpU
+        RP8AiSfALO028Ehz/wAWP5O+RufTApy/Drxr9qihb9oX4v7Ht7iQ/wDEk+Aed0clqqYP/Cj+mJXyPp6c
+        95H4c077RfAT62QLiP8A5mbxIetnank/2tz179uOlKvhzTTfQBp9bwbS7P8AyM3iMHImscc/2rnueB1o
+        07u3lDXp/wBPLf19xer/AM+1/wCB+n/Tu/8Aw/ocRcfDfxlHEzp+0L8YNwKAZ0T4Bn7zqp4/4Ud6Gmf8
+        K38a/wDRwvxf/wDBJ8Av/nH16Fd+GtLFvIftGt9Y858UeJD/AMtE651bB/Gm/wDCOad/z21v0/5GbxJz
+        /wCVX3o06Nv1h6dp+v8AWor1dP3cf/A/R/8APv8AL/Jnn1n8OfGc0JeT9oX4v7hcXcfGh/AMfLDdzwpx
+        /wAKO67I1ye5ye9Nb4deNRdSRD9oX4v7FggkH/Ek+Aed8klyrZP/AAo7ptiTA+vrXoGn+G9La2Ja41v/
+        AI+tQH/Iz+Ixwt/cgcDVgOKa3hvTRezgT62R9ltCf+Km8SHky3o6/wBregHH+NOy11fzh6b/ALz5P1C9
+        T+SP/gz0/wCnduv9aHn7fDrxss1qn/DQvxf2zTvG/wDxI/gH90WtxKMH/hR/B3xp+GRV7/hWnjD/AKOF
+        +MH/AIJPgH/846uvl8O6b9osQ1xrQBuZASfE3iMcfYbw9Tq3HNaP/CN6T/z861z/ANTT4j54z/0FvTn6
+        c0ly/wAz03tD0/v/ANN/IL1P5I99anTvpT20b+TPL7b4d+N5baCV/wBoX4vbpIY3bGh/AIDcyAnA/wCF
+        H8cnpU1t8OfGkjXIf9oX4v8A7q4EaY0P4Bj5TbW8vP8AxY7k75G59MDtXbWPh3TjZ2p8/Wjut4ef+Em8
+        R4P7pcYxquMY9OKntPDulFr3dc61/wAfagf8VR4iHWztCB/yFhnknGcmnpd6tL/Br6az9fn9wc1TrCK9
+        ane3/Tv5/wBI4Gf4c+NEnhjT9oX4v7Xinds6J8A85SS2VcH/AIUd6Stx3JHpTJvh143RQw/aF+L+d8a8
+        6J8Ajwzqp/5of1wTXoNx4c0xbq323GtnMFyD/wAVR4jP/LWzwP8AkLZ6Z47/AIVHceHtNCf8fGtf6yHO
+        fE3iPp5qdQdW9fWjRdXbreFvyqdtv1C9S/wR/wDBn/2l9Djz8NPGIBP/AA0L8YOAf+YL8A//AJx1bXw6
+        vbyz8MGDxH4lvvEWoWninxdoh17XY/D9hqWox2HjTWdJ0pbuDw7pHh3Q1uEtIrKyQWGj2RuCkTyRS3c0
+        ks3Uf8I1pR/5eNb5/wCpo8Sc/wDlWryDQPhh4b8SWH26+k1s3WkeP/iPNat/wkGs3Ee2bx1qsVzA9pfX
+        l5ZtHdQafBE8n2cXNuXuLyxntdQme8rkxM60HSeHiq05OS9nUn7GEl7t5OaVV+6rtKy6rmO3CRoz9p9b
+        lKhTTjarRprE1E+Wo1BQc6CUZyUYzkptxXvKMmkn6L8RUjn0Gygd2Afxj8PA3lTSQyhT4/8ADGSksEkc
+        0bDjDxurDswzmvC/ir8GPGvifWvB/wAQfhD470LwP8RPA0fxA0CC58daB4t8feGvEXhLxnc6Xd6x4Y1C
+        x0T4j+Ada0p7nxD4P8HavDrllrV4bJ9Gljm0XU0uisXc/ED4caHJrZ8evda8NZ1TU/hX4buoYdc1C0sT
+        YaX8TNKvbIxxWk0FxG8U2ragRAt19gD3D3IsxeE3R9As/DmnGOXM+t8Xt+OPE/iUdL2fHTVuvfPUnk8n
+        NerQq/Vp0a9GadSP1iElUwtGvTca+Hp0a9KVOu5wnGdOpUpvmg7xfMuVpW8qpCdf21GopRpt0ZJ08VWo
+        zUqVV1aNWMqKUozjOMJrlnFprlb3v5N8EfHNp8TtN12PXNI1Xwb8QvBWrf8ACG/EvwQ/irWr8+F/FtjG
+        19tsdTW6sjrPhjxFouoaR4r8Ga+1jYya14V1zSb270/S9Te/0my9mu9DsQ1pifU2zcsMf2/rjZ/0O77H
+        UT3xXzx8Sf2d21zxLdfEv4U+L9d+G/xk0/RdIsotdbXPE+q+EvHWlaXc6zcaf4O+KnhYa9br4j8NrLfX
+        y2Gqadc6V4z8KPf3Vz4X8QWMVxqWnanwFt+1P8JNCig0L42S+Lfgz8TdEuPJ8aeC9c1T4i63Z6RGlrdw
+        nxfpnivRoLjRNU+FeqSqZdE+I1xJpOkFPN0nxHF4a8VafrfhrS+qplFDMHLEZPh6ldOUfb5dSwftsVgp
+        yjGUnCm6lWtiMC6ikqOITqTpRUKeMcak6NTE4RzKvhLUcyrQhJJqljKuKdKjiYxa5XKfso0qWK5OX2tG
+        SgpvnqYdOmpxpfZP9hWH/PTVP/B7rn/yxpLHQrD7Faf6Rqf/AB62/wDzMGuj/lknb+0ePpXKeEdR+H3j
+        /QLDxX4E8YweNPDGqxtLpniLwr8QtT8QaHqEccjRSPZarpWv3djdLHKrRSGGdwkqtG+HVlHUWPhrSzZW
+        ZM+uZNrbk/8AFU+JhyYkzwNYAH0AAFeRPC0qU5U6lP2dSnJxnCeEpxnCUXZxlGUlKMouNmmk01Z9T0Y4
+        mrUjGcJQnCSjKMo4upKMovltKLUGmmrWabTT69WR6HY/aL4ebqjYuI+f7e1w/wDLnanr/aPPXv8AToBQ
+        NCsft8H73U1H2S7OTr2uDpNZdD/aIx1/Hv0FRJ4c037RfAT65gXEeP8Aip/EveztScn+1sk57kk4wOgA
+        pV8O6Z9ugVrjW8G0uz/yNHiUHPnWIGCNXyOpzg4PGegwvq9BK9lZLf6tSstuvNtp/WpSr4j+sTV293/p
+        32t8rfO3d6HYiByJ9TOGj4/4SDXCP9anUHUsY+tfPE+gfEXxvqHxD1Twl4913wRZaHf6p4P8EafeHTPE
+        vhjXdT0jTtLln8X6kPsqeJYraHxZNrnhLUNFtvEoJtNBnu4307UrnyrP13x6uieE/B/iLxHPc6l5ei6T
+        e6l5d5421vTre4ltIWlgtZL/AFDW4rKzF1cLHbi4upY4IjIGldVBIyPhr8OLLwx4F8NaTeQXdjq39njU
+        /EVvpXifxadNPivXppde8WXNmbvXrq6eC98S6lqt6r3V1c3MhuDJcXE0zvK/mYnC0MXiaOD561OlTo1M
+        TiXhebC1LyccPhYOrh5wqxjN/Wqi5a1KXtMNDSa5+T18DisRgcHiMeqWGq4ieIoYPCwxkKWMo2jF4jHV
+        Y0sTCpT9rSUcHS/eYWrF08ZVcZ0qsKbn5m/jCfxX4c0bw54Ml8W+GvHnizxP4x8JXGqta6tq1v8ADy78
+        HanqEXizxDrNlqWuWti9hF9khsfCt1K+oW+taj4h8MahHpuq6LcX5i61fhR4yTWJpm+OHjua2/tjSdYN
+        g1h4SMP9jwS6iLjwt5w0IXf9nX25PO1ATrrcPlj7NqMO+Tf1+gfCnwXYeJNf8bWttq8XiLxJbWmjatqA
+        8V+Kd1xYeHdS1ttMhETayY4PKbVLoyvAkbXOIDcGU28JTp38OaaL2ZRPrmPstqf+Ro8THnzb0HJ/tcns
+        MAnAycDJOYo5SqycsxrValWMlToxwtXE4aiqFG8aU3Sw+Koxdau3OtW51UcPaRwvtK1PDwqT0xOcqk40
+        8pw9CGGlD2lX69h8HisR9ZruFWrShWxOExM/q+Dap4XCTU4Sqxpzxjp4erja9CHjLfCDx7GumxH4/wDx
+        AnnSPxDbtc3GkeDF8661LRdQg0i+mjtdBtgH8OXTR31lBbNbRX8sKw6t9stnkibI8O+E/i142TVG1rxt
+        4v8Ahk+iWf8AwhQjsNO0aVPFPibR5Lf+2vivpD6zqvjB7fw1r0yzWHhLw7qAt7mz0yG41HWUurzULCHS
+        PepPDmm/aLAGfXMG5kB/4qfxL/z5Xh4P9rZU5xyCDjI6ZrT/AOEY0r/nvrn/AIVXif3/AOox7k/XmreR
+        4JShy18whTimp0vruOftHyU4U26lTGzrU/ZqmpJUalJTk71OfS2ceIcw5Z82FyipUfL7Kq8vy+Lor2rq
+        1FGlTy+GHqKpzKCVejWVOnGEKPs1FHh0Pwj8czW6NF8ePH9skv8Awjs8aRaX4LYW0OnacbfVbWMy+HH3
+        xeI7lotRvWk3TWM8Cw6TLZWby272LX4SeNDNI3/C9fHipBrutXk0X9n+EQt1Y6npulppWjyH+wg8dp4b
+        mhuJ7C6gaLUL1r2aPVrq9hhtY4PU7Lw7pxs7U+frnNvD08T+JR/yzXsNWAH0xVmz8N6Yz3u6fXPlulA/
+        4qjxMvH2O0PONXGevU5PbOBir/sXL1Z82O02vjcxtrLn0/4ULLXSy0cLU/4cYxWf9vZo96eWbWt/Z2VW
+        1gqf/QrV5cuqm/ejUarxar3qPxqT4P8AjtVtrZv2gPiDLcDw9faeb06Z4JMz6m2sw3qeIPJ/4Rz7Ot7D
+        YSw6Mtmka6W1papdyWbalJNeO68+EXjkpKY/jv4/hEl54dkRE0vwYwih0y2a21W3Qv4dYsviS6aLUr6S
+        TfLY3ECQaQ9jZtLBJ7Dc+G9MW6tws+ucwXOf+Ko8TMeJrLudXOOvQYycHqowyfw5pwjH7/XP9ZDnPifx
+        KRjzU9dWo/sTL2tZY9qyTf17Mm7Ri425v7RUlo22003K02+dKSf9v5p0hlier0y3KbJuUJpxX9lWjaUI
+        8vKk1BypJqlVqwqee/DmW+mvvFfgjxfrNzq/izwfqAurjUbDUPEWmwX/AIW8UX+s3vgq6ltm1BYI9Ti0
+        myfStZNkWs5tV0u7urYQR3C2tv1/w2hgsNE1eJHmw/jr4hsftN5cXT7h431+MbXu55pACkakqrAPIXmY
+        GWWV24e20qxtPjpr2lT654qkttd+F3hTUdM0RtZ19NMsp/DPinxbaa5qsGqrr5up9Q1SPxX4es7ywltF
+        gtbbR7C4guXe8uYo6GmfCfw/4v063uL661yKXQPid431uzMeqPdt9u074h6lcWhaXWI9UnggD6XavPb2
+        Etml5MDc3i3F0I5o+bCqVOnShRjHEV8PicZhX7Zxp1HSpVpQpSqVuetKpVeFVGUpzkp1ZOU5cspezj04
+        tU6mIqTrTeGw2Lw2X4y9CFSpS9vWwnPiVToezw0KVH68sRTpwpQlRoJKFJzpwVSfqPxCCXGg2MRZgreM
+        fh2GMUskMgz8QPDI+WSJo5YyCM7kZW7A85q7Z6RbeXL+/wBT4vdQH/IY1cf8v1x6XwGfU4yTya8k8Q/D
+        jUdDWbU18d+JbhNU8a/D2QpN9kuboSz/ABN0u+njmm1SLVLD7DFLfK+mWWmaTpEemOt3DAz6Xc22maf6
+        ZaaHqTRykeL/ABEv+m6gMC38Ldr645OfDR5PfHGenGK9+pSouMPfjVtKWroz0coUHJK8b+7JtXaXM1or
+        WPm6VatGpU9xwuoLWpBXs52d02tt+xr2+jWzXl0Dcan/AMetn/zGNXzzLe9/t2e3TPXnikvNCs1NqRNq
+        QzcvnGsatyfsl0ev2725HcEjjOaoQaFqZvLgDxj4iUi2tCT5HhcE5lveD/xTWOMcfU0t5oWphrTPjLxE
+        2blxjyfC5wfsd2c/8i17d+MViqNHoktvhpzXa3wxWqb06p3tqzf29Zrd73/ixWui8ujf3M+ZPF3wo8Z/
+        Cbxrq3xV+A+iS+KNI8Xzx3nxf+CMXiU+GZPFWrWtpHaQfEn4c61qN7baJp/xOawtbLRdf0bxNqGk+F/H
+        2lWOkNea/wCF9a0NdT1fsfhl8ePhf481iz8CyyePPAXxFbSmvl+H3xQ0fxv4B8UX1rp6QjU7nw4uvra6
+        J44sdM86E6hqvgHWvFOkWizRPLqAjljZvbP7B1Lv4w8REZHBt/C2Ov8A2LX+fUVwvjP4IeDPiz4YsPDv
+        xLjTxtokMljqlnYeItD8F6kmm6rb2zx2uraXLceFWn0vVrWO4njttT0+a2v7dJ5kiuEWWQN6qr4HFxp0
+        8zo1JVIU6dGGPwybxUKdOEYUlXoVUqGMjQhy06a9pha7pRhTljHSp0KdPzXTxtBylga0Y05TlVlgq9RS
+        w8qk2pVHRqRTqYWVWTcpyUMRS9pzTWHUpTlLL1/4wfArwifFVz4p+MvgPw5D4Y1a20vxFJrvxX0zR00L
+        VLiws5bbS9YN74igOm6lcxur21leiK7uFZPJhcMK4nw5461343S6H4g+BuqWumfDq60yx1u1+JnjXRfH
+        Wt2fjWym1S+stV0Dwn4VPjL4da5pclslhaXo8aavcXekvHe2sWleHtfguJtRsOS8a/s3fC3wZ4TTR/AP
+        gq10PWbqfSvhh4Z1vwJ4E+HeneLvB2k/EC+07RvEGvaR4isfBMeraNHotlqmq+L9X1KDUbO4nlsLq9kv
+        P7UuI7h9K9/Za1zw5rWq6x8Cfjv8Q/glf+JLvVPEGu+HrDRfAHjX4Zaz4gu7izmvtZm8A+KfDE0Xh6+1
+        m7d7/wASXHw91nwRc+JtSnvNX12e/wBbu5NUHnV8Dk2YYv6jQzDFZfRoUqFetiMRhakYYmrWqVYwoutl
+        3tsbgqdKOGeIqPC08VVrutQw7qUqUatTE+zhsbmOW4CGPrYHDY/F4rE1aGGpQrU5QwdHD06FSrilhsZC
+        OHx9WrUxEcNSjiKlGhQjRxFT2OKr1Kawfo118JfH3iCXR4viR8QvDHiTwxpevXGuX/hnw94C8QeH4fED
+        2Vxpl54HtdSvvEnxQ8fPbp4U1u1l8RXNzpVvYXetazaeHWjl0jTtK1bTfEntA0e2AAE+pgeg1nWMD6f6
+        eOPSvkqfw3+3Zp1v9if4kfADxVt2bvEjeF/FvgcttkUgN4MQ/EAM03AZ08eQrbcssFyD5dQz+JP2vfBY
+        j1bxt4A8O+PfC8cijVR8EPiJZX3xB023b5Tf6d4G+IXwg8JaL4mtbf8A4+NQtrP4g2Gux2yuui6H4ivv
+        Ls5enD8L4XDc7wmNy3Ezq8l3UzKpUrVI0oKNKKlmcoVYxXvOnQbhL2s6kvZKrWk58eJ4mxmK9ksVhsXQ
+        p0FUVOFHL6FChTdWXPVm6WV0nQlUnaEZ11Gc3Ro4eg6nsMNQp0vrvTdFtTan9/qX/H3qAP8AxN9W5xf3
+        I5/03r/WmyaPbC+mHn6n/wAetof+Qvqw6y3o6i+z29cD8ePmjwV+0b8I/EV5L4fv/i34w+HXihFvL8eF
+        PjD4Pl+DPiG6tDqctvNdaPpvxQ+H3hV/EtpZ3U0NpqGoeGH1jTrO6uLaGe7ja7tfO99g0+4vZTcWfjrW
+        7y2mtLSSG6th4TnglRpb3Bimj8NtFIh6hkYg54J4rPE5dUwclHFYWphm7NKvha1JPazjz00pJ7pq6fTc
+        VDHrErnw9anW3u6eIhO2qT5lFtxaekk0mmmnrc1pNHtjcWA8/UubqTrrGrn/AJcrw974+mK1f7Ftf+e+
+        p89f+Jxq3/ydXNSaFqf2ixH/AAmHiLm5kwTB4XGP9Cu+ePDXXqOfXpWl/YOqf9Dn4i/78+Fv/marm9jR
+        092PTalL+72j/Xo1fb21V2v5f8vY/wB1/r+DI7LSLY2dr+/1Mf6PD/zGNXH/ACzXsL4AfgB9KsWWi2xa
+        +zPqf/H2v/MX1b/nztDz/pvPXv2ArHstD1I2dqR4w8RAG2g4EHhcgfu17nw1n86ntNC1Mve48Y+IlxdK
+        D+58L8/6HaHJ/wCKa64IH4UexorRRha//PqWu39zz+dvMPb1nu9NP+XsfL/P8GaNzo9qt1b/AL/U+be6
+        /wCYxq3XzrLGT9tzx7Ec4qK40i28sfv9T5khH/IY1c/8tU7G/I6cVSn0LUxdQA+MfETZt7rH7jwucfvr
+        L/qWsd8/hxTJ9D1IIM+MPEX+si62/hb/AJ6p6eGv8KPY0X9mHT/l1L+7/c16etl3Qe3rJaP/AMqx8v8A
+        P8GcR4i06Oy+L/w3kOpeMFtdU8M/EXQjYWmp6rJ4fnv5JvA+uWd/rMh1VTb6hY2mhapa6Iy2syyR6pqy
+        NcWzFI7vrvhvDHaaJqyK8zB/HXxEbNxcT3DDb468QR4ElxJKwBCAlFIBcs+DJI7NwHxA0PV4PGPwXuov
+        Efj69J+IWp6fdzaTF4dNjp1pffC/4iOmoeIoovDRR9HOoWlhp0LTr5cWt32kSqyyIuaui/D7WPEOnxzx
+        +ONZtU0n4l/EHUHR7e0ElwsfjXWoDaLJo50KMQO8Umo7b631ONdXFndJGtrZtY3PjU17LF4x0KTrTWOT
+        VNP2T5KmXZepSjKtaLipKbag1eUJLl5uaUvdnbEYLK44iusPT/s+SlWcXWSnTzXOHCDjRvUnNqVNc0/h
+        i4r4YRPUfiMjS+H7KNJpLd28Y/DwLPCIjLET4/8ADI3oJ4p4SwGcebDInqh6VLZ6Re+XL/xUmtf8fl+P
+        9R4cOcXtxz82gE5Pfn6V5V4g8AeIdHmvtWn+Inii+sNX8W/DJbbSZ3gu4NPmi+KMF/NNajVv7VtbcXa6
+        5Dbzw2FhYRpFo+k21n9l020i05fUrPR9Q8uX/iqNcX/TdQGBb+G/+f645P8AxT55PU9vQAcV79SlS5Y2
+        rKVpzd4qvHV08O2tIJ+7L3XdWbV43VmfO061SM6n7l3ahpy4eo7JztLmnLS6SaSd1e0rNNK1b6NeteXX
+        /FS62MW1mc/Z/DneW9GP+QABgY+uSeafeaNeKbU/8JJrZzcMOYPDnH+h3Rz/AMgDrx9Mdqhg0bUTeXAH
+        ijXeLazOfI8N55lvcf8AMAxxjjHPJz2pbzRdSBtM+KNd/wCPl/8Alh4b4/0O65H/ABIOvGPoax9jS/5+
+        f+TYn/5H+rG3t6m/sVf/AK9YW/Tzt0+fUm/si9/6GTWv/Afw3/8AM/S2Oi3hsrM/8JLrYza25A8jw5xm
+        JOP+QB+VR/2PqH/Q067/AOA/hv8A+Z+iz0fUfsVox8U66FNtbn/UeG8DMSHvoH8z9TR7Gn0qNvoubE+X
+        93yX3IPbz60krdXSwtlb0b2PH9b0C51340eE9Onv9aubTwNpOueOo9WF54bQ6Z4l1nT7bwRoMUujx6CZ
+        Lj+0fDeq/EGOK+ufJt7f7K8Nul1NLcNaeuro961/AP8AhJNa/wCPS8Ofs/hztNY+mgDrn9BXj/gTQZ9X
+        +I/xh8YprdwGbVfC3w+stZ0+68OX9zq+leBtCbVJIdShjsb210260Hxl448baM1kLLS73dbSTXkVzG9n
+        ct66ujaib6ADxRrufsl2c/Z/DeRiax6f8SD3/QVwZfQpOOJr+0V8TjcRUbi8RaUaMlgqM1L2NNyUqGEp
+        SUnzpr4KkocrPUzXEVYVMHhPYvlwWW4Kkrww0uWeJp/2liINe2q8jpYrH16UoLkcXC06NKfNCNy60W8E
+        Dn/hJdbPMfBg8Of89E/6gH5dMUz+yL3j/ipdaGPS38N//M/SXWi6kIH/AOKo1370fWDw3/z0T00AH8ua
+        aNH1HA/4qnXf/Afw3/8AM/Xf7Gl/z8/8mxP/AMj/AFY8v29RaexVn2pYXy3u10/I5vVvhl4d8b6Umn+M
+        orXxZp8Go6hcQ2Hibw14J1+zhuPtd7AZ4rbVfC13DHM0MssRlRFfypZI87HZT86al+ybceBtbudZ/Zd+
+        IcX7POp6jbqPEnh2w8BeH/Efwj8RpM160WoXHwo0688E6Jovim0u445R4q8LXmhajqVpcahY+Il1tJdO
+        l0r6s0/RtTNuT/wlOu/8feoYxB4b7X9zzzoHU9T701tG1EXswPijXf8Aj1tT/wAe/hs5/e3uAf8AiQEc
+        YyMDPqelduGxeIwilChjJxpTTjUw8/bV8LVi9Wq2Er06mFrWdpR9rRny1FGorTimcmIo0cTaVXCRdVNO
+        NaFPD0sRBrS8MRSnTrQ928XyVFeLcGnBtHyN/wALv+JPw2/sdf2lPBHibwJodvfRafq3xq8D6x4G8Z/B
+        m1uZVm0+LW9fWTS7D4ifD7w/qM80F02peJPCV34a8L2080fiXxhBb2R1a8+w7TT5L63iu7PxZqtzbTxp
+        LBPAnhqaKaKRdySxyJoJR43BDIykqynIJHXLvvDk18ILG91/VbyzvHubW7tLqx8Lz21zbT6dexTwTwS+
+        HWjmhmiZo5YpEaOSNmR1KnFfM97+yZdfDe9/4Sr9lXxda/BnxCXm/tfwLNodpcfA7xrZzlZJrbVPhx4e
+        Hh/SfCPiNriNZLD4g+DrO11myknuv7c0vxdp0z6Q3UqeUY7RyjlOJd1GVJ5hXy6tLRx9sq062LwDumnO
+        k8bQlKUIqjhKcJzeCq5lhLNU1mGHVrxqU8FTx1JLf2bp04YfFx2koz+r1opS/eV5OEV9QWWk3v2O1I8S
+        a0P9Hh4+z+HMD92o4z4fJ/Mk+pNWLPRbxnvf+Kl1sf6WvS38Of8APnaHn/iQe+OMdO9fP/wg+J+q+LtT
+        v/hx4/HiL4afGPwzpNpqureC5rrwxreja/4cmaG0g8d/DbxSvhXT18ZeBp750024u5tM0XxH4e1VodM8
+        XeG9Aur/AEgan77aaNqTPeY8Ua78t0oz9n8NjP8Aodmc86BjvjjHTn1rgxOAlhKzoV5KM4qMk41a1SE4
+        TipU6tKrT56VWlUhaVOrTnKE42cZNHbRx31imqlOnzRcpRd6OHi4Tg7ThOElGcKkJLlnCUVKElaSTVh1
+        zo14t1b/APFSa2cwXOMweHMj99Zf9QDBz9PT05juNJvfLA/4STWuZIR/x7+G/wDnqn/Uv0XGjakLq3z4
+        o13mC558jw3/AM9rH00DHPfI7Cmz6PqGwZ8U66f3kP8Ay7+G/wDnqnpoArD2NP8A5+P/AMCxP/yPkvuN
+        frFRf8ufupYW3TvJfd5HnXxZ8P3v2XwPqK3XjHXZdH+Kfw7uYYNGfQba5sP7U8RWnhe51u8EXhDUWudI
+        0Ox8QXeq6zamK2jfTLS5kk1HTo43vYe2+GUEtvoWriW9ub5n8dfERhLdJaI6AeONfj2KLO1tI9rMjTHd
+        Gz+bLIA4iEccfMfFPwTreveEXtLK913xFe2XiPwR4hsdJF74W0Zp7zwr428O+JraYajN4eaKIWU2kR37
+        QyDZeramxLRm48xeZ0nwL4l1/ToZtN8e69pUWmfEXxzf3CW7/Y5L02XxJu7lbCb+xp9Gs7nS7+PT7yHU
+        7XU7DUZpRqDJZXWn2f2uzv8Axp054fMq1SjTlXjUpYWUUnOCc28TSrNyq0oqTp06dJ2jOtOzheFGElKX
+        twqUsTlWGpV6sMN7PGYyDk6dObhSVHC1qVqVCrOpFVK1TERjJ0KUZNVbVazi6dL1f4hqz6DYokhiZvGP
+        w8CyKFYo3/Cf+GcEK4ZWOexGMZq5ZWl/5UudVmz9sv8AP+i2fUX1wCf9T0PX8cdsnxLVPDvxc09NRvNf
+        8U+G5rC98ffD1tItFtb3V4bWyX4j6MsEMVsIPDd1p0hT7NqExudZ8SHdf3GiRyLb6NZarqHrVna+MPLl
+        xrnhwf6bqGc+FtSPP264yRjxeOD1API6EnGT79WhBKK9vSnac9YzxEV70MO2rwjG7jezeqTTtdK7+bpV
+        581R+wmrqC5ZQot6Oor3m/hfa6drOyNu3tNQ+2XIXVph/o1nkm0syMebe4A/c4GPmzzzkfg69tNRzabt
+        WlINy/Szsxj/AEO75/1P4YPXNZUFn4xa7uNuu+GwwtrPcT4W1Mggy320ADxfkEc5JPOQABjlbuy8ZBrQ
+        trvhoj7S/TwtqYOfsd36+Lz2yPxz2wcPYxul7WOv/T3F26dWm/x9NLm/t57+xl5L2eH/ALtvtW/Do+7N
+        Y2l//wBBWb/wEs//AIz+dcD4t8ReKfDlh4Ps/DtjJ4m1jxNrem6Fa2k9zbaRYafZ/wBmXuqaprWqajFo
+        msSwWWmadptwQEsJDd6hLYab5tvJfRzp1X2Xxh313w3j/sVtT/8Amv8A8+hryNdO8V6z8YfDay3vg+Ye
+        Cvhpe6nZXzaddvfaff8AjjVrbS1Mnh+Px0bmOO507wjqMFhrl1YxREHWNP066kL6tDFyY6EoUYQo1+St
+        XxGHownCpiZShGdWDrTSnSrQ5oUFVlF1IcnPGMZNXu/Qy2cJ4idTEYWNTD4bDYnEVKVWFFQqyhRksPTk
+        6eIw1XlqYqWHpz9lWjUVOU3BSa5X1vwv8G6x4R8Iafo2p32mw6+Xm1fxc/h+xij0a/8AG3iJ/wDhIPGu
+        rael3ALpbbV/FWp6vqcQuAk2y6AkSNsxr3q2mofb4NurSgm0u+TaWZGPOss8eT16d+x/HKjtPGAuL4f2
+        74b3C4jyf+EW1PB/0O1IwP8AhL8jg4Iyemc84Vy2njBr2EDXfDe77LdkE+FtT2gedY5BH/CX5JORjkYx
+        3zW9DBUsPQo0KdSKhRpwpwXtsVdRhGMY391Ju2/uq7vojlr46visRWxNak3WxFWpWqy9nhknOrJzm7c2
+        mstF0+Wm5d2mpfZ3zq8pGU4+x2g/5aJ/0x4/rTBaX3/QVm/8BLP/AOM1m3Vl4yELE694aIDR5A8K6mD/
+        AK1OhPi8/wAqb9k8Yjj+3fDfH/Uran/819aKjF71I9N6uLXbyXn/AMOmY+3n/wA+Zf8AgvD9Uu8uj/Xb
+        VmjptpqRtjjV5QPteodbOzPS/uQf+WPHOcZ7e9I1pf8A22bdqsxP2W15FpZjjzb3AI8njBzz3z7VmWFl
+        4xNuxXXfDQH2vUOG8Lamxz9vuc8jxevU5IGOBxz1pGtPGK3s4Ou+G932W0OR4W1PGPNveMf8JfnIwec8
+        56DHIqMb/wARW/6+4tW268v6/jcPbz39jK76ezwytt/et5adnY0ZLS/+0WGNVmz9qkwTaWeB/oV3z/qD
+        njPcevbjS+x6l/0F5f8AwDtO3/bHj8etc1JaeMDPYg654cybmTb/AMUtqYAP2G8OT/xV5yOMY465zxzo
+        fYfGf/Qe8M/+Erqn/wA2FDox0/eLbW1XF91/df56feHtpv8A5cyX/cPD7XXaS19e33eP/Ev4OXfxGsvB
+        2u6L421LwP8AEb4f3Umt/D/xzYaPpWpyaReX2mPpuraLr2jXUcMPifwR4msZFs/FXhaa809tQW103VNL
+        1XQ/E2ieH9f0jzCz+Ifx++DviLSbT4/6r8PPGXw98XeJdK8K2/xa+FPgzxB4Cj8EeLvEDaZpXhbS/Hvw
+        98T+LPie9v4Y8S6vc22gWnj3TPH0sWneI9R0XT9b8L6dpV/L4hs/pyytfGH2O12654cA+zw4DeFtSJH7
+        teCR4vAPPfAzXM+Mvh5qPxL8GeOPh/4p1Lw7e+G/Gmk6n4Z162Tw3q0E8mnaxo8NjdNaXMXi9ZrO7iin
+        MtneQutzZ3ccNzbyRzRRuvq4XEwjGjhMb7HEZfFuFuWbxWGp1Jc854PFOnHEQdOcp16eHlVeFlXlN1aM
+        41ailwYilVbq4jCQnh8ZJRne1H6vXnTUVGOIw6n7KSqRjGhUrKEcRGikoVoypwlH0C5tNQ+1WwbVpTmC
+        6wRaWYxiayz/AMsec5H5e9R3FpfeWP8Aiazf62L/AJdbMc+Yv/TGvln4MfEH4krrs3wL+KviDQbb4weB
+        NFuri11S78K6nHZ/F/4f2l9pmn6X8WfDU/8Awk1ta3VxeCawtPiR4etFW78BeNriTT7i2PhzWvBmu+If
+        pOe18X+WN2ueHCDJCMDwtqYPMqf9Tf269PbjqOTFZfPCVnRqzi3yxnTqxrYx0q9Gor0cRRlypVKNWPvQ
+        ktbJqXLOMorow2P+s0lUhQmtXGdOUMNGpSqR0qUasXK8atNtKcXqtHtJM6U2mpY/5C8v/gHZj/2jx+OK
+        5T4apLHomsCac3BPjn4hkOyJGVH/AAnHiBSuI1VSN6vJkjOZCvCqoGt9h8Z99e8M4/7FXVP/AJsDXjuh
+        6F8TdQsUbRvEmhWdrb/ET4gzai8FncaZLLbJ471NHtntruPxOl8Hl/tG9DQ3WiSIkdrpXmst5c6pZ+VX
+        /cSo1IwqYiV5x9nSlUlL3ox1/fypxstbvVpau12z08KniIVacp0sNG9OXtMRGMYNxjUfKpUYVZqTdoq6
+        jFt6ve3qXxGEzeH7JbeSOKY+Mfh6I5JYmnjR/wDhP/DO1niSa3aRQeqLNGT/AHxipLODxJ5cuNU0c4vd
+        QBJ0K85IvrgEj/ioV4J5Axx0ycZPj+p6d8YIpNXufE3iTQ5tDvPHPw4bw3pr6bDqEukww/E+yEqC706z
+        8Ly3KahaTaNcRpfPdzaRHaSaU9xrVy8/iCf160tvE/ly41fQsfbdQ6+H9R6/brjJ+XxOoGew5wABk9a9
+        GrRiowXtYSanN3p1Kqj71LDyavCK5uVvld9Lp2utTzaVeanUapTV+VWqUaTdoSqRvapryzteL6pprQtW
+        8HiX7Zc7dT0fP2azz/xIrvGPNvcD/kYs5Hzd+c9OKdeQ+Js2m7U9Hwbl8Y0K7HP2O7PP/FRHsD+OKit7
+        XxSby5C6xoQItrMn/in9QwQZb3GB/wAJOSCMHJJOcjAGOXXlr4qDWhbWdCI+0twPD+oD/lzu/wDqZjkY
+        yMcdc9sHH2Mf53b/AK/Yjyv0+7+r7/WJ/wDPv5eww3l/dv3+59yTyPEv/QU0b/wQ3n/zRGvI/A1lrt38
+        TfiVrcUvhBLi20X4beCZdTtLK/u9VuF0PS9e8XR6ZrFkvi+a10r+zh8QnvNPjaysb68ttYa7uHu7VrAw
+        +n3smvabZ3WoX2u+Hraysrea7u7mTQNRSK3treNpp55XbxTtjjhiR5HdvlVVJPArzH4L2Xi3UdD1nx09
+        34VsI/iZrsPjXS1tvDPiCK5uPDkvhjw74e8J3usx6prGmX1trd94V8PaNd6np0lhB/Y9xMdHL3sljJqF
+        152KpUqmLy2lzp1KWIq4tp1azcadPCYjDc+sW4t1cVTinHlck5LmspRn6eDr1oYDN6zhyU6tDC4FS9jS
+        XPWqY/CYxUrRlGM17HAVqslNVIxcINwbcJR9VSDxJ9ovs6no+77RHu/4kV3g/wCh2uMY8RDHGBjnnnPO
+        Aqw+Jft8GNU0fP2S8/5gV3jHnWORg+Ivoc5HTvmo0tvFP2i9B1jQiRcR5P8Awj+o4ObO1IxjxOuMDsSe
+        cnvgOS28UG+hA1jQg32S7IP/AAj+o4wJrHIIPic5PIxgjGDnOePQ9jH+d/OtiPn0PM+sVP8An3b/ALl8
+        M+3l5P7y3dweJ/IfOp6PjMecaFd5/wBYn/UxH+VRiHxJgf8AEz0b/wAEV5/80Q/lS3Vp4r8h86zoRGY8
+        48PagD/rE6H/AISY/wAqj+zeKP8AoL6D/wCE9qX/AM1NHso/zv8A8HYj/IPrFRf8u77f8w+Gv08kvL73
+        1F06HxP9mONT0bH2vUB/yArvqNQuQf8AmYh3zjimvB4l+2zZ1PR932W1/wCYFd4x5t7jgeIuCDnnPOcY
+        9U0+18VG2bbrOhAfa9Q4Ph/UCf8Aj/uc8/8ACTDqckeg4yetNe18Ui9mB1jQifstqf8AkX9Qxgy3vYeJ
+        wc8HnPpxwcnso3+N/wDg2v8A1/T+b+sT39nfy9hhtNn/AC/L7+4SQ+JftFhjU9Hz9qkx/wASG8/58bz/
+        AKmL0+nr2rT8jxR/0FNG/wDBDd//ADR1lPbeKPtFiP7X0LJuZNpHh/URg/Yrzk58TtkYyMDB5HPrpfZP
+        Fn/Qa0H/AMJ7UP8A5p6PZR/nf/g6v/X9P5pYifWnbZf7vhultdnfr91jNsofEZs7Urqej4+zw4zoV4T/
+        AKte/wDwkQz+Q+lT2cHiffe41PRv+Ptc/wDEhu/+fO0xjPiIdsevNVbK28UGztcavoWPs8OAfD+okgCN
+        e48UKD+QqxZ2vikvebdY0If6Uuc+H9ROT9jtOR/xU3AxgYyehOecA9lH+d/+DsR+q/rX5n1ip1p/P6vh
+        vLy8r/Nq2tzwz49/Db4h+KbLwn4t8Bal4bX4q/CnWp/HHw8XULC+0vS9bukszoviPwLr+oQ6tqD2vh7x
+        54W1TVfDt3dNYX8ei6lc6P4qisLvUPDmnoNv4WfFdPi/4cutS0a/j0XXtA1KDQvHHgbxN4VvNI8aeAPF
+        UUVrdXfhvxXo0niWVrW7ihuIbuw1G1kvNC8R6RcWXiDwxqusaBqWnanc+rXFr4qF1b7tY0I/uLrH/FP6
+        hj/W2XUf8JNk9iORjHfOR80/G34WfEKz1Fvjz8JNQ0hPjF4Q0CSzu/DtroVxbab8bfCOnSXWpw/C3xY1
+        x4jeJbr7dcXlx8PfFh26j4G8R6jcyQzT+Gde8X6Dr/rYWOHxtCll2Jqxo1ISmsBjJVqyjSlWkm8HiZP4
+        cJVqtzhUjb6rXqTqy/c1a559apiMLVnjcPSdSEow+uYZYfDt1I01b2+Hja31mnB8soWf1mlThTVqkKcl
+        9UeR4nP/ADFdGA9RoN0cf+XFXN/DNbxND1hb24trh/8AhOviHse2tJLNFT/hONfDK0cl5el2MwldXEig
+        RvHGULxtLLQ8AeLrn4l+CvC3j7wn4m0O98N+MdB0zxFo1w/hnUredrDVbSK7gS7tZPEwmsr2ES+RfWNw
+        FurK7jmtbmOOeGSNeS0PTviHLod0+geIdLtnT4jeM5LhE0ZYYpbCH4l3c2qW0gvZtbdpbyytNWs7e4tn
+        szZx6oJDDd3VrBcp4WKhPCV4RnSrSq0qlWjUoxdSVSE1aE1KFaULODTUk/eWt0tT2cJOOMoytVo0qdX2
+        E6derGnTpSg4zlF81GE2lKLUoysk11ex6N8Q9/8AYNj5Qj8z/hMfh5s8zIjz/wAJ/wCGcb9oJ2564Bq5
+        Z/2x5Uv/ACD/APj91DIzOcH7bcZ7Dj0/p0rxTVdV+Mtw+rw+JPC3h610S3+IHw6Tw3M2qrZNc6f/AMJ9
+        oBE/2uxu/E9xfzeciwst5oXhf/QzZ6gEa7u73SNJ9cs7vxZ5cv8AxJPD5H2y/wD+Zm1LIP264yMf8Iie
+        nY55HOB0r0J4eSjG1WFuaTUqdanZ81PDz6396Kdpae7JSWskzz6VePPUfs5L4Y2qUZN+7OcbpcrXK2rx
+        f2k01vY1YP7a+2XO02H/AB7Wef8Aj4PHm3uOBjHf1z+FOu/7b3Wm42GPtDdrgc/ZLr1Jzxn+dZ9veeLB
+        eXOND8PZNtZ5B8T6kMAS32Mf8Ujzkk9hj3p15eeLSbXOh+Hh/pD4x4n1I/8ALnd9f+KR44+vPFYewd7e
+        1fn+9pf3b/1bq9zb260fs+3/AC4fl/d/q3pfzr41X2r23w71fS11ZdDu/GV5oXw80zVtM099Vv8ATtU+
+        Ievab4MsNQgsJbm1ilXT7jW0vrqWSR0s7K3uL54LlbY20vqWmxaxDp9hFCmmxxR2dqkUaJOqRxrBGqIi
+        rhFVVAUKgCgDC8Yr591TxrqHjr4p+DvCXhm90e9PgDUfFXinxwvhXxvcXmlWeqaRokHhfT/APj2Wy8Pi
+        TT9QvJPHw8XWPh68geeWXwjDe3dvBDFbSye8WN74tFlZhdD8Olfstvg/8JRqIyPJTBwPCR6/X8a87CxW
+        IxmOxFOuqlOH1fAwnDEUpxlLDxlXqyi4zdNfvMYqEkoRmp4eam2lG3rY6UsLgMswtSg6dWosTmU4zwvs
+        6kI4qVLC0ITToRrfwcCsTTc6k6UqOLpzoQi51ZVZ4/7Z+0X2f7Pz9ojz/r/+fO1xx9Pf9MUo/tr7dBj+
+        zwfst30+0dPOss8DHfHOaz0u/FhuL4nQ/D+TcR5x4n1I4xZ2uMf8UjzkY645yOcZLlvPFgvoCND8P5+y
+        XgwfE+pY/wBdY9/+ESHt27+1el7GVv4rei/5fUv7vl5d/wAlfyfbr/n2v/BD/u/3Omn3eavq3X9ueQ+T
+        YYzH2uB/y0T3pP8Aic/9Q/8A8j1Tur3xcYHB0Pw6BujyR4n1I/8ALROg/wCESGT7cfWo/tfizj/iR+H/
+        AH/4qbUv0/4pGkqMulZ9P+XtLy8n019fuD26Wns+3/MO/LryeS08vS9zT/7c+ztg2GPteodrg/8AL/c5
+        7+v5dKQ/219tm3f2fn7La/8APx0829x1z71S0+98Wi3YDQ/DxH2vUOvifUgf+P8Auc8f8Ij68frTWvPF
+        hvZidD8P5+y2gwPE+onjzb3B/wCRSzn14wPU0KjK/wDFd/8Ar7S8vXy6dWCrrf2f/lu/Lpyaf8D0Lsn9
+        s+fY4/s/P2mTGPtHX7FeentnuK0P+J762H5XP+NYD3fiz7RYH+xPD4IuZMZ8Talgn7DecZ/4REds/wCe
+        a0vtvi//AKAXh3/wqNS/+ZGh0ZaXqvp/y9peXp109G/UPbp2/d9v+XD8u0f6t6EVl/bAs7TH9n4+zQ/8
+        9/8AnmvX39altP7b33uDYf8AH2va4P8Ay52noRjjH8+9ZVld+LBZ2v8AxJNAx9nh5/4SbUh/yzUjj/hE
+        T+WePU1Ys7zxaHvMaH4eObpSc+J9SGD9jtP+pR54APbr7ct0Zf8AP1vVf8vaXl5Lrp6eVm37df8APtf+
+        E7027Q06fd6XuzjW/tVvuOn/APHvdYz9oH/Lay9c8024/tjyx/yD/wDWRY5uBz5qelU7i88Wm6t86H4e
+        GILnp4n1I5/fWX/UpdfbHPPPHMc914sKD/iSeHx+8h/5mbUv+eqY6+Eh/MUvYSa/iuzW3tqSutN7a663
+        1Xy6r28dvZ/+W78v7mttPut2v8xT6drf7NnxQi1XQ7BB8CvjX4sgs/FGlWEN3Pp3wn+M3ivVfLsfGdjY
+        xBpdO8E/FzW9Qh0vxrHZRHT9C+I9xpHi+S0hh8a+O9dsvpX4bG4/sPVvtJh3/wDCc/ETb5BfZt/4TjX9
+        xO/BLGTzCOMbNnO7IGs9z4sf72g+HW9j4p1LGP8AwkfYHp1zXlXh+6+I6aNdtoej6CQPiF45iuIVv7jU
+        Wkt5fiDqX2qd5bpPDa2SWqtqMTCJdSmlhWLUYYJbiBdEvzMsX7SeDr1oVKlenTnRrVaU/bTxSio+xq1a
+        STbr06X7udZTTqwp0nOEq7qVa15bhVyYqhSlSpUp1qdWlGtGGHhh+bndWEJtK9OdVurGCTdOVSaVqXJG
+        n6J8RTKugWJt445Jh4x+HpjSWUwRM/8Awn/hnaJJVhuGjU93WCUj+4Qans5vEHly/wDEt0rm8vyR/bt4
+        MMb643DH/CPngHoQfmGDgdB5Fq/iP4p6lLrFprXhLRbPQrPx38M/+EavXu7rTbu8tX+IekG6N/5cniCG
+        Se3P9nWcP2RI4rr7PqWrObS1u9HtLn1uyufEvly/8SfRD/puoZ/4qK+HP265yB/xTDZA9eM9cDoNa1CU
+        YxUqtONpyd41aLvzU8PJL3ubVJ2krJp8yeqOajiKblUm6U5J8kVz06yd4yqRbSha8W07Saaas07FmCfx
+        Ct3ckaZpRxa2hbOu3mAvmXuDkeHj6NkewPOePFtY/aG8KG3vpPD02m+Oda0PxR4g8JzeEPBWq3ut+Lbv
+        xH4Wit4PE+l6fob6FaTXkvh1NYsLvV54pPslpaXEc7TlZI93rs2pa/Z/2pdXGl6DDb2+mxXFxNL4jvhH
+        DBB/aEskrv8A8IxwqIrs52/Kq5rxT4PeELe08JeA/HVt4I+G48YeJfC9lqOreLdBM2l3mqr4otZfFeox
+        peTeEIdYOmXmrXZ1FbW+dX81YnmgjnQqnh4xY54rDYXA4rC0ozo162Kr1vZVatKnGph6cHh4xlGHtW6t
+        S3tounzRT1UZwn9Bl7ylYPGY7McHja7o18JQwdHDOtQpVKtani6s1ip1KdSp7FLDQUnh2q0edpRfMp0+
+        8+GWieLfDfgnQ7LV9P8AD9zr9zBNq/ia8tpU0RNQ8Ta5dza1r982nWHhxYYJLnV768lczG4vJCVlv729
+        vGnvJ/QLGfxH9is8aVpOPstvj/ie3o48pMcDw9gfQcVH9p8Sgf8AIG0Tt08R338v+EXH86Wxu/E4srQD
+        R9DIFrbgE+Ir/OPKTGf+KZ6130cLTw9CjQp1/wB3RpwpQ5qtGcuWnCMU5SknKcna85zcpTlzOTbbb8zE
+        4/65iK+Jq0E6letUrz5MPiYRUqtR1HGEIWjCmm7QpxSjCKUIpJJKNJvEBuL4nTdKybiPI/t284P2O1xj
+        /in+QRg54OcjGACRZvEIvoMaZpRP2W7wP7dvOnm2WeR4fyO2Bg5z1GBlkd14lNzfH+x9EybiPP8AxUV8
+        AP8AQ7XGP+KYJPHPQfpyq3XiYX0BGjaJn7JdjnxFfEY86xyc/wDCMDpgdu9a+yX/AD/j6e0w/k/5f61R
+        j9Ypbewemn8LFdLf1/Tvbup/EfkPnS9JAzHk/wBu3p/5aJ2/4R4fzpnneIP+gZpX/g9vP/mfou7zxP5D
+        50fQ8Zj6eIr8n/WJ/wBSyKaLnxKRn+xtE/8ACjvv/mXP86PZJ/8AL+K/7iYfuv7v9K4KvTj/AMuH03pY
+        rpZd/L+loJp0/iL7Mdul6Vj7XqHXXb0HP2+5z/zL3rnnuOeOlNabxCb2bdpmlA/ZbTj+3bzGPNvcHP8A
+        wj3rnqB2wTk4TTrzxN9mO3R9DI+16h18Q34P/H/c5/5lk01rrxMb6XOj6Jk2trwPEV8BgS3vOf8AhGTz
+        k+n480Kktvbx06uph/8AKzD29Ne97B/+CsX1t5+S3+Ysk3iAXFhjTNKJ+0yY/wCJ7eHkWV3/ANS/xxnk
+        ZPt1I0vP8Sf9ArSf/B9e/wDzO1lyXXiUXFh/xJtEz9pkx/xUV8Rn7FeDB/4pgY4J9a0ftnij/oDaF/4U
+        V/8A/MzR7JL/AJfR6f8ALzD+Xlv3+fcPb05a+welv+XWL8n38v8APUzrKXX/ALHa403SiPs8OD/bl4pP
+        7teo/wCEfOD6jJ57mp7OfxEHvdul6Uf9LGc67ejB+x2nT/inuRjBz65HQAmrY3PiT7Ha40fRSPs8OCfE
+        V8M/u17f8Iw2Pzqezu/Ewe926Pof/H2M58RX3B+x2g4P/CMc8YPQdaPZL/n/AB9PaYfsvLX8dbh7em9P
+        YPvpSxfS3n/XrcdcT+IjdW+7S9JH+j3WP+J5eEHM1lnk+HuD0x685Ixyy4m8QCMf8SzSv9ZD/wAx28P/
+        AC1T/qX/APPueCXF34mN1bg6Pon+oucY8RX3/Payzknwz9AMA9c9uWXFz4l8sf8AEn0QfvYf+ZjvT/y1
+        X/qWB/Oj2Sdv38f/AAZh+630v/wLh7emtPYO+38LF+Vuv9fJmp5/iT/oFaT+Ou3uPx/4p6ub+GbXjaHq
+        5vILa3f/AITn4hhFtrqS7Rk/4TfXyxZ5LSzKMspkjCCNg0aRyl1aRoouhN54oAz/AGNoX/hRX39fDIH6
+        15t4B1LxilxFZtomkL4fufGfxYOq31vqV1e3lpJF4v1abTnRZbLTIY4Zrxr2zlXbdzyKLSeNIkN15GFS
+        1Krh5c8ppylTtDkqaz5Ypy9lFuMYuzlKTUUrtts6aCVWjiIxhGm4KFS9T2tK6pxqNqHtpJTnJKyhFOTd
+        rJHYfERjHoFi8cLTMvjH4eFYo/LWRyPH/hnCoZXijBJ4+eRFwT8wpH11tN03UL+/0y8tLKxk1a9vbqa7
+        0dILa2t7u6muZpXbUhsjgiRnkbGNqEgmvJdU+JHiXxCdT0u/+GXinRLPRvHnw9t7G+u/KgfU1T4kaLCb
+        pG1GPS9EltZ0t4HtX0LX/EMu+WQ38NhZnTb7VYtR+GEHiI66NXvfjLeaZrviW91TUvD8njTw9L4cmsjc
+        6rb3nhU6RNqkls/hLU4L6a21bQpPMt72GOGORykY3b46njqNKH1alGpV9pUsvrGFjGLlRozhKblzuavy
+        xlGnJNXet0Y5fPLq1aq8XXqUaS9heUcJiK1SS55KcYxjKlGMlFtxlNOLlpdatc7pun/HP4j+ELy/Xxro
+        GgW/jfwPJ9gt9O+HukeI7fSYvEWsahf6NqSzeIvGenx6wsHg25i0efTNV0KC1utTeXVbuH7ODpEn0RAL
+        jSdP0bTLbw/dw2unJBY2scD6FbQx29pptxbQRRW9tfRW8CJFGu2GGKKCMBY4lRFUBthqd1aTSQW3hPWY
+        oIbOxhht4pvDKRwxRPeLHHGia8ESNFwiImAqqBgADM95rWoE2gPhfXR/pLdbjw1libO7AA/4n4579RwD
+        1OAeLB5Z9UtJ4jF1sROjSpVatfGyxPNyXk3ThiKtWFHnnOUpeyjC6cYP3IU4w7sdm6xrcI4TC4fCwr1q
+        1DD4bAQw3IqqhCMalTDUaNbEezpU4RhLETqyhepKLjOvWlUufb73tomo57f6RpH/AMtKWxv7/wCxWeNB
+        viPstvg/aNH5/dJzzqeeRzVP+2b/AP6FfXP/AAI8N/08QEn8qfY61qIsrMf8Itrpxa24yLnw3g/uU/6j
+        +fp0PrXc6VTrVn/4FhvL+7934Hne2ptfwluteTE+Vt310fz+Q5L+9+0X2dD1AH7RHwLjSOP9DteP+QmB
+        78E9exyKFv777dBjQ9QJFpd/KbjSOf31lk/8hPHHHvzx0NVE1m/+0XxPhjXMm4jyPtHhvIxZ2uM/8VAo
+        568cYPXOQHJrV+L6AjwvrhP2W7GPtHhvnMtkf+hgPTA9Dz0IzT9jUt/Fnt/NhtrL+7bZ/wBN6ntqf/Pp
+        bae5ifJd7dvv+7Su7+/MD50G/HMfIudHGD5iempk9fY/SmC/vf8AoB6j/wCBGj//ACzqC71vUPs758La
+        6OUyTceGv+eif9R7/D39ajGs3/H/ABTGu+/+keGv/mhH9KSoz6VZfKWG8u0fT9AVakv+XS6a8mJ8klpL
+        rovx8yxp1/qAtj/xIb9v9L1Dn7RpHU39zkc6nnjpn2pkmoXq3spbQtRH+i2vyrcaQf8Alre8kDU8HPOO
+        c8ZI7iHT9a1AW5x4W11h9r1A5Fz4bwc39zxzr+eOn4dxzXH+PNTvrrRNYtn0TxLpqXdrpFlNeWmq6Zp1
+        1bQXerG2nlhv9I8RRanZuYZpUW506RL2Hl7d0mEbBxozcknVlvr72Fv0vZKOr20XlYulKFWrTpqnGLqV
+        IQvKGItHnnCLdueF2k07OUb2tdXOzk1G8NxYY0TUOLmQ4M+kYP8AoV3x/wAhP/PTvkaX9pX3/QBvv+/+
+        kf8Ayzr84/BGv6/4sj1q50S08fate6ZotzJZaLqHxt8V6xrF7rGmal4astR1i30HwZ8Q7a50LwxqFvre
+        ow+HYfEevr4mvvsN7caho+lJpgXWPSJbnx0tjdlPgj8YW1C1SztUb/hfPxJNtd3941pA19DEPHhI0e0l
+        muJ5VW8lv/ItZBLHBC0d83fPKcVCTi69Jyi4pr63gI2clF71OVWV7SabUJXjLllCSWCzHKJxVS+PUfet
+        /wAJVaTfLJX0hj56tp2va+llbV/YFlqV39jtB/YuonFtDz9o0g/8s1/6iYP4EA+1T2eo3u+9xoV+2bsH
+        m40jj/Q7TjnUvTB4yMnH0+MNGk8fQTR6X4h+B3xX85E0fOpaJ8fviI2jhL1Fiu/JB8f3kpWzlhmuyksk
+        EkVrcWttdJBPG009DwnLfa7qGvW2nN47urjT9B+0DTrn40eOb67n1yG+8Mx6rfW2h+GviCuo2vh+xsdY
+        aKwj1fWP+Eg1DUbbVNMutLsJtGiudW8nMJrLZ4eniKlSo8U6nsnhZ4PFRfsoxlLndHnVNNP3HOyk3yxb
+        dk/Zy/C4TNI4qWHqTprBuj7b6zhZYZr2tTkj7P2uYr2tpJufJzckffnaCbPt241G9+12+dDv1/0e64Fx
+        pHP76xz/AMxPnH1HX8KZcaleeWMaJqP+sh/5eNIAx5qf9RPv0+uK+ULqDxMtpcSw/Cb4uT39obe2jRvj
+        l8SEW7e9t7RpLi3T/hPpVitLG6nSO8Vr2R5BA4ifYJriyiuLDxnYxz2U/wALfiTqmpCET2uoab8cfihD
+        oZe4trm6tYZVm8f3l2ZLSSO3sr11eNHu3c5sYDBNNxSzPDw3eYuyV3HL67WraSTWEs9YT1jeMUuaTUXF
+        y745JF8sVXwt3JxSeKy1X5VTlKd3nqShGNSHvSau5OMVKcJxj9i/2lff9AG+9f8AX6R257an/wDrrl/h
+        pLJNoesPLay2p/4Tn4iBUma3d2U+ONfYtm3nnUAOWjIZlJaNiqmMo7fMupw6s+keL4bnwR8XfC8+k+Bv
+        EGtJr5+NPxTv7Ky1K30a8vdOSLz/ABXHp99NvjiM0MF1fLaXAaC8iNv5Nzde2/D/AMS6uk9roq+FdUjs
+        NT8ZfFVrzWLqW3aHTzZ+LdavLcv/AGYdTtsXM872GL680yQ3MTPZx38JLrrGvSnKhVhOvKDr1MOuejKD
+        9o+WF/ZuhTqcnNoqtvZqzTlexy4jLnh6MowdGcpJVW1VoWVOlR9s3GpSx+KozlKnK8aXN7aWnJBt6+k+
+        MdD1HxDoUmnaRqdlo+pJqWharY3+o6VPrdhDc6Frum65Ct3pdtq2hXF3BO+nC3kSHV7GRVl8xZspsfio
+        fDvxohV1HxD+GB3zTzHPwf8AFfBnmeZhx8cOitIQO+AM5PNFFeld2S6JtrTva/nrZfceJZXbtq0k33Sv
+        b7rv7x8eg/GmOaSYfEL4XkyRxRFT8HvFeAIWmZSMfHEHJMzA9sBcAHOXTaF8apvK3fEL4XjypDINvwe8
+        V8kxSxYOfjieMSk8dwO2aKKQw/sH40/9FC+F/wD4Z/xX/wDPxpYNE+NUEMUK/EL4XMsMaRBm+D3ivcRG
+        oUE4+OIGSBzgAUUUARjw/wDGgSTSf8LC+GGZnV2H/Cn/ABXgFYo4QF/4vhnG2IHknkntgBRoHxpWdJx8
+        QvhfuSKWIL/wp/xXgrK0TsT/AMXxzkGFNuMcFs5yMFFAEkuifGqWMxn4hfC5QxXkfB7xZn5WDd/jiRzj
+        HSm/2F8af+ihfC//AMM/4r/+fhRRQAW+hfGq3j8tfiF8L2Blnly3we8V5zPNJOw4+OIGA0hC98AZJPNZ
+        +qeDvi3rMF1aan45+Fd3Z3tvHbXVpN8HfFbQzRRSSSKGH/C8c53yFs5yGSNk2suSUUXGm0002mmpJptN
+        Si04uLWqaaTTTTTWhzjfCDxyzRt/wk/wnXy3L4X4R+NAHyjptf8A4vvynzlsDB3qhyMYMn/CpPHH/Qyf
+        CT/w0fjb/wCfzRRR9/3vy/y/q7N/reL/AOgnEf8Ag6r/APJEcfwg8cRxpH/wk/wnfYipub4R+NCzbQBu
+        b/i+/U4yaI/hD45RpD/wk/wmbzH3gN8I/Gvyfu0QqmPjwPlOzfg5+ZmPeiij79PN+X+SD63i/wDoJxH/
+        AIOq/wDyQN8IfHLSI/8Awk/wmARXXYPhH412tvMZyc/Hg4K+XgEfws478D/CDxy67f8AhJ/hOvKnK/CP
+        xoD8rBsf8l36HGD6qSO9FFH3/e/L/JB9bxf/AEFYjT/p/V/+SCb4PeM7mGa3uNf+EE8FxG8M8E/wf8Zz
+        QzQyKUkimil+O7xyxSIxR45FZHQlWUqSK9e8E+H9T8NaENO1nVbDWtUm1XxBq19qGl6PcaDp8s+u69qW
+        tmO00q61rxDcWsVquoLaATaxevM0DXG6ISiCIopWV07axvZ3el7X++yv6X3InXr1Fy1K1Wot0qk5TS9F
+        Ju1+trXsr3srf//Z
+</value>
+  </data>
+  <data name="cbMultiChart.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        /9j/4AAQSkZJRgABAQEAYABgAAD/4QECRXhpZgAATU0AKgAAAAgABwEaAAUAAAABAAAAYgEbAAUAAAAB
+        AAAAagEoAAMAAAABAAIAAAExAAIAAAAQAAAAcgE7AAIAAAAIAAAAgodpAAQAAAABAAAAipydAAEAAAAQ
+        AAAA6gAAAAAAAABgAAAAAQAAAGAAAAABcGFpbnQubmV0IDQuMC42AEJyaWFudGEAAASQAwACAAAAFAAA
+        AMCQBAACAAAAFAAAANSSkQACAAAAAzQ2AACSkgACAAAAAzQ2AAAAAAAAMjAxNTowOToyMyAwOTozNzow
+        NQAyMDE1OjA5OjIzIDA5OjM3OjA1AAAAQgByAGkAYQBuAHQAYQAAAP/bAEMAAQEBAQEBAQEBAQEBAQEB
+        AQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAf/bAEMBAQEBAQEB
+        AQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAf/A
+        ABEIAJYAoAMBIgACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMD
+        AgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygp
+        KjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOk
+        paanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQAD
+        AQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFR
+        B2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZ
+        WmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfI
+        ycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/AP7m/B3hLRta0MajqP8Aa013
+        Nq/iWN3j8R+I7WPy7TxLq1nbRx29pqsFtDHDbQQwokUKKFQcZyT1H/CvvDH/ADx1n/wq/Ff/AMu64nw/
+        8QfB/hDSvDGi+JNctNH1LxVr/jiDw/DeieKPUriy8XakLm3hu/JNklxGt5DIIJ7iKWSHzp40eG2uXi1/
+        DfxF1HxT4f8AD/iTTvDVtFYeJNF07XrCO88T6dFdR2ep2dve20d3HDbXEUdysNzGJY4ppo1kDqksiqHY
+        /wA7fOydvWzTt2afUPLrZP5O6T9HZ2fk+xv/APCvvDH/ADx1n/wq/Ff/AMu64PxHffBfwfrUGgeK/FC+
+        G9RuPD2qeK1GueOPE+mWMXh/RtV0DQ9Q1O81a81yLStPhTV/FGhafbR315bT39xesthFdC0vTbduPE+u
+        nH/FPaZyEP8AyNdl/GcAf8ePX1HavH/Gvws8CfEjxFYeLPGfww0bXPEej3ejXGk6vcePLqC70q58NzXt
+        9okunNaGBbJdO1C/m1e3SBY4v7aisdaeN9U0zTby02ofV3U/2l1lS5ZXdCMJVOa3uWVSUY25rc2t7aJX
+        d0ne2iV+l9Fvr0fS/Tf7ixN47/Zvi0S68QJ8SvD91Y2se5o7P4paldajNcNYyalbaba6XF4na/uNYv7O
+        MzabpMVu2oX6tH9lt5fMTONffFT9mzTrzxhpt541uLbU/Aml6NqniTT7vxJ47s57ceI/DbeLfD2mWL3m
+        oQWus+INb8PI+pab4d0i4vtbuYVYLYh45FXF1f8AZ5+DusMtzqvwc0S8NrqFlr0SH4jaukMOpaXbw22n
+        XUVrFdxW0cthZ2NnZWSrEsdtY2Gn2UKpaWNpFDoeKPgN8K/Gl1HeeKvhLomu3kFxo8ttdX/xD1KWezbQ
+        NLttL0yOylEwaxtI7Oys2ubW0MFrqN9aW+p6lDd6jBHdr3QWSc0OeeauL5udwp4O8daXK4p1f3l4qspX
+        dK0nSaUkppr3+0bXVtW7rS6eit11V+m256loKfB/xRfXOleHfFdjrerWUUk1/o+lfEnV7/VtOSCdbS4/
+        tDTLXxLLe2LW12ws7lbqCJre7/0aYJN8ldd/wr7wx/zx1n/wq/Ff/wAu68W8C/Cr4e/DLxJd+KfA3wm8
+        M+HfEWp6dq9nd6nZ+LlaWay1XXV8R6xBtuIpoozqWuTpqV0YY0a5lig8xzFaWscXsv8Awk2vc/8AFPaZ
+        w23/AJGuy9Ac/wDHh055NcNf2HtH9WdaVKys68IQqX63VOdSNuzUvVDXN9q1/K+1l+Kd18r9ST/hX3hj
+        /njrP/hV+K//AJd15v8AFfQdP8KeEYtb0KTVbTUo/GXw109ZpfEGv38Rs9c+I/hTQ9Vt5LS/1S5tJku9
+        L1G8tW82Fygm82IpMkciegp4q1x1LDw9poAMqkHxXZA5hkaNsf6DzllJT1XnjpXkHxn8XXFz4fs/Deoa
+        Ollc33iP4b63a3Nrq1pqlsYNE+NfwosLuC48qOCaCd5PENnJb4ikjkSK63vEyRrLiM7/AMH+EdF1jQ11
+        HUf7Xnu59W8RpJIniTxHapstvEeq2lvHHb2mrQW8McNvBFDHHDEiKkagLXT/APCvvDH/ADx1n/wq/Ff/
+        AMu64nw98RPBvhOx8NeHvEeu2mj6r4o1jxwugwXonhh1GTTfEetXd7DFemE2Mc8FruujBPcxTPbRXFxH
+        G8NvO8er4a+I+o+KdA8P+ItP8NW0Nl4j0Sw16xivPFGnRXUVnqNpa3kEV3HFbTxRXSxXcayxRzzIsiyK
+        srhQzCd721s7O3R2Ts/OzTt2a7hfp13+Tuk/wf3Psa194K8JadZ3N9cRa4LezgmuZzF4l8ZXMohgieWT
+        yra21eW4uJNiHZBBFLNK2Eijd2VT4F4P+OP7JfjnwNb/ABH8P/FfSG8KXen3mqwT6x458YeGdZOn2N5q
+        unzXUnhXxNqmkeKoEmutE1VNPWfRYpNVSzkn0xLyBopZPe7vXNYv7WezuPD1h5F1A8Ewi8YW0EhiuUaF
+        ws0NmksL7XOJInSWI4eN1cAjwLxD8A/hn4o8OHw1dfDTTbOxTQdD8I2k9p46Vr2w0LwnbWtloen2r6la
+        ajB9nsk0rTLiNbm2uPO1TSdE12YSa7oukalY9eG+oNSWM+tqTq0uSeG9i4Ro++q7qQqpSlPWm6XJOKXL
+        OM1Lni6afNpa3W9/+3eVLt9q7afTTdnbah4x/Zy0q/s9Lv8A4oeFbbUb6e8t7exk+Ll4LrzNOsNV1O/8
+        6AeKjJax2Vjoerz3U1ysMNuNPuklkSSMpXOap8Vv2a9Ie6W68by3MdtrnhPw2lzofiXx14mtb7XvHEGr
+        XHhjSdNn8N6jqyX1/qiaFqqx2tuWmie2RbiOIXdk1zkP+zz8GGsdTsB8EfCSaXrFrNZanplv4xlttOvL
+        S9tvEmmy2sljbiG2FuumeLvEukRwxxrDa6Nq91pFskWmmO1TXtfgn8MrLS7zQLX4TaDBoeoXFvLf6JH4
+        8vRo18LdPErG0u9K3f2dc6Vev4x8UTatpMts+l61d67qF1q1ne3M3mjf/hHT1lmc17uihhIX9+DnLWc7
+        fu/aKMLu8lGTqJNxivf0+Hzbv52/G1/K/ka9n49/ZxvdQvNOT4jaJDJaRwTR3d38T9TtdL1OGZbjfLoe
+        rT+J007W0spbS6tdU/su5um0q7ga31BbaUorewf8K+8LnkRayR/2Nfiv/wCXdfK6/srfs/Lb2dkfgH4Q
+        mgsdL1jTLNbjxvf3TQaTrmpJq+u6Yk1xNLMLPWNTK3mqWhcw6hKP9LWVAVr6iXxJriKFHh7TAq4Qf8VX
+        ZYAC5AGLDGAMAADjpiufErBJw+pSxc4u/P8AWqdGElZRUeX2NWonzPnk00uT3YqU9ZN3d9UkrLrfWy5v
+        le9vIm/4V94Y/wCeOs/+FX4r/wDl3Xlfxk0Oy8I+CoNa8Py6rZ6kPHnwn0nzpdf16/ibT/EnxU8GeHNZ
+        tpLTUNTurSVLzR9Wv7RjJAzRCfzoWjnjilT0xPFeuOCR4e00YMy4PiuyBzC5jb/lx7kEr3K4PHSvFfjt
+        4unufC+n+G9Q0hLK6vvGnwi1u0uLXVbXU7c2+i/H34PWN5DceXHbzQTPJ4hsntsRSxSpFdb5ImjjWbnj
+        8cf8UfzQz0nwhfeEbLTdBTWbvw/aeIr7VPHVj4eGozWEOtXkL+NL2a/tNGE7pf3EbXMOly3dtYlg08Ng
+        8q+ZHbsMT4bNdW/wf+Ed7YvPLJp/w98HXU1nGkrNqNovhrTEvbNYyzs9z5DyT2CBoy2oW1pFJKsEk2dP
+        w14G8KeJ9I8P65r+jW+qal4b1jxz/Yst5Lcvb2LXvjHUJriX7D539nzytLp9m6T3VpcSweT+4aMPKH4D
+        w78KPBXxR+CnwU0rxZbajJDovhDwL4l0i98N+LfE/gnWNN1qy8LWdtBe2XiDwTqvh7Woc2t/eWs9ul8L
+        S9tbi4tryCaCV42wrqbpVFSjGVVq8FKpKjFyTTjzVI0qzjZpO/spp2SaSu11YFYR4uisfWr4fBuVq9bC
+        4SljsRCnyyv7PC1sZl9Ks5O0bSxlDljJyjJyjGMvoy2ngu7aC5t5kmt57azmgljLvHNFLtdJI3WTayOr
+        Aq4+VlYEHFZ2s30mmaXeXcCrLdpIYLCGQSKlxqN2Y7TTbZj5q7Fub6e3gLF1VBJud0UFh812nw9+Mvw7
+        1TTbDwj8VdJ8Y+F7vxFq+tXWkfGXwtp9/qb6dq4s7i18DeFPHfw/h8F/8Ipb6LfQare6Xq3izwb8Tr+/
+        s9ZbR5TEmhWD3VQ/GbWdE1LQLL40fB/xD4EGm6HrnjPxT4j8G4+LXwy0mbSDrllZ6TP4i0DRdO8XZu7P
+        T5vE2mXet/DjQLa4J0fT7WV9e/tHS9N4JZjGNNxxFKvg6rapc1WClRjN+zi6n1ijKrRpwUqnNBV50Zzh
+        CU4w5E5L6SHClbE1IzyTMMr4hopOr7DAYiph8zaj9aqRw8MozSjluZ42vKlhJOrPKMLmWEoVK2HoVMVH
+        E1oUX9E28l5okCadql5Pf2klokFhrN0P9Je4MboLPVGjEUSzzuT9hvQqpdcWVwq3ywS6r2IA3fe4M5/h
+        k6eVx/y0/Tr689fMNJ8T/Dv4o+Fb248GeJfDHijStU0COYX3hzVNK1Ix2ms6Y13YXX+i+a9tJcWd1DeW
+        X2hI3ZGjlVdprsNCeHUdLsbq4trJLth5N9GqRbYNQtka21G1G6EsRbX0Nxb7iWBMZIZhhj2UZxvGMKka
+        lKdP2lGcZe0vCLUZLnTlzpc0HGTbcuZpt8t385isPiMPUq08Xh6uFxdGr7LFYevRnh6lKpJOUVKhUjCd
+        KTUZc0OVKNk7JTSNVx++iG7rZ3WOJOoksunz/qDxjHJxiy2P3nzH764wsnH7sf7fH+TWa9pa+dH+4teL
+        S6OdkOAQ9kP+ePUjpx0yc9mpeIXh03RNbvoILMT2Om393BmOB1WW2sJJ0LKYl3LvRdwyMjit5S5Iyl/K
+        nL7lf9DmhFzlGC3lJRXrJpL8Wc/4E1S7u9PuYtRuXuLmbz9dtXkBMn9k+I7m61CyhZo/LjA066GoaPAg
+        USi0021lny83myeT/tCcXnhLByP+JF/eHP8Awv39nbszN9cjHWvVpdKstCg8PXkFvCLbSmm0C5DrFI/9
+        lX93FZwyt+7VDJbajbaVPNcysVgsBqLogMoWvI/j/FDHeeE/KjiTd/YOTGqDP/F/v2d+uyNDnvzmsMPz
+        Rh7KbcpUlFc0neUoOKcW+t0+aDbbcnByerNsS4TqOtTSjCs5NRjFRUZRdpJRjZLmXLV5UkoqrFLSzftP
+        gLTtPk0K01OWysm1G3v/ABjaQajLbQvd29rP4v1See3iumXz47aWa1tppoUlSOWS3hkcFokZfI9FOs6b
+        8F/gz4u0BtXvbzwb4B8J61d6Bo5up28TaC3hrSbPxDpDaPbOx1nUU0u4m1Xw7aRQS30niHTNMt7MOLq4
+        t7j1zwLqWn2vh2xtLi+sre7vNZ8WpZWtxcxQzXcieKNbdkt4nYSTFVwziJJGVfmIxWV8HAx+FnwmBSM/
+        8Wy8K8Fjtx/YOhjJ+Tr6g5GM888buN01tfqt11T+T1XRmdKp7KpGpyqSi/ejLacGrTg+qU4txbWqTumm
+        kzqtJ8XeGtasrPUNJ8SaJqNnd6Tous21zZajZXMM+k61H9q0jUopYbh1ksdTtVa40+5UmG8hVngeRVYj
+        zv4o/EG20TwnLaaLrdxa+IvEms2nhDw7eaXp9vqV5Yax4m1M6VDrNpaX0U9jdf8ACPW1xd+JLr7Vb3lh
+        bafpF7e6ha3Fha3ETeCWzQeC/jPrGlR2Vna+GfiBLq1v4T1YTIjf8JD4au7rWdW8CvC0cRilS+1H4ieM
+        PDsVr9oF3pqeJzKlmmiRPf7eoztrPxL8KaJBegQ+ENO13xvrFjDGGlF7rLah4Q8Ite3DRusFjeWsnj+S
+        G2QJcXl9o0U6TJDptzDcedDGVKtOp7qhKNedFy1a5XJezqJ6fFRlGomtLv3eh3/V6VLFRlBupho0PrkH
+        U5HzxhTclSrW92LliYPCzTV1O6a6mq+pSfCq/wBEuPCk91/wgmr3WmeHfEWjeJNd1jxBPp2t6tfGHRfG
+        mmatrN9f6lJqGs69dx6Z4xsL+9mXxHf63beLjf2ev2OtweNd3xD4p1i813TNWN/tsvBes2OqXUUU0lpY
+        zXF/aNpt6l8LeaMz2mkeG9TvtUmgu/Otzc3Wl3uC9gQMrx9FpNz4J8S2HiHTZ9W0XVdIl0fUdKsUvZbz
+        UoNYH9l/YLZbBDerPdPdpBFPbFJrZ5BcJJEYvMXC+GrXus/D6zsPEcdy+txtrHhvxk13iCe+8RaTc3uh
+        eI9RhEMcQXTtYvrW51PQZo4oEk0K90y4t4IYJIY1560pVJyw0Z7U44hRTsoShP8Ac8yVrRlWhzpK6fsp
+        xslIOac8OsbPmdWNaWFq1Ho60KtPmcnLVzqRpzqUardmoTw7bcm2/rGw1O31OGK5t5lwbKZZEbG6KQGD
+        dE43feGcq38SkMOGFGv6xaaBo+sa5qF3bW9ho1hearfT3EkcEEFnp1lLd3U888jeXDDDBDJJLK+EjRS7
+        FVBNeK+Etdv7W3027kZZrkafLa6tEDsjlvbKSOz1FMKm1XhvoLhY2jBRSvy7oyVbpvi/fx6l8J/GNvZ3
+        Gkwt4m06PwdZy6vGbmwi1HxtPa+ErGG+shG32vffa1BD/Z54vneO13bJwx9OnWU6SqR35FNJ7tcqkno+
+        t+979Tio0lUxFKhJ2U60KUpRV7KU1BtLW+julr8zzr4SWOseBtR8H2uq3uj7fih4Lv8AXfE6Wn2q0ik+
+        L+nTQ6t4l1PR7a9Z57qPxjZazqt5dx3UkN/p9v4LtJ5V1CXUNRubSv8AtJkmXwZ8yt/xMfB/Kj/q479m
+        fr8x7fSvRvilbyWfhrQvFdtaaZLdeAvGul+J1n1G4FrFp2jPq8/hzxtqMF0yBYbu08AeIfFZtQ7Rw3Tk
+        WN1LDa3U0iecftJEmTwWcKAdQ8H42kn/AJuO/Znx1UH9a2pLlmoavllC27VnbZtu95KT6eiNsXUddUsU
+        0lOs6sKvwpupRlFp8sbJKNCrh4JqMVJwk7OXMz0LR/AWleLdL8H63f3usWd34P8AE/jm+04aVqM9jFct
+        e+KNWiuLfUY4BuvLVlt4nSLcjwzpHc28kV1DBNHofBq3Q/Cf4UfvLg/8W28INkPfLz/wjuj9vPyM5PA6
+        Yyf4aqaF4d1vWtH8L32leKrvw/aaR4h8cSatY28LyprVtP4u1GSOIsbyG1gmge0MSzX9jrFr9ivdQjXT
+        0vJLTULGx8GoT/wqf4UAXQAPw18IEbPshX/kXdIOB/onc9D1ODjocv8Az/y/r5HH/lv83p8t/n6nol1p
+        lpe20ltcedLFLFAHRpL/AP56blIYXAZHRgrxSKQ8cgWSNldQwytF8Ptp8+oT3Wo3Go3F7eqFupUuoriO
+        xtLNIbOzkZLk+d5Tm7u5JAsKPdX91KlvAspStwQttH+l/wDLOD/n05+bp/x6dsdOvvzw2OFix/0sj9/J
+        xmz4/dc8/ZDkE9D78AdKhwi5xqNe9FNJ3fVNarZ2Tdrp2u2rMtTkoSpp+5O3NFpO9nF6XTau4xbtbm5Y
+        3vZW8c8dfs+/Cbx3ca1r+s+FUsfF+saHa6TffEDwhqHiDwD8TG0vT7uy1Wx0yH4l+CdT8P8Ajq20221P
+        R9KvEsIPEMdk82nWnmwPHEiDhbf4f/Gnwf4g8RWvgL4vR+JtLvfFeheJIfC/xj8PtrFrovhS/TW7fxJ4
+        Z8H+LPA0/gvxHa6hNqKWuqW2ueOofiZdxGD7HefaJtak1Ow+mp4WFtN/pR/49G4H2Qkfu5SBgWgJP456
+        +nODrUDWep6JrAu8Kl/Jol3IVtX8uz1wQLCyIlsCZX1y00WAPtdIoJrhnQLmWLixGBw3MsRGDoVY1FKp
+        Vw054edSMnOMvbSouHtoQdWdblre0gppz5eezPosDxPnVLDrLq2KjmWAjS5MPgM5w+HznB4Xk+qy5cvo
+        5lTxP9mVa9PBYfByr5Y8JiXh4Qw6reyioHi0Xxm8R+HbjTbX4t/CLxx4MlvL/wAU6cuveDJdU+LngW00
+        3RoNFvbLxFq+u+F7C28Q+HdH1uC6uo7e58TeDdFi0+80fU4tWksrd9IvNU7XTPiJ8Ovij4Ps/EHw98aa
+        B448Oa1qWiW0d/4d1z+2LO6sbrxXF4d1WCYWl5K0TQ3VjrWkajbTpHNZ32n6np93HDdWN3DD6e0TedEP
+        tZP+h3OT/omG+eyxk/ZMDPJA5JGcHGQfDvib8Cfhd4+8T+G9c8Q+GNPbxgyap4ci+IOgSv4P+Jek+Gbr
+        Q9ZuLvTdC+JPhH+w/Hfh+wk1Oe2maPRPENiq3kwmAEzl2zr08fSpSUK9LFxly0+XFRVCreo6dNSeIw1O
+        VK0W5y5Pqa5uaEXVgoSlPpw+J4Vx9am8XluPyCrByrSr5JWebYDlofWq/so5PnOLpY5TqJ4al9ZfE040
+        Y4epP6liZ4hex9sbTrS9sbu0ufOltrqPVLe4hM19tkgmuJ4pI2K3CkCSN2U4IIz13DNfPf7QEQivPCe0
+        yMD/AGDkyPO3T4+/s74/10j4PuuMjr2w1vht8a/BsV9N8M/jOfE9kmnaPp2j+CvjbpFj4k0/T/7EksdO
+        1K4h+IHhmx0T4hXN/wCIrCxur691PxleePrhPEOp3Woxp/ZgttFtk+Pyut54T3yGRj/YOf8AU4GPj7+z
+        tnHlQxd8/eycAdOc9tGpObl7TD1KE42XvulJVI800nTnSqT5o6OSU1Tmozi5U4uTS8XMcDhsGqEsJnGB
+        zWhXc3H6rDH0a+GkqWGqyp4zDY7CYV0qy9uqMpYaeLwlSth8RHD4vEUqUa0/S/D3gfwt4p0jwzq+vaNb
+        anqPhbxD42vdAuJ2nV7C5v8AxBrljesgimjjlS8sme0uIbmOaCW3kkjeNldw1f4WvYaZ8HPhrqN1bRLb
+        WHwn8PX1ywijdxBa+GtHnlcAqNzBEbCZ+ZuM12fw/wCfCkQwTnVvFnCnDH/iqtb4U5XBPY7hg85HWvJP
+        D86p8C/hNp4B3614D8DaX5UjER3Fs2jaJe6tbyfMcpPollqcW0jbIWETFQ5YXVm4U5y6xi+W+3Na0V85
+        WR5sUnJJ6Jtcz/urVv5K7OA8WeE7DW/C2m2mt2cS3MOqaBqV1d2rJDPZaxcaii3mvWd2kYe11DSrzULn
+        XrG/UAWuoWkF2wEcbqdTwf4P/wCEfTU7rUtSk8S63rWqS3F/rN7p+l2Ej2tmJbTSrCG0022t7WG3sbRd
+        0m1D9p1G51C+UW8V3HZWvUahZLqOnXunv50a39hLZtIrZKLcxSQlwPMxlA5bnrjHINRaNdtqGl6bfvBJ
+        C97Ct08IkJ8l7hHleIkuCTEzlDkZyMkZryoUoU61uXV0oOLd226V6c2/NRnSSe6TaW5u8RWeHdLntTlU
+        m5QtH7Xs5pRdueMXOmpTjFqM3ClKSk6cOXM162t5U0eya0hVL3WtNy4WPcp0tbnX0ACr8yyy6RHbyZIH
+        lzu2cgA8rocFnoXxJ8Y+HzDceX4qtNM+IGlR3cayWLXNvZ2vhHxXZ6LJgx21vpv9m+EdW1LT9kYGp+MJ
+        dTSS5l1O7W06+cedr1uqK+3TtGkkuFd2+WTVr+1jspI1LspYR6RqccjZDIsqqu5ZZMcv8QZV0K88H+NW
+        vbiwtfD/AImtdI1xcCW2vvD/AI2Fv4Zlhu2ZpP7PttP8RXfhnxLcaqiobS10CeK6uLXSbvU50LJyqVbX
+        5KsVe3/LuEIqf/guU6rkn1i1o1pph/fl9WS5niKEopJXbqykq1GEUlK8qk6NKns/dqySWt30Wm20Fvqm
+        sacbWHaqjVbaIRReXHa6qkYlG4JkySaxZaxcyK24qtxGVcI6pHneNb9LGHwjo6HTrYeIfid4AjWG6s0u
+        zd/8I1rdr47vLayh2FVv5dK8J6gYrp8CyjSa9yHtkZbup2VvZa/pfiRY7gSvYP4cviLq58v7DqF5bPYS
+        m0W4NvJNb6ubeBJzF5kNtqN87yeSrAYfiyVpvHXwq0uG7NvNFr/ifxNPZm3NzLf6ZpPgXW/Ds6rMSy6f
+        Fbal4y0eeW8DRyvIILBWMd9MjODnCM4P3XGqoxcXdyp1ai5XblSS96UFG7V4O7to6w6i8RSqxlJuFGrX
+        1ja1XC0KlS2jnzJOkpuTSumnZfEfUP8AZmheIdEvLC/0rStZ0fV7XWbG/sL+ztbyw1HT7yae2u7G+srm
+        GW3uba4t5JLa6tLiN4pYneKZGRmU/O37SEMcMng0RwRwj+0fBwPloq5x+0d+zRjO0D1JAPTJx3ruNK8T
+        zeH1mWLT9S1uWddWkt9B0swzapqE0E7krp0dxd2tskpJjikuLy7s9Oh8xJNQvbWBftEfCftFSNMngaZ7
+        ae0eW88FyPbXLRma3d/2i/2ZmaGXypp4fNiYlHMUskRYHy5JEwx9WjVjUqcq+OMoc6s7Ru9FzWtfra/M
+        lq1qm+Nqfs4yb9xylyrmXxWjeXJe6TXKuflSlaybcWl63ocPiufwboq+ErzSbKdfGutyaw+rQT3CS+Hk
+        8Za8dVgsY4MMdRmj2La+ZLbx53Zurc7ZBH8Go7wfCf4UjzEU/wDCtvCOA0UhOP8AhHdIzz9tJzyCeTj3
+        qbQdQ8Qad4K0t/Dvh9PENzdeMtYsb2CTU7XS49O0m78c6xFqmtSS3Qf7Qml2ZlufsVtFPeXTBY7eCZ/3
+        bVvgyLgfCb4UgQwcfDbwhjMhHH/CO6Rg8WQGem0YHHp3vv6/otvL9b9bkf1/X9foenCO82j97F/q7fJ8
+        mXpv46XmPx9umBTY47zccSx8TyDmCTP+q5BH2z/IHU0g+07R+4t/9XAT++P9/g/8eXXrn2zz1pI/tG7i
+        C3/10g/1pH/LIZ4+xcYPA460ANnS7+zTEyRY+yMR+5l/uS/9PnT8PwxUGq6Zc6pp97p7zrGLtJ4BNFDI
+        JbeWSBhHcwH7Ydk9u+2aFxho5UV1YMualm+0fZ5v3EAH2RiP3p/uS45+x8fUnGMcirA+0bv9Rb/64/8A
+        LU8fu+R/x5dP844pSSlFxkrqSaa8mNScWpRbUotSi1umndP5NddO5haPeXupWWn3MxhiujYXkN9AsUpW
+        3v7S4trTUbVGN2C62t/BcQeYPlcRh0LoyvUVyl1N4ssQssbGx0TVDcEQyfun1O+0QWOVN4DmZdL1DawJ
+        wIJASpK5zkuG0TW9Rt7qJIrLUYH1aykH2iSFLiY2ttqVnEkGnSJF5c1rDqUhcq1xcavcyYLrM729Jllv
+        9c17UoYoja/ZtD0pGkNxFvmsf7Uv5pYhLYIZISmsW8O5FKefBcJuZlYDk5+dUqLknUVVRqK65v3N5+0a
+        etqkqcXore+ltv1cvI61WMeWDouVPS8V7fkg6altKVOFWcXa7UqcnpynRQJd+VJiWL79/wD8sZOgvJsj
+        /j99fr+PU/Of7QKzLeeEhK6vn+wSNqOmMfH39ncZ+aeYHPsFxjvnj6Kg+0eVJ+4t+Hv/APlsc4+1zetl
+        1GOAcY9ug+dP2gPN+2eE/MSNP+QFjy3Lf819/Z2zn9xDj825zXYch6bovhlPE3hHQo5dY1/R00fxnruu
+        58P6lJpk2omw8UeIVGl6hLDG88+lXYnb7Xa27288jJC0VzC6Bq5j4deEdO8QfDT4J3V1da1FJpHw10Ge
+        0ig1C+S0a5vfDOiWpnurQuUuXgheVLVso1uLi4EbL5jV6d8Pv+RVi5I/4m/ivlRlh/xVWt8gYbJHYbTk
+        8YPSud+DhP8Awqz4T/NJn/hWXhX/AJZHPOg6HwBs5x68jpk81M4RqR5ZxUo3jKzV1eElOL9YyipLzSKj
+        KUXeLs2pR+U4uEl84ya+ehg6n4euNKKmYXUluRDsuIp70xkM2AGHmZic9NjEZOQhbGa8/wDDUE9nJqul
+        ag2JI9e1rUtNa2n1ICfRdV1K9vbdpPNl2/a7S5nubK7ihPlxLHaS7Uju4A31MyrIixybpEaOEMjwbkYF
+        sEMDGQw9jkHj3ryzxT4Nb7ONa0HzPt+mXF/dx2BTAu4N0xvNOilIGBewoPKilfyY7+Kyun3i1SJuLEUH
+        HlrQcn7K/NH+anJx51ZfE1yqUVb4opa3Lpy0lTajapy2k1rGUW+Vp9L3cZf3W3ukeaWEMU9/4gu2NzuS
+        503TIJRPd7Hs7GzgufLB80qxg1PU9UjZuqyb4mAaEirXiHQLLxFoet+H7uS8S11zTNR0i4dZJ5WS31LT
+        ZbOWRYrnzbd3SOYskc8UsLkASo6bgdXwZoOpat4Y0zVYYpoLXW4R4gg+3QSWUsMPiC9n1mK3ltZoVvIp
+        bZL5YJEnt4pt8Tb4omLRp6Pb+Cxu3XeoTE+aAY7a2Ix+5HAlkQ/rDnnn2zoU5VKUHy3jVTqN7JxrN1NN
+        rpqejWjWw5udKv1hUozjG+qcZ0bRv3TUoX2Tv0Wx8+eC7s+LfBOlS63cRXmqTaPqegeKjpVxqMennxNo
+        tzL4b8XW1krXMtzb21v4g07VbWOG4lN5aiIQ3Wy6jkC4WiPfeLPi7p2gabqc82teDvAet2/iyx8m4axs
+        LnxZr3h5NH8QardJLHLaSXVr4I1m70Dw/BNFPrFlqj3E/wBktLRdRtfVl03RPhp8QpotR0+O38IfEye1
+        n0/XJI2ez074kyw2GjS6LrqEJBpo8a2lno58L6iIRpup+KbTVdC1C4svE/iTwlZeK+h+G8Om6l45+K3j
+        LR3i/s+913R/A0T2Olw2tne3Xw70+9s9bvjeRW6yatqFn4m1nXfCWo3LTSx2UnhJNFRYptLulKeFnKVB
+        e0UeVqFZK7m4QXOpJ6JS5407S95RVSVve5behaEPrmJUH7KdB1sLp+7jUxNWnRqUG1o3TpVMRDl92Unh
+        1O3Jc63wb4L0jwppr29rNrGoXs0upPfazql/e3erag39o3UsYuLoFAsFuZnjtLKBIrOzjOy3hTMhfw39
+        pCNEl8HFTMSdS8H582W4kGB+0f8As0YwJnYDr1UZxgE9K+orcnym+eQfvNR6RFv+XyTvsIPqcdDxx0r5
+        g/aTJ83wbyzf8THwf95Nv/Nx37M/bav+cfj6dCnCl7KnTiowg4xjFdEmkvNvu2229W2zy5zlUlKc25Tn
+        JylJ9ZN3b0sld9Eklskke9/DwE+FIgOCdZ8XAHkYz4t1znIIP5EH0NeXaPp3xB+H0fw0+HKeKPDupxHQ
+        ZfDen6unw28QPbwJ4X0ezFvLrNwPirGltLfWdowjEMchuLtGEcCQo7Q4tl8ONY8Sx3Gs6ZfeINLtLnVN
+        aiS0074y/E7w5a+bZ61qFndXKaLoTR6TYNe3UE95JFZrsMk7O7PKzubf/CmvExIJ17xaSOh/4aA+MmR9
+        P3vFP/NfdfX71p5Enqa6P8UQqg+MvAZIjtlbHw78SgFo3JnIB+KpIV14iUkmNssxkB2jnfD158RPEFxr
+        8Vr4p8HQf8I74ku9Du2n+H2ulbmWHTrG7M1o0Hxam/dj7fFGxuBDMJYbhGtlQxStx/8AwpvxP/0H/F3/
+        AIkB8ZP/AI7Sf8Kb8TL/AMx/xaM/9XAfGQZ/8i+/60f5fjda/ddW8/IDsfFknxM8M+Ftd12bxF4Y1YaT
+        otxc/wBm6H8KvGGrarfTwQTN9nsNNsfidc3V1LcuY4oYY4z5eWkmlESvInRrpPxOJVx4w8C7TN5mP+Fe
+        +JN3lNDt27v+FqY3+Yd27bjy/wB3jd+8rys/BzxN38QeLce/7QPxk/8AjtA+Dfiftr/i38P2gfjJ/wDH
+        aAOmuL34jxeNNM8HHxF4V+23/hLXdeTVB8MPFP8AY6rpmqeHdOeza/8A+FpGIXsj6olwtgZPPa1iecZR
+        WdOuOkfE5fMYeL/Au0urgD4e+JAfLWMBlJ/4WpjeXDMH4UKwUrlSzeV/8Ka8TE5/t7xaT/2cB8ZM/wDo
+        2l/4U34n/wCg/wCLv/EgPjJ/8doD+vyv971Oo8H3nxJ8V6Ncapa+I/CenJHrfjLRBb6p8NfElvcmfQfF
+        WraF9r8gfFbP2S7fTXvLdiwe4tLi3l/dMzLXF/GTwz4oXRrHxL4i8Q6Dqaadrvw50OystF8MalojBtc+
+        N3wlv7m6ubrUPF/iQTrEPDlvFBBDbWhBuJpJJZAI0W2Pgz4mHTXvFo+nx/8AjIP5S1y3jD4czeGdLsNa
+        8UXXinWtJtfFvgOL7DP8aPihr8H9qX/jjw9p+g3s2ja1cJpeow6Xr11pupy294WjZLMkRyyKkbn9f1/X
+        zYHuHhmw1i/8JaUNF1s6HNbeKPEd1cubC31CLULOLxTrwl0y4inaN4oLlmjaS4tJre8QR7YZ497GuA0i
+        w+Jvw/Pw1+HUfi3wjqUS+G7vw9Yaunwn8QtBBF4V0vTPIl1mRPi8iWr31nblUeKN0mvgY4440YmPMsvh
+        vrPiSO41jTb7xDpdpdaprSJaaf8AGb4n+HbXzLTWb+zublNG0No9KsDe3ME15JDZr5fmXDuzPK0jtbPw
+        a8TdTr3i36n9oD4yfz836Ua9Py/4K/roH9fiv+GPTRpPxd2p/wAVt8OOEtgf+LX+J+TG+6Ygf8Le4DqA
+        Ixk+W2WYyDC1znhy9+KHiFtYS28XeAIT4e8T6tol4Z/hlrrpcTWyiYyWjW/xjlIixfQI32lIZlmiuIjb
+        7RHO/Kj4OeJu3iDxb+H7QPxk/wDjtA+DXiYcjX/FvuR+0B8ZP6S0f187rX+u/kH5/wBXOs8Uz/Ffwt4b
+        1bX7nxN4O1WLSrKO7k07QPg74x1bV7xreTfLFp+m2XxZnubueYsqwRKgSLDSXNxFbiW4h6IaX8WyS6+N
+        vhwVabzB/wAWw8TZ8sQBAuf+Fu4LmUb9+NvlnYF3fPXmB+DniXv4g8Wfj+0D8ZP6y0o+Dnibt4g8W/h+
+        0D8ZP6S0AamsReP9X8Q/8K31vVvh/q0Ws+B9V1G9bUvgt4lv/Cd9p63+n6Ne6TeSXXxZlsbqef7eHn0e
+        fe8lhIHkVonyet0zwv8AEnQ7Cx0nRfEvwr0jRdKt7ax0zSdM+Euv2Nhp2mWVklpZ2FjZ2vxZitbS2tEj
+        SO3gt4Y7eC1jjt4okVAR59/wprxLnJ17xbn1/wCGgPjJnj383tR/wpzxN/0MHi31/wCTgfjJ+f8AraVt
+        b2V9r21t2K5pcvJzS5OZS5Lvl5uXl5rbc1rq9r2dtjo/Bt98VvFehf2xa+J/BOmxvqfizTltdW+E/ie2
+        vEl0nxNqmj+fLB/wt8lYZ3097mIZzNbzQyBo84PA/G/wz4vXw9p/iTxT4k8OaquneMPhNomn2fh/wlqf
+        h0qNd+P3wXvbq5vLjUfGfigXBi/4Rq3jgightMfaZmkkk2oo2x8GvEw6a94tH0/aA+Mg/lLXHeOvh7J4
+        V0bT9c8VT+KNd0m28Z/Dq2SwufjN8TvEVuutap8QPDOleGdRm0XXbhNJ1CLR/El7pOryQ3hKBbEyJHLK
+        kcb3D4of4o/mv6/Vk/1/kvl3672Wx9I/DtlXwrDuIH/E68Wnkgf8zbrnrS/8LN+Gw4/4WD4HyDg/8VZo
+        PBHBH/H/ANRXn2jeCr7xHaeEtdtvGfi3w3D4a1jx8bjR/D97b2+meIje+NLmaNNftLy2vre9hsl0+RbY
+        LapdR/bLhI7tLee6trr5w174n/Hn4Z+E/wBkib4cfDzwd4y+F3iHwhpuifGDxV4t8dt4NvfAVzeeD/Dt
+        r8Nm0q2tfCXiG61O38V+MLqPw7ez2+kanNY3VzpcctlaWV9c6zpkNtciUZzlUrUaEI04SqScq9WnRptq
+        KfLBTqXqzlanRpRnWqTjTjKUbjGLhi6tSvhcNQwWXZjmeIr4zFUMHRjhsrwGKzHFQjUxFSnGrip4fCTh
+        gsHSc8VmOMqYfL8DRxGNxFCjU+0P+FnfDb/ooXgf/wAKzQf/AJPr5o/aMgv/AImWegf8Ko/aR8L/AA01
+        XRrTxQXu7f4h2tlp1/qGpWmnR6IdZ0zTHmfWLXT57S5mtP8AT9NOl6lPaajeQ+KvD0OveBPFW7/wuH4m
+        BwB4K8D+XvjUufipq4kES3UAMgj/AOFKlS5smuZxF5qqbmGC087yrmS9tKVx8Zfi1FZXMtr4B8ATagsE
+        s9vat8XNYS3lvPsunlLZ7o/A4MkLXUuqxfaTAGMNlp05gRtUuoNG9qhlma4arCvTwsXOm24+0+rVoaxc
+        HelOU4z92bsnGWrTSbR8CvEvgedorPqXvtRu8JmEI+84pNzlhFGKTkm5SajGzbaSuebPY/F2bwP8S/CV
+        7+1z8Nby/wDE9roml+APEo1rQtM1v4e2tppl1FrmtHU9AtNHvPEOv6xrK2+owfbJYLLTLC8TSUW6k0K4
+        1PxdN5vx3mmuL1/2wvhNYyXl0k7aRbQfDm70fSrebxHqN1eWGkTXHhWDWZYrXw5caJp2i3WsXupXEU+h
+        64urHVp/Gml6t8ObPwy+Of7SutfDjw9f/FX4TfC7wt8Rr3Sbn/hJfD2j/GPVLvSNN1JZdYjtIoLq3+Ee
+        uxeXcQRaHLcLBqurJZNqOpJHe6idJt/7X9IPxj+JfmNt8FeCDH5zlSfinqwdohLfRxsyD4LELI1tHps7
+        xh3WOe6vrZZJI9Pt7vU9aVLOa1KFVZfhlGv7PExjWy/L6VSHtKdL3Z0a1ONShJxjD21GcYSVTn9rD2kq
+        nN05hx7wVl2PxuXVuI8DXrYDFYnA1a+XSxGZYCrUwteVGdTBZjl9HEYDH4Wc4OeFxuCxFfCYmjKNfDVq
+        lKpCo1+CHiXxh4ah8Qj44ftG/Cf4iTXieHP+EeOhXHhTQBpElrpAh8SNdPZrpi3o1TViLi23237hIZJo
+        hZw3qaTpnvH/AAs74bf9FC8D/wDhWaD/APJ9fP4+L/xPaaFn8FeBVQR+TKU+KusO6rNLpHnPGp+CcSyG
+        GP8Ath4o2aITvZ6cjyW66pdPozv+FyfFLyy3/CDeA/OKK/l/8LY1gxCb7HAzRCY/A/cYhfG4gWfyFc2k
+        cN4bdZp3sYMauVZpWqOpLBwjKXLeNL6tRpq0YxXLTpzjCN9G7JXbcndtt8i8S+Boqyz2Fl1eDzST6dZY
+        Nvqj37/hZ3w2/wCiheB//Cs0H/5PrzP4w+LfCviLwDLb+H/E3h/XJ7fx18Hpp4NH1nTtTmghb4v+BkEs
+        0VlczvHGXIQO6qpYhQcnFct+y18SPi78T/h5rmq/Gzwj4c+HnxB0Tx54z8OX3hjwX4iuPFujW+lW17Bq
+        fhm9XW9Q8M6Mbq51Pw5q2l38r2sElvNFPDdSR6RfXN74b0V37QKMt74TLSyS5/sHHmLGMf8AF/v2dycF
+        LeE856Et07V40XJpOVOrSk0m6delOjWg39mpSqRjUpzW0oTjGUXo0mfoNWMKdSpClisDjqcJyjDGZZjs
+        LmeX4mMW0q+CzDA1a+DxuGqL3qOJw1arRqwanTnKLTPdfh4f+KXgHf8AtjxVx/3Net1E/wATfhsyMB8Q
+        fAxyDwfFmg4PH/X+e+O1cFofgi+19PCviS38beLvDsPh3UvHqS6HoF7BFpGvtqHifVI1OvWF5bX1pfpY
+        iJprLFqt1DclSl0LV7yzvP5nP2lP2sb2x8G+GfhxrWmeMvC/7RPha30a08FXmhT+ILLxdfWt1b2w8B3P
+        gOPTJI72aw1LTTpj6A3h+ENqPmeZIs2ozXW76vhDhTGcX5jPAYWoqDpRU6s1BVp06U24rESpe1oS+rwn
+        aNepGcpUFKMuSXNFPkxFZUI8zTktNtNbu8f8VldbJt2voz9n/D/gr4zeG7/UYtP/AG0fCX/CN6v8W/F/
+        xM1LT9Q8b2ninXP7B1fxJ4U1Hw18LtG8SeN4PFB8O+EfDuh+G9Y0of2LpFlb3R8a3CzaNKvh2Sbxb0+j
+        j9oW2uPB0+q/tlfC/UP7E1bwvJ4stYpvhZa6f420ez1bx/feK4Z4ovhpHqWhXWs2GqfDzRtPGjazALC0
+        8Mavc/av7S1dr1vq/wCB8/xBv/gv8Ib74rvc2XxRvfhf8Prr4kWYt7CL7L47uPDWly+Lrdore0NtC8Gu
+        vqEbxW5METqUhLRqhPn37Uvj7xj8LfhFf+M/CWg+KvF0Wma5Gvi3T/CdvcT+JbPwhcf2lDqOraRDo9od
+        XaSwvG0yS9m0wfa7DSmv9SV4IrOW4i5YVsbisyeWpZTWr18WsHGs8Fl7o1JqcqEZ08TKhG8Kl0o1OZc8
+        FS19ym404wUXO00rc1lKTa62sn0bvZaXV9DzW2uPix/wk+vz61+1R8Ltd8E6tqHiz7B4dg1Hwf4ZutJ0
+        HU/Dvi2x8PaXa6romgjxBDfab4gv/CWqDW4/Ewv7Gy0e+t2bWLudbubhND0T9obStDsNOT9uD4bQS6Lo
+        UWm2cN4vw+8WNq13Fr8l0k+peI9a8N2viGKW28KWmm+GrbVNRl8U6pealfaz4s8Qya9fLaWbeG/sIftR
+        eObnwx8b/Fvx+8Q+OPD/AMHoPFXh7/hSmsfEnTdevvFuq25i1qTx8mnf2hpd/wCLdd8I6FcDwzDZazPF
+        d6ba6neavpVrqLGzezsf1b8DeOvBfxM8OWXjH4f+NNP8X+F9SmlWy1vQbqwv7GWS2/cXdq8kNqWgvbK5
+        jltr2xuVivLK5jkt7qCGeN0HZnmBzXIMXicFicPgK9LDTwtCWLoZbhp4CVf6usRGkqrwyo/XKcMROli4
+        a1o1aU6c5SdCMozTcK0Y1E5xu3JRcmpL4YO6u/dfs4vl+Fv3rXk2fCl5p37SZvNSvrT9tv4XrcX2m6XY
+        2scZ+G1rp+mNp3jPXdQlvI9NvPAevw3N9qfg3UbHSry4SWxzqVlb74riGyhup9vyvj9c+IBd6j+2P8K3
+        8Ov498P+IG0XSJ/AWi/ZvBek+MdZ16/8G21z/wAIlf6tLPrHh8eGPC11rN/rdzutLXXpm09p9Vie2++W
+        ibehN5c/8ecxJ8u2zuzD/wBOnT8PSpzE24gXl194YzHbY/1Z7/Y+Ocfzwea8R5nXa1oZfdJpSWW4FSSa
+        S0aoK3Lyrl5bcu6s229PZqzV52b/AJ533vu5dXv3Wj00OZX4m/DYAD/hYXgfp/0Nmg//ACfXk/xw8WeF
+        fEXw68jw/wCJfD+uz2/xJ+BUtxDo+s6dqcsETfHL4doss0dlczvFGzkKruFUt8oOeK7b4Y3nxH1Pw/eX
+        XxO0nS/C+vHX/E0dlpfh7U4tbthoMOqSR6Rc3V4+nxqL+5hDyyxxbkMRt5pI7K6ln02z8i/aQQrN4OYz
+        Sy51HweP3qRLj/jI/wDZoPHlwxE5PruA7Yyc8kqbpV3TlKEnCpyuVKpCrTbUrXhUpylCcX0lCTi1qmUn
+        otGvJq34Hd6VpHxD1C08G3fhLxZY+HvD2na548k8Wadd6XZao+vI/jO7axtkW4svtNtHFDDqSSzWWs6X
+        IDdRlluNimJ/w30Sx8S/AzwB4e1mCw1HRNe+EWgaPq2n3Noz297pup+E9Nsr6zmVNQG6K4trieB9rAhH
+        O055E2kXvj200vwdH4T0jQ9T0S68T+OIfGEuqXs9leabYf8ACVaq1neaWYpCtw5lE8N1A9rcOI3jnhBa
+        Fra70vg083/Cp/hRiOIj/hWvhHrPPn/kXdI6hrTdnsc85BzjjOSbVmtGnpbfS2vf080xOMZKUZJSjJWl
+        GVpRcWrOLTutdbxfR67n5zXfxFsPBnxI8T/AjXvGenan8R/AtjaarLZXOraK3ibXvAmpeSfDPju90nTJ
+        Ynt/7St7m1sNfkGlaRaQeKYtQSx0630a70Oe93v+E7H/AD8j/v5/9evqn45/szeDfimmpeNdE8PeFvC/
+        xtj0XT9P0f4oWunR22v6lY6XNPcaf4Q8ZarZaX/aXiPwRNJcXUD6PqL30eiSX8uueHorHXrazvY/xZ8O
+        /HHRvEviP4leD7Se8tPFPwi8fa78MviDomoWsttNofjHw5ObfVLCK6YNY6taLIrNaarpN1e6dfQ7Z7a4
+        kidGb9ByDNaWPpww2Mr4anmUqlWNKhzKFTFUaalNVKUKknKrUhRjz4n2ekJXlyxptM/j3xa8PsbwnjMV
+        nfDmV51ieDKeGwFfHZnOk8VhsjzDGTo4athMdiMJhlSwGBrZlV+r5JLGy9piaUqVCVavi41VL62+LniL
+        4k+IPh14m0f4P+O9H+H3xIvba0Twx4w17Q4fFOlaLcR6nZT30lzodxIILtrvSor/AE+2kmS5isbu7g1C
+        Sxv0tGsrjvbDxvdxWNnFqOpwXuoRWtvHfXltCbG3u7xIUW5uYLJrq8azhnnDyxWrXd01ujrEbicp5rfH
+        v/CcN/z3H/fa/wCNH/CcN/z3H/fa/wCNfRLL4KtOverz1KVKk4urUdFRpSqTjKGHcvYU6snXkqtaFONW
+        rGFKFWcoUaap/jc+K6lTLMJlLhl6w+Ex+OzCniIZfgKeaVK2YYfLMNVo4rN4YWOZ4vAUYZbQngcuxOLq
+        4HL8RiMxxOCw9GvmWPqYn7M/4Tsf8/I/7+f/AF6P+E7H/PyP+/n/ANevjP8A4Thv+e4/77X/ABo/4Thv
+        +e4/77X/ABrX6r5fgvLy8/w9bcH9tLT3+32v8P8Ad8/61v8Aod8CfiAunfF0aP8Aa4Y9P+JWh3GnNG1v
+        JOreMvCltc6vpEyeVqFtFby6p4TXxNb6nez2VxJdp4Z8L6eb62Wzs7W69v8A2gBKL3wn5jxP/wAgHHlx
+        GMj/AIv7+zvnObmfIxjHC8569vxk8SeP/Gtpp0V78NtMs/EnxNsNW0C9+GPh691Cx022174k22uafL4C
+        0KTUNQjksbQa54rXSdIMt21vb7b4pPfWETtewfrX4+1Hxtq/g/4P6n8R/D2meE/HuoeFvAV9418M6LrL
+        +INI8O+Lbr40fs2T+ItD0zWmtbQatYaVqz3djZ6msYW+ggS5A2yAn844poU8NmdNQUlLE4ZYif7ufs1K
+        E3R/i8vs+eaipez5vaK0p8vLJM/s/wABM3xWdcDYmVaeHlRyXOqmV4dvG4aWLlSxGHjmEV9R9t9eWHoy
+        qVYfW3Q+qc0oUI1faxlBfUvw+/5FSLkr/wATfxX8wxlf+Kq1vkZBGR15BHqD0rkPhFpumz/Db4PX9xZ2
+        s99Z/DHwytpfS2sEl1aLNoGhrKLed4mlhWVeJBE67gMNkVU0bTvHd1YeD7vwr4h0jSdEsvEfjlvFthql
+        i93JqljLr2uJYfYJY1WS3uLO/CXEw+1W0dzaGa3MkUrRXMGj8HDcf8Ks+E+bi0/5Jl4VHNtJjH9g6H8p
+        /wBL5OMc8DrxXzybV2m03daO101Z3t0d2muquftH/D/156X+4+boP27fhxJ8c/hx8GxZG6tfile32heE
+        /Fml6za6iY/EOmW2o3q6d4i8P/2fbXWjw36aTdQWt5b32pvFdyWSahaWUEt1cWP3DCeE+dv+Pq76hf79
+        x0+Un+ff0zXwd4n+CP7JvwA+K5/aEsfhTb3/AMcdZbWtT0aLwyviHXNXN5qsMsPiXWvDnhLVPFaeCPCV
+        xf293c2+seJLPT9BkuE1K+tDfTTardW915laf8FS/hB4f8bWHg34veFfGfwgtNR1M2tp408Q2Gmap4Ps
+        prqaSOD/AISO90nW31DQrd5J0V9QbS7vSbFN9zqeo2NpE84+wxGQrOY4etwjk2cVsPQy+Dx/1j2VSviM
+        ZGpWlXqYTC08RXq1aEKfs6PNQjapUpVJKhR+A51WVNtV6tNScvdtdJRdklJtJKTb2drJrV7njn/BQjxf
+        +0Z8J/HPiDXfCvwt8c/FP4VfEXwf4f0qO/8AAvhbVfGdx4X1jRlvre50PWdL0Gx1DUtLtbqe5XV9O1Oa
+        1j0q8udWubOO5+3QSwnpP+CPvwh+OHw7+F/xe8Z/F/w14g+HVl8W/iXZ+J/BHw38T2k+l6/o+m6foEOl
+        6h4m1fw/eKl14evfFMy2tsul6jb2eqmx8OWF7eWscN3Z5/W9bg3VnHcQXthcQXEVpNDNDE0kM0Mjh4po
+        pVvGSSN0YOjruV42BViCDVrdOGb/AEm0H74f8u0mD+5XGP8ATOnr75q6/GVSpwp/qvTynAYd1JYNYzM4
+        e1+s4mjl8oyw0PYyfsqNdShTjXxELyrU6fKoU3UquYsOlXVfnk7c3LTaXKnL4td2t2ovZ9baJzMN6fM3
+        /HjN0C+sHA+XGP8ADrVjP7w/vHxvH8Kf88j/ALPr7d6oMZ/MTFza/wDHnMAfs8mOsHy/8fnX3zj2qffP
+        vP8ApVp98f8ALtJ/zyP/AE+V8WdBh6v4l8PeFNIn1nxP4g0nw3pEEuoCfVNc1Kw0nToWe8l2CW91GW3t
+        42cj5Q8gLEEDPQfMPx08SeHvFmn+A9e8La/pHibRL7UPCTWWsaDqdjq+lXaJ+0j+zVE7WuoabLcWdwqS
+        I0btFM4V1ZThgQPj/wD4KKfHbxL+z/r2ieJfFnhhtd+DPiDwXqnhyHxA+lNfaN4W8cv4l1afUo9TnYXM
+        GiXmu6O+gJo93dPbnUU07U7S0Z2tbtH/ADy/4J1XnxF8Vax8ZviOmk65ovwD8Y+Jfg03w9/tGG5tNC8Q
+        +M7D9pD4Hx+Mdd8IWtxGiT2sOmP4b0vW9asgLHUbq30/TkuLy60K7i0772lwTUfB9fi6eOpU6VGeF9hT
+        fs5U8XKtjYYOrg6c1VVWGOw7l9YlSlSkpUadV2jGKqnM8R/tEaCg22m5PW8bK6k1a3I9lK61dnrof0Va
+        J4m1fQtI8K6fYeFr/XrTXfEXji1vtQsnnC6K0Pi7UTA9yqWE9qkVxDNeTC51LUNHsozYG2+2Nd3dpBJb
+        +DUkg+E3woHksf8Ai2vhA5Vrbbj/AIR3SDx/prdiMc9c4JxxJonivTfCfg3RZtTjvpV1rxtrfh2zXT7O
+        S9lGoav4y16G1aWGHMi2ysrNNKiSMij5IpHKozPgzNj4T/CgMk24/DXwif8Aj3uj/wAy7pHORbL6jJx3
+        GQDyfgk9/J29NE7fjf5nT1+S0+b1+e3bTQ9JEkm0fuH+5B3tem88/wDH514/xr5M/ah/Zj0j4+6A2p6Q
+        kPh74q6Da3UHhXxQ7rDaahACbtfC/i1LSed77w5c3Jke2uvsl7qfhi7urvUtBBS/1zS9c+tRN8o+Sf8A
+        1cH/AC73WPvdf+Pf2POfy7JHMA3CT/6+T/l2uv8Ann/179R34HfIrbD4itha1PEUJunVpSUoTjumu/Rp
+        q6lF6STaaaZ5ub5Rl2fZbjMozbC0sZl+Ooyo4jD1Y3jKLs1KL+KnVpyUalKrBqpSqRjOElKKZ/J94k1H
+        xN4L17VfCfjPRdS8L+KtBu3sNb0DVRCl7p14mCYzJbz3Fle2s0bLcafqumXd9pGr2MlvqWkX99p11b3U
+        vE6t8XPD2gTaRb654h0rR59f1OHRdDh1LUbWzk1bV7kE2+m6ck8qG7vZyNsNtDvlkcoiKzuit/QX+21+
+        x1oH7THhH/hIdAK+G/jN4S0qb/hFPEpgvIbHxBp6LcXL+CvGCx2cgutEu7g/adK1UQtqvhXVS13pkx0r
+        UvEuieIP5UfiDp1/4Z8WXfg74p+CRo/jb4feISt1oPi3SLKXVvCviXTsGK9sWnS6iin8mWO80jX9GuZr
+        LVNLurTV9E1O+0m/sr24/XsmzhZ1g2sM8PSzKl7P21Cv7R0uT2kFUq01TkpyhOnz8mv7uq4xm5Rs5f52
+        +JXh5Pwx4lpTzv8AtfH8D5i8Z/ZuaZV9XWPjiPqlaeEy7FzxNOWEo4qhi1hpV+eEVjcujXrYTkrqdOh9
+        ff8ACb/9NT/30P8AGj/hN/8Apqf++h/8VXxp/wAJ6P8Anqv/AH0v+FH/AAnjH5Y/NnkbiOC2je4uZnPC
+        xW8EEck088jYSKGGN5ZJGWONGdlU/S+xSV3ZWV23zJJJJtt9Et79rdz8Njm9ScowhNynOUYwjG7lKTcV
+        GMUndtuySWrdu5+6X/BOjwNcfEv4uan8SLyJp/DXwgspPsr+balbvx/4m065sdPtfJlSQSJoHhe51bVr
+        9Tc6fdWl7rPhC7tRfQTXIt/1C/aAYte+E8xsmP7COSYjuz8ff2dv+eU0uDwOoWsz9jH4NSfAT9nnwR4J
+        1O3kj8XXlldeKfH7oL65U+N/EDR3OsWkc8lnD51roEaWfhfTp1trTz9L0OynntY7qW4zq/tAyB73wkMS
+        Aj+wvvxzJnPx9/Z25XzY0z05wTX4dnuYPMszxFeLvRjL2OHXRUaV4xa/6+O9R+c2f6o+FXCT4M4HybKa
+        8OXMq1BZjnD+08zxsIVK1KTsub6pTVLBRf2oYaMup7n8Ps/8IrDtAJ/tfxXgEkAn/hKtbwCQGIBPUhTj
+        rg9K5/4Ns/8Awq34THYv/JMvCv8AH2/sLQ+c7P8APrVbRr/xPYeEdA/4RfQbXX5LvxprtlrEd5fx6dFp
+        2hz+KfEP27VfNcO07WjLCBawQXM8qysY4JNhFHweW5Pwr+FCi3tf+SZeFT/r3AP/ABIdEGSPshw3I7nv
+        zXj+fnb/AIPp5+R+i9fu/P8AP1t0PyT/AGgP2p7v4N/tpfFXQPEs0cCnwl4Eh8JC5eNt3hG98J2FxcNa
+        LIdwtm8WTeKkkwqj7YlyBkDJ/Hb9uL43+FvG1jql0klqxmjuG+VkOSwbpjGcjr14r9dP2h/+CZPxd/az
+        +MGh3nxT1/wt4N8L+CG8QHRPjB4H1Bj8Rtc0nVlvpdJ0e+0K60AWNwp1G4s7rxDFrNzLb26wXw0C/a4v
+        hdr8Mr/wSX+APhv4uHwz8Wf2ptY+MdroOiyeIrvwrpGj6N4Q00X39o3lnpGieJ5bbXPFeo3cFx/Zt3c3
+        trBLoTzwNaDMltPNEf27gDxF4CyrLoZxxFSzDI83yiGGy2jl1PDVcRXz1YPDUI08RhKqjTwVCVep7SM4
+        4zE0YxnGdWNSVOUW/kKmYYp0sXUxWDng6Sxs8PhlialKnPEcypyUoxnKHuqc6kFJOUJKm5wk4tM/XL9g
+        H4x674N/4J2fsyav8SdO8ReIPFQ+E6arbaVZGxfXX+Hmn+JtXsvAGpyf23qGlW/2ObwMvhddPMl6Z7u2
+        KSW6TRQzyRdj8Qf+Cl3wX8HeFfDPivRrDUPEj+INbt9MuPCks8mj+MILuPV4tB1fRdI0pNO1a017xZpE
+        stldNoEGp20d9a6toU1nqb2+sWlzX5nW+qfFr41/tCeGPgHo/wAXLHRftXg7XfD/AIK1WTwtYXFhZaP4
+        Zspdet/DF7ZeGl8Nxx6TZ6ZZas+kXixXNxZT+Xphjlsri2bTf2a/Zk/ZW8Pfs9fDmx8HX0mmfETxGvjP
+        UfH2r+Mdb0u3gmk8ZatYafp8+paBp08Opv4dgttL0zTdOtI7fUJ7ryrVpp7uWa5lI/C8DxVR4h4uzXOK
+        +SSlw7XzDNcRWwNPGU8JOnicRW+tUMJRr0o1qkYUliYqf7lKVFRlTnCfumeTZzmWb4yccLh1SynCxqYW
+        tia7w8qn1ujHDSUIQpV6lTnlCq5SU17L2bhKM+dtS+qN7lozsAzYy8bz0zByfk6g8Yx796tZk8z/AFa/
+        fH/LT/pk3+xWeRceYn+j2uPsUxA89+mYBn/j0Hzf4nnjBsbbjef9FtPvj/lvJj/VEf8APp7dMf4nb8T7
+        MiiTzbeSKSGKWJ21NHSQhkdWvJAysjRsrKehDZDDqO1fMP7SQ2v4LQIsarqHg5VVD8qqP2jf2ZwFACqA
+        AMYA4A4xX0zbi4MTf6NanMmojmd+15IP+fTt0HsOo6D5k/aR8wTeDt8cUf8AxMfB+PKdnz/xkd+zR97M
+        MWMcf3sknpjmoN80V05k7fNAezeFNa0fQ/Bdpc61qFnpsFz4m8RabbS3syQpPqGo+NNatbK0iLsu+e4n
+        dURFOQA8jFI43dcr4M3Fv/wqf4UZltgf+Fa+Efl3wgf8i7pGOPPbjsBk4Xoetb/gnTrDUfCNmt/ZWt6L
+        XxH4mvrVbq3juBb31n4y1qezvIBKknlXdrOiTW1xGvnQSqskTK4Brzz4X+M9P0P4ffDjQdY0bx9p+saV
+        4F0HSr+xn+GvxMaWC/0vSNLsb623r4SKymG5iaPzYneGYKJYpJI2R2n/AD/Rfj+lgPbxc2+0fvbf7kH/
+        AC0hxneeP9b0/wA5psdxb5/11vxM/wDy0iP/ACz4x+971xy/EfQiikaX8QeYrNsH4WfFQNiWQqFIPg3K
+        unJmVgGgX55hGhDU2H4keH3chLDx25F3LG+34Y/E9vLcQF/3hTwiQisFwHfapYomd7KpAOwnuLb7NN+9
+        t/8Aj0bpJCMfu5en70/XGDxX5q/8FEP2B/Df7W/g2bxX4Im0zwz+0B4TtJD4U15pre103xlp9vG87+B/
+        GR37JbS8BceH9d/d33hvVmt5WuZtAm1nSdR+9Lr4k+H0sriWXTvHscaaeZXaT4XfFFFSPypid/m+Dl+Z
+        FQtLH/rYxjeqlk3XP+FiaFvx/Zvj7m52hh8L/iltObbzPM3DweV8vHyeZny/N/dbvM+SunCYvEYHE0sX
+        hajpV6MuaE1+MZJ6ShNe7ODvGUW00eJxHw7k/FmTY7IM+wVPH5XmNF0cRQqXTX2qdajUVp0MTQqKNXD1
+        6bjUo1YxnCSaP89zxjc+K/h54r8Q+BfHGjal4X8X+FNUudF8ReHtZt3tNS0rUrQjzILiFjhkkjaO6tLq
+        FpbO/sZ7bULCe5sbq3uJf0i/4JH/AAZf9ov9q3Qtc1y1+0/D34HwwfEnxO06Xa2N94ht52g+HugTXcMs
+        EEU9x4lRfE/2K7llt9X0nwhrOmXFldWdzdBP3d/aU/YH/Y3/AGr/AI/+H/jp8a/DXxs1vXtM+GVz4Kk8
+        F6L4d+Lvg/wt4ittP1WS+07xJr8fhXwVpPjHUfE+kJrdxptnKfE0dm2nrplrNpk39mW+z0X9kP8AZH/Z
+        x/Yi17406l8DrX482ei/GTVfBF9f+DPE/hr4seKvDnhCXwXpOsWdsngy61bwNJ4lit9WbxBe3mtya/4i
+        8Q7ruO1gsJNPtrQWh+6x/H0sZlVTCUstq0MdiW8NVrqtR+r0sPKheriaevtnKpO+GhR5VKm5+2c5wg7/
+        AMq8IfRGp8OcfYHiHHcbZdm/C2S06efYDKp5XmNPOcbnFHNYUsBkOOfsI5bCngsLyZzis0hiJYbG/VJZ
+        dTwdGpiYun+g9vcW3lv++t/vX/8AHD/z9y/9NB1/L36GvnX9oCWKS88J+W8TEf2Fu8tkbGfj9+zt12O3
+        pxnGPfNeq2vxK8PS28skVh48lVX1ZSYvhf8AFGTD29/LHLF+68HsDLvBVIx88pVjGrgHHjPxo1ePxDJo
+        V7p+m+JobPS5/CNre3ms+EvFnh20judW+PXwIm0+1iufEei6VDdXM8WkalKYLSSeWKO1aSdIleIyfnh/
+        Yp9CfD//AJFSLgn/AIm/ivgcE/8AFVa3wDxgnsSQB1JFfNXh/wDaN+E3wr+Gvwii8ca5faRYnwB4V067
+        1xdG1q+0DTbw6HokbR6hrFlaXFrbpBJmO+kDvFprhhqLWvlS7PevDesnRfB+my/2PrmrpeeKPEdhMNCs
+        0vZtOhn8U6+0mp3kP2iC5NhbCPE5sI72/LyRLbWNwzEL+DPxB+B/7WWsaF4c+EXhzRdW1TwRqmkQzW3i
+        DxH4N+KWm3Hg6K8SyfWNP8R6M/gafVLy70K/upLQ3Xhu11q21mKO3v43ge7ltrbyM5xmNwWGVTA4Opi6
+        0pcqjTpSrWlo4KpCE4TVOesZVItqDtzWTuvCz/MMxy/CxqZbgKuOrylyqFOjPEKMnb2aqU6c4VFTqPmU
+        qqfLStefKmpL+hsiz1rS0MUn2vTdV06Dy7m0uw0N1Y30XyTW1zbzDdHPBMHhnglGVdZIpOjD80PGv/BM
+        fwn4sbXfEdj8ZfidY/EvUryO00nxvrI0XXItN8O6a+oC08NahoFlF4eh1u133U1zJfyX9jqYuo7c213a
+        2rX1pf8A198K9b8L/DX4Y/Df4dJH8UtZTwH4D8E+Dl1a5+DPxfhn1NfDuj2OiLqE8J8GyfZ5roWP2m4t
+        /Mf7F5gEriMB27m3+KfhdxHs034kSA319GSnwi+LbBHjlu1cOy+C8RhWRkLPtTzCI872RTticvwuZUaS
+        zDDRnJQvyOcv3U5wXOoThKPvRekaifNFrmhKNzoxmVYLN6FBZpg4VJRp83s3Un+4q1IRVTkqUpQfPBrl
+        hVi1KNuam4t3PjX9lD/gnz4Y/Zt8Xar8UvEvjvV/iz8TrzS20PTNdv8ARrbw5o3hnR7+4ibUE0TQI9V1
+        ydNW1IQR217rF3rN1KLFZLOwt7CC71Fb/wC3/iP430r4beCPFfjvW0mbTPC+m3WrXEUcypJctBaqLezj
+        d22JLe3TwWsckmESSdWchFYjHl+Kfhhbcu+m/EmJdlm26X4QfF2LHmzEKp8zwUvzg/fiOJIyyiRV3Lu5
+        D4l6j8PPip4D8afDfxPpHxUOheNdG1Xwzqcll8Jfi7b3tvb6ppTwm+067bwPLFb3tizJdaffGOaG31G3
+        gDLJKhhbsyjAZblrwuGhRdDL44mnLExpOU6rpSqxeImp1JSnUrOnzcsqk5NyUU3ZGuX5ZgsowaweWYeG
+        Goxc5xhzVKjlVnvUq1Ks51as5NLmnUnKXKlG9oxS/M39p79s/wCP/wAHrbSviN4L8efD3xJpJsoNQvPh
+        /ceF420J7SVYpp9KbWkuYvFIukiUwjU4dVji+1L9pXTjAfsVfo1+zl+1D8O/2jvDHhfVvDktxpHi3Wvh
+        54N+I2teBNSNz/avh7TPF+m+ZAhvJLe2stYgtb6O5sJb3TWcK620t1BZ/b7WJ/57/HH/AATR/aq8XeIo
+        /BE/x10hvhJIzuvi26+DH7RzfEdPDqSRxvL/AMK6X4W/2LNryQyoosR8QIbOWbJN7AT5I/dX9nP4Ufs5
+        /sveFdK8K/Cz4fePdNvLTw54Z8Ka14wuPgz8WZ/FXi6HwvpH2e01DxFrA8DoLia4mkvNRuI7SO00ldW1
+        C9NtZ28kpiH65xhS4Bw+QZfSynHUMxz3nqzpYjKMLLC0VhJSpOEM4VWlRi6qj7T2MYQqY1Ti/b1KdKyq
+        Vh3ipVZOpBwp2SaqSUm5d6dpSsu7bUbPSN1p9jW4zE3yOfn1Lo+P+XyQf3wOM4+vPvXzB+0mMS+DflK/
+        8TLwf1bd/wA3Hfs0dOTge30969Xtfir4WeB2j034kyKsmrgmL4QfFyQboL+WORP3fgpsyh1ZVj/1kjKw
+        jVyr48P+OWuW/ieLw/f6XpfiyCx0jW/h9ZX154g8F+MfC1st3q37RP7PE+n29vN4p0TSI72WeHSdRk2W
+        LXDRLauZxHlN35VD44/4o/mjuudjY+OviJ4ahl0jRfBHgvW9Miv9WvLXUtU+IuuaBfTpqurX2q7LjSrT
+        4Y+Ire2e3N4bfMer3QmEQn/deZ5MeRqfizx9rGu+G/El/wDCn4ey6v4TfU5NCuR8ZPFSLaNrFn/Z+oEw
+        p8GRDMZ7QmHMyOYwSYihZixRWnJHt279HdfijmjOb3d9+i6ctunmdH/wtf4s/wDRM/h3/wCHe8S//OWr
+        B0Txl8Q/D82uT6Z8Lfh9FL4i1ubxDqzv8YvE8huNUuLOy0+SYbvgt8i/ZNOtIVjX5VWFQO9FFNQjZ6dP
+        PuvMfPNrf7UXsuy8vN/eO8TeNPiH4v0DV/DGu/C3wHcaNrljcabqlva/G3xnpk1zY3cZiubcX2mfB+zv
+        oEniZopTb3MTPE7xsxR2U7Y+K3xZUBR8M/h5gAAZ+L3iUngY5P8Awpbk0UUuSPb8/wDMSqT017dF/c8v
+        NnPS+LfiBN4rs/Gj/C3wH/wkFhoGpeGba5X41+MFtl0fVdQ0vVLyF9PHwc+wyTteaPYyR3j25u4UWWCO
+        ZYZ5Y26I/Ff4skEf8Kz+HfPH/JXvEv8A85aiijlj2/MOeWmu9m9Fq/dXbtoc74X8W+PvBulyaN4f+FXw
+        +tNPl1fxBrrxSfGbxZdM2p+KNd1HxLrVx5tz8GpZcXesatfXQj3+XD53lRKkSKor+MvFHxO8daRaeHr/
+        AME+BNDsG8UeCNZvdTs/iT4g1q7gtPC3jTQPFFylrpc3wq0SG7uLqHR3tIEl1WyjWWdJZJgiMrFFHJHt
+        +L/zF7Sdt+l9l/d8vNm9ZeOfiN4bhm0fR/A/gnWtMh1DVbq01HU/iPruhX1xHqmqXmqbbjSrX4X+ILe1
+        eA3pt8R6veLKIhPujMhhjx9S8V+PdW1/w74mvvhT8PZdY8K/2t/YdyPjL4sjFmdbtI7LUiYY/gysM/n2
+        0SIPtEcnlH54tjksSihQi2rrqur77rXR9mtUCqTa1d7uz0W14+XmzpB8V/iyOP8AhWfw74/6q94l/wDn
+        LVg6H4z+Ifh19ak0v4W/D6J/EGt3fiHVGf4xeJ5DPql7FbQTzfN8FvlXybO2hjTkRRRJGmEAFFFHJHt+
+        f+ZSnN6N+ey3tHy/vP7xfE3jT4h+L9A1Xwzr3wt8B3Gja1aSWGpW9r8bfGmlzT2kwxLCt9pfwfs76BZV
+        +SX7PcxGSJnhkLRSOjbi/Fb4sqAP+FafDw4GMt8X/EpJ+pPwWyT7miijkj2/P/MSqT017dF/c8vNnOP4
+        r8fSeLbfxu3wt8B/8JFbeH7nwxHcD42eMha/2PdajaarLC+mj4O/2c8/22zheO+a2+2xxmW3WcQSvGek
+        /wCFr/Fn/omfw7/8O74l/wDnLUUVXJG60/l79bN9R88/d13Svov7q7djnPCvizx94L0ddB8PfCr4f2mm
+        JqGtaosEnxm8W3TC88Qa1qHiDVJPOufg1LMRPqmqXk6ozlYlkEUQWNEUUfHXiP4m/EDRLLw5qHgzwJoF
+        gPF/w+8QXuqWXxI8Qa5eQ2ng3x74b8Y3ENrpU/ws0KG7uL6LQWsYRLq1lHFJcrO8jLEY3KKUYxTjps1b
+        V9LW6kupOzfNrvst3ytvbu395//Z
+</value>
+  </data>
+  <data name="cbHDotPlot.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        /9j/4AAQSkZJRgABAQEAYABgAAD/4QECRXhpZgAATU0AKgAAAAgABwEaAAUAAAABAAAAYgEbAAUAAAAB
+        AAAAagEoAAMAAAABAAIAAAExAAIAAAAQAAAAcgE7AAIAAAAIAAAAgodpAAQAAAABAAAAipydAAEAAAAQ
+        AAAA6gAAAAAAAABgAAAAAQAAAGAAAAABcGFpbnQubmV0IDQuMC42AEJyaWFudGEAAASQAwACAAAAFAAA
+        AMCQBAACAAAAFAAAANSSkQACAAAAAzQ5AACSkgACAAAAAzQ5AAAAAAAAMjAxNTowOToyMyAwNzowNToz
+        MgAyMDE1OjA5OjIzIDA3OjA1OjMyAAAAQgByAGkAYQBuAHQAYQAAAP/bAEMAAQEBAQEBAQEBAQEBAQEB
+        AQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAf/bAEMBAQEBAQEB
+        AQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAf/A
+        ABEIAJYAoAMBIgACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMD
+        AgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygp
+        KjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOk
+        paanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQAD
+        AQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFR
+        B2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZ
+        WmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfI
+        ycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/AP7WNR8cWXxJ8XaNpFo3jnQL
+        DSIfiBZaxZQX+t+FpbnWtDl+G0lvcHUPDOowyXlra23ia6t7eJr/AMiaae5m+zTLb21yNN/CunmHcNd+
+        Igb7LcyZ/wCFk/Es/PGU2HafEpwRkkg8c8jpU2oeIbrX/iD4TludA1zw+bLw38RbVINWgt45LlTefCm5
+        NzH5MtxE6o91LZ5hmmhNxa3IWVwqNXSO37gndN/x53gJ2J6ocY28dOfx6ZFerhacHQg5QhJty1cU3uu9
+        7Lql066o8rE1Kka80pzSTiklJpL3U9r233dtd+xy7+E9OViBrvxFUBrQAf8ACyfiXyJbkpIT/wAVLwSn
+        ygZzkZX5jSnwpp3mov8AbvxGUG6MRH/CyfiWcp9jeUZ/4qTIPmLv4wQBgnacHq5WwznM3+ssCflTPF0p
+        y3y8Edh3J7jgKzETR8zjN6T/AKtDknT5TuPy98ZxxgV0eyp/8+4f+AR/y8l9xh7Wr/z8qb3+OXl5+SOT
+        HhTTtyj+3fiLzHdsR/wsr4mfehliVMf8VKDwrMG6jJGe2UPhPT/MYDXPiN8sdowU/En4lghpZZkkG4+J
+        O6oPYY+UAnnqwx3oMy/6i+HCIes8B7LyD0Jxnd044pScyyDdNgQ2PBWPoJ7jgnaPTg5HbrS9lT/59w/8
+        Aj0t5eS+4Pa1f+fk/wDwKX+fkcr/AMInp3mOP7d+IpC3IjA/4WV8Sx8htY5Dn/ipSQd7Er0JGAMqaSHw
+        ppzkbtd+IxG+7BJ+JPxLGBHdeXFkDxKOifKcEZxuOSQaj8efEDwl8MfDOreNvHWsSaH4W0jUdKh1HU2s
+        L7UPJl1m50vQdLj+x6VY3+oTyXWr6lYWUSW1pKTLcIz7IhJIvBfDD9o74N/FvxBceGPh94yuNe16z0zV
+        9fnsH8NeKNFkTSLbV9Psbi8WbXtA0u1mjhvNW06CSKKZ7gG6iby9gkYYyqYKnVp4ec8LCvUV6dGUqUat
+        Raq9Ok2pyV4vWKfwvsejQyvPMTgMTm2Gy7NsRleCn7PGZlQweMrZfhKlqT9nicbTpyw2HnarRfJVqwl+
+        9pO3vwv3R8LWP2J5v7e+InmLp0dwGHxI+JTATNDIzED/AISUrw6rjqpGMDGcwano2iaXHG9zrnxPZrjU
+        ILG1gsfHPxb1W7uZGhN1JHb2Oma5d3kzLa293cy+XAwhgikldkWMsOxLY0yTmYf8SiLosZz/AKNLj+E/
+        KOdpPJGOTiszWNSsNL1bwhqGqX8Gm6fb+LLg3F9qE1vaWcHneDPE1tE09zO0cMHm3E0cEfmOqtNLFEMu
+        6hrnCnCEpKnTvGLkrwj0+5vp1OfCc+IxFKlOdeUZOTapTtUlyRdTlg3Cok5cnLrCW+ivZnIi10PKZuvj
+        oATMG/0z9oM9H/ddJO688dMfNk5pn2fRQkh+0/HMsLZHQfbP2g8+dtmL4/eEYyE5OVyMAjnPlXgzTPjB
+        pWiXFt4k/bK8EajrqfETxbr9hqVxo3gfXLObwNrzaVd6d4SvbKG48Isl5oN+uuJZajFNPDDZX9vb2ttb
+        WVnY6bp/pkl1rh1TTb2L9qPwrFZxQ6XJrGlvpXgiaHUrm20q3sNQ+wTPrZfSLHUb8ajrUdsw1Ke0vLy2
+        txfXGm6ZDZSbSw2Gi2lmeSyt7W3Lh83XN7OVoNc2VqyrxtKk3ttV9k1r6jwlrf7DnTbcdFiKb5U2t74J
+        fCkpNbapJt6Fv7Log84/afjp/r4tn+mftBj90Vt9/wDHyNzS8t82TwwwAFS20Q7d118c8madT/pv7Qf+
+        rVpvLPEvJ2qnTn+9yTXEWeneN7CPWYrb9sTwvJFqTaubZb/w94R1KXQTe6HqOmaLBpF3e+MJblrbw7fS
+        6Hq1u2ryarqesS6Zfx6/qepTa2byw1J9Q8fz6xpd0P2lvheNC/sK5t9e0ddN8Pw3N9rq20EcZ03V18QP
+        Jp1pPdvfz/b4LSO50+CG0tn0/VpLg3mmKWGwyc+TM8mmo0nUhbDZtF1JRpqfsoqWWqKqSalCLlJUuZR5
+        qqTuhYRyk19RzvdWksRT5XqtVfBJ2tq/dUkle2mm/wDZ9HFsD9p+Ohm+yK3N5+0Hn7R5eT8ok25L4yOF
+        XpgU+S20LD7bn458T24XF5+0G37pmt/MPMh/haX/AGhyVxhcfNfwG8I/G7wT4dvbX4gftZeBn1lvEEeo
+        QzP49vvjRZXuiNp+mwz2c178QT4S1TR5/OtLgWsWntc2EK3c128Ut46G3+lZtQvf7Qt7qD9pPwpHZCO0
+        F9pz2ng2QT3q6fbWd1Ja3R1iOSys7m8N5qkVm6XlxbXN3Bbrfy2Gn21m3hUsfWqUqdSWVzpTmoOVKUMP
+        zw5r3TtibXhypyte6ceTn1t9NmHC+W4HGV8NQ4gpZjTozrQhi8LLO/Y11SsoTpKpwtCXLiLL2LlGL1/e
+        +yfuB9m0P91/pPx05mkDgXv7QZPlBZ9gH7zk7hCDtBYdWGN1RtbaN+7K3Xx0GbSd2X7Z+0Ef36iDy+S/
+        BOZeB8nJyMAYw7OPxJYJqEUf7VnhWeO/l1eS1F9pfhK9m0k3mjajY6XbWF1ceJZJ5bbQr+XStShGom9v
+        9RGnXcGrX93Jqj3lpoS6z4qfWrO4/wCGh/htHoT6JOmpaSlp4dN3LrJ0q3tElstUbXT5Fj/ajzanHIlr
+        C1tbxRafPaalJdSaja39cqq3/CffWKdoUbK+8l+/vyRSV3ZSvZqDSbXK+HsC5SUM35oxpymp8+cxjKUY
+        qSoq/DP8SduWD/hOSSlVheN9BrbRPOcLc/HPy9tqV/039oPq88iz8mQnAiEZ/MrzkU1o7S0Oj6voevfE
+        NbiD4heBNHmg1zxX8RyFt9S8VeG7HUbHUtC8UamUZLuw1GZPLv8ATzuguUuICAYJRneG9V8X2uqQXfir
+        9pT4ca1YW9xp3maVpmk+GNFa+t7e6iN5NLqB8Q3T27anFFIVs47aT7FI/kR6nPEJWm3dW1Cy1R7y/wBN
+        vYdQsLn4y/DJrW9s5re6srlYvEnw7t5Wt7mBpI5gk8MsLtHIyrLHIh+dCB0Yes8RTqyqYRYe0JcsakKf
+        tG1FPmXs6lWKXa8ubTWMbJvzM0yyll6g6GLqYr3qN61GrjJYZc84x9lJYzKctqOdnzXhzQ5YvWS2m/4S
+        jXPE/wAQfDz634N1fwpPpOl/FDSLeK9uRJHqltbah8KZV1iykK2Pn2N7JcSrYyrBKoigJuHs743WnWna
+        vnyD+6uMGzvMHzh2KH/nv7/jj0zXGPrfizXPiD4dPizwaPCdzp+lfE+w02O219dbg1bSY7/4US2+sCf7
+        Bo727XU09zELQ20/2dLQlrwyTvbxdm6nyOY5SBZXmMTnAOY+n7zk8fkM5NdeDd8NT6/FrrrrvZ7N7tWV
+        m/kvncV/vFT1X/pMdu67PW61u9x8xO5v3NwP3mn/APLUY5vAOR9oPzHp3wQDnvQSTNH+5uR/pz4/fD/o
+        HynP/Hxg45PccdSKJQ25v3Uv+tsP+W3b7Wo4Pm8jqB1wRkEHmgqfOj/dS/8AH6x/4+Dj/kHy/wDTXp1H
+        5/j0nOICd0f7mcfuL7/lqCMefAM/8fH3T0I655xxmlyfNk/c3P8AqNP6zAgfv7j0uMn1HHOR2xhAGymY
+        pOYL4n99j/ltBg8Scew7nnk80FT5j4ik/wBRYY/fk/8ALe4PI83vxn0HPbgA+Mv+Cg05tv2T/ibOLS+n
+        MPin4PusEBWWeYj4u/DYiKNDchXlkOFTeyou4GR40DMvwN/wTT1aTUf2ifECvouu6b5XwZ8bkHUY7aBZ
+        d/j/AOF4PlPBqE4PlbcujlPvKVVwHK/fH/BQeWWD9k74mzQ2N1eyQ+KPhC8Vpbz24uLiRfi78NisELXd
+        3bWqyyn5Ea5nihVmHmTRryvwJ/wTR1LUNQ/aK8QLeeGtZ0VYvgz42Mb6je6HKLgt4/8AheGWL+x9c1Rl
+        8oAeb9oEKNvXyjKdwX89zqKfHXDj5YN/VZWk60YzVpY26jSc1Ka/wwdtW9mf114cVXH6LfjDTWJx1NTz
+        6lfD0ssq18HV/d8L+9XzCOCq08LJWtyTxdC9o+63Ujf9wjn+zJB5Vwf+JRF92UKD/o8q9PtA4OOBxgHg
+        LVqRjtl/dXH/AB+WoyJVOf3lscj/AEjGe7cYz7HioVJ02U+XL/yB4cHzyP8Al3l5A8wYGCMAYwf4Rnm2
+        4IWT91J/x+W3Wbt5ttxnzOe3JzwQP4cV+hH8igucxZhuPvXfHnAA/vP+vgcHvx2PHJzGSfKn/cz/APIP
+        gP8ArRj7tz/03+7x8q/+O8jL1Ukx/upeWvOs/UGU8j97/wB89ePWoyr+VOPLl/48YekxGTtuecCTA3d1
+        xwP4cUAPOc3X7m5J+223WYc/u7Lgf6QefxHQ5PUF0ROI/wB1cH/Srv8A5arg/vbnJAFx95emffOSMGml
+        Tm5xFL/x+2+P35P/ACzsuMeYefUjuOtOQHEf7qT/AI+rvBE/GPNuev7wcAnnjk4570AV/wDlxA8m4z/Z
+        Y5MwOP3PtcH0546DvzU8p+WX9zcf8flnjEw5/eWf/Tx1HOexODnOKg2kWK4ik/5Bg/5an/niO/mH06dy
+        O54qeZDiU+VL/wAflnjM5/56WYwP3o+UY6/SgAyf9GBhnGbu4H+tGOI7zgfv8gjvwMjPXmoXOBDmG4z/
+        AGZdnBmGOlnx/r+h+nce1S4bFt+7kObqfP74g/6u84P737wwPm4yQeWycxOpxAPLl/5Bt0Mmck5xZ9V8
+        w5PtjnIGOtAErk/aJR5M/wDq9P4Mi8ZurnjPnnJxwvXBU5Ayc814r/499IPlzr/xcj4YjLy5A/4rjwl1
+        HnsT6fdbg4+nSup+0SfupMCPTv8AlucjF3cd/M6nHPphu5rmfFakW2kfu3X/AIuR8MSSZSw/5Hrwjjjz
+        Gz1GPwHTioqfw6n+CX/pLLp/xKf+OP8A6Uincah4w1L4ieHR4t8N6dosllo3xIstImg1CK6/tjS0ufhH
+        OurrbxG9awiudQlv7YWd1dLdwfYo2kidJI7iTr3RvIb9zbn/AEO7GcnGQVwMeV15456VxNxceOZfiP4e
+        TxxZeGY3g0X4kxaBc6R9rtftmiif4Qv513aXV3qzJK+qPqauy3kAWCCwQ2LEG7uOxkI8j/V2ZJsrvgy4
+        X/lnjB8jJP8Ad6fL+VY4T/d4b3vLy69fO979Pka4r/eKnrH/ANIjt5dvLfUszK298QW4+fT+jH/n7HT9
+        z93senU59KCj+dH+4tgRet1J4/4l8vIHk9PT155qKQ/M/wC7tM+ZY9Jf+npeR+4zg8h+mB69KaSBNHiK
+        y/4/W+9Nj/mHyZ24g+71xxz6Cuk5yYI25P3MABgv+Nx5Hnwd/JHzdAOO5+hNjebIfItv9RYfxHP/AB8X
+        BH/LDr3IwO/1qIEZT5LTHkXoyZc8edBjdiHhh/AOhGfu4xSEjzJP3dljyLAcTDf/AMfFxjjyB83TIz6j
+        J7gHxr/wUJkuLb9k34nzwaaL+4i8T/CBoLO1mtop7ib/AIW78NikUcl41rbRhiR5kks6BVLsBIwWN/gH
+        /gmdqWsX/wC0X4gTUvCtzoax/Bjxs0Ut5qOjXsU5Pj74XiRFGmXl3LHJH8hBkiWJ1L/vQVUP98/8FCpL
+        xP2TPia+n2mlXV8vij4QNaW91qMtjbTTj4u/Dby45LyDS9RmtonbiSaOwunjyxW3lxtPwB/wTNuvFM/7
+        RXiEeItC8LaXEvwX8bG2fSfFWo6600h8f/C/zVnjvfBvh1bZUTaYnjku2l3MGSEKC/57nS/4zrh1uFJ/
+        7LK0pVGqqs8bfkpqtHmjqrt0pL4te39d+HE2vot+MMPrOZ008+pt4ehgY1cuq/u+FvexWMeX15UJrS0Y
+        47DaRptxfO+f9zCjnTJP3Nuf+JREQWY5JNtJz/qfvEYJ5PJ6nirTq+2T9zbD/TLUZ3Hn97bEkYh6EHOC
+        T1OTVBjjTZf3dn/yCIvvS45+zzHtB9/n5+4O3OetWnOVl+Sz4u7Y/wCt7ebbZH+o4Tpj+Q7/AKEfyISh
+        G3R/uLbG67+8x5Hmdc+TwfTrxUZV/Ln/AHMGPsMBxuOR8tzz/qvvYBz0wB19GqQDEBHZYzd/emw2PMP/
+        AEw6/wB3nGO4phP7if8Ad2pzYwD/AFvzE7Lnk/uf9Z6jHTv2oAnKN/pP7i2Ob22AwTk/u7ED/lgen07D
+        pnAfGrER/ubc/wCl3X8R6CW5zn9ycADHHv2quWGbr93Zf8ftv92bn/V2WM/uOh7+nvT4yMR/JZ/8fN3j
+        97jrJc8H9xwnvyT6UAR7H+wLmG3H/EsHOTx+47fuRz6cjP8AKeVH2y/uLb/j9tOpPP72zz/yx4X8+c56
+        c0wf9BXEdl/yDB0l7eT/ANcPvf3fyyM1PNgCXEdmf9Msz80uP+WlmDt/cHC8A/7xbjigCXY2Lb9xb4+1
+        Tj7x7R3nB/c9B/D7gcc8RSI4EH7i2402743HPAs8D/U9f8enqAjFviO0x9qnyDLz/q7zhv3J+UfwHnd8
+        vAzULniD93Zj/iWXXPnfvAMWeD/qPv8AoM9ehoAtujefL+5t+ItP43cAm6uB3h4B6NwOF6HoOY8VoRb6
+        QTDbgD4kfDHDIxypPjnwlyP3Qzn6jk10UhHnyfu7PBTT+kuQCLu46ZhGegD9OAOTnjmfFLDyNI+SzXPx
+        J+GP+ql3Nn/hOfCXQeSue56jBA+tRU/h1P8ABL/0ll0/4lP/ABx/9KRBcR+Nbf4ieHx4x1HQ53fRviW2
+        hjTkkZxoi3vwmigN4z2ulCK5a+W+nntUiv1hS5t1XVJgBHH1zu/kH/Sbb/jzux93uSmMf6R1J/TA61zG
+        o6d4l0v4ieE49d8Rprvn+G/iJNYPJpdvbz2lol18KIDbySaetnbyqbqK9uzvtjMZL0qs4t4Y4I+mdphA
+        f3qf8ed5z9mlIJ/d9MT8HPPt046nHCf7vD1l+fXz7+aNsXpiKm32dttYRehJNI+5j9otj+8sP4D1F2OV
+        P2g4UZyRycH+HNDSP50X+k23/H63VDyf7Plzj/SeFzwOuKJmm3OPNT/WWB5tpeR9rABAM3y4IPrnoAMU
+        m6fzo/3yA/bXP/HrNz/xL5ckDz+Af7voPQ10nMLvfen+kW3EF8MlTwDLbnBP2k4Y9QemB054PMfzZALm
+        2x5Fj0Q7tvn3OOftB56bjgjGeKQNNuT96g/cX/8Ay7S55ng4H77Jyec9hwe2DdMZH/eof3NhwLWUH/X3
+        HrMenXPfGOpoA+Kf+CiVzfW/7IvxVuLKbSjdw+I/hHNB9va4hst8Xxc+Gz77mW2a5uFhjRWaTyYJHO3C
+        gZyPzW/4JN+Or7x38e/FGqrfeFLjTLX4S/EDTo59GfW2mW9tfiJ8L1lS5g1az0/ZDc23k31jNG7mazuI
+        JzGFnUp+lX/BRB9QT9kb4qNZXltBdr4j+EjwTT6Nf6pDHKnxb+G7I8mm2OoWd5fIm3m0tbq3uLgjZDIr
+        stfll/wRwv8AStQ+Mviqfwpe+HP+Ech+F/xBtEtNE8A+IPCSpqFr46+E0D3kn9reLvEKXy6npkWmahC0
+        C29ysdzHJqwTVJbu2i+FzanGXGOS1HBudOjQjGooycKaqvNXKNSSpSUZ1fZL2C9pTTVKvzc2iP668OFV
+        /wCJW/F9xpZnKn/b0OepQxGDhl8WqfCumJoVMTTxU5q6u6WHqxadKz92fL/Q2ZGGmPi4th/xKIhyp6i2
+        k4GLgDcOc8DJ7CrUjvtk/wBItSftdqeUP/PS2BIP2jpwB7EEHpgVC0w02QCVB/xJ4cf6NMf+XeXjImAy
+        MYJHB6jmrTtNtlHmoP8ATLU/8esvTzLY5/13cEHH498D7o/kUUSNuixc22N13jKEnb5nPP2n73XHTio9
+        8myb/SLbH2GAY2HOMXPGftI+YHr69Pq9GmzF+9QDdd8fZZs48zgZ8/qeoPbNR7pvKnIlT/jwgwPs0pbG
+        y5OOJxyOpbgdsccgD/Mcm6/0m2P+m233UI/5Z2Xf7TyPWnRyPiP/AEi2H+lXZACH/ntc5Lf6QMqcccdf
+        XrTC0+br98h/023xi2lB/wBXZdT5+Mfln9adE02I/wB6n/H1d9LWbj97dcn98Bz3Xjt1xmgCASSGwH+k
+        2xH9mDGEPP7k9f8ASOSR930PPIqeaRwsn+kWv/H3aYyh6+baDI/0k/LnHHB61BumNiP3qH/iWD/l2lA5
+        h6f67qe2enUippWmxL+9jH+mWf8Ay6zEH95Z8g+d0x29QfpQAF5P9HP2i2x9qnPKHIzFeZJP2joQfl+o
+        5PeN5HzAPPtv+QbdfKEO7kWeAD9o6ntUmZv9G/eoMXVxwbaUkHy70Hnz+QTxjquRk8VC7TAQ/vU/5Bl1
+        8v2WUN0s+N3nYz7kHHegCZ5H+0yH7RbcxWHRSOl1c45+09s/Nyc5GCOp5nxU7G30kG4t2H/CyPhjkRqQ
+        Sf8AhOvCXAPntjnjG1uT2xmulkaYXEuZkP7vTh/x7TZz9suOTifoPr8w6cjJ5rxW0pt9I3So4PxI+GPC
+        28iHjxz4S7mVgPQ5U+vGDUVP4dT/AAS/9JZdP+JT/wAcf/SkZzeHfEXh74geHYvEPjTUPFs1/pPxR1HT
+        pbjSrPTzpulzan8K4rTSmS1NzFcNYGGUrcwDT4roTmSXT/tS3F1cdm4IgP76cD7HdjIhU5yUzx5JAzjP
+        AHOfeud1vQr/AEr4uWF/ceItV1WDxFpPjzVNP0u4RHs/DdtBbfBjRn0zTmkM8vkT3uk3etMiPbW/2zWb
+        wrZmUSXE/Ryb/IP7ybmyvOREh5ynGPLJ7/QcjnjGOD/3amuzktXd79X1fnu3u2a4r/eKnrH8Yx/Dsui0
+        sth8oIZj503L2HWJRn/Sxlv9QMAHgDjJHQ9KCD50X7+4H+mnnyU/6B8vP/HvgZx04Ax05pZhJufMs3Mm
+        nnJijGf9LUD/AJZgAjHC4BLHnI4oPmedF+8nH+msf9Shz/xL5ecCPjPXHXGOma6TnEwd6Dzp/wDUX3WJ
+        cjM0HH+p/i7nnB4yOlJ/y2f9/P8A6mwxmFQeLi54LeQOR+BPTvgrh9yfvJh+4vuPLjJwZoOP9X0PUt2b
+        HQZWg+Z5sn7yfPk2AwYo+Mz3HfywPl6g8A4wc0AfFX/BQ8Tn9kf4qfZr+9tJ/wDhI/hI0NzbafHezxSL
+        8W/huyyR2b2si3LqRhbfZun+4uHdXH5Y/wDBHHU9C1r4z+KtQ8LXkkOhx/C/4h6emnweDdE8LWyXdl48
+        +E8S3qRaRZpBdNd6UmmPw5ksojFY3Sx3VvJDF+qH/BQ2O5k/ZI+KaW93qUE7eJPhGIprCHTWvo5P+Ft/
+        DfY1qup2lxp/2nOBCL2CS1Z9pmXyyxH5af8ABHTxHp3i/wCMvinW9DvPEi6Ynwu8fabHZatpvge0gUWX
+        jb4SNZ3NqvhHw/o5Mlxocuj/AGmO7E0Vkyrp1lJcw2gu5fhc2jfjDJZ8l+Wlho+0TglTc/7XfJKP1ec5
+        SqqCdKSxFFUlRqpxn7VH9deHEL/Rb8X5/VsyqWz6C+sUMe6WX0rU+FnbE4JZjQ9vPXWcsBik1KilNeza
+        p/0KnP8AZsn76cA6TEMCFWBxbSd/IPIyOR14PPWrcgO2QefNzeWp5iT/AJ623zD9xweOAe2COCKqkP8A
+        2ZIBLMP+JPDjEUbD/j2lGB+7J44Gc89fWrUgk2y/vZh/plqf9VHz+9tjnHl55/ujkADvkn7o/kUFzui/
+        fzj5rvjyVPWTOP8AUd+ue3T6RkHy5wJ5v+PGADEa54W5wMiA8DruHJPAapUD5i/eT/eu+PKjJ5kzjIix
+        z684Oaiw/lz/ALyb/jwg+Xyk7C5OMmM/KOxOc++KAF6m5/fTt/pltj9yoB/dWRHPkDp2A6njBJp8ecJ+
+        +m/4+ro/LCvH725+Y/uOpyMjkZxxnFNIf/Sv3k5/0y2/5ZIP+Wdlz9zr3Gc884I4Do9+I8ST/wDH1ddI
+        o+P3tzz/AKvJOeq5yPagCuM/YAfOnP8AxLFH+pUAfuD1/cd+nPTJxg1NNnbJ+/nGbuzOPIUjHm2YJGYD
+        xxjHTjpniohv+wj97PgaWM5iQDmEcHEY69/TnpxiaXftl/ez/wDH5Z4/dIQcSWfzD93+YycY7Ud/X9EA
+        EEfZx504xdT/APLJcjMV53MHJOeRzjJ4GKhcH9wvnzj/AIlt0MeUo7WfG7yOPrnOec81Ph/9GzJNkXU/
+        Ajj6+XeA4/dck9cdsk9MYhcSfufnmP8AxLLv5DEmDkWZAz5fTtke3fqASPn7RJ++nH7rT+kS5OLu56jy
+        M4X/AMe+YdjXMeKj/o+kfvpmx8SPhjw0SoDnx14RHJ8lc/QEcHd2yOnk3i4l/ez58rThjyo85+13HJ/d
+        9uo4AbnGe3M+K9/2fSMySt/xcj4YcNEqj/kefCXcIOeMdehyBnBqKn8Op/gl/wCksun/ABKf+OP/AKUh
+        db8NRaN8WtN1RdT13UZPFWlePdbmtb/UFnsNFlt7X4MeHU07QrVUt1sdNlg0KLU5IH+0yNq19q92bhRe
+        Rwx9E6nyCdsxIs7zJEq9Pk7eYB157k/SsfxJo2m6f8VtC1CyikFxrvh/x/qGqtFMEU3kLfCHSY2liSSM
+        ea1hpdiFllSSfYuzzkhMUVbDqPIPy3B/0O86Ttjqmf8Al468Zxzn8zWOE/3eHrL8/T+uyNcV/Hqf9u/+
+        kRJJV+Z8LN/rNP3fvByftg5J808kcccZHUcGgqfOjwtxzfNn94v3v7Pl9ZfXB4yMdM8iklVdzDZOMSWJ
+        /wBe3e7A6/aMkfKACc4OTkdaCq+fH8tx/wAfp5+0N1Gny/8ATzzxz+fJrpOcAh3JgT48i/OPNHQzwE8m
+        ToOnY5I4wM0bT5kmVnA8iw4MgwB59xjP73PB6d+me+AIu5PknH7i+yPObOfOgB6TgfgcZPOD1oKgyyHZ
+        cH9zYcGcnrPcggg3BHrxjpxjjg/rr/Xz/wAwPi7/AIKFwmT9kr4pIYtQl3eJPhHiOyvPsl4z/wDC2vhu
+        Yxa3C3lsI7nftNu0k8dv5mwXLGDzEP5gf8EgvE8fjX40eKNej0rxXpJHwt8fWEdv4h1d74vaJ44+E97p
+        11aRm8IX7RpV9ppvGmto9l0skWnTX2nLFfXf6e/8FC7cz/slfFKFEuzJJ4k+EaIItSnsJCzfFv4bhVS9
+        guDNaMxwFuocy25IkjIdFFfmF/wSD1bVfEnxp8T61rPh3xP4Yu2+F3xAtI9N8Qa54lvrhrFfHXwpv9Pu
+        UtvELwzWx+xX9va3E8KrHf3VvcTpFDAIYIfhs2UP9cMmk4Rc40sOo1LwU6fP/a14Rg5qdSNb2a55xpz9
+        h7FJyj7ez/rrw4w9Sp9Fvxgrxw6nCln8FOu8wxdF0/3fCtrYGnSlhq7XPbmq1INqez9nC/8AQQVP9myk
+        LPzpEI4lGMfZ5iMZkHGCQAOfXBq06kLJgT/8fltn96PveZbE/wDLX157ADgZ5qqVU6bJlLg/8SiI589h
+        wbaTkD7QMA9Qv8J4GKtSKCsnyzjF3a8mdu0ttj/l4zzk4PoQM8V9yfyKCKcxfJOBuuyR5i9DJz1kzgn8
+        eeB6xlP3M4Inx9ggHEi9NtyBz5mdvp/F6qKlVAXh+S4Pz3f/AC8N2k7D7QBx6enavwAu/wBqD9oNPFt5
+        GnxU8TrbrrTRLaBdF+zCBdSnRbb7P/Zfl/ZghMYgA8sIduCCRXiZzn2EyNYJ4unXn9exDw9H2Eacmprk
+        u5qdSnaPvr4eZ6PQ/TPDjwq4h8T3xGsgxeT4T/VfKXnGYPNsRjMP7XCr2vuYT6pgMc6lf91L3KqoQ2/e
+        a6fv6VObrctxj7bb/wDLRf8AnnZY6S9fyH9VjVsR5E5P2u7xiRTyJbn/AKaDp3zxnnnPDNi5ufknP+mW
+        +f35z/qrLsbg4PA5AyOxFcx4112+8J+CvFPinS9AvvE+o+HNG8Sa7Z+HLS+mtrrX59Js9Rv49Hs5YotS
+        lS81E25tbTZY3JkupYk8slyR7sYucowVrykormlGKvJ2V5SajFXespNRS1bS1PzM6PafsIO2f/kGdPMG
+        MeTk/wDLXHpnvwcZ7zSqcS4Wfm9s8/vF+95lmO8oyeO3Gfxrwr9nX4jeNvix8FvDfjf4i/DvU/hj4s1G
+        x1Wx1TwnqDa3a3ltd6DqF5oV5fSaX4hsdH1rR7bVL7Tbq/0rTdQhuZl0efT7j+0L9boTN7rMoKyDZcYF
+        5aD/AI+GA4ltDwPtA45PPfua1xWGq4PFYnB1/Z+2wterhq3sa1HE0lVozdOoqeIw9Srh68OeL5K1CrUo
+        1Y2nSnOEoyaTuk1ezSaumnZ907NPyaTXUNpxb4WcD7VcYHmD/nleZGTJnPXJOO+M8VDIhxCMT7f7Muxz
+        KMbcWQJJEu7A9hn0qYqp+znZOP8AS5+POYHIjvOMeeBuGOTgbsfxZwYXUfuDsnJGm3ZwZ2P/AD6E5U3G
+        Cfw5J6VgMldT9pl4nx5enYHmDI/0u5IJxIPTgZPIOeuDzXitW+z6QWE3HxI+GGN0gx/yPPhLkhZDngng
+        gj37V0joouJCFnz5Wn/8t2zj7Vcj/nufp0wMH1xXNeKlAt9IASbj4j/DH7029R/xXPhI5IM7Z59j1A56
+        VFT+HU/wS/8ASWXT/iU/8cf/AEpEOr6H4Z034vW1/oQt31LXdP8AHupeLxHqs928XiBLD4J6XbJcWbT3
+        EelyyeGtN0Cf7HHHZq1ubW/Fu7ag9xL1Lxgwn5IzizvMfO+AMx5x8nUY98/y5nWtK8LWvxcs77QbfSn1
+        fU9K8e3PjGWC6W4vV11bP4J2dpFqKBrhrGZ/DNl4ckWzYWwNj/Z98tvILwTydK8Y+zkCC2x9ju+CeOq5
+        2nyTyOMHHIOTjoccH/u8PWW23xP+tzXFfx5/9u/+kRJZY1DP8kfEmnj77dPtYwB8vTOc/mM0GMGaP5Ij
+        /prD77YH/Evlxj5OgH49eetJLGAzfuLbG+w6N63ag7f3X3SMBunfrgCkaJfOi/0e1/4/G6t6WEuMfuOR
+        0x3HNdJzirGMoQkf+pvyPnbkieDn7nUdB6gg9uTywJJG8uLiDTzne3Xz7jOfk79/QZzSCMbl/cW2fIve
+        M+k0HX9z94DhBjp6dKDGPOk/0e1B8mx78j9/c548gc9c89Mg+tH9ID4w/wCChNsZ/wBkv4pQrb287S+J
+        PhJEsL3c9qkjSfFn4cBIzdQQTT2odmX/AEqCKSe3LedAjSxoD+YH/BIO58Q6t8afFOpeKfB0vg/U3+F/
+        j+GGxvNR164mn04+OfhVfWUht9bhSW1NrDqA0uaWCSRdSudPnvZ4dOlYaXZfp5/wUMslvP2SvijamC1/
+        f+JPhJCQZZo0/e/Fv4boFZrYQTmFywWdY5YmdWddwBNfl/8A8EgrHxUvxp8UXnjfwxZeGtduPhb4/WPT
+        0uppUfTH8dfCi/09pFOpata+ZZ/bpNNiKSfalSzk+2EXclwtfC5tNLjDJU5xjelh0o+0lGo7/wBq3VOk
+        sTTVSEnGP1icsNX9k6eGSnT9o0/668OMMqn0W/F/EPLstrOln0F9fr1Esfh/3fC1o4an/Z9ZuPvOz+vY
+        dv2tVcui9p/QWYwdNkOyM50eHOXbOPs83P3eCSSCOgIwKtPGu2X5Iv8Aj9tf+WjdRJbYH3eR3Hpz161U
+        aMf2a5MFsf8AiURE7z82DbSdP3J5PO7r82ferUkY2y5gtf8Aj7tO/Q+bbYH+p+71I+p4PNfdH8ijkj5i
+        /dxk7rskmRuT5nsnYAAf7Nfy13vhvST4/vdUW3mN4fFUl/n+0dSFqbj+2prjP9n/AGk2HkGX/lxNt9jE
+        X7jyPJ+Sv6kliBeL/R7YndddW+YnzP8Arh16bR3GPav5Z73wpoX/AAsC91kWJOpf8JZJqgvPt+ob/t39
+        tTXX2kD7RsMn2j96BsCdBtC/LX55x9Pl/sBe1r0ubM7fuEm5v9z7s/3lNqOu/vW1ai9j+ufopYVYl+K9
+        8tyzMVT4Kcmsyqciw6vi/wB9h1/Z+OvWVtv3Kso3m9l/UpLGwS9MMUDSfaoPLV5pURn8qy2LJIsMrIhb
+        aHcRyMoJYI5wh+Pvgz8ZP2jPFnwo+L3jL4ifs/2XhTxp4J13xl/wgHgY654wsrjx7bWWkzeJ9I06Ka++
+        Hz6gLIJqNl4SsvFWlaLqd14l1uw1iebwX4XubZdGm7H9rzUNU0X9nT4qaloN/d6FqkH/AAjKWer6Jql9
+        pGq2n2rxT4TtJmtdS0xrK/tmmgnlt5mtbqB3hlli37XZT+PH/BP/AOKP7UOseN/Hlx4wvfEXiHxTpfgv
+        4nX3gXwb4o8b+MPEeieI7yx02z1jw9Hc6ffeLNWtM3GozR6HZXn+gaxbiK4e7jiklkM/2tTP8LgcdQyO
+        rl2FxOJzStgfYY3EYqpQng0q2IjOFKnDF0IVKOI5FHG1Z0a0sPTjSlRqYZynOX41wx4UZnxT4e8Z+ImH
+        zfA4TL+C6ipYzLq1OtLF41zoYWspYecKcqUOVYlRSqyinKMrqVon7S/s5+MPij4/+C3hvxN8ZPAVp8O/
+        H9xZatp+r+HYm1i3djoV/d6KuuTaRrOm2t3oC+IJNPl1nTNHS+8RW8Oi3umXEPiPU1uiYuf/AGpviP8A
+        Gj4XeCtF1z4JfCaD4ta7eePfD2n61oy3HiF7qw8OWyf27q08NloPhzWpmTVrHRrnwxDrE8sSeHNV1/Sd
+        Wi0jxdPCnhjUvy2/bM+If7Xum/s4/AjUtfS+8A/He+034oadrPh7wT4m1DwrFfyaNrvgrw5pOs6uPCvi
+        8+H769n017nxbZqmuT+HobfVWggis43nhXrf2aPiZ+19L+yfqniT4b6DJ8Ufig/7R+h2vijRvGviLVPE
+        954f8I2/wr+Fvi/XNJ0zUPF/ipfsumvfW934duLS31K6uVu/FN5f+HLR9akheb1aWa4WfiDVyD6hkMuT
+        M6/+z1M5S4bVOMqdWNH6+syjjP7FUK8aWHzGWYWr0aTl9cqSUpyVfwpzOh4Q4Hxceb4SWWY7N5ZNDK40
+        a39pwrRxeLwjrym6f1Vpzwc5+zj7y54x5U+ZL9rLVZmt9Pe8t7WC7eVzdQW93NdQRXJguzPBDdSWlnLc
+        QRS70huHs7aSZFWR7WBnMafzs/Er42/Giy+I/wAYYrP4s/Eqzt9G+K3xv0rSbK08eeJ7fT9O0zQ/ib4n
+        03SNNs7CHUEsobDT9PsbOytrRLcW621tFF5exTn+ieGKYQWAu4bF7nzGW4eAPHC84guvO8pJElkjh8wN
+        5CPJK6KEVmZgWr+Wf4seFNDuPi18dNTlsC1//wALu/aAuBcC/wBRXbcQ/Fzxf5LIq3CxqsRRREqIqIqq
+        ioFGK/OuP8RWw2Eyp0sVisJz5lCEpYWUoucXSk+SpatRbg92pOW13G+q/XPoo5Nl+dZ7x3Sx/D+Q8QQw
+        /BtbEUaWfUqVWjhKqxlCKxOF9tluZxhiUm4qUadGXK3astn/AFOyxj7RL8kQxHp3WRuAby4zzs6HHPA4
+        HXnI5nxYmLfSDsjBHxJ+GGCrseP+E58Jeq/XHP3sCulkjU3MmILY4i0/HzdP9KuMY/cnIPG72HfjHMeK
+        o8W+kEQWy4+JHwxO6NskD/hOfCJ4Hkr3wfvcHHpX3dV/u6nT3Jfkz+UqPxUuvvQ1+aINbj8HJ8YLD+w7
+        TRLTW20jx8/i97fToLS/u9ae1+Cxt7vUZhFBJqMn/CN/8I/bfbi1yv2aCwsftCtYG3h6ZxB5BGbP/jzv
+        M/u024ynT5xz6eg9awNd1Xw1P8XdOsdIewttW07R/H0PiqMac9jdXWryW/wXvLa6uJ5I7Uavs0C90OD+
+        0oWvoEjS30w3cc+mTWcHRPNH5B/0i1/487vg4xzs7eaMcfd9uM5rHCP/AGeHrLb/ABPby7fM2xX8ep/2
+        7/6REWUW+5+bP/WWH8CYI+1r9z9590fxeo4460hFv50fzWX/AB+tjMaf9A+X7v7zheeOvf1qSWaPc/8A
+        pFtzJYHAx0F2Pu/vfujgke3brQ00XnRf6Tan/TG6gHj+z5cY/fcKOgHpn1rpOcjAg3JzaA+TfYzGnXzo
+        Ovz/AHscp/s54pMQeZJzZn9xY8CJN+RPcZ/5afeHJbjjBqQSxhk/f23+pvsnA4JngOD++5bHI54x6dDz
+        o/NkH2m1/wBTYDPAYnz7jP8Ay269c8nPP4gHxN/wUStbC9/ZE+K1rdJos1vceIfhNHPHqVlBe6c6N8Wf
+        hxuN5ZyTwx3NmuN1zA80ayxo6maLdvT8tv8AgjrpGp6f8afFlx4q0DwBoPiGf4W+PgU8K6T4dsidLn8d
+        /Cq/tLa+uNB1G9t7lLG7ub3TdPV2imSy0+Jrl9RuWk1W9/Ub/go1No//AAx98WTrN9ottpQ8Q/CVr241
+        dLNtNggX4t/DcvcXi38wszbwMFklFyfJOw7yo5H5U/8ABGiS1i+N3i6PU/EHwy1jxOfhT4/uJ5PA9z4Z
+        uzbaRfePPhReW9reSaClrJsg1CW9tbaKeFYoILSKC2e5hijupfiM1cv9bcnS0XssPe6nzNXzS/s2ouCh
+        e31hTkm39W5E9bf1j4efVP8AiWPxb9pLJViv7ch7KOKjSebOPJwx/uUpSVVQ0lZQi9q76u39E7C3/s2Q
+        ZswRo8Od0ceR/o8vH3x82Rls98VbcW+2U5s/+Pu25MacnzbbkfvPuZzj8enQV2mjGmSZuLYf8SiIYOCR
+        i1k/6a8NnAbgcgHFWnlj2y/6RbH/AEy17djJbbf+Wp47Y/UV9ufyc3bUZGLc+Ud1l9685Mcec+YeT+84
+        J7c9MjNfyNfGXw74Bit/izqttoXg6PxdHZ+N9Rg1GHS9FXxJH4jVNYuI72O8jhXU11xdTCzrcpIL8X4E
+        isLgA17t+1zqvwdtf2mPjFB4u1T4X2/iEeNtSe+i8RXXhaHWFWWO3lsWu49TnW9Ak0+S0ktGmGGtHt2h
+        zA0ZP5ryDQP7K1Df4k+Ef9iN8Em0uHw2sng9vGH/AAnK+EfIFt9i2rrC6u+syT5uBctqZvUTTW0vdtux
+        +QcS5xVzjFPBrDYjBLJ8yrU1WVWpy45RqTpJQUcOrOfseaEXJwanrUVk3/oh4JeGGWcDcPYjiWtxZwrn
+        c+O/Dunmv9mZjg8PSq5DVeDwON+qRqzzPEOvik80eHc/q+FmpYRydL3+Sn7bqmq+PNSvfG9h4svvCtx4
+        LufGnw8g8N21qthPLqGkTePPD9tq0OoQw+Ir6VtLj0C3Mmu2+qWXl6ouo3cscmmafBPpi/YP/BM/SviF
+        o3xL+IOo6N4a+Elh8VIfh/8AFL/hX9tpXhvQI7LU2FjpeqaNZa4NA8Y6aZtCufETWukQ6fdeItGuLSHT
+        obnUNbu3ki1Ffz1kl8InWvGE2p+KvgtqHh+68a/D248J6do8/gabUbLSLbx1oT69NeJahJ7WxsvD1kbn
+        Ug1xeWdzZzalf37aesdzbtBoU2h2+j3H9v8Ai34H6h4gHiXxLeaNPp8/gOfTtP0258Ka0+mHWnhFtBFZ
+        DxTfWenJaX5mtrR4dNhttRvPPtXXycsxtXAYnC450oYl4WrhsQqDlXSrewwNGcqUHKhJJuSccy5l/vHO
+        6UZ9P2zjzIMl4nybinhulmnA2VPPcr4cyqOY4XD4SdTBfXs6xeHnjKMFi6PNOhGopziq1JyoxgpVIXuf
+        rH+37pfx31X9mr9nm3+N2m/DvUfjfBZ/Fix8nUND8J3FnHb2ms+BdD0vXJ5f+Ek1DwhceLNS8MQyeLm1
+        HTo9M0qCfUP7K/4Q6FrS50+b80DdfELQPCssHw+g8BaN4in8ReEtT8QaFp1ro2l+H4LlvC2j3uuRaZA/
+        iaHTMS39hYeH9Xmtry8vL6znM1nqGlyR2+o2XC2yaMfh5dabJ41+CT+Of+Eej0t/EC33gd9Fink166tr
+        J5tSW1WA6s/hyK71KC9fS/7SE4uClhO8UquzWJtGufDjf2B4s+Btl4nbXfClzrF3d3HgW30W9ksfDGkX
+        uvWmlSutxay/8TaKx027is40S8tbkpdz2MMplj789zapnec43NlhcHgI4zFzq/VMOsUsDQjHEYOmo0ks
+        PGSyp+zbwsOX2sIOcZw91yl5Xhvwbk/APDWQcIVc94K4geTcRZnGWb43DYSlXxccZlWa5gp1KUsfi+Wn
+        SljFhofv5x9pSpSUo/BH+sT9gycXX7KnwrmuLuzvJm1n4oqbkLuSWOL4p/EWKFod9zO4tlijRLSMzSCK
+        FYo1kZUBP4JfFvw18O5/jF8dL670DwRL4gf44fHy4+2XGkaG+rtfL8W/FxtJ/tEsJvTcqRGbaTeZRiMx
+        tnbX6f8A7Lej/HfVvgX+xnqHwA8beC9M+EWj+Ofi/f8AxTs7ddEWHWNEf4z+MtMiGiJBaXkGrR3Gj6z4
+        q1NbCG90ewstT0TTNSW7v9QWy0y5/Kf4wal8HE+NXx4tdR1H4Xp4oPx2+P6S295ceFl11tVm+Lvi82wa
+        KeYag19LK8bQKym4dmj2ZZlJ93jDDypcMcE1oYmVeeKp4OrUo4SdWWLwfs6E6HssyjKlGEatRUliIqnO
+        tGVGrRnKcJzlCP8APHgfLAvxe8dlXlw7Gio8VrDzzGFD+z534mrODyuM6igvdaVBRk7U1ZJpJv8ArElF
+        v9pl5sv9Xp3/ACzTobu46fP067uTla5rxSIRBpG02hb/AIWR8MceVGoYZ8c+EuhEhPPTp94j6V4d4G0X
+        9oux/aN+LWteOPGPh/VPgNqmj6Hb/DLQ7VLBNW0y8tJ9Nune+tIbS3nsFWfUfE+nPctqmrz69Fp2nX18
+        ujCCytLn3LxTKjW+kBZ7Zj/wsj4Y/LGACR/wnPhLp+9P48H6V+n47Dxw3uRxOGxanhMPiHUwsqk6dOWJ
+        wtOvLDVHVpUZLE4V1Hh8VFRlThiKdSNOpVgo1JfxBQd5U9GrTitba2kldWurPdeT2Wxg/Erx78OPA/j+
+        x1vxPrvhz4f6Vpul+NrbxP4k8S3GmeFNDu9bvx8GHsZ73xBqps9OvbybTbrSNMtpJ7w3MnkLp6BxZRpE
+        zwb8ZPhD8SZb7Tvh18Vvh94+1DTtJub3UbDwV4x8NeKbuws3mihS7vLbQ7y+mtbZ5nWFbidI4TKwRWLE
+        Kfk7/goh4it/FGi2PhnTLPVV1jw5quvaU9q9mhfWZSvwk1qS50VIWuLi+itYPEdjbyweXBfpKlxdmxbS
+        /seo3XzL+wYr+C/iP4x1Txetz4V06f4eahplvd+ILd9IhudQuPEGg3MVrbtqEMPnztb2dzIUh37EjJcr
+        uTd8hHNsbRzfAZXTy6VXA4ijOtWzFe15MPO2Il7OdqbpKUlSp6TqQl+8Ts7xR+v5fwFwzmXhjxTx1i+N
+        cHgOJ8lzahgMt4LnPL1js6wsp5HTnjaFOrjYY+cIrMca39XwVaEf7Oq3npVdP9lZZE3N88v+ssM/ujz/
+        AKWvP+p4APPYEnbyRikMiGaP55f+P5v+WJ5/0CX/AKYdMfpzgVxMvxN+HZZivjrw6Qz2LD/ia2GCI7rc
+        5HI5ROSM4xg7ccV8zftAadefE/xR8GtW+Hv7Sll8NdM8B/ECHxJ4vsNP1lIX8W6Mw02xvbGGW2jaOK9X
+        w7J4psbGTVU1HQvtWpwx6joN9vivdL+xwlLD4jERpYjHYfA0pRqyliq6rVaUJU6M6lOEoYSniK7depGN
+        CDhRlGM6kZVHCnGc4/j7U0tKdST00UJJu9trpLS99/TXQ+zhIpZPml/1F+eYif8AltB38juOcnkHjIqj
+        qmr6XollqmtazqltpOj6Tpcep6rqupyw2GnaZptgLy7v9R1C/ukitbKysbaGa5u7u5ljt7e3ikmmkSNG
+        YclJ8VvhpBNaRTfEHwzE919utbVZtY06OS4uT/pX2eBGcNNK1tbXNz5cYaQQW80v+rikI+G/if4Y8QXX
+        jT9pf4hQftCw+JvA3jz9nzxR4J8I/By31VJGg8RQ+FpYdDEEJjGnTCXWNX8byRQWUNpqaz6ppH23V9Yt
+        mi07RM6caM6ONqTxmHoVMNg6mIw9Koq9SWOrwqUoxwVF4ejWVOtOE51YzxHsqHLRnB1Y1JU4z6MNRVbF
+        YWhUcqVKviaFGrWcbRoU6lSMJ1pOfLHlpxbk7vZa6XazP27P2j/2e/E37MXxF0Pwx8fPhTruu3/iT4Wv
+        YaX4X+IPgvxBr1wtj8T/AADf3lxp2j6de6leXr6dY2V5qU6xWF1HDa2Nxc3ETW8E5Hwp/wAEedV1iX42
+        eK9N8VeO7Pxtr8fws+IGotPpq3M1vZ2OoePPhRObdZLnw/o02was+pmCJoZYbSy+xWlktnZww2Ft87eM
+        fhz481iHRYbDwn4t3Wvi7Q9QuZotDv4ZbaxtlP2i7iNxZ7WeAHdGqLM7yAbIJSCp+tv+CXfgzxh8HPij
+        4hvPi54i1AwXPgDxxDD4h8R2t5pNkmoa94w+G2rpo1tNrUEU000t3p/iG+jVZJFa1i8yGPT4DHYwflOD
+        xuYZzn2V4/G5RXy+VGpSpOE8PWlaEIZhJVliK2BToU1Kvy1oPEUVWcqHu1HS93+9c5yPgrw28D/FHgzh
+        3xQ4U4rjmlTBZrRpQxOUzzbGYitWyWhVwuX08Bn1dVFQp5fGtLkwmJqRTq83LFpx/anxz8W/hT8MrHTo
+        fiT8TvA3w+m17R7htEh8ceLPD3hSTWV02CBNSOkpr13YNqI05tR05b57RZhbNfWQuChuod/Hv+1b+y4R
+        IB+0n8CSftdq2P8Ahbfw96eZbndxrXT5XwTx8p96/Mn/AIKk+Gtd+N2nfCXRvhJr99e6jY+GfHVtqWp+
+        FILvWzpcd5qvw1aSy1CHQle/jj1HT7HVY7fy7izaS6to1e7WISxyfmP4g/Z5+Per2dpDp6ePtDv7LxB4
+        b1TUdVj8O65I3iKHTPDGiafdSyLZ6UhiuDremySRNe262iRedJPo95HNbAfRZlxFmGDx1fC0Mr+sUabi
+        o4j2eYzi06eEmpt4bA1qcoznXrUYxo1KtWMqEpVacINSPx/w98FPDni3hLh3Ps/8Xcn4XzTN8ZmOHzDI
+        8ZiMip4jK6ODq5tToVqsMZnGExUY4qGAwtWEq1GlGUcdT9lKS5Pae6/tF/GT4Xaj8dvihfaT498P61p1
+        54x1i4stV0O7XW9KvreeUPHPZarpKXenXkRB2l7W5lRHDxORJG6r+ecniC9/4R6/dviRbN4Wf4EN4dj8
+        FhHNyPEg8GmxSAxnw2IFg/tBrmY3Y1pr83JihNydKAsY/qVfgB8cJfEvhXWbew8faHpWieJ/HOoat4ej
+        8O648Os2WteNNc1bT5z9m06S1U3elXsP2lL4XMoidIII9Iv4Zpzykn7N3x9bSr6X+yvHr28vwSPguLwI
+        NC1X7MfEv/CI/wBlLGbv7IdHa3GpNcusomDi6kS6/to6d/oA/N55fiquMx+Mll+MjUx2JniqlOWExFSF
+        OVXF4q9CnKrlc4wq8nJWpYqMvZ06dWKliKc+ZH9q5ZxXwrk/CHDuR0PE7w8r08m8OsVkdN1MXlv1mTwu
+        W5BhaNGuocVRX17ELDvljCnD95TrOGHklaHlt14rnTV/F17rPxOtNa8P6n45+G1/4X0WCKQy6TZ6d4/8
+        PXuozXKP4XsEtTp+j2VqLeK0vbqO6KX82oR3+oOl5NBonibWbLSng174sWWseIn8UeJ9R0DVooTPa6Fb
+        33g/X4LG4uzceD7bH/FS6mY5bIafqenWmn/YYNMs4LdZLRPfJf2ffjjFrPi/VLmw8fa9p2u+NPh9rGka
+        E/h7WoYdDsNE8c6Hquqyk3Wnw2zPZ6Dp0QsxY/ZpHS2ntZoNWvZLa4eroX7O/wAftJ0iayv08f65qtx4
+        n8S6vYazJ4d1uP8A4R+DVfCWuWVrKkd5pTyPMviTU2klSygktGtpYJbbSrCFLqNMVluKVGcf7PxDtCCt
+        DLalNzay6lC1J/2ND2bpSTpYz4frtdOcfrV7n0WYeIHC88diZR8TPDacHU4PfPHG5c4yWH4hxFaq4tcX
+        NP6tTlGtiNXy0JJS9krTfg1vrurf8IDc6DJ8W7R/Gg8NrpJ8ViS98iG2n1+4FvaLqJ8LjVvtUnha3lZt
+        T+xPrCa0JJ49YUrDdK3VfE2u3+gTQaJ8WtN03xYuu+D7jXddkjlt7DWbjSfDGlXOpR2zWfg+WX7PHr62
+        CrbHTNPtb7Rzc2mq2t5BcT2Nz7tB+zb8dk+H83hJx4/k1k+Hf7EHi9vDfiLz1tZNflkjs47Z7Y626L4Z
+        Q28u28NxFeuEGtwtJbT0ms/s6/tAapoB0yyHj3SNci1nwhf3viIeHNec6/NoXh7T/tjPFaabFdpA/iO3
+        tmhe5jjhFvDL9ptdTjimspt1l2K5/wDcqn+81Zczyqq6VnjaElXdFZG28FUs50sB7OU6MVUf1WndyYvE
+        Dhf6/Tl/xE3w25VxJVrubxuA5OR8MYmgq7f+t/8ABlUmsNzKSj9YqL962nSl+lPwL+KUNx8Mf2RZfBf7
+        Znwf+FvhzwH48+K2q/GTwN4t+JXgTwz4l1zT7/4s+Jzp6jw/qfhvUbm5n1bwNr/iy5/s7xLcaXosV5de
+        C/EGjadbarBp/iPR/gv4k/Fb4d6h8SfjM+n+MdI1CDU/jB8drnTL3T5XvtO1G11T4qeLLnTb2w1G1iks
+        Lyxv7a4gubW8triS0nt5knimaJg55Of9nv46XnifStVsbDx/oOmaT4/1nXr6w/4RzW5T4i0+5g0mzglY
+        WenNBDLcac2v28/9oxyYkktPIsbaV0vrappn7O3x4j1y01dtM8d2mjwaD4z0qbwc/h/WTBc3utaz4huI
+        pxcJYtpcVvch/Dl0pkdrrfFdF7+ztlezuPazfHZnnmU8PZTiMoqYajw/h6VPDVcPgMRTxVdxlipKlmFW
+        llKeMxNRyvSxNWpVhQozoYadajSoxow/HuCck4C4I4p424xwPi7wVjcdx9gOKMVmGDxmNyf6rgK2Izeh
+        j6eGwSpcTQqJ4iWJn7BVnOUqVFyjGtLmmfvd8KfipY3n7UXxK1y9/bP+CfxD+Ffj6y8NaN8IvhfofxT+
+        H+seI7TVvtGlS2dvDoWl6FYt9qj1C+8W2FgNC13U9S1vTLnQn8Strup29o+ifb/itx9n0gB5Dn4k/DEY
+        MRUY/wCE58JY58pfXHXuWHTI/mm/Zl+Cvxd8JftI+BPGvigeMo/CH/CWfCyVtL1XQ9XtbDw3baBr/h++
+        1C8ur25sU02K208Q666GBrXy7SZPtMmp3MqSW/7J/B7w7rnwy1Xxjb/EH9oi3+Kc3xJ+P/w513wJpWo6
+        qr3ei6efiFokKaTBHdor3movpr6Jb38ukfYdGllsI/7M8O6MqTSal+oZbm9fiHAY/H5nDAZRisDhstwm
+        FwNPA4jByzCnTwOFoScIxy7C0HicNBN4/F4jklj8RCrXjiMZXqzm/wCJfFbgHhrgDPsmy3hTjHC8c4HH
+        5VSzLF5hgKuAr0svxdTG4qjLAVJZfjsfCMo0qFKsoTqQqQhWjemoWk/vb4m/Bn4efFn+xJ/G+k6lfXfh
+        dtRm0C+0jxX4x8I3unyaktmb0C98G+IPD17cwzSabp87W9zcyxLcWVtcRLHPEkq/Jfgn9n7wZ4k+D+u+
+        KNRtPFkHjGxb4hWVi9l8fP2jl0OWTw9res6bpU1xDN8UJLyIyxadb/a2V7poZGmmtg0bi1BRXlttKbX2
+        Ycy8nfc+HW69USv+z/4Iv/gh4a8eWVv4tsPGOs+G/BetXkUvx0/aOvPDkV5qx0241GC3tV+LVpfGzDXs
+        6xBrpLmaBI4JrhHIuYtz4l/s5/DnwungW50G18cSJrXj7wvoGuRan8e/2h3J0vXbuHTLqXT2t/iiqpdW
+        0crXFtDIgge8WCaV/KimtrwopvS9ulSEV/hbSa+4lN/+Ur/P95r66L7ip4v/AGYfhVbfE34Z6ONI8XX+
+        iajc67cSPqPxy/aBm1jRtSt/DviGZdW0O7b4nSxQ3rQqdGDKlrLDpGra5EtzILmOBM/QfgZ8NNX+N3jj
+        wDLZeOx4b8N6FpU9s6/Hb9oaLVTqrQaJqU++f/hbMttNZPa+IoE3i3t5neDyGiCW7XGoFFOOqv5z/Baf
+        cKTabt3p/wDk3Lf77v8AQ2fh7+zz8L/FF541k1K28fnT9J8QazY6OLf46/tCW1zCui+I/FXha4hvEb4s
+        XMFzGy+Hre9hmVovOubu7ka1tVFvBD5x4G+Gfwx8Q/ADxT8XLqx8fPqejaP4s1awhHxr/aFt7MyaVpC6
+        pHDdab/wuq5eaCG+EttEqavDNJpqQp9pt7h5pKKKGrKTW/Kn8/d19f8Ahti38Vv7yXXZySt5mrqHwO8B
+        W/wU0rxto9h4xuvGetTaF4f0ibVPjt+0FbafKfEPi+18PWs15JF8TNSuNGlurWW2u7+5s4NbSx1GNJRp
+        +uW1nFaXGx8U/gz8P/B2nfDRtF0vxe+qeMfGnhXSNWhvvjp+0DJZRWF4IJdVTT7uH4mxS2sxIjitpJNP
+        uYZY5Lh5raKVgxKKS2/7el+FjPmeuv8Ay7cvmk2n969CTxl8GPh5oXxe+F3gTSdN8Yy6P4qOty+I5L/4
+        4/H77dBbRaTqt7pz6RcRfE9omnF9pjR3MF5aCKK0b9xO0kipbbmm/s/fDXUfir4i8JJD44Xw1ofhrT3l
+        ib41fH5dYOsXcttKktvqS/Fp4WsxYXm2dpLGO7e5EPlyRLavLfFFJfq/zYXfNJdFyWXa7d/6+4xPh18G
+        Phx4s+IHxZ8OX9h43XRPB99osegzW3xv+PltqbSyXPiLTtVhv8/FG5tmtluPDsEtm9v5bXC3N291DGss
+        drb5fwu+E3w88W/Drx94w1qw8ZRzeG9b8Tf2G9j8afj8Fm0e18O6Z4gsG1TTZvi1ta9gk1S4tJLS31QW
+        8lvbWrJeRzvJMhRSelO6vfkbvq9bPXXrovuL2qNLbnivlyRdvvbYmgfBnwTf/ADSPHOpWfi638Z6hbWm
+        m3DWXxv/AGgbnRotTuvFQ8MLLClx8UbW6kjDOjteuUkD5vhpzKo0pp/iV8H/AIe+Dvhx4E8SW9l4zGu+
+        J9a8I6dqEZ+NXx/u9MF1q2lT3tzFao3xZs7i1sjd2aJ5jNdyfYjNF9mN1cC8tyiqf2/8cV8uxEG3BNvX
+        2Slfz5W7+tza+InwQ+Gnhfxt8K/DWlWfjlrfxhqWqpqS3nxr+PksjwWl/wCG7WQQXifFaMWgitNdv7mG
+        JtPvhPe2+mx+bZWsM4ntT/ADwE3xig8HWum+L38IWvg6wv8AVJ5vj7+0HBrsWq63eeJorJrRE+IV1a6j
+        btD4XZZJZbnR7jS2kmZRrh1KM6IUUuq85yXyVLmX4q4SbUYvq5U1/wCBTin96b/QoeE/gh8PNe+LvxP8
+        H3dh4zHh3wjbeGV0qWD45fH621P7XdWEepXYuwfidcW1xHLLeFVnhazPkWttbyWUhaa4eX4HfBT4ceLP
+        EPiXxLrvh7WLq8+G/wAV7oeA5rn4q/GbW4bdPDkum3Wk3+p6H4m8f63pEuow6hbreSQOl9p8lxFDceSp
+        VIoSii750unJJ/NSppfhJ/f6C5neKvvUcX6KEnb70n8j/9k=
+</value>
+  </data>
+  <data name="cbVDotPlot.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        /9j/4AAQSkZJRgABAQEAYABgAAD/4QECRXhpZgAATU0AKgAAAAgABwEaAAUAAAABAAAAYgEbAAUAAAAB
+        AAAAagEoAAMAAAABAAIAAAExAAIAAAAQAAAAcgE7AAIAAAAIAAAAgodpAAQAAAABAAAAipydAAEAAAAQ
+        AAAA6gAAAAAAAABgAAAAAQAAAGAAAAABcGFpbnQubmV0IDQuMC42AEJyaWFudGEAAASQAwACAAAAFAAA
+        AMCQBAACAAAAFAAAANSSkQACAAAAAzcyAACSkgACAAAAAzcyAAAAAAAAMjAxNTowOToyMyAwNzowNjoz
+        MQAyMDE1OjA5OjIzIDA3OjA2OjMxAAAAQgByAGkAYQBuAHQAYQAAAP/bAEMAAQEBAQEBAQEBAQEBAQEB
+        AQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAf/bAEMBAQEBAQEB
+        AQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAf/A
+        ABEIAJYAoAMBIgACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMD
+        AgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygp
+        KjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOk
+        paanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQAD
+        AQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFR
+        B2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZ
+        WmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfI
+        ycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/AP7Hv2nvjp8Q/BHw8+MN14P0
+        fW/B+p+BPDXivV9B8cT6ZZ3+l61c6J8I/iJ48h+xW3ibQm0q5tLPW/C2k6bqi2n9rTzR3F5DEbFTb6g/
+        5V/sn/8ABQL9qj43/GyfwB4o1nxJZ6Rpur+NLH7JY+GPhbp2peJ08N+AvG2sW0Gk6rqXg+PTYZ7jxL4S
+        e2N7vl0f7LNFGdQLrdSw/ox+294p8Sa38GPj54X1bwNqWjaDoPgL4mpofiyLVroReJo9U/Zy+NUt7NBE
+        2naStidImt47ORbDVtYu/tF1b3BhtI1SY/zJ/Dfxj8RfBvje58TaBpvj7wL4g8L+Ob7QvCuq3PxH+Jl4
+        mtWNz4d8VaTefYZ/Etxc2pjvzp0zp4g0uxeY6PrUMMFq0RNxqny+eZlLLcXl1Z1Kn1eC9viaUK0abq0q
+        OIw7mo0ZYiisQ6lOUqUoclRUoTdWTppc8f6n8CuAMFx14feJ+G/sLIsdnkpZbleR51m9SrTrZJjMzw+J
+        w9DEYd0cBjKqhDEzo1qsqcoTSp3hGclE/ox8DftPfF/xf+zN4y+PVxonxl0nxB4YPif7F8NrrT/hnBre
+        uQ6dPpcuj3lpb33wvstaEM2m6xbyTWj6LHrGqT2V6fDul6lHeaJ/aP0V8H/F/wARPid8NPBvj7VfE/xL
+        8Gah4p0DTtXuvCup2Pwrk1HR5ru4uYHt7kn4dQzRmRYBcR215a2ep2kcyW2qWFjqMd1Z2/8ANBp37bP7
+        Yd7oses3Wv8AxO07Xf8AhGPiJqMHgq48TeKobzU59J1v4fRaPOEnsDrMcsFn4g1OE6faLJbavcRCSea2
+        dov7KbqX7bn7YdnpV1q1p4g+JupayvhT4catP4Kg8S+LJr7S7nV9d+IsetThLfT21qea4sfDmlW8dheo
+        ltpFzJ5sEl3IJhq/0GL494ar/WYYbh36jOtm1WWHlDH4StDC0HUeGhlsamJzWdKrhKdW045nVlLnUbTx
+        LT5Tgj9DzxQ+sLDPibg51Fjllrbx2eqDxCytZw5trIeZU/qrVPSLk62ns+Rub/qrWy8aeZIp+J/jzC3C
+        xDGm/CvO02qTcn/hX3UOx54BXjrSRWfjRhz8T/Hn+svFyNM+FYwILhokOP8AhXx6KPm/vNgjrgfmD8EP
+        2j/2jrX4d/BZtO+Guu/Gm48cfGjUfCvj3xBe6x4t1N/A2gzWHhLTbd7/AFrSPCusHT9M0/WfFg1248Ua
+        8nlW3h7w1rVj/YscNz/a3hz7D8SfFr4u6N+0n8P/AITaL8GNR1v4V+JvDfiTUfEnxXS58SDTfDurvc6z
+        fafb3d/aeHbvw5p0ljb+EdV0+TR77VWm1/UPGHhCRdW8OeSLLxH9bl2WyzPL8BmWGp4ONDMcrxGb0I18
+        bllOtDC4SFSpXjXpSxd6WKcaUvq+Fl/tONbp/U6WI9rT5/5i4jyzH8McQ59w1jsRGrjuHs5zDI8bVwsq
+        88NUxeW4yrgq9TDzqU6VSeHlVoylTnUpU5ODTqQpycor3OPSvFkcj3UfxH8axXV4mn/arlNI+FCzTjzP
+        JjWaRfh5vkEKO4gV2YRb2wAGOY7LQvEmlr9l034g+MNOtp9U1C7nhstE+E1tHLeam11rGpX0iQ/DxFe7
+        1HU7m5v724KmW6u7ie4nZ55pJG6fD7Iv3U3+r07jzsgf6QOf9fzkgcdhzxmlKt5yYhn/AOP48+fzj+zn
+        9J+fpz0xgg8cvsaX/PqH/gC/HT+tTyfbVv8An7U/8Cf+f9a92YZs/GmVx8T/AB5tMNy+DpnwrzuikiVP
+        +afHghyCMZzgnpg5Wo6nq2j3S22r/GrxLpcrw208UOoj4PWUskck80Ujolz4FiZ0/dEblDKjKQT1x2DB
+        js/dT8218SfO5/1kHT9/69eMD5SemRwPi1PHstl8WbT4W6r4d0D4mXfwz8NReBdS8Z+bceHrXxEdR8fi
+        wl1SO3a4uFs1mdFluo7PUhYvIl7Jo+tRwtpN4OjRvFONCmpTpwc6q5acFOcYc85RjKUYwvzScYydk/dl
+        s+nC89ac+epXcadN1OWnU5ZytOELJyU19u/wu7VtLtjV8UEySKfj7qpUTBFP2z4LD5PIjkzk+CSCfMLL
+        uHy/wfeHLI/FTMpLfH3VQQ12P+Pz4LdIrho4f+ZK5JjAY/385X2o+GLf9p+3j8Gy+J/HnwRvJn0DwjH8
+        QLW28PeIX8nxJFptunjOXwheW+v6Yr2E16biXSG1mzczmKJ5LXSoLk2djoix/aBP9p2z/EP4YNbDS0h0
+        W9g0a7tdaGtDU9Pmm1LVpZ59S0efS0szqVsdFsdGs7m8hjtraPXdLvLmTW7LR4XDXSWNyZ6J39pikleS
+        i028DrKLs5aW5XdNpSZ2OnTi7WzJ6wV1XpuPvKD1bwydo3alZX5lJJSvG7W8UsFGPj7qpybXkXfwW/5a
+        zBJeP+EK/hjOfRTywIFOPik70X/hfuqBTMUJ+2fBUfJ9maXqfBWP9YAN5O3HyD5+Ko6PB+03aQaNbaz4
+        6+B+rvZ3fh1NV1GLQfE2n3es6fHZ6zD4nupLWLXXsrTULi8n0K80W0skgtbb7BqUN7dzRX0CWvAfFGD9
+        sK48IeNrXwl4q+GT6sur6EfAk3gsxaX4tk0xrizn13+3rvx3eTeEYBCst9ZWltZW32mXTrK2vG1BtQvp
+        rCDHF0qOFw+LrwrZXjHhqUqsKODqVamIxXLJR9nhKdbC0faVXeMlTqSpXi5c1nGR1ZZgaWY5hgMBPEV8
+        vWNx2FwUsfmWNhRy7ArEV4UXjMdXo4LEVKWCwybq4mrGjUnChGU40py9yXpjeKWBH/F/dVwYbhji7+Cx
+        HmI0IQf8iV3DvxwTjIHGaVvFJEjqPj9qhVRb7T9s+C3JeWVZBkeCTkhFU/7I5YAEZyPhxbftGW+l+Ck8
+        a+NvAEqP4V8OJ40h1GwjufGNnr6abpcHiH+z9U0C+t/Cc08t2mq3YuH0/UbE3c1tHbwfYbZ/tfRPZ/HO
+        W1v4H8efDe3uma1j0m/sNJvIXtxFJOJLrVIb+61S3vzdiSKS6srNNKG21S0s7+ya6lv4/LjjoNR/4T6l
+        3Z2cKKa92Mrtc/nZ2v7yafRv0qmRYWlVlSee4KpyOFqlPMcTKlPmrKlLkl/Yq5lTUXUm7a0ryhzyajKm
+        nihjJIp+Puq7VuBGp+2fBYZjNskm7P8AwhWCBKWXP/Aeo5aPFLlGb/hfuqkj7WR/pfwX5EUpWHj/AIQo
+        feTGf733lGCBWnon/C9bRtITXfFXwi1OK2OiW+rvZadr2n3OpwrEU8SahCf7UuLa1v5mEU2i28cCWUTN
+        eR3ayrJbNZ5Ekv7ScOl6wkPiL4GXerQXOnL4bmurXxZa2eoWVvHqCavN4oW2v5ntrzUidLNhBokccGk3
+        C3ss0uq25hsGJY6CV/7PqP4tFTpN+6lLT94o2ktIu/K5aNq+qWQ0HJxjnWClyuklL+1KkYS9pNQclKpl
+        MGo07KpUc1BqnLmipNVIQkm8VrGrOf2gNTRFEDM73vwVCorS7ZWYnwUFAWL5iScR/efC81xnxF8VfFfw
+        b4v+E8ej/EnX7zRtZ+IfhPRfFOm65o/w6kj1PR9a8ceAvDNxaQS6X4Gsb+2kNt4nvX+0Wuo2c0bRxsjl
+        l2n0gz/EaLwf43PxC134f3sbeDvEQtYfCVrqllsumt78wFm1bU713RLHbHLg5muCpiWJYWe68w+NYI8T
+        fCPKSp/xdL4c43vvHPxg+DvQ+Y/1PvwOK2VSnWw1SoqCoyXs2k4xU1zTS1Sva6XfVPzPMxmEjgq9GFLF
+        PFJ1KsJVKeIeIoVFClSmnTk8PhZaObUuam7Nbpp35n9uO58Yal8BPjrYa/oOnW3ha38F/Fe38NXyXRj1
+        DVLGf9m74xNqt1PFBd35heG/dLG0Rl0ud7ZZb04aSO3T+VGw8Javdalq1v4i8CwaPDB4+Gn+FpD4g8Tf
+        Z9b02DS/EMURaT+0bu4W0nvdEtdQS8EVrqT22oqgsY7VoPtP9TX7cU/xFn+DPx7tPF2m+Cv+Fcp4B+KK
+        eDbiAX0evXEcn7OPxnOvHXRd3eoadd7ZjFBbRQ2WjrHaGeWSW/MjRW/8qWm+G7VtR1uPxJ4Q+C+n2j+O
+        ha+FpNP8PeD/ALLe6JHp2vwW7atb6dq1zPJotxdadoWtf2dqs1teLf6gY5L2KSO2ttM/PeLnJPC2k4/7
+        JiGrKftV79BP2MVisPGVV6qqpwqKNLnlH2crVIf2r9FWnh6nDfHDrZdkONaz/hZKWcYiFCrC9WonGgp5
+        Zj+elPas1OnaLfuVNipp/hrxNcaZbXmqfD2Ox8bf8In8SbvTfDj654gH21rXXfhuNKdymt3IhnjttWv4
+        I7aLVTZ3EkMD6pc2syTfYW6j4b8UQWV9d6X8PYb3xovg74aX2oeG11zxGRZSXmvfEw6s0bPrVu000ttp
+        Gn2z2z6q1paySzNplxdTNH9vz9N8P3LaNANX8E/Bm18cSeF/iLc2OlRaJ4GbQ5ryLWvh62hHUEttUbRJ
+        9Ts7W/8AEFlpF5cXdubS2a4L216g1BtS/Uj9j7wN8Tb39nf4k3nwU+EPwI8WfGOz8QfCiXVNH1Hwf8PL
+        vRo7YJ40u9ettNl1fxBpvhyw1PU/7P0DStVvP7SvPtenzzmystNmk07UND4Mgyief51g8ohjsBgXi8bU
+        prE4urXhl1FQxdSpy1qv9pxlDKbR5JYqVSNSnF8zxPus/dvErjHK/DfIM44xr8GcK51TynifL4SyzAZp
+        hoYmusfkGCy9QpTnw1OPs6VTFLFTbg1KpTnFU037RfFuiePvj94B1A+E/hX4l+Iek+GLb4m2Frr+keGP
+        i58UdB0Dw7Z6j4A+HlzqM9pY6T4n0hBFJrHiC/1efUPstxqrx2bLLYy2guPsv9U37Nl5qWqfs/8AwV1L
+        Vru61nVL74YeFrrUNX1jU73VtW1K8uNG097q/wBU1TUTdX+o391MzTXV/fXNxdXdw7zXE8s0jO3zr8ZP
+        hL8SLXXPgXb/AAe+C37PGradL4x06D443198MPBK2Nlok9pomk6je6dp+seJ9I1OPRLRNb8QeLotE0O7
+        1LxHJeeGdJtRr08Et7pPiX0rVf8AhorSP2h/hr4f8BeGvAdp+y7a+EtcsPF9yun6Nb3ej6m0urT6fa2N
+        qPFWm6uG0lvDHh7RfD76H4cGhafZ+O9UbV9L199Msrzw1+p8PcIYrLYwrVuIMvxcK+V4qrGnVxNajUpP
+        LJ1JOliKVfF4iFPG4uNJwy7D0qVF4mnPD2lOc3OX8C+Lfi/kPiRl2V4PK/D3AcIYvAZxmmZYzMMHiMFi
+        a2ZLNKs6sMPWlhslyuq4YN1XH2tatX5+Vy9nS2X1KFfy4f8AR7cfJpv8eQR9oXBX9z1Hcf3cY6U9kbzo
+        x9ntz/pp/ix10+TkAwHj0HPOOTXzB4Pvv2mJf2jviJY+L9H8HQ/s5QeG/Dcfw71ezttKTVb7XLY6JfTP
+        +48W3+v291eT+I9f0bWbnWNAi0u9j8A6Tc6Fp3h77fd3XiX6afHnR/u7L/j9bgycgf2e4AX9z04498fS
+        vcxWGeFnSg6+GxHtMNhcTzYWsq8IfWqFOuqFSUUlDE0FU9liqOsqFeNSlJ80Gfhad76NWbWqts7XXk90
+        +q1HlXOzMEGPs17n5jn/AFsBBP7nrkjIx3J471L7StPv591/o+k3pijsxGbuCC5Kb7iYME861faH2rv2
+        kbtoyDtG2w235P3doQLe9zmQbtwkg25/ckbhznrxnGKV9vnSfu7LPl2P3ZBvJ+0z/wDTHuOG6kZPXvzF
+        xlKDUoSlCS2lGTi1800zLXwz4fE0n/FM+HSDdDAOnWPB+wxHAP2IjaeSSAOSeM81FD4Z0AIw/wCEY8O/
+        f1Ppp1jwBev/ANOPY4x0z04xW0Mec/7uyz9rH/LQYx9gj/6Y/cznPvmo4cbG/d2X39T4Egx/x+vyT5PB
+        H8PH3ifTk/rY1+s4n/oIr9P+X1Tpt9oy5fDWgYX/AIpnw6f+Qfz/AGbYgf8AH0uM/wChcEgkEdxk5OKc
+        fDPh83CA+GfD3/H4Qf8AiW2JBxp7nH/HiPl/PDjkcjGlLjC5jsv+YbnMny5+1jGf3P3hn6lSakIX7TH+
+        7tD/AKb0EgAH/EvkyB+5Py9yeP3h6HGS1ul3aX5B9ZxP/QRX7/xqnl/eMaTwzoA2E+GPDvFpedNNsQ3D
+        256fYeWHTp+IFSv4a0Dz3/4pnw7ytlj/AIltjgH7TMMj/QeScDd0wAoJPbQkxlMx2efst5kiT959+25/
+        1X3s89foepqV8ee/7uzHFjgiQYB+1TZIHk9+jjIP3eaQfWcS/wDmIr/+Dqn/AMkY6eGdAE83/FM+Hf8A
+        j+XBGm2PQ6dGxz/oPAzk5zgnn3pg8NeH9kg/4Rnw7nGpYJ06yHAuSAP+PLjA4HP3RkYHy1sR7fPm/d2X
+        /H8MbZBgj+zovvfuRgDrxn5gOnUM42vujss41T70nH/HyMZzD16Y5+726Uf1t6f5IPrOJ/6CK/f+NU/+
+        SM6Tw1oAYY8NeHkObA/Lp1jjP2sYwRZAnOOnYY6g14x8bFI8S/CPMcaH/haXw5/1fIJHxg+D2cHYnA4z
+        156gd/fH27hiOy5NhgLJ8uftfBXEXXGN3A+XnPWvAfjTj/hJfhHhYV/4ul8OP9SwYH/i7/wdz/AmB+J5
+        /Tnxf8Cp/wBufhOJdCpUqV6XtJ1KlnK3POU2rxd7OTbWy8tDhv247P4gW3wX+Pl94u13wvJ8O7z4dfFR
+        PC+jeSZtRsI4P2ePjf8A26+q3slhpFskN6HsZo4JW1pYILeeBrhdr3N1/KNplx4aj1DWz4i8V/BG7s5/
+        HQufDk+lyeCJ003Qf7O1/T7a41m2tpYI4LFpofD901jdTzW66hfbX1KS7uPLt/6uf23dH8d6P8Gfj74g
+        8SeObTUvA+ofDv4nf8Iz4VbQ7KI+F10/9nv44vrN0+s2tvZXtw2q+dpjOuqS6rDZjTD9ka3a7mLfyy6f
+        4pubPUtXl8RfFrTNYtL/AMff2h4Zmt9kk/h/TTpfiLTbS5mhn8OWNpHdraSeHvNsbeO/0r+0VvLhLOQ3
+        F5dX/wCX8X8zlhlGPO3hMQoqKqe1b9pQk40JxwmIjCaScqrnUpqdFSpx9o5KJ/dv0Vq2Hp8OccqtmGRY
+        OUs94UcYZxh6dapNKtUvPDc+ZYHlpwv++ShUTV/fp3ucJp0unpo8Nvqniz4IP4xbwz8QktNUtrvwPNoF
+        pqF/rPw+udDtdQu41gsRftbp4kTTppbBZ7W0ivmsbPUILGVrluoy2DaZdRaR4s+CEfi9fCnw4W41O4uv
+        A8Ph+81LT9b+It1r1rYXki3GntfeRJ4ai1OWCxM1zZz2P2yy02C+he139P8AEOtwaXbaZqvxf0W78Zye
+        E/iTbWfimGSVrTTbjV9c+HF3aWfn3HhqK98mVrDWP3n9n3lxaW7FLC6simnR2LNS8Ra5PY32naX8YNFt
+        PGaeD/hjb3nimeWSOy1W60fxB8TLy9smnh8Nz3ogja/0RjINMtbm8t18i/u70SajHefMe8pJ2opfW2+Z
+        0a7oKDx/8X2byr/kWpSfLhXBVHHSOGtqv6y+tYJZpL/hc4Lt/rNq3gKHK7cHRXMl/rArxUn7O7dvrGvt
+        G/dOqt/AmueJtWXVvh7a+BdR8ND4i6fLrGsx+HNCvNL1nQ4PAvgDSNUk8PSR2+oWN1aQak3imabTrG6i
+        t4tbsJ4zqiahbPBcf0hfAfw7+0dby/sk3nhbxF4a0f8AZ30b9n/w/pPjjwrc2VlBrB1q58PSTQtZ6e8S
+        3Lrp8+g+GNOtbtL7TX0WDxDqkdvpOswz3k2k+bfsDftHfALwp8Cv7K8WfH/4SaHrKeOdXlntfFnj7wd4
+        b1udf7C0GAahd6RqGqaRcWy3ssEksZGnWlvOGElrCLdogftGP9rX9ltIzM37Tf7PqRD+0ZfMb4u/D9U8
+        l7kyrKX/AOEmCmNosSK+duzD7sDcP1Pgujh8loxzFV8JXqZhk6wlTDZhh8LUlhvrtCTnUbmoyeNw/tZf
+        Va86cKuGqU4SpKDgkv8APbx+47z7jbH4jg6PCdCjguDuL+KfqWeZLhcbKGdUf7UxOHWIUI06lGGFnGEK
+        lJUsRiIeznGLq1E1N+/iRtkX762+5pvIU4P+kL/026juO4OMjs5pD50f762/4/T/AAnJH9nOeD5x/D/J
+        rw7Rv2nP2c/EWo6NoegftDfA/XNb1u70HS9G0jR/if4I1LVNX1LUNQhtdP03S9Ps/EM13fX99dTw21pa
+        WsM1xdTzRQwRvI6q3uTNL50f7wf8frdLaY/8w9xwd/Ax7jH54+phUp1LunOE0m0+Sakk9NHyt6+uq+Z/
+        NGJweLwcowxmFxOFnOPPCOJoVaEpwu1zxjVjFyjdNcyTV01fQazt8hM9sB9nvc/LyMywY/5bdT356DI6
+        U55G86T9/bf6uw6Kc83Vx/02GOOvPr+KFpfkG8f8e16MfZ5Qf9bAP7+eD1OeOAeSCXO8vnyDzB/q7Hpb
+        TA8XM5HO7GOD35AOKs5gWRhNJ+/tubxf4eM/YIs/8th8nBzwTnntxFFI20/v7YjfqhPyHj/TH6/vuvJ2
+        +vPNTK0vnSfvP+XtT/x7zdfsEYyRu/8AHTz0OOlRQtLtY+YMb9UH/HrMOt6+cjdyT+mDn1oAWWRsL++t
+        v+Yb1U45uxjP77qf5Zpxkb7SmZrf/j8zkL/1D35/1/I6jthgDzTZWlG0eZ207/l2m/5+xjo2DjqDz3Hs
+        Xky/aUy+f9M/59puv9nP0+fp1GOufm+jW69V+YEUkjYTM9t/x6Xn8J3Z323/AE2+9+I49alkdvPf99b8
+        rYAYUjn7VPwMzds5b8OKjkaX5QZBj7JecC2mzjfbfxBwDnuc4Ge/eWQy+fJ84J22PP2eUdLmfHG7sSf9
+        4dOhpAMSRvtEv7+1/wCP5ei9v7Nizn9/93t35PTvUYkba+Z7UErqhyVJBH2r08/rzkcH5e9So0v2ib94
+        OL4EYtpv+gdECT84yBn3HI9ssDS7ZPnH3dUH/HtMR/x9EnjdjJx6ccjqKAHyyMWH7+14+wE4XjP2vIx+
+        ++mR128givn/AONbFvE3wj/eRPj4pfDn/VjGP+Lv/B3p+8fj16c+tfQEjS7v9YP+XAf8e0oHF3x34P4c
+        ggDqK+f/AI2Fz4l+Ee5s/wDF0vhyeIpIxn/hb/we/vMR9RgHPOa58V/Aqf8Abv8A6XE3wv8AHp+sv/SZ
+        HK/tv+GdS0P4DfHLxFqHinWNVtta8F/Fyex0SKLU5rDRbGy/Z0+Mkf2KzsJ7/Wkaa7lc3lzc6baaZLdX
+        iRQJCLZYLJf5WNPmudI1LVp9V8T/ABI1u317x6uqaaJ/hv8AE21u9As5NL8Q6dbQ2baj4Vk+3apFp9xo
+        qtHpkAbFncXMWkC1s7m8m/qZ/be8EXfhz4LfHvxnJ4z8aa3beJfh78UWXwld3h1Dw54dXRv2evjeGfw7
+        pLx3E9nc6p9ujGoR6c0R1CWw07Ns0kcjS/zSfBb4ZeL/ABp8T/8AhE/Adt8Q/G/ifxh8QrvxHYaD4gsp
+        /DsGmxaR4Z8T6rcaeNY8beJIdFfUrXws1ghuL+90y+1Kx0S1SJJt+n2MX5jxdTVargqMYzq1q2HxFOlQ
+        p0qc6uIm6tC1GlOdCtKlPmtJOm6cq38KXMp8j/u/6LWaQyrhLxBxWIzTLspwWHzfhnF4zEZjgcTiaFHD
+        4edepVxVXE0sbhKOFw+HpRlPESr3tTjOSnTUZSfkun2+q2GmW3he98ZfES91+78J/EeCHxQ3w0+KMeoW
+        Uus658N7tBaabc+HJddurCKSw1IX91bXE0Vu93BBcajpE+raZFX01+z/APC/4meMrrXbnwt4a+JHxAh0
+        LwZ8OfDeq68fAvi+2u5tXs9Z+It/N59hq+jW2rQW7Wuq2X2K4uIZreZFltYdRv7mwvmi+qLr9iT9rKXx
+        hoetL8FtW+xWHhjxpps4Pjr4PiYXOqax4Kubby0/4WJho/K0W8ErlsowiChvMLD9Mv2GPg18UvhLafE9
+        fiV4RvPCMviCfwO2k28+teEdZku4tLfxN9sl3eGde16C3jjfULZEFzNDNIS+2MxoXPkZXw9jc2xdPB5p
+        luZYHCYmGIxGIxUcPhsP7PEe2q1YRjL+z4wpxqaKNGHLRjGS5aXNaR+p+JHjzlfC2QZvxBwfxr4e8VZ/
+        hOJcvrYDJ6ca2I+u4evkmCyrE4pUsHxH9YlSw1KrXu4Suq9BudTkUqZ+SXh39mv9oKw1rx3dXfwc+Jsc
+        GteMLPU9NZfB2tSm4s4vAXg3R3lZIrGSS1ZdQ0m/g+z3SQTskC3KxNa3FvNNSt/2Zv2hY/A2oaM3wb+J
+        Z1K403xRBDbp4P1aRWlvrjUXtUM8dm1srsLiESB5l+zOzR3PlSxyLH/TqBIZps/aD/pqYx9m4P2CLGB0
+        65zkgfXApkAkweZ/9bqZ4+z4H+mtlecHHr+mcg19a/DjJmn/ALXmms8PN2rYVa4aDpw/5g76xk2/O1ml
+        dP8AmqH0x/EqnJSjkPA91Szekl/Z+fW5c5xtLH4p6cRp3hWoxjQtZRptqoqsrSX88/wN/Z9+OWieOvgV
+        Jq/wp+IWmW/h74gfBe/1u7vPCuqQWOmWOg+NPDF5q13dX8lmtmltZWtjdzyXAnaORYGELSFlDf0MMW85
+        P3txj7a3H2cnOdPfq3kcDJ+gySCB0TEmyLmf/V6byfs3P+kLwcZHBORgfXgDD2Ehmj5uB/prZH+jdf7P
+        kGD3xjnj1PGRz9JkeQYTIKOIo4SriKscTiHiJvESpykqjhGDUfZUqS5bRT95Sknf3raH4x4n+KvEHivm
+        OUZnxBgsnwNfJcop5LhYZNQxlClUwtOvWxEZ11jcfj5zr89eacoVKdPlUUqSd242JGzMs/8Ax7XvHkdc
+        yQY58nnH97IBO0ZGcM92PnSfvZ8+XYcfZyvS5n/iMPH584OOTSMsnyYM+Ps16MfuOf3sGPXv75+70GcP
+        cSefJlrjHl2PX7N/z8z4OBzxge3BJHWvcPzIaC3nP+9nObwYxb9xYR8keTnIwfk69DjHWOIttP724+/q
+        n/Lvj/l8cHgwDOe5xgEEnHFTASedJzP/AMfY6fZ/vfYIhz745/ujjkmo4lkKsc3H39U/59+P9NfPTjpg
+        EEfTvQAkpb5f3s/TTulv63a448k5HfI+meQKeS32lf3s/wDx+/8APA/9A5wTjyeGx8u3HQ79uMGklEmF
+        5uM400A/6NjH2sdM98468nPpk09g/wBpjJ8/m9/6dxk/2dJyMZGdvB7YBI+bGWt16oCGQthf3s//AB6X
+        nH2fA/1ltwGMB49846ZPcyyFvPk/fXByLDH+j8j/AEqfsIO3bI+Y5xnGAyRZMJzcY+yXhx/o/Pz23HY4
+        B69CM1JIsn2iTmduLE4/0fP/AB83GPbGM4GT33Y4zK2XXQBiFvPl/fTnN+v/AC744/s2PsYQSOxHJxz0
+        5pgJCv8AvrjO3Vfm+z5wPtQOOIMd857HIJ42iVBJ582TcE/b1I/49uD/AGdF6cYxnk5x7nG2NVl2yYNw
+        eNUAP+j4wbr34zkAdjkEjK9WA+Qktnzp/wDlwyTb4yTdkjjyBgjjH97gcnr8/wDxrJPib4R/PI3/ABdL
+        4cffj2D/AJK/8HeQNicjofXqBX0DKsm7kz5/0AE/6P0N4cAkd89Mde+ATXz/APGwMPEvwi3eZn/haXw5
+        yX8vt8X/AIOgYEffHXt+Oa58V/Aqf9u/+lxN8N/Hp+r/APSWcH+238ONH8MfBr49+PrG91/U9c8Y/D34
+        npqdg+oWMOmwR6D+z38cv7Pi07T7aLS7VXZdVuY5pdRmupbuUWs93cGaJrqvxD/4JseH7bQP2xfDclno
+        fjW2/wCEg8V+Pb/VX8Qav4EvLPRNSHwt+IOoRaHCnhnxnrGpwzrpmr6eqfb7SS4ks7a3mur/AGS2sC/v
+        P+0d8HvCHjPw58TvDvw91HRl+J/xcsvEXgzxDLqHirUZbHT9S1b4KfGfw/4Sn13SLCTVP7DsILjXNRea
+        4tdCN/d2q3DeXqL6bZW0PwF+yB/wTc8ffs2fHzTfinf6n8O5tIn8QeJ9V1uz0bxNrmo6ikmseE/HGn2V
+        hollL8NPC9rDptpe+LPlhutVYwWFqvli4ud7XHx+NwWNxGZ5PXw9GpUoUa9F4iUFH2ajDG4Sq/ayeJpO
+        MaUITrU3GhiXOdNU7U03I/pvwz4x4ayHwo8Y8hzbib+yM44hyr2OTZR9WVZZzV/s3MKHs1V/szFOhJ1K
+        tOjzLGYNJVXLmbSnH9iii7lGyf8A499R5888fv7f/p4zke3X+bnUb3+ScHyrDpMc/wDHzPn/AJeOc9O+
+        MdBR5fzqQi/6jUDzLJuBFxb5/h5I6DjnjNOdB5kg2Kf3ViQBK+ebmfnleSSOeO3HUgfcH8ujQq+dL+7u
+        ADfJ0uDk4sIuM/aOMd+ny9+xbCq/3J/9ZqZyJyORetjP+kdPw5I9wDKseJpfkTBvVHEsnT+z4evydPX1
+        GORTIE4PyIf3up/8tnyCL1uo2nPIwOnQeuKAGBV2xfJP9zTes5wM3IBz/pBB3DOP7uM4708qBPGNlxxf
+        Nj9+cg/2c56faOef5e+Agj/dw/IgwmmkfvZCP+Phc4+UduvI4I4p5jBmjxGh/wBNY/6185/s98Y+Q8Hj
+        68depAGMoOw7Jz/o17jM5ycyW+ePtGOnUcYJGB3pZEHmudk4Pl2HWdj/AMvU/GPtB5J4zjqTkgdAxjKH
+        YpP2a+x+9fOPNgzn5eD6nb78YAL2jAmk+RB+7sRkSvuA+0z9fl+mT1xmgBoRfOkwk/8Ax+AH9+en2CPr
+        /pGc9DuznHGe1RxIuD8k+d+q8eeTki9Yf8/HBGTn1J6HHEwjHnSfIh/0tR/rZOB9gixxt+7754z+NRxR
+        /Kw2Jnfqf/LWTtev1+UkYOMD1z7CgBJUX5fkn5Gm9Jzz/pYyc/aBggH8c556h+1ftKgJcE/bcYEx/wCg
+        c52j/SOD0YsD0+X2pssY+XCJyNO/5ayYP+lgEn5evJzzyCc881IU/wBJT5VH+mY4lfkf2fIeDt6Z75zv
+        GOM01uvVfmv6/wAtwIZFTCHbOP8ARLznzyT9+2GQPtP6YP0qWVF89/3c/K2HHnkn/j6n5z9oPBPHseeO
+        pY8Y+QhE/wCPS8I/fSbvv23P3eo78duoqR4x58nyJ92xziV+AbqfnO38wcDpg8nCAYqr9ol+Wcf6ev8A
+        y3Jyf7NiOP8Aj5OBnk5IHHXPBjCKFcCOc/Lqn/Lc4z9q9ftA57YyO7YNTJH+/m+SP/j+XJEsh5/s6IjP
+        ynA6/p07MEY2vhE+7qnWWTGftRGD8nXsOegzgdCALIq7/uTD/kH8eeSRm7Ocn7Rz3AOSRjoOtfP/AMax
+        jxN8I/lkX/i6Xw5x5knmcD4v/B0DafMk/HkdAD2r6CljGcbIxg2H/LWQjm6wcHaOvp2HPU18/wDxsG3x
+        L8IxgAf8LS+HHR2YcfF/4PdMqPbPPXt3PPiv4FT/ALd/9Lib4b+PT9X/AOkstfHzxD8NPhbY+KPinpEV
+        h4l8WeCLrXvHPjbQo/FMt7q8kfhP4N/FbW7Gw+yXt1qcPh6e+sbO6sLNoLC0jFoyI0ctraQwL+eEH/BX
+        f4a3lxeJp/w50vURpeuDTdWks/iXpzW+mO+jXd99rv7l/CcUUekR29neK2pwm4tFvLO7stxlsr02v2X+
+        24/gCP4LfH3/AIRmx0iDxtH4F+J8fiuWTTbjTLvUbp/2c/jbd6JBc6rLZL9uYW0l9PFNZnUjZ2k803kh
+        LlfN/AP9n79ne9+J3xo8O+AhL4Q8ADx74r8QeItY8TabP4j8YTyatpfhLxr4meSbQtVufD8MkF/K2oWz
+        Cy1rS1svtkMsMU1vZQ2DfD5xnGY4HE4DA5bXhTxGOVSNCnOnQnGriXUowgpSqp+zjaTUbSSdRrnagpNf
+        1L4M+Hvh7xRwnx1xRx5l2cYjDcJ18qrzx2WYrF0aOByqUcRXzOpiKGEqRq16iw9GUqap0a1X3bUo81k/
+        0ki/4LB/C65t11S3+HWnT6MumeKry51pPiPYDTrL+wtV8N2F1a3kj+EEuIdQup/EektpNn9maTUoLmGW
+        A4ubBbxbj/gsP8LbdJdRuPh1p1vo503wpf22tSfEiwGmXw8Q6v4l0+0tbKRPCD3E2oW0/hnVn1e0Nqra
+        bb2zz3DYtdQFlg2n/BHTwxp9nBoth8adItfDqaF4u0efQx8NNYkt7m28QX/hie+Ml1N8Y5NQjc/8I7Zo
+        nk3caFZ7hnR2k3Ut7/wRy8M31vd6RffGrSbrw/JoHhHQodDb4ZavFbW1r4d1DxVNYmO7g+McWoNID4mv
+        EfzbuQAQ2zIEkQsdebja/wAEuT2q6ZN7R4f2+tk63J9a9hqlf2F92pHvKh9Db6z/AL5xN9W/tKy04uT/
+        ALO/siL5rfVeZS/thON/4vstbeydzpJf+CvvwzstRez1D4caZpslz4ittH06W8+JWmpaavLceEdC8Rw3
+        mn3EfhOVJNIaw13TLf8AtS4FvanVLm209XL32nNdkn/BXr4dWc0Vjc/DG0h1i407xFq9todx8RtPi1We
+        HTLyRZoEg/4RN4kubiRJzpFvLPFc6rbWl5dWsRTT9TFnlXP/AASF0bUtbn1jV/jlpOpXcPjCx8T6W0nw
+        v1O3XSdTsvD3hTT4XhWz+MEC3EYHhXTbkx3ouFaUzRsDbyyRyQSf8EgdGvJrbUbj45aW+u2OmeItEsNY
+        f4Xaj51pa6lLrcN0Fs4/i7Dp8of+3tRZFmtpXAlh3ySyW8E0eXNx3yRvGKnyLm5VlHL7V06tuXmqc3sf
+        aew9tzfvVeoqKkrEQw/0OeZc+N4lUPZZvzf8lZf2kcbRWTbYXXmwPtXU+yp2dZxnyp6h/wCCwHw4MV/F
+        bfC63vNU0fQtI1290K1+ImnSavDa3Eu5IvIPhRYDeW5MI1e1iuZZdIjurGW8VU1CwN1dtv8Agrx8Nr+5
+        nTTfhxpWojTtffTtVns/iVpsltpTx+HdS1V72/uZPCcUcOkrZ6Xfr/acRntPt1ndWgfdZXzWvKv/AMEe
+        NDMOqXFv8dNMttc17w/o+galrqfC/Upbi5s7WHSbCDdZy/F99NjMcWh6aXFtaW5bypiGjkubiWXTtf8A
+        gkToumalNfaT8b9J0241LxXd+I9XaL4Y6nP/AGnqd3pevrcvMt38X5lt0lfxBfyBLH7KkTGBEXyIIoEc
+        pcd2lyxXM0uTmWUcvMoUHPnaqt+ydT23seW9RpQVVJXYvYfQ5s/9s4lv9Wym2nFn+8vFVlmqV8LtHC+w
+        5G/cUub2XNJWVpP+CwvwvmtE1S3+HenT6KNL8UXtxrSfEayXT7I6FqXhuwvLO9aXwglzBqd3P4k0k6VY
+        /ZWl1KG5SSEj7TYLercf8Fh/hba+bfXPw50230htM8JX9rrb/EiwOmX6+IdY8UadZ2llKnhFria9tbjw
+        xq0msWxtk/sq0t5Li5fZbagLDBt/+COnhixsrbRrH406Ra+Ho9B8WaTLoafDPV5Le4t/EOoeF7u+L3Uv
+        xie/jbf4ctQohu449s1zuRi5akv/APgjj4Y1GK70nUPjXpN34ffw74N8P2+hN8MtYigtbPw1eeLDYPHe
+        QfGSLUpJdnie7iczXkoxBbuAJQXq+bjfmvyScPa7Wyb2n1f2+n/L1w+tLD20v9Xvd819DT6v9DX6wv8A
+        bOJfq/8AaKT04uv/AGcsoTu/9l5uZ5v7ui9rydFS946mb/gr18NLLUUstR+HGl6fLea/DpOmPefEzTY7
+        fVJJ/C2k6/DdafcR+EpUfSXstXsIRqVx9ltX1S6ttORmmvdON90dt/wVF0SXw+3iBPgjdCzWy1bUGibx
+        zaC5CQyzzTIEHhJomZGikSDMyCUbWcwbyicRdf8ABIjR9T1o6xq/xx0nUb618WW3iXSpZPhdqVummanb
+        aJ4Xs4ZreOz+L9uk6L/wi+mylLwXKtJ58bZt5pIG2rX/AIJZXUXhx/Dy/tC6YYHsdY09p2+EshlxNLPD
+        JIB/wtUKCWld4lKsEARWMxUu3POXiCoUnShQ9pen7b2n9lqC+Pn9ly1G2rKm25+9z86gnAiND6HOnNjO
+        Jl+5zduy4sT+sLF0FlC/3VxtLCe2dXlvHnUfa2nY17j/AIKmaFH4Zg8Ut8D7s2E+naLqUcK+OrQ3fl3c
+        kEsCPGfCKwiT/SI1m23DKi72Rptqh9G//wCCn2kadf6NbzfBKdpNa1ttOtTF46tiiTx6BqmpsZ2bwejJ
+        B9l0m42tEkzm6e3jMaxvJPFyFz/wSquJPCsHhQ/tDaYLaHS9E01bofCNxNizkt4IZWU/FYpuJgR5Fxhl
+        LopTIYamo/8ABLq91C/0OeT9oLS0k0XXX1GAR/CSXbK8nh3V9MZJc/FYsI/K1aZhtIPnxwkkoXjbNS8S
+        Lr93hH71fRPLr8ns4/V7Pm3c+ZS6pWcktglh/ob62xnE7/c5PbTivWtLF1VnF74Ve7DB+ydJNWcr+yTn
+        zJa1z/wU+0eLWdO0JvgjObzUdD8QapBIvjm2NutvpF54dtLpZZD4QEq3Dya5Zm2VYZUljjuTJLA0cSz/
+        AGJ+zl+0ZY/tDW/i67g8GDwlL4VuvDlvNby61DrUd3Fqz6pLDNHcLpGltFIj6fcJPC9uyhDbus7l3SL4
+        fuf+CXN5Lrul68f2g9LFxp2geJNMjgX4Sy+XLHrF94avJpJCfirv86F9Ct1iKsF2TTblJ2FPtP8AZm/Z
+        wP7Otv4ytLjx5Y+NZvFV14ZuTcQ+Fz4YisI9IfVo0hFs/ifxG9zJM+oyPJN9pgCqsSCDO529TJHxm8dQ
+        /tqGHjgfYVfbun9T5vb80/ZKKoTlNLl5L29297vv8R4k0fo3Q4XzSXhric8qcULNcvWVwx6z/wBhLKXQ
+        wrzCVT+0KEMMqqr/AFpR9pJVeVR5E4tN/UaJGZ5f3Fn/AMfynhlIJ/s6MfMfJ4XnIPJ3ADvkM2IVfENo
+        RjVB8zDH/HyM5/cnBwMLj+Ec+0iPELib97ac3yjgKOf7NiIB/e9On88YpgeLbJ+9tOmp9Qp6XR/6adec
+        j/Z47Zr7Q/m8fIibh+5tB/x4DhgRj7Wc4PlDk/xDHA5JPNeAfGtQPEvwjISJM/FL4c/6ogjH/C3/AIO4
+        wQicevv0r3+R4y2PNtD/AMeB4Vcc3eD/AMtDzxz7dx1Hz38b7iGPxN8JP4wvxP8Aho8j21tNLHDHN8bf
+        ghp0UlxLCssdtFJfalY2qNO8aST3MaISxIrnxX8Cp/27/wClxOjC/wAen6y/9Jf57F/44/8ACs/i5a+K
+        /gTo19Bouu+IL7xB4V8e3mlaA0V3Zp49+EHxU0YaobtrS3sNW1GCCa7uFMlzdFZYRFchBOpPwp+x58K/
+        g7qnxr8R+Jvh/wDErxvr2tfALxhrHhvXNK8R/C/WvBtpdajrHhPxH4WnmjvNXk3hbHUJPE2lXOi3EVj4
+        is9T8PvdX+mWujX+jXur/ph468d6LqPxD0HwHb6frNnrXhfxjompajevpanS7628Q/Dz4my2DWmoWxug
+        zINNu1mF6lkwnVYYfPYyol7QvCHg3wtqOsX/AIY8MaF4bvfEmuXOreI7vQvDum6Tda9qt2up6lc6prVx
+        p+n28uqaldajqup6hPeXzXNxLd6jf3UjtNdXEr82Ey/JcVSlisfgKmJzPDSpvKMVHERpU8FVVahUr1a1
+        GVCpPERqUqcqdGnCth/ZVHGrOdaMfZT+qwvGfFeQ5bnGQZNnmMy7JeIqKo57l2H9n7DM6PsqlKNPEc8J
+        OypVakHyOLcZtaXudH5mHUean/HvqPWJ883FuOD5nP8ATjJ4pzyZkk/eJ/q7D/lk4z/pM5xnzPX+LPPq
+        e8ZkXco8yYf6PqPy+SepuLfgfuOhz+o6GnvIvmSjzJj+6sOPKIzi4m4/1PQZB459yOnonxookJll/erx
+        eqf9RIOlhFycyc4HYflxTYZDjPmqAJNTH+pk6m9b/pqM57DPHHTBNKJV86X95OcXq5/cnI/4l8XPEA6d
+        xg9enamwyLjHmS/63U+kJ4JvGwf9UfvevQe2OAAEh2QnzU5TTR/qXGcXCnj5+vPJ6HgDpTmkImj/AHqc
+        3pPEMh/5h8mdp8w9x3PB9DTPMXZF+9mx5em4zCcf8fA6/uRjA5B4B3Y9qcZF86MCWfi9bjyDznT35/1G
+        QDn2xzyAOAALn5R5iZ+z3o/1T5/1sBIz5g6+ufXqae0h86Qean+rsDxC4PF1OevmAYz+f48xtIuU+eYn
+        7NfYBgORiWAld3k9u+TkkLzz8z3kXzn/AHsx/d2Py+Qen2qYf88c5BxwTk4P4ACrJ+9k/epj7WG/1MnI
+        /s+MdPMH024J9uRiKKTKN+9TIfVCP3MgAzev28zk8Ed8ck+tSLIvnSfvJj/pgP8AqT0+wRncf3PUdMfQ
+        4xnMcUi7W/ezn59U58kjH+mMAP8AUdT0/A9KAHSyHCnzUGP7NH+pc4/0tSf+WnuMHHtnnBcXP2lCJFJ+
+        25/1Mn/QOkHaTIHGMHBJ56YNRySJ8v72YYGnDiE4H+mLx/qPx/r2qTzF+0p+8m/4/f8AnkRn/iXPg/6n
+        k5+XGPU444a3Vu6/roAyR/ujzVOLW8AHkuD9+2wN3mYHUc5xzznpUjyEzufNQjZYZ/cuBgXM/wDt8Y79
+        j6cVDJIuFxLN/wAed78vkn+/bHAPkdMd89MdetSySJ58n7yY/LYZ/ckZ/wBJnHTye3bHPXrjiVsvRAIk
+        h8+b96vF8vPkSDH/ABLoxn/WDP3unPrjrTBIdsn72PhdUz+5cjJus9PM9s9DgZGeOHLKv2iX97OR9vUE
+        +SeCdNiwc+QOOxx2I5HdiyJtfEkwG3VBnyDgf6V0/wBT3zn68ewYEskhLBvNQ/8AIPGfJfGftZ/6aZB5
+        z244r59+OMn/ABN/h+C6sX8ffB4DCMmcftVfsstwGduMDnAGcZ55x9ASyKW/1sxB+wcmA4OLs548gc55
+        GOvHWvnf46uDrnw1AZ2DfEP4QjLoU6ftRfsvHgeWnPGCO3oM1z4r+BU/7d/9Lib4X+PT9Zf+kyPXPHXj
+        OfVPH+g+Dm8KeLtLTwx4y0W8i8U3um28fhfxIut/Dz4myNb6BqQnn+2T6S1gsWrwPFbz2k15YjY8czlf
+        EfgD+0rD8d/Fvxj8Mw/D/wAZeCpPhB8QbjwjcXfiG48LXUWsS2g13Qb/AMsaHrGqGDU7DxJ4X8S2t3FB
+        9v0J9Mj0e8sNfvb+81TStD988fa1rl34v8LaPd+Gbiz0fSvH2n/2Zr8eolhrLXvw0+INzdsLOS1skgh0
+        +VI7J/Iv9RlkuZQ0kFtFGJm3+kqYhn/4/GPMq/8APhL0/wBIGPXORkE85JzrldXDwwOLp1cN7etW9nHC
+        4j21Sn9UnCpSqVavsYLkruvRjKhyVLRpqTqxXOo20xyftoWdkoptWvfR6Xe2tpaegmTvUbp/9RqIxsiw
+        M3Fv38voc+vfg4FOYkvIN0xzHYD7sY4+0TfL9wcDPB6881Hk7h+5uf8Aj31Ef69QcC4t/wDp4yCOM8cn
+        B5Jp7k+ZJ+6n/wBXYYPmqT/x8z8/6/r1wOduOgFWcg4FvNl+ac/6ap+5FwPsEPzDEfUdecjngdKbCTg/
+        NOMS6mPux45vW5+5nnuCOMnGMA0oz50n7m4yb1MYnUk/6BF0P2jj3PGR1OSBTID0xFP/AK3UxkSoOPtj
+        np9o5A684zjvk5ADJ2QndOcppo+5Fk4uFPP7sDHORjBzkEngU9i3nxjdcZN63GyLB/4l7jn93kA9MAjq
+        e4qMcrF+5n/1emZzMpAzcDGf9IOc4wOvPPHWnH/XR/ubji+YZMy5A/s+Q8j7RyO+OfQdSAAKxPyKDOP9
+        GvcDZGeklvxnZ+PPOcc4zlzlvOkG64/1Vj8pSPtcz9xGDkY+nHIINRsT8v7qc/6NfZLTLk/vYBz/AKQT
+        zwMY4JXgY4e/E0h8q4Hyafz5ynk3U4PH2nr+HrmgBykmaT5p+LsH7kYOPsEY3fc5IyOAMHH3c5qKInaf
+        mn4fVBykfGb1+gEffGD1PcYp4z5z/uZ/+Pwf8tl/58IjjP2jqeu7nsN1RRcAjybj7+qf8tlx/wAfr8n/
+        AEg9M8+pOBmgB8pOFO6cf8g0Z2RZ/wCPtSQMx8jv0J9+uXnP2mPBnyb3P3Ysn/iXSDJ+TqMbeMDBzjPN
+        Ryk/L+5uM407jz1GcXY5H+kcdenHXODgGnf8vKjyrgf6dj/Wqef7NY4H7/rzuJJ6ZXPzYLW69UA2QnCA
+        tOf9EvBt2R7eHt8jIj3YxznOfepZCTO/zTn5bE/diBOLqf8A2McY4wOcnORjEMh4T91cDNpeAkTKT962
+        6AXH4EY9CRgVLKSbiT91cfdsf+Wy5P8ApU/cXB4+p+XB4GeZWy9AEQnz5juuDi+HVIhj/iXRDIxGM8E9
+        cjAPcZDFLFJDunGBqg4SPjN36FD6Z78kgYHFKpxcS/up+b9f+Wy9Dpsf/TwQB+QPT0poyVkzDP8Ad1Tj
+        zlxxdYBz54HXjHXILcnmmBJIx3A7pyT9g5MceTi75GAnbkgj/wAer5e/aG1SKy8V/Bazlh1KZ9a+Kfws
+        sbeWDT57m2t5IP2i/wBnDVGm1K4tYGh0y1aHTZraO7vngtpb+Wy0+N2vL21hl+oJfvDMUw/48MgzKQP9
+        LOP+Xg5JHTk44PGK+Zv2gGx4o+EY2Spu+JfwpH7xw/I/aV/ZmbgiST0bPI5HU9Bz4r+BU/7d/wDS4nRh
+        f49P/t7/ANIke2+OtZ8aXfj7QNE1TwbBp3hHS/GmjXHhfxfF4ht7lvEk958O/iU2t2s+ixwR32ky6LPF
+        YRJ9o823v47x7i2uN1s0ddcyyCWP5B/x9sOZ5Bk/YpeDx0xgg+nGMdfl39tXXvihpnww+Mlwbaw0Twvo
+        PgHxzrHw98Y6Fq+o6T4ut/EEX7P/AMcLrV7hJ7O7kubC/wBCvrbRLjRdUsTo08LzTXNvcS3Nsoj/ADD/
+        AGPPHvj3Vv2m/hbpOqfEbx/4g02+v/Gcd7o2v/Ejxnr+k3yQfDDxneQi80rVtav7C5WC7tba8gee0kMF
+        zbwTxbZYkkX52pn9HLcXleWTw9erUzSvyU6sORQpNzpUuaqm1L7V7RT29bfrfDXhRmfGnB3HPG2EzbLs
+        FhOBMFHF43A4qGIliswi8JiMXyYN0oOnGajh5QbqyilKcX8KZ+7eJPMX5B/qNQ6zybgPtFuOm3qOmP4j
+        tzTmD+ZINv8AyysDxPJnH2mfkDb1OOnbB/BhSTcv7i3/AOPfUerkt/x8Qf8ATDt/Dyc8dKdIknmSDyYP
+        9XY5w5z/AMfE3I/cY3EcMOwAIJ6D6o/HLiqJPNm+Uf8AH6vS4kIOLCHg8HAA6n044FJAH+YhRjzdSGfP
+        k5H21s5GPbgd8DnBOVCSedL+4ts/bl6OeT/Z8R+b/R+g79SRimQo+P8AUQcS6oB856fbHzn9we33R06c
+        jpQAAP5cPyqPk07/AJbyED/SE6cc5wOOwweacwk8+PCAf6cf+XiXP/IPk5A2jtjHHPHPNMCybYv3FuP3
+        em9HbAH2kYx+4HOevtinsknnJmC3P+mt0Y9Dpz5x+459ueeOfQC4MHJQbetve5/fuG4kgA4xwxPX06nk
+        CnMH86T5VH7qxz/pEhOftM4xjHoeT1HPFRskmEBhgANtfZG9t3+tg5P7nGR344yeexe6SedJ+4t/9XYc
+        hmLf8fU3/TD69x36daAv/X9eq+8VQ/nSDaOLtePtEmAfsEfH3fu89evIFRQh9jfKv39TwBPIePtrnk44
+        x2H8TemKlCSec/7i3/4/AMbjgf6AmV/1H3O56c5GOMmKJJNp/cW2N2qcB2x/x+PnP+j9Rng9yW4FACyh
+        8L8o5/s7/l4kxxdrj+HAPPOOx5HSpCH+0x5X/l8x/r5Of+JfJ8oO0/XPrhelRypJ8v7i3ORpufmbB/0t
+        cZ/cHntjuM88U8rILlcwwD/TRn5jj/kHP38gfL6f7Y6cnDW69V+aC/p/Vv8ANfeMcSZT5Rxa3uT58u4f
+        Pb5OMdcdR+oqRw/nv8g4SxxieQ/8vM/T5c9ufTHHWopEkwv7i3x9jvOjNuPz23OPJ+9ntz9e1SyJJ57/
+        ALi34WwIw5wD9qn55gxz0bpjjk0ley9FcBsYfz5vlA/05ek8hz/xL4jz7d8+uOQKYA5SQ7QeNT6zyYx9
+        qPJOOoPHpjnvinKkv2iT9xbf8f46Mf8AoGR5zmDp/XApoVyrHybc/LquMscY+1Dv5B56gf7IJx2AFySQ
+        OCMqOth0nk4/0vHDEZJx27Y9818v/tCll8WfBkEAb/id8LhjzGfJ/wCGkf2aW+Xdg4G3J9/xr6glSTdx
+        Bb/8uGcO23/j74x+46kdenGOuOflL9oyYReOfgNbMsaTX/xW+HEFtHFvczS2vx8/Z61W4RcRLgQ2GnXl
+        25YgeXbynjaa58V/Aqf9u/8ApcTfDfx6fq//AEln2N8VPC0ni/wde6TbafoOo6kLi0udMi8SfbV0qO4S
+        Tybtp5dOR76IT6RcalYP5CMtxDeS2d0ktjc3UT8ZP8BPhtp17o+o+G/Bvh/S72LV4bm+nxqkUsunTWc9
+        jfW9nLZX8DW8zwyq8SuJbNpUZpIBNJ9pQoryE2rWbX7xbNr/AJ9nrNJuSa+xJ/OzV/u0NC++FWjf8JH4
+        eax0q0Xw8LLxDHr5udf8SnUpLi8k02TSYtMtY7n7OR5sV9Nc6jcajC2mwwRWFlpl6NUe80aeL4U6I3ij
+        UZZtLtT4afQ9Dis401zxIuqw67ZalrM99LJGLtbT7Bc2dxpiq63BuJJbWaK4ha3ZDRRRzz09+Wr1959n
+        5+RShDX3I7X2XdIbovwq0j+0vFT63o+nfYT4jgn8J/2Zrvih7n+wl8LaBazDXo7m7it49SPiGPxBJHba
+        eZ9PGltpM7N/af2wrm6R8Jbe38LakuoWWk3Hi4T+M5NNuE1fxW2hbb/XNWvPDUd7E2oRXvlW2nPpMF/F
+        EXe1kiu7fT7iSERzSlFLnny355X5f5n29RRjFtXjF+9/Ku9uxInwk01/BunwzWdrb+Lxo+iR3l5ba34i
+        uNJj1m0FvNdT24nninubE3izkLLaWlxf2myC4NqWD27/ABR8K9N87w1N4Y0zTUZfFFhdeIhrWteKCkvh
+        z7DdWWpxaZHaX0inVNkls9hBceTp3nI9xOwmAZyinzztfml8aW729z/Ni5YqN+WN+XflXYk1H4TaW3if
+        w6+nWOnp4YTTvEVv4mtbzVfFLaxcXF82mSaLPo88GrLawm2mtb9b1rtHdYLiNLExMHIzrT4Vf8V9rT39
+        hoT+BZtKsRotvZ6r4th8SW+pWhtJW/tHfqL6ZNbSXEuru09q9vLLbPp1nc2sy28s0hRQ5z096W/8z7Pz
+        CUYpS92O9P7K6unfp1u/vL3hz4UWaXGvP4ls9JuTJruoXWhjR7/xXbLa6UXltdMtdRS81y4We6j0tLP7
+        e9sLeyn1E3VxBaQny3bnNB+FGow+B9Th12z8MHx9jxEunXWn6r4zufCyXF9cXFxpct1FcajY6mbd5Ghu
+        JbSLMujW8raPZ3+qizOr6kUUlOd/jlrFfaf8sH301b2K5Y2l7sfjf2V3l5EOufCnXv8AhWcC6FYeDT8V
+        ItO0NJJtY1rxz/whF1q+n3EE947Pp95HrNtZXLLcOrJZTTujpaXEckZE0W14s+FSSXvhZ/CNpotrBH4m
+        sLzxVDrepeK5JLrw+FS01GDRJrTVHgtr/wCyPK0EF3ZSWdxclJjNY3Aa6JRQpzdrylryX1fV2f3oiUYq
+        EWoxu3vyrsvL8VqJqPwo3+N9AfTrDQv+EEGk6jbeIbW61bxfF4oN9dLcPDcaXcwanLp01v58OmKY7hLO
+        9tEW8mt7+QSraG/Y/CnTH8Wa5PqFrZt4eKWUej2NnqPiKK8jW3g0+dZb6R9S8r7SNTbXTM9swgvtOutJ
+        tJraKXTLifUSinGc/dXNL4W930St1L5Ytu8Y/D/Ku8V27GZ4V+FM0eseNX8V2Ph240yTXnu/Bv8AYmqe
+        MI7qDSzHPZRW2vwXuptbfaIbGLThIthNJaXOoC/1BY7UzW9vBgaV8J/EUfw51aLVrfwdf/EeR9fTR7yw
+        1TxxpnhVV1K+km09b5LnUdX1OM2isEaSGG4MUcaRWyKpkdyilzz5fjl8DfxPe8ddxcsbx92Pxx+zH/Im
+        1L4U+IJPAGhR2Nl4Ph+JBttCGv3txrXjZ/CKXdipub+XTraC4h1O9gkv1SJIJRpEl5ZyObm4gEUdm93x
+        t8GbG58VfDXWPDXhbwXdx+HvGWn6/rF54vvddv8AUNPhs7vSmjl8JWr2+qWkOqx/ZjqVvNcXFlbW+q6X
+        pkwie7mTVdIKKFObbTlJr2kVZt2s1C6t28ttyYpKMWkk/ZRd0tb+9r6+Z//Z
+</value>
+  </data>
+  <data name="cbBubblePlot.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAKAAAACWCAIAAADWjhTKAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        vAAADrwBlbxySQAAABh0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC42/Ixj3wAAKH5JREFUeF7tfflX
+        lFe2dv8p37q31+1O9/r6++Wude93v77daU1ueoozoIAMxSAJSUxi4jwkMeloBjVOKIMFCDHGCRAEHHCe
+        iWBUxCHigANjMc+a73nrqd7uFKeqqAIVCc86q9bjZr/77LOf95zz1mvVW79ITEzc7ER6eroQzUkA4ZlO
+        kKekpJAARgcdITk5mSQjI4MEMHZht9vFx+igI/QPi85feWXe2LFz3NqLL74nfMyY2ST/9V+z1q9P44E6
+        rAxND8eYuc9sdQS/KibOxn59Zgtxf7Fly5Yfnejt7SXpcYJcjIDwR06Qt7a2kgDi8PDhQ3HQEZqbm0n6
+        +vpIAGMX3d3d4mN00BGamppIxJiXdz0qas9rr+1jS0jYSxIb+9g4Y0bxP8ne2bMP9/VZCeuwMjQ9XmPm
+        PrPVBfGrYi0tLSTGfn1mC3EtgfHvzs7Omzdv3nGiyglyMQLCbztBfuXKFRLA6KAjXL58mcQYFiDHqLq6
+        upA9c8XZRgJgbG4EwHlDQmNTU9ekSbmiH9T1LjD+irPh4MHbEoFAyUhQfQoAaAdJDAKLXWcrHGORCBIW
+        kKO0g46AUpAY+/WZrSXw119/jX8fOHCgtLT0eyfOOyGcBNBcUF5e7mIeHLSxrKyMxFNY8jVr1kBgZM9c
+        MR4SQLg2QmASHpKaej4+vhj6UVrdILBwNwebrRBF1mFRMhJUnwIAxmQgsDEx4XI4IGEBo4OOIM7GsFIi
+        wJgtxHUt0SUlJagp5zXFF04CaC5ALBfz4KCN4uwpLPn69esHs0THxBRxXnKCau5pBqOFheVXVTXpsCgZ
+        CbKSJLWDJDPcl2gwEfjRj4/yyvNCNoZEbYr67uZ3cK28fsR+cktNZ7frsL6OC7V1FnECfVTXnjt57So4
+        HfCya9fV4OA8m62ovLwWxktHqzZtqahrg68zoZ6eC7faLOIE1pQDxZdzSu5Y3BlhMALX1naMG7eLslE/
+        zb0IHBdXvHVrpQ47MgUuu102PXX6a1mvoU1NntrQWv91SVplbVV9053Mk99eqP6++OLBo7dvHb6Yt//6
+        9/tKt566daOru7bw7EEcy7hnztyPiHDVMTQ03+HoSF//XeWNproaR3p2xfcV9/cfuHn0ouPg3islpTVF
+        WytKLzd39zzcveeSRBiMwGfPPsBcpGzMQXMvAuNSa9my0z5Lph0kmWEtcHZ2Ng7Yt28fBMYfkg8nx2fG
+        J2xOgMA2u+1Q5aGOjsbyKznR9pnLCj7+tDj7luPmkuKvbVnvfbovee2+z74tPfHoUdve0hLGBdatK0Ox
+        WNPIyD1nztxrb+koO1oZ9Vbxsn8cX5p07l5tw+Kk8qiZh5YnnVu16tSOgurLx67vL290Hf/oEfZgXPSh
+        akgM4H5MiFEIgCqQwFhY+AN2U4gXH1+EV7cWF2f9ia2/w9y5h3TYtrY2Eux5ALl2kMQ8ZStcR5CwgNFB
+        R4BsJMZ+fWYLcd1n8P7L+6Pt0ZzB05Kn/VB7fd+5b9ccSr508/zKkpQ9FScb2ut2VlzaciR183f7txxa
+        l/d96Y8/dp3/4SKOhTZ4LSy8wV0QDTP49q3mwrwLa1LKL5XdXZF0Lv/IzaaWtp3HHmSlncsu/CEr6VzB
+        3rurPz2eueOGRBjMDD5x4u706dY09XcGoy1desLnnNAOkozPbIfREt33sG9p/tKJ6ydOSZqSdTJLXAHN
+        BboPOuDK7oMPjk+cmBMUlPfNN5X6KHH2FJZ8MALfutWC90iUjfpp7n0Pttsv6rAjU2AAnbV3tXf2dIKL
+        K6C5QPchDsi2owMLl/UnfZQ4ewpLPsiraFzfUTbqp7kXgXHdcOFCnQ47QgTGWyX4HT58ODU1Nd1/2O12
+        FxsABui8YcOGjo4ObCRIDGD5COHa6HA4SGj87LPTuAiAflQOTTgEFiP2YBL8Ff5Tp+ZhR9Nh8faaBAUF
+        yI3JcA8mNzrI4YCEBYwOOoI4G8MaPZ3JuqJZ74MzMzORH4BdmgTnAkAuRkA4qg+QNzY2kgBGBx2hvr6e
+        5NKtS5sOb1q8c3HcprjYTbF4ff+b95MOJB2vPE4HnLnt7e3kxhyMYWm8dq1u4sSduJ6ChGggwm22fBLa
+        hURFFWRlXZAIhAzN03CEo1zCjQ46grFiGKyxi4aGBhJjWG00ZgtxXUs0ANlJeBlGLkZAuF4EMDYSQBw8
+        LThX7lxJPpIclho2cd1EXqijzcicQYIWvCEYf/qs6LOyqjKcgDzKmIP8FXBbooE1a87Fxbku9LgIk3ha
+        orEBd3ZakXVYGZoer3aQZDiTyI3ZPssl+ukI3NLZknQoadzqcdRV1EXTApMnZCVA6UU5i6od1RKBEK7H
+        1l/gnp6Hb711QHT1LnBU1J6qKvcIwKjAFgaSbsW9ivDUcLy9jrXHUkjvAqPFZ8SD431a0cUiSQaQLvTY
+        +gsMNDS0z5xZgqkJCT0JnJAAdQvLy2skW58lMxZ6WAvMGx2AvH0GEY7USQAx8gwgxzZAAhgdSi6VhKWE
+        QS00CExC/bxwIRFpEamHUyWa5KMTQxVItBEcFxJffnlm8uQc/t8DGrZbErTw8N1vvrm/qqpRZ6sjyNA8
+        Och4QcQuRsBnxeQo7aAjQDYSY78+s318owPAv0noQS5GQLg+R7yfjzvO7ZAbn2h+zWDxid4UvWLvikc/
+        WgGlC33yGmew8Bs3HF98cSYmpmj8+F2vvPLtq6/uDA3NX7jw6IEDNzkIPRyfc0I7SDIotNiNFXuWM/jJ
+        CVx6sxTzT+sXmMAwxmTEZJ3M0l3osXkXGJkgn6b2pus1N05VnsFrU7v1uQPjcHyWTDtIhJ+jwPcc96Cu
+        1gwtYIHxOj1t+qkbp4xj8yJwZ0/n7vLdr2e/Pn7t+KANQcFJwXgFf/PrN/PL87t6rXs7ejg+S6YdJJmR
+        JrDPdHt6e17Peh0XwyIP22AERsNe7mhzsAudGN7jk7hliyUkclNktD1aQkkCaJFpkbZ027lb5zAcQI4i
+        AWRoerxuXZBwLyQ3OugIgQlsDKuNOluA3BKYd7IAnoYkmpMAwhEXIMfeTgKIw96Le6M2RaGsaJCHBA31
+        7W80cggs/LExM375nuXsAqcgCYAqkGjjtrPbQlNCebhEkARoxysu73eW7pTh6AgyND1e7SDjxVWP2AOr
+        mPwV0BEgG4mxX5/ZPv5EBwArCQ4DyMUICMe55uV87O7r1hdWqKPwQc5gNLw/bmhrQC/I3tmnhf5LdE5Z
+        DjcINgmlZ7CExSzPLcvlgTqsDE2PVztIQVhxcmPF9AQNbAYb+/WZbYBLtA7RP91j145hVexfR7TBCwz+
+        1f6v0Isem5vAF6ovcO7KUd4Fxl9xNuDNukQgRgW20D/dpflLPek3eIFhxEL98JH10TJ2CmiB8afYDKsX
+        3YVwTwKjxWXEuYUdIQIP/EaHcJ4B5PL+GoBDe1f7q2teRe2kcTdlQ32FS9MOwo1G8snrJ99tvKsTQxVI
+        YCw4X4DtX/zdWlx6nHAdFg1H4dJBh5Wh6fFqB+Eol3Cjg47gVjES7SDFByAbiQ5rVMeY7dDf6MBCh2td
+        PXtQO+FDMoMxQbNPZeuTV8/gOTvmiKc+isTLDAZ5d+u7PueEcSah0GI3VmzkLNFFF4vkI11sQy4wXv9R
+        8A89NhEY68e4NeO0pxv3LvCk9ZNaOx4PZ2QKXNtS+/Y3bydmJd5ptD7HqjsTrkO4pZtyJGXGZuvtB2uH
+        9iQEnrllplHgi9UXgzcGa0837l1gXJohgjOShZEpMJYpTEEMHhcdYiSE6xBu6a7ct1LqxablGSqBE7IS
+        jALvr9iPrVR7unHvAkfbow9dPsRQwAgR2G63IwqAMuF10tpJMZti0CasmSBGQnhzczMJUFdX52JOh0/y
+        Pomxx6CO0hBKeFRKVH+jkdvSbML7O9g22XRiNTU1JNtPb49MjdSebi06NVp4f4eI1IjdpbsZCpCh6fEa
+        C+JwOIQbHbxUjMRTF7W1tSTGsNqow0o0iOs+g/dd2he8ITgoKWjr2a1iJITrc8TtfMSbVJkQbE9iBqMZ
+        Z/DZqrNYZt08NZcE0PrP4PDU8NKqUoYCRsgMdhMYqG+pr2uuc/vvOUC4DuGWbuaJzKewB8/6dpZR4PtN
+        9yesm6A93bh3gXFmVzdUMxQwYgUezFX0wcqDcZlxurhPQuDPiz43CgxjbLqhC+HeBcb+7bNkxkIPa4Hl
+        RgeyJLFucwR6o+Pa/WuYB6idNEglHPUVLk07SNNGN4fITZG7vtulE0MVSGBce2CtdnZrXm504KISx+qw
+        Q3ujgwTwdKODBNARIBtJ/7DdPd2lN0q3nNqCN40Ldy2c8+2cxTmLkw4m5Zfn32u8R8+hv9Hx8NFD/YlJ
+        NNRO+JDM4ClJU1o6rf8+cvX60xlc31oftCGInvooEi8zGJt3Q1uDzzlhnEmouNiNFRvCGYyts6K6YsXe
+        Fa+ueTVkQ4jb0PD+IiY95u+r/451dNe5XanpqUMsMF5xnYVtmL2iDbnAb379JgapC60FxmvGiQy3bcKt
+        Cmxa4NiMWBwlEYhhKPBdx90FuxaIrnqMemi0Y0369+h/H3qBL1RfwOWodDa0AuP03HxyM3rRhXYTuPdh
+        7+zts/VREsooME7H97e93/fQOlaHHVYCw1h8qVj+h5uZ6zL2Fxjt5TdetvZgJAcwSxLNSQDh6Awgx45C
+        AtABf3pts1U+dMNsSNCQRH+jkXODdDOiTds4rb2rXfoiUAUSnJckeCOAHHjTFIdLBEmAdrziNE/MSnS0
+        /eTLL4QMTY/XWBDuweRGBx2hf8UA7aAj4GzAK/5kP2afnjpdZ64Jmq6t2F9KfGnoZzBQdqtseprr//zR
+        GQmanGXoW4zaQbhxBkMMjJNdYNgkgNsMJlo7WpfkLuFaIqH0aY6w+OvH+R939VhfjOZRP4kwPGYwLmtW
+        7lsZvcnwX+y6jHpoYrdm8JMQGOmicJhA6EPrpwW2bUyc/OHbr8x8748xs19OfH/Cwnci1rwxI9OVmVFg
+        XEHg0pFd+BQYHEmevnEap8W05GnR9mjkgwTwCg4LyNmbZ7GdE3IUCTBMBN5yZgs2Jq3lsBAYC2lidiL6
+        cBd482vTvnjrd39Z8K//8cGv/rD4hRcXv/CnRS/8afGv/7j4l/+5BJYJi95JyDQIjCWhurFautCF9iSw
+        izzsu+e4t710+7LCZe9vfX954fKd53bWtNTIGPVwdIThIPDRiqNui5AUxM34tAWGQ7WjGslpgaNTYv8z
+        ZN4v/++S345d9NuX/tl+yv/t94v/z18XRiU9zhIRoO7x68d1F7rQ3gX2ma120BGeucAdPR3BSYb/HPNP
+        4MBudJAA3t+2f1f1nVwaRG14/X//ed5vxlgq/mbsQktXZ+vPfzN20a//uGjaF2/wwLCUsNyyXAaULnRi
+        WMdIjNkCko+nbMVBHyXO8lfA2AUvssiNDjqC94oBYly9f3XMJmtxRoOoJGhc3tyMEFiMYn9SF1n6fLxZ
+        dxPvQ+LsCb/788Jf/2mBcdb251Aay3XU+jewXx67eoyhAOlCz6QROYNbOluCNwTLvIRaJGj+zeAnLTCM
+        rZ2t/x0x71cvzn9hjB8C/3rM/BdennPl3nVjDrrQI1LgtKNpmBjPh8DXrjlCQvLGTU3/5R9m/+pP87SQ
+        Rv7C2AX/8t/vjZ24Liq6ICfnmjEHXeiRJzDeGvE9yBAInJGR0e4EdjIhmpMAwrGLAOT19fUkgNGhubll
+        9uyDfI5CVFTeX6ek/u6lD/7lD++h/duLczGn2SD8v/7x/f/1+3d/O2bRmAlro6LzYmP34JDw8N319U0M
+        BRgTq6urI0HtSIDAstVhxdmTg3D+Bzu50UFHGEgOt2pvjV8zPi49Ljo1Gq9o0I9Ec220pdmESxvz2hhr
+        BjtP0MfPMOUMJsfZRAIIx+nGMw5ATUkA7UAC1Ne3TZqUw+9cx8QUyJevw6N3vhK08ffjVvy/V7/E69hJ
+        60IitsbPcD13IT7eekIKSGTknhMn7rhiqS50YpjBJH5lK2PUDjqCOHtyEM7LInKjgxwO+KwYEsstz8V7
+        X0xBmZcyazXXRvHE9H2qS3ROzhWbzSWbfMFevnKPBrH7cxF4xoy9H398kqEA6UIvlSNviV59YDUV0rKR
+        oA2vPXjZslPUDC0AgdFiY4sYCpAudKFHnsCzvp1FhZ4DgWfNKqFOTqkCEXjKFNc3wwDpQhd65AksUg2B
+        wEP7iQ4S7YD5B9nYILBwadCyP9fGV1/dwVCAdKETw1UJyeCz1RHE2ZOD8IHc6JAInnIgAWCMy3B98gSy
+        kegWb/oMDC6p3CxoT+NGx3vvHeRERAtsBgcF/exm8Jtfv8kp+Bws0V98cZo6oQUmMK6zGAqQLnShR57A
+        H+7+kAo9BwIXF/8QFVVIqQIQGOp++eVZhgKkC13okSew/ZidD8AYAoG9P8IBSpMAYkQGJADSdTHlrB0c
+        jvbJk3OgFhoEJoGQJJ4492CQ6dMLzp6964qlutCJYQ8m0UbNJR+drXE4+ihx9uQgHHuwcAkLiNGviiGC
+        9Qn+ZOvTOZANr2gQlURzbRRP3QLcg/06H3H18NFHJxISrHkZwAyOiSnq7HT9Jz8gXejEmj08hIUEmSAf
+        ck/ZioOOIM74q55eJIBwSCLc6KAj+KwYjF29XVOSpmAKBjCDKS3501iiYbx/v43PcPZXYKztBw/eNuaA
+        M50EGHlLNF4X5ix0k40Ezb8l+ikIjNeMjIuxsdbbJOo3EIHj44vnzz/a12fdz2MoQLgu9IgU+EzVmbCU
+        sOdGYPxrwYKj0dGue9EDERi8tdVKw5iDLvSIFBhIzE4cAoHlRofc3LBuc5hudIiRZwC5fttudBBjR0f3
+        nDkHoqPd73VQS81jY7E+F9XUuG5fSARA8tGJBXajw5itjuDzRodEABG7MVsdwdONDnGQCCevn5y2cRrk
+        dGvD60aHjuBwNGVmXgoNzddP64aiwrEsh4cXfPrpqeZm68PPPMqYg55JI3UGAx/nfMyviQQ+g5+mwLzc
+        ravr+Pzz0yEhu3HlhcsoiG2zFU2dunvChJz5849cv249rNBnyXShR7DA9Y31bpqhDXeBAZQDDlevNh44
+        cGv79sqioqrz52t7e61fW6TD8y7w/ab7Z2+ePXT50LWaa9293QELjN2n2lEdkRYRuMD9f5QDRHMSQLj8
+        5gPg6Uc5SAAdQX5iov2fP7gBGLvAwMRHO4hRR5Af5dBG4c7fqHDl4/MnRHQE/TMXJIB2kAjQjHZHq8N+
+        1B6eHP63r/4WvCE4dGPohLUT/rLyL0tylly4Y/3oBxBAxS7fuRyREhGXEYfdFw3brRtBs6XZhEsb+/pY
+        18/LAjgNhWhOAgjH2QqQQwkSQBxwDoqDjoCpRoIVggQwdoFRIQi5dpADdQSHw0GijcJ9ZqsddARx9uQg
+        EXBZBPv52+dDNobwWwhsmGpCpm6cumLviq6eLr8qhjWP5IHjwRvZb8RmWLerdFgSNMxg4dKe9kWWXqJJ
+        AGMXGKT4GB10hOGwRGM17v98bOGoNV7jMuPm75zf4LAepkpIBE8Vw9lAgn47uju+3PtlaEooP48nYdmM
+        S/SowBa0g44wcIGvPrgalhLGmnoRGA0af5L7CY8CJMJABCapvF85d/vciesm4urai8A426YlT4tYEDEq
+        8GAF7unrsdltUmvvAqOFJYed/MH1KTPJYeACA3Cob6tPPpI8c8vMyE2Rk9ZPmrBuwt+/+jtesUdgq/4g
+        74O9l/Y+fPQQ4vq40SEEEM4zgBxXBCSA0UFHQMlIoB8JYOwCe7D4aAcx6gioAok2CtfJ+MxWRxBnTw6M
+        UHShKDItElc0kBNNiBuXhqkGOwMac9Dj9V6xru6ujq6OlvaWpram2sba5rbmto42GCUUxB2dwYOdwe9u
+        fReyDXwGQ+CpyVOvPLgiEQB/ZzCJz2ytGTwqsHbQEQYicGtX67g14/wVGNsnHwkiOYwK7IJwHeEZCny9
+        9jq2PX8FTshKWLp7KSMw1BMUWN4HQ1QSFBcgFyMgHHEBcsQlAYwOOgLSJTGGBYRzmyE3OmgjzhsSo6dO
+        xq9sxdmTAzh/G4p7LVREE+LGpVkCb06YvW02IzCUxAeMObj160YAY7auH+Wg5vAWIhxVJgHEyIPJEZcE
+        MDqIEYDAJMawgNghMLIkNzroCBCYRBuF62R8ZqsjiLMnB0SouFeBdyMQUiarEM0pLTkFXpSzCBEkGiUh
+        H3jFfGY7ukRb0A46gjh7ckCE2pZavEvhTKV+ngQWIwVec2ANIzCUp4qN7sEWnu1VNB9T4ZfAePN67Jr1
+        rXbJYVRgF4TrCM9WYFwPx6Zbk5L6DURgvE3q6bMqLDk8QYGzsrKoKLY9IZqTAJoL2traXMyDgzYiCRLo
+        RwIYu+CNDnKjg46AKpBoo+YCn9nqo7SzQDswQm1zbdD6oIHf6IhKi8o4nqEjAP3DEt4r5jNbiPuTGYzT
+        CDOntbUTDQT/1GeTcH2OGOfEz2oGA7lludH//C0wSCiTVbjMYLxBsqXZupw/iglIhCe7RONiu7i46sMP
+        jyUk7A0Kyhs3bifalCm5M2bsXbToaH7+D/x9e2NFRgUGurq7Piv8jF/Z9i5wlD2q8nYljwIkwhMUePr0
+        f0yalGuzWZ92kw9Jac6fVl6/vvzePVdnOsSowACXyqRDSWGp1m+dU0s0LTDkj8+Mv+u461fFhkDgsWPn
+        UVH5dCOfp9HPWDRlSk5u7jWMBePhkAAUlwTAxkmiHcQINDa6fk9dGzs6OlxM2bGjyE5jdNARGhoaSLRR
+        uE5GZythtYOOIM6eHITz4xx8Qnd0mvWcRKzY2IDRoOv01OlTN0xdvW91a4e1oRorhsFKF3q8DoeDRPcr
+        DtpozNbag196ab6bliCak5BHRe1ZtuwkhiMhPAlMAugkjOkaOUomAhsdtFHOG315Ig7O8frIVhx02IEL
+        jIoLb+9ov91wO/Nk5ge5H8z+dvaqfatO/XCqqe1xv0NYMT1ejwK//PICWY2FaE4iPDa2eMmSY1hBuQiM
+        LtGAz2x1QZ72Eu2vwGjx8cXLlp1GSggxKjAw0gTGxXZ0dOGOHVcR4lkJ3N7VfvXB1cILhclHklcVrdp4
+        eCPeq5TfKm/vbqeDHK4H/HMU2K89WDhaeHh+ZWXd07/RUdNU89W+ryaumzhto3UtE5sei+ua2IxYm90W
+        lhwG+0d5H1XVVvGDDW54Ejc6AC/ZupiCMQdPBfFeMZ/ZBrIHo/GrYwkJ+95+u8Sv83GQM/jho4ebT2zm
+        xwr1zb+YTdYbUL4b4eu0lGkr967s7rW+WKzPaGO22sHnnDBmbswWeJz5M5zBAQuMFh5ecPr0TcYCfKY7
+        GIGbO5rnbJ8jN4y8CMyGOY3z4HbjbT3gUYFdZIACYxK/957hCSlDLvC9pnsQTEvoU2DyiLSIS3cvSTKj
+        AruIT4FF4wkTdnZ1uf7bGYs+CTpmxoAYAaRLghRJAO0gdmwzCELuaHPEZbh+B0nuDekbRiJw/7tIOAoa
+        3228y1CoAgkg/SJVyVYnJs6eHCQCBBa7Ho5wXRCdgxwVWMV8Zuu6yKJg0E+I5iRuXFpoaN7p0/cYFB2T
+        IF1mDIgRQLok2mjkEBjZg/T29S7JWQK1IBVaf4JmfCy69kzMTuzo7kA0VMEZ3oLPbMXZk4NwCCzc6CCH
+        A55yIAF0BHE2hmWJCGO21kd2BrNEo9lsBdnZFVwQ0B8JQuP0IRcjEMASvb9if2RapMxLCOZG0Lws0WxY
+        APA+CtFQBWd4C9IXT3ZynZg4e3Lony1gHI4uiDEHTxV7xnswWkzMnk8/PcVwPtP1V+Cu3i4ssJiCIlVg
+        AoNPTZ7a0NYwKrCLDFzg2Ng9c+ceYTif6forcMH3BTHpMUMi8IzNM1btX/VzFDjgGx1scXGFs2aVoEuA
+        GyeATQIgFyOAJEhQERJAOwjnrYPYdOtRnPGmz0hoY+w/n9hp9JQWlBTU3NLM+IAxW51Y24Cf0cFsyY3D
+        0REkLGB00BG8V8xnttZXVwY/g+fNeyIz+EHTg+AN1q8GQRs9F90I2kBmMF7DU8OPVhxlfED60qe8zzlh
+        zBzZit04nGc5gwe/B3/22RmG85muXwKfvXE2yh4FYYZKYKzSyQeSGR+QvnRFfJbMmPlIFhhX0Vu3uj6D
+        4jNdvwTecnoLrn4tYYZIYLzO/WYu4wPSl66Iz5IZMx/WAsv7YGyxQoRDVBLa+xtDQnLLyh6gJ4DjBJAB
+        CSBGoKmpiUQbjbyjo2PdgXW854zdFK9sENuNoEHg/kYjT0xPZHxAZysJ62RwOpJ4chDOPZjc6CCHAxIW
+        MDroCOJsDGv0dCbrima9Dx47dh4VxeUSCbZVNDej5iDCx4/f3tbmeoAI9nkSyMMPOQBiBORpKdpo5Dhz
+        Vxav5ENGcA2FVzbj80eiU12fj9FG7Sn8NftrjA/4zFY/hMXoIByzR7jRQUcwPoSlvb3d2IU8tsYYFqSx
+        sfX06du5uZe3bTuP17Kyu01NrRIqMzNzUEs0yOLFJVwNAJw4JEOyRCcfTuYzwDD/3BZbTdAGuESjvZX5
+        FuMD0pde03Riw3aJxjVyZWXDmjXnbLbCP/95e0jI7sjIwrCwvMjIPUFBea+8sg26bNx4vqqqebB7cGho
+        /vffV7u6HUC6fglccL4gJsNSbqgExuvSXdaXNgnpy1Lv+RG4oqLhnXdKgoN3JyT85GJIHvSKBjva5Mm5
+        //M/CwIXGK+LFx/zK12/BK64W8Gfzh0qgXHJtuW461P+gPRlqfc8CIxOVq8+FxaW7yYEm5vAJBA38Bsd
+        oaG7b99uwjaAhIhBvm0HxI79w9HqmLTO+uIe9k68sgnXRrnRoZt2YJuSNOVK9RXGB4zZ6sRkaJ4cJAKI
+        2PVwjF3oislR2kFHkIo5HG1z5x6OibE+zuwmBBuuitwsaBA3wBkcHV1YUnILZ9aTm8Hw+TDvw4Qs6xrY
+        bS5qgjbAGYxrcmO21vQc3jMYl2VvvLGfT813E4IEzeMMDkDgmJiiDRvKmcETFbjinrVKD4nAtnRb4YXC
+        51FgxH733YNGIZ6IwFB35cqzfX0+fgXBmK6/Aj/68dHcHXOHRODYjNi+h9YPYjA+IH1Z6g1jgXG1PGOG
+        ddHkJgTagATu/x/+3IPdjLSHhxdkZ1/s7nbtFoCnHYUEECOAsZFoo5FjD2aQq/evhiWHQSE2iO1G0LAH
+        9zdqz8i0yEOXDyGaMVsNbdR7MAlgzFbvwUYHHcGviuXnX46IKOgvBIk2QmAxit3ag8eOnU+1YRWiOQkm
+        Lno6deoeTivnCR3I+ejvDCbf9d0u3pTW81IImvcZjLm7tmQtQz1fM7in52FYWC7rD7VI0EQUbfQ4g+Pi
+        lmMFwJvl2FjXU9i1wHFx1qO68afs7IquLtfX/p3j9TtdIDCBcXav2r+KX870V2BcWM3fOb+n15X58yXw
+        tm1XIiPzKUTgAm/ZsgXBq6qaVq8unTXrEBbhkJA8NJB33jn45Zdnrl5ttHZD1bFzvH6nCwQmMIwIuP7g
+        +mh7tF8CY+4uyV3S2dPpPVvnaFwOw0rg+Hgfv1MzUIGd+T/+iB5mDEAuRkA4smFCANIlAYwOOgIuGUiM
+        YQHh2NVQMnIx5pblhmwI6X//sr/AINOSp+GcwIWVTsavbMXZk4NwCCzc6CCHA55yIAFoxLwKCrJ+555S
+        iaiaGwWG8ScCf/2Ef9pOR4DAJMawgNj5Zp9cO1Q3VGNSypOL2NwusoI3BL/9zdsVdytcx6h8dLbG4ejE
+        xNmTg85WuNFBR/BZMSaWnFyOrROyUTCISqK5NoqnbtZFFmYwFwT0QYJeAXIxAsJ5opEjXRJAHHg+kusI
+        AS/RJAB5VX3V50WfJ2QlhGwMGb92/F9X/nXc2nFTkqZgn/6k4JOy22XwkcN9ZqsddGLi7MlhgNkCuiAD
+        rNjbb1s/rK3nJQma9xmMJnbXEq3jAsNfYAB/RRc9fT3YYmvqa/Da3Yt3b660ATncmay3bLWDTuwZCtzX
+        9zA62vrJ1p+1wCTAyPt+MK5AJk2y3iANgcB2ux1bI4AykTicIBcjIBw6kQB1dXUu5sFBR6itrSUxhgWE
+        NzY2ShCjgzbW1NSQGD0BCeVXtuLsyUE4yiXc6KAjDCSHujrH3/62DZpFR+M9qvX5i5iYAhLNtVE8dRsz
+        Zs7oDB6OM7izs3fcuF2YghDJbVKijS7RFoT7zFY76AjPUOChXKJHBdYOOsIzFPgZX2T5my4JgA2GxBgW
+        EM4bHeRGB230ft4gE+RD7le24uzJQTgEFm508LdioG+9dQAKBSAwjD8RODs7G3UBeBqSaE4CCEcGAHlb
+        WxsJYHTQETA2EmNYQDj/N4nc6KCNOG9I5BBAHHQyfmUrzp4chPN/k8iNDjrCAHPYsKEssBsdMIr9eb3R
+        AegII2+Jxuvlyw3O/wF6Fku0c7z+pUuMCgwMsGL4l88fxR8V2ILPbLWDjvBsBQa++eay9x/FH5DAo3uw
+        dtBhn+0eDLS3d4eG5kEtNNlWNddGCCxGsY/uwRa0g47wzGcwsGPHhago6/0S1OKkRIN+JNo4ukRbeO4E
+        xuK0YkXpoD50NyqwdtARhonAiP36649FRRsV2IJwn9lqBx1hmAiM15qa9piYwgA/+C4/L4ssSXDJAJCL
+        ERAO+UkAXDK42AA+BIqxkRjDAsLlY7OA0UEbUQUSoycgoTxla+xLnOWvgLELXmSRGx10hMAqVlvb+u67
+        JXFx1gdm/fvY7OgM1g46gjh7chh4toOcwQDio5NPPz0VHl4wukRbEO4zW+2gIwxGYPg3NXU9eIAYViWH
+        RGC8wuXChToIPH06ZLbmqIjqJnB8/F6cCi++OG9UYI/6BSYw1toTJ+7GxRUHB+dNnpwTErJ75sySysoG
+        iTAYgYnu7p6LF+s/+ugE4k+alBsZie15b0yMtURD+IkT0Wne8uWnr11zQNxfZGRktDuBWEI0JwGEYxcB
+        yOvr60kAo4OOUFdXR2IMCwiHZigEudFBGyWsHAKIg07Gr2zF2ZODcJy45C0tbatWnQ4JyeFTLjCrSKZM
+        2bVzZyWdA8vB2C/Ge+XKg9zcCrv9XHLyabzu2XPl+vUaCQVxrRnsPEEfP8OUM5gcZxMJIBynG884AH2Q
+        ANqBBNARUAgSbZS+ALHjsgXnLLnRQUfA2UCijcI9ZSthtYOOIM6eHIRjBpPb7RdsNuu+BJveLCMj92Bm
+        w8dnxfR4oSWJ7teojjFbawaPLtHaQUcQZ08ObtneudMSGvr46/duAuMVGuO89atiEJjE2K/PbEcFtqAd
+        dAR/Bd648TwufLwLfObM/VGBLTyPAkNdLarmFBhXtitXlj5tgQO70QGQYz8nAYwOOgKSIDGGBYR3qsd7
+        Gh20EVUgMXrqZPzKVpw9OQhHucCDg3OhaLznp5qgLVx4xFMOJIDuwlgxozrGbK2HkY7OYO2gIxjnhHZw
+        yzYxcb+etZrLDF69+pxfFRtdoi0ME4HT0y9CQi8CR0TsOX++dlRgC8+jwLW1HdOmebuKjo0t7u21flyB
+        RwES4QkK/KS/PipHAUiXxBgWEDu3GXKjg45gDKu5hNLZGoejjxJnTw7CkS359u2VfKQGGwQWMn16QXm5
+        9dRWvyomzrpfcdBGHVaiWQ8jDWAG69MNcUkAo4OOIOejMSwgHCVDfuRGB22UhcHoiUyQD7mnbMVBRxBn
+        /NU4HOGoODncsrIuhodbGssMxroNdY8fv0vnIayYNkpYPd7RJdqCdtARdMmMDp6yvXmzecGCo0FBeePH
+        7wwNzV++/Ex9fbtECExgY78+s7UETkxM3OxEenq6EM1JAOGZTpCnpKSQAEYHHSE5OZkkIyODBDB2Ybfb
+        xcfooCMYwwrXyfjMVkcQZ08OA89WR/CrYuJs7NdntomJif8f3MukU3DaesMAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="cbStepLine.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAKAAAACWCAMAAABuMnOvAAAABGdBTUEAALGPC/xhBQAAAwBQTFRFQEBA
+        f39/YI/CY4/DZJDEZpHFZ5PEaZPGbJXHbpbHcZjJcprJdJvLf5/JeKLRfaHQf6bSfqbTx2ZjyGZkyGdl
+        yGlny3Jw0Ht60n970H180X+FgYGBhISEjIyMnJycnZ2dgKPNjKXPjKbOjabPiabQo7XUor3dpLvbpMDf
+        q8PfuMTcpsPhp8fkr8vmr8znqczprcvors7ps8fhtcbgscnlts7ht87jtMzktM/pucjguMjhtdPsz4ON
+        1YeF1YmD2pGF15ab1pad1pif3KKn26St46WW46ic4q2m4aio4q6s46+v5rGj6Las47Cw47Sz5LOy5ru7
+        6ru167207L6y4bXB5L/P7si878u/wsLC1tbWwM3jys/ixNjszd3rzt7rzOP01OLt1OLu1+Tv2+Lu1OX1
+        1eb02ubw3OXx3ejx5MPO6sPD6cTE68XF6cvN7czM7s7O6cnQ7tDL8NPT8NTU8t3U997S897d7Nrn+OHU
+        5+fn5unu5ujv5+ru5uvv6Ojo6enp6erq6+vr6erv6uzt6uzu7Ozs7e3t7e3u7u7u7+/v4ufw4e3z7+Xz
+        6uvw6e3x6u7x6O727u/w7O7y6vH37fDy7vHz7PH36fH46/X77/T59OPi9ebm9+fn8OTu8ubv8uvr8+3t
+        +Ovr+ezr+Ozs+e3t8efx9u/3+e/x/vTr/PTv8PDw8fHx8vLy8vLz8vP08fP38/T09fDw9PHx9PLy9PPz
+        9PT09PT19vb29vb38vT59PX59fj79/n89/r9+vLy+/T0+fX1/PX1/vjy+Pj4+fn5+/v7+fv9+vz+/fn5
+        /vv7/vz8/fz9/Pz+/f7+/v7/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA5YFIZQAAAAlwSFlzAAAO
+        vAAADrwBlbxySQAAABh0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC42/Ixj3wAABp5JREFUeF7tmod3
+        21QUxgtU7B2zS9l777333nvvXfYoo7EBh4hNadl74wElaZxAymxDaRzrb+Je8VX5bk8fOCSyXnv045zc
+        7+lq/PosO34K0/wnShhEVYZQldZiBIUbzREEhRsjTQSFG0taCAo3OPMgFxS4kQvaRnuCP6AqPgp2dXUh
+        CV4KNroK47hee8486PQMFkYRFD6CMw86cQ8WUJXVUrCUMBtV4Vycg6Bwo7sbQTGNIoJSQFUKrlNx5oEI
+        NhJ6UZUQNaaCqnCjXkNQuFEbQFAKqEqhH0HhI8z1aJALCrlgLqiY69EgFxTaEZTfh0iKj4LmGwUd4dEM
+        LkQUPBQ0O6UjaO6iyQn2pSNo7iKe2gkL8r81pRnky/0PQflvOVMn2FfoQxImKZjKDPZPXLCMqvBOA+En
+        SFMpyJeQKaB3iUvQfVPQNVISdH3sWkGzFzbGWMFywmxUZQ6qUuIB52IRQSmgCjI3+MYeg61KoRtBcO9F
+        1xBBrE6EyS2aeG00EtGqiY/gRZPMOZLwL4smJGHqBJegxhjBZQgKH9FhQbPspCPkVUVSfBS07x5sVdIR
+        lHttnInPYIiqpCLofsFcgn85b07OPHAKVug5mVNQXjCRBO0Iut89ExWUCyIJ7c0gX8ItOFXPB1f4lMdW
+        hc9U6KPrcaMDggWaHLegq5G+oLnlc0GBMw9yQYEbuaA9Uy64igmOeiqIJUGpJL9akQTztwPUGP47grNh
+        /gxhGqgx3ODMAxHE8qnxsfz+3TzBLMVcqzrzhIMb5tkMN6qoMdzgzAMS7JMZRBTYiQX7zEqzo4KyLqZH
+        dC5B86/ouCCq4hTUL6n4FmYfYnVakKScM2ieLHRYMHQI8sPFbAVRBUxaf7Va61+40EdB/fq/5Ra47fyd
+        QcBn8kSwzcdv3MgFVzggF1zhejTIBQVu5IK2sRoLDtSFHv0BONNABXsSulEVzj1FVIUb5RKCwo1SGUHh
+        xvIzbb+DMFN/AM7jgxmzRRCrE4EXTbyIae8ZNTf+c9F0pf7gnTiPD65anAsKKxdsXfdms/n2W9FPP/+4
+        dLj5+rAse+/+IPolGv08Gn3/689av0efZit4+7vXN6/ZeMd9d9ln5yM3eXazW6PooS/ujU649IoTx745
+        /uStHzj20a0+zFJw7PDozjv2Gt1z96eOOuaIo19Z/4Zo2dnRw49deNEZp4xFl3952uMXROd+lekM3tS6
+        uXnwLRsdsMdv+x16yPcvHhRFs5r3t86/+L5LXo7O+vbBy8574q5WpoKLDruxuff+116904G73bbrS5u+
+        E0W/njkrOv3Uc05qRff8cdx72z6yzUeZCgq8E2c/3sVCLjgJwZkzhO30B+A8PlhjJCvBGG5w5kEuKHAj
+        F7SNXHDVEBxKCFGVCqoyWEVQuNGoIyjcqDcQFG7UBhEUbvAluCGCAwk9qEovqlKvICica1UEQZZcSEK1
+        hqDwqcI6gsINzjwQQayzBNeqLggCJIFXeGZVx43OLjvnB6EoJmCr4sm6eK6xcgpmN4ONeevOQxI8nEEr
+        xZn/VmGO8ETQ3pB8hC+CYbBm/L75B2xV/JlBOsRDwQb7+SmIGpML5oJKLpia4PPfIShtCNrP3fQF7fXa
+        ETTfsDogGAZrTR8HW4X2ZvBJVCUlwSBY+TcmEexN6EZVAlSlp4igcIOzGZR7EBQ+uuRovDAdIYZOJYJY
+        Pgm8qgto+WVWdQGqwtkMJr6qc53KLYiqpCT4ZzSGJLhOlaWg3HdIgutUmQqGwYYJG2BjDJ3KmxnknXwR
+        NEfkgnaQC9qDV3NB82ZNX3CYGyazhxE0X4xSF5RrIAm8k/VYhK2CjJCEgH67pSRoPLBRkdHShGAYWxWz
+        V/qCbMVvBXOJDAWjIbqE8yF6poKoSi4YC1aXUykiKAGqUikjKJzDXgSFG8HTCAqfKngDQeFGuYKgUEME
+        sTqJFy5IglkPTfj/3QrmIih8qoCXv9wwR5MICdbtJwi2xnRaMFyp4HxjxU8ZPJlBkXoNQeADOi3IsOCC
+        5xCULAUXoCp2BlGVLAV5kJYgn8pDQbnL64iCj4JhsPZ6CX7O4KuIAh/hyz1o4IYvgs7ng8EzCIqHgvLa
+        04ecj4JhMH2dBD9nkD7C+QhzPRp0+h40cMPsRINOC6b0h5xsBWsJZVSlBzWmF1XhRrWCoHCjUkVQuBGi
+        xnDDXI8GIrg4oYKqVFGVoRqCwo3BAQSFGwODCAo36kMICjc480AEsXwSeFXHq6yJr+rae7rFDc48EEGv
+        mTbtbxxCCW4GIaZ4AAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="cbLineArea.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAKAAAACWCAIAAADWjhTKAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        vAAADrwBlbxySQAAABh0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC42/Ixj3wAANZtJREFUeF7tnYdT
+        HMme5/c/u4vdiIu7i7exd/fe2zfzpBmNHPIgCQkBAiG8hwa6oRua9t57b6BpgzcSTngrCe/lNXu/ooqi
+        yHYIIwnNfONLR1Z1dlZmfSqzsqqykn9JTU0VUsTn8wUCAbEQRRwOhwhFEZfLJULRFTeRuBFAbDabCEXR
+        2UoEjwNEzoeptLSUjBBDSARI6l90Ot06Raurq2tra8RCFC0tLRGhKFpeXiZC0RU3kbgRQIuLi0Qois5W
+        IngcILKxsTo38+rV7Nz81HigrXNjY0MkEpERYgiJAEn9i9Pp/C+KPnz48PnzZ2Ihit68eUOEoujdu3e/
+        //47sRBFcROJGwG0vb2NB6ampiYiaXBwkAhFV39/PxGiaGZmBk8Z9EU5iabDJILHsdlsXS16nbmlOie7
+        SW9tHxje2dnRaDRkhBhCIgDcrw14c08LCwtEaHOT+O6gDrNHyN1Kp9NHIml4eJgIRdfQ0BARokgsFuMp
+        g74oJ9F0mETwOAB4Z2fF5wn2+DydLSG+RnmWAGdmZpoPKj8/n/juoA6zR8jdqlAo8ACiuGUBffr0iQhR
+        RN0tX5STaDpMIngcKuBgWxODyztLgGUyCa+kaGJqlMWSiBsZKmuTyWQivjuow+yRGIA313ZcvS+n1t9D
+        eGJ+fW713cL624h5+k4At3d1aY1G2G+7gFEdHbDD4QCipN6/f//x40diIYogFSIURW/fviVCYZLJZAN+
+        z6v1HZ/H4/KYTW4bACa+2xW0jWW7gn4jHgBB55D4+qBgt+KBcMALL9d7ZlYdfQvB0dW2gZfNfS/dQytT
+        L9eez6w19b56/3mfdTTAeMqguOUFkTlBVFFRgReBWhyXy0V8vSf4udbv51utefn55eXllWGCzgREi5sT
+        JALAxQDDUUMKajAUmFiIIkiFCEURXoMjigpYr1NbbRhg4rtd2e32qeEOIddELynQqY2PS0o2tnZUKhXx
+        9UHBfsEDOGBz+6wuOA2GAACe3HzfNrzQPbHS9mxG3fHK9WwhMPh6e3NH5pte/7DfSkUDjKcMilteEJkT
+        RFartd2j84V6M9KeOMyWykasvUX2+cdPn82hcaGryTc2FggGibWRFDcnSAQM8FdvomVry0ub2zvLS0sz
+        k6Ozi6tIEw2Ad3Y2HCq1OdQrkXJqawQb2ztqtZr4+qBgt+KBCE30+pvt3/9rZXnTPbg8MbvSM7Xu7Fsc
+        m13pmFgxh2bffopfg4nQ8ZpoALy2MO2zq5s7e4oaFBKpCQBTE996+7FY8fxyZaCoQfPzvZJPMXd+3Jwg
+        EWBDXxtwXl5e/a6gb4UHCgoKiO92hQN2arQaR6iquiIYtL5e3ToCYFxxywL6CoCDzRaD2ZPL05ucRirg
+        gem1a9XBJ8IeS8eco3s+qTbwaiXWts4AYFLIdkntAt6aGBlzmRQDoyN8FbZHzjTgzfWV2ZeLcqVscrjL
+        6A3hgN9//Cxtmjhf4muwvgC0uItkGGnil5F0ZgAvr6zkFxW9efuWWKbIYDBwdwWXtngAdATAH1dev2ry
+        bi9vQfjTu3f4ys944POHtyvYelz7gH///OntBzx4UoCJAhwsjsbsfsTpTKxr07fOkHTBfOdwifI58ctI
+        Ogrgr9zJwiUzmRqNRrnevP32I3QxiLUHhWQsomC34oFwwG/HRrZW17anJ1aePZ+32Fbag5sTo7Na7XJP
+        z9rg8Nbk1II/tDn+Yqm9bX18ejEY2hwbWu3tmnW04T+HXYOnDIpbXhCZk2jCi/P58+8t/a9/KfWVqftt
+        XVizTLUhNHmTHoLTMP6TcMXNCRIB62RBkwhVltRJXSbBUUIsRBJfpx/Y3LySw/6psOkmPVgo79MEJp9N
+        rmzuvCd/JxAI5ubniYUogt2KB3DALx32ObMRDIE3Y8PLQ0MLLYHl5z1LTaYRgXRS61x7PrDyrG1aLZs1
+        O5bam2da+lY6O2dVtZMy2bTNt9oXWOqexAHDrsFTBsUtL4jMSTTV1tYuraxXavp/K28Re8ftXXPhNrVO
+        3q9vX1yLurm4OUEiANxv0ESvbb3/5ak8u4oldXTrQzON9hFolx6yOy5X+v+W502oBt7P6rWt6SUlAoMh
+        dmbIhjG8Br9/Of3S43nt79ycHl9tb523mF+39e5Mjrz2+V65HUsdPZujA0tD01sTk2t9oXmbdalvaGtq
+        aKmVaCFPqonGFWxtLW5oSCxuSON1mTtmkYpLGgCXqp47u18SPwtT3JwgEbAm+isDhvWAs1I7AIVBimcH
+        d81D14OmG7hVKG4eGzO0t0NzQvwykmIAxhW3LKBT7WThMjmdbfPzHKMVKTJi2CdQuWHnED8L0xkA3Dq0
+        eIsRApDhgKk2tU5k0eponP07/hF1VgDXKEMZUBy+FikmYtgnUL9h/0Rr/r53wJtvPlytCqj8U3hhqGUL
+        t7x5vED2jPhlFMUAvL7c19vDW9na7y3jWlubJ0J7Om3Ak6+34OxjCE4gBQw3vk+SmG1LGxGuL0BHAQzn
+        YSghKehk4R3pGIIrOSIURdDJgqaVWKCIbhiE/pStcxYMhcED0QwRoKgR0yEFuxUPyOVyOKQQTYwH1lZG
+        pqZDoxOBjfXZ9bXRFy8cQ8Ne4us9wQFNhCiCThaeMihueUFkThC9//AxjdvFtg3HLS8YjwO7qKnvJfH7
+        g4qbEyTCV+1k9U2sXqsOQuNMPVpjGCJAYwUXUcTvIwmpwf39ir4+IRgCsAiAR4ccKysD/kDJ+Iilt4vv
+        D5S1dFh2f7Ev2BFEiKKTqsFNz14lN7TjxaGWLqLxOAL3WI1hiPj9QR2lBn8dwDvvPgJd6EAhhYlhiJDK
+        7YT2jUgikhDAiObmemem2l/OBUOtNTOT3s316VArs3fIT3y9p9MDDKekK7SALjSNF4dauojG48Bp+E5d
+        K5HEQX17wE1NTXD9yuVy4ROEP0gA1CzLi3xZX3hhYhgiwDWDqyfqNQMoNmBQ3LKATg9wg/UFXDKQxSGL
+        Fs1knBv00MomcfeNqm8P2GazDfT4ewaG5OzGyddrFgvWHg5Mr0Hfytp54MbNYQDDJTLHMYqnHFHfM+CJ
+        V1tQatteqb8IcIGsz9f/mkiIou8CsMFqNOkF+dl165vbAPjdh893altFnnGyGLgPA1gdmHoq6iGSjiRy
+        t6anp2siSa1WE6HoihintLQUTxl0BMCfPv/+iNMJRye1OGQ4msk4POdonXmYSIuiowA2m83Q6SW1tbUF
+        PTFiIYrW19eJUJigTe7vaq5uYPUEQ7qOcVgUuEYz+J3mtinE+sAYsgYxRDC1Tl2vDuzsvCFSD9Pq6ioe
+        gDxHFEQgQtG1vLxMhA4KTxkUo7ykyJzgsnfO3me1IsWhLkY0GccQmrzHansTVu64OUEiAFz0YQN+L5pY
+        iCIoPBEKk9VqtZlkKoWqkl4+NLvMFqkuVfqtHbPITVcwHK3IGsR4hMS61q03H4jUwwSHIxGKohhZJbW5
+        uUmEoihGIrAHiylKSEiAlWtb7y5V+KFvFV6c2KbGuV0boeBxi4NEwB42nGwTrdfrpyjKKmvgOvebKarJ
+        5iia8QiZgu6R+Q0i9TBF7NpQdZjWFY4SIhRFMRKBPfis3U2r5Ur4NJWjGe9U1pmGy9T91LKA45YXTI2T
+        J+0LDS3iWyF1lCb6ZAFPTk62t7dD/zkUCmXWqJPK9WSOER8ScKV2wNw+S6Qepu8BcGuLLausaGN9RW+3
+        AGA4HBOgbxX2KPBLAUMHk20bITazp28PGFdnZ+f4/PrFCr+pPdaTE2QNYjyCwDVWa4rQ3cD1PQCemZlt
+        dlscWvOrtU0AnMrp5LvGqAXB/aWADa0zyQ0dxGb29F0AhlP445ycq5lVbNv+YJRwHxIwnMnSeV1E0mH6
+        HgCvzL/QWj1ybpXd1waAofNMLQXpLwUMhtPwzrsDD9OOAhgubAAJqXfv3gFjYiGK4ExOhCKptbVVEww6
+        +vvVTYPUG62IoTDIGsR4BEvHzBVa4H2UHAFgIhRFsbOK6ziJuFwuzq5qamrqWOwbSSnaQORyxS0vGImT
+        JeruGl0itrSruMVBIgDck6/BEzOvBE4P3+owt8U6ZpGjNdxkhCRmW8TbOqDTrsHQwV5bW3v58iV8guDC
+        g/giTHDpXGMYqtAOkPlHHLe8YCROg/UFXBATG9jVUWrwiQOGU2ZKtVFkwe6wx/DhAWeLe59NrhKpH9Rp
+        A4YrHztFMpmM+OKg4CL44ZOShOpgeN+K9BEAw+kJGnxiG7v69oCx+3O0gKkNe+Ib24cHTDcMaQLTxAYO
+        6rQBy+VySUMtX8AsLqtZXN+CFo/44qAEWm1SVnaFyE1mPtxHAGzvnoeD5s27/Tup3xjwp8+/Q4cIWhVL
+        O/b8JLYPD1jSNBFtFMtXAKyXcBvpjHqOaHVzOxzw77//F7QuHLOtaWQkny4kMx/uIwAGPxH2DEytERv7
+        5oD9/Qv4s8+TBQzXWpAssY2D+gqAtQZ1I7vCalO/eLmGAF5Ye1ukeHahvOUxTZBLZxkCkW/p4D4aYKZl
+        WOQeJ7Z3NMDhvWj8bmUMRezLbe28u1YdVLVMWDtmzG1T8BnRmqbBlBzao9wq8lPlHUDi4IbS4gHoSF+u
+        9L+L1JMGwEQoio7Zi4aT7uTY0Kvl1WeD2Gv2FosFX//m7XtZ0/gvpb58aZ+xdZqa22iOGwEcHkftn0zn
+        duIbBX3LXrTCN5kr6cWPuxg1mG8Mzs1O6632qZHeYM/g/Pw8R9uCxMFNPZzvstpml3aILVF02jW4qqqK
+        yWTm5OTAJ8hsNsPKrtHlm4wQ9O2VLfs5NIbiDLmiFieaw+PYu+axq8SPBJGj1OATAby08Q7ygb9BBY4N
+        eLS/wyTi2XvHXG7jIQHny/r8AwvExig6bcC4yF30cmWnUP7sYoWf+kIR7lMCDIZuzfO9i4hvAxg6GiXK
+        5wzjEJmn2IDHh7rrKir7RybU9kBEwCmZBUXFxUVFxdhncTEssizDYu/+qYjUVwAMDV1xaenQyLiseeJc
+        STOcdJGRC7hPD3CtaQg2jWfm2wDun1q7SceGOpN5ig145FmoqLKwtLhCZXVHBMyTaswyvlijzEzPml3Z
+        hEVoDKHqENuj6CsA9odCDTpdEV95v75dG4xartMDDFfD0JfGM3O6gDc2NrKzsysqKsrLy+ET1Nra+vHT
+        53v17RLvgQEbsQAbgtPT05AULghHBOzWKwxcZnNnj6pzGhbtXXN3mW3hQ62/AmBnU1P/xgbXbEMyifj0
+        AIN330jDCn8UwPZDj4teWlrqCnmZ9EqNySPWYW+qw29tnbOp3E7qHVQw9KKRNaR1LS8ySljgc1fv4gGt
+        bxiJw5VobHaTXlRgsHjdQ6+xxc5ZKCR0pIms7AkAE6EogkwSoeiKnUi1uutefjVdZKLmMNzABlmDOG4E
+        cLQ4qZzOF7NrkJm4xUEiAKAvqMGrq6u9vb0vert8TR6t1gxpaQyWq1UBw8GXXMExajDpojoZsoY0VNlO
+        vy3QPy6VS7a2d2ARVsJhNLWAVrXTrsEj8xtXqgLGQ1S+U63BNYZBlX8K8nOUGvylgP0+v9frNdgMAPj8
+        o7rwoQvguIDZCuflC5ck1sj3q7OLaxh1DeW0avgEwyKsLFE9d4cNoT1VwHD2gfMuzzl6GDanChi6INni
+        XsjS1wDcNzA02O0TGewA+C+3qyPeXo8LWFDPadGoGgpKXEqHw//C0REhPlLFIw6hPVXA0FvGH+5+c8DQ
+        gb1Bx17ywIsDpQYWpKg74biAi4qK8EkIcGVViZGs4I4DuHOWmZ6xPTLESLjuvXCh6W//13v5iif9qate
+        4rS0OjqJBj81n65wEXdOwNBGhQ+hPT3Aa1vvL+0OnINNf3PA4EeNnbNLO3hxeDweUCMFi3ieQccCTAp+
+        0jmynMRsQzJBOjZgdyndcu3Gk+v3HPVSF1vuYkncJTWetCfe6ze95/7Z9Pe/epKSFdklBWmpkoZG6D/j
+        v4LATUbo88Ge9OkBrjEMle+dfb4HwDTdgD40gxfHarU6jfJadlVeSuHc8hYs4nkGRQCMTCe8srKyFnM6
+        YajH9FrmtaoWsfuFPjAW0dqWEWQNaVOD3Pvbb1Y630TnW2qFiK21Qlt1oyunhHU5YdTf3GoyaH37W7nF
+        CL5aXCHysasTmcR3YWGBCO2ptX8GOo86P7FdDSUP0axuHkbWID5MIjHiCJzD2cJOvDgGg2Fj+VWoI/Ag
+        KaV/bg0W8WyDTmA6YYfHk0WrelguQg4xqqPVYKe1ren8ORedCxXXzpJg1TeKLXWiivTHtNxi6s8z+N0j
+        cweG0J5GDYYrzuSGDqF7f+Dc91CDoUNwrTq4tYXdkIcqO9gWmJ2fafKaXYOv49TgLwWsdjqbRkZqZTok
+        B7jNbZOGwKimeQg+wSZqsYOj3itX3UVVOMLYgMHOCpYnI2f/57tDaJFppI4DGC4T4ecgqMF4AF9vbseu
+        7Knb/R4Ag5Mb2kdnliGHQHRpZQU6ucNDA/B5koDffvh0q0hMl8sZEjOyedz55XV6ivKKacRXnTOeB2me
+        tCySX1zA9jqR9+ZtMmUw3zWGvLFDUommGICh4EQud1VRUfHx48fVrfcX9/pWpL8TwOWafm3L6O+//w5Z
+        raOIOpDoWIAhaahDedK+GPlgi9Qei6qSXpOVmftsalEkJ2alcJcxvLcSD/CLC5gl8V5NcHTtj6wOH0J7
+        TMCTw715ebm8RpZU7/D7/VB2KGD4wLnvBDDf3p+Yi9WfGGP/IgB2HHo6YdjGLUbI1hnrNRsAvLO90WyV
+        uboGRYFhAAwrXUI9dKycLLGzQUbaxpJQF8MNETw3bjm8z8nErZ2z0PfBZk7bEwAmQlEEBSZCYYKCQ/sW
+        ag06XQaTBwPcPbqYUB2wdaJvUsUoL2kAjKxBfJhEYseh8TXNY2PVbDZRgEhCygtlPOxMd5OvN38rb4E6
+        BFuKDXiiM/hiaowt0LUMzWE12NrmPUd0rKgGfsgaxBjgh+lOmZWaPlybLW+8JfJ0iPnloMBEKEwY4O1V
+        rzNg1GssNisAvkX3izwRpij7TgBXCTXDb97UKQ0fPh52KjwM8GGa6HcfPiUy2xrtI3hbAfnAA+EGwK+X
+        lqBm9D/v2dzaFgml1I4V1Ydpot05xe4aDjX9p+Le51P7Q2iP2UTvbK2/XNmYmxqbfLkIgFMbI986jVFe
+        0l+hida1DD/IKbtZaoBrdOR+ACmkvFgTfRjAtabhbPH+TaUY+Sio5haW0zOeFhSU1RSWVuX8+188aU8Q
+        crgPBbiizpOVT02/xjCoDe4PoT0O4J6eHvaucnJyKqrrfr31WB+KPNo3Rnml9u4cGg+cWdqAB5AIpI8P
+        GAwR4HrpLgurbAjiUCgEF8QqlQo+QX19fbAyKmC4Rg7uSai2/+87THIqAnwzZDiiGWKrtX16t2N1B8FG
+        +jCAXXVCSIGaMjKE9jiAScnlijJ1PyRL3RDVMcpbVi/f2lhp6+gd6G4feDEOexaJQPqkAMMnXCve3p00
+        gYrYbDZPjw69mJj2ulxLa1v4tVNUwLBy4fXLzs7eoee9zwaGoSm3Up4HxM1HRiGDXVQNHSsXS4xgI30o
+        wGw5tPDURxGm9tkH7P137o4PeHZ2NiHpUUKVnzoiBXFswC02na+rW80XTr1cMplMSATSJwgYbO6YvUEP
+        KXyTJGOLxaJSSEJetUzr2drewUf4YoAjdrJg5fNWj9HlVQvFI5OzcH6i3pyKnQ+xpZ1Hq/AI+ZbKeiow
+        xIfpZMGnFzrS/v0RbrauucuVfnIC4uN0snAJDYbC+vqSxliTDMYCzJJbzMqSymqfw6E16b8aYCzcNpNQ
+        HTS1zeIFAcAV+Y/4EpFVI2qbWIUaDCuxTpY90nTCsNLn0VdVM8wqpUyvxwC3TZHdOdgMGQ43U+acCAWe
+        u536Gh5y5UM18EPWIMYjeJJTnSo3NX3oSM8sbOG5BcB4IJoAMBGKIp7B0L24WFIvpW4CcYzylrJko+1t
+        RSymUt6gtTkBMBKBdOydhjtuHCSCLjgFh7unF5t0GQAbpEK2qJ5RUzT0cgMAw8qoIzpg5eTzHqaQY7Zq
+        VCYzAP6CJjowWn7uHC39KbU6hvuQTbTnaaG7lk9NP1/WFxgkhtAev4l+RFM+pbH0fuICIaJjlBeaaLhk
+        IPU1azBudWDqYoW/dXgRABOZ2NV+Ex0RsMWGPc/f2Nzc2oKLne0vAuxmipwP06moIvqQgN1ltZ7sImr6
+        TPOwtIkYRnpMwDOL23AmO84VDlfnv5OaD/7LX8/D561HeUgE0qcEGKzyT/1a1pJZyq6pqblz5w58gtxu
+        NxQwMuA37z78mlp7OSnz1sOnuK/fy7B17t8yjJWPzllvwjVHVSMVVUQfErCLwfcm3qNuQkEZQntMwHCx
+        QTcOncglbFY5G1mD+PQAg6G39Vt5y8D0GkITBQynZbFCcSOt8B4t8rME3DHy4TS0eK/diAsPfFjADTLo
+        jcNxQ24CurvYENrdDB8H8PuPnxOqgnBZeXzAdK7m5/OXoJuCrKf6VAGDJd7xCyWeG0n3XV4vUUIcMJyH
+        sQGWuxodHfUMD9dIZXxTGzlmM9ywGWQNaffTQldBBbChdpci+pCdLLAn4bq9eYC6lVuM0Lv32DTDABjP
+        eTTBiYYIhcndM/9E2A2pAWBq4uGOUV7cZrFYXscorZMg66mOmwg4bpzYEYrZOr7NJnE6iRKGD5t9/fq1
+        qbPT0tOrdD9DDhCqYTPIGsKBEe+vv7qgR3qCNRj6WfdTnHofdUOPOJ3TC1jdPXINhuusBw0d+Ntjx6/B
+        Si7/dU9nLT/qnFHguImA48aJHaFe6e5aXBTuviGHC22iQd6m5nK2Gvkl4mibcTVIaX/9W+6D9OzkNPgE
+        FyQ/JoEhPjxgd1a+m3VgdF+J8rmnFxtCe2TA4682E+ta8dSOD5ina8n6xzkXrR5ZT3WMRJgyR05pLTir
+        qAY+0/MqkQikY+cELpxyKuoHh/bnmo4A+O27D47uOaG5LbOITjo1l2aP28nqmvPevN1YVNbZ5LA3BWxa
+        1fzKuoiNPkQi/QWAS+me3FLqttj2Ee7uENojA64xDNXvvSF4Ip0sa73Me+GCI4TOuUo6RiI0tmKir0uq
+        NXc0O7tfTOn0RiQC6bg5aeo9MGlcVMBFdbKlmXGhRP6ir6v12ehhLpOc5hD0nxtpDAWb6Wtxco3BhRMC
+        7KoVeO4mU7cFFwY5uwPBjwZ4Y+fD5cr9iX5PBjBP40l57KZzkfWkYwNu0mq0Hr9Cp3v5au4rAe73N8md
+        PpVaNjU1chjA7vwyd24pAJ4YGder6rMrmK7nUycDuF7qvXSJui1b19xNOjaE9miArR1z1NnJTwowHIhY
+        JW6NnFpswDOjkwa3g1lbobLZThgwMp3w+saWpW0yny6aGx0PtjorSp82KjUA2BDcnw1XHzYzriUw4rlw
+        wc4UsyvpDovc6LBxqxkD0wuiBi5wimhLrRBZg5gawfPbRUvTAHWLtxmh1Q1sgD+R7yhaD5t/d+fN26S6
+        VpVvnExK5x8lwxEdXt4I5qggn67kVGd1I/rVrmMkUs6SdrZ7BHKFValwtbVr9QYkAum4OXF3TRLl3BUx
+        nfBninbevnN0zRbVSof62+obGxx6LRxTANjSHutetJOjxG4aN8houcU9FNWUVOCXOuG2MQ+M4Ak3NQI0
+        0U6tl7rF3SG061tbxE3paIIqToT29Gxi5X59OzUpQzDyP5ojHV7ecFu4Gsgn9nzz4iV7W4TRHTESKa0T
+        EftrV3XMeiQC6bg5aeqdIcq5K+xhQ7QmeoYiOBBiNdHQvbp1x01rgOZUW9UoKWHkJz4SFtZAQBX9gRJ2
+        vIetpJoawZOZC1106kYrtAPWzjm8ib5x4wY+XTMulUqFlwUU3kSXa/qhg0ZN6sSaaDyrD9PctQLkW3CM
+        RPT+EZGlHZwKLaelXWKNPNslOG5ODncO7pqDDVXxDFTD0UGmgmzGaWv3Xr5CwgDXZhZ+Eb+IpkZwF1e7
+        Cw9cPPBco0zzMA5YJuNXpuYY7UZafeP2zo5cLsfLAkIAQ/fqalUAefR7soBdDB7WY6DUB9yHSSTGK7W4
+        jwv448ePwnrWg/spCteB/5CCGNmMu5DmzikhYdhYkjuX/1GamYQ1WXsrw/1lRwCD772fQt2oLjj9mN9N
+        ABY1ZDzIGZ5+5fPZt7ZjAdYEpsh/g0L6hAFDJU5+hLQ34NiJQP2hVTfcuHrDGIwwFTHp4wIeGhycbg+5
+        5FKBMYT8kuoDm2kdx+5eUWAwMvLdtsKQr1JfE7ULDf7SKo49w6C0ItCRTqgKbm5ib51Ihfzx2SmBxqx3
+        tO1Er8EfPn2+XhMMf139xAG76FzvpcuO9gO3pmMnomt50W23BvXaQnqsd4KOApg6Edr62ppRyDcya41V
+        jdSbnIhhM2TYCdd/9x6QvSGwklEjET3kcpPEykcONnrD2coUCwqrwfx8Gh6ANUgc3MjNau/VBNvBm8aJ
+        da2zr1ch21KpRMKr9jgM5YyG7e0dqVSKFwcEvInQx49tw4spjR3UFHADYGQNYmp5o9nK01Jz676X4myQ
+        UiPESURqEWZnNSnlcA5Gv6I4bk6a+2aJ0u4qwkRo87NzmtJa7y+/uHhRb1hSjyPv3WR3FXv/4GXLxIa7
+        LE6ioPEJ33xdok92Nh6oiMLC6paWlu7u7o721mCoFcK8fBo1AmmkBnuS7jvNQXK74Kfino7hV58+fbp3
+        7x4+aTMu/FUOQLu5ubmwsACfILhmyJH0hv93H/DJ12AwXok79luLGIk4jX7vuXOGoirlz/+kPjcLd9yc
+        HKKTtfPGxVG4ajje8+ddKifye9zkZpzObigGtWAGCY1nuaaWFGllJVpZsdB0W2i84+CIyAgAeH5+vp5F
+        G+jr4IhlED4s4MfZLo6SzAOYpu6tEVrgEPnwgfjH+1ThE9ORKqliJVD+cyLVpwIYOyKTXY0KMkK0RJzO
+        LqhO7lI6/MR57YbT0YVEoPrkAEPHtYIJjJ2mAPljTdNgdnY2PqkfrrK//cOTVUAWCUByrVdUytw9wJjF
+        hntQle1cPh4HAI8PdZfzJTtb674WbCK0QwJ2F9GgL01mBlzKFrMNBhPl3TqqLBbL9LMmpStQkFs4vbyZ
+        XMih6SIPjD0lwFglhn7DXo2MmIizqR9qiDu/HP+J41EmNIFIHKpPDHDpg8yS4uKSwsKSouKSktKku3fh
+        OhgA9/b2GjUSl0zaKNNCG1j+3/+bq34fg0KdKdbfB6hUwGCJ7iHPctXKx4Z5AOBnre5bibf9/uDwwuYX
+        AK5uhEtMamHoUqV/aqqCp4aLHyL3FAFgp0XOVynKGNzF9e30Uh450yLi0wIMlfjuAxdXhUfAE0nPKYP9
+        SfrhTz9hT9D34tsLacj4JMQnBrjkfgbw02jkslqaweHD70UD4J7uVjqLYRYJyhv5EKH0n7+SmbMIWFzr
+        JY28OBwwWKZJ59gumgUsvIle31jf2NiAFA4PGC48sDHSlI50tUBXwGQnVpp/K29x975E/hGtxWKqK0zJ
+        otU6TIqWkUUmn9jR4T49wHBQ7lZi7EyMJ8IWqbdW53VmXea1lJH5VXEDhxrfTud5r98g0wz3UQBTe9Gg
+        7c0tZ6O8+N7jlZnREqGEXZqnsHoAsLl5UOl57rfKbt65ZQz1Gp1WwFN8N83RINs1XFndlqsyNdJiMADG
+        A1TDtxzbb8LagvtXbz68fufiT+fhE8LycuZeIgcMvWhkjefqNVtwjDrbLhQYPgWuUTi/Jje0D8+swvkY
+        Lwicd7e3NhZX1nqfY29JNwhV1B9SDYCRNaSflDak5FY9zKHBJ7hGaEYi7JunRXKL25N4zyHQQQQ8q5CN
+        QLDZalPevnL/xdyKiM2lRoYiQ4ttO1hGqvFEYjh+L5qswR0+y4PMJwMjwya7EQA7b9/VOKGF7n39en5+
+        aqitF9trEA0/9KCOCkw3yfoaXoNxK1VPgbFeWgE/IX8bzWgNhhbvzl3o1lEPWLLywWVxlX7wfKmvzjSM
+        t9h8Pr++vj4/P7+kkn43o6SgOuqDvBg1mCsQb60tTr98ZbC7obwxmoGINRjsrmrwXr8JZ+K9GqySsGkF
+        FRWDIwPqtjHkaRsUGbpm0Kmmpkz1UWpwjCZ6cmqyK+joGZnBAN99YL6V+DS7oJLOyisspWU9peUX1mZg
+        PSw7V8CxXVIr8kmQ0QCDoQvGsV3ksjKv/vSfRgbR84roCIDTslyCA68gIGxM7bMZ/O4L5S22zvkPu3Ms
+        Q+nqrS/olJlwwx0bsN/EUfiePQuZJhe3jgAY7L2d5BKb9gCrd3fshFbBW9/cjgD4aSHyQiXVJwYYmmh6
+        ZRXpjEdpsG3vnbueJ3lwRskoZj79299zEpNz7qeCU1OuNPCTqBRjAAbDoUCjX1bLHlc/jTV8Ohywu6DS
+        XcqgliciG7kP+9/wScy2ganV0vKK89kqa6QJgEnHBCySMgs1oWGF0rB5pBoMxisxNl1J11x6cjq9tIzc
+        sVnJqdSYUGR3JcuT9gRJnPQJAO7t6WJlF1Wl5VA3TLhe6r12w5Jb+vf/9zN0jkZGX4z1d7uCXRBmVD48
+        gDAmYDCDljg/Jaoovu1s3J0qK5IjAK5me1IzqeWJxgaud+vMw/94LKTL5CxN1Df+cMcG/KLT3SCU5tOY
+        S+tHrMFg9807lVnFNflVmp9+ctUJkW9JY0VmibE7JJHmDwQfF/Dy8rJFX/A04xfNgZtTFLPE7KSkiqzM
+        +dnp7JI8u9vjbPYeAXADI/3hvZ/rZJd3b3WhjDMTH2Q/zsxOz8Q+H2fCIvEVU4R1SinlicEGTBebepeX
+        BTYHsh5xjEQ4fNE2RUcGXPc4Z6jJnfbzzy4GD/mKavyYhosFp28QSR/3UQBDRwsfQwsaGhrqbqN3hqrp
+        dYlWTuRXx0SV1a1GfU+L8X5GlszmsDY3AWB6xUNqhxkAUxcjGosjKxIab0P329YopG6CV1vvsiqa/F3s
+        Wsar1S1YJL/yXrxoC46Rt16hwGQ43IbAWDaNReNhsxGHmylz5pfRST96UmBpR2dBzqnipxUwfr50Bz7B
+        tVJs+uSIRu5FU52ccDvjQUpZXl5eZmZhxtOylCwkAmn89rvnQapDZkXSxx27vGDoRRMsdxWhF83nVuVk
+        XYL93mi/oFI9tXPQ9oRfQMu6e29ubjbUHgo6bQqj/Qg1GEzGEevv8803yFtd2CZq69eW5nQyGa+qbmRx
+        ExbJr6DD4nT1kAds7BoMjnHIF9XJXk4PC+U6p0mpNGOTsFAHNVAd9zEtOEYN5jWy1XJ2iy/IbGCvbGwX
+        p+7PJYUYr8HuvHJ3KR1JH/dxm2jQm50tnbwMA6DIE5hvwlWNRlHg4Bx4j5ubVxkMBvv3BOHjAAZLdSk8
+        6xX8VhcYiC4svNJIS7Q6vWdokQoYzsHQIyXLc0zAm5ubHp1qbX3NH+qOBljrG/r14k/VnMjTrpKOCZjz
+        cn7YbQ91t7Vt7ezEBeyicz33HiDp4z5JwLiVyhye5RrXekkrLSVPlvVZJbTi+6Xsf9bSHuFWigrJn4C/
+        FDCYvNUF6QNRr01uD3ZUMyqW1raogN15Ze4KJlme4wP2e3Wjgz3DM0tRAM/VcDgmbbZcmhv21QHHAMzF
+        AM9am1wtzV64RooPGDqzFy5QJwgjffKAcSvUT6CG8S3X9JJKe70k8deLbNNFuKJFopE+AmAwbAUaDKO4
+        JuthmoAiWCR3AVxyeNKfkuU5JuCZ8WcMLr+r+xlUrHDA5o4eSXNxLuuvY4ONDY1R3wvFHQswu0HIY7Q/
+        6w71Th8KMJyJrt1w2juQTYBPCzBuuSada7tUUPlPRtXN/KLfkG+pPhpgMH6rSyfFnq5EvtXFFGOTOuyV
+        55iA8SeJuGg0GgnY3NEl8ZU1ui6KmnLUAVl6SbbMfuAOWrhjAE57lEpsY1dZiQ+RCKRJwNgtnYPPRnEf
+        BTAynfDC65dqSbFKXBjRSnEBq/buQA+TTktCvqJaKSoAIysRK4T5yBrcClk2tNVyUU7mtSRNZQM50zBu
+        a63Q88sv+r1pd48zia/OP6JqGgQnP63EA/rAqMrXwnPmNbouAVpZk1jWJMPsNSG/DbeRrUCyStpQwzVU
+        c3NuPYRPsIkRYR5l3OQUy/aCSntWAbIJcNw5ie1tYwTIXUWYTjhGDcZdU36/vPhaTXkysp7qI9dg3GpF
+        Pl3+S9Kd/0MvTobLBvIAx+29flMutWYW0Z8UMdLzq/BP05e/T4Abam1KbhWca80d3eLmokbXZVFzrjog
+        1wQ1pNX+OP9TBxyjBuPOuf2QmAA9uskajN3uODgRK+7TbaJJx+V3TMDg0oLbfm+Zy1pgZaN3Bjwpj+sy
+        ClYW5lR688bG4tjwDPTkNU1HvDNAq6u5fu3/1ijToNaKm/OgQaaixX18wLyCykf3/0HLOnBjMtz7gOE4
+        vnzlCGNvzwxgMSenpvJWcclFjvWiUVRDFhvszi1hXk98NT8bMhs7eoJWG3bBdmTAAm6aw5yfVZ6gDkgR
+        rqSPD5iRlxFsLpdyM5H1iKmAPYn3wh8r/TiAwXA+hk+FOpNjvwAdbHLwnruynvXXv29sbFi03NmlBZ/n
+        6IB1rbbCqnMKaUadko5Apfr4gBvzSjXyJ6Xll13sw44V9zzJdzMOTC8EPgpg9N2k7c3vBDAZQS0v4Juv
+        gy18tpMtd9ZLWP/2r2PDXTUs+uvV5Y5QFwBWewfI93Oohj2CrCGtb3U2uq7IfTyRS6wOqNUAMpr9NuS3
+        4QbAWN6iW8us4xtuaeRFyHqqsVuVe2FXORMuCJGtxCgO7ua+WQLkrrB3k+Bvd6Y0Qjvb30sNPhihWKp9
+        1Gi7AGEnW8b6y1/Gxsam9uTz+dRNKOD7adlPc/JJp+dWUL/Vt7qBrtLPgwqq8Cmo9TXchwRMVr6INjey
+        ofPIsV2ycwTIV6QB8P4iS+K9ctV+cPLqwwAmQO4qwstn308THR5BpcyBC3GJPtl87TK9TlojtFy9mwGf
+        YCtlBDJukVyrENNlGlVJXkbn1CpbtD/M29Dm47ivKvxcnN9hAJO/jebDAIYiSHUpYOQr0tQmGoxNeH/w
+        TZajNNFnCDAYmjihMZGn+clow/6hYYzZqQDwzta60W7qaWtd29khARvbAxx3gsLPJvl9TcDQFHGtV4wi
+        bBR0uBHA2DtOygND0398wLgV0mSO5VwZ+8n5X/9DYo38/7kAsNdonV1Zb3Z5dvYAm9pbd+k2UPl9XcAl
+        SlU233It4kgHBLA7t9RdXkvdyh8FsI6bpa29w2Il6lRPqhqKbV0H3vfFDYB5jAKTy9czMoUDNrW3A115
+        Cwvh95UBg0WGJJUyG4kARgC7qhuhElO3chTAyLDZra0NrbwMeTiPGHY9sgZx3AjgYyUiyteXJFTQHw30
+        MHNq/wknVFkL3dTWZe2cJh99Z+QUsxrYtXVM+AQ/LnjMcV+T+eqwDvNBA2BkDWq/jUw2mmM88McNgMn8
+        q2UFXOslK5eDxMEf+O8b+lkXLtgowxAAMBmO6PjDZs9EDQbr83+TOEWFrAIAoPRzhU2ZbNcFQdNjXavF
+        3r3f4cKf1Zs7+jjuG/IWBlI1cX/9GgyWadLFhrtIHLQG796XdXr2J6X7ozTRYH3RZU2TlMpGHVRKfGVc
+        9y28D2XuwP7JRHohQ9Uc4npuy1pqyJiIvwlgMM98zSA58FZHOGBsgINwfwK9PxLgyttaY10kNliFFnjT
+        Gl0Xq+T3n2T8UlJ5QeqrCou2728FWKXM5VovU1+9BMCiopqc7JzSklLcOdnZ/LT9/+/3BwKsq3uoE+Xj
+        bO5m3k3NSyVdKajEqATkRczkrtZqtTyTRBXR3wowWKxPlqv3H3sDYGFh9Uh/R0Z2emu7TyHFRqwKfv2N
+        3MofCTDniY6ZgrORSMQWnXh6alxlxa6I0grTcDACG7+07GZB5UN8MZq/IeDdy+LLFgE2QREYBwxQn4Vs
+        o4urHrMLwsL/+T8ce/8w4yiA0V705oZW9t33oqXFWmGevuw6sFEF1GIh98XEaB6N1RJq3tzeTi1IhZW4
+        FS1KMhzNeCIxrPZHHS1LOtrLZ6QBMFIE3HJVhtB029EghTjQixYUVE2PDiq0TTs7azhgwd/+btf78K0A
+        YHKLEf3j9KK10mJ93q+KZuzJvEQq8dmsEqs90O7f2NomazBY2aIkw9H8TWswZvy9PYiD1+DhXj+DwZhZ
+        WpscmwTA/ISbbiYxM8sfqIkG6wsvKZx8ACDkMJ6k5jkM1hqeZJvSRIPPBGC1Ip9ru2TnCgAwJ7eitKCI
+        XkHDXVZQLE7P8WQSYzr/YIArbqkMtQCgjlk3SdGjgkckmzMBGCzVpdAbrtMzcsoehP0nwAbslTBHN/a2
+        0h8LsI6RrBEXVomrClgFpZxS0jwL9hAQ91kBrBAVCPjJtVW3GnPLkB+CsakNdged/bEAs+j3K6oScxlP
+        ER5Un5kazMtzWQufd9eVpOwPAiftuZ/iUrlgK0cBbDAYNilaWlyIMWwWd9whsXEjgI+fCF+QoZQVMSUF
+        8mZ5NEu9UmRNuOPHaTIZguOxbWQrrXWiGDbUs5D8I87LupqVdZ5rTDCzuMhvHVkF9rJa2Iq2ZYS60XA7
+        O8YJkLsCuGe5BrMeupw17MJLmuYIQyFxn5UajBuKLNEni4xJyMNEdxUbn2Hoj9VEqyRFvIYMXVUiXBBr
+        okA6c4DhU2i8LdOmHhie1yDD3grfm+gjhn8owGBo2eBTX3lbX3FTc5Dlw6yHWflZT/KewCf4cdFj6rdU
+        f2+ANfJiniVBpcw1MvjpCYm4M/7139KyK5UedKpcxD8mYK2sGADrabepjPlSfpfPMTA6xWBxVrd26vh1
+        5FeIvzfAYI28kGu9zKx+ND8/Pzc9Oz892jUwAmGm3A3bwv7NemUdaeoEQj8qYHCxvvyGvipR4ycYA+CX
+        o8/dPteznoBrcOFsAQarFHnFvL/OTI2UlNBsNpfT68YAKzDAPKlmfLBrcGSaz+OvbG7DIpmNCIDD7kWv
+        n4l70biROHAy1lUnqVqwe8s8Ke/1+IC7xd3T0eIdXqzj1VFvL1MNgJE1iNV+O3Wyscg+6r1oqpHiMGru
+        A1Sfx+X2eczNzRBmKdywLa5E/Wp6qMVlsLWETH3zsEhm4we6F71rSg3eNTAuScBugARUUINXXs2MTc+W
+        1TA3ts9YE42bWZ0KUANNXpdBy1fqqDV4bWHa79K5Qu36nrk4NfiHAgyWFumLrujqUjKyH4spyiyI+lT4
+        Owe8syesBkvssC0gurHyemhkjE6jL23Ea6J/NMBgYFx4Scd6pA6os6qy8IFzCDOqv1vAEm7urWt/Byfc
+        +l+Xk/574l/+o6agBrZVWM6AtpdUUcX+0No/BmAwtNXAuCE9vSRV4Tvwsm+4v1vAFBfzzddl7NsPzl0U
+        GENwJjaFxklT/2/xHwYwWFIkzjmflvZLHT8LAYb4LADGXukoYPzno+S/X7l14MVwmbNH5sCsb8H+1+YP
+        3otGzGQ8MBtoGm0R0itGDICRNYi/VS8aMa30tt2U18hNM7b1ktstLCz0NTf7A4ESOgcWf/Re9EGLedkC
+        YUadINbjJvCZqMHgypIkHvt+Qfb/abSel7bQLJ3YeGmJhFOWXjY2u4BPs/hHaqJ3rVJWILTCfVYAg7H5
+        yLhZuryfRbo7ja6LspYaiZCdnZLR1Df6hwWMDaGN7TMEGI+g4zwx5JxTW+uETU/EArar2WVp6wfAF367
+        VFBYVFxczOVycZp/AsZ85gCDdezH+pzzWgdPIpVMT45ubm3XcGokYn5ZTk7v2DycenGafwLGfBYBg3X1
+        afq8C1cTzqU8SQGfu/7vgvoKY2u/sqX7AGC0F30m3i7cc9w4KlUlfqMjhgEwsgb1Sb9dGM1fuk90zBR9
+        4UW1R4TnU8yhK6wha+szq9WK0/zBe9HgH7gG49bVPsDfw4N8QnOtVwrmlzf+bKIP+EwDBuvo9/QlCZpm
+        2Z27dyqrKjkcjkKhwGn+CRjzWQcMxsYtld/U+JX5jHwC5K7+BIz5BwAMxsYtVSWm5j9YW1sjWP4JGPeP
+        ARgsKLycl31NyW0kWOKAw6cTVsUbFx1tJmDSymNMJ0w6bgRw/ETkZcSUwNEt8UiQNaiPN50wbn09E8lb
+        uI+5T+royX431ymTECyPNp0w+EQq34kkAqVC1iD+Q9VguTCvlp6i2+thgf5sojH/MIDBVn09AXJXfwLG
+        /Cdg1CfC5kQS+RMw4giAv//phGM4bhwAjM4NHGYAjKxBfRLTCX81wATIXZ2h6YQjO26ck6rBCM5wfz81
+        mAC5KwxwamqqkCJOI/ve7X/evf1TDCfd/AeyBnHSrTgRwPETiRcBHDdOYuK5u1l3Y/tOxh1kDeKkJymP
+        8mpi+2HC3bQrt2P4wdUrSN7Cffx9knL/MgFyV6mpqf8fjOc9WOmdjTcAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="cbRangeBarH.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAKAAAACWCAIAAADWjhTKAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        vAAADrwBlbxySQAAABh0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC42/Ixj3wAAFMhJREFUeF7tnflz
+        HMd1xynSImiClAhCIkXwwLU3dhd7YncB8AKIc4EFSBykJIqiSMk6kki2pehIdJAiddlRIsW2jrKiVOi4
+        Kk4lkkpO7LKOH5LKb/mn8sj51hDdb/phdzJY7i7mU99idTf4+s30m37TPXtt2bFjx71Vs6V29u7dC+Na
+        gHEtuHC0Z88eGNdCR0cH7KuGTGBcC+3t7bCvhe3bt8Pe4siRI6NrGBsbQ4kxPDwMGwb1ixJjenoa9ion
+        T55EiXH06FEYMwRHU1NTsFc5fvw4dYiKyokTJ2DMEBydOnUK9irHjh0jX6iokAmMGYKjgYEB2DPGx8dR
+        Yhw4cAD2Fp4E+J577kGJYQowDS5KDCHAgiNvAyw48jbAgiMhwEKYnAP80IvvXnzzE1mPXv345OOvcB0I
+        Jnbu3InuGIVCIe5EKpVKJBKoqFA7jBk7d7ajxDAFmMbdRYCFMzIFmLyQL1RUhAALjoQAC/nPOcCPvPbB
+        g3/5NumRV35mFbjOvfBW/vQlrtDwpHAzGzp7Ze7VP3ilroFj6JchzGDTuAsBFs7I2xksOPIyRVsBPrl6
+        uTS7WpxZObly6aEX33n4xXeokQp2gIfOXKaIWv+uDbCQZwoPXV+4+r1XOhg3hsRP0RZ6gCkl0m3y8esf
+        X3z1/RMXr1rjePzim+/909c3vvrjY6+9/9aNL59+7W/pr6QXf/7R5KXnn/u7z05ffp4KlvIzK6FQ6JCB
+        4sNeBjhUmEO/jMXFRToRzuzs7MzMDCoq5XIZxgzhjCqVCuxVyAv5QkWFTGDMEBxRtGDPmJ+fR4mRTCZh
+        f+jQ/fffv6Wnp4cu8Auvf0gz9diFK9Y4Hrtw9Y1f/9snN/71s9//17989z9f/+Gb337/v198/99fff37
+        p6598Nl/fnfl73/z8ef/WFh6nBQZne7s7NxmwNsZfCgxhn4ZdG50Ihy6XVmTmEN/gjFDOKOJiQnYq5AX
+        6hAVFTKBMUNwRGsR2DNMx0BZ5ODBg7Dftm3r1q1Kil4b4B+/+/Fb//C7D2/8+y+/+NP7n/7zZ199+9v/
+        +OPLb3/4Z9c++s233/3sF58/8co1P0WvpUFTtCnAT7/9ybVfff7ihzde+PlHz1z9gAoU8p9ceffCK+88
+        8tMrcz965fxfvGwHWFgKRsceK114zyvd1zOIfhn+KtpCCnBu9tHc4nPZhWezMxeshdVauVtF07jTBppD
+        F/vIyAgqKtQOY4bsyDpDDYqiadw33SqadP7l9+yIahICvHv3bnTHoFuj5ViDBhclBk0FGDO2t+3Y+oPt
+        jkokU6FIlCsciYVuSm8nRWNxrRNb29t+qLXYGogntX4skaNbvvR2EplondgSHAWCIYwIo/YU/eoHj7z5
+        qazzVz+Z+vNrXAdj2fZ24/MHU4BNFzshBLgnP2/fj1teQ/NPY0QYNadoIp/PZzKZQqFA/zqSSqVgwxDy
+        jCnAwiH6AbYkBLiGFE2Ro02VDe3YUGLQrjFsgO4WKDFWVlZgryI4ImDMSI49rI1CC2vkzLMYDoYwejRF
+        MVjh8OHDh2/PYAvh1kjLH1wUDD9Fb4Q8TtEWwtwXAuyn6I2QNylaC7Aw7kKA67aK7uxOJsvPOipd+YkL
+        aZ1UI62HKqV1Uo0iQ5MYEUbNq2ibBk/RgiNvH3QIjrx90CE48vJBh02Dp2jBkbcPOnbt2oUSo1gsWtsK
+        jWw2m8vlUFEhExgzhAAHAgHYM0yXLNHcKVpwZAowpQoXM/hAdHTq+d81rAaL9b0Hu0jR7gJctxR9KDmu
+        LXkaSqlh55Ml9ABHIhG6Q9jMzMygxKAbe6cBukpQYtCODfYqFPiJiQlUVKgdxgzBEW0BYa9CgTc5omOA
+        MSOQn9XGtKGUO1bGOTBo+4tz6Oy8+VJVf38/Xcg29D9QYtBU2GngvvvuQ4kxNzcHexVyRNkCFRVqhzFD
+        cFQul2GvQqsKkyM6BhgzejJT2pg2lDKjMzgHFTrT3t5enMPOnTt27Gj9FO3uHtw6KVoLsL+KttgfLJx4
+        +tOGVSJvnB4bssgSNhXezmDBkbczmPIbSgy6XApO0F6oVCqhoiKckeCI7qawZ5guWWLTraLdBVhwlEql
+        ok7EYrGBgQFUVAbNL8QJjvwHHQrepmjBUXLuucqVb2vS0LmrMGYIjoQA0/IQJYafom8jBFhwNDj3Y23J
+        s66GHnwTxgzBkRDgGp5FU8KhDYbNwsICSgzaIvcZSCaTKDGWlpZgr0L7Y5ScgDFDcHTmzBkYq9D+mLZq
+        qKjQMcCYITjKLD6vxW9dFR++DmOG4IiuPxwoY3FxESVGNpuFfV9fV1dXbSn6LgMdHR0oMeiygL0KpQrT
+        xKJ2GDMER0KqEFI0jBmCI3czGMYMwVE8HseBMkwpmoaOZjDs77rr5gz2U7QjDZ6i3S+y/ABbCI56suX8
+        6us1KTh6FsaMegfYX0VbCI5MQ0Re6GJCRYVMYMzYjKto4Y3vgiM6cjwFUCmVSsViERUVd2dkGlwKsOlK
+        IhMYM+o9gxshwMn80WNP/PLO6kDEeJE1d4AbIUWnSnf+QX93towTYAgBNqVoIcAbnqK1lwsnJiZQYtAJ
+        3HoNyoF9+/ahxHDxcmF2ZFIb7vqrv1DBCTDoZo8DVRkbG6PpgYoKmcCYIQxdOp2GPWNychIlFRrSnp4e
+        2FsvF0ajUQqqzezsLEoMOno6Gkd6e3tRYiwsLMBehfbHdJSoqAwdm9GGu/4Kj5zBCTDK5TIOVIWiSOkK
+        FRUygTFDGDpaOsCeYToGggIK+337bqYHP0U7qnVStCeLLG9fTRosnNDeY1Z/HUoaNzamwaXdnYtFVr1f
+        TXIXYG9X0cKbTAVHdHgpJ7LZbObWJ+c4uVwOxgzBkTCDXQR4M66iG/xBhxDg5k7R8XQxdPy8oyInHtFa
+        bMXGL8bGHq1VWie2JEdjdXOkd7KuetITGG5GA6Xo9NGGfidpI+tOvh5cfYr2A+xaQoA3PEUXCoXTa1hZ
+        WUGJMTq1oh23rypVOv8W1nWMkZERlBi0fMHQM1ZXV1Fi0FIA9qlUIBDwU3Q95KfoFtedTNHVz+Dk4OC2
+        u3c4ave9e7UWW5FYvLc/xBUIR/sCeqMlatc6sSU4CkcNjkKRvkBYa7TUH4pondgSHAXDMa0fS/3BcH8w
+        ojVaCoYiGG7GZnzQ0eDv6PB2H9xAKbpuDzoS2eHMmZdr1UBiEPYq/oMOJcDCxBIC7OJZtGksCHcvNsTi
+        zgGmcXcxg4UzMg1ugz6L7u7upiOzobmPEoMCjHdjMnbv3o0SY2ZmBvYqNLgoMdKlU1rwqhHNYNir0JVk
+        xZhDw4SjZAhnRNGCvYo1g1FRIRMYMwRH8Xgc9gwhTF1dXbC/xZZ0Oj23hoWFBZQYs7OzQQN0KCgxlpeX
+        Ya9SqVRQYpTG5rTgVaPcUAn2KtYb3x2hY8BRMoQzor0m7FVufguZwReZwJghOKLrD/YMIUz5fB72weCh
+        Q4f8FO1M66RoT1bR3n4JS6o4Pv/6n2qVKcBW2kRFRQiwcEamAFspGhUVIcCCo5ZdRVOSgTGjra0NJYYQ
+        RdPEEgLc4KtoIUxNsIqmUMGYITgy7YP9FK0EOJPJREaXHRUeXe7JzTmqvUPtdA0uUrQQYCGhefugo2VT
+        dDKZ1BYv1Wh/cAjdMVykaCHAQkLbVO/ocJ+i6xZgdyl6p/kbLbxN0YIjU4DJi4sULTjyJkVrrwfTUWrB
+        q0aJ0XnaTzty7tw5dF0LMGbQHQQlxtmzZ2FcNUtLSzBmCI6El8xNkAmMGYIjmhuwrwW6yGCfTtNW2E/R
+        zvgpWpGfookGTdFagGkP2hcZdFRvOPnDe/c56gfbd6A7hinANLgoMYQA+6toC/eraMFS2Af7vwBOuAtw
+        vX8BXJhYQoDv70sPTD7pqPj0U/EpJ5nab0nrxJb0J8GR+U9aJ7bor1qLLW8d3ddr/I60DUnR7mZwcPSc
+        dlf2VaUCwysYREYDpWg/wK7lLsA1pOihoaGFNSwvL6PEqFQqCQOZmSe04/ZVpdLTlzGIjMnJSQw9wxSm
+        xcXFkZER2CcSfX19/gy+w/JTdItrw1O0J6vone3td9211VGx2EB/f4ArFAprLbcVCGid2Gpv36W12IpG
+        Y3o/txQMhgKBoNZoif6kdWJLcBQOR7R+LJEX6lBrtEQmWie2aOgwiIwGWkULv1Pu7YMOwZG3++BW+4l3
+        G3cBdvGgo1AoRIplR0WL5QPRUUf1pMa1FlsDIxWtH0ux4floaU5rtETtWie2BEfUodYPNDRdKpVweipN
+        /6BDeKBqCnA6na688Y12Q2pqzbz0ZT6fx+mpCAGu97PouqVoP8AW7lK0+33w6uoqSgxhH0z9osQ4e/Ys
+        7FXoGmy9AJt2rrRtxXAwhKET9sGmMK2/D/ZTtGv5KVrBD7DFhqfoO7WKLhaLoczxUOaEo/YeiTvqYDin
+        tdiKDY1rnViK5MbCWb3RUiR7UuvEluAomhvT+oHSx/xV9G1MW0ZC2AcLjvx3dFhsyAzes/f+tvY9jkpm
+        iuF4mmtgMB9hjZaoXevEVucDh7UWW4lMQevHUiyZiyQyWqOlaDKrdWJLcDSQymv9WIomMrFkVmu0RCZa
+        J7YER0f6I1o/thLpIa3Flp4SPAmw/yy6QVS58h1CYuNJivYD3CByCHAmk5lfw9LSEkqMcrkcNpCauqx5
+        8nVHRAGmGYuohMOHDx/2U3RLyU/RLa71A+xuBu/rS0dPXXZUuvxMavZpB5nab0nrxFZ88kdaiy2jo1nB
+        0TNaJ7YER3KHrMWSG0fJ6SdZP5DpZAdnntq2bRuiYuFJgF086BB2csI+WHDkvy/aYmMedOzZrz3usTU4
+        PB0bGq9Rp7ROqlGydkfxwoTWSTVKlKa0ftZVNG38FabmeNDh34NlCd9VWe8Z7Ad4IyQEeMNfbND2wQL+
+        Pti1Sg9fx0jVAk02DH0tFAoF2Pv74LrJT9EtrjuZoj1ZRd+zv+9IetpRqfGHEidWa9RZrZNqlBp/kPWz
+        jpIn3TgaHDun9bOuQlnjz2w1xypayDP+PphooH2wuwC7eMuOuwALjkwBHhkZCYXDIScikSiMGXfffTdK
+        DBoHdK1Szze+1ztFC3nmjr+jI5fLlf/qa+2m+P/RQLqArlXosFv2HR2NnKLrFuAGTdHaPnhhYQElhrAP
+        pkNBibGysgJ7lUqlgpITMGYIjpaXl2GsQmPhbYDzwyfRNcN0UmfOnMFRMoQzoskGe4YQpnX2wX6KXleb
+        MUUL3+blbYp28UVoDZ6i6/1FaHVbRQupQgiwi1V0Pp8fLD+bXnzBUanK87Uqlkija5V6rqKFMG26VTSN
+        O3WIioqwDxYcUbRgr9L0KTqVye/qPOSo/d0RrcVWcuh4JFXiimdHo6zRErVrndja07kPx80wBZiiaBp3
+        IcAt+12VQoAb4bcLD8aNITEFmAbdxQxu2a8yFFJ0kwZ4s6fo6t8XPTyxpA13/TUwehpbPIZpH7y4uGja
+        ntJuEsaMtbtJDdrUwl7F+nguKirCPlhwRNMU9gzTyRLr7IOFS8NP0RZ+it5A1S1Ft+yvrgjLs0SmGBw9
+        56joifNai63U9OXk5GNcqSlqv6Q1WhqcvKR1YqvjQB+Om+Gvoi3WCbBwaQj7YCHPePugQ3Dkp2gL9yla
+        CLCQZ7LZbMyJZDJJJ4CKCrXDmOHCUSKRiMfjqKjQn2DMEBxhOBhNn6KFAAdGVitvfLNJNJAawoiotHKK
+        prujthpqYXn7YsOGp2hKlTNroC0jSgy6m3YbSE48po1CCytbPI4RUSmXy3Nzc6io0BYZI8WgOwVKDLpi
+        YM+gDlFSmZ2dTafTsO/ufuCBB/RfAKe5jxKDZvBWA5tqBsfTBYyICk1fWsGgokIzGCPF2Lt3L0oM4RfA
+        qUOUGF1dXbDfuvXmL4D7KbpWNVmK9iTAB2JHCw9e2yQyvR5Ms6dlV9HCUpDu3CNOWPsxVFSoHcYMwRHt
+        g2GvQrOKhh4VFfoTjBmCI9MQtfIqeteuXSgxXDzoIGDMEBxNTk7CWMUKMCoqwoMOwRFFC/Yq7gIsOGqg
+        FC3kGRcBTuZGhx/9m1o1kPDyN/yFMzIFePOmaNirCIeYKo1r65pqFIs7B5iiaBp3IcDCGXk7gzc8Rff1
+        9dFh2dChoMSgK7TNQGdnJ0oM2h3CXoUOESVGZmRCC141iifTsFehbEaBREWFjgFHyRDOiO4FsFehS5Z8
+        oaJCJjBmCI5SqRTsGRMTEygxaMbCvq3t5gdw6DKh5YkNbdVRYlCntMdyJBgMosQ4ffo07FUo8CgxCsfd
+        vC6Zzg3BXoX2/pRFUFGhP+EoGcIZzc/Pw17FetSAigqZwJghOKJlIOwZQpgSiQTsu7ro6vFTtDMNnqJN
+        x0A0wSp6sHBy5qUvapUpwDTodVtFm64kIcCbcRVdKBRgzBAcmTp0F2AXq2h3AW76VTTdSGixwMlmsyg5
+        AWOGMBylUgnGKplMJp1Oo6JCxwBjRt32wU2fonPLfz3z0pdNp8OpSZwAw9sZ7C5Fu5/Bnge48NB1bTXU
+        FOrOlnECjCYLcCwWo12aDe0cUGLQUe430NvbixKjSQMcHlnCCTBoi4IRUaEtCi04UFEhExgzhKGjmw7s
+        GbTJRIlBAYX9/v0dHR36gw7h+YPwoIM6QonRpAHuG5rHCTBoEDEiKrRko4mFigqZwJghDB2tEmDPoMmG
+        EoNSMuytBx1+inZU66TojV5FD0w9efTxXzSdDkSM3w8rBJgmECoqQoCbYxUt7xqLTtD2ie4xqKhQO4wZ
+        wke16NKEvYrgiE4KxgwXHz5zN4PrvQ/2PEW7eNBBN3sYMwRHtMaBvQrNqtZ7kuU+wIN0Z6/8tGG197Dx
+        q8tMAaYomsZdCLCQOYUAN0GKTiaT2nKjoVS3Txe6eFRJXlzM4HqnaD/AFq2TorPZ7K3PDQNakmhj2lCK
+        Hz0dNWD6TPTCrZ+2RkVlcXERxozBwUGUGKYPgJMX8oWKCpnAmCE4omUj7BmmT5rTMdDiEfbRaHd3tz+D
+        nfFT9J2Rn6It3L8eTHuhoIFAIAAbxvbt21FiJBIJ2KuEw2GUGKFQCMaMtrY2lBj+KtpinQC72wcLecbb
+        fbDgyBRgGnc/Rd/GXYCFPOM/6CCEAG9sit6y5f8Af2XvE6UgCOAAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="cbRangeBarV.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAKAAAACWCAIAAADWjhTKAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        vAAADrwBlbxySQAAABh0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC42/Ixj3wAAGnhJREFUeF7tnYdb
+        GtnawPc/+p577+7eu3d3k6iJm2bXmGy7iZtqElM1JsaeGM1q1oYFBRXQ2I0d7L1r7IoVpSMKogKCut/B
+        OYsjOjobiREyv+c8ed6ZeRlezo8z5QThi2vXrlH3Iz4+HkbY4MkBxMXFwQgbEokEI2yMVVJycjKZTIYL
+        2Bxm2YmJiRQKBS5ggLPsq1evfkGj0f7cj+XlZRhhgycHoFAoYITN4uIijLAxVklra2urq6twAZvDLFul
+        Um1sbMAFDHCWnZaWRgj+PASDKBab6OhoGGGDJwdgrF0ZKydmk2fPnslkMqRTdsXkBefn5yOrdgXsDkbY
+        4MkBGGtXxsoBXQno7+//XAS/zhkITO9FWkUPH3QAX6oEu1tcXjXorflFFYz+/HNWIO+emNfuqGpBoTZY
+        Z9Dp4vq6/qAApA2Hv97QrCx0dS7OCOFmIGB1eVWxsjgypNXoH6iVdXcp+JLVealaKoXrdqDVyJZXNXAB
+        m89O8IWQWrvAaqQllrGVS8qyXtHIuIT5XiBVaQQLqhWVRiJXN7/nyZQalVojXdZ1YueQRCxamJhTiRfV
+        DT28hSXVslorkKmb+wRKjVYkVytXtauaNcWyWiJTSpe2+n2KTquzt0Fa4yVX7QJPzpEIG2qUAr5WqVmd
+        E64plSreuKSLva7RKEXiPzf+XBrqVCq0ovp6zfKyuLYKqyfmFromROxVsBetclUjX1ldXlZJlWrpklqu
+        0SwqVAurmkWw8nMXzOXOT/Fk9QNCIFgwr0gqHspqnGkfEjA7eFU93Lqe2X6Orl9K6ybymmaLmsbjy9ms
+        Dm5Z63TTgHB0UpRazy1vm0woY1f0CYYnJayOmcKm6boBEfJcgB2CZ8apNFH7gKAog5NJ4bcNydqZgpZ2
+        fkmZqLVJNjK0PK+c7+0ED1xo7uDX1Yr+EixVcNj8OqSNCeq1a6oZccesuG1a1DYj6e5ik5vYmd2cWqms
+        p5nNGONVjfCqutmJDWP5JiRYvrxa9V6AtPp+gVEEj9a1c2re86jlE+/aePXDwoaOqaxWweSMpLqbX97F
+        re+Z7ZhYAI/qGp4D76nW97Pt41Iwglk9vIExcfsQn9HIberl6lb2csvaZ5uGRR2Dog72HPJcgJ0jeJG3
+        oFkUzJQ3zGYlc2vbZJ1Vop5+UXWNuL1F0tGhlKuUU4Pi9l5eVa0YJdiANc1c9zSrd6pwRtrFneeMzJbN
+        SN4PCnoneOVDM8Vj3PL+GdbobAlHOmxCggc5Mp/4ciprLK5oyNUnQ61Www3Y7D+C19Z0z6RWa9Sa9fX1
+        DeXqmnZtY31jQ7u2rllbX1tfX9Wug4S19Q0gGCSANLAJ5ICTm0oDEjbASl2wtq7W6hY1GrB9q3oDwcgp
+        cW1Nu65SrWu162oVWNDtYvPfNRXykjbAcVu7uqpbiXkZBWoEGzXgkaCv1nXFanW1gAP9mpovaRzityAr
+        N5/QZASfuJUIvNj4Mu08aXgFMxgM4CY3Nxd5qZEFQ+A6C2ngUICs1LndDzw5APBcMNpE3Ngw9HsY0kai
+        I5GVBjm7YsSSQBoQPDenOwhhsbS0BCNswJsARtgAwTDCRgnevlotXEDRNynVC7b3osv5/L434ex4Emjt
+        fs/BERvmoaDT6YYjeFdAKoywwZMDMNaujJWDOAaCFxZ05xosgGAYYXOYI9jekybjTKc7O773edrl7ZVq
+        ZaHV7HLLsHWIbmhoCMEmMDAQRtjgyQEEBATACBt/f38YYWOskl68eBEcHBwUFATGDdIpu3IED9EyDifZ
+        4litvU213flUyxNg0MM8FFuC9wZPWXhyAIfZU3hywCjHczlKCCYEE4I3IQTDCBtCsA5CMCGYEEwIJgQj
+        EIIJwYRgQvAmhGAYYWNkwUlJSZL9EAgEMMIGTw6Az+fDCBsejwcjbIxVklgsFolEcAGbwyxbKBTCaDtN
+        vdNowZy+PrTgXfdMJpO/SElJWdmP+fl5GGGDJwcglUphhM3c3ByMsDFWSUtLS2DkwQVsDrNsmUwGBjpc
+        QNHFFqIFi9ijaMG7vgoqlUoIJgQTgo+aYD/mvSjv0d4KQrB5CnYILCWVuHGG2gjB5in4t8i0yHdPiEO0
+        2Qp2Cnrn9DSVEGyegn96nReef9Pei7jIMlPBPrTgh+RXxFW0DvMTbOkeTyq74vIijxCsw/wEW92O/zGs
+        4O/dB9NoNLiEjVwuhxE2eHIAoHoYYYMnx1glga5UKBRwAZvDLBvrDdfNFr5Iv/7z77lAsL0XXTI2tq9g
+        3Vw0MYJNZQSPzgxEFV+zD6oiZrIgZia4foB8jxRITFVuYbqClxSKRbEYaYrN3S4vL/WMjVh7xBGCtzBd
+        wYL2tubgoAlK8khcbInbZTCgeydLMuszkYkOQjDEhAW3tVIsj9c52FbYnc+64LyokL1t9KjsaTcfwcuL
+        i/oGDk9wAwozEwxe4qJiGWnS+QWdYIvjdfY2FTbngOBxXntBm0/XqMBAsN+X//T/6l8BX39JPnHMxATX
+        3/cYiY1mk2KYN67x2lrhBhRmJpjVyXnJaCMVjYRlvb8dXiJo3SZYMs/lCHv1c9GI4HmRiFtbza3RNV5t
+        za7XZUdXcJa9TZWjXb2zQ4qVBbe5CW5AAZ5upqpyKj9vuiBvPDtLPDgAN6AwIcElLRPW92lOL2psn5f8
+        FpwlaG3RC6Zesq7tjwc5QPDx66RzPiVnvd8BweBIjjx2D46wYDubSttz4BWmWJ7AElzt7dUb8ftodGTh
+        VbfR7Cy4AYVpCbbySAOj89yz4m2Cbc/Fh55vH80EOd1s4Tc/v/r28hvQnJ5l4pkzMW3B5R53ys6fATmM
+        k5bmKph10Sal/FepTADz/kKBr2y8ghcWFmCEDZ4cAJ5OB725r2DwdPsKxlMSTsE4y4YRNlglbRecrT8H
+        sxzPZfn+AoqEeX+Bs2wg94u0tDS4tJ3+SXF9LxdpYxwhXIsNnlMCAE+ng97cVzB4un0F4ykJ9BSeuWic
+        ZcMIG6yS0IKvvshBBNc42zLinLJ+dNl5AYWz7NTUVMwRHEpvTGEOM6onn5AqKMXdcC02eF4egDhEw2g7
+        ux6iC30c0xKcwFX0roIPeoh+QmKdfVoInvLkPToh+PAFJ1seT81xLbpq8xkJTi4bTK1gp1aMRef3dA5x
+        zFyw1fHixw7IfbCJCW667zEYFjoY9qrit8sLAsPrQwCW4J8D8wNoXUHpvQ5etNLmUTMWzOtuTU5zrnWC
+        Ex0mJphx2rrpyq/Nl39NsbKQ8rjI+sruWWbnDGiszhm+ULyrYKdnWTa+5aAkC/dk8xbcOpxOi3UEL80k
+        BdOsLGrsztfa21Atj+sF33xdksIaA+1H37fD4zOfs+BfA1NSmb9SHazMSrDV3RRb/wq7gCoL96TPWbDN
+        80KPCPpobT6cyTo0wXOjo7y6WqRJ2WyYhMLsBfMbG2AP1NeDx8ANKLAEtw4J6nq5SJviiuDa7egFe1FD
+        qSy/ranKQxPcnRA/kEyeYtCag4PaI9/AJBQHF+wQWOYYzDyygpl3b0/SaZO0tOxLrlIeD25AgSX4XhSL
+        VjnGqJ68FZpf1jwK125nU3Dqg6SoyMLf7oYzPoHg1jfhBWeswVPmnj7V/oeRBS8tK+7GBMWUut0nR14O
+        CRueGD6CgreX/TcEo8vGElzWNubiR7odn+ASlKGf6DCOYKyPzaIFp5b17isY58dmQdoOwcscYe/rnGvX
+        oynOL0rvk55lNj5Idzizt2Bm2/i+gnF+bBZ0FlzAZkfZuwjGmoZEl81qGx/LyhxLoY6nUvtJsbyWFpDA
+        EfVlNz/xZzwBOeAi69rLXIP/8N8pGGfZQO4nHsGS2WlWT4RkYfakBxU5B1u6J6XXhEWHnI079h35xLGY
+        7781sxFc8fB+h69Pf1BA7qUL3W/jZYtzOS2eiWUJp+6lIoKNPII/reDaVtK7dj/F0iL6Iqt3ZKQj5Y+W
+        Vy9bQ0PaQl/NseFh7TAFC+fkIRmdkQWDoHkmNIjFEmMJRsqucbahh9pTmD9N8DsUSzKD+2AzEZx03iKj
+        xl0q44P1BlfR47zW2v4E5CF6DlMwVyRz8KI9oXR5JrVb3aEIhSIjCi52Plv82IGc5NjPzEByTFgwqA2M
+        Bn3TC666ZEv55ZRwZhxJMxAMrNPqrskV2/Z5yIItbpFBPbb+lZa3jSmYGf0oJce1xsWWYW3J/qtsExbM
+        E8ueJtSkVIxTmGOufnkika6nqu3PZ8a5UEJsse6DwRpWT/jAdAWyFcEMBNNYJVTmL4V3bJGyzUEwV7zZ
+        U4FVdgFbPVX00D41x5VifWIPwYK5sTnZtn40dcEn7ySllBfQHznqyzYjweieOmVR4m5XdsNus6cwBQMq
+        3v+xIN+a+jF1wX50r4b3jeiy9xAc/t//pFqdAHeJmaYmWEiLcmT+ZvdXT+0luLI3qn+KicQAkxZ8PTol
+        Iu8ys3UQj2DJ0GDxwwdMz0fljx+2hYaYkuCG3owkhnO1kw0ewWxuY1lXKBIDTFpwxLs7F32D9bdJewve
+        adSAIyrY2iM+reYaxcUK1VN7CZYrpG2j8EYCcAQFszpnyts5oDE7OHzh7v+RAMp2CCi6FPrO8vbWffBO
+        wd+5/QEcW91JOUKCG/pmM2rG3tZO0CtHCxuGhF2dYxnpk5kZ4xkMdl4ukqMX7BhU/lNwOIc7sb2n9hIM
+        4ElGhdIJJD6Cgm+8LqGy2BTW2KXnuv/GHqXTJt9mgB4YSCLPjcM7QFe/jD8Kr18IKQZlYwlu7ufefJnp
+        Hpp/KzQ3jN5oTMHJyckLu+EZU64XnFTY2fR7mF5wS/jvSE5kVotPUkNIZv/NCGZgcmU/g171+OFgyIuG
+        B/dKHz1AciZnxUhPeVJfB6Q/5nK56J4STE4iaWjB/SNwJaBjNK+2LwmJHZ9m6gUXNwyV3bmt76nBjHQk
+        Bw24JYMRNuC+HBxa4QIKfdmIYJxlF/x4sfdlMOiBdEf7qbo6JMeLHP08+dpXF/y++flVceNw2R13fdlD
+        u5UtkUjAWxMuYIBVtgFALub3RT9LqNILTil93xkdqRfcHRON5MQXdJ32zAE54N9gStV4Xm6mte5zCMXn
+        Tlc88UJypAo16KlLoQWxpVfOPSaBwtE9tTIPfwAY3VPjHAGyErCwNJvX+gSJnX2y9YJZbeMVD+7pe2qq
+        YJdfbgPjAEbYYH1ftHRRV7ZeMOis7WXPI2kGZaP/E0zS3QUSNv7cyGjwGpwZHOXKQRPNyZj37oKtb62t
+        kiyOTb3bpWys74tGg/Nrrvf6QnDjCr4ckf6AHAF66u8KXt9YK+kKWtWugNgUBStX5SqNAmhG8kFJreGv
+        s9wu5/x2BTRBfR2yHo3pCbZ9HHErNgnpqb8rGKBdW9Vodb879wGC17XaNZUKaSBG1q9vbKhW15C2ogId
+        9bEEg3dnfpv33OIkkgzA854zMcHzCvXzlPsPk/74YMEzc921A7Eg+ADBwynUgZjoscT4Nn+//sR4ZP3w
+        rNyf0pBQOhpTOPRL8Ltdf6fVKIL5C4NAMNCMJAOOqGBqSc+HC14SRBVfdQxmfrDgFbUss+ne+ob2AwR3
+        RkW+O3em3sk+74x1dywse5Ajs3QnOwbX2Pmz7DB+iNcogmsGYsYFTUgmwhEVHJKRUBBy/cMEi2W8G+FB
+        +p76AMFgBOS1eslXBB8meKtslGD4p/J+uj+V/0iC+e1N4NIBPXwBR1Tw75nZycU/FrjoevNvCV5WSRuG
+        CtE9BQTHfP9t5Hf/jfr+v6Rj3+kFW95O/uFR1g+eOaDrDQQDJIsT2jX1RxIsn5mpf/xoJPLN8JvwElcX
+        5OdLDi64IPPWhLAZSdNzRAWDc3BTM+ltrPPfFdzCTmP2pBkIHqfTxmipoI3T07QqFbIr56cMu4fJ9g+T
+        nbwZU1wRslKPQimpH0p09tma6MASTCrsD83qe50z4JXYlF0zhEewjMOhWFnUuzjWOjukWp5Afmn5oIId
+        rOg115GLfzRHV3BXXFT+pTNVP9viF6xaXWTU3+LOiQwEI4/dg8UdP0Ck1ixlNnnYedP2FQzKvhxWeS2q
+        2cYrQ3dtiE8w+vuIjCKYEWDXPpaB5KA5uoLBRVa2yw8pBRezHK1xCl5Wzw9xK8Bt0vHrpDNP8k975YHj
+        8IcJBhR1+F/wjdhX8NN4UHbRVtmfQnD1RVvqWQtRv+4+2IBPIJjBYICzzk684yv1gtPK+9oj/wA9lRfq
+        lBRj3xkTheSQ8jr1gkNSa9k52XrBxY/cm0dTQY5EtmLtTrJ2jwPNxjNdJpcjj92DpaUlGKEY4zf9FBip
+        F1zRMcm676EXPJGXi6R5x4GyoeDNst/oBXdGw7L7JqV6wfZe9IXpabRg0L8gR7ywvE2wTIYWrBCLkV2h
+        BU/OihDBWVHOcd5nhB3tSA4aIBhG2CiVShhhA+yCa0O4gA2dTv8bIxj0VK2zTSrZqSdZd1cK2GMEJwac
+        axxOQtLQfPBvxK2va+9Gx9j4HfURXHrZhlp8kXLWApnJMuBIH6JhT505VRB9E1wegxxMwRfOUsp/XlLN
+        IbtC88GC19Y11KqbzsG6ko6y4MwXDu/8HZH7YCQHjSkIPn0q4/dLxZ2B4A4PU7DDmdJUH7ij7XywYEBE
+        wUuPxJhPIlh3+37SAiTsLTjnvgvL5XydA5zoQHLQmIbgjug3pd0ve6ff7SqYdc0uNcK+whtOdBhwEMEe
+        seRnaS8OU7BLSPG9xKjnqY+4gvGkiku0DNf8QEfqyRO7Cm7uq6eU/lTupvvEpGkLBlfRKo1iRb0QnZdr
+        IDjj7EnaW9d0Txv9TJYBBxEM7oOdggocgisOQbBEvnjqLulN4c2wvHvXw4PnF+bTzlkWP7Av9HZIvnv6
+        XfvzKVGrdk2NCLYPrDj3MIpSdZVyZ+tPqkxbMEhQrsrTam/cjQtHC056dCYj6ULx+a2pSgMOJjjbl/bU
+        PS7xowrWaDRcaW9W0/0rr4IuhBTZBVQYnIPBBVTXYFZOy6NJUesTin9wpnd4wZ1zDyN7xtr098HmIBjw
+        tqY+stDtbkKcgy89OCWrsjwkw/ZUjYutfiZrJwcUfCOK9CLryUcUfNaSNzeY3nCreaTMwj1x74usjY31
+        K6HhntTQm7FJJ+8moCc6zEQwOAfbPGW4vip6keVFZv0vO+tG5tmTIOfjCXYILCSVXfnBI87ogmucbQr8
+        HSn5rkr1klqzdJCJDrMSjJyDz3tnhqSVbV1FfzTBNr7lP4bln7xLNqJg0fRw8nmLjESXtIwLqZd/OOBt
+        knkK1p+DD0HwhZCSiAK3yg72HoIdg1nW99Pii+MLMx8xQuxrnW0Y/nbl6U/Z/HqVZrGyN/9muN+16NTL
+        EYzQrBspVf+jPjlX+ZNttb0R7oNNRvDToyoYPN3LrPstw7m7C06o/C0iJrLopovvm7jisPwcD/obxxoX
+        G1qUY3aBe8MwWaEU57aEBNDveKWEXXyVezcyjD/ek2x5HJ6DNy+ywH7MRzDOueiOzbloRLB+UpeUvzUX
+        /XL7XDTLyxPJMWDXeWYDwJsARttx/utz0U4+sfQ6jzKPW3rByFz0imoxmZkRVXz9Tnw8GMH6KXSk7C79
+        XPQUnrnolW2CDeaiJXvNRSOCTXIuGumpTz6CwVV0aWtvZdyToms2tU42jFOWA7mUltHUdx2+fsks2+f5
+        W2V/6H0wcQ7W8QkF6y6yqE+Tiy+m5rqmOZ6kFv1U2fdGviI4+H0wIfjICH5wr9jpbOl9B/ppy/GiXCSH
+        EIzG5AUb8T6YEEwINi/B3iTml84+X7kGfPNzaGpZLyHY3ATLlldFC0qkSaRyIDj/tDV4ebk/EILNQjAa
+        UBa49w36+svQb/4d8e1/euP2/8gOIdjEBOv+ikutQpr+r7gIwQaC6efPxh//PsniWOz335qYYBhthxD8
+        3eWIry74f30x8Lsrb4Dg91GRra9etr0KaQ8NWeJwkBw0n0Aw1lQlGlAWjLazx8dmDzJViZWjn6oEgo/I
+        x2ZL2jjFrZutjTM3L0NW7gFWT6I5pKlKNKY7gjuiIqO//5ZqeYJ84hh6BH/zSxjYCTiu2j0+0AhGg1U2
+        mk8wgs1b8HRZSfXzZ3W+PrW+PrMsJpIzK1n2ia/wJdc8J1eHZbTJZ2YIwaYqGFm5B6CnFmdnCcG7l0XK
+        a/+HvedXLn7/vhQUTKlm5+Z4/eP/Ar7+V/C/v/oYH5vFI9gruvSfDt6bJQXjF4z+rXRC8BZTQkXjoAhp
+        feMCJZ8naWxAmnxoCCZt52MLHpqR6Utiz4iRlXsAekqlUEiaGmHlTY1I5+4UTLE4nv3DSXCxlmzx2QhG
+        gycH8LEFo8FTElZP7RScefFCmrNjmotT9sULKrkc5qEgBOswXcFwAzaEYB2EYBhhQwgmBBOCNzmg4O+v
+        Rp96kA6a5W3d13nCDdgQgnWYimD58uqvfoxf/TNAu/qqSCbb5arKgCMqOCkpSbIfAoEARtjgyQHw+XwY
+        YYOVg/622cL6wVLU17b2M+gwCQWeksRisUgkggvYHKRsNHhKEgqFMMIGZ9lkMhnz+6LR4PniZTw5AOkB
+        fqf1ML8v2oCDlI0GT0kymQwMdLiAAc6y9/pCcDSEYEIwIZgQvAkhGEbYEIIJwYTgTQjBhGBC8CaEYEIw
+        IZgQvAkhGEbYGFkwjUaDS9jI5XIYYYMnBwCqhxE2WDlowcy28X0F4ykJdKVCoYAL2BykbDR4SsJjDmfZ
+        urloYgQTh2hCMCGYEEwIRiAEwwgbQjAhmBC8CSGYEEwI3oQQTAgmBBOCNzGi4JK7t+OOfUexPA7+JQTv
+        imkL7qMk1/o9r/P3rfPz5TU3wSQUhGCd4EOei8aTBl4hjLaDFsxsG4drscE5Fw06Cy5gc5Cy0eDZD55J
+        ZpxlA7mmNIIdnjBO3Ey0vEM9djUGjGC4FhtiBJvYITo4pf5xVOnj6LLH0eWt/dNwLTaEYBMTjMZYJRGC
+        dRCCCcGEYELwJoRgGGFDCNZBCCYEE4IJwYRgBEKwCQs2oY/NojFWSaArTfRjs8AxXMBG97FZNze3hP2I
+        iYmBETZ4cgDR0dEwwgZPjrFKiouLI5FIcAGbwyw7NjY2Pj4eLmCAs2w3N7f/B9VB2SaISaQKAAAAAElF
+        TkSuQmCC
+</value>
+  </data>
+  <data name="cbBarH.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAKAAAACWCAIAAADWjhTKAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        vAAADrwBlbxySQAAABh0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC42/Ixj3wAAEGtJREFUeF7tXWlQ
+        VFcWnl/6J6kYrcriLjqYVEqnTMVoKhOjM3EBwZIYtQIZHU0MGaMxI4oguEQFxNEkTmQXZImJScZdRBEw
+        ihsuiAMKGNGABqRRGmUXMHNf3/fuO/3u49ENPW3z+lR9RX197nfuPfd8aU33ySN/WOofGL19R3R8EkFU
+        3I7I2ATKY6QgW43eniiS+KRt0dulYKdlslJFBrlEgCxRSDdxvk5ZJgSlYjhZREx8lLQJvyoTsmFUrDKo
+        KouOUwZBK1hQrSeykl3H7LKUQN6BTFz18w/4Q+qxnx80ttU0/U5gbGi7X9dC+cPGVkrYKiMEVQ8aFEGZ
+        ND2mhEBDVtP0mCl5mYmzAkQiy4REMZevk8lgkJfdq22uaRQ3AWeJq7ASg7FOEVSX1dQrgrAVKreQc+VW
+        sDrb6Qk7l5OZnSXKDqdnocE0qHVZNNicgJM0ZGgwyEWDFTIhUdkRlstkMNjtDM48eTY2IYkgLj6REsgZ
+        iY6NpyQWyL7+JsJouhoaLG7igAanZfzc2vZ7+3hMSUtrGwiKyMk5/+vdarIJGixu4rAGZ5RkJV5OSryc
+        TAAt7NDg42cukE2UBlfVNu8/fGx/WibBwbR0Sg6kiRFCDpgIwZ4Dh1mQIxkElDPZqZxL9AjVW6HB7Rmc
+        dVP4WdtUf+SX9ILS9F15KZm/XtqVn9Hc1nasKIMsUYPrmxpbW5rTfjlFOAExOOtUDtlEafCtivszvp4x
+        99u5toVPvM/fAufRI1RvhQZrGFzX3BCavXHb+ciG2pv7CtL2F58+cu3YDUN+6IltqQU704qz04sOrj+1
+        k7ynMwozOzZ4Xuq8JXlLbIuFZxd+GP4xPUL1VmhwewYfK8mct2/e4sOfHb91gli49UREyrmknOKje69m
+        pubvi/o57MvTsXGXEg9dzSXi40VZHRs8a/+s+Rfm2xZzTs6ZEzafHqF6KzS4PYPJO3h5+oqKh5Umg38v
+        NpQUG26evn5g/7WDYSe3Rpz4aufF73YXZf2Ud6C1pWFbTkpLhwZP2jlpeuZ028Iz1XP2Oh96hOqt0OD2
+        DP4+/4fTZWfP3T4fdSGGvAR4/OhR/fac2AJDpXlcgJbBr8e8Pm7fONvizV1veq16jx6heis0uD2Daxof
+        GuruGeruE0ALO/y36HYNHv7l8BHJI2yLV+JecQ+YRo9QvRUa3J7BuTfvpefdTs+7QwAt7LzBzwc933dL
+        X9vixdAX//r5ZHqE6q3Q4PYMvnxLfOPm3bp/s8yQceV2bqkxq6Cyue3x+SLhD2dqcGNTa31905Er5R3/
+        HdzDvUfPmT1tDK+ef/YZT49QvRUabInBjbV1J6+Wn7xedbaw8rbhQcrJG+cKbp+7bjhfXJF8+jZ5T9+4
+        c7+5VdPg+3UtF68UXiq4TnA5XyS5+UUKQpCTm68IyqSgOJeTFZWU0SNUb4UGW2Iw+flD9i+pObfyiyuO
+        X7t7quD23hNFP5y5eSi3LPtaNTG4pKKGits1GL+qZKuwEscxuNRQS5B/vSL7Wvl32Tf2ZJekXyo9WWzI
+        zKuorn6482xpk/Y7GA1mq7CSJ2hwVn554R1j4Z2aQxdLqdMSyMek1kPnf71haDCPC0CDBdItDK5tbDHW
+        NVNACzv5b9FoMFuFlTxBg9tHpwyuqm0+kJZx8GgWQUlZBQ2qXkbDOTRYXgWtsNbgsxevBASv+ch34Ue+
+        /zD9pGBcJPM/+lgRofzEWWF8pzSYfEya8ZUwTfLa7BWbnEKDqpfRcA4NlldBK6w1mMjIn6ald6tLK+4J
+        P00okzgjN0rLKSm9e18iwuqdew/JJioG02nS3ANzY79FgwVC8KQMpgQeAc7lZGZniTIVg+k06b0978Wg
+        wSZCoCuD6TRpYvLE6JRkGgSbyifxx8sEnKQhQ4NBrh0NptOk0ZGjo5KTaBBsKp/EHy8TcJKGDA0GuXY0
+        mE6TXP/lGpWcSINgU/kk/niZgJM0ZGgwyLWjwXSa9Fzgc5GJO2gQbCqfxB8vE3CShgwNBrl2NLjHVGGa
+        1MOtR0RCAg2CTeWT+ONlAk7SkKHBINdeBpMPXufzrl7MLyb4zWCkQbCpfBJ/vEzASRoyNBjk2stg/KqS
+        rcJK0GBzAk7SkKHBIBcNVsiERGVHWC6TwSAaLLxGg9kqrEQ/BlfVNh88mnko/ThBqgrJooRgX+pRKaiU
+        HUqXZZfyC+nOoDJWLhrMcu1lMPmY9O5X785JmWMTzNo2a83WULozqIyViwazXDsabMNnkxZkLlgXG053
+        BpWxctFglmtHg234bNL7R95fE4PvYHHVUQy24bNJbv9xC45cR3cGlbFy0WCWa0eDbfhs0huJbwRsW013
+        BpWxctFglmtHg234bNLL37y8bGsQ3RlUxspFg1muHQ224bNJL6x94fPNK+jOoDJWLhrMcu1osDBNmtXT
+        JugxrceiL/zozqAyVi4azHLtZfC9ukc5lwsuXCkkuJjHyFVKLlxhpPDMhTxK2CqQXZNIIf9IEigXDWa5
+        9jIYv6pkq7ASNNicgJM0ZGgwyEWDFTIhUdkRlstkMIgGC6/RYLYKK9GPweXVdUvXr1gWFmhCgERUsHSD
+        vyKiiq7JWAEi6UgmwlJZCLspgbC6NCRga1w0bQVsq34MJh+TvBO9fdN8nRPz98z/eMNC2grYVl0ZPDdt
+        7uL/LnZO+J71/WTLItoK2FZdGTx99/QPznzgnJidMXu+yq9c1JfB45PGux9xd05M2jvpgw1/p62AbdWV
+        waMiRo39aaxzYnTy6JlrvGkrYFt1ZbBLuItrvKtzYljEsOlB/K9c1JfBvT7r1Xt1b+fEsyuedfvck7YC
+        tlU/BpdV1ri4DXOZJmCo6acqEeA5VBHshExWcjLIVWX8Ki+DQRUZgBj0GOazWNd/Bxsb2u7VNhsbHwv/
+        z46GRxJpAaSNcnIZEDQjxoZWsg/lmrI2QdmODHJGmAwewdcJZG010hH8blUPG6vlTdiq2DjYVl0ZjF9V
+        KggBGmxOwEkaMjQY5KLBCpmQqOwIy2UyGESDhddoMFuFlejHYGmatJJguTBjUScEplGM+uqSVcsMD5vp
+        hnyVoFw0mOXay2DyObir06TDvhODJv52X+wIXyUoFw1muXY0uIvTpEVXFrltcUODRWLWdO4Wcq4dDe7i
+        NMnntM+4kHFosEjMms7dQs61o8FdnSalub8a/CoaLBKzpnO3kHPtaHBXp0k/jnX1c0WDRWLWdO4Wcq4d
+        DXYJdxkeP7zTcI137buwLxosErOmc7eQc+1ocFenSat6PzXzKTRYJGZN524h59rL4LLKmiFThg6ZJsDF
+        9BMSM3i6UKKUeQ4d8vbQCqN4Vb5KUC4azHLtZbCRTpOEOU+bMKURSYuCEJDLKIJgVTybgK8SlIsGs1w7
+        GoxfVSoIARpsTsBJGjI0GOSiwQqZkKjsCMtlMhhEg4XXaDBbhZXox+Dy6jq/DQHLNwYR+IetFMlGJSHw
+        C5FkKqsWymTwMsgZYTIIvk5zmbTKyZaFBlICgzwh8NuwQhFUl4UoZbAVrADVyzJoy5Tnhq1cGbKWemeR
+        weRzsDM/m9TtsODgAg8/6T8DtdDguUec99mkboeFlxZOWzudemepwc78bFK3g/cJ70krp1DvLDV4QtIE
+        5YAI4aiYcmjKW8vept5ZarAzP5vU7TDm+zGjF4+h3llqcBenSQh7wjXWdYTvSOqdpQb3+qxXn9V9EN0C
+        vYN6D509jHpnkcFllcbBk10Ge1oAjyHKiCp0IPN0GeSw5Xm4vO75BvXOIoONlk+TjFrTJIloD50IRCUv
+        g5wRJoNH8HUCGYGo5GVVD0zPJpkHeUJwt7pWEVSVVRrruKBKnaqX5eu0vCfUO0sNxq8qFYQAv4s2J+Ak
+        DRkaDHLRYIVMSFR2hOUyGQyiwcJrNJitwkp0NU1atiHQf2OwCUHtk+BlIQFcUE0WqiGTuZoM8k7L5KCa
+        jN1UDqqRYD8LL6slk3nXL+u3ITAt6wS1zDqDyedgnCY5PohHWxNiqGVWG4zTJMcH8ejfSbHUMqsNxmmS
+        48Nrj9fXO8Rfmmq1wThNcnxMSJ7wZUIktcxqg3Ga5PgYFTlqc3wEtcxqg4VpUsJwhCPDZZPLprhvqGVW
+        G4zTJMcH8Whj9FZqmXUGl1YaB00eMsjDAkwdrIyoQweyIQMtu6yFMhuUN2nItoR4apl1BhvhNKneFtMk
+        LRmBqORlkDPCZGZTGq5Og+o0iZPZfprEyVTrVL0sX6d2Tzr5TRbJxK8qFYQAv4s2J+AkDRkaDHLRYIVM
+        SFR2hOUyGQyiwcJrNJitwkr0Y3BFdd3ykJUrwlcJ2BgkkWAlCV+1PDRQGZRXCRF552WQS4TK/MNXLV27
+        olz6LRFosBixxGDyOdh7h8NPkw77un3hVnKnitaMBosRCw3uFtMkzwhPNJgSqw3uFtOkCZsnoMGUWG2w
+        ME066u7QOOL+2vrX0GBKrDa4G0yTfhz7UuBLaDAlVhvsssnhp0nxw/st6YcGU2K1wd1imvT0+0+jwZRY
+        Z3BppXHgpEEDPQabwBOAqf9vGeQSobKpgweOG0T+WaQ1o8FixBKDjaZpUnVDG0FN/SORNLRQYpQIQaWx
+        nhK2CmTCYIRyg5ZMUFLOywRer0xhMpJImkJrRoPFiIUG41eVCkKABpsTcJKGDA0GuWiwQiYkKjvCcpkM
+        BtFg4TUazFZhJfoxuKK6fnmIOEQKkEY9gJhmOyYsDxWHTp2WmbhIeBnkjDAZhLaMHcHL/MPEmy5bvzK3
+        oJh2AHRQbqt+DCafPYRp0mFhYuM8mBk5c29qOu0A6KDcVl0Z7ITPJnnv9nYig53w2SSPFA8nMrgbTJNs
+        jbei33Iig53w2aSRW0Y6kcHdYJpkawxeN9iJDHbCZ5Oe+eSZvalHaQdAB+W26sfg0krjgIkDB0wdZIIG
+        GdTfvesymavJIFeVKVfVZHJQhUiy/n8ZmJZ5knYAdFBuq34MNqpOk6Spjvo0ic18ZJk8TepIJk6TeJmJ
+        KwtgMpjLy8DQSa6Zl9FnkyhYv0AH5bbqymD8qlJBCNBgcwJO0pChwSAXDVbIhERlR1guk8EgGiy8RoPZ
+        KqxEPwZXVNf7hwYHbFpNEBi+ipIAnmxa7R8WpAzKRNQQdCCTlCoyUAAjQCbn8nXKMhBUkwW3u0n46uDQ
+        L2hPCPRjMPkc7ITTJB4LDi6YtGQy7QmBrgzG33RH8OnlT91Wu9OeEOjKYK/dXophixPCJ9tnfMAE2hMC
+        XRnshNMkHm6pbmP+OZb2hEBXBuNvuiMYs2vMyIV/oj0h0JXBTjhN4uEa5/rHD11pTwh0ZXCvJb36rOnj
+        7Aju029Gf9oTAv0YXFpp7P/OgP7uHaMfF1GFI8u04DbglXdG0J4Q6MdgoxXTpDpK2CqQPeFpEpDJNWtP
+        k/jVmgbxGz0CXRmMX1UqCAEabE7ASRoyNBjkosEKmZCo7AjLZTIYRIOF12gwW4WVoMHmBJykIUODQS4a
+        rJAJicqOsFwmg0HnNXipf2D09h3R8UkEUXE7ImMTKI+Rgmw1enuiSOKTtkVvl4KdlslKFRnkEgGyRCHd
+        xPk6ZZkQlIrhZBEx8VHSJvyqTMiGUbHKoKosOk4ZBK1gQbWeyEp2HbPLUgJ5BzJx1c8/4H9ign3GgCGQ
+        ywAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="cbBarV.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAKAAAACWCAIAAADWjhTKAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        vAAADrwBlbxySQAAABh0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC42/Ixj3wAAEVJJREFUeF7tnXlQ
+        HNedx8frRFtKpTZblcqmXNkcf+SPOMmaJLVJObVJbSprV1K5fJQ2UWwLeW1LtqTIcjaKLkuR7djhCAwW
+        IEDi1MUpTlk3IGQhgaUoNiALMCAkDSBguMUpIe1+u99BT/dr0pDhGPT7VFf719Pfbl73Z17zGD2wa+nS
+        pVG+uN1uXgnCw8N5NSmhoaG8sickJIRXAuuXs2YiIyN5JQgLC+OVwF8Za3twlOnAaWciIiL4hsB0FHBy
+        +dZbrcwEBwe7kpKS/s+X8fFxXgmGhoZ4Jbh79+6dO3f4hqC/v59XOv7KgNu3b/NKcPPmTV4J/JWxXv6t
+        W7dMByozgG/oWDM4iSkDrE1ycvkOMxkZGa6UlBTsMzI2NsYrAQTzygDayisBbhavBNbMwMAArwROMtYm
+        DQ4O8kowc5nR0VHTi8oM4Bs61gxeMWWANebk8p1koOPAgQOu5ORk2G5ubuYd++9+RJeXl7N3EPVgXglw
+        EmjgGwJrk/zcg9kjurS0VH5t3HRWSKwOlLBLiomJYZskmFcCnMSUAdYmkWANEswrgTKjEBz2XsLiPcvY
+        8om0p89cL28d7He33phwfmf8/NAorznjDYMj2n9IsIF5KvgP7yW7ysr4UnKs+EpxdmvbzdHhmpFbzSOj
+        w3fG28fG+sbv9IyNem+Pe0dHUZ/v6djX3o1jSTDf0JkvgjGKRlNKSkowwMPtNgtuKq7t9b7S0LS3ve31
+        K42vNV8/2dvzZkvHy41Nm5qubG9sKurqv3v39omObhyL82AdHR2NgoGvyisBhn+8EjjJ4L7wSgAxvBLM
+        XAZvfcA3dKaXwSu4yXxDYDoKWC9/2pn09HRtFA0rtj24qfhD/CQx3L+qtrFhZGhXa1vL6PDr19siW71n
+        e3v+MtD39rU2vHsgGMfipFijB+OEAF0TsFqCtxWvdBDAUXxDYMoAvAl4JYAYXglmLgMxpheVGcA3dKzX
+        haNwk/mGwHoq6+WbzgycZCDY0SP6g96u16+3jN0effN6y0dDgwPjt8/cHCntbCvqvVnY1lI6MIxvy02D
+        WNMjOhC+B2+vTHC9k8iXop0lV0rwotWBEhLMN3TmqeCekZ6G7obGnka2DN/WuiYJNh0YkILZIIvdcVZI
+        cLDpRWxaY2g91iSYMV8Es8+im5ub3fZERkbyalIiIiKwrqysxAkBu2ZWS3BDeaWDAJ4cfENgygDrR7jW
+        z5CdZKxfy+Fn0aaT+ysDrK84uXyHGe2zaNaDjVjfevSvSaYDA6kHk2BeCUiwBgnmlUD3S4KnlQHW1pNg
+        XgmUGRJ8DwiOj4/v86Wnp4dXgs7OTl4JenX4hqC9vZ1XOv7KgO7ubl4JOjo6eCVgzb7cWhtVEcWW0NNh
+        rHBXRB2vOyEzRuzOYwRf3dQAf2WA9RUnl+8wk5ycvNB6cFF90bPHj8W1tMS1trJlZ0vLfxcXP1+4VWaM
+        0CNaI7AEL4qN+eLZs1+qrGTLFysq7k9JIcETBLpg144druLiiX8yOXXKlZxMgicgwbwSwIrpQBKsQYJ5
+        JcBJTBlgbZJDebwSKDOa4NTUVNY4yejoKK8EEDw2NsY3dLBpegXgZvFKx18ZYG3S4OAgrwQsk/9hvlLw
+        /+RtkRkjducxMjIyYnpRmQF8Q0dmfnzgl0/mr3qycM0T+oICm9/c/ROWt57KyeU7zOzfv5968Iz34M++
+        /VRofX1sa6tcXq6qui90GTuntUkOeyevBMoMPaJnQ/Di8CWuvLyJ9mApKnKFPMPOaW2SQ3m8EigzJJgE
+        65Bg04EkWIMEs2KOBTscRfNK4HD066+MtUlTHkXnz+woGq+YXpTXZSd4eHgYe62ncnL5DjM0iqZHtA4J
+        Nh1IgjVIMCtIMAn2waE8XgmUGRJ8Dwh2+Dc62EVK2PXwDQFuFq90pp0ZsPwBCgwReSWwzmdmmfzL6lH0
+        c/lbsNd6adbzWDM4s6kBU8rYCcbgHHtNRwHTLQLTzizAedHUgyXI0COaBOssMMGe/ha3PhMPS0hZKCsi
+        K6KKm0qxlwRrBLTgow1Hlx09EufxTEzMa239ZUnJ8rxXsZcEawS64EUxO75QXv6Figq2fP7cuY+lpi5M
+        wQkJCaiM9Pb2Yt3V25X815TEi4lYYitid1/czercS3ks1tfXxwpJR0cHrwTTy7S3t/NKwJpkpLOzk1cC
+        lsl6P0spODhno8zkVuW6dkSZMykpT2VtkBkjPT09pheVGcA3dGRmcZhaMMtbT+Xk8q23UZnBj0iKHsze
+        C13DXY9mRuy82ryztUUuG99//6Fdv0G381fvVGagnFcC69tzyj24wKcHKwXPkx7s5PJNtxEoM5M9oiH4
+        vvB1D54+/bULF+Tyqdzcr8Wv0f3OoGAnrf87H9HzWbBDebwSKDN/Q7Ar/GXX4cM+LcvKmkPBpc1lP8t6
+        nk1de6xgNSt+lPncG6fCZYYES5AJMMF5tXnfy8qK8XhiWlrYssPj+XpOzkuHtskMCZYgE3iCXdHRrpKS
+        ifZATFISCQbKjCbYbkbHjf4bSsFfjVs9JmB5Cb4v8krHXxnAmpRdk60UvLLgVZlxMi/6UO0hpeBlBzfL
+        jBGHMzrs5kXbCZ7jGR3UgyW4Wab+EUg9mATzDAnWFhKsQ4I1/JUBrPUkWOIwQ4INmXtnFM2Gte397UrB
+        X41fw2JWrEM7JyNk56PonEs5SsErCw2jaPsZHTJzqM5mFJ2rjaKt7cFR7EDJlDJ2guf4twupB0tws0z9
+        I5B6MAnmGRKsLSRYhwRr+CsDWOtJsMRhhgQbMgtVsN286PaBvz2KZnkJhm280pl2xm5e9CSjaJlxMi/6
+        nbp3lIIxipYZIzgzO7lkShk7wXM8L5p6sIS9BfmGTiD1YBLMMyRYW0iwDgnW8FcGsNaTYInDDAk2ZBaq
+        4ISEBAy3jGAH1te815SCH9y5CqNcBstLOjs7eaXjJAOcZPr6+rBOfz9dKfj5vE3Yy5qd/UG2UvDygxtl
+        Jq86Tyn46eyJjBF8ddYAyZQydvOiWd50FLC7fCMOM2lpaVoP1jvkBHgvYN01ZNuD0ecYLC/BJfFKR5lB
+        O3ilgwDe6XxDYMoAdA6s8y7b9OCibTJTVGfTgwu2Yi+7tCMfHbHrwTJjBD/wsJNLrBmt/9pkJunB2Gs6
+        CthdvhEnGeigR7QhQ9+DtYUE65BgDX9lAGs9CZY4zJBgQ2ahCrabF207o2Pu5kXn1Nh8Fu2vedH6jA6W
+        Ac8Wrl55dMPKYxtfOLphhV5gvSR7BRosMxK8YnpRbtoJnuq86MyagysOr0czsDx3+Hes+HX+2mP1x2XG
+        CM5DMzoMGUsP/lx0sLuhQf6SOJZXqqoWhwcjIDMSdk/5ho7M+KsHby+LXfnuu8b2RHs8X0pL23Vht8wY
+        4T2YBPOMRfDHQpfcX1Bw/+nTcrmvoGBR2DJN71wI3nYq5r6kpPvLyiaaVFrqio0lwdMX7MrPn8hgmWvB
+        uFitqfI8uBUkmAST4AUteBZmdOyvznyrPOKts5FYtpf+iRdlId4Br8wYGZgfMzrsBOMLyYwEL7IGSGTG
+        TvBUZ3S8WrJDKTiuMl5mjOA8szSj4/GszW9UVxuHf+FXrnxm5x+bupqcnAeguVhTD55OD54FwY/uX784
+        I+Ofy8vl8smTJ10RW0gw9irF8ErAMvNasAs/cRvPc+wYCWaNUYrhlYBlSLCWIcESEnxvCLYbRXcMdCgF
+        T2MU/ci+/1UKrm+vlxkj1lE0a5L9KHqrzBRcLlAKdjaK9vmb0naCMV6VGQleNI1jZcZOMBtFW09l90OE
+        3Sg6fs5H0dSD6RHtAwnmlYBlSLCWIcESEkyCSfACELxr164hXzCKw9rT5VEKfjBu9aCA5SVer5dXOjLz
+        wz2/VQq+5LmEAAZ7LC8xnQewJmV8kKEU/ELeZpnJqc5RCl6eu0lmCi5hpK0Q/HTORuyV7bETjJPIzMmm
+        4sMfHcZSVFuEhdXHGo5jl8zYzYuGAOxlTTJid/mbTriVgmPKY2XGCM6zZ88erQejDxnBOxFr76DXrgez
+        tzBgeUlfXx+vdGTmkX2/Uwpu6GxAAG89lpf09vbySoCfJbDO/TBXKfjFom3Yy5pdWFeo7sEFr8qM3bzo
+        4LyJDLATjIDMPJz6oru+xn21Xi5/qv3g0+7lxoxdD2YBdmlGTLcRsMzW0mil4IT3dsmMEZwnPT1dE8y7
+        tAA3HWt6RDt5RP9j2JL/KCt7tKpKLl8+ceIfQp8xZuh7cGALNmcKC0kwCSbBvrDWk+DpCJ7yvOj4Nfh+
+        jgBbG8G4kVcClrH7LLquvU5mjFjPw5pkOy96Zv7SnZ3gkZERmVlkI9iYsROMDPayJhmxu/wtxbYzOmTG
+        CM4zS/OiqQfTI9oHEswrAcuQYC1DgiUkmAST4AUgeBbmRTuZ0ZFfW/Tnc262/PFUCCvCyiO9A17sxRAR
+        63k4L9pOMBtFs4ydYDajgzX73avl1ssPLY+ouXFJZubvvGgnPfipvNfe8p07Hdnc/K8JobUdtdiL5mK9
+        gHvwa2Wxm8+fN15+rMfzrfT05IspMhPYj+ifZ27+p8zMB86dk8un0frIbfeI4E0lOz6RlvbA2bPy8v/l
+        zBlXTMyCEuzat88nc/z4PSUYjTTLI8EkmATf84JTU1Mx3mOjWQbGY1g7/H8Xrjj0218cfPEXBaux/Dx/
+        lVbkr/rG7seud1+Xmf/aa/NZ9I06mflp+kal4OqWatmkWf5/F9oJxuhXZuw+ix4eHpYZO8HGv9Gx4YRb
+        KXj3e7tlZkvx20rBcRVxMmPEP59F/+eeda9cuBDl8chlS13dx92br/VckxnqwQH8iP5+2joXftgyZjR5
+        m0iwzJBgEkyC9daTYBJMgifgguPi4rp98Xq9WDe2NioFfyX2pS4BYt9NWq0UXHWlSmZ+kLpOKfhi40WZ
+        +dHe9UrBlR9VyibtPb9XKfjZnA0yk/6XdKXgZ7J+LzPZf81WCl6auV5mgJ3gzs5OmVlkzeiCjRm7edEd
+        HR3Yy2KvvBOqFBx9Olpm1h8JVwp2l0XJjJG2trbExETqwSJDj2htIcEkmASTYBJMgrGQYL8ITklJueU7
+        N2NsKjM6vpe6Vim4qbNJZiaf0cG+3M/SNykF17TWYO+on2Z0sIxfZnSwS7MTLOdFI2Mn2DijY8PJKKXg
+        xPOJMjM3MzqoB8/3HkyCeYYEawsJJsEkmAST4FkUbPfbhQ5ndNiOojuaZOYRRzM6bEbRLTWySTSjQyk4
+        rmImf7uQevB878EkmGdIsLaQYBJMgkkwCZ5FwbMwinY2L5pG0QrBcz8vmnrwfO/BJJhnSLC2kGASTIJJ
+        MAmeRcHx8fE9vnR1dWF9tf3qNxKXBGWtDjr48r9l/wZrbTmw8omMlXzebXc3Ysvz1gXtW8H2fj17jVZg
+        nfirek+9zLxQsF6RSVp6+fpl7GWZ1Yc2qzK/rr5ajb2sSYdqDgUlLw/KWYu9E03a89z2kyEyc+TDI0HJ
+        wZbM81uPvykzxy+fUGY2HXtDZsC/Jz0WlPESdj2Us/ahg1o4KGPVt5OeREBmvpP0OM8cXIsYy3wr8XFj
+        5uHkJ4LSfTOZ2i9gsgBb//l0DC5E2yUvH8mU5RkXM2XGfSYuKE2R2X/hgMwYuXHjBnqvbQ82MjQ0xCuB
+        7HlG8JbhlY6/MsD69sTPALwS+CtjvXz8yGE6UJkBfEPHmsFJTBlgbZKTy3eYmewRbYQEmw4kwRokmFcC
+        nMSUAdYmOZTHK4EyQ4JJsA4JNh0YSILtPos2AsG8EsjPkI3gZvFK4K+MtUmDg4O8EsxcxvjhM8PaZgSc
+        ZHAqviEwHQWcXL7DzGSfRRuhHmw6MJB6MAnmlWChCV66dGmUL263m1eC8PBwXk1KaGgor+wJCQnhlcD6
+        5ayZyMhIXgnCwsJ4JfBXxtoeHGU6cNqZiIgIviEwHQWcXL71ViszwcHB/w8QL/QBQawCzAAAAABJRU5E
+        rkJggg==
+</value>
+  </data>
+  <data name="cbHiLoHBox.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAKAAAACWCAIAAADWjhTKAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        vAAADrwBlbxySQAAABh0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC42/Ixj3wAADzdJREFUeF7tXUtv
+        JFcVnnE/3O+u6ur3Y2z3+D3j9mBnkskkivKaSSIeIaAIsQGJP4BggUiygT0bgoKCWLAFiUV2LKIgiAQh
+        S34FSxYoSpZ8vve45vpU+1bfvlVut30/fbLOqT713XvPV4+udFK5cXBwUFPQbDbr9TolAt1ulyKBdrtN
+        kYDnediFEoFOp0ORAKuP6rMCS31AP2FT/VarZdSQWH1WYKkPaBqytbV1Y3t7+4aCQqFw8+ZNSgRQR5FA
+        pVKhSGBlZQW7UCJQrVYpEmD1UX1WYKkP6Cdsql8sFo0aEqvPCiz1AU1D+v2+M9gZ7Ax2BlMi4AymSODK
+        GtxYXf3z64/SoxwLiC7YGUyRvcFodLNUxHc+2BlyFDTwd9urSxvYhKL6+gVMNQDK4XDDxslwKteaTRkU
+        s1lUzqFPkcDSGzyZTHwF+JKNjlEigCKKBPAlniLfR/v0RI1aD0T1WQFLgyDALpQI9Ho9Noqec+hTJICH
+        kNkbAsTqswJLfUBTv7OzY3sGZzKZfD5PuYAsaBeL+LRTLG40A/wNecv3uqWSuoUVsLRXLt/yPHXLuNWE
+        shwLiB7R6oRRyQpY6i7RMeOd16BKLofmpkc5FhBdsKUBzuCYBWjGA6L6+gWY6gPOYIqcwYAzeAEGd/rD
+        b/3i41TZbHflcM7g1A1GuykSQH339j3VjDTYurUvh2Pzx0dXzeCF/5qk9l3lm7/8JCWygRjdr0kxR+gc
+        Z3B2tRSy3mi1N++rHU+DzfVDOVy+WCnX/HB0fHTVzuBLeA+uttdVM9JgORjI4WLn7wxO3mCKBEz1AUsD
+        nMExC3AGUyRw7QwedJqf/uyZ5eLKijNYgToeusPqd3pVbPzqD28vCzHbzMwGR9e7eINTfUzCgr/44PEX
+        HzwK+d9fv4qNX/728bIQs/3Pr15Sl8BWpKYoju0PK1juxyQsuFqpQC/kbre8dAZnV05aEhJ2qKm6QBTH
+        9ocVXLV7cN8rogvLRfhLsxcwMuDaGRzV1y/AVB+wNIDpWxrgDI5ZgDNYrw84g+fXf+OPf0+DpC7gDL5Q
+        g9F9ZvCPP/l3slQNRpy6we6/TVL10XFGZo89mb77b5Mu+gzu7E38XSJSZo89oanqu0v0hRoMqPowIA2S
+        uoAzeJEGA5YGRPVZgTPYGazTB5zBVvqJG3x076l3fvC7BHl07z5JC6gTcAanbjAMYPqvPHgLG99/96NE
+        CKmXn3mTpAUwAWyU8YnB7jFJr2/zGHO8/wJ6PZXMp7nJZEM2/AYm4B6T0j2Dc9k8et30u9WSH/Kl4+9i
+        I/NpbkLqxaO3VP1ua4CNN26czNldotM1GIjqH2w+CwMS5MHmA5IWUCfgDF6AwazAUh/QNMQZ7Ay+fgZ/
+        +JfvJU6SFmATcAab6aOb9gZTlARee3tvqsHhxtQNvnPnTkmB7/vlcpkSATwnUCQQBAFFApDDkwYlAnjq
+        oEiA1Uf1WYGN/teeW0Pj7ElyAqYNic6fiYeUBZb6gKZ+PB6fnME4gkLggMJBTYkAngIpEsCMKRLIZDLy
+        GAyBA4oiAVYf1WcFNvobuwEaR0fvvIACyQmgTUYNic5/6pTCUSz1AZzxFAmoBYPBwN2Dp1yiEydJC7AJ
+        pH6JdgYz/VqtijMqJC6fmQyqnmzxvLqasnqWZnOZUqlI0gJsAs7gizaY6VsaENVnBc5gZ7BOH7hcBrO3
+        IaVEGkxA3yBn8Ml4mZs3WdfmBnSYvn4BpgfQ7XpNM1V8ZKq/9AbP8nNh4HloTVJk+pY/57H6w36fDcdo
+        qm/zcyEQ1WcFlvqApiEGPxeiNTKNPUL1Z1iokx7YEOoE8JHp/K/FJZoigdgFxBp8AaTBBPQNcgYnbHBU
+        X78AU33A0gBncMwCUjI4l8vX6h7Y6w9kQGmvr6Zgo9GQ+0rMqB/CGRyzgJQMBtirkDSU9RKz60tcNYN3
+        d3ezCsrlci6Xo0TA932KBPCVjyKBfD6PXSgRwPdGigRYfVSfFYQp8wnAFvbOuiijBp8HlOXyq7HzR7+M
+        GhLbH1ZgqQ9oGj4ajW7s7e3hEAuBw4eiUwRBQJEAhqdIAAcg2wVXSIoEWH1UnxWEqbSKkdkZJavXs1gq
+        x84f/aLoFPqGxPaHFVjqA5r69fX1y3uJhgH4G+oPD15WvdFTCBBm1A9x1S7Ry3IPzuSmn9NTKfeVmFE/
+        hDM4ZgEpGRxCrw9YGuAMjlmAM5giAWfwmQL2/qKkSOoCpvN3Bs9qcK2QRa+fGgeTUW0yrB4Mq/LvM1tt
+        BDJGwZcfvpEsoRnq4y+GC4cGD0d1TEnGcuOD7U6Ygth9uQ2eTCZ4MAjR6XTwtZsSgcFgQJFAr9ejSADF
+        2IUSAVYQpq/fG6FZsWQvmrMnNP/58wchP3/voZp+9s6z/3r3zJbP33tOTbF782xD0DWKBM5br0Rsf9in
+        gJE+oKm3/R9jAUaXaDQrqs8K/vebR8kSmqQuYDp/7L7cZ7C7B+vn7+7BSRoMWOoDlgY4g2MW4AymSMAZ
+        HLOAOQxm7yzSEMXO4EttMExi9QA23lzJhKzUalPTuQ2WO4YwnT8rSN3gpX5HB3o9lfSxwHn6bBcjBv2h
+        FAFM588KLsu/dBci9gi98DO4+uTt64LYSB8LnKd/Uib+47BCoajuXq3W1LRYKp1MWOGM+hKLP4PdPViv
+        7+7Bl85gSwOcwTELcAZTJHCNDGYv/0mcchTAGUxRUgZjiuhvLpuX9L0gjEGv3pCB9CCqr1/AjAeQOoGg
+        0QxjMJzA1HQ1X6iUa+oWNn8oL7fBeEzCV/kQ+Nbu+z4lAr1ejyIBfCmnSADF9/YeoAuzEPVRfSYY1ccu
+        lAjgKYIiAVnPBkqWvt+QY0noGxI7f1aApxqKTmGkD2jqT87eRC7R6ALl2kt0YbXs1RrFQgVByMBva9JS
+        sYpd1C3NxpR6dQKWZxibP5SX+wx292D9/N09eFaDJaL6+gWY6gPOYIqcwYAzmI+3ub3B3hGUOGkkAWew
+        Xh+wMhjtZuMdPz/Gxj/94ycp8cIMlgNdfYP1vyahC1PJXEmQbKBUiQXiWUL/a5jlrz1RfVZgqQ+wCasF
+        8b8moQvDtbYXFEM+fHRyif79x99PiRBXh2u0yp2+p24ZrLXUtH+rqabgaP3MhFlBmGIgLPC6X6IBNt7m
+        3TZakyppJIH0LtESzuCY8UwNiOrrF+AM1usDzmAr/Wtn8J3NTfZKmyvP6/W/eH/+1ghr/uxHP7wmTMNg
+        aFJyAQab/kt3r443rpvBaZC6eQn/pbuH3Q7mx7pwhYnFrmYyuZWVkIHnqalXrWrS1Wy2UiqqW+rVKjSp
+        m5fwEr0XNOQxeH14ve7BsQvQjAdE9fULMNUHLA1g+pYGOINjFuAM1usDCzP45kqGvfwmDUYX7AymaA6D
+        ow3VNCi3Wkb95v2vDyevhNw4fn10+Kq6hRWwdHT4CLuoWzafflIw1WBspEhA36Crb7DRYxJ6Z0r2tT6q
+        r38M0P/aw8YKSR8L2OgDV/zXJAB1FImTY3z0uL//QsjB3RfX7r2ibhkfvyaD0eFj1LMjLqqvP0L1Z1h0
+        PiA20scCNvrA9bpEA7ELCMfLikt02owu2NIAZ3DMAjTjAVF9/QJM9QFnMEXOYMAZnLrBvu/59VrIYb+r
+        poHvddstdctw0DuTnq0Hbw0HaoqCsvI/lzOdvzPY1mD2yqOUSIOZw7Qhsf1hBakbvPA3vqP77N10iXNu
+        g1ezKx//9P5Wp0pzFdA3JLY/rAB+XPE3vl+MwfMR7uLv0caZFekbEtsfVgA/KDqFkT6gqb8Ub3xXG5oe
+        aTDz+WPf5b5EL9zgpl8beIWQW4OGmo4apXHnTMH2IFBTVg/ujJpqioJGOUeDmc/f0gBncMwCTPUBSwOc
+        wZVSZ1AZrEnWRhuN8XaYgu3t/TPp1p6aBuPt6nBd3eIPbpG0AFuAM1ivDyRvMHsZkT1JOiE4gymSBu/v
+        72MGwdYe8hl7jTLsIlEqlTAhSgTYt2iW4ksjlkSJQLIGQ61/55CkBfTziZ0/HkLYhJvNJkUCi9UH2Ldo
+        teDkW/TOzk4mk6mt3ZbdmZHYRQLPcFgDJQKwkCIBLI8iARTj+YwSAaZsT9wjSFqATYClsfPHUyxFp4Al
+        FAmY6rMCS31A0/DhcHjmEo3uwPZZLtGUJAGmxi5BpvdgqEUnTJGAqf7SX6Iv2z2YLcDUYMAZTJF7TAKc
+        wc5gZ/AlM5i9XmkOHh8++UebzmBbg7vtIXp6e3ggeXfzfhiDW6PJ3saRuuVg62k1ZfUg1N5/96O5id0f
+        HrwRqu2Pj1v+ABtpuktn8GQywffyEK24Vxl2z75JEE9d2IUSAVbA0qj+8d3n0b5kyTwzIpMKSdONa4hp
+        f9rttlHDWQpo6k/O3stwiUb7KLHWB6DGPDMidh/375DW6RmmznDJzmB3D46yVHgyhLsHXzqDLQ1g+s5g
+        Z7CZPitwBi/YYPaKp0RI0gLO4As1GN33G/X8ajYkttgYEJ0/BFX9uldZLTxJwWbLl0Emu4JivT4QY7D9
+        G9/1jwGsPqrPCiz1Af2E9fpoaJT02Sls9AEmHku9PqCZz8nZ685gVR8NZfrYUq7mS5Un7PQDNW11fE1a
+        qRX8oKpugSBJC+gv0SjWzx+IOYOdwXp9tDhxkrSAuwcv2GD3LdoZbKbPCpzB0/XZm45SJeYgh5ZwBscY
+        jJb1yqWQt1tNTTqoVNZ9X92y2WrhL0Q+ffs7F0AM1FdGl0Orb87SG7B4gyeTSUMBvmQHQUCJAIooEsCX
+        cooEUNxutykRYAUshT4alAj/9u1vXgDZoJIjZcn69cb2Bw2h6BT6hrMU0NTv7Ows5gymREB/hJ6nD5G/
+        vvmNCyAGYm+6s5w/K3D34HMNvjDaGOAMjlmAqT5gaQDTtzTAGRyzAGewXh+47Aaz1yLpmStC3hl8Bos3
+        GMZQco7BmVwhZN0P1DRXKJWrdRmjsuR15zBYnYDp/JfeYNM3vrNX6XlxrwJEPfqrJ5UKaPTZXkaUCoDp
+        /FvX6lWGQOwROvUMXsnkJHE+ZrL5MAXxKZUKaPRRWQmGNc9Xd6/WPTUFPT9Q02rNU4cwnb+7RMcbTJFA
+        VB/dn52rFV+vD1ga4AyOWYCpwfoFmOoDzmCKnMGAM9gZ7Ax2BiuI1WcFqRv88OHDDQXwm6JT7O/vUySw
+        u7tLkcB4PGa77O3tUSTA6qP6rMBSH9BP2FR/Z2eHolNY6rMCS31AU390dPR/J2g2z7KdRYgAAAAASUVO
+        RK5CYII=
+</value>
+  </data>
+  <data name="cbHiLoVBox.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAKAAAACWCAIAAADWjhTKAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        vAAADrwBlbxySQAAABh0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC42/Ixj3wAARltJREFUeF7tvQmw
+        Zsd13zfvffu+72/f5r03OzBYiJ0gMAQ5AEFSNAlItpKQtrXEVSIlcQVFEgAlm3Jily2RAkFWuMiJFYm7
+        6JJJmqRAy05VrLIWKy4nVXHFVS5XXK6UncQ2NynMr/vft7/++t43mAFmsBTxrzt3zvnfvqdP9+ntLt99
+        x17CS3gJL3JUKpXDw8Pd3d09i52dHS97ASBz6Pjx45JDcn9/P01K9aTgyYj3CHkvPy0JUOVGBCWLEguU
+        JZMHIZ8ppwUBVVUUQXyUWEjzqGJCPlM+isRmr9dzAS4UCs1ms2FRr9fb7Xan05EaAp5znGJB4m632+/3
+        nW4B2Wq1SMweVKvVWgBU8krzAOPsQx4Zg6SPSNzLtDwej8nd6QlgsBwlFvA8zVuvF4wj4wakZE+qjJEF
+        VNxwSgLIcqU8GA4qlXK1FudI+rQRSk0xQ15y2g3VZ0TCcLoLcIRcLpfP550SAL5cLjslAY0jTS4tLWEB
+        cIqjAiwvL2faT9sBmCK9UxIUi8VMCxTVSYvItAwYupwUINNt3EiTlP0y3cjnCrVyczparZYzPMx0m+wo
+        plMCpHPMrE9OP6o2rlqAS6Vyph1IznJKAKqbE52SINOZUqmUWXi6VLo1YDMzkPC0dKcEyGw9mE37fJQb
+        9J6oIIP27N0//lFtxXzJsQlI76QAZId9pyTALDlGxvE27QbktQ0wiRkdOSRrHjJCjUc8YCzFmuclUEgZ
+        CXkCk7ZADJgvsOB0C9LAMMBGiY/iAZYjt5GpQUjJnpQbIQnSbnC00+zffu5+oru1clguxZ6TXr1Q4Cgg
+        O+yHKZExS47sPa+UkRsiae4uHmI9VKdOScA58MTA6QkwnSbxwCRuNJQxqgcqJK5HPKC6OcvzEuS9VyVo
+        moks4CFzLZFwugVpsElbjhKjkjLNAx82pydGjnIjJIF3IySPLR9bnx4nwKptxyYgPWc5xVoDZIf9MDEy
+        ZskxNK6UkRsi5wFG8aBCCRh1rZr1EM85IY9MyjRJfiRWri6PAHLUKQE4Nxp8ACUnvVMSUN2ZFjKHaBg8
+        cUoAeGrQKQGwnHZbAXBKgityY328rwCncdQQTU06JcHlD9GcPh+iOSEEx3DdKQGwQk05JQEp0yTVQWKC
+        no4NyKwscFQYSO+UBJQ800J68gMwNB2nLCIzRyyn3caNNEkZj3LDSQHWRq4HpzHvagHIjrp1SoB0jpn1
+        yemZbhhwwlGBSbcpTGc2NCxcaYAzw5AZYEp+VM2+YAO8Oty7oh5Mds8ywEcusjiW6Td8uqYoZJqkOrDA
+        zHCUHc5ySgCNBE5JkNnaaFKZFq5oiCavazdEhwVZXlouFct7a2cIMCusQiE+JbMHk92zHKJdu9FNA/IQ
+        kFnUgZAEqKQcDAZRYhYIaZKUWBhNphyFQfVAhez3+xEPhsMh+5BHxk5kBJkcQWQBdTqdkt7pFrKA5XRi
+        +PF4HPEA39I5yg3JnsQHEockQMYNp3Q6zWbj5O71hDbc6FvhKaQPVYBKdlEZJUc5KmWa5Fx4E2CaQwT1
+        YKcEUA92SgLaTppUe4fPtAOpZhiBfkZvc0qCTGdo2vQepwSgYGTtlAQwGhsikBc92CkB8C2dY6Yb6sFO
+        CYAbviDU8MbYzL6P/cSvP/6Tf4c9clTtpHdSALKjmE5JgFlyjGopsz5h6GkmwGlkjooAPj1oyA+nJCAD
+        1chRdjjklADpoR5QGNI7JcGLaw5eG5nZ931v/uT73/Ip9gpwiMxIkN21moMz6xTAp2OJoTQJsMAh4PQA
+        VxRg2XFKghdjgInuB/7ip9k/DwFG4nJW4PqV/Bg0dDXsIZ5hPeSRGfHTpOYYyYSf+vVAVeKIB5xCjXte
+        AqNoZARZDkcWUJl4sOB0C0gYLKcTw+N8xIO020oMKdmTciMkATJuOKVSYRTfWT0VBZgZJjyF9JEF9ljG
+        fsTjBjx7zyOoPiV7EoZ1gwswugetUnWK4CgLWhM8MQ55ZAylSfLAAn4AmhLtywMVElMRDygPuXhegjwW
+        I8BjPG0Blaamzu0BCYPldGJ4PI94gOW025QLEsHzCHIjJAFy6EYun9uanYgCTJrwFNKHqmQsYz/iqVt4
+        9p5HoH4iNxDwlmbtAhwhc1QE8JTTKQkwlyY1BwuOCgDJWU4JgE/pAZZMgVMSUH0U0ikBKNLlD9Hw5OiU
+        AKogpyS4oiE6cmPdLrLCALsDCTIjgWWK6ZQA6RypnzSJtzRrp0TghMzAwF+VAGc6BDLDkLkgUP9wSgB6
+        5OUHGFyjAOOGkyyerzk406wBxzL9hk/XFIVMk1QHFkC6UsBR9rGTDk9mazuqB19RgOFfID04MxJYvmo9
+        mPLTC6EE7EpVUT3gNdaHPOcypeZzCykpORZkVlXjgapDEQ+YzrHseQnemZDHDWKD4EmAzGQW+gYgYbAc
+        pgTiqYKIB5HbEjLdwAcShyRAZnVDDYhkvzk9iAIMqaMCboeqZCxTzIjHZ/iolvAtcgMBZt5uNjY2VldX
+        cReLqjv2HKb8ngTIAG8W+Hrtid95kzbHWJAAC7Rlpwfg9Ewey1q2hCA2pHdKAt2scUoCchyPx6R3egKY
+        fr/vlADklclnGs/0mZTAKQFGo5F3o1It762fjgKsQx7pV3YAtZc2js+4EdVSZkqSzVfRNAFSOCWBGoJT
+        Aqh1O4WxK7e0vtchutP1ZjQ6Zo6uIHNIATQ6JwUgL9I7JQEOZ1qgqJc/RAOq1UkBsJx2W53DKQmOGqJx
+        w0kWz/91MOWfRzsB56RrFpA44rvDKgEuVzLyyCw/fOYMSnWnw0Ne6ZqlkWVaoNmmGyVMZiDJi5bulACZ
+        YcusRAJwlBuLc7DuZH3i/W/5JPt0gEnvpABkRzGdkgCz5BjVUmZ9cvq83RwcHDBKq1MDejN7hi8g2QOV
+        8Yex1PPtdmdrd0KAJ7NBmBiZ07mET1vI5AGW2XtegvViwQ3koUVkAXU2m+Gb0y2UBsvpxKRkbIx4gG/p
+        HEkML9mT+BCRABk3nEL9dNrrs22C+vp73vwj976FPTKTQHgK6SML7LEcldHzXpaAt5m+wbsAM6ZTANpF
+        CBoFTcMpAegNEd8bmWm4Uovvd9OI1NwiQNL2nRKA/kRHcUqCTCOMIrRupwSgbGkLMFh2SgB4Cu6UAOqX
+        TkmgXuKUBPiQ6Qb1G7qxu3GSoH7ksc//2uNfYI/sDiQgvZMC4AbFdEoCRiN49k63wLG0G5DzHsxh8nBK
+        AoqUHu4AiSO+M6gQ4FIlHkgpJEacEgA+PdyBzJmSvEjvlAQUMtPCC3MO3ts0tyo/8aGvfPKXv8oe2R1I
+        cM3n4JcCHALLabefXYBND/7vPvT3P/HLX2H/PASYNb2GaIoBJKgSPSmgUikhj9C3Q3S1bkYwkQCZ8oOQ
+        BOIxHvGAgRS3PC+BvCI3kAmYBiVHWaDSTLHgdAtIyq8h2lEW4jVEOyoBvkVuI6u6JXsSH1QQTwJkDdFS
+        qd79bXOZFAbYn0JrpD22WyYSSg90FMsUU8kEZMzCs/c8gupTckjO2w2zMXMyZYAFVCh7AkkBJAu2qs3N
+        gZBnpTyatQhws20CLxIgY0GtwVEWqPid5gGWcdTzEkgMwsTIuhCMLOA/zRQLTrcgDQyWo8TiqYKIB1iO
+        3EOmyJCSPend8CSI3FjKLR3uno0CTBqdVWm0ap3eaG293GhhQnZ0iOywL0ZAxiw5sve8UkJKDsn54hyJ
+        GBN5moaHXHRKAHINeU4aTBoEuNZwr6d7YIF6cUqAo3gsU3KnJCAv0jslAd4TdackwH8WWZTN6QlgsOyU
+        AOTF0OWUAFhOu4cbaTLTDeaEVrO9vGRqBiwtLx3smLexwgD7mh6ePP+q33hKGx451kJNyikJ8Jkco1qi
+        ftJuwMwDjK2X5mAPLKfdxo00qb7iFAsypyq0+Qq5xBzcOX7q+I/+JNHt7J9xVAKyo5hOCZAueGZ9cvpV
+        W2S1+ybAxfJzF2DmEmZFpwR43gOcyy9tHXSpjetuWxnM3F0UBZjofvKvf5V9GGDQ2jkgwE4JQHZXJ8C4
+        jpReZOE9iTwpoFIp4nWoUFwer5ohutkpF0qMS45nT64YkeohHtcjHjCR4KvnJZAX6UOSdjdttTba5jUD
+        kQKHwtWNAAmDZW9BEM/QHfEA3yK3kXEDUrInaesqiCdz+eXBpE5tbB30G23TEzikRdavPW6ug9mQSW1O
+        YeQvlSbnbiLAxVKR3mBIY8xYIzvapWQBGZ/JMaol1adkT8K4RRYB29zcnEwmUFgE+M2ewlMvkj1QGdnF
+        g2Zr/qRBW7PtTmGPBSY5qR5H8QDLOON5CeRF+pAcNBqfue9ebTWxFvjPUhELTrcgPQyWvQVBPHN2xAOa
+        e+SeEuOGZE/6lCHJjnpoteusNGDo5Me3TQ8ONw7QinqrG+fvvfiKv/wzBPiGV16cHT80JyTWsEyEvGWA
+        jBtkyt7zCDgGKdmTMG5UJuDYoqjIRB5IUA/2JDCpbYMQDzoDcxf6pns27rp/nz3yaGaGBSVWD5bqcRQP
+        sIwznpfge7BU9uBUr0t0UUy6BPDqwU63gFQPRnCUBSp5pXlAQyHHkJcRfJbsSeqRxBFJ/6EeKjVngb2g
+        p8KSxa/dfZHQhhs9VAkA2WEfwRo2QMZncoxqST1Ysic53fVgQMwV4BCcRqmcEoDEnm91TWtFoImwRx7O
+        jCAoNk4JoOHOKQEIsJwLQV6+PXkcdjoE2CkB6KkqfAgYLDslAHkpwBHwLe02bqRJqjWzINRDObXkTP/4
+        bHbHfQT14mf+sdk++z+ZAC/PK5zsFOAQ+EyOUS1l1ienzwOMoWe2yGp2SgowowR75MHUCEJmbEBmZQGa
+        jpMCkJdvTx4H7XZmgJ/3RRYge+qhVI19Tv/4bHr7Kwnqq3/rH5ntM/8Y+djSvMLJjgbklADpHDPrk9MZ
+        pZ3CCit9o0NDuWQBGXCaeNAfNylMbjlnx8YC8spGN58zdjhK9QEEnS6gYpmuE/HAW5YqgcQgTJzLF84M
+        BwTYjA+OM8D/5/FGB6jWzHgWbbllUxssvrZXzUyMoNOJ/+pdr456MIOys/Wsb3TAzK+DkXSjgzoC6nkU
+        iaSSBWRAruJBd2hWjLRaOxrkkKdr7aVjxg5HsQAQdLqAin/ELOKByuN5CSQGyJ6nN53q9wiw7haIBPiv
+        Gx1OtyABDDNImBKgUoo0D/AtcluJISV7kppVQYRW16xITpyfnnvZ9tbhkEOqHM6gktfsU2EEUnI6QjrA
+        tAWZAmSHfQRlB5Api5q755USUrInYeYBxtAP4RwMTzN3SgB8S7uNG2mSlhcWhAtFaqDdY0HTyRdMFaty
+        wKy/RXT95siX5mBAXr49ebww5+BG29RGpV5oNszkFwa4Ve/vrJ6+7uD2zclhPudO0RwcBvhazcEvBTjE
+        swxwteG+nRAGWKjVF7J77gJMeDLvZHGaJwEyoFI4WXKnb2YdLGBr6Zi5/huvGEGJsQAQdLogHtcjHjBg
+        4qvnJeBDZISIneja6+BFE2i6Dna6BSQMlhfTOp6CRzzQwBvyyBQZUrInaesqiNDqmog22uVWq00qH+Ak
+        uVmpsLeqCeTszniIphGZdGqjy4Xlggmw0gN4fCbHqJZUn5JDcj5EaxXNadQmoDDs8Y8CSBaQAdMt5iT3
+        R+YmJT6YyW/JLLJm6x0W1UqMBYCg0wXxaiWOSuAtS5WAD5GR5Vz+9KBPgM344DgD/KcgFMzpFiSBof0t
+        pj2SB/gW5YiMY5CSPUm7UUGE7sAsOdu9WqfTJRXpVTk+Pe2PvVQivPryeJHFKpkE5WLh5Errpt3hLfvj
+        Sces5wUO4TM5svd2EFSfkkNyYRU9GAyIPHXkQc1iyCkBaPWe79lVNAb7/V6xUESerBFpZ4dKwYjkEKos
+        pwQgwHjmlATkRXqnWGA+XEV74L9W0U5PAKPVcgR4AuyUAPiWdhs30qSaglNyuU7f3Lhtdip2IDFVrAC7
+        wySwA4xAJ53dYYbo+/7u75rN3snKF0zF1svFb73jJm03bnbCGlHkolrKrE+8vQqLLK2i6cdbuyuDURv5
+        pTn4EnOweI/JTXcQ1AtPfNZsH/0cMr7qULuSJ7oXT/WX49I8ozkYV57ZZRKXBJRhNO3s7K+Np+Yx2Q/z
+        rUpdJtWabvJLB3jepSx2b7uboP7E//A7Zvu7fx+ZKVSHmEUJ8O27ca/T5BrVUmZ94u3CHDwajZQOcIw9
+        /tFZJXug0i7EA93JYky2NZtHnl3GnSxIajbigbcsVQJugDDxC/ZOVm9oViQM1N1uj1S4bQNshnelxz32
+        Uonk6fseJKjvfOp/Mdu3/jkyU5q1VKjYUfruw+ExW5kCPD6TI3tkT6o+JYfkfA7OXGSRglJJFpCBwiBZ
+        iyyWV2Z2cQFeWGRhBEGnC0fx4BKLLK+ChUVWYAT/+/2+Cu9BAhh8DlMC8QQ44gGVRY4hr8T4LNmTpASS
+        gV9k2aWADzBjuzuLepYA6IPpABft51tBuWQDfDBgBld6AE/wyJE9sifJyLvhyYUAk+KH8E7WNRqiy9V8
+        vWYqIQnwHNEQfeLCA1GA/ePC3LIZou/Yu0pDNL3k8hdZrCapM8kv+hsdqXuBAN/SbuNGmoyaghZZ0eaO
+        WTCQOMni8N77owD7imVtZefgpAsGSFddZn3i7Tw7WuLlBJia65SKa+32JGn4L94AF1udcn/YW9vI1xcq
+        HTzjANdbpjbWdwdcU/RHrXQPft4CrDkYinRAAsNaOAcj4DLVqq2iRY2dg4kjY6Ofg1lkKT0lBN6CIB7j
+        EQ9wiKbmeQnpOZhWc3pgF1kWIgEyBVGle0BiE8s+JUKxXKE2tY3O3MgVdGgH30K3JaTdQGCEJ7FkoDm4
+        1WXy65CK9KjL5iaYOcUk6HYlAyJ56jLmYBYcSg/gKR05skf2pOpTsidh5p2W6GoVTV0AUrCnU+o0kRit
+        lcu3zmbU7C0rs7JNNpiYV94JsFlk2efBq1tmFU16jvryy4IgHkQ8IAyqRKkSsEBir4JoFS0S4L8WWSFI
+        Qmzo2f50CkKsOuvbVOj2xTe2pmu0CEgdBWQXFRzgWOQGAlUEJAMtOTv9Oqto7CnAS+YVUGOcBFpF27NL
+        NsCvjQLMUt1aKlQrZQL8isPhkq1MAZ6y4AZ7ZE/CeDdCch5glkhUDUMZAxGQoHSeBAx2Q9uJa0XDg+Re
+        9JIdDey96NVndS+aIHleAj6Q3qsAN670XjTlX0xrRkIqtLt/GsFRCfAtchtZrV+yJ6loIBn4e9GMZ6RS
+        gL19Elg+KcWxYydfGS+yaLvW0lIhnyPAdx3vUatKD+ApC26wR/Yk3no3QvKZLLJG5TI1y0Wl1EvPwQZ2
+        QqSowOoGmXMGKJQyljz4QHqnJLgqiywqtHNw1ikB8I2yOyUBbqRJKjEsyJXeyXrBLbIAQww1W014H+Bq
+        xSy7fICp015rsj7e25jujzqrNr6XCnBheWncLK4PW+MWQ+1ChDIDvGvfnHVKgMwAg1LZtHGnJDgqwFy4
+        cvXp5ATPcYABAX7Z1vya0+OKA8xhovu0v03K53LdWu3s6io1ezCbMctDdgbm9nqnX1nZGOj3DePVFmbK
+        peqtZy/6FxgUYNkBWKa6ncKImstN2xXKo217UAsdwYfIjVa1eufONm5Me71yceHRQvphQ73SHHZWVsdb
+        OLBwaHmZCu2fvN6Xmv9KhfzusHp6tX1yxfyULqwOztXYGAKbYUHaPTNhJQ8b3BsdYa2KFxhHT84XWX+i
+        ADNdk75VK29MB1TFG162vTrqhVVH2MiRvdMtovoUYNyNDnI9ffr06uoqMzE9ABB59lQWhySDnh0Vw41D
+        k5U+ZXjwvzypDXllbdBomNfBS5XCHdc9QHSrNfcmuuxwFpaBt9xoNjfGvR+/c4ciPXzb9t6KscAxJcCH
+        p3VDhxAmkwml8irwjWxtvMNiE8Ydrdep0LUbb2vYr9QA8tyedn07u/f01Hzex6Znj1l8lmyTG4FFE5AM
+        ZmsDamC60h+Px6SiyKjVivnGp9JY3p1eq5RPv9IE+Kd+6+s//Zlv/uRvfg253enU6g3vg7aw6tiTI854
+        Owg45t3wpHUt+ctnlzNEF5eXqM1/+IbXfesNr/uDh9+ILJ4yhJtI4abDC9SsUwLQvtJDSq2wTGGi8Rmo
+        BzglceOpN7zu9+zm3RAoW3qIxofZcBs7NGpHWVChmUM0bkzb8asUnH7Vh+j2bBUfwo25DR4HvvPEq7/z
+        5MXvfuyiAqz0QrrqMutzPkQDSn6ZAf7max/43dc+8Pt/7vVhzbqv7FTjPK4owI2SWTdWzPXhAjID/M0H
+        738KTx68/zIDvDraRbicABdypn7Xe/GEfTkB1ork8gMs9E6cM6ENgAP/6cP3fvsjF77zkQvPdYC/8eD9
+        VG4U4FbP3IPNm1d9HbjgZl1978t+hMrlqr9cXHDxKgT4NReJLvsrCjADVRikqx5g3cmqt0uttnHjMgPc
+        2T+VDvB//PA93/7wvd/58L3pAKfdePoAb2xsrKys6HrZQ5OZU+r1Xqtpatb24H9ix0bxs/UexdDWG5j0
+        tVr15F78VwpYxzbq5jvMAMu0J8kek36bwgy7rQUngo9XC3KDduZ7cJhek5xTLCrVMrnvb5yt1c3tC+AO
+        VKtU68r5W5kLHWPRbZsp8OR6v7roB2ZDNwQmv7Agw4n5IFy0lctJjvX6aDRyUgI989cmplyp4cB/+tWF
+        HqyKa7a74/W92faJ7mBiCQccwxOnJMAxSBdgJL2yQ9gBLYI9drVuFFkrFqMAc4iDuLS22zl78/rOiUG5
+        bJa72Dmz9zKq9Rf/6//+gz/9dxTgJd2ys8YZMKhoc3IC5G7d3LtpVkt0WE+y1xLRq1XrRhhgn558WVbQ
+        q6QKkOS+NTtczrnSCfDU6fD0Db7UQrVcwI2dUYOBw1E2a9ygQiR7ki5BQSSDYqlAza9smrt7G8e7s40m
+        62pvhwTUM3uvsquOZ52DM6s33laZzETiTzrAXJhzqNEdv+YDX9PGGOntqD4le5KzCLwLMEp6iKbXk84p
+        jG/Lyz7A0RDNQM7CLc/oluDE1k1U6/vf8ukP/MVPK8DugAUeEAanJGiWzUsq1WCcF+S0U8wQbd04Yg6m
+        SFSQUxKQ+9p4zykBCHD38JxTEhTz5jndRm9hVAS4kR4GiXq6IEwRpuNW44EUMBo5yQNvl3N0QCMkMAFe
+        nIM16+Tyxdb0ONGtdiaWcMisT7ydZ3f5c3BmgEG9Vrffi3E43LzRBvhT+jRjFODMynoOFlkRCPDVnYM9
+        CHCpErdUkDkHA7qHkyzSAXYHcCNXJMCF8sINkMz6xNt5ds8+wFz4hjV7wgaY7pvZg69dgOnBVxTg7kGq
+        B1/LAGf0YIuIv0SAc8WqCXBloUE8fYD7/X76nSyGdQIvGdTtXehwDvaHEGgfjFcIADund8wcHAZ4Oeee
+        PZAAjzGOIAYg95rmZlarXs4HZtnjA+mRpTo3ggD79OSrp0lShVw+R+7bsxPMWY6ywEszB5+5gfnKURaN
+        Sgk3dscNJjlHGcu5UhG3y5wlNwACaxkVJCSLJfP6cKO1UECAyhIhIgV4VT7HmJFMgBfnYBWJcyuNNgGu
+        tfrejiHtky7JnsSx+Rw8sdByxgPvOc0p5XKrVo0C7A5Y4KIaBKCGz+7dGgU4VzD3GQQs0+OdkmDYrlOY
+        brO24IR9OkZ6pyRuPPXg/f/wtQ98ywbYpS+Vc8uFdqtHLMJyFIoFct9dPVWyf+hE0D1YAjw6c54hAd0d
+        KJebddPO9mftYmCk1mi1eyPWro12n/bm2MVPOHjQDghwm0VjCrQ/Jy2CFa53ulAwLew7H7n3e09c+P4T
+        LsA+y3qrR4Cb3ZHTLagfPHFKAhybj8pYf7ZzsH0e55RkDg4D7A5YPJshurBk3Pjsffd+/lUXPmdvVYrP
+        5ZdGK40T161t7HWJtUiB3KMhOl+tFzs9E+Cb7iq1e8vBU6zMObg+2Fg5dffq6VcMts8fWwrmC9tXnBLg
+        yufgeIj+l3/1zv/jr931r/7aXQqwO8AKLl8mwLnSwiO7px+iCfiLJcD4RNaP3nnHY3fd8fhdd3g39K0u
+        bWtbC0/Z0gEmtNHmDhwR4PbKAdWqbSn5bSC4dgH+9E/d8us/fStbGGBG/0Z7gA9cL+mmpvD0AWYY1EUx
+        QVKc2HOOalYkV8Q+wBqiw/QMCGFr0GVSOsBKrPlGqoDctO/yV0vzHCXgA+m9yhBG1n/83vf8yS88wubd
+        YF8smR9HMel6CwCZ3HWZJBUQ0dbmXn262t/cGd5wG+qSdZ4Epby5DN3omzq1BtwpzeEmNSvZ85rv0UNy
+        WR9hsTduRQLJCqSYEJosEdgh4MD3vvSOP/vtd/5/X36nArxs3jgw6+dwS05x9SnZmLMCzLzdbG9vr66u
+        EmbiBDRHkispJINeqxUF2B9CGA6HtBcEwNX/dft3RAEuVcySRImxzIAhVUCeDuydrJ65k+VJ9vhAeq/q
+        adI/fc+7/uiRd//Re96FrPTM1IORuZHEHtXD3cnaNHeyUDHCsoKItgcjHO73eqOD06iNpitpr93EjZNr
+        5k6WNaB865Pt09Rpo2HKKB6w8qBjqOBiEJiXjRvDuIDsx+NxSHp4nl25WsWBb3/u5777hbd/74tvV4CZ
+        6jsDc5fjLX/j9978N3/voce+jJyc4u5kSTbmrACDey7ArI/Ug0PQBMKxsZSb3+jwPdiDQoY9+OQRPVhg
+        bFAPDhH24BA0z3D8KeXzUYDdgWPHKjXzUlj6mQe5r4+PO8WCiBaq5g+a1KrV+pp5OYt+p0NhDw7RmuzY
+        TmM6h1DP51farWmr2SktlIUOZN24vBsdFurBHukAk2uhXMeBBx/7xmsf++ar3vl564wD9cNY4pQEkPPs
+        sudg80zayeCK5uATW1c8B5eWTcHiGTh9HWxnij9QgB95d+gGdUrNpj+ZSe7pOThXNq/CV7nAWN0yAU5w
+        1I2O5mg7rFP8JGttF1Zmjk1g3YhbKphPiouIAm8C/PmfDwMMmSvVcOA1j379wUe/cd87Phc6k1mfl5qD
+        Qb0360x3OpPtUr2zZH92Xg7mYB9gJUbAVhiGgw0T4Pf8Fx9n8wH2ifFGPVhqzS6vwq1dd/VLAvVgpWSv
+        OTgKsI6yNKZm6ceoHvDkrh4sFRDRYrNdKJW5/Glt76NqDgYF24PXk1uV7oRjS63JLnWqqpDdqh1Lru/3
+        67ZyDWntuzk4+RCaB6oC6fQA6sEI/EPAgSjAzMGFyrwH+wCbU5IeLNmYs8LCHEx0w98mAdNY7Nad7bB4
+        o5ZrpdI8wHaIVtUDTmQAIA8YkMstn9y1Af5LH2bzAc4XTHoS4DGTAgLqci4/bptZ59888dC/+9jD/+eT
+        DyNvmfsMBiRgdCG9TmRfr5jXOsMAswaDZynWbJuFdKPl7ooIRITct2aHLL5QMUIzJKLdzZ3ObHW8uTM9
+        fwuqvctg5ohw2xial23lSG91n9qgZcoNs7cBPt7rLOfNMtBkZnksGTeYchJSQKWeI1JgslTlc5TLMLKO
+        hmgW65VGBwcI8IPJEC1T5M0VNBVqnAjcWLjRwbRMHkSe8VCgB5vorh4Wq2Z5zKGyLU8YYJ8egcaCUQTh
+        upO3Ua2/8r7PsPkALy2b9BylCtTipI5b5tL+T5981Xc/+qoffPzVyNtD8yMlJcBd0isl+4p9mhQGWDz7
+        WsPULP0Y1YM+SO4bk32fjOZNRKv9YbnR7PQHXfs4lsV6IWceM/zrX3vo3z75o//2yR9DPr/ZcacsLben
+        pgczXRjFksxgJsCdtr4fajITnzOL+ar9EyUiBVRqPCIFuod49tQTWUcBJq9itRkFWKdwNIS1Z+xQw5ea
+        g5eWc5go1uaT/6XnYJqIdc7hhjN3Uq2f/OtfZfMB9lBDc8qxY4O6eUL37Q/fy/b9XzP3bjaCKZD6Ir1T
+        nukcvDZaeJpERHNlMwhXK2U/B+tN1e9/9L7vPnHfnz15H/JNm/OpsTlemIMFct/NmlatG1d5Ds7bOTga
+        ooHiGsGkj250RKvoXKGEiXJ9Toar6MxFFg3HKceO3XjJAJMuHyQeNszPNL7zkQvf/siF7z/xSuTN1CIW
+        yG+tojMDfIlV9Oo4XmTp+yaMB9XZugmw6ZG2Zm07+95HzKsUN23M4xEtsgRy32nFb7bSzq0bz24VvRhg
+        uk4uaxUNv1Kv4Ya2eQ+LVtF056gHL9vL6lIQYPXgpx68/1sP3v9PU5dJ0SpaAX7yF3/7Y7/05YUA53Kl
+        3qA+mjanq8Wmy149OAyw78Gd1cOVk3etnHp5d+2UAny1VtH11a3KYNRd3eifuznswfjA9j07kNwYBLjS
+        WckM8GZj8UV/C9womN+mxHj2q2gX4MVV9E7TvOXilATzHkyo+/ZPZ2kwBAjFsjFXa48saXi9SvHZ11z8
+        3IP3f+VHTIDD9LRB7CAIJ/auU1z9Jr7cbFGb2nonzomc2JeikwCbmt0Z2T+xUCgcv/NHcUMb5YSr2rWe
+        C7C9DoaUD42Wuctfb7BamIMVH7lvsshKkgFyX7nngc3737h9/5s2H3gYFbJUNIusMMC37HY5odro7J25
+        +cZ73ogPJ87f0ZusY2elXt+3t1zunk4POu1xzf1xBdY39YZZ6w3GjXKF1mhytI4YgV7k1RAMn+LZc1Fo
+        3Ficg1k1VWotHAjnYBIL+jm83lSXQQTOcgMDcT44OJhOp6y76IiAq6Zm2zy16I7Xza2Aunme07bN5Fcf
+        ftOvPvzQx3/8LyDrOY/S0z6YhhGEVqPdanTIg8rttvqdVq9aq9Zq1FW3e9wsaqZ3XGhv7NUqLP9qGyNz
+        DysM8OFqz1gxD+Mqo80TJrol4zFc195QCwOMXXyoVmv6Ckx/MH9zivSlchEfjq+frlTLOGDMVuc/LfQb
+        dKtpHmeFAb7zcFyvVbfP3I4D4dao18k32qzpWqtlbmNpW98a4hqkd4ZLFa+GGI1G4tmXKhl3ssix3R2S
+        dRhgEgPyPT+b4kDTni6DCDSm+Z0slqlPP0TbsfGP3/uef/YLj/yrX3wc2R2wwGg4RAsKsFMCUKHFTpL3
+        JYdoFnvtmbk+QcQa+ysaopeXcqWC8WF75VSpUC3kF273KLROOXqI7q6Zm5QX3//1i+/72gOPflPOkC/j
+        CTMOl73tkhnbrA1zETxda5y7ZXPvVL+Teu/nGg3Rh3YsiWqffjzPDhPZi6zGPAx+dfOHj7z7f3/80bBm
+        Ad03XGQJlwhwuT9yyqUXWUvLnSTAwhUtssg92twBiyjAXACR9X/+8L1s37WLLBfgdRNg+s2Dj379dR98
+        Ss6Qb5sr52KR64FR1VyaWxsOTbO8iJs7OGqR9bQBxlb+6FuVJ+wHLcwVYQBmzHmA0/eiXyAB5mqtYx/V
+        SQVXGuBT27fUq61Bb9xtji4dYK7iyfo//K1X/Ie//Yr/91degXxUgKlI8r1EgAlYejwD1yrA3acLMBOw
+        3ujAFuCqqWZfDWkPVsoJ2W6YiccF+LEPIOseE0BguKeVeAboe7rUaUiCUsG8K9NeWS+XiqjFUnl1YB7g
+        hHPw/qzDWa3+ZLh+uHn9fXgyWD3e6PRJzwQrN3yAzX0c84ZvudMz33Tq9BomGxYmxTy5n9y+gemf5ttu
+        dlHxSv6U7GuzbMVl0xAhWW2Q9TcffYDtqcceQL5ue1Qpl8a751WzPsCkJ99xs9loNmv1xnrHjJAYdZZL
+        JVYk1AZyCI7qjQ6nB9AbHZJzBdPcozkYWw37Lkc4B2MKUPxz4zEO1BIHAALRnU+7zKC6k+WRL5o3Byqt
+        gdOTm8BE94/e+55/+UHTg90BC8yxcnOKBWbJiTp1uoftOtXhGMloS0sjeycrDPDWwHw7FAeibWlpOX0v
+        2ho1SO5Fm1tIAAfIfWfltDlUrdKcUCFR86XKqb/0cwowm02+xDUAWf/73/gZtv/nN9+KfOPeBL63cYas
+        wwAv27dKzL3ZcrlQKk1q5kpURgSWr1FtCOrZaegOl4CHZB0FmByLlYZzIwmwO2Fp6YT9EyXm2VAA1lXz
+        gYGAZy+yGsGNDjs2fvNtb/36237m99+98JwORHeyBAXYKQGo03J/6BQWWY30IssM0ThQ76/W2kO24e5N
+        qJBXtMgi9+3ZKQQ8YYU1d4aQj2fN9Z3h/qlyfyxOczDVyvanX3oH8k3HzevHR83B+oQaF0Yj26GtDYej
+        huL5mLmIpx2iIRcWWYtD9J69snBKgoVF1pEBDlbRTLBYCTd3wOJKV9GlXhDgI1bROLCcMx8MY2skL1Rc
+        nQAnKBfnEzbtn6wXArxnYt9dUw/+3Qcf/cbrPvgtuUG+BJgJmAvPYcW86GltOFzzACer6IYdz8LNGjBY
+        CDCXTVpk2c5t4rScy2OiVHdRF88F9MzOxD2m/QAk0BDtUwJkH2BHWaAS4MrA1J3UUTMcok2AtwauBxcI
+        GlWYW25P91BJn/G40BoB0eNCGHJPD9FAR1kVUnCv5u0QHQb45uNTDvTWT5H1xff+zsVH/t4D7/uK3CBf
+        M0SXSnTisX3RU07IFEOulpyoHqgKpNMD6I4EAntA1t/+fDxEF5Ih2vdgUu/b9fPrtrdev7N9cWMd2d8D
+        XhiiudAej8cMOWbSLsbv/lRq5g1Q5pt8sbhqL7n69ovCkAIyUzh+hGQubx50UKchCQr2hWRzq7Jgf6xe
+        KK70zB2GcA4+Pm0W8uZpR63ZsauV8mDd3O4gfctOeEmAzUyhz+MwXLa79kuCXfeqL+2C3A82ry+VzXOV
+        Zr2Nqj96wlH2uEfNerVWNT+OCgN8+8l1Dow3T5L1697+6df9/Kde/85fN26UTJcdMS01GtVafbVtRkj7
+        ehaVZEyxmMI4Xhk/EohXdhFYZLnKL5WW8/bRy+d+Ngwwq6Z6M7XIKhbP2+XVZr+/PRoet/ez6jYKgDF1
+        PiqTATG2c4p5LMrJG2fvObjzR7fsCrY9WrOnmKuCVTvcD2yAQ2AL/5xikcu7VbTTEyjAjclK0WbHbqVr
+        fk/3Z09c+NMnLvzgSRvgSZPBj6yr9ZZZEZZL/bVDVNI3qqa7hAG2Ths7rY75nkSzbV4BByyYFWBkAlyv
+        mV/745WOAmpTARZYMJN1GODbTpiCr+2eJeuf/KXP/sQvfuanPvQFZEJJvsO6ucNXqdZW7A8eZUSguWPc
+        KQHgnbQIAu8q39SbArzQg7FVbXTJ2gXYDtEkPqPvhVFBXMLYm7i0btlhcNLAYIA34RzMyY3hRne2p1cJ
+        m+MddyD1lR2PZzMHd6vmJvAfP373Hz1+95988B7kmf2BPVnnCmVGp+WlY/iACnl152CGBycdPQeP18yF
+        +I+96+N//l0f/7F3fFRukO/zOQcniyx9bcg8zAb2aRBX89bGJRdZOlljOXJjuGVFg2sR4EbFtNlP/+wD
+        n/rZB37951+D3G+6OfiFEOCivcMQbpDk+/wE+PFvvvbx333Vu8xAAnm5AUZilGBdwEKJPSdzTcWwILk9
+        2YXXoamdAhmOlVhAxkUsRqQCHJIAlQBXhxPx7CcdMwf/4Mvv/sGX3/WD33k38s7UvEpB1sVyjSGd+bgz
+        Mz+bJL3e6NBblX9oHzZ4O7WG/YJC3X0LB4bc99bOItD+GMXkDFACoBtwCOzJiKwV4O/bAN9yMLOHTJW1
+        kgf+VCAk+XbtuoSBfmKfyHq7/E9vseICxCepFhDyCGTthugvuADDM0bjwMX3fPH+93zpwlvNUoC0J3vm
+        TxuwNjLzWMFcx7L0wAJgVJ63m8PDw83NTbJhkmi3TIPtdrj2HPW65j2g1ePXwYNOt7s/NQ8uNkYjVt0i
+        AfJ0OqWJhGSrbe4oUachCTot88RwsnO8q+w63b31KcX43hfeQZH+zNbsub21Ttu8oTIYz/q9Xr/XXds3
+        t5NIPxkOcSAMMF7Bdzvd2cqIAE9XhiYb44CZdM8d3trtdlhCjkdT1GbL/J1VJQDQUtkP+n2yDgN87/nj
+        OkSStePXWwdcGVUJg+GwPxyqTmwqA/6fzWZWXID4JNUCQr7RMs/WogDDD4YjHHj5Qz9/90Nvv/31f8U6
+        07153ayce/Zp77hvFlnsMQVYVBERF+D0EN3sDHvjtXbPGG1Pru0cPLC/K3QB/m1TsxtDM7aQ9QthiBZa
+        zgFXRvJ9jofokn2r8pFP/+Ejn/rDt33YPdR65nNwb7IxXj8+mG4gd6bzF5p+OAPctO/MaltaNvbJ9zkO
+        cNleBz/yqT945JN/8LZf/YZq45kHmFplqc0e+Vovsq5WgItl8zpjIfhtxNUKcKU9Hu6cH+/d0J4d6NeF
+        qgTqdTmfHzwnAS5WTQ9+6698/a1/+x/89Ie+pNq43AAzZPv3olk8m5rNmU+pFnImwL2VfXO+ba0r9r2O
+        3uLXnpG55GJWD0kGMwU4JEFuyQSY6+B8zrwSy9Ji2jdPk8IA7630SUbW5VqT60m2/qq5VqHNpd+Ltvbz
+        nU5z92CTAO8e35itjEvlAiUl9/2N61ikUdRapWECvGxKTr7ssQYvlaJxHWnc+KKpVrnBdbBLWSpX6816
+        s8X/Sk++x/u91X5/pdc7PR6hmnQylTMfW8G4VA9U+IgUmGJV+Rw96r3ocsX8tj/cSH/aflaZtZ55n6Rs
+        roOrydvptN35dTCzcRTgfM585qmYPyLAtYUAcyIDwDMO8OySAabeywTYXoxmBhivWDkT2nAbr5o+cekA
+        43AYYN3o+Pf/41v/r9946//9m29Dvv3kulKyx40qw4ANIyr5Hg4Hm8PhxmBw3WSCao9YU/YPsEW1AVCv
+        JMALd7J0U4gYNzrmxZ1Wf1osmu8pLAbYDCTZAWaAJQ8EDbOY4D+Mohlz4x14c2hpaWJvJNFbxQicQk3h
+        otMtIBVgpyeAJ8CVwRhJ6qht7mSFAd4aG8/IulCq5s2La09zL7pSNY/6P/H1/+qT33jzJ77xZuTVHTPj
+        kPvu6hnOovjh40IBh+Elw+pedLhtj+dP8agyqtgp9l70qFptVKs0uPWm+fStO2BLRHOPakNgKHbSIhQJ
+        yQhknb4XrUP5kunHxaoZe2H03WyaBu2JwCIzhdm0l3xciAn2FFjy8zgHa0UD6gOz3EPInINLdvb96Fff
+        9ORXH3ryaw8hz7ZdD778ORh06qXVvrkov26zO2xVS3l34x5wZUmMnfJ8zMFC9BGWy52DCX86wEp4jQIc
+        vnQ3bJkA/+kX3/H9L779B182Ad5MAjzeODFa2R2t7Gyde8XTBvjJr77pY197iM0EeMsFeGt6wiQolZgQ
+        njbAAg7M2vGvW9MBfo5X0cJy3rxK5T+jdFkB5hBzMFfKUCBnbyENd2+a7t8y3L0Rubd6qENgxX6JW4us
+        EAwyWlYIzBDT/qYCvDbazekrc4wk7W65PyLA7b2T5d6wWDXf8B/34g/obow6+EHWu2fv2Dl1887Jm07f
+        +QZUEmumSQJsbnRA1hvmjWi678e+9jAb8vpej5CQ+7n92ztMWePVUW+GqjgJFJwqcEoC96W7cYPIhaCJ
+        UByn2MGwX61WqtVypTKzQ7Q7YMFci3GnBKAXOWkRmpsFFiU4EC2y3ARfKjfsSFbrTi2RP21vbhTtl+6q
+        9uXOShIFznJzMPPQxsbGZDJhoIYt2adJ4dab7cIDEmzYQX/UaimxgEwTsdO8Ixv11vX7L6dCtbEg4FC1
+        2SS00QbfbTduOdx4xXU7F27Yv/f63VtObgw6rK0KZF2rt/CoUi4O7NMkLLdtCwsDjIV217yNHAZ4+9B8
+        FYqs7zz/wPba8cO9s/ubZ1Cpdjlp/LGvGkr1aDfMm1kHKx1WLo6yiSldo2HuzSk9+Y5bzUazWW801u07
+        b7A6gQT0FoxbbQ54ainKTiC95wtFs9aLAmxslcuNdn/19D0mIiv7Nm3lOvu4kJKY96Ht8qiZfBiJtjsf
+        ldHDIVrAUKES//BGr6c0U7/P101dp4QIhm0Wu0S0c3C2u3vYP35ycss9qO6YRa6wYBYHuA5mzWCvg82t
+        BkgtJeIhumJucYQB9kN0MgeX6YSoyB7MKekhOvmU4fzXbwKlo1M6RUO0XdoyOGa+spOesMAzHqJla7lQ
+        1j35cvIiht6nbNFSWSbblzsLSRRo3/Ps0gFOv7IjXNEczEqSbJxCljXTg2EJGP+qU/urrwCUxEkWCvDl
+        3OhI5uBLBPiyFlngMj9laKr1+ZiDqQRtUs+OzJ35O/f27trfv3tvFzl7kYUJBiunWKTfiwacOrPjQK8c
+        fxEisweTR9jqC3UT4FyZUcg8bW/o4xgBqO6wleBAvmh+Gktr0A/sIRd7sBmiIcupHryybaYfIrqzYv5w
+        DpaLBfM1FmQP8mLgdUoC14NTP2/UdapTbIAv8V40k19mDz4q8PMLVgsc+I+f/bn//Lmf42JJAfa2MKur
+        Nan6G440PUg1fd+D8Xae3Ww2e9r3oiEHdjWhrWX/RKfAIS6jqUQER1mSqAOR2Gn0BkR09dxN62dvYNt5
+        +atQS/ZRl06hnH4iLxXNUqDe6sLUa9XhhnkxyqRZeC/aBJjJst0xL+tEczCrFSJ6Yvt8uWLGp1ajg5ov
+        uvei2eNweg5u2Tl4f9YpluY8adJz8LTVarZa9WZz065LYHWIakzPwTo0HA6j7AR4VT4HaTQ4EG7wssW5
+        mKVf+qrWG9HVet38kQv7JDd7DkbRjQ56IaCBFEoVU6GtAU1lTuZy40plr9/faDbNc8sEnEhjob+SxlE2
+        ve2oyS/56XzNNhGtdPo1AtLp9uyv0OD9WVSi7g8gYxMHoufB8HoevNCDl5YqNfO6XRjg6EYHNRLe6MAO
+        exzWzGLyTlAsmEXsRp+ePedJQ4egLJLZk2+0GbuJ59RsVBsAFT4iBUVCsknWKG8MW7jx2vMrU/sevz9E
+        /RA8X0v+eTCtXLeAGOE4BPB2PjBg4nKGaEA8aE26BxKC1k1+TkmQOUQv2y9+wNcXP28DCAOeOeWyhmg3
+        B19iiI42YzcBeUVDNBPwyam50XHhRK9Rns+4IBqiuUzs23u/NwwGPTrTYoU8yyEa6M/L3m7/vCzREQkw
+        e/QQbZpd9hBN+Ofd2eKoRRYgcTqWl7fIapguW2CyMHxtZTMKcFgSgAPPcpE162+d3r7l5debPx1xuHnD
+        qa2XGbsBaFJOsqgVlx88M6Rm/8LLZuvdhXUWRQ7LIpD7ViPjb1cdFcjLXGQBimwCbP/yWVQtYTt7ho8L
+        BdOByvEaBLyIApxbzlfLzZtPmD/+Uqu0SoUF+zgcBThnq1VbxbxyP8dRAd5pXvMARzg6wKYHZweYIYJ1
+        gepdoDa1DbfOcukdHiKWjAdOSYCLZOGUBDQF4BQmj1aHiBar5m94wrc2dlHzwa0lxnlvhDHKBBiBeqcK
+        RuYODvzinSwTYNLU66k7Wbs9veTEpHJmz3zyZ2nZXKDJuEApqAKnJDDfVC+V88X5n44A2CHxvCwWOEru
+        +13z53RDkJj5Ll0bQHNzGnqa5BRrgRAT4Ju36XVmreCBWbqBN37K3slidQBZKZopwz3wspU/H/nJmACr
+        kQrTg1s3z927ed2F7mxP38kSyJswEKHIIWyZWWCRJA/yFclUWml3iWjJvkbPirC1aQJsptjkLAVYKksK
+        Irr7stdvnb+4ff7Vp+77yzbAhXSAOb9mv5rwsX/w0Me//jAb8sZeb3nJFIfuf+747QQ4+qMc5KIA+9w9
+        6NbebQ+KDIkgnr0CfNAzdxnDxFQjAU73AdLAR2YFAhxWPgvCN9xg3lP7G286PJg1fUsxmdovfftaUoCP
+        5QvLRMT6w7kcAng7DzDnRIssEI/CCVR4pySgptLjNh7gilOSRVauxHLP4HIWWdFGc85cZOlO1n/zmw/+
+        t7/1WjbkafD9lDM75uvkTgmAw9EiSyA2odsCRY5IHCX33azRmJpN1waY1/giIr5k/wicttMrjXCqoH5w
+        z9fSWRvgGyfjm6fTWyfmkomllg7h7Xzkp0ul52DCk+klidP8tZiDBf8JB4GT0wHWh4Q/9Kk3/vKn38SG
+        rAf+AuuszACDaA4WqJrQbYEip0lyv0ZzMDAD0OK9WyFsZ9vBnQltPjB4O8+O8DBKECGKASRokPGkgEql
+        RDyyxrqIxIKam1Mb5oVZJgdchNedLHglAOF1MDBCLt+1L+vQeMRXivEDf/hqzczBv/XUez/zrV9gQ97c
+        HSs9J57dtXNwYlZAJS+1S0clYDT2bgvIFBlSsvZMLuS+124xF0SJ6S0Yd3oCeHpqmNKD9JEFQB0xw0U8
+        ZjU/ijfM0tLZvrkaZow2TJKSZPN2Y14bHo8pAL0TcIw91U0sJXug4mXEIzPC0/8ikuoDIqmzur2TVW02
+        sVyv1XrbB6ilormBoFNwKDSCUKlWR1vm57n2zSzDt+xb5mGAOdDumKdJX/onj3759x9jQz5+cpX2T/p8
+        IXf9gfloVzH4wwzAGLd/Lcpn58FSwLstIFNkSMnas4wg95ODQbnkSIFq7Nsfnzk9AWnoRWFKD9L7ygdK
+        Q3Z0mzA9MmZxz9cSe6rv7Mi8FEZ+PjECyeajMkp0J4u9OXnxT7wjA8IT8ZxIbNLdGqeBSIbvkv1IVr5s
+        fv5GvJvqwXZe0SnpHpzLF7or5kFh0IPDO1l2iMYlu4r+7SDA2/a326Rnf3bXzsFLrnSCMX6FPRhesvZJ
+        D3av9diEBuRIH8jswdRSmNJDc7BTbEpAdgQyTI+MWeIX9mCKf9LeK2UN5hMjcPq8B3POC3QODj6jJGTO
+        weWKeScrDPDG7vwjLy/SOZjsCJJTAoRzsPD0n1F6KcAhXgrwiynAXP3eePhKAlwpZUTihyXAk8lkOp0S
+        OaoYSCBmTIqeFFCZMNI8ywQqKySRscDsLpJ9oz8kojX/5y92zSKLBYE/S8s3ryJUq7Xxtvn9NbL49ONC
+        +E7XfEDpS//zPMD7p9b1iGVv/RTR1Sab1raMZzwuBNSLd1tANgvDel2y35P7ydHA3LVZNHLUKzvhqzkh
+        0o8RUcmOwIe8ZHzztcQe6MWd6DNKJJt3WsrpX3xX+2WvdJIFZKDChzwnEhuaW0giKzORLAGqHXcnC5LS
+        t+2drLy9waRTsMzqxqsIxKi/Zr6gkE++qr744rsJMAeaLfPb/jDAuwczFhwmfbXZaw+no7V2w/xZOQ9j
+        PPhlQwjFJuSRKR2kZO2L9vHcvr2TJVKgNqhPjDs9AWngw5Qe8L7ygbVnao9WFaZHxizu+Vpiv5zLnbQf
+        b5BqExqB07V2M1BbdkoC0pGrUwJwZponNulxW/k5BYNX+LgQXOaX7ipV8zw4HKI3gx8GAsYJJwUgL2rQ
+        KQEUG6ckUACcYoGj5L67+IdDBWo2PWGBo4bueSQCkB0dySkJMIt7oXGCcdvEXCb1bX92rD19nh1Keg6m
+        SJle0pbTPOOJkwIQ8rApaA4+VihyMtcQtdX4lR2ajpMC6C/mOgVX7cXJv3j/L/xvH3jf//qB9ynAeh78
+        1X/2S1/541/62p/8VeSNvfkiC2RaBjQpJwWg/aVbMEVOk+S+08wo+FWZg8kucw7GPSdZTOyQpu2mqflZ
+        vXhOd9lR+LW1tfF4jDnTBhIQM8rvlAB4k+YZANKk5i2noLbMGx3lSnWwf6rZ6zdHU6MGoCHjjFMsqvXW
+        xH5JsFI1bwjBNO2LKeEG2WrPP+KrbWtv6kvDiVh2SgB4mrVTAjAahW4LlC4i8YbcT9hpNQJzbVQQQa/N
+        pqG5OQLZESGnJMAs7nnj/DdptU5Pxqen08ORmcg9SOY6LdLe3l70vWhZ55BkD1RiGfHIuJ4msUBr8CQC
+        EY02HRKwzD40Mt4yE7A2SsUh6n69192fTI9PJseHo76132g2Jqv9ncMJod0+mKzvjPrDjl4WljUsh2aB
+        Ocve3ol4gM94HvJKDCnZ7W1TOz02n3oWKSCPUn+rH8Cz0AlTevjvRXugkh0RCnnJuOdl/lVYMSA0m+Zm
+        m1096Chtej7tXtEQTet4ZkO0B3EtdgdOCYBzTkrQXj1cO3uBrbN2MjzKfIh/TkmQL5o/WGS/jRcjbVmg
+        RpwU4IqG6K2GWTNG9jOHXEDMnLSIzPRkdzlDNAgv4YiOBE6fZwebDjDnpNdNgMRpngCno04eaW8AAQ5/
+        fOaRGYblZVez4VFKHi15gB4ahj8AF3As0zLIDDCWL12JQsf+VOTW0ciE9xoEmOwyA5wuOPWTJjl9nh3h
+        uRZPk8hVSz5HWaASYPPz0UUeMLCwj4yQF3Yikgql8J5EyOWWu8MqAe6Na/nCwl1ZHMOyZwTxapeOSoDl
+        yG1k3ICUzF5rPW0KsE1oQAJ6i1MCwGt17fQApI94VLLDbMhLxj0vS6B+0iSnz9sNc/D6+jpBwgPAAfaM
+        4ECyByoTScQjs0bDy4gkGe0mJAHzGAEebu4w0TkqAWsN9pERzKazY8oHnmw1WysbQ6Krbe/klNnfHbIW
+        8Dm0AMQz+UU8wOd0jiSGlyySOZmkbAqwSECCyWTilADw1FJo1oP0EY+KD1RIyEuO3FDKNEn9QLoA08BJ
+        hEDkgQSaAM3Wk8AktcNamlcPjkj14JAEqOrBEQ+wTOvzvATfg0OeaULDl2eWlpe4/hpN+/Yvny0kVg/2
+        jHAUD9SDQx5ZPViyJ+WGAiwSwFPF6kYhxPvTQ0Q8MiA7zEY8ZtVZPY+gHizZk5xOmBEMMEQLdUoCTpOh
+        CCRO8ywyZTeEYuOUAAQ4/KS/h8oTgTCoPYXwMYhAA077hmOZc+1RPJbTbuNGmpQbuB15Pq/ZRVwRT3Z+
+        xRQiXXA1PqckgJzPwS/sRVbGUpyazWw61FTaDZhMyyAzwFhOu40baVJNIW38qEDOa3wRmenJjmI6JUC6
+        4JmNj9Pn2b3Yh2gBlWaKG063gIRRIB1lgUpeRw3Rqi+nJ0Yoi2RPyo2QBMhXa4hWD3as5TFLjlEt4W3k
+        BgKnz9sNaw2gdIBj7Ck8bVOygAw4Lc3TPvAmIrEAQhIU7B8e0/eiHZUgsiyB2GDEqxKYERgzYsuFgm4J
+        Od2CNDBYjhKjkhc1G/EAy5HbSgwv2ZNyIyQBbrDASVcRe9wLSQ94X/lAafAB+5ERykKOYVUjkDLtG8x8
+        VKac+EQjDSErTgnAmWmeGsRFpyQgJ4w4JQFtjwBX+yNWQo5KgOW0ETntlAREnRp0SgDaWdoCDJadEoCx
+        gRp0SgAsp93GjTR5RW4ADTBpkN5JAcgO+05JgM/kyN7pFtRP2g1O18BgQIrnaA7mCrJpft/Q2jnM1+Kb
+        X3jppADkhR2nJMBhatApAWhnaTdgMi0DDd0RsBy7fck52CkBcMNJi3je5uDnLMDLpXLn4AwBnt5yT31t
+        27EJXgpwCLK7agFmfNYcjMdymj2FJ5aeBMiA09I87UOV7ihLUq0YCclK3Twx1NZe3XBsAiyHRiSQF3a8
+        KoGhlYkHwZMAmUt7LDjdAhKGGgxTgqN4gOXQbQm4AelVCTRrzdahEWS5EZIAVUO30wOQPrLAnuwoZsRj
+        lhxD4wjUT+QGAqfPh+jt7e21tTXcpYoBdtkTM1JIFpABrSHN61ZRRGIBhCRsrVohXbvZqNsfq4fAcmhE
+        AnlhxKsSqBGA4EmArFtCTreAhGEVE6YER/GAMIRuS8h0g5QgJAEyvSWqDYA6Ho8jUiB9ZIE92amMIgEy
+        ZskxNI5AysgNBBhOdwGmeVJUhjI6O9CoqH4jWUAGnEwLCnlOxFw6sTpfSALxtK+IB1hmYPG8BPIivVcl
+        qJNFFnBDy1GnW5AGhjJHicVTUxEPsBy5rcSQkj0pN0IS4AYtlfQhCVDhI1KA95UPSAPIji4Xpkemfsgx
+        qiXVp+SQpHQuwNhaXV1VQwASVlZWaFmeBMhgZ2dHd54d2+3Suk+cOEEnDknkmUVIAtTpdIrxiKe5YZkI
+        eV4CnVJGQn5jY4MhxzMC5Tl79iwWnG5BGhgsR4lRqda9vT2cd1QCqiJyG5nS4TNOeh5BbkgWCXDjzJkz
+        GHd6AjI6ffp0Ojtskp6znG6tAbLDfmgZGbO4x97zCHgbuYGAWdqHCzCgBWkvgSZAlrQLTwKT7tgxMqDl
+        Rvz+/j5dLSKxAEISoGoAiXjaHZYZBjwvQRMHcsjTwghbSALkc+fO4YbTLSBhKH+YEqCS19aW+Uqjoywo
+        OFUTuo0A6APUGkdDnqiTWLJIgEzAwoIAZECAQ1Kg4LTLkJdMdhQz4um7RJfhwfMIeEtthL4JqMeOHfv/
+        Ae7AUtoKEbIJAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="cbHiLoHLine.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAKAAAACWCAMAAABuMnOvAAAABGdBTUEAALGPC/xhBQAAAwBQTFRFAAAA
+        AAABAQECAgIBAgICAgIDAQMEAwQGBQICBAMGBAUCBAQEBQUFBQQHBgYGBwcHAwUIBgUIBAYJBAoLBgkO
+        CAMDDAcDDAUFDQgDDQgEDgkFDwoGCAgICQkJCgoKCwsLCggNCwgODwsLDAwMDQ0NDg4ODw8PBwwRCA0T
+        CQ4TDgsRDwsSDhESDxITDhIXCxMbDhMYEQcHFAwGFw4GFAgIFgkJFwoJFgoKFA8LGgsLGw8PHQwMHg0N
+        Hw4OFhEMFRoMGRAIGBMPHRIIHhUNHxYPEBAQEREREhISExMTFRUTFBQUFRUVFhYWFxcXEhYcExcdFxId
+        FhQZFRgRERgaFBkeGRQQGhURHhMSHxQTGBgYGRkZGhoaGxsbHBwcHh4eHx8fDhciDR4jDh8kFB8iEh4s
+        GhUgHhcmHxgmHxknDiAkDyElECEmFCUqFCYrFykuGCovFiQ1HSczGiswGSo9GjM5IBYMLhwNIBUVJBMS
+        JxYWIRgRIhkSJBsTKBcWLhMSKRgYLBoZMxUVIBsnIRwmJB0rJB0sJR4tJx4xJCsWJi4WKDEXLDMdOicX
+        ISEhIiIiJCQkJSUlJiYmJycnJyAvKCgoKSkpKioqKysrLCwsLS0tLi4uLy8vIC09IC4+KSIwKSIxKyQz
+        OyMiMDAwMjIyMzMzNDQ0PT09Gy1CIC5ASx8eQUFBR3Ope1+bf2OhdIxDPIecPIqfQpivuk1KvU9MkrBU
+        3IU+34c/54xCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAApgXMrQAAAAlwSFlzAAAO
+        vAAADrwBlbxySQAAABh0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC42/Ixj3wAABohJREFUeF7tXAd7
+        G0UQlYgTAgSHDgZbBqxCb04gIDrIEi70lpheDAZCh4QSQu811CT0DorAIIP/Hvtm9+7W65F0pyva4Hvf
+        56cZP+/c0+6efNJIyvy+W+AH0O6fQD+CvqdfUEgkdS83dW2oqZulfele/nPmo4zAYBZcAI2A+gbBeRDl
+        UqeQ1bWhpj5klNZ0ClndKz2dGkwNUt7CYFP8mnJrDa5WeZwGdxaq1eqU+KlWp0GbQLXvmsFRmCwIEFXG
+        wVOgiSJ4I8jUKWR1ORThhy1m8PiywLZyM5N5BtHW88EUEl2wFbwNRHl5e7l8tjYDUc5g2yUWBilvscQg
+        ynkDCRgUoDw1GKXB+kG2G7wnWYOfDQkUc+BxUBWUK4JrIMpJP60eEDS+AtJKa/UpZHXv0O9ldvQJ5FaC
+        K6A86IAcuACinHTcKT+oq1ugr2/YKK3Vp5DV+4pOeGv0J8mjwmCUS9zJYA4UxOA+Ky03CErSIOVPLbgh
+        q/fc4FH/uCGrx2nwi7xAtQCeAk2AClXwZD7/7gLhX3kTBbT6FNZA2qGJcGgZfqDPYBGk3UNxNy7FbSjQ
+        5jDRcQbdvIv/JCBT55eQdGmQ1SmMZg+GMDgEstogZ8Aig6ssN3joXGiD/i8WtH/mpr7kYgD1CXPqtg0w
+        oM3Fwuc5gcoweAJUA41UwOMgyqVOIatrQz39oTk/GDMObdR7v5cnyRykHu/B9gZBdhrUYaVBqV8DsnSJ
+        14IbkDoa/LRfIL8WXANVQIN58BiIcqlTyOr9VTc09QIN9XQcWWK/PSpog/7bM5+sERjpB4+BiqD+YXAF
+        RLnUKWR1baip50GG3iDskTftcO+a23q5Bylk9YMbTtjTk4RCVs/ablACoa0G3dK9Mjj/thMmZDAo5tWt
+        gzYGd40JTFbB06CNoNokeBOIcqlTyOhX/DHfNcamjEMTefmOGJd4f5omi/fgCtsNSj01SHkng+ubbmjq
+        URoMgRgN7kTTaVz2o1RPKxS0VlecrbDFS/gC2pr6PTT0FjMUzQz6MVi23WDHkyQ12IXB+iHWGlxVKp14
+        Rql+eumqksCVoNL1bgjaN0qDwa9mHlOdrjbQxrNXK1KnMJmrmTuo/cXqPVhiAVM/wXaDvIHUIGdwgdWX
+        tUH9agakXW04lxSqidU1RJV4r2aOGNhw9IDAJS4dswF8A4jygRtBCyBTv3A1qoSYwQhPEq9nq+lJ70Fe
+        5w2kBrs1OLe8DLbvuKtc6l5H3NVPVf2ijnjSGaqNpzBkx13l/Axq8NGSWzqeQn4G3TyiJb6LDLK6jXsw
+        NRjQYONA2w2eHKtB/mpGdXqiwDcoGPnVzMszAh9LeqMx89p9Wi5w/6tuSDTztRua+uvHomCIGey8xMc1
+        2i8xwBqIZol97UEJr4B1Bm2awWtXCLLZoNkDCoFoDDodd/wGiMggqrIdd60jTyGre7necX9TdafCo1PH
+        XekUsrqXB++4z18kqJd7UCvAG+ROIpsMsnqSBvE5JbsNnivIJoP09jztPXKqYZQMFh+6xdvzsgJDfeAi
+        CNajxN9HqoBHNucdesSlbMEJb4n9JGmeCQ6xxLGfxaDUYBiDnIEEDda/QpSQwW6gf4DJO0CUBhc/q/tV
+        9bICA+O9Z2XJddyfqFNu7x4s2W5Q5anBaAwunOXkthp8enR09FnxM3rxZeDnQJSPPu+Gpn75AIaGMBig
+        4y4bW4GBob3uuKuhaDWZepJL7BXYWw26lBrkDf4JYvV4Dd45O7v5gVmBx0EPgx7cDH4ERLnU/wKx+uzd
+        TkFJURrcVVXNqnBwv4VDfhUHfTcHhea3dPjSvXzpw8x1aBqZS2jTHjzFdoNagdQgKBmDJ7kfUFmi22Hw
+        6hgN+nhjj6Or3lZQYGhsT5pUrmbQeUUnu3IQnAfJF3uMF3+k/m1DUC7sDMZ4kryChbdjD/IGJCw2SLrN
+        M9jJYOsPxOxVBgM8zHgPA6bOPoy8o/pOfqGN7/ZhxiV/M0gI2vuT9bQZjHmJ35rnllDqFNq8Bylc5gad
+        74Zb1gZ9Pcy8qFpXIeCU0upTGM3VzND6dQI3uXTOeeCbQZSv2+KGpt78DbzlcKeUVl+W7jSDcZ8kzZfA
+        rE5hzw2G3oP/X4OH1S03+EtCBs2OO3W8tS+8+VK1knxB/L05nu2oS53CwB13+aRH3i8Del+uJZzxAvSk
+        iu2oS53CKDvu3ierTD3OJQ5gkMDqlhgkYnVLDHpVLTXoFUgNOqUz0/8BhkYgU0kdYv8AAAAASUVORK5C
+        YII=
+</value>
+  </data>
+  <data name="cbHiLoVLine.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAKAAAACWCAIAAADWjhTKAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        vAAADrwBlbxySQAAABh0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC42/Ixj3wAAE2tJREFUeF7tndtv
+        Y9d1xjUSdeFNIinykEekJF5010iaGXvGk45jt46d2gaaFAlaGyhcpG0CFH3oW4ukfUmA/g29oH1Mb0Df
+        +1CkTQsEfe9f1I/cn8bf2VxnoG1dTFH7h/Owvj2jpbXXd/Y5WzwUtTCwODg4YCQMh8O9vT0KYX9/n1GW
+        20symkAhhCZBMRRCUBLM5e6TmON5SRa2trYWplhfX2ckLC4urq2tUQiVSoVRFjPJ0tLSysoKhZCXZGNj
+        g5FQKBSWl5cphKAkKAPFUAhB01ldXUVbKISgJOjqo0ePKIS8JOZ4sVhk5BEN9giaTpDBqyvFQe+QQogG
+        +9xTgzctMH67Bh8fH+MLPJIkYSRUq9VGo0EhNJtNRlnMJGhTvV6nEPKStNttRgIMAxRCUJJarYZiKISg
+        6WAuaAuFYCYZbR//5Pf/jkJAV6+eBJjjOFcYZVnodrs4fTwwc0YCTlWcJhQCsjDKAg8YCVh8OOsphKAk
+        WL6AQghKghWMYiiEoCSYCy4DFIKZZKvZh8EUArqK3lIIeZWY46VSiVGWeIn2CZpO0CU6nRhMIcR7sE80
+        mJEQDfZ5KAbjR2/8mwdu44wEXOWxMaEQsEdglMVMUi6X0SkKIS9Jq9ViJGCG2JVQCEFJ3L6GQgiaDuaC
+        GVEIZpJ+9xAGu4NDE3D+obcUQl4l5rhpDVjY3t7GOeiBb8lIwLpBHRQCOsUoC74lIwErDycshRCUBIvP
+        LR2PoCQoA8VQCEFJ0EG0hUIwk3STIaz95sVvne19g0MT0FVcSyiEvErMcZxnZpJ4ifYJmk68B/tEgymE
+        aLBPNJiRkGvw2dkZ5u/R6XQYCbgJYaNBIbTbbUZZzCT1en1zc5NCyEuSpikjAbsMQCEEJUEZKIZCCJoO
+        kqAtFIKZZL//GAZTCOjq1ZMAcxwbSUZZ4gr2CZpOvET7RIMphGiwTzSYkRAN9nkoBsdNlkfQdB7EJqtW
+        X19cNE7AuII97usl+m///bPB0fidCR7RYI9osEE0eBpzPBrs81AMPj8/x/w98vZH5p0cBp+9vUshmFsb
+        JAnaqd3qJuv6STCXq+/UDnI2WejqjWyyzCRxBfvkJbmvKzga7JGXJBrsEw32eIPBuF9QCHmVmOPRYJ+H
+        YvD1X8nK22TFV7I83vBKVlBPzPFbfCUrrmAKwUySt4I/+Zf/vsUVHA32yEsSZPDwqLO45O+bosEG99Rg
+        9KRY9iuMBhuY3qAdSblMIUSDDa6zycI03HHHmyxk+LePP6IQQpPc3iYLPWmnX07zrZP3/uIHf/+XP/gH
+        c5MFgz/5519+/PNfnH7+Qw5N+Po3WSurS2ulZUzm7lcwDKYQZnYFLy4urS4Xdzvj32zgkOBWcKFYXsze
+        d25mBd/TS/T9MtgR78EG0eBposE+d2kwuuGOWTH46dOnyO4B1xkJ2GHh9k4hYDJPXgwphG63y0hAkiRJ
+        KATsgxhlMZMAGMxICEqCMtxLSB7XTDLY644OeuhJt+f36mh0AYMpBGfwNHmVmOPYAzLKElewzzVXsMNc
+        wa7jDg5NiJdoH7TjPhq8tFRoN41uR4N97qnBwEwSDfaJBjMScg1+8uSJe/qmwHVGAorAJotCwGQuXgwo
+        hLwkrVaLQsDGgVGWvCQwmEIISoIysD+iEIKSuA0jhYCebPUSCsFM4gymEPZ2u4yymBWa1oC4gn1mZwX/
+        z5+/U1w2koet4GiwRzTYJxpMIcyQwdf/KENMZni0SSGgrYyEwk18lKEzmEIISgKDUQyFEJQEc8FZQiGg
+        J6XKCoVgNtYZTCGMDV656uck5n6U4enpKb6rB+7YjATMEHVQCJjM47d2KIROp8NIqNVquPNTCNitMMpi
+        JnEGUwhBSVAGiqEQQpOgLRQCepJ0jGmajXUGUwgwOGlctUJsGBlliZdon7wk5nTiPdgnGsxImBWDUcSw
+        UacQ7qnB1U633Dbm/qANNtt6Hw1GBoWjE+bN4IuLi/oUaZoyElAE2kohYDLnz/sUAk4dRgKStFotCgFb
+        GEZZ8pKYlYQmQWcphKAk7lU5CgE9SbvGNM0kzmAKAQaniTFuVojtG6MsD3QFA2cwhTBvKzga7BEN9jEN
+        Xlxc6ncPKIRoMCNhtgw+wY2kXOLQBNPg8tq6+f6jPIMxmaOO8V72NxiMSjqlTCXmzEtr1eenH1AIeQaj
+        ksqq8ePT12Lwu/v15/2NcraeMIOfPn2KbYIHXGckuLa6g0MTMJnXB4cajW66A4MpBPeeLAoBk3l5ZDwd
+        63aNQa1EizGfow13DsxKnMEUAio52DEevZmVYC7IQyGgFVd5XNg9PBk8/zVnMIcEVPK/P3n5qx+/fOcw
+        81XmNLHzMpPczCX66El7rbS8VPjyXP4KK/g4NU7M61+iG+ttsxIkyVvBSdWo8DZWMApwB4rhkIBKZvce
+        HA2e802WM7hV22qsJxyaEA1mJNyuwaPRCFV64NrNSHBtpRAwmYOzDsUl9fUm2uoODk1AHaiPQsBkznfq
+        FAK+KSMhrxL8XM9I6DR7Xg0OZzCFgEp6m0aFZiWYy9raGoWAnrij06txaILZWGcwhYBKNipFCqHVNSzD
+        qcMoy0K/31+eAp1iJLi2Uggv3h+20nWKSzaqDbSVQsC3LJVKFAImc7a9QSGgI4yEvEqw3BkJSaNrVuIM
+        phBQyVbdqNCspFwuY0YUAqz93T9++r0/uuhs1zg0wWxs5+I5iqEQUEm1ZCT/zk//g5FQrVYZZbmBS7R5
+        xYj34KtfonENQDEUAioxL9EwmJFwi/fgaDCFEGrw+K0XU0SDfaLBBru7u4UparUaI8G1lUJA0YyE9Uod
+        baUQ4C5KoRAwmce9DQoBNy1GQlAlrfqWWYkzmEJAJWnNqNCsxO0nKAQYXFk3kpiNxY3cTIJKKsXxG8c8
+        YDAjASc3oywL+/v76LhH0/o7fa6tFAJ2H4yEzVoLbaUQ8v52ISbzpL9JIVy/krQ1fk2NQnAGUwioZKfl
+        Vwh38f+xkYGjHJqAuXgjDhhc3zT+uqI5HVylzCSopL5u/GFEGMxIwKnDKMtcXaLPnm+vFQsUl0xfoheX
+        VwrFsjOYQwIqmb5El+qd0fNPYQPq0ctpvAf73KrBaOtm239iMW3wwec/+vgf/xPuXt3gatI32xoN9pkF
+        gx07H37n/hrsDuoJuQZf/WOUXFsphLb1qT6dZPzyAoXgbmYUAibzfN/4pmnIxyihrf09P8lud2RWgiQw
+        mEJAJaOu/5GcW8PHaCiFgCS4+VEIqEQ/Ruk1ZmNxYzaToJJ20/igJ1Sy//ZH+299SD3hBj5GybWVQrin
+        K9gZTCGgkquv4H6ttlUxHmPf9gpmJMRLtM+NGDxOsrNNIUSDfe6vwXmVzK7BjxaXugdvUwi3bbA7Xgwy
+        jkaDKYQwg09OTuCQUttMkIJCcJOhEHB7ZyQkzRRtpRBgGPZZFAIm87PvP/6Tjw7P+gmHJmAHx0jIqwRt
+        3RlmvhxspwOzEmcwheDOM3dwqFLp9E+CeoJKWm1jmuZ0Go1GtVqlEFBAq75BIeRVYiYZ//oorb5kebUc
+        dLaOs0xRLuauYPxoQSFgMjdyiW5OvXPvK6zgP/3W7h+86vbqX/4i1vpXWcHGhSpvBZs/a6GS4orx9j+z
+        klKphGIolOlLdGG1dAMGx3vw3V6iUUY0OEM02OfuDV5cWu70jymEaDAjIdfgg4MDXL6Vam0TKSgENxkK
+        AeOMJrSb49ew3MEhwbWVQsBkng6aFJfU2ztBlaCtvX6mGLCV7L6hEndwaAIq2UnGj3eU1s4RKnGHG0EB
+        rw83oqCSRnP8oMkDG1JGQq1WY5QFlTTWKxSC2ROU4RnhWNje3sYdXlkpjvdpFIJrK4WAzRujCeuVxqvz
+        T3/j2ffQVg4Jrq0UAiZzupXJA8q1dlAlaGsr9ZM0a503VDL87u81Hz/j0ARU0tkY73qUjfYAley9+qx3
+        /i038qzV+nx/9FfvPM+rpFwdv0ztgTsOIwE24MJGIaCS8mqBQjB74gymEO76Eu3aSiFgMtOX6OJ6K6gS
+        tHVGLtEvPxgVrKvr/N+D39DWGzd4sHXy4y/+BmXcvcFmT0A0OMM1DV5aXCqtVbut4YM2ePpxYaPVQQoK
+        wU2GQgh6XOjaSiFgMvq4sNFMusPT/tmroEpg8N0/Lrx6T8BNPS5kJDiDKYQZXcH13jFqcAeHhLxKZuce
+        fC8v0a/Szp0Z7LjtTdZquUohPESDP93dwde7g0PC/TUYP5xQCPfO4Orycqu4hjK+usHVleWdSuW3B/1o
+        sMcsGIwC3GEbfMVNFr7426MhslALt7HJciS94XQlwLWVQgjdZNWtP22HSuZ2k1VpbuOL3cGhS/DF83cP
+        no8V7HAGUyhq8NLyGravzcHTh2DwSs5nVXoGFzfau299evjrX8yDwQ5zF/1gDd7o7KEGd3BIiAb73DuD
+        Hff4En1+fo47vLKZpEhBcQm++Nt7I2ShFrChYCSk7fEHJ1AIzmAKAZN5cZBSXNLeHk1XAlxbKQQYPNj3
+        k/R7e2Yl2No0Jp8J7oFK9notiku6o7OgSsyegDT1ywPuwzspBFTSaRkVmpU4gymEuIJ9UMncbrIc0eBo
+        cIaHYHBxY/xWYgohGuxzTw0Gpjd3afBapfHdn/0CR5jBc/ZK1uuDQzf0Sha4/m9cgmu/koX/Nt5kUQnO
+        YAph3lZwM608Wny0IOvh6isYNbhjNlfwa8yeOIMplHiJfs33n7V/+M1eNNhnbgx2RIN9rmkwfP3GcPxD
+        fTTY42YMzttkuYND4ZuspDl+NzLFhJPP/vDjf/ovuIuDQxMwDXc87vsfQjA7jwvBbGyyxpg9cQZTCLkr
+        eGllbWn5y18DxBcHrWDgna2LhcLSWrH7/ifmJdpMElewuYLXaw1GgjOYQrmlSzTI60g02CPUYDN5NNgn
+        GpwhGnyXBu8lpaNO+WYMfvbsGf5BSdIe2kohPN7aem84oBDSNGWUpdvtMsoCgxkJZpJ098CsBLj5eMDg
+        0aH/TYc7hzCYQkiSBLsbCgFtPdxpUwh500Elrw8OBfYEOzJGl/zyz17+30/fRSXdtlGhmdxsCAhYwYs5
+        f142ruAfnRy/nbQ4NOGaK9hxMyv4gRjsDg5NeIPBm5Wr/u52XiXRYJ/bNrixnqyXMz9d5BkcOp05MRg8
+        kEv0vBk8/aftNjebw6MnFAK+HtsBCgH3fEZZcOowEpzBFIKZJN3Zh8EUgmsrheA2WRSXDLbtP23XarXc
+        27I8QqdjVhKUxG2yKAQYvJVctUJnMIVgrGBgnmhf1wp2B4cmuLZSCPO3gtdu4xINZsrgeu94vT3k0IQH
+        YnBeEnMcZfz8ww/++v13P9ruccgx+wZTCNFgRgLK+OJw/3yz0SpmPer1esjugToYCWhHsVikEKrVKqMs
+        G5M/b+DhDKYQzCSlyVvdKATXVgoBBjc7FYpLNjfGz7UohNXV1UKhQCGETsesJCgJuorFQyHkJTHH//U3
+        P8SdnEIYfxgpvsAjSRJGAlzHfCgE7FYYZcHegZHgDKYQzCTNrfGbVSkE11YKAQbvDP3Kt9PxZ3RQCO5Z
+        IYUQOh2zkqAk2AoxypKXxBxHGYN2Ao+oL4mXaJ/Q6ZiVBCW5qUv0SZKMP/nMIxrsETqd2TH4eWf8+zLU
+        r4kGe4ROZ3YMfm8rxX0HNnHIEQ32CJ3OTBmMf/I/jvvi4mL8S2hZUuuX4LAXwOaLQuh0OoyymEmcwRSC
+        maS9Pf7dXArBtZVCgMHDqV9RxEmNk5hCyPvtwrzpmEnyKgnqCTZNKJJCyEtijqOMT/b3kMdLNf8rGIzf
+        ezbFXK5geASDOeSIBnuETmemDEaAVZuZVzTYI3Q6M2JwuVRanCQpl8sZm74Wg93BoQlmkmmDk2Lx8eUz
+        HA5N6A1qe6fNh2zw6z+rs7y8nPku048LAVxnJGAyQY8Lu13/yR1wBrc6aTNJODTBTJLu+o8Lf+f4EA11
+        B4cmwFp3TD8uBGYl2NoEPS7Mm45XiSMvidnYvMeFeUnMcey8GGWZ6Uv0aqVuXqILhQLOUwohrmCDWTYY
+        mN5EgxkJ0WCfmzL43bRDIQQluV2DR6PR6hSom5GAFKiPQsAPXoyymEmcwRRCUBJsFAGFAIPTbSOPmQRt
+        KpVKFELodNAWCiEoCboKjymEvCTmOE5iM8nC7u4uFoQHfpZiJOCUR1MoBKRmlAV1MBIwQxhMIQQlwUwA
+        xQSk9eA/TDCTOGMohKBKcIqgLRRCUBKcrLggUQh5Scxx0xowV5fooCQ3conGKYK2UAhBSdDVeA/OEA1m
+        JESDfR6Kwf1+f3ypzmLeKmb5HuwISjJn9+BqtWomWdjb23P9UmADIwEdQWoKAUUzymImcQZTCHlJms0m
+        IwEdwalGIQQlQQbYQyEEJUFb0RYKIagnWNZBScxx0xoQL9E+QdOJ92CfaDAjYd4Mrnb8PyoP8pJEg6cx
+        x3MNnv4YJdCxPu2nNnmbC4XQDvnIINw/4DGFkJckTVNGgntOQiEEJUEZKIZCCJoOkqAtFEJQEnQ1KIk5
+        3mr5H0LluOsVjEWDpUMh5CUZlzhFXMGMhNwVfHJyMpji9PSUkTAajQ4PDymE4+NjRlnykhwcHFAIQUmw
+        89/f36cQgpIgA/JQCEFJMBfMiEIISoKuDodDCiEviTl+dHRkJBkM/h8boFPhTFWi6AAAAABJRU5ErkJg
+        gg==
+</value>
+  </data>
+  <data name="cbPieMultiRingRev.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAKAAAACWCAYAAABZ7IOdAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMK0KCsAAADQRSURBVHhe7Z1n
+        WFTZuufn65xzZ+7MfW6aO3PD3Gfuc+/t00E7ne4+nU93e+w2kSXnJDmIJMmCERVElCAgIAgGggEk5yiK
+        EgREkJyxtbXPt//stcsqqqi3qF1FQWG3H36P3YLUXmv9WO+71l7hvzx58gSveY22eC3ga7TKawFfo1Ve
+        C/garfJawGUsLC5iaHwSPUMjaOntx/nKBlQUZ+FhwTF0nXVG53Fj3I7cgtvh3yCpKB8R9d08F+8/wv2u
+        Njy7ew3P7hThaXc55iZGMDw+i7n5RfKzXvMrF3Bubh6D/UOoLGlAbnoRfN2O4Jvwk3jT5wB+5x2FNzj+
+        0ysS3g5/Qo3pf5XDJ/E4dAtbJFzOjsafk3ZIKIkLhE5kJZzjGxBwrhUn0mswcOUyJu50YPbxY/KZfm38
+        qgRc5Hq3x6MDqGq6jJiYcNjp+UP/qz3Q+dxJxBdO+J17BC+dNM5OuwQJeC0rXEbAzGPR2BleIcHfMwHV
+        u7ajWncnavR1cHt/EBamp9HRfw2DY5yU85Pkc/+S+VUI2N3fjoKyswiNN4Jj6IewC34Xlnu+XhJPivcc
+        9ssJaLbHVJCA5ZlBMgIeO5IgI+Axx3CRgC9p2+uDiZkhJJcZI6XcFOmV1ii9HYve4TrMzE2QZfml8YsV
+        kPV20+Nj/H+n5ofy0kljG/ABdL90lBPwD6b75ATc7uqIatPfKBWwKcNXRkC36DwZAS+a2skI2J97AXcf
+        lvACLie90galHbHoetCGmak5ufL9UvjFCTjJ5VZNl/KRZGWBNGdHPOFEvNfbBMcQUc8njeF2MzkBv9L3
+        kRPwK3dPQQL2pDlJ5HuRtAumkdcl8umHluC6obFEvhouDI/fbkdl5xlSQDEH98cidm8+irMa8XhwgvvF
+        osv9qvKLEHBxYQH97W3ICwxA9OefYv87b/FE/eFjTshhzM5NIzB2l5yApqa75ATc8r2HnICfePihyvS3
+        SgWcSDWXCDhzxghGkSUSAc2DrqJSZ6dEwDrT3ZgdfYyL9T6keIwzhTYId0xHmN15ngN7snHhVAW6Owax
+        sPDLGFm/0gLOz87iblkZkm2sEfb+uxLxpGnMu8h/b3bRETkBLV3k88Bt37riDU9ZAT/0CMAts79UKuCT
+        ZH2JgA9PW0MnvFwioIfvOYl8jLZ9vhifHkRKmQkpH+N4QoBEPmnCHTKRHH0d99ofYp7r4ZfXy6vEKykg
+        E6+9uAjx+roI2fwOKZ6YVDtbPgx397XJhWFbf/k8cNcXznhz2Uh4k+d+FFv8zYoC6hc24zkXdsUCdp5y
+        ksjHiHI5JCPgwMVcdD4sJcXjuWWCKK8zpIBiPEIL4FNxF52jU1gk6ulV4JUSkIXarpoanDI0QMimt0nh
+        lsPC8MTQEObmZ8gwbLjNXEZAxruOITICvukVjkuW/7CigGYFtfgpWVci4K2T+2QETLPykMhXo7cL41zK
+        UNmZSMvHkXDRGWH2GaR4jBCuF9TPqMEPlxqhe7UZR5t6MDg1S9bbRuaVEfBRZycy3d0Q9sF7pGgr0ZCb
+        y/+MC8VH5QQ0IfLAT8z8ZQRk5Fr+44oC2l0pw4tkHYmAmbFLc4A6YWUoMjKVCCjJ/+q8SPkYRw9FkuKJ
+        cQ0r4OWTZjf3HAXdQ69UWN7wAs5MTuLG8VhEfPQhKZcQUmxt+J/V098Oh5APZASk8sAvDXzlBEyx/o8V
+        BfS4cg0/J+2UCHjiSLxEQJP9xSjX1ZUI2O7vh7Hph/zcHyVf0k1zROw5R4rHCHHMgm5mrZyAjO2XG+FX
+        0cmF5VdjUnvjCsj9FrNwe2LndlIqVYj65CM+DM/PzyHouK6MgLb+H8rlgVt+kB8JH7T7aEUB/S9dkcjH
+        8I7JkQjosC+HE2+HRMCBvFzcG7xFyseIT/MmxRPjElFIyidN+oUTeNaQwdXjAl2/G4QNKeDUxASuRIQr
+        HNmqDJcvVmek8z8791qsjIAMwx8sZATc9h0bCcsORPwcvltRwND8XIl8rCc0ibwhEXC/+wmJfHz+19aK
+        yruK87+DwbGkeIz9TlnQuVBHSifGJfcqfkrcip8T/4TnhQF4MjksV8cbhQ0nYHf/MHa7HYXvBx/TMqlJ
+        wm5D/uc/eHgHDvvflxFweR6480v5kbCL044VBTyQlykRcP6MAXZLzQGetA+WCCjO/3LrPEj5zhTYINxB
+        8eBjT1QRKZ2YXfl16E22xM+nv5PwIlUPPw60yNX1RmBDCVhc0YaPdofhHZ0gfPX9HgRt3kTKpA7h3OBl
+        5MEDLCzMY/8JfRkBqTxwk3OojIA2e4xWFPD4xRSJgI8SLWXmAK/utpQI2B7oj7GpAYX53/FTgaR4jGDn
+        bOzKWbn3yzgfIyOfRMLknXjWyELyxhqgbAgBZ2bnceDMVbxvEMLLJ8boKwNSJnWpSE7iPy/vRpyMgLb7
+        5PPAj80DZATUdbFdUcDknFMSAaXnAA1DbqBE30AiIMv/7j8qJ+Xj5/68Fc/9OR68RkonxiP3Ehd6/0QK
+        yMN97aeKk3gyNy3XBtpC6wKOjE3CM/q8jHhi3t0VANePviRlUod4Az2+B+h/dE8uDBssywO/NNgrke8N
+        ryh86+6Fmxb/ghLzf8E1y7c43ob3iQgYZefwJGeEY+7MNrzgBKyI85UIaB14CVU6ogGIOP+ruJtACpiQ
+        swdh9rR8wXuysTOnnhSPoZNfi/4kM1o8KX4qCt5QAxOtCtg3OAJdLkGn5BPzyXYvBLyrmcEIG9QMd3dj
+        kWuA0DgjGQFNTHdC9wtnGP3RA1Y/BMLB5DDs3M7C2zUNIXsyEbXnAv8uVgT77wtw32cg9TPegz33J8M1
+        5GNYhhjCNMQVLv4+yDPdgjK9bag1McTM6DAu1LqSAh6JOUDKx7A7eoMUT0xuRgQpnDTPc53wZHoMU9Oz
+        yLhajbl57YuoNQHZYON7xyOkdMvZ9p0VJ5CwNx/KKEs8zX/+ldLTvDROQZ/D088E+1xDEeaQzom2JJgy
+        ZAVcGYegd3HsuAW67vXAd58dYs5a4HTx0nvgpJtmiHBOI+ULcr2AHbmKez+fnIt4fnqF0MvxItsGT6ZG
+        +EUM+0/mYZNuMELjL3ESzsu1zXqiFQF7OPm2OgiTj7FJJxC2n31PCqUqcXo6/FrBoeGHCPM8zgmXRcol
+        BFUEZJy/Go3iS+WSMK/3lROc7O0QedISsad9SPkY1sdLSPEY+vnVeJRkTEon5kXyLn4UzPa7nMoqwWa9
+        YFG9chIGn7iI6RntrTdcdwGZfEJ7Pmne3+kH3w8+IqUSSujvN+GI1R8xMT7EPwtb2kSJJRTVBHwPjbdv
+        4kBAgkyuuSTjHtjvCMM+80QZ+QLcc7Ajr4GUb9ulBhSkBZPSiWHyPe2t4cube60e7+rtl6tb070JfC4u
+        3U7rxboK2NU3hK1qyCfm663Oqk/NbHobUds/wsmIbUi9boG0Sht0D4kapLWmhxRLKKoI6Br5GR4NPYTV
+        zr2kgGJ0P3eG6Za98DGNQ6hdBqxOKu79Ai9krRx6E7fgWUsOX9ba1i58ahpJ1ivDwDMOI+NTMu21Hqyb
+        gLx8KoRdRez+Uo8WbRkh776NaIM/IDHJAGnlVpx41hJKO47zzzQ5PoMj3nmkXEJQRcCIBFPcu9PD93SU
+        eBS7t3Cj6cN5+CFfvgc0yq/AyFkjWjwGJ99PVfH8qL/9Xj8+M48i61MaNhsxO7e+OeG6CNj/aFStsEux
+        eVcA3H7/BSkdI2Tz24gx+hRnM42QVrEknTRZNc6YmRvnny1nFWFYFQEzrkThmlT+JxhuZL7LJBTbE5fm
+        ALdzofdG2j5avJf8VMH9knGjfRZalc00iNmkG8TnhPPrODpecwHZkH+3zymywOryBzY1s3nZ1MymtxC1
+        7SOcPqOvUDxpuoaq+Odrq1U/DAsX8D00dZQgat8pWjIhfLkHOzmRtmVXI/RC+oqh93muM57Mz2BsYhoW
+        /olkHSqCScheCrCB2vK2XAvWVEDWne89ks2NYunCroYd31pI5Av7aDPiorbjXJlsqF2Jko5Y/hn5MOyl
+        XhgWKqBb5Od8/me5w5eWSxW+90ZJiBleEOLx8uU48NMtbI7PNTKdrDtlsNHxuXP5cu25FqypgJcvFWAz
+        9xtFFVIT2H26lQu3nyH5iikp2UrIhOEE9cKwUAEjT5vhXke37Cb4VaD3hRMS7UzxJG5ZL5i8Ez+OD/DT
+        LXGZN/nejKq3lWBTXgZfGyHsg/dxr7JSrk01zZoJ+ONQJ56d3YGEvTZ4Xy+QLOxqeM8gEL4n9sgNMFTh
+        /qMK/lnbantJwZQhVMC0y5G4drmClGk1eOy0xdDhbSL5knbgaU81X55zlyslc32q8O4uf5n51tgfvsf4
+        o0cy7app1kbA6VE8z7bjK4aFivIII3y1ex9ZaHX4wsofMRccSalUoeT2Mf55p7gwfNjzIinZSggVsPnO
+        LUT6xZMSrRaLbx3QGqaLp/dL+bKw6ZZ39eXn+pTx0Q4f8r37eTcXLKzh2xLNC8iNvH4qOyobGjgGj22H
+        kZU3WXhV2OHhh9M3bEmhVCW9yhaTs6LFmuqMhoUI6BbF8r9BWG7XQP5HoMuF47gDqXy9s+mWLyyUT7cs
+        58vvXeD3Pr3lgW3+unU6Qb6dNYTGBXzaU4Wfz3wvJyBjIX4rglyc1MoL2UDGNNgbKWU2pEzq0t5fyD93
+        uxphWIiAkQlc/nenB/pfu5ACrZaDwWcwOzuHxxNT+KPjIbLuVmLHt5YI3LyZlE8M24/TXVcn19aaQKMC
+        /siNvl5kWpHySXMhyFylvJAl03YHPHFOwPSKqhS1RvLPPjUxg0MeqoVhIQKeuxS+Jvkfw808DFOT05ic
+        mYV1QgbecI/AO0bCwu/mXYEw+VKXE0zYIo94fT0szGn+nbHmBORGXj+Vx5LCUbTG6OE7471k5UjD5HM8
+        6EHKowlYGJ6aHeHLoGoYFiJgy90yROyNIwVaDQ6GQRjoG8LcwgKcky4srV3kJNxkLLuwdznsvbrjJ9+Q
+        oimCD8UvVxJpEo0J+OPgbfzMNsIQsili7MQPsLHzICuJweSzj147+cSIw/Dt+gekaIpQJiDL/4a4/M9i
+        uw8pkbqYbPVEb9cAf1BR9KUbEvkkEnpEKpTw020e8P7wD6RkymCb/Ie7u+TafjVoRsD5GX6xIyWZMp4l
+        bEG0pz3eJfJCmwhPUhhNU9QawZdjamJWpTCsTED2/vd+Z69G8z+jb934E12ZfMmlNXjTR3SKKyXh8nC8
+        5U/28m+QVCTdxVmjo2KNCPi0o4CTaYucXKpQFGqMTwwCJJWlv9cXqeW0MJomo8qOGw2LjszNPV1Jykah
+        TMCU/FCN5n9M5OtXRZPDhc0d/FHClHxi3nDjwrFhMD+5rP+1EYKVnKMjhIAvN6Gx4ZpM+6+G1Qs4Ny1o
+        4CGE3iM7sdPMB985+iGpVLOjXWW09V3ly9PRIDwMKxOw9W65xvI/tl3g9NFM/h1tc08/Pgk+Skq3nDdd
+        I2D55U5SJlUI/P3bcLfYDPug9xASZ4D5ec2cQ7NqAZ81ppMyqcvY6W1IKl5f+RiFLSwML3KjylnBk9Ir
+        Ccjyv+HhRxqZ/2PyHQ1LxvzcPO4NDuPT/cdI2RTxrZkTgjep1/sFv/cWvPU3wT5gqWz2+99HTYsob14t
+        qxNwcpjfb0qJpA4vEregrNCYFGSt4cPwjGhS+mJiFSncclYSMPyUMbpY/vfV6vO/vQ4xmJudw+jUNPSP
+        JpOSKcN0G5tyoSUj2fQW9n7/Dhx96fIFn9DD3NyMvBMqsioBn9WeJUVSl/s5uqQc60Vb3xW+XHea+kjh
+        lrOSgKn5YSjOV2P93zL2mITg8fCoaK7vVAYplxDecg+D2+fCtrj6f/0O9rjS5RJjv/89VDZdlnNCVdQX
+        kM/9ZI+AWA0zKT/gfIX6Cws0QWFLOBbFYVjAEq2VBGzrrES470lSKqE4GAbiYd8jfnVLYNZVUixV+MBp
+        HwLfU/zWI/CTt+FmK8rzqDItJ/iELmZX2QuqLeDTjkJSJHVgofdmsQkpxXqSUWXPX5vAynfxjPIwrEhA
+        TeR/u79zR2NNOy9f/PUKhdMtqqKjby4nXtAHb8HLmBMvUL4sK8F6QbbRarkbqqCegAtz/D5TSiZ16M3W
+        IYXQBq0qhGFFAobF736Z/6m3/o/N9ZUUiZZWsavClE23qAILxR6ffsaLF/zuW/DduQmOfvJlEErsuT2r
+        Wj2tloBTg/dEx38RMqnKk7NbcaHMkpRBGxS2hPFheJoLw8o2LCkSkL3/LcorI+VSBhvxZiWLpoTq7vfi
+        nb3RpEir4XMbD+z9bhOcPeWfXVWcwz7C4HCPnCNCUUvAxNZeOOUWojgtANNndEixhNKWp0+KoC3OVztw
+        YVi0CDNPSRhWJKC6+R+TLzYiBQsLC7jdPyh4rk8ddPx3kM+uDjnFonWV6qCygBNz8zAoaJbs0DLIr8KR
+        rER0JtvimYq94mLSVmRqeeBBIR4N323uJ8UTQwnI9n8MPx5Ua/9HuG8c5mbn+aVVX4WdIMXRFO/5+ME2
+        WPa4YnXxOPAVpqZF2xtURWUBb/WPSOSThu3Sd7pYyO/UZ73iCwGv5hovG5ICaBt+NLy4gOmpWZzwv0LK
+        x6AEZIcedd97AL0vVcv/nI33Y/TxONf7zsBqFdMtqrArYKfc86uCbeD7sHL7AsZGBii7LtrsryoqCxhZ
+        10UKKI1efjUOZCfjToq9wl7xx7N/QuYq9nOsJeerHTExPciXt+h8AykfgxIw7XIECi/eIiVThL1+APp7
+        BzG/sAiX5BxSlrXgXZ99XC8oe0ydUoLeg7XXpzAx0YH+dzaSMsQEqrdUSyUBx7nwYFTYQkpHsY3DkesV
+        c9MjMHlWV6ZXvJurRzb+RkH8brj37hCiXXIEC9jaWaHS+1/Db9zQUn+Hv2jm9I1KUpS1RC/gB7kyyMFJ
+        Z+P7MUwttsNgqxV/re3ycpj/4I2pCdUPvlRJwIqBUVI0IbADFCOyU9Ga4oSnid8jv5Sd00I3/kZAHIZn
+        Z+ZxMoAOw8sFZOe/DD9+COtdfnINRGHwR1fcLBBtkM+satTodItQPvZ1556dnni23fd7mNls5S/zYXtP
+        qDKIYV+vLW+Wc0YZKgmY2N5HyqUq7lfPk42+kcjkwjC7y42VuzizkRAwmxPQCHb7l67/CjlpgJ57fVz+
+        50w2kjS63PcUcKGa/fymnn685bv+8jHe8AqHWdDnS9IFvA8Lx+9gtMsYOsR1titxJjZbxhchCBaQLYDc
+        U9pBCqUqYSUHyUbfaLT3F/Bl7+J+8SJNDiB8uzPCvtJB6Cd/RMgHH8PC+Rh0wgugF5YJw7DjSCm8gvrL
+        N+DwtR10iQaS5hg/3bKIOwOP8FlILCnHevGtnwV/UPtufUPofu1APq8Q7A0CVL7FU7CAD7kR4Y7LTaRQ
+        qrDjch2SKla/p3c9KGgOx8LiPH/JTeTHv5d7hWXuFCc5C5rR2jOGrviT/HnQV3foIOw7cxgt70W4UBUT
+        dFqyk+3r8JOkFOvJ226h/CFIMs+pJt1cBKD8UYRgAcsUTL+oikPRBbKxNxJnS2zhddIV39j7o6blPr/h
+        6pyD3YoCGh+sxvjkDFrcXSUn4jNu7NiFwG8t+eM0WAO5W4ZjemoGEzOzsEk4TwqhDbZ+7yEnkzqwGQDK
+        H0UIFjC1Y4AUSlXCbsaQjb4ROFdhA/9EF3xiurQ1ICBWdNFha2HBigJ6nWnCzMOHqNZdupRamtQfjOC+
+        OxCDA8OYmZuH45lsUgRt8ZnJPlIoVUk8liXnzkoIEnCBy/88y+6QQqnC9sv1OFXuTja+tjlz0xY63r4S
+        8cR8YxODyelZTI6M8HfOKRIw9WY3hm5cJ+Vj1JsZY3qA7WRbRGTeNVICbcIu5tFEGHazCCMdUoQgAWe5
+        xNLmejsplSrsvnqTbHxtE19kjz/a0WfXbNYNRkVjJx+G052dFArY2s3lf6fiSPlqjfQxUlvL12Xp7TK8
+        s1czS6s0zfZvXEmpVMF8mw+fYix3SBGCBOwZnyaFUhXX4jRSAG2ScN0OX9n4k/KJ8Ttyga+HtqJCUsDd
+        MdUY4/M/F1K+4TJRXjQ4dgep5WZwS3XFmz60BNrkm13epFRCseDks9PzR29Xv4w/KyFIwI6RSVIoVdlo
+        +R87Z2aLkx8pnTR/tI7BBPdbPTU6iqhPP5ET0PtsM5f/DaD65Y1IErj/78vM4OtwZPIBsmr2SO4FcU52
+        wxuEBNrkD6b+pFjLMfmTJy9adGACjkelovpWE9qbOjHDpSrzKu4ZFiSgJgYgbLFCbJkfKYK2cDroTgq3
+        HBaGyxvu8mE4w81FTsC0kh48Wp7/cfLdPx6LxYUFfs9xdo2LRD7G2Vsm2Botex+dtnnPfr+saFs9YaPj
+        hxCv4zgWnsy/tWnl6mFyYhpzxGHms5x8j8Ym+M1Ty7+mCEECJrX3k1Kpws7LNUiusCdF0AbHLjtgsx4t
+        HIXvYdEsf/u1YjkBW7pH0X36lIyAdyLCsMg1yNzCDG60H5KRT8zxYgts3hdOyrCefBhwGJ/tj4XdqQwc
+        Dk3CjauVaKnvwMT4FGaJS2yYaMPjk2jpHcDlhjYcuVrCTyl9FxWPTX4xsE8UPhJWKiB7SR5d301KpQoG
+        V26RImgL40DVzir82joa45PTmB4fw4GXYZgJaBhdhbGJWbRwPaNYvmZXZ8yNjWF+YRY32w+T8omxTpC/
+        nX0tYOGeifYpJ5rt6Ux4peXjEidP5d1ujHE91vQsLRqbLGeiFTTdxsHLN2HH/Vs2ef7uvoMK96n86cAp
+        uZ+lCKUCznNhx6PsDnYXtvDsuqLe2xDbwjxSBG0QV2ivUu/HYEfeltZ18GE4y9NDIiCf/w0s5X9Nzg6Y
+        5Y+1XUTNvRRSOmlOXjfH276yl2OvFiYH27zOeiXPc3l8L1XWcZ8PjVOEaIvzXO42MYzpvnY0NFbj4JWb
+        cDqbzS+Kfd//EH7nrdqo/ZuIOMH7RASF4Jn5BUzNcXB/PpiYQe3gGKofisjqHER4bRfCau8jlMP6ehsM
+        OVF5Clokr+820gjY7ZgbKZky9r4Mw/erKvkbmJiA6aU9GLp5g5evdrcBpnq6ue9h73hv8CNeSrrl6B/z
+        JRtSGUy03wcegfHxVP6ItvSKetxsu8vnYWwf8fJ25EWbHMHUgzaM1F9C38UI3D2ijxa/91Bv93eotfxL
+        eDhtIz9LFd7ghO0dFh15pwxBAqrC3MIiJjlZJ3jmcXd0il/G1fKom3uoOjT25PBnMzNucuTUefAn1otJ
+        r1zbYznYIZdb9yg/l5Dia6toLtxOYW56Goe/+ZoXsOk+l/8lJqDWUE8y3cIOPxcqH8Mv05FsSDGb/Q7y
+        4ZMX7ewFZFQ24HrrHQyOjWN8Wn7ObXF+DgvT45xo7RhtLEBfTgg6Y3ej2ecd1Dv8L9Ra/De5y7fFRNt9
+        TD6DqrDza5Y/F4XyHJDrSge6H6O/axjjI1OY58QSs5rteGJYnjQzP8HlG5OYmZvgKrUD3UPV6Bmu5Rvy
+        1p04Lok/zMl6BNe5ZD671oVfKpVZ7cT/ye5+o0RTRFKpLX/CPiWYMlgYvllzm3/u/OAg2LjGY5Tlf+4u
+        eMQNTtjfj0718c9FiaaIE9fM+XnBTXtj8EHAIew+ngJHLgRmVNajqLkDD0fH+TxNut4YvGgzk5ju78BY
+        yzX05Ybh3klztPhuQoPj/0GN+V+Qkq3Eaes3SaFUpfXBgNzzUijPAbmwe8L/Mn9zY7TLBcTuvcRz3O8S
+        Ug/d4JesM65lN6Kj8YFIVo7BB6P81sYF7t+zn8H+ZPkT9RmqMLfAJcxz47ys03Nj6Btp5kXtGqrkw97N
+        20dxrS2Gk/UgilqjeFHZTjcGO//lZIE9KZdQxKPh+1VVCAtP5ef/uuJO8GUbmx6Qm25ZTkqZCdcLW/A9
+        P1v0yvLEzsFbXI/Whv6RMYxyA53lZV5cmMfi3DRmBrsw3l6CgatHcf+UDVr2bkaD8z+jxuy3pEzqkG35
+        L6RQqpJf3ypXDgphAu4TCagqhzxyeXkZBb5H0BHkjwepKehNSUJfRjoGC65iqus+Ju/dw/SDB/zIkU1d
+        8CxoQthFvmednuV+GThZx6YGUNtRgcScW4g7fwPOYedg7JvA36W20yUW7xuE4D39/fw1B4ru2WBheHSc
+        iwQzM2iobsHs8DAnxxzfk19pCpYRjYXh81UOKGgOxa2Ok/wvyIPHDfyRwOz75Z53kYsqXJ42M9SN8Y5y
+        DFw5jK4zTmgL+gMaXf6Vz9EoaTTJVYu/x5teqx8UnSwuly8fgXIBuVAby/V2lGCqcNHcF/Vckr4ixoZo
+        dXdFq5sL2n28cDcqnBf1QVoqBnKy+WR/ureXk7aL6w0eYmGWy3+YpGKI5xcKSyeYWL0PH+P+g0doutOL
+        i9cbcDa3DPFZJYhJKoB14Fn+WlN2F4f0v2VrBllPxgQsvxOP2/1FnGiN/AQ067Glv1cM+zwWIYb6x9Be
+        14uG8yloC/4UTW7/hlpzxTnaWlNi9j/xltfq5yZjLt8gy70cpQKODk8i3CGTlEoVLpt70tKtgiYbS7R7
+        e6LN0x23/f1w/+hh9GdnoT/zPB5eyscIN1qd7u8T9a6PH4t6VaKMq2V+YYaH+hqDifZ4cBwt1d24dakV
+        WSfLcGp/AWLcciT1k2TtQAqx3lSb/gZvaKAHDM0tIutiOUoFfNQ3KiOSuhSYuZISrSfNDnboj/bgb5N8
+        XrAPz5rOc2TiWXMWnnaX48fxfv6utR/HH+LJrOo3iM9Mz+Hxowncax1ARUE7Mk/cQmJYEb9/hKoTaU5Z
+        e5NCaANNCBiSoyEBB3pGyApTlSKzPaQU602P+y6Z/cmKYFfdP7/ogud5HPlueFZxAs9aLvD8OCa77Hxx
+        YREF6XX8WTJU2YVwytqHlEEbvO4B15BuN2ECKoKJye7CY3XD1kmyxbrieop0yiLLLoTT1h6kDNpAEwJG
+        5V+X8UgRSgVkuQtVYapyxdyDFGK9ueOgR4ollOeFAZK6qXo4ipI+0en6jMqi22TZhZBqbUXKsN5Umf4W
+        v9tIArLVEIe9LpKVpgp55j6kEOtNk5k+XiTQcilnC57eEx3IyBZpxDR0w6y4FYNToikVNmOQHH2dLL8y
+        8iy/IoVYb4rN/1ojo2B2gY60R4pQKiCbBzyu5jygNBcs9pFCrDcNJgZYPKbe2YYvUnQk4Xd8bh6mnHzs
+        PTc7L4edZMr+nkUMdXLBEvN/IoVYb3It/5FfOUNJpQqnrovuYlaGIAHFb0JWQ6plBCmENhgJ3k4Kpozn
+        V/0k9cLCr3ilD0M6FDeW30e4vfCpq6O2MVzja+5txmpItf53LgSvvgesuCPsSq916wFPWx8iZdAG6uaB
+        z1pFWzTF4VdaQBaKH70MxQvzi/xcH1UPFBlWhqQM2oDlgKVm/wMXuZ7wuO1mBNp/DRennTBwscJ3bq74
+        zN0Hmz33k9JJo7HFCOyoBTZpSlWcKhy1TSBl0AYNxgZYOKJiGE7azs8Rsjrhw2+RKPxK41V+l18/yb5n
+        ZGhSUCiOtEtGufnfkTJoBbPf0H//kkqzv+DShb/CNS5XTLf+Nxyw+wS+Dltg42yI7a6O+NrdEx95+ON2
+        30MZjxShVEBGUWYDWXmqEGV3jmt8QzkZtMV9F9WOFn6e58q/q2X1sTz8imHH0WXeXar4lqoupW+R0qxN
+        yYZ+NfkN/yalwvrvMD0mum1AGYIEZCtdqMpThQi7dJSbWJIyaAWuF5yJoW92p3jWksPXhbItCrpXm9H7
+        8pw8NkGdHVdO1gfjkG0s16P8FdGQWkRJDyiEJo//5Mov7N28IAFrb94lK1BVNspktJh2G338FCfglk8W
+        fsdEOQ0LvyZE+JWGnSLBFuay7x97PIVjvvlydRFhl4pii7fIBnzVYat3pP1ZCUECPnygmddx6ZahpAja
+        5L6rrtJ5wed5bpLwy7YhUNJJw0Jxxp2lUNx1+yEiHZfekoTbpSHXagvZeNpl9b0foyfVQ1J2ZQgScJRL
+        qFfzmklMnM1xUgJt88BbZ0UJnzaLTkZQZYegHheKu8ZehuLFJyhIr+frIILLhbOttpENp3U0EH4ZfTmh
+        Mv6shCAB2Ug4LvCKnFBCCHfIQKRrCg6FHUF84l7UmdESaJsurid8Hk+E46QdksUHbI+LsZLwK41LaQe/
+        kYv925mpWSTsy0Ch5btko/2SmLgjbBKaIUjAJ9xvcE5CBSmYHPYZiHBJ5YQ7ihOnA3D6kgOSSk0lK4VL
+        fTfOSHg57TZ6mImWHZiIRr+iUwBqBpWH3+UktD7ge07270earml1salyVt8D1jv8A+anxmT9WQFhAnKU
+        XmpVLJzzORwMOYYTCYE4neckI9xyLsXvJht/o8DmCB947pLME7K1gqz8TKIDamzQ181vQlPvywbh8sj7
+        p+3JhvulwLZ4SnujDMECsl1xYunCndJwMDgWx+OCkXDReUXhlpNeYEw2/IaDE7Fzjz4WBu7y5Wfhl23M
+        pySj2JbXiF3JdTA8XAPPM80Ynxb1ovPjQ2jy+A+y8bTL+g9AGIIFnJqcQcLpgzh1wUUl4eS4ZYxyt40b
+        hqVpdd3Dbzhi5a/rHcWOrAZSNgmcdDvPN0A3gRPvUA0Mo6slnL3WzQ9G2M9iWyhr1dgyuaZoaADyuEq1
+        k/IFC8gmFktuH6WlUpFLcRs7DIvpObN0+098wX2RTAdroH+8BrrxtRL04mphcIwTLmZJuOUYcV+r6ni5
+        YIELxd1Je8gG1Aoakq/e7u8xNyJsP7AYFQR8gtv9haRQqnLuujFqN+hoWIKxISY7ReF3Zm4BzvGNpFiq
+        YHu8HiMTL9cOTo2i2ftNsiHXHQ0J2B7yhYwvQlBJQLbNMEWFIydW4nqIEd3wG4RWt6Xw2/FgnO/BKKlU
+        JTrnjmTt4MS9GtTZ/g3ZmOtFoc2/wSfoOM7t2YJKs/9Ofo9QBq4ckfFFCCoJyChoDiGFUpWsCxt7MCId
+        fln+RsmkDkzk0talF/XsgCCqMdeH3yDML0jybNYRV3Hc0wrXrf6R+N6VqbX475h52Ckpl1BUFrC9r4AU
+        SlVSOEp9NuhgZFn4dYpbffiVxvpYHYbGRKF4cW4G7fs/Jxt1rblu9c8wPlAm93zGB8qxf18I8uw3k/+O
+        oi3oExlPhKKygJMzw1wYXsUoWIrs7I3ZC/Lhd140bXKbC7/sEPLljbRaIrJuS0LxZE8T6m3/lmzYtSTK
+        14d8NjFG0ZXYE3IOKS7fo9x85VU7D4tOyHgiFJUFZLCTqiihVGWj9oJrFX6lYaG4uFF0GSKDnQNDNexa
+        UWTz/2By4Bb5bBSWkUU46mWPYut/lftZ7O3H3Ijwk/GlUUvA7qEqUih1yMrhekFjWgStwMLv3Tt8OWdm
+        F+AY10A2iCawOFKLewOiExjYCVjtoV/KNe5aUG36WwQERJPPpAwWsv0DYpDj8CGqzERzmXePGcn4oQpq
+        CchOnGJHnVFCqUNx5MYZEcuHX9kJZU2zN7mFq0/RggV2RC7rTZYLo2ku2r+P3Vx4pZ5HKEbRVXAMy8JZ
+        Nx08bhBd7q0OagnIqOvKIGVSh7RiE9RY0UKsNz2JCZIyJl1fm/C7nMyyB5LPHCpLRY352u2QY7mcEycO
+        9RzqsC+lVeUrWqVRW8DHE90aG4wwNsQiBS78TnSITkBdi9GvIsy5UHy3f4L/XHaC190jeqQ8muCwtxP5
+        DOrAokNdp7CzoBWhtoAMds4zJZOqZGUaocxyJ+oM9Wgx1gnpd7/rEX6l2ZvcykvPPnt2+MGahOJ8u3fI
+        aRd12cv1fnPz6vd+jFUJODR+f1W9YOp1YxSE6aFKV3S/Ro3uTtQb6ZNyrAfdCUv3WyTfWJ/wK03GrV7J
+        5w9XZGg0FN+y+FvYh+eQn6sO7Jez+s7SZnx1WZWAbIGCsotYFJGdwfV6FvJ369bo7yLlWA/YgZasXJp6
+        96sqLBS3947zz8BGxexke0omVWGj1UD/SPIz1UUTvR9jlQKyXvCeSr1g6g1jFIYs9XoUtQa6pCBrSZOd
+        NRampvgydfRNrGv4lcY1oQmTM6JR+OzjPtFp94RUqnDJ7kuYHCgnP08dWN3U3F1978dYtYCiXlDAxPSt
+        l70el+tR0smgswN1RuubD947fFBSpsu1A2TFrxcJhfclawdHG6/y71kpsYRQa/p/ucGVPnLtvWERWUJ+
+        nqrsS23F/CpGvtJoQEDR6zl2wQwpHgfL9YqC9DixCNkUsc4SPq4QnerOKtY/tY2s+PWC9TAt3UvL+LvO
+        qrd2sNbsf3PyLdXhNSsH7Am9Qn6mUMwPL43YNYFGBGS09OZzspnIyZedZoRycwG9HgE/KJGSZK1osrXC
+        /ISoUvsfT8P4oHbCrzQuUqF4buwRmr1UWztYa/p3qDeRr79KUzP4B6STnymEo/mdkt5ZE2hMQHbvxcU6
+        L4l4rNcrDFax1yOo0Vv7Qcm9g9GSclyt0274lYatwhbvqBttKRZ8T4gi+cTUmuzGUa9j/NsM6nMV4XCy
+        AWNT8pcdrgaNCcjoH2nhL2fJSTZEual6vR5Fjd7aTs8Ml5byz89Wp2g7/ErDQjG7i46vX+7ZulPcSOGk
+        USafNKnOwTCNEjYvyBZP1Gpo4CGNRgVkl6+05p0kJVotLBzXrYGE7K4RdkMTe/4BLvzu3gDhVxq7E/V4
+        LF7GPzmCZp+3SfEYtab/xMmn2gxCgbUz7MKLyc+WJlxq+Zgm0aiAjLmRETQ52pESrZo1GJh0xhyQPPsV
+        LY9+FRF1oUPS+ON3ylFn89eEfP/OlUe9X9Ayc0t4B2WTn82wia3H0Ljol0DTaFxAxmhTI2q53oqUaLVw
+        EtYa6JAVqQ7DJS8PHecSa//UVrIBtA0LxdJrB/vzoqQ2Ev0F6kw/XPWStlpjI0T5JpCf3ShOA9aANRGQ
+        0Zd5npeFlGjV7MAJ5wjcMLchK1MojdYWfI/NnpcPv1xlL2+AjQLbUTc4KroOTLyMv9b0b7mQu5Usm1oY
+        G+KMSxhMDlRIPje9tFcyEFoL1kzAxdlZtPl6E/KsnmQbX+wMr4BR6E0kOwaijqpMAXQeiJQ870YNv9Kw
+        PEw8ATzd14kmW3OyXKvlor0XrCJuIjCtTXLO4VqxZgIyZoeH0OzqTEqkLleNLWEYcpMXkLErvBx+vsko
+        MbciK3Mlhm6ILlMRhd+NM/pVBOuhrzX1SOp36Fox32tRZVstpc7ueDyu+AJGTbGmAjKmH/SizsSIlElV
+        bunpwyYgTyKfNIahJTjpEoUqExOyQpfTwD3T7NAj/hkfjsxobN/vWrH7YAX2pSUis9oL49Oiwy/Z2sHO
+        KM1ff8FmBsbb22Taca1YcwEZI3W1qOUKRkkllCqdnQj0iCflk8Yq+CrS7f1QwyXVVOWK6Qj0lzzflQ00
+        +bwcful7fB5OFu9FWqU1z432w9yoWPyWZBQtLs5kGdWh0dIMY81NkrpZa9ZFQMbjqkrUGuqRcgnhlH0Q
+        H24p6ZbDvs8uMB/nHPxRbUxv/Ry8cknybCzXoRpf29ieKMDBS2E4V2EjkY+RXmWL9v5CyfOPNtRrJhRz
+        P2PgougulPVi3QRkM/kPMtLVGhlfNHWAfmgpKdtK7OKw5HrERKcQ3DKzkFR0g+lu/sZ19lzD47MbbPRb
+        xYsXnR+J1Ao7GfGkOV/tgOGJl7cRcXXbk3BKViZV4eTrO5/B/yyZdltj1k9ABi9hmkoSlugbwjLoCimY
+        KrAcce/eFGTZeaMlKEjyTGVtQ4QE6w/L8ZwTcnHkajAnni0p3XKuNodwo1TROdTz42NodXOh5VIGlw/3
+        Za6/fIz1FZDxsies0dchhZOmUmcXfH2SSKHUhfWKV6uWRpIHc++QQqwHRhzmEeVwC7iG6MgznFSyoVYI
+        Tb0sZIrEGWtsUDkUs8FYf1amVuRjrL+ADK6wjysrlL4tiXUKJyVaDXpRlfyol3+OmTF0J3shMTYezgeL
+        YRK9NAG7Vuw+UAWr8DK4+xdjv2c+olxycGDPBUS7ZiPlujMp2Uqw/dlDE/ckddubkkyKRtFgZoyBnAta
+        k4+hHQFfwg9MFEiYZe4M3bBbpESrwSepWTKz/6yrDH9O2sHzImkXhhMtURPvh4TYU/A7nAfLmFJeStZT
+        UTIpg8lmwglvy+WvroHXEOB9GeFuF3nhKOJORZGSKeNKUxDmF0S/VAvT02j38SKFk4ZNtYw1NWpVPoZW
+        BWSwKZrl84Q3DHbDLLiQFGi15NcsnWHyvCRaIuByfk7aiZ+SdDgprXD/tBMaT3njYGIaDJLqYZBYD/3T
+        dTIYnOH+nvuafloD9LOboJfbBJ/wIlI0RRzyS0XashGvUCo6EyXlYnubGy1MSfEYzfa26zbPpwytC8iY
+        efhQ8sakUncX3PemkfKsFv2oKi78ipL2J7MT+DnDlJRPEfnZMdAtbBGM29GbpGgrcSbXlxRMGWxqpne4
+        XlKnfefTSfluB+zD7GPNr+tTlw0hIGNudASdRw7hsPMBUh5N4H2WC78vl5M/7a4gJVuJszkJpGiKcDhd
+        Tkq2ErExx0nBhJBb74XZedHOvoWZGbR5ey7Jxw1O2Klf4q0HG4UNIyBjYX4e+dV9XP5URQq0WvKqpcNv
+        DCmZIlhIjsrPJkVThHlGDSnZSkS7ZyK11J4UTAgVnUtHy03evYsGcxMu37MSLTvTcr5HsaEEFMPOZHY/
+        3URKpC4G3IBgQBx+Z1j4NSNFWwmfSwWkaIowyamXjHJV4dTZMFIuIaRzo+Ke4TpJXQ7fvIGpLmHX52uD
+        DSkgg51OkMIfj6GZ3pCNfsWrip/2VJKCrcQLrgd0uXKTFE0RBleaEOGeS0q2EocDk9QejDAu1ntz9Sc6
+        YWGjs2EFFNPWOwbPM6vvDfMl4XdxxdGvIp4m68H2agUp2kqE+OSRkq2IywUkXfYk5VIGG4ywE2zHp5dW
+        UG9kNryADHYGCTutgG3QoeRSButFl8LvuFrhdzbFGKYFtaRkK7E3vJCWTAnHDx8lBVuJnDoP3H/Ebqrc
+        eLmeIl4JAcVMTM8jvuAe2KHhlGiK8GXh9+XK3qc9VaRgyphMMYV+YTMp2Uq4HlN9KoYR45WBc7cUL0aQ
+        hvV6tffPYXpO+C2VG4VXSkAxbG/E8cudMD4oTETpyeefquJJwZQxnGpFCqYMdaZixCSk7ieFE8New7G1
+        gcMT92Xq51XilRRQDLtrI+7qvRVFZOGXHbfB/5v5GfycbUsKpow76W6kYMowP19LyiWEI/sTycGIWLxH
+        451YfIXCLcUrLaAYtnGbHShpT+SIvsktko08TwfbSbmEUJEZRAqmDOPcekS5qj4Vw+OSjeRCVynx7PkB
+        BjsS71UXT8wvQkAxs3MLqO8cQXROB38FAhPw7LWlObDnaoZfRmFWJCmYMvipGA/Vp2LEnIg9hAu1bqjq
+        PIvHk92/GPHE/KIElIYNWIoaHqJ7UHQPx5O5afycZUPKJYTsC0dJwYQQ4ptPyrUSB91zcSaiGGUFTa/M
+        nJ46/GIFXM6Pow/wc6Yl/pyiSwqmjJO5yaRcQtgrcFUML114MUrzWzHYN4qFl/eH/JL51QjIw/WCPw7d
+        xU91KXiR54Kf043x5+SdpHDSsPfAwfl5pFxCcI0tIYWLdsnBUZ98ZBwrRVNFFx71j2L+5Un5vxZ+XQJK
+        szDPL8l62teAnxrS8PxaKH4+b4E/pxmRUrpevkHKJQSHxHK+dzvilYezkddwIb4CzZVd6O4YxMzUnEYP
+        fHzV+PUKSMH1kOxNydO+RjzruoWfmrPxong/fioOwbGaFtiXdsDkWhuMFcC+5lvZidC6LoRxRDf2oKR/
+        BNXdw1zvNoYpbrT+awirqvBaQBWYXVjEBBciR2fnSSa5ry38inszdXgt4Gu0ymsBX6NVXgv4Gi3yBP8f
+        Dl9zmFWDBX0AAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="cbPieMultiRing.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAKAAAACWCAYAAABZ7IOdAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMK0KCsAAADArSURBVHhe7Z1X
+        XJTLmq/P7dln5pzJZ8/MCb+5mTmz9+yVXGmv5FquYFgqqIjkDJJFQJAgOSpgICpJkhKVnHNOAipZkuSM
+        2bn7n6+qpSUU2F8HunV58fxWULr763qo962qt6r+y6NHj/Ce98iL9wK+R668F/A9cuW9gO+RK+8F3Ia5
+        yUkMd3XiflUlWnOy0ZiehqrYWJRGhCMvMADZoVG4VtBDiS3qRUbNIHIahlDd+RCtvZPoHZnF5Owi87Xf
+        I+C9gByz4+Pora9DVVws0p2dEH7iOLy/+hKen38Kt48+wLkP/8TkzLe/QMmzYkuUvSqg4lMF9YBquF5v
+        Q3jOfWTXD6FjYAqzC8vMz/Jb4zcp4MSDB7RHy3B1QfCB/fD8bBfObSPaVrxJwK1Q5jjuV4XTUc3IaxzG
+        eHUVJpsasTQzzfy87zK/CQGXl5Yw2NaGsogIhKupwoMIxxCKL+IKuJaksj40GuqhWvkQatVU0OHmguGc
+        25gfHmY+y7vGOy3gyoqAvsZGuH/yEVMiSZBUQBKiG2s7UXNMmQq4ltrjR9Hu5IiRwnwsTowzn+9d4J0U
+        cHJ6FtllLdB1isKNvDoszM4i4IfdTIkkQVIB1bjccKS0ZJN8G6lVO477IUGY5gZEK8vvVu74zgi4vLyC
+        5s5+uF3JwDea3vjwiAtF3/kq7QVve3syJZIESQV0iW/D/cuXmNKxqDmqhBYrc4yVlWJ5YYH5PbxtvPUC
+        Liwuoay+C1oOEfj4mKtQvFW+UPPAw8kZbpRbv+2IVhwkFZDmf0b6TNm25chhNJkYYbSwAMtzs8zv5W3h
+        rRVwbn6RhtkjVpfw0dH10m0k4XY1DcOBP/7AFElcJBGQ5H8NtV3M/I8PjUYGeFhRjpWlt3O+8a0TcInL
+        gUrqOnHYIoQpGwuSC5IwnO3jzRRJXCQR8IS/aPmfSHA9Ypu9Laba2/BoZYX5vSkqb42ARKD2e4MwcLnG
+        9XibQ+12kDA8NjFNR8PSDMOSCEjzvyui53+iQHrTe8EXsDg5yfwOFZG3QkCSwzmFpOLT425MwUQhPqsK
+        i3NzOP/THqZM4iCJgImlXP5nYsgUSVLqdbXoQOVtGDErtIBkZFtQ1Y6fDQOYUvFB2zGS9qI5fr5MmcRB
+        XAFJ/ldfd5eOalkCSQUuLHdyI//FyQnmd6soKKyAo+PTsA1IYo5sxYGE4ZGHU+hvbobbxx8yheKLuAKq
+        +lVhuLSULY6UaTDQpct8rO9YEVBIASub7uFHA3+mSJIQl1lJw/CFX35mCsUXcQV05vK/binnf9tRo3IE
+        fXEx3Eh5ifl9yxOFEpCMcMOSiyXK9bZD80yEVMOwuAImlPShycyEKYvMICHZ0x1LMzPM715eKIyAE9Oz
+        sPJJYIojLUgYHh6bxEBrq1RGw+IKWF3fLfH8n7i0WFlgbqCf2QbyQCEE7B96CGXLi0xppE1MRgUW5+cR
+        tO8XplQbcfv0C7h/sw8ePx6H5wEjeB40h5eyDbxUzsJF0x5abmYUTTcbqLs744RHIFQ9QqHikQBlz8JN
+        8pH6wKGycqYcOwLXE/ZGX2W2gzyQu4CtXQMyyfe2QsM+nIbhXH+/zbJ9+T0VzUv5NLw1/eFrmghf8xSO
+        G0zcra7AyPWTbfgUhud2Q9dNHZruDpyYYTgbU4174WFsOXaADvdzNBfsHq3iUp55ZpvsJHIVsKLxLg2L
+        LFFkBXm/wZEJPLjTDvdPP4P7D8rwOmoPH6MoTqqtZWPxZgE3cyMvBNY67jDdYwT/vVq4eVAFVQxRZEGr
+        7Sksc4OwHk6+2HIt3G5yxcKSfHNCuQmYU96KXTIabLyJqNQyLC0sItQlkymWqIgjYEVtDo79YI4j35lS
+        jnLo/GACP07GzENHmeJIg0ZDfSyMjWF4shPxFbqILlOnZDU6YW5BfnOFchEwp6JVZiPd7dhj6Ajz89ZI
+        KHXjPscKStJbmWKJCl8BTd2/REl+pVC+jRAZLX80QMyvJ1ChfJgpkjjUaaph5v49TM0NIbHKWCjfKmn1
+        tpieH9nUTjvBjguYV9m2o/LtOu4MVUc7+N88ibgKA8RX6iOx2gTTcyMYGZyEn8VNplyiwFdAvyh9RFxI
+        Ysq3EdIrhu5XR6mSZKsltarHMF5Xi/nFKaTX222Sb5UbtVaY5ARltZks2VEBSRXLTsn3+QlnaLudRmiu
+        MZVuI639WVheWkakRy5TLlHgK2Bq/kXY6HsxhdsKze9PIvyAmng9IjfiHbqVSQcbOS0eTPHWQnrCucWd
+        Dcc7JmBDey8+U5W9fLtUnKHpchoRhUZM8Va5xSXgK1wYLs1sY8olCvwE3IXqhvx1+R8fDPcYI+HX42zR
+        WHDy9UVf40b8y6joCmcKx4LkhAtLO1fkuiMCDgyPY4++bKdaSFGq0ml7BGeaMIXbSAKXC5GcaPTBJPwt
+        xQvDfAQ08/gzivMqmHKJCskRz/6shwKlN09id/l602qYpt6bTNG2I7/Vh+s1d6bkX+YCTs3MQeXUZaY0
+        0uLPGk5wumrB5Xhs2baipT+DC8MriPLKYwr2JvgI6Belh/DziUyx+KLBheWYX1WZ4hFa7U7TPSN3h0sQ
+        U67JlOxNVHSF0d6T1abSRKYCkrVdS+/rTGmkxVE7O0S+IdxuRVaTMw3D5bfbmYK9CT4CpuaH8M7/toP0
+        hm57dTcNUppMDLE4Po6hyTvcL6QOUy7R0EBLXzqzXaWJTAUMTylhSiMNPlV1xunLVrx7vbWQMDwxO4ix
+        oSmxwrCoAhqf24WaxkKoiJn/bYfJHiPkHD5C5aPTLd33uWca4J7NkCEVP2LLtanIrLaVFjITsOGO7AYd
+        3+meRcDNk0yp+NLcl8blSiu45lvAlGw7RBXQ3PNrFOWWMwWSBupcSL5xRB0TDfXcKHYSaXW2TKHEIaXG
+        AvPca7LaWBrIRMCJqVn8ahrElEdSDlicETvksshsdKRhuDKngynZdogqIMn/wgITmPJIg6PfmyEntYQO
+        HLKb3ZkiSUJ+m5/M8kGpC0jK6O0Ck5nySMpxB3tcKzVkiiQuCVVGGJ/tx/jINO8wLKqAKbkXYGvow5RH
+        Uo7uNkNsaBrNt91Tk3ExT5K8b2vIgI3V3pIidQHzq9qlVka/CpliMfA6zeUkgpUMadPUd5P7DV9BjH8h
+        U7StEEVAY9ddqG0qxPE9FkyBJCXwXBSWlpZxMbcMfzjtja9d3XEhW48pkSTEV+hhcu4Bs80lQaoCTk7P
+        Ya/xeaZE4kLk0+fkW11GkwUZDQ40DFfl8QvDoghoweV/xfllTHkkxeGkP+bnFnCjpgl/tPPBv3MCEj53
+        8kDAbX2mSJKQ1+pDvydW24uL1AQkNXY+kbeYEkmCrrutTOUjkDD8cKYH46P8wrAoAnqFayAqJIUpkCRY
+        aLphYnwK1Xd78LGDv1C+VT5xJBJKuyfUwL3hMmb7i4vUBGzp6udGve5MicRF7aydzMLuRhp7b9BfotiA
+        IqZsLEQRMCk7kMv/fJkSiYv2QTv0dT/A3aFRfOF8YZN8q/zZxV3qOWFyjRkWpbhUJxUBycCDnELFkkhc
+        9pufQXTpzshHSG+wp+GlpqCTKRuLNwlI5v9qm4pw/EdLpkjioPaLNVoaOjEyNY2fvUOZ4q3lB09XhBeJ
+        txqyFVV3pVfSLxUBSWUz3+MytuM7vbOIKJDeVIsoXK8yxNh0NybGZuAnYhh+k4AWXt9INf9T+cECRdlV
+        mF1YhPqlWKZwLPb5nsXVUg2mTOIQV6ErtfpBiQUkx6OdsA1liiQOZIUjME06k8x8aehNoc8Uf76YKdxG
+        3iSgZ5g6robcYMrEFzLdcj2SlFYtwzImlSnadmiHnmbKJC6kwmajC+IgsYAF1e10pMqSSRxOXbRiyrET
+        pNXbcc+0gtrCLqZwG3mTgEm3A3DaQDrzfxe9Y6l8gbeK8Afb1yNeUfmjrTecUk4yZRIHUtY/OTu4yQe+
+        SCQg6f0OmQczRRKHI7b2Mh/xbgcJw6NTdzH5cFakMLydgIL8rxiqUsj/nC0uYIELu3HldZxI/OVbZRc3
+        Mg7Ofb0fRFJKOy4xveCDRAJKM/cjJVXSXGITl/qeRPps8RfeHIa3E9DS+1up5H/WOh6YnppFcfs9fHjG
+        jykWH37xcZZaPkiKFSTtBcUWkKwcGLpeY8okDg4RFkwhdhpSlk5Gw/Ul95jSrWU7AUn+J+n8n8ERBwwN
+        jqKtfwifOQUyheILWS05FWfOFEocKu5GMP0QFbEF7Ogewi6Vc0yZ+HLI+oxcQ+96DDA82YHJ8TeH4e0E
+        JPN/p/TEr/9T33sKHa33MfBwAt+5hTBlEpddZz1wpUCbKRRfkqpNsLg8x3REFMQWkBwYyZKJL2TX2qXb
+        opXR7xS13fH0Ga8HlTDFW2UrASXN/8jPVRY3cuFtDkcvXGNKJClHLpzBNYZQ4tDxIG+TH6IiloCk3Opb
+        rddXIUiCupMtUwJ5klp/mobhxrL7TPFW2UpAK+/vUCRm/kdKq1LjczHPDfAMI5KY8kgDMir2TJe8aJWQ
+        2eAodrmWWALmVrThI4ZMfPlM1Rnh+fIfeGzGAEMT7ZjiwrC/VSpTPsJWAoqd/+02pfuGSXWL280cmq+x
+        5JEWe32dcK2ULRUfYso0MTZ9n+nKmxBLQBP3WKZQfCH7dtkCyJ+a+7H0WROCS5nyEbYSkOR/1jqebMm2
+        wdP+CpUvsqhKrLk+vkizFyzvDN3kiSjwFnBodBJfSuFAIbJ/NzRXEXs/Aal1XBjmwkpTRTdTPgJLQLr/
+        o6EAJ362Ykq2FTb63pifm8etxnb8h50vUxhZIK1e8EatJZZX+N9VwlvA1IJ6plB8UbG3Yza84mCABxNt
+        mJ6Y2zIMswQk83+lReV06YwlGgtjbiA2NjKOxp4BfOIYwBRFVvzR1gu+WZLXDsaUaWB06h7Tme3gLaCV
+        j+TbLMnSHTmrhd3wikP1vWj6zIkh7DDMEtDtynHEXEllisZCY58N7nb0omf0Ib5yDWJKImuOBdszpeLL
+        atrCB14Czswt4FttH6ZUfPjJ2BGSbKfcKVLrbGgYbq7socJ5myXB1SQeVpaxiDS2wBVLM5hcNkeo//cw
+        OncYVmc/R+ItP5zSEy3/U/3JCrXlLRifmcXBgAimHDvBx44eCC3UYkrFBzqJz3M0zEtAchulNJbezAKt
+        mQ2ueBhgcKIVUxOzsD2rDW01Tezfb01HpwXaf4ss8z/CMqsQo5E60HW5hfJjSuipzUdohj4cXA2gsdeG
+        KR7h2PdmyEopotMtemEJTDF2EqtYyVdHyKGXU3P8LtrmJSA5wZ4lFB9I+N3qxCqFguuhozM0kH8zkD77
+        hdiT0Dn5Cw79aIE/2njjpt7/pQLaZWajK8wMNvaxqNM4gd6eMq4xNBCWaA13owRYG0ZCWcVlk4CRwcm0
+        usUx6RZTiJ3mBw+XTUKJQ9vArU3ebAcvATXOhDOl4sM+8zO0cZmNriBcvaGOAM3v4LbrQ3rDJrnyv7wh
+        Hfp2X+PI96b4D2svhBp8SAU8l5GO4stOXIgOQIu1Beq7E2hDBLoHwcMoETphpfg1vR6nz/lDfc9JKp+v
+        UzidbgkvrNyR6RZR+MDeCyFSKN8v6bjIdGcrRBZwbn4B30hh9cPE/xSz0RWB6BJ9BNn8AvfPXl/vT65z
+        uFdRgcnpUXrC6bGfjPCp8Tl4GX9DBQxIS0BKiC/idU+hJzIMGQ1ncDVPD56m8Thrk4pDGQ3QTC/DXNQR
+        DPgdhreFO+Zm55FR3ypRaZUssIk3Y0rFh9XpK5ZDLEQW8G7fsFT2+yrq6DcszwgHzM7g5Febb1FKO+tI
+        v4OgODOoq6rgaw1HOJr8RAWMSI3ExfOhyDuhiaHaEu619HAp8iw8jBOhFVGGQ5kNqIk7hZcRv+BFohYe
+        TY9wvWT/jk+3iMIBv7NMqfhA9g+T01g3+rMVIguYX9nGFIoPX2o47dguNz6E3DLGNzpO9DN+cdgejrs+
+        WydgwJ7vaRiubMykeeCPR+1gbXqICnj9xiU4ecajSksTvb3liC7VhK99OBxs03CQ6/3OJ0fhRcRevIxW
+        wuOxu+h9MIZvzRRPPsLHDp4Sb2Ai84FkGZPlEAuRBbwQm7tJKL4o2dgzBZAnZEC0W08g3yr79xrg3Jqb
+        lEgYvltehompEZg4/ID9B6yhY65OBUxOCYKjcwyaaf6XiIiMk/AwSYRmVDl004sxH6WMl1EH8KS3mm7c
+        V1q9kEfbnSmBPPmDrbdUJqUbegR7a0RBZAGN3WLWNZI4mPgpVv6XyIWL827GzD0tet8eXNcLpjmdpd/D
+        hRhTKB3gBhMWRlTApKRg+NtcoPkf2doZdN4b9vbpUMqoR0OsJV5G7sPT9kwscoMO43Ovv8M/H7KFymEN
+        pgjyxDLGgikVC3L4Jdkhd6vJBWWdl7kR8G0MjDfJJgRL4zYjl2hzpgjyoiPtGBcef0Gqixa+UHFe91k/
+        VXKE3Wd/FgoY+OMeLC8uoqopC2onjmO/uTkV8GZ8AEJNXDBUXYS4EiN4WcVA41oFLiaH0dD7rCqUS8pX
+        4Bh8U/jaew6Yw2HX57SX/VHHnCmCvDgWtHlVhIgWW6FNz48u5Ua5rf2Z6B2rZc75kaPuJh+KfvmNSAKS
+        EfBXGl7rGkgcIgqle7KVJNwu0sLzSC434wQkdAYcwX4Nh3Wfl4ji+ioUkzDcVVZKw7Ch+SEcMLJEhsWf
+        kBHti1z9k+jrq0Rogg3sHDNgmFaAxSglPCv0oiNCMn+6OoF/8Gdd7jVf31ds9/UX+NDGlSnDTkNG5d+7
+        e1DRiu8E07MTe0ar6VnaG50gopGDPTsaB1CR3Y60yCpEeubC2zQZ50+nYX5OtMIEkQQkh4xLer3CZyec
+        FWYAcp3jQZKSUL5VZi//ipPGVus+t+oeVaEsqY4O9PsIDDuNAxoWSLX4COlXvFBja0/zP3+3i9CKKUdb
+        zEk8z7DGo8U5pBU24GNOvo+VnaG9W/l1bvnRn2B/+COcdNiF/Y7qm2SQJUS0j874QykwChbRN3Eprxy3
+        m9rRPfKQ9tZr256KNjyFruZBVOZ2IP1qNRXNhxPN0ziJznVuxMskidZSrn2drRBJQHKhoKR7f/cYOSrM
+        BHRiiTEecwODjQISSEi+ZGfISSP43B9x4lh9uZtKQyall0gYbryFX9XMkWz1KdIC3NAdEYabZa6wdctA
+        ZNJFPE/Wx+O5cVQ136Pn5XyudAamX/0kFNnh5w9hdup1AYOu61f442kPpiySQEQjO+kOB0bC9GoKgnNK
+        kVnfhvsjY1jeJNoS5ofuYqIpB3U5tciMrqaHt/uYpcCTE4ol2lYQMfvvja17/a0QSUBSgk9+k8lVp+dj
+        cmF/PoUm1FoOEThoFoyvNb3ob/knx85tKephBRoBOxSEQjO9FHGJgRi+piGYJtkgYpGnGr47cZZ+9q8P
+        2sD5k08Eo+GyMjoprWqshxsWHyPV1REPqgtx5ao3bGMzsHxdC48n+um86W4dX3xz0Br2n31JxXP65gNY
+        niTS7RLKZ+j8KXQt9mC3iTVTIlEgon1g74tf/SNoGf/528VIrW2hhxcR0VbWtCW5umF+pBuTLfkYzr2M
+        7kgTtLl+gzq9v0at9l+gRvN3CDOwZ4rFh7riu+sc2gqRByEsyGlSpMsmhxORpSVyGTTpLXMrWpGYXYOI
+        G6XwCs+iJ+W7hl/G7WY3WjGRWC2YjCYbwTfKIWviKg2hfrsIv2Y2UshEsdONZFTE2WIl8tA6CQeCDuOo
+        jh2V8NDPOjR83jxjT5/dM8QTiRafIdnBFb291XAKSMC9eHM8GWzC8MMp7DUKxP69hpy4u+Dy+Qc4pfUx
+        jF1e9Xouu6BnvRsa6kdx7Edjujy3l5OcJddayLLdB/Z+2O8bBv3wBPhlFiK5uhEdg8NY5MRaGz6JaAuj
+        vZhqL8Zwfih6rlmg3W036vT/FrU6/50T7b9uSbyexiah+JKX3Cj8LNshmoDzk3gyUI8nI3fob/fjuQk8
+        Wlli/91tIBt9SFK+zP0sOc+YJLfkFPZ7I+W4M5iDpr5UVN6NQmF7IHJaPOk1CjfrTiGhmhQvGEhF2Mhy
+        CxzKqhcKuBbVjEpcSwzC4DUtYa+4FLofp03NaUg2/novAn7YjaWFBVRUFyPC4jvkunqjrC4bydEBeHK3
+        EDOz89A6E47je07AZdcHsD36EUzOCsTTP/0NNLUPQeUXg3WFCYTDP1rgDzZea0TzxV6fMGhfuQ7v9Hwk
+        VjbQ/cGkemZd+OT+fWGsD1Md5RgpikJv7Cnc8fwJ9Yb/8EbRtiJV5yemVHzIjK5Z1/ZbIZKAZBL1JW0Q
+        jsh9eHmN6ykIcap4kWaO5wWeeFZxCc/qovG0PQNPeirwZKiVzvw/nuZGUAvTzNd9E6uyklJvcq8tOcuZ
+        zDN1DRWhdSCLnmJA5p/y2nxp75rR6ICUWktOVCNuoMEJy7FRwIulZ3CQId9aSK9oczMDpXH23Gj2MM0L
+        Yxx18bWyPRw+/QKdxcWYmBzDJcsD6LoahZSUMCzXX6dHldh6x8Lw2304s/8jmNp9AgP7r6ClfwDH9+vh
+        6O710pGqaXJ1g+kJFziaBcIjORvx5fVo7XuAOS7XXOIii/D74ERbHB/EdFcVRktj0Btvhzvev6De6Peo
+        1f0rTpzfbRJJXG7rfMqUig9Jl0Q7yFIkAZ925QnDEi/INAeX7L+IVsakjwpaLc3Q6eGGntDLGIiPxVB6
+        KsZKSzDZ3ISZe/cwN9BPL1lZnhfnJu/V3pU03DxmF8ZpiTiZRrgzmEunFKrvRyOpOQHWZZ0wK+6ATn4b
+        jt1upkIeympiyng8owoR3MCi75oOanxPQF1JHyn2gjCcfekslxOW4EFFPJeGLONS+A1YHvgeZiZfQtto
+        L1QPaePI7pNC0YxVnHDGxB9X/K8jI6kAHS3cM8/N0/RF+BzcMyxOPMDM/TqMlV9HX4IDOvx+Rb3xP3J5
+        2t9wgkhPtK0o0P5XplR8uOqT//qZtkE0AZtT2ILxYMzlEOrVjm9Lg8YJNOpooslQl0MPbbancNfPB71R
+        ERhMSsRw9i2MV1Vh+k47Znt7MD88hKWpKaxwvQXrc2/HMpe/LnI9zBzX+DOLyxiYmUfT6DRyeseQ1DWE
+        q+2D8G/ogX3FXZiVdOBkYRtcb+UgJeocfI2N6Wh4Neci/8xKvwWDo/uhcUwTRscd6Kn45ESrtOt5aGvs
+        wvTUDBa5HnL1/cnPjE3PoH1gCLcb2+nAISr4DBrM/g/N02q0ZC/aVpRq/xNTKj6EutwWPut2iCTgs4Y4
+        plR8GHY8zJRObNRV0aCphiZ9HTQb6aPF1Bh3nBxwP/gC+mOj8SD1JkYLCzDZ2EAva54bGMDi2BiWZmaF
+        4vBhifuZea6Xm+ZknV/Y0ENzf5adlo/mug5MTkzTk6zW/jkpue8aGkFeSyc9zd7s2g163ManZwPX1QOq
+        W3C9LEOInaZC62+YUvEhxCFz3XewFaIJWB/DlIoPg/ZKbJFkDScq/SfXuzZoa+D2SVect0nDpbNZiD9f
+        hKyYWhSltaAqtwOt1T3o6RjGyMAEvTdkZmoeiwuiDbbIVAc5SuP+8BgK2+4iNL8C1rFp+N7jEj5zOk9F
+        e9NG84OWJ5lC7DSVmn/FlIoP0hWwJpIpFR8GTstJwA2kaW8/x7U6u09m830tbiDILp0S7p6D5MtlyE1q
+        QH15+6Ze9E5+DrztTeBgdhDmZkegYqGPH6xt8NUpB3xsc46TTzDC3Y4DlqZMIXYaxRNQCj3ggN3bISAL
+        L/M4+DmEITjYA9ERpoj2DxKOUBfmBJUfC6MjKLDmcj+XGFw5pYEi3X+ijVmh9ZfI1/k7bmT5e8Tq/xt8
+        jL6G9cmD0DVXxwErM3x96gw+O+WMP9l44LClySYZ5IHCCfi0KYkpFR+GziiGgLe0rJlf2Fq8zOLgaxeB
+        oAteCEuxwNUCHcQUqSMr8DhS9M0QdqtT8N1Mj6A0KQAz8+P0vx+WlaJUVx92Ljeg5VMIdwdX3DL8I6o1
+        /xuzoau5ES2hROuvcEvnH5Gp+8/Mv7fTSEPAy06ibU4STcD2TKZUfBg5K+VBiJiUaujBc8OXRfZv+NhG
+        IijQG6GJ1nRPx9pypMQ0NZSYKKPwuBq0zuWgpUdwe+TTzlxciwlDbmUEF5KX6erD/fMBqNFQh5d9BE74
+        VUHNrxLW564i3uwnVGj/NbPBhchx5LuWMq3fr/t+xOGKszQF7MpnSsWHhyJMw+wEVeqa8D0ZDR+bKFwI
+        8KUlVFG57CrgmGJBr1elchiVR5Rw2i4WBiF1wvD7PMcZ7kmpuBgSTCfHyf8j85jNJ41Qxw1+Iq24ka1v
+        BVT9qqmMBl6ZCD5thELd/8VseEURMF/735lS8YEUMqx1aCtEEvBJTzlTKj5MeRxkCiEPEmPffIVVQroa
+        ik2VhTeRB5l6QcmzAkEZXfQ7eTwzRleCzDKL4eOYiKQKa0y/KtAcr6mmc5rkvW6a2EHPu4hKuIqmbwlc
+        HT2QbvQRqrRIAQDX8AoiHyFL589MqfiQfKV8nUNbIZqA/XVMqfgw73dgkwjyIt/9BFM6QkyJOjLPc73e
+        8cNC+ZJ0LHHEowzKXhVouCfI957eK8bzaGXo3K6G25kMRCQ40cv8yNIhmRfsvhQifL9CXSOYud1aJyGB
+        9IpWbtcQY74fVdrirdvKAmmsBd+Or9vkEQuRBHw8epeTaHPJEh8eBe9Dg/pmGeRBtf5xxHKDio3yJaYK
+        cr1V8QgFx9Wh6ZpLez+dC7VYXBKE3xd557AcowrN7Dqc8cpFkHsESMEEWfYjf05WaFosTIXvWamlBWen
+        +E0SCkSsRLrxJ0wZ5EGcnhZTKj4U3mxa59BWiCbgzCheXj3IFEtUXoT/woWlzTLIi6zLakLxSK+XFaCC
+        qmOvez1CFZf3WZ+5TuUjBKYJRr+kGug/445jIlYHJ7IbYRlSBD+rZMTkmSOpxhQTswP07001NwtDMYHk
+        hRdOh2wS8LRrKB0Ns2SQB1cMnJhS8YHcubfWoa0QScBHy0t4GaPMFIsPbfoq6ySQJzVcLxiXz+71Vgk0
+        8xPKR8JvZYegyvdJdxn+89phDMUZ4lhOM4wjK+jpWVdC/WjFTXaLBy2KIKG4Lypyw3urciNiF6j7CAYn
+        an4VNBdkiSAPqjX/AhcMA5lSiYqgInp0s0cMRBOQ40WyPlMqPvSdUt7QGPKl1IrL9Tb0eqsk6FhB2bNc
+        KKDW+Rph+H1e6EMF7I03xdGcFmgn1VIBA+zjEFcmqFls7k+nf3d5bg5tp6w2vfctQysYeuZzPaJiLL+t
+        UqH1d/AyimGKJSpkYxI52HOtP1shsoDPC72YUvFh/JxiTMWspfb4kU3y5atqQONcnlA+gu+NDvo9PJ6f
+        ouGXCNiYYE8FVE9tgM+rO0Wibp6hAiZWmwgP7p7u7KCFExvfu0SHe78tJqnlRY7Oh0yp+BBsnyHyGrrI
+        Aj6tk3w5biFAcUbCa6k5piSUr/KoMswdktbJp8xR3i4IKU96q6h8hLxkLyqgyq0meNqkUQGDva9QAQmk
+        opvUJpKfG0xMWP++Gj9xDa5Y8hES9Y4xpeJDuFvOOne2Q2QBn/TXMqXiw7PQvWhUoIHIWmqOcXngkcPw
+        sgxaJx9BLaAaC4uCotHnxf5CAVNuBFEBCW7cbz0R0P9UEmIKTIUS1nUn0J9bWVrCHQd7+l516t9zjf2X
+        mxpf/vwOFw3cmFLxQdRyfILIAj6eesCNhH9lisWH++ZHNjW+opChY4oja/K+VbxT7gi+h8VZLvyqCgWM
+        vhkmFJBMxRABCaGRnkIBE6qMhIf1kCLaet0vGQ2vGFRo/T28jaKZUvGhoUz0w8pFFpCUir+MV2VKxYcJ
+        N8XLA9dy09AG+q5Z6wQsahHcDv6kr0YoH8EvPUkooGXI69s1Ax1jEL9mE356wxnMLwqOq3iQFcA1tuJM
+        uawlU+drplB8IGVs5Nb5de5sg+gCcpDNRyyp+PAoRHEmpLeiRl0NYeYeMHLOoKsV86vhtyxIKN/La0qw
+        zcoRCmgcWS4U0NciBVczBFeQxZSbwC0lBGHZgiU8UrDQ7kZCMFsCeRKhf4opFR9IGdbSq+9LFHgJ+LQ1
+        lSkVX+4YHWM2vKJRp6aKusBXR84uznHh98Q6AfVvVwoF1EoWTMWsEhRwCd6p/tALzhfM9/nXoKbrIX2t
+        ucEO1Bn+PVMCeVGh9bfwNYpgSsWH60HF65x5E7wEfDx2X7AtkyEVHxRxOmYrxooL6bPf6R5G0qUL6Aq3
+        wESUDpavCZbhVgVUv9mAczYZcLC7BVPXQqj7Vq5b7SAYX27AxIxgv8hw3mWFKkDI0N3NFIov1fmirYCs
+        wktAsiLy4ro6Uyo+PL3MjYY12Q2uSDRqa2BpRpDPhOXcF4qk4VcBHf9SqAZy/x1YI4AbKZ9YI9tWXEgX
+        hGKSU3f47GPKsNOQuciLBu5MofhAJqDJPcvrnHkD/ATkeFZ5hSkVX/ptFGtVhMVdb0/6zGQFRD+kjikU
+        X074V6O0TTCnSM5oIft9WVLsJMXa/wIvozimVHwIc8vmctz1e2XeBG8BydknklbGEBYDDyj8YGQ0X1DZ
+        QiqgRendRMXgYj0eTi3Q1x4tieZCsXwnpKP1jZhC8aVAxAqYtfAWkByz8SL2GFMqvtwzO8pseEWgQUsd
+        S5OC0vuo/B6mSJLgc6MD5HAnEoq7zh9lirETkE3o0pj7I0e4DfUJaiX5wF9ADnLyJ0soviz4H0C9gvaC
+        ne7n6LOS8ntDrsdiSSQpeY2CCuqFhwNoOLlFmb6MideX/CQsQti5bHpK2lpPREEsAZ88aJbKaJjUCHaa
+        KGYvOJItOFqivX+K5m0sgSRFN6gOwxOCteKH1Sk7HopJ7+djdI0pFF/Kb4t+NcNaxBLw0fIiXiTpMqXi
+        CynVV7RckFSuLIwJBgoxhb1MeaSFW+Id0OPWOO5d1maKIht+h2v6JkyZ+ELmPckpEps8EQHxBOR42nKT
+        KZQ49FgpVi/Y4epEn5HkaKahjUxxpAUZ3GTVPqDvtzg5gkbzf2HIIn0Kdf5VKiNfQuLF0nVu8EFsAWmZ
+        fvTmg77F4fHFfWhSoHnBocwM+oxdg9MyC79rIaF4YExQwDnReOvVUblscaRBtdZf4pIUql4IpPq5+87m
+        U/RFRWwBCc+ksDa8ypiLYmxcJ3s45ocEX2hCSR9TGFngHN/2ar/xCj23mSWOtLipt58pkziQE/P5zv2t
+        RSIBHz+8j5dRkpdoEZ6H7UWHsfzXiEnN3urzWYY3MWWRBSQU36gQbGZamn6IJut/Y8ojKSXa/xveUhp4
+        eBonorWmV/h9iYNEApLf1uf57kyhxGEleL/cl+gepKXSZ+senuHCbw1TFlmhfaEWPSOCpazJ1gKxz3je
+        iiqt/8GF3nNMmcSBnP8iztTLWiQUULq9IGHSXX6FCg0aapjr76PPlVzez5RE1pyJaRVufuqNsWaKJB6/
+        w3UpnH6/FlGvYtgOiQUU9IIeTJnEgcwN9p6ST9V0u62N8Llsr7YwBdkJrnO5J/kMy7OTaLH7kCETf27r
+        fA5Po+tMkcQh1FW8ieeNSEFA0gt2S7UXfB66Vy4T1A9uJNPn6edGpKR+jyXHTqAZWENH4OSzTHdW0ktk
+        WFKJSoHO/5PKcpsQLvfrahLkq5IiFQEJz8qCmDKJy9PL+9BusHMb2cnk82xPD32W1MoBphg7yanIZmEl
+        dn+KKyeSeLWDpdr/jACjy2yRxCQ2sEiwjr2m/cVFagI+mpvEizjJ94ysZSVoP5q12cJImzYbK+GzOHJ5
+        GEuKnSYyr5t+nuWFWbQ589/MVK71Dwgy9GNKJC5eJ5Mx2C2o7JYG0hOQgxzYKI1SrbUsnT+wIxKSfbvk
+        GYbG5+UafteiHlAjPAxztq8FdQZ/xxSNBZEv2MCXKZEk5CTUr2tzSZGqgKRimlxTyhJJEoiELTpscaQB
+        Db/dgt4mo/oBUwZ5YRbaiJl5wSkDD7ICObneHIrLtf5eJvJddMwS+cQDUZGugByPR7sE13gxRJKE5Qv7
+        0aLLFkhSWq3MaTEAyWvOxrYxRZAnF7Pu0s+2srSAOx4/MqVbpUz795x8PkyBJIHU+91rE6xZSxOpC0h4
+        2pzMSSPdUEx4FLJfJjvqBq7H0889OrmgMOF3LXRHXacg75ofvod6o//JlI8UGAQaXmQKJCl8Tjvgg0wE
+        JFW+z7PPMiWSlGdX9uKeufSmaMjkM7lJiXxuUpXCEkARML70ekfdSGHkhh11v0O2zi6pLbFthBSbLrxK
+        A6SNbATkeDw7jhfxJ5gSSQqZrB60V5ZKHSG5QJFsFichziVe8cLvWvxTO2ntILndvDNAicpHltcS9FTh
+        aRTPlEdS/CxuiFVqLyoyE5BAjrJ4GbWfKZE0mPX5lRucSDZX2B9zjX7WsakFOupkNbyioOZfjeJWQaEs
+        KeOvMP1Qqmu7GyGlVnzOeREHmQpIeEovOpR+PrjKk8t7cd9CvJBMSq9m7grWM3MahpiNrmgYhNQLy/jb
+        qu/TwQFLHokxfnXQuJQmnLdC5gKS0eWzkkCmPNKChORJj4PcKJlfb9hifpIem0bCr+v1dmaDKxwXauBc
+        2EVv7yT31aVGVrIFkhBykeO6e4xlhOwFJCwt4HmmDVMeaUIGKORWTlFLuvquRtLPN84l9xrkdANWgysK
+        XPg9FlGHg+mNOJjViIxuwYlds9ML9ERSlkTiQopM52f538EsDjsjIMdjslQnhXOmRYEs4XVbHdleRPUT
+        mO4QHLub3zTMbnRFgBNP5WItDqc0rLvJXSW7GX3TglDc1TxIj0VjycQXMtk8xfN4DUnYMQEJjyf68CJB
+        gymNLFgJ3kcPRmeJ2GJqQm9aJ+GX7ExjNr6cOR5cA6Xr9evEW4tteRe99Z18t7fiaplC8eGCbTqGByY2
+        tZss2VEBCY/He/Hi+s5JSHgcsg9DDkpo1eNyxFdTN71hV+jnmeRCjdb5WqYAcoHr8YTiZbDFW+UgR1KX
+        YP/KwtwivYSbJZYoUPn6d1Y+wo4LSBBIKPkpW3whgxWyD5kUvM50tNHPUtI6yhZhpyE5XigXapPXh9o3
+        ceRWM+5NCEJm951hsULxBds0Tj7ZzfVth1wEJDwe7+EkVGOKImvIBDk5cJJcs+92Q47hl+R3ITVQjq3H
+        wTS2YKJgXtIhDMXkRneWZFsh6PnkIx9BbgISaE8opRMW+PCsyJe+/+TCEk3mD3EJ/pFrdTTZJ1IwZZEG
+        5LUDBT2dUlw9DqXy6+2241r7IH0msmR2xeU2U7aNhLvnYHxEUHktL+QqIIEs2T3PPMUURTbspbd/kvcu
+        GRjf3Jhc3nWY60WUY+pxNKxWIGXAK3lYUjEQbmY/XwOVy7U4GlkHZSLcDekJt5HDWU1ofyg4TJNck0UK
+        R1nSrRJ/oWjHplq2Q+4CUpYWZD5ZvQqp2ibXLZD3PVdzn9mYTDgxiUBKiRzcAEEpnkECByfvwZucaG8Y
+        QMgC46I7mHs1eVyc3sIUj+zlzb5eh+VXO+/kjWIISFhZwdPG63gZdYApjrR4XuBB32+KC7/Hs1uYDfk2
+        c7mlnz4fWcWIcM9dJx8pLKgvkXwrpTRRHAFfQW5kkt1cIRd+e6vp+5Q/mKDTGKxGfJshqyQNI1P0Gcm0
+        Cjm3mchHjs+VZVWLuCicgJT5SdpTSbuI4UWcCh4tCPIkdz7h9y1Dr6ANM6921JFT67NiaqReSi8tFFNA
+        AgnJnTl4GXOEKZM4PM93o69Nwq9azrsXftcS2CDZmS07heIK+ApyRx2tro6UtDfkwm93GX3NqqF3M/yu
+        cogLw/4NPYKDLzd8n4qGwgtI4b7IJ72VkhUzxL4Ovz513cyGexfQ58Jv7bBgK+fbwNsh4CrLi3jaEM+F
+        5aNsybbheY4zfY3pxXcz/B693YzQ1n7ML8u+hk+avF0CvuLx7EM8Kz3PIz/kwu9dwZVbdVzv8C6F30NZ
+        TXQ+s/9Vadbbxlsp4CqP5ybwrCoUL7jwyhbvFZyo5H4T8jMBXG7Easi3DZLnnS7vRNPoFF3T3vjdvC28
+        1QIK4eR6Wh/7qsJm82DlebYj/XtkakIjt5XZoG8LpMezq+ii4r0Ng4w38W4IuMrSPDdYqeLyPSe8jFYW
+        Cvi0I4f+eePI1FsbfknRhBc3eCLrvcsy3ii0k7xbAq7h8dw4nrbcwPN0S2H4DW7qYzauokJ6O8PCdlzv
+        HMLDefkXDsiCd1bAjSwsr9DGVPQekCylaeW1IqS5Dx3jM8I6v3eV34yAhImFJVQ8mKCTtKSRSQ/DkmCn
+        OXKriVayRLQN4A4n3WpFy2+B35SAayE9S+/UHLK6R+Fb3wOd/DY6lybrHpL0cKQKx6jwDi5yvVzZ4ASG
+        Zhfe6pGsJPxmBdwISexH5xZpD0SkJPmic9U96Be0QzWnBcc4OZW4nmq7XpPIS/5cmft7RLIT3M+dLL4D
+        t5r7uNLSj8L+h7g7MUsrsVmf4bfIewFFgJxCQAYBgzMLuDc5hzvcSLSNQcf4LO5zfz7M9WhEMrLlk/V6
+        73nNewHfI1feC/geufJewPfIkUf4/57e3ZAnALWYAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="cbPieExtentFill.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAKAAAACWCAYAAABZ7IOdAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMK0KCsAAACTuSURBVHhe7Z33
+        dxtHlu/3H3o7YXff29mdDTO7xxM8DpLlLFtOspwkS5YclXPOgUqUKCaJokgx5wTmCAaRBHMOYJaY5sf7
+        6lsQKDR0G0AD3UjinPM5tjkE0I36sG7VrVvV//D48WNaZZVAsSrgKgFlVcBVAsqqgKsElFUBXTA7M0Mz
+        U5M0OTZG1qEhGunpobGBfpqbm6MR6zQNjk3R0Ng0jYp/H52YodnZOfZ9VlFnVUDBaF8f9ZjN1FZWRvXp
+        aVQSdZuyzpym3EsXKffiRcq5cIGyz56l/IgrlH3+HE1PTlB2TR/dK+6ku0WdFJVrkdzOaaeYfIv8WVJp
+        NxXUD1Bj5xh1D07Q+OQM+9kvOi+cgDNTU1K2prw8Ko+Po/Tjxyjn/Hky3blDpdHRVBYTQ2WxsarkXrxA
+        0xM2AVMrelySUt5DD8u76YGpi+7kCUGFpOmVvWTuHF0V8ikvhIATo6PUajIJyaIo5fAhKZs70dTIPneO
+        pqxWVjhPiSvskCEc1zZkKqHx5iaam7b994tG2AtYlXhf9lqyd2OE0kp+RIQIwZOUJnoyTi5PSBChe25O
+        jDFFKK/7fju1XrpAbSK8dz9IpJHqKpqdsLL3Eo6EvYDo+fSSD2AcCAFzat2HYDUwPsS1DZeXUcnrr0hM
+        b66lms1fU8vJE2S5FUm9qQ9ppKpSyDjx3D2FE2EjIGam/UNjlFXSoPj5xMiICJtnWZm8Ie/yJTkGzK3t
+        Z+VyR3JZt3wtrs1y8/qKgI5IGbd8Q60XzlH79avUl5VB00OD9Fjco+O9hQMhL+CYdZKqzBa6lVREF2Oy
+        6XJcLo2NTyp+p/D6NVYmb8CEBWPAjCrvQnC0mCWPTdgmILXfbWUFXGHNK1T2/jtk3reH2q9FUF9GGk1Y
+        LGElYsgK2N0/TPezK+laQj5FPSyh2LRSSXSKiYoqWxS/245Qd+sWK5RWkJJBD8jJ5QkJxV00K8Z/M2Nj
+        ZHrjdV48BtO6NVS7fZvsEbvvJ8iJSziIGFICYuDe0TskJTt3J2tFOmfuCCEdXzc1Pi7HbpxQWim4elWO
+        ATO97AGRmsE1DZc9G/9pAdLWbt1Clsgb1BkTTZPdXYp7DTVCRsCe/hEp1gURZjnpHMHvTEwq0xpILnNC
+        aSX/ipiEiB4wr077GBA5weJGMZYT12O5wY//PMW09jWq//kHW2jOzBAzauWwI1QIegFHxiYoKbdaju04
+        2TgQkjOK6xXv02oqcTsbLhZhOv34cUrau4divt1C1z/aQJfeXEen/vwSnXjpf+nQv/+ODv7uX+UYMMeD
+        RLQzsQUd1D8yJa+n5tvNrFhaKX3rDWo6eliG5rHGxpALy0ErIGa1OaVmuhKfRzGpJlY0V0TczVO83/jA
+        gGI2XBoTI//77vc76Or69+nYH/9Ae377a9r9q//jFoT0NEYwd8QXdojx3xxNjwzLMR0nlLdUbvyE2i5f
+        pN6UhzQ9PKy492AmKAXsFOO8a/fyvRLPTsS9PBocHle8L8Jn8v59dG3DB3TkP39Pe379j6xg7oCAGMsh
+        nweQWkF45aRzBNLiOhzzf3qC8aF5727quBNF402hMUkJKgFnZmcprbCOLsbmsFJpAROVgopmxfvXpaXR
+        bi+lcwQCXnjYQm8cKqJ1h4rp3WMl9NHpUvrsbDl9c7mSdt+po1OJTXQzq40SSrpsa8JC0upWW8/UfuMa
+        K5BeyN4w4jL1ZaQHfSI7aAQcGhmXeTzHlIqv3E4qVnzG+NCgHMNxUmkBAp5NaqbX9he65PUDhbT2YBFt
+        OFVK312rpp4h20Sh+usvWXH0BGPD5hPHqSvhHk0P2iY+wUhQCFjf0kWnb2ewEvkC3nN4VLmuGr35a1Yq
+        LXgqoCOfni0TPbwY/wkZIAcnje6seZUadv4kQvJtsra1Kb6HYCHgAqYX1dHleM9nuFpJK6xVfF59ejor
+        lRa8EfDI3Ub5+VjfZWUxkOqvvqCO27dobib4SsACJuCcAOM0PUMuxxUht+PnYm344O/+HyuWp3gjoD0B
+        bbl1k5XESKq/3EQzo6OK7yFYCIiAKF1HmoQTRm8iHxRRz8CI4vPjtm1lxfIUrQJiHNgxYJsMoOKFk8Qo
+        yj98nya6lKslQ9YOxX8HEr8LiOKBs1GZrCxGEJ1qotwyW/iz05CZwYrlKVoFxAxZjv+Ghqj0nTdZUYwA
+        uUbUFzree8dgJVW136XOIeXPA4VfBcRM94yQL4YRxUhuiV7Q8TogkC9hWKuAR+6a5ef6c/yHnGB/brbi
+        vvtGGqnGcp8auzOprjOZ2gdKxc8Dmyv0m4ADQ2NyOS0mlZfESJBXHBgeU1zPvR9/YOXyBK0Cpvp7/Cdm
+        v51xMYr7HRZht8aSKOWzU9eRTG39JWI8HjgJ/SLgoOj5UDbly8qGL9xJKaHUAuVsuDE3h5XLE7QIiPFf
+        e59Vrkr4a/yHQlbHVZDxyQHR4yUp5HOUsLWvKGASGi6gdWJKFosGSj476AVRzmW/LpRUHf79v7GCuUOL
+        gB+eKpWfOz0sxn9vGz/+M+/fo0i3TM9MyHDLyWentuOBHBvaX+NPDBUQC+9ItaAH4qTwJ/gjcA7D93f+
+        wgrmDi0C2sd/w5UVMjRy0uhFzbff0Kz1WeJ9bm6WGrrSyNyVwYrnCMJzz4hyO4M/MFRAhL2bDwpZIfwN
+        /gjynGbDzfn5Xq0NaxEQhQr4LKPHf5WffkxTAwOK+2vqyZECcsJxYILSP6qsJjcawwQ01bbKcR8nQyDA
+        7Hvb0RhZ5mW/Rhy9ceS//oOVzBWeCvj6gSJq7R2X4zFUMXPi6AFSO2OofnH4/tv6izXJZ6fack9MWPxX
+        ZW2IgO1dA3Q9oYAVwZ9EJRfTj6fv0p83nqBfr91F//LW3ueS0g/27GYlc4WnAq4/YZIrPliFKH17HSuP
+        ryDXN1isTDN1D9d6JZ8d9IQYOzq+p1HoLuC4dVIWkXJC+Isb9wvo64NR9Pv1B+lXa3YqQJ2h4/W2FBVq
+        DsOeCng43uDxn3jP7oR7ivsZHGt1O+lwh7krXf7THzlCXQVEeEvIqpATD04Mo7kterxtx2Lod+/tf048
+        O+9sv6QIw5gNH/vjf7OiqeGpgKgBxGdYIo0Z/6Hmz34fAOkWrHI4C+UNtR1J1DVUo3h/I9BVwEqzRfY+
+        nBxGc/R6Cv33hiOsdI78dt1u6upTlqwn7t7FiqaGJwJi/NeJ9V8he92ObaxAvtB05BDNzc6u3MP07ARV
+        tsWxMnlLVfs9Gp2wJdGNQjcBR8cnNW0c0gsUG2z46Sr99o3drHAcl2JzFNfeWlKiKQx7IuDHZ8ps4z/x
+        u6Vv6lv/V7t9q2IX3OzcjG49nzN1oiecmbVtpDIC3QS8L0Ovf/N956Kz6I8fue/1nHlr20VFGMYut+P/
+        8wdWNg5PBFwZ/1WUsxJ5S9WmjTQ9opxI1XU+JHO3+1yfNzR0pVL7QJni8/REFwGxiUiPfRxa+OVsAv3T
+        uj2sYO5Ab2npVpapJ+7eycrG4YmA9vEfCkE5kbyhbP27ZG1XVjZDvIbOVFYevahoi6WJaaX0euGzgOhJ
+        roqZJSeJEWBJb9O+SJlW4eTyFGxed7yPttJSj8OwOwGxF8S+/6P+px9YmbSCMn5U0yiuud9EkYUfUHHz
+        VVYc/ciQa8mOn60XPgtY2WDxW8IZ1dMfivEeJ5RW1m09r7gPhGFPZ8PuBMTuOCxDYpyGk644obRgWvs6
+        9aalKq63b7SJbhV+SDfy36XIgvVU0HiJEUc/sF7cO9KouAY98ElALLK7OqNFT3Asx7s7LrMyecNv3thF
+        LZZexf0k7dvDCueMOwGfjf8qWKE0seZVuYzneJ0jE90UU7JJymfnZsH7lGc+x8qjF1Xt8XLC43gtvuKT
+        gFmmBikGJ4ye4DPW/xjBiuQLZ24j2frsftqFMJ5sVncn4EMd6/9aThxTpFsmpofpbtm3CvnsoCcsMjAc
+        Y3WlfcC0ci164LWAk1PTdNYPvR/GfB/vvM4K5CuvfnVGcU9ISnsyG3Yl4JqDRdQ3Yhv/1e34jpXKU+p+
+        2EGzU89SINOzk5RavY+Vz05kwQdU+ugWK5AeIBTPzul3nrXXAlY2tBu+ow1sPx7r84RDjd+I961/pFx4
+        xyHmnHSOuBJw47lyuf8D+T/TG96f/1L99RfyDEH7dSH05ZrPsNI5c7voI6q2JLAC+QrSMt3DdYrvzBe8
+        EtBfM98j11I0JZi94WRkuuLeLJWVbsOwKwEPxNpq6nzZ/1G+Yb3TTrY5mQq5kf/ec7KpEV/6jU8FCa6o
+        7UjUbSzolYBN7b2GC3j9fgH9+/sHWGn05G9fnpaTKfu9zU5Pu50NuxLwgelp/u/ObVYud8jSqgZlYSjq
+        +m5qkM9OavVeViBfqe9MoZ5h5fF33uKVgEYXG2Dct3bLOVYYvcHasLnVJo2dtKNHWPHsqAm45kDRSv4P
+        4zdOMFdgJ9tAnnIjPcKdPd2iFUhrVI4Qe0kcr9NbNAuIk+hP3UpnxdGLn07fZWUxilPOYViEzz2/+RUr
+        H1ATEOe/TM/Yxn+lWvN/a1+jrrhYxXUMWzspuuRzVi5PiS7eKHqsh6xEvlDZHifTQY7X6w2aBcShkUZu
+        MEJo/9d39rGiGMXLX5xSPGgQaY+TL/0vKx9QE/Bg3NPxX3UVL5kaa16l1ovnFTvZrFNDchzHSaWVtJr9
+        rES+0tSTtXK93qJJQGT3jT5S490dl1hJjARhuMEpDGecOsnKB9QETH76AJqOKG3rv+Y9uxSP6kI1cnLV
+        TlYmb0B+sKIthpXIF1Cu5WvltCYBcVA4JgecOHpwJipDzHqNSbm449h15VJXZ02NahjmBET+D0/FxGtr
+        t33LisZRs3WzDNn2z0WOLav+OCuSLySUfyek0bdiBrNsLAnar90bNAmIM1Zw1gonj68grK/Z7J+JB8df
+        N50Uf83PVhwQDs+8/BePBfzkjG38h1IpT/d/VHz0AU32PCv4xOZw06NIViBfwVJdWesdViRfwAx95Tvz
+        Ak0C4qgzTh49wMQGiWFODn+AtWHn2XDW2TMeC3jo6frvSE01K5szZe+9TeMtTkcIi8mCllyfVu6XbxfS
+        6NsLogrbl1MVPBZwaNRqyCmmdrBXgxPDnxy9lqK45+6GBjYpzQmoZfyHdAse0+r4WZaBMjlW48TRC/SC
+        KCjgRPIW7B3xJQx7LGBNU4dhS2/YRffPb3pXXKonf910ShmGBedee8WtgDj/xdJvO5GgVozpOOlWEDPe
+        nqRExWcMjLVSVNEnrDR6k2JAcrqlT7nTUAseC5icV83KowebD91hhfA33NpwzvlzbgXEIeTy/L/hYSpz
+        df6fkA9PNnJMt4xN9lOs6StWFiOIKvpYrudyInkLekHH70wLHglo5NovVlX+55OjrBCB4FCEMsPf29T0
+        3GzYWUBPx39Nhw8qd7LNWCmp8idWFCPJbzzPiuQtqJDxNh3jkYDWySnDCk9xZIZR1S7e8BcxG55xCMM4
+        vuP8mtdcCujJ/o/6H3c47WSbpvTaQ6wgRmNLyfAyeQMmT0PjlpV704JHAnb0DBqWgA6W8GsHYRj7mx3v
+        P/fSRVUBMf5re3r+C06n4uSr+vxTxbM6EFFQOMrJ4Q9QM6jnRiacvvWor1DxnXmKRwLmlzcZlv9DNQon
+        QiDZd+mB4v77H7WIMPzsOXKOAn5w0iRXiJD/48Z/5R+8R1ZLu+L9cACQkekWTyhsuszK5C0Iw4736Cke
+        CZiSX8PK4ys4sw/LYJwEgeRPG48r1oZlGH79WRh2FHBl/Fctxn9ikuEoHw4Owr5g+/uAR30FMh3CSeFP
+        kit/YUXSCs6RQfFrdfs90bMrMwie4JGARu37QMEpJ0CgwZi0tLZV8R3kXrzACrhS/+ec/xMy9qWnKd4D
+        u8puFW5ghfA3sSVfskKpAdHQy5W3RlNlezw19WTLDeu9I2Y5k/f2ICO3AmK8YtSTjLYejWYFCAb2XFDm
+        6vpEGN779HGudgGx/7el++n5f99tVcjXcStS8foRaxfdKd7IyhAI0AujsFQpWsaKaNWW+/KfSLG09hdT
+        32gjjQvRvOnlXOFWwOnpGTlT5QTylWBY/VADqSE8vdP+PSAMn3vtVYWA7x83iQZ5LPduOD7/o/nEUUWu
+        D6cKYBmMEyFwvCfHgQifEM3cnU7NvbnUNVQrT9ky8jwYR9wKiBTM2TuZ8hAgHH+mZzV0MOX/nPn12p2U
+        X6FcYsqPuKIQ8FCcffxXtTL+a9j1s6K0amZ2klKq9zAC+A9URt8p/ozulm6RlTYoSsD2yqHxDr+JpoZb
+        ATHD6x0cpaa2HiqubpETEpz9fC+jXE4izkdnyZMRbiYWylQNTshCyRYelepu6S4Ylt9c8ctZ5eGP/a2t
+        tPeffrMiIB5WjZ/b8394KODM2LNnsmGRvqDxIiuFEUA0LOndK/uWMuoOC9Fuy/QIwv/UjPLh3bohIoB1
+        bJL6u0ZoalL7RiWPJiHuwIwRoXp8YkoWLbRY+qhRCFtU1SKX8HBULoREyRVExdrv8Rup8shc5N2CKRHt
+        yH98cEixNozxMJLSEPBccott/Vf8rO777VTx8Qaa7FWetIAiUE4UX4FomMzcK9tKaTUHqFSI1tyT81Q0
+        q+7jNDvWsSnqsQxRfZmFitPMVJ7bQrmJtZSTUEOFqQ3UWNXJvs4VugioFYytsLEdwqLItcpsoaTcainn
+        OTHexMlXn++NpPe/vyJrBP/w0RHZW0JUf8uabbKFWTsF165KAW/ntMvz//BYhPIP19Nog3KXGGaJvqdb
+        3pMVMgidqTX7Za0gJguD4+1yk7pRoqEn6+0YJnNlJ+U+qKX4S4V0ansiHf4qnvZvjKZ9n0XTlX1pUkBH
+        zBXaH4IYEAG1gF4HwqInGh6zyqEA9qXEp5fJg9CRytl6NIY+23WD3hWTmpc+O07/9+29UlTU+HFSaQGH
+        nDtez8TwsHwQTP+obewE8Zx3snUN18rVBl4qHsgaa/pSioZVEkwKMPM0UrRZ8Z32d4/Inis/uY4SIorp
+        3E9JdOjLOCFajBRNDfyes4CVBY/Yz3FF0AuoFcxKIe3E5LQ8rd9U80gOAzB5wno2xnXfHIyij36+Kjcj
+        YQMUZFXbAP+fHx4SvbXnYxusiaLihJMMQDSM07BnF7NQ20kDtU/HaN4XdrpEfCfD/ePUJEQrEqHy/tVi
+        urI3lQ5+EetWNDWOfBP/nIAlGY3857sg7AT0BvSu3WIogJpHhNzE7ErZux6KeEg/nop/7jBLNbCT7W7Z
+        FikaekCIhs1FBU2X5NbIzsEq+Tvca31FpoOmZ2lkUESJ6i4pQ+K1Erp+OFOETvc9mlbwfqVZTQoBc+7X
+        0JzDCpIneCCgQX+VYUhjT5Z8RAJOlx+b7POpVF0VIRrGaKNDVnpU10OmzEbZo107lEHHttzTXTQ19n8e
+        I8J2vULAwpQG+UfAXrcKbgWcb8qg5buf09LDHbSYd4IWyiNpoS6B5ltyaL67hp4MW+jJeD89mRylxzOB
+        zSmFG9Mi9I8MjlObuVeK9uCGSQz+U+nktgS/ieaKrHvVCgExM57WW0AI9/crL6nwJxtX/0J/v/E6Ld95
+        j5aj19Nywle0lLmPFksu00LlHVowP6R5Swk96W8UwnYIYQfo8bQthcF95osGeg2M0dqb+mRYe3i7jC7v
+        EaJ9d58OiJ5m39OZZ7CReqdCISBSMVNi7M3doxpuBVwsOOMknY9E/Jn+fu1vtBz5Bi3fWkfLsRtE7/oD
+        LeafpMXS67RQE0/zj0Tv2lVFTwaa6clIl613NWgm6E8wPhoeGCdLc79osGZKi66gq/vT6PjWBDqwKfA9
+        mlaSbpYqBCx4WE8T49qioHsBc4/yIvkF0btGiN71+quS5ah3aenBt7SYfYgWi87TIoYD5hSaby+h+Z5a
+        ejLURk+sYsIwq98Bit4yNjIhRasqbKW0mAq6eTSLjm6+K2eeXGOGIg+umxQC5j2oo/HRZ1XfnuBewMz9
+        jBhBSgSGA38VPezL9Peba2k5fiMtpe0UY9fjtuFAzV0xds2m+Y5Smu8z05OxXjFu1faFuaLz0QDdOZ0b
+        dqKp4SwgxoCTVr1DcCgJqBUMB2QP+wotx3xIS8nbxdh1vxh2nKaFits0j961TfkkSldgdnpxVwrbWOGI
+        s4BFqWaasOocgpeyDvCN94KwdP8b9ntRA73gwS/i2AYLN5IjlWNACDipt4CLucfZhnlRWKiOY78XV+Ql
+        1bENFm48vFWmEBBjQP0nIUUX2IZ5IRAhGrNw7ntJax+gGZU0EtIqSAxzjRZOZMZXKQUUf3j6p2HKb/KN
+        8wKAfCb3nUzMzNKbKTV0u1F5mJEjWOQ//HU823DhALcSUpxuptkZnZfiFmri2MZ5EVioima/k/K+UXr5
+        QSW9llxFTcO2M2E4kFQO1iSyr2AlxpSpXAvGLFj3teCFhmS2ccIeGX75AstTVe1SQPBVrhh4ix6R+z2s
+        20adymEbMNQ5uClWIR/ASgj7PbjArYDz7UV8A4U5y/e+YL+PydlZeju1ZkVAcL2eHyeC4f4xWSTANWIo
+        gwJVZwFRU8h9B65wKyCKDWS+jGmkcGZBjH2576NaCPU3B/nA6yIU1w+q77mozG8RIYtvyFDl8p6U5wSs
+        LlLupfYEtwKiaOCFE9BF+D1f06GQz86mnAayqoRi7JmJOZfHNmSoghUfR/kw3m1rVO6J8QT3As5O0/Lt
+        d/iGClNQfsZV6iD8vpdWywoIICf2iTi/DowMWenE1gS2MUORxOslCgFRAItCC+7eXeFeQNEQWA3gGipc
+        WSy7zn4XtYPPh19HMCvGDJl7LcBuMqQvuAYNJTADdk7BeFMJA9wLKFjMP8U2VFiC8DvM7+66WMuHX0c+
+        yqyjUZU9JNirgo0/XKOGEse23KWynGaFgCjHx6yfu29XeCTgQmMa31hhyHL8Z2zt4aQYx32QXsdK58zR
+        irbnXm/HOjpJp3cksg0bKlza/fwEBEJy9+sOjwS0zYRR/cw3WjixaIpgvwPz0LjL8OvIK0mVlN81zL4P
+        aK7pCulQHHehQCFfaXazrObm7tUdHgn4eHqClm+9yTZYWIHwO8inEq7UdbKyqfF+ei0NuVgXRdk917jB
+        DsZ/2KzuKGBJupiA9Ht39IdnAgqWErfwjRZGLMdsELP+58dv0yL8fpJZz4rmij0m9Y3aUxPTcnM318jB
+        DGbyzuM/TEC07oaz47GAC1UxbKOFE4tFF9l7bx62ehx+HcFrUtoH2PcEKNk/sCm0KqdvHstSyAewY4+7
+        P0/wWEDstwjrhDTC7wA/kL7Z0MUK5glvpdZQt4v0RPa9arahgxGs5qTHVjrJ10QdLTghlb8/d3gsoExI
+        R3/AN14YgHvjNjOh5u/z7AZWLk/5sahZtXYQe39xTAbX4MHG8W/vyQmHo4CoAfQ2/ALPBRQsFl9iGy8c
+        WCw8x95z2+iEnNVyYnkKQnHCI/VZYnf7oDwQiGv0YCLqlHL5DXibfrGjSUCchGDbjM43Ysgiwu98r/J4
+        NTtRjT2sVFpBAatlTH0HHipJuEYPFrBvGdfoKB96w9b6Z4+b9QZNAmIL43JU+K0LY7+x2l7ir3PNrFDe
+        sC2/yXUZ/8F0tvGDAe44Nqx+4Ig37n48RZuAgoWy8CvRX8w7yd5r5/gk/c3H8OsIQnF0k3qP0dc1Epyh
+        WEw+kp02IIHSbN+elg40C4h1Urn5m2nIkCTiTzTfWcHea2xzLyuSL6x9WE0tI+pl/KgqYSUIIDijpsx5
+        8vGgjsaGvXtAoSOaBQRLyTv4xgxBliPXqZ7q9U2efuHXEZTxT6nsnUBIu3U8mxUhUNy/piy9AqYs33s/
+        4JWA820FbGOGIjj7hrvHDjFheCWpihVID7C0x30uwLIWjvfgZPA3x5B6cTqIsijNLHf9cdeuFa8EfDw7
+        JY9h4xo01MCeF+4e77boH34deVXIjfJ+7rMBytuDoYyf6/0wTMCJrNx1a8U7AQVhUaJ143W/zH7V+Diz
+        nsZUkrho4LiLBawU/gJlY87rvlh2e+Rj6sURrwXEov1y9Id8w4YIS1kH2XvrErNf9FCcNHpzqkr9Qc84
+        6gwTAE4Oo0Hvi/MLHeUD2HqJwlruer3BewEFC42pbMOGCvOt+ex93X/Ux8piBBDd1KM+nsKzNwJxHC+W
+        B53lwwn7na3qxRXe4JOAqBxGCRPXuEGPi/C7Jb+RlcUoNmS4KuMXfxBX/VvGjyNFcOC4s4Aou+Ku0Rd8
+        E1CAXiQUq6WXMvay99NtnZKbizhRjARl/Go76vAstlN+KuNH6L1/9fmJB4oOtJ5+6gk+Cyh3zaX8yDZy
+        MDP/SPl0IzvJbf2sIEaDlI/LMv7abtuB5Yw0eoL9HmU5SvmQhsGOPu66fMV3AQVyzwjOcWYaOihB+GWS
+        z+iBsF7LCeIPUMY/oFbGL0Kx0WX8OEIEOT5H+QB+NuPjmq8auggIFspu8I0dhCyl72LvoVeEXxyzwcnh
+        L1DGr5Zjw/nL539OZuXxFVRmOxebgoLkehrsVc9X+opuAj6eGqfluE/YBg825puz2HtIbR9gpfAnKH5w
+        X8avfyiOPZ//nHwot6orbWevQy/0E1DwpK9RPgOEa/SgAeF3+vlFdITf7YWBC7+OvJVSQz0uzlrGE4o4
+        ibwlYn/acwlnIB+9ZVDotaOrgAAPmmEbPkhYSv2Jve5BMfZCpQonRCD4vrBZdVaM2kFMFjiZtII6P+eD
+        JqV8qQ002Gdc6LWju4DIDS6l/MQ2fjCA5Dl33Zkdg6wIgeRui3oZP55c7uuOOjyhCcllTj5fNhppQX8B
+        BXhaEaqMOQECCsLvJP9X/UtJCytBIFkjeuTWEfWau4KUelYsT8AGo/wkZYk9KE5vNCzlwmGIgECOB2+8
+        xosQIJYefs9e68jUDL0RROHXkc15jaq1gziP+caRTFYwV6Dncz7dCiAUV+S16LrW6w7DBATzFpPtsVmM
+        DIEAz5XjrjO7c4ht/GDhlln9NP6BnlH59HJONA6cbIAlNWf5UPFcktno0xZLbzBUQIBnCwfFhnbRGz+x
+        8k8rR+6Na/hgYU1ytTwcibt2UJbt2Wn8qKxh5RMzYDxiYXJCJQluIIYLiKU6237iwK4XLyVtY69vXPzF
+        r0sJzvDryBc5Daqn8eMIYHen8V/alSILSZ3lK8+xFRkEQj5gvIBAzIxtT1wKnIQL9YnstWH9lWvwYMRl
+        Gf8AX8aP4oLrhzOfO9HATm5irTydgXtPf+AfAYGU8Dwrh+Fcf8X2aFbmuo6Ut7GNHYygSqd2QD03h2cT
+        O5bxo3gh/mIhKx6AfFqfbKQ3/hMQQMLii0IK//aES/c3s9eDY9dwYgHX2MHKJ1n18lFh3P1g9hp91nYa
+        P9IsWXerWfHQGyL/58/Zrhr+FRBgTFhyxa8TE7UnXhb3jLCNHOycdlHGPzo8QVcPpMtDIzn5kOerLEDB
+        Q+DlA/4X8ClIiSA0csLoyrWX6cko/ySj45XPHrkVSqB2EH883D0BFCxwZVXI/TXXdItOgH9dIAiYgOBJ
+        Ty0t336bF0cnlhO+ZD8byd1QmP2qsT69loZdlPGX59nSK3b5MN7D0R/c7weSgAoInoz2yAfDcPLowUJl
+        FPu5pt7QDL+O7C9tdVHGPyXTKyWZTbY0izUwaRZ3BFxAybSVFvNOiHHhX1iJvCbiT7Jam/vMkyEafh3B
+        YUfplkH2/oClqV/W8+m1idwIgkNAyRzNP8rT9TT+5fiNzOfYwm+ozX7VwBHA/QFKIutBEAlo48n4AC2l
+        /MAKpZWF8kj2Myr6bQ+cDhd2lqCA4Pn7DAWCTkDJ3JycJftU0oXwO8Q/sehstYVtyFAFRwhjOwF3r8FO
+        cApoZ2pMPrnIm3SNWvjFI7ecHzgdymAmj3QSHpo9G4K9YHAL+BQcirmUtlPTwZiLpdfY96piHjgdiuBI
+        j2/zG+UZ1lkdg6rPKg52QkJAG3P0pL+JljJ2u68xxDM/VMKv2gOnQwX88XyaVU8XajplyT5O8efuM1QI
+        IQGfgdTKYvZh1c3wy3GfynGk8+tQzuTqgdPBDMRD8vmECLfRjb1UPziueuB5KBGSAtrBjHmx/CYtx34s
+        Jx12AbHWzP1+nWi0UAu/dvFOVVroRkM35XUNySIK7v5CkZAWcIW5WZrvqaXF3GO0HLlW9YmXl2q1PfEy
+        kGCD+sbsBll4cNvcQ+mWgbDo8ZwJDwEdETJyP0fy+cMMzx44HUiwOQp7gq/UdVF8cy+V9o6ImXtoTjA8
+        IfwEVKFp2CobN9hCMK4H2y+x++1sdQddre+SR3O0h/jkwlNeGAFrBsZkKLsgZsG/FLfI3hANHwghcQDS
+        +2Iy9ENRM50T0iGVktTaT+V9o6rFpuHKCyMgwBiqfWxCNnZ8S++KkLtKHtGXOWZ6J7WW1gg59JIS74My
+        eiS+P8tqoJ+F+BAOk4lb4rMftvXTo5GJF046R14oAZ1B8rZ9dFImcuPEeCumqVf2Rhh/Id2B7Zo/FbXI
+        E/M/y6qXR+mi53IGvSlyc3gAzQ/i9/G64xXt8n0gWqS5W74/ZrAtYiiAjfBqZVQvGi+0gM5gKQu5wqHJ
+        aTIPWWWpU27nEKWJfyaKXhOCggfi3/H41XstfbIXxT+T2wZEjzYgx29Yl8WYE1UqkDwcZ696sSrgKgFl
+        VcBVAsqqgKsElH+gp//j/s9VVjGWx/T/AS9VebkLYiqlAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="cbPieExtent.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAKAAAACWCAYAAABZ7IOdAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMK0KCsAAAB3BSURBVHhe7Z33
+        V1xXfsDzazbZnPSTk7Kbk5zknOwm3uIt9tpZO7v2tpPsru21mlUsWQUJ9WLZFgIEkhCgDqhZBXWQAIEE
+        qog+AwwDDKJ3Zpje8H/wzfve0QzvDV9gyptXZvjhc1w05b65H936vd/7R1999RUssIBcLAgYAR6vG6x2
+        E8NmnwSnyw4utwO8Xg/5+gVmZ0HACNC2P4KN6a8zkjPegJ1H3oU9Ob+B1FOL4OCZFXDq2na4eT8XqjXF
+        0NWnBZvD/FLOqRmflegsCBgBTW2VsDbl+yGxbv+rsH7/D2BH1juQe2kD3Hl4Clo6n8CkZZz87ERjQcAI
+        CEfA2diQ+iMw9DaRn59ILAgYAWIIuOnAG+Bw2sjPTyQWBIwAMQQ8kL8MpqYWxoQLAs4BCuL1cni84OFw
+        u7l/cogh4LXyLPI7E40FATlQqtGBSTC0DIHm6Qt4cEMLN09Xw5Wcx3DhYCXk7y+HU5+XQe6OO3D801JR
+        BNToq8iyJBoJJyC2ZMP9Jmir74OKaxq4mPUQsrYUweFNt+BQCBzZWhS1gElpr7G1Q6p8iUZCCGg22qG9
+        aQBKL9ZD7s67cDj5NilXKIghYGbB8oXx30viWsCJEQvrQrO3FZMyRYIYAl69d4gsbyIS1wI6bC7I2S6e
+        fIgYAjZy76fKm4jEtYBTU1/B9ZPPSJEiJVoB16f+kO0fU+VNROJ+DKir6yNFipRoBUw7vZgsZ6IS9wI6
+        HW5Ru+FoBbx27zBZzkQl7gVEis/VkjJFQjQCYmBCW9dzsoyJSkIIiEswlEyREI2AyRlvgtk6QZYxUUkI
+        Ae1Wl2hLMdEImHrqQ7J8iUxCCIgUnRGnG45GwIX935nErYAujx1GLZ2B/+7QiNMNRyogjv86ehoEZVwg
+        zgT0Tnlg3PoC6rovwo36jXC9PgkcbjP7M5vFyYIJKKnCIVIBtxx8Cyw244wyJzpxIaDb64Te8Toobf4C
+        Cms+gSs1qwN0j1UHXne7oIaUKhwiFTDt9CJBmRfwoWoB3R4H6IcqoLhpFyfbGoF4fqr02YHXY7jV4WRa
+        rFCJVMAbFUcEZZcT79QUtA2OkH8mNaoUcGrKC12jTznxdpLS8blauw6cbgt7H86Gj+2+S4oVKpEI6Fv/
+        q5nxHHKRV/Ucvr/3CJRq2sg/lxJVCTj11RQMmVrhXst+Ti66xaMwjDwKfEa03XAkAuL6n8NpFTyLXJQ3
+        t8N/7joE/7EjE17ZcxguVzeSr5MK1QjocE3Cs848bowXunh+qtqmlz+6WodJsUIlEgEzCj5SRPxf/Ys+
+        +A4nHcrn5z93HYTjFU9lK5/iBcTutm+iAW41bCHlCgXWDXt8LZDL6Ybje0pIuUIhEgGvl8s//nsxOgFv
+        7j8mkM/Pt3cehIN3q9jYkHpvLFG0gLiWV20oiKjVC6ZjePoMxp1zdaRcoRCJgHLH/41bbPDLg3mkfH5Q
+        QtYSEu+PJYoVcNI+yJZVKJkiobINo1B8f8OxG450NhyugElpP5Z1/Gd3uWHxiYukdMG8svswFDW0kJ8T
+        KxQpYO94PVyvSyJFipTrdRsCs2E8ahlpNxyugAfyl8o2vvJwz7n7agkp22x899MseKzvIj8vFihKQJzl
+        6gZKoLBWuJgsFh3D011hxdUmUrD5CFfAK6UZgmeUkuyyR6Rk8/E9TsKG7n7yM8VGMQJiyjPcQgtneSVc
+        7utQBl9r1K0fgUMRdMPhCtiguy94Tqm4VqOBb3MzXEqwUPhJyjEYNMb+6IAiBMSttCcdJ0hpxAT3hu0u
+        334sHkaPZFE6HAExAZFVhvMfzzq64bt7skixwmHJiUvg9njJ7xAL2QX0Trklkc9P+/B0i1RxVUNKNhfh
+        CJgqw/6vfnAEfvR5DilUuHyLI+feY/J7xEJWAVG+54YzpCixoqI1PfD9PR2jYc+GwxGwsDRT8LyxZnjS
+        Au9knCZlihRsSas7e8jvEwPZBMQJR03XWVKSWHKtbj1YnKOsDC6nJ+zZcKgCrkt5FVo6n0LZrcdw9tgN
+        aGnsAIfdOeN3EAuLwwnv554nJYqWN/YfY3JT3xstsgiI8mn7bpKCSEH70HQ3/OC6lhRtNkIVEPP/YRbU
+        z5Nz4b2fJsH7b22Ej369HbL3nwNtvR7cbvHySeM4Len8TVIesVhdcC0mOyWyCPhirBoKa9eSckjBvZbU
+        QFn6u8bDyhUTqoApJz8Ap8MFH/5sMxOQD8q4eXkaPCqvBbvNIfhtwgWlyLhTycZrlDhi8a2dB6EkBtEz
+        kgs4au5g3SAlhlTgOqPZ4YuHw73hk5+VkbJRhCrg1bKDrKULli+YT97fC3euVUXcIp59VMvkoKQRm7fS
+        ToDV6SLLESmSCojh8cWa3aQUUqMbLA2UK5xF6VAE9Mf/XS64Q0pHsXXVAdBpDYLfaz4etHbMiG6JNWlF
+        4q5rSiYgRrU87ThJyiAH5S1pXLl8Y5qB7omQZ8OhCLg586dgMo/BpxuOkLLNxvtvb4Sj6RfANOE7xzIX
+        2t5BFlRKSRJLcL+4tX+YLFMkSCYgRqNQIsgFnh2xOsdY2dwuD+TtKyeFCyYUAfef+gPYrHZY/O4WUrT5
+        WPPeXtBppk/0BdM7boTXU46SgkjB4uMXweMVZ4FaEgGxouUe91G09t8NlDHU2XAoAl4vz4LmhnY22aAE
+        C4VF72yGW5cqwOMRjg0n7Q74XfZZUgypwNCt5wZx1gZjLiB2vQ/12aQAcoOzYX+kylCPMaTZ8HwC4vhP
+        Z6jmxn93SbHCAQUuyLkW+C2dnIyr8gpJKaRmEdcKirEsE3MBe8ZrucqOXYBBNFytXcu1zr4bi1DE/P0V
+        pHR85hMQr+6y2iZh28cZpFThsPL/dsFAn2+2jiFkn10vI2WQAzxXIsYOSUwFdLqtcLtxK1n5SqGlvzhQ
+        3kdFLaR0fOYTMD1vCTeJmISlv9xGShUqi9/ZwpZxsFwYpXyqslqy5ZZQ+X3O+ajHgjEVUNt3i6x0JYFR
+        1zhMwPIOstnw3N3wfAJeu5fFtt2iGf99+LNktkjt/x1v1TezcRclgZzgX4gq3eyTpVCImYA21wRLj0FV
+        upLAbtjyclEaU/qe/uIeKZ6fuQTE/V+8STOc9b9gPnh7E5t8+H/HGkMvCxClBFACn5y5HihrJMRMwIae
+        QrLClYi273ag3E/u6kjx/Mwl4Mb019j9b7jNRskVCsczLsIUN97DsnSNjMNrX+SSFa8U/osbC0YTuBoT
+        AW0uoyKXXWajRLuXBUhg2X2zYVo+ZC4B8fzHxLgp4vFf6vbjgS05k80OvzqUT1a60sDQf379h0NMBNQN
+        lpAVrVTw3LDJNsDK7vVMzdkNzyXgpbtpEY//tqxIB4vZd3um3eWC5aeukJWtRDAGMdLJiOgCerwubua7
+        jaxoJdPM64aflbaR8iFzCVjfWg6X88Mf/338uz0wPODblXF5PJD85W2yopUKTkYqI5yMiC4gJg2iKljp
+        FDftDnTDeHFh1mZ6NjybgBtSfwhWuwm2r84kJZuN5b/ZAV3tvex7cWH3cOlDxS23hMKWi0UCD0JFVAFx
+        Mfe+LpOsYKVTWLsGxiy+87B4oSHekBmOgJj/edJkYet3lGgUi36+GWqfaAO/X+HzJkUut4TCT9NOsEPw
+        /mcJFVEFxD1fXNagKlgNNPVOLynM1g3PJuDlkvSQ4v/8fPD2Rii5+TDwfY/0XfDKbl/WKjWCrXZjBGeJ
+        RRWwdeAuWbFq4a7mU+45fN3w+LAZDhPdMC3gq6DRPwx5/e/9t5LgzNEbgX3ojuFReH2ffNEtYpFyqzzg
+        QqiIJiCecLur/ZSsWLWASZAmrN2+5+G64bMHHoQk4Mb018FkHoW9SdmkcMEc2HUqIN+gaRLe5rovqkLV
+        xs8zToV9jlg0Ac2O4Zil1JCSxp6rgWeqvqcPScB9J95jZztwC40Sjs+utYfA4fCFtftCq86RlalGMEAB
+        F8/9v18oiCag0gJOI6VE+1lgb9g4Zp0xG6YEvFKaCU21OlI4Pus+/AImxkzss51uN6w7e4OsSDWDKUH4
+        XsyHaAJWtmWRFao2sBWfsPrCjLCb/PJw1ZwC+uP/Lp4uIqXzs+J/d0Ff91Dgc/dx4yWqAtUOZuPiezEf
+        ogjo8ljhRv0mskLVSEPPlcCz1VS0zyng5ow3wTg5Ap8mzX7+Y8kvtoK2oT3wmRefNqh2uWU+3s3MCzxn
+        KIgioNHaK0oWU6VwR7OHTarw2caHLYJuOFjAfSfe953/mGX9Dw8alRc9CfxWFS3tUWWtUjp4UAozsvqf
+        dz5EEbBr9AlZkWoFF6X93TDC74aDBcTzv5q6NnL/F//flTPT506aegbgVRlOskkJrgfWhHFeRBQB67sv
+        kRWpZjBXYeD5qgykgDj+a+l8Ro7/cK0vN+18ILSqZwyThB8nK03NoHCYwOh/0k+y3DT7bpZDx5Av904o
+        iCIgzhypSlQzRU07hN3wlqIZAiYfeAPMViNsWzXz/Mdnm3LA+TKLAHZJv+DGRlQFqgVM/YGivbYvF97L
+        OQ97r5fBucd1rFUfmbSAg5vV850IlagFxAsCxc7nrARwNjz+cm8YI6XPZ1bOEDD19Ifs/AdOMvjyJS9P
+        A8ukLzG5062ck2yhgut5mHEBz3zsLLzLRMPIbDyPjNE6/PqPlqgFtDkn4GrdOrIS1U49rxtueOjrhvkC
+        FpZlgrZeeP531W93w+DLk2x4mAhbCqqSlQCKhmPSD45eYNEspyufs5uU8E4Rqe4MiVpAvB5Vqccuo+Vm
+        w+ZAN4yL0ijftICvQpO+Ci7lFQfkW/ar7dDe8oK9Htf6jpY/UURoFS75YNeJLdrGC7fYCbt7nGhDJjMT
+        Teq7QfhELeCgqZmrrPgUEJ8L76bD50ShsBv2C5iU/hrYnVbYtCyVyfeHnyXDk/v1gd/ldn0La2EoIWIB
+        io6ivZFyDH5zuAA2fXmb/QWoaOkIjNGkatXCIWoBXR4bDBi1LPeypu8Gmz0+6TwJ5a1p7BrVW41buZYk
+        mZ0RweUNf8XOrGxlUtt1PvCsTU+6AgIeyF8G46NGWPqLbawLvnlxOhLkafuLmGWtwskAio2Hld7JOAWb
+        LtyGI2WPWETyINeiYaZUf6CDGohawPnASQoeUMdYQZOtn12j3ztRD/qhcnZy7rmhAB6150JZ8z7W5eH5
+        DJ+sGNggv6i3GrZyFerbGzYb7ezWdRQQ7//w53/Jz74aqPTO4THRTrLxlzg2cV3n4ZKHLCUbfgcGMvB/
+        55DhnmXK4wLnSBcY62+DqWl6nVIOYi5guGBlO9yT7KquYbMe+o1NbKG7ub8IarrOweOO41Cpz2IHyrFl
+        xVbVl201VrKu4VoW3/VVuKZ3JfcxE7BBV8HOf6TuOAHul5HAY2ZrRMstKBq2ani4BwMUMu9Uwp1GHWh6
+        B1mLxv99wmHK6wHHcCcnWQkMl2ZD14ml0JbyJjSu/itoWPGnUP/RH4Nu7w/I90qF4gQMD2x1pljiS6Ot
+        DwZMWm4G95Tdoq7pvQHPDHlQpT8CFboDnLCfs9YMW1jcNgwndOx519nAd+Kt690DrWBzmOHEwctgf5l4
+        3OZ0sYQ9lGB+cIyGUc+/PpQPK/MK2Q2V12u10Nw3xMZokU4GptwOcAy1w2TLfU60I9Bd8Am0ff4aNH78
+        FwHRZgNf4w/ClQOVCxgq3EyPa1lxOOD1utmdcUxYo4aFkbUO3IXG3qssgSbepoStKwbX4hWxuMRU1IiL
+        0jPXv7wvjyJiEOaWS0UC0XBPFG+oXHbyMhwo5rrs503sDg8ULdIjjF6Hhes6DWBuewgj93Kh59wGaN3z
+        PWhc89ecaF8nBZuPhpVfB7dJvIST4SKagK7RURi6fg1Gy0rB+OwpWNp04BgYANfEBHjM3HTf4eDGHuIu
+        YsYSXH5xex1MVmxhqdf4wYVavFUoveg+i4djYzSbI7JbhrixJIrmMg6ApeMZjJQfg56z66F11yug2fBP
+        nDB/BvXLv0bKFCm2F9Ozd6kRTUBLaws0LV0ETUs+9IH/zqFZthi0H6+A1qT10LZjK+j37ARDZjr0nS2A
+        keIiGK+qBFNdLdgMneAaG2Wiel0un6wiZeFUJJxoU24neKwTTLTRyjwmmu6zH4N287/6us7lf0IKIzaT
+        zdO5aKRGNAFN9XXT8kXC0g9B89ESJq129UrQbU2Gjn2fgeFAGnQfzYGBy5dgrKIcjM+rwazVgL2nG9xG
+        o2paVY/VyEQbf/Il13UmQXvGu6BN/peXoonbooWLsfYGWWYpEE3AiSfc7JASK4bwhW3bvsUn67Fc6Dt3
+        BoZv3YDxh1Uw2djAhgP23h42HPA6Y3dbEeIyDflEe3YZ+i7vgM7s34N20z9HPEaTgvHq6QBcqRFNwLH7
+        FaQkigGHA8uXgnbFMjYkwBbWkJEOvXmnuNb1IozcKYKJp0/YUMLW/QIcgwPc4NzIhgTU8/IZf3wBOrN+
+        C03r/o6bVf45V6nytmjhEhcCjpaW0BWvNnDsyv2TjV1XLoeWtWugdeMGmOLGpdRzI7aeJmhc/Zdk5aqB
+        +GgBHyi8BYyCztR9bNLgf1ZqT3WwKJ2sXDUwEQ8CTjyVfgwoFSMlwu2qB9pRaDD4jlf6we0tfcp/kxWs
+        dEyNdwTPIiWiCWiqi3IWrFA0y5awyYv/OTE4df9VPSSd1oDFIZyB2/t1quyKrV11gueQEtEENDc3B8ZP
+        8UTHvs8Fz2myuWHpkXpYdLgOcu4YuO5Y+DuM3D8p+7JKOODCtnPclx5ODkQT0N7TE5cCBne/FZoRJh+y
+        JKsenrUJU1FMedzQnvkLsrKVCG7F4YI4/xmkRDQBsZti63JEJaoVfB5cjvE/I3a/X1xpCwiIrD3ZBONm
+        4QzZOdoNmvV/T1a40mje+u+CskuNaAJ6bTZoWf8JWZFqBbcN+c9otLpgeU6DQEAk42YHk5P/WtzxkGor
+        LRpwoZxfbqkRTcAprxfatm8lK1KtDBdN541GHrWOzZAPWZxVB/e5mTH/tRiLZ8h5n6x0JdF3aZug3FIj
+        moBIZ9p+siLViGbFMnAODQqeL6VQTwqIrMxtgCGjcNfEPTkK2k3fJCteEXCTpUlNmaDMUiOqgCPFt8nK
+        VCP6ndsFi88TFhcnWSMpnx8cH3peZkLwY6wvgoYVyuyKMTLaJeMMGBFVQHMLLsXQFao2MJiB/2yPdeOk
+        dMHcrhG2mihxd97HpABywyYgxK6OlIgqoMdqiYuZMD6Dc9iXy89PJjfRoIQLZgXXFfeN2QXvdVvGWegV
+        JYGc9JzdICinHIgqIMbm6XduIytVTWD3i5Mq/3NN2tzk7Hc2Pr2oA1dQNDQGfbJoZkIEWeDGf+a2yK/Y
+        EgtRBUR6T58kK1VNDF4Vbs4/b58gRZuLa0+n1w99TEHv+Y20DDKg2fhN8NrnPmogBaILiAGgVKWqBQzD
+        cgTNfrOLDaRkc/FRdgO0D1gEn+N1WqF193dJIaSm6/gSQdnkQnQBMeJYu/IjsnLVAA4h+N2v3eUNq/vl
+        s/VMM3s///exGmrZUUhKCsngZuWW9umsrXIiuoDIi+wssnLVAEZH85+ltsNIyhUq5x7MzBY6cGs/LYZE
+        4Ak7DB8LLpccxETAiUcPycpVPEsXgc1gEDzLsZIuUqxQwcgZXZ9wrOV12VlGAkoOKRi6kykoj5zEREA8
+        B6xdpb5uWLdlk2BdzOWZgo+Pzb34HArJ+VxX7BTGDtp6NNC4Cs+P0JLECs2GfwCPTRhMKycxERDpK8gj
+        K1nJ9J8/J3iGhi4TKVQknCh9MSNgAdNoSH2Aqe/SdkEZ5CZmAuJBc5xRUhWtSLjuF49v8p8BA04pmSJh
+        CdcV13caBZ+PcXj61LdJUWJB0yd/Ay5j0E6NzMRMQIwGwUwIZGUrEAwl42disHFd5toTTaRMkYKxgxjS
+        xf+dME0aHuekhBGXr8HgrVTBdyuBmAmIGKufqiZKGlOF8Muu7Z6ExYRE0ZJVNPNqe0zLEevYQUz34bFN
+        zvhuuYmpgLgm2LZtM1nhSgKHCla9XlD2k2UvSIGiBWMHq1rGBN+FE5/OI78lxREFTm45z/7ORUwFRDCX
+        i9Jbwdakddx4bPqei1h0v3w+4T57zCw8h+Ea72MzVFKgKOk88jtOcuGCuFKIuYBYsfpd28mKVwo4Y+eX
+        ubXXzFoqSh6xOHCjHbxBsYMT1YW+ZEWERJGiSfoGuCfly/83HzEXEDFrNNCk1Bkx1zpbO6ZvskQKKnpI
+        acQEBb/X5LtPJADXSnUdX0yKFAl44m2i5rrwOxSGJAIi3bnZtAAyg3lf+BmznG4vrDkeu+6Xz6pjjTBs
+        CgrjNw2DZuM3SKHCxRfvJ2/A6XxIJqBzZIRlpqIkkJPekycE5dT3W2Le/fLBMH63RyiJqamUBQxQUoWK
+        7rMfcX+xQr82VS4kExDBQ96UBLLBdb/mZq2gjBeqeklRYgUu9cwM4/dCz5m1pFih0Lzl39ikRvCZCkVS
+        AXFC0pHyBS2DDLRsWMvSAfvLh1mvYjn7nQ0MWOga9l1uGCiL0wotO75NCjYXmg3/CPZ+3+1OakBSARHs
+        ilvWriaFkBrMpsovm36A634JQaRg5/nWGWH8GLMXThg/7qgoIcw+HCQXEMG1QSXsE5tqawTluvSoj5RD
+        KvD7+eVB+gv3kLIF07T2b8Gsq5rxfqUji4C48t9XkE9KIRXNa1YJFp/xkpjNZ5pJMaTio5wG6BgMCuN3
+        WKB193dI6fzgPSHmlvuC96kFeQTkwLD3rkOZpBxS0J1zRFCe7hEby3ZFiSEl28+1gGNGGH/NrGH8OOGw
+        dtUKXq8mZBMQ8disoN+1gxQk1hirnwnKclnm7pfPmfs9M67tGrydygnHjx38GrTt+4niwqvCRVYBEZyU
+        tG5YR0oSK/DQlNc+fXgc1+G2nW0hZZCDZdysWPNCGLWMYfz6lDeZfLjD0VOAM3jhAXg1IruAiKO/D1rW
+        ryVliQUvjhwWfH/vqDK6Xz7rTmrAbJ8eoyKOwXaWYWH82RU2jub/mVpRhICIow8llCa/IM7C+d99o3qA
+        lEBu8EAUv5yIx668mL5oUIyACLaEGBpFSSMWzatXgts8XYlu7xRskXn2Oxu4JVjTPp0gPR5RlIAIpsTF
+        W4woecTAkHlA8H2YSEhp3S+f9ac0YLIKu+J4QnECInis05CRRgoUFUsXsatk+d91s3qQrHglcfh2J3k5
+        TjygSAERvBqrN/+0qDsmuPjsnpzufqe4SlVq98sHW+hHwWH8cYJiBWR4vTBW+QC0q5aTQoWLIV14Kgy7
+        X/+dH0oHYxRHJ+W7TiFWKFvAlzgG+qF9725SqnBAmfmfe7d+iKxspZJ6VR93XbEqBERw3xYTB+GVq5Rc
+        84GtKGZw5X/m7i9byYpWMiX1yj3fEQmqEdAPXjzdmZYS9km7ztQUweItZrRXS/fLB1PFBacAVjOqExDB
+        QAZTXS3oNm8KWcSx8nuCzyhrGCYrWA3svaSbEcavVlQpoB+8zRzD/Nni9RzZ+bHb5i8+I3jjJVW5auH6
+        s+AUwOpE1QL6QRHHH9wHTK9GCYjHAPjdL+ZnUWP3ywez8WMIGf93UCNxIaAf7JoxzMqQkS6YrIzcLRa8
+        rqJp+sZLNbPrQuuM2EG1EVcC8sEFZ7y5qX3vHnCNTt/jhssYwTdeqhU8v3LxoTpOv81G3AoYICgnCna/
+        y7LV3f3ywWdp6VFvhEz8CxjEA+0oWZFqZlO+FuxOdXbFCSUgpsjdFyfdbzD5Fd3kMyudhBIQb7zE2SNV
+        gWoHD9RbHMJE6GogoQSc7cJpNYORMkeKDWAKSv2rFhJKQLUvPgezuaAZ6g3GGdn31UTCCBhP3e/q401Q
+        XDuk+jVAJGEEfNYW2oXTSgYDEc7e74mrEP2EERCz01OVqgaw5T77oAfGFgJS1YnF7mbXp1KVq1RwlyPp
+        tBauPO5X7QQjFBJCQDzaSFWyEsFuFtcqn3JDhngJuZqLhBDwXGWvoo9eYuuM+QFxYoFbhWqe1YZLQgiI
+        LQmm38AYuj0XdWxMJVciSgQPnK862ggZNzrY1uCIyZlQ0vFJmEkIH7PNza7iuvy4D1IK9UzIWLaQeFEh
+        5no5dKsT7tQNsav842EJRQwSUsBgMBUazjDxdnTsBvPKu1nr9PnlNkjO18LKow1zRtCgwHhsEs8YY6gX
+        ioY3pZc1DoOGEz04ydAC0ywIOAfYLWL8oMc7P3jrkZd7fXBevwXmZkHABWTkK/h/lpVQcZb35PwAAAAA
+        SUVORK5CYII=
+</value>
+  </data>
+  <data name="cbPieDonut.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAKAAAACWCAYAAABZ7IOdAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMK0KCsAAAB1YSURBVHhe7Z33
+        W1TX1sfff+h9403uzc0tuSVvck3exN5rNPYSa4wmVkTALioCUhQFpKkgiCC9987QGdoUmBkYRIo/rnev
+        PaIz4xqnnTlzzsAPn8fnQZhz9lnf2Wettdde+79evXoF88zjLeYFOI9XmRfgPF5lXoA2mNCrYWKwFV53
+        lcHrliyYrH8Kk9WPYLLiAUwVhbynJNz0c/b/+HuvO4rgtbIOJob74dW4kfzsed4z5wU4oVPB654qJqIE
+        mMoOhJmEnfAmcjG8ufsDvAlbCG9C/+MC7O/C/49/xkz8TzD14jxMFYfBa0UuTAy1wSvjGHkvc5E5J8CJ
+        4T42U2XDVM5lmHm4kYnke0JAHiTsWybwJTCdcQYmaxJgYmSQvM+5gu8LkL0G8VWKr8mZlJ/FF9zHYDPs
+        RH/ju3sdZzR3KGFsbO68un1WgBNaJZthEmEm9kfTrEMJwMvM3Ftl4Sd2KYfgz2vPwdfbLkJQRBoUV7fC
+        8IjeYly+hm8JcEzPgoBimE4/BW8iFpFGlxLT6Sct7j+joBY+WXbyHQuWn4K/b/SHUzeToaqx0ydnRt8Q
+        4OgIj0JnHqxnhnU1cBCfydoki3GcvpVsIUBz/rDiFCzedx1inhaBclBj8XdyRt4CNGiZEVNg5v4a0sCS
+        hrkFE+rud2MxGsfh31sCSfFZ85f1fnDmVgq0dw9YPg8ZIk8Bjun47IE+FGlcGTATu5mNZfzdmDD4+HTF
+        aVJwtvh8zVk4eikO6hU9MD7+/rPkhLwEyBx2TAxjbo0yqpyYyrpgMbb4jFJSZI7w2crTcDDwIXT0yC+l
+        IxsB4utqOuO0ZCNaZ5lsem4xvsNBsaS4nOEv6/zg6r0M0Moocpa+AI2jMFkRw5O3lCFlSfh3MKEbejdG
+        vWEM/rrhPCkqV8A0TmpOFfcrLZ6lBJG0ACc0PTD95DBtRBkzk7DLYpzVTZ085UKJyVXw8/b7x0g+Ypam
+        AJlD/br5BcxELScNKHem8oMtxns3MZcUkRD8c3MAPGWzoVSDFOkJcHQEprKDfMbXo3jdlm8x5m2nIkjx
+        CAXOhhgtD+sMFteVApISIJYwzSTtJY3mM9z9nn/JZseMAcPna86RwhGa5T8HQ3NHn8Uz9zaSEeBEX8Pb
+        lQzCaD7E9OODFuMurGolxeIp/saCnWd5NRb34E0kIcDXrTmyWLsVgqnSSIuxX7v3nBSKJ8FlveAHLyQR
+        JXtdgJNVcTwtQRnL91jIi1/Nx7/y0C1SJJ4G/UIscjCMerc41qsCnKyM9elg4wMil1pUQ/cNauCzVWdI
+        gYjBAsaus9FeLfnymgAnK9nMN5fEx5hO/93iGTwvrCOFITYbjoWCWvs+MBITrwiQv3bnmPgQLJA1fw5n
+        b6eQgvAG64/dAY1WZ3F/YiC6ACer4uek+HDMEwMt757D+Pgr+HbHZVIM3mLziXDR15FFFSAmYPluMcpA
+        Pg7WLJqXXym6+p0uvxIDTIqP6MVLWIsmwIn+JngTsZg0zlxgKivA4nkkZpaRApAC+y/EwKhI5f+iCJCv
+        cDzYQBpmrvC6OdPimeDSGGV8KYApmivRGXyXnvk9ewLPC3BUZ9oOSRhlzsDcDtylN/tMxoxG+HKTP2l8
+        qYDJ6oTnpZa29AAeFyBWfpBGmUNgBbf5M6lp7hK8/MoT4BbRsro2i3sXGo8K8HV7wdyMeK2Yyr9h8Vyi
+        UvJJg0uRr7YGwoBKa3H/QuIxAWLLCTlvGhKOhbxhkfmz2X3uHmlsqbL3/H0weqie0DMCHDfC9LMThDHm
+        IBGL4JX+fVUylt//WaTyK6FYsPwk3HtSYGljgfCIADHjL6cN4p5kmgVg5s+msKqFNLLUwQ1PjW29FmMR
+        AsEFODEyAG98tJTeFazLr27EZJIGlgPrfrkjeGm/wAIcN5XTE4aYk4Qx/6+31uIZbToeRhpXDuCr+EGq
+        pT/rLoIKcEJZPx/1mhO1jDdMmn0+mmEdfLbSe+VXQvDPHwMEjYqFE6BxDKaT9tGGmKNgIGb+jF4U1ZNG
+        lRsnriVYjMsdBBMgtp+dn/0ssS6/8rvzhDSo3MBVEkymm4/NVYSbAceNMNmUwZvuUMaYc+Dy26Di3fPB
+        8qul+2+QBpUjP52MECQgETgIYbBXMe9MGrOWNswcAcdv3v20t1/NZw7KmHLkD8tPQVldu6XtXcBtAY7Z
+        +hYw5xtTEDPRK0gD+TrW5VdJmeWkIeXM5hNhbs+CbgkQl2d+K2yBm9Wd0Gdj1z2etzGVd9109AFhKF8F
+        zwwxfw6HL7rf/UpqYEFFQeX7Km9XcEuAdYPDsOhJJXz/uAJWpFZBVH03qA30Nr8JTS9MZ/nPjYroiEUw
+        oX2/aoC9nf/3pyDSiHJnx+ko7t+a29oZXBYgzn7HC5q5+MxZ86waklr7YHiUrqjFIxOmn/0mv4gZD63B
+        g2cerIeZ+K3vwbNGIpea/v/t8uNM3BaLMeMSli/5f+Zgc8w2N1oFuyxA89mPYmNGDTzvGAQ9tfueiXei
+        twamUw68NRxhcG/DviB4xMNUziWYrH/CZ/BXhmHm2zJXA/f2vmOU93rBqu/XbXkwVRjyQfpFTuVXroC7
+        +8zH6wwuCRBLtf1KFKTwrNmRVQ+FvSo6WMGWu+2FMPNoh0SEuJBHr1hEO6HqMAnM+p5d4HzoU/hi3Tm+
+        EZwyoNz5x6YLLu+mc0mAvSMGWM58PkpwFD8wDuc1QfWAlvYXsAtqY7rpdUYKw9Mw4cVu4kc94BaCD+7P
+        TXDMuHwVm1YMa47cluRuOHeJeVpIjt0eLgnwXkMPKTR7LHpSAb8XtUCLeoTe8MKMj/uGxTx2YSZqGUxW
+        PrRYs/Uk6DuX1Ch4UQLm0ihjyhEcjyspGacFqGMRHfp3lMAcZenTSggsa4OeYRv7T/UafgwqLuZTohEE
+        9srH9r/YBpi8Bw+DG5NeljTA8gPBpEHlxuerz0LfkPPtgJ0WYEW/hr9SKWE5C6Zubtd0wpCeOfLEtdCx
+        n8q9InzrtrDvYKo0yhRAENcVE9wE7s98RLlXySDhCbnkGD+G0wIMLG8jxeQOmLqJaeyxnbpRdcJ05jlh
+        cohMzJMNaeR1vEk2mw2x1IkyrFxYcyTE6b0jTgkQk8yr0qpJEQkBvtqfKPrBYKNxInZXmE79hc9gpLjs
+        wcSHZwVTny0FMJ/27U5p9YtxBjy5aVA9TI7NFk4JENMplHCEZvuLenjZNWTz2/S6qxxmkvY4l7oJ/45H
+        2tTnSQkU4fe7r5IGljqYZsKO/NS4bOGUAK9WdpCC8QToZx7IaYRSpZq8F36UQ0sWX3UgBWfBQphEn4/6
+        HAnS2TsEX22V59Kds8WqDgsQX4vr092Lfl3hhycVfMmvfsjG1I45xNrkj5Z/TT85IlhSWSzwsOo/sciS
+        MrKUwdnbmcZGDguwSTXCxUCJRAxw2e98qQLaNTYSxZhDLIv+IHUzE70SJrTSOprAUfAAG9wIRBlaquDa
+        cE+/ihwPhcMCTGrpI4UhNouZEK8xVwBXY6j7fIXlX4Uhb1M37NVb/Yj+PRmAuULs4UwZWqqgH5iWW02O
+        h8JhAZ4pbiUF4S0wmR1R1/2RHGKfaU+uBHJ97tDUruTRJWVsqXIx8hk5FgqHBIj+H+bqKCF4G0wLxTcr
+        beYQfQG5bWba8ls4OQ4KhwSIfheu41ICkAqYQ0xtG7CZQ5Qz/UNa+PtGafcTNAd7Xzt6/ohDAizoESf/
+        JwTbXtRBYa+N1I2MCQhPJY0tFdD3w6Lbf/0YABt/DeWb8KlxWOOQAF2tfvEWd2qE2bMqJbCpuTcPtZkF
+        K3i+WOsHi/de5131/UKe8ILboqpWGNKM8JnPmaoYhwR4VmIByMfAAgeVjX0pcgYj4tWHxTnWC0X26crT
+        8M22i/woscNBsfxsOVzl6Ogd5Me+4j4X8j5HR0Hd0wMDbY51VnVIgN5IQLvKpQr396q6wvhb33P2X09w
+        NymPFIwrYH4RhfYl8y0X7b3GN5oHstc8FpZWNnSAis1mesMoWUCMM9yIagj6FQpozsuD/MgIeHLuLISs
+        XgWB//gS/P70GVz//juHZkK7AsT6v9UeLEAQEly+w3IxahyewtZDHmcz1rjABwE2KHqcLmLFrZOYxlnI
+        AoNVbDY7fi0BbsVmwcvSRp4wxlJ6W6dmGkZGQMVms+7aWqhISoLMa1fh/p5dcPmbr+HC3/4CZ/7wCZxe
+        8D9w+pP//oBLX3/F/576XHPsChATvkue2t58JCUwEra5Ud4FjDZyjN4CHXuquz6KbDYAwKWw3eeiISgi
+        DeIzSvmOPNwOYLDhlhjZK3N4cBAG2GzWkJUFeXfDIfn3E3Bz6RK4+NW/4NwfP4UzNkT2Mc7/+U+g7e8n
+        r2mOXQHyJTjC2FIEq6ypMbiK8e1me0++Vp0BZ1ssff+a+WbrjobAqeBkCH30km8O71IO8dmMmpHxZ3qt
+        FtS9vdBRUQ4lsbGQcekiRPy4Ga5++x/w/+sXLonsY+DnDXbYd4fsCrCiT0MaW4qkKIRd87V+hUpBiHi0
+        qs0AwGCAkSHmm7W2Qm1GOuSGhULc4UNsNlvMZ7Ozny4QXGi2wOsoiu03s7QrwDyZ5ACxUKKZzdbUGHwN
+        9K00fUpu4JLYh5AWcAHCNqznjr8fe/WJJTJ7lMXHk/dvjl0Bprb1kwaXGuinjgro/yHjLAqkfu5N8FV6
+        ZeE3Hw0ApAL6k9QYzLErwNgmJWlwqbGBBSBGN3qUUIwzB536uSN46nU9qtdzv40yuNTIuRNCjsEcuwKM
+        rO8mDS419r5s8MjhephOoX7+MTzpK+L93F65nDS41MC0DTUGc3xGgEfzm8j790VCVq8kDS41Mi5fIu/f
+        HJ8R4KHcJlGOF5UCYRvWkQaXGulBgeT9m+MzAjyY2+gxATqypIQIvfJBwu4lZJU8ZsD0i0H0GMywK8D7
+        jb2kwaXGrqx6r8+AYggQVy5uLltCGlxqZAVbnhJKYVeAyQpp7AWxx7LUKkGX4ZxFrCS1YXgYAv/5JWlw
+        qVEQGUGOwRy7AnzROUgaXGrgrjmlrY1KbjCuN/AludlluQ/+X+TVEZ1a9b4QgDC6lKhITiLHYI5dARb3
+        qmWzFpzTPUSOQQjMk9LeXJLTGYyQX6uEstJ6KHyUCJlXr8C9ndsheMliU+GARISJqzGN2fbboNgVIG4I
+        p4wtRYKrO8kx+BLFTYOw9Hw+Z3VgIey8WQ5XU5rgUV4HlDUooTSnBPKio+HxmdN8ee7Kf772yqrJmQWf
+        QGeV/TYddgXYqdV/tBe0lNjvoWS0lIjMbIMlfvk2We5fAOsuFsHRiCoIS2+FtJJOqKzrhOK0TMgOCYHY
+        gwfg1oplEPDl3zy6Znzm0wWg6u4mx2COXQFiR6yVaY634/UmuGndE36gVMDq5AOhlaTwPsZSxuqAQth0
+        pQT84uohJrsNciq7oLqyGQriE3nCOGrbVrjxw/fg9/kfBRFmIBO4Tm1/c5hdAeL66mqJ7gmmiKi3/62T
+        K70qPay4UECKzBXwNb6ezZY7gsvg2uNmSMxrh5IaNmMWlENORBR/jd9Zuxous9e4s6Vc175byJcNrcdg
+        jV0BIthgnDK2FMGu/M42SZQLcXmdpJCEBGfLFew1vpnNlofDqyA8QwFpRe1QVdMGpRnZkHkjGOIOHYDg
+        xYsg8B9/t+lfhm9cT47BGocEiNscKWNLCdw4j+3cMBL2RT9wjEXe+0IqSNGIwWzQs+1GKZx9WAcPc9oh
+        u7QNaioaoDAhGdICAyBiy48s6PkGzn/xOaScOkmOwxqHBCjlmkDsEYPn1eEREEKXY0kJXVcndPSo4PqT
+        Zh5kUCLxBsuYMDdeLoY9t8v5vaUUdEBReSv099rfD4I4JEA8FUlquUDc/3uxvM1muza9Tt5NicwZVamg
+        bPMGqNy1HXqfPmbGHYTY3A7Ycq2EFIW3wdd4YqFjzQEcEiBu9EaDU0IQm7UsILpb102ezolFA70dQ5AY
+        WgDXjqWAztYxEDKj4340FC1d9I6yTRugPSIc1F09kFmphJ9DK/hMRInBG+DruqXHsV7RDgkQwcV+ShBi
+        gLPvlsxaSG7tAw2x4I/7WhX1vXDvUhb47YyFc9sfctIfln/wu3LD0N8PpRvWWghwlpLVK6A5KAA0TY1Q
+        0TIIv9+vFTRKdhV0EbQ6xwozHBZgWK34gQgGFj+zwCK7awhGieUv3B1WXdQGd848A78d74U3S+D+R6Ae
+        lPFGJaMRmi6cJ8VnwbLFUHf8GAwVF4GiR8NXRlYFFJLiEIO9LFhy9AhXhwVYrFSTIvEEmFA+WdTCuxxQ
+        Ea1BPwqF6fVw4/jjD0RnTcKdfIfr+aTGQG4OFxcpOgr2u5V7doIyLRWU7Nndy2qHDZeKSZF4kmAWjFDj
+        oXBYgIPM6J72A5exiPZyRTs/S466B83QCGQ+qoRLBxNJsVHgzFie496p3t5gpL0NStevoYXmAOVbNkFn
+        zD1Qs2j0SUkP7LpVTopFaDAAKWocJMdE4bAAkUO5jaRw3AW7r4azwKLfRskTBhYpEUXgvzuOFJk9gvYn
+        8M+gPluKjA4NQeXunaSwnAX9RMXNG6BtbYW8ugE4HlXNAhbP+Ylrgxz3/xCnBJgoYKNyDCy2ssACPxMb
+        IFlfC1+bLbU9EHM1m/TvnOX2qTQY1ohzIqY7jKnVUHP0ECkmdyhevgQazpwCVXkZNHaqISihEVZ6IGA5
+        crfKqYUApwSIlTHuNipC4R1gMykGFpSjOmoYg6rC2cCCFpOrhJ57BsNq4c8DFgrDQD9UH9hHCkgwmJ9Y
+        tX8P9D3PgL4+Ndx9ruCJZEpMroDLhdTYbOGUAFHZ+3IaSGHZAwOL08WtUNWvJb8hI0zcBSywuHo0mRSP
+        UKAI1cyXtL6+FMBIlhSNh8DkdlfsQ1D3KCGluBt2u+knYgqoT+3cW8YpASJPnVyWW5FWxZtG2lqxGFRq
+        4HlcBQTse0QKxhNcOZLM84bU/XgD1Yhp1UDb1AQla1aSYvEk6Ce2Mj9Rw/zE/PoB+NVFPxGLFxxNv8zi
+        tABxBcKR4/qxVUZobReoiP4qeJPdigFIuFPgcmDhLnjd3Ke1YLTRaUoMRo16KGyJgHv5P0KPqo7/bCDn
+        JRSvWEoKxdPgdRvOnARVRfk7P9GZfGJCgfO9uZ0WIHK2hO4Zjf7d9hd1kNjaB3rCsMaxcWiu7oboiy/g
+        vNmKhddgPmb4+QxQNCid/ua6S4+qBpLKjkJk7jpOXPEe0OpN7eU6oiJIgYgG+on79kB/VibzE1UQmq7g
+        5VmU6GbBSplBrfNLny4JECtPzM+Nw5J9TNHkdg+RWyMNulGoKlCwSDRV8MBCCHD57sG1l9DdNsijb+v7
+        F5Kh4Q7Irr8K0Xkb34lvlscVJ9isqIPxsTFoPH+OFofIlG1aD13xcaDu7YPkom7YebOM5/qsBXgu1jSD
+        O4tLAsRlsV3Z9TxxjIEFVstQpVCY9ihIb+A+F2V4qYGzMkbfmLjWqoSLlo3GUegeqoEXdZfY63bTB8Iz
+        52XDdRakjcOYRgNVe3eRovAG6Jua/EQFFDQMwC8R7/1ELD6oaHUtz+qSAJEaNgt2DevJiHawTwsZceU8
+        AUwZWg4EsqAoMjATCtkXqL2pD1QDw6AbMTg0Q46PG2FYP8BEVw1FLZEQV7SHiWv9B2KjiGK/V9Vh2k+r
+        6+zgMxAlCG9RvHIZ1J/+HVRVldDQroIL8Q1wMKySF8xaPwdHcFmA1qBhuhWD8CgkHy7siSeNKluY2+C/
+        K44vAWKaCGf0rtYBPm6NrpcJJhEqGYUtdyGt6gzEF+9lM91mUmCOEJ23CToGSvnnD5UUc6NTYvAqzE/E
+        nCWuV+vcOJfFbQGOjRp5YIGzhSQCC5HAVRocf1t/ISkid3lYuONdeqYnKcG5ogQRqf/9BG+YZK4JZ3Bb
+        gMl3iwRZKpMbnhYgklh6GPRjWr67rPnyRVIAXoV9KYZKSj7QhDO4LcC2xj6LItC5ghgCRDJrL7IAbwyM
+        uhGoOSL8GrE74Jq1O7Mf4rYAsRo5KugFaSRfRiwBIiWt99m1xkGvVEL5ls2kGEQHZ7+iQgstuIIgQUhb
+        g3LOvYbFFCDmDFv78vj1NDU1fOmMFIWI1B476vbshwgiQD4LsiCEMpSv0lprWksWQ4DI/YKt0K81FdYq
+        n6Xy8ipKGGKA19bU1VpowFUEESDSpRiYM1EwzvadLaY0TLMymxSMJ0goOQC6URWfeRS3b5LiEIOmAP8P
+        7O8qggkQeRxZTBrM1zAXYFPvC1IsniKt6iyMGQ38DBNMgVAC8SSl61aDzoGuV44iqAC1ah1cOphEGs2X
+        8KYAkYJm0wlEWLpfsf0nUiieojs+zsLm7iKoAJGi54185YAynK/gbQFG5W2A+u50fv0RRatbm5ecofrg
+        foc6XjmD4ALEgCTiwnPScL6CtwWIROdvgm5VDb+HgbwcjwclxauWg7ZZ+MOABBcgMtCr4ZvCKeP5AlIQ
+        IBJbtBM0OiW/j67YB55brlsm/Kt3Fo8IECnNbmaGog0od3DlZ3abZ0PPc1IcYpFc/gsYxkZ4ZNzo70cL
+        yE3qfjvOPt8zleMeEyDy8EYOaUC5gwLs6za1n63rSiWFISZY4IolYMaREcF31WEjJFyBsbatUHhUgBgV
+        Y5cqyohyRmoCRMrbYvn96Lq7BKshRL8P94eY21RoPCpABBPUYu54EwMpChAj47Z+0xH5KBq3awhZUNPz
+        OMXClp7A4wJEynNbuONOGVOOSFGAyP38LTA43M7vqycl2fWghP1da/B1QdZ67SGKAJGM2ArSmHJEqgJE
+        EksPgX5Uw8XTcv0qLTA7NJw9DeNj4nSYFU2AuP82NjiXNKjcQAH295gEWCsxASLpNf6mGkK9Hmp/OUKK
+        zBZ1J46BUSde+xLRBIhg3xfcE0wZVU6gOzHb+LK6M5kUgbcpbo3m92fo6+Ot2iixWVNz+CCMOnC4jJCI
+        KkAEd5bd9c8gDSsXzAVYJVEBYlDS1JvF71FTX2e35QcXn0plYSsxEF2ACKZnQs8+I40rB+QgQOR+wRbo
+        05i6lSrTn9kMSmqPHRF95pvFKwJEcNO6XGdCuQgQiS/ZDyOGIR6UtIWFfiDCuuO/8E3w1vYRC68JEMHX
+        sRz3k8hJgEhq1WnencFoMEDdb7+axMeE2Oh/jgcq1nYRE68KEDHox+DB9ZekoaWK3ASIFDSH8ZYfvP3v
+        ru1sNrzDe9BY20NsvC5ABI9byIir4IalDC5FsKEm3jt2RaAMLjWw5Udddxq/Z+7viZBkdgRJCHAWXDGR
+        S1sP/YgpUVvR/og0uBR5xPzBMaO0+mRLSoBIZ0s/XD9m//wPbyMvAa7ne0mGDY4fnyAWkhMgMqI1wKPb
+        eaThpYJcBIh7isvb4rj/Z/2cpYAkBYhgx9IK9koO+lmaLd7kIMDYot28RZz1s5USkhXgLEP9WtPyncSq
+        q6UsQFwFedlwA3QG8Vc2nEXyAkSw9yC2+L16VCLFrezLIFUBYjWM1Gc9c2QhwFnwEOrU+6Vej5SxA8Ts
+        gdilihhSCGKDtYBlbQ/BOG66L7kgKwHOouxUQfytXN61lBKIp5GSALHndHb9NVDrTM2S5IYsBTiLsnMI
+        4m6KL0QpCBDb+GbVXeFd962fi5yQtQA5LFrGLZJ4LrBYTdG9KUDsPZ1Vd/mt8KSZWnEG+QvQDCzzyk6p
+        5jvxPLknWXwBrof44n3sWvdBq+9n15W/8GbxKQHOgpXXTVXdgB37Lx1KEjyFI5YAcbbDrvu42w07YlmP
+        0xfwSQGag+mShvJOHrTg8Qq4n4MSlTNgFI6nP+HnY+k7JR5XiSn4iZdP1XY99bnZjsLnBWgOzozoL758
+        XAORAZlw8UCiS4I0F2Bh811SSI6CS2W4YvGC+XWtffmySB4LyZwSoDU4O/Z1qaC6qA3SYkr5WSeX2Ssb
+        l/8+Flm7KkAUW0zBNkgp/5X9XTh/tWL6BHewWd/bXGFOC9AWWAyBHb46mvu5OIsyGyHzUSWvWcQusJgM
+        xwN68HdLWu8xUW19Bx7LlVB6kPtuOQ3B3EdsVr6EXnU9qEe6TY2ErK43l5kX4DxeZV6A83iVeQHO40Ve
+        wf8D9K3wZLcbeP4AAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="cbPieSimple.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAKAAAACWCAYAAABZ7IOdAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMK0KCsAAAB6MSURBVHhe7Z33
+        WxtntoDvP3TvJrvZdrfd+2xukk11TWJc4rg7LrFjJ3E2brjXuBtTbHoxBkyxwZjei+hdCESVQI0O+fHc
+        OZ8YWaADzIxG0ozQD++TJ7sxzMx5/Z2vnu8/JiYmIEAAXxEQMIBPCQgYwKcEBAzgUwICBvApAQED+JSA
+        gAIYHx8Hm9UKVpMJLCMjMDo0BKODg2A2mWF41MowmmxgsoyB1TZO/owANAEBnTAZDNDX1gqNua+gODIS
+        Mq9chid798CdNZ/CrY8/gmvv/hMu/+PvcO5Pf4Dg3/8OHt2MhA0XixhfXi6GrddLYPftcjhwvxJ+fFwL
+        N1OaIbFQC0UN/dDVb2Kijo+7/t7VzKoV0GaxcLK1QXVaKmRcugj3NqyDS3/7K5x+67/g1G/+UxD3roTD
+        Z8EFglhzrgC+4CTdf68C7qW3Qna1HnoGzeSzrSZWlYCYOlsKCyHtXDBcf+9dOP32b0ixhCJGQIrguHrQ
+        xsZAZ0Q4DNfWgM1oJJ/bn1k1Aj799wm48Jc/wykRLdxKuCtgYn4nVB/8BorXfALFaz+FsqAvoDH4NAwU
+        5IPNMEy+h7/htwKOmizwsqgO0nKr2b+/vHmDlMgd3BFw7blCqKvrgpL1a+wCLqJs0+fQdPkiDFdVwrjN
+        5vJ+/oJfCYgd/Po2HVwOTYe/b7sAv1n7M3y49zrYxsZAV1fndspdjDsCBl0tgd68PFK+BXAtY+XuHaB7
+        lgyWgX7yvdWMXwiIguWU1MPm7x/Cb9efYuLx4L/Xt+rYoOPGB++TIknFHQHPxNRB2/27tHRLUPr5eugI
+        ewQWvZ78DmpE1QKaLVZIzq6ETw/8Am85SbeYK+EZ7L/PvvULKZJU3BEwgev/1Rw+SIq2Eihi+8P7YOnv
+        c/kmakOVAo6NjUPKqyp4b9dVUrjFfLiPS8M2Lg3X18uahqUKiFMytXXaJft/Qin9ciNo42NhzKze6RzV
+        CVimaYeg4w+WbfEW8/b6k9DA9Q3HrFYuDb9HyiQFqQLifKC+oICUSgqVO7dD/+tcmBhX3yqMagTUDxjg
+        2NU4JhMl2UrgwAR/jpxpWKqAp6LruBT6gJRJMtxgpeHsaTDrul2+nZJRvICYbpNzKuHvW+2jWql8tO8G
+        WLk03NPQIFsalipgPNf/qz1ymBbJTTAt65KTYJwbmFHfU2koWkBt7yAcPB8Fb62T1uo5gy1nXUs3C8zN
+        f31ACiUWKQJi/6+mvtvt/t+ycK1h/cl/g6VP+YMURQqI83kviurcbvUWcyEkjf38V3fvkEKJRYqA2P/r
+        k7H/txzl2zbDQHGRy/dVEooTEKdWroZnSu7rLceHe+fTcGMjnPntW6RUYpAi4Gns/4XI3P9bhpJ1n4E2
+        LkaxqymKElDXNwRf/fSIlEcO3uZSeU2Tlu3vu/XJR6RUYpAiYEKBFmqOHCJl8RhcSm66eB5soyPkd/cl
+        ihGwsb0H3t1xhRRHToLvp7Df9/rBfVIqMYgVEPt/mgau/7fOg/2/peAk1KU8c/nuvkYRAhZXt8Lftpwn
+        hZGbf+29ztJwrwxpWKyAm64UQ39hIS2Ih2m6dIHr3hjgdcNtGLUMknHwBT4XMDW3Cv745VlSFk+AI+rq
+        xi42aXtnzWekWEIRK6C3+388dT8cB6vJCNl11yA8bxM8Lf8ORszKGCH7VMCn2RXw2w0LNw94gzN37ako
+        LySEFEsoYgVk/b/DB0hJPAXupMFdNEUtYUw+noTSg2Aw9bjExNv4TEBcy/WFfMgHu6+xtWF9SzOcflt6
+        GhYjIPb/6uq1bFRKieIJyjZvgtGOdqjvzoSIvKAFAiJxJfthaJTLBkR8vIVPBMwoqIV3Np4m5fAGmIYr
+        6jrYs9zlBgSUXEIQI2DQVa7/V1REiuIJSjaug6HKCugcKIeI/C0u8vHEFu+DYZPOJUbewusC5pY1+lQ+
+        njP37Gk4P/QRKZcQxAh4Mgr7fw9JWWSHG/HqszJgYKQdogq/JsVzJqH0kM8GJl4VsKVTL/vqhlT+b9dV
+        tpEVT8ZJXRsWI2BcfhfUHPJC/4+TryvyMYxYBiC+5AApHEVq5U9gtZnIuHkSrwk4aBiFj/beIGXwBZiG
+        S2ra2LPd37iBFGwlhAqI/b9qtv9vLS2NjOA5Eot1BJ5V/ECKthwvNJdgfNy7KyZeEdBitcHOk2GkCL7k
+        1J1k9nwFYaGkYCshVECc/+srKSWFkZO6Ez+AzWKCl5rLpGBCyG+67xI/T+IVAYMfpJIC+Jp/7rjMtnsN
+        dnXBaQmT0kIF/OlJLXSEh5LSyEXV/j1gHR6CwuYQUizhBEFTTw4ZR0/gcQEzuRGvHNupPMFb636G/Iom
+        9pwhm4NIyZZDqIAxr6Wf/xBCxfatYOrWQm1XCjndIhYcuAyOdLrE0hN4VMDOngH4q5eW2KTy0y9J7FkL
+        H0eQki2HEAHZ+Q9NF5RsWEfK4y54fthQp4FWfQFE5G8mhZJCcsVxsI55flDiMQHNFhs7JkkFXUn8z1cX
+        2Wh4uKcHzvzubVK0pRAi4OarJVz/r4SUx11wU2vfqxzoGa6HyIKvSJHcIb/xHhdLz54z8ZiAj5LyyIAr
+        kVelDeyZQ7/aSoq2FEIEZP0/bpBDCeQOuKLSnRgPw6M6iC3eSwrkLtiidvaXu8RWTjwiYIeuH/7kxQ0G
+        7vLDjQT23MWRT0jRlkKIgNj/qz64n5TIHVpv3QSTeRCSyo6Q8shFYulhj6Zi2QXEUeW+4CdkoJUK9lOt
+        NhsM63RwVkQaXklAtv6r6YTSjetJiaTScPokWM0jkFlzjpRGbsraoshYy4HsAmYWaBQ76l2O7JJ6tlM6
+        dJvwNLySgFuulYC+WN75P6ymZTUMQ17jHVIWT4D9y8ER+9q53MgqIFaken+3sGoFSuP4tXj2DsVRkaRs
+        FCsJeOKxvPN/bLpF1w1VHYmcGO5Pt4gho+Ys9xdU/qOesgoYm15CBlcN/HfQOXYgariHS8PvCEvDKwnI
+        +n8H9pEyiaX0iw1gbKiHVn2+rNMtQsH5Re2gvdSdnMgm4LDRxKY0qOCqhexiLg2PjcGjLZtJ4RaznICO
+        /t/n7vf/cMSLpTd6hxvgScE2UhBvkFLxo+ytoGwCPojPJYOqJr6fT8Ml0dGkcItZTsCtXP+vV47137Wf
+        QndSAhhMvWzvHiWG9wiCzv4yl9i7gywCGkZM8A+Vt37IXzafA5OZS8M4Gn7nt6R0ziwn4A8RtdAZEUZL
+        JYLWWzfAbDVAUtlRQgjvk1Ipbysoi4BJL8vJgKoNXBvGSWlMwyFBm0jpnFlOwKjcDq7/5978H0632Gxm
+        r023CEPeVtBtAXGrFRaIpAKqRvjRcGlsLCmdM0sJ6Oj/cQMHSiwh1Hx7CGwjRnaMkhbBd6RXn+G+kTxL
+        dG4LWFDZrMp5v6XASemRUTNbG8bLaCjxeJYScOv1UuhxY/4P6/2Z9b1Q0R7HBdy70y1CwDMmcp0jcUtA
+        nLjde+YxGUi1gmkY603ju620RWspAfGWpM5waf0/PMk20trC9uT5YrpFKEUtoaQTYnFLwL5BA/zxC/Ws
+        +Qrluyux7P3K4uNI8XiWEtDe/xM//4cn2bCalXagEh7nbyUDrxRii/eAbczi4oRY3BIw+nkxGUC1gwen
+        DCP2NHzuj78n5UMoAbH/p5HQ/8OtVT3PU9mSV3TRLjLoSkOOndOSBRzjUhTWaqYCqHYwDeMlN1i+I3Tb
+        FlI+hBIQ9//pSsvZ/B0lGgn333aEhrByGWJOsvmazJpg0g0xSBYQt1wtvpPDn/j2Ugx7z/KEBFI+hBLw
+        WFg1OxZJirYEWDrNYjFCWtW/yUArlScFX7m9VUuygJGpRWTg/AW8aQkn2JdLw5SAj7PbRZ3/0Bw/CtZR
+        I+TMFw5SG3gUgPJDKJIF3HfWv0a/i8E0nFWoYe8atn2bIAGx/1ej6YKyLzeSsi2mctfX7LKZ0tYnZHDV
+        QG79TRc3xCBJQJx8/nNQMBk4f+LQhWj2vhVJSYIEDLpaDN2lFYL6f+VbNsFoexs06F7IcpLNV8QU7XZr
+        aU6SgEXVLayFoILmTziPhoP/8M6KArL+X9QTUjhnSjasgcHSEugaqIDHyxQOUgdB0DPEDdgIT4QgScDb
+        0S/JgPkb+JcMq/XjO0fs/HpFASNetq98/wfXOvY+T2PnbtUy3bISeB55sSNCkSTgfpWd+XCHA+ft5yEq
+        k58uKyD2/6o02hX7f1gha9QywApEUsFUI1h5dbEjQpEkoLfqOSsBTMPGUTMYentd0rCzgF9eXrn/13g+
+        mFWgSqv6mQykWokv+Yb0RAiiBezqHYS3/Xj+bzGYhjPya9m7R+zasaSA9v5fJCkeovn+GNjMJsipu04G
+        Uc1E5G2WXF9QtIBY64UKlD9z4Fwke/fq1JQlBQx/2Qa1x46S8lXt2QmWgQEobokgA6h+gqC9r9jFFSGI
+        FvBOTA4ZJH8Gd0pjGjb29y9Iw7yA2P+r0HSziwIXy1e+bQuYurqgrjtD1dMtdoLY6gduRHhedZJV4qrX
+        ZbGzKlKLW4oW8MTNRDJI/g4WVcf3j9q/z0VAvP9NR/T/cEPCcHUVax2UvLXKlSB4XLCVnUFJrTwBBU0P
+        oE77nIk2Yu4n5/3GbNLmAkULuOtUOBkgfwdXfvD9a9OfuwhI9f9wrq8vJxv0hmZBdZp9Ayda/hYmGlZU
+        zWu8BzVdz1ixI6O5D8bGrS7xt1psMDwwCp3NfVCa3QTPI8vg4ZkMiL2d5/LfCkG0gO/u9Px1WkoEV35w
+        Unp0aMiRhnkBsf+HgwyHgFxLqI2JZvdweKpwkDiCWAuMz4Jl13Cbf1VnEuiGalmLZhtzvfIfWzQUTdvW
+        D+W5zZAZUwEhwZlw41gynNsbC8G7Y+DsrjdcPpTo8jOEIEpArPuCFe7x0j8xV+b7C3j4Cr9DzOFDCwQs
+        w/6f0/6/lpvXwGwZhuTyY4QMngX7mbg8hr87p/4GVHYksKsaUDQrIdo4F1PDkAm62wegKr8VXiZUQfjF
+        l3D9u2Q4vy8Ozi4SbSnO7Y0D86hri7kSoltALDbepu1jy3HxmWVwP+4VXAnLgO+uxMG2E49g/eE78PH+
+        G2w3ye84WfG8iL+cGdlzJoJ9g9r0dIeAGy8WLej/1Z/8CaxmI2TVXiAFkQsULapwByfacXhZd4WdH8G+
+        JqZOu2iuh4ZGhs2g6xiAmuJ2yE6shshrOXDt6FO4sD9esGjLgRIv/p0rIVrAlRjnwFuIsMwFjhx7BwxQ
+        09TF5tIinhXA7ehsVhwcz5JsOv4A1h2+zWo1/+GLM6xV9cQ9wXLxp03BYOTSsNloYFu0UMBjYTXQFR3F
+        5Kvev5fVacZOOyWNFFA0HHni/W4odXlbDLT05rGD6pg6xwnRTCMW6OkYhPryLsh5WgNxd/LgOifaxW8S
+        ZBFtKfD3LX6WlRAnIDf6mdJWwKS+HiaHtTBpHma7hsn/ViCY1vH2Sl5YvEskv6IZ4rPKICTx9XzrGgs7
+        fg6DL4/dh4/23WDTItiq+mJDLLb6+NxxR79lAoa9aGPV6bFwkFmnY514KdMt+GfwHAgeQMdzwKVtkWzL
+        ++BoFzt7QY08LWYb9HYNQWOlFnJTaiHxfgHcPPaMiba4j+YNKl63uDzjSogScHK0H3599CH8+vB9+DXk
+        A/g17BP4NfQjmIv8AuaSD8Lsy2CYyb8FM2XhMF2fClPtBTClq4LJgVb2ZyfGxPcRnMGr/HlhcUuYtncQ
+        Kuo7IDWXSyepRXA3NgdOcq0rrlVjdwBb1//dfsneb+VaVjm6ArtPhbNn0WRmMAFLND1QvnUzGDS1Aus0
+        2wcEuBacURMMxS3hbEtWv7F1XjTXv9CYUfp0w9BU3Q35z+sg+VER3D6RylJn8O5YUgZfgM+2+NlXQpyA
+        g+12+R6+JxLuz6C4SPgamEvYCbMZP8FM7hWYKboH09XxMNWSA1OdJTDVWweTBh1MWEfJZxADBhPProyN
+        jcEQ13fFS7Gx8kEi17qGJ+fDpdB01nfdfSoCgr5/AO/vvsZO+S3XumJXAXdKW0ZGIDs9D/Q1Guh7hdMt
+        jRBZuH2BbPaR5z5W2oxN2nZnsikO3MZOpU583gG9EZpruqEoqwGehRWzKY7z+5Ql2lJkxVa4vNNKiBJw
+        qqeWkMsDYOuKsmLrGr0ZZlOOcK3rWZjJuz7fuqbBVFseTHVXcn8pOuxdAeJ5xYItLEqA3YGungFudNsO
+        6Xk1rOzc3Riudb2dDAcvREF5XfuCP2c067k+2lFIrz7NLnrBVY/uwWqw2PCKfLqLgiPPFo2OzaWlRpRA
+        2IUX9hZtj/JFWwp8D+pdl0OcgFzASWF8ynzrGsL988kGmEvaZ29dcy7Ot65xMNWUBVMdhTClb4DJET3X
+        FfDedVQ4IGhv6IXy3BZ4/qQMnlzNYXNmahZtKZIeFpLfYDnECdhVSgigMh79yy5r+GcwF7cdZlO/g9ms
+        0zDz+irMlEfY+67YHdCWs9Z1wmywC4uDAKJ/xoNzYLg6UJnXChnR5RB14xWb4vBH0ZYiIKDcoKjYHWAD
+        rS9h7ul+mE07zgZWzt8FB0ah57PIoKwmPC9gdwUdqNUEJ+OkaYh9j36zlRtQ2FtFnA65+E08GZjVQlKI
+        pwXkRqhkUFYROCDiv0dInRYeN7ypElWYUU8GZrWAo3b+WwhFlID2aRg6MKuF6Rr7ojuu+Gx/qYE1aVXQ
+        MIij3QmwWccg/NJLMjirAY+PgieNPfZOPBGYVcEjLv2O2tc7GznpPk6phI849r2qB5PNvlLR32OASwcT
+        yQD5O9lJ4qvoixOQ6/vYV0KI4KwCZp8d4r6Dvc8XXt/N5ON5qNE6vhNuX/LFUpivKXvV7PgGQhElIE5H
+        rOYWcLrKXjcQ0++Ol3ULBMRUXNNvZP8/joojr78ig+TPaErF36YkTkCOueggMjh+D9fyT470sW/QMjwK
+        n6S+kY9nZ3YdjM6n4qH+EbhyOIkMlL+CKzvOrghBtICz6T/QAfJzcA6Qn4iObOxxkY/nl+o3N43XFLWr
+        Yg1XDs7tiWX9X/7dhSJaQNxAQAXI35musB/NxPS7O6eelA/5NLUKyvX2QODaMu7FowLmb+A6NrWTZyVE
+        C4iBoALk13D9XrZDh3v/NoOJS79VpHw8X73QgNFqX2/GTQfXjjwlg+ZPPDidscAToYgWENdJySD5MXMJ
+        u+1rwdz7xzX3ktIt5kpFB2st8c/gTmF/T8W4GdbZE6GIFnByqNO+PkoEyl+ZKQtzvD/O+VHCLQYHKUU9
+        b7aJPQ0pJAPnL+CObP5dxSBaQJwH+zViLRkovySES7/cXzp8906jmfXxKOEotmTVwrDFnopHuT/7y/cp
+        ZPD8AdxEu9ATYUgQkBsJZ5ygg+WHzMV/7Ui/SS16UrTlCC5tc6TillodGy1SAVQz7EimSdpxC0kCTpc/
+        JoPlj8wUP3C89ze5DaRky4HLdS+63hxXTI8qJ4OoZh6ckTYAQSQJONVZTAbL7+D6upMDbeydu0fM8Fma
+        8PTrzBcZNaA32W8VwpNsd39+TgZSraSEi9+EwCNJQDwwxE7EUUHzI+Ziv3Js33/WJj79OnOisAXGxu3f
+        r6ulz151gAimGpGyBMcjTUCO2fQfyaD5EzOFd9m7Yh/u29eNpFhCwVT8tFXv+H64c4QKptrACWhs1fn3
+        EotkAfHsBBU0vwHTb18je9eeUQvbbECJJYZ1z6uhixsN48/EKlMPz2aQQVUTuOnC2QuxSBZw0qj3650x
+        eByUP0j/vL2PFEoKR/IawTq/ZKVrH4ALKt/Gj8dKnb0Qi2QBcWoCF+ip4PkDM/m/ON71u/wmUiapRDX2
+        OH52XqqGDKwawH6sYci9AgLSBeTA/XFU8FQPpt8e+8y+3mRlqZMSSSqYzpvnA4fb+EPPvyADrHTcTb+I
+        WwLi/rhfQ/1vNIxHMCfmL2N+0TlASuQuB3IbwDJ/ok7frc4TdbUl0ke/PG4JiMtys5k/k0FUM3hInX/H
+        HwqbSYHkALf187+n+EUDGWSlguXesGgS//xScVNAnJT2s8PqIe+zqgj4boNmK6yXOf06g6m4nj9RxwUz
+        4nI2GWwlkvakdIEHUnFbwAmbmY0YyWCqkLnHG9g74bvlaD2Tfp3B3TXm+ZYEK2NdOpBABlxJ4NzfQK/4
+        3c8U7gvI4U+bVGdzLjje62RJKymN3NyvfXOiDos8UkFXEvF38x3P6y6yCDhhHuZajvVkQNUFl3477OUl
+        cBvVxnTPpV9nMBVXz5+ow6LhUTdzycArAdzNg3WmF8TfDeQRkMMvWsHwNY7CmHncyJSSxVPgiboRqz0V
+        4/UIVw4r83A7FjbHsy7OsXcH2QScMKm/FcQimPz7BJe1kaJ4khtVnY69gzjFobTD7ef3xoG2tf9NzGVA
+        PgE5piuiyMCqhakW+8SqkWuJcAsVJYknwd3WxfPb+LGVwXJnlAi+IkHiuY/lkFVALOY4F7WJDK7iCfvE
+        kX5RAr7ui7fBE3X8Nv4Rg5ndTETJ4G0uHUyAoT77lJGcyCsgBzs1h4UdqSArmNmsk453uFjeTsrhLS5w
+        v59PxXjWQgkn6vAGJf77yInsAuImhdm0Y2SQlcx0UxZ7fqxytSmzlhTDW+C54xztmwug8UJASgpvcevH
+        VEnXcAlBfgE5cBs7VhKlAq1IQj+GCYs9vZT1GnyWfp0J4v4S9M8f9LGYrexeEEoOT4MXE+L9JM7xlROP
+        CIjMlIbSwVYgeMqPf24ciVJC+IKTxa2OVNzRpPfJiTo8z8x/G0/gMQEnbBZ2ZQIVcKUx3ZDOnhnrPeNZ
+        XkoGX4AtMW6G5b/pi/hKUhJPgTdmGoel3YQuFM8JyMGqKIR/RgZdMXBdBXYVA/e8VX1GRaRfZzakV7Mj
+        Afh8uI3/3knvnKjD1hbvoHOOpyfwqIDIdGOGokfFeO0C/6z3artICXzN8YJmx4k6nAj2xom67ETPjHoX
+        43EBkdnsc2TwlcC05hl7Rpz43fZCQwqgBBJbeh3fM8fDJ+qw0DpWeeV/nyfxioA4wpxL3E0K4FMefcg2
+        UuAz1g+MwMdE1VOlsCatGjqN9v4YO1F3xjMn6rDfh9VdF8TPg3hHQA6ssK+0VZLZVKc7PzRaMvBK4tu8
+        RrDxJ+o6BmTfxo97EbVt8q71roTXBEQm9Q2KGpQ43/nx9aKi40ol2vlEXZpGthvQscBQQ6X4G8/dxasC
+        IlOtuco4T4xFx/k7P4ZGFTf6XYq1i07UhV10/0QdjnjxagnnOHkLrwuI4H2/vr5vZDZ56Ts/lA5W6eK3
+        8eNN6rhRgBJLCLjSUZjZ4IiNt/GJgMhUw3OfSuh85wduBqUCrWQe1b2ZoyvNaZK0dxDTri/lQ3wmIDLt
+        Kwkx/eLF1dwzYDpTS/p1BkvFaQakX4yDm0tL3CyrIQc+FRCZbnrhdQnnnn7z5s6PBh0ZYDWwy+linME+
+        vBhH2DZ+nMjGG9yd4+ArfC4gMtX62qt1p6cro9jvVWv6deZW9Ztt/FUFbSvuHcTbm7yxxCYURQiITPY1
+        eecaMLzzw2ifymgbXvnOD6WD2/grBF6Mg0XSezrf7DNUAooREMFaM7PJB2lxZGIuaa+j6HhM09JXbqkJ
+        vLeYvxjHiBfjHHW9GCf0fBYYBt2rZOUJFCUgw2aG2ezzHtvAMFMWzn4Ppq29Au/8UANXK+mLcfCf6dHl
+        bM5wwXdWCMoTkDEOUzg4iVhHSiQZvPNj2D7bL/bOD6WD69iFuiHHN0wOLYKr3yZBXdmbyxOViEIFtIP3
+        s82mHKFlksBc/A5H+sXdJVQg1YzzxTimEQsM6u3TNEpG0QIyOGFY1YXQj0mpxDBT8tDxc7E+HxVEtYMn
+        +hZ8P4WjfAHnmRzssN/QJLVv6HTnh9aNOz+UDFba4su9qQXVCGiH6xu2F8Bc3HZasmVwvvMjpU2+ouNK
+        AGsYRnMjen6rlppQmYDzcCPl6eo4mIv8nJSNgr/zAznk5p0fSgEHUWdLWx1XP6gRdQrIYx2FaU3yfIHM
+        ZVKzB+788CU44sW/RHxJNzWjbgF5sEVszORGuTuZbIsFnIvZ4rjzI03GOz+8DS9eYc8QjKkw3VL4h4A8
+        XB9vqkcDMzkXWKldXkD+zg+cqD0q850f3gAHTMcKmljRJH8Rj8e/BHTGMgJTzdkwm/odOwqA/xveWLnW
+        g0XH5ebzjBq4VtkB7QaTY5XD3/BfAQkyO/rJQCsJvBTn+4Jm9qz8+q4/s6oExAHI4wYd60cpZSCCm2Gx
+        GOaJomZ41qqHAbNnqlAplVUlIA+mM1yyyursh+uVnbD/VQMT0hs7o3EgsTG9hvVFH9V1Q5ne4DjfsRpZ
+        lQIuBvfR4c7i6j4jJLboWb/rSF4TO6q5Nq1a9IF1FJkXbU9OPUupDzRaNgLHPYj8FV0BAgIuC9ZjwatV
+        h7jWEisnlHCj0OyuQXjW1udCKgcWlcTNoXjOBCve48qEnBXl/ZGAgAF8SkDAAD4lIGAAnxIQMIBPCQgY
+        wKcEBAzgQybg/wHM+JM9RA5vewAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="cbPieOverlay.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAKAAAACWCAYAAABZ7IOdAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMK0KCsAAADHxSURBVHhe7Z1X
+        Vxvbuqb7L/Yv6O7LHqPHOBfn7LNPWnvl5RUcAAcMJucclUAgQFmAyDnnnPG5fnu+UxSUSlPSFMjGNrp4
+        B3ZVqVThqS/Nr6b+x8XFBXLK6bGUAzCnR1UOwJweVTkAFTo/P8fp6Sn29/exubmJpaUlzM7OSs3MzGB6
+        ehpTU1MJ4nKup+bm5rCwsIC1tTXs7e3J/Z2dnSm/7ykrB6AQASFkhIbwEJzl5WUJHyEkPKrPpROBOzw8
+        xNbWltwf90uI+T2Li4vY3t6WsKs++1T05AAkFLzxBIIgEIiNjY3Pbp0I3s7Ozi2QfAAI6lOzkk8CwOPj
+        Y2nNDAtHi/elWR4ez8HBwa2rp+s+OjpSbvst6ZsFkJaEFoXA0d19bTfz5OQEq6urMq4kjPcNA750fXMA
+        0trR0jHeYvym2uZrEx8eIxH6Vs7J0DcDIK3d/Pw8VlZWvunAfn19XZ4n49Zv4Ty/agB5Axjb0TIwrlNt
+        863KiBcJ5NcM4lcJIC+4Ed+xzKHa5qmI7pnXgQ/i1wjiVwcgLR0v+OeKhXhTmQAwKeB3Eny6P7p6qwgB
+        13M7bs/PfS4o+CDSIrK0o1r/peqrAZA3k7EPb7BqfTZkZM5MYIySjVGUZkbKdXwA6P6Y7FhF8Lie23F7
+        fo7HzP0QDu6LkBJO1fdnQwSQ38njUa3/0vRVAMg4h6WUbFsT3iTu2wCON253d/eTWS3ul4DyXIxMnSWW
+        bIcR/B7Cz31/Lgt8X33RADK+IRTZquEZAPDm0CqxtEFr9Jg3iZad7pv1Ph4Pjy9bx8MHjKDTYqvWfwn6
+        YgGkq+KNycbNIMCEjjeZw3BfalGXIQBdKI8zm8VzWvkvNVv+4gDkTaBrykaSwZtJS/c1jiTwOhAaHj8f
+        RtU2mYhuntbwS7sOXxSAdBWEjxdftV5XzFLpumntVOu/NtEt83yY2DzEivGzhptXrX8MfTEA0lrRUqnW
+        6YgXl+Ax2/ySY56HyIjpaBkf8pDyOmXDqmZDjw4gwSF4D6lf8bME79GK0ofbuDzYwOWROIcTcQxnn67M
+        QhFEni/LPfe1iAxxshVjP0SPCiBPnsnBfcFhkM4b8aldCq0NYydmzPwuI0EydGT7HUe9r3HkeoUT1wtc
+        9L7ElVvIX4qrkWZczfThcmcRF6ciqcjiDSdED3nwCPKnKG9lokcFkCfPi6Bal0q8YIxlHhoTqUTYjGI0
+        by6TAB4nQaOlZlzJG8/jNnTVX4DTkXacDLfhONKK/UAjdn312B6qxeZANTbdJdhx5AlAX+J6sBDXkTpc
+        LQayZinpknk97nMt+GBlI+6+rx4FQJ4sb+p9MjLGdwzIszWaYADHG2gUh+nSM7mZHz0FuJqwpdTleLeE
+        c2uwRkK54y4WlvMZrgIVwkL2Chf+sJiM14PX5T7ewHigHwPCzw6gAV+mJ8uLxCf9IYmKIX433SiBo5Wj
+        RXuIJdUBUCVazc2BKmx5KnFo/wuX3hJcLYVEHHn/JIrnxWuU6fkYEH7uMs1nBZA3/j5PGi9KNkZEjDIP
+        octWkZf62CfiPQVgmeg82ild9lZfCc4YQ451yORG9X3pxLCAD1emXoIQ3tcz3VefDUDj5DKFjwH2fT5n
+        llGQpnV4yH6S6WPfCyVU9xFd9WGoGRt95Th05eE6VH0v92xYtEwL+vwcH1L+Va3Ptj4bgAziM30iCQ4T
+        DdU6HTFh+BwF6WwCaBZd9NZgNY568nE92oqLo13l96fSfWp+fEj50KvWZVufBUBClGlxmBeNyYFqXTox
+        EKcL+lwjIR97/1QClC0xu94SseJJbx6upnszzp7Z4cP4WbUumWgsWCJTrcumPjmAhCjTzIxBdKaug2Ls
+        QreT6RNv1ZlwP1tHJxjfPkD3/CamdlI/PB97/1CCk20dhVuw1V+Oi4F3uNyaUx5LMjGUoRfKxLXSaGQj
+        6UulTwogTyDTJ4/W8j4JguFu7xtAH56eIbS+h6qJFeRHFlA6toymmTV0zm2gdnJF7pfBPR8MPlS8MUYh
+        +qTrR1n3Owg2SWvFhOJirEvGcyqQHiLuc9dbhyNPEa7oli/0geLxZ2rVeF1pQVXrsqFPBiBvWKZxBG9q
+        plV9xisE7z4X6fjsHEOrO6gYX0FxdEkCZ1/YhG1+A81j86gNT6I6OI68oTF54/gw8YbQovMhoZuirp2/
+        SugYs9FKGYVo1vw2PFWy7kc4CaUKqvvoJNKKXdtfODvJrJBPCPnQqNYlE8+dn1Ote6g+GYCZZlKEL9M4
+        kdsT8kwztvXDE3QJyN6NLKJ1Zl1C1za5hPrhaQkd1T61LJdThWI71X4MfXQ9U0JiFi2jLLMIKHeEBWNR
+        WrWdrq6DlbjYjLX5Z/rw8eHJBEJeXz7kqnUP1ScBkG40E0vGTC1ZzDcTXcFYMBEAww1al6fSzM4h6qZW
+        pbWzCbA6Z1bRODorrVzL+IK0fAZ0ZtEdHwgXrdrnxfkZPvZkFgPellqEdSSMZ6Mdyu2SarRFJCM9t8fA
+        a8FrGHdcacT7k8n1o6VnfK1a9xBlHcBM4z66tGSdMIRvoHsMQ/ZxTERiJ8+nkS4hk8RmQ1i8GhHH1U6u
+        Csg2pXWrCU2gYWQG3XMxC5hK1eKzKwdJXNDp0YPKMIRxz98gYaRVTBs3ivXXAZGICPDNx8HrTkBU3mB5
+        XV0NyPRe3SehTKesAsh4jOUP1TqVUl2AqeFlDNrGEPbMSBFEAkn4dOuJjPGYRJSNL9+CZ1g7FWjJ1Cxi
+        w5HNJFn5AwE0iwAaIKrWU9f+MlwmGSHhdaFLNhfbveIhK6hywCniWPO2hlIZAJUeOihgVVYBZFyhG6ym
+        SlIWpzfg6YrewkeF+qfRWTuEGeEOVZ+xivDliWyWANLVMq5jYqECLJ06uA8h1fdcHO/jY3+eEpb7iu6Z
+        sSKTmrh1kXpcLfjUx3EjwkFLyOtL+Eqa+9HiCqK0pR+BUbVxyOS+EfJsFqmzBiCtmW5MQTeRLElZW9yG
+        u20kAb7ejiCCfVPo7xjF6oJegdm1uIWakVnpalVgZaKyJOCzCfV64HU8KFmSkU1Lt0zXO1yvPAareF07
+        e3wobnRL+Ay9r+9FdEZ9Hpkkjayz3qdOq1LWAMzE9SZ74na3D+Fqiijh419jWV/7KLbWUscivEBTs7Mo
+        HsnM3SZT4aj6qf+UAFIs3bCMc97/RrtLxjtMy9eH0kYnmhz+OAhfVzsxu5RozTO1bLzfusCmUlYA5BOh
+        G5xyO9VIxenJGdyt8ZaPssJniFZyd0t9Q5gRGlnh4v4RKidWlFBlogLhzo/EQ0NLz7iJ1p4P0tpsFIfO
+        F9JS0XXSbbImmDaZyEDX4VrsTftl/JvupvtMbrfZGZAQ8q8Vwr2DxGI/yzk8N+tylVjKecg4vaGsAKhb
+        I0qWpPCiMskI9sWD5u4MIeCejFtmVk/LMPZ37y4k90NXYnUPjN9Y91OBlUpMVpgtM3Ep8I5jZD42ja65
+        EH26vYTLwUIJHWt9hJBZLWt+RhGarvTeQEbbcT3WLs+DXiOVq4xZvhh8hghfWZMrblmTWFbU4Fbuh/Gj
+        bpJ3nxqsVQ8GMJMqObdVDZVNRpZkqcUM14B9BEPO+EREJVrCo4Pj2wxQtf8TkZCURJeUkJnFOiDrgkxY
+        CB6L08Y6ZsLh9UQrf7m3hmvvezU8N4p1tdRIEU7CqtpOpWt/aVzzAR9inqf1mqvgM9Rg86K8uSduWWX7
+        AOyD0bh9UNy/rkExrrlqna4eBCBvtu4B0GqoiqWM5Xqah+Og8rrG4LHFL0umkD2C3pYw5mdTH8fk9oGs
+        A5qBM8TyTF1kSkLXNRsbjrOKFtQp/lr3e7m9gGtfiRIelRjTGSMi6UZDrgMVuNxVj1jQUjEc4L8HI9Mo
+        TQKfodrOAVS3x2/zrq5HGQ+yLENLb12uEt2wrsVU6UEAZlKTUz1VZ6dncDbGJx10uT3tgbhlyRSyheH9
+        LQ/u39+iv31ExpHW7zCrfTbeFXdMr0joUo2CGOLICUdRrPuUAPr1ATREl8xxY7ppuu6EbSyjHSqxhuoY
+        GEZZS2r4DFW09EpraF72qsKOw6NED6brXmmEMklArbo3gPxiXVOdbJw36p+Hvzc+xiN8qqTDqpBjGN5n
+        +eh/VYLA63L48stFHBkVLiT5RdsXgHIYjqMfdLOZFqQ5JGfdZwzA0kSAMhDjRsaKt0NyLLmEqsT+UwPQ
+        F5jAm6ruBKhS6UO9PS4pabT7Ud0xlLBvGhbdrJjJ2H2t4L0BJFQ6sR9BVZ0IM1ir9aPbpfs1L1Mp5ByF
+        9/cC9L38gEBhTUyvy+AtqIDXMY6L8/jvMsszvYAPwcm0Fk8lVVPC5caUbAywQnUfMT5kwnLt+5C2DZ/w
+        sbhMiBjf6ULIsow1KXlb68LkfKJ1J1iqmNqqZPdYR/cCkKaZ71io1lmlctPnApD+jvgEg66XJRfzMqX6
+        JuH74w3cL4rv4DNUICB8XSX2NRX3fZRxkfaFJa4TsSAbTVWQpRJrgewbNO83mwBS54EarIdtKR9uwmd1
+        u4Sq0e6LW5ZMVW19qO8eilv2usYpG3HN38Nrpute6Q3vM0R3LwBZx9PpdiF4qiRleW4LfR2jcWA5W31x
+        /0+mwNsq9D1/D/+76kQAbyAcLKhCZGD21hLyWM0xDSH6EL1rt9IVk5joVnyJ53J9Qr44pIIpY4114DpS
+        L4+TD66qtkr4yls9cfBQdKslDY6Eml8yWbctb/PA7Z9I+D4mGTqejtvcpy54LwB1Yz+VCWfi4WgIx0E1
+        6BjVKrkEa2zo/y0fPgGhEj5D+SUYeFOL8eCizOhUQ4TB9d3bBlRddc6uo10kLizYMqPn+W1G3dj3lEjX
+        yayWcdx9G09lyYXTd9wcIx90c9G+T4QOKvgMqdxrMtFlMykxL3tVacfRcfz94v3Tvd/3SUYyBpCk8+lU
+        rTOL5pjv31qXz46vxdX8mHA4WrxxoCnlnsDQP36FJ69UDZ1VeSXoeVWNYd90wjEYqmF7lgI0s1gLZKZc
+        FRiTpZryyIwEkFaVFv5sKYyLUK0EjwCy85k9fuv9lTKxSFdqMXQdrMLlZuKx0goy23WbYr5UYrmlpiM5
+        pGYRVvNQXVXHIGwDownHoFvtYOkm0+bYjAGkS9VJz2l1EmO/c9jrQnFgMfHw907ELVNJjgnX9cD/11vp
+        ZpXQmTQosuLBv97B/boB85Pqli/2CTKztULH7hmjO9raQVM+Hv/wXS1HcDXSpISKMjpbCGVCd4shut6x
+        zrj9mmXzRPC22h4HTyoxKbGOAaukspjPy7qFFYy/b5kkGSqjk0oZAUiAdM2x6kAWBAiDtjvrx+4WV5s/
+        DrRkYnmG24cFiIH3tTEQFeBRgwUCPiH+2/+qGL2vG0Xcqc4q+U6I0ZZP8GjlCF+yLJldMeZg/WopEKvZ
+        qcAyiXU/ZrkJbVYsuYis19pgaoiWj26Xlo3JgxmWZGJsx3KLap1V1uSlpnMIzqHEERLedx3Dk6wpNpky
+        ApBjrKpGAqs4oK0a1O5tiR/d6OsKx6AyLVOJ8SGH5szLQu1e+J/lI/CmIg4+75vKRDf9sgi971qwsZLo
+        HggToaofmZHDcOnKMx+iS7LX0Pi8LoBmMV7kaAhjRXY3X+6pg3cDvls4hGvVda/cjtCq1plFWNmwYF72
+        x4fOBIgYcugkGZk0NFAZAajbgqMKRjdX9xJarXQz36TbibiQRWj/i/cSNP/b6vjaoEn+l+/R+74d2xvx
+        WSwfqvDULEqji0rgrGJnjbk9/2reK12oCrRUokXc9ZTiKOqIOx5DzEjLWhJhY+KgW27RtYLWjhkO6w0N
+        J5bZdJMMTrKuWq6SNoAET6f2x+RDFS/4XJOySGzAo9tswO3SFaeD9S5hDfPgfl6khM8QQe0pbMfeTqyE
+        xODeGJ9m82r7XPriNJsSBlbuWtiv5geFG71H1kvXG6zElvAoVssSg0+dcBAU3XKLKtNViUBbrWB+VeKD
+        weO0VjVU0s0TKG0AOZSm4355U1XDbhwi49ttva3DcDVH4GjWyHyFdGNET5sPvueFCLxSW0BDfpGYuAo7
+        MT+7GNe2dS5EV6yCziw5JiyyZ+Nz9wVQllyOY9/P1i4jdqLbVVk+swiMbrmFsKqWW0UAmWVzbLikqV/Z
+        pMAKiE4ywtKXtSUumbQB1B3v0zG/25u7cLYE4GwMY6BLbd1CQsXVQdgt74ao5OsZl/Fk2DONYGUH/H+8
+        RiBZoVqo/+eXcBV14khkwebjWtjTa141Z8JXs/0ZAyhnSOU8gKbvpudosg2gLEWdzywmJHVdg8p1ZtEK
+        poK1rtuHNzUu/PmhA3aRbZ9YRnqs0slyMxlB0QZQx/3yi3Xas4yMikXppdlN9AiLyPgw0HuXkPQ4JvFz
+        4QBeVkak7PZJhPoT4aOsVpItWv7fC2R8aIWPMSIL2b4/36KvwiUeqvgL7hCAsYFVBR7FRoa3kbnbQvRO
+        qB273trbaTnSFqHHOnE92hz3nZQc223uk7DouFcqE+tm3if/zTjvz5IuCeDGduzXmXSMh6q8ppJuHKgF
+        IJ9OHQBpelXDR2YlO9GD3SMMD83BVhtEf2dUuIIQ3lXx4o1K5VVF8Fd5GG2d8Y2rHEWhzMukRHYdKKqH
+        /883t/AxO2aWbPzf+8cbeGr7xINwF68ciVCBHTNm6JgZ88UmdkazRFMYnsHmXuwXMc+nenER7ZClFbZX
+        sTWfLVZGlmsF8NpbFDfaQfX6x29jvkzcK8dzdWI8Wko5/mvz4ffiTryt7cHIFCcKjY/TGAakG89leKXq
+        67SK+9KJF7UAZGqt8+6oTvDJdD7lCZxfYCK6iv/K60N+sR/FtcO3EFIF1cN4XhFBQ9sYgv3TaWPEUOuA
+        cMkFGMwrwWB+YgHb+/sbeJsG4457WiQpHPdlcyrrgpS5UZUTGLGIzW05vzMTCitohI/FZ4JotFmxxepy
+        K96F8X1da8Khah5NJqt1s6rZGWs0+Pl1Pdp6wtjbTz7xE++zzkjG1FRis4dVjAF1yjFaAOpmPzoHphNL
+        +ibFTXaOwx5aRXlTFK9LAnhTRpczcgtiYd0Ifiryobw+DJ87df9g0D0BtwDN/0IkKRYAJYTPCuBv9d42
+        LxDGquFZVIen4iyhocbpNYzevKieDECzZJvVUJX8t/k8HUNRVLSra3Wq5lGVaN0qW+Nfv6QYS+ZV2lHc
+        2Ic5kVDotM/pejqd+I686CQsWgDqjH7oZkg6sUGhcLNd/kU4I2tSjvAa2gcWUVgZRsEHP4qqIxLC/NJB
+        FNWP4LfSMMrF/wdNMaRZRpNrsLE3VrxWNDMM/VaAkC2E05NYHLt/eISSJFkxY8S22djwHruW0wF4NdGN
+        S18p5udmbx8+wlfZnjqJ0I3xjHofXSwTipflNgyEpnAszsW4prpvsekkGayGqCodVuncay0AdZ4KDkSn
+        a9HixU+XpGztneBFfegWPqvswRXUdk8hr8iLl4WDt1axWID4p4gR39WOwNNzByIz5Lj3S1zRWOE6L7Fc
+        M/BLPjwCCiMOYutV/ZS6Y8bIhK8mHWkBlNNpHGxIy7ooYqNOdxgVbelHKXRcMd3v+zrhYt+2CAD9WNtM
+        7kJ1gGAZLd19pLFRdRhZpQNzWgB50XQApGtNF8Dq1IfCM9uosI0o4TOroXccbf3z4ukfQb5wxe+rwhLE
+        koZR/CVixNciVuxxTibttAlWdopMWVjDG/jYX8gmV8/P+ZgK3J1vk3C3qubVwtHYZElpAWSjwqzndn98
+        E41t9LqjGcmKzg12vxwye9/Qi0B0DlMacNECpnPDtJSEULXOEJnQccP0iOlCt7QAEph0B0TpuGmdWLLe
+        PYNO3537TaYahwlS4aJru6bwtjyEAhEvfqiLJS7PxL9flgfQ1a3utgl1h2RTg7+gDH0vbiyiALH/xzzM
+        D8cu8M7xqRz/TQBwZBEn4kZcE7JkAI533bzbETs3GfPdWL50yYMhc3sVt2f7fEEVZzwIYt/0crlOs4Au
+        XLRch7upk04da8qEJt3gRVoAecA8cNU6s3SspA6kzxsiIuZbjYPNqk7fAtoGZ5XrbIEVlAirWPAhgBeF
+        Humi84U1pHtuF7Fl0FpLFLFhP8szLF7fWENC2Pf9CyxGY+FCZGNPWkIzgJXjK1g9OMb1eGdSAGWXy3Gs
+        LOUQls8c87EVyjr8pVKz0KvSNjlCwZfJ55Zjrtx8zSidrNOAK26Z8Fq7wp0ujQxjuKMdfUXvUfW3f0H9
+        3/+GlTH1jFqUjnvl96ULudICyGbEdE8W1+s8EekgXd1exy9VbnSHFuCIrCgBo5r6hGtNA2l3YElkmMN4
+        R6t4U855K/RMJCyNbWPw38zCwBixvzuCUIfvprvGqBNWw/NTHtZm+atDF6ieWAGneCN8rAvWjS9iYGYJ
+        e16+bF6fUITmdBqXa+PyvJIlHIzvko1mGAnFC5FQdPcFsbWdujzC8CedWzwV7ncsHMLicATBpka4CvLR
+        +v0/4Hj1AoMV5fA31CPU0gzHh2L4amsQFv9W7YdiyKVjmNIdU1oA6cfTAciglQekWmeIrjfdwXSFnHjZ
+        3IwPrhYUORtR2tOO6n43Wn2jAjgCGYOuTiQSVuCsavFMwxZclv/u9i+jqn1c1hVZznknQPyjLIzKplHY
+        W0ydNrK7puK2u4aWcODXAmyvbktXzNkVjEbVhjHxkAg4L0dacD7aIYvQxgvnF6NtuB7hzTuHbSCK8hQJ
+        R3GdLe7/LJ88K+6QCYUxsSSTN50udLMRoGU72tvDrHcI3ppq2F88R/cfv6Px55/gKRHhRmODhE2lvsoK
+        eOvr0C9ANO/fLMbzOi+vPxhAHbdpzJeiWmeIaXu6zKmitwNF3V2oEdAZqu7vRVlPJ4ocDRLMst4uvO/s
+        RLM3AlsoeaxY3zOmXN7inpNlHJZz8ssC+FW46lKRuAz13tUSZXcNExSOJ7+twuDvb7G+uIb20Wk0TsXG
+        imkN2dLPH5BhmcWwfGyz2nflY3dbWEvhdlPBRzHGK29x40VZt5w+bSgyk/B2GpXKw9BAbAtAB5qa4Bfg
+        9L59g+4//0DX78/gKS2Jg8tTLc5HWDfzMqsIHyF0FeQpv4+iQeFoh2qdWen4SQugTrajkwET0nQZ8Ku2
+        WpS5HHEAWlXZ68IHWxfKe8UNc9RLMPnvWo8I1L3D6ArGYsNa52gCfGbRhb+vDeJNaUAmLr98ENZIxI5u
+        500JR2TZbGRlR/VQfhncIjs+2N6LueKbOJDJiRXA62CFHO1osg2huCF+PhazmhwBOTUGi8WFNQLaw9TZ
+        KWMpXmO60Y3ZGUwPDMBfV4ueN6/RItyo7cVfcJeUSMBUUBkKCNfbU1aqXGeWU1hJ+8sXKb2fDhsPjgF1
+        vkQnTkwH6fn5Gb6rfIcqd48SPEOlDpuE0Lq8uq8HlW47Pjib8aa7Cu+7m8Xyfum+CaXjxn2bZUDa5V1C
+        cc0w8oSL/q1IACmSFqdjUiYo/op29P/0XFjCSgz+UYiF9d3bti1O2XY93HgLH3+342rSKS0fYz6OUFhH
+        M5gFv6qw4b1IKBZWNqW1o5VQXRu60M35OUz298Et3GGLcJ+ErUdYOMLHOM4MTbC5SYJjXqaS7jbOvFcS
+        eOtxGdLxjulCuKwAqPMeQLptDo638GN1TQJYVn2wdwvYepXrDJXYbQLkXgllhduGElertJYlrjYZU7Z4
+        R9DunUazZyoOSA79NTpn5NDfL2+8+LM0hIYGPwIs14gs2Z9XAu+LYvTOrsuREL6ofhCsi8EnXC97/Oye
+        kdtSC8smHKXg9Beck49uliMUBxZrt7e7ixVxo7YWFxC122WM1vHLz9KNut8XwiusWrbhUi03ywDwJEVR
+        OhtsZAVAnSG4dE/C5v4sfqpuVQJlFt2varlZqbYhvOUijnzbWYtiZ1Ms0RHLmr1h2MNLtzDSKrKE8/3L
+        Pvz23o/m9igCHxrh//UlBvNKUTy8ICcrirrLY67XXwa70xM3wsEGzx9eN6K8tR+Lq3cB+5mIn9YmJxFp
+        j5U9bM//Qr2wbK7XBTJhUAFBPQaAtMLm+2RWNrxjVgBM5+epdJAuboXxY1WnEhqzirvTb3MfSI2YklDy
+        33TflS4POvzTaHDM4KWwhj8Kq1hTIhKFX17A9qoE5dFF9HUV4mq4Ac7GCglfXbdX1uwK63oxGJ7GgcgW
+        Aw47Rm3C+onYy/HqJVp//F7CZs5EPzdcquVmSQDz83CYogtKhw2GXp8cQJ1YIB2ks+uD+EdFenB0AMzG
+        Nsy+33e3odjRiEK7SI5EJl7ldiO/phffvXah/N/zUMpZGrrewl76XLrX3/Jq8DqvHL6WVvQVF0k32v7L
+        T2gXwbyM14QbVd1sirU31XJDgYZ62ArfytjPkLdGZLQiWzWrQ1itfgFPnD7wrcA3t2oR2THjSNYBrXLm
+        v5JqEsfd9uMPTwvA78q/HAAp6zYVzMCdNrzpasUPlWX47h/vUP2v/4R/+l//jH/9n/8bz//P/0XxP/0z
+        Kv/tP9Hww49o/lkA+NsvqP3P/5AlEbvIVFmPM8slrAxvfPOvv9yBIKxjj0UDZWXoFtD4hIs2FGlvw3hP
+        T5wGW1uwPDoap9WJCeytr91qPBwWf9dxsLUlMvvtOB3v70tNi88cp+l40bnvOQCTyLpNdV9MFb1uvOt2
+        4mWbU4QENvxc14U/mx14b4sIl+xHR2Mpgh9+wtjz/wdv3j/jF3HMzZV/h/Pf/gabiA1rGwZR1DWJPxtG
+        8V/lYfytOIjvSn3IbwqhrDMi65MO3wy8I3OITi1gcWkF6xubGBsflwV9ZsO8YYbM10jnXmTrfmVrm68G
+        wPkN3yd3weU9brztdgm4evBzTRd+b+zEqzYXiu0hlLqG0DQYQt/oEsKzS1jcWMPcwhzOtldxPmLDafcr
+        HFf8HbtFf8dyya8YKvkDVd4AXrZE0FzXCu9kGaJdRZjJe4n5okKsdrRhLzqKk+MTrGwfiX3uiH1viJhy
+        BWWuObzumMazhnF8VzmKZ/VRvGoexbu2Ebyq8+F9awjlXcOoc4yg3hFGuzsCT3ACHl8Es3MCWhFPM7tk
+        Yd8YBOCwGG90tiDN1n3/LABmIwlZ3RnHD1XtSnDMUiUYtFylrl4U2npQ0OEWN7QDz1u6kdfehzedA2K5
+        G5XuELqDM/BNTWJpcxkLi7HaG1/HjDuW0xNcrIzhbKgWR3XfY7/0X3DQ+AK71b9jp+JXzHWUw10hXKbf
+        j675TbyqDci5DgdHmjG61IGxJRvW+l1YEvHZsojTCONKazN2IxGcWjJKjjGfnp0L2A/hndiScDYNLqHG
+        vSDiTaHeeaEFVPbMo1xAS3Dfdk6Lc5rGB/ssKlwzqHROotIeRbWw0HX2WPZt9wzDExhDaHQSE1MzEhRe
+        f2ak7EgaFW6ZXSocTuMIFVu0rF1K2YL0s2TB6UosVLp60M7BEn6qbkyAq0rAVSYsV7GjV7jGXvzZSLgc
+        eNHaL+RCfodT3BhhJfwjwgqNYHlrWViuRfmbHmdJ5luh4rp697dwPj2EM1chTir/hoPqn3DQnIeDlgKs
+        lPyInbKfcOKuxJizGf1VBYhORGRbPlUjrBbnIuwRVis034ipVTdCc/XY2V/ETsCHpepKrIpYbU1kwQul
+        JViqrca234eTrdRtSoTz+PQcB0enmFs7wMDYpoSztn9RwDiPCgFlTd8CGgeW0OZdQWdgFfYQa5lrEuQG
+        T2y7wu4ZuR2vvRxJEaBRhI7tUux24r3hfZ6cnJSvVXDYb2RkRHa8EF6uJ7jc1rC4vHbcVgWvWQ8GUMfM
+        poOLSncgRyd7+M+KMhFv9eBZowu/CdBetNlR4vSh2TuEgfEwZtaWMD4zI2DdEZYj+XslbEtK+XLNmbgJ
+        28vY6K3EScMPOKr8DxzW/yGgy5fQUftNr7At4NtuLcBRuB1D7fUINrzF1twwysZX5EwKbNnv750SAM5h
+        oHtcttxHFpoxvdaP4cVWzG14cSYs6u7oCBYry4Vbbhff2SNhXKqtwUJZCTbFA3YiHgY2DyiPNYn4Rtve
+        4SnWd44xsbSH3pF1CR0tZoljDh+EavoW0epdRrsvsx+otorgsiGCsDFO5ZAqQaR75X014DUAZtcT4eXy
+        sbGxhwGYDTNLpW9GPUd0Jow1AcbpWeo3t3jyqnWG+D2JD444vqURnPWV4LTxRxxW/hfWyn68Be5WAsLt
+        Dz/gQIB3Fe3GkYj/OitLMd72HgezQdgWtuS7wwTw7cgiRrzzEkDK3Sqyzu1hRJe6JITjKw4ML7QKS7Yv
+        AdsjiFUVwiW3SBCpdYddwrhYWYF1u/i+5ez8Ji9d+8buMaZW9rG5l3qc+TGVFQtI05yu1TutVRLik5Wu
+        Y4ZPo04zpOw9PNjC5bRHutbjin/FQeX3cVZus/Yv7DXFXC21U/4L9ur+wuVwB64nndjwd8LZUIN5exm2
+        xz2Ykj94vSbhMyzgWGBBuuDhQWEFu8bkDylOrLiEK+6VEFKh+Qas7911szA5Wa6vxUpz4y2IUj0idhQu
+        elF4gnW7DfuTExlbxq9NaQHUSTB0rBKzNLpq1TqzHtTYen6Ky805nIdasS8SiKPyv4m/wrW23EFn1r6A
+        cbXyGXarhCp/xUWwRYJ3NeHEbF+rhG+1twrb0T45r3TlxOotfFSV+P94aPEWwGFhBZmQnInwgPHg9Frf
+        LYSjix3y/2fnN6GD8Bj701NYqqtJBPEGxtW2ViyUlyae5zektADqxHc6b7tROnDpWDd+1+0xcYIf4Vov
+        PGWxBKL8O5G1vsR2/QvsNLxUgmdoT1jAtfff4dhTLcGjzsccCHU3oq+lDtueGmwOu+R3tcyuC9d7Bx+7
+        Yfg7wpPhpTsAhTydMSu4f7RxGw8amlztkdaQ627PR+z7UJwPs+aV5iYJngEhSzk7oeDdtt+g0gLIQJNu
+        T7XOrE8Cl0pi3faqyLone3DW/rtIIP5dZK0/y6TBCthKxW8Jy6h9AirivJMeNhI4sDVYJ+FjvDfYVo+B
+        1noc+RuwEbLJY5nYPkDTzHqc9WMJxru2i6mRZUQ8dwBStILMYld2orfxoFmRhSYsbUXE+cSf5+GCyDhF
+        PLjcKL6b7lhAeZ4ybv76lRZAxm4603LowKVTrmE8aby8fSvxGTZ5Xo9342OgHNdDxdgdrBYuNE+AdxfD
+        WbVR82dcjMdtmdketr/F1bj91uqdjXZhoa9Rgudtb8BpSFiiYIc8Vv66UvlELOs1ixZxcucAs2OrCPZO
+        xwE4KDJi/hQFARtfsQvLdxcPGooudWNs2SaShcTY+VDE3SstTVgX2bJ13bemtADqutd7w2URY0Vm1Xyb
+        jBOAX4+24L8H3uJjqOYWGGpzoBYX4VbslP4UB51ZhG+9OlZe2Sn7BfvCJV+N2eL2wwbS2b42uBurMNQm
+        9jncik1/q2yZ4vFw0kqz6zXEdvz1Q3Ftptbhc07GAUi520bl9WCjbWShJQFAStYM5+uxfZC+ne1bVVoA
+        KR33qgMXi5daMysNteK/Pa9xzdnjJx1xwBg6CrfhbKRTgPWzEj4pAd5a8ffYFq74ciSW2Zp1Pu5AxNaE
+        QGej/Hvoq8X6kLCAN/BxZoRmi+s19EFkwPwZWE4vN2SfSABwyDaBlflYYsZmW8Z+KgipYQHo3MaQhNV8
+        HZ6CtADUca+sjqfLhCmtCYymhOULViUAY9alcKHbQ/U4dnyQpRMrfLs1f8iyypm/ETvehoTPH4t4TxaX
+        RcIx5mrB1Wg7tsR2RjmJWW+FwvUaKhYAcjsmHJ6uaAKAVG/LyK1X4FCjKh40NLHilJaSBXnjOjwFaQHI
+        TDhdIsILrWMpWVdM56r3BczHrlcJ0FhFsCSIwsoZ4O2L7Jdx3mn/HcDHkXYp4/9bgS6ZbAS7mjDtbpW/
+        0bE9WHM7JwrHh2n5VK7XEOHktpx8ne5WBSBds/k3SlgfVMWDhlg7ZOZsbP8UpAUgx02zNTsCreTtGGwS
+        EdCVvmoBRtctNCoRvl1fI466i7AnEg6646OuQrEu0W1zu0vhcmf72+DraECgqxELHv4cvnDjA1Vxb+yN
+        pnC9lFOA2TAdK5jvbB7IH9xWAUjxF0GN/bIGGJ4X0Cvgo+iKU40CfYvSApBuSaeIrDMHHeNEmWQo1pm1
+        tjiHq8GiBJCsklZwrDs2dGbKbK06H7NjsLkCYRHrEcA1X6cEfHdQwGfqUuEL6OU3Y73JxOnZPDcz5e/v
+        HsHZEFHCR9EKTo/ejcUeHm8jvJAIIeFjrGhs91SkBSClE7vRhekkGTqWklnopuudEiazaAVVMZ5Zx6N2
+        Ee81iESjQWS7ldgNd8uSDieN3N25m0+Frpc/YEgLpwLPEGuCc3sxS3V4cCx/fkwFnyEjIza+Z213UrZu
+        GfDR7T7VTFgbQJ3YTTcOpBtONy5MLUe9+BioUEJl1kGwBReW8oqhrWAs3os6WySEu8EOHIjE5NBbjc2N
+        +JmiIpt78nVLFXRmsQSzdfOrkifHZ+isCijBM0QryIK1+bs4LMeREbrkg+P0P3/xrUobQJ3YjdIFVafJ
+        gXHnTs97AZK6FGOWMZph1txNvEf4+PdEWEJOp3Y4WIG1lXgg9k7Su15DHBNmlmx8tq3UqwTPLHfriEjk
+        7q7L2fmpLEQfn6a/pt+ytAFk7KYTB+rW+tIOud1obdyH62B8EVoljmbQEvLfTDZGHM0IdTfJv/5OZssC
+        4nEbTn1VCfDFXG96y2eodGwlrpO6vcynhM4sWsGZaPopcp+atAGkdNwrodLpIbwd8VCsM+tYbLfVI5KR
+        ieQJhqHDUCv2gu3wCms36mzGsL1ZJh3sbuHnz/zVWFlKHNUJrO+hVcP1GjJKMIY6KvxK6Kxitmz+SYic
+        MgSQWa5OOUanbkhpW8GZKK58ZUrozNoW8V5PXQVGHU1yZGPM1XwDnwPngWosLyQ+GNsilmNblQq0ZKq/
+        KcEY6koTAxryu6ZyVtCijADkEJWOG+Z2OuPHdNfpGlApwrzmqb0ZmksEj5r3xOI9jmp4mipjBWa5zoHL
+        YDUWZycT9ks3WjuVPus1i/NFdy/EJw322tRZsFks2eSs4J0yApDSca+UrnXTSVqo3e0tHPexyBwP3qWw
+        cFHhboNdsSE1f2ejSD5asePjrFV2XAn4lmYmlN8RFK6XzQYq0JKJsWJ0Kz5xYLFZBZtKQfc0xoNPt/nA
+        qowBZIKRbp4/SqdLmtJNWqjliSCu/OW38DGrpdUbFYkG4eO/11lgJpgi4djvLcRiEvg2j06UbVbpxB8z
+        3LP8vlyqkRCVXE0iFjRlxE9ZGQNI6TQnUNxO1wrqxIzc15qvHdejbTLeY/9eVIBH+NjHt8cCs4RTZLx0
+        uzPjyheh6Ho5lOZUAJZOhJZdMOb99SUZC04mWsFRX/oy1FPQvQBk9qoDDK2gTsFZt8RDMQkaay+Cv6NO
+        gkexwMxuZsMyXodqsDKrho8aXN1B22xmrtcQE5azm5/0MsQ2fBVoqSTrgml+GvUp6F4A6kxKTtFi6Qy7
+        UXTDaX9pU4iTSNa5xjDR8lq+KM6Siyww38D3MVSN1emRpGPSdL1Vk5llvWbxs9Z9sgNaBVkq0Qry10Gt
+        +3pquheAlG7yoNsnSKVKXPgSdl3/IrqCsZ9vaO2JYLTpDS7G7kZJPoZqsTYzmnTE5lTsu/oB8FFMQqz7
+        VTWk6qhXWMGTmyG9p6p7A0iwdH6Ok9KNBZMVp/mCdalzDo6b2Us7Ayvyjf/V+Umce2P1wY/hWmzMjacc
+        LqTr7Zq/n+s11Ck+b92vqiVfR7lY8AEAUrrulWDpuGyKvYfWLPvw+ExO1MNfzWzzLUs3zLfOuG5dQHcx
+        8B5bc9GU2fnq4bHMYFVQ6YqNCv61xJiWv/TOmRFUkKUTM+KnbAUfBCATDJ035ihatmRJgVVMSKzbbu+f
+        oMg2C0800QLNTE+ntMaMHdnBooIqE9F9rxwkxpah/pm4d4MzUahvRv617vOp6EEAUrolGWbNOh0wFN21
+        KsakJTT/n+JDkO4H8fpXtmUTqQqqTFQUXUrIgCkCFLa8G5yJODpydPML7E9NDwZQdziNorXUjRt1SjN0
+        uXwbT7XOEF+dtE6pcV9xLhjVdzCOCwsrqIJLR7SejAdV+/7W9WAAKZ13gg2p3GsyMdFJNkrCUhBn3FKt
+        M+v47BzNInZj4VkFVSYiyKrv4PwwdMMquHTFN+hOjp5eLJgVAHXfGaEyccUUIbS62EySGkOL+0eyjYrz
+        uajgSieOmnBCStW+p4aXb2O5+4oWNPAErWBWAKR0XkgyROul67Yp87hyJqMmVjF+84kslq5Up/XeLE5G
+        5FpS1zM5PcdDAaT47shTiwWzBiBdsG5CQuk2NRhi/EhLeF/4rAqs78qstt40318qcTIifka1r/mJ9djI
+        hgKqTEQryJ5B1Xd8q8oagBSB0u1soehGadFU66yi62bdUTfW1BHLM7O7h6idWpU1Qr4LnKxBgaAab8JZ
+        tTi9kTBB0X1FK3jwBc9omm1lFUCK9T5dV0yYOPyWrrGB63W2e4iORLLC2a4II100kxaWbozZEbjsIEnz
+        wPKssI69U0qgMhHdeE/TsLSoqu/5FpV1AAlVJkkGM2Jm0ap1FPfH9Z8SPqs4Zsykhe+KNM6soXR8GX+F
+        k58T54fxOu43HkzRfTvqw4gMzuJw/+lYPyrrAFKZZqmpEgtaVF03/VhaX96Rs+Sr4Eomae2ah2UvITuk
+        n2pr1icBkGLWmq69yiy6bSu0/L+uO39McYIiT6d6hixDnEWVXTPsAyR0tHZHB09z9MOsTwYglan1Miwn
+        3S6LzMZsVV+6tjf2JVQcjqNl8/dMYcg2jv72KFyNEVlkpotmsnL8BIvNqfRJATTiQf5VrVeJFo8/eJKq
+        repLE2t3tGxe54QspfDVy83VXTlxUSbn/hT1SQGk0iUZVtF167Tx5/Rt6JMDSOmO27LYrNs9ndO3oc8C
+        IJWucyVV40FO364+G4CUeUzXLJ22qpy+TX1WACmrm9V1zzl9m/rsAFIGhPdpq8rp29KjAEgRQtUbcDk9
+        LT0agDnlROUAzOlRlQMwp0dVDsCcHlU5AHN6VOUAzOlRlQMwp0dVDsCcHlU5AHN6VOUAzOlRlQMwp0dV
+        DsCcHlU5AHN6VOUAzOlRlQMwp0dVDsCcHlU5AHN6VOUAzOlRlQMwp0dVDsCcHlU5AHN6RF3g/wONExfe
+        iWGCnwAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="cbPieGridAngle.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAKAAAACWCAYAAABZ7IOdAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMK0KCsAAACMfSURBVHhe7Z33
+        exRHnsbvH7pb27fnTffseePdBq9JXoKzCTYGTLAJDuQMxkQjokkCEySBkEgSymGUcx7lHGYkG/D6x+/1
+        23KNenqqZ7qqa4Lk+eHzANO56q1vqurm37799luKEydaxAUYJ6rEBRgnqsQFqIDu7m5yu90+urq6qLe3
+        lwYHB2lkZIQ8Hg+Nj49zj/2pExegApqamsjr9foYGxuj4eFhGhgY0IXY3t6u71NXV0cNDQ3U3NxMPT09
+        ujAnJia45/ypEBegAiAo3u9WQHRDQ0PU2dlJLS0t1NjYqP8JwfL2n8nEBagAUQHygChhLWEpIcaOjg7d
+        QvL2nUnEBagAFQI0A1cOIeLciClnqhjjAlRAOARoBOJrbW3VrwM3PZPixrgAFRBuATIgPGTWSGRgFWdC
+        Zh0XoAIiJUAjo6Ojuotua2ub1kKMC1AB0RAgA7Ei3DPqj9PRNccFqIBoCpCBOBH3AdfM2x6rxAWogFgQ
+        IAMzLyjlTJeaYlyACoglATL6+vp01xzr5Zu4ABWAKTZMtzEwzQYLhEQBAohWkoDrQoQQI297LBAXoALg
+        8iA0BtwgBAghQpCwkPX19b4pNwgikgkDSje4biwmKXEBKkDEBUME/f39umVi025YTRNuK8myZcxB87ZH
+        i7gAFeA0BsTKGZwDYIFCOOM2ZMkQPG9bNIgLUAFOBWgE4mNzwOFy1RA8Ctix4JLjAlSASgEagVDCNe3G
+        XHK0Z1HiAlRAuATIwAJXXAMJjUrBsCwZYuRtjwRxASog3AJkQIgQjEr3ifPgfDg3b3u4iQtQAZESIIPF
+        iVjAytsuA6wrXD5vWziJC1ABkRYgg9X3UHfkbRcFsWakyzRxASrALMD+YQ/VtA1Se+8oDY+GN76CC8Xy
+        faDCLaMMhBkc3rZwEBegAswCfFDaSa9sz6K5u7LpjYN5tPhwAW2/UknXslp1YQ6OqBcl3DLuQ0UsB3cc
+        zlqkkbgAFVBdXa1PtaFkgum2c3fLdQHymLUji14/kEfrz5ZScr6bez5ZYAEhHqdzvywxiUR2HBegAswW
+        8FRaA1d8ZjZ9XeZ3nCow1QcB8bbZBSJExq3CrQcjLkAFmAW482oVV3Bmvk6r1GO3cFgauFCnhWZWJ+Rt
+        U0VcgAowC3DDuVKu4IzM251DnX2Ty7VwPLJZ1VNvzIo5iedwLJb787apIC5ABRgFOD4+QWtOlXBFZ2Tl
+        V8U0PjF1DoiFTb2x1TEjbmdulAF37CSzhUsP15rCuAAVYBTgmGeclh4p5IrOyNl7jX7nMAKx1GZmUv78
+        eVR/5DB5FHQ+XL2TeiGOD8dsSVyACjAKEHW/BXtzuaJjzNYy4Tr3oN85/NCsYdW2LZQ762WdwjcWUXtK
+        Mk04LI04qfHBQuM5VSclcQEqwCjAgRGvXmrhCY+xRLOQHq91Rw5UlFPenFd8AmSUfriCBquruMfYBfGc
+        rCXDcSjz8LbJEhegAowCbOsZ0SxcNld4jIM3a/yONzKhZcQVG9cHiI+RN282uW/d0K0k73g7OKnx4TUD
+        ldN1cQEqwCjA8ub+oBZwlsbjCusVyf2lJZQ7+x9c8fnQtldt20xjPXIrm1l2LFuiUemK4wJUgFGAGeVd
+        XOEx5mvx4ZiX3/ETmiDK16/ji45D0btv0WBlJfdcoYD4UPrhbQuFytJMXIAKMAowJd/NFR5j88Vyv2ON
+        9JcUc2M/K/IXzSd3cTH3XHZAVozEhLctFMiKndQXGXEBKsA4F3wiqYwrPEZSnkVtT3Np5Rs+5gqNR97c
+        WdSd8UhfkiUrIiAb08EF460+3jYRlAkQJh0dgAbhbZ/JGC3g4eRarvAAyi+t3fzO7i9x2bd+WgzYevmi
+        71gUsJ1kp4gHZZISLIh1mpAoEyA6ASLEiMIDRXJNWbQxCnDTeWsLuPJEsR53AbSTMZCv+GQDX2wcavbu
+        CsiC0d6yIsR9yMaDWP3D+90uSgSI+hBiAvZvPBCCVKAiToh1jAJcfryIKz5w4eGUy0L8hc5Du3UXFti2
+        fuUfr6NxizoeRGjsBxFgyWS+rIVpOicfQlIiQHQALy2HRYQ1RIwim/JPB5gAUVy2moZDbbC6NbCjvNoA
+        dX28lis2M0WL36axECKBO5b9RBvqgzL9hNCL97sdHAvQzqiDhUTAipiBJ9TpDhPg0KiX3jyYzxXgW1/k
+        a50b+Ox9xUWUF6rup1GgZbxDtbUBx/NAHC7zwhLiQBlXDAsoawUdC1Bk1KBhIMSZlqgwAfYMjNGru3O4
+        AvwyKVA8E14Pla1dzRWcEcx+9GRnBRwfDBgFmcUHWIkjehyMimws6EiAGDHG+McuVVVV+kibKYkKawO8
+        hMSbBcFvRXWBFqm3IN/WrEdr4pWAY+2ANhb1ONhfprwC4cq81ulIgIjtRJMMiI7VrZC1IVEJx4rgSMIE
+        WOce4goQ74CYX0TCypbSD1fyRWegYu9u6XlfFoPztgVDxqVCuDLu25EAZYJPjC7jqEQj4canc6LCBFhQ
+        28sV4JbLFQHH9OblhrR+5Rs+ooG+PumkAsjGgzJ9C7GLWlxpAWKEiK6SRWxh9WkwWFKI01wfmw4wAd4t
+        ag8QH0jVfjfuj9ivdNUHXNExipcuJs+PwkG7wVvItguEITq4ZcorSDZF54ilBYjkQ7RBYOlCNQTiCAS0
+        0ylRwcBBGJGY2Rwgvn9qSUnvoH+Y0pubE9T6FSz8Jw3V+SctxkKzZ3yEvOP21/RhcIu6YvStTGIhmhNI
+        C1D05kQbAW4DHSuTyUUa9o3oL28EzoKsOeXSOtOw/8Q4la5exRUeyHt1DvVoAjWen4HB2dxWSymuz+hh
+        5SGa+Na+AYAbF0360AeihgDZt0hMLyVAmQls0RsDsJgw6bC2sTyjwkb93uvVAQL8KqXCF+PCqgS1fsh4
+        r1pnvN2DDXQ1byWdzVxI5zIXUbX7Hnc/HjIWDceIWjRRQyMlQNGbAqJBrTGeQEPgoSDiWExUWHuY34bD
+        4oPmrsnShF6M1wTgsrJ+mvgajh2xyHgnqKEzmy5mv6OLj3Ex+11dlIH784FFEzUcMrMjImUcYQHKjAqZ
+        1/p4Dw4LGouJCmuPN7/wnwV5/1iRFqtN3Wf340xL61fxyUZ9OT7blzEx4aWS5pt07vFrfuJj3Chcq8eE
+        5uN4oM1ExAFg0dAXvG1WwNrb9XbCApSZa4T1EhEMHjpYTQlxIdwJhM3bHmkgQKxyRr3PKMAjKVOJBOp+
+        JSuWc8XnWr6MvJyM0zs+ShnVR3V3yxMfo1QTqPlYK9B3ogVjUYMjohFhAdrJZM2Ijjq78SLKBBBitBMV
+        dFDfkIcW7Jt6HRPvfuRV9/j26X70kCu+vAWvUl9Ntd/5wIinn1JLt3MFZwaueGjU3vshMh5MJn7HAl3e
+        72aEBWj3xAyIRLQQKhIvokEx2pCJRitRQYfibbi5O6fehsO7wezVy3Et+yxZ/l6A+PK1jLc3P0+PdY0Z
+        au9QC10vWMMVmxVZNV/5jg+FqEfCvYm6YbSJnWsICRCjQCTDAaKjLVi8OKaZ9iurP6TSlBTyGDoMAT7u
+        C42Ezox0ooJnrG/3n4bbnjj1shCWzgfEfnNeIffN6759YGXwHC09xXQpZzFXZME4//h16hu2JxJ4DFyP
+        t80K0SQScbqdso+QAOHbRZIJjABR9xtsdNZkZtCW5/6DNmvs+91L9Pj0aRrQGtKYsOBPCAIzLiKj3Am4
+        XllTv098IK14soNh/VzLlviLDxnv8aN+Ge/ExDhlV1zWhPQGV2B2yK5N8J0vFKKGQXRgQ+RWs15GhASI
+        YquIm4PFZKUUuwQTLKzf5p/9ux87f/kiJW7aSJ2aCzYKDqMvUokKOvNxxdTrmHM0V4ylWdjW9fBBgPWr
+        2vK532c2MKuRW3dWE1HwZCMUl3KWasmQvQRDJFMFaEeR5AV9YSdcExKgaCFTtGCNfa1GTb8m/u0v/jxA
+        gIxtP3+Bvl66hBry8vRVxuw4VPJx36KZnwgQ4I2cNp8A150u0X+f0Fyqa9liP/GVfPAeeQ2zC2PeIbpb
+        tpMrKBnKWpJ85w6GqBsOVZngYcdtCwkQgT7vdytE3S8e0MptFlxN5ArPDFz08XlztTgxmbyaANjxGAy4
+        n3AkKjgvvnbFBJj4eLKjdOs3a8r6Fb6+kIabp9qkf8RNN4s+5gpJFpwP7pxdIxiiCaXo/hiYocIg2wKE
+        /xcVlOgNB7OwiWtWcwVniSbEg3/+E2UmnKThH7NwNAbe4eUVuZ1QW1tLe69OzoLM2ZlFhZUtNK4J3Zj5
+        YlUzFqCyY9r7Kuhy7jKuiJyAZGRo1F4Nzo5AjIjuD28WqkRmW4A4EawIbxsPlgzwtvHA/lYZ9rgWq+z8
+        9S/5QrPBDi1OvLNrJ7mrqvR7QuxjnJ/lXVMEnHPblUpdgEsOF9DwyChVJl6ZEt/cWdR+O8W3f037A/o6
+        602ugFRQ3jp1rWBAIMi8edt4oL1E9odmQpXgbAsQ2W8oNRvBjeKGedt4IP6zutmmoqLJ7JcjLhG2vvAc
+        XVz+vh4nQtS4R1h10WlCMxDgByeKdQGeuFOvJxjGzLcOGa+23/iElwoaLtG5TP60mipSS7cF3CMPxMV2
+        MlUG4mmR1TEId0LFmbYFCDGJxE+4UZEFjcEy7KLr12nXb36lRIRgy/M/o6OzX6GS5CQaHRzwJSqiE/UM
+        CHDhvlx98UFFc7/+MUkmvurtW6hV2z443EsPKg5yBaMSuOCk4k36NB7vXo3A64gklqgsiBgVnD9U4mJb
+        gKJxk6i5DtYQCKqHNPffWlZGmacS9Hhw/x9/Tzt/9QvHotz/h9/pceKgZglggWERRe4b1NU36gtP3z6U
+        T0P9Q1S89F1dfJj79WqiHhjppG/y1nIF44xF+jQcFiRk1Z6kuo7HVFWHb0/bNxQiiaVoWAVC5QG2BSh6
+        YcRzIoIVTVgglP6OdmrMz6eHx4/R5VUraO9Lv6Vt//k8V2ihgIVN2rKZuhoadLchcv+uijr9q/e7rlVR
+        R+ptve5X+NbrNOpuo86BGrqa9wFHPOJgRcyF7Lf1sk1x0zVq76+kkTH/8EFl4sdDtBKiTICiNxrujNmq
+        xoR6YWV6Ot0//CV9/d5S3cLB5fJExwNx4qWVK6gqM5PKy8t1MYZKVB4XVulfPkjPbaKid9/WMt5Z1FdY
+        QI1duVqy8RZXTHaAO03MWUWPqg5Tdft96h7U4ssQJRbRdg+3oQilG9sCVCUQHiwr5W3jAUHYHhDavpiu
+        e3ThAqUd2E9nNYHAfYcSJVz7iVfnUeGN61RfUxO0ApCaVU7z9+ZQ/c0kvdzScfcOlTTfsFzDx2cRXc5Z
+        SndKtlJ+wwVdvGPeQX2hhciMRbhDJdE54agJUGR/NIBIVR4NLCJYnJ+90ANQoxvs7tKTkLv791HCawvp
+        wJ/+aClKzDunaRa1vKCAmwXeyiinj47nUeHbb1DdySOUUXWUIzAji/Q53+sFa7XE5IA+e9E73PJj7OZv
+        bZHIiUwnQrAiyaLdRQMMUQsban/bAhT1/cb98VKOx2M9itEAdhcwAtE5ZpRZQnWiZ2SE+rVzliQnU9K2
+        rXRk7mza9/uXdJeMojaEiHrixXVryaW5Z2NJKvF+JZ3ceopcWz+i5MJNAYLDglJYt1tFGyiz8iRVtTyi
+        UU+/XpYx3gMPDB5YNd42AG/g9YzT2KiXRobGtIy7nbo7+qmve4h6uwbJ3dhDLfXdVO1qpYqCZsq/X0O5
+        6dWUmVxOD26UUmeH2BcNpqUAS6pb6G/vf0F/X37Ix+sbTvpYs+eSxkXa8MU12pVwmw5fvKfz1dVHdDEl
+        R+fy7VxKeuii5EcuuvWgiFIziii/rEGnqsFNDa1dOu6ufuof1MSkMTA0QoPDo9TU0kZdPX00Oubx4fWO
+        k1ezpMAc47E57NEhzQVqLsd166aeoByfN0dPVjAnfWzRQiq8m6ovCzt/u4werl9GVzKW6IKDdcMsx/2K
+        fborxnsbo55BzXJPaOcdplbtfiCY0REPjQyP6cLp6RigzrZ+aqrupPrydirNaaTizHpNLFWUfDGLHt4s
+        o+RzeXTjVA6d3XOPTu9Mp6OfptDRT1LoyKYUOrQ+ifatvk67V1yjne8n0valV2jbksv6n+zvZnYsu0Id
+        bV1CtT3RZDTU/mETIKan2N8hkp/N/ixsPD/3c3ph7mad5+d8PvW79vdfLthGv5i/Vf/zz0v2+5i35ijN
+        X3dc57X1X9GbGxN03v3sDC3bcoZW7LhAq/dc1gfE7lOTnLnxmBIupdOe3Qm0ecWn9N4fZtG2uQvp2KZt
+        9NXpDXTi7Ba6euUifXP+Nt25lE+JRzPp8uEMXTBndqdTwvY0Ov75bTqw7jrth1g+uOYTB8QAzCIJJ7he
+        V0ePUL12WgrQVdVMzxmEMVN4TuOdZevp9tHVtPGTZG4nxzIQYGd7XIDTEljUM1/soe8T/koV59+nBbeK
+        ab/mEnkdHatAgO2aCxaZAZo2AjTuX1rTMqMECLfd8CiRfjj1V/rh5J+p/tJK+ntSMa1/oCUjO9O4nR2L
+        IFZsa+mYHkmIkzJMs7uHXpi3mduZ04kXtVjy4Pm75K1I9YkPDN/6iGbfLqGXk4vpSkUbXTj4gNvhsQbi
+        UHdru1AZRvWEhG0BOilAIiP9heayeJ06XUAWj2TqSU2aJr6/+MQHnt3ZSAtSS+lvmhWcowmxTMtorx57
+        zO30WOLYp7fJ7RZ7zSJqhWgnykeZ48X501OAyLC3HLull3Se1N4PEB/4Pm0zfZJTpwsQvHOvgnqHxuj6
+        yWxux8cKX21NDboKnYfqGTHbAhQNPs1TQn9avI/bwbHMH9/dSykPC/X7txKfLsD0LZRQ3uoTINhd2KgX
+        iJPO5nE7Pxa4dOiRkEWDUFXPiNkWoOhreebl2B9sv8Dt5FgECdPavVf00KETixHKkyzFB76/t51Sm7r9
+        BPh3LR5MbujSi8+3L+RzBRBt7l1zCSWXcNVWq9Z5QLDKLKDo8m2k9sbpr4Pn07idHWv8z5u76daD4h/d
+        0gQ9qbhFPyT8H1d4jGcP91BFz5CeCRtFOO9OCVV39VFLc4ve2VYzEtGiJKdeaE5d9LUMTJmGEqxtAaJY
+        KZKumxcYpGSUcDs8VkCst3TzWXJrgpm85wl6WqFZvgRry8eAAN1azPdKistPgGDpvXIa9k5O92UkldGO
+        92JDhJNF6G6hIrTou8HQQKgV1LYFCPWLvD+ABjcmLmW1rTFbC/z1oh10MSVXnxdm9/u0MiWk5WM8e/wl
+        jWoiW5BaFiBA8IWrmSZ+PG/23UpNhIlcUUSSIxuT9QxYZKkXVhSJ7I855lCLQGwLEPGfaBHSGIB29Q7S
+        rxZu5wogmixYd4Jqm/yXgj3RLZ898YHh1F162yxJ5wvwH8kuymibeuEq/0EN7YyyCJGAiPan6P521hra
+        FiAQnQ1B5jwZS03+e86HR7giiAb/9c+tdOhCup/Vw+LVp6XfCIkPPMs+ph//ZUkzV4Bg3p1Sah2cKvi6
+        shpo1/KrXHFEggJtEIjW9ET7345ghQQoOgJgfo0m+Mil+1wxRJrZqw5TVqHp/+6YGKenJYnC4gPPCs7q
+        57he18kVH2NlRpXuqtk1q4paaM+Ka1yBhBNMwWEOWOR1VMyWiCwaBnZKNkICxA2IZMJw28bFlJhJiGYc
+        CKu3KyGFRsY8ejbnWwcH8bmuSIkPMAEWdQ4EZMJmjpf6Z531Fe20d9U3XKGEi3N77ullNaN3CgXaS7Tv
+        lVtAJCKiH5s03kRP/xD99+s7ueIIN39ZdoCyi/3/7w0MqFHtmZ4WX5QWH3hafEk/HzLhl7V4jyc8BuLB
+        LLe/5Wmu6aS9KyMnwqzUSmFvJjpjgjKcHQsrJECoWqRuBFAHMt748u1fcwUSLlBeWX/wKvVq4jfeF2Mk
+        44Qj8QG4bpxrYMzrmxMOxmtpZdQ9MjX/inZ15VVFxBLC/TbXu0Nmp2ZEZ0CQgNiZYxYSIBANXFE3Mr7v
+        kZZdrrlhvlhU89Jbuyk1q8xXAvEDCUfRBU18/8sVlQhMgOMT39Li+xVc0ZlZn1VLXu0e2OwCBqm7qYcO
+        rL3BFY4qvjmRJWxEYM1ESnDAroUVFiBiOpFaEDDeDCb1f/vGLq5gVIE484MdF6inz2KhpRbzPSs8r0R8
+        4Gn51Ffqt+TVcwVnBrHimbLmgBeOutz9dGRTeFZXw/q1aIlSsJeceIjGi9jXrsUUFqB5hsMOeGDjA2Ce
+        lSccFSDGTEzNs26wcS89yzvl2O0aMQrwSk07V3A8ZqW49MTF7/408Ebb8c/vcEXkhNO70nVr68SA2AGz
+        K3ZnWIQFCERXxpjdcGFFo9/LQyqA1Xvrk1NUXF7jtwjCD4gv+5gyy8fAlB27BgrOPLFZseiufzzIGBoY
+        pYRtd7lCkgFTb5VFzUKLCQAqBSLzv0Bk4YqUAEVjCGCcloN1WvDRCa6QZMD7GWdvPva9e2xOfBjIVlWL
+        D2Dajl2jaWAkZCZs5tOcOi1+DLzf4cExOrVDzRL/c3vv655IZPEpEDU2QGTtqJQAZUaFeTXN9fRCrphE
+        mb3qCFU3+v9/vFarML7rb6V/Jb7NFZETjAIc1AYBlufzhGYF4sHEWn5Yg3eGz2iukycqu2Dar6lm8oNL
+        vGtYASsmegy8XagFCEakBAhE4wJzYXJ4ZEzPUnmisgPeAd575g6NWXxxwapy/91QF/3r+vtcIcnSm3NZ
+        txSgoamZFlvMCQcDS/kre/lJ0+iwh74+IP+eCTJfCMmuW2TAlYoUn4FowiItQHNiYQfz5PS5W1lccYUC
+        X1bIKwtdDkIsyB2NnmF69nC3MneM90SM59+YXcsVWShQwhn08EXS3dVDFw6JixC1xdbGDmGPBbHKhFqi
+        hklagOhc0WwYrtEYU+CzGSJL9X/+6hbafPQmDWnW03jeYMAlcO9TGzxPq+7QD+fncEUlwpNa//+396Rp
+        eb4I2/IbAuJBiAezCuPeCbp5Koe2L+WLLQBtv4KHtVJxHAauyNtyAMVt0ZkyaQECUbUD86d4r6UV2CpM
+        /+GdPfSooEqzuoHnDAWsrpXF/m6wk76/+5mjssyThky/c6Y393DFZQckMFjKj/PgfiEE44vjWOJ/51Kh
+        rdXV+DSIjJDM4ZJdZI5xJECMTMuShwXmBGFk1KO7VJ7oAKbSVu++TE2t7cKjywhED0vAzQK1jn7SlDMZ
+        G0oI0SxAxHKhFiUEY+6dEqrVzgEXyBMPRJh+tTioCA+uu0kd7m6hr44xkDCKihb9iviPty0YjgSIkSL6
+        uiaAFTQ+YLarTk8qzOL7zWs76cb9Ip/lgisVLSMYwXnQSJbzoBPj9KQln75PXiskxCfNeX7nwRJ80VKM
+        mTdTXTQ4Zv2seJYHN0q47hjrDGtKW4UzWIA+lXHZMiUe4EiAQFYUxodEY2489I1PeHDJS7eco5Z2f4uH
+        /XAcE6QsiKfQOcHu+7v+NnpWcI6+v7E86Btx4Enr5KubDMw9v54mngmb2V8c3KUhHMlILvezhCg4Fzys
+        0a2naNYLRIrIDFnRAscCRCfKjDRM1Rhdat/AsP4eLt7POJ+UzS3MAph6jDbeNhEgYpwHMVJwQWvbxgbp
+        ac09epZ9VLOO6+hfV9+lH87Nph9O/21SgG3FAcehuMwTlQj41Edac+hFAPjgpL7EX7OGePsORkHUhQLR
+        Gh5DxmUzHAsQYNTIWEEI19j5OSV1VNccugFwLZl4gwcSFIQRaHiIm7dPAPiyqVdrcI8W/3qGdddt3udI
+        SQtXVKLMTy2lFsNSfiuKH9fTzdM5+nOIxuUMmbILrJ9M8sFQIkDchIwVlLWeACNOtAwUDAgRbgT3A0vg
+        1M2nNHZxBSXDKtNSfit6ug2rvAVBsoLn5m0LBo4TLVYbUSJAIBuEwg2LfJ/OCI6TcRnBwGDCPWHdIywC
+        riEjxsLOAa6YZDlqWspvBnGtyDseRmQHM9pKJgk1okyA6CQZEw4gXtvuzwRGrfEL+CphYoRVREPDQuJe
+        0dHoNPPIxwDE78iyXQ3NegzHE5MMeOndvJSfgRhMdIUzA88om0BAtLL9xlAmQIC6oIw1QyPIiheg0xET
+        OnWbdsC9IoGC6HFNCJMBceJ3CBRz1FjvxxOTLIgH24f9RQ8PIOtBgOzgx2DDsbxtIigVIJAdTbAmTmI6
+        NCJELBMGhAu8hskTkhPWZNaQZ3xCHwgQAAYf79p2cBL+mBNIWZQLUDaVB2gQkW+VmEGDoFOcnEMlB4ub
+        uCJyynFXoz7YIELede0gM5fPMJfQnKBcgMA83ysC4hmZbMwIXCDuIRIuORgiy/NF+IcWWxZwlvLbBd5G
+        tozlNFwyExYB4iad1IYwMp2k9gDH4x6cxEdOyW3v5wpIBW+ml1PvqPggZ66bt80OsjGjFWERIIAVgzXj
+        bbMDRqiKB8U9YMSqbDS71PUP08sc8agC36LhXdcKiM9J7AbXK1vqsSJsAgROqvJoJDSWCuGwc8GyOomb
+        RMGL6nMFl+fbAV9XOFHWSmNaMsK7Lg8mPtnnR0iF43nbnBBWAQJYH9kRh+OcZnpGIGa4ZScxqiiv3XW+
+        KMHIkvsV3Fc5g8HEIys+NoBl+zEYYRcgHtpp0ArBOE1MjECIuCc0quxMh1225tt7UT0Ur94ppfNVbhoV
+        sHoAsTAGsZNnVBGTWxF2AQKIR2ZhpBEcr7q8gk5BTINpN8ScaGTVYjxb2cYVlF1m33bR/qJG6jAVoO3A
+        CvS8bXaRWWYvQkQECNDRTgWEhnAqZCvgphCzslkN/F1F/Hm/RW55PqbedhU26O8Z884bCrS3k8I+QPwu
+        W9O1S8QECFTU+HC8k3jGLmh8uC7M7AC4bPwbgwArTmBdzG4JIsbv2A4BwPpk1TQKLc/H17WOl2nXGpKL
+        e2HBcV3ZuWEGng2hD2+bSiIqQIBR6TSpYHFlpGt86Fz2Uj46GYKE+2ZgYOB3bIe1x/6dI2P6O788sTGw
+        /dPcOnrQ2qNPs/GubQe0K9rFqeXGQMKz8bapJuICBOgkFUEtLCpcsuq4TSUolZiX5+N9kbfvldM2LUFJ
+        11z0sMW7wCLAMquwWBBvuDJeHlERIIAIVcRYGPWI2aI54xEK/D9ySx9UaslEE31T10GtmnsVqeEFA8+v
+        asYHoouk+EDUBIiHhJlXIUIAC6DC/YQDJ27VCoQhGMRIElQIBueLRGxtJmoCBGg4Ve4YoPEg6nBnbtGG
+        DTZVxXTmdiMtPhBVATJUF5qRwSJzRcITSXcSTvAciHfxXCrroRj8GLTRaqeYECAIR6EZFoJNvcWia7YD
+        rBIsOp5Ddl7dCpwvEqWWYMSMAAFcC+BtcwLEB8sBNyP71likgTgQniDBUuVqjWCwOy1UqyCmBAiQzYXL
+        JeCcKBDjA9roXHRyLLlouENYO9QU4RHCEZPheXGNcAx0GWJOgAAjHhYrHCOfAauIOiI6G9eCZYx0EI7r
+        IfZFQoH7gDBUJWQ8mCdwOhGgkpgUIMBIRXyCWQXedpUwywjLC5eHTlKdGAF0PESG8+M6CAnwfJEQPlxu
+        tDLdYMSsABloOJX1Qrswd4jgH0A0sFS4F7hvCBQxlBn8ju3YD/vjOHYObFOdSIQCgwv3E4mBLEPMCxCg
+        EdGZsFK87ZEE92IX3vGRBIMXAyCWKwDTQoAMxGkQYizFMLEIYmdY4FgYsKGYVgIEsCxwdXArsRbPRBu0
+        B8IGiG+6tM20EyADbgVBNcQYC+4umuD5EePB3U437zBtBchAg8Mt/1SFiFIShBfLq4GCMe0FyEDWio6A
+        aw5n/TAWgHvFgENmPV2Fx5gxAmSgc+CaYRVVzy1HGzZLFOuZrQgzToAMuGMIEDMM0ai/qYIVr/EcmD6b
+        aWHGjBWgEVgLxEqxOgdsBPcF0WHQ4H4hvpkcUvwkBGgEYkTGiPhJ5euXTmADhN0T/j7T41jGT06AZtiy
+        J8RVAPEjVqKEy2UjWYLAcB12TcR1quedpws/eQHygAtElom4CxYJlglJDUQDsWIbRGoFtsOFsvlgHA9w
+        Phz/UxUbj7gABUB8BpBph4LtyztPnCniAowTVeICjBNV4gKME0W+pf8HNi1HsqI6WQkAAAAASUVORK5C
+        YII=
+</value>
+  </data>
+  <data name="cbPieShowSingleRing.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAKAAAACWCAYAAABZ7IOdAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsAAAA7AAWrWiQkAAAAZdEVYdFNvZnR3YXJlAHBhaW50Lm5ldCA0LjAuMTCtCgrA
+        AAAUzklEQVR4Xu2d6XtTV3rA+7Wk7UyXp326zjPtl062TmY6nWeeztZl2k4z05k+zwwEMGsYIDAQggmB
+        JA1g4wWMDXjF7FvAYCAshgSwDd4l74tsSZZlS5ZkydZi/oO3970TUdV5ZZ17dSWdc68+/D7FODp6fz7r
+        e97zW8+ePYMsWTJFVsAsGSUrYJaMkhUwS0bJCsjIfDAI4ZkZCLldEJx0PufZ/DxMeHxgc3ue4/YHIBAM
+        wbz036jfleX/yAr4OfORCIR9Ppi122G6uQkm6q+D9UQ19H+wF8xbNoP5rY3Q9eY66Fy1EjpWvvGckMcD
+        /1FQCa/sKnjO3+85BD/Yd1TmJ0XVsP3MNSi7+wguPemEDosNnN4ZmA2FyM9hNAwrYGRuDuYc4zD14D5Y
+        yo5Az47t0LV+DbQvXwrtb/ySGRTwX/PK4Wvv5DPx4s6D8OquQvjnA8dh+bEzUPWgGVpHrOANzELEgD2m
+        cQSUgotDqLupEUZKS+QeTalsFEoFpHhxZz58471iWFp2WhZy0DEJYalHJtuhM3QvYNjrhan7DTCYtw86
+        Vq0gJUoGLQRcyEtSL/nvByuh8OYD6LY5YJ5ol17QpYDz0vzK0/IUhgoPyvM0ShytSIWAseCQjXPM6k+f
+        yIsdqr0ioysBcYXqqLsC5k0bSFlSQaoFjAXnjltPXYWnw2O66RV1IeCs1Qpj1ZXSClX7ITYR6RQwCg7R
+        Pz98Aj7p7IVgOEx+J6IgtIAonuVoKXTkLCflSAeZEDDKixKvF1bBHVM/hMJiLlqEFDAoDbWjleUpWVQo
+        JZMCRsF54s8OnYDmQYtwWzlCCRgJBmHiZj10vbmGlCET8CBglJdzC2BT7cdgmXST3x+PiCGg9FftHxyA
+        3twdpASZhCcBo3xzzyE43tAIcyH+54fcCxgJBMB68kTKt1PUwqOACG5u40LFbHWQ3ysvcC2gf3BQPiKj
+        As8LvAoY5bXdRVDR0AThCJ9zQy4FnA+HwVF3NaOrW1Z4FxDB1XJO+Tmwuz3k951JuBMw5PXCUEEeGWwe
+        EUHAKN/58Ag87Bsmv/dMwZWA/qEh6N62hQw0r4gkIILpYkfvPuZmu4YbAX2mLuhcvZIMMs+IJmCUPZdu
+        cXGKknkBpb9Ed+PjjByjaYGoAiJ4ruyfC9JxSROZFVCSz3mzXojFRjxEFhBZcewseAKzdHzSQMYExBR4
+        +/mz0LFiGRlYURBdQOS/DtXApHeGjFOqyYyAkny4uaxFRnKm0YOAyI8LquS7KmS8UkhGBBy/dEEX8iF6
+        ERD5aXENePzpHY7TLqDz9i3hh91Y9CQgsqzsNMykcWGSVgHdzY3cnumqRW8CIr+quZy2RIa0Ceg1dQm9
+        2o2HHgVEdp6vh0gazo/TImDAYoHONTlkAEVHrwIiedfvpfzuScoFxGoDPW9vI4OnB/Qs4Cu5BfK9Eyqu
+        WpFSATGrBa9GUoHTC3oWEPmHvYdh2Oki46sFKRVw4vo1Mmh6Qu8CIpjYOhtMTS2blAnoHx4SMrlAKUYQ
+        EPMJ91+7R8Y5WVIiIKbR97yznQyY3jCCgMjfvVsIj1KQS5gSAW1nTpPB0iNGERDBil5aJy5oLuDMwIAu
+        9/viYSQBkb2Xb5FxV4umAmJRoL7duWSg9IrRBMSM6qZBCxl/NWgq4OS9u2SQ9IzRBEQwfSukUf1CzQTE
+        DeeuN9eSQdIzRhQQV8VnHreRHihFMwGNtPCIxYgCIv/4P6WaZM1oIiAWCzLCnh+FUQVE8HYd5YMSNBFQ
+        zm4mgmMEjCzgd6VeEJ+joJxgJWkBg64p3Wa6sGBkAZGj95LrBZMW0Hr6JBkYo2B0AX+4/1hSb54kJSBW
+        oDdtWEcGxigYXUDkfFM76QcLSQk4ceM6GRQjgPdaEBTwR/kV8HLuQXl7ggqQ3nm9qFr1vqBqAfHtNNHq
+        uKhi+VK5l+/buxvGaqrkJ7y8He0QsIzINarlK6auaegfd0LjgAWutpqg+NansL7qIvxL3nG5aikVND2B
+        JYLxtSfKk0SoFtDXbdbN1covILXLvHmj/FYc1igM+/3kd5AIrL2CctY+bIH/PlwLr75bSAZQD2CZD+o7
+        SIRqAYcPFdHBExlJPDzLnn7SBJFZbbM+8OVMzCx+98JN+VkuKogig5nTrhnlf6iqBMR5T9e61XQQBaVn
+        xzbwtLXKJUOoNmsJPumae75ePtingikiOP+92NxJtncxVAk4/fQJGUQRwRMcx9UrcgV+qq2pBJ9V+M/C
+        KjKgIpJz/BzZzsVQJeBwcSEZTNHArG3/0CDZxnSB56lYqw9fP6KCKhL4TrLS+jKKBcQnTzvXriIDKhJD
+        B/PkN4OpNqYbvHuLj1ljQXEqsKKAw3Bdq5lsYzwUC+gzmciACoO00BitOJ6WuZ5SPusdgm9Jk3kquKKw
+        ufYK2bZ4KBbQdkrsozfLsTJ5745qGw887h+B1wReJX/7/RJFCQrKBJyfh+6tm8nAisDg/o/ky/Jk2zji
+        WpsZXsoVc06Ic9l2i41sF4UiAYNTk8JeODJLfziYtU21Sym4pxeWRJ6T5pBRQqEQRDTsWfG1dCrAIlB5
+        v5lsE4UiAT0d7WRweQcLoPt6esg2sYLC+SSBHQ4HWK1WGB0dBYvF8v8YGxsDu90ObrdblhJFpX4XC1ge
+        7RdHTpIB5p1NJz4m20ShSED7+XNkgHnHWltDtocFFG9qaooULhHj4+MQCATI38tCt80hXwingswzOA9k
+        /eNTJKCIhYbwTBe3jqj2JMLj8agSbyETExOyyNT/IxFYEoMKMs+8uqsAbC62Z8EUCSjirTe8Kkq1ZTFw
+        Lud0OkmZ1ILD9qyK82Xc2MUNXirQPPOgh22Dn1nAkDSvEW0BYt6ySXFSAfZUOI+jJEoW7E1nVPTG+fX3
+        ySDzTHlDI9mWhTALONPbQwaZZyau15FtiQfOW3DeRsmjFSih0p5wfNoLr+0Wa29w+5lrZFsWwizg9JNm
+        Msi8gkkGoelpsi3xmJycJKWJR39PF1SWFsHBg4Vw7c4jGCF+hgJXy7htQ30GCjyqW11xngw0r7AmJjAL
+        iL0JFWhewU1n3Din2kKBWyyULPFA+cqPFMD+/ft/w4E8uHG/mfxZCuxpqc8RjzumPvkVdCrYPPL9fUfJ
+        diyEWcCxqgoy0LyC91WodlDgogMXCZQoFAOSfBWx8n1OafV58ufjoWQ+6J4JwNcFSlbAqwgsT8IyCzhS
+        WkIGmktWLIVZO/txEG63UIJQDPSaoKK08AvyYQ9488ET8t/EAxc7rPtl+OT+zw6fIIPNI1jgnCVDmlnA
+        wQMf0cHmENOmDXKpOKodC0EBWHu/wV4zVJYVkfLVSXNA6t8kQsmCRKQ9QbyoNOCYJNsRC7OAIpXc7duz
+        m3n+h0dmlBgLGZR6Plq+fNXyIbjwoT4XBeYMUsHmFczsodoRC7OAIm1CD5cUk22gYBl+5TkfNezmJScf
+        YrPZmIdhvPoo0kLkZkfi83d2AdevIYPNI/ZzZ8g2UGByASVGlC+sdmMoPFwGFy9eTMjDp13k70ZwX5A1
+        iwYvM4l0z7i+vZtsRyzMAor0pL7jCls2RqL5Hw675SW0fEooPnZy0T1CnAZQn28huBIW6e7IlRYT2Y5Y
+        mAXse28X9O7cIQSuzz4l27AQFBA3hSkpkOaG66RQSikqOwHDxO+Pwpoxg0WAflJcLZfCEIGG7gGyHbEw
+        C+j0zIFjWgwCQbYhDYe+xQTs7WqB4oJ8UiolFB+tXVRAP2vlBekPZs45DHMTQ0IQmUu8z8ks4MpDrbC0
+        8KkQ1D9lO2VI1AMiXS2P4kp4QFqEFBcXJ+AQXL/XSP7uKKxbMZHZGWjJWQItK39bCKYenSbbEQu7gIfF
+        EfByI/smNK5CKSliMckS5n1BwPyiEmiWJtrUv1FCkPFSfMgzAa2rfocMNo9MPTxFtiMWZgHXlbWRweaR
+        U/fHyDZQsOb9pUpCJatgHNZaV/0uGWwecTVdINsRC7OAG462k8HmkfyP+8k2UHi9XlIMingS5iUhIfbA
+        1Oei8HTdIQPNK+4nl8l2xMIsYO5JMxlsHtklfdb5ebodC8G0KEqMeJhaHtMSFh6GpjYz+W8Ww+Vif4t3
+        4u4xMtC84utJvBvBLGCe1KtQweaRNUfaYC7EfkVSaQa0qZWWsLRGWTYMwjr/Q4aP55CB5hGcq86OJx6J
+        mAUsvTFEBptHlhU9hV4r+x1g3Aah5FgMWcLCWAkPwNm6u+TPxgNPYajPQzEfmgPTzpfJYPMIzlXD/sQJ
+        wcwCnrg3SgabV84/ZC8Zi9sxalLxfyMhbtEcgNqLN2BkhP45Clx8sJ6AIMGpMaEWIK1rviR9bg3zAT9p
+        myADzSs4Z2VJiIyCe3EoBSXLYgwO9EFvbx8MK5APwbvG1OeIh/PucTLQvGJ65yWyHQthFrB1cJoMNK8s
+        L24B65SyS+FKElOTQUkiKjIfCUH37m+SgeaV/oLXybYshFnAwfEZWEYEmmeq7ih/1xZ7JkoarcDkB6WX
+        1P2WdqE2oJGRynVkWxbCLKB/NgwrDrWQgeaVtaVt4PEre8UHe6ZUSYjyKVn1Rhks+QUZZJ6ZuFNGtmUh
+        zAIim8s7yEDzzAUFi5FYtB6OccWrpjzHrL0P2tb+PhlkflkCHhNbRQpFAh6pF2crJsrqklZwuJWXxEBw
+        YZJslQRc2ExPTyua8z1nPgIDRT8lAsw3bdIKODjNlhCiSMC6J+NkkHln/6U+5pMRCrw+qXSbBodbPOVg
+        PeelcLfUCZX9EqVzy1fJ9lAoEhA3d0VbiCC4MX2nY4JskxLw2A6HZqx2hT0jShYFz3RxmEXpMMFUVY8X
+        Q9Btg47Nf0kGmHeGj60k20ShSECftBDJESgtKxZMJxtyqCvTFg+ULBbqZ9QwHw5Cf/6/kcEVgckHVWS7
+        KBQJiOw+3U0GWAS2VnXBlDf9D9IoQpr3jZ19RwqkeEMv0rr69yAwlvguSBTFAl5tspPBFYVdp8xyT061
+        LeNI8tnrDgg574vSufWvYT7C/v0qFnAIN6SlORUVXFFACV0+vnpCDJrt4w8k+V4gAysKluoNZPvioVjA
+        YDgC68vESU6Nx6+l4djiVPcMq9ZEggGw1GwUuueTkT6/p+s22cZ4KBYQqbprIYMqGrhHeN80KS0g6Ham
+        g1l7L/S8/x06oILRsenPmVKwYlElYM+YV/hhOApuKxVcGQC7S91mtVoic34Yry+AtnV/QAZTRIZKl5Ft
+        XQxVAs4GI7DhmHjHcouB59xnPh2T7z9TbdYKTCx1NV8E085XyCAKCw6/HbfINi+GKgGRUw/GyECKDt5/
+        rrg9Iu8ZRiLa7e0FXVZw3isH046vSQETfK5H0Pnrv2G6iL4Q1QLapgJyzh0VRD3wRlELbKvugkuPbfKU
+        Y9ofUpTgGg54IGDtBmdDuXye27buD8nA6YWxszvI7yERqgXEYOw500MGT2/gfHf1kTbYXN4pnyuflnr/
+        uma7XIEhGIrA5Ge10nyuEKwXdsNIxVr57kbH5r8SfkuFFUy/x5IhlCeJUC0g0tTnEvJsWEsw37Dr7b8l
+        A2MU+vJ+xFwQdCFJCYhXH7dUdpKBMQqGF1DF3l8sSQmI1Lc4yMAYBaMLaH73NUVHbwtJWkD/XBjeFKhs
+        h9YYW8Al4LxfSXrBStICIvUtYiaqaoGRBTTv+rqcQEE5wYomAuL58Kbj+tqYZsWwAkpzP1cj23Nci6GJ
+        gMjdTqchV8RGFbD7vW8l3fshmgmIL/nsrBWngpZWGFFAvKPsNTeQHihFMwER06hXPkGgAqVXjCgg3lOm
+        4q8GTQXEZ0VLBLy6mQxGE7B9wx+rPvWg0FRAZMoXlCsSUMHSI4YSUFp4sFY8YEVzAZEHpkkyWHrESAL2
+        fvg9+cYeFXO1pERATGPCOs1UwPSGUQRs3/AnTBVPlZISAZHpmRBsNMDeoCEEzHlBzvih4pwsKRMQ6Rzx
+        CFdRSylGEHCobJkme34UKRUQufjIqusNar0LiMdtkYCXjK0WpFxA3KDGSz9U8PSAngXEeV/AaibjqhUp
+        FxDBjBm9npLoVcDWNV8G91O2Z2+TIS0CIpPeOXirQn/Jq3oUEI/aJm6XknHUmrQJiIw6A7rbpNadgDlL
+        wHZpDxm/VJBWAZEeqw9W6mhlrDcBR2u3qL7foYa0C4i0DU3rRkL9CLhEfgosmfR6NWREQKSx1yVssctY
+        dCGgNOwOHV0uV22gYpVKMiYg0jHike/bUoEVBeEFlOSznNis+RkvKxkVEBmwzwhdZ0ZkAXG1a734XspO
+        OVjIuIAIVqbCMhhUgHlHVAGxmoHj1mHp+0/fgoOCCwERrFiKlUupIPOMiALiwzdTj8+QcUg33AiIzMyG
+        obhuUKizY9EE7Nz6VfAyvGSeLrgSEMGiR1ea7MJk0QgjoLTY6N33Qwi67eT3nim4EzCKedQLWwQ4uhNB
+        wLY1Xwbb5fczttJdDG4FRHBIxvfpeB6SeRcQC2L6+h6S3y8PcC0gggXEm/vdsInTlzp5FRAfjBk9uRUi
+        sz7ye+UF7gWMEghGoPz2CHdVWbkTUJrrYcUq30AT+T3yhjACInjvGGs3f3Cuh5sq/TwJ2PHWV8DxSQmX
+        c714CCVgFLx1h9VZ364xZVxEHgTEzGV8Xy484yK/L54RUsAowfA8fGaelE9RMiViJgVsW/9HMFr7Fndb
+        K0oQWsAoIUlE7BHxJc9016bJhIDtG/9MLoiOTz9Q34dI6ELAKLhi7h7zyqcpK9K0WEmXgK05L8iLC+e9
+        49JQ6ybbLyK6EjAWty8Idc3j8mWoVPaKKRVQWtFibzdSuR58fY/TmqmcLnQrYCz4qM7lRps8RGu9jaO5
+        gFJPh+e1w+VrYLr9RtozlNONIQSMgts43kAIGjqdUHh1QH5B/Y0kFy9JCygJ1/6rP4Xeff8EtssfgH+k
+        LaP5eenGUAIuBLdzsIYNVvM6eX8U3j/XA1sru+ReklVMZgHx1SSJjk1/Ad17vy31cKvlPTv/WNfnqfD6
+        G15ZMLSAFLiixov0NtcsNPe74GqzXX6aq/TGEHx0oRdyT5phe41JBvchfYEw9B/8sfz6pUzuq9Dz4Xdh
+        6MgvYfT0NvkV9MkHVTAz2Awh76T8TKse53JqyQqYJaNkBcySUbICZskoWQGzZJBn8L+YWOTeTnNU4gAA
+        AABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="cbPieMultiSeries.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAKAAAACWCAYAAABZ7IOdAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMK0KCsAAACmpSURBVHhe7Z1X
+        dFzHtWDn9z2veTPz/uateTN/s9ZYY1sSbVljK9rPlmSJoiiJYEBizhnMJBiQSIIRJEEQIEDknHMOjRwb
+        OeecAUbo80ydAhrsbpzuvvf27QCSH3thSexQF3ejTp2qU3X/09OnT+Ed77AU7wR8h0V5J+A7LMo7AQUw
+        Oz0NM5OTMD0xAVNjYzA+MACTIyP834bHZ2BkYgbGJmdhYmoWJqfnVrz/Hbp5J+ASKNloXy901VRDXUY6
+        VCclQWl4OGR5eUH6rZuQeecO5D3ygRxvb05RYCB/n1dCE0QWdEJEficE57RDYFY7BGS2QRT7f0mlPZBe
+        2QulTUPQ3j8BQ0zWmdn5Fd/9NvN2Cjg/DxNDTIqKciiPiYZcHxTrAf+JYhWHhEBJWJheCgP8+WehdMll
+        PXpJLOmG+OJuLmpwdjuXtUA5AJ0DkzA/T7TvLeKtErC7thZqU1Mh/7Ef5Dx4AIrgYCgJDSUFM0TB48f8
+        M7G3o6QzBPaOKCL2iHMstA+VFMNkVxf/49Bu95vMWyHgQEsLJLm5Qr6fLymTFMoiI/ln+6S2kIIJIbqQ
+        Ccc+Y7S2Bsp37YA65/NQ73oF+rMyYYK1eX5mRuM63kTeCgExcci+f48UyRjws33TW0m5DBHPwjKGYfyM
+        ztAQKPph7SLrv4fijT9D9fEj0HT7JvSz8ehYQ73G9bxJvHECzrEQVlbXBnNzmqEs56E3KZE2Bf7+kObp
+        CXHOFyDs6BHwc3SA+z//BHfWfgee//EXuPr5Z+D68R8h5PAh/rmBbExHCWaI6MJOGBid5p9Rc9LptYBa
+        lNhuhtqzp6DlwX0YLi+Duakpjeta7bwRAs4z6XoGRiA1vwbuhmSAd3g2pBfWarymRaHgCYa6bPjfKdeu
+        QvjxY+C9yQauffk5XPzgd+D8u98YJHDvbv65Bx6Uw0n/KjjFuBhcCx6RSrgd3wgPU5ohhCUoCaynw/Ge
+        toBRTMBZ9kcyy3rn4k0bSPnUUfy4DqoO7YfGG9ehPzsTpgcHNa5vtbKqBZyZnQNFVTP4ReeBb3QuhKYU
+        Q9gST+IKNF87OQmZXndZpvsQok6fgns/rocrH/2elEsIKgHXXcnXyQ8u+bDetQAcbxbDfibq5dBaeJDc
+        zOXDrBjfj+M/DLuUdDTfQ9l2R2jwcIOehHiY7u/TuM7VxqoUcGp6FoqYeJ7+KRCcWLQsnTq+TMqJqcUQ
+        pyLihJPgHs4QQgTUBUqJvSK+vzM0mJBMAEzaUgdbUF52hr7UFJ5Jq1/ramFVCTg5NQP55Y1wNzgDnsQX
+        kOKpCEwohNKaVo33VycnkTJJwRgBf2QC4hwgvl/f+E8QTMSyHVuh4Zo7DJeVssxZ84/O2lkVAs7OzUGF
+        sh38YvIgML6QFI7icUy+xudMjY2C658+JoUSizECbrtVsjz+K9myiRZLJDhGrDywFzoCn8BEe7vGdVsz
+        Vi9gU0cfPIzIhiDWo1GS6eN2UDpMz8xqfF7I4YOkUGIxRkB3lqjge8eUSpHjP8PgFI7y8kXoS0+F2fFx
+        jWu3RqxWwFmWYMRklvMEg5JLCMFJRZCUV63xubgS4vz+b0mpxGCMgKrxX1c4y8QJieSgYs9OaPN7xCe0
+        1a/f2rBKAdt7BuFGQCqEJitIscSi/tlYxeL+yZ9IqcQgVUAc/2FhAr7X6PGfAbA3bPS8CoMFbChipUt8
+        ViUgTiKnFdbCHRY6KZGk4M3C9+j44oBfRejhQ6RUYpAqIE7J4CQ5H//ZbSbFkRUW4quPHYGuyHCrDMlW
+        IyBmuI9ZkhEQpz+7FUtQYhHPnNW/qy493egwLFVA94il8V+9/OM/fZTv2g7tAY9hqntx/dlasAoBO1jI
+        xYSBEkgqKJ6LdzzYHLsP+y4/0fg+OcKwVAETliaguyLCSVFMSYntJmi6dcOqwrFFBcRauNLaVrgVmEZK
+        JAWfyBzYfdEfPrFzhd+tP8/5/YaLMDyqOVEbxsISJZZQpAi43qUAmrrH+PtqTp0gJTEluOSHPa/678HS
+        WExAHO9lKOr4FAslkhhwCc4rJBPsTj3ksqnEUycsWTMZqc/ONioMSxHQ1lOxOP83zsZ/tmYY/6mh+Hk9
+        DBUVavwO5uYtX+5lEQFxYjkyrRT8ZRjvPYzIgc0nvOHDn51J8VTsuLBYQKoCw7DHZ5+QcglBioAuYXX8
+        PWPKOrOO//C7euJjNa5/dLIHipufQP+o5vjY3JhdQMwA/WPzda7hCgWTlX1XAuEPNpdI4bTBnrF3cFSj
+        LVGnTpJyCUGKgLGKxQTAlPN/K2Dy4Xyg+nVPzYxCaUsI1HenQ2V7NPSMLP5hWAKzCohhF6tUQpKkz+9h
+        uMXk4lN7N1I0feD3qrenMT9PchgWKyBWxjTi+I/9DmpPn6RlMQGNV91hnkUc1TXPzE1BeWs4l09FRVsU
+        dA/XLL/GnJhNQKzZw8zUmJ4P13a3sHD7/o8XSMEMsfWsr0absFLa/dM/k4IZQqyAW64X8aQLq1bkWv81
+        RM2JYzA//bo4YX5+Fqo74ph0aRoCIpVMwq6hquXXmguzCYhjPqxQocQSwjW/ZPiz7evMVgofbbwEPf2L
+        +3lVxJw/RwpmCLECLo//6mrNMv6rYO2bHdUcctR3Z0BdV8oK+VRgOO41czg2i4C5pQ3wKCqXFMsQIckK
+        OOIRAmsMJBlCwR5YvW1NBQWSwrBYAWOLlsZ/EaYf/5XabYaJNs1StPaBEtb7xZPiqVPeFg5D4+arpjG5
+        gI3tfbx+j5LLENhjbjh2D94nRJKKwxnNATmediAlDIsREMd/Td3jfPxXd/4MKY1c4PrvSFWlxjX2jzWt
+        GPfpo6ItAkYmzLNiYlIB+4fGwDMglZTLEFj79+3em6RExvDHTZehu39Yo51xFy+QkulDjIB2norF8d/0
+        FBv/bSTFkQPFTz9AX1qKxrX1jzZBQaMPKZo+qtpjYWyyV+OzTIHJBMT9GljRQslliPthWfCXbVdJgeTg
+        SbzmhGyLogguigzDYgRUjf9GTTn+Y5/bEbR4XIiKsak+CFfsh+DCnaxXiyRF0wcmLDNzmoUccmMSAXnG
+        m1AEocm0YPq4F5rJkg0XUhy5sD35EObV2ovnwnh8/ikpmi7ECBinmv8z4fovrvGqT7fgXF90qRM8zt3M
+        CSrYBmWtoaRousCEpbEni/2uTLd2bBIBc8saDO7ZoMCeT30N11R8ZHMJuvqGNNqc6OZCiqYLoQLi+K+t
+        b3EdWul8npTHWGrPntaYbpmdm4bUardl+VQE5m+FkpYgUjZd1LDEpWdYc4urnMguYHffMN+bSwmmD6zb
+        +9QM8qnwi87VaHdbaYmoMCxUQKz/w/EfHrMhZP+vWCoP7oPZsdfTLfPzc5BXf3+FfCpQwrLWMFI2XVS2
+        R/FwrvoOOZFVQFxmk5LxYh3gX0045qPYePw+Hyost312Fq795QtSNgqhAi6P/0Tv/zUMbsuc7Opcvoan
+        LFTiXJ5/7hZSPhVBBTv46yjZdIGvn5vX3F8jB7IKmKVQ8tUOSjJd4OvX7r9FSmJKfm9zETq1wnDKVY8V
+        ol1a8wHc+sfX8MhuCy/hSnJ3g4zbt6AyPo6/Jyi7HZ5ktcGDpGa4HFoHx30rwfa6goXeAi5gnGKp/k/m
+        9d+SzTZ8U5N6+5t6c8E/z5aUTpswxT4WXhNI2ShqO5OhtV9zKVMOZBNwYGiML5VRkukC93zYn/YhBTEH
+        WEmjfg3t5eVcuIebNvJDKRtyc/hynfrg3hCY3GDJVe/wFGRU9sHg2OLYTHnJmRRJCjjdMsDapv69WFDw
+        JN+RlE0XUSVHQalnZUQbnEvE5Eb9e41FFgExlEWklojeRHTqZoSsk8xisdEKw8jE8LBJKoanerp5Flxz
+        yokLRIklCBbGu6IWj4ZTMTLZDaFFe0jJDJFa7UrKpgsMxerfbSyyCNjc0cfPZqEk0wUmKkJLqUzFmg0X
+        V2TD5mBmaAg6w0KhbJsDLZkeWu57afyBYI8UVXKMlEsI/nlbQNHkT8pGgVlx15DmSosxGC0glliJ3TSO
+        E8F/33mdlMJcYH0gVsfUty7u0bUEmBn3paVC1eGDpGzaKC9e0BgOYEVzSrULKZYYcI6wqiOWFI4CJ7Xl
+        SkiMFrC1a4BPoVCi6QL3bFBSmAOc6rnql8TbTV2PJZhnGXhPYjyU2m8hxUPwwEr1A4hwuiVbeYcUSgrR
+        pcdBSZRpUeDrWvs1izqkYpSAOH7CTUCUZLrA3W+69m2YElxdwSmiIa3NScaQlOsLN/z3wJ3AgxCc6A7J
+        eX5QWZ8DgyM9MD0jfglrZmQEmu/e4fs31OUr37ENpvv71V47z+fyKJGMIbf+HikcBY4FccJbvf1SMErA
+        mqYuUWVWeFTGN3tukIKYCizjOnE9HPq0yvHlwDv8JOy88OEKdjv/HpyufwWpBZrbQYUyWFgIpXaLvSH+
+        nGhp1vh37IEMzfVJAUMxjvEo4bTBZbr2Ac2NXlIwSkCx0y4nb0SQkpiKr3d78lpEqu1yoEtAFSU1qeT7
+        hDDV3c2P7hgq1px76xgsg4A8e1IgOUioOEcKR1HVHgPTs8adtiBZwPbuQV4yRYlGgceqfeYgfh+HFN7/
+        8TzsuRwAw2PGh9vpqVno7RyGakUb5MTVQNxjBQRcy4SHl1Lg4pmLpHjI3kt/hImpxT3AUtGefxwca2W9
+        1HZSHLnArLi4OYAUThs5xoKSBUzKrSJF08XRq6GkLHLzwU8XePk+bv2k2i0EXFKsKmyFiPv5cON4DHgc
+        iAT3/RErOHf0MikfcunexhVzjMYwPtXPVy8oaeQmquQIKRwFbmii2isUSQJOTc+Al4iCA9xC+fGmK6Qw
+        coLzerjl09inD83NzsGdU/GkdOroEzAw3oX8bKkUNj4iZTENW0AhsBes7Uw0qlpGkoDlde2iNhgdvxZG
+        CiMnmGxgm6j2SiExsISUTh3dAq6B0tp08nOlMjs3BRm11wlZTIOYXrChJ5NssxAkCSgm+cC9uF84upPS
+        yAWO+R6EZZFtlUpLbQ8LvbR4KnQJuO/yxzA+qbn7Tg7m5mYgW3mbFEZucCxY0hxICqcNZs6TM9KuV7SA
+        OJ3hFZpJykZx2Tve5Ou9Z29H8RUZqr1iwQnenpFayK3zgWtOQaR4KnQJeNFrg6zjP3WwJ0yuukxKIzdx
+        5WdI4bTBZKRjsJxsryFEC5hX1iCq6GDt/tukNHLx81EvfrYg1VYxoHhtAyWQUHEBAlmmGViwDe7evEGK
+        p0KXgEEJruR3GCKlSglhhYZvJE59xJSeIKWRk4B8+6WN7LR46tR0JpBtNYRoASnJdIFLdB/8JM9+XoqP
+        N1+Bhjbjd24NTXRAWo3HsngqfKOPk+KpoAVcAxVK8cOB8tZOWHP6Grx33A18s4s09qxQDLM2BxZsJcWR
+        k8xaT1I4bXB9eHJGc7ehEEQJiCfOiznLz9RTL9qPYRALjqnK2sIhpGi3hngqnuTuZGE4kJQPoQTcf+VP
+        MDYhrsKmtX8QPnG+Bf/nmCuHS5hleH6tuS/PJCsi6oSy342yK5WUTh18TftAKdlOfYgSsKaxEwIEbjbC
+        MG3KrZWbnB4wgaTP9eGgGbNKSjx17t72JOVDKAGdvX4WNf4bHJuAbzy8l+VT8Rsnd4guMXRWy7zJM2MU
+        XPhuujSijfoRJWBUWqnG89j0gdsrP5B4iJAhcLK5ROspSGIYnuiEmLKTpHDa+MYeA3cd2TAlYHCCG/md
+        FJPTM+BwP2iFfCo+ZCG5jIVm6r0qRid7+RouJY9cpFW7E7KtBEu6xBYoiBJQTOEBVjtT8sjBfpdAsn1C
+        wOrhyJLDpGwU+sLwSgHX8GoY6nu1wZWa40GxpHjq/IfLPfYHo7+yprwtghRHLnAFhjpRSxtMRPDgS6qN
+        uhAsID74D/ftUrJR/HTEi5THWLBXrazvINtoiInpQb5ZmxJNH3dvXxck4K6zn0C90vDDpTHBuJuaC79m
+        Yz1KOm0O+UfpDetTs2MQUriLlEcOcKMTFh5Q0qmD48DWfnGLAYIFxOID3D5JyaYNVjzjUWiUQMbicNpH
+        0hzb9OzE0hQLLZk+/OKOChLQ1v57+OmL/XDQ/hIkRefA5AT9cOlIRSVPNCjZKN5zcoMcZRP5WSpMUR+o
+        Dk6AU9JpgydwUe3ThWAB88obeT0fJZw2+KAZXJ2gBDKWmAxpE554QA8llxCe5O6Aa8dXTkprC7jhWwdY
+        /9neZRzWnoCkqGyYn3v9B1Pc1AYfnLpGiqaPr9zuw5TWc+/UGZ8aEL0rTgwJFedJ4bSp6Uzkc6pUGykE
+        C4i73ijZKM7diSLlMRY8tmNiUnwVbvtgKS9jouQSiteda3oF3HHmI/jxy90aAnI+3wsnd1+F7s4+aOod
+        gD9feD3dIoZfMwLzSsjrU2HKjDisaK+gkn3sAcXUCAoWEI+yoGSj2H7ejxTIWA66BpFt0wdOt4hJOnTB
+        w7BWNqwuoOOhL1bKp4bt+pPw18t3SbmE8tmlO2wcq/sPEJfDKHnkAItgsfJFXTYc82FlNJbn41RNXVcy
+        3xyPY22qfRSCBMQxF06rULJR/HW7aeb/sBem2qePoqbHpFBieZLHwrBWNqwuII7/KPGQdV/sgzW7nEmp
+        xBKQq/t3gD1PcOEOUiBjwflALNHC+j+UDUXDM6XxNNWJaelbWwUJiGFP6KO08KiN/7dZ/to/rPUbHBFX
+        /o3zfXg2HiWUFLzueegU0OY7e1K+Hz7fB3/cfp6USQrrrj/SW3iRVnOVFEg4W3hvF6bYD/HlZyG/8SHU
+        diVB32gj34Ms9/kwggTs6hsG73BhWy9xg7pc5zmrg6el4jOEqfbpQq7eT4Vf/BEWhsNXCLjjzB/o8R/j
+        0y2nSZGkgtlzRZvu43MxJNJiabOFT6/gHB9WveQ1POCFB70jSt6jmespSoIE7Owd4g+OxsdqYShGyXBS
+        GsEKZPXnfuAjs0yRAe+5FEC2TRc49gsp2kOKJJn87XD9xJMVAjoe/JKU78sNJ0iJjMUlRveS18BYy4r1
+        Yaztw/XuuPLTkKO8w8dsGD7xdyTH1kpjEJyEILhXAgsSsCR/ZGyS94yFFU2QUVTHn/MblV4Knv4p/CBw
+        m2P34OtdnrxiBYX80MiqGPxcqk26aO7LpyUyknv33VYIaGu/boV8f193DN4j5JGDb9y9dc6F4jgwqfIi
+        ZNbdgIr2KF5iNjE9zETDHk38/KkQJkanoLNlAJpquqGyoAWaa4SvhogSUAz4C8Llphku7Cx09AxBcU0L
+        xGaWQ0BsAR9TnrkVxXs2PCFr3cE7fNccivrhTxdW9KLa5zobQkihgRT8EjAMawpos9ZOQ75vvj4E7x1x
+        IeWRAwzDXUP6KpBNI9rUxAx0tQ5CTXEbZERVQphXLngejQa3feHgsjsUcuJroDS7CRTphleDVJhMQLGg
+        sDi4xl4Wj3qrberivWp4Sgn4slDf1i38KA1c9QhlYxtKIKPJ3wbXTwYsC7jjLBv/fbFnWb61fzsIvz18
+        hRRHTgxXykgHx9o9HUNQV9oOWTFVEPEgH26fjAPXvWFweWeITjIiK7mAeYnCNylZjYBy0j/WzGQxbuJZ
+        H/ceLIZhFNDx4Ov5v3Vf7ocP914khZET7AHdYo3f9IR/9AM9o1y03IQaiPQugPsXEsFlTxhc2UVLpg/c
+        M40CorS4n5r6Tm3eSAHrezJIceTCL+EwD8MooK3D4vzfD1/sg492XiCFkcr/dXLnJVlrr/nAkScxcC8t
+        D1IqldDSN6hzDKgNHwrNzMFw/zgoyzuhILkOoh4WgM+VFNajhTPRQkmZpBB8K5sLWJiihMlxYcnNGylg
+        SUswKY6ceJ725wLafG/Ll9v+bH+WlEgf7x27Ah8cdYa/HDoCDvs3w4k9X8GDHe/DrbhkyKhpgIaefv68
+        Feoa9dHTNgQFTIIo1qM9ckkFj4MRsoqmi8fu6VzAorR6GOoTdiqEMAEnR+DZxAA8m2IDXzz1ScRisyXA
+        Oa3g3O0QlEfLIwf3H7rCucMufPz3uc1JUjAV7x1zgTVHz8Nnh4+D7X5bOL7nG/De/huIcvyfkGv3L1Bk
+        +8+gsP0nTrHdr2Cy07gHBmKCQAliarwvJi8L2NMubHVEkIAv827BLz5fwS9+38NC4EZYCNsKC5F74FXy
+        GXiZfwdelAfBi9o4eN6aD8/6lPBspAuejffD02n2V8DTf/pzTQXO1lec2A+FuzZCwb6NkOu0CTIuboGU
+        G3aQ6GUH8X72EBXuAOEJjhCWshVC0rdCUA4TiyUYHEI4bR4nHYJT2+7A39Y78UIBFO3XS6J9zkTbdMAB
+        jjHR7m1/H2Ic/wdk2/1XDdH0MVyRRF6XUEqzG0lBTM2d0/FcQEV6A9RX6K/kViFIwFcpF+CXh38XBoqK
+        Px/9A37x/xEWgrbAQog9LMQehpeZ7vBS4QMvKsPgRX0KPO8shWcDTUzYTtbDsr+YWfkeC1W5eweUbtpg
+        kJItG6DY3gYUW22gaIcN5B/YCNmnNkOauy0k37KFxAf2EPvEHiKjHZeFDc5iwrLe9ZyTG9js2wpH93wL
+        t3esgTiHf4Ms+38VLJouBgpCyGsSSlNND1yWkEQYy41jMVzAkqxGqC5qI9umjSABF2IOrBRNFpZk9fka
+        fvFdCwtPNiwSsZNJf571vKx3LXkML5SsRxAZ9oUKKIrNTFjbJWEdbcDniDNkbP13UiJjGCwKJ69JKJ3N
+        A6QgpubqoUguIIIJD9U2bYQJyIRYKY/5WAjewnpHcUtG1YcP0BLJhg0cco6BU+duGt3jaTNcJm2Tt4re
+        jmFSEFNz9eBrAXGymmqbNsIEDHUgxTAX+P1P58RVYdRfciakkY8Mhx1g41HEKASfQz+SIkllrKGAvCah
+        WExAtR6wslDYrsVVIqCj6BDc/ughKY5ceB9k4z8uYBHYu2VA2tb/RcoklmKH/wxzRh5saQ0CFqVqPsVJ
+        F8IEDN9OimEueA8osg6tJy6WFEcOSlj4PXIhallAxOmCFxTZ/YqUSgyVTr8lr0cMHU39FklCrh+J4vJh
+        EiJrFmy6JEQYC8G2oseAY3W1pDxykOWwHTay0KsuIOJ9mCUnhFRiaLzDxrvE9YihrqyDFMTUeB6Lfi2g
+        nEnIq6TTpBjmYiHgJ3g6I+6859nRUSh3sCUFMhafA1dWyIfYuWVC8vb/TYollMGiCPJ6xICrIJQgpubu
+        maV5wIwGaKsX9nhXYQJmupFimA2frxfnCYm26aPB9QopkHHYwLHzkaSAyGFnXyiw+xdSLkOU7f43mJ+h
+        9xKLIT5AQQpianxdU7mAuBbc3SpsY5IgAXG1gxTDXPh8Bc/6hNeYqRjIyiQEMo4sh22wyb2AlE/FrWM7
+        ScEM0fxgO3kdYsGKFkoQUxNwLYMLiOVYo0PCIpYgAXEymBTDjLyoFv+UxtnxcajY5kCKJBXfA5dJ6dTZ
+        4p4D8Tt/Q0qmi5Kt/w0mexrJ6xDDxNgUz0YpQUxN6N3c5R5welLYEqwwAZWJpBTmBIcBVNsM0RkUSIok
+        DRtwOh9OSqfNvkvBLBT/F1I2iqb7jmT7xcJXQSyQASN4sDsKiGNQLAGj2qeNIAGfd1cyCZaWzSwETgVJ
+        qcLBR6OWO9oRMokn234bbHbPJ4Wj8DhxjJRNm7K9/w7TQ7p3uokBi0EpOUwNFrBmxVQvCphcx+4V3T5t
+        BAn4bLj9dZGBpXj0j8UKG6J9hsDH5VNCicV/nzMpmi42eRRA1O4/kNKpKLb/FQwqjM98ETyDxlLjP9wX
+        Upiq5AJidTXVPgphAk4O8VIsUgwz8qJK2o2an56G6kP7SanEcOJcKCmaPnZdiYI8+38l5VPY/jO0+Oxm
+        vYU8m4jwkWK4OYgSxNSoVkFKspr4Y82o9lEIEhDXYRcCbUgpzMmruKOsPdJu1mh1NZRt2UiKJYQce0fY
+        4pZHSmaIK6fOEvL9E9RfXQvzIifY9ZESUkbKYQ5UxahYC9jVInwDmTABGaJqAk3Fo2/YcEDa4ZRIZ0gw
+        KZcQAveeI+USAq6ahOz9QkO+uit/g7lp+Z5djHswcIskJYc5CLuXxwXEDHh8VPhcpmABsYiUlMLM4Jwk
+        1T4h4NMnm29cJwUzxKmzwaRcQtnmmghZjv8dFHa/gqa7dkYXHGiD4y9KDLPAEpD0iIql8V8tf9Ye1UYK
+        wQI+76lmAlg4EUECfoSnU9IfPj03OQmN7q6kZLrItXMAW7dcUiwxnD/nAZ2x7pKyeX1MTUzDTadYWg4z
+        gAkIhl4UEKdgqDbqQrCAi4nIWloKM/NS8ZBso1C4hB5upGwUwXvOkEKJZePVIsipkZbJ68NSUy8qvM4m
+        cPmKMxuhoVLcdJJgARHcjEQJYXYe/yB5SkbF/Mw0tHrfh1IBicmZM4GkUFLYcacU+kfkSzwGe0f5JnlK
+        DHMRfv/1+G9kUNy4VpSAL4t9aSEswKu0S2QbRTE/D/0Z6VCxYyspHpJnZw/2rtmkTFJxDVfqPeNPKLjp
+        /IlnJimFucD9xjlxixPQ+Ul1/GgVqq26ECXgs54ay09Iq/D5Gp63yfN84Kme7sWQvNlmhYChe06REhkD
+        huK0cuOfcWfRxGMJfKI8yoeU5zaT7dSHKAFxjy/W5pFCWICFwE3wbEL4ecR6Yb3JSEU5KM+e0hDx/Gl/
+        UiJj2XqrBHqGpJdeYb0dnuFCSWFOgm4uHceRWs/Xoam26kOcgIyXOddJGSzFq5Rz8maVTMTR6io+XVPk
+        6AiOrlmkQHJwMbhWdMhCBvvGePUxJYQ5wfXf7NjF8Is/hZ5Xo45oAZ+3FZAiWBLc7E611Vhux9ST4sjF
+        RkZKmbhQPDYyCffOJZBCmBvVSQi4/IYHU1LtNYRoAbE0Hk88oESwGI++gee4eZ1qr0SmZuZgJ8tYKXHk
+        YMt1BfiktsDYpPDNVmPDk/DAOYmUwRJE+xQuhV8lP+aNarMhxAvIeFl4nxbBkvh+C88bUsn2SqGseZj3
+        UJQ8xrD5mgLOB9VCU7e4E//7Oofh7hnr6PkQt/2vJ58x+xVafqWNJAGfDTbzLJQUwZKghHWJrI3GT3F4
+        JTaTAknFzrMYPCLrQdk5xsZK9HeSsNfi5O61w1GkCJYi0DNzKfw2Cj4FgUKSgMiruCO0BJbG5xvWQ98z
+        6lQuFMQlTAkON4qN6gVRutMB1RBd2AW9w+IzXqwqzoissIpsVx08qheX3FBAPJZXaPUzhWQBnzem0wJY
+        Ca+STsGzcWFbA3UxMjEDxQ2DfKx2LrAGDj2sAMebJTyMqouG47ltt0vhgHcFf51/Rhvk1w3A4Ng0fzQr
+        9dlC6O8eAXcW6igJLMljj8WDKLH3k5p8qJAsIJ8TDNpM3nxrYSHgZ3jenM3aa3xIRnD1YmJ6DkZZ4jAy
+        PrMM/vck+/+zEqZUDIE7zCgJLAX2frlLp+HnxNUY1fsh0gVkvKiJIW+8VcHGqq8ST8KzIenjFEuCN9jP
+        LY2UwRKotl7K0fshRgmIx2XgAZTkjbc2Hn0LL/Nu88MwyWuxMNN6ek8MxR4HLFtwgGAbVPs+MPMVU3iq
+        C+MEZOB+XfKGWyuP/gEvM93geVcFX/WgrsmczDDxopv7wDa1GrrGdd/Q4owGUgpzoqp6wbKrmuJ2sp1i
+        MVpAPLTc2seCNF/xo4PxTGvyusxA5cAY7M9Wwrdx5RynvAadUzS4ZBdw3XKVL7j0h38Eqt7P2LGfCuMF
+        ZDyvT+E3lL7RVozvt/IVMwhklvW6hT0jcDK/EdbGVyzLh3zHCGvUvTSHz/rARy5QgpgS3GmXGlbO5cPJ
+        Z2WZ9H052sgiIO6as9p5QT28ijnI2r8yDOPUib4xmVhQOgyvKNfuzDoumrp46qxPqISmEd1FnTjwl/IU
+        I2Pwv7qYeCz2fsIfwyUEeQRk4Gn3v/h+R95oawU3WlHXUjc0Do5pNeBS0gIpbQPQPT4NE7NzglcwUN7+
+        yRko7h0Bf2U37M2qY70dLRwFhmVdfwBYcYJjMUoUU4CHTuJzP1C+7LhqwU9AEopsAiJWuUasC/bH8myM
+        nqj2re3SEAJD5abkKt57OSua4RH7d+zNwtXA97iVtsKR3Hou7/da4VUs+HlU2xDMPm+YoRwLV2BSQxdD
+        L0oo9NRTMcgqIO5Ww4E9ecOtjIWofazNdPjdnlFLSmFOfkiogGqWpGi3T0UDk8Gkj99iYV512hWWW2Hi
+        IaXezxDyCsh43l3Fpzqom25NvKigHwbTMDwB34kIl6ZkF+txMfRT7UQSAoppeWQAz5jByWZV6MVj36g2
+        GIvsAiL46C7qplsNmP2O0CHucZ1m+LU096p0Z5z4SNS7p+NJgYwBK29UxQa4FIilYNT3y4FJBORZcYIT
+        ffOtgIXI3ayddDjZYQXhV511LBSX9+su9mzFvSEyHkiEj6HNWiqzxymXulL5plwoTCMgAwf4+NgtSgBL
+        86I0gGxzoxWFX3W2pdfCuJ6JX5yjo2QSCxYaqOb7MPxi4iHmmA0pmExAhB9s+ehbUgKLgecM6ihMCKzv
+        JgWwBjzL23SWds1Mzxq9TwQTmli/Ii6fKvROCTxm1xhMKiDyvDGDF4mSMliAhbBt5Bow3tydmdYVftXB
+        qaCinpEV7VaBD6fBHoySyxBXWAhX7e9AcIfb+Ih8Ty7Vh8kFRF6UsaTESja0vyz2I9vYzH7hYiaLLYFd
+        ajUMs96Oaj8i5YwYHD9GP3otH36G0BPu5cAsAuKA/2XuTVIIs8J64mcD9En0QfU95E23Nq4Ut+gNxT5X
+        UkjRKFC+GN/XYRd7vqF+eY+NM4SZBGSwzPhl7g1aDDOx+Mw5OvziKgd1w60NXEdObdddQIEPKsRMlhJO
+        HTxSLdZPoSEfHnREfaYpMZ+AiIUlfFlEH+vWMorh17ilM3OyMbkKeid0r8kaOjMGn+ubFr54oCSCh0oO
+        9Zm351NhXgERlDDvFhPCzGNCfNpSL13JEdawOsKvOqcLGnXXDs7O8QoWSj48TChnaU8HTrVgtjvUL26P
+        spyYX0Bkfo4/jt+ciQl/4qaOtd/VEn61iWrSvetvsHdMo3YQS7jwIHE8RAjlw+JSPM/PVEtsQrGMgAgb
+        i72oCAU8VoMSRm5eFniR7WhnN8DYyhVLgQUL2H7qupDy3CYuHk7PRD7Ih9KsxZC7KGEjzMyIewazKbCc
+        gEs8by0w/TNIWE+LRRLU90c09ZI3d7WA5V9Y8EpdG4bo8Ht5kBldxcVDMORiWZUpKlukYHEBESxmXQix
+        o+WRATxHUFf4Vd+TsVoJYWNY7WtTgQWkqoQDq5lNWVggBasQEMG9GXjWnynGhbgdk/rOzvEpvthP3dTV
+        xPrESj6RTl0j0qrs5eu65lrdEIPVCLgIGxfWJcAvj9eRIkkCw29XOfFdTyGmuY+8oauRA6wnn9JTOCB0
+        O4G5sTIBF8HN4wuxh2ihRIJbRsnJZ3ZDDuas/vCrjr4yfmvFKgXkzM3wqmV8MA0lllBw4pv6/J6JaZ5F
+        UjdytWKojN8asV4Bl8DngeBJBtLK/HWH39iWNyf8qsAVkqtlrfy0BeqarRGrF3CReb6Kgft4xSQpC0Es
+        +yUOMMfwi9MX1E1cjeAy4sGcep4N61uis0ZWiYBLMJmet+bDQvR+JphhEV9mXyM/p+8NCb9YmGCfVgPX
+        ytqgon8M5qw00dDH6hJQBUsqnneWwav443p6RBZ+O0rI9ye1DpA3dDWB4fZcYRPP5CdNXDZvSlangMuw
+        0NxTA68yXFaspiwEbuSFD9rvwclnp/wG8qauBjYkVcGFoia+Mb7Twuu4crDKBVRjehxe1MbBq9jDrFf8
+        micu1OuGpmb4+SvUzbVmsMc7y3q8+JZ+vneZurbVyJsjoBrPhts51L+ltq+e8IvJBW4TxVCLw4bVlmAI
+        4Y0UUBcYfrEXoW62tYCJBZ5Dc6qgEW5XtENGx6DeLZmrnbdKQDzmAnsT3GeL66f6jkkzJ1gOZptSDUdz
+        G+AWky6tfRBaRyd1Vrm8SbxdPeD8U76rLK9rGAKU3XyvLc4H4vG46xMrzCYkCreZCbc3SwkXFc18CS2p
+        bYBLJ8dzhFcTb5WA2mCPiJlkVucQBCp7eO+DPSQu7OMWSAyFOF+IYoqVE1+Potmwz7BLrYE9mXX8VNTr
+        ZW3gU9PFz4XGgyjHZmattlDAHLzVAmqDS1goZQeTMrdriJe8hzb08hWGO5Ud4FrSwsdmZwqa+FQOnul8
+        KKcejrOfKNf5omZ+fqBHaSvvYXGqJK65n8/VoWxDU7P84Ekci1Lf/zbyTkABoDAYGlFQLHmaWvqJE8Ao
+        LP6cmpvjcuG/zbDXvpNMGO8EfIdFeSfgOyzKOwHfYUGewv8HAu+9LO1LNKEAAAAASUVORK5CYII=
+</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/ChartTitleCollectionEditor.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/ChartTitleCollectionEditor.cs
new file mode 100644
index 00000000..d5499185
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/ChartTitleCollectionEditor.cs	
@@ -0,0 +1,95 @@
+using System;
+using System.ComponentModel;
+using System.ComponentModel.Design;
+using DevComponents.DotNetBar.Charts;
+
+namespace DevComponents.Charts.Design
+{
+    public class ChartTitleCollectionEditor : BaseCollectionEditor
+    {
+        #region Private variables
+
+        private ChartContainer _Container;
+
+        #endregion
+
+        public ChartTitleCollectionEditor(Type type)
+            : base(type)
+        {
+        }
+
+        #region EditValue
+
+        public override object EditValue(
+            ITypeDescriptorContext context, IServiceProvider provider, object value)
+        {
+            _Container = context.Instance as ChartContainer;
+
+            return (base.EditValue(context, provider, value));
+        }
+
+        #endregion
+
+        #region CreateInstance
+
+        protected override object CreateInstance(Type itemType)
+        {
+            if (itemType == typeof(ChartTitle))
+            {
+                ChartTitle title = (ChartTitle)base.CreateInstance(itemType);
+
+                title.Name = _Container.Titles.GetUniqueName();
+
+                return (title);
+            }
+
+            return (base.CreateInstance(itemType));
+        }
+
+        #endregion
+
+        #region CopyButton_Click
+
+        protected override void CopyButton_Click(object sender, EventArgs e)
+        {
+            ChartTitle title = ChartItem as ChartTitle;
+
+            if (title != null)
+            {
+                if (AddButton != null)
+                {
+                    ChartControlDesigner ccd = GetDesigner(_Container.ChartControl);
+
+                    ccd.InCopyItem = true;
+
+                    try
+                    {
+                        AddButton.PerformClick();
+
+                        ChartTitleCollection ctc = _Container.Titles;
+                        ChartTitle clone = ctc[ctc.Count - 1];
+
+                        string name = clone.Name;
+                        title.CopyTo(clone);
+                        clone.Name = name;
+                    }
+                    finally
+                    {
+                        ccd.InCopyItem = false;
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region CreateCollectionItemType
+
+        protected override Type CreateCollectionItemType()
+        {
+            return typeof(ChartTitle);
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/DataLabelCollectionEditor.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/DataLabelCollectionEditor.cs
new file mode 100644
index 00000000..c1a8a607
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/DataLabelCollectionEditor.cs	
@@ -0,0 +1,94 @@
+using System;
+using System.ComponentModel;
+using DevComponents.DotNetBar.Charts;
+
+namespace DevComponents.Charts.Design
+{
+    public class DataLabelCollectionEditor : BaseCollectionEditor
+    {
+        #region Private variables
+
+        private ChartSeries _ChartSeries;
+
+        #endregion
+
+        public DataLabelCollectionEditor(Type type)
+            : base(type)
+        {
+        }
+
+        #region EditValue
+
+        public override object EditValue(
+            ITypeDescriptorContext context, IServiceProvider provider, object value)
+        {
+            _ChartSeries = context.Instance as ChartSeries;
+
+            return (base.EditValue(context, provider, value));
+        }
+
+        #endregion
+
+        #region CreateInstance
+
+        protected override object CreateInstance(Type itemType)
+        {
+            if (itemType == typeof(DataLabel))
+            {
+                DataLabel label = (DataLabel)base.CreateInstance(itemType);
+
+                label.Name = _ChartSeries.DataLabels.GetUniqueName();
+
+                return (label);
+            }
+
+            return (base.CreateInstance(itemType));
+        }
+
+        #endregion
+
+        #region CopyButton_Click
+
+        protected override void CopyButton_Click(object sender, EventArgs e)
+        {
+            DataLabel item = ChartItem as DataLabel;
+
+            if (item != null)
+            {
+                if (AddButton != null)
+                {
+                    ChartControlDesigner ccd = GetDesigner(_ChartSeries.ChartControl);
+
+                    ccd.InCopyItem = true;
+
+                    try
+                    {
+                        AddButton.PerformClick();
+
+                        DataLabelCollection dlc = _ChartSeries.DataLabels;
+                        DataLabel clone = dlc[dlc.Count - 1];
+
+                        string name = clone.Name;
+                        item.CopyTo(clone);
+                        clone.Name = name;
+                    }
+                    finally
+                    {
+                        ccd.InCopyItem = false;
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region CreateCollectionItemType
+
+        protected override Type CreateCollectionItemType()
+        {
+            return typeof(DataLabel);
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/DevComponents.DotNetBar.Charts.Design.csproj b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/DevComponents.DotNetBar.Charts.Design.csproj
new file mode 100644
index 00000000..9ec0a333
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/DevComponents.DotNetBar.Charts.Design.csproj	
@@ -0,0 +1,214 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{CBBE8B3E-A0DD-4CE7-9E42-AB7AB387E277}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>DevComponents.Charts.Design</RootNamespace>
+    <AssemblyName>DevComponents.Charts.Design</AssemblyName>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>x86</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>ChartControlDesignTime.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup>
+    <StartupObject />
+  </PropertyGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+    <None Include="ChartControlDesignTime.snk" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="LabeledTextBoxX.resx">
+      <DependentUpon>LabeledTextBoxX.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="LocationDropDown.resx">
+      <DependentUpon>LocationDropDown.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="PivotPointDropDown.resx">
+      <DependentUpon>PivotPointDropDown.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="RangeValueDropDown.resx">
+      <DependentUpon>RangeValueDropDown.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="SeriesPointValueDropDown.resx">
+      <DependentUpon>SeriesPointValueDropDown.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="ChartStyleDialog.resx">
+      <DependentUpon>ChartStyleDialog.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Resources\Copy.png" />
+    <EmbeddedResource Include="SizeDropDown.resx">
+      <DependentUpon>SizeDropDown.cs</DependentUpon>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="AssemblyInfo.cs" />
+    <Compile Include="AxisReferenceCollectionEditor.cs" />
+    <Compile Include="IndicatorCollectionEditor.cs" />
+    <Compile Include="DataLabelCollectionEditor.cs" />
+    <Compile Include="ChartAxesCollectionEditor.cs" />
+    <Compile Include="AxisStripeCollectionEditor.cs" />
+    <Compile Include="BaseCollectionEditor.cs" />
+    <Compile Include="LocationDropDown.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="LocationDropDown.Designer.cs">
+      <DependentUpon>LocationDropDown.cs</DependentUpon>
+    </Compile>
+    <Compile Include="LocationEditor.cs" />
+    <Compile Include="PieReferenceCollectionEditor.cs" />
+    <Compile Include="PieSeriesPointCollectionEditor.cs" />
+    <Compile Include="PivotPointDropDown.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="PivotPointDropDown.Designer.cs">
+      <DependentUpon>PivotPointDropDown.cs</DependentUpon>
+    </Compile>
+    <Compile Include="PivotPointEditor.cs" />
+    <Compile Include="PointValueConverter.cs" />
+    <Compile Include="RangeValueDropDown.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="RangeValueDropDown.Designer.cs">
+      <DependentUpon>RangeValueDropDown.cs</DependentUpon>
+    </Compile>
+    <Compile Include="RangeValueEditor.cs" />
+    <Compile Include="SeriesPointCollectionEditor.cs" />
+    <Compile Include="ChartTitleCollectionEditor.cs" />
+    <Compile Include="ChartSeriesCollectionEditor.cs" />
+    <Compile Include="AxisListTypeEditor.cs" />
+    <Compile Include="FlagsEnumEditor.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="LabeledTextBoxX.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="LabeledTextBoxX.Designer.cs">
+      <DependentUpon>LabeledTextBoxX.cs</DependentUpon>
+    </Compile>
+    <Compile Include="SeriesPointValueDropDown.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="SeriesPointValueDropDown.Designer.cs">
+      <DependentUpon>SeriesPointValueDropDown.cs</DependentUpon>
+    </Compile>
+    <Compile Include="SeriesPointValueEditor.cs" />
+    <Compile Include="ChartControlActionList.cs" />
+    <Compile Include="ChartControlDesigner.cs" />
+    <Compile Include="ChartContainerCollectionEditor.cs" />
+    <Compile Include="ChartStyleDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="ChartStyleDialog.Designer.cs">
+      <DependentUpon>ChartStyleDialog.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="SizeDropDown.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="SizeDropDown.Designer.cs">
+      <DependentUpon>SizeDropDown.cs</DependentUpon>
+    </Compile>
+    <Compile Include="SizeEditor.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Design" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.XML" />
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.5">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4.5 %28x86 and x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\DevComponents.DotNetBar.Charts\DevComponents.DotNetBar.Charts.csproj">
+      <Project>{2af9ba7a-2d05-419e-9f49-0ccef791947e}</Project>
+      <Name>DevComponents.DotNetBar.Charts</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\DotNetBar.csproj">
+      <Project>{36546ce3-335c-4ab6-a2f3-40f8c818bc66}</Project>
+      <Name>DotNetBar</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/FlagsEnumEditor.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/FlagsEnumEditor.cs
new file mode 100644
index 00000000..0276eb53
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/FlagsEnumEditor.cs	
@@ -0,0 +1,210 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing.Design;
+using System.Text;
+using System.Windows.Forms;
+using System.Windows.Forms.Design;
+
+namespace DevComponents.Charts.Design
+{
+    #region FlagsEnumUIEditor
+
+    public class FlagsEnumUIEditor : UITypeEditor
+    {
+        private FlagsCheckedListBox _FlagCb;
+
+        public FlagsEnumUIEditor()
+        {
+            _FlagCb = new FlagsCheckedListBox();
+        }
+
+        public override UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext context)
+        {
+            return (UITypeEditorEditStyle.DropDown);
+        }
+
+        public override object EditValue(ITypeDescriptorContext context, IServiceProvider provider, object value)
+        {
+            if (context != null && context.Instance != null && provider != null)
+            {
+                IWindowsFormsEditorService edSvc =
+                    (IWindowsFormsEditorService)provider.GetService(typeof(IWindowsFormsEditorService));
+
+                if (edSvc != null)
+                {
+                    Enum e = (Enum)Convert.ChangeType(value, context.PropertyDescriptor.PropertyType);
+
+                    _FlagCb.Value = e;
+                    edSvc.DropDownControl(_FlagCb);
+
+                    return (_FlagCb.Value);
+                }
+            }
+
+            return (base.EditValue(provider, value));
+        }
+    }
+
+    #endregion
+
+    public class FlagsCheckedListBox : CheckedListBox
+    {
+        private Type _Type;
+        private Enum _Value;
+        private bool _UpdatingStates;
+
+        public FlagsCheckedListBox()
+        {
+            CheckOnClick = true;
+            BorderStyle = BorderStyle.None;
+        }
+
+        #region Public properties
+
+        #region Value
+
+        public Enum Value
+        {
+            get
+            {
+                return (_Value);
+            }
+
+            set
+            {
+                _Value = value;
+                _Type = value.GetType();
+
+                InitializeCheckedListBox();
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InitializeCheckedListBox
+
+        private void InitializeCheckedListBox()
+        {
+            Items.Clear();
+
+            foreach (string name in Enum.GetNames(_Type))
+            {
+                object o = Enum.Parse(_Type, name);
+                uint value = (uint)Convert.ChangeType(o, typeof(uint));
+
+                FlagsCheckedListBoxItem item = new FlagsCheckedListBoxItem(value, name);
+
+                Items.Add(item);
+            }
+
+            SetCheckedItems();
+        }
+
+        #region OnItemCheck
+
+        protected override void OnItemCheck(ItemCheckEventArgs e)
+        {
+            base.OnItemCheck(e);
+
+            if (_UpdatingStates == false)
+            {
+                FlagsCheckedListBoxItem item = Items[e.Index] as FlagsCheckedListBoxItem;
+
+                uint sum;
+
+                if (e.NewValue == CheckState.Checked &&
+                    (item.Value == 0 || item.Text.Equals("None")))
+                {
+                    sum = item.Value;
+                }
+                else
+                {
+                    sum = CalculateCheckedSum();
+
+                    if (e.NewValue == CheckState.Checked)
+                        sum += item.Value;
+                    else
+                        sum -= item.Value;
+                }
+                   
+                _Value = (Enum)(Enum.ToObject(_Type, sum));
+
+                SetCheckedItems();
+            }
+        }
+
+        #endregion
+
+        #region SetCheckedItems
+
+        private void SetCheckedItems()
+        {
+            _UpdatingStates = true;
+
+            int value = (int)Convert.ChangeType(_Value, typeof(int));
+
+            for (int i = 0; i < Items.Count; i++)
+            {
+                FlagsCheckedListBoxItem item = Items[i] as FlagsCheckedListBoxItem;
+
+                if (item.Value == 0)
+                    SetItemChecked(i, value == 0);
+
+                else if (item.Text.Equals("None"))
+                    SetItemChecked(i, value == item.Value);
+
+                else
+                    SetItemChecked(i, ((item.Value & value) == item.Value));
+            }
+
+            _UpdatingStates = false;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region CalculateCheckedSum
+
+        private uint CalculateCheckedSum()
+        {
+            uint sum = 0;
+
+            for (int i = 0; i < Items.Count; i++)
+            {
+                FlagsCheckedListBoxItem item = Items[i] as FlagsCheckedListBoxItem;
+
+                if (GetItemChecked(i))
+                    sum |= item.Value;
+            }
+
+            return (sum);
+        }
+
+        #endregion
+    }
+
+    #region FlagsCheckedListBoxItem
+
+    public class FlagsCheckedListBoxItem
+    {
+        public uint Value;
+        public string Text;
+
+        public FlagsCheckedListBoxItem(uint value, string text)
+        {
+            Value = value;
+            Text = text;
+        }
+
+        public override string ToString()
+        {
+            return (Text);
+        }
+    }
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/IndicatorCollectionEditor.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/IndicatorCollectionEditor.cs
new file mode 100644
index 00000000..a767533d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/IndicatorCollectionEditor.cs	
@@ -0,0 +1,128 @@
+using System;
+using System.ComponentModel;
+using System.ComponentModel.Design;
+using System.Reflection;
+using DevComponents.DotNetBar.Charts;
+
+namespace DevComponents.Charts.Design
+{
+    public class IndicatorCollectionEditor : BaseCollectionEditor
+    {
+        #region Private variables
+
+        private ChartSeries _ChartSeries;
+
+        #endregion
+
+        public IndicatorCollectionEditor(Type type)
+            : base(type)
+        {
+        }
+
+        #region EditValue
+
+        public override object EditValue(
+            ITypeDescriptorContext context, IServiceProvider provider, object value)
+        {
+            _ChartSeries = context.Instance as ChartSeries;
+
+            return (base.EditValue(context, provider, value));
+        }
+
+        #endregion
+
+        #region CreateInstance
+
+        protected override object CreateInstance(Type itemType)
+        {
+            if (itemType == typeof(RegressionLine))
+            {
+                RegressionLine regLine = (RegressionLine)base.CreateInstance(itemType);
+
+                if (_ChartSeries != null)
+                    regLine.Name = _ChartSeries.ChartIndicators.GetUniqueName("RegLine");
+
+                return (regLine);
+            }
+
+            if (itemType == typeof(TrendLine))
+            {
+                TrendLine trendLine = (TrendLine)base.CreateInstance(itemType);
+
+                if (_ChartSeries != null)
+                    trendLine.Name = _ChartSeries.ChartIndicators.GetUniqueName("TrendLine");
+
+                return (trendLine);
+            }
+
+            return (base.CreateInstance(itemType));
+        }
+
+        #endregion
+
+        #region CopyButton_Click
+
+        protected override void CopyButton_Click(object sender, EventArgs e)
+        {
+            ChartIndicator item = ChartItem as ChartIndicator;
+
+            if (item != null)
+            {
+                if (AddButton != null)
+                {
+                    ChartControlDesigner ccd = GetDesigner(_ChartSeries.ChartControl);
+                    ChartIndicatorCollection cic = _ChartSeries.ChartIndicators;
+
+                    ccd.InCopyItem = true;
+
+                    if (item is RegressionLine)
+                        _ItemTypes[0] = typeof(RegressionLine);
+
+                    try
+                    {
+                        AddButton.PerformClick();
+
+                        ChartIndicator clone = (ChartIndicator)cic[cic.Count - 1];
+
+                        string name = clone.Name;
+                        item.CopyTo(clone);
+                        clone.Name = name;
+                    }
+                    finally
+                    {
+                        if (item is RegressionLine)
+                            _ItemTypes[0] = typeof(TrendLine);
+
+                        ccd.InCopyItem = false;
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region CreateCollectionItemType
+
+        protected override Type CreateCollectionItemType()
+        {
+            return typeof(ChartIndicator);
+        }
+
+        #endregion
+
+        #region CreateNewItemTypes
+
+        private Type[] _ItemTypes = new Type[] 
+        {
+            typeof(TrendLine),
+            typeof(RegressionLine),
+        };
+
+        protected override Type[] CreateNewItemTypes()
+        {
+            return (_ItemTypes);
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/LabeledTextBoxX.Designer.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/LabeledTextBoxX.Designer.cs
new file mode 100644
index 00000000..b26117db
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/LabeledTextBoxX.Designer.cs	
@@ -0,0 +1,92 @@
+namespace DevComponents.Charts.Design
+{
+    partial class LabeledTextBoxX
+    {
+        /// <summary> 
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #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.lbIndex = new DevComponents.DotNetBar.LabelX();
+            this.tbValue = new DevComponents.DotNetBar.Controls.TextBoxX();
+            this.SuspendLayout();
+            // 
+            // lbIndex
+            // 
+            // 
+            // 
+            // 
+            this.lbIndex.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.lbIndex.ForeColor = System.Drawing.Color.DimGray;
+            this.lbIndex.Location = new System.Drawing.Point(3, 4);
+            this.lbIndex.Name = "lbIndex";
+            this.lbIndex.Size = new System.Drawing.Size(8, 13);
+            this.lbIndex.Style = DevComponents.DotNetBar.eDotNetBarStyle.OfficeXP;
+            this.lbIndex.TabIndex = 1;
+            this.lbIndex.Text = "3";
+            this.lbIndex.TextAlignment = System.Drawing.StringAlignment.Far;
+            // 
+            // tbValue
+            // 
+            this.tbValue.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            // 
+            // 
+            // 
+            this.tbValue.Border.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Etched;
+            this.tbValue.Border.BorderColor = System.Drawing.SystemColors.ControlDark;
+            this.tbValue.Border.BorderColor2 = System.Drawing.SystemColors.ControlLight;
+            this.tbValue.Border.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Etched;
+            this.tbValue.Border.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Etched;
+            this.tbValue.Border.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Etched;
+            this.tbValue.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.tbValue.Border.PaddingBottom = 2;
+            this.tbValue.Border.PaddingLeft = 3;
+            this.tbValue.Border.PaddingRight = 2;
+            this.tbValue.Border.PaddingTop = 2;
+            this.tbValue.Location = new System.Drawing.Point(17, 0);
+            this.tbValue.Name = "tbValue";
+            this.tbValue.PreventEnterBeep = true;
+            this.tbValue.Size = new System.Drawing.Size(54, 18);
+            this.tbValue.TabIndex = 2;
+            this.tbValue.PreviewKeyDown += new System.Windows.Forms.PreviewKeyDownEventHandler(this.tbValue_PreviewKeyDown);
+            // 
+            // LabeledTextBoxX
+            // 
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
+            this.Controls.Add(this.tbValue);
+            this.Controls.Add(this.lbIndex);
+            this.Margin = new System.Windows.Forms.Padding(0);
+            this.Name = "LabeledTextBoxX";
+            this.Size = new System.Drawing.Size(72, 19);
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        internal DotNetBar.LabelX lbIndex;
+        internal DotNetBar.Controls.TextBoxX tbValue;
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/LabeledTextBoxX.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/LabeledTextBoxX.cs
new file mode 100644
index 00000000..fa837f9a
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/LabeledTextBoxX.cs	
@@ -0,0 +1,34 @@
+using System;
+using System.ComponentModel;
+using System.Windows.Forms;
+
+namespace DevComponents.Charts.Design
+{
+    [ToolboxItem(false)]
+    public partial class LabeledTextBoxX : UserControl
+    {
+        #region EscapeKeyPressed
+
+        public event EventHandler<EventArgs> EscapeKeyPressed;
+
+        #endregion
+
+        public LabeledTextBoxX()
+        {
+            InitializeComponent();
+        }
+
+        #region tbValue_PreviewKeyDown
+
+        private void tbValue_PreviewKeyDown(object sender, PreviewKeyDownEventArgs e)
+        {
+            if (e.KeyCode == Keys.Escape)
+            {
+                if (EscapeKeyPressed != null)
+                    EscapeKeyPressed(this, EventArgs.Empty);
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/LabeledTextBoxX.resx b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/LabeledTextBoxX.resx
new file mode 100644
index 00000000..7080a7d1
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/LabeledTextBoxX.resx	
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/LocationDropDown.Designer.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/LocationDropDown.Designer.cs
new file mode 100644
index 00000000..8ca9ec3f
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/LocationDropDown.Designer.cs	
@@ -0,0 +1,48 @@
+namespace DevComponents.Charts.Design
+{
+    partial class LocationDropDown
+    {
+        /// <summary> 
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #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.SuspendLayout();
+            // 
+            // PivotPointDropDown
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.Name = "PivotPointDropDown";
+            this.Size = new System.Drawing.Size(99, 110);
+            this.PreviewKeyDown += new System.Windows.Forms.PreviewKeyDownEventHandler(this.PivotPointDropDown_PreviewKeyDown);
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/LocationDropDown.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/LocationDropDown.cs
new file mode 100644
index 00000000..714f113a
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/LocationDropDown.cs	
@@ -0,0 +1,248 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Windows.Forms;
+using System.Windows.Forms.Design;
+
+namespace DevComponents.Charts.Design
+{
+    [ToolboxItem(false)]
+    public partial class LocationDropDown : UserControl
+    {
+        #region Constants
+
+        private const int DotRadius = 4;
+
+        #endregion
+
+        #region Private variables
+
+        private PointF _PivotPoint;
+        private Rectangle _DotBounds;
+        private Rectangle _FrameBounds;
+
+        private Point _Center;
+
+        private bool _InFrame;
+        private bool _InPivotDot;
+        private bool _PivotMoving;
+
+        private bool _EscapePressed;
+
+        private IWindowsFormsEditorService _EditorService;
+        private ITypeDescriptorContext _Context;
+
+        #endregion
+
+        public LocationDropDown(PointF value,
+            IWindowsFormsEditorService editorService, ITypeDescriptorContext context)
+        {
+            Initialize();
+
+            _EditorService = editorService;
+            _Context = context;
+
+            PivotPoint = value;
+        }
+
+        public LocationDropDown()
+        {
+            Initialize();
+        }
+
+        #region Initialize
+
+        private void Initialize()
+        {
+            InitializeComponent();
+
+            SetStyle(ControlStyles.UserPaint, true);
+            SetStyle(ControlStyles.AllPaintingInWmPaint, true);
+            SetStyle(ControlStyles.OptimizedDoubleBuffer, true);
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region EditorService
+
+        public IWindowsFormsEditorService EditorService
+        {
+            get { return (_EditorService); }
+            set { _EditorService = value; }
+        }
+
+        #endregion
+
+        #region EscapePressed
+
+        public bool EscapePressed
+        {
+            get { return (_EscapePressed); }
+            set { _EscapePressed = value; }
+        }
+
+        #endregion
+
+        #region PivotPoint
+
+        public PointF PivotPoint
+        {
+            get { return (_PivotPoint); }
+
+            set
+            {
+                _PivotPoint = value;
+
+                RecalcLayout();
+                Invalidate();
+
+                _Context.OnComponentChanging();
+                _Context.PropertyDescriptor.SetValue(_Context.Instance, value);
+                _Context.OnComponentChanged();
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RecalcLayout
+
+        private void RecalcLayout()
+        {
+            int n = Math.Min(Bounds.Width - 4, Bounds.Height - 4);
+
+            _FrameBounds = new Rectangle(2, 2, n, n);
+            _FrameBounds.X = (Bounds.Width - n) / 2;
+            _FrameBounds.Y = (Bounds.Height - n) / 2;
+
+            int x = _FrameBounds.X + (int)(_PivotPoint.X * _FrameBounds.Width);
+            int y = _FrameBounds.Y + (int)(_PivotPoint.Y * _FrameBounds.Height);
+
+            _DotBounds = new Rectangle(x - DotRadius, y - DotRadius,
+                DotRadius * 2, DotRadius * 2);
+
+            _Center = new Point(_FrameBounds.X + _FrameBounds.Width / 2,
+                _FrameBounds.Y + _FrameBounds.Height / 2);
+        }
+
+        #endregion
+
+        #region Paint support
+
+        #region OnPaint
+
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            base.OnPaint(e);
+
+            Graphics g = e.Graphics;
+
+            g.SmoothingMode = SmoothingMode.AntiAlias;
+
+            RecalcLayout();
+
+            g.DrawLine(Pens.Red, new Point(_FrameBounds.X, _Center.Y),
+                new Point(_FrameBounds.Right, _Center.Y));
+
+            g.DrawLine(Pens.Red, new Point(_Center.X, _FrameBounds.Y),
+                new Point(_Center.X, _FrameBounds.Bottom));
+
+            DrawPivotDot(g);
+        }
+
+        #endregion
+
+        #region DrawPivotDot
+
+        private void DrawPivotDot(Graphics g)
+        {
+            g.FillEllipse(Brushes.SkyBlue, _DotBounds);
+            g.DrawEllipse(Pens.DimGray, _DotBounds);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Mouse support
+
+        #region OnMouseMove
+
+        protected override void OnMouseMove(MouseEventArgs e)
+        {
+            base.OnMouseMove(e);
+
+            _InFrame = (_FrameBounds.Contains(e.Location) == true);
+
+            if (_PivotMoving == true && _InFrame == true)
+            {
+                PivotPoint = new PointF(
+                    (float)(e.X - _FrameBounds.X) / _FrameBounds.Width,
+                    (float)(e.Y - _FrameBounds.Y) / _FrameBounds.Height);
+            }
+
+            _InPivotDot = (_DotBounds.Contains(e.Location) == true);
+
+            Cursor = (_InPivotDot == true) ? Cursors.Hand : Cursors.Default;
+        }
+
+        #endregion
+
+        #region OnMouseLeave
+
+        protected override void OnMouseLeave(EventArgs e)
+        {
+            base.OnMouseLeave(e);
+
+            _InFrame = false;
+            _InPivotDot = false;
+        }
+
+        #endregion
+
+        #region OnMouseDown
+
+        protected override void OnMouseDown(MouseEventArgs e)
+        {
+            base.OnMouseDown(e);
+
+            if (e.Button == MouseButtons.Left)
+            {
+                if (_InPivotDot == true)
+                    _PivotMoving = true;
+            }
+        }
+
+        #endregion
+
+        #region OnMouseUp
+
+        protected override void OnMouseUp(MouseEventArgs e)
+        {
+            base.OnMouseUp(e);
+
+            _PivotMoving = false;
+
+            _InFrame = (_FrameBounds.Contains(e.Location) == true);
+            _InPivotDot = (_DotBounds.Contains(e.Location) == true);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region PivotPointDropDown_PreviewKeyDown
+
+        private void PivotPointDropDown_PreviewKeyDown(object sender, PreviewKeyDownEventArgs e)
+        {
+            if (e.KeyCode == Keys.Escape)
+                _EscapePressed = true;
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/LocationDropDown.resx b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/LocationDropDown.resx
new file mode 100644
index 00000000..19dc0dd8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/LocationDropDown.resx	
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/LocationEditor.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/LocationEditor.cs
new file mode 100644
index 00000000..72c1ce4e
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/LocationEditor.cs	
@@ -0,0 +1,59 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Windows.Forms.Design;
+
+namespace DevComponents.Charts.Design
+{
+    public class LocationEditor : UITypeEditor
+    {
+        #region GetEditStyle
+
+        public override UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext context)
+        {
+            return (UITypeEditorEditStyle.DropDown);
+        }
+
+        #endregion
+
+        #region GetPaintValueSupported
+
+        public override bool GetPaintValueSupported(ITypeDescriptorContext context)
+        {
+            return (false);
+        }
+
+        #endregion
+
+        #region EditValue
+
+        public override object EditValue(
+            ITypeDescriptorContext context, IServiceProvider provider, object value)
+        {
+            if (provider != null)
+            {
+                IWindowsFormsEditorService editorService =
+                    provider.GetService(typeof(IWindowsFormsEditorService)) as IWindowsFormsEditorService;
+
+                if (editorService != null)
+                {
+                    LocationDropDown pv = new LocationDropDown((PointF)value, editorService, context);
+
+                    pv.EscapePressed = false;
+
+                    editorService.DropDownControl(pv);
+
+                    if (pv.EscapePressed == true)
+                        context.PropertyDescriptor.SetValue(context.Instance, value);
+                    else
+                        return (pv.PivotPoint);
+                }
+            }
+
+            return (base.EditValue(context, provider, value));
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/PieReferenceCollectionEditor.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/PieReferenceCollectionEditor.cs
new file mode 100644
index 00000000..1b00ea62
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/PieReferenceCollectionEditor.cs	
@@ -0,0 +1,112 @@
+using System;
+using System.ComponentModel;
+using System.ComponentModel.Design;
+using DevComponents.DotNetBar.Charts;
+
+namespace DevComponents.Charts.Design
+{
+    public class PieReferenceCollectionEditor : BaseCollectionEditor
+    {
+        #region Private variables
+
+        private SliceVisualLayout _SliceLayout;
+
+        #endregion
+
+        public PieReferenceCollectionEditor(Type type)
+            : base(type)
+        {
+        }
+
+        #region EditValue
+
+        public override object EditValue(
+            ITypeDescriptorContext context, IServiceProvider provider, object value)
+        {
+            _SliceLayout = context.Instance as SliceVisualLayout;
+
+            IComponentChangeService cs = BeforeEditValue(context);
+
+            object retval = value;
+
+            try
+            {
+                retval = base.EditValue(context, provider, value);
+            }
+            finally
+            {
+                AfterEditValue(context, cs);
+            }
+
+            return (retval);
+        }
+
+        #endregion
+
+        #region CreateInstance
+
+        protected override object CreateInstance(Type itemType)
+        {
+            if (itemType == typeof(PieReferenceLine))
+            {
+                PieReferenceLine line = (PieReferenceLine)base.CreateInstance(itemType);
+
+                line.Name = _SliceLayout.ReferenceLines.GetUniqueName();
+
+                return (line);
+            }
+
+            return (base.CreateInstance(itemType));
+        }
+
+        #endregion
+
+        #region CopyButton_Click
+
+        protected override void CopyButton_Click(object sender, EventArgs e)
+        {
+            PieReferenceLine item = ChartItem as PieReferenceLine;
+
+            if (item != null)
+            {
+                if (AddButton != null)
+                {
+                    ChartVisualElement cve = _SliceLayout.Parent as ChartVisualElement;
+
+                    ChartControlDesigner ccd = (cve != null) ? GetDesigner(cve.ChartControl) : null;
+
+                    if (ccd != null)
+                        ccd.InCopyItem = true;
+
+                    try
+                    {
+                        AddButton.PerformClick();
+
+                        PieReferenceLineCollection rlc = _SliceLayout.ReferenceLines;
+                        PieReferenceLine clone = rlc[rlc.Count - 1];
+
+                        string name = clone.Name;
+                        item.CopyTo(clone);
+                        clone.Name = name;
+                    }
+                    finally
+                    {
+                        if (ccd != null)
+                            ccd.InCopyItem = false;
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region CreateCollectionItemType
+
+        protected override Type CreateCollectionItemType()
+        {
+            return typeof(PieReferenceLine);
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/PieSeriesPointCollectionEditor.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/PieSeriesPointCollectionEditor.cs
new file mode 100644
index 00000000..481a458b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/PieSeriesPointCollectionEditor.cs	
@@ -0,0 +1,97 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.ComponentModel.Design;
+using DevComponents.DotNetBar;
+using DevComponents.DotNetBar.Charts;
+
+namespace DevComponents.Charts.Design
+{
+    public class PieSeriesPointCollectionEditor : BaseCollectionEditor
+    {
+        #region Private variables
+
+        private PieSeries _PieSeries;
+
+        #endregion
+
+        public PieSeriesPointCollectionEditor(Type type)
+            : base(type)
+        {
+        }
+
+        #region EditValue
+
+        public override object EditValue(
+            ITypeDescriptorContext context, IServiceProvider provider, object value)
+        {
+            _PieSeries = context.Instance as PieSeries;
+
+            if (_PieSeries == null)
+            {
+                PieSeriesPoint psp = context.Instance as PieSeriesPoint;
+
+                if (psp != null)
+                    _PieSeries = psp.ChartSeries;
+            }
+
+            if (_PieSeries != null)
+                return (base.EditValue(context, provider, value));
+
+            return (value);
+        }
+
+        #endregion
+
+        #region CreateInstance
+
+        protected override object CreateInstance(Type itemType)
+        {
+            return (base.CreateInstance(itemType));
+        }
+
+        #endregion
+
+        #region CopyButton_Click
+
+        protected override void CopyButton_Click(object sender, EventArgs e)
+        {
+            PieSeriesPoint item = ChartItem as PieSeriesPoint;
+
+            if (item != null)
+            {
+                if (AddButton != null)
+                {
+                    ChartControlDesigner ccd = GetDesigner(_PieSeries.ChartControl);
+
+                    ccd.InCopyItem = true;
+
+                    try
+                    {
+                        AddButton.PerformClick();
+
+                        PieSeriesPointCollection spc = item.Parent as PieSeriesPointCollection;
+                        PieSeriesPoint clone = spc[spc.Count - 1];
+
+                        item.CopyTo(clone);
+                    }
+                    finally
+                    {
+                        ccd.InCopyItem = false;
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region CreateCollectionItemType
+
+        protected override Type CreateCollectionItemType()
+        {
+            return typeof(PieSeriesPoint);
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/PivotPointDropDown.Designer.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/PivotPointDropDown.Designer.cs
new file mode 100644
index 00000000..22904d4e
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/PivotPointDropDown.Designer.cs	
@@ -0,0 +1,48 @@
+namespace DevComponents.Charts.Design
+{
+    partial class PivotPointDropDown
+    {
+        /// <summary> 
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #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.SuspendLayout();
+            // 
+            // PivotPointDropDown
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.Name = "PivotPointDropDown";
+            this.Size = new System.Drawing.Size(99, 110);
+            this.PreviewKeyDown += new System.Windows.Forms.PreviewKeyDownEventHandler(this.PivotPointDropDown_PreviewKeyDown);
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/PivotPointDropDown.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/PivotPointDropDown.cs
new file mode 100644
index 00000000..fee40cd8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/PivotPointDropDown.cs	
@@ -0,0 +1,332 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Windows.Forms;
+using System.Windows.Forms.Design;
+
+namespace DevComponents.Charts.Design
+{
+    [ToolboxItem(false)]
+    public partial class PivotPointDropDown : UserControl
+    {
+        #region Constants
+
+        private const int DotRadius = 4;
+        private const int ScaleWidth = 3;
+        private const float BevelInside = .035f;
+        private const float BevelOutside = .05f;
+        private const float RoundRectangleArc = .125f;
+
+        #endregion
+
+        #region Private variables
+
+        private PointF _PivotPoint;
+        private Rectangle _DotBounds;
+        private Rectangle _FrameBounds;
+        private Rectangle _ScaleBounds;
+
+        private double _ScaleRadius;
+        private double _StartAngle;
+        private double _SweepAngle;
+
+        private bool _InFrame;
+        private bool _InPivotDot;
+        private bool _PivotMoving;
+
+        private bool _EscapePressed;
+
+        private IWindowsFormsEditorService _EditorService;
+        private ITypeDescriptorContext _Context;
+
+        #endregion
+
+        public PivotPointDropDown(PointF value,
+            double scaleRadius, double startAngle, double sweepAngle,
+            IWindowsFormsEditorService editorService, ITypeDescriptorContext context)
+        {
+            _ScaleRadius = scaleRadius;
+            _StartAngle = startAngle;
+            _SweepAngle = sweepAngle;
+
+            _ScaleRadius = Math.Max(_ScaleRadius, .07f);
+
+            Initialize();
+
+            _EditorService = editorService;
+            _Context = context;
+
+            PivotPoint = value;
+        }
+
+        public PivotPointDropDown()
+        {
+            Initialize();
+        }
+
+        #region Initialize
+
+        private void Initialize()
+        {
+            InitializeComponent();
+
+            SetStyle(ControlStyles.UserPaint, true);
+            SetStyle(ControlStyles.AllPaintingInWmPaint, true);
+            SetStyle(ControlStyles.OptimizedDoubleBuffer, true);
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region EditorService
+
+        public IWindowsFormsEditorService EditorService
+        {
+            get { return (_EditorService); }
+            set { _EditorService = value; }
+        }
+
+        #endregion
+
+        #region EscapePressed
+
+        public bool EscapePressed
+        {
+            get { return (_EscapePressed); }
+            set { _EscapePressed = value; }
+        }
+
+        #endregion
+
+        #region PivotPoint
+
+        public PointF PivotPoint
+        {
+            get { return (_PivotPoint); }
+
+            set
+            {
+                _PivotPoint = value;
+
+                RecalcLayout();
+                Invalidate();
+
+                _Context.OnComponentChanging();
+                _Context.PropertyDescriptor.SetValue(_Context.Instance, value);
+                _Context.OnComponentChanged();
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RecalcLayout
+
+        private void RecalcLayout()
+        {
+            int n = Math.Min(Bounds.Width - 4, Bounds.Height - 4);
+
+            _FrameBounds = new Rectangle(2, 2, n, n);
+            _FrameBounds.X = (Bounds.Width - n) / 2;
+            _FrameBounds.Y = (Bounds.Height - n) / 2;
+
+            int radius = (int)(n * _ScaleRadius);
+            int n2 = n / 2;
+
+            _ScaleBounds.Width = radius * 2;
+            _ScaleBounds.Height = radius * 2;
+
+            int x = _FrameBounds.X + (int)(_PivotPoint.X * _FrameBounds.Width + n2);
+            int y = _FrameBounds.Y + (int)(_PivotPoint.Y * _FrameBounds.Height + n2);
+
+            _ScaleBounds.X = x - radius;
+            _ScaleBounds.Y = y - radius;
+
+            _DotBounds = new Rectangle(x - DotRadius, y - DotRadius, DotRadius * 2, DotRadius * 2);
+        }
+
+        #endregion
+
+        #region Paint support
+
+        #region OnPaint
+
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            base.OnPaint(e);
+
+            Graphics g = e.Graphics;
+
+            g.SmoothingMode = SmoothingMode.AntiAlias;
+
+            RecalcLayout();
+
+            DrawFrame(g);
+            DrawScale(g);
+            DrawPivotDot(g);
+        }
+
+        #endregion
+
+        #region DrawFrame
+
+        private void DrawFrame(Graphics g)
+        {
+                DrawBlankFrame(g);
+        }
+
+        #region DrawBlankFrame
+
+        private void DrawBlankFrame(Graphics g)
+        {
+            using (Brush br = new SolidBrush(Color.LightGray))
+                g.FillRectangle(br, _FrameBounds);
+
+            g.DrawRectangle(Pens.DimGray, _FrameBounds);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region DrawScale
+
+        private void DrawScale(Graphics g)
+        {
+            using (Brush br = new SolidBrush(Color.CornflowerBlue))
+            {
+                using (Pen pen = new Pen(br, ScaleWidth))
+                    g.DrawArc(pen, _ScaleBounds, (float)_StartAngle, (float)_SweepAngle);
+            }
+        }
+
+        #endregion
+
+        #region DrawPivotDot
+
+        private void DrawPivotDot(Graphics g)
+        {
+            g.FillEllipse(Brushes.SkyBlue, _DotBounds);
+            g.DrawEllipse(Pens.DimGray, _DotBounds);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Mouse support
+
+        #region OnMouseMove
+
+        protected override void OnMouseMove(MouseEventArgs e)
+        {
+            base.OnMouseMove(e);
+
+            _InFrame = (_FrameBounds.Contains(e.Location) == true);
+
+            if (_PivotMoving == true && _InFrame == true)
+            {
+                int n = Math.Min(Bounds.Width - 4, Bounds.Height - 4);
+                int n2 = n / 2;
+
+                PivotPoint = new PointF(
+                    (float)(e.X - _FrameBounds.X - n2) / _FrameBounds.Width,
+                    (float)(e.Y - _FrameBounds.Y - n2) / _FrameBounds.Height);
+            }
+
+            _InPivotDot = (_DotBounds.Contains(e.Location) == true);
+
+            Cursor = (_InPivotDot == true) ? Cursors.Hand : Cursors.Default;
+        }
+
+        #endregion
+
+        #region OnMouseLeave
+
+        protected override void OnMouseLeave(EventArgs e)
+        {
+            base.OnMouseLeave(e);
+
+            _InFrame = false;
+            _InPivotDot = false;
+        }
+
+        #endregion
+
+        #region OnMouseDown
+
+        protected override void OnMouseDown(MouseEventArgs e)
+        {
+            base.OnMouseDown(e);
+
+            if (e.Button == MouseButtons.Left)
+            {
+                if (_InPivotDot == true)
+                    _PivotMoving = true;
+            }
+        }
+
+        #endregion
+
+        #region OnMouseUp
+
+        protected override void OnMouseUp(MouseEventArgs e)
+        {
+            base.OnMouseUp(e);
+
+            _PivotMoving = false;
+
+            _InFrame = (_FrameBounds.Contains(e.Location) == true);
+            _InPivotDot = (_DotBounds.Contains(e.Location) == true);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region PivotPointDropDown_PreviewKeyDown
+
+        private void PivotPointDropDown_PreviewKeyDown(object sender, PreviewKeyDownEventArgs e)
+        {
+            PointF pt = PivotPoint;
+
+            int n = Math.Min(Bounds.Width - 4, Bounds.Height - 4) / 2;
+
+            switch (e.KeyCode)
+            {
+                case Keys.Escape:
+                    _EscapePressed = true;
+                    break;
+
+                case Keys.Home:
+                    PivotPoint = PointF.Empty;
+                    break;
+
+                case Keys.Left:
+                    pt.X -= (float)(_ScaleRadius / 20);
+                    PivotPoint = pt;
+                    break;
+
+                case Keys.Right:
+                    pt.X += (float)(_ScaleRadius / 20);
+                    PivotPoint = pt;
+                    break;
+
+                case Keys.Up:
+                    pt.Y -= (float)(_ScaleRadius / 20);
+                    PivotPoint = pt;
+                    break;
+
+                case Keys.Down:
+                    pt.Y += (float)(_ScaleRadius / 20);
+                    PivotPoint = pt;
+                    break;
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/PivotPointDropDown.resx b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/PivotPointDropDown.resx
new file mode 100644
index 00000000..19dc0dd8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/PivotPointDropDown.resx	
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/PivotPointEditor.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/PivotPointEditor.cs
new file mode 100644
index 00000000..0990ea24
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/PivotPointEditor.cs	
@@ -0,0 +1,77 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Windows.Forms.Design;
+using DevComponents.DotNetBar.Charts;
+
+namespace DevComponents.Charts.Design
+{
+    public class PivotPointEditor : UITypeEditor
+    {
+        #region GetEditStyle
+
+        public override UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext context)
+        {
+            return (UITypeEditorEditStyle.DropDown);
+        }
+
+        #endregion
+
+        #region GetPaintValueSupported
+
+        public override bool GetPaintValueSupported(ITypeDescriptorContext context)
+        {
+            return (false);
+        }
+
+        #endregion
+
+        #region EditValue
+
+        public override object EditValue(
+            ITypeDescriptorContext context, IServiceProvider provider, object value)
+        {
+            if (provider != null)
+            {
+                IWindowsFormsEditorService editorService =
+                    provider.GetService(typeof(IWindowsFormsEditorService)) as IWindowsFormsEditorService;
+
+                if (editorService != null)
+                {
+                    PieChart pieChart = context.Instance as PieChart;
+
+                    if (pieChart != null)
+                    {
+                        double scale = pieChart.OuterRadius;
+
+                        if (scale >= 1)
+                        {
+                            int n = Math.Min(pieChart.ContentBounds.Width, pieChart.ContentBounds.Height);
+                            scale = (n > 0) ? pieChart.ActualOuterRadius / n : 0;
+                        }
+
+                        scale /= 2;
+
+                        PivotPointDropDown pv = new PivotPointDropDown((PointF) value,
+                            scale, pieChart.SubSliceVisualLayout.StartAngle,
+                            pieChart.SubSliceVisualLayout.SweepAngle, editorService, context);
+
+                        pv.EscapePressed = false;
+
+                        editorService.DropDownControl(pv);
+
+                        if (pv.EscapePressed == true)
+                            context.PropertyDescriptor.SetValue(context.Instance, value);
+                        else
+                            return (pv.PivotPoint);
+                    }
+                }
+            }
+
+            return (base.EditValue(context, provider, value));
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/PointValueConverter.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/PointValueConverter.cs
new file mode 100644
index 00000000..e3df5ecb
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/PointValueConverter.cs	
@@ -0,0 +1,117 @@
+using System;
+using System.ComponentModel;
+using System.Globalization;
+
+namespace DevComponents.Charts.Design
+{
+    /// <summary>
+    /// Represents PointValueConverter converter.
+    /// </summary>
+    public class PointValueConverter : TypeConverter
+    {
+        public PointValueConverter()
+        {
+        }
+
+        #region CanConvertTo
+
+        public override bool CanConvertFrom(
+            ITypeDescriptorContext context, Type sourceType)
+        {
+            if (sourceType == typeof(string))
+                return true;
+
+            return base.CanConvertFrom(context, sourceType);
+        }
+
+        #endregion
+
+        #region CanConvertTo
+
+        public override bool CanConvertTo(
+            ITypeDescriptorContext context, Type destinationType)
+        {
+            if (destinationType == typeof(string))
+                return true;
+
+            return base.CanConvertTo(context, destinationType);
+        }
+
+        #endregion
+
+        #region ConvertFrom
+
+        public override object ConvertFrom(
+            ITypeDescriptorContext context, CultureInfo culture, object value)
+        {
+            if (value is string)
+                return (GetConvertedValue((string)value));
+
+            return base.ConvertFrom(context, culture, value);
+        }
+
+        #region GetConvertedValue
+
+        private object GetConvertedValue(string text)
+        {
+            string s = text.Trim();
+
+            if (text.Length == 0)
+                return (null);
+
+            if (s.StartsWith("\"") && s.EndsWith("\""))
+                return (s.Substring(1, s.Length - 2));
+
+            int intResult;
+
+            if (int.TryParse(text, out intResult) == true)
+                return (intResult);
+
+            double dblResult;
+
+            if (double.TryParse(text, out dblResult) == true)
+                return (dblResult);
+
+            DateTime dtResult;
+
+            if (DateTime.TryParse(text, out dtResult) == true)
+                return (dtResult);
+
+            return (text);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ConvertTo
+
+        public override object ConvertTo(
+            ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+        {
+            if (value != null)
+            {
+                if (destinationType == typeof(string))
+                {
+                    if (value == null)
+                        return ("<null>");
+
+                    if (value is string)
+                        return ("\"" + value + "\"");
+
+                    if (value is int)
+                        return (value.ToString());
+
+                    if (value is DateTime)
+                        return (value.ToString());
+
+                    return (String.Format("{0:0.0###############}", value));
+                }
+            }
+
+            return (string.Empty);
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/Properties/Resources.Designer.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/Properties/Resources.Designer.cs
new file mode 100644
index 00000000..9702ca24
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/Properties/Resources.Designer.cs	
@@ -0,0 +1,73 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.34209
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace DevComponents.Charts.Design.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DevComponents.Charts.Design.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap Copy {
+            get {
+                object obj = ResourceManager.GetObject("Copy", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/Properties/Resources.resx b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/Properties/Resources.resx
new file mode 100644
index 00000000..11a4ac80
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/Properties/Resources.resx	
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="Copy" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\resources\copy.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/RangeValueDropDown.Designer.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/RangeValueDropDown.Designer.cs
new file mode 100644
index 00000000..dcc1c86b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/RangeValueDropDown.Designer.cs	
@@ -0,0 +1,105 @@
+namespace DevComponents.Charts.Design
+{
+    partial class RangeValueDropDown
+    {
+        /// <summary> 
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #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._TrackBar = new System.Windows.Forms.TrackBar();
+            this._LabelValue = new System.Windows.Forms.Label();
+            this._LabelMin = new System.Windows.Forms.Label();
+            this._LabelMax = new System.Windows.Forms.Label();
+            ((System.ComponentModel.ISupportInitialize)(this._TrackBar)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // _TrackBar
+            // 
+            this._TrackBar.AutoSize = false;
+            this._TrackBar.Dock = System.Windows.Forms.DockStyle.Fill;
+            this._TrackBar.Location = new System.Drawing.Point(0, 0);
+            this._TrackBar.Name = "_TrackBar";
+            this._TrackBar.Size = new System.Drawing.Size(186, 40);
+            this._TrackBar.TabIndex = 0;
+            this._TrackBar.PreviewKeyDown += new System.Windows.Forms.PreviewKeyDownEventHandler(this._TrackBar_PreviewKeyDown);
+            this._TrackBar.ValueChanged += new System.EventHandler(this.TrackBar_ValueChanged);
+            // 
+            // _LabelValue
+            // 
+            this._LabelValue.AutoEllipsis = true;
+            this._LabelValue.Location = new System.Drawing.Point(59, 21);
+            this._LabelValue.Name = "_LabelValue";
+            this._LabelValue.Size = new System.Drawing.Size(69, 16);
+            this._LabelValue.TabIndex = 1;
+            this._LabelValue.Text = "Value";
+            this._LabelValue.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // _LabelMin
+            // 
+            this._LabelMin.AutoEllipsis = true;
+            this._LabelMin.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+            this._LabelMin.Location = new System.Drawing.Point(3, 21);
+            this._LabelMin.Name = "_LabelMin";
+            this._LabelMin.Size = new System.Drawing.Size(50, 16);
+            this._LabelMin.TabIndex = 2;
+            this._LabelMin.Text = "Min";
+            this._LabelMin.TextAlign = System.Drawing.ContentAlignment.BottomLeft;
+            // 
+            // _LabelMax
+            // 
+            this._LabelMax.AutoEllipsis = true;
+            this._LabelMax.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+            this._LabelMax.Location = new System.Drawing.Point(134, 21);
+            this._LabelMax.Name = "_LabelMax";
+            this._LabelMax.Size = new System.Drawing.Size(52, 16);
+            this._LabelMax.TabIndex = 3;
+            this._LabelMax.Text = "Max";
+            this._LabelMax.TextAlign = System.Drawing.ContentAlignment.BottomRight;
+            // 
+            // RangeValueDropDown
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.Controls.Add(this._LabelMax);
+            this.Controls.Add(this._LabelMin);
+            this.Controls.Add(this._LabelValue);
+            this.Controls.Add(this._TrackBar);
+            this.Name = "RangeValueDropDown";
+            this.Size = new System.Drawing.Size(186, 40);
+            ((System.ComponentModel.ISupportInitialize)(this._TrackBar)).EndInit();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.TrackBar _TrackBar;
+        private System.Windows.Forms.Label _LabelValue;
+        private System.Windows.Forms.Label _LabelMin;
+        private System.Windows.Forms.Label _LabelMax;
+
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/RangeValueDropDown.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/RangeValueDropDown.cs
new file mode 100644
index 00000000..965e0eb8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/RangeValueDropDown.cs	
@@ -0,0 +1,160 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Windows.Forms;
+using System.Windows.Forms.Design;
+
+namespace DevComponents.Charts.Design
+{
+    [ToolboxItem(false)]
+    public partial class RangeValueDropDown : UserControl
+    {
+        #region Private variables
+
+        private double _Value;
+        private bool _EscapePressed;
+
+        private IWindowsFormsEditorService _EditorService;
+        private ITypeDescriptorContext _Context;
+
+        #endregion
+
+        public RangeValueDropDown(double value, double minimum, double maximum,
+            IWindowsFormsEditorService editorService, ITypeDescriptorContext context)
+        {
+            InitializeComponent();
+
+            _EditorService = editorService;
+            _Context = context;
+
+            if (double.IsNaN(value) == true)
+                value = 0;
+
+            if (value < minimum)
+            {
+                if ((minimum * 1000 > Int16.MinValue) && (minimum * 1000 < Int16.MaxValue))
+                    minimum = value;
+            }
+
+            if (value > maximum)
+            {
+                if ((maximum * 1000 > Int16.MinValue) && (maximum * 1000 < Int16.MaxValue))
+                    maximum = value;
+            }
+
+            _TrackBar.Minimum = (int)(minimum * 1000);
+            _TrackBar.Maximum = (int)(maximum * 1000);
+
+            _TrackBar.SmallChange = _TrackBar.Maximum / 100;
+            _TrackBar.LargeChange = _TrackBar.Maximum / 10;
+            _TrackBar.TickFrequency = _TrackBar.LargeChange;
+
+            _TrackBar.Value = (int)(value * 1000);
+
+            _LabelMin.Text = String.Format("{0:f}", minimum);
+            _LabelMax.Text = String.Format("{0:f}", maximum);
+
+            Value = value;
+        }
+
+        public RangeValueDropDown()
+        {
+            InitializeComponent();
+        }
+
+        #region DefaultSize
+
+        protected override Size DefaultSize
+        {
+            get { return new Size(186, 40); }
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region EditorService
+
+        public IWindowsFormsEditorService EditorService
+        {
+            get { return (_EditorService); }
+            set { _EditorService = value; }
+        }
+
+        #endregion
+
+        #region EscapePressed
+
+        public bool EscapePressed
+        {
+            get { return (_EscapePressed); }
+            set { _EscapePressed = value; }
+        }
+
+        #endregion
+
+        #region Value
+
+        public double Value
+        {
+            get { return (_Value); }
+
+            set
+            {
+                _Value = value;
+
+                _LabelValue.Text = String.Format("{0:f3}", value);
+                _LabelValue.Update();
+
+                object cvalue = Convert.ChangeType(value, _Context.PropertyDescriptor.PropertyType);
+
+                _Context.OnComponentChanging();
+                _Context.PropertyDescriptor.SetValue(_Context.Instance, cvalue);
+                _Context.OnComponentChanged();
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region OnResize
+
+        protected override void OnResize(EventArgs e)
+        {
+            base.OnResize(e);
+
+            int width = _TrackBar.Width;
+
+            int dx = width / 3;
+
+            _LabelMin.Width = dx;
+            _LabelMax.Width = dx;
+            _LabelValue.Width = dx;
+
+            _LabelValue.Location = new Point((width - dx) / 2, _LabelValue.Location.Y);
+            _LabelMax.Location = new Point(width - dx, _LabelMax.Location.Y);
+        }
+
+        #endregion
+
+        #region _TrackBar_ValueChanged
+
+        private void TrackBar_ValueChanged(object sender, EventArgs e)
+        {
+            Value = ((float)_TrackBar.Value) / 1000;
+        }
+
+        #endregion
+
+        #region _TrackBar_PreviewKeyDown
+
+        private void _TrackBar_PreviewKeyDown(object sender, PreviewKeyDownEventArgs e)
+        {
+            if (e.KeyCode == Keys.Escape)
+                _EscapePressed = true;
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/RangeValueDropDown.resx b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/RangeValueDropDown.resx
new file mode 100644
index 00000000..19dc0dd8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/RangeValueDropDown.resx	
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/RangeValueEditor.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/RangeValueEditor.cs
new file mode 100644
index 00000000..03be54b9
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/RangeValueEditor.cs	
@@ -0,0 +1,225 @@
+using System;
+using System.ComponentModel;
+using System.Drawing.Design;
+using System.Windows.Forms.Design;
+
+namespace DevComponents.Charts.Design
+{
+    public class RangeValueEditor : UITypeEditor
+    {
+        #region Private variables
+
+        private const double MinValue = 0;
+        private const double MaxValue = 1;
+
+        #endregion
+
+        #region Public properties
+
+        public virtual double Minimum
+        {
+            get { return (MinValue); }
+        }
+
+        public virtual double Maximum
+        {
+            get { return (MaxValue); }
+        }
+
+        #endregion
+
+        #region GetEditStyle
+
+        public override UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext context)
+        {
+            return (UITypeEditorEditStyle.DropDown);
+        }
+
+        #endregion
+
+        #region GetPaintValueSupported
+
+        public override bool GetPaintValueSupported(ITypeDescriptorContext context)
+        {
+            return (false);
+        }
+
+        #endregion
+
+        #region EditValue
+
+        public override object EditValue(
+            ITypeDescriptorContext context, IServiceProvider provider, object value)
+        {
+            if (provider != null)
+            {
+                IWindowsFormsEditorService editorService =
+                    provider.GetService(typeof(IWindowsFormsEditorService)) as IWindowsFormsEditorService;
+
+                if (editorService != null)
+                {
+                    double dvalue = Convert.ToDouble(value);
+
+                    RangeValueDropDown rv = new
+                        RangeValueDropDown(dvalue, Minimum, Maximum, editorService, context);
+
+                    rv.EscapePressed = false;
+
+                    editorService.DropDownControl(rv);
+
+                    if (rv.EscapePressed == true)
+                    {
+                        context.PropertyDescriptor.SetValue(context.Instance, value);
+                    }
+                    else
+                    {
+                        Type type = value.GetType();
+
+                        value = Convert.ChangeType(rv.Value, type);
+
+                        return (value);
+                    }
+                }
+            }
+
+            return (base.EditValue(context, provider, value));
+        }
+
+        #endregion
+    }
+
+    #region AngleRangeValueEditor
+
+    public class AngleRangeValueEditor : RangeValueEditor
+    {
+        public override double Maximum
+        {
+            get { return (360); }
+        }
+    }
+
+    #endregion
+
+    #region AngleOffsetRangeValueEditor
+
+    public class AngleOffsetRangeValueEditor : RangeValueEditor
+    {
+        public override double Maximum
+        {
+            get { return (360); }
+        }
+
+        public override double Minimum
+        {
+            get { return (-360); }
+        }
+    }
+
+    #endregion
+
+    #region AngleMarginRangeValueEditor
+
+    public class AngleMarginRangeValueEditor : RangeValueEditor
+    {
+        public override double Maximum
+        {
+            get { return (10); }
+        }
+    }
+
+    #endregion
+
+    #region MarginRangeValueEditor
+
+    public class MarginRangeValueEditor : RangeValueEditor
+    {
+        public override double Maximum
+        {
+            get { return (50); }
+        }
+    }
+
+    #endregion
+
+    #region RadiusRangeValueEditor
+
+    public class RadiusRangeValueEditor : RangeValueEditor
+    {        
+        public override double Maximum
+        {
+            get { return (1); }
+        }
+    }
+
+    #endregion
+
+    #region WidthRangeValueEditor
+
+    public class WidthRangeValueEditor : RangeValueEditor
+    {
+        public override double Maximum
+        {
+            get { return (.3); }
+        }
+    }
+
+    #endregion
+
+    #region OffsetRangeValueEditor
+
+    public class OffsetRangeValueEditor : RangeValueEditor
+    {
+        public override double Maximum
+        {
+            get { return (.3); }
+        }
+
+        public override double Minimum
+        {
+            get { return (-.3); }
+        }
+    }
+
+    #endregion
+
+    #region OffsetRangeValueEditor
+
+    public class OffsetPosRangeValueEditor : RangeValueEditor
+    {
+        public override double Maximum
+        {
+            get { return (.9); }
+        }
+
+        public override double Minimum
+        {
+            get { return (0); }
+        }
+    }
+
+    #endregion
+
+    #region WidthMaxRangeValueEditor
+
+    public class WidthMaxRangeValueEditor : RangeValueEditor
+    {
+        public override double Maximum
+        {
+            get { return (1); }
+        }
+    }
+
+    #endregion
+
+    #region HalfRadiusRangeValueEditor
+
+    public class HalfRadiusRangeValueEditor : RangeValueEditor
+    {
+        public override double Maximum
+        {
+            get { return (.5); }
+        }
+    }
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/Resources/Copy.png b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/Resources/Copy.png
new file mode 100644
index 00000000..195dc6d6
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/Resources/Copy.png differ
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/SeriesPointCollectionEditor.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/SeriesPointCollectionEditor.cs
new file mode 100644
index 00000000..c22e5069
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/SeriesPointCollectionEditor.cs	
@@ -0,0 +1,105 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using DevComponents.DotNetBar;
+using DevComponents.DotNetBar.Charts;
+
+namespace DevComponents.Charts.Design
+{
+    public class SeriesPointCollectionEditor : BaseCollectionEditor
+    {
+        #region Private variables
+
+        private ChartSeries _ChartSeries;
+        private SeriesPointCollection _SavedCollection;
+
+        #endregion
+
+        public SeriesPointCollectionEditor(Type type)
+            : base(type)
+        {
+        }
+
+        #region EditValue
+
+        public override object EditValue(
+            ITypeDescriptorContext context, IServiceProvider provider, object value)
+        {
+            _ChartSeries = context.Instance as ChartSeries;
+
+            SeriesPointCollection spc = (SeriesPointCollection)value;
+
+            _SavedCollection = new SeriesPointCollection();
+
+            foreach (SeriesPoint sp in spc)
+                _SavedCollection.Add(sp.Copy());
+
+            try
+            {
+                object evalue = base.EditValue(context, provider, value);
+
+                if (EditCancelled == true)
+                    return (_SavedCollection);
+
+                return (evalue);
+            }
+            catch
+            {
+                return (_SavedCollection);
+            }
+        }
+
+        #endregion
+
+        #region CreateInstance
+
+        protected override object CreateInstance(Type itemType)
+        {
+            return (base.CreateInstance(itemType));
+        }
+
+        #endregion
+
+        #region CopyButton_Click
+
+        protected override void CopyButton_Click(object sender, EventArgs e)
+        {
+            SeriesPoint item = ChartItem as SeriesPoint;
+
+            if (item != null)
+            {
+                if (AddButton != null)
+                {
+                    ChartControlDesigner ccd = GetDesigner(_ChartSeries.ChartControl);
+
+                    ccd.InCopyItem = true;
+
+                    try
+                    {
+                        AddButton.PerformClick();
+
+                        SeriesPointCollection spc = _ChartSeries.SeriesPoints;
+                        SeriesPoint clone = spc[spc.Count - 1];
+
+                        item.CopyTo(clone);
+                    }
+                    finally
+                    {
+                        ccd.InCopyItem = false;
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region CreateCollectionItemType
+
+        protected override Type CreateCollectionItemType()
+        {
+            return typeof(SeriesPoint);
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/SeriesPointValueDropDown.Designer.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/SeriesPointValueDropDown.Designer.cs
new file mode 100644
index 00000000..07d8ba24
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/SeriesPointValueDropDown.Designer.cs	
@@ -0,0 +1,88 @@
+namespace DevComponents.Charts.Design
+{
+    partial class SeriesPointValueDropDown
+    {
+        /// <summary> 
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #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.btnCancel = new DevComponents.DotNetBar.ButtonX();
+            this.btnOk = new DevComponents.DotNetBar.ButtonX();
+            this.SuspendLayout();
+            // 
+            // btnCancel
+            // 
+            this.btnCancel.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+            this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnCancel.ColorTable = DevComponents.DotNetBar.eButtonColor.Blue;
+            this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+            this.btnCancel.Location = new System.Drawing.Point(48, 29);
+            this.btnCancel.Name = "btnCancel";
+            this.btnCancel.Size = new System.Drawing.Size(15, 15);
+            this.btnCancel.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.btnCancel.Symbol = "";
+            this.btnCancel.SymbolColor = System.Drawing.Color.DarkRed;
+            this.btnCancel.SymbolSize = 10F;
+            this.btnCancel.TabIndex = 3;
+            this.btnCancel.TextAlignment = DevComponents.DotNetBar.eButtonTextAlignment.Left;
+            this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
+            // 
+            // btnOk
+            // 
+            this.btnOk.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+            this.btnOk.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnOk.ColorTable = DevComponents.DotNetBar.eButtonColor.Blue;
+            this.btnOk.DialogResult = System.Windows.Forms.DialogResult.OK;
+            this.btnOk.Location = new System.Drawing.Point(26, 29);
+            this.btnOk.Name = "btnOk";
+            this.btnOk.Size = new System.Drawing.Size(19, 15);
+            this.btnOk.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.btnOk.Symbol = "";
+            this.btnOk.SymbolColor = System.Drawing.SystemColors.ControlText;
+            this.btnOk.SymbolSize = 10F;
+            this.btnOk.TabIndex = 2;
+            this.btnOk.TextAlignment = DevComponents.DotNetBar.eButtonTextAlignment.Left;
+            this.btnOk.Click += new System.EventHandler(this.btnOk_Click);
+            // 
+            // SeriesPointValueDropDown
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.Controls.Add(this.btnOk);
+            this.Controls.Add(this.btnCancel);
+            this.MinimumSize = new System.Drawing.Size(45, 45);
+            this.Name = "SeriesPointValueDropDown";
+            this.Size = new System.Drawing.Size(65, 45);
+            this.PreviewKeyDown += new System.Windows.Forms.PreviewKeyDownEventHandler(this.MyPreviewKeyDown);
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private DotNetBar.ButtonX btnCancel;
+        private DotNetBar.ButtonX btnOk;
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/SeriesPointValueDropDown.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/SeriesPointValueDropDown.cs
new file mode 100644
index 00000000..2ba4f7cc
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/SeriesPointValueDropDown.cs	
@@ -0,0 +1,330 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Windows.Forms;
+using System.Windows.Forms.Design;
+
+namespace DevComponents.Charts.Design
+{
+    [ToolboxItem(false)]
+    public partial class SeriesPointValueDropDown : UserControl
+    {
+        #region Private variables
+
+        private object _Value;
+        private bool _EscapePressed;
+
+        private IWindowsFormsEditorService _EditorService;
+        private ITypeDescriptorContext _Context;
+
+        private LabeledTextBoxX[] _TextBoxes;
+
+        #endregion
+
+        public SeriesPointValueDropDown()
+        {
+            InitializeComponent();
+        }
+
+        public SeriesPointValueDropDown(object value,
+            IWindowsFormsEditorService editorService, ITypeDescriptorContext context)
+        {
+            if (value == null)
+                value = new object[0];
+
+            _Value = value;
+
+            _EditorService = editorService;
+            _Context = context;
+
+            BackColor = SystemColors.Control;
+
+            InitializeComponent();
+
+            LayoutMultipleEntry();
+
+            Disposed += SeriesPointValueDropDown_Disposed;
+        }
+
+        #region LayoutMultipleEntry
+
+        private void LayoutMultipleEntry()
+        {
+            if (_Value is object[])
+            {
+                object[] values = (object[])_Value;
+
+                _TextBoxes = GetTextBoxArray(values);
+
+                PositionBtns();
+            }
+        }
+
+        #region GetTextBoxArray
+
+        private LabeledTextBoxX[] GetTextBoxArray(object[] values)
+        {
+            LabeledTextBoxX[] tba = new LabeledTextBoxX[Math.Max(values.Length + 1, 3)];
+
+            for (int i = 0; i < tba.Length; i++)
+            {
+                object value = (i < values.Length) ? values[i] : null;
+
+                tba[i] = GetValueTextBox(value, i);
+            }
+
+            return (tba);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetValueTextBox
+
+        private LabeledTextBoxX GetValueTextBox(object value, int i)
+        {
+            LabeledTextBoxX ltb = new LabeledTextBoxX();
+
+            ltb.EscapeKeyPressed += ltb_EscapeKeyPressed;
+
+            ltb.lbIndex.Text = i.ToString();
+            ltb.tbValue.Tag = (value is string) ? "\"" + value + "\"" : value;
+            ltb.tbValue.Text = FormatToStringValue(value);
+
+            ltb.Location = new Point(0, i * (ltb.Height + 2) + 2);
+            ltb.Width = Width + 6;
+
+            ltb.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+
+            Controls.Add(ltb);
+
+            return (ltb);
+        }
+
+        #region FormatToStringValue
+
+        private string FormatToStringValue(object value)
+        {
+            if (value == null)
+                return ("");
+
+            if (value is string)
+                return ("\"" + value + "\"");
+
+            if (value is int)
+                return (value.ToString());
+
+            if (value is DateTime)
+                return (value.ToString());
+
+            return (String.Format("{0:0.0###############}", value));
+        }
+
+        #endregion
+
+        #region ltb_EscapeKeyPressed
+
+        void ltb_EscapeKeyPressed(object sender, EventArgs e)
+        {
+            btnCancel.PerformClick();
+        }
+
+        #endregion
+
+        #endregion
+
+        #region PositionBtns
+
+        private void PositionBtns()
+        {
+            int y = 2;
+
+            foreach (LabeledTextBoxX ltb in _TextBoxes)
+                y += (ltb.Height + 2);
+
+            Height = y + btnOk.Height;
+
+            int x = Width - btnCancel.Width;
+
+            btnCancel.Location = new Point(x - 3 , y);
+            btnOk.Location = new Point(x - 3 - btnOk.Width, y);
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region Value
+
+        public object Value
+        {
+            get
+            {
+                if (EscapePressed == true)
+                    return (_Value);
+
+                return (GetTextBoxValues());
+            }
+        }
+
+        #region GetTextBoxValues
+
+        private object[] GetTextBoxValues()
+        {
+            object[] values = new object[_TextBoxes.Length];
+
+            int n = 0;
+
+            for (int i = 0; i < _TextBoxes.Length; i++)
+            {
+                values[i] = GetTextBoxValue(i);
+
+                if (values[i] != null)
+                    n++;
+            }
+
+            if (n > 0)
+            {
+                object[] rvalues = new object[n];
+
+                n = 0;
+
+                for (int i = 0; i < values.Length; i++)
+                {
+                    if (values[i] != null)
+                        rvalues[n++] = values[i];
+                }
+
+                return (rvalues);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetTextBoxValue
+
+        private object GetTextBoxValue(int n)
+        {
+            LabeledTextBoxX ltb = _TextBoxes[n];
+
+            if (string.IsNullOrEmpty(ltb.tbValue.Text) == true)
+                return (null);
+
+            if (ltb.tbValue.Tag != null)
+            {
+                if (ltb.tbValue.Text.Equals(ltb.tbValue.Tag.ToString()) == true)
+                    return (ltb.tbValue.Tag);
+            }
+
+            return (GetConvertedValue(ltb.tbValue.Text));
+        }
+
+        #endregion
+
+        #region GetConvertedValue
+
+        private object GetConvertedValue(string text)
+        {
+            string s = text.Trim();
+            
+            if (s.StartsWith("\"") && s.EndsWith("\""))
+                return (s.Substring(1, s.Length - 2));
+
+            if (s.Contains(".") == false)
+            {
+                int iResult;
+
+                if (int.TryParse(text, out iResult) == true)
+                    return (iResult);
+            }
+
+            double dblResult;
+
+            if (double.TryParse(text, out dblResult) == true)
+                return (dblResult);
+
+            DateTime dtResult;
+
+            if (DateTime.TryParse(text, out dtResult) == true)
+                return (dtResult);
+
+            return (text);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region EditorService
+
+        public IWindowsFormsEditorService EditorService
+        {
+            get { return (_EditorService); }
+            set { _EditorService = value; }
+        }
+
+        #endregion
+
+        #region EscapePressed
+
+        public bool EscapePressed
+        {
+            get { return (_EscapePressed); }
+            set { _EscapePressed = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region MyPreviewKeyDown
+
+        private void MyPreviewKeyDown(object sender, PreviewKeyDownEventArgs e)
+        {
+            if (e.KeyCode == Keys.Escape)
+                _EscapePressed = true;
+        }
+
+        #endregion
+
+        #region btnOk_Click
+
+        private void btnOk_Click(object sender, EventArgs e)
+        {
+            _EditorService.CloseDropDown();
+        }
+
+        #endregion
+
+        #region btnCancel_Click
+
+        private void btnCancel_Click(object sender, EventArgs e)
+        {
+            _EscapePressed = true;
+
+            _EditorService.CloseDropDown();
+        }
+
+        #endregion
+
+        #region SeriesPointValueDropDown_Disposed
+
+        void SeriesPointValueDropDown_Disposed(object sender, EventArgs e)
+        {
+            for (int i = 0; i < _TextBoxes.Length; i++)
+            {
+                LabeledTextBoxX ltb = _TextBoxes[i];
+
+                ltb.EscapeKeyPressed -= ltb_EscapeKeyPressed;
+                ltb.Dispose();
+
+                _TextBoxes[i] = null;
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/SeriesPointValueDropDown.resx b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/SeriesPointValueDropDown.resx
new file mode 100644
index 00000000..19dc0dd8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/SeriesPointValueDropDown.resx	
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/SeriesPointValueEditor.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/SeriesPointValueEditor.cs
new file mode 100644
index 00000000..f49387fb
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/SeriesPointValueEditor.cs	
@@ -0,0 +1,59 @@
+using System;
+using System.ComponentModel;
+using System.Drawing.Design;
+using System.Windows.Forms.Design;
+using DevComponents.DotNetBar.Charts;
+
+namespace DevComponents.Charts.Design
+{
+    public class SeriesPointValueEditor : UITypeEditor
+    {
+        #region GetEditStyle
+
+        public override UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext context)
+        {
+            return (UITypeEditorEditStyle.DropDown);
+        }
+
+        #endregion
+
+        #region GetPaintValueSupported
+
+        public override bool GetPaintValueSupported(ITypeDescriptorContext context)
+        {
+            return (false);
+        }
+
+        #endregion
+
+        #region EditValue
+
+        public override object EditValue(
+            ITypeDescriptorContext context, IServiceProvider provider, object value)
+        {
+            IWindowsFormsEditorService editorService =
+                provider.GetService(typeof(IWindowsFormsEditorService)) as IWindowsFormsEditorService;
+
+            if (editorService != null)
+            {
+                SeriesPointValueDropDown fs = new
+                    SeriesPointValueDropDown(value, editorService, context);
+
+                fs.EscapePressed = false;
+
+                editorService.DropDownControl(fs);
+
+                if (fs.EscapePressed == true)
+                    return (value);
+
+                context.PropertyDescriptor.SetValue(context.Instance, fs.Value);
+
+                return (fs.Value);
+            }
+
+            return (base.EditValue(context, provider, value));
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/SizeDropDown.Designer.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/SizeDropDown.Designer.cs
new file mode 100644
index 00000000..e4659acc
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/SizeDropDown.Designer.cs	
@@ -0,0 +1,48 @@
+namespace DevComponents.Charts.Design
+{
+    partial class SizeDropDown
+    {
+        /// <summary> 
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #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.SuspendLayout();
+            // 
+            // PivotPointDropDown
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.Name = "PivotPointDropDown";
+            this.Size = new System.Drawing.Size(99, 110);
+            this.PreviewKeyDown += new System.Windows.Forms.PreviewKeyDownEventHandler(this.PivotPointDropDown_PreviewKeyDown);
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/SizeDropDown.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/SizeDropDown.cs
new file mode 100644
index 00000000..5f744368
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/SizeDropDown.cs	
@@ -0,0 +1,242 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Windows.Forms;
+using System.Windows.Forms.Design;
+
+namespace DevComponents.Charts.Design
+{
+    [ToolboxItem(false)]
+    public partial class SizeDropDown : UserControl
+    {
+        #region Constants
+
+        private const int DotRadius = 4;
+
+        #endregion
+
+        #region Private variables
+
+        private SizeF _Size;
+        private Rectangle _DotBounds;
+        private Rectangle _FrameBounds;
+        private Rectangle _DotRect;
+
+        private bool _InFrame;
+        private bool _InSizeDot;
+        private bool _PivotMoving;
+
+        private bool _EscapePressed;
+
+        private IWindowsFormsEditorService _EditorService;
+        private ITypeDescriptorContext _Context;
+
+        #endregion
+
+        public SizeDropDown(SizeF value,
+            IWindowsFormsEditorService editorService, ITypeDescriptorContext context)
+        {
+            Initialize();
+
+            _EditorService = editorService;
+            _Context = context;
+
+            _Size = value;
+        }
+
+        public SizeDropDown()
+        {
+            Initialize();
+        }
+
+        #region Initialize
+
+        private void Initialize()
+        {
+            InitializeComponent();
+
+            SetStyle(ControlStyles.UserPaint, true);
+            SetStyle(ControlStyles.AllPaintingInWmPaint, true);
+            SetStyle(ControlStyles.OptimizedDoubleBuffer, true);
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region EditorService
+
+        public IWindowsFormsEditorService EditorService
+        {
+            get { return (_EditorService); }
+            set { _EditorService = value; }
+        }
+
+        #endregion
+
+        #region EscapePressed
+
+        public bool EscapePressed
+        {
+            get { return (_EscapePressed); }
+            set { _EscapePressed = value; }
+        }
+
+        #endregion
+
+        #region PivotPoint
+
+        public SizeF Syze
+        {
+            get { return (_Size); }
+
+            set
+            {
+                _Size = value;
+
+                RecalcLayout();
+                Invalidate();
+
+                _Context.OnComponentChanging();
+                _Context.PropertyDescriptor.SetValue(_Context.Instance, value);
+                _Context.OnComponentChanged();
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RecalcLayout
+
+        private void RecalcLayout()
+        {
+            int n = Math.Min(Bounds.Width - 4, Bounds.Height - 4);
+
+            _FrameBounds = new Rectangle(2, 2, n, n);
+            _FrameBounds.X = (Bounds.Width - n) / 2;
+            _FrameBounds.Y = (Bounds.Height - n) / 2;
+
+            int x = _FrameBounds.X + (int)(_Size.Width * _FrameBounds.Width);
+            int y = _FrameBounds.Y + (int)(_Size.Height * _FrameBounds.Height);
+
+            _DotBounds = new Rectangle(x - DotRadius, y - DotRadius,
+                DotRadius * 2, DotRadius * 2);
+
+            _DotRect = new Rectangle(0, 0, x, y);
+        }
+
+        #endregion
+
+        #region Paint support
+
+        #region OnPaint
+
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            base.OnPaint(e);
+
+            Graphics g = e.Graphics;
+
+            g.SmoothingMode = SmoothingMode.AntiAlias;
+
+            RecalcLayout();
+
+            g.DrawRectangle(Pens.Red, _DotRect);
+
+            DrawPivotDot(g);
+        }
+
+        #endregion
+
+        #region DrawPivotDot
+
+        private void DrawPivotDot(Graphics g)
+        {
+            g.FillEllipse(Brushes.SkyBlue, _DotBounds);
+            g.DrawEllipse(Pens.DimGray, _DotBounds);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Mouse support
+
+        #region OnMouseMove
+
+        protected override void OnMouseMove(MouseEventArgs e)
+        {
+            base.OnMouseMove(e);
+
+            _InFrame = (_FrameBounds.Contains(e.Location) == true);
+
+            if (_PivotMoving == true && _InFrame == true)
+            {
+                Syze = new SizeF(
+                    (float)(e.X - _FrameBounds.X) / _FrameBounds.Width,
+                    (float)(e.Y - _FrameBounds.Y) / _FrameBounds.Height);
+            }
+
+            _InSizeDot = (_DotBounds.Contains(e.Location) == true);
+
+            Cursor = (_InSizeDot == true) ? Cursors.Hand : Cursors.Default;
+        }
+
+        #endregion
+
+        #region OnMouseLeave
+
+        protected override void OnMouseLeave(EventArgs e)
+        {
+            base.OnMouseLeave(e);
+
+            _InFrame = false;
+            _InSizeDot = false;
+        }
+
+        #endregion
+
+        #region OnMouseDown
+
+        protected override void OnMouseDown(MouseEventArgs e)
+        {
+            base.OnMouseDown(e);
+
+            if (e.Button == MouseButtons.Left)
+            {
+                if (_InSizeDot == true)
+                    _PivotMoving = true;
+            }
+        }
+
+        #endregion
+
+        #region OnMouseUp
+
+        protected override void OnMouseUp(MouseEventArgs e)
+        {
+            base.OnMouseUp(e);
+
+            _PivotMoving = false;
+
+            _InFrame = (_FrameBounds.Contains(e.Location) == true);
+            _InSizeDot = (_DotBounds.Contains(e.Location) == true);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region PivotPointDropDown_PreviewKeyDown
+
+        private void PivotPointDropDown_PreviewKeyDown(object sender, PreviewKeyDownEventArgs e)
+        {
+            if (e.KeyCode == Keys.Escape)
+                _EscapePressed = true;
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/SizeDropDown.resx b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/SizeDropDown.resx
new file mode 100644
index 00000000..19dc0dd8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/SizeDropDown.resx	
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/SizeEditor.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/SizeEditor.cs
new file mode 100644
index 00000000..5d93fb54
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts.Design/SizeEditor.cs	
@@ -0,0 +1,59 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Windows.Forms.Design;
+
+namespace DevComponents.Charts.Design
+{
+    public class SizeEditor : UITypeEditor
+    {
+        #region GetEditStyle
+
+        public override UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext context)
+        {
+            return (UITypeEditorEditStyle.DropDown);
+        }
+
+        #endregion
+
+        #region GetPaintValueSupported
+
+        public override bool GetPaintValueSupported(ITypeDescriptorContext context)
+        {
+            return (false);
+        }
+
+        #endregion
+
+        #region EditValue
+
+        public override object EditValue(
+            ITypeDescriptorContext context, IServiceProvider provider, object value)
+        {
+            if (provider != null)
+            {
+                IWindowsFormsEditorService editorService =
+                    provider.GetService(typeof(IWindowsFormsEditorService)) as IWindowsFormsEditorService;
+
+                if (editorService != null)
+                {
+                    SizeDropDown pv = new SizeDropDown((SizeF)value, editorService, context);
+
+                    pv.EscapePressed = false;
+
+                    editorService.DropDownControl(pv);
+
+                    if (pv.EscapePressed == true)
+                        context.PropertyDescriptor.SetValue(context.Instance, value);
+                    else
+                        return (pv.Syze);
+                }
+            }
+
+            return (base.EditValue(context, provider, value));
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl.cs
new file mode 100644
index 00000000..a28f961c
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl.cs	
@@ -0,0 +1,8248 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Drawing.Text;
+using System.Runtime.InteropServices;
+using System.Windows.Forms;
+using DevComponents.Charts.TextMarkup;
+using DevComponents.DotNetBar.Charts.Style;
+
+namespace DevComponents.DotNetBar.Charts
+{
+    /// <summary>
+    /// Represents a Chart Control
+    /// </summary>
+    [ToolboxItem(true), ToolboxBitmap(typeof(ChartControl), "ChartControl.ico")]
+    [Designer("DevComponents.Charts.Design.ChartControlDesigner, DevComponents.Charts.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+    public class ChartControl : Control, INotifyPropertyChanged, IMessageFilter
+    {
+        #region Events
+
+        #region DataBindingStart
+
+        /// <summary>
+        /// Occurs when the Chart is about to start a binding operation
+        /// </summary>
+        [Description("Occurs when the Chart is about to start a binding operation.")]
+        public event EventHandler<ChartDataBindingStartEventArgs> DataBindingStart;
+
+        #endregion
+
+        #region ChartDataBindingComplete
+
+        /// <summary>
+        /// Occurs when a Chart data binding operation is completed
+        /// </summary>
+        [Description("Occurs when a Chart data binding operation is completed.")]
+        public event EventHandler<ChartDataBindingCompleteEventArgs> ChartDataBindingComplete;
+
+        #endregion
+
+        #region ChartMatrixResized
+
+        /// <summary>
+        /// Occurs when a ChartMatrix has been resized.
+        /// </summary>
+        [Description("Occurs when a ChartMatrix has been resized.")]
+        public event EventHandler<ChartMatrixResizedEventArgs> ChartMatrixResized;
+
+        #endregion
+
+        #region CompareElements
+
+        /// <summary>
+        /// Occurs when the chart needs to compare 1 element with another
+        /// </summary>
+        [Description("Occurs when the chart needs to compare 1 element with another.")]
+        public event EventHandler<ChartCompareElementsEventArgs> CompareElements;
+
+        #endregion
+
+        #region EmptyTextMarkupLinkClick
+
+        /// <summary>
+        /// Occurs when a ChartContainer's EmptyText MarkupLink has been clicked
+        /// </summary>
+        [Description("Occurs when a ChartContainer's EmptyText MarkupLink has been clicked.")]
+        public event EventHandler<ChartEmptyTextMarkupLinkClickEventArgs> EmptyTextMarkupLinkClick;
+
+        #endregion
+
+        #region GetPieCenterLabel
+
+        /// <summary>
+        /// Occurs when a Pie Center label is needed
+        /// </summary>
+        [Description("Occurs when a Pie Center label is needed.")]
+        public event EventHandler<GetPieCenterLabelEventArgs> GetPieCenterLabel;
+
+        #endregion
+
+        #region GetCrosshairAxisLabel
+
+        /// <summary>
+        /// Occurs when a Crosshair Axis label is needed
+        /// </summary>
+        [Description("Occurs when a Crosshair Axis label is needed.")]
+        public event EventHandler<GetCrosshairAxisLabelEventArgs> GetCrosshairAxisLabel;
+
+        #endregion
+
+        #region GetCrosshairLabelHeader
+
+        /// <summary>
+        /// Occurs when a CrosshairLabel header is needed
+        /// </summary>
+        [Description("Occurs when a CrosshairLabel header is needed.")]
+        public event EventHandler<GetCrosshairLabelHeaderEventArgs> GetCrosshairLabelHeader;
+
+        #endregion
+
+        #region GetCrosshairLabelItem
+
+        /// <summary>
+        /// Occurs when a CrosshairLabel item (text) is needed
+        /// </summary>
+        [Description("Occurs when a CrosshairLabel item (text) is needed.")]
+        public event EventHandler<GetCrosshairLabelItemEventArgs> GetCrosshairLabelItem;
+
+        #endregion
+
+        #region GetSliceLabel
+
+        /// <summary>
+        /// Occurs when a Pie Slice label (text) is needed
+        /// </summary>
+        [Description("Occurs when a Pie Slice label (text) is needed.")]
+        public event EventHandler<GetSliceLabelEventArgs> GetSliceLabel;
+
+        #endregion
+
+        #region GetTickmarkLabel
+
+        /// <summary>
+        /// Occurs when a MajorTickmark label (text and color) is needed
+        /// </summary>
+        [Description("Occurs when a MajorTickmark label (text and color) is needed.")]
+        public event EventHandler<GetTickmarkLabelEventArgs> GetTickmarkLabel;
+
+        #endregion
+
+        #region GetToolTip
+
+        /// <summary>
+        /// Occurs when a Pie SeriesPoint ToolTip is needed
+        /// </summary>
+        [Description("Occurs when a Pie SeriesPoint ToolTip is needed.")]
+        public event EventHandler<GetToolTipEventArgs> GetToolTip;
+
+        #endregion
+
+        #region GetElementStyle
+
+        /// <summary>
+        /// Occurs when a ChartElement Style is needed.
+        /// </summary>
+        [Description("Occurs when a ChartElement Style is needed.")]
+        public event EventHandler<ChartGetElementStyleEventArgs> GetElementStyle;
+
+        #endregion
+
+        #region GetPieSeriesPointStyle
+
+        /// <summary>
+        /// Occurs when a PieSeriesPoint Style is needed.
+        /// </summary>
+        [Description("Occurs when a PieSeriesPoint Style is needed.")]
+        public event EventHandler<ChartGetPieSeriesPointStyleEventArgs> GetPieSeriesPointStyle;
+
+        #endregion
+
+        #region LayoutBoundsInvalid
+
+        /// <summary>
+        /// Occurs when layout bounds of the item is invalidated.
+        /// </summary>
+        public event EventHandler<EventArgs> LayoutBoundsInvalid;
+
+        #endregion
+
+        #region LegendItemCheckedChanged
+
+        /// <summary>
+        /// Occurs when a LegendItem checked state has changed
+        /// </summary>
+        [Description("Occurs when a LegendItem checked state has changed.")]
+        public event EventHandler<LegendItemCheckedChangedEventArgs> LegendItemCheckedChanged;
+
+        #endregion
+
+        #region ChartMouseClick
+
+        /// <summary>
+        /// Occurs when a single click has ocurred on a chart Pie element.
+        /// </summary>
+        [Description("Occurs when a single click has ocurred on a chart Pie element.")]
+        public event EventHandler<ChartMouseClickEventArgs> ChartMouseClick;
+
+        #endregion
+
+        #region ChartMouseDoubleClick
+
+        /// <summary>
+        /// Occurs when a double click has ocurred on a chart Pie element.
+        /// </summary>
+        [Description("Occurs when a double click has ocurred on a chart Pie element.")]
+        public event EventHandler<ChartMouseDoubleClickEventArgs> ChartMouseDoubleClick;
+
+        #endregion
+
+        #region PieCenterMarkupLinkClick
+
+        /// <summary>
+        /// Occurs after a pie center MarkupLink has been clicked.
+        /// </summary>
+        [Description("Occurs after a pie center MarkupLink has been clicked.")]
+        public event EventHandler<PieCenterMarkupLinkClickEventArgs> PieCenterMarkupLinkClick;
+
+        #endregion
+
+        #region PieDetachChanged
+
+        /// <summary>
+        /// Occurs after a pie element detach was performed by the user.
+        /// </summary>
+        [Description("Occurs after a pie element detach was performed by the user.")]
+        public event EventHandler<PieDetachChangedEventArgs> PieDetachChanged;
+
+        #endregion
+
+        #region PieExplodeChanged
+
+        /// <summary>
+        /// Occurs after a pie explode operation was performed by the user.
+        /// </summary>
+        [Description("Occurs after a pie explode operation was performed by the user.")]
+        public event EventHandler<PieExplodeChangedEventArgs> PieExplodeChanged;
+
+        #endregion
+
+        #region PieRingLevelChanged
+
+        /// <summary>
+        /// Occurs after a ring level change, as initiated
+        /// by the user, has taken place.
+        /// </summary>
+        [Description("Occurs after a ring level change, as initiated by the user, has taken place.")]
+        public event EventHandler<PieRingLevelChangedEventArgs> PieRingLevelChanged;
+
+        #endregion
+
+        #region PieRingLevelChanging
+
+        /// <summary>
+        /// Occurs after a user has initiated a ring level change, but
+        /// before the actual change has taken place.
+        /// </summary>
+        [Description("Occurs after a user has initiated a ring level change, but before the actual change has taken place.")]
+        public event EventHandler<PieRingLevelChangingEventArgs> PieRingLevelChanging;
+
+        #endregion
+
+        #region PieSelectionChanged
+
+        /// <summary>
+        /// Occurs after a pie selection was performed by the user.
+        /// </summary>
+        [Description("Occurs after a pie selection was performed by the user.")]
+        public event EventHandler<PieSelectionChangedEventArgs> PieSelectionChanged;
+
+        #endregion
+
+        #region PointLabelUpdate
+
+        /// <summary>
+        /// Occurs when a PointLabel update is needed.
+        /// </summary>
+        [Description("Occurs when a PointLabel update is needed.")]
+        public event EventHandler<ChartPointLabelUpdateEventArgs> PointLabelUpdate;
+
+        #endregion
+
+        #region PostLoadLegendData
+
+        /// <summary>
+        /// Occurs after a Legend's data has been loaded.
+        /// </summary>
+        [Description("Occurs after a Legend's data has been loaded.")]
+        public event EventHandler<PostLoadLegendDataEventArgs> PostLoadLegendData;
+
+        #endregion
+
+        #region PostRenderContentBackground
+
+        /// <summary>
+        /// Occurs after a chart content area has been rendered.
+        /// </summary>
+        [Description("Occurs after a chart content area has been rendered.")]
+        public event EventHandler<PostRenderContentBackgroundEventArgs> PostRenderContentBackground;
+
+        #endregion
+
+        #region PostRenderFrameBackground
+
+        /// <summary>
+        /// Occurs after a chart Frame area has been rendered.
+        /// </summary>
+        [Description("Occurs after a chart Frame area has been rendered.")]
+        public event EventHandler<PostRenderFrameBackgroundEventArgs> PostRenderFrameBackground;
+
+        #endregion
+
+        #region PostRenderPanelBackground
+
+        /// <summary>
+        /// Occurs after a chart Panel area has been rendered.
+        /// </summary>
+        [Description("Occurs after a chart Panel area has been rendered.")]
+        public event EventHandler<PostRenderPanelBackgroundEventArgs> PostRenderPanelBackground;
+
+        #endregion
+
+        #region PostRenderPieCenterBackground
+
+        /// <summary>
+        /// Occurs after the pie center background has been rendered.
+        /// </summary>
+        [Description("Occurs after the pie center background has been rendered.")]
+        public event EventHandler<PostRenderPieCenterBackgroundEventArgs> PostRenderPieCenterBackground;
+
+        #endregion
+
+        #region PostRenderPieCenterContent
+
+        /// <summary>
+        /// Occurs after the pie center content has been rendered.
+        /// </summary>
+        [Description("Occurs after the pie center content has been rendered.")]
+        public event EventHandler<PostRenderPieCenterContentEventArgs> PostRenderPieCenterContent;
+
+        #endregion
+
+        #region PostRenderPointConnector
+
+        /// <summary>
+        /// Occurs after a PointConnector has been rendered
+        /// </summary>
+        [Description("Occurs after a PointConnector has been rendered.")]
+        public event EventHandler<PostRenderPointConnectorEventArgs> PostRenderPointConnector;
+
+        #endregion
+
+        #region PostRenderPointLabel
+
+        /// <summary>
+        /// Occurs after a PointLabel has been rendered
+        /// </summary>
+        [Description("Occurs after a PointLabel has been rendered.")]
+        public event EventHandler<PostRenderPointLabelEventArgs> PostRenderPointLabel;
+
+        #endregion
+
+        #region PostRenderRadialGrid
+
+        /// <summary>
+        /// Occurs after a radial grid has been rendered
+        /// </summary>
+        [Description("Occurs after a radial grid has been rendered.")]
+        public event EventHandler<PostRenderRadialGridEventArgs> PostRenderRadialGrid;
+
+        #endregion
+
+        #region PostRenderSeriesBar
+
+        /// <summary>
+        /// Occurs after a series bar has been rendered.
+        /// </summary>
+        [Description("Occurs after a series bar has been rendered.")]
+        public event EventHandler<PostRenderSeriesBarEventArgs> PostRenderSeriesBar;
+
+        #endregion
+
+        #region PostRenderSeriesHiLoBar
+
+        /// <summary>
+        /// Occurs after a series HiLo Bar segment has been rendered.
+        /// </summary>
+        [Description("Occurs after a series HiLo Bar segment has been rendered.")]
+        public event EventHandler<PostRenderSeriesHiLoBarEventArgs> PostRenderSeriesHiLoBar;
+
+        #endregion
+
+        #region PostRenderSeriesPoint
+
+        /// <summary>
+        /// Occurs after a series point has been rendered
+        /// </summary>
+        [Description("Occurs after a series point has been rendered.")]
+        public event EventHandler<PostRenderSeriesPointEventArgs> PostRenderSeriesPoint;
+
+        #endregion
+
+        #region PostRenderSlice
+
+        /// <summary>
+        /// Occurs after the pie slice area has been rendered.
+        /// </summary>
+        [Description("Occurs after the pie slice area has been rendered.")]
+        public event EventHandler<PostRenderSliceEventArgs> PostRenderSlice;
+
+        #endregion
+
+        #region PreLoadLegendData
+
+        /// <summary>
+        /// Occurs prior to a Legend's data being loaded.
+        /// </summary>
+        [Description("Occurs prior to a Legend's data being loaded.")]
+        public event EventHandler<PreLoadLegendDataEventArgs> PreLoadLegendData;
+
+        #endregion
+
+        #region PreRenderContentBackground
+
+        /// <summary>
+        /// Occurs prior to the chart Content area being rendered.
+        /// </summary>
+        [Description("Occurs prior to the chart Content area being rendered.")]
+        public event EventHandler<PreRenderContentBackgroundEventArgs> PreRenderContentBackground;
+
+        #endregion
+
+        #region PreRenderFrameBackground
+
+        /// <summary>
+        /// Occurs prior to the chart Frame area being rendered.
+        /// </summary>
+        [Description("Occurs prior to the chart Frame area being rendered.")]
+        public event EventHandler<PreRenderFrameBackgroundEventArgs> PreRenderFrameBackground;
+
+        #endregion
+
+        #region PreRenderPanelBackground
+
+        /// <summary>
+        /// Occurs prior to the chart Panel area being rendered.
+        /// </summary>
+        [Description("Occurs prior to the chart Panel area being rendered.")]
+        public event EventHandler<PreRenderPanelBackgroundEventArgs> PreRenderPanelBackground;
+
+        #endregion
+
+        #region PreRenderPieCenterBackground
+
+        /// <summary>
+        /// Occurs prior to the pie center background being rendered.
+        /// </summary>
+        [Description("Occurs prior to the pie center background being rendered.")]
+        public event EventHandler<PreRenderPieCenterBackgroundEventArgs> PreRenderPieCenterBackground;
+
+        #endregion
+
+        #region PreRenderPieCenterContent
+
+        /// <summary>
+        /// Occurs prior to the pie center content being rendered.
+        /// </summary>
+        [Description("Occurs prior to the pie center content being rendered.")]
+        public event EventHandler<PreRenderPieCenterContentEventArgs> PreRenderPieCenterContent;
+
+        #endregion
+
+        #region PreRenderPointConnector
+
+        /// <summary>
+        /// Occurs prior to a PointConnector being rendered
+        /// </summary>
+        [Description("Occurs prior to a PointConnector being rendered.")]
+        public event EventHandler<PreRenderPointConnectorEventArgs> PreRenderPointConnector;
+
+        #endregion
+
+        #region PreRenderPointLabel
+
+        /// <summary>
+        /// Occurs prior to a PointLabel being rendered
+        /// </summary>
+        [Description("Occurs prior to a PointLabel being rendered.")]
+        public event EventHandler<PreRenderPointLabelEventArgs> PreRenderPointLabel;
+
+        #endregion
+
+        #region PreRenderRadialGrid
+
+        /// <summary>
+        /// Occurs prior to a radial (circular) grid being rendered.
+        /// </summary>
+        [Description("Occurs prior to a radial (circular) grid being rendered.")]
+        public event EventHandler<PreRenderRadialGridEventArgs> PreRenderRadialGrid;
+
+        #endregion
+
+        #region PreRenderSeriesBar
+
+        /// <summary>
+        /// Occurs prior to a series bar being rendered.
+        /// </summary>
+        [Description("Occurs prior to a series bar being rendered.")]
+        public event EventHandler<PreRenderSeriesBarEventArgs> PreRenderSeriesBar;
+
+        #endregion
+
+        #region PreRenderSeriesHiLoBar
+
+        /// <summary>
+        /// Occurs prior to a series HiLo Bar segment being rendered.
+        /// </summary>
+        [Description("Occurs prior to a series HiLo Bar segment being rendered.")]
+        public event EventHandler<PreRenderSeriesHiLoBarEventArgs> PreRenderSeriesHiLoBar;
+
+        #endregion
+
+        #region PreRenderSeriesPoint
+
+        /// <summary>
+        /// Occurs prior to a series point being rendered
+        /// </summary>
+        [Description("Occurs prior to a series point being rendered.")]
+        public event EventHandler<PreRenderSeriesPointEventArgs> PreRenderSeriesPoint;
+
+        #endregion
+
+        #region PreRenderSlice
+
+        /// <summary>
+        /// Occurs prior to the pie slice area being rendered.
+        /// </summary>
+        [Description("Occurs prior to the pie slice area being rendered.")]
+        public event EventHandler<PreRenderSliceEventArgs> PreRenderSlice;
+
+        #endregion
+
+        #region ReferenceLineMarkupLinkClick
+
+        /// <summary>
+        /// Occurs when a ReferenceLine MarkupLink has been clicked
+        /// </summary>
+        [Description("Occurs when a ReferenceLine MarkupLink has been clicked.")]
+        public event EventHandler<ReferenceLineMarkupLinkClickEventArgs> ReferenceLineMarkupLinkClick;
+
+        #endregion
+
+        #region RenderCrosshairCallout
+
+        /// <summary>
+        /// Occurs when a Crosshair Callout (enclosing "border") needs to be rendered
+        /// </summary>
+        [Description("Occurs when a Crosshair Callout (enclosing border) needs to be rendered.")]
+        public event EventHandler<RenderCrosshairCalloutEventArgs> RenderCrosshairCallout;
+
+        #endregion
+
+        #region RenderCrosshairLabel
+
+        /// <summary>
+        /// Occurs when a CrosshairLabel needs to be rendered
+        /// </summary>
+        [Description("Occurs when a CrosshairLabel needs to be rendered.")]
+        public event EventHandler<RenderCrosshairLabelEventArgs> RenderCrosshairLabel;
+
+        #endregion
+
+        #region RenderCrosshairLabelItem
+
+        /// <summary>
+        /// Occurs when an individual CrosshairLabel item needs to be rendered
+        /// </summary>
+        [Description("Occurs when an individual CrosshairLabel item needs to be rendered.")]
+        public event EventHandler<RenderCrosshairLabelItemEventArgs> RenderCrosshairLabelItem;
+
+        #endregion
+
+        #region RenderPieRingOut
+
+        /// <summary>
+        /// Occurs when the pie center 'ring-out' indicator needs to be rendered.
+        /// </summary>
+        [Description("Occurs when the pie center 'ring-out' indicator needs to be rendered.")]
+        public event EventHandler<RenderPieRingOutEventArgs> RenderPieRingOut;
+
+        #endregion
+
+        #region RenderSliceCenterLine
+
+        /// <summary>
+        /// Occurs when a pie slice center line needs to be rendered.
+        /// </summary>
+        [Description("Occurs when a pie slice center line needs to be rendered.")]
+        public event EventHandler<RenderSliceCenterLineEventArgs> RenderSliceCenterLine;
+
+        #endregion
+
+        #region RenderSliceInnerLabel
+
+        /// <summary>
+        /// Occurs when a slice inner label needs to be rendered.
+        /// </summary>
+        [Description("Occurs when a slice inner label needs to be rendered.")]
+        public event EventHandler<RenderSliceInnerLabelEventArgs> RenderSliceInnerLabel;
+
+        #endregion
+
+        #region RenderSliceOuterLabel
+
+        /// <summary>
+        /// Occurs when a slice outer label needs to be rendered.
+        /// </summary>
+        [Description("Occurs when a slice outer label needs to be rendered.")]
+        public event EventHandler<RenderSliceOuterLabelEventArgs> RenderSliceOuterLabel;
+
+        #endregion
+
+        #region Scroll
+
+        /// <summary>
+        /// Occurs when the Horizontal or Vertical scrollbar has been scrolled
+        /// </summary>
+        [Description("Occurs when the Horizontal or Vertical scrollbar has been scrolled.")]
+        public event EventHandler<ChartScrollEventArgs> Scroll;
+
+        #endregion
+
+        #region ScrollMin
+
+        /// <summary>
+        /// Occurs when the Horizontal or Vertical
+        /// scrollbar has been scrolled to the Minimum and released
+        /// </summary>
+        [Description("Occurs when the Horizontal or Vertical scrollbar has been scrolled to the Minimum and released.")]
+        public event EventHandler<ChartScrollEventArgs> ScrollMin;
+
+        #endregion
+
+        #region ScrollMax
+
+        /// <summary>
+        /// Occurs when the Horizontal or Vertical scrollbar has been scrolled to the Maximum and released
+        /// </summary>
+        [Description("Occurs when the Horizontal or Vertical scrollbar has been scrolled to the Maximum and released.")]
+        public event EventHandler<ChartScrollEventArgs> ScrollMax;
+
+        #endregion
+
+        #region SelectionChanged
+
+        /// <summary>
+        /// Occurs when a visual item's selected state has changed
+        /// </summary>
+        [Description("Occurs when a visual item's selected state has changed.")]
+        public event EventHandler<SelectionChangedEventArgs> SelectionChanged;
+
+        #endregion
+
+        #region SeriesDataBindingComplete
+
+        /// <summary>
+        /// Occurs when a ChartSeries data binding operation is completed
+        /// </summary>
+        [Description("Occurs when a ChartSeries data binding operation is completed.")]
+        public event EventHandler<SeriesDataBindingCompleteEventArgs> SeriesDataBindingComplete;
+
+        #endregion
+
+        #region StyleManagerChanged
+
+        /// <summary>
+        /// Occurs when the StyleManager style has changed
+        /// </summary>
+        [Description("Occurs when the StyleManager style has changed.")]
+        public event EventHandler<EventArgs> StyleManagerChanged;
+
+        #endregion
+
+        #region TitleMarkupLinkClick
+
+        /// <summary>
+        /// Occurs when a title MarkupLink has been clicked
+        /// </summary>
+        [Description("Occurs when a title MarkupLink has been clicked.")]
+        public event EventHandler<ChartTitleMarkupLinkClickEventArgs> TitleMarkupLinkClick;
+
+        #endregion
+
+        #endregion
+
+        #region Dll imports
+
+        private const int WmMouseWheel = 0x20a;
+
+        [DllImport("user32.dll")]
+        private static extern IntPtr WindowFromPoint(Point pt);
+
+        [DllImport("user32.dll")]
+        private static extern IntPtr SendMessage(IntPtr hWnd, int msg, IntPtr wp, IntPtr lp);
+
+        #endregion
+
+        #region Private variables
+
+        private States _States;
+
+        private ChartPanel _ChartPanel;
+
+        private object _DataSource;
+        private string _DataMember;
+        private DataBinder _DataBinder;
+
+        private DefaultVisualStyles _BaseVisualStyles;
+        private DefaultVisualStyles _DefaultVisualStyles;
+
+        private ushort _BeginUpdateCount;
+        private ushort _GlobalUpdateCount;
+        private ushort _BoundsUpdateCount;
+
+        private bool _InUpdateLayout;
+        private bool _LayoutValid;
+        private ChartVisualElement _LayoutBoundsItem;
+
+        private Cursor _ChartCursor;
+        private Cursor _DefaultCursor = Cursors.Default;
+        private bool _SetChartCursor;
+
+        private ChartVisualElement _CapturedItem;
+        private ChartVisualElement _MouseOverElement;
+
+        private bool _PostInternalUpdate;
+        private int _SelectionUpdateCount;
+        private bool _InPostUpdate;
+
+        private System.Windows.Forms.ToolTip _ToolTip;
+        private string _ToolTipText;
+
+        #endregion
+
+        /// <summary>
+        /// Initializes a new instance of the ChartControl class.
+        /// </summary>
+        public ChartControl()
+        {
+            SetStyle(ControlStyles.UserPaint | ControlStyles.AllPaintingInWmPaint |
+                ControlStyles.Opaque | ControlStyles.ResizeRedraw |
+                ControlStyles.OptimizedDoubleBuffer | ControlStyles.SupportsTransparentBackColor, true);
+
+            InitDefaultStates();
+
+            UpdateChartStyle();
+
+            if (DesignMode == false)
+                Application.AddMessageFilter(this);
+
+            StyleManager.Register(this);
+        }
+
+        #region DefaultSize
+
+        protected override Size DefaultSize
+        {
+            get { return new Size(250, 250); }
+        }
+
+        #endregion
+
+        #region ScaleControl
+
+        protected override void ScaleControl(SizeF factor, BoundsSpecified specified)
+        {
+            Dpi.SetScaling(factor);
+
+            base.ScaleControl(factor, specified);
+        }
+
+        #endregion
+
+        #region Scale
+
+        /// <summary>
+        /// Scales the ChartControl based upon the
+        /// parent form AutoScaleDimensions.
+        /// </summary>
+        /// <param name="form"></param>
+        public void Scale(Form form)
+        {
+            if (form != null)
+            {
+                SizeF factor = new SizeF(
+                    form.AutoScaleDimensions.Width / 96F,
+                    form.AutoScaleDimensions.Height / 96F);
+
+                Scale(factor);
+            }
+        }
+
+        #endregion
+
+        #region InitDefaultStates
+
+        private void InitDefaultStates()
+        {
+            //SetState(States.AllowEdit, true);
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region BaseVisualStyles
+
+        ///<summary>
+        /// BaseVisualStyles - the ChartControl starting base styles
+        ///</summary>
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public DefaultVisualStyles BaseVisualStyles
+        {
+            get { return (_BaseVisualStyles); }
+            internal set { _BaseVisualStyles = value; }
+        }
+
+        #endregion
+
+        #region ChartCursor
+
+        ///<summary>
+        /// Gets or sets the logical Chart cursor
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public Cursor ChartCursor
+        {
+            get { return (_ChartCursor); }
+
+            set
+            {
+                if (value == null || value == Cursors.Default)
+                    _ChartCursor = _DefaultCursor;
+                else
+                    _ChartCursor = value;
+            }
+        }
+
+        #endregion
+
+        #region ChartPanel
+
+        /// <summary>
+        /// Gets or sets the base Chart Panel for the Chart (contains Chart Graphs and additional Chart Panels)
+        /// </summary>
+        [Category("Appearance")]
+        [Description("Indicates the base Chart Panel for the Chart (contains Chart Graphs and additional Chart Panels.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ChartPanel ChartPanel
+        {
+            get
+            {
+                if (_ChartPanel == null)
+                {
+                    _ChartPanel = new ChartPanel("PrimaryPanel");
+
+                    _ChartPanel.ChartControl = this;
+                    _ChartPanel.PropertyChanged += ChartPanelPropertyChanged;
+                }
+
+                return (_ChartPanel);
+            }
+
+            set
+            {
+                if (_ChartPanel != null)
+                    _ChartPanel.PropertyChanged -= ChartPanelPropertyChanged;
+
+                _ChartPanel = value;
+
+                if (value != null)
+                {
+                    _ChartPanel.ChartControl = this;
+                    _ChartPanel.PropertyChanged += ChartPanelPropertyChanged;
+                }
+
+                OnPropertyChangedEx("ChartPanel", VisualChangeType.Layout);
+
+                LayoutValid = false;
+            }
+        }
+
+        #region ChartPanelPropertyChanged
+
+        void ChartPanelPropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+        }
+
+        #endregion
+
+        #endregion
+
+        #region DataMember
+
+        ///<summary>
+        /// Gets or sets the name of the list or table
+        /// in the data source that the Chart is bound to.
+        ///</summary>
+        [DefaultValue(null), Category("Data")]
+        [Description("Indicates the name of the list or table in the data source that the Chart is bound to.")]
+        public string DataMember
+        {
+            get { return (_DataMember); }
+
+            set
+            {
+                if (_DataBinder != null)
+                    _DataBinder.Clear();
+
+                _DataMember = value;
+
+                OnPropertyChangedEx("DataMember", VisualChangeType.Layout);
+            }
+        }
+
+        #endregion
+
+        #region DataSource
+
+        ///<summary>
+        /// Gets or sets the data source that the Chart is bound to
+        ///</summary>
+        [DefaultValue(null), AttributeProvider(typeof(IListSource)), Category("Data")]
+        [Description("Indicates the data source that the Chart is bound to.")]
+        public object DataSource
+        {
+            get { return (_DataSource); }
+
+            set
+            {
+                if (_DataBinder != null)
+                    _DataBinder.Clear();
+
+                _DataSource = value;
+
+                OnPropertyChangedEx("DataSource", VisualChangeType.Layout);
+            }
+        }
+
+        #endregion
+
+        #region DefaultVisualStyles
+
+        ///<summary>
+        /// Gets or sets the Default Visual Styles for each Chart element
+        ///</summary>
+        [Browsable(true), Category("Style")]
+        [Description("Gets or sets the Default Visual Styles for the each Invalidate element.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public DefaultVisualStyles DefaultVisualStyles
+        {
+            get
+            {
+                if (_DefaultVisualStyles == null)
+                {
+                    _DefaultVisualStyles = new DefaultVisualStyles();
+
+                    DefaultVisualChangeHandler(null, _DefaultVisualStyles);
+                }
+
+                return (_DefaultVisualStyles);
+            }
+
+            set
+            {
+                if (_DefaultVisualStyles != value)
+                {
+                    DefaultVisualStyles oldValue = _DefaultVisualStyles;
+                    _DefaultVisualStyles = value;
+
+                    OnDefaultVisualStyleChanged(oldValue, value);
+                }
+            }
+        }
+
+        #region OnDefaultVisualStyleChanged
+
+        private void OnDefaultVisualStyleChanged(
+            DefaultVisualStyles oldValue, DefaultVisualStyles newValue)
+        {
+            DefaultVisualChangeHandler(oldValue, newValue);
+
+            OnPropertyChanged("DefaultVisualStyles");
+        }
+
+        #endregion
+
+        #region DefaultVisualChangeHandler
+
+        private void DefaultVisualChangeHandler(
+            DefaultVisualStyles oldValue, DefaultVisualStyles newValue)
+        {
+            if (oldValue != null)
+                oldValue.PropertyChanged -= DefaultVisualStylesPropertyChanged;
+
+            if (newValue != null)
+                newValue.PropertyChanged += DefaultVisualStylesPropertyChanged;
+        }
+
+        #region DefaultVisualStylesPropertyChanged
+
+        void DefaultVisualStylesPropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            GlobalUpdateCount++;
+
+            VisualChangeType changeType = ((VisualPropertyChangedEventArgs)e).ChangeType;
+
+            if (changeType == VisualChangeType.Layout)
+                ChartPanel.InvalidateLayout();
+            else
+                ChartPanel.InvalidateRender();
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region IsUpdateSuspended
+
+        ///<summary>
+        /// Gets whether Chart updating / rendering is suspended
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsUpdateSuspended
+        {
+            get { return (_BeginUpdateCount > 0); }
+        }
+
+        #endregion
+
+        #region SelectedItems
+
+        /// <summary>
+        /// Gets a list of the currently selected chart items.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public List<ChartContainer> SelectedItems
+        {
+            get
+            {
+                List<ChartContainer> selectedItems = new List<ChartContainer>(_SelectedItems);
+
+                return (selectedItems);
+            }
+        }
+
+        #endregion
+
+        #region ToolTip
+
+        internal System.Windows.Forms.ToolTip ToolTip
+        {
+            get
+            {
+                if (_ToolTip == null)
+                    _ToolTip = new System.Windows.Forms.ToolTip();
+
+                return (_ToolTip);
+            }
+        }
+
+        #endregion
+
+        #region ToolTipText
+
+        internal string ToolTipText
+        {
+            get { return (_ToolTipText); }
+
+            set
+            {
+                if (_ToolTipText != value)
+                {
+                    _ToolTipText = value;
+
+                    ToolTip.SetToolTip(this, value);
+
+                    ToolTip.Active =
+                        (string.IsNullOrEmpty(value) == false);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region BoundsUpdateCount
+
+        internal ushort BoundsUpdateCount
+        {
+            get { return (_BoundsUpdateCount); }
+            set { _BoundsUpdateCount = value; }
+        }
+
+        #endregion
+
+        #region CapturedItem
+
+        internal ChartVisualElement CapturedItem
+        {
+            get
+            {
+                if (Capture == false)
+                    _CapturedItem = null;
+
+                return (_CapturedItem);
+            }
+
+            set { Capture = ((_CapturedItem = value) != null); }
+        }
+
+        #endregion
+
+        #region DataBinder
+
+        internal DataBinder DataBinder
+        {
+            get { return (_DataBinder); }
+            set { _DataBinder = value; }
+        }
+
+        #endregion
+
+        #region DefaultCursor
+
+        internal new Cursor DefaultCursor
+        {
+            get { return (_DefaultCursor); }
+            set { _DefaultCursor = value; }
+        }
+
+        #endregion
+
+        #region DesignerHosted
+
+        internal bool DesignerHosted
+        {
+            get { return (DesignMode); }
+        }
+
+        #endregion
+
+        #region GlobalUpdateCount
+
+        internal ushort GlobalUpdateCount
+        {
+            get { return (_GlobalUpdateCount); }
+            set { _GlobalUpdateCount = value; }
+        }
+
+        #endregion
+
+        #region InUpdateLayout
+
+        internal bool InUpdateLayout
+        {
+            get { return (_InUpdateLayout); }
+        }
+
+        #endregion
+
+        #region IsPointLabelUpdateHooked
+
+        internal bool IsPointLabelUpdateHooked
+        {
+            get { return (PointLabelUpdate != null); }
+        }
+
+        #endregion
+
+        #region IsScrollHooked
+
+        internal bool IsScrollHooked
+        {
+            get { return (Scroll != null); }
+        }
+
+        #endregion
+
+        #region LayoutBoundsItem
+
+        internal ChartVisualElement LayoutBoundsItem
+        {
+            get { return (_LayoutBoundsItem); }
+
+            set
+            {
+                _LayoutBoundsItem = value;
+
+                OnLayoutBoundsInvalid(EventArgs.Empty);
+            }
+        }
+
+        #region OnLayoutBoundsInvalid
+
+        /// <summary>
+        /// Raises LayoutBoundsInvalid event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnLayoutBoundsInvalid(EventArgs e)
+        {
+            if (LayoutBoundsInvalid != null)
+                LayoutBoundsInvalid(this, e);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region LayoutValid
+
+        internal bool LayoutValid
+        {
+            get { return (_LayoutValid); }
+            set { _LayoutValid = value; }
+        }
+
+        #endregion
+
+        #region MouseOverElement
+
+        internal ChartVisualElement MouseOverElement
+        {
+            get { return (_MouseOverElement); }
+            set { _MouseOverElement = value; }
+        }
+
+        #endregion
+
+        #region PostInternalUpdate
+
+        internal bool PostInternalUpdate
+        {
+            get { return (_PostInternalUpdate); }
+            set { _PostInternalUpdate = value; }
+        }
+
+        #endregion
+
+        #region SelectionUpdateCount
+
+        internal int SelectionUpdateCount
+        {
+            get { return (_SelectionUpdateCount); }
+            set { _SelectionUpdateCount = value; }
+        }
+
+        #endregion
+
+        #region SetChartCursor
+
+        internal bool SetChartCursor
+        {
+            get { return (_SetChartCursor); }
+            set { _SetChartCursor = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Licensing
+
+#if !TRIAL
+        private string _LicenseKey = "";
+
+        [Browsable(false), DefaultValue("")]
+        public string LicenseKey
+        {
+            get { return _LicenseKey; }
+
+            set
+            {
+                if (Licensing.ValidateLicenseKey(value) == false)
+                    _LicenseKey = (!Licensing.CheckLicenseKey(value) ? "9dsjkhds7" : value);
+            }
+        }
+#endif
+        #endregion
+
+        #region OnEnabledChanged
+
+        /// <summary>
+        /// OnEnabledChanged
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnEnabledChanged(EventArgs e)
+        {
+            base.OnEnabledChanged(e);
+
+            Refresh();
+        }
+
+        #endregion
+
+        #region StyleManager support
+
+        #region StyleManagerStyleChanged
+
+        /// <summary>
+        /// Called by StyleManager to notify control that style on
+        /// manager has changed and that control should refresh its
+        /// appearance if its style is controlled by StyleManager.
+        /// </summary>
+        /// <param name="newStyle">New active style.</param>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void StyleManagerStyleChanged(eDotNetBarStyle newStyle)
+        {
+            UpdateChartStyle();
+        }
+
+        #endregion
+
+        #region UpdateChartStyle
+
+        private void UpdateChartStyle()
+        {
+            ChartControlStyle style = ChartControlStyle.Office2010Blue;
+
+            switch (StyleManager.Style)
+            {
+                case eStyle.Office2007VistaGlass:
+                case eStyle.VisualStudio2010Blue:
+                case eStyle.Windows7Blue:
+                case eStyle.Office2007Blue:
+                case eStyle.Office2010Blue:
+                    style = ChartControlStyle.Office2010Blue;
+                    break;
+
+                case eStyle.Office2007Black:
+                case eStyle.Office2010Black:
+                    style = ChartControlStyle.Office2010Black;
+                    break;
+
+                case eStyle.Office2007Silver:
+                case eStyle.Office2010Silver:
+                    style = ChartControlStyle.Office2010Silver;
+                    break;
+
+                case eStyle.Metro:
+                case eStyle.VisualStudio2012Dark:
+                case eStyle.VisualStudio2012Light:
+                    style = ChartControlStyle.Metro;
+                    break;
+            }
+
+            _BaseVisualStyles = VisualStylesTable.GetStyle(style);
+
+            if (IsHandleCreated == true)
+            {
+                Invalidate(true);
+
+                if (StyleManagerChanged != null)
+                    StyleManagerChanged(this, new EventArgs());
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Paint processing
+
+        #region OnPaint
+
+        /// <summary>
+        /// Renders the control.
+        /// </summary>
+        /// <param name="e">Paint arguments.</param>
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            if (IsUpdateSuspended == false)
+            {
+                SmoothingMode sm = e.Graphics.SmoothingMode;
+                TextRenderingHint th = e.Graphics.TextRenderingHint;
+
+                base.OnPaintBackground(e);
+
+                if (LayoutValid == false || LayoutBoundsItem != null)
+                    UpdateLayout(e.Graphics);
+
+                ChartRenderInfo renderInfo = GetRenderInfo(e);
+
+                PaintControl(renderInfo);
+
+                e.Graphics.SmoothingMode = sm;
+                e.Graphics.TextRenderingHint = th;
+
+                base.OnPaint(e);
+            }
+        }
+
+        #endregion
+
+        #region PaintControl
+
+        private void PaintControl(ChartRenderInfo renderInfo)
+        {
+            if (ChartPanel.Visible == true)
+                ChartPanel.Render(renderInfo);
+        }
+
+        #endregion
+
+        #region PaintTo
+
+        /// <summary>
+        /// Paints control to canvas. This method might be used for print output.
+        /// </summary>
+        /// <param name="g">Graphics object to paint control to.</param>
+        public void PaintTo(Graphics g)
+        {
+            PaintTo(g, ClientRectangle);
+        }
+
+        /// <summary>
+        /// Paints control to canvas. This method might be used for print output.
+        /// </summary>
+        /// <param name="g">Graphics object to paint control to.</param>
+        /// <param name="clipRectangle">Indicates clipping rectangle.</param>
+        public void PaintTo(Graphics g, Rectangle clipRectangle)
+        {
+            SmoothingMode sm = g.SmoothingMode;
+            TextRenderingHint th = g.TextRenderingHint;
+
+            if (LayoutValid == false || LayoutBoundsItem != null)
+                UpdateLayout(g);
+
+            ChartRenderInfo renderInfo = GetRenderInfo(g, clipRectangle);
+
+            PaintControl(renderInfo);
+
+            g.SmoothingMode = sm;
+            g.TextRenderingHint = th;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region UpdateLayout
+
+        /// <summary>
+        /// OnHandleCreated
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnHandleCreated(EventArgs e)
+        {
+            UpdateLayout(false);
+
+            base.OnHandleCreated(e);
+        }
+
+        /// <summary>
+        /// Performs Chart layout.
+        /// </summary>
+        public void UpdateLayout()
+        {
+            UpdateLayout(false);
+        }
+
+        /// <summary>
+        /// Performs Chart layout.
+        /// </summary>
+        ///<param name="force">Whether to force operation even if layout is valid.</param>
+        public void UpdateLayout(bool force)
+        {
+            if (force == true)
+                _LayoutValid = false;
+
+            if (_LayoutValid == false || LayoutBoundsItem != null)
+            {
+                if (_InUpdateLayout == false)
+                {
+                    using (Graphics g = CreateGraphics())
+                        UpdateLayout(g);
+                }
+            }
+        }
+
+        internal ushort LayoutUpdateCount
+        {
+            get { return (_LayoutUpdateCount); }
+        }
+
+        internal ushort _LayoutUpdateCount;
+
+        private void UpdateLayout(Graphics g)
+        {
+            if (ChartPanel.Visible == true)
+            {
+                if (_InUpdateLayout == false)
+                {
+                    _InUpdateLayout = true;
+
+                    _LayoutUpdateCount++;
+
+                    try
+                    {
+                        ChartLayoutInfo layoutInfo = GetLayoutInfo(g);
+
+                        if (_LayoutValid == false)
+                        {
+                            ChartPanel.Measure(layoutInfo);
+
+                            layoutInfo.ClientBounds.Width = Math.Max(0, layoutInfo.ClientBounds.Width);
+                            layoutInfo.ClientBounds.Height = Math.Max(0, layoutInfo.ClientBounds.Height);
+
+                            _LayoutValid = true;
+                            _LayoutBoundsItem = ChartPanel;
+
+                            PostInternalMouseMove();
+                        }
+
+                        if (LayoutBoundsItem != null)
+                        {
+                            layoutInfo = GetLayoutInfo(g);
+                            layoutInfo.ScrollOffset = GetScrollOffset();
+
+                            LayoutBoundsItem.Arrange(layoutInfo);
+                        }
+
+                        LayoutBoundsItem = null;
+                    }
+                    finally
+                    {
+                        _InUpdateLayout = false;
+
+                        // If the user initiated an action during the paint event that
+                        // resulted in a layout change, process it now, as our associated 
+                        // invalidation will be eaten by the Windows event system
+
+                        if (PostInternalUpdate == true)
+                        {
+                            PostInternalUpdate = false;
+
+                            if (_InPostUpdate == false)
+                            {
+                                _InPostUpdate = true;
+
+                                _LayoutValid = false;
+
+                                UpdateLayout(g);
+
+                                _InPostUpdate = false;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        #region GetScrollOffset
+
+        private Point GetScrollOffset()
+        {
+            ChartContainer cc = LayoutBoundsItem.ParentChartContainer;
+
+            if (cc != null)
+            {
+                Point pt = cc.ScrollOffset;
+
+                if (LayoutBoundsItem is ChartLegend == false)
+                {
+                    pt.X += cc.HScrollOffset;
+                    pt.Y += cc.VScrollOffset;
+                }
+
+                return (pt);
+            }
+
+            return (Point.Empty);
+        }
+
+        #endregion
+
+        #region GetLayoutInfo
+
+        private ChartLayoutInfo GetLayoutInfo(Graphics g)
+        {
+            ChartLayoutInfo layoutInfo = new ChartLayoutInfo(g, ClientRectangle);
+
+            Rectangle r = ClientRectangle;
+
+            layoutInfo.LayoutBounds = ClientRectangle;
+
+            return (layoutInfo);
+        }
+
+        #endregion
+
+        #region GetRenderInfo
+
+        private ChartRenderInfo GetRenderInfo(PaintEventArgs e)
+        {
+            ChartRenderInfo renderInfo =
+                new ChartRenderInfo(e.Graphics, Rectangle.Ceiling(e.ClipRectangle));
+
+            return (renderInfo);
+        }
+
+        private ChartRenderInfo GetRenderInfo(Graphics g, Rectangle clipRectangle)
+        {
+            ChartRenderInfo renderInfo =
+                new ChartRenderInfo(g, Rectangle.Ceiling(clipRectangle));
+
+            return (renderInfo);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region DoEvent support
+
+        #region ChartMatrixResizedEvent
+
+        /// <summary>
+        /// Handles invocation of ChartMatrixResized events
+        /// </summary>
+        internal void DoChartMatrixResizedEvent(ChartPanel chartPanel)
+        {
+            if (ChartMatrixResized != null)
+            {
+                ChartMatrixResizedEventArgs ev = new
+                    ChartMatrixResizedEventArgs(chartPanel);
+
+                ChartMatrixResized(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region ChartTitleMarkupLinkClickEvent
+
+        /// <summary>
+        /// Handles invocation of ChartTitleMarkupLinkClick events
+        /// </summary>
+        internal void DoChartTitleMarkupLinkClickEvent(ChartNote title, HyperLink hyperLink)
+        {
+            if (TitleMarkupLinkClick != null)
+            {
+                ChartTitleMarkupLinkClickEventArgs ev = new 
+                    ChartTitleMarkupLinkClickEventArgs(title, hyperLink.Name, hyperLink.HRef);
+
+                TitleMarkupLinkClick(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region DataBindingStartEvent
+
+        /// <summary>
+        /// Handles invocation of DataBindingStart events
+        /// </summary>
+        internal bool DoDataBindingStartEvent(
+            BaseChart chartBase, object source, ref bool autogen)
+        {
+            if (DataBindingStart != null)
+            {
+                ChartDataBindingStartEventArgs ev = new
+                    ChartDataBindingStartEventArgs(chartBase, source, autogen);
+
+                DataBindingStart(this, ev);
+
+                autogen = ev.AutoGenerateSeries;
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region ChartDataBindingCompleteEvent
+
+        /// <summary>
+        /// Handles invocation of ChartDataBindingComplete events
+        /// </summary>
+        internal void DoChartDataBindingCompleteEvent(BaseChart chartBase, object source)
+        {
+            if (ChartDataBindingComplete != null)
+            {
+                ChartDataBindingCompleteEventArgs ev = new
+                    ChartDataBindingCompleteEventArgs(chartBase, source);
+
+                ChartDataBindingComplete(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region ChartMouseClickEvent
+
+        internal bool DoChartMouseClickEvent(BaseChart baseChart, PieSeriesPoint item, MouseEventArgs e)
+        {
+            if (ChartMouseClick != null)
+            {
+                ChartMouseClickEventArgs ev = new
+                    ChartMouseClickEventArgs(baseChart, item, e);
+
+                ChartMouseClick(this, ev);
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region ChartMouseDoubleClickEvent
+
+        /// <summary>
+        /// Handles invocation of ChartMouseDoubleClick events
+        /// </summary>
+        internal bool DoChartMouseDoubleClickEvent(BaseChart baseChart,
+            ItemHitArea hitArea, ChartVisualElement hitElement, object hitItem, MouseEventArgs e)
+        {
+            if (ChartMouseDoubleClick != null)
+            {
+                ChartMouseDoubleClickEventArgs ev = new
+                    ChartMouseDoubleClickEventArgs(baseChart, hitArea, hitElement, hitItem, e);
+
+                ChartMouseDoubleClick(this, ev);
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region CompareElementsEvent
+
+        /// <summary>
+        /// Handles invocation of CompareElementsEvent events
+        /// </summary>
+        internal bool DoCompareElementsEvent(
+            ChartVisualElement chartElement, object a, object b, ref int result)
+        {
+            if (CompareElements != null)
+            {
+                ChartCompareElementsEventArgs ev = new
+                    ChartCompareElementsEventArgs(chartElement, a, b);
+
+                CompareElements(this, ev);
+
+                result = ev.Result;
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region EmptyTextMarkupLinkClickEvent
+
+        /// <summary>
+        /// Handles invocation of EmptyTextMarkupLinkClick events
+        /// </summary>
+        internal void DoEmptyTextMarkupLinkClickEvent(ChartContainer container, HyperLink hyperLink)
+        {
+            if (EmptyTextMarkupLinkClick != null)
+            {
+                ChartEmptyTextMarkupLinkClickEventArgs ev = new
+                    ChartEmptyTextMarkupLinkClickEventArgs(container, hyperLink.Name, hyperLink.HRef);
+
+                EmptyTextMarkupLinkClick(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region GetPieCenterLabelEvent
+
+        internal void DoGetPieCenterLabelEvent(PieChart pieChart, ref string text)
+        {
+            if (GetPieCenterLabel != null)
+            {
+                GetPieCenterLabelEventArgs ev = new
+                    GetPieCenterLabelEventArgs(pieChart, text);
+
+                GetPieCenterLabel(this, ev);
+
+                text = ev.LabelText;
+            }
+        }
+
+        #endregion
+
+        #region GetCrosshairAxisLabelEvent
+
+        internal void DoGetCrosshairAxisLabelEvent(
+            ChartAxis axis, object value, ref string labelText)
+        {
+            if (GetCrosshairAxisLabel != null)
+            {
+                GetCrosshairAxisLabelEventArgs ev = new
+                    GetCrosshairAxisLabelEventArgs(axis, value, labelText);
+
+                GetCrosshairAxisLabel(this, ev);
+
+                labelText = ev.LabelText;
+            }
+        }
+
+        #endregion
+
+        #region GetCrosshairLabelHeaderEvent
+
+        internal void DoGetCrosshairLabelHeaderEvent(
+            BaseChart chart, CrosshairPoint cp, List<CrosshairPoint> cps, ref string text)
+        {
+            if (GetCrosshairLabelHeader != null)
+            {
+                GetCrosshairLabelHeaderEventArgs ev = new
+                    GetCrosshairLabelHeaderEventArgs(chart, cp, cps, text);
+
+                GetCrosshairLabelHeader(this, ev);
+
+                text = ev.Text;
+            }
+        }
+
+        #endregion
+
+        #region GetCrosshairLabelItemEvent
+
+        internal void DoGetCrosshairLabelItemEvent(
+            BaseChart chart, CrosshairPoint cp, ref string text)
+        {
+            if (GetCrosshairLabelItem != null)
+            {
+                GetCrosshairLabelItemEventArgs ev = new
+                    GetCrosshairLabelItemEventArgs(chart, cp, text);
+
+                GetCrosshairLabelItem(this, ev);
+
+                text = ev.Text;
+            }
+        }
+
+        #endregion
+
+        #region GetElementStyleEvent
+
+        /// <summary>
+        /// Handles invocation of GetElementStyle events
+        /// </summary>
+        internal void DoGetElementStyleEvent(
+            ChartElement chartElement, StyleType styleType, ref BaseVisualStyle style)
+        {
+            if (GetElementStyle != null)
+            {
+                ChartGetElementStyleEventArgs ev = new
+                    ChartGetElementStyleEventArgs(chartElement, styleType, style);
+
+                GetElementStyle(this, ev);
+
+                style = ev.Style;
+            }
+        }
+
+        #endregion
+
+        #region GetElementStyleEvent
+
+        /// <summary>
+        /// Handles invocation of GetElementStyle events
+        /// </summary>
+        internal void DoGetPieSeriesPointStyleEvent(
+            PieSeriesPoint pieSeriesPoint, StyleType styleType, ref BaseVisualStyle style)
+        {
+            if (GetPieSeriesPointStyle != null)
+            {
+                ChartGetPieSeriesPointStyleEventArgs ev = new
+                    ChartGetPieSeriesPointStyleEventArgs(pieSeriesPoint, styleType, style);
+
+                GetPieSeriesPointStyle(this, ev);
+
+                style = ev.Style;
+            }
+        }
+
+        #endregion
+
+        #region GetSliceLabelEvent
+
+        internal bool DoGetSliceLabelEvent(PieChart pieChart,
+            PieSeries chartSeries, PieSeriesPoint psp, bool inner, ref string text)
+        {
+            if (GetSliceLabel != null)
+            {
+                GetSliceLabelEventArgs ev = new
+                    GetSliceLabelEventArgs(pieChart, chartSeries, psp, inner, text);
+
+                GetSliceLabel(this, ev);
+
+                text = ev.Text;
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region GetTickmarkLabelEvent
+
+        internal void DoGetTickmarkLabelEvent(
+            ChartAxis axis, object value, ref string labelText, ref Color labelColor)
+        {
+            if (GetTickmarkLabel != null)
+            {
+                GetTickmarkLabelEventArgs ev = new
+                    GetTickmarkLabelEventArgs(axis, value, labelText);
+
+                GetTickmarkLabel(this, ev);
+
+                labelText = ev.LabelText;
+                labelColor = ev.LabelColor;
+            }
+        }
+
+        #endregion
+
+        #region GetToolTipEvent
+
+        /// <summary>
+        /// Handles invocation of GetToolTipEvent events
+        /// </summary>
+        internal bool DoGetToolTipEvent(BaseChart baseChart,
+            BaseSeries baseSeries, SeriesPoint sp, ref string toolTip)
+        {
+            if (GetToolTip != null)
+            {
+                GetToolTipEventArgs ev = new
+                    GetToolTipEventArgs(baseChart, baseSeries, sp, toolTip);
+
+                GetToolTip(this, ev);
+
+                toolTip = ev.ToolTip;
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region LegendItemCheckedChanged
+
+        /// <summary>
+        /// Handles invocation of LegendItemCheckedChanged events
+        /// </summary>
+        internal void DoLegendItemCheckedChangedEvent(
+            ChartLegend legend, ChartLegendItem legendItem)
+        {
+            if (LegendItemCheckedChanged != null)
+            {
+                LegendItemCheckedChangedEventArgs ev = new
+                    LegendItemCheckedChangedEventArgs(legend, legendItem);
+
+                LegendItemCheckedChanged(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region PointLabelUpdateEvent
+
+        /// <summary>
+        /// Handles invocation of PointLabelUpdate events
+        /// </summary>
+        internal void DoPointLabelUpdateEvent(
+            BaseChart chart, ChartSeries chartSeries, List<PointLabel> pointLabels)
+        {
+            if (PointLabelUpdate != null)
+            {
+                ChartPointLabelUpdateEventArgs ev = new
+                    ChartPointLabelUpdateEventArgs(chart, chartSeries, pointLabels);
+
+                PointLabelUpdate(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region PieCenterMarkupLinkClick Event
+
+        /// <summary>
+        /// Handles invocation of PieCenterMarkupLinkClick events
+        /// </summary>
+        internal void DoPieCenterMarkupLinkClickEvent(
+            PieChart pieChart, HyperLink hyperLink)
+        {
+            if (PieCenterMarkupLinkClick != null)
+            {
+                PieCenterMarkupLinkClickEventArgs ev = new PieCenterMarkupLinkClickEventArgs(
+                    pieChart, hyperLink.Name, hyperLink.HRef);
+
+                PieCenterMarkupLinkClick(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region PieDetachChangedEvent
+
+        internal void DoPieDetachChangedEvent(
+            PieChart pieChart, PieSeries pieSeries, PieSelectionMode psm)
+        {
+            if (PieDetachChanged != null)
+            {
+                PieDetachChangedEventArgs ev = new
+                    PieDetachChangedEventArgs(pieChart, pieSeries, psm);
+
+                PieDetachChanged(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region PieExplodeChangedEvent
+
+        internal void DoPieExplodeChangedEvent(PieChart pieChart, PieSeries pieSeries)
+        {
+            if (PieExplodeChanged != null)
+            {
+                PieExplodeChangedEventArgs ev = new
+                    PieExplodeChangedEventArgs(pieChart, pieSeries);
+
+                PieExplodeChanged(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region PieRingLevelChanged
+
+        internal void DoPieRingLevelChangedEvent(
+            PieChart pieChart, PieSeriesPointCollection spcOld, PieSeriesPointCollection spcNew)
+        {
+            if (PieRingLevelChanged != null)
+            {
+                PieRingLevelChangedEventArgs ev = new
+                    PieRingLevelChangedEventArgs(pieChart, spcOld, spcNew);
+
+                PieRingLevelChanged(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region PieRingLevelChanging
+
+        internal bool DoPieRingLevelChangingEvent(
+            PieChart pieChart, PieSeriesPointCollection spcOld, PieSeriesPointCollection spcNew)
+        {
+            if (PieRingLevelChanging != null)
+            {
+                PieRingLevelChangingEventArgs ev = new
+                    PieRingLevelChangingEventArgs(pieChart, spcOld, spcNew);
+
+                PieRingLevelChanging(this, ev);
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region PieSelectionChangedEvent
+
+        internal void DoPieSelectionChangedEvent(
+            PieChart pieChart, PieSeries pieSeries, PieSeriesPoint psp, PieSelectionMode psm)
+        {
+            if (PieSelectionChanged != null)
+            {
+                PieSelectionChangedEventArgs ev = new
+                    PieSelectionChangedEventArgs(pieChart, pieSeries, psp, psm);
+
+                PieSelectionChanged(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region PostLoadLegendDataEvent
+
+        internal void DoPostLoadLegendDataEvent(ChartLegend legend)
+        {
+            if (PostLoadLegendData != null)
+            {
+                PostLoadLegendDataEventArgs ev = new
+                    PostLoadLegendDataEventArgs(legend);
+
+                PostLoadLegendData(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region PostRenderContentBackgroundEvent
+
+        internal void DoPostRenderContentBackgroundEvent(Graphics g, BaseChart chart, Rectangle r)
+        {
+            if (PostRenderContentBackground != null)
+            {
+                PostRenderContentBackgroundEventArgs ev = new
+                    PostRenderContentBackgroundEventArgs(g, chart, r);
+
+                PostRenderContentBackground(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region PostRenderFrameBackgroundEvent
+
+        internal void DoPostRenderFrameBackgroundEvent(Graphics g, BaseChart chart, Rectangle r)
+        {
+            if (PostRenderFrameBackground != null)
+            {
+                PostRenderFrameBackgroundEventArgs ev = new
+                    PostRenderFrameBackgroundEventArgs(g, chart, r);
+
+                PostRenderFrameBackground(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region PostRenderPanelBackgroundEvent
+
+        internal void DoPostRenderPanelBackgroundEvent(Graphics g, ChartPanel panel, Rectangle r)
+        {
+            if (PostRenderPanelBackground != null)
+            {
+                PostRenderPanelBackgroundEventArgs ev = new
+                    PostRenderPanelBackgroundEventArgs(g, panel, r);
+
+                PostRenderPanelBackground(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region PostRenderPieCenterBackgroundEvent
+
+        internal void DoPostRenderPieCenterBackgroundEvent(
+            Graphics g, PieChart pieChart, Rectangle rc)
+        {
+            if (PostRenderPieCenterBackground != null)
+            {
+                PostRenderPieCenterBackgroundEventArgs ev = new
+                    PostRenderPieCenterBackgroundEventArgs(g, pieChart, rc);
+
+                PostRenderPieCenterBackground(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region PostRenderPieCenterContentEvent
+
+        internal void DoPostRenderPieCenterContentEvent(
+            Graphics g, PieChart pieChart, Rectangle rt, string centerlabel)
+        {
+            if (PostRenderPieCenterContent != null)
+            {
+                PostRenderPieCenterContentEventArgs ev = new
+                    PostRenderPieCenterContentEventArgs(g, pieChart, rt, centerlabel);
+
+                PostRenderPieCenterContent(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region PostRenderPointConnectorEvent
+
+        internal void DoPostRenderPointConnectorEvent(Graphics g, BaseChart chart,
+            ChartSeries series, PointLabel pointLabel, bool isCrosshairPt, Point dataPt, Point labelPt)
+        {
+            if (PostRenderPointConnector != null)
+            {
+                PostRenderPointConnectorEventArgs ev = new
+                    PostRenderPointConnectorEventArgs(g, chart, series, pointLabel, isCrosshairPt, dataPt, labelPt);
+
+                PostRenderPointConnector(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region PostRenderPointLabelEvent
+
+        internal void DoPostRenderPointLabelEvent(Graphics g, BaseChart chart,
+            ChartSeries series, PointLabel pointLabel, bool isCrosshairPt, Rectangle bounds)
+        {
+            if (PostRenderPointLabel != null)
+            {
+                PostRenderPointLabelEventArgs ev = new
+                    PostRenderPointLabelEventArgs(g, chart, series, pointLabel, isCrosshairPt, bounds);
+
+                PostRenderPointLabel(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region PostRenderRadialGridEvent
+
+        internal void DoPostRenderRadialGridEvent(Graphics g,
+            PieChart pieChart, double outerRadius, double innerRadius, double exp)
+        {
+            if (PostRenderRadialGrid != null)
+            {
+                PostRenderRadialGridEventArgs ev = new
+                    PostRenderRadialGridEventArgs(g, pieChart, outerRadius, innerRadius, exp);
+
+                PostRenderRadialGrid(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region PostRenderSeriesBarEvent
+
+        internal void DoPostRenderSeriesBarEvent(Graphics g, BaseChart chart,
+            ChartSeries chartSeries, SeriesPoint sp, Rectangle r, Rectangle r2, BarSegment segment)
+        {
+            if (PostRenderSeriesBar != null)
+            {
+                PostRenderSeriesBarEventArgs ev = new
+                    PostRenderSeriesBarEventArgs(g, chart, chartSeries, sp, r, r2, segment);
+
+                PostRenderSeriesBar(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region PostRenderSeriesHiLoBarEvent
+
+        internal void DoPostRenderSeriesHiLoBarEvent(Graphics g, ChartXy chartXy,
+            ChartSeries chartSeries, HiLoRenderData rd, Point pt1, Point pt2, HiLoBarSegment segment)
+        {
+            if (PostRenderSeriesHiLoBar != null)
+            {
+                PostRenderSeriesHiLoBarEventArgs ev = new
+                    PostRenderSeriesHiLoBarEventArgs(g, chartXy, chartSeries, rd, pt1, pt2, segment);
+
+                PostRenderSeriesHiLoBar(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region PostRenderSeriesPointEvent
+
+        internal void DoPostRenderSeriesPointEvent(Graphics graphics, BaseChart chart,
+            ChartSeries chartSeries, SeriesPoint sp, Point pt, Size pointSize, Image marker)
+        {
+            if (PostRenderSeriesPoint != null)
+            {
+                PostRenderSeriesPointEventArgs ev = new
+                    PostRenderSeriesPointEventArgs(graphics, chart, chartSeries, sp, pt, pointSize, marker);
+
+                PostRenderSeriesPoint(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region PostRenderSliceEvent
+
+        internal void DoPostRenderSliceEvent(Graphics g, GraphicsPath path,
+            PieChart pieChart, PieSeries pieSeries, PieSeriesPoint psp, SliceRenderType rtype)
+        {
+            if (PostRenderSlice != null)
+            {
+                PostRenderSliceEventArgs ev = new
+                    PostRenderSliceEventArgs(g, path, pieChart, pieSeries, psp, rtype);
+
+                PostRenderSlice(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region PreLoadLegendDataEvent
+
+        internal bool DoPreLoadLegendDataEvent(ChartLegend legend)
+        {
+            if (PreLoadLegendData != null)
+            {
+                PreLoadLegendDataEventArgs ev = new
+                    PreLoadLegendDataEventArgs(legend);
+
+                PreLoadLegendData(this, ev);
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region PreRenderContentBackgroundEvent
+
+        internal bool DoPreRenderContentBackgroundEvent(Graphics g, BaseChart chart, Rectangle r)
+        {
+            if (PreRenderContentBackground != null)
+            {
+                PreRenderContentBackgroundEventArgs ev = new
+                    PreRenderContentBackgroundEventArgs(g, chart, r);
+
+                PreRenderContentBackground(this, ev);
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region PreRenderFrameBackgroundEvent
+
+        internal bool DoPreRenderFrameBackgroundEvent(Graphics g, BaseChart chart, Rectangle r)
+        {
+            if (PreRenderFrameBackground != null)
+            {
+                PreRenderFrameBackgroundEventArgs ev = new
+                    PreRenderFrameBackgroundEventArgs(g, chart, r);
+
+                PreRenderFrameBackground(this, ev);
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region PreRenderPanelBackgroundEvent
+
+        internal bool DoPreRenderPanelBackgroundEvent(Graphics g, ChartPanel panel, Rectangle r)
+        {
+            if (PreRenderPanelBackground != null)
+            {
+                PreRenderPanelBackgroundEventArgs ev = new
+                    PreRenderPanelBackgroundEventArgs(g, panel, r);
+
+                PreRenderPanelBackground(this, ev);
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region PreRenderPieCenterBackgroundEvent
+
+        internal bool DoPreRenderPieCenterBackgroundEvent(
+            Graphics g, PieChart pieChart, Rectangle rc)
+        {
+            if (PreRenderPieCenterBackground != null)
+            {
+                PreRenderPieCenterBackgroundEventArgs ev = new
+                    PreRenderPieCenterBackgroundEventArgs(g, pieChart, rc);
+
+                PreRenderPieCenterBackground(this, ev);
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region PreRenderPieCenterContentEvent
+
+        internal bool DoPreRenderPieCenterContentEvent(
+            Graphics g, PieChart pieChart, Rectangle rt, string centerlabel)
+        {
+            if (PreRenderPieCenterContent != null)
+            {
+                PreRenderPieCenterContentEventArgs ev = new
+                    PreRenderPieCenterContentEventArgs(g, pieChart, rt, centerlabel);
+
+                PreRenderPieCenterContent(this, ev);
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region PreRenderPointConnectorEvent
+
+        internal bool DoPreRenderPointConnectorEvent(Graphics g, BaseChart chart,
+            ChartSeries series, PointLabel pointLabel, bool isCrosshairPt, Point dataPt, Point labelPt)
+        {
+            if (PreRenderPointConnector != null)
+            {
+                PreRenderPointConnectorEventArgs ev = new
+                    PreRenderPointConnectorEventArgs(g, chart, series, pointLabel, isCrosshairPt, dataPt, labelPt);
+
+                PreRenderPointConnector(this, ev);
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region PreRenderPointLabelEvent
+
+        internal bool DoPreRenderPointLabelEvent(Graphics g, BaseChart chart,
+            ChartSeries series, PointLabel pointLabel, bool isCrosshairPt, Rectangle bounds)
+        {
+            if (PreRenderPointLabel != null)
+            {
+                PreRenderPointLabelEventArgs ev = new
+                    PreRenderPointLabelEventArgs(g, chart, series, pointLabel, isCrosshairPt, bounds);
+
+                PreRenderPointLabel(this, ev);
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region PreRenderRadialGridEvent
+
+        internal bool DoPreRenderRadialGridEvent(Graphics g,
+            PieChart pieChart, double outerRadius, double innerRadius, double exp)
+        {
+            if (PreRenderRadialGrid != null)
+            {
+                PreRenderRadialGridEventArgs ev = new
+                    PreRenderRadialGridEventArgs(g, pieChart, outerRadius, innerRadius, exp);
+
+                PreRenderRadialGrid(this, ev);
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region PreRenderSeriesBarEvent
+
+        internal bool DoPreRenderSeriesBarEvent(Graphics g, BaseChart chart,
+            ChartSeries chartSeries, SeriesPoint sp, Rectangle r, Rectangle r2, BarSegment segment)
+        {
+            if (PreRenderSeriesBar != null)
+            {
+                PreRenderSeriesBarEventArgs ev = new
+                    PreRenderSeriesBarEventArgs(g, chart, chartSeries, sp, r, r2, segment);
+
+                PreRenderSeriesBar(this, ev);
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region PreRenderSeriesHiloBarEvent
+
+        internal bool DoPreRenderSeriesHiloBarEvent(Graphics g, ChartXy chartXy,
+            ChartSeries chartSeries, HiLoRenderData rd, Point pt1, Point pt2, HiLoBarSegment segment)
+        {
+            if (PreRenderSeriesHiLoBar != null)
+            {
+                PreRenderSeriesHiLoBarEventArgs ev = new
+                    PreRenderSeriesHiLoBarEventArgs(g, chartXy, chartSeries, rd, pt1, pt2, segment);
+
+                PreRenderSeriesHiLoBar(this, ev);
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region PreRenderSeriesPointEvent
+
+        internal bool DoPreRenderSeriesPointEvent(Graphics graphics, BaseChart chart, 
+            ChartSeries chartSeries, SeriesPoint sp, Point pt, Size pointSize, ref Image marker)
+        {
+            if (PreRenderSeriesPoint != null)
+            {
+                PreRenderSeriesPointEventArgs ev = new
+                    PreRenderSeriesPointEventArgs(graphics, chart, chartSeries, sp, pt, pointSize, marker);
+
+                PreRenderSeriesPoint(this, ev);
+
+                marker = ev.Marker;
+
+                return (ev.Cancel || marker == null);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region PreRenderSliceEvent
+
+        internal bool DoPreRenderSliceEvent(Graphics g, GraphicsPath path,
+            PieChart pieChart, PieSeries pieSeries, PieSeriesPoint psp, SliceRenderType rtype)
+        {
+            if (PreRenderSlice != null)
+            {
+                PreRenderSliceEventArgs ev = new
+                    PreRenderSliceEventArgs(g, path, pieChart, pieSeries, psp, rtype);
+
+                PreRenderSlice(this, ev);
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region ReferenceLineMarkupLinkClickEvent
+
+        /// <summary>
+        /// Handles invocation of ReferenceLineMarkupLinkClick events
+        /// </summary>
+        internal void DoReferenceLineMarkupLinkClickEvent(ReferenceLine line, HyperLink hyperLink)
+        {
+            if (ReferenceLineMarkupLinkClick != null)
+            {
+                ReferenceLineMarkupLinkClickEventArgs ev = new
+                    ReferenceLineMarkupLinkClickEventArgs(line, hyperLink.Name, hyperLink.HRef);
+
+                ReferenceLineMarkupLinkClick(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region RenderCrosshairCalloutEvent
+
+        /// <summary>
+        /// Handles invocation of RenderCrosshairCallout events
+        /// </summary>
+        internal bool DoRenderCrosshairCalloutEvent(Graphics graphics,
+            BaseChart chart, Rectangle bounds, Point pt, CrosshairVisualStyle cstyle)
+        {
+            if (RenderCrosshairCallout != null)
+            {
+                RenderCrosshairCalloutEventArgs ev = new
+                    RenderCrosshairCalloutEventArgs(graphics, chart, bounds, pt, cstyle);
+
+                RenderCrosshairCallout(this, ev);
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region RenderCrosshairLabelEvent
+
+        /// <summary>
+        /// Handles invocation of RenderCrosshairLabel events
+        /// </summary>
+        internal bool DoRenderCrosshairLabelEvent(Graphics graphics,
+            BaseChart chart, List<CrosshairPoint> cps, Rectangle bounds, Point pt)
+        {
+            if (RenderCrosshairLabel != null)
+            {
+                RenderCrosshairLabelEventArgs ev = new
+                    RenderCrosshairLabelEventArgs(graphics, chart, cps, bounds, pt);
+
+                RenderCrosshairLabel(this, ev);
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region RenderCrosshairLabelItemEvent
+
+        /// <summary>
+        /// Handles invocation of RenderCrosshairLabelItem events
+        /// </summary>
+        internal bool DoRenderCrosshairLabelItemEvent(Graphics graphics,
+            BaseChart chart, CrosshairPoint cp, Rectangle bounds, CrosshairVisualStyle cstyle)
+        {
+            if (RenderCrosshairLabelItem != null)
+            {
+                RenderCrosshairLabelItemEventArgs ev = new
+                    RenderCrosshairLabelItemEventArgs(graphics, chart, cp, bounds, cstyle);
+
+                RenderCrosshairLabelItem(this, ev);
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region RenderPieRingOutEvent
+
+        internal bool DoRenderPieRingOutEvent(Graphics g, PieChart pieChart, Rectangle r)
+        {
+            if (RenderPieRingOut != null)
+            {
+                RenderPieRingOutEventArgs ev = new
+                    RenderPieRingOutEventArgs(g, pieChart, r);
+
+                RenderPieRingOut(this, ev);
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region RenderSliceCenterLineEvent
+
+        internal bool DoRenderSliceCenterLineEvent(Graphics g,
+            PieChart pieChart, PieSeriesPoint psp, Point ptInner, Point ptOuter)
+        {
+            if (RenderSliceCenterLine != null)
+            {
+                RenderSliceCenterLineEventArgs ev = new
+                    RenderSliceCenterLineEventArgs(g, pieChart, psp, ptInner, ptOuter);
+
+                RenderSliceCenterLine(this, ev);
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region RenderSliceInnerLabelEvent
+
+        internal bool DoRenderSliceInnerLabelEvent(Graphics g,
+            PieChart pieChart, PieSeriesPoint psp, string text, ref bool displayed)
+        {
+            if (RenderSliceInnerLabel != null)
+            {
+                RenderSliceInnerLabelEventArgs ev = new
+                    RenderSliceInnerLabelEventArgs(g, pieChart, psp, text, displayed);
+
+                RenderSliceInnerLabel(this, ev);
+
+                displayed = ev.Displayed;
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region RenderSliceOuterLabelEvent
+
+        internal bool DoRenderSliceOuterLabelEvent(
+            Graphics g, PieChart pieChart, PieSeriesPoint psp, PieLabel pl)
+        {
+            if (RenderSliceOuterLabel != null)
+            {
+                RenderSliceOuterLabelEventArgs ev = new
+                    RenderSliceOuterLabelEventArgs(g, pieChart, psp, pl);
+
+                RenderSliceOuterLabel(this, ev);
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region ScrollEvent
+
+        /// <summary>
+        /// Handles invocation of Scroll events
+        /// </summary>
+        internal void DoScrollEvent(ChartContainer chartContainer,
+            ScrollEventArgs args, ScrollBarLite sbar)
+        {
+            if (Scroll != null)
+            {
+                ChartScrollEventArgs ev = new
+                    ChartScrollEventArgs(chartContainer, args);
+
+                Scroll(this, ev);
+            }
+
+            if (args.Type == ScrollEventType.EndScroll)
+            {
+                if (args.NewValue == 0)
+                    DoScrollMaxEvent(chartContainer, args);
+
+                else if (args.NewValue + sbar.LargeChange >= sbar.Maximum)
+                    DoScrollMaxEvent(chartContainer, args);
+            }
+        }
+
+        #endregion
+
+        #region ScrollMinEvent
+
+        /// <summary>
+        /// Handles invocation of ScrollMin events
+        /// </summary>
+        internal void DoScrollMinEvent(ChartContainer chartContainer, ScrollEventArgs args)
+        {
+            if (ScrollMin != null)
+            {
+                ChartScrollEventArgs ev = new
+                    ChartScrollEventArgs(chartContainer, args);
+
+                ScrollMin(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region ScrollMaxEvent
+
+        /// <summary>
+        /// Handles invocation of ScrollMax events
+        /// </summary>
+        internal void DoScrollMaxEvent(ChartContainer chartContainer, ScrollEventArgs args)
+        {
+            if (ScrollMax != null)
+            {
+                ChartScrollEventArgs ev = new
+                    ChartScrollEventArgs(chartContainer, args);
+
+                ScrollMax(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region SelectionChanged
+
+        /// <summary>
+        /// Handles invocation of SelectionChanged events
+        /// </summary>
+        internal void DoSelectionChangedEvent(
+            ChartVisualElement item, bool oldState, bool newState)
+        {
+            if (SelectionChanged != null)
+            {
+                SelectionChangedEventArgs ev = new
+                    SelectionChangedEventArgs(item, oldState, newState, _SelectedItems.Count);
+
+                SelectionChanged(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region SeriesDataBindingCompleteEvent
+
+        /// <summary>
+        /// Handles invocation of SeriesDataBindingComplete events
+        /// </summary>
+        internal void DoSeriesDataBindingCompleteEvent(BaseChart chartBase, BaseSeries series, object source)
+        {
+            if (SeriesDataBindingComplete != null)
+            {
+                SeriesDataBindingCompleteEventArgs ev = new
+                    SeriesDataBindingCompleteEventArgs(chartBase, series, source);
+
+                SeriesDataBindingComplete(this, ev);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Mouse Support
+
+        #region OnMouseLeave
+
+        /// <summary>
+        /// OnMouseLeave
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnMouseLeave(EventArgs e)
+        {
+            _ChartPanel.InternalMouseLeave(e);
+
+            if (_MouseOverElement != null)
+            {
+                _MouseOverElement.InternalMouseLeave(e);
+
+                _MouseOverElement = null;
+            }
+
+            base.OnMouseLeave(e);
+        }
+
+        #endregion
+
+        #region OnMouseMove
+
+        /// <summary>
+        /// OnMouseMove
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnMouseMove(MouseEventArgs e)
+        {
+            if (CapturedItem != null)
+            {
+                CapturedItem.InternalMouseMove(e);
+            }
+            else
+            {
+                ChartVisualElement item = _ChartPanel.GetElementAt(e.Location);
+
+                if (item != null)
+                    item.InternalMouseMove(e);
+                else
+                    _ChartPanel.InternalMouseMove(e);
+            }
+
+            base.OnMouseMove(e);
+
+            base.Cursor = _ChartCursor;
+
+            if (_ChartPanel.IsDesignerHosted == true)
+                Cursor = Cursors.Arrow;
+        }
+
+        #endregion
+
+        #region OnMouseDown
+
+        /// <summary>
+        /// OnMouseDown
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnMouseDown(MouseEventArgs e)
+        {
+            Focus();
+
+            ChartVisualElement item = _ChartPanel.GetElementAt(e.Location);
+
+            if (item != null)
+                item.InternalMouseDown(e);
+            else
+                _ChartPanel.InternalMouseDown(e);
+
+            base.OnMouseDown(e);
+        }
+
+        #endregion
+
+        #region OnMouseUp
+
+        /// <summary>
+        /// OnMouseUp
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnMouseUp(MouseEventArgs e)
+        {
+            if (CapturedItem != null)
+            {
+                CapturedItem.InternalMouseUp(e);
+            }
+            else
+            {
+                ChartVisualElement item = _ChartPanel.GetElementAt(e.Location);
+
+                if (item != null)
+                    item.InternalMouseUp(e);
+                else
+                    _ChartPanel.InternalMouseUp(e);
+
+            }
+
+            base.OnMouseUp(e);
+        }
+
+        #endregion
+
+        #region OnMouseClick
+
+        /// <summary>
+        /// OnMouseClick
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnMouseClick(MouseEventArgs e)
+        {
+            if (_MouseOverElement == null)
+            {
+                ChartVisualElement item = _ChartPanel.GetElementAt(e.Location);
+
+                if (item != null)
+                    item.InternalMouseMove(e);
+                else
+                    _ChartPanel.InternalMouseMove(e);
+            }
+
+            if (_MouseOverElement != null)
+                _MouseOverElement.InternalMouseClick(e);
+
+            base.OnMouseClick(e);
+        }
+
+        #endregion
+
+        #region OnMouseDoubleClick
+
+        /// <summary>
+        /// OnMouseDoubleClick
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnMouseDoubleClick(MouseEventArgs e)
+        {
+            if (_MouseOverElement == null)
+            {
+                ChartVisualElement item = _ChartPanel.GetElementAt(e.Location);
+
+                if (item != null)
+                    item.InternalMouseMove(e);
+                else
+                    _ChartPanel.InternalMouseMove(e);
+            }
+
+            if (_MouseOverElement != null)
+                _MouseOverElement.InternalMouseDoubleClick(e);
+
+            base.OnMouseDoubleClick(e);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetElementAt
+
+        public ChartVisualElement GetElementAt(Point pt)
+        {
+            ChartVisualElement item = ChartPanel.GetElementAt(pt);
+
+            return (item ?? ChartPanel);
+        }
+
+        #endregion
+
+        #region GetSerialData
+
+        internal SerialElementCollection GetSerialData(bool root)
+        {
+            SerialElementCollection sec = new SerialElementCollection();
+
+            if (root == true)
+                sec.AddStartElement("ChartControl");
+
+            sec.AddValue("DataMember", DataMember, null);
+            //sec.AddValue("DataSource", DataSource, null);
+
+            if (_DefaultVisualStyles != null && _DefaultVisualStyles.IsEmpty == false)
+                sec.AddElement(_DefaultVisualStyles.GetSerialData());
+
+            sec.AddElement(ChartPanel.GetSerialData(""));
+
+            if (root == true)
+                sec.AddEndElement("ChartControl");
+
+            return (sec);
+        }
+
+        #endregion
+
+        #region PostInternalMouseMove
+
+        internal void PostInternalMouseMove()
+        {
+            Point pt = PointToClient(Control.MousePosition);
+
+            if (ClientRectangle.Contains(pt) == true)
+                Cursor.Position = Cursor.Position;
+        }
+
+        #endregion
+
+        #region Cursor
+
+        /// <summary>
+        /// Cursor
+        /// </summary>
+        public override Cursor Cursor
+        {
+            get { return (base.Cursor); }
+
+            set
+            {
+                base.Cursor = value;
+
+                if (SetChartCursor == true)
+                    ChartCursor = value;
+                else
+                    DefaultCursor = value;
+            }
+        }
+
+        #endregion
+
+        #region OnResize
+
+        protected override void OnResize(EventArgs e)
+        {
+            base.OnResize(e);
+
+            if (ChartPanel != null)
+                ChartPanel.InternalOnResize(e);
+        }
+
+        #endregion
+
+        #region Selection Support
+
+        private List<ChartContainer> _SelectedItems = new List<ChartContainer>();
+
+        public bool GetSelected(ChartContainer item)
+        {
+            if (item.ChartControl == null)
+                throw new Exception("Items must be a member of the ChartControl");
+
+            return (_SelectedItems.IndexOf(item) >= 0);
+        }
+
+        public void SetSelected(ChartContainer item, bool select)
+        {
+            SetSelectedEx(item, select, true);
+        }
+
+        #region SetSelectedEx
+
+        internal void SetSelectedEx(ChartContainer item, bool select, bool sendEvent)
+        {
+            int index = _SelectedItems.IndexOf(item);
+
+            if (select == false)
+            {
+                if (index >= 0)
+                {
+                    _SelectedItems.RemoveAt(index);
+
+                    item.IsSelected = false;
+
+                    if (sendEvent == true)
+                        OnSelectionChanged(item, true, false);
+                }
+            }
+            else
+            {
+                if (index < 0)
+                {
+                    _SelectedItems.Add(item);
+
+                    item.IsSelected = true;
+
+                    if (sendEvent == true)
+                        OnSelectionChanged(item, false, true);
+                }
+            }
+        }
+
+        #region OnSelectionChanged
+
+        private void OnSelectionChanged(ChartContainer item, bool oldState, bool newState)
+        {
+            DoSelectionChangedEvent(item, oldState, newState);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ClearAllSelected
+
+        /// <summary>
+        /// Clears all selected items
+        /// </summary>
+        public void ClearAllSelected()
+        {
+            for (int i=_SelectedItems.Count - 1; i>=0; i--)
+                SetSelectedEx(_SelectedItems[i], false, true);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Update support
+
+        ///<summary>
+        /// Calling the BeginUpdate routine informs the Chart Control
+        /// that an extended update phase has begun. The Chart Control
+        /// will suspend all layout calculations and display updates
+        /// until the corresponding EndUpdate routine is called.
+        /// 
+        /// BeginUpdate / EndUpdate can be nested and must be
+        /// called in pairs � every BeginUpdate must have a
+        /// matching EndUpdate call.
+        ///</summary>
+        public void BeginUpdate()
+        {
+            _BeginUpdateCount++;
+        }
+
+        ///<summary>
+        /// Calling the EndUpdate routine informs the Chart Control
+        /// that an extended update phase has ended.
+        /// 
+        /// BeginUpdate / EndUpdate can be nested and must be
+        /// called in pairs � every EndUpdate must have a
+        /// matching BeginUpdate call.
+        ///</summary>
+        public void EndUpdate()
+        {
+            if (_BeginUpdateCount > 0)
+            {
+                if (--_BeginUpdateCount == 0)
+                    ChartPanel.InvalidateLayout();
+            }
+        }
+
+        #endregion
+
+        #region InvalidateRender
+
+        /// <summary>
+        /// Invalidates render of the chart element.
+        /// </summary>
+        /// <param name="gridElement">Element to invalidate rendering for.</param>
+        internal void InvalidateRender(ChartVisualElement chartElement)
+        {
+            Rectangle bounds = chartElement.Bounds;
+
+            if (bounds.IsEmpty == false)
+                Invalidate(bounds, true);
+        }
+
+        internal void InvalidateRender(Rectangle bounds)
+        {
+            Invalidate(bounds, InvokeRequired == false);
+        }
+
+        #endregion
+
+        #region PreFilterMessage
+
+        public bool PreFilterMessage(ref Message m)
+        {
+            if (IsDisposed == true)
+                return (false);
+
+            if (DesignMode == true || Enabled == false)
+                return (false);
+
+            if (ContainsFocus == true || m.Msg == WmMouseWheel)
+            {
+                if (m.Msg == WmMouseWheel)
+                {
+                    Point pt = new Point(LoWord(m.LParam), HiWord(m.LParam));
+
+                    IntPtr hWnd = WindowFromPoint(pt);
+
+                    if (hWnd != IntPtr.Zero)
+                    {
+                        Control ctl = Control.FromHandle(hWnd);
+
+                        if (ctl == this)
+                        {
+                            pt = PointToClient(pt);
+
+                            MouseEventArgs e = new
+                                MouseEventArgs(MouseButtons.None, 0, pt.X, pt.Y, HiWord(m.WParam));
+
+                            ChartVisualElement item = _ChartPanel.GetElementAt(pt);
+
+                            if (item != null)
+                                item.InternalMouseWheel(e);
+                            else
+                                _ChartPanel.InternalMouseWheel(e);
+
+                            return (true);
+                        }
+                    }
+                }
+            }
+
+            return (false);
+        }
+
+        #region HiWord / LoWord
+
+        private int LoWord(int n)
+        {
+            return (short)(n & 0xffff);
+        }
+
+        private int HiWord(int n)
+        {
+            return (n >> 0x10);
+        }
+
+        private int LoWord(IntPtr n)
+        {
+            return LoWord((int)((long)n));
+        }
+
+        private int HiWord(IntPtr n)
+        {
+            return HiWord((int)((long)n));
+        }
+
+        #endregion
+
+        #endregion
+
+        #region INotifyPropertyChanged Members
+
+        /// <summary>
+        /// Occurs when property value has changed.
+        /// </summary>
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        /// <summary>
+        /// Default PropertyChanged processing
+        /// </summary>
+        /// <param name="s"></param>
+        /// <param name="changeType">invalidate</param>
+        protected void OnPropertyChangedEx(string s, VisualChangeType changeType)
+        {
+            OnPropertyChanged(s);
+
+            if (changeType == VisualChangeType.Layout)
+                Invalidate();
+            else
+                Invalidate();
+        }
+
+        /// <summary>
+        /// Raises the PropertyChanged event.
+        /// </summary>
+        /// <param name="e">Event arguments</param>
+        protected virtual void OnPropertyChanged(PropertyChangedEventArgs e)
+        {
+            PropertyChangedEventHandler handler = PropertyChanged;
+
+            if (handler != null)
+                handler(this, e);
+        }
+
+        /// <summary>
+        /// Default PropertyChanged processing
+        /// </summary>
+        /// <param name="s"></param>
+        protected void OnPropertyChanged(string s)
+        {
+            if (PropertyChanged != null)
+                OnPropertyChanged(new PropertyChangedEventArgs(s));
+        }
+
+        #endregion
+
+        #region States
+
+        [Flags]
+        private enum States : uint
+        {
+        }
+
+        #region TestState
+
+        private bool TestState(States state)
+        {
+            return ((_States & state) == state);
+        }
+
+        #endregion
+
+        #region SetState
+
+        private void SetState(States state, bool value)
+        {
+            if (value == true)
+                _States |= state;
+            else
+                _States &= ~state;
+        }
+
+        #endregion
+
+
+        #endregion
+    }
+
+    #region enum
+
+    #region AutoScrollEnable
+
+    [Flags]
+    internal enum AutoScrollEnable
+    {
+        None = 0,
+        Vertical = (1 << 0),
+        Horizontal = (1 << 1),
+    }
+
+    #endregion
+
+    #region SortDirection
+
+    public enum SortDirection
+    {
+        None = 0,
+        Ascending = 1,
+        Descending = 2,
+    }
+
+    #endregion
+
+    #endregion
+
+    #region EventArgs
+
+    #region ChartCancelEventArgs
+
+    /// <summary>
+    /// ChartCancelEventArgs
+    /// </summary>
+    public class ChartCancelEventArgs : ChartEventArgs
+    {
+        #region Private variables
+
+        private bool _Cancel;
+
+        #endregion
+
+        ///<summary>
+        /// ChartCancelEventArgs
+        ///</summary>
+        ///<param name="ChartControl">Associated Chart</param>
+        public ChartCancelEventArgs(BaseChart chartBase)
+            : base(chartBase)
+        {
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets or sets whether to cancel the default operation.
+        /// </summary>
+        public bool Cancel
+        {
+            get { return (_Cancel); }
+            set { _Cancel = value; }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridCompareElementsEventArgs
+
+    /// <summary>
+    /// GridCompareElementsEventArgs
+    /// </summary>
+    public class ChartCompareElementsEventArgs : CancelEventArgs
+    {
+        #region Private variables
+
+        private ChartVisualElement _ChartElement;
+
+        private object _ElementA;
+        private object _ElementB;
+
+        private int _Result;
+
+        #endregion
+
+        ///<summary>
+        /// ChartCompareElementsEventArgs
+        ///</summary>
+        ///<param name="chartElement"></param>
+        ///<param name="a"></param>
+        ///<param name="b"></param>
+        public ChartCompareElementsEventArgs(
+            ChartVisualElement chartElement, object a, object b)
+        {
+            _ChartElement = chartElement;
+
+            _ElementA = a;
+            _ElementB = b;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the visual ChartElement associated with the sort.
+        /// </summary>
+        public ChartVisualElement ChartElement
+        {
+            get { return (_ChartElement); }
+        }
+
+        /// <summary>
+        /// Gets the left-hand element of the comparison
+        /// </summary>
+        public object ElementA
+        {
+            get { return (_ElementA); }
+        }
+
+        /// <summary>
+        /// Gets the right-hand element of the comparison
+        /// </summary>
+        public object ElementB
+        {
+            get { return (_ElementB); }
+        }
+
+        /// <summary>
+        /// Gets or sets the result of the element compare.
+        /// -1 = ElementA is less than ElementB
+        /// 0 = ElementA is equal to ElementB
+        /// +1 = ElementA is greater than ElementB
+        /// </summary>
+        public int Result
+        {
+            get { return (_Result); }
+            set { _Result = value; }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region ChartEventArgs
+
+    /// <summary>
+    /// ChartEventArgs
+    /// </summary>
+    public class ChartEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private BaseChart _Chart;
+
+        #endregion
+
+        ///<summary>
+        /// ChartControlEventArgs
+        ///</summary>
+        ///<param name="chartControl">Associated ChartControl</param>
+        public ChartEventArgs(BaseChart chart)
+        {
+            _Chart = chart;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated Chart
+        /// </summary>
+        public BaseChart Chart
+        {
+            get { return (_Chart); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region ChartDataBindingCompleteEventArgs
+
+    /// <summary>
+    /// ChartDataBindingCompleteEventArgs
+    /// </summary>
+    public class ChartDataBindingCompleteEventArgs : ChartEventArgs
+    {
+        #region Private variables
+
+        private object _Source;
+
+        #endregion
+
+        ///<summary>
+        /// ChartDataBindingCompleteEventArgs
+        ///</summary>
+        ///<param name="BaseChart"></param>
+        public ChartDataBindingCompleteEventArgs(BaseChart chart, object source)
+            : base(chart)
+        {
+            _Source = source;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the data source that was bound to.
+        /// </summary>
+        public object Source
+        {
+            get { return (_Source); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region ChartDataBindingStartEventArgs
+
+    /// <summary>
+    /// ChartDataBindingStartEventArgs
+    /// </summary>
+    public class ChartDataBindingStartEventArgs : ChartCancelEventArgs
+    {
+        #region Private variables
+
+        private bool _AutoGenerateSeries;
+        private object _Source;
+
+        #endregion
+
+        ///<summary>
+        /// ChartDataBindingStartEventArgs
+        ///</summary>
+        ///<param name="chartBase">Associated ChartControl</param>
+        ///<param name="row">Associated ChartPanel</param>
+        ///<param name="source">The data source being bound to</param>
+        ///<param name="autoGenerateSeries">Whether to auto-generate panel series</param>
+        public ChartDataBindingStartEventArgs(
+            BaseChart chartBase, object source, bool autoGenerateSeries)
+            : base(chartBase)
+        {
+            _Source = source;
+            _AutoGenerateSeries = autoGenerateSeries;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets or sets whether to auto-generate
+        /// the the panel series from the bound data.
+        /// </summary>
+        public bool AutoGenerateSeries
+        {
+            get { return (_AutoGenerateSeries); }
+            set { _AutoGenerateSeries = value; }
+        }
+
+        /// <summary>
+        /// Gets the associated data source being bound to.
+        /// </summary>
+        public object Source
+        {
+            get { return (_Source); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region ChartEmptyTextMarkupLinkClickEventArgs
+
+    /// <summary>
+    /// ChartEmptyTextMarkupLinkClickEventArgs
+    /// </summary>
+    public class ChartEmptyTextMarkupLinkClickEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private string _HRef;
+        private string _Name;
+
+        private ChartContainer _ChartContainer;
+
+        #endregion
+
+        /// <summary>
+        /// ChartEmptyTextMarkupLinkClickEventArgs
+        /// </summary>
+        /// <param name="chartControl"></param>
+        /// <param name="title"></param>
+        /// <param name="name"></param>
+        /// <param name="href"></param>
+        public ChartEmptyTextMarkupLinkClickEventArgs(
+            ChartContainer chartContainer, string name, string href)
+        {
+            _HRef = href;
+            _Name = name;
+
+            _ChartContainer = chartContainer;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated HyperLink HRef
+        /// </summary>
+        public string HRef
+        {
+            get { return (_HRef); }
+        }
+
+        /// <summary>
+        /// Gets the associated HyperLink Name
+        /// </summary>
+        public string Name
+        {
+            get { return (_Name); }
+        }
+
+        /// <summary>
+        /// Gets the associated ChartContainer
+        /// </summary>
+        public ChartContainer ChartContainer
+        {
+            get { return (_ChartContainer); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region ChartGetElementStyleEventArgs
+
+    /// <summary>
+    /// ChartGetElementStyleEventArgs
+    /// </summary>
+    public class ChartGetElementStyleEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private ChartElement _ChartElement;
+        private StyleType _StyleType;
+        private BaseVisualStyle _Style;
+
+        #endregion
+
+        ///<summary>
+        /// ChartGetElementStyleEventArgs
+        ///</summary>
+        public ChartGetElementStyleEventArgs(
+            ChartElement chartElement, StyleType styleType, BaseVisualStyle style)
+        {
+            _ChartElement = chartElement;
+            _StyleType = styleType;
+            _Style = style;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the ChartElement.
+        /// </summary>
+        public ChartElement ChartElement
+        {
+            get { return (_ChartElement); }
+        }
+
+        /// <summary>
+        /// Gets the StyleType.
+        /// </summary>
+        public StyleType StyleType
+        {
+            get { return (_StyleType); }
+        }
+
+        /// <summary>
+        /// Gets the Style.
+        /// </summary>
+        public BaseVisualStyle Style
+        {
+            get { return (_Style); }
+
+            set
+            {
+                if (value == null)
+                    throw new Exception("Style cannot be null.");
+
+                _Style = value;
+            }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region ChartGetPieSeriesPointStyleEventArgs
+
+    /// <summary>
+    /// ChartGetPieSeriesPointStyleEventArgs
+    /// </summary>
+    public class ChartGetPieSeriesPointStyleEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private PieSeriesPoint _PieSeriesPoint;
+        private StyleType _StyleType;
+        private BaseVisualStyle _Style;
+
+        #endregion
+
+        /// <summary>
+        /// ChartGetPieSeriesPointStyleEventArgs
+        /// </summary>
+        /// <param name="pieSeriesPoint"></param>
+        /// <param name="styleType"></param>
+        /// <param name="style"></param>
+        public ChartGetPieSeriesPointStyleEventArgs(
+            PieSeriesPoint pieSeriesPoint, StyleType styleType, BaseVisualStyle style)
+        {
+            _PieSeriesPoint = pieSeriesPoint;
+            _StyleType = styleType;
+            _Style = style;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the PieSeriesPoint.
+        /// </summary>
+        public PieSeriesPoint PieSeriesPoint
+        {
+            get { return (_PieSeriesPoint); }
+        }
+
+        /// <summary>
+        /// Gets the StyleType.
+        /// </summary>
+        public StyleType StyleType
+        {
+            get { return (_StyleType); }
+        }
+
+        /// <summary>
+        /// Gets the Style.
+        /// </summary>
+        public BaseVisualStyle Style
+        {
+            get { return (_Style); }
+
+            set
+            {
+                if (value == null)
+                    throw new Exception("Style cannot be null.");
+
+                _Style = value;
+            }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region ChartMatrixResizedEventArgs
+
+    /// <summary>
+    /// ChartMatrixResizedEventArgs
+    /// </summary>
+    public class ChartMatrixResizedEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private ChartPanel _ChartPanel;
+
+        #endregion
+
+        /// <summary>
+        /// ChartMatrixResizedEventArgs
+        /// </summary>
+        /// <param name="chartPanel"></param>
+        public ChartMatrixResizedEventArgs(ChartPanel chartPanel)
+        {
+            _ChartPanel = chartPanel;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated ChartPanel
+        /// </summary>
+        public ChartPanel ChartPanel
+        {
+            get { return (_ChartPanel); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region ChartMouseClickEventArgs
+
+    /// <summary>
+    /// ChartMouseClickEventArgs
+    /// </summary>
+    public class ChartMouseClickEventArgs : CancelEventArgs
+    {
+        #region Private variables
+
+        private BaseChart _BaseChart;
+        private object _HitItem;
+        private MouseEventArgs _MouseEventArgs;
+
+        #endregion
+
+        /// <summary>
+        /// ChartMouseClickEventArgs
+        /// </summary>
+        /// <param name="baseChart"></param>
+        /// <param name="item"></param>
+        /// <param name="e"></param>
+        public ChartMouseClickEventArgs(BaseChart baseChart, object item, MouseEventArgs e)
+        {
+            _BaseChart = baseChart;
+            _HitItem = item;
+            _MouseEventArgs = e;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated BaseChart
+        /// </summary>
+        public BaseChart BaseChart
+        {
+            get { return (_BaseChart); }
+        }
+
+        /// <summary>
+        /// Gets the associated hit item.
+        /// </summary>
+        public object HitItem
+        {
+            get { return (_HitItem); }
+        }
+
+        /// <summary>
+        /// Gets the associated MouseEventArgs
+        /// </summary>
+        public MouseEventArgs MouseEventArgs
+        {
+            get { return (_MouseEventArgs); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region ChartMouseDoubleClickEventArgs
+
+    /// <summary>
+    /// ChartMouseDoubleClickEventArgs
+    /// </summary>
+    public class ChartMouseDoubleClickEventArgs : CancelEventArgs
+    {
+        #region Private variables
+
+        private BaseChart _BaseChart;
+        private ItemHitArea _HitArea;
+        private ChartVisualElement _HitElement;
+        private object _HitItem;
+        private MouseEventArgs _MouseEventArgs;
+
+        #endregion
+
+        /// <summary>
+        /// ChartMouseDoubleClickEventArgs
+        /// </summary>
+        /// <param name="baseChart"></param>
+        /// <param name="hitArea"></param>
+        /// <param name="hitItem"></param>
+        /// <param name="e"></param>
+        public ChartMouseDoubleClickEventArgs(BaseChart baseChart,
+            ItemHitArea hitArea, ChartVisualElement hitElement, object hitItem, MouseEventArgs e)
+        {
+            _BaseChart = baseChart;
+
+            _HitArea = hitArea;
+            _HitItem = hitItem;
+            _HitElement = hitElement;
+
+            _MouseEventArgs = e;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated BaseChart
+        /// </summary>
+        public BaseChart BaseChart
+        {
+            get { return (_BaseChart); }
+        }
+
+        /// <summary>
+        /// Gets the associated hit area.
+        /// </summary>
+        public ItemHitArea HitArea
+        {
+            get { return (_HitArea); }
+        }
+
+        /// <summary>
+        /// Gets the associated hit item.
+        /// </summary>
+        public object HitItem
+        {
+            get { return (_HitItem); }
+        }
+
+        /// <summary>
+        /// Gets the associated hit Visual Chart Element.
+        /// </summary>
+        public ChartVisualElement HitElement
+        {
+            get { return (_HitElement); }
+        }
+
+        /// <summary>
+        /// Gets the associated MouseEventArgs
+        /// </summary>
+        public MouseEventArgs MouseEventArgs
+        {
+            get { return (_MouseEventArgs); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region ChartPanelCancelEventArgs
+
+    /// <summary>
+    /// ChartPanelCancelEventArgs
+    /// </summary>
+    public class ChartPanelCancelEventArgs : ChartPanelEventArgs
+    {
+        #region Private variables
+
+        private bool _Cancel;
+
+        #endregion
+
+        ///<summary>
+        /// ChartPanelCancelEventArgs
+        ///</summary>
+        ///<param name="chartControl">Associated ChartControl</param>
+        ///<param name="chartControl">Associated ChartPanel</param>
+        public ChartPanelCancelEventArgs(ChartPanel chartPanel)
+            : base(chartPanel)
+        {
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets or sets whether to cancel the default operation.
+        /// </summary>
+        public bool Cancel
+        {
+            get { return (_Cancel); }
+            set { _Cancel = value; }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region ChartPanelEventArgs
+
+    /// <summary>
+    /// ChartPanelEventArgs
+    /// </summary>
+    public class ChartPanelEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private ChartPanel _ChartPanel;
+
+        #endregion
+
+        ///<summary>
+        /// ChartPanelEventArgs
+        ///</summary>
+        ///<param name="chartControl">Associated ChartControl</param>
+        ///<param name="chartControl">Associated ChartPanel</param>
+        public ChartPanelEventArgs(ChartPanel chartPanel)
+        {
+            _ChartPanel = chartPanel;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated ChartPanel
+        /// </summary>
+        public ChartPanel ChartPanel
+        {
+            get { return (_ChartPanel); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region ChartPointLabelUpdateEventArgs
+
+    /// <summary>
+    /// ChartPointLabelUpdateEventArgs
+    /// </summary>
+    public class ChartPointLabelUpdateEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private BaseChart _Chart;
+        private ChartSeries _ChartSeries;
+        private List<PointLabel> _PointLabels;
+
+        #endregion
+
+        ///<summary>
+        /// ChartPointLabelUpdateEventArgs
+        ///</summary>
+        public ChartPointLabelUpdateEventArgs(
+            BaseChart chart, ChartSeries chartSeries, List<PointLabel> pointLabels)
+        {
+            _Chart = chart;
+            _ChartSeries = chartSeries;
+            _PointLabels = pointLabels;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated BaseChart.
+        /// </summary>
+        public BaseChart Chart
+        {
+            get { return (_Chart); }
+        }
+
+        /// <summary>
+        /// Gets the associated ChartSeries.
+        /// </summary>
+        public ChartSeries ChartSeries
+        {
+            get { return (_ChartSeries); }
+        }
+
+        /// <summary>
+        /// Gets the associated list of PointLabels.
+        /// </summary>
+        public List<PointLabel> PointLabels
+        {
+            get { return (_PointLabels); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region ChartScrollEventArgs
+
+    /// <summary>
+    /// ChartScrollEventArgs
+    /// </summary>
+    public class ChartScrollEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private ChartContainer _ChartContainer;
+        private ScrollEventArgs _ScrollEventArgs;
+
+        #endregion
+
+        ///<summary>
+        /// ChartScrollEventArgs
+        ///</summary>
+        ///<param name="ChartContainer"></param>
+        ///<param name="scrollEventArgs"></param>
+        public ChartScrollEventArgs(
+            ChartContainer chartContainer, ScrollEventArgs scrollEventArgs)
+        {
+            _ChartContainer = chartContainer;
+            _ScrollEventArgs = scrollEventArgs;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the ChartContainer that was scrolled
+        /// </summary>
+        public ChartContainer ChartContainer
+        {
+            get { return (_ChartContainer); }
+        }
+
+        /// <summary>
+        /// Gets the scroll event args
+        /// </summary>
+        public ScrollEventArgs ScrollEventArgs
+        {
+            get { return (_ScrollEventArgs); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region ChartScrollBarValueChangedEventArgs
+
+    /// <summary>
+    /// ChartScrollBarValueChangedEventArgs
+    /// </summary>
+    public class ChartScrollBarValueChangedEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private ChartContainer _ChartContainer;
+
+        private int _OldValue;
+        private int _NewValue;
+
+        #endregion
+
+        ///<summary>
+        /// ChartScrollBarValueChangedEventArgs
+        ///</summary>
+        ///<param name="chartContainer"></param>
+        ///<param name="oldValue"></param>
+        ///<param name="newValue"></param>
+        public ChartScrollBarValueChangedEventArgs(
+            ChartContainer chartContainer, int oldValue, int newValue)
+        {
+            _ChartContainer = chartContainer;
+
+            _OldValue = oldValue;
+            _NewValue = newValue;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated ChartContainer
+        /// </summary>
+        public ChartContainer ChartContainer
+        {
+            get { return (_ChartContainer); }
+        }
+
+        /// <summary>
+        /// Gets the old scroll Value
+        /// </summary>
+        public int OldValue
+        {
+            get { return (_OldValue); }
+        }
+
+        /// <summary>
+        /// Gets the new scroll Value
+        /// </summary>
+        public int NewValue
+        {
+            get { return (_NewValue); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region ChartTitleMarkupLinkClickEventArgs
+
+    /// <summary>
+    /// ChartTitleMarkupLinkClickEventArgs
+    /// </summary>
+    public class ChartTitleMarkupLinkClickEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private string _HRef;
+        private string _Name;
+
+        private ChartNote _Title;
+
+        #endregion
+
+        /// <summary>
+        /// ChartTitleMarkupLinkClickEventArgs
+        /// </summary>
+        /// <param name="chartControl"></param>
+        /// <param name="title"></param>
+        /// <param name="name"></param>
+        /// <param name="href"></param>
+        public ChartTitleMarkupLinkClickEventArgs(
+            ChartNote title, string name, string href)
+        {
+            _HRef = href;
+            _Name = name;
+
+            _Title = title;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated HyperLink HRef
+        /// </summary>
+        public string HRef
+        {
+            get { return (_HRef); }
+        }
+
+        /// <summary>
+        /// Gets the associated HyperLink Name
+        /// </summary>
+        public string Name
+        {
+            get { return (_Name); }
+        }
+
+        /// <summary>
+        /// Gets the associated Title
+        /// </summary>
+        public ChartNote Title
+        {
+            get { return (_Title); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GetCrosshairAxisLabelEventArgs
+
+    /// <summary>
+    /// GetCrosshairAxisLabelEventArgs
+    /// </summary>
+    public class GetCrosshairAxisLabelEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private ChartAxis _ChartAxis;
+        private object _Value;
+        private string _LabelText;
+
+        #endregion
+
+        /// <summary>
+        /// GetCrosshairAxisLabelEventArgs
+        /// </summary>
+        /// <param name="axis">ChartAxis</param>
+        /// <param name="value">object</param>
+        /// <param name="labelText">string List</param>
+        public GetCrosshairAxisLabelEventArgs(
+            ChartAxis axis, object value, string labelText)
+        {
+            _ChartAxis = axis;
+            _Value = value;
+            _LabelText = labelText;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated ChartAxis
+        /// </summary>
+        public ChartAxis ChartAxis
+        {
+            get { return (_ChartAxis); }
+        }
+
+        /// <summary>
+        /// Gets the associated ChartXy
+        /// </summary>
+        public ChartXy ChartXy
+        {
+            get { return ((ChartXy)_ChartAxis.Parent); }
+        }
+
+        /// <summary>
+        /// Gets the associated label Value
+        /// </summary>
+        public object Value
+        {
+            get { return (_Value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the label Text
+        /// </summary>
+        public string LabelText
+        {
+            get { return (_LabelText); }
+            set { _LabelText = value; }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GetCrosshairLabelHeaderEventArgs
+
+    /// <summary>
+    /// GetCrosshairLabelHeaderEventArgs
+    /// </summary>
+    public class GetCrosshairLabelHeaderEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private BaseChart _Chart;
+        private CrosshairPoint _CrosshairPoint;
+        private List<CrosshairPoint> _CrosshairPoints;
+        private string _Text;
+
+        #endregion
+
+        /// <summary>
+        /// GetCrosshairLabelHeaderEventArgs
+        /// </summary>
+        /// <param name="chart">BaseChart</param>
+        /// <param name="cp">CrosshairPoint</param>
+        /// <param name="cps">CrosshairPoint List</param>
+        /// <param name="text">Default header text</param>
+        public GetCrosshairLabelHeaderEventArgs(
+            BaseChart chart, CrosshairPoint cp, List<CrosshairPoint> cps, string text)
+        {
+            _Chart = chart;
+            _CrosshairPoint = cp;
+            _CrosshairPoints = cps;
+            _Text = text;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated BaseChart
+        /// </summary>
+        public BaseChart Chart
+        {
+            get { return (_Chart); }
+        }
+
+        /// <summary>
+        /// Gets the associated CrosshairPoint (for which
+        /// the header text is defined for)
+        /// </summary>
+        public CrosshairPoint CrosshairPoint
+        {
+            get { return (_CrosshairPoint); }
+        }
+
+        /// <summary>
+        /// Gets the full list of CrosshairPoints
+        /// </summary>
+        public List<CrosshairPoint> CrosshairPoints
+        {
+            get { return (_CrosshairPoints); }
+        }
+
+        /// <summary>
+        /// Gets or sets the CrosshairPoint header Text
+        /// </summary>
+        public string Text
+        {
+            get { return (_Text); }
+            set { _Text = value; }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GetCrosshairLabelItemEventArgs
+
+    /// <summary>
+    /// GetCrosshairLabelItemEventArgs
+    /// </summary>
+    public class GetCrosshairLabelItemEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private BaseChart _Chart;
+        private CrosshairPoint _CrosshairPoint;
+        private string _Text;
+
+        #endregion
+
+        /// <summary>
+        /// GetCrosshairLabelItemEventArgs
+        /// </summary>
+        /// <param name="chart">BaseChart</param>
+        /// <param name="cp">CrosshairPoint</param>
+        /// <param name="text">Item text</param>
+        public GetCrosshairLabelItemEventArgs(
+            BaseChart chart, CrosshairPoint cp, string text)
+        {
+            _Chart = chart;
+            _CrosshairPoint = cp;
+            _Text = text;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated BaseChart
+        /// </summary>
+        public BaseChart Chart
+        {
+            get { return (_Chart); }
+        }
+
+        /// <summary>
+        /// Gets the associated CrosshairPoint
+        /// </summary>
+        public CrosshairPoint CrosshairPoint
+        {
+            get { return (_CrosshairPoint); }
+        }
+
+        /// <summary>
+        /// Gets or sets the CrosshairPoint item Text
+        /// </summary>
+        public string Text
+        {
+            get { return (_Text); }
+            set { _Text = value; }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GetPieCenterLabelEventArgs
+
+    /// <summary>
+    /// GetPieCenterLabelEventArgs
+    /// </summary>
+    public class GetPieCenterLabelEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private PieChart _PieChart;
+        private string _LabelText;
+
+        #endregion
+
+        /// <summary>
+        /// GetPieCenterLabelEventArgs
+        /// </summary>
+        /// <param name="pieChart"></param>
+        /// <param name="text"></param>
+        public GetPieCenterLabelEventArgs(PieChart pieChart, string text)
+        {
+            _PieChart = pieChart;
+            _LabelText = text;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated PieChart
+        /// </summary>
+        public PieChart PieChart
+        {
+            get { return (_PieChart); }
+        }
+
+        /// <summary>
+        /// Gets or sets the Center Label Text
+        /// </summary>
+        public string LabelText
+        {
+            get { return (_LabelText); }
+            set { _LabelText = value; }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GetSliceLabelEventArgs
+
+    /// <summary>
+    /// GetSliceLabelEventArgs
+    /// </summary>
+    public class GetSliceLabelEventArgs : CancelEventArgs
+    {
+        #region Private variables
+
+        private PieChart _Chart;
+        private PieSeries _ChartSeries;
+        private PieSeriesPoint _Psp;
+        private bool _InnerLabel;
+        private string _Text;
+
+        #endregion
+
+        /// <summary>
+        /// GetSliceLabelEventArgs
+        /// </summary>
+        /// <param name="chart"></param>
+        /// <param name="chartSeries"></param>
+        /// <param name="psp"></param>
+        /// <param name="inner"></param>
+        /// <param name="text"></param>
+        /// <returns></returns>
+        public GetSliceLabelEventArgs(PieChart chart,
+            PieSeries chartSeries, PieSeriesPoint psp, bool inner, string text)
+        {
+            _Chart = chart;
+            _ChartSeries = chartSeries;
+            _Psp = psp;
+            _InnerLabel = inner;
+            _Text = text;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated PieChart
+        /// </summary>
+        public PieChart Chart
+        {
+            get { return (_Chart); }
+        }
+
+        /// <summary>
+        /// Gets the associated ChartSeries
+        /// </summary>
+        public PieSeries ChartSeries
+        {
+            get { return (_ChartSeries); }
+        }
+
+        /// <summary>
+        /// Gets the associated PieSeriesPoint
+        /// </summary>
+        public PieSeriesPoint PieSeriesPoint
+        {
+            get { return (_Psp); }
+        }
+
+        /// <summary>
+        /// Gets whether the request is for the inner
+        /// or outer label of the slice.
+        /// </summary>
+        public bool InnerLabel
+        {
+            get { return (_InnerLabel); }
+        }
+
+        /// <summary>
+        /// Gets or sets the label Text
+        /// </summary>
+        public string Text
+        {
+            get { return (_Text); }
+            set { _Text = value; }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GetTickmarkLabelEventArgs
+
+    /// <summary>
+    /// GetTickmarkLabelEventArgs
+    /// </summary>
+    public class GetTickmarkLabelEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private ChartAxis _ChartAxis;
+        private object _Value;
+        private string _LabelText;
+        private Color _LabelColor = Color.Empty;
+
+        #endregion
+
+        /// <summary>
+        /// GetTickmarkLabelEventArgs
+        /// </summary>
+        /// <param name="axis">ChartAxis</param>
+        /// <param name="value">object</param>
+        /// <param name="labelText">string List</param>
+        public GetTickmarkLabelEventArgs(
+            ChartAxis axis, object value, string labelText)
+        {
+            _ChartAxis = axis;
+            _Value = value;
+            _LabelText = labelText;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated ChartAxis
+        /// </summary>
+        public ChartAxis ChartAxis
+        {
+            get { return (_ChartAxis); }
+        }
+
+        /// <summary>
+        /// Gets the associated ChartXy
+        /// </summary>
+        public ChartXy ChartXy
+        {
+            get { return ((ChartXy)_ChartAxis.Parent); }
+        }
+
+        /// <summary>
+        /// Gets the associated label Value
+        /// </summary>
+        public object Value
+        {
+            get { return (_Value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the label Text
+        /// </summary>
+        public string LabelText
+        {
+            get { return (_LabelText); }
+            set { _LabelText = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the label Color
+        /// </summary>
+        public Color LabelColor
+        {
+            get { return (_LabelColor); }
+            set { _LabelColor = value; }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GetToolTipEventArgs
+
+    /// <summary>
+    /// GetToolTipEventArgs
+    /// </summary>
+    public class GetToolTipEventArgs : CancelEventArgs
+    {
+        #region Private variables
+
+        private BaseChart _BaseChart;
+        private BaseSeries _BaseSeries;
+        private SeriesPoint _SeriesPoint;
+
+        private string _ToolTip;
+
+        #endregion
+
+        /// <summary>
+        /// GetToolTipEventArgs
+        /// </summary>
+        /// <param name="baseChart"></param>
+        /// <param name="baseSeries"></param>
+        /// <param name="sp"></param>
+        /// <param name="toolTip"></param>
+        public GetToolTipEventArgs(BaseChart baseChart,
+            BaseSeries baseSeries, SeriesPoint sp, string toolTip)
+        {
+            _BaseChart = baseChart;
+            _BaseSeries = baseSeries;
+            _SeriesPoint = sp;
+
+            _ToolTip = toolTip;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated BaseChart.
+        /// </summary>
+        public BaseChart BaseChart
+        {
+            get { return (_BaseChart); }
+        }
+
+        /// <summary>
+        /// Gets the associated BaseSeries.
+        /// </summary>
+        public BaseSeries BaseSeries
+        {
+            get { return (_BaseSeries); }
+        }
+
+        /// <summary>
+        /// Gets the associated SeriesPoint.
+        /// </summary>
+        public SeriesPoint SeriesPoint
+        {
+            get { return (_SeriesPoint); }
+        }
+
+        /// <summary>
+        /// Gets the associated PieChart.
+        /// </summary>
+        public PieChart PieChart
+        {
+            get { return (_BaseChart as PieChart); }
+        }
+
+        /// <summary>
+        /// Gets the associated PieSeries.
+        /// </summary>
+        public PieSeries PieSeries
+        {
+            get { return (_BaseSeries as PieSeries); }
+        }
+
+        /// <summary>
+        /// Gets the associated PieSeriesPoint.
+        /// </summary>
+        public PieSeriesPoint PieSeriesPoint
+        {
+            get { return (_SeriesPoint as PieSeriesPoint); }
+        }
+
+        /// <summary>
+        /// Gets or sets the associated ToolTip text
+        /// </summary>
+        public string ToolTip
+        {
+            get { return (_ToolTip); }
+            set { _ToolTip = value; }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region LegendItemCheckedChangedEventArgs
+
+    /// <summary>
+    /// LegendItemCheckedChangedEventArgs
+    /// </summary>
+    public class LegendItemCheckedChangedEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private ChartLegend _Legend;
+        private ChartLegendItem _LegendItem;
+
+        #endregion
+
+        ///<summary>
+        /// LegendItemCheckedChangedEventArgs
+        ///</summary>
+        ///<param name="legend">Associated legend</param>
+        ///<param name="legendItem">Associated legend item</param>
+        public LegendItemCheckedChangedEventArgs(
+            ChartLegend legend, ChartLegendItem legendItem)
+        {
+            _Legend = legend;
+            _LegendItem = legendItem;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated Legend.
+        /// </summary>
+        public ChartLegend Legend
+        {
+            get { return (_Legend); }
+        }
+
+        /// <summary>
+        /// Gets the associated LegendItem.
+        /// </summary>
+        public ChartLegendItem LegendItem
+        {
+            get { return (_LegendItem); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region PieCenterMarkupLinkClickEventArgs
+
+    /// <summary>
+    /// PieCenterMarkupLinkClickEventArgs
+    /// </summary>
+    public class PieCenterMarkupLinkClickEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private PieChart _PieChart;
+
+        private string _HRef;
+        private string _Name;
+
+        #endregion
+
+        ///<summary>
+        /// PieCenterMarkupLinkClickEventArgs
+        ///</summary>
+        ///<param name="pieChart"></param>
+        ///<param name="name"></param>
+        ///<param name="href"></param>
+        public PieCenterMarkupLinkClickEventArgs(PieChart pieChart, string name, string href)
+        {
+            _HRef = href;
+            _Name = name;
+
+            _PieChart = pieChart;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated PieChart
+        /// </summary>
+        public PieChart PieChart
+        {
+            get { return (_PieChart); }
+        }
+
+        /// <summary>
+        /// Gets the associated HyperLink HRef
+        /// </summary>
+        public string HRef
+        {
+            get { return (_HRef); }
+        }
+
+        /// <summary>
+        /// Gets the associated HyperLink Name
+        /// </summary>
+        public string Name
+        {
+            get { return (_Name); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region PieDetachChangedEventArgs
+
+    /// <summary>
+    /// PieDetachChangedEventArgs
+    /// </summary>
+    public class PieDetachChangedEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private PieChart _PieChart;
+        private PieSeries _PieSeries;
+        private PieSelectionMode _PieSelectionMode;
+
+        #endregion
+
+        /// <summary>
+        /// PieDetachChangedEventArgs
+        /// </summary>
+        /// <param name="pieChart"></param>
+        /// <param name="pieSeries"></param>
+        /// <param name="psm"></param>
+        public PieDetachChangedEventArgs(
+            PieChart pieChart, PieSeries pieSeries, PieSelectionMode psm)
+        {
+            _PieChart = pieChart;
+            _PieSeries = pieSeries;
+
+            _PieSelectionMode = psm;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated PieChart
+        /// </summary>
+        public PieChart PieChart
+        {
+            get { return (_PieChart); }
+        }
+
+        /// <summary>
+        /// Gets the associated PieSeries.
+        /// </summary>
+        public PieSeries PieSeries
+        {
+            get { return (_PieSeries); }
+        }
+
+        /// <summary>
+        /// Gets the associated PieSelectionMode.
+        /// </summary>
+        public PieSelectionMode PieSelectionMode
+        {
+            get { return (_PieSelectionMode); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region PieExplodeChangedEventArgs
+
+    /// <summary>
+    /// PieExplodeChangedEventArgs
+    /// </summary>
+    public class PieExplodeChangedEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private PieChart _PieChart;
+        private PieSeries _PieSeries;
+
+        #endregion
+
+        /// <summary>
+        /// PieExplodeChangedEventArgs
+        /// </summary>
+        /// <param name="pieChart"></param>
+        /// <param name="pieSeries"></param>
+        public PieExplodeChangedEventArgs(PieChart pieChart, PieSeries pieSeries)
+        {
+            _PieChart = pieChart;
+            _PieSeries = pieSeries;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated PieChart
+        /// </summary>
+        public PieChart PieChart
+        {
+            get { return (_PieChart); }
+        }
+
+        /// <summary>
+        /// Gets the associated PieSeries.
+        /// </summary>
+        public PieSeries PieSeries
+        {
+            get { return (_PieSeries); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region PieRingLevelChangingEventArgs
+
+    /// <summary>
+    /// PieRingLevelChangedEventArgs
+    /// </summary>
+    public class PieRingLevelChangedEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private PieChart _PieChart;
+        private PieSeriesPointCollection _SpcOld;
+        private PieSeriesPointCollection _SpcNew;
+
+        #endregion
+
+        /// <summary>
+        /// PieRingLevelChanged
+        /// </summary>
+        /// <param name="pieChart"></param>
+        /// <param name="spcOld"></param>
+        /// <param name="spcNew"></param>
+        public PieRingLevelChangedEventArgs(
+            PieChart pieChart, PieSeriesPointCollection spcOld, PieSeriesPointCollection spcNew)
+        {
+            _PieChart = pieChart;
+
+            _SpcOld = spcOld;
+            _SpcNew = spcNew;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated PieChart
+        /// </summary>
+        public PieChart PieChart
+        {
+            get { return (_PieChart); }
+        }
+
+        /// <summary>
+        /// Gets the old, post-change PieSeriesPointCollection.
+        /// </summary>
+        public PieSeriesPointCollection SpcOld
+        {
+            get { return (_SpcOld); }
+        }
+
+        /// <summary>
+        /// Gets the new, post-change PieSeriesPointCollection.
+        /// </summary>
+        public PieSeriesPointCollection SpcNew
+        {
+            get { return (_SpcNew); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region PieRingLevelChangingEventArgs
+
+    /// <summary>
+    /// PieRingLevelChanging
+    /// </summary>
+    public class PieRingLevelChangingEventArgs : CancelEventArgs
+    {
+        #region Private variables
+
+        private PieChart _PieChart;
+        private PieSeriesPointCollection _SpcOld;
+        private PieSeriesPointCollection _SpcNew;
+
+        #endregion
+
+        /// <summary>
+        /// PieRingLevelChangingEventArgs
+        /// </summary>
+        /// <param name="pieChart"></param>
+        /// <param name="spcOld"></param>
+        /// <param name="spcNew"></param>
+        public PieRingLevelChangingEventArgs(
+            PieChart pieChart, PieSeriesPointCollection spcOld, PieSeriesPointCollection spcNew)
+        {
+            _PieChart = pieChart;
+
+            _SpcOld = spcOld;
+            _SpcNew = spcNew;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated PieChart
+        /// </summary>
+        public PieChart PieChart
+        {
+            get { return (_PieChart); }
+        }
+
+        /// <summary>
+        /// Gets the old, pre-change PieSeriesPointCollection.
+        /// </summary>
+        public PieSeriesPointCollection SpcOld
+        {
+            get { return (_SpcOld); }
+        }
+
+        /// <summary>
+        /// Gets the new, pre-change PieSeriesPointCollection.
+        /// </summary>
+        public PieSeriesPointCollection SpcNew
+        {
+            get { return (_SpcNew); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region PieSelectionChangedEventArgs
+
+    /// <summary>
+    /// PieSelectionChangedEventArgs
+    /// </summary>
+    public class PieSelectionChangedEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private PieChart _PieChart;
+        private PieSeries _PieSeries;
+        private PieSeriesPoint _PieSeriesPoint;
+        private PieSelectionMode _PieSelectionMode;
+
+        #endregion
+
+        /// <summary>
+        /// PieSelectionChangedEventArgs
+        /// </summary>
+        /// <param name="pieChart"></param>
+        /// <param name="pieSeries"></param>
+        /// <param name="psp"></param>
+        /// <param name="psm"></param>
+        public PieSelectionChangedEventArgs(
+            PieChart pieChart, PieSeries pieSeries, PieSeriesPoint psp, PieSelectionMode psm)
+        {
+            _PieChart = pieChart;
+            _PieSeries = pieSeries;
+
+            _PieSeriesPoint = psp;
+            _PieSelectionMode = psm;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated PieChart
+        /// </summary>
+        public PieChart PieChart
+        {
+            get { return (_PieChart); }
+        }
+
+        /// <summary>
+        /// Gets the associated PieSeries.
+        /// </summary>
+        public PieSeries PieSeries
+        {
+            get { return (_PieSeries); }
+        }
+
+        /// <summary>
+        /// Gets the associated PieSeriesPoint (may not be
+        /// applicable for the associated PieSelectionMode).
+        /// </summary>
+        public PieSeriesPoint PieSeriesPoint
+        {
+            get { return (_PieSeriesPoint); }
+        }
+
+        /// <summary>
+        /// Gets the associated PieSelectionMode.
+        /// </summary>
+        public PieSelectionMode PieSelectionMode
+        {
+            get { return (_PieSelectionMode); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region PostLoadLegendDataEventArgs
+
+    /// <summary>
+    /// PostLoadLegendDataEventArgs
+    /// </summary>
+    public class PostLoadLegendDataEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private ChartLegend _Legend;
+        private ChartContainer _ChartContainer;
+
+        #endregion
+
+        public PostLoadLegendDataEventArgs(ChartLegend legend)
+        {
+            _Legend = legend;
+            _ChartContainer = legend.ParentChartContainer;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated Legend
+        /// </summary>
+        public ChartLegend Legend
+        {
+            get { return (_Legend); }
+        }
+
+        /// <summary>
+        /// Gets the Legend's parent ChartContainer
+        /// </summary>
+        public ChartContainer ChartContainer
+        {
+            get { return (_ChartContainer); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region PostRenderContentBackgroundEventArgs
+
+    /// <summary>
+    /// PostRenderContentBackgroundEventArgs
+    /// </summary>
+    public class PostRenderContentBackgroundEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private Graphics _Graphics;
+        private BaseChart _BaseChart;
+        private Rectangle _Bounds;
+
+        #endregion
+
+        /// <summary>
+        /// PostRenderContentBackgroundEventArgs
+        /// </summary>
+        /// <param name="g">Graphics</param>
+        /// <param name="chart">BaseChart</param>
+        /// <param name="bounds">Bounds</param>
+        public PostRenderContentBackgroundEventArgs(Graphics g, BaseChart baseChart, Rectangle bounds)
+        {
+            _Graphics = g;
+            _BaseChart = baseChart;
+            _Bounds = bounds;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated BaseChart
+        /// </summary>
+        public BaseChart BaseChart
+        {
+            get { return (_BaseChart); }
+        }
+
+        /// <summary>
+        /// Gets the associated ChartXy
+        /// </summary>
+        public ChartXy ChartXy
+        {
+            get { return (_BaseChart as ChartXy); }
+        }
+
+        /// <summary>
+        /// Gets the associated PieChart
+        /// </summary>
+        public PieChart PieChart
+        {
+            get { return (_BaseChart as PieChart); }
+        }
+
+        /// <summary>
+        /// Gets the associated Graphics object
+        /// </summary>
+        public Graphics Graphics
+        {
+            get { return (_Graphics); }
+        }
+
+        /// <summary>
+        /// Gets the associated bounding rectangle
+        /// </summary>
+        public Rectangle Bounds
+        {
+            get { return (_Bounds); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region PostRenderFrameBackgroundEventArgs
+
+    /// <summary>
+    /// PostRenderFrameBackgroundEventArgs
+    /// </summary>
+    public class PostRenderFrameBackgroundEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private Graphics _Graphics;
+        private BaseChart _BaseChart;
+        private Rectangle _Bounds;
+
+        #endregion
+
+        /// <summary>
+        /// PostRenderFrameBackgroundEventArgs
+        /// </summary>
+        /// <param name="g">Graphics</param>
+        /// <param name="chart">BaseChart</param>
+        /// <param name="bounds">Bounds</param>
+        public PostRenderFrameBackgroundEventArgs(Graphics g, BaseChart baseChart, Rectangle bounds)
+        {
+            _Graphics = g;
+            _BaseChart = baseChart;
+            _Bounds = bounds;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated BaseChart
+        /// </summary>
+        public BaseChart BaseChart
+        {
+            get { return (_BaseChart); }
+        }
+
+        /// <summary>
+        /// Gets the associated ChartXy
+        /// </summary>
+        public ChartXy ChartXy
+        {
+            get { return (_BaseChart as ChartXy); }
+        }
+
+        /// <summary>
+        /// Gets the associated PieChart
+        /// </summary>
+        public PieChart PieChart
+        {
+            get { return (_BaseChart as PieChart); }
+        }
+
+        /// <summary>
+        /// Gets the associated Graphics object
+        /// </summary>
+        public Graphics Graphics
+        {
+            get { return (_Graphics); }
+        }
+
+        /// <summary>
+        /// Gets the associated bounding rectangle
+        /// </summary>
+        public Rectangle Bounds
+        {
+            get { return (_Bounds); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region PostRenderPanelBackgroundEventArgs
+
+    /// <summary>
+    /// PostRenderPanelBackgroundEventArgs
+    /// </summary>
+    public class PostRenderPanelBackgroundEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private Graphics _Graphics;
+        private ChartPanel _ChartPanel;
+        private Rectangle _Bounds;
+
+        #endregion
+
+        /// <summary>
+        /// PostRenderPanelBackgroundEventArgs
+        /// </summary>
+        /// <param name="g">Graphics</param>
+        /// <param name="chart">BaseChart</param>
+        /// <param name="bounds">Bounds</param>
+        public PostRenderPanelBackgroundEventArgs(Graphics g, ChartPanel panel, Rectangle bounds)
+        {
+            _Graphics = g;
+            _ChartPanel = panel;
+            _Bounds = bounds;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated ChartPanel
+        /// </summary>
+        public ChartPanel ChartPanel
+        {
+            get { return (_ChartPanel); }
+        }
+
+        /// <summary>
+        /// Gets the associated Graphics object
+        /// </summary>
+        public Graphics Graphics
+        {
+            get { return (_Graphics); }
+        }
+
+        /// <summary>
+        /// Gets the associated bounding rectangle
+        /// </summary>
+        public Rectangle Bounds
+        {
+            get { return (_Bounds); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region PostRenderSeriesBarEventArgs
+
+    /// <summary>
+    /// PostRenderSeriesBarEventArgs
+    /// </summary>
+    public class PostRenderSeriesBarEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private Graphics _Graphics;
+        private BaseChart _Chart;
+        private ChartSeries _ChartSeries;
+        private SeriesPoint _SeriesPoint;
+        private Rectangle _Bounds;
+        private Rectangle _ExtendedBounds;
+        private BarSegment _BarSegment;
+
+        #endregion
+
+        /// <summary>
+        /// PostRenderSeriesBarEventArgs
+        /// </summary>
+        /// <param name="graphics">Graphics</param>
+        /// <param name="chart">BaseChart</param>
+        /// <param name="series">Chart Series</param>
+        /// <param name="sp">SeriesPoint</param>
+        public PostRenderSeriesBarEventArgs(Graphics graphics, BaseChart chart,
+            ChartSeries series, SeriesPoint sp, Rectangle r, Rectangle r2, BarSegment segment)
+        {
+            _Graphics = graphics;
+            _Chart = chart;
+            _ChartSeries = series;
+            _SeriesPoint = sp;
+            _Bounds = r;
+            _ExtendedBounds = r2;
+            _BarSegment = segment;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated BaseChart
+        /// </summary>
+        public BaseChart Chart
+        {
+            get { return (_Chart); }
+        }
+
+        /// <summary>
+        /// Gets the associated ChartSeries
+        /// </summary>
+        public ChartSeries ChartSeries
+        {
+            get { return (_ChartSeries); }
+        }
+
+        /// <summary>
+        /// Gets the associated Graphics object
+        /// </summary>
+        public Graphics Graphics
+        {
+            get { return (_Graphics); }
+        }
+
+        /// <summary>
+        /// Gets the bounds for the bar segment.
+        /// </summary>
+        public Rectangle Bounds
+        {
+            get { return (_Bounds); }
+        }
+
+        /// <summary>
+        /// Gets the associated SeriesPoint
+        /// </summary>
+        public SeriesPoint SeriesPoint
+        {
+            get { return (_SeriesPoint); }
+        }
+
+        /// <summary>
+        /// Gets the 'extended' rectangle for the bar (calculated based
+        /// upon the series maximum displayed bar bounds).
+        /// </summary>
+        public Rectangle ExtendedBounds
+        {
+            get { return (_ExtendedBounds); }
+        }
+
+        /// <summary>
+        /// Gets the associated 'segment' of the bar being rendered.
+        /// </summary>
+        public BarSegment BarSegment
+        {
+            get { return (_BarSegment); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region PostRenderSeriesHiLoBarEventArgs
+
+    /// <summary>
+    /// PreRenderSeriesHiLoBarEventArgs
+    /// </summary>
+    public class PostRenderSeriesHiLoBarEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private Graphics _Graphics;
+
+        private BaseChart _Chart;
+        private ChartSeries _ChartSeries;
+
+        private HiLoRenderData _RenderData;
+        private HiLoBarSegment _BarSegment;
+
+        private Point _Pt1;
+        private Point _Pt2;
+
+        #endregion
+
+        /// <summary>
+        /// PostRenderSeriesHiLoBarEventArgs
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="chartXy"></param>
+        /// <param name="chartSeries"></param>
+        /// <param name="rd"></param>
+        /// <param name="pt1"></param>
+        /// <param name="pt2"></param>
+        /// <param name="segment"></param>
+        public PostRenderSeriesHiLoBarEventArgs(Graphics g, BaseChart chart,
+            ChartSeries series, HiLoRenderData rd, Point pt1, Point pt2, HiLoBarSegment segment)
+        {
+            _Graphics = g;
+
+            _Chart = chart;
+            _ChartSeries = series;
+
+            _RenderData = rd;
+            _BarSegment = segment;
+
+            _Pt1 = pt1;
+            _Pt2 = pt2;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated BaseChart
+        /// </summary>
+        public BaseChart Chart
+        {
+            get { return (_Chart); }
+        }
+
+        /// <summary>
+        /// Gets the associated ChartSeries
+        /// </summary>
+        public ChartSeries ChartSeries
+        {
+            get { return (_ChartSeries); }
+        }
+
+        /// <summary>
+        /// Gets the associated Graphics object
+        /// </summary>
+        public Graphics Graphics
+        {
+            get { return (_Graphics); }
+        }
+
+        /// <summary>
+        /// Gets the associated HiLo RenderData.
+        /// </summary>
+        public HiLoRenderData RenderData
+        {
+            get { return (_RenderData); }
+        }
+
+        /// <summary>
+        /// Gets the associated HiLo BarSegment.
+        /// </summary>
+        public HiLoBarSegment BarSegment
+        {
+            get { return (_BarSegment); }
+        }
+
+        /// <summary>
+        /// Gets the initial segment Point.
+        /// </summary>
+        public Point Point1
+        {
+            get { return (_Pt1); }
+        }
+
+        /// <summary>
+        /// Gets the terminal segment Point.
+        /// </summary>
+        public Point Point2
+        {
+            get { return (_Pt2); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region PostRenderSliceEventArgs
+
+    /// <summary>
+    /// PostRenderSliceEventArgs
+    /// </summary>
+    public class PostRenderSliceEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private Graphics _Graphics;
+        private GraphicsPath _GraphicsPath;
+
+        private PieChart _PieChart;
+        private PieSeries _PieSeries;
+        private PieSeriesPoint _PieSeriesPoint;
+
+        private SliceRenderType _SliceRenderType;
+
+        #endregion
+
+        /// <summary>
+        /// PostRenderSliceEventArgs
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="path"></param>
+        /// <param name="pieChart"></param>
+        /// <param name="pieSeries"></param>
+        /// <param name="psp"></param>
+        /// <param name="type"></param>
+        public PostRenderSliceEventArgs(Graphics g, GraphicsPath path,
+            PieChart pieChart, PieSeries pieSeries, PieSeriesPoint psp, SliceRenderType rtype)
+        {
+            _Graphics = g;
+            _GraphicsPath = path;
+
+            _PieChart = pieChart;
+            _PieSeries = pieSeries;
+            _PieSeriesPoint = psp;
+
+            _SliceRenderType = rtype;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated PieChart
+        /// </summary>
+        public PieChart PieChart
+        {
+            get { return (_PieChart); }
+        }
+
+        /// <summary>
+        /// Gets the associated PieSeries
+        /// </summary>
+        public PieSeries PieSeries
+        {
+            get { return (_PieSeries); }
+        }
+
+        /// <summary>
+        /// Gets the associated PieSeriesPoint
+        /// </summary>
+        public PieSeriesPoint PieSeriesPoint
+        {
+            get { return (PieSeriesPoint); }
+        }
+
+        /// <summary>
+        /// Gets the associated Graphics object
+        /// </summary>
+        public Graphics Graphics
+        {
+            get { return (_Graphics); }
+        }
+
+        /// <summary>
+        /// Gets the GraphicsPath for the slice.
+        /// </summary>
+        public GraphicsPath GraphicsPath
+        {
+            get { return (_GraphicsPath); }
+        }
+
+        /// <summary>
+        /// Gets the SliceRenderType - they 'type' of slice element being rendered.
+        /// </summary>
+        public SliceRenderType SliceRenderType
+        {
+            get { return (_SliceRenderType); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region PostRenderPieCenterBackgroundEventArgs
+
+    /// <summary>
+    /// PostRenderPieCenterBackgroundEventArgs
+    /// </summary>
+    public class PostRenderPieCenterBackgroundEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private Graphics _Graphics;
+        private PieChart _PieChart;
+        private Rectangle _CenterBounds;
+
+        #endregion
+
+        /// <summary>
+        /// PostRenderPieCenterBackgroundEventArgs
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="pieChart"></param>
+        /// <param name="rc"></param>
+        public PostRenderPieCenterBackgroundEventArgs(
+            Graphics g, PieChart pieChart, Rectangle rc)
+        {
+            _Graphics = g;
+            _PieChart = pieChart;
+            _CenterBounds = rc;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated PieChart
+        /// </summary>
+        public PieChart PieChart
+        {
+            get { return (_PieChart); }
+        }
+
+        /// <summary>
+        /// Gets the Pie Center Bounds.
+        /// </summary>
+        public Rectangle CenterBounds
+        {
+            get { return (_CenterBounds); }
+        }
+
+        /// <summary>
+        /// Gets the associated Graphics object
+        /// </summary>
+        public Graphics Graphics
+        {
+            get { return (_Graphics); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region PostRenderPieCenterContentEventArgs
+
+    /// <summary>
+    /// PostRenderPieCenterContentEventArgs
+    /// </summary>
+    public class PostRenderPieCenterContentEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private Graphics _Graphics;
+        private PieChart _PieChart;
+        private Rectangle _TextBounds;
+        private string _CenterLabel;
+
+        #endregion
+
+        /// <summary>
+        /// PostRenderPieCenterContentEventArgs
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="pieChart"></param>
+        /// <param name="rt"></param>
+        /// <param name="centerlabel"></param>
+        public PostRenderPieCenterContentEventArgs(
+            Graphics g, PieChart pieChart, Rectangle rt, string centerlabel)
+        {
+            _Graphics = g;
+            _PieChart = pieChart;
+            _TextBounds = rt;
+            _CenterLabel = centerlabel;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated PieChart
+        /// </summary>
+        public PieChart PieChart
+        {
+            get { return (_PieChart); }
+        }
+
+        /// <summary>
+        /// Gets the Pie Center Text Bounds.
+        /// </summary>
+        public Rectangle TextBounds
+        {
+            get { return (_TextBounds); }
+        }
+
+        /// <summary>
+        /// Gets the center text label.
+        /// </summary>
+        public string CenterLabel
+        {
+            get { return (_CenterLabel); }
+        }
+
+        /// <summary>
+        /// Gets the associated Graphics object
+        /// </summary>
+        public Graphics Graphics
+        {
+            get { return (_Graphics); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region PostRenderPointConnectorEventArgs
+
+    /// <summary>
+    /// PostRenderPointConnectorEventArgs
+    /// </summary>
+    public class PostRenderPointConnectorEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private Graphics _Graphics;
+        private BaseChart _Chart;
+        private ChartSeries _ChartSeries;
+        private PointLabel _PointLabel;
+        private bool _IsCrosshairPoint;
+        private Point _DataPoint;
+        private Point _LabelPoint;
+
+        #endregion
+
+        /// <summary>
+        /// PostRenderPointConnectorEventArgs
+        /// </summary>
+        /// <param name="graphics">Graphics</param>
+        /// <param name="chart">BaseChart</param>
+        /// <param name="series">Chart Series</param>
+        /// <param name="pointLabel">PointLabel</param>
+        /// <param name="isCrosshairPoint">Is the point a crosshair point</param>
+        /// <param name="dataPt">Data Point</param>
+        /// <param name="labelPt">Label Point</param>
+        public PostRenderPointConnectorEventArgs(Graphics graphics, BaseChart chart,
+            ChartSeries series, PointLabel pointLabel, bool isCrosshairPt, Point dataPt, Point labelPt)
+        {
+            _Graphics = graphics;
+            _Chart = chart;
+            _ChartSeries = series;
+            _PointLabel = pointLabel;
+            _IsCrosshairPoint = isCrosshairPt;
+            _DataPoint = dataPt;
+            _LabelPoint = labelPt;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated BaseChart.
+        /// </summary>
+        public BaseChart Chart
+        {
+            get { return (_Chart); }
+        }
+
+        /// <summary>
+        /// Gets the associated ChartSeries.
+        /// </summary>
+        public ChartSeries ChartSeries
+        {
+            get { return (_ChartSeries); }
+        }
+
+        /// <summary>
+        /// Gets the associated Graphics object.
+        /// </summary>
+        public Graphics Graphics
+        {
+            get { return (_Graphics); }
+        }
+
+        /// <summary>
+        /// Gets the associated PointLabel.
+        /// </summary>
+        public PointLabel PointLabel
+        {
+            get { return (_PointLabel); }
+        }
+
+        /// <summary>
+        /// Gets the whether the point is a Crosshair Point.
+        /// </summary>
+        public bool IsCrosshairPoint
+        {
+            get { return (_IsCrosshairPoint); }
+        }
+
+        /// <summary>
+        /// Gets the data-side Connector Point.
+        /// </summary>
+        public Point DataPoint
+        {
+            get { return (_DataPoint); }
+        }
+
+        /// <summary>
+        /// Gets the label-side Connector Point.
+        /// </summary>
+        public Point LabelPoint
+        {
+            get { return (_LabelPoint); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region PostRenderPointLabelEventArgs
+
+    /// <summary>
+    /// PostRenderPointLabelEventArgs
+    /// </summary>
+    public class PostRenderPointLabelEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private Graphics _Graphics;
+        private BaseChart _Chart;
+        private ChartSeries _ChartSeries;
+        private PointLabel _PointLabel;
+        private bool _IsCrosshairPoint;
+        private Rectangle _Bounds;
+
+        #endregion
+
+        /// <summary>
+        /// PostRenderPointLabelEventArgs
+        /// </summary>
+        /// <param name="graphics">Graphics</param>
+        /// <param name="chart">BaseChart</param>
+        /// <param name="series">Chart Series</param>
+        /// <param name="pointLabel">PointLabel</param>
+        /// <param name="isCrosshairPoint">Is the point a crosshair point</param>
+        /// <param name="bounds">Display Bounds</param>
+        public PostRenderPointLabelEventArgs(Graphics graphics, BaseChart chart,
+           ChartSeries series, PointLabel pointLabel, bool isCrosshairPoint, Rectangle bounds)
+        {
+            _Graphics = graphics;
+            _Chart = chart;
+            _ChartSeries = series;
+            _PointLabel = pointLabel;
+            _IsCrosshairPoint = isCrosshairPoint;
+            _Bounds = bounds;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated BaseChart.
+        /// </summary>
+        public BaseChart Chart
+        {
+            get { return (_Chart); }
+        }
+
+        /// <summary>
+        /// Gets the associated ChartSeries.
+        /// </summary>
+        public ChartSeries ChartSeries
+        {
+            get { return (_ChartSeries); }
+        }
+
+        /// <summary>
+        /// Gets the associated Graphics object.
+        /// </summary>
+        public Graphics Graphics
+        {
+            get { return (_Graphics); }
+        }
+
+        /// <summary>
+        /// Gets the associated PointLabel.
+        /// </summary>
+        public PointLabel PointLabel
+        {
+            get { return (_PointLabel); }
+        }
+
+        /// <summary>
+        /// Gets the whether the point is a Crosshair Point.
+        /// </summary>
+        public bool IsCrosshairPoint
+        {
+            get { return (_IsCrosshairPoint); }
+        }
+
+        /// <summary>
+        /// Gets the bounding display rectangle.
+        /// </summary>
+        public Rectangle Bounds
+        {
+            get { return (_Bounds); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region PostRenderRadialGridEventArgs
+
+    /// <summary>
+    /// PostRenderRadialGridEventArgs
+    /// </summary>
+    public class PostRenderRadialGridEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private Graphics _Graphics;
+
+        private PieChart _PieChart;
+
+        private double _OuterRadius;
+        private double _InnerRadius;
+        private double _ExpDelta;
+
+        #endregion
+
+        /// <summary>
+        /// PostRenderRadialGridEventArgs
+        /// </summary>
+        /// <param name="graphics"></param>
+        /// <param name="pieChart"></param>
+        /// <param name="outerRadius"></param>
+        /// <param name="innerRadius"></param>
+        /// <param name="exp"></param>
+        public PostRenderRadialGridEventArgs(Graphics graphics,
+            PieChart pieChart, double outerRadius, double innerRadius, double exp)
+        {
+            _Graphics = graphics;
+
+            _PieChart = pieChart;
+
+            _OuterRadius = outerRadius;
+            _InnerRadius = innerRadius;
+            _ExpDelta = exp;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated PieChart.
+        /// </summary>
+        public PieChart PieChart
+        {
+            get { return (_PieChart); }
+        }
+
+        /// <summary>
+        /// Gets the inner, bounding radius for the grid.
+        /// </summary>
+        public double InnerRadius
+        {
+            get { return (_InnerRadius); }
+        }
+
+        /// <summary>
+        /// Gets the outer, bounding radius for the grid.
+        /// </summary>
+        public double OuterRadius
+        {
+            get { return (_OuterRadius); }
+        }
+
+        /// <summary>
+        /// Gets the expanded/exploded delta for the grid.  This is
+        /// the adjustment needed if the pie has been expanded. If you
+        /// want to render an expanded grid, then this delta should be
+        /// added to both the inner and outer radius values.
+        /// </summary>
+        public double ExpDelta
+        {
+            get { return (_ExpDelta); }
+        }
+
+        /// <summary>
+        /// Gets the associated Graphics object.
+        /// </summary>
+        public Graphics Graphics
+        {
+            get { return (_Graphics); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region PostRenderSeriesPointEventArgs
+
+    /// <summary>
+    /// PostRenderSeriesPointEventArgs
+    /// </summary>
+    public class PostRenderSeriesPointEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private Graphics _Graphics;
+        private BaseChart _Chart;
+        private ChartSeries _ChartSeries;
+        private Point _Point;
+        private SeriesPoint _SeriesPoint;
+        private Size _PointSize;
+        private Image _Marker;
+
+        #endregion
+
+        /// <summary>
+        /// PostRenderSeriesPointEventArgs
+        /// </summary>
+        /// <param name="graphics">Graphics</param>
+        /// <param name="chart">BaseChart</param>
+        /// <param name="series">Chart Series</param>
+        /// <param name="pt">Marker Point (center)</param>
+        /// <param name="sp">SeriesPoint</param>
+        /// <param name="pointSize">Max marker point size</param>
+        /// <param name="marker">Marker Image</param>
+        public PostRenderSeriesPointEventArgs(Graphics graphics,
+            BaseChart chart, ChartSeries series, SeriesPoint sp, Point pt, Size pointSize, Image marker)
+        {
+            _Graphics = graphics;
+            _Chart = chart;
+            _ChartSeries = series;
+            _Point = pt;
+            _SeriesPoint = sp;
+            _PointSize = pointSize;
+            _Marker = marker;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated BaseChart
+        /// </summary>
+        public BaseChart Chart
+        {
+            get { return (_Chart); }
+        }
+
+        /// <summary>
+        /// Gets the associated ChartSeries
+        /// </summary>
+        public ChartSeries ChartSeries
+        {
+            get { return (_ChartSeries); }
+        }
+
+        /// <summary>
+        /// Gets the associated Graphics object
+        /// </summary>
+        public Graphics Graphics
+        {
+            get { return (_Graphics); }
+        }
+
+        /// <summary>
+        /// Gets the center point for the marker
+        /// </summary>
+        public Point Point
+        {
+            get { return (_Point); }
+        }
+
+        /// <summary>
+        /// Gets the associated SeriesPoint
+        /// </summary>
+        public SeriesPoint SeriesPoint
+        {
+            get { return (_SeriesPoint); }
+        }
+
+        /// <summary>
+        /// Gets the max size for the point marker
+        /// </summary>
+        public Size PointSize
+        {
+            get { return (_PointSize); }
+        }
+
+        /// <summary>
+        /// Gets the associated marker Image
+        /// </summary>
+        public Image Marker
+        {
+            get { return (_Marker); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region PreLoadLegendDataEventArgs
+
+    /// <summary>
+    /// PreLoadLegendDataEventArgs
+    /// </summary>
+    public class PreLoadLegendDataEventArgs : CancelEventArgs
+    {
+        #region Private variables
+
+        private ChartLegend _Legend;
+        private ChartContainer _ChartContainer;
+
+        #endregion
+
+        public PreLoadLegendDataEventArgs(ChartLegend legend)
+        {
+            _Legend = legend;
+            _ChartContainer = legend.ParentChartContainer;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated Legend
+        /// </summary>
+        public ChartLegend Legend
+        {
+            get { return (_Legend); }
+        }
+
+        /// <summary>
+        /// Gets the Legend's parent ChartContainer
+        /// </summary>
+        public ChartContainer ChartContainer
+        {
+            get { return (_ChartContainer); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region PreRenderContentBackgroundEventArgs
+
+    /// <summary>
+    /// PreRenderContentBackgroundEventArgs
+    /// </summary>
+    public class PreRenderContentBackgroundEventArgs : CancelEventArgs
+    {
+        #region Private variables
+
+        private Graphics _Graphics;
+        private BaseChart _BaseChart;
+        private Rectangle _Bounds;
+
+        #endregion
+
+        /// <summary>
+        /// PreRenderContentBackgroundEventArgs
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="baseChart"></param>
+        /// <param name="r"></param>
+        public PreRenderContentBackgroundEventArgs(Graphics g, BaseChart baseChart, Rectangle r)
+        {
+            _Graphics = g;
+            _BaseChart = baseChart;
+            _Bounds = r;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated BaseChart
+        /// </summary>
+        public BaseChart BaseChart
+        {
+            get { return (_BaseChart); }
+        }
+
+        /// <summary>
+        /// Gets the associated ChartXy
+        /// </summary>
+        public ChartXy ChartXy
+        {
+            get { return (_BaseChart as ChartXy); }
+        }
+
+        /// <summary>
+        /// Gets the associated PieChart
+        /// </summary>
+        public PieChart PieChart
+        {
+            get { return (_BaseChart as PieChart); }
+        }
+
+        /// <summary>
+        /// Gets the associated Graphics object
+        /// </summary>
+        public Graphics Graphics
+        {
+            get { return (_Graphics); }
+        }
+
+        /// <summary>
+        /// Gets the bounds for the bar segment.
+        /// </summary>
+        public Rectangle Bounds
+        {
+            get { return (_Bounds); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region PreRenderFrameBackgroundEventArgs
+
+    /// <summary>
+    /// PreRenderFrameBackgroundEventArgs
+    /// </summary>
+    public class PreRenderFrameBackgroundEventArgs : CancelEventArgs
+    {
+        #region Private variables
+
+        private Graphics _Graphics;
+        private BaseChart _BaseChart;
+        private Rectangle _Bounds;
+
+        #endregion
+
+        /// <summary>
+        /// PreRenderFrameBackgroundEventArgs
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="baseChart"></param>
+        /// <param name="r"></param>
+        public PreRenderFrameBackgroundEventArgs(Graphics g, BaseChart baseChart, Rectangle r)
+        {
+            _Graphics = g;
+            _BaseChart = baseChart;
+            _Bounds = r;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated BaseChart
+        /// </summary>
+        public BaseChart BaseChart
+        {
+            get { return (_BaseChart); }
+        }
+
+        /// <summary>
+        /// Gets the associated ChartXy
+        /// </summary>
+        public ChartXy ChartXy
+        {
+            get { return (_BaseChart as ChartXy); }
+        }
+
+        /// <summary>
+        /// Gets the associated PieChart
+        /// </summary>
+        public PieChart PieChart
+        {
+            get { return (_BaseChart as PieChart); }
+        }
+
+        /// <summary>
+        /// Gets the associated Graphics object
+        /// </summary>
+        public Graphics Graphics
+        {
+            get { return (_Graphics); }
+        }
+
+        /// <summary>
+        /// Gets the bounds for the bar segment.
+        /// </summary>
+        public Rectangle Bounds
+        {
+            get { return (_Bounds); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region PreRenderPanelBackgroundEventArgs
+
+    /// <summary>
+    /// PreRenderPanelBackgroundEventArgs
+    /// </summary>
+    public class PreRenderPanelBackgroundEventArgs : CancelEventArgs
+    {
+        #region Private variables
+
+        private Graphics _Graphics;
+        private ChartPanel _ChartPanel;
+        private Rectangle _Bounds;
+
+        #endregion
+
+        /// <summary>
+        /// PreRenderPanelBackgroundEventArgs
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="panel"></param>
+        /// <param name="r"></param>
+        public PreRenderPanelBackgroundEventArgs(Graphics g, ChartPanel panel, Rectangle r)
+        {
+            _Graphics = g;
+            _ChartPanel = panel;
+            _Bounds = r;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated ChartPanel
+        /// </summary>
+        public ChartPanel ChartPanel
+        {
+            get { return (_ChartPanel); }
+        }
+
+        /// <summary>
+        /// Gets the associated Graphics object
+        /// </summary>
+        public Graphics Graphics
+        {
+            get { return (_Graphics); }
+        }
+
+        /// <summary>
+        /// Gets the bounds for the bar segment.
+        /// </summary>
+        public Rectangle Bounds
+        {
+            get { return (_Bounds); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region PreRenderPieCenterBackgroundEventArgs
+
+    /// <summary>
+    /// PreRenderPieCenterBackgroundEventArgs
+    /// </summary>
+    public class PreRenderPieCenterBackgroundEventArgs : CancelEventArgs
+    {
+        #region Private variables
+
+        private Graphics _Graphics;
+        private PieChart _PieChart;
+        private Rectangle _CenterBounds;
+
+        #endregion
+
+        /// <summary>
+        /// PreRenderPieCenterBackgroundEventArgs
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="pieChart"></param>
+        /// <param name="rc"></param>
+        public PreRenderPieCenterBackgroundEventArgs(
+            Graphics g, PieChart pieChart, Rectangle rc)
+        {
+            _Graphics = g;
+            _PieChart = pieChart;
+            _CenterBounds = rc;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated PieChart
+        /// </summary>
+        public PieChart PieChart
+        {
+            get { return (_PieChart); }
+        }
+
+        /// <summary>
+        /// Gets the Pie Center Bounds.
+        /// </summary>
+        public Rectangle CenterBounds
+        {
+            get { return (_CenterBounds); }
+        }
+
+        /// <summary>
+        /// Gets the associated Graphics object
+        /// </summary>
+        public Graphics Graphics
+        {
+            get { return (_Graphics); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region PreRenderPieCenterContentEventArgs
+
+    /// <summary>
+    /// PreRenderPieCenterContentEventArgs
+    /// </summary>
+    public class PreRenderPieCenterContentEventArgs : CancelEventArgs
+    {
+        #region Private variables
+
+        private Graphics _Graphics;
+        private PieChart _PieChart;
+        private Rectangle _TextBounds;
+        private string _CenterLabel;
+
+        #endregion
+
+        /// <summary>
+        /// PreRenderPieCenterContentEventArgs
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="pieChart"></param>
+        /// <param name="rt"></param>
+        /// <param name="centerlabel"></param>
+        public PreRenderPieCenterContentEventArgs(
+            Graphics g, PieChart pieChart, Rectangle rt, string centerlabel)
+        {
+            _Graphics = g;
+            _PieChart = pieChart;
+            _TextBounds = rt;
+            _CenterLabel = centerlabel;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated PieChart
+        /// </summary>
+        public PieChart PieChart
+        {
+            get { return (_PieChart); }
+        }
+
+        /// <summary>
+        /// Gets the Pie Center Text Bounds.
+        /// </summary>
+        public Rectangle TextBounds
+        {
+            get { return (_TextBounds); }
+        }
+
+        /// <summary>
+        /// Gets the center text label.
+        /// </summary>
+        public string CenterLabel
+        {
+            get { return (_CenterLabel); }
+        }
+
+        /// <summary>
+        /// Gets the associated Graphics object
+        /// </summary>
+        public Graphics Graphics
+        {
+            get { return (_Graphics); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region PreRenderPointConnectorEventArgs
+
+    /// <summary>
+    /// PreRenderPointConnectorEventArgs
+    /// </summary>
+    public class PreRenderPointConnectorEventArgs : CancelEventArgs
+    {
+        #region Private variables
+
+        private Graphics _Graphics;
+        private BaseChart _Chart;
+        private ChartSeries _ChartSeries;
+        private PointLabel _PointLabel;
+        private bool _IsCrosshairPoint;
+        private Point _DataPoint;
+        private Point _LabelPoint;
+
+        #endregion
+
+        /// <summary>
+        /// PreRenderPointConnectorEventArgs
+        /// </summary>
+        /// <param name="graphics">Graphics</param>
+        /// <param name="chart">BaseChart</param>
+        /// <param name="series">Chart Series</param>
+        /// <param name="pointLabel">PointLabel</param>
+        /// <param name="isCrosshairPoint">Is the point a crosshair point</param>
+        /// <param name="dataPt">Data Point</param>
+        /// <param name="labelPt">Label Point</param>
+        public PreRenderPointConnectorEventArgs(Graphics graphics, BaseChart chart,
+            ChartSeries series, PointLabel pointLabel, bool isCrosshairPt, Point dataPt, Point labelPt)
+        {
+            _Graphics = graphics;
+            _Chart = chart;
+            _ChartSeries = series;
+            _PointLabel = pointLabel;
+            _IsCrosshairPoint = isCrosshairPt;
+            _DataPoint = dataPt;
+            _LabelPoint = labelPt;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated BaseChart.
+        /// </summary>
+        public BaseChart Chart
+        {
+            get { return (_Chart); }
+        }
+
+        /// <summary>
+        /// Gets the associated ChartSeries.
+        /// </summary>
+        public ChartSeries ChartSeries
+        {
+            get { return (_ChartSeries); }
+        }
+
+        /// <summary>
+        /// Gets the associated Graphics object.
+        /// </summary>
+        public Graphics Graphics
+        {
+            get { return (_Graphics); }
+        }
+
+        /// <summary>
+        /// Gets the associated PointLabel.
+        /// </summary>
+        public PointLabel PointLabel
+        {
+            get { return (_PointLabel); }
+        }
+
+        /// <summary>
+        /// Gets the whether the point is a Crosshair Point.
+        /// </summary>
+        public bool IsCrosshairPoint
+        {
+            get { return (_IsCrosshairPoint); }
+        }
+
+        /// <summary>
+        /// Gets the data-side Connector Point.
+        /// </summary>
+        public Point DataPoint
+        {
+            get { return (_DataPoint); }
+        }
+
+        /// <summary>
+        /// Gets the label-side Connector Point.
+        /// </summary>
+        public Point LabelPoint
+        {
+            get { return (_LabelPoint); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region PreRenderPointLabelEventArgs
+
+    /// <summary>
+    /// PreRenderPointLabelEventArgs
+    /// </summary>
+    public class PreRenderPointLabelEventArgs : CancelEventArgs
+    {
+        #region Private variables
+
+        private Graphics _Graphics;
+        private BaseChart _Chart;
+        private ChartSeries _ChartSeries;
+        private PointLabel _PointLabel;
+        private bool _IsCrosshairPoint;
+        private Rectangle _Bounds;
+
+        #endregion
+
+        /// <summary>
+        /// PreRenderPointLabelEventArgs
+        /// </summary>
+        /// <param name="graphics">Graphics</param>
+        /// <param name="chart">BaseChart</param>
+        /// <param name="series">Chart Series</param>
+        /// <param name="pointLabel">PointLabel</param>
+        /// <param name="isCrosshairPoint">Is the point a crosshair point</param>
+        /// <param name="bounds">Display Bounds</param>
+        public PreRenderPointLabelEventArgs(Graphics graphics, BaseChart chart,
+           ChartSeries series, PointLabel pointLabel, bool isCrosshairPoint, Rectangle bounds)
+        {
+            _Graphics = graphics;
+            _Chart = chart;
+            _ChartSeries = series;
+            _PointLabel = pointLabel;
+            _IsCrosshairPoint = isCrosshairPoint;
+            _Bounds = bounds;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated BaseChart.
+        /// </summary>
+        public BaseChart Chart
+        {
+            get { return (_Chart); }
+        }
+
+        /// <summary>
+        /// Gets the associated ChartSeries.
+        /// </summary>
+        public ChartSeries ChartSeries
+        {
+            get { return (_ChartSeries); }
+        }
+
+        /// <summary>
+        /// Gets the associated Graphics object.
+        /// </summary>
+        public Graphics Graphics
+        {
+            get { return (_Graphics); }
+        }
+
+        /// <summary>
+        /// Gets the associated PointLabel.
+        /// </summary>
+        public PointLabel PointLabel
+        {
+            get { return (_PointLabel); }
+        }
+
+        /// <summary>
+        /// Gets the whether the point is a Crosshair Point.
+        /// </summary>
+        public bool IsCrosshairPoint
+        {
+            get { return (_IsCrosshairPoint); }
+        }
+
+        /// <summary>
+        /// Gets the bounding display rectangle.
+        /// </summary>
+        public Rectangle Bounds
+        {
+            get { return (_Bounds); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region PreRenderRadialGridEventArgs
+
+    /// <summary>
+    /// PreRenderRadialGridEventArgs
+    /// </summary>
+    public class PreRenderRadialGridEventArgs : CancelEventArgs
+    {
+        #region Private variables
+
+        private Graphics _Graphics;
+
+        private PieChart _PieChart;
+
+        private double _OuterRadius;
+        private double _InnerRadius;
+        private double _ExpDelta;
+
+        #endregion
+
+        /// <summary>
+        /// PreRenderRadialGridEventArgs
+        /// </summary>
+        /// <param name="graphics"></param>
+        /// <param name="pieChart"></param>
+        /// <param name="outerRadius"></param>
+        /// <param name="innerRadius"></param>
+        /// <param name="exp"></param>
+        public PreRenderRadialGridEventArgs(Graphics graphics,
+            PieChart pieChart, double outerRadius, double innerRadius, double exp)
+        {
+            _Graphics = graphics;
+
+            _PieChart = pieChart;
+
+            _OuterRadius = outerRadius;
+            _InnerRadius = innerRadius;
+            _ExpDelta = exp;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated PieChart.
+        /// </summary>
+        public PieChart PieChart
+        {
+            get { return (_PieChart); }
+        }
+
+        /// <summary>
+        /// Gets the inner, bounding radius for the grid.
+        /// </summary>
+        public double InnerRadius
+        {
+            get { return (_InnerRadius); }
+        }
+
+        /// <summary>
+        /// Gets the outer, bounding radius for the grid.
+        /// </summary>
+        public double OuterRadius
+        {
+            get { return (_OuterRadius); }
+        }
+
+        /// <summary>
+        /// Gets the expanded/exploded delta for the grid.  This is
+        /// the adjustment needed if the pie has been expanded. If you
+        /// want to render an expanded grid, then this delta should be
+        /// added to both the inner and outer radius values.
+        /// </summary>
+        public double ExpDelta
+        {
+            get { return (_ExpDelta); }
+        }
+
+        /// <summary>
+        /// Gets the associated Graphics object.
+        /// </summary>
+        public Graphics Graphics
+        {
+            get { return (_Graphics); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region PreRenderSeriesBarEventArgs
+
+    /// <summary>
+    /// PreRenderSeriesBarEventArgs
+    /// </summary>
+    public class PreRenderSeriesBarEventArgs : CancelEventArgs
+    {
+        #region Private variables
+
+        private Graphics _Graphics;
+        private BaseChart _Chart;
+        private ChartSeries _ChartSeries;
+        private SeriesPoint _SeriesPoint;
+        private Rectangle _Bounds;
+        private Rectangle _FillRangeBounds;
+        private BarSegment _BarSegment;
+
+        #endregion
+
+        /// <summary>
+        /// PreRenderSeriesBarEventArgs
+        /// </summary>
+        /// <param name="graphics"></param>
+        /// <param name="chart"></param>
+        /// <param name="series"></param>
+        /// <param name="sp"></param>
+        /// <param name="r"></param>
+        /// <param name="r2"></param>
+        /// <param name="segment"></param>
+        public PreRenderSeriesBarEventArgs(Graphics graphics, BaseChart chart,
+            ChartSeries series, SeriesPoint sp, Rectangle r, Rectangle r2, BarSegment segment)
+        {
+            _Graphics = graphics;
+            _Chart = chart;
+            _ChartSeries = series;
+            _SeriesPoint = sp;
+            _Bounds = r;
+            _FillRangeBounds = r2;
+            _BarSegment = segment;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated BaseChart
+        /// </summary>
+        public BaseChart Chart
+        {
+            get { return (_Chart); }
+        }
+
+        /// <summary>
+        /// Gets the associated ChartSeries
+        /// </summary>
+        public ChartSeries ChartSeries
+        {
+            get { return (_ChartSeries); }
+        }
+
+        /// <summary>
+        /// Gets the associated Graphics object
+        /// </summary>
+        public Graphics Graphics
+        {
+            get { return (_Graphics); }
+        }
+
+        /// <summary>
+        /// Gets the bounds for the bar segment.
+        /// </summary>
+        public Rectangle Bounds
+        {
+            get { return (_Bounds); }
+        }
+
+        /// <summary>
+        /// Gets the 'FillRange' bounds for the bar (See ChartXy.FillRange).
+        /// </summary>
+        public Rectangle FillRangeBounds
+        {
+            get { return (_FillRangeBounds); }
+        }
+
+        /// <summary>
+        /// Gets the associated SeriesPoint
+        /// </summary>
+        public SeriesPoint SeriesPoint
+        {
+            get { return (_SeriesPoint); }
+        }
+
+        /// <summary>
+        /// Gets the associated 'segment' of the bar being rendered.
+        /// </summary>
+        public BarSegment BarSegment
+        {
+            get { return (_BarSegment); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region PreRenderSeriesHiLoBarEventArgs
+
+    /// <summary>
+    /// PreRenderSeriesHiLoBarEventArgs
+    /// </summary>
+    public class PreRenderSeriesHiLoBarEventArgs : CancelEventArgs
+    {
+        #region Private variables
+
+        private Graphics _Graphics;
+
+        private BaseChart _Chart;
+        private ChartSeries _ChartSeries;
+
+        private HiLoRenderData _RenderData;
+        private HiLoBarSegment _BarSegment;
+
+        private Point _Pt1;
+        private Point _Pt2;
+
+        #endregion
+
+        /// <summary>
+        /// PreRenderSeriesHiLoBarEventArgs
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="chartXy"></param>
+        /// <param name="chartSeries"></param>
+        /// <param name="rd"></param>
+        /// <param name="pt1"></param>
+        /// <param name="pt2"></param>
+        /// <param name="segment"></param>
+        public PreRenderSeriesHiLoBarEventArgs(Graphics g, BaseChart chart,
+            ChartSeries series, HiLoRenderData rd, Point pt1, Point pt2, HiLoBarSegment segment)
+        {
+            _Graphics = g;
+
+            _Chart = chart;
+            _ChartSeries = series;
+
+            _RenderData = rd;
+            _BarSegment = segment;
+
+            _Pt1 = pt1;
+            _Pt2 = pt2;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated BaseChart
+        /// </summary>
+        public BaseChart Chart
+        {
+            get { return (_Chart); }
+        }
+
+        /// <summary>
+        /// Gets the associated ChartSeries
+        /// </summary>
+        public ChartSeries ChartSeries
+        {
+            get { return (_ChartSeries); }
+        }
+
+        /// <summary>
+        /// Gets the associated Graphics object
+        /// </summary>
+        public Graphics Graphics
+        {
+            get { return (_Graphics); }
+        }
+
+        /// <summary>
+        /// Gets the associated HiLo RenderData.
+        /// </summary>
+        public HiLoRenderData RenderData
+        {
+            get { return (_RenderData); }
+        }
+
+        /// <summary>
+        /// Gets the associated HiLo BarSegment.
+        /// </summary>
+        public HiLoBarSegment BarSegment
+        {
+            get { return (_BarSegment); }
+        }
+
+        /// <summary>
+        /// Gets the initial segment Point.
+        /// </summary>
+        public Point Point1
+        {
+            get { return (_Pt1); }
+        }
+
+        /// <summary>
+        /// Gets the terminal segment Point.
+        /// </summary>
+        public Point Point2
+        {
+            get { return (_Pt2); }
+        }
+
+        /// <summary>
+        /// Gets the associated SeriesPoint
+        /// </summary>
+        public SeriesPoint SeriesPoint
+        {
+            get { return (_RenderData.Sp); }
+        }
+
+        /// <summary>
+        /// Gets the associated SeriesPoint index
+        /// </summary>
+        public int SeriesPointIndex
+        {
+            get { return (_RenderData.Index); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region PreRenderSeriesPointEventArgs
+
+    /// <summary>
+    /// PreRenderSeriesPointEventArgs
+    /// </summary>
+    public class PreRenderSeriesPointEventArgs : CancelEventArgs
+    {
+        #region Private variables
+
+        private Graphics _Graphics;
+        private BaseChart _Chart;
+        private ChartSeries _ChartSeries;
+        private Point _Point;
+        private SeriesPoint _SeriesPoint;
+        private Size _PointSize;
+        private Image _Marker;
+
+        #endregion
+
+        /// <summary>
+        /// PreRenderSeriesPointEventArgs
+        /// </summary>
+        /// <param name="graphics">Graphics</param>
+        /// <param name="chart">BaseChart</param>
+        /// <param name="series">Chart Series</param>
+        /// <param name="pt">Marker Point (center)</param>
+        /// <param name="sp">SeriesPoint</param>
+        /// <param name="pointSize">Max marker point size</param>
+        /// <param name="marker">Marker Image</param>
+        public PreRenderSeriesPointEventArgs(Graphics graphics,
+            BaseChart chart, ChartSeries series, SeriesPoint sp, Point pt, Size pointSize, Image marker)
+        {
+            _Graphics = graphics;
+            _Chart = chart;
+            _ChartSeries = series;
+            _Point = pt;
+            _SeriesPoint = sp;
+            _PointSize = pointSize;
+            _Marker = marker;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated BaseChart
+        /// </summary>
+        public BaseChart Chart
+        {
+            get { return (_Chart); }
+        }
+
+        /// <summary>
+        /// Gets the associated ChartSeries
+        /// </summary>
+        public ChartSeries ChartSeries
+        {
+            get { return (_ChartSeries); }
+        }
+
+        /// <summary>
+        /// Gets the associated Graphics object
+        /// </summary>
+        public Graphics Graphics
+        {
+            get { return (_Graphics); }
+        }
+
+        /// <summary>
+        /// Gets the center point for the marker
+        /// </summary>
+        public Point Point
+        {
+            get { return (_Point); }
+        }
+
+        /// <summary>
+        /// Gets the associated SeriesPoint
+        /// </summary>
+        public SeriesPoint SeriesPoint
+        {
+            get { return (_SeriesPoint); }
+        }
+
+        /// <summary>
+        /// Gets the max size for the point marker
+        /// </summary>
+        public Size PointSize
+        {
+            get { return (_PointSize); }
+        }
+
+        /// <summary>
+        /// Gets or sets the associated marker Image
+        /// </summary>
+        public Image Marker
+        {
+            get { return (_Marker); }
+            set { _Marker = value; }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region PreRenderSliceEventArgs
+
+    /// <summary>
+    /// PreRenderSliceEventArgs
+    /// </summary>
+    public class PreRenderSliceEventArgs : CancelEventArgs
+    {
+        #region Private variables
+
+        private Graphics _Graphics;
+        private GraphicsPath _GraphicsPath;
+
+        private PieChart _PieChart;
+        private PieSeries _PieSeries;
+        private PieSeriesPoint _PieSeriesPoint;
+
+        private SliceRenderType _SliceRenderType;
+
+        #endregion
+
+        /// <summary>
+        /// PreRenderSliceEventArgs
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="path"></param>
+        /// <param name="pieChart"></param>
+        /// <param name="pieSeries"></param>
+        /// <param name="psp"></param>
+        /// <param name="rtype"></param>
+        public PreRenderSliceEventArgs(Graphics g, GraphicsPath path,
+            PieChart pieChart, PieSeries pieSeries, PieSeriesPoint psp, SliceRenderType rtype)
+        {
+            _Graphics = g;
+            _GraphicsPath = path;
+
+            _PieChart = pieChart;
+            _PieSeries = pieSeries;
+            _PieSeriesPoint = psp;
+
+            _SliceRenderType = rtype;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated PieChart
+        /// </summary>
+        public PieChart PieChart
+        {
+            get { return (_PieChart); }
+        }
+
+        /// <summary>
+        /// Gets the associated PieSeries
+        /// </summary>
+        public PieSeries PieSeries
+        {
+            get { return (_PieSeries); }
+        }
+
+        /// <summary>
+        /// Gets the associated PieSeriesPoint
+        /// </summary>
+        public PieSeriesPoint PieSeriesPoint
+        {
+            get { return (PieSeriesPoint); }
+        }
+
+        /// <summary>
+        /// Gets the associated Graphics object
+        /// </summary>
+        public Graphics Graphics
+        {
+            get { return (_Graphics); }
+        }
+
+        /// <summary>
+        /// Gets the GraphicsPath for the slice.
+        /// </summary>
+        public GraphicsPath GraphicsPath
+        {
+            get { return (_GraphicsPath); }
+        }
+
+        /// <summary>
+        /// Gets the SliceRenderType - they 'type' of slice element being rendered.
+        /// </summary>
+        public SliceRenderType SliceRenderType
+        {
+            get { return (_SliceRenderType); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region ReferenceLineMarkupLinkClickEventArgs
+
+    /// <summary>
+    /// ReferenceLineMarkupLinkClickEventArgs
+    /// </summary>
+    public class ReferenceLineMarkupLinkClickEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private string _HRef;
+        private string _Name;
+
+        private ReferenceLine _ReferenceLine;
+
+        #endregion
+
+        /// <summary>
+        /// ReferenceLineMarkupLinkClickEventArgs
+        /// </summary>
+        /// <param name="referenceLine"></param>
+        /// <param name="name"></param>
+        /// <param name="href"></param>
+        public ReferenceLineMarkupLinkClickEventArgs(
+            ReferenceLine referenceLine, string name, string href)
+        {
+            _HRef = href;
+            _Name = name;
+
+            _ReferenceLine = referenceLine;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated HyperLink HRef
+        /// </summary>
+        public string HRef
+        {
+            get { return (_HRef); }
+        }
+
+        /// <summary>
+        /// Gets the associated HyperLink Name
+        /// </summary>
+        public string Name
+        {
+            get { return (_Name); }
+        }
+
+        /// <summary>
+        /// Gets the associated ReferenceLine
+        /// </summary>
+        public ReferenceLine ReferenceLine
+        {
+            get { return (_ReferenceLine); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region RenderCrosshairCalloutEventArgs
+
+    /// <summary>
+    /// RenderCrosshairCalloutEventArgs
+    /// </summary>
+    public class RenderCrosshairCalloutEventArgs : CancelEventArgs
+    {
+        #region Private variables
+
+        private Graphics _Graphics;
+        private BaseChart _Chart;
+        private Rectangle _Bounds;
+        private Point _Point;
+        private CrosshairVisualStyle _Style;
+
+        #endregion
+
+        /// <summary>
+        /// RenderCrosshairCalloutEventArgs
+        /// </summary>
+        /// <param name="graphics">Graphics</param>
+        /// <param name="chart">BaseChart</param>
+        /// <param name="bounds">Callout bounds</param>
+        /// <param name="pt">Mouse point</param>
+        /// <param name="style">Crosshair style</param>
+        public RenderCrosshairCalloutEventArgs(Graphics graphics,
+            BaseChart chart, Rectangle bounds, Point pt, CrosshairVisualStyle style)
+        {
+            _Graphics = graphics;
+            _Chart = chart;
+            _Bounds = bounds;
+            _Point = pt;
+            _Style = style;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated BaseChart
+        /// </summary>
+        public BaseChart Chart
+        {
+            get { return (_Chart); }
+        }
+
+        /// <summary>
+        /// Gets the associated Graphics object
+        /// </summary>
+        public Graphics Graphics
+        {
+            get { return (_Graphics); }
+        }
+
+        /// <summary>
+        /// Gets the Crosshair style
+        /// </summary>
+        public CrosshairVisualStyle Style
+        {
+            get { return (_Style); }
+        }
+
+        /// <summary>
+        /// Gets the bounding chart Rectangle
+        /// </summary>
+        public Rectangle Bounds
+        {
+            get { return (_Bounds); }
+        }
+
+        /// <summary>
+        /// Gets the associated mouse position
+        /// </summary>
+        public Point Point
+        {
+            get { return (_Point); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region RenderCrosshairLabelEventArgs
+
+    /// <summary>
+    /// RenderCrosshairLabelEventArgs
+    /// </summary>
+    public class RenderCrosshairLabelEventArgs : CancelEventArgs
+    {
+        #region Private variables
+
+        private Graphics _Graphics;
+        private BaseChart _Chart;
+        private Rectangle _Bounds;
+        private List<CrosshairPoint> _CrosshairPoints;
+        private Point _Point;
+
+        #endregion
+
+        /// <summary>
+        /// RenderCrosshairLabelEventArgs
+        /// </summary>
+        /// <param name="graphics">Graphics</param>
+        /// <param name="chart">BaseChart</param>
+        /// <param name="cps">CrosshairPoint list</param>
+        /// <param name="bounds"></param>
+        /// <param name="pt">Mouse Point</param>
+        public RenderCrosshairLabelEventArgs(Graphics graphics,
+            BaseChart chart, List<CrosshairPoint> cps, Rectangle bounds, Point pt)
+        {
+            _Graphics = graphics;
+            _Chart = chart;
+            _CrosshairPoints = cps;
+            _Bounds = bounds;
+            _Point = pt;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated BaseChart
+        /// </summary>
+        public BaseChart Chart
+        {
+            get { return (_Chart); }
+        }
+
+        /// <summary>
+        /// Gets the list of CrosshairPoints
+        /// </summary>
+        public List<CrosshairPoint> CrosshairPoints
+        {
+            get { return (_CrosshairPoints); }
+        }
+
+        /// <summary>
+        /// Gets the associated Graphics object
+        /// </summary>
+        public Graphics Graphics
+        {
+            get { return (_Graphics); }
+        }
+
+        /// <summary>
+        /// Gets the bounding chart Rectangle
+        /// </summary>
+        public Rectangle Bounds
+        {
+            get { return (_Bounds); }
+        }
+
+        /// <summary>
+        /// Gets the associated mouse position
+        /// </summary>
+        public Point Point
+        {
+            get { return (_Point); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region RenderCrosshairLabelItemEventArgs
+
+    /// <summary>
+    /// RenderCrosshairLabelItemEventArgs
+    /// </summary>
+    public class RenderCrosshairLabelItemEventArgs : CancelEventArgs
+    {
+        #region Private variables
+
+        private Graphics _Graphics;
+        private BaseChart _Chart;
+        private CrosshairPoint _CrosshairPoint;
+        private Rectangle _Bounds;
+        private CrosshairVisualStyle _Style;
+
+        #endregion
+
+        /// <summary>
+        /// RenderCrosshairLabelItemEventArgs
+        /// </summary>
+        /// <param name="graphics">Graphics</param>
+        /// <param name="chart">BaseChart</param>
+        /// <param name="cp">CrosshairPoint</param>
+        /// <param name="bounds">Bounding rectangle</param>
+        /// <param name="style">Style</param>
+        public RenderCrosshairLabelItemEventArgs(Graphics graphics,
+            BaseChart chart, CrosshairPoint cp, Rectangle bounds, CrosshairVisualStyle style)
+        {
+            _Graphics = graphics;
+            _Chart = chart;
+            _CrosshairPoint = cp;
+            _Bounds = bounds;
+            _Style = style;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated BaseChart
+        /// </summary>
+        public BaseChart Chart
+        {
+            get { return (_Chart); }
+        }
+
+        /// <summary>
+        /// Gets the associated CrosshairPoint
+        /// </summary>
+        public CrosshairPoint CrosshairPoint
+        {
+            get { return (_CrosshairPoint); }
+        }
+
+        /// <summary>
+        /// Gets the Crosshair style
+        /// </summary>
+        public CrosshairVisualStyle Style
+        {
+            get { return (_Style); }
+        }
+
+        /// <summary>
+        /// Gets the bounding chart Rectangle
+        /// </summary>
+        public Rectangle Bounds
+        {
+            get { return (_Bounds); }
+        }
+
+        /// <summary>
+        /// Gets the associated Graphics object
+        /// </summary>
+        public Graphics Graphics
+        {
+            get { return (_Graphics); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region RenderPieRingOutEventArgs
+
+    /// <summary>
+    /// RenderSliceCenterLineEventArgs
+    /// </summary>
+    public class RenderPieRingOutEventArgs : CancelEventArgs
+    {
+        #region Private variables
+
+        private Graphics _Graphics;
+        private PieChart _PieChart;
+        private Rectangle _RingOutBounds;
+
+        #endregion
+
+        /// <summary>
+        /// RenderPieRingOutEventArgs
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="pieChart"></param>
+        /// <param name="r"></param>
+        public RenderPieRingOutEventArgs(Graphics graphics, PieChart pieChart, Rectangle r)
+        {
+            _Graphics = graphics;
+
+            _PieChart = pieChart;
+            _RingOutBounds = r;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated PieChart
+        /// </summary>
+        public PieChart PieChart
+        {
+            get { return (_PieChart); }
+        }
+
+        /// <summary>
+        /// Gets the associated Ring-Out indicator bounds.
+        /// </summary>
+        public Rectangle RingOutBounds
+        {
+            get { return (_RingOutBounds); }
+        }
+
+        /// <summary>
+        /// Gets the associated Graphics object
+        /// </summary>
+        public Graphics Graphics
+        {
+            get { return (_Graphics); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region RenderSliceCenterLineEventArgs
+
+    /// <summary>
+    /// RenderSliceCenterLineEventArgs
+    /// </summary>
+    public class RenderSliceCenterLineEventArgs : CancelEventArgs
+    {
+        #region Private variables
+
+        private Graphics _Graphics;
+        private PieChart _PieChart;
+        private PieSeriesPoint _PieSeriesPoint;
+        private Point _PtInner;
+        private Point _PtOuter;
+
+        #endregion
+
+        /// <summary>
+        /// RenderSliceCenterLineEventArgs
+        /// </summary>
+        /// <param name="graphics"></param>
+        /// <param name="pieChart"></param>
+        /// <param name="psp"></param>
+        /// <param name="ptInner"></param>
+        /// <param name="ptOuter"></param>
+        public RenderSliceCenterLineEventArgs(Graphics graphics,
+            PieChart pieChart, PieSeriesPoint psp, Point ptInner, Point ptOuter)
+        {
+            _Graphics = graphics;
+
+            _PieChart = pieChart;
+            _PieSeriesPoint = psp;
+
+            _PtInner = ptInner;
+            _PtOuter = ptOuter;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated PieChart
+        /// </summary>
+        public PieChart PieChart
+        {
+            get { return (_PieChart); }
+        }
+
+        /// <summary>
+        /// Gets the associated PieSeriesPoint
+        /// </summary>
+        public PieSeriesPoint PieSeriesPoint
+        {
+            get { return (_PieSeriesPoint); }
+        }
+
+        /// <summary>
+        /// Gets the inner Point for the CenterLine.
+        /// </summary>
+        public Point PtInner
+        {
+            get { return (_PtInner); }
+        }
+
+        /// <summary>
+        /// Gets the outer Point for the CenterLine.
+        /// </summary>
+        public Point PtOuter
+        {
+            get { return (_PtOuter); }
+        }
+
+        /// <summary>
+        /// Gets the associated Graphics object
+        /// </summary>
+        public Graphics Graphics
+        {
+            get { return (_Graphics); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region RenderSliceInnerLabelEventArgs
+
+    /// <summary>
+    /// RenderSliceInnerLabelEventArgs
+    /// </summary>
+    public class RenderSliceInnerLabelEventArgs : CancelEventArgs
+    {
+        #region Private variables
+
+        private Graphics _Graphics;
+        private PieChart _PieChart;
+        private PieSeriesPoint _PieSeriesPoint;
+        private string _Text;
+        private bool _Displayed;
+
+        #endregion
+
+        /// <summary>
+        /// RenderSliceInnerLabelEventArgs
+        /// </summary>
+        /// <param name="graphics"></param>
+        /// <param name="pieChart"></param>
+        /// <param name="psp"></param>
+        /// <param name="text"></param>
+        /// <param name="displayed"></param>
+        public RenderSliceInnerLabelEventArgs(Graphics graphics,
+            PieChart pieChart, PieSeriesPoint psp, string text, bool displayed)
+        {
+            _Graphics = graphics;
+
+            _PieChart = pieChart;
+            _PieSeriesPoint = psp;
+
+            _Text = text;
+            _Displayed = displayed;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated PieChart
+        /// </summary>
+        public PieChart PieChart
+        {
+            get { return (_PieChart); }
+        }
+
+        /// <summary>
+        /// Gets the associated PieSeriesPoint
+        /// </summary>
+        public PieSeriesPoint PieSeriesPoint
+        {
+            get { return (_PieSeriesPoint); }
+        }
+
+        /// <summary>
+        /// Gets the label text.
+        /// </summary>
+        public string Text
+        {
+            get { return (_Text); }
+        }
+
+        /// <summary>
+        /// Gets or sets whether the label text was displayed. This value
+        /// will determine whether the lable will be displayed as an outer
+        /// label when SliceLabelDisplayMode is set to InnerXorOuter.
+        /// </summary>
+        public bool Displayed
+        {
+            get { return (_Displayed); }
+            set { _Displayed = value; }
+        }
+
+        /// <summary>
+        /// Gets the associated Graphics object
+        /// </summary>
+        public Graphics Graphics
+        {
+            get { return (_Graphics); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region RenderSliceOuterLabelEventArgs
+
+    /// <summary>
+    /// RenderSliceOuterLabelEventArgs
+    /// </summary>
+    public class RenderSliceOuterLabelEventArgs : CancelEventArgs
+    {
+        #region Private variables
+
+        private Graphics _Graphics;
+        private PieChart _PieChart;
+        private PieSeriesPoint _PieSeriesPoint;
+        private PieLabel _PieLabel;
+
+        #endregion
+
+        /// <summary>
+        /// RenderSliceOuterLabelEventArgs
+        /// </summary>
+        /// <param name="graphics"></param>
+        /// <param name="pieChart"></param>
+        /// <param name="psp"></param>
+        /// <param name="pl"></param>
+        public RenderSliceOuterLabelEventArgs(
+            Graphics graphics, PieChart pieChart, PieSeriesPoint psp, PieLabel pl)
+        {
+            _Graphics = graphics;
+            _PieChart = pieChart;
+            _PieSeriesPoint = psp;
+            _PieLabel = pl;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated PieChart
+        /// </summary>
+        public PieChart PieChart
+        {
+            get { return (_PieChart); }
+        }
+
+        /// <summary>
+        /// Gets the associated PieSeriesPoint
+        /// </summary>
+        public PieSeriesPoint PieSeriesPoint
+        {
+            get { return (_PieSeriesPoint); }
+        }
+
+        /// <summary>
+        /// Gets the PieLabel defining the label.
+        /// </summary>
+        public PieLabel PieLabel
+        {
+            get { return (_PieLabel); }
+        }
+
+        /// <summary>
+        /// Gets the associated Graphics object
+        /// </summary>
+        public Graphics Graphics
+        {
+            get { return (_Graphics); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region SelectionChangedEventArgs
+
+    /// <summary>
+    /// SelectionChangedEventArgs
+    /// </summary>
+    public class SelectionChangedEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private ChartVisualElement _Item;
+
+        private bool _OldState;
+        private bool _NewState;
+
+        private int _SelectedCount;
+
+        #endregion
+
+        ///<summary>
+        /// SelectionChangedEventArgs
+        ///</summary>
+        ///<param name="item">Associated items changing selected state</param>
+        ///<param name="oldState">Old selected state</param>
+        ///<param name="newState">New selected state</param>
+        ///<param name="selectedCount">Resultant total selected item count</param>
+        public SelectionChangedEventArgs(
+            ChartVisualElement item, bool oldState, bool newState, int selectedCount)
+        {
+            _Item = item;
+
+            _OldState = oldState;
+            _NewState = newState;
+
+            _SelectedCount = selectedCount;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated item.
+        /// </summary>
+        public ChartVisualElement Item
+        {
+            get { return (_Item); }
+        }
+
+        /// <summary>
+        /// Gets the old / previous selected state.
+        /// </summary>
+        public bool OldState
+        {
+            get { return (_OldState); }
+        }
+
+        /// <summary>
+        /// Gets the new / current selected state.
+        /// </summary>
+        public bool NewState
+        {
+            get { return (_NewState); }
+        }
+
+        /// <summary>
+        /// Gets the resultant selected item count.
+        /// </summary>
+        public int SelectedCount
+        {
+            get { return (_SelectedCount); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region SeriesDataBindingCompleteEventArgs
+
+    /// <summary>
+    /// SeriesDataBindingCompleteEventArgs
+    /// </summary>
+    public class SeriesDataBindingCompleteEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private BaseChart _BaseChart;
+        private BaseSeries _BaseSeries;
+
+        private object _Source;
+
+        #endregion
+
+        ///<summary>
+        /// SeriesDataBindingCompleteEventArgs
+        ///</summary>
+        public SeriesDataBindingCompleteEventArgs(BaseChart chart, BaseSeries series, object source)
+        {
+            _BaseChart = chart;
+            _BaseSeries = series;
+
+            _Source = source;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated BaseChart that was bound.
+        /// </summary>
+        public BaseChart BaseChart
+        {
+            get { return (_BaseChart); }
+        }
+
+        /// <summary>
+        /// Gets the associated Chart that was bound.
+        /// </summary>
+        public BaseChart Chart
+        {
+            get { return (_BaseChart); }
+        }
+
+        /// <summary>
+        /// Gets the associated ChartXy that was bound.
+        /// </summary>
+        public ChartXy ChartXy
+        {
+            get { return (_BaseChart as ChartXy); }
+        }
+
+        /// <summary>
+        /// Gets the associated PieChart that was bound.
+        /// </summary>
+        public PieChart PieChart
+        {
+            get { return (_BaseChart as PieChart); }
+        }
+
+        /// <summary>
+        /// Gets the associated BaseSeries that was bound.
+        /// </summary>
+        public BaseSeries BaseSeries
+        {
+            get { return (_BaseSeries); }
+        }
+
+        /// <summary>
+        /// Gets the associated ChartSeries that was bound.
+        /// </summary>
+        public ChartSeries ChartSeries
+        {
+            get { return (_BaseSeries as ChartSeries); }
+        }
+
+        /// <summary>
+        /// Gets the associated PieSeries that was bound.
+        /// </summary>
+        public PieSeries PieSeries
+        {
+            get { return (_BaseSeries as PieSeries); }
+        }
+
+        /// <summary>
+        /// Gets the data source that was bound to.
+        /// </summary>
+        public object Source
+        {
+            get { return (_Source); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #endregion
+
+    #region Attributes
+
+    /// <summary>
+    /// Attribute to control the visibility of individual fields
+    /// or properties in an IList data source to the ChartControl.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Field | AttributeTargets.Property)]
+    public class IsVisibleToChartControl : Attribute
+    {
+        private bool _Visible;
+
+        /// <summary>
+        /// IsVisibleToChartControl
+        /// </summary>
+        /// <param name="visible"></param>
+        public IsVisibleToChartControl(bool visible)
+        {
+            _Visible = visible;
+        }
+
+        /// <summary>
+        /// Visible
+        /// </summary>
+        public bool Visible
+        {
+            get { return (_Visible); }
+            set { _Visible = value; }
+        }
+    }
+
+    #endregion
+
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl.ico b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl.ico
new file mode 100644
index 00000000..9c379579
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl.ico differ
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl.png b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl.png
new file mode 100644
index 00000000..c2570cdd
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl.png differ
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl.snk b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl.snk
new file mode 100644
index 00000000..644c4bc8
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl.snk differ
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/Annotation.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/Annotation.cs
new file mode 100644
index 00000000..c8859b09
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/Annotation.cs	
@@ -0,0 +1,226 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using DevComponents.DotNetBar.Charts.Style;
+using DevComponents.Charts.TextMarkup;
+
+namespace DevComponents.DotNetBar.Charts
+{
+    /// <summary>
+    /// Represents the collection of ChartAnnotations.
+    /// </summary>
+    [Editor("DevComponents.ChartControl.Design.AnnotationCollectionEditor, DevComponents.ChartControl.Design, " +
+            "Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(UITypeEditor))]
+    public class ChartAnnotationCollection : CustomNamedCollection<Annotation>
+    {
+    }
+
+    public class Annotation : ChartNote
+    {
+        #region Private variables
+
+        private States _States;
+
+        private float _ShapeRotation;
+
+        private float _ConnectorRotation;
+        private float _ConnectorLength;
+
+        private AnnotationVisualStyles _AnnotationVisualStyles;
+
+        #endregion
+
+        #region Public properties
+
+        #region AnnotationVisualStyles
+
+        /// <summary>
+        /// Gets or sets the visual styles for the Annotation.
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates the visual styles for the Annotation.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public AnnotationVisualStyles AnnotationVisualStyles
+        {
+            get
+            {
+                if (_AnnotationVisualStyles == null)
+                {
+                    _AnnotationVisualStyles = new AnnotationVisualStyles();
+
+                    StyleVisualChangeHandler(null, _AnnotationVisualStyles);
+                }
+
+                return (_AnnotationVisualStyles);
+            }
+
+            set
+            {
+                if (_AnnotationVisualStyles != value)
+                {
+                    AnnotationVisualStyles oldValue = _AnnotationVisualStyles;
+
+                    _AnnotationVisualStyles = value;
+
+                    OnStyleChanged("AnnotationVisualStyles", oldValue, value);
+
+                    if (oldValue != null)
+                        oldValue.Dispose();
+                }
+            }
+        }
+
+        #endregion
+
+        #region ConnectorLength
+
+        /// <summary>
+        /// Gets or Sets the length of the Annotation Connector.
+        /// </summary>
+        [Category("Appearance")]
+        [Description("Indicates the length of the Annotation Connector.")]
+        public float ConnectorLength
+        {
+            get { return (_ConnectorLength); }
+
+            set
+            {
+                if (_ConnectorLength != value)
+                {
+                    _ConnectorLength = value;
+
+                    OnPropertyChangedEx("ConnectorLength", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ConnectorRotation
+
+        /// <summary>
+        /// Gets or Sets the rotation of the Annotation Connector.
+        /// </summary>
+        [Category("Appearance")]
+        [Description("Indicates the rotation of the Annotation Connector.")]
+        public float ConnectorRotation
+        {
+            get { return (_ConnectorRotation); }
+
+            set
+            {
+                if (_ConnectorRotation != value)
+                {
+                    _ConnectorRotation = value;
+
+                    OnPropertyChangedEx("ConnectorRotation", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShapeRotation
+
+        /// <summary>
+        /// Gets or Sets the rotation of the Annotation Shape.
+        /// </summary>
+        [Category("Appearance")]
+        [Description("Indicates the rotation of the Annotation Shape.")]
+        public float ShapeRotation
+        {
+            get { return (_ShapeRotation); }
+
+            set
+            {
+                if (_ShapeRotation != value)
+                {
+                    _ShapeRotation = value;
+
+                    OnPropertyChangedEx("ShapeRotation", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        protected override void ArrangeOverride(ChartLayoutInfo layoutInfo)
+        {
+            throw new NotImplementedException();
+        }
+
+        protected override void MeasureOverride(ChartLayoutInfo layoutInfo)
+        {
+            throw new NotImplementedException();
+        }
+
+        protected override void RenderOverride(ChartRenderInfo renderInfo)
+        {
+            throw new NotImplementedException();
+        }
+
+        #region Annotation States
+
+        [Flags]
+        private enum States : uint
+        {
+        }
+
+        #region TestState
+
+        private bool TestState(States state)
+        {
+            return ((_States & state) == state);
+        }
+
+        #endregion
+
+        #region SetState
+
+        private void SetState(States state, bool value)
+        {
+            if (value == true)
+                _States |= state;
+            else
+                _States &= ~state;
+        }
+
+        #endregion
+
+        #endregion
+    }
+
+    #region enums
+
+    #region AnnotationShape
+
+    public enum AnnotationShape
+    {
+        NotSet = 0,
+
+        Ellipse,
+        Rectangular,
+    }
+
+    #endregion
+
+    #region ConnectorShape
+
+    public enum ConnectorShape
+    {
+        NotSet = 0,
+
+        None,
+
+        Arrow,
+        Line,
+        Tail,
+    }
+
+    #endregion
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/BaseChart.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/BaseChart.cs
new file mode 100644
index 00000000..3a240889
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/BaseChart.cs	
@@ -0,0 +1,1236 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.Charts.Primitives;
+using DevComponents.DotNetBar.Charts.Style;
+
+namespace DevComponents.DotNetBar.Charts
+{
+    /// <summary>
+    /// Represents a base chart.
+    /// </summary>
+    [TypeConverter(typeof(BlankExpandableObjectConverter))]
+    public class BaseChart : ChartContainer
+    {
+        #region Static variables
+
+        // DNB base color palettes
+
+        static public Color[] PaletteLight = new Color[] { 
+            ColorFactory.GetColor(136, 189, 230),  ColorFactory.GetColor(251, 178, 88),
+            ColorFactory.GetColor(144, 205, 151),  ColorFactory.GetColor(246, 170, 201),
+            ColorFactory.GetColor(191, 165, 84),   ColorFactory.GetColor(188, 153, 199),
+            ColorFactory.GetColor(237, 221, 70),   ColorFactory.GetColor(240, 126, 110),
+            ColorFactory.GetColor(140, 140, 140), };
+
+        static public Color[] PaletteMedium = new Color[] { 
+            ColorFactory.GetColor(93, 165, 218),   ColorFactory.GetColor(250, 164, 58),
+            ColorFactory.GetColor(96, 189, 104),   ColorFactory.GetColor(241, 124, 176),
+            ColorFactory.GetColor(178, 145, 47),   ColorFactory.GetColor(178, 118, 178),
+            ColorFactory.GetColor(222, 207, 63),   ColorFactory.GetColor(241, 88, 84),
+            ColorFactory.GetColor(77, 77, 77), };
+
+        static public Color[] PaletteDark = new Color[] { 
+            ColorFactory.GetColor(38, 93, 171),    ColorFactory.GetColor(223, 92, 36),
+            ColorFactory.GetColor(5, 151, 72),     ColorFactory.GetColor(229, 18, 111),
+            ColorFactory.GetColor(157, 114, 42),   ColorFactory.GetColor(123, 58, 150),
+            ColorFactory.GetColor(199, 180, 46),   ColorFactory.GetColor(203, 32, 39),
+            ColorFactory.GetColor(0, 0, 0), };
+
+        // Excel 2016 colors palettes
+
+        static public Color[] PaletteColor1 = new Color[] { 
+            ColorFactory.GetColor(79, 129, 189),       // Medium Blue
+            ColorFactory.GetColor(192, 80, 77),        // Red
+            ColorFactory.GetColor(155, 187, 89),       // Green
+            ColorFactory.GetColor(128, 100, 162),      // Purple
+            ColorFactory.GetColor(75, 172, 198),       // Light Blue
+            ColorFactory.GetColor(247, 150, 70), };    // Orange
+
+        static public Color[] PaletteColor2 = new Color[] { 
+            ColorFactory.GetColor(79, 129, 180),       // Medium Blue
+            ColorFactory.GetColor(155, 187, 89),       // Green
+            ColorFactory.GetColor(75, 172, 198),       // Light Blue
+            ColorFactory.GetColor(44, 76, 116),        // Dark Blue
+            ColorFactory.GetColor(95, 117, 48),        // Dark Green
+            ColorFactory.GetColor(39, 106, 124), };    // Dark Cyan
+
+        static public Color[] PaletteColor3 = new Color[] { 
+            ColorFactory.GetColor(192, 80, 77),        // Red
+            ColorFactory.GetColor(128, 100, 162),      // Purple
+            ColorFactory.GetColor(247, 150, 70),       // Orange
+            ColorFactory.GetColor(119, 44, 42),        // Dark Red
+            ColorFactory.GetColor(77, 59, 98),         // Dark Purple
+            ColorFactory.GetColor(182, 87, 8), };      // Dark Orange
+
+        static public Color[] PaletteColor4 = new Color[] { 
+            ColorFactory.GetColor(247, 150, 70),       // Orange
+            ColorFactory.GetColor(75, 172, 198),       // Light Blue
+            ColorFactory.GetColor(128, 100, 162),      // Purple
+            ColorFactory.GetColor(182, 87, 8),         // Dark Orange
+            ColorFactory.GetColor(39, 106, 124),       // Dark Cyan
+            ColorFactory.GetColor(77, 59, 98), };      // Dark Purple
+
+        // Monochrome
+
+        static public Color[] PaletteMonoBlue = new Color[] { 
+            ColorFactory.GetColor(56, 93, 138),    ColorFactory.GetColor(66, 109, 161),
+            ColorFactory.GetColor(75, 123, 180),   ColorFactory.GetColor(115, 148, 197),
+            ColorFactory.GetColor(161, 180, 212),  ColorFactory.GetColor(194, 205, 225), };
+
+        static public Color[] PaletteMonoRed = new Color[] { 
+            ColorFactory.GetColor(140, 56, 54),    ColorFactory.GetColor(164, 67, 64),
+            ColorFactory.GetColor(183, 76, 73),    ColorFactory.GetColor(200, 161, 160),
+            ColorFactory.GetColor(214, 180, 212),  ColorFactory.GetColor(226, 194, 194), };
+
+        static public Color[] PaletteMonoGreen = new Color[] { 
+            ColorFactory.GetColor(113, 137, 63),   ColorFactory.GetColor(132, 159, 75),
+            ColorFactory.GetColor(148, 178, 85),   ColorFactory.GetColor(169, 195, 121),
+            ColorFactory.GetColor(192, 210, 164),  ColorFactory.GetColor(213, 224, 196), };
+
+        static public Color[] PaletteMonoPurple = new Color[] { 
+            ColorFactory.GetColor(92, 71, 118),    ColorFactory.GetColor(108, 84, 138),
+            ColorFactory.GetColor(122, 95, 154),   ColorFactory.GetColor(148, 128, 174),
+            ColorFactory.GetColor(179, 168, 196),  ColorFactory.GetColor(205, 198, 215), };
+
+        static public Color[] PaletteMonoTeal = new Color[] { 
+           ColorFactory.GetColor(53, 125, 145),   ColorFactory.GetColor(63, 146, 169),
+           ColorFactory.GetColor(71, 164, 189),   ColorFactory.GetColor(112, 183, 205),
+           ColorFactory.GetColor(160, 202, 217),  ColorFactory.GetColor(193, 219, 229), };
+
+        static public Color[] PaletteMonoOrange = new Color[] { 
+            ColorFactory.GetColor(182, 109, 49),   ColorFactory.GetColor(211, 127, 58),
+            ColorFactory.GetColor(236, 143, 66),   ColorFactory.GetColor(248, 165, 110),
+            ColorFactory.GetColor(249, 190, 158),  ColorFactory.GetColor(251, 211, 193), };
+
+        static public Color[] PaletteMonoGray = new Color[] { 
+            ColorFactory.GetColor(95, 95, 95),     ColorFactory.GetColor(179, 179, 179),
+            ColorFactory.GetColor(137, 137, 137),  ColorFactory.GetColor(33, 33, 33),
+            ColorFactory.GetColor(218, 218, 218),  ColorFactory.GetColor(170, 170, 170), };
+
+        // Palette groups
+
+        static public Color[][] PaletteGroups = new Color[][] { 
+            PaletteColor1, PaletteColor2, PaletteColor3, PaletteColor4,
+
+            PaletteMonoBlue, PaletteMonoRed, PaletteMonoGreen,
+            PaletteMonoPurple, PaletteMonoTeal, PaletteMonoOrange, PaletteMonoGray,
+
+            PaletteLight, PaletteMedium, PaletteDark, };
+
+        #endregion
+
+        #region Private variables
+
+        private States _States;
+
+        private object _DataSource;
+        private string _DataMember;
+        private DataBinder _DataBinder;
+
+        private string _DataPropertyNameSeries;
+        private string _DataPropertyNameX;
+        private CustomCollection<string> _DataPropertyNamesY;
+
+        private ChartBaseSeriesCollection _BaseSeries;
+
+        private object _BoundSource;
+
+        private List<ChartLegendItem> _LegendData;
+
+        private PaletteGroup _PaletteGroup = PaletteGroup.Color1;
+        private Color[] _CustomPalette;
+
+        private int _SeriesPointCount;
+        private int _SeriesLayoutCount;
+
+        private SeriesDisplayOrder _SeriesDisplayOrder = SeriesDisplayOrder.NotSet;
+
+        #endregion
+
+        public BaseChart()
+        {
+            InitDefaultStates();
+
+            VScrollBar.Inverted = true;
+        }
+
+        #region InitDefaultStates
+
+        private void InitDefaultStates()
+        {
+            SetState(States.SeriesRangeChanged, true);
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region AutoGenSeriesCollection
+
+        ///<summary>
+        /// Gets or sets whether series definitions are automatically generated.
+        /// from the associated bound data.
+        ///</summary>
+        [DefaultValue(false), Category("Data")]
+        [Description("Indicates whether series definitions are automatically generated from the associated bound data.")]
+        public bool AutoGenSeriesCollection
+        {
+            get { return (TestState(States.AutoGenSeriesCollection)); }
+
+            set
+            {
+                if (value != AutoGenSeriesCollection)
+                {
+                    SetState(States.AutoGenSeriesCollection, value);
+
+                    OnPropertyChangedEx("AutoGenSeriesCollection", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region BaseSeries
+
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public ChartBaseSeriesCollection BaseSeries
+        {
+            get
+            {
+                if (_BaseSeries == null)
+                    _BaseSeries = GetBaseSeries();
+
+                return (_BaseSeries);
+            }
+
+            set { _BaseSeries = value; }
+        }
+
+        #endregion
+
+        #region GetBaseSeries
+
+        internal virtual ChartBaseSeriesCollection GetBaseSeries()
+        {
+            throw new NotImplementedException();
+        }
+
+        #endregion
+
+        #region CustomPalette
+
+        ///<summary>
+        /// Gets or sets the custom palette for the chart.
+        ///</summary>
+        [DefaultValue(null), Category("Appearance")]
+        [Description("Indicates the custom palette for the chart.")]
+        public virtual Color[] CustomPalette
+        {
+            get { return (_CustomPalette); }
+
+            set
+            {
+                _CustomPalette = value;
+
+                OnPropertyChangedEx("CustomPalette", VisualChangeType.Layout);
+            }
+        }
+
+        #endregion
+
+        #region DataMember
+
+        ///<summary>
+        /// Gets or sets the name of the list or table
+        /// in the data source that the Chart is bound to.
+        ///</summary>
+        [DefaultValue(null), Category("Data")]
+        [Description("Indicates the name of the list or table in the data source that the Chart is bound to.")]
+        public string DataMember
+        {
+            get { return (_DataMember); }
+
+            set
+            {
+                if (_DataBinder != null)
+                    _DataBinder.Clear();
+
+                _DataMember = value;
+
+                NeedToUpdateBindings = true;
+
+                OnPropertyChangedEx("DataMember", VisualChangeType.Layout);
+            }
+        }
+
+        #endregion
+
+        #region DataSource
+
+        ///<summary>
+        /// Gets or sets the data source that the Chart is bound to
+        ///</summary>
+        [DefaultValue(null), AttributeProvider(typeof(IListSource)), Category("Data")]
+        [Description("Indicates the data source that the Chart is bound to.")]
+        public object DataSource
+        {
+            get { return (_DataSource); }
+
+            set
+            {
+                if (_DataBinder != null)
+                    _DataBinder.Clear();
+
+                _DataSource = value;
+
+                NeedToUpdateBindings = true;
+
+                OnPropertyChangedEx("DataSource", VisualChangeType.Layout);
+            }
+        }
+
+        #endregion
+
+        #region DataPropertyNameSeries
+
+        ///<summary>
+        /// Gets or sets the default name of the data field to which the Series Name is bound.
+        ///</summary>
+        [DefaultValue(null), Category("Data")]
+        [Description("Indicates the default name of the data field to which the Series Name is bound.")]
+        public string DataPropertyNameSeries
+        {
+            get { return (_DataPropertyNameSeries); }
+
+            set
+            {
+                if (value != _DataPropertyNameSeries)
+                {
+                    _DataPropertyNameSeries = value;
+
+                    NeedToUpdateBindings = true;
+
+                    InvalidateLayout();
+
+                    OnPropertyChangedEx("DataPropertyNameSeries", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region DataPropertyNameX
+
+        ///<summary>
+        /// Gets or sets the default name of the data field to which the X-Axis data is bound.
+        ///</summary>
+        [DefaultValue(null), Category("Data")]
+        [Description("Indicates the default name of the data field to which the X-Axis data is bound.")]
+        public string DataPropertyNameX
+        {
+            get { return (_DataPropertyNameX); }
+
+            set
+            {
+                if (value != _DataPropertyNameX)
+                {
+                    _DataPropertyNameX = value;
+
+                    NeedToUpdateBindings = true;
+
+                    InvalidateLayout();
+
+                    OnPropertyChangedEx("DataPropertyNameX", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region DataPropertyNamesY
+
+        ///<summary>
+        /// Gets or sets the default names of the data fields to which the Y-Axis data is bound.
+        ///</summary>
+        [DefaultValue(null), Category("Data")]
+        [Description("Indicates the default names of the data fields to which the Y-Axis data is bound.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        [Editor("System.Windows.Forms.Design.StringCollectionEditor, System.Design, Version= 2.0.0.0, Culture=neutral," +
+             "PublicKeyToken=b03f5f7f11d50a3a", typeof(UITypeEditor))]
+        public CustomCollection<string> DataPropertyNamesY
+        {
+            get
+            {
+                if (_DataPropertyNamesY == null)
+                {
+                    _DataPropertyNamesY = new CustomCollection<string>();
+
+                    _DataPropertyNamesY.CollectionChanged += DataPropertyNamesY_CollectionChanged;
+                }
+
+                return (_DataPropertyNamesY);
+            }
+
+            set
+            {
+                if (value != _DataPropertyNamesY)
+                {
+                    if (_DataPropertyNamesY != null)
+                    {
+                        _DataPropertyNamesY.Clear();
+
+                        _DataPropertyNamesY.CollectionChanged -= DataPropertyNamesY_CollectionChanged;
+                    }
+
+                    _DataPropertyNamesY = value;
+
+                    if (_DataPropertyNamesY != null)
+                        _DataPropertyNamesY.CollectionChanged += DataPropertyNamesY_CollectionChanged;
+
+                    OnPropertyChangedEx("DataPropertyNamesY", Style.VisualChangeType.Layout);
+                }
+            }
+        }
+
+        void DataPropertyNamesY_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            NeedToUpdateBindings = true;
+
+            InvalidateLayout();
+        }
+
+        #endregion
+
+        #region EnableDiscreteBoundItems
+
+        /// <summary>
+        /// Gets or sets whether discrete bound item suport is enabled.
+        /// This property permits each List bound item to be a separate object type.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool EnableDiscreteBoundItems
+        {
+            get { return (TestState(States.EnableDiscreteBoundItems)); }
+
+            set
+            {
+                if (value != EnableDiscreteBoundItems)
+                {
+                    SetState(States.EnableDiscreteBoundItems, value);
+
+                    OnPropertyChangedEx("EnableDiscreteBoundItems", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region PaletteGroup
+
+        /// <summary>
+        /// Gets or sets the palette color group to use (Light/Medium/Dark/Color1/MonoBlue/etc).
+        /// </summary>
+        [DefaultValue(PaletteGroup.Color1), Category("Appearance")]
+        [Description("Indicates the palette color group to use (Light/Medium/Dark/Color1/MonoBlue/etc.).")]
+        public virtual PaletteGroup PaletteGroup
+        {
+            get { return (_PaletteGroup); }
+
+            set
+            {
+                if (value != _PaletteGroup)
+                {
+                    _PaletteGroup = value;
+
+                    OnPropertyChangedEx("PaletteGroup", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ReversePaletteColors
+
+        ///<summary>
+        /// Gets or sets whether default palette colors are utilized in reverse order.
+        ///</summary>
+        [DefaultValue(false), Category("Behavior")]
+        [Description("Indicates whether default palette colors are utilized in reverse order.")]
+        public virtual bool ReversePaletteColors
+        {
+            get { return (TestState(States.ReversePaletteColors)); }
+
+            set
+            {
+                if (value != ReversePaletteColors)
+                {
+                    SetState(States.ReversePaletteColors, value);
+
+                    OnPropertyChangedEx("ReversePaletteColors", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region SeriesDisplayOrder
+
+        /// <summary>
+        /// Gets or sets the order in which the charts series are displayed.
+        /// </summary>
+        [DefaultValue(SeriesDisplayOrder.NotSet), Category("Display")]
+        [Description("Indicates the order in which the charts series are displayed.")]
+        public SeriesDisplayOrder SeriesDisplayOrder
+        {
+            get { return (_SeriesDisplayOrder); }
+
+            set
+            {
+                if (value != _SeriesDisplayOrder)
+                {
+                    _SeriesDisplayOrder = value;
+
+                    OnPropertyChangedEx("SeriesDisplayOrder", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region SeriesRangeChanged
+
+        /// <summary>
+        /// Signals to the chart that an underlying chart series data has changed.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool SeriesRangeChanged
+        {
+            get { return (TestState(States.SeriesRangeChanged)); }
+            set { SetState(States.SeriesRangeChanged, value); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region DataBinder
+
+        internal DataBinder DataBinder
+        {
+            get
+            {
+                if (_DataBinder == null)
+                    _DataBinder = new DataBinder(this);
+
+                return (_DataBinder);
+            }
+
+            set
+            {
+                if (_DataBinder != null)
+                    _DataBinder.Clear();
+
+                _DataBinder = value;
+            }
+        }
+
+        #endregion
+
+        #region LegendData
+
+        internal List<ChartLegendItem> LegendData
+        {
+            get { return (_LegendData); }
+            set { _LegendData = value; }
+        }
+
+        #endregion
+
+        #region NeedToUpdateBindings
+
+        internal bool NeedToUpdateBindings
+        {
+            get { return (TestState(States.NeedToUpdateBindings)); }
+            set { SetState(States.NeedToUpdateBindings, value); }
+        }
+
+        #endregion
+
+        #region SeriesLayoutCount
+
+        internal int SeriesLayoutCount
+        {
+            get { return (_SeriesLayoutCount); }
+            set { _SeriesLayoutCount = value; }
+        }
+
+        #endregion
+
+        #region SeriesPointCount
+
+        internal int SeriesPointCount
+        {
+            get { return (_SeriesPointCount); }
+            set { _SeriesPointCount = value; }
+        }
+
+        #endregion
+
+        #region VisibleSeriesCount
+
+        internal int VisibleSeriesCount
+        {
+            get
+            {
+                int count = 0;
+
+                ChartBaseSeriesCollection baseSeries = BaseSeries;
+
+                foreach (BaseSeries series in baseSeries)
+                {
+                    if (series.Visible == true)
+                        count++;
+                }
+
+                return (count);
+            }
+        }
+
+        #endregion
+
+        #region DisplayedSeriesCount
+
+        internal int DisplayedSeriesCount
+        {
+            get
+            {
+                int count = 0;
+
+                ChartBaseSeriesCollection baseSeries = BaseSeries;
+
+                foreach (BaseSeries series in baseSeries)
+                {
+                    if (series.Visible == true)
+                    {
+                        if (Legend.Visible == false ||
+                            (series.ShowCheckBoxInLegend == false || series.CheckedInLegend == true))
+                        {
+                            count++;
+                        }
+                    }
+                }
+
+                return (count);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderFrameBackground
+
+        protected virtual void RenderFrameBackground(
+            Graphics g, Rectangle bounds, ContainerVisualStyle cstyle)
+        {
+            ChartControl chartControl = ChartControl;
+
+            if (chartControl.DoPreRenderFrameBackgroundEvent(g, this, bounds) == false)
+            {
+                cstyle.RenderBackground(g, bounds);
+
+                chartControl.DoPostRenderFrameBackgroundEvent(g, this, bounds);
+            }
+        }
+
+        #endregion
+
+        #region UpdateDataBindings
+
+        protected void UpdateDataBindings()
+        {
+            if (NeedToUpdateBindings == true)
+            {
+                NeedToUpdateBindings = false;
+
+                DataBinder.Clear();
+
+                object boundSource = null;
+
+                if (DataSource != null)
+                    _BoundSource = DataBinder.DataConnect(DataSource, DataMember);
+
+                if (boundSource != null)
+                    ChartControl.DoChartDataBindingCompleteEvent(this, boundSource);
+            }
+        }
+
+        #endregion
+
+        #region FinalizeDataBindings
+
+        protected void FinalizeDataBindings()
+        {
+            if (_BoundSource != null)
+            {
+                ChartControl.DoChartDataBindingCompleteEvent(this, _BoundSource);
+
+                _BoundSource = null;
+            }
+        }
+
+        #endregion
+
+        #region DataCompare
+
+        internal int DataCompare(object value1, object value2)
+        {
+            if (value1 == value2)
+                return (0);
+
+            if (value1 == null)
+                return (-1);
+
+            if (value2 == null)
+                return (1);
+
+            if (value1.GetType() == value2.GetType())
+            {
+                IComparable icompa = value1 as IComparable;
+
+                if (icompa == null)
+                    throw new Exception("Values must support IComparable");
+
+                return (icompa.CompareTo(value2));
+            }
+
+            double v1 = Convert.ToDouble(value1);
+            double v2 = Convert.ToDouble(value2);
+
+            return (v1.CompareTo(v2));
+        }
+
+        #endregion
+
+        #region GetAutoGenSeriesType
+
+        internal virtual SeriesType GetAutoGenSeriesType()
+        {
+            throw new NotImplementedException();
+        }
+
+        #endregion
+
+        #region GetAutoGenSeriesNameCount
+
+        internal virtual int GetAutoGenSeriesNameCount()
+        {
+            throw new NotImplementedException();
+        }
+
+        #endregion
+
+        #region GetNewSeries
+
+        internal virtual BaseSeries GetNewSeries()
+        {
+            throw new NotImplementedException();
+        }
+
+        #endregion
+
+        #region AddChartSeries
+
+        internal virtual void AddChartSeries(BaseSeries series)
+        {
+            throw new NotImplementedException();
+        }
+
+        #endregion
+
+        #region GetPaletteColor
+
+        /// <summary>
+        /// Gets the series default Palette color.
+        /// </summary>
+        /// <returns></returns>
+        public Color GetPaletteColor(int index)
+        {
+            return (GetPaletteColor(index, PaletteGroup));
+        }
+
+        /// <summary>
+        /// Gets the series default Palette color from the
+        /// specified PaletteGroup.
+        /// </summary>
+        /// <param name="index"></param>
+        /// <param name="group"></param>
+        /// <returns></returns>
+        public Color GetPaletteColor(int index, PaletteGroup group)
+        {
+            if (group == PaletteGroup.NotSet)
+                group = PaletteGroup.Color1;
+
+            Color[] palette = (group == PaletteGroup.Custom)
+                ? CustomPalette : PaletteGroups[(int)group];
+
+            return (GetPaletteColor(index, palette, ReversePaletteColors));
+        }
+
+        internal Color GetPaletteColor(
+            int index, Color[] palette, bool reversePaletteColors)
+        {
+            if (palette == null || palette.Length == 0)
+                palette = PaletteColor1;
+
+            int n = index % palette.Length;
+
+            if (reversePaletteColors == true)
+                n = (palette.Length - n - 1);
+
+            index = index % (palette.Length * 3);
+
+            Color color = palette[n];
+
+            if (color.IsEmpty == false)
+            {
+                n = index / palette.Length;
+
+                if (n > 0)
+                {
+                    int z = (int)(Math.Ceiling(n * .75d));
+
+                    float fn = (float)(z) * .05f;
+
+                    if ((n % 2) == 0)
+                        color = ControlPaint.Light(color, fn);
+                    else
+                        color = ControlPaint.Dark(color, fn);
+                }
+            }
+
+            return (color);
+        }
+
+        #endregion
+
+        #region GetShadowBounds
+
+        internal Rectangle GetShadowBounds(Rectangle bounds)
+        {
+            bounds.Width -= 3;
+            bounds.Height -= 3;
+
+            return (bounds);
+        }
+
+        #endregion
+
+        #region Style handling
+
+        #region ApplyStyles
+
+        public override void ApplyStyles(BaseVisualStyle style)
+        {
+            base.ApplyStyles(style);
+        }
+
+        #endregion
+
+        #region ClearEffectiveStyles
+
+        protected override void ClearEffectiveStyles()
+        {
+            base.ClearEffectiveStyles();
+
+            ChartBaseSeriesCollection baseSeries = BaseSeries;
+
+            foreach (BaseSeries series in baseSeries)
+                series.InvalidateStyle();
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ILegendData
+
+        #region GetLegendData
+
+        public override List<ChartLegendItem> GetLegendData()
+        {
+            LegendData = new List<ChartLegendItem>();
+
+            ChartBaseSeriesCollection baseSeries = BaseSeries;
+
+            foreach (BaseSeries series in baseSeries)
+            {
+                if (series.Visible == true)
+                {
+                    List<ChartLegendItem> items = series.GetLegendItems();
+
+                    if (items != null && items.Count > 0)
+                        _LegendData.AddRange(items);
+                }
+            }
+
+            return (_LegendData);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region OnSeriesCheckStateChanged
+
+        internal virtual void OnSeriesCheckStateChanged(string property)
+        {
+        }
+
+        #endregion
+
+        #region Copy/CopyTo
+
+        public override ChartVisualElement Copy()
+        {
+            BaseChart copy = new BaseChart();
+
+            CopyTo(copy);
+
+            return (copy);
+        }
+
+        public override void CopyTo(ChartVisualElement copy)
+        {
+            BaseChart c = copy as BaseChart;
+
+            if (c != null)
+            {
+                base.CopyTo(c);
+
+                c.AutoGenSeriesCollection = AutoGenSeriesCollection;
+
+                if (_CustomPalette != null)
+                {
+                    c.CustomPalette = new Color[CustomPalette.Length];
+
+                    CustomPalette.CopyTo(c.CustomPalette, 0);
+                }
+
+                c.DataMember = DataMember;
+                c.DataSource = DataSource;
+                c.DataPropertyNameSeries = DataPropertyNameSeries;
+                c.DataPropertyNameX = DataPropertyNameX;
+                c.DataPropertyNamesY = DataPropertyNamesY;
+                c.EnableDiscreteBoundItems = EnableDiscreteBoundItems;
+
+                c.PaletteGroup = PaletteGroup;
+                c.ReversePaletteColors = ReversePaletteColors;
+            }
+        }
+
+        #endregion
+
+        #region GetSerialData
+
+        internal override SerialElementCollection GetSerialData(string serialName)
+        {
+            SerialElementCollection sec = new SerialElementCollection();
+
+            if (serialName != null)
+            {
+                if (serialName.Equals("") == true)
+                    serialName = "BaseChart";
+
+                sec.AddStartElement(serialName);
+            }
+
+            sec.AddValue("AutoGenSeriesCollection", AutoGenSeriesCollection, false);
+
+            if (_CustomPalette != null && _CustomPalette.Length > 0)
+            {
+                sec.AddStartElement("CustomPalette count=\"" + _CustomPalette.Length + "\"");
+
+                foreach (Color color in _CustomPalette)
+                    sec.AddValue("PaletteColor", color);
+
+                sec.AddEndElement("CustomPalette");
+            }
+
+            sec.AddDataValue("DataSource", DataSource, null);
+            sec.AddValue("DataMember", DataMember, null);
+
+            sec.AddValue("DataPropertyNameSeries", DataPropertyNameSeries, null);
+            sec.AddValue("DataPropertyNameX", DataPropertyNameX, null);
+
+            if (_DataPropertyNamesY != null && _DataPropertyNamesY.Count > 0)
+            {
+                sec.AddStartElement("DataPropertyNamesYs count=\"" + _DataPropertyNamesY.Count + "\"");
+
+                foreach (string s in _DataPropertyNamesY)
+                    sec.AddValue("DataPropertyNamesY", s);
+
+                sec.AddEndElement("DataPropertyNamesYs");
+            }
+
+            sec.AddValue("EnableDiscreteBoundItems", EnableDiscreteBoundItems, false);
+
+            sec.AddValue("PaletteGroup", PaletteGroup, PaletteGroup.Color1);
+            sec.AddValue("ReversePaletteColors", ReversePaletteColors, false);
+
+            sec.AddElement(base.GetSerialData(null));
+
+            if (serialName != null)
+                sec.AddEndElement(serialName);
+
+            return (sec);
+        }
+
+        #endregion
+
+        #region PutSerialData
+
+        #region ProcessValue
+
+        internal override void ProcessValue(SerialElement se)
+        {
+            switch (se.Name)
+            {
+                case "AutoGenSeriesCollection":
+                    AutoGenSeriesCollection = bool.Parse(se.StringValue);
+                    break;
+
+                case "DataMember":
+                    DataMember = se.StringValue;
+                    break;
+
+                case "DataSource":
+                    DataSource = se.DataValue;
+                    break;
+
+                case "DataPropertyNameSeries":
+                    DataPropertyNameSeries = se.StringValue;
+                    break;
+
+                case "DataPropertyNameX":
+                    DataPropertyNameX = se.StringValue;
+                    break;
+
+                case "DataPropertyNamesY":
+                    DataPropertyNamesY.Add(se.StringValue);
+                    break;
+
+                case "EnableDiscreteBoundItems":
+                    EnableDiscreteBoundItems = bool.Parse(se.StringValue);
+                    break;
+
+                case "PaletteColor":
+                    CustomPalette[se.ValueIndex] = se.GetValueColor();
+                    break;
+
+                case "PaletteGroup":
+                    PaletteGroup = (PaletteGroup)se.GetValueEnum(typeof(PaletteGroup));
+                    break;
+
+                case "ReversePaletteColors":
+                    ReversePaletteColors = bool.Parse(se.StringValue);
+                    break;
+
+                default:
+                    base.ProcessValue(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region ProcessCollection
+
+        internal override void ProcessCollection(SerialElement se)
+        {
+            SerialElementCollection sec = se.Sec;
+
+            switch (se.Name)
+            {
+                case "ChartContainers":
+                    sec.PutSerialData(this);
+                    break;
+
+                case "CustomPalette":
+                    if (se.ArrayCount > 0)
+                    {
+                        CustomPalette = new Color[se.ArrayCount];
+
+                        sec.PutSerialData(this);
+                    }
+                    break;
+
+                case "DataPropertyNamesYs":
+                    if (se.ArrayCount > 0)
+                    {
+                        DataPropertyNamesY = new CustomCollection<string>(se.ArrayCount);
+
+                        sec.PutSerialData(this);
+                    }
+                    break;
+
+                default:
+                    base.ProcessCollection(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region States
+
+        [Flags]
+        private enum States : uint
+        {
+            AutoGenSeriesCollection = (1U << 0),
+            EnableDiscreteBoundItems = (1U << 1),
+            ReversePaletteColors = (1U << 2),
+
+            //------------
+
+            SeriesRangeChanged = (1U << 3),
+            NeedToUpdateBindings = (1U << 4),
+            IsSelected = (1U << 5),
+        }
+
+        #region TestState
+
+        private bool TestState(States state)
+        {
+            return ((_States & state) == state);
+        }
+
+        #endregion
+
+        #region SetState
+
+        private void SetState(States state, bool value)
+        {
+            if (value == true)
+                _States |= state;
+            else
+                _States &= ~state;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IDisposable
+
+        public override void Dispose()
+        {
+            base.Dispose();
+        }
+
+        #endregion
+    }
+
+    #region enums
+
+    #region PaletteGroup
+
+    public enum PaletteGroup
+    {
+        /// <summary>
+        /// NotSet.
+        /// </summary>
+        NotSet = -1,
+
+        /// <summary>
+        ///  Colorful 'Color1' toned pallete
+        /// </summary>
+        Color1,
+
+        /// <summary>
+        ///  Colorful 'Color2' toned pallete
+        /// </summary>
+        Color2,
+
+        /// <summary>
+        ///  Colorful 'Color3' toned pallete
+        /// </summary>
+        Color3,
+
+        /// <summary>
+        ///  Colorful 'Color4' toned pallete
+        /// </summary>
+        Color4,
+
+        /// <summary>
+        ///  Monochromatic 'Blue' toned pallete
+        /// </summary>
+        MonoBlue,
+
+        /// <summary>
+        ///  Monochromatic 'Red' toned pallete
+        /// </summary>
+        MonoRed,
+
+        /// <summary>
+        ///  Monochromatic 'Green' toned pallete
+        /// </summary>
+        MonoGreen,
+
+        /// <summary>
+        ///  Monochromatic 'Purple' toned pallete
+        /// </summary>
+        MonoPurple,
+
+        /// <summary>
+        ///  Monochromatic 'Teal' toned pallete
+        /// </summary>
+        MonoTeal,
+
+        /// <summary>
+        ///  Monochromatic 'Orange' toned pallete
+        /// </summary>
+        MonoOrange,
+
+        /// <summary>
+        ///  Monochromatic 'Gray' toned pallete
+        /// </summary>
+        MonoGray,
+
+        /// <summary>
+        ///  Colorful 'Light' toned pallete
+        /// </summary>
+        Light,
+
+        /// <summary>
+        ///  Colorful 'Medium' toned pallete
+        /// </summary>
+        Medium,
+
+        /// <summary>
+        ///  Colorful 'Dark' toned pallete
+        /// </summary>
+        Dark,
+
+        /// <summary>
+        ///  Custom pallete (CustomPalette property)
+        /// </summary>
+        Custom
+    }
+
+    #endregion
+
+    #endregion
+
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/BaseSeries.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/BaseSeries.cs
new file mode 100644
index 00000000..5a7c6922
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/BaseSeries.cs	
@@ -0,0 +1,1226 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Drawing.Drawing2D;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.Charts.Style;
+
+namespace DevComponents.DotNetBar.Charts
+{
+    /// <summary>
+    /// Represents the collection of BaseSeries.
+    /// </summary>
+    [Editor("DevComponents.Charts.Design.ChartSeriesCollectionEditor, DevComponents.Charts.Design, " +
+            "Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(UITypeEditor))]
+    public class ChartBaseSeriesCollection : CustomNamedCollection<BaseSeries>
+    {
+        #region GetUniqueName
+
+        public string GetUniqueName()
+        {
+            return (GetUniqueName("Series"));
+        }
+
+        #endregion
+    }
+
+    public class BaseSeries : ChartVisualElement, ILegendItem
+    {
+        #region Private variables
+
+        private States _States;
+
+        private SeriesType _SeriesType;
+
+        private int _SeriesId;
+        private object _SeriesKey;
+
+        private object _DataSource;
+        private string _DataMember;
+        private DataBinder _DataBinder;
+
+        private string _DataPropertyNameSeries;
+        private string _DataPropertyNameX;
+        private CustomCollection<string> _DataPropertyNamesY;
+
+        private Color _DefaultPaletteColor = Color.Empty;
+
+        private ChartLegendItemVisualStyles _ChartLegendItemVisualStyles;
+
+        private string _LegendText;
+        private ChartLegendItem _LegendItem;
+
+        private bool _SeriesRangeChanged = true;
+        private Rectangle _RenderBounds;
+
+        #endregion
+
+        #region Constructors
+
+        public BaseSeries()
+            : this(null, SeriesType.Point)
+        {
+        }
+
+        public BaseSeries(SeriesType seriesType)
+            : this(null, seriesType)
+        {
+        }
+
+        public BaseSeries(string name, SeriesType seriesType)
+        {
+            Name = name;
+            SeriesType = seriesType;
+
+            InitDefaultStates();
+        }
+
+        #endregion
+
+        #region InitDefaultStates
+
+        private void InitDefaultStates()
+        {
+            SetState(States.ShowInLegend, true);
+            SetState(States.ShowInParentLegend, true);
+            SetState(States.ShowCheckBoxInLegend, true);
+            SetState(States.ShowMarkerInLegend, true);
+            SetState(States.CheckedInLegend, true);
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region ChartLegendItemVisualStyles
+
+        /// <summary>
+        /// Gets or sets the visual styles for the Legend item.
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates the visual styles for the Legend item.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ChartLegendItemVisualStyles ChartLegendItemVisualStyles
+        {
+            get
+            {
+                if (_ChartLegendItemVisualStyles == null)
+                {
+                    _ChartLegendItemVisualStyles = new ChartLegendItemVisualStyles();
+
+                    StyleVisualChangeHandler(null, _ChartLegendItemVisualStyles);
+                }
+
+                return (_ChartLegendItemVisualStyles);
+            }
+
+            set
+            {
+                if (_ChartLegendItemVisualStyles != value)
+                {
+                    ChartLegendItemVisualStyles oldValue = _ChartLegendItemVisualStyles;
+
+                    _ChartLegendItemVisualStyles = value;
+
+                    OnStyleChanged("ChartLegendItemVisualStyles", oldValue, value);
+
+                    if (oldValue != null)
+                        oldValue.Dispose();
+                }
+            }
+        }
+
+        #endregion
+
+        #region DataMember
+
+        ///<summary>
+        /// Gets or sets the name of the list or table
+        /// in the data source that the Series is bound to.
+        ///</summary>
+        [DefaultValue(null), Category("Data")]
+        [Description("Indicates the name of the list or table in the data source that the Series is bound to.")]
+        public string DataMember
+        {
+            get { return (_DataMember); }
+
+            set
+            {
+                if (_DataBinder != null)
+                    _DataBinder.Clear();
+
+                _DataMember = value;
+
+                NeedToUpdateBindings = true;
+
+                OnPropertyChangedEx("DataMember", VisualChangeType.Layout);
+            }
+        }
+
+        #endregion
+
+        #region DataPropertyNameSeries
+
+        ///<summary>
+        /// Gets or sets the name of the data field to which the Series Name is bound.
+        ///</summary>
+        [DefaultValue(null), Category("Data")]
+        [Description("Indicates the name of the data field to which the Series Name is bound.")]
+        public string DataPropertyNameSeries
+        {
+            get { return (_DataPropertyNameSeries); }
+
+            set
+            {
+                if (value != _DataPropertyNameSeries)
+                {
+                    _DataPropertyNameSeries = value;
+
+                    if (NeedToUpdateBindings == false)
+                    {
+                        NeedToUpdateBindings = true;
+
+                        InvalidateLayout();
+                    }
+
+                    OnPropertyChangedEx("DataPropertyNameSeries", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region DataPropertyNameX
+
+        ///<summary>
+        /// Gets or sets the name of the data field to which the X-Axis data is bound.
+        ///</summary>
+        [DefaultValue(null), Category("Data")]
+        [Description("Indicates the name of the data field to which the X-Axis data is bound.")]
+        public string DataPropertyNameX
+        {
+            get { return (_DataPropertyNameX); }
+
+            set
+            {
+                if (value != _DataPropertyNameX)
+                {
+                    _DataPropertyNameX = value;
+
+                    if (NeedToUpdateBindings == false)
+                    {
+                        NeedToUpdateBindings = true;
+
+                        InvalidateLayout();
+                    }
+
+                    OnPropertyChangedEx("DataPropertyNameX", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region DataPropertyNamesY
+
+        ///<summary>
+        /// Gets or sets the names of the data fields to which the Y-Axis data is bound.
+        ///</summary>
+        [DefaultValue(null), Category("Data")]
+        [Description("Indicates the names of the data fields to which the Y-Axis data is bound.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public CustomCollection<string> DataPropertyNamesY
+        {
+            get
+            {
+                if (_DataPropertyNamesY == null)
+                {
+                    _DataPropertyNamesY = new CustomCollection<string>();
+
+                    _DataPropertyNamesY.CollectionChanged += DataPropertyNamesY_CollectionChanged;
+                }
+
+                return (_DataPropertyNamesY);
+            }
+
+            set
+            {
+                if (value != _DataPropertyNamesY)
+                {
+                    if (_DataPropertyNamesY != null)
+                    {
+                        _DataPropertyNamesY.Clear();
+
+                        _DataPropertyNamesY.CollectionChanged -= DataPropertyNamesY_CollectionChanged;
+                    }
+
+                    _DataPropertyNamesY = value;
+
+                    if (_DataPropertyNamesY != null)
+                        _DataPropertyNamesY.CollectionChanged += DataPropertyNamesY_CollectionChanged;
+
+                    OnPropertyChangedEx("DataPropertyNamesY", Style.VisualChangeType.Layout);
+                }
+            }
+        }
+
+        void DataPropertyNamesY_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            if (NeedToUpdateBindings == false)
+            {
+                NeedToUpdateBindings = true;
+
+                InvalidateLayout();
+            }
+        }
+
+        #endregion
+
+        #region DataSource
+
+        ///<summary>
+        /// Gets or sets the data source that the Series is bound to.
+        ///</summary>
+        [DefaultValue(null), AttributeProvider(typeof(IListSource)), Category("Data")]
+        [Description("Indicates the data source that the Series is bound to.")]
+        public object DataSource
+        {
+            get { return (_DataSource); }
+
+            set
+            {
+                if (_DataBinder != null)
+                    _DataBinder.Clear();
+
+                _DataSource = value;
+
+                NeedToUpdateBindings = true;
+
+                OnPropertyChangedEx("DataSource", VisualChangeType.Layout);
+            }
+        }
+
+        #endregion
+
+        #region DefaultPaletteColor
+
+        /// <summary>
+        /// Gets the default palette color assigned to the series when it
+        /// is added to the chart.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        [Description("Indicates the default palette color assigned to the series when it is added to the chart.")]
+        public Color DefaultPaletteColor
+        {
+            get { return (_DefaultPaletteColor); }
+
+            internal set
+            {
+                if (value != _DefaultPaletteColor)
+                {
+                    _DefaultPaletteColor = value;
+
+                    InvalidateStyle();
+                }
+            }
+        }
+
+        #endregion
+
+        #region IsDisplayed
+
+        ///<summary>
+        /// Gets whether the series is displayed (based upon Visibility and Legend state).
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public virtual bool IsDisplayed
+        {
+            get
+            {
+                BaseChart baseChart = Parent as BaseChart;
+
+                ItemCheckAction ica = (baseChart != null)
+                    ? baseChart.Legend.ItemCheckAction : ItemCheckAction.ShowItem;
+
+                return ((Visible == true) &&
+                        (ica == ItemCheckAction.None ||
+                        (ShowCheckBoxInLegend == false || CheckedInLegend == true)));
+            }
+        }
+
+        #endregion
+
+        #region SeriesRangeChanged
+
+        /// <summary>
+        /// Signals to the chart that the series data has changed.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public virtual bool SeriesRangeChanged
+        {
+            get { return (_SeriesRangeChanged); }
+
+            set
+            {
+                _SeriesRangeChanged = value;
+
+                if (value == true)
+                {
+                    BaseChart chart = Parent as BaseChart;
+
+                    if (chart != null)
+                    {
+                        chart.SeriesRangeChanged = true;
+
+                        chart.InvalidateLayout();
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region SeriesType
+
+        ///<summary>
+        /// Gets or sets the Series Type.
+        ///</summary>
+        [DefaultValue(SeriesType.Point), Category("Appearance")]
+        [Description("Indicates the Series Type.")]
+        public virtual SeriesType SeriesType
+        {
+            get { return (_SeriesType); }
+
+            set
+            {
+                if (value != _SeriesType)
+                {
+                    _SeriesType = value;
+
+                    BaseChart chart = Parent as BaseChart;
+
+                    if (chart != null)
+                    {
+                        SeriesRangeChanged = true;
+                        chart.SeriesRangeChanged = true;
+                    }
+
+                    OnPropertyChangedEx("SeriesType", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region DataBinder
+
+        internal DataBinder DataBinder
+        {
+            get
+            {
+                if (_DataBinder == null)
+                    _DataBinder = new DataBinder(this);
+
+                return (_DataBinder);
+            }
+
+            set
+            {
+                if (_DataBinder != null)
+                    _DataBinder.Clear();
+
+                _DataBinder = value;
+            }
+        }
+
+        #endregion
+
+        #region NeedToUpdateBindings
+
+        internal bool NeedToUpdateBindings
+        {
+            get { return (TestState(States.NeedToUpdateBindings)); }
+            set { SetState(States.NeedToUpdateBindings, value); }
+        }
+
+        #endregion
+
+        #region RenderBounds
+
+        internal Rectangle RenderBounds
+        {
+            get { return (_RenderBounds); }
+            set { _RenderBounds = value; }
+        }
+
+        #endregion
+
+        #region SeriesId
+
+        internal int SeriesId
+        {
+            get { return (_SeriesId); }
+            set { _SeriesId = value; }
+        }
+
+        #endregion
+
+        #region SeriesKey
+
+        internal object SeriesKey
+        {
+            get { return (_SeriesKey); }
+            set { _SeriesKey = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region MeasureOverride
+
+        protected override void MeasureOverride(ChartLayoutInfo layoutInfo)
+        {
+            UpdateDataBindings();
+        }
+
+        #region UpdateDataBindings
+
+        internal void UpdateDataBindings()
+        {
+            if (NeedToUpdateBindings == true)
+            {
+                BaseChart chart = Parent as BaseChart;
+
+                object dataSource = DataSource ?? chart.DataSource;
+                string dataMember = (string.IsNullOrEmpty(DataMember) == false) ? DataMember : chart.DataMember;
+
+                if (dataSource != null)
+                {
+                    ClearSeriesPoints();
+
+                    DataBinder dataBinder = DataBinder;
+
+                    dataBinder.Clear();
+
+                    dataBinder.DataConnect(dataSource, dataMember);
+                    dataBinder.LoadSeriesData(this);
+                }
+
+                NeedToUpdateBindings = false;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ArrangeOverride
+
+        protected override void ArrangeOverride(ChartLayoutInfo layoutInfo)
+        {
+            BoundsRelative = layoutInfo.LayoutBounds;
+        }
+
+        #endregion
+
+        #region RenderOverride
+
+        protected override void RenderOverride(ChartRenderInfo renderInfo)
+        {
+            throw new NotImplementedException();
+        }
+
+        #endregion
+
+        #region Render
+
+        internal override void Render(ChartRenderInfo renderInfo)
+        {
+            if (Displayed == true)
+            {
+                Rectangle bounds = BoundsRelative;
+
+                if (renderInfo.ClipRectangle.IntersectsWith(bounds))
+                    RenderOverride(renderInfo);
+            }
+        }
+
+        #endregion
+
+        #region RefreshSeries
+
+        ///<summary>
+        /// Causes the series to refresh its display, as the underlying
+        /// series data (potentially) has changed in some way.
+        ///</summary>
+        public void RefreshSeries()
+        {
+            SeriesRangeChanged = true;
+
+            InvalidateLayout();
+        }
+
+        #endregion
+
+        #region AddSeriesPoint
+
+        internal virtual void AddSeriesPoint(object valuex, object[] valuesY, object dataItem)
+        {
+            throw new NotImplementedException();
+        }
+
+        #endregion
+
+        #region ClearSeriesPoints
+
+        internal virtual void ClearSeriesPoints()
+        {
+            throw new NotImplementedException();
+        }
+
+        #endregion
+
+        #region Style handling
+
+        #region InvalidateStyle
+
+        ///<summary>
+        ///Invalidate the cached Style definitions
+        ///</summary>
+        public void InvalidateStyle()
+        {
+            ClearEffectiveStyles();
+        }
+
+        #endregion
+
+        #region ClearEffectiveStyles
+
+        protected override void ClearEffectiveStyles()
+        {
+            if (LegendItem != null)
+                LegendItem.EffectiveStyles.InvalidateStyles();
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ILegendItem
+
+        #region CheckedInLegend
+
+        /// <summary>
+        /// Gets or sets whether the series is checked in the Legend.
+        /// </summary>
+        [DefaultValue(true), Category("Legend")]
+        [Description("Indicates whether the series is checked in the Legend.")]
+        public bool CheckedInLegend
+        {
+            get { return (TestState(States.CheckedInLegend)); }
+
+            set
+            {
+                if (value != CheckedInLegend)
+                {
+                    SetState(States.CheckedInLegend, value);
+
+                    if (LegendItem != null)
+                        LegendItem.UpdateCheckState();
+
+                    OnCheckStateChanged();
+                }
+            }
+        }
+
+        internal virtual void OnCheckStateChanged()
+        {
+            BaseChart chart = Parent as BaseChart;
+
+            if (chart != null)
+                chart.OnSeriesCheckStateChanged("CheckedInLegend");
+
+            OnPropertyChangedEx("CheckedInLegend", VisualChangeType.Render);
+        }
+
+        #endregion
+
+        #region ShowCheckBoxInLegend
+
+        /// <summary>
+        /// Gets or sets whether a checkbox for the series is shown in the Legend.
+        /// </summary>
+        [DefaultValue(true), Category("Legend")]
+        [Description("Indicates whether a checkbox for the series is shown in the Legend.")]
+        public bool ShowCheckBoxInLegend
+        {
+            get { return (TestState(States.ShowCheckBoxInLegend)); }
+
+            set
+            {
+                if (value != ShowCheckBoxInLegend)
+                {
+                    SetState(States.ShowCheckBoxInLegend, value);
+
+                    OnPropertyChangedEx("ShowCheckBoxInLegend", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowInLegend
+
+        /// <summary>
+        /// Gets or sets whether the series is shown in the Legend.
+        /// </summary>
+        [DefaultValue(true), Category("Legend")]
+        [Description("Indicates whether the series is shown in the Legend.")]
+        public bool ShowInLegend
+        {
+            get { return (TestState(States.ShowInLegend)); }
+
+            set
+            {
+                if (value != ShowInLegend)
+                {
+                    SetState(States.ShowInLegend, value);
+
+                    OnPropertyChangedEx("ShowInLegend", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowInParentLegend
+
+        /// <summary>
+        /// Gets or sets whether the series is shown in parent Legend(s).
+        /// </summary>
+        [DefaultValue(true), Category("Legend")]
+        [Description("Indicates whether the series is shown in parent Legend(s).")]
+        public bool ShowInParentLegend
+        {
+            get { return (TestState(States.ShowInParentLegend)); }
+
+            set
+            {
+                if (value != ShowInParentLegend)
+                {
+                    SetState(States.ShowInParentLegend, value);
+
+                    OnPropertyChangedEx("ShowInParentLegend", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowMarkerInLegend
+
+        /// <summary>
+        /// Gets or sets whether the series Marker is shown in the Legend.
+        /// </summary>
+        [DefaultValue(true), Category("Legend")]
+        [Description("Indicates whether the series Marker is shown in the Legend.")]
+        public bool ShowMarkerInLegend
+        {
+            get { return (TestState(States.ShowMarkerInLegend)); }
+
+            set
+            {
+                if (value != ShowMarkerInLegend)
+                {
+                    SetState(States.ShowMarkerInLegend, value);
+
+                    OnPropertyChangedEx("ShowMarkerInLegend", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region LegendItem
+
+        ///<summary>
+        /// Gets the item's parent LegendItem.
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        [Description("Indicates the item's parent LegendItem.")]
+        public ChartLegendItem LegendItem
+        {
+            get { return (_LegendItem); }
+            internal set { _LegendItem = value; }
+        }
+
+        #endregion
+
+        #region LegendText
+
+        ///<summary>
+        /// Gets or sets the text to display in the legend.
+        ///</summary>
+        [DefaultValue(null), Category("Legend")]
+        [Description("Indicates the text to display in the legend.")]
+        public string LegendText
+        {
+            get { return (_LegendText); }
+
+            set
+            {
+                if (value != _LegendText)
+                {
+                    _LegendText = value;
+
+                    OnPropertyChangedEx("LegendText", Style.VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region GetLegendItem
+
+        public virtual ChartLegendItem GetLegendItem()
+        {
+            LegendItem = null;
+
+            if (ShowInLegend == true)
+            {
+                ChartContainer chart = Parent as ChartContainer;
+
+                if (chart != null)
+                {
+                    LegendItem = new ChartLegendItem();
+
+                    if (CheckedInLegend == true)
+                        _LegendItem.CheckState = CheckState.Checked;
+
+                    _LegendItem.Parent = chart.Legend;
+
+                    _LegendItem.Name = Name;
+                    _LegendItem.ItemText = LegendText;
+
+                    if (string.IsNullOrEmpty(_LegendItem.Name) == true)
+                        _LegendItem.Name = "(Series)";
+
+                    _LegendItem.ChartItems.Add(this);
+                }
+            }
+
+            return (_LegendItem);
+        }
+
+        #endregion
+
+        #region GetLegendItems
+
+        public List<ChartLegendItem> GetLegendItems()
+        {
+            List<ChartLegendItem> list = new List<ChartLegendItem>();
+
+            ChartLegendItem item = GetLegendItem();
+
+            if (item != null)
+                list.Add(item);
+
+            AddSubLegendItems(list);
+
+            return (list);
+        }
+
+        #region AddSubLegendItems
+
+        internal virtual void AddSubLegendItems(List<ChartLegendItem> list)
+        {
+            throw new NotImplementedException();
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetLegendItemColor
+
+        public Color GetLegendItemColor()
+        {
+            ChartXy chartXy = Parent as ChartXy;
+
+            ChartLegendItemVisualStyle lstyle = ChartLegendItemVisualStyles[StyleType.Default];
+
+            if (lstyle.TextColor.IsEmpty == false)
+                return (lstyle.TextColor);
+
+            Color color = GetLegendItemColorEx();
+
+            if (color.IsEmpty == true)
+                color = _DefaultPaletteColor;
+
+            return (color);
+        }
+
+        #region GetLegendItemColorEx
+
+        internal virtual Color GetLegendItemColorEx()
+        {
+            throw new NotImplementedException();
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderLegendItemMarker
+
+        public void RenderLegendItemMarker(Graphics g,
+            ChartLegendItem litem, ChartLegendItemVisualStyle style)
+        {
+            SmoothingMode sm = g.SmoothingMode;
+            g.SmoothingMode = SmoothingMode.AntiAlias;
+
+            RenderLegendItemMarkerEx(g, litem, style);
+
+            g.SmoothingMode = sm;
+        }
+
+        #region RenderLegendItemMarkerEx
+
+        internal virtual void RenderLegendItemMarkerEx(
+            Graphics g, ChartLegendItem litem, ChartLegendItemVisualStyle style)
+        {
+            throw new NotImplementedException();
+        }
+
+        #endregion
+
+        #region RenderDefaultMarker
+
+        internal void RenderDefaultMarker(Graphics g,
+            Rectangle bounds, ChartSeriesVisualStyle sstyle)
+        {
+            bounds.Width++;
+            bounds.Height++;
+
+            Background background = sstyle.MarkerVisualStyle.Background;
+
+            if (background.IsEmpty == true)
+            {
+                g.FillRectangle(Brushes.DimGray, bounds);
+            }
+            else
+            {
+                using (Brush br = background.GetBrush(bounds))
+                    g.FillRectangle(br, bounds);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region InvalidateRender
+
+        public override void InvalidateRender()
+        {
+            BaseChart chart = Parent as BaseChart;
+
+            if (chart != null)
+                chart.InvalidateRender();
+        }
+
+        #endregion
+
+        #region Copy/CopyTo
+
+        public override ChartVisualElement Copy()
+        {
+            BaseSeries copy = new BaseSeries();
+
+            CopyTo(copy);
+
+            return (copy);
+        }
+
+        public override void CopyTo(ChartVisualElement copy)
+        {
+            BaseSeries c = copy as BaseSeries;
+
+            if (c != null)
+            {
+                base.CopyTo(c);
+
+                c.ChartLegendItemVisualStyles =
+                    (_ChartLegendItemVisualStyles != null) ? ChartLegendItemVisualStyles.Copy() : null;
+
+                c.DataPropertyNameSeries = DataPropertyNameSeries;
+                c.DataPropertyNameX = DataPropertyNameX;
+                c.DataPropertyNamesY = DataPropertyNamesY;
+
+                c.DataMember = DataMember;
+                c.DataSource = DataSource;
+
+                c.DefaultPaletteColor = DefaultPaletteColor;
+
+                c.SeriesType = SeriesType;
+
+                c.CheckedInLegend = CheckedInLegend;
+                c.LegendText = LegendText;
+                c.ShowCheckBoxInLegend = ShowCheckBoxInLegend;
+                c.ShowInLegend = ShowInLegend;
+                c.ShowInParentLegend = ShowInParentLegend;
+                c.ShowMarkerInLegend = ShowMarkerInLegend;
+            }
+        }
+
+        #endregion
+
+        #region GetSerialData
+
+        internal override SerialElementCollection GetSerialData(string serialName)
+        {
+            SerialElementCollection sec = new SerialElementCollection();
+
+            if (serialName != null)
+            {
+                if (serialName.Equals("") == true)
+                    serialName = "BaseSeries";
+
+                sec.AddStartElement(serialName);
+            }
+
+            if (_ChartLegendItemVisualStyles != null)
+                sec.AddElement(_ChartLegendItemVisualStyles.GetSerialData("ChartLegendItemVisualStyles"));
+
+            //sec.AddDataValue("DataSource", DataSource, null);
+            sec.AddValue("DataMember", DataMember, null);
+
+            sec.AddValue("DataPropertyNameSeries", DataPropertyNameSeries, null);
+            sec.AddValue("DataPropertyNameX", DataPropertyNameX, null);
+
+            if (_DataPropertyNamesY != null && _DataPropertyNamesY.Count > 0)
+            {
+                sec.AddStartElement("DataPropertyNamesYs count=\"" + _DataPropertyNamesY.Count + "\"");
+
+                foreach (string s in _DataPropertyNamesY)
+                    sec.AddValue("DataPropertyNamesY", s);
+
+                sec.AddEndElement("DataPropertyNamesYs");
+            }
+
+            sec.AddValue("DefaultPaletteColor", DefaultPaletteColor, Color.Empty);
+
+            sec.AddValue("SeriesType", SeriesType, SeriesType.Point);
+
+            sec.AddValue("CheckedInLegend", CheckedInLegend, true);
+            sec.AddValue("LegendText", LegendText, null);
+            sec.AddValue("ShowCheckBoxInLegend", ShowCheckBoxInLegend, true);
+            sec.AddValue("ShowInLegend", ShowInLegend, true);
+            sec.AddValue("ShowInParentLegend", ShowInParentLegend, true);
+            sec.AddValue("ShowMarkerInLegend", ShowMarkerInLegend, true);
+
+            sec.AddElement(base.GetSerialData(null));
+
+            if (serialName != null)
+                sec.AddEndElement(serialName);
+
+            return (sec);
+        }
+
+        #endregion
+
+        #region PutSerialData
+
+        #region ProcessValue
+
+        internal override void ProcessValue(SerialElement se)
+        {
+            switch (se.Name)
+            {
+                case "DataMember":
+                    DataMember = se.StringValue;
+                    break;
+
+                case "DataPropertyNameSeries":
+                    DataPropertyNameSeries = se.StringValue;
+                    break;
+
+                case "DataPropertyNameX":
+                    DataPropertyNameX = se.StringValue;
+                    break;
+
+                case "DataPropertyNamesY":
+                    DataPropertyNamesY.Add(se.StringValue);
+                    break;
+
+                case "DataSource":
+                    DataSource = se.DataValue;
+                    break;
+
+                case "DefaultPaletteColor":
+                    DefaultPaletteColor = se.GetValueColor();
+                    break;
+
+                case "SeriesType":
+                    SeriesType = (SeriesType)se.GetValueEnum(typeof(SeriesType));
+                    break;
+
+                case "CheckedInLegend":
+                    CheckedInLegend = bool.Parse(se.StringValue);
+                    break;
+
+                case "LegendText":
+                    LegendText = se.StringValue;
+                    break;
+
+                case "ShowCheckBoxInLegend":
+                    ShowCheckBoxInLegend = bool.Parse(se.StringValue);
+                    break;
+
+                case "ShowInLegend":
+                    ShowInLegend = bool.Parse(se.StringValue);
+                    break;
+
+                case "ShowInParentLegend":
+                    ShowInParentLegend = bool.Parse(se.StringValue);
+                    break;
+
+                case "ShowMarkerInLegend":
+                    ShowMarkerInLegend = bool.Parse(se.StringValue);
+                    break;
+
+                default:
+                    base.ProcessValue(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region ProcessCollection
+
+        internal override void ProcessCollection(SerialElement se)
+        {
+            SerialElementCollection sec = se.Sec;
+
+            switch (se.Name)
+            {
+                case "ChartLegendItemVisualStyles":
+                    sec.PutSerialData(ChartLegendItemVisualStyles);
+                    break;
+
+                case "DataPropertyNamesYs":
+                    if (se.ArrayCount > 0)
+                    {
+                        DataPropertyNamesY = new CustomCollection<string>(se.ArrayCount);
+
+                        sec.PutSerialData(this);
+                    }
+                    break;
+
+                default:
+                    base.ProcessCollection(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Series States
+
+        [Flags]
+        private enum States : uint
+        {
+            NeedToUpdateBindings = (1U << 0),
+
+            CheckedInLegend = (1U << 1),
+            ShowInLegend = (1U << 2),
+            ShowInParentLegend = (1U << 3),
+            ShowCheckBoxInLegend = (1U << 4),
+            ShowMarkerInLegend = (1U << 5),
+        }
+
+        #region TestState
+
+        private bool TestState(States state)
+        {
+            return ((_States & state) == state);
+        }
+
+        #endregion
+
+        #region SetState
+
+        private void SetState(States state, bool value)
+        {
+            if (value == true)
+                _States |= state;
+            else
+                _States &= ~state;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IDisposable
+
+        public override void Dispose()
+        {
+            ChartLegendItemVisualStyles = null;
+
+            base.Dispose();
+        }
+
+        #endregion
+    }
+
+    #region enums
+
+    #region SeriesType
+
+    /// <summary>
+    /// Defines available Series types
+    /// </summary>
+    public enum SeriesType
+    {
+        Bubble,
+
+        HorizontalBar,
+        VerticalBar,
+
+        Line,
+        Point,
+
+        HorizontalDot,          // Wilkinson dotplot
+        VerticalDot,
+
+        HorizontalHiLoBar,      // Box, Candle, HiLo
+        VerticalHiLoBar,
+
+        Pie,
+        //Polar,
+        //Radar,
+
+        //TreeMap,
+    }
+
+    #endregion
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/ChartContainer.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/ChartContainer.cs
new file mode 100644
index 00000000..9d7be7e6
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/ChartContainer.cs	
@@ -0,0 +1,2482 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Drawing.Drawing2D;
+using System.Windows.Forms;
+using DevComponents.Charts.TextMarkup;
+using DevComponents.DotNetBar.Charts.Style;
+
+namespace DevComponents.DotNetBar.Charts
+{
+    /// <summary>
+    /// Represents the collection of ChartContainer objects.
+    /// </summary>
+    [Editor("DevComponents.Charts.Design.ChartContainerCollectionEditor, DevComponents.Charts.Design, " +
+            "Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(UITypeEditor))]
+    public class ChartContainerCollection : CustomNamedCollection<ChartContainer>
+    {
+        public ChartContainerCollection()
+        {
+        }
+
+        #region GetUniqueName
+
+        public string GetUniqueName()
+        {
+            return (GetUniqueName("ChartCont"));
+        }
+
+        #endregion
+    }
+
+    /// <summary>
+    /// ChartContainer
+    /// </summary>
+    public class ChartContainer : ChartVisualElement, ILegendData, IScrollable, IComparable
+    {
+        #region Private variables
+
+        private States _States;
+
+        private string _EmptyText;
+        private BodyElement _EmptyTextMarkup;
+        private ChartLegend _Legend;
+
+        private ChartTitleCollection _Titles;
+
+        private ScrollBarLite _VScrollBar;
+        private ScrollBarLite _HScrollBar;
+
+        private int _VScrollBarWidth = 9;
+        private int _HScrollBarHeight = 9;
+
+        private Rectangle _FrameBounds;         // Margin
+        private Rectangle _ContentBounds;       // Content - chart container(s)
+        private Rectangle _ContentBoundsEx;     // Content - extended content bounds
+
+        private int _FillWeight = 100;
+        private AutoSizeMode _AutoSizeMode = AutoSizeMode.NotSet;
+        private Size _MinContentSize = new Size(100, 100);
+
+        private Timer _AutoScrollTimer;
+        private AutoScrollEnable _AutoScrollEnable;
+        private Rectangle _ScrollRect;
+
+        private bool _Panning;
+
+        private int _HPanOffset;
+        private int _VPanOffset;
+
+        private ItemHitArea _HitArea;
+        private ItemHitArea _MouseDownHitArea;
+
+        private ContainerVisualStyles _ContainerVisualStyles;
+        private EffectiveStyles<ContainerVisualStyle> _EffectiveContainerStyles;
+
+        private int _MatrixDisplayOrder;
+        private Rectangle _MatrixDisplayBounds;
+
+        private int _SelectionUpdateCount = -1;
+
+        #endregion
+
+        public ChartContainer()
+        {
+            InitDefaultStates();
+
+            SetupScrollBars();
+
+            _EffectiveContainerStyles = new EffectiveStyles<ContainerVisualStyle>(this);
+        }
+
+        #region InitDefaultStates
+
+        private void InitDefaultStates()
+        {
+            SetState(States.AutoGenSeriesCollection, true);
+            SetState(States.EnablePanning, true);
+
+            SetState(States.HScrollBarVisible, true);
+            SetState(States.VScrollBarVisible, true);
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region AutoSizeMode
+
+        ///<summary>
+        /// Gets or sets the mode used to size the container (by FillWeight, etc).
+        ///</summary>
+        [DefaultValue(AutoSizeMode.NotSet), Category("Layout")]
+        [Description("Indicates the mode used to size the container (by FillWeight, etc).")]
+        public AutoSizeMode AutoSizeMode
+        {
+            get { return (_AutoSizeMode); }
+
+            set
+            {
+                if (value != _AutoSizeMode)
+                {
+                    _AutoSizeMode = value;
+
+                    OnPropertyChangedEx("AutoSizeMode", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ContainerVisualStyles
+
+        /// <summary>
+        /// Gets or sets the visual styles for the container.
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates the visual styles for the container.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ContainerVisualStyles ContainerVisualStyles
+        {
+            get
+            {
+                if (_ContainerVisualStyles == null)
+                {
+                    _ContainerVisualStyles = new ContainerVisualStyles();
+
+                    StyleVisualChangeHandler(null, _ContainerVisualStyles);
+                }
+
+                return (_ContainerVisualStyles);
+            }
+
+            set
+            {
+                if (_ContainerVisualStyles != value)
+                {
+                    ContainerVisualStyles oldValue = _ContainerVisualStyles;
+
+                    _ContainerVisualStyles = value;
+
+                    OnStyleChanged("ContainerVisualStyles", oldValue, value);
+
+                    if (oldValue != null)
+                        oldValue.Dispose();
+                }
+            }
+        }
+
+        #endregion
+
+        #region ContentBounds
+
+        /// <summary>
+        /// Gets the Content area bounding rectangle.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public Rectangle ContentBounds
+        {
+            get { return (_ContentBounds); }
+            internal set { _ContentBounds = value; }
+        }
+
+        #endregion
+
+        #region EffectiveContainerStyle
+
+        /// <summary>
+        /// Gets a reference to the container's effective (cached, composite) styles.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public EffectiveStyles<ContainerVisualStyle> EffectiveContainerStyles
+        {
+            get { return (_EffectiveContainerStyles); }
+        }
+
+        #endregion
+
+        #region EmptyText
+
+        /// <summary>
+        /// Gets or sets the Text to display when the container is empty.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), DefaultValue(null)]
+        [Description("Indicates the Text to display when the container is empty.")]
+        public string EmptyText
+        {
+            get { return (_EmptyText); }
+
+            set
+            {
+                if (_EmptyText != value)
+                {
+                    _EmptyText = value;
+
+                    EmptyTextMarkupChanged();
+
+                    OnPropertyChangedEx("EmptyText", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region EnableEmptyTextMarkup
+
+        /// <summary>
+        /// Gets or sets whether EmptyText markup support is enabled.
+        /// </summary>
+        [DefaultValue(false), Category("Appearance")]
+        [Description("Indicates whether EmptyText markup support is enabled.")]
+        public bool EnableEmptyTextMarkup
+        {
+            get { return (TestState(States.EnableEmptyTextMarkup)); }
+
+            set
+            {
+                if (EnableEmptyTextMarkup != value)
+                {
+                    SetState(States.EnableEmptyTextMarkup, value);
+
+                    EmptyTextMarkupChanged();
+
+                    OnPropertyChangedEx("EnableEmptyTextMarkup", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #region Markup support
+
+        private void EmptyTextMarkupChanged()
+        {
+            _EmptyTextMarkup = null;
+
+            if (EnableEmptyTextMarkup == true)
+            {
+                if (MarkupParser.IsMarkup(_EmptyText) == true)
+                {
+                    _EmptyTextMarkup = MarkupParser.Parse(_EmptyText);
+
+                    if (_EmptyTextMarkup != null)
+                        _EmptyTextMarkup.HyperLinkClick += EmptyTextMarkupLinkClick;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Occurs when a text markup link is clicked
+        /// </summary>
+        protected virtual void EmptyTextMarkupLinkClick(object sender, EventArgs e)
+        {
+            HyperLink link = sender as HyperLink;
+
+            ChartControl.DoEmptyTextMarkupLinkClickEvent(this, link);
+        }
+
+        /// <summary>
+        /// Gets plain text without text-markup (if text-markup is used in EmptyText)
+        /// </summary>
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public string EmptyTextPlainText
+        {
+            get { return (_EmptyTextMarkup != null ? _EmptyTextMarkup.PlainText : _EmptyText); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region EnablePanning
+
+        /// <summary>
+        /// Gets or sets whether the container can be panned with the mouse.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior")]
+        [Description("Indicates whether the container can be panned with the mouse.")]
+        public bool EnablePanning
+        {
+            get { return (TestState(States.EnablePanning)); }
+
+            set
+            {
+                if (value != EnablePanning)
+                {
+                    SetState(States.EnablePanning, value);
+
+                    OnPropertyChanged("EnablePanning");
+                }
+            }
+        }
+
+        #endregion
+
+        #region EnableSelection
+
+        /// <summary>
+        /// Gets or sets whether the CONTAINER can be "selected" with the mouse.
+        /// </summary>
+        [DefaultValue(false), Category("Behavior")]
+        [Description("Indicates whether the CONTAINER can be \"selected\" with the mouse.")]
+        public bool EnableSelection
+        {
+            get { return (TestState(States.EnableSelection)); }
+
+            set
+            {
+                if (value != EnableSelection)
+                {
+                    SetState(States.EnableSelection, value);
+
+                    OnPropertyChanged("EnableSelection");
+                }
+            }
+        }
+
+        #endregion
+
+        #region FillWeight
+
+        /// <summary>
+        /// Gets or sets a value which, when AutoSizeMode is Fill,
+        /// represents the width of the container relative to the widths
+        /// of other fill-mode containers (default value is 100).
+        /// </summary>
+        [DefaultValue(100), Category("Layout")]
+        [Description("Indicates a value which, when AutoSizeMode is Fill, represents the width of the containers relative to the widths of other fill-mode containers (default value is 100).")]
+        public int FillWeight
+        {
+            get { return (_FillWeight); }
+
+            set
+            {
+                if (value != _FillWeight)
+                {
+                    _FillWeight = value;
+
+                    OnPropertyChangedEx("FillWeight", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region FrameBounds
+
+        /// <summary>
+        /// Gets the Frame area bounding rectangle.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public Rectangle FrameBounds
+        {
+            get { return (_FrameBounds); }
+            internal set { _FrameBounds = value; }
+        }
+
+        #endregion
+
+        #region HScrollBar
+
+        ///<summary>
+        /// Gets a reference to the containers’s horizontal scrollbar
+        ///</summary>
+        [Category("ScrollBar")]
+        [Description("Indicates the container’s horizontal scrollbar.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ScrollBarLite HScrollBar
+        {
+            get { return (_HScrollBar); }
+            internal set { _HScrollBar = value; }
+        }
+
+        #endregion
+
+        #region HScrollBarHeight
+
+        /// <summary>
+        /// Gets or sets the horizontal scrollBar height.
+        /// </summary>
+        [DefaultValue(9), Category("ScrollBar")]
+        [Description("Indicates the horizontal scrollBar height")]
+        public int HScrollBarHeight
+        {
+            get { return (_HScrollBarHeight); }
+
+            set
+            {
+                if (value != _HScrollBarHeight)
+                {
+                    if (value > 0)
+                    {
+                        _HScrollBarHeight = value;
+
+                        OnPropertyChangedEx("HScrollBarHeight", VisualChangeType.Layout);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region HScrollOffset
+
+        ///<summary>
+        /// Gets or sets the horizontal scrollbar offset.
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public int HScrollOffset
+        {
+            get
+            {
+                if (_HScrollBar != null && _HScrollBar.Visible == true)
+                    return (_HScrollBar.Value);
+
+                return (0);
+            }
+
+            set { SetHScrollValue(value); }
+        }
+
+        #endregion
+
+        #region HScrollBarVisible
+
+        /// <summary>
+        /// Gets or sets whether Horizontal Scrollbar is shown if needed (due to content of the control exceeding available width).
+        /// </summary>
+        [DefaultValue(true), Category("ScrollBar")]
+        [Description("Indicates whether Horizontal Scrollbar is shown if needed (due to content of the control exceeding available width).")]
+        public bool HScrollBarVisible
+        {
+            get { return (TestState(States.HScrollBarVisible)); }
+
+            set
+            {
+                if (value != HScrollBarVisible)
+                {
+                    SetState(States.HScrollBarVisible, value);
+
+                    InvalidateLayout();
+                }
+            }
+        }
+
+        #endregion
+
+        #region IsSelected
+
+        ///<summary>
+        /// Gets or sets whether the container is selected.
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsSelected
+        {
+            get
+            {
+                ChartControl chartControl = ChartControl;
+
+                if (chartControl != null)
+                {
+                    if (_SelectionUpdateCount == chartControl.SelectionUpdateCount)
+                        return (TestState(States.IsSelected));
+
+                    bool selected = chartControl.GetSelected(this);
+
+                    SetState(States.IsSelected, selected);
+
+                    _SelectionUpdateCount = chartControl.SelectionUpdateCount;
+                }
+
+                return (TestState(States.IsSelected));
+            }
+
+            set
+            {
+                if (value != IsSelected)
+                {
+                    SetState(States.IsSelected, value);
+
+                    ChartControl chartControl = ChartControl;
+
+                    if (chartControl != null)
+                    {
+                        chartControl.SetSelected(this, value);
+
+                        InvalidateRender();
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region Legend
+
+        /// <summary>
+        /// Gets or Sets the element Legend.
+        /// </summary>
+        [Category("Legend")]
+        [Description("Indicates the element Legend.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ChartLegend Legend
+        {
+            get
+            {
+                if (_Legend == null)
+                    Legend = new ChartLegend();
+
+                return (_Legend);
+            }
+
+            set
+            {
+                if (value != _Legend)
+                {
+                    if (_Legend != null)
+                    {
+                        _Legend.Parent = null;
+                        _Legend.PropertyChanged -= LegendPropertyChanged;
+                    }
+
+                    _Legend = value;
+
+                    if (_Legend != null)
+                    {
+                        _Legend.Parent = this;
+                        _Legend.PropertyChanged += LegendPropertyChanged;
+                    }
+                }
+            }
+        }
+
+        void LegendPropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            InvalidateLayout();
+        }
+
+        #endregion
+
+        #region MatrixAlignEndColumn
+
+        ///<summary>
+        /// Gets or sets whether the container's content ending X-offset is aligned 
+        /// with other containers ending in the same ChartMatrix column.
+        ///</summary>
+        [DefaultValue(false), Category("Matrix")]
+        [Description("Indicates whether the container's content ending X-offset is aligned with other containers ending in the same ChartMatrix column.")]
+        public bool MatrixAlignEndColumn
+        {
+            get { return (TestState(States.MatrixAlignEndColumn)); }
+
+            set
+            {
+                if (value != MatrixAlignEndColumn)
+                {
+                    SetState(States.MatrixAlignEndColumn, value);
+
+                    OnPropertyChangedEx("MatrixAlignEndColumn", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region MatrixAlignEndRow
+
+        ///<summary>
+        /// Gets or sets whether the container's content ending Y-offset is aligned 
+        /// with other containers ending in the same ChartMatrix row.
+        ///</summary>
+        [DefaultValue(false), Category("Matrix")]
+        [Description("Indicates whether the container's content ending Y-offset is aligned with other containers ending in the same ChartMatrix row.")]
+        public bool MatrixAlignEndRow
+        {
+            get { return (TestState(States.MatrixAlignEndRow)); }
+
+            set
+            {
+                if (value != MatrixAlignEndRow)
+                {
+                    SetState(States.MatrixAlignEndRow, value);
+
+                    OnPropertyChangedEx("MatrixAlignEndRow", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region MatrixAlignStartColumn
+
+        ///<summary>
+        /// Gets or sets whether the container's content starting X-offset is aligned 
+        /// with other containers starting in the same ChartMatrix column.
+        ///</summary>
+        [DefaultValue(false), Category("Matrix")]
+        [Description("Indicates whether the container's content starting X-offset is aligned with other containers starting in the same ChartMatrix column.")]
+        public bool MatrixAlignStartColumn
+        {
+            get { return (TestState(States.MatrixAlignStartColumn)); }
+
+            set
+            {
+                if (value != MatrixAlignStartColumn)
+                {
+                    SetState(States.MatrixAlignStartColumn, value);
+
+                    OnPropertyChangedEx("MatrixAlignStartColumn", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region MatrixAlignStartRow
+
+        ///<summary>
+        /// Gets or sets whether the container's content starting Y-offset is aligned 
+        /// with other containers starting in the same ChartMatrix row.
+        ///</summary>
+        [DefaultValue(false), Category("Matrix")]
+        [Description("Indicates whether the container's content starting Y-offset is aligned with other containers starting in the same ChartMatrix row.")]
+        public bool MatrixAlignStartRow
+        {
+            get { return (TestState(States.MatrixAlignStartRow)); }
+
+            set
+            {
+                if (value != MatrixAlignStartRow)
+                {
+                    SetState(States.MatrixAlignStartRow, value);
+
+                    OnPropertyChangedEx("MatrixAlignStartRow", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region MatrixDisplayBounds
+
+        ///<summary>
+        /// Gets or sets the containers matrix display bounds (in relative units of the matrix).
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public Rectangle MatrixDisplayBounds
+        {
+            get { return (_MatrixDisplayBounds); }
+
+            set
+            {
+                if (value != _MatrixDisplayBounds)
+                {
+                    _MatrixDisplayBounds = value;
+
+                    OnPropertyChangedEx("MatrixDisplayBounds", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region MatrixDisplayOrder
+
+        ///<summary>
+        /// Gets or sets the containers display order in the parent matrix layout
+        /// (higher values are placed on top of lower values).
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public int MatrixDisplayOrder
+        {
+            get { return (_MatrixDisplayOrder); }
+
+            set
+            {
+                if (value != _MatrixDisplayOrder)
+                {
+                    _MatrixDisplayOrder = value;
+
+                    OnPropertyChangedEx("MatrixDisplayOrder", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region MinContentSize
+
+        /// <summary>
+        /// Gets or sets the minimum size of the content area of the chart.
+        /// </summary>
+        [Category("Layout")]
+        [Description("Indicates the minimum size of the content area of the chart.")]
+        public Size MinContentSize
+        {
+            get { return (_MinContentSize); }
+
+            set
+            {
+                if (value != _MinContentSize)
+                {
+                    _MinContentSize = value;
+
+                    OnPropertyChangedEx("MinContentSize", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        internal virtual bool ShouldSerializeMinContentSize()
+        {
+            return (_MinContentSize.Width != 100 || _MinContentSize.Height != 100);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        internal virtual void ResetMinContentSize()
+        {
+            MinContentSize = new Size(100, 100);
+        }
+
+        #endregion
+
+        #region ScrollBounds
+
+        /// <summary>
+        /// Gets the Scrollable bounds.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public virtual Rectangle ScrollBounds
+        {
+            get { return (_ContentBounds); }
+        }
+
+        #endregion
+
+        #region ScrollBoundsEx
+
+        /// <summary>
+        /// Gets the extended Scrollable bounds.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public virtual Rectangle ScrollBoundsEx
+        {
+            get { return (_ContentBoundsEx); }
+        }
+
+        #endregion
+
+        #region ScrollBoundsOffset
+
+        ///<summary>
+        /// Gets the current scrollbar offset
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public Point ScrollBoundsOffset
+        {
+            get { return (new Point(HScrollOffset, VScrollOffset)); }
+        }
+
+        #endregion
+
+        #region Titles
+
+        /// <summary>
+        /// Gets or Sets a reference to the collection of Titles
+        /// </summary>
+        [Category("Appearance")]
+        [Description("Indicates the collection of Titles.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ChartTitleCollection Titles
+        {
+            get
+            {
+                if (_Titles == null)
+                {
+                    _Titles = new ChartTitleCollection();
+
+                    _Titles.CollectionChanged += TitlesCollectionChanged;
+                }
+
+                return (_Titles);
+            }
+
+            internal set
+            {
+                if (_Titles != null)
+                    _Titles.CollectionChanged -= TitlesCollectionChanged;
+
+                _Titles = value;
+
+                if (_Titles != null)
+                    _Titles.CollectionChanged += TitlesCollectionChanged;
+            }
+        }
+
+        #region TitlesCollectionChanged
+
+        void TitlesCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            switch (e.Action)
+            {
+                case NotifyCollectionChangedAction.Add:
+                    foreach (ChartTitle title in e.NewItems)
+                        title.Parent = this;
+                    break;
+
+                case NotifyCollectionChangedAction.Replace:
+                    foreach (ChartTitle title in e.OldItems)
+                        title.Parent = null;
+
+                    foreach (ChartTitle title in e.NewItems)
+                        title.Parent = this;
+                    break;
+
+                case NotifyCollectionChangedAction.Remove:
+                    foreach (ChartTitle title in e.OldItems)
+                        title.Parent = null;
+                    break;
+            }
+
+            InvalidateLayout();
+        }
+
+        #endregion
+
+        #endregion
+
+        #region VScrollBar
+
+        ///<summary>
+        /// Gets a reference to the container’s vertical scrollbar
+        ///</summary>
+        [Category("ScrollBar")]
+        [Description("Indicates the container’s vertical scrollbar.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ScrollBarLite VScrollBar
+        {
+            get { return (_VScrollBar); }
+        }
+
+        #endregion
+
+        #region VScrollBarWidth
+
+        /// <summary>
+        /// Gets or sets the vertical scrollBar width.
+        /// </summary>
+        [DefaultValue(9), Category("ScrollBar")]
+        [Description("Indicates the vertical scrollBar width")]
+        public int VScrollBarWidth
+        {
+            get { return (_VScrollBarWidth); }
+
+            set
+            {
+                if (value != _VScrollBarWidth)
+                {
+                    if (value > 0)
+                    {
+                        _VScrollBarWidth = value;
+
+                        OnPropertyChangedEx("VScrollBarWidth", VisualChangeType.Layout);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region VScrollOffset
+
+        ///<summary>
+        /// Gets the vertical scrollbar offset
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public int VScrollOffset
+        {
+            get
+            {
+                if (_VScrollBar != null && _VScrollBar.Visible == true)
+                    return (_VScrollBar.Value);
+
+                return (0);
+            }
+
+            set { SetVScrollValue(value); }
+        }
+
+        #endregion
+
+        #region VScrollBarVisible
+
+        /// <summary>
+        /// Gets or sets whether Vertical Scrollbar is shown when needed (due to the content area exceeding available height).
+        /// </summary>
+        [DefaultValue(true), Category("ScrollBar")]
+        [Description("Indicates whether Vertical Scrollbar is shown when needed (due to the content area exceeding available height)")]
+        public bool VScrollBarVisible
+        {
+            get { return (TestState(States.VScrollBarVisible)); }
+
+            set
+            {
+                if (value != VScrollBarVisible)
+                {
+                    SetState(States.VScrollBarVisible, value);
+
+                    InvalidateLayout();
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region ContentBoundsEx
+
+        internal Rectangle ContentBoundsEx
+        {
+            get { return (_ContentBoundsEx); }
+            set { _ContentBoundsEx = value; }
+        }
+
+        #endregion
+
+        #region EmptyTextMarkup
+
+        internal BodyElement EmptyTextMarkup
+        {
+            get { return (_EmptyTextMarkup); }
+            set { _EmptyTextMarkup = value; }
+        }
+
+        #endregion
+
+        #region HitArea
+
+        internal ItemHitArea HitArea
+        {
+            get { return (_HitArea); }
+            set { _HitArea = value; }
+        }
+
+        #endregion
+
+        #region IsSubPanel
+
+        /// <summary>
+        /// Gets whether the ChartPanel is a subordinate / nested panel.
+        /// </summary>
+        internal bool IsSubPanel
+        {
+            get { return (Parent != null); }
+        }
+
+        #endregion
+
+        #region MatrixColumnAligned
+
+        /// <summary>
+        /// Gets whether the ChartContainer column was MatrixAligned.
+        /// </summary>
+        internal bool MatrixColumnAligned
+        {
+            get { return (TestState(States.MatrixColumnAligned)); }
+            set { SetState(States.MatrixColumnAligned, value); }
+        }
+
+        #endregion
+
+        #region MatrixRowAligned
+
+        /// <summary>
+        /// Gets whether the ChartContainer row was MatrixAligned.
+        /// </summary>
+        internal bool MatrixRowAligned
+        {
+            get { return (TestState(States.MatrixRowAligned)); }
+            set { SetState(States.MatrixRowAligned, value); }
+        }
+
+        #endregion
+
+        #region MouseDownHitArea
+
+        internal ItemHitArea MouseDownHitArea
+        {
+            get { return (_MouseDownHitArea); }
+            set { _MouseDownHitArea = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region MeasureOverride
+
+        protected override void MeasureOverride(ChartLayoutInfo layoutInfo)
+        {
+            if (Legend.Visible == true)
+                Legend.Measure(layoutInfo);
+
+            foreach (ChartTitle title in Titles)
+            {
+                if (title.Visible == true)
+                    title.Measure(layoutInfo);
+            }
+        }
+
+        #endregion
+
+        #region ArrangeOverride
+
+        protected override void ArrangeOverride(ChartLayoutInfo layoutInfo)
+        {
+            if (Legend.Visible == true)
+                Legend.Arrange(layoutInfo);
+
+            foreach (ChartTitle title in Titles)
+            {
+                if (title.Visible == true)
+                    title.Arrange(layoutInfo);
+            }
+
+            UpdateScrollBars(layoutInfo);
+        }
+
+        #endregion
+
+        #region RenderOverride
+
+        protected override void RenderOverride(ChartRenderInfo renderInfo)
+        {
+            Graphics g = renderInfo.Graphics;
+
+            // Render Titles
+
+            foreach (ChartTitle title in Titles)
+            {
+                if (title.Visible == true)
+                    title.Render(renderInfo);
+            }
+
+            // Render the Legend
+
+            if (Legend.Visible == true)
+                Legend.Render(renderInfo);
+        }
+
+        #endregion
+
+        #region RenderTextMarkup
+
+        internal void RenderTextMarkup(Graphics g,
+            Font font, Color textColor, Alignment alignment, Rectangle r)
+        {
+            if (textColor.IsEmpty)
+                textColor = Color.Black;
+
+            MarkupDrawContext d =
+                new MarkupDrawContext(g, font, textColor, false);
+
+            _EmptyTextMarkup.Arrange(new Rectangle(Point.Empty, r.Size), d);
+
+            Size size = _EmptyTextMarkup.Bounds.Size;
+
+            switch (alignment)
+            {
+                case Alignment.NotSet:
+                case Alignment.MiddleLeft:
+                case Alignment.MiddleCenter:
+                case Alignment.MiddleRight:
+                    if (r.Height > size.Height)
+                        r.Y += (r.Height - size.Height) / 2;
+                    break;
+
+                case Alignment.BottomLeft:
+                case Alignment.BottomCenter:
+                case Alignment.BottomRight:
+                    if (r.Height > size.Height)
+                        r.Y = r.Bottom - size.Height;
+                    break;
+            }
+
+            _EmptyTextMarkup.Bounds = new Rectangle(r.Location, size);
+
+            Region oldClip = g.Clip;
+
+            try
+            {
+                g.SetClip(r, CombineMode.Intersect);
+
+                _EmptyTextMarkup.Render(d);
+            }
+            finally
+            {
+                g.Clip = oldClip;
+            }
+        }
+
+        #endregion
+
+        #region RenderEmptyText
+
+        protected void RenderEmptyText(
+            Graphics g, ContainerVisualStyle style, Rectangle bounds)
+        {
+            if (String.IsNullOrEmpty(EmptyText) == false)
+            {
+                if (EmptyTextMarkup != null)
+                {
+                    RenderTextMarkup(g, style.Font,
+                        style.TextColor, style.Alignment, bounds);
+                }
+                else
+                {
+                    eTextFormat tf = style.GetTextFormatFlags();
+
+                    TextDrawing.DrawString(g,
+                        EmptyText, style.Font, style.TextColor, bounds, tf);
+                }
+            }
+        }
+
+        #endregion
+
+        #region RenderScrollbars
+
+        protected void RenderScrollbars(ChartRenderInfo renderInfo)
+        {
+            Graphics g = renderInfo.Graphics;
+
+            if (HScrollBar.Visible == true && VScrollBar.Visible == true)
+            {
+                ScrollBarVisualStyle style = VScrollBar.GetEffectiveStyle();
+
+                Rectangle r = HScrollBar.Bounds;
+
+                r.X = VScrollBar.Bounds.X;
+                r.Width = VScrollBar.Width;
+
+                using (Brush br = style.TrackBackground.GetBrush(r))
+                    g.FillRectangle(br, r);
+
+                using (Pen pen = new Pen(style.BorderColor))
+                    g.DrawRectangle(pen, r);
+            }
+
+            if (HScrollBar.Visible == true)
+                HScrollBar.Render(renderInfo);
+
+            if (VScrollBar.Visible == true)
+                VScrollBar.Render(renderInfo);
+        }
+
+        #endregion
+
+        #region Mouse handling
+
+        #region OnMouseEnter
+
+        protected override bool OnMouseEnter(EventArgs e)
+        {
+            base.OnMouseEnter(e);
+
+            InvalidateRender();
+
+            return (true);
+        }
+
+        #endregion
+
+        #region OnMouseLeave
+
+        protected override bool OnMouseLeave(EventArgs e)
+        {
+            base.OnMouseLeave(e);
+
+            InvalidateRender();
+
+            return (true);
+        }
+
+        #endregion
+
+        #region OnMouseMove
+
+        protected override bool OnMouseMove(MouseEventArgs e)
+        {
+            _HitArea = GetHitArea(e.Location);
+
+            if (IsMouseDown == true)
+                return (OnMouseDownMove(e));
+
+            if (_HitArea == ItemHitArea.InContent)
+            {
+                if (EmptyTextMarkup != null)
+                {
+                    ChartControl.SetChartCursor = true;
+                    EmptyTextMarkup.MouseMove(ChartControl, e);
+                    ChartControl.SetChartCursor = false;
+
+                    if (EmptyTextMarkup.MouseOverElement != null)
+                    {
+                        if (EmptyTextMarkup.MouseOverElement is HyperLink)
+                            return (true);
+                    }
+                }
+
+                if (EnablePanning == true &&
+                    (HScrollBar.Enabled == true || VScrollBar.Enabled == true))
+                {
+                    ChartCursor = OpenHandCursor;
+
+                    return (true);
+                }
+            }
+
+            ChartCursor = Cursors.Default;
+
+            return (false);
+        }
+
+        #region OnMouseDownMove
+
+        private bool OnMouseDownMove(MouseEventArgs e)
+        {
+            if (_Panning == true)
+            {
+                ChartCursor = ClosedHandCursor;
+
+                if (HScrollBar.Enabled == true)
+                    HScrollOffset = _HPanOffset + (MouseDownPoint.X - e.Location.X);
+
+                if (VScrollBar.Enabled == true)
+                {
+                    int n = (MouseDownPoint.Y - e.Location.Y);
+
+                    if (VScrollBar.Inverted == true)
+                        VScrollOffset = _VPanOffset - n;
+                    else
+                        VScrollOffset = _VPanOffset + n;
+                }
+            }
+
+            return (true);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region OnMouseDown
+
+        protected override bool OnMouseDown(MouseEventArgs e)
+        {
+            ChartControl.Focus();
+
+            UpdateSelection(e);
+
+            return (OnMouseDownEx(e));
+        }
+
+        protected override bool OnMouseDownEx(MouseEventArgs e)
+        {
+            base.OnMouseDown(e);
+
+            MouseDownHitArea = _HitArea;
+
+            if (EmptyTextMarkup != null)
+            {
+                if (EmptyTextMarkup.MouseOverElement != null)
+                {
+                    EmptyTextMarkup.MouseDown(ChartControl, e);
+
+                    return (true);
+                }
+            }
+
+            if (_HitArea == ItemHitArea.InContent)
+            {
+                if (EnablePanning == true &&
+                    (HScrollBar.Visible == true || VScrollBar.Visible == true))
+                {
+                    _HPanOffset = HScrollOffset;
+                    _VPanOffset = VScrollOffset;
+
+                    _Panning = true;
+
+                    ChartCursor = ClosedHandCursor;
+                    ChartControl.PostInternalMouseMove();
+
+                    ChartControl.CapturedItem = this;
+
+                    return (true);
+                }
+            }
+
+            return (false);
+        }
+
+        #region UpdateSelection
+
+        private void UpdateSelection(MouseEventArgs e)
+        {
+            ChartContainer parent = Parent as ChartContainer;
+
+            if (parent != null && parent.EnableSelection == true)
+            {
+                if (IsSelected == false ||
+                    ((e.Button & MouseButtons.Left) == MouseButtons.Left))
+                {
+                    ChartControl chartControl = ChartControl;
+
+                    if (chartControl != null)
+                    {
+                        bool ctrlKey = ((Control.ModifierKeys & Keys.Control) == Keys.Control);
+
+                        if (ctrlKey == true)
+                        {
+                            chartControl.SetSelected(this, !IsSelected);
+                        }
+                        else
+                        {
+                            chartControl.ClearAllSelected();
+
+                            chartControl.SetSelected(this, true);
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region OnMouseUp
+
+        protected override bool OnMouseUp(MouseEventArgs e)
+        {
+            base.OnMouseUp(e);
+
+            if (EmptyTextMarkup != null)
+            {
+                if (EmptyTextMarkup.MouseOverElement != null)
+                    EmptyTextMarkup.Click(ChartControl);
+            }
+
+            if (_Panning == true)
+            {
+                _Panning = false;
+
+                ChartControl.CapturedItem = null;
+            }
+
+            return (true);
+        }
+
+        #endregion
+
+        #region OnMouseWheel
+
+        protected override bool OnMouseWheel(MouseEventArgs e)
+        {
+            if ((Control.ModifierKeys & Keys.Shift) == Keys.Shift)
+                return (OnHorizontalMouseWheel(e));
+
+            return (OnVerticalMouseWheel(e));
+
+        }
+
+        #region OnHorizontalMouseWheel
+
+        private bool OnHorizontalMouseWheel(MouseEventArgs e)
+        {
+            if (HScrollBar.Enabled == true)
+            {
+                if ((e.Delta < 0 && HScrollBar.IsAtMaxumum == false) ||
+                    (e.Delta > 0 && HScrollBar.IsAtMinumum == false))
+                {
+                    SetHWheelValue(-e.Delta);
+
+                    return (true);
+                }
+            }
+
+            return (false);
+        }
+
+        #region SetHWheelValue
+
+        private void SetHWheelValue(int delta)
+        {
+            int value = delta * SystemInformation.MouseWheelScrollLines / 120;
+
+            value *= HScrollBar.SmallChange;
+            value += HScrollBar.Value;
+
+            SetHScrollValue(value);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region OnVerticalMouseWheel
+
+        private bool OnVerticalMouseWheel(MouseEventArgs e)
+        {
+            if (VScrollBar.Enabled == true)
+            {
+                if (VScrollBar.Inverted == true)
+                {
+                    if ((e.Delta < 0 && VScrollBar.IsAtMinumum == false) ||
+                        (e.Delta > 0 && VScrollBar.IsAtMaxumum == false))
+                    {
+                        SetVWheelValue(e.Delta);
+
+                        return (true);
+                    }
+                }
+                else
+                {
+                    if ((e.Delta < 0 && VScrollBar.IsAtMaxumum == false) ||
+                        (e.Delta > 0 && VScrollBar.IsAtMinumum == false))
+                    {
+                        SetVWheelValue(-e.Delta);
+
+                        return (true);
+                    }
+                }
+            }
+
+            return (false);
+        }
+
+        #region SetVWheelValue
+
+        private void SetVWheelValue(int delta)
+        {
+            int value = delta * SystemInformation.MouseWheelScrollLines / 120;
+
+            value *= VScrollBar.SmallChange;
+            value += VScrollBar.Value;
+
+            SetVScrollValue(value);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region Scrollbar support
+
+        #region SetupScrollBars
+
+        private void SetupScrollBars()
+        {
+            _VScrollBar = new VScrollBarLite();
+            _VScrollBar.Parent = this;
+            _VScrollBar.Width = Dpi.Width(VScrollBarWidth);
+
+            _HScrollBar = new HScrollBarLite();
+            _HScrollBar.Parent = this;
+            _HScrollBar.Height = Dpi.Height(HScrollBarHeight);
+
+            _HScrollBar.Visible = false;
+            _VScrollBar.Visible = false;
+        }
+
+        #endregion
+
+        #region UpdateScrollBars
+
+        private void UpdateScrollBars(ChartLayoutInfo layoutInfo)
+        {
+            Rectangle cbounds = ScrollBounds;
+            Rectangle cboundsEx = ScrollBoundsEx;
+
+            EnableHScrollBar(cbounds, cboundsEx);
+            EnableVScrollBar(cbounds, cboundsEx);
+
+            if (_HScrollBar.Enabled == true)
+            {
+                int widthEx = cboundsEx.Width;
+
+                _HScrollBar.SmallChange = cbounds.Width / 20;
+                _HScrollBar.Maximum = Math.Max(0, widthEx);
+                _HScrollBar.LargeChange = Math.Min(cbounds.Width, _HScrollBar.Maximum);
+
+                if (_HScrollBar.Value + _HScrollBar.LargeChange > _HScrollBar.Maximum)
+                    _HScrollBar.Value = _HScrollBar.Maximum - _HScrollBar.LargeChange;
+
+                _HScrollBar.Arrange(layoutInfo);
+            }
+
+            if (_VScrollBar.Enabled == true)
+            {
+                int heightEx = cboundsEx.Height;
+
+                _VScrollBar.SmallChange = cbounds.Height / 20;
+                _VScrollBar.Maximum = Math.Max(0, heightEx);
+                _VScrollBar.LargeChange = Math.Min(cbounds.Height, _VScrollBar.Maximum);
+
+                if (_VScrollBar.Value + _VScrollBar.LargeChange > _VScrollBar.Maximum)
+                    _VScrollBar.Value = _VScrollBar.Maximum - _VScrollBar.LargeChange;
+
+                _VScrollBar.Arrange(layoutInfo);
+            }
+        }
+
+        #region EnableHScrollBar
+
+        private void EnableHScrollBar(Rectangle cbounds, Rectangle cboundsEx)
+        {
+            bool enable = (HScrollBarVisible == true) &&
+                (cboundsEx.Width > cbounds.Width);
+
+            if ((cbounds.Height < _HScrollBar.Height + 4) || cbounds.Width <= 0)
+                enable = false;
+
+            if (enable == true)
+            {
+                _HScrollBar.Location = new
+                    Point(cbounds.Left, cbounds.Bottom - _HScrollBar.Height - 1);
+
+                int n = cbounds.Width - 1;
+
+                if (_VScrollBar.Visible == true)
+                    n -= _VScrollBar.Width;
+
+                _HScrollBar.Width = n;
+                _HScrollBar.Height = Dpi.Height(HScrollBarHeight);
+            }
+            else
+            {
+                _HScrollBar.Value = 0;
+            }
+
+            _HScrollBar.Enabled = enable;
+            _HScrollBar.Visible = enable;
+        }
+
+        #endregion
+
+        #region EnableVScrollBar
+
+        private void EnableVScrollBar(Rectangle cbounds, Rectangle cboundsEx)
+        {
+            bool enable = (VScrollBarVisible == true) &&
+                (cboundsEx.Height > cbounds.Height);
+
+            if (cbounds.Height <= 0 || (cbounds.Width < _VScrollBar.Width + 4))
+                enable = false;
+
+            if (enable == true)
+            {
+                _VScrollBar.Location = new
+                    Point(cbounds.Right - _VScrollBar.Width - 1, cbounds.Top);
+
+                _VScrollBar.Height = cbounds.Height - 1;
+
+                if (_HScrollBar.Visible == true)
+                    _VScrollBar.Height -= _HScrollBar.Height;
+
+                _VScrollBar.Width = Dpi.Width(VScrollBarWidth);
+            }
+            else
+            {
+                _VScrollBar.Value = 0;
+            }
+
+            _VScrollBar.Enabled = enable;
+            _VScrollBar.Visible = enable;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region SetVScrollValue
+
+        internal void SetVScrollValue(int value)
+        {
+            if (_VScrollBar.Visible == true)
+            {
+                int oldValue = _VScrollBar.Value;
+
+                value = Math.Max(value, 0);
+                value = Math.Min(value, _VScrollBar.Maximum);
+
+                _VScrollBar.Value = value;
+            }
+        }
+
+        #endregion
+
+        #region SetHScrollValue
+
+        internal void SetHScrollValue(int value)
+        {
+            if (_HScrollBar.Visible == true)
+            {
+                int oldValue = _HScrollBar.Value;
+
+                value = Math.Max(value, 0);
+                value = Math.Min(value, _HScrollBar.Maximum);
+
+                _HScrollBar.Value = value;
+            }
+        }
+
+        #endregion
+
+        #region AutoScrolling support
+
+        #region EnableAutoScrolling
+
+        internal void EnableAutoScrolling(
+            AutoScrollEnable enable, Rectangle scrollRect)
+        {
+            if (ChartControl.Focused == true)
+            {
+                _AutoScrollEnable = enable;
+
+                if ((_HScrollBar != null && _HScrollBar.Visible == true) ||
+                    (_VScrollBar != null && _VScrollBar.Visible == true))
+                {
+                    _ScrollRect = scrollRect;
+
+                    if (_AutoScrollTimer == null)
+                    {
+                        _AutoScrollTimer = new Timer();
+
+                        _AutoScrollTimer.Interval = 10;
+                        _AutoScrollTimer.Tick += AutoScrollTimerTick;
+                        _AutoScrollTimer.Start();
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region DisableAutoScrolling
+
+        internal void DisableAutoScrolling()
+        {
+            if (_AutoScrollTimer != null)
+            {
+                _AutoScrollTimer.Stop();
+                _AutoScrollTimer.Tick -= AutoScrollTimerTick;
+
+                _AutoScrollTimer = null;
+            }
+        }
+
+        #endregion
+
+        #region AutoScrollTimerTick
+
+        private void AutoScrollTimerTick(object sender, EventArgs e)
+        {
+            Point pt = ChartControl.PointToClient(Cursor.Position);
+            Rectangle t = _ScrollRect;
+
+            if ((_AutoScrollEnable & AutoScrollEnable.Horizontal) == AutoScrollEnable.Horizontal &&
+                (_HScrollBar != null && _HScrollBar.Visible == true))
+            {
+                int dx = (pt.X < t.X)
+                    ? ScrollAmount(pt.X - t.X)
+                    : (pt.X >= t.Right) ? ScrollAmount(pt.X - t.Right) : 0;
+
+                SetHScrollValue(_HScrollBar.Value + dx);
+            }
+
+            if ((_AutoScrollEnable & AutoScrollEnable.Vertical) == AutoScrollEnable.Vertical &&
+                (_VScrollBar != null && _VScrollBar.Visible == true))
+            {
+                int dy = (pt.Y < t.Top)
+                    ? ScrollAmount(pt.Y - t.Top)
+                    : (pt.Y >= t.Bottom) ? ScrollAmount(pt.Y - t.Bottom) : 0;
+
+                SetVScrollValue(_VScrollBar.Value + dy);
+            }
+        }
+
+        #endregion
+
+        #region ScrollAmount
+
+        private int ScrollAmount(int delta)
+        {
+            int n = Math.Abs(delta);
+            int amt = 1 << ((n / 16) + 1);
+
+            return (delta < 0 ? -amt : amt);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region EnsureVisible
+
+        /// <summary>
+        /// Ensures the container is visible on screen, and optionally
+        /// centered (if possible).
+        /// </summary>
+        /// <param name="center"></param>
+        public virtual void EnsureVisible(bool center)
+        {
+            ChartContainer parent = Parent as ChartContainer;
+
+            if (parent != null)
+                parent.EnsureVisible(this, center);
+        }
+
+        /// <summary>
+        /// Ensures that the given container "item" is visible
+        /// on screen, and optionally centered (if possible).
+        /// </summary>
+        /// <param name="center"></param>
+        public virtual void EnsureVisible(ChartContainer item, bool center)
+        {
+            Rectangle bounds = ContentBounds;
+
+            bounds.X += HScrollOffset;
+
+            if (VScrollBar.Inverted == true)
+                bounds.Y -= VScrollOffset;
+            else
+                bounds.Y += VScrollOffset;
+
+            if (HScrollBar.Enabled == true)
+                bounds.Width -= VScrollBar.Width;
+
+            if (VScrollBar.Enabled == true)
+                bounds.Height -= HScrollBar.Height;
+
+            bounds.Width -= Dpi.Width4;
+            bounds.Height -= Dpi.Height4;
+
+            Rectangle ibounds = item.FrameBounds;
+
+            if (bounds.Contains(ibounds) == false)
+            {
+                if (HScrollBar.Enabled == true)
+                {
+                    if (center == true)
+                    {
+                        int x = (bounds.X + bounds.Right) / 2 - (ibounds.Width / 2);
+
+                        SetHScrollValue(ibounds.X - x);
+                    }
+                    else
+                    {
+                        int x = ibounds.X;
+
+                        if (ibounds.Right > bounds.Right)
+                            x -= (ibounds.Right - bounds.Right);
+
+                        if (x < bounds.X)
+                            x = bounds.X;
+
+                        SetHScrollValue(HScrollOffset + (ibounds.X - x));
+                    }
+                }
+
+                if (VScrollBar.Enabled == true)
+                {
+                    if (center == true)
+                    {
+                        int y = (bounds.Y + bounds.Bottom) / 2;
+                        y -= (ibounds.Height / 2);
+
+                        SetVScrollValue(ibounds.Y - y);
+                    }
+                    else
+                    {
+                        int y = ibounds.Y;
+
+                        if (ibounds.Bottom > bounds.Bottom)
+                            y -= (ibounds.Bottom - bounds.Bottom);
+
+                        if (y < bounds.Y)
+                            y = bounds.Y;
+
+                        SetVScrollValue(VScrollOffset + (ibounds.Y - y));
+                    }
+                }
+            }
+
+            ChartContainer parent = Parent as ChartContainer;
+
+            if (parent != null)
+                parent.EnsureVisible(this, center);
+        }
+
+        #endregion
+
+        #region GetDisplayBounds
+
+        /// <summary>
+        /// Gets the "displayBounds" of the given rectangle (scroll
+        /// adjusted bounds).
+        /// </summary>
+        /// <param name="bounds"></param>
+        /// <returns></returns>
+        public Rectangle GetDisplayBounds(Rectangle bounds)
+        {
+            bounds.X -= HScrollOffset;
+
+            if (VScrollBar.Inverted == true)
+                bounds.Y += VScrollOffset;
+            else
+                bounds.Y -= VScrollOffset;
+
+            return (bounds);
+        }
+
+        #endregion
+
+        #region GetElementAt
+
+        /// <summary>
+        /// Gets the element at the given Point.
+        /// </summary>
+        /// <param name="pt"></param>
+        /// <returns></returns>
+        public override ChartVisualElement GetElementAt(Point pt)
+        {
+            if (InScrollBar(HScrollBar, pt))
+                return (HScrollBar);
+
+            if (InScrollBar(VScrollBar, pt))
+                return (VScrollBar);
+
+            foreach (ChartTitle title in Titles)
+            {
+                if (title.Visible == true)
+                {
+                    if (title.Bounds.Contains(pt))
+                        return (title);
+                }
+            }
+
+            if (Legend.Visible == true)
+            {
+                if (Legend.FrameBounds.Contains(pt))
+                {
+                    ChartVisualElement item = Legend.GetElementAt(pt);
+
+                    return (item ?? Legend);
+                }
+            }
+
+            return (null);
+        }
+
+        #region InScrollBar
+
+        private bool InScrollBar(ScrollBarLite scrollBar, Point pt)
+        {
+            if (scrollBar != null && scrollBar.Visible == true)
+            {
+                if (scrollBar.Bounds.Contains(pt))
+                    return (true);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetHitArea
+
+        /// <summary>
+        /// Gets the HitArea for the given Point.
+        /// </summary>
+        /// <param name="pt"></param>
+        /// <returns></returns>
+        public override ItemHitArea GetHitArea(Point pt)
+        {
+            Rectangle contentBounds = GetScrollBounds(ContentBounds);
+
+            if (contentBounds.Contains(pt))
+                return (ItemHitArea.InContent);
+
+            Rectangle frameBounds = GetScrollBounds(FrameBounds);
+
+            if (frameBounds.Contains(pt))
+                return (ItemHitArea.InFrame);
+
+            return (ItemHitArea.None);
+        }
+
+        #endregion
+
+        #region GetTitleByName
+
+        /// <summary>
+        /// Gets the defined Title with the given name.
+        /// </summary>
+        /// <param name="name"></param>
+        /// <returns>ChartTitle or null</returns>
+        public ChartTitle GetTitleByName(string name)
+        {
+            return (Titles[name]);
+        }
+
+        #endregion
+
+        #region Style Support
+
+        #region GetEffectiveContainerStyle
+
+        internal ContainerVisualStyle GetEffectiveContainerStyle()
+        {
+            StyleState state = GetStyleState();
+
+            return (EffectiveContainerStyles[state]);
+        }
+
+        #endregion
+
+        #region GetStyleState
+
+        private StyleState GetStyleState()
+        {
+            StyleState state = StyleState.Default;
+
+            if (IsMouseOver == true)
+                state |= StyleState.MouseOver;
+
+            if (IsSelected == true)
+                state |= StyleState.Selected;
+
+            return (state);
+        }
+
+        #endregion
+
+        #region ApplyStyles
+
+        public override void ApplyStyles(BaseVisualStyle style, StyleType cs)
+        {
+            base.ApplyStyles(style);
+
+            ContainerVisualStyle cstyle = style as ContainerVisualStyle;
+
+            if (cstyle != null)
+            {
+                ApplyParentStyles(cstyle, Parent as ChartContainer, cs);
+
+                cstyle.ApplyStyle(ContainerVisualStyles[cs]);
+            }
+        }
+
+        #region ApplyParentStyles (ChartContainerVisualStyles)
+
+        private void ApplyParentStyles(
+            ContainerVisualStyle cstyle, ChartContainer item, StyleType cs)
+        {
+            if (item != null)
+            {
+                ApplyParentStyles(cstyle, item.Parent as ChartContainer, cs);
+
+                ChartPanel panel = item as ChartPanel;
+
+                if (panel != null)
+                {
+                    if (panel.DefaultVisualStyles.ContainerVisualStyles != null)
+                        cstyle.ApplyStyle(panel.DefaultVisualStyles.ContainerVisualStyles[cs]);
+                }
+            }
+            else
+            {
+                ChartControl chartControl = ChartControl;
+
+                if (chartControl.BaseVisualStyles.ContainerVisualStyles != null)
+                    cstyle.ApplyStyle(chartControl.BaseVisualStyles.ContainerVisualStyles[cs]);
+
+                if (chartControl.DefaultVisualStyles.ContainerVisualStyles != null)
+                    cstyle.ApplyStyle(chartControl.DefaultVisualStyles.ContainerVisualStyles[cs]);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ApplyDefaults
+
+        public override void ApplyDefaults(BaseVisualStyle style, StyleType cs)
+        {
+            ContainerVisualStyle cstyle = style as ContainerVisualStyle;
+
+            if (cstyle != null)
+            {
+                if (cstyle.BorderPattern == null)
+                    cstyle.BorderPattern = new BorderPattern(LinePattern.Solid);
+
+                if (cstyle.DropShadow.Enabled == Tbool.NotSet)
+                    cstyle.DropShadow.Enabled = Tbool.False;
+            }
+
+            base.ApplyDefaults(style, cs);
+        }
+
+        #endregion
+
+        #region InvalidateStyle
+
+        ///<summary>
+        ///Invalidate the cached Style
+        ///</summary>
+        public void InvalidateStyle()
+        {
+            ClearEffectiveStyles();
+        }
+
+        #endregion
+
+        #region ClearEffectiveStyles
+
+        protected override void ClearEffectiveStyles()
+        {
+            _EffectiveContainerStyles.InvalidateStyles();
+
+            if (_VScrollBar != null)
+                _VScrollBar.InvalidateStyle();
+
+            if (_HScrollBar != null)
+                _HScrollBar.InvalidateStyle();
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ILegendData
+
+        #region GetLegendItems
+
+        public virtual List<ChartLegendItem> GetLegendData()
+        {
+            return (null);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region CompareTo
+
+        public int CompareTo(object obj)
+        {
+            ChartContainer cobj = obj as ChartContainer;
+
+            if (cobj != null)
+            {
+                if (this.Equals(cobj) == true)
+                    return (0);
+            }
+
+            return (-1);
+        }
+
+        #endregion
+
+        #region Copy/CopyTo
+
+        public override ChartVisualElement Copy()
+        {
+            ChartContainer copy = new ChartContainer();
+
+            CopyTo(copy);
+
+            return (copy);
+        }
+
+        public override void CopyTo(ChartVisualElement copy)
+        {
+            ChartContainer c = copy as ChartContainer;
+
+            if (c != null)
+            {
+                base.CopyTo(c);
+
+                c.AutoSizeMode = AutoSizeMode;
+
+                c.ContainerVisualStyles = (_ContainerVisualStyles != null) ? ContainerVisualStyles.Copy() : null;
+
+                c.EmptyText = EmptyText;
+                c.EnableEmptyTextMarkup = EnableEmptyTextMarkup;
+                c.EnablePanning = EnablePanning;
+                c.EnableSelection = EnableSelection;
+                c.FillWeight = FillWeight;
+                c.HScrollBarHeight = HScrollBarHeight;
+                c.HScrollBarVisible = HScrollBarVisible;
+
+                c.Legend = (_Legend != null) ? (ChartLegend)Legend.Copy() : null;
+
+                c.MatrixAlignEndColumn = MatrixAlignEndColumn;
+                c.MatrixAlignEndRow = MatrixAlignEndRow;
+                c.MatrixAlignStartColumn = MatrixAlignStartColumn;
+                c.MatrixAlignStartRow = MatrixAlignStartRow;
+                c.MatrixDisplayBounds = MatrixDisplayBounds;
+                c.MatrixDisplayOrder = MatrixDisplayOrder;
+                c.MinContentSize = MinContentSize;
+
+                c.Titles.Clear();
+
+                foreach (ChartTitle title in Titles)
+                    c.Titles.Add((ChartTitle)title.Copy());
+
+                c.VScrollBarWidth = VScrollBarWidth;
+                c.VScrollBarVisible = VScrollBarVisible;
+            }
+        }
+
+        #endregion
+
+        #region GetSerialData
+
+        internal override SerialElementCollection GetSerialData(string serialName)
+        {
+            SerialElementCollection sec = new SerialElementCollection();
+
+            if (serialName != null)
+            {
+                if (serialName.Equals("") == true)
+                    serialName = "ChartContainer";
+
+                sec.AddStartElement(serialName);
+            }
+
+            sec.AddValue("AutoSizeMode", AutoSizeMode, AutoSizeMode.NotSet);
+
+            if (_ContainerVisualStyles != null && _ContainerVisualStyles.IsEmpty == false)
+                sec.AddElement(_ContainerVisualStyles.GetSerialData("ContainerVisualStyles"));
+
+            sec.AddValue("EmptyText", EmptyText, null);
+            sec.AddValue("EnableEmptyTextMarkup", EnableEmptyTextMarkup, false);
+
+            sec.AddValue("EnablePanning", EnablePanning, true);
+            sec.AddValue("EnableSelection", EnableSelection, false);
+
+            sec.AddValue("FillWeight", FillWeight, 100);
+
+            sec.AddValue("HScrollBarHeight", HScrollBarHeight, 9);
+            sec.AddValue("HScrollBarVisible", HScrollBarVisible, true);
+
+            if (_HScrollBar != null)
+                sec.AddElement(_HScrollBar.GetSerialData("HScrollBar"));
+
+            if (_Legend != null)
+                sec.AddElement(_Legend.GetSerialData("Legend"));
+
+            sec.AddValue("MatrixAlignEndColumn", MatrixAlignEndColumn, false);
+            sec.AddValue("MatrixAlignEndRow", MatrixAlignEndRow, false);
+            sec.AddValue("MatrixAlignStartColumn", MatrixAlignStartColumn, false);
+            sec.AddValue("MatrixAlignStartRow", MatrixAlignStartRow, false);
+
+            ChartPanel panel = Parent as ChartPanel;
+
+            if (panel == null || panel.AutoFillChartMatrix == false) 
+            {
+                if (_MatrixDisplayBounds.IsEmpty == false)
+                    sec.AddValue("MatrixDisplayBounds", MatrixDisplayBounds);
+            }
+
+            sec.AddValue("MatrixDisplayOrder", MatrixDisplayOrder, 0);
+            sec.AddValue("MinContentSize", MinContentSize, new Size(100,100));
+
+            if (_Titles != null && _Titles.Count > 0)
+            {
+                sec.AddStartElement("Titles count=\"" + _Titles.Count + "\"");
+
+                foreach (ChartTitle title in _Titles)
+                    sec.AddElement(title.GetSerialData(""));
+
+                sec.AddEndElement("Titles");
+            }
+
+            if (_VScrollBar != null)
+                sec.AddElement(_VScrollBar.GetSerialData("VScrollBar"));
+
+            sec.AddValue("VScrollBarWidth", VScrollBarWidth, 9);
+            sec.AddValue("VScrollBarVisible", VScrollBarVisible, true);
+
+            sec.AddElement(base.GetSerialData(null));
+
+            if (serialName != null)
+                sec.AddEndElement("ChartContainer");
+
+            return (sec);
+        }
+
+        #endregion
+
+        #region PutSerialData
+
+        #region ProcessValue
+
+        internal override void ProcessValue(SerialElement se)
+        {
+            switch (se.Name)
+            {
+                case "AutoSizeMode":
+                    AutoSizeMode = (AutoSizeMode)se.GetValueEnum(typeof(AutoSizeMode));
+                    break;
+
+                case "EmptyText":
+                    EmptyText = se.StringValue;
+                    break;
+
+                case "EnableEmptyTextMarkup":
+                    EnableEmptyTextMarkup = bool.Parse(se.StringValue);
+                    break;
+
+                case "EnablePanning":
+                    EnablePanning = bool.Parse(se.StringValue);
+                    break;
+
+                case "EnableSelection":
+                    EnableSelection = bool.Parse(se.StringValue);
+                    break;
+
+                case "FillWeight":
+                    FillWeight = int.Parse(se.StringValue);
+                    break;
+
+                case "HScrollBarHeight":
+                    HScrollBarHeight = int.Parse(se.StringValue);
+                    break;
+
+                case "HScrollBarVisible":
+                    HScrollBarVisible = bool.Parse(se.StringValue);
+                    break;
+
+                case "MatrixAlignEndColumn":
+                    MatrixAlignEndColumn = bool.Parse(se.StringValue);
+                    break;
+
+                case "MatrixAlignEndRow":
+                    MatrixAlignEndRow = bool.Parse(se.StringValue);
+                    break;
+
+                case "MatrixAlignStartColumn":
+                    MatrixAlignStartColumn = bool.Parse(se.StringValue);
+                    break;
+
+                case "MatrixAlignStartRow":
+                    MatrixAlignStartRow = bool.Parse(se.StringValue);
+                    break;
+
+                case "MatrixDisplayBounds":
+                    ChartPanel panel = Parent as ChartPanel;
+
+                    if (panel == null || panel.AutoFillChartMatrix == false)
+                        MatrixDisplayBounds = se.GetValueRect();
+                    break;
+
+                case "MatrixDisplayOrder":
+                    MatrixDisplayOrder = int.Parse(se.StringValue);
+                    break;
+
+                case "MinContentSize":
+                    MinContentSize = se.GetValueSize();
+                    break;
+
+                case "VScrollBarWidth":
+                    VScrollBarWidth = int.Parse(se.StringValue);
+                    break;
+
+                case "VScrollBarVisible":
+                    VScrollBarVisible = bool.Parse(se.StringValue);
+                    break;
+
+                default:
+                    base.ProcessValue(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region ProcessCollection
+
+        internal override void ProcessCollection(SerialElement se)
+        {
+            SerialElementCollection sec = se.Sec;
+
+            switch (se.Name)
+            {
+                case "ChartTitle":
+                    string name = sec.GetItemValue("Name");
+
+                    ChartTitle title = GetTitleByName(name);
+
+                    if (title != null)
+                        Titles.Remove(title);
+
+                    title = new ChartTitle(name);
+
+                    sec.PutSerialData(title);
+
+                    Titles.Add(title);
+                    break;
+
+                case "ContainerVisualStyles":
+                    sec.PutSerialData(ContainerVisualStyles);
+                    break;
+
+                case "HScrollBar":
+                    sec.PutSerialData(HScrollBar);
+                    break;
+
+                case "Legend":
+                    sec.PutSerialData(Legend);
+                    break;
+
+                case "Titles":
+                    sec.PutSerialData(this);
+                    break;
+
+                case "VScrollBar":
+                    sec.PutSerialData(VScrollBar);
+                    break;
+
+                default:
+                    base.ProcessCollection(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region States
+
+        [Flags]
+        private enum States : uint
+        {
+            AutoGenSeriesCollection = (1U << 0),
+
+            EnableEmptyTextMarkup = (1U << 1),
+            EnablePanning = (1U << 2),
+
+            ShowPointsToolTips = (1U << 3),
+            ShowSeriesToolTips = (1U << 4),
+
+            HScrollBarEnabled = (1U << 5),
+            VScrollBarEnabled = (1U << 6),
+            HScrollBarVisible = (1U << 7),
+            VScrollBarVisible = (1U << 8),
+
+            LayoutBoundsValid = (1U << 9),
+            IsSelected = (1U << 10),
+
+            MatrixAlignStartColumn = (1U << 11),
+            MatrixAlignEndColumn = (1U << 12),
+            MatrixAlignStartRow = (1U << 13),
+            MatrixAlignEndRow = (1U << 14),
+
+            MatrixColumnAligned = (1U << 15),
+            MatrixRowAligned = (1U << 16),
+
+            EnableSelection = (1U << 17),
+        }
+
+        #region TestState
+
+        private bool TestState(States state)
+        {
+            return ((_States & state) == state);
+        }
+
+        #endregion
+
+        #region SetState
+
+        private void SetState(States state, bool value)
+        {
+            if (value == true)
+                _States |= state;
+            else
+                _States &= ~state;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IDisposable
+
+        public override void Dispose()
+        {
+            ContainerVisualStyles = null;
+            Titles = null;
+
+            base.Dispose();
+        }
+
+        #endregion
+    }
+
+    #region enums
+
+    #region AutoSizeMode
+
+    /// <summary>
+    /// Defines auto-sizing mode.
+    /// </summary>
+    public enum AutoSizeMode
+    {
+        /// <summary>
+        /// NotSet (None is default)
+        /// </summary>
+        NotSet = -1,
+
+        /// <summary>
+        /// No Auto-sizing will take place.
+        /// </summary>
+        None,
+
+        /// <summary>
+        /// Size will be determined by the fill weight.
+        /// </summary>
+        Fill,
+    }
+
+    #endregion
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/ChartCrosshair.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/ChartCrosshair.cs
new file mode 100644
index 00000000..571f88ed
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/ChartCrosshair.cs	
@@ -0,0 +1,895 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using DevComponents.DotNetBar.Charts.Style;
+
+namespace DevComponents.DotNetBar.Charts
+{
+    /// <summary>
+    /// Represents a Crosshair element.
+    /// </summary>
+    [TypeConverter(typeof(BlankExpandableObjectConverter))]
+    public class ChartCrosshair : ChartVisualElement
+    {
+        #region Private variables
+
+        private States _States;
+
+        private PointIntersectMode _PointIntersectMode = PointIntersectMode.Edge;
+        private int _PointIntersectMargin = 2;
+
+        private AxisOrientation _AxisOrientation = AxisOrientation.X;
+        private CrosshairLabelMode _CrosshairLabelMode = CrosshairLabelMode.Common;
+
+        private CrosshairVisualStyle _CrosshairVisualStyle;
+        private EffectiveStyle<CrosshairVisualStyle> _EffectiveCrosshairStyle;
+
+        private CrosshairValueVisualStyle _CrosshairLabelVisualStyle;
+        private EffectiveStyle<CrosshairValueVisualStyle> _EffectiveCrosshairLabelStyle;
+
+        #endregion
+
+        public ChartCrosshair()
+        {
+            InitDefaultStates();
+
+            _EffectiveCrosshairStyle = new EffectiveStyle<CrosshairVisualStyle>(this);
+            _EffectiveCrosshairLabelStyle = new EffectiveStyle<CrosshairValueVisualStyle>(this);
+        }
+
+        #region InitDefaultStates
+
+        private void InitDefaultStates()
+        {
+            SetState(States.ShowCrosshairLabelMarkers, true);
+            SetState(States.ShowGroupHeader, true);
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region AxisOrientation
+
+        /// <summary>
+        /// Gets or sets the axis orientation driving the crosshair display.
+        /// </summary>
+        [DefaultValue(AxisOrientation.X), Category("Appearance")]
+        [Description("Indicates the axis orientation driving the crosshair display.")]
+        public AxisOrientation AxisOrientation
+        {
+            get { return (_AxisOrientation); }
+
+            set
+            {
+                if (value != _AxisOrientation)
+                {
+                    _AxisOrientation = value;
+
+                    OnPropertyChanged("AxisOrientation");
+                }
+            }
+        }
+
+        #endregion
+
+        #region CrosshairLabelMode
+
+        /// <summary>
+        /// Gets or sets the mode used to display the Crosshair label.
+        /// </summary>
+        [DefaultValue(CrosshairLabelMode.Common), Category("Behavior")]
+        [Description("Indicates the mode used to display the Crosshair label.")]
+        public CrosshairLabelMode CrosshairLabelMode
+        {
+            get { return (_CrosshairLabelMode); }
+
+            set
+            {
+                if (value != _CrosshairLabelMode)
+                {
+                    _CrosshairLabelMode = value;
+
+                    OnPropertyChangedEx("CrosshairLabelMode", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region PointIntersectMode
+
+        /// <summary>
+        /// Gets or sets the the Crosshair point intersection mode.
+        /// </summary>
+        [DefaultValue(PointIntersectMode.Edge), Category("Behavior")]
+        [Description("Indicates the Crosshair point intersection mode.")]
+        public PointIntersectMode PointIntersectMode
+        {
+            get { return (_PointIntersectMode); }
+
+            set
+            {
+                if (value != _PointIntersectMode)
+                {
+                    _PointIntersectMode = value;
+
+                    OnPropertyChangedEx("PointIntersectMode", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region PointIntersectMargin
+
+        /// <summary>
+        /// Gets or sets the the Crosshair point intersection margin.
+        /// </summary>
+        [DefaultValue(2), Category("Layout")]
+        [Description("Indicates the Crosshair point intersection margin.")]
+        public int PointIntersectMargin
+        {
+            get { return (_PointIntersectMargin); }
+
+            set
+            {
+                if (value != _PointIntersectMargin)
+                {
+                    _PointIntersectMargin = value;
+
+                    OnPropertyChangedEx("PointIntersectMargin", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region CrosshairLabelVisualStyle
+
+        /// <summary>
+        /// Gets or sets the default visual style to be used for Crosshair 
+        /// values rendered on the X and Y axes.
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates visual style to be used for Crosshair values rendered on the X and Y axes")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public CrosshairValueVisualStyle CrosshairLabelVisualStyle
+        {
+            get
+            {
+                if (_CrosshairLabelVisualStyle == null)
+                {
+                    _CrosshairLabelVisualStyle = new CrosshairValueVisualStyle();
+
+                    StyleVisualChangeHandler(null, _CrosshairLabelVisualStyle);
+                }
+
+                return (_CrosshairLabelVisualStyle);
+            }
+
+            set
+            {
+                if (_CrosshairLabelVisualStyle != value)
+                {
+                    CrosshairValueVisualStyle oldValue = _CrosshairLabelVisualStyle;
+                    _CrosshairLabelVisualStyle = value;
+
+                    OnVisualStyleChanged("CrosshairLabelVisualStyle", oldValue, value);
+                }
+            }
+        }
+
+        #endregion
+
+        #region CrosshairVisualStyle
+
+        /// <summary>
+        /// Gets or sets the visual style for the Crosshair.
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates the visual style for the Crosshair.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public CrosshairVisualStyle CrosshairVisualStyle
+        {
+            get
+            {
+                if (_CrosshairVisualStyle == null)
+                {
+                    _CrosshairVisualStyle = new CrosshairVisualStyle();
+
+                    StyleVisualChangeHandler(null, _CrosshairVisualStyle);
+                }
+
+                return (_CrosshairVisualStyle);
+            }
+
+            set
+            {
+                if (_CrosshairVisualStyle != value)
+                {
+                    CrosshairVisualStyle oldValue = _CrosshairVisualStyle;
+
+                    _CrosshairVisualStyle = value;
+
+                    OnVisualStyleChanged("CrosshairVisualStyle", oldValue, value);
+
+                    if (oldValue != null)
+                        oldValue.Dispose();
+                }
+            }
+        }
+
+        #endregion
+
+        #region EffectiveCrosshairLabelStyle
+
+        /// <summary>
+        /// Gets a reference to the Crosshair label's Effective (cached, composite) style.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public CrosshairValueVisualStyle EffectiveCrosshairLabelStyle
+        {
+            get { return (_EffectiveCrosshairLabelStyle.Style); }
+        }
+
+        #endregion
+
+        #region EffectiveCrosshairStyle
+
+        /// <summary>
+        /// Gets a reference to the Crosshair's Effective (cached, composite) style.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public CrosshairVisualStyle EffectiveCrosshairStyle
+        {
+            get { return (_EffectiveCrosshairStyle.Style); }
+        }
+
+        #endregion
+
+        #region HighlightPoints
+
+        /// <summary>
+        /// Gets or sets whether series points are highlighted
+        /// when the Crosshair cursor intersects with them.
+        /// </summary>
+        [DefaultValue(false), Category("Appearance")]
+        [Description("Indicates whether series points are highlighted when the Crosshair cursor intersects with them.")]
+        public bool HighlightPoints
+        {
+            get { return (TestState(States.HighlightPoints)); }
+
+            set
+            {
+                if (value != HighlightPoints)
+                {
+                    SetState(States.HighlightPoints, value);
+
+                    OnPropertyChangedEx("HighlightPoints", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region HighlightSinglePoint
+
+        /// <summary>
+        /// Gets or sets whether only single series points are highlighted
+        /// when the Crosshair cursor intersects with them.
+        /// </summary>
+        [DefaultValue(false), Category("Appearance")]
+        [Description("Indicates whether only single series points are highlighted when the Crosshair cursor intersects with them.")]
+        public bool HighlightSinglePoint
+        {
+            get { return (TestState(States.HighlightSinglePoint)); }
+
+            set
+            {
+                if (value != HighlightSinglePoint)
+                {
+                    SetState(States.HighlightSinglePoint, value);
+
+                    OnPropertyChangedEx("HighlightSinglePoint", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowValueXLabels
+
+        /// <summary>
+        /// Gets or sets whether ValueX Labels are shown.
+        /// </summary>
+        [DefaultValue(false), Category("Appearance")]
+        [Description("Indicates whether ValueX Labels are shown.")]
+        public bool ShowValueXLabels
+        {
+            get { return (TestState(States.ShowValueXLabels)); }
+
+            set
+            {
+                if (value != ShowValueXLabels)
+                {
+                    SetState(States.ShowValueXLabels, value);
+
+                    OnPropertyChangedEx("ShowValueXLabels", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowValueXLine
+
+        /// <summary>
+        /// Gets or sets whether a ValueX line is shown.
+        /// </summary>
+        [DefaultValue(false), Category("Appearance")]
+        [Description("Indicates whether a ValueX line is shown.")]
+        public bool ShowValueXLine
+        {
+            get { return (TestState(States.ShowValueXLine)); }
+
+            set
+            {
+                if (value != ShowValueXLine)
+                {
+                    SetState(States.ShowValueXLine, value);
+
+                    OnPropertyChangedEx("ShowValueXLine", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowCrosshairLabelMarkers
+
+        /// <summary>
+        /// Gets or sets whether Crosshair label markers are shown.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance")]
+        [Description("Indicates whether Crosshair label markers are shown.")]
+        public bool ShowCrosshairLabelMarkers
+        {
+            get { return (TestState(States.ShowCrosshairLabelMarkers)); }
+
+            set
+            {
+                if (value != ShowCrosshairLabelMarkers)
+                {
+                    SetState(States.ShowCrosshairLabelMarkers, value);
+
+                    OnPropertyChangedEx("ShowCrosshairLabelMarkers", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowCrosshairLabels
+
+        /// <summary>
+        /// Gets or sets whether Crosshair labels are shown.
+        /// </summary>
+        [DefaultValue(false), Category("Appearance")]
+        [Description("Indicates whether Crosshair labels are shown.")]
+        public bool ShowCrosshairLabels
+        {
+            get { return (TestState(States.ShowCrosshairLabels)); }
+
+            set
+            {
+                if (value != ShowCrosshairLabels)
+                {
+                    SetState(States.ShowCrosshairLabels, value);
+
+                    OnPropertyChangedEx("ShowCrosshairLabels", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowGroupHeaders
+
+        /// <summary>
+        /// Gets or sets whether Group Headers are shown for each series.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance")]
+        [Description("Indicates whether Group Headers are shown for each series.")]
+        public bool ShowGroupHeaders
+        {
+            get { return (TestState(States.ShowGroupHeader)); }
+
+            set
+            {
+                if (value != ShowGroupHeaders)
+                {
+                    SetState(States.ShowGroupHeader, value);
+
+                    OnPropertyChangedEx("ShowGroupHeaders", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowValueYLabels
+
+        /// <summary>
+        /// Gets or sets whether a ValueY label is shown.
+        /// </summary>
+        [DefaultValue(false), Category("Appearance")]
+        [Description("Indicates whether a ValueY label is shown.")]
+        public bool ShowValueYLabels
+        {
+            get { return (TestState(States.ShowValueYLabels)); }
+
+            set
+            {
+                if (value != ShowValueYLabels)
+                {
+                    SetState(States.ShowValueYLabels, value);
+
+                    OnPropertyChangedEx("ShowValueYLabels", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowValueYLine
+
+        /// <summary>
+        /// Gets or sets whether a ValueY line is shown.
+        /// </summary>
+        [DefaultValue(false), Category("Appearance")]
+        [Description("Indicates whether a ValueY line is shown.")]
+        public bool ShowValueYLine
+        {
+            get { return (TestState(States.ShowValueYLine)); }
+
+            set
+            {
+                if (value != ShowValueYLine)
+                {
+                    SetState(States.ShowValueYLine, value);
+
+                    OnPropertyChangedEx("ShowValueYLine", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region MeasureOverride
+
+        protected override void MeasureOverride(ChartLayoutInfo layoutInfo)
+        {
+        }
+
+        #endregion
+
+        #region ArrangeOverride
+
+        protected override void ArrangeOverride(ChartLayoutInfo layoutInfo)
+        {
+        }
+
+        #endregion
+
+        #region RenderOverride
+
+        protected override void RenderOverride(ChartRenderInfo renderInfo)
+        {
+        }
+
+        #endregion
+
+        #region Style support
+
+        #region ApplyStyles
+
+        public override void ApplyStyles(BaseVisualStyle style)
+        {
+            base.ApplyStyles(style);
+
+            CrosshairVisualStyle cstyle = style as CrosshairVisualStyle;
+
+            if (cstyle != null)
+            {
+                ApplyParentStyles(cstyle, Parent as ChartContainer);
+
+                cstyle.ApplyStyle(CrosshairVisualStyle);
+
+                ApplyDefaultLineStyles(cstyle.ValueXLineStyle);
+                ApplyDefaultLineStyles(cstyle.ValueYLineStyle);
+
+                if (cstyle.GroupHeaderFont == null)
+                    cstyle.GroupHeaderFont = SystemFonts.CaptionFont;
+
+                if (cstyle.GroupHeaderTextColor.IsEmpty)
+                    cstyle.GroupHeaderTextColor = Color.Black;
+
+                if (cstyle.Padding.IsEmpty == true)
+                    cstyle.Padding = new Style.Padding(4);
+
+                if (cstyle.BorderThickness <= 0)
+                    cstyle.BorderThickness = 1;
+
+                if (cstyle.BorderPattern == LinePattern.NotSet)
+                    cstyle.BorderPattern = LinePattern.Solid;
+
+                if (cstyle.BorderColor.IsEmpty == true)
+                    cstyle.BorderColor = Color.Black;
+
+                if (cstyle.Background.IsEmpty == true)
+                    cstyle.Background = new Background(Color.White);
+
+                if (cstyle.Font == null)
+                    cstyle.Font = SystemFonts.DefaultFont;
+            }
+        }
+
+        #region ApplyParentStyles
+
+        private void ApplyParentStyles(
+            CrosshairVisualStyle pstyle, ChartContainer item)
+        {
+            if (item != null)
+            {
+                ApplyParentStyles(pstyle, item.Parent as ChartContainer);
+
+                if (item is ChartPanel)
+                    pstyle.ApplyStyle(((ChartPanel)item).DefaultVisualStyles.CrosshairVisualStyle);
+            }
+            else
+            {
+                pstyle.ApplyStyle(ChartControl.BaseVisualStyles.CrosshairVisualStyle);
+                pstyle.ApplyStyle(ChartControl.DefaultVisualStyles.CrosshairVisualStyle);
+            }
+        }
+
+        #endregion
+
+        #region ApplyDefaultLineStyles
+
+        private void ApplyDefaultLineStyles(ChartLineVisualStyle style)
+        {
+            if (style.LineColor.IsEmpty == true)
+                style.LineColor = Color.Fuchsia;
+
+            if (style.LinePattern == LinePattern.NotSet)
+                style.LinePattern = LinePattern.Solid;
+
+            if (style.LineWidth < 0)
+                style.LineWidth = 1;
+        }
+
+        #endregion
+
+        #region InvalidateStyle
+
+        ///<summary>
+        ///Invalidate the cached Styles
+        ///</summary>
+        public void InvalidateStyle()
+        {
+            ClearEffectiveStyles();
+        }
+
+        #endregion
+
+        #region ClearEffectiveStyles
+
+        protected override void ClearEffectiveStyles()
+        {
+            _EffectiveCrosshairStyle.InvalidateStyle();
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region Crosshair States
+
+        [Flags]
+        private enum States : uint
+        {
+            HighlightPoints = (1U << 0),
+            HighlightSinglePoint = (1U << 1),
+
+            ShowValueXLabels = (1U << 2),
+            ShowValueXLine = (1U << 3),
+
+            ShowCrosshairLabels = (1U << 4),
+            ShowGroupHeader = (1U << 5),
+            ShowCrosshairLabelMarkers = (1U << 6),
+
+            ShowValueYLabels = (1U << 7),
+            ShowValueYLine = (1U << 8),
+        }
+
+        #region TestState
+
+        private bool TestState(States state)
+        {
+            return ((_States & state) == state);
+        }
+
+        #endregion
+
+        #region SetState
+
+        private void SetState(States state, bool value)
+        {
+            if (value == true)
+                _States |= state;
+            else
+                _States &= ~state;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Copy/CopyTo
+
+        public override ChartVisualElement Copy()
+        {
+            ChartCrosshair copy = new ChartCrosshair();
+
+            CopyTo(copy);
+
+            return (copy);
+        }
+
+        public override void CopyTo(ChartVisualElement copy)
+        {
+            ChartCrosshair c = copy as ChartCrosshair;
+
+            if (c != null)
+            {
+                base.CopyTo(c);
+
+                c.AxisOrientation = AxisOrientation;
+                c.CrosshairLabelMode = CrosshairLabelMode;
+                c.PointIntersectMode = PointIntersectMode;
+                c.PointIntersectMargin = PointIntersectMargin;
+
+                c.CrosshairLabelVisualStyle =  (_CrosshairLabelVisualStyle != null) ? CrosshairLabelVisualStyle.Copy() : null;
+                c.CrosshairVisualStyle = (_CrosshairVisualStyle != null) ? CrosshairVisualStyle.Copy() : null;
+
+                c.HighlightPoints = HighlightPoints;
+                c.HighlightSinglePoint = HighlightSinglePoint;
+
+                c.ShowValueXLabels = ShowValueXLabels;
+                c.ShowValueXLine = ShowValueXLine;
+                c.ShowCrosshairLabels = ShowCrosshairLabels;
+                c.ShowGroupHeaders = ShowGroupHeaders;
+                c.ShowValueYLabels = ShowValueYLabels;
+                c.ShowValueYLine = ShowValueYLine;
+            }
+        }
+
+        #endregion
+
+        #region GetSerialData
+
+        internal override SerialElementCollection GetSerialData(string serialName)
+        {
+            SerialElementCollection sec = new SerialElementCollection();
+
+            if (serialName != null)
+            {
+                if (serialName.Equals("") == true)
+                    serialName = "ChartCrosshair";
+
+                sec.AddStartElement(serialName);
+            }
+
+            sec.AddValue("AxisOrientation", AxisOrientation, AxisOrientation.X);
+            sec.AddValue("CrosshairLabelMode", CrosshairLabelMode, CrosshairLabelMode.Common);
+            sec.AddValue("PointIntersectMode", PointIntersectMode, PointIntersectMode.Edge);
+            sec.AddValue("PointIntersectMargin", PointIntersectMargin, 2);
+
+            if (_CrosshairLabelVisualStyle != null && _CrosshairLabelVisualStyle.IsEmpty == false)
+                sec.AddElement(_CrosshairLabelVisualStyle.GetSerialData("CrosshairLabelVisualStyle"));
+
+            if (_CrosshairVisualStyle != null && _CrosshairVisualStyle.IsEmpty == false)
+                sec.AddElement(_CrosshairVisualStyle.GetSerialData("CrosshairVisualStyle"));
+
+            sec.AddValue("HighlightPoints", HighlightPoints, false);
+            sec.AddValue("HighlightSinglePoint", HighlightSinglePoint, false);
+
+            sec.AddValue("ShowValueXLabels", ShowValueXLabels, false);
+            sec.AddValue("ShowValueXLine", ShowValueXLine, false);
+            sec.AddValue("ShowCrosshairLabels", ShowCrosshairLabels, false);
+            sec.AddValue("ShowGroupHeaders", ShowGroupHeaders, true);
+            sec.AddValue("ShowValueYLabels", ShowValueYLabels, false);
+            sec.AddValue("ShowValueYLine", ShowValueYLine, false);
+
+            sec.AddElement(base.GetSerialData(null));
+
+            if (serialName != null)
+                sec.AddEndElement(serialName);
+
+            return (sec);
+        }
+
+        #endregion
+
+        #region PutSerialData
+
+        #region ProcessValue
+
+        internal override void ProcessValue(SerialElement se)
+        {
+            switch (se.Name)
+            {
+                case "AxisOrientation":
+                    AxisOrientation = (AxisOrientation)se.GetValueEnum(typeof(AxisOrientation));
+                    break;
+
+                case "CrosshairLabelMode":
+                    CrosshairLabelMode = (CrosshairLabelMode)se.GetValueEnum(typeof(CrosshairLabelMode));
+                    break;
+
+                case "PointIntersectMode":
+                    PointIntersectMode = (PointIntersectMode)se.GetValueEnum(typeof(PointIntersectMode));
+                    break;
+
+                case "PointIntersectMargin":
+                    PointIntersectMargin = int.Parse(se.StringValue);
+                    break;
+
+                case "HighlightPoints":
+                    HighlightPoints = bool.Parse(se.StringValue);
+                    break;
+
+                case "HighlightSinglePoint":
+                    HighlightSinglePoint = bool.Parse(se.StringValue);
+                    break;
+
+                case "ShowValueXLabels":
+                    ShowValueXLabels = bool.Parse(se.StringValue);
+                    break;
+
+                case "ShowValueXLine":
+                    ShowValueXLine = bool.Parse(se.StringValue);
+                    break;
+
+                case "ShowCrosshairLabels":
+                    ShowCrosshairLabels = bool.Parse(se.StringValue);
+                    break;
+
+                case "ShowGroupHeaders":
+                    ShowGroupHeaders = bool.Parse(se.StringValue);
+                    break;
+
+                case "ShowValueYLabels":
+                    ShowValueYLabels = bool.Parse(se.StringValue);
+                    break;
+
+                case "ShowValueYLine":
+                    ShowValueYLine = bool.Parse(se.StringValue);
+                    break;
+
+                default:
+                    base.ProcessValue(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region ProcessCollection
+
+        internal override void ProcessCollection(SerialElement se)
+        {
+            SerialElementCollection sec = se.Sec;
+
+            switch (se.Name)
+            {
+                case "CrosshairLabelVisualStyle":
+                    sec.PutSerialData(CrosshairLabelVisualStyle);
+                    break;
+
+                case "CrosshairVisualStyle":
+                    sec.PutSerialData(CrosshairVisualStyle);
+                    break;
+
+                default:
+                    base.ProcessCollection(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IDisposable
+
+        public override void Dispose()
+        {
+            CrosshairLabelVisualStyle = null;
+            CrosshairVisualStyle = null;
+
+            base.Dispose();
+        }
+
+        #endregion
+    }
+
+    #region enums
+
+    #region CrosshairLabelMode
+
+    public enum CrosshairLabelMode
+    {
+        /// <summary>
+        /// A common Crosshair label is shown for all series
+        /// </summary>
+        Common,
+
+        /// <summary>
+        /// A crosshair label is shown for the nearest series
+        /// </summary>
+        NearestSeries,
+
+        /// <summary>
+        /// A crosshair label is shown for each series
+        /// </summary>
+        EachSeries,
+    }
+
+    #endregion
+
+    #region CrosshairLabelPosition
+
+    public enum CrosshairLabelPosition
+    {
+        /// <summary>
+        /// Crosshair labels positioned relative to the Chart
+        /// </summary>
+        ChartRelative,
+
+        /// <summary>
+        /// Crosshair labels positioned relative to the Mouse
+        /// </summary>
+        MouseRelative,
+    }
+
+    #endregion
+
+    #region PointIntersectMode
+
+    public enum PointIntersectMode
+    {
+        /// <summary>
+        /// From center.
+        /// </summary>
+        Center,
+
+        /// <summary>
+        /// From edge.
+        /// </summary>
+        Edge,
+    }
+
+    #endregion
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/ChartElement.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/ChartElement.cs
new file mode 100644
index 00000000..e33f8b85
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/ChartElement.cs	
@@ -0,0 +1,1769 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Globalization;
+using System.IO;
+using System.Threading;
+using System.Windows.Forms;
+using System.Xml;
+using DevComponents.DotNetBar.Charts.Style;
+
+namespace DevComponents.DotNetBar.Charts
+{
+    [DesignTimeVisible(false)]
+    public abstract class ChartElement : INotifyPropertyChanged, INamed, IDisposable
+    {
+        #region Events
+
+        /// <summary>
+        /// Occurs when parent of the item has changed.
+        /// </summary>
+        public event EventHandler ParentChanged;
+
+        /// <summary>
+        /// Occurs when display/rendering of the item is invalidated.
+        /// </summary>
+        public event EventHandler RenderInvalid;
+
+        /// <summary>
+        /// Occurs when layout of the item is invalidated.
+        /// </summary>
+        public event EventHandler LayoutInvalid;
+
+        #endregion
+
+        #region Private variables
+
+        private string _Name = String.Empty;
+
+        private ChartControl _ChartControl;
+        private ChartElement _Parent;
+        private object _Tag;
+
+        #endregion
+
+        #region Public properties
+
+        #region ChartControl
+
+        /// <summary>
+        /// Gets the parent ChartControl
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public ChartControl ChartControl
+        {
+            get { return (GetChartControl()); }
+            internal set { _ChartControl = value; }
+        }
+
+        #region GetChartControl
+
+        private ChartControl GetChartControl()
+        {
+            if (_ChartControl != null)
+                return (_ChartControl);
+
+            ChartElement parent = _Parent;
+
+            while (parent != null)
+            {
+                if (parent.ChartControl != null)
+                    return (parent.ChartControl);
+
+                parent = parent.Parent;
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ChartPanel
+
+        /// <summary>
+        /// Gets the parent ChartPanel
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public ChartPanel ChartPanel
+        {
+            get { return (GetChartPanel()); }
+        }
+
+        #region GetChartPanel
+
+        private ChartPanel GetChartPanel()
+        {
+            ChartElement item = this;
+
+            while (item != null)
+            {
+                if (item is ChartPanel)
+                    return ((ChartPanel)item);
+
+                item = item.Parent;
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Name
+
+        /// <summary>
+        /// Gets or sets the Name of the item.
+        /// </summary>
+        [DefaultValue("")]
+        [Description("Indicates the Name of the item.")]
+        public virtual string Name
+        {
+            get { return (_Name); }
+            set { _Name = value; }
+        }
+
+        #endregion
+
+        #region Parent
+
+        /// <summary>
+        /// Gets or sets the parent of the item.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public virtual ChartElement Parent
+        {
+            get { return (_Parent); }
+
+            internal set
+            {
+                if (_Parent != value)
+                {
+                    ChartElement oldParent = _Parent;
+                    _Parent = value;
+
+                    OnParentChanged(oldParent, value);
+                }
+            }
+        }
+
+        #region OnParentChanged
+
+        /// <summary>
+        /// Called after parent of the item has changed.
+        /// </summary>
+        /// <param name="oldParent">Reference to old parent.</param>
+        /// <param name="newParent">Reference to new parent.</param>
+        protected virtual void OnParentChanged(ChartElement oldParent, ChartElement newParent)
+        {
+            if (oldParent != null)
+                oldParent.ParentChanged -= GrapdParentChanged;
+
+            if (newParent != null)
+                newParent.ParentChanged += GrapdParentChanged;
+
+            OnParentChanged(EventArgs.Empty);
+        }
+
+        void GrapdParentChanged(object sender, EventArgs e)
+        {
+            ChartElement parent = sender as ChartElement;
+
+            if (parent != null)
+                Parent = parent;
+        }
+
+        /// <summary>
+        /// Raises ParentChanged event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnParentChanged(EventArgs e)
+        {
+            EventHandler handler = ParentChanged;
+
+            if (handler != null)
+                handler(this, e);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ParentChartContainer
+
+        /// <summary>
+        /// Gets the parent ChartContainer
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public ChartContainer ParentChartContainer
+        {
+            get { return (GetParentChartContainer()); }
+        }
+
+        #region GetParentChartContainer
+
+        private ChartContainer GetParentChartContainer()
+        {
+            ChartElement parent = _Parent;
+
+            while (parent != null)
+            {
+                if (parent is ChartContainer)
+                    return ((ChartContainer)parent);
+
+                parent = parent.Parent;
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Tag
+
+        ///<summary>
+        /// Gets or sets user-defined data associated with the object
+        ///</summary>
+        [DefaultValue(null)]
+        [Description("User-defined data associated with the object")]
+        [TypeConverter(typeof(StringConverter))]
+        public object Tag
+        {
+            get { return (_Tag); }
+            set { _Tag = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region OnLayoutInvalid
+
+        /// <summary>
+        /// Raises LayoutInvalid event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnLayoutInvalid(EventArgs e)
+        {
+            EventHandler handler = LayoutInvalid;
+
+            if (handler != null)
+                handler(this, e);
+        }
+
+        #endregion
+
+        #region OnRenderInvalid
+
+        /// <summary>
+        /// Raises RenderInvalid event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnRenderInvalid(EventArgs e)
+        {
+            EventHandler handler = RenderInvalid;
+
+            if (handler != null)
+                handler(this, e);
+        }
+
+        #endregion
+
+        #region INotifyPropertyChanged Members
+
+        /// <summary>
+        /// Occurs when property value has changed.
+        /// </summary>
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        /// <summary>
+        /// Raises the PropertyChanged event.
+        /// </summary>
+        /// <param name="e">Event arguments</param>
+        protected virtual void OnPropertyChanged(PropertyChangedEventArgs e)
+        {
+            PropertyChangedEventHandler eh = PropertyChanged;
+
+            if (eh != null)
+                eh(this, e);
+        }
+
+        /// <summary>
+        /// Default PropertyChanged processing
+        /// </summary>
+        /// <param name="s"></param>
+        protected void OnPropertyChanged(string s)
+        {
+            if (PropertyChanged != null)
+                OnPropertyChanged(new PropertyChangedEventArgs(s));
+        }
+
+        #endregion
+
+        #region IDisposable
+
+        public virtual void Dispose()
+        {
+            Parent = null;
+        }
+
+        #endregion
+    }
+
+    [ToolboxItem(false)]
+    public abstract class ChartVisualElement : ChartElement, IEffectiveStyle, IProcessSerialElement
+    {
+        #region Static variables
+
+        static Point _mouseDownPoint;
+
+        static Cursor _OpenHandCursor;
+        static Cursor _ClosedHandCursor;
+
+        #endregion
+
+        #region Private variables
+
+        private Es _States;
+
+        private Rectangle _BoundsRelative;
+        private Point _ScrollOffset;
+
+        private ChartVisualElement _HitItem;
+
+        #endregion
+
+        #region Constructor
+
+        /// <summary>
+        /// ChartVisualElement
+        /// </summary>
+        protected ChartVisualElement()
+        {
+            SetState(Es.Visible, true);
+        }
+
+        #endregion
+
+        #region Abstract methods
+
+        /// <summary>
+        /// Performs the layout of the item
+        /// and sets the Size property to size that item will take.
+        /// </summary>
+        /// <param name="layoutInfo">Layout information.</param>
+        protected abstract void MeasureOverride(ChartLayoutInfo layoutInfo);
+
+        /// <summary>
+        /// Performs the arrange pass layout of the item when
+        /// the final position and size of the item has been set.
+        /// </summary>
+        /// <param name="layoutInfo">Layout information.</param>
+        protected abstract void ArrangeOverride(ChartLayoutInfo layoutInfo);
+
+        /// <summary>
+        /// Performs drawing of the item and its children.
+        /// </summary>
+        /// <param name="renderInfo">Holds contextual rendering information.</param>
+        protected abstract void RenderOverride(ChartRenderInfo renderInfo);
+
+        #endregion
+
+        #region Public properties
+
+        #region Bounds
+
+        /// <summary>
+        /// Gets or sets the absolute (scroll adjusted) bounds of the item.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public virtual Rectangle Bounds
+        {
+            get { return (GetScrollBounds(_BoundsRelative)); }
+        }
+
+        #endregion
+
+        #region BoundsRelative
+
+        /// <summary>
+        /// Gets or sets the relative bounds of the item.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public virtual Rectangle BoundsRelative
+        {
+            get { return (_BoundsRelative); }
+            internal set { _BoundsRelative = value; }
+        }
+
+        #endregion
+
+        #region IsMouseOver
+
+        /// <summary>
+        /// Gets whether mouse is over the element.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public virtual bool IsMouseOver
+        {
+            get { return (TestState(Es.MouseOver)); }
+            internal set { SetState(Es.MouseOver, value); }
+        }
+
+        #endregion
+
+        #region Size
+
+        /// <summary>
+        /// Gets or sets the Size of the item.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public Size Size
+        {
+            get { return (_BoundsRelative.Size); }
+            internal set { _BoundsRelative.Size = value; }
+        }
+
+        #endregion
+
+        #region Visible
+
+        /// <summary>
+        /// Get or sets whether the item is visible
+        /// </summary>
+        [DefaultValue(true), Category("Appearance")]
+        [Description("Indicates whether the item is visible")]
+        public virtual bool Visible
+        {
+            get { return (TestState(Es.Visible)); }
+
+            set
+            {
+                if (Visible != value)
+                {
+                    SetState(Es.Visible, value);
+
+                    OnPropertyChangedEx("Visible", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region Capture
+
+        internal virtual bool Capture
+        {
+            get { return (CapturedItem != null); }
+
+            set
+            {
+                if (ChartControl != null)
+                    CapturedItem = (value == true) ? this : null;
+            }
+        }
+
+        #endregion
+
+        #region CapturedItem
+
+        internal ChartVisualElement CapturedItem
+        {
+            get
+            {
+                if (ChartControl != null)
+                    return (ChartControl.CapturedItem);
+
+                return (null);
+            }
+
+            set
+            {
+                if (ChartControl != null)
+                    ChartControl.CapturedItem = value;
+            }
+        }
+
+        #endregion
+
+        #region ChartCursor
+
+        internal Cursor ChartCursor
+        {
+            get
+            {
+                ChartControl cc = ChartControl;
+
+                if (cc != null)
+                    return (cc.ChartCursor);
+
+                return (Cursors.Default);
+            }
+
+            set
+            {
+                ChartControl cc = ChartControl;
+
+                if (cc != null)
+                    cc.ChartCursor = value;
+            }
+        }
+
+        #endregion
+
+        #region ClosedHandCursor
+
+        internal Cursor ClosedHandCursor
+        {
+            get
+            {
+                if (_ClosedHandCursor == null)
+                    _ClosedHandCursor = new Cursor(GetType(), "ClosedHand.cur");
+
+                return (_ClosedHandCursor);
+            }
+        }
+
+        #endregion
+
+        #region HitItem
+
+        internal ChartVisualElement HitItem
+        {
+            get { return (_HitItem); }
+            set { _HitItem = value; }
+        }
+
+        #endregion
+
+        #region Displayed
+
+        /// <summary>
+        /// Gets whether element is actually displayed on screen
+        /// </summary>
+        internal bool Displayed
+        {
+            get { return (TestState(Es.Displayed)); }
+            set { SetState(Es.Displayed, value); }
+        }
+
+        #endregion
+
+        #region IsMouseDown
+
+        /// <summary>
+        /// Gets whether mouse is down
+        /// </summary>
+        internal virtual bool IsMouseDown
+        {
+            get { return (Control.MouseButtons != MouseButtons.None); }
+        }
+
+        #endregion
+
+        #region MouseDownPoint
+
+        /// <summary>
+        /// Gets the mouse down Point
+        /// </summary>
+        internal virtual Point MouseDownPoint
+        {
+            get { return (_mouseDownPoint); }
+            set { _mouseDownPoint = value; }
+        }
+
+        #endregion
+
+        #region MouseOverElement
+
+        internal ChartVisualElement MouseOverElement
+        {
+            get { return (ChartControl.MouseOverElement); }
+            set { ChartControl.MouseOverElement = value; }
+        }
+
+        #endregion
+
+        #region OpenHandCursor
+
+        internal Cursor OpenHandCursor
+        {
+            get
+            {
+                if (_OpenHandCursor == null)
+                    _OpenHandCursor = new Cursor(GetType(), "OpenHand.cur");
+
+                return (_OpenHandCursor);
+            }
+        }
+
+        #endregion
+
+        #region ScrollOffset
+
+        internal Point ScrollOffset
+        {
+            get { return (_ScrollOffset); }
+            set { _ScrollOffset = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Measure
+
+        /// <summary>
+        /// This method is used by the items internally to invoke the measure pass to
+        /// get item size. Override MeasureOverride method to perform actual measuring.
+        /// </summary>
+        /// <param name="layoutInfo">Holds contextual layout information.</param>
+        internal void Measure(ChartLayoutInfo layoutInfo)
+        {
+            MeasureOverride(layoutInfo);
+        }
+
+        #endregion
+
+        #region Arrange
+
+        /// <summary>
+        /// This method is used by the items internally to invoke the arrange pass after
+        /// location and size of the item has been set. Override ArrangeOverride method
+        /// to perform internal arranging.
+        /// </summary>
+        /// <param name="layoutInfo"></param>
+        /// <param name="layoutBounds"></param>
+        internal void Arrange(ChartLayoutInfo layoutInfo)
+        {
+            Displayed = true;
+
+            _ScrollOffset = layoutInfo.ScrollOffset;
+
+            ArrangeOverride(layoutInfo);
+        }
+
+        #endregion
+
+        #region Render
+
+        private int _RenderCount;
+
+        /// <summary>
+        /// This method is used by the items internally to invoke the rendering
+        /// for the item. Override RenderOverride method to perform actual rendering.
+        /// </summary>
+        /// <param name="renderInfo">Holds contextual rendering information.</param>
+        internal virtual void Render(ChartRenderInfo renderInfo)
+        {
+            if (Displayed == true && renderInfo.ClipRectangle.IntersectsWith(Bounds))
+            {
+                RenderOverride(renderInfo);
+
+                //Graphics g = renderInfo.Graphics;
+
+                //using (StringFormat sf = new StringFormat())
+                //{
+                //    sf.LineAlignment = StringAlignment.Center;
+                //    sf.Alignment = StringAlignment.Center;
+
+                //    _RenderCount++;
+
+                //    g.DrawString(_RenderCount.ToString(), SystemFonts.CaptionFont, Brushes.Red, Bounds, sf);
+                //}
+            }
+        }
+
+        #endregion
+
+        #region CancelCapture
+
+        ///<summary>
+        /// Cancels any inprogress operations that may
+        /// have the mouse captured (resize, reorder).
+        ///</summary>
+        public virtual void CancelCapture()
+        {
+            if (CapturedItem == this)
+                Capture = false;
+        }
+
+        #endregion
+
+        #region InvalidateRecalc
+
+        internal virtual void InvalidateRecalc()
+        {
+            InvalidateLayout();
+        }
+
+        #endregion
+            
+        #region InvalidateLayout
+
+        /// <summary>
+        /// Invalidates the layout for the item.
+        /// </summary>
+        public virtual void InvalidateLayout()
+        {
+            ChartControl control = ChartControl;
+
+            if (control != null)
+            {
+                control.LayoutValid = false;
+
+                if (control.InUpdateLayout == true)
+                    control.PostInternalUpdate = true;
+                else
+                    control.Invalidate();
+            }
+
+            OnLayoutInvalid(EventArgs.Empty);
+        }
+
+        #endregion
+
+        #region InvalidateRender
+
+        /// <summary>
+        /// Invalidates the display state of the item
+        /// </summary>
+        public virtual void InvalidateRender()
+        {
+            ChartControl chartControl = ChartControl;
+
+            if (chartControl != null)
+            {
+                if (chartControl.InvokeRequired)
+                    chartControl.BeginInvoke(new MethodInvoker(delegate { chartControl.InvalidateRender(this); }));
+                else
+                    chartControl.InvalidateRender(this);
+            }
+
+            OnRenderInvalid(EventArgs.Empty);
+        }
+
+        /// <summary>
+        /// Invalidates the display state of the item
+        /// </summary>
+        public virtual void InvalidateRender(Rectangle bounds)
+        {
+            ChartControl chartControl = ChartControl;
+
+            if (chartControl != null)
+                chartControl.InvalidateRender(bounds);
+
+            OnRenderInvalid(EventArgs.Empty);
+        }
+
+        #endregion
+
+        #region InvalidateLayoutBounds
+
+        /// <summary>
+        /// Invalidates the layout bounds
+        /// </summary>
+        public virtual void InvalidateLayoutBounds(ScrollBarLite sbar)
+        {
+            ChartControl.LayoutBoundsItem = this;
+        }
+
+        #endregion
+
+        #region GetElementAt
+
+        /// <summary>
+        /// Gets the visual chart element at the given Point.
+        /// </summary>
+        /// <param name="pt"></param>
+        /// <returns></returns>
+        public virtual ChartVisualElement GetElementAt(Point pt)
+        {
+            return (null);
+        }
+
+        #endregion
+
+        #region GetHitArea
+
+        /// <summary>
+        /// Gets the element Hit Area for the given Point.
+        /// </summary>
+        /// <param name="pt"></param>
+        /// <returns></returns>
+        public virtual ItemHitArea GetHitArea(Point pt)
+        {
+            return (ItemHitArea.None);
+        }
+
+        #endregion
+
+        #region Mouse Handling
+
+        #region OnMouseEnter
+
+        /// <summary>
+        /// Called by top-level control to pass message into the grid
+        /// element. To handle it override corresponding On - virtual method.
+        /// </summary>
+        /// <param name="e"></param>
+        internal virtual bool InternalMouseEnter(EventArgs e)
+        {
+            IsMouseOver = true;
+
+            return (OnMouseEnter(e));
+        }
+
+        /// <summary>
+        /// Called when the mouse enters the element.
+        /// </summary>
+        /// <param name="e"></param>
+        protected virtual bool OnMouseEnter(EventArgs e)
+        {
+            return (true);
+        }
+
+        #endregion
+
+        #region OnMouseLeave
+
+        /// <summary>
+        /// Called by top-level control to pass message into the grid
+        /// element. To handle it override corresponding On - virtual method.
+        /// </summary>
+        /// <param name="e"></param>
+        internal virtual bool InternalMouseLeave(EventArgs e)
+        {
+            IsMouseOver = false;
+
+            return (OnMouseLeave(e));
+        }
+
+        /// <summary>
+        /// Called when mouse leaves the element.
+        /// </summary>
+        /// <param name="e"></param>
+        protected virtual bool OnMouseLeave(EventArgs e)
+        {
+            return (true);
+        }
+
+        #endregion
+
+        #region OnMouseHover
+
+        /// <summary>
+        /// Called by top-level control to pass message into the grid
+        /// element. To handle it override corresponding On - virtual method.
+        /// </summary>
+        /// <param name="e"></param>
+        internal virtual bool InternalMouseHover(EventArgs e)
+        {
+            return (OnMouseHover(e));
+        }
+
+        /// <summary>
+        /// Called when mouse hovers over the element.
+        /// </summary>
+        /// <param name="e"></param>
+        protected virtual bool OnMouseHover(EventArgs e)
+        {
+            return (false);
+        }
+
+        #endregion
+
+        #region OnMouseDown
+
+        /// <summary>
+        /// Called by top-level control to pass message into the grid
+        /// element. To handle it override corresponding On - virtual method.
+        /// </summary>
+        /// <param name="e"></param>
+        internal virtual bool InternalMouseDown(MouseEventArgs e)
+        {
+            MouseDownPoint = e.Location;
+
+            bool handled = OnMouseDown(e);
+
+            if (handled == false)
+            {
+                ChartVisualElement parent = Parent as ChartVisualElement;
+
+                while (parent != null)
+                {
+                    parent.OnMouseMoveEx(e);
+
+                    if (parent.OnMouseDownEx(e) == true)
+                        return (true);
+
+                    parent = parent.Parent as ChartVisualElement;
+                }
+            }
+
+            return (false);
+        }
+
+        /// <summary>
+        /// Called when mouse button is pressed over the element.
+        /// </summary>
+        /// <param name="e"></param>
+        protected virtual bool OnMouseDown(MouseEventArgs e)
+        {
+            return (true);
+        }
+
+        /// <summary>
+        /// Called when mouse button is pressed over the element.
+        /// </summary>
+        /// <param name="e"></param>
+        protected virtual bool OnMouseDownEx(MouseEventArgs e)
+        {
+            return (true);
+        }
+
+        #endregion
+
+        #region OnMouseUp
+
+        /// <summary>
+        /// Called by top-level control to pass message into the grid
+        /// element. To handle it override corresponding On - virtual method.
+        /// </summary>
+        /// <param name="e"></param>
+        internal virtual bool InternalMouseUp(MouseEventArgs e)
+        {
+            Capture = false;
+
+            return (OnMouseUp(e));
+        }
+
+        /// <summary>
+        /// Called when mouse button is released over the element.
+        /// </summary>
+        /// <param name="e"></param>
+        protected virtual bool OnMouseUp(MouseEventArgs e)
+        {
+            return (true);
+        }
+
+        #endregion
+
+        #region OnMouseMove
+
+        /// <summary>
+        /// Called by top-level control to pass message into the chart
+        /// element. To handle it override corresponding On - virtual method.
+        /// </summary>
+        /// <param name="e"></param>
+        internal virtual bool InternalMouseMove(MouseEventArgs e)
+        {
+            ChartVisualElement mouseOverElement = MouseOverElement;
+
+            if (this != mouseOverElement)
+            {
+                if (mouseOverElement != null)
+                    mouseOverElement.InternalMouseLeave(e);
+
+                MouseOverElement = this;
+
+                InternalMouseEnter(e);
+            }
+
+            bool handled = OnMouseMove(e);
+
+            ChartVisualElement parent = Parent as ChartVisualElement;
+
+            while (parent != null)
+            {
+                if (handled == false)
+                    handled = parent.OnMouseMove(e);
+                else
+                    parent.OnMouseMoveEx(e);
+
+                parent = parent.Parent as ChartVisualElement;
+            }
+
+            return (false);
+        }
+
+        /// <summary>
+        /// Called when mouse is moved over the element.
+        /// </summary>
+        /// <param name="e"></param>
+        protected virtual bool OnMouseMove(MouseEventArgs e)
+        {
+            return (false);
+        }
+
+        /// <summary>
+        /// Called when mouse is moved over the element.
+        /// </summary>
+        /// <param name="e"></param>
+        protected virtual void OnMouseMoveEx(MouseEventArgs e)
+        {
+        }
+
+        #endregion
+
+        #region OnMouseClick
+
+        /// <summary>
+        /// Called by top-level control to pass message into the grid
+        /// element. To handle it override corresponding On - virtual method.
+        /// </summary>
+        /// <param name="e"></param>
+        internal virtual bool InternalMouseClick(MouseEventArgs e)
+        {
+            return (OnMouseClick(e));
+        }
+        /// <summary>
+        /// Called when mouse is clicked on the element.
+        /// </summary>
+        /// <param name="e"></param>
+        protected virtual bool OnMouseClick(MouseEventArgs e)
+        {
+            return (true);
+        }
+
+        #endregion
+
+        #region OnMouseDoubleClick
+
+        /// <summary>
+        /// Called by top-level control to pass message into the grid
+        /// element. To handle it override corresponding On - virtual method.
+        /// </summary>
+        /// <param name="e"></param>
+        internal virtual bool InternalMouseDoubleClick(MouseEventArgs e)
+        {
+            return (OnMouseDoubleClick(e));
+        }
+
+        /// <summary>
+        /// Called when mouse is double clicked on the element.
+        /// </summary>
+        /// <param name="e"></param>
+        protected virtual bool OnMouseDoubleClick(MouseEventArgs e)
+        {
+            return (false);
+        }
+
+        #endregion
+
+        #region OnMouseWheel
+
+        /// <summary>
+        /// Called by top-level control to pass message into the grid
+        /// element. To handle it override corresponding On - virtual method.
+        /// </summary>
+        /// <param name="e"></param>
+        internal virtual bool InternalMouseWheel(MouseEventArgs e)
+        {
+            bool handled = OnMouseWheel(e);
+
+            if (handled == false)
+            {
+                ChartVisualElement parent = Parent as ChartVisualElement;
+
+                while (parent != null)
+                {
+                    if (parent.OnMouseWheel(e) == true)
+                        return (true);
+
+                    parent = parent.Parent as ChartVisualElement;
+                }
+            }
+
+            return (false);
+        }
+
+        /// <summary>
+        /// Called when mousewheel is moved while over the element.
+        /// </summary>
+        /// <param name="e"></param>
+        protected virtual bool OnMouseWheel(MouseEventArgs e)
+        {
+            return (false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Keyboard handling
+
+        /// <summary>
+        /// Called by top-level control to pass message into the grid
+        /// element. To handle it override corresponding On - virtual method.
+        /// </summary>
+        /// <param name="keyData"></param>
+        internal virtual void InternalKeyDown(Keys keyData)
+        {
+            OnKeyDown(keyData);
+        }
+
+        /// <summary>
+        /// Called when mouse button is pressed over the element.
+        /// </summary>
+        /// <param name="keyData"></param>
+        protected virtual void OnKeyDown(Keys keyData)
+        {
+        }
+
+        #endregion
+
+        #region OnResize
+
+        internal virtual bool InternalOnResize(EventArgs e)
+        {
+            return (OnResize(e));
+        }
+
+        /// <summary>
+        /// Called when control is resized.
+        /// </summary>
+        /// <param name="e"></param>
+        protected virtual bool OnResize(EventArgs e)
+        {
+            return (true);
+        }
+
+        #endregion
+
+        #region OnVisualStyleChanged
+
+        protected virtual void OnVisualStyleChanged(string property,
+            INotifyPropertyChanged oldValue, INotifyPropertyChanged newValue)
+        {
+            StyleVisualChangeHandler(oldValue, newValue);
+
+            OnPropertyChanged(property);
+        }
+
+        #endregion
+
+        #region StyleVisualChangeHandler
+
+        protected virtual void StyleVisualChangeHandler(
+            INotifyPropertyChanged oldValue, INotifyPropertyChanged newValue)
+        {
+            if (oldValue != null)
+                oldValue.PropertyChanged -= StyleChanged;
+
+            if (newValue != null)
+                newValue.PropertyChanged += StyleChanged;
+        }
+
+        #region StyleChanged
+
+        /// <summary>
+        /// Occurs when one of element visual styles has property changes.
+        /// Default implementation invalidates visual appearance of element.
+        /// </summary>
+        /// <param name="sender">VisualStyle that changed.</param>
+        /// <param name="e">Event arguments.</param>
+        protected virtual void StyleChanged(object sender, PropertyChangedEventArgs e)
+        {
+            VisualChangeType changeType = ((VisualPropertyChangedEventArgs)e).ChangeType;
+
+            if (changeType == VisualChangeType.Layout)
+                InvalidateLayout();
+            else
+                InvalidateRender();
+
+            if (ChartControl != null)
+                ChartControl.GlobalUpdateCount++;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ApplyStyles
+
+        public virtual void ApplyStyles(BaseVisualStyle style, StyleType cs)
+        {
+        }
+
+        public virtual void ApplyStyles(BaseVisualStyle style)
+        {
+        }
+
+        #endregion
+
+        #region ApplyDefaults
+
+        public virtual void ApplyDefaults(BaseVisualStyle style, StyleType cs)
+        {
+        }
+
+        #endregion
+
+        #region ClearEffectiveStyles
+
+        protected virtual void ClearEffectiveStyles()
+        { }
+
+        #endregion
+
+        #region GetElementStyle
+
+        public virtual void GetElementStyle(
+            IEffectiveStyle chartElement, StyleType styleType, ref BaseVisualStyle style)
+        {
+            ChartControl.DoGetElementStyleEvent(this, styleType, ref style);
+        }
+
+        #endregion
+
+        #region GetAdjustedBounds
+
+        internal Rectangle GetAdjustedBounds(Rectangle bounds, Thickness thickness)
+        {
+            if (thickness.IsEmpty == false)
+            {
+                if (bounds.Height > Dpi.Height(thickness.Vertical))
+                {
+                    bounds.Y += Dpi.Height(thickness.Top);
+                    bounds.Height -= Dpi.Height(thickness.Vertical);
+                }
+
+                if (bounds.Width > Dpi.Width(thickness.Horizontal))
+                {
+                    bounds.X += Dpi.Width(thickness.Left);
+                    bounds.Width -= Dpi.Width(thickness.Horizontal);
+                }
+            }
+
+            return (bounds);
+        }
+
+        #endregion
+
+        #region GetScrollBounds
+
+        internal Rectangle GetScrollBounds(Rectangle bounds)
+        {
+            bounds.X -= _ScrollOffset.X;
+            bounds.Y -= _ScrollOffset.Y;
+
+            return (bounds);
+        }
+
+        #endregion
+
+        #region Export
+
+        /// <summary>
+        /// Exports the chart element to the specified file. The 
+        /// specified file will be created and/or overwritten.
+        /// </summary>
+        /// <param name="fileName"></param>
+        /// <returns></returns>
+        public void Export(string fileName)
+        {
+            string dir = Path.GetDirectoryName(fileName);
+
+            if (dir != null)
+            {
+                if (Directory.Exists(dir) == false)
+                    Directory.CreateDirectory(dir);
+
+                using (FileStream stream = new
+                    FileStream(fileName, FileMode.Create, FileAccess.ReadWrite))
+                {
+                    Export(stream);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Exports the chart element to the specified stream.
+        /// </summary>
+        /// <param name="stream"></param>
+        /// <returns></returns>
+        public void Export(Stream stream)
+        {
+            CultureInfo cinfo = Thread.CurrentThread.CurrentCulture;
+            Thread.CurrentThread.CurrentCulture = new CultureInfo("en-US");
+
+            SerialElementCollection sec = new SerialElementCollection();
+
+            sec = GetSerialData("");
+
+            using (StreamWriterNC sw = new StreamWriterNC(stream))
+            {
+                sw.WriteLine("<?xml version=\"1.0\"?>");
+
+                ExportData(sw, sec);
+            }
+
+            Thread.CurrentThread.CurrentCulture = cinfo;
+        }
+
+        #region ExportData
+
+        private void ExportData(StreamWriterNC sw, SerialElementCollection sec)
+        {
+            foreach (SerialElement se in sec)
+            {
+                switch (se.SerType)
+                {
+                    case SerElementType.Start:
+                        sw.WriteLine("<" + se.Name + ">");
+                        break;
+
+                    case SerElementType.ValueStart:
+                        sw.Write("<" + se.Name + ">");
+                        break;
+
+                    case SerElementType.Value:
+                        sw.Write(se.GetValueString());
+                        break;
+
+                    case SerElementType.DataValue:
+                        sw.Write(se.GetDataValueString());
+                        break;
+
+                    case SerElementType.End:
+                    case SerElementType.ValueEnd:
+                        sw.WriteLine("</" + se.Name + ">");
+                        break;
+
+                    case SerElementType.Collection:
+                        ExportData(sw, se.Sec);
+                        break;
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Import
+
+        /// <summary>
+        /// Imoprts the chart element from the given file path.
+        /// </summary>
+        /// <param name="fileName"></param>
+        /// <returns></returns>
+        public void Import(string fileName)
+        {
+            if (File.Exists(fileName) == true)
+            {
+                using (FileStream stream = new
+                    FileStream(fileName, FileMode.Open, FileAccess.Read))
+                {
+                    Import(stream);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Imoprts the chart element from the given stream.
+        /// </summary>
+        /// <param name="stream"></param>
+        /// <returns></returns>
+        public void Import(Stream stream)
+        {
+            CultureInfo cinfo = Thread.CurrentThread.CurrentCulture;
+            Thread.CurrentThread.CurrentCulture = new CultureInfo("en-US");
+
+            SerialElementCollection sec;
+
+            stream.Position = 0;
+
+            using (XmlReader reader = XmlReader.Create(stream))
+                sec = ImportData(reader, 0);
+
+            if (sec.Count > 0)
+                PutSerialData(sec);
+
+            Thread.CurrentThread.CurrentCulture = cinfo;
+        }
+
+        #region ImportData
+
+        internal virtual SerialElementCollection ImportData(XmlReader reader, int depth)
+        {
+            SerialElementCollection sec = new SerialElementCollection();
+
+            string name = "";
+
+            bool read = depth > 0;
+
+            int arrayCount = 0;
+
+            while (read || reader.Read())
+            {
+                read = false;
+
+                switch (reader.NodeType)
+                {
+                    case XmlNodeType.Element:
+                        if (reader.Depth == depth)
+                        {
+                            if (reader.IsStartElement())
+                            {
+                                SerialElement se = sec.AddStartElement(reader.Name);
+
+                                se.ArrayCount = GetArrayCount(reader);
+
+                                arrayCount = se.ArrayCount;
+                            }
+                        }
+                        else if (reader.Depth > depth)
+                        {
+                            SerialElementCollection sec2 = ImportData(reader, reader.Depth);
+
+                            SerialElement se = sec.AddElement(sec2);
+
+                            se.ArrayCount = arrayCount;
+
+                            se.Name = reader.Name;
+                            sec.Name = reader.Name;
+
+                            sec.AddEndElement(reader.Name);
+                        }
+
+                        name = reader.Name;
+                        break;
+
+                    case XmlNodeType.Text:
+                        sec.AddValue(name, reader.Value);
+                        break;
+
+                    case XmlNodeType.EndElement:
+                        if (reader.Depth < depth)
+                            return (sec);
+
+                        sec.AddEndElement(reader.Name);
+                        break;
+                }
+            }
+
+            return (sec);
+        }
+
+        #region GetArrayCount
+
+        private int GetArrayCount(XmlReader reader)
+        {
+            if (reader.HasAttributes == true)
+            {
+                string count = reader.GetAttribute("count");
+
+                if (count != null)
+                    return (int.Parse(count));
+            }
+
+            return (0);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region INotifyPropertyChanged Members
+
+        /// <summary>
+        /// Default PropertyChanged processing
+        /// </summary>
+        /// <param name="s"></param>
+        /// <param name="changeType">invalidate</param>
+        protected void OnPropertyChangedEx(string s, VisualChangeType changeType)
+        {
+            OnPropertyChanged(s);
+
+            switch (changeType)
+            {
+                case VisualChangeType.Layout:
+                    InvalidateLayout();
+                    break;
+
+                case VisualChangeType.Recalc:
+                    InvalidateRecalc();
+                    break;
+
+                default:
+                    InvalidateRender();
+                    break;
+            }
+        }
+
+        protected void OnStyleChanged(string property,
+            INotifyPropertyChanged oldValue, INotifyPropertyChanged newValue)
+        {
+            StyleVisualChangeHandler(oldValue, newValue);
+
+            OnPropertyChanged(property);
+        }
+
+        #endregion
+
+        #region IsDesignerHosted
+
+        internal bool IsDesignerHosted
+        {
+            get
+            {
+                if (ChartControl != null)
+                    return (ChartControl.DesignerHosted);
+
+                return (false);
+            }
+        }
+
+        #endregion
+
+        #region ElementStates
+
+        [Flags]
+        private enum Es
+        {
+            LayoutBoundsValid = (1 << 0),
+            LayoutValid = (1 << 1),
+
+            MouseOver = (1 << 2),
+            Displayed = (1 << 3),
+            Visible = (1 << 4),
+
+            NeedsMeasured = (1 << 5),
+        }
+
+        #region TestState
+
+        private bool TestState(Es state)
+        {
+            return ((_States & state) == state);
+        }
+
+        #endregion
+
+        #region SetState
+
+        private void SetState(Es state, bool value)
+        {
+            if (value == true)
+                _States |= state;
+            else
+                _States &= ~state;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Copy/CopyTo
+
+        public virtual ChartVisualElement Copy()
+        {
+            return (null);
+        }
+
+        public virtual void CopyTo(ChartVisualElement copy)
+        {
+            copy.Name = Name;
+            copy.Size = Size;
+            copy.Tag = Tag;
+
+            copy.Visible = Visible;
+        }
+
+        #endregion
+
+        #region GetSerialData
+
+        internal virtual SerialElementCollection GetSerialData(string serialName)
+        {
+            if ((String.IsNullOrEmpty(Name) == false) || (Tag != null) || (Visible == false))
+            {
+                SerialElementCollection sec = new SerialElementCollection();
+
+                if (serialName != null)
+                {
+                    if (serialName.Equals("") == true)
+                        serialName = "ChartElement";
+
+                    sec.AddStartElement(serialName);
+                }
+
+                sec.AddValue("Name", Name, String.Empty);
+                sec.AddValue("Tag", Tag, null);
+                sec.AddValue("Visible", Visible, true);
+
+                if (serialName != null)
+                    sec.AddEndElement(serialName);
+
+                return (sec);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region PutSerialData
+
+        internal void PutSerialData(SerialElementCollection sec)
+        {
+            sec.PutSerialData(this);
+        }
+
+        #region ProcessValue
+
+        void IProcessSerialElement.ProcessValue(SerialElement se)
+        {
+            ProcessValue(se);
+        }
+
+        internal virtual void ProcessValue(SerialElement se)
+        {
+            switch (se.Name)
+            {
+                case "Name":
+                    Name = se.StringValue;
+                    break;
+
+                case "Tag":
+                    Tag = se.DataValue;
+                    break;
+
+                case "Visible":
+                    Visible = bool.Parse(se.StringValue);
+                    break;
+
+                default:
+                    throw new Exception("Unknown Serial Value (" + se.Name + ")");
+            }
+        }
+
+        #endregion
+
+        #region ProcessCollection
+
+        void IProcessSerialElement.ProcessCollection(SerialElement se)
+        {
+            ProcessCollection(se);
+        }
+
+        internal virtual void ProcessCollection(SerialElement se)
+        {
+            throw new Exception("Unknown Serial Collection (" + se.Name + ")");
+        }
+
+        #endregion
+
+        #endregion
+    }
+
+    #region ItemHitArea
+
+    ///<summary>
+    /// Specifies the ItemHitArea hit areas
+    ///</summary>
+    public enum ItemHitArea
+    {
+        ///<summary>
+        /// None
+        ///</summary>
+        None,
+
+        /// <summary>
+        /// Ancillary AxisX
+        /// </summary>
+        InAncillaryAxisX,
+
+        /// <summary>
+        /// Primary AxisX
+        /// </summary>
+        InPrimaryAxisX,
+
+        /// <summary>
+        /// Ancillary AxisY
+        /// </summary>
+        InAncillaryAxisY,
+
+        /// <summary>
+        /// Primary AxisX
+        /// </summary>
+        InPrimaryAxisY,
+
+        /// <summary>
+        /// ScrollBar ArrowIncrease
+        /// </summary>
+        ArrowIncrease,
+
+        /// <summary>
+        /// ScrollBar ArrowDecrease
+        /// </summary>
+        ArrowDecrease,
+
+        /// <summary>
+        /// ScrollBar TrackIncrease
+        /// </summary>
+        TrackIncrease,
+
+        /// <summary>
+        /// ScrollBar ArrowDecrease
+        /// </summary>
+        TrackDecrease,
+
+        /// <summary>
+        /// ScrollBar Thumb
+        /// </summary>
+        Thumb,
+
+        ///<summary>
+        /// Content area
+        ///</summary>
+        InContent,
+
+        ///<summary>
+        /// Frame area
+        ///</summary>
+        InFrame,
+
+        /// <summary>
+        /// PieSeriesPoint
+        /// </summary>
+        InPieSeriesPoint,
+
+        /// <summary>
+        /// Pie Center
+        /// </summary>
+        InPieCenter,
+
+        /// <summary>
+        /// Pie Ring Out (Out a ring level)
+        /// </summary>
+        InPieRingOut,
+
+        /// <summary>
+        /// In Markup area
+        /// </summary>
+        InMarkup,
+    }
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/ChartIndicator.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/ChartIndicator.cs
new file mode 100644
index 00000000..9cf4a84e
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/ChartIndicator.cs	
@@ -0,0 +1,1480 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Drawing.Drawing2D;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.Charts.Style;
+
+namespace DevComponents.DotNetBar.Charts
+{
+    /// <summary>
+    /// Represents the collection of ChartIndicators.
+    /// </summary>
+    [Editor("DevComponents.Charts.Design.IndicatorCollectionEditor, DevComponents.Charts.Design, " +
+        "Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(UITypeEditor))]
+    public class ChartIndicatorCollection : CustomNamedCollection<ChartIndicator>
+    {
+    }
+
+    #region RegressionLine
+
+    /// <summary>
+    /// Represents a Regression Line (a least-squares calculated series line).
+    /// </summary>
+    public class RegressionLine : ChartIndicator, IEffectiveStyle
+    {
+        #region Private variables
+
+        private RegressionLineVisualStyle _RegressionLineVisualStyle;
+        private EffectiveStyle<RegressionLineVisualStyle> _EffectiveStyle;
+
+        #endregion
+
+        #region Constructors
+
+        public RegressionLine(string name)
+            : this()
+        {
+            Name = name;
+        }
+
+        public RegressionLine()
+        {
+            InitDefaultStates();
+
+            _EffectiveStyle = new EffectiveStyle<RegressionLineVisualStyle>(this);
+        }
+
+        #endregion
+
+        #region InitDefaultStates
+
+        private void InitDefaultStates()
+        {
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region EffectiveStyle
+
+        /// <summary>
+        /// Gets a reference to the RegressionLine's effective (cached, composite) style.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public RegressionLineVisualStyle EffectiveStyle
+        {
+            get { return (_EffectiveStyle.Style); }
+        }
+
+        #endregion
+
+        #region IndicatorType
+
+        /// <summary>
+        /// Gets the RegressionLine's IndicatorType
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override ChartIndicatorType IndicatorType
+        {
+            get { return (ChartIndicatorType.RegressionLine); }
+        }
+
+        #endregion
+
+        #region RegressionLineVisualStyle
+
+        /// <summary>
+        /// Gets or sets the visual style for the RegressionLine Indicator.
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates the visual style for the RegressionLine Indicator.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public RegressionLineVisualStyle RegressionLineVisualStyle
+        {
+            get
+            {
+                if (_RegressionLineVisualStyle == null)
+                {
+                    _RegressionLineVisualStyle = new RegressionLineVisualStyle();
+
+                    StyleVisualChangeHandler(null, _RegressionLineVisualStyle);
+                }
+
+                return (_RegressionLineVisualStyle);
+            }
+
+            set
+            {
+                if (_RegressionLineVisualStyle != value)
+                {
+                    RegressionLineVisualStyle oldValue = _RegressionLineVisualStyle;
+
+                    _RegressionLineVisualStyle = value;
+
+                    OnStyleChanged("RegressionLineVisualStyle", oldValue, value);
+
+                    if (oldValue != null)
+                        oldValue.Dispose();
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Style support
+
+        #region ApplyStyles
+
+        public override void ApplyStyles(BaseVisualStyle style)
+        {
+            RegressionLineVisualStyle rstyle = style as RegressionLineVisualStyle;
+
+            if (rstyle != null)
+            {
+                ApplyParentStyles(rstyle, Parent as ChartContainer);
+
+                rstyle.ApplyStyle(RegressionLineVisualStyle);
+
+                if (rstyle.LineWidth < 0)
+                    rstyle.LineWidth = 1;
+            }
+        }
+
+        #region ApplyParentStyles
+
+        private void ApplyParentStyles(
+            RegressionLineVisualStyle pstyle, ChartContainer item)
+        {
+            if (item != null)
+            {
+                ApplyParentStyles(pstyle, item.Parent as ChartContainer);
+
+                ChartPanel panel = item as ChartPanel;
+
+                if (panel != null)
+                    pstyle.ApplyStyle(panel.DefaultVisualStyles.RegressionLineVisualStyle);
+            }
+            else
+            {
+                pstyle.ApplyStyle(ChartControl.BaseVisualStyles.RegressionLineVisualStyle);
+                pstyle.ApplyStyle(ChartControl.DefaultVisualStyles.RegressionLineVisualStyle);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InvalidateStyle
+
+        ///<summary>
+        ///Invalidate the cached Style
+        ///</summary>
+        public void InvalidateStyle()
+        {
+            ClearEffectiveStyles();
+        }
+
+        #endregion
+
+        #region ClearEffectiveStyles
+
+        protected override void ClearEffectiveStyles()
+        {
+            base.ClearEffectiveStyles();
+
+            if (LegendItem != null)
+                LegendItem.EffectiveStyles.InvalidateStyles();
+        }
+
+        #endregion
+
+        #region StyleChanged
+
+        protected override void StyleChanged(object sender, PropertyChangedEventArgs e)
+        {
+            base.StyleChanged(sender, e);
+
+            if (sender is ChartLegendItemVisualStyles && LegendItem != null)
+                InvalidateRender(LegendItem.Bounds);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ILegendItem
+
+        #region GetLegendItemColorEx
+
+        protected override Color GetLegendItemColorEx()
+        {
+            RegressionLineVisualStyle rstyle = EffectiveStyle;
+
+            return (rstyle.LineColor);
+        }
+
+        #endregion
+
+        #region RenderLegendItemMarkerEx
+
+        protected override void RenderLegendItemMarkerEx(Graphics g,
+            ChartLegendItem litem, ChartLegendItemVisualStyle style)
+        {
+            RegressionLineVisualStyle rstyle = EffectiveStyle;
+
+            if (rstyle.LinePattern != LinePattern.None)
+            {
+                Rectangle bounds = litem.MarkerBounds;
+
+                int n = bounds.Height / 2;
+
+                int lineWidth = Math.Min(rstyle.LineWidth, bounds.Height);
+
+                using (Pen pen = new Pen(GetLegendItemColor(), lineWidth))
+                {
+                    if (rstyle.LinePattern != LinePattern.NotSet)
+                        pen.DashStyle = (DashStyle)rstyle.LinePattern;
+
+                    g.DrawLine(pen,
+                        new Point(bounds.X, bounds.Y + n),
+                        new Point(bounds.Right - 1, bounds.Y + n));
+                }
+            }
+        }
+
+        #endregion
+
+        #region GetLegendItemTextEx
+
+        protected override string GetLegendItemTextEx()
+        {
+            return ("(RegLine)");
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Copy/CopyTo
+
+        public override ChartVisualElement Copy()
+        {
+            RegressionLine copy = new RegressionLine();
+
+            CopyTo(copy);
+
+            return (copy);
+        }
+
+        public override void CopyTo(ChartVisualElement copy)
+        {
+            RegressionLine c = copy as RegressionLine;
+
+            if (c != null)
+            {
+                base.CopyTo(c);
+
+                c.RegressionLineVisualStyle = 
+                    (_RegressionLineVisualStyle != null) ? RegressionLineVisualStyle.Copy() : null;
+            }
+        }
+
+        #endregion
+
+        #region GetSerialData
+
+        internal override SerialElementCollection GetSerialData(string serialName)
+        {
+            SerialElementCollection sec = new SerialElementCollection();
+
+            if (serialName != null)
+            {
+                if (serialName.Equals("") == true)
+                    serialName = "RegressionLine";
+
+                sec.AddStartElement(serialName);
+            }
+
+            if (_RegressionLineVisualStyle != null && _RegressionLineVisualStyle.IsEmpty == false)
+                sec.AddElement(_RegressionLineVisualStyle.GetSerialData("RegressionLineVisualStyle"));
+
+            sec.AddElement(base.GetSerialData(null));
+
+            if (serialName != null)
+                sec.AddEndElement(serialName);
+
+            return (sec);
+        }
+
+        #endregion
+
+        #region PutSerialData
+
+        #region ProcessValue
+
+        internal override void ProcessValue(SerialElement se)
+        {
+            switch (se.Name)
+            {
+                default:
+                    base.ProcessValue(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region ProcessCollection
+
+        internal override void ProcessCollection(SerialElement se)
+        {
+            SerialElementCollection sec = se.Sec;
+
+            switch (se.Name)
+            {
+                case "RegressionLineVisualStyle":
+                    sec.PutSerialData(RegressionLineVisualStyle);
+                    break;
+
+                default:
+                    base.ProcessCollection(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IDisposable
+
+        public override void Dispose()
+        {
+            RegressionLineVisualStyle = null;
+
+            base.Dispose();
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region TrendLine
+
+    /// <summary>
+    /// Represents a Trend Line (a line connecting any 2 defined SeriesPoints).
+    /// </summary>
+    public class TrendLine : ChartIndicator, IEffectiveStyle
+    {
+        #region Private variables
+
+        private object _ValueX1;
+        private object _ValueX2;
+
+        private TrendLineVisualStyle _TrendLineVisualStyle;
+        private EffectiveStyle<TrendLineVisualStyle> _EffectiveStyle;
+
+        #endregion
+
+        #region Constructors
+
+        /// <summary>
+        /// TrendLine
+        /// </summary>
+        public TrendLine()
+        {
+            InitDefaultStates();
+
+            _EffectiveStyle = new EffectiveStyle<TrendLineVisualStyle>(this);
+        }
+
+        #region Constructors
+
+        /// <summary>
+        /// TrendLine
+        /// </summary>
+        /// <param name="name">Name</param>
+        public TrendLine(string name)
+            : this()
+        {
+            Name = name;
+        }
+
+        /// <summary>
+        /// TrendLine
+        /// </summary>
+        /// <param name="name">Name</param>
+        /// <param name="valuex1">Starting X-Axis value</param>
+        /// <param name="valuex2">Ending X-Axis value</param>
+        public TrendLine(string name, object valuex1, object valuex2)
+            : this(name)
+        {
+            ValueX1 = valuex1;
+            ValueX2 = valuex2;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InitDefaultStates
+
+        private void InitDefaultStates()
+        {
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region EffectiveStyles
+
+        /// <summary>
+        /// Gets a reference to the TrendLine's effective (cached, composite) style.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public TrendLineVisualStyle EffectiveStyle
+        {
+            get { return (_EffectiveStyle.Style); }
+        }
+
+        #endregion
+
+        #region IndicatorType
+
+        /// <summary>
+        /// Gets the TrendLine's IndicatorType
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override ChartIndicatorType IndicatorType
+        {
+            get { return (ChartIndicatorType.TrendLine); }
+        }
+
+        #endregion
+
+        #region TrendLineVisualStyle
+
+        /// <summary>
+        /// Gets or sets the visual style for the TrendLine Indicator.
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates the visual style for the TrendLine Indicator.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public TrendLineVisualStyle TrendLineVisualStyle
+        {
+            get
+            {
+                if (_TrendLineVisualStyle == null)
+                {
+                    _TrendLineVisualStyle = new TrendLineVisualStyle();
+
+                    StyleVisualChangeHandler(null, _TrendLineVisualStyle);
+                }
+
+                return (_TrendLineVisualStyle);
+            }
+
+            set
+            {
+                if (_TrendLineVisualStyle != value)
+                {
+                    TrendLineVisualStyle oldValue = _TrendLineVisualStyle;
+
+                    _TrendLineVisualStyle = value;
+
+                    OnStyleChanged("TrendLineVisualStyle", oldValue, value);
+
+                    if (oldValue != null)
+                        oldValue.Dispose();
+                }
+            }
+        }
+
+        #endregion
+
+        #region ValueX1
+
+        /// <summary>
+        /// Trendline starting X value
+        /// </summary>
+        [Category("Data")]
+        [Description("Indicates the Trendline starting X value.")]
+        [TypeConverter("DevComponents.Charts.Design.PointValueConverter," +
+            "DevComponents.Charts.Design, Version=14.1.0.37, Culture=neutral, PublicKeyToken=90f470f34c89ccaf")]
+        public object ValueX1
+        {
+            get { return (_ValueX1); }
+            set { _ValueX1 = value; }
+        }
+
+        #endregion
+
+        #region ValueX2
+
+        /// <summary>
+        /// Trendline ending X value
+        /// </summary>
+        [Category("Data")]
+        [Description("Indicates the Trendline ending X value.")]
+        [TypeConverter("DevComponents.Charts.Design.PointValueConverter," +
+            "DevComponents.Charts.Design, Version=14.1.0.37, Culture=neutral, PublicKeyToken=90f470f34c89ccaf")]
+        public object ValueX2
+        {
+            get { return (_ValueX2); }
+            set { _ValueX2 = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Style support
+
+        #region ApplyStyles
+
+        public override void ApplyStyles(BaseVisualStyle style)
+        {
+            TrendLineVisualStyle tstyle = style as TrendLineVisualStyle;
+
+            if (tstyle != null)
+            {
+                ApplyParentStyles(tstyle, Parent as ChartContainer);
+
+                tstyle.ApplyStyle(TrendLineVisualStyle);
+
+                if (tstyle.LineWidth < 0)
+                    tstyle.LineWidth = 1;
+            }
+        }
+
+        #region ApplyParentStyles
+
+        private void ApplyParentStyles( TrendLineVisualStyle pstyle, ChartContainer item)
+        {
+            if (item != null)
+            {
+                ApplyParentStyles(pstyle, item.Parent as ChartContainer);
+
+                if (item is ChartPanel)
+                    pstyle.ApplyStyle(((ChartPanel)item).DefaultVisualStyles.TrendLineVisualStyle);
+            }
+            else
+            {
+                pstyle.ApplyStyle(ChartControl.BaseVisualStyles.TrendLineVisualStyle);
+                pstyle.ApplyStyle(ChartControl.DefaultVisualStyles.TrendLineVisualStyle);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InvalidateStyle
+
+        ///<summary>
+        ///Invalidate the cached Style
+        ///</summary>
+        public void InvalidateStyle()
+        {
+            ClearEffectiveStyles();
+        }
+
+        #endregion
+
+        #region ClearEffectiveStyles
+
+        protected override void ClearEffectiveStyles()
+        {
+            base.ClearEffectiveStyles();
+
+            if (LegendItem != null)
+                LegendItem.EffectiveStyles.InvalidateStyles();
+        }
+
+        #endregion
+
+        #region StyleChanged
+
+        protected override void StyleChanged(object sender, PropertyChangedEventArgs e)
+        {
+            base.StyleChanged(sender, e);
+
+            if (sender is ChartLegendItemVisualStyles && LegendItem != null)
+                InvalidateRender(LegendItem.Bounds);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ILegendItem
+
+        #region GetLegendItemColorEx
+
+        protected override Color GetLegendItemColorEx()
+        {
+            TrendLineVisualStyle tstyle = EffectiveStyle;
+
+            return (tstyle.LineColor);
+        }
+
+        #endregion
+
+        #region RenderLegendItemMarkerEx
+
+        protected override void RenderLegendItemMarkerEx(Graphics g,
+            ChartLegendItem litem, ChartLegendItemVisualStyle style)
+        {
+            TrendLineVisualStyle tstyle = EffectiveStyle;
+
+            if (tstyle.LinePattern != LinePattern.None)
+            {
+                Rectangle bounds = litem.MarkerBounds;
+
+                int n = bounds.Height / 2;
+
+                int lineWidth = Math.Min(tstyle.LineWidth, bounds.Height);
+
+                using (Pen pen = new Pen(GetLegendItemColor(), lineWidth))
+                {
+                    if (tstyle.LinePattern != LinePattern.NotSet)
+                        pen.DashStyle = (DashStyle)tstyle.LinePattern;
+
+                    g.DrawLine(pen,
+                        new Point(bounds.X, bounds.Y + n),
+                        new Point(bounds.Right - 1, bounds.Y + n));
+                }
+            }
+        }
+
+        #endregion
+
+        #region GetLegendItemTextEx
+
+        protected override string GetLegendItemTextEx()
+        {
+            return ("(TrendLine)");
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Copy/CopyTo
+
+        public override ChartVisualElement Copy()
+        {
+            TrendLine copy = new TrendLine();
+
+            CopyTo(copy);
+
+            return (copy);
+        }
+
+        public override void CopyTo(ChartVisualElement copy)
+        {
+            TrendLine c = copy as TrendLine;
+
+            if (c != null)
+            {
+                base.CopyTo(c);
+
+                c.TrendLineVisualStyle =
+                    (_TrendLineVisualStyle != null) ? TrendLineVisualStyle.Copy() : null;
+
+                c.ValueX1 = ValueX1;
+                c.ValueX2 = ValueX2;
+            }
+        }
+
+        #endregion
+
+        #region GetSerialData
+
+        internal override SerialElementCollection GetSerialData(string serialName)
+        {
+            SerialElementCollection sec = new SerialElementCollection();
+
+            if (serialName != null)
+            {
+                if (serialName.Equals("") == true)
+                    serialName = "TrendLine";
+
+                sec.AddStartElement(serialName);
+            }
+
+            if (_TrendLineVisualStyle != null && _TrendLineVisualStyle.IsEmpty == false)
+                sec.AddElement(_TrendLineVisualStyle.GetSerialData("TrendLineVisualStyle"));
+
+            sec.AddDataValue("ValueX1", ValueX1, null);
+            sec.AddDataValue("ValueX2", ValueX2, null);
+
+            sec.AddElement(base.GetSerialData(null));
+
+            if (serialName != null)
+                sec.AddEndElement(serialName);
+
+            return (sec);
+        }
+
+        #endregion
+
+        #region PutSerialData
+
+        #region ProcessValue
+
+        internal override void ProcessValue(SerialElement se)
+        {
+            switch (se.Name)
+            {
+                case "ValueX1":
+                    ValueX1 = se.DataValue;
+                    break;
+
+                case "ValueX2":
+                    ValueX2 = se.DataValue;
+                    break;
+
+                default:
+                    base.ProcessValue(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region ProcessCollection
+
+        internal override void ProcessCollection(SerialElement se)
+        {
+            SerialElementCollection sec = se.Sec;
+
+            switch (se.Name)
+            {
+                case "TrendLineVisualStyle":
+                    sec.PutSerialData(TrendLineVisualStyle);
+                    break;
+
+                default:
+                    base.ProcessCollection(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IDisposable
+
+        public override void Dispose()
+        {
+            TrendLineVisualStyle = null;
+
+            base.Dispose();
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    public abstract class ChartIndicator : ChartVisualElement, ILegendItem
+    {
+        #region Private variables
+
+        private States _States;
+
+        private string _LegendText;
+        private ChartLegendItem _LegendItem;
+        private ChartLegendItemVisualStyles _ChartLegendItemVisualStyles;
+
+        private int _ValueYIndex;
+
+        #endregion
+
+        public ChartIndicator()
+        {
+            InitDefaultStates();
+        }
+
+        #region InitDefaultStates
+
+        private void InitDefaultStates()
+        {
+            SetState(States.CheckedInLegend, true);
+            SetState(States.ShowInLegend, true);
+            SetState(States.ShowInParentLegend, true);
+            SetState(States.ShowCheckBoxInLegend, true);
+            SetState(States.ShowMarkerInLegend, true);
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region DisplayOnTop
+
+        /// <summary>
+        /// Gets or sets whether Indicator is displayed on top of chart data.
+        /// </summary>
+        [DefaultValue(false), Category("Appearance")]
+        [Description("Indicates whether Indicator is displayed on top of chart data.")]
+        public bool DisplayOnTop
+        {
+            get { return (TestState(States.DisplayOnTop)); }
+
+            set
+            {
+                if (value != DisplayOnTop)
+                {
+                    SetState(States.DisplayOnTop, value);
+
+                    OnPropertyChangedEx("DisplayOnTop", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region IndicatorType
+
+        /// <summary>
+        /// Indicator type
+        /// </summary>
+        public virtual ChartIndicatorType IndicatorType
+        {
+            get { throw new NotImplementedException(); }
+        }
+
+        #endregion
+
+        #region Intercept
+
+        /// <summary>
+        /// Gets the Indicator Line's Intercept (ie. the 'b' portion of 'y = mx + b').
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public double Intercept
+        {
+            get
+            {
+                ChartSeries series = Parent as ChartSeries;
+
+                if (series == null)
+                    throw new Exception("Indicator Line not associated with a ChartSeries.");
+
+                ChartXy chartXy = series.Parent as ChartXy;
+
+                if (chartXy == null)
+                    throw new Exception("Indicator Line not associated with a ChartXy.");
+
+                SortedSeriesPoints ssp = series.GetSortedSeriesPoints(chartXy);
+
+                ssp.SlopeIndex = ValueYIndex;
+
+                return (ssp.Intercept);
+            }
+        }
+
+        #endregion
+
+        #region IsDisplayed
+
+        ///<summary>
+        /// Gets whether the Indicator is displayed.
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsDisplayed
+        {
+            get
+            {
+                return ((Visible == true) &&
+                        (ShowCheckBoxInLegend == false || CheckedInLegend == true));
+            }
+        }
+
+        #endregion
+
+        #region Slope
+
+        /// <summary>
+        /// Gets the Indicator Line's Slope (ie. the 'm' portion of 'y = mx + b').
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public double Slope
+        {
+            get
+            {
+                ChartSeries series = Parent as ChartSeries;
+
+                if (series == null)
+                    throw new Exception("Indicator Line not associated with a ChartSeries.");
+
+                ChartXy chartXy = series.Parent as ChartXy;
+
+                if (chartXy == null)
+                    throw new Exception("Indicator Line not associated with a ChartXy.");
+
+                SortedSeriesPoints ssp = series.GetSortedSeriesPoints(chartXy);
+
+                ssp.SlopeIndex = ValueYIndex;
+
+                return (ssp.Slope);
+            }
+        }
+
+        #endregion
+
+        #region ValueYIndex
+
+        /// <summary>
+        /// Gets or sets the ValueY index to use for the slope/intercept.
+        /// </summary>
+        [DefaultValue(0), Category("Appearance")]
+        [Description("Indicates the ValueY index to use for the slope/intercept.")]
+        public int ValueYIndex
+        {
+            get { return (_ValueYIndex); }
+
+            set
+            {
+                if (value != _ValueYIndex)
+                {
+                    _ValueYIndex = value;
+
+                    OnPropertyChangedEx("ValueYIndex", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ArrangeOverride
+
+        protected override void ArrangeOverride(ChartLayoutInfo layoutInfo)
+        {
+        }
+
+        #endregion
+
+        #region MeasureOverride
+
+        protected override void MeasureOverride(ChartLayoutInfo layoutInfo)
+        {
+        }
+
+        #endregion
+
+        #region RenderOverride
+
+        protected override void RenderOverride(ChartRenderInfo renderInfo)
+        {
+        }
+
+        #endregion
+
+        #region ILegendItem
+
+        #region ChartLegendItemVisualStyles
+
+        /// <summary>
+        /// Gets or sets the visual styles for the Legend item.
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates the visual styles for the Legend item.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ChartLegendItemVisualStyles ChartLegendItemVisualStyles
+        {
+            get
+            {
+                if (_ChartLegendItemVisualStyles == null)
+                {
+                    _ChartLegendItemVisualStyles = new ChartLegendItemVisualStyles();
+
+                    StyleVisualChangeHandler(null, _ChartLegendItemVisualStyles);
+                }
+
+                return (_ChartLegendItemVisualStyles);
+            }
+
+            set
+            {
+                if (_ChartLegendItemVisualStyles != value)
+                {
+                    ChartLegendItemVisualStyles oldValue = _ChartLegendItemVisualStyles;
+
+                    _ChartLegendItemVisualStyles = value;
+
+                    OnStyleChanged("ChartLegendItemVisualStyles", oldValue, value);
+
+                    if (oldValue != null)
+                        oldValue.Dispose();
+                }
+            }
+        }
+
+        #endregion
+
+        #region CheckedInLegend
+
+        /// <summary>
+        /// Gets or sets whether the Line is checked in the Legend.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance")]
+        [Description("Indicates whether the Line is checked in the Legend.")]
+        public bool CheckedInLegend
+        {
+            get { return (TestState(States.CheckedInLegend)); }
+
+            set
+            {
+                if (value != CheckedInLegend)
+                {
+                    SetState(States.CheckedInLegend, value);
+
+                    if (LegendItem != null)
+                        LegendItem.UpdateCheckState();
+
+                    OnPropertyChangedEx("CheckedInLegend", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowCheckBoxInLegend
+
+        /// <summary>
+        /// Gets or sets whether a checkbox for the Line is shown in the Legend.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance")]
+        [Description("Indicates whether a checkbox for the Line is shown in the Legend.")]
+        public bool ShowCheckBoxInLegend
+        {
+            get { return (TestState(States.ShowCheckBoxInLegend)); }
+
+            set
+            {
+                if (value != ShowCheckBoxInLegend)
+                {
+                    SetState(States.ShowCheckBoxInLegend, value);
+
+                    OnPropertyChangedEx("ShowCheckBoxInLegend", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowInLegend
+
+        /// <summary>
+        /// Gets or sets whether the Line is shown in the Legend.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance")]
+        [Description("Indicates whether theLine is shown in the Legend.")]
+        public bool ShowInLegend
+        {
+            get { return (TestState(States.ShowInLegend)); }
+
+            set
+            {
+                if (value != ShowInLegend)
+                {
+                    SetState(States.ShowInLegend, value);
+
+                    OnPropertyChangedEx("ShowInLegend", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowInParentLegend
+
+        /// <summary>
+        /// Gets or sets whether the Line is shown in parent Legend(s).
+        /// </summary>
+        [DefaultValue(true), Category("Appearance")]
+        [Description("Indicates whether the Line is shown in parent Legend(s).")]
+        public bool ShowInParentLegend
+        {
+            get { return (TestState(States.ShowInParentLegend)); }
+
+            set
+            {
+                if (value != ShowInParentLegend)
+                {
+                    SetState(States.ShowInParentLegend, value);
+
+                    OnPropertyChangedEx("ShowInParentLegend", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowMarkerInLegend
+
+        /// <summary>
+        /// Gets or sets whether the Line Marker is shown in the Legend.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance")]
+        [Description("Indicates whether the Line Marker is shown in the Legend.")]
+        public bool ShowMarkerInLegend
+        {
+            get { return (TestState(States.ShowMarkerInLegend)); }
+
+            set
+            {
+                if (value != ShowMarkerInLegend)
+                {
+                    SetState(States.ShowMarkerInLegend, value);
+
+                    OnPropertyChangedEx("ShowMarkerInLegend", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region LegendItem
+
+        ///<summary>
+        /// Gets the item's parent LegendItem.
+        ///</summary>
+        [Description("Indicates the item's parent LegendItem.")]
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public ChartLegendItem LegendItem
+        {
+            get { return (_LegendItem); }
+
+            internal set
+            {
+                if (_LegendItem != null)
+                    _LegendItem.Dispose();
+
+                _LegendItem = value;
+            }
+        }
+
+        #endregion
+
+        #region LegendText
+
+        ///<summary>
+        /// Gets or sets the text to display in the legend.
+        ///</summary>
+        [DefaultValue(null), Category("DataLabel")]
+        [Description("Indicates the text to display in the legend.")]
+        public string LegendText
+        {
+            get { return (_LegendText); }
+
+            set
+            {
+                if (value != _LegendText)
+                {
+                    _LegendText = value;
+
+                    OnPropertyChangedEx("LegendText", Style.VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region GetLegendItem
+
+        public ChartLegendItem GetLegendItem()
+        {
+            LegendItem = null;
+
+            if (ShowInLegend == true)
+            {
+                LegendItem = new ChartLegendItem();
+
+                if (CheckedInLegend == true)
+                    _LegendItem.CheckState = CheckState.Checked;
+
+                _LegendItem.Name = Name;
+                _LegendItem.ItemText = LegendText;
+
+                if (string.IsNullOrEmpty(Name) == true &&
+                    string.IsNullOrEmpty(_LegendItem.ItemText) == true)
+                {
+                    _LegendItem.ItemText = GetLegendItemTextEx();
+                }
+
+                _LegendItem.ChartItems.Add(this);
+            }
+
+            return (_LegendItem);
+        }
+
+        protected virtual string GetLegendItemTextEx()
+        {
+            return ("(IndLine)");
+        }
+
+        #endregion
+
+        #region GetLegendItems
+
+        public List<ChartLegendItem> GetLegendItems()
+        {
+            List<ChartLegendItem> list = new List<ChartLegendItem>(1);
+
+            list.Add(GetLegendItem());
+
+            return (list);
+        }
+
+        #endregion
+
+        #region GetLegendItemColor
+
+        public Color GetLegendItemColor()
+        {
+            Color color = GetLegendItemColorEx();
+
+            if (color.IsEmpty == true)
+            {
+                ChartSeries series = Parent as ChartSeries;
+
+                if (series != null)
+                    color = series.DefaultPaletteColor;
+            }
+
+            return (color);
+        }
+
+        protected virtual Color GetLegendItemColorEx()
+        {
+            return (Color.Empty);
+        }
+
+        #endregion
+
+        #region RenderLegendItemMarker
+
+        public void RenderLegendItemMarker(Graphics g,
+            ChartLegendItem litem, ChartLegendItemVisualStyle style)
+        {
+            RenderLegendItemMarkerEx(g, litem, style);
+        }
+
+        protected virtual void RenderLegendItemMarkerEx(Graphics g,
+            ChartLegendItem litem, ChartLegendItemVisualStyle style)
+        {
+        }
+
+        #endregion
+
+        #endregion
+
+        #region CopyTo
+
+        public override void CopyTo(ChartVisualElement copy)
+        {
+            ChartIndicator c = copy as ChartIndicator;
+
+            if (c != null)
+            {
+                base.CopyTo(c);
+
+                c.ChartLegendItemVisualStyles = 
+                    (_ChartLegendItemVisualStyles != null) ? ChartLegendItemVisualStyles.Copy() : null;
+
+                c.CheckedInLegend = CheckedInLegend;
+                c.LegendText = LegendText;
+                c.ShowCheckBoxInLegend = ShowCheckBoxInLegend;
+                c.ShowInLegend = ShowInLegend;
+                c.ShowInParentLegend = ShowInParentLegend;
+                c.ShowMarkerInLegend = ShowMarkerInLegend;
+                c.DisplayOnTop = DisplayOnTop;
+                c.ValueYIndex = _ValueYIndex;
+            }
+        }
+
+        #endregion
+
+        #region GetSerialData
+
+        internal override SerialElementCollection GetSerialData(string serialName)
+        {
+            SerialElementCollection sec = new SerialElementCollection();
+
+            if (serialName != null)
+            {
+                if (serialName.Equals("") == true)
+                    serialName = "ChartIndicator";
+
+                sec.AddStartElement(serialName);
+            }
+
+            if (_ChartLegendItemVisualStyles != null)
+                sec.AddElement(_ChartLegendItemVisualStyles.GetSerialData("ChartLegendItemVisualStyles"));
+
+            sec.AddValue("DisplayOnTop", DisplayOnTop, false);
+
+            sec.AddValue("CheckedInLegend", CheckedInLegend, true);
+            sec.AddValue("LegendText", LegendText, null);
+            sec.AddValue("ShowCheckBoxInLegend", ShowCheckBoxInLegend, true);
+            sec.AddValue("ShowInLegend", ShowInLegend, true);
+            sec.AddValue("ShowInParentLegend", ShowInParentLegend, true);
+            sec.AddValue("ShowMarkerInLegend", ShowMarkerInLegend, true);
+
+            sec.AddValue("ValueYIndex", _ValueYIndex, 0);
+
+            sec.AddElement(base.GetSerialData(null));
+
+            if (serialName != null)
+                sec.AddEndElement(serialName);
+
+            return (sec);
+        }
+
+        #endregion
+
+        #region PutSerialData
+
+        #region ProcessValue
+
+        internal override void ProcessValue(SerialElement se)
+        {
+            switch (se.Name)
+            {
+                case "CheckedInLegend":
+                    CheckedInLegend = bool.Parse(se.StringValue);
+                    break;
+
+                case "DisplayOnTop":
+                    DisplayOnTop = bool.Parse(se.StringValue);
+                    break;
+
+                case "LegendText":
+                    LegendText = se.StringValue;
+                    break;
+
+                case "ShowCheckBoxInLegend":
+                    ShowCheckBoxInLegend = bool.Parse(se.StringValue);
+                    break;
+
+                case "ShowInLegend":
+                    ShowInLegend = bool.Parse(se.StringValue);
+                    break;
+
+                case "ShowInParentLegend":
+                    ShowInParentLegend = bool.Parse(se.StringValue);
+                    break;
+
+                case "ShowMarkerInLegend":
+                    ShowMarkerInLegend = bool.Parse(se.StringValue);
+                    break;
+
+                case "ValueYIndex":
+                    ValueYIndex = int.Parse(se.StringValue);
+                    break;
+
+                default:
+                    base.ProcessValue(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region ProcessCollection
+
+        internal override void ProcessCollection(SerialElement se)
+        {
+            SerialElementCollection sec = se.Sec;
+
+            switch (se.Name)
+            {
+                case "ChartLegendItemVisualStyles":
+                    sec.PutSerialData(ChartLegendItemVisualStyles);
+                    break;
+
+                default:
+                    base.ProcessCollection(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region States
+
+        [Flags]
+        private enum States : uint
+        {
+            CheckedInLegend = (1U << 1),
+            ShowCheckBoxInLegend = (1U << 2),
+            ShowInLegend = (1U << 3),
+            ShowInParentLegend = (1U << 4),
+            ShowMarkerInLegend = (1U << 5),
+            DisplayOnTop = (1U << 6),
+        }
+
+        #region TestState
+
+        private bool TestState(States state)
+        {
+            return ((_States & state) == state);
+        }
+
+        #endregion
+
+        #region SetState
+
+        private void SetState(States state, bool value)
+        {
+            if (value == true)
+                _States |= state;
+            else
+                _States &= ~state;
+        }
+
+        #endregion
+
+        #endregion
+    }
+
+    #region enums
+
+    #region ChartIndicatorType
+
+    public enum ChartIndicatorType
+    {
+        TrendLine,
+        RegressionLine,
+    }
+
+    #endregion
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/ChartLable.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/ChartLable.cs
new file mode 100644
index 00000000..9ef8acdd
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/ChartLable.cs	
@@ -0,0 +1,261 @@
+using System;
+using System.ComponentModel;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.Charts.Style;
+
+namespace DevComponents.DotNetBar.Charts
+{
+    /// <summary>
+    /// ChartAxisLable
+    /// </summary>
+    public class ChartAxisLable : ChartVisualElement
+    {
+        #region Private variables
+
+        private States _States;
+
+        private string _Text;
+        private int _FixedHeight;
+
+        #endregion
+
+        #region Public properties
+
+        #region FixedHeight
+
+        /// <summary>
+        /// Gets or sets the fixed Text height of the label (0 to auto-size)
+        /// </summary>
+        [DefaultValue(0), Category("Layout")]
+        [Description("Indicates the fixed Text height of the label (0 to auto-size)")]
+        public int FixedHeight
+        {
+            get { return (_FixedHeight); }
+
+            set
+            {
+                if (value != _FixedHeight)
+                {
+                    _FixedHeight = value;
+
+                    OnPropertyChangedEx("FixedHeight", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region Text
+
+        /// <summary>
+        /// Gets or sets the label Text.
+        /// </summary>
+        [DefaultValue(null), Category("Appearance")]
+        [Description("Indicates the label Text.")]
+        public string Text
+        {
+            get { return (_Text); }
+
+            set
+            {
+                _Text = value;
+
+                OnPropertyChangedEx("Text", VisualChangeType.Layout);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region MeasureOverride
+
+        protected override void MeasureOverride(ChartLayoutInfo layoutInfo)
+        {
+            throw new NotImplementedException();
+        }
+
+        #endregion
+
+        #region ArrangeOverride
+
+        protected override void ArrangeOverride(ChartLayoutInfo layoutInfo)
+        {
+            throw new NotImplementedException();
+        }
+
+        #endregion
+
+        #region RenderOverride
+
+        protected override void RenderOverride(ChartRenderInfo renderInfo)
+        {
+            throw new NotImplementedException();
+        }
+
+        #endregion
+
+        #region Mouse handling
+
+        #region OnMouseEnter
+
+        protected override bool OnMouseEnter(EventArgs e)
+        {
+            return (true);
+        }
+
+        #endregion
+
+        #region OnMouseLeave
+
+        protected override bool OnMouseLeave(EventArgs e)
+        {
+            return (true);
+        }
+
+        #endregion
+
+        #region OnMouseMove
+
+        protected override bool OnMouseMove(MouseEventArgs e)
+        {
+            ChartCursor = Cursors.Default;
+
+            return (false);
+        }
+
+        #endregion
+
+        #region OnMouseDown
+
+        protected override bool OnMouseDown(MouseEventArgs e)
+        {
+            return (false);
+        }
+
+        #endregion
+
+        #region OnMouseUp
+
+        protected override bool OnMouseUp(MouseEventArgs e)
+        {
+            base.OnMouseUp(e);
+
+            return (true);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Copy/CopyTo
+
+        public override ChartVisualElement Copy()
+        {
+            ChartAxisLable copy = new ChartAxisLable();
+
+            CopyTo(copy);
+
+            return (copy);
+        }
+
+        public override void CopyTo(ChartVisualElement copy)
+        {
+            ChartAxisLable c = copy as ChartAxisLable;
+
+            if (c != null)
+            {
+                base.CopyTo(c);
+
+                c.FixedHeight = FixedHeight;
+                c.Text = Text;
+            }
+        }
+
+        #endregion
+
+        #region GetSerialData
+
+        internal override SerialElementCollection GetSerialData(string serialName)
+        {
+            SerialElementCollection sec = new SerialElementCollection();
+
+            if (serialName != null)
+            {
+                if (serialName.Equals("") == true)
+                    serialName = "BaseChart";
+
+                sec.AddStartElement(serialName);
+            }
+
+            sec.AddValue("FixedHeight", FixedHeight, 0);
+            sec.AddValue("Text", Text, null);
+
+            sec.AddElement(base.GetSerialData(null));
+
+            if (serialName != null)
+                sec.AddEndElement(serialName);
+
+            return (sec);
+        }
+
+        #endregion
+
+        #region PutSerialData
+
+        #region ProcessValue
+
+        internal override void ProcessValue(SerialElement se)
+        {
+            switch (se.Name)
+            {
+                case "FixedHeight":
+                    FixedHeight = int.Parse(se.StringValue);
+                    break;
+
+                case "Text":
+                    Text = se.StringValue;
+                    break;
+
+                default:
+                    base.ProcessValue(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region States
+
+        [Flags]
+        private enum States : uint
+        {
+            EnableTextMarkup = (1U << 0),
+        }
+
+        #region TestState
+
+        private bool TestState(States state)
+        {
+            return ((_States & state) == state);
+        }
+
+        #endregion
+
+        #region SetState
+
+        private void SetState(States state, bool value)
+        {
+            if (value == true)
+                _States |= state;
+            else
+                _States &= ~state;
+        }
+
+        #endregion
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/ChartLayoutInfo.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/ChartLayoutInfo.cs
new file mode 100644
index 00000000..b3339a1d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/ChartLayoutInfo.cs	
@@ -0,0 +1,30 @@
+using DevComponents.DotNetBar.Charts.Style;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Charts
+{
+    /// <summary>
+    /// Provides the layout information for chart layout pass
+    /// </summary>
+    public class ChartLayoutInfo
+    {
+        #region Public variables
+
+        public Graphics Graphics;
+
+        public Rectangle ClientBounds;
+        public Rectangle LayoutBounds;
+
+        public Point ScrollOffset;
+
+        public bool LayoutBoundsAdjusted;
+
+        #endregion
+
+        public ChartLayoutInfo(Graphics graphics, Rectangle clientBounds)
+        {
+            Graphics = graphics;
+            ClientBounds = clientBounds;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/ChartLegend.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/ChartLegend.cs
new file mode 100644
index 00000000..3d7a2902
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/ChartLegend.cs	
@@ -0,0 +1,2793 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.Charts.Style;
+
+namespace DevComponents.DotNetBar.Charts
+{
+    [TypeConverter(typeof(BlankExpandableObjectConverter))]
+    public class ChartLegend : ChartVisualElement, IScrollable
+    {
+        #region Private variables
+
+        private States _States;
+
+        private Alignment _Alignment = Alignment.NotSet;
+        private Placement _Placement = Placement.NotSet;
+        private Direction _Direction = Direction.NotSet;
+
+        private ChartLegendVisualStyles _ChartLegendVisualStyles;
+        private EffectiveStyles<ChartLegendVisualStyle> _EffectiveStyles;
+
+        private ChartLegendItemVisualStyles _ChartLegendItemVisualStyles;
+        private EffectiveStyles<ChartLegendItemVisualStyle> _EffectiveItemStyles;
+
+        private Rectangle _FrameBounds;
+        private Rectangle _ContentBounds;
+        private Rectangle _ContentBoundsEx;
+
+        private bool _LegendMeasured;
+
+        private double _MaxHorizontalPct = 100d;
+        private double _MaxVerticalPct = 100d;
+
+        private Size _CheckBoxSize = new Size(15, 15);
+        private Size _MarkerSize = new Size(15, 15);
+        private Size _MinContentSize = new Size(15, 15);
+
+        private Tbool _ShowPieSeriesCheckBoxes = Tbool.NotSet;
+        private Tbool _ShowPieRingCheckBoxes = Tbool.NotSet;
+        private Tbool _ShowPieSeriesPointCheckBoxes = Tbool.NotSet;
+
+        private int _ItemTextOffset = 2;
+
+        private List<ChartLegendItem> _LegendItems;
+
+        private ScrollBarLite _VScrollBar;
+        private int _VScrollBarWidth = 9;
+
+        private bool _Panning;
+        private int _VPanOffset;
+
+        private LegendArea _HitArea;
+
+        private SortDirection _ItemSortDirection = SortDirection.None;
+        private ItemCheckAction _ItemCheckAction = ItemCheckAction.ShowItem;
+
+        private PointMarker _PointMarker;
+
+        private LegendTrackingMode _TrackingMode = LegendTrackingMode.NotSet;
+
+        #endregion
+
+        public ChartLegend()
+        {
+            InitDefaultStates();
+
+            _EffectiveStyles = new EffectiveStyles<ChartLegendVisualStyle>(this);
+            _EffectiveItemStyles = new EffectiveStyles<ChartLegendItemVisualStyle>(this);
+
+            SetupScrollBars();
+        }
+
+        #region InitDefaultStates
+
+        private void InitDefaultStates()
+        {
+            SetState(States.CombineLikeItems, true);
+            SetState(States.EnablePanning, true);
+            SetState(States.ShowItemText, true);
+            SetState(States.ShowMarkers, true);
+            SetState(States.ShowPieSeriesInLegend, true);
+            SetState(States.ShowPieSeriesPointsInLegend, true);
+            SetState(States.VScrollBarVisible, true);
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region Alignment
+
+        /// <summary>
+        /// Gets or sets the Alignment of the legend with respect to the chart.
+        /// </summary>
+        [DefaultValue(Alignment.NotSet), Category("Layout")]
+        [Description("Indicates the Alignment of the legend with respect to the chart.")]
+        public Alignment Alignment
+        {
+            get { return (_Alignment); }
+
+            set
+            {
+                if (_Alignment != value)
+                {
+                    _Alignment = value;
+
+                    OnPropertyChangedEx("Alignment", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region AlignVerticalItems
+
+        /// <summary>
+        /// Gets or sets whether vertical items are aligned in the legend
+        /// (used when multiple columns are presented).
+        /// </summary>
+        [DefaultValue(false), Category("Layout")]
+        [Description("Indicates whether vertical items are aligned in the legend (used when multiple columns are presented).")]
+        public bool AlignVerticalItems
+        {
+            get { return (TestState(States.AlignVerticalItems)); }
+
+            set
+            {
+                if (value != AlignVerticalItems)
+                {
+                    SetState(States.AlignVerticalItems, value);
+
+                    OnPropertyChangedEx("AlignVerticalItems", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ChartLegendItemVisualStyles
+
+        /// <summary>
+        /// Gets or sets the default visual styles for Legend items.
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates the default visual styles for Legend items.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ChartLegendItemVisualStyles ChartLegendItemVisualStyles
+        {
+            get
+            {
+                if (_ChartLegendItemVisualStyles == null)
+                {
+                    _ChartLegendItemVisualStyles = new ChartLegendItemVisualStyles();
+
+                    StyleVisualChangeHandler(null, _ChartLegendItemVisualStyles);
+                }
+
+                return (_ChartLegendItemVisualStyles);
+            }
+
+            set
+            {
+                if (_ChartLegendItemVisualStyles != value)
+                {
+                    ChartLegendItemVisualStyles oldValue = _ChartLegendItemVisualStyles;
+
+                    _ChartLegendItemVisualStyles = value;
+
+                    OnStyleChanged("ChartLegendItemVisualStyles", oldValue, value);
+
+                    if (oldValue != null)
+                        oldValue.Dispose();
+                }
+            }
+        }
+
+        #endregion
+
+        #region ChartLegendVisualStyles
+
+        /// <summary>
+        /// Gets or sets the visual styles for the Legend.
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates the visual styles for the Legend.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ChartLegendVisualStyles ChartLegendVisualStyles
+        {
+            get
+            {
+                if (_ChartLegendVisualStyles == null)
+                {
+                    _ChartLegendVisualStyles = new ChartLegendVisualStyles();
+
+                    StyleVisualChangeHandler(null, _ChartLegendVisualStyles);
+                }
+
+                return (_ChartLegendVisualStyles);
+            }
+
+            set
+            {
+                if (_ChartLegendVisualStyles != value)
+                {
+                    ChartLegendVisualStyles oldValue = _ChartLegendVisualStyles;
+
+                    _ChartLegendVisualStyles = value;
+
+                    OnStyleChanged("ChartLegendVisualStyles", oldValue, value);
+
+                    if (oldValue != null)
+                        oldValue.Dispose();
+                }
+            }
+        }
+
+        #endregion
+
+        #region CheckBoxSize
+
+        /// <summary>
+        /// Gets or sets the default size of the item CheckBoxes.
+        /// </summary>
+        [Category("Appearance")]
+        [Description("Indicates the default size of the item CheckBoxes.")]
+        public Size CheckBoxSize
+        {
+            get { return (_CheckBoxSize); }
+
+            set
+            {
+                if (value != _CheckBoxSize)
+                {
+                    _CheckBoxSize = value;
+
+                    OnPropertyChangedEx("CheckBoxSize", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        internal virtual bool ShouldSerializeCheckBoxSize()
+        {
+            return (_CheckBoxSize != new Size(15, 15));
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        internal virtual void ResetCheckBoxSize()
+        {
+            CheckBoxSize = new Size(15, 15);
+        }
+
+        #endregion
+
+        #region CombineLikeItems
+
+        /// <summary>
+        /// Gets or sets whether 'like' subordinate items
+        /// (items with same Names) are combined into a single item.
+        /// </summary>
+        [DefaultValue(true), Category("Layout")]
+        [Description("Indicates whether 'like' subordinate items (items with same Names) are combined into a single item.")]
+        public bool CombineLikeItems
+        {
+            get { return (TestState(States.CombineLikeItems)); }
+
+            set
+            {
+                if (value != CombineLikeItems)
+                {
+                    SetState(States.CombineLikeItems, value);
+
+                    OnPropertyChangedEx("CombineLikeItems", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region Direction
+
+        /// <summary>
+        /// Gets or sets the display direction of the items within the legend.
+        /// </summary>
+        [DefaultValue(Direction.NotSet), Category("Layout")]
+        [Description("Indicates the display direction of the items within the legend.")]
+        public Direction Direction
+        {
+            get { return (_Direction); }
+
+            set
+            {
+                if (_Direction != value)
+                {
+                    _Direction = value;
+
+                    OnPropertyChangedEx("Direction", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region EffectiveItemStyles
+
+        /// <summary>
+        /// Gets a reference to the legend's item Effective (cached, composite) styles.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public EffectiveStyles<ChartLegendItemVisualStyle> EffectiveItemStyles
+        {
+            get { return (_EffectiveItemStyles); }
+        }
+
+        #endregion
+
+        #region EffectiveStyles
+
+        /// <summary>
+        /// Gets a reference to the legend's Effective (cached, composite) styles.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public EffectiveStyles<ChartLegendVisualStyle> EffectiveStyles
+        {
+            get { return (_EffectiveStyles); }
+        }
+
+        #endregion
+
+        #region EnablePanning
+
+        /// <summary>
+        /// Gets or sets whether the legend can be panned with the mouse.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior")]
+        [Description("Indicates whether the legend can be panned with the mouse.")]
+        public bool EnablePanning
+        {
+            get { return (TestState(States.EnablePanning)); }
+
+            set
+            {
+                if (value != EnablePanning)
+                {
+                    SetState(States.EnablePanning, value);
+
+                    OnPropertyChanged("EnablePanning");
+                }
+            }
+        }
+
+        #endregion
+
+        #region ItemCheckAction
+
+        /// <summary>
+        /// Gets or sets the "action" taken when a LegendItem is checked.
+        /// </summary>
+        [DefaultValue(ItemCheckAction.ShowItem), Category("Behavior")]
+        [Description("Indicates the series sort direction (LegendItem Name).")]
+        public ItemCheckAction ItemCheckAction
+        {
+            get { return (_ItemCheckAction); }
+
+            set
+            {
+                if (_ItemCheckAction != value)
+                {
+                    _ItemCheckAction = value;
+
+                    OnPropertyChanged("ItemCheckAction");
+                }
+            }
+        }
+
+        #endregion
+
+        #region ItemSortDirection
+
+        /// <summary>
+        /// Gets or sets the item sort direction (LegendItem Text)
+        /// </summary>
+        [DefaultValue(SortDirection.None), Category("Appearance")]
+        [Description("Indicates the series sort direction (LegendItem Text).")]
+        public SortDirection ItemSortDirection
+        {
+            get { return (_ItemSortDirection); }
+
+            set
+            {
+                if (_ItemSortDirection != value)
+                {
+                    _ItemSortDirection = value;
+
+                    OnPropertyChanged("ItemSortDirection");
+                }
+            }
+        }
+
+        #endregion
+
+        #region ItemTextOffset
+
+        /// <summary>
+        /// Gets or sets the offset between the marker (or Checkbox) and the item text.
+        /// </summary>
+        [DefaultValue(2), Category("Layout")]
+        [Description("Indicates the offset between the marker (or Checkbox) and the item text.")]
+        public int ItemTextOffset
+        {
+            get { return (_ItemTextOffset); }
+
+            set
+            {
+                if (value != _ItemTextOffset)
+                {
+                    if ((uint)value > 1000)
+                        throw new ArgumentOutOfRangeException("value", "Must be between 0 and 1000.");
+
+                    _ItemTextOffset = value;
+
+                    OnPropertyChangedEx("ItemTextOffset", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region LegendItems
+
+        /// <summary>
+        /// Gets the collection of LegendItems.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public List<ChartLegendItem> LegendItems
+        {
+            get
+            {
+                if (_LegendItems == null)
+                    _LegendItems = new List<ChartLegendItem>();
+
+                return (_LegendItems);
+            }
+
+            internal set { _LegendItems = value; }
+        }
+
+        #endregion
+
+        #region MarkerSize
+
+        /// <summary>
+        /// Gets or sets the default size of the item marker.
+        /// </summary>
+        [Category("Appearance")]
+        [Description("Indicates the default size of the item marker.")]
+        public Size MarkerSize
+        {
+            get { return (_MarkerSize); }
+
+            set
+            {
+                if (value != _MarkerSize)
+                {
+                    _MarkerSize = value;
+
+                    OnPropertyChangedEx("MarkerSize", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        internal virtual bool ShouldSerializeMarkerSize()
+        {
+            return (_MarkerSize != new Size(15, 15));
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        internal virtual void ResetMarkerSize()
+        {
+            MarkerSize = new Size(15, 15);
+        }
+
+        #endregion
+
+        #region MaxHorizontalPct
+
+        /// <summary>
+        /// Gets or sets the maximum horizontal size of the legend when autosizing. The value
+        /// is specified as a percentage of the displayed chart size.
+        /// </summary>
+        [DefaultValue(100d), Category("Layout")]
+        [Description("Indicates the maximum horizontal size of the legend when autosizing. The value is specified as a percentage of the displayed chart size.")]
+        public double MaxHorizontalPct
+        {
+            get { return (_MaxHorizontalPct); }
+
+            set
+            {
+                if (value != _MaxHorizontalPct)
+                {
+                    if ((uint)value > 100)
+                        throw new ArgumentOutOfRangeException("value", "Must be between 0 and 100 percent.");
+
+                    _MaxHorizontalPct = value;
+
+                    OnPropertyChangedEx("MaxHorizontalPct", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region MaxVerticalPct
+
+        /// <summary>
+        /// Gets or sets the maximum vertical size of the legend when autosizing. The value
+        /// is specified as a percentage of the displayed chart size.
+        /// </summary>
+        [DefaultValue(100d), Category("Layout")]
+        [Description("Indicates the maximum vertical size of the legend when autosizing. The value is specified as a percentage of the displayed chart size.")]
+        public double MaxVerticalPct
+        {
+            get { return (_MaxVerticalPct); }
+
+            set
+            {
+                if (value != _MaxVerticalPct)
+                {
+                    if ((uint)value > 100)
+                        throw new ArgumentOutOfRangeException("value", "Must be between 0 and 100 percent.");
+
+                    _MaxVerticalPct = value;
+
+                    OnPropertyChangedEx("MaxVerticalPct", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region MinContentSize
+
+        /// <summary>
+        /// Gets or sets the minimum size of the content area of the legend.
+        /// </summary>
+        [Category("Layout")]
+        [Description("Indicates the minimum size of the content area of the legend.")]
+        public Size MinContentSize
+        {
+            get { return (_MinContentSize); }
+
+            set
+            {
+                if (value != _MinContentSize)
+                {
+                    _MinContentSize = value;
+
+                    OnPropertyChangedEx("MinContentSize", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeMinContentSize()
+        {
+            return (_MinContentSize.Width != 15 || _MinContentSize.Height != 15);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetMinContentSize()
+        {
+            MinContentSize = new Size(15, 15);
+        }
+
+        #endregion
+
+        #region Placement
+
+        /// <summary>
+        /// Gets or sets the placement of the legend with respect to the chart.
+        /// </summary>
+        [DefaultValue(Placement.NotSet), Category("Layout")]
+        [Description("Indicates the placement of the legend with respect to the chart.")]
+        public Placement Placement
+        {
+            get { return (_Placement); }
+
+            set
+            {
+                if (_Placement != value)
+                {
+                    _Placement = value;
+
+                    OnPropertyChangedEx("Placement", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ScrollBounds
+
+        /// <summary>
+        /// Gets the Scrollable bounds of the legend.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public virtual Rectangle ScrollBounds
+        {
+            get { return (_ContentBounds); }
+        }
+
+        #endregion
+
+        #region ScrollBoundsEx
+
+        /// <summary>
+        /// Gets the Extended Scrollable bounds of the legend.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public virtual Rectangle ScrollBoundsEx
+        {
+            get { return (_ContentBoundsEx); }
+        }
+
+        #endregion
+
+        #region ScrollBoundsOffset
+
+        ///<summary>
+        /// Gets the current scrollbar offset
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public Point ScrollBoundsOffset
+        {
+            get { return (new Point(0, VScrollOffset)); }
+        }
+
+        #endregion
+
+        #region ShowCheckBoxes
+
+        /// <summary>
+        /// Gets or sets whether checkboxes are shown in the legend.
+        /// </summary>
+        [DefaultValue(false), Category("Appearance")]
+        [Description("Indicates whether checkboxes are shown in the legend.")]
+        public bool ShowCheckBoxes
+        {
+            get { return (TestState(States.ShowCheckBoxes)); }
+
+            set
+            {
+                if (value != ShowCheckBoxes)
+                {
+                    SetState(States.ShowCheckBoxes, value);
+
+                    OnPropertyChangedEx("ShowCheckBoxes", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowItemText
+
+        /// <summary>
+        /// Gets or sets whether item text values are shown in the legend.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance")]
+        [Description("Indicates whether item text values are shown in the legend.")]
+        public bool ShowItemText
+        {
+            get { return (TestState(States.ShowItemText)); }
+
+            set
+            {
+                if (value != ShowItemText)
+                {
+                    SetState(States.ShowItemText, value);
+
+                    OnPropertyChangedEx("ShowItemText", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowMarkers
+
+        /// <summary>
+        /// Gets or sets whether markers are shown in the legend.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance")]
+        [Description("Indicates whether markers are shown in the legend.")]
+        public bool ShowMarkers
+        {
+            get { return (TestState(States.ShowMarkers)); }
+
+            set
+            {
+                if (value != ShowMarkers)
+                {
+                    SetState(States.ShowMarkers, value);
+
+                    OnPropertyChangedEx("ShowMarkers", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowPieRingCheckBoxes
+
+        /// <summary>
+        /// Gets or sets whether PieRing checkboxes are shown in the legend.
+        /// </summary>
+        [DefaultValue(Tbool.NotSet), Category("Appearance")]
+        [Description("Indicates whether PieRing checkboxes are shown in the legend.")]
+        public Tbool ShowPieRingCheckBoxes
+        {
+            get { return (_ShowPieRingCheckBoxes); }
+
+            set
+            {
+                if (value != _ShowPieRingCheckBoxes)
+                {
+                    _ShowPieRingCheckBoxes = value;
+
+                    OnPropertyChangedEx("ShowPieRingCheckBoxes", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowPieRingsInLegend
+
+        /// <summary>
+        /// Gets or sets whether PieRings are shown in the Legend.
+        /// </summary>
+        [DefaultValue(false), Category("Legend")]
+        [Description("Indicates whether Pie Series are shown in the Legend.")]
+        public bool ShowPieRingsInLegend
+        {
+            get { return (TestState(States.ShowPieRingsInLegend)); }
+
+            set
+            {
+                if (value != ShowPieRingsInLegend)
+                {
+                    SetState(States.ShowPieRingsInLegend, value);
+
+                    OnPropertyChangedEx("ShowPieRingsInLegend", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowPieSeriesCheckBoxes
+
+        /// <summary>
+        /// Gets or sets whether PieRing checkboxes are shown in the legend.
+        /// </summary>
+        [DefaultValue(Tbool.NotSet), Category("Appearance")]
+        [Description("Indicates whether PieRing checkboxes are shown in the legend.")]
+        public Tbool ShowPieSeriesCheckBoxes
+        {
+            get { return (_ShowPieSeriesCheckBoxes); }
+
+            set
+            {
+                if (value != _ShowPieSeriesCheckBoxes)
+                {
+                    _ShowPieSeriesCheckBoxes = value;
+
+                    OnPropertyChangedEx("ShowPieSeriesCheckBoxes", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowPieSeriesInLegend
+
+        /// <summary>
+        /// Gets or sets whether Pie Series are shown in the Legend.
+        /// </summary>
+        [DefaultValue(true), Category("Legend")]
+        [Description("Indicates whether Pie Series are shown in the Legend.")]
+        public bool ShowPieSeriesInLegend
+        {
+            get { return (TestState(States.ShowPieSeriesInLegend)); }
+
+            set
+            {
+                if (value != ShowPieSeriesInLegend)
+                {
+                    SetState(States.ShowPieSeriesInLegend, value);
+
+                    OnPropertyChangedEx("ShowPieSeriesInLegend", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowPieSeriesPointCheckBoxes
+
+        /// <summary>
+        /// Gets or sets whether PieSeriesPoint checkboxes are shown in the legend.
+        /// </summary>
+        [DefaultValue(Tbool.NotSet), Category("Appearance")]
+        [Description("Indicates whether PieSeriesPoint checkboxes are shown in the legend.")]
+        public Tbool ShowPieSeriesPointCheckBoxes
+        {
+            get { return (_ShowPieSeriesPointCheckBoxes); }
+
+            set
+            {
+                if (value != _ShowPieSeriesPointCheckBoxes)
+                {
+                    _ShowPieSeriesPointCheckBoxes = value;
+
+                    OnPropertyChangedEx("ShowPieSeriesPointCheckBoxes", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowPieSeriesPointsInLegend
+
+        /// <summary>
+        /// Gets or sets whether Pie Series are shown in the Legend.
+        /// </summary>
+        [DefaultValue(true), Category("Legend")]
+        [Description("Indicates whether Pie Series are shown in the Legend.")]
+        public bool ShowPieSeriesPointsInLegend
+        {
+            get { return (TestState(States.ShowPieSeriesPointsInLegend)); }
+
+            set
+            {
+                if (value != ShowPieSeriesPointsInLegend)
+                {
+                    SetState(States.ShowPieSeriesPointsInLegend, value);
+
+                    OnPropertyChangedEx("ShowPieSeriesPointsInLegend", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region TrackingMode
+
+        /// <summary>
+        /// Gets or sets the tracking mode for highlighting either
+        /// or both chart and legend items when the user mouses over them.
+        /// LegendItems must have MouseOver style set accordingly.
+        /// This property is only honored for PieSeries elements.
+        /// </summary>
+        [DefaultValue(LegendTrackingMode.NotSet), Category("Behavior")]
+        [Description("Indicates the tracking mode for highlighting either or both chart and legend items when the user mouses over them. LegendItems must have MouseOver style set accordingly. This property is only honored for PieSeries elements.")]
+        public LegendTrackingMode TrackingMode
+        {
+            get { return (_TrackingMode); }
+
+            set
+            {
+                if (value != _TrackingMode)
+                {
+                    _TrackingMode = value;
+
+                    OnPropertyChanged("TrackingMode");
+                }
+            }
+        }
+
+        #endregion
+
+        #region Visible
+
+        /// <summary>
+        /// Get or sets whether the item is visible
+        /// </summary>
+        [Description("Indicates whether the item is visible")]
+        [DefaultValue(-1), Category("Appearance")]
+        new public bool Visible
+        {
+            get { return (base.Visible); }
+            set { base.Visible = value; }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        internal bool ShouldSerializeVisible()
+        {
+            return (true);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        internal void ResetVisible()
+        {
+            Visible = true;
+        }
+
+        #endregion
+
+        #region VScrollBar
+
+        ///<summary>
+        /// Gets a reference to the Legend’s vertical scrollbar
+        ///</summary>
+        [DefaultValue(true), Category("Appearance")]
+        [Description("Indicates whether markers are shown in the legend.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ScrollBarLite VScrollBar
+        {
+            get { return (_VScrollBar); }
+        }
+
+        #endregion
+
+        #region VScrollBarWidth
+
+        /// <summary>
+        /// Gets or sets the width of a vertical scrollBar.
+        /// </summary>
+        [DefaultValue(9)]
+        [Description("Indicates the width of a vertical scrollBar")]
+        public int VScrollBarWidth
+        {
+            get { return (_VScrollBarWidth); }
+
+            set
+            {
+                if (value != _VScrollBarWidth)
+                {
+                    _VScrollBarWidth = value;
+
+                    OnPropertyChangedEx("VScrollBarWidth", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region VScrollOffset
+
+        ///<summary>
+        /// Gets or sets the vertical scrollbar offset
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public int VScrollOffset
+        {
+            get
+            {
+                if (_VScrollBar != null && _VScrollBar.Visible == true)
+                    return (_VScrollBar.Value);
+
+                return (0);
+            }
+
+            set { SetVScrollValue(value); }
+        }
+
+        #endregion
+
+        #region VScrollBarVisible
+
+        /// <summary>
+        /// Gets or sets whether Vertical Scrollbar is shown (due to the content of the control exceeding available height).
+        /// </summary>
+        [DefaultValue(true), Category("Appearance")]
+        [Description("Indicates whether Vertical Scrollbar is shown (due to the content of the control exceeding available height).")]
+        public bool VScrollBarVisible
+        {
+            get { return (TestState(States.VScrollBarVisible)); }
+
+            set
+            {
+                if (value != VScrollBarVisible)
+                {
+                    SetState(States.VScrollBarVisible, value);
+
+                    InvalidateLayout();
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region ContentBounds
+
+        internal Rectangle ContentBounds
+        {
+            get { return (_ContentBounds); }
+            set { _ContentBounds = value; }
+        }
+
+        #endregion
+
+        #region ContentBoundsEx
+
+        internal Rectangle ContentBoundsEx
+        {
+            get { return (_ContentBoundsEx); }
+            set { _ContentBoundsEx = value; }
+        }
+
+        #endregion
+
+        #region FrameBounds
+
+        internal Rectangle FrameBounds
+        {
+            get { return (_FrameBounds); }
+            set { _FrameBounds = value; }
+        }
+
+        #endregion
+
+        #region PointMarker
+
+        internal PointMarker PointMarker
+        {
+            get
+            {
+                if (_PointMarker == null)
+                    _PointMarker = new PointMarker();
+
+                return (_PointMarker);
+            }
+
+            set { _PointMarker = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region MeasureOverride
+
+        protected override void MeasureOverride(ChartLayoutInfo layoutInfo)
+        {
+            Graphics g = layoutInfo.Graphics;
+            ChartLegendVisualStyle style = _EffectiveStyles[StyleState.Default];
+
+            ChartControl chartControl = ChartControl;
+
+            if (chartControl.DoPreLoadLegendDataEvent(this) == false)
+            {
+                ChartContainer cc = ParentChartContainer;
+
+                if (cc != null)
+                    LegendItems = cc.GetLegendData();
+
+                chartControl.DoPostLoadLegendDataEvent(this);
+            }
+
+            if (LegendItems.Count > 0)
+            {
+                OrderLegendItems();
+
+                Rectangle layoutBounds = GetLayoutBounds(layoutInfo, style);
+
+                AdjustViewRects(layoutBounds, style);
+
+                _ContentBoundsEx = _ContentBounds;
+
+                Rectangle rrr = layoutInfo.LayoutBounds;
+                layoutInfo.LayoutBounds = layoutBounds;
+
+                Size size = MeasureLegendData(layoutInfo, _ContentBounds, style);
+
+                layoutInfo.LayoutBounds = rrr;
+
+                _ContentBoundsEx.Size = size;
+
+                Size minContentSize = Dpi.Size(MinContentSize);
+
+                size.Width = Math.Max(size.Width, minContentSize.Width);
+                size.Height = Math.Max(size.Height, minContentSize.Height);
+
+                size.Width += Dpi.Width(style.Padding.Horizontal + style.Margin.Horizontal + style.BorderThickness.Horizontal);
+                size.Height += Dpi.Height(style.Padding.Vertical + style.Margin.Vertical + style.BorderThickness.Vertical);
+
+                size.Width = Math.Min(size.Width, layoutBounds.Width);
+                size.Height = Math.Min(size.Height, layoutBounds.Height);
+
+                layoutBounds.Size = size;
+                Size = size;
+
+                if (VScrollBarVisible == true)
+                {
+                    if (ContentBoundsEx.Height > ContentBounds.Height)
+                        layoutBounds.Width += Dpi.Width(_VScrollBarWidth) + 1;
+                }
+
+                layoutBounds = AlignLegend(layoutInfo, layoutBounds, style);
+
+                BoundsRelative = layoutBounds;
+
+                AdjustViewRects(layoutBounds, style);
+            }
+            else
+            {
+                BoundsRelative = Rectangle.Empty;
+            }
+
+            _LegendMeasured = true;
+        }
+
+        #region PreLoadLegendData
+
+        private bool PreLoadLegendData()
+        {
+            ChartControl chartControl = ChartControl;
+
+            if (chartControl != null)
+                return (chartControl.DoPreLoadLegendDataEvent(this));
+
+            return (false);
+        }
+
+        #endregion
+
+        #region OrderLegendItems
+
+        private void OrderLegendItems()
+        {
+            if (ItemSortDirection != SortDirection.None)
+                LegendItems.Sort(new LegendItemComparer(this));
+        }
+
+        #region RowComparer
+
+        private class LegendItemComparer : IComparer<ChartLegendItem>
+        {
+            private ChartLegend _ChartLegend;
+
+            public LegendItemComparer(ChartLegend chartLegend)
+            {
+                _ChartLegend = chartLegend;
+            }
+
+            public int Compare(ChartLegendItem x, ChartLegendItem y)
+            {
+                int sval = 0;
+
+                string sx = string.IsNullOrEmpty(x.ItemText) ? x.Name : x.ItemText;
+                string sy = string.IsNullOrEmpty(y.ItemText) ? y.Name : y.ItemText;
+
+                if (sx == null || sy == null)
+                {
+                    if (sx != sy)
+                        sval = (sx == null ? 1 : -1);
+                }
+                else
+                {
+                    sval = sx.CompareTo(sy);
+                }
+
+                if (sval != 0)
+                {
+                    return (_ChartLegend.ItemSortDirection ==
+                            SortDirection.Ascending) ? sval : -sval;
+                }
+
+                return (0);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region AdjustViewRects
+
+        private void AdjustViewRects(Rectangle layoutBounds, ChartLegendVisualStyle style)
+        {
+            _FrameBounds = GetAdjustedBounds(layoutBounds, style.Margin);
+
+            _ContentBounds = GetAdjustedBounds(_FrameBounds, style.BorderThickness);
+            _ContentBounds = GetAdjustedBounds(_ContentBounds, style.Padding);
+        }
+
+        #endregion
+
+        #region GetLayoutBounds
+
+        private Rectangle GetLayoutBounds(
+            ChartLayoutInfo layoutInfo, ChartLegendVisualStyle style)
+        {
+            Rectangle layoutBounds = layoutInfo.LayoutBounds;
+
+            int width = layoutBounds.Width;
+            int height = layoutBounds.Height;
+
+            int pwidth = (style.Padding.Horizontal + style.Margin.Horizontal + style.BorderThickness.Horizontal);
+            int pheight = (style.Padding.Vertical + style.Margin.Vertical + style.BorderThickness.Vertical);
+
+            if (_MaxHorizontalPct >= 0 && _MaxHorizontalPct < 100)
+                width = (int)Math.Min(width, layoutBounds.Width * _MaxHorizontalPct / 100);
+
+            width = Math.Max(width, _MinContentSize.Width + pwidth);
+            width = Math.Min(width, layoutBounds.Width);
+
+            layoutBounds.Width = width;
+
+            if (_MaxVerticalPct >= 0 && _MaxVerticalPct < 100)
+                height = (int)Math.Min(height, layoutBounds.Height * _MaxVerticalPct / 100);
+
+            height = Math.Max(height, _MinContentSize.Height + pheight);
+            height = Math.Min(height, layoutBounds.Height);
+
+            layoutBounds.Height = height;
+
+            return (layoutBounds);
+        }
+
+        #endregion
+
+        #region MeasureLegendData
+
+        private Size MeasureLegendData(
+            ChartLayoutInfo layoutInfo, Rectangle bounds, ChartLegendVisualStyle style)
+        {
+            Rectangle layoutBounds = layoutInfo.LayoutBounds;
+
+            layoutInfo.LayoutBounds = bounds;
+
+            Size size = Size.Empty;
+
+            if (_LegendItems != null && _LegendItems.Count > 0)
+            {
+                switch (Direction)
+                {
+                    case Direction.LeftToRight:
+                    case Direction.RightToLeft:
+                        size = MeasureHorizontalLegend(layoutInfo, style);
+                        break;
+
+                    case Direction.TopToBottom:
+                    case Direction.BottomToTop:
+                        size = MeasureVerticalLegend(layoutInfo, style);
+                        break;
+
+                    default:
+                        switch (Alignment)
+                        {
+                            case Alignment.TopCenter:
+                            case Alignment.MiddleCenter:
+                            case Alignment.BottomCenter:
+                                size = MeasureHorizontalLegend(layoutInfo, style);
+                                break;
+
+                            default:
+                                size = MeasureVerticalLegend(layoutInfo, style);
+                                break;
+                        }
+                        break;
+                }
+            }
+
+            layoutInfo.LayoutBounds = layoutBounds;
+
+            return (size);
+        }
+
+        #region MeasureHorizontalLegend
+
+        private Size MeasureHorizontalLegend(
+            ChartLayoutInfo layoutInfo, ChartLegendVisualStyle style)
+        {
+            if (AlignVerticalItems == true)
+                return (MeasureEquallySpacedItems(layoutInfo, style));
+
+            return (MeasureDefaultSpacedItems(layoutInfo, style));
+        }
+
+        #region MeasureEquallySpacedItems
+
+        private Size MeasureEquallySpacedItems(
+            ChartLayoutInfo layoutInfo, ChartLegendVisualStyle style)
+        {
+            Size size = Size.Empty;
+            Rectangle bounds = layoutInfo.LayoutBounds;
+
+            Size[] itemSizes = MeasureAllItems(layoutInfo);
+            int mcc = GetMaxColumnCount(layoutInfo, style, itemSizes);
+
+            if (mcc > 0)
+            {
+                int[] widthArray = GetWidthArray(layoutInfo, itemSizes, mcc);
+
+                while (mcc > 1)
+                {
+                    int n = 0;
+
+                    for (int j = 0; j < widthArray.Length; j++)
+                        n += widthArray[j];
+
+                    n += ((widthArray.Length - 1) * Dpi.Width(style.HorizontalSpacing));
+
+                    if (n <= layoutInfo.LayoutBounds.Width)
+                        break;
+
+                    widthArray = GetWidthArray(layoutInfo, itemSizes, --mcc);
+                }
+
+                if (mcc > 0)
+                {
+                    int[] heightArray = GetHeightArray(layoutInfo, itemSizes, mcc);
+
+                    for (int i = 0; i < _LegendItems.Count; i++)
+                    {
+                        int x = i % mcc;
+                        int y = i / mcc;
+
+                        ChartLegendItem li = _LegendItems[i];
+
+                        li.Size = new Size(widthArray[x], heightArray[y]);
+                    }
+
+                    for (int i = 0; i < widthArray.Length; i++)
+                        size.Width += widthArray[i];
+
+                    size.Width += ((mcc - 1) * Dpi.Width(style.HorizontalSpacing));
+
+                    for (int i = 0; i < heightArray.Length; i++)
+                        size.Height += heightArray[i];
+
+                    size.Height += ((heightArray.Length - 1) * Dpi.Height(style.VerticalSpacing));
+                }
+            }
+
+            return (size);
+        }
+
+        #region MeasureAllItems
+
+        private Size[] MeasureAllItems(ChartLayoutInfo layoutInfo)
+        {
+            Size[] sizes = new Size[_LegendItems.Count];
+
+            for (int i = 0; i < _LegendItems.Count; i++)
+            {
+                ChartLegendItem li = _LegendItems[i];
+
+                li.Parent = this;
+                li.Measure(layoutInfo);
+
+                sizes[i] = li.Size;
+            }
+
+            return (sizes);
+        }
+
+        #endregion
+
+        #region GetMaxColumnCount
+
+        private int GetMaxColumnCount(
+            ChartLayoutInfo layoutInfo, ChartLegendVisualStyle style, Size[] itemSizes)
+        {
+            int n = 0;
+
+            for (int i = 0; i < itemSizes.Length; i++)
+            {
+                n += (itemSizes[i].Width + Dpi.Width(style.HorizontalSpacing));
+
+                if (n >= layoutInfo.LayoutBounds.Width)
+                    return (i > 0 ? i : 1);
+            }
+
+            return (itemSizes.Length);
+        }
+
+        #endregion
+
+        #region GetWidthArray
+
+        private int[] GetWidthArray(
+            ChartLayoutInfo layoutInfo, Size[] itemSizes, int mcc)
+        {
+            int[] widthArray = new int[mcc];
+
+            for (int i = 0; i < _LegendItems.Count; i++)
+            {
+                int x = i % mcc;
+
+                ChartLegendItem li = _LegendItems[i];
+
+                if (li.Size.Width > widthArray[x])
+                    widthArray[x] = li.Size.Width;
+            }
+
+            return (widthArray);
+        }
+
+        #endregion
+
+        #region GetHeightArray
+
+        private int[] GetHeightArray(
+            ChartLayoutInfo layoutInfo, Size[] itemSizes, int mcc)
+        {
+            int n = (int)Math.Ceiling((double)_LegendItems.Count / mcc);
+            int[] heightArray = new int[n];
+
+            for (int i = 0; i < _LegendItems.Count; i++)
+            {
+                int y = i / mcc;
+
+                ChartLegendItem li = _LegendItems[i];
+
+                if (li.Size.Height > heightArray[y])
+                    heightArray[y] = li.Size.Height;
+            }
+
+            return (heightArray);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region MeasureDefaultSpacedItems
+
+        private Size MeasureDefaultSpacedItems(
+            ChartLayoutInfo layoutInfo, ChartLegendVisualStyle style)
+        {
+            Size size = Size.Empty;
+            Size rsize = Size.Empty;
+
+            Rectangle bounds = layoutInfo.LayoutBounds;
+
+            for (int i = 0; i < _LegendItems.Count; i++)
+            {
+                ChartLegendItem li = _LegendItems[i];
+
+                li.Parent = this;
+                li.Measure(layoutInfo);
+
+                if (rsize.Width + li.Size.Width <= bounds.Width && li.TextWrapped == false)
+                {
+                    rsize.Width += li.Size.Width;
+                    layoutInfo.LayoutBounds.Width -= li.Size.Width;
+
+                    if (i + 1 < _LegendItems.Count)
+                    {
+                        int n = Dpi.Width(style.HorizontalSpacing);
+
+                        rsize.Width += n;
+                        layoutInfo.LayoutBounds.Width -= n;
+                    }
+
+                    if (li.Size.Height > rsize.Height)
+                        rsize.Height = li.Size.Height;
+                }
+                else
+                {
+                    if (rsize.IsEmpty == false || layoutInfo.LayoutBounds.Width == bounds.Width)
+                    {
+                        if (layoutInfo.LayoutBounds.Width != bounds.Width)
+                            i--;
+                        else
+                            rsize = li.Size;
+
+                        if (size.Width < rsize.Width)
+                            size.Width = rsize.Width;
+
+                        size.Height += (rsize.Height + Dpi.Height(style.VerticalSpacing));
+
+                        layoutInfo.LayoutBounds = bounds;
+                        layoutInfo.LayoutBounds.Height = bounds.Height - size.Height;
+
+                        rsize = Size.Empty;
+                    }
+                }
+            }
+
+            if (rsize.IsEmpty == false)
+            {
+                if (size.Width < rsize.Width)
+                    size.Width = rsize.Width;
+
+                size.Height += rsize.Height;
+            }
+
+            return (size);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region MeasureVerticalLegend
+
+        private Size MeasureVerticalLegend(
+            ChartLayoutInfo layoutInfo, ChartLegendVisualStyle style)
+        {
+            Size size = Size.Empty;
+
+            Rectangle layoutBounds = layoutInfo.LayoutBounds;
+            Rectangle bounds = GetAdjustedBounds(layoutBounds, style.BorderThickness);
+
+            layoutInfo.LayoutBounds = bounds;
+
+            for (int i = 0; i < _LegendItems.Count; i++)
+            {
+                ChartLegendItem li = _LegendItems[i];
+
+                li.Parent = this;
+                li.Measure(layoutInfo);
+
+                size.Height += li.Size.Height;
+
+                if (li.Size.Width > size.Width)
+                    size.Width = li.Size.Width;
+            }
+
+            size.Height += (Dpi.Height(style.VerticalSpacing) * (_LegendItems.Count - 1));
+
+            return (size);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region AlignLegend
+
+        private Rectangle AlignLegend(
+            ChartLayoutInfo layoutInfo, Rectangle bounds, ChartLegendVisualStyle style)
+        {
+            Rectangle layoutBounds = layoutInfo.LayoutBounds;
+
+            bool inside = (Placement == Placement.Inside || Alignment == Alignment.MiddleCenter);
+
+            if (inside == false)
+            {
+                switch (Alignment)
+                {
+                    case Alignment.TopLeft:
+                    case Alignment.MiddleLeft:
+                    case Alignment.BottomLeft:
+                        layoutBounds.X += bounds.Width;
+                        layoutBounds.Width -= bounds.Width;
+                        break;
+
+                    case Alignment.TopCenter:
+                        layoutBounds.Y += bounds.Height;
+                        layoutBounds.Height -= bounds.Height;
+                        break;
+
+                    case Alignment.BottomCenter:
+                        layoutBounds.Height -= bounds.Height;
+                        break;
+
+                    case Alignment.NotSet:
+                    case Alignment.TopRight:
+                    case Alignment.MiddleRight:
+                    case Alignment.BottomRight:
+                        layoutBounds.Width -= bounds.Width;
+                        break;
+                }
+            }
+
+            switch (Alignment)
+            {
+                case Alignment.MiddleLeft:
+                    bounds.Y += (layoutBounds.Height - bounds.Height) / 2;
+                    break;
+
+                case Alignment.BottomLeft:
+                    bounds.Y = layoutBounds.Bottom - bounds.Height;
+                    break;
+
+                case Alignment.TopCenter:
+                    bounds.X += (layoutBounds.Width - bounds.Width) / 2;
+                    break;
+
+                case Alignment.MiddleCenter:
+                    bounds.X += (layoutBounds.Width - bounds.Width) / 2;
+                    bounds.Y += (layoutBounds.Height - bounds.Height) / 2;
+                    break;
+
+                case Alignment.BottomCenter:
+                    bounds.X += (layoutBounds.Width - bounds.Width) / 2;
+                    bounds.Y = layoutBounds.Bottom - (inside ? bounds.Height : 0);
+                    break;
+
+                case Alignment.TopRight:
+                    bounds.X = layoutBounds.Right - (inside ? bounds.Width : 0);
+                    break;
+
+                case Alignment.MiddleRight:
+                    bounds.X = layoutBounds.Right - (inside ? bounds.Width : 0);
+                    bounds.Y += (layoutBounds.Height - bounds.Height) / 2;
+                    break;
+
+                case Alignment.NotSet:
+                case Alignment.BottomRight:
+                    bounds.X = layoutBounds.Right - (inside ? bounds.Width : 0);
+                    bounds.Y = layoutBounds.Bottom - bounds.Height;
+                    break;
+            }
+
+            layoutBounds.Width = Math.Max(0, layoutBounds.Width);
+            layoutBounds.Height = Math.Max(0, layoutBounds.Height);
+
+            layoutInfo.LayoutBounds = layoutBounds;
+
+            return (bounds);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ArrangeOverride
+
+        protected override void ArrangeOverride(ChartLayoutInfo layoutInfo)
+        {
+            ChartLegendVisualStyle style = _EffectiveStyles[StyleState.Default];
+
+            if (_LegendMeasured == true)
+            {
+                PostAlignLegend(style);
+
+                _LegendMeasured = false;
+            }
+
+            if (_LegendItems != null && _LegendItems.Count > 0)
+            {
+                Rectangle layoutBounds = layoutInfo.LayoutBounds;
+
+                switch (Direction)
+                {
+                    case Direction.LeftToRight:
+                    case Direction.RightToLeft:
+                        AlignHorizontalLegendItems(layoutInfo, style);
+                        break;
+
+                    case Direction.TopToBottom:
+                    case Direction.BottomToTop:
+                        AlignVerticalLegendItems(layoutInfo, style);
+                        break;
+
+                    default:
+                        switch (Alignment)
+                        {
+                            case Alignment.TopCenter:
+                            case Alignment.MiddleCenter:
+                            case Alignment.BottomCenter:
+                                AlignHorizontalLegendItems(layoutInfo, style);
+                                break;
+
+                            default:
+                                AlignVerticalLegendItems(layoutInfo, style);
+                                break;
+                        }
+                        break;
+                }
+
+                layoutInfo.LayoutBounds = layoutBounds;
+            }
+
+            UpdateScrollBars(layoutInfo);
+        }
+
+        #region AlignHorizontalLegendItems
+
+        private void AlignHorizontalLegendItems(
+            ChartLayoutInfo layoutInfo, ChartLegendVisualStyle style)
+        {
+            Rectangle bounds = _ContentBounds;
+            Rectangle layoutBounds = bounds;
+
+            Rectangle scContentBounds = GetScrollBounds(_ContentBounds);
+
+            int verticalSpacing = Dpi.Height(style.VerticalSpacing);
+            int horizontalSpacing = Dpi.Width(style.HorizontalSpacing);
+
+            layoutInfo.ScrollOffset.Y += VScrollOffset;
+
+            for (int i = 0; i < _LegendItems.Count; i++)
+            {
+                int index = (Direction == Direction.RightToLeft) ? (_LegendItems.Count - i - 1) : i;
+
+                ChartLegendItem item = _LegendItems[index];
+
+                if (bounds.X + item.Size.Width > layoutBounds.Right)
+                {
+                    if (bounds.X > layoutBounds.X)
+                    {
+                        bounds.X = layoutBounds.X;
+                        bounds.Y += (bounds.Height + verticalSpacing);
+                    }
+                }
+
+                bounds.Width = item.Size.Width;
+                bounds.Height = item.Size.Height;
+
+                layoutInfo.LayoutBounds = bounds;
+
+                item.Arrange(layoutInfo);
+
+                item.Displayed = item.Bounds.IntersectsWith(scContentBounds);
+
+                bounds.X += (item.Size.Width + horizontalSpacing);
+
+                item.UpdateCheckState();
+            }
+
+            layoutInfo.ScrollOffset.Y -= VScrollOffset;
+        }
+
+        #endregion
+
+        #region AlignVerticalLegendItems
+
+        private void AlignVerticalLegendItems(
+            ChartLayoutInfo layoutInfo, ChartLegendVisualStyle style)
+        {
+            Rectangle bounds = _ContentBounds;
+            Rectangle scContentBounds = GetScrollBounds(ContentBounds);
+
+            int verticalSpacing = Dpi.Height(style.VerticalSpacing);
+
+            layoutInfo.ScrollOffset.Y += VScrollOffset;
+
+            for (int i = 0; i < _LegendItems.Count; i++)
+            {
+                int index = (Direction == Direction.BottomToTop) ? (_LegendItems.Count - i - 1) : i;
+
+                ChartLegendItem item = _LegendItems[index];
+
+                bounds.Height = item.Size.Height;
+                layoutInfo.LayoutBounds = bounds;
+
+                item.Arrange(layoutInfo);
+
+                item.Displayed = item.Bounds.IntersectsWith(scContentBounds);
+
+                bounds.Y += (item.Size.Height + verticalSpacing);
+
+                item.UpdateCheckState();
+            }
+
+            layoutInfo.ScrollOffset.Y -= VScrollOffset;
+        }
+
+        #endregion
+
+        #region PostAlignLegend
+
+        private void PostAlignLegend(ChartLegendVisualStyle style)
+        {
+            if (Placement == Placement.Inside)
+            {
+                ChartContainer cc = Parent as ChartContainer;
+
+                Rectangle r = BoundsRelative;
+
+                if (cc.HScrollBar.Visible == true)
+                {
+                    switch (Alignment)
+                    {
+                        case Alignment.NotSet:
+                        case Alignment.BottomLeft:
+                        case Alignment.BottomCenter:
+                        case Alignment.BottomRight:
+                            if (r.Bottom > cc.HScrollBar.BoundsRelative.Top)
+                                r.Y -= (r.Bottom - cc.HScrollBar.BoundsRelative.Top);
+                            break;
+                    }
+                }
+
+                if (cc.VScrollBar.Visible == true)
+                {
+                    switch (Alignment)
+                    {
+                        case Alignment.NotSet:
+                        case Alignment.TopRight:
+                        case Alignment.MiddleRight:
+                        case Alignment.BottomRight:
+                            if (r.Right > cc.VScrollBar.BoundsRelative.Left)
+                                r.X -= (r.Right - cc.VScrollBar.BoundsRelative.Left);
+                            break;
+                    }
+                }
+
+                if (BoundsRelative != r)
+                {
+                    BoundsRelative = r;
+
+                    _FrameBounds = GetAdjustedBounds(BoundsRelative, style.Margin);
+                    _ContentBounds = GetAdjustedBounds(_FrameBounds, style.BorderThickness);
+                    _ContentBounds = GetAdjustedBounds(_ContentBounds, style.Padding);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderOverride
+
+        protected override void RenderOverride(ChartRenderInfo renderInfo)
+        {
+            Graphics g = renderInfo.Graphics;
+
+            Rectangle bounds = Bounds;
+            Rectangle scFrameBounds = GetScrollBounds(_FrameBounds);
+            Rectangle scContentBounds = GetScrollBounds(_ContentBounds);
+
+            if (scContentBounds.Height > 2 & scContentBounds.Width > 2)
+            {
+                ChartLegendVisualStyle style = GetEffectiveStyle();
+
+                style.RenderBackground(g, scFrameBounds);
+
+                if (style.ImageOverlay != ImageOverlay.Top)
+                    style.RenderBackgroundFigure(g, scFrameBounds);
+
+                style.RenderBorder(g, scFrameBounds);
+
+                if (_LegendItems != null && _LegendItems.Count > 0)
+                {
+                    Region clip = g.Clip;
+                    g.SetClip(scContentBounds, CombineMode.Intersect);
+
+                    Point pt = scContentBounds.Location;
+
+                    for (int i = 0; i < _LegendItems.Count; i++)
+                    {
+                        ChartLegendItem li = _LegendItems[i];
+
+                        if (li.Visible == true)
+                            li.Render(renderInfo);
+                    }
+
+                    if (VScrollBar.Visible == true)
+                        VScrollBar.Render(renderInfo);
+
+                    if (style.ImageOverlay == ImageOverlay.Top)
+                        style.RenderBackgroundFigure(g, scFrameBounds);
+
+                    g.Clip = clip;
+
+                    if (style.DropShadow.Enabled == Tbool.True)
+                        style.DropShadow.RenderDropShadow(g, scFrameBounds, true, true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region Mouse handling
+
+        #region OnMouseEnter
+
+        protected override bool OnMouseEnter(EventArgs e)
+        {
+            base.OnMouseEnter(e);
+
+            return (true);
+        }
+
+        #endregion
+
+        #region OnMouseLeave
+
+        protected override bool OnMouseLeave(EventArgs e)
+        {
+            base.OnMouseLeave(e);
+
+            return (true);
+        }
+
+        #endregion
+
+        #region OnMouseMove
+
+        protected override bool OnMouseMove(MouseEventArgs e)
+        {
+            base.OnMouseMove(e);
+
+            _HitArea = GetLegendAreaAt(e.Location);
+
+            if (IsMouseDown == true)
+                return (OnMouseDownMove(e));
+
+            if (EnablePanning == true && VScrollBar.Enabled == true)
+            {
+                ChartCursor = OpenHandCursor;
+
+                return (true);
+            }
+
+            ChartCursor = Cursors.Default;
+
+            return (false);
+        }
+
+        #region OnMouseDownMove
+
+        private bool OnMouseDownMove(MouseEventArgs e)
+        {
+            if (_Panning == true)
+            {
+                ChartCursor = ClosedHandCursor;
+
+                if (VScrollBar.Enabled == true)
+                    VScrollOffset = _VPanOffset + (MouseDownPoint.Y - e.Location.Y);
+            }
+
+            return (true);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region OnMouseDown
+
+        protected override bool OnMouseDown(MouseEventArgs e)
+        {
+            return (OnMouseDownEx(e));
+        }
+
+        protected override bool OnMouseDownEx(MouseEventArgs e)
+        {
+            if (EnablePanning == true && VScrollBar.Visible == true)
+            {
+                _VPanOffset = VScrollOffset;
+
+                _Panning = true;
+
+                ChartCursor = ClosedHandCursor;
+                ChartControl.PostInternalMouseMove();
+
+                ChartControl.CapturedItem = this;
+
+                return (true);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region OnMouseUp
+
+        protected override bool OnMouseUp(MouseEventArgs e)
+        {
+            base.OnMouseUp(e);
+
+            if (_Panning == true)
+            {
+                _Panning = false;
+
+                ChartControl.CapturedItem = null;
+            }
+
+            return (true);
+        }
+
+        #endregion
+
+        #region OnMouseWheel
+
+        protected override bool OnMouseWheel(MouseEventArgs e)
+        {
+            if (VScrollBar.Enabled == true)
+            {
+                if ((e.Delta < 0 && VScrollBar.IsAtMaxumum == false) ||
+                    (e.Delta > 0 && VScrollBar.IsAtMinumum == false))
+                {
+                    int value = -e.Delta * SystemInformation.MouseWheelScrollLines / 120;
+
+                    value *= VScrollBar.SmallChange;
+                    value += VScrollBar.Value;
+
+                    SetVScrollValue(value);
+
+                    return (true);
+                }
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Scrollbar support
+
+        #region SetupScrollBars
+
+        private void SetupScrollBars()
+        {
+            _VScrollBar = new VScrollBarLite();
+
+            _VScrollBar.Parent = this;
+            _VScrollBar.Width = Dpi.Width(_VScrollBarWidth);
+
+            _VScrollBar.Visible = false;
+        }
+
+        #endregion
+
+        #region UpdateScrollBars
+
+        private void UpdateScrollBars(ChartLayoutInfo layoutInfo)
+        {
+            EnableVScrollBar();
+
+            if (_VScrollBar.Enabled == true)
+            {
+                _VScrollBar.SmallChange = ContentBounds.Height / 20;
+                _VScrollBar.Maximum = Math.Max(0, ContentBoundsEx.Height);
+                _VScrollBar.LargeChange = Math.Min(ContentBounds.Height, _VScrollBar.Maximum);
+
+                if (_VScrollBar.Value + _VScrollBar.LargeChange > _VScrollBar.Maximum)
+                    _VScrollBar.Value = _VScrollBar.Maximum - _VScrollBar.LargeChange;
+
+                _VScrollBar.Arrange(layoutInfo);
+            }
+        }
+
+        #region EnableVScrollBar
+
+        private void EnableVScrollBar()
+        {
+            bool enable = (VScrollBarVisible == true) &&
+                (ContentBounds.Height > 0 && ContentBoundsEx.Height > ContentBounds.Height);
+
+            if (enable == true)
+            {
+                _VScrollBar.Height = ContentBounds.Height - 1;
+                _VScrollBar.Width = Dpi.Width(_VScrollBarWidth);
+
+                _VScrollBar.Location = new
+                    Point(ContentBounds.Right - _VScrollBar.Width - 1, ContentBounds.Top);
+
+            }
+            else
+            {
+                _VScrollBar.Value = 0;
+            }
+
+            _VScrollBar.Enabled = enable;
+            _VScrollBar.Visible = enable;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region SetVScrollValue
+
+        internal void SetVScrollValue(int value)
+        {
+            if (_VScrollBar.Visible == true)
+            {
+                int oldValue = _VScrollBar.Value;
+
+                value = Math.Max(value, 0);
+                value = Math.Min(value, _VScrollBar.Maximum);
+
+                _VScrollBar.Value = value;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetElementAt
+
+        /// <summary>
+        /// Gets the legend element at the given Point.
+        /// </summary>
+        /// <param name="pt"></param>
+        /// <returns></returns>
+        public override ChartVisualElement GetElementAt(Point pt)
+        {
+            if (InScrollBar(VScrollBar, pt))
+                return (VScrollBar);
+
+            if (_LegendItems != null)
+            {
+                foreach (ChartLegendItem item in _LegendItems)
+                {
+                    if (item != null && item.Visible == true && item.IsEnabled == true)
+                    {
+                        if (item.Bounds.Contains(pt))
+                        {
+                            ChartVisualElement subItem = item.GetElementAt(pt);
+
+                            if (subItem != null)
+                                return (subItem);
+
+                            return (item);
+                        }
+                    }
+                }
+            }
+
+            return (null);
+        }
+
+        #region InScrollBar
+
+        private bool InScrollBar(ScrollBarLite scrollBar, Point pt)
+        {
+            if (scrollBar != null && scrollBar.Visible == true)
+            {
+                if (scrollBar.Bounds.Contains(pt))
+                    return (true);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetLegendAreaAt
+
+        private LegendArea GetLegendAreaAt(Point pt)
+        {
+            if ((Bounds.Contains(pt) == false || Visible == false))
+                return (LegendArea.None);
+
+            ChartVisualElement item = GetElementAt(pt);
+
+            if (item != null)
+            {
+                if (item is ScrollBarLite)
+                    return (LegendArea.ScrollBar);
+
+                return (LegendArea.LegendItem);
+            }
+
+            return (LegendArea.WhiteSpace);
+        }
+
+        #endregion
+
+        #region InvalidateItem
+
+        internal void InvalidateItem(ChartLegendItem item)
+        {
+            ChartLegendItem likeItem = FindLikeItem(item);
+
+            if (likeItem != null && likeItem.Legend != item.Legend)
+            {
+                likeItem.UpdateCheckState();
+                likeItem.InvalidateRender();
+            }
+        }
+
+        #endregion
+
+        #region FindLikeItem
+
+        private ChartLegendItem FindLikeItem(ChartLegendItem item)
+        {
+            if (_LegendItems != null)
+            {
+                string itemName = item.Name ?? item.ItemText;
+
+                if (String.IsNullOrEmpty(itemName) == false)
+                {
+                    foreach (ChartLegendItem likeItem in _LegendItems)
+                    {
+                        string likeName = likeItem.Name ?? likeItem.ItemText;
+
+                        if (String.IsNullOrEmpty(likeName) == false)
+                        {
+                            if (likeName.Equals(itemName) == true)
+                                return (likeItem);
+                        }
+                    }
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetLegendItem
+
+        /// <summary>
+        /// Gets the LegendItem from the given chart item.
+        /// </summary>
+        /// <param name="chartItem"></param>
+        /// <returns></returns>
+        public ChartLegendItem GetLegendItem(ILegendItem chartItem)
+        {
+            if (LegendItems != null)
+            {
+                foreach (ChartLegendItem litem in LegendItems)
+                {
+                    foreach (ILegendItem citem in litem.ChartItems)
+                    {
+                        if (citem == chartItem)
+                            return (litem);
+                    }
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region Style Support
+
+        #region GetEffectiveStyle
+
+        internal ChartLegendVisualStyle GetEffectiveStyle()
+        {
+            StyleState state = StyleState.Default;
+
+            if (IsMouseOver == true)
+            {
+                state |= StyleState.MouseOver;
+            }
+            else
+            {
+                Point pt = Control.MousePosition;
+
+                pt = ChartControl.PointToClient(pt);
+
+                if (Bounds.Contains(pt))
+                    state |= StyleState.MouseOver;
+            }
+
+            return (EffectiveStyles[state]);
+        }
+
+        #endregion
+
+        #region ApplyStyles
+
+        public override void ApplyStyles(BaseVisualStyle style, StyleType cs)
+        {
+            ChartLegendVisualStyle lstyle = style as ChartLegendVisualStyle;
+
+            if (lstyle != null)
+            {
+                ApplyParentStyles(lstyle, cs, Parent as ChartContainer);
+
+                lstyle.ApplyStyle(ChartLegendVisualStyles[cs]);
+            }
+        }
+
+        #region ApplyParentStyles
+
+        private void ApplyParentStyles(
+            ChartLegendVisualStyle lstyle, StyleType cs, ChartContainer item)
+        {
+            if (item != null)
+            {
+                ApplyParentStyles(lstyle, cs, item.Parent as ChartContainer);
+
+                if (item is ChartPanel)
+                    lstyle.ApplyStyle(((ChartPanel)item).DefaultVisualStyles.ChartLegendVisualStyles[cs]);
+            }
+            else
+            {
+                lstyle.ApplyStyle(ChartControl.BaseVisualStyles.ChartLegendVisualStyles[cs]);
+                lstyle.ApplyStyle(ChartControl.DefaultVisualStyles.ChartLegendVisualStyles[cs]);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ApplyDefaults
+
+        public override void ApplyDefaults(BaseVisualStyle style, StyleType cs)
+        {
+            ChartLegendVisualStyle lstyle = style as ChartLegendVisualStyle;
+
+            if (lstyle != null)
+                lstyle.ApplyDefaults();
+
+            base.ApplyDefaults(style, cs);
+        }
+
+        #endregion
+
+        #region InvalidateStyle
+
+        ///<summary>
+        ///Invalidate the cached Style
+        ///</summary>
+        public void InvalidateStyle()
+        {
+            ClearEffectiveStyles();
+        }
+
+        #endregion
+
+        #region ClearEffectiveStyles
+
+        protected override void ClearEffectiveStyles()
+        {
+            EffectiveStyles.InvalidateStyles();
+            EffectiveItemStyles.InvalidateStyles();
+
+            if (_LegendItems != null)
+            {
+                for (int i = 0; i < _LegendItems.Count; i++)
+                    _LegendItems[i].EffectiveStyles.InvalidateStyles();
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Copy/CopyTo
+
+        public override ChartVisualElement Copy()
+        {
+            ChartLegend copy = new ChartLegend();
+
+            CopyTo(copy);
+
+            return (copy);
+        }
+
+        public override void CopyTo(ChartVisualElement copy)
+        {
+            ChartLegend c = copy as ChartLegend;
+
+            if (c != null)
+            {
+                base.CopyTo(c);
+
+                c.Alignment = Alignment;
+                c.AlignVerticalItems = AlignVerticalItems;
+
+                c.ChartLegendItemVisualStyles =
+                    (_ChartLegendItemVisualStyles != null) ? ChartLegendItemVisualStyles.Copy() : null;
+
+                c.ChartLegendVisualStyles =
+                    (_ChartLegendVisualStyles != null) ? ChartLegendVisualStyles.Copy() : null;
+
+                c.CheckBoxSize = CheckBoxSize;
+                c.CombineLikeItems = CombineLikeItems;
+                c.Direction = Direction;
+                c.EnablePanning = EnablePanning;
+
+                c.ItemCheckAction = ItemCheckAction;
+                c.ItemSortDirection = ItemSortDirection;
+                c.ItemTextOffset = ItemTextOffset;
+
+                c.MarkerSize = MarkerSize;
+
+                c.MaxHorizontalPct = MaxHorizontalPct;
+                c.MaxVerticalPct = MaxVerticalPct;
+                c.MinContentSize = MinContentSize;
+
+                c.Placement = Placement;
+
+                c.ShowCheckBoxes = ShowCheckBoxes;
+                c.ShowItemText = ShowItemText;
+                c.ShowMarkers = ShowMarkers;
+
+                c.ShowPieRingCheckBoxes = ShowPieRingCheckBoxes;
+                c.ShowPieSeriesCheckBoxes = ShowPieSeriesCheckBoxes;
+                c.ShowPieSeriesPointCheckBoxes = ShowPieSeriesPointCheckBoxes;
+
+                c.ShowPieRingsInLegend = ShowPieRingsInLegend;
+                c.ShowPieSeriesInLegend = ShowPieSeriesInLegend;
+                c.ShowPieSeriesPointsInLegend = ShowPieSeriesPointsInLegend;
+
+                c.TrackingMode = TrackingMode;
+
+                c.VScrollBarWidth = VScrollBarWidth;
+                c.VScrollBarVisible = VScrollBarVisible;
+            }
+        }
+
+        #endregion
+
+        #region GetSerialData
+
+        internal override SerialElementCollection GetSerialData(string serialName)
+        {
+            SerialElementCollection sec = new SerialElementCollection();
+
+            if (serialName != null)
+            {
+                if (serialName.Equals("") == true)
+                    serialName = "ChartLegend";
+
+                sec.AddStartElement(serialName);
+            }
+
+            sec.AddValue("Alignment", Alignment, Alignment.NotSet);
+            sec.AddValue("AlignVerticalItems", AlignVerticalItems, false);
+
+            if (_ChartLegendItemVisualStyles != null && _ChartLegendItemVisualStyles.IsEmpty == false)
+                sec.AddElement(_ChartLegendItemVisualStyles.GetSerialData("ChartLegendItemVisualStyles"));
+
+            if (_ChartLegendVisualStyles != null && _ChartLegendVisualStyles.IsEmpty == false)
+                sec.AddElement(_ChartLegendVisualStyles.GetSerialData("ChartLegendVisualStyles"));
+
+            sec.AddValue("CheckBoxSize", CheckBoxSize, new Size(15, 15));
+            sec.AddValue("CombineLikeItems", CombineLikeItems, true);
+            sec.AddValue("Direction", Direction, Direction.NotSet);
+            sec.AddValue("EnablePanning", EnablePanning, true);
+
+            sec.AddValue("ItemCheckAction", ItemCheckAction, ItemCheckAction.ShowItem);
+            sec.AddValue("ItemSortDirection", ItemSortDirection, SortDirection.None);
+            sec.AddValue("ItemTextOffset", ItemTextOffset, 2);
+
+            sec.AddValue("MarkerSize", MarkerSize, new Size(15, 15));
+            sec.AddValue("MaxHorizontalPct", MaxHorizontalPct, 100d);
+            sec.AddValue("MaxVerticalPct", MaxVerticalPct, 100d);
+            sec.AddValue("MinContentSize", MinContentSize, new Size(15, 15));
+            sec.AddValue("Placement", Placement, Placement.NotSet);
+
+            sec.AddValue("ShowCheckBoxes", ShowCheckBoxes, false);
+            sec.AddValue("ShowItemText", ShowItemText, true);
+            sec.AddValue("ShowMarkers", ShowMarkers, true);
+
+            sec.AddValue("ShowPieRingCheckBoxes", ShowPieRingCheckBoxes, Tbool.NotSet);
+            sec.AddValue("ShowPieSeriesCheckBoxes", ShowPieSeriesCheckBoxes, Tbool.NotSet);
+            sec.AddValue("ShowPieSeriesPointCheckBoxes", ShowPieSeriesPointCheckBoxes, Tbool.NotSet);
+
+            sec.AddValue("ShowPieRingsInLegend", ShowPieRingsInLegend, false);
+            sec.AddValue("ShowPieSeriesInLegend", ShowPieSeriesInLegend, false);
+            sec.AddValue("ShowPieSeriesPointsInLegend", ShowPieSeriesPointsInLegend, true);
+
+            sec.AddValue("TrackingMode", TrackingMode, LegendTrackingMode.NotSet);
+
+            if (_VScrollBar != null)
+                sec.AddElement(_VScrollBar.GetSerialData("VScrollBar"));
+
+            sec.AddValue("VScrollBarWidth", VScrollBarWidth, 9);
+            sec.AddValue("VScrollBarVisible", VScrollBarVisible, true);
+
+            // Don't call base, due to 'Visible' default differences
+            // between ChartPanel and ChartXy elements.
+
+            sec.AddValue("Name", Name, String.Empty);
+            sec.AddValue("Tag", Tag, null);
+            sec.AddValue("Visible", Visible, Parent is BaseChart);
+
+            if (serialName != null)
+                sec.AddEndElement(serialName);
+
+            return (sec);
+        }
+
+        #endregion
+
+        #region PutSerialData
+
+        #region ProcessValue
+
+        internal override void ProcessValue(SerialElement se)
+        {
+            switch (se.Name)
+            {
+                case "Alignment":
+                    Alignment = (Alignment)se.GetValueEnum(typeof(Alignment));
+                    break;
+
+                case "AlignVerticalItems":
+                    AlignVerticalItems = bool.Parse(se.StringValue);
+                    break;
+
+                case "CheckBoxSize":
+                    CheckBoxSize = se.GetValueSize();
+                    break;
+
+                case "CombineLikeItems":
+                    CombineLikeItems = bool.Parse(se.StringValue);
+                    break;
+
+                case "Direction":
+                    Direction = (Direction)se.GetValueEnum(typeof(Direction));
+                    break;
+
+                case "EnablePanning":
+                    EnablePanning = bool.Parse(se.StringValue);
+                    break;
+
+                case "ItemCheckAction":
+                    ItemCheckAction = (ItemCheckAction)se.GetValueEnum(typeof(ItemCheckAction));
+                    break;
+
+                case "ItemSortDirection":
+                    ItemSortDirection = (SortDirection)se.GetValueEnum(typeof(SortDirection));
+                    break;
+
+                case "ItemTextOffset":
+                    ItemTextOffset = int.Parse(se.StringValue);
+                    break;
+
+                case "MarkerSize":
+                    MarkerSize = se.GetValueSize();
+                    break;
+
+                case "MaxHorizontalPct":
+                    MaxHorizontalPct = double.Parse(se.StringValue);
+                    break;
+
+                case "MaxVerticalPct":
+                    MaxVerticalPct = double.Parse(se.StringValue);
+                    break;
+
+                case "MinContentSize":
+                    MinContentSize = se.GetValueSize();
+                    break;
+
+                case "Placement":
+                    Placement = (Placement)se.GetValueEnum(typeof(Placement));
+                    break;
+
+                case "ShowCheckBoxes":
+                    ShowCheckBoxes = bool.Parse(se.StringValue);
+                    break;
+
+                case "ShowItemText":
+                    ShowItemText = bool.Parse(se.StringValue);
+                    break;
+
+                case "ShowMarkers":
+                    ShowMarkers = bool.Parse(se.StringValue);
+                    break;
+
+                case "ShowPieRingCheckBoxes":
+                    ShowPieRingCheckBoxes = (Tbool)se.GetValueEnum(typeof(Tbool));
+                    break;
+
+                case "ShowPieSeriesCheckBoxes":
+                    ShowPieSeriesCheckBoxes = (Tbool)se.GetValueEnum(typeof(Tbool));
+                    break;
+
+                case "ShowPieSeriesPointCheckBoxes":
+                    ShowPieSeriesPointCheckBoxes = (Tbool)se.GetValueEnum(typeof(Tbool));
+                    break;
+
+                case "ShowPieRingsInLegend":
+                    ShowPieRingsInLegend = bool.Parse(se.StringValue);
+                    break;
+
+                case "ShowPieSeriesInLegend":
+                    ShowPieSeriesInLegend = bool.Parse(se.StringValue);
+                    break;
+
+                case "ShowPieSeriesPointsInLegend":
+                    ShowPieSeriesPointsInLegend = bool.Parse(se.StringValue);
+                    break;
+
+                case "TrackingMode":
+                    TrackingMode = (LegendTrackingMode)se.GetValueEnum(typeof(LegendTrackingMode));
+                    break;
+
+                case "VScrollBarWidth":
+                    VScrollBarWidth = int.Parse(se.StringValue);
+                    break;
+
+                case "VScrollBarVisible":
+                    VScrollBarVisible = bool.Parse(se.StringValue);
+                    break;
+
+                default:
+                    base.ProcessValue(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region ProcessCollection
+
+        internal override void ProcessCollection(SerialElement se)
+        {
+            SerialElementCollection sec = se.Sec;
+
+            switch (se.Name)
+            {
+                case "ChartLegendItemVisualStyles":
+                    sec.PutSerialData(ChartLegendItemVisualStyles);
+                    break;
+
+                case "ChartLegendVisualStyles":
+                    sec.PutSerialData(ChartLegendVisualStyles);
+                    break;
+
+                case "VScrollBar":
+                    sec.PutSerialData(VScrollBar);
+                    break;
+
+                default:
+                    base.ProcessCollection(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region States
+
+        [Flags]
+        private enum States : uint
+        {
+            AlignVerticalItems = (1U << 0),
+
+            VScrollBarEnabled = (1U << 1),
+            VScrollBarVisible = (1U << 2),
+
+            EnablePanning = (1U << 3),
+
+            ShowCheckBoxes = (1U << 4),
+
+            ShowPieSeriesInLegend = (1U << 5),
+            ShowPieRingsInLegend = (1U << 6),
+            ShowPieSeriesPointsInLegend = (1U << 7),
+
+            ShowMarkers = (1U << 8),
+            ShowItemText = (1U << 9),
+
+            CombineLikeItems = (1U << 10),
+        }
+
+        #region TestState
+
+        private bool TestState(States state)
+        {
+            return ((_States & state) == state);
+        }
+
+        #endregion
+
+        #region SetState
+
+        private void SetState(States state, bool value)
+        {
+            if (value == true)
+                _States |= state;
+            else
+                _States &= ~state;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IDisposable
+
+        public override void Dispose()
+        {
+            ChartLegendItemVisualStyles = null;
+            ChartLegendVisualStyles = null;
+            LegendItems = null;
+
+            base.Dispose();
+        }
+
+        #endregion
+    }
+
+    #region enums
+
+    #region Direction
+
+    /// <summary>
+    /// Specifies how the legend items are presented.
+    /// </summary>
+    public enum Direction
+    {
+        NotSet = 0,
+
+        LeftToRight,
+        RightToLeft,
+        TopToBottom,
+        BottomToTop,
+    }
+
+    #endregion
+
+    #region ItemCheckAction
+
+    public enum ItemCheckAction
+    {
+        /// <summary>
+        /// No action is taken.
+        /// </summary>
+        None,
+
+        /// <summary>
+        /// Item will be shown or hidden, depending
+        /// upon the check state of the item.
+        /// </summary>
+        ShowItem,
+    }
+
+    #endregion
+
+    #region LegendArea
+
+    public enum LegendArea
+    {
+        None = 0,
+
+        // In a legend item.
+        LegendItem,
+
+        // In legend scrollbar.
+        ScrollBar,
+
+        // In legend whitespace.
+        WhiteSpace,
+    }
+
+    #endregion
+
+    #region Placement
+
+    /// <summary>
+    /// Specifies the placement of the element with respect
+    /// to the chart contents.
+    /// </summary>
+    public enum Placement
+    {
+        NotSet = 0,
+
+        Inside,
+        Outside,
+    }
+
+    #endregion
+
+    #endregion
+
+    #region Interfaces
+
+    #region ILegendData
+
+    internal interface ILegendData
+    {
+        ChartLegend Legend { get; }
+        List<ChartLegendItem> GetLegendData();
+    }
+
+    #endregion
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/ChartLegendItem.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/ChartLegendItem.cs
new file mode 100644
index 00000000..8851b1ab
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/ChartLegendItem.cs	
@@ -0,0 +1,1505 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.Charts.Style;
+
+namespace DevComponents.DotNetBar.Charts
+{
+    /// <summary>
+    /// Represents an item in the chart Legend.
+    /// </summary>
+    public class ChartLegendItem : ChartVisualElement
+    {
+        #region Private variables
+
+        private States _States;
+
+        private List<ILegendItem> _ChartItems;
+        private ChartLegendItem _LikeItem;
+
+        private Tbool _ShowCheckBox = Tbool.NotSet;
+        private Tbool _ShowItemText = Tbool.NotSet;
+        private Tbool _ShowMarker = Tbool.NotSet;
+        private Tbool _ShowInParentLegend = Tbool.NotSet;
+
+        private ChartLegendItemVisualStyles _ChartLegendItemVisualStyles;
+        private EffectiveStyles<ChartLegendItemVisualStyle> _EffectiveStyles;
+
+        private Size _MarkerSize;
+        private Size _TextSize;
+
+        private Rectangle _MarkerBounds;
+
+        private string _ItemText;
+        private string _FormattedText;
+
+        private LegendItemArea _HitArea;
+        private LegendItemArea _MouseDownHitArea;
+
+        private CheckState _CheckState = CheckState.Unchecked;
+        private bool _InCheckStateUpdate;
+
+        #endregion
+
+        public ChartLegendItem()
+        {
+            InitDefaultStates();
+
+            _EffectiveStyles = new EffectiveStyles<ChartLegendItemVisualStyle>(this);
+        }
+
+        #region InitDefaultStates
+
+        private void InitDefaultStates()
+        {
+            SetState(States.IsEnabled, true);
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region ChartItems
+
+        /// <summary>
+        /// Gets or sets the referenced Chart items.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public List<ILegendItem> ChartItems
+        {
+            get
+            {
+                if (_ChartItems == null)
+                    _ChartItems = new List<ILegendItem>();
+
+                return (_ChartItems);
+            }
+
+            set
+            {
+                if (value != ChartItems)
+                {
+                    _ChartItems = value;
+
+                    OnPropertyChangedEx("ChartItems", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ChartLegendItemVisualStyles
+
+        /// <summary>
+        /// Gets or sets the visual styles for the Legend item.
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates the visual styles for the Legend item.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ChartLegendItemVisualStyles ChartLegendItemVisualStyles
+        {
+            get
+            {
+                if (_ChartLegendItemVisualStyles == null)
+                {
+                    _ChartLegendItemVisualStyles = new ChartLegendItemVisualStyles();
+
+                    StyleVisualChangeHandler(null, _ChartLegendItemVisualStyles);
+                }
+
+                return (_ChartLegendItemVisualStyles);
+            }
+
+            set
+            {
+                if (_ChartLegendItemVisualStyles != value)
+                {
+                    ChartLegendItemVisualStyles oldValue = _ChartLegendItemVisualStyles;
+
+                    _ChartLegendItemVisualStyles = value;
+
+                    OnStyleChanged("ChartLegendItemVisualStyles", oldValue, value);
+
+                    if (oldValue != null)
+                        oldValue.Dispose();
+                }
+            }
+        }
+
+        #endregion
+
+        #region CheckState
+
+        /// <summary>
+        /// Gets or sets whether the item's checkbox is checked.
+        /// </summary>
+        [DefaultValue(CheckState.Unchecked), Category("Appearance")]
+        [Description("Indicates whether the item's checkbox is checked.")]
+        public CheckState CheckState
+        {
+            get { return (_CheckState); }
+
+            set
+            {
+                if (value != _CheckState)
+                {
+                    _CheckState = value;
+
+                    UpdateChartItemsCheckState();
+
+                    OnPropertyChangedEx("CheckState", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region EffectiveStyles
+
+        /// <summary>
+        /// Gets a reference to the item's Effective (cached, composite) styles.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public EffectiveStyles<ChartLegendItemVisualStyle> EffectiveStyles
+        {
+            get { return (_EffectiveStyles); }
+        }
+
+        #endregion
+
+        #region ItemText
+
+        /// <summary>
+        /// Gets or sets the item Text.
+        /// </summary>
+        [DefaultValue(null), Category("Appearance")]
+        [Description("Indicates the item Text.")]
+        public string ItemText
+        {
+            get { return (_ItemText); }
+
+            set
+            {
+                if (value != _ItemText)
+                {
+                    _ItemText = value;
+
+                    OnPropertyChangedEx("ItemText", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ItemTextBounds
+
+        /// <summary>
+        /// Gets the Item's Text bounds
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public Rectangle ItemTextBounds
+        {
+            get
+            {
+                Rectangle bounds = Bounds;
+
+                int n = _MarkerSize.Width + Dpi.Width(Legend.ItemTextOffset);
+
+                bounds.X += n;
+                bounds.Width -= n;
+
+                return (bounds);
+            }
+        }
+
+        #endregion
+
+        #region Legend
+
+        /// <summary>
+        /// Gets the associated ChartLegend
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public ChartLegend Legend
+        {
+            get { return (Parent as ChartLegend); }
+        }
+
+        #endregion
+
+        #region MarkerBounds
+
+        /// <summary>
+        /// Gets the Marker bounds
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public Rectangle MarkerBounds
+        {
+            get { return (_MarkerBounds); }
+        }
+
+        #endregion
+
+        #region ShowCheckBox
+
+        /// <summary>
+        /// Gets or sets whether the item CheckBox is shown in the Legend.
+        /// </summary>
+        [DefaultValue(Tbool.NotSet), Category("Appearance")]
+        [Description("Indicates whether the item CheckBox is shown in the Legend.")]
+        public Tbool ShowCheckBox
+        {
+            get { return (_ShowCheckBox); }
+
+            set
+            {
+                if (value != _ShowCheckBox)
+                {
+                    _ShowCheckBox = value;
+
+                    OnPropertyChangedEx("ShowCheckBox", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowInParentLegend
+
+        /// <summary>
+        /// Gets or sets whether the item is shown in parent Legend(s).
+        /// </summary>
+        [DefaultValue(Tbool.NotSet), Category("Layout")]
+        [Description("Indicates whether the item is shown in parent Legend(s).")]
+        public Tbool ShowInParentLegend
+        {
+            get { return (_ShowInParentLegend); }
+
+            set
+            {
+                if (value != _ShowInParentLegend)
+                {
+                    _ShowInParentLegend = value;
+
+                    OnPropertyChangedEx("ShowInParentLegend", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowItemText
+
+        /// <summary>
+        /// Gets or sets whether the item text is shown in the Legend.
+        /// </summary>
+        [DefaultValue(Tbool.NotSet), Category("Appearance")]
+        [Description("Indicates whether the item text is shown in the Legend.")]
+        public Tbool ShowItemText
+        {
+            get { return (_ShowItemText); }
+
+            set
+            {
+                if (value != _ShowItemText)
+                {
+                    _ShowItemText = value;
+
+                    OnPropertyChangedEx("ShowItemText", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowMarker
+
+        /// <summary>
+        /// Gets or sets whether the item Marker is shown in the Legend.
+        /// </summary>
+        [DefaultValue(Tbool.NotSet), Category("Appearance")]
+        [Description("Indicates whether the item Marker is shown in the Legend.")]
+        public Tbool ShowMarker
+        {
+            get { return (_ShowMarker); }
+
+            set
+            {
+                if (value != _ShowMarker)
+                {
+                    _ShowMarker = value;
+
+                    OnPropertyChangedEx("ShowMarker", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region FormattedText
+
+        internal string FormattedText
+        {
+            get { return (_FormattedText); }
+            set { _FormattedText = value; }
+        }
+
+        #endregion
+
+        #region IsEnabled
+
+        internal bool IsEnabled
+        {
+            get { return (TestState(States.IsEnabled)); }
+            set { SetState(States.IsEnabled, value); }
+        }
+
+        #endregion
+
+        #region IsHitItem
+
+        internal bool IsHitItem
+        {
+            get { return (TestState(States.IsHitItem)); }
+            set { SetState(States.IsHitItem, value); }
+        }
+
+        #endregion
+
+        #region IsLegendHitItem
+
+        internal bool IsLegendHitItem
+        {
+            get { return (TestState(States.IsLegendHitItem)); }
+            set { SetState(States.IsLegendHitItem, value); }
+        }
+
+        #endregion
+
+        #region LikeItem
+
+        internal ChartLegendItem LikeItem
+        {
+            get { return (_LikeItem ?? this); }
+            set { _LikeItem = value; }
+        }
+
+        #endregion
+
+        #region TextWrapped
+
+        internal bool TextWrapped
+        {
+            get { return (TestState(States.TextWrapped)); }
+            set { SetState(States.TextWrapped, value); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region MeasureOverride
+
+        protected override void MeasureOverride(ChartLayoutInfo layoutInfo)
+        {
+            BoundsRelative = layoutInfo.LayoutBounds;
+
+            ChartLegend cl = Parent as ChartLegend;
+
+            if (cl != null)
+            {
+                Size sizeNeeded = Size.Empty;
+                Rectangle layoutBounds = layoutInfo.LayoutBounds;
+
+                ChartLegendItemVisualStyle style = EffectiveStyles[StyleType.Default];
+
+                if (cl.ShowMarkers == true || cl.ShowCheckBoxes == true)
+                {
+                    Size size = MeasureMarker(layoutInfo, cl);
+
+                    sizeNeeded.Width += (size.Width + Dpi.Width2);
+
+                    if (cl.ShowItemText == true)
+                        sizeNeeded.Width += Dpi.Width(cl.ItemTextOffset);
+
+                    sizeNeeded.Height = size.Height;
+
+                    layoutInfo.LayoutBounds.Width -= sizeNeeded.Width;
+                }
+
+                _TextSize = Size.Empty;
+
+                if (cl.ShowItemText == true)
+                {
+                    Size size = MeasureItemText(layoutInfo, cl, style);
+
+                    sizeNeeded.Width += size.Width;
+
+                    if (size.Height > sizeNeeded.Height)
+                        sizeNeeded.Height = size.Height;
+                }
+
+                layoutInfo.LayoutBounds = layoutBounds;
+
+                Size = sizeNeeded;
+            }
+        }
+
+        #region MeasureMarker
+
+        private Size MeasureMarker(ChartLayoutInfo layoutInfo, ChartLegend legend)
+        {
+            _MarkerSize = Size.Empty;
+
+            if (legend.ShowCheckBoxes == true)
+                _MarkerSize = Dpi.Size(legend.CheckBoxSize);
+
+            if (legend.ShowMarkers == true)
+            {
+                Size msize = Dpi.Size(legend.MarkerSize);
+
+                _MarkerSize.Width = Math.Max(_MarkerSize.Width, msize.Width);
+                _MarkerSize.Height = Math.Max(_MarkerSize.Height, msize.Height);
+            }
+
+            return (_MarkerSize);
+        }
+
+        #endregion
+
+        #region MeasureItemText
+
+        private Size MeasureItemText(
+            ChartLayoutInfo layoutInfo, ChartLegend legend, ChartLegendItemVisualStyle style)
+        {
+            if (legend.ShowItemText == true && (ShowItemText != Tbool.False))
+            {
+                Graphics g = layoutInfo.Graphics;
+
+                string text = GetItemText();
+
+                if (string.IsNullOrEmpty(text) == false)
+                {
+                    using (StringFormat sf = new StringFormat())
+                    {
+                        style.GetStringFormatFlags(sf);
+
+                        Size size = layoutInfo.LayoutBounds.Size;
+
+                        _TextSize = g.MeasureString(text, style.Font, size, sf).ToSize();
+                    }
+                }
+
+                _TextSize.Width++;
+                _TextSize.Height++;
+
+                TextWrapped = false;
+
+                if (style.MaxLineCount > 1)
+                {
+                    if (_TextSize.Height > style.Font.Height + 2)
+                    {
+                        if (text.Contains("\n") == false)
+                            TextWrapped = true;
+                    }
+
+                    int lineHeight = style.Font.Height * style.MaxLineCount;
+
+                    if (_TextSize.Height > lineHeight)
+                        _TextSize.Height = lineHeight;
+                }
+            }
+
+            return (_TextSize);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ArrangeOverride
+
+        protected override void ArrangeOverride(ChartLayoutInfo layoutInfo)
+        {
+            BoundsRelative = layoutInfo.LayoutBounds;
+
+            Rectangle bounds = Bounds;
+            _MarkerBounds = bounds;
+
+            _MarkerBounds.X += Dpi.Width2;
+
+            if (_MarkerSize.IsEmpty == false)
+            {
+                _MarkerBounds.Size = _MarkerSize;
+
+                ChartLegend legend = Legend;
+
+                if (legend != null)
+                {
+                    if (bounds.Height > _MarkerBounds.Height)
+                        _MarkerBounds.Y += (bounds.Height - _MarkerBounds.Height) / 2;
+                }
+            }
+            else
+            {
+                _MarkerBounds.Size = Size.Empty;
+            }
+        }
+
+        #endregion
+
+        #region RenderOverride
+
+        protected override void RenderOverride(ChartRenderInfo renderInfo)
+        {
+            ChartLegend legend = Parent as ChartLegend;
+
+            if (legend != null)
+            {
+                Graphics g = renderInfo.Graphics;
+                Rectangle bounds = Bounds;
+
+                bool showCheckBoxes = (CanShowCheckBox(legend) == true);
+
+                StyleState state = (IsMouseOver == true || IsHitItem == true)
+                    ? StyleState.MouseOver : StyleState.Default;
+
+                if (showCheckBoxes == true)
+                {
+                    if (CheckState != CheckState.Unchecked)
+                        state |= StyleState.Selected;
+                }
+
+                ChartLegendItemVisualStyle istyle = EffectiveStyles[state];
+                Color dcolor = GetLegendItemColor(legend, istyle);
+
+                if (istyle.Background.IsEmpty == false)
+                {
+                    using (Brush br = istyle.Background.GetBrush(bounds))
+                        g.FillRectangle(br, bounds);
+                }
+
+                if (_MarkerSize.IsEmpty == false)
+                {
+                    if (CanShowCheckBox(legend) == true)
+                        RenderCheckBox(g, istyle, dcolor);
+
+                    else if (CanShowMarker(legend) == true)
+                        RenderMarker(g, istyle);
+
+                    int n = _MarkerSize.Width;
+
+                    if (_TextSize.IsEmpty == false)
+                        n += Dpi.Width(legend.ItemTextOffset);
+
+                    bounds.X += n;
+                    bounds.Width -= n;
+                }
+
+                if (_TextSize.IsEmpty == false)
+                    RenderItemText(g, bounds, istyle, dcolor);
+            }
+        }
+
+        #region RenderCheckBox
+
+        private void RenderCheckBox(Graphics g,
+            ChartLegendItemVisualStyle istyle, Color dcolor)
+        {
+            if (_HitArea != LegendItemArea.CheckBox)
+                istyle = EffectiveStyles[StyleState.Default];
+
+            Rectangle r = _MarkerBounds;
+            r.Inflate(-1, -1);
+
+            Background background = istyle.CheckBoxBackground;
+
+            if (background.IsEmpty == false)
+            {
+                using (Brush br = background.GetBrush(r))
+                    g.FillRectangle(br, r);
+            }
+
+            Color color = GetCheckBoxBorderColor(istyle, dcolor);
+            
+            using (Pen pen = new Pen(color, Dpi.Width1))
+                g.DrawRectangle(pen, r);
+
+            color = GetCheckBoxCheckColor(istyle, dcolor);
+
+            Rectangle t = r;
+            t.Inflate(-Dpi.Width2, -Dpi.Width2);
+
+            float fx = (float)t.Width / Dpi.Width9;
+            float fy = (float)t.Height / Dpi.Width9;
+
+            switch (_CheckState)
+            {
+                case CheckState.Checked:
+                    SmoothingMode sm = g.SmoothingMode;
+                    g.SmoothingMode = SmoothingMode.AntiAlias;
+
+                    Point pt1 = new Point(t.X + (int)(fx), t.Y + (int)(fy * Dpi.Width4));
+                    Point pt2 = new Point(t.X + (int)(fx * Dpi.Width3), t.Bottom - Dpi.Width2);
+                    Point pt3 = new Point(t.Right - Dpi.Width1, t.Y + (int)fy);
+
+                    using (Pen pen = new Pen(color, Dpi.Width2))
+                        g.DrawLines(pen, new Point[] { pt1, pt2, pt3 });
+
+                    g.SmoothingMode = sm;
+                    break;
+
+                case CheckState.Indeterminate:
+                    Rectangle z = t;
+                    z.Inflate(-(int)fx, -(int)fy);
+                    z.Width += Dpi.Width1;
+                    z.Height += Dpi.Width1;
+
+                    using (Brush br = new SolidBrush(color))
+                        g.FillRectangle(br, z);
+                    break;
+            }
+        }
+
+        #region GetCheckBoxCheckColor
+
+        private Color GetCheckBoxCheckColor(
+            ChartLegendItemVisualStyle istyle, Color dcolor)
+        {
+            Color color = istyle.CheckBoxCheckColor;
+
+            if (color.IsEmpty == true)
+                color = dcolor;
+
+            return (color);
+        }
+
+        #endregion
+
+        #region GetCheckBoxBorderColor
+
+        private Color GetCheckBoxBorderColor(
+            ChartLegendItemVisualStyle istyle, Color dcolor)
+        {
+            Color color = istyle.CheckBoxBorderColor;
+
+            if (color.IsEmpty == true)
+                color = dcolor;
+            
+            return (color);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderMarker
+
+        private void RenderMarker(Graphics g, ChartLegendItemVisualStyle istyle)
+        {
+            if (istyle.MarkerVisualStyle.IsEmpty == false)
+            {
+                Color color = GetLegendItemColor(Legend, istyle);
+
+                istyle.MarkerVisualStyle.RenderMarker(g, Legend.PointMarker, MarkerBounds, color);
+            }
+            else
+            {
+                if (ChartItems.Count > 0)
+                {
+                    ILegendItem item = ChartItems[0];
+
+                    item.RenderLegendItemMarker(g, this, istyle);
+                }
+            }
+        }
+
+        #endregion
+
+        #region RenderItemText
+
+        private void RenderItemText(Graphics g,
+            Rectangle bounds, ChartLegendItemVisualStyle istyle, Color dcolor)
+        {
+            bounds.Y++;
+
+            string text = GetItemText();
+
+            using (StringFormat sf = new StringFormat())
+            {
+                istyle.GetStringFormatFlags(sf);
+
+                Color color = istyle.TextColor;
+
+                if (color.IsEmpty == true)
+                    color = dcolor;
+
+                using (Brush br = new SolidBrush(color))
+                    g.DrawString(text, istyle.Font, br, bounds, sf);
+            }
+        }
+
+        #endregion
+
+        #region GetLegendItemColor
+
+        private Color GetLegendItemColor(ChartLegend legend, ChartLegendItemVisualStyle istyle)
+        {
+            if (IsEnabled == true)
+            {
+                Color color = istyle.TextColor;
+
+                if (color.IsEmpty == false)
+                    return (color);
+
+                if (ChartItems.Count > 0)
+                {
+                    color = ChartItems[0].LegendItem.EffectiveStyles[StyleType.Default].TextColor;
+
+                    if (color.IsEmpty == true)
+                        color = ChartItems[0].GetLegendItemColor();
+                }
+
+                if (color.IsEmpty == true)
+                    color = Color.DimGray;
+                else
+                    color = Color.FromArgb(255, color);
+
+                return (color);
+            }
+            else
+            {
+                Color color = istyle.DisabledTextColor;
+
+                if (color.IsEmpty == true)
+                    color = Color.Silver;
+
+                return (color);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Mouse handling
+
+        #region OnMouseEnter
+
+        protected override bool OnMouseEnter(EventArgs e)
+        {
+            base.OnMouseEnter(e);
+
+            InvalidateRender();
+            InvalidateChartItems(true);
+
+            return (true);
+        }
+
+        #endregion
+
+        #region OnMouseLeave
+
+        protected override bool OnMouseLeave(EventArgs e)
+        {
+            base.OnMouseLeave(e);
+
+            InvalidateRender();
+            InvalidateChartItems(false);
+
+            return (true);
+        }
+
+        #endregion
+
+        #region InvalidateChartItems
+
+        private void InvalidateChartItems(bool isHitItem)
+        {
+            IsLegendHitItem = isHitItem;
+
+            foreach (ILegendItem item in ChartItems)
+            {
+                ILegendItemEx itemEx = item as ILegendItemEx;
+
+                if (itemEx != null)
+                {
+                    if (itemEx.TrackLegendItem == true)
+                    {
+                        if (item is PieRing)
+                        {
+                            PieRing pieRing = (PieRing)item;
+
+                            foreach (PieSeriesPoint psp in pieRing.Psps)
+                            {
+                                psp.LegendItem.IsLegendHitItem = isHitItem;
+                                psp.InvalidateRender();
+                            }
+                        }
+                        else
+                        {
+                            item.LegendItem.IsLegendHitItem = isHitItem;
+                            itemEx.InvalidateRender();
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region OnMouseMove
+
+        protected override bool OnMouseMove(MouseEventArgs e)
+        {
+            LegendItemArea area = GetItemAreaAt(e.Location);
+
+            if (_HitArea != area)
+                InvalidateRender();
+
+            _HitArea = area;
+
+            if (_HitArea == LegendItemArea.CheckBox)
+            {
+                ChartCursor = Cursors.Hand;
+                
+                return (true);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region OnMouseDown
+
+        protected override bool OnMouseDown(MouseEventArgs e)
+        {
+            base.OnMouseDown(e);
+
+            _MouseDownHitArea = _HitArea;
+
+            if (_HitArea == LegendItemArea.CheckBox)
+            {
+                ChartControl.CapturedItem = this;
+
+                return (true);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region OnMouseUp
+
+        protected override bool OnMouseUp(MouseEventArgs e)
+        {
+            base.OnMouseUp(e);
+
+            if (_HitArea == LegendItemArea.CheckBox && 
+                _MouseDownHitArea == LegendItemArea.CheckBox)
+            {
+                switch (CheckState)
+                {
+                    case CheckState.Checked:
+                        CheckState = CheckState.Unchecked;
+                        break;
+
+                    default:
+                        CheckState = CheckState.Checked;
+                        break;
+                }
+
+                ChartControl.CapturedItem = null;
+
+                InvalidateDisplay();
+            }
+
+            return (true);
+        }
+
+        #region UpdateChartItemsCheckState
+
+        private void UpdateChartItemsCheckState()
+        {
+            if (_InCheckStateUpdate == false)
+            {
+                _InCheckStateUpdate = true;
+
+                if (CheckState != CheckState.Indeterminate)
+                {
+                    foreach (ILegendItem item in ChartItems)
+                        item.CheckedInLegend = (CheckState == CheckState.Checked);
+                }
+
+                if (ChartControl != null)
+                    ChartControl.DoLegendItemCheckedChangedEvent(Legend, this);
+
+                _InCheckStateUpdate = false;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region GetItemText
+
+        private string GetItemText()
+        {
+            string text = GetItemTextEx();
+
+            if (string.IsNullOrEmpty(text) == false)
+            {
+                if (ChartItems.Count > 0)
+                {
+                    if (ChartItems[0] is ILegendItemEx)
+                    {
+                        ILegendItemEx itemEx = (ILegendItemEx)ChartItems[0];
+
+                        text = itemEx.FormatItemText(text);
+                    }
+                }
+            }
+
+            return (text);
+        }
+
+        #region GetItemTextEx
+
+        private string GetItemTextEx()
+        {
+            if (String.IsNullOrEmpty(_ItemText) == false)
+                return (_ItemText);
+
+            foreach (ILegendItem item in _ChartItems)
+            {
+                if (String.IsNullOrEmpty(item.LegendText) == false)
+                    return (item.LegendText);
+            }
+
+            if (_ChartItems.Count > 0)
+            {
+                if (String.IsNullOrEmpty(_ChartItems[0].Name) == false)
+                    return (_ChartItems[0].Name);
+            }
+
+            if (String.IsNullOrEmpty(Name) == false)
+                return (Name);
+
+            return ("");
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetItemAreaAt
+
+        private LegendItemArea GetItemAreaAt(Point pt)
+        {
+            if (Bounds.Contains(pt) == true)
+            {
+                if (_MarkerBounds.Contains(pt))
+                {
+                    ChartLegend legend = Parent as ChartLegend;
+
+                    if (CanShowCheckBox(legend) == true)
+                        return (LegendItemArea.CheckBox);
+
+                    return (LegendItemArea.Marker);
+                }
+
+                if (pt.X > _MarkerBounds.Right)
+                    return (LegendItemArea.ItemText);
+            }
+
+            return (LegendItemArea.None);
+        }
+
+        #endregion
+
+        #region Style Support
+
+        #region ApplyStyles
+
+        public override void ApplyStyles(BaseVisualStyle style, StyleType cs)
+        {
+            ChartLegendItemVisualStyle lstyle = style as ChartLegendItemVisualStyle;
+
+            if (lstyle != null)
+            {
+                ApplyParentStyles(lstyle, cs, Parent as ChartVisualElement);
+
+                lstyle.ApplyStyle(ChartLegendItemVisualStyles[cs]);
+
+                if (ChartItems.Count > 0 && ChartItems[0] != null)
+                    lstyle.ApplyStyle(ChartItems[0].ChartLegendItemVisualStyles[cs]);
+            }
+        }
+
+        #region ApplyParentStyles
+
+        private void ApplyParentStyles(
+            ChartLegendItemVisualStyle lstyle, StyleType cs, ChartVisualElement item)
+        {
+            if (item != null)
+            {
+                ApplyParentStyles(lstyle, cs, item.Parent as ChartVisualElement);
+
+                if (item is ChartLegend)
+                    lstyle.ApplyStyle(((ChartLegend)item).ChartLegendItemVisualStyles[cs]);
+
+                else if (item is ChartPanel)
+                    lstyle.ApplyStyle(((ChartPanel)item).DefaultVisualStyles.ChartLegendItemVisualStyles[cs]);
+            }
+            else
+            {
+                lstyle.ApplyStyle(ChartControl.BaseVisualStyles.ChartLegendItemVisualStyles[cs]);
+                lstyle.ApplyStyle(ChartControl.DefaultVisualStyles.ChartLegendItemVisualStyles[cs]);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ApplyDefaults
+
+        public override void ApplyDefaults(BaseVisualStyle style, StyleType cs)
+        {
+            ChartLegendItemVisualStyle lstyle = style as ChartLegendItemVisualStyle;
+
+            if (lstyle != null)
+            {
+                if (lstyle.MaxLineCount <= 0)
+                    lstyle.MaxLineCount = 2;
+
+                if (lstyle.Font == null)
+                    lstyle.Font = SystemFonts.DefaultFont;
+            }
+
+            base.ApplyDefaults(style, cs);
+        }
+
+        #endregion
+
+        #region InvalidateStyle
+
+        ///<summary>
+        ///Invalidate the cached Styles
+        ///</summary>
+        public void InvalidateStyle()
+        {
+            ClearEffectiveStyles();
+        }
+
+        #endregion
+
+        #region ClearEffectiveStyles
+
+        protected override void ClearEffectiveStyles()
+        {
+            base.ClearEffectiveStyles();
+
+            EffectiveStyles.InvalidateStyles();
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InvalidateDisplay
+
+        private void InvalidateDisplay()
+        {
+            ChartContainer cc = ParentChartContainer;
+
+            if (cc != null)
+            {
+                cc.InvalidateRender(GetScrollBounds(cc.ContentBounds));
+                cc.InvalidateLayoutBounds(null);
+            }
+
+            while (cc != null)
+            {
+                ILegendData ld = cc as ILegendData;
+
+                if (ld != null)
+                {
+                    ChartLegend legend = ld.Legend;
+
+                    if (legend != null)
+                    {
+                        if (CanShowInParentLegend(legend) == true)
+                            legend.InvalidateItem(this);
+                    }
+                }
+
+                cc = cc.ParentChartContainer;
+            }
+        }
+
+        #endregion
+
+        #region UpdateCheckState
+
+        internal void UpdateCheckState()
+        {
+            if (_InCheckStateUpdate == false)
+            {
+                _InCheckStateUpdate = true;
+
+                if (ChartItems.Count > 0)
+                {
+                    CheckState checkState = CheckState.Unchecked;
+
+                    for (int i = 0; i < ChartItems.Count; i++)
+                    {
+                        ILegendItem chartItem = ChartItems[i];
+
+                        CheckState ics = chartItem.CheckedInLegend ? CheckState.Checked : CheckState.Unchecked;
+
+                        if (i == 0)
+                        {
+                            checkState = ics;
+                        }
+                        else
+                        {
+                            if (checkState != ics)
+                            {
+                                checkState = CheckState.Indeterminate;
+                                break;
+                            }
+                        }
+                    }
+
+                    if (CheckState != checkState)
+                    {
+                        CheckState = checkState;
+
+                        InvalidateDisplay();
+                    }
+                }
+
+                _InCheckStateUpdate = false;
+            }
+        }
+
+        #endregion
+
+        #region CanShowCheckBox
+
+        private bool CanShowCheckBox(ChartLegend legend)
+        {
+            if (legend.ShowCheckBoxes == true)
+            {
+                if (ShowCheckBox != Tbool.NotSet)
+                {
+                    bool show = (ShowCheckBox == Tbool.False ? false : true);
+
+                    if (ChartItems.Count > 0)
+                        ChartItems[0].ShowCheckBoxInLegend = show;
+
+                    return (show);
+                }
+
+                if (ChartItems.Count > 0)
+                    return (ChartItems[0].ShowCheckBoxInLegend);
+
+                return (true);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region CanShowMarker
+
+        private bool CanShowMarker(ChartLegend legend)
+        {
+            if (legend.ShowMarkers == true)
+            {
+                if (ShowMarker == Tbool.NotSet)
+                {
+                    if (ChartItems.Count > 0)
+                        return (ChartItems[0].ShowMarkerInLegend);
+                }
+
+                return (ShowMarker == Tbool.False ? false : true);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region CanShowInParentLegend
+
+        private bool CanShowInParentLegend(ChartLegend legend)
+        {
+            if (ChartItems.Count > 0)
+            {
+                if (ShowInParentLegend == Tbool.NotSet)
+                    return (ChartItems[0].ShowInParentLegend);
+
+                return (ShowInParentLegend == Tbool.False ? false : true);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region Copy/CopyTo
+
+        public override ChartVisualElement Copy()
+        {
+            ChartLegendItem copy = new ChartLegendItem();
+
+            CopyTo(copy);
+
+            return (copy);
+        }
+
+        public override void CopyTo(ChartVisualElement copy)
+        {
+            ChartLegendItem c = copy as ChartLegendItem;
+
+            if (c != null)
+            {
+                base.CopyTo(c);
+
+                c.ChartLegendItemVisualStyles =
+                    (_ChartLegendItemVisualStyles != null) ? ChartLegendItemVisualStyles.Copy() : null;
+
+                c.CheckState = CheckState;
+                c.ItemText = ItemText;
+                c.ShowCheckBox = ShowCheckBox;
+                c.ShowInParentLegend = ShowInParentLegend;
+                c.ShowItemText = ShowItemText;
+                c.ShowMarker = ShowMarker;
+            }
+        }
+
+        #endregion
+
+        #region GetSerialData
+
+        internal override SerialElementCollection GetSerialData(string serialName)
+        {
+            SerialElementCollection sec = new SerialElementCollection();
+
+            if (serialName != null)
+            {
+                if (serialName.Equals("") == true)
+                    serialName = "BaseChart";
+
+                sec.AddStartElement(serialName);
+            }
+
+            if (_ChartLegendItemVisualStyles != null)
+                sec.AddElement(_ChartLegendItemVisualStyles.GetSerialData("ChartLegendItemVisualStyles"));
+
+            sec.AddValue("CheckState", CheckState, CheckState.Unchecked);
+            sec.AddValue("ItemText", ItemText, null);
+            sec.AddValue("ShowCheckBox", ShowCheckBox, Tbool.NotSet);
+            sec.AddValue("ShowInParentLegend", ShowInParentLegend, Tbool.NotSet);
+            sec.AddValue("ShowItemText", ShowItemText, Tbool.NotSet);
+            sec.AddValue("ShowMarker", ShowMarker, Tbool.NotSet);
+
+            sec.AddElement(base.GetSerialData(null));
+
+            if (serialName != null)
+                sec.AddEndElement(serialName);
+
+            return (sec);
+        }
+
+        #endregion
+
+        #region PutSerialData
+
+        #region ProcessValue
+
+        internal override void ProcessValue(SerialElement se)
+        {
+            switch (se.Name)
+            {
+                case "CheckState":
+                    CheckState = (CheckState)se.GetValueEnum(typeof(CheckState));
+                    break;
+
+                case "ItemText":
+                    ItemText = se.StringValue;
+                    break;
+
+                case "ShowCheckBox":
+                    ShowCheckBox = (Tbool)se.GetValueEnum(typeof(Tbool));
+                    break;
+
+                case "ShowInParentLegend":
+                    ShowInParentLegend = (Tbool)se.GetValueEnum(typeof(Tbool));
+                    break;
+
+                case "ShowItemText":
+                    ShowItemText = (Tbool)se.GetValueEnum(typeof(Tbool));
+                    break;
+
+                case "ShowMarker":
+                    ShowMarker = (Tbool)se.GetValueEnum(typeof(Tbool));
+                    break;
+
+                default:
+                    base.ProcessValue(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region ProcessCollection
+
+        internal override void ProcessCollection(SerialElement se)
+        {
+            SerialElementCollection sec = se.Sec;
+
+            switch (se.Name)
+            {
+                case "ChartLegendItemVisualStyles":
+                    sec.PutSerialData(ChartLegendItemVisualStyles);
+                    break;
+
+                default:
+                    base.ProcessCollection(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region States
+
+        [Flags]
+        private enum States : uint
+        {
+            IsEnabled = (1U << 0),
+
+            IsHitItem = (1 << 1),
+            IsLegendHitItem = (1 << 2),
+
+            TextWrapped = (1U << 3),
+        }
+
+        #region TestState
+
+        private bool TestState(States state)
+        {
+            return ((_States & state) == state);
+        }
+
+        #endregion
+
+        #region SetState
+
+        private void SetState(States state, bool value)
+        {
+            if (value == true)
+                _States |= state;
+            else
+                _States &= ~state;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IDisposable
+
+        public override void Dispose()
+        {
+            ChartLegendItemVisualStyles = null;
+
+            base.Dispose();
+        }
+
+        #endregion
+    }
+
+    #region enums
+
+    #region LegendItemArea
+
+    public enum LegendItemArea
+    {
+        None = 0,
+
+        CheckBox,
+        ItemText,
+        Marker,
+    }
+
+    #endregion
+
+    #endregion
+
+    #region Interfaces
+
+    #region ILegendItem
+
+    public interface ILegendItem
+    {
+        string Name { get; set; }
+        string LegendText { get; set; }
+
+        ChartLegendItem LegendItem { get; }
+        ChartLegendItem GetLegendItem();
+        List<ChartLegendItem> GetLegendItems();
+
+        Color GetLegendItemColor();
+
+        bool ShowInLegend { get; set; }
+        bool ShowInParentLegend { get; set; }
+        bool ShowCheckBoxInLegend { get; set; }
+        bool ShowMarkerInLegend { get; set; }
+        bool CheckedInLegend { get; set; }
+
+        void RenderLegendItemMarker(Graphics g, ChartLegendItem item, ChartLegendItemVisualStyle style);
+
+        ChartLegendItemVisualStyles ChartLegendItemVisualStyles { get; set; }
+    }
+
+    #endregion
+
+    #region ILegendItem
+
+    internal interface ILegendItemEx
+    {
+        bool TrackLegendItem { get; }
+
+        void InvalidateRender();
+        string FormatItemText(string text);
+    }
+
+    #endregion
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/ChartMatrix.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/ChartMatrix.cs
new file mode 100644
index 00000000..13f85e6a
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/ChartMatrix.cs	
@@ -0,0 +1,1046 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Charts
+{
+    [TypeConverter(typeof(BlankExpandableObjectConverter))]
+    public class ChartMatrix : IProcessSerialElement
+    {
+        #region Private variables
+
+        private States _States;
+
+        private int _Width;
+        private int _Height;
+
+        private ChartContainer[,] _LocalArray;
+        private Rectangle[,] _BoundsArray;
+
+        private Point _ScrollOffset;
+
+        private MatrixRowColProperties[] _ColumnProperties;
+        private MatrixRowColProperties[] _RowProperties;
+
+        private Size _DefaultCellSize = new Size(100, 100);
+
+        private AutoSizeMode _AutoSizeMode = AutoSizeMode.NotSet;
+        private DividerLines _DividerLines = DividerLines.NotSet;
+
+        private ChartContainer _Parent;
+
+        #endregion
+
+        #region Constructors
+
+        public ChartMatrix()
+            : this(0, 0)
+        {
+        }
+
+        public ChartMatrix(Size size)
+            : this(size.Width, size.Height)
+        {
+        }
+
+        public ChartMatrix(int width, int height)
+        {
+            CreateMatrix(width, height);
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region AutoSizeMode
+
+        ///<summary>
+        /// Gets or sets the default mode used to size each matrix row/col (by FillWeight, etc).
+        ///</summary>
+        [DefaultValue(AutoSizeMode.NotSet), Category("Layout")]
+        [Description("Indicates the default mode used to size each matrix row/col (by FillWeight, etc).")]
+        public AutoSizeMode AutoSizeMode
+        {
+            get { return (_AutoSizeMode); }
+
+            set
+            {
+                if (value != _AutoSizeMode)
+                {
+                    _AutoSizeMode = value;
+
+                    OnPropertyChanged("AutoSizeMode");
+                }
+            }
+        }
+
+        #endregion
+
+        #region ColumnProperties
+
+        /// <summary>
+        /// Get a reference to the matrix column properties.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public MatrixRowColProperties[] ColumnProperties
+        {
+            get { return (_ColumnProperties);  }
+        }
+
+        #endregion
+
+        #region DefaultCellSize
+
+        ///<summary>
+        /// Gets or sets the default minimum size for each matrix cell.
+        ///</summary>
+        [ Category("Layout")]
+        [Description("Indicates the default minimum size for each matrix cell.")]
+        public Size DefaultCellSize
+        {
+            get { return (_DefaultCellSize); }
+
+            set
+            {
+                if (value != _DefaultCellSize)
+                {
+                    _DefaultCellSize = value;
+
+                    OnPropertyChanged("DefaultCellSize");
+                }
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        internal virtual bool ShouldSerializeDefaultCellSize()
+        {
+            return (_DefaultCellSize != new Size(100, 100));
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        internal virtual void ResetDefaultCellSize()
+        {
+            DefaultCellSize = new Size(100, 100);
+        }
+
+        #endregion
+
+        #region DividerLines
+
+        /// <summary>
+        /// Gets or sets which Divider lines (horizontal and/or vertical)
+        /// are displayed between each Matrix cell.
+        /// </summary>
+        [DefaultValue(DividerLines.NotSet), Category("Appearance")]
+        [Description("Indicates which Divider lines (horizontal and/or vertical) are displayed between each Matrix cell.")]
+        public DividerLines DividerLines
+        {
+            get { return (_DividerLines); }
+
+            set
+            {
+                if (_DividerLines != value)
+                {
+                    _DividerLines = value;
+
+                    OnPropertyChanged("DividerLines");
+                }
+            }
+        }
+
+        #endregion
+
+        #region Indexer [,]
+
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public ChartContainer this[int x, int y]
+        {
+            get
+            {
+                ValidateXandY(x, y);
+
+                return (_LocalArray[x, y]);
+            }
+
+            internal set
+            {
+                ValidateXandY(x, y);
+
+                if (value is IComparable == true)
+                {
+                    if (((IComparable)value).CompareTo(_LocalArray[x, y]) == 0)
+                        return;
+                }
+
+                _LocalArray[x, y] = value;
+
+                if (value != null)
+                    value.Parent = Parent;
+
+                OnPropertyChanged("Value");
+            }
+        }
+
+        #endregion
+
+        #region Indexer []
+
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public ChartContainer this[int xy]
+        {
+            get
+            {
+                ValidateXY(xy);
+
+                int y = xy / _Width;
+                int x = xy % _Width;
+
+                return (this[x, y]);
+            }
+
+            internal set
+            {
+                ValidateXY(xy);
+
+                int y = xy / _Width;
+                int x = xy % _Width;
+
+                this[x, y] = value;
+
+                OnPropertyChanged("Value");
+            }
+        }
+
+        #endregion
+
+        #region IsEmpty
+
+        /// <summary>
+        /// Gets whether the matrix is empty.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsEmpty
+        {
+            get
+            {
+                for (int i = 0; i < _Width; i++)
+                {
+                    for (int j = 0; j < _Height; j++)
+                    {
+                        if (_LocalArray[i, j] != null)
+                            return (false);
+                    }
+                }
+
+                return (true);
+            }
+        }
+
+        #endregion
+
+        #region Height
+
+        /// <summary>
+        /// Gets or sets the matrix height.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public int Height
+        {
+            get { return (_Height); }
+
+            set
+            {
+                if (value != _Height)
+                {
+                    _Height = value;
+
+                    CreateMatrix(_Width, _Height);
+
+                    OnPropertyChanged("Height");
+                }
+            }
+        }
+
+        #endregion
+
+        #region RowProperties
+
+        /// <summary>
+        /// Get a reference to the matrix row properties.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public MatrixRowColProperties[] RowProperties
+        {
+            get { return (_RowProperties); }
+        }
+
+        #endregion
+
+        #region Size
+
+        /// <summary>
+        /// Gets or sets the matrix size.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public Size Size
+        {
+            get
+            {
+                int x = _Width;
+                int y = _Height;
+
+                return (new Size(x, y));
+            }
+
+            set
+            {
+                if (value.Width != _Width || value.Height != _Height)
+                {
+                    int x = value.Width;
+                    int y = value.Height;
+
+                    CreateMatrix(x, y);
+
+                    OnPropertyChanged("Size");
+                }
+            }
+        }
+
+        #endregion
+
+        #region Width
+
+        /// <summary>
+        /// Gets or sets the matrix width.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public int Width
+        {
+            get { return (_Width); }
+
+            set
+            {
+                if (value != _Width)
+                {
+                    _Width = value;
+
+                    CreateMatrix(_Width, _Height);
+
+                    OnPropertyChanged("Width");
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region BoundsArray
+
+        internal Rectangle[,] BoundsArray
+        {
+            get { return (_BoundsArray); }
+        }
+
+        #endregion
+
+        #region Parent
+
+        internal ChartContainer Parent
+        {
+            get { return (_Parent); }
+            set { _Parent = value; }
+        }
+
+        #endregion
+
+        #region ScrollOffset
+
+        internal Point ScrollOffset
+        {
+            get { return (_ScrollOffset); }
+            set { _ScrollOffset = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ValidateXandY
+
+        protected void ValidateXandY(int x, int y)
+        {
+            if ((uint)x >= _Width)
+                throw new IndexOutOfRangeException("Invalid 'x' value.");
+
+            if ((uint)y >= _Height)
+                throw new IndexOutOfRangeException("Invalid 'y' value.");
+        }
+
+        #endregion
+
+        #region ValidateXY
+
+        protected void ValidateXY(int xy)
+        {
+            int xyMax = _Width * _Height;
+
+            if (xy >= xyMax)
+                throw new IndexOutOfRangeException("Invalid 'xy' value.");
+        }
+
+        #endregion
+
+        #region CreateMatrix
+
+        private void CreateMatrix(int width, int height)
+        {
+            if (width < 0)
+                throw new Exception("Width cannot be negative");
+
+            if (height < 0)
+                throw new Exception("Heigth cannot be negative");
+
+            _Width = width;
+            _Height = height;
+
+            _LocalArray = new ChartContainer[width, height];
+            _BoundsArray = new Rectangle[width, height];
+
+            CreateProperties(ref _RowProperties, height);
+            CreateProperties(ref _ColumnProperties, width);
+        }
+
+        #endregion
+
+        #region CreateProperties
+
+        private void CreateProperties(ref MatrixRowColProperties[] properties, int length)
+        {
+            ReleaseProperties(ref properties);
+
+            properties = new MatrixRowColProperties[length];
+
+            for (int i = 0; i < length; i++)
+            {
+                properties[i] = new MatrixRowColProperties();
+                properties[i].PropertyChanged += Matrix_PropertyChanged;
+            }
+        }
+
+        #endregion
+
+        #region ReleaseProperties
+
+        private void ReleaseProperties(ref MatrixRowColProperties[] properties)
+        {
+            if (properties != null)
+            {
+                for (int i = 0; i < properties.Length; i++)
+                {
+                    properties[i].PropertyChanged -= Matrix_PropertyChanged;
+                    properties[i] = null;
+                }
+
+                properties = null;
+            }
+        }
+
+        #endregion
+
+        #region Clear
+
+        public void Clear()
+        {
+            CreateMatrix(_Width, _Height);
+        }
+
+        #endregion
+
+        #region GetElementAt
+
+        public ChartContainer GetElementAt(Point pt)
+        {
+            for (int i = 0; i < _Width; i++)
+            {
+                for (int j = 0; j < _Height; j++)
+                {
+                    if (_LocalArray[i, j] != null)
+                    {
+                        Rectangle bounds = _BoundsArray[i, j];
+
+                        bounds.X -= _ScrollOffset.X;
+                        bounds.Y -= _ScrollOffset.Y;
+
+                        if (bounds.Contains(pt))
+                            return (_LocalArray[i, j]);
+                    }
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetMatrixCoordAt
+
+        public bool GetMatrixCoordAt(Point pt, ref int column, ref int row)
+        {
+            for (int i = 0; i < _Width; i++)
+            {
+                for (int j = 0; j < _Height; j++)
+                {
+                    Rectangle bounds = _BoundsArray[i, j];
+
+                    bounds.X -= _ScrollOffset.X;
+                    bounds.Y -= _ScrollOffset.Y;
+
+                    if (bounds.Contains(pt))
+                    {
+                        column = i;
+                        row = j;
+
+                        return (true);
+                    }
+                }
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region GetMatrixCoordOf
+
+        public bool GetMatrixCoordOf(ChartContainer item, ref int row, ref int column)
+        {
+            if (item != null)
+            {
+                for (int i = 0; i < _Width; i++)
+                {
+                    for (int j = 0; j < _Height; j++)
+                    {
+                        if (item.Equals(_LocalArray[i, j]))
+                        {
+                            column = i;
+                            row = j;
+
+                            return (true);
+                        }
+                    }
+                }
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region Matrix_PropertyChanged
+
+        void Matrix_PropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            OnPropertyChanged(e);
+        }
+
+        #endregion
+
+        #region INotifyPropertyChanged Members
+
+        /// <summary>
+        /// Occurs when property value has changed.
+        /// </summary>
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        /// <summary>
+        /// Raises the PropertyChanged event.
+        /// </summary>
+        /// <param name="e">Event arguments</param>
+        protected virtual void OnPropertyChanged(PropertyChangedEventArgs e)
+        {
+            PropertyChangedEventHandler eh = PropertyChanged;
+
+            if (eh != null)
+                eh(this, e);
+        }
+
+        /// <summary>
+        /// Default PropertyChanged processing
+        /// </summary>
+        /// <param name="s"></param>
+        protected void OnPropertyChanged(string s)
+        {
+            if (PropertyChanged != null)
+                OnPropertyChanged(new PropertyChangedEventArgs(s));
+        }
+
+        #endregion
+
+        #region Copy/CopyTo
+
+        public ChartMatrix Copy()
+        {
+            ChartMatrix copy = new ChartMatrix();
+
+            CopyTo(copy);
+
+            return (copy);
+        }
+
+        public void CopyTo(ChartMatrix c)
+        {
+            c.AutoSizeMode = AutoSizeMode;
+            c.DividerLines = DividerLines;
+
+            c.Size = Size;
+
+            if (ColumnProperties != null)
+            {
+                for (int i = 0; i < ColumnProperties.Length; i++)
+                    ColumnProperties[i].CopyTo(c.ColumnProperties[i]);
+            }
+
+            if (RowProperties != null)
+            {
+                for (int i = 0; i < RowProperties.Length; i++)
+                    RowProperties[i].CopyTo(c.RowProperties[i]);
+            }
+        }
+
+        #endregion
+
+        #region GetSerialData
+
+        internal SerialElementCollection GetSerialData()
+        {
+            return (GetSerialData(true));
+        }
+
+        internal SerialElementCollection GetSerialData(bool root)
+        {
+            SerialElementCollection sec = new SerialElementCollection();
+
+            if (root == true)
+                sec.AddStartElement("ChartMatrix");
+
+            sec.AddValue("AutoSizeMode", AutoSizeMode, AutoSizeMode.NotSet);
+            sec.AddValue("DividerLines", DividerLines, DividerLines.NotSet);
+
+            ChartPanel panel = Parent as ChartPanel;
+                
+            if (panel != null)
+            {
+                if (panel.AutoSizeChartMatrix == false)
+                    sec.AddValue("Size", Size, Size.Empty);
+            }
+
+            if (AutoSizeMode == AutoSizeMode.None)
+            {
+                if (ColumnProperties != null && ColumnProperties.Length > 0)
+                {
+                    sec.AddStartElement("ColumnProperties count=\"" + ColumnProperties.Length + "\"");
+
+                    foreach (MatrixRowColProperties rcp in ColumnProperties)
+                        sec.AddElement(rcp.GetSerialData());
+
+                    sec.AddEndElement("ColumnProperties");
+                }
+
+                if (RowProperties != null && RowProperties.Length > 0)
+                {
+                    sec.AddStartElement("RowProperties count=\"" + RowProperties.Length + "\"");
+
+                    foreach (MatrixRowColProperties rcp in RowProperties)
+                        sec.AddElement(rcp.GetSerialData());
+
+                    sec.AddEndElement("RowProperties");
+                }
+            }
+
+            if (root == true)
+                sec.AddEndElement("ChartMatrix");
+
+            return (sec);
+        }
+
+        #endregion
+
+        #region PutSerialData
+
+        #region ProcessValue
+
+        void IProcessSerialElement.ProcessValue(SerialElement se)
+        {
+            ChartPanel panel = Parent as ChartPanel;
+                
+            switch (se.Name)
+            {
+                case "AutoSizeMode":
+                    AutoSizeMode = (AutoSizeMode)se.GetValueEnum(typeof(AutoSizeMode));
+                    break;
+
+                case "DividerLines":
+                    DividerLines = (DividerLines)se.GetValueEnum(typeof(DividerLines));
+                    break;
+
+                case "Size":
+                    if (panel != null)
+                    {
+                        if (panel.AutoSizeChartMatrix == false)
+                            Size = se.GetValueSize();
+                    }
+                    break;
+
+                default:
+                    throw new Exception("Unknown Serial Value (" + se.Name + ")");
+            }
+        }
+
+        #endregion
+
+        #region ProcessCollection
+
+        private MatrixRowColProperties[] _RcProperties;
+
+        void IProcessSerialElement.ProcessCollection(SerialElement se)
+        {
+            SerialElementCollection sec = se.Sec;
+
+            switch (se.Name)
+            {
+                case "ColumnProperties":
+                    _RcProperties = ColumnProperties;
+                    sec.PutSerialData(this);
+                    break;
+
+                case "RowProperties":
+                    _RcProperties = RowProperties;
+                    sec.PutSerialData(this);
+                    break;
+
+                case "MatrixRowColProperties":
+                    sec.PutSerialData(_RcProperties[se.ValueIndex]);
+                    break;
+
+                default:
+                    throw new Exception("Unknown Serial Collection (" + se.Name + ")");
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region States
+
+        [Flags]
+        private enum States : uint
+        {
+        }
+
+        #region TestState
+
+        private bool TestState(States state)
+        {
+            return ((_States & state) == state);
+        }
+
+        #endregion
+
+        #region SetState
+
+        private void SetState(States state, bool value)
+        {
+            if (value == true)
+                _States |= state;
+            else
+                _States &= ~state;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IDisposable
+
+        public virtual void Dispose()
+        {
+            ReleaseProperties(ref _RowProperties);
+            ReleaseProperties(ref _ColumnProperties);
+        }
+
+        #endregion
+    }
+
+    [TypeConverter(typeof(BlankExpandableObjectConverter))]
+    public class MatrixRowColProperties : IProcessSerialElement, INotifyPropertyChanged
+    {
+        #region Private variables
+
+        private int _FillWeight = 100;
+        private int _MinimumLength = 0;
+        private int _Length;
+
+        private AutoSizeMode _AutoSizeMode = AutoSizeMode.NotSet;
+        private bool _AlignContentBounds = true;
+
+        #endregion
+
+        #region Public properties
+
+        #region AlignContentBounds
+
+        ///<summary>
+        /// Gets or sets whether the matrix row/col has its content bounds aligned.
+        ///</summary>
+        [DefaultValue(true), Category("Data")]
+        [Description("Indicates the matrix row/col has its content bounds aligned.")]
+        public bool AlignContentBounds
+        {
+            get { return (_AlignContentBounds); }
+
+            set
+            {
+                if (value != _AlignContentBounds)
+                {
+                    _AlignContentBounds = value;
+
+                    OnPropertyChanged("AlignContentBounds");
+                }
+            }
+        }
+
+        #endregion
+
+        #region AutoSizeMode
+
+        ///<summary>
+        /// Gets or sets the mode used to size the matrix row/col.
+        ///</summary>
+        [DefaultValue(AutoSizeMode.NotSet), Category("Data")]
+        [Description("Indicates the mode used to sice the matrix row/col.")]
+        public AutoSizeMode AutoSizeMode
+        {
+            get { return (_AutoSizeMode); }
+
+            set
+            {
+                if (value != _AutoSizeMode)
+                {
+                    _AutoSizeMode = value;
+
+                    OnPropertyChanged("AutoSizeMode");
+                }
+            }
+        }
+
+        #endregion
+
+        #region FillWeight
+
+        /// <summary>
+        /// Gets or sets a value which, when AutoSizeMode is Fill,
+        /// represents the width of the row/col relative to the widths
+        /// of other fill-mode row/col items (default value is 100).
+        /// </summary>
+        [DefaultValue(100), Category("Sizing")]
+        [Description("Indicates a value which, when AutoSizeMode is Fill, represents the width of the row/col relative to the widths of other fill-mode row/col items (default value is 100).")]
+        public int FillWeight
+        {
+            get { return (_FillWeight); }
+
+            set
+            {
+                if (value != _FillWeight)
+                {
+                    _FillWeight = value;
+
+                    OnPropertyChanged("FillWeight");
+                }
+            }
+        }
+
+        #endregion
+
+        #region Length
+
+        /// <summary>
+        /// Gets or sets a value which represents the length (in pixels)
+        /// that the row/col is to occupy.
+        /// </summary>
+        [DefaultValue(0), Category("Sizing")]
+        [Description("Indicates a value which represents the length (in pixels) that the row/col is to occupy.")]
+        public int Length
+        {
+            get { return (_Length); }
+
+            set
+            {
+                if (value != _Length)
+                {
+                    _Length = value;
+
+                    OnPropertyChanged("Length");
+                }
+            }
+        }
+
+        #endregion
+
+        #region MinimumLength
+
+        /// <summary>
+        /// Gets or sets a value which represents the minimum length (in pixels)
+        /// that the row/col can occupy.
+        /// </summary>
+        [DefaultValue(0), Category("Sizing")]
+        [Description("Indicates a value which represents the minimum length (in pixels) that the row/col can occupy.")]
+        public int MinimumLength
+        {
+            get { return (_MinimumLength); }
+
+            set
+            {
+                if (value != _MinimumLength)
+                {
+                    _MinimumLength = value;
+
+                    OnPropertyChanged("MinimumLength");
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region CopyTo
+
+        public void CopyTo(MatrixRowColProperties c)
+        {
+            c.AlignContentBounds = AlignContentBounds;
+            c.AutoSizeMode = AutoSizeMode;
+            c.FillWeight = FillWeight;
+            c.Length = Length;
+            c.MinimumLength = MinimumLength;
+        }
+
+        #endregion
+
+        #region GetSerialData
+
+        internal SerialElementCollection GetSerialData()
+        {
+            return (GetSerialData(true));
+        }
+
+        internal SerialElementCollection GetSerialData(bool root)
+        {
+            SerialElementCollection sec = new SerialElementCollection();
+
+            if (root == true)
+                sec.AddStartElement("MatrixRowColProperties");
+
+            sec.AddValue("AlignContentBounds", AlignContentBounds, true);
+            sec.AddValue("AutoSizeMode", AutoSizeMode, AutoSizeMode.NotSet);
+            sec.AddValue("FillWeight", FillWeight, 100);
+            sec.AddValue("Length", Length, 0);
+            sec.AddValue("MinimumLength", MinimumLength, 0);
+
+            if (root == true)
+                sec.AddEndElement("MatrixRowColProperties");
+
+            return (sec);
+        }
+
+        #endregion
+
+        #region PutSerialData
+
+        #region ProcessValue
+
+        void IProcessSerialElement.ProcessValue(SerialElement se)
+        {
+            switch (se.Name)
+            {
+                case "AlignContentBounds":
+                    AlignContentBounds = bool.Parse(se.StringValue);
+                    break;
+
+                case "AutoSizeMode":
+                    AutoSizeMode = (AutoSizeMode)se.GetValueEnum(typeof(AutoSizeMode));
+                    break;
+
+                case "FillWeight":
+                    FillWeight = int.Parse(se.StringValue);
+                    break;
+
+                case "Length":
+                    Length = int.Parse(se.StringValue);
+                    break;
+
+                case "MinimumLength":
+                    MinimumLength = int.Parse(se.StringValue);
+                    break;
+
+                default:
+                    throw new Exception("Unknown Serial Value (" + se.Name + ")");
+            }
+        }
+
+        #endregion
+
+        #region ProcessCollection
+
+        void IProcessSerialElement.ProcessCollection(SerialElement se)
+        {
+            throw new Exception("Unknown Serial Collection (" + se.Name + ")");
+        }
+
+        #endregion
+
+        #endregion
+
+        #region INotifyPropertyChanged Members
+
+        /// <summary>
+        /// Occurs when property value has changed.
+        /// </summary>
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        /// <summary>
+        /// Raises the PropertyChanged event.
+        /// </summary>
+        /// <param name="e">Event arguments</param>
+        protected virtual void OnPropertyChanged(PropertyChangedEventArgs e)
+        {
+            PropertyChangedEventHandler eh = PropertyChanged;
+
+            if (eh != null)
+                eh(this, e);
+        }
+
+        /// <summary>
+        /// Default PropertyChanged processing
+        /// </summary>
+        /// <param name="s"></param>
+        protected void OnPropertyChanged(string s)
+        {
+            if (PropertyChanged != null)
+                OnPropertyChanged(new PropertyChangedEventArgs(s));
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/ChartNote.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/ChartNote.cs
new file mode 100644
index 00000000..751c70c7
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/ChartNote.cs	
@@ -0,0 +1,362 @@
+using System;
+using System.ComponentModel;
+using System.Windows.Forms;
+using DevComponents.Charts.TextMarkup;
+using DevComponents.DotNetBar.Charts.Style;
+
+namespace DevComponents.DotNetBar.Charts
+{
+    /// <summary>
+    /// ChartNote.
+    /// </summary>
+    public class ChartNote : ChartVisualElement
+    {
+        #region Private variables
+
+        private States _States;
+
+        private string _Text;
+        private BodyElement _TextMarkup;
+        private int _FixedHeight;
+
+        #endregion
+
+        #region Public properties
+
+        #region EnableTextMarkup
+
+        /// <summary>
+        /// Gets or sets whether text-markup support is enabled
+        /// </summary>
+        [DefaultValue(false), Category("Appearance")]
+        [Description("Indicates whether text-markup support is enabled.")]
+        public bool EnableTextMarkup
+        {
+            get { return (TestState(States.EnableTextMarkup)); }
+
+            set
+            {
+                if (EnableTextMarkup != value)
+                {
+                    SetState(States.EnableTextMarkup, value);
+
+                    MarkupTextChanged();
+
+                    OnPropertyChangedEx("EnableTextMarkup", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #region MarkupTextChanged
+
+        private void MarkupTextChanged()
+        {
+            if (_TextMarkup != null)
+                _TextMarkup.HyperLinkClick -= TextMarkupLinkClick;
+
+            _TextMarkup = null;
+
+            if (EnableTextMarkup == true)
+            {
+                if (MarkupParser.IsMarkup(_Text) == true)
+                {
+                    _TextMarkup = MarkupParser.Parse(_Text);
+
+                    if (_TextMarkup != null)
+                        _TextMarkup.HyperLinkClick += TextMarkupLinkClick;
+                }
+            }
+        }
+
+        #endregion
+
+        #region TextMarkupLinkClick
+
+        /// <summary>
+        /// Occurs when a text markup link is clicked
+        /// </summary>
+        protected virtual void TextMarkupLinkClick(object sender, EventArgs e)
+        {
+            HyperLink link = sender as HyperLink;
+
+            if (link != null)
+                ChartControl.DoChartTitleMarkupLinkClickEvent(this, link);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region PlainText
+
+        /// <summary>
+        /// Gets text without text-markup (if text-markup is used in Text)
+        /// </summary>
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public string PlainText
+        {
+            get { return (_TextMarkup != null ? _TextMarkup.PlainText : _Text); }
+        }
+
+        #endregion
+
+        #region FixedHeight
+
+        /// <summary>
+        /// Gets or sets the fixed Text height (0 to auto-size)
+        /// </summary>
+        [DefaultValue(0), Category("Layout")]
+        [Description("Indicates the fixed Text height (0 to auto-size)")]
+        public int FixedHeight
+        {
+            get { return (_FixedHeight); }
+
+            set
+            {
+                if (value != _FixedHeight)
+                {
+                    _FixedHeight = value;
+
+                    OnPropertyChangedEx("FixedHeight", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region Text
+
+        /// <summary>
+        /// Gets or sets the item Text.
+        /// </summary>
+        [DefaultValue(null), Category("Appearance")]
+        [Description("Indicates the item Text.")]
+        [Editor("DevComponents.DotNetBar.Design.TextMarkupUIEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor))]
+        public string Text
+        {
+            get { return (_Text); }
+
+            set
+            {
+                _Text = value;
+
+                MarkupTextChanged();
+
+                OnPropertyChangedEx("Text", VisualChangeType.Layout);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region TextMarkup
+
+        internal BodyElement TextMarkup
+        {
+            get { return (_TextMarkup); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region MeasureOverride
+
+        protected override void MeasureOverride(ChartLayoutInfo layoutInfo)
+        {
+            throw new NotImplementedException();
+        }
+
+        #endregion
+
+        #region ArrangeOverride
+
+        protected override void ArrangeOverride(ChartLayoutInfo layoutInfo)
+        {
+            throw new NotImplementedException();
+        }
+
+        #endregion
+
+        #region RenderOverride
+
+        protected override void RenderOverride(ChartRenderInfo renderInfo)
+        {
+            throw new NotImplementedException();
+        }
+
+        #endregion
+
+        #region Mouse handling
+
+        #region OnMouseEnter
+
+        protected override bool OnMouseEnter(EventArgs e)
+        {
+            return (true);
+        }
+
+        #endregion
+
+        #region OnMouseLeave
+
+        protected override bool OnMouseLeave(EventArgs e)
+        {
+            return (true);
+        }
+
+        #endregion
+
+        #region OnMouseMove
+
+        protected override bool OnMouseMove(MouseEventArgs e)
+        {
+            ChartCursor = Cursors.Default;
+
+            return (false);
+        }
+
+        #endregion
+
+        #region OnMouseDown
+
+        protected override bool OnMouseDown(MouseEventArgs e)
+        {
+            return (false);
+        }
+
+        #endregion
+
+        #region OnMouseUp
+
+        protected override bool OnMouseUp(MouseEventArgs e)
+        {
+            base.OnMouseUp(e);
+
+            return (true);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Copy/CopyTo
+
+        public override ChartVisualElement Copy()
+        {
+            ChartNote copy = new ChartNote();
+
+            CopyTo(copy);
+
+            return (copy);
+        }
+
+        public override void CopyTo(ChartVisualElement copy)
+        {
+            ChartNote c = copy as ChartNote;
+
+            if (c != null)
+            {
+                base.CopyTo(c);
+
+                c.EnableTextMarkup = EnableTextMarkup;
+                c.FixedHeight = FixedHeight;
+                c.Text = Text;
+            }
+        }
+
+        #endregion
+
+        #region GetSerialData
+
+        internal override SerialElementCollection GetSerialData(string serialName)
+        {
+            SerialElementCollection sec = new SerialElementCollection();
+
+            if (serialName != null)
+            {
+                if (serialName.Equals("") == true)
+                    serialName = "ChartNote";
+
+                sec.AddStartElement(serialName);
+            }
+
+            sec.AddValue("EnableTextMarkup", EnableTextMarkup, false);
+            sec.AddValue("FixedHeight", FixedHeight, 0);
+            sec.AddValue("Text", Text, null);
+
+            sec.AddElement(base.GetSerialData(null));
+
+            if (serialName != null)
+                sec.AddEndElement(serialName);
+
+            return (sec);
+        }
+
+        #endregion
+
+        #region PutSerialData
+
+        #region ProcessValue
+
+        internal override void ProcessValue(SerialElement se)
+        {
+            switch (se.Name)
+            {
+                case "EnableTextMarkup":
+                    EnableTextMarkup = bool.Parse(se.StringValue);
+                    break;
+
+                case "FixedHeight":
+                    FixedHeight = int.Parse(se.StringValue);
+                    break;
+
+                case "Text":
+                    Text = se.StringValue;
+                    break;
+
+                default:
+                    base.ProcessValue(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region States
+
+        [Flags]
+        private enum States : uint
+        {
+            EnableTextMarkup = (1U << 0),
+        }
+
+        #region TestState
+
+        private bool TestState(States state)
+        {
+            return ((_States & state) == state);
+        }
+
+        #endregion
+
+        #region SetState
+
+        private void SetState(States state, bool value)
+        {
+            if (value == true)
+                _States |= state;
+            else
+                _States &= ~state;
+        }
+
+        #endregion
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/ChartPanel.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/ChartPanel.cs
new file mode 100644
index 00000000..09337883
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/ChartPanel.cs	
@@ -0,0 +1,2320 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Drawing.Drawing2D;
+using System.Globalization;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.Charts.Style;
+
+namespace DevComponents.DotNetBar.Charts
+{
+    /// <summary>
+    /// ChartPanel is a container object which holds
+    /// and defines ChartGraphs, which can be single or multiple. 
+    /// </summary>
+    [TypeConverter(typeof(BlankExpandableObjectConverter))]
+    public class ChartPanel : ChartContainer, IEffectiveStyle
+    {
+        #region Private variables
+
+        private States _States;
+
+        private ChartContainerCollection _ChartContainers;
+        private ContainerLayout _ContainerLayout = ContainerLayout.Auto;
+
+        private ChartMatrix _ChartMatrix;
+        private List<ChartContainer> _MatrixList;
+
+        private DefaultVisualStyles _DefaultVisualStyles;
+
+        private ChartPanelVisualStyle _ChartPanelVisualStyle;
+        private EffectiveStyle<ChartPanelVisualStyle> _EffectivePanelStyle;
+
+        private List<ChartLegendItem> _LegendData;
+        private LegendSource _LegendSource = (LegendSource.NestedCharts | LegendSource.NestedPanels);
+
+        #endregion
+
+        public ChartPanel(string name)
+            : this()
+        {
+            Name = name;
+        }
+
+        public ChartPanel()
+        {
+            InitDefaultStates();
+
+            _EffectivePanelStyle = new EffectiveStyle<ChartPanelVisualStyle>(this);
+
+            Legend.Visible = false;
+        }
+
+        #region InitDefaultStates
+
+        private void InitDefaultStates()
+        {
+            SetState(States.AutoFillChartMatrix, true);
+            SetState(States.AutoSizeChartMatrix, true);
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region AutoFillChartMatrix
+
+        /// <summary>
+        /// Gets or sets whether the ChartMatrix is auto filled
+        /// from the ChartContainer collection.
+        /// </summary>
+        [DefaultValue(true), Category("Layout")]
+        [Description("Indicates whether the ChartMatrix is auto filled from the ChartContainer collection.")]
+        public bool AutoFillChartMatrix
+        {
+            get { return (TestState(States.AutoFillChartMatrix)); }
+
+            set
+            {
+                if (value != AutoFillChartMatrix)
+                {
+                    SetState(States.AutoFillChartMatrix, value);
+
+                    OnPropertyChangedEx("AutoFillChartMatrix", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region AutoGenSeriesCollection
+
+        /// <summary>
+        /// Gets or sets whether series definitions are auto generated from the set DataSource.
+        /// </summary>
+        [DefaultValue(false), Category("Data")]
+        [Description("Indicates whether series definitions are auto generated from the set DataSource.")]
+        public bool AutoGenSeriesCollection
+        {
+            get { return (TestState(States.AutoGenSeriesCollection)); }
+
+            set
+            {
+                if (value != AutoGenSeriesCollection)
+                {
+                    SetState(States.AutoGenSeriesCollection, value);
+
+                    OnPropertyChangedEx("AutoGenSeriesCollection", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region AutoSizeChartMatrix
+
+        /// <summary>
+        /// Gets or sets whether the ChartMatrix is auto sized
+        /// from the ChartContainer collection.
+        /// </summary>
+        [DefaultValue(true), Category("Layout")]
+        [Description("Indicates whether the ChartMatrix is auto sized from the ChartContainer collection.")]
+        public bool AutoSizeChartMatrix
+        {
+            get { return (TestState(States.AutoSizeChartMatrix)); }
+
+            set
+            {
+                if (value != AutoSizeChartMatrix)
+                {
+                    SetState(States.AutoSizeChartMatrix, value);
+
+                    OnPropertyChangedEx("AutoSizeChartMatrix", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ChartContainers
+
+        /// <summary>
+        /// Gets a reference to the collection of Chart Containers (ChartPanels and Chart graphs).
+        /// </summary>
+        [Category("Layout")]
+        [Description("Indicates the reference to the collection of Chart Containers (ChartPanels and Chart graphs).")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ChartContainerCollection ChartContainers
+        {
+            get
+            {
+                if (_ChartContainers == null)
+                {
+                    _ChartContainers = new ChartContainerCollection();
+
+                    _ChartContainers.CollectionChanged += ChartContainersCollectionChanged;
+                }
+
+                return (_ChartContainers);
+            }
+
+            internal set
+            {
+                if (_ChartContainers != null)
+                    _ChartContainers.CollectionChanged -= ChartContainersCollectionChanged;
+
+                _ChartContainers = value;
+
+                if (_ChartContainers != null)
+                    _ChartContainers.CollectionChanged += ChartContainersCollectionChanged;
+            }
+        }
+
+        #region ChartContainersCollectionChanged
+
+        void ChartContainersCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            ChartControl chartControl = ChartControl;
+
+            switch (e.Action)
+            {
+                case NotifyCollectionChangedAction.Add:
+                    foreach (ChartContainer item in e.NewItems)
+                    {
+                        item.Parent = this;
+
+                        if (chartControl != null)
+                            AddSelectedItems(chartControl, item);
+                    }
+                    break;
+
+                case NotifyCollectionChangedAction.Replace:
+                    foreach (ChartContainer item in e.OldItems)
+                    {
+                        if (chartControl != null)
+                            RemoveSelectedItems(chartControl, item);
+
+                        item.Parent = null;
+                    }
+
+                    foreach (ChartContainer item in e.NewItems)
+                    {
+                        item.Parent = this;
+
+                        if (chartControl != null)
+                            AddSelectedItems(chartControl, item);
+                    }
+                    break;
+
+                case NotifyCollectionChangedAction.Remove:
+                    foreach (ChartContainer item in e.OldItems)
+                    {
+                        item.Parent = null;
+
+                        if (chartControl != null)
+                            RemoveSelectedItems(chartControl, item);
+                    }
+                    break;
+            }
+
+            InvalidateLayout();
+        }
+
+        #region AddSelectedItems
+
+        private void AddSelectedItems(ChartControl chartControl, ChartContainer item)
+        {
+            BaseChart chart = item as BaseChart;
+
+            if (chart != null)
+            {
+                if (chart.IsSelected == true)
+                    chartControl.SetSelected(item, true);
+            }
+            else if (item is ChartPanel)
+            {
+                foreach (ChartContainer citem in ((ChartPanel)item).ChartContainers)
+                    AddSelectedItems(chartControl, citem);
+            }
+        }
+
+        #endregion
+
+        #region RemoveSelectedItems
+
+        private void RemoveSelectedItems(ChartControl chartControl, ChartContainer item)
+        {
+            BaseChart chart = item as BaseChart;
+
+            if (chart != null)
+            {
+                if (chart.IsSelected == true)
+                    chartControl.SetSelected(item, false);
+            }
+            else if (item is ChartPanel)
+            {
+                foreach (ChartContainer citem in ((ChartPanel)item).ChartContainers)
+                    RemoveSelectedItems(chartControl, citem);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region ChartMatrix
+
+        /// <summary>
+        /// Gets the Matrix used to display the defined Panels and Charts in a Matrix format.
+        /// </summary>
+        [Category("Layout")]
+        [Description("Indicates the Matrix used to display the defined Panels and Charts in a Matrix format.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ChartMatrix ChartMatrix
+        {
+            get
+            {
+                if (_ChartMatrix == null)
+                {
+                    _ChartMatrix = new ChartMatrix();
+                    _ChartMatrix.Parent = this;
+
+                    _ChartMatrix.PropertyChanged += ChartMatrix_PropertyChanged;
+                }
+
+                return (_ChartMatrix);
+            }
+
+            internal set
+            {
+                if (_ChartMatrix != value)
+                {
+                    if (_ChartMatrix != null)
+                    {
+                        _ChartMatrix.PropertyChanged -= ChartMatrix_PropertyChanged;
+                        _ChartMatrix.Parent = null;
+                    }
+
+                    _ChartMatrix = value;
+
+                    if (_ChartMatrix != null)
+                    {
+                        _ChartMatrix.Parent = this;
+                        _ChartMatrix.PropertyChanged += ChartMatrix_PropertyChanged;
+                    }
+                }
+            }
+        }
+
+        #region ChartMatrix_PropertyChanged
+
+        void ChartMatrix_PropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            if (ChartControl != null)
+            {
+                if (e.PropertyName.Equals("Size") || e.PropertyName.Equals("Height") || e.PropertyName.Equals("Width"))
+                    ChartControl.DoChartMatrixResizedEvent(this);
+
+                if (ChartControl.InUpdateLayout == false)
+                    InvalidateLayout();
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ChartPanelVisualStyle
+
+        /// <summary>
+        /// Gets or sets the visual style for the Chart Panel.
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates the visual style for the Chart Panel.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ChartPanelVisualStyle ChartPanelVisualStyle
+        {
+            get
+            {
+                if (_ChartPanelVisualStyle == null)
+                {
+                    _ChartPanelVisualStyle = new ChartPanelVisualStyle();
+
+                    StyleVisualChangeHandler(null, _ChartPanelVisualStyle);
+                }
+
+                return (_ChartPanelVisualStyle);
+            }
+
+            set
+            {
+                if (_ChartPanelVisualStyle != value)
+                {
+                    ChartPanelVisualStyle oldValue = _ChartPanelVisualStyle;
+
+                    _ChartPanelVisualStyle = value;
+
+                    OnStyleChanged("ChartPanelVisualStyle", oldValue, value);
+
+                    if (oldValue != null)
+                        oldValue.Dispose();
+                }
+            }
+        }
+
+        #endregion
+
+        #region ContainerLayout
+
+        /// <summary>
+        /// Gets or sets the layout (horizontal, vertical, matrix) for the defined Chart Containers.
+        /// </summary>
+        [DefaultValue(ContainerLayout.Auto), Category("Layout")]
+        [Description("Indicates the layout (horizontal, vertical, matrix) for the defined Chart Containers.")]
+        public ContainerLayout ContainerLayout
+        {
+            get { return (_ContainerLayout); }
+
+            set
+            {
+                if (_ContainerLayout != value)
+                {
+                    _ContainerLayout = value;
+
+                    OnPropertyChangedEx("ContainerLayout", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region DefaultVisualStyles
+
+        ///<summary>
+        /// Gets or sets the Default Visual Styles for each Chart element.
+        ///</summary>
+        [Browsable(true), Category("Style"), DefaultValue(null)]
+        [Description("Indicates the Default Visual Styles for each Chart element.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public DefaultVisualStyles DefaultVisualStyles
+        {
+            get
+            {
+                if (_DefaultVisualStyles == null)
+                {
+                    _DefaultVisualStyles = new DefaultVisualStyles();
+
+                    _DefaultVisualStyles.PropertyChanged += DefaultVisualStylesPropertyChanged;
+                }
+
+                return (_DefaultVisualStyles);
+            }
+
+            set
+            {
+                if (_DefaultVisualStyles != value)
+                {
+                    if (_DefaultVisualStyles != null)
+                        _DefaultVisualStyles.PropertyChanged -= DefaultVisualStylesPropertyChanged;
+
+                    _DefaultVisualStyles = value;
+
+                    if (_DefaultVisualStyles != null)
+                        _DefaultVisualStyles.PropertyChanged += DefaultVisualStylesPropertyChanged;
+                }
+            }
+        }
+
+        #region DefaultVisualStylesPropertyChanged
+
+        private void DefaultVisualStylesPropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            VisualChangeType changeType = ((VisualPropertyChangedEventArgs)e).ChangeType;
+
+            switch (changeType)
+            {
+                case VisualChangeType.Layout:
+                    InvalidateRender();
+                    break;
+
+                case VisualChangeType.Render:
+                    InvalidateRender();
+                    break;
+            }
+
+            //ChartControl cc = ChartControl;
+
+            //if (cc != null)
+            //    cc.UpdateStyleCount();
+        }
+
+        #endregion
+
+        #endregion
+
+        #region EffectivePanelStyle
+
+        /// <summary>
+        /// Gets a reference to the panel's effective (cached, composite) style.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public ChartPanelVisualStyle EffectivePanelStyle
+        {
+            get { return (_EffectivePanelStyle.Style); }
+        }
+
+        #endregion
+
+        #region LegendSource
+
+        /// <summary>
+        /// Gets or sets the source for the items in the panel legend.
+        /// </summary>
+        [Category("Layout")]
+        [Description("Indicates the source for the items in the panel legend.")]
+        [Editor("DevComponents.Charts.Design.FlagsEnumUIEditor, DevComponents.Charts.Design, " +
+                "Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(UITypeEditor))]
+        public LegendSource LegendSource
+        {
+            get { return (_LegendSource); }
+
+            set
+            {
+                if (value != _LegendSource)
+                {
+                    _LegendSource = value;
+
+                    OnPropertyChangedEx("LegendSource", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        internal virtual bool ShouldSerializeLegendSource()
+        {
+            return (_LegendSource != (LegendSource.NestedCharts | LegendSource.NestedPanels));
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        internal virtual void ResetLegendSource()
+        {
+            LegendSource = (LegendSource.NestedCharts | LegendSource.NestedPanels);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region LegendData
+
+        internal List<ChartLegendItem> LegendData
+        {
+            get { return (_LegendData); }
+
+            set
+            {
+                if (_LegendData != null)
+                {
+                    foreach (ChartLegendItem item in _LegendData)
+                        item.Dispose();
+                }
+
+                _LegendData = value;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region MeasureOverride
+
+        protected override void MeasureOverride(ChartLayoutInfo layoutInfo)
+        {
+            ChartPanelVisualStyle pstyle = EffectivePanelStyle;
+            ContainerVisualStyle cstyle = GetEffectiveContainerStyle();
+
+            if (cstyle.DropShadow.Enabled == Tbool.True)
+            {
+                layoutInfo.LayoutBounds.Height -= 3;
+                layoutInfo.LayoutBounds.Width -= 3;
+            }
+
+            BoundsRelative = layoutInfo.LayoutBounds;
+
+            FrameBounds = GetAdjustedBounds(BoundsRelative, cstyle.Margin);
+            ContentBounds = GetAdjustedBounds(FrameBounds, cstyle.BorderThickness);
+            ContentBounds = GetAdjustedBounds(ContentBounds, cstyle.Padding);
+
+            layoutInfo.LayoutBounds = ContentBounds;
+
+            base.MeasureOverride(layoutInfo);
+
+            ContentBounds = layoutInfo.LayoutBounds;
+            ContentBoundsEx = ContentBounds;
+
+            if (AutoFillChartMatrix == true)
+                AutoFillMatrix(layoutInfo);
+            else
+                FillMatrix();
+
+            Size size = MeasureMatrix(layoutInfo, pstyle);
+
+            Size minContentSize = Dpi.Size(MinContentSize);
+
+            if (size.Width < minContentSize.Width)
+                size.Width = minContentSize.Width;
+
+            if (size.Height < minContentSize.Height)
+                size.Height = minContentSize.Height;
+
+            Rectangle r = ContentBoundsEx;
+
+            if (size.Width > r.Width)
+                r.Width = size.Width;
+
+            if (size.Height > r.Height)
+                r.Height = size.Height;
+
+            ContentBoundsEx = r;
+
+            if ((ContentBoundsEx.Width > ContentBounds.Width  && ContentBoundsEx.Height == ContentBounds.Height) ||
+                (ContentBoundsEx.Height > ContentBounds.Height && ContentBoundsEx.Width == ContentBounds.Width))
+            {
+                layoutInfo.LayoutBounds = ContentBounds;
+
+                if (ContentBoundsEx.Width > ContentBounds.Width)
+                    layoutInfo.LayoutBounds.Height -= (HScrollBar.Height + 1);
+
+                if (ContentBoundsEx.Height > ContentBounds.Height)
+                    layoutInfo.LayoutBounds.Width -= (VScrollBar.Width + 1);
+
+                size = MeasureMatrix(layoutInfo, pstyle);
+
+                if (size.IsEmpty == false)
+                {
+                    if (size.Width < minContentSize.Width)
+                        size.Width = minContentSize.Width;
+
+                    if (size.Height < minContentSize.Height)
+                        size.Height = minContentSize.Height;
+
+                    r = ContentBoundsEx;
+                    r.Size = size;
+                    ContentBoundsEx = r;
+                }
+            }
+            else if (ContentBoundsEx.Width > ContentBounds.Width &&
+                ContentBoundsEx.Height > ContentBounds.Height)
+            {
+                r.Width += (VScrollBar.Width + 1);
+                r.Height += (HScrollBar.Height + 1);
+
+                ContentBoundsEx = r;
+            }
+        }
+
+        #region FillMatrix
+
+        private void FillMatrix()
+        {
+            Size size = Size.Empty;
+
+            _MatrixList = new List<ChartContainer>();
+
+            foreach (ChartContainer cc in ChartContainers)
+            {
+                if (cc.Visible == true)
+                {
+                    if (cc.MatrixDisplayBounds.Right > 0 && cc.MatrixDisplayBounds.Bottom > 0)
+                    {
+                        _MatrixList.Add(cc);
+
+                        if (cc.MatrixDisplayBounds.Right > size.Width)
+                            size.Width = cc.MatrixDisplayBounds.Right;
+
+                        if (cc.MatrixDisplayBounds.Bottom > size.Height)
+                            size.Height = cc.MatrixDisplayBounds.Bottom;
+                    }
+                }
+            }
+
+            if (AutoSizeChartMatrix == true)
+            {
+                ChartMatrix.Size = size;
+            }
+            else
+            {
+                if (size.Width > ChartMatrix.Size.Width || size.Height > ChartMatrix.Size.Height)
+                    throw new Exception("ChartMatrix not large enough for assigned containers.");
+            }
+
+            ChartMatrix.Clear();
+
+            _MatrixList.Sort(new MatrixComparer());
+
+            foreach (ChartContainer cc in _MatrixList)
+            {
+                Rectangle r = cc.MatrixDisplayBounds;
+
+                for (int i = r.X; i < r.Right; i++)
+                {
+                    for (int j = r.Y; j < r.Bottom; j++)
+                        ChartMatrix[i, j] = cc;
+                }
+            }
+        }
+
+        #endregion
+
+        #region AutoFillMatrix
+
+        private void AutoFillMatrix(ChartLayoutInfo layoutInfo)
+        {
+            _MatrixList = new List<ChartContainer>();
+
+            int count = VisibleContainerCount();
+
+            if (count > 0)
+            {
+                Size size = ChartMatrix.Size;
+
+                ContainerLayout clayout = ContainerLayout;
+
+                if (AutoSizeChartMatrix == true)
+                    size = GetAutoMatrixSize(layoutInfo, count, ref clayout);
+
+                ChartMatrix.Size = size;
+
+                int n = -1;
+
+                if (clayout == ContainerLayout.Horizontal)
+                {
+                    for (int i = 0; i < size.Height; i++)
+                    {
+                        for (int j = 0; j < size.Width; j++)
+                        {
+                            ChartContainer container = GetNextVisibleContainer(ref n);
+
+                            if (container == null)
+                            {
+                                i = size.Height;
+                                break;
+                            }
+
+                            ChartMatrix[j, i] = container;
+                            container.MatrixDisplayBounds = new Rectangle(j, i, 1, 1);
+
+                            _MatrixList.Add(container);
+                        }
+                    }
+                }
+                else
+                {
+                    for (int i = 0; i < size.Width; i++)
+                    {
+                        for (int j = 0; j < size.Height; j++)
+                        {
+                            ChartContainer container = GetNextVisibleContainer(ref n);
+
+                            if (container == null)
+                            {
+                                i = size.Width;
+                                break;
+                            }
+
+                            ChartMatrix[i, j] = container;
+                            container.MatrixDisplayBounds = new Rectangle(i, j, 1, 1);
+
+                            _MatrixList.Add(container);
+                        }
+                    }
+                }
+            }
+        }
+
+        #region VisibleContainerCount
+
+        private int VisibleContainerCount()
+        {
+            int count = 0;
+
+            foreach (ChartContainer cc in ChartContainers)
+            {
+                if (cc.Visible == true)
+                    count++;
+            }
+
+            return (count);
+        }
+
+        #endregion
+
+        #region GetAutoMatrixSize
+
+        private Size GetAutoMatrixSize(
+            ChartLayoutInfo layoutInfo, int count, ref ContainerLayout clayout)
+        {
+            if (count > 0)
+            {
+                if (ContainerLayout == ContainerLayout.Horizontal)
+                    return (new Size(count, 1));
+
+                if (ContainerLayout == ContainerLayout.Vertical)
+                    return (new Size(1, count));
+
+                double w = Math.Ceiling(Math.Sqrt((double)count));
+                double h = (w * w == count) ? w : Math.Ceiling(count / w);
+
+                if (w != h)
+                {
+                    if ((layoutInfo.LayoutBounds.Width > layoutInfo.LayoutBounds.Height && w < h) ||
+                        (layoutInfo.LayoutBounds.Width < layoutInfo.LayoutBounds.Height && w > h))
+                    {
+                        clayout = ContainerLayout.Vertical;
+
+                        return (new Size((int)h, (int)w));
+                    }
+                }
+
+                clayout = ContainerLayout.Horizontal;
+
+                return (new Size((int)w, (int)h));
+            }
+
+            return (Size.Empty);
+        }
+
+        #endregion
+
+        #region GetNextVisibleContainer
+
+        private ChartContainer GetNextVisibleContainer(ref int n)
+        {
+            n++;
+
+            while (n < ChartContainers.Count)
+            {
+                if (ChartContainers[n].Visible == true)
+                    return (ChartContainers[n]);
+
+                n++;
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region MeasureMatrix
+
+        private Size MeasureMatrix(ChartLayoutInfo layoutInfo, ChartPanelVisualStyle style)
+        {
+            int hLen = GetMatrixLayout(layoutInfo, ContainerLayout.Horizontal);
+            int vLen = GetMatrixLayout(layoutInfo, ContainerLayout.Vertical);
+
+            Rectangle layoutBounds = layoutInfo.LayoutBounds;
+            Point ptLayout = layoutBounds.Location;
+
+            for (int i = 0; i < ChartMatrix.Width; i++)
+            {
+                int width = ChartMatrix.ColumnProperties[i].Length;
+
+                Point ptBounds = ptLayout;
+
+                for (int j = 0; j < ChartMatrix.Height; j++)
+                {
+                    int height = ChartMatrix.RowProperties[j].Length;
+
+                    ChartMatrix.BoundsArray[i, j] = new Rectangle(ptBounds, new Size(width, height));
+
+                    ptBounds.Y += height;
+                }
+
+                ptLayout.X += width;
+            }
+
+            int dx = style.DividerLineX.LineWidth / 2;
+            int dy = style.DividerLineY.LineWidth / 2;
+
+            foreach (ChartContainer cc in _MatrixList)
+            {
+                Rectangle r = GetMatrixBounds(cc, dx, dy);
+
+                cc.BoundsRelative = r;
+
+                layoutInfo.LayoutBounds = cc.BoundsRelative;
+
+                cc.Measure(layoutInfo);
+            }
+
+            AlignMatrix(layoutInfo);
+
+            return (new Size(hLen, vLen));
+        }
+
+        #region GetMatrixBounds
+
+        private Rectangle GetMatrixBounds(ChartContainer cc, int dx, int dy)
+        {
+            Rectangle r = Rectangle.Empty;
+
+            Rectangle ccb = cc.MatrixDisplayBounds;
+
+            for (int i = ccb.X; i < ccb.Right; i++)
+            {
+                for (int j = ccb.Y; j < ccb.Bottom; j++)
+                {
+                    if (r.IsEmpty == true)
+                        r = ChartMatrix.BoundsArray[i, j];
+                    else
+                        r = Rectangle.Union(r, ChartMatrix.BoundsArray[i, j]);
+                }
+            }
+
+            if (ccb.X != 0)
+            {
+                r.X += dy;
+                r.Width -= dy;
+            }
+
+            if (ccb.Right != ChartMatrix.Width)
+                r.Width -= dy;
+
+            if (ccb.Y != 0)
+            {
+                r.Y += dx;
+                r.Height -= dx;
+            }
+
+            if (ccb.Bottom != ChartMatrix.Height)
+                r.Height -= dx;
+
+            return (r);
+        }
+
+        #endregion
+
+        #region AlignMatrix
+
+        private void AlignMatrix(ChartLayoutInfo layoutInfo)
+        {
+            for (int i = 0; i < ChartMatrix.Width; i++)
+            {
+                Vector v = GetMatrixColumnVector(i);
+
+                UpdateMatrixColumnBounds(v, i);
+            }
+
+            for (int i = 0; i < ChartMatrix.Height; i++)
+            {
+                Vector v = GetMatrixRowVector(i);
+
+                UpdateMatrixRowBounds(v, i);
+            }
+
+            foreach (ChartContainer cc in _MatrixList)
+            {
+                if (cc.MatrixColumnAligned == true || cc.MatrixRowAligned == true)
+                {
+                    cc.MatrixColumnAligned = false;
+                    cc.MatrixRowAligned = false;
+
+                    layoutInfo.LayoutBounds = cc.BoundsRelative;
+
+                    cc.Measure(layoutInfo);
+                }
+            }
+        }
+
+        #region GetMatrixColumnVector
+
+        private Vector GetMatrixColumnVector(int index)
+        {
+            Vector v = new Vector();
+
+            foreach (ChartContainer cc in _MatrixList)
+            {
+                Rectangle cb = cc.ContentBounds;
+
+                if (cc.MatrixDisplayBounds.X == index)
+                {
+                    if (cc.MatrixAlignStartColumn == true)
+                    {
+                        if (v.IsEmpty == true)
+                        {
+                            v.Start = cb.X;
+                            v.End = cb.Right;
+                        }
+                        else
+                        {
+                            if (cb.X > v.Start)
+                            {
+                                int n = cb.X - v.Start;
+                                v.Start += n;
+                                v.End -= n;
+                            }
+                        }
+                    }
+                }
+
+                if (cc.MatrixDisplayBounds.Right - 1 == index)
+                {
+                    if (cc.MatrixAlignEndColumn == true)
+                    {
+                        if (v.IsEmpty == true)
+                        {
+                            v.End = cb.Right;
+                        }
+                        else
+                        {
+                            if (cb.Right < v.End)
+                            {
+                                int n = v.End - cb.Right;
+                                v.End -= n;
+                            }
+                        }
+                    }
+                }
+            }
+
+            return (v);
+        }
+
+        #endregion
+
+        #region UpdateMatrixColumnBounds
+
+        private void UpdateMatrixColumnBounds(Vector v, int index)
+        {
+            foreach (ChartContainer cc in _MatrixList)
+            {
+                Rectangle cb = cc.ContentBounds;
+                Rectangle t = cc.BoundsRelative;
+
+                if (cc.MatrixDisplayBounds.X == index)
+                {
+                    if (cc.MatrixAlignStartColumn == true)
+                    {
+                        if (cb.X != v.Start)
+                        {
+                            t.X += (v.Start - cb.X);
+                            t.Width -= (v.Start - cb.X);
+
+                            cc.MatrixColumnAligned = true;
+                        }
+                    }
+                }
+
+                if (cc.MatrixDisplayBounds.Right - 1 == index)
+                {
+                    if (cc.MatrixAlignEndColumn == true)
+                    {
+                        if (cb.Right != v.End)
+                        {
+                            t.Width -= (cb.Right - v.End);
+
+                            cc.MatrixColumnAligned = true;
+                        }
+                    }
+                }
+
+                cc.BoundsRelative = t;
+            }
+        }
+
+        #endregion
+
+        #region GetMatrixRowVector
+
+        private Vector GetMatrixRowVector(int index)
+        {
+            Vector v = new Vector();
+
+            foreach (ChartContainer cc in _MatrixList)
+            {
+                Rectangle cb = cc.ContentBounds;
+
+                if (cc.MatrixDisplayBounds.Y == index)
+                {
+                    if (cc.MatrixAlignStartRow == true)
+                    {
+                        if (v.IsEmpty == true)
+                        {
+                            v.Start = cb.Y;
+                            v.End = cb.Bottom;
+                        }
+                        else
+                        {
+                            if (cb.Y > v.Start)
+                            {
+                                int n = (cb.Y - v.Start);
+
+                                v.Start += n;
+                                v.End -= n;
+                            }
+                        }
+                    }
+                }
+
+                if (cc.MatrixDisplayBounds.Bottom - 1 == index)
+                {
+                    if (cc.MatrixAlignEndRow == true)
+                    {
+                        if (v.IsEmpty == true)
+                        {
+                            v.Start = cb.Y;
+                            v.End = cb.Bottom;
+                        }
+                        else
+                        {
+                            if (cb.Bottom < v.End)
+                                v.End = cb.Bottom;
+                        }
+                    }
+                }
+            }
+
+            return (v);
+        }
+
+        #endregion
+
+        #region UpdateMatrixRowBounds
+
+        private void UpdateMatrixRowBounds(Vector v, int index)
+        {
+            foreach (ChartContainer cc in _MatrixList)
+            {
+                if (cc.MatrixDisplayBounds.Y == index)
+                {
+                    Rectangle cb = cc.ContentBounds;
+                    Rectangle t = cc.BoundsRelative;
+
+                    if (cc.MatrixAlignStartRow == true)
+                    {
+                        if (cb.Y != v.Start)
+                        {
+                            t.Y += (v.Start - cb.Y);
+                            t.Height -= (v.Start - cb.Y);
+
+                            cc.MatrixRowAligned = true;
+                        }
+                    }
+
+                    if (cc.MatrixAlignEndRow == true)
+                    {
+                        if (cb.Bottom != v.End)
+                        {
+                            t.Height -= (cb.Bottom - v.End);
+
+                            cc.MatrixRowAligned = true;
+                        }
+                    }
+
+                    cc.BoundsRelative = t;
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RowComparer
+
+        private class MatrixComparer : IComparer<ChartContainer>
+        {
+            public int Compare(ChartContainer x, ChartContainer y)
+            {
+                return (x.MatrixDisplayOrder - y.MatrixDisplayOrder);
+            }
+        }
+
+        #endregion
+
+        #region GetMatrixLayout
+
+        private int GetMatrixLayout(
+            ChartLayoutInfo layoutInfo, ContainerLayout containerLayout)
+        {
+            int fillBase;
+            int noFillBase;
+
+            CalculateMatrixFillData(layoutInfo, containerLayout, out fillBase, out noFillBase);
+
+            int length = CalcMatrixContentSize(layoutInfo, containerLayout, fillBase, noFillBase);
+
+            return (length);
+        }
+
+        #region CalculateMatrixFillData
+
+        private void CalculateMatrixFillData(ChartLayoutInfo layoutInfo, 
+            ContainerLayout containerLayout, out int fillBase, out int noFillBase)
+        {
+            fillBase = 0;
+            noFillBase = 0;
+
+            if (containerLayout == ContainerLayout.Horizontal)
+            {
+                for (int i = 0; i < ChartMatrix.Width; i++)
+                {
+                    MatrixRowColProperties props = ChartMatrix.ColumnProperties[i];
+
+                    if (props.AutoSizeMode == AutoSizeMode.NotSet)
+                    {
+                        if (ChartMatrix[i] != null && AutoSizeMode != AutoSizeMode.None)
+                            fillBase += ChartMatrix[i].FillWeight;
+                        else
+                            noFillBase += props.Length;
+                    }
+                    else
+                    {
+                        if (props.AutoSizeMode != AutoSizeMode.None)
+                            fillBase += props.FillWeight;
+                        else
+                            noFillBase += props.Length;
+                    }
+                }
+            }
+            else
+            {
+                for (int i = 0; i < ChartMatrix.Height; i++)
+                {
+                    MatrixRowColProperties props = ChartMatrix.RowProperties[i];
+
+                    if (props.AutoSizeMode == AutoSizeMode.NotSet)
+                    {
+                        if (ChartMatrix[i] != null && AutoSizeMode != AutoSizeMode.None)
+                            fillBase += ChartMatrix[i].FillWeight;
+                        else
+                            noFillBase += props.Length;
+                    }
+                    else
+                    {
+                        if (props.AutoSizeMode != AutoSizeMode.None)
+                            fillBase += props.FillWeight;
+                        else
+                            noFillBase += props.Length;
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region CalcMatrixContentSize
+
+        private int CalcMatrixContentSize(ChartLayoutInfo layoutInfo, 
+            ContainerLayout containerLayout, int fillBase, int noFillBase)
+        {
+            int length;
+
+            if (containerLayout == ContainerLayout.Horizontal)
+                length = CalcHorizontalMatrixContentSize(layoutInfo, fillBase, noFillBase);
+            else
+                length = CalctVerticalMatrixContentSize(layoutInfo, fillBase, noFillBase);
+
+            return (length);
+        }
+
+        #region CalcHorizontalMatrixContentSize
+
+        private int CalcHorizontalMatrixContentSize(
+            ChartLayoutInfo layoutInfo, int fillBase, int noFillBase)
+        {
+            int lenNeeded = 0;
+            int n = layoutInfo.LayoutBounds.Width - noFillBase;
+
+            for (int i = 0; i < ChartMatrix.Width; i++)
+            {
+                MatrixRowColProperties props = ChartMatrix.ColumnProperties[i];
+
+                int length = 0;
+                AutoSizeMode autoSizeMode = props.AutoSizeMode;
+
+                if (autoSizeMode == AutoSizeMode.NotSet)
+                    autoSizeMode = AutoSizeMode;
+
+                if (fillBase > 0)
+                {
+                    int fillWeight = (ChartMatrix[i] != null && props.AutoSizeMode == AutoSizeMode.NotSet)
+                        ? ChartMatrix[i].FillWeight : props.FillWeight;
+
+                    if (fillWeight != 0)
+                    {
+                        if (i == ChartMatrix.Width - 1)
+                            length = layoutInfo.LayoutBounds.Width - lenNeeded;
+                        else
+                            length = (int)(n * (float)fillWeight / fillBase);
+                    }
+                }
+
+                int minLength = (props.MinimumLength > 0)
+                    ? props.MinimumLength : ChartMatrix.DefaultCellSize.Width;
+
+                length = Math.Max(length, minLength);
+
+                props.Length = length;
+
+                lenNeeded += length;
+            }
+
+            return (lenNeeded);
+        }
+
+        #endregion
+
+        #region CalctVerticalMatrixContentSize
+
+        private int CalctVerticalMatrixContentSize(
+            ChartLayoutInfo layoutInfo, int fillBase, int noFillBase)
+        {
+            int lengthNeeded = 0;
+            int n = layoutInfo.LayoutBounds.Height - noFillBase;
+
+            for (int i = 0; i < ChartMatrix.Height; i++)
+            {
+                MatrixRowColProperties props = ChartMatrix.RowProperties[i];
+
+                int length = 0;
+                AutoSizeMode autoSizeMode = props.AutoSizeMode;
+
+                if (autoSizeMode == AutoSizeMode.NotSet)
+                    autoSizeMode = AutoSizeMode;
+
+                if (fillBase > 0 && autoSizeMode != AutoSizeMode.None)
+                {
+                    if (props.FillWeight != 0)
+                    {
+                        if (i == ChartMatrix.Height - 1)
+                            length = layoutInfo.LayoutBounds.Height - lengthNeeded;
+                        else
+                            length = (int)(n * (float)props.FillWeight / fillBase);
+                    }
+                }
+
+                int minLength = (props.MinimumLength > 0)
+                    ? props.MinimumLength : ChartMatrix.DefaultCellSize.Height;
+
+                length = Math.Max(length, minLength);
+
+                props.Length = length;
+
+                lengthNeeded += length;
+            }
+
+            return (lengthNeeded);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region ArrangeOverride
+
+        protected override void ArrangeOverride(ChartLayoutInfo layoutInfo)
+        {
+            base.ArrangeOverride(layoutInfo);
+
+            layoutInfo.ScrollOffset.X += HScrollOffset;
+            layoutInfo.ScrollOffset.Y += VScrollOffset;
+
+            Rectangle scContentBounds = GetScrollBounds(ContentBounds);
+
+            _ChartMatrix.ScrollOffset = layoutInfo.ScrollOffset;
+
+            foreach (ChartContainer cc in _MatrixList)
+            {
+                if (cc.Visible == true)
+                {
+                    cc.Arrange(layoutInfo);
+
+                    cc.Displayed = cc.Bounds.IntersectsWith(scContentBounds);
+                }
+            }
+
+            layoutInfo.ScrollOffset.X -= HScrollOffset;
+            layoutInfo.ScrollOffset.Y -= VScrollOffset;
+        }
+
+        #endregion
+
+        #region RenderOverride
+
+        protected override void RenderOverride(ChartRenderInfo renderInfo)
+        {
+            Graphics g = renderInfo.Graphics;
+
+            ChartPanelVisualStyle pstyle = EffectivePanelStyle;
+            ContainerVisualStyle cstyle = GetEffectiveContainerStyle();
+
+            Rectangle scFrameBounds = GetScrollBounds(FrameBounds);
+            Rectangle scContentBounds = GetScrollBounds(ContentBounds);
+            Rectangle scDisplayBounds = GetDisplayBounds(scContentBounds);
+
+            RenderPanelBackground(g, scFrameBounds, cstyle);
+
+            cstyle.RenderBorder(g, scFrameBounds);
+
+            Rectangle imageBounds = GetImageBounds(FrameBounds, cstyle);
+
+            if (cstyle.ImageOverlay != ImageOverlay.Top)
+                cstyle.RenderBackgroundFigure(g, imageBounds);
+
+            Region clip = g.Clip;
+            g.SetClip(scContentBounds, CombineMode.Intersect);
+
+            if (ChartMatrix.Size.Width > 0 && ChartMatrix.Size.Height > 0)
+                RenderMatrix(renderInfo, pstyle);
+
+            if (_MatrixList == null || _MatrixList.Count <= 0)
+                RenderEmptyText(g, cstyle, scDisplayBounds);
+
+            if (cstyle.ImageOverlay == ImageOverlay.Top)
+                cstyle.RenderBackgroundFigure(g, imageBounds);
+
+            RenderScrollbars(renderInfo);
+
+            g.Clip = clip;
+
+            if (cstyle.DropShadow.Enabled == Tbool.True)
+                cstyle.DropShadow.RenderDropShadow(g, scFrameBounds, true, true);
+
+            base.RenderOverride(renderInfo);
+        }
+
+        #region RenderPanelBackground
+
+        private void RenderPanelBackground(
+            Graphics g, Rectangle bounds, ContainerVisualStyle cstyle)
+        {
+            ChartControl chartControl = ChartControl;
+
+            if (chartControl.DoPreRenderPanelBackgroundEvent(g, this, bounds) == false)
+            {
+                cstyle.RenderBackground(g, bounds);
+
+                chartControl.DoPostRenderPanelBackgroundEvent(g, this, bounds);
+            }
+        }
+
+        #endregion
+
+        #region GetImageBounds
+
+        private Rectangle GetImageBounds(Rectangle bounds, ContainerVisualStyle style)
+        {
+            bounds = GetAdjustedBounds(bounds, style.BorderThickness);
+
+            Rectangle scBounds = GetScrollBounds(bounds);
+
+            if (HScrollBar.Visible == true)
+                scBounds.Height -= HScrollBar.Height;
+
+            if (VScrollBar.Visible == true)
+                scBounds.Width -= VScrollBar.Width;
+
+            return (scBounds);
+        }
+
+        #endregion
+
+        #region RenderMatrix
+
+        private void RenderMatrix(ChartRenderInfo renderInfo, ChartPanelVisualStyle style)
+        {
+            Graphics g = renderInfo.Graphics;
+
+            // Render divider lines
+
+            switch (ChartMatrix.DividerLines)
+            {
+                case DividerLines.Horizontal:
+                    RenderDividerLinesX(g, style.DividerLineX);
+                    break;
+
+                case DividerLines.Vertical:
+                    RenderDividerLinesY(g, style.DividerLineY);
+                    break;
+
+                case DividerLines.BothXy:
+                    RenderDividerLinesX(g, style.DividerLineX);
+                    RenderDividerLinesY(g, style.DividerLineY);
+                    break;
+
+                case DividerLines.BothYx:
+                    RenderDividerLinesY(g, style.DividerLineY);
+                    RenderDividerLinesX(g, style.DividerLineX);
+                    break;
+            }
+
+            // Render each matrix item
+
+            if (_MatrixList != null && _MatrixList.Count > 0)
+            {
+                foreach (ChartContainer cc in _MatrixList)
+                    cc.Render(renderInfo);
+            }
+        }
+
+        #region RenderDividerLinesX
+
+        private void RenderDividerLinesX(Graphics g, DividerLineVisualStyle style)
+        {
+            if (style.LinePattern != LinePattern.None && style.LineWidth != 0)
+            {
+                LinePattern pattern = (style.LinePattern == LinePattern.NotSet) ? LinePattern.Solid : style.LinePattern;
+                int thickness = (style.LineWidth > 0) ? style.LineWidth : 1;
+
+                int n = ChartMatrix.Width - 1;
+                int xoffset = _ChartMatrix.ScrollOffset.X;
+                int yoffset = _ChartMatrix.ScrollOffset.Y;
+
+                for (int i = 1; i < ChartMatrix.Height; i++)
+                {
+                    Point pt1 = ChartMatrix.BoundsArray[0, i].Location;
+                    Point pt2 = ChartMatrix.BoundsArray[n, i].Location;
+
+                    pt1.X -= xoffset;
+                    pt1.Y -= yoffset;
+
+                    pt2.X -= xoffset;
+                    pt2.Y -= yoffset;
+
+                    pt2.X += ChartMatrix.BoundsArray[n, i].Width;
+
+                    using (Pen pen = new Pen(style.LineColor, Dpi.Width(style.LineWidth)))
+                    {
+                        pen.DashStyle = (DashStyle)pattern;
+
+                        g.DrawLine(pen, pt1, pt2);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region RenderDividerLinesY
+
+        private void RenderDividerLinesY(Graphics g, DividerLineVisualStyle style)
+        {
+            if (style.LinePattern != LinePattern.None && style.LineWidth != 0)
+            {
+                LinePattern pattern = (style.LinePattern == LinePattern.NotSet) ? LinePattern.Solid : style.LinePattern;
+                int thickness = (style.LineWidth > 0) ? style.LineWidth : 1;
+
+                int n = ChartMatrix.Height - 1;
+                int xoffset = _ChartMatrix.ScrollOffset.X;
+                int yoffset = _ChartMatrix.ScrollOffset.Y;
+
+                for (int i = 1; i < ChartMatrix.Width; i++)
+                {
+                    Point pt1 = ChartMatrix.BoundsArray[i, 0].Location;
+                    Point pt2 = ChartMatrix.BoundsArray[i, n].Location;
+
+                    pt1.X -= xoffset;
+                    pt1.Y -= yoffset;
+
+                    pt2.X -= xoffset;
+                    pt2.Y -= yoffset;
+
+                    pt2.Y += ChartMatrix.BoundsArray[i, n].Height;
+
+                    using (Pen pen = new Pen(style.LineColor, Dpi.Height(thickness)))
+                    {
+                        pen.DashStyle = (DashStyle)pattern;
+
+                        g.DrawLine(pen, pt1, pt2);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region Mouse handling
+
+        #region OnMouseMove
+
+        protected override bool OnMouseMove(MouseEventArgs e)
+        {
+            if (base.OnMouseMove(e) == true)
+                return (true);
+
+            return (false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region OnResize
+
+        protected override bool OnResize(EventArgs e)
+        {
+            InvalidateLayout();
+
+            foreach (ChartContainer cc in ChartContainers)
+                cc.InternalOnResize(e);
+
+            return (base.OnResize(e));
+        }
+
+        #endregion
+
+        #region GetElementAt
+
+        /// <summary>
+        /// Gets the visua element at the given Point.
+        /// </summary>
+        /// <param name="pt"></param>
+        /// <returns></returns>
+        public override ChartVisualElement GetElementAt(Point pt)
+        {
+            ChartVisualElement item = base.GetElementAt(pt);
+
+            if (item == null)
+            {
+                if (ContentBounds.Contains(pt))
+                {
+                    if (ChartMatrix.IsEmpty == false)
+                    {
+                        item = ChartMatrix.GetElementAt(pt);
+
+                        if (item != null && item.Visible == true)
+                        {
+                            if (item.Bounds.Contains(pt))
+                            {
+                                ChartVisualElement subItem = item.GetElementAt(pt);
+
+                                if (subItem != null)
+                                    return (subItem);
+
+                                return (item);
+                            }
+
+                            return (null);
+                        }
+                    }
+                }
+            }
+
+            return (item);
+        }
+
+        #endregion
+
+        #region GetMatrixCoordAt
+
+        /// <summary>
+        /// Gets the matric coordinate (row/column) at the given Point.
+        /// </summary>
+        /// <param name="pt"></param>
+        /// <param name="column"></param>
+        /// <param name="row"></param>
+        /// <returns>true if valid coordinate is returned</returns>
+        public bool GetMatrixCoordAt(Point pt, ref int column, ref int row)
+        {
+            if (ContentBounds.Contains(pt))
+                return (ChartMatrix.GetMatrixCoordAt(pt, ref column, ref row));
+
+            return (false);
+        }
+
+        #endregion
+
+        #region GetMatrixCoordOf
+
+        /// <summary>
+        /// Gets the matric coordinate (row/column) of the given container.
+        /// </summary>
+        /// <param name="item"></param>
+        /// <param name="row"></param>
+        /// <param name="column"></param>
+        /// <returns>true if valid coordinate returned.</returns>
+        public bool GetMatrixCoordOf(ChartContainer item, ref int row, ref int column)
+        {
+            return (ChartMatrix.GetMatrixCoordOf(item, ref row, ref column));
+        }
+
+        #endregion
+
+        #region Style handling
+
+        #region ApplyStyles
+
+        public override void ApplyStyles(BaseVisualStyle style)
+        {
+            ChartPanelVisualStyle pstyle = style as ChartPanelVisualStyle;
+
+            if (pstyle != null)
+            {
+                ApplyParentStyles(pstyle, Parent as ChartContainer);
+
+                pstyle.DividerLineX.ApplyStyle(DefaultVisualStyles.DividerLineVisualStyle);
+                pstyle.DividerLineY.ApplyStyle(DefaultVisualStyles.DividerLineVisualStyle);
+
+                pstyle.ApplyStyle(DefaultVisualStyles.ChartPanelVisualStyle);
+                pstyle.ApplyStyle(ChartPanelVisualStyle);
+            }
+        }
+
+        #region ApplyParentStyles
+
+        private void ApplyParentStyles(ChartPanelVisualStyle pstyle, ChartContainer item)
+        {
+            if (item != null)
+            {
+                ApplyParentStyles(pstyle, item.Parent as ChartContainer);
+
+                ChartPanel panel = item as ChartPanel;
+
+                if (panel != null)
+                {
+                    pstyle.DividerLineX.ApplyStyle(panel.DefaultVisualStyles.DividerLineVisualStyle);
+                    pstyle.DividerLineY.ApplyStyle(panel.DefaultVisualStyles.DividerLineVisualStyle);
+
+                    pstyle.ApplyStyle(panel.DefaultVisualStyles.ChartPanelVisualStyle);
+                }
+            }
+            else
+            {
+                pstyle.ApplyStyle(ChartControl.BaseVisualStyles.ChartPanelVisualStyle);
+
+                pstyle.DividerLineX.ApplyStyle(ChartControl.DefaultVisualStyles.DividerLineVisualStyle);
+                pstyle.DividerLineY.ApplyStyle(ChartControl.DefaultVisualStyles.DividerLineVisualStyle);
+
+                pstyle.ApplyStyle(ChartControl.DefaultVisualStyles.ChartPanelVisualStyle);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ClearEffectiveStyles
+
+        protected override void ClearEffectiveStyles()
+        {
+            base.ClearEffectiveStyles();
+
+            _EffectivePanelStyle.InvalidateStyle();
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ILegendData
+
+        #region GetLegendData
+
+        public override List<ChartLegendItem> GetLegendData()
+        {
+            LegendData = new List<ChartLegendItem>();
+
+            if (LegendSource != LegendSource.None)
+            {
+                ChartContainerCollection containers = ChartContainers;
+
+                foreach (ChartContainer cc in containers)
+                {
+                    if ((cc is ChartPanel) && ((LegendSource & LegendSource.NestedPanels) != 0) ||
+                        (cc is BaseChart) && ((LegendSource & LegendSource.NestedCharts) != 0))
+                    {
+                        List<ChartLegendItem> data = cc.GetLegendData();
+
+                        if (data != null && data.Count > 0)
+                            AddLegendItems(data);
+                    }
+                }
+            }
+
+            return (_LegendData);
+        }
+
+        #region AddLegendItems
+
+        private void AddLegendItems(List<ChartLegendItem> items)
+        {
+            foreach (ChartLegendItem item in items)
+            {
+                ChartLegendItem likeItem = null;
+
+                if (Legend.CombineLikeItems == true)
+                    likeItem = FindLikeItems(item);
+
+                if (likeItem == null)
+                {
+                    likeItem = new ChartLegendItem();
+
+                    likeItem.Parent = Legend;
+
+                    likeItem.Name = item.Name;
+                    likeItem.ItemText = item.ItemText;
+
+                    _LegendData.Add(likeItem);
+                }
+
+                likeItem.ChartItems.AddRange(item.ChartItems);
+            }
+        }
+
+        #region FindLikeItems
+
+        private ChartLegendItem FindLikeItems(ChartLegendItem item)
+        {
+            string itemName = item.Name ?? item.ItemText;
+
+            if (String.IsNullOrEmpty(itemName) == false)
+            {
+                foreach (ChartLegendItem likeItem in _LegendData)
+                {
+                    string likeName = likeItem.Name ?? likeItem.ItemText;
+
+                    if (String.IsNullOrEmpty(likeName) == false)
+                    {
+                        if (likeName.Equals(itemName) == true)
+                            return (likeItem);
+                    }
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region GetContainerByName
+
+        /// <summary>
+        /// Gets the ChartContainer object from the given name.
+        /// </summary>
+        /// <param name="name"></param>
+        /// <returns></returns>
+        public ChartContainer GetContainerByName(string name)
+        {
+            return (GetContainerByName(name, false));
+        }
+
+        /// <summary>
+        /// Gets the ChartContainer object from the given name, with
+        /// optional searching of nested panels/charts.
+        /// </summary>
+        /// <param name="name"></param>
+        /// <param name="searchNested"></param>
+        /// <returns></returns>
+        public ChartContainer GetContainerByName(string name, bool searchNested)
+        {
+            if (String.IsNullOrEmpty(name) == true)
+                return (null);
+
+            if (_ChartContainers != null)
+            {
+                foreach (ChartContainer container in _ChartContainers)
+                {
+                    if (name.Equals(container.Name) == true)
+                        return (container);
+
+                    else if (searchNested == true)
+                    {
+                        ChartPanel panel = container as ChartPanel;
+
+                        if (panel != null)
+                        {
+                            ChartContainer item = panel.GetContainerByName(name, true);
+
+                            if (item != null)
+                                return (item);
+                        }
+                    }
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetChartByName
+
+        /// <summary>
+        /// Gets the BaseChart from the given name.
+        /// </summary>
+        /// <param name="name"></param>
+        /// <returns></returns>
+        public BaseChart GetChartByName(string name)
+        {
+            return (GetChartByName(name, false));
+        }
+
+        /// <summary>
+        /// Gets the BaseChart from the given name, optionally searching
+        /// nested panels and charts.
+        /// </summary>
+        /// <param name="name"></param>
+        /// <param name="searchNested"></param>
+        /// <returns></returns>
+        public BaseChart GetChartByName(string name, bool searchNested)
+        {
+            if (String.IsNullOrEmpty(name) == true)
+                return (null);
+
+            if (_ChartContainers != null)
+            {
+                foreach (ChartContainer container in _ChartContainers)
+                {
+                    if (container is BaseChart)
+                    {
+                        if (name.Equals(container.Name) == true)
+                            return ((BaseChart)container);
+                    }
+                    else if (searchNested == true)
+                    {
+                        ChartPanel panel = container as ChartPanel;
+
+                        if (panel != null)
+                        {
+                            BaseChart item = panel.GetChartByName(name, true);
+
+                            if (item != null)
+                                return (item);
+                        }
+                    }
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetPanelByName
+
+        /// <summary>
+        /// Gets the ChartPanel from the given name.
+        /// </summary>
+        /// <param name="name"></param>
+        /// <returns></returns>
+        public ChartPanel GetPanelByName(string name)
+        {
+            return (GetPanelByName(name, false));
+        }
+
+        /// <summary>
+        /// Gets the ChartPanel from the given name, optionally 
+        /// searching through nested panels.
+        /// </summary>
+        /// <param name="name"></param>
+        /// <param name="searchNested"></param>
+        /// <returns></returns>
+        public ChartPanel GetPanelByName(string name, bool searchNested)
+        {
+            if (String.IsNullOrEmpty(name) == true)
+                return (null);
+
+            if (_ChartContainers != null)
+            {
+                foreach (ChartContainer container in _ChartContainers)
+                {
+                    ChartPanel panel = container as ChartPanel;
+
+                    if (panel != null)
+                    {
+                        if (name.Equals(panel.Name) == true)
+                            return (panel);
+
+                        if (searchNested == true)
+                        {
+                            ChartPanel item = panel.GetPanelByName(name, true);
+
+                            if (item != null)
+                                return (item);
+                        }
+                    }
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region Copy/CopyTo
+
+        public override ChartVisualElement Copy()
+        {
+            ChartPanel copy = new ChartPanel();
+
+            CopyTo(copy);
+
+            return (copy);
+        }
+
+        public override void CopyTo(ChartVisualElement copy)
+        {
+            ChartPanel c = copy as ChartPanel;
+
+            if (c != null)
+            {
+                base.CopyTo(c);
+
+                c.AutoFillChartMatrix = AutoFillChartMatrix;
+                c.AutoGenSeriesCollection = AutoGenSeriesCollection;
+                c.AutoSizeChartMatrix = AutoSizeChartMatrix;
+
+                foreach (ChartContainer cc in ChartContainers)
+                    c.ChartContainers.Add((ChartContainer)cc.Copy());
+
+                c.ChartMatrix = ChartMatrix.Copy();
+
+                c.ChartPanelVisualStyle = 
+                    (_ChartPanelVisualStyle != null) ? ChartPanelVisualStyle.Copy() : null;
+
+                c.ContainerLayout = ContainerLayout;
+
+                c.DefaultVisualStyles =
+                    (_DefaultVisualStyles != null) ? DefaultVisualStyles.Copy() : null;
+
+                c.LegendSource = LegendSource;
+            }
+        }
+
+        #endregion
+
+        #region GetSerialData
+
+        internal override SerialElementCollection GetSerialData(string serialName)
+        {
+            SerialElementCollection sec = new SerialElementCollection();
+
+            if (serialName != null)
+            {
+                if (serialName.Equals("") == true)
+                    serialName = "ChartPanel";
+
+                sec.AddStartElement(serialName);
+            }
+
+            sec.AddValue("AutoFillChartMatrix", AutoFillChartMatrix, true);
+            sec.AddValue("AutoGenSeriesCollection", AutoGenSeriesCollection, false);
+            sec.AddValue("AutoSizeChartMatrix", AutoSizeChartMatrix, true);
+
+            if (ChartContainers.Count > 0)
+            {
+                sec.AddStartElement("ChartContainers count=\"" + ChartContainers.Count + "\"");
+
+                foreach (ChartContainer cc in ChartContainers)
+                    sec.AddElement(cc.GetSerialData(""));
+
+                sec.AddEndElement("ChartContainers");
+            }
+
+            if (_ChartMatrix != null && _ChartMatrix.IsEmpty == false)
+            {
+                if (AutoFillChartMatrix == false)
+                    sec.AddElement(_ChartMatrix.GetSerialData());
+            }
+
+            if (_ChartPanelVisualStyle != null && _ChartPanelVisualStyle.IsEmpty == false)
+                sec.AddElement(_ChartPanelVisualStyle.GetSerialData("ChartPanelVisualStyle"));
+
+            sec.AddValue("ContainerLayout", ContainerLayout, ContainerLayout.Auto);
+
+            if (_DefaultVisualStyles != null && _DefaultVisualStyles.IsEmpty == false)
+                sec.AddElement(_DefaultVisualStyles.GetSerialData());
+
+            sec.AddValue("LegendSource",
+                LegendSource, (LegendSource.NestedCharts | LegendSource.NestedPanels));
+
+            sec.AddElement(base.GetSerialData(null));
+
+            if (serialName != null)
+                sec.AddEndElement(serialName);
+
+            return (sec);
+        }
+
+        #endregion
+
+        #region PutSerialData
+
+        #region ProcessValue
+
+        internal override void ProcessValue(SerialElement se)
+        {
+            switch (se.Name)
+            {
+                case "AutoFillChartMatrix":
+                    AutoFillChartMatrix = bool.Parse(se.StringValue);
+                    break;
+
+                case "AutoGenSeriesCollection":
+                    AutoGenSeriesCollection = bool.Parse(se.StringValue);
+                    break;
+
+                case "AutoSizeChartMatrix":
+                    AutoSizeChartMatrix = bool.Parse(se.StringValue);
+                    break;
+
+                case "ContainerLayout":
+                    ContainerLayout = (ContainerLayout)se.GetValueEnum(typeof(ContainerLayout));
+                    break;
+
+                case "LegendSource":
+                    LegendSource = (LegendSource)se.GetValueEnum(typeof(LegendSource));
+                    break;
+
+                default:
+                    base.ProcessValue(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region ProcessCollection
+
+        internal override void ProcessCollection(SerialElement se)
+        {
+            SerialElementCollection sec = se.Sec;
+
+            switch (se.Name)
+            {
+                case "ChartPanel":
+                case "ChartContainers":
+                    sec.PutSerialData(this);
+                    break;
+
+                case "ChartXy":
+                    string name = sec.GetItemValue("Name");
+
+                    ChartXy chartXy = new ChartXy(name);
+
+                    sec.PutSerialData(chartXy);
+
+                    ChartContainers.Add(chartXy);
+                    break;
+
+                case "ChartMatrix":
+                    sec.PutSerialData(ChartMatrix);
+                    break;
+
+                case "ChartPanelVisualStyle":
+                    sec.PutSerialData(ChartPanelVisualStyle);
+                    break;
+
+                case "DefaultVisualStyles":
+                    sec.PutSerialData(DefaultVisualStyles);
+                    break;
+
+                case "PieChart":
+                    string pname = sec.GetItemValue("Name");
+
+                    PieChart pieChart = new PieChart(pname);
+
+                    sec.PutSerialData(pieChart);
+
+                    ChartContainers.Add(pieChart);
+                    break;
+
+                default:
+                    base.ProcessCollection(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region States
+
+        [Flags]
+        private enum States : uint
+        {
+            AutoFillChartMatrix = (1U << 0),
+            AutoGenSeriesCollection = (1U << 1),
+            AutoSizeChartMatrix = (1U << 2),
+        }
+
+        #region TestState
+
+        private bool TestState(States state)
+        {
+            return ((_States & state) == state);
+        }
+
+        #endregion
+
+        #region SetState
+
+        private void SetState(States state, bool value)
+        {
+            if (value == true)
+                _States |= state;
+            else
+                _States &= ~state;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Structs
+
+        private struct Vector
+        {
+            public int Start;
+            public int End;
+
+            public bool IsEmpty
+            {
+                get { return (Start == End); }
+            }
+        }
+
+        #endregion
+
+        #region IDisposable
+
+        public override void Dispose()
+        {
+            ChartContainers = null;
+            ChartMatrix = null;
+            ChartPanelVisualStyle = null;
+            DefaultVisualStyles = null;
+
+            base.Dispose();
+        }
+
+        #endregion
+    }
+
+    #region enums
+
+    #region ContainerLayout
+
+    public enum ContainerLayout
+    {
+        Auto,
+        Horizontal,
+        Vertical,
+        HorizontalThenVertical,
+        VerticalThenHorizontal,
+    }
+
+    #endregion
+
+    #region DividerLines
+
+    ///<summary>
+    /// Specifies which divider lines are displayed
+    ///</summary>
+    public enum DividerLines
+    {
+        ///<summary>
+        /// Not set
+        ///</summary>
+        NotSet,
+
+        ///<summary>
+        /// No lines are displayed
+        ///</summary>
+        None,
+
+        ///<summary>
+        /// Only horizontal divider lines are displayed
+        ///</summary>
+        Horizontal,
+
+        ///<summary>
+        /// Only vertical divider lines are displayed
+        ///</summary>
+        Vertical,
+
+        ///<summary>
+        /// Both horizontal and vertical divider lines are displayed,
+        /// horizontal first, then vertical.
+        ///</summary>
+        BothXy,
+
+        ///<summary>
+        /// Both horizontal and vertical divider lines are displayed
+        /// vertical first, then horizontal.
+        ///</summary>
+        BothYx,
+    }
+
+    #endregion
+
+    #region LegendSource
+
+    [Flags]
+    public enum LegendSource
+    {
+        None = 0,
+
+        NestedCharts = (1 << 0),
+        NestedPanels = (1 << 1),
+    }
+
+    #endregion
+
+    #endregion
+
+    #region BlankExpandableObjectConverter
+
+    ///<summary>
+    /// BlankExpandableObjectConverter
+    ///</summary>
+    public class BlankExpandableObjectConverter : ExpandableObjectConverter
+    {
+        ///<summary>
+        /// ConvertTo
+        ///</summary>
+        ///<param name="context"></param>
+        ///<param name="culture"></param>
+        ///<param name="value"></param>
+        ///<param name="destinationType"></param>
+        ///<returns></returns>
+        public override object ConvertTo(
+            ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+        {
+            if (destinationType == typeof(string))
+                return (" ");
+
+            return (base.ConvertTo(context, culture, value, destinationType));
+        }
+    }
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/ChartRenderInfo.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/ChartRenderInfo.cs
new file mode 100644
index 00000000..a4098a3c
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/ChartRenderInfo.cs	
@@ -0,0 +1,24 @@
+using DevComponents.DotNetBar.Charts.Style;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Charts
+{
+    /// <summary>
+    /// Provides the rendering information for chart render pass.
+    /// </summary>
+    public class ChartRenderInfo
+    {
+        #region Public properties
+
+        public readonly Graphics Graphics;
+        public readonly Rectangle ClipRectangle;
+
+        #endregion
+
+        public ChartRenderInfo(Graphics graphics, Rectangle clipRectangle)
+        {
+            Graphics = graphics;
+            ClipRectangle = clipRectangle;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/ChartSeries.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/ChartSeries.cs
new file mode 100644
index 00000000..b828b583
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/ChartSeries.cs	
@@ -0,0 +1,10637 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Drawing.Drawing2D;
+using System.Globalization;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.Charts.Style;
+
+namespace DevComponents.DotNetBar.Charts
+{
+    /// <summary>
+    /// Represents the collection of ChartSeries.
+    /// </summary>
+    [Editor("DevComponents.Charts.Design.ChartSeriesCollectionEditor, DevComponents.Charts.Design, " +
+            "Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(UITypeEditor))]
+    public class ChartSeriesCollection : CustomNamedCollection<ChartSeries>
+    {
+        #region GetUniqueName
+
+        public string GetUniqueName()
+        {
+            return (GetUniqueName("Series"));
+        }
+
+        #endregion
+    }
+
+    public class ChartSeries : ChartVisualElement, ILegendItem
+    {
+        #region Constants
+
+        private const int StockHigh = 0;
+        private const int StockLow = 1;
+        private const int StockClose = 2;
+        private const int StockOpen = 3;
+        private const int StockMedian = 4;
+
+        #endregion
+
+        #region Private variables
+
+        private States _States;
+
+        private SeriesType _SeriesType = SeriesType.Point;
+        private SeriesPointCollection _SeriesPoints;
+
+        private PointData _PointData;
+        private PointData _EmptyPointData;
+        private PointData _StepPointData;
+
+        private object _DataSource;
+        private string _DataMember;
+        private DataBinder _DataBinder;
+
+        private string _DataPropertyNameSeries;
+        private string _DataPropertyNameX;
+        private CustomCollection<string> _DataPropertyNamesY;
+
+        private int _SeriesId;
+        private object _SeriesKey;
+
+        private ChartAxis _AxisX;
+        private ChartAxis _AxisY;
+
+        private int _BarOffset;
+        private int _BarWidth;
+        private double _BarWidthRatio;
+
+        private Tbool _BarShadingEnabled = Tbool.NotSet;
+        private BarFillRange _BarFillRange = BarFillRange.NotSet;
+        private BarLabelPosition _BarLabelPosition = BarLabelPosition.NotSet;
+
+        private Color[] _BarShadingColors;
+
+        private ChartLegendItemVisualStyles _ChartLegendItemVisualStyles;
+
+        private ChartSeriesVisualStyle _ChartSeriesVisualStyle;
+        private EffectiveStyle<ChartSeriesVisualStyle> _EffectiveChartSeriesStyle;
+
+        private DataLabelVisualStyle _DataLabelVisualStyle;
+        private EffectiveStyle<DataLabelVisualStyle> _EffectiveDataLabelStyle;
+
+        private Tbool _CrosshairEnabled = Tbool.NotSet;
+        private Tbool _CrosshairHighlightPoints = Tbool.NotSet;
+        private Tbool _CrosshairShowLabels = Tbool.NotSet;
+
+        private ScaleType _ScaleTypeX = ScaleType.NotSet;
+        private ScaleType _ScaleTypeY = ScaleType.NotSet;
+        private ScaleType _ActualScaleTypeX = ScaleType.NotSet;
+        private ScaleType _ActualScaleTypeY = ScaleType.NotSet;
+
+        private string _LegendText;
+        private ChartLegendItem _LegendItem;
+
+        private object _MinValueX;
+        private object _MinValueY;
+
+        private object _MaxValueX;
+        private object _MaxValueY;
+
+        private object _AreaBaseValue;
+
+        private bool _SeriesRangeChanged = true;
+        private SortedSeriesPoints _SortedSeriesPoints;
+        private object[] _EmptyValues;
+
+        private List<object> _QualitativeXValues;
+        private List<object> _QualitativeYValues;
+
+        private PointMarker _PointMarker;
+        private Image _PointMarkerImage;
+        private Image _PointMarkerEmptyImage;
+        private Image _PointMarkerHighlightImage;
+        private Point _PointOffset;
+
+        private int _GroupId;
+        private object _PlotData;
+        private double _DotPlotIndexValue = 1.0d;
+
+        private ChartIndicatorCollection _ChartIndicators;
+        private Point[] _ConvexHullPoints;
+
+        private double _BubbleScaleFactor = 1.0d;
+        private double _BubbleMaxPercentage = .25d;
+        private int _BubbleMinSize = 4;
+        private BubbleSizeMode _BubbleSizeMode = BubbleSizeMode.NotSet;
+
+        private BubbleIntensityMode _BubbleIntensityMode = BubbleIntensityMode.NotSet;
+        private ChartLineDisplayMode _ChartLineDisplayMode = ChartLineDisplayMode.NotSet;
+        private ChartLineAreaDisplayMode _ChartLineAreaDisplayMode = ChartLineAreaDisplayMode.NotSet;
+        private ConvexHullDisplayMode _ConvexHullDisplayMode = ConvexHullDisplayMode.NotSet;
+        private PointLabelDisplayMode _PointLabelDisplayMode = PointLabelDisplayMode.NotSet;
+
+        private StepLines _StepLines = StepLines.NotSet;
+        private StepLineMode _StepLineMode = StepLineMode.NotSet;
+        private StepLineMode _LastStepLineMode = StepLineMode.NotSet;
+
+        private Color _DefaultPaletteColor = Color.Empty;
+
+        private DataLabelCollection _DataLabels;
+        private int _PointLabelSkip;
+        private int _PointLabelMinDistance;
+
+        private HiLoBarType _HiLoBarType = HiLoBarType.Box;
+        private Rectangle _RenderBounds;
+
+        #endregion
+
+        #region Constructors
+
+        public ChartSeries()
+            : this(null, SeriesType.Point)
+        {
+        }
+
+        public ChartSeries(string name)
+            : this(name, SeriesType.Point)
+        {
+        }
+
+        public ChartSeries(SeriesType seriesType)
+            : this(null, seriesType)
+        {
+        }
+
+        public ChartSeries(string name, SeriesType seriesType)
+        {
+            Name = name;
+            SeriesType = seriesType;
+
+            InitDefaultStates();
+
+            _EffectiveChartSeriesStyle = new EffectiveStyle<ChartSeriesVisualStyle>(this);
+            _EffectiveDataLabelStyle = new EffectiveStyle<DataLabelVisualStyle>(this);
+        }
+
+        #endregion
+
+        #region InitDefaultStates
+
+        private void InitDefaultStates()
+        {
+            SetState(States.ShowInLegend, true);
+            SetState(States.ShowInParentLegend, true);
+            SetState(States.ShowCheckBoxInLegend, true);
+            SetState(States.ShowMarkerInLegend, true);
+            SetState(States.CheckedInLegend, true);
+            SetState(States.DisplayLinePointsOnTop, true);
+            SetState(States.StackQualitativePoints, true);
+            SetState(States.ShowOriginValueLabels, true);
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region ActualScaleTypeX
+
+        ///<summary>
+        /// Gets the Actual X axis Scale Type (may be
+        /// different than XScaleType when XScaleType is 'Auto').
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public ScaleType ActualScaleTypeX
+        {
+            get
+            {
+                if (IsRotated == false)
+                    return (_ActualScaleTypeX);
+
+                return (_ActualScaleTypeY);
+            }
+
+            internal set { _ActualScaleTypeX = value; }
+        }
+
+        #endregion
+
+        #region ActualScaleTypeY
+
+        ///<summary>
+        /// Gets the Actual Y axis Scale Type (may be
+        /// different than YScaleType when YScaleType is 'Auto').
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public ScaleType ActualScaleTypeY
+        {
+            get
+            {
+                if (IsRotated == true)
+                    return (_ActualScaleTypeX);
+
+                return (_ActualScaleTypeY);
+            }
+
+            internal set { _ActualScaleTypeY = value; }
+        }
+
+        #endregion
+
+        #region AreaBaseValue
+
+        ///<summary>
+        /// Gets or sets the base, reference value for displaying Line/Spline/Step Areas.
+        ///</summary>
+        [DefaultValue(null), Category("Data")]
+        [Description("Indicates the base, reference value for displaying Line/Spline/Step Areas.")]
+        [TypeConverter("DevComponents.Charts.Design.PointValueConverter," +
+            "DevComponents.Charts.Design, Version=14.1.0.37, Culture=neutral, PublicKeyToken=90f470f34c89ccaf")]
+        public object AreaBaseValue
+        {
+            get { return (_AreaBaseValue); }
+
+            set
+            {
+                if (value != _AreaBaseValue)
+                {
+                    _AreaBaseValue = value;
+
+                    OnPropertyChangedEx("AreaBaseValue", Style.VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region AxisX
+
+        /// <summary>
+        /// Gets a reference to the X-Axis associated with the series.
+        /// </summary>
+        [Category("Axis"), DefaultValue(null)]
+        [Description("Indicates the reference to the X-Axis associated with the series.")]
+        [TypeConverter(typeof(AxisTypeConverter))]
+        [Editor("DevComponents.Charts.Design.AxisListTypeEditor, DevComponents.Charts.Design, " +
+                "Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(UITypeEditor))]
+        public ChartAxis AxisX
+        {
+            get { return (_AxisX); }
+
+            set
+            {
+                if (value != _AxisX)
+                {
+                    ChartXy chartXy = Parent as ChartXy;
+
+                    if (value != null)
+                    {
+                        if (value.IsPrimaryAxis == false)
+                        {
+                            if (chartXy != null)
+                            {
+                                if (chartXy.AncillaryAxesX.Contains(value) == false)
+                                {
+                                    throw new Exception("Cannot set the series XAxis. The axis is not primary " +
+                                        "or a member of the chart's AncillaryAxesX collection.");
+                                }
+                            }
+                        }
+                    }
+
+                    if (_AxisX != null)
+                    {
+                        _AxisX.SeriesRangeChanged = true;
+                        _AxisX.PropertyChanged -= AxisX_PropertyChanged;
+                    }
+                    else
+                    {
+                        if (chartXy != null)
+                            chartXy.AxisX.SeriesRangeChanged = true;
+                    }
+
+                    _AxisX = value;
+
+                    if (_AxisX != null)
+                    {
+                        _AxisX.SeriesRangeChanged = true;
+                        _AxisX.PropertyChanged += AxisX_PropertyChanged;
+                    }
+                    else
+                    {
+                        if (chartXy != null)
+                            chartXy.AxisX.SeriesRangeChanged = true;
+                    }
+
+                    OnPropertyChangedEx("AxisX", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        void AxisX_PropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            InvalidateLayout();
+        }
+
+        #endregion
+
+        #region AxisY
+
+        /// <summary>
+        /// Gets a reference to the Y-Axis associated with the series.
+        /// </summary>
+        [Category("Axis"), DefaultValue(null)]
+        [Description("Indicates the reference to the Y-Axis associated with the series.")]
+        [Editor("DevComponents.Charts.Design.AxisListTypeEditor, DevComponents.Charts.Design, " +
+                "Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(UITypeEditor))]
+        public ChartAxis AxisY
+        {
+            get { return (_AxisY); }
+
+            set
+            {
+                if (value != _AxisY)
+                {
+                    ChartXy chartXy = Parent as ChartXy;
+
+                    if (value != null)
+                    {
+                        if (value.IsPrimaryAxis == false)
+                        {
+                            if (chartXy != null)
+                            {
+                                if (chartXy.AncillaryAxesY.Contains(value) == false)
+                                {
+                                    throw new Exception("Cannot set the series YAxis. The axis is not primary " +
+                                        "or a member of the chart's AncillaryAxesY collection.");
+                                }
+                            }
+                        }
+                    }
+
+                    if (_AxisY != null)
+                    {
+                        _AxisY.SeriesRangeChanged = true;
+                        _AxisY.PropertyChanged -= AxisY_PropertyChanged;
+                    }
+                    else
+                    {
+                        if (chartXy != null)
+                            chartXy.AxisY.SeriesRangeChanged = true;
+                    }
+
+                    _AxisY = value;
+
+                    if (_AxisY != null)
+                    {
+                        _AxisY.SeriesRangeChanged = true;
+                        _AxisY.PropertyChanged += AxisY_PropertyChanged;
+                    }
+                    else
+                    {
+                        if (chartXy != null)
+                            chartXy.AxisY.SeriesRangeChanged = true;
+                    }
+
+                    OnPropertyChangedEx("AxisY", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        void AxisY_PropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            InvalidateLayout();
+        }
+
+        #endregion
+
+        #region BarFillRange
+
+        /// <summary>
+        /// Gets or sets how series bars are filled (either according to
+        /// each individual bar range, or the entire series range).
+        /// </summary>
+        [DefaultValue(BarFillRange.NotSet), Category("Bar Display")]
+        [Description("Indicates how series bars are filled (either according to each individual bar range, or the entire series range).")]
+        public BarFillRange BarFillRange
+        {
+            get { return (_BarFillRange); }
+
+            set
+            {
+                if (value != _BarFillRange)
+                {
+                    _BarFillRange = value;
+
+                    OnPropertyChangedEx("BarFillRange", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region BarLabelPosition
+
+        /// <summary>
+        /// Gets or sets the position of bar series labels (default is Center).
+        /// </summary>
+        [DefaultValue(BarLabelPosition.NotSet), Category("Bar Display")]
+        [Description("Indicates the position of bar series labels (default is Center).")]
+        public BarLabelPosition BarLabelPosition
+        {
+            get { return (_BarLabelPosition); }
+
+            set
+            {
+                if (value != _BarLabelPosition)
+                {
+                    _BarLabelPosition = value;
+
+                    OnPropertyChangedEx("BarLabelPosition", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region BarShadingEnabled
+
+        ///<summary>
+        /// Gets or sets whether Bar shading is enabled for Horizontal and Vertical Bar series.
+        ///</summary>
+        [DefaultValue(Tbool.NotSet), Category("Bar Display")]
+        [Description("Indicates whether Bar shading is enabled for Horizontal and Vertical Bar series.")]
+        public Tbool BarShadingEnabled
+        {
+            get { return (_BarShadingEnabled); }
+
+            set
+            {
+                if (value != _BarShadingEnabled)
+                {
+                    _BarShadingEnabled = value;
+
+                    OnPropertyChangedEx("BarShadingEnabled", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region BarWidthRatio
+
+        /// <summary>
+        /// Gets or sets the ratio of bar width to bar spacing within
+        /// the same series (defaults to 2 - bar is twice as wide as spacing).
+        /// </summary>
+        [DefaultValue(0d), Category("Bar Display")]
+        [Description("Indicates the ratio of bar width to bar spacing within the same series (defaults to 2 - bar is twice as wide as spacing).")]
+        public double BarWidthRatio
+        {
+            get { return (_BarWidthRatio); }
+
+            set
+            {
+                if (value != _BarWidthRatio)
+                {
+                    if (value < 0)
+                        throw new ArgumentException("Value must be > 0");
+
+                    _BarWidthRatio = value;
+
+                    OnPropertyChangedEx("BarWidthRatio", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region BubbleIntensityMode
+
+        /// <summary>
+        /// Gets or sets the mode used to determine bubble intensities.
+        /// </summary>
+        [DefaultValue(BubbleIntensityMode.NotSet), Category("Display")]
+        [Description("Indicates the mode used to determine bubble intensities.")]
+        public BubbleIntensityMode BubbleIntensityMode
+        {
+            get { return (_BubbleIntensityMode); }
+
+            set
+            {
+                if (value != _BubbleIntensityMode)
+                {
+                    _BubbleIntensityMode = value;
+
+                    OnPropertyChangedEx("BubbleIntensityMode", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region BubbleMaxPercentage
+
+        /// <summary>
+        /// Gets or sets the max percentage of the display
+        /// area used to calculate series bubble sizes (default is .25).
+        /// </summary>
+        [DefaultValue(0.25d), Category("Display")]
+        [Description("Indicates the max percentage of the display area used to calculate series bubble sizes (default is .25).")]
+        public double BubbleMaxPercentage
+        {
+            get { return (_BubbleMaxPercentage); }
+
+            set
+            {
+                if (value != _BubbleMaxPercentage)
+                {
+                    if (value <= 0 || value > 1)
+                        throw new ArgumentException("Value must be between 0 and 1");
+
+                    _BubbleMaxPercentage = value;
+
+                    OnPropertyChangedEx("BubbleMaxPercentage", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region BubbleMinSize
+
+        /// <summary>
+        /// Gets or sets the minimum series bubble size (in pixels) Default is 4.
+        /// </summary>
+        [DefaultValue(4), Category("Display")]
+        [Description("Indicates the minimum series bubble size (in pixels). Default is 4.")]
+        public int BubbleMinSize
+        {
+            get { return (_BubbleMinSize); }
+
+            set
+            {
+                if (value != _BubbleMinSize)
+                {
+                    if (value < 0)
+                        throw new ArgumentException("Value must be > 0");
+
+                    _BubbleMinSize = value;
+
+                    OnPropertyChangedEx("BubbleMinSize", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region BubbleScaleFactor
+
+        /// <summary>
+        /// Gets or sets the Scale Factor used to calculate series bubble sizes.
+        /// </summary>
+        [DefaultValue(1.0d), Category("Display")]
+        [Description("Indicates the Scale Factor used to calculate series bubble sizes.")]
+        public double BubbleScaleFactor
+        {
+            get { return (_BubbleScaleFactor); }
+
+            set
+            {
+                if (value != _BubbleScaleFactor)
+                {
+                    _BubbleScaleFactor = value;
+
+                    OnPropertyChangedEx("BubbleScaleFactor", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region BubbleSizeMode
+
+        /// <summary>
+        /// Gets or sets the mode used to calculate series bubble sizes.
+        /// </summary>
+        [DefaultValue(BubbleSizeMode.NotSet), Category("Display")]
+        [Description("Indicates the mode used to calculate series bubble sizes.")]
+        public BubbleSizeMode BubbleSizeMode
+        {
+            get { return (_BubbleSizeMode); }
+
+            set
+            {
+                if (value != _BubbleSizeMode)
+                {
+                    _BubbleSizeMode = value;
+
+                    OnPropertyChangedEx("BubbleSizeMode", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ChartIndicators
+
+        ///<summary>
+        /// Gets a reference to the Chart Indicators collection.
+        ///</summary>
+        [DefaultValue(null), Category("Appearance")]
+        [Description("Indicates the Chart Indicators collection.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ChartIndicatorCollection ChartIndicators
+        {
+            get
+            {
+                if (_ChartIndicators == null)
+                {
+                    _ChartIndicators = new ChartIndicatorCollection();
+
+                    _ChartIndicators.CollectionChanged += ChartIndicators_CollectionChanged;
+                }
+
+                return (_ChartIndicators);
+            }
+
+            internal set
+            {
+                if (_ChartIndicators != null)
+                    _ChartIndicators.CollectionChanged -= ChartIndicators_CollectionChanged;
+
+                _ChartIndicators = value;
+
+                if (_ChartIndicators != null)
+                    _ChartIndicators.CollectionChanged += ChartIndicators_CollectionChanged;
+            }
+        }
+
+        #region ChartIndicators_CollectionChanged
+
+        void ChartIndicators_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            bool updateLayout = false;
+
+            switch (e.Action)
+            {
+                case NotifyCollectionChangedAction.Add:
+                    foreach (ChartIndicator ci in e.NewItems)
+                    {
+                        if (ci.ShowInLegend == true || ci.ShowInParentLegend == true)
+                            updateLayout = true;
+
+                        ci.Parent = this;
+                    }
+                    break;
+
+                case NotifyCollectionChangedAction.Replace:
+                    foreach (ChartIndicator ci in e.OldItems)
+                    {
+                        if (ci.ShowInLegend == true || ci.ShowInParentLegend == true)
+                            updateLayout = true;
+
+                        ci.Parent = null;
+                    }
+
+                    foreach (ChartIndicator ci in e.NewItems)
+                    {
+                        if (ci.ShowInLegend == true || ci.ShowInParentLegend == true)
+                            updateLayout = true;
+
+                        ci.Parent = this;
+                    }
+                    break;
+
+                case NotifyCollectionChangedAction.Remove:
+                    foreach (ChartIndicator ci in e.OldItems)
+                    {
+                        if (ci.ShowInLegend == true || ci.ShowInParentLegend == true)
+                            updateLayout = true;
+
+                        ci.Parent = null;
+                    }
+                    break;
+            }
+
+            if (updateLayout == true)
+                InvalidateLayout();
+            else
+                InvalidateRender();
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ChartLegendItemVisualStyles
+
+        /// <summary>
+        /// Gets or sets the visual styles for the Legend item.
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates the visual styles for the Legend item.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ChartLegendItemVisualStyles ChartLegendItemVisualStyles
+        {
+            get
+            {
+                if (_ChartLegendItemVisualStyles == null)
+                {
+                    _ChartLegendItemVisualStyles = new ChartLegendItemVisualStyles();
+
+                    StyleVisualChangeHandler(null, _ChartLegendItemVisualStyles);
+                }
+
+                return (_ChartLegendItemVisualStyles);
+            }
+
+            set
+            {
+                if (_ChartLegendItemVisualStyles != value)
+                {
+                    ChartLegendItemVisualStyles oldValue = _ChartLegendItemVisualStyles;
+
+                    _ChartLegendItemVisualStyles = value;
+
+                    OnStyleChanged("ChartLegendItemVisualStyles", oldValue, value);
+
+                    if (oldValue != null)
+                        oldValue.Dispose();
+                }
+            }
+        }
+
+        #endregion
+
+        #region ChartLineAreaDisplayMode
+
+        /// <summary>
+        /// Gets or sets the Line 'Area' display mode.
+        /// </summary>
+        [DefaultValue(ChartLineAreaDisplayMode.NotSet), Category("Display")]
+        [Description("Indicates the Line ChartType display mode.")]
+        [Editor("DevComponents.Charts.Design.FlagsEnumUIEditor, DevComponents.Charts.Design, " +
+                "Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(UITypeEditor))]
+        public ChartLineAreaDisplayMode ChartLineAreaDisplayMode
+        {
+            get { return (_ChartLineAreaDisplayMode); }
+
+            set
+            {
+                if (value != _ChartLineAreaDisplayMode)
+                {
+                    _ChartLineAreaDisplayMode = value;
+
+                    OnPropertyChangedEx("ChartLineAreaDisplayMode", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ChartLineDisplayMode
+
+        /// <summary>
+        /// Gets or sets the Line ChartType display mode.
+        /// </summary>
+        [DefaultValue(ChartLineDisplayMode.NotSet), Category("Display")]
+        [Description("Indicates the Line ChartType display mode.")]
+        [Editor("DevComponents.Charts.Design.FlagsEnumUIEditor, DevComponents.Charts.Design, " +
+                "Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(UITypeEditor))]
+        public ChartLineDisplayMode ChartLineDisplayMode
+        {
+            get { return (_ChartLineDisplayMode); }
+
+            set
+            {
+                if (value != _ChartLineDisplayMode)
+                {
+                    _ChartLineDisplayMode = value;
+
+                    _SortedSeriesPoints = null;
+
+                    OnPropertyChangedEx("ChartLineDisplayMode", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ChartSeriesVisualStyle
+
+        /// <summary>
+        /// Gets or sets the visual style for the series.
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates the visual style for the series.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ChartSeriesVisualStyle ChartSeriesVisualStyle
+        {
+            get
+            {
+                if (_ChartSeriesVisualStyle == null)
+                {
+                    _ChartSeriesVisualStyle = new ChartSeriesVisualStyle();
+
+                    StyleVisualChangeHandler(null, _ChartSeriesVisualStyle);
+                }
+
+                return (_ChartSeriesVisualStyle);
+            }
+
+            set
+            {
+                if (_ChartSeriesVisualStyle != value)
+                {
+                    ChartSeriesVisualStyle oldValue = _ChartSeriesVisualStyle;
+
+                    _ChartSeriesVisualStyle = value;
+
+                    OnStyleChanged("ChartSeriesVisualStyle", oldValue, value);
+
+                    if (oldValue != null)
+                        oldValue.Dispose();
+                }
+            }
+        }
+
+        #endregion
+
+        #region ConvexHullDisplayMode
+
+        /// <summary>
+        /// Gets or sets the ConvexHull display mode.
+        /// </summary>
+        [DefaultValue(ConvexHullDisplayMode.NotSet), Category("Display")]
+        [Description("Indicates the ConvexHull display mode.")]
+        [Editor("DevComponents.Charts.Design.FlagsEnumUIEditor, DevComponents.Charts.Design, " +
+                "Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(UITypeEditor))]
+        public ConvexHullDisplayMode ConvexHullDisplayMode
+        {
+            get { return (_ConvexHullDisplayMode); }
+
+            set
+            {
+                if (value != _ConvexHullDisplayMode)
+                {
+                    _ConvexHullDisplayMode = value;
+
+                    OnPropertyChangedEx("ConvexHullDisplayMode", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region CrosshairEnabled
+
+        ///<summary>
+        /// Gets or sets whether Crosshair support is enabled for the series.
+        ///</summary>
+        [DefaultValue(Tbool.NotSet), Category("Crosshair")]
+        [Description("Indicates whether Crosshair support is enabled for the series.")]
+        public Tbool CrosshairEnabled
+        {
+            get { return (_CrosshairEnabled); }
+
+            set
+            {
+                if (value != _CrosshairEnabled)
+                {
+                    _CrosshairEnabled = value;
+
+                    OnPropertyChanged("CrosshairEnabled");
+                }
+            }
+        }
+
+        #endregion
+
+        #region CrosshairHighlightPoints
+
+        ///<summary>
+        /// Gets or sets whether Crosshair Point highlighting is enabled for the series.
+        ///</summary>
+        [DefaultValue(Tbool.NotSet), Category("Crosshair")]
+        [Description("Indicates whether Crosshair Point highlighting is enabled for the series.")]
+        public Tbool CrosshairHighlightPoints
+        {
+            get { return (_CrosshairHighlightPoints); }
+
+            set
+            {
+                if (value != _CrosshairHighlightPoints)
+                {
+                    _CrosshairHighlightPoints = value;
+
+                    OnPropertyChanged("CrosshairHighlightPoints");
+                }
+            }
+        }
+
+        #endregion
+
+        #region CrosshairShowLabels
+
+        ///<summary>
+        /// Gets or sets whether Crosshair labels are shown for the series.
+        ///</summary>
+        [DefaultValue(Tbool.NotSet), Category("Crosshair")]
+        [Description("Indicates whether Crosshair labels are shown for the series.")]
+        public Tbool CrosshairShowLabels
+        {
+            get { return (_CrosshairShowLabels); }
+
+            set
+            {
+                if (value != _CrosshairShowLabels)
+                {
+                    _CrosshairShowLabels = value;
+
+                    OnPropertyChanged("CrosshairShowLabels");
+                }
+            }
+        }
+
+        #endregion
+
+        #region DataLabels
+
+        ///<summary>
+        /// Gets or sets the list of instance Data Labels.
+        ///</summary>
+        [DefaultValue(null), Category("DataLabel")]
+        [Description("Indicates the list of instance Data Labels.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public DataLabelCollection DataLabels
+        {
+            get
+            {
+                if (_DataLabels == null)
+                { 
+                    _DataLabels = new DataLabelCollection();
+
+                    _DataLabels.PropertyChanged += DataLabels_PropertyChanged;
+                    _DataLabels.CollectionChanged += DataLabels_CollectionChanged;
+                }
+
+                return (_DataLabels);
+            }
+
+            internal set
+            {
+                if (_DataLabels != null)
+                {
+                    _DataLabels.PropertyChanged -= DataLabels_PropertyChanged;
+                    _DataLabels.CollectionChanged -= DataLabels_CollectionChanged;
+                }
+
+                _DataLabels = value;
+
+                if (_DataLabels != null)
+                {
+                    _DataLabels.PropertyChanged += DataLabels_PropertyChanged;
+                    _DataLabels.CollectionChanged += DataLabels_CollectionChanged;
+                }
+            }
+        }
+
+        #region DataLabels_PropertyChanged
+
+        void DataLabels_PropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            InvalidateRender();
+        }
+
+        #endregion
+
+        #region DataLabels_CollectionChanged
+
+        private void DataLabels_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            switch (e.Action)
+            {
+                case NotifyCollectionChangedAction.Add:
+                    foreach (DataLabel dl in e.NewItems)
+                    {
+                        dl.Parent = this;
+                        dl.PropertyChanged += DataLabel_PropertyChanged;
+                    }
+                    break;
+
+                case NotifyCollectionChangedAction.Replace:
+                    foreach (DataLabel dl in e.OldItems)
+                    {
+                        dl.Parent = null;
+                        dl.PropertyChanged -= DataLabel_PropertyChanged;
+                    }
+
+                    foreach (DataLabel dl in e.NewItems)
+                    {
+                        dl.Parent = this;
+                        dl.PropertyChanged += DataLabel_PropertyChanged;
+                    }
+                    break;
+
+                case NotifyCollectionChangedAction.Remove:
+                case NotifyCollectionChangedAction.Reset:
+                    if (e.OldItems != null)
+                    {
+                        foreach (DataLabel dl in e.OldItems)
+                            dl.PropertyChanged -= DataLabel_PropertyChanged;
+                    }
+                    break;
+            }
+
+            InvalidateLayout();
+        }
+
+        private void DataLabel_PropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            InvalidateLayout();
+        }
+
+        #endregion
+
+        #endregion
+
+        #region DataLabelVisualStyle
+
+        /// <summary>
+        /// Gets or sets the visual style for the data labels.
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates the visual style for the data labels.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public DataLabelVisualStyle DataLabelVisualStyle
+        {
+            get
+            {
+                if (_DataLabelVisualStyle == null)
+                {
+                    _DataLabelVisualStyle = new DataLabelVisualStyle();
+
+                    StyleVisualChangeHandler(null, _DataLabelVisualStyle);
+                }
+
+                return (_DataLabelVisualStyle);
+            }
+
+            set
+            {
+                if (_DataLabelVisualStyle != value)
+                {
+                    DataLabelVisualStyle oldValue = _DataLabelVisualStyle;
+
+                    _DataLabelVisualStyle = value;
+
+                    OnStyleChanged("DataLabelVisualStyle", oldValue, value);
+
+                    if (oldValue != null)
+                        oldValue.Dispose();
+                }
+            }
+        }
+
+        #endregion
+
+        #region DataPropertyNameSeries
+
+        ///<summary>
+        /// Gets or sets the name of the data field to which the Series Name is bound.
+        ///</summary>
+        [DefaultValue(null), Category("Data")]
+        [Description("Indicates the name of the data field to which the Series Name is bound.")]
+        public string DataPropertyNameSeries
+        {
+            get { return (_DataPropertyNameSeries); }
+
+            set
+            {
+                if (value != _DataPropertyNameSeries)
+                {
+                    _DataPropertyNameSeries = value;
+
+                    if (NeedToUpdateBindings == false)
+                    {
+                        NeedToUpdateBindings = true;
+
+                        InvalidateLayout();
+                    }
+
+                    OnPropertyChangedEx("DataPropertyNameSeries", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region DataPropertyNameX
+
+        ///<summary>
+        /// Gets or sets the name of the data field to which the X-Axis data is bound.
+        ///</summary>
+        [DefaultValue(null), Category("Data")]
+        [Description("Indicates the name of the data field to which the X-Axis data is bound.")]
+        public string DataPropertyNameX
+        {
+            get { return (_DataPropertyNameX); }
+
+            set
+            {
+                if (value != _DataPropertyNameX)
+                {
+                    _DataPropertyNameX = value;
+
+                    if (NeedToUpdateBindings == false)
+                    {
+                        NeedToUpdateBindings = true;
+
+                        InvalidateLayout();
+                    }
+
+                    OnPropertyChangedEx("DataPropertyNameX", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region DataPropertyNamesY
+
+        ///<summary>
+        /// Gets or sets the names of the data fields to which the Y-Axis data is bound.
+        ///</summary>
+        [DefaultValue(null), Category("Data")]
+        [Description("Indicates the names of the data fields to which the Y-Axis data is bound.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public CustomCollection<string> DataPropertyNamesY
+        {
+            get
+            {
+                if (_DataPropertyNamesY == null)
+                {
+                    _DataPropertyNamesY = new CustomCollection<string>();
+
+                    _DataPropertyNamesY.CollectionChanged += DataPropertyNamesY_CollectionChanged;
+                }
+
+                return (_DataPropertyNamesY);
+            }
+
+            set
+            {
+                if (value != _DataPropertyNamesY)
+                {
+                    if (_DataPropertyNamesY != null)
+                    {
+                        _DataPropertyNamesY.Clear();
+
+                        _DataPropertyNamesY.CollectionChanged -= DataPropertyNamesY_CollectionChanged;
+                    }
+
+                    _DataPropertyNamesY = value;
+
+                    if (_DataPropertyNamesY != null)
+                        _DataPropertyNamesY.CollectionChanged += DataPropertyNamesY_CollectionChanged;
+
+                    OnPropertyChangedEx("DataPropertyNamesY", Style.VisualChangeType.Layout);
+                }
+            }
+        }
+
+        void DataPropertyNamesY_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            if (NeedToUpdateBindings == false)
+            {
+                NeedToUpdateBindings = true;
+
+                InvalidateLayout();
+            }
+        }
+
+        #endregion
+
+        #region DataMember
+
+        ///<summary>
+        /// Gets or sets the name of the list or table
+        /// in the data source that the Series is bound to.
+        ///</summary>
+        [DefaultValue(null), Category("Data")]
+        [Description("Indicates the name of the list or table in the data source that the Series is bound to.")]
+        public string DataMember
+        {
+            get { return (_DataMember); }
+
+            set
+            {
+                if (_DataBinder != null)
+                    _DataBinder.Clear();
+
+                _DataMember = value;
+
+                NeedToUpdateBindings = true;
+
+                OnPropertyChangedEx("DataMember", VisualChangeType.Layout);
+            }
+        }
+
+        #endregion
+
+        #region DataSource
+
+        ///<summary>
+        /// Gets or sets the data source that the Series is bound to.
+        ///</summary>
+        [DefaultValue(null), AttributeProvider(typeof(IListSource)), Category("Data")]
+        [Description("Indicates the data source that the Series is bound to.")]
+        public object DataSource
+        {
+            get { return (_DataSource); }
+
+            set
+            {
+                if (_DataBinder != null)
+                    _DataBinder.Clear();
+
+                _DataSource = value;
+
+                NeedToUpdateBindings = true;
+
+                OnPropertyChangedEx("DataSource", VisualChangeType.Layout);
+            }
+        }
+
+        #endregion
+
+        #region DefaultPaletteColor
+
+        /// <summary>
+        /// Gets the default palette color assigned to the series when it
+        /// is added to the chart.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        [Description("Indicates the default palette color assigned to the series when it is added to the chart.")]
+        public Color DefaultPaletteColor
+        {
+            get { return (_DefaultPaletteColor); }
+
+            internal set
+            {
+                if (value != _DefaultPaletteColor)
+                {
+                    _DefaultPaletteColor = value;
+
+                    InvalidateStyle();
+                }
+            }
+        }
+
+        #endregion
+
+        #region DisplayLinePointsOnTop
+
+        /// <summary>
+        /// Gets or sets whether series points are displayed on top of series line.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance")]
+        [Description("Indicates whether series points are displayed on top of series line.")]
+        public bool DisplayLinePointsOnTop
+        {
+            get { return (TestState(States.DisplayLinePointsOnTop)); }
+
+            set
+            {
+                if (value != DisplayLinePointsOnTop)
+                {
+                    SetState(States.DisplayLinePointsOnTop, value);
+
+                    OnPropertyChangedEx("DisplayLinePointsOnTop", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region DotPlotIndexValue
+
+        /// <summary>
+        /// Gets or sets the value used to index between DotPlot points. Default is 1.
+        /// </summary>
+        [DefaultValue(1.0d), Category("Display")]
+        [Description("Indicates the value used to index between DotPlot points. Default is 1.")]
+        public double DotPlotIndexValue
+        {
+            get { return (_DotPlotIndexValue); }
+
+            set
+            {
+                if (value != _DotPlotIndexValue)
+                {
+                    if (value < 0)
+                        throw new ArgumentException("Value must be > 0");
+
+                    _DotPlotIndexValue = value;
+
+                    OnPropertyChangedEx("DotPlotIndexValue", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region EffectiveDataLabelStyle
+
+        /// <summary>
+        /// Gets a reference to the DataLabel effective (cached, composite) style.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public DataLabelVisualStyle EffectiveDataLabelStyle
+        {
+            get { return (_EffectiveDataLabelStyle.Style); }
+        }
+
+        #endregion
+
+        #region EffectiveSeriesStyle
+
+        /// <summary>
+        /// Gets a reference to the Series's effective (cached, composite) style.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        [Description("Indicates a reference to the Series's Effective (cached, composite) style.")]
+        public ChartSeriesVisualStyle EffectiveChartSeriesStyle
+        {
+            get { return (_EffectiveChartSeriesStyle.Style); }
+        }
+
+        #endregion
+
+        #region EmptyValues
+
+        ///<summary>
+        /// Gets or sets the value(s) used to determine if
+        /// a series point is empty or missing.
+        ///</summary>
+        [Category("Empty")]
+        [Description("Indicates the value(s) used to determine if a series point is empty or missing.")]
+        [Editor("DevComponents.Charts.Design.SeriesPointValueEditor, DevComponents.Charts.Design, " +
+                "Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(UITypeEditor))]
+        public object[] EmptyValues
+        {
+            get { return (_EmptyValues); }
+
+            set
+            {
+                if (value != _EmptyValues)
+                {
+                    _EmptyValues = value;
+
+                    OnPropertyChangedEx("EmptyValue", Style.VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region EnableEmptyValues
+
+        /// <summary>
+        /// Gets or sets whether EmptyValues are processed in the series
+        /// </summary>
+        [DefaultValue(false), Category("Empty")]
+        [Description("Indicates whether EmptyValues are processed in the series.")]
+        public bool EnableEmptyValues
+        {
+            get { return (TestState(States.EnableEmptyValues)); }
+
+            set
+            {
+                if (value != EnableEmptyValues)
+                {
+                    SetState(States.EnableEmptyValues, value);
+
+                    _PointData = null;
+                    _EmptyPointData = null;
+                    _StepPointData = null;
+
+                    OnPropertyChangedEx("EnableEmptyValues", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region GroupId
+
+        ///<summary>
+        /// Gets or sets the logical grouping Id used to group qualitative series.
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public int GroupId
+        {
+            get { return (_GroupId); }
+
+            set
+            {
+                if (value != _GroupId)
+                {
+                    _GroupId = value;
+
+                    OnPropertyChangedEx("GroupId", Style.VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region HiLoBarType
+
+        ///<summary>
+        /// Gets or sets the Series HiLoBar Type.
+        ///</summary>
+        [DefaultValue(HiLoBarType.Box), Category("Appearance")]
+        [Description("Indicates the Series HiLoBar Type.")]
+        public HiLoBarType HiLoBarType
+        {
+            get { return (_HiLoBarType); }
+
+            set
+            {
+                if (value != _HiLoBarType)
+                {
+                    _HiLoBarType = value;
+
+                    OnPropertyChangedEx("HiLoBarType", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region IsDisplayed
+
+        ///<summary>
+        /// Gets whether the series is displayed (based upon Visibility and Legend state).
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsDisplayed
+        {
+            get
+            {
+                ChartXy chartXy = Parent as ChartXy;
+
+                ItemCheckAction ica = (chartXy != null)
+                    ? chartXy.Legend.ItemCheckAction : ItemCheckAction.ShowItem;
+
+                return ((Visible == true) &&
+                        (ica == ItemCheckAction.None ||
+                        (ShowCheckBoxInLegend == false || CheckedInLegend == true)));
+            }
+        }
+
+        #endregion
+
+        #region MaxValueX
+
+        ///<summary>
+        /// Gets the series Maximum X value.
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public object MaxValueX
+        {
+            get
+            {
+                UpdateSeriesRange();
+
+                if (IsRotated == true)
+                    return (_MaxValueY);
+
+                return (_MaxValueX);
+            }
+        }
+
+        #endregion
+
+        #region MaxValueY
+
+        ///<summary>
+        /// Gets the series Maximum Y value.
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public object MaxValueY
+        {
+            get
+            {
+                UpdateSeriesRange();
+
+                if (IsRotated == true)
+                    return (_MaxValueX);
+
+                return (_MaxValueY);
+            }
+        }
+
+        #endregion
+
+        #region MinValueX
+
+        ///<summary>
+        /// Gets the series minimum X value.
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public object MinValueX
+        {
+            get
+            {
+                UpdateSeriesRange();
+
+                if (IsRotated == true)
+                    return (_MinValueY);
+
+                return (_MinValueX);
+            }
+        }
+
+        #endregion
+
+        #region MinValueY
+
+        ///<summary>
+        /// Gets the series minimum Y value.
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public object MinValueY
+        {
+            get
+            {
+                UpdateSeriesRange();
+
+                if (IsRotated == true)
+                    return (_MinValueX);
+
+                return (_MinValueY);
+            }
+        }
+
+        #endregion
+
+        #region PointLabelDisplayMode
+
+        /// <summary>
+        /// Gets or sets the display mode for the chart PointLabels.
+        /// </summary>
+        [DefaultValue(PointLabelDisplayMode.NotSet), Category("DataLabel")]
+        [Description("Indicates the display mode for the chart PointLabels.")]
+        [Editor("DevComponents.Charts.Design.FlagsEnumUIEditor, DevComponents.Charts.Design, " +
+                "Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(UITypeEditor))]
+        public PointLabelDisplayMode PointLabelDisplayMode
+        {
+            get { return (_PointLabelDisplayMode); }
+
+            set
+            {
+                if (value != _PointLabelDisplayMode)
+                {
+                    _PointLabelDisplayMode = value;
+
+                    InvalidatePointLabels();
+
+                    OnPropertyChangedEx("PointLabelDisplayMode", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region PointLabelMinDistance
+
+        ///<summary>
+        /// Gets or sets the minimum distance between label data points.
+        ///</summary>
+        [DefaultValue(0), Category("DataLabel")]
+        [Description("Indicates the minimum distance between label data points.")]
+        public int PointLabelMinDistance
+        {
+            get { return (_PointLabelMinDistance); }
+
+            set
+            {
+                if (value != _PointLabelMinDistance)
+                {
+                    if (value < 0)
+                        throw new Exception("Minimum Distance must be >= 0");
+
+                    _PointLabelMinDistance = value;
+
+                    InvalidatePointLabels();
+
+                    OnPropertyChangedEx("PointLabelMinDistance", Style.VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region PointLabelSkip
+
+        ///<summary>
+        /// Gets or sets the number of inter-label points to skip.
+        ///</summary>
+        [DefaultValue(0), Category("DataLabel")]
+        [Description("Indicates the number of inter-label points to skip.")]
+        public int PointLabelSkip
+        {
+            get { return (_PointLabelSkip); }
+
+            set
+            {
+                if (value != _PointLabelSkip)
+                {
+                    if (value < 0)
+                        throw new Exception("Skip value must be >= 0");
+
+                    _PointLabelSkip = value;
+
+                    InvalidatePointLabels();
+
+                    OnPropertyChangedEx("PointLabelSkip", Style.VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ScaleTypeX
+
+        ///<summary>
+        /// Gets or sets the X axis Scale Type.
+        ///</summary>
+        [DefaultValue(ScaleType.NotSet), Category("Axis")]
+        [Description("Indicates the X axis Scale Type.")]
+        public ScaleType ScaleTypeX
+        {
+            get { return (_ScaleTypeX); }
+
+            set
+            {
+                if (value != _ScaleTypeX)
+                {
+                    if (ValidScaleTypeX(value) == false)
+                        throw new Exception("Incompatible ScaleTypeX for defined series data.");
+
+                    _ScaleTypeX = value;
+
+                    InvalidatePoints();
+
+                    OnPropertyChangedEx("ScaleTypeX", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #region ValidScaleTypeX
+
+        private bool ValidScaleTypeX(ScaleType scaleType)
+        {
+            if (scaleType == ScaleType.NotSet || scaleType == ScaleType.Auto)
+                return (true);
+
+            if (SeriesPoints.Count > 0)
+            {
+                for (int i = 0; i < SeriesPoints.Count; i++)
+                {
+                    SeriesPoint sp = SeriesPoints[i];
+
+                    if (sp.ValueX != null)
+                    {
+                        Type dataType = sp.ValueX.GetType();
+                        ScaleType autoType = SeriesPoint.GetScaleType(dataType);
+
+                        if (scaleType == autoType)
+                            return (true);
+
+                        if (scaleType == ScaleType.Qualitative)
+                            return (true);
+
+                        return (false);
+                    }
+                }
+            }
+
+            return (true);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ScaleTypeY
+
+        ///<summary>
+        /// Gets or sets the Y axis Scale Type.
+        ///</summary>
+        [DefaultValue(ScaleType.NotSet), Category("Axis")]
+        [Description("Indicates the Y axis Scale Type.")]
+        public ScaleType ScaleTypeY
+        {
+            get { return (_ScaleTypeY); }
+
+            set
+            {
+                if (value != _ScaleTypeY)
+                {
+                    if (ValidScaleTypeY(value) == false)
+                        throw new Exception("Incompatible ScaleTypeY for defined series data.");
+
+                    _ScaleTypeY = value;
+
+                    InvalidatePoints();
+
+                    OnPropertyChangedEx("ScaleTypeY", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #region ValidScaleTypeY
+
+        private bool ValidScaleTypeY(ScaleType scaleType)
+        {
+            if (scaleType == ScaleType.NotSet || scaleType == ScaleType.Auto)
+                return (true);
+
+            if (SeriesPoints.Count > 0)
+            {
+                for (int i = 0; i < SeriesPoints.Count; i++)
+                {
+                    SeriesPoint sp = SeriesPoints[i];
+
+                    if (sp.ValueY != null && sp.ValueY.Length > 0)
+                    {
+                        Type dataType = sp.ValueY[0].GetType();
+                        ScaleType autoType = SeriesPoint.GetScaleType(dataType);
+
+                        if (scaleType == autoType)
+                            return (true);
+
+                        if (scaleType == ScaleType.Qualitative)
+                            return (true);
+
+                        return (false);
+                    }
+                }
+            }
+
+            return (true);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region SeriesPoints
+
+        ///<summary>
+        /// Gets the series point data collection
+        ///</summary>
+        [Category("Data")]
+        [Description("Indicates the series point data collection.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public SeriesPointCollection SeriesPoints
+        {
+            get
+            {
+                if (_SeriesPoints == null)
+                {
+                    _SeriesPoints = new SeriesPointCollection();
+
+                    _SeriesPoints.CollectionChanged += SeriesPoints_CollectionChanged;
+                }
+
+                return (_SeriesPoints);
+            }
+
+            set
+            {
+                if (value != _SeriesPoints)
+                {
+                    if (_SeriesPoints != null)
+                        _SeriesPoints.CollectionChanged -= SeriesPoints_CollectionChanged;
+
+                    _SeriesPoints = value;
+
+                    if (_SeriesPoints != null)
+                        _SeriesPoints.CollectionChanged += SeriesPoints_CollectionChanged;
+                }
+            }
+        }
+
+        #region SeriesPoints_CollectionChanged
+
+        void SeriesPoints_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            SeriesRangeChanged = true;
+
+            InvalidateLayout();
+        }
+
+        #endregion
+
+        #endregion
+
+        #region SeriesType
+
+        ///<summary>
+        /// Gets or sets the Series Type.
+        ///</summary>
+        [DefaultValue(SeriesType.Point), Category("Appearance")]
+        [Description("Indicates the Series Type.")]
+        public SeriesType SeriesType
+        {
+            get { return (_SeriesType); }
+
+            set
+            {
+                if (value != _SeriesType)
+                {
+                    _SeriesType = value;
+
+                    IsRotated = (
+                        SeriesType == SeriesType.HorizontalDot ||
+                        SeriesType == SeriesType.HorizontalBar ||
+                        SeriesType == SeriesType.HorizontalHiLoBar);
+
+                    BaseChart chart = Parent as BaseChart;
+
+                    if (chart != null)
+                    {
+                        SeriesRangeChanged = true;
+                        chart.SeriesRangeChanged = true;
+                    }
+
+                    OnPropertyChangedEx("SeriesType", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowHiLoBarMedianLines
+
+        /// <summary>
+        /// Gets or sets whether defined HiLoBar Median lines are shown.
+        /// </summary>
+        [DefaultValue(false), Category("Empty")]
+        [Description("Indicates whether defined HiLoBar Median lines are shown.")]
+        public bool ShowHiLoBarMedianLines
+        {
+            get { return (TestState(States.ShowHiLoBarMedianLines)); }
+
+            set
+            {
+                if (value != ShowHiLoBarMedianLines)
+                {
+                    SetState(States.ShowHiLoBarMedianLines, value);
+
+                    OnPropertyChangedEx("ShowHiLoBarMedianLines", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowEmptyLines
+
+        /// <summary>
+        /// Gets or sets whether EmptyLines are shown in the series.
+        /// </summary>
+        [DefaultValue(false), Category("Empty")]
+        [Description("Indicates whether EmptyLines are shown in the series.")]
+        public bool ShowEmptyLines
+        {
+            get { return (TestState(States.ShowEmptyLines)); }
+
+            set
+            {
+                if (value != ShowEmptyLines)
+                {
+                    SetState(States.ShowEmptyLines, value);
+
+                    InvalidatePoints();
+
+                    OnPropertyChangedEx("ShowEmptyLines", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowEmptyPoints
+
+        /// <summary>
+        /// Gets or sets whether EmptyPoints are shown in the series.
+        /// </summary>
+        [DefaultValue(false), Category("Empty")]
+        [Description("Indicates whether EmptyPoints are shown in the series.")]
+        public bool ShowEmptyPoints
+        {
+            get { return (TestState(States.ShowEmptyPoints)); }
+
+            set
+            {
+                if (value != ShowEmptyPoints)
+                {
+                    SetState(States.ShowEmptyPoints, value);
+
+                    InvalidatePoints();
+
+                    OnPropertyChangedEx("ShowEmptyPoints", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowOriginValueLabels
+
+        /// <summary>
+        /// Gets or sets whether labels are shown for 'Origin' data values.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance")]
+        [Description("Indicates whether labels are shown for 'Origin' data values.")]
+        public bool ShowOriginValueLabels
+        {
+            get { return (TestState(States.ShowOriginValueLabels)); }
+
+            set
+            {
+                if (value != ShowOriginValueLabels)
+                {
+                    SetState(States.ShowOriginValueLabels, value);
+
+                    OnPropertyChangedEx("ShowOriginValueLabels", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region StackQualitativePoints
+
+        /// <summary>
+        /// Gets or sets whether Qualitative points are
+        /// stacked or spread across the associated grouped column.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance")]
+        [Description("Indicates whether Qualitative points are stacked or spread across the associated grouped column.")]
+        public bool StackQualitativePoints
+        {
+            get { return (TestState(States.StackQualitativePoints)); }
+
+            set
+            {
+                if (value != StackQualitativePoints)
+                {
+                    SetState(States.StackQualitativePoints, value);
+
+                    OnPropertyChangedEx("StackQualitativePoints", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region StepLines
+
+        /// <summary>
+        /// Gets or sets which 'Step lines' are displayed.
+        /// </summary>
+        [DefaultValue(StepLines.NotSet), Category("Display")]
+        [Description("Indicates which 'Step lines' are displayed.")]
+        public StepLines StepLines
+        {
+            get { return (_StepLines); }
+
+            set
+            {
+                if (value != _StepLines)
+                {
+                    _StepLines = value;
+
+                    OnPropertyChangedEx("StepLines", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region StepLineMode
+
+        /// <summary>
+        /// Gets or sets the mode used to render "Step Lines" in
+        /// the defined Line series.
+        /// </summary>
+        [DefaultValue(StepLineMode.NotSet), Category("Display")]
+        [Description("Indicates the mode used to render 'Step Lines' in the defined Line series.")]
+        public StepLineMode StepLineMode
+        {
+            get { return (_StepLineMode); }
+
+            set
+            {
+                if (value != _StepLineMode)
+                {
+                    _StepLineMode = value;
+
+                    OnPropertyChangedEx("StepLineMode", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region BarOffset
+
+        internal int BarOffset
+        {
+            get { return (_BarOffset); }
+            set { _BarOffset = value; }
+        }
+
+        #endregion
+
+        #region BarShadingColors
+
+        internal Color[] BarShadingColors
+        {
+            get
+            {
+                if (_BarShadingColors == null)
+                {
+                    // Top, Bottom, Left, Right
+
+                    _BarShadingColors = new Color[] {
+                        Color.FromArgb(200, Color.White),
+                        Color.FromArgb(100, Color.Black),
+                        Color.FromArgb(100, Color.Black),
+                        Color.FromArgb(100, Color.Black)};
+                }
+
+                return (_BarShadingColors);
+            }
+        }
+
+        #endregion
+
+        #region BarWidth
+
+        internal int BarWidth
+        {
+            get { return (_BarWidth); }
+            set { _BarWidth = value; }
+        }
+
+        #endregion
+
+        #region DataBinder
+
+        internal DataBinder DataBinder
+        {
+            get
+            {
+                if (_DataBinder == null)
+                    _DataBinder = new DataBinder(this);
+
+                return (_DataBinder);
+            }
+
+            set
+            {
+                if (_DataBinder != null)
+                    _DataBinder.Clear();
+
+                _DataBinder = value;
+            }
+        }
+
+        #endregion
+
+        #region IsQualitativeXValues
+
+        internal bool IsQualitativeXValues
+        {
+            get
+            {
+                UpdateSeriesRange();
+
+                return (QualitativeXValues.Count > 0);
+            }
+        }
+
+        #endregion
+
+        #region IsQualitativeYValues
+
+        internal bool IsQualitativeYValues
+        {
+            get
+            {
+                UpdateSeriesRange();
+
+                return (QualitativeYValues.Count > 0); 
+            }
+        }
+
+        #endregion
+
+        #region IsBarSeries
+
+        internal bool IsBarSeries
+        {
+            get
+            {
+                return (_SeriesType == SeriesType.HorizontalBar ||
+                        _SeriesType == SeriesType.VerticalBar ||
+                        _SeriesType == SeriesType.HorizontalHiLoBar ||
+                        _SeriesType == SeriesType.VerticalHiLoBar);
+            }
+        }
+
+        #endregion
+
+        #region IsRotated
+
+        internal bool IsRotated
+        {
+            get { return (TestState(States.IsRotated)); }
+            set { SetState(States.IsRotated, value); }
+        }
+
+        #endregion
+
+        #region IsSorted
+
+        internal bool IsSorted
+        {
+            get { return (TestState(States.IsSorted)); }
+            set { SetState(States.IsSorted, value); }
+        }
+
+        #endregion
+
+        #region NeedToUpdateBindings
+
+        internal bool NeedToUpdateBindings
+        {
+            get { return (TestState(States.NeedToUpdateBindings)); }
+            set { SetState(States.NeedToUpdateBindings, value); }
+        }
+
+        #endregion
+
+        #region PlotData
+
+        internal object PlotData
+        {
+            get { return (_PlotData); }
+            set { _PlotData = value; }
+        }
+
+        #endregion
+
+        #region PointMarkerEmptyImage
+
+        internal Image PointMarkerEmptyImage
+        {
+            get { return (_PointMarkerEmptyImage); }
+            set { _PointMarkerEmptyImage = value; }
+        }
+
+        #endregion
+
+        #region PointMarkerImage
+
+        internal Image PointMarkerImage
+        {
+            get { return (_PointMarkerImage); }
+            set { _PointMarkerImage = value; }
+        }
+
+        #endregion
+
+        #region PointMarkerHighlightImage
+
+        internal Image PointMarkerHighlightImage
+        {
+            get { return (_PointMarkerHighlightImage); }
+            set { _PointMarkerHighlightImage = value; }
+        }
+
+        #endregion
+
+        #region PointOffset
+
+        internal Point PointOffset
+        {
+            get { return (_PointOffset); }
+            set { _PointOffset = value; }
+        }
+
+        #endregion
+
+        #region QualitativeXValues
+
+        internal List<object> QualitativeXValues
+        {
+            get
+            {
+                if (_QualitativeXValues == null)
+                    _QualitativeXValues = new List<object>();
+
+                return (_QualitativeXValues);
+            }
+
+            set { _QualitativeXValues = value; }
+        }
+
+        #endregion
+
+        #region QualitativeYValues
+
+        internal List<object> QualitativeYValues
+        {
+            get
+            {
+                if (_QualitativeYValues == null)
+                    _QualitativeYValues = new List<object>();
+
+                return (_QualitativeYValues);
+            }
+
+            set { _QualitativeYValues = value; }
+        }
+
+        #endregion
+
+        #region SeriesId
+
+        internal int SeriesId
+        {
+            get { return (_SeriesId); }
+            set { _SeriesId = value; }
+        }
+
+        #endregion
+
+        #region SeriesKey
+
+        internal object SeriesKey
+        {
+            get { return (_SeriesKey); }
+            set { _SeriesKey = value; }
+        }
+
+        #endregion
+
+        #region SeriesRangeChanged
+
+        internal bool SeriesRangeChanged
+        {
+            get { return (_SeriesRangeChanged); }
+
+            set
+            {
+                if (value != _SeriesRangeChanged)
+                {
+                    _SeriesRangeChanged = value;
+
+                    if (value == true)
+                    {
+                        BaseChart chart = Parent as BaseChart;
+
+                        if (chart != null)
+                            chart.SeriesRangeChanged = true;
+
+                        _SortedSeriesPoints = null;
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region MeasureOverride
+
+        protected override void MeasureOverride(ChartLayoutInfo layoutInfo)
+        {
+            UpdateDataBindings();
+            UpdateMarkerImage(layoutInfo.Graphics);
+        }
+
+        #region UpdateDataBindings
+
+        internal void UpdateDataBindings()
+        {
+            if (NeedToUpdateBindings == true)
+            {
+                BaseChart chart = Parent as BaseChart;
+
+                object dataSource = DataSource ?? chart.DataSource;
+                string dataMember = (string.IsNullOrEmpty(DataMember) == false) ? DataMember : chart.DataMember;
+
+                if (dataSource != null)
+                {
+                    SeriesPoints.Clear();
+
+                    DataBinder dataBinder = DataBinder;
+
+                    dataBinder.Clear();
+
+                    dataBinder.DataConnect(dataSource, dataMember);
+                    dataBinder.LoadSeriesData(this);
+                }
+
+                NeedToUpdateBindings = false;
+            }
+        }
+
+        #endregion
+
+        #region UpdateMarkerImage
+
+        private void UpdateMarkerImage(Graphics g)
+        {
+            switch (SeriesType)
+            {
+                case SeriesType.Bubble:
+                case SeriesType.VerticalDot:
+                case SeriesType.Line:
+                case SeriesType.Point:
+                case SeriesType.HorizontalDot:
+                    if (PointMarkerImage == null)
+                    {
+                        ChartXy chartXy = Parent as ChartXy;
+                        ChartSeriesVisualStyle sstyle = EffectiveChartSeriesStyle;
+
+                        PointMarkerImage = chartXy.GetPointMarker(g, sstyle.MarkerVisualStyle);
+                    }
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ArrangeOverride
+
+        protected override void ArrangeOverride(ChartLayoutInfo layoutInfo)
+        {
+            BoundsRelative = layoutInfo.LayoutBounds;
+
+            if (SeriesType == SeriesType.Bubble)
+                UpdateBubblePointOffset();
+        }
+
+        #region UpdateBubblePointOffset
+
+        private void UpdateBubblePointOffset()
+        {
+            BubblePlotData bdata = _PlotData as BubblePlotData;
+
+            if (bdata != null)
+            {
+                ChartXy chartXy = Parent as ChartXy;
+
+                Rectangle bounds = chartXy.ContentBoundsEx;
+
+                float minSize = Dpi.Width(BubbleMinSize);
+                float maxSize = (float)(Math.Min(bounds.Width, bounds.Height) * BubbleMaxPercentage);
+
+                double minTotalSize;
+                double maxTotalSize;
+                chartXy.GetChartBubbleData(out minTotalSize, out maxTotalSize);
+
+                BubbleSizeMode smode = GetBubbleSizeMode(chartXy);
+
+                double range = maxSize - minSize;
+
+                double sizeRange = (smode == BubbleSizeMode.Diameter)
+                    ? maxTotalSize - minTotalSize : AMath.ToScalar((float)(maxTotalSize - minTotalSize));
+
+                SortedSeriesPoints ssp = GetSortedSeriesPoints(chartXy);
+
+                for (int i = 0; i < ssp.Count; i++)
+                {
+                    SeriesPoint sp = ssp[i];
+
+                    if (sp.Visible == true)
+                    {
+                        int size = GetBubbleSize(sp, smode, minSize, maxSize, range, sizeRange);
+
+                        sp.PointSize = new Size(size, size);
+                    }
+                }
+            }
+        }
+
+        #region GetBubbleSize
+
+        private int GetBubbleSize(SeriesPoint sp,
+            BubbleSizeMode smode, double minSize, double maxSize, double range, double sizeRange)
+        {
+            if (sp.ValueY == null || sp.ValueY.Length < 2 || sizeRange == 0)
+                return (int)minSize;
+
+            double size = Math.Abs(GetDoubleValue(sp.ValueY[1]));
+
+            double value = (smode == BubbleSizeMode.Diameter)
+                ? (size * range) / sizeRange
+                : (AMath.ToScalar((float)size) * range) / sizeRange;
+
+            if (BubbleScaleFactor > 0)
+                value *= BubbleScaleFactor;
+
+            value = Math.Max(minSize, value);
+
+            return ((int)Math.Min(maxSize, value));
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region RenderOverride
+
+        protected override void RenderOverride(ChartRenderInfo renderInfo)
+        {
+            Graphics g = renderInfo.Graphics;
+
+            if (SeriesPoints.Count > 0)
+            {
+                ChartXy chartXy = Parent as ChartXy;
+                ChartSeriesVisualStyle sstyle = EffectiveChartSeriesStyle;
+
+                SortedSeriesPoints ssp = GetSortedSeriesPoints(chartXy);
+                ssp.SeriesLayoutCount = chartXy.SeriesLayoutCount;
+
+                UpdateMarkerImage(g);
+
+                int n = Dpi.Width1;
+
+                _RenderBounds = chartXy.ContentBounds;
+                _RenderBounds.Location = chartXy.GetGlobalAdjustedPoint(_RenderBounds.Location);
+
+                if (_RenderBounds.Width > 0 && _RenderBounds.Height > 0)
+                {
+                    switch (SeriesType)
+                    {
+                        case SeriesType.Bubble:
+                            RenderBubblePlot(g, chartXy, ssp, sstyle);
+                            break;
+
+                        case SeriesType.HorizontalBar:
+                            RenderHBarPlot(g, chartXy, ssp, sstyle);
+                            break;
+
+                        case SeriesType.HorizontalDot:
+                            RenderHDotPlot(g, chartXy, ssp, sstyle);
+                            break;
+
+                        case SeriesType.HorizontalHiLoBar:
+                            RenderHStockPlot(renderInfo, chartXy, ssp, sstyle);
+                            break;
+
+                        case SeriesType.Point:
+                            RenderPointPlot(g, chartXy, ssp, true, sstyle);
+                            break;
+
+                        case SeriesType.Line:
+                            RenderLinePlot(g, chartXy, ssp, sstyle);
+                            break;
+
+                        case SeriesType.VerticalBar:
+                            RenderVBarPlot(g, chartXy, ssp, sstyle);
+                            break;
+
+                        case SeriesType.VerticalDot:
+                            RenderVDotPlot(g, chartXy, ssp, sstyle);
+                            break;
+
+                        case SeriesType.VerticalHiLoBar:
+                            RenderVStockPlot(renderInfo, chartXy, ssp, sstyle);
+                            break;
+                    }
+                }
+            }
+        }
+
+        #region GetSortedSeriesPoints
+
+        internal SortedSeriesPoints GetSortedSeriesPoints(ChartXy chartXy)
+        {
+            if (_SortedSeriesPoints == null)
+            {
+                bool sort = (IsSorted == false && NeedSortedSeries(chartXy) == true);
+
+                _SortedSeriesPoints = new SortedSeriesPoints(this, sort);
+
+                if (SeriesType == SeriesType.VerticalDot || SeriesType == SeriesType.HorizontalDot)
+                    CombineDuplicates(_SortedSeriesPoints);
+            }
+
+            return (_SortedSeriesPoints);
+        }
+
+        #region CombineDuplicates
+
+        private void CombineDuplicates(SortedSeriesPoints ssp)
+        {
+            SeriesPoint spLast = null;
+
+            List<int> cList = new List<int>();
+            List<int> iList = new List<int>();
+
+            int dcount = 0;
+            int spLastIndex = 0;
+
+            for (int i = 0; i < ssp.Count; i++)
+            {
+                SeriesPoint sp = ssp[i];
+
+                if (spLast != null && spLast.ValueX.Equals(sp.ValueX) == false)
+                {
+                    iList.Add(spLastIndex);
+                    cList.Add(dcount);
+
+                    dcount = 0;
+
+                    spLast = sp;
+                    spLastIndex = (ssp.IndexArray != null ? ssp.IndexArray[i] : i);
+                }
+
+                dcount += GetDotCount(sp);
+
+                if (spLast == null)
+                {
+                    spLast = sp;
+                    spLastIndex = (ssp.IndexArray != null ? ssp.IndexArray[i] : i);
+                }
+            }
+
+            if (dcount > 0)
+            {
+                iList.Add(spLastIndex);
+                cList.Add(dcount);
+            }
+
+            int[] indexArray = new int[iList.Count];
+            int[] countArray = new int[iList.Count];
+
+            for (int i = 0; i < iList.Count; i++)
+            {
+                indexArray[i] = iList[i];
+                countArray[i] = cList[i];
+            }
+
+            ssp.IndexArray = indexArray;
+            ssp.CountArray = countArray;
+        }
+
+        #endregion
+
+        #region NeedSortedSeries
+
+        private bool NeedSortedSeries(ChartXy chartXy)
+        {
+            if (IsSorted == true || _ActualScaleTypeX == ScaleType.Qualitative)
+                return (false);
+
+            if (SeriesType != SeriesType.Line)
+                return (true);
+
+            ChartLineDisplayMode mode = GetLineDisplayMode(chartXy);
+
+            return ((mode & ChartLineDisplayMode.DisplayUnsorted) != ChartLineDisplayMode.DisplayUnsorted);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderBarPlot
+
+        #region RenderHBarPlot
+
+        private void RenderHBarPlot(Graphics g,
+            ChartXy chartXy, SortedSeriesPoints ssp, ChartSeriesVisualStyle sstyle)
+        {
+            g.RenderingOrigin = chartXy.GetLocalAdjustedPoint(Point.Empty);
+
+            BarRenderData rd = new BarRenderData(chartXy, AxisX ?? chartXy.AxisX);
+
+            rd.FillRange = GetBarFillRange(chartXy);
+            rd.BarShading = GetBarShading(chartXy);
+            
+            rd.SeriesStyle = sstyle;
+
+            int index = 0;
+            bool isHistogram = false;
+
+            if (chartXy.BarShowAsHistogram == Tbool.True)
+            {
+                ChartAxis axisY = AxisY ?? chartXy.AxisY;
+                AxisBar axisBar = axisY.AxisBars[(int)AxisBarType.Bar];
+
+                if (axisBar.BarCount == 1)
+                {
+                    TickmarkLayout layout = axisY.TickmarkLayout;
+
+                    for (int i = 0; i < layout.Ticks.Length; i++)
+                    {
+                        if (layout.Ticks[i].LabelIndex >= 0)
+                        {
+                            index = i;
+                            break;
+                        }
+                    }
+
+                    isHistogram = true;
+                }
+            }
+
+            for (int i = 0; i < ssp.Count; i++)
+            {
+                SeriesPoint sp = ssp[i];
+
+                if (sp.Visible == true)
+                {
+                    rd.Spt = sp.Point[0];
+                    rd.Sp = sp;
+
+                    RenderHBar(g, rd, isHistogram, i + index);
+                }
+            }
+        }
+
+        #region RenderHBar
+
+        private void RenderHBar(
+            Graphics g, BarRenderData rd, bool isHistogram, int index)
+        {
+            ChartXy chartXy = rd.ChartXy;
+            SeriesPoint sp = rd.Sp;
+
+            sp.PointSize = new Size(5, BarWidth);
+
+            Point ptt = chartXy.GetDataPointEx(this, sp, 0);
+
+            int y = (int)(ptt.Y + BarOffset - BarWidth / 2);
+            int height = BarWidth;
+
+            if (isHistogram == true)
+                y = GetHistogramSizeY(chartXy, ptt, index, out height);
+
+            int x1 = ptt.X;
+            int x2 = GetHBarStart(chartXy, sp);
+            int xOrigin = GetHBarOrigin(chartXy, rd.Axis, sp);
+
+            if (x1 > x2)
+            {
+                int xtemp = x1;
+                x1 = x2;
+                x2 = xtemp;
+            }
+
+            if (x2 <= xOrigin)
+            {
+                RenderLeftBar(g, rd, y, height, x1, x2, xOrigin);
+            }
+            else if (x1 >= xOrigin)
+            {
+                RenderRightBar(g, rd, y, height, x1, x2, xOrigin);
+            }
+            else
+            {
+                RenderLeftBar(g, rd, y, height, x1, xOrigin, xOrigin);
+                RenderRightBar(g, rd, y, height, xOrigin, x2, xOrigin);
+            }
+        }
+
+        #region GetHistogramSizeY
+
+        private int GetHistogramSizeY(
+            ChartXy chartXy, Point spt, int index, out int height)
+        {
+            ChartAxis axis = AxisY ?? chartXy.AxisY;
+            TickmarkLayout layout = axis.TickmarkLayout;
+
+            if (index < layout.Ticks.Length)
+                height = layout.Ticks[index + 1].TickPoint.Y - spt.Y;
+            else
+                height = (int)layout.MajorInterval;
+
+            int y = spt.Y - (int)(layout.MajorInterval / 2);
+
+            return (y);
+        }
+
+        #endregion
+
+        #region GetHBarStart
+
+        internal int GetHBarStart(ChartXy chartXy, SeriesPoint sp)
+        {
+            ChartAxis axis = AxisX ?? chartXy.AxisX;
+
+            object value = ((sp.ValueY.Length > 1)
+                ? sp.ValueY[1] : chartXy.BarOrigin ?? null);
+
+            if (value == null)
+            {
+                if (axis.ScaleType == ScaleType.Quantitative)
+                    value = 0;
+                else
+                    value = axis.ActualMinValue;
+            }
+
+            return (chartXy.GetDataPointX(axis, value));
+        }
+
+        #endregion
+
+        #region GetHBarOrigin
+
+        private int GetHBarOrigin(
+            ChartXy chartXy, ChartAxis axis, SeriesPoint sp)
+        {
+            object value = ((sp.ValueY != null && sp.ValueY.Length > 2)
+                ? sp.ValueY[2] : (chartXy.BarOrigin ?? null));
+
+            if (value == null)
+            {
+                if (axis.ScaleType == ScaleType.Quantitative)
+                    value = 0;
+                else
+                    value = axis.ActualMinValue;
+            }
+
+            return (chartXy.GetDataPointX(axis, value));
+        }
+
+        #endregion
+
+        #region RenderRightBar
+
+        private void RenderRightBar(Graphics g,
+            BarRenderData rd, int y, int height, int x1, int x2, int xOrigin)
+        {
+            Rectangle r = new Rectangle(x1, y, x2 - x1, Math.Max(1, height - 1));
+
+            if (r.IntersectsWith(_RenderBounds))
+            {
+                Background bk = rd.SeriesStyle.BarVisualStyle.Background;
+                ChartLineVisualStyle lstyle = rd.SeriesStyle.BarVisualStyle.Border;
+
+                // r is actual area, r2 is FillRange area
+
+                Rectangle r2 = r;
+
+                if (rd.FillRange == BarFillRange.BySeries)
+                {
+                    r2.X = xOrigin;
+                    r2.Width = rd.ChartXy.GetDataPointX(rd.Axis, MaxValueX) - r2.X;
+                }
+
+                BarSegment segment = (x1 > xOrigin) ? BarSegment.Right : BarSegment.RightPartial;
+
+                RenderFullHBar(g, rd, r, r2, bk, lstyle, segment);
+            }
+        }
+
+        #endregion
+
+        #region RenderLeftBar
+
+        private void RenderLeftBar(Graphics g,
+            BarRenderData rd, int y, int height, int x1, int x2, int xOrigin)
+        {
+            Rectangle r = new Rectangle(x1, y, x2 - x1, Math.Max(1, height - 1));
+
+            if (r.IntersectsWith(_RenderBounds))
+            {
+                ChartSeriesVisualStyle sstyle = rd.SeriesStyle;
+
+                Background bk = sstyle.BarVisualStyle.AlternateBackground;
+
+                if (bk.IsEmpty)
+                    bk = sstyle.BarVisualStyle.Background;
+
+                ChartLineVisualStyle lstyle = sstyle.BarVisualStyle.AlternateBorder;
+
+                if (lstyle.IsEmpty)
+                    lstyle = sstyle.BarVisualStyle.Border;
+
+                Rectangle r2 = r;
+
+                if (rd.FillRange == BarFillRange.BySeries)
+                {
+                    int left = rd.ChartXy.GetDataPointX(rd.Axis, MinValueX);
+
+                    r2.X = left;
+                    r2.Width = xOrigin - left;
+                }
+
+                BarSegment segment = (x2 < xOrigin) ? BarSegment.Left : BarSegment.LeftPartial;
+
+                RenderFullHBar(g, rd, r, r2, bk, lstyle, segment);
+            }
+        }
+
+        #endregion
+
+        #region RenderFullHBar
+
+        private void RenderFullHBar(Graphics g, BarRenderData rd,
+            Rectangle r, Rectangle r2, Background bk, ChartLineVisualStyle lstyle, BarSegment segment)
+        {
+            if (r2.Width > 0 && r2.Height > 0)
+            {
+                ChartXy chartXy = rd.ChartXy;
+                ChartControl chartControl = ChartControl;
+
+                if (chartControl.DoPreRenderSeriesBarEvent(g, chartXy, this, rd.Sp, r, r2, segment) == false)
+                {
+                    using (Brush br = bk.GetBrush(r2))
+                        g.FillRectangle(br, r);
+
+                    int lw = 0;
+
+                    if (lstyle.LinePattern != LinePattern.None)
+                    {
+                        SmoothingMode sm = g.SmoothingMode;
+                        g.SmoothingMode = SmoothingMode.None;
+
+                        using (Pen pen = new Pen(lstyle.LineColor, Dpi.Width(lstyle.LineWidth)))
+                        {
+                            lw = (int)pen.Width;
+
+                            if (lstyle.LinePattern != LinePattern.NotSet)
+                                pen.DashStyle = (DashStyle)lstyle.LinePattern;
+
+                            g.DrawRectangle(pen, r);
+                        }
+
+                        g.SmoothingMode = sm;
+                    }
+
+                    if (rd.BarShading == true)
+                    {
+                        Rectangle t = r;
+                        t.Inflate(-lw/2, -lw/2);
+
+                        t.Width++;
+                        t.Height++;
+
+                        RenderHBarShading(g, t, r2, segment);
+                    }
+
+                    chartControl.DoPostRenderSeriesBarEvent(g, chartXy, this, rd.Sp, r, r2, segment);
+                }
+            }
+        }
+
+        #region RenderHBarShading
+
+        private void RenderHBarShading(
+            Graphics g, Rectangle r, Rectangle r2, BarSegment segment)
+        {
+            if (r.Width > 6)
+            {
+                SmoothingMode sm = g.SmoothingMode;
+                g.SmoothingMode = SmoothingMode.None;
+
+                int n = (int)(r.Height *.15);
+
+                Color[] colors = (Color[])BarShadingColors.Clone();
+
+                colors[2] = Color.FromArgb(Math.Max(0,colors[2].A - 30), colors[2]);
+                colors[3] = Color.FromArgb(Math.Max(0, colors[3].A - 30), colors[3]);
+
+                Rectangle r3 = r;
+
+                r3.Inflate(1, 1);
+
+                using (LinearGradientBrush lbr = new LinearGradientBrush(r3, Color.Empty, Color.Empty, 90f))
+                {
+                    lbr.WrapMode = WrapMode.Tile;
+
+                    ColorBlend cb = new ColorBlend(4);
+
+                    cb.Colors = new Color[] { colors[0], Color.Transparent, Color.Transparent, colors[1] };
+                    cb.Positions = new float[] { 0f, .25f, .75f, 1f };
+
+                    lbr.InterpolationColors = cb;
+
+                    r3.Inflate(-1, -1);
+
+                    g.FillRectangle(lbr, r3);
+                }
+
+                switch (segment)
+                {
+                    case BarSegment.LeftPartial:
+                        FillLeft(g, r, n, colors);
+                        break;
+
+                    case BarSegment.RightPartial:
+                        FillRight(g, r, n, colors);
+                        break;
+
+                    default:
+                        FillLeft(g, r, n, colors);
+                        FillRight(g, r, n, colors);
+                        break;
+                }
+
+                g.SmoothingMode = sm;
+            }
+        }
+
+        #region FillLeft
+
+        private void FillLeft(Graphics g, Rectangle r, int n, Color[] colors)
+        {
+            r.Width = n - 1;
+            r.Inflate(1, 0);
+
+            using (LinearGradientBrush lbr = new LinearGradientBrush(r, colors[2], Color.Transparent, 0f))
+            {
+                lbr.WrapMode = WrapMode.TileFlipX;
+
+                r.X++;
+
+                g.FillRectangle(lbr, r);
+            }
+        }
+
+        #endregion
+
+        #region FillRight
+
+        private void FillRight(Graphics g, Rectangle r, int n, Color[] colors)
+        {
+            r.X = r.Right - n;
+            r.Width = n;
+            r.Inflate(1, 0);
+            
+            using (LinearGradientBrush lbr = new LinearGradientBrush(r, colors[2], Color.Transparent, 180f))
+            {
+                r.X++;
+                r.Width--;
+
+                g.FillRectangle(lbr, r);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region RenderVBarPlot
+
+        private void RenderVBarPlot(Graphics g,
+            ChartXy chartXy, SortedSeriesPoints ssp, ChartSeriesVisualStyle sstyle)
+        {
+            PointData pd = GatherSeriesPoints(chartXy, ssp, 0, ssp.Count, false);
+
+            if (pd.Points.Count > 0)
+            {
+                g.RenderingOrigin = chartXy.GetLocalAdjustedPoint(Point.Empty);
+
+                BarRenderData rd = new BarRenderData(chartXy, AxisY ?? chartXy.AxisY);
+
+                rd.FillRange = GetBarFillRange(chartXy);
+                rd.BarShading = GetBarShading(chartXy);
+
+                rd.SeriesStyle = sstyle;
+
+                int index = 0;
+                bool isHistogram = false;
+
+                if (chartXy.BarShowAsHistogram == Tbool.True)
+                {
+                    ChartAxis axisX = AxisX ?? chartXy.AxisX;
+                    AxisBar axisBar = axisX.AxisBars[(int)AxisBarType.Bar];
+
+                    if (axisBar.BarCount == 1)
+                    {
+                        TickmarkLayout layout = axisX.TickmarkLayout;
+
+                        for (int i = 0; i < layout.Ticks.Length; i++)
+                        {
+                            if (layout.Ticks[i].LabelIndex >= 0)
+                            {
+                                index = i;
+                                break;
+                            }
+                        }
+
+                        isHistogram = true;
+                    }
+                }
+
+                for (int i = 0; i < pd.Points.Count; i++)
+                {
+                    Point[] pts = pd.Points[i];
+                    SeriesPoint[] spts = pd.SeriesPoints[i];
+
+                    for (int j = 0; j < pts.Length; j++)
+                    {
+                        rd.Spt = pts[j];
+                        rd.Sp = spts[j];
+
+                        RenderVBar(g, rd, isHistogram, j + index);
+                    }
+                }
+            }
+        }
+
+        #region RenderVBar
+
+        private void RenderVBar(
+            Graphics g, BarRenderData rd, bool isHistogram, int index)
+        {
+            ChartXy chartXy = rd.ChartXy;
+            SeriesPoint sp = rd.Sp;
+            Point spt = rd.Spt;
+
+            sp.PointSize = new Size(BarWidth, 5);
+
+            int x = (int)(spt.X + BarOffset - BarWidth / 2);
+            int width = BarWidth;
+
+            if (isHistogram == true)
+                x = GetHistogramSizeX(chartXy, spt, index, out width);
+
+            int y1 = spt.Y;
+            int y2 = GetVBarStart(chartXy, sp);
+            int yOrigin = GetVBarOrigin(chartXy, rd.Axis, sp);
+
+            if (y1 > y2)
+            {
+                int ytemp = y1;
+                y1 = y2;
+                y2 = ytemp;
+            }
+
+            if (y2 <= yOrigin)
+            {
+                RenderAscendingBar(g, rd, x, width, y1, y2, yOrigin);
+            }
+            else if (y1 >= yOrigin)
+            {
+                RenderDescendingBar(g, rd, x, width, y1, y2, yOrigin);
+            }
+            else
+            {
+                RenderAscendingBar(g, rd, x, width, y1, yOrigin, yOrigin);
+                RenderDescendingBar(g, rd, x, width, yOrigin, y2, yOrigin);
+            }
+        }
+
+        #region GetHistogramSizeX
+
+        private int GetHistogramSizeX(
+            ChartXy chartXy, Point spt, int index, out int width)
+        {
+            ChartAxis axis = AxisX ?? chartXy.AxisX;
+            TickmarkLayout layout = axis.TickmarkLayout;
+
+            if (index < layout.Ticks.Length)
+                width = layout.Ticks[index + 1].TickPoint.X - spt.X;
+            else
+                width = (int)layout.MajorInterval;
+
+            int x = spt.X - (int)(layout.MajorInterval / 2);
+
+            return (x);
+        }
+
+        #endregion
+
+        #region GetVBarStart
+
+        internal int GetVBarStart(ChartXy chartXy, SeriesPoint sp)
+        {
+            ChartAxis axis = AxisY ?? chartXy.AxisY;
+
+            object value = ((sp.ValueY != null  && sp.ValueY.Length > 1)
+                ? sp.ValueY[1] : (chartXy.BarOrigin ?? null));
+
+            if (value == null)
+            {
+                if (axis.ScaleType == ScaleType.Quantitative)
+                    value = 0;
+                else
+                    value = axis.ActualMinValue;
+            }
+
+            return (chartXy.GetDataPointY(axis, value));
+        }
+
+        #endregion
+
+        #region GetVBarOrigin
+
+        private int GetVBarOrigin(
+            ChartXy chartXy, ChartAxis axis, SeriesPoint sp)
+        {
+            object value = ((sp.ValueY != null && sp.ValueY.Length > 2)
+                ? sp.ValueY[2] : (chartXy.BarOrigin ?? null));
+
+            if (value == null)
+            {
+                if (axis.ScaleType == ScaleType.Quantitative)
+                    value = 0;
+                else
+                    value = axis.ActualMinValue;
+            }
+
+            return (chartXy.GetDataPointY(axis, value));
+        }
+
+        #endregion
+
+        #region RenderAscendingBar
+
+        private void RenderAscendingBar(Graphics g,
+            BarRenderData rd, int x, int width, int y1, int y2, int yOrigin)
+        {
+            Rectangle r = new Rectangle(x, y1, Math.Max(1, width - 1), y2 - y1);
+
+            if (r.IntersectsWith(_RenderBounds))
+            {
+                Background bk = rd.SeriesStyle.BarVisualStyle.Background;
+                ChartLineVisualStyle lstyle = rd.SeriesStyle.BarVisualStyle.Border;
+
+                Rectangle r2 = r;
+
+                if (rd.FillRange == BarFillRange.BySeries)
+                {
+                    int top = rd.ChartXy.GetDataPointY(rd.Axis, MaxValueY);
+
+                    r2.Y = top;
+                    r2.Height = yOrigin - top;
+                }
+
+                BarSegment segment = (y2 < yOrigin) ? BarSegment.Top : BarSegment.TopPartial;
+
+                RenderFullVBar(g, rd, r, r2, bk, lstyle, segment);
+            }
+        }
+
+        #endregion
+
+        #region RenderDescendingBar
+
+        private void RenderDescendingBar(Graphics g,
+            BarRenderData rd, int x, int width, int y1, int y2, int yOrigin)
+        {
+            Rectangle r = new Rectangle(x, y1, Math.Max(1, width - 1), y2 - y1);
+
+            if (r.IntersectsWith(_RenderBounds))
+            {
+                ChartSeriesVisualStyle sstyle = rd.SeriesStyle;
+
+                Background bk = sstyle.BarVisualStyle.AlternateBackground;
+
+                if (bk.IsEmpty)
+                    bk = sstyle.BarVisualStyle.Background;
+
+                ChartLineVisualStyle lstyle = sstyle.BarVisualStyle.AlternateBorder;
+
+                if (lstyle.IsEmpty)
+                    lstyle = sstyle.BarVisualStyle.Border;
+
+                Rectangle r2 = r;
+
+                if (GetBarFillRange(rd.ChartXy) == BarFillRange.BySeries)
+                {
+                    r2.Y = yOrigin;
+                    r2.Height = rd.ChartXy.GetDataPointY(rd.Axis, MinValueY) - r2.Y;
+                }
+
+                BarSegment segment = (y1 > yOrigin) ? BarSegment.Bottom : BarSegment.BottomPartial;
+
+                RenderFullVBar(g, rd, r, r2, bk, lstyle, segment);
+            }
+        }
+
+        #endregion
+
+        #region RenderFullVBar
+
+        private void RenderFullVBar(Graphics g, BarRenderData rd,
+            Rectangle r, Rectangle r2, Background bk, ChartLineVisualStyle lstyle, BarSegment segment)
+        {
+            if (r2.Width > 0 && r2.Height > 0)
+            {
+                ChartXy chartXy = rd.ChartXy;
+                ChartControl chartControl = ChartControl;
+
+                if (chartControl.DoPreRenderSeriesBarEvent(g, chartXy, this, rd.Sp, r, r2, segment) == false)
+                {
+                    using (Brush br = bk.GetBrush(r2))
+                        g.FillRectangle(br, r);
+
+                    int lw = 0;
+
+                    if (lstyle.LinePattern != LinePattern.None)
+                    {
+                        SmoothingMode sm = g.SmoothingMode;
+                        g.SmoothingMode = SmoothingMode.None;
+
+                        using (Pen pen = new Pen(lstyle.LineColor, Dpi.Width(lstyle.LineWidth)))
+                        {
+                            lw = (int)pen.Width;
+
+                            if (lstyle.LinePattern != LinePattern.NotSet)
+                                pen.DashStyle = (DashStyle)lstyle.LinePattern;
+
+                            g.DrawRectangle(pen, r);
+                        }
+
+                        g.SmoothingMode = sm;
+                    }
+
+                    if (rd.BarShading == true)
+                    {
+                        Rectangle t = r;
+                        t.Inflate(-lw/2, -lw/2);
+
+                        t.Width++;
+                        t.Height++;
+
+                        RenderVBarShading(g, t, r2, segment);
+                    }
+
+                    chartControl.DoPostRenderSeriesBarEvent(g, chartXy, this, rd.Sp, r, r2, segment);
+                }
+            }
+        }
+
+        #region RenderVBarShading
+
+        private void RenderVBarShading(
+            Graphics g, Rectangle r, Rectangle r2, BarSegment segment)
+        {
+            int n = r.Width / 10 + 1;
+
+            if (r.Width > 6 && r.Height > n)
+            {
+                SmoothingMode sm = g.SmoothingMode;
+                g.SmoothingMode = SmoothingMode.None;
+
+                Color[] colors = (Color[])BarShadingColors.Clone();
+
+                Rectangle r3 = r;
+
+                using (LinearGradientBrush lbr = new LinearGradientBrush(r3, Color.Empty, Color.Empty, 0f))
+                {
+                    lbr.WrapMode = WrapMode.TileFlipX;
+
+                    ColorBlend cb = new ColorBlend(4);
+
+                    cb.Colors = new Color[] { colors[2], Color.Transparent, Color.Transparent, colors[3] };
+                    cb.Positions = new float[] { 0f, .15f, .85f, 1f };
+
+                    lbr.InterpolationColors = cb;
+
+                    g.FillRectangle(lbr, r3);
+                }
+
+                switch (segment)
+                {
+                    case BarSegment.TopPartial:
+                        FillTop(g, r, n, colors);
+                        break;
+
+                    case BarSegment.BottomPartial:
+                        FillBottom(g, r, n, colors);
+                        break;
+
+                    default:
+                        FillTop(g, r, n, colors);
+                        FillBottom(g, r, n, colors);
+                        break;
+                }
+
+                g.SmoothingMode = sm;
+            }
+        }
+
+        #region FillTop
+
+        private void FillTop(Graphics g, Rectangle r, int n, Color[] colors)
+        {
+            using (Pen pen = new Pen(colors[0]))
+            {
+                Point pt1 = new Point(r.X + 1, r.Y);
+                Point pt2 = new Point(r.Right - 2, r.Y);
+
+                for (int i = 0; i < n; i++)
+                {
+                    g.DrawLine(pen, pt1, pt2);
+
+                    pt1.X++;
+                    pt2.X--;
+
+                    pt1.Y++;
+                    pt2.Y++;
+                }
+            }
+        }
+
+        #endregion
+
+        #region FillBottom
+
+        private void FillBottom(Graphics g, Rectangle r, int n, Color[] colors)
+        {
+            using (Pen pen = new Pen(colors[1]))
+            {
+                Point pt1 = new Point(r.X + 1, r.Bottom - 1);
+                Point pt2 = new Point(r.Right - 2, r.Bottom - 1);
+
+                for (int i = 0; i < n; i++)
+                {
+                    g.DrawLine(pen, pt1, pt2);
+
+                    pt1.X++;
+                    pt2.X--;
+
+                    pt1.Y--;
+                    pt2.Y--;
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region GetBarFillRange
+
+        private BarFillRange GetBarFillRange(ChartXy chartXy)
+        {
+            BarFillRange fillRange = BarFillRange;
+
+            if (fillRange == BarFillRange.NotSet)
+                fillRange = chartXy.BarFillRange;
+
+            return ((fillRange != BarFillRange.NotSet)
+                ? fillRange : BarFillRange.ByBar);
+        }
+
+        #endregion
+
+        #region GetBarLabelPosition
+
+        internal BarLabelPosition GetBarLabelPosition(ChartXy chartXy)
+        {
+            BarLabelPosition labelPos = BarLabelPosition;
+
+            if (labelPos == BarLabelPosition.NotSet)
+                labelPos = chartXy.BarLabelPosition;
+
+            return ((labelPos != BarLabelPosition.NotSet)
+                ? labelPos : BarLabelPosition.Center);
+        }
+
+        #endregion
+
+        #region GetBarShading
+
+        private bool GetBarShading(ChartXy chartXy)
+        {
+            Tbool barShading = BarShadingEnabled;
+
+            if (barShading == Tbool.NotSet)
+                barShading = chartXy.BarShadingEnabled;
+
+            return (barShading == Tbool.True);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderBubblePlot
+
+        private void RenderBubblePlot(Graphics g,
+            ChartXy chartXy, SortedSeriesPoints ssp, ChartSeriesVisualStyle sstyle)
+        {
+            BubblePlotData bdata = _PlotData as BubblePlotData;
+
+            if (bdata != null)
+            {
+                double minIntensity = 32;
+                double maxIntensity = 255;
+
+                PointMarkerVisualStyle pstyle = sstyle.MarkerVisualStyle;
+                PointMarkerVisualStyle hstyle = GetHighlightStyle(chartXy, sstyle);
+
+                if (DisplayLinePointsOnTop == true)
+                    RenderConvexHull(g, chartXy, ssp, sstyle, pstyle);
+
+                BubbleIntensityMode imode = GetBubbleIntensityMode(chartXy);
+                
+                for (int i = 0; i < ssp.Count; i++)
+                {
+                    SeriesPoint sp = ssp[i];
+
+                    if (sp.Visible == true)
+                    {
+                        int size = sp.PointSize.Width;
+
+                        Point pt = chartXy.GetDataPointNa(this, sp, 0);
+                        Rectangle r = new Rectangle(pt.X - size / 2, pt.Y - size / 2, size, size);
+
+                        if (r.IntersectsWith(_RenderBounds))
+                        {
+                            Point ppt = chartXy.GetLocalAdjustedPoint(pt);
+
+                            bool isCrossPoint = chartXy.IsCrosshairSeriesPoint(this, ppt);
+                            int intensity = GetIntensity(sp, imode, bdata, minIntensity, maxIntensity);
+
+                            PointMarkerVisualStyle style = (hstyle != null && isCrossPoint) ? hstyle : pstyle;
+
+                            Image image = style.GetPointMarkerImage();
+
+                            if (image == null)
+                                image = GetPointMarker(g, style, r.Size);
+
+                            if (image != null)
+                            {
+                                g.DrawImage(image, r);
+                            }
+                            else if (style.Type == PointMarkerType.Ellipse || style.Type == PointMarkerType.NotSet)
+                            {
+                                using (Brush br = style.Background.GetBrush(r, intensity))
+                                {
+                                    g.FillEllipse(br, r);
+
+                                    if (style.BorderColor.IsEmpty == false && style.BorderWidth > 0)
+                                    {
+                                        using (Pen pen = new Pen(style.BorderColor, Dpi.Width(style.BorderWidth)))
+                                            g.DrawEllipse(pen, r);
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+
+                if (DisplayLinePointsOnTop == false)
+                    RenderConvexHull(g, chartXy, ssp, sstyle, pstyle);
+
+                if (hstyle != null)
+                    hstyle.Dispose();
+            }
+        }
+
+        #region GetIntensity
+
+        private int GetIntensity(SeriesPoint sp,
+            BubbleIntensityMode imode, BubblePlotData bdata, double minIntensity, double maxIntensity)
+        {
+            if (imode != BubbleIntensityMode.None && imode != BubbleIntensityMode.NotSet)
+            {
+                if (sp.ValueY.Length > 2)
+                {
+                    double intensity = -1;
+
+                    if (sp.ValueY[2] is double)
+                        intensity = (double)sp.ValueY[2];
+
+                    else if (sp.ValueY[2] is int)
+                        intensity = Convert.ToDouble(sp.ValueY[2]);
+
+                    if (imode == BubbleIntensityMode.Alpha)
+                        return ((int)intensity);
+
+                    if (intensity >= 0)
+                    {
+                        double range = maxIntensity - minIntensity;
+                        double intensityRange = bdata.MaxIntensity - bdata.MinIntensity;
+
+                        if (intensityRange <= 0)
+                            return (-1);
+
+                        return (int)(((intensity - bdata.MinIntensity) * range) / intensityRange + minIntensity);
+                    }
+                }
+            }
+
+            return (-1);
+        }
+
+        #endregion
+
+        #region GetBubbleSizeMode
+
+        private BubbleSizeMode GetBubbleSizeMode(ChartXy chartXy)
+        {
+            if (BubbleSizeMode != BubbleSizeMode.NotSet)
+                return (BubbleSizeMode);
+
+            if (chartXy.BubbleSizeMode != BubbleSizeMode.NotSet)
+                return (chartXy.BubbleSizeMode);
+
+            return (BubbleSizeMode.Area);
+        }
+
+        #endregion
+
+        #region GetBubbleIntensityMode
+
+        private BubbleIntensityMode GetBubbleIntensityMode(ChartXy chartXy)
+        {
+            if (BubbleIntensityMode != BubbleIntensityMode.NotSet)
+                return (BubbleIntensityMode);
+
+            if (chartXy.BubbleIntensityMode != BubbleIntensityMode.NotSet)
+                return (chartXy.BubbleIntensityMode);
+
+            return (BubbleIntensityMode.None);
+        }
+
+        #endregion
+
+        #region GetPointMarker
+
+        internal Image GetPointMarker(Graphics g, PointMarkerVisualStyle style, Size size)
+        {
+            if (style.Type == PointMarkerType.NotSet ||
+                style.Type == PointMarkerType.None || style.Type == PointMarkerType.Ellipse)
+            {
+                return (null);
+            }
+
+            if (_PointMarker == null)
+                _PointMarker = new PointMarker();
+
+            return (_PointMarker.GetMarkerBitmap(g, style.Type, style.PointCount, 
+                size, style.Rotation, style.Background, style.BorderColor, style.BorderWidth));
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderDotPlot
+
+        #region RenderHDotPlot
+
+        private void RenderHDotPlot(Graphics g,
+            ChartXy chartXy, SortedSeriesPoints ssp, ChartSeriesVisualStyle sstyle)
+        {
+            Image marker = PointMarkerImage;
+
+            if (marker != null)
+            {
+                Size maxSize = chartXy.GetMaxDotPlotMarkerSize();
+
+                for (int i = 0; i < ssp.Count; i++)
+                {
+                    SeriesPoint sp = ssp[i];
+
+                    if (sp.Visible == true)
+                    {
+                        object pointValueX = chartXy.GetDataPointValueX(this, sp);
+
+                        Point pt = chartXy.GetPointFromValue(this, 0, pointValueX);
+
+                        Point ppt = new Point(pt.X + maxSize.Width / 2, pt.Y);
+
+                        int dcount = ssp.CountArray[i];
+
+                        for (int j = 0; j < dcount; j++)
+                        {
+                            RenderPointMarker(g, chartXy, sp, ppt, maxSize, marker);
+
+                            ppt.X += maxSize.Width;
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region RenderVDotPlot
+
+        private void RenderVDotPlot(Graphics g,
+            ChartXy chartXy, SortedSeriesPoints ssp, ChartSeriesVisualStyle sstyle)
+        {
+            Image marker = PointMarkerImage;
+
+            if (marker != null)
+            {
+                Size maxSize = chartXy.GetMaxDotPlotMarkerSize();
+
+                for (int i = 0; i < ssp.Count; i++)
+                {
+                    SeriesPoint sp = ssp[i];
+
+                    if (sp.Visible == true)
+                    {
+                        Point pt = chartXy.GetDataPointNa(this, sp, -1);
+                        Point ppt = new Point(pt.X, pt.Y - maxSize.Height / 2);
+
+                        int dcount = ssp.CountArray[i];
+
+                        for (int j = 0; j < dcount; j++)
+                        {
+                            RenderPointMarker(g, chartXy, sp, ppt, maxSize, marker);
+
+                            ppt.Y -= maxSize.Height;
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region GetDotCount
+
+        private int GetDotCount(SeriesPoint sp)
+        {
+            if (sp.ValueY != null && sp.ValueY.Length > 0)
+            {
+                int count = 0;
+
+                foreach (object o in sp.ValueY)
+                {
+                    if (o is int)
+                        count += (int)o;
+
+                    else if (o is double)
+                        count += (int)Convert.ChangeType(o, typeof(int));
+                }
+
+                return (count);
+            }
+
+            return (1);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderPointPlot
+
+        private void RenderPointPlot(Graphics g, ChartXy chartXy,
+            SortedSeriesPoints ssp, bool showHull, ChartSeriesVisualStyle sstyle)
+        {
+            PointData pd = GatherSeriesPoints(chartXy, ssp, 0, ssp.Count, true);
+
+            if (pd.Points.Count > 0)
+            {
+                PointMarkerVisualStyle pstyle = sstyle.MarkerVisualStyle;
+                PointMarkerVisualStyle hstyle = GetHighlightStyle(chartXy, sstyle);
+
+                if (showHull == true)
+                    RenderConvexHull(g, chartXy, ssp, sstyle, pstyle);
+
+                if (hstyle == null)
+                {
+                    Image marker = chartXy.GetPointMarker(g, pstyle);
+
+                    if (marker != null)
+                    {
+                        for (int i=0; i<pd.Points.Count; i++)
+                        {
+                            Point[] pts = pd.Points[i];
+                            SeriesPoint[] spts = pd.SeriesPoints[i];
+
+                            for (int j = 0; j < pts.Length; j++)
+                                RenderPointMarker(g, chartXy, spts[j], pts[j], Size.Empty, marker);
+                        }
+                    }
+                }
+                else
+                {
+                    for (int i = 0; i < pd.Points.Count; i++)
+                    {
+                        Point[] pts = pd.Points[i];
+                        SeriesPoint[] spts = pd.SeriesPoints[i];
+
+                        for (int j = 0; j < pts.Length; j++)
+                        {
+                            Point ppt = pts[j];
+                            Point ppt2 = chartXy.GetLocalAdjustedPoint(ppt);
+
+                            Image marker = (chartXy.IsCrosshairSeriesPoint(this, ppt2))
+                                ? GetHighlightImage(g, chartXy, hstyle) : PointMarkerImage;
+
+                            RenderPointMarker(g, chartXy, spts[j], ppt, Size.Empty, marker);
+                        }
+                    }
+                }
+
+                if (ShowEmptyPoints == true)
+                    RenderEmptyPoints(g, chartXy, pd, sstyle);
+            }
+        }
+
+        #region RenderPointMarker
+
+        private void RenderPointMarker(Graphics g,
+            ChartXy chartXy, SeriesPoint sp, Point pt, Size maxSize, Image marker)
+        {
+            if (marker != null)
+            {
+                ChartControl control = ChartControl;
+
+                Image ptMarker = marker;
+
+                Size markerSize = marker.Size;
+                Size size = maxSize.IsEmpty ? markerSize : maxSize;
+
+                sp.PointSize = size;
+
+                Point ptc = new Point(
+                    pt.X - markerSize.Width / 2,
+                    pt.Y - markerSize.Height / 2);
+
+                Rectangle r = new Rectangle(ptc, markerSize);
+
+                if (r.IntersectsWith(_RenderBounds))
+                {
+                    if (control.DoPreRenderSeriesPointEvent(g,
+                        chartXy, this, sp, pt, size, ref ptMarker) == false)
+                    {
+                        if (ptMarker != null)
+                        {
+                            g.DrawImageUnscaled(ptMarker, ptc);
+
+                            control.DoPostRenderSeriesPointEvent(g,
+                                chartXy, this, sp, pt, ptMarker.Size, ptMarker);
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region RenderConvexHull
+
+        private void RenderConvexHull(Graphics g, ChartXy chartXy,
+            SortedSeriesPoints ssp, ChartSeriesVisualStyle sstyle, PointMarkerVisualStyle pstyle)
+        {
+            ConvexHullDisplayMode mode = GetConvexHullDisplayMode(chartXy);
+
+            if (mode != ConvexHullDisplayMode.None)
+            {
+                if (_ConvexHullPoints == null)
+                {
+                    PointData pd = GatherSeriesPointsEx(chartXy, ssp, 0, ssp.Count, true);
+
+                    _ConvexHullPoints = ConvexHull.GetConvexHull(
+                        (pd.Points.Count == 1) ? pd.Points[0] : CombineListPoints(pd.Points));
+                }
+
+                if (_ConvexHullPoints.Length > 3)
+                {
+                    using (GraphicsPath path = new GraphicsPath())
+                    {
+                        path.AddPolygon(_ConvexHullPoints);
+
+                        if ((mode & ConvexHullDisplayMode.DisplayBackground) == ConvexHullDisplayMode.DisplayBackground)
+                        {
+                            Rectangle r = Rectangle.Round(path.GetBounds());
+
+                            Background bg = (sstyle.ConvexHullBackground.IsEmpty)
+                                ? pstyle.Background : sstyle.ConvexHullBackground;
+
+                            using (Brush br = bg.GetBrush(r))
+                                g.FillPath(br, path);
+                        }
+
+                        if ((mode & ConvexHullDisplayMode.DisplayBorder) == ConvexHullDisplayMode.DisplayBorder)
+                        {
+                            Color color;
+                            int width;
+                            LinePattern pattern;
+
+                            if (sstyle.ConvexHullLineStyle.IsEmpty == false)
+                            {
+                                color = sstyle.ConvexHullLineStyle.LineColor;
+                                width = sstyle.ConvexHullLineStyle.LineWidth;
+                                pattern = sstyle.ConvexHullLineStyle.LinePattern;
+                            }
+                            else
+                            {
+                                color = pstyle.BorderColor;
+                                width = pstyle.BorderWidth;
+                                pattern = LinePattern.Solid;
+                            }
+
+                            if (pattern != LinePattern.None)
+                            {
+                                using (Pen pen = new Pen(color, Dpi.Width(width)))
+                                {
+                                    if (pattern != LinePattern.NotSet)
+                                        pen.DashStyle = (DashStyle)pattern;
+
+                                    g.DrawPath(pen, path);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        #region GetConvexHullDisplayMode
+
+        private ConvexHullDisplayMode GetConvexHullDisplayMode(ChartXy chartXy)
+        {
+            if (ConvexHullDisplayMode != ConvexHullDisplayMode.NotSet)
+                return (ConvexHullDisplayMode);
+
+            ConvexHullDisplayMode mode = chartXy.ConvexHullDisplayMode;
+
+            if (mode != ConvexHullDisplayMode.NotSet) 
+                return (mode);
+
+            return (ConvexHullDisplayMode.None);
+        }
+
+        #endregion
+
+        #region CombineListPoints
+
+        private Point[] CombineListPoints(List<Point[]> plist)
+        {
+            int n = 0;
+
+            foreach (Point[] points in plist)
+                n += points.Length;
+
+            Point[] fpoints = new Point[n];
+
+            n = 0;
+
+            foreach (Point[] points in plist)
+            {
+                for (int i = 0; i < points.Length; i++)
+                    fpoints[n++] = points[i];
+            }
+
+            return (fpoints);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderEmptyPoints
+
+        private void RenderEmptyPoints(Graphics g,
+            ChartXy chartXy, PointData pd, ChartSeriesVisualStyle sstyle)
+        {
+            PointData epd = _EmptyPointData;
+
+            if (epd != null && epd.Points.Count > 0)
+            {
+                PointMarkerVisualStyle pstyle = sstyle.MarkerEmptyVisualStyle;
+
+                Image marker = GetEmptyMarkerImage(g, chartXy, pstyle);
+
+                if (marker != null)
+                {
+                    for (int i = 0; i < epd.Points.Count; i++)
+                    {
+                        Point[] epts = epd.Points[i];
+                        SeriesPoint[] septs = epd.SeriesPoints[i];
+
+                        Point[] pts = GetEmptyPointRange(epts[0]);
+
+                        int run = pts[0].X - pts[1].X;
+                        int rise = pts[0].Y - pts[1].Y;
+
+                        double slope = (run != 0) ? (double)rise / run : 0;
+                        double b = pts[0].Y - (slope * pts[0].X);
+
+                        for (int j = 0; j < epts.Length; j++)
+                        {
+                            Point ept = epts[j];
+                            SeriesPoint sept = septs[j];
+
+                            Point ppt = new Point(ept.X, (int)(slope * ept.X + b));
+
+                            RenderPointMarker(g, chartXy, sept, ppt, Size.Empty, marker);
+                        }
+                    }
+                }
+            }
+        }
+
+        #region GetEmptyPointRange
+
+        private Point[] GetEmptyPointRange(Point pt)
+        {
+            Point[] pts = new Point[2];
+
+            pts[0] = Point.Empty;
+            pts[1] = Point.Empty;
+
+            PointData pd = _PointData;
+
+            for (int i = 0; i < pd.Points.Count; i++)
+            {
+                Point[] lps = pd.Points[i];
+
+                if (pt.X <= lps[0].X)
+                {
+                    pts[1] = lps[0];
+
+                    if (i == 0)
+                        pts[0] = pts[1];
+
+                    return (pts);
+                }
+
+                pts[0] = lps[lps.Length - 1];
+            }
+
+            pts[1] = pts[0];
+
+            return (pts);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region RenderLinePlot
+
+        private void RenderLinePlot(Graphics g,
+            ChartXy chartXy, SortedSeriesPoints ssp, ChartSeriesVisualStyle sstyle)
+        {
+            PointData pd = GatherSeriesPoints(chartXy, ssp, 0, ssp.Count, false);
+
+            if (pd.Points.Count > 0)
+            {
+                ChartLineDisplayMode lineMode = GetLineDisplayMode(chartXy);
+                ChartLineAreaDisplayMode areaMode = GetAreaDisplayMode(chartXy);
+
+                PointMarkerVisualStyle pstyle = sstyle.MarkerVisualStyle;
+
+                RenderConvexHull(g, chartXy, ssp, sstyle, pstyle);
+
+                if (DisplayLinePointsOnTop == true)
+                    RenderLinePlotLines(g, chartXy, pd, lineMode, areaMode, sstyle);
+
+                if ((lineMode & ChartLineDisplayMode.DisplayPoints) == ChartLineDisplayMode.DisplayPoints)
+                {
+                    RenderPointPlot(g, chartXy, ssp, false, sstyle);
+                }
+                else
+                {
+                    if (ShowEmptyPoints == true)
+                        RenderEmptyPoints(g, chartXy, pd, sstyle);
+
+                    RenderPointLabelPoints(g, chartXy, sstyle);
+
+                    if (HighLightPoints(chartXy) == true)
+                        RenderHighlightPoints(g, chartXy, pd, sstyle);
+                }
+
+                if (DisplayLinePointsOnTop == false)
+                    RenderLinePlotLines(g, chartXy, pd, lineMode, areaMode, sstyle);
+            }
+        }
+
+        #region RenderPointLabelPoints
+
+        private void RenderPointLabelPoints(Graphics g,
+            ChartXy chartXy, ChartSeriesVisualStyle sstyle)
+        {
+            List<PointLabelGroup> pointLabels = chartXy.PointLabels;
+
+            if (pointLabels != null && pointLabels.Count > 0)
+            {
+                foreach (PointLabelGroup lg in pointLabels)
+                {
+                    if (lg.ChartSeries == this)
+                    {
+                        PointMarkerVisualStyle pstyle = sstyle.MarkerVisualStyle;
+
+                        Image marker = chartXy.GetPointMarker(g, pstyle);
+
+                        if (marker != null)
+                        {
+                            Size size = marker.Size;
+
+                            for (int i = 0; i < lg.PointLabels.Count; i++)
+                            {
+                                PointLabel pl = lg.PointLabels[i];
+
+                                if (pl.Visible == true && pl.SeriesPoint.IsEmpty == false)
+                                {
+                                    DataLabelVisualStyle dstyle = GetPointLabelVisualStyle(pl);
+
+                                    if (dstyle.DrawPointMarker != Tbool.False)
+                                    {
+                                        SeriesPoint spt = pl.SeriesPoint;
+
+                                        Point ppt = pl.Point;
+                                        Point ppc = new Point(ppt.X, ppt.Y);
+
+                                        RenderPointMarker(g, chartXy, spt, ppc, Size.Empty, marker);
+                                    }
+                                }
+                            }
+                        }
+                        break;
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region RenderLinePlotLines
+
+        private void RenderLinePlotLines(Graphics g, ChartXy chartXy, PointData pd,
+            ChartLineDisplayMode lineMode, ChartLineAreaDisplayMode areaMode, ChartSeriesVisualStyle sstyle)
+        {
+            if ((lineMode & ChartLineDisplayMode.DisplayStepLine) == ChartLineDisplayMode.DisplayStepLine)
+            {
+                StepLineMode slm = GetStepLineMode(chartXy);
+
+                if (slm != StepLineMode.None)
+                    RenderStepLines(g, chartXy, pd, slm, areaMode, sstyle);
+            }
+
+            if ((lineMode & ChartLineDisplayMode.DisplayLine) == ChartLineDisplayMode.DisplayLine)
+                RenderLines(g, chartXy, pd, lineMode, areaMode, sstyle);
+
+            if ((lineMode & ChartLineDisplayMode.DisplaySpline) == ChartLineDisplayMode.DisplaySpline)
+                RenderSplines(g, chartXy, pd, lineMode, areaMode, sstyle);
+
+            if (ShowEmptyLines == true)
+            {
+                if ((lineMode & (ChartLineDisplayMode.DisplayLine | ChartLineDisplayMode.DisplaySpline)) != 0)
+                    RenderEmptyLines(g, chartXy, pd.Points, areaMode, sstyle);
+            }
+        }
+
+        #region GetStepLineMode
+
+        private StepLineMode GetStepLineMode(ChartXy chartXy)
+        {
+            StepLineMode mode = StepLineMode;
+
+            if (mode == StepLineMode.NotSet)
+                mode = chartXy.StepLineMode;
+
+            if (mode == StepLineMode.NotSet)
+                mode = StepLineMode.HorizontalThenVertical;
+
+            return (mode);
+        }
+
+        #endregion
+
+        #region RenderLines
+
+        private void RenderLines(Graphics g, ChartXy chartXy,
+            PointData pd, ChartLineDisplayMode lineMode, ChartLineAreaDisplayMode areaMode, ChartSeriesVisualStyle sstyle)
+        {
+            ChartLineVisualStyle lstyle = sstyle.LineStyle;
+
+            if (lstyle.LinePattern != LinePattern.None)
+            {
+                using (Pen pen = new Pen(lstyle.LineColor, Dpi.Width(lstyle.LineWidth)))
+                {
+                    if (lstyle.LinePattern != LinePattern.NotSet)
+                        pen.DashStyle = (DashStyle)lstyle.LinePattern;
+
+                    if ((lineMode & ChartLineDisplayMode.DisplayClosed) == ChartLineDisplayMode.DisplayClosed)
+                    {
+                        foreach (Point[] points in pd.Points)
+                        {
+                            if (points.Length > 1)
+                                g.DrawLines(pen, points);
+                        }
+
+                        Point fp = pd.Points[0][0];
+                        Point[] lps = pd.Points[pd.Points.Count - 1];
+                        Point lp = lps[lps.Length - 1];
+
+                        if (fp.Equals(lp) == false)
+                            g.DrawLine(pen, lp, fp);
+                    }
+                    else
+                    {
+                        foreach (Point[] points in pd.Points)
+                        {
+                            if (points.Length > 1)
+                            {
+                                using (GraphicsPath path = new GraphicsPath())
+                                {
+                                    path.AddLines(points);
+
+                                    if ((areaMode & ChartLineAreaDisplayMode.DisplayLine) == ChartLineAreaDisplayMode.DisplayLine)
+                                        RenderAreaBackground(g, chartXy, points, path, sstyle.LineAreaBackground);
+
+                                    g.DrawPath(pen, path);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region RenderSplines
+
+        private void RenderSplines(Graphics g, ChartXy chartXy, PointData pd,
+            ChartLineDisplayMode lineMode, ChartLineAreaDisplayMode areaMode, ChartSeriesVisualStyle sstyle)
+        {
+            ChartLineVisualStyle lstyle = sstyle.SplineStyle;
+
+            if (lstyle.LinePattern != LinePattern.None)
+            {
+                using (Pen pen = new Pen(lstyle.LineColor, Dpi.Width(lstyle.LineWidth)))
+                {
+                    if (lstyle.LinePattern != LinePattern.NotSet)
+                        pen.DashStyle = (DashStyle)lstyle.LinePattern;
+
+                    if ((pd.Points.Count == 1) &&
+                        (lineMode & ChartLineDisplayMode.DisplayClosed) == ChartLineDisplayMode.DisplayClosed)
+                    {
+                        Point[] points = pd.Points[0];
+
+                        if (points.Length > 1)
+                            g.DrawClosedCurve(pen, points);
+                    }
+                    else
+                    {
+                        foreach (Point[] points in pd.Points)
+                        {
+                            if (points.Length > 1)
+                            {
+                                using (GraphicsPath path = new GraphicsPath())
+                                {
+                                    path.AddCurve(points);
+
+                                    if ((areaMode & ChartLineAreaDisplayMode.DisplaySpline) == ChartLineAreaDisplayMode.DisplaySpline)
+                                        RenderAreaBackground(g, chartXy, points, path, sstyle.SplineAreaBackground);
+
+                                    g.DrawPath(pen, path);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region RenderStepLines
+
+        private void RenderStepLines(Graphics g, ChartXy chartXy, PointData pd,
+            StepLineMode slm, ChartLineAreaDisplayMode areaMode, ChartSeriesVisualStyle sstyle)
+        {
+            StepLines sls = GetStepLines(chartXy);
+
+            if (sls != StepLines.None)
+            {
+                PointData sd = GetStepPointData(chartXy, pd, slm);
+
+                if (sd != null)
+                {
+                    SmoothingMode sm = g.SmoothingMode;
+                    g.SmoothingMode = SmoothingMode.Default;
+
+                    ChartCapLineVisualStyle lstyle = sstyle.StepLineStyle;
+
+                    if (sls == StepLines.Both)
+                    {
+                        RenderStepLinesEx1(g, sd, lstyle);
+                    }
+                    else
+                    {
+                        int n = ((sls == StepLines.Horizontal && (slm == StepLineMode.HorizontalThenVertical || slm == StepLineMode.MidPoint)) ||
+                                 (sls == StepLines.Vertical && slm == StepLineMode.VerticalThenHorizontal)) ? 0 : 1;
+
+                        RenderStepLinesEx2(g, sd, n, lstyle);
+
+                        if (sstyle.StepLineAltStyle.IsEmpty == false)
+                            RenderStepLinesEx2(g, sd, n ^ 1, sstyle.StepLineAltStyle);
+                    }
+
+                    g.SmoothingMode = sm;
+
+                    if ((areaMode & ChartLineAreaDisplayMode.DisplayStepLine) == ChartLineAreaDisplayMode.DisplayStepLine)
+                    {
+                        foreach (Point[] points in sd.Points)
+                        {
+                            using (GraphicsPath path = new GraphicsPath())
+                            {
+                                path.AddLines(points);
+
+                                RenderAreaBackground(g, chartXy, points, path, sstyle.StepLineAreaBackground);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        #region GetStepLines
+
+        private StepLines GetStepLines(ChartXy chartXy)
+        {
+            StepLines mode = StepLines;
+
+            if (mode == StepLines.NotSet)
+                mode = chartXy.StepLines;
+
+            if (mode == StepLines.NotSet)
+                mode = StepLines.Both;
+
+            return (mode);
+        }
+
+        #endregion
+
+        #region GetStepPointData
+
+        private PointData GetStepPointData(
+            ChartXy chartXy, PointData pd, Charts.StepLineMode slm)
+        {
+            if (_LastStepLineMode != slm)
+                _StepPointData = null;
+
+            if (_StepPointData == null)
+            {
+                PointData sd = new PointData();
+
+                sd.Points = new List<Point[]>();
+
+                foreach (Point[] points in pd.Points)
+                {
+                    if (points.Length > 1)
+                        sd.Points.Add(GetStepPoints(slm, points));
+                }
+
+                _StepPointData = sd;
+
+                _LastStepLineMode = slm;
+            }
+
+            return (_StepPointData);
+        }
+
+        #region GetStepPoints
+
+        private Point[] GetStepPoints(StepLineMode slm, Point[] pts)
+        {
+            if (slm == StepLineMode.HorizontalThenVertical || slm == StepLineMode.VerticalThenHorizontal)
+            {
+                Point[] points = new Point[pts.Length * 2 - 1];
+
+                if (slm == StepLineMode.HorizontalThenVertical)
+                {
+                    for (int i = 0; i < pts.Length; i++)
+                    {
+                        int n = i * 2;
+
+                        points[n] = pts[i];
+
+                        if (i + 1 < pts.Length)
+                            points[n + 1] = new Point(pts[i + 1].X, pts[i].Y);
+                    }
+                }
+                else
+                {
+                    for (int i = 0; i < pts.Length; i++)
+                    {
+                        int n = i * 2;
+
+                        points[n] = pts[i];
+
+                        if (i + 1 < pts.Length)
+                            points[n + 1] = new Point(pts[i].X, pts[i + 1].Y);
+                    }
+                }
+
+                return (points);
+            }
+            else
+            {
+                Point[] points = new Point[pts.Length * 2];
+
+                points[0] = pts[0];
+
+                for (int i = 0; i < pts.Length - 1; i++)
+                {
+                    int n0 = i * 2 + 1;
+                    int n1 = n0 + 1;
+
+                    points[n0] = new Point((pts[i].X + pts[i + 1].X) / 2, pts[i].Y);
+                    points[n1] = new Point(points[n0].X, pts[i + 1].Y);
+                }
+
+                points[points.Length - 1] = pts[pts.Length - 1];
+
+                return (points);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderStepLinesEx1
+
+        private void RenderStepLinesEx1(Graphics g, PointData sd, ChartCapLineVisualStyle lstyle)
+        {
+            if (lstyle.LinePattern != LinePattern.None)
+            {
+                using (Pen pen = new Pen(lstyle.LineColor, Dpi.Width(lstyle.LineWidth)))
+                {
+                    if (lstyle.LinePattern != LinePattern.NotSet)
+                        pen.DashStyle = (DashStyle)lstyle.LinePattern;
+
+                    if (lstyle.StartCap != ChartLineCap.NotSet)
+                        pen.StartCap = (LineCap)lstyle.StartCap;
+
+                    if (lstyle.EndCap != ChartLineCap.NotSet)
+                        pen.EndCap = (LineCap)lstyle.EndCap;
+
+                    foreach (Point[] points in sd.Points)
+                    {
+                        if (points.Length > 1)
+                            g.DrawLines(pen, points);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region RenderStepLinesEx2
+
+        private void RenderStepLinesEx2(Graphics g,
+            PointData sd, int n, ChartCapLineVisualStyle lstyle)
+        {
+            if (lstyle.LinePattern != LinePattern.None)
+            {
+                using (Pen pen = new Pen(lstyle.LineColor, Dpi.Width(lstyle.LineWidth)))
+                {
+                    if (lstyle.LinePattern != LinePattern.NotSet)
+                        pen.DashStyle = (DashStyle)lstyle.LinePattern;
+
+                    if (lstyle.StartCap != ChartLineCap.NotSet)
+                        pen.StartCap = (LineCap)lstyle.StartCap;
+
+                    if (lstyle.EndCap != ChartLineCap.NotSet)
+                        pen.EndCap = (LineCap)lstyle.EndCap;
+
+                    foreach (Point[] points in sd.Points)
+                    {
+                        if (points.Length > 1)
+                        {
+                            for (int i = n; i < points.Length - 1; i += 2)
+                            {
+                                Point pt1 = points[i];
+                                Point pt2 = points[i + 1];
+
+                                g.DrawLine(pen, pt1, pt2);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderEmptyLines
+
+        private void RenderEmptyLines(Graphics g, ChartXy chartXy,
+            List<Point[]> lpoints, ChartLineAreaDisplayMode areaMode, ChartSeriesVisualStyle sstyle)
+        {
+            if (lpoints.Count > 1)
+            {
+                ChartLineVisualStyle lstyle = sstyle.EmptyStyle;
+
+                if (lstyle.LinePattern != LinePattern.None)
+                {
+                    Point[] points = new Point[(lpoints.Count - 1) * 2];
+                    Point[][] epoints = new Point[lpoints.Count - 1][];
+
+                    for (int i = 0; i < lpoints.Count - 1; i++)
+                    {
+                        Point[] pts1 = lpoints[i];
+                        Point[] pts2 = lpoints[i + 1];
+
+                        epoints[i] = new Point[2];
+
+                        epoints[i][0] = pts1[pts1.Length - 1];
+                        epoints[i][1] = pts2[0];
+                    }
+
+                    for (int i = 0; i < points.Length / 2; i++ )
+                    {
+                        using (GraphicsPath path = new GraphicsPath())
+                        {
+                            path.AddLines(epoints[i]);
+
+                            if ((areaMode & ChartLineAreaDisplayMode.DisplayEmptyLine) == ChartLineAreaDisplayMode.DisplayEmptyLine)
+                                RenderAreaBackground(g, chartXy, epoints[i], path, sstyle.EmptyAreaBackground);
+
+                            using (Pen pen = new Pen(lstyle.LineColor, Dpi.Width(lstyle.LineWidth)))
+                            {
+                                if (lstyle.LinePattern != LinePattern.NotSet)
+                                    pen.DashStyle = (DashStyle)lstyle.LinePattern;
+
+                                g.DrawPath(pen, path);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region RenderAreaBackground
+
+        private void RenderAreaBackground(Graphics g,
+            ChartXy chartXy, Point[] points, GraphicsPath path, Background background)
+        {
+            bool backEmpty = (background == null || background.IsEmpty == true);
+
+            if (backEmpty == true)
+                background = new Background(Color.FromArgb(100, DefaultPaletteColor));
+
+            if (background != null && background.IsEmpty == false)
+            {
+                int y = chartXy.ContentBoundsEx.Bottom;
+
+                if (AreaBaseValue != null)
+                {
+                    ChartAxis axis = _AxisY ?? chartXy.AxisY;
+
+                    y = chartXy.GetDataPointY(axis, AreaBaseValue);
+                }
+
+                using (GraphicsPath path2 = new GraphicsPath())
+                {
+                    path2.AddLine(new Point(points[0].X, y), points[0]);
+                    path2.AddPath(path, true);
+                    path2.AddLine(points[points.Length - 1], new Point(points[points.Length - 1].X, y));
+
+                    path2.CloseFigure();
+
+                    Rectangle r = Rectangle.Round(path2.GetBounds());
+
+                    using (Brush br = background.GetBrush(r))
+                        g.FillPath(br, path2);
+                }
+            }
+
+            if (backEmpty == true)
+                background.Dispose();
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderHighlightPoints
+
+        private void RenderHighlightPoints(Graphics g,
+            ChartXy chartXy, PointData pd, ChartSeriesVisualStyle sstyle)
+        {
+            PointMarkerVisualStyle hstyle = GetHighlightStyle(chartXy, sstyle);
+
+            Image marker = GetHighlightImage(g, chartXy, hstyle);
+
+            if (marker != null)
+            {
+                Size size = marker.Size;
+
+                Point pt = chartXy.GetLocalAdjustedPoint(Point.Empty);
+
+                for (int i=0; i<pd.Points.Count; i++)
+                {
+                    Point[] pts = pd.Points[i];
+                    SeriesPoint[] spts = pd.SeriesPoints[i];
+
+                    for (int j=0; j<pts.Length; j++)
+                    {
+                        Point ppt = pts[j];
+                        Point ppc = new Point(ppt.X, ppt.Y);
+                        Point lppc = new Point(ppt.X + pt.X, ppt.Y + pt.Y);
+
+                        if (chartXy.IsCrosshairSeriesPoint(this, lppc) == true)
+                            RenderPointMarker(g, chartXy, spts[j], ppc, Size.Empty, marker);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region GetLineDisplayMode
+
+        private ChartLineDisplayMode GetLineDisplayMode(ChartXy chartXy)
+        {
+            ChartLineDisplayMode mode = ChartLineDisplayMode;
+
+            if (mode == ChartLineDisplayMode.NotSet)
+                mode = chartXy.ChartLineDisplayMode;
+
+            if (mode == ChartLineDisplayMode.NotSet)
+                mode = ChartLineDisplayMode.DisplayLine;
+
+            return (mode);
+        }
+
+        #endregion
+
+        #region GetAreaDisplayMode
+
+        private ChartLineAreaDisplayMode GetAreaDisplayMode(ChartXy chartXy)
+        {
+            ChartLineAreaDisplayMode mode = ChartLineAreaDisplayMode;
+
+            if (mode == ChartLineAreaDisplayMode.NotSet)
+                mode = chartXy.ChartLineAreaDisplayMode;
+
+            if (mode == ChartLineAreaDisplayMode.NotSet)
+                mode = ChartLineAreaDisplayMode.None;
+
+            return (mode);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderStockPlot
+
+        #region RenderHStockPlot
+
+        private void RenderHStockPlot(ChartRenderInfo renderInfo,
+            ChartXy chartXy, SortedSeriesPoints ssp, ChartSeriesVisualStyle sstyle)
+        {
+            HiLoRenderData rd = new HiLoRenderData(chartXy, AxisX ?? chartXy.AxisX);
+
+            rd.SeriesStyle = sstyle;
+
+            for (int i = 0; i < ssp.Count; i++)
+            {
+                SeriesPoint sp = ssp[i];
+
+                if (sp.Visible == true)
+                {
+                    rd.Sp = sp;
+                    rd.Spt = sp.Point[0];
+                    rd.Index = i;
+
+                    RenderHStock(renderInfo, rd);
+                }
+            }
+        }
+
+        #region RenderHStock
+
+        private void RenderHStock(ChartRenderInfo renderInfo, HiLoRenderData rd)
+        {
+            Graphics g = renderInfo.Graphics;
+            
+            rd.Value = GetHStockValues(rd.ChartXy, rd.Sp);
+
+            if (rd.Value[StockHigh] != int.MinValue)
+            {
+                Point pt = rd.ChartXy.GetDataPointEx(this, rd.Sp, 0);
+
+                Rectangle r = GetHBoundingRect(rd, pt);
+
+                if (r.IntersectsWith(_RenderBounds) == true)
+                {
+                    int y = pt.Y + BarOffset;
+
+                    rd.Sp.PointSize = new Size(5, BarWidth / 3);
+
+                    switch (HiLoBarType)
+                    {
+                        case HiLoBarType.Box:
+                        case HiLoBarType.Candle:
+                            RenderHStockBox(g, rd, y);
+                            break;
+
+                        default:
+                            RenderHStockHiLo(g, rd, y);
+                            break;
+                    }
+                }
+            }
+        }
+
+        #region GetHBoundingRect
+
+        private Rectangle GetHBoundingRect(HiLoRenderData rd, Point pt)
+        {
+            int x1 = rd.Value[StockHigh];
+            int x2 = rd.Value[StockLow];
+
+            if (rd.Value[StockOpen] != int.MinValue)
+            {
+                if (rd.Value[StockOpen] > x1)
+                    x1 = rd.Value[StockOpen];
+
+                if (rd.Value[StockOpen] < x2)
+                    x2 = rd.Value[StockOpen];
+            }
+
+            if (rd.Value[StockClose] != int.MinValue)
+            {
+                if (rd.Value[StockClose] > x1)
+                    x1 = rd.Value[StockClose];
+
+                if (rd.Value[StockClose] < x2)
+                    x2 = rd.Value[StockClose];
+            }
+
+            int y = pt.Y + BarOffset - BarWidth / 2;
+
+            return (new Rectangle(x2, y, x1 - x2, BarWidth));
+        }
+
+        #endregion
+
+        #region RenderHStockBox
+
+        private void RenderHStockBox(Graphics g, HiLoRenderData rd, int y)
+        {
+            int x1 = rd.Value[StockClose];
+            int x2 = rd.Value[StockOpen];
+
+            if (rd.Value[StockOpen] != int.MinValue && rd.Value[StockClose] != int.MinValue)
+            {
+                if (rd.Value[StockOpen] < rd.Value[StockClose])
+                {
+                    x1 = rd.Value[StockOpen];
+                    x2 = rd.Value[StockClose];
+                }
+
+                if (rd.Value[StockLow] > x1)
+                    rd.Value[StockLow] = x1;
+
+                if (rd.Value[StockHigh] < x2)
+                    rd.Value[StockHigh] = x2;
+
+                rd.IsAlternate = (rd.Value[StockOpen] > rd.Value[StockClose]);
+
+                RenderHStockBoxWhisker(g, rd,
+                    rd.Value[StockLow], x1, y, HiLoBarSegment.LowWhisker);
+
+                RenderHStockBoxWhisker(g, rd,
+                    x2, rd.Value[StockHigh], y, HiLoBarSegment.HighWhisker);
+
+                RenderHStockBoxOpenClose(g, rd, x1, x2, y);
+            }
+            else
+            {
+                int x = (x1 != int.MinValue) ? x1 : x2;
+
+                if (x != int.MinValue)
+                {
+                    if (x > rd.Value[StockHigh])
+                        rd.Value[StockHigh] = x;
+
+                    if (x < rd.Value[StockLow])
+                        rd.Value[StockLow] = x;
+                }
+
+                if (x < rd.Value[StockHigh] && x > rd.Value[StockLow])
+                {
+                    RenderHStockBoxWhisker(g, rd, x, rd.Value[StockHigh], y, HiLoBarSegment.HighWhisker);
+                    RenderHStockBoxWhisker(g, rd, rd.Value[StockLow], x, y, HiLoBarSegment.LowWhisker);
+
+                    RenderHStockBoxOpenClose(g, rd, x, x, y);
+                }
+                else
+                {
+                    RenderHStockBoxWhisker(g, rd,
+                        rd.Value[StockLow], rd.Value[StockHigh], y, HiLoBarSegment.CenterLine);
+
+                    if (x != int.MinValue)
+                        RenderHStockBoxOpenClose(g, rd, x, x, y);
+                }
+            }
+        }
+
+        #region RenderHStockBoxWhisker
+
+        private void RenderHStockBoxWhisker(Graphics g,
+            HiLoRenderData rd, int x1, int x2, int y, HiLoBarSegment segment)
+        {
+            if (x2 > x1)
+            {
+                Point pt1 = new Point(x1, y);
+                Point pt2 = new Point(x2 + 1, y);
+
+                RenderBoxWhisker(g, rd, pt1, pt2, segment);
+            }
+        }
+
+        #endregion
+
+        #region RenderHStockBoxOpenClose
+
+        private void RenderHStockBoxOpenClose(
+            Graphics g, HiLoRenderData rd, int x1, int x2, int y)
+        {
+            if (x2 == x1)
+            {
+                x1--;
+                x2++;
+            }
+
+            x2++;
+
+            Point pt1 = new Point(x1, y - BarWidth / 2);
+            Point pt2 = new Point(x2, pt1.Y + BarWidth);
+
+            int lw = RenderStockBox(g, rd, pt1, pt2);
+
+            Rectangle r = new Rectangle(pt1.X, pt1.Y, pt2.X - pt1.X, pt2.Y - pt1.Y);
+
+            if (r.Width > 0 && r.Height > 0)
+            {
+                if (GetBarShading(rd.ChartXy) == true)
+                {
+                    ChartControl chartControl = ChartControl;
+
+                    if (chartControl.DoPreRenderSeriesHiloBarEvent(
+                        g, rd.ChartXy, this, rd, pt1, pt2, HiLoBarSegment.BarShading) == false)
+                    {
+                        RenderHBarShading(g, r, r, BarSegment.Left);
+
+                        chartControl.DoPostRenderSeriesHiLoBarEvent(
+                            g, rd.ChartXy, this, rd, pt1, pt2, HiLoBarSegment.BarShading);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderHStockBoxMedian
+
+        private void RenderHStockBoxMedian(
+            Graphics g, HiLoRenderData rd, int y, int x1, int x2)
+        {
+            if (rd.Value.Length > StockMedian)
+            {
+                int x3 = rd.Value[StockMedian];
+
+                if (x3 > x1 && x3 < x2)
+                {
+                    Point pt1 = new Point(x3, y);
+                    Point pt2 = new Point(x3, y + BarWidth - 1);
+
+                     ChartControl chartControl = ChartControl;
+
+                     if (chartControl.DoPreRenderSeriesHiloBarEvent(
+                         g, rd.ChartXy, this, rd, pt1, pt2, HiLoBarSegment.MedianLine) == false)
+                     {
+                         ChartLineVisualStyle lstyle = GetSegLineStyle(rd, HiLoBarSegment.MedianLine);
+
+                         if (lstyle.LinePattern != LinePattern.None)
+                         {
+                             using (Pen pen = new Pen(lstyle.LineColor, Dpi.Width(lstyle.LineWidth)))
+                             {
+                                 if (lstyle.LinePattern != LinePattern.NotSet)
+                                     pen.DashStyle = (DashStyle)lstyle.LinePattern;
+
+                                 if (lstyle.LineWidth > 1)
+                                     pt2.Y++;
+
+                                 g.DrawLine(pen, pt1, pt2);
+                             }
+                         }
+
+                         chartControl.DoPostRenderSeriesHiLoBarEvent(
+                            g, rd.ChartXy, this, rd, pt1, pt2, HiLoBarSegment.MedianLine);
+                     }
+                }
+            }
+        }
+
+        #endregion
+
+        #region RenderHStockHiLo
+
+        private void RenderHStockHiLo(Graphics g, HiLoRenderData rd, int y)
+        {
+            int x1, x2, x3, x4;
+            NormalizeHiLoValues(rd, out x1, out x2, out x3, out x4);
+
+            ChartLineVisualStyle ostyle, cstyle;
+            NormalizeHiLoStyles(rd, out ostyle, out cstyle);
+
+            if (rd.Value[StockOpen] != int.MinValue)
+            {
+                Point pt1 = new Point(x2, y - BarWidth / 2);
+                Point pt2 = new Point(pt1.X, pt1.Y + BarWidth / 2);
+
+                RenderHiLoWhisker(g, rd, pt1, pt2, ostyle, HiLoBarSegment.OpenWhisker);
+            }
+
+            if (rd.Value[StockClose] != int.MinValue)
+            {
+                Point pt1 = new Point(x3, y);
+                Point pt2 = new Point(pt1.X, pt1.Y + BarWidth / 2 + 1);
+
+                RenderHiLoWhisker(g, rd, pt1, pt2, cstyle, HiLoBarSegment.CloseWhisker);
+            }
+
+            if (rd.IsAlternate == false)
+            {
+                int x = x2;
+                x2 = x3;
+                x3 = x;
+
+                ChartLineVisualStyle style = ostyle;
+                ostyle = cstyle;
+                cstyle = ostyle;
+            }
+
+            if ((rd.IsAlternate == false && _RenderFullDefRange == true) ||
+                (rd.IsAlternate == true && _RenderFullAltRange == true))
+            {
+                RenderHiLoRange(g, rd,
+                    new Point(x1, y), new Point(x4, y), HiLoBarSegment.FullRange);
+            }
+            else
+            {
+                // Open value either not specified or is
+                // set to High value.
+
+                if (x1 == x2 && x3 != x4)
+                    x2 = x3;
+
+                if (x2 < x1)
+                {
+                    int n = (ostyle != null) ? (ostyle.LineWidth + 1) / 2 : 1;
+
+                    RenderHiLoRange(g, rd,
+                        new Point(x1, y), new Point(x2 + n, y), HiLoBarSegment.HighWhisker);
+                }
+
+                if (x3 > x4)
+                {
+                    int n = 1;
+
+                    // Low segment extends to the top.
+
+                    if (x3 == x1)
+                        n = (cstyle.LineWidth + 1) / 2;
+
+                    // We have a Center segment.
+
+                    else if (x3 != x2)
+                        n = -cstyle.LineWidth / 2;
+
+                    RenderHiLoRange(g, rd,
+                        new Point(x3 + n, y), new Point(x4, y), HiLoBarSegment.LowWhisker);
+                }
+
+                if (x2 > x3 || (x1 == x2 && x3 == x4))
+                {
+                    ChartLineVisualStyle y2Style = (x2 == rd.Value[StockOpen]) ? ostyle : cstyle;
+                    ChartLineVisualStyle y3Style = (x3 == rd.Value[StockOpen]) ? ostyle : cstyle;
+
+                    if (y2Style != null)
+                        x2 += ((y2Style.LineWidth + 1) / 2 );
+
+                    if (y3Style != null)
+                        x3 -= (y3Style.LineWidth / 2);
+
+                    RenderHiLoRange(g, rd,
+                        new Point(x2, y), new Point(x3, y), HiLoBarSegment.CenterLine);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region RenderVStockPlot
+
+        private void RenderVStockPlot(ChartRenderInfo renderInfo,
+            ChartXy chartXy, SortedSeriesPoints ssp, ChartSeriesVisualStyle sstyle)
+        {
+            HiLoRenderData rd = new HiLoRenderData(chartXy, AxisY ?? chartXy.AxisY);
+
+            rd.SeriesStyle = sstyle;
+
+            for (int i = 0; i < ssp.Count; i++)
+            {
+                SeriesPoint sp = ssp[i];
+
+                if (sp.Visible == true)
+                {
+                    if (sp.ValueY.Length > 0)
+                    {
+                        rd.Sp = sp;
+                        rd.Spt = sp.Point[0];
+                        rd.Index = i;
+
+                        rd.IsAlternate = false;
+
+                        RenderVStock(renderInfo, rd);
+                    }
+                }
+            }
+        }
+
+        #region RenderVStock
+
+        private void RenderVStock(ChartRenderInfo renderInfo, HiLoRenderData rd)
+        {
+            Graphics g = renderInfo.Graphics;
+
+            rd.Value = GetVStockValues(rd.ChartXy, rd.Sp);
+
+            if (rd.Value[StockHigh] != int.MinValue)
+            {
+                Point pt = rd.ChartXy.GetDataPointEx(this, rd.Sp, 0);
+
+                Rectangle r = GetVBoundingRect(rd, pt);
+
+                if (r.IntersectsWith(_RenderBounds) == true)
+                {
+                    int x = pt.X + BarOffset;
+
+                    rd.Sp.PointSize = new Size(BarWidth/3, 5);
+
+                    switch (HiLoBarType)
+                    {
+                        case HiLoBarType.Box:
+                        case HiLoBarType.Candle:
+                            RenderVStockBox(g, rd, x);
+                            break;
+
+                        default:
+                            RenderVStockHiLo(g, rd, x);
+                            break;
+                    }
+                }
+            }
+        }
+
+        #region GetVBoundingRect
+
+        private Rectangle GetVBoundingRect(HiLoRenderData rd, Point pt)
+        {
+            int y1 = rd.Value[StockHigh];
+            int y2 = rd.Value[StockLow];
+
+            if (rd.Value[StockOpen] != int.MinValue)
+            {
+                if (y1 > rd.Value[StockOpen])
+                    y1 = rd.Value[StockOpen];
+
+                if (y2 < rd.Value[StockOpen])
+                    y2 = rd.Value[StockOpen];
+            }
+
+            if (rd.Value[StockClose] != int.MinValue)
+            {
+                if (y1 > rd.Value[StockClose])
+                    y1 = rd.Value[StockClose];
+
+                if (y2 < rd.Value[StockClose])
+                    y2 = rd.Value[StockClose];
+            }
+
+            int x = pt.X + BarOffset - BarWidth / 2;
+
+            return (new Rectangle(x, y1, BarWidth, y2 - y1));
+        }
+
+        #endregion
+
+        #region RenderVStockBox
+
+        private void RenderVStockBox(Graphics g, HiLoRenderData rd, int x)
+        {
+            int y1 = rd.Value[StockOpen];
+            int y2 = rd.Value[StockClose];
+
+            if (rd.Value[StockOpen] != int.MinValue && rd.Value[StockClose] != int.MinValue)
+            {
+                if (rd.Value[StockOpen] > rd.Value[StockClose])
+                {
+                    y1 = rd.Value[StockClose];
+                    y2 = rd.Value[StockOpen];
+                }
+
+                if (rd.Value[StockHigh] > y1)
+                    rd.Value[StockHigh] = y1;
+
+                if (rd.Value[StockLow] < y2)
+                    rd.Value[StockLow] = y2;
+
+                rd.IsAlternate = (rd.Value[StockOpen] < rd.Value[StockClose]);
+
+                RenderVStockBoxWhisker(g, rd, x,
+                    rd.Value[StockHigh], y1, HiLoBarSegment.HighWhisker);
+
+                RenderVStockBoxWhisker(g, rd, x,
+                    y2, rd.Value[StockLow], HiLoBarSegment.LowWhisker);
+
+                RenderVStockBoxOpenClose(g, rd, x, y1, y2);
+            }
+            else
+            {
+                int y = (y1 != int.MinValue) ? y1 : y2;
+
+                if (y != int.MinValue)
+                {
+                    if (y < rd.Value[StockHigh])
+                        rd.Value[StockHigh] = y;
+
+                    if (y > rd.Value[StockLow])
+                        rd.Value[StockLow] = y;
+                }
+
+                if (y > rd.Value[StockHigh] && y < rd.Value[StockLow])
+                {
+                    RenderVStockBoxWhisker(g, rd, x, rd.Value[StockHigh], y, HiLoBarSegment.HighWhisker);
+                    RenderVStockBoxWhisker(g, rd, x, y, rd.Value[StockLow], HiLoBarSegment.LowWhisker);
+
+                    RenderVStockBoxOpenClose(g, rd, x, y, y);
+                }
+                else
+                {
+                    RenderVStockBoxWhisker(g, rd, x, 
+                        rd.Value[StockHigh], rd.Value[StockLow], HiLoBarSegment.CenterLine);
+
+                    if (y != int.MinValue)
+                        RenderVStockBoxOpenClose(g, rd, x, y, y);
+                }
+            }
+        }
+
+        #region RenderVStockBoxWhisker
+
+        private void RenderVStockBoxWhisker(Graphics g, 
+            HiLoRenderData rd, int x, int y1, int y2, HiLoBarSegment segment)
+        {
+            if (y2 > y1)
+            {
+                Point pt1 = new Point(x, y1);
+                Point pt2 = new Point(x, y2 + 1);
+
+                RenderBoxWhisker(g, rd, pt1, pt2, segment);
+            }
+        }
+
+        #endregion
+
+        #region RenderVStockBoxOpenClose
+
+        private void RenderVStockBoxOpenClose(
+            Graphics g, HiLoRenderData rd, int x, int y1, int y2)
+        {
+            if (y2 == y1)
+            {
+                y1--;
+                y2++;
+            }
+
+            y2++;
+
+            Point pt1 = new Point(x - BarWidth / 2, y1);
+            Point pt2 = new Point(pt1.X + BarWidth, y2);
+
+            int lw = RenderStockBox(g, rd, pt1, pt2);
+
+            Rectangle r = new Rectangle(pt1.X, pt1.Y, pt2.X - pt1.X, pt2.Y - pt1.Y);
+
+            if (r.Width > 0 && r.Height > 0)
+            {
+                if (GetBarShading(rd.ChartXy) == true)
+                {
+                    ChartControl chartControl = ChartControl;
+
+                    if (chartControl.DoPreRenderSeriesHiloBarEvent(
+                        g, rd.ChartXy, this, rd, pt1, pt2, HiLoBarSegment.BarShading) == false)
+                    {
+
+                        RenderVBarShading(g, r, r, BarSegment.Top);
+
+                        chartControl.DoPostRenderSeriesHiLoBarEvent(
+                            g, rd.ChartXy, this, rd, pt1, pt2, HiLoBarSegment.BarShading);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderVStockBoxMedian
+
+        private void RenderVStockBoxMedian(
+            Graphics g, HiLoRenderData rd, int x, int y1, int y2)
+        {
+            if (rd.Value.Length > StockMedian)
+            {
+                int y3 = rd.Value[StockMedian];
+
+                if (y3 > y1 && y3 < y2)
+                {
+                    Point pt1 = new Point(x, y3);
+                    Point pt2 = new Point(x + BarWidth - 1, y3);
+
+                    ChartControl chartControl = ChartControl;
+
+                    if (chartControl.DoPreRenderSeriesHiloBarEvent(
+                        g, rd.ChartXy, this, rd, pt1, pt2, HiLoBarSegment.MedianLine) == false)
+                    {
+                        ChartLineVisualStyle lstyle = GetSegLineStyle(rd, HiLoBarSegment.MedianLine);
+
+                        if (lstyle.LinePattern != LinePattern.None)
+                        {
+                            using (Pen pen = new Pen(lstyle.LineColor, lstyle.LineWidth))
+                            {
+                                if (lstyle.LinePattern != LinePattern.NotSet)
+                                    pen.DashStyle = (DashStyle)lstyle.LinePattern;
+
+                                if (lstyle.LineWidth > 1)
+                                    pt2.X++;
+
+                                g.DrawLine(pen, pt1, pt2);
+                            }
+                        }
+
+                        chartControl.DoPostRenderSeriesHiLoBarEvent(
+                            g, rd.ChartXy, this, rd, pt1, pt2, HiLoBarSegment.MedianLine);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region RenderVStockHiLo
+
+        private void RenderVStockHiLo(Graphics g, HiLoRenderData rd, int x)
+        {
+            int y1, y2, y3, y4;
+            NormalizeHiLoValues(rd, out y1, out y2, out y3, out y4);
+
+            ChartLineVisualStyle ostyle, cstyle;
+            NormalizeHiLoStyles(rd, out ostyle, out cstyle);
+
+            if (rd.Value[StockOpen] != int.MinValue)
+            {
+                Point pt1 = new Point(x - BarWidth / 2, y2);
+                Point pt2 = new Point(pt1.X + BarWidth / 2, pt1.Y);
+
+                RenderHiLoWhisker(g, rd, pt1, pt2, ostyle, HiLoBarSegment.OpenWhisker);
+            }
+
+            if (rd.Value[StockClose] != int.MinValue)
+            {
+                Point pt1 = new Point(x + 1, y3);
+                Point pt2 = new Point(pt1.X + BarWidth / 2, pt1.Y);
+
+                RenderHiLoWhisker(g, rd, pt1, pt2, cstyle, HiLoBarSegment.CloseWhisker);
+            }
+
+            NormalizeHiLoDir(rd, ref y2, ref y3, ref ostyle, ref cstyle);
+
+            if ((rd.IsAlternate == false && _RenderFullDefRange == true) ||
+                (rd.IsAlternate == true && _RenderFullAltRange == true))
+            {
+                RenderHiLoRange(g, rd,
+                    new Point(x, y1), new Point(x, y4), HiLoBarSegment.FullRange);
+            }
+            else
+            {
+                if (y1 == y2 && y3 != y4)
+                    y2 = y3;
+
+                // High segment
+
+                if (y2 > y1)
+                {
+                    int n = (ostyle != null) ? ostyle.LineWidth / 2 : 0;
+
+                    RenderHiLoRange(g, rd,
+                        new Point(x, y1), new Point(x, y2 - n), HiLoBarSegment.HighWhisker);
+                }
+
+                // Low segment
+
+                if (y3 < y4)
+                {
+                    int n = 0;
+
+                    if (y3 == y1)
+                        n = -cstyle.LineWidth / 2;
+
+                    else if (y3 != y2)
+                        n = (cstyle.LineWidth + 1) / 2;
+
+                    RenderHiLoRange(g, rd,
+                        new Point(x, y3 + n), new Point(x, y4), HiLoBarSegment.LowWhisker);
+                }
+
+                // Center segment.
+
+                if (y2 < y3 || (y1 == y2 && y3 == y4))
+                {
+                    ChartLineVisualStyle y2Style = (y2 == rd.Value[StockOpen]) ? ostyle : cstyle;
+                    ChartLineVisualStyle y3Style = (y3 == rd.Value[StockOpen]) ? ostyle : cstyle;
+
+                    if (y2Style != null)
+                        y2 -= (y2Style.LineWidth / 2);
+
+                    if (y3Style != null)
+                        y3 += ((y3Style.LineWidth + 1) / 2);
+
+                    RenderHiLoRange(g, rd,
+                        new Point(x, y2), new Point(x, y3), HiLoBarSegment.CenterLine);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region GetHStockValues
+
+        internal int[] GetHStockValues(ChartXy chartXy, SeriesPoint sp)
+        {
+            ChartAxis axis = AxisX ?? chartXy.AxisX;
+
+            int[] values = new int[Math.Max(4, sp.ValueY.Length)];
+
+            for (int i = 0; i < sp.ValueY.Length; i++)
+                values[i] = chartXy.GetDataPointX(axis, sp.ValueY[i]);
+
+            NormalizeStockValues(sp, values);
+
+            return (values);
+        }
+
+        #endregion
+
+        #region GetVStockValues
+
+        internal int[] GetVStockValues(ChartXy chartXy, SeriesPoint sp)
+        {
+            ChartAxis axis = AxisY ?? chartXy.AxisY;
+
+            int[] values = new int[Math.Max(4, sp.ValueY.Length)];
+
+            for (int i = 0; i < sp.ValueY.Length; i++)
+                values[i] = chartXy.GetDataPointY(axis, sp.ValueY[i]);
+
+            NormalizeStockValues(sp, values);
+
+            return (values);
+        }
+
+        #endregion
+
+        #region NormalizeStockValues
+
+        private void NormalizeStockValues(SeriesPoint sp, int[] values)
+        {
+            for (int i = sp.ValueY.Length; i < values.Length; i++)
+                values[i] = int.MinValue;
+
+            if (values[StockLow] == int.MinValue)
+                values[StockLow] = values[StockHigh];
+
+            if ((IsRotated == true && values[StockLow] > values[StockHigh]) ||
+                (IsRotated == false && values[StockLow] < values[StockHigh]))
+            {
+                int temp = values[StockLow];
+                values[StockLow] = values[StockHigh];
+                values[StockHigh] = temp;
+            }
+        }
+
+        #endregion
+
+        #region NormalizeHiLoValues
+
+        private void NormalizeHiLoValues(
+            HiLoRenderData rd, out int v1, out int v2, out int v3, out int v4)
+        {
+            v1 = rd.Value[StockHigh];
+            v4 = rd.Value[StockLow];
+
+            v2 = (rd.Value[StockOpen] != int.MinValue) ? rd.Value[StockOpen] : v1;
+            v3 = (rd.Value[StockClose] != int.MinValue) ? rd.Value[StockClose] : v4;
+
+            if (v1 > v4)
+            {
+                if (v1 <v2)
+                    v1 = v2;
+
+                if (v4 > v3)
+                    v4 = v3;
+
+                rd.IsAlternate = (v2 > v3);
+            }
+            else
+            {
+                if (v1 > v2)
+                    v1 = v2;
+
+                if (v4 < v3)
+                    v4 = v3;
+
+                rd.IsAlternate = (v2 < v3);
+            }
+        }
+
+        #endregion
+
+        #region NormalizeHiLoDir
+
+        private void NormalizeHiLoDir(HiLoRenderData rd,
+            ref int v1, ref int v2, ref ChartLineVisualStyle style1, ref ChartLineVisualStyle style2)
+        {
+            if (rd.IsAlternate == false)
+            {
+                int y = v1;
+                v1 = v2;
+                v2 = y;
+
+                ChartLineVisualStyle style = style1;
+                style1 = style2;
+                style2 = style1;
+            }
+        }
+
+        #endregion
+
+        #region NormalizeHiLoStyles
+
+        private void NormalizeHiLoStyles(HiLoRenderData rd,
+            out ChartLineVisualStyle ostyle, out ChartLineVisualStyle cstyle)
+        {
+            ostyle = (rd.Value[StockOpen] != int.MinValue) ? GetSegLineStyle(rd, HiLoBarSegment.OpenWhisker) : null;
+            cstyle = (rd.Value[StockClose] != int.MinValue) ? GetSegLineStyle(rd, HiLoBarSegment.CloseWhisker) : null;
+
+            rd.EndDelta = GetHiLoEndDelta(ostyle, cstyle);
+        }
+
+        #region GetHiLoEndDelta
+
+        private int GetHiLoEndDelta(
+            ChartLineVisualStyle ostyle, ChartLineVisualStyle cstyle)
+        {
+            int delta = 0;
+
+            if (ostyle != null)
+            {
+                if (ostyle.LineWidth > 1)
+                {
+                    if (ostyle.LinePattern != LinePattern.None)
+                        delta = (ostyle.LineWidth + 1) / 2;
+                }
+            }
+
+            if (cstyle != null)
+            {
+                if (cstyle.LineWidth > 1)
+                {
+                    if (cstyle.LinePattern != LinePattern.None)
+                        delta = Math.Max(delta, (cstyle.LineWidth + 1) / 2);
+                }
+            }
+
+            return (delta);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderBoxWhisker
+
+        private void RenderBoxWhisker(Graphics g,
+            HiLoRenderData rd, Point pt1, Point pt2, HiLoBarSegment segment)
+        {
+            ChartXy chartXy = rd.ChartXy;
+            ChartControl chartControl = ChartControl;
+
+            SmoothingMode sm = g.SmoothingMode;
+            g.SmoothingMode = SmoothingMode.None;
+
+            if (chartControl.DoPreRenderSeriesHiloBarEvent(g, chartXy, this, rd, pt1, pt2, segment) == false)
+            {
+                ChartLineVisualStyle lstyle = GetSegLineStyle(rd, segment);
+
+                if (lstyle.LinePattern != LinePattern.None)
+                {
+                    using (Pen pen = new Pen(lstyle.LineColor, Dpi.Width(lstyle.LineWidth)))
+                    {
+                        if (lstyle.LinePattern != LinePattern.NotSet)
+                            pen.DashStyle = (DashStyle)lstyle.LinePattern;
+
+                        Point pt3 = pt2;
+
+                        if (lstyle.LineWidth == 1)
+                        {
+                            if (pt1.X == pt2.X)
+                                pt3.Y--;
+                            else
+                                pt3.X--;
+                        }
+
+                        g.DrawLine(pen, pt1, pt3);
+                    }
+                }
+
+                chartControl.DoPostRenderSeriesHiLoBarEvent(g, chartXy, this, rd, pt1, pt2, segment);
+            }
+
+            if (rd.SeriesStyle.HiLoBarVisualStyle.ShowWhiskerCaps == Tbool.True)
+                RenderWhiskerCap(g, rd, pt1, pt2, segment);
+
+            g.SmoothingMode = sm;
+        }
+
+        #region RenderWhiskerCap
+
+        private void RenderWhiskerCap(Graphics g,
+            HiLoRenderData rd, Point pt1, Point pt2, HiLoBarSegment segment)
+        {
+            if (segment == HiLoBarSegment.HighWhisker || segment == HiLoBarSegment.LowWhisker)
+            {
+                HiLoBarSegment capSegment = (segment == HiLoBarSegment.HighWhisker)
+                    ? HiLoBarSegment.HighWhiskerCap : HiLoBarSegment.LowWhiskerCap;
+
+                GetWhiskerCapPoints(segment, ref pt1, ref pt2);
+
+                ChartControl chartControl = ChartControl;
+
+                if (chartControl.DoPreRenderSeriesHiloBarEvent(
+                    g, rd.ChartXy, this, rd, pt1, pt2, capSegment) == false)
+                {
+                    ChartLineVisualStyle lstyle = GetSegLineStyle(rd, capSegment);
+
+                    if (lstyle.LinePattern != LinePattern.None)
+                    {
+                        using (Pen pen = new Pen(lstyle.LineColor, lstyle.LineWidth))
+                        {
+                            if (lstyle.LinePattern != LinePattern.NotSet)
+                                pen.DashStyle = (DashStyle)lstyle.LinePattern;
+
+                            if (lstyle.LineWidth == 1)
+                            {
+                                if (pt1.X == pt2.X)
+                                    pt2.Y--;
+                                else
+                                    pt2.X--;
+                            }
+
+                            g.DrawLine(pen, pt1, pt2);
+                        }
+                    }
+
+                    chartControl.DoPostRenderSeriesHiLoBarEvent(
+                        g, rd.ChartXy, this, rd, pt1, pt2, capSegment);
+                }
+            }
+        }
+
+        #region GetWhiskerCapPoints
+
+        private void GetWhiskerCapPoints(
+            HiLoBarSegment segment, ref Point pt1, ref Point pt2)
+        {
+            int n = BarWidth / 3;
+
+            switch (segment)
+            {
+                case HiLoBarSegment.HighWhisker:
+                    if (pt1.X == pt2.X)
+                    {
+                        pt1.X -= n;
+                        pt2.X += n + 1;
+                        pt2.Y = pt1.Y;
+                    }
+                    else
+                    {
+                        pt1.Y -= n;
+                        pt2.Y += n + 1;
+                        pt1.X = pt2.X;
+                    }
+                    break;
+
+                case HiLoBarSegment.LowWhisker:
+                    if (pt1.X == pt2.X)
+                    {
+                        pt1.X -= n;
+                        pt2.X += n + 1;
+                        pt1.Y = pt2.Y;
+                    }
+                    else
+                    {
+                        pt1.Y -= n;
+                        pt2.Y += n + 1;
+                        pt2.X = pt1.X;
+                    }
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region RenderStockBox
+
+        private int RenderStockBox(
+            Graphics g, HiLoRenderData rd, Point pt1, Point pt2)
+        {
+            int lineWidth = 0;
+
+            Rectangle r = new Rectangle(pt1.X, pt1.Y, pt2.X - pt1.X, pt2.Y - pt1.Y);
+
+            if (r.Width > 0 && r.Height > 0)
+            {
+                ChartXy chartXy = rd.ChartXy;
+                ChartControl chartControl = ChartControl;
+
+                SmoothingMode sm = g.SmoothingMode;
+                g.SmoothingMode = SmoothingMode.None;
+
+                if (chartControl.DoPreRenderSeriesHiloBarEvent(
+                    g, chartXy, this, rd, pt1, pt2, HiLoBarSegment.Box) == false)
+                {
+                    if (HiLoBarType == HiLoBarType.Box)
+                        RenderStockBoxBackground(g, rd, r);
+                    else
+                        RenderStockCandleBackground(g, rd, r);
+
+                    ChartLineVisualStyle lstyle = rd.DefaultStyle.BoxBorder;
+
+                    if (CanUseAlternateSegmentStyle(rd) == true)
+                    {
+                        if (rd.IsAlternate == true && rd.AlternateStyle.BoxBorder.IsEmpty == false)
+                            lstyle = rd.AlternateStyle.BoxBorder;
+                    }
+
+                    if (lstyle.LinePattern != LinePattern.None)
+                    {
+                        using (Pen pen = new Pen(lstyle.LineColor, Dpi.Width(lstyle.LineWidth)))
+                        {
+                            lineWidth = (int)pen.Width;
+
+                            if (lstyle.LinePattern != LinePattern.NotSet)
+                                pen.DashStyle = (DashStyle)lstyle.LinePattern;
+
+                            if (pt1.X == pt2.X || pt1.Y == pt2.Y)
+                            {
+                                g.DrawLine(pen, pt1, pt2);
+                            }
+                            else
+                            {
+                                pen.Alignment = PenAlignment.Inset;
+
+                                if (lstyle.LineWidth == 1)
+                                {
+                                    r.Width--;
+                                    r.Height--;
+                                }
+
+                                if (r.Width > 0 && r.Height > 0)
+                                    g.DrawRectangle(pen, r);
+                            }
+                        }
+                    }
+
+                    chartControl.DoPostRenderSeriesHiLoBarEvent(
+                        g, chartXy, this, rd, pt1, pt2, HiLoBarSegment.Box);
+                }
+
+                if (ShowHiLoBarMedianLines == true)
+                {
+                    if (IsRotated == false)
+                        RenderVStockBoxMedian(g, rd, r.X, r.Y, r.Bottom);
+                    else
+                        RenderHStockBoxMedian(g, rd, r.Y, r.X, r.Right);
+                }
+
+                g.SmoothingMode = sm;
+            }
+
+            return (lineWidth);
+        }
+
+        #region RenderStockCandleBackground
+
+        private void RenderStockCandleBackground(
+            Graphics g, HiLoRenderData rd, Rectangle r)
+        {
+            Background bk =
+                GetBoxBackground(rd, rd.AlternateStyle.BoxBackground, rd.DefaultStyle.BoxBackground);
+
+            if (bk.IsEmpty == false)
+            {
+                using (Brush br = bk.GetBrush(r))
+                    g.FillRectangle(br, r);
+            }
+        }
+
+        #endregion
+
+        #region RenderStockBoxBackground
+
+        private void RenderStockBoxBackground(
+            Graphics g, HiLoRenderData rd, Rectangle r)
+        {
+            Background bkDef = rd.DefaultStyle.BoxBackground;
+            Background bkAlt = rd.AlternateStyle.BoxBackground;
+
+            if (bkAlt.IsEmpty == true)
+                bkAlt = bkDef;
+
+            if (rd.IsAlternate == true)
+            {
+                Background bkSave = bkDef;
+                bkDef = bkAlt;
+                bkAlt = bkSave;
+            }
+
+            if ((ShowHiLoBarMedianLines == true) && (rd.Value.Length > StockMedian))
+            {
+                if (bkAlt.IsEmpty == false)
+                {
+                    if (IsRotated == false)
+                        r = RenderVBox(g, rd.Value[StockMedian], bkAlt, r);
+                    else
+                        r = RenderHBox(g, rd.Value[StockMedian], bkAlt, r);
+                }
+            }
+
+            if (r.Width > 0 && r.Height > 0)
+            {
+                if (bkDef.IsEmpty == false)
+                {
+                    using (Brush br = bkDef.GetBrush(r))
+                        g.FillRectangle(br, r);
+                }
+            }
+        }
+
+        #region RenderVBox
+
+        private Rectangle RenderVBox(Graphics g, int y, Background bk, Rectangle r)
+        {
+            if ((y > r.Y && y < r.Bottom) && bk.IsEmpty == false)
+            {
+                int ry = r.Y;
+
+                r.Height = r.Bottom - y;
+                r.Y = y;
+
+                using (Brush br = bk.GetBrush(r))
+                    g.FillRectangle(br, r);
+
+                r.Y = ry;
+                r.Height = y - ry;
+            }
+
+            return (r);
+        }
+
+        #endregion
+
+        #region RenderHBox
+
+        private Rectangle RenderHBox(Graphics g, int x, Background bk, Rectangle r)
+        {
+            if (x > r.X && x < r.Right)
+            {
+                int rw = r.Width;
+
+                r.Width = x - r.X;
+
+                using (Brush br = bk.GetBrush(r))
+                    g.FillRectangle(br, r);
+
+                r.X = r.Right;
+                r.Width = rw - r.Width;
+            }
+
+            return (r);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region RenderHiLoWhisker
+
+        private ChartLineVisualStyle RenderHiLoWhisker(Graphics g,
+            HiLoRenderData rd, Point pt1, Point pt2, ChartLineVisualStyle style, HiLoBarSegment segment)
+        {
+            ChartXy chartXy = rd.ChartXy;
+            ChartControl chartControl = ChartControl;
+
+            SmoothingMode sm = g.SmoothingMode;
+            g.SmoothingMode = SmoothingMode.None;
+
+            if (chartControl.DoPreRenderSeriesHiloBarEvent(g, chartXy, this, rd, pt1, pt2, segment) == false)
+            {
+                if (style.LinePattern != LinePattern.None)
+                {
+                    using (Pen pen = new Pen(style.LineColor, Dpi.Width(style.LineWidth)))
+                    {
+                        if (style.LinePattern != LinePattern.NotSet)
+                            pen.DashStyle = (DashStyle)style.LinePattern;
+
+                        if (style.LineWidth == 1)
+                        {
+                            if (pt1.X == pt2.X)
+                                pt2.Y--;
+                            else
+                                pt2.X--;
+                        }
+
+                        g.DrawLine(pen, pt1, pt2);
+                    }
+                }
+
+                chartControl.DoPostRenderSeriesHiLoBarEvent(g, chartXy, this, rd, pt1, pt2, segment);
+            }
+
+            g.SmoothingMode = sm;
+
+            return (style);
+        }
+
+        #endregion
+
+        #region RenderHiLoRange
+
+        private void RenderHiLoRange(
+            Graphics g, HiLoRenderData rd, Point pt1, Point pt2, HiLoBarSegment segment)
+        {
+            ChartXy chartXy = rd.ChartXy;
+            ChartControl chartControl = ChartControl;
+
+            if (pt1.X == pt2.X)
+            {
+                if (segment == HiLoBarSegment.HighWhisker || segment == HiLoBarSegment.FullRange)
+                    pt1.Y -= rd.EndDelta;
+
+                if (segment == HiLoBarSegment.LowWhisker || segment == HiLoBarSegment.FullRange)
+                    pt2.Y += rd.EndDelta;
+            }
+            else
+            {
+                if (segment == HiLoBarSegment.LowWhisker || segment == HiLoBarSegment.FullRange)
+                    pt2.X -= rd.EndDelta;
+
+                if (segment == HiLoBarSegment.HighWhisker || segment == HiLoBarSegment.FullRange)
+                    pt1.X += rd.EndDelta;
+            }
+
+            SmoothingMode sm = g.SmoothingMode;
+            g.SmoothingMode = SmoothingMode.None;
+
+            if (chartControl.DoPreRenderSeriesHiloBarEvent(g, chartXy, this, rd, pt1, pt2, segment) == false)
+            {
+                ChartLineVisualStyle lstyle = GetSegLineStyle(rd, segment);
+
+                if (lstyle.LinePattern != LinePattern.None)
+                {
+                    using (Pen pen = new Pen(lstyle.LineColor, Dpi.Width(lstyle.LineWidth)))
+                    {
+                        if (lstyle.LinePattern != LinePattern.NotSet)
+                            pen.DashStyle = (DashStyle)lstyle.LinePattern;
+
+
+                        g.DrawLine(pen, pt1, pt2);
+                    }
+                }
+            }
+
+            if (ShowHiLoBarMedianLines == true)
+            {
+                if (segment == HiLoBarSegment.CenterLine || segment == HiLoBarSegment.FullRange)
+                {
+                    if (IsRotated == false)
+                        RenderVStockBoxMedian(g, rd, pt1.X - BarWidth / 2, pt1.Y, pt2.Y);
+                    else
+                        RenderHStockBoxMedian(g, rd, pt1.Y - BarWidth / 2, pt2.X, pt1.X);
+                }
+            }
+
+            chartControl.DoPostRenderSeriesHiLoBarEvent(g, chartXy, this, rd, pt1, pt2, segment);
+
+            g.SmoothingMode = sm;
+        }
+
+        #endregion
+
+        #region GetSegLineStyle
+
+        private ChartLineVisualStyle GetSegLineStyle(HiLoRenderData rd, HiLoBarSegment segment)
+        {
+            ChartLineVisualStyle style = rd.DefaultStyle.Default;
+
+            if (CanUseAlternateSegmentStyle(rd) == true)
+            {
+                if (rd.IsAlternate == true && rd.AlternateStyle.Default.IsEmpty == false)
+                    style = rd.AlternateStyle.Default;
+            }
+
+            switch (segment)
+            {
+                case HiLoBarSegment.FullRange:
+                    break;
+
+                case HiLoBarSegment.Box:
+                    if (rd.IsAlternate == true && rd.AlternateStyle.BoxBorder.IsEmpty == false)
+                    {
+                        style = rd.AlternateStyle.BoxBorder;
+                    }
+                    else
+                    {
+                        if (rd.DefaultStyle.BoxBorder.IsEmpty == false)
+                            style = rd.DefaultStyle.BoxBorder;
+                    }
+                    break;
+
+                case HiLoBarSegment.MedianLine:
+                    if (rd.IsAlternate == true && rd.AlternateStyle.MedianLine.IsEmpty == false)
+                    {
+                        style = rd.AlternateStyle.MedianLine;
+                    }
+                    else
+                    {
+                        if (rd.DefaultStyle.MedianLine.IsEmpty == false)
+                            style = rd.DefaultStyle.MedianLine;
+                    }
+                    break;
+
+                case HiLoBarSegment.HighWhiskerCap:
+                    if (rd.IsAlternate == true && rd.AlternateStyle.HighWhiskerCap.IsEmpty == false)
+                    {
+                        style = rd.AlternateStyle.HighWhiskerCap;
+                    }
+                    else
+                    {
+                        if (rd.DefaultStyle.HighWhiskerCap.IsEmpty == false)
+                            style = rd.DefaultStyle.HighWhiskerCap;
+                    }
+                    break;
+
+                case HiLoBarSegment.LowWhiskerCap:
+                    if (rd.IsAlternate == true && rd.AlternateStyle.LowWhiskerCap.IsEmpty == false)
+                    {
+                        style = rd.AlternateStyle.LowWhiskerCap;
+                    }
+                    else
+                    {
+                        if (rd.DefaultStyle.LowWhiskerCap.IsEmpty == false)
+                            style = rd.DefaultStyle.LowWhiskerCap;
+                    }
+                    break;
+
+                case HiLoBarSegment.HighWhisker:
+                    if (rd.IsAlternate == true && rd.AlternateStyle.HighWhisker.IsEmpty == false)
+                    {
+                        style = rd.AlternateStyle.HighWhisker;
+                    }
+                    else
+                    {
+                        if (rd.DefaultStyle.HighWhisker.IsEmpty == false)
+                            style = rd.DefaultStyle.HighWhisker;
+                    }
+                    break;
+
+                case HiLoBarSegment.LowWhisker:
+                    if (rd.IsAlternate == true && rd.AlternateStyle.LowWhisker.IsEmpty == false)
+                    {
+                        style = rd.AlternateStyle.LowWhisker;
+                    }
+                    else
+                    {
+                        if (rd.DefaultStyle.LowWhisker.IsEmpty == false)
+                            style = rd.DefaultStyle.LowWhisker;
+                    }
+                    break;
+
+                case HiLoBarSegment.OpenWhisker:
+                    if (rd.IsAlternate == true && rd.AlternateStyle.OpenWhisker.IsEmpty == false)
+                    {
+                        style = rd.AlternateStyle.OpenWhisker;
+                    }
+                    else
+                    {
+                        if (rd.DefaultStyle.OpenWhisker.IsEmpty == false)
+                            style = rd.DefaultStyle.OpenWhisker;
+                    }
+                    break;
+
+                case HiLoBarSegment.CloseWhisker:
+                    if (rd.IsAlternate == true && rd.AlternateStyle.CloseWhisker.IsEmpty == false)
+                    {
+                        style = rd.AlternateStyle.CloseWhisker;
+                    }
+                    else
+                    {
+                        if (rd.DefaultStyle.CloseWhisker.IsEmpty == false)
+                            style = rd.DefaultStyle.CloseWhisker;
+                    }
+                    break;
+
+                case HiLoBarSegment.CenterLine:
+                    if (rd.IsAlternate == true && rd.AlternateStyle.CenterLine.IsEmpty == false)
+                    {
+                        style = rd.AlternateStyle.CenterLine;
+                    }
+                    else
+                    {
+                        if (rd.DefaultStyle.CenterLine.IsEmpty == false)
+                            style = rd.DefaultStyle.CenterLine;
+                    }
+                    break;
+            }
+
+            return (style);
+        }
+
+        #region CanUseAlternateSegmentStyle
+
+        private bool CanUseAlternateSegmentStyle(HiLoRenderData rd)
+        {
+            Tbool uas = rd.SeriesStyle.HiLoBarVisualStyle.UseAlternateSegmentStyle;
+
+            if (uas == Tbool.NotSet)
+                return (HiLoBarType == HiLoBarType.Candle);
+
+            return (uas == Tbool.True);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetBoxBackground
+
+        private Background GetBoxBackground(HiLoRenderData rd, Background abk, Background sbk)
+        {
+            if (rd.IsAlternate == true && abk.IsEmpty == false)
+                return (abk);
+
+            return (sbk);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region HighLightPoints
+
+        private bool HighLightPoints(ChartXy chartXy)
+        {
+            if (chartXy.ChartCrosshair.Visible == false)
+                return (false);
+
+            if (CrosshairHighlightPoints != Tbool.NotSet)
+                return (CrosshairHighlightPoints == Tbool.True);
+
+            return (chartXy.ChartCrosshair.HighlightPoints);
+        }
+
+        #endregion
+
+        #region GetHighlightStyle
+
+        private PointMarkerVisualStyle GetHighlightStyle(
+            ChartXy chartXy, ChartSeriesVisualStyle sstyle)
+        {
+            if (HighLightPoints(chartXy) == true)
+            {
+                PointMarkerVisualStyle pstyle = sstyle.MarkerVisualStyle;
+                PointMarkerVisualStyle hstyle = pstyle.Copy();
+
+                if (sstyle.MarkerHighlightVisualStyle.IsEmpty == false)
+                {
+                    hstyle.ApplyStyle(sstyle.MarkerHighlightVisualStyle);
+                }
+                else
+                {
+                    Size size = hstyle.Size;
+
+                    size.Width += 4;
+                    size.Height += 4;
+
+                    hstyle.Size = size;
+                }
+
+                return (hstyle);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetPointMarkerImage
+
+        private Image GetPointMarkerImage(
+            Graphics g, ChartXy chartXy, PointMarkerVisualStyle style)
+        {
+            Image image = PointMarkerImage;
+
+            if (image == null)
+            {
+                image = chartXy.GetPointMarker(g, style);
+
+                PointMarkerImage = image;
+            }
+
+            return (image);
+        }
+
+        #endregion
+
+        #region GetHighlightImage
+
+        private Image GetHighlightImage(
+            Graphics g, ChartXy chartXy, PointMarkerVisualStyle style)
+        {
+            Image image = PointMarkerHighlightImage;
+
+            if (image == null)
+            {
+                image = chartXy.GetPointMarker(g, style);
+
+                PointMarkerHighlightImage = image;
+            }
+
+            return (image);
+        }
+
+        #endregion
+
+        #region GetEmptyMarkerImage
+
+        private Image GetEmptyMarkerImage(
+            Graphics g, ChartXy chartXy, PointMarkerVisualStyle style)
+        {
+            Image image = PointMarkerEmptyImage;
+
+            if (image == null)
+            {
+                image = chartXy.GetPointMarker(g, style);
+
+                PointMarkerEmptyImage = image;
+            }
+
+            return (image);
+        }
+
+        #endregion
+
+        #region GatherSeriesPoints
+
+        private PointData GatherSeriesPoints(
+            ChartXy chartXy, SortedSeriesPoints ssp, int index, int count, bool allArgs)
+        {
+            if (_PointData == null)
+                _PointData = GatherSeriesPointsEx(chartXy, ssp, index, count, allArgs);
+
+            return (_PointData);
+        }
+
+        private PointData GatherSeriesPointsEx(
+            ChartXy chartXy, SortedSeriesPoints ssp, int index, int count, bool allArgs)
+        {
+            PointData pd = new PointData();
+
+            pd.Points = new List<Point[]>();
+            pd.SeriesPoints = new List<SeriesPoint[]>();
+
+            if (EnableEmptyValues == true)
+            {
+                PointData epd = new PointData();
+
+                epd.Points = new List<Point[]>();
+                epd.SeriesPoints = new List<SeriesPoint[]>();
+
+                int n = 0;
+                bool empty = false;
+
+                for (int i = 0; i < count; i++)
+                {
+                    if (ssp[index + i].IsEmpty != empty)
+                    {
+                        int cnt = i - n;
+
+                        if (cnt > 0)
+                            GetPointList(chartXy, ssp, index + n, cnt, allArgs, empty ? epd : pd);
+
+                        empty = !empty;
+
+                        n = i;
+                    }
+                }
+
+                if (n < count)
+                    GetPointList(chartXy, ssp, index + n, count - n, allArgs, empty ? epd : pd);
+
+                _EmptyPointData = epd;
+            }
+            else
+            {
+                GetPointList(chartXy, ssp, index, count, allArgs, pd);
+            }
+
+            return (pd);
+        }
+
+        #endregion
+
+        #region GetPointList
+
+        private void GetPointList(ChartXy chartXy,
+            SortedSeriesPoints ssp, int index, int cnt, bool allArgs, PointData pd)
+        {
+            GetPointList(chartXy, ssp, index, cnt, 0, 0, allArgs, pd);
+        }
+
+        private void GetPointList(ChartXy chartXy, SortedSeriesPoints ssp,
+            int index, int cnt, int skip, int minDistance, bool allArgs, PointData pd)
+        {
+            if (cnt > 0)
+            {
+                Stack<object> stack = new Stack<object>();
+
+                skip++;
+
+                Point lpt = new Point(-5000, -5000);
+
+                if (allArgs == false)
+                {
+                    if (cnt > skip && skip > 1)
+                        cnt = (cnt + skip - 1) / skip;
+
+                    for (int i = 0; i < cnt; i++)
+                    {
+                        int n = index + (i * skip);
+
+                        if (n >= ssp.Count)
+                            break;
+
+                        SeriesPoint sp = ssp[n];
+
+                        if (sp.Visible == true)
+                        {
+                            Point pt = chartXy.GetDataPointEx(this, sp, 0);
+
+                            if (minDistance <= 0 || DataPointDistanceOk(lpt, pt, minDistance) == true)
+                            {
+                                stack.Push(sp);
+                                stack.Push(pt);
+
+                                lpt = pt;
+                            }
+                        }
+                    }
+                }
+                else
+                {
+                    int n = 0;
+
+                    for (int i = 0; i < cnt; i++)
+                        n += ssp[index + i].ValueY.Length;
+
+                    n /= (n + skip - 1) / skip;
+
+                    int m = 0;
+
+                    for (int i = 0; i < cnt; i++)
+                    {
+                        SeriesPoint sp = ssp[index + i];
+
+                        for (int j = 0; j < sp.ValueY.Length; j++)
+                        {
+                            if (m % skip == 0)
+                            {
+                                int w = m / skip;
+
+                                Point pt = chartXy.GetDataPointNa(this, sp, j);
+
+                                if (minDistance <= 0 || DataPointDistanceOk(lpt, pt, minDistance) == true)
+                                {
+                                    stack.Push(sp);
+                                    stack.Push(pt);
+
+                                    lpt = pt;
+                                }
+                            }
+
+                            m++;
+                        }
+                    }
+                }
+
+                if (stack.Count > 0)
+                {
+                    int n = stack.Count / 2;
+
+                    Point[] points = new Point[n];
+                    SeriesPoint[] seriesPoints = new SeriesPoint[n];
+
+                    for (int i = n - 1; i >= 0; i--)
+                    {
+                        points[i] = (Point)stack.Pop();
+                        seriesPoints[i] = (SeriesPoint)stack.Pop();
+                    }
+
+                    pd.Points.Add(points);
+                    pd.SeriesPoints.Add(seriesPoints);
+                }
+            }
+        }
+
+        #region DataPointDistanceOk
+
+        private bool DataPointDistanceOk(Point lpt, Point pt, int minDistance)
+        {
+            int dx = (lpt.X - pt.X);
+            int dy = (lpt.Y - pt.Y);
+
+            int h = (int)AMath.Sqrt(dx * dx + dy * dy);
+
+            return (h >= minDistance);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region Render
+
+        internal override void Render(ChartRenderInfo renderInfo)
+        {
+            if (Displayed == true)
+            {
+                Rectangle bounds = BoundsRelative;
+
+                if (renderInfo.ClipRectangle.IntersectsWith(bounds))
+                    RenderOverride(renderInfo);
+            }
+        }
+
+        #endregion
+
+        #region RenderIndicators
+
+        internal void RenderIndicators(ChartRenderInfo renderInfo, bool onTop)
+        {
+            if (SeriesType != SeriesType.HorizontalDot || SeriesType != SeriesType.VerticalDot)
+            {
+                if (SeriesPoints.Count > 0)
+                {
+                    Graphics g = renderInfo.Graphics;
+
+                    ChartXy chartXy = Parent as ChartXy;
+                    ChartSeriesVisualStyle sstyle = EffectiveChartSeriesStyle;
+
+                    SortedSeriesPoints ssp = GetSortedSeriesPoints(chartXy);
+
+                    foreach (ChartIndicator indicator in ChartIndicators)
+                    {
+                        if (indicator.DisplayOnTop == onTop)
+                        {
+                            if (indicator.IsDisplayed == true)
+                            {
+                                ssp.SlopeIndex = indicator.ValueYIndex;
+
+                                switch (indicator.IndicatorType)
+                                {
+                                    case ChartIndicatorType.RegressionLine:
+                                        RenderRegressionLine(g, chartXy, ssp, (RegressionLine)indicator);
+                                        break;
+
+                                    case ChartIndicatorType.TrendLine:
+                                        RenderTrendLine(g, chartXy, ssp, (TrendLine)indicator);
+                                        break;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        #region RenderRegressionLine
+
+        private void RenderRegressionLine(Graphics g,
+            ChartXy chartXy, SortedSeriesPoints ssp, RegressionLine regline)
+        {
+            double m = regline.Slope;
+            double b = regline.Intercept;
+
+            if (m.Equals(double.NaN) == false && b.Equals(double.NaN) == false)
+            {
+                ChartAxis axis = AxisX ?? chartXy.AxisX;
+
+                double x1, x2;
+
+                switch (ActualScaleTypeX)
+                {
+                    case ScaleType.DateTime:
+                        x1 = chartXy.GetDateTimePointValue(axis, axis.TickmarkLayout, (DateTime)MinValueX);
+                        x2 = chartXy.GetDateTimePointValue(axis, axis.TickmarkLayout, (DateTime)MaxValueX);
+                        break;
+
+                    default:
+                        x1 = Convert.ToDouble(MinValueX);
+                        x2 = Convert.ToDouble(MaxValueX);
+                        break;
+                }
+
+                Point pt1 = chartXy.GetPointFromValue(this, MinValueX, m * x1 + b);
+                Point pt2 = chartXy.GetPointFromValue(this, MaxValueX, m * x2 + b);
+
+                if (SeriesType == SeriesType.VerticalBar ||
+                    SeriesType == SeriesType.VerticalHiLoBar)
+                {
+                    pt1.X += BarOffset;
+                    pt2.X += BarOffset;
+                }
+                else if (SeriesType == SeriesType.HorizontalBar ||
+                         SeriesType == SeriesType.HorizontalHiLoBar)
+                {
+                    pt1.Y += BarOffset;
+                    pt2.Y += BarOffset;
+                }
+
+                RegressionLineVisualStyle rstyle = regline.RegressionLineVisualStyle;
+
+                Color color = rstyle.LineColor;
+
+                if (color.IsEmpty)
+                    color = DefaultPaletteColor;
+
+                using (Pen pen = new Pen(color, Dpi.Width(rstyle.LineWidth)))
+                {
+                    if (rstyle.LinePattern != LinePattern.NotSet)
+                        pen.DashStyle = (DashStyle)rstyle.LinePattern;
+
+                    if (rstyle.StartCap != ChartLineCap.NotSet)
+                        pen.StartCap = (LineCap)rstyle.StartCap;
+
+                    if (rstyle.EndCap != ChartLineCap.NotSet)
+                        pen.EndCap = (LineCap)rstyle.EndCap;
+
+                    g.DrawLine(pen, pt1, pt2);
+                }
+            }
+        }
+
+        #endregion
+
+        #region RenderTrendLine
+
+        private void RenderTrendLine(Graphics g,
+            ChartXy chartXy, SortedSeriesPoints ssp, TrendLine trendLine)
+        {
+            SeriesPoint sp1 = ssp.GetSeriesPoint(trendLine.ValueX1);
+            SeriesPoint sp2 = ssp.GetSeriesPoint(trendLine.ValueX2);
+
+            if (sp1 != null && sp2 != null)
+            {
+                Point pt1 = chartXy.GetDataPointEx(this, sp1, trendLine.ValueYIndex);
+                Point pt2 = chartXy.GetDataPointEx(this, sp2, trendLine.ValueYIndex);
+
+                if (SeriesType == SeriesType.VerticalBar ||
+                    SeriesType == SeriesType.VerticalHiLoBar)
+                {
+                    pt1.X += BarOffset;
+                    pt2.X += BarOffset;
+                }
+                else if (SeriesType == SeriesType.HorizontalBar ||
+                         SeriesType == SeriesType.HorizontalHiLoBar)
+               {
+                    pt1.Y += BarOffset;
+                    pt2.Y += BarOffset;
+                }
+
+                if (pt1.X >= chartXy.ContentBounds.X && pt2.X < chartXy.ContentBounds.Right)
+                {
+                    TrendLineVisualStyle tstyle = trendLine.TrendLineVisualStyle;
+
+                    Color color = tstyle.LineColor;
+
+                    if (color.IsEmpty)
+                        color = DefaultPaletteColor;
+
+                    using (Pen pen = new Pen(color, Dpi.Width(tstyle.LineWidth)))
+                    {
+                        if (tstyle.LinePattern != LinePattern.NotSet)
+                            pen.DashStyle = (DashStyle)tstyle.LinePattern;
+
+                        if (tstyle.StartCap != ChartLineCap.NotSet)
+                            pen.StartCap = (LineCap)tstyle.StartCap;
+
+                        if (tstyle.EndCap != ChartLineCap.NotSet)
+                            pen.EndCap = (LineCap)tstyle.EndCap;
+
+                        g.DrawLine(pen, pt1, pt2);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InvalidatePoints
+
+        internal void InvalidatePoints()
+        {
+            _PointData = null;
+            _EmptyPointData = null;
+            _ConvexHullPoints = null;
+            _StepPointData = null;
+        }
+
+        #endregion
+
+        #region InvalidatePointLabels
+
+        internal void InvalidatePointLabels()
+        {
+            ChartXy chartXy = Parent as ChartXy;
+
+            if (chartXy != null)
+                chartXy.InvalidatePointLabelsEx();
+        }
+
+        #endregion
+
+        #region RefreshSeries
+
+        ///<summary>
+        /// Causes the series to refresh its display, as the underlying
+        /// series data (potentially) has changed in some way.
+        ///</summary>
+        public void RefreshSeries()
+        {
+            SeriesRangeChanged = true;
+
+            InvalidateLayout();
+        }
+
+        #endregion
+
+        #region UpdateSeriesRange
+
+        internal void UpdateSeriesRange()
+        {
+            if (SeriesRangeChanged == true)
+            {
+                if (Parent == null)
+                    return;
+
+                SeriesRangeChanged = false;
+
+                IsSorted = true;
+
+                QualitativeXValues.Clear();
+                QualitativeYValues.Clear();
+
+                _MinValueX = null;
+                _MinValueY = null;
+                _MaxValueX = null;
+                _MaxValueY = null;
+
+                if (SeriesPoints.Count > 0)
+                {
+                    ChartXy chartXy = Parent as ChartXy;
+
+                    Type dataTypeX = null;
+                    Type dataTypeY = null;
+
+                    if (ChartControl != null && ChartControl.DesignerHosted == true)
+                    {
+                        dataTypeX = GetDataTypeX(SeriesPoints);
+                        dataTypeY = GetDataTypeY(SeriesPoints);
+
+                        ActualScaleTypeX = GetActualScaleType(dataTypeX, ScaleTypeX);
+                        ActualScaleTypeY = GetActualScaleType(dataTypeY, ScaleTypeY);
+
+                        _PlotData = null;
+                    }
+
+                    for (int i = 0; i < SeriesPoints.Count; i++)
+                    {
+                        SeriesPoint sp = SeriesPoints[i];
+
+                        if (sp.Visible == true)
+                        {
+                            UpdateXValueRange(chartXy, sp, ref dataTypeX);
+
+                            switch (SeriesType)
+                            {
+                                case SeriesType.VerticalDot:
+                                case SeriesType.HorizontalDot:
+                                    ActualScaleTypeY = ScaleType.Quantitative;
+                                    break;
+
+                                case SeriesType.Bubble:
+                                    UpdateYBubbleRange(chartXy, sp, ref dataTypeY);
+                                    break;
+
+                                default:
+                                    UpdateYValueRange(chartXy, sp, ref dataTypeY);
+                                    break;
+                            }
+                        }
+                    }
+
+                    if (SeriesType == SeriesType.VerticalDot ||
+                        SeriesType == SeriesType.HorizontalDot)
+                    {
+                        UpdateStackedYValueRange();
+                    }
+                    else
+                    {
+                        if (QualitativeXValues.Count > 0)
+                        {
+                            _MinValueX = 0;
+                            _MaxValueX = QualitativeXValues.Count - 1;
+                        }
+
+                        if (QualitativeYValues.Count > 0)
+                        {
+                            _MinValueY = 0;
+                            _MaxValueY = QualitativeYValues.Count - 1;
+                        }
+                    }
+                }
+            }
+        }
+
+        #region GetDataTypeX
+
+        private Type GetDataTypeX(SeriesPointCollection spc)
+        {
+            Type dataType = null;
+
+            for (int i = 0; i < spc.Count; i++)
+            {
+                SeriesPoint sp = spc[i];
+
+                if (sp.Visible == true)
+                {
+                    if (sp.ValueX != null)
+                    {
+                        dataType = sp.ValueX.GetType();
+
+                        if (dataType != typeof(int))
+                            break;
+                    }
+                }
+            }
+
+            return (dataType);
+        }
+
+        #endregion
+
+        #region GetDataTypeY
+
+        private Type GetDataTypeY(SeriesPointCollection spc)
+        {
+            Type dataType = null;
+
+            for (int i = 0; i < spc.Count; i++)
+            {
+                SeriesPoint sp = spc[i];
+
+                if (sp.Visible == true)
+                {
+                    if (sp.ValueY != null && sp.ValueY.Length > 0)
+                    {
+                        for (int j = 0; j < sp.ValueY.Length; j++)
+                        {
+                            object valueY = sp.ValueY[j];
+
+                            if (valueY != null)
+                            {
+                                dataType = valueY.GetType();
+
+                                if (dataType != typeof(int))
+                                    return (dataType);
+                            }
+                        }
+                    }
+                }
+            }
+
+            return (dataType);
+        }
+
+        #endregion
+
+        #region UpdateXValueRange
+
+        private int _CmpLast;
+
+        private void UpdateXValueRange(ChartXy chartXy, SeriesPoint sp, ref Type dataType)
+        {
+            object value = sp.ValueX;
+
+            if (value != null)
+            {
+                if (dataType == null)
+                {
+                    dataType = value.GetType();
+
+                    ActualScaleTypeX = GetActualScaleType(dataType, ScaleTypeX);
+                }
+                else
+                {
+                    if (value.GetType() != dataType)
+                    {
+                        if (ChartControl.DesignerHosted == true)
+                        {
+                            try
+                            {
+                                sp.ValueX = Convert.ChangeType(value, dataType);
+                            }
+                            catch
+                            {
+                                sp.ValueX = null;
+                            }
+
+                            value = sp.ValueX;
+                        }
+                        else
+                        {
+                            throw new Exception("Cannot mix ValueX data types (" +
+                                dataType + "," + value.GetType() + ").");
+                        }
+                    }
+                }
+
+                switch (_ActualScaleTypeX)
+                {
+                    case ScaleType.Qualitative:
+                        if (QualitativeXValues.Contains(value) == false)
+                            QualitativeXValues.Add(value);
+                        break;
+
+                    default:
+                        if (_MinValueX == null)
+                        {
+                            _MinValueX = value;
+                            _MaxValueX = value;
+
+                            _CmpLast = 0;
+                        }
+                        else
+                        {
+                            if (chartXy.DataCompare(value, _MaxValueX) >= 0)
+                            {
+                                _MaxValueX = value;
+
+                                if (_CmpLast == 0)
+                                    _CmpLast = 1;
+
+                                else if (_CmpLast < 0)
+                                    IsSorted = false;
+                            }
+                            else
+                            {
+                                if (chartXy.DataCompare(value, _MinValueX) <= 0)
+                                    _MinValueX = value;
+
+                                if (_CmpLast == 0)
+                                    _CmpLast = -1;
+
+                                else if (_CmpLast > 0)
+                                    IsSorted = false;
+                            }
+                        }
+                        break;
+                }
+            }
+        }
+
+        #endregion
+
+        #region UpdateYBubbleRange
+
+        private void UpdateYBubbleRange(ChartXy chartXy, SeriesPoint sp, ref Type dataType)
+        {
+            if (sp.ValueY == null || sp.ValueY.Length < 1)
+                throw new Exception("Invalid Bubble Chart 'Y' arguments.");
+
+            if (_PlotData == null)
+                _PlotData = new BubblePlotData();
+
+            BubblePlotData bdata = (BubblePlotData)_PlotData;
+
+            object value = sp.ValueY[0];
+
+            sp.IsEmptyValue = IsEmptyValue(value);
+
+            if (sp.IsEmpty == false)
+            {
+                if (dataType == null)
+                {
+                    bdata.Clear();
+
+                    dataType = value.GetType();
+
+                    ActualScaleTypeY = GetActualScaleType(dataType, ScaleTypeY);
+                }
+                else
+                {
+                    if (value.GetType() != dataType)
+                    {
+                        if (ChartControl.DesignerHosted == true)
+                        {
+                            sp.ValueY[0] = Convert.ChangeType(value, dataType);
+
+                            value = sp.ValueY[0];
+                        }
+                        else
+                        {
+                            throw new Exception("Cannot mix ValueY data types (" +
+                                dataType + "," + value.GetType() + ").");
+                        }
+                    }
+                }
+
+                ProcessYValueRange(chartXy, value);
+
+                if (sp.ValueY.Length > 1)
+                {
+                    double bvalue = GetDoubleValue(sp.ValueY[1]);
+
+                    bvalue = Math.Abs(bvalue);
+
+                    if (bvalue < bdata.MinSize)
+                        bdata.MinSize = bvalue;
+
+                    if (bvalue > bdata.MaxSize)
+                        bdata.MaxSize = bvalue;
+
+                    bdata.TotalSize += bvalue;
+
+                    if (sp.ValueY.Length > 2)
+                    {
+                        double ivalue = GetDoubleValue(sp.ValueY[2]);
+
+                        if (ivalue < bdata.MinIntensity)
+                            bdata.MinIntensity = ivalue;
+
+                        if (ivalue > bdata.MaxIntensity)
+                            bdata.MaxIntensity = ivalue;
+                    }
+                }
+            }
+        }
+        
+        #endregion
+
+        #region UpdateYValueRange
+
+        private void UpdateYValueRange(ChartXy chartXy, SeriesPoint sp, ref Type dataType)
+        {
+            if (sp.ValueY != null)
+            {
+                for (int j = 0; j < sp.ValueY.Length; j++)
+                {
+                    object value = sp.ValueY[j];
+
+                    sp.IsEmptyValue = IsEmptyValue(value);
+
+                    if (sp.IsEmpty == false)
+                    {
+                        if (dataType == null)
+                        {
+                            dataType = value.GetType();
+
+                            ActualScaleTypeY = GetActualScaleType(dataType, ScaleTypeY);
+                        }
+                        else
+                        {
+                            if (value.GetType() != dataType)
+                            {
+                                if (ChartControl.DesignerHosted == true)
+                                {
+                                    try
+                                    {
+                                        sp.ValueY[j] = Convert.ChangeType(value, dataType);
+                                    }
+                                    catch
+                                    {
+                                        sp.ValueY[j] = null;
+                                    }
+
+                                    value = sp.ValueY[j];
+                                }
+                                else
+                                {
+                                    throw new Exception("Cannot mix ValueY data types (" +
+                                        dataType + "," + value.GetType() + ").");
+                                }
+                            }
+                        }
+
+                        ProcessYValueRange(chartXy, value);
+                    }
+                }
+            }
+            else
+            {
+                sp.IsEmptyValue = true;
+            }
+        }
+
+        #region IsEmptyValue
+
+        private bool IsEmptyValue(object value)
+        {
+            if (value == null)
+                return (true);
+
+            if (EmptyValues != null)
+            {
+                Type dataType = value.GetType();
+
+                for (int i = 0; i < EmptyValues.Length; i++)
+                {
+                    if (EmptyValues[i] != null)
+                    {
+                        if (dataType == EmptyValues[i].GetType())
+                        {
+                            if (value.Equals(EmptyValues[i]) == true)
+                                return (true);
+                        }
+                    }
+                }
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region UpdateStackedYValueRange
+
+        private void UpdateStackedYValueRange()
+        {
+            if (QualitativeXValues.Count > 0 || QualitativeYValues.Count > 0)
+                throw new Exception("Dot plots can not contain Qualitative values.");
+
+            Dictionary<object, double> pd = new Dictionary<object, double>();
+
+            for (int i = 0; i < SeriesPoints.Count; i++)
+            {
+                SeriesPoint sp = SeriesPoints[i];
+
+                if (sp.Visible == true)
+                {
+                    object ox = sp.ValueX;
+
+                    double count = 0;
+
+                    if (sp.ValueY != null && sp.ValueY.Length > 0)
+                    {
+                        foreach (object oy in sp.ValueY)
+                        {
+                            sp.IsEmptyValue = IsEmptyValue(oy);
+
+                            if (sp.IsEmpty == false)
+                                count += GetDoubleValue(oy);
+                        }
+                    }
+                    else
+                    {
+                        if (sp.IsEmpty == false)
+                            count++;
+                    }
+
+                    if (sp.IsEmpty == false)
+                    {
+                        if (pd.ContainsKey(ox) == true)
+                            pd[ox] += count;
+                        else
+                            pd.Add(ox, count);
+                    }
+                }
+            }
+
+            double maxValue = 0;
+
+            foreach (KeyValuePair<object, double> kvp in pd)
+            {
+                if (kvp.Value > maxValue)
+                    maxValue = kvp.Value;
+            }
+
+            _MinValueY = 0.0;
+            _MaxValueY = maxValue;
+        }
+
+        #endregion
+
+        #region ProcessYValueRange
+
+        private void ProcessYValueRange(ChartXy chartXy, object value)
+        {
+            switch (_ActualScaleTypeY)
+            {
+                case ScaleType.Qualitative:
+                    if (QualitativeYValues.Contains(value) == false)
+                        QualitativeYValues.Add(value);
+                    break;
+
+                default:
+                    if (_MinValueY == null)
+                    {
+                        _MinValueY = value;
+                        _MaxValueY = value;
+                    }
+                    else
+                    {
+                        int cmpMax = chartXy.DataCompare(value, _MaxValueY);
+
+                        if (cmpMax >= 0)
+                        {
+                            _MaxValueY = value;
+                        }
+                        else
+                        {
+                            int cmpMin = chartXy.DataCompare(value, _MinValueY);
+
+                            if (cmpMin <= 0)
+                                _MinValueY = value;
+                        }
+                    }
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region GetActualScaleType
+
+        private ScaleType GetActualScaleType(Type dataType, ScaleType scaleType)
+        {
+            ScaleType autoType = SeriesPoint.GetScaleType(dataType);
+
+            if (scaleType == ScaleType.NotSet || scaleType == ScaleType.Auto)
+                return (autoType);
+
+            if (scaleType == autoType)
+                return (scaleType);
+
+            if (scaleType == ScaleType.Qualitative)
+                return (scaleType);
+
+            throw new Exception("Set ScaleType is incompatible with series data.");
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ResetSortedPoints
+
+        internal void ResetSortedPoints()
+        {
+            if (IsSorted == false)
+                _SortedSeriesPoints = null;
+        }
+
+        #endregion
+
+        #region GetValueX
+
+        internal object GetValueX(SeriesPoint sp)
+        {
+            if (IsRotated == false)
+                return (sp.ValueX);
+
+            if (sp.ValueY != null && sp.ValueY.Length > 0)
+                return (sp.ValueY[0]);
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetValueY
+
+        internal object GetValueY(SeriesPoint sp, int index)
+        {
+            if (IsRotated == true)
+                return (sp.ValueX);
+
+            if (sp.ValueY != null && sp.ValueY.Length > index)
+                return (sp.ValueY[index]);
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetQualitativeValueX
+
+        internal object GetQualitativeValueX(int index)
+        {
+            if (IsRotated == false)
+            {
+                if (QualitativeXValues != null && QualitativeXValues.Count > index)
+                    return (QualitativeXValues[index]);
+            }
+            else
+            {
+                if (QualitativeYValues != null && QualitativeYValues.Count > index)
+                    return (QualitativeYValues[index]);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetQualitativeValueY
+
+        internal object GetQualitativeValueY(int index)
+        {
+            if (IsRotated == true)
+            {
+                if (QualitativeXValues != null && QualitativeXValues.Count > index)
+                    return (QualitativeXValues[index]);
+            }
+            else
+            {
+                if (QualitativeYValues != null && QualitativeYValues.Count > index)
+                    return (QualitativeYValues[index]);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetDoubleValue
+
+        private double GetDoubleValue(object value)
+        {
+            if (value is double)
+                return (double)value;
+
+            return (Convert.ToDouble(value));
+        }
+
+        #endregion
+
+        #region GetBarWidthRatio
+
+        internal double GetBarWidthRatio(ChartXy chartXy)
+        {
+            return (_BarWidthRatio > 0 ? _BarWidthRatio : 
+                (chartXy.BarWidthRatio > 0 ? chartXy.BarWidthRatio : 1));
+        }
+
+        #endregion
+
+        #region GetPointLabels
+
+        internal List<PointLabel> GetPointLabels(Graphics g)
+        {
+            ChartXy chartXy = Parent as ChartXy;
+
+            PointLabelDisplayMode plmode = GetPointLabelDisplayType(chartXy);
+
+            if (plmode != PointLabelDisplayMode.None)
+            {
+                ChartSeriesVisualStyle sstyle = EffectiveChartSeriesStyle;
+
+                SortedSeriesPoints ssp = GetSortedSeriesPoints(chartXy);
+                ssp.SeriesLayoutCount = chartXy.SeriesLayoutCount;
+
+                ChartAxis axisX = (IsRotated == true) ? AxisY ?? chartXy.AxisY : AxisX ?? chartXy.AxisX;
+                ChartAxis axisY = (IsRotated == true) ? AxisX ?? chartXy.AxisX : AxisY ?? chartXy.AxisY;
+
+                if (ssp.Count > 0)
+                {
+                    DataLabelVisualStyle dstyle = EffectiveDataLabelStyle;
+
+                    PointData pd = GetLabelPoints(chartXy, ssp, 0, ssp.Count, plmode);
+
+                    List<PointLabel> plabels = new List<PointLabel>();
+
+                    if (pd.Points.Count > 0)
+                    {
+                        for (int i = 0; i < pd.Points.Count; i++)
+                        {
+                            Point[] pts = pd.Points[i];
+                            SeriesPoint[] spts = pd.SeriesPoints[i];
+
+                            for (int j = 0; j < pts.Length; j++)
+                            {
+                                SeriesPoint sp = spts[j];
+                                Point pt = pts[j];
+
+                                if (IsBarSeries == true && ShowOriginValueLabels == false)
+                                {
+                                    if (IsBarOrigin(chartXy, sp) == true)
+                                        continue;
+                                }
+
+                                string text = GetPointLabelText(sp, axisX, axisY, dstyle);
+
+                                PointLabel pl = new PointLabel(sp, pt, text);
+
+                                pl.LabelSize = MeasurePointLabel(g, pl);
+
+                                plabels.Add(pl);
+                            }
+                        }
+                    }
+
+                    if ((plmode & PointLabelDisplayMode.DataLabels) == PointLabelDisplayMode.DataLabels)
+                        GetDataLabels(g, plabels, chartXy, axisX, axisY, dstyle);
+
+                    return (plabels);
+                }
+            }
+
+            return (null);
+        }
+
+        #region GetPointLabelDisplayType
+
+        private PointLabelDisplayMode GetPointLabelDisplayType(ChartXy chartXy)
+        {
+            PointLabelDisplayMode ptype = PointLabelDisplayMode;
+
+            if (ptype != PointLabelDisplayMode.NotSet)
+                return (ptype);
+
+            ptype = chartXy.PointLabelDisplayMode;
+
+            return (ptype != PointLabelDisplayMode.NotSet ? ptype : PointLabelDisplayMode.None);
+        }
+
+        #endregion
+
+        #region GetLabelPoints
+
+        /// <summary>
+        /// Gets the collection of series PointData for the given PointLabelDisplayType.
+        /// </summary>
+        /// <param name="plmode"></param>
+        /// <returns></returns>
+        public PointData GetLabelPoints(PointLabelDisplayMode displayType)
+        {
+            ChartXy chartXy = Parent as ChartXy;
+
+            if (chartXy != null)
+            {
+                SortedSeriesPoints ssp = GetSortedSeriesPoints(chartXy);
+
+                return (GetLabelPoints(chartXy, ssp, 0, ssp.Count, displayType));
+            }
+
+            return (null);
+        }
+
+        private PointData GetLabelPoints(ChartXy chartXy,
+            SortedSeriesPoints ssp, int index, int count, PointLabelDisplayMode displayType)
+        {
+            PointData pd = new PointData();
+
+            pd.Points = new List<Point[]>();
+            pd.SeriesPoints = new List<SeriesPoint[]>();
+
+            if ((displayType & PointLabelDisplayMode.AllSeriesPoints) == PointLabelDisplayMode.AllSeriesPoints)
+                GetPointList(chartXy, ssp, index, count, _PointLabelSkip, _PointLabelMinDistance, false, pd);
+
+            else if ((displayType & ~PointLabelDisplayMode.AllSeriesPoints) != 0)
+            {
+                List<SeriesPoint> lmmsp = new List<SeriesPoint>();
+
+                if ((displayType & PointLabelDisplayMode.MinValueX) == PointLabelDisplayMode.MinValueX)
+                {
+                    int n;
+                    
+                    if (IsRotated == true)
+                    {
+                        if (QualitativeYValues.Count > 0)
+                            n = (int)MinValueX;
+                        else
+                            n = ssp.SearchY(MinValueX);
+                    }
+                    else
+                    {
+                        if (QualitativeXValues.Count > 0)
+                            n = (int)MinValueX;
+                        else
+                            n = (ssp.IsSorted == true) ? 0 : ssp.SearchX(MinValueX);
+                    }
+
+                    if (n >= 0)
+                        lmmsp.Add(ssp[n]);
+                }
+
+                if ((displayType & PointLabelDisplayMode.MaxValueX) == PointLabelDisplayMode.MaxValueX)
+                {
+                    int n;
+
+                    if (IsRotated == true)
+                    {
+                        if (QualitativeYValues.Count > 0)
+                            n = (int)MaxValueX;
+                        else
+                            n = ssp.SearchY(MaxValueX);
+                    }
+                    else
+                    {
+                        if (QualitativeXValues.Count > 0)
+                            n = (int)MaxValueX;
+                        else
+                            n = (ssp.IsSorted == true) ? ssp.Count - 1 : ssp.SearchX(MaxValueX);
+                    }
+
+                    if (n >= 0 && lmmsp.Contains(ssp[n]) == false)
+                        lmmsp.Add(ssp[n]);
+                }
+
+                if ((displayType & PointLabelDisplayMode.MinValueY) == PointLabelDisplayMode.MinValueY)
+                {
+                    int n;
+
+                    if (IsRotated == true)
+                    {
+                        if (QualitativeXValues.Count > 0)
+                            n = (int)MinValueY;
+                        else
+                            n = (ssp.IsSorted == true) ? 0 : ssp.SearchX(MinValueY);
+                    }
+                    else
+                    {
+                        if (QualitativeYValues.Count > 0)
+                            n = (int)MinValueY;
+                        else
+                            n = ssp.SearchY(MinValueY);
+                    }
+
+                    if (n >= 0 && lmmsp.Contains(ssp[n]) == false)
+                        lmmsp.Add(ssp[n]);
+                }
+
+                if ((displayType & PointLabelDisplayMode.MaxValueY) == PointLabelDisplayMode.MaxValueY)
+                {
+                    int n;
+
+                    if (IsRotated == true)
+                    {
+                        if (QualitativeXValues.Count > 0)
+                            n = (int)MaxValueY;
+                        else
+                            n = ssp.SearchX(MaxValueY);
+                    }
+                    else
+                    {
+                        if (QualitativeYValues.Count > 0)
+                            n = (int)MaxValueY;
+                        else
+                            n = ssp.SearchY(MaxValueY);
+                    }
+
+                    if (n >= 0 && lmmsp.Contains(ssp[n]) == false)
+                        lmmsp.Add(ssp[n]);
+                }
+
+                if (lmmsp.Count > 0)
+                {
+                    SeriesPoint[] mmsp = new SeriesPoint[lmmsp.Count];
+                    Point[] mmpt = new Point[lmmsp.Count];
+
+                    for (int i = 0; i < lmmsp.Count; i++)
+                    {
+                        mmsp[i] = lmmsp[i];
+                        mmpt[i] = chartXy.GetDataPointNa(this, lmmsp[i], 0);
+                    }
+
+                    pd.SeriesPoints.Add(mmsp);
+                    pd.Points.Add(mmpt);
+                }
+            }
+
+            return (pd);
+        }
+
+        #endregion
+
+        #region GetDataLabels
+
+        private void GetDataLabels(Graphics g, List<PointLabel> plabels, 
+            ChartXy chartXy, ChartAxis axisX, ChartAxis axisY, DataLabelVisualStyle dstyle)
+        {
+            foreach (DataLabel dlabel in DataLabels)
+            {
+                DataLabelVisualStyle xstyle = dlabel.EffectiveDataLabelStyle;
+
+                PointLabel pl = FindPointLabel(plabels, dlabel);
+
+                if (pl != null)
+                {
+                    if (string.IsNullOrEmpty(dlabel.Text) == false)
+                        pl.Label = dlabel.Text;
+
+                    pl.DataLabelVisualStyle = xstyle;
+                    pl.BarLabelPosition = dlabel.BarLabelPosition;
+
+                    pl.LabelSize = MeasurePointLabel(g, pl);
+                }
+                else
+                {
+                    SeriesPoint sp = new SeriesPoint(dlabel.ValueX, dlabel.ValueY);
+
+                    string label = (string.IsNullOrEmpty(dlabel.Text) == false) ? dlabel.Text :
+                            GetPointLabelText(sp, axisX, axisY, xstyle);
+
+                    Point pt = chartXy.GetDataPointNa(this, sp, 0);
+
+                    pl = new PointLabel(sp, pt, label);
+
+                    pl.IsDataLabel = true;
+
+                    pl.DataLabelVisualStyle = xstyle;
+                    pl.BarLabelPosition = dlabel.BarLabelPosition;
+
+                    pl.LabelSize = MeasurePointLabel(g, pl);
+
+                    plabels.Add(pl);
+                }
+            }
+        }
+
+        #region FindPointLabel
+
+        private PointLabel FindPointLabel(List<PointLabel> plabels, DataLabel dlabel)
+        {
+            for (int i = 0; i < plabels.Count; i++)
+            {
+                SeriesPoint sp = plabels[i].SeriesPoint;
+
+                if ((sp.ValueX != null) &&
+                    (sp.ValueY != null && sp.ValueY.Length > 0) &&
+                    (sp.ValueX.Equals(dlabel.ValueX) && sp.ValueY[0].Equals(dlabel.ValueY)))
+                {
+                    return (plabels[i]);
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IsBarOrigin
+
+        internal bool IsBarOrigin(ChartXy chartXy, SeriesPoint sp)
+        {
+            object value = ((sp.ValueY != null  && sp.ValueY.Length > 1) ? sp.ValueY[1] : (chartXy.BarOrigin ?? 0));
+
+            ChartAxis axis = AxisY ?? chartXy.AxisY;
+
+            switch (axis.ScaleType)
+            {
+                case ScaleType.Quantitative:
+                    double d1 = Convert.ToDouble(value);
+                    double d2 = Convert.ToDouble(sp.ValueY[0]);
+
+                    return (d1.Equals(d2));
+
+                case ScaleType.Qualitative:
+                    string s1 = axis.QualitativeValues[0] as string;
+                    string s2 = sp.ValueY[0] as string;
+
+                    if (s1 != null)
+                        return (s1.Equals(s2));
+                    break;
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region GetPointLabelText
+
+        private string GetPointLabelText(SeriesPoint sp,
+            ChartAxis axisX, ChartAxis axisY, DataLabelVisualStyle dstyle)
+        {
+            string pattern = dstyle.TextFormat;
+
+            if (string.IsNullOrEmpty(pattern) == true)
+                return (GetDefaultPointLabelText(sp, axisX, axisY, dstyle));
+
+            pattern = pattern.Replace("\\n", "\n");
+            pattern = pattern.Replace("\\r", "\r");
+
+            Regex regex = new Regex("{([^}]*)}");
+            MatchCollection mc = regex.Matches(pattern);
+
+            StringBuilder sb = new StringBuilder();
+
+            int index = 0;
+
+            foreach (Match ma in mc)
+            {
+                if (ma.Index > index)
+                    sb.Append(pattern.Substring(index, ma.Index - index));
+
+                sb.Append(ProcessFormatSpecifier(sp, axisX, axisY, ma.Value));
+
+                index = ma.Index + ma.Length;
+            }
+
+            if (index < pattern.Length)
+                sb.Append(pattern.Substring(index));
+
+            return (sb.ToString());
+        }
+
+        #region ProcessFormatSpecifier
+
+        private string ProcessFormatSpecifier(
+            SeriesPoint sp, ChartAxis axisX, ChartAxis axisY, string pattern)
+        {
+            string s = pattern.Substring(1, pattern.Length - 2);
+
+            int n = s.IndexOf(':');
+
+            if ((uint)n > s.Length - 1)
+                n = s.Length;
+
+            string placeHolder = s.Substring(0, n).Trim().ToUpper();
+            string formatSpecifier = (n + 1 < s.Length) ? s.Substring(n + 1) : "";
+
+            try
+            {
+                switch (placeHolder)
+                {
+                    case "X":
+                        return (GetPointLabelText(sp.ValueX, axisX, formatSpecifier));
+
+                    case "Y":
+                    case "Y0":
+                        if (sp.ValueY != null && sp.ValueY.Length > 0)
+                            return (GetPointLabelText(sp.ValueY[0], axisY, formatSpecifier));
+
+                        return ("");
+
+                    case "S":
+                        if (string.IsNullOrEmpty(formatSpecifier) == false)
+                            return (String.Format(formatSpecifier, Name));
+
+                        return (Name);
+
+                    default:
+                        if (placeHolder.StartsWith("Y") == true)
+                        {
+                            int index = int.Parse(placeHolder.Substring(1));
+
+                            if (sp.ValueY != null && sp.ValueY.Length > index)
+                                return (GetPointLabelText(sp.ValueY[index], axisY, formatSpecifier));
+                        }
+
+                        return (s);
+                }
+            }
+            catch
+            {
+            }
+
+            return (s);
+        }
+
+        #endregion
+
+        #region GetDefaultPointLabelText
+
+        private string GetDefaultPointLabelText(SeriesPoint sp,
+            ChartAxis axisX, ChartAxis axisY, DataLabelVisualStyle dstyle)
+        {
+            String text = string.Empty;
+
+            if (IsBarSeries == true)
+            {
+                text = GetPointLabelText(sp.ValueY[0], axisY, string.Empty);
+            }
+            else
+            {
+                text = GetPointLabelText(sp.ValueX, axisX, string.Empty);
+
+                if (sp.ValueY != null)
+                    text += " : " + GetPointLabelText(sp.ValueY[0], axisY, string.Empty);
+            }
+
+            return (text);
+        }
+
+        #endregion
+
+        #region GetPointLabelText
+
+        private string GetPointLabelText(
+            object value, ChartAxis axis, string format)
+        {
+            switch (axis.ScaleType)
+            {
+                case ScaleType.DateTime:
+                    if (string.IsNullOrEmpty(format) == false)
+                    {
+                        if (value is DateTime)
+                        {
+                            DateTime date = (DateTime)value;
+
+                            return (date.ToString(format));
+                        }
+                    }
+
+                    return (GetDateTimeLabelText(axis, (DateTime)value));
+
+                case ScaleType.Qualitative:
+                    if (string.IsNullOrEmpty(format) == false)
+                        return (string.Format(format, value));
+
+                    return (value.ToString());
+
+                default:
+                    double d = Convert.ToDouble(value);
+
+                    if (string.IsNullOrEmpty(format) == false)
+                        return (d.ToString(format));
+
+                    return (d.ToString("F3"));
+            }
+        }
+
+        #region GetDateTimeLabelText
+
+        internal string GetDateTimeLabelText(ChartAxis axis, DateTime dt)
+        {
+            switch (axis.ActualDateTimeUnits)
+            {
+                case DateTimeUnits.Ticks:
+                    return (dt.Ticks.ToString());
+
+                case DateTimeUnits.Milliseconds:
+                    return (dt.Millisecond.ToString());
+
+                case DateTimeUnits.Seconds:
+                    return (dt.Second.ToString());
+
+                case DateTimeUnits.Minutes:
+                    return (dt.Minute.ToString());
+
+                case DateTimeUnits.Hours:
+                    return (dt.ToShortTimeString());
+
+                case DateTimeUnits.Days:
+                    return (dt.ToShortDateString());
+
+                case DateTimeUnits.Months:
+                    return (dt.Year + " " + dt.Month);
+
+                default:
+                    return (dt.Year.ToString());
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region MeasurePointLabel
+
+        internal Size MeasurePointLabel(Graphics g, PointLabel pl)
+        {
+            DataLabelVisualStyle dstyle = GetPointLabelVisualStyle(pl);
+
+            int width = (dstyle.MaxTextWidth > 0) ? dstyle.MaxTextWidth : 0;
+
+            using (StringFormat sf = new StringFormat())
+            {
+                if (dstyle.MaxTextLineCount <= 1)
+                    sf.FormatFlags |= StringFormatFlags.NoWrap;
+
+                Size size = g.MeasureString(pl.Label, dstyle.Font, width, sf).ToSize();
+                size.Width++;
+
+                if (dstyle.MaxTextLineCount > 1)
+                {
+                    int lineHeight = (int)(Math.Ceiling(dstyle.Font.GetHeight())) * dstyle.MaxTextLineCount;
+
+                    if (size.Height > lineHeight)
+                        size.Height = lineHeight;
+                }
+
+                return (size);
+            }
+        }
+
+        #region GetPointLabelVisualStyle
+
+        internal DataLabelVisualStyle GetPointLabelVisualStyle(PointLabel pl)
+        {
+            DataLabelVisualStyle dstyle = EffectiveDataLabelStyle.Copy();
+
+            if (pl.DataLabelVisualStyle != null)
+                dstyle.ApplyStyle(pl.DataLabelVisualStyle);
+            else
+                dstyle = EffectiveDataLabelStyle;
+
+            return (dstyle);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region GetRotateDegrees
+
+        internal RotateDegrees GetRotateDegrees(DataLabelVisualStyle dstyle)
+        {
+            RotateDegrees degrees = dstyle.RotateDegrees;
+
+            if (degrees == RotateDegrees.Auto || degrees == RotateDegrees.NotSet)
+            {
+                switch (SeriesType)
+                {
+                    case SeriesType.HorizontalBar:
+                    case SeriesType.HorizontalHiLoBar:
+                        return (RotateDegrees.None);
+
+                    case SeriesType.VerticalBar:
+                    case SeriesType.VerticalHiLoBar:
+                        return (RotateDegrees.Rotate270);
+
+                    default:
+                        return (RotateDegrees.None);
+                }
+            }
+
+            return (dstyle.RotateDegrees);
+        }
+
+        #endregion
+
+        #region IsConvexHullPoint
+
+        /// <summary>
+        /// Determines whether the given SeriesPoint is a ConvexHull point.
+        /// </summary>
+        /// <param name="sp"></param>
+        /// <returns></returns>
+        public bool IsConvexHullPoint(SeriesPoint sp)
+        {
+            if (sp != null && _ConvexHullPoints != null)
+            {
+                ChartXy chartXy = Parent as ChartXy;
+
+                if (chartXy != null)
+                {
+                    ConvexHullDisplayMode mode = GetConvexHullDisplayMode(chartXy);
+
+                    if (mode != ConvexHullDisplayMode.None)
+                    {
+                        foreach (Point ptc in _ConvexHullPoints)
+                        {
+                            if (ptc.Equals(sp.Point[0]) == true)
+                                return (true);
+                        }
+                    }
+                }
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region IsHighLightPoint
+
+        /// <summary>
+        /// Determines if the given SeriesPoint is a HighLight Point (a
+        /// point highlighted by the Crosshair setup).
+        /// </summary>
+        /// <param name="sp"></param>
+        /// <returns></returns>
+        public bool IsHighLightPoint(SeriesPoint sp)
+        {
+            if (sp != null)
+            {
+                ChartXy chartXy = Parent as ChartXy;
+
+                if (chartXy != null)
+                    return (chartXy.IsCrosshairSeriesPoint(this, sp.Point[0]));
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region Style handling
+
+        #region ApplyStyles
+
+        internal override void ApplyStyles(BaseVisualStyle style)
+        {
+            ChartSeriesVisualStyle sstyle = style as ChartSeriesVisualStyle;
+
+            if (sstyle != null)
+            {
+                ApplyParentStyles(sstyle, Parent as ChartContainer);
+
+                sstyle.ApplyStyle(ChartSeriesVisualStyle);
+
+                ApplyDefaultLineStyles(sstyle.LineStyle);
+                ApplyDefaultLineStyles(sstyle.SplineStyle);
+                ApplyDefaultLineStyles(sstyle.StepLineStyle);
+                ApplyDefaultLineStyles(sstyle.EmptyStyle);
+
+                ApplyDefaultMarkerStyles(sstyle.MarkerVisualStyle);
+                ApplyDefaultMarkerStyles(sstyle.MarkerEmptyVisualStyle);
+
+                if (sstyle.EmptyAreaBackground.IsEmpty)
+                    sstyle.EmptyAreaBackground = new Background(Color.FromArgb(100, Color.LightGray));
+
+                if (SeriesType == SeriesType.Bubble)
+                {
+                    if (sstyle.MarkerVisualStyle.Background.IsEmpty)
+                        sstyle.MarkerVisualStyle.Background = new Background(DefaultPaletteColor);
+                }
+
+                ApplyDefaultBarStyles(sstyle.BarVisualStyle);
+                ApplyDefaultOhlcBarStyles(sstyle.HiLoBarVisualStyle);
+            }
+            else if (style is DataLabelVisualStyle)
+            {
+                DataLabelVisualStyle dstyle = (DataLabelVisualStyle)style;
+
+                ApplyParentStyles(dstyle, Parent as ChartContainer);
+
+                dstyle.ApplyStyle(_DataLabelVisualStyle);
+
+                dstyle.ApplyDefaults();
+            }
+        }
+
+        #region ApplyParentStyles (ChartSeriesVisualStyle)
+
+        private void ApplyParentStyles(
+            ChartSeriesVisualStyle pstyle, ChartContainer item)
+        {
+            if (item != null)
+            {
+                ApplyParentStyles(pstyle, item.Parent as ChartContainer);
+
+                if (item is BaseChart)
+                    pstyle.ApplyStyle(((BaseChart)item).ChartSeriesVisualStyle);
+
+                if (item is ChartPanel)
+                    pstyle.ApplyStyle(((ChartPanel)item).DefaultVisualStyles.ChartSeriesVisualStyle);
+            }
+            else
+            {
+                pstyle.ApplyStyle(ChartControl.BaseVisualStyles.ChartPanelVisualStyle);
+                pstyle.ApplyStyle(ChartControl.DefaultVisualStyles.ChartPanelVisualStyle);
+            }
+        }
+
+        #endregion
+
+        #region ApplyParentStyles (DataLabelVisualStyle)
+
+        private void ApplyParentStyles(
+            DataLabelVisualStyle dstyle, ChartContainer item)
+        {
+            if (item != null)
+            {
+                ApplyParentStyles(dstyle, item.Parent as ChartContainer);
+
+                if (item is BaseChart)
+                    dstyle.ApplyStyle(((BaseChart)item).DataLabelVisualStyle);
+
+                if (item is ChartPanel)
+                    dstyle.ApplyStyle(((ChartPanel)item).DefaultVisualStyles.DataLabelVisualStyle);
+            }
+            else
+            {
+                dstyle.ApplyStyle(ChartControl.BaseVisualStyles.DataLabelVisualStyle);
+                dstyle.ApplyStyle(ChartControl.DefaultVisualStyles.DataLabelVisualStyle);
+            }
+        }
+
+        #endregion
+
+        #region ApplyDefaultLineStyles
+
+        private void ApplyDefaultLineStyles(ChartLineVisualStyle lstyle)
+        {
+            if (lstyle.LineColor.IsEmpty == true)
+                lstyle.LineColor = DefaultPaletteColor;
+
+            lstyle.ApplyDefaults();
+        }
+
+        #endregion
+
+        #region ApplyDefaultMarkerStyles
+
+        private void ApplyDefaultMarkerStyles(PointMarkerVisualStyle pstyle)
+        {
+            if (pstyle.Background.IsEmpty && pstyle.BorderColor.IsEmpty)
+                pstyle.BorderColor = DefaultPaletteColor;
+
+            pstyle.ApplyDefaults();
+        }
+
+        #endregion
+
+        #region ApplyDefaultBarStyles
+
+        private void ApplyDefaultBarStyles(ChartBarVisualStyle bstyle)
+        {
+            if (bstyle.Background.IsEmpty == true)
+                bstyle.Background = new Background(DefaultPaletteColor);
+
+            ApplyDefaultLineStyles(bstyle.Border);
+        }
+
+        #endregion
+
+        #region ApplyDefaultOhlcBarStyles
+
+        private void ApplyDefaultOhlcBarStyles(ChartHiLoBarVisualStyle bstyle)
+        {
+            HiLoBarSegmentStyle sstyle = bstyle.DefaultSegmentStyle;
+
+            if (sstyle.Default.LineColor.IsEmpty == true)
+                sstyle.Default.LineColor = Color.Black;
+
+            sstyle.Default.ApplyDefaults();
+
+            switch (HiLoBarType)
+            {
+                case HiLoBarType.Candle:
+                    bool backSet = (sstyle.BoxBackground.IsEmpty == true);
+
+                    if (backSet == true)
+                        sstyle.BoxBackground = new Background(DefaultPaletteColor);
+
+                    Background bk = sstyle.BoxBackground;
+
+                    sstyle = bstyle.AlternateSegmentStyle;
+
+                    if (sstyle.BoxBackground.IsEmpty == true)
+                    {
+                        if (backSet == true)
+                        {
+                            sstyle.BoxBackground = new Background(Color.Black, DefaultPaletteColor);
+                            sstyle.BoxBackground.HatchFillType = HatchFillType.ForwardDiagonal;
+                        }
+                        else
+                        {
+                            if (bk.IsSolidBrush == true)
+                            {
+                                sstyle.BoxBackground = new Background(Color.Black, bk.Color1);
+                                sstyle.BoxBackground.HatchFillType = HatchFillType.ForwardDiagonal;
+                            }
+                            else if (bk.Color1.IsEmpty == false && bk.Color2.IsEmpty == false)
+                            {
+                                sstyle.BoxBackground = new Background(bk.Color2, bk.Color1);
+                            }
+                        }
+                    }
+                    break;
+
+                case Charts.HiLoBarType.Box:
+                    if (sstyle.BoxBackground.IsEmpty == true)
+                        sstyle.BoxBackground = new Background(DefaultPaletteColor);
+                    break;
+            }
+
+            sstyle = bstyle.DefaultSegmentStyle;
+
+            _RenderFullDefRange = sstyle.CenterLine.IsEmpty &&
+                sstyle.HighWhisker.IsEmpty && sstyle.LowWhisker.IsEmpty;
+
+            sstyle = bstyle.AlternateSegmentStyle;
+
+            _RenderFullAltRange = sstyle.CenterLine.IsEmpty &&
+                sstyle.HighWhisker.IsEmpty && sstyle.LowWhisker.IsEmpty;
+        }
+
+        private bool _RenderFullDefRange;
+        private bool _RenderFullAltRange;
+
+        #endregion
+
+        #endregion
+
+        #region InvalidateStyle
+
+        ///<summary>
+        ///Invalidate the cached Style definition
+        ///</summary>
+        public void InvalidateStyle()
+        {
+            if (_EffectiveChartSeriesStyle.InvalidateStyle() == true)
+                InvalidateLayout();
+
+            _EffectiveDataLabelStyle.InvalidateStyle();
+
+            foreach (DataLabel dl in DataLabels)
+                dl.InvalidateStyle();
+
+            PointMarkerImage = null;
+            PointMarkerEmptyImage = null;
+            PointMarkerHighlightImage = null;
+        }
+
+        #endregion
+
+        #region ClearEffectiveStyles
+
+        protected override void ClearEffectiveStyles()
+        {
+            _EffectiveChartSeriesStyle.InvalidateStyle();
+            _EffectiveDataLabelStyle.InvalidateStyle();
+
+            if (LegendItem != null)
+                LegendItem.EffectiveStyles.InvalidateStyles();
+
+            PointMarkerImage = null;
+            PointMarkerEmptyImage = null;
+            PointMarkerHighlightImage = null;
+        }
+
+        #endregion
+
+        #region StyleChanged
+
+        protected override void StyleChanged(object sender, PropertyChangedEventArgs e)
+        {
+            base.StyleChanged(sender, e);
+
+            if (sender is ChartLegendItemVisualStyles && LegendItem != null)
+                InvalidateRender(LegendItem.Bounds);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InvalidateRender
+
+        public override void InvalidateRender()
+        {
+            ChartXy chartXy = Parent as ChartXy;
+
+            if (chartXy != null)
+                chartXy.InvalidateRender();
+        }
+
+        #endregion
+
+        #region ILegendItem
+
+        #region CheckedInLegend
+
+        /// <summary>
+        /// Gets or sets whether the series is checked in the Legend.
+        /// </summary>
+        [DefaultValue(true), Category("Legend")]
+        [Description("Indicates whether the series is checked in the Legend.")]
+        public bool CheckedInLegend
+        {
+            get { return (TestState(States.CheckedInLegend)); }
+
+            set
+            {
+                if (value != CheckedInLegend)
+                {
+                    SetState(States.CheckedInLegend, value);
+
+                    if (IsQualitativeXValues || IsQualitativeYValues)
+                        InvalidateLayout();
+
+                    if (PointLabelDisplayMode != PointLabelDisplayMode.None)
+                        InvalidatePointLabels();
+
+                    if (LegendItem != null)
+                        LegendItem.UpdateCheckState();
+
+                    OnPropertyChangedEx("CheckedInLegend", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowCheckBoxInLegend
+
+        /// <summary>
+        /// Gets or sets whether a checkbox for the series is shown in the Legend.
+        /// </summary>
+        [DefaultValue(true), Category("Legend")]
+        [Description("Indicates whether a checkbox for the series is shown in the Legend.")]
+        public bool ShowCheckBoxInLegend
+        {
+            get { return (TestState(States.ShowCheckBoxInLegend)); }
+
+            set
+            {
+                if (value != ShowCheckBoxInLegend)
+                {
+                    SetState(States.ShowCheckBoxInLegend, value);
+
+                    OnPropertyChangedEx("ShowCheckBoxInLegend", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowInLegend
+
+        /// <summary>
+        /// Gets or sets whether the series is shown in the Legend.
+        /// </summary>
+        [DefaultValue(true), Category("Legend")]
+        [Description("Indicates whether the series is shown in the Legend.")]
+        public bool ShowInLegend
+        {
+            get { return (TestState(States.ShowInLegend)); }
+
+            set
+            {
+                if (value != ShowInLegend)
+                {
+                    SetState(States.ShowInLegend, value);
+
+                    OnPropertyChangedEx("ShowInLegend", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowInParentLegend
+
+        /// <summary>
+        /// Gets or sets whether the series is shown in parent Legend(s).
+        /// </summary>
+        [DefaultValue(true), Category("Legend")]
+        [Description("Indicates whether the series is shown in parent Legend(s).")]
+        public bool ShowInParentLegend
+        {
+            get { return (TestState(States.ShowInParentLegend)); }
+
+            set
+            {
+                if (value != ShowInParentLegend)
+                {
+                    SetState(States.ShowInParentLegend, value);
+
+                    OnPropertyChangedEx("ShowInParentLegend", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowMarkerInLegend
+
+        /// <summary>
+        /// Gets or sets whether the series Marker is shown in the Legend.
+        /// </summary>
+        [DefaultValue(true), Category("Legend")]
+        [Description("Indicates whether the series Marker is shown in the Legend.")]
+        public bool ShowMarkerInLegend
+        {
+            get { return (TestState(States.ShowMarkerInLegend)); }
+
+            set
+            {
+                if (value != ShowMarkerInLegend)
+                {
+                    SetState(States.ShowMarkerInLegend, value);
+
+                    OnPropertyChangedEx("ShowMarkerInLegend", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region LegendItem
+
+        ///<summary>
+        /// Gets the item's parent LegendItem.
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        [Description("Indicates the item's parent LegendItem.")]
+        public ChartLegendItem LegendItem
+        {
+            get { return (_LegendItem); }
+
+            internal set
+            {
+                if (_LegendItem != null)
+                    _LegendItem.Dispose();
+
+                _LegendItem = value;
+            }
+        }
+
+        #endregion
+
+        #region LegendText
+
+        ///<summary>
+        /// Gets or sets the text to display in the legend.
+        ///</summary>
+        [DefaultValue(null), Category("Legend")]
+        [Description("Indicates the text to display in the legend.")]
+        public string LegendText
+        {
+            get { return (_LegendText); }
+
+            set
+            {
+                if (value != _LegendText)
+                {
+                    _LegendText = value;
+
+                    OnPropertyChangedEx("LegendText", Style.VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region GetLegendItem
+
+        public ChartLegendItem GetLegendItem()
+        {
+            LegendItem = null;
+
+            if (ShowInLegend == true)
+            {
+                ChartXy chartXy = Parent as ChartXy;
+
+                LegendItem = new ChartLegendItem();
+
+                if (CheckedInLegend == true)
+                    _LegendItem.CheckState = CheckState.Checked;
+
+                _LegendItem.Parent = chartXy.Legend;
+
+                _LegendItem.Name = Name;
+                _LegendItem.ItemText = LegendText;
+
+                if (string.IsNullOrEmpty(_LegendItem.Name) == true)
+                    _LegendItem.Name = "(Series)";
+
+                _LegendItem.ChartItems.Add(this);
+            }
+
+            return (_LegendItem);
+        }
+
+        #endregion
+
+        #region GetLegendItems
+
+        public List<ChartLegendItem> GetLegendItems()
+        {
+            List<ChartLegendItem> list = new List<ChartLegendItem>();
+
+            ChartLegendItem item = GetLegendItem();
+
+            if (item != null)
+                list.Add(item);
+
+            foreach (ChartIndicator ci in ChartIndicators)
+            {
+                if (ci.Visible == true)
+                {
+                    ChartLegendItem li = ci.GetLegendItem();
+
+                    if (li != null)
+                        list.Add(li);
+                }
+            }
+
+            return (list);
+        }
+
+        #endregion
+
+        #region GetLegendItemColor
+
+        public Color GetLegendItemColor()
+        {
+            ChartXy chartXy = Parent as ChartXy;
+
+            ChartLegendItemVisualStyle lstyle = ChartLegendItemVisualStyles[StyleType.Default];
+
+            if (lstyle.TextColor.IsEmpty == false)
+                return (lstyle.TextColor);
+
+            Color color = Color.Empty;
+
+            ChartSeriesVisualStyle sstyle = EffectiveChartSeriesStyle;
+
+            if (sstyle.ItemColor.IsEmpty == false)
+                return (sstyle.ItemColor);
+
+            PointMarkerVisualStyle pstyle = sstyle.MarkerVisualStyle;
+
+            switch (SeriesType)
+            {
+                case SeriesType.Bubble:
+                case SeriesType.Point:
+                case SeriesType.HorizontalDot:
+                case SeriesType.VerticalDot:
+                    color = pstyle.Background.Color1;
+                    break;
+
+                case SeriesType.Line:
+                    ChartLineDisplayMode mode = GetLineDisplayMode(chartXy);
+
+                    if ((mode & ChartLineDisplayMode.DisplayLine) == ChartLineDisplayMode.DisplayLine)
+                        color = sstyle.LineStyle.LineColor;
+
+                    else if ((mode & ChartLineDisplayMode.DisplaySpline) == ChartLineDisplayMode.DisplaySpline)
+                        color = sstyle.SplineStyle.LineColor;
+
+                    else if ((mode & ChartLineDisplayMode.DisplayStepLine) == ChartLineDisplayMode.DisplayStepLine)
+                        color = sstyle.StepLineStyle.LineColor;
+
+                    if (color.IsEmpty == true)
+                        color = pstyle.Background.Color1;
+                    break;
+
+                case SeriesType.HorizontalBar:
+                case SeriesType.VerticalBar:
+                    ChartBarVisualStyle bstyle = sstyle.BarVisualStyle;
+                    color = bstyle.Background.Color1;
+                    break;
+
+                case SeriesType.HorizontalHiLoBar:
+                case SeriesType.VerticalHiLoBar:
+                    HiLoBarSegmentStyle hstyle = sstyle.HiLoBarVisualStyle.DefaultSegmentStyle;
+
+                    if (HiLoBarType == HiLoBarType.Line)
+                    {
+                        color = hstyle.Default.LineColor;
+
+                        if (color.IsEmpty == true)
+                            color = hstyle.CenterLine.LineColor;
+                    }
+                    else
+                    {
+                        color = hstyle.BoxBackground.Color1;
+                    }
+                    break;
+            }
+
+            if (color.IsEmpty == true)
+                color = _DefaultPaletteColor;
+
+            return (color);
+        }
+
+        #endregion
+
+        #region RenderLegendItemMarker
+
+        public void RenderLegendItemMarker(Graphics g,
+            ChartLegendItem litem, ChartLegendItemVisualStyle style)
+        {
+            ChartXy chartXy = Parent as ChartXy;
+            ChartSeriesVisualStyle sstyle = EffectiveChartSeriesStyle;
+
+            Rectangle bounds = litem.MarkerBounds;
+
+            SmoothingMode sm = g.SmoothingMode;
+            g.SmoothingMode = SmoothingMode.AntiAlias;
+
+            switch (SeriesType)
+            {
+                case SeriesType.HorizontalHiLoBar:
+                case SeriesType.VerticalHiLoBar:
+                    RenderHiLoBarMarker(g, bounds, chartXy, sstyle);
+                    break;
+
+                case SeriesType.VerticalBar:
+                case SeriesType.HorizontalBar:
+                    RenderBarMarker(g, bounds, chartXy, sstyle);
+                    break;
+
+                case SeriesType.Bubble:
+                    RenderBubbleMarker(g, bounds, chartXy, sstyle);
+                    break;;
+
+                case SeriesType.VerticalDot:
+                case SeriesType.HorizontalDot:
+                case SeriesType.Point:
+                    RenderDotMarker(g, bounds, chartXy, sstyle);
+                    break;
+
+                case SeriesType.Line:
+                    RenderLineMarker(g, bounds, chartXy, sstyle);
+                    break;
+
+                default:
+                    RenderDefaultMarker(g, bounds, sstyle);
+                    break;
+            }
+
+            g.SmoothingMode = sm;
+        }
+
+        #region RenderHiLoBarMarker
+
+        private void RenderHiLoBarMarker(Graphics g,
+            Rectangle bounds, ChartXy chartXy, ChartSeriesVisualStyle sstyle)
+        {
+            Rectangle r = bounds;
+            r.Inflate(-1, -1);
+
+            if (r.Width > 0 && r.Height > 0)
+            {
+                SmoothingMode sm = g.SmoothingMode;
+                g.SmoothingMode = SmoothingMode.None;
+
+                HiLoBarSegmentStyle hstyle = sstyle.HiLoBarVisualStyle.DefaultSegmentStyle;
+
+                if (HiLoBarType == HiLoBarType.Line)
+                {
+                    Color color = hstyle.Default.LineColor;
+
+                    if (color.IsEmpty == true)
+                        color = hstyle.CenterLine.LineColor;
+
+                    if (color.IsEmpty == true)
+                        color = _DefaultPaletteColor;
+
+                    if (color.IsEmpty == true)
+                        color = Color.Black;
+
+                    if (IsRotated == true || r.Width > r.Height)
+                        RenderHiLoHBarMarker(g, r, color);
+                    else
+                        RenderHiLoVBarMarker(g, r, color);
+                }
+                else
+                {
+                    Background bk = hstyle.BoxBackground;
+                    ChartLineVisualStyle lstyle = hstyle.BoxBorder;
+
+                    if (IsRotated == true || r.Width > r.Height)
+                        RenderHBoxMarker(g, r, bk, hstyle, lstyle);
+                    else
+                        RenderVBoxMarker(g, r, bk, hstyle, lstyle);
+                }
+
+                g.SmoothingMode = sm;
+            }
+        }
+
+        #region RenderHBoxMarker
+
+        private void RenderHBoxMarker(Graphics g, Rectangle r,
+            Background bk, HiLoBarSegmentStyle hstyle, ChartLineVisualStyle lstyle)
+        {
+            int n = r.Height / 4;
+
+            Rectangle t = r;
+            t.Inflate(-n, -n);
+
+            if (t.Height % 2 != 0)
+            {
+                t.Y--;
+                t.Height++;
+            }
+
+            using (Brush br = bk.GetBrush(t))
+                g.FillRectangle(br, t);
+
+            Color lineColor = lstyle.LineColor;
+
+            if (lineColor.IsEmpty == true)
+                lineColor = hstyle.Default.LineColor;
+
+            if (lineColor.IsEmpty == true)
+                lineColor = Color.Black;
+
+            using (Pen pen = new Pen(lineColor))
+            {
+                Point pt1 = new Point(r.X, (r.Y + r.Bottom) / 2);
+                Point pt2 = new Point(t.X, pt1.Y);
+
+                g.DrawLine(pen, pt1, pt2);
+
+                pt1.X = t.Right;
+                pt2.X = r.Right;
+
+                g.DrawLine(pen, pt1, pt2);
+            }
+
+            using (Pen pen = new Pen(lineColor))
+                g.DrawRectangle(pen, t);
+        }
+
+        #endregion
+
+        #region RenderVBoxMarker
+
+        private void RenderVBoxMarker(Graphics g, Rectangle r,
+            Background bk, HiLoBarSegmentStyle hstyle, ChartLineVisualStyle lstyle)
+        {
+            int n = r.Width / 4;
+
+            Rectangle t = r;
+            t.Inflate(-n, -n);
+
+            if (t.Width % 2 != 0)
+            {
+                t.X--;
+                t.Width++;
+            }
+
+            using (Brush br = bk.GetBrush(t))
+                g.FillRectangle(br, t);
+
+            Color lineColor = lstyle.LineColor;
+
+            if (lineColor.IsEmpty == true)
+                lineColor = hstyle.Default.LineColor;
+
+            if (lineColor.IsEmpty == true)
+                lineColor = Color.Black;
+
+            using (Pen pen = new Pen(lineColor))
+            {
+                Point pt1 = new Point((r.X + r.Right) / 2, r.Y);
+                Point pt2 = new Point(pt1.X, t.Y);
+
+                g.DrawLine(pen, pt1, pt2);
+
+                pt1.Y = t.Bottom;
+                pt2.Y = r.Bottom;
+
+                g.DrawLine(pen, pt1, pt2);
+            }
+
+            using (Pen pen = new Pen(lineColor))
+                g.DrawRectangle(pen, t);
+        }
+
+        #endregion
+
+        #region RenderHiLoHBarMarker
+
+        private void RenderHiLoHBarMarker(Graphics g, Rectangle r, Color color)
+        {
+            Point pt1 = new Point(r.X, (r.Y + r.Bottom) / 2);
+            Point pt2 = new Point(r.Right, pt1.Y);
+
+            using (Pen pen = new Pen(color))
+            {
+                g.DrawLine(pen, pt1, pt2);
+
+                int n = (r.Bottom - r.Top) / 3;
+
+                pt1.X = r.X + (r.Width / 4);
+                pt1.Y -= n;
+
+                pt2.X = pt1.X;
+
+                g.DrawLine(pen, pt1, pt2);
+
+                pt1.X = r.X + (r.Width / 4) * 3;
+                pt1.Y += (2 * n);
+                pt2.X = pt1.X;
+
+                g.DrawLine(pen, pt1, pt2);
+            }
+        }
+
+        #endregion
+
+        #region RenderHiLoVBarMarker
+
+        private void RenderHiLoVBarMarker(Graphics g, Rectangle r, Color color)
+        {
+            Point pt1 = new Point((r.X + r.Right) / 2, r.Y);
+            Point pt2 = new Point(pt1.X, r.Bottom);
+
+            using (Pen pen = new Pen(color))
+            {
+                g.DrawLine(pen, pt1, pt2);
+
+                int n = (r.Right - r.Left) / 3;
+
+                pt1.X -= n;
+                pt1.Y = r.Y + (r.Height / 4);
+                pt2.Y = pt1.Y;
+
+                g.DrawLine(pen, pt1, pt2);
+
+                pt1.X += (2 * n);
+                pt1.Y = r.Y + (r.Height / 4) * 3;
+                pt2.Y = pt1.Y;
+
+                g.DrawLine(pen, pt1, pt2);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderBarMarker
+
+        private void RenderBarMarker(Graphics g, Rectangle bounds, ChartXy chartXy, ChartSeriesVisualStyle sstyle)
+        {
+            ChartLineVisualStyle cstyle = sstyle.BarVisualStyle.Border;
+            Background bk = sstyle.BarVisualStyle.Background;
+
+            Rectangle r = bounds;
+            r.Inflate(-1, -1);
+
+            using (Brush br = bk.GetBrush(r))
+            {
+                g.FillRectangle(br, r);
+
+                if (cstyle.LineColor.IsEmpty == false && cstyle.LinePattern != LinePattern.None)
+                {
+                    using (Pen pen = new Pen(cstyle.LineColor, cstyle.LineWidth))
+                    {
+                        if (cstyle.LinePattern != LinePattern.NotSet)
+                            pen.DashStyle = (DashStyle)cstyle.LinePattern;
+
+                        g.DrawRectangle(pen, r);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region RenderBubbleMarker
+
+        private void RenderBubbleMarker(Graphics g,
+            Rectangle bounds, ChartXy chartXy, ChartSeriesVisualStyle sstyle)
+        {
+            PointMarkerVisualStyle pstyle = sstyle.MarkerVisualStyle;
+
+            Background bk = pstyle.Background;
+
+            Rectangle r = bounds;
+            r.Inflate(-1, -1);
+
+            using (Brush br = pstyle.Background.GetBrush(r))
+            {
+                g.FillEllipse(br, r);
+
+                if (pstyle.BorderColor.IsEmpty == false && pstyle.BorderWidth > 0)
+                {
+                    using (Pen pen = new Pen(pstyle.BorderColor, pstyle.BorderWidth))
+                        g.DrawEllipse(pen, r);
+                }
+            }
+        }
+
+        #endregion
+
+        #region RenderDotMarker
+
+        private void RenderDotMarker(Graphics g,
+            Rectangle bounds, ChartXy chartXy, ChartSeriesVisualStyle sstyle)
+        {
+            PointMarkerVisualStyle pstyle = sstyle.MarkerVisualStyle;
+
+            Image marker = pstyle.GetPointMarkerImage();
+
+            if (marker != null)
+            {
+                g.DrawImage(marker, bounds);
+            }
+            else
+            {
+                marker = chartXy.GetPointMarker(g, pstyle.Type, pstyle.PointCount,
+                    bounds.Size, pstyle.Rotation, pstyle.Background,
+                    pstyle.BorderColor, pstyle.BorderWidth);
+
+                if (marker != null)
+                {
+                    // Make allowances for the fact that GetPointMarker() adjusts the
+                    // size and pos of the image to allow for better anti-aliasing
+
+                    bounds.X--;
+                    bounds.Y--;
+
+                    g.DrawImageUnscaled(marker, bounds);
+                }
+                else
+                {
+                    RenderDefaultMarker(g, bounds, sstyle);
+                }
+            }
+        }
+
+        #endregion
+
+        #region RenderLineMarker
+
+        private void RenderLineMarker(Graphics g, 
+            Rectangle bounds, ChartXy chartXy, ChartSeriesVisualStyle sstyle)
+        {
+            ChartLineDisplayMode mode = GetLineDisplayMode(chartXy);
+
+           int n = bounds.Height / 2;
+
+            using (Pen pen = new Pen(GetLegendItemColor()))
+            {
+                g.DrawLine(pen,
+                    new Point(bounds.X, bounds.Y + n),
+                    new Point(bounds.Right - 1, bounds.Y + n));
+            }
+
+            if ((mode & ChartLineDisplayMode.DisplayPoints) == ChartLineDisplayMode.DisplayPoints)
+            {
+                n = Math.Min(bounds.Height, bounds.Width);
+                n = (int)Math.Ceiling((double)n / 2);
+
+                if (n % 2 == 0)
+                    n++;
+
+                Rectangle r = bounds;
+
+                r.X += ((r.Width - n) / 2);
+                r.Y += ((r.Height - n) / 2);
+
+                r.Width = n;
+                r.Height = n;
+
+                PointMarkerVisualStyle pstyle = sstyle.MarkerVisualStyle;
+
+                Image marker2 = chartXy.GetPointMarker(g, pstyle.Type, pstyle.PointCount,
+                    r.Size, 0, pstyle.Background, pstyle.BorderColor, pstyle.BorderWidth > 0 ? 1 : 0);
+
+                if (marker2 != null)
+                {
+                    // Make allowances for the fact that GetPointMarker() adjusts the
+                    // size and pos of the image to allow for better anti-aliasing
+
+                    r.X--;
+                    r.Y--;
+
+                    g.DrawImageUnscaled(marker2, r);
+                }
+                else
+                {
+                    RenderDefaultMarker(g, bounds, sstyle);
+                }
+            }
+        }
+
+        #endregion
+        
+        #region RenderDefaultMarker
+
+        private void RenderDefaultMarker(Graphics g,
+            Rectangle bounds, ChartSeriesVisualStyle sstyle)
+        {
+            bounds.Width++;
+            bounds.Height++;
+
+            Background background = sstyle.MarkerVisualStyle.Background;
+
+            if (background.IsEmpty == true)
+            {
+                g.FillRectangle(Brushes.DimGray, bounds);
+            }
+            else
+            {
+                using (Brush br = background.GetBrush(bounds))
+                    g.FillRectangle(br, bounds);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region Copy/CopyTo
+
+        public override ChartVisualElement Copy()
+        {
+            ChartSeries copy = new ChartSeries();
+
+            CopyTo(copy);
+
+            return (copy);
+        }
+
+        public override void CopyTo(ChartVisualElement copy)
+        {
+            ChartSeries c = copy as ChartSeries;
+
+            if (c != null)
+            {
+                base.CopyTo(c);
+
+                c.AxisX = AxisX;
+                c.AxisY = AxisY;
+
+                c.AreaBaseValue = AreaBaseValue;
+
+                c.BarFillRange = BarFillRange;
+                c.BarLabelPosition = BarLabelPosition;
+                c.BarShadingEnabled = BarShadingEnabled;
+                c.BarWidthRatio = BarWidthRatio;
+
+                c.BubbleIntensityMode = BubbleIntensityMode;
+                c.BubbleScaleFactor = BubbleScaleFactor;
+                c.BubbleSizeMode = BubbleSizeMode;
+
+                foreach (ChartIndicator ci in ChartIndicators)
+                    c.ChartIndicators.Add((ChartIndicator)ci.Copy());
+
+                c.ChartLegendItemVisualStyles =
+                    (_ChartLegendItemVisualStyles != null) ? ChartLegendItemVisualStyles.Copy() : null;
+
+                c.ChartLineAreaDisplayMode = ChartLineAreaDisplayMode;
+                c.ChartLineDisplayMode = ChartLineDisplayMode;
+
+                c.ChartSeriesVisualStyle =
+                    (_ChartSeriesVisualStyle != null) ? ChartSeriesVisualStyle.Copy() : null;
+
+                c.ConvexHullDisplayMode = ConvexHullDisplayMode;
+
+                c.CrosshairEnabled = CrosshairEnabled;
+                c.CrosshairHighlightPoints = CrosshairHighlightPoints;
+                c.CrosshairShowLabels = CrosshairShowLabels;
+
+                foreach (DataLabel dl in DataLabels)
+                    c.DataLabels.Add((DataLabel)dl.Copy());
+
+                c.DataLabelVisualStyle =
+                    (_DataLabelVisualStyle != null) ? DataLabelVisualStyle.Copy() : null;
+
+                c.DataPropertyNameSeries = DataPropertyNameSeries;
+                c.DataPropertyNameX = DataPropertyNameX;
+                c.DataPropertyNamesY = DataPropertyNamesY;
+
+                c.DataMember = DataMember;
+                c.DataSource = DataSource;
+
+                c.DefaultPaletteColor = DefaultPaletteColor;
+                c.DisplayLinePointsOnTop = DisplayLinePointsOnTop;
+                c.DotPlotIndexValue = DotPlotIndexValue;
+                c.EmptyValues = EmptyValues;
+                c.EnableEmptyValues = EnableEmptyValues;
+                c.GroupId = GroupId;
+
+                c.PointLabelDisplayMode = PointLabelDisplayMode;
+                c.PointLabelMinDistance = PointLabelMinDistance;
+                c.PointLabelSkip = PointLabelSkip;
+
+                c.ScaleTypeX = ScaleTypeX;
+                c.ScaleTypeY = ScaleTypeY;
+
+                foreach (SeriesPoint sp in SeriesPoints)
+                    c.SeriesPoints.Add(sp.Copy());
+
+                c.SeriesType = SeriesType;
+
+                c.ShowEmptyLines = ShowEmptyLines;
+                c.ShowEmptyPoints = ShowEmptyPoints;
+                c.ShowHiLoBarMedianLines = ShowHiLoBarMedianLines;
+                c.ShowOriginValueLabels = ShowOriginValueLabels;
+                c.StackQualitativePoints = StackQualitativePoints;
+
+                c.StepLines = StepLines;
+                c.StepLineMode = StepLineMode;
+
+                c.CheckedInLegend = CheckedInLegend;
+                c.LegendText = LegendText;
+                c.ShowCheckBoxInLegend = ShowCheckBoxInLegend;
+                c.ShowInLegend = ShowInLegend;
+                c.ShowInParentLegend = ShowInParentLegend;
+                c.ShowMarkerInLegend = ShowMarkerInLegend;
+            }
+        }
+
+        #endregion
+
+        #region GetSerialData
+
+        internal override SerialElementCollection GetSerialData(string serialName)
+        {
+            SerialElementCollection sec = new SerialElementCollection();
+
+            if (serialName != null)
+            {
+                if (serialName.Equals("") == true)
+                    serialName = "ChartSeries";
+
+                sec.AddStartElement(serialName);
+            }
+
+            if (AxisX != null && string.IsNullOrEmpty(AxisX.Name) == false)
+                sec.AddValue("AxisX", AxisX.Name);
+
+            if (AxisY != null && string.IsNullOrEmpty(AxisY.Name) == false)
+                sec.AddValue("AxisY", AxisY.Name);
+
+            sec.AddDataValue("AreaBaseValue", AreaBaseValue, null);
+
+            sec.AddValue("BarFillRange", BarFillRange, BarFillRange.NotSet);
+            sec.AddValue("BarLabelPosition", BarLabelPosition, BarLabelPosition.NotSet);
+            sec.AddValue("BarShadingEnabled", BarShadingEnabled, Tbool.NotSet);
+            sec.AddValue("BarWidthRatio", BarWidthRatio, 0d);
+
+            sec.AddValue("BubbleIntensityMode", BubbleIntensityMode, BubbleIntensityMode.NotSet);
+            sec.AddValue("BubbleScaleFactor", BubbleScaleFactor, 1.0d);
+            sec.AddValue("BubbleSizeMode", BubbleSizeMode, BubbleSizeMode.NotSet);
+
+            if (_ChartIndicators != null && _ChartIndicators.Count > 0)
+            {
+                sec.AddStartElement("ChartIndicators count=\"" + _ChartIndicators.Count + "\"");
+
+                foreach (ChartIndicator ci in _ChartIndicators)
+                    sec.AddElement(ci.GetSerialData(""));
+
+                sec.AddEndElement("ChartIndicators");
+            }
+
+            if (_ChartLegendItemVisualStyles != null)
+                sec.AddElement(_ChartLegendItemVisualStyles.GetSerialData("ChartLegendItemVisualStyles"));
+
+            sec.AddValue("ChartLineAreaDisplayMode", ChartLineAreaDisplayMode, ChartLineAreaDisplayMode.NotSet);
+            sec.AddValue("ChartLineDisplayMode", ChartLineDisplayMode, ChartLineDisplayMode.NotSet);
+
+            if (_ChartSeriesVisualStyle != null)
+                sec.AddElement(_ChartSeriesVisualStyle.GetSerialData("ChartSeriesVisualStyle"));
+
+            sec.AddValue("ConvexHullDisplayMode", ConvexHullDisplayMode, ConvexHullDisplayMode.NotSet);
+            sec.AddValue("CrosshairEnabled", CrosshairEnabled, Tbool.NotSet);
+            sec.AddValue("CrosshairHighlightPoints", CrosshairHighlightPoints, Tbool.NotSet);
+            sec.AddValue("CrosshairShowLabels", CrosshairShowLabels, Tbool.NotSet);
+
+            if (_DataLabels != null && _DataLabels.Count > 0)
+            {
+                sec.AddStartElement("DataLabels count=\"" + _DataLabels.Count + "\"");
+
+                foreach (DataLabel dl in _DataLabels)
+                    sec.AddElement(dl.GetSerialData(""));
+
+                sec.AddEndElement("DataLabels");
+            }
+
+            if (_DataLabelVisualStyle != null)
+                sec.AddElement(_DataLabelVisualStyle.GetSerialData("DataLabelVisualStyle"));
+
+            //sec.AddDataValue("DataSource", DataSource, null);
+            sec.AddValue("DataMember", DataMember, null);
+
+            sec.AddValue("DataPropertyNameSeries", DataPropertyNameSeries, null);
+            sec.AddValue("DataPropertyNameX", DataPropertyNameX, null);
+
+            if (_DataPropertyNamesY != null && _DataPropertyNamesY.Count > 0)
+            {
+                sec.AddStartElement("DataPropertyNamesYs count=\"" + _DataPropertyNamesY.Count + "\"");
+
+                foreach (string s in _DataPropertyNamesY)
+                    sec.AddValue("DataPropertyNamesY", s);
+
+                sec.AddEndElement("DataPropertyNamesYs");
+            }
+
+            sec.AddValue("DefaultPaletteColor", DefaultPaletteColor, Color.Empty);
+            sec.AddValue("DisplayLinePointsOnTop", DisplayLinePointsOnTop, true);
+            sec.AddValue("DotPlotIndexValue", DotPlotIndexValue, 1.0d);
+
+            if (_EmptyValues != null && _EmptyValues.Length > 0)
+            {
+                sec.AddStartElement("EmptyValues count=\"" + _EmptyValues.Length + "\"");
+
+                foreach (object value in _EmptyValues)
+                    sec.AddValue("EmptyValue", value);
+
+                sec.AddEndElement("EmptyValues");
+            }
+
+            sec.AddValue("EnableEmptyValues", EnableEmptyValues, false);
+            sec.AddValue("GroupId", GroupId, 0);
+            sec.AddValue("HiLoBarType", HiLoBarType, HiLoBarType.Box);
+            sec.AddValue("PointLabelDisplayMode", PointLabelDisplayMode, PointLabelDisplayMode.NotSet);
+            sec.AddValue("PointLabelMinDistance", PointLabelMinDistance, 0);
+            sec.AddValue("PointLabelSkip", PointLabelSkip, 0);
+            sec.AddValue("ScaleTypeX", ScaleTypeX, ScaleType.NotSet);
+            sec.AddValue("ScaleTypeY", ScaleTypeY, ScaleType.NotSet);
+
+            if (_SeriesPoints != null && _SeriesPoints.Count > 0)
+            {
+                sec.AddStartElement("SeriesPoints count=\"" + _SeriesPoints.Count + "\"");
+
+                foreach (SeriesPoint sp in _SeriesPoints)
+                    sec.AddElement(sp.GetSerialData());
+
+                sec.AddEndElement("SeriesPoints");
+            }
+
+            sec.AddValue("SeriesType", SeriesType, SeriesType.Point);
+
+            sec.AddValue("ShowEmptyLines", ShowEmptyLines, false);
+            sec.AddValue("ShowEmptyPoints", ShowEmptyPoints, false);
+            sec.AddValue("ShowHiLoBarMedianLines", ShowHiLoBarMedianLines, false);
+            sec.AddValue("ShowOriginValueLabels", ShowOriginValueLabels, true);
+
+            sec.AddValue("StackQualitativePoints", StackQualitativePoints, true);
+
+            sec.AddValue("StepLines", StepLines, StepLines.NotSet);
+            sec.AddValue("StepLineMode", StepLineMode, StepLineMode.NotSet);
+
+            sec.AddValue("CheckedInLegend", CheckedInLegend, true);
+            sec.AddValue("LegendText", LegendText, null);
+            sec.AddValue("ShowCheckBoxInLegend", ShowCheckBoxInLegend, true);
+            sec.AddValue("ShowInLegend", ShowInLegend, true);
+            sec.AddValue("ShowInParentLegend", ShowInParentLegend, true);
+            sec.AddValue("ShowMarkerInLegend", ShowMarkerInLegend, true);
+
+            sec.AddElement(base.GetSerialData(null));
+
+            if (serialName != null)
+                sec.AddEndElement(serialName);
+
+            return (sec);
+        }
+
+        #endregion
+
+        #region PutSerialData
+
+        #region ProcessValue
+
+        internal override void ProcessValue(SerialElement se)
+        {
+            ChartXy chartXy = Parent as ChartXy;
+
+            switch (se.Name)
+            {
+                case "AreaBaseValue":
+                    AreaBaseValue = se.DataValue;
+                    break;
+
+                case "AxisX":
+                    if (chartXy != null)
+                        AxisX = GetAncillaryAxis(chartXy.AncillaryAxesX, se.GetValueString());
+                    break;
+
+                case "AxisY":
+                    if (chartXy != null)
+                        AxisY = GetAncillaryAxis(chartXy.AncillaryAxesY, se.GetValueString());
+                    break;
+
+                case "BarFillRange":
+                    BarFillRange = (BarFillRange)se.GetValueEnum(typeof(BarFillRange));
+                    break;
+
+                case "BarLabelPosition":
+                    BarLabelPosition = (BarLabelPosition)se.GetValueEnum(typeof(BarLabelPosition));
+                    break;
+
+                case "BarShadingEnabled":
+                    BarShadingEnabled = (Tbool)se.GetValueEnum(typeof(Tbool));
+                    break;
+
+                case "BarWidthRatio":
+                    BarWidthRatio = double.Parse(se.StringValue);
+                    break;
+
+                case "BubbleIntensityMode":
+                    BubbleIntensityMode = (BubbleIntensityMode)se.GetValueEnum(typeof(BubbleIntensityMode));
+                    break;
+
+                case "BubbleScaleFactor":
+                    BubbleScaleFactor = double.Parse(se.StringValue);
+                    break;
+
+                case "BubbleSizeMode":
+                    BubbleSizeMode = (BubbleSizeMode)se.GetValueEnum(typeof(BubbleSizeMode));
+                    break;
+
+                case "ChartLineAreaDisplayMode":
+                    ChartLineAreaDisplayMode = (ChartLineAreaDisplayMode)se.GetValueEnum(typeof(ChartLineAreaDisplayMode));
+                    break;
+
+                case "ChartLineDisplayMode":
+                    ChartLineDisplayMode = (ChartLineDisplayMode)se.GetValueEnum(typeof(ChartLineDisplayMode));
+                    break;
+
+                case "CheckedInLegend":
+                    CheckedInLegend = bool.Parse(se.StringValue);
+                    break;
+
+                case "ConvexHullDisplayMode":
+                    ConvexHullDisplayMode = (ConvexHullDisplayMode)se.GetValueEnum(typeof(ConvexHullDisplayMode));
+                    break;
+
+                case "CrosshairEnabled":
+                    CrosshairEnabled = (Tbool)se.GetValueEnum(typeof(Tbool));
+                    break;
+
+                case "CrosshairHighlightPoints":
+                    CrosshairHighlightPoints = (Tbool)se.GetValueEnum(typeof(Tbool));
+                    break;
+
+                case "CrosshairShowLabels":
+                    CrosshairShowLabels = (Tbool)se.GetValueEnum(typeof(Tbool));
+                    break;
+
+                case "DataMember":
+                    DataMember = se.StringValue;
+                    break;
+
+                case "DataPropertyNameSeries":
+                    DataPropertyNameSeries = se.StringValue;
+                    break;
+
+                case "DataPropertyNameX":
+                    DataPropertyNameX = se.StringValue;
+                    break;
+
+                case "DataPropertyNamesY":
+                    DataPropertyNamesY.Add(se.StringValue);
+                    break;
+
+                case "DataSource":
+                    DataSource = se.DataValue;
+                    break;
+
+                case "DefaultPaletteColor":
+                    DefaultPaletteColor = se.GetValueColor();
+                    break;
+
+                case "DisplayLinePointsOnTop":
+                    DisplayLinePointsOnTop = bool.Parse(se.StringValue);
+                    break;
+
+                case "DotPlotIndexValue":
+                    DotPlotIndexValue = double.Parse(se.StringValue);
+                    break;
+
+                case "EmptyValues":
+                    EmptyValues[se.ValueIndex] = se.DataValue;
+                    break;
+
+                case "EnableEmptyValues":
+                    EnableEmptyValues = bool.Parse(se.StringValue);
+                    break;
+
+                case "GroupId":
+                    GroupId = int.Parse(se.StringValue);
+                    break;
+
+                case "HiLoBarType":
+                    HiLoBarType = (HiLoBarType)se.GetValueEnum(typeof(HiLoBarType));
+                    break;
+
+                case "LegendText":
+                    LegendText = se.StringValue;
+                    break;
+
+                case "PointLabelDisplayMode":
+                    PointLabelDisplayMode = (PointLabelDisplayMode)se.GetValueEnum(typeof(PointLabelDisplayMode));
+                    break;
+
+                case "PointLabelMinDistance":
+                    PointLabelMinDistance = int.Parse(se.StringValue);
+                    break;
+
+                case "PointLabelSkip":
+                    PointLabelSkip = int.Parse(se.StringValue);
+                    break;
+
+                case "ScaleTypeX":
+                    ScaleTypeX = (ScaleType)se.GetValueEnum(typeof(ScaleType));
+                    break;
+
+                case "ScaleTypeY":
+                    ScaleTypeY = (ScaleType)se.GetValueEnum(typeof(ScaleType));
+                    break;
+
+                case "SeriesType":
+                    SeriesType = (SeriesType)se.GetValueEnum(typeof(SeriesType));
+                    break;
+
+                case "ShowCheckBoxInLegend":
+                    ShowCheckBoxInLegend = bool.Parse(se.StringValue);
+                    break;
+
+                case "ShowEmptyLines":
+                    ShowEmptyLines = bool.Parse(se.StringValue);
+                    break;
+
+                case "ShowEmptyPoints":
+                    ShowEmptyPoints = bool.Parse(se.StringValue);
+                    break;
+
+                case "ShowHiLoBarMedianLines":
+                    ShowHiLoBarMedianLines = bool.Parse(se.StringValue);
+                    break;
+
+                case "ShowInLegend":
+                    ShowInLegend = bool.Parse(se.StringValue);
+                    break;
+
+                case "ShowInParentLegend":
+                    ShowInParentLegend = bool.Parse(se.StringValue);
+                    break;
+
+                case "ShowMarkerInLegend":
+                    ShowMarkerInLegend = bool.Parse(se.StringValue);
+                    break;
+
+                case "ShowOriginValueLabels":
+                    ShowOriginValueLabels = bool.Parse(se.StringValue);
+                    break;
+
+                case "StackQualitativePoints":
+                    StackQualitativePoints = bool.Parse(se.StringValue);
+                    break;
+
+                case "StepLines":
+                    StepLines = (StepLines)se.GetValueEnum(typeof(StepLines));
+                    break;
+
+                case "StepLineMode":
+                    StepLineMode = (StepLineMode)se.GetValueEnum(typeof(StepLineMode));
+                    break;
+
+                default:
+                    base.ProcessValue(se);
+                    break;
+            }
+        }
+
+        #region GetAncillaryAxis
+
+        private ChartAxis GetAncillaryAxis(ChartAxesCollection axes, string name)
+        {
+            foreach (ChartAxis axis in axes)
+            {
+                if (name.Equals(axis.Name) == true)
+                    return (axis);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ProcessCollection
+
+        internal override void ProcessCollection(SerialElement se)
+        {
+            SerialElementCollection sec = se.Sec;
+
+            switch (se.Name)
+            {
+                case "ChartIndicators":
+                    sec.PutSerialData(this);
+                    break;
+
+                case "ChartLegendItemVisualStyles":
+                    sec.PutSerialData(ChartLegendItemVisualStyles);
+                    break;
+
+                case "ChartSeriesVisualStyle":
+                    sec.PutSerialData(ChartSeriesVisualStyle);
+                    break;
+
+                case "DataLabel":
+                    sec.PutSerialData(DataLabels[se.ValueIndex]);
+                    break;
+
+                case "DataLabels":
+                    sec.PutSerialData(this);
+                    break;
+
+                case "DataLabelVisualStyle":
+                    sec.PutSerialData(DataLabelVisualStyle);
+                    break;
+
+                case "DataPropertyNamesYs":
+                    if (se.ArrayCount > 0)
+                    {
+                        DataPropertyNamesY = new CustomCollection<string>(se.ArrayCount);
+
+                        sec.PutSerialData(this);
+                    }
+                    break;
+
+                case "EmptyValues":
+                    if (se.ArrayCount > 0)
+                    {
+                        EmptyValues = new object[se.ArrayCount];
+
+                        sec.PutSerialData(this);
+                    }
+                    break;
+
+                case "RegressionLine":
+                    string rname = se.Sec.GetItemValue("Name");
+
+                    RegressionLine reg = ChartIndicators[rname] as RegressionLine;
+
+                    if (reg != null)
+                        ChartIndicators.Remove(reg);
+
+                    reg = new RegressionLine(rname);
+
+                    if (reg != null)
+                    {
+                        sec.PutSerialData(reg);
+
+                        ChartIndicators.Add(reg);
+                    }
+                    break;
+
+                case "SeriesPoints":
+                    if (se.ArrayCount > 0)
+                    {
+                        SeriesPoints = new SeriesPointCollection();
+
+                        sec.PutSerialData(this);
+                    }
+                    break;
+
+                case "SeriesPoint":
+                    SeriesPoint sp = new SeriesPoint();
+
+                    sec.PutSerialData(sp);
+
+                    SeriesPoints.Add(sp);
+                    break;
+
+                case "TrendLine":
+                    string tname = se.Sec.GetItemValue("Name");
+
+                    TrendLine trend = ChartIndicators[tname] as TrendLine;
+
+                    if (trend != null)
+                        ChartIndicators.Remove(trend);
+
+                    trend = new TrendLine(tname);
+
+                    if (trend != null)
+                    {
+                        sec.PutSerialData(trend);
+
+                        ChartIndicators.Add(trend);
+                    }
+                    break;
+
+                default:
+                    base.ProcessCollection(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Series States
+
+        [Flags]
+        private enum States : uint
+        {
+            FilterIgnoreMatchCase = (1U << 0),
+
+            CheckedInLegend = (1U << 1),
+            ShowInLegend = (1U << 2),
+            ShowInParentLegend = (1U << 3),
+            ShowCheckBoxInLegend = (1U << 4),
+            ShowMarkerInLegend = (1U << 5),
+
+            IsSorted = (1U << 6),
+            IsRotated = (1U << 7),
+
+            StackQualitativePoints = (1U << 8),
+            DisplayLinePointsOnTop = (1U << 9),
+
+            EnableEmptyValues = (1U << 10),
+            ShowEmptyLines = (1U << 11),
+            ShowEmptyPoints = (1U << 12),
+            ShowOriginValueLabels = (1U << 13),
+            ShowHiLoBarMedianLines = (1U << 14),
+
+            NeedToUpdateBindings = (1U << 15),
+        }
+
+        #region TestState
+
+        private bool TestState(States state)
+        {
+            return ((_States & state) == state);
+        }
+
+        #endregion
+
+        #region SetState
+
+        private void SetState(States state, bool value)
+        {
+            if (value == true)
+                _States |= state;
+            else
+                _States &= ~state;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IDisposable
+
+        public override void Dispose()
+        {
+            AxisX = null;
+            AxisY = null;
+            ChartIndicators = null;
+            ChartLegendItemVisualStyles = null;
+            ChartSeriesVisualStyle = null;
+            DataLabels = null;
+            DataLabelVisualStyle = null;
+            SeriesPoints = null;
+
+            base.Dispose();
+        }
+
+        #endregion
+    }
+
+    #region SortedSeriesPoints
+
+    public class SortedSeriesPoints
+    {
+        #region Private variables
+
+        private ChartSeries _ChartSeries;
+        private SeriesPointCollection _Spc;
+
+        private int[] _IndexArray;
+        private int[] _CountArray;
+
+        private int _SeriesLayoutCount;
+
+        private int _FirstDisplayIndex = -1;
+        private int _LastDisplayIndex = -1;
+
+        private double _Slope = double.NaN;
+        private double _Intercept = double.NaN;
+
+        private bool _SlopeCalculated;
+        private int _SlopeIndex;
+
+        #endregion
+
+        public SortedSeriesPoints(ChartSeries series, bool sortPoints)
+        {
+            _ChartSeries = series;
+            _Spc = series.SeriesPoints;
+
+            if (sortPoints == true)
+                _IndexArray = CreateIndexArray(_Spc);
+        }
+
+        #region Public properties
+
+        #region Count
+
+        public int Count
+        {
+            get
+            {
+                if (_IndexArray != null)
+                    return (_IndexArray.Length);
+
+                return (_Spc.Count);
+            }
+        }
+
+        #endregion
+
+        #region Indexer[int]
+
+        public SeriesPoint this[int index]
+        {
+            get
+            {
+                if (_IndexArray != null)
+                    index = _IndexArray[index];
+
+                return (_Spc[index]);
+            }
+        }
+
+        #endregion
+
+        #region IsSorted
+
+        public bool IsSorted
+        {
+            get { return (_ChartSeries.IsSorted); }
+        }
+
+        #endregion
+
+        #region SeriesLayoutCount
+
+        public int SeriesLayoutCount
+        {
+            get { return (_SeriesLayoutCount); }
+
+            set
+            {
+                if (value != _SeriesLayoutCount)
+                {
+                    _SeriesLayoutCount = value;
+
+                    _FirstDisplayIndex = -1;
+                    _LastDisplayIndex = -1;
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region CountArray
+
+        internal int[] CountArray
+        {
+            get { return (_CountArray); }
+            set { _CountArray = value; }
+        }
+
+        #endregion
+
+        #region IndexArray
+
+        internal int[] IndexArray
+        {
+            get { return (_IndexArray); }
+            set { _IndexArray = value; }
+        }
+
+        #endregion
+
+        #region Intercept
+
+        internal double Intercept
+        {
+            get
+            {
+                if (_SlopeCalculated == false)
+                    CalcSeriesSlope();
+
+                return (_Intercept);
+            }
+
+            set { _Intercept = value; }
+        }
+
+        #endregion
+
+        #region Slope
+
+        internal double Slope
+        {
+            get
+            {
+                if (_SlopeCalculated == false)
+                    CalcSeriesSlope();
+
+                return (_Slope);
+            }
+
+            set { _Slope = value; }
+        }
+
+        #endregion
+
+        #region SlopeIndex
+
+        internal int SlopeIndex
+        {
+            get { return (_SlopeIndex); }
+
+            set
+            {
+                if (_SlopeIndex != value)
+                {
+                    _SlopeIndex = value;
+                    _SlopeCalculated = false;
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region CreateIndexArray
+
+        private int[] CreateIndexArray(SeriesPointCollection spc)
+        {
+            int[] indexArray = new int[_Spc.Count];
+            object[] keyArray = new object[_Spc.Count];
+
+            for (int i = 0; i < _Spc.Count; i++)
+            {
+                indexArray[i] = i;
+                keyArray[i] = _Spc[i].ValueX;
+            }
+
+            Array.Sort(keyArray, indexArray);
+
+            return (indexArray);
+        }
+
+        #endregion
+
+        #region SearchX
+
+        public int SearchX(object okey)
+        {
+            ChartXy chartXy = _ChartSeries.Parent as ChartXy;
+
+            if (IsSorted == true)
+            {
+                int min = 0;
+                int max = Count - 1;
+
+                while (min <= max)
+                {
+                    int mid = (min + max) / 2;
+
+                    int cmp = chartXy.DataCompare(okey, this[mid].ValueX);
+
+                    if (cmp > 0)
+                        min = mid + 1;
+
+                    else if (cmp < 0)
+                        max = mid - 1;
+
+                    else
+                        return (mid);
+                }
+
+                return (-((min > 0) ? min - 1 : 0));
+            }
+            else
+            {
+                for (int i = 0; i < Count; i++)
+                {
+                    if (chartXy.DataCompare(okey, this[i].ValueX) == 0)
+                        return (i);
+                }
+
+                return (-1);
+            }
+        }
+
+        #endregion
+
+        #region SearchY
+
+        public int SearchY(object okey)
+        {
+            ChartXy chartXy = _ChartSeries.Parent as ChartXy;
+
+            for (int i = 0; i < _Spc.Count; i++)
+            {
+                if (_Spc[i].ValueY[0].Equals(okey))
+                    return (i);
+            }
+
+            return (0);
+        }
+
+        #endregion
+
+        #region GetQualitativeXIndex
+
+        internal int GetQualitativeXIndex(object okey)
+        {
+            int index;
+
+            if (okey is string)
+                index = _ChartSeries.QualitativeXValues.IndexOf((string)okey);
+            else
+                index = Convert.ToInt32(okey);
+
+            return (index);
+        }
+
+        #endregion
+
+        #region GetQualitativeYIndex
+
+        internal int GetQualitativeYIndex(object okey)
+        {
+            int index;
+
+            if (okey is string)
+                index = _ChartSeries.QualitativeYValues.IndexOf((string)okey);
+            else
+                index = Convert.ToInt32(okey);
+
+            return (index);
+        }
+
+        #endregion
+
+        #region CalcSeriesSlope
+
+        private void CalcSeriesSlope()
+        {
+            ChartXy chartXy = _ChartSeries.Parent as ChartXy;
+
+            if (chartXy != null)
+            {
+                ChartAxis axisX = _ChartSeries.AxisX ?? chartXy.AxisX;
+                ChartAxis axisY = _ChartSeries.AxisY ?? chartXy.AxisY;
+
+                if (_ChartSeries.ActualScaleTypeX != ScaleType.NotSet)
+                {
+                    int n = Count;
+
+                    double sumX = 0;
+                    double sumY = 0;
+                    double sumXx = 0;
+                    double sumXy = 0;
+
+                    int nn = 0;
+
+                    for (int i = 0; i < n; i++)
+                    {
+                        SeriesPoint sp = this[i];
+
+                        if (sp.IsEmpty == false && (sp.ValueY.Length > _SlopeIndex))
+                        {
+                            nn++;
+
+                            double x;
+
+                            switch (_ChartSeries.ActualScaleTypeX)
+                            {
+                                case ScaleType.DateTime:
+                                    x = chartXy.GetDateTimePointValue(axisX,
+                                        axisX.TickmarkLayout, (DateTime)sp.ValueX, (DateTime)_ChartSeries.MinValueX);
+                                    break;
+
+                                case ScaleType.Qualitative:
+                                    x = _ChartSeries.QualitativeXValues.IndexOf(sp.ValueX);
+                                    break;
+
+                                default:
+                                    x = Convert.ToDouble(sp.ValueX);
+                                    break;
+                            }
+
+                            double y;
+
+                            switch (_ChartSeries.ActualScaleTypeY)
+                            {
+                                case ScaleType.DateTime:
+                                    y = chartXy.GetDateTimePointValue(axisY, axisY.TickmarkLayout, (DateTime)sp.ValueY[_SlopeIndex]);
+                                    break;
+
+                                case ScaleType.Qualitative:
+                                    y = _ChartSeries.QualitativeYValues.IndexOf(sp.ValueY[_SlopeIndex]);
+                                    break;
+
+                                default:
+                                    y = Convert.ToDouble(sp.ValueY[_SlopeIndex]);
+                                    break;
+                            }
+
+                            sumX += x;
+                            sumY += y;
+
+                            sumXx += (x * x);
+                            sumXy += (x * y);
+                        }
+                    }
+
+                    double a = nn * sumXy;
+                    double b = sumX * sumY;
+                    double c = nn * sumXx;
+                    double d = sumX * sumX;
+
+                    double m = (a - b) / (c - d);
+                    double yi = (sumY - (m * sumX)) / nn;
+
+                    Slope = m;
+                    Intercept = yi;
+
+                    _SlopeCalculated = true;
+                }
+            }
+        }
+
+        #endregion
+
+        #region GetSeriesPoint
+
+        internal SeriesPoint GetSeriesPoint(object key)
+        {
+            if (Count > 0)
+            {
+                int index;
+
+                if (this[0].IsQuantitativeXValue == true)
+                    index = SearchX(key);
+                else
+                    index = GetQualitativeXIndex(key) - 1;
+
+                if (index < 0 && IsSorted == true)
+                    index = -index;
+
+                if ((uint)index < Count)
+                    return (this[index]);
+            }
+
+            return (null);
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region PointData
+
+    public class PointData
+    {
+        public List<Point[]> Points;
+        public List<SeriesPoint[]> SeriesPoints;
+    }
+
+    #endregion
+
+    #region BubblePlotData
+
+    internal class BubblePlotData
+    {
+        public double MinSize;
+        public double MaxSize;
+
+        public double TotalSize;
+
+        public double MinIntensity;
+        public double MaxIntensity;
+
+        public void Clear()
+        {
+            MinSize = double.MaxValue;
+            MaxSize = double.MinValue;
+
+            MinIntensity = double.MaxValue;
+            MaxIntensity = double.MinValue;
+
+            TotalSize = 0;
+        }
+    }
+
+    #endregion
+
+    #region BarRenderData
+
+    internal class BarRenderData
+    {
+        public ChartAxis Axis;
+        public ChartXy ChartXy;
+
+        public BarFillRange FillRange;
+        public bool BarShading;
+
+        public Point Spt;
+        public SeriesPoint Sp;
+
+        public ChartSeriesVisualStyle SeriesStyle;
+
+        public BarRenderData(ChartXy chartXy, ChartAxis axis)
+        {
+            ChartXy = chartXy;
+            Axis = axis;
+        }
+    }
+
+    #endregion
+
+    #region HiLoRenderData
+
+    public class HiLoRenderData
+    {
+        #region Private variables
+
+        private ChartAxis _Axis;
+        private ChartXy _ChartXy;
+
+        private Point _Spt;
+        private SeriesPoint _Sp;
+        private int _Index;
+
+        private ChartSeriesVisualStyle _SeriesStyle;
+
+        private int[] _Value;
+
+        private bool _IsAlternate;
+        private int _EndDelta;
+
+        #endregion
+
+        public HiLoRenderData(ChartXy chartXy, ChartAxis axis)
+        {
+            _ChartXy = chartXy;
+            _Axis = axis;
+        }
+
+        #region Public properties
+
+        #region AlternateStyle
+
+        /// <summary>
+        /// Gets the alternate segment style used when Open/Close values are reversed.
+        /// </summary>
+        public HiLoBarSegmentStyle AlternateStyle
+        {
+            get { return (SeriesStyle.HiLoBarVisualStyle.AlternateSegmentStyle); }
+        }
+
+        #endregion
+
+        #region DefaultStyle
+
+        /// <summary>
+        /// Gets the default segment style used when Open/Close values are not reversed.
+        /// </summary>
+        public HiLoBarSegmentStyle DefaultStyle
+        {
+            get { return (SeriesStyle.HiLoBarVisualStyle.DefaultSegmentStyle); }
+        }
+
+        #endregion
+
+        #region IsAlternate
+
+        /// <summary>
+        /// Gets whether the segment is to be render as 'Alternate'.
+        /// </summary>
+        public bool IsAlternate
+        {
+            get { return (_IsAlternate); }
+            internal set { _IsAlternate = value; }
+        }
+
+        #endregion
+
+        #region SeriesStyle
+
+        /// <summary>
+        /// Gets the associated series visual style.
+        /// </summary>
+        public ChartSeriesVisualStyle SeriesStyle
+        {
+            get { return (_SeriesStyle); }
+            internal set { _SeriesStyle = value; }
+        }
+
+        #endregion
+
+        #region Value
+
+        /// <summary>
+        /// Gets an array of specified HiLo coordinate data values (x or y,
+        /// depending upon the bar orientation). The values are specified
+        /// in [High=0, Low=1, Close=2, Open=3, Median=4] order, followed
+        /// by any 'extra' user supplied bar values.
+        /// </summary>
+        public int[] Value
+        {
+            get { return (_Value); }
+            internal set { _Value = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region Axis
+
+        internal ChartAxis Axis
+        {
+            get { return (_Axis); }
+            set { _Axis = value; }
+        }
+
+        #endregion
+
+        #region ChartXy
+
+        internal ChartXy ChartXy
+        {
+            get { return (_ChartXy); }
+            set { _ChartXy = value; }
+        }
+
+        #endregion
+
+        #region EndDelta
+
+        public int EndDelta
+        {
+            get { return (_EndDelta); }
+            set { _EndDelta = value; }
+        }
+
+        #endregion
+
+        #region Index
+
+        internal int Index
+        {
+            get { return (_Index); }
+            set { _Index = value; }
+        }
+
+        #endregion
+
+        #region Sp
+
+        internal SeriesPoint Sp
+        {
+            get { return (_Sp); }
+            set { _Sp = value; }
+        }
+
+        #endregion
+
+        #region Spt
+
+        internal Point Spt
+        {
+            get { return (_Spt); }
+            set { _Spt = value; }
+        }
+
+        #endregion
+
+        #endregion
+    }
+
+    #endregion
+
+    #region AMath (approximate math)
+
+    internal class AMath
+    {
+        public static double ToScalar(double x)
+        {
+            return (AMath.Sqrt((float)(x / Math.PI)) * 2);
+        }
+
+        public static float Sqrt(float x)
+        {
+            if (x != 0)
+            {
+                FloatIntUnion u;
+
+                u.tmp = 0;
+                u.f = x;
+
+                u.tmp -= 1 << 23;   // Subtract 2^m
+                u.tmp >>= 1;        // Divide by 2
+                u.tmp += 1 << 29;   // Add ((b + 1) / 2) * 2^m
+
+                return (u.f);
+            }
+
+            return (0);
+        }
+
+        [StructLayout(LayoutKind.Explicit)]
+        private struct FloatIntUnion
+        {
+            [FieldOffset(0)]
+            public float f;
+
+            [FieldOffset(0)]
+            public int tmp;
+        }
+    }
+
+    #endregion
+
+    #region enums
+
+    #region BarLabelPosition
+
+    /// <summary>
+    /// Specifies the position for Bar series labels.
+    /// </summary>
+    public enum BarLabelPosition
+    {
+        /// <summary>
+        /// Not set (default is Center). 
+        /// </summary>
+        NotSet = -1,
+
+        /// <summary>
+        /// Labels will be positioned in the center of the bar. 
+        /// </summary>
+        Center,
+
+        /// <summary>
+        /// Labels will be positioned outside the bar, relative to its origin. 
+        /// </summary>
+        Near,
+
+        /// <summary>
+        /// Labels will be positioned inside the bar, relative to its origin. 
+        /// </summary>
+        NearInside,
+
+        /// <summary>
+        /// Labels will be positioned outside the bar, opposite to its origin. 
+        /// </summary>
+        Far,
+
+        /// <summary>
+        /// Labels will be positioned inside the bar, opposite to its origin. 
+        /// </summary>
+        FarInside,
+    }
+
+    #endregion
+
+    #region BarSegment
+
+    public enum BarSegment
+    {
+        /// <summary>
+        /// Top portion of Vertical bar (full area).
+        /// </summary>
+        Top,
+
+        /// <summary>
+        /// Partial Top area of Vertical bar.
+        /// </summary>
+        TopPartial,
+
+        /// <summary>
+        /// Bottom portion of Vertical bar (full area).
+        /// </summary>
+        Bottom,
+
+        /// <summary>
+        /// Partial Bottom area of Vertical bar.
+        /// </summary>
+        BottomPartial,
+
+        /// <summary>
+        /// Left portion of Horizontal bar (full area).
+        /// </summary>
+        Left,
+
+        /// <summary>
+        /// Partial Left area of Horizontal bar.
+        /// </summary>
+        LeftPartial,
+
+        /// <summary>
+        /// Right portion of Horizontal bar (full area).
+        /// </summary>
+        Right,
+
+        /// <summary>
+        /// Partial Right area of Horizontal bar.
+        /// </summary>
+        RightPartial,
+    }
+
+    #endregion
+
+    #region SeriesType
+
+    /// <summary>
+    /// Defines available Series types
+    /// </summary>
+    public enum SeriesType
+    {
+        Bubble,
+
+        HorizontalBar,
+        VerticalBar,
+
+        Line,
+        Point,
+
+        HorizontalDot,          // Wilkinson dotplot
+        VerticalDot,
+
+        HorizontalHiLoBar,      // Box, Candle, HiLo
+        VerticalHiLoBar,
+
+        //Bullet,
+
+        //Pie,
+        //Polar,
+        //Radar,
+
+        //TreeMap,
+    }
+
+    #endregion
+
+    #region ConvexHullDisplayMode
+
+    /// <summary>
+    /// Specifies the ConvexHull display mode
+    /// </summary>
+    [Flags]
+    public enum ConvexHullDisplayMode
+    {
+        /// <summary>
+        /// Not set (default is None). 
+        /// </summary>
+        NotSet = 0,
+
+        /// <summary>
+        /// No Convex Hull processing will take place. 
+        /// </summary>
+        None = (1 << 0),
+
+        /// <summary>
+        /// Convex Hull border will be displayed.
+        /// </summary>
+        DisplayBorder = (1 << 1),
+
+        /// <summary>
+        /// Convex Hull background area will be displayed.
+        /// </summary>
+        DisplayBackground = (1 << 2),
+    }
+
+    #endregion
+
+    #region PointLabelDisplayMode
+
+    /// <summary>
+    /// Specifies which PointLabels are to be displayed
+    /// </summary>
+    [Flags]
+    public enum PointLabelDisplayMode
+    {
+        /// <summary>
+        /// Not set (default is None). 
+        /// </summary>
+        NotSet,
+
+        /// <summary>
+        /// No labels will be displayed. 
+        /// </summary>
+        None = (1 << 0),
+
+        /// <summary>
+        /// All series points will display a label. 
+        /// </summary>
+        AllSeriesPoints = (1 << 1),
+
+        /// <summary>
+        /// User defined DataLabels will be displayed.
+        /// </summary>
+        DataLabels = (1 << 2),
+
+        /// <summary>
+        /// Minimum 'X' Value label will be displayed.
+        /// </summary>
+        MinValueX = (1 << 3),
+
+        /// <summary>
+        /// Minimum 'Y' Value label will be displayed.
+        /// </summary>
+        MinValueY = (1 << 4),
+
+        /// <summary>
+        /// Maximum 'X' Value label will be displayed.
+        /// </summary>
+        MaxValueX = (1 << 5),
+
+        /// <summary>
+        /// Maximum 'Y' Value label will be displayed.
+        /// </summary>
+        MaxValueY = (1 << 6),
+
+    }
+
+    #endregion
+
+    #region StepLineMode
+
+    /// <summary>
+    /// Specifies the mode used to render "Step Lines" in
+    /// a given Line series.
+    /// </summary>
+    public enum StepLineMode
+    {
+        /// <summary>
+        /// Not set (default is HorizontalThenVertical). 
+        /// </summary>
+        NotSet = -1,
+
+        /// <summary>
+        /// No Step Lines will be rendered. 
+        /// </summary>
+        None,
+
+        /// <summary>
+        /// Step lines will be displayed between consecutive
+        /// series points, by first displaying the horizontal step
+        /// line, followed by the connecting vertical step line. 
+        /// </summary>
+        HorizontalThenVertical,
+
+        /// <summary>
+        /// Step lines will be displayed between consecutive
+        /// series points, by first displaying the vertical step
+        /// line, followed by the connecting horizontal step line. 
+        /// </summary>
+        VerticalThenHorizontal,
+
+        /// <summary>
+        /// Step lines will be displayed between consecutive
+        /// series points, by first displaying the midPoint horizontal
+        /// step line, followed by the connecting vertical step line. 
+        /// </summary>
+        MidPoint,
+    }
+
+    #endregion
+
+    #region StepLines
+
+    /// <summary>
+    /// Specifies the mode used to render "Stepped Lines" in
+    /// a given Line series.
+    /// </summary>
+    public enum StepLines
+    {
+        /// <summary>
+        /// Not set (default is StepHv). 
+        /// </summary>
+        NotSet = -1,
+
+        /// <summary>
+        /// No step lines will be displayed. 
+        /// </summary>
+        None,
+
+        /// <summary>
+        /// Horizontal step lines will be displayed. 
+        /// </summary>
+        Horizontal,
+
+        /// <summary>
+        /// Vertical step lines will be displayed. 
+        /// </summary>
+        Vertical,
+
+        /// <summary>
+        /// Both horizontal and vertical step lines will be displayed. 
+        /// </summary>
+        Both,
+    }
+
+    #endregion
+
+    #region ScaleType
+
+    /// <summary>
+    /// Specifies the scale type for the series points
+    /// </summary>
+    public enum ScaleType
+    {
+        /// <summary>
+        /// ScaleType is NotSet (default is 'Auto').
+        /// </summary>
+        NotSet,
+
+        /// <summary>
+        /// ScaleType is Automatic.  Scale type will be determined
+        /// by the underlying, assigned data.
+        /// </summary>
+        Auto,
+
+        /// <summary>
+        /// DateTime data scale. Points will be treated as
+        /// DateTime values and will be shown as such on the axis. 
+        /// </summary>
+        DateTime,
+
+        /// <summary>
+        /// Numerical data scale. Points will be treated as
+        /// numerical values and will be shown on the axis as numbers.
+        /// </summary>
+        Quantitative,
+
+        /// <summary>
+        /// Qualitative data scale. Points will be treated as 
+        /// qualitative values and will be shown on the axis as text.
+        /// </summary>
+        Qualitative,
+
+    }
+
+    #endregion
+
+    #region HiLoBarType
+
+    /// <summary>
+    /// Specifies the HiloBar series display type.
+    /// </summary>
+    public enum HiLoBarType
+    {
+        /// <summary>
+        /// Box Plot display. Display is identical to 'Candle' except:
+        /// 1. Median separated segments are separately rendered using both
+        /// default and alternate box backgrounds.
+        /// 2. UseAlternateSegmentStyle defaults to false.
+        /// </summary>
+        Box,
+
+        /// <summary>
+        /// Candle Plot display. Display is identical to 'Box' except:
+        /// 1. Mmedian separated segments are both rendered using either
+        /// the default or alternate box background.
+        /// 2. UseAlternateSegmentStyle defaults to true.
+        /// </summary>
+        Candle,
+
+        /// <summary>
+        /// Line plot display.
+        /// </summary>
+        Line,
+    }
+
+    #endregion
+
+    #region HiLoBarSegment
+
+    public enum HiLoBarSegment
+    {
+        /// <summary>
+        /// Box (Box plot).
+        /// </summary>
+        Box,
+
+        /// <summary>
+        /// High whisker (Box, Candle, Line).
+        /// </summary>
+        HighWhisker,
+
+        /// <summary>
+        /// High whisker cap (Box, Candle, Line).
+        /// </summary>
+        HighWhiskerCap,
+
+        /// <summary>
+        /// Low whisker (Box, Candle, Line).
+        /// </summary>
+        LowWhisker,
+
+        /// <summary>
+        /// Low whisker cap (Box, Candle, Line).
+        /// </summary>
+        LowWhiskerCap,
+
+        /// <summary>
+        /// Open whisker (Line plot).
+        /// </summary>
+        OpenWhisker,
+
+        /// <summary>
+        /// Close whisker (Line Plot).
+        /// </summary>
+        CloseWhisker,
+
+        /// <summary>
+        /// Center line (Line plot).
+        /// </summary>
+        CenterLine,
+
+        /// <summary>
+        /// Full range (Line plot).
+        /// </summary>
+        FullRange,
+
+        /// <summary>
+        /// Median line (Box, Candle, Line).
+        /// </summary>
+        MedianLine,
+
+        /// <summary>
+        /// Bar shading (Box, Candle).
+        /// </summary>
+        BarShading,
+    }
+
+    #endregion
+
+    #endregion
+
+    #region AxisTypeConverter
+
+    ///<summary>
+    /// AxisTypeConverter
+    ///</summary>
+    public class AxisTypeConverter : TypeConverter
+    {
+        ///<summary>
+        /// ConvertTo
+        ///</summary>
+        ///<param name="context"></param>
+        ///<param name="culture"></param>
+        ///<param name="value"></param>
+        ///<param name="destinationType"></param>
+        ///<returns></returns>
+        public override object ConvertTo(
+            ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+        {
+            if (destinationType == typeof(string))
+            {
+                ChartAxis axis = value as ChartAxis;
+
+                if (axis != null)
+                {
+                    if (string.IsNullOrEmpty(axis.Name) == false)
+                        return (axis.Name);
+
+                    return ("No Axis Name");
+                }
+            }
+
+            return (base.ConvertTo(context, culture, value, destinationType));
+        }
+    }
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/ChartTitle.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/ChartTitle.cs
new file mode 100644
index 00000000..be80b45f
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/ChartTitle.cs	
@@ -0,0 +1,1206 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Drawing.Drawing2D;
+using DevComponents.Charts.TextMarkup;
+using DevComponents.DotNetBar.Charts.Style;
+
+namespace DevComponents.DotNetBar.Charts
+{
+    /// <summary>
+    /// Represents the collection of ChartTitles.
+    /// </summary>
+    [Editor("DevComponents.Charts.Design.ChartTitleCollectionEditor, DevComponents.Charts.Design, " +
+            "Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(UITypeEditor))]
+    public class ChartTitleCollection : CustomNamedCollection<ChartTitle>
+    {
+        public ChartTitleCollection()
+        {
+        }
+
+        #region GetUniqueName
+
+        public string GetUniqueName()
+        {
+            return (GetUniqueName("Title"));
+        }
+
+        #endregion
+    }
+
+    /// <summary>
+    /// ChartTitle
+    /// </summary>
+    public class ChartTitle : ChartNote
+    {
+        #region Private variables
+
+        private States _States;
+        private XyAlignment _XyAlignment = XyAlignment.NotSet;
+        private RotateDegrees _RotateDegrees = RotateDegrees.NotSet;
+
+        private ChartTitleVisualStyle _ChartTitleVisualStyle;
+        private EffectiveStyle<ChartTitleVisualStyle> _EffectiveTitleStyle;
+
+        private Rectangle _FrameBounds;
+        private Rectangle _ContentBounds;
+        private int _TextHeight;
+
+        #endregion
+
+        #region Constructors
+
+        /// <summary>
+        /// Creates a new ChartTitle
+        /// </summary>
+        public ChartTitle()
+            : this(null, null)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new ChartTitle
+        /// </summary>
+        /// <param name="name">Title name</param>
+        public ChartTitle(string name)
+            : this(name, null)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new ChartTitle
+        /// </summary>
+        /// <param name="name">Title Name</param>
+        /// <param name="text">Title Text</param>
+        public ChartTitle(string name, string text)
+        {
+            InitDefaultStates();
+
+            Name = name;
+            Text = text;
+
+            _EffectiveTitleStyle = new EffectiveStyle<ChartTitleVisualStyle>(this);
+        }
+
+        #endregion
+
+        #region InitDefaultStates
+
+        private void InitDefaultStates()
+        {
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region ChartTitleVisualStyle
+
+        /// <summary>
+        /// Gets or sets the visual style for the Title.
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates the visual style for the Title.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ChartTitleVisualStyle ChartTitleVisualStyle
+        {
+            get
+            {
+                if (_ChartTitleVisualStyle == null)
+                {
+                    _ChartTitleVisualStyle = new ChartTitleVisualStyle();
+
+                    StyleVisualChangeHandler(null, _ChartTitleVisualStyle);
+                }
+
+                return (_ChartTitleVisualStyle);
+            }
+
+            set
+            {
+                if (_ChartTitleVisualStyle != value)
+                {
+                    ChartTitleVisualStyle oldValue = _ChartTitleVisualStyle;
+
+                    _ChartTitleVisualStyle = value;
+
+                    OnStyleChanged("ChartTitleVisualStyle", oldValue, value);
+
+                    if (oldValue != null)
+                        oldValue.Dispose();
+                }
+            }
+        }
+
+        #endregion
+
+        #region EffectiveTitleStyle
+
+        /// <summary>
+        /// Gets a reference to the title's effective (cached, composite) style.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public ChartTitleVisualStyle EffectiveTitleStyle
+        {
+            get { return (_EffectiveTitleStyle.Style); }
+        }
+
+        #endregion
+
+        #region RotateDegrees
+
+        /// <summary>
+        /// Gets or sets the title's display rotation.
+        /// </summary>
+        [DefaultValue(RotateDegrees.NotSet), Category("Layout")]
+        [Description("Indicates the title's display rotation.")]
+        public RotateDegrees RotateDegrees
+        {
+            get { return (_RotateDegrees); }
+
+            set
+            {
+                if (value != _RotateDegrees)
+                {
+                    _RotateDegrees = value;
+
+                    OnPropertyChangedEx("RotateDegrees", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region XyAlignment
+
+        /// <summary>
+        /// Gets or sets the X/Y Alignment for the title.
+        /// </summary>
+        [DefaultValue(XyAlignment.NotSet), Category("Layout")]
+        [Description("Indicates the X/Y Alignment for the title.")]
+        public XyAlignment XyAlignment
+        {
+            get { return (_XyAlignment); }
+
+            set
+            {
+                if (value != _XyAlignment)
+                {
+                    _XyAlignment = value;
+
+                    OnPropertyChangedEx("XyAlignment", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region MeasureOverride
+
+        protected override void MeasureOverride(ChartLayoutInfo layoutInfo)
+        {
+            Graphics g = layoutInfo.Graphics;
+            ChartTitleVisualStyle style = EffectiveTitleStyle;
+
+            Size size = Size.Empty;
+            Rectangle layoutBounds = layoutInfo.LayoutBounds;
+
+            RotateDegrees rotDegrees = GetRotateDegrees(style);
+
+            if (rotDegrees == RotateDegrees.Rotate90 || rotDegrees == RotateDegrees.Rotate270)
+                layoutBounds.Size = new Size(layoutBounds.Height, layoutBounds.Width);
+
+            Thickness brdThickness = style.BorderThickness;
+            Size ncSize = GetNonContentSize(style, brdThickness);
+
+            layoutBounds.Width -= ncSize.Width;
+            layoutBounds.Height -= ncSize.Height;
+
+            Alignment imageAlignment = style.ImageAlignment;
+            Size imageSize = style.GetFigureSize(g);
+
+            if (layoutBounds.Width > 0 && layoutBounds.Height > 0)
+            {
+                if (imageSize.IsEmpty == false)
+                {
+                    if (style.IsOverlayImage == true)
+                        imageAlignment = Alignment.MiddleCenter;
+
+                    else if (imageAlignment == Alignment.NotSet)
+                        imageAlignment = Alignment.MiddleLeft;
+
+                    switch (imageAlignment)
+                    {
+                        case Alignment.TopLeft:
+                        case Alignment.TopRight:
+                        case Alignment.BottomLeft:
+                        case Alignment.BottomRight:
+                        case Alignment.MiddleLeft:
+                        case Alignment.MiddleRight:
+                            if (rotDegrees == RotateDegrees.Rotate90 || rotDegrees == RotateDegrees.Rotate270)
+                                layoutBounds.Height -= imageSize.Width;
+                            else
+                                layoutBounds.Width -= imageSize.Width;
+                            break;
+
+                        case Alignment.TopCenter:
+                        case Alignment.BottomCenter:
+                            layoutBounds.Height -= imageSize.Height;
+                            break;
+                    }
+
+                    if (layoutBounds.Size.Width > 0 && layoutBounds.Size.Height > 0)
+                        size = MeasureText(g, style, layoutBounds.Size);
+
+                    switch (imageAlignment)
+                    {
+                        case Alignment.TopLeft:
+                        case Alignment.TopRight:
+                        case Alignment.MiddleLeft:
+                        case Alignment.MiddleRight:
+                        case Alignment.BottomLeft:
+                        case Alignment.BottomRight:
+                            size.Width += imageSize.Width;
+                            size.Height = Math.Max(imageSize.Height, size.Height);
+                            break;
+
+                        case Alignment.TopCenter:
+                        case Alignment.BottomCenter:
+                            size.Height += imageSize.Height;
+                            size.Width = Math.Max(imageSize.Width, size.Width);
+                            break;
+
+                        case Alignment.MiddleCenter:
+                            size.Height = Math.Max(imageSize.Height, size.Height);
+                            size.Width = Math.Max(imageSize.Width, size.Width);
+                            break;
+                    }
+                }
+                else
+                {
+                    size = MeasureText(g, style, layoutBounds.Size);
+                }
+
+                size.Width += ncSize.Width;
+                size.Height += ncSize.Height;
+            }
+
+            if (FixedHeight > 0)
+                size.Height = Dpi.Height(FixedHeight);
+
+            Rectangle bounds = layoutBounds;
+
+            if (style.Stretch == Tbool.True)
+            {
+                switch (XyAlignment)
+                {
+                    case XyAlignment.Left:
+                    case XyAlignment.Right:
+                        if (rotDegrees == RotateDegrees.Rotate90 || rotDegrees == RotateDegrees.Rotate270)
+                            size.Width = layoutInfo.LayoutBounds.Height;
+                        break;
+
+                    default:
+                        if (rotDegrees != RotateDegrees.Rotate90 && rotDegrees != RotateDegrees.Rotate270)
+                            size.Width = layoutInfo.LayoutBounds.Width;
+                        break;
+                }
+            }
+
+            Rectangle rb = bounds;
+
+            if (rotDegrees == RotateDegrees.Rotate90 || rotDegrees == RotateDegrees.Rotate270)
+                bounds.Size = new Size(size.Height, size.Width);
+            else
+                bounds.Size = size;
+
+            if (bounds.Width > layoutInfo.LayoutBounds.Width)
+                bounds.Width = layoutInfo.LayoutBounds.Width;
+
+            if (bounds.Height > layoutInfo.LayoutBounds.Height)
+                bounds.Height = layoutInfo.LayoutBounds.Height;
+
+            Size = bounds.Size;
+
+            bounds = AlignTitle(layoutInfo, bounds, style);
+
+            _FrameBounds = GetAdjustedBoundsRot(bounds, style.Margin);
+
+            if (style.DropShadow.Enabled == Tbool.True)
+            {
+                _FrameBounds.Width -= 3;
+                _FrameBounds.Height -= 3;
+            }
+
+            _ContentBounds = _FrameBounds;
+
+            if (brdThickness.IsEmpty == false)
+            {
+                _ContentBounds.X += brdThickness.Left;
+                _ContentBounds.Width -= brdThickness.Horizontal;
+
+                _ContentBounds.Y += brdThickness.Top;
+                _ContentBounds.Height -= brdThickness.Vertical;
+            }
+
+            if (rotDegrees == RotateDegrees.Rotate90 || rotDegrees == RotateDegrees.Rotate270)
+                _ContentBounds = GetAdjustedBoundsRot(_ContentBounds, style.Padding);
+            else
+                _ContentBounds = GetAdjustedBounds(_ContentBounds, style.Padding);
+
+            if (imageSize.IsEmpty == false)
+            {
+                if (rotDegrees == RotateDegrees.Rotate90 || rotDegrees == RotateDegrees.Rotate270)
+                    AdjustVerticalContent(rotDegrees, imageAlignment, imageSize);
+                else
+                    AdjustHorizontalContent(imageAlignment, imageSize);
+            }
+
+            BoundsRelative = bounds;
+        }
+
+        #region GetAdjustedBoundsRot
+
+        internal Rectangle GetAdjustedBoundsRot(Rectangle bounds, Thickness thickness)
+        {
+            if (thickness.IsEmpty == false)
+            {
+                if (bounds.Width > Dpi.Height(thickness.Vertical))
+                {
+                    bounds.X += Dpi.Height(thickness.Top);
+                    bounds.Width -= Dpi.Height(thickness.Vertical);
+                }
+
+                if (bounds.Height > Dpi.Width(thickness.Horizontal))
+                {
+                    bounds.Y += Dpi.Width(thickness.Left);
+                    bounds.Height -= Dpi.Width(thickness.Horizontal);
+                }
+            }
+
+            return (bounds);
+        }
+
+        #endregion
+
+        #region GetNonContentSize
+
+        private Size GetNonContentSize(ChartTitleVisualStyle style, Thickness brdThickness)
+        {
+            Size size = Size.Empty;
+
+            size.Width = Dpi.Width(style.Margin.Horizontal + brdThickness.Horizontal + style.Padding.Horizontal);
+            size.Height = Dpi.Height(style.Margin.Vertical + brdThickness.Vertical + style.Padding.Vertical);
+
+            if (style.DropShadow.Enabled == Tbool.True)
+            {
+                size.Width += 3;
+                size.Height += 3;
+            }
+
+            return (size);
+        }
+
+        #endregion
+
+        #region AdjustVerticalContent
+
+        private void AdjustVerticalContent(
+            RotateDegrees rotDegrees, Alignment imageAlignment, Size imageSize)
+        {
+            switch (imageAlignment)
+            {
+                case Alignment.TopLeft:
+                case Alignment.MiddleLeft:
+                case Alignment.BottomLeft:
+                    if (rotDegrees == RotateDegrees.Rotate90)
+                        _ContentBounds.Y += imageSize.Width;
+
+                    else if (rotDegrees == RotateDegrees.Rotate270)
+                        _ContentBounds.Y += imageSize.Width;
+                    else
+                        _ContentBounds.X += imageSize.Height;
+
+                    _ContentBounds.Height -= imageSize.Width;
+                    break;
+
+                case Alignment.TopCenter:
+                    if (rotDegrees == RotateDegrees.Rotate90)
+                        _ContentBounds.X += imageSize.Height;
+
+                    else if (rotDegrees == RotateDegrees.Rotate270)
+                        _ContentBounds.X += imageSize.Height;
+                    else
+                        _ContentBounds.Y += imageSize.Width;
+
+                    _ContentBounds.Width -= imageSize.Height;
+                    break;
+
+                case Alignment.BottomCenter:
+                    _ContentBounds.Width -= imageSize.Height;
+                    break;
+
+                case Alignment.TopRight:
+                case Alignment.MiddleRight:
+                case Alignment.BottomRight:
+                    _ContentBounds.Height -= imageSize.Width;
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region AdjustHorizontalContent
+
+        private void AdjustHorizontalContent(
+            Alignment imageAlignment, Size imageSize)
+        {
+            switch (imageAlignment)
+            {
+                case Alignment.TopLeft:
+                case Alignment.MiddleLeft:
+                case Alignment.BottomLeft:
+                    _ContentBounds.X += imageSize.Width;
+                    _ContentBounds.Width -= imageSize.Width;
+                    break;
+
+                case Alignment.TopCenter:
+                    _ContentBounds.Y += imageSize.Height;
+                    _ContentBounds.Height -= imageSize.Height;
+                    break;
+
+                case Alignment.BottomCenter:
+                    _ContentBounds.Height -= imageSize.Height;
+                    break;
+
+                case Alignment.TopRight:
+                case Alignment.MiddleRight:
+                case Alignment.BottomRight:
+                    _ContentBounds.Width -= imageSize.Width;
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region MeasureText
+
+        private Size MeasureText(Graphics g, ChartTitleVisualStyle style, Size vsize)
+        {
+            Size size = Size.Empty;
+
+            string s = Text;
+
+            if (string.IsNullOrEmpty(s) == false)
+            {
+                if (TextMarkup != null)
+                {
+                    size = GetMarkupTextSize(g,
+                        TextMarkup, style, (vsize.Width > 0 ? vsize.Width : 10000));
+                }
+                else
+                {
+                    using (StringFormat sf = new StringFormat())
+                    {
+                        style.GetStringFormatFlags(sf);
+
+                        if (style.MaxLineCount <= 1)
+                            sf.FormatFlags |= StringFormatFlags.NoWrap;
+
+                        size = g.MeasureString(Text, style.Font, vsize, sf).ToSize();
+                    }
+                }
+
+                size.Width++;
+                size.Height++;
+
+                if (style.MaxLineCount > 1)
+                {
+                    int lineHeight = (int)(Math.Ceiling(style.Font.GetHeight())) * style.MaxLineCount;
+
+                    if (size.Height > lineHeight)
+                        size.Height = lineHeight;
+                }
+            }
+
+            _TextHeight = size.Height;
+
+            return (size);
+        }
+
+        #region GetMarkupTextSize
+
+        private Size GetMarkupTextSize(Graphics g,
+            BodyElement textMarkup, ChartTitleVisualStyle style, int width)
+        {
+            MarkupDrawContext d =
+                new MarkupDrawContext(g, style.Font, style.TextColor, false);
+
+            textMarkup.InvalidateElementsSize();
+            textMarkup.Measure(new Size(width, 0), d);
+
+            return (textMarkup.Bounds.Size);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region AlignTitle
+
+        private Rectangle AlignTitle(
+            ChartLayoutInfo layoutInfo, Rectangle bounds, ChartTitleVisualStyle style)
+        {
+            Rectangle layoutBounds = layoutInfo.LayoutBounds;
+
+            switch (XyAlignment)
+            {
+                case XyAlignment.Left:
+                    layoutInfo.LayoutBounds.X += Size.Width;
+                    layoutInfo.LayoutBounds.Width -= Size.Width;
+                    break;
+
+                case XyAlignment.Bottom:
+                    bounds.Y = layoutBounds.Bottom - Size.Height;
+                    layoutInfo.LayoutBounds.Height -= Size.Height;
+                    break;
+
+                case XyAlignment.Right:
+                    bounds.X = layoutBounds.Right - Size.Width;
+                    layoutInfo.LayoutBounds.Width -= Size.Width;
+                    break;
+
+                default:
+                    layoutInfo.LayoutBounds.Y += Size.Height;
+                    layoutInfo.LayoutBounds.Height -= Size.Height;
+                    break;
+            }
+
+            if (XyAlignment == XyAlignment.Left || XyAlignment == XyAlignment.Right)
+            {
+                if (bounds.Height < layoutBounds.Height)
+                {
+                    switch (style.Alignment)
+                    {
+                        case Alignment.TopCenter:
+                        case Alignment.MiddleCenter:
+                        case Alignment.BottomCenter:
+                            bounds.Y += (layoutBounds.Height - bounds.Height) / 2;
+                            break;
+
+                        case Alignment.TopLeft:
+                        case Alignment.MiddleLeft:
+                        case Alignment.BottomLeft:
+                            bounds.Y = layoutBounds.Bottom - bounds.Height;
+                            break;
+                    }
+                }
+            }
+            else
+            {
+                if (bounds.Width < layoutBounds.Width)
+                {
+                    switch (style.Alignment)
+                    {
+                        case Alignment.TopCenter:
+                        case Alignment.MiddleCenter:
+                        case Alignment.BottomCenter:
+                            bounds.X += (layoutBounds.Width - bounds.Width) / 2;
+                            break;
+
+                        case Alignment.TopRight:
+                        case Alignment.MiddleRight:
+                        case Alignment.BottomRight:
+                            bounds.X = layoutBounds.Right - bounds.Width;
+                            break;
+                    }
+                }
+            }
+
+            return (bounds);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ArrangeOverride
+
+        protected override void ArrangeOverride(ChartLayoutInfo layoutInfo)
+        {
+        }
+
+        #endregion
+
+        #region RenderOverride
+
+        protected override void RenderOverride(ChartRenderInfo renderInfo)
+        {
+            Graphics g = renderInfo.Graphics;
+
+            Rectangle scFrameBounds = GetScrollBounds(_FrameBounds);
+            Rectangle scContentBounds = GetScrollBounds(_ContentBounds);
+
+            if (scFrameBounds.Height > 0 && scFrameBounds.Width > 0)
+            {
+                ChartTitleVisualStyle tstyle = EffectiveTitleStyle;
+
+                Rectangle rfb = scFrameBounds;
+                Rectangle rcb = scContentBounds;
+
+                RotateDegrees rotDegrees = GetRotateDegrees(tstyle);
+
+                if (rotDegrees != RotateDegrees.None)
+                {
+                    TransformBounds(g, scFrameBounds, rotDegrees);
+
+                    rfb = TranslateFrameBounds(scFrameBounds, rotDegrees);
+                    rcb = TranslateContentBounds(scFrameBounds, scContentBounds, rotDegrees);
+                }
+
+                RenderBackground(g, rfb, tstyle);
+                RenderTextAndFigure(g, rfb, rcb, rotDegrees, tstyle);
+
+                if (rotDegrees != RotateDegrees.None)
+                    g.ResetTransform();
+
+                tstyle.RenderBorder(g, scFrameBounds);
+
+                if (tstyle.DropShadow.Enabled == Tbool.True)
+                    tstyle.DropShadow.RenderDropShadow(g, scFrameBounds, true, true);
+            }
+        }
+
+        #region TransformBounds
+
+        private void TransformBounds(Graphics g, Rectangle rfb, RotateDegrees rotDegrees)
+        {
+            switch (rotDegrees)
+            {
+                case RotateDegrees.Rotate90:
+                    g.TranslateTransform(rfb.Right, rfb.Y);
+                    g.RotateTransform(90);
+                    break;
+
+                case RotateDegrees.Rotate180:
+                    g.TranslateTransform(rfb.Right, rfb.Bottom);
+                    g.RotateTransform(-180);
+                    break;
+
+                case RotateDegrees.Rotate270:
+                    g.TranslateTransform(rfb.X, rfb.Bottom);
+                    g.RotateTransform(-90);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region TranslateFrameBounds
+
+        private Rectangle TranslateFrameBounds(Rectangle rfb, RotateDegrees rotDegrees)
+        {
+            Rectangle tfb = new Rectangle(0, 0, rfb.Width, rfb.Height);
+
+            switch (rotDegrees)
+            {
+                case RotateDegrees.Rotate90:
+                case RotateDegrees.Rotate270:
+                    tfb.Width = rfb.Height;
+                    tfb.Height = rfb.Width;
+                    break;
+            }
+
+            return (tfb);
+        }
+
+        #endregion
+
+        #region TranslateContentBounds
+
+        private Rectangle TranslateContentBounds(Rectangle rfb, Rectangle rcb, RotateDegrees rotDegrees)
+        {
+            Rectangle tcb = new Rectangle(rcb.X - rfb.X, rcb.Y - rfb.Y, rcb.Width, rcb.Height);
+
+            switch (rotDegrees)
+            {
+                case RotateDegrees.Rotate90:
+                    int X = tcb.X;
+                    tcb.X = tcb.Y;
+                    tcb.Y = X;
+
+                    tcb.Width = rcb.Height;
+                    tcb.Height = rcb.Width;
+                    break;
+
+                case RotateDegrees.Rotate270:
+                    int X1 = tcb.X;
+                    tcb.X = tcb.Y;
+                    tcb.Y = X1;
+
+                    tcb.Width = rcb.Height;
+                    tcb.Height = rcb.Width;
+                    break;
+            }
+
+            return (tcb);
+        }
+
+        #endregion
+
+        #region CalcImageBounds
+
+        private Rectangle CalcImageBounds(
+            Rectangle rfb, RotateDegrees rotDegrees, ChartTitleVisualStyle style)
+        {
+            if (style.BorderThickness.IsEmpty == false)
+            {
+                switch (rotDegrees)
+                {
+                    case RotateDegrees.Rotate90:
+                        rfb.X += Dpi.Height(style.BorderThickness.Top);
+                        rfb.Width -= Dpi.Height(style.BorderThickness.Vertical);
+
+                        rfb.Y += Dpi.Width(style.BorderThickness.Right);
+                        rfb.Height -= Dpi.Width(style.BorderThickness.Horizontal);
+                        break;
+
+                    case RotateDegrees.Rotate270:
+                        rfb.X += Dpi.Height(style.BorderThickness.Bottom);
+                        rfb.Width -= Dpi.Height(style.BorderThickness.Vertical);
+
+                        rfb.Y += Dpi.Width(style.BorderThickness.Left);
+                        rfb.Height -= Dpi.Width(style.BorderThickness.Horizontal);
+                        break;
+
+                    case RotateDegrees.Rotate180:
+                        rfb.X += Dpi.Width(style.BorderThickness.Right);
+                        rfb.Width -= Dpi.Width(style.BorderThickness.Horizontal);
+
+                        rfb.Y += Dpi.Height(style.BorderThickness.Bottom);
+                        rfb.Height -= Dpi.Height(style.BorderThickness.Vertical);
+                        break;
+
+                    default:
+                        rfb.X += Dpi.Width(style.BorderThickness.Left);
+                        rfb.Width -= Dpi.Width(style.BorderThickness.Horizontal);
+
+                        rfb.Y += Dpi.Height(style.BorderThickness.Top);
+                        rfb.Height -= Dpi.Height(style.BorderThickness.Vertical);
+                        break;
+                }
+            }
+
+            return (rfb);
+        }
+
+        #endregion
+
+        #region RenderBackground
+
+        private void RenderBackground(
+            Graphics g, Rectangle r, ChartTitleVisualStyle style)
+        {
+            if (r.Width > 2 && r.Height > 2)
+            {
+                using (Brush br = style.Background.GetBrush(r))
+                    g.FillRectangle(br, r);
+            }
+        }
+
+        #endregion
+
+        #region RenderTextAndFigure
+
+        private void RenderTextAndFigure(Graphics g, Rectangle rfb,
+            Rectangle rcb, RotateDegrees rotDegrees, ChartTitleVisualStyle tstyle)
+        {
+            Rectangle rib = Rectangle.Empty;
+
+            object figure = tstyle.GetFigure();
+
+            if (figure != null)
+            {
+                rib = CalcImageBounds(rfb, rotDegrees, tstyle);
+
+                if (tstyle.ImageOverlay != ImageOverlay.Top)
+                    RenderFigure(g, figure, rib, tstyle);
+            }
+
+            RenderText(g, rcb, tstyle);
+
+            if (figure != null)
+            {
+                if (tstyle.ImageOverlay == ImageOverlay.Top)
+                    RenderFigure(g, figure, rib, tstyle);
+            }
+        }
+
+        #region RenderFigure
+
+        private void RenderFigure(Graphics g,
+            object figure, Rectangle r, ChartTitleVisualStyle tstyle)
+        {
+            Rectangle t = tstyle.GetFigureBounds(g, r);
+
+            t.Intersect(r);
+
+            if (t.Width > 0 && t.Height > 0)
+            {
+                SymbolDef sd = figure as SymbolDef;
+
+                if (sd != null && sd.IsValidSymbol == true)
+                {
+                    using (Brush br = new SolidBrush(sd.SymbolColor))
+                        g.DrawString(sd.SymbolRealized, sd.SymbolFont, br, t);
+                }
+                else
+                {
+                    Image image = figure as Image;
+
+                    if (image != null)
+                        g.DrawImage(image, t);
+                }
+            }
+        }
+
+        #endregion
+
+        #region RenderText
+
+        private void RenderText(
+            Graphics g, Rectangle r, ChartTitleVisualStyle style)
+        {
+            if (r.Width > 0 && r.Height > 0)
+            {
+                string s = Text;
+
+                if (string.IsNullOrEmpty(s) == false)
+                {
+                    if (TextMarkup != null)
+                    {
+                        RenderTextMarkup(g, r, style);
+                    }
+                    else
+                    {
+                        using (SolidBrush br = new SolidBrush(style.TextColor))
+                        {
+                            using (StringFormat sf = new StringFormat())
+                            {
+                                style.GetStringFormatFlags(sf);
+
+                                if (style.MaxLineCount <= 1)
+                                    sf.FormatFlags |= StringFormatFlags.NoWrap;
+
+                                if (r.Height > _TextHeight)
+                                {
+                                    if (sf.LineAlignment == StringAlignment.Center)
+                                    {
+                                        r.Y += (r.Height - _TextHeight) / 2;
+                                        r.Height = _TextHeight;
+                                    }
+                                }
+
+                                g.DrawString(Text, style.Font, br, r, sf);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        #region RenderTextMarkup
+
+        private void RenderTextMarkup(
+            Graphics g, Rectangle r, ChartTitleVisualStyle style)
+        {
+            MarkupDrawContext d =
+                new MarkupDrawContext(g, style.Font, style.TextColor, false);
+
+            TextMarkup.Arrange(r, d);
+
+            Size size = TextMarkup.Bounds.Size;
+
+            switch (style.Alignment)
+            {
+                case Alignment.MiddleLeft:
+                case Alignment.MiddleCenter:
+                case Alignment.MiddleRight:
+                    if (r.Height > size.Height)
+                        r.Y += (r.Height - size.Height) / 2;
+                    break;
+
+                default:
+                    if (r.Height > size.Height)
+                        r.Y = r.Bottom - size.Height;
+                    break;
+            }
+
+            TextMarkup.Bounds = new Rectangle(r.Location, size);
+
+            Region oldClip = g.Clip;
+
+            try
+            {
+                g.SetClip(r, CombineMode.Intersect);
+
+                TextMarkup.Render(d);
+            }
+            finally
+            {
+                g.Clip = oldClip;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region GetRotateDegrees
+
+        private RotateDegrees GetRotateDegrees(ChartTitleVisualStyle style)
+        {
+            switch (RotateDegrees)
+            {
+                case RotateDegrees.Auto:
+                case RotateDegrees.NotSet:
+
+                switch (XyAlignment)
+                {
+                    case XyAlignment.Left:
+                        return (RotateDegrees.Rotate270);
+
+                    case XyAlignment.Right:
+                        return (RotateDegrees.Rotate90);
+
+                    default:
+                        return (RotateDegrees.None);
+                }
+            }
+
+            return (RotateDegrees);
+        }
+
+        #endregion
+
+        #region Style Support
+
+        #region ApplyStyles
+
+        public override void ApplyStyles(BaseVisualStyle style)
+        {
+            ChartTitleVisualStyle tstyle = style as ChartTitleVisualStyle;
+
+            if (tstyle != null)
+            {
+                ApplyParentStyles(tstyle, Parent as ChartContainer);
+
+                tstyle.ApplyStyle(ChartTitleVisualStyle);
+
+                tstyle.ApplyDefaults();
+            }
+        }
+
+        #endregion
+
+        #region ApplyParentStyles
+
+        private void ApplyParentStyles(ChartTitleVisualStyle tstyle, ChartContainer item)
+        {
+            if (item != null)
+            {
+                ApplyParentStyles(tstyle, item.Parent as ChartContainer);
+
+                if (item is ChartPanel)
+                    tstyle.ApplyStyle(((ChartPanel)item).DefaultVisualStyles.ChartTitleVisualStyle);
+            }
+            else
+            {
+                tstyle.ApplyStyle(ChartControl.BaseVisualStyles.ChartTitleVisualStyle);
+                tstyle.ApplyStyle(ChartControl.DefaultVisualStyles.ChartTitleVisualStyle);
+            }
+        }
+
+        #endregion
+
+        #region InvalidateStyle
+
+        ///<summary>
+        ///Invalidate the cached Styles
+        ///</summary>
+        public void InvalidateStyle()
+        {
+            ClearEffectiveStyles();
+        }
+
+        #endregion
+
+        #region ClearEffectiveStyles
+
+        protected override void ClearEffectiveStyles()
+        {
+            base.ClearEffectiveStyles();
+
+            _EffectiveTitleStyle.InvalidateStyle();
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Copy/CopyTo
+
+        public override ChartVisualElement Copy()
+        {
+            ChartTitle copy = new ChartTitle();
+
+            CopyTo(copy);
+
+            return (copy);
+        }
+
+        public override void CopyTo(ChartVisualElement copy)
+        {
+            ChartTitle c = copy as ChartTitle;
+
+            if (c != null)
+            {
+                base.CopyTo(c);
+
+                c.ChartTitleVisualStyle = 
+                    (_ChartTitleVisualStyle != null) ? ChartTitleVisualStyle.Copy() : null;
+
+                c.RotateDegrees = RotateDegrees;
+                c.XyAlignment = XyAlignment;
+            }
+        }
+
+        #endregion
+
+        #region GetSerialData
+
+        internal override SerialElementCollection GetSerialData(string serialName)
+        {
+            SerialElementCollection sec = new SerialElementCollection();
+
+            if (serialName != null)
+            {
+                if (serialName.Equals("") == true)
+                    serialName = "ChartTitle";
+
+                sec.AddStartElement(serialName);
+            }
+
+            if (_ChartTitleVisualStyle != null && _ChartTitleVisualStyle.IsEmpty == false)
+                sec.AddElement(_ChartTitleVisualStyle.GetSerialData("ChartTitleVisualStyle"));
+
+            sec.AddValue("RotateDegrees", RotateDegrees, RotateDegrees.NotSet);
+            sec.AddValue("XyAlignment", XyAlignment, XyAlignment.NotSet);
+
+            sec.AddElement(base.GetSerialData(null));
+
+            if (serialName != null)
+                sec.AddEndElement(serialName);
+
+            return (sec);
+        }
+
+        #endregion
+
+        #region PutSerialData
+
+        #region ProcessValue
+
+        internal override void ProcessValue(SerialElement se)
+        {
+            switch (se.Name)
+            {
+                case "RotateDegrees":
+                    RotateDegrees = (RotateDegrees)se.GetValueEnum(typeof(RotateDegrees));
+                    break;
+
+                case "XyAlignment":
+                    XyAlignment = (XyAlignment)se.GetValueEnum(typeof(XyAlignment));
+                    break;
+
+                default:
+                    base.ProcessValue(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region ProcessCollection
+
+        internal override void ProcessCollection(SerialElement se)
+        {
+            SerialElementCollection sec = se.Sec;
+
+            switch (se.Name)
+            {
+                case "ChartTitleVisualStyle":
+                    sec.PutSerialData(ChartTitleVisualStyle);
+                    break;
+
+                default:
+                    base.ProcessCollection(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region States
+
+        [Flags]
+        private enum States : uint
+        {
+        }
+
+        #region TestState
+
+        private bool TestState(States state)
+        {
+            return ((_States & state) == state);
+        }
+
+        #endregion
+
+        #region SetState
+
+        private void SetState(States state, bool value)
+        {
+            if (value == true)
+                _States |= state;
+            else
+                _States &= ~state;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IDisposable
+
+        public override void Dispose()
+        {
+            ChartTitleVisualStyle = null;
+
+            base.Dispose();
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/DataBinder.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/DataBinder.cs
new file mode 100644
index 00000000..b95a0f94
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/DataBinder.cs	
@@ -0,0 +1,1126 @@
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.Data;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Charts
+{
+    ///<summary>
+    /// DataBinding helper class
+    ///</summary>
+    public class DataBinder : IDisposable
+    {
+        #region Private variables
+
+        private readonly ChartControl _ChartControl;
+        private readonly BaseChart _Chart;
+        private readonly BaseSeries _Series;
+
+        private CurrencyManager _CurrencyManager;
+        private PropertyDescriptorCollection _Pdc;
+        private DataView _DataView;
+
+        private BindingSource _BindingSource;
+        private BindingSource _BaseBindingSource;
+        private object _BaseDataSource;
+        private string _BaseDataMember;
+
+        private bool _NotificationAutogen;
+        private bool _NotificationInProgress;
+
+        private int _SeriesCount;
+
+        #endregion
+
+        ///<summary>
+        /// DataBinding
+        ///</summary>
+        ///<param name="panel"></param>
+        internal DataBinder(BaseChart chart)
+        {
+            _Chart = chart;
+            _ChartControl = chart.ChartControl;
+        }
+
+        internal DataBinder(BaseSeries series)
+        {
+            _Series = series;
+
+            _Chart = series.Parent as BaseChart;
+            _ChartControl = _Chart.ChartControl;
+        }
+
+        #region Internal properties
+
+        #region BaseDataMember
+
+        internal string BaseDataMember
+        {
+            get { return (_BaseDataMember); }
+            set { _BaseDataMember = value; }
+        }
+
+        #endregion
+
+        #region BaseDataSource
+
+        internal object BaseDataSource
+        {
+            get { return (_BaseDataSource); }
+            set { _BaseDataSource = value; }
+        }
+
+        #endregion
+
+        #region CurrencyManager
+
+        internal CurrencyManager CurrencyManager
+        {
+            get { return (_CurrencyManager); }
+
+            set
+            {
+                if (_CurrencyManager != value)
+                {
+                    if (_CurrencyManager != null)
+                        _CurrencyManager.ListChanged -= CurrencyManagerListChanged;
+
+                    _CurrencyManager = value;
+                    _BaseBindingSource = null;
+
+                    if (_CurrencyManager != null)
+                    {
+                        _Pdc = CurrencyManager.GetItemProperties();
+                        _BaseBindingSource = _BaseDataSource as BindingSource;
+
+                        _CurrencyManager.ListChanged += CurrencyManagerListChanged;
+                    }
+                    else
+                    {
+                        _Pdc = null;
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region DataView
+
+        internal DataView DataView
+        {
+            get { return (_DataView); }
+            set { _DataView = value; }
+        }
+
+        #endregion
+
+        #region GetValue
+
+        internal object GetValue(int index, string name)
+        {
+            if (CurrencyManager != null && _Pdc != null)
+            {
+                if ((uint)index < CurrencyManager.List.Count)
+                {
+                    object dataItem = CurrencyManager.List[index];
+
+                    PropertyDescriptorCollection pdc = GetPdc(dataItem);
+                    PropertyDescriptor pd = FindPropertyDescriptor(pdc, name);
+
+                    if (pd != null)
+                        return (pd.GetValue(dataItem));
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region Pdc
+
+        internal PropertyDescriptorCollection Pdc
+        {
+            get { return (_Pdc); }
+            set { _Pdc = value; }
+        }
+
+        #endregion
+
+        #region RowCount
+
+        internal int RowCount
+        {
+            get
+            {
+                if (CurrencyManager != null)
+                    return (CurrencyManager.Count);
+
+                return (0);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Clear
+
+        internal void Clear()
+        {
+            CurrencyManager = null;
+        }
+
+        #endregion
+
+        #region DataConnect
+
+        internal object DataConnect(object dataSource, string dataMember)
+        {
+            _BaseDataSource = dataSource;
+            _BaseDataMember = dataMember;
+
+            if (_BaseDataSource != null)
+            {
+                _BindingSource = _BaseDataSource as BindingSource;
+
+                if (_BindingSource != null)
+                {
+                    BindingSource bs = _BindingSource.DataSource as BindingSource;
+
+                    if (bs != null)
+                    {
+                        if (string.IsNullOrEmpty(_BindingSource.DataMember) == false)
+                            _BaseDataMember = _BindingSource.DataMember;
+                        else
+                            _BindingSource = null;
+
+                        while (bs.DataSource is BindingSource)
+                            bs = (BindingSource)bs.DataSource;
+
+                        DataSet dss = bs.DataSource as DataSet;
+
+                        if (dss != null)
+                        {
+                            DataRelation dsr = dss.Relations[_BaseDataMember];
+
+                            if (dsr != null)
+                            {
+                                _BaseDataSource = dss;
+                                _BaseDataMember = dsr.ChildTable.TableName;
+                            }
+                        }
+                    }
+                    else
+                    {
+                        _BaseDataSource = _BindingSource.DataSource;
+                        _BaseDataMember = _BindingSource.DataMember;
+                    }
+                }
+
+                DataView = null;
+
+                if (_BaseDataSource is DataSet)
+                    return (AddDataSetTable((DataSet)_BaseDataSource, _BaseDataMember));
+
+                if (_BaseDataSource is DataTable)
+                    return (AddDataTable((DataTable)_BaseDataSource));
+
+                if (_BaseDataSource is IListSource)
+                    return (AddList(((IListSource)_BaseDataSource).GetList()));
+                
+                return (AddList(_BaseDataSource));
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region AddList
+
+        internal object AddList(object source)
+        {
+            bool autogen = _Chart.AutoGenSeriesCollection;
+
+            if (_ChartControl.DoDataBindingStartEvent(_Chart, source, ref autogen) == false)
+                return (AddList(source, autogen));
+
+            return (null);
+        }
+
+        internal object AddList(object source, bool autogen)
+        {
+            if (_Series == null)
+            {
+                if (SetDataConnection(source, autogen) == true)
+                    ProcessAddList(source, autogen);
+            }
+            else
+            {
+                SetDataConnection(source, false);
+            }
+
+            return (source);
+        }
+
+        #region ProcessAddList
+
+        private void ProcessAddList(object source, bool autogen)
+        {
+            if (_Pdc != null)
+            {
+                if (autogen == true && _ChartControl.DesignerHosted == false)
+                    AutoGenerateListSeries(source);
+
+                foreach (ChartSeries series in _Chart.BaseSeries)
+                    series.NeedToUpdateBindings = true;
+            }
+        }
+
+        #region AutoGenerateListSeries
+
+        private void AutoGenerateListSeries(object source)
+        {
+            string nameSeries = _Chart.DataPropertyNameSeries;
+
+            string nameX = GetListNameX(nameSeries);
+            CustomCollection<string> namesY = GetListNamesY(nameSeries, nameX);
+
+            if (string.IsNullOrEmpty(nameSeries) == true)
+                AutoGenListSeriesSingle(nameX, namesY);
+            else
+                AutoGenListSeriesMultiple(source, nameSeries, nameX, namesY);
+        }
+
+        #region AutoGenListSeriesSingle
+
+        private void AutoGenListSeriesSingle(
+            string nameX, CustomCollection<string> namesY)
+        {
+            BaseSeries series = _Chart.GetNewSeries();
+
+            series.DataPropertyNameX = nameX;
+            series.DataPropertyNamesY = namesY;
+
+            SetAutoSeriesId(series);
+
+            _Chart.AddChartSeries(series);
+        }
+
+        #endregion
+
+        #region AutoGenListSeriesMultiple
+
+        private void AutoGenListSeriesMultiple(object source,
+            string nameSeries, string nameX, CustomCollection<string> namesY)
+        {
+            PropertyDescriptor pdSeries = FindListPd(nameSeries);
+
+            if (pdSeries == null)
+                throw new Exception("List series name not found (" + nameSeries + ")");
+
+            object lastSeriesKey = null;
+
+            IList list = source as IList;
+
+            if (list != null)
+            {
+                for (int i = 0; i < list.Count; i++)
+                {
+                    object o = list[i];
+
+                    if (o != null)
+                    {
+                        object seriesKey = pdSeries.GetValue(o);
+
+                        if ((lastSeriesKey != null) && (seriesKey != lastSeriesKey))
+                            AddAutoGenSeries(lastSeriesKey, nameSeries, nameX, namesY);
+
+                        lastSeriesKey = seriesKey;
+                    }
+                }
+
+                if (lastSeriesKey != null)
+                    AddAutoGenSeries(lastSeriesKey, nameSeries, nameX, namesY);
+            }
+        }
+
+        #endregion
+
+        #region GetListNameX
+
+        private string GetListNameX(string nameSeries)
+        {
+            string nameX = _Chart.DataPropertyNameX;
+
+            if (string.IsNullOrEmpty(nameX) == false)
+            {
+                if (FindListPd(nameX) == null)
+                    throw new Exception("Cannot find List Property (" + nameX + ")");
+
+                return (nameX);
+            }
+
+            bool emptyNameSeries = string.IsNullOrEmpty(nameSeries);
+
+            foreach (PropertyDescriptor pd in _Pdc)
+            {
+                if (IsAccessibleItem(pd) == true)
+                {
+                    if (emptyNameSeries == true || emptyNameSeries.Equals(pd.Name) == false)
+                        return (pd.Name);
+                }
+            }
+
+            throw new Exception("Cannot determine auto-assigned DataPropertyNameX.");
+        }
+
+        #endregion
+
+        #region GetListNamesY
+
+        private CustomCollection<string>
+            GetListNamesY(string nameSeries, string nameX)
+        {
+            CustomCollection<string> namesY = _Chart.DataPropertyNamesY;
+
+            if (namesY == null)
+                namesY = new CustomCollection<string>();
+
+            if (namesY.Count == 0)
+            {
+                int countY = _Chart.GetAutoGenSeriesNameCount();
+
+                foreach (PropertyDescriptor pd in _Pdc)
+                {
+                    if (IsAccessibleItem(pd) == true)
+                    {
+                        if ((nameSeries == null || nameSeries.Equals(pd.Name) == false)
+                            && nameX.Equals(pd.Name) == false)
+                        {
+                            namesY.Add(pd.Name);
+
+                            if (--countY == 0)
+                                return (namesY);
+                        }
+                    }
+                }
+
+                throw new Exception("Cannot determine auto-assigned DataPropertyNamesY.");
+            }
+
+            return (namesY);
+        }
+
+        #endregion
+
+        #region FindListPd
+
+        private PropertyDescriptor FindListPd(string nameX)
+        {
+            foreach (PropertyDescriptor pd in _Pdc)
+            {
+                if (IsAccessibleItem(pd) == true)
+                {
+                    if (pd.Name.Equals(nameX) == true)
+                        return (pd);
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region IsAccessibleItem
+
+        private bool IsAccessibleItem(PropertyDescriptor pd)
+        {
+            if (pd.PropertyType.IsInterface == false)
+            {
+                if (IsNestedList(pd.PropertyType.Name) == false && IsVisibleItem(pd) == true)
+                    return (true);
+            }
+
+            return (false);
+        }
+
+        #region IsNestedList
+
+        private bool IsNestedList(string name)
+        {
+            return (name.Equals("List`1") || name.Equals("BindingList`1"));
+        }
+
+        #endregion
+    
+        #region IsVisibleItem
+
+        private bool IsVisibleItem(PropertyDescriptor pd)
+        {
+            foreach (Attribute attr in pd.Attributes)
+            {
+                IsVisibleToChartControl dattr = attr as IsVisibleToChartControl;
+
+                if (dattr != null)
+                    return (dattr.Visible);
+            }
+
+            return (true);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region AddDataSetTable
+
+        internal object AddDataSetTable(DataSet dataSet, string dataMember)
+        {
+            if (string.IsNullOrEmpty(dataMember) && dataSet.Tables.Count > 0)
+                dataMember = dataSet.Tables[0].TableName;
+
+            if (string.IsNullOrEmpty(dataMember) == false)
+                return (AddDataTable(dataSet.Tables[dataMember]));
+
+            return (null);
+        }
+
+        #endregion
+
+        #region AddDataTable
+
+        internal object AddDataTable(DataTable dt)
+        {
+            if (_Series == null)
+            {
+                bool autogen = _Chart.AutoGenSeriesCollection;
+
+                if (_ChartControl.DoDataBindingStartEvent(_Chart, dt, ref autogen) == false)
+                {
+                    if (SetDataConnection(dt, autogen) == true)
+                    {
+                        if (CurrencyManager != null)
+                            ProcessAddDataTable(dt, autogen);
+                    }
+                }
+            }
+            else
+            {
+                SetDataConnection(dt, false);
+            }
+
+            return (dt);
+        }
+
+        #region ProcessAddDataTable
+
+        private void ProcessAddDataTable(DataTable dt, bool autogen)
+        {
+            if (autogen == true && _ChartControl.DesignerHosted == false)
+                AutoGenerateDataTableSeries(dt);
+
+            dt.DefaultView.RowFilter = "";
+
+            DataView = dt.DefaultView;
+
+            ChartBaseSeriesCollection baseSeries = _Chart.BaseSeries;
+
+            foreach (BaseSeries series in baseSeries)
+                series.NeedToUpdateBindings = true;
+        }
+
+        #region AutoGenerateDataTableSeries
+
+        private void AutoGenerateDataTableSeries(DataTable dt)
+        {
+            string nameSeries = _Chart.DataPropertyNameSeries;
+
+            string nameX = GetDataTableNameX(dt, nameSeries);
+            CustomCollection<string> namesY = GetDataTableNamesY(dt, nameSeries, nameX);
+
+            if (string.IsNullOrEmpty(nameSeries) == true)
+                AutoGenDataTableSeriesSingle(dt, nameX, namesY);
+            else
+                AutoGenDataTableSeriesMultiple(dt, nameSeries, nameX, namesY);
+        }
+
+        #region AutoGenDataTableSeriesSingle
+
+        private void AutoGenDataTableSeriesSingle(
+            DataTable dt, string nameX, CustomCollection<string> namesY)
+        {
+            BaseSeries series = _Chart.GetNewSeries();
+
+            series.DataPropertyNameX = nameX;
+            series.DataPropertyNamesY = namesY;
+
+            SetAutoSeriesId(series);
+
+            _Chart.AddChartSeries(series);
+        }
+
+        #endregion
+
+        #region AutoGenDataTableSeriesMultiple
+
+        private void AutoGenDataTableSeriesMultiple(DataTable dt,
+            string nameSeries, string nameX, CustomCollection<string> namesY)
+        {
+            DataColumn dtSeries = FindDataColumn(dt, nameSeries);
+
+            if (dtSeries == null)
+                throw new Exception("DataTable series name not found (" + nameSeries + ")");
+
+            object lastSeriesKey = null;
+
+            for (int i = 0; i < CurrencyManager.Count; i++)
+            {
+                DataRowView view = CurrencyManager.List[i] as DataRowView;
+
+                if (view != null)
+                {
+                    object seriesKey = view.Row.ItemArray[dtSeries.Ordinal];
+
+                    if ((lastSeriesKey != null) && (seriesKey != lastSeriesKey))
+                        AddAutoGenSeries(lastSeriesKey, nameSeries, nameX, namesY);
+
+                    lastSeriesKey = seriesKey;
+                }
+            }
+
+            if (lastSeriesKey != null)
+                AddAutoGenSeries(lastSeriesKey, nameSeries, nameX, namesY);
+        }
+
+        #region AddAutoGenSeries
+
+        private void AddAutoGenSeries(object seriesKey,
+            string nameSeries, string nameX, CustomCollection<string> namesY)
+        {
+            string name = seriesKey.ToString();
+
+            if (FindChartSeries(name) == null)
+            {
+                BaseSeries series = _Chart.GetNewSeries();
+
+                series.SeriesId = ++_SeriesCount;
+                series.Name = name;
+
+                series.SeriesKey = seriesKey;
+
+                series.DataPropertyNameSeries = nameSeries;
+                series.DataPropertyNameX = nameX;
+                series.DataPropertyNamesY = namesY;
+
+                _Chart.AddChartSeries(series);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetDataTableNameX
+
+        private string GetDataTableNameX(DataTable dt, string nameSeries)
+        {
+            string nameX = _Chart.DataPropertyNameX;
+
+            if (string.IsNullOrEmpty(nameX) == false)
+            {
+                if (FindDataColumn(dt, nameX) == null)
+                    throw new Exception("Cannot find DataColumn (" + nameX + ")");
+
+                return (nameX);
+            }
+
+            bool emptyNameSeries = string.IsNullOrEmpty(nameSeries);
+
+            foreach (DataColumn dtColumn in dt.Columns)
+            {
+                if ((dtColumn.ColumnMapping & MappingType.Hidden) != MappingType.Hidden)
+                {
+                    if (emptyNameSeries == true || emptyNameSeries.Equals(dtColumn.ColumnName) == false)
+                        return (dtColumn.ColumnName);
+                }
+            }
+
+            throw new Exception("Cannot determine auto-assigned DataPropertyNameX.");
+        }
+
+        #endregion
+
+        #region GetDataTableNamesY
+
+        private CustomCollection<string> 
+            GetDataTableNamesY(DataTable dt, string nameSeries, string nameX)
+        {
+            CustomCollection<string> namesY = _Chart.DataPropertyNamesY;
+
+            if (namesY == null)
+                namesY = new CustomCollection<string>();
+
+            if (namesY.Count == 0)
+            {
+                int countY = _Chart.GetAutoGenSeriesNameCount();
+
+                foreach (DataColumn dtColumn in dt.Columns)
+                {
+                    if ((dtColumn.ColumnMapping & MappingType.Hidden) != MappingType.Hidden)
+                    {
+                        if ((nameSeries == null || nameSeries.Equals(dtColumn.ColumnName) == false)
+                            && nameX.Equals(dtColumn.ColumnName) == false)
+                        {
+                            namesY.Add(dtColumn.ColumnName);
+
+                            if (--countY == 0)
+                                return (namesY);
+                        }
+                    }
+                }
+
+                throw new Exception("Cannot determine auto-assigned DataPropertyNamesY.");
+            }
+
+            return (namesY);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region FindDataColumn
+
+        private DataColumn FindDataColumn(DataTable dt, string name)
+        {
+            if (string.IsNullOrEmpty(name) == false)
+            {
+                foreach (DataColumn dtColumn in dt.Columns)
+                {
+                    if ((dtColumn.ColumnMapping & MappingType.Hidden) != MappingType.Hidden)
+                    {
+                        if (dtColumn.ColumnName.Equals(name) == true)
+                            return (dtColumn);
+                    }
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region SetAutoSeriesId
+
+        private void SetAutoSeriesId(BaseSeries series)
+        {
+            series.SeriesId = ++_SeriesCount;
+
+            series.Name = GetUniqueSeriesName(series);
+        }
+
+        #region GetUniqueSeriesName
+
+        private string GetUniqueSeriesName(BaseSeries series)
+        {
+            string name = "Series" + series.SeriesId;
+
+            while (FindChartSeries(name) != null)
+                name += "*";
+
+            return (name);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region SetDataConnection
+
+        private bool SetDataConnection(object dataSource, bool autogen)
+        {
+            ClearDataNotification(dataSource);
+
+            if (_BindingSource != null || _ChartControl.BindingContext != null)
+                SetDataNotification(dataSource, autogen);
+
+            return (_NotificationInProgress == false);
+        }
+
+        #endregion
+
+        #region SetDataNotification
+
+        private void SetDataNotification(object dataSource, bool autogen)
+        {
+            ISupportInitializeNotification notification =
+                dataSource as ISupportInitializeNotification;
+
+            if (notification == null || notification.IsInitialized == true)
+            {
+                CurrencyManager = (_BindingSource != null)
+                    ? _BindingSource.CurrencyManager
+                    : _ChartControl.BindingContext[DataView ?? dataSource] as CurrencyManager;
+            }
+            else
+            {
+                CurrencyManager = null;
+
+                if (_NotificationInProgress == false)
+                {
+                    _NotificationInProgress = true;
+                    _NotificationAutogen = autogen;
+
+                    notification.Initialized += DataSourceInitialized;
+                }
+            }
+        }
+
+        #endregion
+
+        #region ClearDataNotification
+
+        private void ClearDataNotification(object dataSource)
+        {
+            ISupportInitializeNotification notification =
+                dataSource as ISupportInitializeNotification;
+
+            if (notification != null && _NotificationInProgress == true)
+            {
+                notification.Initialized -= DataSourceInitialized;
+
+                _NotificationInProgress = false;
+                _NotificationAutogen = false;
+            }
+        }
+
+        #endregion
+
+        #region DataSourceInitialized
+
+        private void DataSourceInitialized(object sender, EventArgs e)
+        {
+            ISupportInitializeNotification dataSource =
+                _Chart.DataSource as ISupportInitializeNotification;
+
+            if (dataSource != null)
+            {
+                _NotificationInProgress = false;
+
+                dataSource.Initialized -= DataSourceInitialized;
+
+                CurrencyManager =
+                    _ChartControl.BindingContext[dataSource] as CurrencyManager;
+
+                if (dataSource is DataTable)
+                    ProcessAddDataTable((DataTable)dataSource, _NotificationAutogen);
+                else
+                    ProcessAddList(dataSource, _NotificationAutogen);
+            }
+        }
+
+        #endregion
+
+        #region GetPdc
+
+        private PropertyDescriptorCollection GetPdc(object dataItem)
+        {
+            if (_Chart.EnableDiscreteBoundItems == false)
+                return (_Pdc);
+
+            if (dataItem != null)
+                return (TypeDescriptor.GetProperties(dataItem.GetType()));
+
+            return (null);
+        }
+
+        #endregion
+
+        #region FindPropertyDescriptor
+
+        private PropertyDescriptor FindPropertyDescriptor(
+            PropertyDescriptorCollection pdc, string name)
+        {
+            if (pdc != null)
+            {
+                foreach (PropertyDescriptor pd in pdc)
+                {
+                    if (pd.Name.Equals(name) == true)
+                        return (pd);
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region FindChartSeries
+
+        private BaseSeries FindChartSeries(string name)
+        {
+            ChartBaseSeriesCollection baseSeries = _Chart.BaseSeries;
+
+            foreach (BaseSeries series in baseSeries)
+            {
+                if (name.Equals(series.Name) == true)
+                    return (series);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region LoadSeriesData
+
+        internal void LoadSeriesData(BaseSeries series)
+        {
+            if (_BaseDataSource is DataSet)
+                LoadDataSetTable((DataSet)_BaseDataSource, _BaseDataMember, series);
+
+            else if (_BaseDataSource is DataTable)
+                LoadDataTableSeriesData((DataTable)_BaseDataSource, series);
+
+            else
+                LoadListSeriesData(series);
+        }
+
+        #region LoadDataSetTable
+
+        internal void LoadDataSetTable(DataSet dataSet, string dataMember, BaseSeries series)
+        {
+            if (string.IsNullOrEmpty(dataMember) && dataSet.Tables.Count > 0)
+                dataMember = dataSet.Tables[0].TableName;
+
+            if (string.IsNullOrEmpty(dataMember) == false)
+                LoadDataTableSeriesData(dataSet.Tables[dataMember], series);
+        }
+
+        #endregion
+
+        #region LoadDataTableSeriesData
+
+        private void LoadDataTableSeriesData(DataTable dt, BaseSeries series)
+        {
+            DataColumn dtSeries = FindDataColumn(dt, series.DataPropertyNameSeries);
+            DataColumn dtNameX = FindDataColumn(dt, series.DataPropertyNameX);
+
+            if (dtNameX == null)
+                throw new Exception("DataPropertyNameX (" + series.DataPropertyNameX + ") not present in DataTable.");
+
+            DataColumn[] dtNamesY =
+                new DataColumn[series.DataPropertyNamesY.Count];
+
+            for (int i = 0; i < series.DataPropertyNamesY.Count; i++)
+            {
+                string name = series.DataPropertyNamesY[i];
+
+                dtNamesY[i] = FindDataColumn(dt, name);
+
+                if (dtNamesY[i] == null)
+                    throw new Exception("DataPropertyNameY (" + name + ") not present in DataTable.");
+            }
+
+            if (dtSeries == null)
+                LoadDataTableSeriesDataSingle(series, dt, dtNameX, dtNamesY);
+            else
+                LoadDataTableSeriesDataMultiple(series, dt, dtSeries, dtNameX, dtNamesY);
+
+            _ChartControl.DoSeriesDataBindingCompleteEvent(_Chart, series, dt);
+        }
+
+        #region LoadDataTableSeriesDataSingle
+
+        private void LoadDataTableSeriesDataSingle(
+            BaseSeries series, DataTable dt, DataColumn dtNameX, DataColumn[] dtNamesY)
+        {
+            for (int i = 0; i < CurrencyManager.Count; i++)
+            {
+                DataRowView view = CurrencyManager.List[i] as DataRowView;
+
+                if (view != null)
+                    AddDataTableSeriesData(series, dt, dtNameX, dtNamesY, view);
+            }
+        }
+
+        #endregion
+
+        #region LoadDataTableSeriesDataMultiple
+
+        private void LoadDataTableSeriesDataMultiple(BaseSeries series,
+            DataTable dt, DataColumn dtSeries, DataColumn dtNameX, DataColumn[] dtNamesY)
+        {
+            for (int i = 0; i < CurrencyManager.Count; i++)
+            {
+                DataRowView view = CurrencyManager.List[i] as DataRowView;
+
+                if (view != null)
+                {
+                    object seriesKey = view.Row.ItemArray[dtSeries.Ordinal];
+
+                    if (seriesKey == series.SeriesKey || seriesKey.Equals(series.SeriesKey))
+                        AddDataTableSeriesData(series, dt, dtNameX, dtNamesY, view);
+                }
+            }
+        }
+
+        #endregion
+
+        #region AddDataTableSeriesData
+
+        private void AddDataTableSeriesData(BaseSeries series,
+            DataTable dt, DataColumn dtNameX, DataColumn[] dtNamesY, DataRowView view)
+        {
+            object valueX = view.Row.ItemArray[dtNameX.Ordinal];
+
+            object[] valuesY = new object[dtNamesY.Length];
+
+            for (int i = 0; i < dtNamesY.Length; i++)
+            {
+                DataColumn dtcol = dtNamesY[i];
+
+                valuesY[i] = view.Row.ItemArray[dtcol.Ordinal];
+            }
+
+            series.AddSeriesPoint(valueX, valuesY, view);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region LoadListSeriesData
+
+        private void LoadListSeriesData(BaseSeries series)
+        {
+            object source = _BaseDataSource;
+
+            PropertyDescriptor pdSeries = FindListPd(series.DataPropertyNameSeries);
+            PropertyDescriptor pdNameX = FindListPd(series.DataPropertyNameX);
+
+            if (pdNameX == null)
+                throw new Exception("DataPropertyNameX (" + series.DataPropertyNameX + ") not present.");
+
+            PropertyDescriptor[] pdNamesY =
+                new PropertyDescriptor[series.DataPropertyNamesY.Count];
+
+            for (int i = 0; i < series.DataPropertyNamesY.Count; i++)
+            {
+                string name = series.DataPropertyNamesY[i];
+
+                pdNamesY[i] = FindListPd(name);
+
+                if (pdNamesY[i] == null)
+                    throw new Exception("DataPropertyNameY (" + name + ") not present.");
+            }
+
+            if (pdSeries == null)
+                LoadListSeriesDataSingle(series, source, pdNameX, pdNamesY);
+            else
+                LoadListSeriesDataMultiple(series, source, pdSeries, pdNameX, pdNamesY);
+
+            _ChartControl.DoSeriesDataBindingCompleteEvent(_Chart, series, source);
+        }
+
+        #region LoadListSeriesDataSingle
+
+        private void LoadListSeriesDataSingle(
+            BaseSeries series, object source, PropertyDescriptor pdNameX, PropertyDescriptor[] pdNamesY)
+        {
+            IList list = source as IList;
+
+            if (list != null)
+            {
+                for (int i = 0; i < list.Count; i++)
+                {
+                    object o = list[i];
+
+                    AddListSeriesData(series, o, pdNameX, pdNamesY);
+                }
+            }
+        }
+
+        #endregion
+
+        #region LoadListSeriesDataMultiple
+
+        private void LoadListSeriesDataMultiple(BaseSeries series,
+            object source, PropertyDescriptor pdSeries, PropertyDescriptor pgNameX, PropertyDescriptor[] pdNamesY)
+        {
+            IList list = source as IList;
+
+            if (list != null)
+            {
+                for (int i = 0; i < list.Count; i++)
+                {
+                    object o = list[i];
+
+                    object seriesKey = pdSeries.GetValue(o);
+
+                    if (seriesKey == series.SeriesKey || seriesKey.Equals(series.SeriesKey))
+                        AddListSeriesData(series, o, pgNameX, pdNamesY);
+                }
+            }
+        }
+
+        #endregion
+
+        #region AddListSeriesData
+
+        private void AddListSeriesData(BaseSeries series,
+            object o, PropertyDescriptor pdNameX, PropertyDescriptor[] pdNamesY)
+        {
+            object valueX = pdNameX.GetValue(o);
+
+            object[] valuesY = new object[pdNamesY.Length];
+
+            for (int i = 0; i < pdNamesY.Length; i++)
+                valuesY[i] = pdNamesY[i].GetValue(o);
+
+            series.AddSeriesPoint(valueX, valuesY, o);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region CurrencyManagerListChanged
+
+        void CurrencyManagerListChanged(object sender, ListChangedEventArgs e)
+        {
+            if (_CurrencyManager != null)
+                _Chart.InvalidateLayout();
+        }
+
+        #endregion
+
+        #region Dispose
+
+        /// <summary>
+        /// Data Binder Dispose
+        /// </summary>
+        public void Dispose()
+        {
+            CurrencyManager = null;
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/DataLabel.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/DataLabel.cs
new file mode 100644
index 00000000..7940c159
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/DataLabel.cs	
@@ -0,0 +1,408 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing.Design;
+using DevComponents.DotNetBar.Charts;
+using DevComponents.DotNetBar.Charts.Style;
+
+/// <summary>
+/// Represents the collection of DataLabels.
+/// </summary>
+[Editor("DevComponents.Charts.Design.DataLabelCollectionEditor, DevComponents.Charts.Design, " +
+    "Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(UITypeEditor))]
+public class DataLabelCollection : CustomNamedCollection<DataLabel>
+{
+    #region GetUniqueName
+
+    public string GetUniqueName()
+    {
+        return (GetUniqueName("DataLabel"));
+    }
+
+    #endregion
+}
+
+namespace DevComponents.DotNetBar.Charts
+{
+    public class DataLabel : ChartVisualElement, IEffectiveStyle
+    {
+        #region Private variables
+
+        private string _Text;
+
+        private DataLabelVisualStyle _DataLabelVisualStyle;
+        private EffectiveStyle<DataLabelVisualStyle> _EffectiveDataLabelStyle;
+
+        private object _ValueX;
+        private object _ValueY;
+
+        private BarLabelPosition _BarLabelPosition = BarLabelPosition.NotSet;
+
+        #endregion
+
+        #region Constructors
+
+        /// <summary>
+        /// DataLabel
+        /// </summary>
+        /// <param name="sp">Associated SeriesPoint</param>
+        /// <param name="text">Label text</param>
+        public DataLabel(SeriesPoint sp, string text)
+            : this(sp)
+        {
+            _Text = text;
+        }
+
+        /// <summary>
+        /// DataLabel
+        /// </summary>
+        /// <param name="sp">Associated SeriesPoint</param>
+        public DataLabel(SeriesPoint sp)
+            : this()
+        {
+            if (sp.ValueX == null)
+                throw new Exception("DataLabel Value X must be defined.");
+
+            if (sp.ValueY == null || sp.ValueY.Length == 0)
+                throw new Exception("DataLabel Value Y must be defined.");
+
+            ValueX = sp.ValueX;
+            ValueY = sp.ValueY[0];
+        }
+
+        /// <summary>
+        /// DataLabel
+        /// </summary>
+        public DataLabel()
+        {
+            _EffectiveDataLabelStyle = new EffectiveStyle<DataLabelVisualStyle>(this);
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region BarLabelPosition
+
+        /// <summary>
+        /// Gets or sets the position of bar series labels.
+        /// </summary>
+        [DefaultValue(BarLabelPosition.NotSet), Category("Bar Display")]
+        [Description("Indicates the position of bar series labels.")]
+        public BarLabelPosition BarLabelPosition
+        {
+            get { return (_BarLabelPosition); }
+            set { _BarLabelPosition = value; }
+        }
+
+        #endregion
+
+        #region DataLabelVisualStyle
+
+        /// <summary>
+        /// Gets or sets the visual style for the data label.
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates the visual style for the data label.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public DataLabelVisualStyle DataLabelVisualStyle
+        {
+            get
+            {
+                if (_DataLabelVisualStyle == null)
+                {
+                    _DataLabelVisualStyle = new DataLabelVisualStyle();
+
+                    StyleVisualChangeHandler(null, _DataLabelVisualStyle);
+                }
+
+                return (_DataLabelVisualStyle);
+            }
+
+            set
+            {
+                if (_DataLabelVisualStyle != value)
+                {
+                    DataLabelVisualStyle oldValue = _DataLabelVisualStyle;
+
+                    _DataLabelVisualStyle = value;
+
+                    OnVisualStyleChanged("DataLabelVisualStyle", oldValue, value);
+
+                    if (oldValue != null)
+                        oldValue.Dispose();
+                }
+            }
+        }
+
+        #endregion
+
+        #region EffectiveDataLabelStyle
+
+        /// <summary>
+        /// Gets a reference to the DataLabel effective (cached, composite) style.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        [Description("Indicates a reference to the DataLabel effective (cached, composite) style.")]
+        public DataLabelVisualStyle EffectiveDataLabelStyle
+        {
+            get { return (_EffectiveDataLabelStyle.Style); }
+        }
+
+        #endregion
+
+        #region ValueX
+
+        /// <summary>
+        /// Gets or sets the X-Axis Value.
+        /// </summary>
+        [Category("Data")]
+        [Description("Indicates the X-Axis Value.")]
+        [TypeConverter("DevComponents.Charts.Design.PointValueConverter, DevComponents.Charts.Design," +
+            "Version=14.1.0.37, Culture=neutral, PublicKeyToken=90f470f34c89ccaf")]
+        public object ValueX
+        {
+            get { return (_ValueX); }
+            set { _ValueX = value; }
+        }
+
+        #endregion
+
+        #region ValueY
+
+        /// <summary>
+        /// Gets or sets the Y-Axis Value.
+        /// </summary>
+        [Category("Data")]
+        [Description("Indicates the Y-Axis Value.")]
+        [TypeConverter("DevComponents.Charts.Design.PointValueConverter, DevComponents.Charts.Design," +
+            "Version=14.1.0.37, Culture=neutral, PublicKeyToken=90f470f34c89ccaf")]
+        public object ValueY
+        {
+            get { return (_ValueY); }
+            set { _ValueY = value; }
+        }
+
+        #endregion
+
+        #region Text
+
+        ///<summary>
+        /// Gets or sets the DataLabel text.
+        ///</summary>
+        [DefaultValue(null), Category("Appearance")]
+        [Description("Indicates the DataLabel text.")]
+        public string Text
+        {
+            get { return (_Text); }
+
+            set
+            {
+                _Text = value;
+
+                OnPropertyChangedEx("Text", VisualChangeType.Layout);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region MeasureOverride
+
+        protected override void MeasureOverride(ChartLayoutInfo layoutInfo)
+        {
+        }
+
+        #endregion
+
+        #region ArrangeOverride
+
+        protected override void ArrangeOverride(ChartLayoutInfo layoutInfo)
+        {
+        }
+
+        #endregion
+
+        #region RenderOverride
+
+        protected override void RenderOverride(ChartRenderInfo renderInfo)
+        {
+        }
+
+        #endregion
+
+        #region Style handling
+
+        #region ApplyStyles
+
+        public override void ApplyStyles(BaseVisualStyle style)
+        {
+            DataLabelVisualStyle dstyle = style as DataLabelVisualStyle;
+
+            if (dstyle != null)
+            {
+                ChartSeries series = Parent as ChartSeries;
+
+                dstyle.ApplyStyle(series.EffectiveDataLabelStyle);
+                dstyle.ApplyStyle(DataLabelVisualStyle);
+            }
+        }
+
+        #endregion
+
+        #region InvalidateStyle
+
+        ///<summary>
+        ///Invalidate the cached Style definition
+        ///</summary>
+        public void InvalidateStyle()
+        {
+            ClearEffectiveStyles();
+        }
+
+        #endregion
+
+        #region ClearEffectiveStyles
+
+        protected override void ClearEffectiveStyles()
+        {
+            if (_EffectiveDataLabelStyle.InvalidateStyle() == true)
+                InvalidateLayout();
+
+            ChartXy chartXy = ParentChartContainer as ChartXy;
+
+            if (chartXy != null)
+                chartXy.InvalidatePointLabels();
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Copy/CopyTo
+
+        public override ChartVisualElement Copy()
+        {
+            DataLabel copy = new DataLabel();
+
+            CopyTo(copy);
+
+            return (copy);
+        }
+
+        public override void CopyTo(ChartVisualElement copy)
+        {
+            DataLabel c = copy as DataLabel;
+
+            if (c != null)
+            {
+                base.CopyTo(c);
+
+                c.DataLabelVisualStyle =
+                    (_DataLabelVisualStyle != null) ? DataLabelVisualStyle.Copy() : null;
+
+                c.ValueX = ValueX;
+                c.ValueY = ValueY;
+
+                c.Text = (Text != null) ? (string)Text.Clone() : null;
+            }
+        }
+
+        #endregion
+
+        #region GetSerialData
+
+        internal override SerialElementCollection GetSerialData(string serialName)
+        {
+            SerialElementCollection sec = new SerialElementCollection();
+
+            if (serialName != null)
+            {
+                if (serialName.Equals("") == true)
+                    serialName = "DataLabel";
+
+                sec.AddStartElement(serialName);
+            }
+
+            if (_DataLabelVisualStyle != null && _DataLabelVisualStyle.IsEmpty == false)
+                sec.AddElement(_DataLabelVisualStyle.GetSerialData("DataLabelVisualStyle"));
+
+            sec.AddDataValue("ValueX", ValueX, null);
+            sec.AddDataValue("ValueY", ValueY, null);
+
+            sec.AddValue("Text", Text, null);
+
+            sec.AddElement(base.GetSerialData(null));
+
+            if (serialName != null)
+                sec.AddEndElement(serialName);
+
+            return (sec);
+        }
+
+        #endregion
+
+        #region PutSerialData
+
+        #region ProcessValue
+
+        internal override void ProcessValue(SerialElement se)
+        {
+            switch (se.Name)
+            {
+                case "ValueX":
+                    ValueX = se.DataValue;
+                    break;
+
+                case "ValueY":
+                    ValueY = se.DataValue;
+                    break;
+
+                case "Text":
+                    Text = se.StringValue;
+                    break;
+
+                default:
+                    base.ProcessValue(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region ProcessCollection
+
+        internal override void ProcessCollection(SerialElement se)
+        {
+            SerialElementCollection sec = se.Sec;
+
+            switch (se.Name)
+            {
+                case "DataLabelVisualStyle":
+                    sec.PutSerialData(DataLabelVisualStyle);
+                    break;
+
+                default:
+                    base.ProcessCollection(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IDisposable
+
+        public override void Dispose()
+        {
+            DataLabelVisualStyle = null;
+
+            base.Dispose();
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/IOwnerLocalize.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/IOwnerLocalize.cs
new file mode 100644
index 00000000..5f282702
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/IOwnerLocalize.cs	
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/RadialChart/PieChart.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/RadialChart/PieChart.cs
new file mode 100644
index 00000000..2716fb9b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/RadialChart/PieChart.cs	
@@ -0,0 +1,6396 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Drawing.Drawing2D;
+using System.Windows.Forms;
+using DevComponents.Charts.TextMarkup;
+using DevComponents.DotNetBar.Charts.Style;
+
+namespace DevComponents.DotNetBar.Charts
+{
+    public class PieChart : BaseChart, ISeriesPointContainer
+    {
+        #region Private variables
+
+        private ChartPieSeriesCollection _PieSeries;
+
+        private Point _CenterPoint;
+        private PointF _CenterPos = PointF.Empty;
+
+        private double _InnerRadius;
+        private double _InnerRadiusEx = double.NaN;
+
+        private double _OuterRadius = .8d;
+        private double _OuterRadiusEx = double.NaN;
+
+        private double _MaxPieOuterExtent;
+
+        private double _GridInnerRadius;
+        private double _GridInnerRadiusEx = double.NaN;
+
+        private double _GridOuterRadius = 1d;
+        private double _GridOuterRadiusEx = double.NaN;
+
+        private int _MinOuterRadius = 80;
+
+        private PieRadiusScale _PieRadiusScale = PieRadiusScale.Percentage;
+
+        private double _InnerMargin = .02d;
+        private double _InnerMarginEx = double.NaN;
+
+        private double _OuterMargin = 0d;
+        private double _SeriesMargin = .02d;
+
+        private double _ExplodedOffset = .05d;
+        private double _ExplodedMargin = .1d;
+
+        private double _DetachedOffset = .1d;
+        private int _MaxDetachedOffset = 100;
+
+        private double _ExplodedOffsetEx = double.NaN;
+        private int _MaxExplodedOffset = 100;
+
+        private int _MaxRingOutRadius = 48;
+        private int _MinRingOutRadius = 9;
+
+        private string _CenterLabel;
+        private CenterLabelVisibility _CenterLabelVisibility = CenterLabelVisibility.Always;
+        private BodyElement _CenterLabelMarkup;
+
+        private SymbolDef _ScaleSymDef = new SymbolDef();
+        private float _SymFontScale = -1;
+
+        private PieChartVisualStyle _ChartVisualStyle;
+        private EffectiveStyle<PieChartVisualStyle> _EffectiveChartStyle;
+        private EffectiveStyles<PieCenterVisualStyle> _EffectivePieCenterStyles;
+
+        private SliceLabelOverlapMode _SliceLabelOverlapMode = SliceLabelOverlapMode.NotSet;
+
+        private int _RingWeightTotal;
+
+        private PieSeriesPoint _LastHitPsp;
+        private PieSeriesPoint _HitPsp;
+        private ItemHitArea _LastHitArea;
+
+        private Tbool _CenterFirstSlice = Tbool.NotSet;
+        private Tbool _ShowAllRings = Tbool.NotSet;
+        private Tbool _ShowOtherSlice = Tbool.NotSet;
+
+        private MouseClickSliceAction _MouseClickSliceAction = MouseClickSliceAction.NotSet;
+        private MouseDoubleClickSliceAction _MouseDoubleClickSliceAction = MouseDoubleClickSliceAction.NotSet;
+
+        private PieSelectionMode _PieSelectionMode = PieSelectionMode.NotSet;
+        private PieRingOutDisplayMode _PieRingOutDisplayMode = PieRingOutDisplayMode.OnMouseOver;
+
+        private WhitespaceClickBehavior _WhitespaceClickBehavior = WhitespaceClickBehavior.ClearSelection;
+
+        private PspDragType _PspDragType;
+        private Tbool _EnableDragDetach = Tbool.NotSet;
+
+        private double _GridInterval = 10d;
+        private double _GridMinValue = 0d;
+        private double _GridMaxValue = 100d;
+
+        private List<PieLabel> _PieLabels;
+        private Rectangle _RenderBounds;
+
+        private SliceVisualLayout _SubSliceVisualLayout;
+
+        private uint _GlobalSelectionCount;
+
+        private States _States;
+
+        #endregion
+
+        public PieChart(string name)
+            : this()
+        {
+            Name = name;
+        }
+
+        public PieChart()
+        {
+            InitDefaultStates();
+
+            _EffectiveChartStyle = new EffectiveStyle<PieChartVisualStyle>(this);
+            _EffectivePieCenterStyles = new EffectiveStyles<PieCenterVisualStyle>(this);
+        }
+
+        #region InitDefaultStates
+
+        private void InitDefaultStates()
+        {
+            SetState(States.MultiSelect, true);
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region ActualInnerRadius
+
+        /// <summary>
+        /// Gets the actual, calculated inner radius of the pie.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public double ActualInnerRadius
+        {
+            get { return (InnerRadiusEx); }
+        }
+
+        #endregion
+
+        #region ActualOuterRadius
+
+        /// <summary>
+        /// Gets the actual, calculated outer radius of the pie.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public double ActualOuterRadius
+        {
+            get { return (OuterRadiusEx); }
+        }
+
+        #endregion
+
+        #region CenterFirstSlice
+
+        /// <summary>
+        /// Gets or sets whether the first pie slice is centered
+        /// on the starting angle or starts on the starting angle. Default is false.
+        /// </summary>
+        [DefaultValue(Tbool.NotSet), Category("Display")]
+        [Description("Indicates whether the first pie slice is centered on the starting angle or starts on the starting angle. Default is false.")]
+        public Tbool CenterFirstSlice
+        {
+            get { return (_CenterFirstSlice); }
+
+            set
+            {
+                if (value != _CenterFirstSlice)
+                {
+                    _CenterFirstSlice = value;
+
+                    OnPropertyChangedEx("CenterFirstSlice", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region CenterLabel
+
+        /// <summary>
+        /// Gets or sets the text to use for the center hole label.
+        /// </summary>
+        [DefaultValue(null), Category("Label")]
+        [Description("Indicates the text to use for the center hole label.")]
+        [Editor("DevComponents.DotNetBar.Design.TextMarkupUIEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor))]
+        public string CenterLabel
+        {
+            get { return (_CenterLabel); }
+
+            set
+            {
+                if (value != _CenterLabel)
+                {
+                    _CenterLabel = value;
+
+                    MarkupCenterLabelChanged();
+
+                    OnPropertyChangedEx("CenterLabel", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region CenterLabelVisibility
+
+        /// <summary>
+        /// Gets or sets the mode used to determine if/when to display the center label.
+        /// </summary>
+        [DefaultValue(CenterLabelVisibility.Always), Category("Label")]
+        [Description("Indicates the mode used to determine if/when to display the center label.")]
+        public CenterLabelVisibility CenterLabelVisibility
+        {
+            get { return (_CenterLabelVisibility); }
+
+            set
+            {
+                if (value != _CenterLabelVisibility)
+                {
+                    _CenterLabelVisibility = value;
+
+                    OnPropertyChangedEx("CenterLabelVisibility", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region CenterPoint
+
+        /// <summary>
+        /// Gets the calculated center Point for the pie.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public Point CenterPoint
+        {
+            get { return (_CenterPoint); }
+            internal set { _CenterPoint = value; }
+        }
+
+        #endregion
+
+        #region CenterPos
+
+        /// <summary>
+        /// Gets or sets the offset from the default center x,y location of the chart. If
+        /// the values are between -1 and 1, then the offsets are taken as a percentage
+        /// of the width/height, otherwise they are taken as absolute pixel offsets.
+        /// </summary>
+        [Description("Indicates the offset from the default center x,y location of the chart. If the values are between -1 and 1, then the offsets are taken as a percentage of the width/height, otherwise they are taken as absolute pixel offsets.")]
+        [Editor("DevComponents.Charts.Design.PivotPointEditor, DevComponents.Charts.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(UITypeEditor))]
+        [TypeConverter(typeof(PointFConverter))]
+        [Category("Offset")]
+        public PointF CenterPos
+        {
+            get { return (_CenterPos); }
+
+            set
+            {
+                if (value != _CenterPos)
+                {
+                    _CenterPos = value;
+
+                    OnPropertyChangedEx("CenterPos", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeCenterPos()
+        {
+            return (_CenterPos.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetCenterPos()
+        {
+            CenterPos = PointF.Empty;
+        }
+
+        #endregion
+
+        #region ChartSeries
+
+        /// <summary>
+        /// Gets a reference to the collection of PieSeries
+        /// </summary>
+        [Category("Data")]
+        [Description("Indicates the collection of Chart Series.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ChartPieSeriesCollection ChartSeries
+        {
+            get
+            {
+                if (_PieSeries == null)
+                {
+                    _PieSeries = new ChartPieSeriesCollection();
+
+                    _PieSeries.CollectionChanged += ChartSeriesCollectionChanged;
+                }
+
+                return (_PieSeries);
+            }
+
+            internal set
+            {
+                BaseSeries = null;
+
+                if (_PieSeries != null)
+                    _PieSeries.CollectionChanged -= ChartSeriesCollectionChanged;
+
+                _PieSeries = value;
+
+                if (_PieSeries != null)
+                    _PieSeries.CollectionChanged += ChartSeriesCollectionChanged;
+            }
+        }
+
+        #region ChartSeriesCollectionChanged
+
+        void ChartSeriesCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            BaseSeries = null;
+            InvalidateValueCache();
+
+            switch (e.Action)
+            {
+                case NotifyCollectionChangedAction.Add:
+                    foreach (PieSeries item in e.NewItems)
+                        item.Parent = this;
+                    break;
+
+                case NotifyCollectionChangedAction.Replace:
+                    foreach (PieSeries item in e.OldItems)
+                        item.Parent = null;
+
+                    foreach (PieSeries item in e.NewItems)
+                        item.Parent = this;
+                    break;
+
+                case NotifyCollectionChangedAction.Remove:
+                    foreach (PieSeries item in e.OldItems)
+                        item.Parent = null;
+                    break;
+            }
+
+            SeriesRangeChanged = true;
+
+            InvalidateLayout();
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ChartVisualStyles
+
+        /// <summary>
+        /// Gets or sets the visual style for the Chart.
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates the visual style for the Chart.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public PieChartVisualStyle ChartVisualStyle
+        {
+            get
+            {
+                if (_ChartVisualStyle == null)
+                {
+                    _ChartVisualStyle = new PieChartVisualStyle();
+
+                    StyleVisualChangeHandler(null, _ChartVisualStyle);
+                }
+
+                return (_ChartVisualStyle);
+            }
+
+            set
+            {
+                if (_ChartVisualStyle != value)
+                {
+                    PieChartVisualStyle oldValue = _ChartVisualStyle;
+
+                    _ChartVisualStyle = value;
+
+                    OnStyleChanged("ChartVisualStyle", oldValue, value);
+
+                    if (oldValue != null)
+                        oldValue.Dispose();
+                }
+            }
+        }
+
+        #endregion
+
+        #region CustomPalette
+
+        ///<summary>
+        /// Gets or sets the custom palette for the chart.
+        ///</summary>
+        [DefaultValue(null), Category("Appearance")]
+        [Description("Indicates the custom palette for the chart.")]
+        public override Color[] CustomPalette
+        {
+            get { return (base.CustomPalette); }
+
+            set
+            {
+                base.CustomPalette = value;
+
+                UpdatePaletteNeeded = true;
+            }
+        }
+
+        #endregion
+
+        #region DetachedOffset
+
+        /// <summary>
+        /// Gets or sets the default offset distance of a slice from the pie center, as measured
+        /// by a percentage of the pie radius (if less than 1), or absolute pixel amount (if greater than 1). Default is .1.
+        ///
+        /// A value of 0 will restore the slice to its original position in the pie (which
+        /// may still be offset, if the pie is "exploded").
+        /// </summary>
+        [DefaultValue(.1d), Category("Offset")]
+        [Description("Indicates the default offset distance of a slice from the pie center, as measured by a percentage of the pie radius (if <= 1), or absolute pixel amount (if > 1). Default is .1.")]
+        [Editor("DevComponents.Charts.Design.RadiusRangeValueEditor, DevComponents.Charts.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(UITypeEditor))]
+        public double DetachedOffset
+        {
+            get { return (_DetachedOffset); }
+
+            set
+            {
+                if (value != _DetachedOffset)
+                {
+                    _DetachedOffset = value;
+
+                    OnPropertyChangedEx("DetachedOffset", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region EffectiveChartStyle
+
+        /// <summary>
+        /// Gets a reference to the Chart's Effective (cached, composite) style.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public PieChartVisualStyle EffectiveChartStyle
+        {
+            get { return (_EffectiveChartStyle.Style); }
+        }
+
+        #endregion
+
+        #region EffectivePieCenterStyles
+
+        /// <summary>
+        /// Gets a reference to the Chart's Effective (cached, composite) Pie Center styles.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public EffectiveStyles<PieCenterVisualStyle> EffectivePieCenterStyle
+        {
+            get { return (_EffectivePieCenterStyles); }
+        }
+
+        #endregion
+
+        #region EnableCenterLabelMarkup
+
+        /// <summary>
+        /// Gets or sets whether text-markup support is enabled for the Center Label.
+        /// </summary>
+        [DefaultValue(false), Category("Appearance")]
+        [Description("Indicates whether text-markup support is enabled for the Center Label.")]
+        public bool EnableCenterLabelMarkup
+        {
+            get { return (TestState(States.EnableCenterLabelMarkup)); }
+
+            set
+            {
+                if (EnableCenterLabelMarkup != value)
+                {
+                    SetState(States.EnableCenterLabelMarkup, value);
+
+                    MarkupCenterLabelChanged();
+
+                    OnPropertyChangedEx("EnableCenterLabelMarkup", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region EnableDragDetach
+
+        ///<summary>
+        /// Gets or sets whether the user can, by default, detach
+        /// slices of the pie by Click and drag.
+        ///</summary>
+        [DefaultValue(Tbool.NotSet), Category("Behavior")]
+        [Description("Indicates whether the user can, by default, detach slices of the pie by Click and drag.")]
+        public Tbool EnableDragDetach
+        {
+            get { return (_EnableDragDetach); }
+
+            set
+            {
+                if (value != _EnableDragDetach)
+                {
+                    _EnableDragDetach = value;
+
+                    OnPropertyChangedEx("EnableDragDetach", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region EnableShiftDragExplode
+
+        ///<summary>
+        /// Gets or sets whether the user can explode the pie by
+        /// ShiftClick and drag.
+        ///</summary>
+        [DefaultValue(false), Category("Behavior")]
+        [Description("Indicates whether the user can explode the pie by ShiftClick and drag.")]
+        public bool EnableShiftDragExplode
+        {
+            get { return (TestState(States.EnableShiftDragExplode)); }
+
+            set
+            {
+                if (value != EnableShiftDragExplode)
+                {
+                    SetState(States.EnableShiftDragExplode, value);
+
+                    OnPropertyChanged("EnableShiftDragExplode");
+                }
+            }
+        }
+
+        #endregion
+
+        #region ExplodedMargin
+
+        /// <summary>
+        /// Gets or sets the exploded between each series when the pie
+        /// is Exploded.  The Margin is is measured as a percentage of the pie radius (if <= 1)
+        /// or the absolute pixel amount (if > 1). Default is .1.
+        /// </summary>
+        [DefaultValue(.1d), Category("Margin")]
+        [Description("Indicates the exploded between each series when the pie is Exploded.  The Margin is is measured as a percentage of the pie radius (if <= 1) or the absolute pixel amount (if > 1). Default is .1.")]
+        public double ExplodedMargin
+        {
+            get { return (_ExplodedMargin); }
+
+            set
+            {
+                if (value != _ExplodedMargin)
+                {
+                    _ExplodedMargin = value;
+
+                    OnPropertyChangedEx("ExplodedMargin", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ExplodedOffset
+
+        /// <summary>
+        /// Gets or sets the offset of each slice from the pie center when the pie
+        /// is Exploded.  The offset is is measured as a percentage of the pie radius (if less than 1)
+        /// or the absolute pixel amount (if greater than 1). Default is .1.
+        ///
+        /// Clicking a Detached slice will restore it to its original position in the pie, which
+        /// may still be offset by this amount, if the pie is 'exploded'.
+        /// </summary>
+        [DefaultValue(.05d), Category("Offset")]
+        [Description("Indicates the offset of each slice from the pie center when the pie is Exploded.  The offset is is measured as a percentage of the pie radius (if <= 1) or the absolute pixel amount (if > 1). Default is .1.")]
+        [Editor("DevComponents.Charts.Design.RadiusRangeValueEditor, DevComponents.Charts.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(UITypeEditor))]
+        public double ExplodedOffset
+        {
+            get { return (_ExplodedOffset); }
+
+            set
+            {
+                if (value != _ExplodedOffset)
+                {
+                    _ExplodedOffset = value;
+                    _ExplodedOffsetEx = double.NaN;
+
+                    OnPropertyChangedEx("ExplodedOffset", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region GridInnerRadius
+
+        /// <summary>
+        /// Gets or sets the Inner radius of the pie grid, relative to the pie area. Can be a
+        /// percentage (if value is between 0 and 1) or pixel amount (if value > 1).
+        /// Defaults to 0.
+        /// </summary>
+        [DefaultValue(0d), Category("Radius")]
+        [Description("Indicates the Inner radius of the pie grid, relative to the pie area. Can be a percentage (if value is between 0 and 1) or pixel amount (if value > 1). Defaults to 0")]
+        [Editor("DevComponents.Charts.Design.RadiusRangeValueEditor, DevComponents.Charts.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(UITypeEditor))]
+        public double GridInnerRadius
+        {
+            get { return (_GridInnerRadius); }
+
+            set
+            {
+                if (value != _GridInnerRadius)
+                {
+                    _GridInnerRadius = value;
+
+                    InvalidateValueCache();
+
+                    OnPropertyChangedEx("GridInnerRadius", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region GridOuterRadius
+
+        /// <summary>
+        /// Gets or sets the outer radius of the pie grid, relative to the pie area. Can be a
+        /// percentage (if value is between 0 and 1) or pixel amount (if value > 1).
+        /// Defaults to 1 (ie 100 %).
+        /// </summary>
+        [DefaultValue(1d), Category("Radius")]
+        [Description("Indicates the outer radius of the pie grid, relative to the pie area. Can be a percentage (if value is between 0 and 1) or pixel amount (if value > 1). Defaults to 1")]
+        [Editor("DevComponents.Charts.Design.RadiusRangeValueEditor, DevComponents.Charts.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(UITypeEditor))]
+        public double GridOuterRadius
+        {
+            get { return (_GridOuterRadius); }
+
+            set
+            {
+                if (value != _GridOuterRadius)
+                {
+                    _GridOuterRadius = value;
+
+                    InvalidateValueCache();
+
+                    OnPropertyChangedEx("GridOuterRadius", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region GridInterval
+
+        /// <summary>
+        /// Gets or sets the radial grid interval (interval division between grid lines). 
+        /// </summary>
+        [DefaultValue(10d), Category("Grid")]
+        [Description("Indicates the radial grid interval (interval division between grid lines).")]
+        public double GridInterval
+        {
+            get { return (_GridInterval); }
+
+            set
+            {
+                if (value != _GridInterval)
+                {
+                    _GridInterval = value;
+
+                    OnPropertyChangedEx("GridInterval", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region GridMaxValue
+
+        /// <summary>
+        /// Gets or sets the radial grid maximum value. 
+        /// </summary>
+        [DefaultValue(100d), Category("Grid")]
+        [Description("Indicates the radial grid maximum value.")]
+        public double GridMaxValue
+        {
+            get { return (_GridMaxValue); }
+
+            set
+            {
+                if (value != _GridMaxValue)
+                {
+                    _GridMaxValue = value;
+
+                    OnPropertyChangedEx("GridMaxValue", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region GridMinValue
+
+        /// <summary>
+        /// Gets or sets the radial grid minimum value. 
+        /// </summary>
+        [DefaultValue(0d), Category("Grid")]
+        [Description("Indicates the radial grid minimum value.")]
+        public double GridMinValue
+        {
+            get { return (_GridMinValue); }
+
+            set
+            {
+                if (value != _GridMinValue)
+                {
+                    _GridMinValue = value;
+
+                    OnPropertyChangedEx("GridMinValue", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region InnerMargin
+
+        /// <summary>
+        /// Gets or sets the inner pixel margin between the inner
+        /// most ring and the pie center. Default is .02d.
+        /// </summary>
+        [Description("Indicates the inner pixel margin between the inner most ring and the pie center. Default is .02d.")]
+        [DefaultValue(.02d), Category("Margin")]
+        [Editor("DevComponents.Charts.Design.RadiusRangeValueEditor, DevComponents.Charts.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(UITypeEditor))]
+        public double InnerMargin
+        {
+            get { return (_InnerMargin); }
+
+            set
+            {
+                if (value != _InnerMargin)
+                {
+                    _InnerMargin = value;
+
+                    InvalidateValueCache();
+
+                    OnPropertyChangedEx("InnerMargin", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region InnerRadius
+
+        /// <summary>
+        /// Gets or sets the size of the inner radius for the pie, relative to the plot
+        /// area. Can be a percentage (if value is between 0 and 1) or pixel amount (if value > 1).
+        /// A value > 0 will create an inner "hole" or donut chart.
+        /// </summary>
+        [DefaultValue(0d), Category("Radius")]
+        [Description("Indicates the size of the inner radius for the pie, relative to the plot area. Can be a percentage (if value is between 0 and 1) or pixel amount (if value > 1). A value > 0 will create an inner 'hole' or donut chart.")]
+        [Editor("DevComponents.Charts.Design.RadiusRangeValueEditor, DevComponents.Charts.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(UITypeEditor))]
+        public double InnerRadius
+        {
+            get { return (_InnerRadius); }
+
+            set
+            {
+                if (value != _InnerRadius)
+                {
+                    _InnerRadius = value;
+
+                    InvalidateValueCache();
+
+                    OnPropertyChangedEx("InnerRadius", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region IsExploded
+
+        /// <summary>
+        /// Gets or sets whether all slices of the pie have been pulled out, or
+        /// exploded, from the center of the pie. This attribute can be used to
+        /// create added emphasis or to highlight the entire pie. Default is false.
+        /// </summary>
+        [DefaultValue(false), Category("Display")]
+        [Description("Indicates whether all slices of the pie have been pulled out, or exploded, from the center of the pie. This attribute can be used to create added emphasis or to highlight the entire pie. Default is false.")]
+        public bool IsExploded
+        {
+            get { return (TestState(States.Exploded)); }
+
+            set
+            {
+                if (value != IsExploded)
+                {
+                    SetState(States.Exploded, value);
+
+                    _ExplodedOffsetEx = double.NaN;
+
+                    OnPropertyChangedEx("IsExploded", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region MaxDetachedOffset
+
+        /// <summary>
+        /// Gets or sets the maximum Detached Offset value (in pixels) that
+        /// a pie slice can be detached. Default is 100.
+        /// </summary>
+        [DefaultValue(100), Category("Offset")]
+        [Description("Indicates the maximum DetachedOffset value (in pixels) that a pie slice can be detached. Default is 100.")]
+        public int MaxDetachedOffset
+        {
+            get { return (_MaxDetachedOffset); }
+
+            set
+            {
+                if (value != _MaxDetachedOffset)
+                {
+                    _MaxDetachedOffset = value;
+
+                    OnPropertyChangedEx("MaxDetachedOffset", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region MaxExplodedOffset
+
+        /// <summary>
+        /// Gets or sets the maximum ExplodedOffset value (in pixels) that
+        /// the pie may be exploded. Default is 100.
+        /// </summary>
+        [DefaultValue(100), Category("Offset")]
+        [Description("Indicates the maximum ExplodedOffset value (in pixels) that the pie may be exploded. Default is 100.")]
+        public int MaxExplodedOffset
+        {
+            get { return (_MaxExplodedOffset); }
+
+            set
+            {
+                if (value != _MaxExplodedOffset)
+                {
+                    _MaxExplodedOffset = value;
+
+                    OnPropertyChangedEx("MaxExplodedOffset", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region MaxRingOutRadius
+
+        /// <summary>
+        /// Gets or sets the maximum radius of the Center
+        /// RingOut image (in pixels). Default is 48.
+        /// </summary>
+        [DefaultValue(48), Category("Radius")]
+        [Description("Indicates the maximum radius of the Center RingOut image (in pixels). Default is 48.")]
+        public int MaxRingOutRadius
+        {
+            get { return (_MaxRingOutRadius); }
+
+            set
+            {
+                if (value != _MaxRingOutRadius)
+                {
+                    _MaxRingOutRadius = value;
+
+                    OnPropertyChanged("MaxRingOutRadius");
+                }
+            }
+        }
+
+        #endregion
+
+        #region MinOuterRadius
+
+        /// <summary>
+        /// Gets or sets the minimum outer radius of the chart, in pixels. Defaults to 80.
+        /// </summary>
+        [DefaultValue(80), Category("Radius")]
+        [Description("Indicates the minimum outer radius of the chart, in pixels. Defaults to 80.")]
+        public int MinOuterRadius
+        {
+            get { return (_MinOuterRadius); }
+
+            set
+            {
+                if (value != _MinOuterRadius)
+                {
+                    _MinOuterRadius = value;
+
+                    _OuterRadiusEx = double.NaN;
+                    _ExplodedOffsetEx = double.NaN;
+
+                    OnPropertyChangedEx("MinOuterRadius", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region MinRingOutRadius
+
+        /// <summary>
+        /// Gets or sets the minimum radius of the Center
+        /// RingOut image (in pixels). Default is 9.
+        /// </summary>
+        [DefaultValue(9), Category("Radius")]
+        [Description("Indicates the maximum radius of the Center RingOut image (in pixels). Default is 9.")]
+        public int MinRingOutRadius
+        {
+            get { return (_MinRingOutRadius); }
+
+            set
+            {
+                if (value != _MinRingOutRadius)
+                {
+                    _MinRingOutRadius = value;
+
+                    OnPropertyChanged("MinRingOutRadius");
+                }
+            }
+        }
+
+        #endregion
+
+        #region MouseClickAction
+
+        /// <summary>
+        /// Gets or sets the default action used when the user clicks on a pie slice. Default is 'None'.
+        /// </summary>
+        [DefaultValue(MouseClickSliceAction.NotSet), Category("Behavior")]
+        [Description("Indicates the default action used when the user clicks on a pie slice. Default is 'None'.")]
+        public MouseClickSliceAction MouseClickSliceAction
+        {
+            get { return (_MouseClickSliceAction); }
+
+            set
+            {
+                if (value != _MouseClickSliceAction)
+                {
+                    _MouseClickSliceAction = value;
+
+                    OnPropertyChanged("MouseClickSliceAction");
+                }
+            }
+        }
+
+        #endregion
+
+        #region MouseDoubleClickSliceAction
+
+        /// <summary>
+        /// Gets or sets the default action used when
+        /// the user double-clicks on a pie slice. Default is 'None'.
+        /// </summary>
+        [DefaultValue(MouseDoubleClickSliceAction.NotSet), Category("Behavior")]
+        [Description("Indicates the default action used when the user double-clicks on a pie slice. Default is 'None'.")]
+        public MouseDoubleClickSliceAction MouseDoubleClickSliceAction
+        {
+            get { return (_MouseDoubleClickSliceAction); }
+
+            set
+            {
+                if (value != _MouseDoubleClickSliceAction)
+                {
+                    _MouseDoubleClickSliceAction = value;
+
+                    OnPropertyChanged("MouseDoubleClickSliceAction");
+                }
+            }
+        }
+
+        #endregion
+
+        #region MultiSelect
+
+        ///<summary>
+        /// Gets or sets whether multiple items can be selected by the user. Default is true.
+        ///</summary>
+        [DefaultValue(true), Category("Behavior")]
+        [Description("Indicates whether multiple items can be selected by the user. Default is true.")]
+        public bool MultiSelect
+        {
+            get { return (TestState(States.MultiSelect)); }
+
+            set
+            {
+                if (value != MultiSelect)
+                {
+                    SetState(States.MultiSelect, value);
+
+                    OnPropertyChanged("MultiSelect");
+                }
+            }
+        }
+
+        #endregion
+
+        #region OuterMargin
+
+        /// <summary>
+        /// Gets or sets the outer pixel margin for the chart.
+        /// </summary>
+        [Description("Indicates the outer pixel margin for the chart.")]
+        [DefaultValue(0d), Category("Margin")]
+        [Editor("DevComponents.Charts.Design.RadiusRangeValueEditor, DevComponents.Charts.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(UITypeEditor))]
+        public double OuterMargin
+        {
+            get { return (_OuterMargin); }
+
+            set
+            {
+                if (value != _OuterMargin)
+                {
+                    _OuterMargin = value;
+
+                    _OuterRadiusEx = double.NaN;
+                    _ExplodedOffsetEx = double.NaN;
+
+                    OnPropertyChangedEx("OuterMargin", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region OuterRadius
+
+        /// <summary>
+        /// Gets or sets the outer radius of the pie, relative to the plot area. Can be a
+        /// percentage (if value is between 0 and 1) or pixel amount (if value > 1).
+        /// Defaults to .8 (ie 80 %).
+        /// </summary>
+        [DefaultValue(.8d), Category("Radius")]
+        [Description("Indicates the outer radius of the pie, relative to the plot area. Can be a percentage (if value is between 0 and 1) or pixel amount (if value > 1). Defaults to .8")]
+        [Editor("DevComponents.Charts.Design.RadiusRangeValueEditor, DevComponents.Charts.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(UITypeEditor))]
+        public virtual double OuterRadius
+        {
+            get { return (_OuterRadius); }
+
+            set
+            {
+                if (value != _OuterRadius)
+                {
+                    _OuterRadius = value;
+
+                    InvalidateValueCache();
+
+                    OnPropertyChangedEx("OuterRadius", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region PaletteGroup
+
+        /// <summary>
+        /// Gets or sets the palette color group to use (Light/Medium/Dark/Color1/MonoBlue/etc).
+        /// </summary>
+        [DefaultValue(PaletteGroup.Color1), Category("Appearance")]
+        [Description("Indicates the palette color group to use (Light/Medium/Dark/Color1/MonoBlue/etc.).")]
+        public override PaletteGroup PaletteGroup
+        {
+            get { return (base.PaletteGroup); }
+
+            set
+            {
+                if (value != PaletteGroup)
+                {
+                    base.PaletteGroup = value;
+
+                    UpdatePaletteNeeded = true;
+                }
+            }
+        }
+
+        #endregion
+
+        #region PieRadiusScale
+
+        /// <summary>
+        /// Gets or sets how the PieRadius values (InnerRadius, OuterRadius,
+        /// GridInnerRadius, and GridOuterRadius) are interpreted (as absolute
+        /// pixel values or as relative percentages).
+        /// </summary>
+        [DefaultValue(PieRadiusScale.Percentage), Category("Radius")]
+        [Description("Indicates how the PieRadius values (InnerRadius, OuterRadius, GridInnerRadius, and GridOuterRadius) are interpreted (as absolute pixel values or as relative percentages).")]
+        public PieRadiusScale PieRadiusScale
+        {
+            get { return (_PieRadiusScale); }
+
+            set
+            {
+                if (value != _PieRadiusScale)
+                {
+                    _PieRadiusScale = value;
+
+                    OnPropertyChangedEx("PieRadiusScale", VisualChangeType.Recalc);
+                }
+            }
+        }
+
+        #endregion
+
+        #region PieRingOutDisplayMode
+
+        /// <summary>
+        /// Gets or sets the display mode for the RingOut indicator (used
+        /// to move out a ring level when ShowAllRings is false and the
+        /// ActiveSeriesPointCollection has been set to an inner ring).
+        /// </summary>
+        [DefaultValue(PieRingOutDisplayMode.OnMouseOver), Category("Behavior")]
+        [Description("Indicates the display mode for the RingOut indicator (used to move out a ring level when ShowAllRings is false and the ActiveSeriesPointCollection has been set to an inner ring).")]
+        public PieRingOutDisplayMode PieRingOutDisplayMode
+        {
+            get { return (_PieRingOutDisplayMode); }
+
+            set
+            {
+                if (value != _PieRingOutDisplayMode)
+                {
+                    _PieRingOutDisplayMode = value;
+
+                    OnPropertyChangedEx("PieRingOutDisplayMode", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region PieSelectionMode
+
+        /// <summary>
+        /// Gets or sets the default mode used to perform pie selections. Default is 'Slice'.
+        /// </summary>
+        [DefaultValue(PieSelectionMode.NotSet), Category("Behavior")]
+        [Description("Indicates the default mode used to perform pie selections. Default is 'Slice'.")]
+        public PieSelectionMode PieSelectionMode
+        {
+            get { return (_PieSelectionMode); }
+
+            set
+            {
+                if (value != _PieSelectionMode)
+                {
+                    _PieSelectionMode = value;
+
+                    OnPropertyChanged("PieSelectionMode");
+                }
+            }
+        }
+
+        #endregion
+
+        #region ReversePaletteColors
+
+        ///<summary>
+        /// Gets or sets whether default palette colors are utilized in reverse order.
+        ///</summary>
+        [DefaultValue(false), Category("Appearance")]
+        [Description("Indicates whether default palette colors are utilized in reverse order.")]
+        public override bool ReversePaletteColors
+        {
+            get { return (base.ReversePaletteColors); }
+
+            set
+            {
+                if (value != ReversePaletteColors)
+                {
+                    base.ReversePaletteColors = value;
+
+                    UpdatePaletteNeeded = true;
+                }
+            }
+        }
+
+        #endregion
+
+        #region ReverseRingOrder
+
+        /// <summary>
+        /// Gets or sets whether rings of the pie are presented in reverse order.
+        /// </summary>
+        [DefaultValue(false), Category("Appearance")]
+        [Description("Indicates whether rings of the pie are presented in reverse order.")]
+        public bool ReverseRingOrder
+        {
+            get { return (TestState(States.ReverseRingOrder)); }
+
+            set
+            {
+                if (value != ReverseRingOrder)
+                {
+                    SetState(States.ReverseRingOrder, value);
+
+                    OnPropertyChangedEx("ReverseRingOrder", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region SeriesMargin
+
+        /// <summary>
+        /// Gets or sets the margin between multiple series in
+        /// the chart, relative to the plot area. Can be a percentage (if 
+        /// value is between 0 and 1) or pixel amount (if value > 1).
+        /// Defaults to .02
+        /// </summary>
+        [Description("Indicates the margin between multiple series in the chart, relative to the plot area. Can be a percentage (if value is between 0 and 1) or pixel amount (if value > 1). Defaults to .02")]
+        [DefaultValue(.02d), Category("Margin")]
+        [Editor("DevComponents.Charts.Design.RadiusRangeValueEditor, DevComponents.Charts.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(UITypeEditor))]
+        public double SeriesMargin
+        {
+            get { return (_SeriesMargin); }
+
+            set
+            {
+                if (value != _SeriesMargin)
+                {
+                    _SeriesMargin = value;
+
+                    OnPropertyChangedEx("SeriesMargin", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region SeriesOverlayEnabled
+
+        /// <summary>
+        /// Gets or sets whether chart series are, by default,
+        /// overlayed on top of each other. Default is false.
+        /// </summary>
+        [DefaultValue(false), Category("Display")]
+        [Description("Indicates whether chart series are, by default, overlayed on top of each other. Default is false.")]
+        public bool SeriesOverlayEnabled
+        {
+            get { return (TestState(States.SeriesOverlayEnabled)); }
+
+            set
+            {
+                if (value != SeriesOverlayEnabled)
+                {
+                    SetState(States.SeriesOverlayEnabled, value);
+
+                    OnPropertyChangedEx("SeriesOverlayEnabled", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowAllRings
+
+        /// <summary>
+        /// Gets or sets whether all series rings are shown when rendering the chart.
+        /// If false, only one ring at a time is shown, with the ability to 'drill' up
+        /// or down, to display adjacent rings. Defaults to true'.
+        /// </summary>
+        [DefaultValue(Tbool.NotSet), Category("Display")]
+        [Description("Indicates whether all series rings are shown when rendering the chart. If false, only one ring at a time is shown, with the ability to 'drill' up or down, to display adjacent rings. Defaults to true.")]
+        public Tbool ShowAllRings
+        {
+            get { return (_ShowAllRings); }
+
+            set
+            {
+                if (value != _ShowAllRings)
+                {
+                    _ShowAllRings = value;
+
+                    OnPropertyChangedEx("ShowAllRings", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #region ShowAllRingsEx
+
+        internal bool ShowAllRingsEx
+        {
+            get { return (ShowAllRings != Tbool.False); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ShowFullGrid
+
+        /// <summary>
+        /// Gets or sets whether the radial pie grid is displayed over the entire
+        /// pie (0 - 360 degrees) or only over the sweep angle. Default is false.
+        /// </summary>
+        [DefaultValue(false), Category("Grid")]
+        [Description("Indicates whether the radial pie grid is displayed over the entire pie (0 - 360 degrees) or only over the sweep angle. Default is false.")]
+        public bool ShowFullGrid
+        {
+            get { return (TestState(States.ShowFullGrid)); }
+
+            set
+            {
+                if (value != ShowFullGrid)
+                {
+                    SetState(States.ShowFullGrid, value);
+
+                    OnPropertyChangedEx("ShowFullGrid", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowGridOnTop
+
+        /// <summary>
+        /// Gets or sets whether the radial grid is displayed
+        /// on top of the pie (ShowPieGrid must also be true). Default is false.
+        /// </summary>
+        [DefaultValue(false), Category("Grid")]
+        [Description("Indicates whether the radial grid is displayed on top of the pie (ShowPieGrid must also be true). Default is false.")]
+        public bool ShowGridOnTop
+        {
+            get { return (TestState(States.ShowGridOnTop)); }
+
+            set
+            {
+                if (value != ShowGridOnTop)
+                {
+                    SetState(States.ShowGridOnTop, value);
+
+                    OnPropertyChangedEx("ShowGridOnTop", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowOtherSlice
+
+        /// <summary>
+        /// Gets or sets  whether to consolidate 'excluded' pie slices
+        /// (due to MaxSlices or MinPercent settings) into a single slice
+        /// that represents 'Other' data values. Default is false.
+        /// </summary>
+        [DefaultValue(Tbool.NotSet), Category("Display")]
+        [Description("Indicates  whether to consolidate 'excluded' pie slices (due to MaxSlices or MinPercent settings) into a single slice that represents 'Other' data values. Default is false.")]
+        public Tbool ShowOtherSlice
+        {
+            get { return (_ShowOtherSlice); }
+
+            set
+            {
+                if (value != _ShowOtherSlice)
+                {
+                   _ShowOtherSlice = value;
+
+                   SeriesRangeChanged = true;
+
+                    OnPropertyChangedEx("ShowOtherSlice", VisualChangeType.Recalc);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowPieGrid
+
+        /// <summary>
+        /// Gets or sets whether a radial grid is displayed for the chart. Defaults to false.
+        /// </summary>
+        [DefaultValue(false), Category("Grid")]
+        [Description("Indicates whether a radial grid is displayed for the chart. Defaults to false.")]
+        public bool ShowPieGrid
+        {
+            get { return (TestState(States.ShowPieGrid)); }
+
+            set
+            {
+                if (value != ShowPieGrid)
+                {
+                    SetState(States.ShowPieGrid, value);
+
+                    OnPropertyChangedEx("ShowPieGrid", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowSliceLabelsOnEntry
+
+        /// <summary>
+        /// Gets or sets whether all enabled slice labels will be shown
+        /// when the mouse enters the chart area. Default is false.
+        /// </summary>
+        [DefaultValue(false), Category("Label")]
+        [Description("Indicates whether all enabled slice labels will be shown when the mouse enters the chart area. Default is false.")]
+        public bool ShowSliceLabelsOnEntry
+        {
+            get { return (TestState(States.ShowSliceLabelsOnEntry)); }
+
+            set
+            {
+                if (value != ShowSliceLabelsOnEntry)
+                {
+                    SetState(States.ShowSliceLabelsOnEntry, value);
+
+                    OnPropertyChangedEx("ShowSliceLabelsOnEntry", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowToolTips
+
+        /// <summary>
+        /// Gets or sets whether tooltips are shown.
+        /// </summary>
+        [DefaultValue(false), Category("Appearance")]
+        [Description("Indicates whether tooltips are shown.")]
+        public bool ShowToolTips
+        {
+            get { return (TestState(States.ShowToolTips)); }
+
+            set
+            {
+                if (value != ShowToolTips)
+                {
+                    SetState(States.ShowToolTips, value);
+
+                    OnPropertyChanged("ShowToolTips");
+                }
+            }
+        }
+
+        #endregion
+
+        #region SliceLabelOverlapMode
+
+        /// <summary>
+        /// Gets or sets the mode for resolving overlapping outer slice labels.
+        /// Outer slice labels are only displayed for the outer-most chart series ring.  
+        /// This setting only applies to individual series (ie. Overlapped series are
+        /// treated as distinct elements). Default is HideOverlapping.
+        /// </summary>
+        [DefaultValue(SliceLabelOverlapMode.NotSet), Category("Label")]
+        [Description("Indicates the mode for resolving overlapping outer slice labels. Outer slice labels are only displayed for the outer-most chart series ring.  This setting only applies to individual series (ie. Overlapped series are treated as distinct elements). Default is HideOverlapping.")]
+        public SliceLabelOverlapMode SliceLabelOverlapMode
+        {
+            get { return (_SliceLabelOverlapMode); }
+
+            set
+            {
+                if (value != _SliceLabelOverlapMode)
+                {
+                    _SliceLabelOverlapMode = value;
+
+                    OnPropertyChangedEx("SliceLabelOverlapMode", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region SubSliceVisualLayout
+
+        /// <summary>
+        /// Gets or sets the default layout of chart SeriesPoints that are
+        /// subordinate to the chart.
+        /// </summary>
+        [Category("Layout")]
+        [Description("Indicates the default layout of chart SeriesPoints.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public SliceVisualLayout SubSliceVisualLayout
+        {
+            get
+            {
+                if (_SubSliceVisualLayout == null)
+                    SubSliceVisualLayout = new SliceVisualLayout(this);
+
+                return (_SubSliceVisualLayout);
+            }
+            set
+            {
+                if (value != _SubSliceVisualLayout)
+                {
+                    if (_SubSliceVisualLayout != null)
+                        _SubSliceVisualLayout.PropertyChanged -= SliceVisualLayout_PropertyChanged;
+
+                    _SubSliceVisualLayout = value;
+
+                    if (_SubSliceVisualLayout != null)
+                        _SubSliceVisualLayout.PropertyChanged += SliceVisualLayout_PropertyChanged;
+
+                    OnPropertyChangedEx("SubSliceVisualLayout", VisualChangeType.Recalc);
+                }
+            }
+        }
+
+        #region SliceVisualLayout_PropertyChanged
+
+        void SliceVisualLayout_PropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            if (ChartControl != null)
+                ChartControl.GlobalUpdateCount++;
+
+            VisualPropertyChangedEventArgs vce = e as VisualPropertyChangedEventArgs;
+
+            if (vce != null)
+            {
+                switch (vce.ChangeType)
+                {
+                    case VisualChangeType.Recalc:
+                        foreach (BaseSeries series in BaseSeries)
+                            series.InvalidateRecalc();
+                        break;
+
+                    case VisualChangeType.Layout:
+                        InvalidateLayout();
+                        break;
+
+                    default:
+                        InvalidateRender();
+                        break;
+                }
+            }
+
+            if (e is VisualPropertyChangedEventArgs)
+                OnPropertyChangedEx(e.PropertyName, ((VisualPropertyChangedEventArgs)e).ChangeType);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region UseAlternateGridBackground
+
+        /// <summary>
+        /// Gets or sets whether the chart utilizes the alternate background color
+        /// when ShowPieGrid is enabled.
+        /// </summary>
+        [DefaultValue(false), Category("Grid")]
+        [Description("Indicates whether the chart utilizes the alternate background color when ShowPieGrid is enabled.")]
+        public bool UseAlternateGridBackground
+        {
+            get { return (TestState(States.UseAlternateGridBackground)); }
+
+            set
+            {
+                if (value != UseAlternateGridBackground)
+                {
+                    SetState(States.UseAlternateGridBackground, value);
+
+                    OnPropertyChangedEx("UseAlternateGridBackground", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region WhitespaceClickBehavior
+
+        /// <summary>
+        /// Gets or sets the behavior when the user
+        /// clicks the mouse in the chart whitespace.
+        /// </summary>
+        [DefaultValue(WhitespaceClickBehavior.ClearSelection), Category("Behavior")]
+        [Description("Indicates the behavior when the user clicks the mouse in the chart whitespace.")]
+        public WhitespaceClickBehavior WhitespaceClickBehavior
+        {
+            get { return (_WhitespaceClickBehavior); }
+
+            set
+            {
+                if (value != _WhitespaceClickBehavior)
+                {
+                    _WhitespaceClickBehavior = value;
+
+                    OnPropertyChanged("WhitespaceClickBehavior");
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region ExplodedOffsetEx
+
+        internal double ExplodedOffsetEx
+        {
+            get
+            {
+                if (double.IsNaN(_ExplodedOffsetEx) == true)
+                    _ExplodedOffsetEx = GetExplodedOffset();
+
+                return (_ExplodedOffsetEx);
+            }
+        }
+
+        #region GetExplodedOffset
+
+        internal double GetExplodedOffset()
+        {
+            if (IsExploded == true)
+            {
+                if (ExplodedOffset > 0)
+                {
+                    if (ExplodedOffset >= 1)
+                        return (ExplodedOffset);
+
+                    return (OuterRadiusEx * ExplodedOffset);
+                }
+            }
+
+            return (0);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GlobalSelectionCount
+
+        internal uint GlobalSelectionCount
+        {
+            get { return (_GlobalSelectionCount); }
+            set { _GlobalSelectionCount = value; }
+        }
+
+        #endregion
+
+        #region GridInnerRadiusEx
+
+        internal double GridInnerRadiusEx
+        {
+            get
+            {
+                if (double.IsNaN(_GridInnerRadiusEx) == true)
+                {
+                    _GridInnerRadiusEx = GridInnerRadius;
+
+                    if (_GridInnerRadiusEx > 0)
+                    {
+                        if (PieRadiusScale == PieRadiusScale.Percentage || _GridInnerRadiusEx <= 1)
+                            _GridInnerRadiusEx *= OuterRadiusEx;
+                    }
+
+                    _GridInnerRadiusEx += InnerRadiusEx;
+                }
+
+                return (_GridInnerRadiusEx);
+            }
+        }
+
+        #endregion
+
+        #region GridOuterRadiusEx
+
+        internal double GridOuterRadiusEx
+        {
+            get
+            {
+                if (double.IsNaN(_GridOuterRadiusEx) == true)
+                {
+                    _GridOuterRadiusEx = GridOuterRadius;
+
+                    if (_GridOuterRadiusEx > 0)
+                    {
+                        if (PieRadiusScale == PieRadiusScale.Percentage || _GridOuterRadiusEx <= 1)
+                            _GridOuterRadiusEx *= OuterRadiusEx;
+                    }
+                }
+
+                return (_GridOuterRadiusEx);
+            }
+        }
+
+        #endregion
+
+        #region HitPsp
+
+        internal PieSeriesPoint HitPsp
+        {
+            get { return (_HitPsp); }
+            set { _HitPsp = value; }
+        }
+
+        #endregion
+
+        #region InnerMarginEx
+
+        internal double InnerMarginEx
+        {
+            get
+            {
+                if (double.IsNaN(_InnerMarginEx) == true)
+                    _InnerMarginEx = GetInnerMargin();
+
+                return (_InnerMarginEx);
+            }
+        }
+
+        #region GetInnerMargin
+
+        private double GetInnerMargin()
+        {
+            if (InnerMargin <= 0)
+                return (0);
+
+            if (PieRadiusScale == PieRadiusScale.Percentage || InnerMargin <= 1)
+                return (InnerMargin * OuterRadiusEx);
+
+            return (InnerMargin);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InnerRadiusEx
+
+        internal double InnerRadiusEx
+        {
+            get
+            {
+                if (double.IsNaN(_InnerRadiusEx) == true)
+                    _InnerRadiusEx = GetInnerRadius();
+
+                return (_InnerRadiusEx);
+            }
+        }
+
+        #region GetInnerRadius
+
+        private double GetInnerRadius()
+        {
+            if (InnerRadius > 0)
+            {
+                if (PieRadiusScale == PieRadiusScale.Percentage || InnerRadius <= 1)
+                    return (InnerRadius * OuterRadiusEx);
+                    
+                return (InnerRadius);
+            }
+
+            return (0);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IsDragging
+
+        internal bool IsDragging
+        {
+            get { return (TestState(States.Dragging)); }
+            set { SetState(States.Dragging, value); }
+        }
+
+        #endregion
+
+        #region MaxPieOuterExtent
+
+        internal double MaxPieOuterExtent
+        {
+            get { return (_MaxPieOuterExtent); }
+            set { _MaxPieOuterExtent = value; }
+        }
+
+        #endregion
+
+        #region OuterRadiusEx
+
+        internal double OuterRadiusEx
+        {
+            get
+            {
+                if (double.IsNaN(_OuterRadiusEx) == true)
+                {
+                    _OuterRadiusEx = OuterRadiusExx;
+
+                    if (OuterMargin > 0)
+                    {
+                        if (OuterMargin >= 1)
+                            _OuterRadiusEx -= OuterMargin;
+                        else
+                            _OuterRadiusEx -= (_OuterRadiusEx * OuterMargin);
+                    }
+
+                    _OuterRadiusEx = Math.Max(0, _OuterRadiusEx);
+                }
+
+                return (_OuterRadiusEx);
+            }
+        }
+
+        #endregion
+
+        #region OuterRadiusExx
+
+        internal double OuterRadiusExx
+        {
+            get
+            {
+                double radius = OuterRadius;
+
+                if (radius > 0)
+                {
+                    if (PieRadiusScale == PieRadiusScale.Percentage || radius <= 1)
+                        radius *= (Math.Min(ContentBoundsEx.Width, ContentBoundsEx.Height) / 2);
+                }
+
+                return (Math.Max(MinOuterRadius, radius));
+            }
+        }
+
+        #endregion
+
+        #region PspDragType
+
+        internal PspDragType PspDragType
+        {
+            get { return (_PspDragType); }
+            set { _PspDragType = value; }
+        }
+
+        #endregion
+
+        #region RingOutRadius
+
+        internal int RingOutRadius
+        {
+            get
+            {
+                PieSeries series = GetInnerSeries();
+
+                if (series != null)
+                {
+                    double radius = InnerRadiusEx;
+
+                    if (InnerMarginEx > 0)
+                        radius -= InnerMarginEx;
+
+                    if (ShowAllRingsEx == true)
+                    {
+                        if (ExplodedOffsetEx > 0)
+                        {
+                            radius += ExplodedOffsetEx;
+                            radius -= GetExplodedMargin(series);
+                        }
+                    }
+
+                    radius = Math.Min(radius,  Dpi.Width(MaxRingOutRadius));
+
+                    return (int)(Math.Max(0, radius));
+                }
+
+                return (0);
+            }
+        }
+
+        #endregion
+
+        #region RingWeightTotal
+
+        internal int RingWeightTotal
+        {
+            get { return (_RingWeightTotal); }
+            set { _RingWeightTotal = value; }
+        }
+
+        #endregion
+
+        #region UpdatePaletteNeeded
+
+        internal bool UpdatePaletteNeeded
+        {
+            get { return (TestState(States.UpdatePaletteNeeded)); }
+            set { SetState(States.UpdatePaletteNeeded, value); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region OnResize
+
+        protected override bool OnResize(EventArgs e)
+        {
+            InvalidateValueCache();
+
+            return (base.OnResize(e));
+        }
+
+        #region InvalidateValueCache
+
+        private void InvalidateValueCache()
+        {
+            _InnerRadiusEx = double.NaN;
+            _OuterRadiusEx = double.NaN;
+
+            _GridInnerRadiusEx = double.NaN;
+            _GridOuterRadiusEx = double.NaN;
+
+            _ExplodedOffsetEx = double.NaN;
+
+            _InnerMarginEx = double.NaN;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region MeasureOverride
+
+        protected override void MeasureOverride(ChartLayoutInfo layoutInfo)
+        {
+            ContainerVisualStyle cStyle = GetEffectiveContainerStyle();
+            PieChartVisualStyle pieStyle = EffectiveChartStyle;
+
+            BoundsRelative = layoutInfo.LayoutBounds;
+
+            UpdateDataBindings();
+
+            _PieLabels = null;
+
+            Rectangle oldFrameBounds = FrameBounds;
+
+            FrameBounds = GetAdjustedBounds(BoundsRelative, cStyle.Margin);
+            FrameBounds = GetAdjustedBounds(FrameBounds, cStyle.Padding);
+            FrameBounds = GetAdjustedBounds(FrameBounds, pieStyle.Margin);
+
+            if (FrameBounds != oldFrameBounds)
+                SeriesPointCount++;
+
+            ContentBounds = GetAdjustedBounds(FrameBounds, cStyle.BorderThickness);
+            ContentBounds = GetAdjustedBounds(ContentBounds, pieStyle.BorderThickness);
+            ContentBounds = GetAdjustedBounds(ContentBounds, pieStyle.Padding);
+
+            layoutInfo.LayoutBounds = ContentBounds;
+
+            foreach (ChartTitle title in Titles)
+            {
+                if (title.Visible == true)
+                    title.Measure(layoutInfo);
+            }
+
+            if (pieStyle.DropShadow.Enabled == Tbool.True)
+                layoutInfo.LayoutBounds = GetShadowBounds(layoutInfo.LayoutBounds);
+
+            MeasureSeries(layoutInfo);
+
+            if (Legend.Visible == true)
+                Legend.Measure(layoutInfo);
+
+            Rectangle oldContentBoundsEx = ContentBoundsEx;
+
+            ContentBounds = layoutInfo.LayoutBounds;
+            ContentBoundsEx = ContentBounds;
+
+            Rectangle r = ContentBounds;
+
+            r.Size = new Size(
+                Math.Max(r.Size.Width, Dpi.Width(MinContentSize.Width)),
+                Math.Max(r.Size.Height, Dpi.Height(MinContentSize.Height)));
+
+            // Since our vertical scrollbar is reversed, we
+            // need to adjust the extended content area accordingly
+
+            if (r.Height > ContentBounds.Height)
+                r.Y -= (r.Height - ContentBounds.Height);
+
+            ContentBoundsEx = r;
+
+            FinalizeDataBindings();
+
+            InvalidateValueCache();
+        }
+
+        #region MeasureSeries
+
+        private void MeasureSeries(ChartLayoutInfo layoutInfo)
+        {
+            PieSeries[] aseries = new PieSeries[ChartSeries.Count];
+
+            ChartSeries.CopyTo(aseries, 0);
+
+            foreach (PieSeries series in aseries)
+            {
+                if (series.IsDisplayed == true)
+                    series.Measure(layoutInfo);
+            }
+
+            if (SeriesRangeChanged == true)
+            {
+                SeriesRangeChanged = false;
+                UpdatePaletteNeeded = true;
+
+                RingWeightTotal = 0;
+                MaxPieOuterExtent = 0;
+
+                for (int i = 0; i < aseries.Length; i++)
+                {
+                    PieSeries series = aseries[i];
+
+                    if (series.IsDisplayed == true)
+                        RingWeightTotal += series.RingWeight;
+
+                    MeasurePieSlices(series, series.SeriesPoints);
+
+                    if (series.PieOuterExtent > MaxPieOuterExtent)
+                        MaxPieOuterExtent = series.PieOuterExtent;
+                }
+
+                if (SeriesOverlayEnabled == true)
+                    UpdateSeriesOverlayValues(aseries);
+            }
+
+            if (UpdatePaletteNeeded == true)
+            {
+                UpdatePaletteNeeded = false;
+
+                int colorIndex = 0;
+
+                for (int i = 0; i < aseries.Length; i++)
+                    UpdateSeriesPalette(aseries[i], ref colorIndex);
+            }          
+        }
+
+        #region MeasurePieSlices
+
+        private void MeasurePieSlices(PieSeries series, PieSeriesPointCollection spc)
+        {
+            if (spc != null && spc.Count > 0)
+            {
+                int ringLevel = 0;
+
+                series.PieRings.Clear();
+
+                CalculatePieTotals(series, spc, ringLevel);
+                CalculateRingTotal(series);
+                CalculateSliceValues(spc);
+
+                GatherPieSlices(series, spc);
+            }
+        }
+
+        #region GetMaxSlices
+
+        private int GetMaxSlices(PieSeriesPointCollection spc)
+        {
+            int maxSlices = spc.Parent.SubSliceVisualLayout.MaxSlices;
+
+            if (maxSlices < 0)
+                maxSlices = SubSliceVisualLayout.MaxSlices;
+
+            return ((maxSlices >= 0) ? maxSlices : 100);
+        }
+
+        #endregion
+
+        #region GetMinPercent
+
+        private double GetMinPercent(PieSeriesPointCollection spc)
+        {
+            double minPercent = spc.Parent.SubSliceVisualLayout.MinPercent;
+
+            if (double.IsNaN(minPercent) || minPercent < 0)
+                minPercent = SubSliceVisualLayout.MinPercent;
+
+            if (double.IsNaN(minPercent) == true || minPercent < 0)
+                minPercent = .04d;
+
+            return (minPercent);
+        }
+
+        #endregion
+
+        #region CalculatePieTotals
+
+        private void CalculatePieTotals(
+            PieSeries series, PieSeriesPointCollection spc, int ringLevel)
+        {
+            if (spc.Count > 0)
+            {
+                spc.PieTotal = 0;
+                spc.PieTotalExtent = 0;
+
+                spc.PieMinExtent = double.MaxValue;
+                spc.PieMaxExtent = 0;
+
+                spc.PieRing = GetPieRingAtLevel(series, ringLevel);
+
+                int ringWeight = spc.PieRing.RingWeight;
+                int maxSlices = GetMaxSlices(spc);
+
+                int sliceCount = 0;
+
+                bool showOtherSlices = series.ShowOtherSliceEx(this);
+
+                foreach (PieSeriesPoint psp in spc)
+                {
+                    if (psp != null && psp.Visible == true)
+                    {
+                        if (psp.ValueY.Length > 0)
+                        {
+                            sliceCount++;
+
+                            double d = Convert.ToDouble(psp.ValueY[0]);
+                            spc.PieTotal += d;
+
+                            psp.PieRing = spc.PieRing;
+
+                            if (psp.ValueY.Length > 1)
+                            {
+                                d = Convert.ToDouble(psp.ValueY[1]);
+
+                                spc.PieTotalExtent += d;
+
+                                if (d > spc.PieMaxExtent)
+                                    spc.PieMaxExtent = d;
+
+                                if (d < spc.PieMinExtent)
+                                    spc.PieMinExtent = d;
+
+                                psp.HasExtent = true;
+                            }
+
+                            if (psp.RingWeightEx >= 0)
+                            {
+                                if (psp.RingWeightEx > ringWeight)
+                                    ringWeight = psp.RingWeightEx;
+                            }
+
+                            spc.PieRing.Psps.Add(psp);
+
+                            if (psp.SeriesPoints != null)
+                                CalculatePieTotals(series, psp.SeriesPoints, ringLevel + 1);
+                        }
+                    }
+
+                    spc.PieOuterExtent = Math.Max(psp.MinExtentEx, spc.PieMaxExtent);
+
+                    if (spc.PieOuterExtent > series.PieOuterExtent)
+                        series.PieOuterExtent = spc.PieOuterExtent;
+
+                    if (showOtherSlices == false && sliceCount >= maxSlices)
+                        break;
+                }
+
+                spc.PieRing.RingWeight = (ringWeight < 0) ? 100 : ringWeight;
+
+                int visCount = spc.VisibleCount;
+
+                spc.PieAverage = ((visCount > 0) ? (spc.PieTotal / visCount) : 0);
+                spc.PieAverageExtent = ((visCount > 0) ? (spc.PieTotalExtent / visCount) : 0);
+            }
+        }
+
+        #region GetPieRingAtLevel
+
+        private PieRing GetPieRingAtLevel(PieSeries series, int ringLevel)
+        {
+            foreach (PieRing ring in series.PieRings)
+            {
+                if (ring.RingLevel == ringLevel)
+                    return (ring);
+            }
+
+            PieRing pieRing = new PieRing(ringLevel);
+            pieRing.ChartSeries = series;
+
+            series.PieRings.Add(pieRing);
+
+            return (pieRing);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region CalculateRingTotal
+
+        private void CalculateRingTotal(PieSeries series)
+        {
+            int ringTotal = 0;
+
+            foreach (PieRing ring in series.PieRings)
+                ringTotal += ring.RingWeight;
+
+            series.RingWeightTotal = ringTotal;
+        }
+
+        #endregion
+
+        #region CalculateSliceValues
+
+        private void CalculateSliceValues(PieSeriesPointCollection spc)
+        {
+            if (spc != null)
+            {
+                foreach (PieSeriesPoint psp in spc)
+                {
+                    if (psp != null && psp.Visible == true)
+                    {
+                        psp.SliceValue = 0;
+                        psp.SliceExtent = 1;
+
+                        if (psp.ValueY.Length > 0)
+                        {
+                            double d = Convert.ToDouble(psp.ValueY[0]);
+
+                            psp.SliceValue = (spc.PieTotal > 0) ? (d / spc.PieTotal) : 0;
+
+                            if (spc.PieOuterExtent > 0 && psp.ValueY.Length > 1)
+                            {
+                                d = Convert.ToDouble(psp.ValueY[1]);
+
+                                psp.SliceExtent = d / spc.PieOuterExtent;
+                            }
+
+                            CalculateSliceValues(psp.SeriesPoints);
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region GatherPieSlices
+
+        private void GatherPieSlices(PieSeries series, PieSeriesPointCollection spc)
+        {
+            int maxSlices = GetMaxSlices(spc);
+            double minPercent = GetMinPercent(spc);
+
+            PieSeriesPointCollection pieSlices = GetNewListSpc(spc);
+            PieSeriesPointCollection otherSlices = null;
+
+            if (series.ShowOtherSliceEx(this) == true)
+            {
+                otherSlices = GetNewListSpc(spc);
+                otherSlices.IsOther = true;
+            }
+
+            for (int i = 0; i < spc.Count; i++)
+            {
+                AddPieSeriesPoint(series, spc,
+                    maxSlices, minPercent, i, pieSlices, otherSlices);
+
+                if (otherSlices == null && pieSlices.Count >= maxSlices)
+                    break;
+            }
+
+            if (otherSlices != null && otherSlices.Count > 0)
+            {
+                double value = 0;
+                double extent = 0;
+
+                foreach (PieSeriesPoint psp in otherSlices)
+                {
+                    if (psp.ValueY.Length > 0)
+                        value += Convert.ToDouble(psp.ValueY[0]);
+
+                    if (psp.ValueY.Length > 1)
+                    {
+                        double d = Convert.ToDouble(psp.ValueY[1]);
+
+                        if (d > extent)
+                            extent = value;
+                    }
+                }
+
+                PieSeriesPoint opsp = spc.OtherSlicePsp;
+
+                opsp.ValueX = "Other";
+                opsp.ValueY[0] = value;
+                opsp.ValueY[1] = extent;
+
+                opsp.IsOther = true;
+                opsp.PieRing = spc.PieRing;
+
+                opsp.SliceValue = (spc.PieTotal > 0) ? (value / spc.PieTotal) : 0;
+                opsp.SliceExtent = (spc.PieOuterExtent > 0) ? (extent / spc.PieOuterExtent) : 1;
+
+                pieSlices.Add(opsp);
+
+                spc.PieRing.Psps.Add(opsp);
+            }
+
+            spc.PieSlices = pieSlices;
+            spc.OtherSlices = otherSlices;
+        }
+
+        #region GetNewListSpc
+
+        private PieSeriesPointCollection GetNewListSpc(PieSeriesPointCollection spc)
+        {
+            PieSeriesPointCollection spcNew = new PieSeriesPointCollection();
+
+            spcNew.PieAverage = spc.PieAverage;
+            spcNew.PieTotal = spc.PieTotal;
+
+            spcNew.PieAverageExtent = spc.PieAverageExtent;
+            spcNew.PieMaxExtent = spc.PieMaxExtent;
+            spcNew.PieMinExtent = spc.PieMinExtent;
+            spcNew.PieOuterExtent = spc.PieOuterExtent;
+            spcNew.PieTotalExtent = spc.PieTotalExtent;
+
+            spcNew.PieRing = spc.PieRing;
+            spcNew.Parent = spc.Parent;
+
+            return (spcNew);
+        }
+
+        #endregion
+
+        #region AddPieSeriesPoint
+
+        private void AddPieSeriesPoint(PieSeries series,
+            PieSeriesPointCollection spc, int maxSlices, double minPercent,
+            int index, PieSeriesPointCollection pieSlices, PieSeriesPointCollection otherSlices)
+        {
+            PieSeriesPoint psp = spc[index] as PieSeriesPoint;
+
+            if (psp != null && psp.Visible == true)
+            {
+                psp.IsInOtherEx = ((otherSlices != null) &&
+                    (psp.IsInOther || (pieSlices.Count >= maxSlices || psp.SliceValue < minPercent)));
+
+                if (psp.IsInOtherEx == true)
+                {
+                    psp.OrdinalValue = otherSlices.Count;
+                    otherSlices.Add(psp);
+                }
+                else
+                {
+                    psp.OrdinalValue = pieSlices.Count;
+                    pieSlices.Add(psp);
+                }
+
+                GatherPieSlices(series, psp.SeriesPoints);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region UpdateSeriesOverlayValues
+
+        private void UpdateSeriesOverlayValues(PieSeries[] aseries)
+        {
+            for (int i = 0; i < aseries.Length; i++)
+            {
+                PieSeries series = aseries[i];
+
+                if (series.IsDisplayed == true)
+                    UpdatePspOverlayValues(series, series.SeriesPoints.PieSlices);
+            }
+        }
+
+        #region UpdatePspOverlayValues
+
+        private void UpdatePspOverlayValues(PieSeries series, PieSeriesPointCollection spc)
+        {
+            if (spc != null && spc.Count > 0)
+            {
+                if (spc.PieOuterExtent != MaxPieOuterExtent)
+                {
+                    spc.PieOuterExtent = MaxPieOuterExtent;
+
+                    CalculateSliceValues(spc);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region UpdateSeriesPalette
+
+        private void UpdateSeriesPalette(PieSeries series, ref int colorIndex)
+        {
+            if (series.UpdatePalette(this) == false)
+            {
+                foreach (PieRing pieRing in series.PieRings)
+                {
+                    foreach (PieSeriesPoint psp in pieRing.Psps)
+                        psp.DefaultPaletteColor = GetPaletteColor(colorIndex++);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region ArrangeOverride
+
+        protected override void ArrangeOverride(ChartLayoutInfo layoutInfo)
+        {
+            int vmax = VScrollBar.LargeChange;
+
+            base.ArrangeOverride(layoutInfo);
+
+            if (VScrollBar.LargeChange != vmax)
+                SeriesPointCount++;
+
+            CalcPieCenter(layoutInfo);
+
+            if (RingWeightTotal > 0)
+                ArrangeSeries(layoutInfo);
+
+            SeriesLayoutCount++;
+        }
+
+        #region CalcPieCenter
+
+        private void CalcPieCenter(ChartLayoutInfo layoutInfo)
+        {
+            Rectangle bounds = ContentBoundsEx;
+            Point centerPos = Point.Empty;
+
+            centerPos.X = bounds.X + bounds.Width / 2;
+            centerPos.Y = bounds.Y + bounds.Height / 2;
+
+            if (CenterPos.X >= -1 && CenterPos.X <= 1)
+            {
+                if (CenterPos.X != 0.0)
+                    centerPos.X += (int)(bounds.Width * CenterPos.X);
+            }
+            else
+            {
+                centerPos.X += (int)CenterPos.X;
+            }
+
+            if (CenterPos.Y >= -1 && CenterPos.Y <= 1)
+            {
+                if (CenterPos.Y != 0.0)
+                    centerPos.Y += (int)(bounds.Height * CenterPos.Y);
+            }
+            else
+            {
+                centerPos.Y += (int)CenterPos.Y;
+            }
+
+            CenterPoint = centerPos;
+        }
+
+        #endregion
+
+        #region ArrangeSeries
+
+        private void ArrangeSeries(ChartLayoutInfo layoutInfo)
+        {
+            if (ChartSeries.Count > 0)
+            {
+                List<PieSeries> pieSeries = GetVisibleSeries();
+
+                if (pieSeries.Count > 0)
+                {
+                    UpdatePieRingList();
+
+                    PieChartVisualStyle pStyle = EffectiveChartStyle;
+
+                    int innerRadius = (int)(ReverseRingOrder ? OuterRadiusEx : InnerRadiusEx);
+                    int outerRadius = (int)(ReverseRingOrder ? InnerRadiusEx : OuterRadiusEx);
+
+                    double ringWidth = Math.Max(0, (OuterRadiusEx - InnerRadiusEx));
+
+                    double width = ringWidth;
+                    int seriesMargin = GetSeriesMargin();
+
+                    if (SeriesOverlayEnabled == false)
+                    {
+                        if (pieSeries.Count > 1)
+                            width -= (pieSeries.Count - 1) * seriesMargin;
+                    }
+
+                    bool revOrder = (SeriesDisplayOrder == SeriesDisplayOrder.Reverse) ^ (ReverseRingOrder == true);
+
+                    if (revOrder == true)
+                    {
+                        for (int i = pieSeries.Count - 1; i >= 0; i--)
+                            ArrangeSeriesEx(layoutInfo, pieSeries[i], pStyle, ref outerRadius, width, seriesMargin);
+                    }
+                    else
+                    {
+                        for (int i = 0; i < pieSeries.Count; i++)
+                            ArrangeSeriesEx(layoutInfo, pieSeries[i], pStyle, ref outerRadius, width, seriesMargin);
+                    }
+
+                    AdjustSeriesWidths(pieSeries, seriesMargin);
+                }
+            }
+        }
+
+        #region AdjustSeriesWidths
+
+        private void AdjustSeriesWidths(List<PieSeries> pieSeries, int seriesMargin)
+        {
+            int pieWidth = (int)(OuterRadiusEx - InnerRadiusEx);
+
+            if (SeriesOverlayEnabled == false)
+                pieWidth -= ((pieSeries.Count - 1) * seriesMargin);
+
+            int seriesWidth = 0;
+
+            foreach (PieSeries series in pieSeries)
+            {
+                seriesWidth += series.RingWeightEx;
+
+                if (SeriesOverlayEnabled == true)
+                    break;
+            }
+
+            if (seriesWidth < pieWidth)
+            {
+                int n = 0;
+                int count = pieWidth - seriesWidth;
+
+                for (int i = 0; i < pieSeries.Count; i++)
+                {
+                    PieSeries series = pieSeries[i];
+
+                    if (i < count)
+                        series.RingWeightEx++;
+
+                    AdjustRingWidths(series, n);
+
+                    if (i < count)
+                        n++;
+                }
+            }
+        }
+
+        #region AdjustRingWidths
+
+        private void AdjustRingWidths(PieSeries series, int offset)
+        {
+            int seriesWidth = series.RingWeightEx;
+
+            int ringWidth = 0;
+
+            foreach (PieRing pieRing in series.PieRings)
+                ringWidth += (pieRing.OuterRadius - pieRing.InnerRadius);
+
+            int n = 0;
+            int count = seriesWidth - ringWidth;
+
+            if (ReverseRingOrder == true)
+            {
+                for (int i = series.PieRings.Count - 1; i >= 0; i--)
+                {
+                    PieRing pieRing = series.PieRings[i];
+
+                    pieRing.InnerRadius += offset;
+                    pieRing.OuterRadius += offset;
+
+                    if (n < count)
+                    {
+                        pieRing.InnerRadius += n;
+                        pieRing.OuterRadius += (n + 1);
+
+                        n++;
+                    }
+
+                    AdjustPspWidths(pieRing);
+                }
+            }
+            else
+            {
+                for (int i = 0; i < series.PieRings.Count; i++)
+                {
+                    PieRing pieRing = series.PieRings[i];
+
+                    pieRing.OuterRadius -= offset;
+                    pieRing.InnerRadius -= offset;
+
+                    if (n < count)
+                    {
+                        pieRing.OuterRadius -= n;
+                        pieRing.InnerRadius -= (n + 1);
+
+                        n++;
+                    }
+
+                    AdjustPspWidths(pieRing);
+                }
+            }
+        }
+
+        #region AdjustPspWidths
+
+        private void AdjustPspWidths(PieRing pieRing)
+        {
+            int ringWidth = (pieRing.OuterRadius - pieRing.InnerRadius);
+
+            foreach (PieSeriesPoint psp in pieRing.Psps)
+            {
+                psp.OuterRadius = pieRing.OuterRadius;
+                psp.InnerRadius = pieRing.InnerRadius;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region GetVisibleSeries
+
+        private List<PieSeries> GetVisibleSeries()
+        {
+            List<PieSeries> pieSeries = new List<PieSeries>();
+
+            foreach (PieSeries series in ChartSeries)
+            {
+                if (series.IsDisplayed == true)
+                    pieSeries.Add(series);
+            }
+
+            return (pieSeries);
+        }
+
+        #endregion
+
+        #region UpdatePieRingList
+
+        private void UpdatePieRingList()
+        {
+            PieRing innerRing = null;
+            PieRing outerRing = null;
+
+            if (SeriesDisplayOrder == SeriesDisplayOrder.Reverse)
+            {
+                for (int i = ChartSeries.Count - 1; i >= 0; i--)
+                    UpdatePieRingListEx(ChartSeries[i], ref innerRing, ref outerRing);
+            }
+            else
+            {
+                for (int i = 0; i < ChartSeries.Count; i++)
+                    UpdatePieRingListEx(ChartSeries[i], ref innerRing, ref outerRing);
+            }
+
+            if (innerRing != null)
+            {
+                innerRing.IsInnerRing = true;
+                innerRing.ChartSeries.IsInnerRingSeries = true;
+            }
+
+            if (outerRing != null)
+            {
+                outerRing.IsOuterRing = true;
+                outerRing.ChartSeries.IsOuterRingSeries = true;
+            }
+        }
+
+        #region UpdatePieRingListEx
+
+        private void UpdatePieRingListEx(
+            PieSeries series, ref PieRing innerRing, ref PieRing outerRing)
+        {
+            if (series.IsDisplayed == true)
+            {
+                if (series.PieRings.Count > 0)
+                {
+                    if (ReverseRingOrder == true)
+                    {
+                        if (outerRing == null)
+                            outerRing = series.PieRings[series.PieRings.Count - 1];
+
+                        innerRing = series.PieRings[0];
+                    }
+                    else
+                    {
+                        if (outerRing == null)
+                            outerRing = series.PieRings[0];
+
+                        innerRing = series.PieRings[series.PieRings.Count - 1];
+                    }
+
+                    series.IsInnerRingSeries = false;
+                    series.IsOuterRingSeries = false;
+
+                    for (int j = 0; j < series.PieRings.Count; j++)
+                    {
+                        PieRing pieRing = series.PieRings[j];
+
+                        pieRing.IsOuterRing = false;
+                        pieRing.IsInnerRing = false;
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetSeriesMargin
+
+        private int GetSeriesMargin()
+        {
+            //if (SeriesMargin <= 0)
+            //    return (0);
+
+            if (Math.Abs(SeriesMargin) >= 1)
+                return ((int)SeriesMargin);
+
+            return (int)(SeriesMargin * (OuterRadiusEx - InnerRadiusEx));
+        }
+
+        #endregion
+
+        #region ArrangeSeriesEx
+
+        private void ArrangeSeriesEx(ChartLayoutInfo layoutInfo, PieSeries series,
+            PieChartVisualStyle pStyle, ref int outerRadius, double dwidth, int seriesMargin)
+        {
+            if (series.IsDisplayed == true)
+            {
+                series.Arrange(layoutInfo);
+
+                int width = (SeriesOverlayEnabled == false)
+                    ? (int)(dwidth * ((double)series.RingWeight / RingWeightTotal))
+                    : (int)(dwidth);
+
+                ArrangePieSlices(series, outerRadius, width);
+
+                series.RingWeightEx = width;
+
+                if (SeriesOverlayEnabled == false)
+                {
+                    if (ReverseRingOrder == true)
+                    {
+                        if (series.IsOuterRingSeries == false)
+                            width += seriesMargin;
+
+                        outerRadius += width;
+                    }
+                    else
+                    {
+                        if (series.IsInnerRingSeries == false)
+                            width += seriesMargin;
+
+                        outerRadius -= width;
+                    }
+                }
+            }
+        }
+
+        #region ArrangePieSlices
+
+        private void ArrangePieSlices(PieSeries series, int outerRadius, int width)
+        {
+            series.IsOffset = false;
+
+            PieSeriesPointCollection spc = series.GetActiveSeriesPointCollection();
+
+            if (spc != null)
+            {
+                if (spc.PieSlices != null)
+                    spc = spc.PieSlices;
+
+                if (spc != null && spc.Count > 0)
+                {
+                    int sweepDir = GetSweepDirEx(series);
+                    double sweepAngle = GetSweepAngle(series);
+
+                    CalculateSweepAngles(spc, spc.PieTotal, sweepAngle, sweepDir);
+
+                    double startAngle = GetStartAngle(series);
+                    bool centerFirstSlice = GetCenterFirstSlice(series);
+
+                    ArrangePieSlicesEx(series, spc,
+                        outerRadius, width, startAngle, centerFirstSlice);
+                }
+            }
+        }
+
+        #region GetCenterFirstSlice
+
+        private bool GetCenterFirstSlice(PieSeries series)
+        {
+            Tbool centerSlice = series.CenterFirstSlice;
+
+            if (centerSlice == Tbool.NotSet)
+                centerSlice = CenterFirstSlice;
+
+            return (centerSlice == Tbool.True);
+        }
+
+        #endregion
+
+        #region GetSweepDirEx
+
+        internal int GetSweepDirEx(PieSeries series)
+        {
+            SweepDirection sweepDir = series.SubSliceVisualLayout.SweepDirection;
+
+            if (sweepDir == SweepDirection.NotSet)
+                sweepDir = SubSliceVisualLayout.SweepDirection;
+
+            return (sweepDir == SweepDirection.CounterClockwise) ? -1 : 1;
+        }
+
+        #endregion
+
+        #region GetSweepAngle
+
+        private double GetSweepAngle(PieSeries series)
+        {
+            double sweepAngle = series.SubSliceVisualLayout.SweepAngle;
+
+            if (double.IsNaN(sweepAngle) == false)
+                return (sweepAngle);
+
+            sweepAngle = SubSliceVisualLayout.SweepAngle;
+
+            return (double.IsNaN(sweepAngle) == false ? sweepAngle : 360d);
+        }
+
+        #endregion
+
+        #region GetStartAngle
+
+        private double GetStartAngle(PieSeries series)
+        {
+            double startAngle = series.SubSliceVisualLayout.StartAngle;
+
+            if (double.IsNaN(startAngle) == false)
+                return (startAngle);
+
+            startAngle = SubSliceVisualLayout.StartAngle;
+
+            return (double.IsNaN(startAngle) == false ? startAngle : 270d);
+        }
+
+        #endregion
+
+        #region CalculateSweepAngles
+
+        private void CalculateSweepAngles
+            (PieSeriesPointCollection spc, double pieTotal, double degrees, int sweepDir)
+        {
+            if (spc != null && spc.Count > 0)
+            {
+                if (pieTotal > 0)
+                {
+                    foreach (PieSeriesPoint psp in spc)
+                    {
+                        psp.SweepAngleEx = 0;
+                        psp.AngleMarginExx = 0;
+
+                        if (double.IsNaN(psp.SweepAngle) == false)
+                            psp.SweepAngleEx = psp.SweepAngle;
+                        else
+                            psp.SweepAngleEx = psp.SliceValue * degrees;
+
+                        if (psp.AngleMarginEx > 0)
+                        {
+                            psp.AngleMarginExx = psp.AngleMarginEx;
+
+                            if (psp.SweepAngleEx < (psp.AngleMarginEx * 2))
+                                psp.AngleMarginExx = psp.SweepAngleEx / 2 - 1;
+
+                            if (psp.AngleMarginExx > 0)
+                                psp.SweepAngleEx -= (psp.AngleMarginExx * 2);
+                        }
+
+                        CalculateSweepAngles(
+                            psp.SeriesPoints.PieSlices, psp.SeriesPoints.PieTotal, psp.SweepAngleEx, sweepDir);
+
+                        psp.SweepAngleEx *= sweepDir;
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region ArrangePieSlicesEx
+
+        private void ArrangePieSlicesEx(PieSeries series,
+            PieSeriesPointCollection spc, int outerRadius, int width, double sliceAngle, bool centerSlice)
+        {
+            if (spc.PieSlices != null)
+                spc = spc.PieSlices;
+
+            if (spc != null && spc.Count > 0)
+            {
+                if (series.ShowAllRingsEx(this) == true)
+                {
+                    ArrangeAllPieRings(series,
+                        spc, outerRadius, width, sliceAngle, centerSlice);
+                }
+                else
+                {
+                    ArrangeSinglePieRing(series,
+                            spc, outerRadius, width, sliceAngle, centerSlice);
+                }
+            }
+        }
+
+        #region ArrangeAllPieRings
+
+        private void ArrangeAllPieRings(PieSeries series,
+            PieSeriesPointCollection spc, int outerRadius, int width, double startAngle, bool centerSlice)
+        {
+            if (series.RingWeightTotal != 0)
+            {
+                if (spc.PieRing != null)
+                {
+                    int awidth = (int)(width *
+                        (double)spc.PieRing.RingWeight / series.RingWeightTotal);
+
+                    int innerRadius = outerRadius - ((ReverseRingOrder == true) ? -awidth : awidth);
+
+                    spc.PieRing.OuterRadius = (ReverseRingOrder == true) ? innerRadius : outerRadius;
+                    spc.PieRing.InnerRadius = (ReverseRingOrder == true) ? outerRadius : innerRadius;
+
+                    int sdir = GetSweepDirEx(series);
+
+                    for (int i = 0; i < spc.Count; i++)
+                    {
+                        PieSeriesPoint psp = spc[i] as PieSeriesPoint;
+
+                        if (psp != null)
+                        {
+                            psp.StartAngleEx = (startAngle + 360000) % 360;
+                            startAngle += psp.SweepAngleEx;
+
+                            if (double.IsNaN(psp.StartAngle) == false)
+                                psp.StartAngleEx = psp.StartAngle;
+
+                            if (centerSlice == true)
+                            {
+                                centerSlice = false;
+
+                                startAngle -= (psp.SweepAngleEx / 2);
+                                psp.StartAngleEx -= (int)((psp.SweepAngleEx + psp.AngleMarginExx * sdir) / 2);
+                            }
+
+                            if (psp.AngleMarginExx > 0)
+                            {
+                                double n = psp.AngleMarginExx * sdir;
+
+                                startAngle += (n * 2);
+                                psp.StartAngleEx += n;
+                            }
+
+                            psp.OuterRadius = spc.PieRing.OuterRadius;
+                            psp.InnerRadius = spc.PieRing.InnerRadius;
+
+                            int extentRadius = (int)psp.ExtentRadius;
+
+                            if (extentRadius > spc.PieRing.ExtentRadius)
+                                spc.PieRing.ExtentRadius = extentRadius;
+
+                            PieSeriesPoint pspParent = spc.Parent as PieSeriesPoint;
+
+                            if (pspParent == null)
+                            {
+                                psp.SliceCenter = GetSliceCenter(series, spc, psp);
+                            }
+                            else
+                            {
+                                psp.SliceCenter = pspParent.SliceCenter;
+                                psp.IsOffset = pspParent.IsOffset;
+
+                                double offset = GetDetachedOffset(psp);
+
+                                if (offset > 0)
+                                {
+                                    double centerAngle = psp.CenterAngle;
+                                    double radians = MathHelper.ToRadians(centerAngle);
+
+                                    Point pt = psp.SliceCenter;
+
+                                    pt.X += (int)(Math.Cos(radians) * offset);
+                                    pt.Y += (int)(Math.Sin(radians) * offset);
+
+                                    psp.SliceCenter = pt;
+
+                                    psp.IsOffset = psp.SliceCenter.Equals(CenterPoint);
+                                }
+                            }
+
+                            ArrangePieSlicesEx(series,
+                                psp.SeriesPoints, innerRadius, width, psp.StartAngleEx, false);
+
+                            psp.PathBounds = Rectangle.Empty;
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region ArrangeSinglePieRing
+
+        private int ArrangeSinglePieRing(PieSeries series,
+            PieSeriesPointCollection spc, int outerRadius, int width, double startAngle, bool centerSlice)
+        {
+            int innerRadius = outerRadius - ((ReverseRingOrder == true) ? -width : width);
+
+            bool isInnerRing = false;
+            bool isOuterRing = false;
+
+            GetRingBorderState(series, spc, ref isOuterRing, ref isInnerRing);
+
+            spc.PieRing.OuterRadius = (ReverseRingOrder == true) ? innerRadius : outerRadius;
+            spc.PieRing.InnerRadius = (ReverseRingOrder == true) ? outerRadius : innerRadius;
+
+            int vcount = spc.VisibleCount;
+
+            int sdir = GetSweepDirEx(series);
+
+            for (int i = 0; i < spc.Count; i++)
+            {
+                PieSeriesPoint psp = spc[i] as PieSeriesPoint;
+
+                if (psp != null)
+                {
+                    psp.StartAngleEx = (startAngle + 360000) % 360;
+                    startAngle += psp.SweepAngleEx;
+
+                    if (double.IsNaN(psp.StartAngle) == false)
+                        psp.StartAngleEx = psp.StartAngle;
+
+                    if (centerSlice == true)
+                    {
+                        centerSlice = false;
+
+                        startAngle -= (psp.SweepAngleEx / 2);
+                        psp.StartAngleEx -= (int)((psp.SweepAngleEx + psp.AngleMarginExx * sdir) / 2);
+                    }
+
+                    if (psp.AngleMarginExx > 0)
+                    {
+                        double n = psp.AngleMarginExx * sdir;
+
+                        startAngle += (n * 2);
+                        psp.StartAngleEx += n;
+                    }
+
+                    psp.OuterRadius = spc.PieRing.OuterRadius;
+                    psp.InnerRadius = spc.PieRing.InnerRadius;
+
+                    psp.SliceCenter = GetSliceCenter(series, spc, psp);
+
+                    spc.PieRing.OuterRadius = psp.OuterRadius;
+                    spc.PieRing.InnerRadius = psp.InnerRadius;
+
+                    int extentRadius = (int)psp.ExtentRadius;
+
+                    if (extentRadius > spc.PieRing.ExtentRadius)
+                        spc.PieRing.ExtentRadius = extentRadius;
+
+                    psp.PathBounds = Rectangle.Empty;
+                }
+            }
+
+            return (Math.Abs(outerRadius - innerRadius));
+        }
+
+        #endregion
+
+        #region AdjustForAngleMargin
+
+        private void AdjustForAngleMargin(PieSeries series, PieSeriesPoint psp)
+        {
+            double angleMargin = psp.AngleMarginExx;
+
+            if (angleMargin != 0)
+            {
+                if (angleMargin != 0)
+                {
+                    angleMargin *= GetSweepDirEx(series);
+
+                    psp.StartAngleEx += (angleMargin);
+                    psp.SweepAngleEx -= (angleMargin * 2);
+                }
+            }
+        }
+
+        #endregion
+
+        #region GetRingBorderState
+
+        private void GetRingBorderState(PieSeries series,
+            PieSeriesPointCollection spc, ref bool isOuterRing, ref bool isInnerRing)
+        {
+            if (series.IsInnerRingSeries == true)
+            {
+                if (series.ShowAllRingsEx(this) == true)
+                    isInnerRing = spc.PieRing.IsInnerRing;
+                else
+                    isInnerRing = true;
+            }
+
+            if (series.IsOuterRingSeries == true)
+            {
+                if (series.ShowAllRingsEx(this) == true)
+                    isOuterRing = spc.PieRing.IsOuterRing;
+                else
+                    isOuterRing = true;
+            }
+        }
+
+        #endregion
+
+        #region GetSliceCenter
+
+        private Point GetSliceCenter(PieSeries series,
+            PieSeriesPointCollection spc, PieSeriesPoint psp)
+        {
+            Point sliceCenter = CenterPoint;
+
+            if (IsExploded == false && psp.IsDetached == false)
+                return (sliceCenter);
+
+            double offset = GetPspOffset(series, psp);
+
+            psp.IsOffset = false;
+
+            if (offset > 0)
+            {
+                if (spc.Count > 1)
+                {
+                    double centerAngle = psp.StartAngleEx + psp.SweepAngleEx / 2;
+                    double radians = MathHelper.ToRadians(centerAngle);
+
+                    sliceCenter.X += (int)(Math.Cos(radians) * offset);
+                    sliceCenter.Y += (int)(Math.Sin(radians) * offset);
+
+                    psp.IsOffset = true;
+                    series.IsOffset = true;
+                }
+                else
+                {
+                    psp.InnerRadius += (int)offset;
+                    psp.OuterRadius += (int)offset;
+                }
+            }
+
+            return (sliceCenter);
+        }
+
+        #region GetPspOffset
+
+        internal double GetPspOffset(PieSeries series, PieSeriesPoint psp)
+        {
+            double offset = ExplodedOffsetEx + GetDetachedOffset(psp);
+
+            if (series.IsOuterRingSeries == false && IsExploded == true)
+            {
+                double expMargin = GetExplodedMargin(series);
+
+                offset -= expMargin;
+            }
+
+            return (offset);
+        }
+
+        #region GetExplodedMargin
+
+        internal double GetExplodedMargin(PieSeries series)
+        {
+            double margin = 0;
+
+            if (IsExploded == true)
+            {
+                for (int i = 0; i < ChartSeries.Count; i++)
+                {
+                    PieSeries aseries = ChartSeries[i];
+
+                    if (series.IsDisplayed == true)
+                    {
+                        if (aseries.IsOuterRingSeries == false)
+                        {
+                            if (aseries.IsDisplayed == true)
+                                margin += GetExplodedMarginEx(aseries);
+                        }
+
+                        if (series == aseries)
+                            break;
+                    }
+                }
+            }
+
+            return (margin);
+        }
+
+        #region GetExplodedMarginEx
+
+        internal double GetExplodedMarginEx(PieSeries series)
+        {
+            if (IsExploded == true)
+            {
+                double margin = (double.IsNaN(series.ExplodedMargin) == false)
+                    ? series.ExplodedMargin : ExplodedMargin;
+
+                if (margin > 0)
+                {
+                    if (margin >= 1)
+                        return (margin);
+
+                    return (OuterRadiusEx * margin);
+                }
+            }
+
+            return (0);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetDetachedOffset
+
+        internal double GetDetachedOffset(PieSeriesPoint psp)
+        {
+            if (psp != null && psp.IsDetached == true)
+            {
+                double detachedOffset = double.IsNaN(psp.DetachedOffset) == false
+                    ? psp.DetachedOffset : DetachedOffset;
+
+                if (double.IsNaN(detachedOffset) == false)
+                {
+                    if (Math.Abs(detachedOffset) >= 1)
+                        return (detachedOffset);
+
+                    return (OuterRadiusEx * detachedOffset);
+                }
+            }
+
+            return (0);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region RenderOverride
+
+        protected override void RenderOverride(ChartRenderInfo renderInfo)
+        {
+            Graphics g = renderInfo.Graphics;
+
+            SmoothingMode sm = g.SmoothingMode;
+            g.SmoothingMode = SmoothingMode.AntiAlias;
+
+            PieChartVisualStyle pStyle = EffectiveChartStyle;
+            ContainerVisualStyle cStyle = GetEffectiveContainerStyle();
+
+            Rectangle scFrameBounds = GetScrollBounds(FrameBounds);
+            Rectangle scContentBounds = GetScrollBounds(ContentBounds);
+
+            _RenderBounds = ContentBounds;
+            _RenderBounds.Location = GetGlobalAdjustedPoint(_RenderBounds.Location);
+
+            Rectangle scFigureBounds = GetFigureBounds(scFrameBounds, cStyle);
+
+            RenderFrameBackground(g, scFrameBounds, cStyle);
+
+            cStyle.RenderBackgroundFigure(g, scFigureBounds);
+            cStyle.RenderBorder(g, scFrameBounds);
+
+            Region clip = g.Clip;
+            g.SetClip(scContentBounds, CombineMode.Intersect);
+
+            Rectangle imageBounds = GetXyImageBounds(pStyle);
+
+            if (pStyle.ImageOverlay != ImageOverlay.Top && pStyle.ImageOverlay != ImageOverlay.Middle)
+                pStyle.RenderBackgroundFigure(g, scContentBounds, imageBounds);
+
+            Point cpt = Point.Empty;
+            Rectangle cbounds = Rectangle.Empty;
+
+            if (pStyle.ImageOverlay == ImageOverlay.Middle)
+                pStyle.RenderBackgroundFigure(g, scContentBounds, imageBounds);
+
+            if (InnerRadiusEx < OuterRadiusEx)
+            {
+                Point pt = GetLocalAdjustedPoint(Point.Empty);
+
+                if (pt.IsEmpty == false)
+                    g.TranslateTransform(pt.X, pt.Y);
+
+                RenderContentBackground(renderInfo, scContentBounds, pStyle);
+
+                if (ShowGridOnTop == false)
+                    RenderChartGrid(renderInfo, pStyle);
+
+                RenderChartContent(renderInfo, pStyle);
+
+                if (ShowGridOnTop == true)
+                    RenderChartGrid(renderInfo, pStyle);
+
+                RenderChartOuterLabels(renderInfo, pStyle);
+
+                if (pt.IsEmpty == false)
+                    g.ResetTransform();
+            }
+
+            g.Clip = clip;
+
+            pStyle.RenderBorder(g, scContentBounds);
+
+            if (pStyle.ImageOverlay == ImageOverlay.Top)
+                pStyle.RenderBackgroundFigure(g, scContentBounds, imageBounds);
+
+            RenderScrollbars(renderInfo);
+
+            if (pStyle.DropShadow.Enabled == Tbool.True)
+                pStyle.DropShadow.RenderDropShadow(g, scContentBounds, true, true);
+
+            if (cStyle.DropShadow.Enabled == Tbool.True)
+                cStyle.DropShadow.RenderDropShadow(g, scFrameBounds, true, true);
+
+            g.SmoothingMode = sm;
+
+            base.RenderOverride(renderInfo);
+        }
+
+        #region RenderChartOuterLabels
+
+        private void RenderChartOuterLabels(
+            ChartRenderInfo renderInfo, PieChartVisualStyle pstyle)
+        {
+            Graphics g = renderInfo.Graphics;
+
+            List<PieLabel> pieLabels = GetPieLabels(g);
+
+            if (pieLabels != null)
+            {
+                ChartControl chartControl = ChartControl;
+
+                using (StringFormat sf = new StringFormat())
+                {
+                    foreach (PieLabel pl in pieLabels)
+                    {
+                        if (pl.Bounds.Height > 0 && pl.Bounds.Width > 0)
+                        {
+                            PieSeriesPoint psp = pl.PieSeriesPoint;
+
+                            if (psp.ChartSeries.IsLabelDisplayed(this, psp) == true)
+                            {
+                                SliceOuterLabelVisualStyle lstyle =
+                                    psp.GetEffectiveSliceStyle(this, psp.ChartSeries).SliceOuterLabelStyle;
+
+                                if (chartControl.DoRenderSliceOuterLabelEvent(g, this, psp, pl) == false)
+                                {
+                                    RenderOuterLabelBackground(g, pl, lstyle);
+                                    RenderOuterLabelContent(g, pl, sf, lstyle);
+                                    RenderOuterLabelBorder(g, pl, lstyle);
+                                    RenderOuterLabelConnector(g, pl, lstyle);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        #region GetPieLabels
+
+        private List<PieLabel> GetPieLabels(Graphics g)
+        {
+            if (_PieLabels == null)
+            {
+                if (SeriesOverlayEnabled == false)
+                {
+                    PieSeries series = GetOuterSeries();
+
+                    _PieLabels = GetPieLabelsEx(g, series);
+                }
+                else
+                {
+                    _PieLabels = new List<PieLabel>();
+
+                    foreach (PieSeries series in ChartSeries)
+                    {
+                        if (series.IsDisplayed == true)
+                        {
+                            List<PieLabel> pieLabels = GetPieLabelsEx(g, series);
+
+                            if (pieLabels != null)
+                                _PieLabels.AddRange(pieLabels);
+                        }
+                    }
+                }
+           }
+
+            return (_PieLabels);
+        }
+
+        #region GetPieLabelsEx
+
+        private List<PieLabel> GetPieLabelsEx(Graphics g, PieSeries series)
+        {
+            if (series != null && series.Visible == true)
+            {
+                List<PieLabel> pieLabels = series.GetPieLabels(g, this);
+
+                if (pieLabels != null)
+                {
+                    ContainerVisualStyle cstyle = GetEffectiveContainerStyle();
+                    Rectangle r = GetAdjustedBounds(ContentBoundsEx, cstyle.BorderThickness);
+
+                    RadialAlign ralign = new RadialAlign(pieLabels);
+
+                    ralign.Iterate(g, this, r);
+                }
+
+                return (pieLabels);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetOuterSeries
+
+        private PieSeries GetOuterSeries()
+        {
+            if (ChartSeries.Count > 0)
+            {
+                if (ChartSeries.Count > 0)
+                {
+                    foreach (PieSeries series in ChartSeries)
+                    {
+                        if (series.IsDisplayed == true && series.IsOuterRingSeries == true)
+                            return (series);
+                    }
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetInnerSeries
+
+        private PieSeries GetInnerSeries()
+        {
+            if (ChartSeries.Count > 0)
+            {
+                foreach (PieSeries series in ChartSeries)
+                {
+                    if (series.IsDisplayed == true && series.IsInnerRingSeries == true)
+                        return (series);
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderOuterLabelBackground
+
+        private void RenderOuterLabelBackground(
+            Graphics g, PieLabel pl, SliceOuterLabelVisualStyle lstyle)
+        {
+            if (lstyle.Background.IsEmpty == false)
+            {
+                using (Brush br = lstyle.Background.GetBrush(pl.Bounds))
+                    g.FillRectangle(br, pl.Bounds);
+            }
+        }
+
+        #endregion
+
+        #region RenderOuterLabelContent
+
+        private void RenderOuterLabelContent(Graphics g,
+            PieLabel pl, StringFormat sf, SliceOuterLabelVisualStyle lstyle)
+        {
+            lstyle.GetStringFormatFlags(sf, false);
+
+            Rectangle r = GetAdjustedBounds(pl.Bounds, lstyle.Padding);
+
+            using (Brush br = new SolidBrush(lstyle.TextColor))
+                g.DrawString(pl.Label, lstyle.Font, br, r, sf);
+        }
+
+        #endregion
+
+        #region RenderOuterLabelBorder
+
+        private void RenderOuterLabelBorder(
+            Graphics g, PieLabel pl, SliceOuterLabelVisualStyle lstyle)
+        {
+            if (lstyle.Border.IsDisplayable == true)
+            {
+                using (Pen pen = new Pen(lstyle.Border.LineColor, Dpi.Width(lstyle.Border.LineWidth)))
+                {
+                    if (lstyle.Border.LinePattern != LinePattern.NotSet)
+                        pen.DashStyle = (DashStyle)lstyle.Border.LinePattern;
+
+                    g.DrawRectangle(pen, pl.Bounds);
+                }
+            }
+        }
+
+        #endregion
+
+        #region RenderOuterLabelConnector
+
+        private void RenderOuterLabelConnector(
+            Graphics g, PieLabel pl, SliceOuterLabelVisualStyle lstyle)
+        {
+            if (lstyle.DrawConnector == Tbool.True)
+            {
+                if (lstyle.ConnectorColor.IsEmpty == false && lstyle.ConnectorThickness > 0 &&
+                    lstyle.ConnectorPattern != LinePattern.None)
+                {
+                    using (Pen pen = new Pen(lstyle.ConnectorColor, Dpi.Width(lstyle.ConnectorThickness)))
+                    {
+                        if (lstyle.ConnectorPattern != LinePattern.NotSet)
+                            pen.DashStyle = (DashStyle)lstyle.ConnectorPattern;
+
+                        g.DrawLines(pen,
+                            new Point[] { pl.PtBoxEdge, pl.PtBoxBend, pl.PtSliceEdge });
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderChartGrid
+
+        private void RenderChartGrid(ChartRenderInfo renderInfo, PieChartVisualStyle pstyle)
+        {
+            if (ShowPieGrid == true)
+            {
+                double startAngle = SubSliceVisualLayout.StartAngle;
+                double sweepAngle = SubSliceVisualLayout.SweepAngle;
+
+                if (double.IsNaN(startAngle) == true)
+                    startAngle = 270;
+
+                if (double.IsNaN(sweepAngle) == true)
+                    sweepAngle = 360;
+
+                if (sweepAngle > 0)
+                {
+                    ChartControl chartControl = ChartControl;
+
+                    if (GridMinValue != GridMaxValue && GridInterval != 0)
+                    {
+                        int dv = (int)Math.Ceiling((GridMaxValue - GridMinValue) / GridInterval);
+
+                        if (dv > 0)
+                        {
+                            Graphics g = renderInfo.Graphics;
+
+                            double exp = GetExplodedOffset();
+
+                            int outerRadius = (int)(GridOuterRadiusEx + exp);
+                            int innerRadius = (int)(GridInnerRadiusEx + exp);
+
+                            if (chartControl.DoPreRenderRadialGridEvent(g, this, OuterRadiusExx, InnerRadiusEx, exp) == false)
+                            {
+                                int sdir = (SubSliceVisualLayout.SweepDirection == SweepDirection.CounterClockwise) ? -1 : 1;
+                                double delta = (double)(outerRadius - innerRadius) / dv;
+
+                                PieGridLineVisualStyle gstyle = pstyle.GridLineVisualStyle;
+
+                                using (Pen pen = new Pen(gstyle.LineColor, Dpi.Width(gstyle.LineWidth)))
+                                {
+                                    if (gstyle.LinePattern != LinePattern.NotSet)
+                                        pen.DashStyle = (DashStyle)gstyle.LinePattern;
+
+                                    if (UseAlternateGridBackground == false)
+                                    {
+                                        RenderChartGridLine(g, pen,
+                                            innerRadius, startAngle, sweepAngle, sdir, dv, delta);
+                                    }
+                                    else
+                                    {
+                                        RenderChartGridLinePath(g, pen,
+                                            innerRadius, startAngle, sweepAngle, sdir, dv, delta, pstyle);
+                                    }
+
+                                    if (ShowFullGrid == false && sweepAngle < 360)
+                                    {
+                                        RenderGridRay(g, pen, innerRadius, outerRadius, startAngle);
+                                        RenderGridRay(g, pen, innerRadius, outerRadius, startAngle + sweepAngle * sdir);
+                                    }
+                                }
+
+                                chartControl.DoPostRenderRadialGridEvent(g, this, OuterRadiusExx, InnerRadiusEx, exp);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        #region RenderChartGridLine
+
+        private void RenderChartGridLine(Graphics g, Pen pen, int innerRadius,
+            double startAngle, double sweepAngle, int sdir, int dv, double delta)
+        {
+            Rectangle r = new Rectangle();
+
+            for (int i = 0; i <= dv; i++)
+            {
+                int n = (int)(innerRadius + delta * i);
+
+                if (n > 0)
+                {
+                    r.Location = CenterPoint;
+                    r.Size = Size.Empty;
+                    r.Inflate(n, n);
+
+                    if (ShowFullGrid == true || sweepAngle >= 360)
+                        g.DrawEllipse(pen, r);
+                    else
+                        g.DrawArc(pen, r, (float)startAngle, (float)sweepAngle * sdir);
+                }
+            }
+        }
+
+        #endregion
+
+        #region RenderChartGridLinePath
+
+        private void RenderChartGridLinePath(Graphics g, Pen pen, int innerRadius,
+            double startAngle, double sweepAngle, int sdir, int dv, double delta, PieChartVisualStyle pstyle)
+        {
+            Rectangle r = new Rectangle();
+
+            using (GraphicsPath path = new GraphicsPath())
+            {
+                r.Location = CenterPoint;
+                r.Inflate((int)OuterRadiusEx, (int)OuterRadiusEx);
+
+                using (Brush br = pstyle.AlternateGridBackground.GetBrush(r))
+                {
+                    for (int i = 0; i <= dv; i++)
+                    {
+                        int n = (int)(innerRadius + delta * i);
+
+                        if (n > 0)
+                        {
+                            r.Location = CenterPoint;
+                            r.Size = Size.Empty;
+                            r.Inflate(n, n);
+
+                            if (ShowFullGrid == true || sweepAngle >= 360)
+                            {
+                                path.AddEllipse(r);
+                            }
+                            else
+                            {
+                                if (i % 2 == 0)
+                                    path.AddArc(r, (float)startAngle, (float)sweepAngle * sdir);
+                                else
+                                    path.AddArc(r, (float)(startAngle + sweepAngle * sdir), -(float)sweepAngle * sdir);
+                            }
+
+                            if (i % 2 == 1)
+                            {
+                                g.FillPath(br, path);
+                                g.DrawPath(pen, path);
+
+                                path.Reset();
+                            }
+                        }
+                    }
+
+                    if (path.PointCount > 0)
+                        g.DrawPath(pen, path);
+                }
+            }
+        }
+
+        #endregion
+
+        #region RenderGridRay
+
+        private void RenderGridRay(Graphics g,
+            Pen pen, int innerRadius, int outerRadius, double angle)
+        {
+            double radians = MathHelper.ToRadians(angle);
+
+            int x = CenterPoint.X + (int)(Math.Cos(radians) * innerRadius);
+            int y = CenterPoint.Y + (int)(Math.Sin(radians) * innerRadius);
+
+            Point pt1 = new Point(x, y);
+
+            x = CenterPoint.X + (int)(Math.Cos(radians) * outerRadius);
+            y = CenterPoint.Y + (int)(Math.Sin(radians) * outerRadius);
+
+            Point pt2 = new Point(x, y);
+
+            g.DrawLine(pen, pt1, pt2);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderContentBackground
+
+        private void RenderContentBackground(
+            ChartRenderInfo renderInfo, Rectangle bounds, PieChartVisualStyle pstyle)
+        {
+            Graphics g = renderInfo.Graphics;
+            ChartControl chartControl = ChartControl;
+
+            if (chartControl.DoPreRenderContentBackgroundEvent(g, this, bounds) == false)
+            {
+                pstyle.RenderBackground(g, bounds);
+
+                Rectangle r = new Rectangle();
+
+                r.Location = CenterPoint;
+                r.Inflate((int)InnerRadiusEx, (int)InnerRadiusEx);
+
+                if (r.IntersectsWith(_RenderBounds) == true)
+                {
+                    RenderPieCenter(g, pstyle);
+
+                    if ((PieRingOutDisplayMode == PieRingOutDisplayMode.OnMouseOver && HitArea == ItemHitArea.InPieRingOut) ||
+                        (PieRingOutDisplayMode == PieRingOutDisplayMode.Always && PresentRingOut() == true))
+                    {
+                        RenderPieRingOut(g, pstyle);
+                    }
+                }
+
+                chartControl.DoPostRenderContentBackgroundEvent(g, this, bounds);
+            }
+        }
+
+        #region RenderPieCenter
+
+        private void RenderPieCenter(Graphics g, PieChartVisualStyle pstyle)
+        {
+            if ((CenterLabelVisibility == CenterLabelVisibility.Always) ||
+                (CenterLabelVisibility == CenterLabelVisibility.MouseOver && HitArea == ItemHitArea.InPieCenter))
+            {
+                int margin = (int)InnerMarginEx;
+
+                Rectangle rc = new Rectangle();
+                rc.Location = CenterPoint;
+                rc.Inflate((int)InnerRadiusEx - margin, (int)InnerRadiusEx - margin);
+
+                if (rc.Width > 0)
+                {
+                    double hwidth = (double)rc.Width / 2;
+
+                    int d = (int)Math.Sqrt((hwidth * hwidth) / 2);
+
+                    Rectangle rt = new Rectangle();
+                    rt.Location = CenterPoint;
+                    rt.Inflate(d, d);
+
+                    RenderPieCenterEx(g, pstyle, rc, rt);
+                }
+            }
+        }
+
+        #region RenderPieCenterEx
+
+        private void RenderPieCenterEx(Graphics g,
+            PieChartVisualStyle pstyle, Rectangle rc, Rectangle rt)
+        {
+            PieCenterVisualStyle cstyle = GetEffectivePieCenterStyle();
+            ChartLineVisualStyle border = cstyle.Border;
+
+            RenderPieCenterBackground(g, cstyle, rc, rt);
+
+            Rectangle rcSav = rc;
+
+            if (border.IsDisplayable == true)
+            {
+                int n = cstyle.Border.LineWidth / 2 + 1;
+
+                rc.Inflate(-n, -n);
+                rc.Width++;
+
+                rt.Inflate(-n, -n);
+                rc.Height++;
+            }
+
+            rc.Location = GetAdjustedPoint(rc.Location, cstyle.ImagePadding);
+            rt.Location = GetAdjustedPoint(rt.Location, cstyle.ImagePadding);
+
+            if (cstyle.ImageOverlay != ImageOverlay.Top)
+                RenderCenterFigure(g, rcSav, rc, rt, cstyle);
+
+            RenderPieCenterContent(g, cstyle, rc, rt);
+
+            if (cstyle.ImageOverlay == ImageOverlay.Top)
+                RenderCenterFigure(g, rcSav, rc, rt, cstyle);
+
+            if (border.IsDisplayable == true)
+            {
+                using (Pen pen = new Pen(border.LineColor, Dpi.Width(border.LineWidth)))
+                {
+                    if (border.LinePattern != LinePattern.NotSet)
+                        pen.DashStyle = (DashStyle)border.LinePattern;
+
+                    g.DrawEllipse(pen, rcSav);
+                }
+            }
+        }
+
+        #region GetAdjustedPoint
+
+        private Point GetAdjustedPoint(Point pt, Thickness thickness)
+        {
+            if (thickness.IsEmpty == false)
+            {
+                pt.X += Dpi.Width(thickness.Left - thickness.Right);
+                pt.Y += Dpi.Height(thickness.Top - thickness.Bottom);
+            }
+
+            return (pt);
+        }
+
+        #endregion
+
+        #region RenderPieCenterBackground
+
+        private void RenderPieCenterBackground(
+            Graphics g, PieCenterVisualStyle cstyle, Rectangle rc, Rectangle rt)
+        {
+            ChartControl chartControl = ChartControl;
+
+            if (chartControl.DoPreRenderPieCenterBackgroundEvent(g, this, rc) == false)
+            {
+                if (cstyle.Background.IsEmpty == false)
+                {
+                    using (Brush br = cstyle.Background.GetBrush(rc))
+                        g.FillEllipse(br, rc);
+                }
+
+                chartControl.DoPostRenderPieCenterBackgroundEvent(g, this, rc);
+            }
+        }
+
+        #endregion
+
+        #region RenderPieCenterContent
+
+        private void RenderPieCenterContent(
+            Graphics g, PieCenterVisualStyle style, Rectangle rc, Rectangle rt)
+        {
+            ChartControl chartControl = ChartControl;
+
+            Rectangle r = (style.TextInscribed == Tbool.False) ? rc : rt;
+
+            r = GetAdjustedBounds(r, style.Padding);
+
+            if (r.Width > 0 && r.Height > 0)
+            {
+                string centerlabel = CenterLabel;
+
+                if (chartControl.DoPreRenderPieCenterContentEvent(g, this, r, centerlabel) == false)
+                {
+                    if (string.IsNullOrEmpty(centerlabel) == false)
+                    {
+                        if (_CenterLabelMarkup != null)
+                        {
+                            RenderTextMarkup(g, _CenterLabelMarkup, style, r);
+                        }
+                        else
+                        {
+                            using (StringFormat sf = new StringFormat())
+                            {
+                                style.GetStringFormatFlags(sf);
+
+                                using (Brush br = new SolidBrush(style.TextColor))
+                                    g.DrawString(centerlabel, style.Font, br, r, sf);
+                            }
+                        }
+                    }
+                        
+                    chartControl.DoPostRenderPieCenterContentEvent(g, this, r, centerlabel);
+                }
+            }
+        }
+
+        #region RenderTextMarkup
+
+        private void RenderTextMarkup(Graphics g,
+            BodyElement textMarkup, PieCenterVisualStyle style, Rectangle r)
+        {
+            MarkupDrawContext d =
+                new MarkupDrawContext(g, style.Font, style.TextColor, false);
+
+            textMarkup.Measure(r.Size, d);
+            textMarkup.Arrange(r, d);
+
+            Size size = textMarkup.Bounds.Size;
+
+            switch (style.Alignment)
+            {
+                case Alignment.MiddleLeft:
+                case Alignment.MiddleCenter:
+                case Alignment.MiddleRight:
+                    if (r.Height > size.Height)
+                        r.Y += (r.Height - size.Height) / 2;
+                    break;
+
+                default:
+                    if (r.Height > size.Height)
+                        r.Y = r.Bottom - size.Height;
+                    break;
+            }
+
+            textMarkup.Bounds = new Rectangle(r.Location, size);
+
+            Region oldClip = g.Clip;
+
+            try
+            {
+                g.SetClip(r, CombineMode.Intersect);
+
+                textMarkup.Render(d);
+            }
+            finally
+            {
+                g.Clip = oldClip;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderCenterFigure
+
+        private void RenderCenterFigure(Graphics g,
+            Rectangle rcSav, Rectangle rc, Rectangle rt, PieCenterVisualStyle cstyle)
+        {
+            object figure = cstyle.GetFigure();
+
+            if (figure != null)
+            {
+                int radius = rc.Width / 2;
+                Size fsize = cstyle.GetFigureSize(g);
+
+                Rectangle r = rc;
+
+                if (cstyle.ImageSizeMode == ImageSizeMode.Normal)
+                {
+                    if (double.IsNaN(cstyle.ImageScale) == false)
+                    {
+                        if (cstyle.ImageScale != 1)
+                        {
+                            double d = (double)fsize.Height / fsize.Width;
+
+                            fsize.Width = (int)(rt.Width * cstyle.ImageScale);
+                            fsize.Height = (int)(fsize.Width * d);
+
+                            cstyle.FigureSizeEx = fsize;
+                        }
+                    }
+                }
+
+                if (cstyle.ImageInscribed == Tbool.True)
+                    r = GetFigureAlignment(radius, fsize, cstyle, rc, rt);
+
+                if (r.Width > 0 && r.Height > 0)
+                {
+                    Region clip = g.Clip;
+
+                    using (GraphicsPath path = new GraphicsPath())
+                    {
+                        rc.Inflate(1, 1);
+                        path.AddEllipse(rcSav);
+
+                        g.SetClip(path, CombineMode.Intersect);
+
+                        cstyle.RenderBackgroundFigure(g, r);
+
+                        g.Clip = clip;
+                    }
+                }
+            }
+        }
+
+        #region GetFigureAlignment
+
+        private Rectangle GetFigureAlignment(int radius,
+            Size fsize, PieCenterVisualStyle cstyle, Rectangle rc, Rectangle rt)
+        {
+            Rectangle r = rc;
+
+            Alignment align = cstyle.ImageAlignment;
+
+            if (cstyle.ImageSizeMode == ImageSizeMode.Tile)
+                return (rc);
+
+            if (cstyle.ImageSizeMode == ImageSizeMode.Stretch)
+                return (rt);
+
+            if (cstyle.ImageSizeMode == ImageSizeMode.Zoom)
+            {
+                double ratio = (double)fsize.Height / fsize.Width;
+
+                int dx = (int)Math.Sqrt((radius * radius) / (1 + ratio * ratio));
+                int dy = (int)(dx * ratio);
+
+                r.X += ((r.Width / 2) - dx);
+                r.Width = dx * 2;
+
+                r.Y += ((r.Height / 2) - dy);
+                r.Height = dy * 2;
+
+                return (r);
+            }
+
+            if ((cstyle.ImageSizeMode == ImageSizeMode.Normal) &&
+                (align == Alignment.TopCenter || align == Alignment.BottomCenter ||
+                 align == Alignment.MiddleLeft || align == Alignment.MiddleRight))
+            {
+                int height = fsize.Height / 2;
+                int width = fsize.Width / 2;
+
+                switch (align)
+                {
+                    case Alignment.TopCenter:
+                        if (radius > width)
+                        {
+                            int cy = (radius * radius) - (width * width);
+                            int dy = radius - (int)Math.Sqrt(cy);
+
+                            r.Y += dy;
+                        }
+
+                        if (r.Y > rt.Y)
+                            r.Y = rt.Y;
+
+                        r = GetAdjustedBounds(r, cstyle.ImagePadding);
+                        break;
+
+                    case Alignment.BottomCenter:
+                        if (radius > width)
+                        {
+                            int cy = (radius * radius) - (width * width);
+                            int dy = radius - (int)Math.Sqrt(cy);
+
+                            r.Y -= dy;
+
+                            if (r.Bottom < rt.Bottom)
+                                r.Y = (rt.Bottom - r.Height);
+
+                            r = GetAdjustedBounds(r, cstyle.ImagePadding);
+                        }
+                        break;
+
+                    case Alignment.MiddleLeft:
+                        if (radius > height)
+                        {
+                            int cx = (radius * radius) - (height * height);
+                            int dx = radius - (int)Math.Sqrt(cx);
+
+                            r.X += dx;
+                        }
+
+                        if (r.X > rt.X)
+                            r.X = rt.X;
+
+                        r = GetAdjustedBounds(r, cstyle.ImagePadding);
+                        break;
+
+                    case Alignment.MiddleRight:
+                        if (radius > height)
+                        {
+                            int cx = (radius * radius) - (height * height);
+                            int dx = radius - (int)Math.Sqrt(cx);
+
+                            r.X -= dx;
+                        }
+
+                        if (r.Right < rt.Right)
+                            r.X = (rt.Right - r.Width);
+
+                        r = GetAdjustedBounds(r, cstyle.ImagePadding);
+                        break;
+                }
+
+                return (r);
+            }
+
+            switch (align)
+            {
+                case Alignment.TopLeft:
+                    r.X = rt.X;
+                    r.Y = rt.Y;
+                    break;
+
+                case Alignment.TopRight:
+                    r.X = rt.Right - fsize.Width;
+                    r.Y = rt.Y;
+                    break;
+
+                case Alignment.TopCenter:
+                    r.X = (r.X + r.Width / 2) - fsize.Width / 2;
+                    r.Y = rt.Y;
+                    break;
+
+                case Alignment.BottomLeft:
+                    r.X = rt.X;
+                    r.Y = (rt.Bottom - fsize.Height);
+                    break;
+                    
+                case Alignment.BottomRight:
+                    r.X = rt.Right - fsize.Width;
+                    r.Y = (rt.Bottom - fsize.Height);
+                    break;
+
+                case Alignment.BottomCenter:
+                    r.X = (r.X + r.Width / 2) - fsize.Width / 2;
+                    r.Y = (rt.Bottom - fsize.Height);
+                    break;
+
+                default:
+                    r.X = (r.X + r.Width / 2) - fsize.Width / 2;
+                    r.Y = (r.Y + r.Height / 2) - fsize.Height / 2;
+                    break;
+            }
+
+            r.Size = fsize;
+
+            return (r);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region RenderPieRingOut
+
+        private void RenderPieRingOut(Graphics g, PieChartVisualStyle pstyle)
+        {
+            float n = RingOutRadius;
+
+            if (n > MinRingOutRadius)
+            {
+                Rectangle r = new Rectangle();
+
+                r.Location = CenterPoint;
+                r.Inflate((int)n, (int)n);
+
+                if (ChartControl.DoRenderPieRingOutEvent(g, this, r) == false)
+                {
+                    SmoothingMode sm = g.SmoothingMode;
+                    g.SmoothingMode = SmoothingMode.AntiAlias;
+
+                    using (Brush br = new SolidBrush(Color.FromArgb(30, Color.Black)))
+                        g.FillEllipse(br, r);
+
+                    if (_SymFontScale < 0)
+                    {
+                        _ScaleSymDef.SymbolSet = eSymbolSet.Awesome;
+                        _ScaleSymDef.Symbol = "\uf060";
+                        _ScaleSymDef.SymbolSize = n;
+
+                        _SymFontScale = n / (_ScaleSymDef.SymbolFont.Height * .8f);
+                    }
+
+                    _ScaleSymDef.SymbolSize = n * _SymFontScale;
+
+                    using (StringFormat sf = new StringFormat())
+                    {
+                        sf.LineAlignment = StringAlignment.Center;
+                        sf.Alignment = StringAlignment.Center;
+
+                        r.Y++;
+                        using (Brush br = new SolidBrush(Color.FromArgb(130, Color.Black)))
+                            g.DrawString(_ScaleSymDef.SymbolRealized, _ScaleSymDef.SymbolFont, br, r, sf);
+                    }
+
+                    g.SmoothingMode = sm;
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetXyImageBounds
+
+        private Rectangle GetXyImageBounds(PieChartVisualStyle pieStyle)
+        {
+            Rectangle scBbounds = GetScrollBounds(ScrollBounds);
+
+            scBbounds = GetAdjustedBounds(scBbounds, pieStyle.BorderThickness);
+
+            if (pieStyle.EnableImageScroll != Tbool.False)
+            {
+                scBbounds = GetScrollBounds(ScrollBoundsEx);
+                scBbounds = GetDisplayBounds(scBbounds);
+            }
+
+            if (HScrollBar.Visible == true)
+                scBbounds.Height -= HScrollBar.Height;
+
+            if (VScrollBar.Visible == true)
+                scBbounds.Width -= VScrollBar.Width;
+
+            return (scBbounds);
+        }
+
+        #endregion
+
+        #region GetFigureBounds
+
+        private Rectangle GetFigureBounds(Rectangle bounds, ContainerVisualStyle cStyle)
+        {
+            bounds = GetAdjustedBounds(bounds, cStyle.BorderThickness);
+
+            Rectangle scBounds = GetScrollBounds(bounds);
+
+            return (scBounds);
+        }
+
+        #endregion
+
+        #region RenderChartContent
+
+        protected virtual void RenderChartContent(
+            ChartRenderInfo renderInfo, PieChartVisualStyle pieStyle)
+        {
+            Graphics g = renderInfo.Graphics;
+
+            if (ChartSeries.Count > 0)
+            {
+                if (SeriesDisplayOrder == SeriesDisplayOrder.Reverse)
+                {
+                    for (int i = ChartSeries.Count - 1; i >= 0; i--)
+                        RenderSeries(renderInfo, ChartSeries[i]);
+                }
+                else
+                {
+                    for (int i = 0; i < ChartSeries.Count; i++)
+                        RenderSeries(renderInfo, ChartSeries[i]);
+                }
+            }
+            else
+            {
+                Rectangle scContentBounds = GetScrollBounds(ContentBounds);
+                Rectangle scDisplayBounds = GetDisplayBounds(scContentBounds);
+
+                RenderEmptyText(g, pieStyle, scDisplayBounds);
+            }
+        }
+
+        #region RenderSeries
+
+        private void RenderSeries(ChartRenderInfo renderInfo, PieSeries series)
+        {
+            if (Visible == true)
+            {
+                if (Legend.ItemCheckAction != ItemCheckAction.ShowItem || series.IsDisplayed == true)
+                    series.Render(renderInfo);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region Markup support
+
+        private void MarkupCenterLabelChanged()
+        {
+            if (_CenterLabelMarkup != null)
+                _CenterLabelMarkup.HyperLinkClick -= CenterLabelMarkupLinkClick;
+
+            _CenterLabelMarkup = null;
+
+            if (EnableCenterLabelMarkup == true)
+            {
+                if (MarkupParser.IsMarkup(_CenterLabel) == true)
+                {
+                    _CenterLabelMarkup = MarkupParser.Parse(_CenterLabel);
+
+                    if (_CenterLabelMarkup != null)
+                        _CenterLabelMarkup.HyperLinkClick += CenterLabelMarkupLinkClick;
+                }
+            }
+            else
+            {
+                if (_CenterLabelMarkup != null)
+                    _CenterLabelMarkup.HyperLinkClick -= CenterLabelMarkupLinkClick;
+            }
+        }
+
+        protected virtual void CenterLabelMarkupLinkClick(object sender, EventArgs e)
+        {
+            HyperLink link = sender as HyperLink;
+
+            ChartControl.DoPieCenterMarkupLinkClickEvent(this, link);
+
+            InvalidatePieCenter();
+        }
+
+        /// <summary>
+        /// Gets plain CenterLabel text without text-markup (if text-markup is used in Text)
+        /// </summary>
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public string PlainCenterlabelText
+        {
+            get { return (_CenterLabelMarkup != null ? _CenterLabelMarkup.PlainText : _CenterLabel); }
+        }
+
+        #endregion
+
+        #region Mouse Support
+
+        #region OnMouseDown
+
+        protected override bool OnMouseDown(MouseEventArgs e)
+        {
+            MouseDownHitArea = HitArea;
+
+            PieSeriesPoint psp = _HitPsp;
+
+            if (psp != null)
+            {
+                PieSeries series = psp.PieRing.ChartSeries;
+
+                if (series != null)
+                {
+                    Capture = true;
+
+                    return (series.ProcessMouseDown(e, this, psp));
+                }
+            }
+            else if (HitArea != ItemHitArea.InPieRingOut)
+            {
+                uint selCount = GlobalSelectionCount;
+
+                if (WhitespaceClickBehavior == WhitespaceClickBehavior.ClearSelection)
+                {
+                    SetSelected(false);
+
+                    if (GlobalSelectionCount != selCount)
+                        ChartControl.DoPieSelectionChangedEvent(this, null, null, PieSelectionMode.None);
+                }
+            }
+
+            return (base.OnMouseDown(e));
+        }
+
+        #endregion
+
+        #region OnMouseUp
+
+        protected override bool OnMouseUp(MouseEventArgs e)
+        {
+            switch (MouseDownHitArea)
+            {
+                case ItemHitArea.InMarkup:
+                    if (MouseDownHitArea == ItemHitArea.InMarkup)
+                    {
+                        if (e.Button == MouseButtons.Left)
+                            DoMarkupClick(_CenterLabelMarkup);
+                    }
+                    break;
+
+                case ItemHitArea.InPieSeriesPoint:
+                    if (_HitPsp != null)
+                        _HitPsp.ChartSeries.ProcessMouseUp(e, this);
+                    break;
+
+                case ItemHitArea.InPieRingOut:
+                    ProcessRingOutClick();
+                    break;
+            }
+
+            Capture = false;
+
+            return (base.OnMouseUp(e));
+        }
+
+        #region DoMarkupClick
+
+        private bool DoMarkupClick(BodyElement bodyElement)
+        {
+            if (bodyElement != null)
+            {
+                if (bodyElement.MouseOverElement != null)
+                {
+                    bodyElement.Click(ChartControl);
+
+                    ChartControl.Cursor = Cursors.Default;
+
+                    return (true);
+                }
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region ProcessRingOutClick
+
+        private void ProcessRingOutClick()
+        {
+            List<PieSeriesPointCollection> spcs = GetSelectedSpcs();
+
+            if (spcs != null)
+            {
+                ChartControl chartControl = ChartControl;
+
+                foreach (PieSeriesPointCollection spc1 in spcs)
+                {
+                    PieSeriesPoint psp = spc1.Parent as PieSeriesPoint;
+
+                    if (psp != null)
+                    {
+                        PieSeriesPointCollection spc2 = psp.Parent as PieSeriesPointCollection;
+
+                        if (chartControl.DoPieRingLevelChangingEvent(this, spc1, spc2) == false)
+                        {
+                            psp.ChartSeries.SetActiveSeriesPointCollection(spc2);
+
+                            chartControl.DoPieRingLevelChangedEvent(this, spc1, spc2);
+                        }
+                    }
+                }
+            }
+        }
+
+        #region GetSelectedSpss
+
+        private List<PieSeriesPointCollection> GetSelectedSpcs()
+        {
+            List<PieSeriesPointCollection> list = new List<PieSeriesPointCollection>();
+
+            PieSeriesPointCollection dspc = null;
+
+            foreach (PieSeries series in ChartSeries)
+            {
+                if (series.IsDisplayed == true)
+                {
+                    if (series.ShowAllRingsEx(this) == false)
+                    {
+                        PieSeriesPointCollection spc = series.GetActiveSeriesPointCollection();
+
+                        if (SpcHasSelection(spc) == true)
+                            list.Add(spc);
+
+                        dspc = spc;
+                    }
+                }
+            }
+
+            if (list.Count == 0 && dspc != null)
+                list.Add(dspc);
+
+            return (list);
+        }
+
+        #region SpcHasSelection
+
+        private bool SpcHasSelection(PieSeriesPointCollection spc)
+        {
+            if (spc.PieRing != null && spc.PieRing.Psps != null)
+            {
+                foreach (PieSeriesPoint psp in spc.PieRing.Psps)
+                {
+                    if (psp.IsSelected == true)
+                        return (true);
+                }
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region OnMouseMove
+
+        protected override bool OnMouseMove(MouseEventArgs e)
+        {
+            if (Capture == false)
+            {
+                HitArea = GetHitItem(e.Location, out _HitPsp);
+
+                ChartControl.ChartCursor = Cursors.Default;
+
+                if (HitArea == ItemHitArea.InPieCenter)
+                {
+                    if (_CenterLabelMarkup != null)
+                    {
+                        _CenterLabelMarkup.MouseMove(ChartControl, e);
+
+                        if (_CenterLabelMarkup.MouseOverElement != null)
+                        {
+                            ChartControl.ChartCursor = Cursors.Hand;
+
+                            HitArea = ItemHitArea.InMarkup;
+                        }
+                    }
+                }
+
+                if (_HitPsp != _LastHitPsp)
+                {
+                    if (_LastHitPsp != null)
+                        _LastHitPsp.ChartSeries.ProcessMouseLeave(EventArgs.Empty, this);
+
+                    if (_HitPsp != null)
+                        _HitPsp.ChartSeries.ProcessMouseEnter(EventArgs.Empty, this);
+
+                    InvalidatePsp(_LastHitPsp);
+                    InvalidatePsp(_HitPsp);
+
+                    _LastHitPsp = _HitPsp;
+                }
+
+                if (HitArea != _LastHitArea)
+                {
+                    if (HitArea == ItemHitArea.InPieCenter || _LastHitArea == ItemHitArea.InPieCenter)
+                        InvalidatePieCenter();
+
+                    else if (HitArea == ItemHitArea.InPieRingOut || _LastHitArea == ItemHitArea.InPieRingOut)
+                        InvalidateRingOut();
+                }
+
+                _LastHitArea = HitArea;
+            }
+
+            if (_HitPsp != null)
+                _HitPsp.ChartSeries.ProcessMouseMove(e, this);
+
+            if (HitArea == ItemHitArea.None || HitArea == ItemHitArea.InContent)
+                return (base.OnMouseMove(e));
+
+            return (true);
+        }
+
+        #region GetHitArea
+
+        /// <summary>
+        /// Gets the hit area in the chart from the given point.
+        /// </summary>
+        /// <param name="pt"></param>
+        /// <returns>ItemHitArea</returns>
+        public override ItemHitArea GetHitArea(Point pt)
+        {
+            PieSeriesPoint psp;
+
+            return (GetHitItem(pt, out psp));
+        }
+
+        #endregion
+
+        #region GetHitItem
+
+        /// <summary>
+        /// Gets the hit item in the chart from the given point.
+        /// </summary>
+        /// <param name="pt"></param>
+        /// <param name="psp"></param>
+        /// <returns></returns>
+        public ItemHitArea GetHitItem(Point pt, out PieSeriesPoint psp)
+        {
+            Rectangle contentBounds = GetScrollBounds(ContentBounds);
+
+            if (contentBounds.Contains(pt))
+            {
+                psp = GetPspFromPoint(pt);
+
+                if (psp != null)
+                    return (ItemHitArea.InPieSeriesPoint);
+
+                Point centerPoint = GetLocalAdjustedPoint(CenterPoint);
+
+                Point rpt = pt;
+                int radius = MathHelper.GetPointRadius(ref rpt, centerPoint);
+
+                if (radius <= RingOutRadius)
+                {
+                    if (PresentRingOut() == true)
+                        return (ItemHitArea.InPieRingOut);
+                }
+
+                if (radius <= InnerRadiusEx - InnerMarginEx)
+                    return (ItemHitArea.InPieCenter);
+
+                return (ItemHitArea.InContent);
+            }
+
+            psp = null;
+
+            Rectangle frameBounds = GetScrollBounds(FrameBounds);
+
+            if (frameBounds.Contains(pt))
+                return (ItemHitArea.InFrame);
+
+            return (ItemHitArea.None);
+        }
+
+        #endregion
+
+        #region GetPspFromPoint
+
+        /// <summary>
+        /// Gets the psp at the given Point.  Note that the order of
+        /// displayed/overlapping series is taken into account.
+        /// </summary>
+        /// <param name="pt"></param>
+        /// <returns>PieSeriesPoint or null.</returns>
+        public PieSeriesPoint GetPspFromPoint(Point pt)
+        {
+            if (_RenderBounds.Contains(GetGlobalAdjustedPoint(pt)) == true)
+            {
+                Point centerPoint = GetLocalAdjustedPoint(CenterPoint);
+
+                int radius, angle;
+                Point cpt = MathHelper.GetOffsetPoint(pt, centerPoint, out radius, out angle);
+
+                if (SeriesDisplayOrder == SeriesDisplayOrder.Forward)
+                {
+                    for (int i = ChartSeries.Count - 1; i >= 0; i--)
+                    {
+                        PieSeriesPoint psp =
+                            GetPspFromPoint(ChartSeries[i], pt, cpt, radius, angle);
+
+                        if (psp != null)
+                            return (psp);
+                    }
+                }
+                else
+                {
+                    for (int i = 0; i < ChartSeries.Count; i++)
+                    {
+                        PieSeriesPoint psp =
+                            GetPspFromPoint(ChartSeries[i], pt, cpt, radius, angle);
+
+                        if (psp != null)
+                            return (psp);
+                    }
+                }
+            }
+
+            return (null);
+        }
+
+        #region GetPspFromPoint (series)
+
+        private PieSeriesPoint GetPspFromPoint(
+            PieSeries series, Point pt, Point cpt, int radius, int angle)
+        {
+            if (series.IsDisplayed == true)
+            {
+                if (series.ShowAllRingsEx(this) == false)
+                {
+                    PieSeriesPointCollection spc = series.GetActiveSeriesPointCollection();
+
+                    if (spc != null)
+                    {
+                        if (spc.PieSlices != null)
+                            spc = spc.PieSlices;
+
+                        if (spc != null)
+                        {
+                            foreach (PieSeriesPoint psp in spc)
+                            {
+                                if (GetPspFromPointEx(series, psp, pt, radius, angle) == true)
+                                    return (psp);
+                            }
+                        }
+                    }
+                }
+                else
+                {
+                    foreach (PieRing pieRing in series.PieRings)
+                    {
+                        PieSeriesPoint psp = GetPspFromPoint(series, pieRing, pt, cpt, radius, angle);
+
+                        if (psp != null)
+                            return (psp);
+                    }
+                }
+            }
+
+            return (null);
+        }
+
+        #region GetPspFromPoint (pieRing)
+
+        private PieSeriesPoint GetPspFromPoint(PieSeries series,
+            PieRing pieRing, Point pt, Point cpt, int cradius, int cangle)
+        {
+            if (series.IsOffset == false)
+            {
+                int innerRadius = pieRing.InnerRadius;
+
+                if (cradius < pieRing.InnerRadius || cradius > pieRing.OuterRadius)
+                    return (null);
+            }
+
+            foreach (PieSeriesPoint psp in pieRing.Psps)
+            {
+                if (psp.IsInOtherEx == false)
+                {
+                    if (GetPspFromPointEx(series, psp, pt, cradius, cangle) == true)
+                        return (psp);
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetPspFromPointEx
+
+        private bool GetPspFromPointEx(PieSeries series,
+            PieSeriesPoint psp, Point pt, int cradius, int cangle)
+        {
+            if (psp.IsDisplayed == true)
+            {
+                int width = psp.OuterRadius - psp.InnerRadius;
+
+                if (width > 0)
+                {
+                    PieSeriesPointCollection spc = psp.Parent as PieSeriesPointCollection;
+
+                    if (spc != null)
+                    {
+                        int outerRadius = (psp.ShowSliceWhiteSpaceEx == true)
+                            ? psp.OuterRadius : (int)(psp.InnerRadius + psp.SliceExtent * width);
+
+                        int innerRadius = psp.InnerRadius;
+
+                        if (outerRadius - innerRadius > 0)
+                        {
+                            if (psp.IsOffset == false)
+                            {
+                                if (cradius >= innerRadius && cradius <= outerRadius)
+                                {
+                                    int startAngle, endAngle;
+                                    NormalizePspAngles(psp, out startAngle, out endAngle);
+
+                                    if (IsAngleBetween(cangle, startAngle, endAngle) == true)
+                                        return (true);
+                                }
+                            }
+                            else
+                            {
+                                Point scpt = GetLocalAdjustedPoint(psp.SliceCenter);
+
+                                Point ppt = pt;
+                                int pradius = MathHelper.GetPointRadius(ref ppt, scpt);
+
+                                if (pradius >= innerRadius && pradius <= outerRadius)
+                                {
+                                    int startAngle, endAngle;
+                                    NormalizePspAngles(psp, out startAngle, out endAngle);
+
+                                    int angle = MathHelper.GetPointAngle(ppt);
+
+                                    if (IsAngleBetween(angle, startAngle, endAngle) == true)
+                                        return (true);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
+            return (false);
+        }
+
+        #region NormalizePspAngles
+
+        private void NormalizePspAngles(PieSeriesPoint psp, out int startAngle, out int endAngle)
+        {
+            startAngle = (int)psp.StartAngleEx;
+            endAngle = (int)(psp.StartAngleEx + psp.SweepAngleEx);
+
+            if (startAngle > endAngle)
+            {
+                int temp = startAngle;
+                startAngle = endAngle;
+                endAngle = temp;
+            }
+        }
+
+        #endregion
+
+        #region IsAngleBetween
+
+        private bool IsAngleBetween(int angle, int start, int end)
+        {
+            if (end - start >= 360)
+                return (true);
+
+            start = (3600000 + start) % 360;
+            end = (3600000 + end) % 360;
+
+            if (start <= end)
+                return (start <= angle && angle <= end);
+
+            return (start <= angle || angle <= end);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region InvalidatePsp
+
+        private void InvalidatePsp(PieSeriesPoint psp)
+        {
+            if (psp != null)
+            {
+                PieSeries series = psp.ChartSeries;
+
+                PieSelectionMode psm = series.GetPieSelectionMode(this);
+
+                switch (psm)
+                {
+                    case PieSelectionMode.Pie:
+                        if (_LastHitPsp == null || _HitPsp == null)
+                            InvalidateRender();
+                        break;
+
+                    case PieSelectionMode.Ring:
+                        psp.PieRing.InvalidateRender(this);
+                        break;
+
+                    case PieSelectionMode.Series:
+                        foreach (PieRing pieRing in series.PieRings)
+                            pieRing.InvalidateRender(this);
+                        break;
+
+                    case PieSelectionMode.Slice:
+                        PieSeriesPoint pspHit = psp;
+
+                        if (series.ShowAllRingsEx(this) == true)
+                        {
+                            psp = psp.RootPsp;
+
+                            InvalidateSlice(psp.SeriesPoints);
+                        }
+
+                        InvalidateRender(psp.PathBounds);
+                        InvalidatePieLabel(psp);
+
+                        InvalidateLegendItem(pspHit);
+                        break;
+
+                    case PieSelectionMode.Point:
+                        InvalidateRender(psp.PathBounds);
+                        InvalidatePieLabel(psp);
+                        InvalidateLegendItem(psp);
+                        break;
+                }
+            }
+        }
+
+        #region InvalidateSlice
+
+        private void InvalidateSlice(PieSeriesPointCollection spc)
+        {
+            if (spc != null)
+            {
+                foreach (PieSeriesPoint psp in spc)
+                {
+                    InvalidateRender(psp.PathBounds);
+                    InvalidatePieLabel(psp);
+                    InvalidateLegendItem(psp);
+
+                    InvalidateSlice(psp.SeriesPoints);
+                }
+            }
+        }
+
+        #endregion
+
+        #region InvalidateLegendItem
+
+        private void InvalidateLegendItem(PieSeriesPoint psp)
+        {
+            if (Legend.TrackingMode == LegendTrackingMode.ChartAndLegend ||
+                Legend.TrackingMode == LegendTrackingMode.Chart)
+            {
+                if (psp.LegendItem != null)
+                {
+                    psp.LegendItem.LikeItem.IsHitItem = (psp == HitPsp);
+                    psp.LegendItem.LikeItem.InvalidateRender();
+                }
+            }
+        }
+
+        #endregion
+
+        #region InvalidatePieLabel
+
+        private void InvalidatePieLabel(PieSeriesPoint psp)
+        {
+            if (psp.PieLabel != null)
+            {
+                if (psp.PieLabel.Bounds.IsEmpty == false)
+                {
+                    InvalidateRender(psp.PieLabel.Bounds);
+
+                    if (psp.PieLabel.ConnectorBounds.IsEmpty == false)
+                        InvalidateRender(psp.PieLabel.ConnectorBounds);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InvalidatePieCenter
+
+        /// <summary>
+        /// Invalidates the Pie Center area (causing a repaint).
+        /// </summary>
+        public void InvalidatePieCenter()
+        {
+            int n = (int)InnerRadiusEx;
+
+            if (n > 0)
+            {
+                Rectangle r = new Rectangle();
+
+                r.Location =  GetLocalAdjustedPoint(CenterPoint);
+                r.Inflate(n, n);
+
+                using (GraphicsPath path = new GraphicsPath())
+                {
+                    path.AddEllipse(r);
+
+                    using (Region rgn = new Region(path))
+                        ChartControl.Invalidate(rgn);
+                }
+            }
+        }
+
+        #endregion
+
+        #region InvalidateRingOut
+
+        /// <summary>
+        /// Invalidates the 'Ring Out' area (causing a repaint).
+        /// </summary>
+        public void InvalidateRingOut()
+        {
+            int n = RingOutRadius;
+
+            if (n > MinRingOutRadius)
+            {
+                Rectangle r = new Rectangle();
+
+                r.Location = GetLocalAdjustedPoint(CenterPoint);
+                r.Inflate(n, n);
+
+                using (GraphicsPath path = new GraphicsPath())
+                {
+                    path.AddEllipse(r);
+
+                    using (Region rgn = new Region(path))
+                        ChartControl.Invalidate(rgn);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region OnMouseEnter
+
+        protected override bool OnMouseEnter(EventArgs e)
+        {
+            if (ShowSliceLabelsOnEntry == true)
+                InvalidateRender();
+
+            return (base.OnMouseEnter(e));
+        }
+
+        #endregion
+
+        #region OnMouseLeave
+
+        protected override bool OnMouseLeave(EventArgs e)
+        {
+            _HitPsp = null;
+
+            if (_LastHitArea == ItemHitArea.InPieSeriesPoint)
+            {
+                if (_LastHitPsp != null)
+                {
+                    InvalidateRender(_LastHitPsp.PathBounds);
+                    InvalidateLegendItem(_LastHitPsp);
+
+                    if (_LastHitPsp != null)
+                        _LastHitPsp.ChartSeries.ProcessMouseLeave(e, this);
+
+                    _LastHitPsp = null;
+
+                    IsDragging = false;
+                }
+            }
+            else if (_LastHitArea == ItemHitArea.InPieRingOut)
+            {
+                InvalidatePieCenter();
+            }
+
+            HitArea = ItemHitArea.None;
+            _LastHitArea = ItemHitArea.None;
+
+            if (ShowSliceLabelsOnEntry == true)
+                InvalidateRender();
+
+            return (base.OnMouseLeave(e));
+        }
+
+        #endregion
+
+        #region OnMouseDoubleClick
+
+        protected override bool OnMouseDoubleClick(MouseEventArgs e)
+        {
+            ChartControl chartControl = ChartControl;
+            PieSeriesPoint psp = _HitPsp;
+
+            ItemHitArea hitArea = HitArea;
+            ChartVisualElement hitElement = this;
+            object hitItem = psp;
+
+            if (hitArea == ItemHitArea.InPieSeriesPoint && psp != null)
+                hitElement = psp.ChartSeries;
+
+            if (chartControl.DoChartMouseDoubleClickEvent(this, hitArea, hitElement, hitItem, e) == false)
+            {
+                if (hitArea == ItemHitArea.InPieSeriesPoint && psp != null)
+                    return (psp.ChartSeries.ProcessMouseDoubleClick(e, this, psp));
+            }
+
+            return (base.OnMouseDoubleClick(e));
+        }
+
+        #endregion
+
+        #endregion
+
+        #region PresentRingOut
+
+        private bool PresentRingOut()
+        {
+            if (PieRingOutDisplayMode == PieRingOutDisplayMode.Never)
+                return (false);
+
+            int inCount = 0;
+            int ringCount = 0;
+
+            foreach (PieSeries series in ChartSeries)
+            {
+                if (series.IsDisplayed == true)
+                {
+                    if (series.ShowAllRingsEx(this) == false)
+                    {
+                        PieSeriesPointCollection spc = series.GetActiveSeriesPointCollection();
+
+                        if (spc != null)
+                        {
+                            if (spc.Parent is PieSeries == false)
+                            {
+                                if (SpcHasSelection(spc) == true)
+                                    return (true);
+
+                                inCount++;
+                            }
+
+                            ringCount++;
+                        }
+                    }
+                }
+            }
+
+            return (inCount == 1 && ringCount == 1);
+        }
+
+        #endregion
+
+        #region CancelCapture
+
+        /// <summary>
+        /// Cancels any inprogress operations that may have the mouse captured.
+        /// </summary>
+        public override void CancelCapture()
+        {
+            IsDragging = false;
+            PspDragType = PspDragType.None;
+
+            base.CancelCapture();
+        }
+
+        #endregion
+
+        #region SetSelected
+
+        /// <summary>
+        /// Set (or clears) all selected elements in the chart.
+        /// </summary>
+        /// <param name="select"></param>
+        public void SetSelected(bool select)
+        {
+            foreach (PieSeries series in ChartSeries)
+            {
+                if (series.IsDisplayed == true)
+                    series.SetSelected(select);
+            }
+        }
+
+        /// <summary>
+        /// Set (or clears) all selected elements in the given series.
+        /// </summary>
+        /// <param name="series"></param>
+        /// <param name="select"></param>
+        public void SetSelected(PieSeries series, bool select)
+        {
+            if (series != null)
+                series.SetSelected(select);
+        }
+
+        /// <summary>
+        /// Set (or clears) the given series point.
+        /// </summary>
+        /// <param name="psp"></param>
+        /// <param name="select"></param>
+        public void SetSelected(PieSeriesPoint psp, bool select)
+        {
+            if (psp != null)
+                psp.IsSelected = select;
+        }
+
+        #endregion
+
+        #region GetVisibleSelectionCount
+
+        /// <summary>
+        /// Gets a count of the visible, selected pie series points.
+        /// </summary>
+        /// <returns></returns>
+        public int GetVisibleSelectionCount()
+        {
+            int count = 0;
+
+            foreach (PieSeries series in ChartSeries)
+            {
+                if (series.IsDisplayed == true)
+                    count += series.GetVisibleSelectionCount();
+            }
+
+            return (count);
+        }
+
+        #endregion
+
+        #region GetVisibleSelectedPoints
+
+        /// <summary>
+        /// Gets a list of the currently Visible selected points.
+        /// </summary>
+        /// <returns></returns>
+        public List<PieSeriesPoint> GetVisibleSelectedPoints()
+        {
+            List<PieSeriesPoint> list = new List<PieSeriesPoint>();
+
+            foreach (PieSeries series in ChartSeries)
+            {
+                List<PieSeriesPoint> slist = series.GetVisibleSelectedPoints();
+
+                if (slist != null && slist.Count > 0)
+                    list.AddRange(slist);
+            }
+
+            return (list);
+        }
+
+        #endregion
+
+        #region GetSelectionCount
+
+        /// <summary>
+        /// Gets a count of the selected pie series points.
+        /// </summary>
+        /// <returns></returns>
+        public int GetSelectionCount()
+        {
+            int count = 0;
+
+            foreach (PieSeries series in ChartSeries)
+            {
+                if (series.IsDisplayed == true)
+                    count += series.GetSelectionCount();
+            }
+
+            return (count);
+        }
+
+        #endregion
+
+        #region GetSelectedPoints
+
+        /// <summary>
+        /// Gets a list of the currently selected points.
+        /// </summary>
+        /// <returns></returns>
+        public List<PieSeriesPoint> GetSelectedPoints()
+        {
+            List<PieSeriesPoint> list = new List<PieSeriesPoint>();
+
+            foreach (PieSeries series in ChartSeries)
+            {
+                List<PieSeriesPoint> slist = series.GetSelectedPoints();
+
+                if (slist != null && slist.Count > 0)
+                    list.AddRange(slist);
+            }
+
+            return (list);
+        }
+
+        #endregion
+
+        #region GetLocalAdjustedPoint
+
+        /// <summary>
+        /// Gets the local, scroll adjusted point.
+        /// </summary>
+        /// <param name="pt"></param>
+        /// <returns></returns>
+        public Point GetLocalAdjustedPoint(Point pt)
+        {
+            pt.X -= ScrollOffset.X;
+            pt.X += (HScrollBar.Inverted == true ? HScrollOffset : -HScrollOffset);
+
+            pt.Y -= ScrollOffset.Y;
+            pt.Y += (VScrollBar.Inverted == true ? VScrollOffset : -VScrollOffset);
+
+            return (pt);
+        }
+
+        #endregion
+
+        #region GetGlobalAdjustedPoint
+
+        internal Point GetGlobalAdjustedPoint(Point pt)
+        {
+            pt.X -= (HScrollBar.Inverted == true ? HScrollOffset : -HScrollOffset);
+            pt.Y -= (VScrollBar.Inverted == true ? VScrollOffset : -VScrollOffset);
+
+            return (pt);
+        }
+
+        #endregion
+
+        #region GetRayEndPoint
+
+        /// <summary>
+        /// Gets the end Point for a ray, of the given angle (in degrees),
+        /// starting at the pie center and ending at the outer radius.
+        /// </summary>
+        /// <param name="angle"></param>
+        /// <returns></returns>
+        public Point GetRayEndPoint(double angle)
+        {
+            return (GetRayEndPoint(angle, OuterRadiusEx));
+        }
+
+        /// <summary>
+        /// Gets the end Point for a ray, of the given angle (in degrees),
+        /// starting at the pie center and ending at the specified radius.
+        /// </summary>
+        /// <param name="angle"></param>
+        /// <param name="radius"></param>
+        /// <returns></returns>
+        public Point GetRayEndPoint(double angle, double radius)
+        {
+            Point pt = CenterPoint;
+
+            double radians = MathHelper.ToRadians(angle);
+
+            pt.X += (int)(Math.Cos(radians) * radius);
+            pt.Y += (int)(Math.Sin(radians) * radius);
+
+            return (pt);
+        }
+
+        #endregion
+
+        #region OnSeriesCheckStateChanged
+
+        internal override void OnSeriesCheckStateChanged(string property)
+        {
+            SeriesRangeChanged = true;
+
+            InvalidateLayout();
+
+            base.OnSeriesCheckStateChanged(property);
+        }
+
+        #endregion
+
+        #region GetBaseSeries
+
+        internal override ChartBaseSeriesCollection GetBaseSeries()
+        {
+            ChartBaseSeriesCollection baseSeries = new ChartBaseSeriesCollection();
+
+            foreach (BaseSeries series in ChartSeries)
+                baseSeries.Add(series);
+
+            return (baseSeries);
+        }
+
+        #endregion
+
+        #region GetSeriesByName
+
+        /// <summary>
+        /// Gets the chart series with the given Name.
+        /// </summary>
+        /// <param name="name"></param>
+        /// <returns>PieSeries or null.</returns>
+        public PieSeries GetSeriesByName(string name)
+        {
+            if (String.IsNullOrEmpty(name) == true)
+                return (null);
+
+            foreach (PieSeries series in ChartSeries)
+            {
+                if (name.Equals(series.Name) == true)
+                    return (series);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetAutoGenSeriesType
+
+        internal override SeriesType GetAutoGenSeriesType()
+        {
+            return (SeriesType.Pie);
+        }
+
+        #endregion
+
+        #region GetAutoGenSeriesNameCount
+
+        internal override int GetAutoGenSeriesNameCount()
+        {
+            return (1);
+        }
+
+        #endregion
+
+        #region GetNewSeries
+
+        internal override BaseSeries GetNewSeries()
+        {
+            return (new PieSeries());
+        }
+
+        #endregion
+
+        #region AddChartSeries
+
+        internal override void AddChartSeries(BaseSeries series)
+        {
+            ChartSeries.Add((PieSeries)series);
+        }
+
+        #endregion
+
+        #region Style handling
+
+        #region GetEffectivePieCenterStyle
+
+        internal PieCenterVisualStyle GetEffectivePieCenterStyle()
+        {
+            StyleState state = GetPieCenterStyleState();
+
+            return (EffectivePieCenterStyle[state]);
+        }
+
+        #region GetPieCenterStyleState
+
+        private StyleState GetPieCenterStyleState()
+        {
+            StyleState state = StyleState.Default;
+
+            if (HitArea == ItemHitArea.InPieCenter || HitArea == ItemHitArea.InPieRingOut)
+                state |= StyleState.MouseOver;
+
+            return (state);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ApplyStyles
+
+        public override void ApplyStyles(BaseVisualStyle style)
+        {
+            base.ApplyStyles(style);
+
+            PieChartVisualStyle pstyle = style as PieChartVisualStyle;
+
+            if (pstyle != null)
+            {
+                ApplyParentStyles(pstyle, Parent as ChartContainer);
+
+                pstyle.ApplyStyle(_ChartVisualStyle);
+            }
+        }
+
+        #region ApplyParentStyles
+
+        private void ApplyParentStyles(PieChartVisualStyle pstyle, ChartContainer item)
+        {
+            if (item != null)
+            {
+                ApplyParentStyles(pstyle, item.Parent as ChartContainer);
+
+                ChartPanel panel = item as ChartPanel;
+
+                if (panel != null)
+                    pstyle.ApplyStyle(panel.DefaultVisualStyles.PieChartVisualStyle);
+            }
+            else
+            {
+                ChartControl chartControl = ChartControl;
+
+                pstyle.ApplyStyle(chartControl.BaseVisualStyles.PieChartVisualStyle);
+                pstyle.ApplyStyle(chartControl.DefaultVisualStyles.PieChartVisualStyle);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ApplyStyles (StyleType)
+
+        public override void ApplyStyles(BaseVisualStyle style, StyleType cs)
+        {
+            base.ApplyStyles(style, cs);
+
+            PieCenterVisualStyle cstyle = style as PieCenterVisualStyle;
+
+            if (cstyle != null)
+            {
+                ApplyParentStyles(cstyle, Parent as ChartContainer, cs);
+
+                if (ChartVisualStyle.PieCenterVisualStyles != null)
+                    cstyle.ApplyStyle(ChartVisualStyle.PieCenterVisualStyles[cs]);
+            }
+        }
+
+        #region ApplyParentStyles (PieCenterVisualStyle)
+
+        private void ApplyParentStyles(
+            PieCenterVisualStyle cstyle, ChartContainer item, StyleType cs)
+        {
+            if (item != null)
+            {
+                ApplyParentStyles(cstyle, item.Parent as ChartContainer, cs);
+
+                ChartPanel panel = item as ChartPanel;
+
+                if (panel != null)
+                {
+                    if (panel.DefaultVisualStyles.PieChartVisualStyle.PieCenterVisualStyles != null)
+                        cstyle.ApplyStyle(panel.DefaultVisualStyles.PieChartVisualStyle.PieCenterVisualStyles[cs]);
+                }
+            }
+            else
+            {
+                ChartControl chartControl = ChartControl;
+
+                if (chartControl.BaseVisualStyles.PieChartVisualStyle.PieCenterVisualStyles != null)
+                    cstyle.ApplyStyle(ChartControl.BaseVisualStyles.PieChartVisualStyle.PieCenterVisualStyles[cs]);
+
+                if (chartControl.DefaultVisualStyles.PieChartVisualStyle.PieCenterVisualStyles != null)
+                    cstyle.ApplyStyle(ChartControl.DefaultVisualStyles.PieChartVisualStyle.PieCenterVisualStyles[cs]);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ApplyDefaults
+
+        public override void ApplyDefaults(BaseVisualStyle style, StyleType cs)
+        {
+            PieCenterVisualStyle ctyle = style as PieCenterVisualStyle;
+
+            if (ctyle != null)
+            {
+                ctyle.ApplyDefaults();
+            }
+            else if (style is PieChartVisualStyle)
+            {
+                PieChartVisualStyle pstyle = (PieChartVisualStyle)style;
+
+                pstyle.ApplyDefaults();
+            }
+
+            base.ApplyDefaults(style, cs);
+        }
+
+        #endregion
+
+        #region ClearEffectiveStyles
+
+        protected override void ClearEffectiveStyles()
+        {
+            _EffectiveChartStyle = null;
+
+            base.ClearEffectiveStyles();
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Copy/CopyTo
+
+        public override ChartVisualElement Copy()
+        {
+            PieChart copy = new PieChart();
+
+            CopyTo(copy);
+
+            return (copy);
+        }
+
+        public override void CopyTo(ChartVisualElement copy)
+        {
+            PieChart c = copy as PieChart;
+
+            if (c != null)
+            {
+                base.CopyTo(c);
+
+                c.CenterFirstSlice = CenterFirstSlice;
+                c.CenterLabel = CenterLabel;
+                c.CenterLabelVisibility = CenterLabelVisibility;
+                c.CenterPos = CenterPos;
+
+                foreach (PieSeries series in ChartSeries)
+                    c.ChartSeries.Add((PieSeries)series.Copy());
+
+                c.ChartVisualStyle = (_ChartVisualStyle != null) ? ChartVisualStyle.Copy() : null;
+
+                c.DetachedOffset = DetachedOffset;
+
+                c.EnableDragDetach = EnableDragDetach;
+
+                c.EnableShiftDragExplode = EnableShiftDragExplode;
+                c.ExplodedMargin = ExplodedMargin;
+                c.ExplodedOffset = ExplodedOffset;
+
+                c.GridInnerRadius = GridInnerRadius;
+                c.GridInterval = GridInterval;
+                c.GridMaxValue = GridMaxValue;
+                c.GridMinValue = GridMinValue;
+                c.GridOuterRadius = GridOuterRadius;
+
+                c.InnerMargin = InnerMargin;
+                c.InnerRadius = InnerRadius;
+
+                c.IsExploded = IsExploded;
+
+                c.MaxDetachedOffset = MaxDetachedOffset;
+                c.MaxExplodedOffset = MaxExplodedOffset;
+                c.MaxRingOutRadius = MaxRingOutRadius;
+                c.MinOuterRadius = MinOuterRadius;
+                c.MinRingOutRadius = MinRingOutRadius;
+
+                c.MouseClickSliceAction = MouseClickSliceAction;
+                c.MouseDoubleClickSliceAction = MouseDoubleClickSliceAction;
+
+                c.MultiSelect = MultiSelect;
+                c.OuterMargin = OuterMargin;
+                c.OuterRadius = OuterRadius;
+
+                c.PieRingOutDisplayMode = PieRingOutDisplayMode;
+                c.PieSelectionMode = PieSelectionMode;
+
+                c.ReverseRingOrder = ReverseRingOrder;
+                c.SeriesMargin = SeriesMargin;
+                c.SeriesOverlayEnabled = SeriesOverlayEnabled;
+
+                c.ShowFullGrid = ShowFullGrid;
+                c.ShowGridOnTop = ShowGridOnTop;
+                c.ShowAllRings = ShowAllRings;
+                c.ShowOtherSlice = ShowOtherSlice;
+                c.ShowPieGrid = ShowPieGrid;
+                c.ShowSliceLabelsOnEntry = ShowSliceLabelsOnEntry;
+
+                c.SliceLabelOverlapMode = _SliceLabelOverlapMode;
+
+                c.SubSliceVisualLayout = (_SubSliceVisualLayout != null) ? SubSliceVisualLayout.Copy() : null;
+
+                c.UseAlternateGridBackground = UseAlternateGridBackground;
+                c.WhitespaceClickBehavior = WhitespaceClickBehavior;
+            }
+        }
+
+        #endregion
+
+        #region GetSerialData
+
+        internal override SerialElementCollection GetSerialData(string serialName)
+        {
+            SerialElementCollection sec = new SerialElementCollection();
+
+            if (serialName != null)
+            {
+                if (serialName.Equals("") == true)
+                    serialName = "PieChart";
+
+                sec.AddStartElement(serialName);
+            }
+
+            sec.AddValue("CenterFirstSlice", CenterFirstSlice, Tbool.NotSet);
+            sec.AddValue("CenterLabel", CenterLabel, null);
+            sec.AddDataValue("CenterLabelVisibility", CenterLabelVisibility, CenterLabelVisibility.Always);
+            sec.AddValue("CenterPos", CenterPos, PointF.Empty);
+
+            if (ChartSeries.Count > 0)
+            {
+                sec.AddStartElement("ChartSeries count=\"" + ChartSeries.Count + "\"");
+
+                foreach (PieSeries series in ChartSeries)
+                    sec.AddElement(series.GetSerialData("ChartSeries"));
+
+                sec.AddEndElement("ChartSeries");
+            }
+
+            if (_ChartVisualStyle != null && _ChartVisualStyle.IsEmpty == false)
+                sec.AddElement(_ChartVisualStyle.GetSerialData("ChartVisualStyle"));
+
+            sec.AddValue("EnableDragDetach", EnableDragDetach, Tbool.NotSet);
+            sec.AddValue("EnableShiftDragExplode", EnableShiftDragExplode, true);
+
+            sec.AddValue("ExplodedMargin", ExplodedMargin, .1d);
+            sec.AddValue("ExplodedOffset", ExplodedOffset, .05d);
+
+            sec.AddValue("GridInnerRadius", GridInnerRadius, 0d);
+            sec.AddValue("GridInterval", GridInterval, 10d);
+            sec.AddValue("GridMaxValue", GridMaxValue, 100d);
+            sec.AddValue("GridMinValue", GridMinValue, 0d);
+            sec.AddValue("GridOuterRadius", GridOuterRadius, 1d);
+
+            sec.AddValue("InnerMargin", InnerMargin, 3d);
+            sec.AddValue("InnerRadius", InnerRadius, 0d);
+
+            sec.AddValue("IsExploded", IsExploded, false);
+
+            sec.AddValue("MaxDetachedOffset", MaxDetachedOffset, 100);
+            sec.AddValue("MaxExplodedOffset", MaxExplodedOffset, 100);
+            sec.AddValue("MaxRingOutRadius", MaxRingOutRadius, 48);
+            sec.AddValue("MinOuterRadius", MinOuterRadius, 80);
+            sec.AddValue("MinRingOutRadius", MinRingOutRadius, 9);
+
+            sec.AddValue("MouseClickSliceAction", MouseClickSliceAction, MouseClickSliceAction.NotSet);
+            sec.AddValue("MouseDoubleClickSliceAction", MouseDoubleClickSliceAction, MouseDoubleClickSliceAction.NotSet);
+
+            sec.AddValue("MultiSelect", MultiSelect, true);
+            sec.AddValue("OuterMargin", OuterMargin, 0d);
+            sec.AddValue("PieRingOutDisplayMode", PieRingOutDisplayMode, PieRingOutDisplayMode.OnMouseOver);
+            sec.AddValue("PieSelectionMode", PieSelectionMode, PieSelectionMode.NotSet);
+            sec.AddValue("ReverseRingOrder", ReverseRingOrder, false);
+
+            sec.AddValue("SeriesMargin", SeriesMargin, 0d);
+            sec.AddValue("SeriesOverlayEnabled", SeriesOverlayEnabled, false);
+
+            sec.AddValue("ShowFullGrid", ShowFullGrid, false);
+            sec.AddValue("ShowGridOnTop", ShowGridOnTop, false);
+            sec.AddValue("ShowAllRings", ShowAllRings, Tbool.NotSet);
+            sec.AddValue("ShowOtherSlice", ShowOtherSlice, Tbool.NotSet);
+            sec.AddValue("ShowPieGrid", ShowPieGrid, false);
+            sec.AddValue("ShowSliceLabelsOnEntry", ShowSliceLabelsOnEntry, false);
+            sec.AddValue("ShowToolTips", ShowToolTips, false);
+            sec.AddValue("SliceLabelOverlapMode", SliceLabelOverlapMode, SliceLabelOverlapMode.NotSet);
+
+            if (_SubSliceVisualLayout != null)
+                sec.AddElement(_SubSliceVisualLayout.GetSerialData(true));
+
+            sec.AddValue("UseAlternateBackground", UseAlternateGridBackground, false);
+            sec.AddValue("WhitespaceClickBehavior", WhitespaceClickBehavior, WhitespaceClickBehavior.ClearSelection);
+
+            sec.AddElement(base.GetSerialData(null));
+
+            if (serialName != null)
+                sec.AddEndElement(serialName);
+
+            return (sec);
+        }
+
+        #endregion
+
+        #region PutSerialData
+
+        #region ProcessValue
+
+        internal override void ProcessValue(SerialElement se)
+        {
+            switch (se.Name)
+            {
+                case "CenterFirstSlice":
+                    CenterFirstSlice = (Tbool)se.GetValueEnum(typeof(Tbool));
+                    break;
+
+                case "CenterLabel":
+                    CenterLabel = se.StringValue;
+                    break;
+
+                case "CenterLabelVisibility":
+                    CenterLabelVisibility = (CenterLabelVisibility)se.GetValueEnum(typeof(CenterLabelVisibility));
+                    break;
+
+                case "CenterPos":
+                    CenterPos = se.GetValuePointF();
+                    break;
+
+                case "EnableDragDetach":
+                    EnableDragDetach = (Tbool)se.GetValueEnum(typeof(Tbool));
+                    break;
+
+                case "EnableShiftDragExplode":
+                    EnableShiftDragExplode = bool.Parse(se.StringValue);
+                    break;
+
+                case "ExplodedMargin":
+                    ExplodedMargin = double.Parse(se.StringValue);
+                    break;
+
+                case "ExplodedOffset":
+                    ExplodedOffset = double.Parse(se.StringValue);
+                    break;
+
+                case "GridInnerRadius":
+                    GridInnerRadius = double.Parse(se.StringValue);
+                    break;
+
+                case "GridInterval":
+                    GridInterval = double.Parse(se.StringValue);
+                    break;
+
+                case "GridMaxValue":
+                    GridMaxValue = double.Parse(se.StringValue);
+                    break;
+
+                case "GridMinValue":
+                    GridMinValue = double.Parse(se.StringValue);
+                    break;
+
+                case "GridOuterRadius":
+                    GridOuterRadius = double.Parse(se.StringValue);
+                    break;
+
+                case "InnerMargin":
+                    InnerMargin = double.Parse(se.StringValue);
+                    break;
+
+                case "InnerRadius":
+                    InnerRadius = double.Parse(se.StringValue);
+                    break;
+
+                case "IsExploded":
+                    IsExploded = bool.Parse(se.StringValue);
+                    break;
+
+                case "MaxDetachedOffset":
+                    MaxDetachedOffset = int.Parse(se.StringValue);
+                    break;
+
+                case "MaxExplodedOffset":
+                    MaxExplodedOffset = int.Parse(se.StringValue);
+                    break;
+
+                case "MaxRingOutRadius":
+                    MaxRingOutRadius = int.Parse(se.StringValue);
+                    break;
+
+                case "MinOuterRadius":
+                    MinOuterRadius = int.Parse(se.StringValue);
+                    break;
+
+                case "MinRingOutRadius":
+                    MinRingOutRadius = int.Parse(se.StringValue);
+                    break;
+
+                case "MouseClickSliceAction":
+                    MouseClickSliceAction = (MouseClickSliceAction)se.GetValueEnum(typeof(MouseClickSliceAction));
+                    break;
+
+                case "MouseDoubleClickSliceAction":
+                    MouseDoubleClickSliceAction = (MouseDoubleClickSliceAction)se.GetValueEnum(typeof(MouseDoubleClickSliceAction));
+                    break;
+
+                case "MultiSelect":
+                    MultiSelect = bool.Parse(se.StringValue);
+                    break;
+
+                case "OuterMargin":
+                    OuterMargin = double.Parse(se.StringValue);
+                    break;
+
+                case "PieRingOutDisplayMode":
+                    PieRingOutDisplayMode = (PieRingOutDisplayMode)se.GetValueEnum(typeof(PieRingOutDisplayMode));
+                    break;
+
+                case "PieSelectionMode":
+                    PieSelectionMode = (PieSelectionMode)se.GetValueEnum(typeof(PieSelectionMode));
+                    break;
+
+                case "ReverseRingOrder":
+                    ReverseRingOrder = bool.Parse(se.StringValue);
+                    break;
+
+                case "SeriesMargin":
+                    SeriesMargin = double.Parse(se.StringValue);
+                    break;
+
+                case "SeriesOverlayEnabled":
+                    SeriesOverlayEnabled = bool.Parse(se.StringValue);
+                    break;
+
+                case "ShowFullGrid":
+                    ShowFullGrid = bool.Parse(se.StringValue);
+                    break;
+
+                case "ShowGridOnTop":
+                    ShowGridOnTop = bool.Parse(se.StringValue);
+                    break;
+
+                case "ShowAllRings":
+                    ShowAllRings = (Tbool)se.GetValueEnum(typeof(Tbool));
+                    break;
+
+                case "ShowOtherSlice":
+                    ShowOtherSlice = (Tbool)se.GetValueEnum(typeof(Tbool));
+                    break;
+
+                case "ShowPieGrid":
+                    ShowPieGrid = bool.Parse(se.StringValue);
+                    break;
+
+                case "ShowSliceLabelsOnEntry":
+                    ShowSliceLabelsOnEntry = bool.Parse(se.StringValue);
+                    break;
+
+                case "ShowToolTips":
+                    ShowToolTips = bool.Parse(se.StringValue);
+                    break;
+
+                case "SliceLabelOverlapMode":
+                    SliceLabelOverlapMode = (SliceLabelOverlapMode)se.GetValueEnum(typeof(SliceLabelOverlapMode));
+                    break;
+
+                case "UseAlternateBackground":
+                    UseAlternateGridBackground = bool.Parse(se.StringValue);
+                    break;
+
+                case "WhitespaceClickBehavior":
+                    WhitespaceClickBehavior = (WhitespaceClickBehavior)se.GetValueEnum(typeof(WhitespaceClickBehavior));
+                    break;
+
+                default:
+                    base.ProcessValue(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region ProcessCollection
+
+        internal override void ProcessCollection(SerialElement se)
+        {
+            SerialElementCollection sec = se.Sec;
+
+            switch (se.Name)
+            {
+                case "ChartSeries":
+                    if (se.ArrayCount > 0)
+                    {
+                        sec.PutSerialData(this);
+                    }
+                    else
+                    {
+                        string name = sec.GetItemValue("Name");
+
+                        PieSeries series = new PieSeries(name);
+
+                        ChartSeries.Add(series);
+
+                        sec.PutSerialData(series);
+                    }
+                    break;
+
+                case "ChartVisualStyle":
+                    sec.PutSerialData(ChartVisualStyle);
+                    break;
+
+                case "SliceVisualLayout":
+                    sec.PutSerialData(SubSliceVisualLayout);
+                    break;
+
+                default:
+                    base.ProcessCollection(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region States
+
+        [Flags]
+        private enum States : uint
+        {
+            Exploded = (1U << 0),
+            ReverseRingOrder = (1U << 1),
+
+            MultiSelect = (1U << 2),
+
+            Dragging = (1U << 3),
+            EnableShiftDragExplode = (1U << 4),
+            EnableCenterLabelMarkup = (1U << 5),
+
+            ShowPieGrid = (1U << 6),
+            ShowGridOnTop = (1U << 7),
+            ShowFullGrid = (1U << 8),
+            ShowSliceLabelsOnEntry = (1U << 9),
+            ShowToolTips = (1U << 10),
+
+            UseAlternateGridBackground = (1U << 11),
+            SeriesOverlayEnabled = (1U << 12),
+
+            ShowPieRingsInLegend = (1U << 13),
+            ShowPieSeriesPointsInLegend = (1U << 14),
+
+            UpdatePaletteNeeded = (1U << 15),
+        }
+
+        #region TestState
+
+        private bool TestState(States state)
+        {
+            return ((_States & state) == state);
+        }
+
+        #endregion
+
+        #region SetState
+
+        private void SetState(States state, bool value)
+        {
+            if (value == true)
+                _States |= state;
+            else
+                _States &= ~state;
+        }
+
+        #endregion
+
+        #endregion
+    }
+
+    #region enums
+
+    #region LegendTrackingMode
+
+    /// <summary>
+    /// Defines the mode used to track mouse over interaction
+    /// between PieChart elements and associated Legend elements.
+    /// </summary>
+    public enum LegendTrackingMode
+    {
+        /// <summary>
+        /// NotSet
+        /// </summary>
+        NotSet,
+
+        /// <summary>
+        /// No tracking.
+        /// </summary>
+        None,
+
+        /// <summary>
+        /// Hit Chart elements are tracked in the Legend.
+        /// </summary>
+        Chart,
+
+        /// <summary>
+        /// Hit Legend elements are tracked in the Chart.
+        /// </summary>
+        Legend,
+
+        /// <summary>
+        /// Both hit Legend elements and Chart elements are tracked.
+        /// </summary>
+        ChartAndLegend,
+    }
+
+    #endregion
+
+    #region MouseClickSliceAction
+
+    /// <summary>
+    /// Defines the action taken when a user
+    /// clicks with the mouse in a pie slice..
+    /// </summary>
+    public enum MouseClickSliceAction
+    {
+        /// <summary>
+        /// NotSet
+        /// </summary>
+        NotSet,
+
+        /// <summary>
+        /// No action taken.
+        /// </summary>
+        None,
+
+        /// <summary>
+        /// Element select.
+        /// </summary>
+        Select,
+
+        /// <summary>
+        /// Element detach toggle.
+        /// </summary>
+        Detach,
+
+        /// <summary>
+        /// Pie Exploded.
+        /// </summary>
+        Explode,
+    }
+
+    #endregion
+
+    #region MouseDoubleClickSliceAction
+
+    /// <summary>
+    /// Defines the action taken when a user
+    /// double-clicks with the mouse in a pie slice.
+    /// </summary>
+    public enum MouseDoubleClickSliceAction
+    {
+        /// <summary>
+        /// NotSet
+        /// </summary>
+        NotSet,
+
+        /// <summary>
+        /// No action taken.
+        /// </summary>
+        None,
+
+        /// <summary>
+        /// Change Active Ring (used when ShowAllRings is set to false).
+        /// </summary>
+        ChangeActiveRing,
+
+        /// <summary>
+        /// Element detach toggle.
+        /// </summary>
+        Detach,
+
+        /// <summary>
+        /// Pie Exploded.
+        /// </summary>
+        Explode,
+    }
+
+    #endregion
+
+    #region OtherSliceMethod
+
+    /// <summary>
+    /// Defines the method used when determining
+    /// which slices are to be included in the 'Other' slice.
+    /// </summary>
+    public enum OtherSliceMethod
+    {
+        /// <summary>
+        /// Uses the percentage that is set by the OtherMinPercent property.
+        /// </summary>
+        MinPercent,
+
+        /// <summary>
+        /// Uses the count that is set by the OtherMaxSlices property.
+        /// </summary>
+        MaxSlices,
+    }
+
+    #endregion
+
+    #region PieRadiusScale
+
+    /// <summary>
+    /// Defines how the PieRadius values (InnerRadius,
+    /// OuterRadius, GridInnerRadius, and GridOuterRadius) values are interpreted).
+    /// </summary>
+    public enum PieRadiusScale
+    {
+        /// <summary>
+        /// Values are always taken as percentages of the content area.
+        /// </summary>
+        Percentage,
+
+        /// <summary>
+        /// Values > 1 are taken as pixel values.
+        /// </summary>
+        Pixel,
+    }
+
+    #endregion
+
+    #region PieSelectionMode
+
+    /// <summary>
+    /// Defines the selection mode used when the user
+    /// clicks on a pie element.
+    /// </summary>
+    public enum PieSelectionMode
+    {
+        /// <summary>
+        /// NotSet
+        /// </summary>
+        NotSet,
+
+        /// <summary>
+        /// No selection.
+        /// </summary>
+        None,
+
+        /// <summary>
+        /// Pie selection.
+        /// </summary>
+        Pie,
+
+        /// <summary>
+        /// Series selection.
+        /// </summary>
+        Series,
+
+        /// <summary>
+        /// Slice selection (includes nested PieSeriesPoints).
+        /// </summary>
+        Slice,
+
+        /// <summary>
+        /// Ring level selection.
+        /// </summary>
+        Ring,
+
+        /// <summary>
+        /// Individual PieSeriesPoint selection.
+        /// </summary>
+        Point,
+    }
+
+    #endregion
+
+    #region PspDragType
+
+    /// <summary>
+    /// Defines the drag type.
+    /// </summary>
+    internal enum PspDragType
+    {
+        None,
+
+        Explode,
+        Detach,
+    }
+
+    #endregion
+
+    #region PieRingOutDisplayMode
+
+    /// <summary>
+    /// Defines when the 'RingOut' indicator is displayed.
+    /// </summary>
+    public enum PieRingOutDisplayMode
+    {
+        /// <summary>
+        /// Always displayed (when appropriate).
+        /// </summary>
+        Always,
+
+        /// <summary>
+        /// Never displayed (user can go up a level by shift dbl-click).
+        /// </summary>
+        Never,
+
+        /// <summary>
+        /// Indicator shown when mouse is over ring area in center of Pie. (default)
+        /// </summary>
+        OnMouseOver,
+    }
+
+    #endregion
+
+    #region SliceLabelOverlapMode
+
+    /// <summary>
+    /// Specifies how overlapping outer slice Labels are resolved
+    /// </summary>
+    public enum SliceLabelOverlapMode
+    {
+        /// <summary>
+        /// Not set (default is None). 
+        /// </summary>
+        NotSet = -1,
+
+        /// <summary>
+        /// Overlapping labels will be shown.
+        /// </summary>
+        ShowOverlapping,
+
+        /// <summary>
+        /// Overlapping labels will be hidden.
+        /// </summary>
+        HideOverlapping,
+    }
+
+    #endregion
+
+    #region SweepDirection
+
+    /// <summary>
+    /// Defines the sweep direction.
+    /// </summary>
+    public enum SweepDirection
+    {
+        /// <summary>
+        /// NotSet
+        /// </summary>
+        NotSet,
+
+        /// <summary>
+        /// Clockwise.
+        /// </summary>
+        Clockwise,
+
+        /// <summary>
+        /// CounterClockwise.
+        /// </summary>
+        CounterClockwise,
+    }
+
+    #endregion
+
+    #region WhitespaceClickBehavior
+
+    ///<summary>
+    /// Specifies the resultant behavior
+    /// of clicking in the chart whitespace area.
+    ///</summary>
+    public enum WhitespaceClickBehavior
+    {
+        ///<summary>
+        /// No effect
+        ///</summary>
+        None,
+
+        ///<summary>
+        /// Current selection is cleared
+        ///</summary>
+        ClearSelection,
+    }
+
+    #endregion
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/RadialChart/PieLabel.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/RadialChart/PieLabel.cs
new file mode 100644
index 00000000..f94514a2
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/RadialChart/PieLabel.cs	
@@ -0,0 +1,280 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using DevComponents.DotNetBar.Charts.Style;
+
+namespace DevComponents.DotNetBar.Charts
+{
+    /// <summary>
+    /// Represents a PieLabel (label associated with a pie data slice in the chart).
+    /// </summary>
+    public class PieLabel : IDisposable
+    {
+        #region Private data
+
+        private PieSeriesPoint _PieSeriesPoint;
+
+        private float _Angle;
+        private Rectangle _Bounds;
+        private Rectangle _ConnectorBounds;
+
+        private Point _PtBoxEdge;
+        private Point _PtBoxBend;
+        private Point _PtSliceEdge;
+
+        private double _Radius;
+        private double _OuterRadius;
+
+        private string _Label;
+        private Size _LabelSize;
+
+        private SliceOuterLabelVisualStyle _SliceLabelVisualStyle;
+
+        private States _States;
+
+        #endregion
+
+        public PieLabel(PieSeriesPoint sp, string label)
+        {
+            _PieSeriesPoint = sp;
+            _Label = label;
+
+            InitDefaultStates();
+        }
+
+        #region InitDefaultStates
+
+        private void InitDefaultStates()
+        {
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region Angle
+
+        /// <summary>
+        /// Gets the angle used to display the point label 
+        /// associated with the data point.
+        /// </summary>
+        public float Angle
+        {
+            get { return (_Angle); }
+            internal set { _Angle = value; }
+        }
+
+        #endregion
+
+        #region Bounds
+
+        /// <summary>
+        /// Gets the label text bounds.
+        /// </summary>
+        public Rectangle Bounds
+        {
+            get { return (_Bounds); }
+            internal set { _Bounds = value; }
+        }
+
+        #endregion
+
+        #region IsLeftlabel
+
+        /// <summary>
+        /// Gets whether the label is a left positioned
+        /// label (with respect to the chart slice).
+        /// </summary>
+        public bool IsLeftlabel
+        {
+            get { return (!TestState(States.RightLabel)); }
+            internal set { SetState(States.RightLabel, !value); }
+        }
+
+        #endregion
+
+        #region IsRightlabel
+
+        /// <summary>
+        /// Gets whether the label is a right positioned
+        /// label (with respect to the chart slice).
+        /// </summary>
+        public bool IsRightlabel
+        {
+            get { return (TestState(States.RightLabel)); }
+            internal set { SetState(States.RightLabel, value); }
+        }
+
+        #endregion
+
+        #region Label
+
+        /// <summary>
+        /// Gets or sets the label text
+        /// </summary>
+        public string Label
+        {
+            get { return (_Label); }
+            internal set { _Label = value; }
+        }
+
+        #endregion
+
+        #region LabelSize
+
+        /// <summary>
+        /// Gets the label size.
+        /// </summary>
+        public Size LabelSize
+        {
+            get { return (_LabelSize); }
+            internal set { _LabelSize = value; }
+        }
+
+        #endregion
+
+        #region PieSeriesPoint
+
+        /// <summary>
+        /// Gets the associated PieSeriesPoint.
+        /// </summary>
+        public PieSeriesPoint PieSeriesPoint
+        {
+            get { return (_PieSeriesPoint); }
+            internal set { _PieSeriesPoint = value; }
+        }
+
+        #endregion
+
+        #region PtBoxBend
+
+        /// <summary>
+        /// Gets the middle connector point located
+        /// at the 'bend' of the connector.
+        /// </summary>
+        public Point PtBoxBend
+        {
+            get { return (_PtBoxBend); }
+            internal set { _PtBoxBend = value; }
+        }
+
+        #endregion
+
+        #region PtBoxEdge
+
+        /// <summary>
+        /// Gets the connector point located and the
+        /// 'edge' of the label text bounding box.
+        /// </summary>
+        public Point PtBoxEdge
+        {
+            get { return (_PtBoxEdge); }
+            internal set { _PtBoxEdge = value; }
+        }
+
+        #endregion
+
+        #region PtSliceEdge
+
+        /// <summary>
+        /// Gets the initial connector point, located at
+        /// the edge of the pie slice.
+        /// </summary>
+        public Point PtSliceEdge
+        {
+            get { return (_PtSliceEdge); }
+            internal set { _PtSliceEdge = value; }
+        }
+
+        #endregion
+
+        #region SliceLabelVisualStyle
+
+        /// <summary>
+        /// Gets the current slice label VisualStyle for the label.
+        /// </summary>
+        public SliceOuterLabelVisualStyle LabelStyle
+        {
+            get { return (_SliceLabelVisualStyle); }
+            internal set { _SliceLabelVisualStyle = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region ConnectorBounds
+
+        internal Rectangle ConnectorBounds
+        {
+            get { return (_ConnectorBounds); }
+            set { _ConnectorBounds = value; }
+        }
+
+        #endregion
+
+        #region OuterRadius
+
+        internal double OuterRadius
+        {
+            get { return (_OuterRadius); }
+            set { _OuterRadius = value; }
+        }
+
+        #endregion
+
+        #region Radius
+
+        internal double Radius
+        {
+            get { return (_Radius); }
+            set { _Radius = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region States
+
+        [Flags]
+        private enum States : uint
+        {
+            RightLabel = (1U << 0),
+        }
+
+        #region TestState
+
+        private bool TestState(States state)
+        {
+            return ((_States & state) == state);
+        }
+
+        #endregion
+
+        #region SetState
+
+        private void SetState(States state, bool value)
+        {
+            if (value == true)
+                _States |= state;
+            else
+                _States &= ~state;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IDisposable
+
+        public void Dispose()
+        {
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/RadialChart/PieReferenceLine.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/RadialChart/PieReferenceLine.cs
new file mode 100644
index 00000000..b16a4670
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/RadialChart/PieReferenceLine.cs	
@@ -0,0 +1,404 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Drawing.Drawing2D;
+using System.Windows.Forms;
+using DevComponents.Charts.TextMarkup;
+using DevComponents.DotNetBar.Charts.Style;
+
+namespace DevComponents.DotNetBar.Charts
+{
+    /// <summary>
+    /// Represents the collection of PieReferenceLines.
+    /// </summary>
+    [Editor("DevComponents.Charts.Design.PieReferenceCollectionEditor, DevComponents.Charts.Design, " +
+            "Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(UITypeEditor))]
+    public class PieReferenceLineCollection : CustomNamedCollection<PieReferenceLine>
+    {
+        #region GetUniqueName
+
+        /// <summary>
+        /// Gets a unique (unused) reference line Name.
+        /// </summary>
+        /// <returns></returns>
+        public string GetUniqueName()
+        {
+            return (GetUniqueName("PieRefLine"));
+        }
+
+        #endregion
+    }
+
+    /// <summary>
+    /// Represents a reference line (a radial line on the chart
+    /// that can be used to signify, or reference, a specific chart value).
+    /// </summary>
+    public class PieReferenceLine : ChartVisualElement
+    {
+        #region Private variables
+
+        private double _Value;
+
+        private PieReferenceLineVisualStyle _ReferenceLineVisualStyle;
+        private EffectiveStyle<PieReferenceLineVisualStyle> _EffectiveStyle;
+
+        #endregion
+
+        #region Constructors
+
+        /// <summary>
+        /// PieReferenceLine
+        /// </summary>
+        public PieReferenceLine()
+        {
+            _EffectiveStyle = new EffectiveStyle<PieReferenceLineVisualStyle>(this);
+        }
+
+        /// <summary>
+        /// PieReferenceLine
+        /// </summary>
+        /// <param name="name"></param>
+        public PieReferenceLine(string name)
+            : this()
+        {
+            Name = name;
+        }
+
+        /// <summary>
+        /// PieReferenceLine
+        /// </summary>
+        /// <param name="name"></param>
+        /// <param name="radialValue"></param>
+        public PieReferenceLine(string name, double value)
+            : this(name)
+        {
+            Value = value;
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region EffectiveStyle
+
+        /// <summary>
+        /// Gets a reference to the ReferenceLine's Effective (cached, composite) style.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public PieReferenceLineVisualStyle EffectiveStyle
+        {
+            get { return (_EffectiveStyle.Style); }
+        }
+
+        #endregion
+
+        #region ReferenceLineVisualStyle
+
+        /// <summary>
+        /// Gets or sets the visual style for the Reference Line.
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates the visual style for the ReferenceLine.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public PieReferenceLineVisualStyle ReferenceLineVisualStyle
+        {
+            get
+            {
+                if (_ReferenceLineVisualStyle == null)
+                {
+                    _ReferenceLineVisualStyle = new PieReferenceLineVisualStyle();
+
+                    StyleVisualChangeHandler(null, _ReferenceLineVisualStyle);
+                }
+
+                return (_ReferenceLineVisualStyle);
+            }
+
+            set
+            {
+                if (_ReferenceLineVisualStyle != value)
+                {
+                    PieReferenceLineVisualStyle oldValue = _ReferenceLineVisualStyle;
+
+                    _ReferenceLineVisualStyle = value;
+
+                    OnVisualStyleChanged("ReferenceLineVisualStyle", oldValue, value);
+
+                    if (oldValue != null)
+                        oldValue.Dispose();
+                }
+            }
+        }
+
+        #endregion
+
+        #region  Value
+
+        ///<summary>
+        /// Gets or sets the associated radial grid value of the reference line.
+        ///</summary>
+        [DefaultValue(null), Category("Appearance")]
+        [Description("Indicates the associated radial grid value of the reference line.")]
+        //[TypeConverter("DevComponents.Charts.Design.PointValueConverter," +
+        //    "DevComponents.Charts.Design, Version=14.1.0.37, Culture=neutral, PublicKeyToken=90f470f34c89ccaf")]
+        public double Value
+        {
+            get { return (_Value); }
+
+            set
+            {
+                if (value != _Value)
+                {
+                    _Value = value;
+
+                    OnPropertyChangedEx("Value", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #endregion
+
+        #region MeasureOverride
+
+        protected override void MeasureOverride(ChartLayoutInfo layoutInfo)
+        {
+        }
+
+        #endregion
+
+        #region ArrangeOverride
+
+        protected override void ArrangeOverride(ChartLayoutInfo layoutInfo)
+        {
+        }
+
+        #endregion
+
+        #region RenderOverride
+
+        protected override void RenderOverride(ChartRenderInfo renderInfo)
+        {
+        }
+
+        #region RenderLine
+
+        internal void RenderLine(ChartRenderInfo renderInfo)
+        {
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InvalidateRender
+
+        public override void InvalidateRender()
+        {
+            ChartVisualElement cve = Parent as ChartVisualElement;
+
+            if (cve != null)
+                cve.InvalidateRender();
+            else
+                base.InvalidateRender();
+        }
+
+        #endregion
+
+        #region Style handling
+
+        #region ApplyStyles
+
+        public override void ApplyStyles(BaseVisualStyle style)
+        {
+            ChartLineVisualStyle rstyle = style as ChartLineVisualStyle;
+
+            if (rstyle != null)
+            {
+                ApplyParentStyles(rstyle, Parent as ChartContainer);
+
+                rstyle.ApplyStyle(ReferenceLineVisualStyle);
+
+                if (rstyle.LineColor.IsEmpty == true)
+                    rstyle.LineColor = Color.Red;
+
+                if (rstyle.LineWidth < 0)
+                    rstyle.LineWidth = 1;
+            }
+        }
+
+        #region ApplyParentStyles
+
+        private void ApplyParentStyles(ChartLineVisualStyle pstyle, ChartContainer item)
+        {
+            if (item != null)
+            {
+                ApplyParentStyles(pstyle, item.Parent as ChartContainer);
+
+                ChartPanel chartPanel = item as ChartPanel;
+
+                if (chartPanel != null)
+                {
+                    pstyle.ApplyStyle(chartPanel.DefaultVisualStyles.PieChartVisualStyle.ReferenceLineVisualStyle);
+                }
+                else if (item is PieChart)
+                {
+                    PieChart pieChart = (PieChart)item;
+
+                    pstyle.ApplyStyle(pieChart.ChartVisualStyle.ReferenceLineVisualStyle);
+                }
+            }
+            else
+            {
+                pstyle.ApplyStyle(ChartControl.BaseVisualStyles.ReferenceLineVisualStyle);
+                pstyle.ApplyStyle(ChartControl.DefaultVisualStyles.ReferenceLineVisualStyle);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InvalidateStyle
+
+        ///<summary>
+        ///Invalidate the cached Style definition
+        ///</summary>
+        public void InvalidateStyle()
+        {
+            ClearEffectiveStyles();
+        }
+
+        #endregion
+
+        #region ClearEffectiveStyles
+
+        protected override void ClearEffectiveStyles()
+        {
+            if (_EffectiveStyle.InvalidateStyle() == true)
+                InvalidateLayout();
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Copy/CopyTo
+
+        public override ChartVisualElement Copy()
+        {
+            PieReferenceLine copy = new PieReferenceLine();
+
+            CopyTo(copy);
+
+            return (copy);
+        }
+
+        public override void CopyTo(ChartVisualElement copy)
+        {
+            PieReferenceLine c = copy as PieReferenceLine;
+
+            if (c != null)
+            {
+                base.CopyTo(c);
+
+                c.Value = Value;
+
+                c.ReferenceLineVisualStyle =
+                    (_ReferenceLineVisualStyle != null) ? ReferenceLineVisualStyle.Copy() : null;
+            }
+        }
+
+        #endregion
+
+        #region GetSerialData
+
+        internal override SerialElementCollection GetSerialData(string serialName)
+        {
+            SerialElementCollection sec = new SerialElementCollection();
+
+            if (serialName != null)
+            {
+                if (serialName.Equals("") == true)
+                    serialName = "PieReferenceLine";
+
+                sec.AddStartElement(serialName);
+            }
+
+            if (_ReferenceLineVisualStyle != null && _ReferenceLineVisualStyle.IsEmpty == false)
+                sec.AddElement(_ReferenceLineVisualStyle.GetSerialData("ReferenceLineVisualStyle"));
+
+            sec.AddValue("Value", Value, null);
+
+            sec.AddElement(base.GetSerialData(null));
+
+            if (serialName != null)
+                sec.AddEndElement(serialName);
+
+            return (sec);
+        }
+
+        #endregion
+
+        #region PutSerialData
+
+        #region ProcessValue
+
+        internal override void ProcessValue(SerialElement se)
+        {
+            switch (se.Name)
+            {
+                case "Value":
+                    Value = double.Parse(se.StringValue);
+                    break;
+
+                default:
+                    base.ProcessValue(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region ProcessCollection
+
+        internal override void ProcessCollection(SerialElement se)
+        {
+            SerialElementCollection sec = se.Sec;
+
+            switch (se.Name)
+            {
+                case "ReferenceLineVisualStyle":
+                    sec.PutSerialData(ReferenceLineVisualStyle);
+                    break;
+
+                default:
+                    base.ProcessCollection(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IDisposable
+
+        public override void Dispose()
+        {
+            ReferenceLineVisualStyle = null;
+
+            base.Dispose();
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/RadialChart/PieRing.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/RadialChart/PieRing.cs
new file mode 100644
index 00000000..da75f15e
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/RadialChart/PieRing.cs	
@@ -0,0 +1,918 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.Charts.Style;
+
+namespace DevComponents.DotNetBar.Charts
+{
+    public class PieRing : ILegendItem, ILegendItemEx, INotifyPropertyChanged
+    {
+        #region Private variables
+
+        private int _RingLevel;
+        private int _RingWeight = -1;
+
+        private int _InnerRadius;
+        private int _OuterRadius;
+        private int _ExtentRadius;
+
+        private PieSeries _ChartSeries;
+        private List<PieSeriesPoint> _Psps;
+
+        private ChartLegendItem _LegendItem;
+        private string _LegendText;
+        private ChartLegendItemVisualStyles _ChartLegendItemVisualStyles;
+
+        private string _Name;
+
+        private States _States;
+
+        #endregion
+
+        public PieRing()
+        {
+            InitDefaultStates();
+        }
+
+        public PieRing(int ringLevel)
+            : this()
+        {
+            RingLevel = ringLevel;
+        }
+
+        #region InitDefaultStates
+
+        private void InitDefaultStates()
+        {
+            SetState(States.AllowDetach, true);
+            SetState(States.AllowSelect, true);
+
+            SetState(States.CheckedInLegend, true);
+            SetState(States.ShowInLegend, true);
+            SetState(States.ShowInParentLegend, true);
+            SetState(States.ShowMarkerInLegend, true);
+
+            SetState(States.Visible, true);
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region AllowDetach
+
+        /// <summary>
+        /// Gets or sets whether the element can be 'detached' from
+        /// the center of the pie by the user. Defaults to true.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior")]
+        [Description("Indicates whether the element can be 'detached' from the center of the pie by the user. Defaults to true.")]
+        public bool AllowDetach
+        {
+            get { return (TestState(States.AllowDetach)); }
+
+            set
+            {
+                if (value != AllowDetach)
+                {
+                    SetState(States.AllowDetach, value);
+
+                    OnPropertyChanged("AllowDetach");
+                }
+            }
+        }
+
+        #endregion
+
+        #region AllowSelect
+
+        /// <summary>
+        /// Gets or sets whether the ring can be selected by clicking on it. Defaults to true.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior")]
+        [Description("Indicates whether the ring can be selected by clicking on it. Defaults to true.")]
+        public bool AllowSelect
+        {
+            get { return (TestState(States.AllowSelect)); }
+
+            set
+            {
+                if (value != AllowSelect)
+                {
+                    SetState(States.AllowSelect, value);
+
+                    OnPropertyChanged("AllowSelect");
+                }
+            }
+        }
+
+        #endregion
+
+        #region IsDisplayed
+
+        ///<summary>
+        /// Gets whether the ring is displayed (based upon Visibility and Legend state).
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsDisplayed
+        {
+            get
+            {
+                if (ChartSeries != null)
+                {
+                    PieChart pieChart = ChartSeries.Parent as PieChart;
+
+                    if (pieChart != null)
+                    {
+                        ItemCheckAction ica = (pieChart != null)
+                            ? pieChart.Legend.ItemCheckAction : ItemCheckAction.ShowItem;
+
+                        return ((Visible == true) &&
+                                (ica == ItemCheckAction.None ||
+                                (ShowCheckBoxInLegend == false || CheckedInLegend == true)));
+                    }
+                }
+
+                return (false);
+            }
+        }
+
+        #endregion
+
+        #region Name
+
+        /// <summary>
+        /// Gets or sets the user assigned Name of the item.
+        /// </summary>
+        [DefaultValue("")]
+        [Description("Indicates the Name of the item.")]
+        public virtual string Name
+        {
+            get { return (_Name); }
+            set { _Name = value; }
+        }
+
+        #endregion
+
+        #region RingWeight
+
+        ///<summary>
+        /// Gets or sets the 'relative' thickness of the series ring, as
+        /// compared to the relative thickness of other series
+        /// rings.
+        ///</summary>
+        [DefaultValue(-1), Category("Display")]
+        [Description("Indicates the 'relative' thickness of the series ring, as compared to the relative thickness of other series rings.")]
+        public int RingWeight
+        {
+            get { return (_RingWeight); }
+
+            set
+            {
+                if (value != _RingWeight)
+                {
+                    _RingWeight = value;
+
+                    OnPropertyChangedEx("RingWeight", Style.VisualChangeType.Recalc);
+                }
+            }
+        }
+
+        #endregion
+
+        #region Visible
+
+        /// <summary>
+        /// Get or sets whether the item is visible
+        /// </summary>
+        [DefaultValue(true), Category("Appearance")]
+        [Description("Indicates whether the item is visible")]
+        public virtual bool Visible
+        {
+            get { return (TestState(States.Visible)); }
+
+            set
+            {
+                if (Visible != value)
+                {
+                    SetState(States.Visible, value);
+
+                    OnPropertyChangedEx("Visible", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region ChartSeries
+
+        internal PieSeries ChartSeries
+        {
+            get { return (_ChartSeries); }
+            set { _ChartSeries = value; }
+        }
+
+        #endregion
+
+        #region ExtentRadius
+
+        internal int ExtentRadius
+        {
+            get { return (_ExtentRadius); }
+            set { _ExtentRadius = value; }
+        }
+
+        #endregion
+
+        #region InnerRadius
+
+        internal int InnerRadius
+        {
+            get { return (_InnerRadius); }
+            set { _InnerRadius = value; }
+        }
+
+        #endregion
+
+        #region IsEnabled
+
+        internal bool IsEnabled
+        {
+            get { return (IsRingEnabled()); }
+        }
+
+        #region IsRingEnabled
+
+        private bool IsRingEnabled()
+        {
+            if (ChartSeries != null)
+            {
+                int index = ChartSeries.PieRings.IndexOf(this);
+
+                if (index >= 0)
+                {
+                    for (int i = index - 1; i >= 0; i--)
+                    {
+                        PieRing pieRing = ChartSeries.PieRings[i];
+
+                        if (pieRing.IsDisplayed == false)
+                            return (false);
+                    }
+                }
+
+                return (ChartSeries.IsDisplayed);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IsInitialRing
+
+        internal bool IsInnerRing
+        {
+            get { return (TestState(States.InnerRing)); }
+            set { SetState(States.InnerRing, value); }
+        }
+
+        #endregion
+
+        #region IsOuterRing
+
+        internal bool IsOuterRing
+        {
+            get { return (TestState(States.OuterRing)); }
+            set { SetState(States.OuterRing, value); }
+        }
+
+        #endregion
+
+        #region OuterRadius
+
+        internal int OuterRadius
+        {
+            get { return (_OuterRadius); }
+            set { _OuterRadius = value; }
+        }
+
+        #endregion
+
+        #region Psps
+
+        internal List<PieSeriesPoint> Psps
+        {
+            get
+            {
+                if (_Psps == null)
+                    _Psps = new List<PieSeriesPoint>();
+
+                return (_Psps);
+            }
+        }
+
+        #endregion
+
+        #region RingLevel
+
+        internal int RingLevel
+        {
+            get { return (_RingLevel); }
+            set { _RingLevel = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetSelectionCount
+
+        /// <summary>
+        /// Gets a count of the visible selected pie series points.
+        /// </summary>
+        /// <returns></returns>
+        public int GetSelectionCount()
+        {
+            int count = 0;
+
+            foreach (PieSeriesPoint psp in Psps)
+            {
+                if (psp.Visible == true)
+                {
+                    if (psp.IsSelected == true)
+                        count++;
+                }
+            }
+
+            return (count);
+        }
+
+        #endregion
+
+        #region InvalidateRender
+
+        internal void InvalidateRender(PieChart pieChart)
+        {
+            foreach (PieSeriesPoint psp in Psps)
+                pieChart.InvalidateRender(psp.PathBounds);
+        }
+
+        #endregion
+
+        #region ILegendItem
+
+        #region ChartLegendItemVisualStyles
+
+        /// <summary>
+        /// Gets or sets the visual styles for the Legend item.
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates the visual styles for the Legend item.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ChartLegendItemVisualStyles ChartLegendItemVisualStyles
+        {
+            get
+            {
+                if (_ChartLegendItemVisualStyles == null)
+                {
+                    _ChartLegendItemVisualStyles = new ChartLegendItemVisualStyles();
+
+                    StyleChangeHandler(null, _ChartLegendItemVisualStyles);
+                }
+
+                return (_ChartLegendItemVisualStyles);
+            }
+
+            set
+            {
+                if (_ChartLegendItemVisualStyles != value)
+                {
+                    ChartLegendItemVisualStyles oldValue = _ChartLegendItemVisualStyles;
+
+                    _ChartLegendItemVisualStyles = value;
+
+                    OnStyleChanged("ChartLegendItemVisualStyles", oldValue, value);
+
+                    if (oldValue != null)
+                        oldValue.Dispose();
+                }
+            }
+        }
+
+        #endregion
+
+        #region CheckedInLegend
+
+        /// <summary>
+        /// Gets or sets whether the item is checked in the Legend.
+        /// </summary>
+        [DefaultValue(true), Category("Legend")]
+        [Description("Indicates whether the item is checked in the Legend.")]
+        public bool CheckedInLegend
+        {
+            get { return (TestState(States.CheckedInLegend)); }
+
+            set
+            {
+                if (value != CheckedInLegend)
+                {
+                    SetState(States.CheckedInLegend, value);
+
+                    ChartSeries.InvalidateLayout();
+
+                    if (LegendItem != null)
+                        LegendItem.UpdateCheckState();
+
+                    foreach (PieSeriesPoint psp in Psps)
+                    {
+                        if (psp.LegendItem != null)
+                            psp.LegendItem.IsEnabled = psp.IsEnabled;
+                    }
+
+                    OnPropertyChangedEx("CheckedInLegend", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowCheckBoxInLegend
+
+        /// <summary>
+        /// Gets or sets whether a checkbox for the item is shown in the Legend.
+        /// </summary>
+        [DefaultValue(false), Category("Legend")]
+        [Description("Indicates whether a checkbox for the item is shown in the Legend.")]
+        public bool ShowCheckBoxInLegend
+        {
+            get { return (TestState(States.ShowCheckBoxInLegend)); }
+
+            set
+            {
+                if (value != ShowCheckBoxInLegend)
+                {
+                    SetState(States.ShowCheckBoxInLegend, value);
+
+                    OnPropertyChangedEx("ShowCheckBoxInLegend", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowInLegend
+
+        /// <summary>
+        /// Gets or sets whether the item is shown in the Legend.
+        /// </summary>
+        [DefaultValue(true), Category("Legend")]
+        [Description("Indicates whether the item is shown in the Legend.")]
+        public bool ShowInLegend
+        {
+            get { return (TestState(States.ShowInLegend)); }
+
+            set
+            {
+                if (value != ShowInLegend)
+                {
+                    SetState(States.ShowInLegend, value);
+
+                    OnPropertyChangedEx("ShowInLegend", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowInParentLegend
+
+        /// <summary>
+        /// Gets or sets whether the item Line is shown in parent Legend(s).
+        /// </summary>
+        [DefaultValue(true), Category("Legend")]
+        [Description("Indicates whether the item Line is shown in parent Legend(s).")]
+        public bool ShowInParentLegend
+        {
+            get { return (TestState(States.ShowInParentLegend)); }
+
+            set
+            {
+                if (value != ShowInParentLegend)
+                {
+                    SetState(States.ShowInParentLegend, value);
+
+                    OnPropertyChangedEx("ShowInParentLegend", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowMarkerInLegend
+
+        /// <summary>
+        /// Gets or sets whether the item Marker is shown in the Legend.
+        /// </summary>
+        [DefaultValue(true), Category("Legend")]
+        [Description("Indicates whether the item Marker is shown in the Legend.")]
+        public bool ShowMarkerInLegend
+        {
+            get { return (TestState(States.ShowMarkerInLegend)); }
+
+            set
+            {
+                if (value != ShowMarkerInLegend)
+                {
+                    SetState(States.ShowMarkerInLegend, value);
+
+                    OnPropertyChangedEx("ShowMarkerInLegend", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region LegendItem
+
+        ///<summary>
+        /// Gets the item's parent LegendItem.
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        [Description("Indicates the item's parent LegendItem.")]
+        public ChartLegendItem LegendItem
+        {
+            get { return (_LegendItem); }
+            internal set { _LegendItem = value; }
+        }
+
+        #endregion
+
+        #region LegendText
+
+        ///<summary>
+        /// Gets or sets the text to display in the legend.
+        ///</summary>
+        [DefaultValue(null), Category("Legend")]
+        [Description("Indicates the text to display in the legend.")]
+        [NotifyParentProperty(true)]
+        public string LegendText
+        {
+            get { return (_LegendText); }
+
+            set
+            {
+                if (value != _LegendText)
+                {
+                    _LegendText = value;
+
+                    OnPropertyChangedEx("LegendText", Style.VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region GetLegendItem
+
+        /// <summary>
+        /// Creates the LegendItem for the item.
+        /// </summary>
+        /// <returns></returns>
+        public ChartLegendItem GetLegendItem()
+        {
+            _LegendItem = null;
+
+            if (ShowInLegend == true)
+            {
+                _LegendItem = new ChartLegendItem();
+
+                if (CheckedInLegend == true)
+                    _LegendItem.CheckState = CheckState.Checked;
+
+                _LegendItem.Name = Name;
+                _LegendItem.ItemText = LegendText;
+
+                if (string.IsNullOrEmpty(_LegendItem.Name) == true)
+                    _LegendItem.Name = "(PieRing " + (RingLevel + 1) + ")";
+
+                _LegendItem.IsEnabled = IsEnabled;
+
+                _LegendItem.ChartItems.Add(this);
+            }
+
+            return (_LegendItem);
+        }
+
+        #endregion
+
+        #region GetLegendItems
+
+        /// <summary>
+        /// Creates a list of legend items associated with
+        /// the item.
+        /// </summary>
+        /// <returns></returns>
+        public List<ChartLegendItem> GetLegendItems()
+        {
+            List<ChartLegendItem> list = new List<ChartLegendItem>();
+
+            for (int i = 0; i < Psps.Count; i++)
+            {
+                PieSeriesPoint psp = Psps[i];
+
+                if (psp.IsDisplayable == true)
+                {
+                    List<ChartLegendItem> items = psp.GetLegendItems();
+
+                    if (items != null && items.Count > 0)
+                        list.AddRange(items);
+                }
+            }
+
+            return (list);
+        }
+
+        #endregion
+
+        #region GetLegendItemColor
+
+        /// <summary>
+        /// Gets the default color associated with the legend item.
+        /// </summary>
+        /// <returns></returns>
+        public Color GetLegendItemColor()
+        {
+            if (Psps.Count > 0)
+                return (Psps[0].GetLegendItemColor());
+
+            return (ChartSeries.GetLegendItemColor());
+        }
+
+        #endregion
+
+        #region RenderLegendItemMarker
+
+        /// <summary>
+        /// Renders the Legend item Marker.
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="litem"></param>
+        /// <param name="style"></param>
+        public void RenderLegendItemMarker(Graphics g,
+            ChartLegendItem litem, ChartLegendItemVisualStyle style)
+        {
+            Rectangle bounds = litem.MarkerBounds;
+            bounds.Inflate(-1, -1);
+
+            bounds.Width--;
+            bounds.Height--;
+
+            SmoothingMode sm = g.SmoothingMode;
+            g.SmoothingMode = SmoothingMode.AntiAlias;
+
+            if (IsEnabled == true)
+            {
+                Color color = GetLegendItemColor();
+
+                using (Pen pen = new Pen(color, 2))
+                    g.DrawEllipse(pen, bounds);
+            }
+            else
+            {
+                Color color = style.DisabledMarkerBackground.Color1;
+
+                if (color.IsEmpty == true)
+                    color = style.DisabledTextColor;
+
+                if (color.IsEmpty == true)
+                    color = Color.LightGray;
+
+                using (Pen pen = new Pen(color, 2))
+                    g.DrawEllipse(pen, bounds);
+            }
+
+            g.SmoothingMode = sm;
+        }
+
+        #endregion
+
+        #endregion
+        
+        #region States
+
+        [Flags]
+        private enum States : uint
+        {
+            AllowSelect = (1U << 0),
+            AllowDetach = (1U << 1),
+
+            InnerRing = (1U << 2),
+            OuterRing = (1U << 3),
+
+            CheckedInLegend = (1U << 4),
+            ShowInLegend = (1U << 5),
+            ShowInParentLegend = (1U << 6),
+            ShowCheckBoxInLegend = (1U << 7),
+            ShowMarkerInLegend = (1U << 8),
+
+            Visible = (1U << 9),
+        }
+
+        #region TestState
+
+        private bool TestState(States state)
+        {
+            return ((_States & state) == state);
+        }
+
+        #endregion
+
+        #region SetState
+
+        private void SetState(States state, bool value)
+        {
+            if (value == true)
+                _States |= state;
+            else
+                _States &= ~state;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region INotifyPropertyChanged Members
+
+        /// <summary>
+        /// Occurs when property value has changed.
+        /// </summary>
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        #region OnPropertyChanged
+
+        /// <summary>
+        /// Raises the PropertyChanged event.
+        /// </summary>
+        /// <param name="e">Event arguments</param>
+        protected virtual void OnPropertyChanged(PropertyChangedEventArgs e)
+        {
+            if (PropertyChanged != null)
+                PropertyChanged(this, e);
+        }
+
+        /// <summary>
+        /// Default PropertyChanged processing
+        /// </summary>
+        /// <param name="s"></param>
+        protected void OnPropertyChanged(string s)
+        {
+            if (PropertyChanged != null)
+                OnPropertyChanged(new PropertyChangedEventArgs(s));
+        }
+
+        /// <summary>
+        /// Default PropertyChanged processing
+        /// </summary>
+        /// <param name="s"></param>
+        /// <param name="changeType">invalidate</param>
+        protected void OnPropertyChangedEx(string s, VisualChangeType changeType)
+        {
+            if (PropertyChanged != null)
+                OnPropertyChanged(new VisualPropertyChangedEventArgs(s, changeType));
+        }
+
+        #endregion
+
+        #region NotifyVisualParent
+
+        internal void NotifyVisualParent(object sender, VisualChangeType vct)
+        {
+            object parent = sender;
+
+            PieSeries series = ChartSeries;
+
+            if (series != null)
+            {
+                if (vct == VisualChangeType.Layout)
+                    series.InvalidateLayout();
+                else
+                    series.InvalidateRender();
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region OnStyleChanged
+
+        protected virtual void OnStyleChanged(string property,
+            INotifyPropertyChanged oldValue, INotifyPropertyChanged newValue)
+        {
+            StyleChangeHandler(oldValue, newValue);
+
+            OnPropertyChanged(property);
+        }
+
+        #endregion
+
+        #region StyleChangeHandler
+
+        protected void StyleChangeHandler(
+            INotifyPropertyChanged oldValue, INotifyPropertyChanged newValue)
+        {
+            if (oldValue != null)
+                oldValue.PropertyChanged -= StyleChanged;
+
+            if (newValue != null)
+                newValue.PropertyChanged += StyleChanged;
+        }
+
+        #region StyleChanged
+
+        /// <summary>
+        /// Occurs when one of element visual styles has property changes.
+        /// Default implementation invalidates visual appearance of element.
+        /// </summary>
+        /// <param name="sender">VisualStyle that changed.</param>
+        /// <param name="e">Event arguments.</param>
+        protected void StyleChanged(object sender, PropertyChangedEventArgs e)
+        {
+            VisualChangeType changeType = ((VisualPropertyChangedEventArgs)e).ChangeType;
+
+            PieSeries series = ChartSeries;
+
+            if (series != null)
+            {
+                if (series.ChartControl != null)
+                    series.ChartControl.GlobalUpdateCount++;
+
+                if (changeType == VisualChangeType.Layout)
+                    series.InvalidateLayout();
+                else
+                    series.InvalidateRender();
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InvalidateRender
+
+        public void InvalidateRender()
+        {
+            PieSeries series = ChartSeries;
+
+            if (series != null)
+                series.InvalidateRender();
+        }
+
+        #endregion
+
+        #region TrackLegendItem
+
+        /// <summary>
+        /// Gets whether legend item tracking is enabled.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool TrackLegendItem
+        {
+            get
+            {
+                if (ChartSeries != null)
+                    return (ChartSeries.TrackLegendItem);
+
+                return (false);
+            }
+        }
+
+        #endregion
+
+        #region FormatItemText
+
+        /// <summary>
+        /// Formats the provided item text.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public string FormatItemText(string text)
+        {
+            return (text);
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/RadialChart/PieSeries.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/RadialChart/PieSeries.cs
new file mode 100644
index 00000000..5390cedc
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/RadialChart/PieSeries.cs	
@@ -0,0 +1,6323 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Drawing.Drawing2D;
+using System.Drawing.Text;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.Charts.Style;
+
+namespace DevComponents.DotNetBar.Charts
+{
+    /// <summary>
+    /// Represents the collection of PieSeries.
+    /// </summary>
+    [Editor("DevComponents.Charts.Design.ChartSeriesCollectionEditor, DevComponents.Charts.Design, " +
+            "Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(UITypeEditor))]
+    public class ChartPieSeriesCollection : CustomNamedCollection<PieSeries>
+    {
+        #region GetUniqueName
+
+        public string GetUniqueName()
+        {
+            return (GetUniqueName("Series"));
+        }
+
+        #endregion
+    }
+
+    [TypeConverter(typeof(PieSeriesConverter))]
+    public class PieSeries : BaseSeries, ISeriesPointContainer, ILegendItemEx
+    {
+        #region Private variables
+
+        private States _States;
+
+        private PieSeriesPointCollection _SeriesPoints;
+
+        private double _ExplodedMargin = double.NaN;
+
+        private Point _PieCenter;
+        private List<PieRing> _PieRings;
+
+        private int _RingWeightTotal;
+
+        private Tbool _CenterFirstSlice = Tbool.NotSet;
+
+        private Tbool _ShowAllRings = Tbool.NotSet;
+        private Tbool _ShowOtherSlice = Tbool.NotSet;
+
+        private PieSeriesPointCollection _ActiveSeriesPointSet;
+
+        private MouseClickSliceAction _MouseClickSliceAction = MouseClickSliceAction.NotSet;
+        private MouseDoubleClickSliceAction _MouseDoubleClickSliceAction = MouseDoubleClickSliceAction.NotSet;
+
+        private PieSelectionMode _PieSelectionMode = PieSelectionMode.NotSet;
+
+        private PieSeriesPoint _MouseDownPsp;
+        private int _MouseDownRadius;
+        private int _MouseDownOffset;
+
+        private Tbool _EnableDragDetach = Tbool.NotSet;
+
+        private SymbolDef _ScaleSymDef = new SymbolDef();
+        private float _SymFontScale = -1;
+
+        private SliceVisualLayout _SliceVisualLayout;
+
+        private int _RingWeight = 100;
+        private int _RingWeightEx;
+
+        private PaletteGroup _PaletteGroup = PaletteGroup.NotSet;
+        private Color[] _CustomPalette;
+
+        private double _PieOuterExtent;
+
+        #endregion
+
+        #region Constructors
+
+        public PieSeries()
+            : this(null)
+        {
+        }
+
+        public PieSeries(string name)
+        {
+            Name = name;
+            SeriesType = SeriesType.Pie;
+
+            InitDefaultStates();
+        }
+
+        #endregion
+
+        #region InitDefaultStates
+
+        private void InitDefaultStates()
+        {
+            SetState(States.ShowInnerRingsEx, true);
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region CenterFirstSlice
+
+        /// <summary>
+        /// Gets or sets whether the first pie slice is centered
+        /// on the starting angle or starts on the starting angle. Default is false.
+        /// </summary>
+        [DefaultValue(Tbool.NotSet), Category("Display")]
+        [Description("Indicates whether the first pie slice is centered on the starting angle or starts on the starting angle. Default is false.")]
+        public Tbool CenterFirstSlice
+        {
+            get { return (_CenterFirstSlice); }
+
+            set
+            {
+                if (value != _CenterFirstSlice)
+                {
+                    _CenterFirstSlice = value;
+
+                    OnPropertyChangedEx("CenterFirstSlice", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region CustomPalette
+
+        ///<summary>
+        /// Gets or sets the custom palette for the series.
+        ///</summary>
+        [DefaultValue(null), Category("Appearance")]
+        [Description("Indicates the custom palette for the series.")]
+        public Color[] CustomPalette
+        {
+            get { return (_CustomPalette); }
+
+            set
+            {
+                _CustomPalette = value;
+
+                OnPropertyChangedEx("CustomPalette", VisualChangeType.Layout);
+            }
+        }
+
+        #endregion
+
+        #region EnableDragDetach
+
+        ///<summary>
+        /// Gets or sets whether the user can detach associated series elements by Click and drag.
+        /// Note that MouseClickSelect must not be set to None or NotSet.
+        ///</summary>
+        [DefaultValue(Tbool.NotSet), Category("Behavior")]
+        [Description("Indicates whether the user can detach associated series elements by Click and drag. Note that MouseClickSelect must not be set to None or NotSet.")]
+        public Tbool EnableDragDetach
+        {
+            get { return (_EnableDragDetach); }
+
+            set
+            {
+                if (value != _EnableDragDetach)
+                {
+                    _EnableDragDetach = value;
+
+                    OnPropertyChangedEx("EnableDragDetach", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #region GetEnableDragDetach
+
+        internal bool GetEnableDragDetach(PieChart pieChart)
+        {
+            Tbool enable = EnableDragDetach;
+
+            if (enable == Tbool.NotSet)
+                enable = pieChart.EnableDragDetach;
+
+            return (enable == Tbool.True);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ExplodedMargin
+
+        /// <summary>
+        /// Gets or sets the exploded Margin for the series when the pie
+        /// is Exploded. The Margin is is measured as a percentage of the pie
+        /// radius (if less than 1) or the absolute pixel amount (if greater than 1).
+        /// </summary>
+        [DefaultValue(double.NaN), Category("Layout")]
+        [Description("Indicates the exploded Margin for the series when the pie is Exploded. The Margin is is measured as a percentage of the pie radius (if <= 1) or the absolute pixel amount (if > 1).")]
+        public double ExplodedMargin
+        {
+            get { return (_ExplodedMargin); }
+
+            set
+            {
+                if (value != _ExplodedMargin)
+                {
+                    _ExplodedMargin = value;
+
+                    OnPropertyChangedEx("ExplodedMargin", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region MouseClickSliceAction
+
+        /// <summary>
+        /// Gets or sets the action used when the user clicks on a pie slice.
+        /// </summary>
+        [DefaultValue(MouseClickSliceAction.NotSet), Category("Behavior")]
+        [Description("Indicates the action used when the user clicks on a pie slice.")]
+        public MouseClickSliceAction MouseClickSliceAction
+        {
+            get { return (_MouseClickSliceAction); }
+
+            set
+            {
+                if (value != _MouseClickSliceAction)
+                {
+                    _MouseClickSliceAction = value;
+
+                    OnPropertyChanged("MouseClickSliceAction");
+                }
+            }
+        }
+
+        #region GetMouseClickSliceAction
+
+        private MouseClickSliceAction GetMouseClickSliceAction(PieChart pieChart)
+        {
+            MouseClickSliceAction mca =
+                (MouseClickSliceAction != MouseClickSliceAction.NotSet)
+                ? MouseClickSliceAction : pieChart.MouseClickSliceAction;
+
+            return ((mca != MouseClickSliceAction.NotSet) ? mca : MouseClickSliceAction.None);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region MouseDoubleClickSliceAction
+
+        /// <summary>
+        /// Gets or sets the action used when the user double-clicks on a pie slice.
+        /// </summary>
+        [DefaultValue(MouseDoubleClickSliceAction.NotSet), Category("Behavior")]
+        [Description("Indicates the action used when the user clicks on a pie slice.")]
+        public MouseDoubleClickSliceAction MouseDoubleClickSliceAction
+        {
+            get { return (_MouseDoubleClickSliceAction); }
+
+            set
+            {
+                if (value != _MouseDoubleClickSliceAction)
+                {
+                    _MouseDoubleClickSliceAction = value;
+
+                    OnPropertyChanged("MouseDoubleClickSliceAction");
+                }
+            }
+        }
+
+        #region GetMouseDoubleClickSliceAction
+
+        private MouseDoubleClickSliceAction GetMouseDoubleClickSliceAction(PieChart pieChart)
+        {
+            MouseDoubleClickSliceAction mca =
+                (MouseDoubleClickSliceAction != MouseDoubleClickSliceAction.NotSet)
+                ? MouseDoubleClickSliceAction : pieChart.MouseDoubleClickSliceAction;
+
+            return ((mca != MouseDoubleClickSliceAction.NotSet) ? mca : MouseDoubleClickSliceAction.None);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region PaletteGroup
+
+        /// <summary>
+        /// Gets or sets the palette color group to use (Light/Medium/Dark/Color1/MonoBlue/etc).
+        /// </summary>
+        [DefaultValue(PaletteGroup.NotSet), Category("Appearance")]
+        [Description("Indicates the palette color group to use (Light/Medium/Dark/Color1/MonoBlue/etc.).")]
+        public PaletteGroup PaletteGroup
+        {
+            get { return (_PaletteGroup); }
+
+            set
+            {
+                if (value != _PaletteGroup)
+                {
+                    _PaletteGroup = value;
+
+                    OnPropertyChangedEx("PaletteGroup", VisualChangeType.Recalc);
+                }
+            }
+        }
+
+        #endregion
+
+        #region PieSelectionMode
+
+        /// <summary>
+        /// Gets or sets the mode used to perfoem pie selections.
+        /// </summary>
+        [DefaultValue(PieSelectionMode.NotSet), Category("Behavior")]
+        [Description("Indicates the mode used to perform pie selections.")]
+        public PieSelectionMode PieSelectionMode
+        {
+            get { return (_PieSelectionMode); }
+
+            set
+            {
+                if (value != _PieSelectionMode)
+                {
+                    _PieSelectionMode = value;
+
+                    OnPropertyChanged("PieSelectionMode");
+                }
+            }
+        }
+
+        #region GetPieSelectionMode
+
+        internal PieSelectionMode GetPieSelectionMode(PieChart pieChart)
+        {
+            PieSelectionMode psm = PieSelectionMode;
+
+            if (psm == PieSelectionMode.NotSet)
+                psm = pieChart.PieSelectionMode;
+
+            return ((psm != PieSelectionMode.NotSet) ? psm : PieSelectionMode.Slice);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ReversePaletteColors
+
+        ///<summary>
+        /// Gets or sets whether default palette colors are utilized in reverse order.
+        ///</summary>
+        [DefaultValue(false), Category("Behavior")]
+        [Description("Indicates whether default palette colors are utilized in reverse order.")]
+        public virtual bool ReversePaletteColors
+        {
+            get { return (TestState(States.ReversePaletteColors)); }
+
+            set
+            {
+                if (value != ReversePaletteColors)
+                {
+                    SetState(States.ReversePaletteColors, value);
+
+                    OnPropertyChangedEx("ReversePaletteColors", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region RingWeight
+
+        ///<summary>
+        /// Gets or sets the 'relative' total combined thickness of all series rings, as
+        /// compared to the relative thickness of other series combined rings.
+        /// rings.
+        ///</summary>
+        [DefaultValue(100), Category("Layout")]
+        [Description("Indicates the 'relative' total combined thickness of all series rings, as compared to the relative thickness of other series combined rings.. Default is 100.")]
+        public int RingWeight
+        {
+            get { return (_RingWeight); }
+
+            set
+            {
+                if (value != _RingWeight)
+                {
+                    _RingWeight = value;
+
+                    OnPropertyChangedEx("RingWeight", Style.VisualChangeType.Recalc);
+                }
+            }
+        }
+
+        #endregion
+
+        #region SeriesPoints
+
+        ///<summary>
+        /// Gets or sets the series point data collection.
+        ///</summary>
+        [Category("Data")]
+        [Description("Indicates the series point data collection.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public PieSeriesPointCollection SeriesPoints
+        {
+            get
+            {
+                if (_SeriesPoints == null)
+                {
+                    _SeriesPoints = new PieSeriesPointCollection();
+
+                    _SeriesPoints.Parent = this;
+
+                    _SeriesPoints.CollectionChanged += SeriesPoints_CollectionChanged;
+                }
+
+                return (_SeriesPoints);
+            }
+
+            set
+            {
+                if (value != _SeriesPoints)
+                {
+                    if (_SeriesPoints != null)
+                    {
+                        _SeriesPoints.Parent = null;
+
+                        _SeriesPoints.CollectionChanged -= SeriesPoints_CollectionChanged;
+                    }
+
+                    _SeriesPoints = value;
+
+                    if (_SeriesPoints != null)
+                    {
+                        _SeriesPoints.Parent = this;
+
+                        _SeriesPoints.CollectionChanged += SeriesPoints_CollectionChanged;
+                    }
+                }
+            }
+        }
+
+        #region SeriesPoints_CollectionChanged
+
+        void SeriesPoints_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            SeriesRangeChanged = true;
+
+            SetPointNotify(e.OldItems, false);
+            SetPointNotify(e.NewItems, true);
+
+            InvalidateLayout();
+        }
+
+        #region SetPointNotify
+
+        private void SetPointNotify(IList list, bool notify)
+        {
+            if (list != null)
+            {
+                for (int i = 0; i < list.Count; i++)
+                {
+                    PieSeriesPoint psp = list[i] as PieSeriesPoint;
+
+                    if (psp != null)
+                    {
+                        if (notify == true)
+                        {
+                            psp.Parent = SeriesPoints;
+                            psp.PropertyChanged += Sp_PropertyChanged;
+                        }
+                        else
+                        {
+                            psp.Parent = null;
+                            psp.PropertyChanged -= Sp_PropertyChanged;
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region Sp_PropertyChanged
+
+        void Sp_PropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            VisualPropertyChangedEventArgs vce = e as VisualPropertyChangedEventArgs;
+
+            if (vce != null)
+            {
+                if (vce.ChangeType == VisualChangeType.Recalc)
+                {
+                    InvalidateRecalc();
+                }
+                else if (vce.ChangeType == VisualChangeType.Layout)
+                {
+                    InvalidateLayout();
+                }
+                else
+                {
+                    PieSeriesPoint psp = sender as PieSeriesPoint;
+
+                    if (psp != null)
+                    {
+                        InvalidateRender(psp.Bounds);
+                        InvalidateRender(psp.PathBounds);
+                    }
+                    else
+                    {
+                        InvalidateRender();
+                    }
+                }
+
+                if (ChartControl != null)
+                    ChartControl.GlobalUpdateCount++;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region ShowAllRings
+
+        /// <summary>
+        /// Gets or sets whether all series rings are shown when rendering the chart.
+        /// If false, only one ring at a time is shown, with the ability to 'drill' up
+        /// or down, to display adjacent rings.        
+        /// </summary>
+        [DefaultValue(Tbool.NotSet), Category("Appearance")]
+        [Description("Indicates  whether all series Rings are shown when rendering the chart. If false, only one ring at a time is shown, with the ability to 'drill' up or down, to display adjacent rings.")]
+        public Tbool ShowAllRings
+        {
+            get { return (_ShowAllRings); }
+
+            set
+            {
+                if (value != _ShowAllRings)
+                {
+                    _ShowAllRings = value;
+
+                    OnPropertyChangedEx("ShowAllRings", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #region ShowAllRingsEx
+
+        internal bool ShowAllRingsEx(PieChart pieChart)
+        {
+            if (ShowAllRings != Tbool.NotSet)
+                return (ShowAllRings != Tbool.False);
+
+            return (pieChart.ShowAllRings != Tbool.False);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ShowOtherSlice
+
+        /// <summary>
+        /// Gets or sets whether to consolidate smaller pie slices into a single slice that
+        /// represents 'other' data values, or whether to display those smaller slices
+        /// as separate pie slices.
+        /// </summary>
+        [DefaultValue(Tbool.NotSet), Category("Appearance")]
+        [Description("Indicates whether to consolidate smaller pie slices into a single slice that represents 'other' data values, or whether to display those smaller slices as separate pie slices.")]
+        public Tbool ShowOtherSlice
+        {
+            get { return (_ShowOtherSlice); }
+
+            set
+            {
+                if (value != _ShowOtherSlice)
+                {
+                    _ShowOtherSlice = value;
+
+                    OnPropertyChangedEx("ShowOtherSlice", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #region ShowOtherSliceEx
+
+        internal bool ShowOtherSliceEx(PieChart pieChart)
+        {
+            if (ShowOtherSlice != Tbool.NotSet)
+                return (ShowOtherSlice == Tbool.True);
+
+            return (pieChart.ShowOtherSlice == Tbool.True);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region SubSliceVisualLayout
+
+        /// <summary>
+        /// Gets or sets the default layout of the subordinate or nested series slices.
+        /// </summary>
+        [Category("Layout")]
+        [Description("Indicates the default layout of the subordinate or nested series slices.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public SliceVisualLayout SubSliceVisualLayout
+        {
+            get
+            {
+                if (_SliceVisualLayout == null)
+                    SubSliceVisualLayout = new SliceVisualLayout(this);
+
+                return (_SliceVisualLayout);
+            }
+
+            set
+            {
+                if (value != _SliceVisualLayout)
+                {
+                    if (_SliceVisualLayout != null)
+                        _SliceVisualLayout.PropertyChanged -= SliceVisualLayout_PropertyChanged;
+
+                    _SliceVisualLayout = value;
+
+                    if (_SliceVisualLayout != null)
+                        _SliceVisualLayout.PropertyChanged += SliceVisualLayout_PropertyChanged;
+
+                    OnPropertyChangedEx("SliceVisualLayout", VisualChangeType.Recalc);
+                }
+            }
+        }
+
+        #region SliceVisualLayout_PropertyChanged
+
+        void SliceVisualLayout_PropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            VisualPropertyChangedEventArgs vce = e as VisualPropertyChangedEventArgs;
+
+            if (vce != null)
+            {
+                OnPropertyChangedEx(vce.PropertyName, vce.ChangeType);
+
+                if (ChartControl != null)
+                    ChartControl.GlobalUpdateCount++;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Visible
+
+        /// <summary>
+        /// Gets or sets whether the series is visible or not.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance")]
+        [Description("Indicates whether the series is visible or not.")]
+        public override bool Visible
+        {
+            get { return (base.Visible); }
+
+            set
+            {
+                if (Visible != value)
+                {
+                    base.Visible = value;
+
+                    SeriesRangeChanged = true;
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region ActiveSeriesPointCollection
+
+        internal PieSeriesPointCollection ActiveSeriesPointCollection
+        {
+            get { return (_ActiveSeriesPointSet); }
+            set { _ActiveSeriesPointSet = value; }
+        }
+
+        #endregion
+
+        #region IsInnerRingSeries
+
+        internal bool IsInnerRingSeries
+        {
+            get { return (TestState(States.IsInnerRingSeries)); }
+            set { SetState(States.IsInnerRingSeries, value); }
+        }
+
+        #endregion
+
+        #region IsOffset
+
+        internal bool IsOffset
+        {
+            get { return (TestState(States.IsOffset)); }
+            set { SetState(States.IsOffset, value); }
+        }
+
+        #endregion
+
+        #region IsOuterRingSeries
+
+        internal bool IsOuterRingSeries
+        {
+            get { return (TestState(States.IsOuterRingSeries)); }
+            set { SetState(States.IsOuterRingSeries, value); }
+        }
+
+        #endregion
+
+        #region PieCenter
+
+        internal Point PieCenter
+        {
+            get { return (_PieCenter); }
+            set { _PieCenter = value; }
+        }
+
+        #endregion
+
+        #region PieOuterExtent
+
+        internal double PieOuterExtent
+        {
+            get { return (_PieOuterExtent); }
+            set { _PieOuterExtent = value; }
+        }
+
+        #endregion
+
+        #region PieRings
+
+        internal List<PieRing> PieRings
+        {
+            get
+            {
+                if (_PieRings == null)
+                    _PieRings = new List<PieRing>();
+
+                return (_PieRings);
+            }
+        }
+
+        #endregion
+
+        #region RingWeightTotal
+
+        internal int RingWeightTotal
+        {
+            get { return (_RingWeightTotal); }
+            set { _RingWeightTotal = value; }
+        }
+
+        #endregion
+
+        #region RingWeightEx
+
+        internal int RingWeightEx
+        {
+            get { return (_RingWeightEx); }
+            set { _RingWeightEx = value; }
+        }
+
+        #endregion
+
+        #region SymFontScale
+
+        internal float SymFontScale
+        {
+            get { return (_SymFontScale); }
+            set { _SymFontScale = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderOverride
+
+        protected override void RenderOverride(ChartRenderInfo renderInfo)
+        {
+            if (SeriesPoints.Count > 0)
+            {
+                PieChart pieChart = Parent as PieChart;
+
+                Point pt = pieChart.GetGlobalAdjustedPoint(pieChart.ContentBounds.Location);
+                RenderBounds = new Rectangle(pt, pieChart.ContentBounds.Size);
+
+                if (RenderBounds.Width > 0 && RenderBounds.Height > 0)
+                    RenderPieSeries(renderInfo);
+            }
+        }
+
+        #region RenderPieSeries
+
+        private void RenderPieSeries(ChartRenderInfo renderInfo)
+        {
+            Graphics g = renderInfo.Graphics;
+            PieChart pieChart = Parent as PieChart;
+
+            PieSeriesPointCollection spc = GetActiveSeriesPointCollection();
+
+            RenderPieSeriesEx(g, renderInfo.ClipRectangle, pieChart, spc);
+        }
+
+        #region RenderPieSeriesEx
+
+        private void RenderPieSeriesEx(Graphics g,
+            Rectangle clip, PieChart pieChart, PieSeriesPointCollection spc)
+        {
+            if (spc != null)
+                spc = spc.PieSlices;
+
+            if (spc != null)
+            {
+                foreach (PieSeriesPoint psp in spc)
+                {
+                    if (psp.PieRing != null)
+                    {
+                        if (psp.PieRing.IsDisplayed == true)
+                            RenderSlice(g, clip, pieChart, spc, psp);
+                    }
+                }
+            }
+        }
+
+        #region RenderSlice
+
+        private void RenderSlice(Graphics g, Rectangle clip,
+            PieChart pieChart, PieSeriesPointCollection spc, PieSeriesPoint psp)
+        {
+            if (PspNeedsDisplayed(pieChart, psp, clip) == true)
+            {
+                Region rgn = null;
+
+                int outerRadius = (int)psp.OuterRadius;
+                int innerRadius = (int)psp.InnerRadius;
+
+                ChartSliceVisualStyle sstyle = psp.GetEffectiveSliceStyle(pieChart, this);
+
+                if (psp.IsEmpty == false)
+                    RenderReferenceLines(g, pieChart, spc, psp, false);
+
+                RenderSliceEx(g, ref rgn, pieChart, 
+                    spc, psp, outerRadius, innerRadius, sstyle);
+
+                if (psp.IsEmpty == false)
+                {
+                    if (psp.IsOther == true)
+                    {
+                        if (ShowAllRingsEx(pieChart) == true)
+                        {
+                            List<PieRing> pieRings = psp.PieRing.ChartSeries.PieRings;
+
+                            outerRadius = innerRadius;
+                            innerRadius = pieRings[pieRings.Count - 1].InnerRadius;
+
+                            RenderSliceOtherSpace(g, ref rgn,
+                                pieChart, psp, outerRadius, innerRadius, sstyle);
+                        }
+                    }
+                }
+
+                psp.PathBounds = (rgn != null)
+                    ? Rectangle.Ceiling(rgn.GetBounds(g)) : Rectangle.Empty;
+
+                if (psp.IsEmpty == false)
+                {
+                    if (sstyle.ImageOverlay == ImageOverlay.Bottom)
+                        RenderSliceFigure(g, rgn, pieChart, psp, sstyle);
+
+                    if ((sstyle.ImageOverlay == ImageOverlay.Middle) ||
+                        (sstyle.ImageOverlay == ImageOverlay.NotSet))
+                    {
+                        RenderSliceFigure(g, rgn, pieChart, psp, sstyle);
+                    }
+
+                    RenderSliceLabel(g, pieChart, psp, sstyle);
+
+                    if (sstyle.ImageOverlay == ImageOverlay.Top)
+                        RenderSliceFigure(g, rgn, pieChart, psp, sstyle);
+
+                    RenderReferenceLines(g, pieChart, spc, psp, true);
+                }
+
+                //using (StringFormat sf = new StringFormat())
+                //{
+                //    sf.Alignment = StringAlignment.Center;
+                //    sf.LineAlignment = StringAlignment.Center;
+
+                //    g.DrawString(psp.RenderCount.ToString(),
+                //        SystemFonts.DefaultFont, Brushes.Black, psp.PathBounds, sf);
+                //}
+
+                //psp.RenderCount++;
+            }
+
+            if (ShowAllRingsEx(pieChart) == true)
+            {
+                if (psp.SeriesPoints != null)
+                    RenderPieSeriesEx(g, clip, pieChart, psp.SeriesPoints);
+            }
+        }
+
+        #region PspNeedsDisplayed
+
+        private bool PspNeedsDisplayed(PieChart pieChart, PieSeriesPoint psp, Rectangle clip)
+        {
+            if (psp.IsDisplayedEx == true)
+            {
+                if (psp.SweepAngleEx != 0)
+                {
+                    Rectangle r = psp.Bounds;
+
+                    if (r.Width > 0 && r.Height > 0)
+                    {
+                        if (psp.InnerRadius < psp.OuterRadius)
+                        {
+                            if (psp.PathBounds.IsEmpty == true || clip.IntersectsWith(psp.PathBounds) == true)
+                                return (true);
+                        }
+                    }
+                }
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region RenderSliceEx
+
+        private void RenderSliceEx(Graphics g, ref Region rgn,
+            PieChart pieChart, PieSeriesPointCollection spc, PieSeriesPoint psp,
+            int outerRadius, int innerRadius, ChartSliceVisualStyle sstyle)
+        {
+            int width = outerRadius - innerRadius;
+            int extentWidth = (int)(psp.SliceExtent * width);
+
+            bool renderShading = (sstyle.EnableShading == Tbool.True);
+
+            SliceRenderType renderType = SliceRenderType.FullSlice;
+
+            if (psp.HasExtent == true)
+            {
+                int extentRadius = innerRadius + extentWidth;
+
+                if (extentWidth < width)
+                {
+                    renderType = SliceRenderType.ExtentSlice;
+
+                    if (psp.ShowSliceWhiteSpaceEx == true)
+                    {
+                        RenderSliceWhiteSpace(g, ref rgn, pieChart,
+                            psp, outerRadius, extentRadius, renderShading, sstyle);
+
+                        renderShading = false;
+                    }
+                }
+
+                outerRadius = extentRadius;
+            }
+
+            RenderSliceExtent(g, ref rgn, pieChart,
+                psp, outerRadius, innerRadius, renderShading, renderType, sstyle);
+        }
+
+        #region RenderSliceWhiteSpace
+
+        private void RenderSliceWhiteSpace(Graphics g, ref Region rgn,
+            PieChart pieChart, PieSeriesPoint psp, int outerRadius,
+            int innerRadius, bool renderShading, ChartSliceVisualStyle sstyle)
+        {
+            Background background = sstyle.WhiteSpaceBackground;
+            ChartLineVisualStyle border = sstyle.WhiteSpaceBorder;
+
+            GraphicsState gs = g.Save();
+
+            g.TranslateTransform((float)psp.SliceCenter.X, (float)psp.SliceCenter.Y);
+            g.RotateTransform((float)(psp.CenterAngle) % 360);
+
+            Rectangle r = new Rectangle();
+
+            r.X = r.Y = -outerRadius;
+            r.Width = r.Height = (outerRadius * 2);
+
+            float angle = (float)GetSweepAngle(psp);
+
+            // Try to blend the edges of the slice better.
+
+            //if (background.IsDisplayable == true && border.IsDisplayable == false)
+            //    angle += .1f;
+
+            ChartControl chartControl = ChartControl;
+
+            using (GraphicsPath path = new GraphicsPath())
+            {
+                path.AddArc(r, -angle / 2, angle);
+
+                if (psp.SliceExtent == 0)
+                {
+                    path.AddLine(Point.Empty, Point.Empty);
+                    path.CloseFigure();
+
+                    if (chartControl.DoPreRenderSliceEvent(
+                        g, path, pieChart, this, psp, SliceRenderType.ExtentWhitespace) == false)
+                    {
+                        Rectangle pb = Rectangle.Truncate(path.GetBounds());
+
+                        if (psp.IsEmpty == false)
+                        {
+                            if (background.IsDisplayable == true)
+                            {
+                                using (Brush br = background.GetBrush(pb))
+                                    g.FillPath(br, path);
+                            }
+                        }
+
+                        if (border.IsDisplayable == true)
+                        {
+                            using (Pen pen = new Pen(border.LineColor, Dpi.Width(border.LineWidth)))
+                            {
+                                if (border.LinePattern != LinePattern.NotSet)
+                                    pen.DashStyle = (DashStyle)border.LinePattern;
+
+                                g.DrawPath(pen, path);
+                            }
+                        }
+
+                        chartControl.DoPostRenderSliceEvent(
+                            g, path, pieChart, this, psp, SliceRenderType.ExtentWhitespace);
+                    }
+
+                    if (psp.IsEmpty == false)
+                    {
+                        if (renderShading == true)
+                            RenderShading(g, psp, path);
+                    }
+
+                    path.Transform(g.Transform);
+
+                    if (rgn == null)
+                        rgn = new Region(path);
+                }
+                else
+                {
+                    int pcount = path.PointCount;
+
+                    Rectangle t = new Rectangle();
+                    t.X = t.Y = (-innerRadius);
+                    t.Width = t.Height = (innerRadius * 2);
+
+                    path.AddArc(t, angle / 2, -angle);
+
+                    PointF ppt1 = path.PathPoints[pcount];
+                    PointF ppt2 = path.GetLastPoint();
+
+                    path.CloseFigure();
+
+                    if (chartControl.DoPreRenderSliceEvent(
+                        g, path, pieChart, this, psp, SliceRenderType.ExtentWhitespace) == false)
+                    {
+                        if (psp.IsEmpty == false)
+                        {
+                            if (background.IsDisplayable == true)
+                            {
+                                t = Rectangle.Ceiling(path.GetBounds());
+
+                                Rectangle t2 = t;
+                                t2.Width = outerRadius - (int)psp.InnerRadius;
+                                t2.X = -t2.Width;
+
+                                using (Brush br = background.GetBrush(t2))
+                                    g.FillPath(br, path);
+                            }
+
+                            if (renderShading == true)
+                                RenderShading(g, psp, path);
+                        }
+
+                        path.Transform(g.Transform);
+
+                        if (rgn == null)
+                            rgn = new Region(path);
+
+                        if (border.IsDisplayable == true)
+                        {
+                            path.Reset();
+
+                            using (Pen pen = new Pen(border.LineColor, Dpi.Width(border.LineWidth)))
+                            {
+                                if (border.LinePattern != LinePattern.NotSet)
+                                    pen.DashStyle = (DashStyle)border.LinePattern;
+
+                                path.AddLine(ppt2, ppt2);
+                                path.AddArc(r, -angle / 2, angle);
+                                path.AddLine(ppt1, ppt1);
+
+                                g.DrawPath(pen, path);
+                            }
+                        }
+
+                        chartControl.DoPostRenderSliceEvent(
+                            g, path, pieChart, this, psp, SliceRenderType.ExtentWhitespace);
+                    }
+                }
+            }
+
+            g.Restore(gs);
+        }
+
+        #endregion
+
+        #region RenderSliceExtent
+
+        private void RenderSliceExtent(Graphics g, ref Region rgn,
+            PieChart pieChart, PieSeriesPoint psp, int outerRadius, int innerRadius, 
+            bool renderShading, SliceRenderType renderType, ChartSliceVisualStyle sstyle)
+        {
+            if (outerRadius - innerRadius > 0)
+            {
+                GraphicsState gs = g.Save();
+
+                g.TranslateTransform((float)psp.SliceCenter.X, (float)psp.SliceCenter.Y);
+                g.RotateTransform((float)(psp.CenterAngle) % 360);
+
+                Rectangle r = new Rectangle();
+
+                r.X = r.Y = -outerRadius;
+                r.Width = r.Height = (outerRadius * 2);
+
+                float angle = (float)GetSweepAngle(psp);
+
+                using (GraphicsPath path = new GraphicsPath())
+                {
+                    path.AddArc(r, -angle / 2, angle);
+
+                    if (psp.InnerRadius == 0)
+                    {
+                        path.AddLine(Point.Empty, Point.Empty);
+                    }
+                    else
+                    {
+                        Rectangle t = new Rectangle();
+                        t.X = t.Y = -innerRadius;
+                        t.Width = t.Height = innerRadius * 2;
+
+                        path.AddArc(t, angle / 2, -angle);
+                    }
+
+                    path.CloseFigure();
+
+                    ChartControl chartControl = ChartControl;
+
+                    if (chartControl.DoPreRenderSliceEvent(g, path, pieChart, this, psp, renderType) == false)
+                    {
+                        if (psp.IsEmpty == false)
+                        {
+                            if (sstyle.Background.IsDisplayable == true)
+                            {
+                                r = Rectangle.Ceiling(path.GetBounds());
+
+                                if (psp.HasExtent == true)
+                                {
+                                    switch (sstyle.ExtentFillRange)
+                                    {
+                                        case ExtentFillRange.ByRing:
+                                            r.Width = psp.PieRing.ExtentRadius - innerRadius;
+                                            break;
+
+                                        case ExtentFillRange.BySlice:
+                                            PieSeriesPointCollection spc = psp.Parent as PieSeriesPointCollection;
+
+                                            if (spc != null)
+                                            {
+                                                double sliceExtent = spc.PieMaxExtent / spc.PieOuterExtent;
+
+                                                int width = (int)(psp.OuterRadius - psp.InnerRadius);
+                                                int extentWidth = (int)(sliceExtent * width);
+
+                                                r.Width = extentWidth;
+                                            }
+                                            break;
+                                    }
+                                }
+
+                                using (Brush br = sstyle.Background.GetBrush(r))
+                                    g.FillPath(br, path);
+                            }
+                        }
+
+                        if (sstyle.Border.IsDisplayable == true)
+                        {
+                            using (Pen pen = new Pen(
+                                sstyle.Border.LineColor, Dpi.Width(sstyle.Border.LineWidth)))
+                            {
+                                if (sstyle.Border.LinePattern != LinePattern.NotSet)
+                                    pen.DashStyle = (DashStyle)sstyle.Border.LinePattern;
+
+                                g.DrawPath(pen, path);
+                            }
+                        }
+
+                        chartControl.DoPostRenderSliceEvent(g, path, pieChart, this, psp, renderType);
+                    }
+
+                    if (psp.IsEmpty == false)
+                    {
+                        if (renderShading == true)
+                            RenderShading(g, psp, path);
+                    }
+
+                    path.Transform(g.Transform);
+
+                    if (rgn == null)
+                        rgn = new Region(path);
+                    else
+                        rgn.Union(path);
+
+                    g.Restore(gs);
+                }
+            }
+        }
+
+        #region GetSweepAngle
+
+        private double GetSweepAngle(PieSeriesPoint psp)
+        {
+            double sweepAngle = psp.SweepAngleEx;
+
+            if (sweepAngle > 360)
+                sweepAngle %= 360;
+
+            return (sweepAngle);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region RenderSliceOtherSpace
+
+        private void RenderSliceOtherSpace(Graphics g,
+            ref Region rgn, PieChart pieChart, PieSeriesPoint psp,
+            int outerRadius, int innerRadius, ChartSliceVisualStyle sstyle)
+        {
+            if (outerRadius - innerRadius > 0)
+            {
+                GraphicsState gs = g.Save();
+
+                g.TranslateTransform((float)psp.SliceCenter.X, (float)psp.SliceCenter.Y);
+                g.RotateTransform((float)(psp.CenterAngle) % 360);
+
+                Rectangle r = new Rectangle();
+
+                r.X = r.Y = -outerRadius;
+                r.Width = r.Height = (outerRadius * 2);
+
+                float angle = (float)GetSweepAngle(psp);
+
+                Background background = sstyle.WhiteSpaceBackground;
+                ChartLineVisualStyle border = sstyle.WhiteSpaceBorder;
+
+                ChartControl chartControl = ChartControl;
+
+                using (GraphicsPath path = new GraphicsPath())
+                {
+                    path.AddArc(r, -angle / 2, angle);
+
+                    if (innerRadius == 0)
+                    {
+                        path.AddLine(Point.Empty, Point.Empty);
+                        path.CloseFigure();
+
+                        if (chartControl.DoPreRenderSliceEvent(
+                            g, path, pieChart, this, psp, SliceRenderType.OtherWhitespace) == false)
+                        {
+                            Rectangle pb = Rectangle.Truncate(path.GetBounds());
+
+                            if (background.IsEmpty == false)
+                            {
+                                using (Brush br = background.GetBrush(pb))
+                                    g.FillPath(br, path);
+                            }
+
+                            if (border.IsDisplayable == true)
+                            {
+                                using (Pen pen = new Pen(border.LineColor, Dpi.Width(border.LineWidth)))
+                                {
+                                    if (border.LinePattern != LinePattern.NotSet)
+                                        pen.DashStyle = (DashStyle)border.LinePattern;
+
+                                    g.DrawPath(pen, path);
+                                }
+                            }
+
+                            chartControl.DoPostRenderSliceEvent(
+                                g, path, pieChart, this, psp, SliceRenderType.OtherWhitespace);
+                        }
+
+                        path.Transform(g.Transform);
+
+                        if (rgn == null)
+                            rgn = new Region(path);
+                        else
+                            rgn.Union(path);
+                    }
+                    else
+                    {
+                        int pcount = path.PointCount;
+
+                        Rectangle t = new Rectangle();
+
+                        t.X = t.Y = -innerRadius;
+                        t.Width = t.Height = (innerRadius * 2);
+
+                        PointF ppt1 = path.PathPoints[0];
+                        PointF ppt2 = path.GetLastPoint();
+
+                        path.AddArc(t, angle / 2, -angle);
+                        path.CloseFigure();
+
+                        if (chartControl.DoPreRenderSliceEvent(
+                            g, path, pieChart, this, psp, SliceRenderType.OtherWhitespace) == false)
+                        {
+                            Rectangle pb = Rectangle.Ceiling(path.GetBounds());
+
+                            if (background.IsEmpty == false)
+                            {
+                                using (Brush br = background.GetBrush(pb))
+                                    g.FillPath(br, path);
+                            }
+
+                            path.Transform(g.Transform);
+
+                            if (rgn == null)
+                                rgn = new Region(path);
+                            else
+                                rgn.Union(path);
+
+                            if (border.IsDisplayable == true)
+                            {
+                                using (Pen pen = new Pen(border.LineColor, Dpi.Width(border.LineWidth)))
+                                {
+                                    if (border.LinePattern != LinePattern.NotSet)
+                                        pen.DashStyle = (DashStyle)border.LinePattern;
+
+                                    path.Reset();
+
+                                    path.AddLine(ppt1, ppt1);
+                                    path.AddArc(t, -angle / 2, angle);
+                                    path.AddLine(ppt2, ppt2);
+
+                                    g.DrawPath(pen, path);
+                                }
+                            }
+
+                            chartControl.DoPostRenderSliceEvent(
+                                g, path, pieChart, this, psp, SliceRenderType.OtherWhitespace);
+                        }
+                        else
+                        {
+                            path.Transform(g.Transform);
+
+                            if (rgn == null)
+                                rgn = new Region(path);
+                            else
+                                rgn.Union(path);
+                        }
+                    }
+                }
+
+                g.Restore(gs);
+            }
+        }
+
+        #endregion
+
+        #region RenderShading
+
+        private void RenderShading(Graphics g, PieSeriesPoint psp, GraphicsPath path)
+        {
+            PieChart pieChart = Parent as PieChart;
+
+            int radius = (int)((psp.HasExtent == true) ? psp.ExtentRadius : psp.OuterRadius);
+
+            Rectangle r = new Rectangle();
+            r.Inflate(radius, radius);
+
+            Region clip = g.Clip;
+            g.SetClip(path, CombineMode.Intersect);
+
+            using (GraphicsPath path2 = new GraphicsPath())
+            {
+                path2.AddEllipse(r);
+
+                PathGradientBrush pbr = new PathGradientBrush(path2);
+
+                ColorBlend cb = new ColorBlend(3);
+
+                Color[] colors = new Color[3];
+
+                colors[0] = Color.FromArgb(100, Color.Black);
+                colors[1] = Color.Transparent;
+                colors[2] = Color.Transparent;
+
+                cb.Colors = colors;
+
+                float[] cp = new float[3];
+
+                cp[0] = 0f;
+                cp[1] = .07f;
+                cp[2] = 1f;
+
+                cb.Positions = cp;
+
+                pbr.InterpolationColors = cb;
+
+                g.FillEllipse(pbr, r);
+            }
+
+            g.Clip = clip;
+        }
+
+        #endregion
+
+        #region RenderReferenceLines
+
+        private void RenderReferenceLines(Graphics g, PieChart pieChart,
+            PieSeriesPointCollection spc, PieSeriesPoint psp, bool onTop)
+        {
+            if (spc.PieOuterExtent > 0)
+            {
+                ISeriesPointContainer ispc = spc.Parent;
+
+                if (ispc != null)
+                {
+                    if (psp.ReferenceLineDisplayOnTopEx == onTop)
+                    {
+                        PieRefLineDisplayMode mode = psp.ReferenceLineDisplayModeEx;
+
+                        if ((mode != PieRefLineDisplayMode.NotSet) &&
+                            ((mode & PieRefLineDisplayMode.None) != PieRefLineDisplayMode.None))
+                        {
+                            ChartSliceVisualStyle sstyle = psp.GetEffectiveSliceStyle(pieChart, this);
+
+                            int width = psp.OuterRadius - psp.InnerRadius;
+
+                            float start = (float)psp.StartAngleEx;
+                            float sweep = (float)psp.SweepAngleEx;
+
+                            if ((mode & PieRefLineDisplayMode.ExtentAverage) == PieRefLineDisplayMode.ExtentAverage)
+                            {
+                                int avg = (int)((spc.PieAverageExtent / spc.PieOuterExtent) * width);
+
+                                RenderReferenceLine(g, psp, start, sweep,
+                                    avg + psp.InnerRadius, sstyle.ExtentAverageRefLineStyle);
+                            }
+
+                            if ((mode & PieRefLineDisplayMode.ExtentMinimum) == PieRefLineDisplayMode.ExtentMinimum)
+                            {
+                                int min = (int)((spc.PieMinExtent / spc.PieOuterExtent) * width);
+
+                                RenderReferenceLine(g, psp, start, sweep,
+                                    min + psp.InnerRadius, sstyle.ExtentMinRefLineStyle);
+                            }
+
+                            if ((mode & PieRefLineDisplayMode.ExtentMaximum) == PieRefLineDisplayMode.ExtentMaximum)
+                            {
+                                int max = (int)((spc.PieMaxExtent / spc.PieOuterExtent) * width);
+
+                                RenderReferenceLine(g, psp, start, sweep,
+                                    max + psp.InnerRadius, sstyle.ExtentMaxRefLineStyle);
+                            }
+
+                            if ((mode & PieRefLineDisplayMode.ExtentOuterRadius) == PieRefLineDisplayMode.ExtentOuterRadius)
+                            {
+                                RenderReferenceLine(g, psp, start, sweep,
+                                    psp.OuterRadius, sstyle.ExtentOuterRefLineStyle);
+                            }
+
+                            if ((mode & PieRefLineDisplayMode.UserDefined) == PieRefLineDisplayMode.UserDefined)
+                            {
+                                List<PieReferenceLine> lines = psp.ReferenceLinesEx;
+
+                                if (lines.Count > 0)
+                                {
+                                    foreach (PieReferenceLine line in lines)
+                                    {
+                                        if (line.Visible == true)
+                                        {
+                                            double radius = (line.Value / spc.PieOuterExtent) * width;
+
+                                            RenderReferenceLine(g, psp, start, sweep,
+                                                radius + psp.InnerRadius, line.EffectiveStyle);
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        #region RenderReferenceLine
+
+        private void RenderReferenceLine(Graphics g, PieSeriesPoint psp,
+            float start, float sweep, double radius, PieReferenceLineVisualStyle rstyle)
+        {
+            if (radius > 0)
+            {
+                if (rstyle.IsDisplayable == true)
+                {
+                    Rectangle r = new Rectangle();
+                    r.Location = psp.SliceCenter;
+
+                    r.Inflate((int)radius, (int)radius);
+
+                    using (Pen pen = new Pen(rstyle.LineColor, rstyle.LineWidth))
+                    {
+                        if (rstyle.LinePattern != LinePattern.NotSet)
+                            pen.DashStyle = (DashStyle)rstyle.LinePattern;
+
+                        g.DrawArc(pen, r, start, sweep);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderSliceFigure
+
+        private void RenderSliceFigure(Graphics g, Region rgn,
+            PieChart pieChart, PieSeriesPoint psp, ChartSliceVisualStyle sstyle)
+        {
+            object figure = sstyle.GetFigure();
+
+            if (figure != null)
+            {
+                double radius = GetFigureRadius(psp, sstyle);
+                double centerAngle = psp.CenterAngle;
+
+                double angle = GetImageAngle(psp, centerAngle, sstyle);
+
+                Point pt = psp.GetRayEndPoint(angle, radius);
+                Size srcSize = sstyle.GetFigureSizeEx(g);
+
+                srcSize.Height = Dpi.DescaleHeight(srcSize.Height);
+                srcSize.Width = Dpi.DescaleWidth(srcSize.Width);
+
+                Rectangle srcRect = new Rectangle(pt, Size.Empty);
+                Rectangle destRect = srcRect;
+
+                double scaleFactor = GetImageSideFactor(psp, radius, srcSize);
+
+                Size destSize = srcRect.Size;
+
+                if (scaleFactor != 1)
+                {
+                    double dh = (double)srcSize.Width / srcSize.Height;
+                    destSize = new Size((int)(dh * scaleFactor * 2), (int)scaleFactor * 2);
+                }
+
+                srcRect.Inflate(srcSize.Width / 2, srcSize.Height / 2);
+                destRect.Inflate(destSize.Width / 2, destSize.Height / 2);
+
+                bool scaleImage = (double.IsNaN(sstyle.ImageScale) == false);
+
+                Region clip = null;
+
+                if (scaleImage == false)
+                {
+                    if (sstyle.ImageCropMode == SliceImageCropMode.ClipImage)
+                    {
+                        clip = g.Clip;
+
+                        g.SetClip(rgn, CombineMode.Intersect);
+                    }
+                    else if (sstyle.ImageCropMode == SliceImageCropMode.HideImage)
+                    {
+                        if (destRect.Contains(srcRect) == false)
+                            return;
+                    }
+
+                    destRect = srcRect;
+                }
+
+                psp.PathBounds = Rectangle.Union(psp.PathBounds, destRect);
+
+                GraphicsState gState = null;
+
+                if (sstyle.ImageAutoRotate == Tbool.True || sstyle.ImageRotation != 0)
+                {
+                    gState = g.Save();
+
+                    destRect.X = -(destRect.Width / 2);
+                    destRect.Y = -(destRect.Height / 2);
+
+                    g.TranslateTransform(pt.X, pt.Y);
+
+                    if (sstyle.ImageAutoRotate == Tbool.True)
+                        g.RotateTransform((float)angle);
+
+                    if (sstyle.ImageRotation != 0)
+                        g.RotateTransform((float)sstyle.ImageRotation);
+                }
+
+                if (scaleImage == true)
+                {
+                    if (sstyle.ImageScale != 1)
+                    {
+                        int width = (int)(destRect.Width * sstyle.ImageScale);
+                        int height = (int)(destRect.Height * sstyle.ImageScale);
+
+                        destRect.X += (destRect.Width / 2);
+                        destRect.Y += (destRect.Height / 2);
+                        destRect.Size = Size.Empty;
+
+                        destRect.Inflate(width / 2, height / 2);
+                    }
+                }
+
+                if (sstyle.IsSymbolFigure == true)
+                    RenderSliceSymbol(g, pieChart, (SymbolDef)figure, destRect, sstyle);
+                else
+                    RenderSliceImage(g, (Image)figure, srcRect, destRect);
+
+                if (sstyle.ImageAutoRotate == Tbool.True || sstyle.ImageRotation != 0)
+                    g.Restore(gState);
+
+                if (clip != null)
+                    g.Clip = clip;
+            }
+        }
+
+        #region GetImageAngle
+
+        private double GetImageAngle(
+            PieSeriesPoint psp, double centerAngle, ChartSliceVisualStyle sstyle)
+        {
+            double offset = sstyle.ImageAngleOffset;
+
+            if (offset == 0)
+                return (centerAngle);
+
+            if ((uint)offset < 1)
+                return (centerAngle + offset * psp.SweepAngleEx);
+
+            return (centerAngle + offset);
+        }
+
+        #endregion
+
+        #region GetImageSideFactor
+
+        /// <summary>
+        /// Calculates the max 'a' side of the image.
+        /// </summary>
+        /// <param name="psp"></param>
+        /// <param name="radius"></param>
+        /// <param name="size"></param>
+        /// <returns></returns>
+        private double GetImageSideFactor(
+            PieSeriesPoint psp, double radius, Size size)
+        {
+            double maxRadius = GetMaxImageRadius(psp, radius);
+
+            double scaleFactor = (double)(size.Width * size.Width) / (size.Height * size.Height);
+            double side = Math.Sqrt((maxRadius * maxRadius) / (scaleFactor + 1));
+
+            return (side);
+        }
+
+        #region GetMaxImageRadius
+
+        /// <summary>
+        /// Gets the max radius of a circle image at the given ray radius.
+        /// </summary>
+        /// <param name="psp"></param>
+        /// <param name="radius"></param>
+        /// <returns></returns>
+        private double GetMaxImageRadius(PieSeriesPoint psp, double radius)
+        {
+            double angle = psp.SweepAngleEx / 2;
+
+            if (angle >= 90)
+                return (radius);
+
+            double radians = MathHelper.ToRadians(angle);
+
+            double maxRad = radius * Math.Sin(radians);
+
+            //double dr = (int)(radius * radius);
+
+            //double maxRad = 2 * dr - 2 * (dr * Math.Cos(radians));
+            //maxRad = Math.Sqrt(maxRad);
+
+            return (maxRad);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetFigureRadius
+
+        private double GetFigureRadius(PieSeriesPoint psp, ChartSliceVisualStyle sstyle)
+        {
+            double radius = psp.OuterRadius - psp.InnerRadius;
+            double extentRadius = psp.InnerRadius + radius * psp.SliceExtent;
+
+            double innerRadius = GetAnchorRadius(psp, extentRadius, sstyle.ImageInnerRadiusAnchor);
+            double outerRadius = GetAnchorRadius(psp, extentRadius, sstyle.ImageOuterRadiusAnchor);
+
+            double delta = outerRadius - innerRadius;
+
+            if (delta == 0)
+                delta = radius;
+
+            if (Math.Abs(sstyle.ImageRadiusOffset) <= 1)
+                return (innerRadius + delta * sstyle.ImageRadiusOffset);
+            else
+                return (innerRadius + sstyle.ImageRadiusOffset * (delta > 0 ? 1 : -1));
+        }
+
+        #region GetAnchorRadius
+
+        private double GetAnchorRadius(
+            PieSeriesPoint psp, double extentRadius, SliceImageRadiusAnchor anchor)
+        {
+            switch (anchor)
+            {
+                case SliceImageRadiusAnchor.ExtentRadius:
+                    return (extentRadius);
+
+                case SliceImageRadiusAnchor.InnerRadius:
+                    return (psp.InnerRadius);
+
+                case SliceImageRadiusAnchor.OuterRadius:
+                    return (psp.OuterRadius);
+            }
+
+            return (psp.InnerRadius);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderSliceSymbol
+
+        private void RenderSliceSymbol(Graphics g,
+            PieChart pieChart, SymbolDef symDef, Rectangle destRect, ChartSliceVisualStyle sstyle)
+        {
+            TextRenderingHint hint = g.TextRenderingHint;
+            g.TextRenderingHint = TextRenderingHint.AntiAlias;
+
+            if (double.IsNaN(sstyle.ImageScale) == true)
+            {
+                using (StringFormat sf = new StringFormat())
+                {
+                    sf.LineAlignment = StringAlignment.Center;
+                    sf.Alignment = StringAlignment.Center;
+
+                    using (Brush br = new SolidBrush(symDef.SymbolColor))
+                        g.DrawString(symDef.SymbolRealized, symDef.SymbolFont, br, destRect, sf);
+                }
+            }
+            else
+            {
+                float n = Math.Max(destRect.Width, destRect.Height);
+
+                destRect.Y += Dpi.Width4;
+
+                if (_SymFontScale <= 0)
+                {
+                    _ScaleSymDef.SymbolSize = n;
+                    _ScaleSymDef.SymbolSet = symDef.SymbolSet;
+
+                    _SymFontScale = n / _ScaleSymDef.SymbolFont.Height * .8f;
+                }
+
+                float fn = _SymFontScale * n;
+
+                _ScaleSymDef.SymbolSize = fn;
+                _ScaleSymDef.SymbolSet = symDef.SymbolSet;
+
+                using (StringFormat sf = new StringFormat())
+                {
+                    sf.LineAlignment = StringAlignment.Center;
+                    sf.Alignment = StringAlignment.Center;
+
+                    using (Brush br = new SolidBrush(symDef.SymbolColor))
+                        g.DrawString(symDef.SymbolRealized, _ScaleSymDef.SymbolFont, br, destRect, sf);
+                }
+            }
+
+            g.TextRenderingHint = hint;
+        }
+
+        #endregion
+
+        #region RenderSliceImage
+
+        private void RenderSliceImage(Graphics g, Image image, Rectangle srcRect, Rectangle destRect)
+        {
+            g.DrawImage(image, destRect,
+                new Rectangle(Point.Empty, srcRect.Size), GraphicsUnit.Pixel);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderSliceLabel
+
+        internal void RenderSliceLabel(Graphics g,
+            PieChart pieChart, PieSeriesPoint psp, ChartSliceVisualStyle sstyle)
+        {
+            if (IsInnerSliceLabelVisible(pieChart, psp) == true)
+            {
+                SliceInnerLabelVisualStyle lstyle = sstyle.SliceInnerLabelStyle;
+
+                psp.InnerLabelDisplayed = false;
+
+                string text = GetSliceLabel(pieChart, psp, true, psp.InnerSliceLabelEx);
+
+                ChartControl chartControl = ChartControl;
+
+                bool displayed = true;
+
+                if (chartControl.DoRenderSliceInnerLabelEvent(g, pieChart, psp, text, ref displayed) == false)
+                {
+                    if (string.IsNullOrEmpty(text) == false)
+                    {
+                        double maxRadius = psp.OuterRadius;
+
+                        if (lstyle.OuterRadiusOffsetBase == OuterRadiusOffsetBase.ExtentRadius)
+                            maxRadius = psp.InnerRadius + (psp.OuterRadius - psp.InnerRadius) * psp.SliceExtent;
+
+                        SliceLabelOrientation orientation = psp.InnerLabelOrientationEx;
+
+                        switch (orientation)
+                        {
+                            case SliceLabelOrientation.Adaptive:
+                                psp.InnerLabelDisplayed =
+                                    RenderAdaptiveLabel(g, pieChart, psp, maxRadius, text, lstyle);
+                                break;
+
+                            case SliceLabelOrientation.Custom:
+                                psp.InnerLabelDisplayed =
+                                    RenderCustomLabel(g, pieChart, psp, maxRadius, text, lstyle);
+                                break;
+
+                            case SliceLabelOrientation.Parallel:
+                                psp.InnerLabelDisplayed =
+                                    RenderParallelLabel(g, pieChart, psp, maxRadius, text, lstyle);
+                                break;
+
+                            case SliceLabelOrientation.Perpendicular:
+                                psp.InnerLabelDisplayed =
+                                    RenderPerpendicularLabel(g, pieChart, psp, maxRadius, text, lstyle);
+                                break;
+
+                            default:
+                                psp.InnerLabelDisplayed =
+                                    RenderHorizontalLabel(g, pieChart, psp, maxRadius, text, lstyle);
+                                break;
+                        }
+                    }
+                }
+            }
+            else
+            {
+                psp.LastPathBounds = Rectangle.Empty;
+            }
+        }
+
+        #region IsInnerSliceLabelVisible
+
+        private bool IsInnerSliceLabelVisible(PieChart pieChart, PieSeriesPoint psp)
+        {
+            switch (psp.SliceLabelDisplayModeEx)
+            {
+                case SliceLabelDisplayMode.NotSet:
+
+                case SliceLabelDisplayMode.Inner:
+                case SliceLabelDisplayMode.InnerAndOuter:
+                case SliceLabelDisplayMode.InnerXorOuter:
+                    return (IsLabelDisplayed(pieChart, psp));
+            }
+
+            return (false);
+        }
+
+        #region IsLabelDisplayed
+
+        internal bool IsLabelDisplayed(PieChart pieChart, PieSeriesPoint psp)
+        {
+            SliceLabelVisibility labVis = psp.SliceLabelVisibilityEx;
+
+            if ((labVis == SliceLabelVisibility.NotSet) ||
+                (labVis & SliceLabelVisibility.Always) == SliceLabelVisibility.Always)
+                return (true);
+
+            if ((labVis & SliceLabelVisibility.Never) == SliceLabelVisibility.Never)
+                return (false);
+
+            if (pieChart.ShowSliceLabelsOnEntry == true && pieChart.IsMouseOver == true)
+                return (true);
+
+            if ((labVis & SliceLabelVisibility.SliceMouseOver) == SliceLabelVisibility.SliceMouseOver)
+            {
+                if (psp == pieChart.HitPsp)
+                    return (true);
+            }
+
+            if (((labVis & SliceLabelVisibility.SelectionModeMouseOver) == SliceLabelVisibility.SelectionModeMouseOver) ||
+                ((labVis & SliceLabelVisibility.SliceMouseOver) == SliceLabelVisibility.SliceMouseOver))
+            {
+                if (IsHighLightedPsp(pieChart, psp) == true)
+                    return (true);
+            }
+
+            if ((labVis & SliceLabelVisibility.SliceSelect) == SliceLabelVisibility.SliceSelect)
+            {
+                if (psp.IsSelected == true)
+                    return (true);
+            }
+
+            if ((labVis & SliceLabelVisibility.SliceDetach) == SliceLabelVisibility.SliceDetach)
+            {
+                if (psp.IsDetached == true)
+                    return (true);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderAdaptiveLabel
+
+        internal bool RenderAdaptiveLabel(Graphics g, PieChart pieChart,
+            PieSeriesPoint psp, double maxRadius, string text, SliceInnerLabelVisualStyle lstyle)
+        {
+            double innerOffset = GetLableInnerOffset(psp, maxRadius, lstyle);
+            double outerOffset = GetLableOuterOffset(psp, maxRadius, lstyle);
+
+            if (outerOffset - innerOffset > 0)
+            {
+                double centerAngle = psp.CenterAngle % 360;
+
+                float fontAngle = 0;
+
+                if (lstyle.AutoOrientLabel != Tbool.False)
+                {
+                    if (centerAngle < 180)
+                        fontAngle += 180;
+                }
+
+                float c = (float)(Math.PI * outerOffset * 2);
+
+                if (c > 0)
+                {
+                    RectangleF[] cBounds = GetAdaptiveCharBounds(g, psp, text, lstyle);
+
+                    if (centerAngle < 180)
+                    {
+                        return (PaintAdaptiveFlipText(g, pieChart, psp,
+                            outerOffset, innerOffset, fontAngle, text, cBounds, lstyle));
+                    }
+
+                    return (PaintAdaptiveText(g, pieChart, psp,
+                        outerOffset, innerOffset, fontAngle, text, cBounds, lstyle));
+                }
+            }
+
+            return (false);
+        }
+
+        #region GetAdaptiveCharBounds
+
+        private RectangleF[] GetAdaptiveCharBounds(Graphics g,
+            PieSeriesPoint psp, string text, SliceInnerLabelVisualStyle lstyle)
+        {
+            RectangleF[] charBounds = psp.CharBounds;
+
+            if (charBounds == null || charBounds.Length < text.Length)
+            {
+                charBounds = new RectangleF[text.Length];
+
+                int n = (int)Math.Ceiling((double)text.Length / 32);
+
+                using (StringFormat sf = new StringFormat())
+                {
+                    sf.FormatFlags = StringFormatFlags.NoClip | StringFormatFlags.MeasureTrailingSpaces;
+
+                    for (int i = 0; i < text.Length; i += 32)
+                    {
+                        int len = 32;
+
+                        if (i + len > text.Length)
+                            len = text.Length - i;
+
+                        MeasureAdaptiveText(g, sf, text, i, len, charBounds, lstyle);
+                    }
+                }
+
+                psp.CharBounds = charBounds;
+            }
+
+            return (charBounds); 
+        }
+
+        #region MeasureAdaptiveText
+
+        private void MeasureAdaptiveText(Graphics g, StringFormat sf,
+            string text, int index, int len, RectangleF[] charBounds, SliceInnerLabelVisualStyle lstyle)
+        {
+            CharacterRange[] crs = new CharacterRange[len];
+
+            string s = text.Substring(index, len);
+
+            for (int j = 0; j < len; j++)
+                crs[j] = new CharacterRange(j, 1);
+
+            sf.SetMeasurableCharacterRanges(crs);
+
+            Rectangle r = new Rectangle(0, 0, 5000, 5000);
+            Region[] rgns = g.MeasureCharacterRanges(s, lstyle.Font, r, sf);
+
+            for (int i = 0; i < len; i++)
+                charBounds[index + i] = rgns[i].GetBounds(g);
+
+            if (index > 0)
+            {
+                float dx = charBounds[index - 1].X + charBounds[index - 1].Width - charBounds[index].X;
+
+                for (int i = 0; i < len; i++)
+                    charBounds[index + i].X += dx;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region PaintAdaptiveText
+
+        private bool PaintAdaptiveText(Graphics g, PieChart pieChart,
+            PieSeriesPoint psp, double outerOffset, double innerOffset,
+            float fontAngle, string text, RectangleF[] cBounds, SliceInnerLabelVisualStyle lstyle)
+        {
+            bool clipped;
+            List<WordPosLine> wpsLines =
+                GetAdaptiveLines(psp, outerOffset, innerOffset, text, cBounds, out clipped, lstyle);
+
+            if (wpsLines != null && wpsLines.Count > 0)
+            {
+                psp.InnerLabelClipped = clipped;
+
+                if (clipped == true)
+                {
+                    if (psp.SliceLabelCropModeEx == SliceLabelCropMode.Hide)
+                        return (false);
+                }
+
+                double startAngle;
+                double endAngle;
+                NormalizeSliceAngles(psp, out startAngle, out endAngle);
+
+                double startRadians = MathHelper.ToRadians((float)(startAngle + lstyle.AngleMargin));
+                double endRadians = MathHelper.ToRadians((float)(endAngle - lstyle.AngleMargin));
+
+                if (startRadians < endRadians)
+                {
+                    TextRenderingHint renderingHint = g.TextRenderingHint;
+                    g.TextRenderingHint = TextRenderingHint.AntiAlias;
+
+                    float height = cBounds[0].Height;
+                    float halfHeight = height / 2;
+
+                    using (Brush br = new SolidBrush(lstyle.TextColor))
+                    {
+                        foreach (WordPosLine wpsLine in wpsLines)
+                        {
+                            double offset = wpsLine.Offset;
+
+                            if (wpsLine.Wps.Count > 0)
+                            {
+                                double dx = GetAlignmentOffset(wpsLine, cBounds, lstyle);
+                                double xRadians = startRadians + (dx / offset);
+
+                                foreach (WordPos wp in wpsLine.Wps)
+                                {
+                                    for (int j = 0; j < wp.Text.Length; j++)
+                                    {
+                                        RectangleF tf = cBounds[wp.Index + j];
+
+                                        float cRadians = (float)(tf.Width / offset);
+
+                                        if (xRadians + cRadians > (float)endRadians + .5)
+                                            break;
+
+                                        xRadians += (cRadians / 2);
+
+                                        float z = (float)(offset - halfHeight);
+                                        float y = (float)(psp.SliceCenter.Y + z * Math.Sin(xRadians));
+                                        float x = (float)(psp.SliceCenter.X + z * Math.Cos(xRadians));
+
+                                        int n = (int)Math.Max(tf.Width, tf.Height);
+
+                                        GraphicsState gState = g.Save();
+
+                                        g.TranslateTransform(x, y);
+                                        g.RotateTransform(90 + (float)MathHelper.ToDegrees((float)xRadians));
+
+                                        g.DrawString(wp.Text[j].ToString(), lstyle.Font, br, -tf.Width/2, -tf.Height / 2);
+
+                                        g.Restore(gState);
+
+                                        xRadians += (cRadians / 2);
+                                    }
+
+                                    if (wp.Index + wp.Length < cBounds.Length)
+                                        xRadians += cBounds[wp.Index + wp.Length].Width / offset;
+                                }
+                            }
+                        }
+                    }
+
+                    if ((outerOffset > psp.OuterRadius) || 
+                        (wpsLines[wpsLines.Count - 1].Offset < psp.InnerRadius))
+                    {
+                        Rectangle t = GetBoundingArcRect(
+                            psp, startAngle, endAngle, outerOffset + height);
+
+                        psp.PathBounds = Rectangle.Union(psp.PathBounds, t);
+
+                        if (psp.PathBounds.Equals(psp.LastPathBounds) == false)
+                        {
+                            psp.LastPathBounds = psp.PathBounds;
+
+                            InvalidateRender(psp.PathBounds);
+                        }
+                    }
+
+                    g.TextRenderingHint = renderingHint;
+
+                    return (true);
+                }
+            }
+
+            return (false);
+        }
+
+        #region GetBoundingArcRect
+
+        private Rectangle GetBoundingArcRect(
+            PieSeriesPoint psp, double startAngle, double endAngle, double outerOffset)
+        {
+            Rectangle r = new Rectangle(psp.SliceCenter, Size.Empty);
+
+            double n = startAngle;
+
+            n += 89;
+            n = (int)(n / 90) * 90;
+
+            while (n <= endAngle)
+            {
+                UpdateAngleBounds(psp, n, outerOffset, ref r);
+
+                n += 90;
+            }
+
+            if (startAngle % 90 != 0)
+                UpdateAngleBounds(psp, startAngle, outerOffset, ref r);
+
+            if (endAngle % 90 != 0)
+                UpdateAngleBounds(psp, endAngle, outerOffset, ref r);
+
+            return (r);
+        }
+
+        #region UpdateAngleBounds
+
+        private void UpdateAngleBounds(PieSeriesPoint psp,
+            double angle, double outerOffset, ref Rectangle r)
+        {
+            Point pts = psp.GetRayEndPoint(angle, outerOffset);
+
+            if (pts.X < r.X)
+            {
+                r.Width += (r.X - pts.X);
+                r.X = pts.X;
+            }
+            else if (pts.X > r.Right)
+            {
+                r.Width += (pts.X - r.Right);
+            }
+
+            if (pts.Y < r.Y)
+            {
+                r.Height += (r.Y - pts.Y);
+                r.Y = pts.Y;
+            }
+            else if (pts.Y > r.Bottom)
+            {
+                r.Height += (pts.Y - r.Bottom);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetAdaptiveLines
+
+        private List<WordPosLine> GetAdaptiveLines(
+            PieSeriesPoint psp, double outerOffset, double innerOffset,
+            string text, RectangleF[] cBounds, out bool clipped, SliceInnerLabelVisualStyle lstyle)
+        {
+            if (psp.WordPosLines == null)
+            {
+                psp.WordPosLines =
+                    GetAdaptiveLinesEx(psp, outerOffset, innerOffset, text, cBounds, out clipped, lstyle);
+
+                psp.InnerLabelClipped = clipped;
+            }
+
+            clipped = psp.InnerLabelClipped;
+
+            return (psp.WordPosLines);
+        }
+
+        #region GetAdaptiveLinesEx
+
+        private List<WordPosLine> GetAdaptiveLinesEx(
+            PieSeriesPoint psp, double outerOffset, double innerOffset, string text,
+            RectangleF[] cBounds, out bool clipped, SliceInnerLabelVisualStyle lstyle)
+        {
+            float height = cBounds[0].Height;
+            int maxLineCount = (int)((outerOffset - innerOffset) / height);
+
+            SliceLabelCropMode cropMode = psp.SliceLabelCropModeEx;
+
+            if (cropMode != SliceLabelCropMode.Hide)
+                maxLineCount = 1000;
+
+            if (lstyle.MaxLineCount >= 0)
+            {
+                if (maxLineCount > lstyle.MaxLineCount)
+                    maxLineCount = lstyle.MaxLineCount;
+            }
+
+            List<WordPosLine> wpsLines = null;
+
+            if (maxLineCount > 0)
+            {
+                List<WordPos> wps = GetWordWidths(text, cBounds);
+
+                double offset = outerOffset;
+
+                bool middle = false;
+
+                switch (lstyle.Alignment)
+                {
+                    case SliceLabelAlignment.MiddleLeft:
+                    case SliceLabelAlignment.MiddleRight:
+                    case SliceLabelAlignment.MiddleCenter:
+                        offset = (outerOffset + innerOffset) / 2;
+                        middle = true;
+                        break;
+
+                    case SliceLabelAlignment.InnerLeft:
+                    case SliceLabelAlignment.InnerRight:
+                    case SliceLabelAlignment.InnerCenter:
+
+                        clipped = false;
+
+                        while (offset > innerOffset)
+                        {
+                            List<WordPosLine> ilines = FitAdaptiveLines(psp,
+                                offset, -height, cBounds, maxLineCount, wps, out clipped, lstyle);
+
+                            if (ilines != null)
+                            {
+                                if (wpsLines == null || clipped == false)
+                                    wpsLines = ilines;
+
+                                if (clipped == true)
+                                    break;
+
+                                wps = GetWordWidths(text, cBounds);
+
+                                offset -= height;
+                            }
+                            else
+                            {
+                                break;
+                            }
+                        }
+
+                        return (wpsLines);
+
+                    default:
+                        List<WordPosLine> lines = FitAdaptiveLines(psp,
+                            offset, -height, cBounds, maxLineCount, wps, out clipped, lstyle);
+
+                        return (lines);
+                }
+
+                for (int i = 0; i < maxLineCount; i++)
+                {
+                    List<WordPosLine> lines = FitAdaptiveLines(psp,
+                        offset, -height, cBounds, (i + 1), wps, out clipped, lstyle);
+
+                    if (lines != null)
+                    {
+                        if (clipped == false)
+                            return (lines);
+
+                        wpsLines = lines;
+
+                        wps = GetWordWidths(text, cBounds);
+
+                        if ((middle == false) || (i % 2 == 0))
+                            offset += height;
+                    }
+                    else
+                    {
+                        break;
+                    }
+                }
+            }
+
+            clipped = false;
+
+            return (wpsLines);
+        }
+
+        #region FitAdaptiveLines
+
+        private List<WordPosLine> FitAdaptiveLines(
+            PieSeriesPoint psp, double offset, float height, RectangleF[] cBounds,
+            int count, List<WordPos> wps, out bool clipped, SliceInnerLabelVisualStyle lstyle)
+        {
+            List<WordPosLine> wpsLines = new List<WordPosLine>();
+
+            int wordIndex = 0;
+
+            while (wpsLines.Count < count)
+            {
+                int lineWordCount = 0;
+
+                double arcWidth = GetArcWidth(psp, offset - cBounds[0].Height / 4, lstyle);
+
+                if (arcWidth <= 0)
+                    break;
+
+                WordPosLine wpsLine = new WordPosLine();
+
+                wpsLine.Offset = offset;
+                wpsLine.ArcWidth = arcWidth;
+
+                while (wordIndex < wps.Count)
+                {
+                    WordPos wp = wps[wordIndex];
+
+                    double wordLength = GetWordLength(wp, cBounds, lineWordCount);
+
+                    if (wp.Text.Equals("\n") == true)
+                    {
+                        if (wpsLine.Wps.Count == 0)
+                            wpsLine.Wps.Add(wp);
+
+                        wordIndex++;
+                        break;
+                    }
+
+                    if (wpsLine.ArcWidth - (wpsLine.LineWidth + wordLength) < 0)
+                    {
+                        if (lineWordCount == 0 || wpsLines.Count + 1 == count)
+                        {
+                            wpsLine = FitNonBrokenLine(psp, offset,
+                                count - wpsLines.Count, wpsLines, wpsLine, wp, cBounds, height, out clipped, lstyle);
+
+                            if (clipped == true || wpsLine == null)
+                            {
+                                if (wpsLine != null && wpsLine.Wps.Count > 0)
+                                    wpsLines.Add(wpsLine);
+
+                                return (wpsLines);
+                            }
+
+                            offset = wpsLine.Offset;
+                        }
+                        else
+                        {
+                            break;
+                        }
+                    }
+                    else
+                    {
+                        wpsLine.LineWidth += wordLength;
+
+                        wpsLine.Wps.Add(wp);
+                    }
+
+                    wordIndex++;
+                    lineWordCount++;
+                }
+
+                if (wpsLine.Wps.Count > 0)
+                {
+                    offset = wpsLine.Offset;
+
+                    wpsLines.Add(wpsLine);
+                }
+
+                if (wordIndex >= wps.Count)
+                    break;
+
+                offset += height;
+            }
+
+            clipped = (wordIndex < wps.Count);
+
+            return (wpsLines);
+        }
+
+        #region FitNonBrokenLine
+
+        private WordPosLine FitNonBrokenLine(PieSeriesPoint psp,
+            double offset, int maxCount, List<WordPosLine> wpsLines, WordPosLine wpsLine,
+            WordPos wp, RectangleF[] cBounds, float height, out bool clipped, SliceInnerLabelVisualStyle lstyle)
+        {
+            double length;
+            int count = GetNonBrokenCount(wpsLine, wp, cBounds, out length);
+
+            clipped = true;
+
+            if (length == 0)
+                return (wpsLine);
+
+            int rindex = wp.Index;
+
+            while (count > 0)
+            {
+                WordPos wp2 = new WordPos();
+
+                wp2.Index = wp.Index;
+                wp2.Length = count;
+                wp2.Text = wp.Text.Substring((wp.Index - rindex), count);
+
+                wpsLine.Wps.Add(wp2);
+
+                wp.Index += count;
+                wp.Length -= count;
+
+                if (--maxCount <= 0)
+                    break;
+
+                if (wp.Length <= 0)
+                    break;
+
+                wpsLines.Add(wpsLine);
+
+                offset += height;
+
+                wpsLine = new WordPosLine();
+                wpsLine.Offset = offset;
+
+                wpsLine.ArcWidth = GetArcWidth(psp, offset - cBounds[0].Height / 4, lstyle);
+
+                count = GetNonBrokenCount(wpsLine, wp, cBounds, out length);
+            }
+
+            clipped = (wp.Length > 0);
+
+            return (wpsLine);
+        }
+
+        #region GetNonBrokenCount
+
+        private int GetNonBrokenCount(
+            WordPosLine wpsLine, WordPos wp, RectangleF[] cBounds, out double length)
+        {
+            length = 0;
+
+            if (wpsLine.Wps.Count > 0 && wp.Index > 0)
+            {
+                double width = cBounds[wp.Index - 1].Width;
+
+                if (wpsLine.ArcWidth - (wpsLine.LineWidth + width) < 0)
+                    return (0);
+
+                wpsLine.LineWidth += width;
+                length += width;
+            }
+
+            for (int i = 0; i < wp.Length; i++)
+            {
+                double width = cBounds[wp.Index + i].Width;
+
+                if (wpsLine.ArcWidth - (wpsLine.LineWidth + width) < 0)
+                    return (i);
+
+                wpsLine.LineWidth += width;
+                length += width;
+            }
+
+            return (wp.Length);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region PaintAdaptiveFlipText
+
+        private bool PaintAdaptiveFlipText(Graphics g, PieChart pieChart,
+            PieSeriesPoint psp, double outerOffset, double innerOffset, float fontAngle,
+            string text, RectangleF[] cBounds, SliceInnerLabelVisualStyle lstyle)
+        {
+            bool clipped;
+            List<WordPosLine> wpsLines =
+                GetAdaptiveFlipLines(psp, outerOffset, innerOffset, text, cBounds, out clipped, lstyle);
+
+            if (wpsLines != null && wpsLines.Count > 0)
+            {
+                if (clipped == true)
+                {
+                    if (psp.SliceLabelCropModeEx == SliceLabelCropMode.Hide)
+                        return (false);
+                }
+
+                double startAngle;
+                double endAngle;
+                NormalizeSliceAngles(psp, out startAngle, out endAngle);
+
+                double endRadians = MathHelper.ToRadians(startAngle + lstyle.AngleMargin);
+                double startRadians = MathHelper.ToRadians(endAngle - lstyle.AngleMargin);
+
+                float height = cBounds[0].Height;
+                float halfHeight = height / 2;
+
+                TextRenderingHint renderingHint = g.TextRenderingHint;
+                g.TextRenderingHint = TextRenderingHint.AntiAlias;
+
+                using (Brush br = new SolidBrush(lstyle.TextColor))
+                {
+                    foreach (WordPosLine wpsLine in wpsLines)
+                    {
+                        double offset = wpsLine.Offset;
+
+                        if (wpsLine.Wps.Count > 0)
+                        {
+                            double dx = GetAlignmentOffset(wpsLine, cBounds, lstyle);
+                            double xRadians = startRadians - dx / offset;
+
+                            foreach (WordPos wp in wpsLine.Wps)
+                            {
+                                for (int j = 0; j < wp.Text.Length; j++)
+                                {
+                                    if (xRadians < (float)endRadians)
+                                        break;
+
+                                    RectangleF tf = cBounds[wp.Index + j];
+
+                                    float cRadians = (float)(tf.Width / offset);
+
+                                    xRadians -= (cRadians / 2);
+
+                                    float z = (float)(offset - halfHeight);
+                                    float y = (float)((float)psp.SliceCenter.Y + z * Math.Sin(xRadians));
+                                    float x = (float)((float)psp.SliceCenter.X + z * Math.Cos(xRadians));
+
+                                    GraphicsState gState = g.Save();
+
+                                    g.TranslateTransform(x, y);
+                                    g.RotateTransform(-90 + (float)MathHelper.ToDegrees(xRadians));
+
+                                    g.DrawString(wp.Text[j].ToString(), lstyle.Font, br, -tf.Width / 2, -tf.Height / 2);
+
+                                    g.Restore(gState);
+
+                                    xRadians -= (cRadians / 2);
+                                }
+
+                                if (wp.Index + wp.Length < cBounds.Length)
+                                    xRadians -= cBounds[wp.Index + wp.Length].Width / offset;
+                            }
+                        }
+                    }
+                }
+
+                if ((outerOffset > psp.OuterRadius) ||
+                    (wpsLines.Count > 0 && wpsLines[0].Offset < psp.InnerRadius))
+                {
+                    Rectangle t = GetBoundingArcRect(
+                        psp, startAngle, endAngle, outerOffset + height);
+
+                    psp.PathBounds = Rectangle.Union(psp.PathBounds, t);
+
+                    if (psp.PathBounds.Equals(psp.LastPathBounds) == false)
+                    {
+                        psp.LastPathBounds = psp.PathBounds;
+
+                        InvalidateRender(psp.PathBounds);
+                    }
+                }
+
+                g.TextRenderingHint = renderingHint;
+
+                return (true);
+            }
+
+            return (false);
+        }
+
+        #region GetAdaptiveFlipLines
+
+        private List<WordPosLine> GetAdaptiveFlipLines(
+            PieSeriesPoint psp, double outerOffset, double innerOffset,
+            string text, RectangleF[] cBounds, out bool clipped, SliceInnerLabelVisualStyle lstyle)
+        {
+            if (psp.WordPosLines == null)
+            {
+                psp.WordPosLines =
+                    GetAdaptiveFlipLinesEx(psp, outerOffset, innerOffset, text, cBounds, out clipped, lstyle);
+
+                psp.InnerLabelClipped = clipped;
+            }
+
+            clipped = psp.InnerLabelClipped;
+
+            return (psp.WordPosLines);
+        }
+
+        #region GetAdaptiveFlipLinesEx
+
+        private List<WordPosLine> GetAdaptiveFlipLinesEx(
+            PieSeriesPoint psp, double outerOffset, double innerOffset,
+            string text, RectangleF[] cBounds, out bool clipped, SliceInnerLabelVisualStyle lstyle)
+        {
+            float height = cBounds[0].Height;
+            int maxLineCount = (int)Math.Abs((outerOffset - innerOffset) / height);
+
+            SliceLabelCropMode cropMode = psp.SliceLabelCropModeEx;
+
+            if (cropMode == SliceLabelCropMode.NoAction)
+                maxLineCount = 1000;
+
+            if (lstyle.MaxLineCount >= 0)
+            {
+                if (maxLineCount > lstyle.MaxLineCount)
+                    maxLineCount = lstyle.MaxLineCount;
+            }
+
+            List<WordPosLine> wpsLines = null;
+
+            clipped = false;
+
+            if (maxLineCount > 0)
+            {
+                List<WordPos> wps = GetWordWidths(text, cBounds);
+
+                double offset = outerOffset;
+
+                bool middle = false;
+
+                switch (lstyle.Alignment)
+                {
+                    case SliceLabelAlignment.MiddleLeft:
+                    case SliceLabelAlignment.MiddleRight:
+                    case SliceLabelAlignment.MiddleCenter:
+                        offset = (outerOffset + innerOffset) / 2;
+                        height = -height;
+                        middle = true;
+                        break;
+
+                    case SliceLabelAlignment.InnerLeft:
+                    case SliceLabelAlignment.InnerRight:
+                    case SliceLabelAlignment.InnerCenter:
+
+                        clipped = false;
+
+                        offset = innerOffset;
+
+                        while (offset < outerOffset)
+                        {
+                            List<WordPosLine> ilines = FitAdaptiveLines(psp,
+                                offset, height, cBounds, maxLineCount, wps, out clipped, lstyle);
+
+                            if (ilines != null && ilines.Count > 0)
+                                return (ilines);
+
+                            wps = GetWordWidths(text, cBounds);
+
+                            offset += height;
+                        }
+
+                        return (wpsLines);
+
+                    default:
+                        height = -height;
+                        break;
+                }
+
+                for (int i = 0; i < maxLineCount; i++)
+                {
+                    List<WordPosLine> lines = FitAdaptiveLines(psp,
+                        offset, Math.Abs(height), cBounds, i + 1, wps, out clipped, lstyle);
+
+                    if (lines != null)
+                    {
+                        if (clipped == false)
+                            return (lines);
+
+                        wpsLines = lines;
+
+                        wps = GetWordWidths(text, cBounds);
+
+                        if ((middle == false) || (i % 2 == 0))
+                            offset += height;
+                    }
+                    else
+                    {
+                        break;
+                    }
+                }
+            }
+
+            return (wpsLines);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region NormalizeSliceAngles
+
+        private void NormalizeSliceAngles(
+            PieSeriesPoint psp, out double startAngle, out double endAngle)
+        {
+            startAngle = psp.StartAngleEx;
+            endAngle = psp.StartAngleEx + psp.SweepAngleEx;
+
+            if (startAngle > endAngle)
+            {
+                double temp = startAngle;
+                startAngle = endAngle;
+                endAngle = temp;
+            }
+        }
+
+        #endregion
+
+        #region GetArcWidth
+
+        private double GetArcWidth(
+            PieSeriesPoint psp, double offset, SliceInnerLabelVisualStyle lstyle)
+        {
+            double margin = lstyle.AngleMargin * 2;
+            double sweep = Math.Abs(psp.SweepAngleEx);
+
+            double width = offset * MathHelper.ToRadians(sweep - margin);
+
+            return (width);
+        }
+
+        #endregion
+
+        #region GetWordLength
+
+        private double GetWordLength(
+            WordPos wp, RectangleF[] cBounds, int lineWordCount)
+        {
+            double length = 0;
+
+            if (lineWordCount > 0)
+                length += cBounds[wp.Index - 1].Width;
+
+            for (int i = 0; i < wp.Length; i++)
+                length += cBounds[wp.Index + i].Width;
+
+            return (length);
+        }
+
+        #endregion
+
+        #region GetWordWidths
+
+        private List<WordPos> GetWordWidths(string text, RectangleF[] cBounds)
+        {
+            List<WordPos> wps = new List<WordPos>();
+
+            int index = 0;
+
+            while (index < text.Length)
+            {
+                int length = GetNextWord(text, ref index);
+
+                if (length > 0)
+                {
+                    WordPos wp = new WordPos();
+
+                    wp.Index = index;
+                    wp.Length = length;
+                    wp.Text = text.Substring(index, length);
+
+                    wps.Add(wp);
+
+                    index += length;
+                }
+            }
+
+            return (wps);
+        }
+
+        #region GetNextWord
+
+        private int GetNextWord(string text, ref int index)
+        {
+            while (index < text.Length)
+            {
+                if (text[index] == '\n')
+                    return (1);
+
+                if (Char.IsWhiteSpace(text[index]) == false)
+                    break;
+
+                index++;
+            }
+
+            int eindex = index;
+
+            while (eindex < text.Length)
+            {
+                if (Char.IsWhiteSpace(text[eindex]) == true)
+                    break;
+
+                eindex++;
+            }
+
+            return (eindex - index);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetAlignmentOffset
+
+        private double GetAlignmentOffset(
+            WordPosLine wpsLine, RectangleF[] tbounds, SliceInnerLabelVisualStyle lstyle)
+        {
+            switch (lstyle.Alignment)
+            {
+                case SliceLabelAlignment.OuterRight:
+                case SliceLabelAlignment.MiddleRight:
+                case SliceLabelAlignment.InnerRight:
+                    return (wpsLine.ArcWidth - wpsLine.LineWidth);
+
+                case SliceLabelAlignment.OuterCenter:
+                case SliceLabelAlignment.MiddleCenter:
+                case SliceLabelAlignment.InnerCenter:
+                    return ((wpsLine.ArcWidth - wpsLine.LineWidth) / 2);
+
+                default:
+                    return (0);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderCustomLabel
+
+        internal bool RenderCustomLabel(Graphics g, PieChart pieChart,
+            PieSeriesPoint psp, double maxRadius, string text,SliceInnerLabelVisualStyle lstyle)
+        {
+            double angle = GetCustomLabelAngle(psp, lstyle);
+            double offset = GetCustomLableOffset(psp, maxRadius, lstyle);
+
+            Rectangle r = GetCustomLabelRect(psp, maxRadius, angle, offset, lstyle);
+
+            angle += lstyle.CustomFontAngle;
+
+            if (lstyle.AutoRotate != Tbool.True)
+                angle -= (psp.CenterAngle - 90);
+
+            angle = (angle + 360000) % 360;
+
+            double fontAngle = 0;
+
+            if (lstyle.AutoOrientLabel != Tbool.False)
+            {
+                if (angle < 180)
+                    fontAngle += 180;
+            }
+
+            r = GetSliceLabelBounds(g, pieChart, psp, text, r, lstyle);
+
+            if (r.Width > 0 && r.Height > 0)
+            {
+                GraphicsState gState = g.Save();
+
+                TextRenderingHint renderingHint = g.TextRenderingHint;
+                g.TextRenderingHint = TextRenderingHint.AntiAlias;
+
+                using (StringFormat sf = new StringFormat())
+                {
+                    lstyle.GetStringFormatFlags(sf, angle < 180);
+
+                    g.TranslateTransform(r.X, r.Y);
+                    g.RotateTransform((float)(angle + fontAngle + 90));
+
+                    r.X = -(int)(r.Width / 2);
+                    r.Y = -(int)(r.Height / 2);
+
+                    if (lstyle.Background.IsEmpty == false)
+                    {
+                        using (Brush br = lstyle.Background.GetBrush(r))
+                            g.FillRectangle(br, r);
+                    }
+
+                    using (Brush br = new SolidBrush(lstyle.TextColor))
+                        g.DrawString(text, lstyle.Font, br, r, sf);
+
+                    if (ChartControl.DesignerHosted == true)
+                    {
+                        using (Pen pen = new Pen(Color.Plum))
+                        {
+                            pen.DashStyle = DashStyle.Dash;
+
+                            g.DrawRectangle(pen, r);
+                        }
+                    }
+                }
+
+                g.Restore(gState);
+
+                return (true);
+            }
+
+            return (false);
+        }
+
+        #region GetCustomLabelRect
+
+        private Rectangle GetCustomLabelRect(PieSeriesPoint psp,
+            double maxRadius, double angle, double offset, SliceInnerLabelVisualStyle lstyle)
+        {
+            Rectangle r = new Rectangle();
+
+            r.Location = psp.GetRayEndPoint(angle, offset);
+
+            r.Width = (int)GetCustomLabelWidth(psp, offset, lstyle);
+            r.Height = (int)GetCustomLabelHeight(psp, maxRadius, offset, lstyle);
+
+            return (r);
+        }
+
+        #endregion
+
+        #region GetCustomLabelHeight
+
+        private double GetCustomLabelHeight(PieSeriesPoint psp,
+            double maxRadius, double offset, SliceInnerLabelVisualStyle lstyle)
+        {
+            double height = maxRadius - psp.InnerRadius;
+
+            if (double.IsNaN(lstyle.CustomHeight) == false)
+            {
+                if (Math.Abs(lstyle.CustomHeight) < 1)
+                    return (lstyle.CustomHeight * height);
+
+                return (lstyle.CustomHeight);
+            }
+
+            return (height * .5);
+        }
+
+        #endregion
+
+        #region GetCustomLabelWidth
+
+        private double GetCustomLabelWidth(
+            PieSeriesPoint psp, double offset, SliceInnerLabelVisualStyle lstyle)
+        {
+            double width = GetArcWidth(psp, offset, lstyle);
+
+            if (double.IsNaN(lstyle.CustomWidth) == false)
+            {
+                if (Math.Abs(lstyle.CustomWidth) < 1)
+                    return (lstyle.CustomWidth * width);
+
+                return (lstyle.CustomWidth);
+            }
+
+            return (width * .8);
+        }
+
+        #endregion
+
+        #region GetCustomLableOffset
+
+        private double GetCustomLableOffset(
+            PieSeriesPoint psp, double maxRadius, SliceInnerLabelVisualStyle lstyle)
+        {
+            double offset = lstyle.CustomRadiusOffset;
+
+            if (double.IsNaN(offset) == false)
+            {
+                if (Math.Abs(offset) < 1)
+                    offset = (maxRadius - psp.InnerRadius) * offset;
+
+                return (psp.InnerRadius + offset);
+            }
+
+            return (psp.InnerRadius + (maxRadius - psp.InnerRadius) * .7);
+        }
+
+        #endregion
+
+        #region GetCustomLabelAngle
+
+        private double GetCustomLabelAngle(PieSeriesPoint psp, SliceInnerLabelVisualStyle lstyle)
+        {
+            double angle = (psp.StartAngleEx + psp.SweepAngleEx / 2) % 360;
+
+            if (double.IsNaN(lstyle.CustomAngleOffset) == false)
+            {
+                double offset = lstyle.CustomAngleOffset;
+
+                if (Math.Abs(offset) < 1)
+                    angle += (psp.SweepAngleEx * offset);
+                else
+                    angle += offset;
+            }
+
+            return (angle);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderParallelLabel
+
+        internal bool RenderParallelLabel(Graphics g, PieChart pieChart,
+            PieSeriesPoint psp, double maxRadius, string text, SliceInnerLabelVisualStyle lstyle)
+        {
+            double centerAngle = psp.CenterAngle % 360;
+
+            double innerOffset = GetLableInnerOffset(psp, maxRadius, lstyle);
+            double outerOffset = GetLableOuterOffset(psp, maxRadius, lstyle);
+
+            float fontAngle = 0;
+
+            if (lstyle.AutoOrientLabel != Tbool.False)
+            {
+                if (centerAngle >= 90 && centerAngle < 270)
+                    fontAngle += 180;
+            }
+
+            Point lpt = psp.GetRayEndPoint(
+                centerAngle, (innerOffset + outerOffset) / 2);
+
+            Rectangle r = new Rectangle();
+
+            r.Location = lpt;
+            r.Width = (int)(outerOffset - innerOffset);
+            r.Height = (int)GetArcWidth(psp, innerOffset, lstyle);
+
+            r = GetSliceLabelBounds(g, pieChart, psp, text, r, lstyle);
+
+            if (r.Width > 0 && r.Height > 0)
+            {
+                GraphicsState gState = g.Save();
+
+                TextRenderingHint renderingHint = g.TextRenderingHint;
+                g.TextRenderingHint = TextRenderingHint.AntiAlias;
+
+                using (StringFormat sf = new StringFormat())
+                {
+                    GetStringFormatFlags(lstyle, sf, fontAngle != 0);
+
+                    r.X = -(int)(r.Width / 2);
+                    r.Y = -(int)(r.Height / 2);
+
+                    g.TranslateTransform(lpt.X, lpt.Y);
+                    g.RotateTransform((float)centerAngle + fontAngle);
+
+                    if (lstyle.Background.IsEmpty == false)
+                    {
+                        using (Brush br = lstyle.Background.GetBrush(r))
+                            g.FillRectangle(br, r);
+                    }
+
+                    using (Brush br = new SolidBrush(lstyle.TextColor))
+                        g.DrawString(text, lstyle.Font, br, r, sf);
+                }
+
+                g.Restore(gState);
+
+                return (true);
+            }
+
+            return (false);
+        }
+
+        #region GetStringFormatFlags
+
+        private void GetStringFormatFlags(
+            SliceInnerLabelVisualStyle lstyle, StringFormat sf, bool flip)
+        {
+            if (lstyle.AllowWrap == Tbool.False || lstyle.MaxLineCount == 1)
+                sf.FormatFlags |= StringFormatFlags.NoWrap;
+
+            sf.Trimming = StringTrimming.EllipsisCharacter;
+
+            switch (lstyle.Alignment)
+            {
+                case SliceLabelAlignment.OuterLeft:
+                    sf.Alignment = (flip ? StringAlignment.Near : StringAlignment.Far);     // Outer/inner
+                    sf.LineAlignment = (flip ? StringAlignment.Far : StringAlignment.Near); // Left/right
+                    break;
+
+                case SliceLabelAlignment.InnerLeft:
+                    sf.Alignment = (flip ? StringAlignment.Far : StringAlignment.Near);
+                    sf.LineAlignment = (flip ? StringAlignment.Far : StringAlignment.Near);
+                    break;
+
+                case SliceLabelAlignment.MiddleLeft:
+                    sf.Alignment = StringAlignment.Center;
+                    sf.LineAlignment = (flip ? StringAlignment.Far : StringAlignment.Near);
+                    break;
+
+                case SliceLabelAlignment.OuterRight:
+                    sf.Alignment = (flip ? StringAlignment.Near : StringAlignment.Far);
+                    sf.LineAlignment = (flip ? StringAlignment.Near : StringAlignment.Far);
+                    break;
+
+                case SliceLabelAlignment.InnerRight:
+                    sf.Alignment = (flip ? StringAlignment.Far : StringAlignment.Near);
+                    sf.LineAlignment = (flip ? StringAlignment.Near : StringAlignment.Far);
+                    break;
+
+                case SliceLabelAlignment.MiddleRight:
+                    sf.Alignment = StringAlignment.Center;
+                    sf.LineAlignment = (flip ? StringAlignment.Near : StringAlignment.Far);
+                    break;
+
+                case SliceLabelAlignment.OuterCenter:
+                    sf.Alignment = (flip ? StringAlignment.Near : StringAlignment.Far);
+                    sf.LineAlignment = StringAlignment.Center;
+                    break;
+
+                case SliceLabelAlignment.InnerCenter:
+                    sf.Alignment = (flip ? StringAlignment.Far : StringAlignment.Near);
+                    sf.LineAlignment = StringAlignment.Center;
+                    break;
+
+                case SliceLabelAlignment.NotSet:
+                case SliceLabelAlignment.MiddleCenter:
+                    sf.Alignment = StringAlignment.Center;
+                    sf.LineAlignment = StringAlignment.Center;
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderPerpendicularLabel
+
+        internal bool RenderPerpendicularLabel(Graphics g, PieChart pieChart,
+            PieSeriesPoint psp, double maxRadius, string text, SliceInnerLabelVisualStyle lstyle)
+        {
+            double innerOffset = GetLableInnerOffset(psp, maxRadius, lstyle);
+            double outerOffset = GetLableOuterOffset(psp, maxRadius, lstyle);
+
+            if (outerOffset - innerOffset > 0)
+            {
+                double centerAngle = psp.CenterAngle % 360;
+
+                Point lpt = psp.GetRayEndPoint(centerAngle, outerOffset);
+
+                float fontAngle = 0;
+
+                if (lstyle.AutoOrientLabel != Tbool.False)
+                {
+                    if (centerAngle < 180)
+                        fontAngle += 180;
+                }
+
+                Rectangle r = GetInscribedRectP(psp, maxRadius,
+                    centerAngle, outerOffset, innerOffset, lpt, lstyle);
+
+                r = GetSliceLabelBounds(g, pieChart, psp, text, r, lstyle);
+
+                if (r.Width > 0 && r.Height > 0)
+                {
+                    GraphicsState gState = g.Save();
+
+                    TextRenderingHint renderingHint = g.TextRenderingHint;
+                    g.TextRenderingHint = TextRenderingHint.AntiAlias;
+
+                    g.TranslateTransform(lpt.X, lpt.Y);
+                    g.RotateTransform((float)((centerAngle + fontAngle + 90) % 360));
+
+                    if (lstyle.Background.IsEmpty == false)
+                    {
+                        using (Brush br = lstyle.Background.GetBrush(r))
+                            g.FillRectangle(br, r);
+                    }
+
+                    using (StringFormat sf = new StringFormat())
+                    {
+                        lstyle.GetStringFormatFlags(sf, (centerAngle < 180));
+
+                        using (Brush br = new SolidBrush(lstyle.TextColor))
+                            g.DrawString(text, lstyle.Font, br, r, sf);
+                    }
+
+                    g.Restore(gState);
+
+                    return (true);
+                }
+            }
+
+            return (false);
+        }
+
+        #region GetInscribedRectP
+
+        private Rectangle GetInscribedRectP(PieSeriesPoint psp, double maxRadius,
+            double centerAngle, double outerOffset, double innerOffset, Point lpt, SliceInnerLabelVisualStyle lstyle)
+        {
+            if (psp.InscribedRectValid == false)
+            {
+                double sweepAngle = psp.SweepAngleEx / 2 - lstyle.AngleMargin;
+
+                double b = (innerOffset * Math.Tan(MathHelper.ToRadians(sweepAngle)));
+                double h = (outerOffset - innerOffset);
+
+                double maxb = Math.Sqrt(maxRadius * maxRadius - outerOffset * outerOffset);
+
+                if (b > maxb)
+                    b = maxb;
+
+                h = (h / lstyle.Font.Height) * lstyle.Font.Height;
+
+                Rectangle r = new Rectangle();
+
+                r.Location = new Point((int)-b, (centerAngle < 180) ? (int)-h : 0);
+
+                r.Width = (int)(b * 2);
+                r.Height = (int)h;
+
+                psp.InscribedRect = r;
+            }
+
+            return (psp.InscribedRect);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderHorizontalLabel
+
+        internal bool RenderHorizontalLabel(Graphics g, PieChart pieChart,
+            PieSeriesPoint psp, double maxRadius, string text, SliceInnerLabelVisualStyle lstyle)
+        {
+            double innerOffset = GetLableInnerOffset(psp, maxRadius, lstyle);
+
+            Rectangle r = GetInscribedRectH(g,
+                psp, psp.CenterAngle % 360, maxRadius, innerOffset, lstyle);
+
+            r = GetSliceLabelBounds(g, pieChart, psp, text, r, lstyle);
+
+            if (r.Width > 0 && r.Height > 0)
+            {
+                if (lstyle.Background.IsDisplayable == true)
+                {
+                    using (Brush br = lstyle.Background.GetBrush(r))
+                        g.FillRectangle(br, r);
+                }
+
+                using (StringFormat sf = new StringFormat())
+                {
+                    lstyle.GetStringFormatFlags(sf, false);
+
+                    using (Brush br = new SolidBrush(lstyle.TextColor))
+                        g.DrawString(text, lstyle.Font, br, r, sf);
+                }
+
+                if (ChartControl.DesignerHosted == true)
+                {
+                    using (Pen pen = new Pen(Color.Plum))
+                    {
+                        pen.DashStyle = DashStyle.Dash;
+
+                        g.DrawRectangle(pen, r);
+                    }
+                }
+
+                return (true);
+            }
+
+            return (false);
+        }
+
+        #region GetInscribedRectH
+
+        private Rectangle GetInscribedRectH(Graphics g, PieSeriesPoint psp,
+            double centerAngle, double outerOffset, double innerOffset, SliceInnerLabelVisualStyle lstyle)
+        {
+            if (psp.InscribedRectValid == false)
+            {
+                double startAngle = psp.StartAngleEx % 360;
+                double endAngle = startAngle + psp.SweepAngleEx;
+
+                if (psp.SweepAngleEx > 180)
+                {
+                    startAngle = centerAngle - 88;
+                    endAngle = centerAngle + 88;
+                }
+
+                Rectangle r;
+
+                if (centerAngle > 270)
+                {
+                    r = GetInscribedRectQuad4(g, psp,
+                        startAngle, endAngle, centerAngle, outerOffset, innerOffset, lstyle);
+                }
+                else if (centerAngle > 180)
+                {
+                    r = GetInscribedRectQuad3(g, psp,
+                        startAngle, endAngle, centerAngle, outerOffset, innerOffset, lstyle);
+                }
+                else if (centerAngle > 90)
+                {
+                    r = GetInscribedRectQuad2(g, psp,
+                        startAngle, endAngle, centerAngle, outerOffset, innerOffset, lstyle);
+                }
+                else
+                {
+                    r = GetInscribedRectQuad1(g, psp,
+                        startAngle, endAngle, centerAngle, outerOffset, innerOffset, lstyle);
+                }
+
+                r.Inflate(-2, -2);
+
+                psp.InscribedRect = r;
+            }
+
+            return (psp.InscribedRect);
+        }
+
+        #region GetInscribedRectQuad1
+
+        private Rectangle GetInscribedRectQuad1(Graphics g,
+            PieSeriesPoint psp, double startAngle, double endAngle,
+            double centerAngle, double outerOffset, double innerOffset, SliceInnerLabelVisualStyle lstyle)
+        {
+            Point ptCenter = psp.SliceCenter;
+
+            centerAngle = NormalizeCenterAngleQuad1(centerAngle, startAngle, endAngle);
+
+            Point ptcInner = psp.GetRayEndPoint(centerAngle, innerOffset);
+            Point ptcOuter = psp.GetRayEndPoint(centerAngle, outerOffset);
+
+            Point ptLeftRay = psp.GetRayEndPoint(startAngle, outerOffset);
+            Point ptRightRay = psp.GetRayEndPoint(endAngle, outerOffset);
+
+            Point ptPie1, ptPie2;
+            int count = FindCircleIntersect(ptCenter, outerOffset, ptcOuter,
+                new Point(ptcOuter.X + 1, ptcOuter.Y), out ptPie1, out ptPie2, true);
+
+            if (count != 2)
+                return (Rectangle.Empty);
+
+            Point ptLeftLower = new Point(ptPie1.X, ptcOuter.Y);
+
+            Point pt1;
+            if (FindLineIntersect(ptcOuter, ptLeftLower, ptCenter, ptRightRay, out pt1) == true)
+            {
+                if ((uint)(ptcOuter.X - pt1.X) < ptcOuter.X - ptLeftLower.X)
+                    ptLeftLower.X = pt1.X;
+            }
+
+            Point ptPie3, ptPie4;
+            count = FindCircleIntersect(ptCenter, outerOffset, ptcOuter,
+                new Point(ptcOuter.X, ptcOuter.Y + 10), out ptPie3, out ptPie4, false);
+
+            if (count != 2)
+                return (Rectangle.Empty);
+
+            Point ptRightUpper = new Point(ptcOuter.X, ptPie3.Y);
+
+            if (FindLineIntersect(ptcOuter, new Point(ptcOuter.X, ptcOuter.Y + 10),
+                ptCenter, ptLeftRay, out pt1) == true)
+            {
+                if ((uint)(ptcOuter.Y - pt1.Y) < (ptcOuter.Y - ptRightUpper.Y))
+                    ptRightUpper.Y = pt1.Y;
+            }
+
+            if (centerAngle < 40)
+            {
+                Point ray = psp.GetRayEndPoint(0, innerOffset);
+
+                if (Math.Abs(ray.X - ptcOuter.X) < Math.Abs(ptLeftLower.X - ptcOuter.X))
+                    ptLeftLower.X = ray.X;
+            }
+            else if (centerAngle > 50)
+            {
+                Point ray = psp.GetRayEndPoint(90, innerOffset);
+
+                if (Math.Abs(ray.Y - ptcOuter.Y) < Math.Abs(ptRightUpper.Y - ptcOuter.Y))
+                    ptRightUpper.Y = ray.Y;
+            }
+            else
+            {
+                if (ptLeftLower.X < ptcInner.X)
+                {
+                    if (FindLineIntersect(ptCenter, ptLeftRay, ptcInner,
+                        new Point(ptcInner.X, ptcInner.Y + 10), out pt1) == true)
+                    {
+                        if (Math.Abs(pt1.X - ptcOuter.X) < Math.Abs(ptLeftLower.X - ptcOuter.X))
+                            ptLeftLower.X = pt1.X;
+                    }
+                }
+
+                if (ptRightUpper.Y <= ptcInner.Y)
+                {
+                    if (FindLineIntersect(ptCenter, ptRightRay,
+                        ptcInner, new Point(ptcInner.X + 10, ptcInner.Y), out pt1) == true)
+                    {
+                        if (Math.Abs(pt1.Y - ptcOuter.Y) < Math.Abs(ptRightUpper.Y - ptcOuter.Y))
+                            ptRightUpper.Y = pt1.Y;
+                    }
+                }
+            }
+
+            if (psp.SweepAngleEx < 180)
+            {
+                if (FindLineIntersect(ptCenter, ptRightRay, ptRightUpper,
+                    new Point(ptRightUpper.X + 10, ptRightUpper.Y), out pt1) == true)
+                {
+                    if (Math.Abs(pt1.X - ptcOuter.X) < Math.Abs(ptLeftLower.X - ptcOuter.X))
+                        ptLeftLower.X = pt1.X;
+                }
+
+                if (FindLineIntersect(ptCenter, ptLeftRay, ptLeftLower,
+                    new Point(ptLeftLower.X, ptLeftLower.Y + 10), out pt1) == true)
+                {
+                    if (Math.Abs(pt1.Y - ptcOuter.Y) < Math.Abs(ptRightUpper.Y - ptcOuter.Y))
+                        ptRightUpper.Y = pt1.Y;
+                }
+            }
+
+            Rectangle r = new Rectangle();
+
+            r.Location = new Point(ptLeftLower.X, ptRightUpper.Y);
+            r.Width = ptcOuter.X - ptLeftLower.X;
+            r.Height = ptcOuter.Y - ptRightUpper.Y;
+
+            return (r);
+        }
+
+        #region NormalizeCenterAngleQuad1
+
+        private double NormalizeCenterAngleQuad1(
+            double centerAngle, double startAngle, double endAngle)
+        {
+            if (centerAngle > 70)
+            {
+                centerAngle -= (centerAngle - 70) / 2;
+
+                if (centerAngle - 2 < 0)
+                    centerAngle += 360;
+
+                if (centerAngle - 2 <= startAngle)
+                    centerAngle = (startAngle + 2) % 360;
+            }
+            else if (centerAngle < 20)
+            {
+                centerAngle += (20 - centerAngle) / 2;
+
+                if (centerAngle + 2 >= endAngle)
+                    centerAngle = endAngle - 2;
+            }
+
+            return (centerAngle);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetInscribedRectQuad2
+
+        private Rectangle GetInscribedRectQuad2(Graphics g,
+            PieSeriesPoint psp, double startAngle, double endAngle,
+            double centerAngle, double outerOffset, double innerOffset, SliceInnerLabelVisualStyle lstyle)
+        {
+            Point ptCenter = psp.SliceCenter;
+
+            centerAngle = NormalizeCenterAngleQuad2(centerAngle, startAngle, endAngle);
+
+            Point ptcInner = psp.GetRayEndPoint(centerAngle, innerOffset);
+            Point ptcOuter = psp.GetRayEndPoint(centerAngle, outerOffset);
+
+            Point ptLeftRay = psp.GetRayEndPoint(startAngle, outerOffset);
+            Point ptRightRay = psp.GetRayEndPoint(endAngle, outerOffset);
+
+            Point ptPie1, ptPie2;
+            int count = FindCircleIntersect(ptCenter, outerOffset, ptcOuter,
+                new Point(ptcOuter.X + 1, ptcOuter.Y), out ptPie1, out ptPie2, true);
+
+            if (count != 2)
+                return (Rectangle.Empty);
+
+            Point ptRightLower = new Point(ptPie2.X, ptcOuter.Y);
+
+            Point pt1;
+            if (FindLineIntersect(ptcOuter, ptRightLower, ptCenter, ptLeftRay, out pt1) == true)
+            {
+                if ((uint)(pt1.X - ptcOuter.X) < (ptRightLower.X - ptcOuter.X))
+                    ptRightLower.X = pt1.X;
+            }
+
+            Point ptPie3, ptPie4;
+            count = FindCircleIntersect(ptCenter, outerOffset, ptcOuter,
+                new Point(ptcOuter.X, ptcOuter.Y + 10), out ptPie3, out ptPie4, false);
+
+            if (count != 2)
+                return (Rectangle.Empty);
+
+            Point ptLeftUpper = new Point(ptcOuter.X, ptPie3.Y);
+
+            if (FindLineIntersect(ptcOuter, new Point(ptcOuter.X, ptcOuter.Y + 10),
+                ptCenter, ptRightRay, out pt1) == true)
+            {
+                if ((uint)(ptcOuter.Y - pt1.Y) < (ptcOuter.Y - ptLeftUpper.Y))
+                    ptLeftUpper.Y = pt1.Y;
+            }
+
+            if (centerAngle < 130)
+            {
+                Point ray = psp.GetRayEndPoint(90, innerOffset);
+
+                if (Math.Abs(ray.Y - ptcOuter.Y) < Math.Abs(ptLeftUpper.Y - ptcOuter.Y))
+                    ptLeftUpper.Y = ray.Y;
+            }
+            else if (centerAngle > 140)
+            {
+                Point ray = psp.GetRayEndPoint(180, innerOffset);
+
+                if (Math.Abs(ray.X - ptcOuter.X) < Math.Abs(ptRightLower.X - ptcOuter.X))
+                    ptRightLower.X = ray.X;
+            }
+            else
+            {
+                if (ptRightLower.X > ptcInner.X)
+                {
+                    if (FindLineIntersect(ptCenter, ptLeftRay, ptcInner,
+                        new Point(ptcInner.X, ptcInner.Y + 10), out pt1) == true)
+                    {
+                        if (Math.Abs(pt1.X - ptcOuter.X) < Math.Abs(ptRightLower.X - ptcOuter.X))
+                            ptRightLower.X = pt1.X;
+                    }
+                }
+
+                if (ptLeftUpper.Y <= ptcInner.Y)
+                {
+                    if (FindLineIntersect(ptCenter, ptRightRay,
+                        ptcInner, new Point(ptcInner.X + 10, ptcInner.Y), out pt1) == true)
+                    {
+                        if (Math.Abs(pt1.Y - ptcOuter.Y) < Math.Abs(ptLeftUpper.Y - ptcOuter.Y))
+                            ptLeftUpper.Y = pt1.Y;
+                    }
+                }
+            }
+
+            if (psp.SweepAngleEx < 180)
+            {
+                if (FindLineIntersect(ptCenter, ptRightRay, ptRightLower,
+                    new Point(ptRightLower.X, ptRightLower.Y + 10), out pt1) == true)
+                {
+                    if (Math.Abs(pt1.Y - ptcOuter.Y) < Math.Abs(ptLeftUpper.Y - ptcOuter.Y))
+                        ptLeftUpper.Y = pt1.Y;
+                }
+
+                if (FindLineIntersect(ptCenter, ptLeftRay, ptLeftUpper,
+                    new Point(ptLeftUpper.X + 10, ptLeftUpper.Y), out pt1) == true)
+                {
+                    if (Math.Abs(pt1.X - ptcOuter.X) < Math.Abs(ptRightLower.X - ptcOuter.X))
+                        ptRightLower.X = pt1.X;
+                }
+            }
+
+            Rectangle r = new Rectangle();
+
+            r.Location = ptLeftUpper;
+            r.Width = ptRightLower.X - ptcOuter.X;
+            r.Height = ptcOuter.Y - ptLeftUpper.Y;
+
+            return (r);
+        }
+
+        #region NormalizeCenterAngleQuad2
+
+        private double NormalizeCenterAngleQuad2(
+            double centerAngle, double startAngle, double endAngle)
+        {
+            if (centerAngle > 160)
+            {
+                centerAngle -= (centerAngle - 160) / 2;
+
+                if (centerAngle - 2 <= startAngle)
+                    centerAngle = startAngle + 2;
+            }
+            else if (centerAngle < 110)
+            {
+                centerAngle += (110 - centerAngle) / 2;
+
+                if (centerAngle + 2 >= endAngle)
+                    centerAngle = endAngle - 2;
+            }
+
+            return (centerAngle);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetInscribedRectQuad3
+
+        private Rectangle GetInscribedRectQuad3(Graphics g,
+            PieSeriesPoint psp, double startAngle, double endAngle,
+            double centerAngle, double outerOffset, double innerOffset, SliceInnerLabelVisualStyle lstyle)
+        {
+            Point ptCenter = psp.SliceCenter;
+
+            centerAngle = NormalizeCenterAngleQuad3(centerAngle, startAngle, endAngle);
+
+            Point ptcInner = psp.GetRayEndPoint(centerAngle, innerOffset);
+            Point ptcOuter = psp.GetRayEndPoint(centerAngle, outerOffset);
+
+            Point ptLeftRay = psp.GetRayEndPoint(startAngle, outerOffset);
+            Point ptRightRay = psp.GetRayEndPoint(endAngle, outerOffset);
+
+            Point ptPie1, ptPie2;
+
+            int count = FindCircleIntersect(ptCenter, outerOffset, ptcOuter,
+                new Point(ptcOuter.X + 1, ptcOuter.Y), out ptPie1, out ptPie2, true);
+
+            if (count != 2)
+                return (Rectangle.Empty);
+
+            Point ptRightUpper = new Point(ptPie2.X, ptcOuter.Y);
+
+            Point pt1;
+            if (FindLineIntersect(ptcOuter, ptRightUpper, ptCenter, ptRightRay, out pt1) == true)
+            {
+                if (pt1.X - ptcOuter.X > 0)
+                {
+                    if ((uint)(pt1.X - ptcOuter.X) < (ptRightUpper.X - ptcOuter.X))
+                        ptRightUpper.X = pt1.X;
+                }
+            }
+
+            Point ptPie3, ptPie4;
+
+            count = FindCircleIntersect(ptCenter, outerOffset, ptcOuter,
+                new Point(ptcOuter.X, ptcOuter.Y + 10), out ptPie3, out ptPie4, false);
+
+            if (count != 2)
+                return (Rectangle.Empty);
+
+            Point ptLeftLower = new Point(ptcOuter.X, ptPie4.Y);
+
+            if (FindLineIntersect(ptcOuter, new Point(ptcOuter.X, ptcOuter.Y + 10),
+                ptCenter, ptLeftRay, out pt1) == true)
+            {
+                if (pt1.Y - ptcOuter.Y > 0)
+                {
+                    if ((uint)(pt1.Y - ptcOuter.Y) < (ptLeftLower.Y - ptcOuter.Y))
+                        ptLeftLower.Y = pt1.Y;
+                }
+            }
+
+            if (centerAngle < 220)
+            {
+                Point ray = psp.GetRayEndPoint(180, innerOffset);
+
+                if (Math.Abs(ray.X - ptcOuter.X) < Math.Abs(ptRightUpper.X - ptcOuter.X))
+                    ptRightUpper.X = ray.X;
+            }
+            else if (centerAngle > 230)
+            {
+                Point ray = psp.GetRayEndPoint(270, innerOffset);
+
+                if (Math.Abs(ray.Y - ptcOuter.Y) < Math.Abs(ptLeftLower.Y - ptcOuter.Y))
+                    ptLeftLower.Y = ray.Y;
+            }
+            else
+            {
+                if (ptLeftLower.Y >= ptcInner.Y)
+                {
+                    if (FindLineIntersect(ptCenter, ptLeftRay, ptcInner,
+                        new Point(ptcInner.X + 10, ptcInner.Y), out pt1) == true)
+                    {
+                        if (Math.Abs(pt1.Y - ptcOuter.Y) < Math.Abs(ptLeftLower.Y - ptcOuter.Y))
+                            ptLeftLower.Y = pt1.Y;
+                    }
+                }
+
+                if (ptRightUpper.X > ptcInner.X)
+                {
+                    if (FindLineIntersect(ptCenter, ptRightRay,
+                        ptcInner, new Point(ptcInner.X, ptcInner.Y + 10), out pt1) == true)
+                    {
+                        if (Math.Abs(pt1.X - ptcOuter.X) < Math.Abs(ptRightUpper.X - ptcOuter.X))
+                            ptRightUpper.X = pt1.X;
+                    }
+                }
+            }
+
+            if (psp.SweepAngleEx < 180)
+            {
+                if (FindLineIntersect(ptCenter, ptRightRay, ptLeftLower,
+                    new Point(ptLeftLower.X + 10, ptLeftLower.Y), out pt1) == true)
+                {
+                    if (Math.Abs(pt1.X - ptcOuter.X) < Math.Abs(ptRightUpper.X - ptcOuter.X))
+                        ptRightUpper.X = pt1.X;
+                }
+
+                if (FindLineIntersect(ptCenter, ptLeftRay,
+                    ptRightUpper, new Point(ptRightUpper.X, ptRightUpper.Y + 10), out pt1) == true)
+                {
+                    if (Math.Abs(pt1.Y - ptcOuter.Y) < Math.Abs(ptLeftLower.Y - ptcOuter.Y))
+                        ptLeftLower.Y = pt1.Y;
+                }
+            }
+
+            Rectangle r = new Rectangle();
+
+            r.Location = ptcOuter;
+            r.Width = ptRightUpper.X - ptcOuter.X;
+            r.Height = ptLeftLower.Y - ptcOuter.Y;
+
+            return (r);
+        }
+
+        #region NormalizeCenterAngleQuad3
+
+        private double NormalizeCenterAngleQuad3(
+            double centerAngle, double startAngle, double endAngle)
+        {
+            if (centerAngle > 250)
+            {
+                centerAngle -= (centerAngle - 250) / 2;
+
+                if (centerAngle - startAngle < 2)
+                    centerAngle = startAngle + 2;
+            }
+            else if (centerAngle < 200)
+            {
+                centerAngle += (200 - centerAngle) / 2;
+
+                if (centerAngle + 2 >= endAngle)
+                    centerAngle = endAngle - 2;
+            }
+
+            return (centerAngle);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetInscribedRectQuad4
+
+        private Rectangle GetInscribedRectQuad4(Graphics g,
+            PieSeriesPoint psp, double startAngle, double endAngle,
+            double centerAngle, double outerOffset, double innerOffset, SliceInnerLabelVisualStyle lstyle)
+        {
+            Point ptCenter = psp.SliceCenter;
+
+            centerAngle = NormalizeCenterAngleQuad4(centerAngle, startAngle, endAngle);
+
+            Point ptcInner = psp.GetRayEndPoint(centerAngle, innerOffset);
+            Point ptcOuter = psp.GetRayEndPoint(centerAngle, outerOffset);
+
+            Point ptLeftRay = psp.GetRayEndPoint(startAngle, outerOffset);
+            Point ptRightRay = psp.GetRayEndPoint(endAngle, outerOffset);
+
+            Point ptPie1, ptPie2;
+            int count = FindCircleIntersect(ptCenter, outerOffset, ptcOuter,
+                new Point(ptcOuter.X + 1, ptcOuter.Y), out ptPie1, out ptPie2, true);
+
+            if (count != 2)
+                return (Rectangle.Empty);
+
+            Point ptLeftUpper = new
+                Point((ptcOuter.Y < ptCenter.Y) ? ptPie1.X : ptPie2.X, ptcOuter.Y);
+
+            Point pt1;
+            if (FindLineIntersect(ptcOuter, ptLeftUpper, ptCenter, ptLeftRay, out pt1) == true)
+            {
+                if (ptcOuter.X - pt1.X > 0)
+                {
+                    if ((uint)(ptcOuter.X - pt1.X) < ptcOuter.X - ptLeftUpper.X)
+                        ptLeftUpper.X = pt1.X;
+                }
+            }
+
+            Point ptPie3, ptPie4;
+            count = FindCircleIntersect(ptCenter, outerOffset, ptcOuter,
+                new Point(ptcOuter.X, ptcOuter.Y + 10), out ptPie3, out ptPie4, false);
+
+            if (count != 2)
+                return (Rectangle.Empty);
+
+            Point ptRightLower = new Point(ptcOuter.X,
+                (ptcOuter.X < ptCenter.X) ? ptPie3.Y : ptPie4.Y);
+
+            if (FindLineIntersect(ptcOuter, new Point(ptcOuter.X, ptcOuter.Y + 10),
+                ptCenter, ptRightRay, out pt1) == true)
+            {
+                if (pt1.Y - ptcOuter.Y > 0)
+                {
+                    if ((uint)(pt1.Y - ptcOuter.Y) < (ptRightLower.Y - ptcOuter.Y))
+                        ptRightLower.Y = pt1.Y;
+                }
+            }
+
+            if (centerAngle < 310)
+            {
+                Point ray = psp.GetRayEndPoint(270, innerOffset);
+
+                if (Math.Abs(ray.Y - ptcOuter.Y) < Math.Abs(ptRightLower.Y - ptcOuter.Y))
+                    ptRightLower.Y = ray.Y;
+            }
+            else if (centerAngle > 320)
+            {
+                Point ray = psp.GetRayEndPoint(0, innerOffset);
+
+                if (Math.Abs(ray.X - ptcOuter.X) < Math.Abs(ptLeftUpper.X - ptcOuter.X))
+                    ptLeftUpper.X = ray.X;
+            }
+            else
+            {
+                if (ptLeftUpper.X <= ptcInner.X)
+                {
+                    if (FindLineIntersect(ptCenter, ptLeftRay, ptcInner,
+                        new Point(ptcInner.X, ptcInner.Y + 10), out pt1) == true)
+                    {
+                        if (Math.Abs(pt1.X - ptcOuter.X) < Math.Abs(ptLeftUpper.X - ptcOuter.X))
+                            ptLeftUpper.X = pt1.X;
+                    }
+                }
+
+                if (ptRightLower.Y >= ptcInner.Y)
+                {
+                    if (FindLineIntersect(ptCenter, ptRightRay,
+                        ptcInner, new Point(ptcInner.X + 10, ptcInner.Y), out pt1) == true)
+                    {
+                        if (Math.Abs(pt1.Y - ptcOuter.Y) < Math.Abs(ptRightLower.Y - ptcOuter.Y))
+                            ptRightLower.Y = pt1.Y;
+                    }
+                }
+            }
+
+            if (psp.SweepAngleEx < 180)
+            {
+                if (FindLineIntersect(ptCenter, ptRightRay, ptLeftUpper,
+                    new Point(ptLeftUpper.X, ptLeftUpper.Y + 10), out pt1) == true)
+                {
+                    if (Math.Abs(pt1.Y - ptcOuter.Y) < Math.Abs(ptRightLower.Y - ptcOuter.Y))
+                        ptRightLower.Y = pt1.Y;
+                }
+
+                if (FindLineIntersect(ptCenter, ptLeftRay,
+                    ptRightLower, new Point(ptRightLower.X + 10, ptRightLower.Y), out pt1) == true)
+                {
+                    if (Math.Abs(pt1.X - ptcOuter.X) < Math.Abs(ptLeftUpper.X - ptcOuter.X))
+                        ptLeftUpper.X = pt1.X;
+                }
+            }
+
+            Rectangle r = new Rectangle();
+
+            r.Location = ptLeftUpper;
+            r.Width = ptRightLower.X - ptLeftUpper.X;
+            r.Height = ptRightLower.Y - ptLeftUpper.Y;
+
+            return (r);
+        }
+
+        #region NormalizeCenterAngleQuad4
+
+        private double NormalizeCenterAngleQuad4(
+            double centerAngle, double startAngle, double endAngle)
+        {
+            if (centerAngle > 340)
+            {
+                centerAngle -= (centerAngle - 340) / 2;
+
+                if (centerAngle - 2 <= startAngle)
+                    centerAngle = startAngle + 2;
+            }
+            else if (centerAngle < 290)
+            {
+                centerAngle += (290 - centerAngle) / 2;
+
+                if (centerAngle + 2 >= endAngle)
+                    centerAngle = endAngle - 2;
+            }
+
+            return (centerAngle);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region FindLineIntersect
+
+        private bool FindLineIntersect(
+            Point ps1, Point pe1, Point ps2, Point pe2, out Point ptOut)
+        {
+            float A1 = pe1.Y - ps1.Y;
+            float B1 = ps1.X - pe1.X;
+            float C1 = A1 * ps1.X + B1 * ps1.Y;
+
+            float A2 = pe2.Y - ps2.Y;
+            float B2 = ps2.X - pe2.X;
+            float C2 = A2 * ps2.X + B2 * ps2.Y;
+
+            float delta = A1 * B2 - A2 * B1;
+
+            if (delta == 0)
+            {
+                ptOut = Point.Empty;
+
+                return (false);
+            }
+
+            ptOut = new Point(
+                (int)((B2 * C1 - B1 * C2) / delta),
+                (int)((A1 * C2 - A2 * C1) / delta));
+
+            return (true);
+        }
+
+        #endregion
+
+        #region FindCircleIntersect
+
+        private int FindCircleIntersect(Point ptc, double radius,
+            Point pt1, Point pt2, out Point ptOut1, out Point ptOut2, bool normx)
+        {
+            int dx = pt2.X - pt1.X;
+            int dy = pt2.Y - pt1.Y;
+
+            int a = dx * dx + dy * dy;
+            int b = 2 * (dx * (pt1.X - ptc.X) + dy * (pt1.Y - ptc.Y));
+
+            double c = (pt1.X - ptc.X) * (pt1.X - ptc.X) +
+                (pt1.Y - ptc.Y) * (pt1.Y - ptc.Y) - radius * radius;
+
+            double det = b * b - 4 * a * c;
+
+            if ((a <= 0.0000001) || (det < 0))
+            {
+                ptOut1 = Point.Empty;
+                ptOut2 = Point.Empty;
+
+                return (0);
+            }
+            else if (det == 0)
+            {
+                double t1 = -b / (2 * a);
+
+                ptOut1 = new Point((int)(pt1.X + t1 * dx), (int)(pt1.Y + t1 * dy));
+                ptOut2 = Point.Empty;
+
+                return (1);
+            }
+            else
+            {
+                double t2 = (float)((-b + Math.Sqrt(det)) / (2 * a));
+                double t3 = (float)((-b - Math.Sqrt(det)) / (2 * a));
+
+                ptOut1 = new Point((int)(pt1.X + t2 * dx), (int)(pt1.Y + t2 * dy));
+                ptOut2 = new Point((int)(pt1.X + t3 * dx), (int)(pt1.Y + t3 * dy));
+
+                if ((normx == true && ptOut1.X > ptOut2.X) ||
+                    (normx == false && ptOut1.Y > ptOut2.Y))
+                {
+                    Point ptTemp = ptOut1;
+
+                    ptOut1 = ptOut2;
+                    ptOut2 = ptTemp;
+                }
+
+                return (2);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region GetLableInnerOffset
+
+        internal double GetLableInnerOffset
+            (PieSeriesPoint psp, double maxRadius, SliceInnerLabelVisualStyle lstyle)
+        {
+            double offset;
+
+            if (Math.Abs(lstyle.InnerRadiusOffset) >= 1)
+                offset = lstyle.InnerRadiusOffset;
+            else
+                offset = (maxRadius - psp.InnerRadius) * lstyle.InnerRadiusOffset;
+
+            offset += psp.InnerRadius;
+
+            if (lstyle.MaxLineCount >= 0)
+            {
+                double outerOffset = psp.InnerRadius;
+                
+                if (lstyle.OuterRadiusOffset > -1 && lstyle.OuterRadiusOffset < 1)
+                    outerOffset += (lstyle.OuterRadiusOffset * maxRadius);
+                else
+                    outerOffset += lstyle.OuterRadiusOffset;
+
+                double fh = lstyle.Font.GetHeight() * lstyle.MaxLineCount;
+
+                fh = outerOffset - fh;
+
+                if (fh > offset)
+                    offset = fh;
+            }
+
+            return (offset);
+        }
+
+        #endregion
+
+        #region GetLableOuterOffset
+
+        internal double GetLableOuterOffset(
+            PieSeriesPoint psp, double maxRadius, SliceInnerLabelVisualStyle lstyle)
+        {
+            double offset;
+
+            if (Math.Abs(lstyle.OuterRadiusOffset) >= 1)
+                offset = lstyle.OuterRadiusOffset;
+            else
+                offset = (maxRadius * lstyle.OuterRadiusOffset);
+
+            return (maxRadius + offset);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region GetSliceLabel
+
+        internal string GetSliceLabel(
+            PieChart pieChart, PieSeriesPoint psp, bool inner, string label)
+        {
+            if (string.IsNullOrEmpty(label) == false)
+            {
+                string text = (string)label.Clone();
+
+                if (ChartControl.DoGetSliceLabelEvent(pieChart, this, psp, inner, ref text) == false)
+                    text = psp.GetLabelText(text);
+
+                return (text);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetSliceLabelBounds
+
+        private Rectangle GetSliceLabelBounds(Graphics g, PieChart pieChart,
+            PieSeriesPoint psp, string text, Rectangle r, SliceInnerLabelVisualStyle lstyle)
+        {
+            if (r.Width > 0 && r.Height > 0)
+            {
+                SizeF sz = g.MeasureString(text, lstyle.Font, r.Width);
+                Size size = sz.ToSize();
+
+                psp.InnerLabelClipped = (size.Width > r.Width || size.Height > r.Height);
+
+                if (psp.InnerLabelClipped == true)
+                {
+                    SliceLabelCropMode cropMode = psp.SliceLabelCropModeEx;
+
+                    if (cropMode == SliceLabelCropMode.Hide)
+                        return (Rectangle.Empty);
+
+                    else if (cropMode == SliceLabelCropMode.Clip)
+                    {
+                        int height = GetTruncatedHeight(r.Height, lstyle);
+
+                        if (height > 0)
+                            r.Height = height;
+                    }
+                    else
+                    {
+                        r.Height = size.Height;
+                    }
+                }
+            }
+
+            return (r);
+        }
+
+        #region GetTruncatedHeight
+
+        private int GetTruncatedHeight(int height, SliceInnerLabelVisualStyle lstyle)
+        {
+            int n = (int)(height / lstyle.Font.Height);
+
+            if (lstyle.MaxLineCount > 0)
+            {
+                if (n > lstyle.MaxLineCount)
+                    n = lstyle.MaxLineCount;
+            }
+
+            return (lstyle.Font.Height * n);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region IsHighLightedPsp
+
+        internal bool IsHighLightedPsp(PieChart pieChart, PieSeriesPoint psp)
+        {
+            if (pieChart.Legend.TrackingMode == LegendTrackingMode.ChartAndLegend)
+            {
+                if (LegendItem != null && LegendItem.IsLegendHitItem == true)
+                    return (true);
+
+                if (psp.LegendItem != null && psp.LegendItem.IsLegendHitItem == true)
+                    return (true);
+            }
+
+            PieSeriesPoint hitPsp = pieChart.HitPsp;
+
+            if (hitPsp != null)
+            {
+                PieSelectionMode psm = GetPieSelectionMode(pieChart);
+
+                switch (psm)
+                {
+                    case PieSelectionMode.Pie:
+                        return (true);
+
+                    case PieSelectionMode.Ring:
+                        return (psp.PieRing == hitPsp.PieRing);
+
+                    case PieSelectionMode.Series:
+                        return (psp.ChartSeries == hitPsp.ChartSeries);
+
+                    case PieSelectionMode.Slice:
+                        if (ShowAllRingsEx(pieChart) == true)
+                            return (psp.RootPsp == hitPsp.RootPsp);
+                        else
+                            return (psp == hitPsp);
+
+                    case PieSelectionMode.Point:
+                        return (psp == hitPsp);
+                }
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Render
+
+        internal override void Render(ChartRenderInfo renderInfo)
+        {
+            if (Displayed == true)
+            {
+                Rectangle bounds = BoundsRelative;
+
+                if (renderInfo.ClipRectangle.IntersectsWith(bounds))
+                    RenderOverride(renderInfo);
+            }
+        }
+
+        #endregion
+
+        #region UpdatePalette
+
+        internal bool UpdatePalette(PieChart pieChart)
+        {
+            if (PaletteGroup == PaletteGroup.NotSet)
+                return (false);
+
+            Color[] palette = (PaletteGroup == PaletteGroup.Custom)
+                ? (CustomPalette.Length > 0 ? CustomPalette : pieChart.CustomPalette) 
+                : BaseChart.PaletteGroups[(int)PaletteGroup];
+
+            if (palette == null || palette.Length == 0)
+                palette = BaseChart.PaletteColor1;
+
+            int colorIndex = 0;
+
+            DefaultPaletteColor =
+                pieChart.GetPaletteColor(colorIndex++, palette, ReversePaletteColors);
+
+            if (PieRings != null)
+            {
+                foreach (PieRing pieRing in PieRings)
+                {
+                    foreach (PieSeriesPoint psp in pieRing.Psps)
+                    {
+                        psp.DefaultPaletteColor = 
+                            pieChart.GetPaletteColor(colorIndex++, palette, ReversePaletteColors);
+                    }
+                }
+            }
+
+            return (true);
+        }
+
+        #endregion
+
+        #region AddSeriesPoint
+
+        internal override void AddSeriesPoint(object valueX, object[] valuesY, object dataItem)
+        {
+            PieSeriesPoint sp = new PieSeriesPoint(valueX, valuesY);
+
+            sp.DataItem = dataItem;
+
+            SeriesPoints.Add(sp);
+        }
+
+        #endregion
+
+        #region ClearSeriesPoints
+
+        internal override void ClearSeriesPoints()
+        {
+            SeriesPoints.Clear();
+        }
+
+        #endregion
+
+        #region GetActiveSeriesPointCollection
+
+        /// <summary>
+        /// Gets the current 'active' SeriesPointCollection (useful when
+        /// 'ShowInnerRings' is set to false).
+        /// </summary>
+        /// <returns></returns>
+        public PieSeriesPointCollection GetActiveSeriesPointCollection()
+        {
+            PieChart pieChart = Parent as PieChart;
+
+            if (pieChart != null)
+            {
+                return ((ShowAllRingsEx(pieChart) == true)
+                    ? SeriesPoints : (ActiveSeriesPointCollection ?? SeriesPoints));
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region SetActiveSeriesPointCollection
+
+        /// <summary>
+        /// Sets the current 'active' SeriesPointCollection (useful when
+        /// 'ShowInnerRings' is set to false).
+        /// </summary>
+        /// <param name="spc"></param>
+        public void SetActiveSeriesPointCollection(PieSeriesPointCollection spc)
+        {
+            if (spc == null || ValidSeriesPointSet(SeriesPoints, spc) == true)
+                ActiveSeriesPointCollection = spc;
+            else
+                throw new Exception("Not a valid PieSeriesPointSet for the series.");
+
+            InvalidateLayout();
+        }
+
+        #region ValidSeriesPointSet
+
+        private bool ValidSeriesPointSet(PieSeriesPointCollection spc, PieSeriesPointCollection aspc)
+        {
+            if (aspc == spc)
+                return (true);
+
+            if (spc.PieSlices != null)
+            {
+                foreach (PieSeriesPoint psp in spc.PieSlices)
+                {
+                    if (psp.SeriesPoints == aspc)
+                        return (true);
+
+                    if (ValidSeriesPointSet(psp.SeriesPoints, aspc) == true)
+                        return (true);
+                }
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetPieSeriesPointCollection
+
+        /// <summary>
+        /// Gets the SeriesPointCollection containing the given PieSeriesPoint
+        /// </summary>
+        /// <param name="psp"></param>
+        /// <returns></returns>
+        public PieSeriesPointCollection GetPieSeriesPointCollection(PieSeriesPoint psp)
+        {
+            return (psp.Parent as PieSeriesPointCollection);
+        }
+
+        #endregion
+
+        #region GetPieLabels
+
+        internal List<PieLabel> GetPieLabels(Graphics g, PieChart pieChart)
+        {
+            List<PieLabel> pieLabels = new List<PieLabel>();
+
+            if (ShowAllRingsEx(pieChart) == true)
+            {
+                PieRing pieRing = GetOuterRing(pieChart);
+
+                if (pieRing != null)
+                {
+                    foreach (PieSeriesPoint psp in pieRing.Psps)
+                    {
+                        SetPieLabel(g, pieChart, psp);
+
+                        if (psp.PieLabel != null)
+                            pieLabels.Add(psp.PieLabel);
+                    }
+                }
+            }
+            else
+            {
+                PieSeriesPointCollection spc = GetActiveSeriesPointCollection();
+
+                if (spc != null)
+                {
+                    foreach (PieSeriesPoint psp in spc)
+                    {
+                        SetPieLabel(g, pieChart, psp);
+
+                        if (psp.PieLabel != null)
+                            pieLabels.Add(psp.PieLabel);
+                    }
+                }
+            }
+
+            return (pieLabels);
+        }
+
+        #region SetPieLabel
+
+        private void SetPieLabel(
+            Graphics g, PieChart pieChart, PieSeriesPoint psp)
+        {
+            psp.PieLabel = null;
+
+            if (psp.IsDisplayed == true && psp.SweepAngleEx != 0 &&
+                psp.IsInOtherEx == false && psp.IsEmpty == false)
+            {
+                ChartSliceVisualStyle sstyle = psp.GetEffectiveSliceStyle(pieChart, this);
+
+                if (IsOuterSliceLabelVisible(pieChart, psp) == true)
+                {
+                    SliceOuterLabelVisualStyle lstyle = sstyle.SliceOuterLabelStyle;
+                    SliceLabelDisplayMode displayMode = psp.SliceLabelDisplayModeEx;
+
+                    if (displayMode == SliceLabelDisplayMode.Outer ||
+                        displayMode == SliceLabelDisplayMode.InnerAndOuter ||
+                        displayMode == SliceLabelDisplayMode.NotSet)
+                    {
+                        string outerlabel = psp.OuterSliceLabelEx;
+
+                        if (string.IsNullOrEmpty(outerlabel) == false)
+                            SetPieLabelEx(g, pieChart, psp, outerlabel, lstyle);
+                    }
+                    else
+                    {
+                        if (psp.InnerLabelDisplayed == false)
+                        {
+                            string outerlabel = psp.OuterSliceLabelEx;
+
+                            if (string.IsNullOrEmpty(outerlabel) == false)
+                            {
+                                SetPieLabelEx(g, pieChart, psp, outerlabel, lstyle);
+                            }
+                            else
+                            {
+                                string innerlabel = psp.InnerSliceLabelEx;
+
+                                if (string.IsNullOrEmpty(innerlabel) == false)
+                                    SetPieLabelEx(g, pieChart, psp, innerlabel, lstyle);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region GetOuterRing
+
+        private PieRing GetOuterRing(PieChart pieChart)
+        {
+            if (ShowAllRingsEx(pieChart) == false)
+            {
+                PieSeriesPointCollection spc = (ActiveSeriesPointCollection ?? SeriesPoints);
+
+                return (spc.PieRing);
+            }
+
+            if (PieRings.Count > 0)
+            {
+                foreach (PieRing pieRing in PieRings)
+                {
+                    if (pieRing.IsOuterRing == true)
+                        return (pieRing);
+                }
+
+                return (PieRings[0]);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region IsOuterSliceLabelVisible
+
+        private bool IsOuterSliceLabelVisible(PieChart pieChart, PieSeriesPoint psp)
+        {
+            if (psp.SliceLabelVisibilityEx == SliceLabelVisibility.Never)
+                return (false);
+
+            switch (psp.SliceLabelDisplayModeEx)
+            {
+                case SliceLabelDisplayMode.Outer:
+                case SliceLabelDisplayMode.InnerAndOuter:
+                case SliceLabelDisplayMode.InnerXorOuter:
+                    return (true);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region SetPieLabelEx
+
+        private void SetPieLabelEx(Graphics g, PieChart pieChart,
+            PieSeriesPoint psp, string text, SliceOuterLabelVisualStyle lstyle)
+        {
+            string s = GetSliceLabel(pieChart, psp, false, text);
+
+            if (String.IsNullOrEmpty(s) == false)
+            {
+                PieLabel pl = new PieLabel(psp, s);
+
+                pl.LabelSize = MeasurePieLabel(g, pieChart, psp, pl, 0, lstyle);
+
+                psp.PieLabel = pl;
+            }
+        }
+
+        #region MeasurePieLabel
+
+        internal Size MeasurePieLabel(Graphics g, PieChart pieChart,
+            PieSeriesPoint psp, PieLabel pl, int cwidth, SliceOuterLabelVisualStyle lstyle)
+        {
+            float fheight = lstyle.Font.GetHeight();
+
+            int maxWidth = GetMaxPieTextWidth(g, pieChart, lstyle);
+            int maxHeight = GetMaxPieTextHeight(g, pieChart, fheight, lstyle);
+
+            int minWidth = GetMinPieTextWidth(g, pieChart, lstyle);
+            int minHeight = GetMinPieTextHeight(g, pieChart, fheight, lstyle);
+
+            using (StringFormat sf = new StringFormat())
+            {
+                lstyle.GetStringFormatFlags(sf, false);
+
+                if (cwidth != 0)
+                    cwidth -= Dpi.Width(lstyle.Padding.Horizontal);
+
+                Size size = g.MeasureString(pl.Label,
+                    lstyle.Font, cwidth != 0 ? cwidth : maxWidth, sf).ToSize();
+
+                size.Width += Dpi.Width1;
+
+                size = AdjustForPadding(pieChart, psp, size);
+
+                size.Height = MathHelper.Clamp(size.Height, minHeight, maxHeight);
+                size.Width = MathHelper.Clamp(size.Width, minWidth, maxWidth);
+
+                if (lstyle.MaxLineCount > 1)
+                {
+                    int lineHeight = (int)(Math.Ceiling(fheight)) * lstyle.MaxLineCount;
+
+                    if (size.Height > lineHeight)
+                        size.Height = lineHeight;
+                }
+
+                return (size);
+            }
+        }
+
+        #region GetMaxPieTextWidth
+
+        private int GetMaxPieTextWidth(
+            Graphics g, PieChart pieChart, SliceOuterLabelVisualStyle lstyle)
+        {
+            double maxWidth = lstyle.MaxLabelWidth;
+
+            if (double.IsNaN(maxWidth) == false)
+            {
+                if (Math.Abs(maxWidth) >= 1)
+                    return ((int)maxWidth);
+            }
+            else
+            {
+                maxWidth = .5;
+            }
+
+            return ((int)(pieChart.ContentBoundsEx.Width * maxWidth));
+        }
+
+        #endregion
+
+        #region GetMaxPieTextHeight
+
+        private int GetMaxPieTextHeight(
+            Graphics g, PieChart pieChart, float fheight, SliceOuterLabelVisualStyle lstyle)
+        {
+            double maxHeight = lstyle.MaxLabelHeight;
+
+            if (double.IsNaN(maxHeight) == false)
+            {
+                if (Math.Abs(maxHeight) >= 1)
+                    return ((int)maxHeight);
+            }
+            else
+            {
+                maxHeight = .5;
+            }
+
+            double height = pieChart.ContentBoundsEx.Height * maxHeight;
+
+            int n = (int)(height / fheight);
+
+            return ((int)(fheight * n));
+        }
+
+        #endregion
+
+        #region GetMinPieTextWidth
+
+        private int GetMinPieTextWidth(
+            Graphics g, PieChart pieChart, SliceOuterLabelVisualStyle lstyle)
+        {
+            double minWidth = lstyle.MinLabelWidth;
+
+            if (double.IsNaN(minWidth) == false)
+            {
+                if (Math.Abs(minWidth) >= 1)
+                    return ((int)minWidth);
+
+                return ((int)(pieChart.ContentBoundsEx.Width * minWidth));
+            }
+
+            return (0);
+        }
+
+        #endregion
+
+        #region GetMinPieTextHeight
+
+        private int GetMinPieTextHeight(
+            Graphics g, PieChart pieChart, float fheight, SliceOuterLabelVisualStyle lstyle)
+        {
+            double minHeight = lstyle.MinLabelHeight;
+
+            if (double.IsNaN(minHeight) == false)
+            {
+                if (Math.Abs(minHeight) >= 1)
+                    return ((int)minHeight);
+
+                double height = pieChart.ContentBoundsEx.Height * minHeight;
+
+                int n = (int)(height / fheight);
+
+                return ((int)(fheight * n));
+            }
+
+            return ((int)fheight);
+        }
+
+        #endregion
+
+        #region AdjustForPadding
+
+        private Size AdjustForPadding(PieChart pieChart, PieSeriesPoint psp, Size size)
+        {
+            SliceOuterLabelVisualStyle sstyle =
+                psp.GetEffectiveSliceStyle(pieChart, psp.ChartSeries).SliceOuterLabelStyle;
+
+            size.Width += Dpi.Width(sstyle.Padding.Horizontal);
+            size.Height += Dpi.Width(sstyle.Padding.Vertical);
+
+            return (size);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region GetOtherPieSeriesPoint
+
+        /// <summary>
+        /// Gets the 'Other' PieSeriesPoint
+        /// </summary>
+        /// <returns></returns>
+        public PieSeriesPoint GetOtherPieSeriesPoint()
+        {
+            return (SeriesPoints.OtherSlicePsp);
+        }
+
+        #endregion
+
+        #region Mouse support
+
+        #region ProcessMouseEnter
+
+        internal void ProcessMouseEnter(EventArgs e, PieChart pieChart)
+        {
+            SetToolTip(pieChart.ShowToolTips ? GetToolTipText(pieChart) : string.Empty);
+        }
+
+        #region SetToolTip
+
+        private static string _toolTipText;
+
+        private void SetToolTip(string toolTipText)
+        {
+            ChartControl chartControl = ChartControl;
+
+            if (chartControl != null)
+            {
+                if (chartControl.ToolTipText != _toolTipText)
+                    chartControl.ToolTip.Hide(chartControl);
+
+                chartControl.ToolTipText = toolTipText;
+            }
+        }
+
+        #endregion
+
+        #region GetToolTipText
+
+        private string GetToolTipText(PieChart pieChart)
+        {
+            PieSeriesPoint psp = pieChart.HitPsp;
+
+            if (psp == null || "".Equals(psp.ToolTipText))
+                return (string.Empty);
+
+            if (_toolTipText == null)
+            {
+                ChartControl chartControl = ChartControl;
+
+                string s = "";
+
+                if (chartControl.DoGetToolTipEvent(pieChart, this, psp, ref s) == false)
+                    s = psp.ToolTipTextEx;
+
+                _toolTipText = psp.FormatItemText(s);
+            }
+
+            return (_toolTipText);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ProcessMouseLeave
+
+        internal void ProcessMouseLeave(EventArgs e, PieChart pieChart)
+        {
+            ChartControl chartControl = ChartControl;
+
+            if (chartControl != null)
+                chartControl.ToolTipText = "";
+
+            _toolTipText = null;
+        }
+
+        #endregion
+
+        #region ProcessMouseDown
+
+        internal bool ProcessMouseDown(
+            MouseEventArgs e, PieChart pieChart, PieSeriesPoint psp)
+        {
+            pieChart.IsDragging = false;
+            pieChart.PspDragType = PspDragType.None;
+
+            if ((Control.MouseButtons & MouseButtons.Left) == MouseButtons.Left)
+            {
+                _MouseDownPsp = psp;
+
+                Point cpt = pieChart.GetLocalAdjustedPoint(pieChart.CenterPoint);
+
+                Point rpt = e.Location;
+                _MouseDownRadius = MathHelper.GetPointRadius(ref rpt, cpt);
+
+                if ((Control.ModifierKeys & Keys.Shift) == Keys.Shift)
+                {
+                    _MouseDownOffset = (int)pieChart.ExplodedOffsetEx;
+                }
+                else
+                {
+                    PieSeriesPoint rootPsp = (ShowAllRingsEx(pieChart) == true)
+                        ? psp.RootPsp : psp;
+
+                    _MouseDownOffset = (double.IsNaN(rootPsp.DetachedOffset) == false)
+                        ? (int)rootPsp.DetachedOffset : 0;
+                }
+
+                MouseClickSliceAction mca = GetMouseClickSliceAction(pieChart);
+
+                switch (mca)
+                {
+                    case MouseClickSliceAction.Explode:
+                    case MouseClickSliceAction.Detach:
+                        InitPspDrag(pieChart, psp);
+                        break;
+
+                    case MouseClickSliceAction.Select:
+                        ProcessSliceSelect(e, pieChart, psp);
+                        break;
+                }
+
+                return (true);
+            }
+
+            return (false);
+        }
+
+        #region InitPspDrag
+
+        private bool InitPspDrag(PieChart pieChart, PieSeriesPoint psp)
+        {
+            if ((Control.ModifierKeys & Keys.Shift) == Keys.Shift)
+            {
+                if (pieChart.EnableShiftDragExplode == true)
+                {
+                    pieChart.PspDragType = PspDragType.Explode;
+
+                    return (true);
+                }
+            }
+            else
+            {
+                if (GetEnableDragDetach(pieChart) == true)
+                {
+                    pieChart.PspDragType = PspDragType.Detach;
+
+                    return (psp.IsSelected);
+                }
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region ProcessSliceSelect
+
+        private void ProcessSliceSelect(
+            MouseEventArgs e, PieChart pieChart, PieSeriesPoint psp)
+        {
+            bool select = true;
+
+            if ((pieChart.MultiSelect == true) &&
+                (Control.ModifierKeys & Keys.Control) == Keys.Control)
+            {
+                select = !psp.IsSelected;
+            }
+            else
+            {
+                if (InitPspDrag(pieChart, psp) == true)
+                    return;
+
+                int selCount = pieChart.GetSelectionCount();
+
+                if (selCount != 1 || psp.IsSelected == false)
+                    pieChart.SetSelected(false);
+            }
+
+            ProcessSliceSelectEx(pieChart, psp, select);
+        }
+
+        #region ProcessSliceSelectEx
+
+        private void ProcessSliceSelectEx(
+            PieChart pieChart, PieSeriesPoint psp, bool select)
+        {
+            PieSelectionMode psm = GetPieSelectionMode(pieChart);
+
+            switch (psm)
+            {
+                case PieSelectionMode.Pie:
+                    pieChart.SetSelected(select);
+                    break;
+
+                case PieSelectionMode.Series:
+                    SelectPspSeries(SeriesPoints, true, select);
+                    break;
+
+                case PieSelectionMode.Ring:
+                    SelectPspRing(psp, select);
+                    break;
+
+                case PieSelectionMode.Slice:
+                    SelectPspSlice(pieChart, psp, select);
+                    break;
+
+                case PieSelectionMode.Point:
+                    psp.IsSelected = select;
+                    break;
+            }
+
+            ChartControl.DoPieSelectionChangedEvent(pieChart, this, psp, psm);
+        }
+
+        #region SelectPspSeries
+
+        private void SelectPspSeries(
+            PieSeriesPointCollection spc, bool showInner, bool select)
+        {
+            if (spc != null)
+            {
+                foreach (PieSeriesPoint psp in spc)
+                {
+                    if (psp.AllowSelect == true)
+                    {
+                        psp.IsSelected = select;
+
+                        if (showInner == true)
+                            SelectPspSeries(psp.SeriesPoints, true, select);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region SelectPspRing
+
+        private void SelectPspRing(PieSeriesPoint psp, bool select)
+        {
+            if (psp.PieRing != null)
+            {
+                if (psp.PieRing.AllowSelect == true)
+                {
+                    foreach (PieSeriesPoint rpsp in psp.PieRing.Psps)
+                    {
+                        if (rpsp.AllowSelect == true)
+                            rpsp.IsSelected = select;
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region SelectPspSlice
+
+        private void SelectPspSlice(
+            PieChart pieChart, PieSeriesPoint psp, bool select)
+        {
+            PieSeriesPoint rootPsp = (ShowAllRingsEx(pieChart) == true)
+                ? psp.RootPsp : psp;
+
+            if (rootPsp != null)
+            {
+                if (rootPsp.AllowSelect == true)
+                {
+                    rootPsp.IsSelected = select;
+
+                    SelectPspSliceEx(rootPsp.SeriesPoints, select);
+                }
+            }
+        }
+
+        #region SelectPspSliceEx
+
+        private void SelectPspSliceEx(PieSeriesPointCollection spc, bool select)
+        {
+            if (spc != null)
+            {
+                foreach (PieSeriesPoint psp in spc)
+                {
+                    if (psp.AllowSelect == true)
+                    {
+                        psp.IsSelected = select;
+
+                        SelectPspSliceEx(psp.SeriesPoints, select);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region ProcessMouseMove
+
+        internal void ProcessMouseMove(MouseEventArgs e, PieChart pieChart)
+        {
+            if (IsMouseDown == true && _MouseDownPsp != null)
+                ProcessMouseDownMove(e, pieChart);
+        }
+
+        #region ProcessMouseDownMove
+
+        private bool ProcessMouseDownMove(MouseEventArgs e, PieChart pieChart)
+        {
+            Point pt = e.Location;
+
+            if (pieChart.IsDragging == false)
+            {
+                if (Math.Abs(MouseDownPoint.X - pt.X) > 3 ||
+                    Math.Abs(MouseDownPoint.Y - pt.Y) > 3)
+                {
+                    pieChart.IsDragging = true;
+                }
+            }
+            else
+            {
+                int deltaOffset = GetDeltaOffset(pieChart, pt);
+
+                MouseClickSliceAction mca = GetMouseClickSliceAction(pieChart);
+
+                switch (pieChart.PspDragType)
+                {
+                    case PspDragType.Detach:
+                        if (GetEnableDragDetach(pieChart) == true)
+                            DetachSelectedPsps(pieChart, mca, deltaOffset);
+                        break;
+
+                    case PspDragType.Explode:
+                        if (pieChart.EnableShiftDragExplode == true)
+                            ExplodePie(pieChart, deltaOffset);
+                        break;
+                }
+            }
+
+            return (true);
+        }
+
+        #region GetDeltaOffset
+
+        private int GetDeltaOffset(PieChart pieChart, Point pt)
+        {
+            PieSeriesPoint psp = pieChart.HitPsp;
+
+            if (psp != null)
+            {
+                Point cpt = pieChart.GetLocalAdjustedPoint(pieChart.CenterPoint);
+
+                Point rpt = pt;
+                double radius = MathHelper.GetPointRadius(ref rpt, cpt);
+
+                if (ShowAllRingsEx(pieChart) == true)
+                {
+                    double pspAngle = MathHelper.GetPointAngle(rpt);
+
+                    double angle = psp.CenterAngle - pspAngle;
+                    double delta = Math.Cos(MathHelper.ToRadians(angle)) * radius;
+
+                    return ((int)delta);
+                }
+
+                return ((int)radius);
+            }
+
+            return (0);
+        }
+
+        #endregion
+
+        #region DetachSelectedPsps
+
+        private void DetachSelectedPsps(
+            PieChart pieChart, MouseClickSliceAction mca, int deltaOffset)
+        {
+            int offset = Math.Max(0, deltaOffset - _MouseDownRadius + _MouseDownOffset);
+            offset = Math.Min(offset, pieChart.MaxDetachedOffset);
+
+            PieSeriesPoint pspRoot =
+                ShowAllRingsEx(pieChart) ? _MouseDownPsp.RootPsp : _MouseDownPsp;
+
+            PieSelectionMode psm = GetPieSelectionMode(pieChart);
+
+            bool detachChange = false;
+
+            switch (psm)
+            {
+                case PieSelectionMode.Pie:
+                    foreach (PieSeries series in pieChart.ChartSeries)
+                    {
+                        if (series.IsDisplayed == true)
+                        {
+                            foreach (PieSeriesPoint psp in series.SeriesPoints)
+                                detachChange |= DetachPsp(psp, offset);
+                        }
+                    }
+                    break;
+
+                case PieSelectionMode.Series:
+                case PieSelectionMode.Ring:
+                    if (pspRoot.PieRing.AllowDetach == true)
+                    {
+                        foreach (PieSeriesPoint psp in pspRoot.PieRing.Psps)
+                            detachChange |= DetachPsp(psp, offset);
+                    }
+                    break;
+
+                case PieSelectionMode.Slice:
+                case PieSelectionMode.Point:
+                    if (mca == MouseClickSliceAction.Select)
+                    {
+                        if (pspRoot.PieRing.AllowDetach == true)
+                        {
+                            foreach (PieSeriesPoint psp in pspRoot.PieRing.Psps)
+                            {
+                                if (psp.IsSelected == true)
+                                    detachChange |= DetachPsp(psp, offset);
+                            }
+                        }
+                    }
+                    else
+                    {
+                        detachChange |= DetachPsp(pspRoot, offset);
+                    }
+                    break;
+            }
+
+            ChartControl.DoPieDetachChangedEvent(pieChart, this, psm);
+        }
+
+        #region DetachPsp
+
+        private void DetachPsp(PieSeriesPoint psp)
+        {
+            DetachPsp(psp, psp.DetachedOffset);
+        }
+
+        private bool DetachPsp(PieSeriesPoint psp, double offset)
+        {
+            if (psp.AllowDetach == true)
+            {
+                if (psp.DetachedOffset != offset || psp.IsDetached != (offset > 0))
+                {
+                    psp.DetachedOffset = offset;
+                    psp.IsDetached = (offset > 0);
+
+                    return (true);
+                }
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ExplodePie
+
+        private void ExplodePie(PieChart pieChart, int deltaOffset)
+        {
+            int offset = Math.Max(0, deltaOffset - _MouseDownRadius + _MouseDownOffset);
+
+            offset = Math.Min(offset, pieChart.MaxExplodedOffset);
+
+            if (pieChart.ExplodedOffset != offset || pieChart.IsExploded != (offset > 0))
+            {
+                pieChart.IsExploded = (offset > 0);
+                pieChart.ExplodedOffset = offset;
+
+                ChartControl.DoPieExplodeChangedEvent(pieChart, this);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region ProcessMouseUp
+
+        internal void ProcessMouseUp(MouseEventArgs e, PieChart pieChart)
+        {
+            if (pieChart.IsDragging == false)
+            {
+                PieSeriesPoint psp = pieChart.HitPsp;
+
+                if (psp != null && psp == _MouseDownPsp)
+                {
+                    ChartControl chartControl = ChartControl;
+
+                    if (chartControl.DoChartMouseClickEvent(pieChart, psp, e) == false)
+                    {
+                        MouseClickSliceAction mca = GetMouseClickSliceAction(pieChart);
+
+                        switch (mca)
+                        {
+                            case MouseClickSliceAction.Explode:
+                                pieChart.IsExploded = !pieChart.IsExploded;
+                                break;
+
+                            case MouseClickSliceAction.Detach:
+                                DetachPsp(ShowAllRingsEx(pieChart) ? psp.RootPsp : psp);
+                                break;
+
+                            case MouseClickSliceAction.Select:
+                                if ((Control.ModifierKeys & Keys.Control) == Keys.None)
+                                {
+                                    int selCount = pieChart.GetSelectionCount();
+
+                                    if (selCount != 1 || psp.IsSelected == false)
+                                        pieChart.SetSelected(false);
+
+                                    ProcessSliceSelectEx(pieChart, psp, true);
+                                }
+                                break;
+                        }
+                    }
+                }
+            }
+        }
+
+
+        #endregion
+
+        #region ProcessMouseDoubleClick
+
+        internal bool ProcessMouseDoubleClick(
+            MouseEventArgs e, PieChart pieChart, PieSeriesPoint psp)
+        {
+            if (e.Button == MouseButtons.Left)
+            {
+                MouseDoubleClickSliceAction mdca = GetMouseDoubleClickSliceAction(pieChart);
+
+                switch (mdca)
+                {
+                    case MouseDoubleClickSliceAction.Detach:
+                        psp.IsDetached = !psp.IsDetached;
+                        break;
+
+                    case MouseDoubleClickSliceAction.Explode:
+                        pieChart.IsExploded = !pieChart.IsExploded;
+                        break;
+
+                    case MouseDoubleClickSliceAction.ChangeActiveRing:
+                        Keys keys = Control.ModifierKeys;
+
+                        if ((keys & Keys.Shift) == Keys.Shift)
+                            ProcessPieDrillUp(pieChart, psp);
+
+                        else if ((keys & Keys.Control) == Keys.None)
+                            ProcessPieDrillDown(pieChart, psp);
+                        break;
+                }
+
+                return (true);
+            }
+
+            return (false);
+        }
+
+        #region ProcessPieDrillUp
+
+        private void ProcessPieDrillUp(PieChart pieChart, PieSeriesPoint psp)
+        {
+            PieSeriesPointCollection spc1 = psp.Parent as PieSeriesPointCollection;
+
+            if (spc1 != null)
+            {
+                PieSeriesPoint psp2 = spc1.Parent as PieSeriesPoint;
+
+                if (psp2 != null)
+                {
+                    PieSeriesPointCollection spc2 = GetPieSeriesPointCollection(psp2);
+
+                    if (spc2 != null)
+                    {
+                        ChartControl chartControl = ChartControl;
+
+                        if (chartControl.DoPieRingLevelChangingEvent(pieChart, spc1, spc2) == false)
+                        {
+                            SetActiveSeriesPointCollection(spc2);
+
+                            chartControl.DoPieRingLevelChangedEvent(pieChart, spc1, spc2);
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region ProcessPieDrillDown
+
+        private void ProcessPieDrillDown(PieChart pieChart, PieSeriesPoint psp)
+        {
+            if (psp.ChartSeries.ShowAllRingsEx(pieChart) == false)
+            {
+                PieSeriesPointCollection spc1 = psp.Parent as PieSeriesPointCollection;
+
+                if (psp.SeriesPoints.Count > 0)
+                {
+                    ChartControl chartControl = ChartControl;
+                    PieSeriesPointCollection spc2 = psp.SeriesPoints;
+
+                    if (chartControl.DoPieRingLevelChangingEvent(pieChart, spc1, spc2) == false)
+                    {
+                        SetActiveSeriesPointCollection(psp.SeriesPoints);
+
+                        chartControl.DoPieRingLevelChangedEvent(pieChart, spc1, spc2);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region SetSelected
+
+        /// <summary>
+        /// Selects or clears all series PieSeriesPoints.
+        /// </summary>
+        /// <param name="select"></param>
+        public void SetSelected(bool select)
+        {
+            PieSeriesPointCollection spc = SeriesPoints;
+
+            spc.SetSelected(select);
+
+            if (spc.OtherSlicePsp != null)
+                spc.OtherSlicePsp.IsSelected = select;
+        }
+
+        #endregion
+
+        #region GetVisibleSelectionCount
+
+        /// <summary>
+        /// Gets the count of the currently Visible selected pie series points.
+        /// </summary>
+        /// <returns></returns>
+        public int GetVisibleSelectionCount()
+        {
+            int count = GetVisibleSelectionCountEx(SeriesPoints);
+
+            return (count);
+        }
+
+        #region GetVisibleSelectionCountEx
+
+        private int GetVisibleSelectionCountEx(PieSeriesPointCollection spc)
+        {
+            int count = 0;
+
+            if (spc != null && spc.Count > 0)
+            {
+                foreach (PieSeriesPoint psp in spc)
+                {
+                    if (psp.IsSelected == true && psp.Visible == true)
+                        count++;
+
+                    count += GetVisibleSelectionCountEx(psp.SeriesPoints);
+                }
+
+                if (spc.OtherSlicePsp != null)
+                {
+                    if (spc.OtherSlicePsp.IsSelected == true && spc.OtherSlicePsp.Visible == true)
+                        count++;
+                }
+            }
+
+            return (count);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetVisibleSelectedPoints
+
+        /// <summary>
+        /// Gets a list of the currently Visible selected pie series points.
+        /// </summary>
+        /// <returns></returns>
+        public List<PieSeriesPoint> GetVisibleSelectedPoints()
+        {
+            List<PieSeriesPoint> list = new List<PieSeriesPoint>();
+
+            GetVisibleSelectedPointsEx(list, SeriesPoints);
+
+            return (list);
+        }
+
+        #region GetVisibleSelectedPointsEx
+
+        private void GetVisibleSelectedPointsEx(
+            List<PieSeriesPoint> list, PieSeriesPointCollection spc)
+        {
+            if (spc != null && spc.Count > 0)
+            {
+                foreach (PieSeriesPoint psp in spc)
+                {
+                    if (psp.IsSelected == true && psp.Visible == true)
+                        list.Add(psp);
+
+                    GetVisibleSelectedPointsEx(list, psp.SeriesPoints);
+                }
+
+                if (spc.OtherSlicePsp != null)
+                {
+                    if (spc.OtherSlicePsp.IsSelected == true && spc.OtherSlicePsp.Visible == true)
+                        list.Add(spc.OtherSlicePsp);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetSelectionCount
+
+        /// <summary>
+        /// Gets a count of the selected pie series points.
+        /// </summary>
+        /// <returns></returns>
+        public int GetSelectionCount()
+        {
+            int count = GetSelectionCountEx(SeriesPoints);
+
+            return (count);
+        }
+
+        #region GetSelectionCountEx
+
+        private int GetSelectionCountEx(PieSeriesPointCollection spc)
+        {
+            int count = 0;
+
+            if (spc != null && spc.Count > 0)
+            {
+                foreach (PieSeriesPoint psp in spc)
+                {
+                    if (psp.IsSelected == true)
+                        count++;
+
+                    count += GetSelectionCountEx(psp.SeriesPoints);
+                }
+
+                if (spc.OtherSlicePsp != null)
+                {
+                    if (spc.OtherSlicePsp.IsSelected == true )
+                        count++;
+                }
+            }
+
+            return (count);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetSelectedPoints
+
+        /// <summary>
+        /// Gets a list of the currently selected pie series points.
+        /// </summary>
+        /// <returns></returns>
+        public List<PieSeriesPoint> GetSelectedPoints()
+        {
+            List<PieSeriesPoint> list = new List<PieSeriesPoint>();
+
+            GetSelectedPointsEx(list, SeriesPoints);
+
+            return (list);
+        }
+
+        #region GetSelectedPointsEx
+
+        private void GetSelectedPointsEx(
+            List<PieSeriesPoint> list, PieSeriesPointCollection spc)
+        {
+            if (spc != null && spc.Count > 0)
+            {
+                foreach (PieSeriesPoint psp in spc)
+                {
+                    if (psp.IsSelected == true)
+                        list.Add(psp);
+
+                    GetSelectedPointsEx(list, psp.SeriesPoints);
+                }
+
+                if (spc.OtherSlicePsp != null)
+                {
+                    if (spc.OtherSlicePsp.IsSelected == true)
+                        list.Add(spc.OtherSlicePsp);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Style handling
+
+        #region StyleChanged
+
+        protected override void StyleChanged(object sender, PropertyChangedEventArgs e)
+        {
+            base.StyleChanged(sender, e);
+
+            if (sender is ChartLegendItemVisualStyles && LegendItem != null)
+                InvalidateRender(LegendItem.Bounds);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InvalidateRender
+
+        public override void InvalidateRender()
+        {
+            BaseChart chart = Parent as BaseChart;
+
+            if (chart != null)
+                chart.InvalidateRender();
+        }
+
+        #endregion
+
+        #region InvalidateRecalc
+
+        internal override void InvalidateRecalc()
+        {
+            SeriesRangeChanged = true;
+
+            base.InvalidateRecalc();
+        }
+
+        #endregion
+
+        #region ILegendItem
+
+        #region GetLegendItem
+
+        public override ChartLegendItem GetLegendItem()
+        {
+            LegendItem = null;
+
+            if (ShowInLegend == true)
+            {
+                PieChart pieChart = Parent as PieChart;
+
+                if (pieChart != null)
+                {
+                    if (pieChart.VisibleSeriesCount > 1)
+                    {
+                        if (pieChart.Legend.ShowPieSeriesInLegend == true)
+                        {
+                            LegendItem = base.GetLegendItem();
+
+                            LegendItem.ShowCheckBox = pieChart.Legend.ShowPieSeriesCheckBoxes;
+                        }
+                    }
+                }
+            }
+
+            return (LegendItem);
+        }
+
+        #endregion
+
+        #region AddSubLegendItems
+
+        internal override void AddSubLegendItems(List<ChartLegendItem> list)
+        {
+            PieChart pieChart = Parent as PieChart;
+
+            if (pieChart != null)
+            {
+                if (ShowInLegend == true)
+                {
+                    ChartLegend legend = pieChart.Legend;
+
+                    if (ShowAllRingsEx(pieChart) == true)
+                    {
+                        if (PieRings != null && PieRings.Count > 0)
+                        {
+                            bool addRings =
+                                ((PieRings.Count > 1) && 
+                                 (pieChart.Legend.ShowPieRingsInLegend == true));
+
+                            foreach (PieRing pieRing in PieRings)
+                            {
+                                if (addRings == true)
+                                {
+                                    ChartLegendItem litem = pieRing.GetLegendItem();
+
+                                    if (litem != null)
+                                    {
+                                        litem.ShowCheckBox = legend.ShowPieRingCheckBoxes;
+                                        list.Add(litem);
+                                    }
+                                }
+
+                                if (legend.ShowPieSeriesPointsInLegend == true)
+                                    AddSubLegendItemsEx(legend, list, pieRing.GetLegendItems());
+                            }
+                        }
+                    }
+                    else
+                    {
+                        PieSeriesPointCollection spc = GetActiveSeriesPointCollection();
+
+                        if (spc != null)
+                        {
+                            if (spc.PieSlices != null)
+                                spc = spc.PieSlices;
+
+                            if (spc != null)
+                            {
+                                foreach (PieSeriesPoint psp in spc)
+                                {
+                                    if (psp.IsDisplayable == true)
+                                        AddSubLegendItemsEx(legend, list, psp.GetLegendItems());
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        #region AddSubLegendItemsEx
+
+        private void AddSubLegendItemsEx(ChartLegend legend,
+            List<ChartLegendItem> list, List<ChartLegendItem> items)
+        {
+            if (items != null && items.Count > 0)
+            {
+                foreach (ChartLegendItem item in items)
+                {
+                    item.ShowCheckBox = legend.ShowPieSeriesPointCheckBoxes;
+
+                    if (legend.CombineLikeItems == true)
+                    {
+                        ChartLegendItem likeItem = FindLikeItems(list, item);
+
+                        if (likeItem == null)
+                        {
+                            item.ChartControl = ChartControl;
+
+                            likeItem = new ChartLegendItem();
+
+                            likeItem.Parent = legend;
+                            likeItem.ChartControl = ChartControl;
+
+                            likeItem.Name = item.Name;
+                            likeItem.ItemText = item.ItemText;
+                            likeItem.IsEnabled = item.IsEnabled;
+
+                            list.Add(likeItem);
+                        }
+
+                        item.LikeItem = likeItem;
+
+                        likeItem.ChartItems.AddRange(item.ChartItems);
+                    }
+                    else
+                    {
+                        list.Add(item);
+                    }
+                }
+            }
+        }
+
+        #region FindLikeItems
+
+        private ChartLegendItem FindLikeItems(List<ChartLegendItem> list, ChartLegendItem item)
+        {
+            string itemName = item.Name ?? item.ItemText;
+
+            if (String.IsNullOrEmpty(itemName) == false)
+            {
+                foreach (ChartLegendItem likeItem in list)
+                {
+                    string likeName = likeItem.Name ?? likeItem.ItemText;
+
+                    if (String.IsNullOrEmpty(likeName) == false)
+                    {
+                        if (likeName.Equals(itemName) == true)
+                            return (likeItem);
+                    }
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region GetLegendItemColorEx
+
+        internal override Color GetLegendItemColorEx()
+        {
+            return (Color.Empty);
+        }
+
+        #endregion
+
+        #region RenderLegendItemMarkerEx
+
+        internal override void RenderLegendItemMarkerEx(
+            Graphics g, ChartLegendItem litem, ChartLegendItemVisualStyle style)
+        {
+            Rectangle bounds = litem.MarkerBounds;
+
+            bounds.Width--;
+            bounds.Height--;
+
+            Color color = GetLegendItemColor();
+
+            using (GraphicsPath path = new GraphicsPath())
+            {
+                path.AddEllipse(bounds);
+
+                using (Brush br = new SolidBrush(color))
+                    g.FillPath(br, path);
+            }
+        }
+
+        #endregion
+
+        #region TrackLegendItem
+
+        /// <summary>
+        /// Gets whether legend item tracking is enabled.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool TrackLegendItem
+        {
+            get
+            {
+                PieChart pieChart = Parent as PieChart;
+
+                if (pieChart != null)
+                {
+                    return (pieChart.Legend.TrackingMode == LegendTrackingMode.ChartAndLegend ||
+                        pieChart.Legend.TrackingMode == LegendTrackingMode.Legend);
+                }
+
+                return (false);
+            }
+        }
+
+        #endregion
+
+        #region FormatItemText
+
+        /// <summary>
+        /// Formats the provided item text.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public string FormatItemText(string text)
+        {
+            return (text);
+        }
+
+        #endregion
+
+        #region OnCheckStateChanged
+
+        internal override void OnCheckStateChanged()
+        {
+            if (LegendItem != null)
+                LegendItem.UpdateCheckState();
+
+            foreach (PieRing pieRing in PieRings)
+            {
+                if (pieRing.LegendItem != null)
+                {
+                    pieRing.LegendItem.IsEnabled = pieRing.IsEnabled;
+                }
+                else
+                {
+                    foreach (PieSeriesPoint psp in pieRing.Psps)
+                    {
+                        if (psp.LegendItem != null)
+                            psp.LegendItem.IsEnabled = psp.IsEnabled;
+                    }
+                }
+            }
+
+            base.OnCheckStateChanged();
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Copy/CopyTo
+
+        public override ChartVisualElement Copy()
+        {
+            ChartSeries copy = new ChartSeries();
+
+            CopyTo(copy);
+
+            return (copy);
+        }
+
+        public override void CopyTo(ChartVisualElement copy)
+        {
+            PieSeries c = copy as PieSeries;
+
+            if (c != null)
+            {
+                base.CopyTo(c);
+
+                c.CenterFirstSlice = CenterFirstSlice;
+
+                if (_CustomPalette != null)
+                {
+                    c.CustomPalette = new Color[CustomPalette.Length];
+
+                    CustomPalette.CopyTo(c.CustomPalette, 0);
+                }
+
+                c.EnableDragDetach = EnableDragDetach;
+                c.ExplodedMargin = ExplodedMargin;
+
+                c.MouseClickSliceAction = MouseClickSliceAction;
+                c.MouseDoubleClickSliceAction = MouseDoubleClickSliceAction;
+
+                c.PaletteGroup = PaletteGroup;
+                c.PieSelectionMode = PieSelectionMode;
+                c.ReversePaletteColors = ReversePaletteColors;
+                c.RingWeight = RingWeight;
+
+                c.SubSliceVisualLayout = (_SliceVisualLayout != null) ? _SliceVisualLayout.Copy() : null;
+
+                foreach (PieSeriesPoint psp in SeriesPoints)
+                    c.SeriesPoints.Add(psp.Copy());
+
+                c.ShowAllRings = ShowAllRings;
+                c.ShowOtherSlice = ShowOtherSlice;
+
+                c.SubSliceVisualLayout = (_SliceVisualLayout != null) ? SubSliceVisualLayout.Copy() : null;
+            }
+        }
+
+        #endregion
+
+        #region GetSerialData
+
+        internal override SerialElementCollection GetSerialData(string serialName)
+        {
+            SerialElementCollection sec = new SerialElementCollection();
+
+            if (serialName != null)
+            {
+                if (serialName.Equals("") == true)
+                    serialName = "PieSeries";
+
+                sec.AddStartElement(serialName);
+            }
+
+            sec.AddValue("CenterFirstSlice", CenterFirstSlice, Tbool.NotSet);
+
+            if (_CustomPalette != null && _CustomPalette.Length > 0)
+            {
+                sec.AddStartElement("CustomPalette count=\"" + _CustomPalette.Length + "\"");
+
+                foreach (Color color in _CustomPalette)
+                    sec.AddValue("PaletteColor", color);
+
+                sec.AddEndElement("CustomPalette");
+            }
+
+            sec.AddValue("EnableDragDetach", EnableDragDetach, Tbool.NotSet);
+            sec.AddValue("ExplodedMargin", ExplodedMargin, double.NaN);
+
+            sec.AddValue("MouseClickSliceAction", MouseClickSliceAction, MouseClickSliceAction.NotSet);
+            sec.AddValue("MouseDoubleClickSliceAction", MouseDoubleClickSliceAction, MouseDoubleClickSliceAction.NotSet);
+
+            sec.AddValue("PaletteGroup", PaletteGroup, PaletteGroup.NotSet);
+            sec.AddValue("PieSelectionMode", PieSelectionMode, PieSelectionMode.NotSet);
+            sec.AddValue("ReversePaletteColors", ReversePaletteColors, false);
+            sec.AddValue("RingWeight", RingWeight, 100);
+
+            if (_SeriesPoints != null)
+            {
+                PieSeriesPointCollection spc = _SeriesPoints;
+
+                if (spc.Count > 0)
+                {
+                    sec.AddStartElement("SeriesPoints count=\"" + spc.Count + "\"");
+
+                    foreach (PieSeriesPoint psp in spc)
+                        sec.AddElement(psp.GetSerialData());
+
+                    sec.AddEndElement("SeriesPoints");
+                }
+            }
+
+            sec.AddValue("ShowAllRings", ShowAllRings, Tbool.NotSet);
+            sec.AddValue("ShowOtherSlice", ShowOtherSlice, Tbool.NotSet);
+
+            if (_SliceVisualLayout != null)
+                sec.AddElement(_SliceVisualLayout.GetSerialData(true));
+
+            sec.AddElement(base.GetSerialData(null));
+
+            if (serialName != null)
+                sec.AddEndElement(serialName);
+
+            return (sec);
+        }
+
+        #endregion
+
+        #region PutSerialData
+
+        #region ProcessValue
+
+        internal override void ProcessValue(SerialElement se)
+        {
+            ChartXy chartXy = Parent as ChartXy;
+
+            switch (se.Name)
+            {
+                case "CenterFirstSlice":
+                    CenterFirstSlice = (Tbool)se.GetValueEnum(typeof(Tbool));
+                    break;
+
+                case "EnableDragDetach":
+                    EnableDragDetach = (Tbool)se.GetValueEnum(typeof(Tbool));
+                    break;
+
+                case "ExplodedMargin":
+                    ExplodedMargin = double.Parse(se.StringValue);
+                    break;
+
+                case "MouseClickSliceAction":
+                    MouseClickSliceAction = (MouseClickSliceAction)se.GetValueEnum(typeof(MouseClickSliceAction));
+                    break;
+
+                case "MouseDoubleClickSliceAction":
+                    MouseDoubleClickSliceAction = (MouseDoubleClickSliceAction)se.GetValueEnum(typeof(MouseDoubleClickSliceAction));
+                    break;
+
+                case "PaletteColor":
+                    CustomPalette[se.ValueIndex] = se.GetValueColor();
+                    break;
+
+                case "PaletteGroup":
+                    PaletteGroup = (PaletteGroup)se.GetValueEnum(typeof(PaletteGroup));
+                    break;
+
+                case "PieSelectionMode":
+                    PieSelectionMode = (PieSelectionMode)se.GetValueEnum(typeof(PieSelectionMode));
+                    break;
+
+                case "ReversePaletteColors":
+                    ReversePaletteColors = bool.Parse(se.StringValue);
+                    break;
+
+                case "RingWeight":
+                    RingWeight = int.Parse(se.StringValue);
+                    break;
+
+                case "ShowAllRings":
+                    ShowAllRings = (Tbool)se.GetValueEnum(typeof(Tbool));
+                    break;
+
+                case "ShowOtherSlice":
+                    ShowOtherSlice = (Tbool)se.GetValueEnum(typeof(Tbool));
+                    break;
+
+                default:
+                    base.ProcessValue(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region ProcessCollection
+
+        internal override void ProcessCollection(SerialElement se)
+        {
+            SerialElementCollection sec = se.Sec;
+
+            switch (se.Name)
+            {
+                case "CustomPalette":
+                    if (se.ArrayCount > 0)
+                    {
+                        CustomPalette = new Color[se.ArrayCount];
+
+                        sec.PutSerialData(this);
+                    }
+                    break;
+
+                case "SeriesPoint":
+                    PieSeriesPoint psp = new PieSeriesPoint();
+
+                    sec.PutSerialData(psp);
+
+                    SeriesPoints.Add(psp);
+                    break;
+
+                case "SeriesPoints":
+                    if (se.ArrayCount > 0)
+                    {
+                        SeriesPoints = new PieSeriesPointCollection();
+
+                        sec.PutSerialData(this);
+                    }
+                    break;
+
+                case "SliceVisualLayout":
+                    sec.PutSerialData(SubSliceVisualLayout);
+                    break;
+
+                default:
+                    base.ProcessCollection(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Series States
+
+        [Flags]
+        private enum States : uint
+        {
+            FilterIgnoreMatchCase = (1U << 0),
+
+            IsSorted = (1U << 1),
+            IsRotated = (1U << 2),
+
+            StackQualitativePoints = (1U << 3),
+            DisplayLinePointsOnTop = (1U << 4),
+
+            EnableEmptyValues = (1U << 5),
+            ShowEmptyLines = (1U << 6),
+            ShowEmptyPoints = (1U << 7),
+            ShowOriginValueLabels = (1U << 8),
+            ShowHiLoBarMedianLines = (1U << 9),
+
+            NeedToUpdateBindings = (1U << 10),
+
+            IsInnerRingSeries = (1U << 11),
+            IsOuterRingSeries = (1U << 12),
+
+            IsOffset = (1U << 13),
+            IsDetached = (1U << 14),
+
+            ShowInnerRingsEx = (1U << 15),
+            ReversePaletteColors = (1U << 16),
+        }
+
+        #region TestState
+
+        private bool TestState(States state)
+        {
+            return ((_States & state) == state);
+        }
+
+        #endregion
+
+        #region SetState
+
+        private void SetState(States state, bool value)
+        {
+            if (value == true)
+                _States |= state;
+            else
+                _States &= ~state;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IDisposable
+
+        public override void Dispose()
+        {
+            Visible = false;
+
+            SeriesPoints = null;
+            SubSliceVisualLayout = null;
+
+            base.Dispose();
+        }
+
+        #endregion
+    }
+
+    #region WordPos
+
+    internal class WordPos
+    {
+        public string Text;
+
+        public int Index;
+        public int Length;
+    }
+
+    #endregion
+
+    #region WordPosLine
+
+    internal class WordPosLine
+    {
+        public double ArcWidth;
+        public double LineWidth;
+        public double Offset;
+
+        public List<WordPos> Wps = new List<WordPos>();
+    }
+
+    #endregion
+
+    #region enums
+
+    #region SliceRenderType
+
+    public enum SliceRenderType
+    {
+        /// <summary>
+        /// Full slice.
+        /// </summary>
+        FullSlice,
+
+        /// <summary>
+        /// Extent slice (partial slice).
+        /// </summary>
+        ExtentSlice,
+
+        /// <summary>
+        /// Extentwhitespace.
+        /// </summary>
+        ExtentWhitespace,
+
+        /// <summary>
+        /// 'Other' slice whitespace.
+        /// </summary>
+        OtherWhitespace,
+    }
+
+    #endregion
+
+    #region ExtentFillRange
+
+    public enum ExtentFillRange
+    {
+        /// <summary>
+        /// Not set (default is ByPoint)
+        /// </summary>
+        NotSet = 0,
+
+        /// <summary>
+        /// Extents are filled according to each individual
+        /// PieSeriesPoint extent value.
+        /// </summary>
+        ByPoint,
+
+        /// <summary>
+        /// Extents are filled according to the slice
+        /// maximum extent value.
+        /// </summary>
+        BySlice,
+
+        /// <summary>
+        /// Extents are filled according to the associated
+        /// PieRing maximum extent value.
+        /// </summary>
+        ByRing,
+    }
+
+    #endregion
+
+    #region SliceImageCropMode
+
+    public enum SliceImageCropMode
+    {
+        NotSet = -1,
+
+        NoAction,
+        ClipImage,
+        HideImage,
+    }
+
+    #endregion
+
+    #region SliceImageRadiusAnchor
+
+    /// <summary>
+    /// Defines the anchor for the slice image (ie. the image's bounding edge).
+    /// </summary>
+    public enum SliceImageRadiusAnchor
+    {
+        /// <summary>
+        /// NotSet
+        /// </summary>
+        NotSet = -1,
+
+        /// <summary>
+        /// The pie InnerRadius will be the anchor. 
+        /// </summary>
+        InnerRadius,
+
+        /// <summary>
+        /// The pie ExtentRadius will be the anchor. The 'ExtentRadius' denotes
+        /// how far the slice extends out from the slice center - which may not
+        /// be as far as the OuterRadius (specified by the ValuesY[1] value).
+        /// </summary>
+        ExtentRadius,
+
+        /// <summary>
+        /// The pie OuterRadius will be the anchor. 
+        /// </summary>
+        OuterRadius,
+    }
+
+    #endregion
+
+    #region PieRefLineDisplayMode
+
+    [Flags]
+    /// <summary>
+    /// Defines the type of ReferenceLine to display.
+    /// </summary>
+    public enum PieRefLineDisplayMode
+    {
+        /// <summary>
+        /// NotSet
+        /// </summary>
+        NotSet = 0,
+
+        /// <summary>
+        /// No Reference lines
+        /// </summary>
+        None = (1 << 0),
+
+        /// <summary>
+        /// Extent Average Line. 
+        /// </summary>
+        ExtentAverage = (1 << 3),
+
+        /// <summary>
+        /// Extent Minimum Line.
+        /// </summary>
+        ExtentMaximum = (1 << 2),
+
+        /// <summary>
+        /// Extent Minimum Line.
+        /// </summary>
+        ExtentMinimum = (1 << 1),
+
+        /// <summary>
+        /// Outer Extent Line.
+        /// </summary>
+        ExtentOuterRadius = (1 << 4),
+
+        /// <summary>
+        /// All User defined Lines.
+        /// </summary>
+        UserDefined = (1 << 5),
+    }
+
+    #endregion
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/RadialChart/RadialAlign.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/RadialChart/RadialAlign.cs
new file mode 100644
index 00000000..27083fda
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/RadialChart/RadialAlign.cs	
@@ -0,0 +1,614 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using DevComponents.DotNetBar.Charts.Style;
+
+namespace DevComponents.DotNetBar.Charts
+{
+    class RadialAlign
+    {
+        #region Private variables
+
+        private List<PieLabel> _PieLabels;
+	
+        #endregion
+
+        public RadialAlign(List<PieLabel> pieLabels)
+        {
+            _PieLabels = pieLabels;
+
+            foreach (PieLabel pl in _PieLabels)
+                pl.Bounds = Rectangle.Empty;
+        }
+
+        #region Iterate
+
+        public bool Iterate(Graphics g, PieChart pieChart, Rectangle bounds)
+        {
+            if (_PieLabels.Count > 0)
+            {
+                PositionLabels(pieChart, bounds);
+
+                List<PieLabel>[] plist = SortLabels();
+
+                for (int i = 0; i < plist.Length; i++)
+                {
+                    List<PieLabel> pls = plist[i];
+
+                    if (pls.Count > 0)
+                    {
+                        if (IsAnyOverlap(pieChart, pls) == true)
+                        {
+                            AdjustDownwards(pieChart, pls, bounds);
+
+                            if (IsAnyOverlap(pieChart, pls) == true)
+                                AdjustUpwards(pieChart, pls, bounds);
+                        }
+
+                        AdjustLabelSizes(g, pieChart, pls, bounds);
+
+                        if (IsAnyOverlap(pieChart, pls) == true)
+                        {
+                            AdjustDownwards(pieChart, pls, bounds);
+
+                            if (IsAnyOverlap(pieChart, pls) == true)
+                                AdjustUpwards(pieChart, pls, bounds);
+                        }
+
+                        if (pieChart.SliceLabelOverlapMode != SliceLabelOverlapMode.ShowOverlapping)
+                        {
+                            if (IsAnyOverlap(pieChart, pls) == true)
+                                HideOverLapping(pls, bounds);
+                        }
+
+                        UpdateBoxPoints(pieChart, pls);
+                    }
+                }
+            }
+
+            return (true);
+        }
+
+        #region PositionLabels
+
+        private void PositionLabels(PieChart pieChart, Rectangle bounds)
+        {
+            foreach (PieLabel pl in _PieLabels)
+            {
+                PieSeriesPoint psp = pl.PieSeriesPoint;
+                PieSeriesPointCollection spc = psp.Parent as PieSeriesPointCollection;
+
+                if (spc != null)
+                {
+                    bool showWhiteSpace = psp.ShowSliceWhiteSpaceEx;
+
+                    int width = psp.OuterRadius - psp.InnerRadius;
+
+                    int outerRadius = (psp.ShowSliceWhiteSpaceEx == true)
+                        ? psp.OuterRadius : (int)(psp.InnerRadius + psp.SliceExtent * width);
+
+                    pl.LabelStyle = psp.GetEffectiveSliceStyle(pieChart, psp.ChartSeries).SliceOuterLabelStyle;
+
+                    pl.OuterRadius = outerRadius;
+                    pl.Radius = outerRadius + pl.LabelStyle.ConnectorLength;
+
+                    UpdateBoundingRect(pieChart, psp, pl, psp.CenterAngle);
+                }
+            }
+
+            AdjustForChartBounds(pieChart, _PieLabels);
+        }
+
+        #region UpdateBoundingRect
+
+        private void UpdateBoundingRect(PieChart pieChart, PieSeriesPoint psp, PieLabel pl, double angle)
+        {
+            pl.PtSliceEdge = psp.GetRayEndPoint(angle, pl.OuterRadius);
+
+            Point pt = psp.GetRayEndPoint(angle, pl.Radius);
+
+            Rectangle r = new Rectangle(pt, pl.LabelSize);
+            r.Y -= (r.Size.Height / 2);
+
+            angle = (angle + 360000) % 360;
+
+            int n = (pl.LabelStyle.DrawConnector == Tbool.True)
+                ? Dpi.Width(pl.LabelStyle.ConnectorTickLength) : 0;
+
+            r.X += ((angle >= 270 || angle <= 90) ? n : -(r.Size.Width + n));
+
+            pl.Bounds = r;
+
+            AdjustForPieIntersect(pl);
+        }
+
+        #region AdjustForPieIntersect
+
+        private void AdjustForPieIntersect(PieLabel pl)
+        {
+            PieSeriesPoint psp = pl.PieSeriesPoint;
+
+            Point pto = GetClosestOffset(psp.SliceCenter, pl.Bounds);
+
+            Point ptr = psp.SliceCenter;
+            ptr.X += pto.X;
+            ptr.Y += pto.Y;
+
+            if (Intersects(psp, ptr, pl) == true)
+            {
+                Rectangle r = pl.Bounds;
+
+                double ihyp = Math.Sqrt(pto.X * pto.X + pto.Y * pto.Y);
+                double ohyp = (psp.OuterRadius + pl.LabelStyle.LabelMargin) - ihyp;
+
+                double scale = ohyp / ihyp;
+
+                int dx = (int)(pto.X * scale);
+                int dy = (int)(pto.Y * scale);
+
+                r.X += dx;
+                r.Y += dy;
+
+                pl.Bounds = r;
+            }
+        }
+
+        #region GetClosestOffset
+
+        private Point GetClosestOffset(Point ptc, Rectangle r)
+        {
+            Point pt = new Point();
+
+            int dx1 = r.X - ptc.X;
+            int dx2 = r.Right - ptc.X;
+
+            int dy1 = r.Y - ptc.Y;
+            int dy2 = r.Bottom - ptc.Y;
+
+            pt.X = Math.Abs(dx1) < Math.Abs(dx2) ? dx1 : dx2;
+            pt.Y = Math.Abs(dy1) < Math.Abs(dy2) ? dy1 : dy2;
+
+            return (pt);
+        }
+
+        #endregion
+
+        #region Intersects
+
+        private bool Intersects(
+            PieSeriesPoint psp, Point ptr, PieLabel pl)
+        {
+            int radius = psp.OuterRadius + pl.LabelStyle.LabelMargin;
+
+            int dx = psp.SliceCenter.X - ptr.X;
+            int dy = psp.SliceCenter.Y - ptr.Y;
+
+            float dsq = (dx * dx) + (dy * dy);
+
+            return (dsq < (radius * radius));
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region AdjustForChartBounds
+
+        private void AdjustForChartBounds(PieChart pieChart, List<PieLabel> pls)
+        {
+            Rectangle r = pieChart.ContentBoundsEx;
+
+            for (int i = 0; i < pls.Count; i++)
+            {
+                PieLabel pl = pls[i];
+
+                if (pl.Bounds.IsEmpty == false)
+                {
+                    int margin = Dpi.Width(pl.LabelStyle.LabelMargin);
+
+                    if (pl.Bounds.Bottom + margin > r.Bottom)
+                    {
+                        Rectangle t = pl.Bounds;
+                        t.Y = (r.Bottom - t.Height - margin);
+                        pl.Bounds = t;
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region SortLabels
+
+        private List<PieLabel>[] SortLabels()
+        {
+            List<PieLabel>[] plist = new List<PieLabel>[2];
+
+            plist[0] = new List<PieLabel>();
+            plist[1] = new List<PieLabel>();
+
+            foreach (PieLabel pl in _PieLabels)
+            {
+                double angle = pl.PieSeriesPoint.CenterAngle % 360;
+
+                pl.IsRightlabel = (angle >= 270 || angle <= 90);
+
+                if (pl.IsRightlabel == true)
+                    plist[1].Add(pl);
+                else
+                    plist[0].Add(pl);
+            }
+
+            plist[0].Sort(new PieLabelYComparer());
+            plist[1].Sort(new PieLabelYComparer());
+
+            return (plist);
+        }
+
+        #region PieLabelYComparer
+
+        private class PieLabelYComparer : IComparer<PieLabel>
+        {
+            public int Compare(PieLabel pl1, PieLabel pl2)
+            {
+                return (pl1.PtSliceEdge.Y - pl2.PtSliceEdge.Y);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IsAnyOverlap
+
+        private bool IsAnyOverlap(PieChart pieChart, List<PieLabel> pls)
+        {
+            if (pls.Count <= 0)
+                return (false);
+
+            PieSeriesPoint psp = pls[0].PieSeriesPoint;
+
+            if (psp.SliceLabelVisibilityEx == SliceLabelVisibility.SliceMouseOver)
+                return (false);
+
+            int maxy = 0;
+
+            for (int i = 0; i < pls.Count; i++)
+            {
+                PieLabel pl = pls[i];
+
+                if (pl.Bounds.IsEmpty == false)
+                {
+                    if (maxy > pl.Bounds.Y)
+                        return (IsAnyOverlapEx(pieChart, pls));
+
+                    int margin = Dpi.Width(pl.LabelStyle.LabelMargin);
+
+                    if (pl.Bounds.Bottom + margin > maxy)
+                        maxy = pl.Bounds.Bottom + margin;
+                }
+            }
+
+            return (false);
+        }
+
+        #region IsAnyOverlapEx
+
+        private bool IsAnyOverlapEx(PieChart pieChart, List<PieLabel> pls)
+        {
+            for (int i = 0; i < pls.Count; i++)
+            {
+                PieLabel pl = pls[i];
+
+                if (pl.Bounds.IsEmpty == false)
+                {
+                    int margin = pl.LabelStyle.LabelMargin;
+
+                    Rectangle r = pl.Bounds;
+                    r.Inflate(margin, margin);
+
+                    for (int j = i + 1; j < pls.Count; j++)
+                    {
+                        PieLabel pl2 = pls[j];
+
+                        if (r.IntersectsWith(pl2.Bounds) == true)
+                            return (true);
+                    }
+                }
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region HideOverLapping
+
+        private void HideOverLapping(List<PieLabel> pls, Rectangle bounds)
+        {
+            for (int i = 0; i < pls.Count; i++)
+            {
+                PieLabel pl = pls[i];
+
+                if (pl.Bounds.IsEmpty == false)
+                {
+                    for (int j = i + 1; j < pls.Count; j++)
+                    {
+                        PieLabel pl2 = pls[j];
+
+                        if (pl.Bounds.IntersectsWith(pl2.Bounds) == true)
+                            pl2.Bounds = Rectangle.Empty;
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region AdjustUpwards
+
+        private void AdjustUpwards(PieChart pieChart, List<PieLabel> pls, Rectangle bounds)
+        {
+            for (int i = pls.Count - 1; i > 0; i--)
+            {
+                PieLabel pl0 = pls[i];
+                PieLabel pl1 = pls[i - 1];
+
+                int margin = Dpi.Width(pl0.LabelStyle.LabelMargin);
+
+                Rectangle t = pl0.Bounds;
+                t.Inflate(margin, margin);
+
+                if (pl1.Bounds.Bottom > t.Y)
+                {
+                    if ((pl1.Bounds.X < t.Right) && (t.X < pl1.Bounds.Right))
+                    {
+                        Rectangle r = pl1.Bounds;
+
+                        r.Y = Math.Max(bounds.Y + margin, pl0.Bounds.Y - pl1.Bounds.Height - margin);
+
+                        pl1.Bounds = r;
+
+                        AdjustForPieIntersect(pl1);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region AdjustDownwards
+
+        private void AdjustDownwards(PieChart pieChart, List<PieLabel> pls, Rectangle bounds)
+        {
+            for (int i = 0; i < pls.Count - 1; i++)
+            {
+                PieLabel pl0 = pls[i];
+                PieLabel pl1 = pls[i + 1];
+
+                int margin = Dpi.Width(pl0.LabelStyle.LabelMargin) + 4;
+
+                Rectangle t = pl0.Bounds;
+                t.Inflate(margin, margin);
+
+                if (pl1.Bounds.Bottom < t.Bottom)
+                {
+                    if ((pl1.Bounds.X < t.Right) && (t.X < pl1.Bounds.Right))
+                    {
+                        Rectangle r = pl1.Bounds;
+
+                        r.Y = Math.Min(bounds.Bottom - r.Height - margin, t.Bottom);
+
+                        pl1.Bounds = r;
+
+                        AdjustForPieIntersect(pl1);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region AdjustSpread
+
+        private void AdjustSpread(List<PieLabel> pls, Rectangle bounds)
+        {
+            int height = 0;
+
+            for (int i = 0; i < pls.Count; i++)
+                height += pls[i].Bounds.Height;
+
+            int margin = bounds.Height - height;
+
+            if (pls.Count > 1)
+                margin /= (pls.Count - 1);
+
+            int y = bounds.Y;
+
+            for (int i = 0; i < pls.Count; i++)
+            {
+                PieLabel pl = pls[i];
+
+                Rectangle r = pl.Bounds;
+
+                r.Y = y;
+                pl.Bounds = r;
+
+                y = (pl.Bounds.Bottom + margin);
+
+                AdjustForPieIntersect(pl);
+            }
+        }
+
+        #endregion
+
+        #region AdjustLabelSizes
+
+        private void AdjustLabelSizes(Graphics g,
+            PieChart pieChart, List<PieLabel> pls, Rectangle bounds)
+        {
+            Rectangle r = pieChart.ContentBoundsEx;
+
+            foreach (PieLabel pl in pls)
+            {
+                PieSeriesPoint psp = pl.PieSeriesPoint;
+
+                ChartSliceVisualStyle sstyle =
+                    psp.GetEffectiveSliceStyle(pieChart, psp.ChartSeries);
+
+                Rectangle t = GetChartBounds(pieChart, pl);
+
+                if (pl.LabelSize.Width != t.Width)
+                {
+                    PieSeries series = psp.ChartSeries;
+
+                    Size size = series.MeasurePieLabel(g,
+                        pieChart, psp, pl, t.Width, sstyle.SliceOuterLabelStyle);
+
+                    if (size != pl.Bounds.Size)
+                    {
+                        if (t.X != pl.Bounds.X && size.Width < t.Size.Width)
+                            t.X += (t.Size.Width - size.Width);
+
+                        if (size.Height > t.Size.Height)
+                            t.Y -= (size.Height - t.Size.Height) / 2;
+
+                        t.Size = size;
+                    }
+
+                    pl.Bounds = t;
+
+                    AdjustForPieIntersect(pl);
+                }
+            }
+        }
+
+        #region GetChartBounds
+
+        private Rectangle GetChartBounds(PieChart pieChart, PieLabel pl)
+        {
+            Rectangle r = pl.Bounds;
+
+            r.Inflate(4, 4);
+
+            if (r.X < pieChart.ContentBoundsEx.X)
+            {
+                r.Width -= (pieChart.ContentBoundsEx.X - r.X);
+                r.X = pieChart.ContentBoundsEx.X;
+
+                if (r.Width <= 0)
+                    return (Rectangle.Empty);
+            }
+
+            if (r.Right >= pieChart.ContentBoundsEx.Right)
+            {
+                r.Width -= (r.Right - pieChart.ContentBoundsEx.Right + 1);
+
+                if (r.Width <= 0)
+                    return (Rectangle.Empty);
+            }
+
+            if (r.Y < pieChart.ContentBoundsEx.Y)
+            {
+                r.Height -= (pieChart.ContentBoundsEx.Y - r.Y);
+                r.Y = pieChart.ContentBoundsEx.Y;
+
+                if (r.Height <= 0)
+                    return (Rectangle.Empty);
+            }
+
+            if (r.Bottom >= pieChart.ContentBoundsEx.Bottom)
+            {
+                int n = (r.Bottom - pieChart.ContentBoundsEx.Bottom + 1);
+
+                r.Y -= n;
+                r.Width++;
+
+                if (r.Height <= 0)
+                    return (Rectangle.Empty);
+            }
+
+            r.Inflate(-4, -4);
+
+            return (r);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region UpdateBoxPoints
+
+        private void UpdateBoxPoints(PieChart pieChart, List<PieLabel> pls)
+        {
+            foreach (PieLabel pl in pls)
+            {
+                Rectangle t = new Rectangle();
+
+                Rectangle r = pl.Bounds;
+
+                if (r.IsEmpty == false)
+                {
+                    if (pl.LabelStyle.DrawConnector == Tbool.True)
+                    {
+                        int tick = pl.LabelStyle.ConnectorTickLength;
+
+                        if (pl.IsLeftlabel == true)
+                        {
+                            pl.PtBoxEdge = new Point(r.Right, r.Y + r.Height / 2);
+                            pl.PtBoxBend = new Point(pl.PtBoxEdge.X + tick, pl.PtBoxEdge.Y);
+                        }
+                        else
+                        {
+                            pl.PtBoxEdge = new Point(r.X, r.Y + r.Height / 2);
+                            pl.PtBoxBend = new Point(pl.PtBoxEdge.X - tick, pl.PtBoxEdge.Y);
+                        }
+
+                        Point ptMin = new Point();
+                        Point ptMax = new Point();
+
+                        if (pl.PtBoxEdge.X < pl.PtSliceEdge.X)
+                        {
+                            ptMin.X = pl.PtBoxEdge.X;
+                            ptMax.X = pl.PtSliceEdge.X;
+                        }
+                        else
+                        {
+                            ptMin.X = pl.PtSliceEdge.X;
+                            ptMax.X = pl.PtBoxEdge.X;
+                        }
+
+                        if (pl.PtBoxEdge.Y < pl.PtSliceEdge.Y)
+                        {
+                            ptMin.Y = pl.PtBoxEdge.Y;
+                            ptMax.Y = pl.PtSliceEdge.Y;
+                        }
+                        else
+                        {
+                            ptMin.Y = pl.PtSliceEdge.Y;
+                            ptMax.Y = pl.PtBoxEdge.Y;
+                        }
+
+                        t.Location = ptMin;
+                        t.Width = ptMax.X - ptMin.X + 1;
+                        t.Height = ptMax.Y - ptMin.Y + 1;
+                    }
+                }
+
+                pl.Bounds = r;
+                pl.ConnectorBounds = t;
+            }
+        }
+
+        #endregion
+
+        #endregion
+    }
+}
+
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/SeriesPoints.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/SeriesPoints.cs
new file mode 100644
index 00000000..133da031
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/SeriesPoints.cs	
@@ -0,0 +1,5681 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.ComponentModel.Design;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Drawing.Drawing2D;
+using System.Globalization;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.Charts.Style;
+
+namespace DevComponents.DotNetBar.Charts
+{
+    [Editor("DevComponents.Charts.Design.PieSeriesPointCollectionEditor, DevComponents.Charts.Design, " +
+        "Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(UITypeEditor))]
+    public class PieSeriesPointCollection : CustomNamedCollection<PieSeriesPoint>
+    {
+        #region Private variables
+
+        private ISeriesPointContainer _Parent;
+
+        private PieSeriesPointCollection _PieSlices;
+        private PieSeriesPointCollection _OtherSlices;
+
+        private PieSeriesPoint _OtherSlicePsp;
+
+        private double _PieTotal;
+
+        private double _PieMinExtent;
+        private double _PieMaxExtent;
+        private double _PieOuterExtent;
+        private double _PieTotalExtent;
+
+        private double _PieAverage;
+        private double _PieAverageExtent;
+
+        private PieRing _PieRing;
+
+        private States _States;
+
+        #endregion
+
+        #region Public properties
+
+        #region IsOther
+
+        /// <summary>
+        /// Gets whether the PieSeriesPoint is the 'Other' slice collection.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsOther
+        {
+            get { return (TestState(States.Other)); }
+            internal set { SetState(States.Other, value); }
+        }
+
+        #endregion
+
+        #region OtherSlicePsp
+
+        /// <summary>
+        /// Gets the 'Other' slice PieSeriesPoint.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public PieSeriesPoint OtherSlicePsp
+        {
+            get
+            {
+                if (_OtherSlicePsp == null)
+                    _OtherSlicePsp = new PieSeriesPoint("Other", null, null);
+
+                return (_OtherSlicePsp);
+            }
+        }
+
+        #endregion
+
+        #region OtherSlices
+
+        /// <summary>
+        /// Gets the 'Other' slice collection of SeriesPoints.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public PieSeriesPointCollection OtherSlices
+        {
+            get { return (_OtherSlices); }
+            internal set { _OtherSlices = value; }
+        }
+
+        #endregion
+
+        #region Parent
+
+        /// <summary>
+        /// Gets the parent of this item.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public ISeriesPointContainer Parent
+        {
+            get { return (_Parent); }
+            internal set { _Parent = value; }
+        }
+
+        #endregion
+
+        #region PieAverage
+
+        /// <summary>
+        /// Gets the average pie point 'value' (Y[0]) for the collection.
+        /// </summary>
+        /// <returns></returns>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public double PieAverage
+        {
+            get { return (_PieAverage); }
+            internal set { _PieAverage = value; }
+        }
+
+        #endregion
+
+        #region PieAverageExtent
+
+        /// <summary>
+        /// Gets the average extent for the collection.
+        /// </summary>
+        /// <returns></returns>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public double PieAverageExtent
+        {
+            get { return (_PieAverageExtent); }
+            internal set { _PieAverageExtent = value; }
+        }
+
+        #endregion
+
+        #region PieSlices
+
+        /// <summary>
+        /// Gets the collection of displayed Pie slices.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public PieSeriesPointCollection PieSlices
+        {
+            get { return (_PieSlices); }
+
+            internal set
+            {
+                if (_PieSlices != null)
+                    SetOtherHandler(false);
+
+                _PieSlices = value;
+
+                if (_PieSlices != null)
+                    SetOtherHandler(true);
+            }
+        }
+
+        #region SetOtherHandler
+
+        private void SetOtherHandler(bool notify)
+        {
+            PieSeriesPointCollection spc = _PieSlices;
+
+            foreach (PieSeriesPoint psp in spc)
+            {
+                if (psp.IsOther == true)
+                {
+                    SetPointNotify(psp, notify);
+
+                    break;
+                }
+            }
+        }
+
+        #region SetPointNotify
+
+        private void SetPointNotify(PieSeriesPoint psp, bool notify)
+        {
+            if (notify == true)
+            {
+                psp.Parent = this;
+                psp.PropertyChanged += Sp_PropertyChanged;
+            }
+            else
+            {
+                psp.Parent = null;
+                psp.PropertyChanged -= Sp_PropertyChanged;
+            }
+        }
+
+        #endregion
+
+        #region Sp_PropertyChanged
+
+        void Sp_PropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            VisualPropertyChangedEventArgs vce = e as VisualPropertyChangedEventArgs;
+
+            if (vce != null)
+            {
+                PieSeriesPoint psp = sender as PieSeriesPoint;
+
+                if (psp != null)
+                    psp.NotifyVisualParent(psp, vce.ChangeType);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region PieTotal
+
+        /// <summary>
+        /// Gets the sum total of the pie collection 'values' (Y[0]).
+        /// </summary>
+        /// <returns></returns>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public double PieTotal
+        {
+            get { return (_PieTotal); }
+            internal set { _PieTotal = value; }
+        }
+
+        #endregion
+
+        #region PieTotalExtent
+
+        /// <summary>
+        /// Gets the sum total of the collection 'extents' (Y[1]).
+        /// </summary>
+        /// <returns></returns>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public double PieTotalExtent
+        {
+            get { return (_PieTotalExtent); }
+            internal set { _PieTotalExtent = value; }
+        }
+
+        #endregion
+
+        #region VisibleCount
+
+        ///<summary>
+        /// Gets count of visible points in the collection.
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public int VisibleCount
+        {
+            get
+            {
+                int vcount = 0;
+
+                foreach (PieSeriesPoint psp in Items)
+                {
+                    if (psp.Visible == true)
+                        vcount++;
+                }
+
+                return (vcount);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region PieMaxExtent
+
+        internal double PieMaxExtent
+        {
+            get { return (_PieMaxExtent); }
+            set { _PieMaxExtent = value; }
+        }
+
+        #endregion
+
+        #region PieMinExtent
+
+        internal double PieMinExtent
+        {
+            get { return (_PieMinExtent); }
+            set { _PieMinExtent = value; }
+        }
+
+        #endregion
+
+        #region PieOuterExtent
+
+        internal double PieOuterExtent
+        {
+            get { return (_PieOuterExtent); }
+            set { _PieOuterExtent = value; }
+        }
+
+        #endregion
+
+        #region PieRing
+
+        internal PieRing PieRing
+        {
+            get { return (_PieRing); }
+            set { _PieRing = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ClearItems
+
+        protected override void ClearItems()
+        {
+            if (Parent is PieSeriesPoint)
+            {
+                for (int i = Items.Count - 1; i >= 0; i--)
+                    RemoveItem(i);
+            }
+            else
+            {
+                CheckReentrancy();
+
+                Items.Clear();
+
+                OnPropertyChanged(CountString);
+                OnPropertyChanged(ItemString);
+
+                OnCollectionReset();
+            }
+        }
+
+        #endregion
+
+        #region SetSelected
+
+        internal void SetSelected(bool select)
+        {
+            foreach (PieSeriesPoint psp in Items)
+            {
+                if (psp != null)
+                {
+                    psp.IsSelected = select;
+
+                    if (psp.SeriesPoints.PieSlices != null)
+                        psp.SeriesPoints.PieSlices.SetSelected(select);
+                }
+            }
+        }
+
+        #endregion
+
+        #region States
+
+        [Flags]
+        private enum States : uint
+        {
+            Other = (1 << 0),
+        }
+
+        #region TestState
+
+        private bool TestState(States state)
+        {
+            return ((_States & state) == state);
+        }
+
+        #endregion
+
+        #region SetState
+
+        private void SetState(States state, bool value)
+        {
+            if (value == true)
+                _States |= state;
+            else
+                _States &= ~state;
+        }
+
+        #endregion
+
+        #endregion
+    }
+
+    #region SliceVisualLayout
+
+    [TypeConverter(typeof(BlankExpandableObjectConverter))]
+    public class SliceVisualLayout : INotifyPropertyChanged, IProcessSerialElement, IDisposable
+    {
+        #region Private variables
+
+        private ChartVisualElement _Parent;
+
+        private double _AngleMargin = double.NaN;
+
+        private int _RingWeight = -1;
+
+        private int _MaxSlices = -1;
+        private int _MinExtent = -1;
+        private double _MinPercent = double.NaN;
+
+        private SliceLabelOrientation _InnerLabelOrientation = SliceLabelOrientation.NotSet;
+        private SliceLabelCropMode _SliceLabelCropMode = SliceLabelCropMode.NotSet;
+        private SliceLabelVisibility _SliceLabelVisibility = SliceLabelVisibility.NotSet;
+        private SliceLabelDisplayMode _SliceLabelDisplayMode = SliceLabelDisplayMode.NotSet;
+
+        private ChartSliceVisualStyles _SliceVisualStyles;
+        private ChartSliceVisualStyles _OtherSliceVisualStyles;
+
+        private Tbool _ShowSliceWhiteSpace = Tbool.NotSet;
+
+        private string _InnerSliceLabel;
+        private string _OuterSliceLabel;
+
+        private double _StartAngle = double.NaN;
+        private double _SweepAngle = double.NaN;
+        private SweepDirection _SweepDirection = SweepDirection.NotSet;
+
+        private string _ToolTipText;
+
+        private PieRefLineDisplayMode _RefLineDisplayMode = PieRefLineDisplayMode.NotSet;
+        private Tbool _ReferenceLineDisplayOnTop = Tbool.NotSet;
+
+        internal PieReferenceLineCollection _ReferenceLines;
+
+        #endregion
+
+        public SliceVisualLayout(ChartVisualElement parent)
+        {
+            _Parent = parent;
+        }
+
+        #region Public properties
+
+        #region AngleMargin
+
+        /// <summary>
+        /// Gets or sets the margin used to offset the angle at
+        /// which the slice sides are rendered. This can be used to
+        /// create a more 'wedge' shaped slice.
+        /// </summary>
+        [Description("Indicates the margin used to offset the angle at which the slice sides are rendered. This can be used to create a more 'wedge' shaped slice.")]
+        [DefaultValue(double.NaN)]
+        [Editor("DevComponents.Charts.Design.AngleMarginRangeValueEditor, DevComponents.Charts.Design, " +
+            "Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(UITypeEditor))]
+        public double AngleMargin
+        {
+            get { return (_AngleMargin); }
+
+            set
+            {
+                if (value != _AngleMargin)
+                {
+                    _AngleMargin = value;
+
+                    OnPropertyChangedEx("AngleMargin", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region InnerLabelOrientation
+
+        /// <summary>
+        /// Gets or sets the inner label orientation with respect to the slice.
+        /// </summary>
+        [Category("Behavior"), DefaultValue(SliceLabelOrientation.NotSet)]
+        [Description("Indicates the inner label orientation with respect to the slice.")]
+        public SliceLabelOrientation InnerLabelOrientation
+        {
+            get { return (_InnerLabelOrientation); }
+
+            set
+            {
+                if (value != _InnerLabelOrientation)
+                {
+                    _InnerLabelOrientation = value;
+
+                    OnPropertyChangedEx("InnerLabelOrientation", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region InnerSliceLabel
+
+        /// <summary>
+        /// Gets or sets the inner slice label for the pie slice. The label can be
+        /// straight text, or be comprised of text and formatting specifiers. The label
+        /// should be specified as (note that brackets denote optional elements):
+        /// "[text]{keyword[:format]}[text][{...}]".
+        /// 
+        /// Here are the formatting specifiers that can be used with both inner and
+        /// outer labels:
+        /// 
+        /// "AVG" "A" - Average (angular values).
+        /// "PCT" "P" - Percent of pie (angular values) - (.025 yields "2.5 %").
+        /// "TOT" "T" - Total of all values (angluar values).
+        /// "VAL" "V" - Value percent of pie (angular value) -  (.025 yields ".025").
+        ///
+        /// "AVGX" "AX" - Average (extent/radial values).
+        /// "PCTX" "PX" - Percent of pie (extent values) - (.025 yields "2.5 %").
+        /// "TOTX" "TX" - Total of all values (extent values).
+        /// "VALX" "VX" - Value percent of pie (extent value) -  (.025 yields ".025").
+        ///
+        /// "S" "SNAME" - Series name.
+        /// "X" - ValueX.
+        /// "Y", "Y0", "Yn" - ValueY values (where 'n' is index value).
+        ///
+        /// Example use:
+        /// 
+        /// "{S}\\n{X:yyyy} ({Y:##,##0} - {P:Y1})"
+        /// "Individual cost {Y:C} and average cost {AVG:C} of goods."
+        ///
+        /// </summary>
+        [DefaultValue(null), Category("Label")]
+        [Editor(typeof(MultilineStringEditor), typeof(UITypeEditor))]
+        [Description("Indicates the inner slice label for the pie slices (format specifiers {Keyword[:Format]} - " +
+            "S, X, Y, Y0-Yn, N, [A|AVG][X], [A|PCT][X], [A|TOT][X], [A|VAL][X]. e.g. \"{x:f2},{avg:##.##},{totx:c}\"")]
+        public string InnerSliceLabel
+        {
+            get { return (_InnerSliceLabel); }
+
+            set
+            {
+                if (String.Equals(value, _InnerSliceLabel) == false)
+                {
+                    _InnerSliceLabel = value;
+
+                    OnPropertyChangedEx("InnerSliceLabel", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region MaxSlices
+
+        /// <summary>
+        /// Gets or sets the maximum number of slices to represent in the pie. Any remaining values
+        /// are consolidated into the 'Other' slice, if shown, or are not displayed at all.
+        ///
+        /// The slices are counted in the order in which they are displayed. This order is
+        /// affected by the ReverseSlices property.
+        /// </summary>
+        [DefaultValue(-1), Category("Display")]
+        [Description("Indicates the maximum number of slices to represent in the pie. Any remaining values are consolidated into the 'Other' slice, if shown, or are not displayed at all.")]
+        public int MaxSlices
+        {
+            get { return (_MaxSlices); }
+
+            set
+            {
+                if (value != _MaxSlices)
+                {
+                    _MaxSlices = value;
+
+                    OnPropertyChangedEx("MaxSlices", VisualChangeType.Recalc);
+                }
+            }
+        }
+
+        #endregion
+
+        #region MinExtent
+
+        ///<summary>
+        /// Gets or sets the minimum extent for the collection.
+        ///</summary>
+        [DefaultValue(-1), Category("Display")]
+        [Description("Indicates the minimum extent for the collection.")]
+        public int MinExtent
+        {
+            get { return (_MinExtent); }
+
+            set
+            {
+                if (value != _MinExtent)
+                {
+                    _MinExtent = value;
+
+                    OnPropertyChangedEx("MinExtent", Style.VisualChangeType.Recalc);
+                }
+            }
+        }
+
+        #endregion
+
+        #region MinPercent
+
+        /// <summary>
+        /// Gets or sets the minimum percent-of-total represented in individual slices.
+        /// Values less than the MinPercent are either accumulated into the 'Other' slice, if shown,
+        /// or  left in the main pie display.
+        /// Range is 0–1.
+        /// </summary>
+        [DefaultValue(double.NaN), Category("Display")]
+        [Description("Indicates the minimum percent-of-total represented in individual slices. Values less than the MinPercent are accumulated into the 'Other' slice. Range is 0–1.")]
+        public double MinPercent
+        {
+            get { return (_MinPercent); }
+
+            set
+            {
+                if (value != _MinPercent)
+                {
+                    _MinPercent = value;
+
+                    OnPropertyChangedEx("MinPercent", VisualChangeType.Recalc);
+                }
+            }
+        }
+
+        #endregion
+
+        #region OtherSliceVisualStyles
+
+        /// <summary>
+        /// Gets or sets the default visual style for the series 'Other' slice.
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates the default visual style for the series 'Other' slice.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ChartSliceVisualStyles OtherSliceVisualStyles
+        {
+            get
+            {
+                if (_OtherSliceVisualStyles == null)
+                {
+                    _OtherSliceVisualStyles = new ChartSliceVisualStyles();
+
+                    StyleChangeHandler(null, _OtherSliceVisualStyles);
+                }
+
+                return (_OtherSliceVisualStyles);
+            }
+
+            set
+            {
+                if (_OtherSliceVisualStyles != value)
+                {
+                    ChartSliceVisualStyles oldValue = _OtherSliceVisualStyles;
+
+                    _OtherSliceVisualStyles = value;
+
+                    OnStyleChanged("OtherSliceVisualStyles", oldValue, value);
+
+                    if (oldValue != null)
+                        oldValue.Dispose();
+                }
+            }
+        }
+
+        #endregion
+
+        #region OuterSliceLabel
+
+        /// <summary>
+        /// Gets or sets the outer slice label for the pie slice.  See InnerSliceLabel for
+        /// further notes on Format Specifiers.
+        /// </summary>
+        [DefaultValue(null), Category("Label")]
+        [Editor(typeof(MultilineStringEditor), typeof(UITypeEditor))]
+        [Description("Indicates the inner slice label for the pie slices. See InnerSliceLabel for further notes on Format Specifiers.")]
+        public string OuterSliceLabel
+        {
+            get { return (_OuterSliceLabel); }
+
+            set
+            {
+                if (String.Equals(value, _OuterSliceLabel) == false)
+                {
+                    _OuterSliceLabel = value;
+
+                    OnPropertyChangedEx("OuterSliceLabel", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region Parent
+
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public ChartVisualElement Parent
+        {
+            get { return (_Parent); }
+
+            internal set
+            {
+                _Parent = value;
+
+                UpdateRelations();
+            }
+        }
+
+        #region UpdateRelations
+
+        private void UpdateRelations()
+        {
+            foreach (PieReferenceLine line in ReferenceLines)
+                line.Parent = _Parent;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ReferenceLineDisplayMode
+
+        /// <summary>
+        /// Gets or sets the type of pie reference lines to display.
+        /// </summary>
+        [Category("Appearance"), DefaultValue(PieRefLineDisplayMode.NotSet)]
+        [Description("Indicates the type of pie reference lines to display.")]
+        [Editor("DevComponents.Charts.Design.FlagsEnumUIEditor, DevComponents.Charts.Design, " +
+                "Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(UITypeEditor))]
+        public PieRefLineDisplayMode ReferenceLineDisplayMode
+        {
+            get { return (_RefLineDisplayMode); }
+
+            set
+            {
+                if (value != _RefLineDisplayMode)
+                {
+                    _RefLineDisplayMode = value;
+
+                    OnPropertyChangedEx("ReferenceLineDisplayMode", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ReferenceLineDisplayOnTop
+
+        /// <summary>
+        /// Gets or sets whether references lines are displayed on top of chart data.
+        /// </summary>
+        [DefaultValue(Tbool.NotSet), Category("Appearance")]
+        [Description("Indicates whether the reference lines are displayed on top of chart data.")]
+        public Tbool ReferenceLineDisplayOnTop
+        {
+            get { return (_ReferenceLineDisplayOnTop); }
+
+            set
+            {
+                if (value != _ReferenceLineDisplayOnTop)
+                {
+                    _ReferenceLineDisplayOnTop = value;
+
+                    OnPropertyChangedEx("ReferenceLineDisplayOnTop", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ReferenceLines
+
+        /// <summary>
+        /// Gets a reference to the collection of user defined Reference Lines.
+        /// </summary>
+        [Category("Appearance")]
+        [Description("Indicates the collection of user defined Reference Lines.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public PieReferenceLineCollection ReferenceLines
+        {
+            get
+            {
+                if (_ReferenceLines == null)
+                {
+                    _ReferenceLines = new PieReferenceLineCollection();
+
+                    _ReferenceLines.CollectionChanged += ReferenceLineCollectionChanged;
+                }
+
+                return (_ReferenceLines);
+            }
+
+            internal set
+            {
+                if (_ReferenceLines != null)
+                    _ReferenceLines.CollectionChanged -= ReferenceLineCollectionChanged;
+
+                _ReferenceLines = value;
+
+                if (_ReferenceLines != null)
+                    _ReferenceLines.CollectionChanged += ReferenceLineCollectionChanged;
+            }
+        }
+
+        #region ReferenceLineCollectionChanged
+
+        void ReferenceLineCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            switch (e.Action)
+            {
+                case NotifyCollectionChangedAction.Add:
+                    foreach (ChartElement item in e.NewItems)
+                    {
+                        item.Parent = Parent;
+                        item.PropertyChanged += Item_PropertyChanged;
+                    }
+                    break;
+
+                case NotifyCollectionChangedAction.Replace:
+                    foreach (ChartElement item in e.OldItems)
+                    {
+                        item.Parent = null;
+                        item.PropertyChanged -= Item_PropertyChanged;
+                    }
+
+                    foreach (ChartElement item in e.NewItems)
+                    {
+                        item.Parent = Parent;
+                        item.PropertyChanged += Item_PropertyChanged;
+                    }
+                    break;
+
+                case NotifyCollectionChangedAction.Remove:
+                    foreach (ChartElement item in e.OldItems)
+                    {
+                        item.Parent = null;
+                        item.PropertyChanged -= Item_PropertyChanged;
+                    }
+                    break;
+            }
+
+            OnPropertyChangedEx("ReferenceLines", VisualChangeType.Render);
+        }
+
+        void Item_PropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            OnPropertyChanged(e);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RingWeight
+
+        ///<summary>
+        /// Gets or sets the 'relative' thickness of the associated pie ring, as
+        /// compared to the relative thickness of other series rings
+        /// rings.
+        ///</summary>
+        [DefaultValue(-1), Category("Layout")]
+        [Description("Indicates the 'relative' thickness of the associated pie ring, as compared to the relative thickness of other series rings. Default is 100.")]
+        public int RingWeight
+        {
+            get { return (_RingWeight); }
+
+            set
+            {
+                if (value != _RingWeight)
+                {
+                    _RingWeight = value;
+
+                    OnPropertyChangedEx("RingWeight", Style.VisualChangeType.Recalc);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowSliceWhiteSpace
+
+        /// <summary>
+        /// Gets or sets whether to display, by default, the full
+        /// slice (includes potential area beyond slice extent). Default is false.
+        /// </summary>
+        [DefaultValue(Tbool.NotSet), Category("Display")]
+        [Description("Indicates whether to display, by default the full slice (includes potential area beyond slice extent). Default is false.")]
+        public Tbool ShowSliceWhiteSpace
+        {
+            get { return (_ShowSliceWhiteSpace); }
+
+            set
+            {
+                if (value != _ShowSliceWhiteSpace)
+                {
+                    _ShowSliceWhiteSpace = value;
+
+                    OnPropertyChangedEx("ShowSliceWhiteSpace", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region SliceLabelCropMode
+
+        /// <summary>
+        /// Gets or sets the label display mode (ie. the action taken
+        /// when a label needs be clipped for full display). Default is Clip.
+        /// </summary>
+        [DefaultValue(SliceLabelCropMode.NotSet), Category("Label")]
+        [Description("Indicates the label display mode (ie. the action taken when a label needs clipped for full display). Default is Clip.")]
+        public SliceLabelCropMode SliceLabelCropMode
+        {
+            get { return (_SliceLabelCropMode); }
+
+            set
+            {
+                if (value != _SliceLabelCropMode)
+                {
+                    _SliceLabelCropMode = value;
+
+                    OnPropertyChangedEx("SliceLabelCropMode", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region SliceLabelVisibility
+
+        /// <summary>
+        /// Gets or sets when the slice labels are visibly displayed.
+        /// </summary>
+        [DefaultValue(SliceLabelVisibility.NotSet), Category("Label")]
+        [Description("Indicates when the slice labels are visibly displayed.")]
+        public SliceLabelVisibility SliceLabelVisibility
+        {
+            get { return (_SliceLabelVisibility); }
+
+            set
+            {
+                if (value != _SliceLabelVisibility)
+                {
+                    _SliceLabelVisibility = value;
+
+                    OnPropertyChangedEx("SliceLabelVisibility", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region SliceLabelDisplayMode
+
+        /// <summary>
+        /// Gets or sets the label display mode, which determines
+        /// which slice labels (inner/outer) are displayed. Default is InnerAndOuter.
+        /// </summary>
+        [DefaultValue(SliceLabelDisplayMode.NotSet), Category("Label")]
+        [Description("Indicates the label display mode, which determines which slice labels (inner/outer) are displayed. Default is InnerAndOuter.")]
+        public SliceLabelDisplayMode SliceLabelDisplayMode
+        {
+            get { return (_SliceLabelDisplayMode); }
+
+            set
+            {
+                if (value != _SliceLabelDisplayMode)
+                {
+                    _SliceLabelDisplayMode = value;
+
+                    OnPropertyChangedEx("SliceLabelDisplayMode", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region SliceVisualStyles
+
+        /// <summary>
+        /// Gets or sets the visual styles for the slice.
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates the visual styles for the slice.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ChartSliceVisualStyles SliceVisualStyles
+        {
+            get
+            {
+                if (_SliceVisualStyles == null)
+                {
+                    _SliceVisualStyles = new ChartSliceVisualStyles();
+
+                    StyleChangeHandler(null, _SliceVisualStyles);
+                }
+
+                return (_SliceVisualStyles);
+            }
+
+            set
+            {
+                if (_SliceVisualStyles != value)
+                {
+                    ChartSliceVisualStyles oldValue = _SliceVisualStyles;
+
+                    _SliceVisualStyles = value;
+
+                    OnStyleChanged("SliceVisualStyles", oldValue, value);
+
+                    if (oldValue != null)
+                        oldValue.Dispose();
+                }
+            }
+        }
+
+        #endregion
+
+        #region StartAngle
+
+        /// <summary>
+        /// Gets or sets the start angle of the pie in degrees where 0 is right and 270 is top. 
+        /// Defaults to 270.
+        /// </summary>
+        [DefaultValue(double.NaN), Category("Layout")]
+        [Description("Indicates the start angle of the pie in degrees where 0 is right and 270 is top. Defaults to 270.")]
+        [Editor("DevComponents.Charts.Design.AngleRangeValueEditor, DevComponents.Charts.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(UITypeEditor))]
+        public double StartAngle
+        {
+            get { return (_StartAngle); }
+
+            set
+            {
+                if (value != _StartAngle)
+                {
+                    _StartAngle = value;
+
+                    OnPropertyChangedEx("StartAngle", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region SweepAngle
+
+        /// <summary>
+        /// Gets or sets the sweep angle (distance from StartAngle to the
+        /// ending angle) of the pie in positive degrees (use SweepDirection
+        /// to change rotational direction).
+        /// </summary>
+        [DefaultValue(double.NaN), Category("Layout")]
+        [Description("Indicates the sweep angle (distance from StartAngle to the ending angle) of the pie in positive degrees (use SweepDirection to change rotational direction).")]
+        [Editor("DevComponents.Charts.Design.AngleRangeValueEditor, DevComponents.Charts.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(UITypeEditor))]
+        public double SweepAngle
+        {
+            get { return (_SweepAngle); }
+
+            set
+            {
+                if (value != _SweepAngle)
+                {
+                    if (value < 0)
+                        throw new Exception("SweepAngle cannot be negative (See SweepDirection).");
+
+                    _SweepAngle = value;
+
+                    OnPropertyChangedEx("SweepAngle", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region SweepDirection
+
+        /// <summary>
+        /// Gets or sets the direction to display the pie slices - in either a clockwise
+        /// or counterclockwise direction.
+        /// </summary>
+        [DefaultValue(SweepDirection.NotSet), Category("Layout")]
+        [Description("Indicates the direction to display the pie slices - in either a clockwise or counterclockwise direction).")]
+        public SweepDirection SweepDirection
+        {
+            get { return (_SweepDirection); }
+
+            set
+            {
+                if (value != _SweepDirection)
+                {
+                    _SweepDirection = value;
+
+                    OnPropertyChangedEx("SweepDirection", VisualChangeType.Recalc);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ToolTipText
+
+        /// <summary>
+        /// Gets or sets the text to use for the point ToolTip.
+        /// </summary>
+        [DefaultValue(null), Category("Label")]
+        [Description("Indicates the text to use for the point ToolTip.")]
+        [Editor(typeof(MultilineStringEditor), typeof(UITypeEditor))]
+        public string ToolTipText
+        {
+            get { return (_ToolTipText); }
+
+            set
+            {
+                if (value != _ToolTipText)
+                {
+                    _ToolTipText = value;
+
+                    OnPropertyChanged("ToolTipText");
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetReferenceLineByName
+
+        /// <summary>
+        /// Gets the ReferenceLine from the given name.
+        /// </summary>
+        /// <param name="name"></param>
+        /// <returns></returns>
+        public PieReferenceLine GetReferenceLineByName(string name)
+        {
+            if (String.IsNullOrEmpty(name) == true)
+                return (null);
+
+            if (_ReferenceLines != null)
+            {
+                foreach (PieReferenceLine line in _ReferenceLines)
+                {
+                    if (name.Equals(line.Name) == true)
+                        return (line);
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region Style support
+
+        #region OnStyleChanged
+
+        protected virtual void OnStyleChanged(string property,
+            INotifyPropertyChanged oldValue, INotifyPropertyChanged newValue)
+        {
+            StyleChangeHandler(oldValue, newValue);
+
+            OnPropertyChanged(property);
+        }
+
+        #endregion
+
+        #region StyleChangeHandler
+
+        protected void StyleChangeHandler(
+            INotifyPropertyChanged oldValue, INotifyPropertyChanged newValue)
+        {
+            if (oldValue != null)
+                oldValue.PropertyChanged -= StyleChanged;
+
+            if (newValue != null)
+                newValue.PropertyChanged += StyleChanged;
+        }
+
+        #region StyleChanged
+
+        /// <summary>
+        /// Occurs when one of element visual styles has property changes.
+        /// Default implementation invalidates visual appearance of element.
+        /// </summary>
+        /// <param name="sender">VisualStyle that changed.</param>
+        /// <param name="e">Event arguments.</param>
+        protected void StyleChanged(object sender, PropertyChangedEventArgs e)
+        {
+            OnPropertyChanged(e);
+        }
+
+        #endregion
+
+        #endregion
+    
+        #region INotifyPropertyChanged Members
+
+        /// <summary>
+        /// Occurs when property value has changed.
+        /// </summary>
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        #region OnPropertyChanged
+
+        /// <summary>
+        /// Raises the PropertyChanged event.
+        /// </summary>
+        /// <param name="e">Event arguments</param>
+        protected virtual void OnPropertyChanged(PropertyChangedEventArgs e)
+        {
+            if (PropertyChanged != null)
+                PropertyChanged(this, e);
+        }
+
+        /// <summary>
+        /// Default PropertyChanged processing
+        /// </summary>
+        /// <param name="s"></param>
+        protected void OnPropertyChanged(string s)
+        {
+            if (PropertyChanged != null)
+                OnPropertyChanged(new PropertyChangedEventArgs(s));
+        }
+
+        /// <summary>
+        /// Default PropertyChanged processing
+        /// </summary>
+        /// <param name="s"></param>
+        /// <param name="changeType">invalidate</param>
+        protected void OnPropertyChangedEx(string s, VisualChangeType changeType)
+        {
+            if (PropertyChanged != null)
+                OnPropertyChanged(new VisualPropertyChangedEventArgs(s, changeType));
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region Copy/CopyTo
+
+        /// <summary>
+        /// Creates a copy of the SeriesPointsLayout
+        /// </summary>
+        /// <returns></returns>
+        public SliceVisualLayout Copy()
+        {
+            SliceVisualLayout copy = new SliceVisualLayout(null);
+
+            CopyTo(copy);
+
+            return (copy);
+        }
+
+        /// <summary>
+        /// Copies the item data to the given SeriesPointsLayout.
+        /// </summary>
+        /// <param name="sp"></param>
+        public void CopyTo(SliceVisualLayout c)
+        {
+            c.AngleMargin = AngleMargin;
+
+            c.MaxSlices = MaxSlices;
+            c.MinExtent = MinExtent;
+            c.MinPercent = MinPercent;
+
+            c.InnerLabelOrientation = _InnerLabelOrientation;
+            c.InnerSliceLabel = _InnerSliceLabel;
+
+            c.OtherSliceVisualStyles = (_OtherSliceVisualStyles != null) ? _OtherSliceVisualStyles.Copy() : null;
+
+            c.OuterSliceLabel = OuterSliceLabel;
+
+            foreach (PieReferenceLine line in ReferenceLines)
+                c.ReferenceLines.Add((PieReferenceLine)line.Copy());
+
+            c.ReferenceLineDisplayMode = _RefLineDisplayMode;
+            c.ReferenceLineDisplayOnTop = _ReferenceLineDisplayOnTop;
+
+            c.RingWeight = RingWeight;
+
+            c.ShowSliceWhiteSpace = _ShowSliceWhiteSpace;
+            c.SliceLabelCropMode = _SliceLabelCropMode;
+            c.SliceLabelDisplayMode = _SliceLabelDisplayMode;
+            c.SliceLabelVisibility = _SliceLabelVisibility;
+
+            c.SliceVisualStyles = (_SliceVisualStyles != null) ? _SliceVisualStyles.Copy() : null;
+
+            c.StartAngle = _StartAngle;
+            c.SweepAngle = _SweepAngle;
+            c.SweepDirection = _SweepDirection;
+        }
+
+        #endregion
+
+        #region GetSerialData
+
+        internal virtual SerialElementCollection GetSerialData()
+        {
+            return (GetSerialData(true));
+        }
+
+        internal virtual SerialElementCollection GetSerialData(bool root)
+        {
+            SerialElementCollection sec = new SerialElementCollection();
+
+            if (root == true)
+                sec.AddStartElement("SliceVisualLayout");
+
+            sec.AddValue("AngleMargin", AngleMargin, double.NaN);
+
+            sec.AddValue("MaxSlices", MaxSlices, -1);
+            sec.AddValue("MinExtent", MinExtent, -1);
+            sec.AddValue("MinPercent", MinPercent, double.NaN);
+
+            sec.AddValue("InnerLabelOrientation", InnerLabelOrientation, SliceLabelOrientation.NotSet);
+
+            sec.AddValue("InnerSliceLabel", InnerSliceLabel, null);
+
+            if (_OtherSliceVisualStyles != null && _OtherSliceVisualStyles.IsEmpty == false)
+                sec.AddElement(_OtherSliceVisualStyles.GetSerialData("OtherSliceVisualStyles"));
+
+            sec.AddValue("OuterSliceLabel", OuterSliceLabel, null);
+
+            if (_ReferenceLines != null && _ReferenceLines.Count > 0)
+            {
+                sec.AddStartElement("ReferenceLines count=\"" + _ReferenceLines.Count + "\"");
+
+                foreach (PieReferenceLine rline in _ReferenceLines)
+                    sec.AddElement(rline.GetSerialData(""));
+
+                sec.AddEndElement("ReferenceLines");
+            }
+
+            sec.AddValue("ReferenceLineDisplayMode", ReferenceLineDisplayMode, PieRefLineDisplayMode.NotSet);
+            sec.AddValue("ReferenceLineDisplayOnTop", ReferenceLineDisplayOnTop, Tbool.NotSet);
+
+            sec.AddValue("RingWeight", RingWeight, -1);
+
+            sec.AddValue("ShowSliceWhiteSpace", ShowSliceWhiteSpace, Tbool.NotSet);
+            sec.AddValue("SliceLabelCropMode", SliceLabelCropMode, SliceLabelCropMode.NotSet);
+            sec.AddValue("SliceLabelDisplayMode", SliceLabelDisplayMode, SliceLabelDisplayMode.NotSet);
+            sec.AddValue("SliceLabelVisibility", SliceLabelVisibility, SliceLabelVisibility.NotSet);
+
+            if (_SliceVisualStyles != null && _SliceVisualStyles.IsEmpty == false)
+                sec.AddElement(_SliceVisualStyles.GetSerialData("SliceVisualStyles"));
+
+            sec.AddValue("StartAngle", StartAngle, double.NaN);
+            sec.AddValue("SweepAngle", SweepAngle, double.NaN);
+            sec.AddValue("SweepDirection", SweepDirection, SweepDirection.NotSet);
+
+            if (root == true)
+                sec.AddEndElement("SliceVisualLayout");
+
+            return (sec);
+        }
+
+        #endregion
+
+        #region PutSerialData
+
+        #region ProcessValue
+
+        void IProcessSerialElement.ProcessValue(SerialElement se)
+        {
+            switch (se.Name)
+            {
+                case "AngleMargin":
+                    AngleMargin = double.Parse(se.StringValue);
+                    break;
+
+                case "InnerLabelOrientation":
+                    InnerLabelOrientation = (SliceLabelOrientation)se.GetValueEnum(typeof(SliceLabelOrientation));
+                    break;
+
+                case "InnerSliceLabel":
+                    InnerSliceLabel = se.StringValue;
+                    break;
+
+                case "MaxSlices":
+                    MaxSlices = int.Parse(se.StringValue);
+                    break;
+
+                case "MinExtent":
+                    MinExtent = int.Parse(se.StringValue);
+                    break;
+
+                case "MinPercent":
+                    MinPercent = double.Parse(se.StringValue);
+                    break;
+
+                case "OuterSliceLabel":
+                    OuterSliceLabel = se.StringValue;
+                    break;
+
+                case "ReferenceLineDisplayMode":
+                    ReferenceLineDisplayMode = (PieRefLineDisplayMode)se.GetValueEnum(typeof(PieRefLineDisplayMode));
+                    break;
+
+                case "ReferenceLineDisplayOnTop":
+                    ReferenceLineDisplayOnTop = (Tbool)se.GetValueEnum(typeof(Tbool));
+                    break;
+
+                case "RingWeight":
+                    RingWeight = int.Parse(se.StringValue);
+                    break;
+
+                case "ShowSliceWhiteSpace":
+                    ShowSliceWhiteSpace = (Tbool)se.GetValueEnum(typeof(Tbool));
+                    break;
+
+                case "SliceLabelCropMode":
+                    SliceLabelCropMode = (SliceLabelCropMode)se.GetValueEnum(typeof(SliceLabelCropMode));
+                    break;
+
+                case "SliceLabelDisplayMode":
+                    SliceLabelDisplayMode = (SliceLabelDisplayMode)se.GetValueEnum(typeof(SliceLabelDisplayMode));
+                    break;
+
+                case "SliceLabelVisibility":
+                    SliceLabelVisibility = (SliceLabelVisibility)se.GetValueEnum(typeof(SliceLabelVisibility));
+                    break;
+
+                case "StartAngle":
+                    StartAngle = double.Parse(se.StringValue);
+                    break;
+
+                case "SweepAngle":
+                    SweepAngle = double.Parse(se.StringValue);
+                    break;
+
+                case "SweepDirection":
+                    SweepDirection = (SweepDirection)se.GetValueEnum(typeof(SweepDirection));
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region ProcessCollection
+
+        void IProcessSerialElement.ProcessCollection(SerialElement se)
+        {
+            SerialElementCollection sec = se.Sec;
+
+            switch (se.Name)
+            {
+                case "OtherSliceVisualStyles":
+                    sec.PutSerialData(OtherSliceVisualStyles);
+                    break;
+
+                case "ReferenceLine":
+                    PieReferenceLine line = GetReferenceLineByName(se.Name);
+
+                    if (line != null)
+                        sec.PutSerialData(line);
+                    break;
+
+                case "ReferenceLines":
+                    sec.PutSerialData(this);
+                    break;
+
+                case "SliceVisualStyles":
+                    sec.PutSerialData(SliceVisualStyles);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IDispose
+
+        public virtual void Dispose()
+        {
+            ReferenceLines = null;
+            OtherSliceVisualStyles = null;
+            SliceVisualStyles = null;
+
+            Parent = null;
+        }
+
+        #endregion
+    }
+
+    #region ISeriesPointContainer
+
+    public interface ISeriesPointContainer
+    {
+        SliceVisualLayout SubSliceVisualLayout { get; set; }
+    }
+
+    #endregion
+
+    #endregion
+
+    #region PieSeriesPoint
+
+    [DesignTimeVisible(false), ToolboxItem(false)]
+    public class PieSeriesPoint : SeriesPoint,
+        IEffectiveStyle, INotifyPropertyChanged, ILegendItem, ILegendItemEx, ISeriesPointContainer, INamed
+    {
+        #region Private variables
+
+        private object _Parent;
+
+        private int _OrdinalValue;
+
+        private ChartControl _ChartControl;
+        private int _LocalUpdateCount;
+
+        private string _InnerSliceLabel;
+        private string _OuterSliceLabel;
+
+        private double _DetachedOffset = double.NaN;
+
+        private double _StartAngle = double.NaN;
+        private double _SweepAngle = double.NaN;
+
+        private double _AngleMarginExx;
+
+        private double _StartAngleEx;
+        private double _SweepAngleEx;
+
+        private Point _SliceCenter;
+        private double _SliceExtent;
+        private double _SliceValue;
+
+        private int _InnerRadius;
+        private int _OuterRadius;
+
+        private Rectangle _PathBounds;
+        private Rectangle _LastPathBounds;
+
+        private PieRing _PieRing;
+
+        private PieSeriesPoint _RootPsp;
+
+        private ChartSliceVisualStyles _SliceVisualStyles;
+        private EffectiveStyles<ChartSliceVisualStyle> _EffectiveSliceStyles;
+        private ChartSliceVisualStyle _LastEffectiveStyle;
+
+        private Color _DefaultPaletteColor = Color.Empty;
+
+        private ushort _LayoutUpdateCount;
+        private Rectangle _InscribedRect;
+        private List<WordPosLine> _WordPosLines;
+        private RectangleF[] _CharBounds;
+
+        private PieLabel _PieLabel;
+
+        private ChartLegendItem _LegendItem;
+        private string _LegendText;
+        private ChartLegendItemVisualStyles _ChartLegendItemVisualStyles;
+
+        private string _Name;
+        private string _ToolTipText;
+
+        private PieSeriesPointCollection _SeriesPoints;
+        private SliceVisualLayout _SliceVisualLayout;
+
+        private States _States;
+
+        // ----  Cached items
+
+        private double _AngleMarginEx;
+
+        private SliceLabelCropMode _SliceLabelCropModeEx;
+        private SliceLabelDisplayMode _SliceLabelDisplayModeEx;
+        private SliceLabelOrientation _InnerLabelOrientationEx;
+        private SliceLabelVisibility _SliceLabelVisibilityEx;
+
+        private string _InnerSliceLabelEx;
+        private string _OuterSliceLabelEx;
+
+        private int _MaxSlicesEx;
+        private int _MinExtentEx;
+        private double _MinPercentEx;
+
+        private int _RingWeightEx;
+
+        private PieRefLineDisplayMode _ReferenceLineDisplayModeEx;
+        private List<PieReferenceLine> _ReferenceLinesEx;
+
+        private string _ToolTipTextEx;
+
+        #endregion
+
+        #region Constructors
+
+        public PieSeriesPoint()
+            : this(0, 0)
+        {
+        }
+
+        /// <summary>
+        /// PieSeriesPoint
+        /// </summary>
+        /// <param name="xValue"></param>
+        /// <param name="yValue"></param>
+        public PieSeriesPoint(object xValue, object yValue)
+            : base(xValue, yValue)
+        {
+            InitDefaultStates();
+
+            _EffectiveSliceStyles = new EffectiveStyles<ChartSliceVisualStyle>(this);
+        }
+
+        /// <summary>
+        /// PieSeriesPoint
+        /// </summary>
+        /// <param name="xValue"></param>
+        /// <param name="yValue"></param>
+        public PieSeriesPoint(object xValue, object[] yValue)
+            : base(xValue, yValue)
+        {
+            InitDefaultStates();
+
+            _EffectiveSliceStyles = new EffectiveStyles<ChartSliceVisualStyle>(this);
+        }
+
+        /// <summary>
+        /// PieSeriesPoint
+        /// </summary>
+        /// <param name="xValue"></param>
+        /// <param name="yValue1">angular value</param>
+        /// <param name="yValue2">yValue2=radial</param>
+        public PieSeriesPoint(object xValue, object yValue1, object yValue2)
+            : base(xValue, yValue1, yValue2)
+        {
+            InitDefaultStates();
+
+            _EffectiveSliceStyles = new EffectiveStyles<ChartSliceVisualStyle>(this);
+        }
+
+        #endregion
+
+        #region InitDefaultStates
+
+        private void InitDefaultStates()
+        {
+            SetState(States.AllowDetach, true);
+            SetState(States.AllowSelect, true);
+
+            SetState(States.CheckedInLegend, true);
+            SetState(States.ShowInLegend, true);
+            SetState(States.ShowInParentLegend, true);
+            SetState(States.ShowMarkerInLegend, true);
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region ActualStartAngle
+
+        /// <summary>
+        /// Gets the actual, calculated starting angle for the slice.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public double ActualStartAngle
+        {
+            get { return (StartAngleEx); }
+        }
+
+        #endregion
+
+        #region ActualSweepAngle
+
+        /// <summary>
+        /// Gets the actual, calculated sweep angle for the slice.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public double ActualSweepAngle
+        {
+            get { return (SweepAngleEx); }
+        }
+
+        #endregion
+
+        #region AllowDetach
+
+        /// <summary>
+        /// Gets or sets whether the element can be 'detached' from
+        /// the center of the pie by the user. Defaults to true.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior")]
+        [Description("Indicates whether the element can be 'detached' from the center of the pie by the user. Defaults to true.")]
+        public bool AllowDetach
+        {
+            get { return (TestState(States.AllowDetach)); }
+
+            set
+            {
+                if (value != AllowDetach)
+                {
+                    SetState(States.AllowDetach, value);
+
+                    OnPropertyChanged("AllowDetach");
+                }
+            }
+        }
+
+        #endregion
+
+        #region AllowSelect
+
+        /// <summary>
+        /// Gets or sets whether the element can be selected by clicking on it. Defaults to true.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior")]
+        [Description("Indicates whether the element can be selected by clicking on it. Defaults to true.")]
+        public bool AllowSelect
+        {
+            get { return (TestState(States.AllowSelect)); }
+
+            set
+            {
+                if (value != AllowSelect)
+                {
+                    SetState(States.AllowSelect, value);
+
+                    OnPropertyChanged("AllowSliceSelect");
+                }
+            }
+        }
+
+        #endregion
+
+        #region CenterAngle
+
+        /// <summary>
+        /// Gets the Center Angle for the slice.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public double CenterAngle
+        {
+            get { return ((StartAngleEx + SweepAngleEx / 2) + 360000) % 360; }
+        }
+
+        #endregion
+
+        #region ChartSeries
+
+        /// <summary>
+        /// Gets the associated ChartSeries.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public PieSeries ChartSeries
+        {
+            get { return (_PieRing != null ? _PieRing.ChartSeries : null); }
+        }
+
+        #endregion
+
+        #region DefaultPaletteColor
+
+        /// <summary>
+        /// Gets the default palette color assigned to the point when it
+        /// is arranged in the pie.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        [Description("Indicates the default palette color assigned to the point when it is arranged in the pie.")]
+        public Color DefaultPaletteColor
+        {
+            get { return (_DefaultPaletteColor); }
+
+            internal set
+            {
+                if (value != _DefaultPaletteColor)
+                {
+                    _DefaultPaletteColor = value;
+
+                    ClearEffectiveStyles();
+
+                    OnPropertyChangedEx("DetachedOffset", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region DetachedOffset
+
+        /// <summary>
+        /// Gets or sets the offset distance of the slice from the pie center, as measured
+        /// by a percentage of the pie radius (if between 0 and 1), or absolute pixel amount (if >= 1).
+        /// </summary>
+        [DefaultValue(double.NaN), Category("Appearance")]
+        [Description("Indicates the offset distance of the slice from the pie center, as measured by a percentage of the pie radius (if between 0 and 1), or absolute pixel amount (if >= 1).")]
+        [Editor("DevComponents.Charts.Design.RadiusRangeValueEditor, DevComponents.Charts.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(UITypeEditor))]
+        public double DetachedOffset
+        {
+            get { return (_DetachedOffset); }
+
+            set
+            {
+                if (value != _DetachedOffset)
+                {
+                    _DetachedOffset = value;
+
+                    OnPropertyChangedEx("DetachedOffset", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region EffectiveSliceStyles
+
+        /// <summary>
+        /// Gets a reference to the Effective (cached, composite) Slice styles.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public EffectiveStyles<ChartSliceVisualStyle> EffectiveSliceStyles
+        {
+            get { return (_EffectiveSliceStyles); }
+        }
+
+        #endregion
+
+        #region ExtentRadius
+
+        /// <summary>
+        /// Gets the actual, calculated extent radius of the slice (the
+        /// radius between the inner and outer radius - ValuesY[1]).
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public double ExtentRadius
+        {
+            get
+            {
+                int width = OuterRadius - InnerRadius;
+                int extendWidth = (int)(SliceExtent * width);
+
+                return (InnerRadius + extendWidth);
+            }
+        }
+
+        #endregion
+
+        #region InnerRadius
+
+        /// <summary>
+        /// Gets the actual, inner radius of the slice.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public int InnerRadius
+        {
+            get { return (_InnerRadius); }
+            internal set { _InnerRadius = value; }
+        }
+
+        #endregion
+
+        #region InnerSliceLabel
+
+        /// <summary>
+        /// Gets or sets the inner slice label for the pie slice. The label can be
+        /// straight text, or be comprised of text and formatting specifiers. The label
+        /// should be specified as "Some text {Keyword:Format} more text [{...:...}]".
+        /// 
+        /// Here are the formatting specifiers that can be used with both inner and
+        /// outer labels:
+        /// 
+        /// "AVG" "A" - Average (angular values).
+        /// "PCT" "P" - Percent of pie (angular values) - (.025 yields "2.5 %").
+        /// "TOT" "T" - Total of all values (angluar values).
+        /// "VAL" "V" - Value percent of pie (angular value) -  (.025 yields ".025").
+        ///
+        /// "AVGX" "AX" - Average (extent/radial values).
+        /// "PCTX" "PX" - Percent of pie (extent values) - (.025 yields "2.5 %").
+        /// "TOTX" "TX" - Total of all values (extent values).
+        /// "VALX" "VX" - Value percent of pie (extent value) -  (.025 yields ".025").
+        ///
+        /// "S" "SNAME" - Series name.
+        /// "X" - ValueX.
+        /// "Y", "Y0", "Yn" - ValueY values (where 'n' is index value).
+        ///
+        /// Examples:
+        /// 
+        /// "{S}\\n{X:yyyy} ({Y:##,##0} - {P:Y1})"
+        /// "Individual cost {Y:C} and average cost {AVG:C} of goods."
+        /// 
+        /// </summary>
+        [DefaultValue(null), Category("Label")]
+        [Editor(typeof(MultilineStringEditor), typeof(UITypeEditor))]
+        [Description("Indicates the inner slice label for the pie slices (format specifiers {Keyword[:Format]} - " +
+            "S, X, Y, Y0-Yn, N, [A|AVG][X], [A|PCT][X], [A|TOT][X], [A|VAL][X].  e.g. \"{x:f2},{avg:##.##},{totx:c}\"")]
+        public string InnerSliceLabel
+        {
+            get { return (_InnerSliceLabel); }
+
+            set
+            {
+                if (String.Equals(value, _InnerSliceLabel) == false)
+                {
+                    _InnerSliceLabel = value;
+
+                    OnPropertyChangedEx("InnerSliceLabel", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region IsDetached
+
+        /// <summary>
+        /// Gets or sets whether the slice is 'detached' from the center of the pie. This can be
+        /// used to create emphasis or to highlight a slice of the pie.
+        /// </summary>
+        [DefaultValue(false), Category("Appearance")]
+        [Description("Indicates whether the slice is 'detached' from the center of the pie.")]
+        public bool IsDetached
+        {
+            get { return (TestState(States.Detached)); }
+
+            set
+            {
+                if (value != IsDetached)
+                {
+                    SetState(States.Detached, value);
+
+                    OnPropertyChangedEx("IsDetached", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region IsDisplayed
+
+        ///<summary>
+        /// Gets whether the series point is displayed
+        /// based upon its Visibility and Legend state.
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsDisplayed
+        {
+            get { return (Visible == true && IsDisplayedEx == true); }
+        }
+
+        #endregion
+
+        #region IsEmptyPoint
+
+        /// <summary>
+        /// Gets or sets whether the point is an 'Empty' (or missing) Point.
+        /// </summary>
+        [DefaultValue(false), Category("Data")]
+        [Description("Indicates whether the point is an 'Empty' (or missing) Point.")]
+        public override bool IsEmptyPoint
+        {
+            get { return (base.IsEmptyPoint); }
+
+            set
+            {
+                if (value != base.IsEmptyPoint)
+                {
+                    base.IsEmptyPoint = value;
+
+                    OnPropertyChangedEx("IsEmptyPoint", VisualChangeType.Recalc);
+                }
+            }
+        }
+
+        #endregion
+
+        #region IsInOther
+
+        /// <summary>
+        /// Gets whether the slice is in the 'Other' slice.
+        /// </summary>
+        [DefaultValue(false), Category("Appearance")]
+        [Description("Indicates whether the slice is in the 'Other' slice.")]
+        public bool IsInOther
+        {
+            get { return (TestState(States.IsInOther)); }
+
+            set
+            {
+                if (value != IsInOther)
+                {
+                    SetState(States.IsInOther, value);
+
+                    OnPropertyChangedEx("IsInOther", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region IsOther
+
+        /// <summary>
+        /// Gets whether the slice is the 'Other' slice.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        [Description("Indicates whether the slice is the 'Other' slice.")]
+        public bool IsOther
+        {
+            get { return (TestState(States.IsOther)); }
+            internal set { SetState(States.IsOther, value); }
+        }
+
+        #endregion
+
+        #region IsSelected
+
+        /// <summary>
+        /// Gets or sets whether the slice is selected.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        [Description("Indicates whether the slice is selected.")]
+        public bool IsSelected
+        {
+            get { return (TestState(States.Selected)); }
+
+            set
+            {
+                if (value != IsSelected)
+                {
+                    SetState(States.Selected, value);
+
+                    OnPropertyChangedEx("IsSelected", VisualChangeType.Render);
+
+                    PieSeries series = ChartSeries;
+                    
+                    if (series != null)
+                    {
+                        PieChart pieChart = series.Parent as PieChart;
+
+                        if (pieChart != null)
+                            pieChart.GlobalSelectionCount++;
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region Name
+
+        /// <summary>
+        /// Gets or sets the Name of the item.
+        /// </summary>
+        [DefaultValue(null)]
+        [Description("Indicates the Name of the item.")]
+        public virtual string Name
+        {
+            get { return (_Name); }
+            set { _Name = value; }
+        }
+
+        #endregion
+
+        #region OrdinalValue
+
+        /// <summary>
+        /// Gets the ordial value for the point (the ordinal value when added
+        /// to the PieSeriesPoint Collection
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public int OrdinalValue
+        {
+            get { return (_OrdinalValue); }
+            internal set { _OrdinalValue = value; }
+        }
+
+        #endregion
+
+        #region OuterRadius
+
+        /// <summary>
+        /// Gets the actual, outer radius of the slice.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public int OuterRadius
+        {
+            get { return (_OuterRadius); }
+            internal set { _OuterRadius = value; }
+        }
+
+        #endregion
+
+        #region OuterSliceLabel
+
+        /// <summary>
+        /// Gets or sets the outer slice label for the pie slice.  See InnerSliceLabel for
+        /// further notes on Format Specifiers.
+        /// </summary>
+        [DefaultValue(null), Category("Label")]
+        [Editor(typeof(MultilineStringEditor), typeof(UITypeEditor))]
+        [Description("Indicates the inner slice label for the pie slices. See InnerSliceLabel for further notes on Format Specifiers.")]
+        public string OuterSliceLabel
+        {
+            get { return (_OuterSliceLabel); }
+
+            set
+            {
+                if (String.Equals(value, _OuterSliceLabel) == false)
+                {
+                    _OuterSliceLabel = value;
+
+                    OnPropertyChangedEx("OuterSliceLabel", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region Parent
+
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        [Description("Indicates the item Parent.")]
+        public object Parent
+        {
+            get { return (_Parent); }
+
+            internal set
+            {
+                _Parent = value;
+
+                _RootPsp = null;
+
+                if (value != null)
+                {
+                    PieSeriesPointCollection psp = value as PieSeriesPointCollection;
+
+                    if (psp != null)
+                        SubSliceVisualLayout.Parent = psp.Parent as ChartVisualElement;
+                }
+            }
+        }
+
+        #endregion
+
+        #region PieRing
+
+        /// <summary>
+        /// Gets the items associated PieRing (if applicable).
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public PieRing PieRing
+        {
+            get { return (_PieRing); }
+            internal set { _PieRing = value; }
+        }
+
+        #endregion
+
+        #region SeriesPoints
+
+        ///<summary>
+        /// Gets the nested series point data collection.
+        ///</summary>
+        [Category("Data")]
+        [Description("Indicates the nested series point data collection.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public PieSeriesPointCollection SeriesPoints
+        {
+            get
+            {
+                if (_SeriesPoints == null)
+                    SeriesPoints = new PieSeriesPointCollection();
+
+                return (_SeriesPoints);
+            }
+
+            set
+            {
+                if (value != _SeriesPoints)
+                {
+                    if (_SeriesPoints != null)
+                    {
+                        _SeriesPoints.Parent = null;
+
+                        _SeriesPoints.CollectionChanged -= SeriesPoints_CollectionChanged;
+                    }
+
+                    _SeriesPoints = value;
+
+                    if (_SeriesPoints != null)
+                    {
+                        _SeriesPoints.Parent = this;
+
+                        _SeriesPoints.CollectionChanged += SeriesPoints_CollectionChanged;
+                    }
+
+                    OnPropertyChangedEx("SeriesPoints", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #region SeriesPoints_CollectionChanged
+
+        void SeriesPoints_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            SetSpcNotify(e.OldItems, false);
+            SetSpcNotify(e.NewItems, true);
+
+            OnPropertyChangedEx("SeriesPoints", Style.VisualChangeType.Layout);
+        }
+
+        #region SetPointNotify
+
+        private void SetSpcNotify(IList list, bool notify)
+        {
+            if (list != null)
+            {
+                foreach (PieSeriesPoint psp in list)
+                {
+                    if (psp != null)
+                    {
+                        if (notify == true)
+                        {
+                            psp.Parent = SeriesPoints;
+                            psp.PropertyChanged += Spc_PropertyChanged;
+                        }
+                        else
+                        {
+                            psp.Parent = null;
+                            psp.PropertyChanged -= Spc_PropertyChanged;
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region Spc_PropertyChanged
+
+        void Spc_PropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            if (e is VisualPropertyChangedEventArgs)
+                OnPropertyChanged(e);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region SliceCenter
+
+        /// <summary>
+        /// Gets the slice center origin point.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public Point SliceCenter
+        {
+            get { return (_SliceCenter); }
+            internal set { _SliceCenter = value; }
+        }
+
+        #endregion
+
+        #region SliceExtent
+
+        /// <summary>
+        /// Gets the calculated slice extent value (the relative
+        /// percent-of-total ValuesY[1] value for the slice).
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public double SliceExtent
+        {
+            get { return (_SliceExtent); }
+            internal set { _SliceExtent = value; }
+        }
+
+        #endregion
+
+        #region SliceValue
+
+        /// <summary>
+        /// Gets the calculated slice value (the relative
+        /// percent-of-total ValuesY[0] value for the slice).
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public double SliceValue
+        {
+            get { return (_SliceValue); }
+            internal set { _SliceValue = value; }
+        }
+
+        #endregion
+
+        #region SliceVisualStyles
+
+        /// <summary>
+        /// Gets or sets the visual styles for the slice.
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates the visual styles for the slice.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ChartSliceVisualStyles SliceVisualStyles
+        {
+            get
+            {
+                if (_SliceVisualStyles == null)
+                {
+                    _SliceVisualStyles = new ChartSliceVisualStyles();
+
+                    StyleChangeHandler(null, _SliceVisualStyles);
+                }
+
+                return (_SliceVisualStyles);
+            }
+
+            set
+            {
+                if (_SliceVisualStyles != value)
+                {
+                    ChartSliceVisualStyles oldValue = _SliceVisualStyles;
+
+                    _SliceVisualStyles = value;
+
+                    OnStyleChanged("SliceVisualStyles", oldValue, value);
+
+                    if (oldValue != null)
+                        oldValue.Dispose();
+                }
+            }
+        }
+
+        #endregion
+
+        #region StartAngle
+
+        ///<summary>
+        /// Gets or sets the starting angle of the slice. For subsequent slices,
+        /// the default is the ending angle of the previous slice. Specify a value 
+        /// for the StartAngle if you want the next slice to start at an angle that
+        /// is different from the previous ending angle.
+        ///</summary>
+        [DefaultValue(double.NaN), Category("Layout")]
+        [Description("Indicates the starting angle of the slice. For subsequent slices, the default is the ending angle of the previous slice. Specify a value for the StartAngle if you want the next slice to start at an angle that is different from the previous ending angle.")]
+        [Editor("DevComponents.Charts.Design.AngleRangeValueEditor, DevComponents.Charts.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(UITypeEditor))]
+        public double StartAngle
+        {
+            get { return (_StartAngle); }
+
+            set
+            {
+                if (value != _StartAngle)
+                {
+                    _StartAngle = value;
+
+                    OnPropertyChangedEx("StartAngle", Style.VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region SubSliceVisualLayout
+
+        /// <summary>
+        /// Gets or sets the layout of the subordinate (or nested) slices.
+        /// </summary>
+        [Category("Layout")]
+        [Description("Indicates the layout of the subordinate (or nested) slices.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public SliceVisualLayout SubSliceVisualLayout
+        {
+            get 
+            {
+                if (_SliceVisualLayout == null)
+                    SubSliceVisualLayout = new SliceVisualLayout(null);
+
+                return (_SliceVisualLayout);
+            }
+            set
+            {
+                if (value != _SliceVisualLayout)
+                {
+                    if (_SliceVisualLayout != null)
+                        _SliceVisualLayout.PropertyChanged -= SliceVisualLayout_PropertyChanged;
+
+                    _SliceVisualLayout = value;
+
+                    if (_SliceVisualLayout != null)
+                    {
+                        _SliceVisualLayout.SliceVisualStyles.Default.Tag = "PSP_Def";
+                        _SliceVisualLayout.SliceVisualStyles.MouseOver.Tag = "PSP_Mov";
+                        _SliceVisualLayout.SliceVisualStyles.Selected.Tag = "PSP_Sel";
+                        _SliceVisualLayout.SliceVisualStyles.SelectedMouseOver.Tag = "PSP_Smo";
+
+                        _SliceVisualLayout.PropertyChanged += SliceVisualLayout_PropertyChanged;
+                    }
+
+                    OnPropertyChangedEx("SubSliceVisualLayout", VisualChangeType.Recalc);
+                }
+            }
+        }
+
+        #region SliceVisualLayout_PropertyChanged
+
+        void SliceVisualLayout_PropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            if (e is VisualPropertyChangedEventArgs)
+                OnPropertyChanged(e);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region SweepAngle
+
+        ///<summary>
+        /// Gets or sets the sweep angle of the slice (angle size, in degrees).
+        ///</summary>
+        [DefaultValue(double.NaN), Category("Layout")]
+        [Description("Indicates the sweep angle of the slice (angle size, in degrees).")]
+        [Editor("DevComponents.Charts.Design.AngleRangeValueEditor, DevComponents.Charts.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(UITypeEditor))]
+        public double SweepAngle
+        {
+            get { return (_SweepAngle); }
+
+            set
+            {
+                if (value != _SweepAngle)
+                {
+                    if (value < 0)
+                        throw new Exception("SweepAngle cannot be negative.");
+
+                    _SweepAngle = value;
+
+                    OnPropertyChangedEx("SweepAngle", Style.VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ToolTipText
+
+        /// <summary>
+        /// Gets or sets the text to use for the point ToolTip.
+        /// </summary>
+        [DefaultValue(null), Category("Label")]
+        [Description("Indicates the text to use for the point ToolTip.")]
+        [Editor(typeof(MultilineStringEditor), typeof(UITypeEditor))]
+        public string ToolTipText
+        {
+            get { return (_ToolTipText); }
+
+            set
+            {
+                if (value != _ToolTipText)
+                {
+                    _ToolTipText = value;
+
+                    OnPropertyChanged("ToolTipText");
+                }
+            }
+        }
+
+        #endregion
+
+        #region Visible
+
+        /// <summary>
+        /// Gets or sets whether the point is Visible.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance")]
+        [Description("Indicates whether the point is Visible.")]
+        public override bool Visible
+        {
+            get { return (base.Visible); }
+
+            set
+            {
+                if (value != base.Visible)
+                {
+                    base.Visible = value;
+
+                    OnPropertyChangedEx("Visible", VisualChangeType.Recalc);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region AngleMarginExx
+
+        internal double AngleMarginExx
+        {
+            get { return (_AngleMarginExx); }
+            set { _AngleMarginExx = value; }
+        }
+
+        #endregion
+
+        #region AngleMarginEx
+
+        internal double AngleMarginEx
+        {
+            get { UpdatePropertyCache(); return (_AngleMarginEx); }
+            set { _AngleMarginEx = value; }
+        }
+
+        #endregion
+
+        #region Bounds
+
+        internal Rectangle Bounds
+        {
+            get
+            {
+                Rectangle r = new Rectangle();
+                r.Location = _SliceCenter;
+                r.Inflate(OuterRadius, OuterRadius);
+
+                return (r);
+            }
+        }
+
+        #endregion
+
+        #region CharBounds
+
+        internal RectangleF[] CharBounds
+        {
+            get
+            {
+                VerifyLayoutUpdateCount();
+
+                return (_CharBounds);
+            }
+
+            set { _CharBounds = value; }
+        }
+
+        #endregion
+
+        #region HasExtent
+
+        internal bool HasExtent
+        {
+            get { return (TestState(States.HasExtent)); }
+            set { SetState(States.HasExtent, value); }
+        }
+
+        #endregion
+
+        #region InnerLabelClipped
+
+        internal bool InnerLabelClipped
+        {
+            get { return (TestState(States.InnerLabelClipped)); }
+            set { SetState(States.InnerLabelClipped, value); }
+        }
+
+        #endregion
+
+        #region InnerLabelDisplayed
+
+        internal bool InnerLabelDisplayed
+        {
+            get { return (TestState(States.InnerLabelDisplayed)); }
+            set { SetState(States.InnerLabelDisplayed, value); }
+        }
+
+        #endregion
+
+        #region InnerLabelOrientationEx
+
+        internal SliceLabelOrientation InnerLabelOrientationEx
+        {
+            get { UpdatePropertyCache(); return (_InnerLabelOrientationEx); }
+            set { _InnerLabelOrientationEx = value; }
+        }
+
+        #endregion
+
+        #region InnerSliceLabelEx
+
+        internal string InnerSliceLabelEx
+        {
+            get { UpdatePropertyCache(); return (_InnerSliceLabelEx); }
+            set { _InnerSliceLabelEx = value; }
+        }
+
+        #endregion
+
+        #region InscribedRect
+
+        internal Rectangle InscribedRect
+        {
+            get
+            {
+                VerifyLayoutUpdateCount();
+
+                return (_InscribedRect);
+            }
+
+            set
+            {
+                _InscribedRect = value;
+
+                InscribedRectValid = true;
+            }
+        }
+
+        #endregion
+
+        #region InscribedRectValid
+
+        internal bool InscribedRectValid
+        {
+            get
+            {
+                VerifyLayoutUpdateCount();
+
+                return (TestState(States.InscribedRectValid));
+            }
+
+            set
+            {
+                SetState(States.InscribedRectValid, value);
+
+                if (value == false)
+                    _InscribedRect = Rectangle.Empty;
+            }
+        }
+
+        #endregion
+
+        #region IsDisplayable
+
+        internal bool IsDisplayable
+        {
+            get
+            {
+                if (Visible == false || IsEmpty == true)
+                    return (false);
+
+                if (IsInOtherEx == false)
+                {
+                    object item = Parent;
+
+                    while (item != null)
+                    {
+                        if (item is PieSeriesPointCollection)
+                        {
+                            if (((PieSeriesPointCollection)item).IsOther == true)
+                            {
+                                IsInOtherEx = true;
+                                break;
+                            }
+
+                            item = ((PieSeriesPointCollection)item).Parent;
+                        }
+                        else if (item is PieSeriesPoint)
+                        {
+                            if (((PieSeriesPoint)item).IsInOtherEx == true)
+                            {
+                                IsInOtherEx = true;
+                                break;
+                            }
+
+                            item = ((PieSeriesPoint)item).Parent;
+                        }
+                        else
+                        {
+                            break;
+                        }
+                    }
+                }
+
+                return (IsInOtherEx == false);
+            }
+        }
+
+        #endregion
+
+        #region IsDisplayedEx
+
+        internal bool IsDisplayedEx
+        {
+            get
+            {
+                if (Visible == true)
+                {
+                    if (ChartSeries != null)
+                    {
+                        PieChart pieChart = ChartSeries.Parent as PieChart;
+
+                        if (pieChart != null)
+                        {
+                            ItemCheckAction ica = (pieChart != null)
+                                ? pieChart.Legend.ItemCheckAction : ItemCheckAction.ShowItem;
+
+                            return ((ica == ItemCheckAction.None ||
+                                    (ShowCheckBoxInLegend == false || CheckedInLegend == true)));
+                        }
+                    }
+                }
+
+                return (false);
+            }
+        }
+
+        #endregion
+
+        #region IsInOtherEx
+
+        internal bool IsInOtherEx
+        {
+            get { return (TestState(States.IsInOtherEx)); }
+            set { SetState(States.IsInOtherEx, value); }
+        }
+
+        #endregion
+
+        #region IsOffset
+
+        internal bool IsOffset
+        {
+            get { return (TestState(States.IsOffset)); }
+            set { SetState(States.IsOffset, value); }
+        }
+
+        #endregion
+
+        #region IsEnabled
+
+        internal bool IsEnabled
+        {
+            get
+            {
+                PieRing pieRing = PieRing;
+
+                if (pieRing != null)
+                {
+                    if (pieRing.IsEnabled == true)
+                        return (pieRing.IsDisplayed);
+                }
+
+                return (false);
+            }
+        }
+
+        #endregion
+
+        #region LastPathBounds
+
+        internal Rectangle LastPathBounds
+        {
+            get { return (_LastPathBounds); }
+            set { _LastPathBounds = value; }
+        }
+
+        #endregion
+
+        #region MaxSlicesEx
+
+        internal int MaxSlicesEx
+        {
+            get { UpdatePropertyCache(); return (_MaxSlicesEx); }
+            set { _MaxSlicesEx = value; }
+        }
+
+        #endregion
+
+        #region MinExtentEx
+
+        internal int MinExtentEx
+        {
+            get { UpdatePropertyCache(); return (_MinExtentEx); }
+            set { _MinExtentEx = value; }
+        }
+
+        #endregion
+
+        #region MinPercentEx
+
+        internal double MinPercentEx
+        {
+            get { UpdatePropertyCache(); return (_MinPercentEx); }
+            set { _MinPercentEx = value; }
+        }
+
+        #endregion
+
+        #region OuterSliceLabelEx
+
+        internal string OuterSliceLabelEx
+        {
+            get { UpdatePropertyCache(); return (_OuterSliceLabelEx); }
+            set { _OuterSliceLabelEx = value; }
+        }
+
+        #endregion
+
+        #region PathBounds
+
+        internal Rectangle PathBounds
+        {
+            get { return (_PathBounds); }
+            set { _PathBounds = value; }
+        }
+
+        #endregion
+
+        #region PieLabel
+
+        internal PieLabel PieLabel
+        {
+            get { return (_PieLabel); }
+            set { _PieLabel = value; }
+        }
+
+        #endregion
+
+        #region ReferenceLineDisplayModeEx
+
+        internal PieRefLineDisplayMode ReferenceLineDisplayModeEx
+        {
+            get { UpdatePropertyCache(); return (_ReferenceLineDisplayModeEx); }
+            set { _ReferenceLineDisplayModeEx = value; }
+        }
+
+        #endregion
+
+        #region ReferenceLineDisplayOnTopEx
+
+        internal bool ReferenceLineDisplayOnTopEx
+        {
+            get
+            {
+                UpdatePropertyCache();
+
+                return (TestState(States.ReferenceLineDisplayOnTop));
+            }
+
+            set { SetState(States.ReferenceLineDisplayOnTop, value); }
+        }
+
+        #endregion
+
+        #region ReferenceLinesEx
+
+        internal List<PieReferenceLine> ReferenceLinesEx
+        {
+            get { UpdatePropertyCache(); return (_ReferenceLinesEx); }
+            set { _ReferenceLinesEx = value; }
+        }
+
+        #endregion
+
+        #region RenderCount
+
+        private int _RenderCount;
+
+        internal int RenderCount
+        {
+            get { return (_RenderCount); }
+            set { _RenderCount = value; }
+        }
+
+        #endregion
+
+        #region RingWeightEx
+
+        internal int RingWeightEx
+        {
+            get { UpdatePropertyCache(); return (_RingWeightEx); }
+            set { _RingWeightEx = value; }
+        }
+
+        #endregion
+
+        #region RootPsp
+
+        internal PieSeriesPoint RootPsp
+        {
+            get
+            {
+                if (_RootPsp == null)
+                    _RootPsp = GetRootPsp();
+
+                return (_RootPsp);
+            }
+        }
+
+        #region GetRootPsp
+
+        private PieSeriesPoint GetRootPsp()
+        {
+            if (PieRing.RingLevel > 0)
+            {
+                PieSeriesPointCollection spc = Parent as PieSeriesPointCollection;
+
+                if (spc != null)
+                {
+                    PieSeriesPoint psp = spc.Parent as PieSeriesPoint;
+
+                    if (psp != null)
+                        return (psp.RootPsp);
+                }
+            }
+
+            return (this);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ShowSliceWhiteSpaceEx
+
+        internal bool ShowSliceWhiteSpaceEx
+        {
+            get
+            {
+                UpdatePropertyCache();
+
+                return (TestState(States.ShowSliceWhiteSpaceEx));
+            }
+
+            set { SetState(States.ShowSliceWhiteSpaceEx, value); }
+        }
+
+        #endregion
+
+        #region SliceLabelCropModeEx
+
+        internal SliceLabelCropMode SliceLabelCropModeEx
+        {
+            get { UpdatePropertyCache(); return (_SliceLabelCropModeEx); }
+            set { _SliceLabelCropModeEx = value; }
+        }
+
+        #endregion
+
+        #region SliceLabelDisplayModeEx
+
+        internal SliceLabelDisplayMode SliceLabelDisplayModeEx
+        {
+            get { UpdatePropertyCache(); return (_SliceLabelDisplayModeEx); }
+            set { _SliceLabelDisplayModeEx = value; }
+        }
+
+        #endregion
+
+        #region SliceLabelVisibilityEx
+
+        internal SliceLabelVisibility SliceLabelVisibilityEx
+        {
+            get { UpdatePropertyCache(); return (_SliceLabelVisibilityEx); }
+            set { _SliceLabelVisibilityEx = value; }
+        }
+
+        #endregion
+
+        #region StartAngleEx
+
+        internal double StartAngleEx
+        {
+            get { return (_StartAngleEx); }
+            set { _StartAngleEx = value; }
+        }
+
+        #endregion
+
+        #region SweepAngleEx
+
+        internal double SweepAngleEx
+        {
+            get { return (_SweepAngleEx); }
+            set { _SweepAngleEx = value; }
+        }
+
+        #endregion
+
+        #region ToolTipTextEx
+
+        internal string ToolTipTextEx
+        {
+            get { UpdatePropertyCache(); return (_ToolTipTextEx); }
+            set { _ToolTipTextEx = value; }
+        }
+
+        #endregion
+
+        #region WordPosLines
+
+        internal List<WordPosLine> WordPosLines
+        {
+            get
+            {
+                VerifyLayoutUpdateCount();
+
+                return (_WordPosLines);
+            }
+
+            set { _WordPosLines = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region VerifyLayoutUpdateCount
+
+        private void VerifyLayoutUpdateCount()
+        {
+            PieSeries series = ChartSeries;
+
+            if (series != null)
+            {
+                ChartControl chartControl = series.ChartControl;
+
+                if (chartControl != null)
+                {
+                    if (_LayoutUpdateCount != chartControl.LayoutUpdateCount)
+                    {
+                        _WordPosLines = null;
+
+                        InscribedRectValid = false;
+
+                        _LayoutUpdateCount = chartControl.LayoutUpdateCount;
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region UpdatePropertyCache
+
+        private void UpdatePropertyCache()
+        {
+            if (ChartControl != null)
+            {
+                if (_LocalUpdateCount != ChartControl.GlobalUpdateCount)
+                {
+                    PieSeriesPointCollection spc = Parent as PieSeriesPointCollection;
+
+                    if (spc != null)
+                    {
+                        PieSeries pieSeries = this.ChartSeries;
+                        PieChart pieChart = pieSeries.Parent as PieChart;
+
+                        _AngleMarginEx = GetAngleMarginEx(pieChart, pieSeries, spc.Parent);
+                        _InnerLabelOrientationEx = GetSliceLabelOrientationEx(pieChart, pieSeries, spc.Parent);
+                        _InnerSliceLabelEx = GetInnerSliceLabelEx(pieChart, pieSeries, spc.Parent);
+                        _MaxSlicesEx = GetMaxSlicesEx(pieChart, pieSeries, spc.Parent);
+                        _MinExtentEx = GetMinExtentEx(pieChart, pieSeries, spc.Parent);
+                        _MinPercentEx = GetMinPercentEx(pieChart, pieSeries, spc.Parent);
+                        _OuterSliceLabelEx = GetOuterSliceLabelEx(pieChart, pieSeries, spc.Parent);
+                        _ReferenceLineDisplayModeEx = GetReferenceLineDisplayModeEx(pieChart, pieSeries, spc.Parent);
+                        _ReferenceLinesEx = GetReferenceLinesEx(pieChart, pieSeries, spc.Parent);
+                        _RingWeightEx = GetRingWeightEx(pieChart, pieSeries, spc.Parent);
+
+                        SetState(States.ReferenceLineDisplayOnTop, GetReferenceLineDisplayOnTopEx(pieChart, pieSeries, spc.Parent));
+                        SetState(States.ShowSliceWhiteSpaceEx, GetShowSliceWhiteSpaceEx(pieChart, pieSeries, spc.Parent));
+
+                        _SliceLabelCropModeEx = GetSliceLabelCropModeEx(pieChart, pieSeries, spc.Parent);
+                        _SliceLabelDisplayModeEx = GetSliceLabelDisplayModeEx(pieChart, pieSeries, spc.Parent);
+                        _SliceLabelVisibilityEx = GetSliceLabelVisibilityEx(pieChart, pieSeries, spc.Parent);
+
+                        _ToolTipTextEx = GetToolTipTextEx(pieChart, pieSeries, spc.Parent);
+                    }
+
+                    _LocalUpdateCount = ChartControl.GlobalUpdateCount;
+                }
+            }
+        }
+
+        #region GetAngleMarginEx
+
+        private double GetAngleMarginEx(
+            PieChart pieChart, PieSeries pieSeries, object item)
+        {
+            PieSeriesPoint psp = item as PieSeriesPoint;
+
+            while (psp != null)
+            {
+                if (double.IsNaN(psp.SubSliceVisualLayout.AngleMargin) == false)
+                    return (psp.SubSliceVisualLayout.AngleMargin);
+
+                psp = GetParentPsp(psp);
+            }
+
+            if (double.IsNaN(pieSeries.SubSliceVisualLayout.AngleMargin) == false)
+                return (pieSeries.SubSliceVisualLayout.AngleMargin);
+
+            if (double.IsNaN(pieChart.SubSliceVisualLayout.AngleMargin) == false)
+                return (pieChart.SubSliceVisualLayout.AngleMargin);
+
+            return (0);
+        }
+
+        #endregion
+
+        #region GetInnerSliceLabelEx
+
+        private string GetInnerSliceLabelEx(
+            PieChart pieChart, PieSeries pieSeries, object item)
+        {
+            CharBounds = null;
+
+            if (InnerSliceLabel != null)
+                return (InnerSliceLabel);
+
+            PieSeriesPoint psp = item as PieSeriesPoint;
+
+            while (psp != null)
+            {
+                if (psp.SubSliceVisualLayout.InnerSliceLabel != null)
+                    return (psp.SubSliceVisualLayout.InnerSliceLabel);
+
+                psp = GetParentPsp(psp);
+            }
+
+            if (pieSeries.SubSliceVisualLayout.InnerSliceLabel != null)
+                return (pieSeries.SubSliceVisualLayout.InnerSliceLabel);
+
+            if (pieChart.SubSliceVisualLayout.InnerSliceLabel != null)
+                return (pieChart.SubSliceVisualLayout.InnerSliceLabel);
+
+            return ("{X}");
+        }
+
+        #endregion
+
+        #region GetMaxSlicesEx
+
+        private int GetMaxSlicesEx(
+            PieChart pieChart, PieSeries pieSeries, object item)
+        {
+            PieSeriesPoint psp = item as PieSeriesPoint;
+
+            while (psp != null)
+            {
+                if (psp.SubSliceVisualLayout.MaxSlices >= 0)
+                    return (psp.SubSliceVisualLayout.MaxSlices);
+
+                psp = GetParentPsp(psp);
+            }
+
+            if (pieSeries.SubSliceVisualLayout.MaxSlices >= 0)
+                return (pieSeries.SubSliceVisualLayout.MaxSlices);
+
+            if (pieChart.SubSliceVisualLayout.MaxSlices >= 0)
+                return (pieChart.SubSliceVisualLayout.MaxSlices);
+
+            return (100);
+        }
+
+        #endregion
+
+        #region GetMinExtentEx
+
+        private int GetMinExtentEx(
+            PieChart pieChart, PieSeries pieSeries, object item)
+        {
+            PieSeriesPoint psp = item as PieSeriesPoint;
+
+            while (psp != null)
+            {
+                if (psp.SubSliceVisualLayout.MinExtent >= 0)
+                    return (psp.SubSliceVisualLayout.MinExtent);
+
+                psp = GetParentPsp(psp);
+            }
+
+            if (pieSeries.SubSliceVisualLayout.MinExtent >= 0)
+                return (pieSeries.SubSliceVisualLayout.MinExtent);
+
+            if (pieChart.SubSliceVisualLayout.MinExtent >= 0)
+                return (pieChart.SubSliceVisualLayout.MinExtent);
+
+            return (0);
+        }
+
+        #endregion
+
+        #region GetMinPercentEx
+
+        private double GetMinPercentEx(
+            PieChart pieChart, PieSeries pieSeries, object item)
+        {
+            PieSeriesPoint psp = item as PieSeriesPoint;
+
+            while (psp != null)
+            {
+                if (double.IsNaN(psp.SubSliceVisualLayout.MinPercent) == false)
+                    return (psp.SubSliceVisualLayout.MinPercent);
+
+                psp = GetParentPsp(psp);
+            }
+
+            if (double.IsNaN(pieSeries.SubSliceVisualLayout.MinPercent) == false)
+                return (pieSeries.SubSliceVisualLayout.MinPercent);
+
+            if (double.IsNaN(pieChart.SubSliceVisualLayout.MinPercent) == false)
+                return (pieChart.SubSliceVisualLayout.MinPercent);
+
+            return (.04d);
+        }
+
+        #endregion
+
+        #region GetOuterSliceLabelEx
+
+        private string GetOuterSliceLabelEx(
+            PieChart pieChart, PieSeries pieSeries, object item)
+        {
+            if (OuterSliceLabel != null)
+                return (OuterSliceLabel);
+
+            PieSeriesPoint psp = item as PieSeriesPoint;
+
+            while (psp != null)
+            {
+                if (psp.SubSliceVisualLayout.OuterSliceLabel != null)
+                    return (psp.SubSliceVisualLayout.OuterSliceLabel);
+
+                psp = GetParentPsp(psp);
+            }
+
+            if (pieSeries.SubSliceVisualLayout.OuterSliceLabel != null)
+                return (pieSeries.SubSliceVisualLayout.OuterSliceLabel);
+
+            if (pieChart.SubSliceVisualLayout.OuterSliceLabel != null)
+                return (pieChart.SubSliceVisualLayout.OuterSliceLabel);
+
+            return ("{X}");
+        }
+
+        #endregion
+
+        #region GetReferenceLineDisplayModeEx
+
+        private PieRefLineDisplayMode GetReferenceLineDisplayModeEx(
+            PieChart pieChart, PieSeries pieSeries, object item)
+        {
+            PieSeriesPoint psp = item as PieSeriesPoint;
+
+            while (psp != null)
+            {
+                if (psp.SubSliceVisualLayout.ReferenceLineDisplayMode != PieRefLineDisplayMode.NotSet)
+                    return (psp.SubSliceVisualLayout.ReferenceLineDisplayMode);
+
+                psp = GetParentPsp(psp);
+            }
+
+            if (pieSeries.SubSliceVisualLayout.ReferenceLineDisplayMode != PieRefLineDisplayMode.NotSet)
+                return (pieSeries.SubSliceVisualLayout.ReferenceLineDisplayMode);
+
+            if (pieChart.SubSliceVisualLayout.ReferenceLineDisplayMode != PieRefLineDisplayMode.NotSet)
+                return (pieChart.SubSliceVisualLayout.ReferenceLineDisplayMode);
+
+            return (PieRefLineDisplayMode.None);
+        }
+
+        #endregion
+
+        #region GetReferenceLineDisplayOnTopEx
+
+        private bool GetReferenceLineDisplayOnTopEx(
+            PieChart pieChart, PieSeries pieSeries, object item)
+        {
+            PieSeriesPoint psp = item as PieSeriesPoint;
+
+            while (psp != null)
+            {
+                if (psp.SubSliceVisualLayout.ReferenceLineDisplayOnTop != Tbool.NotSet)
+                    return (psp.SubSliceVisualLayout.ReferenceLineDisplayOnTop == Tbool.True);
+
+                psp = GetParentPsp(psp);
+            }
+
+            if (pieSeries.SubSliceVisualLayout.ReferenceLineDisplayOnTop != Tbool.NotSet)
+                return (pieSeries.SubSliceVisualLayout.ReferenceLineDisplayOnTop == Tbool.True);
+
+            return (pieChart.SubSliceVisualLayout.ReferenceLineDisplayOnTop != Tbool.False);
+        }
+
+        #endregion
+
+        #region GetReferenceLinesEx
+
+        private List<PieReferenceLine> GetReferenceLinesEx(
+            PieChart pieChart, PieSeries pieSeries, object item)
+        {
+            List<PieReferenceLine> lines = new List<PieReferenceLine>();
+
+            PieSeriesPoint psp = item as PieSeriesPoint;
+
+            while (psp != null)
+            {
+                if (psp.SubSliceVisualLayout._ReferenceLines != null)
+                    AddReferenceLines(lines, psp.SubSliceVisualLayout.ReferenceLines);
+
+                psp = GetParentPsp(psp);
+            }
+
+            if (pieSeries.SubSliceVisualLayout._ReferenceLines != null)
+                AddReferenceLines(lines, pieSeries.SubSliceVisualLayout.ReferenceLines);
+
+            if (pieChart.SubSliceVisualLayout._ReferenceLines != null)
+                AddReferenceLines(lines, pieChart.SubSliceVisualLayout.ReferenceLines);
+
+            return (lines);
+        }
+
+        #region AddReferenceLines
+
+        private void AddReferenceLines(
+            List<PieReferenceLine> lines, PieReferenceLineCollection rlc)
+        {
+            foreach (PieReferenceLine line in rlc)
+                lines.Add(line);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetRingWeightEx
+
+        private int GetRingWeightEx(
+            PieChart pieChart, PieSeries pieSeries, object item)
+        {
+            PieSeriesPoint psp = item as PieSeriesPoint;
+
+            while (psp != null)
+            {
+                if (psp.SubSliceVisualLayout.RingWeight >= 0)
+                    return (psp.SubSliceVisualLayout.RingWeight);
+
+                psp = GetParentPsp(psp);
+            }
+
+            if (pieSeries.SubSliceVisualLayout.RingWeight >= 0)
+                return (pieSeries.SubSliceVisualLayout.RingWeight);
+
+            if (pieChart.SubSliceVisualLayout.RingWeight >= 0)
+                return (pieChart.SubSliceVisualLayout.RingWeight);
+
+            return (100);
+        }
+
+        #endregion
+
+        #region GetShowSliceWhiteSpaceEx
+
+        private bool GetShowSliceWhiteSpaceEx(
+            PieChart pieChart, PieSeries pieSeries, object item)
+        {
+            PieSeriesPoint psp = item as PieSeriesPoint;
+
+            while (psp != null)
+            {
+                if (psp.SubSliceVisualLayout.ShowSliceWhiteSpace != Tbool.NotSet)
+                    return (psp.SubSliceVisualLayout.ShowSliceWhiteSpace == Tbool.True);
+
+                psp = GetParentPsp(psp);
+            }
+
+            if (pieSeries.SubSliceVisualLayout.ShowSliceWhiteSpace != Tbool.NotSet)
+                return (pieSeries.SubSliceVisualLayout.ShowSliceWhiteSpace == Tbool.True);
+
+            return (pieChart.SubSliceVisualLayout.ShowSliceWhiteSpace == Tbool.True);
+        }
+
+        #endregion
+
+        #region GetSliceLabelCropModeEx
+
+        private SliceLabelCropMode GetSliceLabelCropModeEx(
+            PieChart pieChart, PieSeries pieSeries, object item)
+        {
+            PieSeriesPoint psp = item as PieSeriesPoint;
+
+            while (psp != null)
+            {
+                if (psp.SubSliceVisualLayout.SliceLabelCropMode != SliceLabelCropMode.NotSet)
+                    return (psp.SubSliceVisualLayout.SliceLabelCropMode);
+
+                psp = GetParentPsp(psp);
+            }
+
+            if (pieSeries.SubSliceVisualLayout.SliceLabelCropMode != SliceLabelCropMode.NotSet)
+                return (pieSeries.SubSliceVisualLayout.SliceLabelCropMode);
+
+            if (pieChart.SubSliceVisualLayout.SliceLabelCropMode != SliceLabelCropMode.NotSet)
+                return (pieChart.SubSliceVisualLayout.SliceLabelCropMode);
+
+            return (SliceLabelCropMode.Clip);
+        }
+
+        #endregion
+
+        #region GetSliceLabelDisplayModeEx
+
+        private SliceLabelDisplayMode GetSliceLabelDisplayModeEx(
+            PieChart pieChart, PieSeries pieSeries, object item)
+        {
+            PieSeriesPoint psp = item as PieSeriesPoint;
+
+            while (psp != null)
+            {
+                if (psp.SubSliceVisualLayout.SliceLabelDisplayMode != SliceLabelDisplayMode.NotSet)
+                    return (psp.SubSliceVisualLayout.SliceLabelDisplayMode);
+
+                psp = GetParentPsp(psp);
+            }
+
+            if (pieSeries.SubSliceVisualLayout.SliceLabelDisplayMode != SliceLabelDisplayMode.NotSet)
+                return (pieSeries.SubSliceVisualLayout.SliceLabelDisplayMode);
+
+            if (pieChart.SubSliceVisualLayout.SliceLabelDisplayMode != SliceLabelDisplayMode.NotSet)
+                return (pieChart.SubSliceVisualLayout.SliceLabelDisplayMode);
+
+            return (SliceLabelDisplayMode.InnerAndOuter);
+        }
+
+        #endregion
+
+        #region GetSliceLabelOrientationEx
+
+        private SliceLabelOrientation GetSliceLabelOrientationEx(
+            PieChart pieChart, PieSeries pieSeries, object item)
+        {
+            PieSeriesPoint psp = item as PieSeriesPoint;
+
+            while (psp != null)
+            {
+                if (psp.SubSliceVisualLayout.InnerLabelOrientation != SliceLabelOrientation.NotSet)
+                    return (psp.SubSliceVisualLayout.InnerLabelOrientation);
+
+                psp = GetParentPsp(psp);
+            }
+
+            if (pieSeries.SubSliceVisualLayout.InnerLabelOrientation != SliceLabelOrientation.NotSet)
+                return (pieSeries.SubSliceVisualLayout.InnerLabelOrientation);
+
+            if (pieChart.SubSliceVisualLayout.InnerLabelOrientation != SliceLabelOrientation.NotSet)
+                return (pieChart.SubSliceVisualLayout.InnerLabelOrientation);
+
+            return (SliceLabelOrientation.Adaptive);
+        }
+
+        #endregion
+
+        #region GetSliceLabelVisibilityEx
+
+        private SliceLabelVisibility GetSliceLabelVisibilityEx(
+            PieChart pieChart, PieSeries pieSeries, object item)
+        {
+            PieSeriesPoint psp = item as PieSeriesPoint;
+
+            while (psp != null)
+            {
+                if (psp.SubSliceVisualLayout.SliceLabelVisibility != SliceLabelVisibility.NotSet)
+                    return (psp.SubSliceVisualLayout.SliceLabelVisibility);
+
+                psp = GetParentPsp(psp);
+            }
+
+            if (pieSeries.SubSliceVisualLayout.SliceLabelVisibility != SliceLabelVisibility.NotSet)
+                return (pieSeries.SubSliceVisualLayout.SliceLabelVisibility);
+
+            if (pieChart.SubSliceVisualLayout.SliceLabelVisibility != SliceLabelVisibility.NotSet)
+                return (pieChart.SubSliceVisualLayout.SliceLabelVisibility);
+
+            return (SliceLabelVisibility.NotSet);
+        }
+
+        #endregion
+
+        #region GetToolTipTextEx
+
+        private string GetToolTipTextEx(
+            PieChart pieChart, PieSeries pieSeries, object item)
+        {
+            PieSeriesPoint psp = item as PieSeriesPoint;
+
+            while (psp != null)
+            {
+                if (psp.SubSliceVisualLayout.ToolTipText != null)
+                    return (psp.SubSliceVisualLayout.ToolTipText);
+
+                psp = GetParentPsp(psp);
+            }
+
+            if (pieSeries.SubSliceVisualLayout.ToolTipText != null)
+                return (pieSeries.SubSliceVisualLayout.ToolTipText);
+
+            if (pieChart.SubSliceVisualLayout.ToolTipText != null)
+                return (pieChart.SubSliceVisualLayout.ToolTipText);
+
+            return ("{x}");
+        }
+
+        #endregion
+
+        #region GetParentPsp
+
+        private PieSeriesPoint GetParentPsp(PieSeriesPoint psp)
+        {
+            PieSeriesPointCollection spc = psp.Parent as PieSeriesPointCollection;
+
+            return (spc != null) ? spc.Parent as PieSeriesPoint : null;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetRayEndPoint
+
+        internal Point GetRayEndPoint(double angle, double radius)
+        {
+            Point pt = SliceCenter;
+
+            double radians = MathHelper.ToRadians(angle);
+
+            pt.X += (int)(Math.Cos(radians) * radius);
+            pt.Y += (int)(Math.Sin(radians) * radius);
+
+            return (pt);
+        }
+
+        #endregion
+
+        #region GetLabelText
+
+        internal string GetLabelText(string pattern)
+        {
+            pattern = pattern.Replace("\\n", "\n");
+            pattern = pattern.Replace("\\r", "\r");
+
+            Regex regex = new Regex("{([^}]*)}");
+            MatchCollection mc = regex.Matches(pattern);
+
+            StringBuilder sb = new StringBuilder();
+
+            int index = 0;
+
+            foreach (Match ma in mc)
+            {
+                if (ma.Index > index)
+                    sb.Append(pattern.Substring(index, ma.Index - index));
+
+                sb.Append(ProcessSliceLabelFmt(ma.Value));
+
+                index = ma.Index + ma.Length;
+            }
+
+            if (index < pattern.Length)
+                sb.Append(pattern.Substring(index));
+
+            return (sb.ToString());
+        }
+
+        #region ProcessSliceLabelFmt
+
+        /// "AVG" "A" - Average (angular values).
+        /// "PCT" "P" - Percent of pie (angular values) - (.025 yields "2.5 %").
+        /// "TOT" "T" - Total of all values (angluar values).
+        /// "VAL" "V" - Value percent of pie (angular value) -  (.025 yields ".025").
+        ///
+        /// "AVGX" "AX" - Average (extent/radial values).
+        /// "PCTX" "PX" - Percent of pie (extent values) - (.025 yields "2.5 %").
+        /// "TOTX" "TX" - Total of all values (extent values).
+        /// "VALX" "VX" - Value percent of pie (extent value) -  (.025 yields ".025").
+        ///
+        /// "S" "SNAME" - Series name.
+        /// "X" - ValueX.
+        /// "Y", "Y0", "Yn" - ValueY values (where 'n' is index value).
+        ///
+        /// Use: {format[:specifier]}
+
+        private string ProcessSliceLabelFmt(string pattern)
+        {
+            string s = pattern.Substring(1, pattern.Length - 2);
+
+            int n = s.IndexOf(':');
+
+            if ((uint)n > s.Length - 1)
+                n = s.Length;
+
+            string placeHolder = s.Substring(0, n).Trim().ToUpper();
+            string formatSpecifier = (n + 1 < s.Length) ? s.Substring(n + 1) : "";
+
+            try
+            {
+                PieSeriesPointCollection spc = Parent as PieSeriesPointCollection;
+
+                switch (placeHolder)
+                {
+                    case "A":
+                    case "AVG":
+                        if (spc != null)
+                            return (GetSliceLabelText(spc.PieAverage, formatSpecifier));
+                        break;
+
+                    case "AX":
+                    case "AVGX":
+                        if (spc != null)
+                            return (GetSliceLabelText(spc.PieAverageExtent, formatSpecifier));
+                        break;
+
+                    case "N":
+                    case "NAME":
+                        if (string.IsNullOrEmpty(formatSpecifier) == false)
+                            return (String.Format(formatSpecifier, Name));
+
+                        return (Name);
+
+                    case "P":
+                    case "PCT":
+                        if (string.IsNullOrEmpty(formatSpecifier) == false)
+                            return (SliceValue.ToString(formatSpecifier));
+
+                        return (GetSliceLabelText(SliceValue, "P"));
+
+                    case "PX":
+                    case "PCTX":
+                        if (string.IsNullOrEmpty(formatSpecifier) == false)
+                            return (SliceExtent.ToString(formatSpecifier));
+
+                        return (GetSliceLabelText(SliceExtent, "P"));
+
+                    case "S":
+                    case "SNAME":
+                        string sname = ChartSeries != null ? ChartSeries.Name : "";
+
+                        if (string.IsNullOrEmpty(formatSpecifier) == false)
+                            return (String.Format(formatSpecifier, sname));
+
+                        return (sname);
+
+                    case "T":
+                    case "TOTA":
+                        if (spc != null)
+                            return (GetSliceLabelText(spc.PieTotal, formatSpecifier));
+                        break;
+
+                    case "TX":
+                    case "TOTX":
+                        if (spc != null)
+                            return (GetSliceLabelText(spc.PieTotalExtent, formatSpecifier));
+                        break;
+
+                    case "V":
+                    case "VAL":
+                        return (GetSliceLabelText(SliceValue, formatSpecifier));
+
+                    case "VX":
+                    case "VALX":
+                        return (GetSliceLabelText(SliceExtent, formatSpecifier));
+
+                    case "X":
+                        return (GetSliceLabelText(ValueX, formatSpecifier));
+
+                    case "Y":
+                    case "Y0":
+                        if (ValueY != null && ValueY.Length > 0)
+                            return (GetSliceLabelText(ValueY[0], formatSpecifier));
+
+                        return ("");
+
+                    default:
+                        if (placeHolder.StartsWith("Y") == true)
+                        {
+                            int index = int.Parse(placeHolder.Substring(1));
+
+                            if (ValueY != null && ValueY.Length > index)
+                                return (GetSliceLabelText(ValueY[index], formatSpecifier));
+                        }
+
+                        return (s);
+                }
+            }
+            catch
+            {
+            }
+
+            return (s);
+        }
+
+        #region GetSliceLabelText
+
+        private string GetSliceLabelText(object value, string format)
+        {
+            if (value is string)
+            {
+                if (string.IsNullOrEmpty(format) == true)
+                    return ((string)value);
+
+                return (String.Format(format, value));
+            }
+            else
+            {
+                double d = Convert.ToDouble(value);
+
+                if (string.IsNullOrEmpty(format) == false)
+                    return (d.ToString(format));
+
+                return (d.ToString("F3"));
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region Style handling
+
+        #region GetEffectiveSliceStyle
+
+        public ChartSliceVisualStyle
+            GetEffectiveSliceStyle(PieChart pieChart, PieSeries series)
+        {
+            StyleState state = StyleState.Default;
+
+            if (series.IsHighLightedPsp(pieChart, this) == true)
+                state |= StyleState.MouseOver;
+
+            if (IsSelected == true)
+                state |= StyleState.Selected;
+
+            ChartSliceVisualStyle estyle = EffectiveSliceStyles[state];
+
+            if (_WordPosLines != null)
+            {
+                if (_LastEffectiveStyle != null)
+                {
+                    if (EqualFonts(estyle.SliceInnerLabelStyle.Font,
+                        _LastEffectiveStyle.SliceInnerLabelStyle.Font) == false)
+                    {
+                        _CharBounds = null;
+                        _WordPosLines = null;
+                    }
+                }
+                   
+                _LastEffectiveStyle = estyle;
+            }
+
+            return (estyle);
+        }
+
+        #region EqualFonts
+
+        private bool EqualFonts(Font font1, Font font2)
+        {
+            if (font1 == null || font2 == null)
+                return (false);
+
+            return (font1.Name == font2.Name &&
+                font1.SizeInPoints == font2.SizeInPoints &&
+                font1.Style == font2.Style);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ApplyStyles
+
+        public void ApplyStyles(BaseVisualStyle style)
+        {
+        }
+
+        public void ApplyStyles(BaseVisualStyle style, StyleType cs)
+        {
+            ChartSliceVisualStyle sstyle = style as ChartSliceVisualStyle;
+
+            if (sstyle != null)
+            {
+                PieSeriesPointCollection spc = Parent as PieSeriesPointCollection;
+                PieSeries series = ChartSeries;
+
+                if (IsOther == true)
+                {
+                    ApplyOtherParentStyles(sstyle, cs, series.Parent as ChartContainer);
+
+                    sstyle.ApplyStyle(series.SubSliceVisualLayout.OtherSliceVisualStyles[cs]);
+
+                    ApplyOtherParentPspStyle(sstyle, cs, this);
+                }
+                else
+                {
+                    ApplyParentStyles(sstyle, cs, series.Parent as ChartContainer);
+
+                    sstyle.ApplyStyle(series.SubSliceVisualLayout.SliceVisualStyles[cs]);
+
+                    ApplyParentPspStyle(sstyle, cs, this);
+                }
+
+                sstyle.ApplyStyle(SliceVisualStyles[cs]);
+            }
+        }
+
+        #region ApplyOtherParentStyles
+
+        private void ApplyOtherParentStyles(
+            ChartSliceVisualStyle sstyle, StyleType cs, ChartContainer item)
+        {
+            if (item != null)
+            {
+                ApplyOtherParentStyles(sstyle, cs, item.Parent as ChartContainer);
+
+                ChartPanel panel = item as ChartPanel;
+
+                if (panel != null)
+                {
+                    sstyle.ApplyStyle(panel.DefaultVisualStyles.OtherSliceVisualStyles[cs]);
+                }
+                else
+                {
+                    PieChart pieChart = item as PieChart;
+
+                    if (pieChart != null)
+                        sstyle.ApplyStyle(pieChart.SubSliceVisualLayout.OtherSliceVisualStyles[cs]);
+                }
+            }
+            else
+            {
+                ChartControl chartControl = ChartControl;
+
+                if (chartControl != null)
+                {
+                    sstyle.ApplyStyle(chartControl.BaseVisualStyles.OtherSliceVisualStyles[cs]);
+                    sstyle.ApplyStyle(chartControl.DefaultVisualStyles.OtherSliceVisualStyles[cs]);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ApplyOtherParentPspStyle
+
+        private void ApplyOtherParentPspStyle(
+            ChartSliceVisualStyle sstyle, StyleType cs, PieSeriesPoint psp)
+        {
+            psp = GetParentPsp(psp);
+
+            if (psp != null)
+            {
+                ApplyOtherParentPspStyle(sstyle, cs, psp);
+
+                sstyle.ApplyStyle(psp.SubSliceVisualLayout.OtherSliceVisualStyles[cs]);
+            }
+        }
+
+        #endregion
+
+        #region ApplyParentStyles
+
+        private void ApplyParentStyles(
+            ChartSliceVisualStyle sstyle, StyleType cs, ChartContainer item)
+        {
+            if (item != null)
+            {
+                ApplyParentStyles(sstyle, cs, item.Parent as ChartContainer);
+
+                if (item is PieChart)
+                    sstyle.ApplyStyle(((PieChart)item).SubSliceVisualLayout.SliceVisualStyles[cs]);
+
+                if (item is ChartPanel)
+                    sstyle.ApplyStyle(((ChartPanel)item).DefaultVisualStyles.SliceVisualStyles[cs]);
+            }
+            else
+            {
+                ChartControl chartControl = ChartControl;
+
+                if (chartControl != null)
+                {
+                    sstyle.ApplyStyle(ChartControl.BaseVisualStyles.SliceVisualStyles[cs]);
+                    sstyle.ApplyStyle(ChartControl.DefaultVisualStyles.SliceVisualStyles[cs]);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ApplyParentPspStyle
+
+        private void ApplyParentPspStyle(
+            ChartSliceVisualStyle sstyle, StyleType cs, PieSeriesPoint psp)
+        {
+            psp = GetParentPsp(psp);
+
+            if (psp != null)
+            {
+                ApplyParentPspStyle(sstyle, cs, psp);
+
+                sstyle.ApplyStyle(psp.SubSliceVisualLayout.SliceVisualStyles[cs]);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ApplyDefaults
+
+        public void ApplyDefaults(BaseVisualStyle style, StyleType styleType)
+        {
+            ChartSliceVisualStyle sstyle = style as ChartSliceVisualStyle;
+
+            if (sstyle != null)
+            {
+                HatchFillType hatch = HatchFillType.LightUpwardDiagonal;
+
+                switch (styleType)
+                {
+                    case StyleType.Default:
+                        if (sstyle.Background.IsEmpty == true)
+                            sstyle.Background = new Background(DefaultPaletteColor);
+
+                        if (sstyle.WhiteSpaceBackground.IsEmpty == true)
+                            sstyle.WhiteSpaceBackground = new Background(Color.FromArgb(100, DefaultPaletteColor));
+
+                        if (sstyle.WhiteSpaceBorder.LinePattern == LinePattern.NotSet)
+                            sstyle.WhiteSpaceBorder.LinePattern = LinePattern.Solid;
+
+                        break;
+
+                    case StyleType.MouseOver:
+                        if (sstyle.Background.IsEmpty == true)
+                            sstyle.Background = new Background(ControlPaint.Light(DefaultPaletteColor));
+
+                        if (sstyle.WhiteSpaceBackground.IsEmpty == true)
+                            sstyle.WhiteSpaceBackground = new Background(Color.FromArgb(50, DefaultPaletteColor));
+
+                        if (sstyle.WhiteSpaceBorder.LinePattern == LinePattern.NotSet)
+                            sstyle.WhiteSpaceBorder.LinePattern = LinePattern.Solid;
+
+                        break;
+
+                    case StyleType.Selected:
+                        if (sstyle.Background.IsEmpty == true)
+                        {
+                            sstyle.Background = new Background(Color.White, DefaultPaletteColor);
+                            sstyle.Background.HatchFillType = hatch;
+                        }
+
+                        if (sstyle.Border.LineWidth < 0)
+                            sstyle.Border.LineWidth = 2;
+
+                        if (sstyle.WhiteSpaceBackground.IsEmpty == true)
+                        {
+                            sstyle.WhiteSpaceBackground = new Background(Color.White, Color.FromArgb(100, DefaultPaletteColor));
+                            sstyle.WhiteSpaceBackground.HatchFillType = hatch;
+                        }
+
+                        if (sstyle.WhiteSpaceBorder.LineWidth < 0)
+                            sstyle.WhiteSpaceBorder.LineWidth = 2;
+
+                        break;
+
+                    case StyleType.SelectedMouseOver:
+                        if (sstyle.Background.IsEmpty == true)
+                        {
+                            sstyle.Background = new Background(Color.White, ControlPaint.Light(DefaultPaletteColor));
+                            sstyle.Background.HatchFillType = hatch;
+                        }
+
+                        if (sstyle.Border.LineWidth < 0)
+                            sstyle.Border.LineWidth = 2;
+
+                        if (sstyle.WhiteSpaceBackground.IsEmpty == true)
+                        {
+                            sstyle.WhiteSpaceBackground = new Background(Color.White, Color.FromArgb(50, DefaultPaletteColor));
+                            sstyle.WhiteSpaceBackground.HatchFillType = hatch;
+                        }
+
+                        if (sstyle.WhiteSpaceBorder.LineWidth < 0)
+                            sstyle.WhiteSpaceBorder.LineWidth = 2;
+
+                        break;
+                }
+
+                if (sstyle.Border.LineColor.IsEmpty == true)
+                    sstyle.Border.LineColor = DefaultPaletteColor;
+
+                if (sstyle.WhiteSpaceBorder.LineColor.IsEmpty == true)
+                    sstyle.WhiteSpaceBorder.LineColor = DefaultPaletteColor;
+
+                if (sstyle.ExtentAverageRefLineStyle.LineColor.IsEmpty == true)
+                    sstyle.ExtentAverageRefLineStyle.LineColor = Color.DimGray;
+
+                if (sstyle.ExtentMinRefLineStyle.LineColor.IsEmpty == true)
+                    sstyle.ExtentMinRefLineStyle.LineColor = Color.DimGray;
+
+                if (sstyle.ExtentMaxRefLineStyle.LineColor.IsEmpty == true)
+                    sstyle.ExtentMaxRefLineStyle.LineColor = Color.DimGray;
+
+                if (sstyle.ExtentOuterRefLineStyle.LineColor.IsEmpty == true)
+                    sstyle.ExtentOuterRefLineStyle.LineColor = Color.DimGray;
+
+                if (sstyle.SliceOuterLabelStyle.TextColor.IsEmpty == true)
+                    sstyle.SliceOuterLabelStyle.TextColor = DefaultPaletteColor;
+
+                sstyle.ApplyDefaults();
+            }
+        }
+
+        #endregion
+
+        #region GetElementStyle
+
+        public virtual void GetElementStyle(
+            IEffectiveStyle chartElement, StyleType styleType, ref BaseVisualStyle style)
+        {
+            ChartControl chartControl = ChartControl;
+
+            if (chartControl != null)
+                chartControl.DoGetPieSeriesPointStyleEvent(this, styleType, ref style);
+        }
+
+        #endregion
+
+        #region ChartControl
+
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public ChartControl ChartControl
+        {
+            get
+            {
+                if (_ChartControl == null)
+                {
+                    if (ChartSeries != null)
+                        _ChartControl = ChartSeries.ChartControl;
+                }
+
+                return (_ChartControl);
+            }
+        }
+
+        #endregion
+
+        #region ClearEffectiveStyles
+
+        protected void ClearEffectiveStyles()
+        {
+            _EffectiveSliceStyles.InvalidateStyles();
+        }
+
+        #endregion
+
+        #region OnStyleChanged
+
+        protected virtual void OnStyleChanged(string property,
+            INotifyPropertyChanged oldValue, INotifyPropertyChanged newValue)
+        {
+            StyleChangeHandler(oldValue, newValue);
+
+            OnPropertyChanged(property);
+        }
+
+        #endregion
+
+        #region StyleChangeHandler
+
+        protected void StyleChangeHandler(
+            INotifyPropertyChanged oldValue, INotifyPropertyChanged newValue)
+        {
+            if (oldValue != null)
+                oldValue.PropertyChanged -= StyleChanged;
+
+            if (newValue != null)
+                newValue.PropertyChanged += StyleChanged;
+        }
+
+        #region StyleChanged
+
+        /// <summary>
+        /// Occurs when one of element visual styles has property changes.
+        /// Default implementation invalidates visual appearance of element.
+        /// </summary>
+        /// <param name="sender">VisualStyle that changed.</param>
+        /// <param name="e">Event arguments.</param>
+        protected void StyleChanged(object sender, PropertyChangedEventArgs e)
+        {
+            VisualChangeType changeType = ((VisualPropertyChangedEventArgs)e).ChangeType;
+
+            PieSeries series = ChartSeries;
+
+            if (series != null)
+            {
+                if (series.ChartControl != null)
+                    series.ChartControl.GlobalUpdateCount++;
+
+                if (changeType == VisualChangeType.Layout)
+                    series.InvalidateLayout();
+                else
+                    series.InvalidateRender();
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region ILegendItem
+
+        #region ChartLegendItemVisualStyles
+
+        /// <summary>
+        /// Gets or sets the visual styles for the Legend item.
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates the visual styles for the Legend item.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ChartLegendItemVisualStyles ChartLegendItemVisualStyles
+        {
+            get
+            {
+                if (_ChartLegendItemVisualStyles == null)
+                {
+                    _ChartLegendItemVisualStyles = new ChartLegendItemVisualStyles();
+
+                    StyleChangeHandler(null, _ChartLegendItemVisualStyles);
+                }
+
+                return (_ChartLegendItemVisualStyles);
+            }
+
+            set
+            {
+                if (_ChartLegendItemVisualStyles != value)
+                {
+                    ChartLegendItemVisualStyles oldValue = _ChartLegendItemVisualStyles;
+
+                    _ChartLegendItemVisualStyles = value;
+
+                    OnStyleChanged("ChartLegendItemVisualStyles", oldValue, value);
+
+                    if (oldValue != null)
+                        oldValue.Dispose();
+                }
+            }
+        }
+
+        #endregion
+
+        #region CheckedInLegend
+
+        /// <summary>
+        /// Gets or sets whether the item is checked in the Legend.
+        /// </summary>
+        [DefaultValue(true), Category("Legend")]
+        [Description("Indicates whether the item is checked in the Legend.")]
+        public bool CheckedInLegend
+        {
+            get { return (TestState(States.CheckedInLegend)); }
+
+            set
+            {
+                if (value != CheckedInLegend)
+                {
+                    SetState(States.CheckedInLegend, value);
+
+                    if (LegendItem != null)
+                        LegendItem.UpdateCheckState();
+
+                    OnPropertyChangedEx("CheckedInLegend", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowCheckBoxInLegend
+
+        /// <summary>
+        /// Gets or sets whether a checkbox for the item is shown in the Legend.
+        /// </summary>
+        [DefaultValue(false), Category("Legend")]
+        [Description("Indicates whether a checkbox for the item is shown in the Legend.")]
+        public bool ShowCheckBoxInLegend
+        {
+            get { return (TestState(States.ShowCheckBoxInLegend)); }
+
+            set
+            {
+                if (value != ShowCheckBoxInLegend)
+                {
+                    SetState(States.ShowCheckBoxInLegend, value);
+
+                    OnPropertyChangedEx("ShowCheckBoxInLegend", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowInLegend
+
+        /// <summary>
+        /// Gets or sets whether the item is shown in the Legend.
+        /// </summary>
+        [DefaultValue(true), Category("Legend")]
+        [Description("Indicates whether the item is shown in the Legend.")]
+        public bool ShowInLegend
+        {
+            get { return (TestState(States.ShowInLegend)); }
+
+            set
+            {
+                if (value != ShowInLegend)
+                {
+                    SetState(States.ShowInLegend, value);
+
+                    OnPropertyChangedEx("ShowInLegend", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowInParentLegend
+
+        /// <summary>
+        /// Gets or sets whether the item Line is shown in parent Legend(s).
+        /// </summary>
+        [DefaultValue(true), Category("Legend")]
+        [Description("Indicates whether the item Line is shown in parent Legend(s).")]
+        public bool ShowInParentLegend
+        {
+            get { return (TestState(States.ShowInParentLegend)); }
+
+            set
+            {
+                if (value != ShowInParentLegend)
+                {
+                    SetState(States.ShowInParentLegend, value);
+
+                    OnPropertyChangedEx("ShowInParentLegend", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowMarkerInLegend
+
+        /// <summary>
+        /// Gets or sets whether the item Marker is shown in the Legend.
+        /// </summary>
+        [DefaultValue(true), Category("Legend")]
+        [Description("Indicates whether the item Marker is shown in the Legend.")]
+        public bool ShowMarkerInLegend
+        {
+            get { return (TestState(States.ShowMarkerInLegend)); }
+
+            set
+            {
+                if (value != ShowMarkerInLegend)
+                {
+                    SetState(States.ShowMarkerInLegend, value);
+
+                    OnPropertyChangedEx("ShowMarkerInLegend", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region LegendItem
+
+        ///<summary>
+        /// Gets the item's parent LegendItem.
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        [Description("Indicates the item's parent LegendItem.")]
+        public ChartLegendItem LegendItem
+        {
+            get
+            {
+                if (_LegendItem == null)
+                {
+                    _LegendItem = new ChartLegendItem();
+
+                    _LegendItem.Name = (ValueX != null ? ValueX.ToString() : "");
+
+                    if (string.IsNullOrEmpty(_LegendItem.Name) == true)
+                        _LegendItem.Name = "(Psp)";
+
+                    _LegendItem.ChartItems.Add(this);
+                }
+
+                return (_LegendItem);
+            }
+
+            internal set { _LegendItem = value; }
+        }
+
+        #endregion
+
+        #region LegendText
+
+        ///<summary>
+        /// Gets or sets the text to display in the legend.
+        ///</summary>
+        [DefaultValue(null), Category("Legend")]
+        [Description("Indicates the text to display in the legend.")]
+        [NotifyParentProperty(true)]
+        public string LegendText
+        {
+            get { return (_LegendText); }
+
+            set
+            {
+                if (value != _LegendText)
+                {
+                    _LegendText = value;
+
+                    OnPropertyChangedEx("LegendText", Style.VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region GetLegendItem
+
+        /// <summary>
+        /// Creates the LegendItem for the item.
+        /// </summary>
+        /// <returns></returns>
+        public ChartLegendItem GetLegendItem()
+        {
+            ChartLegendItem item = LegendItem;
+
+            if (ShowInLegend == true)
+            {
+                item.CheckState = (CheckedInLegend == true)
+                    ? CheckState.Checked : CheckState.Unchecked;
+
+                item.ItemText = LegendText;
+                item.IsEnabled = IsEnabled;
+
+            }
+
+            return (item);
+        }
+
+        #endregion
+
+        #region GetLegendItems
+
+        /// <summary>
+        /// Creates a list of legend items associated with
+        /// the item.
+        /// </summary>
+        /// <returns></returns>
+        public List<ChartLegendItem> GetLegendItems()
+        {
+            List<ChartLegendItem> list = null;
+
+            ChartLegendItem litem = GetLegendItem();
+
+            if (litem != null)
+            {
+                list = new List<ChartLegendItem>(1);
+
+                list.Add(litem);
+            }
+
+            return (list);
+        }
+
+        #endregion
+
+        #region GetLegendItemColor
+
+        /// <summary>
+        /// Gets the default color associated with the legend item.
+        /// </summary>
+        /// <returns></returns>
+        public Color GetLegendItemColor()
+        {
+            ChartSliceVisualStyle sstyle = EffectiveSliceStyles[StyleState.Default];
+
+            Color color = sstyle.Background.Color1;
+
+            if (color.IsEmpty == false)
+                return (color);
+
+            return (Color.DimGray);
+        }
+
+        #endregion
+
+        #region RenderLegendItemMarker
+
+        /// <summary>
+        /// Renders the Legend item Marker.
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="litem"></param>
+        /// <param name="style"></param>
+        public void RenderLegendItemMarker(Graphics g,
+            ChartLegendItem litem, ChartLegendItemVisualStyle style)
+        {
+            ChartSliceVisualStyle sstyle = EffectiveSliceStyles[StyleState.Default];
+
+            Rectangle r = litem.MarkerBounds;
+            r.Inflate(-1, -1);
+
+            g.SmoothingMode = SmoothingMode.AntiAlias;
+
+            using (GraphicsPath path = new GraphicsPath())
+            {
+                Point pt = new Point(r.Right - 2, r.Bottom - 2);
+
+                r.Height += (r.Height - 4);
+                r.Width += (r.Width - 4);
+
+                path.AddArc(r, 180, 90);
+                path.AddLine(pt, pt);
+
+                path.CloseFigure();
+
+                if (IsEnabled == true)
+                {
+                    if (sstyle.Background.IsEmpty == true)
+                    {
+                        g.FillPath(Brushes.LightPink, path);
+                    }
+                    else
+                    {
+                        using (Brush br = sstyle.Background.GetBrush(r))
+                            g.FillPath(br, path);
+
+                        if (sstyle.Background.Color1.IsEmpty == false)
+                        {
+                            using (Pen pen = new Pen(sstyle.Background.Color1))
+                                g.DrawPath(pen, path);
+                        }
+                    }
+                }
+                else
+                {
+                    Background back = style.DisabledMarkerBackground;
+
+                    if (back.IsEmpty == true)
+                    {
+                        using (Brush br = new SolidBrush(Color.LightGray))
+                            g.FillPath(br, path);
+                    }
+                    else
+                    {
+                        using (Brush br = back.GetBrush(r))
+                            g.FillPath(br, path);
+
+                        if (back.Color1.IsEmpty == false)
+                        {
+                            using (Pen pen = new Pen(sstyle.Background.Color1))
+                                g.DrawPath(pen, path);
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region TrackLegendItem
+
+        /// <summary>
+        /// Gets whether legend item tracking is enabled.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool TrackLegendItem
+        {
+            get
+            {
+                if (ChartSeries != null)
+                    return (ChartSeries.TrackLegendItem);
+
+                return (false);
+            }
+        }
+
+        #endregion
+
+        #region FormatItemText
+
+        /// <summary>
+        /// Formats the provided item text.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public string FormatItemText(string text)
+        {
+            return (GetLabelText(text));
+        }
+
+        #endregion
+
+        #endregion
+
+        #region States
+
+        [Flags]
+        private enum States : uint
+        {
+            AllowDetach = (1U << 0),
+            AllowSelect = (1U << 1),
+
+            Detached = (1U << 2),
+            Selected = (1U << 3),
+
+            IsOther = (1U << 4),
+            IsInOther = (1U << 5),
+            IsInOtherEx = (1U << 6),
+
+            InnerLabelClipped = (1U << 7),
+            InnerLabelDisplayed = (1U << 8),
+
+            IsOffset = (1U << 9),
+            InscribedRectValid = (1 << 10),
+
+            CheckedInLegend = (1U << 11),
+            ShowInLegend = (1U << 12),
+            ShowInParentLegend = (1U << 13),
+            ShowCheckBoxInLegend = (1U << 14),
+            ShowMarkerInLegend = (1U << 15),
+
+            ReferenceLineDisplayOnTop = (1U << 16),
+            ShowSliceWhiteSpaceEx = (1U << 17),
+
+            HasExtent = (1U << 18),
+        }
+
+        #region TestState
+
+        private bool TestState(States state)
+        {
+            return ((_States & state) == state);
+        }
+
+        #endregion
+
+        #region SetState
+
+        private void SetState(States state, bool value)
+        {
+            if (value == true)
+                _States |= state;
+            else
+                _States &= ~state;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Copy/CopyTo
+
+        /// <summary>
+        /// Creates a copy of the PieSeriesPoint
+        /// </summary>
+        /// <returns></returns>
+        public new PieSeriesPoint Copy()
+        {
+            PieSeriesPoint copy = new PieSeriesPoint(ValueX, 0);
+
+            CopyTo(copy);
+
+            return (copy);
+        }
+
+        /// <summary>
+        /// Copies the item data to the given PieSeriesPoint.
+        /// </summary>
+        /// <param name="sp"></param>
+        public void CopyTo(PieSeriesPoint c)
+        {
+            base.CopyTo(c);
+
+            c.AllowDetach = AllowDetach;
+            c.AllowSelect = AllowSelect;
+
+            c.DetachedOffset = DetachedOffset;
+            c.InnerSliceLabel = InnerSliceLabel;
+            c.IsDetached = IsDetached;
+            c.IsInOther = IsInOther;
+            c.IsSelected = IsSelected;
+            c.Name = Name;
+            c.OuterSliceLabel = OuterSliceLabel;
+
+            if (_SeriesPoints != null)
+            {
+                PieSeriesPointCollection spc = SeriesPoints;
+
+                if (spc.Count > 0)
+                {
+                    foreach (PieSeriesPoint psp in spc)
+                    {
+                        PieSeriesPoint pspCopy = psp.Copy();
+
+                        c.SeriesPoints.Add(pspCopy);
+                    }
+                }
+            }
+
+            c.SubSliceVisualLayout = (_SliceVisualLayout != null) ? _SliceVisualLayout.Copy() : null;
+            c.SliceVisualStyles = (_SliceVisualStyles != null) ? _SliceVisualStyles.Copy() : null;
+
+            c.StartAngle = StartAngle;
+            c.SweepAngle = SweepAngle;
+
+            c.CheckedInLegend = CheckedInLegend;
+            c.LegendText = LegendText;
+            c.ShowCheckBoxInLegend = ShowCheckBoxInLegend;
+            c.ShowInLegend = ShowInLegend;
+            c.ShowInParentLegend = ShowInParentLegend;
+            c.ShowMarkerInLegend = ShowMarkerInLegend;
+        }
+
+        #endregion
+
+        #region GetSerialData
+
+        internal override SerialElementCollection GetSerialData(bool root)
+        {
+            SerialElementCollection sec = new SerialElementCollection();
+
+            if (root == true)
+                sec.AddStartElement("SeriesPoint");
+
+            sec.AddValue("AllowDetach", AllowDetach, true);
+            sec.AddValue("AllowSelect", AllowSelect, true);
+            sec.AddValue("DetachedOffset", DetachedOffset, double.NaN);
+            sec.AddValue("InnerSliceLabel", InnerSliceLabel, null);
+            sec.AddValue("IsDetached", IsDetached, false);
+            sec.AddValue("IsInOther", IsInOther, false);
+            sec.AddValue("IsSelected", IsSelected, false);
+            sec.AddValue("Name", Name, null);
+            sec.AddValue("OuterSliceLabel", OuterSliceLabel, null);
+
+            sec.AddValue("StartAngle", StartAngle, double.NaN);
+            sec.AddValue("SweepAngle", SweepAngle, double.NaN);
+
+            if (_SeriesPoints != null)
+            {
+                PieSeriesPointCollection spc = SeriesPoints;
+
+                if (spc.Count > 0)
+                {
+                    sec.AddStartElement("SeriesPoints count=\"" + spc.Count + "\"");
+
+                    foreach (PieSeriesPoint psp in spc)
+                        sec.AddElement(psp.GetSerialData());
+
+                    sec.AddEndElement("SeriesPoints");
+                }
+            }
+
+            if (_SliceVisualLayout != null)
+                sec.AddElement(_SliceVisualLayout.GetSerialData());
+
+            if (_SliceVisualStyles != null && _SliceVisualStyles.IsEmpty == false)
+                sec.AddElement(_SliceVisualStyles.GetSerialData("SliceVisualStyles"));
+
+            sec.AddValue("CheckedInLegend", CheckedInLegend, true);
+            sec.AddValue("LegendText", LegendText, null);
+            sec.AddValue("ShowCheckBoxInLegend", ShowCheckBoxInLegend, true);
+            sec.AddValue("ShowInLegend", ShowInLegend, true);
+            sec.AddValue("ShowInParentLegend", ShowInParentLegend, true);
+            sec.AddValue("ShowMarkerInLegend", ShowMarkerInLegend, true);
+
+            sec.AddElement(base.GetSerialData(false));
+
+            if (root == true)
+                sec.AddEndElement("SeriesPoint");
+
+            return (sec);
+        }
+
+        #endregion
+
+        #region PutSerialData
+
+        #region ProcessValue
+
+        internal override void ProcessValue(SerialElement se)
+        {
+            switch (se.Name)
+            {
+                case "AllowDetach":
+                    AllowDetach = bool.Parse(se.StringValue);
+                    break;
+
+                case "AllowSelect":
+                    AllowSelect = bool.Parse(se.StringValue);
+                    break;
+
+                case "DetachedOffset":
+                    DetachedOffset = double.Parse(se.StringValue);
+                    break;
+
+                case "InnerSliceLabel":
+                    InnerSliceLabel = se.StringValue;
+                    break;
+
+                case "IsDetached":
+                    IsDetached = bool.Parse(se.StringValue);
+                    break;
+
+                case "IsInOther":
+                    IsInOther = bool.Parse(se.StringValue);
+                    break;
+
+                case "IsSelected":
+                    IsSelected = bool.Parse(se.StringValue);
+                    break;
+
+                case "Name":
+                    Name = se.StringValue;
+                    break;
+
+                case "OuterSliceLabel":
+                    OuterSliceLabel = se.StringValue;
+                    break;
+
+                case "StartAngle":
+                    StartAngle = double.Parse(se.StringValue);
+                    break;
+
+                case "SweepAngle":
+                    SweepAngle = double.Parse(se.StringValue);
+                    break;
+
+                case "CheckedInLegend":
+                    CheckedInLegend = bool.Parse(se.StringValue);
+                    break;
+
+                case "LegendText":
+                    LegendText = se.StringValue;
+                    break;
+
+                case "ShowCheckBoxInLegend":
+                    ShowCheckBoxInLegend = bool.Parse(se.StringValue);
+                    break;
+
+                case "ShowInLegend":
+                    ShowInLegend = bool.Parse(se.StringValue);
+                    break;
+
+                case "ShowInParentLegend":
+                    ShowInParentLegend = bool.Parse(se.StringValue);
+                    break;
+
+                case "ShowMarkerInLegend":
+                    ShowMarkerInLegend = bool.Parse(se.StringValue);
+                    break;
+
+                default:
+                    base.ProcessValue(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region ProcessCollection
+
+        internal override void ProcessCollection(SerialElement se)
+        {
+            SerialElementCollection sec = se.Sec;
+
+            switch (se.Name)
+            {
+                case "SeriesPoints":
+                    if (se.ArrayCount > 0)
+                    {
+                        SeriesPoints = new PieSeriesPointCollection();
+
+                        sec.PutSerialData(this);
+                    }
+                    break;
+
+                case "SeriesPoint":
+                    PieSeriesPoint sp = new PieSeriesPoint();
+
+                    sec.PutSerialData(sp);
+
+                    SeriesPoints.Add(sp);
+                    break;
+
+                case "SliceVisualLayout":
+                    sec.PutSerialData(SubSliceVisualLayout);
+                    break;
+
+                case "SliceVisualStyles":
+                    se.Sec.PutSerialData(SliceVisualStyles);
+                    break;
+
+                default:
+                    base.ProcessCollection(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region INotifyPropertyChanged Members
+
+        /// <summary>
+        /// Occurs when property value has changed.
+        /// </summary>
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        #region OnPropertyChanged
+
+        /// <summary>
+        /// Raises the PropertyChanged event.
+        /// </summary>
+        /// <param name="e">Event arguments</param>
+        protected virtual void OnPropertyChanged(PropertyChangedEventArgs e)
+        {
+            if (PropertyChanged != null)
+                PropertyChanged(this, e);
+
+            VisualPropertyChangedEventArgs vce = e as VisualPropertyChangedEventArgs;
+
+            if (vce != null)
+                NotifyVisualParent(this, vce.ChangeType);
+        }
+
+        /// <summary>
+        /// Default PropertyChanged processing
+        /// </summary>
+        /// <param name="s"></param>
+        protected void OnPropertyChanged(string s)
+        {
+            if (PropertyChanged != null)
+                OnPropertyChanged(new PropertyChangedEventArgs(s));
+        }
+
+        /// <summary>
+        /// Default PropertyChanged processing
+        /// </summary>
+        /// <param name="s"></param>
+        /// <param name="changeType">invalidate</param>
+        protected void OnPropertyChangedEx(string s, VisualChangeType changeType)
+        {
+            if (PropertyChanged != null)
+                OnPropertyChanged(new VisualPropertyChangedEventArgs(s, changeType));
+        }
+
+        #endregion
+
+        #region NotifyVisualParent
+
+        internal void NotifyVisualParent(object sender, VisualChangeType vct)
+        {
+            ChartVisualElement cve = GetParentCve(sender);
+
+            if (cve != null)
+            {
+                if (vct == VisualChangeType.Recalc)
+                {
+                    cve.InvalidateRecalc();
+                    cve.InvalidateLayout();
+                }
+                else if (vct == VisualChangeType.Layout)
+                {
+                    cve.InvalidateLayout();
+                }
+                else
+                {
+                    PieSeriesPoint psp = (PieSeriesPoint)sender;
+
+                    cve.InvalidateRender(psp.PathBounds);
+
+                    if (psp.PieLabel != null)
+                    {
+                        if (psp.PieLabel.Bounds.IsEmpty == false)
+                        {
+                            cve.InvalidateRender(psp.PieLabel.Bounds);
+
+                            if (psp.PieLabel.ConnectorBounds.IsEmpty == false)
+                                cve.InvalidateRender(psp.PieLabel.ConnectorBounds);
+                        }
+                    }
+                }
+            }
+        }
+
+        #region GetParentCve
+
+        private ChartVisualElement GetParentCve(object sender)
+        {
+            object parent = sender;
+
+            while (parent != null)
+            {
+                if (parent is ChartVisualElement)
+                    break;
+
+                if (parent is PieSeriesPoint)
+                    parent = ((PieSeriesPoint)parent).Parent;
+
+                else if (parent is PieSeriesPointCollection)
+                    parent = ((PieSeriesPointCollection)parent).Parent;
+
+                else
+                    parent = null;
+            }
+
+            return ((ChartVisualElement)parent);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region InvalidateRender
+
+        public void InvalidateRender()
+        {
+            ChartVisualElement cve = GetParentCve(Parent);
+
+            if (cve != null)
+            {
+                cve.InvalidateRender(PathBounds);
+
+                if (PieLabel != null)
+                {
+                    if (PieLabel.Bounds.IsEmpty == false)
+                    {
+                        cve.InvalidateRender(PieLabel.Bounds);
+
+                        if (PieLabel.ConnectorBounds.IsEmpty == false)
+                            cve.InvalidateRender(PieLabel.ConnectorBounds);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region IDispose
+
+        public override void Dispose()
+        {
+            SubSliceVisualLayout = null;
+            SliceVisualStyles = null;
+
+ 	        base.Dispose();
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    [Editor("DevComponents.Charts.Design.SeriesPointCollectionEditor, DevComponents.Charts.Design, " +
+        "Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(UITypeEditor))]
+    public class SeriesPointCollection : CustomCollection<SeriesPoint>
+    {
+    }
+
+    #region SeriesPoint
+
+    [DesignTimeVisible(false), ToolboxItem(false)]
+    public class SeriesPoint : IProcessSerialElement, IDisposable
+    {
+        #region Private variables
+
+        private object _ValueX;
+        private object[] _ValueY;
+
+        private Point[] _Point;
+        private int _SeriesValidationCount;
+
+        private Size _PointSize;
+
+        private States _States;
+
+        private object _DataItem;
+        private object _Tag;
+
+        #endregion
+
+        #region Constructors
+
+        public SeriesPoint()
+            : this(0, 0)
+        {
+        }
+
+        public SeriesPoint(object xValue)
+        {
+            _Point = new Point[1];
+
+            ValueX = xValue;
+
+            InitDefaultStates();
+        }
+
+        public SeriesPoint(object xValue, object yValue)
+        {
+            _ValueY = new object[1];
+            _Point = new Point[1];
+
+            ValueX = xValue;
+
+            _ValueY[0] = yValue;
+
+            InitDefaultStates();
+        }
+
+        public SeriesPoint(object xValue, object yValue, object size)
+        {
+            _ValueY = new object[2];
+            _Point = new Point[1];
+
+            ValueX = xValue;
+
+            _ValueY[0] = yValue;
+            _ValueY[1] = size;
+
+            InitDefaultStates();
+        }
+
+        public SeriesPoint(object xValue, object yValue, object size, object intensity)
+        {
+            _ValueY = new object[3];
+            _Point = new Point[1];
+
+            ValueX = xValue;
+
+            _ValueY[0] = yValue;
+            _ValueY[1] = size;
+            _ValueY[2] = intensity;
+
+            InitDefaultStates();
+        }
+
+        public SeriesPoint(object xValue, object[] yValue)
+        {
+            _ValueY = new object[yValue.Length];
+            _Point = new Point[yValue.Length];
+
+            ValueX = xValue;
+
+            for (int i = 0; i < yValue.Length; i++)
+            {
+                _ValueY[i] = yValue[i];
+
+                if (i > 0)
+                {
+                    if (IsQuantitativeYValue != IsQuantitativeValue(yValue[i]))
+                        throw new ArgumentException("Cannot have mixed qualitative/quantitative yValues");
+                }
+            }
+
+            InitDefaultStates();
+        }
+
+        #endregion
+
+        #region InitDefaultStates
+
+        private void InitDefaultStates()
+        {
+            SetState(States.Visible, true);
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region DataItem
+
+        ///<summary>
+        /// Gets the object to which the Point is bound.
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public object DataItem
+        {
+            get { return (_DataItem); }
+            internal set { _DataItem = value; }
+        }
+
+        #endregion
+
+        #region IsEmpty
+
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsEmpty
+        {
+            get { return (IsEmptyPoint || IsEmptyValue); }
+        }
+
+        #endregion
+
+        #region IsEmptyPoint
+
+        /// <summary>
+        /// Gets or sets whether the point is an 'Empty' (or missing) Point.
+        /// </summary>
+        [DefaultValue(false)]
+        public virtual bool IsEmptyPoint
+        {
+            get { return (TestState(States.IsEmptyPoint)); }
+            set { SetState(States.IsEmptyPoint, value); }
+        }
+
+        #endregion
+
+        #region IsEmptyValue
+
+        /// <summary>
+        /// Gets whether the point is an 'Empty' value.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsEmptyValue
+        {
+            get { return (TestState(States.IsEmptyValue)); }
+            internal set { SetState(States.IsEmptyValue, value); }
+        }
+
+        #endregion
+
+        #region IsQualitativeXValue
+
+        /// <summary>
+        /// Gets whether the X Value is a Qualitative value.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsQualitativeXValue
+        {
+            get { return (TestState(States.IsQualitativeXValue)); }
+            internal set { SetState(States.IsQualitativeXValue, value); }
+        }
+
+        #endregion
+
+        #region IsQualitativeYValue
+
+        /// <summary>
+        /// Gets whether the Y Values are a Qualitative values.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsQualitativeYValue
+        {
+            get { return (IsQuantitativeYValue == false); }
+        }
+
+        #endregion
+
+        #region IsQuantitativeXValue
+
+        /// <summary>
+        /// Gets whether the X Value is a Quantitative value.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsQuantitativeXValue
+        {
+            get { return (!IsQualitativeXValue); }
+            internal set { IsQualitativeXValue = !value; }
+        }
+
+        #endregion
+
+        #region IsQuantitativeYValue
+
+        /// <summary>
+        /// Gets whether the Y Values are Quantitative values.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsQuantitativeYValue
+        {
+            get
+            {
+                if (_ValueY != null && _ValueY.Length > 0)
+                    return (IsQuantitativeValue(_ValueY[0]));
+
+                return (true);
+            }
+        }
+
+        #endregion
+
+        #region Tag
+
+        ///<summary>
+        /// Gets or sets user-defined data associated with the point
+        ///</summary>
+        [DefaultValue(null)]
+        [Description("Indicates the user-defined data associated with the point.")]
+        [TypeConverter("DevComponents.Charts.Design.PointValueConverter, DevComponents.Charts.Design," +
+            "Version=14.1.0.37, Culture=neutral, PublicKeyToken=90f470f34c89ccaf")]
+        public object Tag
+        {
+            get { return (_Tag); }
+            set { _Tag = value; }
+        }
+
+        #endregion
+
+        #region ValueX
+
+        /// <summary>
+        /// Gets or sets the X-Axis Value.
+        /// </summary>
+        [Category("Data")]
+        [Description("Indicates the X-Axis Value.")]
+        [TypeConverter("DevComponents.Charts.Design.PointValueConverter, DevComponents.Charts.Design," +
+            "Version=14.1.0.37, Culture=neutral, PublicKeyToken=90f470f34c89ccaf")]
+        public object ValueX
+        {
+            get { return (_ValueX); }
+
+            set
+            {
+                _ValueX = value;
+
+                IsQuantitativeXValue = IsQuantitativeValue(value);
+            }
+        }
+
+        #endregion
+
+        #region ValueY
+
+        /// <summary>
+        /// Gets or sets the Y-Axis Values.
+        /// </summary>
+        [Category("Data")]
+        [Description("Indicates the Y-Axis Values.")]
+        [Editor("DevComponents.Charts.Design.SeriesPointValueEditor, DevComponents.Charts.Design, " +
+                "Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(UITypeEditor))]
+        public object[] ValueY
+        {
+            get { return (_ValueY); }
+            set { _ValueY = value; }
+        }
+
+        #endregion
+
+        #region Visible
+
+        /// <summary>
+        /// Gets or sets whether the point is Visible.
+        /// </summary>
+        [DefaultValue(true)]
+        public virtual bool Visible
+        {
+            get { return (TestState(States.Visible)); }
+            set { SetState(States.Visible, value); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region Point
+
+        internal Point[] Point
+        {
+            get { return (_Point); }
+            set { _Point = value; }
+        }
+
+        #endregion
+
+        #region PointSize
+
+        internal Size PointSize
+        {
+            get { return (_PointSize); }
+            set { _PointSize = value; }
+        }
+
+        #endregion
+
+        #region SeriesValidationCount
+
+        internal int SeriesValidationCount
+        {
+            get { return (_SeriesValidationCount); }
+            set { _SeriesValidationCount = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InvalidatePoints
+
+        internal void InvalidatePoints()
+        {
+            if (_Point != null)
+                _Point = new Point[_Point.Length];
+        }
+
+        #endregion
+
+        #region IsQuantitativeValue
+
+        private bool IsQuantitativeValue(object value)
+        {
+            if (value is string || value is bool || value is char)
+                return (false);
+
+            return (true);
+        }
+
+        #endregion
+
+        #region IsQualitativeValue
+
+        private bool IsQualitativeValue(object value)
+        {
+            return (IsQuantitativeValue(value) == false);
+        }
+
+        #endregion
+
+        #region GetScaleType
+
+        public static ScaleType GetScaleType(Type dataType)
+        {
+            if (dataType == typeof(DateTime))
+                return (ScaleType.DateTime);
+
+            if (dataType == typeof(string) || dataType == typeof(bool) || dataType == typeof(char))
+                return (ScaleType.Qualitative);
+
+            return (ScaleType.Quantitative);
+        }
+
+        #endregion
+
+        #region Copy/CopyTo
+
+        /// <summary>
+        /// Creates a copy of the SeriesPoint
+        /// </summary>
+        /// <returns></returns>
+        public SeriesPoint Copy()
+        {
+            SeriesPoint copy = new SeriesPoint(ValueX);
+
+            CopyTo(copy);
+
+            return (copy);
+        }
+
+        /// <summary>
+        /// Copies the item data to the given SeriesPoint.
+        /// </summary>
+        /// <param name="sp"></param>
+        public void CopyTo(SeriesPoint sp)
+        {
+            sp.IsEmptyPoint = IsEmptyPoint;
+            sp.Tag = Tag;
+
+            sp.ValueX = ValueX;
+
+            if (ValueY != null)
+            {
+                sp.ValueY = new object[ValueY.Length];
+                sp.Point = new Point[ValueY.Length];
+
+                for (int i = 0; i < ValueY.Length; i++)
+                    sp.ValueY[i] = ValueY[i];
+            }
+        }
+
+        #endregion
+
+        #region GetSerialData
+
+        internal virtual SerialElementCollection GetSerialData()
+        {
+            return (GetSerialData(true));
+        }
+
+        internal virtual SerialElementCollection GetSerialData(bool root)
+        {
+            SerialElementCollection sec = new SerialElementCollection();
+
+            if (root == true)
+                sec.AddStartElement("SeriesPoint");
+
+            sec.AddDataValue("Tag", Tag, null);
+            sec.AddDataValue("ValueX", ValueX);
+
+            if (ValueY != null)
+            {
+                if (ValueY.Length == 1)
+                {
+                    sec.AddDataValue("ValueY0", ValueY[0]);
+                }
+                else
+                {
+                    sec.AddStartElement("ValueYs count=\"" + ValueY.Length + "\"");
+
+                    for (int i = 0; i < ValueY.Length; i++)
+                        sec.AddDataValue("ValueY", ValueY[i]);
+
+                    sec.AddEndElement("ValueYs");
+                }
+            }
+
+            if (root == true)
+                sec.AddEndElement("SeriesPoint");
+
+            return (sec);
+        }
+
+        #endregion
+
+        #region PutSerialData
+
+        #region ProcessValue
+
+        void IProcessSerialElement.ProcessValue(SerialElement se)
+        {
+            ProcessValue(se);
+        }
+
+        internal virtual void ProcessValue(SerialElement se)
+        {
+            switch (se.Name)
+            {
+                case "Tag":
+                    Tag = se.DataValue;
+                    break;
+
+                case "ValueX":
+                    ValueX = se.DataValue;
+                    break;
+
+                case "ValueY":
+                    ValueY[se.ValueIndex] = se.DataValue;
+                    break;
+
+                case "ValueY0":
+                    ValueY = new object[1];
+                    ValueY[0] = se.DataValue;
+                    break;
+
+                default:
+                    throw new Exception("Unknown Serial Value (" + se.Name + ")");
+            }
+        }
+
+        #endregion
+
+        #region ProcessCollection
+
+        void IProcessSerialElement.ProcessCollection(SerialElement se)
+        {
+            ProcessCollection(se);
+        }
+
+        internal virtual void ProcessCollection(SerialElement se)
+        {
+            switch (se.Name)
+            {
+                case "ValueYs":
+                    if (se.ArrayCount > 0)
+                    {
+                        ValueY = new object[se.ArrayCount];
+
+                        se.Sec.PutSerialData(this);
+                    }
+                    break;
+
+                default:
+                    throw new Exception("Unknown Serial Collection (" + se.Name + ")");
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region States
+
+        [Flags]
+        private enum States : uint
+        {
+            IsQualitativeXValue = (1U << 0),
+            IsQualitativeYValue = (1U << 1),
+
+            IsEmptyPoint = (1U << 2),
+            IsEmptyValue = (1U << 3),
+
+            Visible = (1U << 4),
+        }
+
+        #region TestState
+
+        private bool TestState(States state)
+        {
+            return ((_States & state) == state);
+        }
+
+        #endregion
+
+        #region SetState
+
+        private void SetState(States state, bool value)
+        {
+            if (value == true)
+                _States |= state;
+            else
+                _States &= ~state;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ToString
+
+        public override string ToString()
+        {
+            StringBuilder sb = new StringBuilder();
+
+            sb.Append("SeriesPoint (");
+            sb.Append(FormatToStringValue(ValueX));
+            sb.Append(",");
+
+            if (ValueY != null && ValueY.Length > 0)
+            {
+                if (ValueY.Length > 1)
+                    sb.Append("[");
+
+                foreach (object value in ValueY)
+                {
+                    sb.Append(FormatToStringValue(value));
+                    sb.Append(",");
+                }
+
+                sb.Length--;
+
+                if (ValueY.Length > 1)
+                    sb.Append("]");
+            }
+
+            sb.Append(")");
+
+            return (sb.ToString());
+        }
+
+        #region FormatToStringValue
+
+        private string FormatToStringValue(object value)
+        {
+            if (value == null)
+                return ("<null>");
+
+            if (value is string)
+                return ("\"" + value + "\"");
+
+            if (value is int)
+                return (value.ToString());
+
+            if (value is DateTime)
+                return (value.ToString());
+
+            return (String.Format("{0:0.0###############}", value));
+        }
+
+        #endregion
+
+        #endregion
+    
+        #region IDispose
+
+        public virtual void Dispose()
+        {
+        }
+
+        #endregion
+}
+
+    #region PointValueConvertor
+
+    ///<summary>
+    /// PointValueConvertor
+    ///</summary>
+    public class PointValueConvertor : BlankExpandableObjectConverter
+    {
+        public override object ConvertTo(
+            ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+        {
+            if (destinationType == typeof(string))
+            {
+                if (value == null)
+                    return ("<null>");
+
+                if (value is string)
+                    return ("\"" + value + "\"");
+
+                if (value is int)
+                    return (value.ToString());
+
+                if (value is DateTime)
+                    return (value.ToString());
+
+                return (String.Format("{0:0.0}", value));
+            }
+
+            return (base.ConvertTo(context, culture, value, destinationType));
+        }
+    }
+
+    #endregion
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/TextDrawing.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/TextDrawing.cs
new file mode 100644
index 00000000..9a6561e6
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/TextDrawing.cs	
@@ -0,0 +1,250 @@
+using System;
+using System.Drawing;
+using System.Windows.Forms;
+using System.Drawing.Text;
+
+namespace DevComponents.DotNetBar.Charts
+{
+    internal class TextDrawing
+    {
+        #region Public / internal variables
+
+        public static bool UseTextRenderer = true;
+        public static bool TextDrawingEnabled = true;
+
+        internal static bool UseGenericDefault = false;
+
+        #endregion
+
+        #region DrawString
+
+        public static void DrawString(Graphics g,
+            string text, Font font, Color color, int x, int y, eTextFormat format)
+        {
+            DrawString(g, text, font, color, new Rectangle(x, y, 0, 0), format);
+        }
+
+        public static void DrawString(Graphics g,
+            string text, Font font, Color color, Rectangle bounds, eTextFormat format)
+        {
+            if (UseTextRenderer && (format & eTextFormat.Vertical) == 0)
+                TextRenderer.DrawText(g, text, font, bounds, color, GetTextFormatFlags(format));
+            else
+                DrawStringLegacy(g, text, font, color, bounds, format);
+        }
+
+        #endregion
+
+        #region DrawStringLegacy
+
+        public static void DrawStringLegacy(Graphics g,
+            string text, Font font, Color color, Rectangle bounds, eTextFormat format)
+        {
+            if (color.IsEmpty == false && TextDrawingEnabled == true)
+            {
+                using (SolidBrush brush = new SolidBrush(color))
+                {
+                    using (StringFormat sf = GetStringFormat(format))
+                        g.DrawString(text, font, brush, bounds, sf);
+                }
+            }
+        }
+
+        #endregion
+
+        #region MeasureString
+
+        public static Size MeasureString(Graphics g,
+            string text, Font font)
+        {
+            return MeasureString(g, text, font, Size.Empty, eTextFormat.Default);
+        }
+
+        public static Size MeasureString(Graphics g,
+            string text, Font font, int proposedWidth, eTextFormat format)
+        {
+            return MeasureString(g, text, font, new Size(proposedWidth, 0), format);
+        }
+
+        public static Size MeasureString(Graphics g,
+            string text, Font font, int proposedWidth)
+        {
+            return MeasureString(g, text, font, new Size(proposedWidth, 0), eTextFormat.Default);
+        }
+
+        public static Size MeasureString(Graphics g,
+            string text, Font font, Size proposedSize, eTextFormat format)
+        {
+            if (UseTextRenderer && (format & eTextFormat.Vertical) == 0)
+            {
+                format = format & ~(format & eTextFormat.VerticalCenter); // Bug in .NET Framework 2.0
+                format = format & ~(format & eTextFormat.Bottom); // Bug in .NET Framework 2.0
+                format = format & ~(format & eTextFormat.HorizontalCenter); // Bug in .NET Framework 2.0
+                format = format & ~(format & eTextFormat.Right); // Bug in .NET Framework 2.0
+                format = format & ~(format & eTextFormat.EndEllipsis); // Bug in .NET Framework 2.0
+
+                return (Size.Ceiling(TextRenderer.MeasureText(g, text, font, proposedSize, GetTextFormatFlags(format))));
+            }
+
+            using (StringFormat sf = GetStringFormat(format))
+                return Size.Ceiling(g.MeasureString(text, font, proposedSize, sf));
+        }
+
+        #endregion
+
+        #region MeasureStringLegacy
+
+        public static Size MeasureStringLegacy(Graphics g,
+            string text, Font font, Size proposedSize, eTextFormat format)
+        {
+            using (StringFormat sf = GetStringFormat(format))
+                return (g.MeasureString(text, font, proposedSize, sf).ToSize());
+        }
+
+        #endregion
+
+        #region TranslateHorizontal
+
+        public static eTextFormat TranslateHorizontal(StringAlignment align)
+        {
+            if (align == StringAlignment.Center)
+                return (eTextFormat.HorizontalCenter);
+
+            if (align == StringAlignment.Far)
+                return (eTextFormat.Right);
+
+            return (eTextFormat.Default);
+        }
+
+        #endregion
+
+        #region TranslateVertical
+
+        public static eTextFormat TranslateVertical(StringAlignment align)
+        {
+            if (align == StringAlignment.Center)
+                return (eTextFormat.VerticalCenter);
+
+            if (align == StringAlignment.Far)
+                return (eTextFormat.Bottom);
+
+            return (eTextFormat.Default);
+        }
+
+        #endregion
+
+        #region GetTextFormatFlags
+
+        private static TextFormatFlags GetTextFormatFlags(eTextFormat format)
+        {
+            format |= eTextFormat.PreserveGraphicsTranslateTransform |
+                eTextFormat.PreserveGraphicsClipping;
+
+            if ((format & eTextFormat.SingleLine) == eTextFormat.SingleLine &&
+                (format & eTextFormat.WordBreak) == eTextFormat.WordBreak)
+            {
+                format = format & ~(format & eTextFormat.SingleLine);
+            }
+
+            return (TextFormatFlags)format;
+        }
+
+        #endregion
+
+        #region GetStringFormat
+
+        public static StringFormat GetStringFormat(eTextFormat format)
+        {
+            StringFormat sf = new StringFormat(UseGenericDefault
+                ? StringFormat.GenericDefault : StringFormat.GenericTypographic);
+
+            if (format == eTextFormat.Default)
+                return sf;
+
+            if ((format & eTextFormat.HorizontalCenter) == eTextFormat.HorizontalCenter)
+                sf.Alignment = StringAlignment.Center;
+
+            else if ((format & eTextFormat.Right) == eTextFormat.Right)
+                sf.Alignment = StringAlignment.Far;
+
+            if ((format & eTextFormat.VerticalCenter) == eTextFormat.VerticalCenter)
+                sf.LineAlignment = StringAlignment.Center;
+
+            else if ((format & eTextFormat.Bottom) == eTextFormat.Bottom)
+                sf.LineAlignment = StringAlignment.Far;
+
+            if ((format & eTextFormat.EndEllipsis) == eTextFormat.EndEllipsis)
+                sf.Trimming = StringTrimming.EllipsisCharacter;
+            else
+                sf.Trimming = StringTrimming.Character;
+
+            if ((format & eTextFormat.HidePrefix) == eTextFormat.HidePrefix)
+                sf.HotkeyPrefix = HotkeyPrefix.Hide;
+            else if ((format & eTextFormat.NoPrefix) == eTextFormat.NoPrefix)
+                sf.HotkeyPrefix = HotkeyPrefix.None;
+            else
+                sf.HotkeyPrefix = HotkeyPrefix.Show;
+
+            if ((format & eTextFormat.WordBreak) == eTextFormat.WordBreak)
+                sf.FormatFlags = sf.FormatFlags & ~(sf.FormatFlags & StringFormatFlags.NoWrap);
+            else
+                sf.FormatFlags |= StringFormatFlags.NoWrap;
+
+            if ((format & eTextFormat.LeftAndRightPadding) == eTextFormat.LeftAndRightPadding)
+                sf.FormatFlags |= StringFormatFlags.MeasureTrailingSpaces;
+
+            if ((format & eTextFormat.RightToLeft) == eTextFormat.RightToLeft)
+                sf.FormatFlags |= StringFormatFlags.DirectionRightToLeft;
+
+            if ((format & eTextFormat.Vertical) == eTextFormat.Vertical)
+                sf.FormatFlags |= StringFormatFlags.DirectionVertical;
+
+            if ((format & eTextFormat.NoClipping) == eTextFormat.NoClipping)
+                sf.FormatFlags |= StringFormatFlags.NoClip;
+
+            return (sf);
+        }
+
+        #endregion
+    }
+
+    #region enums
+
+    #region eTextFormat
+    [Flags]
+    internal enum eTextFormat
+    {
+        Bottom = 8,
+        Default = 0,
+        EndEllipsis = 0x8000,
+        ExpandTabs = 0x40,
+        ExternalLeading = 0x200,
+        GlyphOverhangPadding = 0,
+        HidePrefix = 0x100000,
+        HorizontalCenter = 1,
+        Internal = 0x1000,
+        Left = 0,
+        LeftAndRightPadding = 0x20000000,
+        ModifyString = 0x10000,
+        NoClipping = 0x100,
+        NoFullWidthCharacterBreak = 0x80000,
+        NoPadding = 0x10000000,
+        NoPrefix = 0x800,
+        PathEllipsis = 0x4000,
+        PrefixOnly = 0x200000,
+        PreserveGraphicsClipping = 0x1000000,
+        PreserveGraphicsTranslateTransform = 0x2000000,
+        Right = 2,
+        RightToLeft = 0x20000,
+        SingleLine = 0x20,
+        TextBoxControl = 0x2000,
+        Top = 0,
+        VerticalCenter = 4,
+        WordBreak = 0x10,
+        WordEllipsis = 0x40000,
+        Vertical = 0x40000000
+    }
+    #endregion
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/TreeMap/TreeMap.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/TreeMap/TreeMap.cs
new file mode 100644
index 00000000..a5aba092
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/TreeMap/TreeMap.cs	
@@ -0,0 +1,10 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace DevComponents.DotNetBar.Charts
+{
+    public class TreeMap : BaseChart
+    {
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/XyChart/AxisStripe.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/XyChart/AxisStripe.cs
new file mode 100644
index 00000000..97989857
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/XyChart/AxisStripe.cs	
@@ -0,0 +1,814 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.Charts.Style;
+
+namespace DevComponents.DotNetBar.Charts
+{
+    /// <summary>
+    /// Represents the collection of Axis Stripes.
+    /// </summary>
+    [Editor("DevComponents.Charts.Design.AxisStripeCollectionEditor, DevComponents.Charts.Design, " +
+        "Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(UITypeEditor))]
+    public class AxisStripeCollection : CustomNamedCollection<AxisStripe>
+    {
+        public AxisStripeCollection()
+        {
+        }
+
+        #region GetUniqueName
+
+        public string GetUniqueName()
+        {
+            return (GetUniqueName("Stripe"));
+        }
+
+        #endregion
+    }
+
+    /// <summary>
+    /// Element describing a color stripe on the chart.  Each AxisStripe
+    /// is associated with a primary or Ancillary Axis.
+    /// </summary>
+    public class AxisStripe : ChartVisualElement, ILegendItem
+    {
+        #region Private variables
+
+        private States _States;
+
+        private object _MinValue;
+        private object _MaxValue;
+        private AxisStripeVisualStyle _AxisStripeVisualStyle;
+
+        private string _LegendText;
+        private ChartLegendItem _LegendItem;
+        private ChartLegendItemVisualStyles _ChartLegendItemVisualStyles;
+
+        #endregion
+
+        #region Constructors
+
+        /// <summary>
+        /// Create a new AxisStripe.
+        /// </summary>
+        /// <param name="name"></param>
+        /// <param name="minValue"></param>
+        /// <param name="maxValue"></param>
+        public AxisStripe(string name, object minValue, object maxValue)
+            : this()
+        {
+            Name = name;
+
+            MinValue = minValue;
+            MaxValue = maxValue;
+        }
+
+        /// <summary>
+        /// Create a new AxisStripe.
+        /// </summary>
+        /// <param name="name"></param>
+        public AxisStripe(string name)
+            : this()
+        {
+            Name = name;
+        }
+
+        /// <summary>
+        /// Create a new AxisStripe.
+        /// </summary>
+        public AxisStripe()
+        {
+            InitDefaultStates();
+        }
+
+        #endregion
+
+        #region InitDefaultStates
+
+        private void InitDefaultStates()
+        {
+            SetState(States.CheckedInLegend, true);
+            SetState(States.ShowInLegend, true);
+            SetState(States.ShowInParentLegend, true);
+            SetState(States.ShowCheckBoxInLegend, true);
+            SetState(States.ShowMarkerInLegend, true);
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region AxisStripeVisualStyle
+
+        /// <summary>
+        /// Gets or sets the visual style for the AxisStripe.
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates the visual style for the AxisStripe.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public AxisStripeVisualStyle AxisStripeVisualStyle
+        {
+            get
+            {
+                if (_AxisStripeVisualStyle == null)
+                {
+                    _AxisStripeVisualStyle = new AxisStripeVisualStyle();
+
+                    StyleVisualChangeHandler(null, _AxisStripeVisualStyle);
+                }
+
+                return (_AxisStripeVisualStyle);
+            }
+
+            set
+            {
+                if (_AxisStripeVisualStyle != value)
+                {
+                    AxisStripeVisualStyle oldValue = _AxisStripeVisualStyle;
+
+                    _AxisStripeVisualStyle = value;
+
+                    OnVisualStyleChanged("AxisStripeVisualStyle", oldValue, value);
+
+                    if (oldValue != null)
+                        oldValue.Dispose();
+                }
+            }
+        }
+
+        #endregion
+
+        #region IsDisplayed
+
+        ///<summary>
+        /// Gets whether the Stripe is displayed (must be Visible
+        /// and appropriately 'checked' if presented in the Legend).
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsDisplayed
+        {
+            get
+            {
+                return ((Visible == true) &&
+                        (ShowCheckBoxInLegend == false || CheckedInLegend == true));
+            }
+        }
+
+        #endregion
+
+        #region MaxValue
+
+        ///<summary>
+        /// Gets or sets the maximum axis stripe value.
+        ///</summary>
+        [DefaultValue(null), Category("Data")]
+        [Description("Indicates the maximum axis stripe value.")]
+        [TypeConverter("DevComponents.Charts.Design.PointValueConverter, DevComponents.Charts.Design," +
+            "Version=14.1.0.37, Culture=neutral, PublicKeyToken=90f470f34c89ccaf")]
+        public object MaxValue
+        {
+            get { return (_MaxValue); }
+
+            set
+            {
+                if (value != _MaxValue)
+                {
+                    _MaxValue = value;
+
+                    OnPropertyChangedEx("MaxValue", Style.VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region MinValue
+
+        ///<summary>
+        /// Gets or sets the minimum axis stripe value.
+        ///</summary>
+        [DefaultValue(null), Category("Data")]
+        [Description("Indicates the minimum axis stripe value.")]
+        [TypeConverter("DevComponents.Charts.Design.PointValueConverter, DevComponents.Charts.Design," +
+            "Version=14.1.0.37, Culture=neutral, PublicKeyToken=90f470f34c89ccaf")]
+        public object MinValue
+        {
+            get { return (_MinValue); }
+
+            set
+            {
+                if (value != _MinValue)
+                {
+                    _MinValue = value;
+
+                    OnPropertyChangedEx("MinValue", Style.VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region MeasureOverride
+
+        protected override void MeasureOverride(ChartLayoutInfo layoutInfo)
+        {
+        }
+
+        #endregion
+
+        #region ArrangeOverride
+
+        protected override void ArrangeOverride(ChartLayoutInfo layoutInfo)
+        {
+        }
+
+        #endregion
+
+        #region RenderOverride
+
+        protected override void RenderOverride(ChartRenderInfo renderInfo)
+        {
+        }
+
+        #endregion
+
+        #region Style support
+
+        #region InvalidateStyle
+
+        ///<summary>
+        ///Invalidate the cached Styles
+        ///</summary>
+        public void InvalidateStyle()
+        {
+            ClearEffectiveStyles();
+        }
+
+        #endregion
+
+        #region ClearEffectiveStyles
+
+        protected override void ClearEffectiveStyles()
+        {
+            base.ClearEffectiveStyles();
+
+            if (LegendItem != null)
+                LegendItem.EffectiveStyles.InvalidateStyles();
+        }
+
+        #endregion
+
+        #region StyleChanged
+
+        protected override void StyleChanged(object sender, PropertyChangedEventArgs e)
+        {
+            base.StyleChanged(sender, e);
+
+            if (sender is ChartLegendItemVisualStyles && LegendItem != null)
+                InvalidateRender(LegendItem.Bounds);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ILegendItem
+
+        #region ChartLegendItemVisualStyles
+
+        /// <summary>
+        /// Gets or sets the visual styles for the Legend item.
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates the visual styles for the Legend item.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ChartLegendItemVisualStyles ChartLegendItemVisualStyles
+        {
+            get
+            {
+                if (_ChartLegendItemVisualStyles == null)
+                {
+                    _ChartLegendItemVisualStyles = new ChartLegendItemVisualStyles();
+
+                    StyleVisualChangeHandler(null, _ChartLegendItemVisualStyles);
+                }
+
+                return (_ChartLegendItemVisualStyles);
+            }
+
+            set
+            {
+                if (_ChartLegendItemVisualStyles != value)
+                {
+                    ChartLegendItemVisualStyles oldValue = _ChartLegendItemVisualStyles;
+
+                    _ChartLegendItemVisualStyles = value;
+
+                    OnStyleChanged("ChartLegendItemVisualStyles", oldValue, value);
+
+                    if (oldValue != null)
+                        oldValue.Dispose();
+                }
+            }
+        }
+
+        #endregion
+
+        #region CheckedInLegend
+
+        /// <summary>
+        /// Gets or sets whether the ReferenceLine is checked in the Legend.
+        /// </summary>
+        [DefaultValue(true), Category("Legend")]
+        [Description("Indicates whether the ReferenceLine is checked in the Legend.")]
+        public bool CheckedInLegend
+        {
+            get { return (TestState(States.CheckedInLegend)); }
+
+            set
+            {
+                if (value != CheckedInLegend)
+                {
+                    SetState(States.CheckedInLegend, value);
+
+                    if (LegendItem != null)
+                        LegendItem.UpdateCheckState();
+                    
+                    OnPropertyChangedEx("CheckedInLegend", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowCheckBoxInLegend
+
+        /// <summary>
+        /// Gets or sets whether a checkbox for the ReferenceLine is shown in the Legend.
+        /// </summary>
+        [DefaultValue(true), Category("Legend")]
+        [Description("Indicates whether a checkbox for the ReferenceLine is shown in the Legend.")]
+        public bool ShowCheckBoxInLegend
+        {
+            get { return (TestState(States.ShowCheckBoxInLegend)); }
+
+            set
+            {
+                if (value != ShowCheckBoxInLegend)
+                {
+                    SetState(States.ShowCheckBoxInLegend, value);
+
+                    OnPropertyChangedEx("ShowCheckBoxInLegend", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowInLegend
+
+        /// <summary>
+        /// Gets or sets whether the ReferenceLine is shown in the Legend.
+        /// </summary>
+        [DefaultValue(true), Category("Legend")]
+        [Description("Indicates whether the ReferenceLine is shown in the Legend.")]
+        public bool ShowInLegend
+        {
+            get { return (TestState(States.ShowInLegend)); }
+
+            set
+            {
+                if (value != ShowInLegend)
+                {
+                    SetState(States.ShowInLegend, value);
+
+                    OnPropertyChangedEx("ShowInLegend", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowInParentLegend
+
+        /// <summary>
+        /// Gets or sets whether the Reference Line is shown in parent Legend(s).
+        /// </summary>
+        [DefaultValue(true), Category("Legend")]
+        [Description("Indicates whether the Reference Line is shown in parent Legend(s).")]
+        public bool ShowInParentLegend
+        {
+            get { return (TestState(States.ShowInParentLegend)); }
+
+            set
+            {
+                if (value != ShowInParentLegend)
+                {
+                    SetState(States.ShowInParentLegend, value);
+
+                    OnPropertyChangedEx("ShowInParentLegend", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowMarkerInLegend
+
+        /// <summary>
+        /// Gets or sets whether the ReferenceLine Marker is shown in the Legend.
+        /// </summary>
+        [DefaultValue(true), Category("Legend")]
+        [Description("Indicates whether the ReferenceLine Marker is shown in the Legend.")]
+        public bool ShowMarkerInLegend
+        {
+            get { return (TestState(States.ShowMarkerInLegend)); }
+
+            set
+            {
+                if (value != ShowMarkerInLegend)
+                {
+                    SetState(States.ShowMarkerInLegend, value);
+
+                    OnPropertyChangedEx("ShowMarkerInLegend", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region LegendItem
+
+        ///<summary>
+        /// Gets the item's parent LegendItem.
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        [Description("Indicates the item's parent LegendItem.")]
+        public ChartLegendItem LegendItem
+        {
+            get { return (_LegendItem); }
+            internal set { _LegendItem = value; }
+        }
+
+        #endregion
+
+        #region LegendText
+
+        ///<summary>
+        /// Gets or sets the text to display in the legend.
+        ///</summary>
+        [DefaultValue(null), Category("Legend")]
+        [Description("Indicates the text to display in the legend.")]
+        [NotifyParentProperty(true)]
+        public string LegendText
+        {
+            get { return (_LegendText); }
+
+            set
+            {
+                if (value != _LegendText)
+                {
+                    _LegendText = value;
+
+                    OnPropertyChangedEx("LegendText", Style.VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region GetLegendItem
+
+        /// <summary>
+        /// Creates the LegendItem for the AxisStripe.
+        /// </summary>
+        /// <returns></returns>
+        public ChartLegendItem GetLegendItem()
+        {
+            _LegendItem = null;
+
+            if (ShowInLegend == true)
+            {
+                _LegendItem = new ChartLegendItem();
+
+                if (CheckedInLegend == true)
+                    _LegendItem.CheckState = CheckState.Checked;
+
+                _LegendItem.Name = Name;
+                _LegendItem.ItemText = LegendText;
+
+                if (string.IsNullOrEmpty(_LegendItem.Name) == true)
+                    _LegendItem.Name = "(RefLine)";
+
+                _LegendItem.ChartItems.Add(this);
+            }
+
+            return (_LegendItem);
+        }
+
+        #endregion
+
+        #region GetLegendItems
+
+        /// <summary>
+        /// Creates a list of legend items associated with
+        /// the AxisStripe.
+        /// </summary>
+        /// <returns></returns>
+        public List<ChartLegendItem> GetLegendItems()
+        {
+            List<ChartLegendItem> list = null;
+
+            ChartLegendItem item = GetLegendItem();
+
+            if (item != null)
+            {
+                list = new List<ChartLegendItem>(1);
+
+                list.Add(item);
+            }
+
+            return (list);
+        }
+
+        #endregion
+
+        #region GetLegendItemColor
+
+        /// <summary>
+        /// Gets the default color associated with the
+        /// AxisStripe legend item.
+        /// </summary>
+        /// <returns></returns>
+        public Color GetLegendItemColor()
+        {
+            AxisStripeVisualStyle astyle = AxisStripeVisualStyle;
+
+            Color color = astyle.Background.Color1;
+
+            if (color.IsEmpty == false)
+                return (color);
+
+            return (Color.DimGray);
+        }
+
+        #endregion
+
+        #region RenderLegendItemMarker
+
+        /// <summary>
+        /// Renders the Legend item Marker.
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="litem"></param>
+        /// <param name="style"></param>
+        public void RenderLegendItemMarker(Graphics g,
+            ChartLegendItem litem, ChartLegendItemVisualStyle style)
+        {
+            AxisStripeVisualStyle astyle = AxisStripeVisualStyle;
+
+            Rectangle bounds = litem.MarkerBounds;
+
+            if (astyle.Background.IsEmpty == true)
+            {
+                g.FillRectangle(Brushes.LightPink, bounds);
+            }
+            else
+            {
+                using (Brush br = astyle.Background.GetBrush(bounds))
+                    g.FillRectangle(br, bounds);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Copy/CopyTo
+
+        /// <summary>
+        /// Creates a copy of the element.
+        /// </summary>
+        /// <returns></returns>
+        public override ChartVisualElement Copy()
+        {
+            AxisStripe copy = new AxisStripe();
+
+            CopyTo(copy);
+
+            return (copy);
+        }
+
+        /// <summary>
+        /// Copies the current element properties and styles 
+        /// to the provided "copy".
+        /// </summary>
+        /// <param name="copy"></param>
+        public override void CopyTo(ChartVisualElement copy)
+        {
+            AxisStripe c = copy as AxisStripe;
+
+            if (c != null)
+            {
+                base.CopyTo(c);
+
+                c.AxisStripeVisualStyle =  (_AxisStripeVisualStyle != null) ? _AxisStripeVisualStyle.Copy() : null;
+                c.ChartLegendItemVisualStyles = (_ChartLegendItemVisualStyles != null) ? ChartLegendItemVisualStyles.Copy() : null;
+
+                c.MaxValue = MaxValue;
+                c.MinValue = MinValue;
+
+                c.CheckedInLegend = CheckedInLegend;
+                c.ShowCheckBoxInLegend = ShowCheckBoxInLegend;
+                c.ShowInLegend = ShowInLegend;
+                c.ShowInParentLegend = ShowInParentLegend;
+                c.LegendText = LegendText;
+                c.ShowMarkerInLegend = ShowMarkerInLegend;
+            }
+        }
+
+        #endregion
+
+        #region GetSerialData
+
+        internal override SerialElementCollection GetSerialData(string serialName)
+        {
+            SerialElementCollection sec = new SerialElementCollection();
+
+            if (serialName != null)
+            {
+                if (serialName.Equals("") == true)
+                    serialName = "ChartAxis";
+
+                sec.AddStartElement(serialName);
+            }
+
+            if (_AxisStripeVisualStyle != null && _AxisStripeVisualStyle.IsEmpty == false)
+                sec.AddElement(_AxisStripeVisualStyle.GetSerialData("AxisStripeVisualStyle"));
+
+            if (_ChartLegendItemVisualStyles != null)
+                sec.AddElement(_ChartLegendItemVisualStyles.GetSerialData("ChartLegendItemVisualStyles"));
+
+            sec.AddDataValue("MaxValue", MaxValue, null);
+            sec.AddDataValue("MinValue", MinValue, null);
+
+            sec.AddValue("CheckedInLegend", CheckedInLegend, true);
+            sec.AddValue("LegendText", LegendText, null);
+            sec.AddValue("ShowCheckBoxInLegend", ShowCheckBoxInLegend, true);
+            sec.AddValue("ShowInLegend", ShowInLegend, true);
+            sec.AddValue("ShowInParentLegend", ShowInParentLegend, true);
+            sec.AddValue("ShowMarkerInLegend", ShowMarkerInLegend, true);
+
+            sec.AddElement(base.GetSerialData(null));
+
+            if (serialName != null)
+                sec.AddEndElement(serialName);
+
+            return (sec);
+        }
+
+        #endregion
+
+        #region PutSerialData
+
+        #region ProcessValue
+
+        internal override void ProcessValue(SerialElement se)
+        {
+            switch (se.Name)
+            {
+                case "CheckedInLegend":
+                    CheckedInLegend = bool.Parse(se.StringValue);
+                    break;
+
+                case "LegendText":
+                    LegendText = se.StringValue;
+                    break;
+
+                case "MaxValue":
+                    MaxValue = se.DataValue;
+                    break;
+
+                case "MinValue":
+                    MinValue = se.DataValue;
+                    break;
+
+                case "ShowCheckBoxInLegend":
+                    ShowCheckBoxInLegend = bool.Parse(se.StringValue);
+                    break;
+
+                case "ShowInLegend":
+                    ShowInLegend = bool.Parse(se.StringValue);
+                    break;
+
+                case "ShowInParentLegend":
+                    ShowInParentLegend = bool.Parse(se.StringValue);
+                    break;
+
+                case "ShowMarkerInLegend":
+                    ShowMarkerInLegend = bool.Parse(se.StringValue);
+                    break;
+
+                default:
+                    base.ProcessValue(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region ProcessCollection
+
+        internal override void ProcessCollection(SerialElement se)
+        {
+            SerialElementCollection sec = se.Sec;
+
+            switch (se.Name)
+            {
+                case "AxisStripeVisualStyle":
+                    sec.PutSerialData(AxisStripeVisualStyle);
+                    break;
+
+                case "ChartLegendItemVisualStyles":
+                    sec.PutSerialData(ChartLegendItemVisualStyles);
+                    break;
+
+                default:
+                    base.ProcessCollection(se);
+                    break;
+            }
+        }
+
+        #region GetAncillaryAxis
+
+        private ChartAxis GetAncillaryAxis(ChartAxesCollection axes, string name)
+        {
+            foreach (ChartAxis axis in axes)
+            {
+                if (name.Equals(axis.Name) == true)
+                    return (axis);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region States
+
+        [Flags]
+        private enum States : uint
+        {
+            CheckedInLegend = (1U << 1),
+            ShowCheckBoxInLegend = (1U << 2),
+            ShowInLegend = (1U << 3),
+            ShowInParentLegend = (1U << 4),
+            ShowMarkerInLegend = (1U << 5),
+        }
+
+        #region TestState
+
+        private bool TestState(States state)
+        {
+            return ((_States & state) == state);
+        }
+
+        #endregion
+
+        #region SetState
+
+        private void SetState(States state, bool value)
+        {
+            if (value == true)
+                _States |= state;
+            else
+                _States &= ~state;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IDisposable
+
+        public override void Dispose()
+        {
+            AxisStripeVisualStyle = null;
+
+            base.Dispose();
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/XyChart/ChartAxes.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/XyChart/ChartAxes.cs
new file mode 100644
index 00000000..61cced46
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/XyChart/ChartAxes.cs	
@@ -0,0 +1,5491 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Drawing.Drawing2D;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.Charts.Style;
+
+namespace DevComponents.DotNetBar.Charts
+{
+    /// <summary>
+    /// Represents the collection of Chart AxesX.
+    /// </summary>
+    [Editor("DevComponents.Charts.Design.ChartAxesCollectionEditor, DevComponents.Charts.Design, " +
+            "Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(UITypeEditor))]
+    public class ChartAxesXCollection : ChartAxesCollection
+    {
+        public ChartAxesXCollection()
+            : base(AxisOrientation.X)
+        {
+        }
+
+        #region GetUniqueName
+
+        public string GetUniqueName()
+        {
+            return (GetUniqueName("AncAxisX"));
+        }
+
+        #endregion
+    }
+
+    /// <summary>
+    /// Represents the collection of Chart AxesY.
+    /// </summary>
+    [Editor("DevComponents.Charts.Design.ChartAxesCollectionEditor, DevComponents.Charts.Design, " +
+            "Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(UITypeEditor))]
+    public class ChartAxesYCollection : ChartAxesCollection
+    {
+        public ChartAxesYCollection()
+            : base(AxisOrientation.Y)
+        {
+        }
+
+        #region GetUniqueName
+
+        public string GetUniqueName()
+        {
+            return (GetUniqueName("AncAxisY"));
+        }
+
+        #endregion
+    }
+
+    /// <summary>
+    /// Represents the collection of Chart Axes.
+    /// </summary>
+    public class ChartAxesCollection : CustomNamedCollection<ChartAxis>
+    {
+        #region Private variables
+
+        private AxisOrientation _AxisOrientation;
+
+        #endregion
+
+        public ChartAxesCollection(AxisOrientation axisOrientation)
+        {
+            _AxisOrientation = axisOrientation;
+        }
+
+        #region Public properties
+
+        #region AxisOrientation
+
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public AxisOrientation AxisOrientation
+        {
+            get { return (_AxisOrientation); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InsertItem
+
+        protected override void InsertItem(int index, ChartAxis item)
+        {
+            if (item.IsPrimaryAxis == true)
+                throw new Exception("Primary Axes cannot be added as Ancillary Axes.");
+
+ 	        base.InsertItem(index, item);
+        }
+
+        #endregion
+    }
+
+    #region ChartAxisX
+
+    /// <summary>
+    /// Represents an X-Axis element.
+    /// </summary>
+    [TypeConverter(typeof(BlankExpandableObjectConverter))]
+    public class ChartAxisX : ChartAxis
+    {
+        #region Constructors
+
+        public ChartAxisX()
+            : base(AxisOrientation.X)
+        {
+        }
+
+        public ChartAxisX(string name)
+            : base(AxisOrientation.X)
+        {
+            Name = name;
+        }
+
+        public ChartAxisX(string name, object minValue, object maxValue)
+            : base(AxisOrientation.X)
+        {
+            Name = name;
+
+            MinValue = minValue;
+            MaxValue = MaxValue;
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region MajorGridLines
+
+        ///<summary>
+        /// Gets the axis MajorGridLines element.
+        ///</summary>
+        [Description("Indicates the MajorGridLines element.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public override ChartMajorGridLines MajorGridLines
+        {
+            get
+            {
+                if (_MajorGridLines == null)
+                {
+                    _MajorGridLines = new ChartMajorGridLinesX();
+                    _MajorGridLines.Parent = this;
+                }
+
+                return (_MajorGridLines);
+            }
+        }
+
+        #endregion
+
+        #region MajorTickmarks
+
+        ///<summary>
+        /// Gets the axis MajorTickmarks element.
+        ///</summary>
+        [Description("Indicates the MajorTickmarks element.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public override MajorTickmarks MajorTickmarks
+        {
+            get
+            {
+                if (_MajorTickmarks == null)
+                {
+                    _MajorTickmarks = new MajorTickmarksX();
+                    _MajorTickmarks.Parent = this;
+                }
+
+                return (_MajorTickmarks);
+            }
+        }
+
+        #endregion
+
+        #region MinorGridLines
+
+        ///<summary>
+        /// Gets the axis MinorGridLines element.
+        ///</summary>
+        [Description("Indicates the MinorGridLines element.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public override ChartMinorGridLines MinorGridLines
+        {
+            get
+            {
+                if (_MinorGridLines == null)
+                {
+                    _MinorGridLines = new ChartMinorGridLinesX();
+                    _MinorGridLines.Parent = this;
+                }
+
+                return (_MinorGridLines);
+            }
+        }
+
+        #endregion
+
+        #region MinorTickmarks
+
+        ///<summary>
+        /// Gets the axis MinorTickmarks element.
+        ///</summary>
+        [Description("Indicates the MinorTickmarks element.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public override MinorTickmarks MinorTickmarks
+        {
+            get
+            {
+                if (_MinorTickmarks == null)
+                {
+                    _MinorTickmarks = new MinorTickmarksX();
+                    _MinorTickmarks.Parent = this;
+                }
+
+                return (_MinorTickmarks);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region MeasureOverride
+
+        protected override void MeasureOverride(ChartLayoutInfo layoutInfo)
+        {
+            ChartXy chartXy = Parent as ChartXy;
+
+            ChartAxisVisualStyle astyle = EffectiveAxisStyle;
+            AxisAlignment axisAlignment = GetAxisAlignment();
+            
+            Rectangle bounds = layoutInfo.LayoutBounds;
+
+            if (Visible == true)
+            {
+                MeasureTitle(layoutInfo, axisAlignment);
+
+                int width = Math.Max(layoutInfo.LayoutBounds.Width, Dpi.Width(chartXy.MinContentSize.Width));
+
+                int tickmarkLen = MeasureTickmarks(layoutInfo, width);
+
+                bounds.Height = GetMeasuredHeight();
+
+                layoutInfo.LayoutBounds.Height -= tickmarkLen;
+
+                if (axisAlignment == AxisAlignment.Far)
+                {
+                    layoutInfo.LayoutBounds.Y += tickmarkLen;
+                }
+                else
+                {
+                    bounds.Y = layoutInfo.LayoutBounds.Bottom;
+
+                    if (EdgeAxis == true)
+                    {
+                        bounds.Y--;
+
+                        if (chartXy.DropShadowDisplayed == true)
+                            layoutInfo.LayoutBounds.Height += 3;
+                    }
+                }
+            }
+            else
+            {
+                int width = Math.Max(layoutInfo.LayoutBounds.Width, Dpi.Width(chartXy.MinContentSize.Width));
+
+                MeasureTickmarks(layoutInfo, width);
+
+                bounds.Height = 0;
+            }
+
+            CalcAxisBounds(layoutInfo, axisAlignment, bounds);
+
+            BoundsRelative = bounds;
+
+            base.MeasureOverride(layoutInfo);
+        }
+
+        #region MeasureTitle
+
+        protected void MeasureTitle(
+            ChartLayoutInfo layoutInfo, AxisAlignment axisAlignment)
+        {
+            if (Title.Visible == true)
+            {
+                Title.XyAlignment = (axisAlignment == AxisAlignment.Near)
+                    ? XyAlignment.Bottom : XyAlignment.Top;
+
+                Title.Measure(layoutInfo);
+            }
+        }
+
+        #endregion
+
+        #region MeasureTickmarks
+
+        protected virtual int MeasureTickmarks(ChartLayoutInfo layoutInfo, int width)
+        {
+            CalcMajorSpacing(layoutInfo, width);
+
+            MajorTickmarks.TickmarkLayout = TickmarkLayout;
+            MinorTickmarks.TickmarkLayout = TickmarkLayout;
+
+            MajorTickmarks.Measure(layoutInfo);
+            MinorTickmarks.Measure(layoutInfo);
+
+            return (Math.Max(MajorTickmarks.Size.Height,
+                             MinorTickmarks.Size.Height));
+        }
+
+        #endregion
+
+        #region GetMeasuredHeight
+
+        private int GetMeasuredHeight()
+        {
+            int height = Math.Max(MajorTickmarks.Size.Height,
+                MinorTickmarks.Size.Height);
+
+            if (Title.Visible == true)
+                height += Title.Size.Height;
+
+            return (height);
+        }
+
+        #endregion
+
+        #region CalcAxisBounds
+
+        private void CalcAxisBounds(ChartLayoutInfo layoutInfo,
+            AxisAlignment axisAlignment, Rectangle bounds)
+        {
+            ChartXy chartXy = Parent as ChartXy;
+
+            int labelHeight = 0;
+            int tmInnerLength = 0;
+            int tmOuterLength = 0;
+
+            if (TickmarkLayout.MajorCount > 0)
+            {
+                labelHeight = MajorTickmarks.GetTotalLabelHeight();
+
+                tmOuterLength = Dpi.Width(GetMaxTickMarkLength(false));
+                tmInnerLength = Dpi.Width(GetMaxTickMarkLength(true));
+
+                if (axisAlignment == AxisAlignment.Near)
+                {
+                    if (EdgeAxis == true)
+                    {
+                        if (chartXy.HScrollBar.Visible == true)
+                            tmInnerLength += (chartXy.HScrollBar.Height + 1);
+
+                        bounds.Y -= tmInnerLength;
+                    }
+                }
+                else
+                {
+                    if (Title.Visible == true)
+                        bounds.Y += Title.Size.Height;
+                }
+
+                bounds.Height = (labelHeight + tmOuterLength + tmInnerLength + 1);
+
+                AxisBounds = bounds;
+
+                Rectangle r = bounds;
+                r.Height = 1;
+
+                if (axisAlignment == AxisAlignment.Near)
+                {
+                    r.Y += tmInnerLength;
+
+                    if (EdgeAxis == false)
+                        r.Y += 1;
+                }
+                else
+                {
+                    r.Y = bounds.Bottom - tmInnerLength - 1;
+                }
+
+                AxisLineBounds = r;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ArrangeOverride
+
+        protected override void ArrangeOverride(ChartLayoutInfo layoutInfo)
+        {
+            ChartXy chartXy = Parent as ChartXy;
+
+            // Let the axis bounds extend into the chart's frame
+            // area as much as possible for better label display.
+
+            Rectangle r = AxisBounds;
+            r.Width = chartXy.ContentBounds.Width;
+
+            int n1 = r.X - chartXy.FrameBounds.X;
+            int n2 = chartXy.FrameBounds.Right - r.Right;
+
+            r.X = chartXy.FrameBounds.X;
+            r.Width += (n1 + n2);
+
+            AxisBounds = r;
+
+            r = AxisLineBounds;
+            r.Width = chartXy.ContentBounds.Width;
+            AxisLineBounds = r;
+
+            base.ArrangeOverride(layoutInfo);
+        }
+
+        #endregion
+
+        #region RenderOverride
+
+        protected override void RenderOverride(ChartRenderInfo renderInfo)
+        {
+            if (Visible == true)
+            {
+                base.RenderOverride(renderInfo);
+
+                Graphics g = renderInfo.Graphics;
+                ChartAxisVisualStyle astyle = EffectiveAxisStyle;
+
+                if (TickmarkLayout.MajorCount > 0)
+                {
+                    Rectangle axisBounds = GetScrollBounds(AxisBounds);
+
+                    Region clip = g.Clip;
+                    g.SetClip(axisBounds, CombineMode.Intersect);
+
+                    MajorTickmarks.Render(renderInfo);
+                    MinorTickmarks.Render(renderInfo);
+
+                    RenderAxisLine(g, astyle);
+
+                    g.Clip = clip;
+                }
+            }
+        }
+
+        #region RenderAxisLine
+
+        private void RenderAxisLine(Graphics g, ChartAxisVisualStyle astyle)
+        {
+            if (astyle.AxisColor.IsEmpty == false &&
+                astyle.AxisColor.Equals(Color.Transparent) == false)
+            {
+                Rectangle alBounds = GetScrollBounds(AxisLineBounds);
+
+                using (Pen pen = new Pen(astyle.AxisColor, Dpi.Height1))
+                    g.DrawLine(pen, alBounds.X, alBounds.Y, alBounds.Right - 1, alBounds.Y);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderCrosshairLabel (Point)
+
+        internal override void RenderCrosshairLabel(Graphics g, Point pt)
+        {
+            TickmarkLayout layout = TickmarkLayout;
+
+            if (layout != null && layout.Ticks != null && layout.Ticks.Length > 0)
+            {
+                TickmarkTick tick = layout.Ticks[0];
+                CrosshairValueVisualStyle lstyle = EffectiveCrosshairLabelStyle;
+
+                string text = GetCrosshairLabel(pt, layout, tick, lstyle);
+
+                if (string.IsNullOrEmpty(text) == false)
+                {
+                    Rectangle r = GetCrosshairBounds(g, text, pt, lstyle);
+
+                    lstyle.RenderBackground(g, r);
+                    lstyle.RenderBorder(g, r);
+
+                    if (lstyle.DropShadow.Enabled == Tbool.True)
+                        lstyle.DropShadow.RenderDropShadow(g, r, true, true);
+
+                    using (StringFormat sf = new StringFormat())
+                    {
+                        sf.Alignment = StringAlignment.Center;
+                        sf.LineAlignment = StringAlignment.Center;
+
+                        using (Brush br = new SolidBrush(lstyle.TextColor))
+                            g.DrawString(text, lstyle.Font, br, r, sf);
+                    }
+                }
+            }
+        }
+
+        #region GetCrosshairLabel
+
+        private string GetCrosshairLabel(Point pt,
+            TickmarkLayout layout, TickmarkTick tick, CrosshairValueVisualStyle lstyle)
+        {
+            object value = null;
+
+            switch (ScaleType)
+            {
+                case ScaleType.DateTime:
+                    value = GetValueFromPoint(layout, pt);
+                    break;
+
+                case ScaleType.Qualitative:
+                    pt = GetChartPoint(pt);
+
+                    int n = (int)Math.Floor((pt.X - (layout.NearMargin + layout.MarginOffset -
+                        layout.MajorInterval / 2 + tick.TickPoint.X)) / (layout.MajorInterval * layout.MajorSpacing));
+
+                    n += tick.Index;
+
+                    if ((uint)n < QualitativeValues.Count)
+                        value = QualitativeValues[n];
+                    break;
+
+                case ScaleType.Quantitative:
+                    double dvalue = Convert.ToDouble(GetValueFromPoint(layout, pt));
+
+                    if (DotPlotAxis == true && Math.Floor(layout.MajorSpacing) == layout.MajorSpacing)
+                        dvalue = Math.Floor(dvalue + .5);
+
+                    value = dvalue;
+                    break;
+            }
+
+            return (GetCrosshairLabel(value, lstyle));
+        }
+
+        #endregion
+
+        #region GetCrosshairBounds
+
+        private Rectangle GetCrosshairBounds(Graphics g,
+            string text, Point pt, CrosshairValueVisualStyle lstyle)
+        {
+            Rectangle bounds = GetScrollBounds(MajorTickmarks.LabelBounds);
+            Rectangle r = bounds; 
+
+            SizeF sizef = g.MeasureString(text, lstyle.Font);
+
+            r.Width = (int)(sizef.Width + 2);
+            r.Height = (int)(sizef.Height + 2);
+
+            r.X = pt.X - (int)(sizef.Width / 2);
+            r.Y--;
+
+            AxisAlignment axisalignment = GetAxisAlignment();
+
+            if (lstyle.Margin.IsEmpty == false)
+            {
+                if (axisalignment == AxisAlignment.Near)
+                    r.Y += lstyle.Margin.Top;
+                else
+                    r.Y -= lstyle.Margin.Bottom;
+            }
+
+            if (axisalignment == AxisAlignment.Near)
+                r.Y += (lstyle.BorderThickness.Vertical);
+            else
+                r.Y -= (lstyle.BorderThickness.Vertical);
+
+            r.Height += lstyle.BorderThickness.Vertical;
+
+            if (lstyle.Padding.IsEmpty == false)
+            {
+                if (axisalignment == AxisAlignment.Far)
+                    r.Y -= lstyle.Padding.Vertical;
+
+                r.Height += lstyle.Padding.Vertical;
+
+                r.X -= lstyle.Padding.Left;
+                r.Width += lstyle.Padding.Horizontal;
+            }
+
+            if (r.Bottom > bounds.Bottom)
+                r.Y -= (r.Bottom - bounds.Bottom);
+
+            if (r.Right > bounds.Right)
+                r.X -= (r.Right - bounds.Right);
+
+            return (r);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderCrosshairLabel (CrosshairPoint)
+
+        internal override void RenderCrosshairLabel(Graphics g, CrosshairPoint cp)
+        {
+            CrosshairValueVisualStyle lstyle = EffectiveCrosshairLabelStyle;
+
+            string text = (cp.ChartSeries.IsRotated == false)
+                ? GetCrosshairLabel(cp.SeriesPoint.ValueX, lstyle)
+                : GetCrosshairLabel(cp.SeriesPoint.ValueY[cp.ValueIndex], lstyle);
+
+            if (string.IsNullOrEmpty(text) == false)
+            {
+                Rectangle r = GetCrosshairBounds(g, text, cp.Point, lstyle);
+
+                lstyle.RenderBackground(g, r);
+                lstyle.RenderBorder(g, r);
+
+                if (lstyle.DropShadow.Enabled == Tbool.True)
+                    lstyle.DropShadow.RenderDropShadow(g, r, true, true);
+
+                using (StringFormat sf = new StringFormat())
+                {
+                    sf.Alignment = StringAlignment.Center;
+                    sf.LineAlignment = StringAlignment.Center;
+
+                    using (Brush br = new SolidBrush(lstyle.TextColor))
+                        g.DrawString(text, lstyle.Font, br, r, sf);
+                }
+            }
+        }
+
+        #endregion
+
+        #region RenderBackground
+
+        internal override void RenderBackground(ChartRenderInfo renderInfo, Rectangle scContentBounds)
+        {
+            if (UseAlternateBackground == true)
+            {
+                if (TickmarkLayout.Ticks != null)
+                {
+                    Graphics g = renderInfo.Graphics;
+                    ChartXy chartXy = Parent as ChartXy;
+
+                    Point pt = chartXy.GetLocalAdjustedPoint(Point.Empty);
+
+                    if (ScaleType == ScaleType.Qualitative)
+                        pt.X -= (int)(TickmarkLayout.MajorInterval / 2);
+
+                    ChartAxisVisualStyle astyle = EffectiveAxisStyle;
+
+                    if (astyle.AlternateBackground.IsSolidBrush == true)
+                    {
+                        using (Brush br = astyle.AlternateBackground.GetBrush(Rectangle.Empty))
+                        {
+                            RenderAltBackground(g,
+                                scContentBounds, pt, TickmarkLayout, astyle, br);
+                        }
+                    }
+                    else
+                    {
+                        RenderAltBackground(g,
+                            scContentBounds, pt, TickmarkLayout, astyle, null);
+                    }
+                }
+            }
+        }
+
+        #region RenderAltBackground
+
+        private void RenderAltBackground(Graphics g, Rectangle scContentBounds, 
+            Point pt, TickmarkLayout TickmarkLayout, ChartAxisVisualStyle astyle, Brush br)
+        {
+            foreach (TickmarkTick tmi in TickmarkLayout.Ticks)
+            {
+                double value = GetTickmarkAltValue(tmi);
+                int n = (int)(Math.Ceiling(value / TickmarkLayout.MajorSpacing));
+
+                if (n % 2 == 0)
+                {
+                    Rectangle r = scContentBounds;
+                    r.X = tmi.TickPoint.X + pt.X;
+                    r.Width = (int)TickmarkLayout.MajorInterval + 1;
+
+                    if (br == null)
+                    {
+                        using (Brush br2 = astyle.AlternateBackground.GetBrush(r))
+                            g.FillRectangle(br2, r);
+                    }
+                    else
+                    {
+                        g.FillRectangle(br, r);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderStripes
+
+        internal override void RenderStripes(ChartRenderInfo renderInfo, Rectangle scContentBounds)
+        {
+            if (AxisStripes.Count > 0)
+            {
+                Graphics g = renderInfo.Graphics;
+                ChartXy chartXy = Parent as ChartXy;
+
+                Point pt = chartXy.GetLocalAdjustedPoint(Point.Empty);
+
+                foreach (AxisStripe stripe in AxisStripes)
+                {
+                    if (stripe.IsDisplayed == true)
+                    {
+                        if (stripe.MinValue != stripe.MaxValue)
+                        {
+                            int x1 = chartXy.GetDataPointX(this, stripe.MinValue);
+                            int x2 = chartXy.GetDataPointX(this, stripe.MaxValue);
+
+                            Rectangle r = scContentBounds;
+                            r.X = (x1 + pt.X);
+                            r.Width = (x2 - x1);
+
+                            RenderStripe(g, r, stripe);
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region UpdateRangeValues
+
+        internal override void UpdateRangeValues(ChartXy chartXy)
+        {
+            bool seriesSeen = false;
+
+            foreach (ChartSeries series in chartXy.ChartSeries)
+            {
+                if (series.AxisX == this)
+                {
+                    if (series.SeriesPoints.Count > 0)
+                        UpdateRangeValuesEx(chartXy, series, ref seriesSeen);
+                }
+            }
+
+            if (seriesSeen == false)
+            {
+                foreach (ChartSeries series in chartXy.ChartSeries)
+                {
+                    if (series.AxisX == null)
+                    {
+                        if (series.SeriesPoints.Count > 0)
+                            UpdateRangeValuesEx(chartXy, series, ref seriesSeen);
+                    }
+                }
+            }
+        }
+
+        #region UpdateRangeValuesEx
+
+        private void UpdateRangeValuesEx(ChartXy chartXy, ChartSeries series, ref bool seriesSeen)
+        {
+            if (ActualMinValue == null)
+            {
+                ActualMinValue = series.MinValueX;
+                ActualMaxValue = series.MaxValueX;
+            }
+            else
+            {
+                if (chartXy.DataCompare(series.MinValueX, ActualMinValue) < 0)
+                    ActualMinValue = series.MinValueX;
+
+                if (chartXy.DataCompare(series.MaxValueX, ActualMaxValue) > 0)
+                    ActualMaxValue = series.MaxValueX;
+            }
+
+            if (seriesSeen == false)
+            {
+                seriesSeen = true;
+
+                ScaleType = series.ActualScaleTypeX;
+            }
+            else
+            {
+                if (series.ActualScaleTypeX != ScaleType)
+                {
+                    string s = "XAxis cannot contain series with differing ScaleTypes";
+
+                    if (String.IsNullOrEmpty(Name) == false)
+                        s += " (" + Name + ")";
+
+                    throw new Exception(s);
+                }
+            }
+
+            if (ScaleType == ScaleType.Qualitative)
+            {
+                if (series.IsRotated == true)
+                {
+                    foreach (object o in series.QualitativeYValues)
+                    {
+                        if (QualitativeValues.Contains(o) == false)
+                            QualitativeValues.Add(o);
+                    }
+                }
+                else
+                {
+                    foreach (object o in series.QualitativeXValues)
+                    {
+                        if (QualitativeValues.Contains(o) == false)
+                            QualitativeValues.Add(o);
+                    }
+                }
+
+                if (QualitativeValues.Count - 1 > (int)ActualMaxValue)
+                    ActualMaxValue = QualitativeValues.Count - 1;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetValueFromPoint
+
+        internal override object GetValueFromPoint(TickmarkLayout layout, Point pt)
+        {
+            if (layout.Ticks != null)
+            {
+                pt = GetChartPoint(pt);
+
+                TickmarkTick lastTick = null;
+
+                foreach (TickmarkTick tick in layout.Ticks)
+                {
+                    if (tick.TickPoint.X == pt.X)
+                        return (tick.Value);
+
+                    if (tick.TickPoint.X > pt.X)
+                    {
+                        if (lastTick != null)
+                        {
+                            double d = ((double)tick.TickPoint.X - lastTick.TickPoint.X) / (layout.MinorCount + 1);
+
+                            for (int i = 1; i <= layout.MinorCount; i++)
+                            {
+                                int x = (int)(lastTick.TickPoint.X + (d * i));
+
+                                if (x >= pt.X)
+                                    break;
+                            }
+                        }
+                        break;
+                    }
+
+                    lastTick = tick;
+                }
+
+                int dx = pt.X - Bounds.X;
+
+                switch (ScaleType)
+                {
+                    case ScaleType.Qualitative:
+                        return (layout.MajorSpacing * ((dx + layout.MarginOffset) /
+                            layout.MajorInterval) + (int)layout.BaseValue);
+
+                    case ScaleType.DateTime:
+                        return (GetDateTimePointValue(layout, dx));
+
+                    default:
+                        return (layout.MajorSpacing * ((dx + layout.MarginOffset) /
+                            layout.MajorInterval) + Convert.ToDouble(layout.BaseValue));
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetPointFromValue
+
+        /// <summary>
+        /// Gets the chart Point from the given axis data value.
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public override Point GetPointFromValue(object value)
+        {
+            return (new Point(GetDisplayValue(value), 0));
+        }
+
+        #endregion
+
+        #region GetDisplayValue
+
+        internal override int GetDisplayValue(object axisValue)
+        {
+            ChartXy chartXy = Parent as ChartXy;
+
+            return (chartXy.GetDataPointX(this, axisValue));
+        }
+
+        #endregion
+
+        #region EnsureVisible
+
+        /// <summary>
+        /// Ensures the given data value is visible and
+        /// optionally centered on screen.
+        /// </summary>
+        /// <param name="value"></param>
+        public override void EnsureVisible(object value, bool center)
+        {
+            ChartXy chartXy = Parent as ChartXy;
+
+            if (chartXy != null)
+            {
+                if (chartXy.ChartControl != null)
+                {
+                    if (chartXy.ChartControl.LayoutValid == false)
+                        chartXy.ChartControl.UpdateLayout();
+
+                    Rectangle cbounds = chartXy.ContentBounds;
+
+                    int x = GetDisplayValue(value);
+
+                    if (center == true)
+                    {
+                        int n = (x - cbounds.Width / 2) - cbounds.X;
+
+                        chartXy.HScrollOffset = n;
+                    }
+                    else
+                    {
+                        int n = cbounds.X + chartXy.HScrollOffset + 20;
+
+                        if (x < n)
+                        {
+                            chartXy.HScrollOffset += (x - n);
+                        }
+                        else
+                        {
+                            n = cbounds.Right + chartXy.HScrollOffset - 20;
+
+                            if (x > n)
+                                chartXy.HScrollOffset += (x - n);
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region Copy/CopyTo
+
+        /// <summary>
+        /// Creates a copy of the axis.
+        /// </summary>
+        /// <returns></returns>
+        public override ChartVisualElement Copy()
+        {
+            ChartAxisX copy = new ChartAxisX();
+
+            CopyTo(copy);
+
+            return (copy);
+        }
+
+        /// <summary>
+        /// Copies the current axis properties to the
+        /// given "copy" axis.
+        /// </summary>
+        /// <param name="copy"></param>
+        public override void CopyTo(ChartVisualElement copy)
+        {
+            ChartAxisX c = copy as ChartAxisX;
+
+            if (c != null)
+            {
+                base.CopyTo(c);
+
+                MajorGridLines.CopyTo(c.MajorGridLines);
+                MinorGridLines.CopyTo(c.MinorGridLines);
+
+                MajorTickmarks.CopyTo(c.MajorTickmarks);
+                MinorTickmarks.CopyTo(c.MinorTickmarks);
+            }
+        }
+
+        #endregion
+
+        #region GetSerialData
+
+        internal override SerialElementCollection GetSerialData(string serialName)
+        {
+            SerialElementCollection sec = new SerialElementCollection();
+
+            if (serialName != null)
+            {
+                if (serialName.Equals("") == true)
+                    serialName = "ChartAxisX";
+
+                sec.AddStartElement(serialName);
+            }
+
+            sec.AddElement(MajorGridLines.GetSerialData("MajorGridLines"));
+            sec.AddElement(MinorGridLines.GetSerialData("MinorGridLines"));
+            sec.AddElement(MajorTickmarks.GetSerialData("MajorTickmarks"));
+            sec.AddElement(MinorTickmarks.GetSerialData("MinorTickmarks"));
+
+            sec.AddElement(base.GetSerialData(null));
+
+            if (serialName != null)
+                sec.AddEndElement(serialName);
+
+            return (sec);
+        }
+
+        #endregion
+
+        #region PutSerialData
+
+        #region ProcessCollection
+
+        internal override void ProcessCollection(SerialElement se)
+        {
+            SerialElementCollection sec = se.Sec;
+
+            switch (se.Name)
+            {
+                case "MajorGridLines":
+                    sec.PutSerialData(MajorGridLines);
+                    break;
+
+                case "MinorGridLines":
+                    sec.PutSerialData(MinorGridLines);
+                    break;
+
+                case "MajorTickmarks":
+                    sec.PutSerialData(MajorTickmarks);
+                    break;
+
+                case "MinorTickmarks":
+                    sec.PutSerialData(MinorTickmarks);
+                    break;
+
+                default:
+                    base.ProcessCollection(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+    }
+
+    #endregion
+
+    #region ChartAxisY
+
+    /// <summary>
+    /// Represents a Y-Axis element.
+    /// </summary>
+    [TypeConverter(typeof(BlankExpandableObjectConverter))]
+    public class ChartAxisY : ChartAxis
+    {
+        #region Constructors
+
+        public ChartAxisY()
+            : base(AxisOrientation.Y)
+        {
+        }
+
+        public ChartAxisY(string name)
+            : base(AxisOrientation.Y)
+        {
+            Name = name;
+        }
+
+        public ChartAxisY(string name, object minValue, object maxValue)
+            : base(AxisOrientation.Y)
+        {
+            Name = name;
+
+            MinValue = minValue;
+            MaxValue = MaxValue;
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region MajorGridLines
+
+        ///<summary>
+        /// Gets the axis MajorGridLines element.
+        ///</summary>
+        [Description("Indicates the MajorGridLines element.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public override ChartMajorGridLines MajorGridLines
+        {
+            get
+            {
+                if (_MajorGridLines == null)
+                {
+                    _MajorGridLines = new ChartMajorGridLinesY();
+                    _MajorGridLines.Parent = this;
+                }
+
+                return (_MajorGridLines);
+            }
+        }
+
+        #endregion
+
+        #region MajorTickmarks
+
+        ///<summary>
+        /// Gets the axis MajorTickmarks element.
+        ///</summary>
+        [Description("Indicates the MajorTickmarks element.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public override MajorTickmarks MajorTickmarks
+        {
+            get
+            {
+                if (_MajorTickmarks == null)
+                {
+                    _MajorTickmarks = new MajorTickmarksY();
+                    _MajorTickmarks.Parent = this;
+                }
+
+                return (_MajorTickmarks);
+            }
+        }
+
+        #endregion
+
+        #region MinorGridLines
+
+        ///<summary>
+        /// Gets the axis MinorGridLines element.
+        ///</summary>
+        [Description("Indicates the MinorGridLines element.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public override ChartMinorGridLines MinorGridLines
+        {
+            get
+            {
+                if (_MinorGridLines == null)
+                {
+                    _MinorGridLines = new ChartMinorGridLinesY();
+                    _MinorGridLines.Parent = this;
+                }
+
+                return (_MinorGridLines);
+            }
+        }
+
+        #endregion
+
+        #region MinorTickmarks
+
+        ///<summary>
+        /// Gets the axis MinorTickmarks element.
+        ///</summary>
+        [Description("Indicates the MinorTickmarks element.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public override MinorTickmarks MinorTickmarks
+        {
+            get
+            {
+                if (_MinorTickmarks == null)
+                {
+                    _MinorTickmarks = new MinorTickmarksY();
+                    _MinorTickmarks.Parent = this;
+                }
+
+                return (_MinorTickmarks);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region MeasureOverride
+
+        protected override void MeasureOverride(ChartLayoutInfo layoutInfo)
+        {
+            ChartXy chartXy = Parent as ChartXy;
+
+            ChartAxisVisualStyle astyle = EffectiveAxisStyle;
+            AxisAlignment axisAlignment = GetAxisAlignment();
+
+            Rectangle bounds = layoutInfo.LayoutBounds;
+
+            if (Visible == true)
+            {
+                MeasureTitle(layoutInfo, axisAlignment);
+
+                int height = Math.Max(layoutInfo.LayoutBounds.Height, Dpi.Height((chartXy.MinContentSize.Height)));
+                int tickmarkLen = MeasureTickmarks(layoutInfo, height);
+
+                bounds.Width = GetMeasuredWidth();
+
+                layoutInfo.LayoutBounds.Width -= tickmarkLen;
+
+                if (axisAlignment == AxisAlignment.Far)
+                {
+                    layoutInfo.LayoutBounds.X += tickmarkLen;
+                }
+                else
+                {
+                    bounds.X = layoutInfo.LayoutBounds.Right;
+
+                    if (EdgeAxis == true)
+                    {
+                        bounds.X -= 1;
+
+                        if (chartXy.DropShadowDisplayed == true)
+                            layoutInfo.LayoutBounds.Width += 3;
+                    }
+                }
+            }
+            else
+            {
+                int height = Math.Max(layoutInfo.LayoutBounds.Height, Dpi.Height(chartXy.MinContentSize.Height));
+                int tickmarkLen = MeasureTickmarks(layoutInfo, height);
+
+                bounds.Width = 0;
+            }
+
+            CalcAxisBounds(layoutInfo, axisAlignment, bounds);
+
+            BoundsRelative = bounds;
+
+            base.MeasureOverride(layoutInfo);
+        }
+
+        #region MeasureTitle
+
+        protected void MeasureTitle(
+            ChartLayoutInfo layoutInfo, AxisAlignment axisAlignment)
+        {
+            if (Title.Visible == true)
+            {
+                Title.XyAlignment = (axisAlignment == AxisAlignment.Near)
+                    ? XyAlignment.Right : XyAlignment.Left;
+
+                Title.Measure(layoutInfo);
+            }
+        }
+
+        #endregion
+
+        #region MeasureTickmarks
+
+        protected virtual int MeasureTickmarks(ChartLayoutInfo layoutInfo, int height)
+        {
+            CalcMajorSpacing(layoutInfo, height);
+
+            MajorTickmarks.TickmarkLayout = TickmarkLayout;
+            MinorTickmarks.TickmarkLayout = TickmarkLayout;
+
+            MajorTickmarks.Measure(layoutInfo);
+            MinorTickmarks.Measure(layoutInfo);
+
+            return (Math.Max(MajorTickmarks.Size.Width,
+                             MinorTickmarks.Size.Width));
+        }
+
+        #endregion
+
+        #region GetMeasuredWidth
+
+        private int GetMeasuredWidth()
+        {
+            int width = Math.Max(MajorTickmarks.Size.Width,
+                MinorTickmarks.Size.Width);
+
+            if (Title.Visible == true)
+                width += Title.Size.Width;
+
+            return (width);
+        }
+
+        #endregion
+
+        #region CalcAxisBounds
+
+        private void CalcAxisBounds(ChartLayoutInfo layoutInfo,
+            AxisAlignment axisAlignment, Rectangle bounds)
+        {
+            int labelWidth = 0;
+            int tmInnerLength = 0;
+            int tmOuterLength = 0;
+
+            if (TickmarkLayout.MajorCount > 0)
+            {
+                labelWidth = MajorTickmarks.GetTotalLabelWidth();
+
+                tmOuterLength = Dpi.Width(GetMaxTickMarkLength(false));
+                tmInnerLength = Dpi.Width(GetMaxTickMarkLength(true));
+
+                if (axisAlignment == AxisAlignment.Near)
+                {
+                    if (EdgeAxis == true)
+                    {
+                        ChartXy chartXy = Parent as ChartXy;
+
+                        if (chartXy.VScrollBar.Visible == true)
+                            tmInnerLength += (chartXy.VScrollBar.Width + 1);
+
+                        bounds.X -= tmInnerLength;
+                    }
+                }
+                else
+                {
+                    if (Title.Visible == true)
+                        bounds.X += Title.Size.Width;
+                }
+
+                bounds.Width = (labelWidth + tmOuterLength + tmInnerLength + 1);
+
+                AxisBounds = bounds;
+
+                Rectangle r = bounds;
+                r.Width = 1;
+
+                if (axisAlignment == AxisAlignment.Near)
+                {
+                    r.X += tmInnerLength;
+
+                    if (EdgeAxis == false)
+                        r.X += 1;
+                }
+                else
+                {
+                    r.X = bounds.Right - tmInnerLength - 1;
+                }
+
+                AxisLineBounds = r;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ArrangeOverride
+
+        protected override void ArrangeOverride(ChartLayoutInfo layoutInfo)
+        {
+            ChartXy chartXy = Parent as ChartXy;
+
+            // Let the axis bounds extend into the chart's frame
+            // area as much as possible for better label display.
+
+            Rectangle r = AxisBounds;
+            r.Height = chartXy.ContentBounds.Height;
+
+            int n1 = r.Y - chartXy.FrameBounds.Y;
+            int n2 = chartXy.FrameBounds.Bottom - r.Bottom;
+
+            r.Y = chartXy.FrameBounds.Y;
+            r.Height += (n1 + n2);
+
+            AxisBounds = r;
+
+            r = AxisLineBounds;
+            r.Height = chartXy.ContentBounds.Height;
+            AxisLineBounds = r;
+
+            base.ArrangeOverride(layoutInfo);
+        }
+
+        #endregion
+
+        #region RenderOverride
+
+        protected override void RenderOverride(ChartRenderInfo renderInfo)
+        {
+            base.RenderOverride(renderInfo);
+
+            Graphics g = renderInfo.Graphics;
+            ChartAxisVisualStyle astyle = EffectiveAxisStyle;
+
+            if (TickmarkLayout.MajorCount > 0)
+            {
+                Rectangle axisBounds = GetScrollBounds(AxisBounds);
+
+                Region clip = g.Clip;
+                g.SetClip(axisBounds, CombineMode.Intersect);
+
+                MajorTickmarks.Render(renderInfo);
+                MinorTickmarks.Render(renderInfo);
+
+                RenderAxisLine(g, astyle);
+
+                g.Clip = clip;
+            }
+        }
+
+        #region RenderAxisLine
+
+        private void RenderAxisLine(Graphics g, ChartAxisVisualStyle astyle)
+        {
+            if (astyle.AxisColor.IsEmpty == false &&
+                astyle.AxisColor.Equals(Color.Transparent) == false)
+            {
+                Rectangle alBounds = GetScrollBounds(AxisLineBounds);
+
+                using (Pen pen = new Pen(astyle.AxisColor, Dpi.Width1))
+                    g.DrawLine(pen, alBounds.X, alBounds.Y, alBounds.X, alBounds.Bottom - 1);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderCrosshairLabel (Point)
+
+        internal override void RenderCrosshairLabel(Graphics g, Point pt)
+        {
+            TickmarkLayout layout = TickmarkLayout;
+
+            if (layout != null && layout.Ticks != null && layout.Ticks.Length > 0)
+            {
+                TickmarkTick tick = layout.Ticks[0];
+                CrosshairValueVisualStyle lstyle = EffectiveCrosshairLabelStyle;
+
+                string text = GetCrosshairLabel(pt, layout, tick, lstyle);
+
+                if (string.IsNullOrEmpty(text) == false)
+                {
+                    Rectangle r = GetCrosshairBounds(g, text, pt, lstyle);
+
+                    lstyle.RenderBackground(g, r);
+                    lstyle.RenderBorder(g, r);
+
+                    if (lstyle.DropShadow.Enabled == Tbool.True)
+                        lstyle.DropShadow.RenderDropShadow(g, r, true, true);
+
+                    using (StringFormat sf = new StringFormat())
+                    {
+                        sf.Alignment = StringAlignment.Center;
+                        sf.LineAlignment = StringAlignment.Center;
+
+                        using (Brush br = new SolidBrush(lstyle.TextColor))
+                            g.DrawString(text, lstyle.Font, br, r, sf);
+                    }
+                }
+            }
+        }
+
+        #region GetCrosshairLabel
+
+        private string GetCrosshairLabel(Point pt,
+            TickmarkLayout layout, TickmarkTick tick, CrosshairValueVisualStyle lstyle)
+        {
+            object value = null;
+
+            switch (ScaleType)
+            {
+                case ScaleType.DateTime:
+                    value = GetValueFromPoint(layout, pt);
+                    break;
+
+                case ScaleType.Qualitative:
+                    pt = GetChartPoint(pt);
+
+                    int n = (int)Math.Floor(((tick.TickPoint.Y - layout.NearMargin - layout.MarginOffset +
+                        layout.MajorInterval / 2) - pt.Y) / (layout.MajorInterval * layout.MajorSpacing));
+
+                    n += tick.Index;
+
+                    if ((uint)n < QualitativeValues.Count)
+                        value = QualitativeValues[n];
+                    break;
+
+                case ScaleType.Quantitative:
+                    double dvalue = (Double)GetValueFromPoint(layout, pt);
+
+                    if (DotPlotAxis == true && Math.Floor(layout.MajorSpacing) == layout.MajorSpacing)
+                        dvalue = Math.Floor(dvalue + .5);
+
+                    value = dvalue;
+                    break;
+            }
+
+            return (GetCrosshairLabel(value, lstyle));
+        }
+
+        #endregion
+
+        #region GetCrosshairBounds
+
+        private Rectangle GetCrosshairBounds(Graphics g,
+            string text, Point pt, CrosshairValueVisualStyle lstyle)
+        {
+            ChartXy chartXy = (ChartXy)Parent;
+
+            AxisAlignment axisalignment = GetAxisAlignment();
+            Rectangle r = GetScrollBounds(MajorTickmarks.LabelBounds);
+            ChartXyVisualStyle cstyle = chartXy.EffectiveChartStyle;
+
+            if (axisalignment == AxisAlignment.Far)
+            {
+                r.X -= cstyle.Padding.Left;
+                r.Width += cstyle.Padding.Left;
+            }
+            else
+            {
+                r.Width += cstyle.Padding.Right;
+            }
+
+            SizeF sizef = g.MeasureString(text, lstyle.Font);
+
+            int width = (int) sizef.Width + 2;
+
+            if (Visible == true)
+                width = Math.Min(r.Width, width);
+            
+            if (axisalignment == AxisAlignment.Far)
+                r.X = Math.Max(r.X, r.Right - width);
+
+            r.Width = width;
+
+            r.Y = pt.Y - (int)(sizef.Height / 2) - 2 - lstyle.BorderThickness.Top;
+            r.Height = (int)sizef.Height;
+
+            if (lstyle.Margin.IsEmpty == false)
+            {
+                if (axisalignment == AxisAlignment.Near)
+                    r.Y += lstyle.Margin.Top;
+                else
+                    r.Y -= lstyle.Margin.Bottom;
+            }
+
+            if (axisalignment == AxisAlignment.Near)
+                r.X += (lstyle.BorderThickness.Horizontal);
+            else
+                r.X -= (lstyle.BorderThickness.Horizontal);
+
+            r.Width += lstyle.BorderThickness.Horizontal;
+            r.Height += lstyle.BorderThickness.Vertical;
+
+            if (lstyle.Padding.IsEmpty == false)
+            {
+                if (axisalignment == AxisAlignment.Far)
+                    r.Y -= lstyle.Padding.Vertical;
+
+                r.Height += lstyle.Padding.Vertical;
+
+                r.X -= lstyle.Padding.Left;
+                r.Width += lstyle.Padding.Horizontal;
+            }
+
+            return (r);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderCrosshairLabel (CrosshairPoint)
+
+        internal override void RenderCrosshairLabel(Graphics g, CrosshairPoint cp)
+        {
+            if ((DotPlotAxis == true) ||
+                (cp.SeriesPoint.ValueY == null || cp.SeriesPoint.ValueY.Length == 0))
+            {
+                RenderCrosshairLabel(g, cp.Point);
+            }
+            else
+            {
+                CrosshairValueVisualStyle lstyle = EffectiveCrosshairLabelStyle;
+
+                string text = (cp.ChartSeries.IsRotated == true)
+                    ? GetCrosshairLabel(cp.SeriesPoint.ValueX, lstyle)
+                    : GetCrosshairLabel(cp.SeriesPoint.ValueY[cp.ValueIndex], lstyle);
+
+                if (string.IsNullOrEmpty(text) == false)
+                {
+                    Rectangle r = GetCrosshairBounds(g, text, cp.Point, lstyle);
+
+                    lstyle.RenderBackground(g, r);
+                    lstyle.RenderBorder(g, r);
+
+                    if (lstyle.DropShadow.Enabled == Tbool.True)
+                        lstyle.DropShadow.RenderDropShadow(g, r, true, true);
+
+                    using (StringFormat sf = new StringFormat())
+                    {
+                        sf.Alignment = StringAlignment.Center;
+                        sf.LineAlignment = StringAlignment.Center;
+
+                        using (Brush br = new SolidBrush(lstyle.TextColor))
+                            g.DrawString(text, lstyle.Font, br, r, sf);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region RenderBackground
+
+        internal override void RenderBackground(ChartRenderInfo renderInfo, Rectangle scContentBounds)
+        {
+            if (UseAlternateBackground == true)
+            {
+                if (TickmarkLayout.Ticks != null)
+                {
+                    Graphics g = renderInfo.Graphics;
+                    ChartXy chartXy = Parent as ChartXy;
+
+                    Point pt = chartXy.GetLocalAdjustedPoint(Point.Empty);
+
+                    if (ScaleType == ScaleType.Qualitative)
+                        pt.Y -= (int)(TickmarkLayout.MajorInterval / 2);
+
+                    ChartAxisVisualStyle astyle = EffectiveAxisStyle;
+
+                    if (astyle.AlternateBackground.IsSolidBrush == true)
+                    {
+                        using (Brush br = astyle.AlternateBackground.GetBrush(Rectangle.Empty))
+                        {
+                            RenderAltBackground(g,
+                                scContentBounds, pt, TickmarkLayout, astyle, br);
+                        }
+                    }
+                    else
+                    {
+                        RenderAltBackground(g,
+                            scContentBounds, pt, TickmarkLayout, astyle, null);
+                    }
+                }
+            }
+        }
+
+        #region RenderAltBackground
+
+        private void RenderAltBackground(Graphics g, Rectangle scContentBounds,
+            Point pt, TickmarkLayout TickmarkLayout, ChartAxisVisualStyle astyle, Brush br)
+        {
+            foreach (TickmarkTick tmi in TickmarkLayout.Ticks)
+            {
+                double value = GetTickmarkAltValue(tmi);
+                int n = (int)(Math.Ceiling(value / TickmarkLayout.MajorSpacing));
+
+                if (n % 2 == 0)
+                {
+                    Rectangle r = scContentBounds;
+                    r.Y = tmi.TickPoint.Y + pt.Y;
+                    r.Height = (int)TickmarkLayout.MajorInterval + 1;
+
+                    if (br == null)
+                    {
+                        using (Brush br2 = astyle.AlternateBackground.GetBrush(r))
+                            g.FillRectangle(br2, r);
+                    }
+                    else
+                    {
+                        g.FillRectangle(br, r);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderStripes
+
+        internal override void RenderStripes(ChartRenderInfo renderInfo, Rectangle scContentBounds)
+        {
+            if (AxisStripes.Count > 0)
+            {
+                Graphics g = renderInfo.Graphics;
+                ChartXy chartXy = Parent as ChartXy;
+
+                Point pt = chartXy.GetLocalAdjustedPoint(Point.Empty);
+
+                foreach (AxisStripe stripe in AxisStripes)
+                {
+                    if (stripe.IsDisplayed == true)
+                    {
+                        int y2 = chartXy.GetDataPointY(this, stripe.MinValue);
+                        int y1 = chartXy.GetDataPointY(this, stripe.MaxValue);
+
+                        Rectangle r = scContentBounds;
+                        r.Y = (y1 + pt.Y);
+                        r.Height = (y2 - y1) + 1;
+
+                        RenderStripe(g, r, stripe);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region UpdateRangeValues
+
+        internal override void UpdateRangeValues(ChartXy chartXy)
+        {
+            bool seriesSeen = false;
+
+            foreach (ChartSeries series in chartXy.ChartSeries)
+            {
+                if (series.AxisY == this)
+                {
+                    if (series.SeriesPoints.Count > 0)
+                        UpdateRangeValuesEx(chartXy, series, ref seriesSeen);
+                }
+            }
+
+            if (seriesSeen == false)
+            {
+                foreach (ChartSeries series in chartXy.ChartSeries)
+                {
+                    if (series.AxisY == null)
+                    {
+                        if (series.SeriesPoints.Count > 0)
+                            UpdateRangeValuesEx(chartXy, series, ref seriesSeen);
+                    }
+                }
+            }
+        }
+
+        #region UpdateRangeValuesEx
+
+        private void UpdateRangeValuesEx(ChartXy chartXy, ChartSeries series, ref bool seriesSeen)
+        {
+            if (ActualMinValue == null)
+            {
+                ActualMinValue = series.MinValueY;
+                ActualMaxValue = series.MaxValueY;
+            }
+            else
+            {
+                if (chartXy.DataCompare(series.MinValueY, ActualMinValue) < 0)
+                    ActualMinValue = series.MinValueY;
+
+                if (chartXy.DataCompare(series.MaxValueY, ActualMaxValue) > 0)
+                    ActualMaxValue = series.MaxValueY;
+            }
+
+            if (seriesSeen == false)
+            {
+                seriesSeen = true;
+
+                ScaleType = series.ActualScaleTypeY;
+            }
+            else
+            {
+                if (series.ActualScaleTypeY != ScaleType)
+                {
+                    string s = "YAxis cannot contain series with differing ScaleTypes";
+
+                    if (String.IsNullOrEmpty(Name) == false)
+                        s += " (" + Name + ")";
+
+                    throw new Exception(s);
+                }
+            }
+
+            if (ScaleType == ScaleType.Qualitative)
+            {
+                if (series.IsRotated == true)
+                {
+                    foreach (object o in series.QualitativeXValues)
+                    {
+                        if (QualitativeValues.Contains(o) == false)
+                            QualitativeValues.Add(o);
+                    }
+                }
+                else
+                {
+                    foreach (object o in series.QualitativeYValues)
+                    {
+                        if (QualitativeValues.Contains(o) == false)
+                            QualitativeValues.Add(o);
+                    }
+                }
+
+                if (QualitativeValues.Count - 1 > (int)ActualMaxValue)
+                    ActualMaxValue = QualitativeValues.Count - 1;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetValueFromPoint
+
+        internal override object GetValueFromPoint(TickmarkLayout layout, Point pt)
+        {
+            pt = GetChartPoint(pt);
+
+            TickmarkTick lastTick = null;
+
+            foreach (TickmarkTick tick in layout.Ticks)
+            {
+                if (tick.TickPoint.Y == pt.Y)
+                    return (Convert.ToDouble(tick.Value));
+
+                if (tick.TickPoint.Y < pt.Y)
+                {
+                    if (lastTick != null)
+                    {
+                        double d = ((double)lastTick.TickPoint.Y - tick.TickPoint.Y) / (layout.MinorCount + 1);
+
+                        for (int i = 1; i <= layout.MinorCount; i++)
+                        {
+                            int y = (int)(lastTick.TickPoint.Y - (d * i));
+
+                            if (y == pt.Y)
+                                return (Convert.ToDouble(lastTick.Value) + (layout.MajorSpacing / (layout.MinorCount + 1) * i));
+
+                            if (y < pt.Y)
+                                break;
+                        }
+                    }
+                    break;
+                }
+
+                lastTick = tick;
+            }
+
+            int dy = Bounds.Bottom - pt.Y;
+
+            switch (ScaleType)
+            {
+                case ScaleType.Qualitative:
+                    return (layout.MajorSpacing * ((dy + layout.MarginOffset) / 
+                        layout.MajorInterval) + (int)layout.BaseValue);
+
+                case ScaleType.DateTime:
+                    return (GetDateTimePointValue(layout, dy));
+
+                default:
+                    return (layout.MajorSpacing * ((dy + layout.MarginOffset) / 
+                        layout.MajorInterval) + Convert.ToDouble(layout.BaseValue));
+            }
+        }
+
+        #endregion
+
+        #region GetPointFromValue
+
+        /// <summary>
+        /// Gets the chart Point from the given axis data value.
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public override Point GetPointFromValue(object value)
+        {
+            return (new Point(0, GetDisplayValue(value)));
+        }
+
+        #endregion
+
+        #region GetDisplayValue
+
+        internal override int GetDisplayValue(object axisValue)
+        {
+            ChartXy chartXy = Parent as ChartXy;
+
+            return (chartXy.GetDataPointY(this, axisValue));
+        }
+
+        #endregion
+
+        #region EnsureVisible
+
+        /// <summary>
+        /// Ensures the given data value is visible and
+        /// optionally centered on screen.
+        /// </summary>
+        /// <param name="value"></param>
+        public override void EnsureVisible(object value, bool center)
+        {
+            ChartXy chartXy = Parent as ChartXy;
+
+            if (chartXy != null)
+            {
+                if (chartXy.ChartControl != null)
+                {
+                    if (chartXy.ChartControl.LayoutValid == false)
+                        chartXy.ChartControl.UpdateLayout();
+
+                    Rectangle cbounds = chartXy.ContentBounds;
+
+                    int y = GetDisplayValue(value);
+
+                    if (center == true)
+                    {
+                        int n = cbounds.Y - (y - cbounds.Height / 2);
+
+                        chartXy.VScrollOffset = n;
+                    }
+                    else
+                    {
+                        int n = cbounds.Y - chartXy.VScrollOffset + 20;
+
+                        if (y < n)
+                        {
+                            chartXy.VScrollOffset += (n - y);
+                        }
+                        else
+                        {
+                            n = cbounds.Bottom - chartXy.VScrollOffset - 20;
+
+                            if (y > n)
+                                chartXy.VScrollOffset -= (y - n);
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region Copy/CopyTo
+
+        /// <summary>
+        /// Creates a copy of the axis.
+        /// </summary>
+        /// <returns></returns>
+        public override ChartVisualElement Copy()
+        {
+            ChartAxisY copy = new ChartAxisY();
+
+            CopyTo(copy);
+
+            return (copy);
+        }
+
+        /// <summary>
+        /// Copies each axis property to the given "copy".
+        /// </summary>
+        /// <param name="copy"></param>
+        public override void CopyTo(ChartVisualElement copy)
+        {
+            ChartAxisY c = copy as ChartAxisY;
+
+            if (c != null)
+            {
+                base.CopyTo(c);
+
+                MajorGridLines.CopyTo(c.MajorGridLines);
+                MinorGridLines.CopyTo(c.MinorGridLines);
+
+                MajorTickmarks.CopyTo(c.MajorTickmarks);
+                MinorTickmarks.CopyTo(c.MinorTickmarks);
+            }
+        }
+
+        #endregion
+
+        #region GetSerialData
+
+        internal override SerialElementCollection GetSerialData(string serialName)
+        {
+            SerialElementCollection sec = new SerialElementCollection();
+
+            if (serialName != null)
+            {
+                if (serialName.Equals("") == true)
+                    serialName = "ChartAxisY";
+
+                sec.AddStartElement(serialName);
+            }
+
+            sec.AddElement(MajorGridLines.GetSerialData("MajorGridLines"));
+            sec.AddElement(MinorGridLines.GetSerialData("MinorGridLines"));
+            sec.AddElement(MajorTickmarks.GetSerialData("MajorTickmarks"));
+            sec.AddElement(MinorTickmarks.GetSerialData("MinorTickmarks"));
+
+            sec.AddElement(base.GetSerialData(null));
+
+            if (serialName != null)
+                sec.AddEndElement(serialName);
+
+            return (sec);
+        }
+
+        #endregion
+
+        #region PutSerialData
+
+        #region ProcessCollection
+
+        internal override void ProcessCollection(SerialElement se)
+        {
+            SerialElementCollection sec = se.Sec;
+
+            switch (se.Name)
+            {
+                case "MajorGridLines":
+                    sec.PutSerialData(MajorGridLines);
+                    break;
+
+                case "MinorGridLines":
+                    sec.PutSerialData(MinorGridLines);
+                    break;
+
+                case "MajorTickmarks":
+                    sec.PutSerialData(MajorTickmarks);
+                    break;
+
+                case "MinorTickmarks":
+                    sec.PutSerialData(MinorTickmarks);
+                    break;
+
+                default:
+                    base.ProcessCollection(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+    }
+
+    #endregion
+
+    #region ChartAxis
+
+    [TypeConverter(typeof(BlankExpandableObjectConverter))]
+    abstract public class ChartAxis : ChartVisualElement
+    {
+        #region Private variables
+
+        private States _States;
+
+        private AxisOrientation _AxisOrientation = AxisOrientation.X;
+        private AxisAlignment _AxisAlignment = AxisAlignment.NotSet;
+        private SortDirection _QualitativeSortDirection = SortDirection.None;
+
+        private int _AxisMargins = -1;
+        private int _AxisNearMargin = -1;
+        private int _AxisFarMargin = -1;
+
+        private AxisStripeCollection _AxisStripes;
+
+        private object _MinValue = null;
+        private object _MaxValue = null;
+
+        private object _ActualMinValue;
+        private object _ActualMaxValue;
+
+        private double _GridSpacing;
+        private double _GridInterval;
+        private int _MinGridInterval = 10;
+
+        private AxisTitle _Title;
+        private ReferenceLineCollection _ReferenceLines;
+
+        private TickmarkLayout _TickmarkLayout;
+        private TickmarkLayout _LastTickmarkLayout;
+
+        private Rectangle _AxisBounds;
+        private Rectangle _AxisLineBounds;
+
+        private ChartAxisVisualStyle _ChartAxisVisualStyle;
+        private EffectiveStyle<ChartAxisVisualStyle> _EffectiveAxisStyle;
+
+        private CrosshairValueVisualStyle _CrosshairLabelVisualStyle;
+        private EffectiveStyle<CrosshairValueVisualStyle> _EffectiveCrosshairLabelStyle;
+
+        private List<object> _QualitativeValues;
+        private DateTimeUnits _DateTimeUnits = DateTimeUnits.Days;
+        private DateTimeUnits _DateTimeUnitsLimit = DateTimeUnits.Years;
+        private DateTimeUnits _ActualDateTimeUnits = DateTimeUnits.Days;
+
+        private ScaleType _ScaleType;
+
+        private AxisBar[] _AxisBars;
+     
+        #endregion
+
+        #region Protected variables
+
+        protected MajorTickmarks _MajorTickmarks;
+        protected MinorTickmarks _MinorTickmarks;
+
+        protected ChartMajorGridLines _MajorGridLines;
+        protected ChartMinorGridLines _MinorGridLines;
+        
+        #endregion
+
+        public ChartAxis(AxisOrientation orientation)
+        {
+            InitDefaultStates();
+
+            _AxisOrientation = orientation;
+
+            _EffectiveAxisStyle = new EffectiveStyle<ChartAxisVisualStyle>(this);
+            _EffectiveCrosshairLabelStyle = new EffectiveStyle<CrosshairValueVisualStyle>(this);
+
+            _AxisBars = new AxisBar[(int)AxisBarType.MaxBarCount];
+
+            for (int i = 0; i < _AxisBars.Length; i++)
+                _AxisBars[i] = new AxisBar();
+        }
+
+        #region InitDefaultStates
+
+        private void InitDefaultStates()
+        {
+            SetState(States.AutoCalcBarMargins, true);
+            SetState(States.SeriesRangeChanged, true);
+            SetState(States.UseAutoMinGridInterval, true);
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region ActualDateTimeUnits
+
+        /// <summary>
+        /// Gets the actual axis display units for DateTime data (as determined by
+        /// either the DateTimeUnits property or actual inspection of the associated data).
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public DateTimeUnits ActualDateTimeUnits
+        {
+            get { return (_ActualDateTimeUnits); }
+            internal set { _ActualDateTimeUnits = value; }
+        }
+
+        #endregion
+
+        #region ActualMaxValue
+
+        /// <summary>
+        /// Gets the actual, axis max data value (as determined by
+        /// either the MaxValue property or actual inspection of the associated data).
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public object ActualMaxValue
+        {
+            get { return (_ActualMaxValue); }
+            internal set { _ActualMaxValue = value; }
+        }
+
+        #endregion
+
+        #region ActualMinValue
+
+        /// <summary>
+        /// Gets the actual, axis min data value (as determined by
+        /// either the MinValue property or actual inspection of the associated data).
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public object ActualMinValue
+        {
+            get { return (_ActualMinValue); }
+            internal set { _ActualMinValue = value; }
+        }
+
+        #endregion
+
+        #region AutoCalcBarMargins
+
+        /// <summary>
+        /// Gets or sets whether axis Bar Margins are calculated and used.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance")]
+        [Description("Indicates whether axis Bar Margins are calculated and used.")]
+        public bool AutoCalcBarMargins
+        {
+            get { return (TestState(States.AutoCalcBarMargins)); }
+
+            set
+            {
+                if (value != AutoCalcBarMargins)
+                {
+                    SetState(States.AutoCalcBarMargins, value);
+
+                    OnPropertyChangedEx("AutoCalcBarMargins", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region AxisAlignment
+
+        /// <summary>
+        /// Gets or sets the axis alignment.
+        /// </summary>
+        [DefaultValue(AxisAlignment.NotSet), Category("Layout")]
+        [Description("Indicates the axis alignment.")]
+        public AxisAlignment AxisAlignment
+        {
+            get { return (_AxisAlignment); }
+
+            set
+            {
+                if (value != _AxisAlignment)
+                {
+                    _AxisAlignment = value;
+
+                    OnPropertyChangedEx("AxisAlignment", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region AxisFarMargin
+
+        ///<summary>
+        /// Gets or sets the far/ending margin for the axis. When set ( >= 0 ), the
+        /// value overrides the general AxisMargins setting.
+        ///</summary>
+        [DefaultValue(-1), Category("Layout")]
+        [Description("Indicates the far/ending margin for the axis. When set ( >= 0 ), the value overrides the general AxisMargins setting.")]
+        public int AxisFarMargin
+        {
+            get { return (_AxisFarMargin); }
+
+            set
+            {
+                if (value != _AxisFarMargin)
+                {
+                    _AxisFarMargin = value;
+
+                    OnPropertyChangedEx("AxisFarMargin", Style.VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region AxisMargins
+
+        ///<summary>
+        /// Gets or sets the near/beginning and far/ending pixel margins for the axis
+        /// (ignored when set to < 0).
+        ///</summary>
+        [DefaultValue(-1), Category("Layout")]
+        [Description("Indicates the near/beginning and far/ending margins for the axis (ignored when set to < 0).")]
+        public int AxisMargins
+        {
+            get { return (_AxisMargins); }
+
+            set
+            {
+                if (value != _AxisMargins)
+                {
+                    _AxisMargins = value;
+
+                    OnPropertyChangedEx("AxisMargins", Style.VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region AxisNearMargin
+
+        ///<summary>
+        /// Gets or sets the near/beginning margin for the axis. When set ( >= 0 ), the
+        /// value overrides the general AxisMargins setting.
+        ///</summary>
+        [DefaultValue(-1), Category("Layout")]
+        [Description("Indicates the near/beginning margin for the axis. When set ( >= 0 ), the value overrides the general AxisMargins setting.")]
+        public int AxisNearMargin
+        {
+            get { return (_AxisNearMargin); }
+
+            set
+            {
+                if (value != _AxisNearMargin)
+                {
+                    _AxisNearMargin = value;
+
+                    OnPropertyChangedEx("AxisNearMargin", Style.VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region AxisOrientation
+
+        ///<summary>
+        /// Gets the axis orientation (X/Y).
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public AxisOrientation AxisOrientation
+        {
+            get { return (_AxisOrientation); }
+        }
+
+        #endregion
+
+        #region AxisStripes
+
+        /// <summary>
+        /// Gets a reference to the collection of AxisStripes associated with the axis.
+        /// </summary>
+        [Category("Appearance")]
+        [Description("Indicates the collection of AxisStripes associated with the axis.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public AxisStripeCollection AxisStripes
+        {
+            get
+            {
+                if (_AxisStripes == null)
+                {
+                    _AxisStripes = new AxisStripeCollection();
+
+                    _AxisStripes.CollectionChanged += AxisStripeCollectionChanged;
+                }
+
+                return (_AxisStripes);
+            }
+
+            internal set
+            {
+                if (_AxisStripes != null)
+                    _AxisStripes.CollectionChanged -= AxisStripeCollectionChanged;
+
+                _AxisStripes = value;
+
+                if (_AxisStripes != null)
+                    _AxisStripes.CollectionChanged += AxisStripeCollectionChanged;
+            }
+        }
+
+        #region AxisStripeCollectionChanged
+
+        void AxisStripeCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            switch (e.Action)
+            {
+                case NotifyCollectionChangedAction.Add:
+                    foreach (ChartElement item in e.NewItems)
+                        item.Parent = this;
+                    break;
+
+                case NotifyCollectionChangedAction.Replace:
+                    foreach (ChartElement item in e.OldItems)
+                        item.Parent = null;
+
+                    foreach (ChartElement item in e.NewItems)
+                        item.Parent = this;
+                    break;
+
+                case NotifyCollectionChangedAction.Remove:
+                    foreach (ChartElement item in e.OldItems)
+                        item.Parent = null;
+                    break;
+            }
+
+            InvalidateLayout();
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ChartAxisVisualStyle
+
+        /// <summary>
+        /// Gets or sets the visual style for the Axis.
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates the visual style for the Axis.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ChartAxisVisualStyle ChartAxisVisualStyle
+        {
+            get
+            {
+                if (_ChartAxisVisualStyle == null)
+                {
+                    _ChartAxisVisualStyle = new ChartAxisVisualStyle();
+
+                    StyleVisualChangeHandler(null, _ChartAxisVisualStyle);
+                }
+
+                return (_ChartAxisVisualStyle);
+            }
+
+            set
+            {
+                if (_ChartAxisVisualStyle != value)
+                {
+                    ChartAxisVisualStyle oldValue = _ChartAxisVisualStyle;
+
+                    _ChartAxisVisualStyle = value;
+
+                    OnStyleChanged("ChartAxisVisualStyle", oldValue, value);
+
+                    if (oldValue != null)
+                        oldValue.Dispose();
+                }
+            }
+        }
+
+        #endregion
+
+        #region CrosshairLabelVisualStyle
+
+        /// <summary>
+        /// Gets or sets the visual style to be used for Crosshair elements associated with the axis.
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates the visual style to be used for Crosshair elements associated with the axis.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public CrosshairValueVisualStyle CrosshairLabelVisualStyle
+        {
+            get
+            {
+                if (_CrosshairLabelVisualStyle == null)
+                {
+                    _CrosshairLabelVisualStyle = new CrosshairValueVisualStyle();
+
+                    StyleVisualChangeHandler(null, _CrosshairLabelVisualStyle);
+                }
+
+                return (_CrosshairLabelVisualStyle);
+            }
+
+            set
+            {
+                if (_CrosshairLabelVisualStyle != value)
+                {
+                    CrosshairValueVisualStyle oldValue = _CrosshairLabelVisualStyle;
+                    _CrosshairLabelVisualStyle = value;
+
+                    OnStyleChanged("CrosshairLabelVisualStyle", oldValue, value);
+                }
+            }
+        }
+
+        #endregion
+
+        #region DateTimeUnits
+
+        /// <summary>
+        /// Gets or sets the axis display units for DateTime data.
+        /// </summary>
+        [DefaultValue(DateTimeUnits.Days), Category("Data")]
+        [Description("Indicates the axis display units for DateTime data.")]
+        public DateTimeUnits DateTimeUnits
+        {
+            get { return (_DateTimeUnits); }
+
+            set
+            {
+                if (value != _DateTimeUnits)
+                {
+                    _DateTimeUnits = value;
+
+                    OnPropertyChangedEx("DateTimeUnits", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region DateTimeUnitsLimit
+
+        /// <summary>
+        /// Gets or sets the limiting axis display units for DateTime data (the
+        /// max DateTime units the chart will, if needed, promote the display to).
+        /// </summary>
+        [DefaultValue(DateTimeUnits.Years), Category("Data")]
+        [Description("Indicates the limiting axis display units for DateTime data (the max DateTime units the chart will, if needed, promote the display to).")]
+        public DateTimeUnits DateTimeUnitsLimit
+        {
+            get { return (_DateTimeUnitsLimit); }
+
+            set
+            {
+                if (value != _DateTimeUnitsLimit)
+                {
+                    _DateTimeUnitsLimit = value;
+
+                    OnPropertyChangedEx("DateTimeUnitsLimit", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region EffectiveAxisStyle
+
+        /// <summary>
+        /// Gets a reference to the Axis' Effective (cached, composite) style.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public ChartAxisVisualStyle EffectiveAxisStyle
+        {
+            get { return (_EffectiveAxisStyle.Style); }
+        }
+
+        #endregion
+
+        #region EffectiveCrosshairLabelStyle
+
+        /// <summary>
+        /// Gets a reference to the CrosshairLabel's Effective (cached, composite) style.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public CrosshairValueVisualStyle EffectiveCrosshairLabelStyle
+        {
+            get { return (_EffectiveCrosshairLabelStyle.Style); }
+        }
+
+        #endregion
+
+        #region GridInterval
+
+        ///<summary>
+        /// Gets or sets the grid interval (the distance between MajorTickmarks, in pixels)
+        ///</summary>
+        [Description("Indicates the grid interval (the distance between MajorTickmarks, in pixels).")]
+        [DefaultValue(0.0d), Category("Layout")]
+        public double GridInterval
+        {
+            get { return (_GridInterval); }
+
+            set
+            {
+                if (value != _GridInterval)
+                {
+                    _GridInterval = value;
+
+                    OnPropertyChangedEx("GridInterval", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region GridSpacing
+
+        ///<summary>
+        /// Gets or sets the numerical spacing between MajorTickmarks (such as 1, 10, 100, ...).
+        ///</summary>
+        [Description("Indicates the numerical spacing between MajorTickmarks (such as 1, 10, 100, ...).")]
+        [DefaultValue(0.0d), Category("Layout")]
+        public double GridSpacing
+        {
+            get { return (_GridSpacing); }
+
+            set
+            {
+                if (value != _GridSpacing)
+                {
+                    _GridSpacing = value;
+
+                    OnPropertyChangedEx("GridSpacing", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region IsPrimaryAxis
+
+        /// <summary>
+        /// Gets whether the axis is the Primary axis.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsPrimaryAxis
+        {
+            get { return (TestState(States.PrimaryAxis)); }
+            internal set { SetState(States.PrimaryAxis, value); }
+        }
+
+        #endregion
+
+        #region MajorGridLines
+
+        ///<summary>
+        /// Gets the axis MajorGridLines element.
+        ///</summary>
+        [Description("Indicates the MajorGridLines element."), Category("Appearance")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public virtual ChartMajorGridLines MajorGridLines
+        {
+            get { return (_MajorGridLines); }
+        }
+
+        #endregion
+
+        #region MajorTickmarks
+
+        ///<summary>
+        /// Gets the axis MajorTickmarks element.
+        ///</summary>
+        [Description("Indicates the MajorTickmarks element."), Category("Appearance")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public virtual MajorTickmarks MajorTickmarks
+        {
+            get { return (_MajorTickmarks); }
+        }
+
+        #endregion
+
+        #region MaxValue
+
+        ///<summary>
+        /// Gets or sets the maximum axis data value.
+        ///</summary>
+        [DefaultValue(null), Category("Data")]
+        [Description("Indicates the maximum axis data value.")]
+        [TypeConverter("DevComponents.Charts.Design.PointValueConverter," +
+            "DevComponents.Charts.Design, Version=14.1.0.37, Culture=neutral, PublicKeyToken=90f470f34c89ccaf")]
+        public object MaxValue
+        {
+            get { return (_MaxValue); }
+
+            set
+            {
+                if (value != _MaxValue)
+                {
+                    _MaxValue = value;
+
+                    OnPropertyChangedEx("MaxValue", Style.VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region MinorGridLines
+
+        ///<summary>
+        /// Gets the axis MinorGridLines element.
+        ///</summary>
+        [Description("Indicates the MinorGridLines element."), Category("Appearance")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public virtual ChartMinorGridLines MinorGridLines
+        {
+            get { return (_MinorGridLines); }
+        }
+
+        #endregion
+
+        #region MinGridInterval
+
+        ///<summary>
+        /// Gets or sets the minimum grid interval size. This is the distance (in pixels)
+        /// between tickmark layout items.
+        ///</summary>
+        [DefaultValue(10), Category("Layout")]
+        [Description("Indicates the minimum grid interval size. This is the distance (in pixels) between tickmark layout items.")]
+        public int MinGridInterval
+        {
+            get { return (_MinGridInterval); }
+
+            set
+            {
+                if (value != _MinGridInterval)
+                {
+                    _MinGridInterval = value;
+
+                    OnPropertyChangedEx("MinGridInterval", Style.VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region MinorTickmarks
+
+        ///<summary>
+        /// Gets the axis MinorTickmarks element.
+        ///</summary>
+        [Description("Indicates the MinorTickmarks element."), Category("Appearance")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public virtual MinorTickmarks MinorTickmarks
+        {
+             get { return (_MinorTickmarks); }
+        }
+
+        #endregion
+
+        #region MinValue
+
+        ///<summary>
+        /// Gets or sets the minimum axis data value.
+        ///</summary>
+        [DefaultValue(null), Category("Data")]
+        [Description("Indicates the minimum axis data value.")]
+        [TypeConverter("DevComponents.Charts.Design.PointValueConverter," +
+            "DevComponents.Charts.Design, Version=14.1.0.37, Culture=neutral, PublicKeyToken=90f470f34c89ccaf")]
+        public object MinValue
+        {
+            get { return (_MinValue); }
+
+            set
+            {
+                if (value != _MinValue)
+                {
+                    _MinValue = value;
+                        
+                    OnPropertyChangedEx("MinValue", Style.VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region QualitativeSortDirection
+
+        ///<summary>
+        /// Gets or sets the sort direction for Qualitative axis values.
+        ///</summary>
+        [DefaultValue(SortDirection.None), Category("Data")]
+        [Description("Indicates the sort direction for Qualitative axis values.")]
+        public SortDirection QualitativeSortDirection
+        {
+            get { return (_QualitativeSortDirection); }
+
+            set
+            {
+                if (value != _QualitativeSortDirection)
+                {
+                    _QualitativeSortDirection = value;
+
+                    RefreshRangeValues();
+
+                    OnPropertyChangedEx("QualitativeSortDirection", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ReferenceLines
+
+        /// <summary>
+        /// Gets a reference to the collection of axis Reference Lines
+        /// </summary>
+        [Category("Appearance")]
+        [Description("Indicates the collection of axis Reference Lines.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ReferenceLineCollection ReferenceLines
+        {
+            get
+            {
+                if (_ReferenceLines == null)
+                {
+                    _ReferenceLines = new ReferenceLineCollection();
+
+                    _ReferenceLines.CollectionChanged += ReferenceLineCollectionChanged;
+                }
+
+                return (_ReferenceLines);
+            }
+
+            internal set
+            {
+                if (_ReferenceLines != null)
+                    _ReferenceLines.CollectionChanged -= ReferenceLineCollectionChanged;
+
+                _ReferenceLines = value;
+
+                if (_ReferenceLines != null)
+                    _ReferenceLines.CollectionChanged += ReferenceLineCollectionChanged;
+            }
+        }
+
+        #region ReferenceLineCollectionChanged
+
+        void ReferenceLineCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            switch (e.Action)
+            {
+                case NotifyCollectionChangedAction.Add:
+                    foreach (ChartElement item in e.NewItems)
+                        item.Parent = this;
+                    break;
+
+                case NotifyCollectionChangedAction.Replace:
+                    foreach (ChartElement item in e.OldItems)
+                        item.Parent = null;
+
+                    foreach (ChartElement item in e.NewItems)
+                        item.Parent = this;
+                    break;
+
+                case NotifyCollectionChangedAction.Remove:
+                    foreach (ChartElement item in e.OldItems)
+                        item.Parent = null;
+                    break;
+            }
+
+            InvalidateRender();
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Title
+
+        ///<summary>
+        /// Gets or sets the Axis Title.
+        ///</summary>
+        [Category("Layout")]
+        [Description("Indicates the Axis Title.")]
+        [TypeConverter(typeof(BlankExpandableObjectConverter))]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public AxisTitle Title
+        {
+            get
+            {
+                if (_Title == null)
+                {
+                    _Title = new AxisTitle();
+                    _Title.Parent = this;
+                }
+
+                return (_Title);
+            }
+
+            set
+            {
+                if (value != _Title)
+                {
+                    _Title = value;
+                    _Title.Parent = (value != null) ? this : null;
+
+                    OnPropertyChangedEx("Title", Style.VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region UseAlternateBackground
+
+        /// <summary>
+        /// Gets or sets whether the axis utilizes the alternate background color.
+        /// </summary>
+        [DefaultValue(false), Category("Appearance")]
+        [Description("Indicates whether the axis utilizes the alternate background color.")]
+        public bool UseAlternateBackground
+        {
+            get { return (TestState(States.UseAlternateBackground)); }
+
+            set
+            {
+                if (value != UseAlternateBackground)
+                {
+                    SetState(States.UseAlternateBackground, value);
+
+                    OnPropertyChangedEx("UseAlternateBackground", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region UseAutoMinGridInterval
+
+        /// <summary>
+        /// Gets or sets whether the auto-calculated minimum grid interval
+        /// will be used in determining the axis major tickmark interval.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance")]
+        [Description("Indicates whether the auto-calculated minimum grid interval will be used in determining the axis major tickmark interval.")]
+        public bool UseAutoMinGridInterval
+        {
+            get { return (TestState(States.UseAutoMinGridInterval)); }
+
+            set
+            {
+                if (value != UseAutoMinGridInterval)
+                {
+                    SetState(States.UseAutoMinGridInterval, value);
+
+                    OnPropertyChangedEx("UseAutoMinGridInterval", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region AxisBars
+
+        internal AxisBar[] AxisBars
+        {
+            get { return (_AxisBars); }
+        }
+
+        #endregion
+
+        #region AxisBounds
+
+        internal Rectangle AxisBounds
+        {
+            get { return (_AxisBounds); }
+            set { _AxisBounds = value; }
+        }
+
+        #endregion
+
+        #region AxisLineBounds
+
+        internal Rectangle AxisLineBounds
+        {
+            get { return (_AxisLineBounds); }
+            set { _AxisLineBounds = value; }
+        }
+
+        #endregion
+
+        #region DotPlotAxis
+
+        internal bool DotPlotAxis
+        {
+            get { return (TestState(States.DotPlotAxis)); }
+            set { SetState(States.DotPlotAxis, value); }
+        }
+
+        #endregion
+
+        #region EdgeAxis
+
+        internal bool EdgeAxis
+        {
+            get { return (TestState(States.EdgeAxis)); }
+            set { SetState(States.EdgeAxis, value); }
+        }
+
+        #endregion
+
+        #region LastTickmarkLayout
+
+        internal TickmarkLayout LastTickmarkLayout
+        {
+            get { return (_LastTickmarkLayout); }
+            set { _LastTickmarkLayout = value; }
+        }
+
+        #endregion
+
+        #region QualitativeValues
+
+        internal List<object> QualitativeValues
+        {
+            get
+            {
+                if (_QualitativeValues == null)
+                    _QualitativeValues = new List<object>();
+
+                return (_QualitativeValues);
+            }
+
+            set { _QualitativeValues = value; }
+        }
+
+        #endregion
+
+        #region ScaleType
+
+        internal ScaleType ScaleType
+        {
+            get { return (_ScaleType); }
+            set { _ScaleType = value; }
+        }
+
+        #endregion
+
+        #region SeriesRangeChanged
+
+        internal bool SeriesRangeChanged
+        {
+            get { return (TestState(States.SeriesRangeChanged)); }
+            set { SetState(States.SeriesRangeChanged, value); }
+        }
+
+        #endregion
+
+        #region TickmarkLayout
+
+        internal TickmarkLayout TickmarkLayout
+        {
+            get { return(_TickmarkLayout); }
+            set { _TickmarkLayout = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region MeasureOverride
+
+        protected override void MeasureOverride(ChartLayoutInfo layoutInfo)
+        {
+            MeasureReferenceLines(layoutInfo);
+        }
+
+        protected void MeasureReferenceLines(ChartLayoutInfo layoutInfo)
+        {
+            Rectangle layoutBounds = layoutInfo.LayoutBounds;
+
+            foreach (ReferenceLine line in ReferenceLines)
+            {
+                layoutInfo.LayoutBounds = BoundsRelative;
+
+                line.Measure(layoutInfo);
+            }
+
+            layoutInfo.LayoutBounds = layoutBounds;
+        }
+
+        #endregion
+
+        #region ArrangeOverride
+
+        protected override void ArrangeOverride(ChartLayoutInfo layoutInfo)
+        {
+            if (Title.Visible == true)
+                Title.Arrange(layoutInfo);
+
+            MajorTickmarks.Arrange(layoutInfo);
+            MinorTickmarks.Arrange(layoutInfo);
+
+            MajorGridLines.TickmarkLayout = TickmarkLayout;
+            MinorGridLines.TickmarkLayout = TickmarkLayout;
+
+            MajorGridLines.Arrange(layoutInfo);
+            MinorGridLines.Arrange(layoutInfo);
+
+            ArrangeReferenceLines(layoutInfo);
+        }
+
+        #region ArrangeReferenceLines
+
+        private void ArrangeReferenceLines(ChartLayoutInfo layoutInfo)
+        {
+            Rectangle layoutBounds = layoutInfo.LayoutBounds;
+
+            foreach (ReferenceLine line in ReferenceLines)
+            {
+                layoutInfo.LayoutBounds = BoundsRelative;
+
+                line.Arrange(layoutInfo);
+            }
+
+            layoutInfo.LayoutBounds = layoutBounds;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderOverride
+
+        protected override void RenderOverride(ChartRenderInfo renderInfo)
+        {
+            ChartAxisVisualStyle astyle = EffectiveAxisStyle;
+
+            if (Title.Visible == true)
+                Title.Render(renderInfo);
+        }
+
+        #endregion
+
+        #region Render
+
+        internal override void Render(ChartRenderInfo renderInfo)
+        {
+            if (Displayed == true)
+            {
+                Rectangle bounds = GetScrollBounds(AxisBounds);
+
+                if (renderInfo.ClipRectangle.IntersectsWith(bounds))
+                    RenderOverride(renderInfo);
+            }
+        }
+
+        #endregion
+
+        #region RenderCrosshairLabel
+
+        internal virtual void RenderCrosshairLabel(Graphics g, Point pt)
+        {
+        }
+
+        internal virtual void RenderCrosshairLabel(Graphics g, CrosshairPoint cp)
+        {
+        }
+
+        #region GetCrosshairLabel
+
+        internal string GetCrosshairLabel(object value, CrosshairValueVisualStyle lstyle)
+        {
+            string label = "";
+
+            if (value != null)
+            {
+                TickmarkLabelVisualStyle tstyle = MajorTickmarks.EffectiveLabelStyle;
+
+                try
+                {
+                    switch (ScaleType)
+                    {
+                        case ScaleType.DateTime:
+                            DateTime dtvalue = (DateTime)value;
+
+                            if (string.IsNullOrEmpty(lstyle.TextFormat) == false)
+                                label = dtvalue.ToString(lstyle.TextFormat);
+
+                            else if (string.IsNullOrEmpty(tstyle.TextFormat) == false)
+                                label = dtvalue.ToString(tstyle.TextFormat);
+                            else
+                                label = GetDateTimeLabel(dtvalue);
+                            break;
+
+                        case ScaleType.Qualitative:
+                            if (string.IsNullOrEmpty(lstyle.TextFormat) == false)
+                                label = string.Format(lstyle.TextFormat, value);
+
+                            else if (string.IsNullOrEmpty(tstyle.TextFormat) == false)
+                                label = string.Format(tstyle.TextFormat, value);
+                            else
+                                label = value.ToString();
+                            break;
+
+                        default:
+                            double d = Convert.ToDouble(value);
+
+                            if (string.IsNullOrEmpty(lstyle.TextFormat) == false)
+                                label = d.ToString(lstyle.TextFormat);
+
+                            else if (string.IsNullOrEmpty(tstyle.TextFormat) == false)
+                                label = d.ToString(tstyle.TextFormat);
+
+                            else if (value is int)
+                                label = ((int)value).ToString();
+
+                            else
+                                label = d.ToString("F6");
+
+                            break;
+                    }
+                }
+                catch
+                {
+                }
+            }
+
+            ChartControl chartControl = ChartControl;
+
+            if (chartControl != null)
+                chartControl.DoGetCrosshairAxisLabelEvent(this, value, ref label);
+
+            return (label);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderBackground
+
+        internal virtual void RenderBackground(
+            ChartRenderInfo renderInfo, Rectangle scContentBounds)
+        {
+        }
+
+        #endregion
+
+        #region RenderStripes
+
+        internal virtual void RenderStripes(
+            ChartRenderInfo renderInfo, Rectangle scContentBounds)
+        {
+        }
+
+        #endregion
+
+        #region RenderStripe
+
+        protected void RenderStripe(
+            Graphics g, Rectangle bounds, AxisStripe stripe)
+        {
+            if (bounds.Width > 0 && bounds.Height > 0)
+            {
+                AxisStripeVisualStyle astyle = stripe.AxisStripeVisualStyle;
+
+                if (astyle.Background.IsEmpty == true)
+                {
+                    g.FillRectangle(Brushes.LightPink, bounds);
+                }
+                else
+                {
+                    using (Brush br = astyle.Background.GetBrush(bounds))
+                        g.FillRectangle(br, bounds);
+                }
+            }
+        }
+
+        #endregion
+
+        #region CalcMajorSpacing
+
+        protected void CalcMajorSpacing(ChartLayoutInfo layoutInfo, int width)
+        {
+            ChartXy chartXy = Parent as ChartXy;
+
+            if (chartXy.DropShadowDisplayed == true)
+                width -= 3;
+
+            if (AxisOrientation == AxisOrientation.X)
+            {
+                if (chartXy.VScrollBar.Visible == true)
+                    width -= chartXy.VScrollBar.Width;
+            }
+            else
+            {
+                if (chartXy.HScrollBar.Visible == true)
+                    width -= chartXy.HScrollBar.Height;
+            }
+
+            TickmarkLayout layout = new TickmarkLayout();
+
+            layout.MinValue = GetMinValue();
+            layout.MaxValue = GetMaxValue();
+
+            if (layout.MinValue != null && layout.MaxValue != null)
+            {
+                ScaleType scaleType = ScaleType;
+                
+                if (ScaleType == ScaleType.NotSet)
+                    ScaleType = SeriesPoint.GetScaleType(layout.MinValue.GetType());
+
+                layout.MinorCount = MinorTickmarks.TickmarkCount;
+
+                if (ScaleType != ScaleType.NotSet)
+                {
+                    switch (ScaleType)
+                    {
+                        case ScaleType.DateTime:
+                            CalcMajorDateTimeSpacing(chartXy, layout, width);
+                            break;
+
+                        case ScaleType.Qualitative:
+                            CalcMajorQualitativeSpacing(layout, width);
+                            break;
+
+                        default:
+                            CalcMajorQuantitativeSpacing(chartXy, layout, width);
+                            break;
+                    }
+                }
+
+                if (AxisOrientation == AxisOrientation.Y)
+                {
+                    if (chartXy.HScrollBar.Visible == true)
+                        layout.MarginOffset -= chartXy.HScrollBarHeight;
+                }
+            }
+
+            TickmarkLayout = layout;
+        }
+
+        #region CalcMajorDateTimeSpacing
+
+        private void CalcMajorDateTimeSpacing(
+            ChartXy chartXy, TickmarkLayout layout, int width)
+        {
+            DateTime dtMinValue = (DateTime)layout.MinValue;
+            DateTime dtMaxValue = (DateTime)layout.MaxValue;
+
+            DateTime odtMinValue = dtMinValue;
+
+            if (width > 0 && dtMinValue < dtMaxValue)
+            {
+                DateTime ominValue = dtMinValue;
+
+                width = SetLayoutMargin(layout, width) - 2;
+
+                CalcDateTimeSpacing(chartXy, layout, dtMinValue, dtMaxValue, width);
+
+                if (AutoCalcBarMargins == true)
+                {
+                    ChartSeries barSeries = GetBarSeries(chartXy);
+
+                    if (barSeries != null)
+                    {
+                        if ((barSeries.IsRotated == false && AxisOrientation == AxisOrientation.X) ||
+                            (barSeries.IsRotated == true && AxisOrientation == AxisOrientation.Y))
+                        {
+                            int n = (int)(width / layout.MajorCount / 2 / layout.MajorSpacing);
+
+                            layout.NearMargin += n;
+                            layout.FarMargin += n;
+
+                            width -= (n * 2);
+
+                            layout.MajorInterval = (double)width / layout.MajorCount;
+                        }
+                    }
+                }
+                else
+                {
+                    layout.MajorInterval = (double)width / layout.MajorCount;
+                }
+
+                if (UseAutoMinGridInterval == true)
+                {
+                    if (layout.MajorInterval <= 3)
+                        layout.MajorInterval = 3;
+                }
+
+                dtMinValue = AdjustDateTimeBase(layout, dtMinValue);
+
+                UpdateDateTimeMargins(layout, ref dtMinValue, ref dtMaxValue);
+
+                double offset = GetDateTimeRange(ActualDateTimeUnits, dtMinValue, ominValue);
+
+                int moff = (int)((layout.MajorInterval * offset) / layout.MajorSpacing - layout.NearMargin - 1);
+
+                layout.MarginOffset = moff;
+
+                layout.MinValue = dtMinValue;
+                layout.MaxValue = dtMaxValue;
+            }
+        }
+
+        #region AdjustDateTimeBase
+
+        private DateTime AdjustDateTimeBase(TickmarkLayout layout, DateTime dtValue)
+        {
+            switch (ActualDateTimeUnits)
+            {
+                case DateTimeUnits.Milliseconds:
+                    dtValue = dtValue.AddMilliseconds(-dtValue.Millisecond % layout.GridSpacing);
+                    break;
+
+                case DateTimeUnits.Seconds:
+                    dtValue = new DateTime(dtValue.Year, dtValue.Month, dtValue.Day, dtValue.Hour, dtValue.Minute, dtValue.Second);
+                    dtValue = dtValue.AddSeconds(-dtValue.Second % layout.GridSpacing);
+                    break;
+
+                case DateTimeUnits.Minutes:
+                    dtValue = new DateTime(dtValue.Year, dtValue.Month, dtValue.Day, dtValue.Hour, dtValue.Minute, 0);
+                    dtValue = dtValue.AddMinutes(-dtValue.Minute % layout.GridSpacing);
+                    break;
+
+                case DateTimeUnits.Hours:
+                    dtValue = new DateTime(dtValue.Year, dtValue.Month, dtValue.Day, dtValue.Hour, 0, 0);
+                    dtValue = dtValue.AddHours(-dtValue.Hour % layout.GridSpacing);
+                    break;
+
+                case DateTimeUnits.Days:
+                    dtValue = new DateTime(dtValue.Year, dtValue.Month, dtValue.Day);
+                    dtValue = dtValue.AddDays(-dtValue.Day % layout.GridSpacing);
+                    break;
+
+                case DateTimeUnits.Months:
+                    dtValue = new DateTime(dtValue.Year, dtValue.Month, 1);
+                    dtValue = dtValue.AddMonths(-(int)(dtValue.Month % layout.GridSpacing));
+                    break;
+
+                case DateTimeUnits.Years:
+                    dtValue = new DateTime(dtValue.Year, 1, 1);
+                    dtValue = dtValue.AddYears(-(int)(dtValue.Year % layout.GridSpacing));
+                    break;
+
+                default:
+                    dtValue = dtValue.AddTicks(-(long)(dtValue.Millisecond % layout.GridSpacing));
+                    break;
+            }
+
+            return (dtValue);
+        }
+
+        #endregion
+
+        #region CalcDateTimeSpacing
+
+        private void CalcDateTimeSpacing(ChartXy chartXy,
+            TickmarkLayout layout, DateTime dtMinValue, DateTime dtMaxValue, int width)
+        {
+            DateTimeUnits adtu = DateTimeUnits;
+
+            double range = GetDateTimeRange(adtu, dtMinValue, dtMaxValue);
+
+            if (GridSpacing <= 0)
+            {
+                layout.GridSpacing = 1;
+                layout.MajorSpacing = layout.GridSpacing;
+            }
+            else
+            {
+                layout.GridSpacing = GridSpacing;
+                layout.MajorSpacing = layout.GridSpacing;
+            }
+
+            CalcDateTimeInterval(layout, range, width);
+
+            double minorInterval = layout.MajorInterval / (MinorTickmarks.TickmarkCount + 1);
+
+            if (minorInterval > 0)
+            {
+                ChartSeries barSeries = GetBarSeries(chartXy);
+
+                while (minorInterval < MinGridInterval)
+                {
+                    if ((barSeries == null) && (int)adtu < (int)DateTimeUnitsLimit)
+                    {
+                        adtu = GetNextDateTimeUnit(adtu, dtMinValue, dtMaxValue);
+                        range = GetDateTimeRange(adtu, dtMinValue, dtMaxValue);
+
+                        CalcDateTimeInterval(layout, range, width);
+
+                        minorInterval = layout.MajorInterval / (MinorTickmarks.TickmarkCount + 1);
+                    }
+                    else
+                    {
+                        if (GridSpacing > 0)
+                            break;
+
+                        minorInterval *= 2;
+                        layout.MajorSpacing *= 2;
+                    }
+                }
+
+                ActualDateTimeUnits = adtu;
+
+                CalcDateTimeInterval(layout, range, width);
+            }
+        }
+
+        #region CalcDateTimeInterval
+
+        private void CalcDateTimeInterval(TickmarkLayout layout, double range, int width)
+        {
+            double d = range / layout.MajorSpacing;
+
+            layout.MajorCount = (int)Math.Ceiling(d);
+            layout.MajorInterval = (double)width / d;
+
+            if (layout.MajorCount <= 0)
+                layout.MajorCount = 1;
+        }
+
+        #endregion
+
+        #region GetNextDateTimeUnit
+
+        private DateTimeUnits GetNextDateTimeUnit(
+            DateTimeUnits adtu, DateTime dtMinValue, DateTime dtMaxValue)
+        {
+            switch (adtu)
+            {
+                case DateTimeUnits.Ticks:
+                    return (DateTimeUnits.Milliseconds);
+
+                case DateTimeUnits.Milliseconds:
+                    return (DateTimeUnits.Seconds);
+
+                case DateTimeUnits.Seconds:
+                    return (DateTimeUnits.Minutes);
+
+                case DateTimeUnits.Minutes:
+                    return (DateTimeUnits.Hours);
+
+                case DateTimeUnits.Hours:
+                    return (DateTimeUnits.Days);
+
+                case DateTimeUnits.Days:
+                    return (DateTimeUnits.Months);
+
+                default:
+                    return (DateTimeUnits.Years);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region AddDateTimeOffset
+
+        private DateTime AddDateTimeOffset(DateTime dtValue, int offset)
+        {
+            switch (ActualDateTimeUnits)
+            {
+                case DateTimeUnits.Milliseconds:
+                    dtValue = dtValue.AddMilliseconds(offset);
+                    break;
+
+                case DateTimeUnits.Seconds:
+                    dtValue = dtValue.AddSeconds(offset);
+                    break;
+
+                case DateTimeUnits.Minutes:
+                    dtValue = dtValue.AddMinutes(offset);
+                    break;
+
+                case DateTimeUnits.Hours:
+                    dtValue = dtValue.AddHours(offset);
+                    break;
+
+                case DateTimeUnits.Days:
+                    dtValue = dtValue.AddDays(offset);
+                    break;
+
+                case DateTimeUnits.Months:
+                    dtValue = dtValue.AddMonths(offset);
+                    break;
+
+                case DateTimeUnits.Years:
+                    dtValue = dtValue.AddYears(offset);
+                    break;
+
+                default:
+                    dtValue = dtValue.AddTicks(offset);
+                    break;
+            }
+
+            return (dtValue);
+        }
+
+        #endregion
+
+        #region UpdateDateTimeMargins
+
+        private void UpdateDateTimeMargins(
+            TickmarkLayout layout, ref DateTime dtMinValue, ref DateTime dtMaxValue)
+        {
+            if (layout.NearMargin > 0)
+            {
+                int marginCount = (int)Math.Ceiling(layout.NearMargin / layout.MajorInterval);
+
+                layout.MajorCount += marginCount;
+
+                dtMinValue = AddDateTimeOffset(dtMinValue, -(int)(marginCount * 1)); //layout.MajorSpacing));
+            }
+
+            if (layout.FarMargin > 0)
+            {
+                int marginCount = (int)Math.Ceiling(layout.FarMargin / layout.MajorInterval);
+
+                layout.MajorCount += marginCount;
+
+                dtMaxValue = AddDateTimeOffset(dtMaxValue, (int)(marginCount * 1)); //layout.MajorSpacing));
+            }
+        }
+
+        #endregion
+
+        #region GetDateTimeRange
+
+        private double GetDateTimeRange(
+            DateTimeUnits dtu, DateTime dtMinValue, DateTime dtMaxValue)
+        {
+            TimeSpan ts = dtMaxValue - dtMinValue;
+
+            switch (dtu)
+            {
+                case DateTimeUnits.Milliseconds:
+                    return (ts.TotalMilliseconds);
+
+                case DateTimeUnits.Seconds:
+                    return (ts.TotalSeconds);
+
+                case DateTimeUnits.Minutes:
+                    return (ts.TotalMinutes);
+
+                case DateTimeUnits.Hours:
+                    return (ts.TotalHours);
+
+                case DateTimeUnits.Days:
+                    return (ts.TotalDays);
+
+                case DateTimeUnits.Months:
+                    return (CalcDateTimeMonths(dtMinValue, dtMaxValue));
+
+                case DateTimeUnits.Years:
+                    return (CalcDateTimeYears(dtMinValue, dtMaxValue));
+
+                default:
+                    return (dtMaxValue.Ticks - dtMinValue.Ticks);
+            }
+        }
+
+        #region CalcDateTimeYears
+
+        internal double CalcDateTimeYears(DateTime dtMinValue, DateTime dtMaxValue)
+        {
+            int years = dtMaxValue.Year - dtMinValue.Year;
+
+            DateTime last = dtMinValue.AddYears(years);
+
+            if (last > dtMaxValue)
+            {
+                last = last.AddYears(-1);
+                years--;
+            }
+
+            DateTime next = last.AddYears(1);
+
+            double yearDays = (next - last).Days;
+            double days = (dtMaxValue - last).Days;
+
+            return ((double)years + (days / yearDays));
+        }
+
+        #endregion
+
+        #region CalcDateTimeMonths
+
+        internal double CalcDateTimeMonths(DateTime dtMinValue, DateTime dtMaxValue)
+        {
+            // Rough estimation...
+
+            TimeSpan ts = dtMaxValue - dtMinValue;
+
+            return ((double)ts.Days / 30);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region CalcMajorQuantitativeSpacing
+
+        private void CalcMajorQuantitativeSpacing(
+            ChartXy chartXy, TickmarkLayout layout, int width)
+        {
+            Type otype = layout.MinValue.GetType();
+
+            double dminValue = Convert.ToDouble(layout.MinValue);
+            double dmaxValue = Convert.ToDouble(layout.MaxValue);
+
+            if (AutoCalcBarMargins == true)
+            {
+                ChartSeries barSeries = GetFullBarSeries(chartXy);
+
+                if (barSeries != null)
+                {
+                    if (barSeries.IsRotated == true && AxisOrientation == AxisOrientation.X ||
+                        barSeries.IsRotated == false && AxisOrientation == AxisOrientation.Y)
+                    {
+                        double origin = Convert.ToDouble((chartXy.BarOrigin ?? 0));
+
+                        dminValue = Math.Min(origin, dminValue);
+                    }
+                }
+            }
+
+            double ominValue = dminValue;
+
+            if (dminValue == dmaxValue)
+                dmaxValue++;
+
+            if (width > 0 && dminValue <= dmaxValue)
+            {
+                width = SetLayoutMargin(layout, width);
+
+                double range = Math.Abs(dmaxValue - dminValue);
+
+                CalcQuantitativeSpacing(chartXy, layout, range, width);
+
+                if (UseAutoMinGridInterval == true)
+                {
+                    if (layout.MajorInterval < 3)
+                        layout.MajorInterval = 3;
+                }
+
+                UpdateQuantitativeMargins(layout, otype, ref dminValue, ref dmaxValue);
+
+                // Make sure zero is included on the axis
+
+                int n = dminValue < 0 ? -1 : 1;
+
+                if (dminValue < 0)
+                    dminValue -= ((dminValue % layout.MajorSpacing) + layout.MajorSpacing);
+
+                else if (dminValue > 0)
+                    dminValue -= (dminValue % layout.MajorSpacing);
+
+                int moff = 0;
+
+                double delta = Math.Floor(Math.Abs(dminValue) / layout.MajorSpacing);
+                double value = (int)delta * layout.MajorSpacing * n;
+                double offset = Math.Abs(value - ominValue);
+
+                moff = (int)((layout.MajorInterval * offset) / layout.MajorSpacing - layout.NearMargin);
+
+                layout.MarginOffset = moff;
+
+                layout.MinValue = Convert.ChangeType(dminValue, otype);
+                layout.MaxValue = Convert.ChangeType(dmaxValue, otype);
+            }
+        }
+
+        #region CalcQuantitativeSpacing
+
+        void CalcQuantitativeSpacing(
+            ChartXy chartXy, TickmarkLayout layout, double range, int width)
+        {
+            if (GridSpacing <= 0)
+            {
+                // User has not specified a spacing, so calculate it for them based
+                // upon powers of 10 (10, 100, 1000, etc)
+                // 
+                // MajorSpacing is set to a multiple of the GridSpacing (based upon
+                // the calculated minor tickmark interval)
+
+                layout.GridSpacing = Math.Pow(10, Math.Floor(Math.Log10(range / 10)));
+
+                if (layout.GridSpacing < 1)
+                    layout.GridSpacing = 1;
+
+                if (layout.MinValue is int)
+                    layout.GridSpacing = Math.Ceiling(layout.GridSpacing);
+
+                layout.MajorSpacing = layout.GridSpacing;
+
+                layout.MajorCount = (int)Math.Ceiling(range / layout.MajorSpacing);
+                layout.MajorInterval = (double)width / layout.MajorCount;
+            }
+            else
+            {
+                layout.GridSpacing = GridSpacing;
+                layout.MajorSpacing = layout.GridSpacing;
+
+                layout.MajorCount = (int)Math.Ceiling(range / layout.MajorSpacing);
+                layout.MajorInterval = (double)width / layout.MajorCount;
+            }
+
+            double gridInterval = GridInterval;
+            double pxp = (range < 1) ? width : ((double)width / range);
+
+            ChartSeries dpSeries = GetChartDotPlotSeries(chartXy);
+
+            if (dpSeries != null)
+            {
+                // Calculate the default dot plot spacing
+
+                gridInterval = CalcDotPlotSpacing(
+                    chartXy, layout, range, ref width, dpSeries);
+
+                double count = range / layout.MajorSpacing;
+
+                layout.MajorCount = (int)Math.Ceiling(count);
+
+                pxp = (double)width / range;
+
+                DotPlotAxis = true;
+            }
+            else
+            {
+                ChartSeries barSeries = GetBarSeries(chartXy);
+
+                if (barSeries != null)
+                {
+                    if ((barSeries.IsRotated == false && AxisOrientation == AxisOrientation.X) ||
+                        (barSeries.IsRotated == true && AxisOrientation == AxisOrientation.Y))
+                    {
+                        int n = (int)(pxp / 2) + 1;
+
+                        layout.NearMargin += n;
+                        layout.FarMargin += n;
+
+                        width -= (n * 2);
+
+                        layout.MajorInterval = (double)width / layout.MajorCount;
+
+                        pxp = (double)width / (range);
+                    }
+                }
+
+                double minorInterval = layout.MajorInterval / (MinorTickmarks.TickmarkCount + 1);
+
+                if (minorInterval > 0)
+                {
+                    while (minorInterval < MinGridInterval)
+                    {
+                        minorInterval *= 2;
+                        layout.MajorSpacing *= 2;
+                    }
+                }
+
+                gridInterval = layout.MajorInterval;
+
+                double dminValue = Convert.ToDouble(layout.MinValue);
+                double dmaxValue = Convert.ToDouble(layout.MaxValue);
+
+                double maxp = (int)(dmaxValue / layout.MajorSpacing) * layout.MajorSpacing;
+
+                if (maxp < dmaxValue)
+                    maxp += layout.MajorSpacing;
+
+                double minp = (int)(dminValue / layout.MajorSpacing) * layout.MajorSpacing;
+
+                if (minp > dminValue)
+                    minp -= layout.MajorSpacing;
+
+                layout.MajorCount = (int)Math.Ceiling((maxp - minp) / layout.MajorSpacing);
+
+                layout.MinValue = minp;
+                layout.MaxValue = maxp;
+
+                DotPlotAxis = false;
+            }
+
+            if (GridInterval > 0)
+            {
+                layout.MajorInterval = GridInterval;
+            }
+            else
+            {
+                if (AxisCanExpand(dpSeries) == true)
+                    gridInterval = Math.Max(gridInterval, pxp * layout.MajorSpacing);
+
+                layout.MajorInterval = Math.Max(gridInterval, 1);
+            }
+        }
+
+        #region GetChartDotPlotSeries
+
+        private ChartSeries GetChartDotPlotSeries(ChartXy chartXy)
+        {
+            foreach (ChartSeries series in chartXy.ChartSeries)
+            {
+                if ((series.SeriesType == SeriesType.VerticalDot) ||
+                    (series.SeriesType == SeriesType.HorizontalDot))
+                {
+                    return (series);
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region CalcDotPlotSpacing
+
+        private double CalcDotPlotSpacing(ChartXy chartXy,
+            TickmarkLayout layout, double range, ref int width, ChartSeries dpSeries)
+        {
+            // If we previously added a default margin, back it back out
+            // since we are going to adjust the margin based upon the orientation
+            // and size of the marker
+
+            if (AxisMargins < 0)
+            {
+                width += ((layout.NearMargin * 2) - Dpi.Width10);
+                layout.NearMargin = Dpi.Width5;
+            }
+
+            Size dotSize = chartXy.GetMaxDotPlotMarkerSize();
+            DotPlotType dotTypes = chartXy.GetDotPlotTypes();
+
+            return (AxisOrientation == AxisOrientation.X)
+                ? CalcXDotPlotSpacing(chartXy, layout, range, ref width, dpSeries, dotTypes, dotSize)
+                : CalcYDotPlotSpacing(chartXy, layout, range, ref width, dpSeries, dotTypes, dotSize);
+        }
+
+        #region CalcXDotPlotSpacing
+
+        private double CalcXDotPlotSpacing(ChartXy chartXy, TickmarkLayout layout,
+            double range, ref int width, ChartSeries dpSeries, DotPlotType dotTypes, Size dotSize)
+        {
+            if ((dotTypes & DotPlotType.Vertical) == DotPlotType.Vertical)
+            {
+                int n = dotSize.Width / 2;
+
+                layout.NearMargin += n;
+                width -= (n * 2);
+            }
+
+            layout.MajorSpacing = (GridSpacing <= 0) ? 1 : GridSpacing;
+
+            double gridInterval = Math.Max(layout.MajorSpacing, 1) * dotSize.Width;
+
+            if (MinGridInterval > 0)
+            {
+                while (gridInterval < Dpi.Width(MinGridInterval))
+                {
+                    gridInterval *= 2;
+                    layout.MajorSpacing *= 2;
+                }
+            }
+
+            Size size = chartXy.MinQualitativeSize;
+
+            double count = range;
+
+            if ((dotTypes & DotPlotType.Vertical) == DotPlotType.Vertical)
+                count = range / dpSeries.DotPlotIndexValue;
+
+            size.Width = (int)(dotSize.Width * count + layout.NearMargin * 2);
+
+            if (chartXy.VScrollBar.Enabled == true)
+                size.Width += chartXy.VScrollBar.Width;
+
+            chartXy.MinQualitativeSize = size;
+
+            return (gridInterval);
+        }
+
+        #endregion
+
+        #region CalcYDotPlotSpacing
+
+        private double CalcYDotPlotSpacing(ChartXy chartXy, TickmarkLayout layout,
+            double range, ref int width, ChartSeries dpSeries, DotPlotType dotTypes, Size dotSize)
+        {
+            if ((dotTypes & DotPlotType.Horizontal) == DotPlotType.Horizontal)
+            {
+                int n = dotSize.Height / 2;
+
+                layout.NearMargin += n;
+                width -= (n * 2);
+            }
+
+            layout.MajorSpacing = (GridSpacing <= 0) ? 1 : GridSpacing;
+
+            double gridInterval = layout.MajorSpacing * dotSize.Height;
+
+            if (MinGridInterval > 0)
+            {
+                while (gridInterval < MinGridInterval)
+                {
+                    gridInterval *= 2;
+                    layout.MajorSpacing *= 2;
+                }
+            }
+
+            Size size = chartXy.MinQualitativeSize;
+
+            double count = range;
+
+            if ((dotTypes & DotPlotType.Horizontal) == DotPlotType.Horizontal)
+                count = range / dpSeries.DotPlotIndexValue;
+
+            size.Height = (int)(dotSize.Height * count + layout.NearMargin * 2);
+
+            if (chartXy.HScrollBar.Enabled == true)
+                size.Height += chartXy.HScrollBar.Height;
+
+            chartXy.MinQualitativeSize = size;
+
+            return (gridInterval);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region AxisCanExpand
+
+        private bool AxisCanExpand(ChartSeries dpSeries)
+        {
+            return ((dpSeries == null) ||
+                    (AxisOrientation == AxisOrientation.X && dpSeries.SeriesType == SeriesType.VerticalDot) ||
+                    (AxisOrientation == AxisOrientation.Y && dpSeries.SeriesType == SeriesType.HorizontalDot));
+        }
+
+        #endregion
+
+        #endregion
+
+        #region UpdateQuantitativeMargins
+
+        private void UpdateQuantitativeMargins(
+            TickmarkLayout layout, Type otype, ref double dminValue, ref double dmaxValue)
+        {
+            if (layout.NearMargin > 0)
+            {
+                int marginCount = (int)Math.Ceiling(layout.NearMargin / layout.MajorInterval);
+
+                layout.MajorCount += marginCount;
+
+                if (otype == typeof(Int32))
+                {
+                    if (dminValue - (marginCount * layout.MajorSpacing) > Int32.MinValue)
+                        dminValue -= (marginCount * layout.MajorSpacing);
+                }
+                else
+                {
+                    dminValue -= (marginCount * layout.MajorSpacing);
+                }
+            }
+
+            if (layout.FarMargin > 0)
+            {
+                int marginCount = (int)Math.Ceiling(layout.FarMargin / layout.MajorInterval);
+
+                layout.MajorCount += marginCount;
+
+                if (otype == typeof(Int32))
+                {
+                    if (dmaxValue + (marginCount * layout.MajorSpacing) < Int32.MaxValue)
+                        dmaxValue += (marginCount * layout.MajorSpacing);
+                }
+                else
+                {
+                    dmaxValue += (marginCount * layout.MajorSpacing);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region CalcMajorQualitativeSpacing
+
+        private void CalcMajorQualitativeSpacing(TickmarkLayout layout, int width)
+        {
+            int iminValue = (int)layout.MinValue;
+            int imaxValue = (int)layout.MaxValue;
+
+            int ominValue = iminValue;
+
+            if (width > 0 && iminValue <= imaxValue)
+            {
+                width = SetLayoutMargin(layout, width);
+
+                double range = Math.Abs(imaxValue - iminValue) + 1;
+
+                CalcQualitativeSpacing(layout, range, width);
+
+                if (UseAutoMinGridInterval == true)
+                {
+                    if (layout.MajorInterval <= 3)
+                        layout.MajorInterval = 3;
+                }
+
+                UpdateQualitativeMargins(layout, ref iminValue, ref imaxValue);
+
+                // Make sure zero is included on the axis
+
+                iminValue -= (int)(iminValue % layout.MajorSpacing);
+
+                int moff = 0;
+
+                int n = iminValue < 0 ? -1 : 1;
+
+                double delta = Math.Floor(Math.Abs(iminValue) / layout.GridSpacing);
+                double value = (int)delta * layout.GridSpacing * n;
+                double offset = Math.Abs(value - ominValue);
+
+                moff = (int)((layout.MajorInterval * offset) / layout.MajorSpacing - layout.NearMargin);
+
+                layout.MarginOffset = moff;
+
+                layout.MinValue = iminValue;
+                layout.MaxValue = imaxValue;
+            }
+        }
+
+        #region CalcQualitativeSpacing
+
+        private void CalcQualitativeSpacing(
+            TickmarkLayout layout, double range, int width)
+        {
+            ChartXy chartXy = Parent as ChartXy;
+
+            layout.GridSpacing = 1;
+            layout.MajorSpacing = layout.GridSpacing;
+
+            layout.MajorCount = (int)range;
+            layout.MajorInterval = (double)width / layout.MajorCount;
+
+            if (layout.MinorCount > 0)
+            {
+                double minorInterval = layout.MajorInterval / (layout.MinorCount + 1);
+
+                if (minorInterval > 0)
+                {
+                    while (minorInterval < MinGridInterval)
+                    {
+                        minorInterval *= 2;
+                        layout.MinorCount /= 2;
+                    }
+                }
+            }
+
+            List<int> groupIds = GetSeriesGroupIds(chartXy);
+
+            int colWidth = int.MinValue;
+
+            foreach (int groupId in groupIds)
+            {
+                int n = chartXy.GetQualitativeColumnWidth(this, groupId);
+
+                if (n > colWidth)
+                    colWidth = n;
+            }
+
+            if (UseAutoMinGridInterval == false)
+            {
+                if (colWidth > layout.MajorInterval)
+                    colWidth = (int)layout.MajorInterval;
+            }
+
+            if (colWidth < MinGridInterval)
+                colWidth = MinGridInterval;
+
+            int minWidth = colWidth * (layout.MajorCount);
+
+            if (AxisOrientation == AxisOrientation.X)
+            {
+                if (chartXy.MinQualitativeSize.Width != minWidth)
+                {
+                    Size size = chartXy.MinQualitativeSize;
+                    size.Width = minWidth + layout.NearMargin;
+                    chartXy.MinQualitativeSize = size;
+
+                    // Force a layout change when the next 
+                    // layout invalidation arrives
+
+                    LastTickmarkLayout = null;
+                }
+            }
+            else
+            {
+                if (chartXy.MinQualitativeSize.Height != minWidth)
+                {
+                    Size size = chartXy.MinQualitativeSize;
+                    size.Height = minWidth + layout.NearMargin;
+                    chartXy.MinQualitativeSize = size;
+
+                    LastTickmarkLayout = null;
+                }
+            }
+
+            width += layout.NearMargin;
+            minWidth = Math.Max(width, minWidth) - layout.NearMargin;
+
+            layout.MajorInterval = (double)minWidth / layout.MajorCount;
+
+            if (layout.MajorInterval < MinGridInterval)
+            {
+                layout.MajorInterval = MinGridInterval;
+
+                minWidth = (int)(layout.MajorInterval * (layout.MajorCount - 0));
+            }
+
+            layout.MajorInterval = (double)minWidth / (layout.MajorCount - 0);
+
+            foreach (int groupId in groupIds)
+            {
+                chartXy.AdjustQualitativeOffsets(this,
+                    groupId, colWidth, (int)(layout.MajorInterval));
+            }
+
+            layout.NearMargin += (int)(layout.MajorInterval / 2);
+        }
+
+        #region GetSeriesGroupIds
+
+        private List<int> GetSeriesGroupIds(ChartXy chartXy)
+        {
+            List<int> groupIds = new List<int>();
+
+            foreach (ChartSeries series in chartXy.ChartSeries)
+            {
+                if (groupIds.Contains(series.GroupId) == false)
+                    groupIds.Add(series.GroupId);
+            }
+
+            return (groupIds);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region UpdateQualitativeMargins
+
+        private void UpdateQualitativeMargins(
+            TickmarkLayout layout, ref int iminValue, ref int imaxValue)
+        {
+            if (layout.NearMargin > 0)
+            {
+                int marginCount = (int)Math.Ceiling(layout.NearMargin / layout.MajorInterval);
+
+                layout.MajorCount += marginCount;
+
+                iminValue -= (int)(marginCount * layout.MajorSpacing);
+            }
+
+            if (layout.FarMargin > 0)
+            {
+                int marginCount = (int)Math.Ceiling(layout.FarMargin / layout.MajorInterval);
+
+                layout.MajorCount += marginCount;
+
+                imaxValue += (int)(marginCount * layout.MajorSpacing);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region SetLayoutMargin
+
+        private int SetLayoutMargin(TickmarkLayout layout, int width)
+        {
+            layout.NearMargin = (AxisNearMargin >= 0) ? AxisNearMargin : AxisMargins >= 0 ? AxisMargins : 20;
+            layout.FarMargin = (AxisFarMargin >= 0) ? AxisFarMargin : AxisMargins >= 0 ? AxisMargins : 20;
+
+            layout.NearMargin = Dpi.Width(layout.NearMargin);
+            layout.FarMargin = Dpi.Width(layout.FarMargin);
+
+            layout.NearMargin = Math.Min(layout.NearMargin, width / 3);
+            layout.FarMargin = Math.Min(layout.FarMargin, width / 3);
+
+            if (layout.NearMargin > 0)
+                width -= (layout.NearMargin + 1);
+
+            if (layout.FarMargin > 0)
+                width -= (layout.FarMargin + 1);
+
+            return (width);
+        }
+
+        #endregion
+
+        #region GetBarSeries
+
+        private ChartSeries GetBarSeries(ChartXy chartXy)
+        {
+            foreach (ChartSeries series in chartXy.ChartSeries)
+            {
+                if (series.Visible == true)
+                {
+                    if (series.IsBarSeries == true)
+                        return (series);
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetFullBarSeries
+
+        private ChartSeries GetFullBarSeries(ChartXy chartXy)
+        {
+            foreach (ChartSeries series in chartXy.ChartSeries)
+            {
+                if (series.Visible == true)
+                {
+                    if (series.SeriesType == SeriesType.HorizontalBar ||
+                        series.SeriesType == SeriesType.VerticalBar)
+                    {
+                        if (AxisOrientation == AxisOrientation.X)
+                        {
+                            if (series.AxisX == this || (series.AxisX == null && chartXy.AxisX == this))
+                                return (series);
+                        }
+                        else
+                        {
+                            if (series.AxisY == this || (series.AxisY == null && chartXy.AxisY == this))
+                                return (series);
+                        }
+                    }
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetMaxTickMarkLength
+
+        protected int GetMaxTickMarkLength(bool inner)
+        {
+            int majorLength = MajorTickmarks.GetMaxTickmarkLength(this, inner);
+            int minorLength = MinorTickmarks.GetMaxTickmarkLength(this, inner);
+
+            int maxlen = Math.Max(majorLength, minorLength);
+
+            return (maxlen);
+        }
+
+        #endregion
+
+        #region GetAxisAlignment
+
+        internal AxisAlignment GetAxisAlignment()
+        {
+            if (AxisAlignment == AxisAlignment.NotSet)
+                return (IsPrimaryAxis ? AxisAlignment.Near : AxisAlignment.Far);
+
+            return (AxisAlignment);
+        }
+
+        #endregion
+
+        #region GetMinValue
+
+        internal object GetMinValue()
+        {
+            UpdateRangeValues();
+
+            if (MinValue != null)
+            {
+                if (ScaleType != ScaleType.NotSet)
+                {
+                    if (SeriesPoint.GetScaleType(MinValue.GetType()) != ScaleType)
+                    {
+                        if (IsDesignerHosted == false)
+                            throw new Exception("MinValue ScaleType must match Axis ScaleType");
+
+                        return (ActualMinValue);
+                    }
+                }
+
+                return (MinValue);
+            }
+
+            return (ActualMinValue);
+        }
+
+        #endregion
+
+        #region GetMaxValue
+
+        internal object GetMaxValue()
+        {
+            UpdateRangeValues();
+
+            if (MaxValue != null)
+            {
+                if (ScaleType != ScaleType.NotSet)
+                {
+                    if (SeriesPoint.GetScaleType(MaxValue.GetType()) != ScaleType)
+                    {
+                        if (IsDesignerHosted == false)
+                            throw new Exception("MaxValue ScaleType must match Axis ScaleType");
+
+                        return (ActualMaxValue);
+                    }
+                }
+
+                return (MaxValue);
+            }
+
+            return (ActualMaxValue);
+        }
+
+        #endregion
+
+        #region UpdateRangeValues
+
+        internal void UpdateRangeValues()
+        {
+            if (SeriesRangeChanged == true)
+            {
+                SeriesRangeChanged = false;
+
+                ActualMinValue = null;
+                ActualMaxValue = null;
+
+                QualitativeValues.Clear();
+
+                ChartXy chartXy = Parent as ChartXy;
+
+                if (chartXy != null)
+                {
+                    if (chartXy.ChartSeries.Count > 0)
+                    {
+                        UpdateRangeValues(chartXy);
+
+                        if (QualitativeValues.Count > 1)
+                        {
+                            if (QualitativeSortDirection != SortDirection.None)
+                            {
+                                QualitativeValues.Sort(new 
+                                    ObjComparer(this, QualitativeSortDirection == SortDirection.Ascending));
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        internal virtual void UpdateRangeValues(ChartXy chartXy)
+        {
+        }
+
+        #region ObjComparer
+
+        private class ObjComparer : IComparer<object>
+        {
+            private ChartVisualElement _ChartElement;
+            private ChartControl _ChartControl;
+
+            private bool _Ascending;
+
+            public ObjComparer(ChartVisualElement chartElement, bool ascending)
+            {
+                _ChartElement = chartElement;
+                _ChartControl = chartElement.ChartControl;
+
+                _Ascending = ascending;
+            }
+
+            public int Compare(object v1, object v2)
+            {
+                int sval = 0;
+
+                if (_ChartControl.DoCompareElementsEvent(_ChartElement, v1, v2, ref sval) == true)
+                    return (sval);
+
+                if (v1 is IComparable)
+                {
+                    sval = ((IComparable)v1).CompareTo(v2);
+
+                    if (sval != 0)
+                        return (_Ascending == true) ? sval : -sval;
+                }
+
+                return (sval);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ValidateAxis
+
+        internal bool ValidateAxis()
+        {
+            bool altered = false;
+
+            if (LastTickmarkLayout == null || TickmarkLayout == null)
+                altered = true;
+
+            else if ((TickmarkLayout.MinValue != LastTickmarkLayout.MinValue) ||
+                (TickmarkLayout.MaxValue != LastTickmarkLayout.MaxValue) ||
+                (TickmarkLayout.MajorInterval != LastTickmarkLayout.MajorInterval) ||
+                (TickmarkLayout.MajorSpacing != LastTickmarkLayout.MajorSpacing) ||
+                (TickmarkLayout.MarginOffset != LastTickmarkLayout.MarginOffset))
+            {
+                altered = true;
+            }
+
+            LastTickmarkLayout = TickmarkLayout;
+
+            return (altered);
+        }
+
+        #endregion
+
+        #region GetChartPoint
+
+        protected Point GetChartPoint(Point pt)
+        {
+            ChartXy chartXy = Parent as ChartXy;
+
+            pt.X += ScrollOffset.X;
+            pt.X -= (chartXy.HScrollBar.Inverted == true ? chartXy.HScrollOffset : -chartXy.HScrollOffset);
+
+            pt.Y += ScrollOffset.Y;
+            pt.Y -= (chartXy.VScrollBar.Inverted == true ? chartXy.VScrollOffset : -chartXy.VScrollOffset);
+
+            return (pt);
+        }
+
+        #endregion
+
+        #region GetDisplayValue
+
+        virtual internal int GetDisplayValue(object axisValue)
+        {
+            return (0);
+        }
+
+        #endregion
+
+        #region GetDateTime
+
+        internal DateTime GetDateTime(DateTime dt, double delta)
+        {
+            switch (ActualDateTimeUnits)
+            {
+                case DateTimeUnits.Milliseconds:
+                    return (dt.AddMilliseconds(delta));
+
+                case DateTimeUnits.Seconds:
+                    return (dt.AddSeconds(delta));
+
+                case DateTimeUnits.Minutes:
+                    return (dt.AddMinutes(delta));
+
+                case DateTimeUnits.Hours:
+                    return (dt.AddHours(delta));
+
+                case DateTimeUnits.Days:
+                    return (dt.AddDays(delta));
+
+                case DateTimeUnits.Months:
+                    dt = dt.AddMonths((int)delta);
+                    dt = dt.AddDays((delta - (int)delta) * 31);
+
+                    return (dt);
+
+                case DateTimeUnits.Years:
+                    return (dt.AddYears((int)delta));
+
+                default:
+                    return (dt.AddTicks((long)delta));
+            }
+        }
+
+        #endregion
+
+        #region GetDateTimeValue
+
+        internal long GetDateTimeValue(DateTime dtValue)
+        {
+            switch (ActualDateTimeUnits)
+            {
+                case DateTimeUnits.Milliseconds:
+                    return (dtValue.Millisecond);
+
+                case DateTimeUnits.Seconds:
+                    return (dtValue.Second);
+
+                case DateTimeUnits.Minutes:
+                    return (dtValue.Minute);
+
+                case DateTimeUnits.Hours:
+                    return (dtValue.Hour);
+
+                case DateTimeUnits.Days:
+                    return (dtValue.Day);
+
+                case DateTimeUnits.Months:
+                    return (dtValue.Month);
+
+                case DateTimeUnits.Years:
+                    return (dtValue.Year);
+
+                default:
+                    return (dtValue.Ticks);
+            }
+        }
+
+        #endregion
+
+        #region GetDateTimePointValue
+
+        internal DateTime GetDateTimePointValue(TickmarkLayout layout, int dz)
+        {
+            double delta = (double)(layout.MajorSpacing * ((dz + layout.MarginOffset) / layout.MajorInterval));
+
+            return (GetDateTime((DateTime)layout.BaseValue, delta));
+        }
+
+        #endregion
+
+        #region GetDateTimeLabel
+
+        internal string GetDateTimeLabel(DateTime dt)
+        {
+            switch (ActualDateTimeUnits)
+            {
+                case DateTimeUnits.Ticks:
+                    return (dt.Ticks.ToString());
+
+                case DateTimeUnits.Milliseconds:
+                    return (dt.Millisecond.ToString());
+
+                case DateTimeUnits.Seconds:
+                    return (dt.Second.ToString());
+
+                case DateTimeUnits.Minutes:
+                    return (dt.Minute.ToString());
+
+                case DateTimeUnits.Hours:
+                    return (dt.ToShortTimeString());
+
+                case DateTimeUnits.Days:
+                    return (dt.ToShortDateString());
+
+                case DateTimeUnits.Months:
+                    return (dt.Month + "/" + dt.Year);
+
+                default:
+                    return (dt.Year.ToString());
+            }
+        }
+
+        #endregion
+
+        #region GetTickmarkAltValue
+
+        internal double GetTickmarkAltValue(TickmarkTick tick)
+        {
+            switch (ScaleType)
+            {
+                case ScaleType.DateTime:
+                    DateTime dt = AddDateTimeOffset((DateTime)tick.Value, (int)(TickmarkLayout.MajorSpacing / 2));
+
+                    return (GetDateTimeValue(dt));
+
+                case ScaleType.Qualitative:
+                    return ((int)tick.Value + TickmarkLayout.MajorSpacing / 2);
+
+                default:
+                    return (Convert.ToDouble(tick.Value) + TickmarkLayout.MajorSpacing / 2);
+            }
+        }
+
+        #endregion
+
+        #region GetLegendData
+
+        internal void GetLegendData(List<ChartLegendItem> legendData)
+        {
+            foreach (ReferenceLine line in ReferenceLines)
+            {
+                if (line.Visible == true)
+                {
+                    List<ChartLegendItem> items = line.GetLegendItems();
+
+                    if (items != null && items.Count > 0)
+                        legendData.AddRange(items);
+                }
+            }
+
+            foreach (AxisStripe stripe in AxisStripes)
+            {
+                if (stripe.Visible == true)
+                {
+                    List<ChartLegendItem> items = stripe.GetLegendItems();
+
+                    if (items != null && items.Count > 0)
+                        legendData.AddRange(items);
+                }
+            }
+        }
+
+        #endregion
+
+        #region GetPointFromValue
+
+        /// <summary>
+        /// Gets the chart Point from the given data value.
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public virtual Point GetPointFromValue(object value)
+        {
+            return (Point.Empty);
+        }
+
+        #endregion
+
+        #region GetValueFromPoint
+
+        /// <summary>
+        /// Gets the "Data" value from the given Chart Point.
+        /// </summary>
+        /// <param name="pt"></param>
+        /// <returns></returns>
+        public object GetValueFromPoint(Point pt)
+        {
+            TickmarkLayout layout = TickmarkLayout;
+
+            return (GetValueFromPoint(layout, pt));
+        }
+
+        internal virtual object GetValueFromPoint(TickmarkLayout layout, Point pt)
+        {
+            return (null);
+        }
+
+        #endregion
+
+        #region GetReferenceLineByName
+
+        /// <summary>
+        /// Gets the ReferenceLine from the given name.
+        /// </summary>
+        /// <param name="name"></param>
+        /// <returns></returns>
+        public ReferenceLine GetReferenceLineByName(string name)
+        {
+            if (String.IsNullOrEmpty(name) == true)
+                return (null);
+
+            if (_ReferenceLines != null)
+            {
+                foreach (ReferenceLine line in _ReferenceLines)
+                {
+                    if (name.Equals(line.Name) == true)
+                        return (line);
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetStripeByName
+
+        /// <summary>
+        /// Gets the AxisStripe from the given name.
+        /// </summary>
+        /// <param name="name"></param>
+        /// <returns></returns>
+        public AxisStripe GetStripeByName(string name)
+        {
+            if (String.IsNullOrEmpty(name) == true)
+                return (null);
+
+            if (_AxisStripes != null)
+            {
+                foreach (AxisStripe stripe in _AxisStripes)
+                {
+                    if (name.Equals(stripe.Name) == true)
+                        return (stripe);
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region EnsureVisible
+
+        /// <summary>
+        /// Ensures the given data value is visible on screen.
+        /// </summary>
+        /// <param name="value"></param>
+        public void EnsureVisible(object value)
+        {
+            EnsureVisible(value, false);
+        }
+
+        /// <summary>
+        /// Ensures the given data value is visible and
+        /// optionally centered on screen.
+        /// </summary>
+        /// <param name="value"></param>
+        public virtual void EnsureVisible(object value, bool center)
+        {
+        }
+
+        #endregion
+
+        #region Style Support
+
+        #region ApplyStyles
+
+        public override void ApplyStyles(BaseVisualStyle style)
+        {
+            ChartAxisVisualStyle astyle = style as ChartAxisVisualStyle;
+
+            if (astyle != null)
+            {
+                ApplyParentStyles(astyle, Parent as ChartContainer);
+
+                astyle.ApplyStyle(ChartAxisVisualStyle);
+                astyle.ApplyDefaults();
+            }
+            else if (style is CrosshairValueVisualStyle)
+            {
+                CrosshairValueVisualStyle cstyle = (CrosshairValueVisualStyle)style;
+
+                ApplyParentStyles(cstyle, Parent as ChartContainer);
+
+                cstyle.ApplyStyle(CrosshairLabelVisualStyle);
+                cstyle.ApplyDefaults();
+            }
+        }
+
+        #region ApplyParentStyles (ChartAxisVisualStyle)
+
+        private void ApplyParentStyles(
+            ChartAxisVisualStyle astyle, ChartContainer item)
+        {
+            if (item != null)
+            {
+                ApplyParentStyles(astyle, item.Parent as ChartContainer);
+
+                ChartPanel cp = item as ChartPanel;
+
+                if (cp != null)
+                {
+                    if (_AxisOrientation == AxisOrientation.X)
+                        astyle.ApplyStyle(cp.DefaultVisualStyles.ChartXAxisVisualStyle);
+                    else
+                        astyle.ApplyStyle(cp.DefaultVisualStyles.ChartYAxisVisualStyle);
+                }
+            }
+            else
+            {
+                if (_AxisOrientation == AxisOrientation.X)
+                {
+                    astyle.ApplyStyle(ChartControl.BaseVisualStyles.ChartXAxisVisualStyle);
+                    astyle.ApplyStyle(ChartControl.DefaultVisualStyles.ChartXAxisVisualStyle);
+                }
+                else
+                {
+                    astyle.ApplyStyle(ChartControl.BaseVisualStyles.ChartYAxisVisualStyle);
+                    astyle.ApplyStyle(ChartControl.DefaultVisualStyles.ChartYAxisVisualStyle);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ApplyParentStyles (CrosshairLabelVisualStyle)
+
+        private void ApplyParentStyles(
+            CrosshairValueVisualStyle pstyle, ChartContainer item)
+        {
+            if (item != null)
+            {
+                ApplyParentStyles(pstyle, item.Parent as ChartContainer);
+
+                if (item is ChartPanel)
+                    pstyle.ApplyStyle(((ChartPanel)item).DefaultVisualStyles.CrosshairLabelVisualStyle);
+
+                else if (item is ChartXy)
+                    pstyle.ApplyStyle(((ChartXy)item).ChartCrosshair.CrosshairLabelVisualStyle);
+            }
+            else
+            {
+                pstyle.ApplyStyle(ChartControl.BaseVisualStyles.CrosshairLabelVisualStyle);
+                pstyle.ApplyStyle(ChartControl.DefaultVisualStyles.CrosshairLabelVisualStyle);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InvalidateStyle
+
+        ///<summary>
+        ///Invalidate the cached Styles
+        ///</summary>
+        public void InvalidateStyle()
+        {
+            ClearEffectiveStyles();
+        }
+
+        #endregion
+
+        #region ClearEffectiveStyles
+
+        protected override void ClearEffectiveStyles()
+        {
+            base.ClearEffectiveStyles();
+
+            _EffectiveAxisStyle.InvalidateStyle();
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InvalidateRender
+
+        /// <summary>
+        /// Invalidate the axis for rendering purposes.
+        /// </summary>
+        public override void InvalidateRender()
+        {
+            base.InvalidateRender();
+
+            ChartXy chartXy = Parent as ChartXy;
+
+            if (chartXy != null)
+                chartXy.InvalidateRender();
+        }
+
+        #endregion
+
+        #region RefreshRangeValues
+
+        /// <summary>
+        /// Causes an invalidation and refresh of the range values for the axis.
+        /// </summary>
+        public void RefreshRangeValues()
+        {
+            SeriesRangeChanged = true;
+
+            InvalidateLayout();
+        }
+
+        #endregion
+
+        #region Copy/CopyTo
+
+        /// <summary>
+        /// Copies the axis elements to the given "copy"
+        /// </summary>
+        /// <param name="copy"></param>
+        public override void CopyTo(ChartVisualElement copy)
+        {
+            ChartAxis c = copy as ChartAxis;
+
+            if (c != null)
+            {
+                base.CopyTo(c);
+
+                c.AxisAlignment = AxisAlignment;
+
+                c.AxisFarMargin = AxisFarMargin;
+                c.AxisMargins = AxisMargins;
+                c.AxisNearMargin = AxisNearMargin;
+
+                foreach (AxisStripe stripe in AxisStripes)
+                    c.AxisStripes.Add((AxisStripe)stripe.Copy());
+
+                c.ChartAxisVisualStyle = (_ChartAxisVisualStyle != null) ? ChartAxisVisualStyle.Copy() : null;
+                c.CrosshairLabelVisualStyle = (_CrosshairLabelVisualStyle != null) ? CrosshairLabelVisualStyle.Copy() : null;
+
+                c.DateTimeUnits = DateTimeUnits;
+                c.GridInterval = GridInterval;
+                c.GridSpacing = GridSpacing;
+
+                c.MinGridInterval = MinGridInterval;
+
+                c.MaxValue = MaxValue;
+                c.MinValue = MinValue;
+
+                foreach (ReferenceLine line in ReferenceLines)
+                    c.ReferenceLines.Add((ReferenceLine)line.Copy());
+
+                Title.CopyTo(c.Title);
+
+                c.UseAlternateBackground = UseAlternateBackground;
+            }
+        }
+
+        #endregion
+
+        #region GetSerialData
+
+        internal override SerialElementCollection GetSerialData(string serialName)
+        {
+            SerialElementCollection sec = new SerialElementCollection();
+
+            if (serialName != null)
+            {
+                if (serialName.Equals("") == true)
+                    serialName = "ChartAxis";
+
+                sec.AddStartElement(serialName);
+            }
+
+            sec.AddValue("AxisAlignment", AxisAlignment, AxisAlignment.NotSet);
+
+            sec.AddValue("AxisFarMargin", AxisFarMargin, -1);
+            sec.AddValue("AxisMargins", AxisMargins, -1);
+            sec.AddValue("AxisNearMargin", AxisNearMargin, -1);
+
+            if (_AxisStripes != null && _AxisStripes.Count > 0)
+            {
+                sec.AddStartElement("AxisStripes count=\"" + _AxisStripes.Count + "\"");
+
+                foreach (AxisStripe stripe in _AxisStripes)
+                    sec.AddElement(stripe.GetSerialData(""));
+
+                sec.AddEndElement("AxisStripes");
+            }
+
+            if (_ChartAxisVisualStyle != null && _ChartAxisVisualStyle.IsEmpty == false)
+                sec.AddElement(_ChartAxisVisualStyle.GetSerialData("ChartAxisVisualStyle"));
+
+            if (_CrosshairLabelVisualStyle != null && _CrosshairLabelVisualStyle.IsEmpty == false)
+                sec.AddElement(_CrosshairLabelVisualStyle.GetSerialData("CrosshairLabelVisualStyle"));
+
+            sec.AddValue("DateTimeUnits", DateTimeUnits, DateTimeUnits.Days);
+
+            sec.AddValue("GridInterval", GridInterval, 0.0d);
+            sec.AddValue("GridSpacing", GridSpacing, 0.0d);
+            sec.AddValue("MinGridInterval", MinGridInterval, 10);
+
+            sec.AddDataValue("MaxValue", MaxValue, null);
+            sec.AddDataValue("MinValue", MinValue, null);
+
+            sec.AddValue("QualitativeSortDirection", QualitativeSortDirection, SortDirection.None);
+
+            if (_ReferenceLines != null && _ReferenceLines.Count > 0)
+            {
+                sec.AddStartElement("ReferenceLines count=\"" + _ReferenceLines.Count + "\"");
+
+                foreach (ReferenceLine rline in _ReferenceLines)
+                    sec.AddElement(rline.GetSerialData(""));
+
+                sec.AddEndElement("ReferenceLines");
+            }
+
+            if (_Title != null)
+                sec.AddElement(_Title.GetSerialData("Title"));
+
+            sec.AddValue("UseAlternateBackground", UseAlternateBackground, false);
+
+            sec.AddElement(base.GetSerialData(null));
+
+            if (serialName != null)
+                sec.AddEndElement(serialName);
+
+            return (sec);
+        }
+
+        #endregion
+
+        #region PutSerialData
+
+        #region ProcessValue
+
+        internal override void ProcessValue(SerialElement se)
+        {
+            switch (se.Name)
+            {
+                case "AxisAlignment":
+                    AxisAlignment = (AxisAlignment)se.GetValueEnum(typeof(AxisAlignment));
+                    break;
+
+                case "AxisFarMargin":
+                    AxisFarMargin = int.Parse(se.StringValue);
+                    break;
+
+                case "AxisMargins":
+                    AxisMargins = int.Parse(se.StringValue);
+                    break;
+
+                case "AxisNearMargin":
+                    AxisNearMargin = int.Parse(se.StringValue);
+                    break;
+
+                case "DateTimeUnits":
+                    DateTimeUnits = (DateTimeUnits)se.GetValueEnum(typeof(DateTimeUnits));
+                    break;
+
+                case "GridInterval":
+                    GridInterval = double.Parse(se.StringValue);
+                    break;
+
+                case "GridSpacing":
+                    GridSpacing = double.Parse(se.StringValue);
+                    break;
+
+                case "MinGridInterval":
+                    MinGridInterval = int.Parse(se.StringValue);
+                    break;
+
+                case "MaxValue":
+                    MaxValue = se.DataValue;
+                    break;
+
+                case "MinValue":
+                    MinValue = se.DataValue;
+                    break;
+
+                case "QualitativeSortDirection":
+                    QualitativeSortDirection = (SortDirection)se.GetValueEnum(typeof(SortDirection));
+                    break;
+
+                case "UseAlternateBackground":
+                    UseAlternateBackground = bool.Parse(se.StringValue);
+                    break;
+
+                default:
+                    base.ProcessValue(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region ProcessCollection
+
+        internal override void ProcessCollection(SerialElement se)
+        {
+            SerialElementCollection sec = se.Sec;
+
+            switch (se.Name)
+            {
+                case "AxisStripes":
+                case "ReferenceLines":
+                    sec.PutSerialData(this);
+                    break;
+
+                case "AxisStripe":
+                    AxisStripe stripe = GetStripeByName(se.Name);
+
+                    if (stripe != null)
+                        sec.PutSerialData(stripe);
+                    break;
+
+                case "ChartAxisVisualStyle":
+                    sec.PutSerialData(ChartAxisVisualStyle);
+                    break;
+
+                case "CrosshairLabelVisualStyle":
+                    sec.PutSerialData(CrosshairLabelVisualStyle);
+                    break;
+
+                case "ReferenceLine":
+                    ReferenceLine line = GetReferenceLineByName(se.Name);
+
+                    if (line != null)
+                        sec.PutSerialData(line);
+                    break;
+
+                case "Title":
+                    sec.PutSerialData(Title);
+                    break;
+
+                default:
+                    base.ProcessCollection(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region States
+
+        [Flags]
+        private enum States : uint
+        {
+            AutoCalcBarMargins = (1U << 0),
+
+            DotPlotAxis = (1U << 1),
+            EdgeAxis = (1U << 2),
+            PrimaryAxis = (1U << 3),
+
+            SeriesRangeChanged = (1U << 4),
+
+            UseAlternateBackground = (1U << 5),
+            UseAutoMinGridInterval = (1U << 6),
+        }
+
+        #region TestState
+
+        private bool TestState(States state)
+        {
+            return ((_States & state) == state);
+        }
+
+        #endregion
+
+        #region SetState
+
+        private void SetState(States state, bool value)
+        {
+            if (value == true)
+                _States |= state;
+            else
+                _States &= ~state;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ToString
+
+        public override string ToString()
+        {
+            if (String.IsNullOrEmpty(Name) == false)
+                return (Name);
+
+            return (base.ToString());
+        }
+
+        #endregion
+
+        #region IDisposable
+
+        public override void Dispose()
+        {
+            AxisStripes = null;
+            ChartAxisVisualStyle = null;
+            CrosshairLabelVisualStyle = null;
+            ReferenceLines = null;
+            Title = null;
+
+            base.Dispose();
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region TickmarkLayout
+
+    internal class TickmarkLayout
+    {
+        public object MinValue;
+        public object MaxValue;
+
+        public object BaseValue;
+
+        public int NearMargin;
+        public int FarMargin;
+        public int MarginOffset;
+
+        public int MajorCount;
+        public int MinorCount;
+
+        public double GridSpacing;
+        public double MajorSpacing;
+        public double MajorInterval;
+
+        public int TickmarkStart;
+        public int TickmarkEnd;
+
+        public TickmarkTick[] Ticks;
+    }
+
+    #endregion
+
+    #region TickmarkTick
+
+    internal class TickmarkTick
+    {
+        public int Index;
+        public object Value;
+        public Point TickPoint;
+
+        public string Label;
+        public Size LabelSize;
+        public Point LabelPoint;
+        public int LabelIndex;
+        public Color LabelColor;
+
+        public SizeF TextSize;
+
+        public bool LabelVisible;
+    }
+
+    #endregion
+
+    #region AxisBar
+
+    internal class AxisBar
+    {
+        public int BarCount;
+        public int BarOffset;
+        public int BarTotalWidth;
+
+        public double BarTotal;
+
+        public void Reset()
+        {
+            BarCount = 0;
+            BarTotal = 0;
+            BarTotalWidth = 0;
+
+            BarOffset = int.MinValue;
+        }
+    }
+
+    #endregion
+
+    public class AxisTitle : ChartTitle
+    {
+        #region XyAlignment
+
+        [Browsable(false)]
+        [Bindable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public new XyAlignment XyAlignment
+        {
+            get { return (base.XyAlignment); }
+            set { base.XyAlignment = value; }
+        }
+
+        #endregion
+    }
+
+    [Obsolete]
+    public class AsixTitle : AxisTitle
+    {
+    }
+
+    #region Enums
+
+    #region AxisAlignment
+
+    public enum AxisAlignment
+    {
+        /// <summary>
+        /// Default is determined by the Axis (X/Y).
+        /// </summary>
+        NotSet = -1,
+
+        /// <summary>
+        /// Axis is displayed at the right or bottom side of the chart.
+        /// </summary>
+        Near,
+
+        /// <summary>
+        /// Axis is displayed at the left or top side of the chart.
+        /// </summary>
+        Far,
+    }
+
+    #endregion
+
+    #region AxisBarType
+
+    internal enum AxisBarType
+    {
+        Bar,
+        HiLoBar,
+
+        MaxBarCount
+    }
+
+    #endregion
+
+    #region AxisOrientation
+
+    /// <summary>
+    /// AxisOrientation.
+    /// </summary>
+    public enum AxisOrientation
+    {
+        /// <summary>
+        /// X Axis
+        /// </summary>
+        X,
+
+        /// <summary>
+        /// Y Axis
+        /// </summary>
+        Y,
+    }
+
+    #endregion
+
+    #region DateTimeUnits
+
+    /// <summary>
+    /// DateTimeUnits
+    /// </summary>
+    public enum DateTimeUnits
+    {
+        Ticks,
+        Milliseconds,
+        Seconds,
+        Minutes,
+        Hours,
+        Days,
+        Months,
+        Years,
+    }
+
+    #endregion
+
+    #region MarginLayout
+
+    public enum MarginLayout
+    {
+        /// <summary>
+        /// No Margins will be displayed.
+        /// </summary>
+        None,
+
+        /// <summary>
+        /// Margin is displayed at the right or bottom side of the axis.
+        /// </summary>
+        Near,
+
+        /// <summary>
+        /// Margin is displayed at the left or top side of the axis.
+        /// </summary>
+        Far,
+
+        /// <summary>
+        /// Both Near and Far margins are displayed.
+        /// </summary>
+        Both,
+    }
+
+    #endregion
+
+    #region OriginOffsetMode
+
+    /// <summary>
+    /// Mode for setting the axis origin, or offset from its
+    /// normal position.
+    /// </summary>
+    public enum OriginOffsetMode
+    {
+        /// <summary>
+        /// No offset
+        /// </summary>
+        None,
+
+        /// <summary>
+        /// Origin is shifted by an absolute amount (OriginOffset)
+        /// </summary>
+        Absolute,
+
+        /// <summary>
+        /// Origin is shifted relative to the major scale amounts.
+        /// </summary>
+        Relative,
+
+        /// <summary>
+        /// Origin is shifted a percentage of the total axis length.
+        /// </summary>
+        Percent,
+    }
+
+    #endregion
+
+    #region OverlapLabelMode
+
+    public enum OverlapLabelMode
+    {
+        /// <summary>
+        /// Default is to Hide overlapping labels.
+        /// </summary>
+        NotSet = 0,
+
+        /// <summary>
+        /// Overlapping labels will be staggered.
+        /// </summary>
+        Stagger,
+
+        /// <summary>
+        /// Overlapping labels may be hidden.
+        /// </summary>
+        Hide,
+    }
+
+    #endregion
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/XyChart/ChartGridLines.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/XyChart/ChartGridLines.cs
new file mode 100644
index 00000000..bf0815de
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/XyChart/ChartGridLines.cs	
@@ -0,0 +1,800 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using DevComponents.DotNetBar.Charts.Style;
+
+namespace DevComponents.DotNetBar.Charts
+{
+    #region ChartMajorGridLines
+
+    #region ChartMajorGridLinesX
+
+    /// <summary>
+    /// Represents a chart's MajorGridLines for the X-Axis.
+    /// </summary>
+    public class ChartMajorGridLinesX : ChartMajorGridLines
+    {
+        public ChartMajorGridLinesX()
+            : base(AxisOrientation.X)
+        {
+        }
+
+        #region RenderOverride
+
+        protected override void RenderOverride(ChartRenderInfo renderInfo)
+        {
+            if (Visible == true)
+            {
+                TickmarkTick[] ticks = TickmarkLayout.Ticks;
+
+                if (ticks != null)
+                {
+                    Graphics g = renderInfo.Graphics;
+
+                    ChartAxis axis = Parent as ChartAxis;
+                    ChartXy chartXy = axis.Parent as ChartXy;
+
+                    PieGridLineVisualStyle gstyle = EffectiveStyle;
+                    Rectangle scContentBounds = GetScrollBounds(chartXy.ContentBounds);
+
+                    if (gstyle.LinePattern != LinePattern.None &&
+                        gstyle.LinePattern != LinePattern.NotSet && gstyle.LineWidth > 0)
+                    {
+                        using (Pen pen = new Pen(gstyle.LineColor, Dpi.Width(gstyle.LineWidth)))
+                        {
+                            pen.DashStyle = (DashStyle)gstyle.LinePattern;
+
+                            Point pt = chartXy.GetLocalAdjustedPoint(Point.Empty);
+
+                            foreach (TickmarkTick tmi in ticks)
+                            {
+                                Point pt1 = tmi.TickPoint;
+                                pt1.X += pt.X;
+                                pt1.Y = scContentBounds.Y;
+
+                                Point pt2 = pt1;
+                                pt2.Y = scContentBounds.Bottom;
+
+                                g.DrawLine(pen, pt1, pt2);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region Copy/CopyTo
+
+        /// <summary>
+        /// Create a copy of the MajorGridLine.
+        /// </summary>
+        /// <returns></returns>
+        public override ChartVisualElement Copy()
+        {
+            ChartMajorGridLinesX copy = new ChartMajorGridLinesX();
+
+            CopyTo(copy);
+
+            return (copy);
+        }
+
+        /// <summary>
+        /// Copies the MajorGridLine to the given "copy".
+        /// </summary>
+        /// <param name="copy"></param>
+        public override void CopyTo(ChartVisualElement copy)
+        {
+            ChartMajorGridLinesX c = copy as ChartMajorGridLinesX;
+
+            if (c != null)
+                base.CopyTo(c);
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region ChartMajorGridLinesY
+
+    /// <summary>
+    /// Represents a chart's MajorGridLines for the Y-Axis.
+    /// </summary>
+    public class ChartMajorGridLinesY : ChartMajorGridLines
+    {
+        public ChartMajorGridLinesY()
+            : base(AxisOrientation.Y)
+        {
+        }
+
+        #region RenderOverride
+
+        protected override void RenderOverride(ChartRenderInfo renderInfo)
+        {
+            if (Visible == true)
+            {
+                TickmarkTick[] ticks = TickmarkLayout.Ticks;
+
+                if (ticks != null)
+                {
+                    Graphics g = renderInfo.Graphics;
+
+                    ChartAxis axis = Parent as ChartAxis;
+                    ChartXy chartXy = axis.Parent as ChartXy;
+
+                    PieGridLineVisualStyle gstyle = EffectiveStyle;
+                    Rectangle scContentBounds = GetScrollBounds(chartXy.ContentBounds);
+
+                    if (gstyle.LinePattern != LinePattern.None &&
+                        gstyle.LinePattern != LinePattern.NotSet && gstyle.LineWidth > 0)
+                    {
+                        using (Pen pen = new Pen(gstyle.LineColor, Dpi.Height(gstyle.LineWidth)))
+                        {
+                            pen.DashStyle = (DashStyle)gstyle.LinePattern;
+
+                            Point pt = chartXy.GetLocalAdjustedPoint(Point.Empty);
+
+                            foreach (TickmarkTick tmi in ticks)
+                            {
+                                Point pt1 = tmi.TickPoint;
+                                pt1.X = scContentBounds.X;
+                                pt1.Y += pt.Y;
+
+                                Point pt2 = pt1;
+                                pt2.X = scContentBounds.Right;
+
+                                g.DrawLine(pen, pt1, pt2);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region Copy/CopyTo
+
+        /// <summary>
+        /// Create a copy of the MajorGridLine.
+        /// </summary>
+        /// <returns></returns>
+        public override ChartVisualElement Copy()
+        {
+            ChartMajorGridLinesY copy = new ChartMajorGridLinesY();
+
+            CopyTo(copy);
+
+            return (copy);
+        }
+
+        /// <summary>
+        /// Copies the MajorGridLine to the given "copy".
+        /// </summary>
+        /// <param name="copy"></param>
+        public override void CopyTo(ChartVisualElement copy)
+        {
+            ChartMajorGridLinesY c = copy as ChartMajorGridLinesY;
+
+            if (c != null)
+                base.CopyTo(c);
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region ChartMajorGridLines
+
+    /// <summary>
+    /// Represents a chart's MajorGridLines.
+    /// </summary>
+    public class ChartMajorGridLines : ChartGridLines
+    {
+        public ChartMajorGridLines(AxisOrientation orientation)
+            : base(orientation)
+        {
+        }
+    }
+
+    #endregion
+
+    #endregion
+
+    #region ChartMinorGridLines
+
+    #region ChartMinorGridLinesX
+
+    public class ChartMinorGridLinesX : ChartMinorGridLines
+    {
+        public ChartMinorGridLinesX()
+            : base(AxisOrientation.X)
+        {
+        }
+
+        #region RenderOverride
+
+        protected override void RenderOverride(ChartRenderInfo renderInfo)
+        {
+            if (Visible == true)
+            {
+                TickmarkTick[] ticks = TickmarkLayout.Ticks;
+
+                if (ticks != null && ticks.Length > 1)
+                {
+                    Graphics g = renderInfo.Graphics;
+
+                    ChartAxis axis = Parent as ChartAxis;
+                    ChartXy chartXy = axis.Parent as ChartXy;
+
+                    PieGridLineVisualStyle gstyle = EffectiveStyle;
+                    Rectangle scContentBounds = GetScrollBounds(chartXy.ContentBounds);
+
+                    if (gstyle.LinePattern != LinePattern.None &&
+                        gstyle.LinePattern != LinePattern.NotSet && gstyle.LineWidth > 0)
+                    {
+                        using (Pen pen = new Pen(gstyle.LineColor, Dpi.Width(gstyle.LineWidth)))
+                        {
+                            pen.DashStyle = (DashStyle)gstyle.LinePattern;
+
+                            int minorTickCount = axis.MinorTickmarks.TickmarkCount;
+                            Point pt = chartXy.GetLocalAdjustedPoint(Point.Empty);
+
+                            for (int i = 0; i < ticks.Length - 1; i++)
+                            {
+                                TickmarkTick tick = ticks[i];
+
+                                Point pt1 = tick.TickPoint;
+                                pt1.Y = scContentBounds.Y;
+
+                                Point pt2 = pt1;
+                                pt2.Y = scContentBounds.Bottom;
+
+                                double dx = (double)(ticks[i + 1].TickPoint.X - tick.TickPoint.X) / (minorTickCount + 1);
+                                double ddx = dx;
+
+                                for (int j = 0; j < minorTickCount; j++)
+                                {
+                                    pt1.X = pt.X + (int)(tick.TickPoint.X + ddx);
+                                    pt2.X = pt1.X;
+
+                                    ddx += dx;
+
+                                    g.DrawLine(pen, pt1, pt2);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region Copy/CopyTo
+
+        /// <summary>
+        /// Create a copy of the MinorGridLine.
+        /// </summary>
+        /// <returns></returns>
+        public override ChartVisualElement Copy()
+        {
+            ChartMinorGridLinesX copy = new ChartMinorGridLinesX();
+
+            CopyTo(copy);
+
+            return (copy);
+        }
+
+        /// <summary>
+        /// Copies the MinorGridLine to the given "copy".
+        /// </summary>
+        /// <param name="copy"></param>
+        public override void CopyTo(ChartVisualElement copy)
+        {
+            ChartMinorGridLinesX c = copy as ChartMinorGridLinesX;
+
+            if (c != null)
+                base.CopyTo(c);
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region ChartMinorGridLinesY
+
+    public class ChartMinorGridLinesY : ChartMinorGridLines
+    {
+        public ChartMinorGridLinesY()
+            : base(AxisOrientation.Y)
+        {
+        }
+
+        #region RenderOverride
+
+        protected override void RenderOverride(ChartRenderInfo renderInfo)
+        {
+            if (Visible == true)
+            {
+                TickmarkTick[] ticks = TickmarkLayout.Ticks;
+
+                if (ticks != null)
+                {
+                    Graphics g = renderInfo.Graphics;
+
+                    ChartAxis axis = Parent as ChartAxis;
+                    ChartXy chartXy = axis.Parent as ChartXy;
+
+                    PieGridLineVisualStyle gstyle = EffectiveStyle;
+                    Rectangle scContentBounds = GetScrollBounds(chartXy.ContentBounds);
+
+                    if (gstyle.LinePattern != LinePattern.None &&
+                        gstyle.LinePattern != LinePattern.NotSet && gstyle.LineWidth > 0)
+                    {
+                        using (Pen pen = new Pen(gstyle.LineColor, Dpi.Height(gstyle.LineWidth)))
+                        {
+                            pen.DashStyle = (DashStyle)gstyle.LinePattern;
+
+                            int minorTickCount = axis.MinorTickmarks.TickmarkCount;
+                            Point pt = chartXy.GetLocalAdjustedPoint(Point.Empty);
+
+                            for (int i = 0; i < ticks.Length - 1; i++)
+                            {
+                                TickmarkTick tick = ticks[i];
+
+                                Point pt1 = tick.TickPoint;
+                                pt1.X = scContentBounds.X;
+
+                                Point pt2 = pt1;
+                                pt2.X = scContentBounds.Right;
+
+                                double dy = (double)(ticks[i + 1].TickPoint.Y - tick.TickPoint.Y) / (minorTickCount + 1);
+                                double ddy = dy;
+
+                                for (int j = 0; j < axis.MinorTickmarks.TickmarkCount; j++)
+                                {
+                                    pt1.Y = pt.Y + (int)(tick.TickPoint.Y + ddy);
+                                    pt2.Y = pt1.Y;
+
+                                    ddy += dy;
+
+                                    g.DrawLine(pen, pt1, pt2);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region Copy/CopyTo
+
+        /// <summary>
+        /// Create a copy of the MinorGridLine.
+        /// </summary>
+        /// <returns></returns>
+        public override ChartVisualElement Copy()
+        {
+            ChartMinorGridLinesY copy = new ChartMinorGridLinesY();
+
+            CopyTo(copy);
+
+            return (copy);
+        }
+
+        /// <summary>
+        /// Copies the MinorGridLine to the given "copy".
+        /// </summary>
+        /// <param name="copy"></param>
+        public override void CopyTo(ChartVisualElement copy)
+        {
+            ChartMinorGridLinesY c = copy as ChartMinorGridLinesY;
+
+            if (c != null)
+                base.CopyTo(c);
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region ChartMinorGridLines
+
+    public class ChartMinorGridLines : ChartGridLines
+    {
+        public ChartMinorGridLines(AxisOrientation orientation)
+            : base(orientation)
+        {
+        }
+    }
+
+    #endregion
+
+    #endregion
+
+    #region ChartGridLines
+
+    [TypeConverter(typeof(BlankExpandableObjectConverter))]
+    public abstract class ChartGridLines : ChartVisualElement
+    {
+        #region Private variables
+
+        private States _States;
+
+        private AxisOrientation _AxisOrientation;
+        private TickmarkLayout _TickmarkLayout;
+
+        private PieGridLineVisualStyle _GridLinesVisualStyle;
+        private EffectiveStyle<PieGridLineVisualStyle> _EffectiveStyle;
+
+        #endregion
+
+        public ChartGridLines(AxisOrientation orientation)
+        {
+            _AxisOrientation = orientation;
+
+            InitDefaultStates();
+
+            _EffectiveStyle = new EffectiveStyle<PieGridLineVisualStyle>(this);
+        }
+
+        #region InitDefaultStates
+
+        private void InitDefaultStates()
+        {
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region DisplayOnTop
+
+        /// <summary>
+        /// Gets or sets whether grid lines are displayed on top of chart data.
+        /// </summary>
+        [DefaultValue(false), Category("Appearance")]
+        [Description("Indicates whether grid lines are displayed on top of chart data.")]
+        public bool DisplayOnTop
+        {
+            get { return (TestState(States.DisplayOnTop)); }
+
+            set
+            {
+                if (value != DisplayOnTop)
+                {
+                    SetState(States.DisplayOnTop, value);
+
+                    OnPropertyChangedEx("DisplayOnTop", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region EffectiveStyles
+
+        /// <summary>
+        /// Gets a reference to the GridLine's Effective (cached, composite) style.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public PieGridLineVisualStyle EffectiveStyle
+        {
+            get { return (_EffectiveStyle.Style); }
+        }
+
+        #endregion
+
+        #region GridLinesVisualStyle
+
+        /// <summary>
+        /// Gets or sets the visual style for the GridLines.
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates the visual style for the GridLines.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public PieGridLineVisualStyle GridLinesVisualStyle
+        {
+            get
+            {
+                if (_GridLinesVisualStyle == null)
+                {
+                    _GridLinesVisualStyle = new PieGridLineVisualStyle();
+
+                    StyleVisualChangeHandler(null, _GridLinesVisualStyle);
+                }
+
+                return (_GridLinesVisualStyle);
+            }
+
+            set
+            {
+                if (_GridLinesVisualStyle != value)
+                {
+                    PieGridLineVisualStyle oldValue = _GridLinesVisualStyle;
+
+                    _GridLinesVisualStyle = value;
+
+                    OnVisualStyleChanged("GridLinesVisualStyle", oldValue, value);
+
+                    if (oldValue != null)
+                        oldValue.Dispose();
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region TickmarkLayout
+
+        internal TickmarkLayout TickmarkLayout
+        {
+            get { return (_TickmarkLayout); }
+            set { _TickmarkLayout = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region MeasureOverride
+
+        protected override void MeasureOverride(ChartLayoutInfo layoutInfo)
+        {
+        }
+
+        #endregion
+
+        #region ArrangeOverride
+
+        protected override void ArrangeOverride(ChartLayoutInfo layoutInfo)
+        {
+            BoundsRelative = layoutInfo.LayoutBounds;
+        }
+
+        #endregion
+
+        #region RenderOverride
+
+        protected override void RenderOverride(ChartRenderInfo renderInfo)
+        {
+        }
+
+        #endregion
+
+        #region Render
+
+        internal override void Render(ChartRenderInfo renderInfo)
+        {
+            if (Displayed == true)
+            {
+                Rectangle bounds = BoundsRelative;
+
+                if (renderInfo.ClipRectangle.IntersectsWith(bounds))
+                    RenderOverride(renderInfo);
+            }
+        }
+
+        #endregion
+
+        #region Style handling
+
+        #region ApplyStyles
+
+        public override void ApplyStyles(BaseVisualStyle style)
+        {
+            PieGridLineVisualStyle sstyle = style as PieGridLineVisualStyle;
+
+            if (sstyle != null)
+            {
+                ApplyParentStyles(sstyle, Parent as ChartContainer);
+
+                sstyle.ApplyStyle(GridLinesVisualStyle);
+
+                if (sstyle.LineColor.IsEmpty == true)
+                {
+                    if (this is ChartMajorGridLines)
+                        sstyle.LineColor = Color.DimGray;
+                    else
+                        sstyle.LineColor = Color.LightGray;
+                }
+
+                if (sstyle.LinePattern == LinePattern.NotSet)
+                    sstyle.LinePattern = LinePattern.Solid;
+
+                if (sstyle.LineWidth < 0)
+                    sstyle.LineWidth = 1;
+            }
+        }
+
+        #region ApplyParentStyles
+
+        private void ApplyParentStyles(PieGridLineVisualStyle pstyle, ChartContainer item)
+        {
+            if (item != null)
+            {
+                ApplyParentStyles(pstyle, item.Parent as ChartContainer);
+
+                if (item is ChartPanel)
+                {
+                    pstyle.ApplyStyle(((ChartPanel)item).DefaultVisualStyles.GridLineVisualStyle);
+                }
+            }
+            else
+            {
+                pstyle.ApplyStyle(ChartControl.BaseVisualStyles.GridLineVisualStyle);
+                pstyle.ApplyStyle(ChartControl.DefaultVisualStyles.GridLineVisualStyle);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ClearEffectiveStyles
+
+        protected override void ClearEffectiveStyles()
+        {
+            base.ClearEffectiveStyles();
+
+            if (_EffectiveStyle.InvalidateStyle() == true)
+                InvalidateLayout();
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Copy/CopyTo
+
+        /// <summary>
+        /// Copies the chart element to the given "copy".
+        /// </summary>
+        /// <param name="copy"></param>
+        public override void CopyTo(ChartVisualElement copy)
+        {
+            ChartGridLines c = copy as ChartGridLines;
+
+            if (c != null)
+            {
+                base.CopyTo(c);
+
+                c.DisplayOnTop = DisplayOnTop;
+
+                c.GridLinesVisualStyle = (_GridLinesVisualStyle != null) ? GridLinesVisualStyle.Copy() : null;
+            }
+        }
+
+        #endregion
+
+        #region GetSerialData
+
+        internal override SerialElementCollection GetSerialData(string serialName)
+        {
+            SerialElementCollection sec = new SerialElementCollection();
+
+            if (serialName != null)
+            {
+                if (serialName.Equals("") == true)
+                    serialName = "ChartGridLines";
+
+                sec.AddStartElement(serialName);
+            }
+
+            sec.AddValue("DisplayOnTop", DisplayOnTop, false);
+
+            if (_GridLinesVisualStyle != null && _GridLinesVisualStyle.IsEmpty == false)
+                sec.AddElement(_GridLinesVisualStyle.GetSerialData("GridLinesVisualStyle"));
+
+            sec.AddElement(base.GetSerialData(null));
+
+            if (serialName != null)
+                sec.AddEndElement(serialName);
+
+            return (sec);
+        }
+
+        #endregion
+
+        #region PutSerialData
+
+        #region ProcessValue
+
+        internal override void ProcessValue(SerialElement se)
+        {
+            switch (se.Name)
+            {
+                case "DisplayOnTop":
+                    DisplayOnTop = bool.Parse(se.StringValue);
+                    break;
+
+                default:
+                    base.ProcessValue(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region ProcessCollection
+
+        internal override void ProcessCollection(SerialElement se)
+        {
+            SerialElementCollection sec = se.Sec;
+
+            switch (se.Name)
+            {
+                case "GridLinesVisualStyle":
+                    sec.PutSerialData(GridLinesVisualStyle);
+                    break;
+
+                default:
+                    base.ProcessCollection(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region States
+
+        [Flags]
+        private enum States : uint
+        {
+            DisplayOnTop = (1U << 0),
+        }
+
+        #region TestState
+
+        private bool TestState(States state)
+        {
+            return ((_States & state) == state);
+        }
+
+        #endregion
+
+        #region SetState
+
+        private void SetState(States state, bool value)
+        {
+            if (value == true)
+                _States |= state;
+            else
+                _States &= ~state;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IDisposable
+
+        public override void Dispose()
+        {
+            GridLinesVisualStyle = null;
+
+            base.Dispose();
+        }
+
+        #endregion
+    }
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/XyChart/ChartSeries.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/XyChart/ChartSeries.cs
new file mode 100644
index 00000000..4bb43172
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/XyChart/ChartSeries.cs	
@@ -0,0 +1,9905 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Drawing.Drawing2D;
+using System.Globalization;
+using System.Text;
+using System.Text.RegularExpressions;
+using DevComponents.DotNetBar.Charts.Style;
+
+namespace DevComponents.DotNetBar.Charts
+{
+    /// <summary>
+    /// Represents the collection of ChartSeries.
+    /// </summary>
+    [Editor("DevComponents.Charts.Design.ChartSeriesCollectionEditor, DevComponents.Charts.Design, " +
+            "Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(UITypeEditor))]
+    public class ChartSeriesCollection : CustomNamedCollection<ChartSeries>
+    {
+        #region GetUniqueName
+
+        public string GetUniqueName()
+        {
+            return (GetUniqueName("Series"));
+        }
+
+        #endregion
+    }
+
+    public class ChartSeries : BaseSeries
+    {
+        #region Constants
+
+        private const int StockHigh = 0;
+        private const int StockLow = 1;
+        private const int StockClose = 2;
+        private const int StockOpen = 3;
+        private const int StockMedian = 4;
+
+        #endregion
+
+        #region Private variables
+
+        private States _States;
+
+        private SeriesPointCollection _SeriesPoints;
+
+        private PointData _PointData;
+        private PointData _EmptyPointData;
+        private PointData _StepPointData;
+
+        private ChartAxis _AxisX;
+        private ChartAxis _AxisY;
+
+        private int _BarOffset;
+        private int _BarWidth;
+        private double _BarWidthRatio;
+
+        private Tbool _BarShadingEnabled = Tbool.NotSet;
+        private BarFillRange _BarFillRange = BarFillRange.NotSet;
+        private BarLabelPosition _BarLabelPosition = BarLabelPosition.NotSet;
+
+        private Color[] _BarShadingColors;
+
+        private ChartSeriesVisualStyle _ChartSeriesVisualStyle;
+        private EffectiveStyle<ChartSeriesVisualStyle> _EffectiveChartSeriesStyle;
+
+        private DataLabelVisualStyle _DataLabelVisualStyle;
+        private EffectiveStyle<DataLabelVisualStyle> _EffectiveDataLabelStyle;
+
+        private Tbool _CrosshairEnabled = Tbool.NotSet;
+        private Tbool _CrosshairHighlightPoints = Tbool.NotSet;
+        private Tbool _CrosshairHighlightSinglePoint = Tbool.NotSet;
+        private Tbool _CrosshairShowLabels = Tbool.NotSet;
+
+        private ScaleType _ScaleTypeX = ScaleType.NotSet;
+        private ScaleType _ScaleTypeY = ScaleType.NotSet;
+        private ScaleType _ActualScaleTypeX = ScaleType.NotSet;
+        private ScaleType _ActualScaleTypeY = ScaleType.NotSet;
+
+        private object _MinValueX;
+        private object _MinValueY;
+
+        private object _MaxValueX;
+        private object _MaxValueY;
+
+        private object _AreaBaseValue;
+
+        private SortedSeriesPoints _SortedSeriesPoints;
+        private object[] _EmptyValues;
+
+        private List<object> _QualitativeXValues;
+        private List<object> _QualitativeYValues;
+
+        private PointMarker _PointMarker;
+        private Image _PointMarkerImage;
+        private Image _PointMarkerEmptyImage;
+        private Image _PointMarkerHighlightImage;
+        private Point _PointOffset;
+
+        private int _GroupId;
+        private object _PlotData;
+        private double _DotPlotIndexValue = 1.0d;
+
+        private ChartIndicatorCollection _ChartIndicators;
+        private Point[] _ConvexHullPoints;
+
+        private double _BubbleScaleFactor = 1.0d;
+        private double _BubbleMaxPercentage = .25d;
+        private int _BubbleMinSize = 4;
+
+        private BubbleSizeMode _BubbleSizeMode = BubbleSizeMode.NotSet;
+        private BubbleIntensityMode _BubbleIntensityMode = BubbleIntensityMode.NotSet;
+        private ChartLineDisplayMode _ChartLineDisplayMode = ChartLineDisplayMode.NotSet;
+        private ChartLineAreaDisplayMode _ChartLineAreaDisplayMode = ChartLineAreaDisplayMode.NotSet;
+        private ConvexHullDisplayMode _ConvexHullDisplayMode = ConvexHullDisplayMode.NotSet;
+        private PointLabelDisplayMode _PointLabelDisplayMode = PointLabelDisplayMode.NotSet;
+
+        private StepLines _StepLines = StepLines.NotSet;
+        private StepLineMode _StepLineMode = StepLineMode.NotSet;
+        private StepLineMode _LastStepLineMode = StepLineMode.NotSet;
+
+        private DataLabelCollection _DataLabels;
+        private int _PointLabelSkip;
+        private int _PointLabelMinDistance;
+
+        private HiLoBarType _HiLoBarType = HiLoBarType.Box;
+
+        #endregion
+
+        #region Constructors
+
+        public ChartSeries()
+            : this(null, SeriesType.Point)
+        {
+        }
+
+        public ChartSeries(string name)
+            : this(name, SeriesType.Point)
+        {
+        }
+
+        public ChartSeries(SeriesType seriesType)
+            : this(null, seriesType)
+        {
+        }
+
+        public ChartSeries(string name, SeriesType seriesType)
+        {
+            Name = name;
+            SeriesType = seriesType;
+
+            InitDefaultStates();
+
+            _EffectiveChartSeriesStyle = new EffectiveStyle<ChartSeriesVisualStyle>(this);
+            _EffectiveDataLabelStyle = new EffectiveStyle<DataLabelVisualStyle>(this);
+        }
+
+        #endregion
+
+        #region InitDefaultStates
+
+        private void InitDefaultStates()
+        {
+            SetState(States.ShowInLegend, true);
+            SetState(States.ShowInParentLegend, true);
+            SetState(States.ShowCheckBoxInLegend, true);
+            SetState(States.ShowMarkerInLegend, true);
+            SetState(States.CheckedInLegend, true);
+            SetState(States.DisplayLinePointsOnTop, true);
+            SetState(States.StackQualitativePoints, true);
+            SetState(States.ShowOriginValueLabels, true);
+            SetState(States.ShowInnerRingsEx, true);
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region ActualScaleTypeX
+
+        ///<summary>
+        /// Gets the Actual X axis Scale Type (may be
+        /// different than XScaleType when XScaleType is 'Auto').
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public ScaleType ActualScaleTypeX
+        {
+            get
+            {
+                if (IsRotated == false)
+                    return (_ActualScaleTypeX);
+
+                return (_ActualScaleTypeY);
+            }
+
+            internal set { _ActualScaleTypeX = value; }
+        }
+
+        #endregion
+
+        #region ActualScaleTypeY
+
+        ///<summary>
+        /// Gets the Actual Y axis Scale Type (may be
+        /// different than YScaleType when YScaleType is 'Auto').
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public ScaleType ActualScaleTypeY
+        {
+            get
+            {
+                if (IsRotated == true)
+                    return (_ActualScaleTypeX);
+
+                return (_ActualScaleTypeY);
+            }
+
+            internal set { _ActualScaleTypeY = value; }
+        }
+
+        #endregion
+
+        #region AreaBaseValue
+
+        ///<summary>
+        /// Gets or sets the base, reference value for displaying Line/Spline/Step Areas.
+        ///</summary>
+        [DefaultValue(null), Category("Data")]
+        [Description("Indicates the base, reference value for displaying Line/Spline/Step Areas.")]
+        [TypeConverter("DevComponents.Charts.Design.PointValueConverter," +
+            "DevComponents.Charts.Design, Version=14.1.0.37, Culture=neutral, PublicKeyToken=90f470f34c89ccaf")]
+        public object AreaBaseValue
+        {
+            get { return (_AreaBaseValue); }
+
+            set
+            {
+                if (value != _AreaBaseValue)
+                {
+                    _AreaBaseValue = value;
+
+                    OnPropertyChangedEx("AreaBaseValue", Style.VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region AxisX
+
+        /// <summary>
+        /// Gets a reference to the X-Axis associated with the series.
+        /// </summary>
+        [Category("Axis"), DefaultValue(null)]
+        [Description("Indicates the reference to the X-Axis associated with the series.")]
+        [TypeConverter(typeof(AxisTypeConverter))]
+        [Editor("DevComponents.Charts.Design.AxisListTypeEditor, DevComponents.Charts.Design, " +
+                "Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(UITypeEditor))]
+        public ChartAxis AxisX
+        {
+            get { return (_AxisX); }
+
+            set
+            {
+                if (value != _AxisX)
+                {
+                    ChartXy chartXy = Parent as ChartXy;
+
+                    if (value != null)
+                    {
+                        if (value.IsPrimaryAxis == false)
+                        {
+                            if (chartXy != null)
+                            {
+                                if (chartXy.AncillaryAxesX.Contains(value) == false)
+                                {
+                                    throw new Exception("Cannot set the series XAxis. The axis is not primary " +
+                                        "or a member of the chart's AncillaryAxesX collection.");
+                                }
+                            }
+                        }
+                    }
+
+                    if (_AxisX != null)
+                    {
+                        _AxisX.SeriesRangeChanged = true;
+                        _AxisX.PropertyChanged -= AxisX_PropertyChanged;
+                    }
+                    else
+                    {
+                        if (chartXy != null)
+                            chartXy.AxisX.SeriesRangeChanged = true;
+                    }
+
+                    _AxisX = value;
+
+                    if (_AxisX != null)
+                    {
+                        _AxisX.SeriesRangeChanged = true;
+                        _AxisX.PropertyChanged += AxisX_PropertyChanged;
+                    }
+                    else
+                    {
+                        if (chartXy != null)
+                            chartXy.AxisX.SeriesRangeChanged = true;
+                    }
+
+                    OnPropertyChangedEx("AxisX", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        void AxisX_PropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            InvalidateLayout();
+        }
+
+        #endregion
+
+        #region AxisY
+
+        /// <summary>
+        /// Gets a reference to the Y-Axis associated with the series.
+        /// </summary>
+        [Category("Axis"), DefaultValue(null)]
+        [Description("Indicates the reference to the Y-Axis associated with the series.")]
+        [Editor("DevComponents.Charts.Design.AxisListTypeEditor, DevComponents.Charts.Design, " +
+                "Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(UITypeEditor))]
+        public ChartAxis AxisY
+        {
+            get { return (_AxisY); }
+
+            set
+            {
+                if (value != _AxisY)
+                {
+                    ChartXy chartXy = Parent as ChartXy;
+
+                    if (value != null)
+                    {
+                        if (value.IsPrimaryAxis == false)
+                        {
+                            if (chartXy != null)
+                            {
+                                if (chartXy.AncillaryAxesY.Contains(value) == false)
+                                {
+                                    throw new Exception("Cannot set the series YAxis. The axis is not primary " +
+                                        "or a member of the chart's AncillaryAxesY collection.");
+                                }
+                            }
+                        }
+                    }
+
+                    if (_AxisY != null)
+                    {
+                        _AxisY.SeriesRangeChanged = true;
+                        _AxisY.PropertyChanged -= AxisY_PropertyChanged;
+                    }
+                    else
+                    {
+                        if (chartXy != null)
+                            chartXy.AxisY.SeriesRangeChanged = true;
+                    }
+
+                    _AxisY = value;
+
+                    if (_AxisY != null)
+                    {
+                        _AxisY.SeriesRangeChanged = true;
+                        _AxisY.PropertyChanged += AxisY_PropertyChanged;
+                    }
+                    else
+                    {
+                        if (chartXy != null)
+                            chartXy.AxisY.SeriesRangeChanged = true;
+                    }
+
+                    OnPropertyChangedEx("AxisY", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        void AxisY_PropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            InvalidateLayout();
+        }
+
+        #endregion
+
+        #region BarFillRange
+
+        /// <summary>
+        /// Gets or sets how series bars are filled (either according to
+        /// each individual bar range, or the entire series range).
+        /// </summary>
+        [DefaultValue(BarFillRange.NotSet), Category("Bar Display")]
+        [Description("Indicates how series bars are filled (either according to each individual bar range, or the entire series range).")]
+        public BarFillRange BarFillRange
+        {
+            get { return (_BarFillRange); }
+
+            set
+            {
+                if (value != _BarFillRange)
+                {
+                    _BarFillRange = value;
+
+                    OnPropertyChangedEx("BarFillRange", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region BarLabelPosition
+
+        /// <summary>
+        /// Gets or sets the position of bar series labels (default is Center).
+        /// </summary>
+        [DefaultValue(BarLabelPosition.NotSet), Category("Bar Display")]
+        [Description("Indicates the position of bar series labels (default is Center).")]
+        public BarLabelPosition BarLabelPosition
+        {
+            get { return (_BarLabelPosition); }
+
+            set
+            {
+                if (value != _BarLabelPosition)
+                {
+                    _BarLabelPosition = value;
+
+                    OnPropertyChangedEx("BarLabelPosition", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region BarShadingEnabled
+
+        ///<summary>
+        /// Gets or sets whether Bar shading is enabled for Horizontal and Vertical Bar series.
+        ///</summary>
+        [DefaultValue(Tbool.NotSet), Category("Bar Display")]
+        [Description("Indicates whether Bar shading is enabled for Horizontal and Vertical Bar series.")]
+        public Tbool BarShadingEnabled
+        {
+            get { return (_BarShadingEnabled); }
+
+            set
+            {
+                if (value != _BarShadingEnabled)
+                {
+                    _BarShadingEnabled = value;
+
+                    OnPropertyChangedEx("BarShadingEnabled", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region BarWidthRatio
+
+        /// <summary>
+        /// Gets or sets the ratio of bar width to bar spacing within
+        /// the same series (defaults to 2 - bar is twice as wide as spacing).
+        /// </summary>
+        [DefaultValue(0d), Category("Bar Display")]
+        [Description("Indicates the ratio of bar width to bar spacing within the same series (defaults to 2 - bar is twice as wide as spacing).")]
+        public double BarWidthRatio
+        {
+            get { return (_BarWidthRatio); }
+
+            set
+            {
+                if (value != _BarWidthRatio)
+                {
+                    if (value < 0)
+                        throw new ArgumentException("Value must be > 0");
+
+                    _BarWidthRatio = value;
+
+                    OnPropertyChangedEx("BarWidthRatio", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region BubbleIntensityMode
+
+        /// <summary>
+        /// Gets or sets the mode used to determine bubble intensities.
+        /// </summary>
+        [DefaultValue(BubbleIntensityMode.NotSet), Category("Display")]
+        [Description("Indicates the mode used to determine bubble intensities.")]
+        public BubbleIntensityMode BubbleIntensityMode
+        {
+            get { return (_BubbleIntensityMode); }
+
+            set
+            {
+                if (value != _BubbleIntensityMode)
+                {
+                    _BubbleIntensityMode = value;
+
+                    OnPropertyChangedEx("BubbleIntensityMode", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region BubbleMaxPercentage
+
+        /// <summary>
+        /// Gets or sets the max percentage of the display
+        /// area used to calculate series bubble sizes (default is .25).
+        /// </summary>
+        [DefaultValue(0.25d), Category("Display")]
+        [Description("Indicates the max percentage of the display area used to calculate series bubble sizes (default is .25).")]
+        public double BubbleMaxPercentage
+        {
+            get { return (_BubbleMaxPercentage); }
+
+            set
+            {
+                if (value != _BubbleMaxPercentage)
+                {
+                    if (value <= 0 || value > 1)
+                        throw new ArgumentException("Value must be between 0 and 1");
+
+                    _BubbleMaxPercentage = value;
+
+                    OnPropertyChangedEx("BubbleMaxPercentage", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region BubbleMinSize
+
+        /// <summary>
+        /// Gets or sets the minimum series bubble size (in pixels) Default is 4.
+        /// </summary>
+        [DefaultValue(4), Category("Display")]
+        [Description("Indicates the minimum series bubble size (in pixels). Default is 4.")]
+        public int BubbleMinSize
+        {
+            get { return (_BubbleMinSize); }
+
+            set
+            {
+                if (value != _BubbleMinSize)
+                {
+                    if (value < 0)
+                        throw new ArgumentException("Value must be > 0");
+
+                    _BubbleMinSize = value;
+
+                    OnPropertyChangedEx("BubbleMinSize", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region BubbleScaleFactor
+
+        /// <summary>
+        /// Gets or sets the Scale Factor used to calculate series bubble sizes.
+        /// </summary>
+        [DefaultValue(1.0d), Category("Display")]
+        [Description("Indicates the Scale Factor used to calculate series bubble sizes.")]
+        public double BubbleScaleFactor
+        {
+            get { return (_BubbleScaleFactor); }
+
+            set
+            {
+                if (value != _BubbleScaleFactor)
+                {
+                    _BubbleScaleFactor = value;
+
+                    OnPropertyChangedEx("BubbleScaleFactor", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region BubbleSizeMode
+
+        /// <summary>
+        /// Gets or sets the mode used to calculate series bubble sizes.
+        /// </summary>
+        [DefaultValue(BubbleSizeMode.NotSet), Category("Display")]
+        [Description("Indicates the mode used to calculate series bubble sizes.")]
+        public BubbleSizeMode BubbleSizeMode
+        {
+            get { return (_BubbleSizeMode); }
+
+            set
+            {
+                if (value != _BubbleSizeMode)
+                {
+                    _BubbleSizeMode = value;
+
+                    OnPropertyChangedEx("BubbleSizeMode", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ChartIndicators
+
+        ///<summary>
+        /// Gets a reference to the Chart Indicators collection.
+        ///</summary>
+        [DefaultValue(null), Category("Appearance")]
+        [Description("Indicates the Chart Indicators collection.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ChartIndicatorCollection ChartIndicators
+        {
+            get
+            {
+                if (_ChartIndicators == null)
+                {
+                    _ChartIndicators = new ChartIndicatorCollection();
+
+                    _ChartIndicators.CollectionChanged += ChartIndicators_CollectionChanged;
+                }
+
+                return (_ChartIndicators);
+            }
+
+            internal set
+            {
+                if (_ChartIndicators != null)
+                    _ChartIndicators.CollectionChanged -= ChartIndicators_CollectionChanged;
+
+                _ChartIndicators = value;
+
+                if (_ChartIndicators != null)
+                    _ChartIndicators.CollectionChanged += ChartIndicators_CollectionChanged;
+            }
+        }
+
+        #region ChartIndicators_CollectionChanged
+
+        void ChartIndicators_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            bool updateLayout = false;
+
+            switch (e.Action)
+            {
+                case NotifyCollectionChangedAction.Add:
+                    foreach (ChartIndicator ci in e.NewItems)
+                    {
+                        if (ci.ShowInLegend == true || ci.ShowInParentLegend == true)
+                            updateLayout = true;
+
+                        ci.Parent = this;
+                    }
+                    break;
+
+                case NotifyCollectionChangedAction.Replace:
+                    foreach (ChartIndicator ci in e.OldItems)
+                    {
+                        if (ci.ShowInLegend == true || ci.ShowInParentLegend == true)
+                            updateLayout = true;
+
+                        ci.Parent = null;
+                    }
+
+                    foreach (ChartIndicator ci in e.NewItems)
+                    {
+                        if (ci.ShowInLegend == true || ci.ShowInParentLegend == true)
+                            updateLayout = true;
+
+                        ci.Parent = this;
+                    }
+                    break;
+
+                case NotifyCollectionChangedAction.Remove:
+                    foreach (ChartIndicator ci in e.OldItems)
+                    {
+                        if (ci.ShowInLegend == true || ci.ShowInParentLegend == true)
+                            updateLayout = true;
+
+                        ci.Parent = null;
+                    }
+                    break;
+            }
+
+            if (updateLayout == true)
+                InvalidateLayout();
+            else
+                InvalidateRender();
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ChartLineAreaDisplayMode
+
+        /// <summary>
+        /// Gets or sets the Line 'Area' display mode.
+        /// </summary>
+        [DefaultValue(ChartLineAreaDisplayMode.NotSet), Category("Display")]
+        [Description("Indicates the Line ChartType display mode.")]
+        [Editor("DevComponents.Charts.Design.FlagsEnumUIEditor, DevComponents.Charts.Design, " +
+                "Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(UITypeEditor))]
+        public ChartLineAreaDisplayMode ChartLineAreaDisplayMode
+        {
+            get { return (_ChartLineAreaDisplayMode); }
+
+            set
+            {
+                if (value != _ChartLineAreaDisplayMode)
+                {
+                    _ChartLineAreaDisplayMode = value;
+
+                    OnPropertyChangedEx("ChartLineAreaDisplayMode", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ChartLineDisplayMode
+
+        /// <summary>
+        /// Gets or sets the Line ChartType display mode.
+        /// </summary>
+        [DefaultValue(ChartLineDisplayMode.NotSet), Category("Display")]
+        [Description("Indicates the Line ChartType display mode.")]
+        [Editor("DevComponents.Charts.Design.FlagsEnumUIEditor, DevComponents.Charts.Design, " +
+                "Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(UITypeEditor))]
+        public ChartLineDisplayMode ChartLineDisplayMode
+        {
+            get { return (_ChartLineDisplayMode); }
+
+            set
+            {
+                if (value != _ChartLineDisplayMode)
+                {
+                    _ChartLineDisplayMode = value;
+
+                    _SortedSeriesPoints = null;
+
+                    OnPropertyChangedEx("ChartLineDisplayMode", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ChartSeriesVisualStyle
+
+        /// <summary>
+        /// Gets or sets the visual style for the series.
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates the visual style for the series.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ChartSeriesVisualStyle ChartSeriesVisualStyle
+        {
+            get
+            {
+                if (_ChartSeriesVisualStyle == null)
+                {
+                    _ChartSeriesVisualStyle = new ChartSeriesVisualStyle();
+
+                    StyleVisualChangeHandler(null, _ChartSeriesVisualStyle);
+                }
+
+                return (_ChartSeriesVisualStyle);
+            }
+
+            set
+            {
+                if (_ChartSeriesVisualStyle != value)
+                {
+                    ChartSeriesVisualStyle oldValue = _ChartSeriesVisualStyle;
+
+                    _ChartSeriesVisualStyle = value;
+
+                    OnStyleChanged("ChartSeriesVisualStyle", oldValue, value);
+
+                    if (oldValue != null)
+                        oldValue.Dispose();
+                }
+            }
+        }
+
+        #endregion
+
+        #region ConvexHullDisplayMode
+
+        /// <summary>
+        /// Gets or sets the ConvexHull display mode.
+        /// </summary>
+        [DefaultValue(ConvexHullDisplayMode.NotSet), Category("Display")]
+        [Description("Indicates the ConvexHull display mode.")]
+        [Editor("DevComponents.Charts.Design.FlagsEnumUIEditor, DevComponents.Charts.Design, " +
+                "Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(UITypeEditor))]
+        public ConvexHullDisplayMode ConvexHullDisplayMode
+        {
+            get { return (_ConvexHullDisplayMode); }
+
+            set
+            {
+                if (value != _ConvexHullDisplayMode)
+                {
+                    _ConvexHullDisplayMode = value;
+
+                    OnPropertyChangedEx("ConvexHullDisplayMode", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region CrosshairEnabled
+
+        ///<summary>
+        /// Gets or sets whether Crosshair support is enabled for the series.
+        ///</summary>
+        [DefaultValue(Tbool.NotSet), Category("Crosshair")]
+        [Description("Indicates whether Crosshair support is enabled for the series.")]
+        public Tbool CrosshairEnabled
+        {
+            get { return (_CrosshairEnabled); }
+
+            set
+            {
+                if (value != _CrosshairEnabled)
+                {
+                    _CrosshairEnabled = value;
+
+                    OnPropertyChanged("CrosshairEnabled");
+                }
+            }
+        }
+
+        #endregion
+
+        #region CrosshairHighlightPoints
+
+        ///<summary>
+        /// Gets or sets whether Crosshair Point highlighting is enabled for the series.
+        ///</summary>
+        [DefaultValue(Tbool.NotSet), Category("Crosshair")]
+        [Description("Indicates whether Crosshair Point highlighting is enabled for the series.")]
+        public Tbool CrosshairHighlightPoints
+        {
+            get { return (_CrosshairHighlightPoints); }
+
+            set
+            {
+                if (value != _CrosshairHighlightPoints)
+                {
+                    _CrosshairHighlightPoints = value;
+
+                    OnPropertyChanged("CrosshairHighlightPoints");
+                }
+            }
+        }
+
+        #endregion
+
+        #region CrosshairHighlightSinglePoint
+
+        ///<summary>
+        /// Gets or sets whether Crosshair Point highlighting will
+        /// only highlight a single point for the series.
+        ///</summary>
+        [DefaultValue(Tbool.NotSet), Category("Crosshair")]
+        [Description("Indicates whether Crosshair Point highlighting will only highlight a single point for the series.")]
+        public Tbool CrosshairHighlightSinglePoint
+        {
+            get { return (_CrosshairHighlightSinglePoint); }
+
+            set
+            {
+                if (value != _CrosshairHighlightSinglePoint)
+                {
+                    _CrosshairHighlightSinglePoint = value;
+
+                    OnPropertyChanged("CrosshairHighlightSinglePoint");
+                }
+            }
+        }
+
+        #endregion
+
+        #region CrosshairShowLabels
+
+        ///<summary>
+        /// Gets or sets whether Crosshair labels are shown for the series.
+        ///</summary>
+        [DefaultValue(Tbool.NotSet), Category("Crosshair")]
+        [Description("Indicates whether Crosshair labels are shown for the series.")]
+        public Tbool CrosshairShowLabels
+        {
+            get { return (_CrosshairShowLabels); }
+
+            set
+            {
+                if (value != _CrosshairShowLabels)
+                {
+                    _CrosshairShowLabels = value;
+
+                    OnPropertyChanged("CrosshairShowLabels");
+                }
+            }
+        }
+
+        #endregion
+
+        #region DataLabels
+
+        ///<summary>
+        /// Gets or sets the list of instance Data Labels.
+        ///</summary>
+        [DefaultValue(null), Category("DataLabel")]
+        [Description("Indicates the list of instance Data Labels.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public DataLabelCollection DataLabels
+        {
+            get
+            {
+                if (_DataLabels == null)
+                {
+                    _DataLabels = new DataLabelCollection();
+
+                    _DataLabels.PropertyChanged += DataLabels_PropertyChanged;
+                    _DataLabels.CollectionChanged += DataLabels_CollectionChanged;
+                }
+
+                return (_DataLabels);
+            }
+
+            internal set
+            {
+                if (_DataLabels != null)
+                {
+                    _DataLabels.PropertyChanged -= DataLabels_PropertyChanged;
+                    _DataLabels.CollectionChanged -= DataLabels_CollectionChanged;
+                }
+
+                _DataLabels = value;
+
+                if (_DataLabels != null)
+                {
+                    _DataLabels.PropertyChanged += DataLabels_PropertyChanged;
+                    _DataLabels.CollectionChanged += DataLabels_CollectionChanged;
+                }
+            }
+        }
+
+        #region DataLabels_PropertyChanged
+
+        void DataLabels_PropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            InvalidateRender();
+        }
+
+        #endregion
+
+        #region DataLabels_CollectionChanged
+
+        private void DataLabels_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            switch (e.Action)
+            {
+                case NotifyCollectionChangedAction.Add:
+                    foreach (DataLabel dl in e.NewItems)
+                    {
+                        dl.Parent = this;
+                        dl.PropertyChanged += DataLabel_PropertyChanged;
+                    }
+                    break;
+
+                case NotifyCollectionChangedAction.Replace:
+                    foreach (DataLabel dl in e.OldItems)
+                    {
+                        dl.Parent = null;
+                        dl.PropertyChanged -= DataLabel_PropertyChanged;
+                    }
+
+                    foreach (DataLabel dl in e.NewItems)
+                    {
+                        dl.Parent = this;
+                        dl.PropertyChanged += DataLabel_PropertyChanged;
+                    }
+                    break;
+
+                case NotifyCollectionChangedAction.Remove:
+                case NotifyCollectionChangedAction.Reset:
+                    if (e.OldItems != null)
+                    {
+                        foreach (DataLabel dl in e.OldItems)
+                            dl.PropertyChanged -= DataLabel_PropertyChanged;
+                    }
+                    break;
+            }
+
+            InvalidateLayout();
+        }
+
+        private void DataLabel_PropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            InvalidateLayout();
+        }
+
+        #endregion
+
+        #endregion
+
+        #region DataLabelVisualStyle
+
+        /// <summary>
+        /// Gets or sets the visual style for the data labels.
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates the visual style for the data labels.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public DataLabelVisualStyle DataLabelVisualStyle
+        {
+            get
+            {
+                if (_DataLabelVisualStyle == null)
+                {
+                    _DataLabelVisualStyle = new DataLabelVisualStyle();
+
+                    StyleVisualChangeHandler(null, _DataLabelVisualStyle);
+                }
+
+                return (_DataLabelVisualStyle);
+            }
+
+            set
+            {
+                if (_DataLabelVisualStyle != value)
+                {
+                    DataLabelVisualStyle oldValue = _DataLabelVisualStyle;
+
+                    _DataLabelVisualStyle = value;
+
+                    OnStyleChanged("DataLabelVisualStyle", oldValue, value);
+
+                    if (oldValue != null)
+                        oldValue.Dispose();
+                }
+            }
+        }
+
+        #endregion
+
+        #region DisplayLinePointsOnTop
+
+        /// <summary>
+        /// Gets or sets whether series points are displayed on top of series line.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance")]
+        [Description("Indicates whether series points are displayed on top of series line.")]
+        public bool DisplayLinePointsOnTop
+        {
+            get { return (TestState(States.DisplayLinePointsOnTop)); }
+
+            set
+            {
+                if (value != DisplayLinePointsOnTop)
+                {
+                    SetState(States.DisplayLinePointsOnTop, value);
+
+                    OnPropertyChangedEx("DisplayLinePointsOnTop", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region DotPlotIndexValue
+
+        /// <summary>
+        /// Gets or sets the value used to index between DotPlot points. Default is 1.
+        /// </summary>
+        [DefaultValue(1.0d), Category("Display")]
+        [Description("Indicates the value used to index between DotPlot points. Default is 1.")]
+        public double DotPlotIndexValue
+        {
+            get { return (_DotPlotIndexValue); }
+
+            set
+            {
+                if (value != _DotPlotIndexValue)
+                {
+                    if (value < 0)
+                        throw new ArgumentException("Value must be > 0");
+
+                    _DotPlotIndexValue = value;
+
+                    OnPropertyChangedEx("DotPlotIndexValue", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region EffectiveDataLabelStyle
+
+        /// <summary>
+        /// Gets a reference to the DataLabel effective (cached, composite) style.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public DataLabelVisualStyle EffectiveDataLabelStyle
+        {
+            get { return (_EffectiveDataLabelStyle.Style); }
+        }
+
+        #endregion
+
+        #region EffectiveSeriesStyle
+
+        /// <summary>
+        /// Gets a reference to the Series's effective (cached, composite) style.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        [Description("Indicates a reference to the Series's Effective (cached, composite) style.")]
+        public ChartSeriesVisualStyle EffectiveChartSeriesStyle
+        {
+            get { return (_EffectiveChartSeriesStyle.Style); }
+        }
+
+        #endregion
+
+        #region EmptyValues
+
+        ///<summary>
+        /// Gets or sets the value(s) used to determine if
+        /// a series point is empty or missing.
+        ///</summary>
+        [Category("Empty")]
+        [Description("Indicates the value(s) used to determine if a series point is empty or missing.")]
+        [Editor("DevComponents.Charts.Design.SeriesPointValueEditor, DevComponents.Charts.Design, " +
+                "Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(UITypeEditor))]
+        public object[] EmptyValues
+        {
+            get { return (_EmptyValues); }
+
+            set
+            {
+                if (value != _EmptyValues)
+                {
+                    _EmptyValues = value;
+
+                    OnPropertyChangedEx("EmptyValue", Style.VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region EnableEmptyValues
+
+        /// <summary>
+        /// Gets or sets whether EmptyValues are processed in the series
+        /// </summary>
+        [DefaultValue(false), Category("Empty")]
+        [Description("Indicates whether EmptyValues are processed in the series.")]
+        public bool EnableEmptyValues
+        {
+            get { return (TestState(States.EnableEmptyValues)); }
+
+            set
+            {
+                if (value != EnableEmptyValues)
+                {
+                    SetState(States.EnableEmptyValues, value);
+
+                    _PointData = null;
+                    _EmptyPointData = null;
+                    _StepPointData = null;
+
+                    OnPropertyChangedEx("EnableEmptyValues", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region GroupId
+
+        ///<summary>
+        /// Gets or sets the logical Id used to group qualitative series.
+        ///</summary>
+        [DefaultValue(0), Category("Display")]
+        [Description("Indicates the logical Id used to group qualitative series).")]
+        public int GroupId
+        {
+            get { return (_GroupId); }
+
+            set
+            {
+                if (value != _GroupId)
+                {
+                    _GroupId = value;
+
+                    OnPropertyChangedEx("GroupId", Style.VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region HiLoBarType
+
+        ///<summary>
+        /// Gets or sets the Series HiLoBar Type.
+        ///</summary>
+        [DefaultValue(HiLoBarType.Box), Category("Appearance")]
+        [Description("Indicates the Series HiLoBar Type.")]
+        public HiLoBarType HiLoBarType
+        {
+            get { return (_HiLoBarType); }
+
+            set
+            {
+                if (value != _HiLoBarType)
+                {
+                    _HiLoBarType = value;
+
+                    OnPropertyChangedEx("HiLoBarType", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region MaxValueX
+
+        ///<summary>
+        /// Gets the series Maximum X value.
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public object MaxValueX
+        {
+            get
+            {
+                UpdateSeriesRange();
+
+                if (IsRotated == true)
+                    return (_MaxValueY);
+
+                return (_MaxValueX);
+            }
+        }
+
+        #endregion
+
+        #region MaxValueY
+
+        ///<summary>
+        /// Gets the series Maximum Y value.
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public object MaxValueY
+        {
+            get
+            {
+                UpdateSeriesRange();
+
+                if (IsRotated == true)
+                    return (_MaxValueX);
+
+                return (_MaxValueY);
+            }
+        }
+
+        #endregion
+
+        #region MinValueX
+
+        ///<summary>
+        /// Gets the series minimum X value.
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public object MinValueX
+        {
+            get
+            {
+                UpdateSeriesRange();
+
+                if (IsRotated == true)
+                    return (_MinValueY);
+
+                return (_MinValueX);
+            }
+        }
+
+        #endregion
+
+        #region MinValueY
+
+        ///<summary>
+        /// Gets the series minimum Y value.
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public object MinValueY
+        {
+            get
+            {
+                UpdateSeriesRange();
+
+                if (IsRotated == true)
+                    return (_MinValueX);
+
+                return (_MinValueY);
+            }
+        }
+
+        #endregion
+
+        #region PointLabelDisplayMode
+
+        /// <summary>
+        /// Gets or sets the display mode for the chart PointLabels.
+        /// </summary>
+        [DefaultValue(PointLabelDisplayMode.NotSet), Category("DataLabel")]
+        [Description("Indicates the display mode for the chart PointLabels.")]
+        [Editor("DevComponents.Charts.Design.FlagsEnumUIEditor, DevComponents.Charts.Design, " +
+                "Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(UITypeEditor))]
+        public PointLabelDisplayMode PointLabelDisplayMode
+        {
+            get { return (_PointLabelDisplayMode); }
+
+            set
+            {
+                if (value != _PointLabelDisplayMode)
+                {
+                    _PointLabelDisplayMode = value;
+
+                    InvalidatePointLabels();
+
+                    OnPropertyChangedEx("PointLabelDisplayMode", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region PointLabelMinDistance
+
+        ///<summary>
+        /// Gets or sets the minimum distance between label data points.
+        ///</summary>
+        [DefaultValue(0), Category("DataLabel")]
+        [Description("Indicates the minimum distance between label data points.")]
+        public int PointLabelMinDistance
+        {
+            get { return (_PointLabelMinDistance); }
+
+            set
+            {
+                if (value != _PointLabelMinDistance)
+                {
+                    if (value < 0)
+                        throw new Exception("Minimum Distance must be >= 0");
+
+                    _PointLabelMinDistance = value;
+
+                    InvalidatePointLabels();
+
+                    OnPropertyChangedEx("PointLabelMinDistance", Style.VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region PointLabelSkip
+
+        ///<summary>
+        /// Gets or sets the number of inter-label points to skip.
+        ///</summary>
+        [DefaultValue(0), Category("DataLabel")]
+        [Description("Indicates the number of inter-label points to skip.")]
+        public int PointLabelSkip
+        {
+            get { return (_PointLabelSkip); }
+
+            set
+            {
+                if (value != _PointLabelSkip)
+                {
+                    if (value < 0)
+                        throw new Exception("Skip value must be >= 0");
+
+                    _PointLabelSkip = value;
+
+                    InvalidatePointLabels();
+
+                    OnPropertyChangedEx("PointLabelSkip", Style.VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ScaleTypeX
+
+        ///<summary>
+        /// Gets or sets the X axis Scale Type.
+        ///</summary>
+        [DefaultValue(ScaleType.NotSet), Category("Axis")]
+        [Description("Indicates the X axis Scale Type.")]
+        public ScaleType ScaleTypeX
+        {
+            get { return (_ScaleTypeX); }
+
+            set
+            {
+                if (value != _ScaleTypeX)
+                {
+                    if (ValidScaleTypeX(value) == false)
+                        throw new Exception("Incompatible ScaleTypeX for defined series data.");
+
+                    _ScaleTypeX = value;
+
+                    InvalidatePoints();
+
+                    OnPropertyChangedEx("ScaleTypeX", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #region ValidScaleTypeX
+
+        private bool ValidScaleTypeX(ScaleType scaleType)
+        {
+            if (scaleType == ScaleType.NotSet || scaleType == ScaleType.Auto)
+                return (true);
+
+            if (SeriesPoints.Count > 0)
+            {
+                for (int i = 0; i < SeriesPoints.Count; i++)
+                {
+                    SeriesPoint sp = SeriesPoints[i];
+
+                    if (sp.ValueX != null)
+                    {
+                        Type dataType = sp.ValueX.GetType();
+                        ScaleType autoType = SeriesPoint.GetScaleType(dataType);
+
+                        if (scaleType == autoType)
+                            return (true);
+
+                        if (scaleType == ScaleType.Qualitative)
+                            return (true);
+
+                        return (false);
+                    }
+                }
+            }
+
+            return (true);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ScaleTypeY
+
+        ///<summary>
+        /// Gets or sets the Y axis Scale Type.
+        ///</summary>
+        [DefaultValue(ScaleType.NotSet), Category("Axis")]
+        [Description("Indicates the Y axis Scale Type.")]
+        public ScaleType ScaleTypeY
+        {
+            get { return (_ScaleTypeY); }
+
+            set
+            {
+                if (value != _ScaleTypeY)
+                {
+                    if (ValidScaleTypeY(value) == false)
+                        throw new Exception("Incompatible ScaleTypeY for defined series data.");
+
+                    _ScaleTypeY = value;
+
+                    InvalidatePoints();
+
+                    OnPropertyChangedEx("ScaleTypeY", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #region ValidScaleTypeY
+
+        private bool ValidScaleTypeY(ScaleType scaleType)
+        {
+            if (scaleType == ScaleType.NotSet || scaleType == ScaleType.Auto)
+                return (true);
+
+            if (SeriesPoints.Count > 0)
+            {
+                for (int i = 0; i < SeriesPoints.Count; i++)
+                {
+                    SeriesPoint sp = SeriesPoints[i];
+
+                    if (sp.ValueY != null && sp.ValueY.Length > 0)
+                    {
+                        Type dataType = sp.ValueY[0].GetType();
+                        ScaleType autoType = SeriesPoint.GetScaleType(dataType);
+
+                        if (scaleType == autoType)
+                            return (true);
+
+                        if (scaleType == ScaleType.Qualitative)
+                            return (true);
+
+                        return (false);
+                    }
+                }
+            }
+
+            return (true);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region SeriesPoints
+
+        ///<summary>
+        /// Gets the series point data collection
+        ///</summary>
+        [Category("Data")]
+        [Description("Indicates the series point data collection.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public SeriesPointCollection SeriesPoints
+        {
+            get
+            {
+                if (_SeriesPoints == null)
+                {
+                    _SeriesPoints = new SeriesPointCollection();
+
+                    _SeriesPoints.CollectionChanged += SeriesPoints_CollectionChanged;
+                }
+
+                return (_SeriesPoints);
+            }
+
+            set
+            {
+                if (value != _SeriesPoints)
+                {
+                    if (_SeriesPoints != null)
+                        _SeriesPoints.CollectionChanged -= SeriesPoints_CollectionChanged;
+
+                    _SeriesPoints = value;
+
+                    if (_SeriesPoints != null)
+                        _SeriesPoints.CollectionChanged += SeriesPoints_CollectionChanged;
+                }
+            }
+        }
+
+        #region SeriesPoints_CollectionChanged
+
+        void SeriesPoints_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            SeriesRangeChanged = true;
+
+            InvalidateLayout();
+        }
+
+        #endregion
+
+        #endregion
+
+        #region SeriesType
+
+        ///<summary>
+        /// Gets or sets the Series Type.
+        ///</summary>
+        [DefaultValue(SeriesType.Point), Category("Appearance")]
+        [Description("Indicates the Series Type.")]
+        public override SeriesType SeriesType
+        {
+            get { return (base.SeriesType); }
+
+            set
+            {
+                if (value != base.SeriesType)
+                {
+                    base.SeriesType = value;
+
+                    IsRotated = (
+                        value == SeriesType.HorizontalDot ||
+                        value == SeriesType.HorizontalBar ||
+                        value == SeriesType.HorizontalHiLoBar);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowHiLoBarMedianLines
+
+        /// <summary>
+        /// Gets or sets whether defined HiLoBar Median lines are shown.
+        /// </summary>
+        [DefaultValue(false), Category("Empty")]
+        [Description("Indicates whether defined HiLoBar Median lines are shown.")]
+        public bool ShowHiLoBarMedianLines
+        {
+            get { return (TestState(States.ShowHiLoBarMedianLines)); }
+
+            set
+            {
+                if (value != ShowHiLoBarMedianLines)
+                {
+                    SetState(States.ShowHiLoBarMedianLines, value);
+
+                    OnPropertyChangedEx("ShowHiLoBarMedianLines", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowEmptyLines
+
+        /// <summary>
+        /// Gets or sets whether EmptyLines are shown in the series.
+        /// </summary>
+        [DefaultValue(false), Category("Empty")]
+        [Description("Indicates whether EmptyLines are shown in the series.")]
+        public bool ShowEmptyLines
+        {
+            get { return (TestState(States.ShowEmptyLines)); }
+
+            set
+            {
+                if (value != ShowEmptyLines)
+                {
+                    SetState(States.ShowEmptyLines, value);
+
+                    InvalidatePoints();
+
+                    OnPropertyChangedEx("ShowEmptyLines", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowEmptyPoints
+
+        /// <summary>
+        /// Gets or sets whether EmptyPoints are shown in the series.
+        /// </summary>
+        [DefaultValue(false), Category("Empty")]
+        [Description("Indicates whether EmptyPoints are shown in the series.")]
+        public bool ShowEmptyPoints
+        {
+            get { return (TestState(States.ShowEmptyPoints)); }
+
+            set
+            {
+                if (value != ShowEmptyPoints)
+                {
+                    SetState(States.ShowEmptyPoints, value);
+
+                    InvalidatePoints();
+
+                    OnPropertyChangedEx("ShowEmptyPoints", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowOriginValueLabels
+
+        /// <summary>
+        /// Gets or sets whether labels are shown for 'Origin' data values.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance")]
+        [Description("Indicates whether labels are shown for 'Origin' data values.")]
+        public bool ShowOriginValueLabels
+        {
+            get { return (TestState(States.ShowOriginValueLabels)); }
+
+            set
+            {
+                if (value != ShowOriginValueLabels)
+                {
+                    SetState(States.ShowOriginValueLabels, value);
+
+                    OnPropertyChangedEx("ShowOriginValueLabels", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region StackQualitativePoints
+
+        /// <summary>
+        /// Gets or sets whether Qualitative points are
+        /// stacked or spread across the associated grouped column.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance")]
+        [Description("Indicates whether Qualitative points are stacked or spread across the associated grouped column.")]
+        public bool StackQualitativePoints
+        {
+            get { return (TestState(States.StackQualitativePoints)); }
+
+            set
+            {
+                if (value != StackQualitativePoints)
+                {
+                    SetState(States.StackQualitativePoints, value);
+
+                    OnPropertyChangedEx("StackQualitativePoints", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region StepLines
+
+        /// <summary>
+        /// Gets or sets which 'Step lines' are displayed.
+        /// </summary>
+        [DefaultValue(StepLines.NotSet), Category("Display")]
+        [Description("Indicates which 'Step lines' are displayed.")]
+        public StepLines StepLines
+        {
+            get { return (_StepLines); }
+
+            set
+            {
+                if (value != _StepLines)
+                {
+                    _StepLines = value;
+
+                    OnPropertyChangedEx("StepLines", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region StepLineMode
+
+        /// <summary>
+        /// Gets or sets the mode used to render "Step Lines" in
+        /// the defined Line series.
+        /// </summary>
+        [DefaultValue(StepLineMode.NotSet), Category("Display")]
+        [Description("Indicates the mode used to render 'Step Lines' in the defined Line series.")]
+        public StepLineMode StepLineMode
+        {
+            get { return (_StepLineMode); }
+
+            set
+            {
+                if (value != _StepLineMode)
+                {
+                    _StepLineMode = value;
+
+                    OnPropertyChangedEx("StepLineMode", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region BarOffset
+
+        internal int BarOffset
+        {
+            get { return (_BarOffset); }
+            set { _BarOffset = value; }
+        }
+
+        #endregion
+
+        #region BarShadingColors
+
+        internal Color[] BarShadingColors
+        {
+            get
+            {
+                if (_BarShadingColors == null)
+                {
+                    // Top, Bottom, Left, Right
+
+                    _BarShadingColors = new Color[] {
+                        Color.FromArgb(200, Color.White),
+                        Color.FromArgb(100, Color.Black),
+                        Color.FromArgb(100, Color.Black),
+                        Color.FromArgb(100, Color.Black)};
+                }
+
+                return (_BarShadingColors);
+            }
+        }
+
+        #endregion
+
+        #region BarWidth
+
+        internal int BarWidth
+        {
+            get { return (_BarWidth); }
+            set { _BarWidth = value; }
+        }
+
+        #endregion
+
+        #region IsQualitativeXValues
+
+        internal bool IsQualitativeXValues
+        {
+            get
+            {
+                UpdateSeriesRange();
+
+                return (QualitativeXValues.Count > 0);
+            }
+        }
+
+        #endregion
+
+        #region IsQualitativeYValues
+
+        internal bool IsQualitativeYValues
+        {
+            get
+            {
+                UpdateSeriesRange();
+
+                return (QualitativeYValues.Count > 0);
+            }
+        }
+
+        #endregion
+
+        #region IsBarSeries
+
+        internal bool IsBarSeries
+        {
+            get
+            {
+                return (SeriesType == SeriesType.HorizontalBar ||
+                        SeriesType == SeriesType.VerticalBar ||
+                        SeriesType == SeriesType.HorizontalHiLoBar ||
+                        SeriesType == SeriesType.VerticalHiLoBar);
+            }
+        }
+
+        #endregion
+
+        #region IsRotated
+
+        internal bool IsRotated
+        {
+            get { return (TestState(States.IsRotated)); }
+            set { SetState(States.IsRotated, value); }
+        }
+
+        #endregion
+
+        #region IsSorted
+
+        internal bool IsSorted
+        {
+            get { return (TestState(States.IsSorted)); }
+            set { SetState(States.IsSorted, value); }
+        }
+
+        #endregion
+
+        #region PlotData
+
+        internal object PlotData
+        {
+            get { return (_PlotData); }
+            set { _PlotData = value; }
+        }
+
+        #endregion
+
+        #region PointMarkerEmptyImage
+
+        internal Image PointMarkerEmptyImage
+        {
+            get { return (_PointMarkerEmptyImage); }
+            set { _PointMarkerEmptyImage = value; }
+        }
+
+        #endregion
+
+        #region PointMarkerImage
+
+        internal Image PointMarkerImage
+        {
+            get { return (_PointMarkerImage); }
+            set { _PointMarkerImage = value; }
+        }
+
+        #endregion
+
+        #region PointMarkerHighlightImage
+
+        internal Image PointMarkerHighlightImage
+        {
+            get { return (_PointMarkerHighlightImage); }
+            set { _PointMarkerHighlightImage = value; }
+        }
+
+        #endregion
+
+        #region PointOffset
+
+        internal Point PointOffset
+        {
+            get { return (_PointOffset); }
+            set { _PointOffset = value; }
+        }
+
+        #endregion
+
+        #region QualitativeXValues
+
+        internal List<object> QualitativeXValues
+        {
+            get
+            {
+                if (_QualitativeXValues == null)
+                    _QualitativeXValues = new List<object>();
+
+                return (_QualitativeXValues);
+            }
+
+            set { _QualitativeXValues = value; }
+        }
+
+        #endregion
+
+        #region QualitativeYValues
+
+        internal List<object> QualitativeYValues
+        {
+            get
+            {
+                if (_QualitativeYValues == null)
+                    _QualitativeYValues = new List<object>();
+
+                return (_QualitativeYValues);
+            }
+
+            set { _QualitativeYValues = value; }
+        }
+
+        #endregion
+
+        #region SeriesRangeChanged
+
+        public override bool SeriesRangeChanged
+        {
+            get { return (base.SeriesRangeChanged); }
+
+            set
+            {
+                if (value != base.SeriesRangeChanged)
+                {
+                    base.SeriesRangeChanged = value;
+
+                    if (value == true)
+                        _SortedSeriesPoints = null;
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region MeasureOverride
+
+        protected override void MeasureOverride(ChartLayoutInfo layoutInfo)
+        {
+            UpdateDataBindings();
+
+            UpdateMarkerImage(layoutInfo.Graphics);
+        }
+
+        #region UpdateMarkerImage
+
+        private void UpdateMarkerImage(Graphics g)
+        {
+            switch (SeriesType)
+            {
+                case SeriesType.Bubble:
+                case SeriesType.VerticalDot:
+                case SeriesType.Line:
+                case SeriesType.Point:
+                case SeriesType.HorizontalDot:
+                    if (PointMarkerImage == null)
+                    {
+                        ChartXy chartXy = Parent as ChartXy;
+                        ChartSeriesVisualStyle sstyle = EffectiveChartSeriesStyle;
+
+                        PointMarkerImage = chartXy.GetPointMarker(g, sstyle.MarkerVisualStyle);
+                    }
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ArrangeOverride
+
+        protected override void ArrangeOverride(ChartLayoutInfo layoutInfo)
+        {
+            BoundsRelative = layoutInfo.LayoutBounds;
+
+            if (SeriesType == SeriesType.Bubble)
+                UpdateBubblePointOffset();
+        }
+
+        #region UpdateBubblePointOffset
+
+        private void UpdateBubblePointOffset()
+        {
+            BubblePlotData bdata = _PlotData as BubblePlotData;
+
+            if (bdata != null)
+            {
+                ChartXy chartXy = Parent as ChartXy;
+
+                Rectangle bounds = chartXy.ContentBoundsEx;
+
+                float minSize = Dpi.Width(BubbleMinSize);
+                float maxSize = (float)(Math.Min(bounds.Width, bounds.Height) * BubbleMaxPercentage);
+
+                double minTotalSize;
+                double maxTotalSize;
+                chartXy.GetChartBubbleData(out minTotalSize, out maxTotalSize);
+
+                BubbleSizeMode smode = GetBubbleSizeMode(chartXy);
+
+                double range = maxSize - minSize;
+
+                double sizeRange = (smode == BubbleSizeMode.Diameter)
+                    ? maxTotalSize - minTotalSize : MathHelper.ToScalar((float)(maxTotalSize - minTotalSize));
+
+                SortedSeriesPoints ssp = GetSortedSeriesPoints(chartXy);
+
+                for (int i = 0; i < ssp.Count; i++)
+                {
+                    SeriesPoint sp = ssp[i];
+
+                    if (sp.Visible == true)
+                    {
+                        int size = GetBubbleSize(sp, smode, minSize, maxSize, range, sizeRange);
+
+                        sp.PointSize = new Size(size, size);
+                    }
+                }
+            }
+        }
+
+        #region GetBubbleSize
+
+        private int GetBubbleSize(SeriesPoint sp,
+            BubbleSizeMode smode, double minSize, double maxSize, double range, double sizeRange)
+        {
+            if (sp.ValueY == null || sp.ValueY.Length < 2 || sizeRange == 0)
+                return (int)minSize;
+
+            double size = Math.Abs(GetDoubleValue(sp.ValueY[1]));
+
+            double value = (smode == BubbleSizeMode.Diameter)
+                ? (size * range) / sizeRange
+                : (MathHelper.ToScalar((float)size) * range) / sizeRange;
+
+            if (BubbleScaleFactor > 0)
+                value *= BubbleScaleFactor;
+
+            value = Math.Max(minSize, value);
+
+            return ((int)Math.Min(maxSize, value));
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region RenderOverride
+
+        protected override void RenderOverride(ChartRenderInfo renderInfo)
+        {
+            if (SeriesPoints.Count > 0)
+            {
+                Graphics g = renderInfo.Graphics;
+
+                if (SeriesPoints.Count > 0)
+                {
+                    ChartXy chartXy = Parent as ChartXy;
+                    ChartSeriesVisualStyle sstyle = EffectiveChartSeriesStyle;
+
+                    SortedSeriesPoints ssp = GetSortedSeriesPoints(chartXy);
+                    ssp.SeriesLayoutCount = chartXy.SeriesLayoutCount;
+
+                    UpdateMarkerImage(g);
+
+                    int n = Dpi.Width1;
+
+                    Point pt = chartXy.GetGlobalAdjustedPoint(chartXy.ContentBounds.Location);
+                    RenderBounds = new Rectangle(pt, chartXy.ContentBounds.Size);
+
+                    if (RenderBounds.Width > 0 && RenderBounds.Height > 0)
+                    {
+                        switch (SeriesType)
+                        {
+                            case SeriesType.Bubble:
+                                RenderBubblePlot(g, chartXy, ssp, sstyle);
+                                break;
+
+                            case SeriesType.HorizontalBar:
+                                RenderHBarPlot(g, chartXy, ssp, sstyle);
+                                break;
+
+                            case SeriesType.HorizontalDot:
+                                RenderHDotPlot(g, chartXy, ssp, sstyle);
+                                break;
+
+                            case SeriesType.HorizontalHiLoBar:
+                                RenderHStockPlot(renderInfo, chartXy, ssp, sstyle);
+                                break;
+
+                            case SeriesType.Point:
+                                RenderPointPlot(g, chartXy, ssp, true, sstyle);
+                                break;
+
+                            case SeriesType.Line:
+                                RenderLinePlot(g, chartXy, ssp, sstyle);
+                                break;
+
+                            case SeriesType.VerticalBar:
+                                RenderVBarPlot(g, chartXy, ssp, sstyle);
+                                break;
+
+                            case SeriesType.VerticalDot:
+                                RenderVDotPlot(g, chartXy, ssp, sstyle);
+                                break;
+
+                            case SeriesType.VerticalHiLoBar:
+                                RenderVStockPlot(renderInfo, chartXy, ssp, sstyle);
+                                break;
+                        }
+                    }
+                }
+            }
+        }
+
+        #region GetSortedSeriesPoints
+
+        internal SortedSeriesPoints GetSortedSeriesPoints(ChartXy chartXy)
+        {
+            if (_SortedSeriesPoints == null)
+            {
+                bool sort = (IsSorted == false && NeedSortedSeries(chartXy) == true);
+
+                _SortedSeriesPoints = new SortedSeriesPoints(this, sort);
+
+                if (SeriesType == SeriesType.VerticalDot || SeriesType == SeriesType.HorizontalDot)
+                    CombineDuplicates(_SortedSeriesPoints);
+            }
+
+            return (_SortedSeriesPoints);
+        }
+
+        #region CombineDuplicates
+
+        private void CombineDuplicates(SortedSeriesPoints ssp)
+        {
+            SeriesPoint spLast = null;
+
+            List<int> cList = new List<int>();
+            List<int> iList = new List<int>();
+
+            int dcount = 0;
+            int spLastIndex = 0;
+
+            for (int i = 0; i < ssp.Count; i++)
+            {
+                SeriesPoint sp = ssp[i];
+
+                if (spLast != null && spLast.ValueX.Equals(sp.ValueX) == false)
+                {
+                    iList.Add(spLastIndex);
+                    cList.Add(dcount);
+
+                    dcount = 0;
+
+                    spLast = sp;
+                    spLastIndex = (ssp.IndexArray != null ? ssp.IndexArray[i] : i);
+                }
+
+                dcount += GetDotCount(sp);
+
+                if (spLast == null)
+                {
+                    spLast = sp;
+                    spLastIndex = (ssp.IndexArray != null ? ssp.IndexArray[i] : i);
+                }
+            }
+
+            if (dcount > 0)
+            {
+                iList.Add(spLastIndex);
+                cList.Add(dcount);
+            }
+
+            int[] indexArray = new int[iList.Count];
+            int[] countArray = new int[iList.Count];
+
+            for (int i = 0; i < iList.Count; i++)
+            {
+                indexArray[i] = iList[i];
+                countArray[i] = cList[i];
+            }
+
+            ssp.IndexArray = indexArray;
+            ssp.CountArray = countArray;
+        }
+
+        #endregion
+
+        #region NeedSortedSeries
+
+        private bool NeedSortedSeries(ChartXy chartXy)
+        {
+            if (IsSorted == true || _ActualScaleTypeX == ScaleType.Qualitative)
+                return (false);
+
+            if (SeriesType != SeriesType.Line)
+                return (true);
+
+            ChartLineDisplayMode mode = GetLineDisplayMode(chartXy);
+
+            return ((mode & ChartLineDisplayMode.DisplayUnsorted) != ChartLineDisplayMode.DisplayUnsorted);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderBarPlot
+
+        #region RenderHBarPlot
+
+        private void RenderHBarPlot(Graphics g,
+            ChartXy chartXy, SortedSeriesPoints ssp, ChartSeriesVisualStyle sstyle)
+        {
+            g.RenderingOrigin = chartXy.GetLocalAdjustedPoint(Point.Empty);
+
+            BarRenderData rd = new BarRenderData(chartXy, AxisX ?? chartXy.AxisX);
+
+            rd.FillRange = GetBarFillRange(chartXy);
+            rd.BarShading = GetBarShading(chartXy);
+
+            rd.SeriesStyle = sstyle;
+
+            int index = 0;
+            bool isHistogram = false;
+
+            if (chartXy.BarShowAsHistogram == Tbool.True)
+            {
+                ChartAxis axisY = AxisY ?? chartXy.AxisY;
+                AxisBar axisBar = axisY.AxisBars[(int)AxisBarType.Bar];
+
+                if (axisBar.BarCount == 1)
+                {
+                    TickmarkLayout layout = axisY.TickmarkLayout;
+
+                    for (int i = 0; i < layout.Ticks.Length; i++)
+                    {
+                        if (layout.Ticks[i].LabelIndex >= 0)
+                        {
+                            index = i;
+                            break;
+                        }
+                    }
+
+                    isHistogram = true;
+                }
+            }
+
+            for (int i = 0; i < ssp.Count; i++)
+            {
+                SeriesPoint sp = ssp[i];
+
+                if (sp.Visible == true)
+                {
+                    rd.Spt = sp.Point[0];
+                    rd.Sp = sp;
+
+                    RenderHBar(g, rd, isHistogram, i + index);
+                }
+            }
+        }
+
+        #region RenderHBar
+
+        private void RenderHBar(
+            Graphics g, BarRenderData rd, bool isHistogram, int index)
+        {
+            ChartXy chartXy = rd.ChartXy;
+            SeriesPoint sp = rd.Sp;
+
+            sp.PointSize = new Size(5, BarWidth);
+
+            Point ptt = chartXy.GetDataPointEx(this, sp, 0);
+
+            int y = (int)(ptt.Y + BarOffset - BarWidth / 2);
+            int height = BarWidth;
+
+            if (isHistogram == true)
+                y = GetHistogramSizeY(chartXy, ptt, index, out height);
+
+            int x1 = ptt.X;
+            int x2 = GetHBarStart(chartXy, sp);
+            int xOrigin = GetHBarOrigin(chartXy, rd.Axis, sp);
+
+            if (x1 > x2)
+            {
+                int xtemp = x1;
+                x1 = x2;
+                x2 = xtemp;
+            }
+
+            if (x2 <= xOrigin)
+            {
+                RenderLeftBar(g, rd, y, height, x1, x2, xOrigin);
+            }
+            else if (x1 >= xOrigin)
+            {
+                RenderRightBar(g, rd, y, height, x1, x2, xOrigin);
+            }
+            else
+            {
+                RenderLeftBar(g, rd, y, height, x1, xOrigin, xOrigin);
+                RenderRightBar(g, rd, y, height, xOrigin, x2, xOrigin);
+            }
+        }
+
+        #region GetHistogramSizeY
+
+        private int GetHistogramSizeY(
+            ChartXy chartXy, Point spt, int index, out int height)
+        {
+            ChartAxis axis = AxisY ?? chartXy.AxisY;
+            TickmarkLayout layout = axis.TickmarkLayout;
+
+            if (index < layout.Ticks.Length)
+                height = layout.Ticks[index + 1].TickPoint.Y - spt.Y;
+            else
+                height = (int)layout.MajorInterval;
+
+            int y = spt.Y - (int)(layout.MajorInterval / 2);
+
+            return (y);
+        }
+
+        #endregion
+
+        #region GetHBarStart
+
+        internal int GetHBarStart(ChartXy chartXy, SeriesPoint sp)
+        {
+            ChartAxis axis = AxisX ?? chartXy.AxisX;
+
+            object value = ((sp.ValueY.Length > 1)
+                ? sp.ValueY[1] : chartXy.BarOrigin ?? null);
+
+            if (value == null)
+            {
+                if (axis.ScaleType == ScaleType.Quantitative)
+                    value = 0;
+                else
+                    value = axis.ActualMinValue;
+            }
+
+            return (chartXy.GetDataPointX(axis, value));
+        }
+
+        #endregion
+
+        #region GetHBarOrigin
+
+        private int GetHBarOrigin(
+            ChartXy chartXy, ChartAxis axis, SeriesPoint sp)
+        {
+            object value = ((sp.ValueY != null && sp.ValueY.Length > 2)
+                ? sp.ValueY[2] : (chartXy.BarOrigin ?? null));
+
+            if (value == null)
+            {
+                if (axis.ScaleType == ScaleType.Quantitative)
+                    value = 0;
+                else
+                    value = axis.ActualMinValue;
+            }
+
+            return (chartXy.GetDataPointX(axis, value));
+        }
+
+        #endregion
+
+        #region RenderRightBar
+
+        private void RenderRightBar(Graphics g,
+            BarRenderData rd, int y, int height, int x1, int x2, int xOrigin)
+        {
+            Rectangle r = new Rectangle(x1, y, x2 - x1, Math.Max(1, height - 1));
+
+            if (r.IntersectsWith(RenderBounds))
+            {
+                Background bk = rd.SeriesStyle.BarVisualStyle.Background;
+                ChartLineVisualStyle lstyle = rd.SeriesStyle.BarVisualStyle.Border;
+
+                // r is actual area, r2 is FillRange area
+
+                Rectangle r2 = r;
+
+                if (rd.FillRange == BarFillRange.BySeries)
+                {
+                    r2.X = xOrigin;
+                    r2.Width = rd.ChartXy.GetDataPointX(rd.Axis, MaxValueX) - r2.X;
+                }
+
+                BarSegment segment = (x1 > xOrigin) ? BarSegment.Right : BarSegment.RightPartial;
+
+                RenderFullHBar(g, rd, r, r2, bk, lstyle, segment);
+            }
+        }
+
+        #endregion
+
+        #region RenderLeftBar
+
+        private void RenderLeftBar(Graphics g,
+            BarRenderData rd, int y, int height, int x1, int x2, int xOrigin)
+        {
+            Rectangle r = new Rectangle(x1, y, x2 - x1, Math.Max(1, height - 1));
+
+            if (r.IntersectsWith(RenderBounds))
+            {
+                ChartSeriesVisualStyle sstyle = rd.SeriesStyle;
+
+                Background bk = sstyle.BarVisualStyle.AlternateBackground;
+
+                if (bk.IsEmpty)
+                    bk = sstyle.BarVisualStyle.Background;
+
+                ChartLineVisualStyle lstyle = sstyle.BarVisualStyle.AlternateBorder;
+
+                if (lstyle.IsEmpty)
+                    lstyle = sstyle.BarVisualStyle.Border;
+
+                Rectangle r2 = r;
+
+                if (rd.FillRange == BarFillRange.BySeries)
+                {
+                    int left = rd.ChartXy.GetDataPointX(rd.Axis, MinValueX);
+
+                    r2.X = left;
+                    r2.Width = xOrigin - left;
+                }
+
+                BarSegment segment = (x2 < xOrigin) ? BarSegment.Left : BarSegment.LeftPartial;
+
+                RenderFullHBar(g, rd, r, r2, bk, lstyle, segment);
+            }
+        }
+
+        #endregion
+
+        #region RenderFullHBar
+
+        private void RenderFullHBar(Graphics g, BarRenderData rd,
+            Rectangle r, Rectangle r2, Background bk, ChartLineVisualStyle lstyle, BarSegment segment)
+        {
+            if (r2.Width > 0 && r2.Height > 0)
+            {
+                ChartXy chartXy = rd.ChartXy;
+                ChartControl chartControl = ChartControl;
+
+                if (chartControl.DoPreRenderSeriesBarEvent(g, chartXy, this, rd.Sp, r, r2, segment) == false)
+                {
+                    using (Brush br = bk.GetBrush(r2))
+                        g.FillRectangle(br, r);
+
+                    int lw = 0;
+
+                    if (lstyle.LinePattern != LinePattern.None)
+                    {
+                        SmoothingMode sm = g.SmoothingMode;
+                        g.SmoothingMode = SmoothingMode.None;
+
+                        using (Pen pen = new Pen(lstyle.LineColor, Dpi.Width(lstyle.LineWidth)))
+                        {
+                            lw = (int)pen.Width;
+
+                            if (lstyle.LinePattern != LinePattern.NotSet)
+                                pen.DashStyle = (DashStyle)lstyle.LinePattern;
+
+                            g.DrawRectangle(pen, r);
+                        }
+
+                        g.SmoothingMode = sm;
+                    }
+
+                    if (rd.BarShading == true)
+                    {
+                        Rectangle t = r;
+                        t.Inflate(-lw / 2, -lw / 2);
+
+                        t.Width++;
+                        t.Height++;
+
+                        RenderHBarShading(g, t, r2, segment);
+                    }
+
+                    chartControl.DoPostRenderSeriesBarEvent(g, chartXy, this, rd.Sp, r, r2, segment);
+                }
+            }
+        }
+
+        #region RenderHBarShading
+
+        private void RenderHBarShading(
+            Graphics g, Rectangle r, Rectangle r2, BarSegment segment)
+        {
+            if (r.Width > 6)
+            {
+                SmoothingMode sm = g.SmoothingMode;
+                g.SmoothingMode = SmoothingMode.None;
+
+                int n = (int)(r.Height * .15);
+
+                Color[] colors = (Color[])BarShadingColors.Clone();
+
+                colors[2] = Color.FromArgb(Math.Max(0, colors[2].A - 30), colors[2]);
+                colors[3] = Color.FromArgb(Math.Max(0, colors[3].A - 30), colors[3]);
+
+                Rectangle r3 = r;
+
+                r3.Inflate(1, 1);
+
+                using (LinearGradientBrush lbr = new LinearGradientBrush(r3, Color.Empty, Color.Empty, 90f))
+                {
+                    lbr.WrapMode = WrapMode.Tile;
+
+                    ColorBlend cb = new ColorBlend(4);
+
+                    cb.Colors = new Color[] { colors[0], Color.Transparent, Color.Transparent, colors[1] };
+                    cb.Positions = new float[] { 0f, .25f, .75f, 1f };
+
+                    lbr.InterpolationColors = cb;
+
+                    r3.Inflate(-1, -1);
+
+                    g.FillRectangle(lbr, r3);
+                }
+
+                switch (segment)
+                {
+                    case BarSegment.LeftPartial:
+                        FillLeft(g, r, n, colors);
+                        break;
+
+                    case BarSegment.RightPartial:
+                        FillRight(g, r, n, colors);
+                        break;
+
+                    default:
+                        FillLeft(g, r, n, colors);
+                        FillRight(g, r, n, colors);
+                        break;
+                }
+
+                g.SmoothingMode = sm;
+            }
+        }
+
+        #region FillLeft
+
+        private void FillLeft(Graphics g, Rectangle r, int n, Color[] colors)
+        {
+            r.Width = n - 1;
+            r.Inflate(1, 0);
+
+            using (LinearGradientBrush lbr = new LinearGradientBrush(r, colors[2], Color.Transparent, 0f))
+            {
+                lbr.WrapMode = WrapMode.TileFlipX;
+
+                r.X++;
+
+                g.FillRectangle(lbr, r);
+            }
+        }
+
+        #endregion
+
+        #region FillRight
+
+        private void FillRight(Graphics g, Rectangle r, int n, Color[] colors)
+        {
+            r.X = r.Right - n;
+            r.Width = n;
+            r.Inflate(1, 0);
+
+            using (LinearGradientBrush lbr = new LinearGradientBrush(r, colors[2], Color.Transparent, 180f))
+            {
+                r.X++;
+                r.Width--;
+
+                g.FillRectangle(lbr, r);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region RenderVBarPlot
+
+        private void RenderVBarPlot(Graphics g,
+            ChartXy chartXy, SortedSeriesPoints ssp, ChartSeriesVisualStyle sstyle)
+        {
+            PointData pd = GatherSeriesPoints(chartXy, ssp, 0, ssp.Count, false);
+
+            if (pd.Points.Count > 0)
+            {
+                g.RenderingOrigin = chartXy.GetLocalAdjustedPoint(Point.Empty);
+
+                BarRenderData rd = new BarRenderData(chartXy, AxisY ?? chartXy.AxisY);
+
+                rd.FillRange = GetBarFillRange(chartXy);
+                rd.BarShading = GetBarShading(chartXy);
+
+                rd.SeriesStyle = sstyle;
+
+                int index = 0;
+                bool isHistogram = false;
+
+                if (chartXy.BarShowAsHistogram == Tbool.True)
+                {
+                    ChartAxis axisX = AxisX ?? chartXy.AxisX;
+                    AxisBar axisBar = axisX.AxisBars[(int)AxisBarType.Bar];
+
+                    if (axisBar.BarCount == 1)
+                    {
+                        TickmarkLayout layout = axisX.TickmarkLayout;
+
+                        for (int i = 0; i < layout.Ticks.Length; i++)
+                        {
+                            if (layout.Ticks[i].LabelIndex >= 0)
+                            {
+                                index = i;
+                                break;
+                            }
+                        }
+
+                        isHistogram = true;
+                    }
+                }
+
+                for (int i = 0; i < pd.Points.Count; i++)
+                {
+                    Point[] pts = pd.Points[i];
+                    SeriesPoint[] spts = pd.SeriesPoints[i];
+
+                    for (int j = 0; j < pts.Length; j++)
+                    {
+                        rd.Spt = pts[j];
+                        rd.Sp = spts[j];
+
+                        RenderVBar(g, rd, isHistogram, j + index);
+                    }
+                }
+            }
+        }
+
+        #region RenderVBar
+
+        private void RenderVBar(
+            Graphics g, BarRenderData rd, bool isHistogram, int index)
+        {
+            ChartXy chartXy = rd.ChartXy;
+            SeriesPoint sp = rd.Sp;
+            Point spt = rd.Spt;
+
+            sp.PointSize = new Size(BarWidth, 5);
+
+            int x = (int)(spt.X + BarOffset - BarWidth / 2);
+            int width = BarWidth;
+
+            if (isHistogram == true)
+                x = GetHistogramSizeX(chartXy, spt, index, out width);
+
+            int y1 = spt.Y;
+            int y2 = GetVBarStart(chartXy, sp);
+            int yOrigin = GetVBarOrigin(chartXy, rd.Axis, sp);
+
+            if (y1 > y2)
+            {
+                int ytemp = y1;
+                y1 = y2;
+                y2 = ytemp;
+            }
+
+            if (y2 <= yOrigin)
+            {
+                RenderAscendingBar(g, rd, x, width, y1, y2, yOrigin);
+            }
+            else if (y1 >= yOrigin)
+            {
+                RenderDescendingBar(g, rd, x, width, y1, y2, yOrigin);
+            }
+            else
+            {
+                RenderAscendingBar(g, rd, x, width, y1, yOrigin, yOrigin);
+                RenderDescendingBar(g, rd, x, width, yOrigin, y2, yOrigin);
+            }
+        }
+
+        #region GetHistogramSizeX
+
+        private int GetHistogramSizeX(
+            ChartXy chartXy, Point spt, int index, out int width)
+        {
+            ChartAxis axis = AxisX ?? chartXy.AxisX;
+            TickmarkLayout layout = axis.TickmarkLayout;
+
+            if (index < layout.Ticks.Length)
+                width = layout.Ticks[index + 1].TickPoint.X - spt.X;
+            else
+                width = (int)layout.MajorInterval;
+
+            int x = spt.X - (int)(layout.MajorInterval / 2);
+
+            return (x);
+        }
+
+        #endregion
+
+        #region GetVBarStart
+
+        internal int GetVBarStart(ChartXy chartXy, SeriesPoint sp)
+        {
+            ChartAxis axis = AxisY ?? chartXy.AxisY;
+
+            object value = ((sp.ValueY != null && sp.ValueY.Length > 1)
+                ? sp.ValueY[1] : (chartXy.BarOrigin ?? null));
+
+            if (value == null)
+            {
+                if (axis.ScaleType == ScaleType.Quantitative)
+                    value = 0;
+                else
+                    value = axis.ActualMinValue;
+            }
+
+            return (chartXy.GetDataPointY(axis, value));
+        }
+
+        #endregion
+
+        #region GetVBarOrigin
+
+        private int GetVBarOrigin(
+            ChartXy chartXy, ChartAxis axis, SeriesPoint sp)
+        {
+            object value = ((sp.ValueY != null && sp.ValueY.Length > 2)
+                ? sp.ValueY[2] : (chartXy.BarOrigin ?? null));
+
+            if (value == null)
+            {
+                if (axis.ScaleType == ScaleType.Quantitative)
+                    value = 0;
+                else
+                    value = axis.ActualMinValue;
+            }
+
+            return (chartXy.GetDataPointY(axis, value));
+        }
+
+        #endregion
+
+        #region RenderAscendingBar
+
+        private void RenderAscendingBar(Graphics g,
+            BarRenderData rd, int x, int width, int y1, int y2, int yOrigin)
+        {
+            Rectangle r = new Rectangle(x, y1, Math.Max(1, width - 1), y2 - y1);
+
+            if (r.IntersectsWith(RenderBounds))
+            {
+                Background bk = rd.SeriesStyle.BarVisualStyle.Background;
+                ChartLineVisualStyle lstyle = rd.SeriesStyle.BarVisualStyle.Border;
+
+                Rectangle r2 = r;
+
+                if (rd.FillRange == BarFillRange.BySeries)
+                {
+                    int top = rd.ChartXy.GetDataPointY(rd.Axis, MaxValueY);
+
+                    r2.Y = top;
+                    r2.Height = yOrigin - top;
+                }
+
+                BarSegment segment = (y2 < yOrigin) ? BarSegment.Top : BarSegment.TopPartial;
+
+                RenderFullVBar(g, rd, r, r2, bk, lstyle, segment);
+            }
+        }
+
+        #endregion
+
+        #region RenderDescendingBar
+
+        private void RenderDescendingBar(Graphics g,
+            BarRenderData rd, int x, int width, int y1, int y2, int yOrigin)
+        {
+            Rectangle r = new Rectangle(x, y1, Math.Max(1, width - 1), y2 - y1);
+
+            if (r.IntersectsWith(RenderBounds))
+            {
+                ChartSeriesVisualStyle sstyle = rd.SeriesStyle;
+
+                Background bk = sstyle.BarVisualStyle.AlternateBackground;
+
+                if (bk.IsEmpty)
+                    bk = sstyle.BarVisualStyle.Background;
+
+                ChartLineVisualStyle lstyle = sstyle.BarVisualStyle.AlternateBorder;
+
+                if (lstyle.IsEmpty)
+                    lstyle = sstyle.BarVisualStyle.Border;
+
+                Rectangle r2 = r;
+
+                if (GetBarFillRange(rd.ChartXy) == BarFillRange.BySeries)
+                {
+                    r2.Y = yOrigin;
+                    r2.Height = rd.ChartXy.GetDataPointY(rd.Axis, MinValueY) - r2.Y;
+                }
+
+                BarSegment segment = (y1 > yOrigin) ? BarSegment.Bottom : BarSegment.BottomPartial;
+
+                RenderFullVBar(g, rd, r, r2, bk, lstyle, segment);
+            }
+        }
+
+        #endregion
+
+        #region RenderFullVBar
+
+        private void RenderFullVBar(Graphics g, BarRenderData rd,
+            Rectangle r, Rectangle r2, Background bk, ChartLineVisualStyle lstyle, BarSegment segment)
+        {
+            if (r2.Width > 0 && r2.Height > 0)
+            {
+                ChartXy chartXy = rd.ChartXy;
+                ChartControl chartControl = ChartControl;
+
+                if (chartControl.DoPreRenderSeriesBarEvent(g, chartXy, this, rd.Sp, r, r2, segment) == false)
+                {
+                    using (Brush br = bk.GetBrush(r2))
+                        g.FillRectangle(br, r);
+
+                    int lw = 0;
+
+                    if (lstyle.LinePattern != LinePattern.None)
+                    {
+                        SmoothingMode sm = g.SmoothingMode;
+                        g.SmoothingMode = SmoothingMode.None;
+
+                        using (Pen pen = new Pen(lstyle.LineColor, Dpi.Width(lstyle.LineWidth)))
+                        {
+                            lw = (int)pen.Width;
+
+                            if (lstyle.LinePattern != LinePattern.NotSet)
+                                pen.DashStyle = (DashStyle)lstyle.LinePattern;
+
+                            g.DrawRectangle(pen, r);
+                        }
+
+                        g.SmoothingMode = sm;
+                    }
+
+                    if (rd.BarShading == true)
+                    {
+                        Rectangle t = r;
+                        t.Inflate(-lw / 2, -lw / 2);
+
+                        t.Width++;
+                        t.Height++;
+
+                        RenderVBarShading(g, t, r2, segment);
+                    }
+
+                    chartControl.DoPostRenderSeriesBarEvent(g, chartXy, this, rd.Sp, r, r2, segment);
+                }
+            }
+        }
+
+        #region RenderVBarShading
+
+        private void RenderVBarShading(
+            Graphics g, Rectangle r, Rectangle r2, BarSegment segment)
+        {
+            int n = r.Width / 10 + 1;
+
+            if (r.Width > 6 && r.Height > n)
+            {
+                SmoothingMode sm = g.SmoothingMode;
+                g.SmoothingMode = SmoothingMode.None;
+
+                Color[] colors = (Color[])BarShadingColors.Clone();
+
+                Rectangle r3 = r;
+
+                using (LinearGradientBrush lbr = new LinearGradientBrush(r3, Color.Empty, Color.Empty, 0f))
+                {
+                    lbr.WrapMode = WrapMode.TileFlipX;
+
+                    ColorBlend cb = new ColorBlend(4);
+
+                    cb.Colors = new Color[] { colors[2], Color.Transparent, Color.Transparent, colors[3] };
+                    cb.Positions = new float[] { 0f, .15f, .85f, 1f };
+
+                    lbr.InterpolationColors = cb;
+
+                    g.FillRectangle(lbr, r3);
+                }
+
+                switch (segment)
+                {
+                    case BarSegment.TopPartial:
+                        FillTop(g, r, n, colors);
+                        break;
+
+                    case BarSegment.BottomPartial:
+                        FillBottom(g, r, n, colors);
+                        break;
+
+                    default:
+                        FillTop(g, r, n, colors);
+                        FillBottom(g, r, n, colors);
+                        break;
+                }
+
+                g.SmoothingMode = sm;
+            }
+        }
+
+        #region FillTop
+
+        private void FillTop(Graphics g, Rectangle r, int n, Color[] colors)
+        {
+            using (Pen pen = new Pen(colors[0]))
+            {
+                Point pt1 = new Point(r.X + 1, r.Y);
+                Point pt2 = new Point(r.Right - 2, r.Y);
+
+                for (int i = 0; i < n; i++)
+                {
+                    g.DrawLine(pen, pt1, pt2);
+
+                    pt1.X++;
+                    pt2.X--;
+
+                    pt1.Y++;
+                    pt2.Y++;
+                }
+            }
+        }
+
+        #endregion
+
+        #region FillBottom
+
+        private void FillBottom(Graphics g, Rectangle r, int n, Color[] colors)
+        {
+            using (Pen pen = new Pen(colors[1]))
+            {
+                Point pt1 = new Point(r.X + 1, r.Bottom - 1);
+                Point pt2 = new Point(r.Right - 2, r.Bottom - 1);
+
+                for (int i = 0; i < n; i++)
+                {
+                    g.DrawLine(pen, pt1, pt2);
+
+                    pt1.X++;
+                    pt2.X--;
+
+                    pt1.Y--;
+                    pt2.Y--;
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region GetBarFillRange
+
+        private BarFillRange GetBarFillRange(ChartXy chartXy)
+        {
+            BarFillRange fillRange = BarFillRange;
+
+            if (fillRange == BarFillRange.NotSet)
+                fillRange = chartXy.BarFillRange;
+
+            return ((fillRange != BarFillRange.NotSet)
+                ? fillRange : BarFillRange.ByBar);
+        }
+
+        #endregion
+
+        #region GetBarLabelPosition
+
+        internal BarLabelPosition GetBarLabelPosition(ChartXy chartXy)
+        {
+            BarLabelPosition labelPos = BarLabelPosition;
+
+            if (labelPos == BarLabelPosition.NotSet)
+                labelPos = chartXy.BarLabelPosition;
+
+            return ((labelPos != BarLabelPosition.NotSet)
+                ? labelPos : BarLabelPosition.Center);
+        }
+
+        #endregion
+
+        #region GetBarShading
+
+        private bool GetBarShading(ChartXy chartXy)
+        {
+            Tbool barShading = BarShadingEnabled;
+
+            if (barShading == Tbool.NotSet)
+                barShading = chartXy.BarShadingEnabled;
+
+            return (barShading == Tbool.True);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderBubblePlot
+
+        private void RenderBubblePlot(Graphics g,
+            ChartXy chartXy, SortedSeriesPoints ssp, ChartSeriesVisualStyle sstyle)
+        {
+            BubblePlotData bdata = _PlotData as BubblePlotData;
+
+            if (bdata != null)
+            {
+                double minIntensity = 32;
+                double maxIntensity = 255;
+
+                PointMarkerVisualStyle pstyle = sstyle.MarkerVisualStyle;
+                PointMarkerVisualStyle hstyle = GetHighlightStyle(chartXy, sstyle);
+
+                if (DisplayLinePointsOnTop == true)
+                    RenderConvexHull(g, chartXy, ssp, sstyle, pstyle);
+
+                BubbleIntensityMode imode = GetBubbleIntensityMode(chartXy);
+
+                for (int i = 0; i < ssp.Count; i++)
+                {
+                    SeriesPoint sp = ssp[i];
+
+                    if (sp.Visible == true)
+                    {
+                        int size = sp.PointSize.Width;
+
+                        Point pt = chartXy.GetDataPointNa(this, sp, 0);
+                        Rectangle r = new Rectangle(pt.X - size / 2, pt.Y - size / 2, size, size);
+
+                        if (r.IntersectsWith(RenderBounds))
+                        {
+                            Point ppt = chartXy.GetLocalAdjustedPoint(pt);
+
+                            bool isCrossPoint = chartXy.IsCrosshairSeriesPoint(this, ppt);
+                            int intensity = GetIntensity(sp, imode, bdata, minIntensity, maxIntensity);
+
+                            PointMarkerVisualStyle style = (hstyle != null && isCrossPoint) ? hstyle : pstyle;
+
+                            Image image = style.GetPointMarkerImage();
+
+                            if (image == null)
+                                image = GetPointMarker(g, style, r.Size);
+
+                            if (image != null)
+                            {
+                                g.DrawImage(image, r);
+                            }
+                            else if (style.Type == PointMarkerType.Ellipse || style.Type == PointMarkerType.NotSet)
+                            {
+                                using (Brush br = style.Background.GetBrush(r, intensity))
+                                {
+                                    g.FillEllipse(br, r);
+
+                                    if (style.BorderColor.IsEmpty == false && style.BorderWidth > 0)
+                                    {
+                                        using (Pen pen = new Pen(style.BorderColor, Dpi.Width(style.BorderWidth)))
+                                            g.DrawEllipse(pen, r);
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+
+                if (DisplayLinePointsOnTop == false)
+                    RenderConvexHull(g, chartXy, ssp, sstyle, pstyle);
+
+                if (hstyle != null)
+                    hstyle.Dispose();
+            }
+        }
+
+        #region GetIntensity
+
+        private int GetIntensity(SeriesPoint sp,
+            BubbleIntensityMode imode, BubblePlotData bdata, double minIntensity, double maxIntensity)
+        {
+            if (imode != BubbleIntensityMode.None && imode != BubbleIntensityMode.NotSet)
+            {
+                if (sp.ValueY.Length > 2)
+                {
+                    double intensity = -1;
+
+                    if (sp.ValueY[2] is double)
+                        intensity = (double)sp.ValueY[2];
+
+                    else if (sp.ValueY[2] is int)
+                        intensity = Convert.ToDouble(sp.ValueY[2]);
+
+                    if (imode == BubbleIntensityMode.Alpha)
+                        return ((int)intensity);
+
+                    if (intensity >= 0)
+                    {
+                        double range = maxIntensity - minIntensity;
+                        double intensityRange = bdata.MaxIntensity - bdata.MinIntensity;
+
+                        if (intensityRange <= 0)
+                            return (-1);
+
+                        return (int)(((intensity - bdata.MinIntensity) * range) / intensityRange + minIntensity);
+                    }
+                }
+            }
+
+            return (-1);
+        }
+
+        #endregion
+
+        #region GetBubbleSizeMode
+
+        private BubbleSizeMode GetBubbleSizeMode(ChartXy chartXy)
+        {
+            if (BubbleSizeMode != BubbleSizeMode.NotSet)
+                return (BubbleSizeMode);
+
+            if (chartXy.BubbleSizeMode != BubbleSizeMode.NotSet)
+                return (chartXy.BubbleSizeMode);
+
+            return (BubbleSizeMode.Area);
+        }
+
+        #endregion
+
+        #region GetBubbleIntensityMode
+
+        private BubbleIntensityMode GetBubbleIntensityMode(ChartXy chartXy)
+        {
+            if (BubbleIntensityMode != BubbleIntensityMode.NotSet)
+                return (BubbleIntensityMode);
+
+            if (chartXy.BubbleIntensityMode != BubbleIntensityMode.NotSet)
+                return (chartXy.BubbleIntensityMode);
+
+            return (BubbleIntensityMode.None);
+        }
+
+        #endregion
+
+        #region GetPointMarker
+
+        internal Image GetPointMarker(Graphics g, PointMarkerVisualStyle style, Size size)
+        {
+            if (style.Type == PointMarkerType.NotSet ||
+                style.Type == PointMarkerType.None || style.Type == PointMarkerType.Ellipse)
+            {
+                return (null);
+            }
+
+            if (_PointMarker == null)
+                _PointMarker = new PointMarker();
+
+            return (_PointMarker.GetMarkerBitmap(g, style.Type, style.PointCount,
+                size, style.Rotation, style.Background, style.BorderColor, style.BorderWidth));
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderDotPlot
+
+        #region RenderHDotPlot
+
+        private void RenderHDotPlot(Graphics g,
+            ChartXy chartXy, SortedSeriesPoints ssp, ChartSeriesVisualStyle sstyle)
+        {
+            Image marker = PointMarkerImage;
+
+            if (marker != null)
+            {
+                Size maxSize = chartXy.GetMaxDotPlotMarkerSize();
+
+                for (int i = 0; i < ssp.Count; i++)
+                {
+                    SeriesPoint sp = ssp[i];
+
+                    if (sp.Visible == true)
+                    {
+                        object pointValueX = chartXy.GetDataPointValueX(this, sp);
+
+                        Point pt = chartXy.GetPointFromValue(this, 0, pointValueX);
+
+                        Point ppt = new Point(pt.X + maxSize.Width / 2, pt.Y);
+
+                        int dcount = ssp.CountArray[i];
+
+                        for (int j = 0; j < dcount; j++)
+                        {
+                            RenderPointMarker(g, chartXy, sp, ppt, maxSize, marker);
+
+                            ppt.X += maxSize.Width;
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region RenderVDotPlot
+
+        private void RenderVDotPlot(Graphics g,
+            ChartXy chartXy, SortedSeriesPoints ssp, ChartSeriesVisualStyle sstyle)
+        {
+            Image marker = PointMarkerImage;
+
+            if (marker != null)
+            {
+                Size maxSize = chartXy.GetMaxDotPlotMarkerSize();
+
+                for (int i = 0; i < ssp.Count; i++)
+                {
+                    SeriesPoint sp = ssp[i];
+
+                    if (sp.Visible == true)
+                    {
+                        Point pt = chartXy.GetDataPointNa(this, sp, -1);
+                        Point ppt = new Point(pt.X, pt.Y - maxSize.Height / 2);
+
+                        int dcount = ssp.CountArray[i];
+
+                        for (int j = 0; j < dcount; j++)
+                        {
+                            RenderPointMarker(g, chartXy, sp, ppt, maxSize, marker);
+
+                            ppt.Y -= maxSize.Height;
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region GetDotCount
+
+        private int GetDotCount(SeriesPoint sp)
+        {
+            if (sp.ValueY != null && sp.ValueY.Length > 0)
+            {
+                int count = 0;
+
+                foreach (object o in sp.ValueY)
+                {
+                    if (o is int)
+                        count += (int)o;
+
+                    else if (o is double)
+                        count += (int)Convert.ChangeType(o, typeof(int));
+                }
+
+                return (count);
+            }
+
+            return (1);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderPointPlot
+
+        private void RenderPointPlot(Graphics g, ChartXy chartXy,
+            SortedSeriesPoints ssp, bool showHull, ChartSeriesVisualStyle sstyle)
+        {
+            PointData pd = GatherSeriesPoints(chartXy, ssp, 0, ssp.Count, true);
+
+            if (pd.Points.Count > 0)
+            {
+                PointMarkerVisualStyle pstyle = sstyle.MarkerVisualStyle;
+                PointMarkerVisualStyle hstyle = GetHighlightStyle(chartXy, sstyle);
+
+                if (showHull == true)
+                    RenderConvexHull(g, chartXy, ssp, sstyle, pstyle);
+
+                if (hstyle == null)
+                {
+                    Image marker = chartXy.GetPointMarker(g, pstyle);
+
+                    if (marker != null)
+                    {
+                        for (int i = 0; i < pd.Points.Count; i++)
+                        {
+                            Point[] pts = pd.Points[i];
+                            SeriesPoint[] spts = pd.SeriesPoints[i];
+
+                            for (int j = 0; j < pts.Length; j++)
+                                RenderPointMarker(g, chartXy, spts[j], pts[j], Size.Empty, marker);
+                        }
+                    }
+                }
+                else
+                {
+                    bool highlightSinglePoint = HighLightSinglePoint(chartXy);
+
+                    Image highlightMarker = GetHighlightImage(g, chartXy, hstyle);
+
+                    for (int i = 0; i < pd.Points.Count; i++)
+                    {
+                        Point[] pts = pd.Points[i];
+                        SeriesPoint[] spts = pd.SeriesPoints[i];
+
+                        for (int j = 0; j < pts.Length; j++)
+                        {
+                            Point ppt = pts[j];
+                            Point ppt2 = chartXy.GetLocalAdjustedPoint(ppt);
+
+                            Image marker = PointMarkerImage;
+
+                            if (highlightMarker != null)
+                            {
+                                if (chartXy.IsCrosshairSeriesPoint(this, ppt2) == true)
+                                {
+                                    marker = highlightMarker;
+
+                                    if (highlightSinglePoint == true)
+                                        highlightMarker = null;
+                                }
+                            }
+
+                            RenderPointMarker(g, chartXy, spts[j], ppt, Size.Empty, marker);
+                        }
+                    }
+                }
+
+                if (ShowEmptyPoints == true)
+                    RenderEmptyPoints(g, chartXy, pd, sstyle);
+            }
+        }
+
+        #region RenderPointMarker
+
+        private void RenderPointMarker(Graphics g,
+            ChartXy chartXy, SeriesPoint sp, Point pt, Size maxSize, Image marker)
+        {
+            if (marker != null)
+            {
+                ChartControl control = ChartControl;
+
+                Image ptMarker = marker;
+
+                Size markerSize = marker.Size;
+                Size size = maxSize.IsEmpty ? markerSize : maxSize;
+
+                sp.PointSize = size;
+
+                Point ptc = new Point(
+                    pt.X - markerSize.Width / 2,
+                    pt.Y - markerSize.Height / 2);
+
+                Rectangle r = new Rectangle(ptc, markerSize);
+
+                if (r.IntersectsWith(RenderBounds))
+                {
+                    if (control.DoPreRenderSeriesPointEvent(g,
+                        chartXy, this, sp, pt, size, ref ptMarker) == false)
+                    {
+                        if (ptMarker != null)
+                        {
+                            g.DrawImageUnscaled(ptMarker, ptc);
+
+                            control.DoPostRenderSeriesPointEvent(g,
+                                chartXy, this, sp, pt, ptMarker.Size, ptMarker);
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region RenderConvexHull
+
+        private void RenderConvexHull(Graphics g, ChartXy chartXy,
+            SortedSeriesPoints ssp, ChartSeriesVisualStyle sstyle, PointMarkerVisualStyle pstyle)
+        {
+            ConvexHullDisplayMode mode = GetConvexHullDisplayMode(chartXy);
+
+            if (mode != ConvexHullDisplayMode.None)
+            {
+                if (_ConvexHullPoints == null)
+                {
+                    PointData pd = GatherSeriesPointsEx(chartXy, ssp, 0, ssp.Count, true);
+
+                    _ConvexHullPoints = ConvexHull.GetConvexHull(
+                        (pd.Points.Count == 1) ? pd.Points[0] : CombineListPoints(pd.Points));
+                }
+
+                if (_ConvexHullPoints.Length > 3)
+                {
+                    using (GraphicsPath path = new GraphicsPath())
+                    {
+                        path.AddPolygon(_ConvexHullPoints);
+
+                        if ((mode & ConvexHullDisplayMode.DisplayBackground) == ConvexHullDisplayMode.DisplayBackground)
+                        {
+                            Rectangle r = Rectangle.Round(path.GetBounds());
+
+                            Background bg = (sstyle.ConvexHullBackground.IsEmpty)
+                                ? pstyle.Background : sstyle.ConvexHullBackground;
+
+                            using (Brush br = bg.GetBrush(r))
+                                g.FillPath(br, path);
+                        }
+
+                        if ((mode & ConvexHullDisplayMode.DisplayBorder) == ConvexHullDisplayMode.DisplayBorder)
+                        {
+                            Color color;
+                            int width;
+                            LinePattern pattern;
+
+                            if (sstyle.ConvexHullLineStyle.IsEmpty == false)
+                            {
+                                color = sstyle.ConvexHullLineStyle.LineColor;
+                                width = sstyle.ConvexHullLineStyle.LineWidth;
+                                pattern = sstyle.ConvexHullLineStyle.LinePattern;
+                            }
+                            else
+                            {
+                                color = pstyle.BorderColor;
+                                width = pstyle.BorderWidth;
+                                pattern = LinePattern.Solid;
+                            }
+
+                            if (pattern != LinePattern.None)
+                            {
+                                using (Pen pen = new Pen(color, Dpi.Width(width)))
+                                {
+                                    if (pattern != LinePattern.NotSet)
+                                        pen.DashStyle = (DashStyle)pattern;
+
+                                    g.DrawPath(pen, path);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        #region GetConvexHullDisplayMode
+
+        private ConvexHullDisplayMode GetConvexHullDisplayMode(ChartXy chartXy)
+        {
+            if (ConvexHullDisplayMode != ConvexHullDisplayMode.NotSet)
+                return (ConvexHullDisplayMode);
+
+            ConvexHullDisplayMode mode = chartXy.ConvexHullDisplayMode;
+
+            if (mode != ConvexHullDisplayMode.NotSet)
+                return (mode);
+
+            return (ConvexHullDisplayMode.None);
+        }
+
+        #endregion
+
+        #region CombineListPoints
+
+        private Point[] CombineListPoints(List<Point[]> plist)
+        {
+            int n = 0;
+
+            foreach (Point[] points in plist)
+                n += points.Length;
+
+            Point[] fpoints = new Point[n];
+
+            n = 0;
+
+            foreach (Point[] points in plist)
+            {
+                for (int i = 0; i < points.Length; i++)
+                    fpoints[n++] = points[i];
+            }
+
+            return (fpoints);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderEmptyPoints
+
+        private void RenderEmptyPoints(Graphics g,
+            ChartXy chartXy, PointData pd, ChartSeriesVisualStyle sstyle)
+        {
+            PointData epd = _EmptyPointData;
+
+            if (epd != null && epd.Points.Count > 0)
+            {
+                PointMarkerVisualStyle pstyle = sstyle.MarkerEmptyVisualStyle;
+
+                Image marker = GetEmptyMarkerImage(g, chartXy, pstyle);
+
+                if (marker != null)
+                {
+                    for (int i = 0; i < epd.Points.Count; i++)
+                    {
+                        Point[] epts = epd.Points[i];
+                        SeriesPoint[] septs = epd.SeriesPoints[i];
+
+                        Point[] pts = GetEmptyPointRange(epts[0]);
+
+                        int run = pts[0].X - pts[1].X;
+                        int rise = pts[0].Y - pts[1].Y;
+
+                        double slope = (run != 0) ? (double)rise / run : 0;
+                        double b = pts[0].Y - (slope * pts[0].X);
+
+                        for (int j = 0; j < epts.Length; j++)
+                        {
+                            Point ept = epts[j];
+                            SeriesPoint sept = septs[j];
+
+                            Point ppt = new Point(ept.X, (int)(slope * ept.X + b));
+
+                            RenderPointMarker(g, chartXy, sept, ppt, Size.Empty, marker);
+                        }
+                    }
+                }
+            }
+        }
+
+        #region GetEmptyPointRange
+
+        private Point[] GetEmptyPointRange(Point pt)
+        {
+            Point[] pts = new Point[2];
+
+            pts[0] = Point.Empty;
+            pts[1] = Point.Empty;
+
+            PointData pd = _PointData;
+
+            for (int i = 0; i < pd.Points.Count; i++)
+            {
+                Point[] lps = pd.Points[i];
+
+                if (pt.X <= lps[0].X)
+                {
+                    pts[1] = lps[0];
+
+                    if (i == 0)
+                        pts[0] = pts[1];
+
+                    return (pts);
+                }
+
+                pts[0] = lps[lps.Length - 1];
+            }
+
+            pts[1] = pts[0];
+
+            return (pts);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region RenderLinePlot
+
+        private void RenderLinePlot(Graphics g,
+            ChartXy chartXy, SortedSeriesPoints ssp, ChartSeriesVisualStyle sstyle)
+        {
+            PointData pd = GatherSeriesPoints(chartXy, ssp, 0, ssp.Count, false);
+
+            if (pd.Points.Count > 0)
+            {
+                ChartLineDisplayMode lineMode = GetLineDisplayMode(chartXy);
+                ChartLineAreaDisplayMode areaMode = GetAreaDisplayMode(chartXy);
+
+                PointMarkerVisualStyle pstyle = sstyle.MarkerVisualStyle;
+
+                RenderConvexHull(g, chartXy, ssp, sstyle, pstyle);
+
+                if (DisplayLinePointsOnTop == true)
+                    RenderLinePlotLines(g, chartXy, pd, lineMode, areaMode, sstyle);
+
+                if ((lineMode & ChartLineDisplayMode.DisplayPoints) == ChartLineDisplayMode.DisplayPoints)
+                {
+                    RenderPointPlot(g, chartXy, ssp, false, sstyle);
+                }
+                else
+                {
+                    if (ShowEmptyPoints == true)
+                        RenderEmptyPoints(g, chartXy, pd, sstyle);
+
+                    RenderPointLabelPoints(g, chartXy, sstyle);
+
+                    if (HighLightPoints(chartXy) == true)
+                        RenderHighlightPoints(g, chartXy, pd, sstyle);
+                }
+
+                if (DisplayLinePointsOnTop == false)
+                    RenderLinePlotLines(g, chartXy, pd, lineMode, areaMode, sstyle);
+            }
+        }
+
+        #region RenderPointLabelPoints
+
+        private void RenderPointLabelPoints(Graphics g,
+            ChartXy chartXy, ChartSeriesVisualStyle sstyle)
+        {
+            List<PointLabelGroup> pointLabels = chartXy.PointLabels;
+
+            if (pointLabels != null && pointLabels.Count > 0)
+            {
+                foreach (PointLabelGroup lg in pointLabels)
+                {
+                    if (lg.ChartSeries == this)
+                    {
+                        PointMarkerVisualStyle pstyle = sstyle.MarkerVisualStyle;
+
+                        Image marker = chartXy.GetPointMarker(g, pstyle);
+
+                        if (marker != null)
+                        {
+                            Size size = marker.Size;
+
+                            for (int i = 0; i < lg.PointLabels.Count; i++)
+                            {
+                                PointLabel pl = lg.PointLabels[i];
+
+                                if (pl.Visible == true && pl.SeriesPoint.IsEmpty == false)
+                                {
+                                    DataLabelVisualStyle dstyle = GetPointLabelVisualStyle(pl);
+
+                                    if (dstyle.DrawPointMarker != Tbool.False)
+                                    {
+                                        SeriesPoint spt = pl.SeriesPoint;
+
+                                        Point ppt = pl.Point;
+                                        Point ppc = new Point(ppt.X, ppt.Y);
+
+                                        RenderPointMarker(g, chartXy, spt, ppc, Size.Empty, marker);
+                                    }
+                                }
+                            }
+                        }
+                        break;
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region RenderLinePlotLines
+
+        private void RenderLinePlotLines(Graphics g, ChartXy chartXy, PointData pd,
+            ChartLineDisplayMode lineMode, ChartLineAreaDisplayMode areaMode, ChartSeriesVisualStyle sstyle)
+        {
+            if ((lineMode & ChartLineDisplayMode.DisplayStepLine) == ChartLineDisplayMode.DisplayStepLine)
+            {
+                StepLineMode slm = GetStepLineMode(chartXy);
+
+                if (slm != StepLineMode.None)
+                    RenderStepLines(g, chartXy, pd, slm, areaMode, sstyle);
+            }
+
+            if ((lineMode & ChartLineDisplayMode.DisplayLine) == ChartLineDisplayMode.DisplayLine)
+                RenderLines(g, chartXy, pd, lineMode, areaMode, sstyle);
+
+            if ((lineMode & ChartLineDisplayMode.DisplaySpline) == ChartLineDisplayMode.DisplaySpline)
+                RenderSplines(g, chartXy, pd, lineMode, areaMode, sstyle);
+
+            if (ShowEmptyLines == true)
+            {
+                if ((lineMode & (ChartLineDisplayMode.DisplayLine | ChartLineDisplayMode.DisplaySpline)) != 0)
+                    RenderEmptyLines(g, chartXy, pd.Points, areaMode, sstyle);
+            }
+        }
+
+        #region GetStepLineMode
+
+        private StepLineMode GetStepLineMode(ChartXy chartXy)
+        {
+            StepLineMode mode = StepLineMode;
+
+            if (mode == StepLineMode.NotSet)
+                mode = chartXy.StepLineMode;
+
+            if (mode == StepLineMode.NotSet)
+                mode = StepLineMode.HorizontalThenVertical;
+
+            return (mode);
+        }
+
+        #endregion
+
+        #region RenderLines
+
+        private void RenderLines(Graphics g, ChartXy chartXy,
+            PointData pd, ChartLineDisplayMode lineMode, ChartLineAreaDisplayMode areaMode, ChartSeriesVisualStyle sstyle)
+        {
+            ChartLineVisualStyle lstyle = sstyle.LineStyle;
+
+            if (lstyle.LinePattern != LinePattern.None)
+            {
+                using (Pen pen = new Pen(lstyle.LineColor, Dpi.Width(lstyle.LineWidth)))
+                {
+                    if (lstyle.LinePattern != LinePattern.NotSet)
+                        pen.DashStyle = (DashStyle)lstyle.LinePattern;
+
+                    if ((lineMode & ChartLineDisplayMode.DisplayClosed) == ChartLineDisplayMode.DisplayClosed)
+                    {
+                        foreach (Point[] points in pd.Points)
+                        {
+                            if (points.Length > 1)
+                                g.DrawLines(pen, points);
+                        }
+
+                        Point fp = pd.Points[0][0];
+                        Point[] lps = pd.Points[pd.Points.Count - 1];
+                        Point lp = lps[lps.Length - 1];
+
+                        if (fp.Equals(lp) == false)
+                            g.DrawLine(pen, lp, fp);
+                    }
+                    else
+                    {
+                        foreach (Point[] points in pd.Points)
+                        {
+                            if (points.Length > 1)
+                            {
+                                using (GraphicsPath path = new GraphicsPath())
+                                {
+                                    path.AddLines(points);
+
+                                    if ((areaMode & ChartLineAreaDisplayMode.DisplayLine) == ChartLineAreaDisplayMode.DisplayLine)
+                                        RenderAreaBackground(g, chartXy, points, path, sstyle.LineAreaBackground);
+
+                                    g.DrawPath(pen, path);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region RenderSplines
+
+        private void RenderSplines(Graphics g, ChartXy chartXy, PointData pd,
+            ChartLineDisplayMode lineMode, ChartLineAreaDisplayMode areaMode, ChartSeriesVisualStyle sstyle)
+        {
+            ChartLineVisualStyle lstyle = sstyle.SplineStyle;
+
+            if (lstyle.LinePattern != LinePattern.None)
+            {
+                using (Pen pen = new Pen(lstyle.LineColor, Dpi.Width(lstyle.LineWidth)))
+                {
+                    if (lstyle.LinePattern != LinePattern.NotSet)
+                        pen.DashStyle = (DashStyle)lstyle.LinePattern;
+
+                    if ((pd.Points.Count == 1) &&
+                        (lineMode & ChartLineDisplayMode.DisplayClosed) == ChartLineDisplayMode.DisplayClosed)
+                    {
+                        Point[] points = pd.Points[0];
+
+                        if (points.Length > 1)
+                            g.DrawClosedCurve(pen, points);
+                    }
+                    else
+                    {
+                        foreach (Point[] points in pd.Points)
+                        {
+                            if (points.Length > 1)
+                            {
+                                using (GraphicsPath path = new GraphicsPath())
+                                {
+                                    path.AddCurve(points);
+
+                                    if ((areaMode & ChartLineAreaDisplayMode.DisplaySpline) == ChartLineAreaDisplayMode.DisplaySpline)
+                                        RenderAreaBackground(g, chartXy, points, path, sstyle.SplineAreaBackground);
+
+                                    g.DrawPath(pen, path);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region RenderStepLines
+
+        private void RenderStepLines(Graphics g, ChartXy chartXy, PointData pd,
+            StepLineMode slm, ChartLineAreaDisplayMode areaMode, ChartSeriesVisualStyle sstyle)
+        {
+            StepLines sls = GetStepLines(chartXy);
+
+            if (sls != StepLines.None)
+            {
+                PointData sd = GetStepPointData(chartXy, pd, slm);
+
+                if (sd != null)
+                {
+                    SmoothingMode sm = g.SmoothingMode;
+                    g.SmoothingMode = SmoothingMode.Default;
+
+                    ChartCapLineVisualStyle lstyle = sstyle.StepLineStyle;
+
+                    if (sls == StepLines.Both)
+                    {
+                        RenderStepLinesEx1(g, sd, lstyle);
+                    }
+                    else
+                    {
+                        int n = ((sls == StepLines.Horizontal && (slm == StepLineMode.HorizontalThenVertical || slm == StepLineMode.MidPoint)) ||
+                                 (sls == StepLines.Vertical && slm == StepLineMode.VerticalThenHorizontal)) ? 0 : 1;
+
+                        RenderStepLinesEx2(g, sd, n, lstyle);
+
+                        if (sstyle.StepLineAltStyle.IsEmpty == false)
+                            RenderStepLinesEx2(g, sd, n ^ 1, sstyle.StepLineAltStyle);
+                    }
+
+                    g.SmoothingMode = sm;
+
+                    if ((areaMode & ChartLineAreaDisplayMode.DisplayStepLine) == ChartLineAreaDisplayMode.DisplayStepLine)
+                    {
+                        foreach (Point[] points in sd.Points)
+                        {
+                            using (GraphicsPath path = new GraphicsPath())
+                            {
+                                path.AddLines(points);
+
+                                RenderAreaBackground(g, chartXy, points, path, sstyle.StepLineAreaBackground);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        #region GetStepLines
+
+        private StepLines GetStepLines(ChartXy chartXy)
+        {
+            StepLines mode = StepLines;
+
+            if (mode == StepLines.NotSet)
+                mode = chartXy.StepLines;
+
+            if (mode == StepLines.NotSet)
+                mode = StepLines.Both;
+
+            return (mode);
+        }
+
+        #endregion
+
+        #region GetStepPointData
+
+        private PointData GetStepPointData(
+            ChartXy chartXy, PointData pd, Charts.StepLineMode slm)
+        {
+            if (_LastStepLineMode != slm)
+                _StepPointData = null;
+
+            if (_StepPointData == null)
+            {
+                PointData sd = new PointData();
+
+                sd.Points = new List<Point[]>();
+
+                foreach (Point[] points in pd.Points)
+                {
+                    if (points.Length > 1)
+                        sd.Points.Add(GetStepPoints(slm, points));
+                }
+
+                _StepPointData = sd;
+
+                _LastStepLineMode = slm;
+            }
+
+            return (_StepPointData);
+        }
+
+        #region GetStepPoints
+
+        private Point[] GetStepPoints(StepLineMode slm, Point[] pts)
+        {
+            if (slm == StepLineMode.HorizontalThenVertical || slm == StepLineMode.VerticalThenHorizontal)
+            {
+                Point[] points = new Point[pts.Length * 2 - 1];
+
+                if (slm == StepLineMode.HorizontalThenVertical)
+                {
+                    for (int i = 0; i < pts.Length; i++)
+                    {
+                        int n = i * 2;
+
+                        points[n] = pts[i];
+
+                        if (i + 1 < pts.Length)
+                            points[n + 1] = new Point(pts[i + 1].X, pts[i].Y);
+                    }
+                }
+                else
+                {
+                    for (int i = 0; i < pts.Length; i++)
+                    {
+                        int n = i * 2;
+
+                        points[n] = pts[i];
+
+                        if (i + 1 < pts.Length)
+                            points[n + 1] = new Point(pts[i].X, pts[i + 1].Y);
+                    }
+                }
+
+                return (points);
+            }
+            else
+            {
+                Point[] points = new Point[pts.Length * 2];
+
+                points[0] = pts[0];
+
+                for (int i = 0; i < pts.Length - 1; i++)
+                {
+                    int n0 = i * 2 + 1;
+                    int n1 = n0 + 1;
+
+                    points[n0] = new Point((pts[i].X + pts[i + 1].X) / 2, pts[i].Y);
+                    points[n1] = new Point(points[n0].X, pts[i + 1].Y);
+                }
+
+                points[points.Length - 1] = pts[pts.Length - 1];
+
+                return (points);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderStepLinesEx1
+
+        private void RenderStepLinesEx1(Graphics g, PointData sd, ChartCapLineVisualStyle lstyle)
+        {
+            if (lstyle.LinePattern != LinePattern.None)
+            {
+                using (Pen pen = new Pen(lstyle.LineColor, Dpi.Width(lstyle.LineWidth)))
+                {
+                    if (lstyle.LinePattern != LinePattern.NotSet)
+                        pen.DashStyle = (DashStyle)lstyle.LinePattern;
+
+                    if (lstyle.StartCap != ChartLineCap.NotSet)
+                        pen.StartCap = (LineCap)lstyle.StartCap;
+
+                    if (lstyle.EndCap != ChartLineCap.NotSet)
+                        pen.EndCap = (LineCap)lstyle.EndCap;
+
+                    foreach (Point[] points in sd.Points)
+                    {
+                        if (points.Length > 1)
+                            g.DrawLines(pen, points);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region RenderStepLinesEx2
+
+        private void RenderStepLinesEx2(Graphics g,
+            PointData sd, int n, ChartCapLineVisualStyle lstyle)
+        {
+            if (lstyle.LinePattern != LinePattern.None)
+            {
+                using (Pen pen = new Pen(lstyle.LineColor, Dpi.Width(lstyle.LineWidth)))
+                {
+                    if (lstyle.LinePattern != LinePattern.NotSet)
+                        pen.DashStyle = (DashStyle)lstyle.LinePattern;
+
+                    if (lstyle.StartCap != ChartLineCap.NotSet)
+                        pen.StartCap = (LineCap)lstyle.StartCap;
+
+                    if (lstyle.EndCap != ChartLineCap.NotSet)
+                        pen.EndCap = (LineCap)lstyle.EndCap;
+
+                    foreach (Point[] points in sd.Points)
+                    {
+                        if (points.Length > 1)
+                        {
+                            for (int i = n; i < points.Length - 1; i += 2)
+                            {
+                                Point pt1 = points[i];
+                                Point pt2 = points[i + 1];
+
+                                g.DrawLine(pen, pt1, pt2);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderEmptyLines
+
+        private void RenderEmptyLines(Graphics g, ChartXy chartXy,
+            List<Point[]> lpoints, ChartLineAreaDisplayMode areaMode, ChartSeriesVisualStyle sstyle)
+        {
+            if (lpoints.Count > 1)
+            {
+                ChartLineVisualStyle lstyle = sstyle.EmptyStyle;
+
+                if (lstyle.LinePattern != LinePattern.None)
+                {
+                    Point[] points = new Point[(lpoints.Count - 1) * 2];
+                    Point[][] epoints = new Point[lpoints.Count - 1][];
+
+                    for (int i = 0; i < lpoints.Count - 1; i++)
+                    {
+                        Point[] pts1 = lpoints[i];
+                        Point[] pts2 = lpoints[i + 1];
+
+                        epoints[i] = new Point[2];
+
+                        epoints[i][0] = pts1[pts1.Length - 1];
+                        epoints[i][1] = pts2[0];
+                    }
+
+                    for (int i = 0; i < points.Length / 2; i++)
+                    {
+                        using (GraphicsPath path = new GraphicsPath())
+                        {
+                            path.AddLines(epoints[i]);
+
+                            if ((areaMode & ChartLineAreaDisplayMode.DisplayEmptyLine) == ChartLineAreaDisplayMode.DisplayEmptyLine)
+                                RenderAreaBackground(g, chartXy, epoints[i], path, sstyle.EmptyAreaBackground);
+
+                            using (Pen pen = new Pen(lstyle.LineColor, Dpi.Width(lstyle.LineWidth)))
+                            {
+                                if (lstyle.LinePattern != LinePattern.NotSet)
+                                    pen.DashStyle = (DashStyle)lstyle.LinePattern;
+
+                                g.DrawPath(pen, path);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region RenderAreaBackground
+
+        private void RenderAreaBackground(Graphics g,
+            ChartXy chartXy, Point[] points, GraphicsPath path, Background background)
+        {
+            bool backEmpty = (background == null || background.IsEmpty == true);
+
+            if (backEmpty == true)
+                background = new Background(Color.FromArgb(100, DefaultPaletteColor));
+
+            if (background != null && background.IsEmpty == false)
+            {
+                int y = chartXy.ContentBoundsEx.Bottom;
+
+                if (AreaBaseValue != null)
+                {
+                    ChartAxis axis = _AxisY ?? chartXy.AxisY;
+
+                    y = chartXy.GetDataPointY(axis, AreaBaseValue);
+                }
+
+                using (GraphicsPath path2 = new GraphicsPath())
+                {
+                    path2.AddLine(new Point(points[0].X, y), points[0]);
+                    path2.AddPath(path, true);
+                    path2.AddLine(points[points.Length - 1], new Point(points[points.Length - 1].X, y));
+
+                    path2.CloseFigure();
+
+                    Rectangle r = Rectangle.Round(path2.GetBounds());
+
+                    using (Brush br = background.GetBrush(r))
+                        g.FillPath(br, path2);
+                }
+            }
+
+            if (backEmpty == true)
+                background.Dispose();
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderHighlightPoints
+
+        private void RenderHighlightPoints(Graphics g,
+            ChartXy chartXy, PointData pd, ChartSeriesVisualStyle sstyle)
+        {
+            PointMarkerVisualStyle hstyle = GetHighlightStyle(chartXy, sstyle);
+
+            Image marker = GetHighlightImage(g, chartXy, hstyle);
+
+            if (marker != null)
+            {
+                Size size = marker.Size;
+
+                Point pt = chartXy.GetLocalAdjustedPoint(Point.Empty);
+
+                for (int i = 0; i < pd.Points.Count; i++)
+                {
+                    Point[] pts = pd.Points[i];
+                    SeriesPoint[] spts = pd.SeriesPoints[i];
+
+                    for (int j = 0; j < pts.Length; j++)
+                    {
+                        Point ppt = pts[j];
+                        Point ppc = new Point(ppt.X, ppt.Y);
+                        Point lppc = new Point(ppt.X + pt.X, ppt.Y + pt.Y);
+
+                        if (chartXy.IsCrosshairSeriesPoint(this, lppc) == true)
+                        {
+                            RenderPointMarker(g, chartXy, spts[j], ppc, Size.Empty, marker);
+
+                            if (HighLightSinglePoint(chartXy) == true)
+                                break;
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region GetLineDisplayMode
+
+        private ChartLineDisplayMode GetLineDisplayMode(ChartXy chartXy)
+        {
+            ChartLineDisplayMode mode = ChartLineDisplayMode;
+
+            if (mode == ChartLineDisplayMode.NotSet)
+                mode = chartXy.ChartLineDisplayMode;
+
+            if (mode == ChartLineDisplayMode.NotSet)
+                mode = ChartLineDisplayMode.DisplayLine;
+
+            return (mode);
+        }
+
+        #endregion
+
+        #region GetAreaDisplayMode
+
+        private ChartLineAreaDisplayMode GetAreaDisplayMode(ChartXy chartXy)
+        {
+            ChartLineAreaDisplayMode mode = ChartLineAreaDisplayMode;
+
+            if (mode == ChartLineAreaDisplayMode.NotSet)
+                mode = chartXy.ChartLineAreaDisplayMode;
+
+            if (mode == ChartLineAreaDisplayMode.NotSet)
+                mode = ChartLineAreaDisplayMode.None;
+
+            return (mode);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderStockPlot
+
+        #region RenderHStockPlot
+
+        private void RenderHStockPlot(ChartRenderInfo renderInfo,
+            ChartXy chartXy, SortedSeriesPoints ssp, ChartSeriesVisualStyle sstyle)
+        {
+            HiLoRenderData rd = new HiLoRenderData(chartXy, AxisX ?? chartXy.AxisX);
+
+            rd.SeriesStyle = sstyle;
+
+            for (int i = 0; i < ssp.Count; i++)
+            {
+                SeriesPoint sp = ssp[i];
+
+                if (sp.Visible == true)
+                {
+                    rd.Sp = sp;
+                    rd.Spt = sp.Point[0];
+                    rd.Index = i;
+
+                    RenderHStock(renderInfo, rd);
+                }
+            }
+        }
+
+        #region RenderHStock
+
+        private void RenderHStock(ChartRenderInfo renderInfo, HiLoRenderData rd)
+        {
+            Graphics g = renderInfo.Graphics;
+
+            rd.Value = GetHStockValues(rd.ChartXy, rd.Sp);
+
+            if (rd.Value[StockHigh] != int.MinValue)
+            {
+                Point pt = rd.ChartXy.GetDataPointEx(this, rd.Sp, 0);
+
+                Rectangle r = GetHBoundingRect(rd, pt);
+
+                if (r.IntersectsWith(RenderBounds) == true)
+                {
+                    int y = pt.Y + BarOffset;
+
+                    rd.Sp.PointSize = new Size(5, BarWidth / 3);
+
+                    switch (HiLoBarType)
+                    {
+                        case HiLoBarType.Box:
+                        case HiLoBarType.Candle:
+                            RenderHStockBox(g, rd, y);
+                            break;
+
+                        default:
+                            RenderHStockHiLo(g, rd, y);
+                            break;
+                    }
+                }
+            }
+        }
+
+        #region GetHBoundingRect
+
+        private Rectangle GetHBoundingRect(HiLoRenderData rd, Point pt)
+        {
+            int x1 = rd.Value[StockHigh];
+            int x2 = rd.Value[StockLow];
+
+            if (rd.Value[StockOpen] != int.MinValue)
+            {
+                if (rd.Value[StockOpen] > x1)
+                    x1 = rd.Value[StockOpen];
+
+                if (rd.Value[StockOpen] < x2)
+                    x2 = rd.Value[StockOpen];
+            }
+
+            if (rd.Value[StockClose] != int.MinValue)
+            {
+                if (rd.Value[StockClose] > x1)
+                    x1 = rd.Value[StockClose];
+
+                if (rd.Value[StockClose] < x2)
+                    x2 = rd.Value[StockClose];
+            }
+
+            int y = pt.Y + BarOffset - BarWidth / 2;
+
+            return (new Rectangle(x2, y, x1 - x2, BarWidth));
+        }
+
+        #endregion
+
+        #region RenderHStockBox
+
+        private void RenderHStockBox(Graphics g, HiLoRenderData rd, int y)
+        {
+            int x1 = rd.Value[StockClose];
+            int x2 = rd.Value[StockOpen];
+
+            if (rd.Value[StockOpen] != int.MinValue && rd.Value[StockClose] != int.MinValue)
+            {
+                if (rd.Value[StockOpen] < rd.Value[StockClose])
+                {
+                    x1 = rd.Value[StockOpen];
+                    x2 = rd.Value[StockClose];
+                }
+
+                if (rd.Value[StockLow] > x1)
+                    rd.Value[StockLow] = x1;
+
+                if (rd.Value[StockHigh] < x2)
+                    rd.Value[StockHigh] = x2;
+
+                rd.IsAlternate = (rd.Value[StockOpen] > rd.Value[StockClose]);
+
+                RenderHStockBoxWhisker(g, rd,
+                    rd.Value[StockLow], x1, y, HiLoBarSegment.LowWhisker);
+
+                RenderHStockBoxWhisker(g, rd,
+                    x2, rd.Value[StockHigh], y, HiLoBarSegment.HighWhisker);
+
+                RenderHStockBoxOpenClose(g, rd, x1, x2, y);
+            }
+            else
+            {
+                int x = (x1 != int.MinValue) ? x1 : x2;
+
+                if (x != int.MinValue)
+                {
+                    if (x > rd.Value[StockHigh])
+                        rd.Value[StockHigh] = x;
+
+                    if (x < rd.Value[StockLow])
+                        rd.Value[StockLow] = x;
+                }
+
+                if (x < rd.Value[StockHigh] && x > rd.Value[StockLow])
+                {
+                    RenderHStockBoxWhisker(g, rd, x, rd.Value[StockHigh], y, HiLoBarSegment.HighWhisker);
+                    RenderHStockBoxWhisker(g, rd, rd.Value[StockLow], x, y, HiLoBarSegment.LowWhisker);
+
+                    RenderHStockBoxOpenClose(g, rd, x, x, y);
+                }
+                else
+                {
+                    RenderHStockBoxWhisker(g, rd,
+                        rd.Value[StockLow], rd.Value[StockHigh], y, HiLoBarSegment.CenterLine);
+
+                    if (x != int.MinValue)
+                        RenderHStockBoxOpenClose(g, rd, x, x, y);
+                }
+            }
+        }
+
+        #region RenderHStockBoxWhisker
+
+        private void RenderHStockBoxWhisker(Graphics g,
+            HiLoRenderData rd, int x1, int x2, int y, HiLoBarSegment segment)
+        {
+            if (x2 > x1)
+            {
+                Point pt1 = new Point(x1, y);
+                Point pt2 = new Point(x2 + 1, y);
+
+                RenderBoxWhisker(g, rd, pt1, pt2, segment);
+            }
+        }
+
+        #endregion
+
+        #region RenderHStockBoxOpenClose
+
+        private void RenderHStockBoxOpenClose(
+            Graphics g, HiLoRenderData rd, int x1, int x2, int y)
+        {
+            if (x2 == x1)
+            {
+                x1--;
+                x2++;
+            }
+
+            x2++;
+
+            Point pt1 = new Point(x1, y - BarWidth / 2);
+            Point pt2 = new Point(x2, pt1.Y + BarWidth);
+
+            int lw = RenderStockBox(g, rd, pt1, pt2);
+
+            Rectangle r = new Rectangle(pt1.X, pt1.Y, pt2.X - pt1.X, pt2.Y - pt1.Y);
+
+            if (r.Width > 0 && r.Height > 0)
+            {
+                if (GetBarShading(rd.ChartXy) == true)
+                {
+                    ChartControl chartControl = ChartControl;
+
+                    if (chartControl.DoPreRenderSeriesHiloBarEvent(
+                        g, rd.ChartXy, this, rd, pt1, pt2, HiLoBarSegment.BarShading) == false)
+                    {
+                        RenderHBarShading(g, r, r, BarSegment.Left);
+
+                        chartControl.DoPostRenderSeriesHiLoBarEvent(
+                            g, rd.ChartXy, this, rd, pt1, pt2, HiLoBarSegment.BarShading);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderHStockBoxMedian
+
+        private void RenderHStockBoxMedian(
+            Graphics g, HiLoRenderData rd, int y, int x1, int x2)
+        {
+            if (rd.Value.Length > StockMedian)
+            {
+                int x3 = rd.Value[StockMedian];
+
+                if (x3 > x1 && x3 < x2)
+                {
+                    Point pt1 = new Point(x3, y);
+                    Point pt2 = new Point(x3, y + BarWidth - 1);
+
+                    ChartControl chartControl = ChartControl;
+
+                    if (chartControl.DoPreRenderSeriesHiloBarEvent(
+                        g, rd.ChartXy, this, rd, pt1, pt2, HiLoBarSegment.MedianLine) == false)
+                    {
+                        ChartLineVisualStyle lstyle = GetSegLineStyle(rd, HiLoBarSegment.MedianLine);
+
+                        if (lstyle.LinePattern != LinePattern.None)
+                        {
+                            using (Pen pen = new Pen(lstyle.LineColor, Dpi.Width(lstyle.LineWidth)))
+                            {
+                                if (lstyle.LinePattern != LinePattern.NotSet)
+                                    pen.DashStyle = (DashStyle)lstyle.LinePattern;
+
+                                if (lstyle.LineWidth > 1)
+                                    pt2.Y++;
+
+                                g.DrawLine(pen, pt1, pt2);
+                            }
+                        }
+
+                        chartControl.DoPostRenderSeriesHiLoBarEvent(
+                           g, rd.ChartXy, this, rd, pt1, pt2, HiLoBarSegment.MedianLine);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region RenderHStockHiLo
+
+        private void RenderHStockHiLo(Graphics g, HiLoRenderData rd, int y)
+        {
+            int x1, x2, x3, x4;
+            NormalizeHiLoValues(rd, out x1, out x2, out x3, out x4);
+
+            ChartLineVisualStyle ostyle, cstyle;
+            NormalizeHiLoStyles(rd, out ostyle, out cstyle);
+
+            if (rd.Value[StockOpen] != int.MinValue)
+            {
+                Point pt1 = new Point(x2, y - BarWidth / 2);
+                Point pt2 = new Point(pt1.X, pt1.Y + BarWidth / 2);
+
+                RenderHiLoWhisker(g, rd, pt1, pt2, ostyle, HiLoBarSegment.OpenWhisker);
+            }
+
+            if (rd.Value[StockClose] != int.MinValue)
+            {
+                Point pt1 = new Point(x3, y);
+                Point pt2 = new Point(pt1.X, pt1.Y + BarWidth / 2 + 1);
+
+                RenderHiLoWhisker(g, rd, pt1, pt2, cstyle, HiLoBarSegment.CloseWhisker);
+            }
+
+            if (rd.IsAlternate == false)
+            {
+                int x = x2;
+                x2 = x3;
+                x3 = x;
+
+                ChartLineVisualStyle style = ostyle;
+                ostyle = cstyle;
+                cstyle = ostyle;
+            }
+
+            if ((rd.IsAlternate == false && _RenderFullDefRange == true) ||
+                (rd.IsAlternate == true && _RenderFullAltRange == true))
+            {
+                RenderHiLoRange(g, rd,
+                    new Point(x1, y), new Point(x4, y), HiLoBarSegment.FullRange);
+            }
+            else
+            {
+                // Open value either not specified or is
+                // set to High value.
+
+                if (x1 == x2 && x3 != x4)
+                    x2 = x3;
+
+                if (x2 < x1)
+                {
+                    int n = (ostyle != null) ? (ostyle.LineWidth + 1) / 2 : 1;
+
+                    RenderHiLoRange(g, rd,
+                        new Point(x1, y), new Point(x2 + n, y), HiLoBarSegment.HighWhisker);
+                }
+
+                if (x3 > x4)
+                {
+                    int n = 1;
+
+                    // Low segment extends to the top.
+
+                    if (x3 == x1)
+                        n = (cstyle.LineWidth + 1) / 2;
+
+                    // We have a Center segment.
+
+                    else if (x3 != x2)
+                        n = -cstyle.LineWidth / 2;
+
+                    RenderHiLoRange(g, rd,
+                        new Point(x3 + n, y), new Point(x4, y), HiLoBarSegment.LowWhisker);
+                }
+
+                if (x2 > x3 || (x1 == x2 && x3 == x4))
+                {
+                    ChartLineVisualStyle y2Style = (x2 == rd.Value[StockOpen]) ? ostyle : cstyle;
+                    ChartLineVisualStyle y3Style = (x3 == rd.Value[StockOpen]) ? ostyle : cstyle;
+
+                    if (y2Style != null)
+                        x2 += ((y2Style.LineWidth + 1) / 2);
+
+                    if (y3Style != null)
+                        x3 -= (y3Style.LineWidth / 2);
+
+                    RenderHiLoRange(g, rd,
+                        new Point(x2, y), new Point(x3, y), HiLoBarSegment.CenterLine);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region RenderVStockPlot
+
+        private void RenderVStockPlot(ChartRenderInfo renderInfo,
+            ChartXy chartXy, SortedSeriesPoints ssp, ChartSeriesVisualStyle sstyle)
+        {
+            HiLoRenderData rd = new HiLoRenderData(chartXy, AxisY ?? chartXy.AxisY);
+
+            rd.SeriesStyle = sstyle;
+
+            for (int i = 0; i < ssp.Count; i++)
+            {
+                SeriesPoint sp = ssp[i];
+
+                if (sp.Visible == true)
+                {
+                    if (sp.ValueY.Length > 0)
+                    {
+                        rd.Sp = sp;
+                        rd.Spt = sp.Point[0];
+                        rd.Index = i;
+
+                        rd.IsAlternate = false;
+
+                        RenderVStock(renderInfo, rd);
+                    }
+                }
+            }
+        }
+
+        #region RenderVStock
+
+        private void RenderVStock(ChartRenderInfo renderInfo, HiLoRenderData rd)
+        {
+            Graphics g = renderInfo.Graphics;
+
+            rd.Value = GetVStockValues(rd.ChartXy, rd.Sp);
+
+            if (rd.Value[StockHigh] != int.MinValue)
+            {
+                Point pt = rd.ChartXy.GetDataPointEx(this, rd.Sp, 0);
+
+                Rectangle r = GetVBoundingRect(rd, pt);
+
+                if (r.IntersectsWith(RenderBounds) == true)
+                {
+                    int x = pt.X + BarOffset;
+
+                    rd.Sp.PointSize = new Size(BarWidth / 3, 5);
+
+                    switch (HiLoBarType)
+                    {
+                        case HiLoBarType.Box:
+                        case HiLoBarType.Candle:
+                            RenderVStockBox(g, rd, x);
+                            break;
+
+                        default:
+                            RenderVStockHiLo(g, rd, x);
+                            break;
+                    }
+                }
+            }
+        }
+
+        #region GetVBoundingRect
+
+        private Rectangle GetVBoundingRect(HiLoRenderData rd, Point pt)
+        {
+            int y1 = rd.Value[StockHigh];
+            int y2 = rd.Value[StockLow];
+
+            if (rd.Value[StockOpen] != int.MinValue)
+            {
+                if (y1 > rd.Value[StockOpen])
+                    y1 = rd.Value[StockOpen];
+
+                if (y2 < rd.Value[StockOpen])
+                    y2 = rd.Value[StockOpen];
+            }
+
+            if (rd.Value[StockClose] != int.MinValue)
+            {
+                if (y1 > rd.Value[StockClose])
+                    y1 = rd.Value[StockClose];
+
+                if (y2 < rd.Value[StockClose])
+                    y2 = rd.Value[StockClose];
+            }
+
+            int x = pt.X + BarOffset - BarWidth / 2;
+
+            return (new Rectangle(x, y1, BarWidth, y2 - y1));
+        }
+
+        #endregion
+
+        #region RenderVStockBox
+
+        private void RenderVStockBox(Graphics g, HiLoRenderData rd, int x)
+        {
+            int y1 = rd.Value[StockOpen];
+            int y2 = rd.Value[StockClose];
+
+            if (rd.Value[StockOpen] != int.MinValue && rd.Value[StockClose] != int.MinValue)
+            {
+                if (rd.Value[StockOpen] > rd.Value[StockClose])
+                {
+                    y1 = rd.Value[StockClose];
+                    y2 = rd.Value[StockOpen];
+                }
+
+                if (rd.Value[StockHigh] > y1)
+                    rd.Value[StockHigh] = y1;
+
+                if (rd.Value[StockLow] < y2)
+                    rd.Value[StockLow] = y2;
+
+                rd.IsAlternate = (rd.Value[StockOpen] < rd.Value[StockClose]);
+
+                RenderVStockBoxWhisker(g, rd, x,
+                    rd.Value[StockHigh], y1, HiLoBarSegment.HighWhisker);
+
+                RenderVStockBoxWhisker(g, rd, x,
+                    y2, rd.Value[StockLow], HiLoBarSegment.LowWhisker);
+
+                RenderVStockBoxOpenClose(g, rd, x, y1, y2);
+            }
+            else
+            {
+                int y = (y1 != int.MinValue) ? y1 : y2;
+
+                if (y != int.MinValue)
+                {
+                    if (y < rd.Value[StockHigh])
+                        rd.Value[StockHigh] = y;
+
+                    if (y > rd.Value[StockLow])
+                        rd.Value[StockLow] = y;
+                }
+
+                if (y > rd.Value[StockHigh] && y < rd.Value[StockLow])
+                {
+                    RenderVStockBoxWhisker(g, rd, x, rd.Value[StockHigh], y, HiLoBarSegment.HighWhisker);
+                    RenderVStockBoxWhisker(g, rd, x, y, rd.Value[StockLow], HiLoBarSegment.LowWhisker);
+
+                    RenderVStockBoxOpenClose(g, rd, x, y, y);
+                }
+                else
+                {
+                    RenderVStockBoxWhisker(g, rd, x,
+                        rd.Value[StockHigh], rd.Value[StockLow], HiLoBarSegment.CenterLine);
+
+                    if (y != int.MinValue)
+                        RenderVStockBoxOpenClose(g, rd, x, y, y);
+                }
+            }
+        }
+
+        #region RenderVStockBoxWhisker
+
+        private void RenderVStockBoxWhisker(Graphics g,
+            HiLoRenderData rd, int x, int y1, int y2, HiLoBarSegment segment)
+        {
+            if (y2 > y1)
+            {
+                Point pt1 = new Point(x, y1);
+                Point pt2 = new Point(x, y2 + 1);
+
+                RenderBoxWhisker(g, rd, pt1, pt2, segment);
+            }
+        }
+
+        #endregion
+
+        #region RenderVStockBoxOpenClose
+
+        private void RenderVStockBoxOpenClose(
+            Graphics g, HiLoRenderData rd, int x, int y1, int y2)
+        {
+            if (y2 == y1)
+            {
+                y1--;
+                y2++;
+            }
+
+            y2++;
+
+            Point pt1 = new Point(x - BarWidth / 2, y1);
+            Point pt2 = new Point(pt1.X + BarWidth, y2);
+
+            int lw = RenderStockBox(g, rd, pt1, pt2);
+
+            Rectangle r = new Rectangle(pt1.X, pt1.Y, pt2.X - pt1.X, pt2.Y - pt1.Y);
+
+            if (r.Width > 0 && r.Height > 0)
+            {
+                if (GetBarShading(rd.ChartXy) == true)
+                {
+                    ChartControl chartControl = ChartControl;
+
+                    if (chartControl.DoPreRenderSeriesHiloBarEvent(
+                        g, rd.ChartXy, this, rd, pt1, pt2, HiLoBarSegment.BarShading) == false)
+                    {
+
+                        RenderVBarShading(g, r, r, BarSegment.Top);
+
+                        chartControl.DoPostRenderSeriesHiLoBarEvent(
+                            g, rd.ChartXy, this, rd, pt1, pt2, HiLoBarSegment.BarShading);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderVStockBoxMedian
+
+        private void RenderVStockBoxMedian(
+            Graphics g, HiLoRenderData rd, int x, int y1, int y2)
+        {
+            if (rd.Value.Length > StockMedian)
+            {
+                int y3 = rd.Value[StockMedian];
+
+                if (y3 > y1 && y3 < y2)
+                {
+                    Point pt1 = new Point(x, y3);
+                    Point pt2 = new Point(x + BarWidth - 1, y3);
+
+                    ChartControl chartControl = ChartControl;
+
+                    if (chartControl.DoPreRenderSeriesHiloBarEvent(
+                        g, rd.ChartXy, this, rd, pt1, pt2, HiLoBarSegment.MedianLine) == false)
+                    {
+                        ChartLineVisualStyle lstyle = GetSegLineStyle(rd, HiLoBarSegment.MedianLine);
+
+                        if (lstyle.LinePattern != LinePattern.None)
+                        {
+                            using (Pen pen = new Pen(lstyle.LineColor, lstyle.LineWidth))
+                            {
+                                if (lstyle.LinePattern != LinePattern.NotSet)
+                                    pen.DashStyle = (DashStyle)lstyle.LinePattern;
+
+                                if (lstyle.LineWidth > 1)
+                                    pt2.X++;
+
+                                g.DrawLine(pen, pt1, pt2);
+                            }
+                        }
+
+                        chartControl.DoPostRenderSeriesHiLoBarEvent(
+                            g, rd.ChartXy, this, rd, pt1, pt2, HiLoBarSegment.MedianLine);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region RenderVStockHiLo
+
+        private void RenderVStockHiLo(Graphics g, HiLoRenderData rd, int x)
+        {
+            int y1, y2, y3, y4;
+            NormalizeHiLoValues(rd, out y1, out y2, out y3, out y4);
+
+            ChartLineVisualStyle ostyle, cstyle;
+            NormalizeHiLoStyles(rd, out ostyle, out cstyle);
+
+            if (rd.Value[StockOpen] != int.MinValue)
+            {
+                Point pt1 = new Point(x - BarWidth / 2, y2);
+                Point pt2 = new Point(pt1.X + BarWidth / 2, pt1.Y);
+
+                RenderHiLoWhisker(g, rd, pt1, pt2, ostyle, HiLoBarSegment.OpenWhisker);
+            }
+
+            if (rd.Value[StockClose] != int.MinValue)
+            {
+                Point pt1 = new Point(x + 1, y3);
+                Point pt2 = new Point(pt1.X + BarWidth / 2, pt1.Y);
+
+                RenderHiLoWhisker(g, rd, pt1, pt2, cstyle, HiLoBarSegment.CloseWhisker);
+            }
+
+            NormalizeHiLoDir(rd, ref y2, ref y3, ref ostyle, ref cstyle);
+
+            if ((rd.IsAlternate == false && _RenderFullDefRange == true) ||
+                (rd.IsAlternate == true && _RenderFullAltRange == true))
+            {
+                RenderHiLoRange(g, rd,
+                    new Point(x, y1), new Point(x, y4), HiLoBarSegment.FullRange);
+            }
+            else
+            {
+                if (y1 == y2 && y3 != y4)
+                    y2 = y3;
+
+                // High segment
+
+                if (y2 > y1)
+                {
+                    int n = (ostyle != null) ? ostyle.LineWidth / 2 : 0;
+
+                    RenderHiLoRange(g, rd,
+                        new Point(x, y1), new Point(x, y2 - n), HiLoBarSegment.HighWhisker);
+                }
+
+                // Low segment
+
+                if (y3 < y4)
+                {
+                    int n = 0;
+
+                    if (y3 == y1)
+                        n = -cstyle.LineWidth / 2;
+
+                    else if (y3 != y2)
+                        n = (cstyle.LineWidth + 1) / 2;
+
+                    RenderHiLoRange(g, rd,
+                        new Point(x, y3 + n), new Point(x, y4), HiLoBarSegment.LowWhisker);
+                }
+
+                // Center segment.
+
+                if (y2 < y3 || (y1 == y2 && y3 == y4))
+                {
+                    ChartLineVisualStyle y2Style = (y2 == rd.Value[StockOpen]) ? ostyle : cstyle;
+                    ChartLineVisualStyle y3Style = (y3 == rd.Value[StockOpen]) ? ostyle : cstyle;
+
+                    if (y2Style != null)
+                        y2 -= (y2Style.LineWidth / 2);
+
+                    if (y3Style != null)
+                        y3 += ((y3Style.LineWidth + 1) / 2);
+
+                    RenderHiLoRange(g, rd,
+                        new Point(x, y2), new Point(x, y3), HiLoBarSegment.CenterLine);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region GetHStockValues
+
+        internal int[] GetHStockValues(ChartXy chartXy, SeriesPoint sp)
+        {
+            ChartAxis axis = AxisX ?? chartXy.AxisX;
+
+            int[] values = new int[Math.Max(4, sp.ValueY.Length)];
+
+            for (int i = 0; i < sp.ValueY.Length; i++)
+                values[i] = chartXy.GetDataPointX(axis, sp.ValueY[i]);
+
+            NormalizeStockValues(sp, values);
+
+            return (values);
+        }
+
+        #endregion
+
+        #region GetVStockValues
+
+        internal int[] GetVStockValues(ChartXy chartXy, SeriesPoint sp)
+        {
+            ChartAxis axis = AxisY ?? chartXy.AxisY;
+
+            int[] values = new int[Math.Max(4, sp.ValueY.Length)];
+
+            for (int i = 0; i < sp.ValueY.Length; i++)
+                values[i] = chartXy.GetDataPointY(axis, sp.ValueY[i]);
+
+            NormalizeStockValues(sp, values);
+
+            return (values);
+        }
+
+        #endregion
+
+        #region NormalizeStockValues
+
+        private void NormalizeStockValues(SeriesPoint sp, int[] values)
+        {
+            for (int i = sp.ValueY.Length; i < values.Length; i++)
+                values[i] = int.MinValue;
+
+            if (values[StockLow] == int.MinValue)
+                values[StockLow] = values[StockHigh];
+
+            if ((IsRotated == true && values[StockLow] > values[StockHigh]) ||
+                (IsRotated == false && values[StockLow] < values[StockHigh]))
+            {
+                int temp = values[StockLow];
+                values[StockLow] = values[StockHigh];
+                values[StockHigh] = temp;
+            }
+        }
+
+        #endregion
+
+        #region NormalizeHiLoValues
+
+        private void NormalizeHiLoValues(
+            HiLoRenderData rd, out int v1, out int v2, out int v3, out int v4)
+        {
+            v1 = rd.Value[StockHigh];
+            v4 = rd.Value[StockLow];
+
+            v2 = (rd.Value[StockOpen] != int.MinValue) ? rd.Value[StockOpen] : v1;
+            v3 = (rd.Value[StockClose] != int.MinValue) ? rd.Value[StockClose] : v4;
+
+            if (v1 > v4)
+            {
+                if (v1 < v2)
+                    v1 = v2;
+
+                if (v4 > v3)
+                    v4 = v3;
+
+                rd.IsAlternate = (v2 > v3);
+            }
+            else
+            {
+                if (v1 > v2)
+                    v1 = v2;
+
+                if (v4 < v3)
+                    v4 = v3;
+
+                rd.IsAlternate = (v2 < v3);
+            }
+        }
+
+        #endregion
+
+        #region NormalizeHiLoDir
+
+        private void NormalizeHiLoDir(HiLoRenderData rd,
+            ref int v1, ref int v2, ref ChartLineVisualStyle style1, ref ChartLineVisualStyle style2)
+        {
+            if (rd.IsAlternate == false)
+            {
+                int y = v1;
+                v1 = v2;
+                v2 = y;
+
+                ChartLineVisualStyle style = style1;
+                style1 = style2;
+                style2 = style1;
+            }
+        }
+
+        #endregion
+
+        #region NormalizeHiLoStyles
+
+        private void NormalizeHiLoStyles(HiLoRenderData rd,
+            out ChartLineVisualStyle ostyle, out ChartLineVisualStyle cstyle)
+        {
+            ostyle = (rd.Value[StockOpen] != int.MinValue) ? GetSegLineStyle(rd, HiLoBarSegment.OpenWhisker) : null;
+            cstyle = (rd.Value[StockClose] != int.MinValue) ? GetSegLineStyle(rd, HiLoBarSegment.CloseWhisker) : null;
+
+            rd.EndDelta = GetHiLoEndDelta(ostyle, cstyle);
+        }
+
+        #region GetHiLoEndDelta
+
+        private int GetHiLoEndDelta(
+            ChartLineVisualStyle ostyle, ChartLineVisualStyle cstyle)
+        {
+            int delta = 0;
+
+            if (ostyle != null)
+            {
+                if (ostyle.LineWidth > 1)
+                {
+                    if (ostyle.LinePattern != LinePattern.None)
+                        delta = (ostyle.LineWidth + 1) / 2;
+                }
+            }
+
+            if (cstyle != null)
+            {
+                if (cstyle.LineWidth > 1)
+                {
+                    if (cstyle.LinePattern != LinePattern.None)
+                        delta = Math.Max(delta, (cstyle.LineWidth + 1) / 2);
+                }
+            }
+
+            return (delta);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderBoxWhisker
+
+        private void RenderBoxWhisker(Graphics g,
+            HiLoRenderData rd, Point pt1, Point pt2, HiLoBarSegment segment)
+        {
+            ChartXy chartXy = rd.ChartXy;
+            ChartControl chartControl = ChartControl;
+
+            SmoothingMode sm = g.SmoothingMode;
+            g.SmoothingMode = SmoothingMode.None;
+
+            if (chartControl.DoPreRenderSeriesHiloBarEvent(g, chartXy, this, rd, pt1, pt2, segment) == false)
+            {
+                ChartLineVisualStyle lstyle = GetSegLineStyle(rd, segment);
+
+                if (lstyle.LinePattern != LinePattern.None)
+                {
+                    using (Pen pen = new Pen(lstyle.LineColor, Dpi.Width(lstyle.LineWidth)))
+                    {
+                        if (lstyle.LinePattern != LinePattern.NotSet)
+                            pen.DashStyle = (DashStyle)lstyle.LinePattern;
+
+                        Point pt3 = pt2;
+
+                        if (lstyle.LineWidth == 1)
+                        {
+                            if (pt1.X == pt2.X)
+                                pt3.Y--;
+                            else
+                                pt3.X--;
+                        }
+
+                        g.DrawLine(pen, pt1, pt3);
+                    }
+                }
+
+                chartControl.DoPostRenderSeriesHiLoBarEvent(g, chartXy, this, rd, pt1, pt2, segment);
+            }
+
+            if (rd.SeriesStyle.HiLoBarVisualStyle.ShowWhiskerCaps == Tbool.True)
+                RenderWhiskerCap(g, rd, pt1, pt2, segment);
+
+            g.SmoothingMode = sm;
+        }
+
+        #region RenderWhiskerCap
+
+        private void RenderWhiskerCap(Graphics g,
+            HiLoRenderData rd, Point pt1, Point pt2, HiLoBarSegment segment)
+        {
+            if (segment == HiLoBarSegment.HighWhisker || segment == HiLoBarSegment.LowWhisker)
+            {
+                HiLoBarSegment capSegment = (segment == HiLoBarSegment.HighWhisker)
+                    ? HiLoBarSegment.HighWhiskerCap : HiLoBarSegment.LowWhiskerCap;
+
+                GetWhiskerCapPoints(segment, ref pt1, ref pt2);
+
+                ChartControl chartControl = ChartControl;
+
+                if (chartControl.DoPreRenderSeriesHiloBarEvent(
+                    g, rd.ChartXy, this, rd, pt1, pt2, capSegment) == false)
+                {
+                    ChartLineVisualStyle lstyle = GetSegLineStyle(rd, capSegment);
+
+                    if (lstyle.LinePattern != LinePattern.None)
+                    {
+                        using (Pen pen = new Pen(lstyle.LineColor, lstyle.LineWidth))
+                        {
+                            if (lstyle.LinePattern != LinePattern.NotSet)
+                                pen.DashStyle = (DashStyle)lstyle.LinePattern;
+
+                            if (lstyle.LineWidth == 1)
+                            {
+                                if (pt1.X == pt2.X)
+                                    pt2.Y--;
+                                else
+                                    pt2.X--;
+                            }
+
+                            g.DrawLine(pen, pt1, pt2);
+                        }
+                    }
+
+                    chartControl.DoPostRenderSeriesHiLoBarEvent(
+                        g, rd.ChartXy, this, rd, pt1, pt2, capSegment);
+                }
+            }
+        }
+
+        #region GetWhiskerCapPoints
+
+        private void GetWhiskerCapPoints(
+            HiLoBarSegment segment, ref Point pt1, ref Point pt2)
+        {
+            int n = BarWidth / 3;
+
+            switch (segment)
+            {
+                case HiLoBarSegment.HighWhisker:
+                    if (pt1.X == pt2.X)
+                    {
+                        pt1.X -= n;
+                        pt2.X += n + 1;
+                        pt2.Y = pt1.Y;
+                    }
+                    else
+                    {
+                        pt1.Y -= n;
+                        pt2.Y += n + 1;
+                        pt1.X = pt2.X;
+                    }
+                    break;
+
+                case HiLoBarSegment.LowWhisker:
+                    if (pt1.X == pt2.X)
+                    {
+                        pt1.X -= n;
+                        pt2.X += n + 1;
+                        pt1.Y = pt2.Y;
+                    }
+                    else
+                    {
+                        pt1.Y -= n;
+                        pt2.Y += n + 1;
+                        pt2.X = pt1.X;
+                    }
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region RenderStockBox
+
+        private int RenderStockBox(
+            Graphics g, HiLoRenderData rd, Point pt1, Point pt2)
+        {
+            int lineWidth = 0;
+
+            Rectangle r = new Rectangle(pt1.X, pt1.Y, pt2.X - pt1.X, pt2.Y - pt1.Y);
+
+            if (r.Width > 0 && r.Height > 0)
+            {
+                ChartXy chartXy = rd.ChartXy;
+                ChartControl chartControl = ChartControl;
+
+                SmoothingMode sm = g.SmoothingMode;
+                g.SmoothingMode = SmoothingMode.None;
+
+                if (chartControl.DoPreRenderSeriesHiloBarEvent(
+                    g, chartXy, this, rd, pt1, pt2, HiLoBarSegment.Box) == false)
+                {
+                    if (HiLoBarType == HiLoBarType.Box)
+                        RenderStockBoxBackground(g, rd, r);
+                    else
+                        RenderStockCandleBackground(g, rd, r);
+
+                    ChartLineVisualStyle lstyle = rd.DefaultStyle.BoxBorder;
+
+                    if (CanUseAlternateSegmentStyle(rd) == true)
+                    {
+                        if (rd.IsAlternate == true && rd.AlternateStyle.BoxBorder.IsEmpty == false)
+                            lstyle = rd.AlternateStyle.BoxBorder;
+                    }
+
+                    if (lstyle.LinePattern != LinePattern.None)
+                    {
+                        using (Pen pen = new Pen(lstyle.LineColor, Dpi.Width(lstyle.LineWidth)))
+                        {
+                            lineWidth = (int)pen.Width;
+
+                            if (lstyle.LinePattern != LinePattern.NotSet)
+                                pen.DashStyle = (DashStyle)lstyle.LinePattern;
+
+                            if (pt1.X == pt2.X || pt1.Y == pt2.Y)
+                            {
+                                g.DrawLine(pen, pt1, pt2);
+                            }
+                            else
+                            {
+                                pen.Alignment = PenAlignment.Inset;
+
+                                if (lstyle.LineWidth == 1)
+                                {
+                                    r.Width--;
+                                    r.Height--;
+                                }
+
+                                if (r.Width > 0 && r.Height > 0)
+                                    g.DrawRectangle(pen, r);
+                            }
+                        }
+                    }
+
+                    chartControl.DoPostRenderSeriesHiLoBarEvent(
+                        g, chartXy, this, rd, pt1, pt2, HiLoBarSegment.Box);
+                }
+
+                if (ShowHiLoBarMedianLines == true)
+                {
+                    if (IsRotated == false)
+                        RenderVStockBoxMedian(g, rd, r.X, r.Y, r.Bottom);
+                    else
+                        RenderHStockBoxMedian(g, rd, r.Y, r.X, r.Right);
+                }
+
+                g.SmoothingMode = sm;
+            }
+
+            return (lineWidth);
+        }
+
+        #region RenderStockCandleBackground
+
+        private void RenderStockCandleBackground(
+            Graphics g, HiLoRenderData rd, Rectangle r)
+        {
+            Background bk =
+                GetBoxBackground(rd, rd.AlternateStyle.BoxBackground, rd.DefaultStyle.BoxBackground);
+
+            if (bk.IsEmpty == false)
+            {
+                using (Brush br = bk.GetBrush(r))
+                    g.FillRectangle(br, r);
+            }
+        }
+
+        #endregion
+
+        #region RenderStockBoxBackground
+
+        private void RenderStockBoxBackground(
+            Graphics g, HiLoRenderData rd, Rectangle r)
+        {
+            Background bkDef = rd.DefaultStyle.BoxBackground;
+            Background bkAlt = rd.AlternateStyle.BoxBackground;
+
+            if (bkAlt.IsEmpty == true)
+                bkAlt = bkDef;
+
+            if (rd.IsAlternate == true)
+            {
+                Background bkSave = bkDef;
+                bkDef = bkAlt;
+                bkAlt = bkSave;
+            }
+
+            if ((ShowHiLoBarMedianLines == true) && (rd.Value.Length > StockMedian))
+            {
+                if (bkAlt.IsEmpty == false)
+                {
+                    if (IsRotated == false)
+                        r = RenderVBox(g, rd.Value[StockMedian], bkAlt, r);
+                    else
+                        r = RenderHBox(g, rd.Value[StockMedian], bkAlt, r);
+                }
+            }
+
+            if (r.Width > 0 && r.Height > 0)
+            {
+                if (bkDef.IsEmpty == false)
+                {
+                    using (Brush br = bkDef.GetBrush(r))
+                        g.FillRectangle(br, r);
+                }
+            }
+        }
+
+        #region RenderVBox
+
+        private Rectangle RenderVBox(Graphics g, int y, Background bk, Rectangle r)
+        {
+            if ((y > r.Y && y < r.Bottom) && bk.IsEmpty == false)
+            {
+                int ry = r.Y;
+
+                r.Height = r.Bottom - y;
+                r.Y = y;
+
+                using (Brush br = bk.GetBrush(r))
+                    g.FillRectangle(br, r);
+
+                r.Y = ry;
+                r.Height = y - ry;
+            }
+
+            return (r);
+        }
+
+        #endregion
+
+        #region RenderHBox
+
+        private Rectangle RenderHBox(Graphics g, int x, Background bk, Rectangle r)
+        {
+            if (x > r.X && x < r.Right)
+            {
+                int rw = r.Width;
+
+                r.Width = x - r.X;
+
+                using (Brush br = bk.GetBrush(r))
+                    g.FillRectangle(br, r);
+
+                r.X = r.Right;
+                r.Width = rw - r.Width;
+            }
+
+            return (r);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region RenderHiLoWhisker
+
+        private ChartLineVisualStyle RenderHiLoWhisker(Graphics g,
+            HiLoRenderData rd, Point pt1, Point pt2, ChartLineVisualStyle style, HiLoBarSegment segment)
+        {
+            ChartXy chartXy = rd.ChartXy;
+            ChartControl chartControl = ChartControl;
+
+            SmoothingMode sm = g.SmoothingMode;
+            g.SmoothingMode = SmoothingMode.None;
+
+            if (chartControl.DoPreRenderSeriesHiloBarEvent(g, chartXy, this, rd, pt1, pt2, segment) == false)
+            {
+                if (style.LinePattern != LinePattern.None)
+                {
+                    using (Pen pen = new Pen(style.LineColor, Dpi.Width(style.LineWidth)))
+                    {
+                        if (style.LinePattern != LinePattern.NotSet)
+                            pen.DashStyle = (DashStyle)style.LinePattern;
+
+                        if (style.LineWidth == 1)
+                        {
+                            if (pt1.X == pt2.X)
+                                pt2.Y--;
+                            else
+                                pt2.X--;
+                        }
+
+                        g.DrawLine(pen, pt1, pt2);
+                    }
+                }
+
+                chartControl.DoPostRenderSeriesHiLoBarEvent(g, chartXy, this, rd, pt1, pt2, segment);
+            }
+
+            g.SmoothingMode = sm;
+
+            return (style);
+        }
+
+        #endregion
+
+        #region RenderHiLoRange
+
+        private void RenderHiLoRange(
+            Graphics g, HiLoRenderData rd, Point pt1, Point pt2, HiLoBarSegment segment)
+        {
+            ChartXy chartXy = rd.ChartXy;
+            ChartControl chartControl = ChartControl;
+
+            if (pt1.X == pt2.X)
+            {
+                if (segment == HiLoBarSegment.HighWhisker || segment == HiLoBarSegment.FullRange)
+                    pt1.Y -= rd.EndDelta;
+
+                if (segment == HiLoBarSegment.LowWhisker || segment == HiLoBarSegment.FullRange)
+                    pt2.Y += rd.EndDelta;
+            }
+            else
+            {
+                if (segment == HiLoBarSegment.LowWhisker || segment == HiLoBarSegment.FullRange)
+                    pt2.X -= rd.EndDelta;
+
+                if (segment == HiLoBarSegment.HighWhisker || segment == HiLoBarSegment.FullRange)
+                    pt1.X += rd.EndDelta;
+            }
+
+            SmoothingMode sm = g.SmoothingMode;
+            g.SmoothingMode = SmoothingMode.None;
+
+            if (chartControl.DoPreRenderSeriesHiloBarEvent(g, chartXy, this, rd, pt1, pt2, segment) == false)
+            {
+                ChartLineVisualStyle lstyle = GetSegLineStyle(rd, segment);
+
+                if (lstyle.LinePattern != LinePattern.None)
+                {
+                    using (Pen pen = new Pen(lstyle.LineColor, Dpi.Width(lstyle.LineWidth)))
+                    {
+                        if (lstyle.LinePattern != LinePattern.NotSet)
+                            pen.DashStyle = (DashStyle)lstyle.LinePattern;
+
+
+                        g.DrawLine(pen, pt1, pt2);
+                    }
+                }
+            }
+
+            if (ShowHiLoBarMedianLines == true)
+            {
+                if (segment == HiLoBarSegment.CenterLine || segment == HiLoBarSegment.FullRange)
+                {
+                    if (IsRotated == false)
+                        RenderVStockBoxMedian(g, rd, pt1.X - BarWidth / 2, pt1.Y, pt2.Y);
+                    else
+                        RenderHStockBoxMedian(g, rd, pt1.Y - BarWidth / 2, pt2.X, pt1.X);
+                }
+            }
+
+            chartControl.DoPostRenderSeriesHiLoBarEvent(g, chartXy, this, rd, pt1, pt2, segment);
+
+            g.SmoothingMode = sm;
+        }
+
+        #endregion
+
+        #region GetSegLineStyle
+
+        private ChartLineVisualStyle GetSegLineStyle(HiLoRenderData rd, HiLoBarSegment segment)
+        {
+            ChartLineVisualStyle style = rd.DefaultStyle.Default;
+
+            if (CanUseAlternateSegmentStyle(rd) == true)
+            {
+                if (rd.IsAlternate == true && rd.AlternateStyle.Default.IsEmpty == false)
+                    style = rd.AlternateStyle.Default;
+            }
+
+            switch (segment)
+            {
+                case HiLoBarSegment.FullRange:
+                    break;
+
+                case HiLoBarSegment.Box:
+                    if (rd.IsAlternate == true && rd.AlternateStyle.BoxBorder.IsEmpty == false)
+                    {
+                        style = rd.AlternateStyle.BoxBorder;
+                    }
+                    else
+                    {
+                        if (rd.DefaultStyle.BoxBorder.IsEmpty == false)
+                            style = rd.DefaultStyle.BoxBorder;
+                    }
+                    break;
+
+                case HiLoBarSegment.MedianLine:
+                    if (rd.IsAlternate == true && rd.AlternateStyle.MedianLine.IsEmpty == false)
+                    {
+                        style = rd.AlternateStyle.MedianLine;
+                    }
+                    else
+                    {
+                        if (rd.DefaultStyle.MedianLine.IsEmpty == false)
+                            style = rd.DefaultStyle.MedianLine;
+                    }
+                    break;
+
+                case HiLoBarSegment.HighWhiskerCap:
+                    if (rd.IsAlternate == true && rd.AlternateStyle.HighWhiskerCap.IsEmpty == false)
+                    {
+                        style = rd.AlternateStyle.HighWhiskerCap;
+                    }
+                    else
+                    {
+                        if (rd.DefaultStyle.HighWhiskerCap.IsEmpty == false)
+                            style = rd.DefaultStyle.HighWhiskerCap;
+                    }
+                    break;
+
+                case HiLoBarSegment.LowWhiskerCap:
+                    if (rd.IsAlternate == true && rd.AlternateStyle.LowWhiskerCap.IsEmpty == false)
+                    {
+                        style = rd.AlternateStyle.LowWhiskerCap;
+                    }
+                    else
+                    {
+                        if (rd.DefaultStyle.LowWhiskerCap.IsEmpty == false)
+                            style = rd.DefaultStyle.LowWhiskerCap;
+                    }
+                    break;
+
+                case HiLoBarSegment.HighWhisker:
+                    if (rd.IsAlternate == true && rd.AlternateStyle.HighWhisker.IsEmpty == false)
+                    {
+                        style = rd.AlternateStyle.HighWhisker;
+                    }
+                    else
+                    {
+                        if (rd.DefaultStyle.HighWhisker.IsEmpty == false)
+                            style = rd.DefaultStyle.HighWhisker;
+                    }
+                    break;
+
+                case HiLoBarSegment.LowWhisker:
+                    if (rd.IsAlternate == true && rd.AlternateStyle.LowWhisker.IsEmpty == false)
+                    {
+                        style = rd.AlternateStyle.LowWhisker;
+                    }
+                    else
+                    {
+                        if (rd.DefaultStyle.LowWhisker.IsEmpty == false)
+                            style = rd.DefaultStyle.LowWhisker;
+                    }
+                    break;
+
+                case HiLoBarSegment.OpenWhisker:
+                    if (rd.IsAlternate == true && rd.AlternateStyle.OpenWhisker.IsEmpty == false)
+                    {
+                        style = rd.AlternateStyle.OpenWhisker;
+                    }
+                    else
+                    {
+                        if (rd.DefaultStyle.OpenWhisker.IsEmpty == false)
+                            style = rd.DefaultStyle.OpenWhisker;
+                    }
+                    break;
+
+                case HiLoBarSegment.CloseWhisker:
+                    if (rd.IsAlternate == true && rd.AlternateStyle.CloseWhisker.IsEmpty == false)
+                    {
+                        style = rd.AlternateStyle.CloseWhisker;
+                    }
+                    else
+                    {
+                        if (rd.DefaultStyle.CloseWhisker.IsEmpty == false)
+                            style = rd.DefaultStyle.CloseWhisker;
+                    }
+                    break;
+
+                case HiLoBarSegment.CenterLine:
+                    if (rd.IsAlternate == true && rd.AlternateStyle.CenterLine.IsEmpty == false)
+                    {
+                        style = rd.AlternateStyle.CenterLine;
+                    }
+                    else
+                    {
+                        if (rd.DefaultStyle.CenterLine.IsEmpty == false)
+                            style = rd.DefaultStyle.CenterLine;
+                    }
+                    break;
+            }
+
+            return (style);
+        }
+
+        #region CanUseAlternateSegmentStyle
+
+        private bool CanUseAlternateSegmentStyle(HiLoRenderData rd)
+        {
+            Tbool uas = rd.SeriesStyle.HiLoBarVisualStyle.UseAlternateSegmentStyle;
+
+            if (uas == Tbool.NotSet)
+                return (HiLoBarType == HiLoBarType.Candle);
+
+            return (uas == Tbool.True);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetBoxBackground
+
+        private Background GetBoxBackground(HiLoRenderData rd, Background abk, Background sbk)
+        {
+            if (rd.IsAlternate == true && abk.IsEmpty == false)
+                return (abk);
+
+            return (sbk);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region HighLightPoints
+
+        private bool HighLightPoints(ChartXy chartXy)
+        {
+            if (chartXy.ChartCrosshair.Visible == false)
+                return (false);
+
+            if (CrosshairHighlightPoints != Tbool.NotSet)
+                return (CrosshairHighlightPoints == Tbool.True);
+
+            return (chartXy.ChartCrosshair.HighlightPoints);
+        }
+
+        #endregion
+
+        #region HighLightSinglePoint
+
+        private bool HighLightSinglePoint(ChartXy chartXy)
+        {
+            if (chartXy.ChartCrosshair.Visible == false)
+                return (false);
+
+            if (CrosshairHighlightSinglePoint != Tbool.NotSet)
+                return (CrosshairHighlightSinglePoint == Tbool.True);
+
+            return (chartXy.ChartCrosshair.HighlightSinglePoint);
+        }
+
+        #endregion
+
+        #region GetHighlightStyle
+
+        private PointMarkerVisualStyle GetHighlightStyle(
+            ChartXy chartXy, ChartSeriesVisualStyle sstyle)
+        {
+            if (HighLightPoints(chartXy) == true)
+            {
+                PointMarkerVisualStyle pstyle = sstyle.MarkerVisualStyle;
+                PointMarkerVisualStyle hstyle = pstyle.Copy();
+
+                if (sstyle.MarkerHighlightVisualStyle.IsEmpty == false)
+                {
+                    hstyle.ApplyStyle(sstyle.MarkerHighlightVisualStyle);
+                }
+                else
+                {
+                    Size size = hstyle.Size;
+
+                    size.Width += 4;
+                    size.Height += 4;
+
+                    hstyle.Size = size;
+                }
+
+                return (hstyle);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetPointMarkerImage
+
+        private Image GetPointMarkerImage(
+            Graphics g, ChartXy chartXy, PointMarkerVisualStyle style)
+        {
+            Image image = PointMarkerImage;
+
+            if (image == null)
+            {
+                image = chartXy.GetPointMarker(g, style);
+
+                PointMarkerImage = image;
+            }
+
+            return (image);
+        }
+
+        #endregion
+
+        #region GetHighlightImage
+
+        private Image GetHighlightImage(
+            Graphics g, ChartXy chartXy, PointMarkerVisualStyle style)
+        {
+            Image image = PointMarkerHighlightImage;
+
+            if (image == null)
+            {
+                image = chartXy.GetPointMarker(g, style);
+
+                PointMarkerHighlightImage = image;
+            }
+
+            return (image);
+        }
+
+        #endregion
+
+        #region GetEmptyMarkerImage
+
+        private Image GetEmptyMarkerImage(
+            Graphics g, ChartXy chartXy, PointMarkerVisualStyle style)
+        {
+            Image image = PointMarkerEmptyImage;
+
+            if (image == null)
+            {
+                image = chartXy.GetPointMarker(g, style);
+
+                PointMarkerEmptyImage = image;
+            }
+
+            return (image);
+        }
+
+        #endregion
+
+        #region GatherSeriesPoints
+
+        private PointData GatherSeriesPoints(
+            ChartXy chartXy, SortedSeriesPoints ssp, int index, int count, bool allArgs)
+        {
+            if (_PointData == null)
+                _PointData = GatherSeriesPointsEx(chartXy, ssp, index, count, allArgs);
+
+            return (_PointData);
+        }
+
+        private PointData GatherSeriesPointsEx(
+            ChartXy chartXy, SortedSeriesPoints ssp, int index, int count, bool allArgs)
+        {
+            PointData pd = new PointData();
+
+            pd.Points = new List<Point[]>();
+            pd.SeriesPoints = new List<SeriesPoint[]>();
+
+            if (EnableEmptyValues == true)
+            {
+                PointData epd = new PointData();
+
+                epd.Points = new List<Point[]>();
+                epd.SeriesPoints = new List<SeriesPoint[]>();
+
+                int n = 0;
+                bool empty = false;
+
+                for (int i = 0; i < count; i++)
+                {
+                    if (ssp[index + i].IsEmpty != empty)
+                    {
+                        int cnt = i - n;
+
+                        if (cnt > 0)
+                            GetPointList(chartXy, ssp, index + n, cnt, allArgs, empty ? epd : pd);
+
+                        empty = !empty;
+
+                        n = i;
+                    }
+                }
+
+                if (n < count)
+                    GetPointList(chartXy, ssp, index + n, count - n, allArgs, empty ? epd : pd);
+
+                _EmptyPointData = epd;
+            }
+            else
+            {
+                GetPointList(chartXy, ssp, index, count, allArgs, pd);
+            }
+
+            return (pd);
+        }
+
+        #endregion
+
+        #region GetPointList
+
+        private void GetPointList(ChartXy chartXy,
+            SortedSeriesPoints ssp, int index, int cnt, bool allArgs, PointData pd)
+        {
+            GetPointList(chartXy, ssp, index, cnt, 0, 0, allArgs, pd);
+        }
+
+        private void GetPointList(ChartXy chartXy, SortedSeriesPoints ssp,
+            int index, int cnt, int skip, int minDistance, bool allArgs, PointData pd)
+        {
+            if (cnt > 0)
+            {
+                Stack<object> stack = new Stack<object>();
+
+                skip++;
+
+                Point lpt = new Point(-5000, -5000);
+
+                if (allArgs == false)
+                {
+                    if (cnt > skip && skip > 1)
+                        cnt = (cnt + skip - 1) / skip;
+
+                    for (int i = 0; i < cnt; i++)
+                    {
+                        int n = index + (i * skip);
+
+                        if (n >= ssp.Count)
+                            break;
+
+                        SeriesPoint sp = ssp[n];
+
+                        if (sp.Visible == true)
+                        {
+                            Point pt = chartXy.GetDataPointEx(this, sp, 0);
+
+                            if (minDistance <= 0 || DataPointDistanceOk(lpt, pt, minDistance) == true)
+                            {
+                                stack.Push(sp);
+                                stack.Push(pt);
+
+                                lpt = pt;
+                            }
+                        }
+                    }
+                }
+                else
+                {
+                    int n = 0;
+
+                    for (int i = 0; i < cnt; i++)
+                        n += ssp[index + i].ValueY.Length;
+
+                    n /= (n + skip - 1) / skip;
+
+                    int m = 0;
+
+                    for (int i = 0; i < cnt; i++)
+                    {
+                        SeriesPoint sp = ssp[index + i];
+
+                        for (int j = 0; j < sp.ValueY.Length; j++)
+                        {
+                            if (m % skip == 0)
+                            {
+                                int w = m / skip;
+
+                                Point pt = chartXy.GetDataPointNa(this, sp, j);
+
+                                if (minDistance <= 0 || DataPointDistanceOk(lpt, pt, minDistance) == true)
+                                {
+                                    stack.Push(sp);
+                                    stack.Push(pt);
+
+                                    lpt = pt;
+                                }
+                            }
+
+                            m++;
+                        }
+                    }
+                }
+
+                if (stack.Count > 0)
+                {
+                    int n = stack.Count / 2;
+
+                    Point[] points = new Point[n];
+                    SeriesPoint[] seriesPoints = new SeriesPoint[n];
+
+                    for (int i = n - 1; i >= 0; i--)
+                    {
+                        points[i] = (Point)stack.Pop();
+                        seriesPoints[i] = (SeriesPoint)stack.Pop();
+                    }
+
+                    pd.Points.Add(points);
+                    pd.SeriesPoints.Add(seriesPoints);
+                }
+            }
+        }
+
+        #region DataPointDistanceOk
+
+        private bool DataPointDistanceOk(Point lpt, Point pt, int minDistance)
+        {
+            int dx = (lpt.X - pt.X);
+            int dy = (lpt.Y - pt.Y);
+
+            int h = (int)MathHelper.Sqrt(dx * dx + dy * dy);
+
+            return (h >= minDistance);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region Render
+
+        internal override void Render(ChartRenderInfo renderInfo)
+        {
+            if (Displayed == true)
+            {
+                Rectangle bounds = BoundsRelative;
+
+                if (renderInfo.ClipRectangle.IntersectsWith(bounds))
+                    RenderOverride(renderInfo);
+            }
+        }
+
+        #endregion
+
+        #region RenderIndicators
+
+        internal void RenderIndicators(ChartRenderInfo renderInfo, bool onTop)
+        {
+            if (SeriesType != SeriesType.HorizontalDot || SeriesType != SeriesType.VerticalDot)
+            {
+                if (SeriesPoints.Count > 0)
+                {
+                    Graphics g = renderInfo.Graphics;
+
+                    ChartXy chartXy = Parent as ChartXy;
+                    ChartSeriesVisualStyle sstyle = EffectiveChartSeriesStyle;
+
+                    SortedSeriesPoints ssp = GetSortedSeriesPoints(chartXy);
+
+                    foreach (ChartIndicator indicator in ChartIndicators)
+                    {
+                        if (indicator.DisplayOnTop == onTop)
+                        {
+                            if (indicator.IsDisplayed == true)
+                            {
+                                ssp.SlopeIndex = indicator.ValueYIndex;
+
+                                switch (indicator.IndicatorType)
+                                {
+                                    case ChartIndicatorType.RegressionLine:
+                                        RenderRegressionLine(g, chartXy, ssp, (RegressionLine)indicator);
+                                        break;
+
+                                    case ChartIndicatorType.TrendLine:
+                                        RenderTrendLine(g, chartXy, ssp, (TrendLine)indicator);
+                                        break;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        #region RenderRegressionLine
+
+        private void RenderRegressionLine(Graphics g,
+            ChartXy chartXy, SortedSeriesPoints ssp, RegressionLine regline)
+        {
+            double m = regline.Slope;
+            double b = regline.Intercept;
+
+            if (m.Equals(double.NaN) == false && b.Equals(double.NaN) == false)
+            {
+                ChartAxis axis = AxisX ?? chartXy.AxisX;
+
+                double x1, x2;
+
+                switch (ActualScaleTypeX)
+                {
+                    case ScaleType.DateTime:
+                        x1 = chartXy.GetDateTimePointValue(axis, axis.TickmarkLayout, (DateTime)MinValueX);
+                        x2 = chartXy.GetDateTimePointValue(axis, axis.TickmarkLayout, (DateTime)MaxValueX);
+                        break;
+
+                    default:
+                        x1 = Convert.ToDouble(MinValueX);
+                        x2 = Convert.ToDouble(MaxValueX);
+                        break;
+                }
+
+                Point pt1 = chartXy.GetPointFromValue(this, MinValueX, m * x1 + b);
+                Point pt2 = chartXy.GetPointFromValue(this, MaxValueX, m * x2 + b);
+
+                if (SeriesType == SeriesType.VerticalBar ||
+                    SeriesType == SeriesType.VerticalHiLoBar)
+                {
+                    pt1.X += BarOffset;
+                    pt2.X += BarOffset;
+                }
+                else if (SeriesType == SeriesType.HorizontalBar ||
+                         SeriesType == SeriesType.HorizontalHiLoBar)
+                {
+                    pt1.Y += BarOffset;
+                    pt2.Y += BarOffset;
+                }
+
+                RegressionLineVisualStyle rstyle = regline.RegressionLineVisualStyle;
+
+                Color color = rstyle.LineColor;
+
+                if (color.IsEmpty)
+                    color = DefaultPaletteColor;
+
+                using (Pen pen = new Pen(color, Dpi.Width(rstyle.LineWidth)))
+                {
+                    if (rstyle.LinePattern != LinePattern.NotSet)
+                        pen.DashStyle = (DashStyle)rstyle.LinePattern;
+
+                    if (rstyle.StartCap != ChartLineCap.NotSet)
+                        pen.StartCap = (LineCap)rstyle.StartCap;
+
+                    if (rstyle.EndCap != ChartLineCap.NotSet)
+                        pen.EndCap = (LineCap)rstyle.EndCap;
+
+                    g.DrawLine(pen, pt1, pt2);
+                }
+            }
+        }
+
+        #endregion
+
+        #region RenderTrendLine
+
+        private void RenderTrendLine(Graphics g,
+            ChartXy chartXy, SortedSeriesPoints ssp, TrendLine trendLine)
+        {
+            SeriesPoint sp1 = ssp.GetSeriesPoint(trendLine.ValueX1);
+            SeriesPoint sp2 = ssp.GetSeriesPoint(trendLine.ValueX2);
+
+            if (sp1 != null && sp2 != null)
+            {
+                Point pt1 = chartXy.GetDataPointEx(this, sp1, trendLine.ValueYIndex);
+                Point pt2 = chartXy.GetDataPointEx(this, sp2, trendLine.ValueYIndex);
+
+                if (SeriesType == SeriesType.VerticalBar ||
+                    SeriesType == SeriesType.VerticalHiLoBar)
+                {
+                    pt1.X += BarOffset;
+                    pt2.X += BarOffset;
+                }
+                else if (SeriesType == SeriesType.HorizontalBar ||
+                         SeriesType == SeriesType.HorizontalHiLoBar)
+                {
+                    pt1.Y += BarOffset;
+                    pt2.Y += BarOffset;
+                }
+
+                if (pt1.X >= chartXy.ContentBounds.X && pt2.X < chartXy.ContentBounds.Right)
+                {
+                    TrendLineVisualStyle tstyle = trendLine.TrendLineVisualStyle;
+
+                    Color color = tstyle.LineColor;
+
+                    if (color.IsEmpty)
+                        color = DefaultPaletteColor;
+
+                    using (Pen pen = new Pen(color, Dpi.Width(tstyle.LineWidth)))
+                    {
+                        if (tstyle.LinePattern != LinePattern.NotSet)
+                            pen.DashStyle = (DashStyle)tstyle.LinePattern;
+
+                        if (tstyle.StartCap != ChartLineCap.NotSet)
+                            pen.StartCap = (LineCap)tstyle.StartCap;
+
+                        if (tstyle.EndCap != ChartLineCap.NotSet)
+                            pen.EndCap = (LineCap)tstyle.EndCap;
+
+                        g.DrawLine(pen, pt1, pt2);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InvalidatePoints
+
+        internal void InvalidatePoints()
+        {
+            _PointData = null;
+            _EmptyPointData = null;
+            _ConvexHullPoints = null;
+            _StepPointData = null;
+        }
+
+        #endregion
+
+        #region InvalidatePointLabels
+
+        internal void InvalidatePointLabels()
+        {
+            ChartXy chartXy = Parent as ChartXy;
+
+            if (chartXy != null)
+                chartXy.InvalidatePointLabelsEx();
+        }
+
+        #endregion
+
+        #region UpdateSeriesRange
+
+        internal void UpdateSeriesRange()
+        {
+            if (SeriesRangeChanged == true)
+            {
+                if (Parent == null)
+                    return;
+
+                SeriesRangeChanged = false;
+
+                IsSorted = true;
+
+                QualitativeXValues.Clear();
+                QualitativeYValues.Clear();
+
+                _MinValueX = null;
+                _MinValueY = null;
+                _MaxValueX = null;
+                _MaxValueY = null;
+
+                if (SeriesPoints.Count > 0)
+                {
+                    BaseChart chart = Parent as BaseChart;
+
+                    Type dataTypeX = null;
+                    Type dataTypeY = null;
+
+                    if (ChartControl != null && ChartControl.DesignerHosted == true)
+                    {
+                        dataTypeX = GetDataTypeX(SeriesPoints);
+                        dataTypeY = GetDataTypeY(SeriesPoints);
+
+                        ActualScaleTypeX = GetActualScaleType(dataTypeX, ScaleTypeX);
+                        ActualScaleTypeY = GetActualScaleType(dataTypeY, ScaleTypeY);
+
+                        _PlotData = null;
+                    }
+
+                    for (int i = 0; i < SeriesPoints.Count; i++)
+                    {
+                        SeriesPoint sp = SeriesPoints[i];
+
+                        if (sp.Visible == true)
+                        {
+                            UpdateXValueRange(chart, sp, ref dataTypeX);
+
+                            switch (SeriesType)
+                            {
+                                case SeriesType.VerticalDot:
+                                case SeriesType.HorizontalDot:
+                                    ActualScaleTypeY = ScaleType.Quantitative;
+                                    break;
+
+                                case SeriesType.Bubble:
+                                    UpdateYBubbleRange(chart, sp, ref dataTypeY);
+                                    break;
+
+                                default:
+                                    UpdateYValueRange(chart, sp, ref dataTypeY);
+                                    break;
+                            }
+                        }
+                    }
+
+                    if (SeriesType == SeriesType.VerticalDot ||
+                        SeriesType == SeriesType.HorizontalDot)
+                    {
+                        UpdateStackedYValueRange();
+                    }
+                    else
+                    {
+                        if (QualitativeXValues.Count > 0)
+                        {
+                            _MinValueX = 0;
+                            _MaxValueX = QualitativeXValues.Count - 1;
+                        }
+
+                        if (QualitativeYValues.Count > 0)
+                        {
+                            _MinValueY = 0;
+                            _MaxValueY = QualitativeYValues.Count - 1;
+                        }
+                    }
+                }
+            }
+        }
+
+        #region GetDataTypeX
+
+        private Type GetDataTypeX(SeriesPointCollection spc)
+        {
+            Type dataType = null;
+
+            for (int i = 0; i < spc.Count; i++)
+            {
+                SeriesPoint sp = spc[i];
+
+                if (sp.Visible == true)
+                {
+                    if (sp.ValueX != null)
+                    {
+                        dataType = sp.ValueX.GetType();
+
+                        if (dataType != typeof(int))
+                            break;
+                    }
+                }
+            }
+
+            return (dataType);
+        }
+
+        #endregion
+
+        #region GetDataTypeY
+
+        private Type GetDataTypeY(SeriesPointCollection spc)
+        {
+            Type dataType = null;
+
+            for (int i = 0; i < spc.Count; i++)
+            {
+                SeriesPoint sp = spc[i];
+
+                if (sp.Visible == true)
+                {
+                    if (sp.ValueY != null && sp.ValueY.Length > 0)
+                    {
+                        for (int j = 0; j < sp.ValueY.Length; j++)
+                        {
+                            object valueY = sp.ValueY[j];
+
+                            if (valueY != null)
+                            {
+                                dataType = valueY.GetType();
+
+                                if (dataType != typeof(int))
+                                    return (dataType);
+                            }
+                        }
+                    }
+                }
+            }
+
+            return (dataType);
+        }
+
+        #endregion
+
+        #region UpdateXValueRange
+
+        private int _CmpLast;
+
+        private void UpdateXValueRange(BaseChart chart, SeriesPoint sp, ref Type dataType)
+        {
+            object value = sp.ValueX;
+
+            if (value != null)
+            {
+                if (dataType == null)
+                {
+                    dataType = value.GetType();
+
+                    ActualScaleTypeX = GetActualScaleType(dataType, ScaleTypeX);
+                }
+                else
+                {
+                    if (value.GetType() != dataType)
+                    {
+                        if (ChartControl.DesignerHosted == true)
+                        {
+                            try
+                            {
+                                sp.ValueX = Convert.ChangeType(value, dataType);
+                            }
+                            catch
+                            {
+                                sp.ValueX = null;
+                            }
+
+                            value = sp.ValueX;
+                        }
+                        else
+                        {
+                            throw new Exception("Cannot mix ValueX data types (" +
+                                dataType + "," + value.GetType() + ").");
+                        }
+                    }
+                }
+
+                switch (_ActualScaleTypeX)
+                {
+                    case ScaleType.Qualitative:
+                        if (QualitativeXValues.Contains(value) == false)
+                            QualitativeXValues.Add(value);
+                        break;
+
+                    default:
+                        if (_MinValueX == null)
+                        {
+                            _MinValueX = value;
+                            _MaxValueX = value;
+
+                            _CmpLast = 0;
+                        }
+                        else
+                        {
+                            if (chart.DataCompare(value, _MaxValueX) >= 0)
+                            {
+                                _MaxValueX = value;
+
+                                if (_CmpLast == 0)
+                                    _CmpLast = 1;
+
+                                else if (_CmpLast < 0)
+                                    IsSorted = false;
+                            }
+                            else
+                            {
+                                if (chart.DataCompare(value, _MinValueX) <= 0)
+                                    _MinValueX = value;
+
+                                if (_CmpLast == 0)
+                                    _CmpLast = -1;
+
+                                else if (_CmpLast > 0)
+                                    IsSorted = false;
+                            }
+                        }
+                        break;
+                }
+            }
+        }
+
+        #endregion
+
+        #region UpdateYBubbleRange
+
+        private void UpdateYBubbleRange(BaseChart chart, SeriesPoint sp, ref Type dataType)
+        {
+            if (sp.ValueY == null || sp.ValueY.Length < 1)
+                throw new Exception("Invalid Bubble Chart 'Y' arguments.");
+
+            if (_PlotData == null)
+                _PlotData = new BubblePlotData();
+
+            BubblePlotData bdata = (BubblePlotData)_PlotData;
+
+            object value = sp.ValueY[0];
+
+            sp.IsEmptyValue = IsEmptyValue(value);
+
+            if (sp.IsEmpty == false)
+            {
+                if (dataType == null)
+                {
+                    bdata.Clear();
+
+                    dataType = value.GetType();
+
+                    ActualScaleTypeY = GetActualScaleType(dataType, ScaleTypeY);
+                }
+                else
+                {
+                    if (value.GetType() != dataType)
+                    {
+                        if (ChartControl.DesignerHosted == true)
+                        {
+                            sp.ValueY[0] = Convert.ChangeType(value, dataType);
+
+                            value = sp.ValueY[0];
+                        }
+                        else
+                        {
+                            throw new Exception("Cannot mix ValueY data types (" +
+                                dataType + "," + value.GetType() + ").");
+                        }
+                    }
+                }
+
+                ProcessYValueRange(chart, value);
+
+                if (sp.ValueY.Length > 1)
+                {
+                    double bvalue = GetDoubleValue(sp.ValueY[1]);
+
+                    bvalue = Math.Abs(bvalue);
+
+                    if (bvalue < bdata.MinSize)
+                        bdata.MinSize = bvalue;
+
+                    if (bvalue > bdata.MaxSize)
+                        bdata.MaxSize = bvalue;
+
+                    bdata.TotalSize += bvalue;
+
+                    if (sp.ValueY.Length > 2)
+                    {
+                        double ivalue = GetDoubleValue(sp.ValueY[2]);
+
+                        if (ivalue < bdata.MinIntensity)
+                            bdata.MinIntensity = ivalue;
+
+                        if (ivalue > bdata.MaxIntensity)
+                            bdata.MaxIntensity = ivalue;
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region UpdateYValueRange
+
+        private void UpdateYValueRange(BaseChart chart, SeriesPoint sp, ref Type dataType)
+        {
+            if (sp.ValueY != null)
+            {
+                for (int j = 0; j < sp.ValueY.Length; j++)
+                {
+                    object value = sp.ValueY[j];
+
+                    sp.IsEmptyValue = IsEmptyValue(value);
+
+                    if (sp.IsEmpty == false)
+                    {
+                        if (dataType == null)
+                        {
+                            dataType = value.GetType();
+
+                            ActualScaleTypeY = GetActualScaleType(dataType, ScaleTypeY);
+                        }
+                        else
+                        {
+                            if (value.GetType() != dataType)
+                            {
+                                if (ChartControl.DesignerHosted == true)
+                                {
+                                    try
+                                    {
+                                        sp.ValueY[j] = Convert.ChangeType(value, dataType);
+                                    }
+                                    catch
+                                    {
+                                        sp.ValueY[j] = null;
+                                    }
+
+                                    value = sp.ValueY[j];
+                                }
+                                else
+                                {
+                                    throw new Exception("Cannot mix ValueY data types (" +
+                                        dataType + "," + value.GetType() + ").");
+                                }
+                            }
+                        }
+
+                        ProcessYValueRange(chart, value);
+                    }
+                }
+            }
+            else
+            {
+                sp.IsEmptyValue = true;
+            }
+        }
+
+        #region IsEmptyValue
+
+        private bool IsEmptyValue(object value)
+        {
+            if (value == null)
+                return (true);
+
+            if (EmptyValues != null)
+            {
+                Type dataType = value.GetType();
+
+                for (int i = 0; i < EmptyValues.Length; i++)
+                {
+                    if (EmptyValues[i] != null)
+                    {
+                        if (dataType == EmptyValues[i].GetType())
+                        {
+                            if (value.Equals(EmptyValues[i]) == true)
+                                return (true);
+                        }
+                    }
+                }
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region UpdateStackedYValueRange
+
+        private void UpdateStackedYValueRange()
+        {
+            if (QualitativeXValues.Count > 0 || QualitativeYValues.Count > 0)
+                throw new Exception("Dot plots can not contain Qualitative values.");
+
+            Dictionary<object, double> pd = new Dictionary<object, double>();
+
+            for (int i = 0; i < SeriesPoints.Count; i++)
+            {
+                SeriesPoint sp = SeriesPoints[i];
+
+                if (sp.Visible == true)
+                {
+                    object ox = sp.ValueX;
+
+                    double count = 0;
+
+                    if (sp.ValueY != null && sp.ValueY.Length > 0)
+                    {
+                        foreach (object oy in sp.ValueY)
+                        {
+                            sp.IsEmptyValue = IsEmptyValue(oy);
+
+                            if (sp.IsEmpty == false)
+                                count += GetDoubleValue(oy);
+                        }
+                    }
+                    else
+                    {
+                        if (sp.IsEmpty == false)
+                            count++;
+                    }
+
+                    if (sp.IsEmpty == false)
+                    {
+                        if (pd.ContainsKey(ox) == true)
+                            pd[ox] += count;
+                        else
+                            pd.Add(ox, count);
+                    }
+                }
+            }
+
+            double maxValue = 0;
+
+            foreach (KeyValuePair<object, double> kvp in pd)
+            {
+                if (kvp.Value > maxValue)
+                    maxValue = kvp.Value;
+            }
+
+            _MinValueY = 0.0;
+            _MaxValueY = maxValue;
+        }
+
+        #endregion
+
+        #region ProcessYValueRange
+
+        private void ProcessYValueRange(BaseChart chart, object value)
+        {
+            switch (_ActualScaleTypeY)
+            {
+                case ScaleType.Qualitative:
+                    if (QualitativeYValues.Contains(value) == false)
+                        QualitativeYValues.Add(value);
+                    break;
+
+                default:
+                    if (_MinValueY == null)
+                    {
+                        _MinValueY = value;
+                        _MaxValueY = value;
+                    }
+                    else
+                    {
+                        int cmpMax = chart.DataCompare(value, _MaxValueY);
+
+                        if (cmpMax >= 0)
+                        {
+                            _MaxValueY = value;
+                        }
+                        else
+                        {
+                            int cmpMin = chart.DataCompare(value, _MinValueY);
+
+                            if (cmpMin <= 0)
+                                _MinValueY = value;
+                        }
+                    }
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region GetActualScaleType
+
+        private ScaleType GetActualScaleType(Type dataType, ScaleType scaleType)
+        {
+            ScaleType autoType = SeriesPoint.GetScaleType(dataType);
+
+            if (scaleType == ScaleType.NotSet || scaleType == ScaleType.Auto)
+                return (autoType);
+
+            if (scaleType == autoType)
+                return (scaleType);
+
+            if (scaleType == ScaleType.Qualitative)
+                return (scaleType);
+
+            throw new Exception("Set ScaleType is incompatible with series data.");
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ResetSortedPoints
+
+        internal void ResetSortedPoints()
+        {
+            if (IsSorted == false)
+                _SortedSeriesPoints = null;
+        }
+
+        #endregion
+
+        #region GetValueX
+
+        internal object GetValueX(SeriesPoint sp)
+        {
+            if (IsRotated == false)
+                return (sp.ValueX);
+
+            if (sp.ValueY != null && sp.ValueY.Length > 0)
+                return (sp.ValueY[0]);
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetValueY
+
+        internal object GetValueY(SeriesPoint sp, int index)
+        {
+            if (IsRotated == true)
+                return (sp.ValueX);
+
+            if (sp.ValueY != null && sp.ValueY.Length > index)
+                return (sp.ValueY[index]);
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetQualitativeValueX
+
+        internal object GetQualitativeValueX(int index)
+        {
+            if (IsRotated == false)
+            {
+                if (QualitativeXValues != null && QualitativeXValues.Count > index)
+                    return (QualitativeXValues[index]);
+            }
+            else
+            {
+                if (QualitativeYValues != null && QualitativeYValues.Count > index)
+                    return (QualitativeYValues[index]);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetQualitativeValueY
+
+        internal object GetQualitativeValueY(int index)
+        {
+            if (IsRotated == true)
+            {
+                if (QualitativeXValues != null && QualitativeXValues.Count > index)
+                    return (QualitativeXValues[index]);
+            }
+            else
+            {
+                if (QualitativeYValues != null && QualitativeYValues.Count > index)
+                    return (QualitativeYValues[index]);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetDoubleValue
+
+        private double GetDoubleValue(object value)
+        {
+            if (value is double)
+                return (double)value;
+
+            return (Convert.ToDouble(value));
+        }
+
+        #endregion
+
+        #region AddSeriesPoint
+
+        internal override void AddSeriesPoint(object valueX, object[] valuesY, object dataItem)
+        {
+            SeriesPoint sp = new SeriesPoint(valueX, valuesY);
+
+            sp.DataItem = dataItem;
+
+            SeriesPoints.Add(sp);
+        }
+
+        #endregion
+
+        #region ClearSeriesPoints
+
+        internal override void ClearSeriesPoints()
+        {
+            SeriesPoints.Clear();
+        }
+
+        #endregion
+
+        #region GetBarWidthRatio
+
+        internal double GetBarWidthRatio(ChartXy chartXy)
+        {
+            return (_BarWidthRatio > 0 ? _BarWidthRatio :
+                (chartXy.BarWidthRatio > 0 ? chartXy.BarWidthRatio : 1));
+        }
+
+        #endregion
+
+        #region GetPointLabels
+
+        internal List<PointLabel> GetPointLabels(Graphics g)
+        {
+            ChartXy chartXy = Parent as ChartXy;
+
+            PointLabelDisplayMode plmode = GetPointLabelDisplayType(chartXy);
+
+            if (plmode != PointLabelDisplayMode.None)
+            {
+                ChartSeriesVisualStyle sstyle = EffectiveChartSeriesStyle;
+
+                SortedSeriesPoints ssp = GetSortedSeriesPoints(chartXy);
+                ssp.SeriesLayoutCount = chartXy.SeriesLayoutCount;
+
+                ChartAxis axisX = (IsRotated == true) ? AxisY ?? chartXy.AxisY : AxisX ?? chartXy.AxisX;
+                ChartAxis axisY = (IsRotated == true) ? AxisX ?? chartXy.AxisX : AxisY ?? chartXy.AxisY;
+
+                if (ssp.Count > 0)
+                {
+                    DataLabelVisualStyle dstyle = EffectiveDataLabelStyle;
+
+                    PointData pd = GetLabelPoints(chartXy, ssp, 0, ssp.Count, plmode);
+
+                    List<PointLabel> plabels = new List<PointLabel>();
+
+                    if (pd.Points.Count > 0)
+                    {
+                        for (int i = 0; i < pd.Points.Count; i++)
+                        {
+                            Point[] pts = pd.Points[i];
+                            SeriesPoint[] spts = pd.SeriesPoints[i];
+
+                            for (int j = 0; j < pts.Length; j++)
+                            {
+                                SeriesPoint sp = spts[j];
+                                Point pt = pts[j];
+
+                                if (IsBarSeries == true && ShowOriginValueLabels == false)
+                                {
+                                    if (IsBarOrigin(chartXy, sp) == true)
+                                        continue;
+                                }
+
+                                string text = GetPointLabelText(sp, axisX, axisY, dstyle);
+
+                                PointLabel pl = new PointLabel(sp, pt, text);
+
+                                pl.LabelSize = MeasurePointLabel(g, pl);
+
+                                plabels.Add(pl);
+                            }
+                        }
+                    }
+
+                    if ((plmode & PointLabelDisplayMode.DataLabels) == PointLabelDisplayMode.DataLabels)
+                        GetDataLabels(g, plabels, chartXy, axisX, axisY, dstyle);
+
+                    return (plabels);
+                }
+            }
+
+            return (null);
+        }
+
+        #region GetPointLabelDisplayType
+
+        private PointLabelDisplayMode GetPointLabelDisplayType(ChartXy chartXy)
+        {
+            PointLabelDisplayMode ptype = PointLabelDisplayMode;
+
+            if (ptype != PointLabelDisplayMode.NotSet)
+                return (ptype);
+
+            ptype = chartXy.PointLabelDisplayMode;
+
+            return (ptype != PointLabelDisplayMode.NotSet ? ptype : PointLabelDisplayMode.None);
+        }
+
+        #endregion
+
+        #region GetLabelPoints
+
+        /// <summary>
+        /// Gets the collection of series PointData for the given PointLabelDisplayType.
+        /// </summary>
+        /// <param name="plmode"></param>
+        /// <returns></returns>
+        public PointData GetLabelPoints(PointLabelDisplayMode displayType)
+        {
+            ChartXy chartXy = Parent as ChartXy;
+
+            if (chartXy != null)
+            {
+                SortedSeriesPoints ssp = GetSortedSeriesPoints(chartXy);
+
+                return (GetLabelPoints(chartXy, ssp, 0, ssp.Count, displayType));
+            }
+
+            return (null);
+        }
+
+        private PointData GetLabelPoints(ChartXy chartXy,
+            SortedSeriesPoints ssp, int index, int count, PointLabelDisplayMode displayType)
+        {
+            PointData pd = new PointData();
+
+            pd.Points = new List<Point[]>();
+            pd.SeriesPoints = new List<SeriesPoint[]>();
+
+            if ((displayType & PointLabelDisplayMode.AllSeriesPoints) == PointLabelDisplayMode.AllSeriesPoints)
+                GetPointList(chartXy, ssp, index, count, _PointLabelSkip, _PointLabelMinDistance, false, pd);
+
+            else if ((displayType & ~PointLabelDisplayMode.AllSeriesPoints) != 0)
+            {
+                List<SeriesPoint> lmmsp = new List<SeriesPoint>();
+
+                if ((displayType & PointLabelDisplayMode.MinValueX) == PointLabelDisplayMode.MinValueX)
+                {
+                    int n;
+
+                    if (IsRotated == true)
+                    {
+                        if (QualitativeYValues.Count > 0)
+                            n = (int)MinValueX;
+                        else
+                            n = ssp.SearchY(MinValueX);
+                    }
+                    else
+                    {
+                        if (QualitativeXValues.Count > 0)
+                            n = (int)MinValueX;
+                        else
+                            n = (ssp.IsSorted == true) ? 0 : ssp.SearchX(MinValueX);
+                    }
+
+                    if (n >= 0)
+                        lmmsp.Add(ssp[n]);
+                }
+
+                if ((displayType & PointLabelDisplayMode.MaxValueX) == PointLabelDisplayMode.MaxValueX)
+                {
+                    int n;
+
+                    if (IsRotated == true)
+                    {
+                        if (QualitativeYValues.Count > 0)
+                            n = (int)MaxValueX;
+                        else
+                            n = ssp.SearchY(MaxValueX);
+                    }
+                    else
+                    {
+                        if (QualitativeXValues.Count > 0)
+                            n = (int)MaxValueX;
+                        else
+                            n = (ssp.IsSorted == true) ? ssp.Count - 1 : ssp.SearchX(MaxValueX);
+                    }
+
+                    if (n >= 0 && lmmsp.Contains(ssp[n]) == false)
+                        lmmsp.Add(ssp[n]);
+                }
+
+                if ((displayType & PointLabelDisplayMode.MinValueY) == PointLabelDisplayMode.MinValueY)
+                {
+                    int n;
+
+                    if (IsRotated == true)
+                    {
+                        if (QualitativeXValues.Count > 0)
+                            n = (int)MinValueY;
+                        else
+                            n = (ssp.IsSorted == true) ? 0 : ssp.SearchX(MinValueY);
+                    }
+                    else
+                    {
+                        if (QualitativeYValues.Count > 0)
+                            n = (int)MinValueY;
+                        else
+                            n = ssp.SearchY(MinValueY);
+                    }
+
+                    if (n >= 0 && lmmsp.Contains(ssp[n]) == false)
+                        lmmsp.Add(ssp[n]);
+                }
+
+                if ((displayType & PointLabelDisplayMode.MaxValueY) == PointLabelDisplayMode.MaxValueY)
+                {
+                    int n;
+
+                    if (IsRotated == true)
+                    {
+                        if (QualitativeXValues.Count > 0)
+                            n = (int)MaxValueY;
+                        else
+                            n = ssp.SearchX(MaxValueY);
+                    }
+                    else
+                    {
+                        if (QualitativeYValues.Count > 0)
+                            n = (int)MaxValueY;
+                        else
+                            n = ssp.SearchY(MaxValueY);
+                    }
+
+                    if (n >= 0 && lmmsp.Contains(ssp[n]) == false)
+                        lmmsp.Add(ssp[n]);
+                }
+
+                if (lmmsp.Count > 0)
+                {
+                    SeriesPoint[] mmsp = new SeriesPoint[lmmsp.Count];
+                    Point[] mmpt = new Point[lmmsp.Count];
+
+                    for (int i = 0; i < lmmsp.Count; i++)
+                    {
+                        mmsp[i] = lmmsp[i];
+                        mmpt[i] = chartXy.GetDataPointNa(this, lmmsp[i], 0);
+                    }
+
+                    pd.SeriesPoints.Add(mmsp);
+                    pd.Points.Add(mmpt);
+                }
+            }
+
+            return (pd);
+        }
+
+        #endregion
+
+        #region GetDataLabels
+
+        private void GetDataLabels(Graphics g, List<PointLabel> plabels,
+            ChartXy chartXy, ChartAxis axisX, ChartAxis axisY, DataLabelVisualStyle dstyle)
+        {
+            foreach (DataLabel dlabel in DataLabels)
+            {
+                DataLabelVisualStyle xstyle = dlabel.EffectiveDataLabelStyle;
+
+                PointLabel pl = FindPointLabel(plabels, dlabel);
+
+                if (pl != null)
+                {
+                    if (string.IsNullOrEmpty(dlabel.Text) == false)
+                        pl.Label = dlabel.Text;
+
+                    pl.DataLabelVisualStyle = xstyle;
+                    pl.BarLabelPosition = dlabel.BarLabelPosition;
+
+                    pl.LabelSize = MeasurePointLabel(g, pl);
+                }
+                else
+                {
+                    SeriesPoint sp = new SeriesPoint(dlabel.ValueX, dlabel.ValueY);
+
+                    string label = (string.IsNullOrEmpty(dlabel.Text) == false) ? dlabel.Text :
+                            GetPointLabelText(sp, axisX, axisY, xstyle);
+
+                    Point pt = chartXy.GetDataPointNa(this, sp, 0);
+
+                    pl = new PointLabel(sp, pt, label);
+
+                    pl.IsDataLabel = true;
+
+                    pl.DataLabelVisualStyle = xstyle;
+                    pl.BarLabelPosition = dlabel.BarLabelPosition;
+
+                    pl.LabelSize = MeasurePointLabel(g, pl);
+
+                    plabels.Add(pl);
+                }
+            }
+        }
+
+        #region FindPointLabel
+
+        private PointLabel FindPointLabel(List<PointLabel> plabels, DataLabel dlabel)
+        {
+            for (int i = 0; i < plabels.Count; i++)
+            {
+                SeriesPoint sp = plabels[i].SeriesPoint;
+
+                if ((sp.ValueX != null) &&
+                    (sp.ValueY != null && sp.ValueY.Length > 0) &&
+                    (sp.ValueX.Equals(dlabel.ValueX) && sp.ValueY[0].Equals(dlabel.ValueY)))
+                {
+                    return (plabels[i]);
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IsBarOrigin
+
+        internal bool IsBarOrigin(ChartXy chartXy, SeriesPoint sp)
+        {
+            object value = ((sp.ValueY != null && sp.ValueY.Length > 1) ? sp.ValueY[1] : (chartXy.BarOrigin ?? 0));
+
+            ChartAxis axis = AxisY ?? chartXy.AxisY;
+
+            switch (axis.ScaleType)
+            {
+                case ScaleType.Quantitative:
+                    double d1 = Convert.ToDouble(value);
+                    double d2 = Convert.ToDouble(sp.ValueY[0]);
+
+                    return (d1.Equals(d2));
+
+                case ScaleType.Qualitative:
+                    string s1 = axis.QualitativeValues[0] as string;
+                    string s2 = sp.ValueY[0] as string;
+
+                    if (s1 != null)
+                        return (s1.Equals(s2));
+                    break;
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region GetPointLabelText
+
+        private string GetPointLabelText(SeriesPoint sp,
+            ChartAxis axisX, ChartAxis axisY, DataLabelVisualStyle dstyle)
+        {
+            string pattern = dstyle.TextFormat;
+
+            if (string.IsNullOrEmpty(pattern) == true)
+                return (GetDefaultPointLabelText(sp, axisX, axisY, dstyle));
+
+            pattern = pattern.Replace("\\n", "\n");
+            pattern = pattern.Replace("\\r", "\r");
+
+            Regex regex = new Regex("{([^}]*)}");
+            MatchCollection mc = regex.Matches(pattern);
+
+            StringBuilder sb = new StringBuilder();
+
+            int index = 0;
+
+            foreach (Match ma in mc)
+            {
+                if (ma.Index > index)
+                    sb.Append(pattern.Substring(index, ma.Index - index));
+
+                sb.Append(ProcessFormatSpecifier(sp, axisX, axisY, ma.Value));
+
+                index = ma.Index + ma.Length;
+            }
+
+            if (index < pattern.Length)
+                sb.Append(pattern.Substring(index));
+
+            return (sb.ToString());
+        }
+
+        #region ProcessFormatSpecifier
+
+        private string ProcessFormatSpecifier(
+            SeriesPoint sp, ChartAxis axisX, ChartAxis axisY, string pattern)
+        {
+            string s = pattern.Substring(1, pattern.Length - 2);
+
+            int n = s.IndexOf(':');
+
+            if ((uint)n > s.Length - 1)
+                n = s.Length;
+
+            string placeHolder = s.Substring(0, n).Trim().ToUpper();
+            string formatSpecifier = (n + 1 < s.Length) ? s.Substring(n + 1) : "";
+
+            try
+            {
+                switch (placeHolder)
+                {
+                    case "X":
+                        return (GetPointLabelText(sp.ValueX, axisX, formatSpecifier));
+
+                    case "Y":
+                    case "Y0":
+                        if (sp.ValueY != null && sp.ValueY.Length > 0)
+                            return (GetPointLabelText(sp.ValueY[0], axisY, formatSpecifier));
+
+                        return ("");
+
+                    case "S":
+                    case "SNAME":
+                        if (string.IsNullOrEmpty(formatSpecifier) == false)
+                            return (String.Format(formatSpecifier, Name));
+
+                        return (Name);
+
+                    default:
+                        if (placeHolder.StartsWith("Y") == true)
+                        {
+                            int index = int.Parse(placeHolder.Substring(1));
+
+                            if (sp.ValueY != null && sp.ValueY.Length > index)
+                                return (GetPointLabelText(sp.ValueY[index], axisY, formatSpecifier));
+                        }
+
+                        return (s);
+                }
+            }
+            catch
+            {
+            }
+
+            return (s);
+        }
+
+        #endregion
+
+        #region GetDefaultPointLabelText
+
+        private string GetDefaultPointLabelText(SeriesPoint sp,
+            ChartAxis axisX, ChartAxis axisY, DataLabelVisualStyle dstyle)
+        {
+            String text = string.Empty;
+
+            if (IsBarSeries == true)
+            {
+                text = GetPointLabelText(sp.ValueY[0], axisY, string.Empty);
+            }
+            else
+            {
+                text = GetPointLabelText(sp.ValueX, axisX, string.Empty);
+
+                if (sp.ValueY != null)
+                    text += " : " + GetPointLabelText(sp.ValueY[0], axisY, string.Empty);
+            }
+
+            return (text);
+        }
+
+        #endregion
+
+        #region GetPointLabelText
+
+        private string GetPointLabelText(
+            object value, ChartAxis axis, string format)
+        {
+            switch (axis.ScaleType)
+            {
+                case ScaleType.DateTime:
+                    if (string.IsNullOrEmpty(format) == false)
+                    {
+                        if (value is DateTime)
+                        {
+                            DateTime date = (DateTime)value;
+
+                            return (date.ToString(format));
+                        }
+                    }
+
+                    return (GetDateTimeLabelText(axis, (DateTime)value));
+
+                case ScaleType.Qualitative:
+                    if (string.IsNullOrEmpty(format) == false)
+                        return (string.Format(format, value));
+
+                    return (value.ToString());
+
+                default:
+                    double d = Convert.ToDouble(value);
+
+                    if (string.IsNullOrEmpty(format) == false)
+                        return (d.ToString(format));
+
+                    return (d.ToString("F3"));
+            }
+        }
+
+        #region GetDateTimeLabelText
+
+        internal string GetDateTimeLabelText(ChartAxis axis, DateTime dt)
+        {
+            switch (axis.ActualDateTimeUnits)
+            {
+                case DateTimeUnits.Ticks:
+                    return (dt.Ticks.ToString());
+
+                case DateTimeUnits.Milliseconds:
+                    return (dt.Millisecond.ToString());
+
+                case DateTimeUnits.Seconds:
+                    return (dt.Second.ToString());
+
+                case DateTimeUnits.Minutes:
+                    return (dt.Minute.ToString());
+
+                case DateTimeUnits.Hours:
+                    return (dt.ToShortTimeString());
+
+                case DateTimeUnits.Days:
+                    return (dt.ToShortDateString());
+
+                case DateTimeUnits.Months:
+                    return (dt.Year + " " + dt.Month);
+
+                default:
+                    return (dt.Year.ToString());
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region MeasurePointLabel
+
+        internal Size MeasurePointLabel(Graphics g, PointLabel pl)
+        {
+            DataLabelVisualStyle dstyle = GetPointLabelVisualStyle(pl);
+
+            int width = (dstyle.MaxTextWidth > 0) ? dstyle.MaxTextWidth : 0;
+
+            using (StringFormat sf = new StringFormat())
+            {
+                if (dstyle.MaxTextLineCount <= 1)
+                    sf.FormatFlags |= StringFormatFlags.NoWrap;
+
+                Size size = g.MeasureString(pl.Label, dstyle.Font, width, sf).ToSize();
+                size.Width++;
+
+                if (dstyle.MaxTextLineCount > 1)
+                {
+                    int lineHeight = (int)(Math.Ceiling(dstyle.Font.GetHeight())) * dstyle.MaxTextLineCount;
+
+                    if (size.Height > lineHeight)
+                        size.Height = lineHeight;
+                }
+
+                return (size);
+            }
+        }
+
+        #region GetPointLabelVisualStyle
+
+        internal DataLabelVisualStyle GetPointLabelVisualStyle(PointLabel pl)
+        {
+            DataLabelVisualStyle dstyle = EffectiveDataLabelStyle.Copy();
+
+            if (pl.DataLabelVisualStyle != null)
+                dstyle.ApplyStyle(pl.DataLabelVisualStyle);
+            else
+                dstyle = EffectiveDataLabelStyle;
+
+            return (dstyle);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region GetRotateDegrees
+
+        internal RotateDegrees GetRotateDegrees(DataLabelVisualStyle dstyle)
+        {
+            RotateDegrees degrees = dstyle.RotateDegrees;
+
+            if (degrees == RotateDegrees.Auto || degrees == RotateDegrees.NotSet)
+            {
+                switch (SeriesType)
+                {
+                    case SeriesType.HorizontalBar:
+                    case SeriesType.HorizontalHiLoBar:
+                        return (RotateDegrees.None);
+
+                    case SeriesType.VerticalBar:
+                    case SeriesType.VerticalHiLoBar:
+                        return (RotateDegrees.Rotate270);
+
+                    default:
+                        return (RotateDegrees.None);
+                }
+            }
+
+            return (dstyle.RotateDegrees);
+        }
+
+        #endregion
+
+        #region IsConvexHullPoint
+
+        /// <summary>
+        /// Determines whether the given SeriesPoint is a ConvexHull point.
+        /// </summary>
+        /// <param name="sp"></param>
+        /// <returns></returns>
+        public bool IsConvexHullPoint(SeriesPoint sp)
+        {
+            if (sp != null && _ConvexHullPoints != null)
+            {
+                ChartXy chartXy = Parent as ChartXy;
+
+                if (chartXy != null)
+                {
+                    ConvexHullDisplayMode mode = GetConvexHullDisplayMode(chartXy);
+
+                    if (mode != ConvexHullDisplayMode.None)
+                    {
+                        foreach (Point ptc in _ConvexHullPoints)
+                        {
+                            if (ptc.Equals(sp.Point[0]) == true)
+                                return (true);
+                        }
+                    }
+                }
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region IsHighLightPoint
+
+        /// <summary>
+        /// Determines if the given SeriesPoint is a HighLight Point (a
+        /// point highlighted by the Crosshair setup).
+        /// </summary>
+        /// <param name="sp"></param>
+        /// <returns></returns>
+        public bool IsHighLightPoint(SeriesPoint sp)
+        {
+            if (sp != null)
+            {
+                ChartXy chartXy = Parent as ChartXy;
+
+                if (chartXy != null)
+                    return (chartXy.IsCrosshairSeriesPoint(this, sp.Point[0]));
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region Style handling
+
+        #region ApplyStyles
+
+        public override void ApplyStyles(BaseVisualStyle style)
+        {
+            ChartSeriesVisualStyle sstyle = style as ChartSeriesVisualStyle;
+
+            if (sstyle != null)
+            {
+                ApplyParentStyles(sstyle, Parent as ChartContainer);
+
+                sstyle.ApplyStyle(ChartSeriesVisualStyle);
+
+                ApplyDefaultLineStyles(sstyle.LineStyle);
+                ApplyDefaultLineStyles(sstyle.SplineStyle);
+                ApplyDefaultLineStyles(sstyle.StepLineStyle);
+                ApplyDefaultLineStyles(sstyle.EmptyStyle);
+
+                ApplyDefaultMarkerStyles(sstyle.MarkerVisualStyle);
+                ApplyDefaultMarkerStyles(sstyle.MarkerEmptyVisualStyle);
+
+                if (sstyle.EmptyAreaBackground.IsEmpty)
+                    sstyle.EmptyAreaBackground = new Background(Color.FromArgb(100, Color.LightGray));
+
+                if (SeriesType == SeriesType.Bubble)
+                {
+                    if (sstyle.MarkerVisualStyle.Background.IsEmpty)
+                        sstyle.MarkerVisualStyle.Background = new Background(DefaultPaletteColor);
+                }
+
+                ApplyDefaultBarStyles(sstyle.BarVisualStyle);
+                ApplyDefaultOhlcBarStyles(sstyle.HiLoBarVisualStyle);
+            }
+            else if (style is DataLabelVisualStyle)
+            {
+                DataLabelVisualStyle dstyle = (DataLabelVisualStyle)style;
+
+                ApplyParentStyles(dstyle, Parent as ChartContainer);
+
+                dstyle.ApplyStyle(_DataLabelVisualStyle);
+
+                dstyle.ApplyDefaults();
+            }
+       }
+
+        #region ApplyParentStyles (ChartSeriesVisualStyle)
+
+        private void ApplyParentStyles(ChartSeriesVisualStyle pstyle, ChartContainer item)
+        {
+            if (item != null)
+            {
+                ApplyParentStyles(pstyle, item.Parent as ChartContainer);
+
+                if (item is ChartXy)
+                    pstyle.ApplyStyle(((ChartXy)item).ChartSeriesVisualStyle);
+
+                if (item is ChartPanel)
+                    pstyle.ApplyStyle(((ChartPanel)item).DefaultVisualStyles.ChartSeriesVisualStyle);
+            }
+            else
+            {
+                pstyle.ApplyStyle(ChartControl.BaseVisualStyles.ChartSeriesVisualStyle);
+                pstyle.ApplyStyle(ChartControl.DefaultVisualStyles.ChartSeriesVisualStyle);
+            }
+        }
+
+        #endregion
+
+        #region ApplyParentStyles (DataLabelVisualStyle)
+
+        private void ApplyParentStyles(DataLabelVisualStyle dstyle, ChartContainer item)
+        {
+            if (item != null)
+            {
+                ApplyParentStyles(dstyle, item.Parent as ChartContainer);
+
+                if (item is BaseChart)
+                    dstyle.ApplyStyle(((ChartXy)item).DataLabelVisualStyle);
+
+                if (item is ChartPanel)
+                    dstyle.ApplyStyle(((ChartPanel)item).DefaultVisualStyles.DataLabelVisualStyle);
+            }
+            else
+            {
+                dstyle.ApplyStyle(ChartControl.BaseVisualStyles.DataLabelVisualStyle);
+                dstyle.ApplyStyle(ChartControl.DefaultVisualStyles.DataLabelVisualStyle);
+            }
+        }
+
+        #endregion
+
+        #region ApplyDefaultLineStyles
+
+        private void ApplyDefaultLineStyles(ChartLineVisualStyle lstyle)
+        {
+            if (lstyle.LineColor.IsEmpty == true)
+                lstyle.LineColor = DefaultPaletteColor;
+
+            lstyle.ApplyDefaults();
+        }
+
+        #endregion
+
+        #region ApplyDefaultMarkerStyles
+
+        private void ApplyDefaultMarkerStyles(PointMarkerVisualStyle pstyle)
+        {
+            if (pstyle.Background.IsEmpty && pstyle.BorderColor.IsEmpty)
+                pstyle.BorderColor = DefaultPaletteColor;
+
+            pstyle.ApplyDefaults();
+        }
+
+        #endregion
+
+        #region ApplyDefaultBarStyles
+
+        private void ApplyDefaultBarStyles(ChartBarVisualStyle bstyle)
+        {
+            if (bstyle.Background.IsEmpty == true)
+                bstyle.Background = new Background(DefaultPaletteColor);
+
+            ApplyDefaultLineStyles(bstyle.Border);
+        }
+
+        #endregion
+
+        #region ApplyDefaultOhlcBarStyles
+
+        private void ApplyDefaultOhlcBarStyles(ChartHiLoBarVisualStyle bstyle)
+        {
+            HiLoBarSegmentStyle sstyle = bstyle.DefaultSegmentStyle;
+
+            if (sstyle.Default.LineColor.IsEmpty == true)
+                sstyle.Default.LineColor = Color.Black;
+
+            sstyle.Default.ApplyDefaults();
+
+            switch (HiLoBarType)
+            {
+                case HiLoBarType.Candle:
+                    bool backSet = (sstyle.BoxBackground.IsEmpty == true);
+
+                    if (backSet == true)
+                        sstyle.BoxBackground = new Background(DefaultPaletteColor);
+
+                    Background bk = sstyle.BoxBackground;
+
+                    sstyle = bstyle.AlternateSegmentStyle;
+
+                    if (sstyle.BoxBackground.IsEmpty == true)
+                    {
+                        if (backSet == true)
+                        {
+                            sstyle.BoxBackground = new Background(Color.Black, DefaultPaletteColor);
+                            sstyle.BoxBackground.HatchFillType = HatchFillType.ForwardDiagonal;
+                        }
+                        else
+                        {
+                            if (bk.IsSolidBrush == true)
+                            {
+                                sstyle.BoxBackground = new Background(Color.Black, bk.Color1);
+                                sstyle.BoxBackground.HatchFillType = HatchFillType.ForwardDiagonal;
+                            }
+                            else if (bk.Color1.IsEmpty == false && bk.Color2.IsEmpty == false)
+                            {
+                                sstyle.BoxBackground = new Background(bk.Color2, bk.Color1);
+                            }
+                        }
+                    }
+                    break;
+
+                case Charts.HiLoBarType.Box:
+                    if (sstyle.BoxBackground.IsEmpty == true)
+                        sstyle.BoxBackground = new Background(DefaultPaletteColor);
+                    break;
+            }
+
+            sstyle = bstyle.DefaultSegmentStyle;
+
+            _RenderFullDefRange = sstyle.CenterLine.IsEmpty &&
+                sstyle.HighWhisker.IsEmpty && sstyle.LowWhisker.IsEmpty;
+
+            sstyle = bstyle.AlternateSegmentStyle;
+
+            _RenderFullAltRange = sstyle.CenterLine.IsEmpty &&
+                sstyle.HighWhisker.IsEmpty && sstyle.LowWhisker.IsEmpty;
+        }
+
+        private bool _RenderFullDefRange;
+        private bool _RenderFullAltRange;
+
+        #endregion
+
+        #endregion
+
+        #region ClearEffectiveStyles
+
+        protected override void ClearEffectiveStyles()
+        {
+            if (_EffectiveChartSeriesStyle.InvalidateStyle() == true)
+                InvalidateLayout();
+
+            if (_EffectiveDataLabelStyle.InvalidateStyle() == true)
+                InvalidateLayout();
+
+            foreach (DataLabel dl in DataLabels)
+                dl.InvalidateStyle();
+
+            if (LegendItem != null)
+                LegendItem.EffectiveStyles.InvalidateStyles();
+
+            PointMarkerImage = null;
+            PointMarkerEmptyImage = null;
+            PointMarkerHighlightImage = null;
+        }
+
+        #endregion
+
+        #region StyleChanged
+
+        protected override void StyleChanged(object sender, PropertyChangedEventArgs e)
+        {
+            base.StyleChanged(sender, e);
+
+            if (sender is ChartLegendItemVisualStyles && LegendItem != null)
+                InvalidateRender(LegendItem.Bounds);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ILegendItem
+
+        #region OnCheckStateChanged
+
+        internal override void OnCheckStateChanged()
+        {
+            if (IsQualitativeXValues || IsQualitativeYValues)
+                InvalidateLayout();
+
+            if (PointLabelDisplayMode != PointLabelDisplayMode.None)
+                InvalidatePointLabels();
+
+            base.OnCheckStateChanged();
+        }
+
+        #endregion
+
+        #region AddSubLegendItems
+
+        internal override void AddSubLegendItems(List<ChartLegendItem> list)
+        {
+            foreach (ChartIndicator ci in ChartIndicators)
+            {
+                if (ci.Visible == true)
+                {
+                    ChartLegendItem li = ci.GetLegendItem();
+
+                    if (li != null)
+                        list.Add(li);
+                }
+            }
+        }
+
+        #endregion
+
+        #region GetLegendItemColorEx
+
+        internal override Color GetLegendItemColorEx()
+        {
+            ChartXy chartXy = Parent as ChartXy;
+
+            ChartSeriesVisualStyle sstyle = EffectiveChartSeriesStyle;
+            PointMarkerVisualStyle pstyle = sstyle.MarkerVisualStyle;
+
+            if (sstyle.ItemColor.IsEmpty == false)
+                return (sstyle.ItemColor);
+
+            switch (SeriesType)
+            {
+                case SeriesType.Bubble:
+                case SeriesType.Point:
+                case SeriesType.HorizontalDot:
+                case SeriesType.VerticalDot:
+                    return (pstyle.Background.Color1);
+
+                case SeriesType.Line:
+                    ChartLineDisplayMode mode = GetLineDisplayMode(chartXy);
+
+                    if ((mode & ChartLineDisplayMode.DisplayLine) == ChartLineDisplayMode.DisplayLine)
+                    {
+                        if (sstyle.LineStyle.LineColor.IsEmpty == false)
+                            return (sstyle.LineStyle.LineColor);
+                    }
+
+                    if ((mode & ChartLineDisplayMode.DisplaySpline) == ChartLineDisplayMode.DisplaySpline)
+                    {
+                        if (sstyle.SplineStyle.LineColor.IsEmpty == false)
+                            return (sstyle.SplineStyle.LineColor);
+                    }
+
+                    if ((mode & ChartLineDisplayMode.DisplayStepLine) == ChartLineDisplayMode.DisplayStepLine)
+                    {
+                        if (sstyle.StepLineStyle.LineColor.IsEmpty == false)
+                            return (sstyle.StepLineStyle.LineColor);
+                    }
+
+                    return (pstyle.Background.Color1);
+
+                case SeriesType.HorizontalBar:
+                case SeriesType.VerticalBar:
+                    return (sstyle.BarVisualStyle.Background.Color1);
+
+                case SeriesType.HorizontalHiLoBar:
+                case SeriesType.VerticalHiLoBar:
+                    HiLoBarSegmentStyle hstyle = sstyle.HiLoBarVisualStyle.DefaultSegmentStyle;
+
+                    if (HiLoBarType == HiLoBarType.Line)
+                    {
+                        if (hstyle.Default.LineColor.IsEmpty == false)
+                            return (hstyle.Default.LineColor);
+
+                        return (hstyle.CenterLine.LineColor);
+                    }
+                        
+                    return (hstyle.BoxBackground.Color1);
+            }
+
+            return (Color.Empty);
+        }
+
+        #endregion
+
+        #region RenderLegendItemMarkerEx
+
+        internal override void RenderLegendItemMarkerEx(
+            Graphics g, ChartLegendItem litem, ChartLegendItemVisualStyle style)
+        {
+            ChartXy chartXy = Parent as ChartXy;
+            ChartSeriesVisualStyle sstyle = EffectiveChartSeriesStyle;
+
+            Rectangle bounds = litem.MarkerBounds;
+
+            switch (SeriesType)
+            {
+                case SeriesType.HorizontalHiLoBar:
+                case SeriesType.VerticalHiLoBar:
+                    RenderHiLoBarMarker(g, bounds, chartXy, sstyle);
+                    break;
+
+                case SeriesType.VerticalBar:
+                case SeriesType.HorizontalBar:
+                    RenderBarMarker(g, bounds, chartXy, sstyle);
+                    break;
+
+                case SeriesType.Bubble:
+                    RenderBubbleMarker(g, bounds, chartXy, sstyle);
+                    break; ;
+
+                case SeriesType.VerticalDot:
+                case SeriesType.HorizontalDot:
+                case SeriesType.Point:
+                    RenderDotMarker(g, bounds, chartXy, sstyle);
+                    break;
+
+                case SeriesType.Line:
+                    RenderLineMarker(g, bounds, chartXy, sstyle);
+                    break;
+
+                default:
+                    RenderDefaultMarker(g, bounds, sstyle);
+                    break;
+            }
+        }
+
+        #region RenderHiLoBarMarker
+
+        private void RenderHiLoBarMarker(Graphics g,
+            Rectangle bounds, ChartXy chartXy, ChartSeriesVisualStyle sstyle)
+        {
+            Rectangle r = bounds;
+            r.Inflate(-1, -1);
+
+            if (r.Width > 0 && r.Height > 0)
+            {
+                SmoothingMode sm = g.SmoothingMode;
+                g.SmoothingMode = SmoothingMode.None;
+
+                HiLoBarSegmentStyle hstyle = sstyle.HiLoBarVisualStyle.DefaultSegmentStyle;
+
+                if (HiLoBarType == HiLoBarType.Line)
+                {
+                    Color color = hstyle.Default.LineColor;
+
+                    if (color.IsEmpty == true)
+                        color = hstyle.CenterLine.LineColor;
+
+                    if (color.IsEmpty == true)
+                        color = DefaultPaletteColor;
+
+                    if (color.IsEmpty == true)
+                        color = Color.Black;
+
+                    if (IsRotated == true || r.Width > r.Height)
+                        RenderHiLoHBarMarker(g, r, color);
+                    else
+                        RenderHiLoVBarMarker(g, r, color);
+                }
+                else
+                {
+                    Background bk = hstyle.BoxBackground;
+                    ChartLineVisualStyle lstyle = hstyle.BoxBorder;
+
+                    if (IsRotated == true || r.Width > r.Height)
+                        RenderHBoxMarker(g, r, bk, hstyle, lstyle);
+                    else
+                        RenderVBoxMarker(g, r, bk, hstyle, lstyle);
+                }
+
+                g.SmoothingMode = sm;
+            }
+        }
+
+        #region RenderHBoxMarker
+
+        private void RenderHBoxMarker(Graphics g, Rectangle r,
+            Background bk, HiLoBarSegmentStyle hstyle, ChartLineVisualStyle lstyle)
+        {
+            int n = r.Height / 4;
+
+            Rectangle t = r;
+            t.Inflate(-n, -n);
+
+            if (t.Height % 2 != 0)
+            {
+                t.Y--;
+                t.Height++;
+            }
+
+            using (Brush br = bk.GetBrush(t))
+                g.FillRectangle(br, t);
+
+            Color lineColor = lstyle.LineColor;
+
+            if (lineColor.IsEmpty == true)
+                lineColor = hstyle.Default.LineColor;
+
+            if (lineColor.IsEmpty == true)
+                lineColor = Color.Black;
+
+            using (Pen pen = new Pen(lineColor))
+            {
+                Point pt1 = new Point(r.X, (r.Y + r.Bottom) / 2);
+                Point pt2 = new Point(t.X, pt1.Y);
+
+                g.DrawLine(pen, pt1, pt2);
+
+                pt1.X = t.Right;
+                pt2.X = r.Right;
+
+                g.DrawLine(pen, pt1, pt2);
+            }
+
+            using (Pen pen = new Pen(lineColor))
+                g.DrawRectangle(pen, t);
+        }
+
+        #endregion
+
+        #region RenderVBoxMarker
+
+        private void RenderVBoxMarker(Graphics g, Rectangle r,
+            Background bk, HiLoBarSegmentStyle hstyle, ChartLineVisualStyle lstyle)
+        {
+            int n = r.Width / 4;
+
+            Rectangle t = r;
+            t.Inflate(-n, -n);
+
+            if (t.Width % 2 != 0)
+            {
+                t.X--;
+                t.Width++;
+            }
+
+            using (Brush br = bk.GetBrush(t))
+                g.FillRectangle(br, t);
+
+            Color lineColor = lstyle.LineColor;
+
+            if (lineColor.IsEmpty == true)
+                lineColor = hstyle.Default.LineColor;
+
+            if (lineColor.IsEmpty == true)
+                lineColor = Color.Black;
+
+            using (Pen pen = new Pen(lineColor))
+            {
+                Point pt1 = new Point((r.X + r.Right) / 2, r.Y);
+                Point pt2 = new Point(pt1.X, t.Y);
+
+                g.DrawLine(pen, pt1, pt2);
+
+                pt1.Y = t.Bottom;
+                pt2.Y = r.Bottom;
+
+                g.DrawLine(pen, pt1, pt2);
+            }
+
+            using (Pen pen = new Pen(lineColor))
+                g.DrawRectangle(pen, t);
+        }
+
+        #endregion
+
+        #region RenderHiLoHBarMarker
+
+        private void RenderHiLoHBarMarker(Graphics g, Rectangle r, Color color)
+        {
+            Point pt1 = new Point(r.X, (r.Y + r.Bottom) / 2);
+            Point pt2 = new Point(r.Right, pt1.Y);
+
+            using (Pen pen = new Pen(color))
+            {
+                g.DrawLine(pen, pt1, pt2);
+
+                int n = (r.Bottom - r.Top) / 3;
+
+                pt1.X = r.X + (r.Width / 4);
+                pt1.Y -= n;
+
+                pt2.X = pt1.X;
+
+                g.DrawLine(pen, pt1, pt2);
+
+                pt1.X = r.X + (r.Width / 4) * 3;
+                pt1.Y += (2 * n);
+                pt2.X = pt1.X;
+
+                g.DrawLine(pen, pt1, pt2);
+            }
+        }
+
+        #endregion
+
+        #region RenderHiLoVBarMarker
+
+        private void RenderHiLoVBarMarker(Graphics g, Rectangle r, Color color)
+        {
+            Point pt1 = new Point((r.X + r.Right) / 2, r.Y);
+            Point pt2 = new Point(pt1.X, r.Bottom);
+
+            using (Pen pen = new Pen(color))
+            {
+                g.DrawLine(pen, pt1, pt2);
+
+                int n = (r.Right - r.Left) / 3;
+
+                pt1.X -= n;
+                pt1.Y = r.Y + (r.Height / 4);
+                pt2.Y = pt1.Y;
+
+                g.DrawLine(pen, pt1, pt2);
+
+                pt1.X += (2 * n);
+                pt1.Y = r.Y + (r.Height / 4) * 3;
+                pt2.Y = pt1.Y;
+
+                g.DrawLine(pen, pt1, pt2);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderBarMarker
+
+        private void RenderBarMarker(Graphics g, Rectangle bounds, ChartXy chartXy, ChartSeriesVisualStyle sstyle)
+        {
+            ChartLineVisualStyle cstyle = sstyle.BarVisualStyle.Border;
+            Background bk = sstyle.BarVisualStyle.Background;
+
+            Rectangle r = bounds;
+            r.Inflate(-1, -1);
+
+            using (Brush br = bk.GetBrush(r))
+            {
+                g.FillRectangle(br, r);
+
+                if (cstyle.LineColor.IsEmpty == false && cstyle.LinePattern != LinePattern.None)
+                {
+                    using (Pen pen = new Pen(cstyle.LineColor, cstyle.LineWidth))
+                    {
+                        if (cstyle.LinePattern != LinePattern.NotSet)
+                            pen.DashStyle = (DashStyle)cstyle.LinePattern;
+
+                        g.DrawRectangle(pen, r);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region RenderBubbleMarker
+
+        private void RenderBubbleMarker(Graphics g,
+            Rectangle bounds, ChartXy chartXy, ChartSeriesVisualStyle sstyle)
+        {
+            PointMarkerVisualStyle pstyle = sstyle.MarkerVisualStyle;
+
+            Background bk = pstyle.Background;
+
+            Rectangle r = bounds;
+            r.Inflate(-1, -1);
+
+            using (Brush br = pstyle.Background.GetBrush(r))
+            {
+                g.FillEllipse(br, r);
+
+                if (pstyle.BorderColor.IsEmpty == false && pstyle.BorderWidth > 0)
+                {
+                    using (Pen pen = new Pen(pstyle.BorderColor, pstyle.BorderWidth))
+                        g.DrawEllipse(pen, r);
+                }
+            }
+        }
+
+        #endregion
+
+        #region RenderDotMarker
+
+        private void RenderDotMarker(Graphics g,
+            Rectangle bounds, ChartXy chartXy, ChartSeriesVisualStyle sstyle)
+        {
+            PointMarkerVisualStyle pstyle = sstyle.MarkerVisualStyle;
+
+            Image marker = pstyle.GetPointMarkerImage();
+
+            if (marker != null)
+            {
+                g.DrawImage(marker, bounds);
+            }
+            else
+            {
+                marker = chartXy.GetPointMarker(g, pstyle.Type, pstyle.PointCount,
+                    bounds.Size, pstyle.Rotation, pstyle.Background,
+                    pstyle.BorderColor, pstyle.BorderWidth);
+
+                if (marker != null)
+                {
+                    // Make allowances for the fact that GetPointMarker() adjusts the
+                    // size and pos of the image to allow for better anti-aliasing
+
+                    bounds.X--;
+                    bounds.Y--;
+
+                    g.DrawImageUnscaled(marker, bounds);
+                }
+                else
+                {
+                    RenderDefaultMarker(g, bounds, sstyle);
+                }
+            }
+        }
+
+        #endregion
+
+        #region RenderLineMarker
+
+        private void RenderLineMarker(Graphics g,
+            Rectangle bounds, ChartXy chartXy, ChartSeriesVisualStyle sstyle)
+        {
+            ChartLineDisplayMode mode = GetLineDisplayMode(chartXy);
+
+            int n = bounds.Height / 2;
+
+            using (Pen pen = new Pen(GetLegendItemColor()))
+            {
+                g.DrawLine(pen,
+                    new Point(bounds.X, bounds.Y + n),
+                    new Point(bounds.Right - 1, bounds.Y + n));
+            }
+
+            if ((mode & ChartLineDisplayMode.DisplayPoints) == ChartLineDisplayMode.DisplayPoints)
+            {
+                n = Math.Min(bounds.Height, bounds.Width);
+                n = (int)Math.Ceiling((double)n / 2);
+
+                if (n % 2 == 0)
+                    n++;
+
+                Rectangle r = bounds;
+
+                r.X += ((r.Width - n) / 2);
+                r.Y += ((r.Height - n) / 2);
+
+                r.Width = n;
+                r.Height = n;
+
+                PointMarkerVisualStyle pstyle = sstyle.MarkerVisualStyle;
+
+                Image marker2 = chartXy.GetPointMarker(g, pstyle.Type, pstyle.PointCount,
+                    r.Size, 0, pstyle.Background, pstyle.BorderColor, pstyle.BorderWidth > 0 ? 1 : 0);
+
+                if (marker2 != null)
+                {
+                    // Make allowances for the fact that GetPointMarker() adjusts the
+                    // size and pos of the image to allow for better anti-aliasing
+
+                    r.X--;
+                    r.Y--;
+
+                    g.DrawImageUnscaled(marker2, r);
+                }
+                else
+                {
+                    RenderDefaultMarker(g, bounds, sstyle);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region Copy/CopyTo
+
+        public override ChartVisualElement Copy()
+        {
+            ChartSeries copy = new ChartSeries();
+
+            CopyTo(copy);
+
+            return (copy);
+        }
+
+        public override void CopyTo(ChartVisualElement copy)
+        {
+            ChartSeries c = copy as ChartSeries;
+
+            if (c != null)
+            {
+                base.CopyTo(c);
+
+                c.AreaBaseValue = AreaBaseValue;
+
+                c.AxisX = AxisX;
+                c.AxisY = AxisY;
+
+                c.BarFillRange = BarFillRange;
+                c.BarLabelPosition = BarLabelPosition;
+                c.BarShadingEnabled = BarShadingEnabled;
+                c.BarWidthRatio = BarWidthRatio;
+
+                c.BubbleIntensityMode = BubbleIntensityMode;
+                c.BubbleMaxPercentage = BubbleMaxPercentage;
+                c.BubbleMinSize = BubbleMinSize;
+                c.BubbleScaleFactor = BubbleScaleFactor;
+                c.BubbleSizeMode = BubbleSizeMode;
+
+                foreach (ChartIndicator ci in ChartIndicators)
+                    c.ChartIndicators.Add((ChartIndicator)ci.Copy());
+
+                c.ChartLineAreaDisplayMode = ChartLineAreaDisplayMode;
+                c.ChartLineDisplayMode = ChartLineDisplayMode;
+
+                c.ChartSeriesVisualStyle =
+                    (_ChartSeriesVisualStyle != null) ? _ChartSeriesVisualStyle.Copy() : null;
+
+                c.ConvexHullDisplayMode = ConvexHullDisplayMode;
+
+                c.CrosshairEnabled = CrosshairEnabled;
+                c.CrosshairHighlightPoints = CrosshairHighlightPoints;
+                c.CrosshairShowLabels = CrosshairShowLabels;
+
+                foreach (DataLabel dl in DataLabels)
+                    c.DataLabels.Add((DataLabel)dl.Copy());
+
+                c.DataLabelVisualStyle =
+                    (_DataLabelVisualStyle != null) ? _DataLabelVisualStyle.Copy() : null;
+
+                c.DisplayLinePointsOnTop = DisplayLinePointsOnTop;
+                c.DotPlotIndexValue = DotPlotIndexValue;
+
+                c.EmptyValues = EmptyValues;
+                c.EnableEmptyValues = EnableEmptyValues;
+
+                c.GroupId = GroupId;
+                c.HiLoBarType = HiLoBarType;
+                c.CrosshairHighlightSinglePoint = CrosshairHighlightSinglePoint;
+
+                c.PointLabelDisplayMode = PointLabelDisplayMode;
+                c.PointLabelMinDistance = PointLabelMinDistance;
+                c.PointLabelSkip = PointLabelSkip;
+
+                c.ScaleTypeX = ScaleTypeX;
+                c.ScaleTypeY = ScaleTypeY;
+
+                foreach (SeriesPoint sp in SeriesPoints)
+                    c.SeriesPoints.Add(sp.Copy());
+
+                c.SeriesType = SeriesType;
+
+                c.ShowEmptyLines = ShowEmptyLines;
+                c.ShowEmptyPoints = ShowEmptyPoints;
+                c.ShowHiLoBarMedianLines = ShowHiLoBarMedianLines;
+                c.ShowOriginValueLabels = ShowOriginValueLabels;
+                c.StackQualitativePoints = StackQualitativePoints;
+
+                c.StepLines = StepLines;
+                c.StepLineMode = StepLineMode;
+            }
+        }
+
+        #endregion
+
+        #region GetSerialData
+
+        internal override SerialElementCollection GetSerialData(string serialName)
+        {
+            SerialElementCollection sec = new SerialElementCollection();
+
+            if (serialName != null)
+            {
+                if (serialName.Equals("") == true)
+                    serialName = "ChartSeries";
+
+                sec.AddStartElement(serialName);
+            }
+
+            sec.AddDataValue("AreaBaseValue", AreaBaseValue, null);
+
+            if (AxisX != null && string.IsNullOrEmpty(AxisX.Name) == false)
+                sec.AddValue("AxisX", AxisX.Name);
+
+            if (AxisY != null && string.IsNullOrEmpty(AxisY.Name) == false)
+                sec.AddValue("AxisY", AxisY.Name);
+
+            sec.AddValue("BarFillRange", BarFillRange, BarFillRange.NotSet);
+            sec.AddValue("BarLabelPosition", BarLabelPosition, BarLabelPosition.NotSet);
+            sec.AddValue("BarShadingEnabled", BarShadingEnabled, Tbool.NotSet);
+            sec.AddValue("BarWidthRatio", BarWidthRatio, 0d);
+
+            sec.AddValue("BubbleIntensityMode", BubbleIntensityMode, BubbleIntensityMode.NotSet);
+            sec.AddValue("BubbleMaxPercentage", BubbleMaxPercentage, 0.25d);
+            sec.AddValue("BubbleMinSize", BubbleMinSize, 4);
+            sec.AddValue("BubbleScaleFactor", BubbleScaleFactor, 1.0d);
+            sec.AddValue("BubbleSizeMode", BubbleSizeMode, BubbleSizeMode.NotSet);
+
+            if (_ChartIndicators != null && _ChartIndicators.Count > 0)
+            {
+                sec.AddStartElement("ChartIndicators count=\"" + _ChartIndicators.Count + "\"");
+
+                foreach (ChartIndicator ci in _ChartIndicators)
+                    sec.AddElement(ci.GetSerialData(""));
+
+                sec.AddEndElement("ChartIndicators");
+            }
+
+            sec.AddValue("ChartLineAreaDisplayMode", ChartLineAreaDisplayMode, ChartLineAreaDisplayMode.NotSet);
+            sec.AddValue("ChartLineDisplayMode", ChartLineDisplayMode, ChartLineDisplayMode.NotSet);
+
+            if (_ChartSeriesVisualStyle != null)
+                sec.AddElement(_ChartSeriesVisualStyle.GetSerialData("ChartSeriesVisualStyle"));
+
+            sec.AddValue("ConvexHullDisplayMode", ConvexHullDisplayMode, ConvexHullDisplayMode.NotSet);
+
+            sec.AddValue("CrosshairEnabled", CrosshairEnabled, Tbool.NotSet);
+            sec.AddValue("CrosshairHighlightPoints", CrosshairHighlightPoints, Tbool.NotSet);
+            sec.AddValue("CrosshairHighlightSinglePoint", CrosshairHighlightSinglePoint, Tbool.NotSet);
+            sec.AddValue("CrosshairShowLabels", CrosshairShowLabels, Tbool.NotSet);
+
+            if (_DataLabels != null && _DataLabels.Count > 0)
+            {
+                sec.AddStartElement("DataLabels count=\"" + _DataLabels.Count + "\"");
+
+                foreach (DataLabel dl in _DataLabels)
+                    sec.AddElement(dl.GetSerialData(""));
+
+                sec.AddEndElement("DataLabels");
+            }
+
+            if (_DataLabelVisualStyle != null)
+                sec.AddElement(_DataLabelVisualStyle.GetSerialData("DataLabelVisualStyle"));
+
+            sec.AddValue("DisplayLinePointsOnTop", DisplayLinePointsOnTop, true);
+            sec.AddValue("DotPlotIndexValue", DotPlotIndexValue, 1.0d);
+
+            if (_EmptyValues != null && _EmptyValues.Length > 0)
+            {
+                sec.AddStartElement("EmptyValues count=\"" + _EmptyValues.Length + "\"");
+
+                foreach (object value in _EmptyValues)
+                    sec.AddValue("EmptyValue", value);
+
+                sec.AddEndElement("EmptyValues");
+            }
+
+            sec.AddValue("EnableEmptyValues", EnableEmptyValues, false);
+
+            sec.AddValue("GroupId", GroupId, 0);
+            sec.AddValue("HiLoBarType", HiLoBarType, HiLoBarType.Box);
+
+            sec.AddValue("PointLabelDisplayMode", PointLabelDisplayMode, PointLabelDisplayMode.NotSet);
+            sec.AddValue("PointLabelMinDistance", PointLabelMinDistance, 0);
+            sec.AddValue("PointLabelSkip", PointLabelSkip, 0);
+
+            sec.AddValue("ScaleTypeX", ScaleTypeX, ScaleType.NotSet);
+            sec.AddValue("ScaleTypeY", ScaleTypeY, ScaleType.NotSet);
+
+            if (_SeriesPoints != null && _SeriesPoints.Count > 0)
+            {
+                sec.AddStartElement("SeriesPoints count=\"" + _SeriesPoints.Count + "\"");
+
+                foreach (SeriesPoint sp in _SeriesPoints)
+                    sec.AddElement(sp.GetSerialData());
+
+                sec.AddEndElement("SeriesPoints");
+            }
+
+            sec.AddValue("SeriesType", SeriesType, SeriesType.Point);
+
+            sec.AddValue("ShowEmptyLines", ShowEmptyLines, false);
+            sec.AddValue("ShowEmptyPoints", ShowEmptyPoints, false);
+            sec.AddValue("ShowHiLoBarMedianLines", ShowHiLoBarMedianLines, false);
+            sec.AddValue("ShowOriginValueLabels", ShowOriginValueLabels, true);
+
+            sec.AddValue("StackQualitativePoints", StackQualitativePoints, true);
+
+            sec.AddValue("StepLines", StepLines, StepLines.NotSet);
+            sec.AddValue("StepLineMode", StepLineMode, StepLineMode.NotSet);
+
+            sec.AddElement(base.GetSerialData(null));
+
+            if (serialName != null)
+                sec.AddEndElement(serialName);
+
+            return (sec);
+        }
+
+        #endregion
+
+        #region PutSerialData
+
+        #region ProcessValue
+
+        internal override void ProcessValue(SerialElement se)
+        {
+            ChartXy chartXy = Parent as ChartXy;
+
+            switch (se.Name)
+            {
+                case "AreaBaseValue":
+                    AreaBaseValue = se.DataValue;
+                    break;
+
+                case "AxisX":
+                    if (chartXy != null)
+                        AxisX = GetAncillaryAxis(chartXy.AncillaryAxesX, se.GetValueString());
+                    break;
+
+                case "AxisY":
+                    if (chartXy != null)
+                        AxisY = GetAncillaryAxis(chartXy.AncillaryAxesY, se.GetValueString());
+                    break;
+
+                case "BarFillRange":
+                    BarFillRange = (BarFillRange)se.GetValueEnum(typeof(BarFillRange));
+                    break;
+
+                case "BarLabelPosition":
+                    BarLabelPosition = (BarLabelPosition)se.GetValueEnum(typeof(BarLabelPosition));
+                    break;
+
+                case "BarShadingEnabled":
+                    BarShadingEnabled = (Tbool)se.GetValueEnum(typeof(Tbool));
+                    break;
+
+                case "BarWidthRatio":
+                    BarWidthRatio = double.Parse(se.StringValue);
+                    break;
+
+                case "BubbleIntensityMode":
+                    BubbleIntensityMode = (BubbleIntensityMode)se.GetValueEnum(typeof(BubbleIntensityMode));
+                    break;
+
+                case "BubbleMaxPercentage":
+                    BubbleMaxPercentage = double.Parse(se.StringValue);
+                    break;
+
+                case "BubbleMinSize":
+                    BubbleMinSize = int.Parse(se.StringValue);
+                    break;
+
+                case "BubbleScaleFactor":
+                    BubbleScaleFactor = double.Parse(se.StringValue);
+                    break;
+
+                case "BubbleSizeMode":
+                    BubbleSizeMode = (BubbleSizeMode)se.GetValueEnum(typeof(BubbleSizeMode));
+                    break;
+
+                case "ChartLineAreaDisplayMode":
+                    ChartLineAreaDisplayMode = (ChartLineAreaDisplayMode)se.GetValueEnum(typeof(ChartLineAreaDisplayMode));
+                    break;
+
+                case "ChartLineDisplayMode":
+                    ChartLineDisplayMode = (ChartLineDisplayMode)se.GetValueEnum(typeof(ChartLineDisplayMode));
+                    break;
+
+                case "ConvexHullDisplayMode":
+                    ConvexHullDisplayMode = (ConvexHullDisplayMode)se.GetValueEnum(typeof(ConvexHullDisplayMode));
+                    break;
+
+                case "CrosshairEnabled":
+                    CrosshairEnabled = (Tbool)se.GetValueEnum(typeof(Tbool));
+                    break;
+
+                case "CrosshairHighlightPoints":
+                    CrosshairHighlightPoints = (Tbool)se.GetValueEnum(typeof(Tbool));
+                    break;
+
+                case "CrosshairHighlightSinglePoint":
+                    CrosshairHighlightSinglePoint = (Tbool)se.GetValueEnum(typeof(Tbool));
+                    break;
+
+                case "CrosshairShowLabels":
+                    CrosshairShowLabels = (Tbool)se.GetValueEnum(typeof(Tbool));
+                    break;
+
+                case "DisplayLinePointsOnTop":
+                    DisplayLinePointsOnTop = bool.Parse(se.StringValue);
+                    break;
+
+                case "DotPlotIndexValue":
+                    DotPlotIndexValue = double.Parse(se.StringValue);
+                    break;
+
+                case "EmptyValues":
+                    EmptyValues[se.ValueIndex] = se.DataValue;
+                    break;
+
+                case "EnableEmptyValues":
+                    EnableEmptyValues = bool.Parse(se.StringValue);
+                    break;
+
+                case "GroupId":
+                    GroupId = int.Parse(se.StringValue);
+                    break;
+
+                case "HiLoBarType":
+                    HiLoBarType = (HiLoBarType)se.GetValueEnum(typeof(HiLoBarType));
+                    break;
+
+                case "PointLabelDisplayMode":
+                    PointLabelDisplayMode = (PointLabelDisplayMode)se.GetValueEnum(typeof(PointLabelDisplayMode));
+                    break;
+
+                case "PointLabelMinDistance":
+                    PointLabelMinDistance = int.Parse(se.StringValue);
+                    break;
+
+                case "PointLabelSkip":
+                    PointLabelSkip = int.Parse(se.StringValue);
+                    break;
+
+                case "ScaleTypeX":
+                    ScaleTypeX = (ScaleType)se.GetValueEnum(typeof(ScaleType));
+                    break;
+
+                case "ScaleTypeY":
+                    ScaleTypeY = (ScaleType)se.GetValueEnum(typeof(ScaleType));
+                    break;
+
+                case "SeriesType":
+                    SeriesType = (SeriesType)se.GetValueEnum(typeof(SeriesType));
+                    break;
+
+                case "ShowEmptyLines":
+                    ShowEmptyLines = bool.Parse(se.StringValue);
+                    break;
+
+                case "ShowEmptyPoints":
+                    ShowEmptyPoints = bool.Parse(se.StringValue);
+                    break;
+
+                case "ShowHiLoBarMedianLines":
+                    ShowHiLoBarMedianLines = bool.Parse(se.StringValue);
+                    break;
+
+                case "ShowOriginValueLabels":
+                    ShowOriginValueLabels = bool.Parse(se.StringValue);
+                    break;
+
+                case "StackQualitativePoints":
+                    StackQualitativePoints = bool.Parse(se.StringValue);
+                    break;
+
+                case "StepLines":
+                    StepLines = (StepLines)se.GetValueEnum(typeof(StepLines));
+                    break;
+
+                case "StepLineMode":
+                    StepLineMode = (StepLineMode)se.GetValueEnum(typeof(StepLineMode));
+                    break;
+
+                default:
+                    base.ProcessValue(se);
+                    break;
+            }
+        }
+
+        #region GetAncillaryAxis
+
+        private ChartAxis GetAncillaryAxis(ChartAxesCollection axes, string name)
+        {
+            foreach (ChartAxis axis in axes)
+            {
+                if (name.Equals(axis.Name) == true)
+                    return (axis);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ProcessCollection
+
+        internal override void ProcessCollection(SerialElement se)
+        {
+            SerialElementCollection sec = se.Sec;
+
+            switch (se.Name)
+            {
+                case "ChartIndicators":
+                    sec.PutSerialData(this);
+                    break;
+
+                case "ChartSeriesVisualStyle":
+                    sec.PutSerialData(ChartSeriesVisualStyle);
+                    break;
+
+                case "DataLabel":
+                    sec.PutSerialData(DataLabels[se.ValueIndex]);
+                    break;
+
+                case "DataLabels":
+                    sec.PutSerialData(this);
+                    break;
+
+                case "DataLabelVisualStyle":
+                    sec.PutSerialData(DataLabelVisualStyle);
+                    break;
+
+                case "EmptyValues":
+                    if (se.ArrayCount > 0)
+                    {
+                        EmptyValues = new object[se.ArrayCount];
+
+                        sec.PutSerialData(this);
+                    }
+                    break;
+
+                case "RegressionLine":
+                    string rname = se.Sec.GetItemValue("Name");
+
+                    RegressionLine reg = ChartIndicators[rname] as RegressionLine;
+
+                    if (reg != null)
+                        ChartIndicators.Remove(reg);
+
+                    reg = new RegressionLine(rname);
+
+                    if (reg != null)
+                    {
+                        sec.PutSerialData(reg);
+
+                        ChartIndicators.Add(reg);
+                    }
+                    break;
+
+                case "SeriesPoints":
+                    if (se.ArrayCount > 0)
+                    {
+                        SeriesPoints = new SeriesPointCollection();
+
+                        sec.PutSerialData(this);
+                    }
+                    break;
+
+                case "SeriesPoint":
+                    SeriesPoint sp = new SeriesPoint();
+
+                    sec.PutSerialData(sp);
+
+                    SeriesPoints.Add(sp);
+                    break;
+
+                case "TrendLine":
+                    string tname = se.Sec.GetItemValue("Name");
+
+                    TrendLine trend = ChartIndicators[tname] as TrendLine;
+
+                    if (trend != null)
+                        ChartIndicators.Remove(trend);
+
+                    trend = new TrendLine(tname);
+
+                    if (trend != null)
+                    {
+                        sec.PutSerialData(trend);
+
+                        ChartIndicators.Add(trend);
+                    }
+                    break;
+
+                default:
+                    base.ProcessCollection(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Series States
+
+        [Flags]
+        private enum States : uint
+        {
+            FilterIgnoreMatchCase = (1U << 0),
+
+            CheckedInLegend = (1U << 1),
+            ShowInLegend = (1U << 2),
+            ShowInParentLegend = (1U << 3),
+            ShowCheckBoxInLegend = (1U << 4),
+            ShowMarkerInLegend = (1U << 5),
+
+            IsSorted = (1U << 6),
+            IsRotated = (1U << 7),
+
+            StackQualitativePoints = (1U << 8),
+            DisplayLinePointsOnTop = (1U << 9),
+
+            EnableEmptyValues = (1U << 10),
+            ShowEmptyLines = (1U << 11),
+            ShowEmptyPoints = (1U << 12),
+            ShowOriginValueLabels = (1U << 13),
+            ShowHiLoBarMedianLines = (1U << 14),
+
+            NeedToUpdateBindings = (1U << 15),
+
+            IsInnerRingSeries = (1U << 16),
+            IsOuterRingSeries = (1U << 17),
+
+            IsOffset = (1U << 18),
+            IsDetached = (1U << 19),
+
+            ShowInnerRingsEx = (1U << 20),
+        }
+
+        #region TestState
+
+        private bool TestState(States state)
+        {
+            return ((_States & state) == state);
+        }
+
+        #endregion
+
+        #region SetState
+
+        private void SetState(States state, bool value)
+        {
+            if (value == true)
+                _States |= state;
+            else
+                _States &= ~state;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IDisposable
+
+        public override void Dispose()
+        {
+            AxisX = null;
+            AxisY = null;
+            ChartIndicators = null;
+            ChartLegendItemVisualStyles = null;
+            ChartSeriesVisualStyle = null;
+            DataLabels = null;
+            DataLabelVisualStyle = null;
+            SeriesPoints = null;
+
+            base.Dispose();
+        }
+
+        #endregion
+    }
+
+    #region SortedSeriesPoints
+
+    public class SortedSeriesPoints
+    {
+        #region Private variables
+
+        private ChartSeries _ChartSeries;
+        private SeriesPointCollection _Spc;
+
+        private int[] _IndexArray;
+        private int[] _CountArray;
+
+        private int _SeriesLayoutCount;
+
+        private double _Slope = double.NaN;
+        private double _Intercept = double.NaN;
+
+        private bool _SlopeCalculated;
+        private int _SlopeIndex;
+
+        #endregion
+
+        public SortedSeriesPoints(ChartSeries series, bool sortPoints)
+        {
+            _ChartSeries = series;
+            _Spc = series.SeriesPoints;
+
+            if (sortPoints == true)
+                _IndexArray = CreateIndexArray(_Spc);
+        }
+
+        #region Public properties
+
+        #region Count
+
+        public int Count
+        {
+            get
+            {
+                if (_IndexArray != null)
+                    return (_IndexArray.Length);
+
+                return (_Spc.Count);
+            }
+        }
+
+        #endregion
+
+        #region Indexer[int]
+
+        public SeriesPoint this[int index]
+        {
+            get
+            {
+                if (_IndexArray != null)
+                    index = _IndexArray[index];
+
+                return (_Spc[index]);
+            }
+        }
+
+        #endregion
+
+        #region IsSorted
+
+        public bool IsSorted
+        {
+            get { return (_ChartSeries.IsSorted); }
+        }
+
+        #endregion
+
+        #region SeriesLayoutCount
+
+        public int SeriesLayoutCount
+        {
+            get { return (_SeriesLayoutCount); }
+
+            set
+            {
+                if (value != _SeriesLayoutCount)
+                    _SeriesLayoutCount = value;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region CountArray
+
+        internal int[] CountArray
+        {
+            get { return (_CountArray); }
+            set { _CountArray = value; }
+        }
+
+        #endregion
+
+        #region IndexArray
+
+        internal int[] IndexArray
+        {
+            get { return (_IndexArray); }
+            set { _IndexArray = value; }
+        }
+
+        #endregion
+
+        #region Intercept
+
+        internal double Intercept
+        {
+            get
+            {
+                if (_SlopeCalculated == false)
+                    CalcSeriesSlope();
+
+                return (_Intercept);
+            }
+
+            set { _Intercept = value; }
+        }
+
+        #endregion
+
+        #region Slope
+
+        internal double Slope
+        {
+            get
+            {
+                if (_SlopeCalculated == false)
+                    CalcSeriesSlope();
+
+                return (_Slope);
+            }
+
+            set { _Slope = value; }
+        }
+
+        #endregion
+
+        #region SlopeIndex
+
+        internal int SlopeIndex
+        {
+            get { return (_SlopeIndex); }
+
+            set
+            {
+                if (_SlopeIndex != value)
+                {
+                    _SlopeIndex = value;
+                    _SlopeCalculated = false;
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region CreateIndexArray
+
+        private int[] CreateIndexArray(SeriesPointCollection spc)
+        {
+            int[] indexArray = new int[_Spc.Count];
+            object[] keyArray = new object[_Spc.Count];
+
+            for (int i = 0; i < _Spc.Count; i++)
+            {
+                indexArray[i] = i;
+                keyArray[i] = _Spc[i].ValueX;
+            }
+
+            Array.Sort(keyArray, indexArray);
+
+            return (indexArray);
+        }
+
+        #endregion
+
+        #region SearchX
+
+        public int SearchX(object okey)
+        {
+            ChartXy chartXy = _ChartSeries.Parent as ChartXy;
+
+            if (IsSorted == true)
+            {
+                int min = 0;
+                int max = Count - 1;
+
+                while (min <= max)
+                {
+                    int mid = (min + max) / 2;
+
+                    int cmp = chartXy.DataCompare(okey, this[mid].ValueX);
+
+                    if (cmp > 0)
+                        min = mid + 1;
+
+                    else if (cmp < 0)
+                        max = mid - 1;
+
+                    else
+                        return (mid);
+                }
+
+                return (-((min > 0) ? min - 1 : 0));
+            }
+            else
+            {
+                for (int i = 0; i < Count; i++)
+                {
+                    if (chartXy.DataCompare(okey, this[i].ValueX) == 0)
+                        return (i);
+                }
+
+                return (-1);
+            }
+        }
+
+        #endregion
+
+        #region SearchY
+
+        public int SearchY(object okey)
+        {
+            ChartXy chartXy = _ChartSeries.Parent as ChartXy;
+
+            for (int i = 0; i < _Spc.Count; i++)
+            {
+                if (_Spc[i].ValueY[0].Equals(okey))
+                    return (i);
+            }
+
+            return (0);
+        }
+
+        #endregion
+
+        #region GetQualitativeXIndex
+
+        internal int GetQualitativeXIndex(object okey)
+        {
+            int index;
+
+            if (okey is string)
+                index = _ChartSeries.QualitativeXValues.IndexOf((string)okey);
+            else
+                index = Convert.ToInt32(okey);
+
+            return (index);
+        }
+
+        #endregion
+
+        #region GetQualitativeYIndex
+
+        internal int GetQualitativeYIndex(object okey)
+        {
+            int index;
+
+            if (okey is string)
+                index = _ChartSeries.QualitativeYValues.IndexOf((string)okey);
+            else
+                index = Convert.ToInt32(okey);
+
+            return (index);
+        }
+
+        #endregion
+
+        #region CalcSeriesSlope
+
+        private void CalcSeriesSlope()
+        {
+            ChartXy chartXy = _ChartSeries.Parent as ChartXy;
+
+            if (chartXy != null)
+            {
+                ChartAxis axisX = _ChartSeries.AxisX ?? chartXy.AxisX;
+                ChartAxis axisY = _ChartSeries.AxisY ?? chartXy.AxisY;
+
+                if (_ChartSeries.ActualScaleTypeX != ScaleType.NotSet)
+                {
+                    int n = Count;
+
+                    double sumX = 0;
+                    double sumY = 0;
+                    double sumXx = 0;
+                    double sumXy = 0;
+
+                    int nn = 0;
+
+                    for (int i = 0; i < n; i++)
+                    {
+                        SeriesPoint sp = this[i];
+
+                        if (sp.IsEmpty == false && (sp.ValueY.Length > _SlopeIndex))
+                        {
+                            nn++;
+
+                            double x;
+
+                            switch (_ChartSeries.ActualScaleTypeX)
+                            {
+                                case ScaleType.DateTime:
+                                    x = chartXy.GetDateTimePointValue(axisX,
+                                        axisX.TickmarkLayout, (DateTime)sp.ValueX, (DateTime)_ChartSeries.MinValueX);
+                                    break;
+
+                                case ScaleType.Qualitative:
+                                    x = _ChartSeries.QualitativeXValues.IndexOf(sp.ValueX);
+                                    break;
+
+                                default:
+                                    x = Convert.ToDouble(sp.ValueX);
+                                    break;
+                            }
+
+                            double y;
+
+                            switch (_ChartSeries.ActualScaleTypeY)
+                            {
+                                case ScaleType.DateTime:
+                                    y = chartXy.GetDateTimePointValue(axisY, axisY.TickmarkLayout, (DateTime)sp.ValueY[_SlopeIndex]);
+                                    break;
+
+                                case ScaleType.Qualitative:
+                                    y = _ChartSeries.QualitativeYValues.IndexOf(sp.ValueY[_SlopeIndex]);
+                                    break;
+
+                                default:
+                                    y = Convert.ToDouble(sp.ValueY[_SlopeIndex]);
+                                    break;
+                            }
+
+                            sumX += x;
+                            sumY += y;
+
+                            sumXx += (x * x);
+                            sumXy += (x * y);
+                        }
+                    }
+
+                    double a = nn * sumXy;
+                    double b = sumX * sumY;
+                    double c = nn * sumXx;
+                    double d = sumX * sumX;
+
+                    double m = (a - b) / (c - d);
+                    double yi = (sumY - (m * sumX)) / nn;
+
+                    Slope = m;
+                    Intercept = yi;
+
+                    _SlopeCalculated = true;
+                }
+            }
+        }
+
+        #endregion
+
+        #region GetSeriesPoint
+
+        internal SeriesPoint GetSeriesPoint(object key)
+        {
+            if (Count > 0)
+            {
+                int index;
+
+                if (this[0].IsQuantitativeXValue == true)
+                    index = SearchX(key);
+                else
+                    index = GetQualitativeXIndex(key) - 1;
+
+                if (index < 0 && IsSorted == true)
+                    index = -index;
+
+                if ((uint)index < Count)
+                    return (this[index]);
+            }
+
+            return (null);
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region PointData
+
+    public class PointData
+    {
+        public List<Point[]> Points;
+        public List<SeriesPoint[]> SeriesPoints;
+    }
+
+    #endregion
+
+    #region BubblePlotData
+
+    internal class BubblePlotData
+    {
+        public double MinSize;
+        public double MaxSize;
+
+        public double TotalSize;
+
+        public double MinIntensity;
+        public double MaxIntensity;
+
+        public void Clear()
+        {
+            MinSize = double.MaxValue;
+            MaxSize = double.MinValue;
+
+            MinIntensity = double.MaxValue;
+            MaxIntensity = double.MinValue;
+
+            TotalSize = 0;
+        }
+    }
+
+    #endregion
+
+    #region BarRenderData
+
+    internal class BarRenderData
+    {
+        public ChartAxis Axis;
+        public ChartXy ChartXy;
+
+        public BarFillRange FillRange;
+        public bool BarShading;
+
+        public Point Spt;
+        public SeriesPoint Sp;
+
+        public ChartSeriesVisualStyle SeriesStyle;
+
+        public BarRenderData(ChartXy chartXy, ChartAxis axis)
+        {
+            ChartXy = chartXy;
+            Axis = axis;
+        }
+    }
+
+    #endregion
+
+    #region HiLoRenderData
+
+    public class HiLoRenderData
+    {
+        #region Private variables
+
+        private ChartAxis _Axis;
+        private ChartXy _ChartXy;
+
+        private Point _Spt;
+        private SeriesPoint _Sp;
+        private int _Index;
+
+        private ChartSeriesVisualStyle _SeriesStyle;
+
+        private int[] _Value;
+
+        private bool _IsAlternate;
+        private int _EndDelta;
+
+        #endregion
+
+        public HiLoRenderData(ChartXy chartXy, ChartAxis axis)
+        {
+            _ChartXy = chartXy;
+            _Axis = axis;
+        }
+
+        #region Public properties
+
+        #region AlternateStyle
+
+        /// <summary>
+        /// Gets the alternate segment style used when Open/Close values are reversed.
+        /// </summary>
+        public HiLoBarSegmentStyle AlternateStyle
+        {
+            get { return (SeriesStyle.HiLoBarVisualStyle.AlternateSegmentStyle); }
+        }
+
+        #endregion
+
+        #region DefaultStyle
+
+        /// <summary>
+        /// Gets the default segment style used when Open/Close values are not reversed.
+        /// </summary>
+        public HiLoBarSegmentStyle DefaultStyle
+        {
+            get { return (SeriesStyle.HiLoBarVisualStyle.DefaultSegmentStyle); }
+        }
+
+        #endregion
+
+        #region IsAlternate
+
+        /// <summary>
+        /// Gets whether the segment is to be render as 'Alternate'.
+        /// </summary>
+        public bool IsAlternate
+        {
+            get { return (_IsAlternate); }
+            internal set { _IsAlternate = value; }
+        }
+
+        #endregion
+
+        #region SeriesStyle
+
+        /// <summary>
+        /// Gets the associated series visual style.
+        /// </summary>
+        public ChartSeriesVisualStyle SeriesStyle
+        {
+            get { return (_SeriesStyle); }
+            internal set { _SeriesStyle = value; }
+        }
+
+        #endregion
+
+        #region Value
+
+        /// <summary>
+        /// Gets an array of specified HiLo coordinate data values (x or y,
+        /// depending upon the bar orientation). The values are specified
+        /// in [High=0, Low=1, Close=2, Open=3, Median=4] order, followed
+        /// by any 'extra' user supplied bar values.
+        /// </summary>
+        public int[] Value
+        {
+            get { return (_Value); }
+            internal set { _Value = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region Axis
+
+        internal ChartAxis Axis
+        {
+            get { return (_Axis); }
+            set { _Axis = value; }
+        }
+
+        #endregion
+
+        #region ChartXy
+
+        internal ChartXy ChartXy
+        {
+            get { return (_ChartXy); }
+            set { _ChartXy = value; }
+        }
+
+        #endregion
+
+        #region EndDelta
+
+        public int EndDelta
+        {
+            get { return (_EndDelta); }
+            set { _EndDelta = value; }
+        }
+
+        #endregion
+
+        #region Index
+
+        internal int Index
+        {
+            get { return (_Index); }
+            set { _Index = value; }
+        }
+
+        #endregion
+
+        #region Sp
+
+        internal SeriesPoint Sp
+        {
+            get { return (_Sp); }
+            set { _Sp = value; }
+        }
+
+        #endregion
+
+        #region Spt
+
+        internal Point Spt
+        {
+            get { return (_Spt); }
+            set { _Spt = value; }
+        }
+
+        #endregion
+
+        #endregion
+    }
+
+    #endregion
+
+    #region enums
+
+    #region BarLabelPosition
+
+    /// <summary>
+    /// Specifies the position for Bar series labels.
+    /// </summary>
+    public enum BarLabelPosition
+    {
+        /// <summary>
+        /// Not set (default is Center). 
+        /// </summary>
+        NotSet = -1,
+
+        /// <summary>
+        /// Labels will be positioned in the center of the bar. 
+        /// </summary>
+        Center,
+
+        /// <summary>
+        /// Labels will be positioned outside the bar, relative to its origin. 
+        /// </summary>
+        Near,
+
+        /// <summary>
+        /// Labels will be positioned inside the bar, relative to its origin. 
+        /// </summary>
+        NearInside,
+
+        /// <summary>
+        /// Labels will be positioned outside the bar, opposite to its origin. 
+        /// </summary>
+        Far,
+
+        /// <summary>
+        /// Labels will be positioned inside the bar, opposite to its origin. 
+        /// </summary>
+        FarInside,
+    }
+
+    #endregion
+
+    #region BarSegment
+
+    public enum BarSegment
+    {
+        /// <summary>
+        /// Top portion of Vertical bar (full area).
+        /// </summary>
+        Top,
+
+        /// <summary>
+        /// Partial Top area of Vertical bar.
+        /// </summary>
+        TopPartial,
+
+        /// <summary>
+        /// Bottom portion of Vertical bar (full area).
+        /// </summary>
+        Bottom,
+
+        /// <summary>
+        /// Partial Bottom area of Vertical bar.
+        /// </summary>
+        BottomPartial,
+
+        /// <summary>
+        /// Left portion of Horizontal bar (full area).
+        /// </summary>
+        Left,
+
+        /// <summary>
+        /// Partial Left area of Horizontal bar.
+        /// </summary>
+        LeftPartial,
+
+        /// <summary>
+        /// Right portion of Horizontal bar (full area).
+        /// </summary>
+        Right,
+
+        /// <summary>
+        /// Partial Right area of Horizontal bar.
+        /// </summary>
+        RightPartial,
+    }
+
+    #endregion
+
+    #region ConvexHullDisplayMode
+
+    /// <summary>
+    /// Specifies the ConvexHull display mode
+    /// </summary>
+    [Flags]
+    public enum ConvexHullDisplayMode
+    {
+        /// <summary>
+        /// Not set (default is None). 
+        /// </summary>
+        NotSet = 0,
+
+        /// <summary>
+        /// No Convex Hull processing will take place. 
+        /// </summary>
+        None = (1 << 0),
+
+        /// <summary>
+        /// Convex Hull border will be displayed.
+        /// </summary>
+        DisplayBorder = (1 << 1),
+
+        /// <summary>
+        /// Convex Hull background area will be displayed.
+        /// </summary>
+        DisplayBackground = (1 << 2),
+    }
+
+    #endregion
+
+    #region PointLabelDisplayMode
+
+    /// <summary>
+    /// Specifies which PointLabels are to be displayed
+    /// </summary>
+    [Flags]
+    public enum PointLabelDisplayMode
+    {
+        /// <summary>
+        /// Not set (default is None). 
+        /// </summary>
+        NotSet,
+
+        /// <summary>
+        /// No labels will be displayed. 
+        /// </summary>
+        None = (1 << 0),
+
+        /// <summary>
+        /// All series points will display a label. 
+        /// </summary>
+        AllSeriesPoints = (1 << 1),
+
+        /// <summary>
+        /// User defined DataLabels will be displayed.
+        /// </summary>
+        DataLabels = (1 << 2),
+
+        /// <summary>
+        /// Minimum 'X' Value label will be displayed.
+        /// </summary>
+        MinValueX = (1 << 3),
+
+        /// <summary>
+        /// Minimum 'Y' Value label will be displayed.
+        /// </summary>
+        MinValueY = (1 << 4),
+
+        /// <summary>
+        /// Maximum 'X' Value label will be displayed.
+        /// </summary>
+        MaxValueX = (1 << 5),
+
+        /// <summary>
+        /// Maximum 'Y' Value label will be displayed.
+        /// </summary>
+        MaxValueY = (1 << 6),
+    }
+
+    #endregion
+
+    #region StepLineMode
+
+    /// <summary>
+    /// Specifies the mode used to render "Step Lines" in
+    /// a given Line series.
+    /// </summary>
+    public enum StepLineMode
+    {
+        /// <summary>
+        /// Not set (default is HorizontalThenVertical). 
+        /// </summary>
+        NotSet = -1,
+
+        /// <summary>
+        /// No Step Lines will be rendered. 
+        /// </summary>
+        None,
+
+        /// <summary>
+        /// Step lines will be displayed between consecutive
+        /// series points, by first displaying the horizontal step
+        /// line, followed by the connecting vertical step line. 
+        /// </summary>
+        HorizontalThenVertical,
+
+        /// <summary>
+        /// Step lines will be displayed between consecutive
+        /// series points, by first displaying the vertical step
+        /// line, followed by the connecting horizontal step line. 
+        /// </summary>
+        VerticalThenHorizontal,
+
+        /// <summary>
+        /// Step lines will be displayed between consecutive
+        /// series points, by first displaying the midPoint horizontal
+        /// step line, followed by the connecting vertical step line. 
+        /// </summary>
+        MidPoint,
+    }
+
+    #endregion
+
+    #region StepLines
+
+    /// <summary>
+    /// Specifies the mode used to render "Stepped Lines" in
+    /// a given Line series.
+    /// </summary>
+    public enum StepLines
+    {
+        /// <summary>
+        /// Not set (default is StepHv). 
+        /// </summary>
+        NotSet = -1,
+
+        /// <summary>
+        /// No step lines will be displayed. 
+        /// </summary>
+        None,
+
+        /// <summary>
+        /// Horizontal step lines will be displayed. 
+        /// </summary>
+        Horizontal,
+
+        /// <summary>
+        /// Vertical step lines will be displayed. 
+        /// </summary>
+        Vertical,
+
+        /// <summary>
+        /// Both horizontal and vertical step lines will be displayed. 
+        /// </summary>
+        Both,
+    }
+
+    #endregion
+
+    #region ScaleType
+
+    /// <summary>
+    /// Specifies the scale type for the series points
+    /// </summary>
+    public enum ScaleType
+    {
+        /// <summary>
+        /// ScaleType is NotSet (default is 'Auto').
+        /// </summary>
+        NotSet,
+
+        /// <summary>
+        /// ScaleType is Automatic.  Scale type will be determined
+        /// by the underlying, assigned data.
+        /// </summary>
+        Auto,
+
+        /// <summary>
+        /// DateTime data scale. Points will be treated as
+        /// DateTime values and will be shown as such on the axis. 
+        /// </summary>
+        DateTime,
+
+        /// <summary>
+        /// Numerical data scale. Points will be treated as
+        /// numerical values and will be shown on the axis as numbers.
+        /// </summary>
+        Quantitative,
+
+        /// <summary>
+        /// Qualitative data scale. Points will be treated as 
+        /// qualitative values and will be shown on the axis as text.
+        /// </summary>
+        Qualitative,
+
+    }
+
+    #endregion
+
+    #region HiLoBarType
+
+    /// <summary>
+    /// Specifies the HiloBar series display type.
+    /// </summary>
+    public enum HiLoBarType
+    {
+        /// <summary>
+        /// Box Plot display. Display is identical to 'Candle' except:
+        /// 1. Median separated segments are separately rendered using both
+        /// default and alternate box backgrounds.
+        /// 2. UseAlternateSegmentStyle defaults to false.
+        /// </summary>
+        Box,
+
+        /// <summary>
+        /// Candle Plot display. Display is identical to 'Box' except:
+        /// 1. Mmedian separated segments are both rendered using either
+        /// the default or alternate box background.
+        /// 2. UseAlternateSegmentStyle defaults to true.
+        /// </summary>
+        Candle,
+
+        /// <summary>
+        /// Line plot display.
+        /// </summary>
+        Line,
+    }
+
+    #endregion
+
+    #region HiLoBarSegment
+
+    public enum HiLoBarSegment
+    {
+        /// <summary>
+        /// Box (Box plot).
+        /// </summary>
+        Box,
+
+        /// <summary>
+        /// High whisker (Box, Candle, Line).
+        /// </summary>
+        HighWhisker,
+
+        /// <summary>
+        /// High whisker cap (Box, Candle, Line).
+        /// </summary>
+        HighWhiskerCap,
+
+        /// <summary>
+        /// Low whisker (Box, Candle, Line).
+        /// </summary>
+        LowWhisker,
+
+        /// <summary>
+        /// Low whisker cap (Box, Candle, Line).
+        /// </summary>
+        LowWhiskerCap,
+
+        /// <summary>
+        /// Open whisker (Line plot).
+        /// </summary>
+        OpenWhisker,
+
+        /// <summary>
+        /// Close whisker (Line Plot).
+        /// </summary>
+        CloseWhisker,
+
+        /// <summary>
+        /// Center line (Line plot).
+        /// </summary>
+        CenterLine,
+
+        /// <summary>
+        /// Full range (Line plot).
+        /// </summary>
+        FullRange,
+
+        /// <summary>
+        /// Median line (Box, Candle, Line).
+        /// </summary>
+        MedianLine,
+
+        /// <summary>
+        /// Bar shading (Box, Candle).
+        /// </summary>
+        BarShading,
+    }
+
+    #endregion
+
+    #endregion
+
+    #region AxisTypeConverter
+
+    ///<summary>
+    /// AxisTypeConverter
+    ///</summary>
+    public class AxisTypeConverter : TypeConverter
+    {
+        ///<summary>
+        /// ConvertTo
+        ///</summary>
+        ///<param name="context"></param>
+        ///<param name="culture"></param>
+        ///<param name="value"></param>
+        ///<param name="destinationType"></param>
+        ///<returns></returns>
+        public override object ConvertTo(
+            ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+        {
+            if (destinationType == typeof(string))
+            {
+                ChartAxis axis = value as ChartAxis;
+
+                if (axis != null)
+                {
+                    if (string.IsNullOrEmpty(axis.Name) == false)
+                        return (axis.Name);
+
+                    return ("No Axis Name");
+                }
+            }
+
+            return (base.ConvertTo(context, culture, value, destinationType));
+        }
+    }
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/XyChart/ChartTickmarks.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/XyChart/ChartTickmarks.cs
new file mode 100644
index 00000000..41e7c6ee
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/XyChart/ChartTickmarks.cs	
@@ -0,0 +1,2740 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Drawing.Drawing2D;
+using DevComponents.DotNetBar.Charts.Style;
+
+namespace DevComponents.DotNetBar.Charts
+{
+    #region MajorTickmarks
+
+    #region MajorTickmarksX
+
+    /// <summary>
+    /// Represents a chart MajorTickmark on the X-Axis.
+    /// </summary>
+    public class MajorTickmarksX : MajorTickmarks
+    {
+        public MajorTickmarksX()
+            : base(AxisOrientation.X)
+        {
+        }
+
+        #region MeasureOverride
+
+        protected override void MeasureOverride(ChartLayoutInfo layoutInfo)
+        {
+            ChartAxis chartAxis = Parent as ChartAxis;
+            ChartTickmarkVisualStyle tstyle = EffectiveStyle;
+
+            Rectangle bounds = Rectangle.Empty;
+
+            MeasureTickmarks(layoutInfo, chartAxis);
+
+            if (TickmarkLayout.MajorCount > 0)
+            {
+                bounds = MeasureTickmarkLabels(layoutInfo, chartAxis);
+
+                float angle = GetLabelAngle();
+
+                if (angle == 0)
+                    CullOverlappingLabels();
+            }
+
+            BoundsRelative = bounds;
+        }
+
+        #region MeasureTickmarks
+
+        private void MeasureTickmarks(ChartLayoutInfo layoutInfo, ChartAxis chartAxis)
+        {
+            TickmarkLayout layout = TickmarkLayout;
+
+            if (layout.MajorCount > 0)
+            {
+                Graphics g = layoutInfo.Graphics;
+                Rectangle bounds = layoutInfo.LayoutBounds;
+
+                layout.TickmarkStart = GetStartIndex();
+                layout.TickmarkEnd = layout.TickmarkStart + (int)Math.Ceiling((bounds.Width + layout.MarginOffset) / layout.MajorInterval) + 3;
+
+                UpdateTickmarkTicks(g, chartAxis, bounds, layout);
+
+                ArrangeTickmarks();
+            }
+        }
+
+        #endregion
+
+        #region MeasureTickmarkLabels
+
+        private Rectangle MeasureTickmarkLabels(
+            ChartLayoutInfo layoutInfo, ChartAxis chartAxis)
+        {
+            ChartTickmarkVisualStyle tstyle = EffectiveStyle;
+
+            int labelHeight = GetTotalLabelHeight();
+            int tickmarkHeight = Dpi.Height(GetMaxTickmarkLength(chartAxis, false));
+
+            if (tickmarkHeight == 0)
+                tickmarkHeight = Dpi.Height4;
+
+            Rectangle bounds = layoutInfo.LayoutBounds;
+            bounds.Height = (labelHeight + tickmarkHeight);
+
+            ChartXy chartXy = chartAxis.Parent as ChartXy;
+
+            if (chartXy.DropShadowDisplayed == true)
+                bounds.Width -= 3;
+
+            Rectangle r = bounds;
+
+            if (chartAxis.GetAxisAlignment() == AxisAlignment.Far)
+            {
+                LabelBounds = new Rectangle(r.X, r.Y, r.Width, labelHeight);
+
+                r.Y += labelHeight;
+                r.Height -= labelHeight;
+
+                TickmarkBounds = r;
+            }
+            else
+            {
+                r.Y = layoutInfo.LayoutBounds.Bottom - labelHeight;
+                bounds.Y = r.Y;
+
+                LabelBounds = new Rectangle(r.X, r.Y, r.Width, labelHeight);
+
+                r.Y -= tickmarkHeight;
+                r.Height = tickmarkHeight;
+
+                TickmarkBounds = r;
+            }
+
+            if (chartAxis.EdgeAxis == false)
+                bounds.Height += Dpi.Height(GetMaxTickmarkLength(chartAxis, true)) + 2;
+
+            return (bounds);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ArrangeTickmarks
+
+        protected override void ArrangeTickmarks()
+        {
+            TickmarkLayout layout = TickmarkLayout;
+
+            if (layout.Ticks != null)
+            {
+                ChartAxis chartAxis = Parent as ChartAxis;
+
+                Rectangle tmBounds = TickmarkBounds;
+                Rectangle lbounds = LabelBounds;
+
+                AxisAlignment axisAlignment = chartAxis.GetAxisAlignment();
+
+                Point tickPoint = new Point(0, 
+                    (axisAlignment == AxisAlignment.Near) ? tmBounds.Y : tmBounds.Bottom + 1);
+
+                float angle = GetLabelAngle();
+
+                for (int i = layout.TickmarkStart; i < layout.TickmarkEnd; i++)
+                {
+                    TickmarkTick tick = layout.Ticks[i - layout.TickmarkStart];
+
+                    tickPoint.X = (int)(tmBounds.Location.X + (i * layout.MajorInterval) - layout.MarginOffset);
+                    tick.TickPoint = tickPoint;
+
+                    if (tick.Label != null)
+                    {
+                        tick.LabelPoint = tickPoint;
+                        tick.LabelPoint.Y = lbounds.Y;
+
+                        int height = LabelBounds.Height;
+
+                        if (LabelsAreStaggered == true)
+                        {
+                            double value = GetTickmarkValue(chartAxis, tick);
+                            int n = (int)(Math.Ceiling(value / TickmarkLayout.MajorSpacing));
+
+                            if ((tick.Index % 2) != (axisAlignment == AxisAlignment.Far ? 0 : 1))
+                            {
+                                height -= MaxLabelSize[0].Height;
+                                tick.LabelPoint.Y += MaxLabelSize[0].Height;
+                            }
+                            else
+                            {
+                                height -= MaxLabelSize[1].Height;
+                            }
+                        }
+
+                        if (axisAlignment == AxisAlignment.Far)
+                            tick.LabelPoint.Y += (height - tick.LabelSize.Height);
+
+                        if (angle == 0)
+                            tick.LabelPoint.X -= (tick.LabelSize.Width / 2);
+                    }
+                }
+            }
+        }
+
+        #region CullOverlappingLabels
+
+        private void CullOverlappingLabels()
+        {
+            TickmarkLayout layout = TickmarkLayout;
+
+            for (int i = layout.TickmarkStart; i < layout.TickmarkEnd; i++)
+            {
+                TickmarkTick tick = layout.Ticks[i - layout.TickmarkStart];
+
+                if (tick.LabelVisible == true)
+                {
+                    for (int j = i + 1; j < layout.TickmarkEnd; j++)
+                    {
+                        TickmarkTick tick2 = layout.Ticks[j - layout.TickmarkStart];
+
+                        if (tick2.LabelVisible == true)
+                        {
+                            if (tick2.LabelPoint.X < tick.LabelPoint.X + tick.LabelSize.Width - 1)
+                            {
+                                if ((LabelsAreStaggered == false) ||
+                                    (tick.LabelIndex % 2 == tick2.LabelIndex % 2))
+                                {
+                                    tick2.LabelVisible = false;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderOverride
+
+        protected override void RenderOverride(ChartRenderInfo renderInfo)
+        {
+            base.RenderOverride(renderInfo);
+
+            Graphics g = renderInfo.Graphics;
+
+            ChartAxis chartAxis = Parent as ChartAxis;
+            ChartTickmarkVisualStyle tstyle = EffectiveStyle;
+
+            if (CanRenderTickmarks(tstyle) == true)
+                RenderTickmarks(g, tstyle, chartAxis);
+
+            if (TickmarkLayout.MajorCount > 0)
+                RenderTickmarkLabels(g, chartAxis);
+        }
+
+        #region RenderTickmarks
+
+        private void RenderTickmarks(Graphics g,
+            ChartTickmarkVisualStyle tstyle, ChartAxis chartAxis)
+        {
+            SmoothingMode sm = g.SmoothingMode;
+            g.SmoothingMode = SmoothingMode.None;
+
+            using (Pen pen = new Pen(tstyle.TickmarkColor, Dpi.Width(tstyle.TickmarkThickness)))
+            {
+                int tlen = Dpi.Width(tstyle.TickmarkLength - ((tstyle.TickmarkThickness > 1) ? 0 : 1));
+
+                AxisAlignment axisAlignment = chartAxis.GetAxisAlignment();
+
+                Point pt = GetLocalAdjustedPoint(Point.Empty);
+
+                if ((tstyle.TickmarkAlignment == LineAlignment.Center) ||
+                    (axisAlignment == AxisAlignment.Far && tstyle.TickmarkAlignment == LineAlignment.Near) ||
+                    (axisAlignment == AxisAlignment.Near && tstyle.TickmarkAlignment == LineAlignment.Far))
+                {
+                    // Bottom
+
+                    RenderMarks(g, pen, chartAxis, pt, 0, tlen, axisAlignment == AxisAlignment.Far);
+                }
+
+                if ((tstyle.TickmarkAlignment == LineAlignment.Center) ||
+                    (axisAlignment == AxisAlignment.Far && tstyle.TickmarkAlignment == LineAlignment.Far) ||
+                    (axisAlignment == AxisAlignment.Near && tstyle.TickmarkAlignment == LineAlignment.Near))
+                {
+                    // Top
+
+                    ChartXy chartXy = chartAxis.Parent as ChartXy;
+
+                    if (axisAlignment == AxisAlignment.Near)
+                    {
+                        int n = 1;
+
+                        if (chartAxis.EdgeAxis == true)
+                            n = chartXy.GetScBorderThickness(XyAlignment.Bottom) + 1;
+
+                        RenderMarks(g, pen, chartAxis, pt, -(n + tlen), tlen, true);
+                    }
+                    else
+                    {
+                        int n = 1;
+
+                        RenderMarks(g, pen, chartAxis, pt, -(n + tlen), tlen, false);
+                    }
+                }
+            }
+
+            g.SmoothingMode = sm;
+        }
+
+        #region RenderMarks
+
+        private void RenderMarks(Graphics g,
+            Pen pen, ChartAxis chartAxis, Point pt, int voff, int len, bool skipFirst)
+        {
+            foreach (TickmarkTick tmi in TickmarkLayout.Ticks)
+            {
+                Point pt1 = tmi.TickPoint;
+                pt1.X += pt.X;
+                pt1.Y += (pt.Y + voff);
+
+                if (pt1.X >= chartAxis.AxisLineBounds.X - ScrollOffset.X &&
+                    pt1.X < chartAxis.AxisLineBounds.Right - ScrollOffset.X)
+                {
+                    if (tmi.Index > 0 || skipFirst == false)
+                    {
+                        Point pt2 = pt1;
+                        pt2.Y += len;
+
+                        g.DrawLine(pen, pt1, pt2);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderTickmarkLabels
+
+        private void RenderTickmarkLabels(Graphics g, ChartAxis chartAxis)
+        {
+            if (LabelBounds.IsEmpty == false)
+            {
+                TickmarkLabelVisualStyle lstyle = EffectiveLabelStyle;
+
+                Point pt = GetLocalAdjustedPoint(Point.Empty);
+                float angle = GetLabelAngle();
+
+                using (SolidBrush br = new SolidBrush(lstyle.TextColor))
+                {
+                    SmoothingMode sm = g.SmoothingMode;
+                    g.SmoothingMode = SmoothingMode.HighQuality;
+
+                    ChartXy chartXy = chartAxis.Parent as ChartXy;
+                    Rectangle alb = chartXy.GetScrollBounds(chartAxis.AxisLineBounds);
+
+                    foreach (TickmarkTick tmi in TickmarkLayout.Ticks)
+                    {
+                        if (tmi.LabelVisible == true)
+                        {
+                            if ((tmi.TickPoint.X + pt.X >= alb.X) &&
+                                (tmi.TickPoint.X + pt.X < alb.Right))
+                            {
+                                if (tmi.LabelColor.IsEmpty == true)
+                                {
+                                    RenderLabel(g, tmi, pt, angle, br, lstyle.Font);
+                                }
+                                else
+                                {
+                                    using (SolidBrush br2 = new SolidBrush(tmi.LabelColor))
+                                        RenderLabel(g, tmi, pt, angle, br2, lstyle.Font);
+                                }
+                            }
+                        }
+                    }
+
+                    g.SmoothingMode = sm;
+                }
+            }
+        }
+
+        #region RenderLabel
+
+        private void RenderLabel(Graphics g,
+            TickmarkTick tmi, Point pt, float angle, Brush br, Font font)
+        {
+            Rectangle r = new Rectangle(tmi.LabelPoint, tmi.LabelSize);
+            r.X += pt.X;
+            r.Y += pt.Y;
+
+            if (angle == 0)
+            {
+                g.DrawString(tmi.Label, font, br, r);
+            }
+            else
+            {
+                Point pt1 = Point.Empty;
+
+                if (angle > 0)
+                {
+                    if (angle > 90)
+                    {
+                        angle = angle - 180;
+
+                        pt1.X = -(int)tmi.TextSize.Width;
+                    }
+
+                    pt1.Y = -(int)((Math.Abs(angle) / 90f) * (font.Height / 2));
+
+                    g.TranslateTransform(r.X, r.Y);
+                }
+                else
+                {
+                    if (angle < -90)
+                    {
+                        angle = angle + 180;
+
+                        pt1.X = -(int)tmi.TextSize.Width + 4;
+                    }
+
+                    pt1.Y = -(int)(tmi.TextSize.Height -
+                        (Math.Abs(angle) / 90f) * (tmi.TextSize.Height / 2));
+
+                    g.TranslateTransform(r.X, LabelBounds.Bottom - 1);
+                }
+
+                g.RotateTransform(angle);
+
+                g.DrawString(tmi.Label, font, br, pt1);
+
+                g.ResetTransform();
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region GetStartIndex
+
+        internal override int GetStartIndex()
+        {
+            ChartAxis chartAxis = Parent as ChartAxis;
+            ChartXy chartXy = chartAxis.Parent as ChartXy;
+
+            return (GetStartIndexEx(chartXy.HScrollBar));
+        }
+
+        #endregion
+
+        #region Copy/CopyTo
+
+        /// <summary>
+        /// Create a copy of the chart element.
+        /// </summary>
+        /// <returns></returns>
+        public override ChartVisualElement Copy()
+        {
+            MajorTickmarksX copy = new MajorTickmarksX();
+
+            CopyTo(copy);
+
+            return (copy);
+        }
+
+        /// <summary>
+        /// Copies the chart element to the given "copy".
+        /// </summary>
+        /// <param name="copy"></param>
+        public override void CopyTo(ChartVisualElement copy)
+        {
+            MajorTickmarksX c = copy as MajorTickmarksX;
+
+            if (c != null)
+                base.CopyTo(c);
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region MajorTickmarksY
+
+    /// <summary>
+    /// Represents a chart MajorTickmark on the Y-Axis.
+    /// </summary>
+    public class MajorTickmarksY : MajorTickmarks
+    {
+        public MajorTickmarksY()
+            : base(AxisOrientation.Y)
+        {
+        }
+
+        #region MeasureOverride
+
+        protected override void MeasureOverride(ChartLayoutInfo layoutInfo)
+        {
+            ChartAxis chartAxis = Parent as ChartAxis;
+            ChartTickmarkVisualStyle tstyle = EffectiveStyle;
+
+            Rectangle bounds = Rectangle.Empty;
+
+            MeasureTickmarks(layoutInfo, chartAxis);
+
+            if (TickmarkLayout.MajorCount > 0)
+                bounds = MeasureTickmarkLabels(layoutInfo, chartAxis);
+
+            BoundsRelative = bounds;
+        }
+
+        #region MeasureTickmarks
+
+        private void MeasureTickmarks(ChartLayoutInfo layoutInfo, ChartAxis chartAxis)
+        {
+            TickmarkLayout layout = TickmarkLayout;
+
+            if (layout.MajorCount > 0)
+            {
+                Graphics g = layoutInfo.Graphics;
+                Rectangle bounds = layoutInfo.LayoutBounds;
+
+                layout.TickmarkStart = GetStartIndex();
+                layout.TickmarkEnd = layout.TickmarkStart + (int)((Math.Ceiling(bounds.Height / layout.MajorInterval))) + 3;
+
+                UpdateTickmarkTicks(g, chartAxis, bounds, layout);
+
+                ArrangeTickmarks();
+            }
+        }
+
+        #endregion
+
+        #region MeasureTickmarkLabels
+
+        private Rectangle MeasureTickmarkLabels(ChartLayoutInfo layoutInfo, ChartAxis chartAxis)
+        {
+            Rectangle bounds = layoutInfo.LayoutBounds;
+
+            int labelWidth = GetTotalLabelWidth();
+            int tickmarkWidth = Dpi.Width(GetMaxTickmarkLength(chartAxis, false));
+
+            bounds.Width = (labelWidth + tickmarkWidth);
+
+            ChartXy chartXy = chartAxis.Parent as ChartXy;
+
+            if (chartXy.DropShadowDisplayed == true)
+                bounds.Height -= 3;
+
+            Rectangle r = bounds;
+
+            AxisAlignment axisAlignment = chartAxis.GetAxisAlignment();
+
+            if (axisAlignment == AxisAlignment.Far)
+            {
+                LabelBounds = new Rectangle(r.X, r.Y, labelWidth, r.Height);
+
+                r.X += labelWidth;
+                r.Width -= labelWidth;
+
+                TickmarkBounds = r;
+            }
+            else
+            {
+                r.X = layoutInfo.LayoutBounds.Right - labelWidth;
+                bounds.X = r.X;
+
+                LabelBounds = new Rectangle(r.X, r.Y, labelWidth, r.Height);
+
+                r.X -= tickmarkWidth;
+                r.Width = tickmarkWidth;
+
+                TickmarkBounds = r;
+            }
+
+            if (chartAxis.EdgeAxis == false)
+                bounds.Width += Dpi.Width(GetMaxTickmarkLength(chartAxis, true)) + 2;
+
+            return (bounds);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ArrangeTickmarks
+
+        protected override void ArrangeTickmarks()
+        {
+            ChartAxis chartAxis = Parent as ChartAxis;
+
+            Rectangle tmBounds = TickmarkBounds;
+            Rectangle lbounds = LabelBounds;
+            TickmarkLayout layout = TickmarkLayout;
+
+            AxisAlignment axisAlignment = chartAxis.GetAxisAlignment();
+            Point tickPoint = new Point((axisAlignment == AxisAlignment.Near) ? tmBounds.X : tmBounds.Right + 1, 0);
+
+            float angle = GetLabelAngle();
+
+            for (int i = layout.TickmarkStart; i < layout.TickmarkEnd; i++)
+            {
+                TickmarkTick tick = layout.Ticks[i - layout.TickmarkStart];
+
+                tickPoint.Y = (int)(tmBounds.Bottom - 1 - (i * layout.MajorInterval) + layout.MarginOffset);
+
+                tick.TickPoint = tickPoint;
+
+                tick.LabelPoint = tickPoint;
+                tick.LabelPoint.X = lbounds.X;
+
+                int width = LabelBounds.Width;
+
+                if (LabelsAreStaggered == true)
+                {
+                    double value = GetTickmarkValue(chartAxis, tick);
+                    int n = (int)(Math.Ceiling(value / TickmarkLayout.MajorSpacing));
+
+                    if ((n % 2) != (axisAlignment == AxisAlignment.Near ? 0 : 1))
+                    {
+                        width -= MaxLabelSize[0].Width;
+                        tick.LabelPoint.X += MaxLabelSize[0].Width;
+                    }
+                    else
+                    {
+                        width -= MaxLabelSize[1].Width;
+                    }
+                }
+
+                if (axisAlignment == AxisAlignment.Far)
+                    tick.LabelPoint.X += (width - tick.LabelSize.Width);
+
+                if ((angle + 90) % 180 == 0)
+                    tick.LabelPoint.Y -= (tick.LabelSize.Height / 2);
+            }
+        }
+
+        #endregion
+
+        #region RenderOverride
+
+        protected override void RenderOverride(ChartRenderInfo renderInfo)
+        {
+            base.RenderOverride(renderInfo);
+
+            Graphics g = renderInfo.Graphics;
+
+            ChartAxis chartAxis = Parent as ChartAxis;
+            ChartTickmarkVisualStyle tstyle = EffectiveStyle;
+
+            if (CanRenderTickmarks(tstyle) == true)
+                RenderTickmarks(g, tstyle, chartAxis);
+
+            if (TickmarkLayout.MajorCount > 0)
+                RenderTickmarkLabels(g, chartAxis);
+        }
+
+        #region RenderTickmarks
+
+        private void RenderTickmarks(Graphics g,
+            ChartTickmarkVisualStyle tstyle, ChartAxis chartAxis)
+        {
+            SmoothingMode sm = g.SmoothingMode;
+            g.SmoothingMode = SmoothingMode.None;
+
+            using (Pen pen = new Pen(tstyle.TickmarkColor, Dpi.Height(tstyle.TickmarkThickness)))
+            {
+                int tlen = Dpi.Height(tstyle.TickmarkLength) - ((tstyle.TickmarkThickness > 1) ? 0 : 1);
+
+                Point pt = GetLocalAdjustedPoint(Point.Empty);
+
+                AxisAlignment axisAlignment = chartAxis.GetAxisAlignment();
+
+                if (tstyle.TickmarkAlignment == LineAlignment.Center ||
+                    (axisAlignment == AxisAlignment.Far && tstyle.TickmarkAlignment == LineAlignment.Near) ||
+                    (axisAlignment == AxisAlignment.Near && tstyle.TickmarkAlignment == LineAlignment.Far))
+                {
+                    // Right
+
+                    RenderMarks(g, pen, chartAxis, pt, 0, tlen, axisAlignment == AxisAlignment.Far);
+                }
+
+                if (tstyle.TickmarkAlignment == LineAlignment.Center ||
+                    (axisAlignment == AxisAlignment.Far && tstyle.TickmarkAlignment == LineAlignment.Far) ||
+                    (axisAlignment == AxisAlignment.Near && tstyle.TickmarkAlignment == LineAlignment.Near))
+                {
+                    // Left
+
+                    ChartXy chartXy = chartAxis.Parent as ChartXy;
+
+                    if (axisAlignment == AxisAlignment.Near)
+                    {
+                        int n = 1;
+
+                        if (chartAxis.EdgeAxis == true)
+                            n = chartXy.GetScBorderThickness(XyAlignment.Right) + 1;
+
+                        RenderMarks(g, pen, chartAxis, pt, -(n + tlen), tlen, true);
+                    }
+                    else
+                    {
+                        int n = 2;
+
+                        RenderMarks(g, pen, chartAxis, pt, -(n + tlen), tlen, false);
+                    }
+                }
+            }
+
+            g.SmoothingMode = sm;
+        }
+
+        #region RenderMarks
+
+        private void RenderMarks(Graphics g,
+            Pen pen, ChartAxis chartAxis, Point pt, int hoff, int len, bool skipFirst)
+        {
+            foreach (TickmarkTick tmi in TickmarkLayout.Ticks)
+            {
+                Point pt1 = tmi.TickPoint;
+                pt1.X += (pt.X + hoff);
+                pt1.Y += pt.Y;
+
+                if (pt1.Y >= chartAxis.AxisLineBounds.Y - ScrollOffset.Y &&
+                    pt1.Y < chartAxis.AxisLineBounds.Bottom - ScrollOffset.Y)
+                {
+                    if (tmi.Index > 0 || skipFirst == false)
+                    {
+                        Point pt2 = pt1;
+                        pt2.X += len;
+
+                        g.DrawLine(pen, pt1, pt2);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderTickmarkLabels
+
+        private void RenderTickmarkLabels(Graphics g, ChartAxis chartAxis)
+        {
+            if (LabelBounds.IsEmpty == false)
+            {
+                TickmarkLabelVisualStyle lstyle = EffectiveLabelStyle;
+
+                Point pt = GetLocalAdjustedPoint(Point.Empty);
+                AxisAlignment axisAlignment = chartAxis.GetAxisAlignment();
+
+                float angle = GetLabelAngle();
+
+                using (SolidBrush br = new SolidBrush(lstyle.TextColor))
+                {
+                    SmoothingMode sm = g.SmoothingMode;
+                    g.SmoothingMode = SmoothingMode.HighQuality;
+
+                    Rectangle bounds = chartAxis.Bounds;
+
+                    foreach (TickmarkTick tmi in TickmarkLayout.Ticks)
+                    {
+                        if (tmi.LabelVisible == true)
+                        {
+                            if (tmi.TickPoint.Y + pt.Y < bounds.Y)
+                                break;
+
+                            if (tmi.TickPoint.Y + pt.Y > bounds.Bottom)
+                                continue;
+
+                            if (tmi.LabelColor.IsEmpty == true)
+                            {
+                                RenderLabel(g, tmi, pt, axisAlignment, angle, br, lstyle.Font);
+                            }
+                            else
+                            {
+                                using (SolidBrush br2 = new SolidBrush(tmi.LabelColor))
+                                    RenderLabel(g, tmi, pt, axisAlignment, angle, br2, lstyle.Font);
+                            }
+                        }
+                    }
+
+                    g.SmoothingMode = sm;
+                }
+            }
+        }
+
+        #region RenderLabel
+
+        private void RenderLabel(Graphics g, TickmarkTick tmi,
+            Point pt, AxisAlignment axisAlignment, float angle, Brush br, Font font)
+        {
+            Rectangle r = new Rectangle(tmi.LabelPoint, tmi.LabelSize);
+            r.X += pt.X;
+            r.Y += pt.Y;
+
+            int n = (int)(tmi.TextSize.Height / 2);
+
+            if (angle == 0)
+            {
+                r.Y -= n;
+                g.DrawString(tmi.Label, font, br, r);
+            }
+            else
+            {
+                Point pt1 = Point.Empty;
+
+                if (angle > 0)
+                {
+                    if (angle > 90)
+                    {
+                        angle = angle - 180;
+
+                        pt1.Y -= (int)(((90 + angle) / 90f) * (font.Height / 2));
+                    }
+                    else
+                    {
+                        pt1.Y -= (n + (int)((Math.Abs(angle) / 90f) * (font.Height / 2)));
+                    }
+
+                    g.TranslateTransform(r.X, r.Y);
+                }
+                else
+                {
+                    if (angle < -90)
+                    {
+                        angle = angle + 180;
+
+                        pt1.Y -= ((int)((Math.Abs(90 - angle) / 90f) * (tmi.TextSize.Height / 2)));
+                    }
+                    else
+                    {
+                        pt1.Y -= (n + (int)((Math.Abs(angle) / 90f) * (font.Height / 2)));
+                    }
+
+                    pt1.X = -(int)tmi.TextSize.Width;
+
+                    g.TranslateTransform(r.Right, r.Y);
+                }
+
+                g.RotateTransform(angle);
+
+                g.DrawString(tmi.Label, font, br, pt1);
+
+                g.ResetTransform();
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region GetStartIndex
+
+        internal override int GetStartIndex()
+        {
+            ChartAxis chartAxis = Parent as ChartAxis;
+            ChartXy chartXy = chartAxis.Parent as ChartXy;
+
+            return (GetStartIndexEx(chartXy.VScrollBar));
+        }
+
+        #endregion
+
+        #region Copy/CopyTo
+
+        /// <summary>
+        /// Creates a copy of the chart element.
+        /// </summary>
+        /// <returns></returns>
+        public override ChartVisualElement Copy()
+        {
+            MajorTickmarksY copy = new MajorTickmarksY();
+
+            CopyTo(copy);
+
+            return (copy);
+        }
+
+        /// <summary>
+        /// Copies the chart element to the given "copy".
+        /// </summary>
+        /// <param name="copy"></param>
+        public override void CopyTo(ChartVisualElement copy)
+        {
+            MajorTickmarksY c = copy as MajorTickmarksY;
+
+            if (c != null)
+                base.CopyTo(c);
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region MajorTickmarks
+
+    /// <summary>
+    /// Represents a chart MajorTickmark.
+    /// </summary>
+    public class MajorTickmarks : ChartTickmarks
+    {
+        #region Private variables
+
+        private MajorStates _MajorStates;
+
+        private float _LabelAngle;
+        private int _MinLabelGap = 4;
+        private int _LabelSkip;
+
+        private Rectangle _LabelBounds;
+        private Size[] _MaxLabelSize;
+
+        private TickmarkLabelVisualStyle _LabelVisualStyle;
+        private EffectiveStyle<TickmarkLabelVisualStyle> _EffectiveLabelStyle;
+
+        #endregion
+
+        public MajorTickmarks(AxisOrientation orientation)
+            : base(orientation)
+        {
+            InitDefaultStates();
+
+            _EffectiveLabelStyle = new EffectiveStyle<TickmarkLabelVisualStyle>(this);
+        }
+
+        #region InitDefaultStates
+
+        private void InitDefaultStates()
+        {
+            SetState(MajorStates.AutoLayout, true);
+            SetState(MajorStates.ShowLabels, true);
+            SetState(MajorStates.StaggerLabels, true);
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region AutoTickmarkLayout
+
+        /// <summary>
+        /// Gets or sets whether Major Tickmark layout is automatic.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance")]
+        [Description("Indicates whether Major Tickmark layout is automatic.")]
+        public bool AutoTickmarkLayout
+        {
+            get { return (TestState(MajorStates.AutoLayout)); }
+
+            set
+            {
+                if (value != AutoTickmarkLayout)
+                {
+                    SetState(MajorStates.AutoLayout, value);
+
+                    OnPropertyChangedEx("AutoTickmarkLayout", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region EffectiveLabelStyles
+
+        /// <summary>
+        /// Gets a reference to the Tickmark Label's Effective (cached, composite) style.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public TickmarkLabelVisualStyle EffectiveLabelStyle
+        {
+            get { return (_EffectiveLabelStyle.Style); }
+        }
+
+        #endregion
+
+        #region LabelAngle
+
+        ///<summary>
+        /// Gets or sets the angle at which the Tickmark labels are displayed.
+        ///</summary>
+        [DefaultValue(0f), Category("Layout")]
+        [Description("Indicates the angle at which the Tickmark labels are displayed.")]
+        [Editor("DevComponents.Charts.Design.AngleRangeValueEditor, DevComponents.Charts.Design, " +
+                "Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(UITypeEditor))]
+        public float LabelAngle
+        {
+            get { return (_LabelAngle); }
+
+            set
+            {
+                if (value != _LabelAngle)
+                {
+                    _LabelAngle = value;
+
+                    OnPropertyChangedEx("LabelAngle", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region LabelSkip
+
+        /// <summary>
+        /// Gets or sets the number of inter-labels to skip.
+        /// </summary>
+        [DefaultValue(0), Category("Layout")]
+        [Description("Indicates the number of inter-labels to skip.")]
+        public int LabelSkip
+        {
+            get { return (_LabelSkip); }
+
+            set
+            {
+                if (value != _LabelSkip)
+                {
+                    _LabelSkip = value;
+
+                    OnPropertyChangedEx("LabelSkip", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region LabelVisualStyle
+
+        /// <summary>
+        /// Gets or sets the visual style for the Tickmark Labels.
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates the visual style for the Tickmark Labels.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public TickmarkLabelVisualStyle LabelVisualStyle
+        {
+            get
+            {
+                if (_LabelVisualStyle == null)
+                {
+                    _LabelVisualStyle = new TickmarkLabelVisualStyle();
+
+                    StyleVisualChangeHandler(null, _LabelVisualStyle);
+                }
+
+                return (_LabelVisualStyle);
+            }
+
+            set
+            {
+                if (_LabelVisualStyle != value)
+                {
+                    TickmarkLabelVisualStyle oldValue = _LabelVisualStyle;
+
+                    _LabelVisualStyle = value;
+
+                    OnStyleChanged("LabelVisualStyle", oldValue, value);
+
+                    if (oldValue != null)
+                        oldValue.Dispose();
+                }
+            }
+        }
+
+        #endregion
+
+        #region MinLabelGap
+
+        /// <summary>
+        /// Gets or sets the minimum gap between tickmark labels.
+        /// </summary>
+        [DefaultValue(4), Category("Layout")]
+        [Description("Indicates the minimum gap between tickmark labels.")]
+        public int MinLabelGap
+        {
+            get { return (_MinLabelGap); }
+
+            set
+            {
+                if (value != _MinLabelGap)
+                {
+                    _MinLabelGap = value;
+
+                    OnPropertyChangedEx("MinLabelGap", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowLabels
+
+        /// <summary>
+        /// Gets or sets whether Tickmark labels are shown.
+        /// </summary>
+        [DefaultValue(true), Category("Layout")]
+        [Description("Indicates whether Tickmark labels are shown.")]
+        public bool ShowLabels
+        {
+            get { return (TestState(MajorStates.ShowLabels)); }
+
+            set
+            {
+                if (value != ShowLabels)
+                {
+                    SetState(MajorStates.ShowLabels, value);
+
+                    OnPropertyChangedEx("ShowLabels", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region StaggerLabels
+
+        /// <summary>
+        /// Gets or sets whether overlapping labels are staggered.
+        /// </summary>
+        [DefaultValue(true), Category("Layout")]
+        [Description("Indicates whether overlapping labels are staggered.")]
+        public bool StaggerLabels
+        {
+            get { return (TestState(MajorStates.StaggerLabels)); }
+
+            set
+            {
+                if (value != StaggerLabels)
+                {
+                    SetState(MajorStates.StaggerLabels, value);
+
+                    OnPropertyChangedEx("StaggerLabels", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region LabelBounds
+
+        internal Rectangle LabelBounds
+        {
+            get { return (_LabelBounds); }
+            set { _LabelBounds = value; }
+        }
+
+        #endregion
+
+        #region LabelsAreStaggered
+
+        internal bool LabelsAreStaggered
+        {
+            get { return (TestState(MajorStates.LabelsAreStaggered)); }
+            set { SetState(MajorStates.LabelsAreStaggered, value); }
+        }
+
+        #endregion
+
+        #region MaxLabelSize
+
+        internal Size[] MaxLabelSize
+        {
+            get { return (_MaxLabelSize); }
+            set { _MaxLabelSize = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region UpdateTickmarkTicks
+
+        internal void UpdateTickmarkTicks(Graphics g,
+            ChartAxis chartAxis, Rectangle bounds, TickmarkLayout layout)
+        {
+            TickmarkTick[] ticks = new TickmarkTick[layout.TickmarkEnd - layout.TickmarkStart];
+
+            CalculateBaseValue(chartAxis, layout);
+
+            if (ShowLabels == true)
+            {
+                TickmarkLabelVisualStyle lbstyle = EffectiveLabelStyle;
+
+                using (StringFormat sf = new StringFormat())
+                {
+                    lbstyle.GetStringFormatFlags(sf);
+
+                    if (lbstyle.MaxLineCount <= 1)
+                        sf.FormatFlags |= StringFormatFlags.NoWrap;
+
+                    int maxLabelWidth = lbstyle.MaxWidth < 0 ? 0 : lbstyle.MaxWidth;
+
+                    float angle = GetLabelAngle();
+
+                    int skip = (LabelSkip > 0 ? LabelSkip + 1 : 0);
+
+                    for (int i = layout.TickmarkStart; i < layout.TickmarkEnd; i++)
+                    {
+                        TickmarkTick tmi = new TickmarkTick();
+
+                        tmi.Index = i;
+
+                        SetTickValue(chartAxis, layout, lbstyle, tmi);
+
+                        if ((tmi.Label != null) && (skip <= 0 || (tmi.LabelIndex) % skip == 0))
+                        {
+                            lbstyle.GetStringFormatFlags(sf);
+
+                            tmi.TextSize = g.MeasureString(tmi.Label, lbstyle.Font, maxLabelWidth, sf);
+
+                            if (tmi.TextSize.IsEmpty == false)
+                            {
+                                tmi.TextSize.Width++;
+                                tmi.TextSize.Height++;
+                            }
+
+                            if (lbstyle.MaxLineCount > 1)
+                            {
+                                int lineHeight = (int)(Math.Ceiling(lbstyle.Font.GetHeight())) * lbstyle.MaxLineCount;
+
+                                if (tmi.TextSize.Height > lineHeight)
+                                    tmi.TextSize.Height = lineHeight;
+                            }
+
+                            if (angle != 0)
+                            {
+                                double radians = MathHelper.ToRadians(angle);
+
+                                tmi.LabelSize.Width = (int)(Math.Abs(tmi.TextSize.Width * Math.Cos(radians)) + Math.Abs(tmi.TextSize.Height * Math.Sin(radians)));
+                                tmi.LabelSize.Height = (int)(Math.Abs(tmi.TextSize.Width * Math.Sin(radians)) + Math.Abs(tmi.TextSize.Height * Math.Cos(radians)));
+                            }
+                            else
+                            {
+                                tmi.LabelSize = tmi.TextSize.ToSize();
+                            }
+
+                            tmi.LabelVisible = true;
+                        }
+                        else
+                        {
+                            tmi.LabelVisible = false;
+                        }
+
+                        ticks[i - layout.TickmarkStart] = tmi;
+                    }
+                }
+            }
+            else
+            {
+                for (int i = layout.TickmarkStart; i < layout.TickmarkEnd; i++)
+                {
+                    TickmarkTick tmi = new TickmarkTick();
+
+                    tmi.Index = i;
+
+                    SetTickValue(chartAxis, layout, null, tmi);
+
+                    ticks[i - layout.TickmarkStart] = tmi;
+                }
+            }
+
+            layout.Ticks = ticks;
+        }
+
+        #region CalculateBaseValue
+
+        private void CalculateBaseValue(ChartAxis axis, TickmarkLayout layout)
+        {
+            switch (axis.ScaleType)
+            {
+                case ScaleType.Qualitative:
+                    int iminValue = (int)layout.MinValue;
+                    int ivalue = (int)Math.Floor(iminValue / layout.GridSpacing);
+
+                    layout.BaseValue = (int)(ivalue * layout.GridSpacing);
+                    break;
+
+                case ScaleType.DateTime:
+                    layout.BaseValue = layout.MinValue;
+                    break;
+
+                default:
+                    Type otype = layout.MinValue.GetType();
+
+                    double dminValue = Convert.ToDouble(layout.MinValue);
+                    double n = dminValue < 0 ? -1 : 1;
+                    double dvalue = Math.Floor(Math.Abs(dminValue) / layout.MajorSpacing);
+
+                    layout.BaseValue = Convert.ChangeType((int)dvalue * layout.MajorSpacing * n, otype);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region SetTickValue
+
+        private void SetTickValue(ChartAxis chartAxis, 
+            TickmarkLayout layout, TickmarkLabelVisualStyle lbstyle, TickmarkTick tmi)
+        {
+            tmi.LabelIndex = -1;
+
+            switch (chartAxis.ScaleType)
+            {
+                case ScaleType.Qualitative:
+                    tmi.Value = (int)layout.BaseValue + tmi.Index;
+
+                    if (ShowLabels == true)
+                    {
+                        int i = (int)tmi.Value;
+
+                        if ((uint)i < chartAxis.QualitativeValues.Count)
+                        {
+                            object value = chartAxis.QualitativeValues[i];
+
+                            if (string.IsNullOrEmpty(lbstyle.TextFormat) == false)
+                                tmi.Label = string.Format(lbstyle.TextFormat, value);
+                            else
+                                tmi.Label = value.ToString();
+
+                            tmi.LabelIndex = i;
+                        }
+                    }
+                    break;
+
+                case ScaleType.DateTime:
+                    tmi.Value = chartAxis.GetDateTime((DateTime)layout.BaseValue, tmi.Index * layout.MajorSpacing);
+
+                    if (ShowLabels == true)
+                    {
+                        DateTime dt = (DateTime)tmi.Value;
+
+                        if (string.IsNullOrEmpty(lbstyle.TextFormat) == false)
+                            tmi.Label = dt.ToString(lbstyle.TextFormat);
+                        else
+                            tmi.Label = chartAxis.GetDateTimeLabel(dt);
+
+                        tmi.LabelIndex = tmi.Index;
+                    }
+                    break;
+
+                default:
+                    Type otype = layout.BaseValue.GetType();
+                    double dbase = Convert.ToDouble(layout.BaseValue);
+
+                    tmi.Value = dbase + (tmi.Index * layout.MajorSpacing);
+
+                    if (ShowLabels == true)
+                    {
+                        if (string.IsNullOrEmpty(lbstyle.TextFormat) == false)
+                            tmi.Label = String.Format("{0:" + lbstyle.TextFormat + "}", tmi.Value);
+                        else
+                            tmi.Label = tmi.Value.ToString();
+
+                        tmi.LabelIndex = tmi.Index;
+                    }
+                    break;
+            }
+
+            if (ShowLabels == true && tmi.LabelIndex >= 0)
+            {
+                ChartControl chartControl = ChartControl;
+
+                chartControl.DoGetTickmarkLabelEvent(chartAxis, tmi.Value, ref tmi.Label, ref tmi.LabelColor);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetTickmarkValue
+
+        internal double GetTickmarkValue(ChartAxis chartAxis, TickmarkTick tick)
+        {
+            switch (chartAxis.ScaleType)
+            {
+                case ScaleType.DateTime:
+                    return (chartAxis.GetDateTimeValue((DateTime)tick.Value));
+
+                case ScaleType.Qualitative:
+                    return ((int)tick.Value + TickmarkLayout.MajorSpacing / 2);
+
+                default:
+                    return (Convert.ToDouble(tick.Value) + TickmarkLayout.MajorSpacing / 2);
+            }
+        }
+
+        #endregion
+
+        #region GetLabelAngle
+
+        protected virtual float GetLabelAngle()
+        {
+            float angle = LabelAngle % 180;
+
+            ChartAxis chartAxis = Parent as ChartAxis;
+            AxisAlignment axisAlignment = chartAxis.GetAxisAlignment();
+
+            if (axisAlignment == AxisAlignment.Near)
+            {
+                if (angle < -90)
+                    angle += 180;
+            }
+            else
+            {
+                if (angle > 0)
+                    angle -= 180;
+            }
+
+            return (angle);
+        }
+
+        #endregion
+
+        #region GetStartIndex
+
+        internal virtual int GetStartIndex()
+        {
+            return (0);
+        }
+
+        internal int GetStartIndexEx(ScrollBarLite srollBar)
+        {
+            int offset = srollBar.Value;
+
+            if (offset <= 0)
+                return (0);
+
+            int range = TickmarkLayout.MajorCount - 1;
+            int smax = srollBar.Maximum;
+
+            double dx = (((double)(offset * range)) / smax);
+
+            return (int)(dx);
+        }
+
+        #endregion
+
+        #region ArrangeTickmarks
+
+        protected virtual void ArrangeTickmarks()
+        {
+        }
+
+        #endregion
+
+        #region ArrangeOverride
+
+        protected override void ArrangeOverride(ChartLayoutInfo layoutInfo)
+        {
+            ChartAxis axis = Parent as ChartAxis;
+            ChartXy chartXy = axis.Parent as ChartXy;
+
+            if (TickmarkLayout.TickmarkStart != GetStartIndex())
+            {
+                Rectangle bounds = layoutInfo.LayoutBounds;
+                layoutInfo.LayoutBounds = chartXy.BoundsRelative;
+
+                chartXy.Measure(layoutInfo);
+                chartXy.Arrange(layoutInfo);
+
+                layoutInfo.LayoutBounds = bounds;
+
+                if (layoutInfo.LayoutBoundsAdjusted == true)
+                {
+                    layoutInfo.LayoutBoundsAdjusted = false;
+
+                    chartXy.InvalidateRender();
+                }
+            }
+                
+            ArrangeTickmarks();
+        }
+
+        #endregion
+
+        #region GetTotalLabelHeight
+
+        internal int GetTotalLabelHeight()
+        {
+            return (GetTotalLabelSize().Height);
+        }
+
+        #endregion
+
+        #region GetTotalLabelWidth
+
+        internal int GetTotalLabelWidth()
+        {
+            return (GetTotalLabelSize().Width);
+        }
+
+        #endregion
+
+        #region GetTotalLabelSize
+
+        internal Size GetTotalLabelSize()
+        {
+            _MaxLabelSize = new Size[2];
+            _MaxLabelSize[0] = Size.Empty;
+            _MaxLabelSize[1] = Size.Empty;
+
+            TickmarkTick lastTmi = null;
+
+            LabelsAreStaggered = false;
+
+            float angle = GetLabelAngle();
+
+            int minLabelGap = Dpi.Width(MinLabelGap);
+
+            foreach (TickmarkTick tmi in TickmarkLayout.Ticks)
+            {
+                if (tmi.LabelVisible == true && tmi.LabelPoint.IsEmpty == false && tmi.LabelIndex >= 0)
+                {
+                    int n = tmi.Index % 2;
+
+                    if (tmi.LabelSize.Height > _MaxLabelSize[n].Height)
+                        _MaxLabelSize[n].Height = tmi.LabelSize.Height;
+
+                    if (tmi.LabelSize.Width > _MaxLabelSize[n].Width)
+                        _MaxLabelSize[n].Width = tmi.LabelSize.Width;
+
+                    if (StaggerLabels == true && LabelsAreStaggered == false)
+                    {
+                        if (lastTmi != null)
+                        {
+                            if (AxisOrientation == AxisOrientation.X)
+                            {
+                                if (angle % 180 == 0)
+                                {
+                                    if (lastTmi.LabelPoint.X +
+                                        lastTmi.LabelSize.Width + minLabelGap > tmi.LabelPoint.X)
+                                    {
+                                        LabelsAreStaggered = true;
+                                    }
+                                }
+                            }
+                            else
+                            {
+                                if ((angle + 90) % 180 == 0)
+                                {
+                                    if (tmi.LabelPoint.Y +
+                                        tmi.LabelSize.Height + minLabelGap > lastTmi.LabelPoint.Y)
+                                    {
+                                        LabelsAreStaggered = true;
+                                    }
+                                }
+                            }
+                        }
+
+                        lastTmi = tmi;
+                    }
+                }
+            }
+
+            Size maxSize = Size.Empty;
+
+            if (LabelsAreStaggered == true)
+            {
+                if (AxisOrientation == AxisOrientation.X)
+                    maxSize.Height = _MaxLabelSize[0].Height + _MaxLabelSize[1].Height;
+                else
+                    maxSize.Width = _MaxLabelSize[0].Width + _MaxLabelSize[1].Width;
+            }
+            else
+            {
+                maxSize.Height = Math.Max(_MaxLabelSize[0].Height, _MaxLabelSize[1].Height);
+                maxSize.Width = Math.Max(_MaxLabelSize[0].Width, _MaxLabelSize[1].Width);
+            }
+
+            return (maxSize);
+        }
+
+        #endregion
+
+        #region Style handling
+
+        #region ApplyStyles
+
+        public override void ApplyStyles(BaseVisualStyle style)
+        {
+            base.ApplyStyles(style);
+
+            TickmarkLabelVisualStyle lstyle = style as TickmarkLabelVisualStyle;
+
+            if (lstyle != null)
+            {
+                ApplyParentStyles(lstyle, Parent as ChartContainer);
+
+                lstyle.ApplyStyle(LabelVisualStyle);
+
+                if (lstyle.Font == null)
+                    lstyle.Font = SystemFonts.DefaultFont;
+
+                if (lstyle.TextColor.IsEmpty)
+                    lstyle.TextColor = Color.Black;
+            }
+        }
+
+        #region ApplyParentStyles
+
+        private void ApplyParentStyles(
+            TickmarkLabelVisualStyle pstyle, ChartContainer item)
+        {
+            if (item != null)
+            {
+                ApplyParentStyles(pstyle, item.Parent as ChartContainer);
+            }
+            else
+            {
+                pstyle.ApplyStyle(ChartControl.BaseVisualStyles.TickmarkLabelVisualStyle);
+                pstyle.ApplyStyle(ChartControl.DefaultVisualStyles.TickmarkLabelVisualStyle);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ClearEffectiveStyles
+
+        protected override void ClearEffectiveStyles()
+        {
+            base.ClearEffectiveStyles();
+
+            _EffectiveLabelStyle.InvalidateStyle();
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Copy/CopyTo
+
+        /// <summary>
+        /// Copies the chart element to the given "copy".
+        /// </summary>
+        /// <param name="copy"></param>
+        public override void CopyTo(ChartVisualElement copy)
+        {
+            MajorTickmarks c = copy as MajorTickmarks;
+
+            if (c != null)
+            {
+                base.CopyTo(c);
+
+                c.AutoTickmarkLayout = AutoTickmarkLayout;
+                c.LabelAngle = LabelAngle;
+
+                c.LabelVisualStyle = (_LabelVisualStyle != null) ? LabelVisualStyle.Copy() : null;
+
+                c.MinLabelGap = MinLabelGap;
+                c.ShowLabels = ShowLabels;
+                c.StaggerLabels = StaggerLabels;
+            }
+        }
+
+        #endregion
+
+        #region GetSerialData
+
+        internal override SerialElementCollection GetSerialData(string serialName)
+        {
+            SerialElementCollection sec = new SerialElementCollection();
+
+            if (serialName != null)
+            {
+                if (serialName.Equals("") == true)
+                    serialName = "MajorTickmarks";
+
+                sec.AddStartElement(serialName);
+            }
+
+            sec.AddValue("AutoTickmarkLayout", AutoTickmarkLayout, true);
+            sec.AddValue("LabelAngle", LabelAngle, 0f);
+            sec.AddValue("LabelSkip", LabelSkip, 0);
+
+            if (_LabelVisualStyle != null && _LabelVisualStyle.IsEmpty == false)
+                sec.AddElement(_LabelVisualStyle.GetSerialData("LabelVisualStyle"));
+
+            sec.AddValue("MinLabelGap", MinLabelGap, 4);
+            sec.AddValue("ShowLabels", ShowLabels, true);
+            sec.AddValue("StaggerLabels", StaggerLabels, true);
+
+            sec.AddElement(base.GetSerialData(null));
+
+            if (serialName != null)
+                sec.AddEndElement(serialName);
+
+            return (sec);
+        }
+
+        #endregion
+
+        #region PutSerialData
+
+        #region ProcessValue
+
+        internal override void ProcessValue(SerialElement se)
+        {
+            switch (se.Name)
+            {
+                case "AutoTickmarkLayout":
+                    AutoTickmarkLayout = bool.Parse(se.StringValue);
+                    break;
+
+                case "LabelAngle":
+                    LabelAngle = float.Parse(se.StringValue);
+                    break;
+
+                case "LabelSkip":
+                    LabelSkip = int.Parse(se.StringValue);
+                    break;
+
+                case "MinLabelGap":
+                    MinLabelGap = int.Parse(se.StringValue);
+                    break;
+
+                case "ShowLabels":
+                    ShowLabels = bool.Parse(se.StringValue);
+                    break;
+
+                case "StaggerLabels":
+                    StaggerLabels = bool.Parse(se.StringValue);
+                    break;
+
+                default:
+                    base.ProcessValue(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region ProcessCollection
+
+        internal override void ProcessCollection(SerialElement se)
+        {
+            SerialElementCollection sec = se.Sec;
+
+            switch (se.Name)
+            {
+                case "LabelVisualStyle":
+                    sec.PutSerialData(LabelVisualStyle);
+                    break;
+
+                default:
+                    base.ProcessCollection(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region MajorStates
+
+        [Flags]
+        protected enum MajorStates : uint
+        {
+            AutoLayout = (1U << 0),
+            ShowLabels = (1U << 1),
+            StaggerLabels = (1U << 2),
+
+            //--------
+
+            LabelsAreStaggered = (1U << 3),
+        }
+
+        #region TestState
+
+        protected bool TestState(MajorStates state)
+        {
+            return ((_MajorStates & state) == state);
+        }
+
+        #endregion
+
+        #region SetState
+
+        protected void SetState(MajorStates state, bool value)
+        {
+            if (value == true)
+                _MajorStates |= state;
+            else
+                _MajorStates &= ~state;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IDisposable
+
+        public override void Dispose()
+        {
+            LabelVisualStyle = null;
+
+            base.Dispose();
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #endregion
+
+    #region MinorTickmarks
+
+    #region MinorTickmarksX
+
+    /// <summary>
+    /// Represents a Minor tickmark on the X-Axis.
+    /// </summary>
+    public class MinorTickmarksX : MinorTickmarks
+    {
+        public MinorTickmarksX()
+            : base(AxisOrientation.X)
+        {
+        }
+
+        #region MeasureOverride
+
+        protected override void MeasureOverride(ChartLayoutInfo layoutInfo)
+        {
+            ChartAxis chartAxis = Parent as ChartAxis;
+            Rectangle bounds = Rectangle.Empty;
+
+            if (TickmarkCount > 0)
+            {
+                bounds = layoutInfo.LayoutBounds;
+                bounds.Height = Dpi.Height(GetMaxTickmarkLength(chartAxis, false));
+            }
+
+            BoundsRelative = bounds;
+        }
+
+        #endregion
+
+        #region RenderOverride
+
+        protected override void RenderOverride(ChartRenderInfo renderInfo)
+        {
+            TickmarkTick[] ticks = TickmarkLayout.Ticks;
+
+            if (ticks.Length > 1)
+            {
+                ChartAxis chartAxis = Parent as ChartAxis;
+                ChartTickmarkVisualStyle tstyle = EffectiveStyle;
+
+                if (CanRenderTickmarks(tstyle) == true)
+                {
+                    Graphics g = renderInfo.Graphics;
+                    Point pt = GetLocalAdjustedPoint(Point.Empty);
+
+                    AxisAlignment axisAlignment = chartAxis.GetAxisAlignment();
+
+                    using (Pen pen = new Pen(tstyle.TickmarkColor, Dpi.Width(tstyle.TickmarkThickness)))
+                    {
+                        int tlen = Dpi.Width(tstyle.TickmarkLength);
+
+                        if ((tstyle.TickmarkAlignment == LineAlignment.Center) ||
+                            (axisAlignment == AxisAlignment.Far && tstyle.TickmarkAlignment == LineAlignment.Near) ||
+                            (axisAlignment == AxisAlignment.Near && tstyle.TickmarkAlignment == LineAlignment.Far))
+                        {
+                            // Bottom
+
+                            RenderMarks(g, pen, chartAxis, pt, ticks, 0, tlen - 1);
+                        }
+
+                        if ((tstyle.TickmarkAlignment == LineAlignment.Center) ||
+                            (axisAlignment == AxisAlignment.Far && tstyle.TickmarkAlignment == LineAlignment.Far) ||
+                            (axisAlignment == AxisAlignment.Near && tstyle.TickmarkAlignment == LineAlignment.Near))
+                        {
+                            // Top
+
+                            ChartXy chartXy = chartAxis.Parent as ChartXy;
+
+                            if (axisAlignment == AxisAlignment.Near)
+                            {
+                                int n = 1;
+
+                                if (chartAxis.EdgeAxis == true)
+                                    n = chartXy.GetScBorderThickness(XyAlignment.Bottom);
+
+                                RenderMarks(g, pen, chartAxis, pt, ticks, -(n + tlen), tlen - 1);
+                            }
+                            else
+                            {
+                                int n = 0;
+
+                                RenderMarks(g, pen, chartAxis, pt, ticks, -(n + tlen), tlen - 1);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        #region CanRenderTickmarks
+
+        protected override bool CanRenderTickmarks(ChartTickmarkVisualStyle tstyle)
+        {
+            if (TickmarkCount <= 0)
+                return (false);
+
+            return (base.CanRenderTickmarks(tstyle));
+        }
+
+        #endregion
+
+        #region RenderMarks
+
+        private void RenderMarks(Graphics g,
+            Pen pen, ChartAxis chartAxis, Point pt, TickmarkTick[] ticks, int voff, int len)
+        {
+            ChartAxis axis = Parent as ChartAxis;
+
+            int minorTickCount = TickmarkLayout.MinorCount;
+
+            for (int i = 0; i < ticks.Length - 1; i++)
+            {
+                TickmarkTick tick = ticks[i];
+
+                Point pt1 = tick.TickPoint;
+                pt1.Y += (pt.Y + voff);
+
+                Point pt2 = pt1;
+                pt2.Y += len;
+
+                double dx = (double)(ticks[i + 1].TickPoint.X - tick.TickPoint.X) / (minorTickCount + 1);
+                double ddx = dx;
+
+                for (int j = 0; j < minorTickCount; j++)
+                {
+                    pt1.X = pt.X + (int)(tick.TickPoint.X + ddx);
+                    pt2.X = pt1.X;
+
+                    ddx += dx;
+
+                    if (pt1.X >= chartAxis.AxisLineBounds.X - ScrollOffset.X &&
+                        pt1.X < chartAxis.AxisLineBounds.Right - ScrollOffset.X)
+                    {
+                        if (pt1.Equals(pt2) == true)
+                            pt1.Y--;
+
+                        g.DrawLine(pen, pt1, pt2);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Copy/CopyTo
+
+        /// <summary>
+        /// Creates a copy of the chart element.
+        /// </summary>
+        /// <returns></returns>
+        public override ChartVisualElement Copy()
+        {
+            MinorTickmarksX copy = new MinorTickmarksX();
+
+            CopyTo(copy);
+
+            return (copy);
+        }
+
+        /// <summary>
+        /// Copies the chart element to the given "copy".
+        /// </summary>
+        /// <param name="copy"></param>
+        public override void CopyTo(ChartVisualElement copy)
+        {
+            MinorTickmarksX c = copy as MinorTickmarksX;
+
+            if (c != null)
+            {
+                base.CopyTo(c);
+            }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region MinorTickmarksY
+
+    /// <summary>
+    /// Represents a Minor tickmark on the Y-Axis.
+    /// </summary>
+    public class MinorTickmarksY : MinorTickmarks
+    {
+        public MinorTickmarksY()
+            : base(AxisOrientation.Y)
+        {
+        }
+
+        #region MeasureOverride
+
+        protected override void MeasureOverride(ChartLayoutInfo layoutInfo)
+        {
+            ChartAxis chartAxis = Parent as ChartAxis;
+
+            Rectangle bounds = Rectangle.Empty;
+
+            if (TickmarkCount > 0)
+            {
+                bounds = layoutInfo.LayoutBounds;
+                bounds.Width = Dpi.Width(GetMaxTickmarkLength(chartAxis, false));
+
+                if (chartAxis.AxisAlignment == AxisAlignment.Near)
+                    bounds.X = layoutInfo.LayoutBounds.Right - bounds.Width;
+            }
+
+            BoundsRelative = bounds;
+        }
+
+        #endregion
+
+        #region RenderOverride
+
+        protected override void RenderOverride(ChartRenderInfo renderInfo)
+        {
+            TickmarkTick[] ticks = TickmarkLayout.Ticks;
+
+            if (ticks.Length > 1)
+            {
+                ChartAxis chartAxis = Parent as ChartAxis;
+                ChartTickmarkVisualStyle tstyle = EffectiveStyle;
+
+                if (CanRenderTickmarks(tstyle) == true)
+                {
+                    Graphics g = renderInfo.Graphics;
+
+                    AxisAlignment axisAlignment = chartAxis.GetAxisAlignment();
+
+                    using (Pen pen = new Pen(tstyle.TickmarkColor, Dpi.Height(tstyle.TickmarkThickness)))
+                    {
+                        int tlen = Dpi.Height(tstyle.TickmarkLength);
+
+                        if (tstyle.TickmarkAlignment == LineAlignment.Center ||
+                            (axisAlignment == AxisAlignment.Far && tstyle.TickmarkAlignment == LineAlignment.Near) ||
+                            (axisAlignment == AxisAlignment.Near && tstyle.TickmarkAlignment == LineAlignment.Far))
+                        {
+                            // Right
+
+                            RenderMarks(g, pen, chartAxis, ticks, 0, tlen - 1);
+                        }
+
+                        if (tstyle.TickmarkAlignment == LineAlignment.Center ||
+                            (axisAlignment == AxisAlignment.Far && tstyle.TickmarkAlignment == LineAlignment.Far) ||
+                            (axisAlignment == AxisAlignment.Near && tstyle.TickmarkAlignment == LineAlignment.Near))
+                        {
+                            // Left
+
+                            ChartXy chartXy = chartAxis.Parent as ChartXy;
+
+                            if (axisAlignment == AxisAlignment.Near)
+                            {
+                                int n = 1;
+
+                                if (chartAxis.EdgeAxis == true)
+                                    n = chartXy.GetScBorderThickness(XyAlignment.Right);
+
+                                RenderMarks(g, pen, chartAxis, ticks, -(n + tlen), tlen - 1);
+                            }
+                            else
+                            {
+                                int n = 1;
+
+                                RenderMarks(g, pen, chartAxis, ticks, -(n + tlen), tlen);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        #region CanRenderTickmarks
+
+        protected override bool CanRenderTickmarks(ChartTickmarkVisualStyle tstyle)
+        {
+            if (TickmarkCount <= 0)
+                return (false);
+
+            return (base.CanRenderTickmarks(tstyle));
+        }
+
+        #endregion
+
+        #region RenderMarks
+
+        private void RenderMarks(Graphics g,
+            Pen pen, ChartAxis chartAxis, TickmarkTick[] ticks, int hoff, int len)
+        {
+            ChartAxis axis = Parent as ChartAxis;
+
+            int minorTickCount = TickmarkLayout.MinorCount;
+
+            Point pt = GetLocalAdjustedPoint(Point.Empty);
+
+            for (int i = 0; i < ticks.Length - 1; i++)
+            {
+                TickmarkTick tick = ticks[i];
+
+                Point pt1 = tick.TickPoint;
+                pt1.X += (pt.X + hoff);
+
+                Point pt2 = pt1;
+                pt2.X += len;
+
+                double dy = (double)(ticks[i + 1].TickPoint.Y - tick.TickPoint.Y) / (minorTickCount + 1);
+                double ddy = dy;
+
+                for (int j = 0; j < minorTickCount; j++)
+                {
+                    pt1.Y = pt.Y + (int)(tick.TickPoint.Y + ddy);
+                    pt2.Y = pt1.Y;
+
+                    ddy += dy;
+
+                    if (pt1.Y >= chartAxis.AxisLineBounds.Y - ScrollOffset.Y &&
+                        pt1.Y < chartAxis.AxisLineBounds.Bottom - ScrollOffset.Y)
+                    {
+                        g.DrawLine(pen, pt1, pt2);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Copy/CopyTo
+
+        /// <summary>
+        /// Creates a copy of the chart element.
+        /// </summary>
+        /// <returns></returns>
+        public override ChartVisualElement Copy()
+        {
+            MinorTickmarksY copy = new MinorTickmarksY();
+
+            CopyTo(copy);
+
+            return (copy);
+        }
+
+        /// <summary>
+        /// Copies the chart element to the given "copy".
+        /// </summary>
+        /// <param name="copy"></param>
+        public override void CopyTo(ChartVisualElement copy)
+        {
+            MinorTickmarksY c = copy as MinorTickmarksY;
+
+            if (c != null)
+            {
+                base.CopyTo(c);
+            }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region MinorTickmarks
+
+    /// <summary>
+    /// Represents a Minor tickmark.
+    /// </summary>
+    public class MinorTickmarks : ChartTickmarks
+    {
+        #region Private variables
+
+        private int _TickmarkCount = 3;
+
+        #endregion
+
+        public MinorTickmarks(AxisOrientation orientation)
+            : base(orientation)
+        {
+        }
+
+        #region Public properties
+
+        #region TickmarkCount
+
+        ///<summary>
+        /// Gets or sets the number of Tickmarks presented between Majortickmarks.
+        ///</summary>
+        [DefaultValue(3), Category("Layout")]
+        [Description("Indicates the number of Tickmarks presented between Majortickmarks.")]
+        public int TickmarkCount
+        {
+            get { return (_TickmarkCount); }
+
+            set
+            {
+                if (value != _TickmarkCount)
+                {
+                    _TickmarkCount = value;
+
+                    OnPropertyChangedEx("TickmarkCount", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region CopyTo
+
+        /// <summary>
+        /// Copies the chart element to the given "copy".
+        /// </summary>
+        /// <param name="copy"></param>
+        public override void CopyTo(ChartVisualElement copy)
+        {
+            MinorTickmarks c = copy as MinorTickmarks;
+
+            if (c != null)
+            {
+                base.CopyTo(c);
+
+                c.TickmarkCount = TickmarkCount;
+            }
+        }
+
+        #endregion
+
+        #region GetSerialData
+
+        internal override SerialElementCollection GetSerialData(string serialName)
+        {
+            SerialElementCollection sec = new SerialElementCollection();
+
+            if (serialName != null)
+            {
+                if (serialName.Equals("") == true)
+                    serialName = "MinorTickmarks";
+
+                sec.AddStartElement(serialName);
+            }
+
+            sec.AddElement(base.GetSerialData(null));
+
+            sec.AddValue("TickmarkCount", TickmarkCount, 3);
+
+            if (serialName != null)
+                sec.AddEndElement(serialName);
+
+            return (sec);
+        }
+
+        #endregion
+
+        #region PutSerialData
+
+        #region ProcessValue
+
+        internal override void ProcessValue(SerialElement se)
+        {
+            switch (se.Name)
+            {
+                case "TickmarkCount":
+                    TickmarkCount = int.Parse(se.StringValue);
+                    break;
+
+                default:
+                    base.ProcessValue(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+    }
+
+    #endregion
+
+    #endregion
+
+    #region ChartTickmarks
+
+    [TypeConverter(typeof(BlankExpandableObjectConverter))]
+    public abstract class ChartTickmarks : ChartVisualElement
+    {
+        #region Private variables
+
+        private States _States;
+
+        private AxisOrientation _AxisOrientation;
+
+        private Rectangle _TickmarkBounds;
+        private TickmarkLayout _TickmarkLayout;
+
+        private ChartTickmarkVisualStyle _ChartTickmarkVisualStyle;
+        private EffectiveStyle<ChartTickmarkVisualStyle> _EffectiveStyle;
+
+        #endregion
+
+        public ChartTickmarks(AxisOrientation orientation)
+        {
+            _AxisOrientation = orientation;
+
+            InitDefaultStates();
+
+            _EffectiveStyle = new EffectiveStyle<ChartTickmarkVisualStyle>(this);
+
+            Visible = true;
+        }
+
+        #region InitDefaultStates
+
+        private void InitDefaultStates()
+        {
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region AxisOrientation
+
+        ///<summary>
+        /// Gets the axis orientation (X/Y).
+        ///</summary>
+        [Browsable(false)]
+        [Description("Indicates the axis orientation (X/Y).")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public AxisOrientation AxisOrientation
+        {
+            get { return (_AxisOrientation); }
+        }
+
+        #endregion
+
+        #region EffectiveStyle
+
+        /// <summary>
+        /// Gets a reference to the Tickmark's Effective (cached, composite) style.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        [Description("Indicates a reference to the Tickmark's Effective (cached, composite) style.")]
+        public ChartTickmarkVisualStyle EffectiveStyle
+        {
+            get { return (_EffectiveStyle.Style); }
+        }
+
+        #endregion
+
+        #region ChartTickmarkVisualStyle
+
+        /// <summary>
+        /// Gets or sets the visual styles for the Tickmarks.
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates the visual styles for the Tickmarks.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ChartTickmarkVisualStyle ChartTickmarkVisualStyle
+        {
+            get
+            {
+                if (_ChartTickmarkVisualStyle == null)
+                {
+                    _ChartTickmarkVisualStyle = new ChartTickmarkVisualStyle();
+
+                    StyleVisualChangeHandler(null, _ChartTickmarkVisualStyle);
+                }
+
+                return (_ChartTickmarkVisualStyle);
+            }
+
+            set
+            {
+                if (_ChartTickmarkVisualStyle != value)
+                {
+                    ChartTickmarkVisualStyle oldValue = _ChartTickmarkVisualStyle;
+
+                    _ChartTickmarkVisualStyle = value;
+
+                    OnVisualStyleChanged("ChartTickmarkVisualStyle", oldValue, value);
+
+                    if (oldValue != null)
+                        oldValue.Dispose();
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region TickmarkBounds
+
+        internal Rectangle TickmarkBounds
+        {
+            get { return (_TickmarkBounds); }
+            set { _TickmarkBounds = value; }
+        }
+
+        #endregion
+
+        #region TickmarkLayout
+
+        internal TickmarkLayout TickmarkLayout
+        {
+            get { return (_TickmarkLayout); }
+            set { _TickmarkLayout = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region MeasureOverride
+
+        protected override void MeasureOverride(ChartLayoutInfo layoutInfo)
+        {
+        }
+
+        #endregion
+
+        #region ArrangeOverride
+
+        protected override void ArrangeOverride(ChartLayoutInfo layoutInfo)
+        {
+        }
+
+        #endregion
+
+        #region RenderOverride
+
+        protected override void RenderOverride(ChartRenderInfo renderInfo)
+        {
+        }
+
+        #endregion
+
+        #region CanRenderTickmarks
+
+        protected virtual bool CanRenderTickmarks(ChartTickmarkVisualStyle tstyle)
+        {
+            if (Visible == false || tstyle.TickmarkThickness <= 0 || tstyle.TickmarkColor.IsEmpty == true)
+                return (false);
+
+            return (true);
+        }
+
+        #endregion
+
+        #region Render
+
+        internal override void Render(ChartRenderInfo renderInfo)
+        {
+            if (Displayed == true)
+                RenderOverride(renderInfo);
+        }
+
+        #endregion
+
+        #region GetMaxTickmarkLength
+
+        internal int GetMaxTickmarkLength(ChartAxis chartAxis, bool inner)
+        {
+            int length = (inner == false) ? 4 : 0;
+
+            if (Visible == true)
+            {
+                ChartTickmarkVisualStyle tstyle = EffectiveStyle;
+
+                if (chartAxis.EdgeAxis == false)
+                {
+                    length = tstyle.TickmarkLength;
+                }
+                else
+                {
+                    switch (tstyle.TickmarkAlignment)
+                    {
+                        case LineAlignment.Near:
+                            if (inner == true)
+                                length = tstyle.TickmarkLength;
+                            break;
+
+                        case LineAlignment.Center:
+                            length = tstyle.TickmarkLength;
+                            break;
+
+                        default:
+                            if (inner == false)
+                                length = tstyle.TickmarkLength;
+                            break;
+                    }
+                }
+            }
+
+            return (length);
+        }
+
+        #endregion
+
+        #region GetLocalAdjustedBounds
+
+        internal Rectangle GetLocalAdjustedBounds(Rectangle bounds)
+        {
+            bounds.Location = GetLocalAdjustedPoint(bounds.Location);
+
+            return (bounds);
+        }
+
+        #endregion
+
+        #region GetLocalAdjustedPoint
+
+        internal Point GetLocalAdjustedPoint(Point pt)
+        {
+            ChartAxis axis = Parent as ChartAxis;
+            ChartXy chartXy = axis.Parent as ChartXy;
+
+            if (chartXy != null)
+            {
+                pt.X -= ScrollOffset.X;
+                pt.Y -= ScrollOffset.Y;
+
+                if (_AxisOrientation == AxisOrientation.X)
+                {
+                    pt.X -= chartXy.HScrollOffset;
+                }
+                else
+                {
+                    if (chartXy.VScrollBar.Inverted == true)
+                        pt.Y += chartXy.VScrollOffset;
+                    else
+                        pt.Y -= chartXy.VScrollOffset;
+                }
+            }
+
+            return (pt);
+        }
+
+        #endregion
+
+        #region Style handling
+
+        #region ApplyStyles
+
+        public override void ApplyStyles(BaseVisualStyle style)
+        {
+            ChartTickmarkVisualStyle tstyle = style as ChartTickmarkVisualStyle;
+
+            if (tstyle != null)
+            {
+                ApplyParentStyles(tstyle, Parent as ChartContainer);
+
+                tstyle.ApplyStyle(ChartTickmarkVisualStyle);
+
+                if (tstyle.TickmarkColor.IsEmpty == true)
+                    tstyle.TickmarkColor = Color.Gray;
+
+                if (tstyle.TickmarkThickness < 0)
+                    tstyle.TickmarkThickness = 1;
+
+                if (tstyle.TickmarkLength < 0)
+                {
+                    if (this is MajorTickmarks)
+                        tstyle.TickmarkLength = 5;
+                    else
+                        tstyle.TickmarkLength = 2;
+                }
+
+                if (tstyle.TickmarkAlignment == LineAlignment.NotSet)
+                    tstyle.TickmarkAlignment = LineAlignment.Far;
+            }
+        }
+
+        #region ApplyParentStyles
+
+        private void ApplyParentStyles(
+            ChartTickmarkVisualStyle pstyle, ChartContainer item)
+        {
+            if (item != null)
+            {
+                ApplyParentStyles(pstyle, item.Parent as ChartContainer);
+
+                if (item is ChartPanel)
+                {
+                    pstyle.ApplyStyle(((ChartPanel)item).DefaultVisualStyles.ChartTickmarkVisualStyle);
+                }
+            }
+            else
+            {
+                pstyle.ApplyStyle(ChartControl.BaseVisualStyles.ChartTickmarkVisualStyle);
+                pstyle.ApplyStyle(ChartControl.DefaultVisualStyles.ChartTickmarkVisualStyle);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InvalidateStyle
+
+        ///<summary>
+        ///Invalidate the cached Style definition
+        ///</summary>
+        public void InvalidateStyle()
+        {
+            ClearEffectiveStyles();
+        }
+
+        #endregion
+
+        #region ClearEffectiveStyles
+
+        protected override void ClearEffectiveStyles()
+        {
+            if (_EffectiveStyle.InvalidateStyle() == true)
+                InvalidateLayout();
+        }
+
+        #endregion
+
+        #endregion
+
+        #region CopyTo
+
+        /// <summary>
+        /// Copies the chart element to the given "copy".
+        /// </summary>
+        /// <param name="copy"></param>
+        public override void CopyTo(ChartVisualElement copy)
+        {
+            ChartTickmarks c = copy as ChartTickmarks;
+
+            if (c != null)
+            {
+                base.CopyTo(c);
+
+                c.ChartTickmarkVisualStyle = 
+                    (_ChartTickmarkVisualStyle != null) ? ChartTickmarkVisualStyle.Copy() : null;
+            }
+        }
+
+        #endregion
+
+        #region GetSerialData
+
+        internal override SerialElementCollection GetSerialData(string serialName)
+        {
+            SerialElementCollection sec = new SerialElementCollection();
+
+            if (serialName != null)
+            {
+                if (serialName.Equals("") == true)
+                    serialName = "ChartTickmarks";
+
+                sec.AddStartElement(serialName);
+            }
+
+            if (_ChartTickmarkVisualStyle != null && _ChartTickmarkVisualStyle.IsEmpty == false)
+                sec.AddElement(_ChartTickmarkVisualStyle.GetSerialData("ChartTickmarkVisualStyle"));
+
+            sec.AddElement(base.GetSerialData(null));
+
+            if (serialName != null)
+                sec.AddEndElement(serialName);
+
+            return (sec);
+        }
+
+        #endregion
+
+        #region PutSerialData
+
+        #region ProcessCollection
+
+        internal override void ProcessCollection(SerialElement se)
+        {
+            SerialElementCollection sec = se.Sec;
+
+            switch (se.Name)
+            {
+                case "ChartTickmarkVisualStyle":
+                    sec.PutSerialData(ChartTickmarkVisualStyle);
+                    break;
+
+                default:
+                    base.ProcessCollection(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region States
+
+        [Flags]
+        protected enum States : uint
+        {
+        }
+
+        #region TestState
+
+        protected bool TestState(States state)
+        {
+            return ((_States & state) == state);
+        }
+
+        #endregion
+
+        #region SetState
+
+        protected void SetState(States state, bool value)
+        {
+            if (value == true)
+                _States |= state;
+            else
+                _States &= ~state;
+        }
+
+        #endregion
+
+        #endregion
+    }
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/XyChart/ChartXy.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/XyChart/ChartXy.cs
new file mode 100644
index 00000000..81d79d68
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/XyChart/ChartXy.cs	
@@ -0,0 +1,6452 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Drawing.Drawing2D;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.Charts.Style;
+
+namespace DevComponents.DotNetBar.Charts
+{
+    /// <summary>
+    /// Represents an X/Y oriented chart.
+    /// </summary>pi
+    public class ChartXy : BaseChart
+    {
+        #region Private variables
+
+        private States _States;
+
+        private ChartAxisX _AxisX;
+        private ChartAxisY _AxisY;
+
+        private ChartAxesXCollection _AncillaryAxesX;
+        private ChartAxesYCollection _AncillaryAxesY;
+
+        private ChartSeriesCollection _ChartSeries;
+
+        private SeriesType _AutoGenSeriesChartType = SeriesType.Point;
+
+        private int _BarSpacing;
+        private double _BarSpacingRatio = 0.2d;
+        private double _BarWidthRatio;
+        private object _BarOrigin;
+        private Tbool _BarShadingEnabled = Tbool.NotSet;
+        private Tbool _BarShowAsHistogram = Tbool.NotSet;
+
+        private BarFillRange _BarFillRange = BarFillRange.NotSet;
+        private BarLabelPosition _BarLabelPosition = BarLabelPosition.NotSet;
+
+        private DataLabelOverlapMode _DataLabelOverlapMode = DataLabelOverlapMode.NotSet;
+
+        private DataLabelVisualStyle _DataLabelVisualStyle;
+        private EffectiveStyle<DataLabelVisualStyle> _EffectiveDataLabelStyle;
+
+        private ChartXyVisualStyle _ChartVisualStyle;
+        private EffectiveStyle<ChartXyVisualStyle> _EffectiveChartStyle;
+
+        private ChartSeriesVisualStyle _ChartSeriesVisualStyle;
+        private EffectiveStyle<ChartSeriesVisualStyle> _EffectiveChartSeriesStyle;
+
+        private ChartCrosshair _ChartCrosshair;
+        private List<CrosshairPoint> _CrosshairSeriesPoints;
+        private CrosshairPoint _NearestCrosshairPoint;
+        private bool _CanShowCrosshairLabel;
+
+        private object _MinValueX;
+        private object _MaxValueX;
+
+        private object _MinValueY;
+        private object _MaxValueY;
+
+        private Size _MinQualitativeSize;
+
+        private PointMarker _PointMarker;
+
+        private ChartLineDisplayMode _ChartLineDisplayMode = ChartLineDisplayMode.NotSet;
+        private ChartLineAreaDisplayMode _ChartLineAreaDisplayMode = ChartLineAreaDisplayMode.NotSet;
+
+        private BubbleSizeMode _BubbleSizeMode = BubbleSizeMode.NotSet;
+        private BubbleIntensityMode _BubbleIntensityMode = BubbleIntensityMode.NotSet;
+        private ConvexHullDisplayMode _ConvexHullDisplayMode = ConvexHullDisplayMode.NotSet;
+        private PointLabelDisplayMode _PointLabelDisplayType = PointLabelDisplayMode.NotSet;
+
+        private StepLines _StepLines = StepLines.NotSet;
+        private StepLineMode _StepLineMode = StepLineMode.NotSet;
+
+        private List<PointLabelGroup> _PointLabels;
+
+        #endregion
+
+        public ChartXy(string name)
+            : this()
+        {
+            Name = name;
+        }
+
+        public ChartXy()
+        {
+            InitDefaultStates();
+
+            _EffectiveChartStyle = new EffectiveStyle<ChartXyVisualStyle>(this);
+            _EffectiveChartSeriesStyle = new EffectiveStyle<ChartSeriesVisualStyle>(this);
+
+            _EffectiveDataLabelStyle = new EffectiveStyle<DataLabelVisualStyle>(this);
+        }
+
+        #region InitDefaultStates
+
+        private void InitDefaultStates()
+        {
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region AncillaryAxesX
+
+        /// <summary>
+        /// Gets a reference to the collection of Ancillary X Axes (Axes that
+        /// can be presented in addition to the default X Axis)
+        /// </summary>
+        [Category("Axis")]
+        [Description("Indicates the collection of Ancillary X Axes (Axes that can be presented in addition to the default X Axis.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ChartAxesXCollection AncillaryAxesX
+        {
+            get
+            {
+                if (_AncillaryAxesX == null)
+                {
+                    _AncillaryAxesX = new ChartAxesXCollection();
+                    _AncillaryAxesX.CollectionChanged += AncillaryAxesCollectionChanged;
+                }
+
+                return (_AncillaryAxesX);
+            }
+
+            internal set
+            {
+                if (_AncillaryAxesX != null)
+                    _AncillaryAxesX.CollectionChanged -= AncillaryAxesCollectionChanged;
+
+                _AncillaryAxesX = value;
+
+                if (_AncillaryAxesX != null)
+                    _AncillaryAxesX.CollectionChanged += AncillaryAxesCollectionChanged;
+            }
+        }
+
+        #region AncillaryAxesCollectionChanged
+
+        private void AncillaryAxesCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            ChartAxesCollection cac = sender as ChartAxesCollection;
+
+            switch (e.Action)
+            {
+                case NotifyCollectionChangedAction.Add:
+                    AddAxisItems(e, cac.AxisOrientation);
+                    break;
+
+                case NotifyCollectionChangedAction.Replace:
+                    RemoveAxisItems(e);
+                    AddAxisItems(e, cac.AxisOrientation);
+                    break;
+
+                case NotifyCollectionChangedAction.Remove:
+                    RemoveAxisItems(e);
+                    break;
+            }
+
+            InvalidateLayout();
+        }
+
+        #region AddAxisItems
+
+        private void AddAxisItems(
+            NotifyCollectionChangedEventArgs e, AxisOrientation axisOrientation)
+        {
+            foreach (ChartAxis axis in e.NewItems)
+            {
+                if (axis.AxisOrientation != axisOrientation)
+                {
+                    if (axisOrientation == AxisOrientation.X)
+                        throw new Exception("Cannot add Y-Axis element to X-Axis collection.");
+                    else
+                        throw new Exception("Cannot add X-Axis element to Y-Axis collection.");
+                }
+
+                axis.Parent = this;
+            }
+        }
+
+        #endregion
+
+        #region RemoveAxisItems
+
+        private void RemoveAxisItems(NotifyCollectionChangedEventArgs e)
+        {
+            foreach (ChartAxis axis in e.OldItems)
+                axis.Parent = null;
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region AncillaryAxesY
+
+        /// <summary>
+        /// Gets a reference to the collection of Ancillary Y Axes (Axes that
+        /// can be presented in addition to the default Y Axis)
+        /// </summary>
+        [Category("Axis")]
+        [Description("Indicates the collection of Ancillary Y Axes (Axes that can be presented in addition to the default Y Axis.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ChartAxesYCollection AncillaryAxesY
+        {
+            get
+            {
+                if (_AncillaryAxesY == null)
+                {
+                    _AncillaryAxesY = new ChartAxesYCollection();
+                    _AncillaryAxesY.CollectionChanged += AncillaryAxesCollectionChanged;
+                }
+
+                return (_AncillaryAxesY);
+            }
+
+            internal set
+            {
+                if (_AncillaryAxesY != null)
+                    _AncillaryAxesY.CollectionChanged -= AncillaryAxesCollectionChanged;
+
+                _AncillaryAxesY = value;
+
+                if (_AncillaryAxesY != null)
+                    _AncillaryAxesY.CollectionChanged += AncillaryAxesCollectionChanged;
+            }
+        }
+
+        #endregion
+
+        #region AutoGenSeriesType
+
+        ///<summary>
+        /// Gets or sets the default SeriesType assigned to auto-generated Series.
+        ///</summary>
+        [DefaultValue(SeriesType.Point), Category("Behavior")]
+        [Description("Indicates the default SeriesType assigned to auto-generated Series.")]
+        public SeriesType AutoGenSeriesType
+        {
+            get { return (_AutoGenSeriesChartType); }
+
+            set
+            {
+                if (value != _AutoGenSeriesChartType)
+                {
+                    _AutoGenSeriesChartType = value;
+
+                    OnPropertyChanged("AutoGenSeriesType");
+                }
+            }
+        }
+
+        #endregion
+
+        #region AxisX
+
+        /// <summary>
+        /// Gets a reference to the default, primary X Axis.
+        /// </summary>
+        [Category("Axis")]
+        [Description("Indicates the reference to the default, primary X Axis.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ChartAxisX AxisX
+        {
+            get
+            {
+                if (_AxisX == null)
+                {
+                    _AxisX = new ChartAxisX();
+
+                    _AxisX.Parent = this;
+                    _AxisX.IsPrimaryAxis = true;
+                }
+
+                return (_AxisX);
+            }
+
+            internal set
+            {
+                if (_AxisX != null)
+                    _AxisX.Parent = null;
+
+                _AxisX = value;
+
+                if (_AxisX != null)
+                {
+                    _AxisX.Parent = this;
+                    _AxisX.IsPrimaryAxis = true;
+                }
+            }
+        }
+
+        #endregion
+
+        #region AxisY
+
+        /// <summary>
+        /// Gets a reference to the default, primary Y Axis.
+        /// </summary>
+        [Category("Axis")]
+        [Description("Indicates the reference to the default, primary Y Axis.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ChartAxisY AxisY
+        {
+            get
+            {
+                if (_AxisY == null)
+                {
+                    _AxisY = new ChartAxisY();
+
+                    _AxisY.Parent = this;
+                    _AxisY.IsPrimaryAxis = true;
+                }
+
+                return (_AxisY);
+            }
+
+            internal set
+            {
+                if (_AxisY != null)
+                    _AxisY.Parent = null;
+
+                _AxisY = value;
+
+                if (_AxisY != null)
+                {
+                    _AxisY.Parent = this;
+                    _AxisY.IsPrimaryAxis = true;
+                }
+            }
+        }
+
+        #endregion
+
+        #region BarFillRange
+
+        /// <summary>
+        /// Gets or sets how series bars are filled by default (either according to
+        /// each individual bar range, or the entire series range).
+        /// </summary>
+        [DefaultValue(BarFillRange.NotSet), Category("Bar Display")]
+        [Description("Indicates how series bars are filled by default(either according to each individual bar range, or the entire series range).")]
+        public BarFillRange BarFillRange
+        {
+            get { return (_BarFillRange); }
+
+            set
+            {
+                if (value != _BarFillRange)
+                {
+                    _BarFillRange = value;
+
+                    OnPropertyChangedEx("BarFillRange", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region BarLabelPosition
+
+        /// <summary>
+        /// Gets or sets the default position of bar series labels (default is Center).
+        /// </summary>
+        [DefaultValue(BarLabelPosition.NotSet), Category("Bar Display")]
+        [Description("Indicates the default position of bar series labels (default is Center).")]
+        public BarLabelPosition BarLabelPosition
+        {
+            get { return (_BarLabelPosition); }
+
+            set
+            {
+                if (value != _BarLabelPosition)
+                {
+                    _BarLabelPosition = value;
+
+                    OnPropertyChangedEx("BarLabelPosition", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region BarOrigin
+
+        /// <summary>
+        /// Gets or sets the bar 'origin'.  This value is used as the base, or 
+        /// starting Value, from which each bar originates.
+        /// </summary>
+        [DefaultValue(null), Category("Bar Display")]
+        [Description("Indicates the bar 'origin'.  This value is used as the base, or starting Value, from which each bar originates.")]
+        [TypeConverter("DevComponents.Charts.Design.PointValueConverter, DevComponents.Charts.Design," +
+            "Version=14.1.0.37, Culture=neutral, PublicKeyToken=90f470f34c89ccaf")]
+        public object BarOrigin
+        {
+            get { return (_BarOrigin); }
+
+            set
+            {
+                if (value != _BarOrigin)
+                {
+                    _BarOrigin = value;
+
+                    OnPropertyChangedEx("BarOrigin", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region BarOverlayEnabled
+
+        /// <summary>
+        /// Gets or sets whether the intra-bar (or bar grouping) overlay
+        /// is enabled (bars within a group are positoned overlayed on top of each other).
+        /// </summary>
+        [DefaultValue(false), Category("Bar Display")]
+        [Description("Indicates whether the intra-bar (or bar grouping) overlay is enabled (bars within a group are positoned overlayed on top of each other).")]
+        public bool BarOverlayEnabled
+        {
+            get { return (TestState(States.BarOverlayEnabled)); }
+
+            set
+            {
+                if (value != BarOverlayEnabled)
+                {
+                    SetState(States.BarOverlayEnabled, value);
+
+                    OnPropertyChangedEx("BarOverlayEnabled", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region BarShadingEnabled
+
+        ///<summary>
+        /// Gets or sets whether Bar shading is enabled by
+        /// default for Horizontal and Vertical Bar series.
+        ///</summary>
+        [DefaultValue(Tbool.NotSet), Category("Bar Display")]
+        [Description("Indicates whether Bar shading is enabled by default for Horizontal and Vertical Bar series.")]
+        public Tbool BarShadingEnabled
+        {
+            get { return (_BarShadingEnabled); }
+
+            set
+            {
+                if (value != _BarShadingEnabled)
+                {
+                    _BarShadingEnabled = value;
+
+                    OnPropertyChangedEx("BarShadingEnabled", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region BarShowAsHistogram
+
+        ///<summary>
+        /// Gets or sets whether the bars will be shown as a Histogram.
+        /// Note that this will only be honored for single series bar displays.
+        ///</summary>
+        [DefaultValue(Tbool.NotSet), Category("Bar Display")]
+        [Description("Indicates whether the bars will be shown as a Histogram. Note that this will only be honored for single series bar displays.")]
+        public Tbool BarShowAsHistogram
+        {
+            get { return (_BarShowAsHistogram); }
+
+            set
+            {
+                if (value != _BarShowAsHistogram)
+                {
+                    _BarShowAsHistogram = value;
+
+                    OnPropertyChangedEx("BarShowAsHistogram", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region BarSpacing
+
+        /// <summary>
+        /// Gets or sets the intra-bar spacing (or spacing between bars
+        /// within the same group). Value is taken as a fixed pixel size.
+        /// Setting BarSpacing to 0 (zero) will disable the use of this
+        /// property, and will enable the use of the set BarSpacingRatio value.
+        /// </summary>
+        [DefaultValue(0), Category("Bar Display")]
+        [Description("Indicates the intra-bar spacing (or spacing between bars within the same group). Value is taken as a fixed pixel size. Setting BarSpacing to 0 (zero) will disable the use of this property, and will enable the use of the set BarSpacingRatio value.")]
+        public int BarSpacing
+        {
+            get { return (_BarSpacing); }
+
+            set
+            {
+                if (value != _BarSpacing)
+                {
+                    _BarSpacing = value;
+
+                    OnPropertyChangedEx("BarSpacing", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region BarSpacingRatio
+
+        /// <summary>
+        /// Gets or sets the intra-bar spacing ratio (bar spacing between
+        /// multiple series bars associated with the same value. Default is .2).
+        /// </summary>
+        [DefaultValue(0.2d), Category("Bar Display")]
+        [Description("Indicates the intra-bar spacing ratio (bar spacing between multiple series bars associated with the same value. Default is .2).")]
+        public double BarSpacingRatio
+        {
+            get { return (_BarSpacingRatio); }
+
+            set
+            {
+                if (value != _BarSpacingRatio)
+                {
+                    if (value < 0)
+                        throw new ArgumentException("Value must be >= 0");
+
+                    _BarSpacingRatio = value;
+
+                    OnPropertyChangedEx("BarSpacingRatio", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region BarWidthRatio
+
+        /// <summary>
+        /// Gets or sets the default ratio of bar width to bar 
+        /// group spacing (defaults to 1 - bar width matches spacing).
+        /// </summary>
+        [DefaultValue(0d), Category("Bar Display")]
+        [Description("Indicates the default ratio of bar width to bar group spacing (defaults to 1 - bar width matches spacing).")]
+        public double BarWidthRatio
+        {
+            get { return (_BarWidthRatio); }
+
+            set
+            {
+                if (value != _BarWidthRatio)
+                {
+                    if (value < 0)
+                        throw new ArgumentException("Value must be >= 0");
+
+                    _BarWidthRatio = value;
+
+                    OnPropertyChangedEx("BarWidthRatio", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region BubbleIntensityMode
+
+        /// <summary>
+        /// Gets or sets the default mode used to determine series bubble intensities.
+        /// </summary>
+        [DefaultValue(BubbleIntensityMode.NotSet), Category("Display")]
+        [Description("Indicates the default mode used to determine series bubble intensities.")]
+        public BubbleIntensityMode BubbleIntensityMode
+        {
+            get { return (_BubbleIntensityMode); }
+
+            set
+            {
+                if (value != _BubbleIntensityMode)
+                {
+                    _BubbleIntensityMode = value;
+
+                    OnPropertyChangedEx("BubbleIntensityMode", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region BubbleSizeMode
+
+        /// <summary>
+        /// Gets or sets the default mode used to calculate series bubble sizes.
+        /// </summary>
+        [DefaultValue(BubbleSizeMode.NotSet), Category("Display")]
+        [Description("Indicates the default mode used to calculate series bubble sizes.")]
+        public BubbleSizeMode BubbleSizeMode
+        {
+            get { return (_BubbleSizeMode); }
+
+            set
+            {
+                if (value != _BubbleSizeMode)
+                {
+                    _BubbleSizeMode = value;
+
+                    OnPropertyChangedEx("BubbleSizeMode", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ChartLineAreaDisplayMode
+
+        /// <summary>
+        /// Gets or sets the default Line 'Area' display mode.
+        /// </summary>
+        [DefaultValue(ChartLineAreaDisplayMode.NotSet), Category("Display")]
+        [Description("Indicates the default Line 'Area' display mode.")]
+        [Editor("DevComponents.Charts.Design.FlagsEnumUIEditor, DevComponents.Charts.Design, " +
+                "Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(UITypeEditor))]
+        public ChartLineAreaDisplayMode ChartLineAreaDisplayMode
+        {
+            get { return (_ChartLineAreaDisplayMode); }
+
+            set
+            {
+                if (value != _ChartLineAreaDisplayMode)
+                {
+                    _ChartLineAreaDisplayMode = value;
+
+                    OnPropertyChangedEx("ChartLineAreaDisplayMode", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ChartLineDisplayMode
+
+        /// <summary>
+        /// Gets or sets the default display mode for SeriesType.Line series.
+        /// </summary>
+        [DefaultValue(ChartLineDisplayMode.NotSet), Category("Display")]
+        [Description("Indicates the default display mode for SeriesType.Line series.")]
+        [Editor("DevComponents.Charts.Design.FlagsEnumUIEditor, DevComponents.Charts.Design, " +
+                "Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(UITypeEditor))]
+        public ChartLineDisplayMode ChartLineDisplayMode
+        {
+            get { return (_ChartLineDisplayMode); }
+
+            set
+            {
+                if (value != _ChartLineDisplayMode)
+                {
+                    if ((_ChartLineDisplayMode & ChartLineDisplayMode.DisplayUnsorted) !=
+                        (value & ChartLineDisplayMode.DisplayUnsorted))
+                    {
+                        foreach (ChartSeries series in ChartSeries)
+                            series.ResetSortedPoints();
+                    }
+
+                    _ChartLineDisplayMode = value;
+
+                    OnPropertyChangedEx("ChartLineDisplayMode", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ChartSeries
+
+        /// <summary>
+        /// Gets a reference to the collection of Chart Series
+        /// </summary>
+        [Category("Data")]
+        [Description("Indicates the collection of Chart Series.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ChartSeriesCollection ChartSeries
+        {
+            get
+            {
+                if (_ChartSeries == null)
+                {
+                    _ChartSeries = new ChartSeriesCollection();
+
+                    _ChartSeries.CollectionChanged += ChartSeriesCollectionChanged;
+                }
+
+                return (_ChartSeries);
+            }
+
+            internal set
+            {
+                BaseSeries = null;
+
+                if (_ChartSeries != null)
+                    _ChartSeries.CollectionChanged -= ChartSeriesCollectionChanged;
+
+                _ChartSeries = value;
+
+                if (_ChartSeries != null)
+                    _ChartSeries.CollectionChanged += ChartSeriesCollectionChanged;
+            }
+        }
+
+        #region ChartSeriesCollectionChanged
+
+        void ChartSeriesCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            BaseSeries = null;
+
+            switch (e.Action)
+            {
+                case NotifyCollectionChangedAction.Add:
+                    foreach (ChartSeries item in e.NewItems)
+                        item.Parent = this;
+                    break;
+
+                case NotifyCollectionChangedAction.Replace:
+                    foreach (ChartSeries item in e.OldItems)
+                        item.Parent = null;
+
+                    foreach (ChartSeries item in e.NewItems)
+                        item.Parent = this;
+                    break;
+
+                case NotifyCollectionChangedAction.Remove:
+                    foreach (ChartSeries item in e.OldItems)
+                        item.Parent = null;
+                    break;
+            }
+
+            ValidateSeriesCollection();
+
+            InvalidateLayout();
+        }
+
+        #endregion
+
+        #region ValidateSeriesCollection
+
+        private void ValidateSeriesCollection()
+        {
+            SeriesRangeChanged = true;
+
+            foreach (ChartSeries series in ChartSeries)
+            {
+                ChartAxis axis = series.AxisX;
+
+                if (axis != null && axis.IsPrimaryAxis == false)
+                {
+                    if (AncillaryAxesX.Contains(axis) == false)
+                    {
+                        throw new Exception("Cannot set the series YAxis. The axis is not primary " +
+                            "or a member of the chart's AncillaryAxesY collection.");
+                    }
+                }
+
+                axis = series.AxisY;
+
+                if (axis != null && axis.IsPrimaryAxis == false)
+                {
+                    if (AncillaryAxesY.Contains(axis) == false)
+                    {
+                        throw new Exception("Cannot set the series YAxis. The axis is not primary " +
+                            "or a member of the chart's AncillaryAxesY collection.");
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ChartSeriesVisualStyle
+
+        /// <summary>
+        /// Gets or sets the default visual style for each chart series.
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates the default visual style for each chart series.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ChartSeriesVisualStyle ChartSeriesVisualStyle
+        {
+            get
+            {
+                if (_ChartSeriesVisualStyle == null)
+                {
+                    _ChartSeriesVisualStyle = new ChartSeriesVisualStyle();
+
+                    StyleVisualChangeHandler(null, _ChartSeriesVisualStyle);
+                }
+
+                return (_ChartSeriesVisualStyle);
+            }
+
+            set
+            {
+                if (_ChartSeriesVisualStyle != value)
+                {
+                    ChartSeriesVisualStyle oldValue = _ChartSeriesVisualStyle;
+
+                    _ChartSeriesVisualStyle = value;
+
+                    OnStyleChanged("ChartSeriesVisualStyle", oldValue, value);
+
+                    if (oldValue != null)
+                        oldValue.Dispose();
+                }
+            }
+        }
+
+        #endregion
+
+        #region ChartVisualStyle
+
+        /// <summary>
+        /// Gets or sets the visual style for the Chart.
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates the visual style for the Chart.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ChartXyVisualStyle ChartVisualStyle
+        {
+            get
+            {
+                if (_ChartVisualStyle == null)
+                {
+                    _ChartVisualStyle = new ChartXyVisualStyle();
+
+                    StyleVisualChangeHandler(null, _ChartVisualStyle);
+                }
+
+                return (_ChartVisualStyle);
+            }
+
+            set
+            {
+                if (_ChartVisualStyle != value)
+                {
+                    ChartXyVisualStyle oldValue = _ChartVisualStyle;
+
+                    _ChartVisualStyle = value;
+
+                    OnStyleChanged("ChartVisualStyle", oldValue, value);
+
+                    if (oldValue != null)
+                        oldValue.Dispose();
+                }
+            }
+        }
+
+        #endregion
+
+        #region ChartCrosshair
+
+        /// <summary>
+        /// Gets a reference to the Crosshair element for the chart.
+        /// </summary>
+        [Category("Appearance")]
+        [Description("Indicates a reference to the Crosshair element for the chart.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ChartCrosshair ChartCrosshair
+        {
+            get
+            {
+                if (_ChartCrosshair == null)
+                {
+                    _ChartCrosshair = new ChartCrosshair();
+
+                    _ChartCrosshair.Parent = this;
+                    _ChartCrosshair.PropertyChanged += ChartCrosshair_PropertyChanged;
+                }
+
+                return (_ChartCrosshair);
+            }
+
+            internal set
+            {
+                if (_ChartCrosshair != null)
+                {
+                    _ChartCrosshair.Parent = null;
+                    _ChartCrosshair.PropertyChanged -= ChartCrosshair_PropertyChanged;
+                }
+
+                _ChartCrosshair = value;
+
+                if (_ChartCrosshair != null)
+                {
+                    _ChartCrosshair.Parent = this;
+                    _ChartCrosshair.PropertyChanged += ChartCrosshair_PropertyChanged;
+                }
+            }
+        }
+
+        #region ChartCrosshair_PropertyChanged
+
+        void ChartCrosshair_PropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            InvalidateRender();
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ConvexHullDisplayMode
+
+        /// <summary>
+        /// Gets or sets the default ConvexHull display mode.
+        /// </summary>
+        [DefaultValue(ConvexHullDisplayMode.NotSet), Category("Display")]
+        [Description("Indicates the default ConvexHull display mode.")]
+        [Editor("DevComponents.Charts.Design.FlagsEnumUIEditor, DevComponents.Charts.Design, " +
+                "Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(UITypeEditor))]
+        public ConvexHullDisplayMode ConvexHullDisplayMode
+        {
+            get { return (_ConvexHullDisplayMode); }
+
+            set
+            {
+                if (value != _ConvexHullDisplayMode)
+                {
+                    _ConvexHullDisplayMode = value;
+
+                    OnPropertyChangedEx("ConvexHullDisplayMode", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region DataLabelOverlapMode
+
+        /// <summary>
+        /// Gets or sets the mode for resolving overlapping series data labels.
+        /// </summary>
+        [DefaultValue(DataLabelOverlapMode.NotSet), Category("Display")]
+        [Description("Indicates the mode for resolving overlapping series data labels.")]
+        public DataLabelOverlapMode DataLabelOverlapMode
+        {
+            get { return (_DataLabelOverlapMode); }
+
+            set
+            {
+                if (value != _DataLabelOverlapMode)
+                {
+                    _DataLabelOverlapMode = value;
+
+                    OnPropertyChangedEx("DataLabelOverlapMode", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region DataLabelVisualStyle
+
+        /// <summary>
+        /// Gets or sets the default visual style for the chart DataLabel's.
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates the default visual style for the chart DataLabel's.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public DataLabelVisualStyle DataLabelVisualStyle
+        {
+            get
+            {
+                if (_DataLabelVisualStyle == null)
+                {
+                    _DataLabelVisualStyle = new DataLabelVisualStyle();
+
+                    StyleVisualChangeHandler(null, _DataLabelVisualStyle);
+                }
+
+                return (_DataLabelVisualStyle);
+            }
+
+            set
+            {
+                if (_DataLabelVisualStyle != value)
+                {
+                    DataLabelVisualStyle oldValue = _DataLabelVisualStyle;
+
+                    _DataLabelVisualStyle = value;
+
+                    OnStyleChanged("DataLabelVisualStyle", oldValue, value);
+
+                    if (oldValue != null)
+                        oldValue.Dispose();
+                }
+            }
+        }
+
+        #endregion
+
+        #region EffectiveChartSeriesStyle
+
+        /// <summary>
+        /// Gets a reference to the ChartSeries effective (cached, composite) style.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public ChartSeriesVisualStyle EffectiveChartSeriesStyle
+        {
+            get { return (_EffectiveChartSeriesStyle.Style); }
+        }
+
+        #endregion
+
+        #region EffectiveChartStyle
+
+        /// <summary>
+        /// Gets a reference to the Chart's Effective (cached, composite) style.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public ChartXyVisualStyle EffectiveChartStyle
+        {
+            get { return (_EffectiveChartStyle.Style); }
+        }
+
+        #endregion
+
+        #region EffectiveDataLabelStyle
+
+        /// <summary>
+        /// Gets a reference to the DataLabel Effective (cached, composite) style.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        [Description("Indicates a reference to the DataLabel Effective (cached, composite) style.")]
+        public DataLabelVisualStyle EffectiveDataLabelStyle
+        {
+            get { return (_EffectiveDataLabelStyle.Style); }
+        }
+
+        #endregion
+
+        #region MaxValueX
+
+        /// <summary>
+        /// Gets the calculated maximum X value (composite value of all associated series).
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public object MaxValueX
+        {
+            get
+            {
+                UpdateRangeValues();
+
+                return (_MaxValueX);
+            }
+        }
+
+        #endregion
+
+        #region MaxValueY
+
+        /// <summary>
+        /// Gets the calculated maximum Y value (composite value of all associated series).
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public object MaxValueY
+        {
+            get
+            {
+                UpdateRangeValues();
+
+                return (_MaxValueY);
+            }
+        }
+
+        #endregion
+
+        #region MinValueX
+
+        /// <summary>
+        /// Gets the calculated minimum X value (composite value of all associated series).
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public object MinValueX
+        {
+            get
+            {
+                UpdateRangeValues();
+
+                return (_MinValueX);
+            }
+        }
+
+        #endregion
+
+        #region MinValueY
+
+        /// <summary>
+        /// Gets the calculated minimum Y value (composite value of all associated series).
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public object MinValueY
+        {
+            get
+            {
+                UpdateRangeValues();
+
+                return (_MinValueY);
+            }
+        }
+
+        #endregion
+
+        #region NearestCrosshairPoint
+
+        /// <summary>
+        /// Gets the last calculated CrosshairPoint nearest to the mouse cursor.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public CrosshairPoint NearestCrosshairPoint
+        {
+            get { return (_NearestCrosshairPoint); }
+        }
+
+        #endregion
+
+        #region PointLabelDisplayMode
+
+        /// <summary>
+        /// Gets or sets the default display mode for the chart PointLabels.
+        /// </summary>
+        [DefaultValue(PointLabelDisplayMode.NotSet), Category("Display")]
+        [Description("Indicates the default display mode for the chart PointLabels.")]
+        [Editor("DevComponents.Charts.Design.FlagsEnumUIEditor, DevComponents.Charts.Design, " +
+                "Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(UITypeEditor))]
+        public PointLabelDisplayMode PointLabelDisplayMode
+        {
+            get { return (_PointLabelDisplayType); }
+
+            set
+            {
+                if (value != _PointLabelDisplayType)
+                {
+                    _PointLabelDisplayType = value;
+
+                    InvalidatePointLabels();
+
+                    OnPropertyChangedEx("PointLabelDisplayMode", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ScrollBounds
+
+        /// <summary>
+        /// Gets the Scrollable bounds of the chart.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override Rectangle ScrollBounds
+        {
+            get
+            {
+                ChartXyVisualStyle xyStyle = EffectiveChartStyle;
+
+                Rectangle cbounds = ContentBounds;
+
+                cbounds.X += xyStyle.BorderThickness.Left;
+                cbounds.Width -= xyStyle.BorderThickness.Horizontal;
+
+                cbounds.Y += xyStyle.BorderThickness.Top;
+                cbounds.Height -= xyStyle.BorderThickness.Vertical;
+
+                return (cbounds);
+            }
+        }
+
+        #endregion
+
+        #region ScrollBoundsEx
+
+        /// <summary>
+        /// Gets the Scrollable, extended bounds of the chart.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override Rectangle ScrollBoundsEx
+        {
+            get
+            {
+                ChartXyVisualStyle xyStyle = EffectiveChartStyle;
+
+                Rectangle cbounds = ContentBoundsEx;
+
+                cbounds.X += xyStyle.BorderThickness.Left;
+                cbounds.Width -= xyStyle.BorderThickness.Horizontal;
+
+                cbounds.Y += xyStyle.BorderThickness.Top;
+                cbounds.Height -= xyStyle.BorderThickness.Vertical;
+
+                return (cbounds);
+            }
+        }
+
+        #endregion
+
+        #region StepLines
+
+        /// <summary>
+        /// Gets or sets which 'Step lines' are displayed by default.
+        /// </summary>
+        [DefaultValue(StepLines.NotSet), Category("Display")]
+        [Description("Indicates which 'Step lines' are displayed by default.")]
+        public StepLines StepLines
+        {
+            get { return (_StepLines); }
+
+            set
+            {
+                if (value != _StepLines)
+                {
+                    _StepLines = value;
+
+                    OnPropertyChangedEx("StepLines", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region StepLineMode
+
+        /// <summary>
+        /// Gets or sets the default mode (or order of rendered Step Lines)
+        /// used to display "Step Lines" in the defined Line series.
+        /// </summary>
+        [DefaultValue(StepLineMode.NotSet), Category("Display")]
+        [Description("Indicates the default mode (or order of rendered Step Lines) used to display 'Step Lines' in the defined Line series.")]
+        public StepLineMode StepLineMode
+        {
+            get { return (_StepLineMode); }
+
+            set
+            {
+                if (value != _StepLineMode)
+                {
+                    _StepLineMode = value;
+
+                    OnPropertyChangedEx("StepLineMode", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region CrosshairSeriesPoints
+
+        internal List<CrosshairPoint> CrosshairSeriesPoints
+        {
+            get { return (_CrosshairSeriesPoints); }
+            set { _CrosshairSeriesPoints = value; }
+        }
+
+        #endregion
+
+        #region DisplayCrosshair
+
+        internal bool DisplayCrosshair
+        {
+            get { return (TestState(States.DisplayCrosshair)); }
+            set { SetState(States.DisplayCrosshair, value); }
+        }
+
+        #endregion
+
+        #region DropShadowDisplayed
+
+        internal bool DropShadowDisplayed
+        {
+            get { return (TestState(States.DropShadowDisplayed)); }
+            set { SetState(States.DropShadowDisplayed, value); }
+        }
+
+        #endregion
+
+        #region MinQualitativeSize
+
+        internal Size MinQualitativeSize
+        {
+            get { return (_MinQualitativeSize); }
+            set { _MinQualitativeSize = value; }
+        }
+
+        #endregion
+
+        #region PointLabels
+
+        internal List<PointLabelGroup> PointLabels
+        {
+            get { return (_PointLabels); }
+            set { _PointLabels = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region MeasureOverride
+
+        protected override void MeasureOverride(ChartLayoutInfo layoutInfo)
+        {
+            ContainerVisualStyle cstyle = GetEffectiveContainerStyle();
+            ChartXyVisualStyle xystyle = EffectiveChartStyle;
+
+            BoundsRelative = layoutInfo.LayoutBounds;
+
+            MinQualitativeSize = Size.Empty;
+
+            UpdateDataBindings();
+            UpdateRangeValues();
+
+            Rectangle oldFrameBounds = FrameBounds;
+
+            FrameBounds = GetAdjustedBounds(BoundsRelative, cstyle.Margin);
+            FrameBounds = GetAdjustedBounds(FrameBounds, cstyle.Padding);
+            FrameBounds = GetAdjustedBounds(FrameBounds, xystyle.Margin);
+
+            if (FrameBounds != oldFrameBounds)
+                SeriesPointCount++;
+
+            ContentBounds = GetAdjustedBounds(FrameBounds, cstyle.BorderThickness);
+            ContentBounds = GetAdjustedBounds(ContentBounds, xystyle.BorderThickness);
+            ContentBounds = GetAdjustedBounds(ContentBounds, xystyle.Padding);
+
+            layoutInfo.LayoutBounds = ContentBounds;
+
+            foreach (ChartTitle title in Titles)
+            {
+                if (title.Visible == true)
+                    title.Measure(layoutInfo);
+            }
+
+            if (Legend.Visible == true && Legend.Placement != Placement.Inside)
+                Legend.Measure(layoutInfo);
+
+            DropShadowDisplayed = (xystyle.DropShadow.Enabled == Tbool.True);
+
+            MeasureSeries(layoutInfo);
+            MeasureXyAxes(layoutInfo);
+
+            if (DropShadowDisplayed == true)
+                layoutInfo.LayoutBounds = GetShadowBounds(layoutInfo.LayoutBounds);
+
+            if (Legend.Visible == true && Legend.Placement == Placement.Inside)
+            {
+                Rectangle t = layoutInfo.LayoutBounds;
+
+                if (VScrollBar.Visible == true)
+                {
+                    t.Width -= (VScrollBar.Width - 1);
+                    layoutInfo.LayoutBounds = t;
+                }
+
+                if (HScrollBar.Visible == true)
+                {
+                    t.Height -= (HScrollBar.Height - 1);
+                    layoutInfo.LayoutBounds = t;
+                }
+
+                Legend.Measure(layoutInfo);
+
+                if (VScrollBar.Visible == true)
+                {
+                    t.Width += VScrollBar.Width;
+                    layoutInfo.LayoutBounds = t;
+                }
+
+                if (HScrollBar.Visible == true)
+                {
+                    t.Height += HScrollBar.Height;
+                    layoutInfo.LayoutBounds = t;
+                }
+            }
+
+            Rectangle oldContentBoundsEx = ContentBoundsEx;
+
+            ContentBounds = layoutInfo.LayoutBounds;
+            ContentBoundsEx = ContentBounds;
+
+            Rectangle r = ContentBounds;
+
+            r.Size = new Size(
+                Math.Max(r.Size.Width, Dpi.Width(MinContentSize.Width)),
+                Math.Max(r.Size.Height, Dpi.Height(MinContentSize.Height)));
+
+            if (MinQualitativeSize.Width > r.Width)
+                r.Width = MinQualitativeSize.Width;
+
+            if (MinQualitativeSize.Height > r.Height)
+                r.Height = MinQualitativeSize.Height;
+
+            // Since our vertical scrollbar is reversed, we
+            // need to adjust the extended content area accordingly
+
+            if (r.Height > ContentBounds.Height)
+                r.Y -= (r.Height - ContentBounds.Height);
+
+            ContentBoundsEx = r;
+
+            if (ContentBoundsEx.Equals(oldContentBoundsEx) == false)
+                _PointLabels = null;
+
+            FinalizeDataBindings();
+        }
+
+        #region MeasureSeries
+
+        private void MeasureSeries(ChartLayoutInfo layoutInfo)
+        {
+            ChartSeries[] aseries = new ChartSeries[ChartSeries.Count];
+
+            ChartSeries.CopyTo(aseries, 0);
+
+            foreach (ChartSeries series in aseries)
+            {
+                if (series.Visible == true)
+                    series.Measure(layoutInfo);
+            }
+        }
+
+        #endregion
+
+        #region MeasureXyAxes
+
+        private void MeasureXyAxes(ChartLayoutInfo layoutInfo)
+        {
+            Rectangle obounds = layoutInfo.LayoutBounds;
+
+            SetEdgeAxes(AncillaryAxesX, AxisX);
+            SetEdgeAxes(AncillaryAxesY, AxisY);
+
+            MeasureAxes(layoutInfo, AncillaryAxesX, AxisX);
+
+            Rectangle nbounds = layoutInfo.LayoutBounds;
+
+            MeasureAxes(layoutInfo, AncillaryAxesY, AxisY);
+
+            for (int i = 0; i < 10; i++)
+            {
+                if (layoutInfo.LayoutBounds.Width == nbounds.Width)
+                    break;
+
+                nbounds = layoutInfo.LayoutBounds;
+
+                layoutInfo.LayoutBoundsAdjusted = true;
+                layoutInfo.LayoutBounds.Y = obounds.Y;
+                layoutInfo.LayoutBounds.Height = obounds.Height;
+
+                MeasureAxes(layoutInfo, AncillaryAxesX, AxisX);
+
+                if (layoutInfo.LayoutBounds.Height == nbounds.Height)
+                    break;
+
+                layoutInfo.LayoutBounds.X = obounds.X;
+                layoutInfo.LayoutBounds.Width = obounds.Width;
+
+                MeasureAxes(layoutInfo, AncillaryAxesY, AxisY);
+            }
+
+            ValidateAxes();
+        }
+
+        #region MeasureAxes
+
+        private void MeasureAxes(
+            ChartLayoutInfo layoutInfo, ChartAxesCollection axes, ChartAxis axis)
+        {
+            for (int i = axes.Count - 1; i >= 0; i--)
+            {
+                ChartAxis ca = axes[i];
+
+                if (ca != null)
+                    ca.Measure(layoutInfo);
+            }
+
+            axis.Measure(layoutInfo);
+        }
+
+        #endregion
+
+        #region ValidateAxes
+
+        private void ValidateAxes()
+        {
+            if (ValidateAxes(AncillaryAxesX, AxisX) |
+                ValidateAxes(AncillaryAxesY, AxisY))
+            {
+                InvalidateSeriesPoints();
+            }
+        }
+
+        #region ValidateAxes
+
+        private bool ValidateAxes(ChartAxesCollection axes, ChartAxis axis)
+        {
+            int visCount = 0;
+            bool altered = false;
+
+            for (int i = axes.Count - 1; i >= 0; i--)
+            {
+                ChartAxis ca = axes[i];
+
+                if (ca.Visible == true)
+                {
+                    visCount++;
+                    altered |= ca.ValidateAxis();
+                }
+            }
+
+            if (axis.Visible == true)
+            {
+                visCount++;
+                altered |= axis.ValidateAxis();
+            }
+
+            return (altered || (visCount == 0));
+        }
+
+        #endregion
+
+        #endregion
+
+        #region SetEdgeAxes
+
+        private void SetEdgeAxes(ChartAxesCollection axes, ChartAxis axis)
+        {
+            ChartAxis farEdgeAxis = null;
+            ChartAxis nearEdgeAxis = null;
+
+            for (int i = axes.Count - 1; i >= 0; i--)
+            {
+                ChartAxis ca = axes[i];
+
+                if (ca.Visible == true)
+                {
+                    AxisAlignment axisAlignment = ca.GetAxisAlignment();
+
+                    ca.EdgeAxis = false;
+
+                    if (axisAlignment == AxisAlignment.Near)
+                        nearEdgeAxis = ca;
+
+                    else if (axisAlignment == AxisAlignment.Far)
+                        farEdgeAxis = ca;
+                }
+            }
+
+            if (axis.Visible == true)
+            {
+                AxisAlignment axisAlignment = axis.GetAxisAlignment();
+
+                if (axisAlignment == AxisAlignment.Near)
+                    nearEdgeAxis = axis;
+
+                else if (axisAlignment == AxisAlignment.Far)
+                    farEdgeAxis = axis;
+            }
+
+            if (nearEdgeAxis != null)
+                nearEdgeAxis.EdgeAxis = true;
+
+            if (farEdgeAxis != null)
+                farEdgeAxis.EdgeAxis = true;
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region ArrangeOverride
+
+        protected override void ArrangeOverride(ChartLayoutInfo layoutInfo)
+        {
+            int vmax = VScrollBar.LargeChange;
+
+            UpdatePaletteColor();
+
+            base.ArrangeOverride(layoutInfo);
+
+            if (VScrollBar.LargeChange != vmax)
+                SeriesPointCount++;
+
+            ArrangeAxes(layoutInfo, AncillaryAxesX, AxisX);
+            ArrangeAxes(layoutInfo, AncillaryAxesY, AxisY);
+
+            ArrangeSeries(layoutInfo);
+
+            SeriesLayoutCount++;
+        }
+
+        #region UpdatePaletteColor
+
+        private void UpdatePaletteColor()
+        {
+            ChartBaseSeriesCollection baseSeries = BaseSeries;
+
+            for (int i = 0; i < baseSeries.Count; i++)
+            {
+                BaseSeries series = baseSeries[i];
+
+                series.DefaultPaletteColor = GetPaletteColor(i);
+            }
+        }
+
+        #endregion
+
+        #region ArrangeAxes
+
+        private void ArrangeAxes(
+            ChartLayoutInfo layoutInfo, ChartAxesCollection axes, ChartAxis axis)
+        {
+            foreach (ChartAxis ca in axes)
+            {
+                if (ca.Visible == true)
+                    ca.Arrange(layoutInfo);
+            }
+
+            axis.Arrange(layoutInfo);
+        }
+
+        #endregion
+
+        #region ArrangeSeries
+
+        private void ArrangeSeries(ChartLayoutInfo layoutInfo)
+        {
+            if (ChartSeries.Count > 0)
+            {
+                for (int i = 0; i < ChartSeries.Count; i++)
+                {
+                    ChartSeries series = ChartSeries[i];
+
+                    series.Arrange(layoutInfo);
+
+                    if (series.IsBarSeries == true)
+                    {
+                        ChartAxis axis = (series.IsRotated == false)
+                            ? (series.AxisX ?? AxisX) : (series.AxisY ?? AxisY);
+
+                        for (int j = 0; j < axis.AxisBars.Length; j++)
+                            axis.AxisBars[j].Reset();
+                    }
+                }
+
+                for (int i = ChartSeries.Count - 1; i >= 0; i--)
+                    SetBarTotals(i);
+
+                for (int i = ChartSeries.Count - 1; i >= 0; i--)
+                    SetBarWidth(i);
+
+                if (SeriesDisplayOrder == SeriesDisplayOrder.Reverse)
+                {
+                    for (int i = ChartSeries.Count - 1; i >= 0; i--)
+                        ArrangeBarSeries(i);
+                }
+                else
+                {
+                    for (int i = 0; i < ChartSeries.Count; i++)
+                        ArrangeBarSeries(i);
+                }
+            }
+        }
+
+        #region SetBarTotals
+
+        private void SetBarTotals(int i)
+        {
+            ChartSeries series = ChartSeries[i];
+
+            if (series.IsDisplayed == true)
+            {
+                ChartAxis axis = (series.IsRotated == false)
+                    ? series.AxisX ?? AxisX : series.AxisY ?? AxisY;
+
+                switch (series.SeriesType)
+                {
+                    case SeriesType.HorizontalBar:
+                    case SeriesType.VerticalBar:
+                        axis.AxisBars[(int)AxisBarType.Bar].BarCount++;
+                        axis.AxisBars[(int)AxisBarType.Bar].BarTotal += series.GetBarWidthRatio(this);
+                        break;
+
+                    case SeriesType.HorizontalHiLoBar:
+                    case SeriesType.VerticalHiLoBar:
+                        axis.AxisBars[(int)AxisBarType.HiLoBar].BarCount++;
+                        axis.AxisBars[(int)AxisBarType.HiLoBar].BarTotal += series.GetBarWidthRatio(this);
+                        break;
+                }
+            }
+        }
+
+        #endregion
+
+        #region SetBarWidth
+
+        private void SetBarWidth(int i)
+        {
+            ChartSeries series = ChartSeries[i];
+
+            if (series.IsDisplayed == true)
+            {
+                switch (series.SeriesType)
+                {
+                    case SeriesType.HorizontalBar:
+                    case SeriesType.VerticalBar:
+                        SetBarWidthEx(series, (int)AxisBarType.Bar);
+                        break;
+
+                    case SeriesType.HorizontalHiLoBar:
+                    case SeriesType.VerticalHiLoBar:
+                        SetBarWidthEx(series, (int)AxisBarType.HiLoBar);
+                        break;
+                }
+            }
+        }
+
+        #region SetBarWidthEx
+
+        private void SetBarWidthEx(ChartSeries series, int barType)
+        {
+            ChartAxis axis = (series.IsRotated == false)
+                ? series.AxisX ?? AxisX : series.AxisY ?? AxisY;
+
+            AxisBar axisBar = axis.AxisBars[barType];
+
+            double interval = axis.MajorTickmarks.TickmarkLayout.MajorInterval;
+
+            double dwidth = interval / axis.MajorTickmarks.TickmarkLayout.MajorSpacing;
+            double ratio = series.GetBarWidthRatio(this);
+
+            if (BarOverlayEnabled == true || axisBar.BarCount == 1)
+            {
+                int width = (int)(dwidth * (ratio / (ratio + 1)));
+
+                if (ratio > 100)
+                {
+                    ratio = (ratio - 1) / 100;
+                    width = (int)(dwidth * ratio);
+                }
+                
+                width = (width < 0) ? 0 : ((width - 1) | 1);
+
+                series.BarWidth = (int)(width / axis.MajorTickmarks.TickmarkLayout.GridSpacing);
+
+                axisBar.BarTotalWidth += series.BarWidth;
+            }
+            else
+            {
+                int spacing = BarSpacing;
+
+                if (BarSpacing == 0)
+                {
+                    double abt = (axisBar.BarTotal + 1) + (axisBar.BarCount - 1) * BarSpacingRatio;
+                    double sr = BarSpacingRatio / abt;
+
+                    spacing = (int)(Math.Ceiling(dwidth * sr));
+                }
+
+                dwidth -= ((axisBar.BarCount - 1) * spacing);
+
+                int width = (int)(dwidth * (ratio / (axisBar.BarTotal + 1)));
+
+                if (ratio > 100)
+                {
+                    ratio = (ratio - 1) / 100;
+                    width = (int)(dwidth * ratio);
+                }
+
+                width = (int)(width / axis.MajorTickmarks.TickmarkLayout.GridSpacing);
+                width = (width < 0) ? 0 : ((width - 1) | 1);                
+
+                series.BarWidth = width;
+
+                axisBar.BarTotalWidth += (series.BarWidth + spacing);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ArrangeBarSeries
+
+        private void ArrangeBarSeries(int i)
+        {
+            ChartSeries series = ChartSeries[i];
+
+            if (series.IsDisplayed == true)
+            {
+                switch (series.SeriesType)
+                {
+                    case SeriesType.HorizontalBar:
+                    case SeriesType.VerticalBar:
+                        ArrangeBarSeriesEx(series, (int)AxisBarType.Bar);
+                        break;
+
+                    case SeriesType.HorizontalHiLoBar:
+                    case SeriesType.VerticalHiLoBar:
+                        ArrangeBarSeriesEx(series, (int)AxisBarType.HiLoBar);
+                        break;
+                }
+            }
+        }
+
+        #region ArrangeBarSeriesEx
+
+        private void ArrangeBarSeriesEx(ChartSeries series, int barType)
+        {
+            ChartAxis axis = (series.IsRotated == false)
+                ? (series.AxisX ?? AxisX) : (series.AxisY ?? AxisY);
+
+            AxisBar axisBar = axis.AxisBars[barType];
+
+            if (BarOverlayEnabled == true || axisBar.BarCount == 1)
+            {
+                series.BarOffset = 0;
+
+                axisBar.BarOffset = series.BarWidth;
+            }
+            else
+            {
+                int spacing = BarSpacing;
+
+                if (BarSpacing == 0)
+                {
+                    double dwidth = axis.MajorTickmarks.TickmarkLayout.MajorInterval;
+                    double abt = (axisBar.BarTotal + 1) + (axisBar.BarCount - 1) * BarSpacingRatio;
+
+                    spacing = (int)(Math.Ceiling(dwidth * BarSpacingRatio / abt));
+                }
+
+                if (axisBar.BarOffset == int.MinValue)
+                    axisBar.BarOffset = (int)((-axisBar.BarTotalWidth + spacing) / 2);
+
+                series.BarOffset = axisBar.BarOffset + series.BarWidth / 2;
+
+                axisBar.BarOffset += (series.BarWidth + spacing);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region RenderOverride
+
+        private bool _LastDisplayCrosshair;
+
+        protected override void RenderOverride(ChartRenderInfo renderInfo)
+        {
+            Graphics g = renderInfo.Graphics;
+
+            ChartXyVisualStyle xystyle = EffectiveChartStyle;
+            ContainerVisualStyle cstyle = GetEffectiveContainerStyle();
+
+            Rectangle scFrameBounds = GetScrollBounds(FrameBounds);
+            Rectangle scContentBounds = GetScrollBounds(ContentBounds);
+
+            Rectangle scFigureBounds = GetFigureBounds(scFrameBounds, cstyle);
+
+            RenderFrameBackground(g, scFrameBounds, cstyle);
+
+            cstyle.RenderBackgroundFigure(g, scFigureBounds);
+            cstyle.RenderBorder(g, scFrameBounds);
+
+            Region clip = g.Clip;
+            g.SetClip(scContentBounds, CombineMode.Intersect);
+
+            RenderContentBackground(renderInfo, scContentBounds, xystyle);
+
+            Rectangle imageBounds = GetXyImageBounds(xystyle);
+
+            if (xystyle.ImageOverlay != ImageOverlay.Top && xystyle.ImageOverlay != ImageOverlay.Middle)
+                xystyle.RenderBackgroundFigure(g, scContentBounds, imageBounds);
+
+            Point cpt = Point.Empty;
+            Rectangle cbounds = Rectangle.Empty;
+
+            _NearestCrosshairPoint = null;
+
+            if (DisplayCrosshair == true)
+            {
+                cpt = ChartControl.PointToClient(Control.MousePosition);
+                cbounds = GetCrosshairBounds(cstyle);
+
+                _CrosshairSeriesPoints = GetCrosshairPoints(cbounds, cpt);
+            }
+
+            UpdatePointLabels(g);
+
+            RenderGrid(renderInfo, false);
+            RenderReferences(renderInfo, false);
+
+            if (xystyle.ImageOverlay == ImageOverlay.Middle)
+                xystyle.RenderBackgroundFigure(g, scContentBounds, imageBounds);
+
+            RenderChartContent(renderInfo, xystyle);
+
+            RenderGrid(renderInfo, true);
+            RenderReferences(renderInfo, true);
+
+            RenderPointLabels(g);
+
+            g.Clip = clip;
+
+            xystyle.RenderBorder(g, scContentBounds);
+
+            if (xystyle.ImageOverlay == ImageOverlay.Top)
+                xystyle.RenderBackgroundFigure(g, scContentBounds, imageBounds);
+
+            RenderAxes(renderInfo, AncillaryAxesX, AxisX);
+            RenderAxes(renderInfo, AncillaryAxesY, AxisY);
+
+            RenderScrollbars(renderInfo);
+
+            if (DropShadowDisplayed == true)
+                xystyle.DropShadow.RenderDropShadow(g, scContentBounds, true, true);
+
+            if (cstyle.DropShadow.Enabled == Tbool.True)
+                cstyle.DropShadow.RenderDropShadow(g, scFrameBounds, true, true);
+
+            if (DisplayCrosshair == true)
+            {
+                CrosshairVisualStyle chstyle = ChartCrosshair.EffectiveCrosshairStyle;
+
+                RenderCrosshairLines(g, cbounds, cpt, chstyle);
+                base.RenderOverride(renderInfo);
+
+                if (_CanShowCrosshairLabel == true)
+                    RenderCrosshairLabels(g, cbounds, cpt, chstyle);
+
+                _LastDisplayCrosshair = DisplayCrosshair;
+            }
+            else
+            {
+                if (_CanShowCrosshairLabel == true)
+                {
+                    if (DisplayCrosshair != _LastDisplayCrosshair)
+                        RenderCrosshairLabels(g, cbounds, cpt, ChartCrosshair.EffectiveCrosshairStyle);
+                }
+
+                base.RenderOverride(renderInfo);
+            }
+        }
+
+        #region RenderContentBackground
+
+        private void RenderContentBackground(
+            ChartRenderInfo renderInfo, Rectangle bounds, ChartXyVisualStyle xyStyle)
+        {
+            Graphics g = renderInfo.Graphics;
+            ChartControl chartControl = ChartControl;
+
+            if (chartControl.DoPreRenderContentBackgroundEvent(g, this, bounds) == false)
+            {
+                xyStyle.RenderBackground(g, bounds);
+
+                RenderAxesBackground(renderInfo, bounds, AncillaryAxesX, AxisX);
+                RenderAxesBackground(renderInfo, bounds, AncillaryAxesY, AxisY);
+
+                chartControl.DoPostRenderContentBackgroundEvent(g, this, bounds);
+            }
+        }
+
+        #region RenderAxesBackground
+
+        private void RenderAxesBackground(ChartRenderInfo renderInfo,
+            Rectangle scContentBounds, ChartAxesCollection axes, ChartAxis axis)
+        {
+            foreach (ChartAxis ca in axes)
+            {
+                if (ca.Visible == true)
+                    ca.RenderBackground(renderInfo, scContentBounds);
+            }
+
+            axis.RenderBackground(renderInfo, scContentBounds);
+
+            foreach (ChartAxis ca in axes)
+            {
+                if (ca.Visible == true)
+                    ca.RenderStripes(renderInfo, scContentBounds);
+            }
+
+            axis.RenderStripes(renderInfo, scContentBounds);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderChartContent
+
+        protected virtual void RenderChartContent(
+            ChartRenderInfo renderInfo, ChartXyVisualStyle xyStyle)
+        {
+            Graphics g = renderInfo.Graphics;
+
+            if (ChartSeries.Count > 0)
+            {
+                SmoothingMode sm = g.SmoothingMode;
+                g.SmoothingMode = SmoothingMode.AntiAlias;
+
+                Point pt = GetLocalAdjustedPoint(Point.Empty);
+
+                if (pt.IsEmpty == false)
+                    g.TranslateTransform(pt.X, pt.Y);
+
+                // Indicators on bottom
+
+                if (SeriesDisplayOrder == SeriesDisplayOrder.Reverse)
+                {
+                    for (int i = ChartSeries.Count - 1; i >= 0; i--)
+                        RenderIndicators(renderInfo, ChartSeries[i], false);
+                }
+                else
+                {
+                    foreach (ChartSeries series in ChartSeries)
+                        RenderIndicators(renderInfo, series, false);
+                }
+
+                // Series data
+
+                if (SeriesDisplayOrder == SeriesDisplayOrder.Reverse)
+                {
+                    for (int i = ChartSeries.Count - 1; i >= 0; i--)
+                        RenderSeries(renderInfo, ChartSeries[i]);
+                }
+                else
+                {
+                    foreach (ChartSeries series in ChartSeries)
+                        RenderSeries(renderInfo, series);
+                }
+
+                // Indicators on top
+
+                if (SeriesDisplayOrder == SeriesDisplayOrder.Reverse)
+                {
+                    for (int i = ChartSeries.Count - 1; i >= 0; i--)
+                        RenderIndicators(renderInfo, ChartSeries[i], true);
+                }
+                else
+                {
+                    foreach (ChartSeries series in ChartSeries)
+                        RenderIndicators(renderInfo, series, true);
+                }
+
+                if (pt.IsEmpty == false)
+                    g.ResetTransform();
+
+                g.SmoothingMode = sm;
+            }
+            else
+            {
+                Rectangle scContentBounds = GetScrollBounds(ContentBounds);
+                Rectangle scDisplayBounds = GetDisplayBounds(scContentBounds);
+
+                RenderEmptyText(g, xyStyle, scDisplayBounds);
+            }
+        }
+
+        #region RenderIndicators
+
+        private void RenderIndicators(
+            ChartRenderInfo renderInfo, ChartSeries series, bool onTop)
+        {
+            if (Visible == true)
+            {
+                if (Legend.ItemCheckAction != ItemCheckAction.ShowItem || series.IsDisplayed == true)
+                    series.RenderIndicators(renderInfo, onTop);
+            }
+        }
+
+        #endregion
+
+        #region RenderSeries
+
+        private void RenderSeries(ChartRenderInfo renderInfo, ChartSeries series)
+        {
+            if (Visible == true)
+            {
+                if (Legend.ItemCheckAction != ItemCheckAction.ShowItem || series.IsDisplayed == true)
+                    series.Render(renderInfo);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetFigureBounds
+
+        private Rectangle GetFigureBounds(Rectangle bounds, ContainerVisualStyle cStyle)
+        {
+            bounds = GetAdjustedBounds(bounds, cStyle.BorderThickness);
+
+            Rectangle scBounds = GetScrollBounds(bounds);
+
+            return (scBounds);
+        }
+
+        #endregion
+
+        #region GetXyImageBounds
+
+        private Rectangle GetXyImageBounds(ChartXyVisualStyle xyStyle)
+        {
+            Rectangle scBbounds = GetScrollBounds(ScrollBounds);
+
+            scBbounds = GetAdjustedBounds(scBbounds, xyStyle.BorderThickness);
+
+            if (xyStyle.EnableImageScroll != Tbool.False)
+            {
+                scBbounds = GetScrollBounds(ScrollBoundsEx);
+                scBbounds = GetDisplayBounds(scBbounds);
+            }
+
+            if (HScrollBar.Visible == true)
+                scBbounds.Height -= HScrollBar.Height;
+
+            if (VScrollBar.Visible == true)
+                scBbounds.Width -= VScrollBar.Width;
+
+            return (scBbounds);
+        }
+
+        #endregion
+
+        #region RenderGrid
+
+        private void RenderGrid(ChartRenderInfo renderInfo, bool displayOnTop)
+        {
+            Rectangle scContentBounds = GetScrollBounds(ContentBounds);
+
+            if (scContentBounds.Width > 0 && scContentBounds.Height > 0)
+            {
+                RenderGridLines(renderInfo, displayOnTop, AncillaryAxesX, AxisX);
+                RenderGridLines(renderInfo, displayOnTop, AncillaryAxesY, AxisY);
+            }
+        }
+
+        #region RenderGridLines
+
+        private void RenderGridLines(ChartRenderInfo renderInfo,
+            bool displayOnTop, ChartAxesCollection axes, ChartAxis axis)
+        {
+            foreach (ChartAxis ca in axes)
+            {
+                if (ca.Visible == true)
+                {
+                    if (ca.MajorGridLines.DisplayOnTop == displayOnTop)
+                        ca.MajorGridLines.Render(renderInfo);
+
+                    if (ca.MinorGridLines.DisplayOnTop == displayOnTop)
+                        ca.MinorGridLines.Render(renderInfo);
+                }
+            }
+
+            if (axis.MajorGridLines.DisplayOnTop == displayOnTop)
+                axis.MajorGridLines.Render(renderInfo);
+
+            if (axis.MinorGridLines.DisplayOnTop == displayOnTop)
+                axis.MinorGridLines.Render(renderInfo);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderReferences
+
+        private void RenderReferences(ChartRenderInfo renderInfo, bool displayOnTop)
+        {
+            Rectangle scContentBounds = GetScrollBounds(ContentBounds);
+
+            if (scContentBounds.Width > 0 && scContentBounds.Height > 0)
+            {
+                RenderReferenceLines(renderInfo, displayOnTop, AncillaryAxesX, AxisX);
+                RenderReferenceLines(renderInfo, displayOnTop, AncillaryAxesY, AxisY);
+            }
+        }
+
+        #region RenderReferenceLines
+
+        private void RenderReferenceLines(ChartRenderInfo renderInfo,
+            bool displayOnTop, ChartAxesCollection axes, ChartAxis axis)
+        {
+            foreach (ChartAxis ca in axes)
+            {
+                foreach (ReferenceLine line in ca.ReferenceLines)
+                    RenderReferenceLine(renderInfo, line, displayOnTop);
+            }
+
+            if (axis.Visible == true)
+            {
+                foreach (ReferenceLine line in axis.ReferenceLines)
+                    RenderReferenceLine(renderInfo, line, displayOnTop);
+            }
+        }
+
+        #region RenderReferenceLine
+
+        private void RenderReferenceLine(
+            ChartRenderInfo renderInfo, ReferenceLine line, bool displayOnTop)
+        {
+            if (line.Visible == true)
+            {
+                if (line.ShowCheckBoxInLegend == false || line.CheckedInLegend == true)
+                {
+                    if (line.DisplayLineOnTop == displayOnTop)
+                        line.RenderLine(renderInfo);
+
+                    if (line.DisplayTextOnTop == displayOnTop)
+                        line.RenderLineText(renderInfo);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region RenderPointLabels
+
+        private void RenderPointLabels(Graphics g)
+        {
+            Point pt = GetLocalAdjustedPoint(Point.Empty);
+
+            List<PointLabelGroup> pointLabels = UpdatePointLabels(g);
+
+            if (pointLabels.Count > 0)
+            {
+                SmoothingMode sm = g.SmoothingMode;
+                g.SmoothingMode = SmoothingMode.AntiAlias;
+
+                RenderPointConnector(g, pt, pointLabels);
+                RenderPointLabel(g, pt, pointLabels);
+
+                g.SmoothingMode = sm;
+            }
+        }
+
+        #region UpdatePointLabels
+
+        private List<PointLabelGroup> UpdatePointLabels(Graphics g)
+        {
+            if (_PointLabels == null)
+            {
+                List<PointLabelGroup> labelGroups = new List<PointLabelGroup>();
+
+                foreach (ChartSeries series in ChartSeries)
+                {
+                    if (series.IsDisplayed == true)
+                    {
+                        List<PointLabel> list = series.GetPointLabels(g);
+
+                        if (list != null)
+                        {
+                            PointLabelGroup plg = new PointLabelGroup(series, list);
+
+                            labelGroups.Add(plg);
+                        }
+                    }
+                }
+
+                UpdatePointLabelsEx(g, labelGroups);
+
+                FlockAlign falign = new FlockAlign(labelGroups);
+
+                ContainerVisualStyle cstyle = GetEffectiveContainerStyle();
+
+                Rectangle r = GetAdjustedBounds(ContentBoundsEx, cstyle.BorderThickness);
+
+                falign.Iterate(r, DataLabelOverlapMode);
+
+                _PointLabels = labelGroups;
+            }
+
+            return (_PointLabels);
+        }
+
+        #region UpdatePointLabelsEx
+
+        private void UpdatePointLabelsEx(Graphics g, List<PointLabelGroup> labelGroups)
+        {
+            ChartControl control = ChartControl;
+
+            if (control.IsPointLabelUpdateHooked == true)
+            {
+                for (int i = 0; i < labelGroups.Count; i++)
+                {
+                    PointLabelGroup lg = labelGroups[i];
+                    List<PointLabel> lps = lg.PointLabels;
+
+                    control.DoPointLabelUpdateEvent(this, lg.ChartSeries, lps);
+
+                    for (int j = 0; j < lps.Count; j++)
+                    {
+                        PointLabel pl = lps[j];
+
+                        if (pl.IsFixedSize == false && pl.NeedsMeasured == true)
+                            pl.LabelSize = lg.ChartSeries.MeasurePointLabel(g, pl);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderPointConnector
+
+        private void RenderPointConnector(
+            Graphics g, Point pt, List<PointLabelGroup> labelGroups)
+        {
+            ChartControl chartControl = ChartControl;
+
+            foreach (PointLabelGroup lg in labelGroups)
+            {
+                ChartSeries series = lg.ChartSeries;
+
+                foreach (PointLabel pl in lg.PointLabels)
+                {
+                    if (pl.Visible == true &&
+                        pl.SeriesPoint.IsEmpty == false && pl.EdgePoint.IsEmpty == false)
+                    {
+                        DataLabelVisualStyle dstyle = series.GetPointLabelVisualStyle(pl);
+                        ConnectorLineVisualStyle cstyle = dstyle.ConnectorLineStyle;
+
+                        if (dstyle.DrawConnector == Tbool.True && cstyle.LinePattern != LinePattern.None)
+                        {
+                            if (pl.Bounds.IsEmpty == false)
+                            {
+                                Rectangle r = pl.Bounds;
+                                r.Offset(pt);
+
+                                Point pt1 = pl.Point;
+                                pt1.Offset(pt);
+
+                                Point pt2 = pl.EdgePoint;
+                                pt2.Offset(pt);
+
+                                bool isChpt = IsCrosshairSeriesPoint(null, pt1);
+
+                                if (cstyle.Origin == ConnectorOrigin.Edge)
+                                {
+                                    int offset = Math.Max(
+                                        pl.SeriesPoint.PointSize.Width,
+                                        pl.SeriesPoint.PointSize.Height) / 2 + 1;
+
+                                    double radians = MathHelper.ToRadians(pl.Angle);
+
+                                    int x = (int)(Math.Cos(radians) * offset);
+                                    int y = (int)(Math.Sin(radians) * offset);
+
+                                    pt1.X += (int)(Math.Cos(radians) * offset);
+                                    pt1.Y += (int)(Math.Sin(radians) * offset);
+                                }
+
+                                if (r.Contains(pt1) == false)
+                                {
+                                    if (chartControl.DoPreRenderPointConnectorEvent(g, this, series, pl, isChpt, pt1, pt2) == false)
+                                    {
+                                        using (Pen pen = new Pen(cstyle.LineColor, Dpi.Width(cstyle.LineWidth)))
+                                        {
+                                            if (cstyle.LinePattern != LinePattern.NotSet)
+                                                pen.DashStyle = (DashStyle)cstyle.LinePattern;
+
+                                            g.DrawLine(pen, pt1, pt2);
+                                        }
+
+                                        chartControl.DoPostRenderPointConnectorEvent(g, this, series, pl, isChpt, pt1, pt2);
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region RenderPointLabel
+
+        private void RenderPointLabel(
+            Graphics g, Point pt, List<PointLabelGroup> labelGroups)
+        {
+            ChartControl chartControl = ChartControl;
+
+            foreach (PointLabelGroup lg in labelGroups)
+            {
+                ChartSeries series = lg.ChartSeries;
+
+                foreach (PointLabel pl in lg.PointLabels)
+                {
+                    if (pl.Visible == true && pl.SeriesPoint.IsEmpty == false)
+                    {
+                        Rectangle r = pl.Bounds;
+
+                        if (r.IsEmpty == false)
+                        {
+                            DataLabelVisualStyle dstyle = series.GetPointLabelVisualStyle(pl);
+
+                            Point pt1 = r.Location;
+                            pt1.Offset(pt);
+                            r.Location = pt1;
+
+                            Point pt2 = pl.Point;
+                            pt2.Offset(pt);
+
+                            bool isChpt = IsCrosshairSeriesPoint(null, pt2);
+
+                            if (chartControl.DoPreRenderPointLabelEvent(g, this, series, pl, isChpt, r) == false)
+                            {
+                                using (StringFormat sf = new StringFormat())
+                                {
+                                    dstyle.GetStringFormatFlags(sf);
+
+                                    Color textColor = dstyle.TextColor;
+                                    Color borderColor = dstyle.BorderColor;
+                                    Background background = dstyle.Background;
+                                    LinePattern borderPattern = dstyle.BorderPattern;
+
+                                    if (isChpt == true)
+                                    {
+                                        if (dstyle.HighlightTextColor.IsEmpty == false)
+                                            textColor = dstyle.HighlightTextColor;
+
+                                        if (dstyle.HighlightBorderColor.IsEmpty == false)
+                                            borderColor = dstyle.HighlightBorderColor;
+
+                                        if (dstyle.HighlightBackground.IsEmpty == false)
+                                            background = dstyle.HighlightBackground;
+
+                                        if (dstyle.HighlightBorderPattern != LinePattern.NotSet)
+                                            borderPattern = dstyle.HighlightBorderPattern;
+                                    }
+
+                                    RenderPointLabelEx(g, lg, pl, r, textColor,
+                                        background, borderColor, dstyle.BorderThickness, borderPattern, dstyle, sf);
+                                }
+
+                                chartControl.DoPostRenderPointLabelEvent(g, this, series, pl, isChpt, r);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        #region RenderPointLabelEx
+
+        private void RenderPointLabelEx(Graphics g, PointLabelGroup lg, PointLabel pl,
+            Rectangle r, Color tcolor, Background background, Color bcolor,
+            int thickness, LinePattern pattern, DataLabelVisualStyle dstyle, StringFormat sf)
+        {
+            if (background.IsEmpty == false)
+            {
+                using (Brush hbr = background.GetBrush(r))
+                    g.FillRectangle(hbr, r);
+            }
+
+            g.SmoothingMode = SmoothingMode.None;
+
+            using (Pen hBorderPen = GetBorderPen(bcolor, thickness, pattern))
+            {
+                if (hBorderPen != null)
+                    g.DrawRectangle(hBorderPen, r);
+            }
+
+            if (dstyle.DropShadow.Enabled == Tbool.True)
+                dstyle.DropShadow.RenderDropShadow(g, r, true, true);
+
+            RotateDegrees rotateDegrees = lg.ChartSeries.GetRotateDegrees(dstyle);
+            float angle = GetRotateAngle(rotateDegrees);
+
+            r.Size = pl.LabelSize;
+
+            Point ptc = new Point(
+                r.X + pl.Bounds.Width / 2,
+                r.Y + pl.Bounds.Height / 2);
+
+            if (angle != 0)
+            {
+                g.TranslateTransform(ptc.X, ptc.Y);
+                g.RotateTransform(angle);
+
+                r.X = -((r.Width + dstyle.Padding.Horizontal) / 2);
+                r.Y = -((r.Height + dstyle.Padding.Vertical) / 2);
+
+                if (angle == 90)
+                    r.Y--;
+
+                else if (angle == 270)
+                    r.X--;
+
+                r.X += dstyle.Padding.Left;
+                r.Y += dstyle.Padding.Top;
+            }
+            else
+            {
+                if (dstyle.HasBorder == true)
+                {
+                    r.X += dstyle.BorderThickness;
+                    r.Y += dstyle.BorderThickness;
+                }
+
+                r.X += dstyle.Padding.Left;
+                r.Y += dstyle.Padding.Top;
+            }
+
+            using (Brush htbr = new SolidBrush(tcolor))
+                g.DrawString(pl.Label, dstyle.Font, htbr, r, sf);
+
+            if (angle != 0)
+                g.ResetTransform();
+        }
+
+        #region GetRotateAngle
+
+        private float GetRotateAngle(RotateDegrees rotateDegrees)
+        {
+            switch (rotateDegrees)
+            {
+                case RotateDegrees.Rotate90:
+                    return (90);
+
+                case RotateDegrees.Rotate180:
+                    return (180);
+
+                case RotateDegrees.Rotate270:
+                    return (270);
+
+                default:
+                    return (0);
+            }
+        }
+
+        #endregion
+
+        #region GetBorderPen
+
+        private Pen GetBorderPen(Color color, int thickness, LinePattern pattern)
+        {
+            Pen pen = null;
+
+            if (pattern != LinePattern.None && pattern != LinePattern.NotSet && 
+                color.IsEmpty == false && thickness > 0)
+            {
+                pen = new Pen(color, Dpi.Width(thickness));
+
+                pen.Alignment = PenAlignment.Inset;
+
+                if (pattern != LinePattern.NotSet)
+                    pen.DashStyle = (DashStyle)pattern;
+            }
+
+            return (pen);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region RenderAxes
+
+        private void RenderAxes(ChartRenderInfo renderInfo,
+            ChartAxesCollection axes, ChartAxis axis)
+        {
+            foreach (ChartAxis ca in axes)
+            {
+                if (ca.Visible == true)
+                    ca.Render(renderInfo);
+            }
+
+            if (axis.Visible == true)
+                axis.Render(renderInfo);
+        }
+
+        #endregion
+
+        #region RenderCrosshair
+
+        #region GetCrosshairBounds
+
+        private Rectangle GetCrosshairBounds(ContainerVisualStyle cstyle)
+        {
+            ChartCrosshair crosshair = ChartCrosshair;
+
+            Rectangle bounds = GetScrollBounds(ContentBounds);
+
+            if (cstyle.BorderThickness.IsEmpty == false)
+            {
+                bounds.X += Dpi.Width(cstyle.BorderThickness.Left);
+                bounds.Width -= Dpi.Width(cstyle.BorderThickness.Horizontal);
+
+                bounds.Y += Dpi.Height(cstyle.BorderThickness.Top);
+                bounds.Height -= Dpi.Height(cstyle.BorderThickness.Vertical);
+            }
+
+            if (HScrollBar.Visible == true)
+                bounds.Height -= (HScrollBar.Height + 1);
+
+            if (VScrollBar.Visible == true)
+                bounds.Width -= (VScrollBar.Width + 1);
+
+            return (bounds);
+        }
+
+        #endregion
+
+        #region GetCrosshairPoints
+
+        private List<CrosshairPoint> GetCrosshairPoints(Rectangle bounds, Point pt)
+        {
+            List<CrosshairPoint> cps;
+
+            if (ChartCrosshair.AxisOrientation == AxisOrientation.X)
+                cps = GetCrosshairPointsX(pt, bounds);
+            else
+                cps = GetCrosshairPointsY(pt, bounds);
+
+            _NearestCrosshairPoint = null;
+
+            if (cps != null && cps.Count > 0)
+            {
+                if (ChartCrosshair.CrosshairLabelMode == CrosshairLabelMode.NearestSeries)
+                    _NearestCrosshairPoint = GetNearestPoint(cps, pt, ChartCrosshair.AxisOrientation);
+            }
+
+            return (cps);
+        }
+
+        #endregion
+
+        #region RenderCrosshair
+
+        internal void RenderCrosshairLines(Graphics g,
+            Rectangle bounds, Point pt, CrosshairVisualStyle cstyle)
+        {
+            if (ChartCrosshair.AxisOrientation == AxisOrientation.X)
+                RenderCrosshairX(g, bounds, pt, cstyle);
+            else
+                RenderCrosshairY(g, bounds, pt, cstyle);
+        }
+
+        #region RenderCrosshairX
+
+        private void RenderCrosshairX(Graphics g,
+            Rectangle bounds, Point pt, CrosshairVisualStyle cstyle)
+        {
+            ChartCrosshair crosshair = ChartCrosshair;
+
+            List<CrosshairPoint> cps = _CrosshairSeriesPoints;
+
+            if (crosshair.ShowValueXLine == true)
+                RenderCrosshairLineX(g, pt, bounds, cstyle);
+
+            if (crosshair.ShowValueXLabels == true)
+                RenderCrosshairLabelX(g, pt);
+
+            if (crosshair.ShowValueYLine == true || crosshair.ShowValueYLabels == true)
+            {
+                if (crosshair.CrosshairLabelMode == CrosshairLabelMode.NearestSeries)
+                {
+                    CrosshairPoint mcp = _NearestCrosshairPoint;
+
+                    if (mcp != null)
+                    {
+                        if (crosshair.ShowValueYLine == true)
+                            RenderCrosshairLineY(g, mcp.Point, bounds, cstyle);
+
+                        if (crosshair.ShowValueYLabels == true)
+                            RenderCrosshairLabelY(g, mcp);
+                    }
+                }
+                else
+                {
+                    foreach (CrosshairPoint cp in cps)
+                    {
+                        if (crosshair.ShowValueYLine == true)
+                            RenderCrosshairLineY(g, cp.Point, bounds, cstyle);
+
+                        if (crosshair.ShowValueYLabels == true)
+                            RenderCrosshairLabelY(g, cp);
+                    }
+                }
+            }
+        }
+
+        #region GetCrosshairPointsX
+
+        private List<CrosshairPoint> GetCrosshairPointsX(Point pt, Rectangle bounds)
+        {
+            List<CrosshairPoint> cps = new List<CrosshairPoint>();
+
+            for (int i = 0; i < ChartSeries.Count; i++)
+            {
+                ChartSeries series = ChartSeries[i];
+
+                if (series.IsDisplayed == true && series.CrosshairEnabled != Tbool.False)
+                {
+                    if (series.SeriesPoints.Count > 0)
+                    {
+                        SortedSeriesPoints ssp = series.GetSortedSeriesPoints(this);
+
+                        ChartAxis axis = (series.IsRotated == true)
+                            ? series.AxisY ?? AxisY : series.AxisX ?? AxisX;
+
+                        TickmarkLayout layout = axis.TickmarkLayout;
+
+                        if (layout.Ticks != null && layout.Ticks.Length > 0)
+                        {
+                            Size msize = GetCrosshairMarkerSize(series);
+
+                            for (int j = 0; j < ssp.Count; j++)
+                                SetCrosshairPointX(cps, series, ssp, j, msize, pt, bounds);
+                        }
+                    }
+                }
+            }
+
+            return (cps);
+        }
+
+        #region SetCrosshairPointX
+
+        private void SetCrosshairPointX(List<CrosshairPoint> cps, ChartSeries series,
+            SortedSeriesPoints ssp, int index, Size msize, Point pt, Rectangle bounds)
+        {
+            SeriesPoint sp = ssp[index];
+
+            if (sp.IsEmpty == false)
+            {
+                int vindex = 0;
+                bool descending = false;
+
+                Point spt = Point.Empty;
+                Point lpt = GetLocalAdjustedPoint(spt);
+
+                switch (series.SeriesType)
+                {
+                    case SeriesType.VerticalDot:
+                        spt = GetDataPointEx(series, sp, -1);
+                        spt.Offset(lpt);
+
+                        spt.Y -= (msize.Height * ssp.CountArray[index]);
+                        spt.Y += (msize.Height / 2);
+                        break;
+
+                    case SeriesType.HorizontalDot:
+                        object x1 = GetDataPointValueX(series, sp);
+
+                        spt = GetPointFromValue(series, 0, x1);
+                        spt.Offset(lpt);
+
+                        spt.X += (msize.Width * ssp.CountArray[index]);
+                        spt.X -= (msize.Width / 2);
+                        break;
+
+                    case SeriesType.VerticalBar:
+                        spt = GetDataPointEx(series, sp, 0);
+                        spt.Offset(lpt);
+
+                        spt.X += series.BarOffset;
+
+                        int yStart = series.GetVBarStart(this, sp) + lpt.Y;
+
+                        descending = (spt.Y > yStart);
+
+                        if (sp.ValueY.Length > 1)
+                        {
+                            AddCrosshairPointX(cps, series,
+                                ssp, index, sp, 0, spt, msize, pt, bounds, descending);
+
+                            spt.Y = yStart;
+
+                            vindex = 1;
+                            descending = !descending;
+                        }
+                        break;
+
+                    case SeriesType.HorizontalBar:
+                        spt = GetDataPointEx(series, sp, 0);
+                        spt.Offset(lpt);
+
+                        spt.Y += series.BarOffset;
+
+                        int xStart = series.GetHBarStart(this, sp) + lpt.X;
+
+                        descending = (spt.X < xStart);
+
+                        if (sp.ValueY.Length > 1)
+                        {
+                            AddCrosshairPointX(cps, series,
+                                ssp, index, sp, 0, spt, msize, pt, bounds, descending);
+
+                            spt.X = xStart;
+
+                            vindex = 1;
+                            descending = !descending;
+                        }
+                        break;
+
+                    case SeriesType.VerticalHiLoBar:
+                        SetCrosshairPointVHiLoX(cps, series, ssp, index, msize, pt, bounds);
+                        return;
+
+                    case SeriesType.HorizontalHiLoBar:
+                        SetCrosshairPointHHiLoX(cps, series, ssp, index, msize, pt, bounds);
+                        return;
+
+                    case SeriesType.Point:
+                        for (int i = 0; i < sp.ValueY.Length; i++)
+                        {
+                            spt = GetDataPointEx(series, sp, i);
+                            spt.Offset(lpt);
+
+                            AddCrosshairPointX(cps, series,
+                                ssp, index, sp, i, spt, msize, pt, bounds, descending);
+                        }
+                        return;
+
+                    default:
+                        spt = GetDataPoint(series, sp, 0);
+                        break;
+                }
+
+                AddCrosshairPointX(cps, series,
+                    ssp, index, sp, vindex, spt, msize, pt, bounds, descending);
+            }
+        }
+
+        #region SetCrosshairPointVHiLoX
+
+        private void SetCrosshairPointVHiLoX(List<CrosshairPoint> cps,
+            ChartSeries series, SortedSeriesPoints ssp, int index, Size msize, Point pt, Rectangle bounds)
+        {
+            Point spt = Point.Empty;
+            Point lpt = GetLocalAdjustedPoint(spt);
+
+            SeriesPoint sp = ssp[index];
+
+            spt = GetDataPointEx(series, sp, 0);
+            spt.X += (series.BarOffset + lpt.X);
+
+            int[] values = GetVStockValues(series, sp);
+
+            int v0, v1, v2, v3;
+            NormalizeStockValues(values, out v0, out v1, out v2, out v3);
+
+            if (values[v2] != int.MinValue)
+            {
+                spt.Y = values[v2] + lpt.Y;
+
+                AddCrosshairPointX(cps, series,
+                    ssp, index, sp, v2, spt, msize, pt, bounds, false);
+            }
+
+            if (values[v3] != int.MinValue)
+            {
+                spt.Y = values[v3] + lpt.Y;
+
+                AddCrosshairPointX(cps, series,
+                    ssp, index, sp, v3, spt, msize, pt, bounds, true);
+            }
+
+            if (values[v2] == int.MinValue || values[v0] < values[v2])
+            {
+                spt.Y = values[v0] + lpt.Y;
+
+                AddCrosshairPointX(cps, series,
+                    ssp, index, sp, v0, spt, msize, pt, bounds, false);
+            }
+
+            if (values[v3] == int.MinValue || values[v1] > values[v3])
+            {
+                spt.Y = values[v1] + lpt.Y;
+
+                AddCrosshairPointX(cps, series,
+                    ssp, index, sp, v1, spt, msize, pt, bounds, true);
+            }
+        }
+
+        #region GetVStockValues
+
+        private int[] GetVStockValues(ChartSeries series, SeriesPoint sp)
+        {
+            ChartAxis axis = series.AxisY ?? AxisY;
+
+            int[] values = new int[4];
+
+            for (int i = 0; i < values.Length; i++)
+            {
+                if (i < sp.ValueY.Length)
+                    values[i] = GetDataPointY(axis, sp.ValueY[i]);
+                else
+                    values[i] = int.MinValue;
+            }
+
+            return (values);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region SetCrosshairPointHHiLoX
+
+        private void SetCrosshairPointHHiLoX(List<CrosshairPoint> cps,
+        ChartSeries series, SortedSeriesPoints ssp, int index, Size msize, Point pt, Rectangle bounds)
+        {
+            Point spt = Point.Empty;
+            Point lpt = GetLocalAdjustedPoint(spt);
+
+            SeriesPoint sp = ssp[index];
+
+            spt = GetDataPointEx(series, sp, 0);
+            spt.Y += (series.BarOffset + lpt.Y);
+
+            int[] values = GetHStockValues(series, sp);
+
+            int v0, v1, v2, v3;
+            NormalizeStockValues(values, out v0, out v1, out v2, out v3);
+
+            if (values[v2] != int.MinValue)
+            {
+                spt.X = values[v2] + lpt.X;
+
+                AddCrosshairPointX(cps, series,
+                    ssp, index, sp, v2, spt, msize, pt, bounds, true);
+            }
+
+            if (values[v3] != int.MinValue)
+            {
+                spt.X = values[v3] + lpt.X;
+
+                AddCrosshairPointX(cps, series,
+                    ssp, index, sp, v3, spt, msize, pt, bounds, false);
+            }
+
+            if (values[v2] == int.MinValue || values[v0] < values[v2])
+            {
+                spt.X = values[v0] + lpt.X;
+
+                AddCrosshairPointX(cps, series,
+                    ssp, index, sp, v0, spt, msize, pt, bounds, true);
+            }
+
+            if (values[v3] == int.MinValue || values[v1] > values[v3])
+            {
+                spt.X = values[v1] + lpt.X;
+
+                AddCrosshairPointX(cps, series,
+                    ssp, index, sp, v1, spt, msize, pt, bounds, false);
+            }
+        }
+
+        #region GetHStockValues
+
+        private int[] GetHStockValues(ChartSeries series, SeriesPoint sp)
+        {
+            ChartAxis axis = series.AxisX ?? AxisX;
+
+            int[] values = new int[4];
+
+            for (int i = 0; i < values.Length; i++)
+            {
+                if (i < sp.ValueY.Length)
+                    values[i] = GetDataPointX(axis, sp.ValueY[i]);
+                else
+                    values[i] = int.MinValue;
+            }
+
+            return (values);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region NormalizeStockValues
+
+        private void NormalizeStockValues(int[] values,
+            out int v0, out int v1, out int v2, out int v3)
+        {
+            v0 = 0;
+            v1 = 1;
+            v2 = 2;
+            v3 = 3;
+
+            if (values[1] < values[0])
+            {
+                v0 = 1;
+                v1 = 0;
+            }
+
+            if (values[v3] != int.MinValue && values[v3] < values[v2])
+            {
+                v2 = 3;
+                v3 = 2;
+            }
+
+            if (values[v2] != int.MinValue)
+            {
+                if (values[v2] < values[v0])
+                    v0 = v2;
+
+                if (values[v2] > values[v1])
+                    v1 = v2;
+            }
+
+            if (values[v3] != int.MinValue)
+            {
+                if (values[v3] > values[v1])
+                    v1 = v3;
+
+                if (values[v3] < values[v0])
+                    v0 = v3;
+            }
+        }
+
+        #endregion
+
+        #region AddCrosshairPointX
+
+        private void AddCrosshairPointX(List<CrosshairPoint> cps, ChartSeries series,
+            SortedSeriesPoints ssp, int index, SeriesPoint sp, int vindex, Point spt,
+            Size msize, Point pt, Rectangle bounds, bool descending)
+        {
+            if (spt != Point.Empty && bounds.Contains(spt))
+            {
+                int dx = ChartCrosshair.PointIntersectMargin;
+
+                if (ChartCrosshair.PointIntersectMode == PointIntersectMode.Edge)
+                {
+                    if (sp.PointSize.Width > 0)
+                        dx += (sp.PointSize.Width / 2);
+                    else
+                        dx += (msize.Height / 2);
+                }
+
+                if (spt.X >= pt.X - dx && spt.X <= pt.X + dx)
+                    cps.Add(new CrosshairPoint(series, ssp, index, sp, vindex, spt, descending));
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region RenderCrosshairY
+
+        private void RenderCrosshairY(Graphics g,
+            Rectangle bounds, Point pt, CrosshairVisualStyle cstyle)
+        {
+            ChartCrosshair crosshair = ChartCrosshair;
+
+            List<CrosshairPoint> cps = _CrosshairSeriesPoints;
+
+            if (crosshair.ShowValueYLine == true)
+                RenderCrosshairLineY(g, pt, bounds, cstyle);
+
+            if (crosshair.ShowValueYLabels == true)
+                RenderCrosshairLabelY(g, pt);
+
+            if (crosshair.ShowValueXLine == true || crosshair.ShowValueXLabels == true)
+            {
+                if (crosshair.CrosshairLabelMode == CrosshairLabelMode.NearestSeries)
+                {
+                    CrosshairPoint mcp = _NearestCrosshairPoint;
+
+                    if (mcp != null)
+                    {
+                        if (crosshair.ShowValueXLine == true)
+                            RenderCrosshairLineX(g, mcp.Point, bounds, cstyle);
+
+                        if (crosshair.ShowValueXLabels == true)
+                            RenderCrosshairLabelX(g, mcp);
+                    }
+                }
+                else
+                {
+                    foreach (CrosshairPoint cp in cps)
+                    {
+                        if (crosshair.ShowValueXLine == true)
+                            RenderCrosshairLineX(g, cp.Point, bounds, cstyle);
+
+                        if (crosshair.ShowValueXLabels == true)
+                            RenderCrosshairLabelX(g, cp);
+                    }
+                }
+            }
+        }
+
+        #region GetCrosshairPointsY
+
+        private List<CrosshairPoint> GetCrosshairPointsY(Point pt, Rectangle bounds)
+        {
+            List<CrosshairPoint> cps = new List<CrosshairPoint>();
+
+            for (int i = 0; i < ChartSeries.Count; i++)
+            {
+                ChartSeries series = ChartSeries[i];
+
+                if (series.IsDisplayed == true && series.CrosshairEnabled != Tbool.False)
+                {
+                    if (series.SeriesPoints.Count > 0)
+                    {
+                        SortedSeriesPoints ssp = series.GetSortedSeriesPoints(this);
+
+                        ChartAxis axis = series.AxisX ?? AxisX;
+                        TickmarkLayout layout = axis.TickmarkLayout;
+
+                        if (layout.Ticks != null && layout.Ticks.Length > 0)
+                        {
+                            Size msize = GetCrosshairMarkerSize(series);
+
+                            for (int j = 0; j < ssp.Count; j++)
+                                SetCrosshairPointY(cps, series, ssp, j, msize, pt, bounds);
+                        }
+                    }
+                }
+            }
+
+            return (cps);
+        }
+
+        #region SetCrosshairPointY
+
+        private void SetCrosshairPointY(List<CrosshairPoint> cps, ChartSeries series,
+            SortedSeriesPoints ssp, int index, Size msize, Point pt, Rectangle bounds)
+        {
+            SeriesPoint sp = ssp[index];
+
+            if (sp.IsEmpty == false)
+            {
+                int vindex = 0;
+                bool descending = false;
+
+                Point spt = Point.Empty;
+                Point lpt = GetLocalAdjustedPoint(spt);
+
+                switch (series.SeriesType)
+                {
+                    case SeriesType.VerticalDot:
+                        spt = GetDataPointEx(series, sp, -1);
+                        spt.Offset(lpt);
+
+                        spt.Y -= (msize.Height * ssp.CountArray[index] - msize.Height / 2);
+                        break;
+
+                    case SeriesType.HorizontalDot:
+                        object x1 = GetDataPointValueX(series, sp);
+
+                        spt = GetPointFromValue(series, 0, x1);
+                        spt.Offset(lpt);
+
+                        spt.X += (msize.Width * ssp.CountArray[index] - msize.Width / 2);
+                        break;
+
+                    case SeriesType.VerticalBar:
+                        spt = GetDataPointEx(series, sp, 0);
+                        spt.Offset(lpt);
+
+                        spt.X += series.BarOffset;
+
+                        int yStart = series.GetVBarStart(this, sp) + lpt.Y;
+
+                        descending = (spt.Y > yStart);
+
+                        if (sp.ValueY.Length > 1)
+                        {
+                            AddCrosshairPointY(cps, series,
+                                ssp, index, sp, 0, spt, msize, pt, bounds, descending);
+
+                            spt.Y = yStart;
+
+                            vindex = 1;
+                            descending = !descending;
+                        }
+                        break;
+
+                    case SeriesType.HorizontalBar:
+                        spt = GetDataPointEx(series, sp, 0);
+                        spt.Offset(lpt);
+
+                        spt.Y += series.BarOffset;
+
+                        int xStart = series.GetHBarStart(this, sp) + lpt.X;
+
+                        descending = (spt.X < xStart);
+
+                        if (sp.ValueY.Length > 1)
+                        {
+                            AddCrosshairPointX(cps, series,
+                                ssp, index, sp, 0, spt, msize, pt, bounds, descending);
+
+                            spt.X = xStart;
+
+                            vindex = 1;
+                            descending = !descending;
+                        }
+                        break;
+
+                    case SeriesType.VerticalHiLoBar:
+                        SetCrosshairPointVHiLoY(cps, series, ssp, index, msize, pt, bounds);
+                        return;
+
+                    case SeriesType.HorizontalHiLoBar:
+                        SetCrosshairPointHHiLoY(cps, series, ssp, index, msize, pt, bounds);
+                        return;
+
+                    case SeriesType.Point:
+                        for (int i = 0; i < sp.ValueY.Length; i++)
+                        {
+                            spt = GetDataPointEx(series, sp, i);
+                            spt.Offset(lpt);
+
+                            AddCrosshairPointY(cps, series,
+                                ssp, index, sp, i, spt, msize, pt, bounds, descending);
+                        }
+                        return;
+
+                    default:
+                        spt = GetDataPoint(series, sp, 0);
+                        break;
+                }
+
+                AddCrosshairPointY(cps, series,
+                    ssp, index, sp, vindex, spt, msize, pt, bounds, descending);
+            }
+        }
+
+        #region SetCrosshairPointVHiLoY
+
+        private void SetCrosshairPointVHiLoY(List<CrosshairPoint> cps,
+            ChartSeries series, SortedSeriesPoints ssp, int index, Size msize, Point pt, Rectangle bounds)
+        {
+            Point spt = Point.Empty;
+            Point lpt = GetLocalAdjustedPoint(spt);
+
+            SeriesPoint sp = ssp[index];
+
+            spt = GetDataPointEx(series, sp, 0);
+            spt.X += (series.BarOffset + lpt.X);
+
+            int[] values = GetVStockValues(series, sp);
+
+            int v0, v1, v2, v3;
+            NormalizeStockValues(values, out v0, out v1, out v2, out v3);
+
+            if (values[v2] != int.MinValue)
+            {
+                spt.Y = values[v2] + lpt.Y;
+
+                AddCrosshairPointY(cps, series,
+                    ssp, index, sp, v2, spt, msize, pt, bounds, false);
+            }
+
+            if (values[v3] != int.MinValue)
+            {
+                spt.Y = values[v3] + lpt.Y;
+
+                AddCrosshairPointY(cps, series,
+                    ssp, index, sp, v3, spt, msize, pt, bounds, true);
+            }
+
+            if (values[v2] == int.MinValue || values[v0] < values[v2])
+            {
+                spt.Y = values[v0] + lpt.Y;
+
+                AddCrosshairPointY(cps, series,
+                    ssp, index, sp, v0, spt, msize, pt, bounds, false);
+            }
+
+            if (values[v3] == int.MinValue || values[v1] > values[v3])
+            {
+                spt.Y = values[v1] + lpt.Y;
+
+                AddCrosshairPointY(cps, series,
+                    ssp, index, sp, v1, spt, msize, pt, bounds, true);
+            }
+        }
+
+        #endregion
+
+        #region SetCrosshairPointHHiLoY
+
+        private void SetCrosshairPointHHiLoY(List<CrosshairPoint> cps,
+        ChartSeries series, SortedSeriesPoints ssp, int index, Size msize, Point pt, Rectangle bounds)
+        {
+            Point spt = Point.Empty;
+            Point lpt = GetLocalAdjustedPoint(spt);
+
+            SeriesPoint sp = ssp[index];
+
+            spt = GetDataPointEx(series, sp, 0);
+            spt.Y += (series.BarOffset + lpt.Y);
+
+            int[] values = GetHStockValues(series, sp);
+
+            int v0, v1, v2, v3;
+            NormalizeStockValues(values, out v0, out v1, out v2, out v3);
+
+            if (values[v2] != int.MinValue)
+            {
+                spt.X = values[v2] + lpt.X;
+
+                AddCrosshairPointY(cps, series,
+                    ssp, index, sp, v2, spt, msize, pt, bounds, true);
+            }
+
+            if (values[v3] != int.MinValue)
+            {
+                spt.X = values[v3] + lpt.X;
+
+                AddCrosshairPointY(cps, series,
+                    ssp, index, sp, v3, spt, msize, pt, bounds, false);
+            }
+
+            if (values[v2] == int.MinValue || values[v0] < values[v2])
+            {
+                spt.X = values[v0] + lpt.X;
+
+                AddCrosshairPointY(cps, series,
+                    ssp, index, sp, v0, spt, msize, pt, bounds, true);
+            }
+
+            if (values[v3] == int.MinValue || values[v1] > values[v3])
+            {
+                spt.X = values[v1] + lpt.X;
+
+                AddCrosshairPointY(cps, series,
+                    ssp, index, sp, v1, spt, msize, pt, bounds, false);
+            }
+        }
+
+        #endregion
+
+        #region AddCrosshairPointY
+
+        private void AddCrosshairPointY(List<CrosshairPoint> cps, ChartSeries series,
+            SortedSeriesPoints ssp, int index, SeriesPoint sp, int vindex, Point spt,
+            Size msize, Point pt, Rectangle bounds, bool descending)
+        {
+            if (spt != Point.Empty && bounds.Contains(spt))
+            {
+                int dy = ChartCrosshair.PointIntersectMargin;
+
+                if (ChartCrosshair.PointIntersectMode == PointIntersectMode.Edge)
+                {
+                    if (sp.PointSize.Height > 0)
+                        dy += (sp.PointSize.Height / 2);
+                    else
+                        dy += (msize.Height / 2);
+                }
+
+                if (spt.Y >= pt.Y - dy && spt.Y <= pt.Y + dy)
+                    cps.Add(new CrosshairPoint(series, ssp, index, sp, vindex, spt, descending));
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region GetCrosshairMarkerSize
+
+        private Size GetCrosshairMarkerSize(ChartSeries series)
+        {
+            Size msize = Size.Empty;
+
+            if (series.SeriesType == SeriesType.VerticalDot ||
+                series.SeriesType == SeriesType.HorizontalDot)
+            {
+                msize = GetMaxDotPlotMarkerSize();
+            }
+            else if (series.IsBarSeries == true)
+            {
+                msize = new Size(series.BarWidth, Dpi.Height5);
+            }
+            else
+            {
+                Image marker = series.PointMarkerImage;
+
+                if (marker != null)
+                    msize = marker.Size;
+            }
+
+            return (msize);
+        }
+
+        #endregion
+
+        #region RenderCrosshairLineX
+
+        private void RenderCrosshairLineX(Graphics g,
+            Point pt, Rectangle bounds, CrosshairVisualStyle cstyle)
+        {
+            Point pt1 = new Point(pt.X, bounds.Y);
+            Point pt2 = new Point(pt.X, bounds.Bottom - 1);
+
+            ChartLineVisualStyle lstyle = cstyle.ValueXLineStyle;
+
+            using (Pen pen = new Pen(lstyle.LineColor, Dpi.Width(lstyle.LineWidth)))
+            {
+                pen.DashStyle = (DashStyle)lstyle.LinePattern;
+
+                g.DrawLine(pen, pt1, pt2);
+            }
+        }
+
+        #endregion
+
+        #region RenderCrosshairLineY
+
+        private void RenderCrosshairLineY(Graphics g,
+            Point pt, Rectangle bounds, CrosshairVisualStyle cstyle)
+        {
+            Point pt1 = new Point(bounds.X, pt.Y);
+            Point pt2 = new Point(bounds.Right - 1, pt.Y);
+
+            ChartLineVisualStyle lstyle = cstyle.ValueYLineStyle;
+
+            using (Pen pen = new Pen(lstyle.LineColor, Dpi.Height(lstyle.LineWidth)))
+            {
+                pen.DashStyle = (DashStyle)lstyle.LinePattern;
+
+                g.DrawLine(pen, pt1, pt2);
+            }
+        }
+
+        #endregion
+
+        #region RenderCrosshairLabelX
+
+        private void RenderCrosshairLabelX(Graphics g, Point pt)
+        {
+            RenderAxesCrosshairLabelXy(g, pt, AncillaryAxesX, AxisX);
+        }
+
+        private void RenderCrosshairLabelX(Graphics g, CrosshairPoint cp)
+        {
+            ChartAxis axis = cp.ChartSeries.AxisX ?? AxisX;
+
+            if (axis != null)
+                axis.RenderCrosshairLabel(g, cp);
+        }
+
+        #endregion
+
+        #region RenderCrosshairLabelY
+
+        private void RenderCrosshairLabelY(Graphics g, Point pt)
+        {
+            RenderAxesCrosshairLabelXy(g, pt, AncillaryAxesY, AxisY);
+        }
+
+        private void RenderCrosshairLabelY(Graphics g, CrosshairPoint cp)
+        {
+            ChartAxis axis = cp.ChartSeries.AxisY ?? AxisY;
+
+            if (axis != null)
+                axis.RenderCrosshairLabel(g, cp);
+        }
+
+        #endregion
+
+        #region RenderAxesCrosshairLabelXy
+
+        private void RenderAxesCrosshairLabelXy(Graphics g,
+            Point pt, ChartAxesCollection axes, ChartAxis axis)
+        {
+            foreach (ChartAxis ca in axes)
+            {
+                if (ca.Visible == true)
+                    ca.RenderCrosshairLabel(g, pt);
+            }
+
+            if (axis.Visible == true)
+                axis.RenderCrosshairLabel(g, pt);
+        }
+
+        #endregion
+
+        #region GetNearestPoint
+
+        private CrosshairPoint GetNearestPoint(
+            List<CrosshairPoint> cps, Point pt, AxisOrientation orientation)
+        {
+            CrosshairPoint minPoint = null;
+
+            int minValue = int.MaxValue;
+            int minValue2 = int.MaxValue;
+
+            bool comp = (orientation == AxisOrientation.Y);
+
+            foreach (CrosshairPoint cp in cps)
+            {
+                Point cpt = cp.Point;
+
+                int dv = Math.Abs((comp == false) ? (cpt.Y - pt.Y) : (cpt.X - pt.X));
+                int dv2 = Math.Abs((comp == true) ? (cpt.Y - pt.Y) : (cpt.X - pt.X));
+
+                if (dv < minValue)
+                {
+                    minValue = dv;
+                    minValue2 = dv2;
+
+                    minPoint = cp;
+                }
+                else if (dv == minValue)
+                {
+                    if (dv2 < minValue2)
+                    {
+                        minValue2 = dv2;
+                        minPoint = cp;
+                    }
+                }
+            }
+
+            return (minPoint);
+        }
+
+        #endregion
+
+        #region GetFirstValue
+
+        private object GetFirstValue(TickmarkLayout layout)
+        {
+            for (int i = 0; i < layout.Ticks.Length; i++)
+            {
+                TickmarkTick tick = layout.Ticks[i];
+
+                if (tick.LabelIndex >= 0)
+                    return (tick.Value);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetLastValue
+
+        private object GetLastValue(TickmarkLayout layout)
+        {
+            for (int i = layout.Ticks.Length - 1; i >= 0; i--)
+            {
+                TickmarkTick tick = layout.Ticks[i];
+
+                if (tick.LabelIndex >= 0)
+                    return (tick.Value);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region RenderCrosshairLabels
+
+        #region RenderCrosshairLabels
+
+        private void RenderCrosshairLabels(Graphics g,
+            Rectangle bounds, Point pt, CrosshairVisualStyle cstyle)
+        {
+            if (ChartCrosshair.ShowCrosshairLabels == true)
+            {
+                if (ChartControl.DoRenderCrosshairLabelEvent(g, this, _CrosshairSeriesPoints, bounds, pt) == false)
+                {
+                    if (_CrosshairSeriesPoints != null && _CrosshairSeriesPoints.Count > 0)
+                    {
+                        switch (ChartCrosshair.CrosshairLabelMode)
+                        {
+                            case CrosshairLabelMode.Common:
+                                RenderCrosshairLabelCommon(g, bounds, pt, cstyle);
+                                break;
+
+                            case CrosshairLabelMode.EachSeries:
+                                RenderCrosshairLabelEach(g, bounds, pt, cstyle);
+                                break;
+
+                            case CrosshairLabelMode.NearestSeries:
+                                if (_NearestCrosshairPoint != null)
+                                    RenderCrosshairLabel(g, bounds, cstyle, _NearestCrosshairPoint);
+                                break;
+                        }
+                    }
+                }
+            }
+        }
+
+        #region RenderCrosshairLabelCommon
+
+        private void RenderCrosshairLabelCommon(Graphics g,
+            Rectangle bounds, Point pt, CrosshairVisualStyle cstyle)
+        {
+            Hashtable gps = GetCrosshairLabelGroups(_CrosshairSeriesPoints);
+
+            MeasureCrosshairLabelGroups(g, gps, bounds, cstyle);
+
+            int markerWidth;
+            Rectangle cbounds = GetCrosshairCommonBounds(gps, bounds, pt, cstyle, out markerWidth);
+
+            cbounds = GetAdjustedBounds(cbounds, cstyle.Margin);
+
+            if (ChartControl.DoRenderCrosshairCalloutEvent(g, this, cbounds, pt, cstyle) == false)
+                DrawRoundRectangle(g, cbounds, cstyle);
+
+            cbounds = GetAdjustedBounds(cbounds, cstyle.Padding);
+
+            RenderCrosshairLabelGroups(g, gps, cbounds, cstyle);
+        }
+
+        #region GetCrosshairLabelGroups
+
+        private Hashtable GetCrosshairLabelGroups(List<CrosshairPoint> cps)
+        {
+            Hashtable gps = new Hashtable();
+
+            foreach (CrosshairPoint cp in cps)
+            {
+                ChartAxis axis;
+
+                if (ChartCrosshair.AxisOrientation == AxisOrientation.X)
+                    axis = cp.ChartSeries.AxisX ?? AxisX;
+                else
+                    axis = cp.ChartSeries.AxisY ?? AxisY;
+
+                CrosshairGroup group = gps[axis] as CrosshairGroup;
+
+                if (group == null)
+                {
+                    group = new CrosshairGroup();
+
+                    group.Cps = new List<CrosshairPoint>();
+                    group.Text = GetCrosshairHeader(cp, cps);
+
+                    gps[axis] = group;
+                }
+
+                group.Cps.Add(cp);
+            }
+
+            return (gps);
+        }
+
+        #endregion
+
+        #region MeasureCrosshairLabelGroups
+
+        private void MeasureCrosshairLabelGroups(Graphics g,
+            Hashtable gps, Rectangle bounds, CrosshairVisualStyle cstyle)
+        {
+            bool groupHeader = ChartCrosshair.ShowGroupHeaders;
+
+            foreach (DictionaryEntry pair in gps)
+            {
+                CrosshairGroup group = (CrosshairGroup)pair.Value;
+
+                if (groupHeader == true)
+                    MeasureCrosshairGroupHeader(g, group, bounds, cstyle);
+
+                MeasureCrosshairCommonLabels(g, group, bounds, cstyle, groupHeader ? null : group.Text);
+            }
+        }
+
+        #region MeasureCrosshairGroupHeader
+
+        private void MeasureCrosshairGroupHeader(Graphics g,
+            CrosshairGroup group, Rectangle bounds, CrosshairVisualStyle cstyle)
+        {
+            if (string.IsNullOrEmpty(group.Text) == false)
+            {
+                SizeF sizef = g.MeasureString(group.Text, cstyle.GroupHeaderFont, bounds.Width);
+
+                group.TextSize = new Size((int)sizef.Width + 1, (int)sizef.Height + 1);
+            }
+        }
+
+        #endregion
+
+        #region MeasureCrosshairCommonLabels
+
+        private void MeasureCrosshairCommonLabels(Graphics g,
+            CrosshairGroup group, Rectangle bounds, CrosshairVisualStyle cstyle, string header)
+        {
+            group.LabelSize = Size.Empty;
+            group.MarkerWidth = 0;
+
+            foreach (CrosshairPoint cp in group.Cps)
+            {
+                Size markerSize = Size.Empty;
+
+                Image marker = cp.ChartSeries.PointMarkerImage;
+
+                if (marker != null)
+                {
+                    markerSize = marker.Size;
+
+                    if (marker.Width > group.MarkerWidth)
+                        group.MarkerWidth = marker.Width;
+                }
+
+                MeasureCrosshairLabel(g, bounds, cp, cstyle, header, false);
+
+                if (cp.TextSize.IsEmpty == false)
+                {
+                    group.LabelSize.Height += Math.Max(markerSize.Height, cp.TextSize.Height);
+
+                    if (markerSize.Width + cp.TextSize.Width > group.LabelSize.Width)
+                        group.LabelSize.Width = markerSize.Width + cp.TextSize.Width;
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetCrosshairCommonBounds
+
+        private Rectangle GetCrosshairCommonBounds(Hashtable gps,
+            Rectangle bounds, Point pt, CrosshairVisualStyle cstyle, out int markerWidth)
+        {
+            markerWidth = 0;
+
+            Size totalSize = Size.Empty;
+
+            foreach (DictionaryEntry pair in gps)
+            {
+                CrosshairGroup group = (CrosshairGroup)pair.Value;
+
+                totalSize.Width = Math.Max(totalSize.Width, group.TextSize.Width);
+                totalSize.Height += (group.TextSize.Height + Dpi.Width4);
+
+                foreach (CrosshairPoint cp in group.Cps)
+                {
+                    Size markerSize = Size.Empty;
+
+                    Image marker = cp.ChartSeries.PointMarkerImage;
+
+                    if (marker != null)
+                        markerSize = Dpi.Size(marker.Size);
+
+                    markerWidth = Math.Max(markerWidth, markerSize.Width);
+
+                    totalSize.Width = Math.Max(totalSize.Width, cp.TextSize.Width);
+                    totalSize.Height += (Math.Max(markerSize.Height, cp.TextSize.Height) + Dpi.Width4);
+                }
+            }
+
+            totalSize.Width += markerWidth;
+
+            totalSize.Width += (cstyle.Margin.Horizontal + cstyle.Padding.Horizontal + Dpi.Width4);
+            totalSize.Height += (cstyle.Margin.Horizontal + cstyle.Padding.Horizontal - Dpi.Width4);
+
+            return (GetCrosshairLabelBounds(bounds, pt, totalSize));
+        }
+
+        #region GetCrosshairLabelBounds
+
+        private Rectangle GetCrosshairLabelBounds(
+            Rectangle bounds, Point pt, Size size)
+        {
+            Rectangle r;
+
+            int left = pt.X - bounds.X - Dpi.Width10;
+            int right = bounds.Right - pt.X - Dpi.Width10;
+
+            if ((right >= size.Width) || (right > left))
+            {
+                r = new Rectangle(pt.X + 10, pt.Y - size.Height,
+                    size.Width, size.Height);
+            }
+            else
+            {
+                r = new Rectangle(pt.X - (size.Width + Dpi.Width10),
+                    pt.Y - size.Height, size.Width, size.Height);
+            }
+
+            r.Y -= Dpi.Height10;
+
+            if (r.Y < ContentBounds.Y + Dpi.Height2)
+                r.Y = ContentBounds.Y + Dpi.Height2;
+
+            return (r);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderCrosshairLabelGroups
+
+        private void RenderCrosshairLabelGroups(Graphics g,
+            Hashtable gps, Rectangle bounds, CrosshairVisualStyle cstyle)
+        {
+            using (Brush br = new SolidBrush(cstyle.GroupHeaderTextColor))
+            {
+                foreach (DictionaryEntry pair in gps)
+                {
+                    CrosshairGroup group = (CrosshairGroup)pair.Value;
+
+                    Rectangle r = bounds;
+                    r.Height = group.TextSize.Height;
+
+                    if (string.IsNullOrEmpty(group.Text) == false)
+                    {
+                        g.DrawString(group.Text, cstyle.GroupHeaderFont, br, r);
+
+                        bounds.Y += (group.TextSize.Height + Dpi.Height4);
+                        bounds.Height -= (group.TextSize.Height + Dpi.Height4);
+                    }
+
+                    foreach (CrosshairPoint cp in group.Cps)
+                    {
+                        if (cp.TextSize.IsEmpty == false)
+                        {
+                            RenderCrosshairLabelItem(g, bounds, cp, cstyle);
+
+                            bounds.Y += (cp.TextSize.Height + Dpi.Height4);
+                            bounds.Height -= (cp.TextSize.Height + Dpi.Height4);
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderCrosshairLabelEach
+
+        private void RenderCrosshairLabelEach(Graphics g,
+            Rectangle bounds, Point pt, CrosshairVisualStyle cstyle)
+        {
+            List<CrosshairPoint> cps = _CrosshairSeriesPoints;
+
+            foreach (CrosshairPoint cp in cps)
+                RenderCrosshairLabel(g, bounds, cstyle, cp);
+        }
+
+        #endregion
+
+        #region RenderCrosshairLabel
+
+        private void RenderCrosshairLabel(Graphics g,
+            Rectangle bounds, CrosshairVisualStyle cstyle, CrosshairPoint cp)
+        {
+            string arg = GetCrosshairArgument(cp);
+
+            MeasureCrosshairLabel(g, bounds, cp, cstyle, arg, true);
+
+            if (cp.TextSize.IsEmpty == false)
+            {
+                Size markerSize = Size.Empty;
+
+                if (ChartCrosshair.ShowCrosshairLabelMarkers == true)
+                {
+                    Image marker = cp.ChartSeries.PointMarkerImage;
+
+                    if (marker != null)
+                        markerSize = marker.Size;
+                }
+
+                Size totalSize = new Size((markerSize.Width + cp.TextSize.Width),
+                    Math.Max(markerSize.Height, cp.TextSize.Height) + Dpi.Height4);
+
+                totalSize.Width += Dpi.Width(cstyle.Padding.Horizontal + 4);
+                totalSize.Height += Dpi.Height(cstyle.Padding.Vertical - 4);
+
+                Point pt = cp.Point;
+
+                if (ChartCrosshair.PointIntersectMode == PointIntersectMode.Edge)
+                {
+                    if (cp.ChartSeries.SeriesType == SeriesType.VerticalDot)
+                        pt.Y -= (cp.SeriesPoint.PointSize.Height / 2);
+
+                    else if (cp.ChartSeries.SeriesType == SeriesType.HorizontalDot)
+                        pt.X += (cp.SeriesPoint.PointSize.Width / 2);
+                }
+
+                Rectangle cbounds = GetCrosshairPointBounds(bounds, cp, pt, totalSize);
+
+                DrawCrosshairCallout(g, cbounds, pt, cstyle);
+
+                cbounds = GetAdjustedBounds(cbounds, cstyle.Padding);
+
+                RenderCrosshairLabelItem(g, cbounds, cp, cstyle);
+            }
+        }
+
+        #region GetCrosshairPointBounds
+
+        private Rectangle GetCrosshairPointBounds(
+            Rectangle bounds, CrosshairPoint cp, Point pt, Size size)
+        {
+            Rectangle r;
+
+            int n = size.Width / 5;
+
+            int left = pt.X - bounds.X + n;
+            int right = bounds.Right - pt.X + n;
+
+            if ((right >= size.Width) || (right > left))
+            {
+                r = new Rectangle(pt.X - n, pt.Y - size.Height,
+                    size.Width, size.Height);
+            }
+            else
+            {
+                r = new Rectangle(pt.X - (size.Width - n),
+                    pt.Y - size.Height, size.Width, size.Height);
+            }
+
+            r.Y -= Dpi.Height20;
+
+            if (cp.ChartSeries.SeriesType == SeriesType.VerticalBar ||
+                cp.ChartSeries.SeriesType == SeriesType.VerticalHiLoBar)
+            {
+                if (cp.IsDescending == true)
+                {
+                    if (pt.Y + 20 + r.Height < Bounds.Bottom)
+                        r.Y = pt.Y + Dpi.Height20;
+                }
+            }
+            else
+            {
+                if (r.Y < Bounds.Y + 2)
+                    r.Y = pt.Y + Dpi.Height20;
+            }
+
+            if (cp.ChartSeries.SeriesType == SeriesType.HorizontalBar ||
+                cp.ChartSeries.SeriesType == SeriesType.HorizontalHiLoBar)
+            {
+                if (cp.IsDescending == true)
+                    r.X = pt.X - (size.Width - n);
+            }
+
+            if (r.Right > Bounds.Right - Dpi.Width2)
+                r.X = Bounds.Right - r.Width - Dpi.Width2;
+
+            if (r.Left < Bounds.X + Dpi.Width2)
+                r.X = Bounds.X + Dpi.Width2;
+
+            return (r);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region GetCrosshairHeader
+
+        private string GetCrosshairHeader(CrosshairPoint cp, List<CrosshairPoint> cps)
+        {
+            string text = GetCrosshairArgument(cp);
+
+            ChartControl.DoGetCrosshairLabelHeaderEvent(this, cp, cps, ref text);
+
+            return (text);
+        }
+
+        #endregion
+
+        #region GetCrosshairArgument
+
+        private string GetCrosshairArgument(CrosshairPoint cp)
+        {
+            AxisOrientation ao = ChartCrosshair.AxisOrientation;
+
+            if (cp.ChartSeries.IsRotated == true)
+            {
+                ao = (ChartCrosshair.AxisOrientation == AxisOrientation.X)
+                    ? AxisOrientation.Y : AxisOrientation.X;
+            }
+
+            if (ao == AxisOrientation.X)
+                return (GetValueXText(cp.ChartSeries, cp.ValueX));
+
+            return (GetValueYText(cp.ChartSeries, cp.ValueY));
+        }
+
+        #endregion
+
+        #region GetValueXText
+
+        private string GetValueXText(ChartSeries series, object value)
+        {
+            ChartAxis axis = (series.IsRotated)
+                ? series.AxisY ?? AxisY : series.AxisX ?? AxisX;
+
+            return (axis.GetCrosshairLabel(
+                value, axis.EffectiveCrosshairLabelStyle));
+        }
+
+        #endregion
+
+        #region GetValueYText
+
+        private string GetValueYText(ChartSeries series, object value)
+        {
+            ChartAxis axis = (series.IsRotated)
+                ? series.AxisX ?? AxisX : series.AxisY ?? AxisY;
+
+            return (axis.GetCrosshairLabel(
+                value, axis.EffectiveCrosshairLabelStyle));
+        }
+
+        #endregion
+
+        #region MeasureCrosshairLabel
+
+        private void MeasureCrosshairLabel(Graphics g,
+            Rectangle bounds, CrosshairPoint cp, CrosshairVisualStyle cstyle, string arg, bool multiLine)
+        {
+            cp.Text = GetCrosshairItemText(cp, arg, multiLine);
+
+            if (string.IsNullOrEmpty(cp.Text) == false)
+            {
+                SizeF sizef = g.MeasureString(cp.Text, cstyle.Font, bounds.Width);
+
+                cp.TextSize = new Size((int)sizef.Width + 1, (int)sizef.Height + 1);
+            }
+            else
+            {
+                cp.TextSize = Size.Empty;
+            }
+        }
+
+        #region GetCrosshairItemText
+
+        private string GetCrosshairItemText(CrosshairPoint cp, string arg, bool multiLine)
+        {
+            string text = cp.ChartSeries.LegendText ?? cp.ChartSeries.Name ?? "";
+
+            if (String.IsNullOrEmpty(text) == false)
+                text += "  ";
+
+            if (arg != null)
+            {
+                if (multiLine == true && text.Length > 0)
+                    text += "\n";
+
+                text += (arg + " : ");
+            }
+
+            text += GetItemText(cp);
+
+            ChartControl.DoGetCrosshairLabelItemEvent(this, cp, ref text);
+
+            return (text);
+        }
+
+        #region GetItemText
+
+        private string GetItemText(CrosshairPoint cp)
+        {
+            AxisOrientation ao = ChartCrosshair.AxisOrientation;
+
+            if (cp.ChartSeries.IsRotated == true)
+            {
+                ao = (ChartCrosshair.AxisOrientation == AxisOrientation.X)
+                    ? AxisOrientation.Y : AxisOrientation.X;
+            }
+
+            string text = (ao == AxisOrientation.X)
+                ? GetValueYText(cp.ChartSeries, cp.ValueY)
+                : GetValueXText(cp.ChartSeries, cp.ValueX);
+
+            switch (cp.ChartSeries.SeriesType)
+            {
+                case SeriesType.HorizontalBar:
+                case SeriesType.VerticalBar:
+                    return (GetBarText(cp, text));
+
+                case SeriesType.HorizontalHiLoBar:
+                case SeriesType.VerticalHiLoBar:
+                    return (GetHiLoBarText(cp, text));
+
+                default:
+                    return (text);
+            }
+        }
+
+        #endregion
+
+        #region GetBarText
+
+        private string GetBarText(CrosshairPoint cp, string s1)
+        {
+            if (cp.ChartSeries.IsRotated == (ChartCrosshair.AxisOrientation == AxisOrientation.Y))
+            {
+                if (cp.SeriesPoint.ValueY.Length > 1)
+                {
+                    object v1 = cp.ValueY;
+
+                    ChartAxis axis = (cp.ChartSeries.IsRotated)
+                        ? cp.ChartSeries.AxisX ?? AxisX : cp.ChartSeries.AxisY ?? AxisY;
+
+                    CrosshairValueVisualStyle lstyle = axis.EffectiveCrosshairLabelStyle;
+
+                    object v2 = cp.SeriesPoint.ValueY[1];
+
+                    if (v2 != null)
+                    {
+                        string s2 = axis.GetCrosshairLabel(v2, lstyle);
+
+                        int y1 = GetDataPointX(axis, v1);
+                        int y2 = GetDataPointX(axis, v2);
+
+                        if (y1 < y2)
+                            return (s1 + " — " + s2);
+
+                        return (s2 + " — " + s1);
+                    }
+                }
+            }
+
+            return (s1);
+        }
+
+        #endregion
+
+        #region GetHiLoVBarText
+
+        private string GetHiLoBarText(CrosshairPoint cp, string s1)
+        {
+            if (cp.ChartSeries.IsRotated == (ChartCrosshair.AxisOrientation == AxisOrientation.Y))
+            {
+                if (cp.SeriesPoint.ValueY.Length > 1)
+                {
+                    ChartAxis axis = (cp.ChartSeries.IsRotated)
+                        ? cp.ChartSeries.AxisX ?? AxisX : cp.ChartSeries.AxisY ?? AxisY;
+
+                    CrosshairValueVisualStyle lstyle = axis.EffectiveCrosshairLabelStyle;
+
+                    s1 = axis.GetCrosshairLabel(cp.ValueY, lstyle);
+                }
+            }
+
+            s1 = s1 + " (" + "HLCO"[cp.ValueIndex] + ")";
+
+            return (s1);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region RenderCrosshairLabelItem
+
+        private void RenderCrosshairLabelItem(Graphics g,
+            Rectangle bounds, CrosshairPoint cp, CrosshairVisualStyle cstyle)
+        {
+            if (ChartControl.DoRenderCrosshairLabelItemEvent(g, this, cp, bounds, cstyle) == false)
+            {
+                Rectangle r = RenderCrosshairLabelMarker(g, bounds, cp);
+
+                Color color = cstyle.TextColor;
+
+                if (color.IsEmpty == true)
+                {
+                    color = cp.ChartSeries.GetLegendItemColor();
+
+                    color = Color.FromArgb(255, color);
+                }
+
+                using (Brush lbr = new SolidBrush(color))
+                    g.DrawString(cp.Text, cstyle.Font, lbr, r);
+            }
+        }
+
+        #region RenderCrosshairLabelMarker
+
+        private Rectangle RenderCrosshairLabelMarker(
+            Graphics g, Rectangle r, CrosshairPoint cp)
+        {
+            if (ChartCrosshair.ShowCrosshairLabelMarkers == true)
+            {
+                Image image = cp.ChartSeries.PointMarkerImage;
+
+                if (image != null)
+                {
+                    Rectangle t = r;
+
+                    Size isize = image.Size;
+
+                    if (cp.TextSize.Height > isize.Height)
+                        t.Y += (cp.TextSize.Height - isize.Height) / 2;
+
+                    g.DrawImageUnscaled(image, t);
+
+                    r.X += (isize.Width + Dpi.Width4);
+                    r.Width -= (isize.Width + Dpi.Width4);
+                }
+            }
+
+            return (r);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region DrawRoundRectangle
+
+        private void DrawRoundRectangle(Graphics g,
+            Rectangle t, CrosshairVisualStyle cstyle)
+        {
+            SmoothingMode sm = g.SmoothingMode;
+            g.SmoothingMode = SmoothingMode.AntiAlias;
+
+            using (GraphicsPath path = new GraphicsPath())
+            {
+                int dia = Dpi.Width14;
+                Rectangle r = t;
+
+                r.Width = dia;
+                r.Height = dia;
+                path.AddArc(r, 180, 90);
+
+                r.X += (t.Width - dia);
+                path.AddArc(r, 270, 90);
+
+                r.Y += (t.Height - dia);
+                path.AddArc(r, 0, 90);
+
+                r.X = t.X;
+                path.AddArc(r, 90, 90);
+
+                path.CloseFigure();
+
+                using (Brush br = cstyle.Background.GetBrush(r))
+                    g.FillPath(br, path);
+
+                using (Pen pen = new Pen(cstyle.BorderColor, cstyle.BorderThickness))
+                {
+                    pen.DashStyle = (DashStyle)cstyle.BorderPattern;
+
+                    g.DrawPath(pen, path);
+                }
+            }
+
+            g.SmoothingMode = sm;
+        }
+
+        #endregion
+
+        #region DrawCrosshairCallout
+
+        private void DrawCrosshairCallout(Graphics g,
+            Rectangle t, Point pt, CrosshairVisualStyle cstyle)
+        {
+            SmoothingMode sm = g.SmoothingMode;
+            g.SmoothingMode = SmoothingMode.AntiAlias;
+
+            using (GraphicsPath path = new GraphicsPath())
+            {
+                AddCalloutToPath(path, t, pt);
+
+                Rectangle rp = Rectangle.Round(path.GetBounds());
+
+                if (pt.Y > t.Y)
+                    rp.Y -= Dpi.Height10;
+
+                rp.Height += Dpi.Height10;
+
+                using (Brush br = cstyle.Background.GetBrush(rp))
+                    g.FillPath(br, path);
+
+                using (Pen pen = new Pen(cstyle.BorderColor, cstyle.BorderThickness))
+                {
+                    pen.DashStyle = (DashStyle)cstyle.BorderPattern;
+
+                    g.DrawPath(pen, path);
+                }
+            }
+
+            g.SmoothingMode = sm;
+        }
+
+        #region AddCalloutToPath
+
+        private void AddCalloutToPath(GraphicsPath path, Rectangle t, Point pt)
+        {
+            int dia = Dpi.Width10;
+            Rectangle r = t;
+
+            int n = Dpi.Width20;
+
+            r.Width = dia;
+            r.Height = dia;
+
+            if (pt.Y > t.Y)
+            {
+                if (pt.X < (t.X + t.Width / 2))
+                {
+                    path.AddLine(new Point(pt.X + n, pt.Y - Dpi.Width20), pt);
+                    path.AddLine(pt, new Point(pt.X + Dpi.Width5, pt.Y - Dpi.Width20));
+                }
+                else
+                {
+                    path.AddLine(new Point(pt.X - Dpi.Width5, pt.Y - Dpi.Width20), pt);
+                    path.AddLine(pt, new Point(pt.X - n, pt.Y - Dpi.Width20));
+                }
+
+
+                r.Y += (t.Height - dia);
+                path.AddArc(r, 90, 90);
+
+                r.Y = t.Y;
+                path.AddArc(r, 180, 90);
+
+                r.X += (t.Width - dia);
+                path.AddArc(r, 270, 90);
+
+                r.Y += (t.Height - dia);
+                path.AddArc(r, 0, 90);
+            }
+            else
+            {
+                if (pt.X < (t.X + t.Width / 2))
+                {
+                    path.AddLine(new Point(pt.X + Dpi.Width5, pt.Y + Dpi.Width20), pt);
+                    path.AddLine(pt, new Point(pt.X + n, pt.Y + Dpi.Width20));
+                }
+                else
+                {
+                    path.AddLine(new Point(pt.X - n, pt.Y + Dpi.Width20), pt);
+                    path.AddLine(pt, new Point(pt.X - Dpi.Width5, pt.Y + Dpi.Width20));
+                }
+
+                r.X += (t.Width - dia);
+                path.AddArc(r, 270, 90);
+
+                r.Y += (t.Height - dia);
+                path.AddArc(r, 0, 90);
+
+                r.X = t.X;
+                path.AddArc(r, 90, 90);
+
+                r.Y = t.Y;
+                path.AddArc(r, 180, 90);
+            }
+
+            path.CloseFigure();
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region Mouse Support
+
+        #region OnMouseMove
+
+        protected override bool OnMouseMove(MouseEventArgs e)
+        {
+            OnMouseMoveEx(e);
+
+            if (Legend.Visible == false ||
+                Legend.ContentBounds.Contains(e.Location) == false)
+            {
+                _CanShowCrosshairLabel = true;
+            }
+
+            return (base.OnMouseMove(e));
+        }
+
+        #endregion
+
+        #region OnMouseMoveEx
+
+        protected override void OnMouseMoveEx(MouseEventArgs e)
+        {
+            ChartCrosshair crosshair = ChartCrosshair;
+
+            bool displayCrosshair = DisplayCrosshair;
+
+            _CanShowCrosshairLabel = false;
+
+            if (crosshair.Visible == false ||
+                (crosshair.ShowCrosshairLabels == false &&
+                crosshair.ShowValueXLine == false && crosshair.ShowValueYLine == false &&
+                crosshair.ShowValueXLabels == false && crosshair.ShowValueYLabels == false))
+            {
+                DisplayCrosshair = false;
+            }
+            else
+            {
+                Rectangle bounds = GetScrollBounds(ContentBounds);
+
+                if (VScrollBar.Enabled == true)
+                    bounds.Width -= (VScrollBar.Width + 1);
+
+                if (HScrollBar.Enabled == true)
+                    bounds.Height -= (HScrollBar.Height + 1);
+
+                DisplayCrosshair = bounds.Contains(e.Location);
+            }
+
+            if (DisplayCrosshair == true || displayCrosshair != DisplayCrosshair)
+            {
+                if (DisplayCrosshair == false)
+                    _CrosshairSeriesPoints = null;
+
+                InvalidateRender();
+            }
+        }
+
+        #endregion
+
+        #region OnMouseLeave
+
+        protected override bool OnMouseLeave(EventArgs e)
+        {
+            if (DisplayCrosshair == true)
+            {
+                DisplayCrosshair = false;
+
+                _CrosshairSeriesPoints = null;
+
+                InvalidateRender();
+            }
+
+            return (base.OnMouseLeave(e));
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetLocalAdjustedPoint
+
+        /// <summary>
+        /// Gets the local, scroll adjusted point.
+        /// </summary>
+        /// <param name="pt"></param>
+        /// <returns></returns>
+        public Point GetLocalAdjustedPoint(Point pt)
+        {
+            pt.X -= ScrollOffset.X;
+            pt.X += (HScrollBar.Inverted == true ? HScrollOffset : -HScrollOffset);
+
+            pt.Y -= ScrollOffset.Y;
+            pt.Y += (VScrollBar.Inverted == true ? VScrollOffset : -VScrollOffset);
+
+            return (pt);
+        }
+
+        #endregion
+
+        #region GetGlobalAdjustedPoint
+
+        internal Point GetGlobalAdjustedPoint(Point pt)
+        {
+            pt.X -= (HScrollBar.Inverted == true ? HScrollOffset : -HScrollOffset);
+            pt.Y -= (VScrollBar.Inverted == true ? VScrollOffset : -VScrollOffset);
+
+            return (pt);
+        }
+
+        #endregion
+
+        #region GetScBorderThickness
+
+        internal int GetScBorderThickness(XyAlignment side)
+        {
+            ChartXyVisualStyle xyStyle = EffectiveChartStyle;
+
+            int n = 0;
+
+            switch (side)
+            {
+                case XyAlignment.Top:
+                    n = (xyStyle.BorderThickness.Top);
+                    break;
+
+                case XyAlignment.Left:
+                    n = (xyStyle.BorderThickness.Left);
+                    break;
+
+                case XyAlignment.Bottom:
+                    n = (xyStyle.BorderThickness.Bottom +
+                        ((HScrollBar.Visible == true) ? HScrollBar.Height + 1 : 0));
+                    break;
+
+                case XyAlignment.Right:
+                    n = (xyStyle.BorderThickness.Right +
+                        ((VScrollBar.Visible == true) ? VScrollBar.Width + 1 : 0));
+                    break;
+            }
+
+            return (Dpi.Width(n));
+        }
+
+        #endregion
+
+        #region GetPointMarker
+
+        internal Image GetPointMarker(Graphics g, PointMarkerVisualStyle style)
+        {
+            Image marker = null;
+
+            marker = style.GetPointMarkerImage();
+
+            return (marker ?? GetPointMarkerEx(g, style));
+        }
+
+        internal Image GetPointMarkerEx(Graphics g, PointMarkerVisualStyle style)
+        {
+            return (GetPointMarker(g, style.Type,
+                style.PointCount, Dpi.Size(style.Size), style.Rotation,
+                style.Background, style.BorderColor, style.BorderWidth));
+        }
+
+        internal Image GetPointMarker(Graphics g, PointMarkerType markerType, int markerPoints,
+            Size size, int markerRotation, Background background, Color borderColor, int borderWidth)
+        {
+            if (_PointMarker == null)
+                _PointMarker = new PointMarker();
+
+            if (markerType == PointMarkerType.None || markerType == PointMarkerType.NotSet)
+                markerType = PointMarkerType.Rectangle;
+
+            return (_PointMarker.GetMarkerBitmap(g, markerType,
+                markerPoints, size, markerRotation, background, borderColor, borderWidth));
+        }
+
+        #endregion
+
+        #region IsCrosshairSeriesPoint
+
+        /// <summary>
+        /// Gets whether the given Point is a Crosshair displayed point.
+        /// </summary>
+        /// <param name="series"></param>
+        /// <param name="pt"></param>
+        /// <returns></returns>
+        public bool IsCrosshairSeriesPoint(ChartSeries series, Point pt)
+        {
+            if (_CrosshairSeriesPoints != null)
+            {
+                Rectangle r = new Rectangle(pt, Size.Empty);
+                r.Inflate(2, 2);
+
+                foreach (CrosshairPoint chp in _CrosshairSeriesPoints)
+                {
+                    if (r.Contains(chp.Point) && (series == null || chp.ChartSeries == series))
+                    {
+                        if (chp == _NearestCrosshairPoint)
+                            return (true);
+
+                        if (ChartCrosshair.CrosshairLabelMode != CrosshairLabelMode.NearestSeries)
+                            return (true);
+                    }
+                }
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region UpdateRangeValues
+
+        private void UpdateRangeValues()
+        {
+            if (SeriesRangeChanged == true)
+            {
+                SeriesRangeChanged = false;
+
+                InvalidatePointLabelsEx();
+
+                _MinValueX = null;
+                _MaxValueX = null;
+                _MinValueY = null;
+                _MaxValueY = null;
+
+                foreach (ChartSeries series in ChartSeries)
+                {
+                    if (_MinValueX == null)
+                    {
+                        _MinValueX = series.MinValueX;
+                        _MaxValueX = series.MaxValueX;
+                        _MinValueY = series.MinValueY;
+                        _MaxValueY = series.MaxValueY;
+                    }
+                    else
+                    {
+                        if (series.MinValueX != null)
+                        {
+                            if (DataCompare(series.MinValueX, _MinValueX) < 0)
+                                _MinValueX = series.MinValueX;
+
+                            else if (DataCompare(series.MaxValueX, _MaxValueX) > 0)
+                                _MaxValueX = series.MaxValueX;
+
+                            if (DataCompare(series.MinValueY, _MinValueY) < 0)
+                                _MinValueY = series.MinValueY;
+
+                            else if (DataCompare(series.MaxValueY, _MaxValueY) > 0)
+                                _MaxValueY = series.MaxValueY;
+                        }
+                    }
+
+                    ChartAxis axis = series.AxisX ?? AxisX;
+
+                    if (axis != null)
+                        axis.SeriesRangeChanged = true;
+
+                    axis = series.AxisY ?? AxisY;
+
+                    if (axis != null)
+                        axis.SeriesRangeChanged = true;
+                }
+            }
+        }
+
+        #endregion
+
+        #region GetPointFromValue
+
+        /// <summary>
+        /// Gets the chart Point, given the provided SeriesPoint.
+        /// </summary>
+        /// <param name="series"></param>
+        /// <param name="sp"></param>
+        /// <param name="dy"></param>
+        /// <returns></returns>
+        public Point GetPointFromValue(ChartSeries series, SeriesPoint sp)
+        {
+            Point pt = GetDataPointNa(series, sp, 0);
+
+            return (GetLocalAdjustedPoint(pt));
+        }
+
+        /// <summary>
+        /// Gets the chart Point, given the X and Y data point values.
+        /// </summary>
+        /// <param name="series"></param>
+        /// <param name="pointValueX"></param>
+        /// <param name="pointValueY"></param>
+        /// <returns></returns>
+        public Point GetPointFromValue(ChartSeries series, object pointValueX, object pointValueY)
+        {
+            Point pt = Point.Empty;
+
+            ChartAxis axisX = series.AxisX ?? AxisX;
+            ChartAxis axisY = series.AxisY ?? AxisY;
+
+            pt.X = GetDataPointX(axisX, pointValueX) + series.PointOffset.X;
+            pt.Y = GetDataPointY(axisY, pointValueY);
+
+            return (pt);
+        }
+
+        #endregion
+
+        #region GetDataPoint
+
+        internal Point GetDataPoint(ChartSeries series, SeriesPoint sp, int dy)
+        {
+            Point pt = GetDataPointNa(series, sp, dy);
+
+            return (GetLocalAdjustedPoint(pt));
+        }
+
+        internal Point GetDataPointNa(ChartSeries series, SeriesPoint sp, int dy)
+        {
+            if (sp.SeriesValidationCount != SeriesPointCount)
+            {
+                sp.InvalidatePoints();
+
+                sp.SeriesValidationCount = SeriesPointCount;
+            }
+
+            int n = (dy < 0) ? 0 : dy;
+
+            if (sp.Point.Length > n)
+            {
+                if (sp.Point[n].IsEmpty == true)
+                {
+                    sp.Point[n] = GetDataPointEx(series, sp, dy);
+
+                    if (sp.Point[n].IsEmpty == true)
+                        return (Point.Empty);
+                }
+
+                return (sp.Point[n]);
+            }
+
+            return (Point.Empty);
+        }
+
+        internal Point GetDataPointEx(ChartSeries series, SeriesPoint sp, int dy)
+        {
+            object pointValueX = sp.ValueX;
+            object pointValueY = 0;
+
+            if (dy >= 0)
+            {
+                if (sp.ValueY != null && sp.ValueY.Length > dy)
+                    pointValueY = sp.ValueY[dy];
+            }
+
+            if (series.IsRotated == true)
+                return (GetPointFromValue(series, pointValueY, pointValueX));
+
+            return (GetPointFromValue(series, pointValueX, pointValueY));
+        }
+
+        #region GetDataPointX
+
+        internal int GetDataPointX(ChartAxis axis, object pointValueX)
+        {
+            TickmarkLayout layoutX = axis.TickmarkLayout;
+
+            if (layoutX.Ticks != null)
+            {
+                Rectangle tmBoundsX = axis.MajorTickmarks.TickmarkBounds;
+
+                int minOffset;
+                int majOffset = GetDataOffsetX(axis, layoutX, pointValueX, out minOffset);
+
+                return ((tmBoundsX.X + majOffset - layoutX.MarginOffset) + minOffset);
+            }
+            else
+            {
+                Rectangle r = ScrollBounds;
+
+                return (int)(r.Left);
+            }
+        }
+
+        #region GetDataOffsetX
+
+        private int GetDataOffsetX(ChartAxis axis,
+            TickmarkLayout layout, object pointValue, out int minOffset)
+        {
+            double ptValue;
+
+            switch (axis.ScaleType)
+            {
+                case ScaleType.Qualitative:
+                    ptValue = axis.QualitativeValues.IndexOf(pointValue) - Convert.ToInt32(layout.BaseValue);
+                    break;
+
+                case ScaleType.DateTime:
+                    ptValue = GetDateTimePointValue(axis, layout, (DateTime)pointValue);
+                    break;
+
+                default:
+                    try
+                    {
+                        ptValue = Convert.ToDouble(pointValue) - Convert.ToDouble(layout.BaseValue);
+                    }
+                    catch
+                    {
+                        minOffset = 0;
+
+                        return (0);
+                    }
+                    break;
+            }
+
+            int n = (int)(ptValue / layout.MajorSpacing);
+            int p1 = (int)(n * layout.MajorInterval);
+            int p2 = (int)((n + 1) * layout.MajorInterval);
+
+            double minorValue = (ptValue - (n * layout.MajorSpacing));
+            minOffset = (int)(((p2 - p1) * minorValue) / layout.MajorSpacing);
+
+            return (p1);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetDataPointY
+
+        internal int GetDataPointY(ChartAxis axis, object pointValueY)
+        {
+            TickmarkLayout layoutY = axis.TickmarkLayout;
+
+            if (layoutY.Ticks != null)
+            {
+                Rectangle tmBoundsY = axis.MajorTickmarks.TickmarkBounds;
+
+                int minOffset;
+                int majOffset = GetDataOffsetY(axis, layoutY, pointValueY, out minOffset);
+
+                return (((tmBoundsY.Bottom - 1) - majOffset + layoutY.MarginOffset) - minOffset);
+            }
+            else
+            {
+                Rectangle r = ScrollBounds;
+
+                if (HScrollBar.Enabled == true)
+                    r.Height -= HScrollBar.Height;
+
+                return (int)(r.Bottom - 1);
+            }
+        }
+
+        #region GetDataOffsetY
+
+        private int GetDataOffsetY(ChartAxis axis,
+            TickmarkLayout layout, object pointValue, out int minOffset)
+        {
+            double ptValue;
+
+            switch (axis.ScaleType)
+            {
+                case ScaleType.Qualitative:
+                    ptValue = axis.QualitativeValues.IndexOf(pointValue) - Convert.ToInt32(layout.BaseValue);
+                    break;
+
+                case ScaleType.DateTime:
+                    ptValue = GetDateTimePointValue(axis, layout, (DateTime)pointValue);
+                    break;
+
+                default:
+                    try
+                    {
+                        ptValue = Convert.ToDouble(pointValue) - Convert.ToDouble(layout.BaseValue);
+                    }
+                    catch
+                    {
+                        minOffset = 0;
+
+                        return (0);
+                    }
+                    break;
+            }
+
+            int n = (int)(ptValue / layout.MajorSpacing);
+            int p1 = (int)Math.Ceiling(n * layout.MajorInterval);
+            int p2 = (int)Math.Ceiling((n + 1) * layout.MajorInterval);
+
+            double minorValue = (ptValue - (n * layout.MajorSpacing));
+            minOffset = (int)Math.Ceiling(((p2 - p1) * minorValue) / layout.MajorSpacing);
+
+            return (p1);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetDateTimePointValue
+
+        internal double GetDateTimePointValue(
+            ChartAxis axis, TickmarkLayout layout, DateTime dt)
+        {
+            return (GetDateTimePointValue(axis, layout, dt, (DateTime)layout.BaseValue));
+        }
+
+        internal double GetDateTimePointValue(
+            ChartAxis axis, TickmarkLayout layout, DateTime dt, DateTime baseValue)
+        {
+            TimeSpan ts = dt - baseValue;
+
+            DateTimeUnits adtu = axis.ActualDateTimeUnits;
+
+            switch (adtu)
+            {
+                case DateTimeUnits.Ticks:
+                    return (ts.Ticks);
+
+                case DateTimeUnits.Milliseconds:
+                    return (ts.TotalMilliseconds);
+
+                case DateTimeUnits.Seconds:
+                    return (ts.TotalSeconds);
+
+                case DateTimeUnits.Minutes:
+                    return (ts.TotalMinutes);
+
+                case DateTimeUnits.Hours:
+                    return (ts.TotalHours);
+
+                case DateTimeUnits.Days:
+                    return (ts.TotalDays);
+
+                case DateTimeUnits.Months:
+                    return (axis.CalcDateTimeMonths(baseValue, dt));
+
+                default:
+                    return (axis.CalcDateTimeYears(baseValue, dt));
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetDataPointValueX
+
+        internal object GetDataPointValueX(ChartSeries series, SeriesPoint sp)
+        {
+            ChartAxis axisX = series.AxisX ?? AxisX;
+
+            switch (axisX.ScaleType)
+            {
+                case ScaleType.Qualitative:
+                    return (axisX.QualitativeValues.IndexOf(sp.ValueX));
+
+                default:
+                    return (sp.ValueX);
+            }
+        }
+
+        #endregion
+
+        #region GetDataPointValueY
+
+        internal double GetDataPointValueY(ChartSeries series, SeriesPoint sp, int dy)
+        {
+            if (dy >= 0)
+            {
+                if (sp.IsQuantitativeYValue == true)
+                {
+                    if (sp.ValueY != null && sp.ValueY.Length > dy)
+                        return (Convert.ToDouble(sp.ValueY[dy]));
+
+                    return (1);
+                }
+
+                ChartAxis axisY = series.AxisY ?? AxisY;
+
+                return (axisY.QualitativeValues.IndexOf(sp.ValueY[dy]));
+            }
+
+            return (0);
+        }
+
+        #endregion
+
+        #region GetQualitativeColumnWidth
+
+        internal int GetQualitativeColumnWidth(ChartAxis axis, int groupId)
+        {
+            ChartXyVisualStyle cstyle = EffectiveChartStyle;
+
+            List<ChartSeries> slist = GetQualitativeSeriesList(axis, groupId);
+
+            int width = 0;
+            int swidth = 0;
+
+            int count = 0;
+
+            foreach (ChartSeries series in slist)
+            {
+                Size size;
+
+                if (series.PointMarkerImage != null)
+                    size = series.PointMarkerImage.Size;
+                else
+                    size = series.EffectiveChartSeriesStyle.MarkerVisualStyle.Size;
+
+                if (series.StackQualitativePoints == false)
+                {
+                    count++;
+                    width += size.Width;
+                }
+                else
+                {
+                    swidth = Math.Max(swidth, size.Width);
+                }
+            }
+
+            width += swidth;
+
+            if (count > 1)
+                width += ((count - 1) * cstyle.IntraSeriesGap);
+
+            int offset = -width / 2;
+
+            if (swidth > 0)
+            {
+                Point pt = new Point(offset + swidth / 2, 0);
+
+                foreach (ChartSeries series in slist)
+                {
+                    if (series.StackQualitativePoints == true)
+                        series.PointOffset = pt;
+                }
+
+                offset += (swidth + cstyle.IntraSeriesGap);
+            }
+
+            foreach (ChartSeries series in slist)
+            {
+                if (series.StackQualitativePoints == false)
+                {
+                    Size size;
+
+                    if (series.PointMarkerImage != null)
+                        size = series.PointMarkerImage.Size;
+                    else
+                        size = series.EffectiveChartSeriesStyle.MarkerVisualStyle.Size;
+
+                    series.PointOffset = new Point(offset + size.Width / 2 + 1, 0);
+
+                    offset += (size.Width + cstyle.IntraSeriesGap);
+                }
+            }
+
+            width += (cstyle.InterSeriesGap * 2);
+
+            return (width);
+        }
+
+        #endregion
+
+        #region AdjustQualitativeOffsets
+
+        internal void AdjustQualitativeOffsets(ChartAxis axis, int groupId, int colWidth, int interval)
+        {
+            ChartXyVisualStyle cstyle = EffectiveChartStyle;
+
+            if (cstyle.AutoExpandIntraSeriesGap == Tbool.True)
+            {
+                List<ChartSeries> slist = GetQualitativeSeriesList(axis, groupId);
+
+                interval -= cstyle.InterSeriesGap;
+
+                int count = 0;
+
+                foreach (ChartSeries series in slist)
+                {
+                    if (series.StackQualitativePoints == false)
+                        count++;
+                }
+
+                if (count > 1)
+                {
+                    if (interval > colWidth)
+                    {
+                        int offset = (interval - colWidth);
+                        int dv = offset / count;
+
+                        offset = offset / 2 - dv / 2;
+
+                        foreach (ChartSeries series in slist)
+                        {
+                            Point pt = series.PointOffset;
+
+                            if (axis.AxisOrientation == AxisOrientation.X)
+                                pt.X -= offset;
+                            else
+                                pt.Y -= offset;
+
+                            series.PointOffset = pt;
+
+                            if (series.StackQualitativePoints == false)
+                                offset -= dv;
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region GetQualitativeSeriesList
+
+        private List<ChartSeries> GetQualitativeSeriesList(ChartAxis axis, int groupId)
+        {
+            List<ChartSeries> slist = new List<ChartSeries>();
+
+            if (axis.ScaleType == ScaleType.Qualitative)
+            {
+                foreach (ChartSeries series in ChartSeries)
+                {
+                    if (series.Visible == true && series.GroupId == groupId)
+                    {
+                        if (Legend.Visible == false ||
+                            (series.ShowCheckBoxInLegend == false || series.CheckedInLegend == true))
+                        {
+                            if (axis.AxisOrientation == AxisOrientation.X)
+                            {
+                                if (series.AxisX == axis || (series.AxisX == null && axis.IsPrimaryAxis))
+                                    slist.Add(series);
+                            }
+                            else
+                            {
+                                if (series.AxisY == axis || (series.AxisY == null && axis.IsPrimaryAxis))
+                                    slist.Add(series);
+                            }
+                        }
+                    }
+                }
+            }
+
+            return (slist);
+        }
+
+        #endregion
+
+        #region GetChartBubbleData
+
+        internal int GetChartBubbleData(out double min, out double max)
+        {
+            int count = 0;
+
+            min = double.MaxValue;
+            max = double.MinValue;
+
+            foreach (ChartSeries series in ChartSeries)
+            {
+                if (series.Visible == true)
+                {
+                    BubblePlotData bpd = series.PlotData as BubblePlotData;
+
+                    if (bpd != null)
+                    {
+                        int n = series.SeriesPoints.Count;
+                        count += n;
+
+                        double size = bpd.MinSize;
+
+                        if (size < min)
+                            min = size;
+
+                        size = bpd.MaxSize;
+
+                        if (size > max)
+                            max = size;
+                    }
+                }
+            }
+
+            return (count);
+
+        }
+
+        #endregion
+
+        #region GetMaxDotPlotMarkerSize
+
+        internal Size GetMaxDotPlotMarkerSize()
+        {
+            Size size = Size.Empty;
+
+            foreach (ChartSeries series in ChartSeries)
+            {
+                if (series.Visible == true)
+                {
+                    Image marker = series.PointMarkerImage;
+
+                    if (marker != null)
+                    {
+                        if (marker.Size.Width > size.Width)
+                            size.Width = marker.Size.Width;
+
+                        if (marker.Size.Height > size.Height)
+                            size.Height = marker.Size.Height;
+                    }
+                }
+            }
+
+            return (size);
+        }
+
+        #endregion
+
+        #region GetDotPlotTypes
+
+        internal DotPlotType GetDotPlotTypes()
+        {
+            DotPlotType types = DotPlotType.None;
+
+            foreach (ChartSeries series in ChartSeries)
+            {
+                if (series.Visible == true)
+                {
+                    if (series.SeriesType == SeriesType.VerticalDot)
+                        types |= DotPlotType.Vertical;
+
+                    else if (series.SeriesType == SeriesType.HorizontalDot)
+                        types |= DotPlotType.Horizontal;
+                }
+            }
+
+            return (types);
+        }
+
+        #endregion
+
+        #region GetBaseSeries
+
+        internal override ChartBaseSeriesCollection GetBaseSeries()
+        {
+            ChartBaseSeriesCollection baseSeries = new ChartBaseSeriesCollection();
+
+            foreach (BaseSeries series in ChartSeries)
+                baseSeries.Add(series);
+
+            return (baseSeries);
+        }
+
+        #endregion
+
+        #region GetSeriesByName
+
+        /// <summary>
+        /// Gets the chart series with the given Name.
+        /// </summary>
+        /// <param name="name"></param>
+        /// <returns>ChartSeries or null.</returns>
+        public ChartSeries GetSeriesByName(string name)
+        {
+            if (String.IsNullOrEmpty(name) == true)
+                return (null);
+
+            foreach (ChartSeries series in ChartSeries)
+            {
+                if (name.Equals(series.Name) == true)
+                    return (series);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetAutoGenSeriesType
+
+        internal override SeriesType GetAutoGenSeriesType()
+        {
+            return (AutoGenSeriesType);
+        }
+
+        #endregion
+
+        #region GetAutoGenSeriesNameCount
+
+        internal override int GetAutoGenSeriesNameCount()
+        {
+            return (AutoGenSeriesType == SeriesType.Bubble ? 2 : 1);
+        }
+
+        #endregion
+
+        #region GetNewSeries
+
+        internal override BaseSeries GetNewSeries()
+        {
+            return (new ChartSeries(AutoGenSeriesType));
+        }
+
+        #endregion
+
+        #region AddChartSeries
+
+        internal override void AddChartSeries(BaseSeries series)
+        {
+            ChartSeries.Add((ChartSeries)series);
+        }
+
+        #endregion
+
+        #region Style handling
+
+        #region ApplyStyles
+
+        public override void ApplyStyles(BaseVisualStyle style)
+        {
+            base.ApplyStyles(style);
+
+            ChartXyVisualStyle xyStyle = style as ChartXyVisualStyle;
+
+            if (xyStyle != null)
+            {
+                ApplyParentStyles(xyStyle, Parent as ChartContainer);
+
+                xyStyle.ApplyStyle(ChartVisualStyle);
+
+                xyStyle.ApplyDefaults();
+            }
+            else if (style is ChartSeriesVisualStyle)
+            {
+                ChartSeriesVisualStyle sstyle = (ChartSeriesVisualStyle)style;
+
+                ApplyParentStyles(sstyle, Parent as ChartContainer);
+
+                sstyle.ApplyStyle(_ChartSeriesVisualStyle);
+
+                sstyle.ApplyDefaults();
+            }
+            else if (style is DataLabelVisualStyle)
+            {
+                DataLabelVisualStyle dstyle = style as DataLabelVisualStyle;
+
+                if (dstyle != null)
+                {
+                    ApplyParentStyles(dstyle, Parent as ChartContainer);
+
+                    dstyle.ApplyStyle(_DataLabelVisualStyle);
+
+                    dstyle.ApplyDefaults();
+                }
+            }
+        }
+
+        #region ApplyParentStyles
+
+        private void ApplyParentStyles(ChartXyVisualStyle pstyle, ChartContainer item)
+        {
+            if (item != null)
+            {
+                ApplyParentStyles(pstyle, item.Parent as ChartContainer);
+
+                if (item is ChartPanel)
+                    pstyle.ApplyStyle(((ChartPanel)item).DefaultVisualStyles.ChartXyVisualStyle);
+            }
+            else
+            {
+                pstyle.ApplyStyle(ChartControl.BaseVisualStyles.ChartXyVisualStyle);
+                pstyle.ApplyStyle(ChartControl.DefaultVisualStyles.ChartXyVisualStyle);
+            }
+        }
+
+        #endregion
+
+        #region ApplyParentStyles (ChartSeriesVisualStyle)
+
+        private void ApplyParentStyles(ChartSeriesVisualStyle pstyle, ChartContainer item)
+        {
+            if (item != null)
+            {
+                ApplyParentStyles(pstyle, item.Parent as ChartContainer);
+
+                if (item is ChartPanel)
+                    pstyle.ApplyStyle(((ChartPanel)item).DefaultVisualStyles.ChartSeriesVisualStyle);
+            }
+            else
+            {
+                pstyle.ApplyStyle(ChartControl.BaseVisualStyles.ChartSeriesVisualStyle);
+                pstyle.ApplyStyle(ChartControl.DefaultVisualStyles.ChartSeriesVisualStyle);
+            }
+        }
+
+        #endregion
+
+        #region ApplyParentStyles (DataLabelVisualStyle)
+
+        private void ApplyParentStyles(DataLabelVisualStyle pstyle, ChartContainer item)
+        {
+            if (item != null)
+            {
+                ApplyParentStyles(pstyle, item.Parent as ChartContainer);
+
+                if (item is ChartPanel)
+                    pstyle.ApplyStyle(((ChartPanel)item).DefaultVisualStyles.DataLabelVisualStyle);
+            }
+            else
+            {
+                pstyle.ApplyStyle(ChartControl.BaseVisualStyles.DataLabelVisualStyle);
+                pstyle.ApplyStyle(ChartControl.DefaultVisualStyles.DataLabelVisualStyle);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ClearEffectiveStyles
+
+        protected override void ClearEffectiveStyles()
+        {
+            _EffectiveChartStyle.InvalidateStyle();
+            _EffectiveChartSeriesStyle.InvalidateStyle();
+
+            if (_EffectiveDataLabelStyle.InvalidateStyle() == true)
+                InvalidateLayout();
+
+            base.ClearEffectiveStyles();
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InvalidateLayoutBounds
+
+        public override void InvalidateLayoutBounds(ScrollBarLite sbar)
+        {
+            base.InvalidateLayoutBounds(sbar);
+
+            if (sbar != null)
+            {
+                Rectangle contentBounds = GetScrollBounds(ContentBounds);
+                InvalidateRender(contentBounds);
+
+                if (sbar.Orientation == Orientation.Horizontal)
+                    InvalidateAxes(AncillaryAxesX, AxisX);
+                else
+                    InvalidateAxes(AncillaryAxesY, AxisY);
+            }
+        }
+
+        #region InvalidateAxes
+
+        private void InvalidateAxes(ChartAxesCollection axes, ChartAxis axis)
+        {
+            foreach (ChartAxis ca in axes)
+            {
+                if (ca.Visible == true)
+                {
+                    Rectangle bounds = ca.GetScrollBounds(ca.AxisBounds);
+
+                    ca.InvalidateRender(bounds);
+                }
+            }
+
+            if (axis.Visible == true)
+            {
+                Rectangle bounds = axis.GetScrollBounds(axis.AxisBounds);
+
+                axis.InvalidateRender(bounds);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InvalidateSeriesPoints
+
+        private void InvalidateSeriesPoints()
+        {
+            SeriesPointCount++;
+
+            foreach (ChartSeries series in ChartSeries)
+                series.InvalidatePoints();
+
+            InvalidatePointLabelsEx();
+        }
+
+        #endregion
+
+        #region InvalidatePointLabels
+
+        /// <summary>
+        /// Invalidate the cached PointLabels
+        /// </summary>
+        public void InvalidatePointLabels()
+        {
+            InvalidatePointLabelsEx();
+            InvalidateRender();
+        }
+
+        internal void InvalidatePointLabelsEx()
+        {
+            _PointLabels = null;
+        }
+
+        #endregion
+
+        #region GetLegendData
+
+        /// <summary>
+        /// Gets the list of chart legend data.
+        /// </summary>
+        /// <returns></returns>
+        public override List<ChartLegendItem> GetLegendData()
+        {
+            base.GetLegendData();
+
+            GetAxesLegendData(AncillaryAxesX, AxisX);
+            GetAxesLegendData(AncillaryAxesY, AxisY);
+
+            return (LegendData);
+        }
+
+        #endregion
+
+        #region GetAxesLegendData
+
+        private void GetAxesLegendData(ChartAxesCollection axes, ChartAxis axis)
+        {
+            for (int i = axes.Count - 1; i >= 0; i--)
+            {
+                ChartAxis ca = axes[i];
+
+                if (ca.Visible == true)
+                    ca.GetLegendData(LegendData);
+            }
+
+            if (axis.Visible == true)
+                axis.GetLegendData(LegendData);
+        }
+
+        #endregion
+
+        #region GetHitArea
+
+        /// <summary>
+        /// Gets the hit area for the chart.
+        /// </summary>
+        /// <param name="pt"></param>
+        /// <returns>ItemHitArea</returns>
+        public override ItemHitArea GetHitArea(Point pt)
+        {
+            if (AxisX.Bounds.Contains(pt))
+                return (ItemHitArea.InPrimaryAxisX);
+
+            if (AxisY.Bounds.Contains(pt))
+                return (ItemHitArea.InPrimaryAxisY);
+
+            foreach (ChartAxis axis in AncillaryAxesX)
+            {
+                if (axis.Bounds.Contains(pt))
+                    return (ItemHitArea.InAncillaryAxisX);
+            }
+
+            foreach (ChartAxis axis in AncillaryAxesY)
+            {
+                if (axis.Bounds.Contains(pt))
+                    return (ItemHitArea.InAncillaryAxisY);
+            }
+
+            return (base.GetHitArea(pt));
+        }
+
+        #endregion
+
+        #region Copy/CopyTo
+
+        public override ChartVisualElement Copy()
+        {
+            ChartXy copy = new ChartXy();
+
+            CopyTo(copy);
+
+            return (copy);
+        }
+
+        public override void CopyTo(ChartVisualElement copy)
+        {
+            ChartXy c = copy as ChartXy;
+
+            if (c != null)
+            {
+                base.CopyTo(c);
+
+                foreach (ChartAxisX axis in AncillaryAxesX)
+                    c.AncillaryAxesX.Add((ChartAxisX)axis.Copy());
+
+                foreach (ChartAxisY axis in AncillaryAxesY)
+                    c.AncillaryAxesY.Add((ChartAxisY)axis.Copy());
+
+                c.AutoGenSeriesType = AutoGenSeriesType;
+
+                AxisX.CopyTo(c.AxisX);
+                AxisY.CopyTo(c.AxisY);
+
+                c.BarFillRange = BarFillRange;
+                c.BarLabelPosition = BarLabelPosition;
+                c.BarOrigin = BarOrigin;
+                c.BarOverlayEnabled = BarOverlayEnabled;
+                c.BarShadingEnabled = BarShadingEnabled;
+                c.BarSpacing = BarSpacing;
+                c.BarSpacingRatio = BarSpacingRatio;
+                c.BarWidthRatio = BarWidthRatio;
+
+                c.BubbleIntensityMode = BubbleIntensityMode;
+                c.BubbleSizeMode = BubbleSizeMode;
+
+                c.ChartLineAreaDisplayMode = ChartLineAreaDisplayMode;
+                c.ChartLineDisplayMode = ChartLineDisplayMode;
+
+                foreach (ChartSeries series in ChartSeries)
+                    c.ChartSeries.Add((ChartSeries)series.Copy());
+
+                c.ChartSeriesVisualStyle =
+                    (_ChartSeriesVisualStyle != null) ? _ChartSeriesVisualStyle.Copy() : null;
+
+                c.ChartVisualStyle = (_ChartVisualStyle != null) ? ChartVisualStyle.Copy() : null;
+
+                c.ConvexHullDisplayMode = ConvexHullDisplayMode;
+
+                ChartCrosshair.CopyTo(c.ChartCrosshair);
+
+                c.DataLabelOverlapMode = DataLabelOverlapMode;
+
+                c.DataLabelVisualStyle =
+                    (_DataLabelVisualStyle != null) ? _DataLabelVisualStyle.Copy() : null;
+
+                c.PointLabelDisplayMode = PointLabelDisplayMode;
+                c.SeriesDisplayOrder = SeriesDisplayOrder;
+
+                c.StepLines = StepLines;
+                c.StepLineMode = StepLineMode;
+            }
+        }
+
+        #endregion
+
+        #region GetSerialData
+
+        internal override SerialElementCollection GetSerialData(string serialName)
+        {
+            SerialElementCollection sec = new SerialElementCollection();
+
+            if (serialName != null)
+            {
+                if (serialName.Equals("") == true)
+                    serialName = "ChartXy";
+
+                sec.AddStartElement(serialName);
+            }
+
+            if (_AncillaryAxesX != null && _AncillaryAxesX.Count > 0)
+            {
+                sec.AddStartElement("AncillaryAxesX count=\"" + _AncillaryAxesX.Count + "\"");
+
+                foreach (ChartAxisX axis in _AncillaryAxesX)
+                    sec.AddElement(axis.GetSerialData("ChartAxisX"));
+
+                sec.AddEndElement("AncillaryAxesX");
+            }
+
+            if (_AncillaryAxesY != null && _AncillaryAxesY.Count > 0)
+            {
+                sec.AddStartElement("AncillaryAxesY count=\"" + _AncillaryAxesY.Count + "\"");
+
+                foreach (ChartAxisY axis in _AncillaryAxesY)
+                    sec.AddElement(axis.GetSerialData("ChartAxisY"));
+
+                sec.AddEndElement("AncillaryAxesY");
+            }
+
+            sec.AddValue("AutoGenSeriesType", AutoGenSeriesType, SeriesType.Point);
+
+            if (AxisX != null)
+                sec.AddElement(AxisX.GetSerialData("AxisX"));
+
+            if (AxisY != null)
+                sec.AddElement(AxisY.GetSerialData("AxisY"));
+
+            sec.AddValue("BarFillRange", BarFillRange, BarFillRange.NotSet);
+            sec.AddValue("BarLabelPosition", BarLabelPosition, BarLabelPosition.NotSet);
+
+            sec.AddDataValue("BarOrigin", BarOrigin, null);
+
+            sec.AddValue("BarOverlayEnabled", BarOverlayEnabled, false);
+            sec.AddValue("BarShadingEnabled", BarShadingEnabled, Tbool.NotSet);
+            sec.AddValue("BarShowAsHistogram", BarShowAsHistogram, Tbool.NotSet);
+            sec.AddValue("BarSpacing", BarSpacing, 0);
+            sec.AddValue("BarSpacingRatio", BarSpacingRatio, 0.2d);
+            sec.AddValue("BarWidthRatio", BarWidthRatio, 0d);
+
+            sec.AddValue("BubbleIntensityMode", BubbleIntensityMode, BubbleIntensityMode.NotSet);
+            sec.AddValue("BubbleSizeMode", BubbleSizeMode, BubbleSizeMode.NotSet);
+
+            sec.AddValue("ChartLineAreaDisplayMode", ChartLineAreaDisplayMode, ChartLineAreaDisplayMode.NotSet);
+            sec.AddValue("ChartLineDisplayMode", ChartLineDisplayMode, ChartLineDisplayMode.NotSet);
+
+            if (ChartSeries.Count > 0)
+            {
+                sec.AddStartElement("ChartSeries count=\"" + ChartSeries.Count + "\"");
+
+                foreach (ChartSeries series in ChartSeries)
+                    sec.AddElement(series.GetSerialData("ChartSeries"));
+
+                sec.AddEndElement("ChartSeries");
+            }
+
+            if (_ChartSeriesVisualStyle != null && _ChartSeriesVisualStyle.IsEmpty == false)
+                sec.AddElement(_ChartSeriesVisualStyle.GetSerialData("ChartSeriesVisualStyle"));
+
+            if (_ChartVisualStyle != null && _ChartVisualStyle.IsEmpty == false)
+                sec.AddElement(_ChartVisualStyle.GetSerialData("ChartVisualStyle"));
+
+            sec.AddValue("ConvexHullDisplayMode", ConvexHullDisplayMode, ConvexHullDisplayMode.NotSet);
+
+            sec.AddElement(ChartCrosshair.GetSerialData("ChartCrosshair"));
+
+            sec.AddValue("DataLabelOverlapMode", DataLabelOverlapMode, DataLabelOverlapMode.NotSet);
+
+            if (_DataLabelVisualStyle != null && _DataLabelVisualStyle.IsEmpty == false)
+                sec.AddElement(_DataLabelVisualStyle.GetSerialData("DataLabelVisualStyle"));
+
+            sec.AddValue("PointLabelDisplayMode", PointLabelDisplayMode, PointLabelDisplayMode.NotSet);
+            sec.AddValue("SeriesDisplayOrder", SeriesDisplayOrder, SeriesDisplayOrder.NotSet);
+            sec.AddValue("StepLines", StepLines, StepLines.NotSet);
+            sec.AddValue("StepLineMode", StepLineMode, StepLineMode.NotSet);
+
+            sec.AddElement(base.GetSerialData(null));
+
+            if (serialName != null)
+                sec.AddEndElement(serialName);
+
+            return (sec);
+        }
+
+        #endregion
+
+        #region PutSerialData
+
+        #region ProcessValue
+
+        internal override void ProcessValue(SerialElement se)
+        {
+            switch (se.Name)
+            {
+                case "AutoGenSeriesType":
+                    AutoGenSeriesType = (SeriesType)se.GetValueEnum(typeof(SeriesType));
+                    break;
+
+                case "BarFillRange":
+                    BarFillRange = (BarFillRange)se.GetValueEnum(typeof(BarFillRange));
+                    break;
+
+                case "BarLabelPosition":
+                    BarLabelPosition = (BarLabelPosition)se.GetValueEnum(typeof(BarLabelPosition));
+                    break;
+
+                case "BarOrigin":
+                    BarOrigin = se.DataValue;
+                    break;
+
+                case "BarOverlayEnabled":
+                    BarOverlayEnabled = bool.Parse(se.StringValue);
+                    break;
+
+                case "BarShadingEnabled":
+                    BarShadingEnabled = (Tbool)se.GetValueEnum(typeof(Tbool));
+                    break;
+
+                case "BarShowAsHistogram":
+                    BarShowAsHistogram = (Tbool)se.GetValueEnum(typeof(Tbool));
+                    break;
+
+                case "BarSpacing":
+                    BarSpacing = int.Parse(se.StringValue);
+                    break;
+
+                case "BarSpacingRatio":
+                    BarSpacingRatio = double.Parse(se.StringValue);
+                    break;
+
+                case "BarWidthRatio":
+                    BarWidthRatio = double.Parse(se.StringValue);
+                    break;
+
+                case "BubbleIntensityMode":
+                    BubbleIntensityMode = (BubbleIntensityMode)se.GetValueEnum(typeof(BubbleIntensityMode));
+                    break;
+
+                case "BubbleSizeMode":
+                    BubbleSizeMode = (BubbleSizeMode)se.GetValueEnum(typeof(BubbleSizeMode));
+                    break;
+
+                case "ChartLineAreaDisplayMode":
+                    ChartLineAreaDisplayMode = (ChartLineAreaDisplayMode)se.GetValueEnum(typeof(ChartLineAreaDisplayMode));
+                    break;
+
+                case "ChartLineDisplayMode":
+                    ChartLineDisplayMode = (ChartLineDisplayMode)se.GetValueEnum(typeof(ChartLineDisplayMode));
+                    break;
+
+                case "ConvexHullDisplayMode":
+                    ConvexHullDisplayMode = (ConvexHullDisplayMode)se.GetValueEnum(typeof(ConvexHullDisplayMode));
+                    break;
+
+                case "DataLabelOverlapMode":
+                    DataLabelOverlapMode = (DataLabelOverlapMode)se.GetValueEnum(typeof(DataLabelOverlapMode));
+                    break;
+
+                case "PointLabelDisplayMode":
+                    PointLabelDisplayMode = (PointLabelDisplayMode)se.GetValueEnum(typeof(PointLabelDisplayMode));
+                    break;
+
+                case "SeriesDisplayOrder":
+                    SeriesDisplayOrder = (SeriesDisplayOrder)se.GetValueEnum(typeof(SeriesDisplayOrder));
+                    break;
+
+                case "StepLines":
+                    StepLines = (StepLines)se.GetValueEnum(typeof(StepLines));
+                    break;
+
+                case "StepLineMode":
+                    StepLineMode = (StepLineMode)se.GetValueEnum(typeof(StepLineMode));
+                    break;
+
+                default:
+                    base.ProcessValue(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region ProcessCollection
+
+        internal override void ProcessCollection(SerialElement se)
+        {
+            SerialElementCollection sec = se.Sec;
+
+            switch (se.Name)
+            {
+                case "AncillaryAxesX":
+                case "AncillaryAxesY":
+                    sec.PutSerialData(this);
+                    break;
+
+                case "AxisX":
+                    sec.PutSerialData(AxisX);
+                    break;
+
+                case "AxisY":
+                    sec.PutSerialData(AxisY);
+                    break;
+
+                case "ChartAxisX":
+                    string nameX = sec.GetItemValue("Name");
+
+                    ChartAxis axisX = AncillaryAxesX[nameX];
+                        
+                    if (axisX != null)
+                        AncillaryAxesX.Remove(axisX);
+
+                    axisX = new ChartAxisX(nameX);
+
+                    sec.PutSerialData(axisX);
+
+                    AncillaryAxesX.Add(axisX);
+                    break;
+
+                case "ChartAxisY":
+                    string nameY = sec.GetItemValue("Name");
+
+                    ChartAxis axisY = AncillaryAxesY[nameY];
+                        
+                    if (axisY != null)
+                        AncillaryAxesY.Remove(axisY);
+
+                    axisY = new ChartAxisY(nameY);
+
+                    sec.PutSerialData(axisY);
+
+                    AncillaryAxesY.Add(axisY);
+                    break;
+
+                case "ChartSeries":
+                    if (se.ArrayCount > 0)
+                    {
+                        sec.PutSerialData(this);
+                    }
+                    else
+                    {
+                        string name = sec.GetItemValue("Name");
+
+                        ChartSeries series = new ChartSeries(name);
+
+                        ChartSeries.Add(series);
+
+                        sec.PutSerialData(series);
+                    }
+                    break;
+
+                case "ChartSeriesVisualStyle":
+                    sec.PutSerialData(ChartSeriesVisualStyle);
+                    break;
+
+                case "ChartVisualStyle":
+                    sec.PutSerialData(ChartVisualStyle);
+                    break;
+
+                case "ChartCrosshair":
+                    sec.PutSerialData(ChartCrosshair);
+                    break;
+
+                case "DataLabelVisualStyle":
+                    sec.PutSerialData(DataLabelVisualStyle);
+                    break;
+
+                default:
+                    base.ProcessCollection(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region States
+
+        [Flags]
+        private enum States : uint
+        {
+            BarOverlayEnabled = (1U << 0),
+
+            DisplayCrosshair = (1U << 1),
+            DropShadowDisplayed = (1U << 2),
+        }
+
+        #region TestState
+
+        private bool TestState(States state)
+        {
+            return ((_States & state) == state);
+        }
+
+        #endregion
+
+        #region SetState
+
+        private void SetState(States state, bool value)
+        {
+            if (value == true)
+                _States |= state;
+            else
+                _States &= ~state;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IDisposable
+
+        public override void Dispose()
+        {
+            AncillaryAxesX = null;
+            AncillaryAxesY = null;
+
+            AxisX = null;
+            AxisY = null;
+
+            ChartSeriesVisualStyle = null;
+            ChartVisualStyle = null;
+            ChartCrosshair = null;
+            DataLabelVisualStyle = null;
+
+            base.Dispose();
+        }
+
+        #endregion
+    }
+
+    #region CrosshairPoint
+
+    /// <summary>
+    /// Defines a Crosshair Point
+    /// </summary>
+    public class CrosshairPoint
+    {
+        #region Public variables
+
+        private ChartSeries _ChartSeries;
+        private SeriesPoint _SeriesPoint;
+
+        private int _PointIndex;
+        private int _ValueIndex;
+        private SortedSeriesPoints _SortedSeriesPoints;
+
+        private Point _Point;
+        
+        private string _Text;
+        private Size _TextSize;
+
+        private bool _IsDescending;
+
+        #endregion
+
+        public CrosshairPoint(ChartSeries chartSeries, SortedSeriesPoints ssp,
+            int pointIndex, SeriesPoint seriesPoint, int valueIndex, Point point, bool isDescending)
+        {
+            _ChartSeries = chartSeries;
+            _IsDescending = isDescending;
+            _SortedSeriesPoints = ssp;
+            _PointIndex = pointIndex;
+            _SeriesPoint = seriesPoint;
+            _ValueIndex = valueIndex;
+
+            _Point = point;
+        }
+
+        #region Public properties
+
+        #region ChartSeries
+
+        /// <summary>
+        /// Gets the associated chart series.
+        /// </summary>
+        public ChartSeries ChartSeries
+        {
+            get { return (_ChartSeries); }
+            internal set { _ChartSeries = value; }
+        }
+
+        #endregion
+
+        #region SeriesPoint
+
+        /// <summary>
+        /// Gets the associated SeriesPoint.
+        /// </summary>
+        public SeriesPoint SeriesPoint
+        {
+            get { return (_SeriesPoint); }
+            internal set { _SeriesPoint = value; }
+        }
+
+        #endregion
+
+        #region ValueX
+
+        /// <summary>
+        /// Gets the X-Value
+        /// </summary>
+        public object ValueX
+        {
+            get { return (SeriesPoint.ValueX); }
+        }
+
+        #endregion
+
+        #region ValueY
+
+        /// <summary>
+        /// Gets the associated ValueY.
+        /// </summary>
+        public object ValueY
+        {
+            get
+            {
+                if (ChartSeries.SeriesType == SeriesType.VerticalDot ||
+                    ChartSeries.SeriesType == SeriesType.HorizontalDot)
+                {
+                    return (SortedSeriesPoints.CountArray[PointIndex]);
+                }
+
+                if (SeriesPoint.ValueY != null && (uint)_ValueIndex < SeriesPoint.ValueY.Length)
+                    return (SeriesPoint.ValueY[_ValueIndex]);
+
+                return (string.Empty);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region IsDescending
+
+        internal bool IsDescending
+        {
+            get { return (_IsDescending); }
+            set { _IsDescending = value; }
+        }
+
+        #endregion
+
+        #region Point
+
+        internal Point Point
+        {
+            get { return (_Point); }
+            set { _Point = value; }
+        }
+
+        #endregion
+
+        #region PointIndex
+
+        internal int PointIndex
+        {
+            get { return (_PointIndex); }
+            set { _PointIndex = value; }
+        }
+
+        #endregion
+
+        #region SortedSeriesPoints
+
+        internal SortedSeriesPoints SortedSeriesPoints
+        {
+            get { return (_SortedSeriesPoints); }
+            set { _SortedSeriesPoints = value; }
+        }
+
+        #endregion
+
+        #region Text
+
+        internal string Text
+        {
+            get { return (_Text); }
+            set { _Text = value; }
+        }
+
+        #endregion
+
+        #region TextSize
+
+        internal Size TextSize
+        {
+            get { return (_TextSize); }
+            set { _TextSize = value; }
+        }
+
+        #endregion
+
+        #region ValueIndex
+
+        internal int ValueIndex
+        {
+            get { return (_ValueIndex); }
+            set { _ValueIndex = value; }
+        }
+
+        #endregion
+
+        #endregion
+    }
+
+    #endregion
+
+    #region CrosshairGroup
+
+    internal class CrosshairGroup
+    {
+        public string Text;
+        public Size TextSize;
+
+        public Size LabelSize;
+        public int MarkerWidth;
+
+        public List<CrosshairPoint> Cps;
+    }
+
+    #endregion
+
+    #region enums
+
+    #region BarFillRange
+
+    public enum BarFillRange
+    {
+        /// <summary>
+        /// Not set (default is ByBar)
+        /// </summary>
+        NotSet = 0,
+
+        /// <summary>
+        /// Bars are filled according to each individual
+        /// bar's defined range.
+        /// </summary>
+        ByBar,
+
+        /// <summary>
+        /// Bars are filled according to the associated series
+        /// minimum and maximum values.
+        /// </summary>
+        BySeries,
+    }
+
+    #endregion
+
+    #region BubbleIntensityMode
+
+    public enum BubbleIntensityMode
+    {
+        /// <summary>
+        /// Not set (default is None)
+        /// </summary>
+        NotSet = 0,
+
+        /// <summary>
+        /// Bubble intensity not used.
+        /// </summary>
+        None,
+
+        /// <summary>
+        /// Bubble intensity is expressed as an alpha value (0 - 255).
+        /// </summary>
+        Alpha,
+
+        /// <summary>
+        /// Bubble intensity is expressed as a data value (as is the size of the bubble).
+        /// </summary>
+        Value,
+    }
+
+    #endregion
+
+    #region BubbleSizeMode
+
+    public enum BubbleSizeMode
+    {
+        /// <summary>
+        /// Not set (default is Area)
+        /// </summary>
+        NotSet = 0,
+
+        /// <summary>
+        /// Bubble size is proportional to the bubble area.
+        /// </summary>
+        Area,
+
+        /// <summary>
+        /// Bubble size is proportional to the bubble diameter.
+        /// </summary>
+        Diameter,
+    }
+
+    #endregion
+
+    #region ChartLineDisplayMode
+
+    [Flags]
+    public enum ChartLineDisplayMode
+    {
+        /// <summary>
+        /// Not set
+        /// </summary>
+        NotSet = 0,
+
+        /// <summary>
+        /// Display defined points on line
+        /// </summary>
+        DisplayPoints = (1 << 0),
+
+        /// <summary>
+        /// Display a straight line through defined series points
+        /// </summary>
+        DisplayLine = (1 << 1),
+
+        /// <summary>
+        /// Display a spline through defined series points
+        /// </summary>
+        DisplaySpline = (1 << 2),
+
+        /// <summary>
+        /// Display a Step Line through defined series points
+        /// </summary>
+        DisplayStepLine = (1 << 3),
+
+        /// <summary>
+        /// Points are displayed unsorted
+        /// </summary>
+        DisplayUnsorted = (1 << 4),
+
+        /// <summary>
+        /// Start and end Points are connected.
+        /// </summary>
+        DisplayClosed = (1 << 5),
+    }
+
+    #endregion
+
+    #region ChartLineAreaDisplayMode
+
+    [Flags]
+    public enum ChartLineAreaDisplayMode
+    {
+        /// <summary>
+        /// Not set
+        /// </summary>
+        NotSet = 0,
+
+        /// <summary>
+        /// Not set
+        /// </summary>
+        None = (1 << 0),
+
+        /// <summary>
+        /// Display background area under series Line.
+        /// </summary>
+        DisplayLine = (1 << 1),
+
+        /// <summary>
+        /// Display background area under series Spline.
+        /// </summary>
+        DisplaySpline = (1 << 2),
+
+        /// <summary>
+        /// Display background area under series StepLine.
+        /// </summary>
+        DisplayStepLine = (1 << 3),
+
+        /// <summary>
+        /// Display background area under series EmptyLines.
+        /// </summary>
+        DisplayEmptyLine = (1 << 4),
+    }
+
+    #endregion
+
+    #region DotPlotType
+
+    [Flags]
+    internal enum DotPlotType
+    {
+        None = 0,
+        Horizontal = (1 << 0),
+        Vertical = (1 << 1),
+    }
+
+    #endregion
+
+    #region DataLabelOverlapMode
+
+    /// <summary>
+    /// Specifies how overlapping Series Data Labels are resolved
+    /// </summary>
+    public enum DataLabelOverlapMode
+    {
+        /// <summary>
+        /// Not set (default is None). 
+        /// </summary>
+        NotSet = -1,
+
+        /// <summary>
+        /// Overlapping labels will be shown.
+        /// </summary>
+        ShowOverlapping,
+
+        /// <summary>
+        /// Overlapping labels will be hidden.
+        /// </summary>
+        HideOverlapping,
+
+        /// <summary>
+        /// Overlapping labels will be rotated around point (when applicable).
+        /// </summary>
+        RotateAroundPoint,
+    }
+
+    #endregion
+
+    #region SeriesDisplayOrder
+
+    public enum SeriesDisplayOrder
+    {
+        /// <summary>
+        /// Not set (default is Forward).
+        /// </summary>
+        NotSet,
+
+        /// <summary>
+        /// Series are displayed in the normal collection order.
+        /// </summary>
+        Forward,
+
+        /// <summary>
+        /// Series are displayed in the reverse collection order.
+        /// </summary>
+        Reverse,
+    }
+
+    #endregion
+
+    #region XyAlignment
+
+    public enum XyAlignment
+    {
+        NotSet = -1,
+
+        Top,
+        Left,
+        Bottom,
+        Right,
+    }
+
+    #endregion
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/XyChart/FlockAlign.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/XyChart/FlockAlign.cs
new file mode 100644
index 00000000..d8893244
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/XyChart/FlockAlign.cs	
@@ -0,0 +1,922 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using DevComponents.DotNetBar.Charts.Style;
+
+namespace DevComponents.DotNetBar.Charts
+{
+    class FlockAlign
+    {
+        #region Constants
+
+	    private const long RemovePenalty = 1;
+        private const int MovesPerIteration = 500;
+	
+        #endregion
+
+        #region Private variables
+
+        private List<PointLabelGroup> _LabelGroups;
+	
+        #endregion
+
+        public FlockAlign(List<PointLabelGroup> labelGroups)
+        {
+            _LabelGroups = labelGroups;
+
+            foreach (PointLabelGroup lg in _LabelGroups)
+            {
+                foreach (PointLabel pl in lg.PointLabels)
+                    pl.Bounds = Rectangle.Empty;
+            }
+        }
+
+        #region Iterate
+
+        public bool Iterate(Rectangle bounds, DataLabelOverlapMode ovlMode)
+        {
+            if (ovlMode == DataLabelOverlapMode.NotSet)
+                ovlMode = DataLabelOverlapMode.RotateAroundPoint;
+
+            for (int i = 0; i < _LabelGroups.Count; i++)
+            {
+                PointLabelGroup lg = _LabelGroups[i];
+                List<PointLabel> lps = lg.PointLabels;
+                ChartSeries series = lg.ChartSeries;
+
+                Point lp = Point.Empty;
+
+                for (int j = 0; j < lps.Count; j++)
+                {
+                    PointLabel pl = lps[j];
+
+                    if (pl.Visible == true )
+                    {
+                        DataLabelVisualStyle dstyle = pl.DataLabelVisualStyle ?? series.EffectiveDataLabelStyle;
+
+                        if (series.IsBarSeries == true)
+                        {
+                            if (series.IsRotated == true)
+                                IterateHBar(series, pl, bounds, ovlMode, dstyle);
+                            else
+                                IterateVBar(series, pl, bounds, ovlMode, dstyle);
+                        }
+                        else
+                        {
+                            IteratePoint(series, pl, bounds, lp, ovlMode, dstyle);
+                        }
+                    }
+
+                    lp = pl.Point;
+                }
+            }
+
+            return (true);
+        }
+
+        #region IterateHBar
+
+        private void IterateHBar(ChartSeries series, PointLabel pl,
+            Rectangle bounds, DataLabelOverlapMode ovlMode, DataLabelVisualStyle dstyle)
+        {
+            ChartXy chartXy = series.Parent as ChartXy;
+
+            int start = (pl.IsDataLabel == true)
+                ? pl.Point.X - 1 : series.GetHBarStart(chartXy, pl.SeriesPoint);
+
+            int end = pl.Point.X;
+
+            BarLabelPosition labelPos = pl.BarLabelPosition;
+            
+            if (labelPos == BarLabelPosition.NotSet)
+                labelPos = series.GetBarLabelPosition(chartXy);
+
+            switch (labelPos)
+            {
+                case BarLabelPosition.Near:
+                    SetHBarLabelNear(series, pl, bounds, ovlMode, dstyle, start, end, false);
+                    break;
+
+                case BarLabelPosition.NearInside:
+                    SetHBarLabelNear(series, pl, bounds, ovlMode, dstyle, start, end, true);
+                    break;
+
+                case BarLabelPosition.Far:
+                    SetHBarLabelFar(series, pl, bounds, ovlMode, dstyle, start, end, false);
+                    break;
+
+                case BarLabelPosition.FarInside:
+                    SetHBarLabelFar(series, pl, bounds, ovlMode, dstyle, start, end, true);
+                    break;
+
+                default:
+                    SetHBarLabelCenter(series, pl, bounds, ovlMode, dstyle, start, end);
+                    break;
+            }
+        }
+
+        #region SetHBarLabelNear
+
+        private void SetHBarLabelNear(ChartSeries series, PointLabel pl, Rectangle bounds,
+            DataLabelOverlapMode ovlMode, DataLabelVisualStyle dstyle, int start, int end, bool inside)
+        {
+            ConnectorLineVisualStyle cstyle = dstyle.ConnectorLineStyle;
+
+            Point pt = new Point(start, pl.Point.Y + series.BarOffset);
+
+            Size size = GetBoundsSize(series, pl, dstyle);
+            Rectangle t = Rectangle.Empty;
+
+            int minLength = Dpi.Width(cstyle.MinLength);
+
+            for (int i = 0; i < 2; i++)
+            {
+                int clen = (inside == false && minLength > 0) ? minLength + Dpi.Width2 : Dpi.Width4;
+
+                int step = cstyle.LengthStep;
+                int offset = (size.Width / 2 + clen);
+
+                if (inside ? end < start : end > start)
+                {
+                    step *= -1;
+                    offset *= -1;
+                }
+
+                Point ptc = pt;
+                ptc.X += offset;
+
+                t = GetCenteredRectangle(series, ptc, size);
+
+                while (step < 0 ? t.X > bounds.X : t.Right < bounds.Right)
+                {
+                    if (SetHBarLabelPos(pl, ovlMode, bounds, ptc, t, start, end) == true)
+                        return;
+
+                    if (ovlMode != DataLabelOverlapMode.RotateAroundPoint)
+                        break;
+
+                    t.X += step;
+
+                    if (cstyle.MaxLength > 0)
+                    {
+                        if (Math.Abs(t.X - ptc.X) > cstyle.MaxLength)
+                            break;
+                    }
+                }
+
+                inside = !inside;
+            }
+
+            SetHBarDefaultLabelPos(series, ref pl, pt, t, ovlMode, start, end);
+        }
+
+        #endregion
+
+        #region SetHBarLabelFar
+
+        private void SetHBarLabelFar(ChartSeries series, PointLabel pl, Rectangle bounds,
+            DataLabelOverlapMode ovlMode, DataLabelVisualStyle dstyle, int start, int end, bool inside)
+        {
+            ConnectorLineVisualStyle cstyle = dstyle.ConnectorLineStyle;
+
+            Point pt = new Point(end, pl.Point.Y + series.BarOffset);
+            Size size = GetBoundsSize(series, pl, dstyle);
+
+            Rectangle t = Rectangle.Empty;
+
+            int minLength = Dpi.Width(cstyle.MinLength);
+            
+            for (int i = 0; i < 2; i++)
+            {
+                int clen = (inside == false && minLength >= 0) ? minLength + Dpi.Width2 : Dpi.Width4;
+
+                int step = cstyle.LengthStep;
+                int offset = (size.Width / 2 + clen);
+
+                if (inside ? end > start : end < start)
+                {
+                    step *= -1;
+                    offset *= -1;
+                }
+
+                Point ptc = pt;
+                ptc.X += offset;
+
+                t = GetCenteredRectangle(series, ptc, size);
+
+                while (step < 0 ? t.X > bounds.X : t.Right < bounds.Right)
+                {
+                    if (SetHBarLabelPos(pl, ovlMode, bounds, ptc, t, start, end) == true)
+                        return;
+
+                    if (ovlMode != DataLabelOverlapMode.RotateAroundPoint)
+                        break;
+
+                    t.X += step;
+
+                    if (cstyle.MaxLength > 0)
+                    {
+                        if (Math.Abs(t.X - ptc.X) > cstyle.MaxLength)
+                            break;
+                    }
+                }
+
+                inside = !inside;
+            }
+
+            SetHBarDefaultLabelPos(series, ref pl, pt, t, ovlMode, start, end);
+        }
+
+        #endregion
+
+        #region SetHBarLabelCenter
+
+        private void SetHBarLabelCenter(ChartSeries series, PointLabel pl,
+            Rectangle bounds, DataLabelOverlapMode ovlMode, DataLabelVisualStyle dstyle,
+            int start, int end)
+        {
+            Point pt = new Point((end + start) / 2, pl.Point.Y + series.BarOffset);
+
+            int pass = 0;
+            int step = 2;
+            int startx = pt.X;
+
+            Size size = GetBoundsSize(series, pl, dstyle);
+
+            Rectangle t = GetCenteredRectangle(series, pt, size);
+
+            int len = (end + start) / 2;
+
+            while (pass <= len)
+            {
+                if (SetHBarLabelPos(pl, ovlMode, bounds, pt, t, start, end) == true)
+                    return;
+
+                if (ovlMode != DataLabelOverlapMode.RotateAroundPoint)
+                    break;
+
+                int pval = pass / 2 + 1;
+
+                if (pass % 2 > 0)
+                    pval = -pval;
+
+                t.X = (startx + (pval * step));
+
+                pass++;
+            }
+
+            SetHBarDefaultLabelPos(series, ref pl, pt, t, ovlMode, start, end);
+        }
+
+        #endregion
+
+        #region SetHBarLabelPos
+
+        private bool SetHBarLabelPos(PointLabel pl,
+            DataLabelOverlapMode ovlMode, Rectangle bounds, Point pt, Rectangle t, int start, int end)
+        {
+            if (IsFreeArea(t, bounds, ovlMode, false, true) == true)
+            {
+                pl.Bounds = t;
+
+                SetHBarEdgePoint(pl, pt, t, start, end);
+
+                return (true);
+            }
+
+            if (ovlMode == DataLabelOverlapMode.HideOverlapping)
+                return (true);
+
+            return (false);
+        }
+
+        #endregion
+
+        #region SetHBarDefaultLabelPos
+
+        private void SetHBarDefaultLabelPos(ChartSeries series, ref PointLabel pl,
+            Point pt, Rectangle t, DataLabelOverlapMode ovlMode, int start, int end)
+        {
+            if (ovlMode == DataLabelOverlapMode.RotateAroundPoint)
+            {
+                if (t.X < start)
+                    t.X = start + Dpi.Width4;
+                else
+                    t.X = end - (t.Width + Dpi.Width4);
+
+                ChartXy chartXy = series.Parent as ChartXy;
+
+                Rectangle bounds = chartXy.ContentBoundsEx;
+
+                if (t.Right > bounds.Right)
+                    t.X -= (t.Right - bounds.Right + Dpi.Width4);
+
+                if (t.X < bounds.X)
+                    t.X = bounds.X + Dpi.Width4;
+
+                pl.Bounds = t;
+
+                SetHBarEdgePoint(pl, pt, t, start, end);
+            }
+            else
+            {
+                pl.Bounds = Rectangle.Empty;
+                pl.EdgePoint = Point.Empty;
+            }
+        }
+
+        #endregion
+
+        #region SetHBarEdgePoint
+
+        private void SetHBarEdgePoint(PointLabel pl, Point pt, Rectangle t, int start, int end)
+        {
+            if (t.X > start && t.X > end)
+            {
+                pt.X = Math.Max(start, end);
+                pl.EdgePoint = new Point(t.X, pt.Y);
+            }
+            else if (t.X < start && t.X < end)
+            {
+                pt.X = Math.Min(start, end);
+                pl.EdgePoint = new Point(t.Right, pt.Y);
+            }
+            else
+            {
+                pl.EdgePoint = Point.Empty;
+            }
+
+            pl.Point = pt;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IterateVBar
+
+        private void IterateVBar(ChartSeries series, PointLabel pl,
+            Rectangle bounds, DataLabelOverlapMode ovlMode, DataLabelVisualStyle dstyle)
+        {
+            ChartXy chartXy = series.Parent as ChartXy;
+
+            int start = series.GetVBarStart(chartXy, pl.SeriesPoint);
+            int end = pl.Point.Y;
+
+            BarLabelPosition labelPos = series.GetBarLabelPosition(chartXy);
+
+            switch (labelPos)
+            {
+                case BarLabelPosition.Near:
+                    SetVBarLabelNear(series, pl, bounds, ovlMode, dstyle, start, end, false);
+                    break;
+
+                case BarLabelPosition.NearInside:
+                    SetVBarLabelNear(series, pl, bounds, ovlMode, dstyle, start, end, true);
+                    break;
+
+                case BarLabelPosition.Far:
+                    SetVBarLabelFar(series, pl, bounds, ovlMode, dstyle, start, end, false);
+                    break;
+
+                case BarLabelPosition.FarInside:
+                    SetVBarLabelFar(series, pl, bounds, ovlMode, dstyle, start, end, true);
+                    break;
+
+                default:
+                    SetVBarLabelCenter(series, pl, bounds, ovlMode, dstyle, start, end);
+                    break;
+            }
+        }
+
+        #region SetVBarLabelNear
+
+        private void SetVBarLabelNear(ChartSeries series, PointLabel pl, Rectangle bounds,
+            DataLabelOverlapMode ovlMode, DataLabelVisualStyle dstyle, int start, int end, bool inside)
+        {
+            ConnectorLineVisualStyle cstyle = dstyle.ConnectorLineStyle;
+
+            Point pt = new Point(pl.Point.X + series.BarOffset, start);
+            Size size = GetBoundsSize(series, pl, dstyle);
+
+            int minLength = Dpi.Width(cstyle.MinLength);
+
+            int clen = (inside == false && minLength >= 0) ? minLength + Dpi.Width2 : Dpi.Width4;
+
+            int step = cstyle.LengthStep;
+            int offset = (size.Height / 2 + clen);
+
+            Rectangle t = Rectangle.Empty;
+
+            for (int i = 0; i < 2; i++)
+            {
+                if (inside ? end < start : end > start)
+                {
+                    step *= -1;
+                    offset *= -1;
+                }
+
+                Point ptc = pt;
+                ptc.Y += offset;
+
+                t = GetCenteredRectangle(series, ptc, size);
+
+                while (t.Y < bounds.Bottom)
+                {
+                    if (SetVBarLabelPos(pl, ovlMode, bounds, ptc, t, start, end) == true)
+                        return;
+
+                    if (ovlMode != DataLabelOverlapMode.RotateAroundPoint)
+                        break;
+
+                    t.Y += step;
+
+                    if (cstyle.MaxLength > 0)
+                    {
+                        if (Math.Abs(t.Y - ptc.Y) > cstyle.MaxLength)
+                            break;
+                    }
+                }
+
+                inside = !inside;
+            }
+
+            SetVBarDefaultLabelPos(series, ref pl, pt, t, ovlMode, start, end);
+        }
+
+        #endregion
+
+        #region SetVBarLabelFar
+
+        private void SetVBarLabelFar(ChartSeries series, PointLabel pl, Rectangle bounds,
+            DataLabelOverlapMode ovlMode, DataLabelVisualStyle dstyle, int start, int end, bool inside)
+        {
+            ConnectorLineVisualStyle cstyle = dstyle.ConnectorLineStyle;
+
+            Point pt = new Point(pl.Point.X + series.BarOffset, end);
+            Size size = GetBoundsSize(series, pl, dstyle);
+
+            int minLength = Dpi.Width(cstyle.MinLength);
+
+            Rectangle t = Rectangle.Empty;
+
+            for (int i = 0; i < 2; i++)
+            {
+                int clen = (inside == false && minLength >= 0) ? minLength + Dpi.Width2 : Dpi.Width4;
+
+                int step = cstyle.LengthStep;
+                int offset = (size.Height / 2 + clen);
+
+                if (inside ? end > start : end < start)
+                {
+                    step *= -1;
+                    offset *= -1;
+                }
+
+                Point ptc = pt;
+                ptc.Y += offset;
+
+                t = GetCenteredRectangle(series, ptc, size);
+
+                while (step < 0 ? t.Y > bounds.Y : t.Y < bounds.Bottom)
+                {
+                    if (SetVBarLabelPos(pl, ovlMode, bounds, ptc, t, start, end) == true)
+                        return;
+
+                    if (ovlMode != DataLabelOverlapMode.RotateAroundPoint)
+                        break;
+
+                    t.Y += step;
+
+                    if (cstyle.MaxLength > 0)
+                    {
+                        if (Math.Abs(t.Y - ptc.Y) > cstyle.MaxLength)
+                            break;
+                    }
+                }
+
+                inside = !inside;
+            }
+
+            SetVBarDefaultLabelPos(series, ref pl, pt, t, ovlMode, start, end);
+        }
+
+        #endregion
+
+        #region SetVBarLabelCenter
+
+        private void SetVBarLabelCenter(ChartSeries series, PointLabel pl,
+            Rectangle bounds, DataLabelOverlapMode ovlMode, DataLabelVisualStyle dstyle,
+            int origin, int end)
+        {
+            Point pt = new Point(pl.Point.X + series.BarOffset, (end + origin) / 2);
+
+            int pass = 0;
+            int step = 2;
+            int starty = pt.Y;
+
+            Size size = GetBoundsSize(series, pl, dstyle);
+
+            Rectangle t = GetCenteredRectangle(series, pt, size);
+
+            int len = (end + origin) / 2;
+
+            while (pass <= len)
+            {
+                if (SetVBarLabelPos(pl, ovlMode, bounds, pt, t, origin, end) == true)
+                    return;
+
+                if (ovlMode != DataLabelOverlapMode.RotateAroundPoint)
+                    break;
+
+                int pval = pass / 2 + 1;
+
+                if (pass % 2 > 0)
+                    pval = -pval;
+
+                t.Y = (starty + (pval * step));
+
+                pass++;
+            }
+
+            SetVBarDefaultLabelPos(series, ref pl, pt, t, ovlMode, origin, end);
+        }
+
+        #endregion
+
+        #region SetVBarLabelPos
+
+        private bool SetVBarLabelPos(PointLabel pl,
+            DataLabelOverlapMode ovlMode, Rectangle bounds, Point pt, Rectangle t, int start, int end)
+        {
+            if (IsFreeArea(t, bounds, ovlMode, false, true) == true)
+            {
+                pl.Bounds = t;
+
+                SetVBarEdgePoint(pl, pt, t, start, end);
+
+                return (true);
+            }
+
+            if (ovlMode == DataLabelOverlapMode.HideOverlapping)
+                return (true);
+
+            return (false);
+        }
+
+        #endregion
+
+        #region SetVBarDefaultLabelPos
+
+        private void SetVBarDefaultLabelPos(ChartSeries series, ref PointLabel pl,
+            Point pt, Rectangle t, DataLabelOverlapMode ovlMode, int start, int end)
+        {
+            if (ovlMode == DataLabelOverlapMode.RotateAroundPoint)
+            {
+                if (t.Y > start)
+                    t.Y = start - (t.Height + Dpi.Height4);
+                else
+                    t.Y = end + Dpi.Height4;
+
+                ChartXy chartXy = series.Parent as ChartXy;
+
+                Rectangle bounds = chartXy.ContentBoundsEx;
+
+                if (t.Y > bounds.Bottom)
+                    t.Y -= (t.Bottom - bounds.Bottom + Dpi.Height4);
+
+                if (t.Y < bounds.Y)
+                    t.Y = bounds.Y + Dpi.Height4;
+
+                pl.Bounds = t;
+
+                SetVBarEdgePoint(pl, pt, t, start, end);
+            }
+            else
+            {
+                pl.Bounds = Rectangle.Empty;
+                pl.EdgePoint = Point.Empty;
+            }
+        }
+
+        #endregion
+
+        #region SetVBarEdgePoint
+
+        private void SetVBarEdgePoint(PointLabel pl, Point pt, Rectangle t, int start, int end)
+        {
+            if (t.Y > start && t.Y > end)
+            {
+                pt.Y = Math.Max(start, end);
+                pl.EdgePoint = new Point(pt.X, t.Y);
+            }
+            else if (t.Y < start && t.Y < end)
+            {
+                pt.Y = Math.Min(start, end);
+                pl.EdgePoint = new Point(pt.X, t.Bottom);
+            }
+            else
+            {
+                pl.EdgePoint = Point.Empty;
+            }
+
+            pl.Point = pt;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IteratePoint
+
+        private void IteratePoint(ChartSeries series, PointLabel pl,
+            Rectangle bounds, Point lp, DataLabelOverlapMode ovlMode, DataLabelVisualStyle dstyle)
+        {
+            if ((dstyle.CenterLabel != Tbool.True) ||
+                SetLabelCenter(series, pl, bounds, ovlMode, dstyle) == false)
+            {
+                ConnectorLineVisualStyle cstyle = dstyle.ConnectorLineStyle;
+
+                int step;
+                int startAngle = GetStartAngle(lp, pl, cstyle, out step);
+
+                int offset = 0;
+
+                if (cstyle.Origin == ConnectorOrigin.Edge)
+                {
+                    offset = Math.Max(
+                        pl.SeriesPoint.PointSize.Width,
+                        pl.SeriesPoint.PointSize.Height) / 2;
+                }
+
+                SetLabel(series, pl, startAngle, step,
+                    cstyle.MinLength + offset, cstyle.MaxLength + offset, ovlMode, bounds, dstyle);
+            }
+        }
+
+        #endregion
+
+        #region GetBoundsSize
+
+        private Size GetBoundsSize(
+            ChartSeries series, PointLabel pl, DataLabelVisualStyle dstyle)
+        {
+            RotateDegrees rotate = series.GetRotateDegrees(dstyle);
+
+            Size size = (rotate == RotateDegrees.Rotate90 || rotate == RotateDegrees.Rotate270)
+                ? new Size(pl.LabelSize.Height, pl.LabelSize.Width) : pl.LabelSize;
+
+            if (dstyle.HasBorder == true)
+            {
+                size.Width += (dstyle.BorderThickness << 1);
+                size.Height += (dstyle.BorderThickness << 1);
+            }
+
+            size.Width += dstyle.Padding.Horizontal;
+            size.Height += dstyle.Padding.Vertical;
+
+            return (size);
+        }
+
+        #endregion
+
+        #region SetLabelCenter
+
+        private bool SetLabelCenter(ChartSeries series, PointLabel pl,
+            Rectangle bounds, DataLabelOverlapMode ovlMode, DataLabelVisualStyle dstyle)
+        {
+            Rectangle t = GetCenteredRectangle(series, pl.Point, pl.LabelSize);
+
+            if (IsFreeArea(t, bounds, ovlMode, true, true) == true)
+            {
+                pl.Bounds = t;
+                pl.EdgePoint = new Point(t.Right, t.Bottom);
+
+                return (true);
+            }
+
+            if (ovlMode == DataLabelOverlapMode.HideOverlapping)
+                return (true);
+
+            return (false);
+        }
+
+        #endregion
+
+        #region SetLabel
+
+        private bool SetLabel(ChartSeries series, PointLabel pl, int startAngle, int step,
+            int radius, int maxRadius, DataLabelOverlapMode ovlMode, Rectangle bounds, DataLabelVisualStyle dstyle)
+        {
+            int angle = startAngle;
+            int pass = 0;
+
+            radius = Dpi.Width(radius);
+            maxRadius = Dpi.Width(maxRadius);
+
+            while (radius <= maxRadius)
+            {
+                Point calcPoint;
+                Rectangle r = GetAreaRectangle(series, pl, angle, radius, out calcPoint, dstyle);
+
+                if (IsFreeArea(r, bounds, ovlMode, true, true) == true)
+                {
+                    pl.Angle = angle;
+                    pl.Bounds = r;
+                    pl.EdgePoint = calcPoint;
+
+                    return (true);
+                }
+
+                if (ovlMode != DataLabelOverlapMode.RotateAroundPoint)
+                    break;
+
+                int pval = pass / 2 + 1;
+
+                if (pass % 2 > 0)
+                    pval = -pval;
+
+                angle = (startAngle + (pval * step)) % 360;
+
+                pass++;
+
+                if (pass * step >= 360)
+                {
+                    radius += Dpi.Width15;
+                    pass = 0;
+                }
+            }
+
+            pl.Bounds = Rectangle.Empty;
+            pl.EdgePoint = Point.Empty;
+
+            return (false);
+        }
+
+        #endregion
+
+        #region GetStartAngle
+
+        private int GetStartAngle(Point lp,
+            PointLabel pl, ConnectorLineVisualStyle cstyle, out int step)
+        {
+            step = cstyle.AngleStep;
+
+            if (cstyle.DefaultAngle >= 0)
+                return (cstyle.DefaultAngle);
+
+            Point pt = pl.Point;
+
+            int rise = lp.Y - pt.Y;
+            int run = lp.X - pt.X;
+
+            double slope = (run == 0) ? 0 : (double)rise / run;
+
+            return ((slope < 1) ? 270 : (slope > 0) ? 315 : 225);
+        }
+
+        #endregion
+
+        #region GetCenteredRectangle
+
+        private Rectangle GetCenteredRectangle(
+            ChartSeries series, Point pt, Size labelSize)
+        {
+            Rectangle r = new Rectangle(pt, labelSize);
+
+            r.X -= (r.Width / 2);
+            r.Y -= (r.Height / 2);
+
+            return (r);
+        }
+
+        #endregion
+
+        #region GetAreaRectangle
+
+        private Rectangle GetAreaRectangle(ChartSeries series, PointLabel pl,
+            int angle, int radius, out Point calcPoint, DataLabelVisualStyle dstyle)
+        {
+            Rectangle r = new Rectangle(pl.Point, pl.LabelSize);
+
+            RotateDegrees rotate = series.GetRotateDegrees(dstyle);
+
+            if (rotate == RotateDegrees.Rotate90 || rotate == RotateDegrees.Rotate270)
+            {
+                r.Width = pl.LabelSize.Height;
+                r.Height = pl.LabelSize.Width;
+            }
+
+            if (dstyle.HasBorder == true)
+            {
+                int n = Dpi.Width(dstyle.BorderThickness) << 1;
+
+                r.Width += n;
+                r.Height += n;
+            }
+
+            r.Width += Dpi.Width(dstyle.Padding.Horizontal);
+            r.Height += Dpi.Height(dstyle.Padding.Vertical);
+
+            r.X += (int)(radius * Math.Cos(MathHelper.ToRadians(angle)));
+            r.Y += (int)(radius * Math.Sin(MathHelper.ToRadians(angle)));
+
+            calcPoint = r.Location;
+
+            return (OffsetAreaRectangle(r, angle, ref calcPoint, dstyle));
+        }
+
+        #region OffsetAreaRectangle
+
+        private Rectangle OffsetAreaRectangle(Rectangle r,
+            int angle, ref Point calcPoint, DataLabelVisualStyle dstyle)
+        {
+            if (angle == 0)
+            {
+                r.Y -= (r.Height / 2);
+            }
+            else if (angle == 90)
+            {
+                r.X -= (r.Width / 2);
+            }
+            else if (angle == 180)
+            {
+                r.X -= r.Width;
+                r.Y -= (r.Height / 2);
+            }
+            else if (angle == 270)
+            {
+                r.X -= (r.Width / 2);
+                r.Y -= r.Height;
+            }
+            else if (angle < 90)
+            {
+            }
+            else if (angle < 180)
+            {
+                r.X -= r.Width;
+            }
+            else if (angle < 270)
+            {
+                r.X -= r.Width;
+                r.Y -= r.Height;
+            }
+            else
+            {
+                r.Y -= r.Height;
+            }
+
+            return (r);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IsFreeArea
+
+        private bool IsFreeArea(
+            Rectangle r, Rectangle bounds, DataLabelOverlapMode ovlMode, bool xos, bool yos)
+        {
+            if (xos == true)
+            {
+                if (r.X < bounds.X || r.Right > bounds.Right)
+                    return (false);
+            }
+
+            if (yos == true)
+            {
+                if (r.Y < bounds.Y || r.Bottom > bounds.Bottom)
+                    return (false);
+            }
+
+            if (ovlMode == DataLabelOverlapMode.ShowOverlapping)
+                return (true);
+
+            r.Inflate(3, 3);
+
+            for (int i = 0; i < _LabelGroups.Count; i++)
+            {
+                List<PointLabel> lps = _LabelGroups[i].PointLabels;
+
+                for (int j = 0; j < lps.Count; j++)
+                {
+                    PointLabel pl = lps[j];
+
+                    if (pl.Bounds.IsEmpty == false)
+                    {
+                        if (pl.Bounds.IntersectsWith(r) == true)
+                            return (false);
+                    }
+                }
+            }
+
+            return (true);
+        }
+
+        #endregion
+
+        #endregion
+    }
+}
+
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/XyChart/PointLabel.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/XyChart/PointLabel.cs
new file mode 100644
index 00000000..36fa40f4
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/XyChart/PointLabel.cs	
@@ -0,0 +1,351 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using DevComponents.DotNetBar.Charts.Style;
+
+namespace DevComponents.DotNetBar.Charts
+{
+    /// <summary>
+    /// Represents a PointLabel group.
+    /// </summary>
+    public class PointLabelGroup
+    {
+        #region Private data
+
+        private ChartSeries _ChartSeries;
+        private List<PointLabel> _PointLabels;
+
+        #endregion
+
+        public PointLabelGroup(ChartSeries chartSeries, List<PointLabel> pointLabels)
+        {
+            _ChartSeries = chartSeries;
+            _PointLabels = pointLabels;
+        }
+
+        #region Public properties
+
+        #region ChartSeries
+
+        /// <summary>
+        /// Gets or sets the associated chart series.
+        /// </summary>
+        public ChartSeries ChartSeries
+        {
+            get { return (_ChartSeries); }
+            set { _ChartSeries = value; }
+        }
+
+        #endregion
+
+        #region PointLabels
+
+        /// <summary>
+        /// Gets or sets the associated list of PointLabels.
+        /// </summary>
+        public List<PointLabel> PointLabels
+        {
+            get { return (_PointLabels); }
+            set { _PointLabels = value; }
+        }
+
+        #endregion
+
+        #endregion
+    }
+
+    /// <summary>
+    /// Represents a PointLabel (label associated with a data point in the chart).
+    /// </summary>
+    public class PointLabel : IDisposable
+    {
+        #region Private data
+
+        private SeriesPoint _SeriesPoint;
+
+        private float _Angle;
+        private Rectangle _Bounds;
+        private Point _EdgePoint;
+        private Point _Point;
+
+        private string _Label;
+        private Size _LabelSize;
+
+        private BarLabelPosition _BarLabelPosition = BarLabelPosition.NotSet;
+
+        private DataLabelVisualStyle _DataLabelVisualStyle;
+
+        private States _States;
+
+        #endregion
+
+        public PointLabel(SeriesPoint sp, Point pt, string label)
+        {
+            _SeriesPoint = sp;
+            _Point = pt;
+            _Label = label;
+
+            InitDefaultStates();
+        }
+
+        #region InitDefaultStates
+
+        private void InitDefaultStates()
+        {
+            SetState(States.Visible, true);
+            SetState(States.NeedsMeasured, true);
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region Angle
+
+        /// <summary>
+        /// Gets the angle used to display the point label 
+        /// associated with the data point.
+        /// </summary>
+        public float Angle
+        {
+            get { return (_Angle); }
+            internal set { _Angle = value; }
+        }
+
+        #endregion
+
+        #region BarLabelPosition
+
+        /// <summary>
+        /// Gets or sets the position of bar series labels.
+        /// </summary>
+        [Description("Indicates the position of bar series labels.")]
+        public BarLabelPosition BarLabelPosition
+        {
+            get { return (_BarLabelPosition); }
+            set { _BarLabelPosition = value; }
+        }
+
+        #endregion
+
+        #region DataLabelVisualStyle
+
+        /// <summary>
+        /// Gets or sets the visual style for the data label.
+        /// </summary>
+        public DataLabelVisualStyle DataLabelVisualStyle
+        {
+            get { return (_DataLabelVisualStyle); }
+
+            set
+            {
+                if (value != _DataLabelVisualStyle)
+                {
+                    DataLabelVisualStyle oldValue = _DataLabelVisualStyle;
+
+                    _DataLabelVisualStyle = value;
+
+                    StyleVisualChangeHandler(oldValue, value);
+                }
+            }
+        }
+
+        #endregion
+
+        #region FixedSize
+
+        /// <summary>
+        /// Gets or set whether the LabelSize is a fixed size.
+        /// </summary>
+        public bool IsFixedSize
+        {
+            get { return (TestState(States.IsFixedSize)); }
+            set { SetState(States.IsFixedSize, value); }
+        }
+
+        #endregion
+
+        #region Label
+
+        /// <summary>
+        /// Gets or sets the label text
+        /// </summary>
+        public string Label
+        {
+            get { return (_Label); }
+
+            set
+            {
+                NeedsMeasured = true;
+
+                _Label = value;
+            }
+        }
+
+        #endregion
+
+        #region LabelSize
+
+        /// <summary>
+        /// Gets or sets the label size.
+        /// </summary>
+        public Size LabelSize
+        {
+            get { return (_LabelSize); }
+
+            set
+            {
+                _LabelSize = value;
+
+                NeedsMeasured = false;
+            }
+        }
+
+        #endregion
+
+        #region SeriesPoint
+
+        /// <summary>
+        /// Gets the associated SeriesPoint.
+        /// </summary>
+        public SeriesPoint SeriesPoint
+        {
+            get { return (_SeriesPoint); }
+            internal set { _SeriesPoint = value; }
+        }
+
+        #endregion
+
+        #region Visible
+
+        /// <summary>
+        /// Gets or sets whether the label is visible.
+        /// </summary>
+        public bool Visible
+        {
+            get { return (TestState(States.Visible)); }
+            set { SetState(States.Visible, value); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region Bounds
+
+        internal Rectangle Bounds
+        {
+            get { return (_Bounds); }
+            set { _Bounds = value; }
+        }
+
+        #endregion
+
+        #region EdgePoint
+
+        internal Point EdgePoint
+        {
+            get { return (_EdgePoint); }
+            set { _EdgePoint = value; }
+        }
+
+        #endregion
+
+        #region IsDataLabel
+
+        internal bool IsDataLabel
+        {
+            get { return (TestState(States.IsDataLabel)); }
+            set { SetState(States.IsDataLabel, value); }
+        }
+
+        #endregion
+
+        #region NeedsMeasured
+
+        internal bool NeedsMeasured
+        {
+            get { return (TestState(States.NeedsMeasured)); }
+            set { SetState(States.NeedsMeasured, value); }
+        }
+
+        #endregion
+
+        #region Point
+
+        internal Point Point
+        {
+            get { return (_Point); }
+            set { _Point = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region States
+
+        [Flags]
+        private enum States : uint
+        {
+            IsFixedSize = (1U << 0),
+            NeedsMeasured = (1U << 1),
+            Visible = (1U << 2),
+            IsDataLabel = (1U << 3),
+        }
+
+        #region TestState
+
+        private bool TestState(States state)
+        {
+            return ((_States & state) == state);
+        }
+
+        #endregion
+
+        #region SetState
+
+        private void SetState(States state, bool value)
+        {
+            if (value == true)
+                _States |= state;
+            else
+                _States &= ~state;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region StyleVisualChangeHandler
+
+        private void StyleVisualChangeHandler(
+            INotifyPropertyChanged oldValue, INotifyPropertyChanged newValue)
+        {
+            if (oldValue != null)
+                oldValue.PropertyChanged -= StyleChanged;
+
+            if (newValue != null)
+                newValue.PropertyChanged += StyleChanged;
+        }
+
+        private void StyleChanged(object sender, PropertyChangedEventArgs e)
+        {
+            NeedsMeasured = true;
+        }
+
+        #endregion
+
+        #region IDisposable
+
+        public void Dispose()
+        {
+            DataLabelVisualStyle = null;
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/XyChart/PointMarker.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/XyChart/PointMarker.cs
new file mode 100644
index 00000000..0decf0d3
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/XyChart/PointMarker.cs	
@@ -0,0 +1,565 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Text;
+using DevComponents.DotNetBar.Charts.Style;
+
+namespace DevComponents.DotNetBar.Charts
+{
+    internal class PointMarker : IDisposable
+    {
+        #region Private variables
+
+        private List<BitmapEntry> _Bitmaps = new List<BitmapEntry>();
+
+        #endregion
+
+        #region GetMarkerBitmap
+
+        public Bitmap GetMarkerBitmap(Graphics g, PointMarkerType markerType, int markerPoints, 
+            Size size, int markerRotation, Background background, Color borderColor, int borderWidth)
+        {
+            if (markerType == PointMarkerType.None || markerType == PointMarkerType.NotSet)
+                return (null);
+
+            if (markerType == PointMarkerType.Cross ||
+                background == null || background.IsEmpty)
+            {
+                if (borderColor.IsEmpty)
+                    borderColor = Color.Black;
+            }
+
+            // Add margin to permit better antialiasing of image
+
+            size.Width++;
+            size.Height++;
+
+            Bitmap bitmap = null;
+
+            bitmap = FindBitmap(markerType, markerPoints,
+                size, markerRotation, background, borderColor, borderWidth);
+
+            if (bitmap == null)
+            {
+                size.Width = Math.Max(size.Width, 3);
+                size.Height = Math.Max(size.Height, 3);
+
+                Rectangle r = new Rectangle(Point.Empty, size);
+
+                using (GraphicsPath path =
+                    GetMarkerPath(markerType, markerPoints, markerRotation, r, borderWidth))
+                {
+                    if (path != null)
+                    {
+                        bitmap = new Bitmap(size.Width, size.Height, g);
+
+                        using (Graphics gBmp = Graphics.FromImage(bitmap))
+                        {
+                            gBmp.SmoothingMode = SmoothingMode.AntiAlias;
+
+                            FillMarkerPath(gBmp, path, r, markerType, background, borderColor, borderWidth);
+
+                            if (markerRotation != 0 && markerRotation != -1)
+                            {
+                                Bitmap bitmap2 = RotatePic(bitmap, markerRotation);
+
+                                bitmap.Dispose();
+
+                                bitmap = bitmap2;
+                            }
+
+                            _Bitmaps.Add(new BitmapEntry(markerType, size, markerPoints,
+                                markerRotation, background, borderColor, borderWidth, bitmap));
+                        }
+                    }
+                }
+            }
+
+            return (bitmap);
+        }
+
+        #endregion
+
+        #region FindBitmap
+
+        public Bitmap FindBitmap(PointMarkerType markerType, int markerPoints,
+            Size size, int markerRotation, Background background, Color borderColor, int borderWidth)
+        {
+            foreach (BitmapEntry entry in _Bitmaps)
+            {
+                if (entry.MarkerType == markerType &&
+                    entry.MarkerPoints == markerPoints &&
+                    entry.MarkerRotation == markerRotation &&
+                    entry.MarkerSize.Equals(size) &&
+                    entry.BorderWidth == borderWidth &&
+                    entry.BorderColor.Equals(borderColor) &&
+                    entry.Background.IsEqualTo(background))
+                {
+                    return (entry.Bitmap);
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetMarkerPath
+
+        internal GraphicsPath GetMarkerPath( PointMarkerType markerType,
+            int markerPoints, int markerRotation, Rectangle r, int borderWidth)
+        {
+            r.Inflate(-borderWidth, -borderWidth);
+
+            if (r.Width > 0 && r.Height > 0)
+            {
+                switch (markerType)
+                {
+                    case PointMarkerType.Ellipse:
+                        return (GetCirclePath(r));
+
+                    case PointMarkerType.Cross:
+                        return (GetCrossPath(r, markerPoints));
+
+                    case PointMarkerType.Diamond:
+                        return (GetDiamondPath(r));
+
+                    case PointMarkerType.Rectangle:
+                        return (GetRectanglePath(r));
+
+                    case PointMarkerType.Star:
+                        return (GetStarPath(r, markerPoints));
+
+                    case PointMarkerType.Triangle:
+                        return (GetTrianglePath(r));
+
+                    default:
+                        return (GetPolygonPath(r, markerPoints));
+                }
+            }
+
+            return (null);
+        }
+
+        #region GetCirclePath
+
+        private GraphicsPath GetCirclePath(Rectangle r)
+        {
+            GraphicsPath path = new GraphicsPath();
+
+            path.AddEllipse(r);
+
+            return (path);
+        }
+
+        #endregion
+
+        #region GetCrossPath
+
+        private GraphicsPath GetCrossPath(Rectangle r, int points)
+        {
+            GraphicsPath path = new GraphicsPath();
+
+            PointF[] pts = new PointF[2 * points];
+
+            double rx1 = r.Width / 2;
+            double ry1 = r.Height / 2;
+
+            if (rx1 < 2)
+                rx1 = 2;
+
+            if (ry1 < 2)
+                ry1 = 2;
+
+            double cx = r.X + rx1;
+            double cy = r.Y + ry1;
+
+            double theta = MathHelper.ToRadians(270);
+            double dtheta = Math.PI / points;
+
+            for (int i = 0; i < 2 * points; i += 2)
+            {
+                pts[i] = new PointF(
+                    (float)(cx + rx1 * Math.Cos(theta)),
+                    (float)(cy + ry1 * Math.Sin(theta)));
+
+                pts[i + 1] = new PointF((float)cx, (float)cy);
+
+                theta += (dtheta * 2);
+            }
+
+            path.AddPolygon(pts);
+
+            path.CloseAllFigures();
+
+            return (path);
+        }
+
+        #endregion
+
+        #region GetDiamondPath
+
+        private GraphicsPath GetDiamondPath(Rectangle r)
+        {
+            GraphicsPath path = new GraphicsPath();
+
+            int dx = r.Width / 2;
+            int dy = r.Height / 2;
+
+            int mx = r.X + dx;
+            int my = r.Y + dy;
+
+            Point[] pts =
+            {
+                new Point(mx, my - dy), 
+                new Point(mx + dx, my),
+                new Point(mx, my + dy),
+                new Point(mx - dx, my),
+            };
+
+            path.AddPolygon(pts);
+
+            path.CloseAllFigures();
+
+            return (path);
+        }
+
+        #endregion
+
+        #region GetPolygonPath
+
+        private GraphicsPath GetPolygonPath(Rectangle r, int sides)
+        {
+            if (sides <= 4)
+                return (GetRectanglePath(r));
+
+            GraphicsPath path = new GraphicsPath();
+
+            int radius = Math.Min(r.Width, r.Height);
+
+            float dx = (float)radius / 2;
+            float radians = (float)MathHelper.ToRadians(270);
+            float delta = (float)MathHelper.ToRadians((float)360 / sides);
+
+            Point[] pts = new Point[sides];
+
+            for (int i = 0; i < sides; i++)
+            {
+                pts[i] = new Point(
+                    (int)(dx * Math.Cos(radians) + dx + r.X),
+                    (int)(dx * Math.Sin(radians) + dx + r.Y));
+
+                radians += delta;
+            }
+
+            path.AddPolygon(pts);
+
+            path.CloseAllFigures();
+
+            if (r.Width != r.Height)
+            {
+                PointF[] dp = 
+                { 
+                    new PointF(0, 0), 
+                    new PointF(r.Width, 0), 
+                    new PointF(0, r.Height),
+                };
+
+                path.Warp(dp, new RectangleF(0, 0, radius, radius));
+            }
+
+            return (path);
+        }
+
+        #endregion
+
+        #region GetRectanglePath
+
+        private GraphicsPath GetRectanglePath(Rectangle r)
+        {
+            GraphicsPath path = new GraphicsPath();
+
+            path.AddRectangle(r);
+
+            return (path);
+        }
+        
+        #endregion
+
+        #region GetStarPath
+
+        private GraphicsPath GetStarPath(Rectangle r, int points)
+        {
+            if (points < 2)
+                points = 2;
+
+            GraphicsPath path = new GraphicsPath();
+
+            PointF[] pts = new PointF[2 * points];
+
+            double rx1 = r.Width / 2;
+            double ry1 = r.Height / 2;
+
+            if (rx1 < 2)
+                rx1 = 2;
+
+            if (ry1 < 2)
+                ry1 = 2;
+
+            double rx2 = rx1 / 2;
+            double ry2 = ry1 / 2;
+
+            double cx = r.X + rx1;
+            double cy = r.Y + ry1;
+
+            double theta = MathHelper.ToRadians(270);
+            double dtheta = Math.PI / points;
+
+            for (int i = 0; i < 2 * points; i += 2)
+            {
+                pts[i] = new PointF(
+                    (float)(cx + rx1 * Math.Cos(theta)),
+                    (float)(cy + ry1 * Math.Sin(theta)));
+
+                theta += dtheta;
+
+                pts[i + 1] = new PointF(
+                    (float)(cx + rx2 * Math.Cos(theta)),
+                    (float)(cy + ry2 * Math.Sin(theta)));
+
+                theta += dtheta;
+            }
+
+            path.AddPolygon(pts);
+
+            path.CloseAllFigures();
+
+            return (path);
+        }
+
+        #endregion
+
+        #region GetTrianglePath
+
+        private GraphicsPath GetTrianglePath(Rectangle r)
+        {
+            // Equal height and width will not be adjusted to make
+            // an equalaterial triangle - thus rotation will skew image.
+
+            GraphicsPath path = new GraphicsPath();
+
+            int dx = r.Width / 2;
+            int dy = r.Height / 2;
+
+            Point[] pts = {
+                new Point(r.X + dx, r.Y), 
+                new Point(r.X , r.Y + dy * 2),
+                new Point(r.X + dx * 2, r.Y + dy * 2),
+            };
+
+            path.AddPolygon(pts);
+
+            path.CloseAllFigures();
+
+            return (path);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region FillMarkerPath
+
+        internal void FillMarkerPath(Graphics g, GraphicsPath path, Rectangle r, 
+            PointMarkerType markerType, Background background, Color borderColor, int borderWidth)
+        {
+            if (markerType != PointMarkerType.Cross)
+            {
+                BackFillType fillType = GetMarkerFillType(markerType, background);
+
+                using (Brush br = background.GetBrush(r, -1, fillType))
+                    g.FillPath(br, path);
+            }
+
+            if (borderColor.IsEmpty == false && borderWidth > 0)
+            {
+                using (Pen pen = new Pen(borderColor, borderWidth))
+                    g.DrawPath(pen, path);
+            }
+        }
+
+        #region GetMarkerFillType
+
+        private BackFillType GetMarkerFillType(PointMarkerType markerType, Background background)
+        {
+            if (background.Color2.IsEmpty == true)
+                return (BackFillType.None);
+
+            if (background.BackFillType == BackFillType.Auto)
+            {
+                switch (markerType)
+                {
+                    case PointMarkerType.Ellipse:
+                    case PointMarkerType.Star:
+                        return (BackFillType.Center);
+
+                    default:
+                        return (BackFillType.VerticalCenter);
+                }
+            }
+
+            return (background.BackFillType);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RotatePic
+
+        private Bitmap RotatePic(Bitmap obmp, float angle)
+        {
+            float rad = (float)MathHelper.ToRadians(angle);
+
+            double fW = Math.Abs((Math.Cos(rad) * obmp.Width)) + Math.Abs((Math.Sin(rad) * obmp.Height));
+            double fH = Math.Abs((Math.Sin(rad) * obmp.Width)) + Math.Abs((Math.Cos(rad) * obmp.Height));
+
+            Bitmap nbmp = new Bitmap((int)Math.Ceiling(fW), (int)Math.Ceiling(fH));
+
+            using (Graphics g = Graphics.FromImage(nbmp))
+            {
+                g.SmoothingMode = SmoothingMode.AntiAlias;
+                g.InterpolationMode = InterpolationMode.HighQualityBicubic;
+
+                float hw = nbmp.Width / 2f;
+                float hh = nbmp.Height / 2f;
+
+                Matrix m = g.Transform;
+
+                m.RotateAt(angle, new PointF(hw, hh), MatrixOrder.Append);
+
+                g.Transform = m;
+
+                g.DrawImage(obmp, new PointF((float)((nbmp.Width - obmp.Width) / 2), (float)((nbmp.Height - obmp.Height) / 2)));
+            }
+
+            return nbmp;
+        }
+
+        #endregion
+
+        #region Clear
+
+        public void Clear()
+        {
+            foreach (BitmapEntry entry in _Bitmaps)
+            {
+                entry.Background.Dispose();
+                entry.Bitmap.Dispose();
+            }
+
+            _Bitmaps.Clear();
+        }
+
+        #endregion
+
+        #region IDisposable Members
+
+        public void Dispose()
+        {
+            Clear();
+        }
+
+        #endregion
+
+        #region BitmapEntry
+
+        private class BitmapEntry
+        {
+            public PointMarkerType MarkerType;
+            public Size MarkerSize;
+            public int MarkerPoints;
+            public int MarkerRotation;
+
+            public Background Background;
+            public Color BorderColor;
+            public int BorderWidth;
+
+            public Bitmap Bitmap;
+
+            public BitmapEntry(PointMarkerType markerType, Size markerSize, int markerPoints,
+                int markerRotation, Background background, Color borderColor, int borderWidth, Bitmap bitmap)
+            {
+                MarkerType = markerType;
+                MarkerSize = markerSize;
+                MarkerPoints = markerPoints;
+                MarkerRotation = markerRotation;
+
+                Background = background.Copy();
+                BorderColor = borderColor;
+                BorderWidth = borderWidth;
+
+                Bitmap = bitmap;
+            }
+        }
+
+        #endregion
+    }
+
+    #region enums
+
+    #region PointMarkerType
+
+    public enum PointMarkerType
+    {
+        /// <summary>
+        /// Type not set.
+        /// </summary>
+        NotSet = -1,
+
+        /// <summary>
+        /// No Marker
+        /// </summary>
+        None,
+
+        /// <summary>
+        /// Cross
+        /// </summary>
+        Cross,
+
+        /// <summary>
+        /// Diamond
+        /// </summary>
+        Diamond,
+
+        /// <summary>
+        /// Ellipse
+        /// </summary>
+        Ellipse,
+
+        /// <summary>
+        /// Polygon (Pentagon, Hexagon, etc)
+        /// </summary>
+        Polygon,
+
+        /// <summary>
+        /// Rectangle
+        /// </summary>
+        Rectangle,
+
+        /// <summary>
+        /// Star
+        /// </summary>
+        Star,
+
+        /// <summary>
+        /// Triangle
+        /// </summary>
+        Triangle,
+    }
+
+    #endregion
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/XyChart/ReferenceLine.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/XyChart/ReferenceLine.cs
new file mode 100644
index 00000000..c803421b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartControl/XyChart/ReferenceLine.cs	
@@ -0,0 +1,1599 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Drawing.Drawing2D;
+using System.Windows.Forms;
+using DevComponents.Charts.TextMarkup;
+using DevComponents.DotNetBar.Charts.Style;
+
+namespace DevComponents.DotNetBar.Charts
+{
+    /// <summary>
+    /// Represents the collection of ReferenceLines.
+    /// </summary>
+    [Editor("DevComponents.Charts.Design.AxisReferenceCollectionEditor, DevComponents.Charts.Design, " +
+            "Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(UITypeEditor))]
+    public class ReferenceLineCollection : CustomNamedCollection<ReferenceLine>
+    {
+        #region GetUniqueName
+
+        /// <summary>
+        /// Gets a unique (unused) reference line Name.
+        /// </summary>
+        /// <returns></returns>
+        public string GetUniqueName()
+        {
+            return (GetUniqueName("RefLine"));
+        }
+
+        #endregion
+    }
+
+    /// <summary>
+    /// Represents a reference line (a vertical or horizontal line on the chart
+    /// that can be used to signify, or reference, a specific axis/chart value).
+    /// </summary>
+    public class ReferenceLine : ChartVisualElement, ILegendItem
+    {
+        #region Private variables
+
+        private States _States;
+
+        private object _AxisValue;
+
+        private string _Text;
+        private Size _TextSize;
+        private BodyElement _TextMarkup;
+
+        private Rectangle _LineBounds;
+        private int _MaxLineCount = 3;
+
+        private ReferenceLineVisualStyle _ReferenceLineVisualStyle;
+        private EffectiveStyle<ReferenceLineVisualStyle> _EffectiveStyle;
+
+        private string _LegendText;
+        private ChartLegendItem _LegendItem;
+        private ChartLegendItemVisualStyles _ChartLegendItemVisualStyles;
+
+        #endregion
+
+        #region Constructors
+
+        /// <summary>
+        /// ReferenceLine
+        /// </summary>
+        public ReferenceLine()
+        {
+            InitDefaultStates();
+
+            _EffectiveStyle = new EffectiveStyle<ReferenceLineVisualStyle>(this);
+        }
+
+        /// <summary>
+        /// ReferenceLine
+        /// </summary>
+        /// <param name="name"></param>
+        public ReferenceLine(string name)
+            : this()
+        {
+            Name = name;
+        }
+
+        /// <summary>
+        /// ReferenceLine
+        /// </summary>
+        /// <param name="name"></param>
+        /// <param name="axisValue"></param>
+        public ReferenceLine(string name, object axisValue)
+            : this(name)
+        {
+            AxisValue = axisValue;
+        }
+
+        /// <summary>
+        /// ReferenceLine
+        /// </summary>
+        /// <param name="name"></param>
+        /// <param name="axisValue"></param>
+        public ReferenceLine(string name, object axisValue, string text)
+            : this(name, axisValue)
+        {
+            Text = text;
+        }
+
+        #endregion
+
+        #region InitDefaultStates
+
+        private void InitDefaultStates()
+        {
+            SetState(States.CheckedInLegend, true);
+            SetState(States.ShowInLegend, true);
+            SetState(States.ShowInParentLegend, true);
+            SetState(States.ShowCheckBoxInLegend, true);
+            SetState(States.ShowMarkerInLegend, true);
+            SetState(States.DisplayTextOnTop, true);
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region AxisValue
+
+        ///<summary>
+        /// Gets or sets the associated axis value of the reference line.
+        ///</summary>
+        [DefaultValue(null), Category("Appearance")]
+        [Description("Indicates the associated axis value of the reference line.")]
+        [TypeConverter("DevComponents.Charts.Design.PointValueConverter," +
+            "DevComponents.Charts.Design, Version=14.1.0.37, Culture=neutral, PublicKeyToken=90f470f34c89ccaf")]
+        public object AxisValue
+        {
+            get { return (_AxisValue); }
+
+            set
+            {
+                if (value != _AxisValue)
+                {
+                    _AxisValue = value;
+
+                    if (_LegendItem != null)
+                    {
+                        if (string.IsNullOrEmpty(Name) && string.IsNullOrEmpty(LegendText))
+                        {
+                            ChartAxis axis = Parent as ChartAxis;
+
+                            _LegendItem.ItemText = axis.AxisOrientation + "-Axis: " + AxisValue;
+                        }
+                    }
+
+                    OnPropertyChangedEx("AxisValue", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region DisplayLineOnTop
+
+        /// <summary>
+        /// Gets or sets whether the reference line is displayed on top of chart data.
+        /// </summary>
+        [DefaultValue(false), Category("Appearance")]
+        [Description("Indicates whether the reference line is displayed on top of chart data.")]
+        public bool DisplayLineOnTop
+        {
+            get { return (TestState(States.DisplayLineOnTop)); }
+
+            set
+            {
+                if (value != DisplayLineOnTop)
+                {
+                    SetState(States.DisplayLineOnTop, value);
+
+                    OnPropertyChangedEx("DisplayLineOnTop", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region DisplayTextOnTop
+
+        /// <summary>
+        /// Gets or sets whether the reference text is displayed on top of chart data.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance")]
+        [Description("Indicates whether the reference text is displayed on top of chart data.")]
+        public bool DisplayTextOnTop
+        {
+            get { return (TestState(States.DisplayTextOnTop)); }
+
+            set
+            {
+                if (value != DisplayTextOnTop)
+                {
+                    SetState(States.DisplayTextOnTop, value);
+
+                    OnPropertyChangedEx("DisplayTextOnTop", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region EffectiveStyle
+
+        /// <summary>
+        /// Gets a reference to the ReferenceLine's Effective (cached, composite) style.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public ReferenceLineVisualStyle EffectiveStyle
+        {
+            get { return (_EffectiveStyle.Style); }
+        }
+
+        #endregion
+
+        #region EnableTextMarkup
+
+        /// <summary>
+        /// Gets or sets whether text-markup support is enabled for the reference line text
+        /// </summary>
+        [DefaultValue(false), Category("Appearance")]
+        [Description("Indicates whether text-markup support is enabled for the reference line text.")]
+        public bool EnableTextMarkup
+        {
+            get { return (TestState(States.EnableTextMarkup)); }
+
+            set
+            {
+                if (EnableTextMarkup != value)
+                {
+                    SetState(States.EnableTextMarkup, value);
+
+                    MarkupTextChanged();
+
+                    OnPropertyChangedEx("EnableTextMarkup", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #region MarkupTextChanged
+
+        private void MarkupTextChanged()
+        {
+            if (_TextMarkup != null)
+                _TextMarkup.HyperLinkClick -= TextMarkupLinkClick;
+
+            _TextMarkup = null;
+
+            if (EnableTextMarkup == true)
+            {
+                if (MarkupParser.IsMarkup(_Text) == true)
+                {
+                    _TextMarkup = MarkupParser.Parse(_Text);
+
+                    if (_TextMarkup != null)
+                        _TextMarkup.HyperLinkClick += TextMarkupLinkClick;
+                }
+            }
+        }
+
+        #endregion
+
+        #region TextMarkupLinkClick
+
+        /// <summary>
+        /// Occurs when a text markup link is clicked
+        /// </summary>
+        protected virtual void TextMarkupLinkClick(object sender, EventArgs e)
+        {
+            HyperLink link = sender as HyperLink;
+
+            if (link != null)
+                ChartControl.DoReferenceLineMarkupLinkClickEvent(this, link);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InvertVerticalText
+
+        /// <summary>
+        /// Gets or sets whether vertical reference text is inverted.
+        /// </summary>
+        [DefaultValue(false), Category("Appearance")]
+        [Description("Indicates whether vertical reference text is inverted.")]
+        public bool InvertVerticalText
+        {
+            get { return (TestState(States.InvertVerticalText)); }
+
+            set
+            {
+                if (value != InvertVerticalText)
+                {
+                    SetState(States.InvertVerticalText, value);
+
+                    OnPropertyChangedEx("InvertVerticalText", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region MaxLineCount
+
+        /// <summary>
+        /// Gets or sets the maximum number of Text lines.
+        /// </summary>
+        [DefaultValue(3), Category("Layout")]
+        [Description("Indicates the maximum number of Text lines.")]
+        public int MaxLineCount
+        {
+            get { return (_MaxLineCount); }
+
+            set
+            {
+                if (value != _MaxLineCount)
+                {
+                    _MaxLineCount = value;
+
+                    OnPropertyChangedEx("MaxLineCount", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region PlainText
+
+        /// <summary>
+        /// Gets text without text-markup (if text-markup is used in Text)
+        /// </summary>
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public string PlainText
+        {
+            get { return (_TextMarkup != null ? _TextMarkup.PlainText : _Text); }
+        }
+
+        #endregion
+
+        #region ReferenceLineVisualStyle
+
+        /// <summary>
+        /// Gets or sets the visual style for the ReferenceLine.
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates the visual style for the ReferenceLine.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ReferenceLineVisualStyle ReferenceLineVisualStyle
+        {
+            get
+            {
+                if (_ReferenceLineVisualStyle == null)
+                {
+                    _ReferenceLineVisualStyle = new ReferenceLineVisualStyle();
+
+                    StyleVisualChangeHandler(null, _ReferenceLineVisualStyle);
+                }
+
+                return (_ReferenceLineVisualStyle);
+            }
+
+            set
+            {
+                if (_ReferenceLineVisualStyle != value)
+                {
+                    ReferenceLineVisualStyle oldValue = _ReferenceLineVisualStyle;
+
+                    _ReferenceLineVisualStyle = value;
+
+                    OnVisualStyleChanged("ReferenceLineVisualStyle", oldValue, value);
+
+                    if (oldValue != null)
+                        oldValue.Dispose();
+                }
+            }
+        }
+
+        #endregion
+
+        #region Text
+
+        ///<summary>
+        /// Gets or sets the ReferenceLine Text.
+        ///</summary>
+        [DefaultValue(null), Category("Layout")]
+        [Description("Indicates the ReferenceLine Text.")]
+        public string Text
+        {
+            get { return (_Text); }
+
+            set
+            {
+                if (value != _Text)
+                {
+                    _Text = value;
+
+                    MarkupTextChanged();
+
+                    OnPropertyChangedEx("Text", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region LineBounds
+
+        internal Rectangle LineBounds
+        {
+            get
+            {
+                if (_LineBounds.IsEmpty == true)
+                    _LineBounds = GetLineBounds();
+
+                return (_LineBounds);
+            }
+
+            set { _LineBounds = value; }
+        }
+
+        #endregion
+
+        #region TextMarkup
+
+        internal BodyElement TextMarkup
+        {
+            get { return (_TextMarkup); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region MeasureOverride
+
+        protected override void MeasureOverride(ChartLayoutInfo layoutInfo)
+        {
+            _TextSize = Size.Empty;
+        }
+
+        #region MeasureText
+
+        private Size MeasureText(Graphics g,
+            ReferenceLineVisualStyle style, Size vsize)
+        {
+            Size size = Size.Empty;
+
+            string s = Text;
+
+            if (string.IsNullOrEmpty(s) == false)
+            {
+                if (TextMarkup != null)
+                {
+                    size = GetMarkupTextSize(g,
+                        TextMarkup, style, (vsize.Width > 0 ? vsize.Width : 10000));
+                }
+                else
+                {
+                    using (StringFormat sf = new StringFormat())
+                    {
+                        style.GetStringFormatFlags(sf);
+
+                        if (MaxLineCount <= 1)
+                            sf.FormatFlags |= StringFormatFlags.NoWrap;
+
+                        size = g.MeasureString(Text, style.Font, vsize, sf).ToSize();
+                    }
+                }
+
+                size.Width++;
+                size.Height++;
+
+                if (MaxLineCount > 1)
+                {
+                    int lineHeight = (int)(Math.Ceiling(style.Font.GetHeight())) * MaxLineCount;
+
+                    if (size.Height > lineHeight)
+                        size.Height = lineHeight;
+                }
+            }
+
+            return (size);
+        }
+
+        #region GetMarkupTextSize
+
+        private Size GetMarkupTextSize(Graphics g,
+            BodyElement textMarkup, ReferenceLineVisualStyle style, int width)
+        {
+            MarkupDrawContext d =
+                new MarkupDrawContext(g, style.Font, style.TextColor, false);
+
+            textMarkup.InvalidateElementsSize();
+            textMarkup.Measure(new Size(width, 0), d);
+
+            return (textMarkup.Bounds.Size);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region ArrangeOverride
+
+        protected override void ArrangeOverride(ChartLayoutInfo layoutInfo)
+        {
+            LineBounds = Rectangle.Empty;
+
+            ChartAxis axis = Parent as ChartAxis;
+
+            if (axis != null)
+            {
+                ChartXy chartXy = axis.Parent as ChartXy;
+
+                if (chartXy != null)
+                {
+                    Rectangle bounds = chartXy.ContentBounds;
+
+                    if (chartXy.HScrollBar.Enabled == true)
+                        bounds.Height -= (chartXy.HScrollBar.Height);
+
+                    if (chartXy.VScrollBar.Enabled == true)
+                        bounds.Width -= (chartXy.VScrollBar.Width);
+
+                    BoundsRelative = GetLineBoundsEx();
+                }
+            }
+        }
+
+        #endregion
+
+        #region RenderOverride
+
+        protected override void RenderOverride(ChartRenderInfo renderInfo)
+        {
+        }
+
+        #region RenderLine
+
+        internal void RenderLine(ChartRenderInfo renderInfo)
+        {
+            ChartAxis axis = Parent as ChartAxis;
+
+            if (axis != null)
+            {
+                Graphics g = renderInfo.Graphics;
+                ChartXy chartXy = axis.Parent as ChartXy;
+
+                Rectangle contentBounds = chartXy.ContentBounds;
+
+                ReferenceLineVisualStyle rstyle = EffectiveStyle;
+
+                if (axis.AxisOrientation == AxisOrientation.X)
+                    RenderLineX(g, contentBounds, rstyle);
+                else
+                    RenderLineY(g, contentBounds, rstyle);
+            }
+        }
+
+        #region RenderLineX
+
+        private void RenderLineX(Graphics g,
+            Rectangle contentBounds, ReferenceLineVisualStyle rstyle)
+        {
+            if (rstyle.LinePattern != LinePattern.None)
+            {
+                Rectangle lbounds = LineBounds;
+
+                if (lbounds.X > contentBounds.X && lbounds.X < contentBounds.Right)
+                {
+                    Point pt1 = lbounds.Location;
+                    Point pt2 = new Point(pt1.X, lbounds.Bottom);
+
+                    using (Pen pen = new Pen(rstyle.LineColor, Dpi.Width(rstyle.LineWidth)))
+                    {
+                        if (rstyle.LinePattern != LinePattern.NotSet)
+                            pen.DashStyle = (DashStyle)rstyle.LinePattern;
+
+                        g.DrawLine(pen, pt2, pt1);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region RenderLineY
+
+        private void RenderLineY(Graphics g,
+            Rectangle contentBounds, ReferenceLineVisualStyle rstyle)
+        {
+            if (rstyle.LinePattern != LinePattern.None)
+            {
+                Rectangle lbounds = LineBounds;
+
+                if (lbounds.Y > contentBounds.Y && lbounds.Y < contentBounds.Bottom)
+                {
+                    Point pt1 = lbounds.Location;
+                    Point pt2 = new Point(lbounds.Right, pt1.Y);
+
+                    using (Pen pen = new Pen(rstyle.LineColor, Dpi.Height(rstyle.LineWidth)))
+                    {
+                        if (rstyle.LinePattern != LinePattern.NotSet)
+                            pen.DashStyle = (DashStyle)rstyle.LinePattern;
+
+                        g.DrawLine(pen, pt1, pt2);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderLineText
+
+        internal void RenderLineText(ChartRenderInfo renderInfo)
+        {
+            ChartAxis axis = Parent as ChartAxis;
+
+            if (axis != null)
+            {
+                Graphics g = renderInfo.Graphics;
+                ChartXy chartXy = axis.Parent as ChartXy;
+
+                Rectangle bounds = chartXy.ContentBounds;
+
+                if (chartXy.HScrollBar.Enabled == true)
+                    bounds.Height -= (chartXy.HScrollBar.Height + 1);
+
+                if (chartXy.VScrollBar.Enabled == true)
+                    bounds.Width -= (chartXy.VScrollBar.Width + 1);
+
+                ReferenceLineVisualStyle rstyle = EffectiveStyle;
+
+                if (axis.AxisOrientation == AxisOrientation.X)
+                    RenderTextX(g, bounds, rstyle);
+                else
+                    RenderTextY(g, bounds, rstyle);
+            }
+        }
+
+        #region RenderTextX
+
+        private void RenderTextX(Graphics g,
+            Rectangle bounds, ReferenceLineVisualStyle rstyle)
+        {
+            Rectangle lbounds = LineBounds;
+
+            if (lbounds.X > bounds.X && lbounds.X < bounds.Right)
+            {
+                if (_TextSize == Size.Empty)
+                {
+                    Rectangle r = bounds;
+
+                    int n = r.Width;
+                    r.Width = r.Height;
+                    r.Height = n;
+
+                    if (rstyle.AllowWrap == Tbool.False)
+                        r.Size = Size.Empty;
+
+                    _TextSize = MeasureText(g, rstyle, r.Size);
+                }
+
+                int dy = (lbounds.Y + lbounds.Bottom) / 2;
+                Point pt = new Point(lbounds.X, dy);
+
+                int rotDegrees = (InvertVerticalText == true) ? 90 : -90;
+
+                g.TranslateTransform(pt.X, pt.Y);
+                g.RotateTransform(rotDegrees);
+
+                Rectangle tbounds = new Rectangle(
+                    -bounds.Height / 2, -rstyle.LineWidth / 2, bounds.Height, rstyle.LineWidth);
+
+                switch (rstyle.TextAlignment)
+                {
+                    case Alignment.TopLeft:
+                    case Alignment.TopCenter:
+                    case Alignment.TopRight:
+                        tbounds.Y -= (_TextSize.Height + rstyle.TextPadding.Bottom);
+                        break;
+
+                    case Alignment.MiddleLeft:
+                    case Alignment.MiddleCenter:
+                    case Alignment.MiddleRight:
+                        tbounds.Y -= (_TextSize.Height - tbounds.Height) / 2 + (rstyle.TextPadding.Vertical / 2 - rstyle.TextPadding.Top);
+                        break;
+
+                    case Alignment.BottomLeft:
+                    case Alignment.BottomCenter:
+                    case Alignment.BottomRight:
+                        tbounds.Y += (rstyle.LineWidth + rstyle.TextPadding.Top);
+                        break;
+                }
+
+                switch (rstyle.TextAlignment)
+                {
+                    case Alignment.TopRight:
+                    case Alignment.MiddleRight:
+                    case Alignment.BottomRight:
+                        tbounds.X = (tbounds.Right - _TextSize.Width);
+                        tbounds.Width = _TextSize.Width;
+                        break;
+                }
+
+                tbounds.X += +rstyle.TextPadding.Left;
+                tbounds.Width -= rstyle.TextPadding.Horizontal;
+                tbounds.Height = _TextSize.Height;
+
+                RenderText(g, tbounds, rstyle);
+
+                g.ResetTransform();
+            }
+        }
+
+        #endregion
+
+        #region RenderTextY
+
+        private void RenderTextY(Graphics g,
+            Rectangle bounds, ReferenceLineVisualStyle rstyle)
+        {
+            Rectangle lbounds = LineBounds;
+
+            if (lbounds.Y > bounds.Y && lbounds.Y < bounds.Bottom)
+            {
+                if (_TextSize == Size.Empty)
+                {
+                    Rectangle r = bounds;
+
+                    if (rstyle.AllowWrap == Tbool.False)
+                        r.Size = Size.Empty;
+
+                    _TextSize = MeasureText(g, rstyle, r.Size);
+                }
+
+                Point pt1 = lbounds.Location;
+                Point pt2 = new Point(lbounds.Right, pt1.Y);
+
+                Rectangle tbounds = new Rectangle(pt1.X, pt1.Y, pt2.X - pt1.X, 0);
+
+                switch (rstyle.TextAlignment)
+                {
+                    case Alignment.TopLeft:
+                    case Alignment.TopCenter:
+                    case Alignment.TopRight:
+                        tbounds.Y -= ((rstyle.LineWidth / 2) + rstyle.TextPadding.Bottom + _TextSize.Height);
+                        break;
+
+                    case Alignment.MiddleLeft:
+                    case Alignment.MiddleCenter:
+                    case Alignment.MiddleRight:
+                        tbounds.Y -= ((_TextSize.Height + rstyle.TextPadding.Vertical) / 2 - rstyle.TextPadding.Top);
+                        break;
+
+                    case Alignment.BottomLeft:
+                    case Alignment.BottomCenter:
+                    case Alignment.BottomRight:
+                        tbounds.Y += ((rstyle.LineWidth / 2) + rstyle.TextPadding.Top);
+                        break;
+                }
+
+                switch (rstyle.TextAlignment)
+                {
+                    case Alignment.TopRight:
+                    case Alignment.MiddleRight:
+                    case Alignment.BottomRight:
+                        tbounds.X = (tbounds.Right - _TextSize.Width - rstyle.TextPadding.Horizontal);
+                        tbounds.Width = _TextSize.Width + rstyle.TextPadding.Horizontal;
+                        break;
+                }
+
+                tbounds.X += rstyle.TextPadding.Left;
+                tbounds.Width -= rstyle.TextPadding.Horizontal;
+
+                tbounds.Height += _TextSize.Height;
+
+                RenderText(g, tbounds, rstyle);
+            }
+        }
+
+        #endregion
+
+        #region RenderText
+
+        private void RenderText(
+            Graphics g, Rectangle r, ReferenceLineVisualStyle style)
+        {
+            if (r.Width > 0 && r.Height > 0)
+            {
+                string s = Text;
+
+                if (string.IsNullOrEmpty(s) == false)
+                {
+                    if (TextMarkup != null)
+                    {
+                        RenderTextMarkup(g, r, style);
+                    }
+                    else
+                    {
+                        using (SolidBrush br = new SolidBrush(style.TextColor))
+                        {
+                            using (StringFormat sf = new StringFormat())
+                            {
+                                style.GetStringFormatFlags(sf);
+
+                                g.DrawString(Text, style.Font, br, r, sf);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        #region RenderTextMarkup
+
+        private void RenderTextMarkup(
+            Graphics g, Rectangle r, ReferenceLineVisualStyle style)
+        {
+            MarkupDrawContext d =
+                new MarkupDrawContext(g, style.Font, style.TextColor, false);
+
+            TextMarkup.Arrange(r, d);
+
+            Size size = TextMarkup.Bounds.Size;
+
+            TextMarkup.Bounds = new Rectangle(r.Location, size);
+
+            Region oldClip = g.Clip;
+
+            try
+            {
+                g.SetClip(r, CombineMode.Intersect);
+
+                TextMarkup.Render(d);
+            }
+            finally
+            {
+                g.Clip = oldClip;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region GetLineBounds
+
+        private Rectangle GetLineBounds()
+        {
+            ChartAxis axis = Parent as ChartAxis;
+
+            if (axis != null)
+            {
+                ChartXy chartXy = axis.Parent as ChartXy;
+
+                if (chartXy != null)
+                {
+                    Rectangle bounds = chartXy.ContentBounds;
+
+                    if (chartXy.HScrollBar.Enabled == true)
+                        bounds.Height -= (chartXy.HScrollBar.Height);
+
+                    if (chartXy.VScrollBar.Enabled == true)
+                        bounds.Width -= (chartXy.VScrollBar.Width);
+
+                    Point pt;
+                    
+                    if (axis.AxisOrientation == AxisOrientation.X)
+                    {
+                        pt = new Point(axis.GetDisplayValue(AxisValue), bounds.Y);
+                        pt = chartXy.GetLocalAdjustedPoint(pt);
+                        pt.Y = bounds.Y;
+                    }
+                    else
+                    {
+                        pt = new Point(bounds.X, axis.GetDisplayValue(AxisValue));
+                        pt = chartXy.GetLocalAdjustedPoint(pt);
+                        pt.X = bounds.X;
+                    }
+
+                    return (new Rectangle(pt, bounds.Size));
+                }
+            }
+
+            return (Rectangle.Empty);
+        }
+
+        #endregion
+
+        #region GetLineBoundsEx
+
+        private Rectangle GetLineBoundsEx()
+        {
+            ChartAxis axis = Parent as ChartAxis;
+
+            if (axis != null)
+            {
+                ChartXy chartXy = axis.Parent as ChartXy;
+
+                if (chartXy != null)
+                {
+                    Rectangle bounds = chartXy.ContentBounds;
+
+                    if (chartXy.HScrollBar.Enabled == true)
+                        bounds.Height -= (chartXy.HScrollBar.Height);
+
+                    if (chartXy.VScrollBar.Enabled == true)
+                        bounds.Width -= (chartXy.VScrollBar.Width);
+
+                    Point pt;
+
+                    if (axis.AxisOrientation == AxisOrientation.X)
+                        pt = new Point(axis.GetDisplayValue(AxisValue), bounds.Y);
+                    else
+                        pt = new Point(bounds.X, axis.GetDisplayValue(AxisValue));
+
+                    return (new Rectangle(pt, bounds.Size));
+                }
+            }
+
+            return (Rectangle.Empty);
+        }
+
+        #endregion
+
+        #region GetDoubleValue
+
+        private double GetDoubleValue(object value)
+        {
+            if (value is double)
+                return (double)value;
+
+            return (Convert.ToDouble(value));
+        }
+
+        #endregion
+
+        #region EnsureVisible
+
+        /// <summary>
+        /// Ensures that the reference line is visible on screen.
+        /// </summary>
+        public void EnsureVisible()
+        {
+            EnsureVisible(false);
+        }
+
+        /// <summary>
+        /// Ensures that the reference line is visible on screen, and
+        /// optionally centered (if possible).
+        /// </summary>
+        /// <param name="center"></param>
+        public void EnsureVisible(bool center)
+        {
+            ChartAxis axis = Parent as ChartAxis;
+
+            if (axis != null)
+                axis.EnsureVisible(AxisValue, center);
+        }
+
+        #endregion
+
+        #region Style handling
+
+        #region ApplyStyles
+
+        public override void ApplyStyles(BaseVisualStyle style)
+        {
+            ReferenceLineVisualStyle rstyle = style as ReferenceLineVisualStyle;
+
+            if (rstyle != null)
+            {
+                ApplyParentStyles(rstyle, Parent as ChartContainer);
+
+                rstyle.ApplyStyle(ReferenceLineVisualStyle);
+
+                if (rstyle.LineColor.IsEmpty == true)
+                    rstyle.LineColor = Color.Red;
+
+                if (rstyle.LineWidth < 0)
+                    rstyle.LineWidth = 1;
+
+                if (rstyle.Font == null)
+                    rstyle.Font = SystemFonts.DefaultFont;
+
+                if (rstyle.TextColor.IsEmpty == true)
+                    rstyle.TextColor = Color.Black;
+            }
+        }
+
+        #region ApplyParentStyles
+
+        private void ApplyParentStyles(
+            ReferenceLineVisualStyle pstyle, ChartContainer item)
+        {
+            if (item != null)
+            {
+                ApplyParentStyles(pstyle, item.Parent as ChartContainer);
+
+                ChartPanel cp = item as ChartPanel;
+
+                if (cp != null)
+                    pstyle.ApplyStyle(cp.DefaultVisualStyles.ReferenceLineVisualStyle);
+            }
+            else
+            {
+                pstyle.ApplyStyle(ChartControl.BaseVisualStyles.ReferenceLineVisualStyle);
+                pstyle.ApplyStyle(ChartControl.DefaultVisualStyles.ReferenceLineVisualStyle);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InvalidateStyle
+
+        ///<summary>
+        ///Invalidate the cached Style definition
+        ///</summary>
+        public void InvalidateStyle()
+        {
+            ClearEffectiveStyles();
+        }
+
+        #endregion
+
+        #region ClearEffectiveStyles
+
+        protected override void ClearEffectiveStyles()
+        {
+            if (_EffectiveStyle.InvalidateStyle() == true)
+                InvalidateLayout();
+
+            if (LegendItem != null)
+                LegendItem.EffectiveStyles.InvalidateStyles();
+        }
+
+        #endregion
+
+        #region StyleChanged
+
+        protected override void StyleChanged(object sender, PropertyChangedEventArgs e)
+        {
+            base.StyleChanged(sender, e);
+
+            if (sender is ChartLegendItemVisualStyles && LegendItem != null)
+                InvalidateRender(LegendItem.Bounds);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ILegendItem
+
+        #region ChartLegendItemVisualStyles
+
+        /// <summary>
+        /// Gets or sets the visual styles for the Legend item.
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates the visual styles for the Legend item.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ChartLegendItemVisualStyles ChartLegendItemVisualStyles
+        {
+            get
+            {
+                if (_ChartLegendItemVisualStyles == null)
+                {
+                    _ChartLegendItemVisualStyles = new ChartLegendItemVisualStyles();
+
+                    StyleVisualChangeHandler(null, _ChartLegendItemVisualStyles);
+                }
+
+                return (_ChartLegendItemVisualStyles);
+            }
+
+            set
+            {
+                if (_ChartLegendItemVisualStyles != value)
+                {
+                    ChartLegendItemVisualStyles oldValue = _ChartLegendItemVisualStyles;
+
+                    _ChartLegendItemVisualStyles = value;
+
+                    OnStyleChanged("ChartLegendItemVisualStyles", oldValue, value);
+
+                    if (oldValue != null)
+                        oldValue.Dispose();
+                }
+            }
+        }
+
+        #endregion
+
+        #region CheckedInLegend
+
+        /// <summary>
+        /// Gets or sets whether the ReferenceLine is checked in the Legend.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance")]
+        [Description("Indicates whether the ReferenceLine is checked in the Legend.")]
+        public bool CheckedInLegend
+        {
+            get { return (TestState(States.CheckedInLegend)); }
+
+            set
+            {
+                if (value != CheckedInLegend)
+                {
+                    SetState(States.CheckedInLegend, value);
+
+                    if (LegendItem != null)
+                        LegendItem.UpdateCheckState();
+
+                    OnPropertyChangedEx("CheckedInLegend", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowCheckBoxInLegend
+
+        /// <summary>
+        /// Gets or sets whether a checkbox for the ReferenceLine is shown in the Legend.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance")]
+        [Description("Indicates whether a checkbox for the ReferenceLine is shown in the Legend.")]
+        public bool ShowCheckBoxInLegend
+        {
+            get { return (TestState(States.ShowCheckBoxInLegend)); }
+
+            set
+            {
+                if (value != ShowCheckBoxInLegend)
+                {
+                    SetState(States.ShowCheckBoxInLegend, value);
+
+                    OnPropertyChangedEx("ShowCheckBoxInLegend", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowInLegend
+
+        /// <summary>
+        /// Gets or sets whether the ReferenceLine is shown in the Legend.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance")]
+        [Description("Indicates whether the ReferenceLine is shown in the Legend.")]
+        public bool ShowInLegend
+        {
+            get { return (TestState(States.ShowInLegend)); }
+
+            set
+            {
+                if (value != ShowInLegend)
+                {
+                    SetState(States.ShowInLegend, value);
+
+                    OnPropertyChangedEx("ShowInLegend", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowInParentLegend
+
+        /// <summary>
+        /// Gets or sets whether the Reference Line is shown in parent Legend(s).
+        /// </summary>
+        [DefaultValue(true), Category("Appearance")]
+        [Description("Indicates whether the Reference Line is shown in parent Legend(s).")]
+        public bool ShowInParentLegend
+        {
+            get { return (TestState(States.ShowInParentLegend)); }
+
+            set
+            {
+                if (value != ShowInParentLegend)
+                {
+                    SetState(States.ShowInParentLegend, value);
+
+                    OnPropertyChangedEx("ShowInParentLegend", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowMarkerInLegend
+
+        /// <summary>
+        /// Gets or sets whether the ReferenceLine Marker is shown in the Legend.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance")]
+        [Description("Indicates whether the ReferenceLine Marker is shown in the Legend.")]
+        public bool ShowMarkerInLegend
+        {
+            get { return (TestState(States.ShowMarkerInLegend)); }
+
+            set
+            {
+                if (value != ShowMarkerInLegend)
+                {
+                    SetState(States.ShowMarkerInLegend, value);
+
+                    OnPropertyChangedEx("ShowMarkerInLegend", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region LegendItem
+
+        ///<summary>
+        /// Gets the item's parent LegendItem.
+        ///</summary>
+        [Description("Indicates the item's parent LegendItem.")]
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public ChartLegendItem LegendItem
+        {
+            get { return (_LegendItem); }
+            internal set { _LegendItem = value; }
+        }
+
+        #endregion
+
+        #region LegendText
+
+        ///<summary>
+        /// Gets or sets the text to display in the legend.
+        ///</summary>
+        [DefaultValue(null), Category("DataLabel")]
+        [Description("Indicates the text to display in the legend.")]
+        public string LegendText
+        {
+            get { return (_LegendText); }
+
+            set
+            {
+                if (value != _LegendText)
+                {
+                    _LegendText = value;
+
+                    OnPropertyChangedEx("LegendText", Style.VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region GetLegendItem
+
+        public ChartLegendItem GetLegendItem()
+        {
+            _LegendItem = null;
+
+            if (ShowInLegend == true)
+            {
+                _LegendItem = new ChartLegendItem();
+
+                if (CheckedInLegend == true)
+                    _LegendItem.CheckState = CheckState.Checked;
+
+                _LegendItem.Name = Name;
+                _LegendItem.ItemText = LegendText;
+
+                if (string.IsNullOrEmpty(_LegendItem.Name) == true)
+                    _LegendItem.Name = "(RefLine)";
+
+                _LegendItem.ChartItems.Add(this);
+            }
+
+            return (_LegendItem);
+        }
+
+        #endregion
+
+        #region GetLegendItems
+
+        public List<ChartLegendItem> GetLegendItems()
+        {
+            List<ChartLegendItem> list = null;
+
+            ChartLegendItem item = GetLegendItem();
+
+            if (item != null)
+            {
+                list = new List<ChartLegendItem>(1);
+
+                list.Add(item);
+            }
+
+            return (list);
+        }
+
+        #endregion
+
+        #region GetLegendItemColor
+
+        public Color GetLegendItemColor()
+        {
+            ReferenceLineVisualStyle rstyle = EffectiveStyle;
+
+            return (rstyle.LineColor);
+        }
+
+        #endregion
+
+        #region RenderLegendItemMarker
+
+        public void RenderLegendItemMarker(Graphics g,
+            ChartLegendItem litem, ChartLegendItemVisualStyle style)
+        {
+            ReferenceLineVisualStyle rstyle = EffectiveStyle;
+
+            if (rstyle.LinePattern != LinePattern.None)
+            {
+                Rectangle bounds = litem.MarkerBounds;
+
+                int n = bounds.Height / 2;
+
+                int lineWidth = Math.Min(rstyle.LineWidth, bounds.Height);
+
+                using (Pen pen = new Pen(GetLegendItemColor(), lineWidth))
+                {
+                    if (rstyle.LinePattern != LinePattern.NotSet)
+                        pen.DashStyle = (DashStyle)rstyle.LinePattern;
+
+                    g.DrawLine(pen,
+                        new Point(bounds.X, bounds.Y + n),
+                        new Point(bounds.Right - 1, bounds.Y + n));
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Copy/CopyTo
+
+        public override ChartVisualElement Copy()
+        {
+            ReferenceLine copy = new ReferenceLine();
+
+            CopyTo(copy);
+
+            return (copy);
+        }
+
+        public override void CopyTo(ChartVisualElement copy)
+        {
+            ReferenceLine c = copy as ReferenceLine;
+
+            if (c != null)
+            {
+                base.CopyTo(c);
+
+                c.AxisValue = AxisValue;
+                c.DisplayLineOnTop = DisplayLineOnTop;
+                c.DisplayTextOnTop = DisplayTextOnTop;
+                c.EnableTextMarkup = EnableTextMarkup;
+                c.InvertVerticalText = InvertVerticalText;
+                c.MaxLineCount = MaxLineCount;
+
+                c.ReferenceLineVisualStyle =
+                    (_ReferenceLineVisualStyle != null) ? ReferenceLineVisualStyle.Copy() : null;
+
+                c.Text = Text;
+
+                c.CheckedInLegend = CheckedInLegend;
+                c.LegendText = LegendText;
+                c.ShowCheckBoxInLegend = ShowCheckBoxInLegend;
+                c.ShowInLegend = ShowInLegend;
+                c.ShowInParentLegend = ShowInParentLegend;
+                c.ShowMarkerInLegend = ShowMarkerInLegend;
+            }
+        }
+
+        #endregion
+
+        #region GetSerialData
+
+        internal override SerialElementCollection GetSerialData(string serialName)
+        {
+            SerialElementCollection sec = new SerialElementCollection();
+
+            if (serialName != null)
+            {
+                if (serialName.Equals("") == true)
+                    serialName = "ReferenceLine";
+
+                sec.AddStartElement(serialName);
+            }
+
+            sec.AddValue("AxisValue", AxisValue, null);
+            sec.AddValue("DisplayLineOnTop", DisplayLineOnTop, false);
+            sec.AddValue("DisplayTextOnTop", DisplayTextOnTop, true);
+            sec.AddValue("EnableTextMarkup", EnableTextMarkup, false);
+            sec.AddValue("InvertVerticalText", InvertVerticalText, false);
+            sec.AddValue("MaxLineCount", MaxLineCount, 3);
+
+            if (_ReferenceLineVisualStyle != null && _ReferenceLineVisualStyle.IsEmpty == false)
+                sec.AddElement(_ReferenceLineVisualStyle.GetSerialData("ReferenceLineVisualStyle"));
+
+            sec.AddValue("Text", Text, null);
+
+            sec.AddValue("CheckedInLegend", CheckedInLegend, true);
+            sec.AddValue("LegendText", LegendText, null);
+            sec.AddValue("ShowCheckBoxInLegend", ShowCheckBoxInLegend, true);
+            sec.AddValue("ShowInLegend", ShowInLegend, true);
+            sec.AddValue("ShowInParentLegend", ShowInParentLegend, true);
+            sec.AddValue("ShowMarkerInLegend", ShowMarkerInLegend, true);
+
+            sec.AddElement(base.GetSerialData(null));
+
+            if (serialName != null)
+                sec.AddEndElement(serialName);
+
+            return (sec);
+        }
+
+        #endregion
+
+        #region PutSerialData
+
+        #region ProcessValue
+
+        internal override void ProcessValue(SerialElement se)
+        {
+            switch (se.Name)
+            {
+                case "AxisValue":
+                    AxisValue = se.DataValue;
+                    break;
+
+                case "CheckedInLegend":
+                    CheckedInLegend = bool.Parse(se.StringValue);
+                    break;
+
+                case "DisplayLineOnTop":
+                    DisplayLineOnTop = bool.Parse(se.StringValue);
+                    break;
+
+                case "DisplayTextOnTop":
+                    DisplayTextOnTop = bool.Parse(se.StringValue);
+                    break;
+
+                case "EnableTextMarkup":
+                    EnableTextMarkup = bool.Parse(se.StringValue);
+                    break;
+
+                case "InvertVerticalText":
+                    InvertVerticalText = bool.Parse(se.StringValue);
+                    break;
+
+                case "LegendText":
+                    LegendText = se.StringValue;
+                    break;
+
+                case "MaxLineCount":
+                    MaxLineCount = int.Parse(se.StringValue);
+                    break;
+
+                case "ShowCheckBoxInLegend":
+                    ShowCheckBoxInLegend = bool.Parse(se.StringValue);
+                    break;
+
+                case "ShowInLegend":
+                    ShowInLegend = bool.Parse(se.StringValue);
+                    break;
+
+                case "ShowInParentLegend":
+                    ShowInParentLegend = bool.Parse(se.StringValue);
+                    break;
+
+                case "ShowMarkerInLegend":
+                    ShowMarkerInLegend = bool.Parse(se.StringValue);
+                    break;
+
+                case "Text":
+                    Text = se.StringValue;
+                    break;
+
+                default:
+                    base.ProcessValue(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region ProcessCollection
+
+        internal override void ProcessCollection(SerialElement se)
+        {
+            SerialElementCollection sec = se.Sec;
+
+            switch (se.Name)
+            {
+                case "ReferenceLineVisualStyle":
+                    sec.PutSerialData(ReferenceLineVisualStyle);
+                    break;
+
+                default:
+                    base.ProcessCollection(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region States
+
+        [Flags]
+        private enum States : uint
+        {
+            CheckedInLegend = (1U << 1),
+            ShowCheckBoxInLegend = (1U << 2),
+            ShowInLegend = (1U << 3),
+            ShowInParentLegend = (1U << 4),
+            ShowMarkerInLegend = (1U << 5),
+
+            DisplayLineOnTop = (1U << 6),
+            DisplayTextOnTop = (1U << 7),
+
+            EnableTextMarkup = (1U << 8),
+            InvertVerticalText = (1U << 9)
+        }
+
+        #region TestState
+
+        private bool TestState(States state)
+        {
+            return ((_States & state) == state);
+        }
+
+        #endregion
+
+        #region SetState
+
+        private void SetState(States state, bool value)
+        {
+            if (value == true)
+                _States |= state;
+            else
+                _States &= ~state;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IDisposable
+
+        public override void Dispose()
+        {
+            ChartLegendItemVisualStyles = null;
+            ReferenceLineVisualStyle = null;
+
+            base.Dispose();
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartEventArgs.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartEventArgs.cs
new file mode 100644
index 00000000..5f282702
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartEventArgs.cs	
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartPrint.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartPrint.cs
new file mode 100644
index 00000000..d54a95bd
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ChartPrint.cs	
@@ -0,0 +1,225 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Printing;
+
+namespace DevComponents.DotNetBar.Charts
+{
+    [ToolboxItem(false)]
+    public class ChartPrint : PrintDocument
+    {
+        #region Private variables
+
+        private ChartControl _ChartControl;
+        private Image _ChartImage;
+
+        private Rectangle _PrintBounds;
+
+        private int _Columns;
+        private int _Rows;
+
+        private int _CurCell;
+
+        private FitToPageScale _FitToPageScale = FitToPageScale.Normal;
+
+        #endregion
+
+        #region Constructors
+
+        /// <summary>
+        /// ChartPrint
+        /// </summary>
+        public ChartPrint()
+            : base()
+        {
+        }
+
+        /// <summary>
+        /// ChartPrint
+        /// </summary>
+        /// <param name="chartControl">ChartControl</param>
+        public ChartPrint(ChartControl chartControl)
+            : base()
+        {
+            _ChartControl = chartControl;
+        }
+
+        /// <summary>
+        /// ChartPrint
+        /// </summary>
+        /// <param name="chartControl">ChartControl</param>
+        /// <param name="fitToPageScale">FitToPageScale</param>
+        public ChartPrint(ChartControl chartControl, FitToPageScale fitToPageScale)
+            : base()
+        {
+            _ChartControl = chartControl;
+            _FitToPageScale = fitToPageScale;
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region FitToPageScale
+
+        /// <summary>
+        /// Gets or sets how the chart is scaled
+        /// to fit the page when printing.
+        /// </summary>
+        public FitToPageScale FitToPageScale
+        {
+            get { return (_FitToPageScale); }
+            set { _FitToPageScale = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region OnBeginPrint
+
+        protected override void OnBeginPrint(PrintEventArgs e)
+        {
+            base.OnBeginPrint(e);
+
+            if (_ChartControl == null)
+                throw new Exception("ChartControl has not been set.");
+
+            Size size = _ChartControl.ClientSize;
+
+            _PrintBounds = DefaultPageSettings.Bounds;
+
+            Margins margins = DefaultPageSettings.Margins;
+
+            _PrintBounds.X += margins.Left;
+            _PrintBounds.Width -= (margins.Left + margins.Right);
+
+            _PrintBounds.Y += margins.Top;
+            _PrintBounds.Height -= (margins.Top + margins.Bottom);
+
+            _Columns = (int)Math.Ceiling((double)size.Width / _PrintBounds.Width);
+            _Rows = (int)Math.Ceiling((double)size.Height / _PrintBounds.Height);
+
+            _CurCell = 0;
+
+            _ChartImage = new Bitmap(size.Width, size.Height);
+
+            using (Graphics g = Graphics.FromImage(_ChartImage))
+                _ChartControl.PaintTo(g);
+        }
+
+        #endregion
+
+        #region OnPrintPage
+
+        protected override void OnPrintPage(PrintPageEventArgs e)
+        {
+            base.OnPrintPage(e);
+
+            switch (FitToPageScale)
+            {
+                case Charts.FitToPageScale.Stretch:
+                    PrintStretchPage(e);
+                    break;
+
+                case Charts.FitToPageScale.Zoom:
+                    PrintZoomPage(e);
+                    break;
+
+                default:
+                    PrintNormalPage(e);
+                    break;
+            }
+        }
+
+        #region PrintNormalPage
+
+        private void PrintNormalPage(PrintPageEventArgs e)
+        {
+            Graphics g = e.Graphics;
+
+            int curRow = _CurCell / _Columns;
+            int curColumn = _CurCell % _Columns;
+
+            int x = curColumn * _PrintBounds.Width;
+            int y = curRow * _PrintBounds.Height;
+
+            Rectangle rs = new Rectangle(x, y, _ChartImage.Width - x, _ChartImage.Height - y);
+            Rectangle rd = new Rectangle(_PrintBounds.X, _PrintBounds.Y, _ChartImage.Width - x, _ChartImage.Height - y);
+
+            Region saveClip = g.Clip;
+
+            g.SetClip(_PrintBounds);
+            g.DrawImage(_ChartImage, rd, rs, GraphicsUnit.Pixel);
+            g.Clip = saveClip;
+
+            _CurCell++;
+
+            e.HasMorePages = (_CurCell < _Columns * _Rows);
+        }
+
+        #endregion
+
+        #region PrintStretchPage
+
+        private void PrintStretchPage(PrintPageEventArgs e)
+        {
+            Rectangle rs = new Rectangle(0, 0, _ChartImage.Width, _ChartImage.Height);
+
+            e.Graphics.DrawImage(_ChartImage, _PrintBounds, rs, GraphicsUnit.Pixel);
+
+            e.HasMorePages = false;
+        }
+
+        #endregion
+
+        #region PrintZoomPage
+
+        private void PrintZoomPage(PrintPageEventArgs e)
+        {
+            Rectangle rd = _PrintBounds;
+
+            SizeF size = new SizeF(_ChartImage.Width / _ChartImage.HorizontalResolution,
+                _ChartImage.Height / _ChartImage.VerticalResolution);
+
+            float scale = Math.Min(rd.Width / size.Width, rd.Height / size.Height);
+
+            size.Width *= scale;
+            size.Height *= scale;
+
+            e.Graphics.DrawImage(_ChartImage, rd.X, rd.Y, size.Width, size.Height);
+
+            e.HasMorePages = false;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region OnEndPrint
+
+        protected override void OnEndPrint(PrintEventArgs e)
+        {
+            base.OnEndPrint(e);
+
+            if (_ChartImage != null)
+                _ChartImage.Dispose();
+
+            _ChartImage = null;
+        }
+
+        #endregion
+    }
+
+    #region FitToPageScale
+
+    public enum FitToPageScale
+    {
+        Normal,
+
+        Stretch,
+        Zoom,
+    }
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ClosedHand.cur b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ClosedHand.cur
new file mode 100644
index 00000000..13d7056e
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ClosedHand.cur differ
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ContentManager/BlockLayoutManager.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ContentManager/BlockLayoutManager.cs
new file mode 100644
index 00000000..c088927e
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ContentManager/BlockLayoutManager.cs	
@@ -0,0 +1,38 @@
+using System.Collections;
+using System.Drawing;
+
+namespace DevComponents.Charts.TextMarkup
+{
+	/// <summary>
+	/// Represents block layout manager responsible for sizing the content blocks.
+	/// </summary>
+	public abstract class BlockLayoutManager
+	{
+		private Graphics _Graphics;
+
+	    /// <summary>
+		/// Resizes the content block and sets it's Bounds property to reflect new size.
+		/// </summary>
+		/// <param name="block">Content block to resize.</param>
+        /// <param name="availableSize">Content size available for the block in the given line.</param>
+		public abstract void Layout(IBlock block, Size availableSize);
+
+        /// <summary>
+        /// Performs layout finalization
+        /// </summary>
+        /// <param name="containerBounds"></param>
+        /// <param name="blocksBounds"></param>
+        /// <param name="lines"></param>
+        /// <returns></returns>
+        public abstract Rectangle FinalizeLayout(Rectangle containerBounds, Rectangle blocksBounds, ArrayList lines);
+
+		/// <summary>
+		/// Gets or sets the graphics object used by layout manager.
+		/// </summary>
+		public Graphics Graphics
+		{
+			get {return _Graphics;}
+			set {_Graphics = value;}
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ContentManager/Enums.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ContentManager/Enums.cs
new file mode 100644
index 00000000..89fc4d26
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ContentManager/Enums.cs	
@@ -0,0 +1,55 @@
+namespace DevComponents.Charts.TextMarkup
+{
+	/// <summary>
+	/// Specifies orientation of content.
+	/// </summary>
+	public enum eContentOrientation
+	{
+		/// <summary>
+		/// Indicates Horizontal orientation of the content.
+		/// </summary>
+		Horizontal,
+		/// <summary>
+		/// Indicates Vertical orientation of the content.
+		/// </summary>
+		Vertical
+	}
+
+	/// <summary>
+	/// Specifies content horizontal alignment.
+	/// </summary>
+	public enum eContentAlignment
+	{
+		/// <summary>
+		/// Content is left aligned.UI
+		/// </summary>
+		Left,
+		/// <summary>
+		/// Content is right aligned.
+		/// </summary>
+		Right,
+		/// <summary>
+		/// Content is centered.
+		/// </summary>
+		Center
+	}
+
+	/// <summary>
+	/// Specifies content vertical alignment.
+	/// </summary>
+	public enum eContentVerticalAlignment
+	{
+		/// <summary>
+		/// Content is top aligned.
+		/// </summary>
+		Top,
+		/// <summary>
+		/// Content is bottom aligned.
+		/// </summary>
+		Bottom,
+		/// <summary>
+		/// Content is in the middle.
+		/// </summary>
+		Middle
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ContentManager/IBlock.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ContentManager/IBlock.cs
new file mode 100644
index 00000000..d41189bd
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ContentManager/IBlock.cs	
@@ -0,0 +1,20 @@
+using System.Drawing;
+
+namespace DevComponents.Charts.TextMarkup
+{
+	/// <summary>
+	/// Represents a content block interface.
+	/// </summary>
+	public interface IBlock
+	{
+		/// <summary>
+		/// Gets or sets the bounds of the content block.
+		/// </summary>
+		Rectangle Bounds {get;set;}
+
+		/// <summary>
+		/// Gets or sets whether content block is visible.
+		/// </summary>
+		bool Visible {get;set;}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ContentManager/IBlockExtended.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ContentManager/IBlockExtended.cs
new file mode 100644
index 00000000..1acfbcf9
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ContentManager/IBlockExtended.cs	
@@ -0,0 +1,23 @@
+namespace DevComponents.Charts.TextMarkup
+{
+    /// <summary>
+    /// Represents a extended content block interface for advanced layout information.
+    /// </summary>
+    public interface IBlockExtended : IBlock
+    {
+        /// <summary>
+        /// Gets whether element is block level element.
+        /// </summary>
+        bool IsBlockElement { get;}
+
+        /// <summary>
+        /// Gets whether new line is required after the element.
+        /// </summary>
+        bool IsNewLineAfterElement { get;}
+
+        /// <summary>
+        /// Gets whether element can be on new line.
+        /// </summary>
+        bool CanStartNewLine { get; }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ContentManager/IContentLayoutManager.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ContentManager/IContentLayoutManager.cs
new file mode 100644
index 00000000..2bb576d7
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ContentManager/IContentLayoutManager.cs	
@@ -0,0 +1,19 @@
+using System.Drawing;
+
+namespace DevComponents.Charts.TextMarkup
+{
+	/// <summary>
+	/// Represents interface for block layout.
+	/// </summary>
+	public interface IContentLayout
+	{
+		/// <summary>
+		/// Performs layout of the content block.
+		/// </summary>
+		/// <param name="containerBounds">Container bounds to layout content blocks in.</param>
+		/// <param name="contentBlocks">Content blocks to layout.</param>
+		/// <param name="blockLayout">Block layout manager that resizes the content blocks.</param>
+		/// <returns>The bounds of the content blocks within the container bounds.</returns>
+		Rectangle Layout(Rectangle containerBounds, IBlock[] contentBlocks, BlockLayoutManager blockLayout);
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ContentManager/SerialContentLayoutManager.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ContentManager/SerialContentLayoutManager.cs
new file mode 100644
index 00000000..7f45ee39
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ContentManager/SerialContentLayoutManager.cs	
@@ -0,0 +1,709 @@
+using System;
+using System.Collections;
+using System.Drawing;
+
+namespace DevComponents.Charts.TextMarkup
+{
+	/// <summary>
+	/// Represents the serial content layout manager that arranges content blocks in series next to each other.
+	/// </summary>
+	public class SerialContentLayoutManager:IContentLayout
+    {
+        #region Events
+
+        /// <summary>
+        /// Occurs when X, Y position of next block is calcualted.
+        /// </summary>
+        public event LayoutManagerPositionEventHandler NextPosition;
+
+        /// <summary>
+        /// Occurs before new block is layed out.
+        /// </summary>
+        public event LayoutManagerLayoutEventHandler BeforeNewBlockLayout;
+
+        #endregion
+
+        #region Private Variables
+
+        private int _BlockSpacing;
+		private bool _FitContainerOversize;
+        private bool _FitContainer;
+        private bool _VerticalFitContainerWidth;
+        private bool _HorizontalFitContainerHeight;
+		private bool _EvenHeight;
+		private bool _MultiLine;
+        private bool _RightToLeft;
+        private bool _OversizeDistribute;
+
+		private eContentAlignment _ContentAlignment = eContentAlignment.Left;
+		private eContentOrientation _ContentOrientation = eContentOrientation.Horizontal;
+		private eContentVerticalAlignment _ContentVerticalAlignment = eContentVerticalAlignment.Middle;
+        private eContentVerticalAlignment _BlockLineAlignment = eContentVerticalAlignment.Middle;
+
+		#endregion
+
+	    #region IContentLayout Members
+
+		/// <summary>
+		/// Performs layout of the content block.
+		/// </summary>
+		/// <param name="containerBounds">Container bounds to layout content blocks in.</param>
+		/// <param name="contentBlocks">Content blocks to layout.</param>
+		/// <param name="blockLayout">Block layout manager that resizes the content blocks.</param>
+		/// <returns>The bounds of the content blocks within the container bounds.</returns>
+        public virtual Rectangle Layout(Rectangle containerBounds, IBlock[] contentBlocks, BlockLayoutManager blockLayout)
+		{
+		    Rectangle blocksBounds = Rectangle.Empty;
+		    Point position = containerBounds.Location;
+		    ArrayList lines = new ArrayList();
+		    lines.Add(new BlockLineInfo());
+		    BlockLineInfo currentLine = lines[0] as BlockLineInfo;
+		    bool switchToNewLine = false;
+		    int visibleIndex = 0;
+
+		    foreach (IBlock block in contentBlocks)
+		    {
+		        if (!block.Visible)
+		        {
+		            block.Bounds = Rectangle.Empty;
+		            continue;
+		        }
+
+		        if (BeforeNewBlockLayout != null)
+		        {
+		            LayoutManagerLayoutEventArgs e = new
+                        LayoutManagerLayoutEventArgs(block, position, visibleIndex);
+
+		            BeforeNewBlockLayout(this, e);
+
+		            position = e.CurrentPosition;
+
+		            if (e.CancelLayout)
+		                continue;
+		        }
+		        visibleIndex++;
+
+		        Size availableSize = containerBounds.Size;
+		        bool isBlockElement = false;
+		        bool isNewLineTriggger = false;
+		        bool canStartOnNewLine;
+
+		        if (block is IBlockExtended)
+		        {
+		            IBlockExtended ex = block as IBlockExtended;
+
+		            isBlockElement = ex.IsBlockElement;
+		            isNewLineTriggger = ex.IsNewLineAfterElement;
+		            canStartOnNewLine = ex.CanStartNewLine;
+		        }
+		        else
+		            canStartOnNewLine = true;
+
+		        if (!isBlockElement)
+		        {
+		            if (_ContentOrientation == eContentOrientation.Horizontal)
+		                availableSize.Width = (containerBounds.Right - position.X);
+		            else
+		                availableSize.Height = (containerBounds.Bottom - position.Y);
+		        }
+
+		        // Resize the content block
+
+		        blockLayout.Layout(block, availableSize);
+
+		        if (_MultiLine && currentLine.Blocks.Count > 0)
+		        {
+		            if (_ContentOrientation == eContentOrientation.Horizontal &&
+		                position.X + block.Bounds.Width > containerBounds.Right && canStartOnNewLine || isBlockElement ||
+		                switchToNewLine)
+		            {
+		                position.X = containerBounds.X;
+		                position.Y += (currentLine.LineSize.Height + _BlockSpacing);
+
+		                currentLine = new BlockLineInfo();
+
+		                currentLine.Line = lines.Count;
+
+		                lines.Add(currentLine);
+		            }
+		            else if (_ContentOrientation == eContentOrientation.Vertical &&
+		                     position.Y + block.Bounds.Height > containerBounds.Bottom && canStartOnNewLine || isBlockElement ||
+		                     switchToNewLine)
+		            {
+		                position.Y = containerBounds.Y;
+		                position.X += (currentLine.LineSize.Width + _BlockSpacing);
+
+		                currentLine = new BlockLineInfo();
+
+		                currentLine.Line = lines.Count;
+
+		                lines.Add(currentLine);
+		            }
+		        }
+
+		        if (_ContentOrientation == eContentOrientation.Horizontal)
+		        {
+		            if (block.Bounds.Height > currentLine.LineSize.Height)
+		                currentLine.LineSize.Height = block.Bounds.Height;
+
+		            currentLine.LineSize.Width = position.X + block.Bounds.Width - containerBounds.X;
+		        }
+		        else if (_ContentOrientation == eContentOrientation.Vertical)
+		        {
+		            if (block.Bounds.Width > currentLine.LineSize.Width)
+		                currentLine.LineSize.Width = block.Bounds.Width;
+
+		            currentLine.LineSize.Height = position.Y + block.Bounds.Height - containerBounds.Y;
+		        }
+
+		        currentLine.Blocks.Add(block);
+
+		        if (block.Visible)
+                    currentLine.VisibleItemsCount++;
+
+		        block.Bounds = new Rectangle(position, block.Bounds.Size);
+
+		        if (blocksBounds.IsEmpty)
+		            blocksBounds = block.Bounds;
+		        else
+		            blocksBounds = Rectangle.Union(blocksBounds, block.Bounds);
+
+		        switchToNewLine = isBlockElement | isNewLineTriggger;
+
+		        position = GetNextPosition(block, position);
+		    }
+
+		    blocksBounds = AlignResizeBlocks(containerBounds, blocksBounds, lines);
+
+		    if (_RightToLeft)
+		        blocksBounds = MirrorContent(containerBounds, blocksBounds, contentBlocks);
+
+		    blocksBounds = blockLayout.FinalizeLayout(containerBounds, blocksBounds, lines);
+
+		    return blocksBounds;
+		}
+
+	    #endregion
+
+		#region Internals
+
+        private struct SizeExtended
+        {
+            public int Width;
+            public int Height;
+            public float WidthReduction;
+            public float HeightReduction;
+            public bool UseAbsoluteWidth;
+        }
+
+		private Rectangle AlignResizeBlocks(Rectangle containerBounds,Rectangle blocksBounds,ArrayList lines)
+		{
+			Rectangle newBounds=Rectangle.Empty;
+
+			if(containerBounds.IsEmpty || blocksBounds.IsEmpty || ((BlockLineInfo)lines[0]).Blocks.Count==0)
+				return newBounds;
+
+            if (_ContentAlignment == eContentAlignment.Left && _ContentVerticalAlignment == eContentVerticalAlignment.Top &&
+                !_FitContainer && !_FitContainerOversize && !_EvenHeight && _BlockLineAlignment == eContentVerticalAlignment.Top)
+                return blocksBounds;
+
+			Point[] offset=new Point[lines.Count];
+            SizeExtended[] sizeOffset = new SizeExtended[lines.Count];
+			foreach(BlockLineInfo lineInfo in lines)
+			{
+                if (_ContentOrientation == eContentOrientation.Horizontal)
+                {
+                    if (_FitContainer && containerBounds.Width > lineInfo.LineSize.Width ||
+                        _FitContainerOversize && lineInfo.LineSize.Width > containerBounds.Width)
+                    {
+                        if (_OversizeDistribute && containerBounds.Width < lineInfo.LineSize.Width * .75)
+                        {
+                            sizeOffset[lineInfo.Line].Width = (int)Math.Floor((float)(containerBounds.Width - lineInfo.VisibleItemsCount * _BlockSpacing) / (float)lineInfo.VisibleItemsCount);
+                            sizeOffset[lineInfo.Line].UseAbsoluteWidth = true;
+                        }
+                        else
+                            sizeOffset[lineInfo.Line].Width = ((containerBounds.Width - lineInfo.VisibleItemsCount * _BlockSpacing) - lineInfo.LineSize.Width) / lineInfo.VisibleItemsCount;
+                        sizeOffset[lineInfo.Line].WidthReduction = (float)(containerBounds.Width - lineInfo.VisibleItemsCount * _BlockSpacing) / (float)lineInfo.LineSize.Width;
+                        blocksBounds.Width = containerBounds.Width;
+                    }
+
+                    if (_HorizontalFitContainerHeight && containerBounds.Height > blocksBounds.Height)
+                        sizeOffset[lineInfo.Line].Height = (containerBounds.Height - lineInfo.LineSize.Height) / lines.Count;
+                }
+                else
+                {
+                    if (_FitContainer && containerBounds.Height > lineInfo.LineSize.Height ||
+                        _FitContainerOversize && lineInfo.LineSize.Height > containerBounds.Height)
+                    {
+                        if (_OversizeDistribute && containerBounds.Width < lineInfo.LineSize.Width*.75)
+                        {
+                            sizeOffset[lineInfo.Line].Height = (int)
+                                Math.Floor((float) (containerBounds.Height - lineInfo.VisibleItemsCount*_BlockSpacing)/
+                                           (float) lineInfo.VisibleItemsCount);
+
+                            sizeOffset[lineInfo.Line].UseAbsoluteWidth = true;
+                        }
+                        else
+                            sizeOffset[lineInfo.Line].Height = ((containerBounds.Height -
+                                                                 lineInfo.VisibleItemsCount*_BlockSpacing) -
+                                                                lineInfo.LineSize.Height)/lineInfo.VisibleItemsCount;
+                        sizeOffset[lineInfo.Line].HeightReduction =
+                            (float) (containerBounds.Height - lineInfo.VisibleItemsCount*_BlockSpacing)/
+                            (float) lineInfo.LineSize.Height;
+                        blocksBounds.Height = containerBounds.Height;
+                    }
+
+                    if (_VerticalFitContainerWidth && containerBounds.Width > blocksBounds.Width)
+                        sizeOffset[lineInfo.Line].Width = (containerBounds.Width - lineInfo.LineSize.Width)/lines.Count;
+                }
+
+
+			    if (_ContentOrientation == eContentOrientation.Horizontal && !_FitContainer)
+                {
+                    if (containerBounds.Width > blocksBounds.Width && _FitContainerOversize || !_FitContainerOversize)
+                    {
+                        switch (_ContentAlignment)
+                        {
+                            case eContentAlignment.Right:
+                                if (containerBounds.Width > lineInfo.LineSize.Width)
+                                    offset[lineInfo.Line].X = containerBounds.Width - lineInfo.LineSize.Width;
+                                break;
+
+                            case eContentAlignment.Center:
+                                if (containerBounds.Width > lineInfo.LineSize.Width)
+                                    offset[lineInfo.Line].X = (containerBounds.Width - lineInfo.LineSize.Width)/2;
+                                break;
+                        }
+                    }
+                }
+
+			    if (_ContentOrientation == eContentOrientation.Vertical && !_FitContainer)
+                {
+                    if (containerBounds.Height > blocksBounds.Height && _FitContainerOversize || !_FitContainerOversize)
+                    {
+                        switch (_ContentVerticalAlignment)
+                        {
+                            case eContentVerticalAlignment.Bottom:
+                                if (containerBounds.Height > lineInfo.LineSize.Height)
+                                    offset[lineInfo.Line].Y = containerBounds.Height - lineInfo.LineSize.Height;
+                                break;
+
+                            case eContentVerticalAlignment.Middle:
+                                if (containerBounds.Height > lineInfo.LineSize.Height)
+                                    offset[lineInfo.Line].Y = (containerBounds.Height - lineInfo.LineSize.Height)/2;
+                                break;
+                        }
+                    }
+                }
+			}
+
+            if (_VerticalFitContainerWidth && containerBounds.Width > blocksBounds.Width && _ContentOrientation==eContentOrientation.Vertical)
+                blocksBounds.Width = containerBounds.Width;
+
+            else if(_HorizontalFitContainerHeight && containerBounds.Height>blocksBounds.Height && _ContentOrientation==eContentOrientation.Horizontal)
+                blocksBounds.Height = containerBounds.Height;
+
+			if(_ContentOrientation==eContentOrientation.Horizontal)
+			{
+				foreach(BlockLineInfo lineInfo in lines)
+				{
+                    foreach (IBlock block in lineInfo.Blocks)
+                    {
+                        if (!block.Visible)
+                            continue;
+
+                        Rectangle r = block.Bounds;
+
+                        if (_EvenHeight && lineInfo.LineSize.Height > 0)
+                            r.Height = lineInfo.LineSize.Height;
+
+                        r.Offset(offset[lineInfo.Line]);
+
+                        if (_ContentVerticalAlignment == eContentVerticalAlignment.Middle)
+                        {
+                            // Takes care of offset rounding error when both content is vertically centered and blocks in line are centered
+
+                            if (_BlockLineAlignment == eContentVerticalAlignment.Middle)
+                                r.Offset(0,
+                                         ((containerBounds.Height - blocksBounds.Height) +
+                                          (lineInfo.LineSize.Height - r.Height))/2);
+                            else
+                                r.Offset(0, (containerBounds.Height - blocksBounds.Height)/2);
+
+                            // Line alignment of the block
+
+                            if (_BlockLineAlignment == eContentVerticalAlignment.Bottom)
+                                r.Offset(0, lineInfo.LineSize.Height - r.Height);
+                        }
+                        else if (_ContentVerticalAlignment == eContentVerticalAlignment.Bottom)
+                            r.Offset(0, containerBounds.Height - blocksBounds.Height);
+
+                        // To avoid rounding offset errors when dividing this is split see upper part
+
+                        if (_ContentVerticalAlignment != eContentVerticalAlignment.Middle)
+                        {
+                            // Line alignment of the block
+
+                            if (_BlockLineAlignment == eContentVerticalAlignment.Middle)
+                                r.Offset(0, (lineInfo.LineSize.Height - r.Height)/2);
+
+                            else if (_BlockLineAlignment == eContentVerticalAlignment.Bottom)
+                                r.Offset(0, lineInfo.LineSize.Height - r.Height);
+                        }
+
+                        if (sizeOffset[lineInfo.Line].Width != 0)
+                        {
+                            if (_OversizeDistribute)
+                            {
+                                int nw = sizeOffset[lineInfo.Line].UseAbsoluteWidth
+                                             ? sizeOffset[lineInfo.Line].Width
+                                             : (int) Math.Floor(r.Width*sizeOffset[lineInfo.Line].WidthReduction);
+
+                                offset[lineInfo.Line].X += nw - r.Width;
+
+                                r.Width = nw;
+                            }
+                            else
+                            {
+                                r.Width += sizeOffset[lineInfo.Line].Width;
+                                offset[lineInfo.Line].X += sizeOffset[lineInfo.Line].Width;
+                            }
+                        }
+
+                        r.Height += sizeOffset[lineInfo.Line].Height;
+
+                        block.Bounds = r;
+
+                        if (newBounds.IsEmpty)
+                            newBounds = block.Bounds;
+                        else
+                            newBounds = Rectangle.Union(newBounds, block.Bounds);
+                    }
+
+				    // Adjust for left-over size adjustment for odd difference
+                    // between container width and the total block width
+
+                    if (!_OversizeDistribute && sizeOffset[lineInfo.Line].Width != 0 &&
+                        containerBounds.Width - (lineInfo.LineSize.Width + sizeOffset[lineInfo.Line].Width * lineInfo.Blocks.Count) != 0)
+                    {
+                        Rectangle r = ((IBlock) lineInfo.Blocks[lineInfo.Blocks.Count - 1]).Bounds;
+
+                        r.Width += containerBounds.Width -
+                                   (lineInfo.LineSize.Width + sizeOffset[lineInfo.Line].Width*lineInfo.Blocks.Count);
+
+                        ((IBlock) lineInfo.Blocks[lineInfo.Blocks.Count - 1]).Bounds = r;
+                    }
+				}
+			}
+			else
+			{
+				foreach(BlockLineInfo lineInfo in lines)
+				{
+					foreach(IBlock block in lineInfo.Blocks)
+					{
+						if(!block.Visible)
+							continue;
+
+						Rectangle r=block.Bounds;
+
+						if(_EvenHeight && lineInfo.LineSize.Width>0)
+							r.Width=lineInfo.LineSize.Width;
+
+						r.Offset(offset[lineInfo.Line]);
+
+						if(_ContentAlignment==eContentAlignment.Center)
+							r.Offset(((containerBounds.Width-blocksBounds.Width)+(lineInfo.LineSize.Width-r.Width))/2,0); //r.Offset((containerBounds.Width-blocksBounds.Width)/2+(lineInfo.LineSize.Width-r.Width)/2,0);
+						else if(_ContentAlignment==eContentAlignment.Right)
+
+							r.Offset((containerBounds.Width-blocksBounds.Width)+lineInfo.LineSize.Width-r.Width,0);
+						r.Width+=sizeOffset[lineInfo.Line].Width;
+
+						if(sizeOffset[lineInfo.Line].Height!=0)
+						{
+                            if (_OversizeDistribute)
+                            {
+                                int nw = sizeOffset[lineInfo.Line].UseAbsoluteWidth
+                                    ? sizeOffset[lineInfo.Line].Height : (int)Math.Floor(r.Height * sizeOffset[lineInfo.Line].HeightReduction);
+                                
+                                offset[lineInfo.Line].Y += nw - r.Height;
+                                r.Height = nw;
+                            }
+                            else
+                            {
+                                r.Height += sizeOffset[lineInfo.Line].Height;
+                                offset[lineInfo.Line].Y += sizeOffset[lineInfo.Line].Height;
+                            }
+						}
+
+						block.Bounds=r;
+
+						if(newBounds.IsEmpty)
+							newBounds=block.Bounds;
+						else
+							newBounds=Rectangle.Union(newBounds,block.Bounds);
+					}
+
+                    if (!_OversizeDistribute && sizeOffset[lineInfo.Line].Height != 0 && containerBounds.Height - (lineInfo.LineSize.Height + sizeOffset[lineInfo.Line].Height * lineInfo.Blocks.Count) != 0)
+					{
+						Rectangle r=((IBlock)lineInfo.Blocks[lineInfo.Blocks.Count-1]).Bounds;
+						r.Height+=containerBounds.Height-(lineInfo.LineSize.Height+sizeOffset[lineInfo.Line].Height*lineInfo.Blocks.Count);
+						((IBlock)lineInfo.Blocks[lineInfo.Blocks.Count-1]).Bounds=r;
+					}
+				}
+			}
+			return newBounds;
+		}
+
+		private Point GetNextPosition(IBlock block, Point position)
+		{
+            if (NextPosition != null)
+            {
+                LayoutManagerPositionEventArgs e = new LayoutManagerPositionEventArgs();
+
+                e.Block = block;
+                e.CurrentPosition = position;
+
+                NextPosition(this, e);
+
+                if (e.Cancel)
+                    return e.NextPosition;
+            }
+
+			if(_ContentOrientation==eContentOrientation.Horizontal)
+				position.X+=block.Bounds.Width+_BlockSpacing;
+			else
+				position.Y+=block.Bounds.Height+_BlockSpacing;
+
+			return position;
+		}
+
+		internal class BlockLineInfo
+		{
+		    public ArrayList Blocks=new ArrayList();
+			public Size LineSize = Size.Empty;
+			public int Line;
+            public int VisibleItemsCount;
+		}
+
+        private Rectangle MirrorContent(Rectangle containerBounds, Rectangle blockBounds, IBlock[] contentBlocks)
+        {
+            if (blockBounds.Width < containerBounds.Width)
+                blockBounds.X = containerBounds.Right - ((blockBounds.X - containerBounds.X) + blockBounds.Width);
+
+            else if (blockBounds.Width > containerBounds.Width)
+                containerBounds.Width = blockBounds.Width;
+
+            foreach (IBlock block in contentBlocks)
+            {
+                if (!block.Visible)
+                    continue;
+
+                Rectangle r = block.Bounds;
+
+                block.Bounds = new Rectangle(containerBounds.Right - 
+                    ((r.X - containerBounds.X) + r.Width), r.Y, r.Width, r.Height);
+            }
+
+            return blockBounds;
+        }
+		#endregion
+
+		#region Properties
+		/// <summary>
+		/// Gets or sets the spacing in pixels between content blocks. Default value is 0.
+		/// </summary>
+		public virtual int BlockSpacing
+		{
+			get {return _BlockSpacing;}
+			set {_BlockSpacing=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets whether content blocks are forced to fit the container bounds if they 
+		/// occupy more space than it is available by container. Default value is false.
+		/// </summary>
+		public virtual bool FitContainerOversize
+		{
+			get {return _FitContainerOversize;}
+			set {_FitContainerOversize=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets whether content blocks are resized to fit the container bound if they
+		/// occupy less space than it is available by container. Default value is false.
+		/// </summary>
+		public virtual bool FitContainer
+		{
+			get {return _FitContainer;}
+			set {_FitContainer=value;}
+		}
+
+        /// <summary>
+        /// Gets or sets whether content blocks are resized (Width) to fit container bounds if they
+        /// occupy less space than the actual container width. Applies to the Vertical orientation only. Default value is false.
+        /// </summary>
+        public virtual bool VerticalFitContainerWidth
+        {
+            get { return _VerticalFitContainerWidth; }
+            set { _VerticalFitContainerWidth = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether content blocks are resized (Height) to fit container bounds if they
+        /// occupy less space than the actual container height. Applies to the Horizontal orientation only. Default value is false.
+        /// </summary>
+        public virtual bool HorizontalFitContainerHeight
+        {
+            get { return _HorizontalFitContainerHeight; }
+            set { _HorizontalFitContainerHeight = value; }
+        }
+
+		/// <summary>
+		/// Gets or sets the content orientation. Default value is Horizontal.
+		/// </summary>
+		public virtual eContentOrientation ContentOrientation
+		{
+			get {return _ContentOrientation;}
+			set {_ContentOrientation=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets the content vertical alignment. Default value is Middle.
+		/// </summary>
+		public virtual eContentVerticalAlignment ContentVerticalAlignment
+		{
+			get {return _ContentVerticalAlignment;}
+			set {_ContentVerticalAlignment=value;}
+		}
+
+        /// <summary>
+        /// Gets or sets the block line vertical alignment. Default value is Middle.
+        /// </summary>
+        public virtual eContentVerticalAlignment BlockLineAlignment
+        {
+            get { return _BlockLineAlignment; }
+            set { _BlockLineAlignment = value; }
+        }
+
+		/// <summary>
+		/// Gets or sets the content horizontal alignment. Default value is Left.
+		/// </summary>
+		public virtual eContentAlignment ContentAlignment
+		{
+			get {return _ContentAlignment;}
+			set {_ContentAlignment=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets whether all content blocks are resized so they have same height which is height of the tallest content block. Default value is false.
+		/// </summary>
+		public virtual bool EvenHeight
+		{
+			get {return _EvenHeight;}
+			set {_EvenHeight=value;}
+		}
+
+        /// <summary>
+        /// Gets or sets whether oversized blocks are resized based on the percentage reduction instead of based on equal pixel distribution. Default value is false.
+        /// </summary>
+        public virtual bool OversizeDistribute
+        {
+            get { return _OversizeDistribute; }
+            set { _OversizeDistribute = value; }
+        }
+
+		/// <summary>
+		/// Gets or sets whether content is wrapped into new line if it exceeds the width of the container.
+		/// </summary>
+		public bool MultiLine
+		{
+			get {return _MultiLine;}
+			set {_MultiLine=value;}
+		}
+
+        /// <summary>
+        /// Gets or sets whether layout is right-to-left.
+        /// </summary>
+        public bool RightToLeft
+        {
+            get { return _RightToLeft; }
+            set { _RightToLeft = value; }
+        }
+
+		#endregion
+	}
+
+    /// <summary>
+    /// Represents event arguments for SerialContentLayoutManager.NextPosition event.
+    /// </summary>
+    public class LayoutManagerPositionEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets or sets the block that is layed out.
+        /// </summary>
+        public IBlock Block;
+
+        /// <summary>
+        /// Gets or sets the current block position.
+        /// </summary>
+        public Point CurrentPosition = Point.Empty;
+
+        /// <summary>
+        /// Gets or sets the calculated next block position.
+        /// </summary>
+        public Point NextPosition = Point.Empty;
+
+        /// <summary>
+        /// Cancels default position calculation.
+        /// </summary>
+        public bool Cancel;
+    }
+
+    /// <summary>
+    /// Represents event arguments for the SerialContentLayoutManager layout events.
+    /// </summary>
+    public class LayoutManagerLayoutEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets or sets the reference block object.
+        /// </summary>
+        public IBlock Block;
+
+        /// <summary>
+        /// Gets or sets the position block will assume.
+        /// </summary>
+        public Point CurrentPosition = Point.Empty;
+
+        /// <summary>
+        /// Cancel the layout of the block, applies only to BeforeXXX layout event.
+        /// </summary>
+        public bool CancelLayout;
+
+        /// <summary>
+        /// Gets or sets the visibility index of the block.
+        /// </summary>
+        public int BlockVisibleIndex;
+
+        /// <summary>
+        /// Creates new instance of the class and initializes it with default values.
+        /// </summary>
+        public LayoutManagerLayoutEventArgs(IBlock block, Point currentPosition, int visibleIndex)
+        {
+            this.Block = block;
+            this.CurrentPosition = currentPosition;
+            this.BlockVisibleIndex = visibleIndex;
+        }
+    }
+
+    /// <summary>
+    /// Delegate for SerialContentLayoutManager.NextPosition event.
+    /// </summary>
+    public delegate void LayoutManagerPositionEventHandler(object sender, LayoutManagerPositionEventArgs e);
+
+    /// <summary>
+    /// Delegate for the SerialContentLayoutManager layout events.
+    /// </summary>
+    public delegate void LayoutManagerLayoutEventHandler(object sender, LayoutManagerLayoutEventArgs e);
+    
+
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ConvexHull.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ConvexHull.cs
new file mode 100644
index 00000000..5a1fd060
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ConvexHull.cs	
@@ -0,0 +1,137 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Text;
+
+namespace DevComponents.DotNetBar.Charts
+{
+    // Monotone Chain Convex Hull.
+    // It takes O(NlogN) in sorting & O(N) in actual convex hull calc for N points.
+
+    public static class ConvexHull
+    {
+        #region GetConvexHull
+
+        public static Point[] GetConvexHull(Point[] points)
+        {
+            int n = points.Length;
+
+            Array.Sort(points, 0, n, new PointComparer());
+
+            Point[] ans = new Point[2 * n];
+
+            int k = 0;
+            int start = 0;
+
+            // Bottom hull
+
+            Point lpt = Point.Empty;
+
+            for (int i = 0; i < n; i++)
+            {
+                Point p = points[i];
+
+                if (PtCompare(p, lpt) == 0)
+                    continue;
+
+                lpt = p;
+
+                while (k - start >= 2)
+                {
+                    Point sp1 = PtSub(p, ans[k - 1]);
+                    Point sp2 = PtSub(p, ans[k - 2]);
+
+                    if (PtCross(sp1, sp2) <= 0)
+                        break;
+
+                    k--;
+                }
+
+                ans[k++] = p;
+            }
+
+            k--;
+
+            // Top hull
+
+            start = k;
+            lpt = Point.Empty;
+
+            for (int i = n - 1; i >= 0; i--)
+            {
+                Point p = points[i];
+
+                if (PtCompare(p, lpt) == 0)
+                    continue;
+
+                lpt = p;
+
+                while (k - start >= 2)
+                {
+                    Point sp1 = PtSub(p, ans[k - 1]);
+                    Point sp2 = PtSub(p, ans[k - 2]);
+
+                    if (PtCross(sp1, sp2) <= 0)
+                        break;
+
+                    k--;
+                }
+
+                ans[k++] = p;
+            }
+
+            k--;
+
+            Point[] hullPoints = new Point[k + 1];
+            Array.Copy(ans, hullPoints, k);
+
+            hullPoints[k] = hullPoints[0];
+
+            return (hullPoints);
+        }
+
+        #endregion
+
+        #region PointComparer
+
+        private class PointComparer : IComparer<Point>
+        {
+            public int Compare(Point pt1, Point pt2)
+            {
+                return (ConvexHull.PtCompare(pt1, pt2));
+            }
+        }
+
+        #endregion
+
+        #region PtCompare
+
+        private static int PtCompare(Point pt1, Point pt2)
+        {
+            if (pt1.X == pt2.X)
+                return (pt1.Y - pt2.Y);
+
+            return (pt1.X - pt2.X);
+        }
+
+        #endregion
+
+        #region PtCross
+
+        private static int PtCross(Point pt1, Point pt2)
+        {
+            return (pt1.X * pt2.Y - pt1.Y * pt2.X);
+        }
+
+        #endregion
+
+        #region PtSub
+
+        private static Point PtSub(Point pt1, Point pt2)
+        {
+            return (new Point(pt1.X - pt2.X, pt1.Y - pt2.Y));
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/DevComponents.DotNetBar.Charts.csproj b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/DevComponents.DotNetBar.Charts.csproj
new file mode 100644
index 00000000..19274fa4
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/DevComponents.DotNetBar.Charts.csproj	
@@ -0,0 +1,268 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{2AF9BA7A-2D05-419E-9F49-0CCEF791947E}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>DevComponents.DotNetBar.Charts</RootNamespace>
+    <AssemblyName>DevComponents.DotNetBar.Charts</AssemblyName>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;CHARTCONTROL</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <PlatformTarget>x86</PlatformTarget>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <DocumentationFile>bin\Release\DevComponents.DotNetBar.Charts.XML</DocumentationFile>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>ChartControl.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Deployment" />
+    <Reference Include="System.Design" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Drawing.Design" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="ChartControl\BaseChart.cs" />
+    <Compile Include="ChartControl\BaseSeries.cs" />
+    <Compile Include="ChartControl\ChartTitle.cs" />
+    <Compile Include="ChartControl\ChartLegendItem.cs" />
+    <Compile Include="ChartControl\ChartNote.cs" />
+    <Compile Include="ChartControl\ChartContainer.cs" />
+    <Compile Include="ChartControl\Annotation.cs" />
+    <Compile Include="ChartControl\ChartPanel.cs" />
+    <Compile Include="ChartControl\ChartIndicator.cs" />
+    <Compile Include="ChartControl\RadialChart\PieLabel.cs" />
+    <Compile Include="ChartControl\RadialChart\PieReferenceLine.cs" />
+    <Compile Include="ChartControl\RadialChart\PieRing.cs" />
+    <Compile Include="ChartControl\RadialChart\PieSeries.cs" />
+    <Compile Include="ChartControl\RadialChart\RadialAlign.cs" />
+    <Compile Include="ChartControl\TreeMap\TreeMap.cs" />
+    <Compile Include="ChartControl\DataLabel.cs" />
+    <Compile Include="ChartControl\ChartElement.cs" />
+    <Compile Include="ChartControl\ChartMatrix.cs" />
+    <Compile Include="ChartControl\SeriesPoints.cs" />
+    <Compile Include="ChartControl\ChartLayoutInfo.cs" />
+    <Compile Include="ChartControl\ChartRenderInfo.cs" />
+    <Compile Include="ChartControl\ChartLegend.cs" />
+    <Compile Include="ChartControl\ChartCrosshair.cs" />
+    <Compile Include="ChartControl\DataBinder.cs" />
+    <Compile Include="ChartControl\IOwnerLocalize.cs" />
+    <Compile Include="ChartControl\RadialChart\PieChart.cs" />
+    <Compile Include="ChartControl\TextDrawing.cs" />
+    <Compile Include="ChartControl\XyChart\ChartAxes.cs" />
+    <Compile Include="ChartControl\XyChart\ChartSeries.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ChartControl\XyChart\ChartTickmarks.cs" />
+    <Compile Include="ChartControl\XyChart\FlockAlign.cs" />
+    <Compile Include="ChartControl\XyChart\PointMarker.cs" />
+    <Compile Include="ChartControl\XyChart\AxisStripe.cs" />
+    <Compile Include="ChartControl\XyChart\ReferenceLine.cs" />
+    <Compile Include="ChartControl\XyChart\ChartGridLines.cs" />
+    <Compile Include="ChartControl\XyChart\ChartXy.cs" />
+    <Compile Include="ChartControl\XyChart\PointLabel.cs" />
+    <Compile Include="ChartEventArgs.cs" />
+    <Compile Include="ChartControl\ChartLable.cs" />
+    <Compile Include="ChartPrint.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="ContentManager\BlockLayoutManager.cs" />
+    <Compile Include="ContentManager\Enums.cs" />
+    <Compile Include="ContentManager\IBlock.cs" />
+    <Compile Include="ContentManager\IBlockExtended.cs" />
+    <Compile Include="ContentManager\IContentLayoutManager.cs" />
+    <Compile Include="ContentManager\SerialContentLayoutManager.cs" />
+    <Compile Include="ConvexHull.cs" />
+    <Compile Include="Helpers\MathHelper.cs" />
+    <Compile Include="Helpers\PieSeriesConverter.cs" />
+    <Compile Include="Helpers\PointFConverter.cs" />
+    <Compile Include="Helpers\XmlHelpers.cs" />
+    <Compile Include="Licensing.cs" />
+    <Compile Include="Primitives\ColorFactory.cs" />
+    <Compile Include="Primitives\SymbolDef.cs" />
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="ScrollBarLite\ScrollBarLite.cs" />
+    <Compile Include="Style\ChartBarVisualStyle.cs" />
+    <Compile Include="Style\ChartHiLoBarVisualStyle.cs" />
+    <Compile Include="Style\ChartSliceVisualStyle.cs" />
+    <Compile Include="Style\HiLoBarSegmentStyle.cs" />
+    <Compile Include="Style\PieCenterVisualStyle.cs" />
+    <Compile Include="Style\PieChartVisualStyle.cs" />
+    <Compile Include="Style\PieGridLineVisualStyle .cs" />
+    <Compile Include="Style\PieReferenceLineVisualStyle.cs" />
+    <Compile Include="Style\PointMarkerVisualStyle.cs" />
+    <Compile Include="Style\DropShadowVisualStyle.cs" />
+    <Compile Include="Style\ConnectorLineVisualStyle.cs" />
+    <Compile Include="Style\ChartLineVisualStyle.cs" />
+    <Compile Include="Style\AxisStripeVisualStyle .cs" />
+    <Compile Include="Style\SliceCenterLineVisualStyle.cs" />
+    <Compile Include="Style\SliceLabelVisualStyle.cs" />
+    <Compile Include="Style\TrendLineVisualStyle.cs" />
+    <Compile Include="Style\RegressionLineVisualStyle.cs" />
+    <Compile Include="Style\CrosshairValuelVisualStyle.cs" />
+    <Compile Include="Style\TickmarkLableVisualStyle.cs" />
+    <Compile Include="Style\ChartTickmarkVisualStyle.cs" />
+    <Compile Include="Style\ChartLegendItemVisualStyle.cs" />
+    <Compile Include="Style\ReferenceLineVisualStyle.cs" />
+    <Compile Include="Style\ChartXyVisualStyle.cs" />
+    <Compile Include="Style\ScrollBarVisualStyle.cs" />
+    <Compile Include="Style\DividerLineVisualStyle.cs" />
+    <Compile Include="Style\EffectiveStyles.cs" />
+    <Compile Include="Helpers\TextHelpers.cs" />
+    <Compile Include="Primitives\Converters.cs" />
+    <Compile Include="Primitives\CustomCollection.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="ChartControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Style\BackColorBlend.cs" />
+    <Compile Include="Style\Background.cs" />
+    <Compile Include="Style\BaseVisualStyle.cs" />
+    <Compile Include="Style\BorderColor.cs" />
+    <Compile Include="Style\BorderPattern.cs" />
+    <Compile Include="Style\ChartAxisVisualStyle.cs" />
+    <Compile Include="Style\AnnotationVisualStyle.cs" />
+    <Compile Include="Style\SeriesLabelVisualStyle.cs" />
+    <Compile Include="Style\ChartSeriesVisualStyle.cs" />
+    <Compile Include="Style\CrosshairVisualStyle.cs" />
+    <Compile Include="Style\GridLineVisualStyle .cs" />
+    <Compile Include="Style\DataLabelVisualStyle.cs" />
+    <Compile Include="Style\ChartTitleVisualStyle.cs" />
+    <Compile Include="Style\ChartLegendVisualStyle.cs" />
+    <Compile Include="Style\ChartPanelVisualStyle.cs" />
+    <Compile Include="Style\ContainerVisualStyle.cs" />
+    <Compile Include="Style\DefaultVisualStyles.cs" />
+    <Compile Include="Style\Padding.cs" />
+    <Compile Include="Style\Thickness.cs" />
+    <Compile Include="Style\VisualStyle.cs" />
+    <Compile Include="Style\VisualStyles.cs" />
+    <Compile Include="TextMarkup\BodyElement.cs" />
+    <Compile Include="TextMarkup\ContainerElement.cs" />
+    <Compile Include="TextMarkup\Div.cs" />
+    <Compile Include="TextMarkup\EndMarkupElement.cs" />
+    <Compile Include="TextMarkup\ExpandElement.cs" />
+    <Compile Include="TextMarkup\FontChangeElement.cs" />
+    <Compile Include="TextMarkup\FontElement.cs" />
+    <Compile Include="TextMarkup\Heading.cs" />
+    <Compile Include="TextMarkup\HyperLink.cs" />
+    <Compile Include="TextMarkup\IActiveMarkupElement.cs" />
+    <Compile Include="TextMarkup\ImageElement.cs" />
+    <Compile Include="TextMarkup\Italic.cs" />
+    <Compile Include="TextMarkup\MarkupDrawContext.cs" />
+    <Compile Include="TextMarkup\MarkupElement.cs" />
+    <Compile Include="TextMarkup\MarkupElementCollection.cs" />
+    <Compile Include="TextMarkup\MarkupLayoutManager.cs" />
+    <Compile Include="TextMarkup\MarkupParser.cs" />
+    <Compile Include="TextMarkup\MarkupSettings.cs" />
+    <Compile Include="TextMarkup\NewLine.cs" />
+    <Compile Include="TextMarkup\Paragraph.cs" />
+    <Compile Include="TextMarkup\Span.cs" />
+    <Compile Include="TextMarkup\Strike.cs" />
+    <Compile Include="TextMarkup\Strong.cs" />
+    <Compile Include="TextMarkup\TextElement.cs" />
+    <Compile Include="TextMarkup\Underline.cs" />
+    <Compile Include="VisualStyles\MetroStyleFactory.cs" />
+    <Compile Include="VisualStyles\Office2010BlackStyleFactory.cs" />
+    <Compile Include="VisualStyles\Office2010BlueStyleFactory.cs" />
+    <Compile Include="VisualStyles\Office2010SilverStyleFactory.cs" />
+    <Compile Include="VisualStyles\VisualStyleFactory.cs" />
+    <Compile Include="VisualStyles\VisualStylesTable.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\DotNetBar.csproj">
+      <Project>{36546ce3-335c-4ab6-a2f3-40f8c818bc66}</Project>
+      <Name>DotNetBar</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="ChartControl.snk" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="ClosedHand.cur" />
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="OpenHand.cur" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="ChartControl.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+      <Visible>False</Visible>
+      <ProductName>Windows Installer 3.1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Helpers/MathHelper.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Helpers/MathHelper.cs
new file mode 100644
index 00000000..da7bc96a
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Helpers/MathHelper.cs	
@@ -0,0 +1,126 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Runtime.InteropServices;
+using System.Text;
+
+namespace DevComponents.DotNetBar.Charts
+{
+    internal static class MathHelper
+    {
+        #region ToDegrees
+
+        public static double ToDegrees(double radians)
+        {
+            return (radians * 180 / Math.PI);
+        }
+
+        #endregion
+
+        #region ToRadians
+
+        public static double ToRadians(double degrees)
+        {
+            return (degrees * Math.PI / 180);
+        }
+
+        #endregion
+
+        #region GetPointAngle
+
+        public static int GetPointAngle(Point pt)
+        {
+            double theta = Math.Atan2(pt.X, -pt.Y);
+            int angle = (int)(MathHelper.ToDegrees(theta) + 270) % 360;
+
+            return (angle);
+        }
+
+        #endregion
+
+        #region GetPointRadius
+
+        public static int GetPointRadius(ref Point pt, Point cpt)
+        {
+            pt.X -= cpt.X;
+            pt.Y -= cpt.Y;
+
+            return ((int)Math.Sqrt(pt.X * pt.X + pt.Y * pt.Y));
+        }
+
+        #endregion
+
+        #region GetOffsetPoint
+
+        public static Point GetOffsetPoint(
+            Point pt, Point cpt, out int radius, out int angle)
+        {
+            radius = MathHelper.GetPointRadius(ref pt, cpt);
+            angle = MathHelper.GetPointAngle(pt);
+
+            return (pt);
+        }
+
+        #endregion
+
+        #region Clamp
+
+        public static T Clamp<T>(T value, T min, T max)
+            where T : IComparable<T>
+        {
+            T result = value;
+
+            if (result.CompareTo(max) > 0)
+                result = max;
+
+            if (result.CompareTo(min) < 0)
+                result = min;
+
+            return (result);
+        }
+
+        #endregion
+
+        #region ToScalar
+
+        public static double ToScalar(double x)
+        {
+            return (MathHelper.Sqrt((float)(x / Math.PI)) * 2);
+        }
+
+        #endregion
+
+        #region Sqrt
+
+        [StructLayout(LayoutKind.Explicit)]
+        private struct FloatIntUnion
+        {
+            [FieldOffset(0)]
+            public float f;
+
+            [FieldOffset(0)]
+            public int tmp;
+        }
+
+        public static float Sqrt(float x)
+        {
+            if (x != 0)
+            {
+                FloatIntUnion u;
+
+                u.tmp = 0;
+                u.f = x;
+
+                u.tmp -= 1 << 23;   // Subtract 2^m
+                u.tmp >>= 1;        // Divide by 2
+                u.tmp += 1 << 29;   // Add ((b + 1) / 2) * 2^m
+
+                return (u.f);
+            }
+
+            return (0);
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Helpers/PieSeriesConverter.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Helpers/PieSeriesConverter.cs
new file mode 100644
index 00000000..629ddb48
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Helpers/PieSeriesConverter.cs	
@@ -0,0 +1,29 @@
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.Drawing;
+using System.Globalization;
+
+namespace DevComponents.DotNetBar.Charts
+{
+    public class PieSeriesConverter : ExpandableObjectConverter
+    {
+        public override PropertyDescriptorCollection
+            GetProperties(ITypeDescriptorContext context, object value, Attribute[] attributes)
+        {
+            PropertyDescriptorCollection pdc = base.GetProperties(context, value, attributes);
+
+            PropertyDescriptor[] newProps = new PropertyDescriptor[pdc.Count - 1];
+
+            int n = 0;
+
+            for (int i = 0; i < pdc.Count; i++)
+            {
+                if (pdc[i].Name.Equals("SeriesType") == false)
+                    newProps[n++] = pdc[i];
+            }
+
+            return new PropertyDescriptorCollection(newProps);
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Helpers/PointFConverter.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Helpers/PointFConverter.cs
new file mode 100644
index 00000000..f20555cd
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Helpers/PointFConverter.cs	
@@ -0,0 +1,108 @@
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.Drawing;
+using System.Globalization;
+
+namespace DevComponents.DotNetBar.Charts
+{
+    public class PointFConverter : ExpandableObjectConverter
+    {
+        #region CanConvertTo
+
+        public override bool CanConvertTo(
+            ITypeDescriptorContext context, Type destinationType)
+        {
+            if (destinationType == typeof(string))
+                return (true);
+
+            return (base.CanConvertTo(context, destinationType));
+        }
+
+        #endregion
+
+        #region ConvertTo
+
+        public override object ConvertTo(
+            ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+        {
+            if (destinationType == typeof(string))
+            {
+                PointF pf = (PointF)value;
+
+                return (String.Format("{0:f}, {1:f}", pf.X, pf.Y));
+            }
+
+            return (base.ConvertTo(context, culture, value, destinationType));
+        }
+
+        #endregion
+
+        #region CanConvertFrom
+
+        public override bool CanConvertFrom(
+            ITypeDescriptorContext context, Type sourceType)
+        {
+            if (sourceType == typeof(string))
+                return (true);
+
+            return (base.CanConvertFrom(context, sourceType));
+        }
+
+        #endregion
+
+        #region ConvertFrom
+
+        public override object ConvertFrom(
+            ITypeDescriptorContext context, CultureInfo culture, object value)
+        {
+            if (value is string)
+            {
+                string[] values = ((string)value).Split(',');
+
+                if (values.Length != 2)
+                    throw new ArgumentException("Invalid value to convert.");
+
+                try
+                {
+                    float x = float.Parse(values[0]);
+                    float y = float.Parse(values[1]);
+
+                    PointF pf = new PointF(x, y);
+
+                    return (pf);
+                }
+                catch
+                {
+                    throw new ArgumentException("Invalid value to convert.");
+                }
+            }
+
+            return base.ConvertFrom(context, culture, value);
+        }
+
+        #endregion
+
+        #region GetCreateInstanceSupported
+
+        public override bool GetCreateInstanceSupported(ITypeDescriptorContext context)
+        {
+            return (true);
+        }
+
+        #endregion
+
+        #region CreateInstance
+
+        public override object CreateInstance(
+            ITypeDescriptorContext context, IDictionary propertyValues)
+        {
+            if (propertyValues != null)
+                return (new PointF((float)propertyValues["X"], (float)propertyValues["Y"]));
+
+            return (null);
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Helpers/TextHelpers.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Helpers/TextHelpers.cs
new file mode 100644
index 00000000..287766e4
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Helpers/TextHelpers.cs	
@@ -0,0 +1,55 @@
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Charts
+{
+    /// <summary>
+    /// Provides helpers when working with text.
+    /// </summary>
+    internal static class TextHelper
+    {
+        private static int _textMarkupCultureSpecific = 3;
+
+        /// <summary>
+        /// Get or sets the text-markup padding for text
+        /// measurement when running on Japanese version of Windows.
+        /// </summary>
+        public static int TextMarkupCultureSpecificPadding
+        {
+            get { return _textMarkupCultureSpecific; }
+            set { _textMarkupCultureSpecific = value; }
+        }
+
+        /// <summary>
+        /// MeasureText always adds about 1/2 em width of white space on the right,
+        /// even when NoPadding is specified. It returns zero for an empty string.
+        /// To get the precise string width, measure the width of a string containing a
+        /// single period and subtract that from the width of our original string plus a period.
+        /// </summary>
+        public static Size MeasureText(Graphics g,
+            string s, Font font, Size csize, eTextFormat tf)
+        {
+            return (TextDrawing.MeasureString(g, s, font, csize, tf));
+
+            if (font.Italic == true)
+                return (TextDrawing.MeasureString(g, s, font, csize, tf));
+
+            Size sz1 = TextDrawing.MeasureString(g, ".", font, csize, tf);
+            Size sz2 = TextDrawing.MeasureString(g, s + ".", font, csize, tf);
+
+            return (new Size(sz2.Width - sz1.Width, sz2.Height));
+        }
+
+        public static Size MeasureText(Graphics g, string s, Font font)
+        {
+            return (TextDrawing.MeasureString(g, s, font));
+
+            if (font.Italic == true)
+                return (TextDrawing.MeasureString(g, s, font));
+
+            Size sz1 = TextDrawing.MeasureString(g, ".", font);
+            Size sz2 = TextDrawing.MeasureString(g, s + ".", font);
+
+            return (new Size(sz2.Width - sz1.Width, sz2.Height));
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Helpers/XmlHelpers.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Helpers/XmlHelpers.cs
new file mode 100644
index 00000000..e8cfe83e
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Helpers/XmlHelpers.cs	
@@ -0,0 +1,1059 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.IO;
+using System.Runtime.Serialization.Formatters.Binary;
+using System.Security;
+using System.Text.RegularExpressions;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.Charts.Style;
+
+namespace DevComponents.DotNetBar.Charts
+{
+    #region XmlSerializableFont
+
+    static public class XmlSerializableFont
+    {
+        static public string ConvertToString(Font font)
+        {
+            if (font != null)
+            {
+                TypeConverter converter =
+                    TypeDescriptor.GetConverter(typeof(Font));
+
+                return (converter.ConvertToString(font));
+            }
+
+            return (null);
+        }
+
+        static public Font ConvertFromString(string fontString)
+        {
+            TypeConverter converter =
+                TypeDescriptor.GetConverter(typeof(Font));
+
+            Font font = (Font)converter.ConvertFromString(fontString);
+
+            return (font);
+        }
+    }
+
+    #endregion
+
+    #region XmlSerializableImageList
+
+    static public class XmlSerializableImageList
+    {
+        static public string ConvertToString(ImageList list)
+        {
+            TypeConverter converter =
+                TypeDescriptor.GetConverter(typeof(ImageList));
+
+            return (converter.ConvertToString(list));
+        }
+
+        static public ImageList ConvertFromString(string listString)
+        {
+            TypeConverter converter =
+                TypeDescriptor.GetConverter(typeof(ImageList));
+
+            ImageList list = (ImageList)converter.ConvertFromString(listString);
+
+            return (list);
+        }
+    }
+
+    #endregion
+
+    #region SerialElementCollection
+
+    public delegate void Pv(SerialElement se);
+    public delegate void Pc(SerialElement se);
+
+    public class SerialElementCollection : CustomCollection<SerialElement>
+    {
+        #region Private variables
+
+        private int _ReadIndex = -1;
+
+        private SerialElement _ReadSe;
+        private string _Name;
+
+        private int _ValueIndex;
+
+        #endregion
+
+        #region Internal properties
+
+        #region Eof
+
+        internal bool Eof
+        {
+            get { return (_ReadIndex >= Count); }
+        }
+
+        #endregion
+
+        #region Name
+
+        internal string Name
+        {
+            get { return (_Name); }
+            set { _Name = value; }
+        }
+
+        #endregion
+
+        #region ReadIndex
+
+        internal int ReadIndex
+        {
+            get { return (_ReadIndex); }
+            set { _ReadIndex = value; }
+        }
+
+        #endregion
+
+        #region ReadSe
+
+        internal SerialElement ReadSe
+        {
+            get { return (_ReadSe); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region AddStartElement
+
+        /// <summary>
+        /// Adds a 'Start' element to the collection.
+        /// </summary>
+        /// <param name="name"></param>
+        /// <returns></returns>
+        public SerialElement AddStartElement(string name)
+        {
+            SerialElement se = new SerialElement(SerElementType.Start, name);
+
+            Items.Add(se);
+
+            return (se);
+        }
+
+        #endregion
+
+        #region AddEndElement
+
+        /// <summary>
+        /// Adds an 'End' element to the collection.
+        /// </summary>
+        /// <param name="name"></param>
+        /// <returns></returns>
+        public SerialElement AddEndElement(string name)
+        {
+            SerialElement se = new SerialElement(SerElementType.End, name);
+
+            Items.Add(se);
+
+            return (se);
+        }
+
+        #endregion
+
+        #region AddValue
+
+        /// <summary>
+        /// Adds the given object element to the collection.
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public SerialElement AddValue(object value)
+        {
+            SerialElement se = new SerialElement(null, value);
+
+            Items.Add(se);
+
+            return (se);
+        }
+
+        /// <summary>
+        /// Adds the given value to the collection (surrounded
+        /// by a 'Start' and 'End' element pair).
+        /// </summary>
+        /// <param name="name"></param>
+        /// <param name="value"></param>
+        public void AddValue(string name, object value)
+        {
+            Items.Add(new SerialElement(SerElementType.ValueStart, name));
+            Items.Add(new SerialElement(name, value));
+            Items.Add(new SerialElement(SerElementType.ValueEnd, name));
+        }
+
+        /// <summary>
+        /// Adds the given value to the collection (surrounded
+        /// by a 'Start' and 'End' element pair) - but only if the
+        /// value is not equal to the given defaultValue.
+        /// </summary>
+        /// <param name="name"></param>
+        /// <param name="value"></param>
+        /// <param name="defaultValue"></param>
+        public void AddValue(string name, object value, object defaultValue)
+        {
+            if ((defaultValue == null && value != null) ||
+                (defaultValue != null && defaultValue.Equals(value) == false))
+            {
+                AddValue(name, value);
+            }
+        }
+
+        /// <summary>
+        /// Adds the given value Image to the collection (surrounded
+        /// by a 'Start' and 'End' element pair).
+        /// </summary>
+        /// <param name="name"></param>
+        /// <param name="image"></param>
+        public void AddValue(string name, Image image)
+        {
+            if (image != null)
+                AddValue(name, ImageToString(image));
+        }
+
+        #endregion
+
+        #region ImageToString
+
+        private String ImageToString(Image image)
+        {
+            BinaryFormatter bf = new BinaryFormatter();
+            MemoryStream ms = new MemoryStream();
+
+            bf.Serialize(ms, image);
+
+            return (Convert.ToBase64String(ms.ToArray()));
+        }
+
+        #endregion
+
+        #region AddDataValue
+
+        /// <summary>
+        /// Adds the given 'Data' value to the collection (surrounded
+        /// by a 'Start' and 'End' element pair).
+        /// </summary>
+        /// <param name="name"></param>
+        /// <param name="value"></param>
+        public void AddDataValue(string name, object value)
+        {
+            Items.Add(new SerialElement(SerElementType.ValueStart, name));
+            Items.Add(new SerialElement(SerElementType.DataValue, name, value));
+            Items.Add(new SerialElement(SerElementType.ValueEnd, name));
+        }
+
+        /// <summary>
+        /// Adds the given 'Data' value to the collection (surrounded
+        /// by a 'Start' and 'End' element pair) - but only if the
+        /// value is not equal to the given defaultValue.
+        /// </summary>
+        /// <param name="name"></param>
+        /// <param name="value"></param>
+        /// <param name="defaultValue"></param>
+        public void AddDataValue(string name, object value, object defaultValue)
+        {
+            if ((defaultValue == null && value != null) ||
+                (defaultValue != null && defaultValue.Equals(value) == false))
+            {
+                AddDataValue(name, value);
+            }
+        }
+
+        #endregion
+
+        #region AddElement
+
+        /// <summary>
+        /// Adds the given SerialElementCollection to the
+        /// collection, if the given collection is non-empty.
+        /// </summary>
+        /// <param name="sec"></param>
+        /// <returns></returns>
+        public SerialElement AddElement(SerialElementCollection sec)
+        {
+            if (sec != null && sec.Count > 0)
+            {
+                int count = sec.Count;
+
+                if (sec[count - 1].SerType == SerElementType.End)
+                    count--;
+
+                if (sec[0].SerType == SerElementType.Start)
+                    count--;
+
+                if (count > 0)
+                {
+                    SerialElement se = new SerialElement(sec);
+
+                    Items.Add(se);
+
+                    return (se);
+                }
+            }
+
+            return (null);
+        }
+
+        /// <summary>
+        /// Adds the given style to the collection, if
+        /// it is not Empty.
+        /// </summary>
+        /// <param name="style"></param>
+        /// <returns></returns>
+        public SerialElement AddElement(BaseVisualStyle style)
+        {
+            if (style != null && style.IsEmpty == false)
+                return (AddElement(style.GetSerialData("")));
+
+            return (null);
+        }
+
+        #endregion
+
+        #region PutSerialData
+
+        internal void PutSerialData(IProcessSerialElement ipse)
+        {
+            while (Read())
+            {
+                SerialElement se = ReadSe;
+
+                switch (se.SerType)
+                {
+                    case SerElementType.Start:
+                    case SerElementType.ValueStart:
+                        string name = se.Name;
+
+                        PutSerialData(ipse);
+
+                        if (se.Name.Equals(name) == false)
+                            throw new Exception("Expecting " + name + " End");
+
+                        break;
+
+                    case SerElementType.Value:
+                        se.ValueIndex = _ValueIndex++;
+
+                        ipse.ProcessValue(se);
+                        break;
+
+                    case SerElementType.Collection:
+                        int valueIndex = _ValueIndex;
+                        _ValueIndex = 0;
+
+                        ipse.ProcessCollection(se);
+
+                        _ValueIndex = valueIndex;
+                        break;
+
+                    case SerElementType.End:
+                    case SerElementType.ValueEnd:
+                        return;
+                }
+            }
+        }
+
+        #region SkipSerialData
+
+        private void SkipSerialData()
+        {
+            while (Read())
+            {
+                SerialElement se = ReadSe;
+
+                switch (se.SerType)
+                {
+                    case SerElementType.Start:
+                    case SerElementType.ValueStart:
+                        string name = se.Name;
+
+                        SkipSerialData();
+
+                        if (se.Name.Equals(name) == false)
+                            throw new Exception("Expecting " + name + " End");
+
+                        break;
+
+                    case SerElementType.End:
+                    case SerElementType.ValueEnd:
+                        return;
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Read
+
+        internal bool Read()
+        {
+            _ReadIndex++;
+
+            _ReadSe = (_ReadIndex < Count) ? Items[_ReadIndex] : null;
+
+            return (_ReadSe != null);
+        }
+
+        #endregion
+
+        #region Rewind
+
+        internal void Rewind()
+        {
+            _ReadIndex = -1;
+        }
+
+        #endregion
+
+        #region GetItemValue
+
+        internal string GetItemValue(string text)
+        {
+            foreach (SerialElement se in this)
+            {
+                if (se.SerType == SerElementType.Value)
+                {
+                    if (se.Name.Equals(text))
+                        return (se.StringValue);
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region SerialElement
+
+    public class SerialElement
+    {
+        #region Private variables
+
+        private SerElementType _SerType;
+
+        private string _Name;
+        private object _Value;
+
+        private SerialElementCollection _Sec;
+
+        private int _ArrayCount;
+        private int _ValueIndex;
+
+        #endregion
+
+        #region Constructors
+
+        public SerialElement(SerElementType type, string name)
+        {
+            _SerType = type;
+            _Name = name;
+        }
+
+        public SerialElement(string name, object value)
+        {
+            _SerType = SerElementType.Value;
+
+            _Name = name;
+            _Value = value;
+        }
+
+        public SerialElement(SerElementType type, string name, object value)
+        {
+            _SerType = type;
+
+            _Name = name;
+            _Value = value;
+        }
+
+        public SerialElement(SerialElementCollection sec)
+        {
+            _SerType = SerElementType.Collection;
+
+            _Sec = sec;
+        }
+
+        #endregion
+
+        #region Public properties
+
+        /// <summary>
+        /// Element name
+        /// </summary>
+        public string Name
+        {
+            get { return (_Name); }
+            set { _Name = value; }
+        }
+
+        /// <summary>
+        /// Element type.
+        /// </summary>
+        public SerElementType SerType
+        {
+            get { return (_SerType); }
+            set { _SerType = value; }
+        }
+
+        /// <summary>
+        /// Element value
+        /// </summary>
+        public object Value
+        {
+            get { return (_Value); }
+            set { _Value = value; }
+        }
+
+        /// <summary>
+        /// Element sub-collection.
+        /// </summary>
+        public SerialElementCollection Sec
+        {
+            get { return (_Sec); }
+            set { _Sec = value; }
+        }
+
+        #endregion
+
+        #region Internal properties
+
+        #region ArrayCount
+
+        internal int ArrayCount
+        {
+            get { return (_ArrayCount); }
+            set { _ArrayCount = value; }
+        }
+
+        #endregion
+
+        #region ColorValue
+
+        internal Color ColorValue
+        {
+            get { return (GetValueColor()); }
+        }
+
+        #endregion
+
+        #region DataValue
+
+        internal object DataValue
+        {
+            get
+            {
+                if (Value is string)
+                {
+                    string s = (string)Value;
+
+                    if (s.StartsWith("\"") && s.EndsWith("\""))
+                        return (s.Substring(1, s.Length - 2));
+
+                    if (s.StartsWith("#") && s.EndsWith("#"))
+                        return (DateTime.Parse(s.Substring(1, s.Length - 2)));
+
+                    if (s.StartsWith("{") && s.EndsWith("}"))
+                        return (ColorTranslator.FromHtml(s.Substring(1, s.Length - 2)));
+
+                    if (s.StartsWith("[") && s.EndsWith("]"))
+                    {
+                        s = s.Substring(1, s.Length - 2);
+
+                        string[] t = s.Split(',');
+
+                        TypeCode tc = TypeCode.Double;
+
+                        if (t.Length > 1)
+                            tc = (TypeCode)int.Parse(t[1]);
+
+                        return (GetNumericValue(t[0], tc));
+                    }
+
+                    if (s.Equals("xsi:nil=\"true\""))
+                        return (null);
+
+                    return (s);
+                }
+
+                return (null);
+            }
+        }
+
+        #endregion
+
+        #region StringValue
+
+        internal string StringValue
+        {
+            get
+            {
+                if (Value is string)
+                {
+                    string s = (string)Value;
+
+                    if (s.StartsWith("\"") && s.EndsWith("\""))
+                        return (s.Substring(1, s.Length - 2));
+
+                    return (s);
+                }
+
+                return ("");
+            }
+        }
+
+        #endregion
+
+        #region ValueIndex
+
+        internal int ValueIndex
+        {
+            get { return (_ValueIndex); }
+            set { _ValueIndex = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetValueColor
+
+        internal Color GetValueColor()
+        {
+            string s = StringValue;
+
+            if (string.IsNullOrEmpty(s) == false)
+            {
+                if (s.IndexOf('=') >= 0)
+                {
+                    string pattern = @"A=(?<A>\d+)\s*,\s*R=(?<R>\d+)\s*,\s*G=(?<G>\d+)\s*,\s*B=(?<B>\d+)";
+
+                    Match match = Regex.Match(s, pattern);
+
+                    if (match.Success == true)
+                    {
+                        Color color = Color.FromArgb(
+                            int.Parse(match.Groups["A"].Value),
+                            int.Parse(match.Groups["R"].Value),
+                            int.Parse(match.Groups["G"].Value),
+                            int.Parse(match.Groups["B"].Value));
+
+                        return (color);
+                    }
+                }
+                else
+                {
+                    return (Color)Color.FromName(s);
+                }
+            }
+
+            return (Color.Empty);
+        }
+
+        #endregion
+
+        #region GetValueString
+
+        internal string GetValueString()
+        {
+            string s = GetValueStringEx();
+
+            string encodedXml = SecurityElement.Escape(s);
+
+            return (encodedXml);
+        }
+
+        internal string GetValueStringEx()
+        {
+            object value = Value;
+
+            if (value == null)
+                return ("xsi:nil=\"true\"");
+
+            if (value is string)
+                return ((string)value);
+
+            if (value is DateTime)
+                return (((DateTime)value).ToString("o"));
+
+            if (value is Color)
+            {
+                Color color = (Color)value;
+
+                string s = color.ToString();
+
+                int start = s.IndexOf('[') + 1;
+                int end = s.IndexOf(']');
+
+                s = s.Substring(start, end - start);
+
+                return (s);
+            }
+
+            return (value.ToString());
+        }
+
+        #endregion
+
+        #region GetDataValueString
+
+        internal string GetDataValueString()
+        {
+            object value = Value;
+
+            if (value == null)
+                return ("xsi:nil=\"true\"");
+
+            if (value is string)
+                return ("\"" + value + "\"");
+
+            if (value is DateTime)
+                return ("#" + ((DateTime)value).ToString("o") + "#");
+
+            if (value is Color)
+                return ("{" + ColorTranslator.ToHtml((Color)value) + "}");
+
+            if (Value is Enum == false)
+            {
+                TypeCode typeCode;
+
+                if (IsNumericValue(out typeCode))
+                {
+                    string s = value.ToString();
+
+                    return ("[" + s + "," + (int)typeCode + "]");
+                }
+            }
+
+            return (value.ToString());
+        }
+
+        #endregion
+
+        #region GetValueEnum
+
+        internal object GetValueEnum(Type type)
+        {
+            return (Enum.Parse(type, StringValue));
+        }
+
+        #endregion
+
+        #region GetValuePoint
+
+        internal Point GetValuePoint()
+        {
+            string svalue = StringValue;
+
+            if (string.IsNullOrEmpty(svalue) == false)
+            {
+                string pattern = @"(?<x>X=\d+)\s,\s(?<y>Y=\d+)";
+
+                Match match = Regex.Match(svalue, pattern);
+
+                if (match.Success == true)
+                {
+                    Point pt = new Point(
+                        int.Parse(match.Groups["x"].Value),
+                        int.Parse(match.Groups["y"].Value));
+
+                    return (pt);
+                }
+            }
+
+            return (Point.Empty);
+        }
+
+        #endregion
+
+        #region GetValuePointF
+
+        internal PointF GetValuePointF()
+        {
+            string svalue = StringValue;
+
+            if (string.IsNullOrEmpty(svalue) == false)
+            {
+                string pattern = @"(?<x>X=\d+)\s,\s(?<y>Y=\d+)";
+
+                Match match = Regex.Match(svalue, pattern);
+
+                if (match.Success == true)
+                {
+                    PointF ptf = new PointF(
+                        float.Parse(match.Groups["x"].Value),
+                        float.Parse(match.Groups["y"].Value));
+
+                    return (ptf);
+                }
+            }
+
+            return (PointF.Empty);
+        }
+
+        #endregion
+
+        #region GetValueSize
+
+        internal Size GetValueSize()
+        {
+            string svalue = StringValue;
+
+            if (string.IsNullOrEmpty(svalue) == false)
+            {
+                string pattern = @"Width=(?<width>\d+)\s*,\s*Height=(?<height>\d+)";
+
+                Match match = Regex.Match(svalue, pattern);
+
+                if (match.Success == true)
+                {
+                    Size size = new Size(
+                        int.Parse(match.Groups["width"].Value),
+                        int.Parse(match.Groups["height"].Value));
+
+                    return (size);
+                }
+            }
+
+            return (Size.Empty);
+        }
+
+        #endregion
+
+        #region GetValueRect
+
+        internal Rectangle GetValueRect()
+        {
+            string svalue = StringValue;
+
+            if (string.IsNullOrEmpty(svalue) == false)
+            {
+                string pattern = @"(?<x>X=\d+)\s,\s(?<x>Y=\d+)\s,\s(?<width>Width=\d+)\s,\s(?<height>Height=\d+)";
+
+                Match match = Regex.Match(svalue, pattern);
+
+                if (match.Success == true)
+                {
+                    Rectangle rect = new Rectangle(
+                        int.Parse(match.Groups["x"].Value),
+                        int.Parse(match.Groups["y"].Value),
+                        int.Parse(match.Groups["width"].Value),
+                        int.Parse(match.Groups["height"].Value));
+
+                    return (rect);
+                }
+            }
+
+            return (Rectangle.Empty);
+        }
+
+        #endregion
+
+        #region GetValueImage
+
+        internal Image GetValueImage()
+        {
+            string svalue = StringValue;
+
+            if (string.IsNullOrEmpty(svalue) == false)
+                return (StringToImage(svalue));
+
+            return (null);
+        }
+
+        #region StringToImage
+
+        private Image StringToImage(String data)
+        {
+            MemoryStream ms = new MemoryStream(Convert.FromBase64String(data));
+            BinaryFormatter bf = new BinaryFormatter();
+
+            Image image = (Image)bf.Deserialize(ms);
+
+            return (image);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IsNumericValue
+
+        private bool IsNumericValue(out TypeCode typeCode)
+        {
+            typeCode = Type.GetTypeCode(Value.GetType());
+
+            switch (typeCode)
+            {
+                case TypeCode.Byte:
+                case TypeCode.Decimal:
+                case TypeCode.Double:
+                case TypeCode.Int16:
+                case TypeCode.Int32:
+                case TypeCode.Int64:
+                case TypeCode.SByte:
+                case TypeCode.Single:
+                case TypeCode.UInt16:
+                case TypeCode.UInt32:
+                case TypeCode.UInt64:
+                    return (true);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region GetNumericValue
+
+        private object GetNumericValue(string s, TypeCode typeCode)
+        {
+            switch (typeCode)
+            {
+                case TypeCode.Byte:
+                    return (Byte.Parse(s));
+
+                case TypeCode.Decimal:
+                    return (Decimal.Parse(s));
+
+                case TypeCode.Double:
+                    return (Double.Parse(s));
+
+                case TypeCode.Int16:
+                    return (Int16.Parse(s));
+
+                case TypeCode.Int32:
+                    return (Int32.Parse(s));
+
+                case TypeCode.Int64:
+                    return (Int64.Parse(s));
+
+                case TypeCode.SByte:
+                    return (SByte.Parse(s));
+
+                case TypeCode.Single:
+                    return (Single.Parse(s));
+
+                case TypeCode.UInt16:
+                    return (UInt16.Parse(s));
+
+                case TypeCode.UInt32:
+                    return (UInt32.Parse(s));
+
+                case TypeCode.UInt64:
+                    return (UInt64.Parse(s));
+            }
+
+            return (false);
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region Interfaces
+
+    internal interface IProcessSerialElement
+    {
+        void ProcessValue(SerialElement se);
+        void ProcessCollection(SerialElement se);
+    }
+
+    #endregion
+
+    #region SerElementType enum
+
+    public enum SerElementType
+    {
+        Start,
+        End,
+
+        ValueStart,
+        ValueEnd,
+
+        Value,
+        DataValue,
+
+        Collection,
+    }
+
+    #endregion
+
+    #region StreamWriterNC
+
+    public class StreamWriterNC : IDisposable
+    {
+        #region Private variables
+
+        private Stream _Stream;
+
+        #endregion
+
+        public StreamWriterNC(Stream stream)
+        {
+            _Stream = stream;
+
+            stream.Position = 0;
+        }
+
+        #region Public properties
+
+        public Stream Stream
+        {
+            get { return (_Stream); }
+            internal set { _Stream = value; }
+        }
+
+        #endregion
+
+        #region Write
+
+        public void Write(string s)
+        {
+            byte[] bytes = new byte[s.Length * sizeof(char)];
+
+            Buffer.BlockCopy(s.ToCharArray(), 0, bytes, 0, bytes.Length);
+
+            _Stream.Write(bytes, 0, bytes.Length);
+        }
+
+        #endregion
+
+        #region WriteLine
+
+        public void WriteLine(string s)
+        {
+            Write(s + "\n");
+        }
+
+        public void WriteLine()
+        {
+            Write("\n");
+        }
+
+        #endregion
+
+        #region Dispose
+
+        public void Dispose()
+        {
+            _Stream.Flush();
+        }
+
+        #endregion
+    }
+
+    #endregion
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Licensing.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Licensing.cs
new file mode 100644
index 00000000..1a2499bf
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Licensing.cs	
@@ -0,0 +1,147 @@
+using System;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Charts
+{
+    internal class Licensing
+    {
+#if !TRIAL
+        internal static bool KeyValidated;
+        internal static int KeyValidated2;
+
+        internal static bool ValidateLicenseKey(string key)
+        {
+            string[] parts = key.Split('-');
+            int i = 10;
+
+            foreach (string s in parts)
+            {
+                if (s == "88405280")
+                    i++;
+                else if (s == "D06E")
+                    i += 10;
+                else if (s == "4617")
+                    i += 8;
+                else if (s == "8810")
+                    i += 12;
+                else if (s == "64462F60FA93")
+                    i += 3;
+            }
+
+            if (i == 29)
+                return true;
+
+            KeyValidated = true;
+
+            return (false);
+        }
+
+        internal static bool CheckLicenseKey(string key)
+        {
+            // {F962CEC7-CD8F-4911-A9E9-CAB39962FC1F}, 114
+            string[] parts = key.Split('-');
+            int test = 0;
+
+            for (int i = parts.Length - 1; i >= 0; i--)
+            {
+                if (parts[i] == "CD8F")
+                    test += 12;
+                else if (parts[i] == "CAB39962FC1F")
+                    test += 2;
+                else if (parts[i] == "A9E9")
+                    test += 3;
+                else if (parts[i] == "4911")
+                    test += 7;
+                else if (parts[i] == "F962CEC7")
+                    test += 13;
+            }
+
+            KeyValidated2 = test + 77;
+
+            if (test == 23)
+                return false;
+
+            return true;
+        }
+#endif
+
+#if TRIAL
+		private static Color m_ColorExpFlag = Color.Empty;
+		internal static int ColorCountExp;
+
+		internal static bool ColorExpAlt()
+		{
+			Color clr=SystemColors.Control;
+			Color clr2;
+			Color clr3;
+			clr2=clr;
+
+			if(clr2.ToArgb()==clr.ToArgb())
+			{
+				clr3=clr2;
+			}
+			else
+			{
+				clr3=clr;
+			}
+
+			ColorCountExp=clr.A;
+
+			if(!m_ColorExpFlag.IsEmpty)
+			{
+				return (m_ColorExpFlag==Color.Black?false:true);
+			}
+			try
+			{
+				Microsoft.Win32.RegistryKey key=Microsoft.Win32.Registry.ClassesRoot;
+				key=key.CreateSubKey("CLSID\\{542FD3B2-2F65-4290-AB4F-EBFF0444C54C}\\InprocServer32");
+			
+				try
+				{
+					if(key.GetValue("")==null || key.GetValue("").ToString()=="")
+					{
+						key.SetValue("",DateTime.Today.ToOADate().ToString());
+					}
+					else
+					{
+						if(key.GetValue("").ToString()=="windows3.dll")
+						{
+							m_ColorExpFlag=Color.White;
+							key.Close();
+							key=null;
+							return true;
+						}
+						DateTime date=DateTime.FromOADate(double.Parse(key.GetValue("").ToString()));
+						if(((TimeSpan)DateTime.Today.Subtract(date)).TotalDays>30)
+						{
+							m_ColorExpFlag=Color.White;
+							key.SetValue("","windows3.dll");
+							key.Close();
+							key=null;
+							return true;
+						}
+						if(((TimeSpan)DateTime.Today.Subtract(date)).TotalDays<0)
+						{
+							m_ColorExpFlag=Color.White;
+							key.SetValue("","windows2.dll");
+							key.Close();
+							key=null;
+							return true;
+						}
+					}
+				}
+				finally
+				{
+					if(key!=null)
+						key.Close();
+				}
+			}
+			catch{}
+
+			m_ColorExpFlag=Color.Black;
+
+			return false;
+		}
+#endif
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/OpenHand.cur b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/OpenHand.cur
new file mode 100644
index 00000000..d04e8481
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/OpenHand.cur differ
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Primitives/ColorFactory.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Primitives/ColorFactory.cs
new file mode 100644
index 00000000..dd518c68
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Primitives/ColorFactory.cs	
@@ -0,0 +1,74 @@
+using System;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Charts.Primitives
+{
+    public class ColorFactory
+    {
+        /// <summary>
+		/// Converts hex string to Color type.
+		/// </summary>
+		/// <param name="rgbHex">Hexadecimal color representation.</param>
+		/// <returns>Reference to Color object.</returns>
+		public static Color GetColor(string rgbHex)
+        {
+            if (string.IsNullOrEmpty(rgbHex) == false)
+            {
+                if (rgbHex.Length == 8)
+                {
+                    return (Color.FromArgb(Convert.ToInt32(rgbHex.Substring(0, 2), 16),
+                                           Convert.ToInt32(rgbHex.Substring(2, 2), 16),
+                                           Convert.ToInt32(rgbHex.Substring(4, 2), 16),
+                                           Convert.ToInt32(rgbHex.Substring(6, 2), 16)));
+                }
+
+                return (Color.FromArgb(Convert.ToInt32(rgbHex.Substring(0, 2), 16),
+                                       Convert.ToInt32(rgbHex.Substring(2, 2), 16),
+                                       Convert.ToInt32(rgbHex.Substring(4, 2), 16)));
+            }
+
+            return Color.Empty;
+        }
+
+        /// <summary>
+        /// Converts int value to Color type.
+        /// </summary>
+        /// <param name="rgb">Color representation as 32-bit RGB value.</param>
+        /// <returns>Reference to Color object.</returns>
+        public static Color GetColor(int rgb)
+        {
+            return ((rgb == -1) ? Color.Empty :
+                Color.FromArgb((rgb & 0xFF0000) >> 16, (rgb & 0xFF00) >> 8, rgb & 0xFF));
+        }
+
+        /// <summary>
+        /// Converts int values to Color type.
+        /// </summary>
+        /// <param name="alpha"></param>
+        /// <param name="rgb">Color representation as 32-bit RGB value.</param>
+        /// <returns>Reference to Color object.</returns>
+        public static Color GetColor(int alpha, int rgb)
+        {
+            return ((rgb == -1) ? Color.Empty :
+                Color.FromArgb(alpha, (rgb & 0xFF0000) >> 16, (rgb & 0xFF00) >> 8, rgb & 0xFF));
+        }
+
+        /// <summary>
+        /// Converts int values to Color type.
+        /// </summary>
+        /// <returns>Reference to Color object.</returns>
+        public static Color GetColor(int red, int green, int blue)
+        {
+            return (ColorFactory.GetColor(255, red, green, blue));
+        }
+
+        /// <summary>
+        /// Converts int values to Color type.
+        /// </summary>
+        /// <returns>Reference to Color object.</returns>
+        public static Color GetColor(int alpha, int red, int green, int blue)
+        {
+            return (Color.FromArgb(alpha, red, green, blue));
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Primitives/Converters.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Primitives/Converters.cs
new file mode 100644
index 00000000..186d028c
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Primitives/Converters.cs	
@@ -0,0 +1,33 @@
+using System;
+using System.ComponentModel;
+using System.Globalization;
+
+namespace DevComponents.DotNetBar.Charts.Primitives
+{
+    #region BlankExpandableObjectConverter
+
+    ///<summary>
+    /// BlankExpandableObjectConverter
+    ///</summary>
+    public class BlankExpandableObjectConverter : ExpandableObjectConverter
+    {
+        ///<summary>
+        /// ConvertTo
+        ///</summary>
+        ///<param name="context"></param>
+        ///<param name="culture"></param>
+        ///<param name="value"></param>
+        ///<param name="destinationType"></param>
+        ///<returns></returns>
+        public override object ConvertTo(
+            ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+        {
+            if (destinationType == typeof(string))
+                return (" ");
+
+            return (base.ConvertTo(context, culture, value, destinationType));
+        }
+    }
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Primitives/CustomCollection.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Primitives/CustomCollection.cs
new file mode 100644
index 00000000..8e982234
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Primitives/CustomCollection.cs	
@@ -0,0 +1,1377 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Runtime.InteropServices;
+using DevComponents.DotNetBar.Charts.Style;
+
+namespace DevComponents.DotNetBar.Charts
+{
+    /// <summary>
+    /// Represents custom collection with INotifyPropertyChanged and INotifyCollectionChanged interface support.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    [Serializable, DebuggerDisplay("Count = {Count}"), ComVisible(false)]
+    public class CustomCollection<T> : IList<T>, IList, INotifyPropertyChanged, INotifyCollectionChanged
+    {
+        #region Events
+
+        /// <summary>
+        /// Occurs when property value has changed.
+        /// </summary>
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        #endregion
+
+        #region Private variables
+
+        private SimpleMonitor _Monitor;
+        private object _SyncRoot;
+        private readonly IList<T> _Items;
+
+        #endregion
+
+        #region Constructors
+
+        /// <summary>
+        /// Creates new instance of object.
+        /// </summary>
+        public CustomCollection()
+        {
+            _Monitor = new SimpleMonitor();
+            _Items = new List<T>();
+        }
+
+        /// <summary>
+        /// Creates new instance of object.
+        /// </summary>
+        public CustomCollection(int capacity)
+        {
+            _Monitor = new SimpleMonitor();
+            _Items = new List<T>(capacity);
+        }
+
+        /// <summary>
+        /// Creates new instance of object.
+        /// </summary>
+        /// <param name="list">List to initialize collection with.</param>
+        public CustomCollection(IList<T> list)
+        {
+            if (list == null)
+                throw new ArgumentNullException("list");
+
+            _Monitor = new SimpleMonitor();
+            _Items = list;
+        }
+
+        #endregion
+
+        #region Add
+
+        /// <summary>
+        /// Add item to collection.
+        /// </summary>
+        /// <param name="item">Item to add.</param>
+        public void Add(T item)
+        {
+            if (_Items.IsReadOnly)
+                throw new NotSupportedException("collection is read-only");
+
+            InsertItem(_Items.Count, item);
+        }
+
+        #endregion
+
+        #region AddRange
+
+        /// <summary>
+        /// Add range of items to collection.
+        /// </summary>
+        /// <param name="collection"></param>
+        public void AddRange(IEnumerable<T> collection)
+        {
+            if (_Items.IsReadOnly)
+                throw new NotSupportedException("collection is read-only");
+
+            CheckReentrancy();
+
+            int index = _Items.Count;
+
+            foreach (T item in collection)
+                _Items.Insert(index++, item);
+
+            OnPropertyChanged(CountString);
+
+            List<T> list = new List<T>(collection);
+
+            NotifyCollectionChangedEventArgs e = new
+                NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Add, list);
+
+            OnCollectionChanged(e);
+        }
+
+        #endregion
+
+        #region Clear
+
+        /// <summary>
+        /// Remove all items from collection.
+        /// </summary>
+        public void Clear()
+        {
+            if (_Items.IsReadOnly)
+                throw new NotSupportedException("collection is read-only");
+
+            ClearItems();
+        }
+
+        /// <summary>
+        /// Remove all items from collection.
+        /// </summary>
+        protected virtual void ClearItems()
+        {
+            CheckReentrancy();
+
+            _Items.Clear();
+
+            OnPropertyChanged(CountString);
+            OnPropertyChanged(ItemString);
+
+            OnCollectionReset();
+        }
+
+        #endregion
+
+        #region Contains
+
+        /// <summary>
+        /// Checks whether collection contains item.
+        /// </summary>
+        /// <param name="item">Item to look for.</param>
+        /// <returns>true if item is in collection.</returns>
+        public bool Contains(T item)
+        {
+            OnCollectionReadAccess();
+
+            return (_Items.Contains(item));
+        }
+
+        #endregion
+
+        #region CopyTo
+
+        /// <summary>
+        /// Copy collection to array.
+        /// </summary>
+        /// <param name="array">Array to copy to.</param>
+        /// <param name="index">Index to copy from.</param>
+        public void CopyTo(T[] array, int index)
+        {
+            OnCollectionReadAccess();
+
+            _Items.CopyTo(array, index);
+        }
+
+        #endregion
+
+        #region Count
+
+        /// <summary>
+        /// Returns number of items in collection.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public int Count
+        {
+            get
+            {
+                OnCollectionReadAccess();
+
+                return (_Items.Count);
+            }
+        }
+
+        #endregion
+
+        #region CountString
+
+        protected string CountString
+        {
+            get { return ("Count"); }
+        }
+
+        #endregion
+
+        #region GetEnumerator
+
+        /// <summary>
+        /// Gets enumerator for collection.
+        /// </summary>
+        /// <returns>Enumerator.</returns>
+        public IEnumerator<T> GetEnumerator()
+        {
+            OnCollectionReadAccess();
+
+            return (_Items.GetEnumerator());
+        }
+
+        #endregion
+
+        #region Indexer[int]
+
+        /// <summary>
+        /// Returns item at index.
+        /// </summary>
+        /// <param name="index">Index of item.</param>
+        /// <returns>Item at index.</returns>
+        public T this[int index]
+        {
+            get
+            {
+                OnCollectionReadAccess();
+
+                return (_Items[index]);
+            }
+
+            set
+            {
+                if (_Items.IsReadOnly)
+                    throw new NotSupportedException("collection is read-only");
+
+                if ((index < 0) || (index >= _Items.Count))
+                    throw new ArgumentOutOfRangeException();
+
+                SetItem(index, value);
+            }
+        }
+
+        #endregion
+
+        #region IndexOf
+
+        /// <summary>
+        /// Returns index of an item.
+        /// </summary>
+        /// <param name="item">Reference to item.</param>
+        /// <returns>Index of item.</returns>
+        public int IndexOf(T item)
+        {
+            OnCollectionReadAccess();
+
+            return (_Items.IndexOf(item));
+        }
+
+        #endregion
+
+        #region Insert
+
+        /// <summary>
+        /// Insert item at specified location.
+        /// </summary>
+        /// <param name="index">Index to insert item in.</param>
+        /// <param name="item">Item to insert.</param>
+        public void Insert(int index, T item)
+        {
+            if ((index < 0) || (index > _Items.Count))
+                throw new ArgumentOutOfRangeException("index");
+
+            InsertItem(index, item);
+        }
+
+        #endregion
+
+        #region InsertItem
+
+        /// <summary>
+        /// Inserts item.
+        /// </summary>
+        /// <param name="index">Index to insert item at.</param>
+        /// <param name="item">Reference to item.</param>
+        protected virtual void InsertItem(int index, T item)
+        {
+            CheckReentrancy();
+
+            _Items.Insert(index, item);
+
+            OnPropertyChanged(CountString);
+            OnCollectionChanged(NotifyCollectionChangedAction.Add, item, index);
+        }
+
+        #endregion
+
+        #region IsCompatibleObject
+
+        private static bool IsCompatibleObject(object value)
+        {
+            return (value is T) || (value == null && !typeof (T).IsValueType);
+        }
+
+        #endregion
+
+        #region ItemString
+
+        protected string ItemString
+        {
+            get { return ("Item[]"); }
+        }
+
+        #endregion
+
+        #region Remove
+
+        /// <summary>
+        /// Removes item from collection.
+        /// </summary>
+        /// <param name="item">Item to remove.</param>
+        /// <returns>true if item was removed.</returns>
+        public bool Remove(T item)
+        {
+            if (_Items.IsReadOnly)
+                throw new NotSupportedException("collection is read-only");
+
+            int index = _Items.IndexOf(item);
+
+            if (index < 0)
+                return (false);
+
+            RemoveItem(index);
+
+            return (true);
+        }
+
+        #endregion
+
+        #region RemoveAt
+
+        /// <summary>
+        /// Remove item at specified location.
+        /// </summary>
+        /// <param name="index">Index of item to remove.</param>
+        public void RemoveAt(int index)
+        {
+            if (_Items.IsReadOnly)
+                throw new NotSupportedException("collection is read-only");
+
+            if ((index < 0) || (index >= _Items.Count))
+                throw new ArgumentOutOfRangeException();
+
+            RemoveItem(index);
+        }
+
+        #endregion
+
+        #region RemoveItem
+
+        /// <summary>
+        /// Remove item at specified location.
+        /// </summary>
+        /// <param name="index">Index of item to remove.</param>
+        protected virtual void RemoveItem(int index)
+        {
+            CheckReentrancy();
+
+            object item = _Items[index];
+            _Items.RemoveAt(index);
+
+            OnPropertyChanged(CountString);
+            OnCollectionChanged(NotifyCollectionChangedAction.Remove, item, index);
+        }
+
+        #endregion
+
+        #region RemoveRange
+
+        /// <summary>
+        /// Removes a range of items from the collection.
+        /// </summary>
+        /// <param name="collection"></param>
+        public void RemoveRange(int index, int count)
+        {
+            if (_Items.IsReadOnly)
+                throw new NotSupportedException("collection is read-only");
+
+            CheckReentrancy();
+
+            List<T> list = new List<T>(count);
+
+            for (int i = index + count - 1; i >= index; i--)
+            {
+                if ((uint)i < _Items.Count)
+                {
+                    list.Add(_Items[i]);
+
+                    _Items.RemoveAt(i);
+                }
+            }
+
+            OnPropertyChanged(CountString);
+
+            NotifyCollectionChangedEventArgs e = new
+                NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Remove, list);
+
+            OnCollectionChanged(e);
+        }
+
+        #endregion
+
+        #region SetItem
+
+        /// <summary>
+        /// Set item on location.
+        /// </summary>
+        /// <param name="index">Index</param>
+        /// <param name="item">Item to assign.</param>
+        protected virtual void SetItem(int index, T item)
+        {
+            CheckReentrancy();
+
+            T oldItem = _Items[index];
+            _Items[index] = item;
+
+            OnPropertyChanged(CountString);
+            OnPropertyChanged(ItemString);
+
+            OnCollectionChanged(NotifyCollectionChangedAction.Replace, oldItem, item, index);
+        }
+
+        #endregion
+
+        #region IList support
+
+        #region Add
+
+        int IList.Add(object value)
+        {
+            if (_Items.IsReadOnly)
+                throw new NotSupportedException("collection is read-only");
+
+            VerifyValueType(value);
+
+            Add((T)value);
+
+            return (Count - 1);
+        }
+
+        #endregion
+
+        #region Contains
+
+        bool IList.Contains(object value)
+        {
+            return (IsCompatibleObject(value) && Contains((T)value));
+        }
+
+        #endregion
+
+        #region GetItemsDirect
+
+        /// <summary>
+        /// Returns items directly without checks.
+        /// </summary>
+        /// <returns>List of items.</returns>
+        protected IList<T> GetItemsDirect()
+        {
+            return (_Items);
+        }
+
+        #endregion
+
+        #region Indexer[int]
+
+        object IList.this[int index]
+        {
+            get
+            {
+                OnCollectionReadAccess();
+                return (_Items[index]);
+            }
+            set
+            {
+                VerifyValueType(value);
+                this[index] = (T)value;
+            }
+        }
+
+        #region IndexOf
+
+        int IList.IndexOf(object value)
+        {
+            OnCollectionReadAccess();
+
+            return (IsCompatibleObject(value) ? IndexOf((T) value) : -1);
+        }
+
+        #endregion
+
+        #region Insert
+
+        void IList.Insert(int index, object value)
+        {
+            if (_Items.IsReadOnly)
+                throw new NotSupportedException("collection is read-only");
+            
+            VerifyValueType(value);
+
+            Insert(index, (T)value);
+        }
+
+        #endregion
+
+        #region IsFixedSize
+
+        bool IList.IsFixedSize
+        {
+            get
+            {
+                IList items = _Items as IList;
+
+                return ((items != null) && items.IsFixedSize);
+            }
+        }
+
+        #endregion
+
+        #region IsReadOnly
+
+        bool IList.IsReadOnly
+        {
+            get { return (_Items.IsReadOnly); }
+        }
+
+        #endregion
+
+        #region Items
+
+        /// <summary>
+        /// Returns the IList interface for items in collection.
+        /// </summary>
+        protected IList<T> Items
+        {
+            get
+            {
+                OnCollectionReadAccess();
+
+                return (_Items);
+            }
+        }
+
+        #endregion
+
+        #region Remove
+
+        void IList.Remove(object value)
+        {
+            if (_Items.IsReadOnly)
+                throw new NotSupportedException("collection is read-only");
+
+            if (IsCompatibleObject(value))
+                Remove((T)value);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region VerifyValueType
+
+        private static void VerifyValueType(object value)
+        {
+            if (!IsCompatibleObject(value))
+                throw new ArgumentException("value is of wrong type");
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IEnumerable.GetEnumerator
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            OnCollectionReadAccess();
+
+            return (_Items.GetEnumerator());
+        }
+
+        #endregion
+
+        #region ICollection support
+
+        #region CopyTo
+
+        void ICollection.CopyTo(Array array, int index)
+        {
+            CheckReentrancy();
+            OnCollectionReadAccess();
+
+            if (array == null)
+                throw new ArgumentNullException("array");
+
+            if (array.Rank != 1)
+                throw new ArgumentException("Argument array.Rank multi-dimensional not supported");
+
+            if (array.GetLowerBound(0) != 0)
+                throw new ArgumentException("Argument array non zero lower bound not supported");
+
+            if (index < 0)
+                throw new ArgumentOutOfRangeException("index", "index must be non-negative number");
+
+            if ((array.Length - index) < Count)
+                throw new ArgumentException("array too small");
+
+            T[] localArray = array as T[];
+
+            if (localArray != null)
+            {
+                _Items.CopyTo(localArray, index);
+            }
+            else
+            {
+                Type elementType = array.GetType().GetElementType();
+                Type c = typeof(T);
+
+                if (elementType == null ||
+                    (!elementType.IsAssignableFrom(c) && !c.IsAssignableFrom(elementType)))
+                {
+                    throw new ArgumentException("Argument array of invalid type");
+                }
+
+                object[] objArray = array as object[];
+
+                if (objArray == null)
+                    throw new ArgumentException("Argument array invalid type");
+
+                int count = _Items.Count;
+
+                try
+                {
+                    for (int i = 0; i < count; i++)
+                        objArray[index++] = _Items[i];
+                }
+                catch (ArrayTypeMismatchException)
+                {
+                    throw new ArgumentException("Argument array invalid type");
+                }
+            }
+        }
+
+        #endregion
+
+        #region IsSynchronized
+
+        bool ICollection.IsSynchronized
+        {
+            get { return false; }
+        }
+
+        #endregion
+
+        #region IsReadOnly
+
+        bool ICollection<T>.IsReadOnly
+        {
+            get { return (_Items.IsReadOnly); }
+        }
+
+        #endregion
+
+        #region SyncRoot
+
+        object ICollection.SyncRoot
+        {
+            get
+            {
+                if (_SyncRoot == null)
+                {
+                    ICollection items = _Items as ICollection;
+
+                    if (items != null)
+                        _SyncRoot = items.SyncRoot;
+                    else
+                        System.Threading.Interlocked.CompareExchange(ref _SyncRoot, new object(), null);
+                }
+
+                return (_SyncRoot);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region OnCollectionReadAccess
+
+        /// <summary>
+        /// Occurs when collection is read.
+        /// </summary>
+        protected virtual void OnCollectionReadAccess()
+        {
+        }
+
+        #endregion
+
+        #region OnPropertyChanged
+
+        /// <summary>
+        /// Occurs when collection property has changed.
+        /// </summary>
+        /// <param name="e">Event arguments.</param>
+        protected virtual void OnPropertyChanged(PropertyChangedEventArgs e)
+        {
+            PropertyChangedEventHandler eh = PropertyChanged;
+
+            if (eh != null)
+                eh(this, e);
+        }
+
+        /// <summary>
+        /// Default PropertyChanged processing
+        /// </summary>
+        /// <param name="s"></param>
+        protected void OnPropertyChanged(string s)
+        {
+            if (PropertyChanged != null)
+                OnPropertyChanged(new PropertyChangedEventArgs(s));
+        }
+
+        protected void OnPropertyChangedEx(string s, VisualChangeType changeType)
+        {
+            if (PropertyChanged != null)
+                OnPropertyChanged(new VisualPropertyChangedEventArgs(s, changeType));
+        }
+
+        protected void OnStyleChanged(string property,
+            INotifyPropertyChanged oldValue, INotifyPropertyChanged newValue)
+        {
+            StyleVisualChangeHandler(oldValue, newValue);
+
+            OnPropertyChanged(property);
+        }
+
+        #region StyleVisualChangeHandler
+
+        protected virtual void StyleVisualChangeHandler(
+            INotifyPropertyChanged oldValue, INotifyPropertyChanged newValue)
+        {
+            if (oldValue != null)
+                oldValue.PropertyChanged -= StyleChanged;
+
+            if (newValue != null)
+                newValue.PropertyChanged += StyleChanged;
+        }
+
+        #region StyleChanged
+
+        /// <summary>
+        /// Occurs when one of element visual styles has property changes.
+        /// Default implementation invalidates visual appearance of element.
+        /// </summary>
+        /// <param name="sender">VisualStyle that changed.</param>
+        /// <param name="e">Event arguments.</param>
+        protected virtual void StyleChanged(object sender, PropertyChangedEventArgs e)
+        {
+            VisualChangeType changeType = ((VisualPropertyChangedEventArgs)e).ChangeType;
+
+            OnPropertyChangedEx(e.PropertyName, changeType);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region BlockReentrancy
+
+        /// <summary>
+        /// Blocks the collection reentrancy.
+        /// </summary>
+        /// <returns>IDisposable to end reentrancy</returns>
+        protected IDisposable BlockReentrancy()
+        {
+            _Monitor.Enter();
+
+            return (_Monitor);
+        }
+
+        #endregion
+
+        #region CheckReentrancy
+
+        /// <summary>
+        /// Checks whether call creates reentrancy.
+        /// </summary>
+        protected void CheckReentrancy()
+        {
+            if ((_Monitor.Busy && (CollectionChanged != null)) &&
+                (CollectionChanged.GetInvocationList().Length > 1))
+            {
+                throw new InvalidOperationException("CustomCollectionReentrancyNotAllowed");
+            }
+        }
+
+        #endregion
+
+        #region SimpleMonitor
+
+        [Serializable]
+        private class SimpleMonitor : IDisposable
+        {
+            // Fields
+            private int _BusyCount;
+
+            // Methods
+            public void Dispose()
+            {
+                _BusyCount--;
+            }
+
+            public void Enter()
+            {
+                _BusyCount++;
+            }
+
+            // Properties
+            public bool Busy
+            {
+                get { return (_BusyCount > 0); }
+            }
+        }
+        #endregion
+
+        #region INotifyCollectionChanged Members
+
+        /// <summary>
+        /// Occurs when collection has changed.
+        /// </summary>
+        public event NotifyCollectionChangedEventHandler CollectionChanged;
+
+        protected void OnCollectionChanged(NotifyCollectionChangedAction action, object item, int index)
+        {
+            OnCollectionChanged(new NotifyCollectionChangedEventArgs(action, item, index));
+        }
+
+        protected void OnCollectionChanged(NotifyCollectionChangedAction action, object oldItem, object newItem, int index)
+        {
+            OnCollectionChanged(new NotifyCollectionChangedEventArgs(action, newItem, oldItem, index));
+        }
+
+        protected void OnCollectionReset()
+        {
+            OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset));
+        }
+
+        /// <summary>
+        /// Called when collection has changed.
+        /// </summary>
+        /// <param name="e">Event arguments.</param>
+        protected virtual void OnCollectionChanged(NotifyCollectionChangedEventArgs e)
+        {
+            if (CollectionChanged != null)
+            {
+                using (BlockReentrancy())
+                {
+                    CollectionChanged(this, e);
+                }
+            }
+        }
+
+        #endregion
+    }
+
+    #region INotifyCollectionChanged
+    /// <summary>
+    /// Represents collection changed notification interface.
+    /// </summary>
+    public interface INotifyCollectionChanged
+    {
+        /// <summary>
+        /// Occurs when collection changed.
+        /// </summary>
+        event NotifyCollectionChangedEventHandler CollectionChanged;
+    }
+    /// <summary>
+    /// Defines change actions.
+    /// </summary>
+    public enum NotifyCollectionChangedAction
+    {
+        /// <summary>
+        /// Items were added.
+        /// </summary>
+        Add,
+        /// <summary>
+        /// Items were removed.
+        /// </summary>
+        Remove,
+        /// <summary>
+        /// Items were replaced.
+        /// </summary>
+        Replace,
+        /// <summary>
+        /// Items were moved.
+        /// </summary>
+        Move,
+        /// <summary>
+        /// Collection was reset.
+        /// </summary>
+        Reset
+    }
+    /// <summary>
+    /// Defines delegate for collection notification events.
+    /// </summary>
+    /// <param name="sender">Event sender.</param>
+    /// <param name="e">Event arguments.</param>
+    public delegate void NotifyCollectionChangedEventHandler(object sender, NotifyCollectionChangedEventArgs e);
+    /// <summary>
+    /// Defines collection change notification event arguments.
+    /// </summary>
+    public class NotifyCollectionChangedEventArgs : EventArgs
+    {
+        #region Private Vars
+
+        private NotifyCollectionChangedAction _Action;
+        private IList _NewItems;
+        private int _NewStartingIndex;
+        private IList _OldItems;
+        private int _OldStartingIndex;
+
+        #endregion
+
+        /// <summary>
+        /// Create new instance of object.
+        /// </summary>
+        /// <param name="action">Action</param>
+        public NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction action)
+        {
+            _NewStartingIndex = -1;
+            _OldStartingIndex = -1;
+            if (action != NotifyCollectionChangedAction.Reset)
+            {
+                throw new ArgumentException("WrongActionForCtor");
+            }
+            InitializeAdd(action, null, -1);
+        }
+
+        /// <summary>
+        /// Creates new instance of object.
+        /// </summary>
+        /// <param name="action">Specifies action.</param>
+        /// <param name="changedItems">List of changed items.</param>
+        public NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction action, IList changedItems)
+        {
+            _NewStartingIndex = -1;
+            _OldStartingIndex = -1;
+            if (((action != NotifyCollectionChangedAction.Add) && (action != NotifyCollectionChangedAction.Remove)) && (action != NotifyCollectionChangedAction.Reset))
+            {
+                throw new ArgumentException("MustBeResetAddOrRemoveActionForCtor");
+            }
+            if (action == NotifyCollectionChangedAction.Reset)
+            {
+                if (changedItems != null)
+                {
+                    throw new ArgumentException("ResetActionRequiresNullItem");
+                }
+                InitializeAdd(action, null, -1);
+            }
+            else
+            {
+                if (changedItems == null)
+                {
+                    throw new ArgumentNullException("changedItems");
+                }
+                InitializeAddOrRemove(action, changedItems, -1);
+            }
+
+        }
+        /// <summary>
+        /// Creates new instance of object.
+        /// </summary>
+        /// <param name="action">Specifies action.</param>
+        /// <param name="changedItem">Item that was changed.</param>
+        public NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction action, object changedItem)
+        {
+            _NewStartingIndex = -1;
+            _OldStartingIndex = -1;
+            if (((action != NotifyCollectionChangedAction.Add) && (action != NotifyCollectionChangedAction.Remove)) && (action != NotifyCollectionChangedAction.Reset))
+            {
+                throw new ArgumentException("MustBeResetAddOrRemoveActionForCtor");
+            }
+            if (action == NotifyCollectionChangedAction.Reset)
+            {
+                if (changedItem != null)
+                {
+                    throw new ArgumentException("ResetActionRequiresNullItem");
+                }
+                InitializeAdd(action, null, -1);
+            }
+            else
+            {
+                InitializeAddOrRemove(action, new object[] { changedItem }, -1);
+            }
+        }
+
+        /// <summary>
+        /// Creates new instance of object.
+        /// </summary>
+        /// <param name="action">Action.</param>
+        /// <param name="newItems">New items in collection.</param>
+        /// <param name="oldItems">Old items in collection.</param>
+        public NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction action, IList newItems, IList oldItems)
+        {
+            _NewStartingIndex = -1;
+            _OldStartingIndex = -1;
+            if (action != NotifyCollectionChangedAction.Replace)
+            {
+                throw new ArgumentException("WrongActionForCtor");
+            }
+            if (newItems == null)
+            {
+                throw new ArgumentNullException("newItems");
+            }
+            if (oldItems == null)
+            {
+                throw new ArgumentNullException("oldItems");
+            }
+            InitializeMoveOrReplace(action, newItems, oldItems, -1, -1);
+        }
+
+        /// <summary>
+        /// Creates new instance of object.
+        /// </summary>
+        /// <param name="action">Action.</param>
+        /// <param name="changedItems">List of changed items.</param>
+        /// <param name="startingIndex">Starting index of change.</param>
+        public NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction action, IList changedItems, int startingIndex)
+        {
+            _NewStartingIndex = -1;
+            _OldStartingIndex = -1;
+            if (((action != NotifyCollectionChangedAction.Add) && (action != NotifyCollectionChangedAction.Remove)) && (action != NotifyCollectionChangedAction.Reset))
+            {
+                throw new ArgumentException("MustBeResetAddOrRemoveActionForCtor");
+            }
+            if (action == NotifyCollectionChangedAction.Reset)
+            {
+                if (changedItems != null)
+                {
+                    throw new ArgumentException("ResetActionRequiresNullItem");
+                }
+                if (startingIndex != -1)
+                {
+                    throw new ArgumentException("ResetActionRequiresIndexMinus1");
+                }
+                InitializeAdd(action, null, -1);
+            }
+            else
+            {
+                if (changedItems == null)
+                {
+                    throw new ArgumentNullException("changedItems");
+                }
+                if (startingIndex < -1)
+                {
+                    throw new ArgumentException("IndexCannotBeNegative");
+                }
+                InitializeAddOrRemove(action, changedItems, startingIndex);
+            }
+        }
+
+        /// <summary>
+        /// Creates new instance of object.
+        /// </summary>
+        /// <param name="action">Action</param>
+        /// <param name="changedItem">Changed item</param>
+        /// <param name="index">Index of change</param>
+        public NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction action, object changedItem, int index)
+        {
+            _NewStartingIndex = -1;
+            _OldStartingIndex = -1;
+            if (((action != NotifyCollectionChangedAction.Add) && (action != NotifyCollectionChangedAction.Remove)) && (action != NotifyCollectionChangedAction.Reset))
+            {
+                throw new ArgumentException("MustBeResetAddOrRemoveActionForCtor");
+            }
+            if (action == NotifyCollectionChangedAction.Reset)
+            {
+                if (changedItem != null)
+                {
+                    throw new ArgumentException("ResetActionRequiresNullItem");
+                }
+                if (index != -1)
+                {
+                    throw new ArgumentException("ResetActionRequiresIndexMinus1");
+                }
+                InitializeAdd(action, null, -1);
+            }
+            else
+            {
+                InitializeAddOrRemove(action, new object[] { changedItem }, index);
+            }
+        }
+
+        /// <summary>
+        /// Creates new instance of object.
+        /// </summary>
+        /// <param name="action">Action</param>
+        /// <param name="newItem">New item</param>
+        /// <param name="oldItem">Old item</param>
+        public NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction action, object newItem, object oldItem)
+        {
+            _NewStartingIndex = -1;
+            _OldStartingIndex = -1;
+            if (action != NotifyCollectionChangedAction.Replace)
+            {
+                throw new ArgumentException("WrongActionForCtor");
+            }
+            InitializeMoveOrReplace(action, new object[] { newItem }, new object[] { oldItem }, -1, -1);
+        }
+
+        /// <summary>
+        /// Creates new instance of object.
+        /// </summary>
+        /// <param name="action">Action</param>
+        /// <param name="newItems">New items.</param>
+        /// <param name="oldItems">Removed items.</param>
+        /// <param name="startingIndex">Starting index of change.</param>
+        public NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction action, IList newItems, IList oldItems, int startingIndex)
+        {
+            _NewStartingIndex = -1;
+            _OldStartingIndex = -1;
+            if (action != NotifyCollectionChangedAction.Replace)
+            {
+                throw new ArgumentException("WrongActionForCtor");
+            }
+            if (newItems == null)
+            {
+                throw new ArgumentNullException("newItems");
+            }
+            if (oldItems == null)
+            {
+                throw new ArgumentNullException("oldItems");
+            }
+            InitializeMoveOrReplace(action, newItems, oldItems, startingIndex, startingIndex);
+        }
+
+        /// <summary>
+        /// Creates new instance of object.
+        /// </summary>
+        /// <param name="action">Action</param>
+        /// <param name="changedItems">Changed items</param>
+        /// <param name="index">New index</param>
+        /// <param name="oldIndex">Old index</param>
+        public NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction action, IList changedItems, int index, int oldIndex)
+        {
+            _NewStartingIndex = -1;
+            _OldStartingIndex = -1;
+            if (action != NotifyCollectionChangedAction.Move)
+            {
+                throw new ArgumentException("WrongActionForCtor");
+            }
+            if (index < 0)
+            {
+                throw new ArgumentException("IndexCannotBeNegative");
+            }
+            InitializeMoveOrReplace(action, changedItems, changedItems, index, oldIndex);
+        }
+
+        /// <summary>
+        /// Creates new instance of object.
+        /// </summary>
+        /// <param name="action">Action</param>
+        /// <param name="changedItem">Changed item</param>
+        /// <param name="index">New index</param>
+        /// <param name="oldIndex">Old index</param>
+        public NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction action, object changedItem, int index, int oldIndex)
+        {
+            _NewStartingIndex = -1;
+            _OldStartingIndex = -1;
+            if (action != NotifyCollectionChangedAction.Move)
+            {
+                throw new ArgumentException("WrongActionForCtor");
+            }
+            if (index < 0)
+            {
+                throw new ArgumentException("IndexCannotBeNegative");
+            }
+            object[] newItems = new object[] { changedItem };
+            InitializeMoveOrReplace(action, newItems, newItems, index, oldIndex);
+        }
+
+        /// <summary>
+        /// Creates new instance of object.
+        /// </summary>
+        /// <param name="action">Action.</param>
+        /// <param name="newItem">New item</param>
+        /// <param name="oldItem">Old item</param>
+        /// <param name="index">New index</param>
+        public NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction action, object newItem, object oldItem, int index)
+        {
+            _NewStartingIndex = -1;
+            _OldStartingIndex = -1;
+            if (action != NotifyCollectionChangedAction.Replace)
+            {
+                throw new ArgumentException("WrongActionForCtor");
+            }
+            InitializeMoveOrReplace(action, new object[] { newItem }, new object[] { oldItem }, index, index);
+        }
+
+        private void InitializeAdd(NotifyCollectionChangedAction action, IList newItems, int newStartingIndex)
+        {
+            _Action = action;
+            _NewItems = (newItems == null) ? null : ArrayList.ReadOnly(newItems);
+            _NewStartingIndex = newStartingIndex;
+        }
+
+        private void InitializeAddOrRemove(NotifyCollectionChangedAction action, IList changedItems, int startingIndex)
+        {
+            if (action == NotifyCollectionChangedAction.Add)
+            {
+                InitializeAdd(action, changedItems, startingIndex);
+            }
+            else if (action == NotifyCollectionChangedAction.Remove)
+            {
+                InitializeRemove(action, changedItems, startingIndex);
+            }
+        }
+
+        private void InitializeMoveOrReplace(NotifyCollectionChangedAction action, IList newItems, IList oldItems, int startingIndex, int oldStartingIndex)
+        {
+            InitializeAdd(action, newItems, startingIndex);
+            InitializeRemove(action, oldItems, oldStartingIndex);
+        }
+
+        private void InitializeRemove(NotifyCollectionChangedAction action, IList oldItems, int oldStartingIndex)
+        {
+            _Action = action;
+            _OldItems = (oldItems == null) ? null : ArrayList.ReadOnly(oldItems);
+            _OldStartingIndex = oldStartingIndex;
+        }
+
+        /// <summary>
+        /// Gets the type of the collection change action.
+        /// </summary>
+        public NotifyCollectionChangedAction Action
+        {
+            get
+            {
+                return _Action;
+            }
+        }
+        /// <summary>
+        /// Gets list of newly added items.
+        /// </summary>
+        public IList NewItems
+        {
+            get
+            {
+                return _NewItems;
+            }
+        }
+        /// <summary>
+        /// Gets new starting index.
+        /// </summary>
+        public int NewStartingIndex
+        {
+            get
+            {
+                return _NewStartingIndex;
+            }
+        }
+        /// <summary>
+        /// Gets list of removed items.
+        /// </summary>
+        public IList OldItems
+        {
+            get
+            {
+                return _OldItems;
+            }
+        }
+        /// <summary>
+        /// Old starting index.
+        /// </summary>
+        public int OldStartingIndex
+        {
+            get
+            {
+                return _OldStartingIndex;
+            }
+        }
+    }
+    #endregion
+
+    public class CustomNamedCollection<T> : CustomCollection<T> where T : class, INamed
+    {
+        #region Indexer[name]
+
+        /// <summary>
+        /// Returns item at index.
+        /// </summary>
+        /// <param name="name">Name of item.</param>
+        /// <returns>Item or null.</returns>
+        public T this[string name]
+        {
+            get
+            {
+                if (string.IsNullOrEmpty(name) == false)
+                {
+                    OnCollectionReadAccess();
+
+                    foreach (T item in Items)
+                    {
+                        if (name.Equals(item.Name) == true)
+                            return (item);
+                    }
+                }
+
+                return (null);
+            }
+
+            set
+            {
+                if (Items.IsReadOnly)
+                    throw new NotSupportedException("Collection is read-only");
+
+                T item = this[name];
+
+                if (item == null)
+                    throw new ArgumentOutOfRangeException();
+
+                int index = Items.IndexOf(item);
+
+                if ((uint)index >= Items.Count)
+                    throw new ArgumentOutOfRangeException();
+
+                SetItem(index, value);
+            }
+        }
+
+        #endregion
+
+        #region GetUniqueName
+
+        public string GetUniqueName(string rootText)
+        {
+            for (int i = 1; i < 500; i++)
+            {
+                string s = rootText + i;
+
+                if (this[s] == null)
+                    return (s);
+            }
+
+            return (rootText);
+        }
+
+        #endregion
+    }
+
+    #region INamed
+
+    public interface INamed
+    {
+        string Name { get; set; }
+    }
+
+    #endregion
+
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Primitives/SymbolDef.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Primitives/SymbolDef.cs
new file mode 100644
index 00000000..957a5be5
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Primitives/SymbolDef.cs	
@@ -0,0 +1,549 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Globalization;
+using DevComponents.DotNetBar.Charts.Style;
+
+namespace DevComponents.DotNetBar.Charts
+{
+    [TypeConverter(typeof(SymbolDefConvertor))]
+    [Editor(typeof(SymbolDefEditor), typeof(UITypeEditor))]
+    public class SymbolDef : INotifyPropertyChanged, IDisposable, IProcessSerialElement
+    {
+        #region Private variables
+
+        private string _Symbol = "";
+        private string _SymbolRealized;
+
+        private float _SymbolSize = -1f;
+        private Color _SymbolColor = Color.Empty;
+        private eSymbolSet _SymbolSet = eSymbolSet.Awesome;
+
+        private Font _SymbolFont;
+        private Size _RealSymbolSize;
+
+        #endregion
+
+        #region Public properties
+
+        #region Symbol
+
+        /// <summary>
+        /// Indicates the displayed Symbol. Symbol setting takes precedence over Image setting.
+        /// </summary>
+        [DefaultValue(""), Category("Appearance"), Description("displayed Symbol. Symbol setting takes precedence over Image setting.")]
+        [Editor("DevComponents.DotNetBar.Design.SymbolTypeEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor))]
+        public string Symbol
+        {
+            get { return (_Symbol); }
+
+            set
+            {
+                if (value == null)
+                    value = "";
+
+                if (value != _Symbol)
+                {
+                    _Symbol = value;
+                    _SymbolRealized = null;
+
+                    OnPropertyChangedEx("Symbol");
+                }
+            }
+        }
+
+        #endregion
+
+        #region SymbolColor
+
+        /// <summary>
+        /// Gets or sets the color of the Symbol.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates color of the Symbol.")]
+        public Color SymbolColor
+        {
+            get { return (_SymbolColor); }
+
+            set
+            {
+                if (_SymbolColor != value)
+                {
+                    _SymbolColor = value;
+
+                    OnPropertyChangedEx("SymbolColor", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeSymbolColor()
+        {
+            return (_SymbolColor.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetSymbolColor()
+        {
+            SymbolColor = Color.Empty;
+        }
+
+        #endregion
+
+        #region SymbolRealized
+
+        /// <summary>
+        /// Gets the realized symbol string.
+        /// </summary>
+        [Browsable(false)]
+        public string SymbolRealized
+        {
+            get
+            {
+                if (_SymbolRealized == null)
+                {
+                    if (_Symbol != null)
+                        _SymbolRealized = Symbols.GetSymbol(_Symbol);
+                }
+
+                return (_SymbolRealized);
+            }
+        }
+
+        #endregion
+
+        #region SymbolSet
+
+        /// <summary>
+        /// Gets or sets the symbol set used to represent the Symbol.
+        /// </summary>
+        [DefaultValue(eSymbolSet.Awesome)]
+        public eSymbolSet SymbolSet
+        {
+            get { return (_SymbolSet); }
+
+            set
+            {
+                if (_SymbolSet != value)
+                {
+                    _SymbolSet = value;
+
+                    _SymbolRealized = null;
+                    _SymbolFont = null;
+                    _RealSymbolSize = Size.Empty;
+
+                    OnPropertyChangedEx("SymbolSet");
+                }
+            }
+        }
+
+        #endregion
+
+        #region SymbolSize
+
+        /// <summary>
+        /// Indicates the size of the symbol in points.
+        /// </summary>
+        [DefaultValue(-1f), Category("Appearance")]
+        [Description("Indicates the size of the symbol in points.")]
+        public float SymbolSize
+        {
+            get { return (_SymbolSize); }
+
+            set
+            {
+                if (value != _SymbolSize)
+                {
+                    _SymbolSize = value;
+                    _SymbolFont = null;
+                    _RealSymbolSize = Size.Empty;
+
+                    OnPropertyChangedEx("SymbolSize");
+                }
+            }
+        }
+
+        #endregion
+
+        #region IsEmpty
+
+        /// <summary>
+        /// Gets whether SymbolDef is Empty.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsEmpty
+        {
+            get
+            {
+                return ((string.IsNullOrEmpty(_Symbol) == true) &&
+                    (_SymbolColor.IsEmpty == true) &&
+                    (_SymbolSize == -1f));
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region SymbolFont
+
+        internal Font SymbolFont
+        {
+            get
+            {
+                if (_SymbolFont == null)
+                    _SymbolFont = Symbols.GetFont(SymbolSize, SymbolSet);
+
+                return (_SymbolFont);
+            }
+
+            set
+            {
+                _SymbolFont = value;
+            }
+        }
+
+        #endregion
+
+        #region IsValidSymbol
+
+        internal bool IsValidSymbol
+        {
+            get { return (string.IsNullOrEmpty(SymbolRealized) == false); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetSymbolSize
+
+        internal Size GetSymbolSize(Graphics g)
+        {
+            if (_RealSymbolSize == Size.Empty)
+            {
+                Font font = SymbolFont;
+
+                Size size = g.MeasureString(SymbolRealized, font).ToSize();
+
+                size.Width++;
+                size.Height++;
+
+                _RealSymbolSize = size;
+            }
+
+            return (_RealSymbolSize);
+        }
+
+        #endregion
+
+        #region Copy
+
+        /// <summary>
+        /// Creates an exact copy of the SymbolDef.
+        /// </summary>
+        /// <returns>Copy of the SymbolDef.</returns>
+        public SymbolDef Copy()
+        {
+            SymbolDef style = new SymbolDef();
+
+            CopyTo(style);
+
+            return (style);
+        }
+
+        #endregion
+
+        #region CopyTo
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public void CopyTo(SymbolDef style)
+        {
+            style.Symbol = _Symbol;
+
+            style.SymbolColor = _SymbolColor;
+            style.SymbolSet = _SymbolSet;
+            style.SymbolSize = _SymbolSize;
+        }
+
+        #endregion
+
+        #region GetSerialData
+
+        internal SerialElementCollection GetSerialData(string serialName)
+        {
+            if (IsEmpty == false)
+            {
+                SerialElementCollection sec = new SerialElementCollection();
+
+                if (serialName != null)
+                {
+                    if (serialName.Equals("") == true)
+                        serialName = "SymbolDef";
+
+                    sec.AddStartElement(serialName);
+                }
+
+                if (IsValidSymbol == true)
+                    sec.AddValue("Symbol", Symbol);
+
+                sec.AddValue("SymbolColor", SymbolColor, Color.Empty);
+                sec.AddValue("SymbolSet", SymbolSet, eSymbolSet.Awesome);
+                sec.AddValue("SymbolSize", SymbolSize, -1f);
+
+                if (serialName != null)
+                    sec.AddEndElement(serialName);
+
+                return (sec);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region PutSerialData
+
+        #region ProcessValue
+
+        void IProcessSerialElement.ProcessValue(SerialElement se)
+        {
+            switch (se.Name)
+            {
+                case "Symbol":
+                    Symbol = se.GetValueString();
+                    break;
+
+                case "SymbolColor":
+                    SymbolColor = se.GetValueColor();
+                    break;
+
+                case "SymbolSet":
+                    SymbolSet = (eSymbolSet)se.GetValueEnum(typeof(eSymbolSet));
+                    break;
+
+                case "SymbolSize":
+                    SymbolSize = float.Parse(se.StringValue);
+                    break;
+
+                default:
+                    throw new Exception("Unknown Serial Value (" + se.Name + ")");
+            }
+        }
+
+        #endregion
+
+        #region ProcessCollection
+
+        void IProcessSerialElement.ProcessCollection(SerialElement se)
+        {
+            switch (se.Name)
+            {
+                default:
+                    throw new Exception("Unknown Serial Collection (" + se.Name + ")");
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region INotifyPropertyChanged Members
+
+        /// <summary>
+        /// Occurs when property value has changed.
+        /// </summary>
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        /// <summary>
+        /// Raises the PropertyChanged event.
+        /// </summary>
+        /// <param name="e">Event arguments</param>
+        protected virtual void OnPropertyChanged(VisualPropertyChangedEventArgs e)
+        {
+            PropertyChangedEventHandler eh = PropertyChanged;
+
+            if (eh != null)
+                eh(this, e);
+        }
+
+        /// <summary>
+        /// Raises the PropertyChanged event.
+        /// </summary>
+        /// <param name="s">Event arguments</param>
+        protected virtual void OnPropertyChangedEx(string s)
+        {
+            PropertyChangedEventHandler eh = PropertyChanged;
+
+            if (eh != null)
+            {
+                VisualPropertyChangedEventArgs e =
+                    new VisualPropertyChangedEventArgs(s);
+
+                eh(this, e);
+            }
+        }
+
+        /// <summary>
+        /// Raises the PropertyChanged event.
+        /// </summary>
+        /// <param name="s">Event arguments</param>
+        protected virtual void OnPropertyChangedEx(string s, VisualChangeType changeType)
+        {
+            PropertyChangedEventHandler eh = PropertyChanged;
+
+            if (eh != null)
+            {
+                VisualPropertyChangedEventArgs e =
+                    new VisualPropertyChangedEventArgs(s, changeType);
+
+                eh(this, e);
+            }
+        }
+
+        #endregion
+
+        #region UpdateChangeHandler
+
+        private void UpdateChangeHandler(
+            INotifyPropertyChanged oldValue, INotifyPropertyChanged newValue)
+        {
+            if (oldValue != null)
+                oldValue.PropertyChanged -= StyleChanged;
+
+            if (newValue != null)
+                newValue.PropertyChanged += StyleChanged;
+        }
+
+        #endregion
+
+        #region StyleChanged
+
+        /// <summary>
+        /// StyleChanged
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected virtual void StyleChanged(
+            object sender, PropertyChangedEventArgs e)
+        {
+            OnPropertyChanged((VisualPropertyChangedEventArgs)e);
+        }
+
+        #endregion
+
+        #region IDisposable
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        public void Dispose()
+        {
+            SymbolFont = null;
+        }
+ 
+        #endregion
+    }
+
+    #region SymbolDefConvertor
+
+    ///<summary>
+    /// SymbolDefConvertor
+    ///</summary>
+    public class SymbolDefConvertor : ExpandableObjectConverter
+    {
+        /// <summary>
+        /// ConvertTo
+        /// </summary>
+        /// <param name="context"></param>
+        /// <param name="culture"></param>
+        /// <param name="value"></param>
+        /// <param name="destinationType"></param>
+        /// <returns></returns>
+        public override object ConvertTo(
+            ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+        {
+            if (destinationType == typeof(string))
+            {
+                SymbolDef sd = value as SymbolDef;
+
+                if (sd != null)
+                    return (sd.SymbolSet.ToString());
+            }
+
+            return (base.ConvertTo(context, culture, value, destinationType));
+        }
+    }
+
+    #endregion
+
+    #region SymbolDefEditor
+
+    ///<summary>
+    /// SymbolDefEditor
+    ///</summary>
+    public class SymbolDefEditor : UITypeEditor
+    {
+        #region GetPaintValueSupported
+
+        /// <summary>
+        /// GetPaintValueSupported
+        /// </summary>
+        /// <param name="context"></param>
+        /// <returns></returns>
+        public override bool GetPaintValueSupported(ITypeDescriptorContext context)
+        {
+            return (true);
+        }
+
+        #endregion
+
+        #region PaintValue
+
+        /// <summary>
+        /// PaintValue
+        /// </summary>
+        /// <param name="e"></param>
+        public override void PaintValue(PaintValueEventArgs e)
+        {
+            SymbolDef sd = e.Value as SymbolDef;
+
+            if (sd != null)
+            {
+                Font font = Symbols.GetFont(10, sd.SymbolSet);
+
+                Color color = sd.SymbolColor;
+
+                if (sd.SymbolColor.IsEmpty || sd.SymbolColor == Color.White)
+                    color = Color.Brown;
+
+                using (Brush br = new SolidBrush(color))
+                {
+                    using (StringFormat sf = new StringFormat())
+                    {
+                        sf.Alignment = StringAlignment.Center;
+                        sf.LineAlignment = StringAlignment.Center;
+
+                        e.Graphics.DrawString(sd.SymbolRealized, font, br, e.Bounds, sf);
+                    }
+                }
+            }
+        }
+
+        #endregion
+    }
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Properties/Resources.Designer.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Properties/Resources.Designer.cs
new file mode 100644
index 00000000..335f1f14
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Properties/Resources.Designer.cs	
@@ -0,0 +1,63 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.34209
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace DevComponents.DotNetBar.Charts.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DevComponents.DotNetBar.Charts.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Properties/Resources.resx b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Properties/Resources.resx
new file mode 100644
index 00000000..04e2214f
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Properties/Resources.resx	
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ScrollBarLite/ScrollBarLite.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ScrollBarLite/ScrollBarLite.cs
new file mode 100644
index 00000000..5b8e63cd
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/ScrollBarLite/ScrollBarLite.cs	
@@ -0,0 +1,1548 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.Charts.Style;
+
+namespace DevComponents.DotNetBar.Charts
+{
+    [ToolboxItem(false)]
+    [TypeConverter(typeof(BlankExpandableObjectConverter))]
+    public class HScrollBarLite : ScrollBarLite
+    {
+        public HScrollBarLite()
+        {
+            Orientation = Orientation.Horizontal;
+        }
+    }
+
+    [ToolboxItem(false)]
+    [TypeConverter(typeof(BlankExpandableObjectConverter))]
+    public class VScrollBarLite : ScrollBarLite
+    {
+        public VScrollBarLite()
+        {
+            Orientation = Orientation.Vertical;
+        }
+    }
+
+    [ToolboxItem(false)]
+    [TypeConverter(typeof(BlankExpandableObjectConverter))]
+    public class ScrollBarLite : ChartVisualElement
+    {
+        #region Events
+
+        #region Scroll
+
+        /// <summary>
+        /// Occurs when the Horizontal or Vertical scrollbar has been scrolled
+        /// </summary>
+        [Description("Occurs when the Horizontal or Vertical scrollbar has been scrolled.")]
+        public event EventHandler<ScrollEventArgs> Scroll;
+
+        #endregion
+
+        #region ValueChanged
+
+        /// <summary>
+        /// Occurs when the Value property is changed.
+        /// </summary>
+        public event EventHandler<ValueChangedEventArgs> ValueChanged;
+
+        #endregion
+
+        #endregion
+
+        #region Private Variables
+
+        private Orientation _Orientation = Orientation.Horizontal;
+
+        private int _LargeChange = 10;
+        private int _Maximum = 100;
+        private int _Minimum;
+        private int _SmallChange = 1;
+        private int _Value;
+
+        private bool _Enabled = true;
+
+        private Rectangle _ArrowIncreaseBounds;
+        private Rectangle _ArrowDecreaseBounds;
+        private Rectangle _ThumbBounds;
+
+        private Size _MinArrowSize = new Size(5, 7);
+        private Size _MaxArrowSize = new Size(50, 50);
+        private Size _MinThumbSize = new Size(10, 12);
+
+        private ScrollBarVisualStyles _ScrollBarVisualStyles;
+        private EffectiveStyles<ScrollBarVisualStyle> _EffectiveStyles;
+
+        private ItemHitArea _HitArea;
+        private ItemHitArea _LastHitArea;
+        private ItemHitArea _MouseDownHitArea;
+        private int _ThumbOffset;
+
+        private Timer _ClickTimer;
+        private int _ClickCount;
+        private bool _RaiseEndScroll;
+
+        private bool _Inverted;
+
+        #endregion
+
+        #region Constructor
+
+        public ScrollBarLite()
+        {
+            Size = new Size(10, 10);
+
+            _EffectiveStyles = new EffectiveStyles<ScrollBarVisualStyle>(this);
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region Enabled
+
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool Enabled
+        {
+            get { return (_Enabled); }
+
+            internal set
+            {
+                if (value != _Enabled)
+                {
+                    _Enabled = value;
+
+                    InvalidateRender();
+                }
+            }
+        }
+
+        #endregion
+
+        #region Orientation
+
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public Orientation Orientation
+        {
+            get { return (_Orientation); }
+
+            internal set
+            {
+                if (value != _Orientation)
+                {
+                    _Orientation = value;
+
+                    InvalidateLayout();
+                }
+            }
+        }
+
+        #endregion
+
+        #region ScrollBarVisualStyles
+
+        /// <summary>
+        /// Gets or sets the visual styles for the ScrollBar.
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates the visual styles for the ScrollBar.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ScrollBarVisualStyles ScrollBarVisualStyles
+        {
+            get
+            {
+                if (_ScrollBarVisualStyles == null)
+                {
+                    _ScrollBarVisualStyles = new ScrollBarVisualStyles();
+
+                    StyleVisualChangeHandler(null, _ScrollBarVisualStyles);
+                }
+
+                return (_ScrollBarVisualStyles);
+            }
+
+            set
+            {
+                if (_ScrollBarVisualStyles != value)
+                {
+                    ScrollBarVisualStyles oldValue = _ScrollBarVisualStyles;
+
+                    _ScrollBarVisualStyles = value;
+
+                    OnStyleChanged("ScrollBarVisualStyles", oldValue, value);
+
+                    if (oldValue != null)
+                        oldValue.Dispose();
+                }
+            }
+        }
+
+        #endregion
+
+        #region Value
+
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public int Value
+        {
+            get { return (_Value); }
+
+            set
+            {
+                if (value < Minimum)
+                    throw new ArgumentOutOfRangeException("Value must be >= to Minimum property value.");
+
+                if (value > Maximum)
+                    throw new ArgumentOutOfRangeException("Value must be <= to Maximum property value.");
+
+                value = NormalizeValue(value);
+
+                if (value != _Value)
+                {
+                    int oldValue = _Value;
+                    _Value = value;
+
+                    OnValueChanged(oldValue, value);
+
+                    InvalidateLayoutBounds(this);
+                }
+            }
+        }
+
+        #region OnValueChanged
+
+        private void OnValueChanged(int oldValue, int newValue)
+        {
+            if (ValueChanged != null)
+            {
+                ValueChangedEventArgs args
+                    = new ValueChangedEventArgs(oldValue, newValue);
+
+                ValueChanged(this, args);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Visible
+
+        /// <summary>
+        /// Get or sets whether the item is visible
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public new bool Visible
+        {
+            get { return (base.Visible); }
+            set { base.Visible = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region Height
+
+        internal int Height
+        {
+            get { return (BoundsRelative.Height); }
+
+            set
+            {
+                if (value != BoundsRelative.Height)
+                {
+                    Rectangle r = BoundsRelative;
+
+                    _ThumbOffset -= (value - r.Height);
+
+                    r.Height = value;
+
+                    BoundsRelative = r;
+                }
+            }
+        }
+
+        #endregion
+
+        #region Inverted
+
+        internal bool Inverted
+        {
+            get { return (_Inverted); }
+            set { _Inverted = value; }
+        }
+
+        #endregion
+
+        #region IsAtMaxumum
+
+        internal bool IsAtMaxumum
+        {
+            get { return (_Value + _LargeChange >= _Maximum); }
+        }
+
+        #endregion
+
+        #region IsAtMinumum
+
+        internal bool IsAtMinumum
+        {
+            get { return (_Value == _Minimum); }
+        }
+
+        #endregion
+
+        #region IsVertical
+
+        internal bool IsVertical
+        {
+            get { return (Orientation == Orientation.Vertical); }
+        }
+
+        #endregion
+
+        #region LargeChange
+
+        internal int LargeChange
+        {
+            get { return (_LargeChange); }
+
+            set
+            {
+                if (value != _LargeChange)
+                {
+                    if (value < 0)
+                        throw new ArgumentOutOfRangeException();
+
+                    _LargeChange = value;
+
+                    InvalidateRender();
+                }
+            }
+        }
+
+        #endregion
+
+        #region Location
+
+        internal Point Location
+        {
+            get { return (BoundsRelative.Location); }
+
+            set
+            {
+                Rectangle r = BoundsRelative;
+                r.Location = value;
+
+                BoundsRelative = r;
+            }
+        }
+
+        #endregion
+
+        #region Maximum
+
+        internal int Maximum
+        {
+            get { return (_Maximum); }
+
+            set
+            {
+                if (value != _Maximum)
+                {
+                    _Maximum = value;
+
+                    InvalidateRender();
+                }
+            }
+        }
+
+        #endregion
+
+        #region Minimum
+
+        internal int Minimum
+        {
+            get { return (_Minimum); }
+
+            set
+            {
+                if (value != _Minimum)
+                {
+                    _Minimum = value;
+
+                    InvalidateRender();
+                }
+            }
+        }
+
+        #endregion
+
+        #region SmallChange
+
+        internal int SmallChange
+        {
+            get { return (_SmallChange); }
+
+            set
+            {
+                if (value != _SmallChange)
+                {
+                    if (value < 0)
+                        throw new ArgumentOutOfRangeException();
+
+                    _SmallChange = value;
+
+                    InvalidateRender();
+                }
+            }
+        }
+
+        #endregion
+
+        #region Width
+
+        internal int Width
+        {
+            get { return (BoundsRelative.Width); }
+
+            set
+            {
+                if (value != BoundsRelative.Width)
+                {
+                    Rectangle r = BoundsRelative;
+
+                    _ThumbOffset -= (value - r.Width);
+
+                    r.Width = value;
+
+                    BoundsRelative = r;
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region MeasureOverride
+
+        protected override void MeasureOverride(ChartLayoutInfo layoutInfo)
+        {
+        }
+
+        #endregion
+
+        #region ArrangeOverride
+
+        protected override void ArrangeOverride(ChartLayoutInfo layoutInfo)
+        {
+            UpdateBarBounds();
+        }
+
+        #region UpdateBarBounds
+
+        private void UpdateBarBounds()
+        {
+            Rectangle bounds = Bounds;
+
+            _ThumbBounds = Rectangle.Empty;
+
+            if (Orientation == Orientation.Horizontal)
+            {
+                int arrowWidth = Height;
+                arrowWidth = Math.Max(arrowWidth, _MinArrowSize.Width);
+                arrowWidth = Math.Min(arrowWidth, _MaxArrowSize.Width);
+
+                _ArrowDecreaseBounds = bounds;
+                _ArrowDecreaseBounds.Width = arrowWidth;
+
+                _ArrowIncreaseBounds = bounds;
+                _ArrowIncreaseBounds.X = _ArrowIncreaseBounds.Right - arrowWidth;
+                _ArrowIncreaseBounds.Width = arrowWidth;
+
+                if (bounds.Width > (_ArrowDecreaseBounds.Width +
+                    _ArrowIncreaseBounds.Width + _MinThumbSize.Width))
+                {
+                    int tv = Maximum - Minimum;
+                    int width = Width - (2 * arrowWidth);
+                    int x = (width * Value) / tv;
+
+                    _ThumbBounds = bounds;
+                    _ThumbBounds.X += (x + arrowWidth);
+                    _ThumbBounds.Width = GetThumbSize();
+                    _ThumbBounds.Y += 1;
+                    _ThumbBounds.Height -= 2;
+                }
+            }
+            else
+            {
+                int arrowHeight = Width;
+                arrowHeight = Math.Max(arrowHeight, _MinArrowSize.Height);
+                arrowHeight = Math.Min(arrowHeight, _MaxArrowSize.Height);
+
+                _ArrowDecreaseBounds = bounds;
+                _ArrowDecreaseBounds.Height = arrowHeight;
+
+                _ArrowIncreaseBounds = bounds;
+                _ArrowIncreaseBounds.Y = bounds.Bottom - arrowHeight;
+                _ArrowIncreaseBounds.Height = arrowHeight;
+
+                if (bounds.Height > (_ArrowDecreaseBounds.Height +
+                    _ArrowIncreaseBounds.Height + _MinThumbSize.Height))
+                {
+                    int tv = Maximum - Minimum;
+                    int height = Height - (2 * arrowHeight);
+                    int y = (height * Value) / tv;
+
+                    _ThumbBounds = bounds;
+                    _ThumbBounds.Height = GetThumbSize();
+
+                    if (Inverted == true)
+                        _ThumbBounds.Y = (bounds.Bottom - _ThumbBounds.Height) - (y + arrowHeight);
+                    else
+                        _ThumbBounds.Y += (y + arrowHeight);
+
+                    _ThumbBounds.X += 1;
+                    _ThumbBounds.Width -= 2;
+                }
+            }
+        }
+
+        #region GetThumbSize
+
+        private int GetThumbSize()
+        {
+            int size = GetAvailableTrackArea();
+
+            int i = (int)(size * ((float)LargeChange / (float)(Maximum - Minimum))) + 1;
+
+            if (Orientation == Orientation.Horizontal)
+                i = Math.Max(_MinThumbSize.Width, i);
+            else
+                i = Math.Max(_MinThumbSize.Height, i);
+
+            i = Math.Min(i, size);
+
+            return i;
+        }
+
+        #endregion
+
+        #region GetAvailableTrackArea
+
+        private int GetAvailableTrackArea()
+        {
+            Rectangle r = BoundsRelative;
+
+            int size;
+
+            if (Orientation == Orientation.Horizontal)
+                size = r.Width - (_ArrowDecreaseBounds.Width + _ArrowIncreaseBounds.Width);
+            else
+                size = r.Height - (_ArrowDecreaseBounds.Height + _ArrowIncreaseBounds.Height);
+
+            return Math.Max(size, 8);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region RenderOverride
+
+        protected override void RenderOverride(ChartRenderInfo renderInfo)
+        {
+            Graphics g = renderInfo.Graphics;
+
+            if (CanDrawScrollBar())
+            {
+                Rectangle bounds = Bounds;
+
+                RenderBackground(g, bounds);
+
+                RenderArrowDecrease(g, bounds);
+                RenderArrowIncrease(g, bounds);
+
+                RenderThumb(g, bounds);
+
+                RenderBorder(g, bounds);
+            }
+        }
+
+        #region CanDrawScrollBar
+
+        private bool CanDrawScrollBar()
+        {
+            Rectangle bounds = Bounds;
+
+            if (Orientation == Orientation.Horizontal)
+            {
+                if (bounds.Height < _MinArrowSize.Height)
+                    return (false);
+
+                int widthNeeded = (_ArrowIncreaseBounds.Width + _ArrowDecreaseBounds.Width);
+
+                return (bounds.Width >= widthNeeded);
+            }
+            else
+            {
+                if (bounds.Width < _MinArrowSize.Width)
+                    return (false);
+
+                int heightNeeded = (_ArrowIncreaseBounds.Height + _ArrowDecreaseBounds.Height);
+
+                return (bounds.Height >= heightNeeded);
+            }
+        }
+
+        #endregion
+
+        #region RenderBackground
+
+        private void RenderBackground(Graphics g, Rectangle bounds)
+        {
+            ScrollBarVisualStyle style = GetEffectiveStyle();
+
+            bool noAlpha = (style.NoAlphaOnMouseOver == Tbool.True) ? IsMouseOver : false;
+
+            using (Brush br = style.TrackBackground.GetBrush(bounds, noAlpha))
+                g.FillRectangle(br, bounds);
+        }
+
+        #endregion
+
+        #region RenderArrowDecrease
+
+        private void RenderArrowDecrease(Graphics g, Rectangle bounds)
+        {
+            ScrollBarVisualStyle style = GetAreaStyle(Inverted == true ? ItemHitArea.ArrowIncrease : ItemHitArea.ArrowDecrease);
+            Rectangle r = _ArrowDecreaseBounds;
+
+            bool noAlpha = (style.NoAlphaOnMouseOver == Tbool.True) ? IsMouseOver : false;
+
+            using (Brush br = style.ArrowBackground.GetBrush(r, noAlpha))
+                g.FillRectangle(br, r);
+
+            if (style.ArrowColor.IsEmpty == false)
+            {
+                Color color = style.GetColor(style.ArrowColor, noAlpha);
+
+                using (Pen pen = new Pen(color))
+                {
+                    int n = Math.Min(r.Width, r.Height) / 4 + 1;
+
+                    if (Orientation == Orientation.Horizontal)
+                    {
+                        int x = r.X + (n * 5 / 4);
+                        int y = r.Y + (r.Height / 2);
+
+                        for (int i = 0; i < n; i++)
+                        {
+                            g.DrawLine(pen, x + i, y - i, x + i + 1, y - i);
+                            g.DrawLine(pen, x + i, y + i, x + i + 1, y + i);
+                        }
+                    }
+                    else
+                    {
+                        int x = r.X + (r.Width / 2);
+                        int y = r.Y + (n * 5 / 4);
+
+                        for (int i = 0; i < n; i++)
+                        {
+                            g.DrawLine(pen, x - i, y + i, x - i, y + i + 1);
+                            g.DrawLine(pen, x + i, y + i, x + i, y + i + 1);
+                        }
+                    }
+                }
+            }
+
+            if (style.ArrowBorderColor.IsEmpty == false)
+            {
+                Color color = style.GetColor(style.ArrowBorderColor, noAlpha);
+
+                using (Pen pen = new Pen(color))
+                    g.DrawRectangle(pen, r);
+            }
+        }
+
+        #endregion
+
+        #region RenderArrowIncrease
+
+        private void RenderArrowIncrease(Graphics g, Rectangle bounds)
+        {
+            ScrollBarVisualStyle style = GetAreaStyle(Inverted == true ? ItemHitArea.ArrowDecrease : ItemHitArea.ArrowIncrease);
+            Rectangle r = _ArrowIncreaseBounds;
+
+            bool noAlpha = (style.NoAlphaOnMouseOver == Tbool.True) ? IsMouseOver : false;
+
+            using (Brush br = style.ArrowBackground.GetBrush(r, noAlpha))
+                g.FillRectangle(br, r);
+
+            if (style.ArrowColor.IsEmpty == false)
+            {
+                Color color = style.GetColor(style.ArrowColor, noAlpha);
+
+                using (Pen pen = new Pen(color))
+                {
+                    int n = Math.Min(r.Width, r.Height) / 4 + 1;
+
+                    if (Orientation == Orientation.Horizontal)
+                    {
+                        int x = r.Right - (n * 5 / 4);
+                        int y = r.Y + (r.Height / 2);
+
+                        for (int i = 0; i < n; i++)
+                        {
+                            g.DrawLine(pen, x - i, y - i, x - i - 1, y - i);
+                            g.DrawLine(pen, x - i, y + i, x - i - 1, y + i);
+                        }
+                    }
+                    else
+                    {
+                        int x = r.X + (r.Width / 2);
+                        int y = r.Bottom - (n * 5 / 4);
+
+                        for (int i = 0; i < n; i++)
+                        {
+                            g.DrawLine(pen, x - i, y - i, x - i, y - i - 1);
+                            g.DrawLine(pen, x + i, y - i, x + i, y - i - 1);
+                        }
+                    }
+                }
+            }
+
+            if (style.ArrowBorderColor.IsEmpty == false)
+            {
+                Color color = style.GetColor(style.ArrowBorderColor, noAlpha);
+
+                using (Pen pen = new Pen(color))
+                    g.DrawRectangle(pen, r);
+            }
+        }
+
+        #endregion
+
+        #region RenderThumb
+
+        private void RenderThumb(Graphics g, Rectangle bounds)
+        {
+            if (_ThumbBounds.IsEmpty == false)
+            {
+                ScrollBarVisualStyle style = GetAreaStyle(ItemHitArea.Thumb);
+
+                bool noAlpha = (style.NoAlphaOnMouseOver == Tbool.True) ? IsMouseOver : false;
+
+                using (Brush br = style.ThumbBackground.GetBrush(_ThumbBounds, noAlpha))
+                    g.FillRectangle(br, _ThumbBounds);
+
+                if (style.ThumbColor.IsEmpty == false)
+                {
+                    Color color = style.GetColor(style.ThumbColor, noAlpha);
+
+                    if (Orientation == Orientation.Horizontal)
+                        RenderHThumbHashMarks(g, bounds, color);
+                    else
+                        RenderVThumbHashMarks(g, bounds, color);
+                }
+
+                if (style.ThumbBorderColor.IsEmpty == false)
+                {
+                    Color color = style.GetColor(style.ThumbBorderColor, noAlpha);
+
+                    using (Pen pen = new Pen(color))
+                        g.DrawRectangle(pen, _ThumbBounds);
+                }
+            }
+        }
+
+        #region RenderHThumbHashMarks
+
+        private void RenderHThumbHashMarks(
+            Graphics g, Rectangle bounds, Color color)
+        {
+            Rectangle r = _ThumbBounds;
+
+            if (_ThumbBounds.Width > 20)
+            {
+                int n = r.Height / 6 + 1;
+                int m = r.Height / 10 + 1;
+
+                r.X += (r.Width / 2 - 1 - m);
+                r.Y += n;
+
+                r.Width = m * 2 + 3;
+                r.Height -= (n * 2);
+
+                Point pt1 = new Point(r.X, r.Y);
+                Point pt2 = new Point(r.X, r.Bottom);
+
+                using (Pen pen = new Pen(color))
+                {
+                    for (int i = 0; i < 3; i++)
+                    {
+                        g.DrawLine(pen, pt1, pt2);
+
+                        pt1.X += (m + 1);
+                        pt2.X += (m + 1);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region RenderVThumbHashMarks
+
+        private void RenderVThumbHashMarks(
+            Graphics g, Rectangle bounds, Color color)
+        {
+            Rectangle r = _ThumbBounds;
+
+            if (_ThumbBounds.Height > 20)
+            {
+                int n = r.Width / 6 + 1;
+                int m = r.Width / 10 + 1;
+
+                r.Y += (r.Height / 2 - 1 - m);
+                r.X += n;
+
+                r.Height = m * 2 + 3;
+                r.Width -= (n * 2);
+
+                Point pt1 = new Point(r.Left, r.Y);
+                Point pt2 = new Point(r.Right, r.Y);
+
+                using (Pen pen = new Pen(color))
+                {
+                    for (int i = 0; i < 3; i++)
+                    {
+                        g.DrawLine(pen, pt1, pt2);
+
+                        pt1.Y += (m + 1);
+                        pt2.Y += (m + 1);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderBorder
+
+        private void RenderBorder(Graphics g, Rectangle bounds)
+        {
+            ScrollBarVisualStyle style = GetEffectiveStyle();
+
+            if (style.BorderColor.IsEmpty == false)
+            {
+                bool noAlpha = (style.NoAlphaOnMouseOver == Tbool.True) ? IsMouseOver : false;
+
+                Color color = style.GetColor(style.BorderColor, noAlpha);
+
+                using (Pen pen = new Pen(color))
+                    g.DrawRectangle(pen, bounds);
+            }
+        }
+
+        #endregion
+
+        #region GetAreaStyle
+
+        private ScrollBarVisualStyle GetAreaStyle(ItemHitArea scrollBarArea)
+        {
+            StyleState state = StyleState.Default;
+
+            if (_HitArea == scrollBarArea)
+                state |= StyleState.MouseOver;
+
+            if (_MouseDownHitArea == scrollBarArea)
+                state |= StyleState.Selected;
+
+            return (GetEffectiveStyle(state));
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Mouse handling
+
+        #region OnMouseEnter
+
+        protected override bool OnMouseEnter(EventArgs e)
+        {
+            ChartCursor = Cursors.Default;
+
+            InvalidateRender();
+
+            return (true);
+        }
+
+        #endregion
+
+        #region OnMouseLeave
+
+        protected override bool OnMouseLeave(EventArgs e)
+        {
+            _HitArea = ItemHitArea.None;
+
+            InvalidateRender();
+
+            return (true);
+        }
+
+        #endregion
+
+        #region OnMouseMove
+
+        /// <summary>
+        /// InternalMouseMove
+        /// </summary>
+        /// <param name="e"></param>
+        protected override bool OnMouseMove(MouseEventArgs e)
+        {
+            _HitArea = GetHitArea(e.Location);
+
+            if (_HitArea != _LastHitArea)
+            {
+                _LastHitArea = _HitArea;
+
+                InvalidateRender();
+            }
+
+            if (IsMouseDown == false)
+                _MouseDownHitArea = ItemHitArea.None;
+
+            if (_MouseDownHitArea == ItemHitArea.Thumb)
+                ProcessThumbMove(e);
+
+            ChartCursor = Cursors.Default;
+
+            return (true);
+        }
+
+        #region ProcessThumbMove
+
+        private void ProcessThumbMove(MouseEventArgs e)
+        {
+            int track;
+            int tc;
+            int tv = Maximum - Minimum - _LargeChange;
+
+            if (Orientation == Orientation.Horizontal)
+            {
+                track = e.Location.X - _ThumbOffset;
+                track -= _ArrowDecreaseBounds.Right;
+
+                tc = Width - (_ArrowDecreaseBounds.Width + _ArrowIncreaseBounds.Width + _ThumbBounds.Width);
+            }
+            else
+            {
+                track = e.Location.Y - _ThumbOffset;
+                track -= _ArrowDecreaseBounds.Bottom;
+
+                tc = Height - (_ArrowDecreaseBounds.Height + _ArrowIncreaseBounds.Height + _ThumbBounds.Height);
+            }
+
+            if (tc > 0)
+            {
+                int value = (tv * track) / tc;
+
+                if (Inverted == true)
+                    value = tv - value;
+
+                SetScrollValue(value, ScrollEventType.ThumbPosition);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region OnMouseDown
+
+        protected override bool OnMouseDown(MouseEventArgs e)
+        {
+            _MouseDownHitArea = _HitArea;
+
+            if (_HitArea != ItemHitArea.None)
+            {
+                ChartControl.CapturedItem = this;
+
+                switch (_HitArea)
+                {
+                    case ItemHitArea.Thumb:
+                        if (Orientation == Orientation.Horizontal)
+                            _ThumbOffset = MouseDownPoint.X - _ThumbBounds.X;
+                        else
+                            _ThumbOffset = MouseDownPoint.Y - _ThumbBounds.Y;
+                        break;
+
+                    case ItemHitArea.TrackDecrease:
+                        SetScrollValue(Value - _LargeChange, ScrollEventType.LargeDecrement);
+                        break;
+
+                    case ItemHitArea.TrackIncrease:
+                        SetScrollValue(Value + _LargeChange, ScrollEventType.LargeIncrement);
+                        break;
+
+                    case ItemHitArea.ArrowDecrease:
+                        SetScrollValue(Value - _SmallChange, ScrollEventType.SmallDecrement);
+                        break;
+
+                    case ItemHitArea.ArrowIncrease:
+                        SetScrollValue(Value + _SmallChange, ScrollEventType.SmallIncrement);
+                        break;
+                }
+
+                if (_HitArea != ItemHitArea.Thumb)
+                    SetupClickTimer();
+            }
+
+            InvalidateRender();
+
+            return (true);
+        }
+
+        #endregion
+
+        #region OnMouseUp
+
+        protected override bool OnMouseUp(MouseEventArgs e)
+        {
+            ChartControl.CapturedItem = null;
+
+            if (_MouseDownHitArea != ItemHitArea.None)
+            {
+                if (_RaiseEndScroll == true)
+                {
+                    OnScroll(ScrollEventType.EndScroll, Value, Value);
+
+                    _RaiseEndScroll = false;
+                }
+            }
+
+            DisposeTimer();
+
+            _MouseDownHitArea = ItemHitArea.None;
+
+            InvalidateRender();
+
+            return (true);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region NormalizeValue
+
+        private int NormalizeValue(int value)
+        {
+            value = Math.Max(Minimum, value);
+
+            if (value + _LargeChange > _Maximum)
+                value = _Maximum - _LargeChange;
+
+            return (value);
+        }
+
+        #endregion
+
+        #region Timer support
+
+        #region SetupClickTimer
+
+        private void SetupClickTimer()
+        {
+            if (_ClickTimer == null)
+            {
+                _ClickCount = 0;
+
+                _ClickTimer = new Timer();
+                _ClickTimer.Interval = 100;
+                _ClickTimer.Tick += new EventHandler(ClickTimerTick);
+
+                _ClickTimer.Enabled = true;
+            }
+        }
+
+        #endregion
+
+        #region DisposeTimer
+
+        private void DisposeTimer()
+        {
+            Timer clickTimer = _ClickTimer;
+
+            if (clickTimer != null)
+            {
+                _ClickTimer = null;
+
+                clickTimer.Enabled = false;
+                clickTimer.Tick -= new EventHandler(ClickTimerTick);
+
+                clickTimer.Dispose();
+            }
+        }
+
+        #endregion
+
+        #region ClickTimerTick
+
+        private void ClickTimerTick(object sender, EventArgs e)
+        {
+            if (IsMouseDown == true)
+            {
+                if (_MouseDownHitArea == ItemHitArea.TrackDecrease || _MouseDownHitArea == ItemHitArea.TrackIncrease)
+                {
+                    Point pt = ChartControl.PointToClient(Control.MousePosition);
+
+                    if (_ThumbBounds.Contains(pt))
+                    {
+                        DisposeTimer();
+                    }
+                    else
+                    {
+                        if (_MouseDownHitArea == ItemHitArea.TrackDecrease)
+                            SetScrollValue(Value - _LargeChange, ScrollEventType.LargeDecrement);
+                        else
+                            SetScrollValue(Value + _LargeChange, ScrollEventType.LargeIncrement);
+                    }
+                }
+                else
+                {
+                    if (_HitArea == ItemHitArea.ArrowDecrease)
+                        SetScrollValue(Value - _SmallChange, ScrollEventType.SmallDecrement);
+
+                    else if (_HitArea == ItemHitArea.ArrowIncrease)
+                        SetScrollValue(Value + _SmallChange, ScrollEventType.SmallIncrement);
+
+                    else
+                    {
+                        _ClickCount = 0;
+                        _ClickTimer.Interval = 100;
+                    }
+                }
+
+                Timer clickTimer = _ClickTimer;
+
+                if (clickTimer != null)
+                {
+                    _ClickCount++;
+
+                    if (_ClickCount > 4 && clickTimer.Interval > 20)
+                        clickTimer.Interval -= 10;
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region SetScrollValue
+
+        private void SetScrollValue(int value, ScrollEventType type)
+        {
+            value = NormalizeValue(value);
+            int oldValue = _Value;
+
+            Value = value;
+
+            OnScroll(type, _Value, oldValue);
+
+            _RaiseEndScroll = true;
+        }
+
+        #endregion
+
+        #region OnScroll
+
+        private void OnScroll(ScrollEventType type, int oldValue, int newValue)
+        {
+            ScrollEventArgs args = null;
+
+            if (Scroll != null)
+            {
+                ScrollOrientation so = (Orientation == Orientation.Horizontal)
+                    ? ScrollOrientation.HorizontalScroll : ScrollOrientation.VerticalScroll;
+
+                args = new ScrollEventArgs(type, oldValue, newValue, so);
+
+                Scroll(this, args);
+            }
+
+            if (ChartControl.IsScrollHooked == true)
+            {
+                if (args == null)
+                {
+                    ScrollOrientation so = (Orientation == Orientation.Horizontal)
+                        ? ScrollOrientation.HorizontalScroll : ScrollOrientation.VerticalScroll;
+
+                    args = new ScrollEventArgs(type, oldValue, newValue, so);
+                }
+
+                ChartControl.DoScrollEvent((ChartContainer)Parent, args, this);
+            }
+        }
+
+        #endregion
+
+        #region GetBarAreaAt
+
+        public override ItemHitArea GetHitArea(Point pt)
+        {
+            if ((Bounds.Contains(pt) == false) ||
+                (Visible == false || Enabled == false))
+            {
+                return (ItemHitArea.None);
+            }
+
+            if (_ArrowDecreaseBounds.Contains(pt))
+                return (Inverted ? ItemHitArea.ArrowIncrease : ItemHitArea.ArrowDecrease);
+
+            if (_ArrowIncreaseBounds.Contains(pt))
+                return (Inverted ? ItemHitArea.ArrowDecrease : ItemHitArea.ArrowIncrease);
+
+            if (_ThumbBounds.Contains(pt))
+                return (ItemHitArea.Thumb);
+
+            if (Orientation == Orientation.Horizontal)
+            {
+                if (pt.X < _ThumbBounds.Left)
+                {
+                    if (Inverted == false)
+                        return (ItemHitArea.TrackDecrease);
+                }
+            }
+            else
+            {
+                if (pt.Y < _ThumbBounds.Top)
+                {
+                    if (Inverted == false)
+                        return (ItemHitArea.TrackDecrease);
+                }
+            }
+
+            return (ItemHitArea.TrackIncrease);
+        }
+
+        #endregion
+
+        #region Style handling
+
+        #region GetEffectiveStyle
+
+        ///<summary>
+        /// Gets the EffectiveStyle for the ScrollBar. The effective
+        /// style is a composite, cached style definition.
+        ///</summary>
+        /// <param name="state"></param>
+        /// <returns></returns>
+        public ScrollBarVisualStyle GetEffectiveStyle(StyleState state)
+        {
+            return (_EffectiveStyles[state]);
+        }
+
+        ///<summary>
+        /// Gets the EffectiveStyle for the ScrollBar. The effective
+        /// style is a composite, cached style definition.
+        ///</summary>
+        ///<returns></returns>
+        public ScrollBarVisualStyle GetEffectiveStyle()
+        {
+            StyleState state = GetStyleState();
+
+            return (_EffectiveStyles[state]);
+        }
+
+        #region GetStyleState
+
+        private StyleState GetStyleState()
+        {
+            StyleState state = StyleState.Default;
+
+            Point pt = ChartControl.PointToClient(Control.MousePosition);
+
+            if (Bounds.Contains(pt))
+                state |= StyleState.MouseOver;
+
+            if (_MouseDownHitArea != ItemHitArea.None)
+                state |= StyleState.Selected;
+
+            return (state);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ApplyStyles
+
+        public override void ApplyStyles(BaseVisualStyle style, StyleType cs)
+        {
+            ScrollBarVisualStyle pstyle = style as ScrollBarVisualStyle;
+
+            if (pstyle != null)
+            {
+                ApplyParentStyles(pstyle, cs, Parent as ChartContainer);
+
+                pstyle.ApplyStyle(ScrollBarVisualStyles[cs]);
+            }
+        }
+
+        #region ApplyParentStyles
+
+        private void ApplyParentStyles(
+            ScrollBarVisualStyle pstyle, StyleType cs, ChartContainer item)
+        {
+            if (item != null)
+            {
+                ApplyParentStyles(pstyle, cs, item.Parent as ChartContainer);
+
+                if (item is ChartXy)
+                {
+                    if (Orientation == Orientation.Horizontal)
+                        pstyle.ApplyStyle(((ChartXy)item).ChartVisualStyle.HScrollBarVisualStyles[cs]);
+                    else
+                        pstyle.ApplyStyle(((ChartXy)item).ChartVisualStyle.VScrollBarVisualStyles[cs]);
+                }
+                else if (item is ChartPanel)
+                {
+                    if (Orientation == Orientation.Horizontal)
+                        pstyle.ApplyStyle(((ChartPanel)item).DefaultVisualStyles.HScrollBarVisualStyles[cs]);
+                    else
+                        pstyle.ApplyStyle(((ChartPanel)item).DefaultVisualStyles.VScrollBarVisualStyles[cs]);
+                }
+            }
+            else
+            {
+                if (Orientation == Orientation.Horizontal)
+                {
+                    pstyle.ApplyStyle(ChartControl.BaseVisualStyles.HScrollBarVisualStyles[cs]);
+                    pstyle.ApplyStyle(ChartControl.DefaultVisualStyles.HScrollBarVisualStyles[cs]);
+                }
+                else
+                {
+                    pstyle.ApplyStyle(ChartControl.BaseVisualStyles.VScrollBarVisualStyles[cs]);
+                    pstyle.ApplyStyle(ChartControl.DefaultVisualStyles.VScrollBarVisualStyles[cs]);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ApplyDefaults
+
+        public override void ApplyDefaults(BaseVisualStyle style, StyleType cs)
+        {
+            ScrollBarVisualStyle pstyle = style as ScrollBarVisualStyle;
+
+            if (pstyle != null)
+                pstyle.ApplyDefaults();
+
+            base.ApplyDefaults(style, cs);
+        }
+
+        #endregion
+
+        #region InvalidateStyle
+
+        ///<summary>
+        ///Invalidate the cached Styles
+        ///</summary>
+        public void InvalidateStyle()
+        {
+            ClearEffectiveStyles();
+        }
+
+        #endregion
+
+        #region ClearEffectiveStyles
+
+        protected override void ClearEffectiveStyles()
+        {
+            _EffectiveStyles.InvalidateStyles();
+
+            base.ClearEffectiveStyles();
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InvalidateLayoutBounds
+
+        /// <summary>
+        /// Invalidates the layout bounds for the item container
+        /// </summary>
+        public override void InvalidateLayoutBounds(ScrollBarLite sbar)
+        {
+            ChartVisualElement parent = Parent as ChartVisualElement;
+
+            if (parent is IScrollable)
+            {
+                IScrollable isc = (IScrollable)parent;
+
+                isc.InvalidateLayoutBounds(sbar);
+
+                Rectangle scrollBounds = GetScrollBounds(isc.ScrollBounds);
+
+                parent.InvalidateRender(scrollBounds);
+            }
+        }
+
+        #endregion
+
+        #region GetSerialData
+
+        internal override SerialElementCollection GetSerialData(string serialName)
+        {
+            SerialElementCollection sec = new SerialElementCollection();
+
+            if (serialName != null)
+            {
+                if (serialName.Equals("") == true)
+                    serialName = "ChartXy";
+
+                sec.AddStartElement(serialName);
+            }
+
+            if (_ScrollBarVisualStyles != null && _ScrollBarVisualStyles.IsEmpty == false)
+                sec.AddElement(_ScrollBarVisualStyles.GetSerialData("ScrollBarVisualStyles"));
+
+            sec.AddElement(base.GetSerialData(null));
+
+            if (serialName != null)
+                sec.AddEndElement(serialName);
+
+            return (sec);
+        }
+
+        #endregion
+
+        #region PutSerialData
+
+        #region ProcessCollection
+
+        internal override void ProcessCollection(SerialElement se)
+        {
+            SerialElementCollection sec = se.Sec;
+
+            switch (se.Name)
+            {
+                case "ScrollBarVisualStyles":
+                    sec.PutSerialData(ScrollBarVisualStyles);
+                    break;
+
+                default:
+                    base.ProcessCollection(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IDisposable
+
+        public override void Dispose()
+        {
+            ScrollBarVisualStyles = null;
+
+            base.Dispose();
+        }
+
+        #endregion
+    }
+
+    #region EventArgs
+
+    #region ValueChangedEventArgs
+
+    /// <summary>
+    /// ValueChangedEventArgs
+    /// </summary>
+    public class ValueChangedEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private int _OldValue;
+        private int _NewValue;
+
+        #endregion
+
+        ///<summary>
+        /// ValueChangedEventArgs
+        ///</summary>
+        ///<param name="oldValue"></param>
+        ///<param name="newValue"></param>
+        public ValueChangedEventArgs(int oldValue, int newValue)
+        {
+            _OldValue = oldValue;
+            _NewValue = newValue;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the old scroll Value
+        /// </summary>
+        public int OldValue
+        {
+            get { return (_OldValue); }
+        }
+
+        /// <summary>
+        /// Gets the new scroll Value
+        /// </summary>
+        public int NewValue
+        {
+            get { return (_NewValue); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #endregion
+
+    #region Interfaces
+
+    #region IScrollable
+
+    internal interface IScrollable
+    {
+        Rectangle ScrollBounds { get; }
+        Rectangle ScrollBoundsEx { get; }
+
+        Point ScrollBoundsOffset { get; }
+
+        void InvalidateLayoutBounds(ScrollBarLite sbar);
+    }
+
+    #endregion
+
+    #endregion
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/AnnotationVisualStyle.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/AnnotationVisualStyle.cs
new file mode 100644
index 00000000..a66da6a0
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/AnnotationVisualStyle.cs	
@@ -0,0 +1,206 @@
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar.Charts.Style
+{
+    ///<summary>
+    /// AnnotationVisualStyles
+    ///</summary>
+    [TypeConverter(typeof(VisualStylesConverter))]
+    public class AnnotationVisualStyles : VisualStyles<AnnotationVisualStyle>
+    {
+        #region Copy
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public AnnotationVisualStyles Copy()
+        {
+            AnnotationVisualStyles styles = new AnnotationVisualStyles();
+
+            for (int i = 0; i < Styles.Length; i++)
+            {
+                AnnotationVisualStyle vstyle = Styles[i];
+
+                if (vstyle != null)
+                    styles.Styles[i] = vstyle.Copy();
+            }
+
+            return (styles);
+        }
+
+        #endregion
+    }
+
+    /// <summary>
+    /// Represents the visual style of a Legend element.
+    /// </summary>
+    [TypeConverter(typeof(VisualStylesConverter))]
+    public class AnnotationVisualStyle : ContainerVisualStyle
+    {
+        #region Private variables
+
+        private AnnotationShape _AnnotationShape = AnnotationShape.Ellipse;
+        private ConnectorShape _ConnectorShape = ConnectorShape.NotSet;
+
+        private Alignment _TextAlignment = Alignment.NotSet;
+
+        #endregion
+
+        #region Public properties
+
+        #region AnnotationShape
+
+        /// <summary>
+        /// Gets or sets the shape of the annotation container.
+        /// </summary>
+        [DefaultValue(AnnotationShape.NotSet), Category("Appearance")]
+        [Description("Indicates the shape of the annotation container.")]
+        public AnnotationShape AnnotationShape
+        {
+            get { return (_AnnotationShape); }
+
+            set
+            {
+                if (_AnnotationShape != value)
+                {
+                    _AnnotationShape = value;
+
+                    OnPropertyChangedEx("AnnotationShape", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ConnectorShape
+
+        /// <summary>
+        /// Gets or sets the shape of the annotation connector.
+        /// </summary>
+        [DefaultValue(ConnectorShape.NotSet), Category("Appearance")]
+        [Description("Indicates the shape of the annotation connector.")]
+        public ConnectorShape ConnectorShape
+        {
+            get { return (_ConnectorShape); }
+
+            set
+            {
+                if (_ConnectorShape != value)
+                {
+                    _ConnectorShape = value;
+
+                    OnPropertyChangedEx("ConnectorShape", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region TextAlignment
+
+        /// <summary>
+        /// Gets or sets the alignment of the content within the cell
+        /// </summary>
+        [DefaultValue(Alignment.NotSet), Category("Appearance")]
+        [Description("Indicates the alignment of the content within the cell.")]
+        public Alignment TextAlignment
+        {
+            get { return (_TextAlignment); }
+
+            set
+            {
+                if (_TextAlignment != value)
+                {
+                    _TextAlignment = value;
+
+                    OnPropertyChangedEx("TextAlignment", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region IsEmpty
+
+        /// <summary>
+        /// Gets whether the style is logically Empty.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        [Description("Gets whether the style is logically Empty.")]
+        public override bool IsEmpty
+        {
+            get
+            {
+                return ((_AnnotationShape == AnnotationShape.NotSet) &&
+                    (_ConnectorShape == ConnectorShape.NotSet) &&
+                    (_TextAlignment == Alignment.NotSet) &&
+                    (base.IsEmpty == true));
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ApplyStyle
+
+        /// <summary>
+        /// Applies the style to instance of this style.
+        /// </summary>
+        /// <param name="style">Style to apply.</param>
+        public void ApplyStyle(AnnotationVisualStyle style)
+        {
+            if (style != null)
+            {
+                base.ApplyStyle(style);
+
+                if (style.AnnotationShape != AnnotationShape.NotSet)
+                    _AnnotationShape = style.AnnotationShape;
+
+                if (style.ConnectorShape != ConnectorShape.NotSet)
+                    _ConnectorShape = style.ConnectorShape;
+
+                if (style.TextAlignment != Alignment.NotSet)
+                    _TextAlignment = style.TextAlignment;
+            }
+        }
+
+        #endregion
+
+        #region Copy
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public new AnnotationVisualStyle Copy()
+        {
+            AnnotationVisualStyle style = new AnnotationVisualStyle();
+
+            CopyTo(style);
+
+            return (style);
+        }
+
+        #endregion
+
+        #region CopyTo
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public void CopyTo(AnnotationVisualStyle style)
+        {
+            base.CopyTo(style);
+
+            style.AnnotationShape = _AnnotationShape;
+            style.ConnectorShape = _ConnectorShape;
+            style.TextAlignment = _TextAlignment;
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/AxisStripeVisualStyle .cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/AxisStripeVisualStyle .cs
new file mode 100644
index 00000000..13fb24b4
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/AxisStripeVisualStyle .cs	
@@ -0,0 +1,213 @@
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Charts.Style
+{
+    /// <summary>
+    /// Represents a AxisStripeVisualStyle.
+    /// </summary>
+    [TypeConverter(typeof(VisualStylesConverter))]
+    public class AxisStripeVisualStyle : BaseVisualStyle
+    {
+        #region Private variables
+
+        private Background _Background;
+
+        #endregion
+
+        #region Public properties
+
+        #region Background
+
+        /// <summary>
+        /// Gets or sets the style background.
+        /// </summary>
+        [Description("Indicates the style background")]
+        public Background Background
+        {
+            get
+            {
+                if (_Background == null)
+                {
+                    _Background = Background.Empty;
+
+                    UpdateChangeHandler(null, _Background);
+                }
+
+                return (_Background);
+            }
+
+            set
+            {
+                if (_Background != value)
+                {
+                    UpdateChangeHandler(_Background, value);
+
+                    _Background = value;
+
+                    OnPropertyChangedEx("Background", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeBackground()
+        {
+            return (_Background != null && _Background.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetBackground()
+        {
+            Background = null;
+        }
+
+        #endregion
+
+        #region IsEmpty
+
+        /// <summary>
+        /// Gets whether the style is logically Empty.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        [Description("Gets whether the style is logically Empty.")]
+        public override bool IsEmpty
+        {
+            get
+            {
+                return ((_Background == null || _Background.IsEmpty == true) &&
+                    (base.IsEmpty == true));
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ApplyStyle
+
+        /// <summary>
+        /// Applies the style to instance of this style.
+        /// </summary>
+        /// <param name="style">Style to apply.</param>
+        public void ApplyStyle(AxisStripeVisualStyle style)
+        {
+            if (style != null)
+            {
+                base.ApplyStyle(style);
+
+                if (style._Background != null && style._Background.IsEmpty == false)
+                    Background = style._Background.Copy();
+            }
+        }
+
+        #endregion
+
+        #region Copy
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public new AxisStripeVisualStyle Copy()
+        {
+            AxisStripeVisualStyle style = new AxisStripeVisualStyle();
+
+            CopyTo(style);
+
+            return (style);
+        }
+
+        #endregion
+
+        #region CopyTo
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public void CopyTo(AxisStripeVisualStyle style)
+        {
+            base.CopyTo(style);
+
+            style.Background = (_Background != null) ? _Background.Copy() : null;
+        }
+
+        #endregion
+
+        #region GetSerialData
+
+        internal override SerialElementCollection GetSerialData(string serialName)
+        {
+            SerialElementCollection sec = new SerialElementCollection();
+
+            if (serialName != null)
+            {
+                if (serialName.Equals("") == true)
+                    serialName = "AxisStripeVisualStyle";
+
+                sec.AddStartElement(serialName);
+            }
+
+            if (_Background != null && _Background.IsEmpty == false)
+                sec.AddElement(_Background.GetSerialData("Background"));
+
+            sec.AddElement(base.GetSerialData(null));
+
+            if (serialName != null)
+                sec.AddEndElement(serialName);
+
+            return (sec);
+        }
+
+        #endregion
+
+        #region PutSerialData
+
+        #region ProcessCollection
+
+        internal override void ProcessCollection(SerialElement se)
+        {
+            SerialElementCollection sec = se.Sec;
+
+            switch (se.Name)
+            {
+                case "Background":
+                    sec.PutSerialData(Background);
+                    break;
+
+                default:
+                    base.ProcessCollection(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IDisposable
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        public override void Dispose()
+        {
+            Background = null;
+
+            base.Dispose();
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/BackColorBlend.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/BackColorBlend.cs
new file mode 100644
index 00000000..1925bb04
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/BackColorBlend.cs	
@@ -0,0 +1,290 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Globalization;
+
+namespace DevComponents.DotNetBar.Charts.Style
+{
+    ///<summary>
+    /// BackColorBlend
+    ///</summary>
+    [TypeConverter(typeof(BackColorBlendConvertor))]
+    public class BackColorBlend : INotifyPropertyChanged, IProcessSerialElement
+    {
+        #region Private variables
+
+        private Color[] _Colors;        // Color values
+        private float[] _Positions;     // Gradient color positions
+
+        #endregion
+
+        #region Public properties
+
+        #region Colors
+
+        /// <summary>
+        /// Gets or sets the ColorBlend Color array
+        /// </summary>
+        [Browsable(true), DefaultValue(null)]
+        [Description("Indicates the ColorBlend Color array")]
+        [TypeConverter(typeof(ArrayConverter))]
+        public Color[] Colors
+        {
+            get { return (_Colors); }
+
+            set
+            {
+                if (value != null && value.Length == 0)
+                    value = null;
+
+                _Colors = value;
+
+                OnPropertyChangedEx("Colors");
+            }
+        }
+
+        #endregion
+
+        #region Positions
+
+        /// <summary>
+        /// Gets or sets the ColorBlend Color Positions
+        /// </summary>
+        [Browsable(true), DefaultValue(null)]
+        [Description("Indicates the ColorBlend Color Positions")]
+        [TypeConverter(typeof(ArrayConverter))]
+        public float[] Positions
+        {
+            get { return (_Positions); }
+
+            set
+            {
+                if (value != null && value.Length == 0)
+                    value = null;
+                
+                _Positions = value;
+
+                OnPropertyChangedEx("Positions");
+            }
+        }
+
+        #endregion
+
+        #region IsEmpty
+
+        /// <summary>
+        /// IsEmpty
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsEmpty
+        {
+            get { return (_Colors == null || _Colors.Length == 1 && _Colors[0].IsEmpty); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Copy
+
+        /// <summary>
+        /// Creates an exact copy of the BackColorBlend.
+        /// </summary>
+        /// <returns>Copy of the BackColorBlend.</returns>
+        public BackColorBlend Copy()
+        {
+            BackColorBlend copy = new BackColorBlend();
+
+            if (_Colors != null)
+            {
+                copy.Colors = new Color[_Colors.Length];
+
+                _Colors.CopyTo(copy.Colors, 0);
+            }
+
+            if (_Positions != null)
+            {
+                copy.Positions = new float[_Positions.Length];
+
+                _Positions.CopyTo(copy.Positions, 0);
+            }
+
+            return (copy);
+        }
+
+        #endregion
+
+        #region GetSerialData
+
+        internal SerialElementCollection GetSerialData()
+        {
+            SerialElementCollection sec = new SerialElementCollection();
+
+            sec.AddStartElement("BackColorBlend");
+
+            if (_Colors != null && _Colors.Length > 0)
+            {
+                sec.AddStartElement("Colors count=\"" + _Colors.Length + "\"");
+
+                foreach (Color color in _Colors)
+                    sec.AddValue("Color", color);
+
+                sec.AddEndElement("Colors");
+            }
+
+            if (_Positions != null && _Positions.Length > 0)
+            {
+                sec.AddStartElement("Positions count=\"" + _Positions.Length + "\"");
+
+                foreach (float pos in _Positions)
+                    sec.AddDataValue("Position", pos);
+
+                sec.AddEndElement("Positions");
+            }
+
+            sec.AddEndElement("BackColorBlend");
+
+            return (sec);
+        }
+
+        #endregion
+
+        #region PutSerialData
+
+        #region ProcessValue
+
+        void IProcessSerialElement.ProcessValue(SerialElement se)
+        {
+            switch (se.Name)
+            {
+                case "Color":
+                    _Colors[se.ValueIndex] = se.ColorValue;
+                    break;
+
+                case "Position":
+                    _Positions[se.ValueIndex] = (float)se.DataValue;
+                    break;
+
+                default:
+                    throw new Exception("Unknown Serial Value (" + se.Name + ")");
+            }
+        }
+
+        #endregion
+
+        #region ProcessCollection
+
+        void IProcessSerialElement.ProcessCollection(SerialElement se)
+        {
+            int count = se.ArrayCount;
+
+            if (count > 0)
+            {
+                switch (se.Name)
+                {
+                    case "Colors":
+                        _Colors = new Color[count];
+                        break;
+
+                    case "Positions":
+                        _Positions = new float[count];
+                        break;
+
+                    default:
+                        throw new Exception("Unknown Serial Collection (" + se.Name + ")");
+                }
+
+                se.Sec.PutSerialData(this);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region INotifyPropertyChanged Members
+
+        /// <summary>
+        /// Occurs when property value has changed.
+        /// </summary>
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        /// <summary>
+        /// Raises the PropertyChanged event.
+        /// </summary>
+        /// <param name="e">Event arguments</param>
+        protected virtual void OnPropertyChanged(PropertyChangedEventArgs e)
+        {
+            PropertyChangedEventHandler eh = PropertyChanged;
+
+            if (eh != null)
+                eh(this, e);
+        }
+
+        /// <summary>
+        /// Raises the PropertyChanged event.
+        /// </summary>
+        /// <param name="s">Event arguments</param>
+        protected virtual void OnPropertyChangedEx(string s)
+        {
+            PropertyChangedEventHandler eh = PropertyChanged;
+
+            if (eh != null)
+            {
+                VisualPropertyChangedEventArgs e =
+                    new VisualPropertyChangedEventArgs(s);
+
+                eh(this, e);
+            }
+        }
+
+        #endregion
+    }
+
+    #region BackColorBlendConvertor
+
+        /// <summary>
+        /// BackColorBlendConvertor
+        /// </summary>
+        public class BackColorBlendConvertor : ExpandableObjectConverter
+        {
+            /// <summary>
+            /// ConvertTo
+            /// </summary>
+            /// <param name="context"></param>
+            /// <param name="culture"></param>
+            /// <param name="value"></param>
+            /// <param name="destinationType"></param>
+            /// <returns></returns>
+            public override object ConvertTo(
+                ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+            {
+                if (destinationType == typeof(string))
+                {
+                    BackColorBlend cb = value as BackColorBlend;
+
+                    if (cb != null)
+                    {
+                        ColorConverter cvt = new ColorConverter();
+
+                        if (cb.Colors != null)
+                        {
+                            if (cb.Colors[0] != Color.Empty)
+                                return (cvt.ConvertToString(cb.Colors[0]));
+
+                            if (cb.Colors.Length > 1 && cb.Colors[1] != Color.Empty)
+                                return (cvt.ConvertToString(cb.Colors[1]));
+                        }
+                    }
+
+                    return (String.Empty);
+                }
+
+                return (base.ConvertTo(context, culture, value, destinationType));
+            }
+        }
+
+        #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/Background.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/Background.cs
new file mode 100644
index 00000000..6ed7a85f
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/Background.cs	
@@ -0,0 +1,1399 @@
+using System;
+using System.Drawing;
+using System.ComponentModel;
+using System.Drawing.Design;
+using System.Drawing.Drawing2D;
+using System.Globalization;
+using DevComponents.DotNetBar.Charts.Primitives;
+
+namespace DevComponents.DotNetBar.Charts.Style
+{
+    /// <summary>
+    /// Represents background of visual style.
+    /// </summary>
+    [TypeConverter(typeof(BackgroundConvertor))]
+    [Editor(typeof(BackgroundEditor), typeof(UITypeEditor))]
+    public class Background : INotifyPropertyChanged, IDisposable, IProcessSerialElement
+    {
+        #region Static data
+
+        ///<summary>
+        /// Empty
+        ///</summary>
+        /// <summary>
+        /// Returns Empty instance of Background.
+        /// </summary>
+        public static Background Empty
+        {
+            get { return (new Background()); }
+        }
+
+        #endregion
+
+        #region Private variables
+
+        private Color _Color1 = Color.Empty;
+        private Color _Color2 = Color.Empty;
+
+        private int _GradientAngle = 90;
+        private double _RadialCenter = 0.0d;
+
+        private BackFillType _BackFillType = BackFillType.Angle;
+        private HatchFillType _HatchFillType = HatchFillType.NotSet;
+
+        private BackColorBlend _BackColorBlend;
+
+        #endregion
+
+        #region Constructors
+
+        /// <summary>
+        /// Creates new instance of the object.
+        /// </summary>
+        public Background() { }
+
+        /// <summary>
+        /// Creates new instance of the object.
+        /// </summary>
+        /// <param name="color1">Start color.</param>
+        public Background(Color color1)
+        {
+            _Color1 = color1;
+        }
+
+        /// <summary>
+        /// Creates new instance of the object.
+        /// </summary>
+        /// <param name="color1">Start color.</param>
+        /// <param name="color2">End color.</param>
+        public Background(Color color1, Color color2)
+        {
+            _Color1 = color1;
+            _Color2 = color2;
+        }
+
+        /// <summary>
+        /// Creates new instance of the object.
+        /// </summary>
+        /// <param name="color1">Start color in hexadecimal representation like FFFFFF.</param>
+        /// <param name="color2">End color in hexadecimal representation like FFFFFF.</param>
+        public Background(string color1, string color2)
+        {
+            _Color1 = ColorFactory.GetColor(color1);
+            _Color2 = ColorFactory.GetColor(color2);
+        }
+
+        /// <summary>
+        /// Creates new instance of the object.
+        /// </summary>
+        /// <param name="color1">Start color in 32-bit RGB representation.</param>
+        /// <param name="color2">End color in 32-bit RGB representation.</param>
+        public Background(int color1, int color2)
+        {
+            _Color1 = ColorFactory.GetColor(color1);
+            _Color2 = ColorFactory.GetColor(color2);
+        }
+
+        /// <summary>
+        /// Creates new instance of the object.
+        /// </summary>
+        /// <param name="color1">Start color in 32-bit RGB representation.</param>
+        /// <param name="color2">End color in 32-bit RGB representation.</param>
+        /// <param name="gradientAngle">Gradient angle.</param>
+        public Background(int color1, int color2, int gradientAngle)
+        {
+            _Color1 = ColorFactory.GetColor(color1);
+            _Color2 = ColorFactory.GetColor(color2);
+
+            GradientAngle = gradientAngle;
+        }
+
+        /// <summary>
+        /// Creates new instance of the object.
+        /// </summary>
+        /// <param name="color1">Start color.</param>
+        /// <param name="color2">End color.</param>
+        /// <param name="gradientAngle">Gradient angle.</param>
+        public Background(Color color1, Color color2, int gradientAngle)
+        {
+            _Color1 = color1;
+            _Color2 = color2;
+
+            GradientAngle = gradientAngle;
+        }
+
+        /// <summary>
+        /// Creates new instance of the object.
+        /// </summary>
+        /// <param name="color1">Start color.</param>
+        /// <param name="color2">End color.</param>
+        /// <param name="fillType">Gradient angle.</param>
+        public Background(Color color1, Color color2, BackFillType fillType)
+        {
+            _Color1 = color1;
+            _Color2 = color2;
+
+            _BackFillType = fillType;
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region BackColorBlend
+
+        /// <summary>
+        /// Gets or sets the BackColorBlend.
+        /// </summary>
+        [Description("Indicates the BackColorBlend.")]
+        public BackColorBlend BackColorBlend
+        {
+            get
+            {
+                if (_BackColorBlend == null)
+                {
+                    _BackColorBlend = new BackColorBlend();
+
+                    UpdateChangeHandler(null, _BackColorBlend);
+                }
+
+                return (_BackColorBlend);
+            }
+
+            set
+            {
+                if (_BackColorBlend != value)
+                {
+                    UpdateChangeHandler(_BackColorBlend, value);
+
+                    _BackColorBlend = value;
+
+                    OnPropertyChangedEx("BackColorBlend");
+                }
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        internal virtual bool ShouldSerializeBackColorBlend()
+        {
+            return (_BackColorBlend != null && _BackColorBlend.IsEmpty == false);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        internal virtual void ResetBackColorBlend()
+        {
+            BackColorBlend = null;
+        }
+
+        #endregion
+
+        #region BackFillType
+
+        /// <summary>
+        /// Gets or sets the Gradient BackFillType
+        /// </summary>
+        [DefaultValue(BackFillType.Angle)]
+        [Description("Indicates the Gradient BackFillType.")]
+        public BackFillType BackFillType
+        {
+            get { return (_BackFillType); }
+
+            set
+            {
+                if (_BackFillType != value)
+                {
+                    _BackFillType = value;
+
+                    OnPropertyChangedEx("BackFillType");
+                }
+            }
+        }
+
+        #endregion
+
+        #region Color1
+
+        /// <summary>
+        /// Gets or sets the start color.
+        /// </summary>
+        [Description("Indicates the Starting Gradient Color.")]
+        public Color Color1
+        {
+            get { return (_Color1); }
+
+            set
+            {
+                if (_Color1 != value)
+                {
+                    _Color1 = value;
+
+                    OnPropertyChangedEx("Color1");
+                }
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        internal virtual bool ShouldSerializeColor1()
+        {
+            return (_Color1.IsEmpty == false);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        internal virtual void ResetColor1()
+        {
+            Color1 = Color.Empty;
+        }
+
+        #endregion
+
+        #region Color2
+
+        /// <summary>
+        /// Gets or sets the Ending Gradient Color
+        /// </summary>
+        [Description("Indicates the Ending Gradient Color")]
+        public Color Color2
+        {
+            get { return (_Color2); }
+
+            set
+            {
+                if (_Color2 != value)
+                {
+                    _Color2 = value;
+
+                    OnPropertyChangedEx("Color2");
+                }
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        internal virtual bool ShouldSerializeColor2()
+        {
+            return (_Color2.IsEmpty == false);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        internal virtual void ResetColor2()
+        {
+            Color2 = Color.Empty;
+        }
+
+        #endregion
+
+        #region GradientAngle
+
+        /// <summary>
+        /// Gets or sets the gradient angle (default is 90)
+        /// </summary>
+        [DefaultValue(90)]
+        [Description("Indicates the Gradient Angle default is 90)")]
+        public int GradientAngle
+        {
+            get { return (_GradientAngle); }
+
+            set
+            {
+                if (_GradientAngle != value)
+                {
+                    _GradientAngle = value;
+
+                    OnPropertyChangedEx("GradientAngle");
+                }
+            }
+        }
+
+        #endregion
+
+        #region HatchFillType
+
+        /// <summary>
+        /// Gets or sets the Gradient BackFillType
+        /// </summary>
+        [DefaultValue(HatchFillType.NotSet)]
+        [Description("Indicates the Hatch FillType.")]
+        public HatchFillType HatchFillType
+        {
+            get { return (_HatchFillType); }
+
+            set
+            {
+                if (_HatchFillType != value)
+                {
+                    _HatchFillType = value;
+
+                    OnPropertyChangedEx("HatchFillType");
+                }
+            }
+        }
+
+        #endregion
+
+        #region RadialCenter
+
+        /// <summary>
+        /// Gets or sets the Radial Gradient Center expressed as a percentage of the radius (from 0 to 1)
+        /// </summary>
+        [DefaultValue(0.0d)]
+        [Description("Indicates the Radial Gradient Center expressed as a percentage of the radius (om 0 to 1)")]
+        public double RadialCenter
+        {
+            get { return (_RadialCenter); }
+
+            set
+            {
+                if (_RadialCenter != value)
+                {
+                    if (value < 0 || value > 1)
+                        throw new Exception("RadialCenter must be a value between 0 and 1");
+
+                    _RadialCenter = value;
+
+                    OnPropertyChangedEx("RadialCenter");
+                }
+            }
+        }
+
+        #endregion
+
+        #region IsSolidBrush
+
+        /// <summary>
+        /// Gets whether the backcolor brush is a SolidBrush
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsSolidBrush
+        {
+            get
+            {
+                if (_BackColorBlend != null && _BackColorBlend.IsEmpty == false)
+                {
+                    if (_BackColorBlend.Colors.Length == 1)
+                        return (true);
+                }
+
+                if (_Color2.IsEmpty == true)
+                    return (true);
+
+                return (false);
+            }
+        }
+
+        #endregion
+
+        #region IsEmpty
+
+        /// <summary>
+        /// Gets whether Background is empty.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsEmpty
+        {
+            get
+            {
+                return ((_BackColorBlend == null || _BackColorBlend.IsEmpty) &&
+                    (_BackFillType == BackFillType.Angle) &&
+                    (_Color1.IsEmpty == true) &&
+                    (_Color2.IsEmpty == true) &&
+                    (_GradientAngle == 90) &&
+                    (_HatchFillType == HatchFillType.NotSet) &&
+                    (_RadialCenter == .0));
+            }
+        }
+
+        #endregion
+
+        #region IsEqualTo
+
+        /// <summary>
+        /// Determines if the Background is equal to the given one
+        /// </summary>
+        /// <param name="background">Background to compare</param>
+        /// <returns>true if equal</returns>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsEqualTo(Background background)
+        {
+            return (_Color1 == background.Color1 &&
+                    _Color2 == background.Color2 &&
+                    (_BackColorBlend == null || _BackColorBlend.Equals(background._BackColorBlend)) &&
+                    _GradientAngle == background.GradientAngle &&
+                    _RadialCenter == background.RadialCenter &&
+                    _BackFillType == background.BackFillType);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        internal bool IsDisplayable
+        {
+            get
+            {
+                if (_BackFillType == BackFillType.None)
+                    return (false);
+
+                if ((_BackColorBlend == null || _BackColorBlend.IsEmpty) &&
+                    (_Color1.IsEmpty == true) &&
+                    (_Color2.IsEmpty == true))
+                {
+                    return (false);
+                }
+
+                return (true);
+            }
+        }
+
+        #endregion
+
+        #region GetBrush
+
+        ///<summary>
+        /// GetBrush
+        ///</summary>
+        ///<param name="r"></param>
+        ///<returns></returns>
+        public Brush GetBrush(Rectangle r)
+        {
+            if (_HatchFillType != HatchFillType.NotSet)
+                return (GetHatchBrush(r));
+
+            return (GetBrush(r, -1, _BackFillType));
+        }
+
+        public Brush GetBrush(Rectangle r, bool noAlpha)
+        {
+            return (GetBrush(r, noAlpha ? 255 : -1));
+        }
+
+        /// <summary>
+        /// Get the background brush
+        /// </summary>
+        /// <param name="r">Brush rectangle</param>
+        /// <param name="alph">0-255 to override default</param>
+        /// <returns>Brush</returns>
+        public Brush GetBrush(Rectangle r, int alpha)
+        {
+            return (GetBrush(r, alpha, _BackFillType));
+        }
+
+        /// <summary>
+        /// Get the background brush
+        /// </summary>
+        /// <param name="r">Brush rectangle</param>
+        /// <param name="alph">0-255 to override default</param>
+        /// <param name="fillType">BackFillType</param>
+        /// <returns>Brush</returns>
+        public Brush GetBrush(Rectangle r, int alpha, BackFillType fillType)
+        {
+            if (_BackColorBlend != null && _BackColorBlend.IsEmpty == false)
+            {
+                if (_BackColorBlend.Colors.Length == 1)
+                    return (new SolidBrush(GetColor(_BackColorBlend.Colors[0], alpha)));
+
+                Brush br = GetLinearBrush(r, alpha, fillType);
+
+                if (br is LinearGradientBrush)
+                {
+                    ColorBlend cb = GetColorBlend(alpha);
+
+                    if (cb != null)
+                        ((LinearGradientBrush)br).InterpolationColors = cb;
+                }
+
+                return (br);
+            }
+
+            if (_Color2.IsEmpty == true)
+                return (new SolidBrush(GetColor(_Color1, alpha)));
+
+            return (GetLinearBrush(r, alpha, fillType));
+        }
+
+        private Brush GetHatchBrush(Rectangle r)
+        {
+            HatchBrush brush = new HatchBrush((HatchStyle)_HatchFillType, Color1, Color2);
+
+            return (brush);
+        }
+
+        #region GetLinearBrush
+
+        private Brush GetLinearBrush(
+            Rectangle r, int alpha, BackFillType fillType)
+        {
+            LinearGradientBrush lbr = null;
+
+            if (r.Width > 0 && r.Height > 0)
+            {
+                Color color1 = GetColor(_Color1, alpha);
+                Color color2 = GetColor(_Color2, alpha);
+
+                switch (fillType)
+                {
+                    case BackFillType.HorizontalCenter:
+                        r.Width /= 2;
+                        r.Width = Math.Max(1, r.Width);
+
+                        lbr = new LinearGradientBrush(r, color1, color2, 0f);
+                        break;
+
+                    case BackFillType.VerticalCenter:
+                        r.Height /= 2;
+                        r.Height = Math.Max(1, r.Height);
+
+                        lbr = new LinearGradientBrush(r, color1, color2, 90f);
+                        break;
+
+                    case BackFillType.ForwardDiagonal:
+                        lbr = new LinearGradientBrush(r, color1, color2, LinearGradientMode.ForwardDiagonal);
+                        break;
+
+                    case BackFillType.BackwardDiagonal:
+                        lbr = new LinearGradientBrush(r, color1, color2, LinearGradientMode.BackwardDiagonal);
+                        break;
+
+                    case BackFillType.ForwardDiagonalCenter:
+                        r.Width /= 2;
+                        r.Height /= 2;
+                        lbr = new LinearGradientBrush(r, color1, color2, LinearGradientMode.ForwardDiagonal);
+                        break;
+
+                    case BackFillType.BackwardDiagonalCenter:
+                        r.Width /= 2;
+                        r.Height /= 2;
+                        r.X += r.Width;
+
+                        lbr = new LinearGradientBrush(r, color1, color2, LinearGradientMode.BackwardDiagonal);
+                        break;
+
+                    case BackFillType.Center:
+                        using (GraphicsPath path = new GraphicsPath())
+                        {
+                            path.AddRectangle(r);
+
+                            PathGradientBrush pbr = new PathGradientBrush(path);
+
+                            pbr.CenterColor = color1;
+                            pbr.SurroundColors = new Color[] { color2 };
+
+                            ColorBlend cb = GetColorBlend(alpha);
+
+                            if (cb != null)
+                                pbr.InterpolationColors = cb;
+
+                            return (pbr);
+                        }
+
+                    case BackFillType.Radial:
+                        int n = (int) Math.Sqrt(r.Width*r.Width + r.Height*r.Height) + 4;
+
+                        using (GraphicsPath path = new GraphicsPath())
+                        {
+                            path.AddEllipse(r.X - (n - r.Width)/2, r.Y - (n - r.Height)/2, n, n);
+
+                            PathGradientBrush pbr = new PathGradientBrush(path);
+
+                            pbr.CenterColor = color1;
+
+                            if (_RadialCenter != .0)
+                                pbr.CenterPoint = GetRadialCenterPoint(r, n);
+
+                            pbr.SurroundColors = new Color[] { color2 };
+
+                            ColorBlend cb = GetColorBlend(alpha);
+
+                            if (cb != null)
+                                pbr.InterpolationColors = cb;
+
+                            return (pbr);
+                        }
+
+                    default:
+                        lbr = new LinearGradientBrush(r, color1, color2, _GradientAngle);
+                        break;
+                }
+
+                if (lbr != null)
+                    lbr.WrapMode = WrapMode.TileFlipXY;
+            }
+
+            return (lbr);
+        }
+
+        #region GetRadialCenterPoint
+
+        private PointF GetRadialCenterPoint(Rectangle r, int n)
+        {
+            double w2 = (double)r.Width / 2;
+            double h2 = (double)r.Height / 2;
+
+            double z = ((double)n / 2) * _RadialCenter;
+            double radians = MathHelper.ToRadians(_GradientAngle);
+
+            double dx = z * Math.Cos(radians);
+            double dy = z * Math.Sin(radians);
+
+            PointF pf = new PointF((float)(r.X + (w2 + dx)), (float)(r.Y + (h2 + dy)));
+
+            return (pf);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetColorBlend
+
+        private ColorBlend GetColorBlend(int alpha)
+        {
+            if (_BackColorBlend != null && 
+                _BackColorBlend.Colors != null && _BackColorBlend.Colors.Length > 0)
+            {
+                ColorBlend cb = new ColorBlend(_BackColorBlend.Colors.Length);
+
+                Color[] colors = _BackColorBlend.Colors;
+
+                if ((uint) alpha < 256)
+                {
+                    for (int i = 0; i < colors.Length; i++)
+                        colors[i] = GetColor(colors[i], alpha);
+                }
+
+                cb.Colors = colors;
+                cb.Positions = GetPositions();
+
+                return (cb);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetPositions
+
+        private float[] GetPositions()
+        {
+            float[] cp = _BackColorBlend.Positions;
+
+            if (cp == null || cp.Length != _BackColorBlend.Colors.Length)
+            {
+                cp = new float[_BackColorBlend.Colors.Length];
+
+                float f = 1f / _BackColorBlend.Colors.Length;
+
+                for (int i = 0; i < cp.Length; i++)
+                    cp[i] = i * f;
+
+                cp[_BackColorBlend.Colors.Length - 1] = 1;
+            }
+
+            return (cp);
+        }
+
+        #endregion
+
+        #region GetColor
+
+        private Color GetColor(Color color, int alpha)
+        {
+            if ((uint)alpha > 255)
+                return (color);
+
+            return (Color.FromArgb(alpha, color));
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Copy
+
+        /// <summary>
+        /// Creates an exact copy of the background.
+        /// </summary>
+        /// <returns>Copy of the background.</returns>
+        public Background Copy()
+        {
+            Background style = new Background();
+
+            CopyTo(style);
+
+            return (style);
+        }
+
+        #endregion
+
+        #region CopyTo
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public void CopyTo(Background style)
+        {
+            style.Color1 = _Color1;
+            style.Color2 = _Color2;
+
+            style.RadialCenter = _RadialCenter;
+            style.GradientAngle = _GradientAngle;
+            style.BackFillType = _BackFillType;
+            style.HatchFillType = _HatchFillType;
+
+            style.BackColorBlend = (_BackColorBlend != null) ? _BackColorBlend.Copy() : null;
+        }
+
+        #endregion
+
+        #region GetSerialData
+
+        internal SerialElementCollection GetSerialData(string serialName)
+        {
+            SerialElementCollection sec = new SerialElementCollection();
+
+            if (serialName != null)
+            {
+                if (serialName.Equals("") == true)
+                    serialName = "Background";
+
+                sec.AddStartElement(serialName);
+            }
+
+            if (_BackColorBlend != null && _BackColorBlend.IsEmpty == false)
+                sec.AddElement(BackColorBlend.GetSerialData());
+
+            sec.AddValue("BackFillType", BackFillType, BackFillType.Angle);
+
+            sec.AddValue("Color1", Color1, Color.Empty);
+            sec.AddValue("Color2", Color2, Color.Empty);
+
+            sec.AddValue("GradientAngle", GradientAngle, 90);
+            sec.AddValue("HatchFillType", HatchFillType, HatchFillType.NotSet);
+            sec.AddValue("RadialCenter", RadialCenter, 0.0d);
+
+            if (serialName != null)
+                sec.AddEndElement(serialName);
+
+            return (sec);
+        }
+
+        #endregion
+
+        #region PutSerialData
+
+        #region ProcessValue
+
+        void IProcessSerialElement.ProcessValue(SerialElement se)
+        {
+            switch (se.Name)
+            {
+                case "BackFillType":
+                    BackFillType = (BackFillType)se.GetValueEnum(typeof(BackFillType));
+                    break;
+
+                case "Color1":
+                    Color1 = se.GetValueColor();
+                    break;
+
+                case "Color2":
+                    Color2 = se.GetValueColor();;
+                    break;
+
+                case "GradientAngle":
+                    GradientAngle = int.Parse(se.StringValue);
+                    break;
+
+                case "HatchFillType":
+                    HatchFillType = (HatchFillType)se.GetValueEnum(typeof(HatchFillType));
+                    break;
+
+                case "RadialCenter":
+                    RadialCenter = double.Parse(se.StringValue);
+                    break;
+
+                default:
+                    throw new Exception("Unknown Serial Value (" + se.Name + ")");
+            }
+        }
+
+        #endregion
+
+        #region ProcessCollection
+
+        void IProcessSerialElement.ProcessCollection(SerialElement se)
+        {
+            switch (se.Name)
+            {
+                case "BackColorBlend":
+                    se.Sec.PutSerialData(BackColorBlend);
+                    break;
+
+                default:
+                    throw new Exception("Unknown Serial Collection (" + se.Name + ")");
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region INotifyPropertyChanged Members
+
+        /// <summary>
+        /// Occurs when property value has changed.
+        /// </summary>
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        /// <summary>
+        /// Raises the PropertyChanged event.
+        /// </summary>
+        /// <param name="e">Event arguments</param>
+        protected virtual void OnPropertyChanged(VisualPropertyChangedEventArgs e)
+        {
+            PropertyChangedEventHandler eh = PropertyChanged;
+
+            if (eh != null)
+                eh(this, e);
+        }
+
+        /// <summary>
+        /// Raises the PropertyChanged event.
+        /// </summary>
+        /// <param name="s">Event arguments</param>
+        protected virtual void OnPropertyChangedEx(string s)
+        {
+            PropertyChangedEventHandler eh = PropertyChanged;
+
+            if (eh != null)
+            {
+                VisualPropertyChangedEventArgs e =
+                    new VisualPropertyChangedEventArgs(s);
+
+                eh(this, e);
+            }
+        }
+
+        #endregion
+
+        #region UpdateChangeHandler
+
+        private void UpdateChangeHandler(
+            INotifyPropertyChanged oldValue, INotifyPropertyChanged newValue)
+        {
+            if (oldValue != null)
+                oldValue.PropertyChanged -= StyleChanged;
+
+            if (newValue != null)
+                newValue.PropertyChanged += StyleChanged;
+        }
+
+        #endregion
+
+        #region StyleChanged
+
+        /// <summary>
+        /// StyleChanged
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected virtual void StyleChanged(
+            object sender, PropertyChangedEventArgs e)
+        {
+            OnPropertyChanged((VisualPropertyChangedEventArgs)e);
+        }
+
+        #endregion
+
+        #region IDisposable
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        public void Dispose()
+        {
+            BackColorBlend = null;
+        }
+ 
+        #endregion
+    }
+
+    #region enums
+
+    #region BackFillType
+
+    ///<summary>
+    /// BackFillType
+    ///</summary>
+    public enum BackFillType
+    {
+        /// <summary>
+        /// No fill
+        /// </summary>
+        None,
+
+        /// <summary>
+        /// Auto
+        /// </summary>
+        Auto,
+
+        ///<summary>
+        /// Angle
+        ///</summary>
+        Angle,
+
+        ///<summary>
+        /// Center
+        ///</summary>
+        Center,
+
+        ///<summary>
+        /// HorizontalCenter
+        ///</summary>
+        HorizontalCenter,
+
+        ///<summary>
+        /// VerticalCenter
+        ///</summary>
+        VerticalCenter,
+
+        ///<summary>
+        /// ForwardDiagonal
+        ///</summary>
+        ForwardDiagonal,
+
+        ///<summary>
+        /// BackwardDiagonal
+        ///</summary>
+        BackwardDiagonal,
+
+        ///<summary>
+        /// ForwardDiagonalCenter
+        ///</summary>
+        ForwardDiagonalCenter,
+
+        ///<summary>
+        /// BackwardDiagonalCenter
+        ///</summary>
+        BackwardDiagonalCenter,
+
+        ///<summary>
+        /// Radial
+        ///</summary>
+        Radial,
+    }
+
+    #endregion
+
+    #region HatchFillType
+
+    public enum HatchFillType
+    {
+        NotSet = -1,
+
+        /// <summary>
+        ///  A pattern of horizontal lines.
+        /// </summary>
+        Horizontal = HatchStyle.Horizontal,
+
+        /// <summary>
+        /// A pattern of vertical lines.
+        /// </summary>
+        Vertical = HatchStyle.Vertical,
+
+        /// <summary>
+        /// A pattern of lines on a diagonal from upper left to lower right..
+        /// </summary>
+        ForwardDiagonal = HatchStyle.ForwardDiagonal,
+
+        /// <summary>
+        /// A pattern of lines on a diagonal from upper right to lower left.
+        /// </summary>
+        BackwardDiagonal = HatchStyle.BackwardDiagonal,
+
+        /// <summary>
+        /// Specifies horizontal and vertical lines that cross.
+        /// </summary>
+        Cross = HatchStyle.Cross,
+
+        /// <summary>
+        /// A pattern of crisscross diagonal lines.
+        /// </summary>
+        DiagonalCross = HatchStyle.DiagonalCross,
+
+        /// <summary>
+        /// Specifies a 5-percent hatch. The ratio of foreground color to background
+        /// color is 5:100.
+        /// </summary>
+        Percent05 = HatchStyle.Percent05,
+
+        /// <summary>
+        /// Specifies a 10-percent hatch. The ratio of foreground color to background
+        /// color is 10:100.
+        /// </summary>
+        Percent10 = HatchStyle.Percent10,
+
+        /// <summary>
+        /// Specifies a 20-percent hatch. The ratio of foreground color to background
+        /// color is 20:100.
+        /// </summary>
+        Percent20 = HatchStyle.Percent20,
+
+        /// <summary>
+        /// Specifies a 25-percent hatch. The ratio of foreground color to background
+        /// color is 25:100.
+        /// </summary>
+        Percent25 = HatchStyle.Percent25,
+
+        /// <summary>
+        /// Specifies a 30-percent hatch. The ratio of foreground color to background
+        /// color is 30:100.
+        /// </summary>
+        Percent30 = HatchStyle.Percent30,
+
+        /// <summary>
+        /// Specifies a 40-percent hatch. The ratio of foreground color to background
+        /// color is 40:100.
+        /// /<summary>
+        Percent40 = HatchStyle.Percent40,
+
+        /// <summary>
+        /// Specifies a 50-percent hatch. The ratio of foreground color to background
+        /// color is 50:100.
+        /// </summary>
+        Percent50 = HatchStyle.Percent50,
+
+        /// <summary>
+        /// Specifies a 60-percent hatch. The ratio of foreground color to background
+        /// color is 60:100.
+        /// </summary>
+        Percent60 = HatchStyle.Percent60,
+
+        /// <summary>
+        /// Specifies a 70-percent hatch. The ratio of foreground color to background
+        /// color is 70:100.
+        /// /<summary>
+        Percent70 = HatchStyle.Percent70,
+
+        /// <summary>
+        /// Specifies a 75-percent hatch. The ratio of foreground color to background
+        /// color is 75:100.
+        /// </summary>
+        Percent75 = HatchStyle.Percent75,
+
+        /// <summary>
+        /// Specifies a 80-percent hatch. The ratio of foreground color to background
+        /// color is 80:100.
+        /// </summary>
+        Percent80 = HatchStyle.Percent80,
+
+        /// <summary>
+        /// Specifies a 90-percent hatch. The ratio of foreground color to background
+        /// color is 90:100.
+        /// </summary>
+        Percent90 = HatchStyle.Percent90,
+
+        /// <summary>
+        /// Specifies diagonal lines that slant to the right from top points to bottom
+        /// points and are spaced 50 percent closer together than System.Drawing.Drawing2D.HatchStyle.ForwardDiagonal,
+        /// but are not antialiased.
+        /// </summary>
+        LightDownwardDiagonal = HatchStyle.LightDownwardDiagonal,
+
+        /// <summary>
+        /// Specifies diagonal lines that slant to the left from top points to bottom
+        /// points and are spaced 50 percent closer together than System.Drawing.Drawing2D.HatchStyle.BackwardDiagonal,
+        /// but they are not antialiased.
+        /// </summary>
+        LightUpwardDiagonal = HatchStyle.LightUpwardDiagonal,
+
+        /// <summary>
+        /// Specifies diagonal lines that slant to the right from top points to bottom
+        /// points, are spaced 50 percent closer together than, and are twice the width
+        /// of System.Drawing.Drawing2D.HatchStyle.ForwardDiagonal. This hatch pattern
+        /// is not antialiased.
+        /// </summary>
+        DarkDownwardDiagonal = HatchStyle.DarkDownwardDiagonal,
+
+        /// <summary>
+        /// Specifies diagonal lines that slant to the left from top points to bottom
+        /// points, are spaced 50 percent closer together than System.Drawing.Drawing2D.HatchStyle.BackwardDiagonal,
+        /// and are twice its width, but the lines are not antialiased.
+        /// </summary>
+        DarkUpwardDiagonal = HatchStyle.DarkUpwardDiagonal,
+
+        /// <summary>
+        /// Specifies diagonal lines that slant to the right from top points to bottom
+        /// points, have the same spacing as hatch style System.Drawing.Drawing2D.HatchStyle.ForwardDiagonal,
+        /// and are triple its width, but are not antialiased.
+        /// </summary>
+        WideDownwardDiagonal = HatchStyle.WideDownwardDiagonal,
+
+        /// <summary>
+        /// Specifies diagonal lines that slant to the left from top points to bottom
+        /// points, have the same spacing as hatch style System.Drawing.Drawing2D.HatchStyle.BackwardDiagonal,
+        /// and are triple its width, but are not antialiased.
+        /// </summary>
+        WideUpwardDiagonal = HatchStyle.WideUpwardDiagonal,
+
+        /// <summary>
+        /// Specifies vertical lines that are spaced 50 percent closer together than
+        /// System.Drawing.Drawing2D.HatchStyle.Vertical.
+        /// </summary>
+        LightVertical = HatchStyle.LightVertical,
+
+        /// <summary>
+        /// Specifies horizontal lines that are spaced 50 percent closer together than
+        /// System.Drawing.Drawing2D.HatchStyle.Horizontal.
+        /// </summary>
+        LightHorizontal = HatchStyle.LightHorizontal,
+
+        /// <summary>
+        /// Specifies vertical lines that are spaced 75 percent closer together than
+        /// hatch style System.Drawing.Drawing2D.HatchStyle.Vertical (or 25 percent closer
+        /// together than System.Drawing.Drawing2D.HatchStyle.LightVertical).
+        /// </summary>
+        NarrowVertical = HatchStyle.NarrowVertical,
+
+        /// <summary>
+        /// Specifies horizontal lines that are spaced 75 percent closer together than
+        /// hatch style System.Drawing.Drawing2D.HatchStyle.Horizontal (or 25 percent
+        /// closer together than System.Drawing.Drawing2D.HatchStyle.LightHorizontal).
+        /// </summary>
+        NarrowHorizontal = HatchStyle.NarrowHorizontal,
+
+        /// <summary>
+        /// Specifies vertical lines that are spaced 50 percent closer together than
+        /// System.Drawing.Drawing2D.HatchStyle.Vertical and are twice its width.
+        /// </summary>
+        DarkVertical = HatchStyle.DarkVertical,
+
+        /// <summary>
+        /// Specifies horizontal lines that are spaced 50 percent closer together than
+        /// System.Drawing.Drawing2D.HatchStyle.Horizontal and are twice the width of
+        /// System.Drawing.Drawing2D.HatchStyle.Horizontal.
+        /// </summary>
+        DarkHorizontal = HatchStyle.DarkHorizontal,
+
+        /// <summary>
+        /// Specifies dashed diagonal lines, that slant to the right from top points
+        /// to bottom points.
+        /// </summary>
+        DashedDownwardDiagonal = HatchStyle.DashedDownwardDiagonal,
+
+        /// <summary>
+        /// Specifies dashed diagonal lines, that slant to the left from top points to
+        /// bottom points.
+        /// </summary>
+        DashedUpwardDiagonal = HatchStyle.DashedUpwardDiagonal,
+
+        /// <summary>
+        /// Specifies dashed horizontal lines.
+        /// </summary>
+        DashedHorizontal = HatchStyle.DashedHorizontal,
+
+        /// <summary>
+        /// Specifies dashed vertical lines.
+        /// </summary>
+        DashedVertical = HatchStyle.DashedVertical,
+
+        /// <summary>
+        /// Specifies a hatch that has the appearance of confetti.
+        /// </summary>
+        SmallConfetti = HatchStyle.SmallConfetti,
+
+        /// <summary>
+        /// Specifies a hatch that has the appearance of confetti, and is composed of
+        /// larger pieces than System.Drawing.Drawing2D.HatchStyle.SmallConfetti.
+        /// </summary>
+        LargeConfetti = HatchStyle.LargeConfetti,
+
+        /// <summary>
+        /// Specifies horizontal lines that are composed of zigzags.
+        /// </summary>
+        ZigZag = HatchStyle.ZigZag,
+
+        /// <summary>
+        /// Specifies horizontal lines that are composed of tildes.
+        /// </summary>
+        Wave = HatchStyle.Wave,
+
+        /// <summary>
+        /// Specifies a hatch that has the appearance of layered bricks that slant to
+        /// the left from top points to bottom points.
+        /// </summary>
+        DiagonalBrick = HatchStyle.DiagonalBrick,
+
+        /// <summary>
+        /// Specifies a hatch that has the appearance of horizontally layered bricks.
+        /// </summary>
+        HorizontalBrick = HatchStyle.HorizontalBrick,
+
+        /// <summary>
+        /// Specifies a hatch that has the appearance of a woven material.
+        /// </summary>
+        Weave = HatchStyle.Weave,
+
+        /// <summary>
+        /// Specifies a hatch that has the appearance of a plaid material.
+        /// </summary>
+        Plaid = HatchStyle.Plaid,
+
+        /// <summary>
+        /// Specifies a hatch that has the appearance of divots.
+        /// </summary>
+        Divot = HatchStyle.Divot,
+
+        /// <summary>
+        /// Specifies horizontal and vertical lines, each of which is composed of dots,
+        /// that cross.
+        /// </summary>
+        DottedGrid = HatchStyle.DottedGrid,
+
+        /// <summary>
+        /// Specifies forward diagonal and backward diagonal lines, each of which is
+        /// composed of dots, that cross.
+        /// </summary>
+        DottedDiamond = HatchStyle.DottedDiamond,
+
+        /// <summary>
+        /// Specifies a hatch that has the appearance of diagonally layered shingles
+        /// that slant to the right from top points to bottom points.
+        /// </summary>
+        Shingle = HatchStyle.Shingle,
+
+        /// <summary>
+        /// Specifies a hatch that has the appearance of a trellis.
+        /// </summary>
+        Trellis = HatchStyle.Trellis,
+
+        /// <summary>
+        /// Specifies a hatch that has the appearance of spheres laid adjacent to one
+        /// another.
+        /// </summary>
+        Sphere = HatchStyle.Sphere,
+
+        /// <summary>
+        /// Specifies horizontal and vertical lines that cross and are spaced 50 percent
+        /// closer together than hatch style System.Drawing.Drawing2D.HatchStyle.Cross.
+        /// </summary>
+        SmallGrid = HatchStyle.SmallGrid,
+
+        /// <summary>
+        /// Specifies a hatch that has the appearance of a checkerboard.
+        /// </summary>
+        SmallCheckerBoard = HatchStyle.SmallCheckerBoard,
+
+        /// <summary>
+        /// Specifies a hatch that has the appearance of a checkerboard with squares
+        /// that are twice the size of System.Drawing.Drawing2D.HatchStyle.SmallCheckerBoard.
+        /// </summary>
+        LargeCheckerBoard = HatchStyle.LargeCheckerBoard,
+
+        /// <summary>
+        /// Specifies forward diagonal and backward diagonal lines that cross but are
+        /// not antialiased.
+        /// </summary>
+        OutlinedDiamond = HatchStyle.OutlinedDiamond,
+
+        /// <summary>
+        /// Specifies a hatch that has the appearance of a checkerboard placed diagonally.
+        /// </summary>
+        SolidDiamond = HatchStyle.SolidDiamond,
+    }
+
+    #endregion
+
+    #endregion
+
+    #region BackgroundConvertor
+
+    ///<summary>
+    /// BackgroundConvertor
+    ///</summary>
+    public class BackgroundConvertor : ExpandableObjectConverter
+    {
+        /// <summary>
+        /// ConvertTo
+        /// </summary>
+        /// <param name="context"></param>
+        /// <param name="culture"></param>
+        /// <param name="value"></param>
+        /// <param name="destinationType"></param>
+        /// <returns></returns>
+        public override object ConvertTo(
+            ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+        {
+            if (destinationType == typeof(string))
+            {
+                Background gc = value as Background;
+
+                if (gc != null)
+                {
+                    if (gc.BackColorBlend != null && gc.BackColorBlend.IsEmpty == false)
+                        return ("Blended");
+
+                    ColorConverter cvt = new ColorConverter();
+
+                    string s = gc.Color1.IsEmpty ? " " : cvt.ConvertToString(gc.Color1);
+
+                    if (gc.Color2 != Color.Empty)
+                        s += ", " + cvt.ConvertToString(gc.Color2);
+
+                    return (s);
+                }
+            }
+
+            return (base.ConvertTo(context, culture, value, destinationType));
+        }
+    }
+
+    #endregion
+
+    #region BackgroundEditor
+
+    ///<summary>
+    /// BackgroundEditor
+    ///</summary>
+    public class BackgroundEditor : UITypeEditor
+    {
+        #region GetPaintValueSupported
+
+        /// <summary>
+        /// GetPaintValueSupported
+        /// </summary>
+        /// <param name="context"></param>
+        /// <returns></returns>
+        public override bool GetPaintValueSupported(ITypeDescriptorContext context)
+        {
+            return (true);
+        }
+
+        #endregion
+
+        #region PaintValue
+
+        /// <summary>
+        /// PaintValue
+        /// </summary>
+        /// <param name="e"></param>
+        public override void PaintValue(PaintValueEventArgs e)
+        {
+            Background b = e.Value as Background;
+
+            if (b != null)
+            {
+                using (Brush br = b.GetBrush(e.Bounds))
+                    e.Graphics.FillRectangle(br, e.Bounds);
+            }
+        }
+
+        #endregion
+    }
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/BaseVisualStyle.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/BaseVisualStyle.cs
new file mode 100644
index 00000000..4d7af36f
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/BaseVisualStyle.cs	
@@ -0,0 +1,622 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Globalization;
+
+namespace DevComponents.DotNetBar.Charts.Style
+{
+    /// <summary>
+    /// Represents the base visual style.
+    /// </summary>
+    [ToolboxItem(false), DesignTimeVisible(false)]
+    public class BaseVisualStyle : INotifyPropertyChanged, IDisposable, IProcessSerialElement
+    {
+        #region Static data
+
+        static private List<BaseVisualStyle> _StyleList;
+        private static StyleUpdateMode _StyleUpdateMode = StyleUpdateMode.Full;
+
+        #endregion
+
+        #region Private variables
+
+        private StyleType _StyleType;
+        private BaseVisualStyle _Parent;
+
+        private ushort _StyleUpdateCount;
+
+        private string _Class = "";
+        private object _Tag;
+
+        #endregion
+
+        #region Public properties
+
+        #region Class
+
+        /// <summary>
+        /// Gets or sets the class style belongs to. 
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public string Class
+        {
+            get { return (_Class); }
+
+            set
+            {
+                if (_Class != value)
+                {
+                    _Class = value;
+
+                    OnPropertyChangedEx("Class", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region IsEmpty
+
+        /// <summary>
+        /// Gets whether the style is logically Empty.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        [Description("Gets whether the style is logically Empty.")]
+        public virtual bool IsEmpty
+        {
+            get { return (_Tag == null); }
+        }
+
+        #endregion
+
+        #region Tag
+
+        /// <summary>
+        /// Gets or sets the user defined reference Tag.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        [Description("User defined reference Tag.")]
+        public object Tag
+        {
+            get { return (_Tag); }
+            set { _Tag = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region StyleType
+
+        internal StyleType StyleType
+        {
+            get { return (_StyleType); }
+            set { _StyleType = value; }
+        }
+
+        #endregion
+
+        #region StyleUpdateCount
+
+        internal ushort StyleUpdateCount
+        {
+            get { return (_StyleUpdateCount); }
+            set { _StyleUpdateCount = value; }
+        }
+
+        #endregion
+
+        #region StyleUpdateMode
+
+        internal StyleUpdateMode StyleUpdateMode
+        {
+            get { return (_StyleUpdateMode); }
+            set { _StyleUpdateMode = value; }
+        }
+
+        #endregion
+
+        #region Parent
+
+        internal BaseVisualStyle Parent
+        {
+            get { return (_Parent); }
+            set { _Parent = value; }
+        }
+
+        #endregion
+
+        #region StyleList
+
+        internal List<BaseVisualStyle> StyleList
+        {
+            get { return (_StyleList); }
+            set { _StyleList = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ApplyStyle
+
+        /// <summary>
+        /// Applies the style to instance of this style.
+        /// </summary>
+        /// <param name="style">Style to apply.</param>
+        public void ApplyStyle(BaseVisualStyle style)
+        {
+            if (StyleList != null)
+                StyleList.Add(style ?? this);
+        }
+
+        #endregion
+
+        #region GetApplyStyleTypes
+
+        internal StyleType[] GetApplyStyleTypes(StyleType e)
+        {
+            StyleType[] css = null;
+
+            switch (e)
+            {
+                case StyleType.Default:
+                    css = new StyleType[] { StyleType.Default};
+                    break;
+
+                case StyleType.MouseOver:
+                    css = new StyleType[] { StyleType.Default, e };
+                    break;
+
+                case StyleType.Selected:
+                    css = new StyleType[] { StyleType.Default, e };
+                    break;
+
+                case StyleType.SelectedMouseOver:
+                    css = new StyleType[] { StyleType.Default, StyleType.Selected, e };
+                    break;
+            }
+
+            return (css);
+        }
+
+        #endregion
+
+        #region Copy
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public BaseVisualStyle Copy()
+        {
+            BaseVisualStyle style = new BaseVisualStyle();
+
+            CopyTo(style);
+
+            return (style);
+        }
+
+        #endregion
+
+        #region CopyTo
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public void CopyTo(BaseVisualStyle copy)
+        {
+            copy.Class = _Class;
+            copy.Tag = _Tag;
+        }
+
+        #endregion
+
+        #region GetSerialData
+
+        internal virtual SerialElementCollection GetSerialData(string serialName)
+        {
+            if ((String.IsNullOrEmpty(Class) == false) || (Tag != null))
+            {
+                SerialElementCollection sec = new SerialElementCollection();
+
+                if (serialName != null)
+                {
+                    if (serialName.Equals("") == true)
+                        serialName = "BaseVisualStyle";
+
+                    sec.AddStartElement(serialName);
+                }
+
+                sec.AddValue("Class", Class, "");
+                sec.AddValue("Tag", Tag, null);
+
+                if (serialName != null)
+                    sec.AddEndElement(serialName);
+
+                return (sec);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region PutSerialData
+
+        #region ProcessValue
+
+        void IProcessSerialElement.ProcessValue(SerialElement se)
+        {
+            ProcessValue(se);
+        }
+
+        internal virtual void ProcessValue(SerialElement se)
+        {
+            switch (se.Name)
+            {
+                case "Name":
+                    Class = se.StringValue;
+                    break;
+
+                case "Tag":
+                    Tag = se.DataValue;
+                    break;
+
+                default:
+                    throw new Exception("Unknown Serial Value (" + se.Name + ")");
+            }
+        }
+
+        #endregion
+
+        #region ProcessCollection
+
+        void IProcessSerialElement.ProcessCollection(SerialElement se)
+        {
+            ProcessCollection(se);
+        }
+
+        internal virtual void ProcessCollection(SerialElement se)
+        {
+            throw new Exception("Unknown Serial Collection (" + se.Name + ")");
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ApplyDefaults
+
+        public virtual void ApplyDefaults()
+        {
+        }
+
+        #endregion
+
+        #region INotifyPropertyChanged Members
+
+        /// <summary>
+        /// Occurs when property value has changed.
+        /// </summary>
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        /// <summary>
+        /// Raises the PropertyChanged event.
+        /// </summary>
+        /// <param name="e">Event arguments</param>
+        protected virtual void OnPropertyChanged(PropertyChangedEventArgs e)
+        {
+            if ((StyleUpdateMode & StyleUpdateMode.UpdateCount) == StyleUpdateMode.UpdateCount)
+                StyleUpdateCount++;
+
+            if ((StyleUpdateMode & StyleUpdateMode.Notify) == StyleUpdateMode.Notify)
+            {
+                if (PropertyChanged != null)
+                    PropertyChanged(this, e);
+            }
+        }
+
+        /// <summary>
+        /// Default PropertyChanged processing
+        /// </summary>
+        /// <param name="s"></param>
+        protected void OnPropertyChanged(string s)
+        {
+            if ((StyleUpdateMode & StyleUpdateMode.UpdateCount) == StyleUpdateMode.UpdateCount)
+                StyleUpdateCount++;
+
+            if (PropertyChanged != null)
+                OnPropertyChanged(new VisualPropertyChangedEventArgs(s));
+        }
+
+        /// <summary>
+        /// Default PropertyChanged processing
+        /// </summary>
+        /// <param name="s"></param>
+        /// <param name="changeType">invalidate</param>
+        protected void OnPropertyChangedEx(string s, VisualChangeType changeType)
+        {
+            if ((StyleUpdateMode & StyleUpdateMode.UpdateCount) == StyleUpdateMode.UpdateCount)
+                StyleUpdateCount++;
+
+            if (PropertyChanged != null)
+                OnPropertyChanged(new VisualPropertyChangedEventArgs(s, changeType));
+        }
+
+        #endregion
+
+        #region UpdateChangeHandler
+
+        /// <summary>
+        /// UpdateChangeHandler
+        /// </summary>
+        /// <param name="oldValue"></param>
+        /// <param name="newValue"></param>
+        protected void UpdateChangeHandler(
+            INotifyPropertyChanged oldValue, INotifyPropertyChanged newValue)
+        {
+            if (oldValue != null)
+                oldValue.PropertyChanged -= ValuePropertyChanged;
+
+            if (newValue != null)
+                newValue.PropertyChanged += ValuePropertyChanged;
+        }
+
+        void ValuePropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            OnPropertyChanged(e);
+        }
+
+        #endregion
+
+        #region OnStyleChanged
+
+        protected void OnStyleChanged(string property,
+            INotifyPropertyChanged oldValue, INotifyPropertyChanged newValue)
+        {
+            UpdateChangeHandler(oldValue, newValue);
+
+            OnPropertyChanged(property);
+        }
+
+        #endregion
+
+        #region IDisposable
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        public virtual void Dispose()
+        {
+        }
+
+        #endregion
+    }
+
+    #region enums
+
+    #region StyleState
+
+    ///<summary>
+    /// StyleState
+    ///</summary>
+    [Flags]
+    public enum StyleState
+    {
+        ///<summary>
+        /// Default
+        ///</summary>
+        Default = 0,
+
+        ///<summary>
+        /// MouseOver
+        ///</summary>
+        MouseOver = (1 << 0),
+
+        ///<summary>
+        /// Selected
+        ///</summary>
+        Selected = (1 << 1),
+    }
+
+    #endregion
+
+    #region StyleType
+
+    ///<summary>
+    /// StyleType
+    ///</summary>
+    public enum StyleType
+    {
+        ///<summary>
+        /// CellStyle is Not Set
+        ///</summary>
+        NotSet = -1,
+
+        ///<summary>
+        /// Default
+        ///</summary>
+        Default = 0,
+
+        ///<summary>
+        /// MouseOver
+        ///</summary>
+        MouseOver,
+
+        ///<summary>
+        /// Selected
+        ///</summary>
+        Selected,
+
+        ///<summary>
+        /// SelectedMouseOver
+        ///</summary>
+        SelectedMouseOver,
+    }
+
+    #endregion
+
+    #region StyleUpdateMode
+
+    [Flags]
+    internal enum StyleUpdateMode
+    {
+        None = 0,
+
+        Notify = (1 << 0),
+        UpdateCount = (1 << 1),
+
+        Full = (UpdateCount | Notify),
+    }
+
+    #endregion
+
+    #region Tbool
+
+    ///<summary>
+    /// TBool - Three state boolean
+    ///</summary>
+    public enum Tbool
+    {
+        ///<summary>
+        /// NotSet
+        ///</summary>
+        NotSet,
+
+        ///<summary>
+        /// True
+        ///</summary>
+        True,
+
+        ///<summary>
+        /// False
+        ///</summary>
+        False
+    }
+
+    #endregion
+
+    #region VisualChangeType
+
+    /// <summary>
+    /// Defines visual property change type.
+    /// </summary>
+    public enum VisualChangeType
+    {
+        /// <summary>
+        /// Visual style has changed so Recalc is needed
+        /// </summary>
+        Recalc,
+
+        /// <summary>
+        /// Visual style has changed so layout is impacted, but not recalc
+        /// </summary>
+        Layout,
+
+        /// <summary>
+        /// Visual style has changed so visuals are impacted, but not layout
+        /// </summary>
+        Render
+    }
+
+    #endregion
+
+    #endregion
+
+    #region VisualPropertyChangedEventArgs
+
+    /// <summary>
+    /// Represents visual property changed event arguments.
+    /// </summary>
+    public class VisualPropertyChangedEventArgs : PropertyChangedEventArgs
+    {
+        #region Public data
+
+        /// <summary>
+        /// Gets the change type.
+        /// </summary>
+        public readonly VisualChangeType ChangeType;
+
+        #endregion
+
+        /// <summary>
+        /// Initializes a new instance of the VisualPropertyChangedEventArgs class.
+        /// </summary>
+        public VisualPropertyChangedEventArgs(string propertyName)
+            : base(propertyName)
+        {
+            ChangeType = VisualChangeType.Layout;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the VisualPropertyChangedEventArgs class.
+        /// </summary>
+        public VisualPropertyChangedEventArgs(string propertyName, VisualChangeType changeType)
+            : base(propertyName)
+        {
+            ChangeType = changeType;
+        }
+    }
+
+    #endregion
+
+    #region VisualStylesConverter
+
+    ///<summary>
+    /// VisualStylesConverter
+    ///</summary>
+    public class VisualStylesConverter : ExpandableObjectConverter
+    {
+        /// <summary>
+        /// ConvertTo
+        /// </summary>
+        /// <param name="context"></param>
+        /// <param name="culture"></param>
+        /// <param name="value"></param>
+        /// <param name="destinationType"></param>
+        /// <returns></returns>
+        public override object ConvertTo(
+            ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+        {
+            if (destinationType == typeof(string))
+                return (" ");
+
+            return (base.ConvertTo(context, culture, value, destinationType));
+        }
+    }
+
+    #endregion
+
+    #region DefaultStyleConvertor
+
+    public class DefaultStyleConvertor : ExpandableObjectConverter
+    {
+        public override object ConvertTo(
+            ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+        {
+            if (destinationType == typeof(string))
+            {
+                BaseVisualStyle bvs = value as BaseVisualStyle;
+
+                if (bvs != null)
+                {
+                    ColorConverter cvt = new ColorConverter();
+
+                    return ((bvs.IsEmpty == true) ? " " : "(Set)");
+                }
+            }
+
+            return (base.ConvertTo(context, culture, value, destinationType));
+        }
+    }
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/BorderColor.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/BorderColor.cs
new file mode 100644
index 00000000..fe4d7618
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/BorderColor.cs	
@@ -0,0 +1,670 @@
+using System;
+using System.Drawing;
+using System.ComponentModel;
+using System.Globalization;
+using System.Drawing.Design;
+using System.Collections;
+
+namespace DevComponents.DotNetBar.Charts.Style
+{
+    /// <summary>
+    /// Represents style border color.
+    /// </summary>
+    [TypeConverter(typeof(BorderColorConverter))]
+    public class BorderColor : IProcessSerialElement, INotifyPropertyChanged
+    {
+        #region Static data
+
+        ///<summary>
+        /// Empty
+        ///</summary>
+        /// <summary>
+        /// Returns Empty instance of BorderColor.
+        /// </summary>
+        public static BorderColor Empty
+        {
+            get { return (new BorderColor()); }
+        }
+
+        #endregion
+
+        #region Private variables
+
+        private Color _Top = Color.Empty;
+        private Color _Left = Color.Empty;
+        private Color _Bottom = Color.Empty;
+        private Color _Right = Color.Empty;
+
+        #endregion
+
+        #region Constructors
+
+        /// <summary>
+        /// Initializes a new instance of the BorderColor object.
+        /// </summary>
+        /// <param name="left"></param>
+        /// <param name="top"></param>
+        /// <param name="right"></param>
+        /// <param name="bottom"></param>
+        public BorderColor(Color left, Color top, Color right, Color bottom)
+        {
+            _Top = top;
+            _Bottom = bottom;
+            _Left = left;
+            _Right = right;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the BorderColor object.
+        /// </summary>
+        public BorderColor(Color all)
+            : this(all, all, all, all)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the BorderColor object.
+        /// </summary>
+        public BorderColor()
+        {
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region All
+
+        /// <summary>
+        /// Gets or sets the color of all borders.
+        /// </summary>
+        //[Browsable(false)]
+        //[EditorBrowsable(EditorBrowsableState.Never)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public Color All
+        {
+            set { _Top = _Left = _Bottom = _Right = value; }
+        }
+
+        #endregion
+
+        #region Bottom
+
+        /// <summary>
+        /// Gets or sets the color of the bottom border
+        /// </summary>
+        [Category("Appearance")]
+        [Description("Indicates the color of the bottom border")]
+        public Color Bottom
+        {
+            get { return (_Bottom); }
+
+            set
+            {
+                if (_Bottom != value)
+                {
+                    _Bottom = value;
+
+                    OnVisualPropertyChanged("Bottom");
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeBottom()
+        {
+            return (_Bottom.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetBottom()
+        {
+            Bottom = Color.Empty;
+        }
+
+        #endregion
+
+        #region Left
+
+        /// <summary>
+        /// Gets or sets the color of the left border
+        /// </summary>
+        [Category("Appearance")]
+        [Description("Indicates the color of the left border")]
+        public Color Left
+        {
+            get { return (_Left); }
+
+            set
+            {
+                if (_Left != value)
+                {
+                    _Left = value;
+
+                    OnVisualPropertyChanged("Left");
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeLeft()
+        {
+            return (_Left.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetLeft()
+        {
+            Left = Color.Empty;
+        }
+
+        #endregion
+
+        #region Right
+
+        /// <summary>
+        /// Gets or sets the color of the right border
+        /// </summary>
+        [Category("Appearance")]
+        [Description("Indicates the color of the right border")]
+        public Color Right
+        {
+            get { return (_Right); }
+
+            set
+            {
+                if (_Right != value)
+                {
+                    _Right = value;
+
+                    OnVisualPropertyChanged("Right");
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeRight()
+        {
+            return (_Right.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetRight()
+        {
+            Right = Color.Empty;
+        }
+
+        #endregion
+
+        #region Top
+
+        /// <summary>
+        /// Gets or sets the color of the top border
+        /// </summary>
+        [Category("Appearance")]
+        [Description("Indicates the color of the top border")]
+        public Color Top
+        {
+            get { return (_Top); }
+
+            set
+            {
+                if (_Top != value)
+                {
+                    _Top = value;
+
+                    OnVisualPropertyChanged("Top");
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeTop()
+        {
+            return (_Top.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetTop()
+        {
+            Top = Color.Empty;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region IsEmpty
+
+        internal bool IsEmpty
+        {
+            get
+            {
+                return (_Left.IsEmpty && _Top.IsEmpty &&
+                        _Right.IsEmpty && _Bottom.IsEmpty);
+            }
+        }
+
+        #endregion
+
+        #region IsUniform
+
+        internal bool IsUniform
+        {
+            get
+            {
+                return (_Left == _Top &&
+                        _Left == _Right && _Left == _Bottom);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Operators
+
+        #region '==' operator
+
+        /// <summary>
+        /// Compares two instances.
+        /// </summary>
+        /// <param name="t1">Instance 1</param>
+        /// <param name="t2">Instance 2</param>
+        /// <returns>true if same</returns>
+        public static bool operator ==(BorderColor t1, BorderColor t2)
+        {
+            // If both are null, or both are same instance, return true.
+
+            if (ReferenceEquals(t1, t2))
+                return (true);
+
+            // If one is null, but not both, return false.
+
+            if (((object)t1 == null) || ((object)t2 == null))
+                return (false);
+
+            return (t1._Left == t2._Left && t1._Right == t2._Right &&
+                    t1._Top == t2._Top && t1._Bottom == t2._Bottom);
+        }
+
+        #endregion
+
+        #region "!=" operator
+
+        /// <summary>
+        /// Compares two instances.
+        /// </summary>
+        /// <param name="t1">Instance 1</param>
+        /// <param name="t2">Instance 2</param>
+        /// <returns>true if different.</returns>
+        public static bool operator !=(BorderColor t1, BorderColor t2)
+        {
+            return ((t1 == t2) == false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetHashCode
+
+        /// <summary>
+        /// Returns hash-code for object.
+        /// </summary>
+        /// <returns>Hash-code value.</returns>
+        public override int GetHashCode()
+        {
+            return (((_Left.GetHashCode() ^ _Top.GetHashCode()) ^
+                     _Right.GetHashCode()) ^ _Bottom.GetHashCode());
+        }
+
+        #endregion
+
+        #region Equals
+
+        /// <summary>
+        /// Compares object to this instance.
+        /// </summary>
+        /// <param name="obj">Object to compare.</param>
+        /// <returns>true if same.</returns>
+        public override bool Equals(object obj)
+        {
+            if (obj is BorderColor)
+                return ((BorderColor) obj == this);
+
+            return (false);
+        }
+
+        /// <summary>
+        /// Compares object to this instance.
+        /// </summary>
+        /// <param name="borderColor">Border color</param>
+        /// <returns>true if same</returns>
+        public bool Equals(BorderColor borderColor)
+        {
+            return (this == borderColor);
+        }
+
+        #endregion
+
+        #region Copy
+
+        /// <summary>
+        /// Creates an exact copy of the BorderColor.
+        /// </summary>
+        /// <returns>Copy of the BorderColor.</returns>
+        public BorderColor Copy()
+        {
+            BorderColor copy = new BorderColor(_Left, _Top, _Right, _Bottom);
+
+            return (copy);
+        }
+
+        #endregion
+
+        #region GetSerialData
+
+        internal SerialElementCollection GetSerialData(string serialName)
+        {
+            SerialElementCollection sec = new SerialElementCollection();
+
+            if (serialName != null)
+            {
+                if (serialName.Equals("") == true)
+                    serialName = "BorderColor";
+
+                sec.AddStartElement(serialName);
+            }
+
+            if (IsUniform == true)
+            {
+                sec.AddValue("All", Left, Color.Empty);
+            }
+            else
+            {
+                sec.AddValue("Left", Left, Color.Empty);
+                sec.AddValue("Top", Top, Color.Empty);
+                sec.AddValue("Right", Right, Color.Empty);
+                sec.AddValue("Bottom", Bottom, Color.Empty);
+            }
+
+            if (serialName != null)
+                sec.AddEndElement(serialName);
+
+            return (sec);
+        }
+
+        #endregion
+
+        #region PutSerialData
+
+        #region ProcessValue
+
+        void IProcessSerialElement.ProcessValue(SerialElement se)
+        {
+            switch (se.Name)
+            {
+                case "All":
+                    All = (Color)se.ColorValue;
+                    break;
+
+                case "Left":
+                    Left = (Color)se.ColorValue;
+                    break;
+
+                case "Top":
+                    Top = (Color)se.ColorValue;
+                    break;
+
+                case "Right":
+                    Right = (Color)se.ColorValue;
+                    break;
+
+                case "Bottom":
+                    Bottom = (Color)se.ColorValue;
+                    break;
+
+                default:
+                    throw new Exception("Unknown Serial Value (" + se.Name + ")");
+            }
+        }
+
+        #endregion
+
+        #region ProcessCollection
+
+        void IProcessSerialElement.ProcessCollection(SerialElement se)
+        {
+            throw new Exception("Unknown Serial Collection (" + se.Name + ")");
+        }
+
+        #endregion
+
+        #endregion
+
+        #region INotifyPropertyChanged Members
+
+        /// <summary>
+        /// Occurs when property value has changed.
+        /// </summary>
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        /// <summary>
+        /// Raises the PropertyChanged event.
+        /// </summary>
+        /// <param name="e">Event arguments</param>
+        protected virtual void OnPropertyChanged(PropertyChangedEventArgs e)
+        {
+            PropertyChangedEventHandler eh = PropertyChanged;
+
+            if (eh != null)
+                eh(this, e);
+        }
+
+        /// <summary>
+        /// Default PropertyChanged processing
+        /// </summary>
+        /// <param name="s"></param>
+        protected void OnPropertyChanged(string s)
+        {
+            if (PropertyChanged != null)
+                OnPropertyChanged(new PropertyChangedEventArgs(s));
+        }
+
+
+        /// <summary>
+        /// Default PropertyChanged processing
+        /// </summary>
+        /// <param name="s"></param>
+        protected void OnVisualPropertyChanged(string s)
+        {
+            if (PropertyChanged != null)
+                OnPropertyChanged(new VisualPropertyChangedEventArgs(s));
+        }
+
+        #endregion
+    }
+
+    #region BorderColorConverter
+
+    ///<summary>
+    /// BorderColorConverter
+    ///</summary>
+    public class BorderColorConverter : ExpandableObjectConverter
+    {
+        #region CanConvertTo
+
+        /// <summary>
+        /// CanConvertTo
+        /// </summary>
+        /// <param name="context"></param>
+        /// <param name="destinationType"></param>
+        /// <returns></returns>
+        public override bool CanConvertTo(
+            ITypeDescriptorContext context, Type destinationType)
+        {
+            if (destinationType == typeof(string))
+                return (true);
+
+            return (base.CanConvertTo(context, destinationType));
+        }
+
+        #endregion
+
+        #region ConvertTo
+
+        /// <summary>
+        /// ConvertTo
+        /// </summary>
+        /// <param name="context"></param>
+        /// <param name="culture"></param>
+        /// <param name="value"></param>
+        /// <param name="destinationType"></param>
+        /// <returns></returns>
+        public override object ConvertTo(
+            ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+        {
+            if (destinationType == typeof(string))
+            {
+                BorderColor bc = value as BorderColor;
+
+                if (bc != null)
+                {
+                    if (bc.IsUniform == true)
+                        return (bc.Left.ToString());
+
+                    return (String.Format("{0}, {1}, {2}, {3}",
+                        bc.Bottom, bc.Left, bc.Right, bc.Top));
+                }
+            }
+
+            return (base.ConvertTo(context, culture, value, destinationType));
+        }
+
+        #endregion
+
+        #region CanConvertFrom
+
+        /// <summary>
+        /// CanConvertFrom
+        /// </summary>
+        /// <param name="context"></param>
+        /// <param name="sourceType"></param>
+        /// <returns></returns>
+        public override bool CanConvertFrom(
+            ITypeDescriptorContext context, Type sourceType)
+        {
+            if (sourceType == typeof(string))
+                return (true);
+
+            return (base.CanConvertFrom(context, sourceType));
+        }
+
+        #endregion
+
+        #region ConvertFrom
+
+        /// <summary>
+        /// ConvertFrom
+        /// </summary>
+        /// <param name="context"></param>
+        /// <param name="culture"></param>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public override object ConvertFrom(
+            ITypeDescriptorContext context, CultureInfo culture, object value)
+        {
+            if (value is string)
+            {
+                string[] values = ((string)value).Split(',');
+
+                if (values.Length != 1 && values.Length != 4)
+                    throw new ArgumentException("Invalid value to convert.");
+
+                ColorConverter cvt = new ColorConverter();
+
+                try
+                {
+                    Color[] c = new Color[values.Length];
+
+                    for (int i = 0; i < values.Length; i++)
+                        c[i] = (Color)cvt.ConvertFrom(values[i]);
+
+                    BorderColor bc = (values.Length == 1)
+                        ? new BorderColor(c[0])
+                        : new BorderColor(c[1], c[3], c[2], c[0]);
+
+                    return (bc);
+                }
+                catch (Exception)
+                {
+                    throw new ArgumentException("Invalid value to convert.");
+                }
+            }
+
+            return base.ConvertFrom(context, culture, value);
+        }
+
+        #endregion
+
+        #region GetCreateInstanceSupported
+
+        /// <summary>
+        /// GetCreateInstanceSupported
+        /// </summary>
+        /// <param name="context"></param>
+        /// <returns></returns>
+        public override bool GetCreateInstanceSupported(ITypeDescriptorContext context)
+        {
+            return (true);
+        }
+
+        #endregion
+
+        #region CreateInstance
+
+        /// <summary>
+        /// CreateInstance
+        /// </summary>
+        /// <param name="context"></param>
+        /// <param name="propertyValues"></param>
+        /// <returns></returns>
+        public override object CreateInstance(
+            ITypeDescriptorContext context, IDictionary propertyValues)
+        {
+            return (new BorderColor((Color)propertyValues["Left"], (Color)propertyValues["Top"],
+                (Color)propertyValues["Right"], (Color)propertyValues["Bottom"]));
+        }
+
+        #endregion
+    }
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/BorderPattern.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/BorderPattern.cs
new file mode 100644
index 00000000..f26cfbb5
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/BorderPattern.cs	
@@ -0,0 +1,524 @@
+using System;
+using System.ComponentModel;
+using System.Drawing.Drawing2D;
+using DevComponents.DotNetBar.Charts.Primitives;
+
+namespace DevComponents.DotNetBar.Charts.Style
+{
+    /// <summary>
+    /// Defines Thickness class.
+    /// </summary>
+    [TypeConverter(typeof(BlankExpandableObjectConverter))]
+    public class BorderPattern : IEquatable<BorderPattern>, IProcessSerialElement, INotifyPropertyChanged
+    {
+        #region Static data
+
+        /// <summary>
+        /// Returns Empty instance of BorderPattern.
+        /// </summary>
+        public static BorderPattern Empty
+        {
+            get { return (new BorderPattern()); }
+        }
+
+        #endregion
+
+        #region Private variables
+
+        private LinePattern _Bottom = LinePattern.NotSet;
+        private LinePattern _Left = LinePattern.NotSet;
+        private LinePattern _Right = LinePattern.NotSet;
+        private LinePattern _Top = LinePattern.NotSet;
+
+        #endregion
+
+        #region Constructors
+
+        /// <summary>
+        /// Creates new instance of the object.
+        /// </summary>
+        /// <param name="left">Left BorderPatternStyle.</param>
+        /// <param name="top">Top BorderPatternStyle.</param>
+        /// <param name="right">Right BorderPatternStyle.</param>
+        /// <param name="bottom">Bottom BorderPatternStyle.</param>
+        public BorderPattern(LinePattern left,
+            LinePattern top, LinePattern right, LinePattern bottom)
+        {
+            _Left = left;
+            _Top = top;
+            _Right = right;
+            _Bottom = bottom;
+
+            PropertyChanged = null;
+        }
+
+        /// <summary>
+        /// Creates new instance of the object.
+        /// </summary>
+        /// <param name="all">Specifies uniform Thickness.</param>
+        public BorderPattern(LinePattern all)
+            : this(all, all, all, all)
+        {
+        }
+
+        ///<summary>
+        /// Creates new instance of the object.
+        ///</summary>
+        public BorderPattern()
+        {
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region All
+
+        /// <summary>
+        /// Gets or sets the thickness of all sides.
+        /// </summary>
+        //[Browsable(false)]
+        //[EditorBrowsable(EditorBrowsableState.Never)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public LinePattern All
+        {
+            set { _Top = _Left = _Bottom = _Right = value; }
+        }
+
+        #endregion
+
+        #region Bottom
+
+        /// <summary>
+        /// Gets or sets the bottom Border Pattern
+        /// </summary>
+        [DefaultValue(LinePattern.NotSet)]
+        [Description("Indicates the bottom Border Pattern")]
+        public LinePattern Bottom
+        {
+            get { return (_Bottom); }
+
+            set
+            {
+                if (_Bottom != value)
+                {
+                    _Bottom = value;
+
+                    OnPropertyChanged(new VisualPropertyChangedEventArgs("Bottom"));
+                }
+            }
+        }
+
+        #endregion
+
+        #region Left
+
+        /// <summary>
+        /// Gets or sets the left Border Pattern
+        /// </summary>
+        [DefaultValue(LinePattern.NotSet)]
+        [Description("Indicates the left Border Pattern")]
+        public LinePattern Left
+        {
+            get { return (_Left); }
+
+            set
+            {
+                if (_Left != value)
+                {
+                    _Left = value;
+
+                    OnPropertyChanged(new VisualPropertyChangedEventArgs("Left"));
+                }
+            }
+        }
+
+        #endregion
+
+        #region Right
+
+        /// <summary>
+        /// Gets or sets the Right Border Pattern
+        /// </summary>
+        [DefaultValue(LinePattern.NotSet)]
+        [Description("Indicates the Right Border Pattern")]
+        public LinePattern Right
+        {
+            get { return (_Right); }
+
+            set
+            {
+                if (_Right != value)
+                {
+                    _Right = value;
+
+                    OnPropertyChanged(new VisualPropertyChangedEventArgs("Right"));
+                }
+            }
+        }
+
+        #endregion
+
+        #region Top
+
+        /// <summary>
+        /// Gets or sets the Top Border Pattern
+        /// </summary>
+        [Browsable(true), DefaultValue(LinePattern.NotSet)]
+        [Description("Indicates the Top Border Pattern")]
+        public LinePattern Top
+        {
+            get { return (_Top); }
+
+            set
+            {
+                if (_Top != value)
+                {
+                    _Top = value;
+
+                    OnPropertyChanged(new VisualPropertyChangedEventArgs("Top"));
+                }
+            }
+        }
+
+        #endregion
+
+        #region IsEmpty
+
+        /// <summary>
+        /// Gets whether the item is empty
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsEmpty
+        {
+            get
+            {
+                return (_Left == LinePattern.NotSet &&
+                        _Right == LinePattern.NotSet &&
+                        _Top == LinePattern.NotSet &&
+                        _Bottom == LinePattern.NotSet);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region IsUniform
+
+        internal bool IsUniform
+        {
+            get
+            {
+                return (_Left == _Top &&
+                        _Left == _Right && _Left == _Bottom);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Equals
+
+        /// <summary>
+        /// Gets whether two instances are equal.
+        /// </summary>
+        /// <param name="obj">Instance to compare to.</param>
+        /// <returns>true if equal otherwise false.</returns>
+        public override bool Equals(object obj)
+        {
+            if (obj is BorderPattern)
+                return (this == (BorderPattern)obj);
+
+            return (false);
+        }
+
+        /// <summary>
+        /// Gets whether two instances are equal.
+        /// </summary>
+        /// <param name="borderPattern">Instance to compare to</param>
+        /// <returns>true if equal otherwise false</returns>
+        public bool Equals(BorderPattern borderPattern)
+        {
+            return (this == borderPattern);
+        }
+
+        #endregion
+
+        #region GetHashCode
+
+        /// <summary>
+        /// Returns hash-code.
+        /// </summary>
+        /// <returns>hash-code</returns>
+        public override int GetHashCode()
+        {
+            return (((_Left.GetHashCode() ^ _Top.GetHashCode()) ^
+                     _Right.GetHashCode()) ^ _Bottom.GetHashCode());
+        }
+
+        #endregion
+
+        #region Operators
+
+        #region "==" operator
+
+        /// <summary>
+        /// Implements == operator.
+        /// </summary>
+        /// <param name="t1">Object 1</param>
+        /// <param name="t2">Object 2</param>
+        /// <returns>true if equals</returns>
+        public static bool operator ==(BorderPattern t1, BorderPattern t2)
+        {
+            if (ReferenceEquals(t1, t2))
+                return (true);
+
+            if (((object)t1 == null) || ((object)t2 == null))
+                return (false);
+
+            return (t1._Left == t2._Left && t1._Right == t2._Right &&
+                    t1._Top == t2._Top && t1._Bottom == t2._Bottom);
+        }
+
+        #endregion
+
+        #region "!=" operator
+
+        /// <summary>
+        /// Implements != operator
+        /// </summary>
+        /// <param name="t1">Object 1</param>
+        /// <param name="t2">Object 2</param>
+        /// <returns>true if different</returns>
+        public static bool operator !=(BorderPattern t1, BorderPattern t2)
+        {
+            return ((t1 == t2) == false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ApplyPattern
+
+        /// <summary>
+        /// Applies the pattern to instance of this pattern.
+        /// </summary>
+        /// <param name="pattern">Pattern to apply.</param>
+        public void ApplyPattern(BorderPattern pattern)
+        {
+            if (pattern != null)
+            {
+                if (pattern.Top != LinePattern.NotSet)
+                    _Top = pattern.Top;
+
+                if (pattern.Left != LinePattern.NotSet)
+                    _Left = pattern.Left;
+
+                if (pattern.Bottom != LinePattern.NotSet)
+                    _Bottom = pattern.Bottom;
+
+                if (pattern.Right != LinePattern.NotSet)
+                    _Right = pattern.Right;
+            }
+        }
+
+        #endregion
+
+        #region Copy
+
+        /// <summary>
+        /// Creates an exact copy of the BorderPattern.
+        /// </summary>
+        /// <returns>Copy of the BorderPattern.</returns>
+        public BorderPattern Copy()
+        {
+            BorderPattern copy = new BorderPattern(_Left, _Top, _Right, _Bottom);
+
+            return (copy);
+        }
+
+        #endregion
+
+        #region GetSerialData
+
+        internal SerialElementCollection GetSerialData(string serialName)
+        {
+            SerialElementCollection sec = new SerialElementCollection();
+
+            if (serialName != null)
+            {
+                if (serialName.Equals("") == true)
+                    serialName = "BorderPattern";
+
+                sec.AddStartElement(serialName);
+            }
+
+            if (IsUniform == true)
+            {
+                sec.AddValue("All", Left, LinePattern.NotSet);
+            }
+            else
+            {
+                sec.AddValue("Left", Left, LinePattern.NotSet);
+                sec.AddValue("Top", Top, LinePattern.NotSet);
+                sec.AddValue("Right", Right, LinePattern.NotSet);
+                sec.AddValue("Bottom", Bottom, LinePattern.NotSet);
+            }
+
+            if (serialName != null)
+                sec.AddEndElement(serialName);
+
+            return (sec);
+        }
+
+        #endregion
+
+        #region PutSerialData
+
+        #region ProcessValue
+
+        void IProcessSerialElement.ProcessValue(SerialElement se)
+        {
+            switch (se.Name)
+            {
+                case "All":
+                    All = (LinePattern)se.GetValueEnum(typeof(LinePattern));
+                    break;
+
+                case "Left":
+                    Left = (LinePattern)se.GetValueEnum(typeof(LinePattern));
+                    break;
+
+                case "Top":
+                    Top = (LinePattern)se.GetValueEnum(typeof(LinePattern));
+                    break;
+
+                case "Right":
+                    Right = (LinePattern)se.GetValueEnum(typeof(LinePattern));
+                    break;
+
+                case "Bottom":
+                    Bottom = (LinePattern)se.GetValueEnum(typeof(LinePattern));
+                    break;
+
+                default:
+                    throw new Exception("Unknown Serial Value (" + se.Name + ")");
+            }
+        }
+
+        #endregion
+
+        #region ProcessCollection
+
+        void IProcessSerialElement.ProcessCollection(SerialElement se)
+        {
+            throw new Exception("Unknown Serial Collection (" + se.Name + ")");
+        }
+
+        #endregion
+
+        #endregion
+
+        #region INotifyPropertyChanged Members
+
+        /// <summary>
+        /// Occurs when property value has changed.
+        /// </summary>
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        /// <summary>
+        /// Raises the PropertyChanged event.
+        /// </summary>
+        /// <param name="e">Event arguments</param>
+        void OnPropertyChanged(VisualPropertyChangedEventArgs e)
+        {
+            PropertyChangedEventHandler eh = PropertyChanged;
+
+            if (eh != null)
+                eh(this, e);
+        }
+
+        #endregion
+    }
+
+    #region enums
+
+    #region LinePattern
+
+    ///<summary>
+    /// LinePattern
+    ///</summary>
+    public enum LinePattern
+    {
+        ///<summary>
+        /// None
+        ///</summary>
+        None = -2,
+
+        ///<summary>
+        /// NotSet
+        ///</summary>
+        NotSet = -1,
+
+        ///<summary>
+        /// Solid
+        ///</summary>
+        Solid = DashStyle.Solid,
+
+        ///<summary>
+        /// Dash
+        ///</summary>
+        Dash = DashStyle.Dash,
+
+        ///<summary>
+        /// Dot
+        ///</summary>
+        Dot = DashStyle.Dot,
+
+        ///<summary>
+        /// DashDot
+        ///</summary>
+        DashDot = DashStyle.DashDot,
+
+        ///<summary>
+        /// DashDotDot
+        ///</summary>
+        DashDotDot = DashStyle.DashDotDot,
+    }
+
+    #endregion
+
+    #region ChartLineCap
+
+    ///<summary>
+    /// ChartLineCap
+    ///</summary>
+    public enum ChartLineCap
+    {
+        ///<summary>
+        /// NotSet
+        ///</summary>
+        NotSet = -1,
+
+        Flat = 0,
+        Square = 1,
+        Round = 2,
+        Triangle = 3,
+        NoAnchor = 16,
+        SquareAnchor = 17,
+        RoundAnchor = 18,
+        DiamondAnchor = 19,
+        ArrowAnchor = 20,
+    }
+
+    #endregion
+
+    #endregion
+
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/ChartAxisVisualStyle.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/ChartAxisVisualStyle.cs
new file mode 100644
index 00000000..63b53088
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/ChartAxisVisualStyle.cs	
@@ -0,0 +1,325 @@
+using System.ComponentModel;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Charts.Style
+{
+    ///<summary>
+    /// ChartAxisVisualStyles
+    ///</summary>
+    [TypeConverter(typeof(VisualStylesConverter))]
+    public class ChartAxisVisualStyles : VisualStyles<ChartAxisVisualStyle>
+    {
+        #region Copy
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public ChartAxisVisualStyles Copy()
+        {
+            ChartAxisVisualStyles styles = new ChartAxisVisualStyles();
+
+            for (int i = 0; i < Styles.Length; i++)
+            {
+                ChartAxisVisualStyle vstyle = Styles[i];
+
+                if (vstyle != null)
+                    styles.Styles[i] = vstyle.Copy();
+            }
+
+            return (styles);
+        }
+
+        #endregion
+    }
+
+    /// <summary>
+    /// Represents the visual style of a ChartAxis element.
+    /// </summary>
+    [TypeConverter(typeof(VisualStylesConverter))]
+    public class ChartAxisVisualStyle : BaseVisualStyle
+    {
+        #region Private variables
+
+        private Color _AxisColor = Color.Empty;
+        private Background _AlternateBackground;
+
+        #endregion
+
+        #region Public properties
+
+        #region AlternateBackground
+
+        /// <summary>
+        /// Gets or sets the alternate, or interlaced, background.
+        /// </summary>
+        [Description("Indicates the alternate, or interlaced, background")]
+        public Background AlternateBackground
+        {
+            get
+            {
+                if (_AlternateBackground == null)
+                {
+                    _AlternateBackground = Background.Empty;
+
+                    UpdateChangeHandler(null, _AlternateBackground);
+                }
+
+                return (_AlternateBackground);
+            }
+
+            set
+            {
+                if (_AlternateBackground != value)
+                {
+                    UpdateChangeHandler(_AlternateBackground, value);
+
+                    _AlternateBackground = value;
+
+                    OnPropertyChangedEx("AlternateBackground", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeAlternateBackground()
+        {
+            return (_AlternateBackground != null && _AlternateBackground.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetAlternateBackground()
+        {
+            AlternateBackground = null;
+        }
+
+        #endregion
+
+        #region AxisColor
+
+        ///<summary>
+        /// Gets or sets the Axis line Color.
+        ///</summary>
+        [Category("Appearance")]
+        [Description("Indicates the Axis line Color.")]
+        public Color AxisColor
+        {
+            get { return (_AxisColor); }
+
+            set
+            {
+                if (value != _AxisColor)
+                {
+                    _AxisColor = value;
+
+                    OnPropertyChangedEx("AxisColor", Style.VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeAxisColor()
+        {
+            return (_AxisColor.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetAxisColor()
+        {
+            _AxisColor = Color.Empty;
+        }
+
+        #endregion
+
+        #region IsEmpty
+
+        /// <summary>
+        /// Gets whether the style is logically Empty.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        [Description("Gets whether the style is logically Empty.")]
+        public override bool IsEmpty
+        {
+            get
+            {
+                return ((_AlternateBackground == null || _AlternateBackground.IsEmpty) &&
+                    (_AxisColor.IsEmpty == true) &&
+                    (base.IsEmpty == true));
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ApplyStyle
+
+        /// <summary>
+        /// Applies the style to instance of this style.
+        /// </summary>
+        /// <param name="style">Style to apply.</param>
+        public void ApplyStyle(ChartAxisVisualStyle style)
+        {
+            if (style != null)
+            {
+                base.ApplyStyle(style);
+
+                if (style._AlternateBackground != null && style.AlternateBackground.IsEmpty == false)
+                    AlternateBackground = style.AlternateBackground.Copy();
+
+                if (style.AxisColor.IsEmpty == false)
+                    AxisColor = style.AxisColor;
+            }
+        }
+
+        #endregion
+
+        #region ApplyDefaults
+
+        public override void ApplyDefaults()
+        {
+            if (AxisColor.IsEmpty == true)
+                AxisColor = Color.Black;
+
+            if (AlternateBackground.IsEmpty == true)
+                AlternateBackground = new Background(Color.Ivory);
+
+            base.ApplyDefaults();
+        }
+
+        #endregion
+
+        #region Copy
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public new ChartAxisVisualStyle Copy()
+        {
+            ChartAxisVisualStyle style = new ChartAxisVisualStyle();
+
+            CopyTo(style);
+
+            return (style);
+        }
+
+        #endregion
+
+        #region CopyTo
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public void CopyTo(ChartAxisVisualStyle style)
+        {
+            base.CopyTo(style);
+
+            style.AlternateBackground = 
+                (_AlternateBackground != null) ? _AlternateBackground.Copy() : null;
+
+            style.AxisColor = _AxisColor;
+        }
+
+        #endregion
+
+        #region GetSerialData
+
+        internal override SerialElementCollection GetSerialData(string serialName)
+        {
+            SerialElementCollection sec = new SerialElementCollection();
+
+            if (serialName != null)
+            {
+                if (serialName.Equals("") == true)
+                    serialName = "ChartAxisVisualStyle";
+
+                sec.AddStartElement(serialName);
+            }
+
+            if (_AlternateBackground != null && _AlternateBackground.IsEmpty == false)
+                sec.AddElement(_AlternateBackground.GetSerialData("AlternateBackground"));
+
+            sec.AddValue("AxisColor", AxisColor, Color.Empty);
+
+            sec.AddElement(base.GetSerialData(null));
+
+            if (serialName != null)
+                sec.AddEndElement(serialName);
+
+            return (sec);
+        }
+
+        #endregion
+
+        #region PutSerialData
+
+        #region ProcessValue
+
+        internal override void ProcessValue(SerialElement se)
+        {
+            switch (se.Name)
+            {
+                case "AxisColor":
+                    AxisColor = se.GetValueColor();
+                    break;
+
+                default:
+                    base.ProcessValue(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region ProcessCollection
+
+        internal override void ProcessCollection(SerialElement se)
+        {
+            SerialElementCollection sec = se.Sec;
+
+            switch (se.Name)
+            {
+                case "AlternateBackground":
+                    sec.PutSerialData(AlternateBackground);
+                    break;
+
+                default:
+                    base.ProcessCollection(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IDisposable
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        public override void Dispose()
+        {
+            AlternateBackground = null;
+
+            base.Dispose();
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/ChartBarVisualStyle.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/ChartBarVisualStyle.cs
new file mode 100644
index 00000000..687648e9
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/ChartBarVisualStyle.cs	
@@ -0,0 +1,388 @@
+using System.ComponentModel;
+using System.Drawing.Design;
+
+namespace DevComponents.DotNetBar.Charts.Style
+{
+    /// <summary>
+    /// Represents the visual style of a Bar Series
+    /// </summary>
+    [ToolboxItem(false), DesignTimeVisible(false)]
+    [TypeConverter(typeof(VisualStylesConverter))]
+    public class ChartBarVisualStyle : BaseVisualStyle
+    {
+        #region Private variables
+
+        private ChartLineVisualStyle _Border;
+        private ChartLineVisualStyle _AlternateBorder;
+
+        private Background _Background;
+        private Background _AlternateBackground;
+
+        #endregion
+
+        #region Public properties
+
+        #region AlternateBackground
+
+        /// <summary>
+        /// Gets or sets the background for the bar, when it
+        /// extends to the alternate side of the bar origin.
+        /// </summary>
+        [Description("Indicates the background for the bar, when it extends to the alternate side of the bar origin.")]
+        public Background AlternateBackground
+        {
+            get
+            {
+                if (_AlternateBackground == null)
+                {
+                    _AlternateBackground = Background.Empty;
+
+                    UpdateChangeHandler(null, _AlternateBackground);
+                }
+
+                return (_AlternateBackground);
+            }
+
+            set
+            {
+                if (_AlternateBackground != value)
+                {
+                    UpdateChangeHandler(_AlternateBackground, value);
+
+                    _AlternateBackground = value;
+
+                    OnPropertyChangedEx("AlternateBackground", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeAlternateBackground()
+        {
+            return (_AlternateBackground != null && _AlternateBackground.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetAlternateBackground()
+        {
+            AlternateBackground = null;
+        }
+
+        #endregion
+
+        #region AlternateBorder
+
+        /// <summary>
+        /// Gets or sets the border style for the bar, when it
+        /// extends to the alternate side of the bar origin.
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates the border style for the bar, when it extends to the alternate side of the bar origin.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ChartLineVisualStyle AlternateBorder
+        {
+            get
+            {
+                if (_AlternateBorder == null)
+                {
+                    _AlternateBorder = new ChartLineVisualStyle();
+
+                    UpdateChangeHandler(null, _AlternateBorder);
+                }
+
+                return (_AlternateBorder);
+            }
+
+            set
+            {
+                if (_AlternateBorder != value)
+                {
+                    ChartLineVisualStyle oldValue = _AlternateBorder;
+
+                    _AlternateBorder = value;
+
+                    OnStyleChanged("AlternateBorder", oldValue, value);
+
+                    if (oldValue != null)
+                        oldValue.Dispose();
+                }
+            }
+        }
+
+        #endregion
+
+        #region Background
+
+        /// <summary>
+        /// Gets or sets the background for the bar.
+        /// </summary>
+        [Description("Indicates the background for the bar.")]
+        public Background Background
+        {
+            get
+            {
+                if (_Background == null)
+                {
+                    _Background = Background.Empty;
+
+                    UpdateChangeHandler(null, _Background);
+                }
+
+                return (_Background);
+            }
+
+            set
+            {
+                if (_Background != value)
+                {
+                    UpdateChangeHandler(_Background, value);
+
+                    _Background = value;
+
+                    OnPropertyChangedEx("Background", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeBackground()
+        {
+            return (_Background != null && _Background.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetBackground()
+        {
+            Background = null;
+        }
+
+        #endregion
+
+        #region Border
+
+        /// <summary>
+        /// Gets or sets the border style for the bar.
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates the border style for the bar.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ChartLineVisualStyle Border
+        {
+            get
+            {
+                if (_Border == null)
+                {
+                    _Border = new ChartLineVisualStyle();
+
+                    UpdateChangeHandler(null, _Border);
+                }
+
+                return (_Border);
+            }
+
+            set
+            {
+                if (_Border != value)
+                {
+                    ChartLineVisualStyle oldValue = _Border;
+
+                    _Border = value;
+
+                    OnStyleChanged("Border", oldValue, value);
+
+                    if (oldValue != null)
+                        oldValue.Dispose();
+                }
+            }
+        }
+
+        #endregion
+
+        #region IsEmpty
+
+        /// <summary>
+        /// Gets whether the style is logically Empty.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        [Description("Gets whether the style is logically Empty.")]
+        public override bool IsEmpty
+        {
+            get
+            {
+                return ((_AlternateBackground == null || _AlternateBackground.IsEmpty == true) &&
+                    (_AlternateBorder == null || _AlternateBorder.IsEmpty) &&
+                    (_Background == null || _Background.IsEmpty) &&
+                    (_Border == null || _Border.IsEmpty) &&
+                    (base.IsEmpty == true));
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ApplyStyle
+
+        /// <summary>
+        /// Applies the style to instance of this style.
+        /// </summary>
+        /// <param name="style">Style to apply.</param>
+        public void ApplyStyle(ChartBarVisualStyle style)
+        {
+            if (style != null)
+            {
+                base.ApplyStyle(style);
+
+                if (style._AlternateBackground != null && style._AlternateBackground.IsEmpty == false)
+                    AlternateBackground = style._AlternateBackground.Copy();
+
+                if (style._AlternateBorder != null && style._AlternateBorder.IsEmpty == false)
+                    AlternateBorder.ApplyStyle(style._AlternateBorder);
+
+                if (style._Background != null && style._Background.IsEmpty == false)
+                    Background = style._Background.Copy();
+
+                if (style._Border != null && style._Border.IsEmpty == false)
+                    Border.ApplyStyle(style._Border);
+            }
+        }
+
+        #endregion
+
+        #region Copy
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public new ChartBarVisualStyle Copy()
+        {
+            ChartBarVisualStyle style = new ChartBarVisualStyle();
+
+            CopyTo(style);
+
+            return (style);
+        }
+
+        #endregion
+
+        #region CopyTo
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public void CopyTo(ChartBarVisualStyle style)
+        {
+            base.CopyTo(style);
+
+            style.AlternateBackground = (_AlternateBackground != null) ? _AlternateBackground.Copy() : null;
+            style.AlternateBorder = (_AlternateBorder != null) ? _AlternateBorder.Copy() : null;
+            style.Background = (_Background != null) ? _Background.Copy() : null;
+            style.Border = (_Border != null) ? _Border.Copy() : null;
+        }
+
+        #endregion
+
+        #region GetSerialData
+
+        internal override SerialElementCollection GetSerialData(string serialName)
+        {
+            SerialElementCollection sec = new SerialElementCollection();
+
+            if (serialName != null)
+            {
+                if (serialName.Equals("") == true)
+                    serialName = "ChartBarVisualStyle";
+
+                sec.AddStartElement(serialName);
+            }
+
+            if (_AlternateBackground != null && _AlternateBackground.IsEmpty == false)
+                sec.AddElement(_AlternateBackground.GetSerialData("AlternateBackground"));
+
+            if (_AlternateBorder != null && _AlternateBorder.IsEmpty == false)
+                sec.AddElement(_AlternateBorder.GetSerialData("AlternateBorder"));
+
+            if (_Background != null && _Background.IsEmpty == false)
+                sec.AddElement(_Background.GetSerialData("Background"));
+
+            if (_Border != null && _Border.IsEmpty == false)
+                sec.AddElement(_Border.GetSerialData("Border"));
+
+            sec.AddElement(base.GetSerialData(null));
+
+            if (serialName != null)
+                sec.AddEndElement(serialName);
+
+            return (sec);
+        }
+
+        #endregion
+
+        #region PutSerialData
+
+        #region ProcessCollection
+
+        internal override void ProcessCollection(SerialElement se)
+        {
+            SerialElementCollection sec = se.Sec;
+
+            switch (se.Name)
+            {
+                case "AlternateBackground":
+                    sec.PutSerialData(AlternateBackground);
+                    break;
+
+                case "AlternateBorder":
+                    sec.PutSerialData(AlternateBorder);
+                    break;
+
+                case "Background":
+                    sec.PutSerialData(Background);
+                    break;
+
+                case "Border":
+                    sec.PutSerialData(Border);
+                    break;
+
+                default:
+                    base.ProcessCollection(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IDisposable
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        public override void Dispose()
+        {
+            AlternateBackground = null;
+            Background = null;
+            Border = null;
+
+            base.Dispose();
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/ChartHiLoBarVisualStyle.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/ChartHiLoBarVisualStyle.cs
new file mode 100644
index 00000000..8d4f2743
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/ChartHiLoBarVisualStyle.cs	
@@ -0,0 +1,330 @@
+using System;
+using System.ComponentModel;
+using System.Drawing.Design;
+
+namespace DevComponents.DotNetBar.Charts.Style
+{
+    /// <summary>
+    /// Represents the visual style of an Hilo Bar Series (OHLC)
+    /// </summary>
+    [ToolboxItem(false), DesignTimeVisible(false)]
+    [TypeConverter(typeof(VisualStylesConverter))]
+    public class ChartHiLoBarVisualStyle : BaseVisualStyle
+    {
+        #region Private variables
+
+        private HiLoBarSegmentStyle _DefaultSegmentStyle;
+        private HiLoBarSegmentStyle _AlternateSegmentStyle;
+
+        private Tbool _ShowWhiskerCaps = Tbool.NotSet;
+        private Tbool _UseAlternateSegmentStyle = Tbool.NotSet;
+
+        #endregion
+
+        #region Public properties
+
+        #region AlternateSegmentStyle
+
+        /// <summary>
+        /// Gets or sets the Alternate Style for the Ohlc bar.
+        /// </summary>
+        [Description("Indicates the Alternate Style for the Ohlc bar.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public HiLoBarSegmentStyle AlternateSegmentStyle
+        {
+            get
+            {
+                if (_AlternateSegmentStyle == null)
+                {
+                    _AlternateSegmentStyle = HiLoBarSegmentStyle.Empty;
+
+                    UpdateChangeHandler(null, _AlternateSegmentStyle);
+                }
+
+                return (_AlternateSegmentStyle);
+            }
+
+            set
+            {
+                if (_AlternateSegmentStyle != value)
+                {
+                    UpdateChangeHandler(_AlternateSegmentStyle, value);
+
+                    _AlternateSegmentStyle = value;
+
+                    OnPropertyChangedEx("AlternateSegmentStyle", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region DefaultSegmentStyle
+
+        /// <summary>
+        /// Gets or sets the Default Style for the Ohlc bar.
+        /// </summary>
+        [Description("Indicates the Default Style for the Ohlc bar.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public HiLoBarSegmentStyle DefaultSegmentStyle
+        {
+            get
+            {
+                if (_DefaultSegmentStyle == null)
+                {
+                    _DefaultSegmentStyle = HiLoBarSegmentStyle.Empty;
+
+                    UpdateChangeHandler(null, _DefaultSegmentStyle);
+                }
+
+                return (_DefaultSegmentStyle);
+            }
+
+            set
+            {
+                if (_DefaultSegmentStyle != value)
+                {
+                    UpdateChangeHandler(_DefaultSegmentStyle, value);
+
+                    _DefaultSegmentStyle = value;
+
+                    OnPropertyChangedEx("DefaultSegmentStyle", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowWhiskerCaps
+
+        /// <summary>
+        /// Gets or sets whether Box/Candle whisker caps are displayed.
+        /// </summary>
+        [DefaultValue(Tbool.NotSet), Category("Appearance")]
+        [Description("Indicates whether Box/Candle whisker caps are displayed.")]
+        public Tbool ShowWhiskerCaps
+        {
+            get { return (_ShowWhiskerCaps); }
+
+            set
+            {
+                if (value != _ShowWhiskerCaps)
+                {
+                    _ShowWhiskerCaps = value;
+
+                    OnPropertyChangedEx("ShowWhiskerCaps", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region UseAlternateSegmentStyle
+
+        /// <summary>
+        /// Gets or sets whether Box/Candle whisker caps are displayed.
+        /// </summary>
+        [DefaultValue(Tbool.NotSet), Category("Appearance")]
+        [Description("Indicates whether Box/Candle whisker caps are displayed.")]
+        public Tbool UseAlternateSegmentStyle
+        {
+            get { return (_UseAlternateSegmentStyle); }
+
+            set
+            {
+                if (value != _UseAlternateSegmentStyle)
+                {
+                    _UseAlternateSegmentStyle = value;
+
+                    OnPropertyChangedEx("UseAlternateSegmentStyle", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region IsEmpty
+
+        /// <summary>
+        /// Gets whether the style is logically Empty.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        [Description("Gets whether the style is logically Empty.")]
+        public override bool IsEmpty
+        {
+            get
+            {
+                return ((_AlternateSegmentStyle == null || _AlternateSegmentStyle.IsEmpty == true) &&
+                    (_DefaultSegmentStyle == null || _DefaultSegmentStyle.IsEmpty) &&
+                    (_ShowWhiskerCaps == Tbool.NotSet));
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ApplyStyle
+
+        /// <summary>
+        /// Applies the style to instance of this style.
+        /// </summary>
+        /// <param name="style">Style to apply.</param>
+        public void ApplyStyle(ChartHiLoBarVisualStyle style)
+        {
+            if (style != null)
+            {
+                base.ApplyStyle(style);
+
+                if (style._AlternateSegmentStyle != null && style._AlternateSegmentStyle.IsEmpty == false)
+                    AlternateSegmentStyle.ApplyStyle(style._AlternateSegmentStyle);
+
+                if (style._DefaultSegmentStyle != null && style._DefaultSegmentStyle.IsEmpty == false)
+                    DefaultSegmentStyle.ApplyStyle(style._DefaultSegmentStyle);
+
+                if (style.ShowWhiskerCaps != Tbool.NotSet)
+                    ShowWhiskerCaps = style.ShowWhiskerCaps;
+
+                if (style.UseAlternateSegmentStyle != Tbool.NotSet)
+                    UseAlternateSegmentStyle = style.UseAlternateSegmentStyle;
+            }
+        }
+
+        #endregion
+
+        #region Copy
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public new ChartHiLoBarVisualStyle Copy()
+        {
+            ChartHiLoBarVisualStyle style = new ChartHiLoBarVisualStyle();
+
+            CopyTo(style);
+
+            return (style);
+        }
+
+        #endregion
+
+        #region CopyTo
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public void CopyTo(ChartHiLoBarVisualStyle style)
+        {
+            base.CopyTo(style);
+
+            style.AlternateSegmentStyle = (_AlternateSegmentStyle != null) ? _AlternateSegmentStyle.Copy() : null;
+            style.DefaultSegmentStyle = (_DefaultSegmentStyle != null) ? _DefaultSegmentStyle.Copy() : null;
+
+            style.ShowWhiskerCaps = _ShowWhiskerCaps;
+            style.UseAlternateSegmentStyle = _UseAlternateSegmentStyle;
+        }
+
+        #endregion
+
+        #region GetSerialData
+
+        internal override SerialElementCollection GetSerialData(string serialName)
+        {
+            SerialElementCollection sec = new SerialElementCollection();
+
+            if (serialName != null)
+            {
+                if (serialName.Equals("") == true)
+                    serialName = "ChartHiLoBarVisualStyle";
+
+                sec.AddStartElement(serialName);
+            }
+
+            if (_DefaultSegmentStyle != null && _DefaultSegmentStyle.IsEmpty == false)
+                sec.AddElement(_DefaultSegmentStyle.GetSerialData("DefaultSegmentStyle"));
+
+            if (_AlternateSegmentStyle != null && _AlternateSegmentStyle.IsEmpty == false)
+                sec.AddElement(_AlternateSegmentStyle.GetSerialData("AlternateSegmentStyle"));
+
+            sec.AddValue("ShowWhiskerCaps", ShowWhiskerCaps, Tbool.NotSet);
+            sec.AddValue("UseAlternateSegmentStyle", UseAlternateSegmentStyle, Tbool.NotSet);
+
+            sec.AddElement(base.GetSerialData(null));
+
+            if (serialName != null)
+                sec.AddEndElement(serialName);
+
+            return (sec);
+        }
+
+        #endregion
+
+        #region PutSerialData
+
+        #region ProcessValue
+
+        internal override void ProcessValue(SerialElement se)
+        {
+            switch (se.Name)
+            {
+                case "ShowWhiskerCaps":
+                    ShowWhiskerCaps = (Tbool)se.GetValueEnum(typeof(Tbool));
+                    break;
+
+                case "UseAlternateSegmentStyle":
+                    UseAlternateSegmentStyle = (Tbool)se.GetValueEnum(typeof(Tbool));
+                    break;
+
+                default:
+                    base.ProcessValue(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region ProcessCollection
+
+        internal override void ProcessCollection(SerialElement se)
+        {
+            SerialElementCollection sec = se.Sec;
+
+            switch (se.Name)
+            {
+                case "DefaultSegmentStyle":
+                    sec.PutSerialData(DefaultSegmentStyle);
+                    break;
+
+                case "AlternateSegmentStyle":
+                    sec.PutSerialData(AlternateSegmentStyle);
+                    break;
+
+                default:
+                    base.ProcessCollection(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IDisposable
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        public override void Dispose()
+        {
+            AlternateSegmentStyle = null;
+            DefaultSegmentStyle = null;
+
+            base.Dispose();
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/ChartLegendItemVisualStyle.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/ChartLegendItemVisualStyle.cs
new file mode 100644
index 00000000..47fb86cf
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/ChartLegendItemVisualStyle.cs	
@@ -0,0 +1,847 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Charts.Style
+{
+    ///<summary>
+    /// ChartLegendVisualStyles
+    ///</summary>
+    [TypeConverter(typeof(VisualStylesConverter))]
+    public class ChartLegendItemVisualStyles : VisualStyles<ChartLegendItemVisualStyle>
+    {
+        #region Copy
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public ChartLegendItemVisualStyles Copy()
+        {
+            ChartLegendItemVisualStyles styles = new ChartLegendItemVisualStyles();
+
+            for (int i = 0; i < Styles.Length; i++)
+            {
+                ChartLegendItemVisualStyle vstyle = Styles[i];
+
+                if (vstyle != null)
+                    styles.Styles[i] = vstyle.Copy();
+            }
+
+            return (styles);
+        }
+
+        #endregion
+    }
+
+    /// <summary>
+    /// Represents the visual style of a Legend item element.
+    /// </summary>
+    [TypeConverter(typeof(VisualStylesConverter))]
+    public class ChartLegendItemVisualStyle : BaseVisualStyle
+    {
+        #region Private variables
+
+        private Background _Background;
+        private Color _TextColor = Color.Empty;
+        private Font _Font;
+
+        private Tbool _AllowWrap = Tbool.NotSet;
+        private Alignment _Alignment = Alignment.NotSet;
+        private int _MaxLineCount;
+
+        private Background _CheckBoxBackground;
+        private Color _CheckBoxBorderColor = Color.Empty;
+        private Color _CheckBoxCheckColor = Color.Empty;
+
+        private PointMarkerVisualStyle _MarkerVisualStyle;
+
+        private Background _DisabledMarkerBackground;
+        private Color _DisabledTextColor = Color.Empty;
+
+        #endregion
+
+        #region Public properties
+
+        #region Alignment
+
+        /// <summary>
+        /// Gets or sets the alignment of the text
+        /// </summary>
+        [DefaultValue(Alignment.NotSet), Category("Appearance")]
+        [Description("Indicates the alignment of the text.")]
+        public Alignment Alignment
+        {
+            get { return (_Alignment); }
+
+            set
+            {
+                if (_Alignment != value)
+                {
+                    _Alignment = value;
+
+                    OnPropertyChangedEx("Alignment", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region AllowWrap
+
+        /// <summary>
+        /// Gets or sets whether text wrapping is permitted
+        /// </summary>
+        [DefaultValue(Tbool.NotSet), Category("Appearance")]
+        [Description("Indicates whether text wrapping is permitted.")]
+        public Tbool AllowWrap
+        {
+            get { return (_AllowWrap); }
+
+            set
+            {
+                if (_AllowWrap != value)
+                {
+                    _AllowWrap = value;
+
+                    OnPropertyChangedEx("AllowWrap", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region Background
+
+        /// <summary>
+        /// Gets or sets the style background.
+        /// </summary>
+        [Description("Indicates the style background")]
+        public Background Background
+        {
+            get
+            {
+                if (_Background == null)
+                {
+                    _Background = Background.Empty;
+
+                    UpdateChangeHandler(null, _Background);
+                }
+
+                return (_Background);
+            }
+
+            set
+            {
+                if (_Background != value)
+                {
+                    UpdateChangeHandler(_Background, value);
+
+                    _Background = value;
+
+                    OnPropertyChangedEx("Background", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeBackground()
+        {
+            return (_Background != null && _Background.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetBackground()
+        {
+            Background = null;
+        }
+
+        #endregion
+
+        #region CheckBoxBackground
+
+        /// <summary>
+        /// Gets or sets the CheckBox background.
+        /// </summary>
+        [Description("Indicates the CheckBox background")]
+        public Background CheckBoxBackground
+        {
+            get
+            {
+                if (_CheckBoxBackground == null)
+                {
+                    _CheckBoxBackground = Background.Empty;
+
+                    UpdateChangeHandler(null, _CheckBoxBackground);
+                }
+
+                return (_CheckBoxBackground);
+            }
+
+            set
+            {
+                if (_CheckBoxBackground != value)
+                {
+                    UpdateChangeHandler(_CheckBoxBackground, value);
+
+                    _CheckBoxBackground = value;
+
+                    OnPropertyChangedEx("CheckBoxBackground", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeCheckBoxBackground()
+        {
+            return (_CheckBoxBackground != null && _CheckBoxBackground.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetCheckBoxBackground()
+        {
+            CheckBoxBackground = null;
+        }
+
+        #endregion
+
+        #region CheckBoxBorderColor
+
+        /// <summary>
+        /// Gets or sets the CheckBox border color.
+        /// </summary>
+        [Description("Indicates the CheckBox border color")]
+        public Color CheckBoxBorderColor
+        {
+            get { return (_CheckBoxBorderColor); }
+
+            set
+            {
+                if (_CheckBoxBorderColor != value)
+                {
+                    _CheckBoxBorderColor = value;
+
+                    OnPropertyChangedEx("CheckBoxBorderColor", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeCheckBoxBorderColor()
+        {
+            return (_CheckBoxBorderColor.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetCheckBoxBorderColor()
+        {
+            CheckBoxBorderColor = Color.Empty;
+        }
+
+        #endregion
+
+        #region CheckBoxCheckColor
+
+        /// <summary>
+        /// Gets or sets the CheckBox check color.
+        /// </summary>
+        [Description("Indicates the CheckBox check color")]
+        public Color CheckBoxCheckColor
+        {
+            get { return (_CheckBoxCheckColor); }
+
+            set
+            {
+                if (_CheckBoxCheckColor != value)
+                {
+                    _CheckBoxCheckColor = value;
+
+                    OnPropertyChangedEx("CheckBoxCheckColor", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeCheckBoxCheckColor()
+        {
+            return (_CheckBoxCheckColor.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetCheckBoxCheckColor()
+        {
+            CheckBoxCheckColor = Color.Empty;
+        }
+
+        #endregion
+
+        #region DisabledMarkerBackground
+
+        /// <summary>
+        /// Gets or sets the Disabled Marker Background style.
+        /// </summary>
+        [Description("Indicates the Disabled Marker Background style")]
+        public Background DisabledMarkerBackground
+        {
+            get
+            {
+                if (_DisabledMarkerBackground == null)
+                {
+                    _DisabledMarkerBackground = Background.Empty;
+
+                    UpdateChangeHandler(null, _DisabledMarkerBackground);
+                }
+
+                return (_DisabledMarkerBackground);
+            }
+
+            set
+            {
+                if (_DisabledMarkerBackground != value)
+                {
+                    UpdateChangeHandler(_DisabledMarkerBackground, value);
+
+                    _DisabledMarkerBackground = value;
+
+                    OnPropertyChangedEx("DisabledMarkerBackground", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeDisabledMarkerBackground()
+        {
+            return (_DisabledMarkerBackground != null && _DisabledMarkerBackground.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetDisabledMarkerBackground()
+        {
+            DisabledMarkerBackground = null;
+        }
+
+        #endregion
+
+        #region DisabledTextColor
+
+        /// <summary>
+        /// Gets or sets the Disabled TextColor
+        /// </summary>
+        [Category("Appearance")]
+        [Description("Indicates whether the items in the Legend are equally spaced.")]
+        public Color DisabledTextColor
+        {
+            get { return (_DisabledTextColor); }
+
+            set
+            {
+                if (value != _DisabledTextColor)
+                {
+                    _DisabledTextColor = value;
+
+                    OnPropertyChangedEx("DisabledTextColor", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeDisabledTextColor()
+        {
+            return (_DisabledTextColor.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetDisabledTextColor()
+        {
+            DisabledTextColor = Color.Empty;
+        }
+
+        #endregion
+
+        #region Font
+
+        /// <summary>
+        /// Gets or sets the style Font
+        /// </summary>
+        [DefaultValue(null)]
+        [Description("Indicates the style Font")]
+        public Font Font
+        {
+            get { return (_Font); }
+
+            set
+            {
+                if (_Font != value)
+                {
+                    _Font = value;
+
+                    OnPropertyChangedEx("Font", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region MarkerVisualStyle
+
+        /// <summary>
+        /// Gets or sets the visual styles for the Legend Marker.
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates the visual styles for the PointMarker.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public PointMarkerVisualStyle MarkerVisualStyle
+        {
+            get
+            {
+                if (_MarkerVisualStyle == null)
+                {
+                    _MarkerVisualStyle = new PointMarkerVisualStyle();
+
+                    UpdateChangeHandler(null, _MarkerVisualStyle);
+                }
+
+                return (_MarkerVisualStyle);
+            }
+
+            set
+            {
+                if (_MarkerVisualStyle != value)
+                {
+                    PointMarkerVisualStyle oldValue = _MarkerVisualStyle;
+
+                    _MarkerVisualStyle = value;
+
+                    OnStyleChanged("MarkerVisualStyle", oldValue, value);
+
+                    if (oldValue != null)
+                        oldValue.Dispose();
+                }
+            }
+        }
+
+        #endregion
+
+        #region MaxLineCount
+
+        /// <summary>
+        /// Gets or sets the maximum number of lines for the item text.
+        /// </summary>
+        [Category("Appearance")]
+        [Description("Indicates the maximum number of lines for the item text.")]
+        [DefaultValue(0)]
+        public int MaxLineCount
+        {
+            get { return (_MaxLineCount); }
+
+            set
+            {
+                if (value != _MaxLineCount)
+                {
+                    _MaxLineCount = value;
+
+                    OnPropertyChangedEx("MaxLineCount", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region TextColor
+
+        /// <summary>
+        /// Gets or sets the Text color.
+        /// </summary>
+        [Description("Indicates the Text color")]
+        public Color TextColor
+        {
+            get { return (_TextColor); }
+
+            set
+            {
+                if (_TextColor != value)
+                {
+                    _TextColor = value;
+
+                    OnPropertyChangedEx("TextColor", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeTextColor()
+        {
+            return (_TextColor.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetTextColor()
+        {
+            TextColor = Color.Empty;
+        }
+
+        #endregion
+
+        #region IsEmpty
+
+        /// <summary>
+        /// Gets whether the style is logically Empty.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        [Description("Gets whether the style is logically Empty.")]
+        public override bool IsEmpty
+        {
+            get
+            {
+                return ((_Alignment == Alignment.NotSet) && 
+                    (_AllowWrap == Tbool.NotSet) &&
+                    (_Background == null || _Background.IsEmpty == true) &&
+                    (_CheckBoxBackground == null || _CheckBoxBackground.IsEmpty == true) &&
+                    (_CheckBoxBorderColor.IsEmpty == true) &&
+                    (_CheckBoxCheckColor.IsEmpty == true) &&
+                    (_DisabledMarkerBackground == null || _DisabledMarkerBackground.IsEmpty == true) &&
+                    (_DisabledTextColor.IsEmpty == true) &&
+                    (_Font == null) &&
+                    (_MarkerVisualStyle == null || _MarkerVisualStyle.IsEmpty) &&
+                    (_MaxLineCount == 0) &&
+                    (_TextColor.IsEmpty == true) &&
+                    (base.IsEmpty == true));
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetStringFormatFlags
+
+        internal void GetStringFormatFlags(StringFormat sf)
+        {
+            if (_AllowWrap == Tbool.False || _MaxLineCount <= 1)
+                sf.FormatFlags |= StringFormatFlags.NoWrap;
+
+            sf.Trimming = StringTrimming.EllipsisCharacter;
+
+            switch (Alignment)
+            {
+                case Alignment.TopCenter:
+                    sf.LineAlignment = StringAlignment.Near;
+                    sf.Alignment = StringAlignment.Center;
+                    break;
+
+                case Alignment.TopRight:
+                    sf.LineAlignment = StringAlignment.Near;
+                    sf.Alignment = StringAlignment.Far;
+                    break;
+
+                case Alignment.NotSet:
+                case Alignment.MiddleLeft:
+                    sf.LineAlignment = StringAlignment.Center;
+                    sf.Alignment = StringAlignment.Near;
+                    break;
+
+                case Alignment.MiddleCenter:
+                    sf.LineAlignment = StringAlignment.Center;
+                    sf.Alignment = StringAlignment.Center;
+                    break;
+
+                case Alignment.MiddleRight:
+                    sf.LineAlignment = StringAlignment.Center;
+                    sf.Alignment = StringAlignment.Far;
+                    break;
+
+                case Alignment.BottomLeft:
+                    sf.LineAlignment = StringAlignment.Far;
+                    sf.Alignment = StringAlignment.Near;
+                    break;
+
+                case Alignment.BottomCenter:
+                    sf.LineAlignment = StringAlignment.Far;
+                    sf.Alignment = StringAlignment.Center;
+                    break;
+
+                case Alignment.BottomRight:
+                    sf.LineAlignment = StringAlignment.Far;
+                    sf.Alignment = StringAlignment.Far;
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region ApplyStyle
+
+        /// <summary>
+        /// Applies the style to instance of this style.
+        /// </summary>
+        /// <param name="style">Style to apply.</param>
+        public void ApplyStyle(ChartLegendItemVisualStyle style)
+        {
+            if (style != null)
+            {
+                base.ApplyStyle(style);
+
+                if (style.Alignment != Alignment.NotSet)
+                    Alignment = style.Alignment;
+
+                if (style.AllowWrap != Tbool.NotSet)
+                    AllowWrap = style.AllowWrap;
+
+                if (style._Background != null && style._Background.IsEmpty == false)
+                    Background = style._Background.Copy();
+
+                if (style._CheckBoxBackground != null && style._CheckBoxBackground.IsEmpty == false)
+                    CheckBoxBackground = style._CheckBoxBackground.Copy();
+
+                if (style._CheckBoxBorderColor.IsEmpty == false)
+                    CheckBoxBorderColor = style._CheckBoxBorderColor;
+
+                if (style._CheckBoxCheckColor.IsEmpty == false)
+                    CheckBoxCheckColor = style._CheckBoxCheckColor;
+
+                if (style._DisabledMarkerBackground != null && style._DisabledMarkerBackground.IsEmpty == false)
+                    DisabledMarkerBackground = style.DisabledMarkerBackground.Copy();
+
+                if (style.DisabledTextColor.IsEmpty == false)
+                    DisabledTextColor = style.DisabledTextColor;
+
+                if (style.Font != null)
+                    Font = style.Font;
+
+                if (style._MarkerVisualStyle != null && style.MarkerVisualStyle.IsEmpty == false)
+                    MarkerVisualStyle.ApplyStyle(style.MarkerVisualStyle);
+
+                if (style.MaxLineCount != 0)
+                    MaxLineCount = style.MaxLineCount;
+
+                if (style._TextColor.IsEmpty == false)
+                    TextColor = style._TextColor;
+            }
+        }
+
+        #endregion
+
+        #region Copy
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public new ChartLegendItemVisualStyle Copy()
+        {
+            ChartLegendItemVisualStyle style = new ChartLegendItemVisualStyle();
+
+            CopyTo(style);
+
+            return (style);
+        }
+
+        #endregion
+
+        #region CopyTo
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public void CopyTo(ChartLegendItemVisualStyle style)
+        {
+            base.CopyTo(style);
+
+            style.Alignment = _Alignment;
+            style.AllowWrap = _AllowWrap;
+
+            style.Background = (_Background != null) ? _Background.Copy() : null;
+
+            style.CheckBoxBackground = (_CheckBoxBackground != null) ? _CheckBoxBackground.Copy() : null;
+            style.CheckBoxBorderColor = _CheckBoxBorderColor;
+            style.CheckBoxCheckColor = _CheckBoxCheckColor;
+
+            style.DisabledMarkerBackground = (_DisabledMarkerBackground != null ? _DisabledMarkerBackground.Copy() : null);
+            style.DisabledTextColor = _DisabledTextColor;
+
+            style.Font = (_Font != null) ? (Font)_Font.Clone() : null;
+            style.MarkerVisualStyle = (_MarkerVisualStyle != null) ? _MarkerVisualStyle.Copy() : null;
+
+            style.MaxLineCount = _MaxLineCount;
+            style.TextColor = _TextColor;
+        }
+
+        #endregion
+
+        #region GetSerialData
+
+        internal override SerialElementCollection GetSerialData(string serialName)
+        {
+            SerialElementCollection sec = new SerialElementCollection();
+
+            if (serialName != null)
+            {
+                if (serialName.Equals("") == true)
+                    serialName = "ChartLegendItemVisualStyle";
+
+                sec.AddStartElement(serialName);
+            }
+
+            sec.AddValue("Alignment", _Alignment, Alignment.NotSet);
+            sec.AddValue("AllowWrap", _AllowWrap, Tbool.NotSet);
+
+            if (_Background != null && _Background.IsEmpty == false)
+                sec.AddElement(_Background.GetSerialData("Background"));
+
+            if (_CheckBoxBackground != null && _CheckBoxBackground.IsEmpty == false)
+                sec.AddElement(_CheckBoxBackground.GetSerialData("CheckBoxBackground"));
+
+            sec.AddValue("CheckBoxBorderColor", _CheckBoxBorderColor, Color.Empty);
+            sec.AddValue("CheckBoxCheckColor", _CheckBoxCheckColor, Color.Empty);
+ 
+            if (_Font != null)
+                sec.AddValue("Font", XmlSerializableFont.ConvertToString(Font));
+
+            if (_MarkerVisualStyle != null && _MarkerVisualStyle.IsEmpty == false)
+                sec.AddElement(_MarkerVisualStyle.GetSerialData("MarkerVisualStyle"));
+
+            sec.AddValue("MaxLineCount", _MaxLineCount, 0);
+            sec.AddValue("TextColor", _TextColor, Color.Empty);
+
+            sec.AddElement(base.GetSerialData(null));
+
+            if (serialName != null)
+                sec.AddEndElement(serialName);
+
+            return (sec);
+        }
+
+        #endregion
+
+        #region PutSerialData
+
+        #region ProcessValue
+
+        internal override void ProcessValue(SerialElement se)
+        {
+            switch (se.Name)
+            {
+                case "Alignment":
+                    Alignment = (Alignment)se.GetValueEnum(typeof(Alignment));
+                    break;
+
+                case "AllowWrap":
+                    AllowWrap = (Tbool)se.GetValueEnum(typeof(Tbool));
+                    break;
+
+                case "CheckBoxBorderColor":
+                    CheckBoxBorderColor = se.GetValueColor();
+                    break;
+
+                case "CheckBoxCheckColor":
+                    CheckBoxCheckColor = se.GetValueColor();
+                    break;
+
+                case "Font":
+                    Font = XmlSerializableFont.ConvertFromString(se.StringValue);
+                    break;
+
+                case "MaxLineCount":
+                    MaxLineCount = int.Parse(se.StringValue);
+                    break;
+
+                case "TextColor":
+                    TextColor = se.GetValueColor();
+                    break;
+
+                default:
+                    base.ProcessValue(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region ProcessCollection
+
+        internal override void ProcessCollection(SerialElement se)
+        {
+            SerialElementCollection sec = se.Sec;
+
+            switch (se.Name)
+            {
+                case "Background":
+                    sec.PutSerialData(Background);
+                    break;
+
+                case "CheckBoxBackground":
+                    sec.PutSerialData(CheckBoxBackground);
+                    break;
+
+                case "MarkerVisualStyle":
+                    sec.PutSerialData(MarkerVisualStyle);
+                    break;
+
+                default:
+                    base.ProcessCollection(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IDisposable
+
+        public override void Dispose()
+        {
+            Background = null;
+            CheckBoxBackground = null;
+            MarkerVisualStyle = null;
+
+            base.Dispose();
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/ChartLegendVisualStyle.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/ChartLegendVisualStyle.cs
new file mode 100644
index 00000000..8299026d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/ChartLegendVisualStyle.cs	
@@ -0,0 +1,351 @@
+using System.ComponentModel;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Charts.Style
+{
+    ///<summary>
+    /// ChartLegendVisualStyles
+    ///</summary>
+    [TypeConverter(typeof(VisualStylesConverter))]
+    public class ChartLegendVisualStyles : VisualStyles<ChartLegendVisualStyle>
+    {
+        #region Copy
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public ChartLegendVisualStyles Copy()
+        {
+            ChartLegendVisualStyles styles = new ChartLegendVisualStyles();
+
+            for (int i = 0; i < Styles.Length; i++)
+            {
+                ChartLegendVisualStyle vstyle = Styles[i];
+
+                if (vstyle != null)
+                    styles.Styles[i] = vstyle.Copy();
+            }
+
+            return (styles);
+        }
+
+        #endregion
+    }
+
+    /// <summary>
+    /// Represents the visual style of a Legend element.
+    /// </summary>
+    [TypeConverter(typeof(VisualStylesConverter))]
+    public class ChartLegendVisualStyle : ContainerVisualStyle
+    {
+        #region Private variables
+
+        private Tbool _EquallySpacedItems = Tbool.NotSet;
+
+        private int _HorizontalSpacing = -1;
+        private int _VerticalSpacing = -1;
+
+        #endregion
+
+        #region Public properties
+
+        #region EquallySpacedItems
+
+        /// <summary>
+        /// Gets or sets whether the items in the Legend are equally spaced.
+        /// </summary>
+        [DefaultValue(Tbool.NotSet), Category("Appearance")]
+        [Description("Indicates whether the items in the Legend are equally spaced.")]
+        public Tbool EquallySpacedItems
+        {
+            get { return (_EquallySpacedItems); }
+
+            set
+            {
+                if (value != _EquallySpacedItems)
+                {
+                    _EquallySpacedItems = value;
+
+                    OnPropertyChangedEx("EquallySpacedItems", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region HorizontalSpacing
+
+        /// <summary>
+        /// Gets or sets the horizontal spacing of the legend items.
+        /// </summary>
+        [DefaultValue(-1), Category("Appearance")]
+        [Description("Indicates the horizontal spacing of the legend items.")]
+        public int HorizontalSpacing
+        {
+            get { return (_HorizontalSpacing); }
+
+            set
+            {
+                if (value != _HorizontalSpacing)
+                {
+                    _HorizontalSpacing = value;
+
+                    OnPropertyChangedEx("HorizontalSpacing", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region VerticalSpacing
+
+        /// <summary>
+        /// Gets or sets the vertical spacing of the legend items.
+        /// </summary>
+        [DefaultValue(-1), Category("Appearance")]
+        [Description("Indicates the vertical spacing of the legend items.")]
+        public int VerticalSpacing
+        {
+            get { return (_VerticalSpacing); }
+
+            set
+            {
+                if (value != _VerticalSpacing)
+                {
+                    _VerticalSpacing = value;
+
+                    OnPropertyChangedEx("VerticalSpacing", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region IsEmpty
+
+        /// <summary>
+        /// Gets whether the style is logically Empty.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        [Description("Gets whether the style is logically Empty.")]
+        public override bool IsEmpty
+        {
+            get
+            {
+                return ((_EquallySpacedItems == Tbool.NotSet) &&
+                    (_HorizontalSpacing == -1) &&
+                    (_VerticalSpacing == -1) &&
+                    (base.IsEmpty == true));
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Hidden properties
+
+        #region Alignment
+
+        /// <summary>
+        /// Gets or sets the alignment of the text
+        /// </summary>
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public new Alignment Alignment
+        {
+            get { return (base.Alignment); }
+            set { base.Alignment = value; }
+        }
+
+        #endregion
+
+        #region AllowWrap
+
+        /// <summary>
+        /// Gets or sets whether text wrapping is permitted
+        /// </summary>
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public new Tbool AllowWrap
+        {
+            get { return (base.AllowWrap); }
+            set { base.AllowWrap = value; }
+        }
+
+        #endregion
+
+        #region Font
+
+        /// <summary>
+        /// Gets or sets the style Font
+        /// </summary>
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public new Font Font
+        {
+            get { return (base.Font); }
+            set { base.Font = value; }
+        }
+
+        #endregion
+
+        #region TextColor
+
+        /// <summary>
+        /// Gets or sets the Text color
+        /// </summary>
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public new Color TextColor
+        {
+            get { return (base.TextColor); }
+            set { base.TextColor = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ApplyStyle
+
+        /// <summary>
+        /// Applies the style to instance of this style.
+        /// </summary>
+        /// <param name="style">Style to apply.</param>
+        public void ApplyStyle(ChartLegendVisualStyle style)
+        {
+            if (style != null)
+            {
+                base.ApplyStyle(style);
+
+                if (style.EquallySpacedItems != Tbool.NotSet)
+                    EquallySpacedItems = style.EquallySpacedItems;
+
+                if (style.HorizontalSpacing != -1)
+                    HorizontalSpacing = style.HorizontalSpacing;
+
+                if (style.VerticalSpacing != -1)
+                    VerticalSpacing = style.VerticalSpacing;
+            }
+        }
+
+        #endregion
+
+        #region ApplyDefaults
+
+        public override void ApplyDefaults()
+        {
+            base.ApplyDefaults();
+
+            if (VerticalSpacing < 0)
+                VerticalSpacing = 2;
+
+            if (HorizontalSpacing < 0)
+                HorizontalSpacing = 2;
+
+            if (BorderPattern == null)
+                BorderPattern = new BorderPattern(LinePattern.Solid);
+
+            if (DropShadow.Enabled == Tbool.NotSet)
+                DropShadow.Enabled = Tbool.False;
+        }
+
+        #endregion
+
+        #region Copy
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public new ChartLegendVisualStyle Copy()
+        {
+            ChartLegendVisualStyle style = new ChartLegendVisualStyle();
+
+            CopyTo(style);
+
+            return (style);
+        }
+
+        #endregion
+
+        #region CopyTo
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public void CopyTo(ChartLegendVisualStyle style)
+        {
+            base.CopyTo(style);
+
+            style.HorizontalSpacing = _HorizontalSpacing;
+            style.EquallySpacedItems = _EquallySpacedItems;
+
+            style.VerticalSpacing = _VerticalSpacing;
+        }
+
+        #endregion
+
+        #region GetSerialData
+
+        internal override SerialElementCollection GetSerialData(string serialName)
+        {
+            SerialElementCollection sec = new SerialElementCollection();
+
+            if (serialName != null)
+            {
+                if (serialName.Equals("") == true)
+                    serialName = "ChartLegendVisualStyle";
+
+                sec.AddStartElement(serialName);
+            }
+
+            sec.AddValue("HorizontalSpacing", HorizontalSpacing, -1);
+            sec.AddValue("EquallySpacedItems", EquallySpacedItems, Tbool.NotSet);
+            sec.AddValue("VerticalSpacing", VerticalSpacing, -1);
+
+            sec.AddElement(base.GetSerialData(null));
+
+            if (serialName != null)
+                sec.AddEndElement(serialName);
+
+            return (sec);
+        }
+
+        #endregion
+
+        #region PutSerialData
+
+        #region ProcessValue
+
+        internal override void ProcessValue(SerialElement se)
+        {
+            switch (se.Name)
+            {
+                case "HorizontalSpacing":
+                    HorizontalSpacing = int.Parse(se.StringValue);
+                    break;
+
+                case "EquallySpacedItems":
+                    EquallySpacedItems = (Tbool)se.GetValueEnum(typeof(Tbool));
+                    break;
+
+                case "VerticalSpacing":
+                    VerticalSpacing = int.Parse(se.StringValue);
+                    break;
+
+                default:
+                    base.ProcessValue(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/ChartLineVisualStyle.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/ChartLineVisualStyle.cs
new file mode 100644
index 00000000..aefe5a58
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/ChartLineVisualStyle.cs	
@@ -0,0 +1,517 @@
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Drawing.Drawing2D;
+
+namespace DevComponents.DotNetBar.Charts.Style
+{
+    /// <summary>
+    /// Represents the visual style of a Chart Line
+    /// </summary>
+    [ToolboxItem(false), DesignTimeVisible(false)]
+    [TypeConverter(typeof(BlankExpandableObjectConverter))]
+    public class ChartLineVisualStyle : BaseVisualStyle
+    {
+        #region Private variables
+
+        private Color _LineColor = Color.Empty;
+        private LinePattern _LinePattern = LinePattern.NotSet;
+        private int _LineWidth = -1;
+
+        #endregion
+
+        #region Public properties
+
+        #region LineColor
+
+        /// <summary>
+        /// Gets or sets the Line color.
+        /// </summary>
+        [Description("Indicates the Line color.")]
+        public Color LineColor
+        {
+            get { return (_LineColor); }
+
+            set
+            {
+                if (_LineColor != value)
+                {
+                    _LineColor = value;
+
+                    OnPropertyChangedEx("LineColor", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeLineColor()
+        {
+            return (_LineColor.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetLineColor()
+        {
+            LineColor = Color.Empty;
+        }
+
+        #endregion
+
+        #region LinePattern
+
+        /// <summary>
+        /// Gets or sets the LinePattern.
+        /// </summary>
+        [DefaultValue(LinePattern.NotSet)]
+        [Description("Indicates the LinePattern.")]
+        public LinePattern LinePattern
+        {
+            get { return (_LinePattern); }
+
+            set
+            {
+                if (_LinePattern != value)
+                {
+                    _LinePattern = value;
+
+                    OnPropertyChangedEx("LinePattern", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region LineWidth
+
+        /// <summary>
+        /// Gets or sets the line width.
+        /// </summary>
+        [DefaultValue(-1)]
+        [Description("Indicates the line width")]
+        public int LineWidth
+        {
+            get { return (_LineWidth); }
+
+            set
+            {
+                if (_LineWidth != value)
+                {
+                    _LineWidth = value;
+
+                    OnPropertyChangedEx("LineWidth", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region IsEmpty
+
+        /// <summary>
+        /// Gets whether the style is logically Empty.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        [Description("Gets whether the style is logically Empty.")]
+        public override bool IsEmpty
+        {
+            get
+            {
+                return ((_LineColor.IsEmpty) &&
+                    (_LinePattern == LinePattern.NotSet) &&
+                    (_LineWidth < 0) &&
+                    (base.IsEmpty == true));
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        internal bool IsDisplayable
+        {
+            get
+            {
+                return (LineColor.IsEmpty == false && 
+                    LinePattern != LinePattern.None &&
+                    LineWidth > 0);
+            }
+        }
+
+        #endregion
+
+        #region ApplyStyle
+
+        /// <summary>
+        /// Applies the style to instance of this style.
+        /// </summary>
+        /// <param name="style">Style to apply.</param>
+        public void ApplyStyle(ChartLineVisualStyle style)
+        {
+            if (style != null)
+            {
+                base.ApplyStyle(style);
+
+                if (style.LineColor.IsEmpty == false)
+                    LineColor = style.LineColor;
+
+                if (style.LinePattern != LinePattern.NotSet)
+                    LinePattern = style.LinePattern;
+
+                if (style.LineWidth >= 0)
+                    LineWidth = style.LineWidth;
+            }
+        }
+
+        #endregion
+
+        #region ApplyDefaults
+
+        public override void ApplyDefaults()
+        {
+            if (LinePattern == LinePattern.NotSet)
+                LinePattern = LinePattern.Solid;
+
+            if (LineWidth < 0)
+                LineWidth = 1;
+
+            base.ApplyDefaults();
+        }
+
+        #endregion
+
+        #region Copy
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public new ChartLineVisualStyle Copy()
+        {
+            ChartLineVisualStyle style = new ChartLineVisualStyle();
+
+            CopyTo(style);
+
+            return (style);
+        }
+
+        #endregion
+
+        #region CopyTo
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public void CopyTo(ChartLineVisualStyle style)
+        {
+            base.CopyTo(style);
+
+            style.LineColor = _LineColor;
+            style.LinePattern = _LinePattern;
+            style.LineWidth = _LineWidth;
+        }
+
+        #endregion
+
+        #region GetSerialData
+
+        internal override SerialElementCollection GetSerialData(string serialName)
+        {
+            SerialElementCollection sec = new SerialElementCollection();
+
+            if (serialName != null)
+            {
+                if (serialName.Equals("") == true)
+                    serialName = "ChartLineVisualStyle";
+
+                sec.AddStartElement(serialName);
+            }
+
+            sec.AddValue("LineColor", LineColor, Color.Empty);
+            sec.AddValue("LinePattern", LinePattern, LinePattern.NotSet);
+            sec.AddValue("LineWidth", LineWidth, -1);
+
+            sec.AddElement(base.GetSerialData(null));
+
+            if (serialName != null)
+                sec.AddEndElement(serialName);
+
+            return (sec);
+        }
+
+        #endregion
+
+        #region PutSerialData
+
+        #region ProcessValue
+
+        internal override void ProcessValue(SerialElement se)
+        {
+            switch (se.Name)
+            {
+                case "LineColor":
+                    LineColor = se.GetValueColor();
+                    break;
+
+                case "LinePattern":
+                    LinePattern = (LinePattern)se.GetValueEnum(typeof(LinePattern));
+                    break;
+
+                case "LineWidth":
+                    LineWidth = int.Parse(se.StringValue);
+                    break;
+
+                default:
+                    base.ProcessValue(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IDisposable
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        public override void Dispose()
+        {
+            base.Dispose();
+        }
+
+        #endregion
+    }
+
+    /// <summary>
+    /// Represents the visual style of a Chart CapLine
+    /// </summary>
+    [ToolboxItem(false), DesignTimeVisible(false)]
+    [TypeConverter(typeof(BlankExpandableObjectConverter))]
+    public class ChartCapLineVisualStyle : ChartLineVisualStyle
+    {
+        #region Private variables
+
+        private ChartLineCap _EndCap = ChartLineCap.NotSet;
+        private ChartLineCap _StartCap = ChartLineCap.NotSet;
+
+        #endregion
+
+        #region Public properties
+
+        #region EndCap
+
+        /// <summary>
+        /// Gets or sets the line EndCap.
+        /// </summary>
+        [DefaultValue(ChartLineCap.NotSet)]
+        [Description("Indicates the line End Cap.")]
+        public ChartLineCap EndCap
+        {
+            get { return (_EndCap); }
+
+            set
+            {
+                if (_EndCap != value)
+                {
+                    _EndCap = value;
+
+                    OnPropertyChangedEx("EndCap", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region StartCap
+
+        /// <summary>
+        /// Gets or sets the line StartCap.
+        /// </summary>
+        [DefaultValue(ChartLineCap.NotSet)]
+        [Description("Indicates the line Start Cap.")]
+        public ChartLineCap StartCap
+        {
+            get { return (_StartCap); }
+
+            set
+            {
+                if (_StartCap != value)
+                {
+                    _StartCap = value;
+
+                    OnPropertyChangedEx("StartCap", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region IsEmpty
+
+        /// <summary>
+        /// Gets whether the style is logically Empty.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        [Description("Gets whether the style is logically Empty.")]
+        public override bool IsEmpty
+        {
+            get
+            {
+                return ((_EndCap == ChartLineCap.NotSet) &&
+                    (_StartCap == ChartLineCap.NotSet) &&
+                    (base.IsEmpty == true));
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ApplyStyle
+
+        /// <summary>
+        /// Applies the style to instance of this style.
+        /// </summary>
+        /// <param name="style">Style to apply.</param>
+        public void ApplyStyle(ChartCapLineVisualStyle style)
+        {
+            if (style != null)
+            {
+                base.ApplyStyle(style);
+
+                if (style.EndCap != ChartLineCap.NotSet)
+                    _EndCap = style.EndCap;
+
+                if (style.StartCap != ChartLineCap.NotSet)
+                    _StartCap = style.StartCap;
+            }
+        }
+
+        #endregion
+
+        #region ApplyDefaults
+
+        public override void ApplyDefaults()
+        {
+            if (EndCap == ChartLineCap.NotSet)
+                EndCap = ChartLineCap.NoAnchor;
+
+            if (StartCap == ChartLineCap.NotSet)
+                StartCap = ChartLineCap.NoAnchor;
+
+            base.ApplyDefaults();
+        }
+
+        #endregion
+
+        #region Copy
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public new ChartCapLineVisualStyle Copy()
+        {
+            ChartCapLineVisualStyle style = new ChartCapLineVisualStyle();
+
+            CopyTo(style);
+
+            return (style);
+        }
+
+        #endregion
+
+        #region CopyTo
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public void CopyTo(ChartCapLineVisualStyle style)
+        {
+            base.CopyTo(style);
+
+            style.EndCap = _EndCap;
+            style.StartCap = _StartCap;
+        }
+
+        #endregion
+
+        #region GetSerialData
+
+        internal override SerialElementCollection GetSerialData(string serialName)
+        {
+            SerialElementCollection sec = new SerialElementCollection();
+
+            if (serialName != null)
+            {
+                if (serialName.Equals("") == true)
+                    serialName = "ChartCapLineVisualStyle";
+
+                sec.AddStartElement(serialName);
+            }
+
+            sec.AddValue("EndCap", EndCap, ChartLineCap.NotSet);
+            sec.AddValue("StartCap", StartCap, ChartLineCap.NotSet);
+
+            sec.AddElement(base.GetSerialData(null));
+
+            if (serialName != null)
+                sec.AddEndElement(serialName);
+
+            return (sec);
+        }
+
+        #endregion
+
+        #region PutSerialData
+
+        #region ProcessValue
+
+        internal override void ProcessValue(SerialElement se)
+        {
+            switch (se.Name)
+            {
+                case "EndCap":
+                    EndCap = (ChartLineCap)se.GetValueEnum(typeof(ChartLineCap));
+                    break;
+
+                case "StartCap":
+                    StartCap = (ChartLineCap)se.GetValueEnum(typeof(ChartLineCap));
+                    break;
+
+                default:
+                    base.ProcessValue(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IDisposable
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        public override void Dispose()
+        {
+            base.Dispose();
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/ChartPanelVisualStyle.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/ChartPanelVisualStyle.cs
new file mode 100644
index 00000000..9065c817
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/ChartPanelVisualStyle.cs	
@@ -0,0 +1,357 @@
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Charts.Style
+{
+    /// <summary>
+    /// Represents the visual style of a ChartPanel
+    /// </summary>
+    [ToolboxItem(false), DesignTimeVisible(false)]
+    [TypeConverter(typeof(BlankExpandableObjectConverter))]
+    public class ChartPanelVisualStyle : BaseVisualStyle
+    {
+        #region Private variables
+
+        private DividerLineVisualStyle _DividerLineX;
+        private DividerLineVisualStyle _DividerLineY;
+
+        private ScrollBarVisualStyles _HScrollBarVisualStyles;
+        private ScrollBarVisualStyles _VScrollBarVisualStyles;
+
+        #endregion
+
+        #region Public properties
+
+        #region DividerLineX
+
+        /// <summary>
+        /// Gets or sets the visual style of the horizontal DividerLine (when ChartMatrix.DividerLines is enabled).
+        /// </summary>
+        [Description("Indicates the visual style of the horizontal DividerLine (when ChartMatrix.DividerLines is enabled).")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public DividerLineVisualStyle DividerLineX
+        {
+            get
+            {
+                if (_DividerLineX == null)
+                {
+                    _DividerLineX = new DividerLineVisualStyle();
+
+                    UpdateChangeHandler(null, _DividerLineX);
+                }
+
+                return (_DividerLineX);
+            }
+
+            set
+            {
+                if (_DividerLineX != value)
+                {
+                    UpdateChangeHandler(_DividerLineX, value);
+
+                    _DividerLineX = value;
+
+                    OnPropertyChangedEx("DividerLineX", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region DividerLineY
+
+        /// <summary>
+        /// Gets or sets the visual style of the vertical DividerLine (when ChartMatrix.DividerLines is enabled).
+        /// </summary>
+        [Description("Indicates the visual style of the vertical DividerLine. (when ChartMatrix.DividerLines is enabled)")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public DividerLineVisualStyle DividerLineY
+        {
+            get
+            {
+                if (_DividerLineY == null)
+                {
+                    _DividerLineY = new DividerLineVisualStyle();
+
+                    UpdateChangeHandler(null, _DividerLineY);
+                }
+
+                return (_DividerLineY);
+            }
+
+            set
+            {
+                if (_DividerLineY != value)
+                {
+                    UpdateChangeHandler(_DividerLineY, value);
+
+                    _DividerLineY = value;
+
+                    OnPropertyChangedEx("DividerLineY", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region HScrollBarVisualStyles
+
+        /// <summary>
+        /// Gets or sets the visual styles to be used for Horizontal ScrollBar elements 
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates visual styles to be used for Horizontal ScrollBar elements ")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ScrollBarVisualStyles HScrollBarVisualStyles
+        {
+            get
+            {
+                if (_HScrollBarVisualStyles == null)
+                {
+                    _HScrollBarVisualStyles = new ScrollBarVisualStyles();
+
+                    UpdateChangeHandler(null, _HScrollBarVisualStyles);
+                }
+
+                return (_HScrollBarVisualStyles);
+            }
+
+            set
+            {
+                if (_HScrollBarVisualStyles != value)
+                {
+                    ScrollBarVisualStyles oldValue = _HScrollBarVisualStyles;
+                    _HScrollBarVisualStyles = value;
+
+                    OnStyleChanged("HScrollBarVisualStyles", oldValue, value);
+                }
+            }
+        }
+
+        #endregion
+
+        #region VScrollBarVisualStyles
+
+        /// <summary>
+        /// Gets or sets the visual styles to be used for Vertical ScrollBar elements 
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates visual styles to be used for Vertical ScrollBar elements ")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ScrollBarVisualStyles VScrollBarVisualStyles
+        {
+            get
+            {
+                if (_VScrollBarVisualStyles == null)
+                {
+                    _VScrollBarVisualStyles = new ScrollBarVisualStyles();
+
+                    UpdateChangeHandler(null, _VScrollBarVisualStyles);
+                }
+
+                return (_VScrollBarVisualStyles);
+            }
+
+            set
+            {
+                if (_VScrollBarVisualStyles != value)
+                {
+                    ScrollBarVisualStyles oldValue = _VScrollBarVisualStyles;
+                    _VScrollBarVisualStyles = value;
+
+                    OnStyleChanged("VScrollBarVisualStyles", oldValue, value);
+                }
+            }
+        }
+
+        #endregion
+
+        #region IsEmpty
+
+        /// <summary>
+        /// Gets whether the style is logically Empty.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        [Description("Gets whether the style is logically Empty.")]
+        public override bool IsEmpty
+        {
+            get
+            {
+                return ((_DividerLineX == null || _DividerLineX.IsEmpty == true) &&
+                    (_DividerLineY == null || _DividerLineY.IsEmpty == true) &&
+                    (_HScrollBarVisualStyles == null) &&
+                    (_VScrollBarVisualStyles == null) &&
+                    (base.IsEmpty == true));
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ApplyStyle
+
+        /// <summary>
+        /// Applies the style to instance of this style.
+        /// </summary>
+        /// <param name="style">Style to apply.</param>
+        public void ApplyStyle(ChartPanelVisualStyle style)
+        {
+            if (style != null)
+            {
+                base.ApplyStyle(style);
+
+                if (style.DividerLineX != null)
+                    DividerLineX.ApplyStyle(style.DividerLineX);
+
+                if (style.DividerLineY != null)
+                    DividerLineY.ApplyStyle(style.DividerLineY);
+
+                if (style.HScrollBarVisualStyles != null)
+                {
+                    for (int i = 0; i < style.HScrollBarVisualStyles.Styles.Length; i++)
+                    {
+                        if (style.HScrollBarVisualStyles.Styles[i] != null)
+                            HScrollBarVisualStyles.GetStyle(i).ApplyStyle(style.HScrollBarVisualStyles.Styles[i]);
+                    }
+                }
+
+                if (style.VScrollBarVisualStyles != null)
+                {
+                    for (int i = 0; i < style.VScrollBarVisualStyles.Styles.Length; i++)
+                    {
+                        if (style.VScrollBarVisualStyles.Styles[i] != null)
+                            VScrollBarVisualStyles.GetStyle(i).ApplyStyle(style.VScrollBarVisualStyles.Styles[i]);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region Copy
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public new ChartPanelVisualStyle Copy()
+        {
+            ChartPanelVisualStyle style = new ChartPanelVisualStyle();
+
+            CopyTo(style);
+
+            return (style);
+        }
+
+        #endregion
+
+        #region CopyTo
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public void CopyTo(ChartPanelVisualStyle style)
+        {
+            base.CopyTo(style);
+
+            style.DividerLineX = (_DividerLineX != null) ? _DividerLineX.Copy() : null;
+            style.DividerLineY = (_DividerLineY != null) ? _DividerLineY.Copy() : null;
+
+            style.HScrollBarVisualStyles = (_HScrollBarVisualStyles != null) ? _HScrollBarVisualStyles.Copy() : null;
+            style.VScrollBarVisualStyles = (_VScrollBarVisualStyles != null) ? _VScrollBarVisualStyles.Copy() : null;
+        }
+
+        #endregion
+
+        #region GetSerialData
+
+        internal override SerialElementCollection GetSerialData(string serialName)
+        {
+            SerialElementCollection sec = new SerialElementCollection();
+
+            if (serialName != null)
+            {
+                if (serialName.Equals("") == true)
+                    serialName = "ChartPanelVisualStyle";
+
+                sec.AddStartElement(serialName);
+            }
+
+            if (_DividerLineX != null && _DividerLineX.IsEmpty == false)
+                sec.AddElement(_DividerLineX.GetSerialData("DividerLineX"));
+
+            if (_DividerLineY != null && _DividerLineY.IsEmpty == false)
+                sec.AddElement(_DividerLineY.GetSerialData("DividerLineY"));
+
+            if (_HScrollBarVisualStyles != null && _HScrollBarVisualStyles.IsEmpty == false)
+                sec.AddElement(_HScrollBarVisualStyles.GetSerialData("HScrollBarVisualStyles"));
+
+            if (_VScrollBarVisualStyles != null && _VScrollBarVisualStyles.IsEmpty == false)
+                sec.AddElement(_VScrollBarVisualStyles.GetSerialData("VScrollBarVisualStyles"));
+
+            sec.AddElement(base.GetSerialData(null));
+
+            if (serialName != null)
+                sec.AddEndElement(serialName);
+
+            return (sec);
+        }
+
+        #endregion
+
+        #region PutSerialData
+
+        #region ProcessCollection
+
+        internal override void ProcessCollection(SerialElement se)
+        {
+            SerialElementCollection sec = se.Sec;
+
+            switch (se.Name)
+            {
+                case "DividerLineX":
+                    sec.PutSerialData(DividerLineX);
+                    break;
+
+                case "DividerLineY":
+                    sec.PutSerialData(DividerLineY);
+                    break;
+
+                case "HScrollBarVisualStyles":
+                    sec.PutSerialData(HScrollBarVisualStyles);
+                    break;
+
+                case "VScrollBarVisualStyles":
+                    sec.PutSerialData(VScrollBarVisualStyles);
+                    break;
+
+                default:
+                    base.ProcessCollection(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IDisposable
+
+        public override void Dispose()
+        {
+            DividerLineX = null;
+            DividerLineY = null;
+            HScrollBarVisualStyles = null;
+            VScrollBarVisualStyles = null;
+
+            base.Dispose();
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/ChartSeriesVisualStyle.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/ChartSeriesVisualStyle.cs
new file mode 100644
index 00000000..97e7ffff
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/ChartSeriesVisualStyle.cs	
@@ -0,0 +1,1208 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Charts.Style
+{
+    /// <summary>
+    /// Represents the visual style of a ChartSeries
+    /// </summary>
+    [ToolboxItem(false), DesignTimeVisible(false)]
+    [TypeConverter(typeof(VisualStylesConverter))]
+    public class ChartSeriesVisualStyle : BaseVisualStyle
+    {
+        #region Private variables
+
+        private ChartLineVisualStyle _LineStyle;
+        private ChartLineVisualStyle _SplineStyle;
+        private ChartCapLineVisualStyle _StepLineStyle;
+        private ChartBarVisualStyle _BarVisualStyle;
+        private ChartHiLoBarVisualStyle _HiLoBarVisualStyle;
+
+        private Background _EmptyAreaBackground;
+        private Background _LineAreaBackground;
+        private Background _SplineAreaBackground;
+        private Background _StepLineAreaBackground;
+
+        private ChartCapLineVisualStyle _StepLineAltStyle;
+        private ChartLineVisualStyle _EmptyStyle;
+
+        private PointMarkerVisualStyle _MarkerVisualStyle;
+        private PointMarkerVisualStyle _MarkerHighlightVisualStyle;
+        private PointMarkerVisualStyle _MarkerEmptyVisualStyle;
+
+        private ChartLineVisualStyle _ConvexHullLineStyle;
+        private Background _ConvexHullBackground;
+
+        private ChartSliceVisualStyle _SliceVisualStyle;
+
+        private Color _ItemColor = Color.Empty;
+
+        #endregion
+
+        #region Public properties
+
+        #region BarVisualStyle
+
+        /// <summary>
+        /// Gets or sets the visual style for series Bars.
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates the visual style for series Bars.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ChartBarVisualStyle BarVisualStyle
+        {
+            get
+            {
+                if (_BarVisualStyle == null)
+                {
+                    _BarVisualStyle = new ChartBarVisualStyle();
+
+                    UpdateChangeHandler(null, _BarVisualStyle);
+                }
+
+                return (_BarVisualStyle);
+            }
+
+            set
+            {
+                if (_BarVisualStyle != value)
+                {
+                    ChartBarVisualStyle oldValue = _BarVisualStyle;
+
+                    _BarVisualStyle = value;
+
+                    OnStyleChanged("BarVisualStyle", oldValue, value);
+
+                    if (oldValue != null)
+                        oldValue.Dispose();
+                }
+            }
+        }
+
+        #endregion
+
+        #region ConvexHullBackground
+
+        /// <summary>
+        /// Gets or sets the ConvexHull background.
+        /// </summary>
+        [Description("Indicates the the ConvexHull background.")]
+        public Background ConvexHullBackground
+        {
+            get
+            {
+                if (_ConvexHullBackground == null)
+                {
+                    _ConvexHullBackground = Background.Empty;
+
+                    UpdateChangeHandler(null, _ConvexHullBackground);
+                }
+
+                return (_ConvexHullBackground);
+            }
+
+            set
+            {
+                if (_ConvexHullBackground != value)
+                {
+                    UpdateChangeHandler(_ConvexHullBackground, value);
+
+                    _ConvexHullBackground = value;
+
+                    OnPropertyChangedEx("ConvexHullBackground", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeConvexHullBackground()
+        {
+            return (_ConvexHullBackground != null && _ConvexHullBackground.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetConvexHullBackground()
+        {
+            ConvexHullBackground = null;
+        }
+
+        #endregion
+
+        #region ConvexHullLineStyle
+
+        /// <summary>
+        /// Gets or sets the visual style for the ConvexHull Lines.
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates the visual style for the ConvexHull Lines.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ChartLineVisualStyle ConvexHullLineStyle
+        {
+            get
+            {
+                if (_ConvexHullLineStyle == null)
+                {
+                    _ConvexHullLineStyle = new ChartLineVisualStyle();
+
+                    UpdateChangeHandler(null, _ConvexHullLineStyle);
+                }
+
+                return (_ConvexHullLineStyle);
+            }
+
+            set
+            {
+                if (_ConvexHullLineStyle != value)
+                {
+                    ChartLineVisualStyle oldValue = _ConvexHullLineStyle;
+
+                    _ConvexHullLineStyle = value;
+
+                    OnStyleChanged("ConvexHullLineStyle", oldValue, value);
+
+                    if (oldValue != null)
+                        oldValue.Dispose();
+                }
+            }
+        }
+
+        #endregion
+
+        #region EmptyAreaBackground
+
+        /// <summary>
+        /// Gets or sets the Empty Area Background.
+        /// </summary>
+        [Description("Indicates the Empty Area Background.")]
+        public Background EmptyAreaBackground
+        {
+            get
+            {
+                if (_EmptyAreaBackground == null)
+                {
+                    _EmptyAreaBackground = Background.Empty;
+
+                    UpdateChangeHandler(null, _EmptyAreaBackground);
+                }
+
+                return (_EmptyAreaBackground);
+            }
+
+            set
+            {
+                if (_EmptyAreaBackground != value)
+                {
+                    UpdateChangeHandler(_EmptyAreaBackground, value);
+
+                    _EmptyAreaBackground = value;
+
+                    OnPropertyChangedEx("EmptyAreaBackground", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeEmptyAreaBackground()
+        {
+            return (_EmptyAreaBackground != null && _EmptyAreaBackground.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetEmptyAreaBackground()
+        {
+            _EmptyAreaBackground = null;
+        }
+
+        #endregion
+
+        #region EmptyStyle
+
+        /// <summary>
+        /// Gets or sets the visual styles for series EmptyValue Lines.
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates the visual styles for series EmptyValue Lines.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ChartLineVisualStyle EmptyStyle
+        {
+            get
+            {
+                if (_EmptyStyle == null)
+                {
+                    _EmptyStyle = new ChartLineVisualStyle();
+
+                    UpdateChangeHandler(null, _EmptyStyle);
+                }
+
+                return (_EmptyStyle);
+            }
+
+            set
+            {
+                if (_EmptyStyle != value)
+                {
+                    ChartLineVisualStyle oldValue = _EmptyStyle;
+
+                    _EmptyStyle = value;
+
+                    OnStyleChanged("EmptyLineStyle", oldValue, value);
+
+                    if (oldValue != null)
+                        oldValue.Dispose();
+                }
+            }
+        }
+
+        #endregion
+
+        #region HiLoBarVisualStyle
+
+        /// <summary>
+        /// Gets or sets the visual style for series Hilo Bars.
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates the visual style for series Hilo Bars.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ChartHiLoBarVisualStyle HiLoBarVisualStyle
+        {
+            get
+            {
+                if (_HiLoBarVisualStyle == null)
+                {
+                    _HiLoBarVisualStyle = new ChartHiLoBarVisualStyle();
+
+                    UpdateChangeHandler(null, _HiLoBarVisualStyle);
+                }
+
+                return (_HiLoBarVisualStyle);
+            }
+
+            set
+            {
+                if (_HiLoBarVisualStyle != value)
+                {
+                    ChartHiLoBarVisualStyle oldValue = _HiLoBarVisualStyle;
+
+                    _HiLoBarVisualStyle = value;
+
+                    OnStyleChanged("HiloBarVisualStyle", oldValue, value);
+
+                    if (oldValue != null)
+                        oldValue.Dispose();
+                }
+            }
+        }
+
+        #endregion
+
+        #region ItemColor
+
+        /// <summary>
+        /// Gets or sets the default color to use for the item.
+        /// </summary>
+        [Description("Indicates the default color to use for the item")]
+        public Color ItemColor
+        {
+            get { return (_ItemColor); }
+
+            set
+            {
+                if (_ItemColor != value)
+                {
+                    _ItemColor = value;
+
+                    OnPropertyChangedEx("ItemColor", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeItemColor()
+        {
+            return (_ItemColor.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetItemColor()
+        {
+            _ItemColor = Color.Empty;
+        }
+
+        #endregion
+
+        #region LineAreaBackground
+
+        /// <summary>
+        /// Gets or sets the Line Area Background (area under the series 'Line').
+        /// </summary>
+        [Description("Indicates the Line Area Background (area under the series 'Line').")]
+        public Background LineAreaBackground
+        {
+            get
+            {
+                if (_LineAreaBackground == null)
+                {
+                    _LineAreaBackground = Background.Empty;
+
+                    UpdateChangeHandler(null, _LineAreaBackground);
+                }
+
+                return (_LineAreaBackground);
+            }
+
+            set
+            {
+                if (_LineAreaBackground != value)
+                {
+                    UpdateChangeHandler(_LineAreaBackground, value);
+
+                    _LineAreaBackground = value;
+
+                    OnPropertyChangedEx("LineAreaBackground", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeLineAreaBackground()
+        {
+            return (_LineAreaBackground != null && _LineAreaBackground.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetLineAreaBackground()
+        {
+            LineAreaBackground = null;
+        }
+
+        #endregion
+
+        #region LineStyle
+
+        /// <summary>
+        /// Gets or sets the visual styles for series Lines.
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates the visual styles for series Lines.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ChartLineVisualStyle LineStyle
+        {
+            get
+            {
+                if (_LineStyle == null)
+                {
+                    _LineStyle = new ChartLineVisualStyle();
+
+                    UpdateChangeHandler(null, _LineStyle);
+                }
+
+                return (_LineStyle);
+            }
+
+            set
+            {
+                if (_LineStyle != value)
+                {
+                    ChartLineVisualStyle oldValue = _LineStyle;
+
+                    _LineStyle = value;
+
+                    OnStyleChanged("LineStyle", oldValue, value);
+
+                    if (oldValue != null)
+                        oldValue.Dispose();
+                }
+            }
+        }
+
+        #endregion
+
+        #region MarkerEmptyVisualStyle
+
+        /// <summary>
+        /// Gets or sets the visual styles for the Empty PointMarker.
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates the visual styles for the Empty PointMarker.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public PointMarkerVisualStyle MarkerEmptyVisualStyle
+        {
+            get
+            {
+                if (_MarkerEmptyVisualStyle == null)
+                {
+                    _MarkerEmptyVisualStyle = new PointMarkerVisualStyle();
+
+                    UpdateChangeHandler(null, _MarkerEmptyVisualStyle);
+                }
+
+                return (_MarkerEmptyVisualStyle);
+            }
+
+            set
+            {
+                if (_MarkerEmptyVisualStyle != value)
+                {
+                    PointMarkerVisualStyle oldValue = _MarkerEmptyVisualStyle;
+
+                    _MarkerEmptyVisualStyle = value;
+
+                    OnStyleChanged("MarkerEmptyVisualStyle", oldValue, value);
+
+                    if (oldValue != null)
+                        oldValue.Dispose();
+                }
+            }
+        }
+
+        #endregion
+
+        #region MarkerHighlightVisualStyle
+
+        /// <summary>
+        /// Gets or sets the visual styles for the PointMarker Highlight.
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates the visual styles for the PointMarker Highlight.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public PointMarkerVisualStyle MarkerHighlightVisualStyle
+        {
+            get
+            {
+                if (_MarkerHighlightVisualStyle == null)
+                {
+                    _MarkerHighlightVisualStyle = new PointMarkerVisualStyle();
+
+                    UpdateChangeHandler(null, _MarkerHighlightVisualStyle);
+                }
+
+                return (_MarkerHighlightVisualStyle);
+            }
+
+            set
+            {
+                if (_MarkerHighlightVisualStyle != value)
+                {
+                    PointMarkerVisualStyle oldValue = _MarkerHighlightVisualStyle;
+
+                    _MarkerHighlightVisualStyle = value;
+
+                    OnStyleChanged("MarkerHighlightVisualStyle", oldValue, value);
+
+                    if (oldValue != null)
+                        oldValue.Dispose();
+                }
+            }
+        }
+
+        #endregion
+
+        #region MarkerVisualStyle
+
+        /// <summary>
+        /// Gets or sets the visual styles for the PointMarker.
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates the visual styles for the PointMarker.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public PointMarkerVisualStyle MarkerVisualStyle
+        {
+            get
+            {
+                if (_MarkerVisualStyle == null)
+                {
+                    _MarkerVisualStyle = new PointMarkerVisualStyle();
+
+                    UpdateChangeHandler(null, _MarkerVisualStyle);
+                }
+
+                return (_MarkerVisualStyle);
+            }
+
+            set
+            {
+                if (_MarkerVisualStyle != value)
+                {
+                    PointMarkerVisualStyle oldValue = _MarkerVisualStyle;
+
+                    _MarkerVisualStyle = value;
+
+                    OnStyleChanged("MarkerVisualStyle", oldValue, value);
+
+                    if (oldValue != null)
+                        oldValue.Dispose();
+                }
+            }
+        }
+
+        #endregion
+
+        #region SliceVisualStyle
+
+        /// <summary>
+        /// Gets or sets the default visual style for series Pie Slices.
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates the default visual style for series Pie Slices.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ChartSliceVisualStyle SliceVisualStyle
+        {
+            get
+            {
+                if (_SliceVisualStyle == null)
+                {
+                    _SliceVisualStyle = new ChartSliceVisualStyle();
+
+                    UpdateChangeHandler(null, _SliceVisualStyle);
+                }
+
+                return (_SliceVisualStyle);
+            }
+
+            set
+            {
+                if (_SliceVisualStyle != value)
+                {
+                    ChartSliceVisualStyle oldValue = _SliceVisualStyle;
+
+                    _SliceVisualStyle = value;
+
+                    OnStyleChanged("SliceVisualStyle", oldValue, value);
+
+                    if (oldValue != null)
+                        oldValue.Dispose();
+                }
+            }
+        }
+
+        #endregion
+
+        #region SplineAreaBackground
+
+        /// <summary>
+        /// Gets or sets the Spline Area Background (area under the series 'Spline').
+        /// </summary>
+        [Description("Indicates the Spline Area Background (area under the series 'Spline').")]
+        public Background SplineAreaBackground
+        {
+            get
+            {
+                if (_SplineAreaBackground == null)
+                {
+                    _SplineAreaBackground = Background.Empty;
+
+                    UpdateChangeHandler(null, _SplineAreaBackground);
+                }
+
+                return (_SplineAreaBackground);
+            }
+
+            set
+            {
+                if (_SplineAreaBackground != value)
+                {
+                    UpdateChangeHandler(_SplineAreaBackground, value);
+
+                    _SplineAreaBackground = value;
+
+                    OnPropertyChangedEx("SplineAreaBackground", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeSplineAreaBackground()
+        {
+            return (_SplineAreaBackground != null && _SplineAreaBackground.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetSplineAreaBackground()
+        {
+            SplineAreaBackground = null;
+        }
+
+        #endregion
+
+        #region SplineStyle
+
+        /// <summary>
+        /// Gets or sets the visual styles for series Splines.
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates the visual styles for series Splines.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ChartLineVisualStyle SplineStyle
+        {
+            get
+            {
+                if (_SplineStyle == null)
+                {
+                    _SplineStyle = new ChartLineVisualStyle();
+
+                    UpdateChangeHandler(null, _SplineStyle);
+                }
+
+                return (_SplineStyle);
+            }
+
+            set
+            {
+                if (_SplineStyle != value)
+                {
+                    ChartLineVisualStyle oldValue = _SplineStyle;
+
+                    _SplineStyle = value;
+
+                    OnStyleChanged("SplineStyle", oldValue, value);
+
+                    if (oldValue != null)
+                        oldValue.Dispose();
+                }
+            }
+        }
+
+        #endregion
+
+        #region StepLineAreaBackground
+
+        /// <summary>
+        /// Gets or sets the StepLine Area Background (area under the series 'StepLines').
+        /// </summary>
+        [Description("Indicates the StepLine Area Background (area under the series 'StepLines').")]
+        public Background StepLineAreaBackground
+        {
+            get
+            {
+                if (_StepLineAreaBackground == null)
+                {
+                    _StepLineAreaBackground = Background.Empty;
+
+                    UpdateChangeHandler(null, _StepLineAreaBackground);
+                }
+
+                return (_StepLineAreaBackground);
+            }
+
+            set
+            {
+                if (_StepLineAreaBackground != value)
+                {
+                    UpdateChangeHandler(_StepLineAreaBackground, value);
+
+                    _StepLineAreaBackground = value;
+
+                    OnPropertyChangedEx("StepLineAreaBackground", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeStepLineAreaBackground()
+        {
+            return (_StepLineAreaBackground != null && _StepLineAreaBackground.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetStepLineAreaBackground()
+        {
+            StepLineAreaBackground = null;
+        }
+
+        #endregion
+
+        #region StepLineStyle
+
+        /// <summary>
+        /// Gets or sets the visual styles for series Step Lines.
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates the visual styles for series Step Lines.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ChartCapLineVisualStyle StepLineStyle
+        {
+            get
+            {
+                if (_StepLineStyle == null)
+                {
+                    _StepLineStyle = new ChartCapLineVisualStyle();
+
+                    UpdateChangeHandler(null, _StepLineStyle);
+                }
+
+                return (_StepLineStyle);
+            }
+
+            set
+            {
+                if (_StepLineStyle != value)
+                {
+                    ChartCapLineVisualStyle oldValue = _StepLineStyle;
+
+                    _StepLineStyle = value;
+
+                    OnStyleChanged("StepLineStyle", oldValue, value);
+
+                    if (oldValue != null)
+                        oldValue.Dispose();
+                }
+            }
+        }
+
+        #endregion
+
+        #region StepLineAltStyle
+
+        /// <summary>
+        /// Gets or sets the visual styles for 'Alternate' series Step Lines.
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates the visual styles for 'Alternate' series Step Lines.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ChartCapLineVisualStyle StepLineAltStyle
+        {
+            get
+            {
+                if (_StepLineAltStyle == null)
+                {
+                    _StepLineAltStyle = new ChartCapLineVisualStyle();
+
+                    UpdateChangeHandler(null, _StepLineAltStyle);
+                }
+
+                return (_StepLineAltStyle);
+            }
+
+            set
+            {
+                if (_StepLineAltStyle != value)
+                {
+                    ChartCapLineVisualStyle oldValue = _StepLineAltStyle;
+
+                    _StepLineAltStyle = value;
+
+                    OnStyleChanged("StepLineAltStyle", oldValue, value);
+
+                    if (oldValue != null)
+                        oldValue.Dispose();
+                }
+            }
+        }
+
+        #endregion
+
+        #region IsEmpty
+
+        /// <summary>
+        /// Gets whether the style is logically Empty.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        [Description("Gets whether the style is logically Empty.")]
+        public override bool IsEmpty
+        {
+            get
+            {
+                return ((_BarVisualStyle == null || _BarVisualStyle.IsEmpty) &&
+                    (_ConvexHullBackground == null || _ConvexHullBackground.IsEmpty == true) &&
+                    (_ConvexHullLineStyle == null || _ConvexHullLineStyle.IsEmpty) &&
+                    (_EmptyAreaBackground == null || _EmptyAreaBackground.IsEmpty == true) &&
+                    (_EmptyStyle == null || _EmptyStyle.IsEmpty) &&
+                    (_HiLoBarVisualStyle == null || _HiLoBarVisualStyle.IsEmpty) &&
+                    (_ItemColor.IsEmpty) &&
+                    (_LineAreaBackground == null || _LineAreaBackground.IsEmpty == true) &&
+                    (_LineStyle == null || _LineStyle.IsEmpty) &&
+                    (_MarkerVisualStyle == null || _MarkerVisualStyle.IsEmpty) &&
+                    (_MarkerHighlightVisualStyle == null || _MarkerHighlightVisualStyle.IsEmpty) &&
+                    (_SliceVisualStyle == null || _SliceVisualStyle.IsEmpty) &&
+                    (_SplineAreaBackground == null || _SplineAreaBackground.IsEmpty == true) && 
+                    (_SplineStyle == null || _SplineStyle.IsEmpty) &&
+                    (_StepLineAreaBackground == null || _StepLineAreaBackground.IsEmpty == true) &&
+                    (_StepLineStyle == null || _StepLineStyle.IsEmpty) &&
+                    (_StepLineAltStyle == null || _StepLineAltStyle.IsEmpty) &&
+                    (base.IsEmpty == true));
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ApplyStyle
+
+        /// <summary>
+        /// Applies the style to instance of this style.
+        /// </summary>
+        /// <param name="style">Style to apply.</param>
+        public void ApplyStyle(ChartSeriesVisualStyle style)
+        {
+            if (style != null)
+            {
+                base.ApplyStyle(style);
+
+                if (style._BarVisualStyle != null && style._BarVisualStyle.IsEmpty == false)
+                    BarVisualStyle.ApplyStyle(style.BarVisualStyle);
+
+                if (style._ConvexHullBackground != null && style._ConvexHullBackground.IsEmpty == false)
+                    ConvexHullBackground = style._ConvexHullBackground.Copy();
+
+                if (style._ConvexHullLineStyle != null && style.ConvexHullLineStyle.IsEmpty == false)
+                    ConvexHullLineStyle.ApplyStyle(style.ConvexHullLineStyle);
+
+                if (style._EmptyAreaBackground != null && style._EmptyAreaBackground.IsEmpty == false)
+                    EmptyAreaBackground = style._EmptyAreaBackground.Copy();
+
+                if (style._EmptyStyle != null && style.EmptyStyle.IsEmpty == false)
+                    EmptyStyle.ApplyStyle(style.EmptyStyle);
+
+                if (style._HiLoBarVisualStyle != null && style._HiLoBarVisualStyle.IsEmpty == false)
+                    HiLoBarVisualStyle.ApplyStyle(style.HiLoBarVisualStyle);
+
+                if (style.ItemColor.IsEmpty == false)
+                    ItemColor = style.ItemColor;
+
+                if (style._LineAreaBackground != null && style._LineAreaBackground.IsEmpty == false)
+                    LineAreaBackground = style._LineAreaBackground.Copy();
+
+                if (style._LineStyle != null && style.LineStyle.IsEmpty == false)
+                    LineStyle.ApplyStyle(style.LineStyle);
+
+                if (style._MarkerEmptyVisualStyle != null && style.MarkerEmptyVisualStyle.IsEmpty == false)
+                    MarkerEmptyVisualStyle.ApplyStyle(style.MarkerEmptyVisualStyle);
+
+                if (style._MarkerHighlightVisualStyle != null && style.MarkerHighlightVisualStyle.IsEmpty == false)
+                    MarkerHighlightVisualStyle.ApplyStyle(style.MarkerHighlightVisualStyle);
+
+                if (style._MarkerVisualStyle != null && style.MarkerVisualStyle.IsEmpty == false)
+                    MarkerVisualStyle.ApplyStyle(style.MarkerVisualStyle);
+
+                if (style._HiLoBarVisualStyle != null && style._HiLoBarVisualStyle.IsEmpty == false)
+                    HiLoBarVisualStyle.ApplyStyle(style.HiLoBarVisualStyle);
+
+                if (style._SliceVisualStyle != null && style._SliceVisualStyle.IsEmpty == false)
+                    SliceVisualStyle.ApplyStyle(style.SliceVisualStyle);
+
+                if (style._SplineAreaBackground != null && style._SplineAreaBackground.IsEmpty == false)
+                    SplineAreaBackground = style._SplineAreaBackground.Copy();
+
+                if (style._SplineStyle != null && style.SplineStyle.IsEmpty == false)
+                    SplineStyle.ApplyStyle(style.SplineStyle);
+
+                if (style._StepLineAreaBackground != null && style._StepLineAreaBackground.IsEmpty == false)
+                    StepLineAreaBackground = style._StepLineAreaBackground.Copy();
+
+                if (style._StepLineStyle != null && style.StepLineStyle.IsEmpty == false)
+                    StepLineStyle.ApplyStyle(style.StepLineStyle);
+
+                if (style._StepLineAltStyle != null && style.StepLineAltStyle.IsEmpty == false)
+                    StepLineAltStyle.ApplyStyle(style.StepLineAltStyle);
+            }
+        }
+
+        #endregion
+
+        #region Copy
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public new ChartSeriesVisualStyle Copy()
+        {
+            ChartSeriesVisualStyle style = new ChartSeriesVisualStyle();
+
+            CopyTo(style);
+
+            return (style);
+        }
+
+        #endregion
+
+        #region CopyTo
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public void CopyTo(ChartSeriesVisualStyle style)
+        {
+            base.CopyTo(style);
+
+            style.BarVisualStyle = (_BarVisualStyle != null) ? _BarVisualStyle.Copy() : null;
+
+            style.ConvexHullBackground = (_ConvexHullBackground != null) ? _ConvexHullBackground.Copy() : null;
+            style.ConvexHullLineStyle = (_ConvexHullLineStyle != null) ? _ConvexHullLineStyle.Copy() : null;
+
+            style.EmptyAreaBackground = (_EmptyAreaBackground != null) ? _EmptyAreaBackground.Copy() : null;
+            style.EmptyStyle = (_EmptyStyle != null) ? _EmptyStyle.Copy() : null;
+
+            style.HiLoBarVisualStyle = (_HiLoBarVisualStyle != null) ? _HiLoBarVisualStyle.Copy() : null;
+            style.ItemColor = ItemColor;
+
+            style.LineAreaBackground = (_LineAreaBackground != null) ? _LineAreaBackground.Copy() : null;
+            style.LineStyle = (_LineStyle != null) ? _LineStyle.Copy() : null;
+
+            style.MarkerEmptyVisualStyle = (_MarkerEmptyVisualStyle != null) ? _MarkerEmptyVisualStyle.Copy() : null;
+            style.MarkerHighlightVisualStyle = (_MarkerHighlightVisualStyle != null) ? _MarkerHighlightVisualStyle.Copy() : null;
+            style.MarkerVisualStyle = (_MarkerVisualStyle != null) ? _MarkerVisualStyle.Copy() : null;
+
+            style.SliceVisualStyle = (_SliceVisualStyle != null) ? _SliceVisualStyle.Copy() : null;
+
+            style.SplineAreaBackground = (_SplineAreaBackground != null) ? _SplineAreaBackground.Copy() : null;
+            style.SplineStyle = (_SplineStyle != null) ? _SplineStyle.Copy() : null;
+
+            style.StepLineAltStyle = (_StepLineAltStyle != null) ? _StepLineAltStyle.Copy() : null;
+            style.StepLineAreaBackground = (_StepLineAreaBackground != null) ? _StepLineAreaBackground.Copy() : null;
+            style.StepLineStyle = (_StepLineStyle != null) ? _StepLineStyle.Copy() : null;
+        }
+
+        #endregion
+
+        #region GetSerialData
+
+        internal override SerialElementCollection GetSerialData(string serialName)
+        {
+            SerialElementCollection sec = new SerialElementCollection();
+
+            if (serialName != null)
+            {
+                if (serialName.Equals("") == true)
+                    serialName = "ChartSeriesVisualStyle";
+
+                sec.AddStartElement(serialName);
+            }
+
+            if (_BarVisualStyle != null && _BarVisualStyle.IsEmpty == false)
+                sec.AddElement(_BarVisualStyle.GetSerialData("BarVisualStyle"));
+
+            if (_ConvexHullBackground != null && _ConvexHullBackground.IsEmpty == false)
+                sec.AddElement(_ConvexHullBackground.GetSerialData("ConvexHullBackground"));
+
+            if (_ConvexHullLineStyle != null && _ConvexHullLineStyle.IsEmpty == false)
+                sec.AddElement(_ConvexHullLineStyle.GetSerialData("ConvexHullLineStyle"));
+
+            if (_EmptyAreaBackground != null && _EmptyAreaBackground.IsEmpty == false)
+                sec.AddElement(_EmptyAreaBackground.GetSerialData("EmptyAreaBackground"));
+
+            if (_EmptyStyle != null && _EmptyStyle.IsEmpty == false)
+                sec.AddElement(_EmptyStyle.GetSerialData("EmptyStyle"));
+
+            sec.AddValue("ItemColor", ItemColor, Color.Empty);
+
+            if (_HiLoBarVisualStyle != null && _HiLoBarVisualStyle.IsEmpty == false)
+                sec.AddElement(_HiLoBarVisualStyle.GetSerialData("HiLoBarVisualStyle"));
+
+            if (_LineAreaBackground != null && _LineAreaBackground.IsEmpty == false)
+                sec.AddElement(_LineAreaBackground.GetSerialData("LineAreaBackground"));
+
+            if (_LineStyle != null && _LineStyle.IsEmpty == false)
+                sec.AddElement(_LineStyle.GetSerialData("LineStyle"));
+
+            if (_MarkerEmptyVisualStyle != null && _MarkerEmptyVisualStyle.IsEmpty == false)
+                sec.AddElement(_MarkerEmptyVisualStyle.GetSerialData("MarkerEmptyVisualStyle"));
+
+            if (_MarkerHighlightVisualStyle != null && _MarkerHighlightVisualStyle.IsEmpty == false)
+                sec.AddElement(_MarkerHighlightVisualStyle.GetSerialData("MarkerHighlightVisualStyle"));
+
+            if (_MarkerVisualStyle != null && _MarkerVisualStyle.IsEmpty == false)
+                sec.AddElement(_MarkerVisualStyle.GetSerialData("MarkerVisualStyle"));
+
+            if (_SplineAreaBackground != null && _SplineAreaBackground.IsEmpty == false)
+                sec.AddElement(_SplineAreaBackground.GetSerialData("SplineAreaBackground"));
+
+            if (_SplineStyle != null && _SplineStyle.IsEmpty == false)
+                sec.AddElement(_SplineStyle.GetSerialData("SplineStyle"));
+
+            if (_StepLineAreaBackground != null && _StepLineAreaBackground.IsEmpty == false)
+                sec.AddElement(_StepLineAreaBackground.GetSerialData("StepLineAreaBackground"));
+
+            if (_StepLineStyle != null && _StepLineStyle.IsEmpty == false)
+                sec.AddElement(_StepLineStyle.GetSerialData("StepLineStyle"));
+
+            if (_StepLineAltStyle != null && _StepLineAltStyle.IsEmpty == false)
+                sec.AddElement(_StepLineAltStyle.GetSerialData("StepLineAltStyle"));
+
+            sec.AddElement(base.GetSerialData(null));
+
+            if (serialName != null)
+                sec.AddEndElement(serialName);
+
+            return (sec);
+        }
+
+        #endregion
+
+        #region PutSerialData
+
+        #region ProcessValue
+
+        internal override void ProcessValue(SerialElement se)
+        {
+            switch (se.Name)
+            {
+                case "ItemColor":
+                    ItemColor = se.GetValueColor();
+                    break;
+
+                default:
+                    base.ProcessValue(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region ProcessCollection
+
+        internal override void ProcessCollection(SerialElement se)
+        {
+            SerialElementCollection sec = se.Sec;
+
+            switch (se.Name)
+            {
+                case "BarVisualStyle":
+                    sec.PutSerialData(BarVisualStyle);
+                    break;
+
+                case "ConvexHullBackground":
+                    sec.PutSerialData(ConvexHullBackground);
+                    break;
+
+                case "ConvexHullLineStyle":
+                    sec.PutSerialData(ConvexHullLineStyle);
+                    break;
+
+                case "EmptyAreaBackground":
+                    sec.PutSerialData(EmptyAreaBackground);
+                    break;
+
+                case "EmptyStyle":
+                    sec.PutSerialData(EmptyStyle);
+                    break;
+
+                case "HiLoBarVisualStyle":
+                    sec.PutSerialData(HiLoBarVisualStyle);
+                    break;
+                
+                case "LineAreaBackground":
+                    sec.PutSerialData(LineAreaBackground);
+                    break;
+
+                case "LineStyle":
+                    sec.PutSerialData(LineStyle);
+                    break;
+
+                case "MarkerEmptyVisualStyle":
+                    sec.PutSerialData(MarkerEmptyVisualStyle);
+                    break;
+
+                case "MarkerHighlightVisualStyle":
+                    sec.PutSerialData(MarkerHighlightVisualStyle);
+                    break;
+
+                case "MarkerVisualStyle":
+                    sec.PutSerialData(MarkerVisualStyle);
+                    break;
+
+                case "SplineAreaBackground":
+                    sec.PutSerialData(SplineAreaBackground);
+                    break;
+
+                case "SplineStyle":
+                    sec.PutSerialData(SplineStyle);
+                    break;
+
+                case "StepLineAreaBackground":
+                    sec.PutSerialData(StepLineAreaBackground);
+                    break;
+
+                case "StepLineStyle":
+                    sec.PutSerialData(StepLineStyle);
+                    break;
+
+                case "StepLineAltStyle":
+                    sec.PutSerialData(StepLineAltStyle);
+                    break;
+
+                default:
+                    base.ProcessCollection(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IDisposable
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        public override void Dispose()
+        {
+            BarVisualStyle = null;
+            ConvexHullBackground = null;
+            ConvexHullLineStyle = null;
+            EmptyAreaBackground = null;
+            EmptyStyle = null;
+            HiLoBarVisualStyle = null;
+            LineAreaBackground = null;
+            LineStyle = null;
+            MarkerEmptyVisualStyle = null;
+            MarkerHighlightVisualStyle = null;
+            MarkerVisualStyle = null;
+            SliceVisualStyle = null;
+            SplineAreaBackground = null;
+            SplineStyle = null;
+            StepLineAreaBackground = null;
+            StepLineStyle = null;
+            StepLineAreaBackground = null;
+            StepLineStyle = null;
+            StepLineAltStyle = null;
+
+            base.Dispose();
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/ChartSliceVisualStyle.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/ChartSliceVisualStyle.cs
new file mode 100644
index 00000000..4b10b22d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/ChartSliceVisualStyle.cs	
@@ -0,0 +1,1824 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Charts.Style
+{
+    ///<summary>
+    /// ChartSliceVisualStyles
+    ///</summary>
+    [TypeConverter(typeof(VisualStylesConverter))]
+    public class ChartSliceVisualStyles : VisualStyles<ChartSliceVisualStyle>
+    {
+        #region Copy
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public ChartSliceVisualStyles Copy()
+        {
+            ChartSliceVisualStyles styles = new ChartSliceVisualStyles();
+
+            for (int i = 0; i < Styles.Length; i++)
+            {
+                ChartSliceVisualStyle vstyle = Styles[i];
+
+                if (vstyle != null)
+                    styles.Styles[i] = vstyle.Copy();
+            }
+
+            return (styles);
+        }
+
+        #endregion
+    }
+
+    /// <summary>
+    /// Represents the visual style of a series Slice.
+    /// </summary>
+    [TypeConverter(typeof(VisualStylesConverter))]
+    public class ChartSliceVisualStyle : BaseVisualStyle
+    {
+        #region Private variables
+
+        private SymbolDef _SymbolDef;
+
+        private SliceInnerLabelVisualStyle _SliceInnerLabelStyle;
+        private SliceOuterLabelVisualStyle _SliceOuterLabelStyle;
+
+        private PieReferenceLineVisualStyle _ExtentMaxRefLineStyle;
+        private PieReferenceLineVisualStyle _ExtentMinRefLineStyle;
+        private PieReferenceLineVisualStyle _ExtentAverageRefLineStyle;
+        private PieReferenceLineVisualStyle _ExtentOuterRefLineStyle;
+
+        private Background _Background;
+        private ChartLineVisualStyle _Border;
+
+        private Background _WhiteSpaceBackground;
+        private ChartLineVisualStyle _WhiteSpaceBorder;
+
+        private Image _Image;
+        private int _ImageIndex = -1;
+        private ImageList _ImageList;
+
+        private double _ImageRotation = double.NaN;
+        private Tbool _ImageAutoRotate = Tbool.NotSet;
+
+        private double _ImageRadiusOffset = double.NaN;
+        private double _ImageAngleOffset = double.NaN;
+
+        private double _ImageScale = double.NaN;
+        private ImageOverlay _ImageOverlay = ImageOverlay.NotSet;
+
+        private Padding _ImagePadding;
+
+        private SliceImageCropMode _ImageCropMode = SliceImageCropMode.NotSet;
+        private SliceImageRadiusAnchor _ImageInnerRadiusAnchor = SliceImageRadiusAnchor.NotSet;
+        private SliceImageRadiusAnchor _ImageOuterRadiusAnchor = SliceImageRadiusAnchor.NotSet;
+
+        private Tbool _EnableShading = Tbool.NotSet;
+
+        private ExtentFillRange _ExtentFillRange = ExtentFillRange.NotSet;
+
+        #endregion
+
+        #region Public properties
+
+        #region Background
+
+        /// <summary>
+        /// Gets or sets the background style for the slice.
+        /// </summary>
+        [Description("Indicates the background style for the slice")]
+        public Background Background
+        {
+            get
+            {
+                if (_Background == null)
+                {
+                    _Background = Background.Empty;
+
+                    UpdateChangeHandler(null, _Background);
+                }
+
+                return (_Background);
+            }
+
+            set
+            {
+                if (_Background != value)
+                {
+                    UpdateChangeHandler(_Background, value);
+
+                    _Background = value;
+
+                    OnPropertyChangedEx("Background", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeBackground()
+        {
+            return (_Background != null && _Background.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetBackground()
+        {
+            Background = null;
+        }
+
+        #endregion
+
+        #region ExtentFillRange
+
+        ///<summary>
+        /// Gets or sets the range area used to fill the slice extent 
+        /// background.
+        ///</summary>
+        [DefaultValue(ExtentFillRange.NotSet), Category("Behavior")]
+        [Description("Indicatesthe range area used to fill the slice extent background.")]
+        public ExtentFillRange ExtentFillRange
+        {
+            get { return (_ExtentFillRange); }
+
+            set
+            {
+                if (value != _ExtentFillRange)
+                {
+                    _ExtentFillRange = value;
+
+                    OnPropertyChangedEx("ExtentFillRange", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region Border
+
+        /// <summary>
+        /// Gets or sets the visual style for the slice border.
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates the visual styles for the slice border.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ChartLineVisualStyle Border
+        {
+            get
+            {
+                if (_Border == null)
+                {
+                    _Border = new ChartLineVisualStyle();
+
+                    UpdateChangeHandler(null, _Border);
+                }
+
+                return (_Border);
+            }
+
+            set
+            {
+                if (_Border != value)
+                {
+                    ChartLineVisualStyle oldValue = _Border;
+
+                    _Border = value;
+
+                    OnStyleChanged("Border", oldValue, value);
+
+                    if (oldValue != null)
+                        oldValue.Dispose();
+                }
+            }
+        }
+
+        #endregion
+
+        #region EnableShading
+
+        ///<summary>
+        /// Gets or sets whether shading is applie to the pie slice.
+        ///</summary>
+        [DefaultValue(Tbool.NotSet), Category("Behavior")]
+        [Description("Indicates whether shading is applie to the pie slice.")]
+        public Tbool EnableShading
+        {
+            get { return (_EnableShading); }
+
+            set
+            {
+                if (value != _EnableShading)
+                {
+                    _EnableShading = value;
+
+                    OnPropertyChangedEx("EnableShading", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region Image
+
+        /// <summary>
+        /// Gets or sets the slice Image.
+        /// </summary>
+        [DefaultValue(null), Category("Appearance")]
+        [Description("Indicates the slice image.")]
+        public Image Image
+        {
+            get { return (_Image); }
+
+            set
+            {
+                if (_Image != value)
+                {
+                    _Image = value;
+
+                    OnPropertyChangedEx("Image", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ImageAngleOffset
+
+        /// <summary>
+        /// Gets or sets the display angle offset for the slice image. By default, the image is
+        /// centered in the pie slice (mid sweepAngle), but can be offset either
+        /// toward the end angle (positive offset) or toward the start angle
+        /// (negative offset). The offset can either be a percentage (if value is
+        /// between 0 and 1) or pixel amount (if value > 1).
+        /// </summary>
+        [DefaultValue(double.NaN), Category("Display")]
+        [Description("Indicates the display angle offset for the slice image. By default, the image is centered in the pie slice (mid sweepAngle), but can be offset either toward the end angle (positive offset) or toward the start angle (negative offset). The offset can either be a percentage (if value is between 0 and 1) or pixel amount (if value > 1).")]
+        [Editor("DevComponents.Charts.Design.AngleOffsetRangeValueEditor, DevComponents.Charts.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(UITypeEditor))]
+        public double ImageAngleOffset
+        {
+            get { return (_ImageAngleOffset); }
+
+            set
+            {
+                if (value != _ImageAngleOffset)
+                {
+                    _ImageAngleOffset = value;
+
+                    OnPropertyChangedEx("ImageAngleOffset", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ImageAutoRotate
+
+        /// <summary>
+        /// Gets or sets whether the Image (or Symbol) is auto 
+        /// rotated to match the angle of the slice.
+        /// </summary>
+        [DefaultValue(Tbool.NotSet), Category("Display")]
+        [Description("Indicates whether the Image (or Symbol) is auto rotated to match the angle of the slice.")]
+        public Tbool ImageAutoRotate
+        {
+            get { return (_ImageAutoRotate); }
+
+            set
+            {
+                if (value != _ImageAutoRotate)
+                {
+                    _ImageAutoRotate = value;
+
+                    OnPropertyChangedEx("ImageAutoRotate", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ImageCropMode
+
+        /// <summary>
+        /// Gets or sets how the slice image will be displayed when
+        /// the image needs to be cropped due to 'angular' size constraints 
+        /// (ie. will not fully fit within the slice angular bounds).
+        /// Default is ClipImage.
+        /// </summary>
+        [DefaultValue(SliceImageCropMode.NotSet), Category("Display")]
+        [Description("Indicates how the slice image will be displayed when the image needs to be cropped due to 'angular' size constraints (ie. will not fully fit within the slice angular bounds). Default is ClipImage.")]
+        public SliceImageCropMode ImageCropMode
+        {
+            get { return (_ImageCropMode); }
+
+            set
+            {
+                if (value != _ImageCropMode)
+                {
+                    _ImageCropMode = value;
+
+                    OnPropertyChangedEx("ImageCropMode", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ImageIndex
+
+        /// <summary>
+        /// Gets or sets the slice image index (used with the ImageList property).
+        /// </summary>
+        [DefaultValue(-1)]
+        [Category("Appearance"), Description("Indicates the slice image index (used with the ImageList property)")]
+        [Editor("DevComponents.SuperGrid.Design.ImageIndexEditor, DevComponents.SuperGrid.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(UITypeEditor))]
+        [TypeConverter(typeof(ImageIndexConverter))]
+        public int ImageIndex
+        {
+            get { return (_ImageIndex); }
+
+            set
+            {
+                if (_ImageIndex != value)
+                {
+                    _ImageIndex = value;
+
+                    OnPropertyChangedEx("ImageIndex", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ImageInnerRadiusAnchor
+
+        /// <summary>
+        /// Gets or sets the inner radius anchor for the slice image (ie.
+        /// the inner limiting radius - used with the ImageRadiusOffset property).
+        /// </summary>
+        [DefaultValue(SliceImageRadiusAnchor.NotSet), Category("Display")]
+        [Description("Indicates the inner radius anchor for the slice image (ie. the inner limiting radius - used with the ImageRadiusOffset property).")]
+        public SliceImageRadiusAnchor ImageInnerRadiusAnchor
+        {
+            get { return (_ImageInnerRadiusAnchor); }
+
+            set
+            {
+                if (value != _ImageInnerRadiusAnchor)
+                {
+                    _ImageInnerRadiusAnchor = value;
+
+                    OnPropertyChangedEx("ImageInnerRadiusAnchor", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ImageList
+
+        /// <summary>
+        /// Gets or sets the slice ImageList.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), DefaultValue(null)]
+        [Description("Indicates the slice ImageList.")]
+        public ImageList ImageList
+        {
+            get { return (_ImageList); }
+
+            set
+            {
+                if (_ImageList != value)
+                {
+                    _ImageList = value;
+
+                    OnPropertyChangedEx("ImageList", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ImageOuterRadiusAnchor
+
+        /// <summary>
+        /// Gets or sets the Outer radius anchor for the slice image (ie.
+        /// the Outer limiting radius - used with the ImageRadiusOffset percentage).
+        /// </summary>
+        [DefaultValue(SliceImageRadiusAnchor.NotSet), Category("Display")]
+        [Description("Indicates the Outer radius anchor for the slice image (ie. the Outer limiting radius - used with the ImageRadiusOffset percentage).")]
+        public SliceImageRadiusAnchor ImageOuterRadiusAnchor
+        {
+            get { return (_ImageOuterRadiusAnchor); }
+
+            set
+            {
+                if (value != _ImageOuterRadiusAnchor)
+                {
+                    _ImageOuterRadiusAnchor = value;
+
+                    OnPropertyChangedEx("ImageOuterRadiusAnchor", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ImageOverlay
+
+        /// <summary>
+        /// Gets or sets how to overlay the image with respect to the slice text.
+        /// </summary>
+        [DefaultValue(ImageOverlay.NotSet), Category("Appearance")]
+        [Description("Indicates how to overlay the image with respect to the slice text..")]
+        public ImageOverlay ImageOverlay
+        {
+            get { return (_ImageOverlay); }
+
+            set
+            {
+                if (_ImageOverlay != value)
+                {
+                    _ImageOverlay = value;
+
+                    OnPropertyChangedEx("ImageOverlay", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ImagePadding
+
+        /// <summary>
+        /// Gets or sets the spacing between content and edges of the Image
+        /// </summary>
+        [Description("Indicates the spacing between content and edges of the Image")]
+        public Padding ImagePadding
+        {
+            get
+            {
+                if (_ImagePadding == null)
+                {
+                    _ImagePadding = Padding.Empty;
+
+                    UpdateChangeHandler(null, _ImagePadding);
+                }
+
+                return (_ImagePadding);
+            }
+
+            set
+            {
+                if (_ImagePadding != value)
+                {
+                    UpdateChangeHandler(_ImagePadding, value);
+
+                    _ImagePadding = value;
+
+                    OnPropertyChangedEx("ImagePadding", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeImagePadding()
+        {
+            return (_ImagePadding != null && _ImagePadding.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetImagePadding()
+        {
+            ImagePadding = null;
+        }
+
+        #endregion
+
+        #region ImageRadiusOffset
+
+        /// <summary>
+        /// Gets or sets the display radius for the slice image. The image can be offset
+        /// toward the outer radius (positive offset) or toward the inner radius
+        /// (negative offset). The offset can either be a percentage (if value is
+        /// between 0 and 1) or pixel amount (if value > 1).
+        /// </summary>
+        [DefaultValue(double.NaN), Category("Display")]
+        [Description("Indicates the display radius for the slice image. The image can be offset toward the outer radius (positive offset) or toward the inner radius (negative offset). The offset can either be a percentage (if value is between 0 and 1) or pixel amount (if value > 1).")]
+        [Editor("DevComponents.Charts.Design.RadiusRangeValueEditor, DevComponents.Charts.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(UITypeEditor))]
+        public double ImageRadiusOffset
+        {
+            get { return (_ImageRadiusOffset); }
+
+            set
+            {
+                if (value != _ImageRadiusOffset)
+                {
+                    _ImageRadiusOffset = value;
+
+                    OnPropertyChangedEx("ImageRadiusOffset", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ImageRotation
+
+        /// <summary>
+        /// Gets or sets the amount to rotate the image, specified in degrees. 
+        /// </summary>
+        [Description("Indicates the amount to rotate the image, specified in degrees.")]
+        [DefaultValue(double.NaN)]
+        [Editor("DevComponents.Charts.Design.AngleRangeValueEditor, DevComponents.Charts.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(UITypeEditor))]
+        public double ImageRotation
+        {
+            get { return (_ImageRotation); }
+
+            set
+            {
+                if (value != _ImageRotation)
+                {
+                    _ImageRotation = value;
+
+                    OnPropertyChangedEx("ImageRotation", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ImageScale
+
+        /// <summary>
+        /// Gets or sets the 'scale' factor for the image/symbol. This property informs the
+        /// chart to scale the image (or symbol) based upon the available space at its offset
+        /// position in the slice - the image is moved in or out of the slice, the image will
+        /// grow of shrink accordingly.
+        /// </summary>
+        [DefaultValue(double.NaN), Category("Display")]
+        [Description("Indicates the 'scale' factor for the image/symbol. This property informs the chart to scale the image (or symbol) based upon the available space at its offset position in the slice - the image is moved in or out of the slice, the image will grow of shrink accordingly.")]
+        [Editor("DevComponents.Charts.Design.RadiusRangeValueEditor, DevComponents.Charts.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(UITypeEditor))]
+        public double ImageScale
+        {
+            get { return (_ImageScale); }
+
+            set
+            {
+                if (value != _ImageScale)
+                {
+                    if (value < 0)
+                        throw new Exception("ImageScale can not be negative.");
+
+                    _ImageScale = value;
+
+                    OnPropertyChangedEx("ImageScale", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ExtentAverageRefLineStyle
+
+        /// <summary>
+        /// Gets or sets the visual style for the slice Extent Average
+        /// ReferenceLine style (see SliceVisualLayout.ReferenceLineDisplayMode).
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates the visual style for the slice Extent Average ReferenceLine style (see SliceVisualLayout.ReferenceLineDisplayMode).")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public PieReferenceLineVisualStyle ExtentAverageRefLineStyle
+        {
+            get
+            {
+                if (_ExtentAverageRefLineStyle == null)
+                {
+                    _ExtentAverageRefLineStyle = new PieReferenceLineVisualStyle();
+
+                    UpdateChangeHandler(null, _ExtentAverageRefLineStyle);
+                }
+
+                return (_ExtentAverageRefLineStyle);
+            }
+
+            set
+            {
+                if (_ExtentAverageRefLineStyle != value)
+                {
+                    PieReferenceLineVisualStyle oldValue = _ExtentAverageRefLineStyle;
+
+                    _ExtentAverageRefLineStyle = value;
+
+                    OnStyleChanged("ExtentAverageRefLineStyle", oldValue, value);
+
+                    if (oldValue != null)
+                        oldValue.Dispose();
+                }
+            }
+        }
+
+        #endregion
+
+        #region ExtentMaxRefLineStyle
+
+        /// <summary>
+        /// Gets or sets the visual style for the slice Extent Maximum
+        /// ReferenceLine style (see SliceVisualLayout.ReferenceLineDisplayMode).
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates the visual style for the slice Extent Maximum ReferenceLine style (see SliceVisualLayout.ReferenceLineDisplayMode).")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public PieReferenceLineVisualStyle ExtentMaxRefLineStyle
+        {
+            get
+            {
+                if (_ExtentMaxRefLineStyle == null)
+                {
+                    _ExtentMaxRefLineStyle = new PieReferenceLineVisualStyle();
+
+                    UpdateChangeHandler(null, _ExtentMaxRefLineStyle);
+                }
+
+                return (_ExtentMaxRefLineStyle);
+            }
+
+            set
+            {
+                if (_ExtentMaxRefLineStyle != value)
+                {
+                    PieReferenceLineVisualStyle oldValue = _ExtentMaxRefLineStyle;
+
+                    _ExtentMaxRefLineStyle = value;
+
+                    OnStyleChanged("ExtentMaxRefLineStyle", oldValue, value);
+
+                    if (oldValue != null)
+                        oldValue.Dispose();
+                }
+            }
+        }
+
+        #endregion
+
+        #region ExtentMinRefLineStyle
+
+        /// <summary>
+        /// Gets or sets the visual style for the slice Extent Minimum
+        /// ReferenceLine style (see SliceVisualLayout.ReferenceLineDisplayMode).
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates the visual style for the slice Extent Minimum ReferenceLine style (see SliceVisualLayout.ReferenceLineDisplayMode).")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public PieReferenceLineVisualStyle ExtentMinRefLineStyle
+        {
+            get
+            {
+                if (_ExtentMinRefLineStyle == null)
+                {
+                    _ExtentMinRefLineStyle = new PieReferenceLineVisualStyle();
+
+                    UpdateChangeHandler(null, _ExtentMinRefLineStyle);
+                }
+
+                return (_ExtentMinRefLineStyle);
+            }
+
+            set
+            {
+                if (_ExtentMinRefLineStyle != value)
+                {
+                    PieReferenceLineVisualStyle oldValue = _ExtentMinRefLineStyle;
+
+                    _ExtentMinRefLineStyle = value;
+
+                    OnStyleChanged("ExtentMinRefLineStyle", oldValue, value);
+
+                    if (oldValue != null)
+                        oldValue.Dispose();
+                }
+            }
+        }
+
+        #endregion
+
+        #region ExtentOuterRefLineStyle
+
+        /// <summary>
+        /// Gets or sets the visual style for the slice Extent Outer
+        /// ReferenceLine style (see SliceVisualLayout.ReferenceLineDisplayMode).
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates the visual style for the slice Extent Outer ReferenceLine style (see SliceVisualLayout.ReferenceLineDisplayMode).")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public PieReferenceLineVisualStyle ExtentOuterRefLineStyle
+        {
+            get
+            {
+                if (_ExtentOuterRefLineStyle == null)
+                {
+                    _ExtentOuterRefLineStyle = new PieReferenceLineVisualStyle();
+
+                    UpdateChangeHandler(null, _ExtentOuterRefLineStyle);
+                }
+
+                return (_ExtentOuterRefLineStyle);
+            }
+
+            set
+            {
+                if (_ExtentOuterRefLineStyle != value)
+                {
+                    PieReferenceLineVisualStyle oldValue = _ExtentOuterRefLineStyle;
+
+                    _ExtentOuterRefLineStyle = value;
+
+                    OnStyleChanged("ExtentOuterRefLineStyle", oldValue, value);
+
+                    if (oldValue != null)
+                        oldValue.Dispose();
+                }
+            }
+        }
+
+        #endregion
+
+        #region SliceInnerLabelStyle
+
+        /// <summary>
+        /// Gets or sets the visual style for the inner slice Label.
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates the visual style for the inner slice Label.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public SliceInnerLabelVisualStyle SliceInnerLabelStyle
+        {
+            get
+            {
+                if (_SliceInnerLabelStyle == null)
+                {
+                    _SliceInnerLabelStyle = new SliceInnerLabelVisualStyle();
+
+                    UpdateChangeHandler(null, _SliceInnerLabelStyle);
+                }
+
+                return (_SliceInnerLabelStyle);
+            }
+
+            set
+            {
+                if (value != _SliceInnerLabelStyle)
+                {
+                    SliceInnerLabelVisualStyle oldValue = _SliceInnerLabelStyle;
+
+                    _SliceInnerLabelStyle = value;
+
+                    OnStyleChanged("SliceInnerLabelStyle", oldValue, value);
+
+                    if (oldValue != null)
+                        oldValue.Dispose();
+                }
+            }
+        }
+
+        #endregion
+
+        #region SliceOuterLabelStyle
+
+        /// <summary>
+        /// Gets or sets the visual style for the outer slice Label.
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates the visual style for the outer slice Label.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public SliceOuterLabelVisualStyle SliceOuterLabelStyle
+        {
+            get
+            {
+                if (_SliceOuterLabelStyle == null)
+                {
+                    _SliceOuterLabelStyle = new SliceOuterLabelVisualStyle();
+
+                    UpdateChangeHandler(null, _SliceOuterLabelStyle);
+                }
+
+                return (_SliceOuterLabelStyle);
+            }
+
+            set
+            {
+                if (value != _SliceOuterLabelStyle)
+                {
+                    SliceOuterLabelVisualStyle oldValue = _SliceOuterLabelStyle;
+
+                    _SliceOuterLabelStyle = value;
+
+                    OnStyleChanged("SliceOuterLabelStyle", oldValue, value);
+
+                    if (oldValue != null)
+                        oldValue.Dispose();
+                }
+            }
+        }
+
+        #endregion
+
+        #region SymbolDef
+
+        /// <summary>
+        /// Gets or sets the element Symbol Definition. Note that Symbol definition
+        /// takes precedence over Image definition. Also note that the supporting Image
+        /// properties (such as ImageCrpoMode, ImageRadiusOffset, etc) apply to a set
+        /// Symbol as well as to a set Image.
+        /// </summary>
+        [DefaultValue(null), Category("Appearance")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        [Description("Indicates the element Symbol Definition. Note that Symbol definition takes precedence over Image definition. Also note that the supporting Image properties (such as ImageCrpoMode, ImageRadiusOffset, etc) apply to a set Symbol as well as to a set Image")]
+        public SymbolDef SymbolDef
+        {
+            get
+            {
+                if (_SymbolDef == null)
+                {
+                    _SymbolDef = new SymbolDef();
+
+                    UpdateChangeHandler(null, _SymbolDef);
+                }
+
+                return (_SymbolDef);
+            }
+
+            set
+            {
+                if (_SymbolDef != value)
+                {
+                    UpdateChangeHandler(_SymbolDef, value);
+
+                    _SymbolDef = value;
+
+                    OnPropertyChangedEx("SymbolDef", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeSymbolDef()
+        {
+            return (_SymbolDef != null && _SymbolDef.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetSymbolDef()
+        {
+            SymbolDef = null;
+        }
+
+        #endregion
+
+        #region WhiteSpaceBackground
+
+        /// <summary>
+        /// Gets or sets the WhiteSpace Background (area beyond the slice extent area).
+        /// </summary>
+        [Description("Indicates the WhiteSpace Background (area beyond the slice extent area).")]
+        public Background WhiteSpaceBackground
+        {
+            get
+            {
+                if (_WhiteSpaceBackground == null)
+                {
+                    _WhiteSpaceBackground = Background.Empty;
+
+                    UpdateChangeHandler(null, _WhiteSpaceBackground);
+                }
+
+                return (_WhiteSpaceBackground);
+            }
+
+            set
+            {
+                if (_WhiteSpaceBackground != value)
+                {
+                    UpdateChangeHandler(_WhiteSpaceBackground, value);
+
+                    _WhiteSpaceBackground = value;
+
+                    OnPropertyChangedEx("WhiteSpaceBackground", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeWhiteSpaceBackground()
+        {
+            return (_WhiteSpaceBackground != null &&
+                _WhiteSpaceBackground.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetWhiteSpaceBackground()
+        {
+            WhiteSpaceBackground = null;
+        }
+
+        #endregion
+
+        #region WhiteSpaceBorder
+
+        /// <summary>
+        /// Gets or sets the visual style for the slice WhiteSpace Border.
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates the visual styles for the slice WhiteSpace Border.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ChartLineVisualStyle WhiteSpaceBorder
+        {
+            get
+            {
+                if (_WhiteSpaceBorder == null)
+                {
+                    _WhiteSpaceBorder = new ChartLineVisualStyle();
+
+                    UpdateChangeHandler(null, _WhiteSpaceBorder);
+                }
+
+                return (_WhiteSpaceBorder);
+            }
+
+            set
+            {
+                if (_WhiteSpaceBorder != value)
+                {
+                    ChartLineVisualStyle oldValue = _WhiteSpaceBorder;
+
+                    _WhiteSpaceBorder = value;
+
+                    OnStyleChanged("WhiteSpaceBorder", oldValue, value);
+
+                    if (oldValue != null)
+                        oldValue.Dispose();
+                }
+            }
+        }
+
+        #endregion
+
+        #region IsEmpty
+
+        /// <summary>
+        /// Gets whether the style is logically Empty.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        [Description("Gets whether the style is logically Empty.")]
+        public override bool IsEmpty
+        {
+            get
+            {
+                return ((_Background == null || _Background.IsEmpty == true) &&
+                    (_Border == null || _Border.IsEmpty == true) &&
+                    (_EnableShading == Tbool.NotSet) &&
+                    (_ExtentAverageRefLineStyle == null || _ExtentAverageRefLineStyle.IsEmpty) &&
+                    (_ExtentMaxRefLineStyle == null || _ExtentMaxRefLineStyle.IsEmpty) &&
+                    (_ExtentMinRefLineStyle == null || _ExtentMinRefLineStyle.IsEmpty) &&
+                    (_ExtentOuterRefLineStyle == null || _ExtentOuterRefLineStyle.IsEmpty) &&
+                    (_Image == null) &&
+                    (double.IsNaN(_ImageAngleOffset) == true) &&
+                    (_ImageAutoRotate == Tbool.NotSet) &&
+                    (_ImageCropMode == SliceImageCropMode.NotSet) &&
+                    (_ImageIndex == -1) &&
+                    (_ImageInnerRadiusAnchor == SliceImageRadiusAnchor.NotSet) &&
+                    (_ImageList == null) &&
+                    (_ImageOuterRadiusAnchor == SliceImageRadiusAnchor.NotSet) &&
+                    (_ImageOverlay == ImageOverlay.NotSet) && 
+                    (_ImagePadding == null || _ImagePadding.IsEmpty == true) &&
+                    (double.IsNaN(_ImageRadiusOffset) == true) &&
+                    (double.IsNaN(_ImageRotation) == true) &&
+                    (double.IsNaN(_ImageScale) == true) &&
+                    (_SliceInnerLabelStyle == null || _SliceInnerLabelStyle.IsEmpty) &&
+                    (_SliceOuterLabelStyle == null || _SliceOuterLabelStyle.IsEmpty) &&
+                    (_SymbolDef == null || _SymbolDef.IsEmpty == true) &&
+                    (_WhiteSpaceBackground == null || _WhiteSpaceBackground.IsEmpty == true) &&
+                    (_WhiteSpaceBorder == null || _WhiteSpaceBorder.IsEmpty == true) &&
+                    (base.IsEmpty == true));
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region IsSymbolFigure
+
+        internal bool IsSymbolFigure
+        {
+            get { return (_SymbolDef != null && _SymbolDef.IsValidSymbol == true); }
+        }
+
+        #endregion
+
+        #region IsValidFigure
+
+        internal bool IsValidFigure
+        {
+            get
+            {
+                if (IsSymbolFigure == true)
+                    return (true);
+
+                return (GetImage() != null);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetFigure
+
+        internal object GetFigure()
+        {
+            if (_SymbolDef != null && _SymbolDef.IsEmpty == false && _SymbolDef.SymbolSize > 0)
+                return (_SymbolDef);
+
+            return (GetImage());
+        }
+
+        #region GetImage
+
+        internal Image GetImage()
+        {
+            if (_Image != null)
+                return (_Image);
+
+            if (_ImageIndex >= 0)
+            {
+                ImageList imageList = ImageList;
+
+                if (imageList != null && _ImageIndex < imageList.Images.Count)
+                    return (imageList.Images[_ImageIndex]);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetSymbol
+
+        internal string GetSymbol()
+        {
+            if (_SymbolDef != null && _SymbolDef.IsEmpty == false)
+                return (_SymbolDef.SymbolRealized);
+
+            return (null);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetFigureSize
+
+        internal Size GetFigureSize(Graphics g)
+        {
+            Size size = Size.Empty;
+
+            if (IsSymbolFigure == true)
+                size = _SymbolDef.GetSymbolSize(g);
+
+            else
+            {
+                Image image = GetImage();
+
+                if (image != null)
+                    size = Dpi.Size(image.Size);
+            }
+
+            if (size.IsEmpty == false)
+            {
+                size.Width += Dpi.Width(ImagePadding.Horizontal);
+                size.Height += Dpi.Height(ImagePadding.Vertical);
+            }
+
+            return (size);
+        }
+
+        #endregion
+
+        #region GetFigureSizeEx
+
+        internal Size GetFigureSizeEx(Graphics g)
+        {
+            Size size = Size.Empty;
+
+            if (IsSymbolFigure == true)
+                size = _SymbolDef.GetSymbolSize(g);
+
+            else
+            {
+                Image image = GetImage();
+
+                if (image != null)
+                    size = Dpi.Size(image.Size);
+            }
+
+            return (size);
+        }
+
+        #endregion
+
+        #region ApplyStyle
+
+        /// <summary>
+        /// Applies the style to instance of this style.
+        /// </summary>
+        /// <param name="style">Style to apply.</param>
+        public void ApplyStyle(ChartSliceVisualStyle style)
+        {
+            if (style != null)
+            {
+                base.ApplyStyle(style);
+
+                if (style._Background != null && style._Background.IsEmpty == false)
+                    Background = style._Background.Copy();
+
+                if (style._Border != null && style._Border.IsEmpty == false)
+                    Border.ApplyStyle(style._Border);
+                
+                if (style._EnableShading != Tbool.NotSet)
+                    EnableShading = style._EnableShading;
+
+                if (style._ExtentAverageRefLineStyle != null && style._ExtentAverageRefLineStyle.IsEmpty == false)
+                    ExtentAverageRefLineStyle.ApplyStyle(style._ExtentAverageRefLineStyle);
+
+                if (style._ExtentFillRange != ExtentFillRange.NotSet)
+                    ExtentFillRange = style._ExtentFillRange;
+
+                if (style._ExtentMaxRefLineStyle != null && style._ExtentMaxRefLineStyle.IsEmpty == false)
+                    ExtentMaxRefLineStyle.ApplyStyle(style._ExtentMaxRefLineStyle);
+
+                if (style._ExtentMinRefLineStyle != null && style._ExtentMinRefLineStyle.IsEmpty == false)
+                    ExtentMinRefLineStyle.ApplyStyle(style._ExtentMinRefLineStyle);
+
+                if (style._ExtentOuterRefLineStyle != null && style._ExtentOuterRefLineStyle.IsEmpty == false)
+                    ExtentOuterRefLineStyle.ApplyStyle(style._ExtentOuterRefLineStyle);
+
+                if (style.Image != null)
+                    Image = style.Image;
+
+                if (double.IsNaN(style.ImageAngleOffset) == false)
+                    ImageAngleOffset = style.ImageAngleOffset;
+
+                if (style._ImageAutoRotate != Tbool.NotSet)
+                    ImageAutoRotate = style._ImageAutoRotate;
+
+                if (style._ImageCropMode != SliceImageCropMode.NotSet)
+                    ImageCropMode = style._ImageCropMode;
+
+                if (style._ImageIndex >= 0)
+                    ImageIndex = style._ImageIndex;
+
+                if (style._ImageInnerRadiusAnchor != SliceImageRadiusAnchor.NotSet)
+                    ImageInnerRadiusAnchor = style._ImageInnerRadiusAnchor;
+
+                if (style._ImageList != null)
+                    ImageList = style._ImageList;
+
+                if (style._ImageOuterRadiusAnchor != SliceImageRadiusAnchor.NotSet)
+                    ImageOuterRadiusAnchor = style._ImageOuterRadiusAnchor;
+
+                if (style._ImageOverlay != ImageOverlay.NotSet)
+                    ImageOverlay = style._ImageOverlay;
+
+                if (style._ImagePadding != null && style._ImagePadding.IsEmpty == false)
+                    ImagePadding = style._ImagePadding.Copy();
+
+                if (double.IsNaN(style.ImageRadiusOffset) == false)
+                    ImageRadiusOffset = style._ImageRadiusOffset;
+
+                if (double.IsNaN(style.ImageRotation) == false)
+                    ImageRotation = style.ImageRotation;
+
+                if (double.IsNaN(style._ImageScale) == false)
+                    ImageScale = style._ImageScale;
+                
+                if (style._SliceInnerLabelStyle != null && style._SliceInnerLabelStyle.IsEmpty == false)
+                    SliceInnerLabelStyle.ApplyStyle(style._SliceInnerLabelStyle);
+
+                if (style._SliceOuterLabelStyle != null && style._SliceOuterLabelStyle.IsEmpty == false)
+                    SliceOuterLabelStyle.ApplyStyle(style._SliceOuterLabelStyle);
+
+                if (style._SymbolDef != null && style._SymbolDef.IsEmpty == false)
+                    SymbolDef = style._SymbolDef.Copy();
+
+                if (style._WhiteSpaceBackground != null && style._WhiteSpaceBackground.IsEmpty == false)
+                    WhiteSpaceBackground = style._WhiteSpaceBackground.Copy();
+
+                if (style._WhiteSpaceBorder != null && style._WhiteSpaceBorder.IsEmpty == false)
+                    WhiteSpaceBorder = style._WhiteSpaceBorder.Copy();
+            }
+        }
+
+        #endregion
+
+        #region ApplyDefaults
+
+        public override void ApplyDefaults()
+        {
+            if (_Border != null)
+                Border.ApplyDefaults();
+
+            ExtentAverageRefLineStyle.ApplyDefaults();
+            ExtentMaxRefLineStyle.ApplyDefaults();
+            ExtentMinRefLineStyle.ApplyDefaults();
+            ExtentOuterRefLineStyle.ApplyDefaults();
+
+            if (_EnableShading == Tbool.NotSet)
+                EnableShading = Tbool.False;
+
+            if (double.IsNaN(_ImageAngleOffset) == true)
+                ImageAngleOffset = 0;
+
+            if (_ImageAutoRotate == Tbool.NotSet)
+                ImageAutoRotate = Tbool.False;
+
+            if (ImageCropMode == SliceImageCropMode.NotSet)
+                ImageCropMode = SliceImageCropMode.ClipImage;
+
+            if (ImageInnerRadiusAnchor == SliceImageRadiusAnchor.NotSet)
+                ImageInnerRadiusAnchor = SliceImageRadiusAnchor.InnerRadius;
+
+            if (ImageOuterRadiusAnchor == SliceImageRadiusAnchor.NotSet)
+                ImageOuterRadiusAnchor = SliceImageRadiusAnchor.ExtentRadius;
+
+            if (ImageOverlay == Style.ImageOverlay.NotSet)
+                ImageOverlay = Style.ImageOverlay.Top;
+
+            if (double.IsNaN(ImageRadiusOffset) == true)
+                ImageRadiusOffset = .3;
+
+            if (double.IsNaN(_ImageRotation) == true)
+                ImageRotation = 0;
+
+            SliceInnerLabelStyle.ApplyDefaults();
+            SliceOuterLabelStyle.ApplyDefaults();
+
+            if (_SymbolDef != null && _SymbolDef.IsValidSymbol == true)
+            {
+                if (_SymbolDef.SymbolSize == 0)
+                {
+                    if (_SliceInnerLabelStyle != null)
+                    {
+                        if (_SliceInnerLabelStyle.Font != null)
+                            _SymbolDef.SymbolSize = _SliceInnerLabelStyle.Font.SizeInPoints;
+                    }
+                }
+
+                if (_SymbolDef.SymbolColor.IsEmpty == true)
+                {
+                    if (_SliceInnerLabelStyle != null && _SliceInnerLabelStyle.TextColor.IsEmpty == false)
+                        _SymbolDef.SymbolColor = _SliceInnerLabelStyle.TextColor;
+                    else
+                        _SymbolDef.SymbolColor = Color.Black;
+                }
+            }
+
+            base.ApplyDefaults();
+        }
+
+        #endregion
+
+        #region Copy
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public new ChartSliceVisualStyle Copy()
+        {
+            ChartSliceVisualStyle style = new ChartSliceVisualStyle();
+
+            CopyTo(style);
+
+            return (style);
+        }
+
+        #endregion
+
+        #region CopyTo
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public void CopyTo(ChartSliceVisualStyle style)
+        {
+            base.CopyTo(style);
+
+            style.Background = (_Background != null) ? _Background.Copy() : null;
+            style.Border = (_Border != null) ? _Border.Copy() : null;
+
+            style.EnableShading = EnableShading;
+            style.ExtentFillRange = _ExtentFillRange;
+
+            style.ExtentAverageRefLineStyle = (_ExtentMinRefLineStyle != null) ? _ExtentMinRefLineStyle.Copy() : null;
+            style.ExtentMinRefLineStyle = (_ExtentMinRefLineStyle != null) ? _ExtentMinRefLineStyle.Copy() : null;
+            style.ExtentMaxRefLineStyle = (_ExtentMaxRefLineStyle != null) ? _ExtentMaxRefLineStyle.Copy() : null;
+            style.ExtentOuterRefLineStyle = (_ExtentOuterRefLineStyle != null) ? _ExtentOuterRefLineStyle.Copy() : null;
+
+            style.Image = _Image;
+            style.ImageAngleOffset = _ImageAngleOffset;
+            style.ImageAutoRotate = _ImageAutoRotate;
+            style.ImageCropMode =_ImageCropMode;
+            style.ImageIndex = _ImageIndex;
+            style.ImageInnerRadiusAnchor = _ImageInnerRadiusAnchor;
+            style.ImageList = _ImageList;
+            style.ImageOuterRadiusAnchor = _ImageOuterRadiusAnchor;
+            style.ImageOverlay = _ImageOverlay;
+            style.ImagePadding = (_ImagePadding != null) ? _ImagePadding.Copy() : null;
+            style.ImageRadiusOffset = _ImageRadiusOffset;
+            style.ImageRotation = _ImageRotation;
+            style.ImageScale = _ImageScale;
+            
+            style.SliceInnerLabelStyle = (_SliceInnerLabelStyle != null) ? SliceInnerLabelStyle.Copy() : null;
+            style.SliceOuterLabelStyle = (_SliceOuterLabelStyle != null) ? SliceOuterLabelStyle.Copy() : null;
+
+            style.SymbolDef = (_SymbolDef != null) ? _SymbolDef.Copy() : null;
+
+            style.WhiteSpaceBackground = (_WhiteSpaceBackground != null) ? _WhiteSpaceBackground.Copy() : null;
+            style.WhiteSpaceBorder = (_WhiteSpaceBorder != null) ? _WhiteSpaceBorder.Copy() : null;
+        }
+
+        #endregion
+
+        #region GetSerialData
+
+        internal override SerialElementCollection GetSerialData(string serialName)
+        {
+            SerialElementCollection sec = new SerialElementCollection();
+
+            if (serialName != null)
+            {
+                if (serialName.Equals("") == true)
+                    serialName = "ChartSliceVisualStyle";
+
+                sec.AddStartElement(serialName);
+            }
+
+            if (_Background != null && _Background.IsEmpty == false)
+                sec.AddElement(_Background.GetSerialData("Background"));
+
+            if (_Border != null && _Border.IsEmpty == false)
+                sec.AddElement(_Border.GetSerialData("Border"));
+
+            sec.AddValue("EnableShading", EnableShading, Tbool.NotSet);
+
+            if (_ExtentAverageRefLineStyle != null && _ExtentAverageRefLineStyle.IsEmpty == false)
+                sec.AddElement(_ExtentAverageRefLineStyle.GetSerialData("ExtentAverageRefLineStyle"));
+
+            sec.AddValue("ExtentFillRange", ExtentFillRange, ExtentFillRange.NotSet);
+
+            if (_ExtentMaxRefLineStyle != null && _ExtentMaxRefLineStyle.IsEmpty == false)
+                sec.AddElement(_ExtentMaxRefLineStyle.GetSerialData("ExtentMaxRefLineStyle"));
+
+            if (_ExtentMinRefLineStyle != null && _ExtentMinRefLineStyle.IsEmpty == false)
+                sec.AddElement(_ExtentMinRefLineStyle.GetSerialData("ExtentMinRefLineStyle"));
+
+            if (_ExtentOuterRefLineStyle != null && _ExtentOuterRefLineStyle.IsEmpty == false)
+                sec.AddElement(_ExtentOuterRefLineStyle.GetSerialData("ExtentOuterRefLineStyle"));
+
+            sec.AddValue("Image", Image);
+            sec.AddValue("ImageAngleOffset", ImageAngleOffset, double.NaN);
+            sec.AddValue("ImageAutoRotate", ImageAutoRotate, Tbool.NotSet);
+            sec.AddValue("ImageCropMode", ImageCropMode, SliceImageCropMode.NotSet);
+            sec.AddValue("ImageIndex", _ImageIndex, -1);
+            sec.AddValue("ImageInnerRadiusAnchor", ImageInnerRadiusAnchor, SliceImageRadiusAnchor.NotSet);
+
+            if (_ImageList != null)
+                sec.AddValue("ImageList", XmlSerializableImageList.ConvertToString(ImageList));
+
+            sec.AddValue("ImageOuterRadiusAnchor", ImageOuterRadiusAnchor, SliceImageRadiusAnchor.NotSet);
+            sec.AddValue("ImageOverlay", ImageOverlay, ImageOverlay.NotSet);
+
+            if (_ImagePadding != null && _ImagePadding.IsEmpty == false)
+                sec.AddElement(_ImagePadding.GetSerialData("ImagePadding"));
+
+            sec.AddValue("ImageRadiusOffset", ImageRadiusOffset, double.NaN);
+            sec.AddValue("ImageRotation", ImageRotation, double.NaN);
+            sec.AddValue("ImageScale", ImageScale, double.NaN);
+
+            if (_SliceInnerLabelStyle != null && _SliceInnerLabelStyle.IsEmpty == false)
+                sec.AddElement(_SliceInnerLabelStyle.GetSerialData("SliceInnerLabelStyle"));
+
+            if (_SliceOuterLabelStyle != null && _SliceOuterLabelStyle.IsEmpty == false)
+                sec.AddElement(_SliceOuterLabelStyle.GetSerialData("SliceOuterLabelStyle"));
+
+            if (_SymbolDef != null && _SymbolDef.IsEmpty == false)
+                sec.AddElement(_SymbolDef.GetSerialData("SymbolDef"));
+
+            if (_WhiteSpaceBackground != null && _WhiteSpaceBackground.IsEmpty == false)
+                sec.AddElement(_WhiteSpaceBackground.GetSerialData("WhiteSpaceBackground"));
+
+            if (_WhiteSpaceBorder != null && _WhiteSpaceBorder.IsEmpty == false)
+                sec.AddElement(_WhiteSpaceBorder.GetSerialData("WhiteSpaceBorder"));
+
+            sec.AddElement(base.GetSerialData(null));
+
+            if (serialName != null)
+                sec.AddEndElement(serialName);
+
+            return (sec);
+        }
+
+        #endregion
+
+        #region PutSerialData
+
+        #region ProcessValue
+
+        internal override void ProcessValue(SerialElement se)
+        {
+            switch (se.Name)
+            {
+                case "Image":
+                    Image = se.GetValueImage();
+                    break;
+
+                case "EnableShading":
+                    EnableShading = (Tbool)se.GetValueEnum(typeof(Tbool));
+                    break;
+
+                case "ExtentFillRange":
+                    ExtentFillRange = (ExtentFillRange)se.GetValueEnum(typeof(ExtentFillRange));
+                    break;
+
+                case "ImageAngleOffset":
+                    ImageAngleOffset = double.Parse(se.StringValue);
+                    break;
+
+                case "ImageAutoRotate":
+                    ImageAutoRotate = (Tbool)se.GetValueEnum(typeof(Tbool));
+                    break;
+
+                case "ImageCropMode":
+                    ImageCropMode = (SliceImageCropMode)se.GetValueEnum(typeof(SliceImageCropMode));
+                    break;
+
+                case "ImageIndex":
+                    ImageIndex = int.Parse(se.StringValue);
+                    break;
+
+                case "ImageInnerRadiusAnchor":
+                    ImageInnerRadiusAnchor = (SliceImageRadiusAnchor)se.GetValueEnum(typeof(SliceImageRadiusAnchor));
+                    break;
+
+                case "ImageList":
+                    ImageList = XmlSerializableImageList.ConvertFromString(se.StringValue);
+                    break;
+
+                case "ImageOuterRadiusAnchor":
+                    ImageOuterRadiusAnchor = (SliceImageRadiusAnchor)se.GetValueEnum(typeof(SliceImageRadiusAnchor));
+                    break;
+
+                case "ImageOverlay":
+                    ImageOverlay = (ImageOverlay)se.GetValueEnum(typeof(ImageOverlay));
+                    break;
+
+                case "ImageRadiusOffset":
+                    ImageRadiusOffset = double.Parse(se.StringValue);
+                    break;
+
+                case "ImageRotation":
+                    ImageRotation = double.Parse(se.StringValue);
+                    break;
+
+                case "ImageScale":
+                    ImageScale = double.Parse(se.StringValue);
+                    break;
+
+                default:
+                    base.ProcessValue(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region ProcessCollection
+
+        internal override void ProcessCollection(SerialElement se)
+        {
+            SerialElementCollection sec = se.Sec;
+
+            switch (se.Name)
+            {
+                case "Background":
+                    sec.PutSerialData(Background);
+                    break;
+
+                case "Border":
+                    sec.PutSerialData(Border);
+                    break;
+
+                case "ExtentAverageRefLineStyle":
+                    sec.PutSerialData(ExtentAverageRefLineStyle);
+                    break;
+
+                case "ExtentMaxRefLineStyle":
+                    sec.PutSerialData(ExtentMaxRefLineStyle);
+                    break;
+
+                case "ExtentMinRefLineStyle":
+                    sec.PutSerialData(ExtentMinRefLineStyle);
+                    break;
+
+                case "ExtentOuterRefLineStyle":
+                    sec.PutSerialData(ExtentOuterRefLineStyle);
+                    break;
+
+                case "ImagePadding":
+                    sec.PutSerialData(ImagePadding);
+                    break;
+
+                case "SliceInnerLabelStyle":
+                    sec.PutSerialData(SliceInnerLabelStyle);
+                    break;
+
+                case "SliceOuterLabelStyle":
+                    sec.PutSerialData(SliceOuterLabelStyle);
+                    break;
+
+                case "SymbolDef":
+                    sec.PutSerialData(SymbolDef);
+                    break;
+
+                case "WhiteSpaceBackground":
+                    sec.PutSerialData(WhiteSpaceBackground);
+                    break;
+
+                case "WhiteSpaceBorder":
+                    sec.PutSerialData(WhiteSpaceBorder);
+                    break;
+
+                default:
+                    base.ProcessCollection(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IDisposable
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        public override void Dispose()
+        {
+            Background = null;
+            Border = null;
+
+            ExtentMaxRefLineStyle = null;
+            ExtentMinRefLineStyle = null;
+            ExtentAverageRefLineStyle = null;
+            ExtentOuterRefLineStyle = null;
+
+            ImagePadding = null;
+
+            SliceInnerLabelStyle = null;
+            SliceOuterLabelStyle = null;
+
+            SymbolDef = null;
+
+            WhiteSpaceBackground = null;
+            WhiteSpaceBorder = null;
+
+            base.Dispose();
+        }
+
+        #endregion
+    }
+
+    #region CenterLabelVisibility
+
+    /// <summary>
+    /// Defines the visibility of the CenterLabel
+    /// </summary>
+    public enum CenterLabelVisibility
+    {
+        /// <summary>
+        /// Always shown.
+        /// </summary>
+        Always,
+
+        /// <summary>
+        /// Never showm.
+        /// </summary>
+        Never,
+
+        /// <summary>
+        /// Only shown on MouseOver.
+        /// </summary>
+        MouseOver,
+    }
+
+    #endregion
+
+    #region SliceLabelCropMode
+
+    /// <summary>
+    /// Defines the label crop/clip mode.
+    /// </summary>
+    public enum SliceLabelCropMode
+    {
+        /// <summary>
+        /// NotSet
+        /// </summary>
+        NotSet = -1,
+
+        /// <summary>
+        /// No clipping or hiding performed.
+        /// </summary>
+        NoAction,
+
+        /// <summary>
+        /// Labels that do not fully fit will be clipped.
+        /// </summary>
+        Clip,
+
+        /// <summary>
+        /// Labels that do not fully fit will be hidden.
+        /// </summary>
+        Hide,
+    }
+
+    #endregion
+
+    #region SliceLabelDisplayMode
+
+    /// <summary>
+    /// Defines the slice label display mode.
+    /// </summary>
+    public enum SliceLabelDisplayMode
+    {
+        /// <summary>
+        /// NotSet
+        /// </summary>
+        NotSet = -1,
+
+        /// <summary>
+        /// No labels displayed.
+        /// </summary>
+        None,
+
+        /// <summary>
+        /// Inner labels only displayed (those inside the pie slice).
+        /// </summary>
+        Inner,
+
+        /// <summary>
+        /// Outer labels only displayed (those outside the pie slice).
+        /// </summary>
+        Outer,
+
+        /// <summary>
+        /// Both inner and outer labels displayed.
+        /// </summary>
+        InnerAndOuter,
+
+        /// <summary>
+        /// Either the inner or the outer label will be displayed, but not
+        /// both (outer label will be displayed only when the inner label
+        /// cannot be displayed).
+        /// </summary>
+        InnerXorOuter,
+    }
+
+    #endregion
+
+    #region SliceLabelOrientation
+
+    /// <summary>
+    /// Defines the slice inner label orientation.
+    /// </summary>
+    public enum SliceLabelOrientation
+    {
+        /// <summary>
+        /// NotSet
+        /// </summary>
+        NotSet = -1,
+
+        /// <summary>
+        /// The text is perpendicular to the center line of the
+        /// slice, and is 'adapted' to fit the outer arc of the slice.
+        /// </summary>
+        Adaptive,
+
+        /// <summary>
+        /// The label layout is gotten from the set 'Custom' layout
+        /// properties for the slice (include location, size, orientation, etc).
+        /// This option give the most control over the presentation of the label.
+        /// </summary>
+        Custom,
+
+        /// <summary>
+        /// Labels are presented horizontally, within the bounds of the slice.
+        /// </summary>
+        Horizontal,
+
+        /// <summary>
+        /// Labels are presented parallel to the slice center line, within
+        /// the bounds of the slice.
+        /// </summary>
+        Parallel,
+
+        /// <summary>
+        /// Labels are presented perpendicular to the slice center line, within
+        /// the bounds of the slice.
+        /// </summary>
+        Perpendicular,
+    }
+
+    #endregion
+
+    #region SliceLabelVisibility
+
+    /// <summary>
+    /// Defines the visibility of the slice labels.  These values
+    /// can be combined to define a more targeted visibility.
+    /// </summary>
+    [Flags]
+    public enum SliceLabelVisibility
+    {
+        /// <summary>
+        /// NotSet
+        /// </summary>
+        NotSet = 0,
+
+        /// <summary>
+        /// Labels are always visible.
+        /// </summary>
+        Always = (1 << 0),
+
+        /// <summary>
+        /// Labels are never visible.
+        /// </summary>
+        Never = (1 << 1),
+
+        /// <summary>
+        /// Labels will be shown according to the SelectionMode
+        /// setting in effect (ie. Ring, Slice, Pie, etc).
+        /// </summary>
+        SelectionModeMouseOver = (1 << 2),
+
+        /// <summary>
+        /// Labels are shown for Detached slices.
+        /// </summary>
+        SliceDetach = (1 << 3),
+
+        /// <summary>
+        /// Labels are shown on MouseOver.
+        /// </summary>
+        SliceMouseOver = (1 << 4),
+
+        /// <summary>
+        /// Labels are shown for selected slices.
+        /// </summary>
+        SliceSelect = (1 << 5),
+    }
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/ChartTickmarkVisualStyle.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/ChartTickmarkVisualStyle.cs
new file mode 100644
index 00000000..59394e89
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/ChartTickmarkVisualStyle.cs	
@@ -0,0 +1,300 @@
+using System.ComponentModel;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Charts.Style
+{
+    /// <summary>
+    /// Represents the visual style of a Chart Ticmark element.
+    /// </summary>
+    [TypeConverter(typeof(BlankExpandableObjectConverter))]
+    public class ChartTickmarkVisualStyle : BaseVisualStyle
+    {
+        #region Private variables
+
+        private int _TickmarkLength = -1;
+        private int _TickmarkThickness = -1;
+        private Color _TickmarkColor = Color.Empty;
+
+        private LineAlignment _TickmarkAlignment = LineAlignment.NotSet;
+
+        #endregion
+
+        #region Public properties
+
+        #region TickmarkAlignment
+
+        /// <summary>
+        /// Gets or sets the Tickmark alignment.
+        /// </summary>
+        [DefaultValue(LineAlignment.NotSet), Category("Appearance")]
+        [Description("Indicates the Tickmark alignment.")]
+        public LineAlignment TickmarkAlignment
+        {
+            get { return (_TickmarkAlignment); }
+
+            set
+            {
+                if (value != _TickmarkAlignment)
+                {
+                    _TickmarkAlignment = value;
+
+                    OnPropertyChangedEx("TickMarkAlignment", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region TickmarkColor
+
+        ///<summary>
+        /// Gets or sets the Tickmark Color.
+        ///</summary>
+        [Category("Appearance")]
+        [Description("Indicates the Tickmark Color.")]
+        public Color TickmarkColor
+        {
+            get { return (_TickmarkColor); }
+
+            set
+            {
+                if (value != _TickmarkColor)
+                {
+                    _TickmarkColor = value;
+
+                    OnPropertyChangedEx("TickmarkColor", Style.VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeTickmarkColor()
+        {
+            return (_TickmarkColor.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetTickmarkColor()
+        {
+            TickmarkColor = Color.Empty;
+        }
+
+        #endregion
+
+        #region TickmarkLength
+
+        /// <summary>
+        /// Gets or sets the Tickmark length.
+        /// </summary>
+        [DefaultValue(-1), Category("Appearance")]
+        [Description("Indicates the Tickmark length.")]
+        public int TickmarkLength
+        {
+            get { return (_TickmarkLength); }
+
+            set
+            {
+                if (value != _TickmarkLength)
+                {
+                    _TickmarkLength = value;
+
+                    OnPropertyChangedEx("TickmarkLength", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region TickmarkThickness
+
+        /// <summary>
+        /// Gets or sets the Tickmark Thickness.
+        /// </summary>
+        [DefaultValue(-1), Category("Appearance")]
+        [Description("Indicates the Tickmark Thickness.")]
+        public int TickmarkThickness
+        {
+            get { return (_TickmarkThickness); }
+
+            set
+            {
+                if (value != _TickmarkThickness)
+                {
+                    _TickmarkThickness = value;
+
+                    OnPropertyChangedEx("TickmarkThickness", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region IsEmpty
+
+        /// <summary>
+        /// Gets whether the style is logically Empty.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        [Description("Gets whether the style is logically Empty.")]
+        public override bool IsEmpty
+        {
+            get
+            {
+                return ((_TickmarkAlignment == LineAlignment.NotSet) &&
+                    (_TickmarkColor.IsEmpty == true) &&
+                    (_TickmarkLength < 0) &&
+                    (_TickmarkThickness < 0) &&
+                    (base.IsEmpty == true));
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ApplyStyle
+
+        /// <summary>
+        /// Applies the style to instance of this style.
+        /// </summary>
+        /// <param name="style">Style to apply.</param>
+        public void ApplyStyle(ChartTickmarkVisualStyle style)
+        {
+            if (style != null)
+            {
+                base.ApplyStyle(style);
+
+                if (style.TickmarkAlignment != LineAlignment.NotSet)
+                    TickmarkAlignment = style.TickmarkAlignment;
+
+                if (style.TickmarkColor.IsEmpty == false)
+                    TickmarkColor = style.TickmarkColor;
+
+                if (style.TickmarkLength >= 0)
+                    TickmarkLength = style.TickmarkLength;
+
+                if (style.TickmarkThickness >= 0)
+                    TickmarkThickness = style.TickmarkThickness;
+            }
+        }
+
+        #endregion
+
+        #region Copy
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public new ChartTickmarkVisualStyle Copy()
+        {
+            ChartTickmarkVisualStyle style = new ChartTickmarkVisualStyle();
+
+            CopyTo(style);
+
+            return (style);
+        }
+
+        #endregion
+
+        #region CopyTo
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public void CopyTo(ChartTickmarkVisualStyle style)
+        {
+            base.CopyTo(style);
+
+            style.TickmarkAlignment = _TickmarkAlignment;
+            style.TickmarkColor = _TickmarkColor;
+            style.TickmarkLength = _TickmarkLength;
+            style.TickmarkThickness = _TickmarkThickness;
+        }
+
+        #endregion
+
+        #region GetSerialData
+
+        internal override SerialElementCollection GetSerialData(string serialName)
+        {
+            SerialElementCollection sec = new SerialElementCollection();
+
+            if (serialName != null)
+            {
+                if (serialName.Equals("") == true)
+                    serialName = "ChartTickmarkVisualStyle";
+
+                sec.AddStartElement(serialName);
+            }
+
+            sec.AddValue("TickmarkAlignment", TickmarkAlignment, LineAlignment.NotSet);
+            sec.AddValue("TickmarkColor", TickmarkColor, Color.Empty);
+            sec.AddValue("TickmarkLength", TickmarkLength, -1);
+            sec.AddValue("TickmarkThickness", TickmarkThickness, -1);
+
+            sec.AddElement(base.GetSerialData(null));
+
+            if (serialName != null)
+                sec.AddEndElement(serialName);
+
+            return (sec);
+        }
+
+        #endregion
+
+        #region PutSerialData
+
+        #region ProcessValue
+
+        internal override void ProcessValue(SerialElement se)
+        {
+            switch (se.Name)
+            {
+                case "TickmarkAlignment":
+                    TickmarkAlignment = (LineAlignment)se.GetValueEnum(typeof(LineAlignment));
+                    break;
+
+                case "TickmarkColor":
+                    TickmarkColor = se.GetValueColor();
+                    break;
+
+                case "TickmarkLength":
+                    TickmarkLength = int.Parse(se.StringValue);
+                    break;
+
+                case "TickmarkThickness":
+                    TickmarkThickness = int.Parse(se.StringValue);
+                    break;
+
+                default:
+                    base.ProcessValue(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IDisposable
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        public override void Dispose()
+        {
+            base.Dispose();
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/ChartTitleVisualStyle.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/ChartTitleVisualStyle.cs
new file mode 100644
index 00000000..068b87d5
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/ChartTitleVisualStyle.cs	
@@ -0,0 +1,268 @@
+using System.ComponentModel;
+using System.Drawing;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Charts.Style
+{
+    /// <summary>
+    /// Represents the visual style of an element.
+    /// </summary>
+    [TypeConverter(typeof(VisualStylesConverter))]
+    public class ChartTitleVisualStyle : ContainerVisualStyle
+    {
+        #region Private variables
+
+        private int _MaxLineCount = -1;
+        private Tbool _Stretch = Tbool.NotSet;
+
+        #endregion
+
+        #region Public properties
+
+        #region MaxLineCount
+
+        /// <summary>
+        /// Gets or sets the maximum number of Text lines.
+        /// </summary>
+        [DefaultValue(-1), Category("Appearance")]
+        [Description("Indicates the maximum number of Text lines.")]
+        public int MaxLineCount
+        {
+            get { return (_MaxLineCount); }
+
+            set
+            {
+                if (value != _MaxLineCount)
+                {
+                    _MaxLineCount = value;
+
+                    OnPropertyChangedEx("MaxLineCount", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region Stretch
+
+        /// <summary>
+        /// Gets or sets whether text is 'stretched' to consume entire XyAlignment area.
+        /// </summary>
+        [DefaultValue(Tbool.NotSet), Category("Appearance")]
+        [Description("Indicates whether text is 'stretched' to consume entire XyAlignment area.")]
+        public Tbool Stretch
+        {
+            get { return (_Stretch); }
+
+            set
+            {
+                if (_Stretch != value)
+                {
+                    _Stretch = value;
+
+                    OnPropertyChangedEx("Stretch", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region IsEmpty
+
+        /// <summary>
+        /// Gets whether the style is logically Empty.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        [Description("Gets whether the style is logically Empty.")]
+        public override bool IsEmpty
+        {
+            get
+            {
+                return ((_MaxLineCount < 0) &&
+                    (_Stretch == Tbool.NotSet) &&
+                    (base.IsEmpty == true));
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ApplyStyle
+
+        /// <summary>
+        /// Applies the style to instance of this style.
+        /// </summary>
+        /// <param name="style">Style to apply.</param>
+        public void ApplyStyle(ChartTitleVisualStyle style)
+        {
+            if (style != null)
+            {
+                base.ApplyStyle(style);
+
+                if (style.MaxLineCount > 0)
+                    _MaxLineCount = style.MaxLineCount;
+
+                if (style.Stretch != Tbool.NotSet)
+                    _Stretch = style.Stretch;
+            }
+        }
+
+        #endregion
+
+        #region ApplyDefaults
+
+        public override void ApplyDefaults()
+        {
+            base.ApplyDefaults();
+
+            if (TextColor.IsEmpty)
+                TextColor = Color.Black;
+
+            if (MaxLineCount < 0)
+                MaxLineCount = 3;
+        }
+
+        #endregion
+
+        #region Copy
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public new ChartTitleVisualStyle Copy()
+        {
+            ChartTitleVisualStyle style = new ChartTitleVisualStyle();
+
+            CopyTo(style);
+
+            return (style);
+        }
+
+        #endregion
+
+        #region CopyTo
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public void CopyTo(ChartTitleVisualStyle style)
+        {
+            base.CopyTo(style);
+
+            style.MaxLineCount = _MaxLineCount;
+            style.Stretch = _Stretch;
+        }
+
+        #endregion
+
+        #region GetSerialData
+
+        internal override SerialElementCollection GetSerialData(string serialName)
+        {
+            SerialElementCollection sec = new SerialElementCollection();
+
+            if (serialName != null)
+            {
+                if (serialName.Equals("") == true)
+                    serialName = "ChartTitleVisualStyle";
+
+                sec.AddStartElement(serialName);
+            }
+
+            sec.AddValue("MaxLineCount", MaxLineCount, -1);
+            sec.AddValue("Stretch", Stretch, Tbool.NotSet);
+
+            sec.AddElement(base.GetSerialData(null));
+
+            if (serialName != null)
+                sec.AddEndElement(serialName);
+
+            return (sec);
+        }
+
+        #endregion
+
+        #region PutSerialData
+
+        #region ProcessValue
+
+        internal override void ProcessValue(SerialElement se)
+        {
+            switch (se.Name)
+            {
+                case "MaxLineCount":
+                    MaxLineCount = int.Parse(se.StringValue);
+                    break;
+
+                case "Stretch":
+                    Stretch = (Tbool)se.GetValueEnum(typeof(Tbool));
+                    break;
+
+                default:
+                    base.ProcessValue(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IDisposable
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        public override void Dispose()
+        {
+            base.Dispose();
+        }
+
+        #endregion
+    }
+
+    #region RotateDegrees
+
+    ///<summary>
+    /// Specifies the degrees to rotate the element.
+    ///</summary>
+    public enum RotateDegrees
+    {
+        ///<summary>
+        /// Not set
+        ///</summary>
+        NotSet = -1,
+
+        ///<summary>
+        /// None
+        ///</summary>
+        None,
+
+        ///<summary>
+        /// Rotate as needed
+        ///</summary>
+        Auto,
+
+        ///<summary>
+        /// Rotate 90 degrees
+        ///</summary>
+        Rotate90,
+
+        ///<summary>
+        /// Rotate 180 degrees
+        ///</summary>
+        Rotate180,
+
+        ///<summary>
+        /// Rotate 270 degrees
+        ///</summary>
+        Rotate270,
+    }
+
+    #endregion
+
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/ChartXyVisualStyle.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/ChartXyVisualStyle.cs
new file mode 100644
index 00000000..c9faa6e2
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/ChartXyVisualStyle.cs	
@@ -0,0 +1,398 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Charts.Style
+{
+    /// <summary>
+    /// Represents the visual style of an XY Chart element.
+    /// </summary>
+    [TypeConverter(typeof(BlankExpandableObjectConverter))]
+    public class ChartXyVisualStyle : ContainerVisualStyle
+    {
+        #region Private variables
+
+        private ScrollBarVisualStyles _HScrollBarVisualStyles;
+        private ScrollBarVisualStyles _VScrollBarVisualStyles;
+
+        private int _InterSeriesGap = -1;
+        private int _IntraSeriesGap = -1;
+
+        private Tbool _AutoExpandIntraSeriesGap = Tbool.NotSet;
+
+        #endregion
+
+        #region Public properties
+
+        #region AutoExpandIntraSeriesGap
+
+        /// <summary>
+        /// Gets or sets whether to auto adjust the IntraSeriesGap when space permits.
+        /// </summary>
+        [Description("Indicates whether to auto adjust the IntraSeriesGap when space permits.")]
+        [DefaultValue(Tbool.NotSet)]
+        public Tbool AutoExpandIntraSeriesGap
+        {
+            get { return (_AutoExpandIntraSeriesGap); }
+
+            set
+            {
+                if (value != _AutoExpandIntraSeriesGap)
+                {
+                    _AutoExpandIntraSeriesGap = value;
+
+                    OnPropertyChangedEx("AutoExpandIntraSeriesGap", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region HScrollBarVisualStyles
+
+        /// <summary>
+        /// Gets or sets the visual styles to be used for Horizontal ScrollBar elements 
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates visual styles to be used for Horizontal ScrollBar elements ")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ScrollBarVisualStyles HScrollBarVisualStyles
+        {
+            get
+            {
+                if (_HScrollBarVisualStyles == null)
+                {
+                    _HScrollBarVisualStyles = new ScrollBarVisualStyles();
+
+                    UpdateChangeHandler(null, _HScrollBarVisualStyles);
+                }
+
+                return (_HScrollBarVisualStyles);
+            }
+
+            set
+            {
+                if (_HScrollBarVisualStyles != value)
+                {
+                    ScrollBarVisualStyles oldValue = _HScrollBarVisualStyles;
+                    _HScrollBarVisualStyles = value;
+
+                    OnStyleChanged("HScrollBarVisualStyles", oldValue, value);
+                }
+            }
+        }
+
+        #endregion
+
+        #region InterSeriesGap
+
+        /// <summary>
+        /// Gets or sets the pixel gap between grouped, qualitative series.
+        /// </summary>
+        [Description("Indicates the pixel gap between grouped, qualitative series.")]
+        [DefaultValue(-1)]
+        public int InterSeriesGap
+        {
+            get { return (_InterSeriesGap); }
+
+            set
+            {
+                if (value != _InterSeriesGap)
+                {
+                    _InterSeriesGap = value;
+
+                    OnPropertyChangedEx("InterSeriesGap", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region IntraSeriesGap
+
+        /// <summary>
+        /// Gets or sets the pixel gap between each series in a set of grouped, qualitative series.
+        /// </summary>
+        [Description("Indicates the pixel gap between each series in a set of grouped, qualitative series.")]
+        [DefaultValue(-1)]
+        public int IntraSeriesGap
+        {
+            get { return (_IntraSeriesGap); }
+
+            set
+            {
+                if (value != _IntraSeriesGap)
+                {
+                    _IntraSeriesGap = value;
+
+                    OnPropertyChangedEx("IntraSeriesGap", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region VScrollBarVisualStyles
+
+        /// <summary>
+        /// Gets or sets the visual styles to be used for Vertical ScrollBar elements 
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates visual styles to be used for Vertical ScrollBar elements ")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ScrollBarVisualStyles VScrollBarVisualStyles
+        {
+            get
+            {
+                if (_VScrollBarVisualStyles == null)
+                {
+                    _VScrollBarVisualStyles = new ScrollBarVisualStyles();
+
+                    UpdateChangeHandler(null, _VScrollBarVisualStyles);
+                }
+
+                return (_VScrollBarVisualStyles);
+            }
+
+            set
+            {
+                if (_VScrollBarVisualStyles != value)
+                {
+                    ScrollBarVisualStyles oldValue = _VScrollBarVisualStyles;
+                    _VScrollBarVisualStyles = value;
+
+                    OnStyleChanged("VScrollBarVisualStyles", oldValue, value);
+                }
+            }
+        }
+
+        #endregion
+
+        #region IsEmpty
+
+        /// <summary>
+        /// Gets whether the style is logically Empty.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        [Description("Gets whether the style is logically Empty.")]
+        public override bool IsEmpty
+        {
+            get
+            {
+                return ((_InterSeriesGap < 0) &&
+                    (_IntraSeriesGap < 0) &&
+                    (_VScrollBarVisualStyles == null) &&
+                    (base.IsEmpty == true));
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ApplyStyle
+
+        /// <summary>
+        /// Applies the style to instance of this style.
+        /// </summary>
+        /// <param name="style">Style to apply.</param>
+        public void ApplyStyle(ChartXyVisualStyle style)
+        {
+            if (style != null)
+            {
+                base.ApplyStyle(style);
+
+                if (style.AutoExpandIntraSeriesGap != Tbool.NotSet)
+                    _AutoExpandIntraSeriesGap = style.AutoExpandIntraSeriesGap;
+
+                if (style.InterSeriesGap >= 0)
+                    _InterSeriesGap = style.InterSeriesGap;
+
+                if (style.IntraSeriesGap >= 0)
+                    _IntraSeriesGap = style.IntraSeriesGap;
+
+                if (style.HScrollBarVisualStyles != null)
+                {
+                    for (int i = 0; i < style.HScrollBarVisualStyles.Styles.Length; i++)
+                    {
+                        if (style.HScrollBarVisualStyles.Styles[i] != null)
+                            HScrollBarVisualStyles.GetStyle(i).ApplyStyle(style.HScrollBarVisualStyles.Styles[i]);
+                    }
+                }
+
+                if (style.VScrollBarVisualStyles != null)
+                {
+                    for (int i = 0; i < style.VScrollBarVisualStyles.Styles.Length; i++)
+                    {
+                        if (style.VScrollBarVisualStyles.Styles[i] != null)
+                            VScrollBarVisualStyles.GetStyle(i).ApplyStyle(style.VScrollBarVisualStyles.Styles[i]);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region ApplyDefaults
+
+        public override void ApplyDefaults()
+        {
+            if (BorderPattern == null)
+                BorderPattern = new BorderPattern(LinePattern.Solid);
+
+            if (InterSeriesGap < 0)
+                InterSeriesGap = 2;
+
+            if (IntraSeriesGap < 0)
+                IntraSeriesGap = 2;
+
+            if (AutoExpandIntraSeriesGap == Tbool.NotSet)
+                AutoExpandIntraSeriesGap = Tbool.True;
+
+            if (DropShadow.Enabled == Tbool.NotSet)
+                DropShadow.Enabled = Tbool.False;
+
+            base.ApplyDefaults();
+        }
+
+        #endregion
+
+        #region Copy
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public new ChartXyVisualStyle Copy()
+        {
+            ChartXyVisualStyle style = new ChartXyVisualStyle();
+
+            CopyTo(style);
+
+            return (style);
+        }
+
+        #endregion
+
+        #region CopyTo
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public void CopyTo(ChartXyVisualStyle style)
+        {
+            base.CopyTo(style);
+
+            style.AutoExpandIntraSeriesGap = _AutoExpandIntraSeriesGap;
+            style.InterSeriesGap = _InterSeriesGap;
+            style.IntraSeriesGap = _IntraSeriesGap;
+
+            style.HScrollBarVisualStyles = (_HScrollBarVisualStyles != null) ? _HScrollBarVisualStyles.Copy() : null;
+            style.VScrollBarVisualStyles = (_VScrollBarVisualStyles != null) ? _VScrollBarVisualStyles.Copy() : null;
+        }
+
+        #endregion
+
+        #region GetSerialData
+
+        internal override SerialElementCollection GetSerialData(string serialName)
+        {
+            SerialElementCollection sec = new SerialElementCollection();
+
+            if (serialName != null)
+            {
+                if (serialName.Equals("") == true)
+                    serialName = "ChartXyVisualStyle";
+
+                sec.AddStartElement(serialName);
+            }
+
+            sec.AddValue("AutoExpandIntraSeriesGap", AutoExpandIntraSeriesGap, Tbool.NotSet);
+            sec.AddValue("InterSeriesGap", InterSeriesGap, -1);
+            sec.AddValue("IntraSeriesGap", IntraSeriesGap, -1);
+
+            if (_HScrollBarVisualStyles != null && _HScrollBarVisualStyles.IsEmpty == false)
+                sec.AddElement(_HScrollBarVisualStyles.GetSerialData("HScrollBarVisualStyles"));
+
+            if (_VScrollBarVisualStyles != null && _VScrollBarVisualStyles.IsEmpty == false)
+                sec.AddElement(_VScrollBarVisualStyles.GetSerialData("VScrollBarVisualStyles"));
+
+            sec.AddElement(base.GetSerialData(null));
+
+            if (serialName != null)
+                sec.AddEndElement(serialName);
+
+            return (sec);
+        }
+
+        #endregion
+
+        #region PutSerialData
+
+        #region ProcessValue
+
+        internal override void ProcessValue(SerialElement se)
+        {
+            switch (se.Name)
+            {
+                case "AutoExpandIntraSeriesGap":
+                    AutoExpandIntraSeriesGap = (Tbool)se.GetValueEnum(typeof(Tbool));
+                    break;
+
+                case "InterSeriesGap":
+                    InterSeriesGap = int.Parse(se.StringValue);
+                    break;
+
+                case "IntraSeriesGap":
+                    IntraSeriesGap = int.Parse(se.StringValue);
+                    break;
+
+                default:
+                    base.ProcessValue(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region ProcessCollection
+
+        internal override void ProcessCollection(SerialElement se)
+        {
+            SerialElementCollection sec = se.Sec;
+
+            switch (se.Name)
+            {
+                case "HScrollBarVisualStyles":
+                    sec.PutSerialData(HScrollBarVisualStyles);
+                    break;
+
+                case "VScrollBarVisualStyles":
+                    sec.PutSerialData(HScrollBarVisualStyles);
+                    break;
+
+                default:
+                    base.ProcessCollection(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IDisposable
+
+        public override void Dispose()
+        {
+            HScrollBarVisualStyles = null;
+            VScrollBarVisualStyles = null;
+
+            base.Dispose();
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/ConnectorLineVisualStyle.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/ConnectorLineVisualStyle.cs
new file mode 100644
index 00000000..5394c66a
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/ConnectorLineVisualStyle.cs	
@@ -0,0 +1,407 @@
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+
+namespace DevComponents.DotNetBar.Charts.Style
+{
+    /// <summary>
+    /// Represents the visual style of a Chart Line
+    /// </summary>
+    [ToolboxItem(false), DesignTimeVisible(false)]
+    [TypeConverter(typeof(DefaultStyleConvertor))]
+    public class ConnectorLineVisualStyle : ChartLineVisualStyle
+    {
+        #region Private variables
+
+        private int _MaxLength = -1;
+        private int _MinLength = -1;
+        private int _LengthStep = -1;
+
+        private int _DefaultAngle = -1;
+        private int _AngleStep = -1;
+
+        private ConnectorOrigin _Origin = ConnectorOrigin.NotSet;
+
+        #endregion
+
+        #region Public properties
+
+        #region AngleStep
+
+        ///<summary>
+        /// Gets or sets the angle step value when rotating conflicting labels.
+        ///</summary>
+        [DefaultValue(-1), Category("DataLabel")]
+        [Description("Indicates the angle step value when rotating conflicting labels.")]
+        public int AngleStep
+        {
+            get { return (_AngleStep); }
+
+            set
+            {
+                if (value != _AngleStep)
+                {
+                    _AngleStep = value;
+
+                    OnPropertyChangedEx("AngleStep", Style.VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region DefaultAngle
+
+        ///<summary>
+        /// Gets or sets the default line angle (-1 denotes 'auto').
+        ///</summary>
+        [DefaultValue(-1), Category("DataLabel")]
+        [Description("Indicates the default line angle (-1 denotes 'auto').")]
+        public int DefaultAngle
+        {
+            get { return (_DefaultAngle); }
+
+            set
+            {
+                if (value != _DefaultAngle)
+                {
+                    _DefaultAngle = value;
+
+                    OnPropertyChangedEx("DefaultAngle", Style.VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region LengthStep
+
+        ///<summary>
+        /// Gets or sets the angle step value when rotating conflicting labels.
+        ///</summary>
+        [DefaultValue(-1), Category("DataLabel")]
+        [Description("Indicates the angle step value when rotating conflicting labels.")]
+        public int LengthStep
+        {
+            get { return (_LengthStep); }
+
+            set
+            {
+                if (value != _LengthStep)
+                {
+                    _LengthStep = value;
+
+                    OnPropertyChangedEx("LengthStep", Style.VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region MaxLength
+
+        ///<summary>
+        /// Gets or sets the maximum connector line length.
+        ///</summary>
+        [DefaultValue(-1), Category("DataLabel")]
+        [Description("Indicates the maximum connector line length.")]
+        public int MaxLength
+        {
+            get { return (_MaxLength); }
+
+            set
+            {
+                if (value != _MaxLength)
+                {
+                    _MaxLength = value;
+
+                    OnPropertyChangedEx("MaxLength", Style.VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region MinLength
+
+        ///<summary>
+        /// Gets or sets the minimum connector line length.
+        ///</summary>
+        [DefaultValue(-1), Category("DataLabel")]
+        [Description("Indicates the minimum connector line length.")]
+        public int MinLength
+        {
+            get { return (_MinLength); }
+
+            set
+            {
+                if (value != _MinLength)
+                {
+                    _MinLength = value;
+
+                    OnPropertyChangedEx("MinLength", Style.VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region Origin
+
+        /// <summary>
+        /// Gets or sets the line connector origin.
+        /// </summary>
+        [DefaultValue(ConnectorOrigin.NotSet)]
+        [Description("Indicates the line connector origin")]
+        public ConnectorOrigin Origin
+        {
+            get { return (_Origin); }
+
+            set
+            {
+                if (value != _Origin)
+                {
+                    _Origin = value;
+
+                    OnPropertyChangedEx("Origin", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region IsEmpty
+
+        /// <summary>
+        /// Gets whether the style is logically Empty.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        [Description("Gets whether the style is logically Empty.")]
+        public override bool IsEmpty
+        {
+            get
+            {
+                return ((_AngleStep < 0) &&
+                    (_DefaultAngle < 0) &&
+                    (_Origin == ConnectorOrigin.NotSet) &&
+                    (_LengthStep < 0) && 
+                    (_MaxLength < 0) &&
+                    (_MinLength < 0) &&
+                    (base.IsEmpty == true));
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ApplyStyle
+
+        /// <summary>
+        /// Applies the style to instance of this style.
+        /// </summary>
+        /// <param name="style">Style to apply.</param>
+        public void ApplyStyle(ConnectorLineVisualStyle style)
+        {
+            if (style != null)
+            {
+                base.ApplyStyle(style);
+
+                if (style.AngleStep >= 0)
+                    _AngleStep = style.AngleStep;
+
+                if (style.DefaultAngle >= 0)
+                    _DefaultAngle = style.DefaultAngle;
+
+                if (style.LengthStep >= 0)
+                    _LengthStep = style.LengthStep;
+
+                if (style.MaxLength >= 0)
+                    _MaxLength = style.MaxLength;
+
+                if (style.MinLength >= 0)
+                    _MinLength = style.MinLength;
+
+                if (style.Origin != ConnectorOrigin.NotSet)
+                    _Origin = style.Origin;
+            }
+        }
+
+        #endregion
+
+        #region ApplyDefaults
+
+        public override void ApplyDefaults()
+        {
+            if (MinLength > MaxLength)
+                MaxLength = MinLength;
+
+            if (MinLength < 0)
+                MinLength = 10;
+
+            if (MaxLength < 0)
+                MaxLength = 200;
+
+            if (MaxLength <= MinLength)
+                MaxLength = MinLength + 200;
+
+            if (AngleStep < 0)
+                AngleStep = 15;
+
+            if (LengthStep < 0)
+                LengthStep = 10;
+
+            if (LinePattern == LinePattern.NotSet)
+                LinePattern = LinePattern.Solid;
+
+            if (LineColor.IsEmpty == true)
+                LineColor = Color.Black;
+
+            if (LineWidth < 0)
+                LineWidth = 1;
+
+            base.ApplyDefaults();
+        }
+
+        #endregion
+
+        #region Copy
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public new ConnectorLineVisualStyle Copy()
+        {
+            ConnectorLineVisualStyle style = new ConnectorLineVisualStyle();
+
+            CopyTo(style);
+
+            return (style);
+        }
+
+        #endregion
+
+        #region CopyTo
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public void CopyTo(ConnectorLineVisualStyle style)
+        {
+            base.CopyTo(style);
+
+            style.AngleStep = _AngleStep;
+            style.DefaultAngle = _DefaultAngle;
+
+            style.LengthStep = _LengthStep;
+            style.MaxLength = _MaxLength;
+            style.MinLength = _MinLength;
+
+            style.Origin = _Origin;
+        }
+
+        #endregion
+
+        #region GetSerialData
+
+        internal override SerialElementCollection GetSerialData(string serialName)
+        {
+            SerialElementCollection sec = new SerialElementCollection();
+
+            if (serialName != null)
+            {
+                if (serialName.Equals("") == true)
+                    serialName = "ConnectorLineVisualStyle";
+
+                sec.AddStartElement(serialName);
+            }
+
+            sec.AddValue("AngleStep", AngleStep, -1);
+            sec.AddValue("DefaultAngle", DefaultAngle, -1);
+
+            sec.AddValue("LengthStep", LengthStep, -1);
+            sec.AddValue("MaxLength", MaxLength, -1);
+            sec.AddValue("MinLength", MinLength, -1);
+
+            sec.AddElement(base.GetSerialData(null));
+
+            if (serialName != null)
+                sec.AddEndElement(serialName);
+
+            return (sec);
+        }
+
+        #endregion
+
+        #region PutSerialData
+
+        #region ProcessValue
+
+        internal override void ProcessValue(SerialElement se)
+        {
+            switch (se.Name)
+            {
+                case "AngleStep":
+                    AngleStep = int.Parse(se.StringValue);
+                    break;
+
+                case "DefaultAngle":
+                    DefaultAngle = int.Parse(se.StringValue);
+                    break;
+
+                case "LengthStep":
+                    LengthStep = int.Parse(se.StringValue);
+                    break;
+
+                case "MaxLength":
+                    MaxLength = int.Parse(se.StringValue);
+                    break;
+
+                case "MinLength":
+                    MinLength = int.Parse(se.StringValue);
+                    break;
+
+                default:
+                    base.ProcessValue(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IDisposable
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        public override void Dispose()
+        {
+            base.Dispose();
+        }
+
+        #endregion
+    }
+
+    #region Enums
+
+    #region ConnectorOrigin
+
+    public enum ConnectorOrigin
+    {
+        NotSet = -1,
+
+        Center,
+
+        Edge,
+    }
+
+    #endregion
+
+    #endregion
+
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/ContainerVisualStyle.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/ContainerVisualStyle.cs
new file mode 100644
index 00000000..bd45f0d5
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/ContainerVisualStyle.cs	
@@ -0,0 +1,1402 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Drawing.Drawing2D;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Charts.Style
+{
+    ///<summary>
+    /// ContainerVisualStyles
+    ///</summary>
+    [TypeConverter(typeof(VisualStylesConverter))]
+    public class ContainerVisualStyles : VisualStyles<ContainerVisualStyle>
+    {
+        #region Copy
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public ContainerVisualStyles Copy()
+        {
+            ContainerVisualStyles styles = new ContainerVisualStyles();
+
+            for (int i = 0; i < Styles.Length; i++)
+            {
+                ContainerVisualStyle vstyle = Styles[i];
+
+                if (vstyle != null)
+                    styles.Styles[i] = vstyle.Copy();
+            }
+
+            return (styles);
+        }
+
+        #endregion
+    }
+
+    /// <summary>
+    /// Represents the visual style of a container item.
+    /// </summary>
+    [ToolboxItem(false), DesignTimeVisible(false)]
+    [TypeConverter(typeof(BlankExpandableObjectConverter))]
+    public class ContainerVisualStyle : VisualStyle
+    {
+        #region Private variables
+
+        private Tbool _AllowWrap = Tbool.NotSet;
+        private Alignment _Alignment = Alignment.NotSet;
+
+        private Image _Image;
+        private int _ImageIndex = -1;
+        private ImageList _ImageList;
+
+        private Padding _ImagePadding;
+
+        private Alignment _ImageAlignment = Alignment.NotSet;
+        private ImageOverlay _ImageOverlay = ImageOverlay.NotSet;
+        private ImageSizeMode _ImageSizeMode = ImageSizeMode.NotSet;
+
+        private Tbool _EnableImageScroll = Tbool.NotSet;
+
+        private DropShadowVisualStyle _DropShadow;
+
+        private SymbolDef _SymbolDef;
+
+        #endregion
+
+        #region Public properties
+
+        #region Alignment
+
+        /// <summary>
+        /// Gets or sets the alignment of the text
+        /// </summary>
+        [DefaultValue(Alignment.NotSet), Category("Appearance")]
+        [Description("Indicates the alignment of the text.")]
+        public Alignment Alignment
+        {
+            get { return (_Alignment); }
+
+            set
+            {
+                if (_Alignment != value)
+                {
+                    _Alignment = value;
+
+                    OnPropertyChangedEx("Alignment", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region AllowWrap
+
+        /// <summary>
+        /// Gets or sets whether text wrapping is permitted
+        /// </summary>
+        [DefaultValue(Tbool.NotSet), Category("Appearance")]
+        [Description("Indicates whether text wrapping is permitted.")]
+        public Tbool AllowWrap
+        {
+            get { return (_AllowWrap); }
+
+            set
+            {
+                if (_AllowWrap != value)
+                {
+                    _AllowWrap = value;
+
+                    OnPropertyChangedEx("AllowWrap", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region DropShadow
+
+        /// <summary>
+        /// Gets or sets the visual style for the DropShadow.
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates the visual style for the DropShadow.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public DropShadowVisualStyle DropShadow
+        {
+            get
+            {
+                if (_DropShadow == null)
+                {
+                    _DropShadow = new DropShadowVisualStyle();
+
+                    UpdateChangeHandler(null, _DropShadow);
+                }
+
+                return (_DropShadow);
+            }
+
+            set
+            {
+                if (_DropShadow != value)
+                {
+                    DropShadowVisualStyle oldValue = _DropShadow;
+
+                    _DropShadow = value;
+
+                    OnStyleChanged("DropShadow", oldValue, value);
+
+                    if (oldValue != null)
+                        oldValue.Dispose();
+                }
+            }
+        }
+
+        #endregion
+
+        #region EnableImageScroll
+
+        /// <summary>
+        /// Gets or sets whether the image scrolls or is fixed with the container content.
+        /// </summary>
+        [DefaultValue(Tbool.NotSet)]
+        [Category("Appearance"), Description("Indicates whether the image scrolls or is fixed with the container content.")]
+        public Tbool EnableImageScroll
+        {
+            get { return (_EnableImageScroll); }
+
+            set
+            {
+                if (value != _EnableImageScroll)
+                {
+                    _EnableImageScroll = value;
+
+                    OnPropertyChangedEx("EnableImageScroll", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region Image
+
+        /// <summary>
+        /// Gets or sets the element Image
+        /// </summary>
+        [DefaultValue(null), Category("Appearance")]
+        [Description("Indicates the element image")]
+        public Image Image
+        {
+            get { return (_Image); }
+
+            set
+            {
+                if (_Image != value)
+                {
+                    _Image = value;
+
+                    OnPropertyChangedEx("Image", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ImageAlignment
+
+        /// <summary>
+        /// Gets or sets the alignment of the Image
+        /// </summary>
+        [DefaultValue(Alignment.NotSet), Category("Appearance")]
+        [Description("Indicates the alignment of the Image.")]
+        public Alignment ImageAlignment
+        {
+            get { return (_ImageAlignment); }
+
+            set
+            {
+                if (_ImageAlignment != value)
+                {
+                    _ImageAlignment = value;
+
+                    OnPropertyChangedEx("ImageAlignment", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ImageIndex
+
+        /// <summary>
+        /// Gets or sets the image index
+        /// </summary>
+        [DefaultValue(-1)]
+        [Category("Appearance"), Description("Indicates the image index")]
+        [Editor("DevComponents.SuperGrid.Design.ImageIndexEditor, DevComponents.SuperGrid.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(UITypeEditor))]
+        [TypeConverter(typeof(ImageIndexConverter))]
+        public int ImageIndex
+        {
+            get { return (_ImageIndex); }
+
+            set
+            {
+                if (_ImageIndex != value)
+                {
+                    _ImageIndex = value;
+
+                    OnPropertyChangedEx("ImageIndex", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ImageList
+
+        /// <summary>
+        /// Gets or sets the ImageList.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), DefaultValue(null)]
+        [Description("Indicates the ImageList.")]
+        public ImageList ImageList
+        {
+            get { return (_ImageList); }
+
+            set
+            {
+                if (_ImageList != value)
+                {
+                    _ImageList = value;
+
+                    OnPropertyChangedEx("ImageList", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ImageOverlay
+
+        /// <summary>
+        /// Gets or sets how to overlay the cell image with respect to cell content
+        /// </summary>
+        [DefaultValue(ImageOverlay.NotSet), Category("Appearance")]
+        [Description("Indicates how to overlay the cell image with respect to cell content.")]
+        public ImageOverlay ImageOverlay
+        {
+            get { return (_ImageOverlay); }
+
+            set
+            {
+                if (_ImageOverlay != value)
+                {
+                    _ImageOverlay = value;
+
+                    OnPropertyChangedEx("ImageOverlay", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ImagePadding
+
+        /// <summary>
+        /// Gets or sets the spacing between content and edges of the Image
+        /// </summary>
+        [Description("Indicates the spacing between content and edges of the Image")]
+        public Padding ImagePadding
+        {
+            get
+            {
+                if (_ImagePadding == null)
+                {
+                    _ImagePadding = Padding.Empty;
+
+                    UpdateChangeHandler(null, _ImagePadding);
+                }
+
+                return (_ImagePadding);
+            }
+
+            set
+            {
+                if (_ImagePadding != value)
+                {
+                    UpdateChangeHandler(_ImagePadding, value);
+
+                    _ImagePadding = value;
+
+                    OnPropertyChangedEx("ImagePadding", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeImagePadding()
+        {
+            return (_ImagePadding != null && _ImagePadding.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetImagePadding()
+        {
+            ImagePadding = null;
+        }
+
+        #endregion
+
+        #region ImageSizeMode
+
+        /// <summary>
+        /// Gets or sets the 'mode' used to display the image.
+        /// </summary>
+        [DefaultValue(ImageSizeMode.NotSet), Category("Appearance")]
+        [Description("Indicates the 'mode' used to display the image.")]
+        public ImageSizeMode ImageSizeMode
+        {
+            get { return (_ImageSizeMode); }
+
+            set
+            {
+                if (value!= _ImageSizeMode)
+                {
+                    _ImageSizeMode = value;
+
+                    OnPropertyChangedEx("ImageSizeMode", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region SymbolDef
+
+        /// <summary>
+        /// Gets or sets the element Symbol Definition. Note that Symbol definition
+        /// takes precedence over Image definition. Also note that the supporting Image
+        /// properties (such as ImageAlignment, ImageOverlay, etc) apply to a set
+        /// Symbol as well as to a set Image.
+        /// </summary>
+        [DefaultValue(null), Category("Appearance")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        [Description("Indicates the element Symbol Definition. Note that Symbol definition takes precedence over Image definition. Also note that the supporting Image properties (such as ImageAlignment, ImageOverlay, etc) apply to a set Symbol as well as to a set Image.")]
+        public SymbolDef SymbolDef
+        {
+            get
+            {
+                if (_SymbolDef == null)
+                {
+                    _SymbolDef = new SymbolDef();
+
+                    UpdateChangeHandler(null, _SymbolDef);
+                }
+
+                return (_SymbolDef);
+            }
+
+            set
+            {
+                if (_SymbolDef != value)
+                {
+                    UpdateChangeHandler(_SymbolDef, value);
+
+                    _SymbolDef = value;
+
+                    OnPropertyChangedEx("SymbolDef", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeSymbolDef()
+        {
+            return (_SymbolDef != null && _SymbolDef.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetSymbolDef()
+        {
+            SymbolDef = null;
+        }
+
+        #endregion
+
+        #region IsEmpty
+
+        /// <summary>
+        /// Gets whether the style is logically Empty.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        [Description("Gets whether the style is logically Empty.")]
+        public override bool IsEmpty
+        {
+            get
+            {
+                return ((_Alignment == Alignment.NotSet) &&
+                    (_AllowWrap == Tbool.NotSet) &&
+                    (_DropShadow == null || _DropShadow.IsEmpty) &&
+                    (_Image == null) &&
+                    (_ImageAlignment == Alignment.NotSet) &&
+                    (_ImageIndex == -1) &&
+                    (_ImageList == null) &&
+                    (_ImageOverlay == ImageOverlay.NotSet) &&
+                    (_ImagePadding == null || _ImagePadding.IsEmpty == true) &&
+                    (_ImageSizeMode == Style.ImageSizeMode.NotSet) &&
+                    (_SymbolDef == null || _SymbolDef.IsEmpty == true) &&
+                    (base.IsEmpty == true));
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region IsOverlayImage
+
+        internal bool IsOverlayImage
+        {
+            get
+            {
+                return (_ImageOverlay == ImageOverlay.Top ||
+                    _ImageOverlay == ImageOverlay.Middle ||
+                    _ImageOverlay == ImageOverlay.Bottom);
+            }
+        }
+
+        #endregion
+
+        #region IsValidFigure
+
+        internal bool IsValidFigure
+        {
+            get
+            {
+                if (IsSymbolFigure == true)
+                    return (true);
+
+                return (GetImage() != null);
+            }
+        }
+
+        #endregion
+
+        #region IsSymbolFigure
+
+        internal bool IsSymbolFigure
+        {
+            get { return (_SymbolDef != null &&  _SymbolDef.IsValidSymbol == true); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetFigure
+
+        internal object GetFigure()
+        {
+            if (_SymbolDef != null && _SymbolDef.IsEmpty == false)
+                return (_SymbolDef);
+
+            return (GetImage());
+        }
+
+        #region GetImage
+
+        internal Image GetImage()
+        {
+            if (_Image != null)
+                return (_Image);
+
+            if (_ImageIndex >= 0)
+            {
+                ImageList imageList = ImageList;
+
+                if (imageList != null && _ImageIndex < imageList.Images.Count)
+                    return (imageList.Images[_ImageIndex]);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetSymbol
+
+        internal string GetSymbol()
+        {
+            if (_SymbolDef != null && _SymbolDef.IsEmpty == false)
+                return (_SymbolDef.SymbolRealized);
+
+            return (null);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetFigureSize
+
+        internal Size GetFigureSize(Graphics g)
+        {
+            Size size = Size.Empty;
+
+            if (IsSymbolFigure == true)
+                size = _SymbolDef.GetSymbolSize(g);
+
+            else
+            {
+                Image image = GetImage();
+
+                if (image != null)
+                    size = Dpi.Size(image.Size);
+            }
+
+            if (size.IsEmpty == false)
+            {
+                size.Width += Dpi.Width(ImagePadding.Horizontal);
+                size.Height += Dpi.Height(ImagePadding.Vertical);
+            }
+
+            return (size);
+        }
+
+        #endregion
+
+        #region GetFigureBounds
+
+        internal Rectangle GetFigureBounds(Graphics g, Rectangle r)
+        {
+            if (IsSymbolFigure == true)
+                return (GetSymbolBounds(g, r));
+
+            return (GetImageBounds(g, r));
+        }
+
+        #region GetImageBounds
+
+        internal Rectangle GetImageBounds(Graphics g, Rectangle r)
+        {
+            Image image = GetImage();
+
+            return (GetImageBounds(g, r, image));
+        }
+
+        private Rectangle GetImageBounds(Graphics g, Rectangle r, Image image)
+        {
+            if (image != null)
+                return (GetSizeBounds(r, Dpi.Size(image.Size)));
+
+            return (Rectangle.Empty);
+        }
+
+        #endregion
+
+        #region GetSymbolBounds
+
+        internal Rectangle GetSymbolBounds(Graphics g, Rectangle r)
+        {
+            if (_SymbolDef != null && _SymbolDef.IsEmpty == false)
+            {
+                Size size = _SymbolDef.GetSymbolSize(g);
+
+                return (GetSizeBounds(r, size));
+            }
+
+            return (Rectangle.Empty);
+        }
+
+        #endregion
+
+        #region GetSizeBounds
+
+        internal Rectangle GetSizeBounds(Rectangle r, Size size)
+        {
+            switch (ImageAlignment)
+            {
+                case Alignment.NotSet:
+                case Alignment.MiddleLeft:
+                    r.Y += (r.Height - size.Height) / 2;
+
+                    r.X += Dpi.Width(ImagePadding.Left);
+                    r.Y += Dpi.Height(ImagePadding.Top - ImagePadding.Bottom);
+                    break;
+
+                case Alignment.TopLeft:
+                    r.X += Dpi.Width(ImagePadding.Left);
+                    r.Y += Dpi.Height(ImagePadding.Top);
+                    break;
+
+                case Alignment.BottomLeft:
+                    r.Y = r.Bottom - size.Height;
+
+                    r.X += Dpi.Width(ImagePadding.Left);
+                    r.Y -= Dpi.Height(ImagePadding.Bottom);
+                    break;
+
+                case Alignment.TopCenter:
+                    r.X += (r.Width - size.Width) / 2;
+
+                    r.X += Dpi.Width(ImagePadding.Left - ImagePadding.Right);
+                    r.Y += Dpi.Height(ImagePadding.Top);
+                    break;
+
+                case Alignment.MiddleCenter:
+                    r.X += (r.Width - size.Width) / 2;
+                    r.Y += (r.Height - size.Height) / 2;
+
+                    r.X += Dpi.Width(ImagePadding.Left - ImagePadding.Right);
+                    r.Y += Dpi.Height(ImagePadding.Top - ImagePadding.Bottom);
+                    break;
+
+                case Alignment.BottomCenter:
+                    r.X += (r.Width - size.Width) / 2;
+                    r.Y = r.Bottom - size.Height;
+
+                    r.X += Dpi.Width(ImagePadding.Left - ImagePadding.Right);
+                    r.Y -= Dpi.Height(ImagePadding.Bottom);
+                    break;
+
+                case Alignment.TopRight:
+                    r.X = r.Right - size.Width;
+
+                    r.X -= Dpi.Width(ImagePadding.Right);
+                    r.Y += Dpi.Height(ImagePadding.Top);
+                    break;
+
+                case Alignment.MiddleRight:
+                    r.X = r.Right - size.Width;
+                    r.Y += (r.Height - size.Height) / 2;
+
+                    r.X -= Dpi.Width(ImagePadding.Right);
+                    r.Y += Dpi.Height(ImagePadding.Top - ImagePadding.Bottom);
+                    break;
+
+                case Alignment.BottomRight:
+                    r.X = r.Right - size.Width;
+                    r.Y = r.Bottom - size.Height;
+
+                    r.X -= Dpi.Width(ImagePadding.Right);
+                    r.Y -= Dpi.Height(ImagePadding.Bottom);
+                    break;
+            }
+
+            r.Size = size;
+
+            return (r);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderBackgroundFigure
+
+        internal void RenderBackgroundFigure(Graphics g, Rectangle bounds)
+        {
+            RenderBackgroundFigure(g, bounds, bounds);
+        }
+
+        internal void RenderBackgroundFigure(Graphics g, Rectangle bounds, Rectangle clipBounds)
+        {
+            if (IsSymbolFigure == true)
+            {
+                RenderBackgroundSymbol(g, bounds, clipBounds);
+            }
+            else
+            {
+                Image image = GetImage();
+
+                if (image != null)
+                    RenderBackgroundImage(g, bounds, clipBounds);
+            }
+        }
+
+        #region RenderBackgroundImage
+
+        internal void RenderBackgroundImage(Graphics g, Rectangle bounds, Rectangle clipBounds)
+        {
+            Image image = GetImage();
+
+            if (image != null)
+            {
+                Region clip = g.Clip;
+
+                if (ImageSizeMode == ImageSizeMode.NotSet ||
+                    ImageSizeMode == ImageSizeMode.Normal)
+                {
+                    Rectangle dbounds = GetImageBounds(g, clipBounds, image);
+
+                    g.SetClip(Rectangle.Intersect(bounds, dbounds));
+
+                    g.DrawImage(image, dbounds,
+                        new Rectangle(Point.Empty, image.Size), GraphicsUnit.Pixel);
+                }
+                else
+                {
+                    Rectangle r = GetAdjustedBounds(clipBounds, ImagePadding);
+
+                    g.SetClip(r, CombineMode.Intersect);
+
+                    switch (ImageSizeMode)
+                    {
+                        case ImageSizeMode.Stretch:
+                            g.DrawImage(image, r);
+                            break;
+
+                        case ImageSizeMode.Tile:
+                            RenderImageTiled(g, image, r);
+                            break;
+
+                        case ImageSizeMode.Zoom:
+                            RenderImageZoomed(g, image, r);
+                            break;
+                    }
+                }
+
+                g.Clip = clip;
+            }
+        }
+
+        #region GetAdjustedBounds
+
+        private Rectangle GetAdjustedBounds(Rectangle bounds, Thickness padding)
+        {
+            if (padding.IsEmpty == false)
+            {
+                if (bounds.Height > padding.Vertical)
+                {
+                    bounds.Y += padding.Top;
+                    bounds.Height -= padding.Vertical;
+                }
+
+                if (bounds.Width > padding.Horizontal)
+                {
+                    bounds.X += padding.Left;
+                    bounds.Width -= padding.Horizontal;
+                }
+            }
+
+            return (bounds);
+        }
+
+        #endregion
+
+        #region RenderImageTiled
+
+        private void RenderImageTiled(Graphics g, Image image, Rectangle bounds)
+        {
+            Rectangle sr = new Rectangle(Point.Empty, image.Size);
+            Rectangle dr = new Rectangle(bounds.Location, image.Size);
+
+            while (dr.Top < bounds.Bottom)
+            {
+                while (dr.Left < bounds.Right)
+                {
+                    g.DrawImage(image, dr, sr, GraphicsUnit.Pixel);
+
+                    dr.X += image.Size.Width;
+                }
+
+                dr.X = bounds.X;
+                dr.Y += image.Size.Height;
+            }
+        }
+
+        #endregion
+
+        #region RenderImageZoomed
+
+        private void RenderImageZoomed(
+            Graphics g, Image image, Rectangle r)
+        {
+            SizeF size = new SizeF(image.Width / image.HorizontalResolution,
+                image.Height / image.VerticalResolution);
+
+            float scale = Math.Min(r.Width / size.Width, r.Height / size.Height);
+
+            size.Width *= scale;
+            size.Height *= scale;
+
+            Point pt = r.Location;
+
+            if (Math.Abs(r.Width - size.Width) > 2)
+            {
+                switch (ImageAlignment)
+                {
+                    case Alignment.TopCenter:
+                    case Alignment.MiddleCenter:
+                    case Alignment.BottomCenter:
+                        pt.X += (int)((r.Width - size.Width) / 2);
+                        break;
+
+                    case Alignment.TopRight:
+                    case Alignment.MiddleRight:
+                    case Alignment.BottomRight:
+                        pt.X = (int)(r.Right - size.Width);
+                        break;
+                }
+            }
+            else
+            {
+                switch (ImageAlignment)
+                {
+                    case Alignment.MiddleLeft:
+                    case Alignment.MiddleCenter:
+                    case Alignment.MiddleRight:
+                        pt.Y += (int)((r.Height - size.Height) / 2);
+                        break;
+
+                    case Alignment.BottomLeft:
+                    case Alignment.BottomCenter:
+                    case Alignment.BottomRight:
+                        pt.Y = (int)(r.Bottom - size.Height);
+                        break;
+                }
+            }
+
+            g.DrawImage(image,
+                pt.X, pt.Y, size.Width, size.Height);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderBackgroundSymbol
+
+        internal void RenderBackgroundSymbol(Graphics g, Rectangle bounds, Rectangle clipBounds)
+        {
+            string symbol = GetSymbol();
+
+            if (symbol != null)
+            {
+                Region clip = g.Clip;
+
+                if (ImageSizeMode != ImageSizeMode.Tile)
+                {
+                    Rectangle dbounds = GetSymbolBounds(g, clipBounds);
+
+                    g.SetClip(Rectangle.Intersect(bounds, dbounds));
+
+                    using (Brush br = new SolidBrush(_SymbolDef.SymbolColor))
+                        g.DrawString(symbol, _SymbolDef.SymbolFont, br, dbounds);
+                }
+                else
+                {
+                    Rectangle r = GetAdjustedBounds(clipBounds, ImagePadding);
+
+                    g.SetClip(r, CombineMode.Intersect);
+
+                    RenderSymbolTiled(g, symbol, r);
+                }
+
+                g.Clip = clip;
+            }
+        }
+
+        #region RenderSymbolTiled
+
+        private void RenderSymbolTiled(Graphics g, string symbol, Rectangle bounds)
+        {
+            Font font = _SymbolDef.SymbolFont;
+            Color color = _SymbolDef.SymbolColor;
+
+            Size size = _SymbolDef.GetSymbolSize(g);
+            Rectangle dr = new Rectangle(bounds.Location, size);
+
+            while (dr.Top < bounds.Bottom)
+            {
+                while (dr.Left < bounds.Right)
+                {
+                    TextDrawing.DrawString(g, symbol, font, color, dr, eTextFormat.Default);
+
+                    dr.X += size.Width;
+                }
+
+                dr.X = bounds.X;
+                dr.Y += size.Height;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region GetStringFormatFlags
+
+        internal void GetStringFormatFlags(StringFormat sf)
+        {
+            if (AllowWrap == Tbool.False)
+                sf.FormatFlags |= StringFormatFlags.NoWrap;
+
+            switch (Alignment)
+            {
+                case Alignment.TopCenter:
+                    sf.LineAlignment = StringAlignment.Near;
+                    sf.Alignment = StringAlignment.Center;
+                    break;
+
+                case Alignment.TopRight:
+                    sf.LineAlignment = StringAlignment.Near;
+                    sf.Alignment = StringAlignment.Far;
+                    break;
+
+                case Alignment.MiddleLeft:
+                    sf.LineAlignment = StringAlignment.Center;
+                    sf.Alignment = StringAlignment.Near;
+                    break;
+
+                case Alignment.MiddleCenter:
+                    sf.LineAlignment = StringAlignment.Center;
+                    sf.Alignment = StringAlignment.Center;
+                    break;
+
+                case Alignment.MiddleRight:
+                    sf.LineAlignment = StringAlignment.Center;
+                    sf.Alignment = StringAlignment.Far;
+                    break;
+
+                case Alignment.BottomLeft:
+                    sf.LineAlignment = StringAlignment.Far;
+                    sf.Alignment = StringAlignment.Near;
+                    break;
+
+                case Alignment.BottomCenter:
+                    sf.LineAlignment = StringAlignment.Far;
+                    sf.Alignment = StringAlignment.Center;
+                    break;
+
+                case Alignment.BottomRight:
+                    sf.LineAlignment = StringAlignment.Far;
+                    sf.Alignment = StringAlignment.Far;
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region GetTextFormatFlags
+
+        internal eTextFormat GetTextFormatFlags()
+        {
+            eTextFormat tf = eTextFormat.WordEllipsis |
+                eTextFormat.NoPadding | eTextFormat.NoPrefix;
+
+            if (AllowWrap == Tbool.True)
+                tf |= eTextFormat.WordBreak;
+
+            switch (Alignment)
+            {
+                case Alignment.TopCenter:
+                    tf |= eTextFormat.HorizontalCenter;
+                    break;
+
+                case Alignment.TopRight:
+                    tf |= eTextFormat.Right;
+                    break;
+
+                case Alignment.MiddleLeft:
+                    tf |= eTextFormat.VerticalCenter;
+                    break;
+
+                case Alignment.NotSet:
+                case Alignment.MiddleCenter:
+                    tf |= eTextFormat.HorizontalCenter;
+                    tf |= eTextFormat.VerticalCenter;
+                    break;
+
+                case Alignment.MiddleRight:
+                    tf |= eTextFormat.Right;
+                    tf |= eTextFormat.VerticalCenter;
+                    break;
+
+                case Alignment.BottomLeft:
+                    tf |= eTextFormat.Bottom;
+                    break;
+
+                case Alignment.BottomCenter:
+                    tf |= eTextFormat.Bottom;
+                    tf |= eTextFormat.HorizontalCenter;
+                    break;
+
+                case Alignment.BottomRight:
+                    tf |= eTextFormat.Bottom;
+                    tf |= eTextFormat.Right;
+                    break;
+            }
+
+            return (tf);
+        }
+
+        #endregion
+
+        #region ApplyStyle
+
+        /// <summary>
+        /// Applies the style to instance of this style.
+        /// </summary>
+        /// <param name="style">Style to apply.</param>
+        public void ApplyStyle(ContainerVisualStyle style)
+        {
+            base.ApplyStyle(style);
+
+            if (style != null)
+            {
+                if (style.Alignment != Alignment.NotSet)
+                    Alignment = style.Alignment;
+
+                if (style.AllowWrap != Tbool.NotSet)
+                    AllowWrap = style.AllowWrap;
+
+                if (style._DropShadow != null && style.DropShadow.IsEmpty == false)
+                    DropShadow.ApplyStyle(style.DropShadow);
+
+                if (style.EnableImageScroll != Tbool.NotSet)
+                    EnableImageScroll = style.EnableImageScroll;
+
+                if (style.ImageIndex >= 0)
+                {
+                    Image = null;
+                    ImageIndex = style.ImageIndex;
+                }
+
+                if (style.Image != null)
+                {
+                    Image = style.Image;
+                    ImageIndex = -1;
+                }
+
+                if (style.ImageAlignment != Alignment.NotSet)
+                    ImageAlignment = style.ImageAlignment;
+
+                if (style.ImageList != null)
+                    ImageList = style.ImageList;
+
+                if (style._ImagePadding != null && style._ImagePadding.IsEmpty == false)
+                    ImagePadding = style._ImagePadding.Copy();
+
+                if (style.ImageOverlay != ImageOverlay.NotSet)
+                    ImageOverlay = style.ImageOverlay;
+
+                if (style.ImageSizeMode != ImageSizeMode.NotSet)
+                    ImageSizeMode = style.ImageSizeMode;
+
+                if (style._SymbolDef != null && style._SymbolDef.IsEmpty == false)
+                    SymbolDef = style._SymbolDef.Copy();
+            }
+        }
+
+        #endregion
+
+        #region ApplyDefaults
+
+        public override void ApplyDefaults()
+        {
+            base.ApplyDefaults();
+
+            if (_SymbolDef != null && _SymbolDef.IsValidSymbol == true)
+            {
+                if (_SymbolDef.SymbolSize == 0)
+                {
+                    if (Font != null)
+                        _SymbolDef.SymbolSize = Font.SizeInPoints;
+                }
+
+                if (_SymbolDef.SymbolColor.IsEmpty == true)
+                {
+                    _SymbolDef.SymbolColor = 
+                        (TextColor.IsEmpty == false) ? TextColor : Color.Black;
+                }
+            }
+        }
+
+        #endregion
+
+        #region Copy
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public new ContainerVisualStyle Copy()
+        {
+            ContainerVisualStyle style = new ContainerVisualStyle();
+
+            CopyTo(style);
+
+            return (style);
+        }
+
+        #endregion
+
+        #region CopyTo
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public void CopyTo(ContainerVisualStyle style)
+        {
+            base.CopyTo(style);
+
+            style.Alignment = _Alignment;
+            style.AllowWrap = _AllowWrap;
+            style.DropShadow = (_DropShadow != null) ? DropShadow.Copy() : null;
+            style.EnableImageScroll = _EnableImageScroll;
+
+            style.Image = _Image;
+            style.ImageAlignment = _ImageAlignment;
+            style.ImageIndex = _ImageIndex;
+            style.ImageList = _ImageList;
+            style.ImageOverlay = _ImageOverlay;
+            style.ImagePadding = (_ImagePadding != null) ? _ImagePadding.Copy() : null;
+            style.ImageSizeMode = _ImageSizeMode;
+
+            style.SymbolDef = (_SymbolDef != null) ? _SymbolDef.Copy() : null;
+        }
+
+        #endregion
+
+        #region GetSerialData
+
+        internal override SerialElementCollection GetSerialData(string serialName)
+        {
+            SerialElementCollection sec = new SerialElementCollection();
+
+            if (serialName != null)
+            {
+                if (serialName.Equals("") == true)
+                    serialName = "ContainerVisualStyle";
+
+                sec.AddStartElement(serialName);
+            }
+
+            sec.AddValue("Alignment", Alignment, Alignment.NotSet);
+            sec.AddValue("AllowWrap", AllowWrap, Tbool.NotSet);
+
+            if (_DropShadow != null && _DropShadow.IsEmpty == false)
+                sec.AddElement(_DropShadow.GetSerialData("DropShadow"));
+
+            sec.AddValue("EnableImageScroll", EnableImageScroll, Tbool.NotSet);
+            sec.AddValue("Image", Image);
+            sec.AddValue("ImageAlignment", ImageAlignment, Alignment.NotSet);
+            sec.AddValue("ImageIndex", ImageIndex, -1);
+
+            if (_ImageList != null)
+                sec.AddValue("ImageList", XmlSerializableImageList.ConvertToString(ImageList));
+
+            sec.AddValue("ImageOverlay", ImageOverlay, ImageOverlay.NotSet);
+
+            if (_ImagePadding != null && _ImagePadding.IsEmpty == false)
+                sec.AddElement(_ImagePadding.GetSerialData("ImagePadding"));
+
+            sec.AddValue("ImageSizeMode", ImageSizeMode, ImageSizeMode.NotSet);
+
+            if (_SymbolDef != null && _SymbolDef.IsEmpty == false)
+                sec.AddElement(_SymbolDef.GetSerialData("SymbolDef"));
+
+            sec.AddElement(base.GetSerialData(null));
+
+            if (serialName != null)
+                sec.AddEndElement("ContainerVisualStyle");
+
+            return (sec);
+        }
+
+        #endregion
+
+        #region PutSerialData
+
+        #region ProcessValue
+
+        internal override void ProcessValue(SerialElement se)
+        {
+            switch (se.Name)
+            {
+                case "Alignment":
+                    Alignment = (Alignment)se.GetValueEnum(typeof(Alignment));
+                    break;
+
+                case "AllowWrap":
+                    AllowWrap = (Tbool)se.GetValueEnum(typeof(Tbool));
+                    break;
+
+                case "EnableImageScroll":
+                    EnableImageScroll = (Tbool)se.GetValueEnum(typeof(Tbool));
+                    break;
+
+                case "Image":
+                    Image = se.GetValueImage();
+                    break;
+
+                case "ImageAlignment":
+                    ImageAlignment = (Alignment)se.GetValueEnum(typeof(Alignment));
+                    break;
+
+                case "ImageIndex":
+                    ImageIndex = int.Parse(se.StringValue);
+                    break;
+
+                case "ImageList":
+                    ImageList = XmlSerializableImageList.ConvertFromString(se.StringValue);
+                    break;
+
+                case "ImageOverlay":
+                    ImageOverlay = (ImageOverlay)se.GetValueEnum(typeof(ImageOverlay));
+                    break;
+
+                case "ImageSizeMode":
+                    ImageSizeMode = (ImageSizeMode)se.GetValueEnum(typeof(ImageSizeMode));
+                    break;
+
+                default:
+                    base.ProcessValue(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region ProcessCollection
+
+        internal override void ProcessCollection(SerialElement se)
+        {
+            SerialElementCollection sec = se.Sec;
+
+            switch (se.Name)
+            {
+                case "DropShadow":
+                    sec.PutSerialData(DropShadow);
+                    break;
+
+                case "ImagePadding":
+                    sec.PutSerialData(ImagePadding);
+                    break;
+
+                case "SymbolDef":
+                    sec.PutSerialData(SymbolDef);
+                    break;
+
+                default:
+                    base.ProcessCollection(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IDisposable
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        public override void Dispose()
+        {
+            DropShadow = null;
+            ImagePadding = null;
+            SymbolDef = null;
+
+            base.Dispose();
+        }
+
+        #endregion
+    }
+
+    #region ImageOverlay
+
+    ///<summary>
+    /// How to Overlay the Image with
+    /// respect to the content
+    ///</summary>
+    public enum ImageOverlay
+    {
+        ///<summary>
+        /// Not set
+        ///</summary>
+        NotSet = -1,
+
+        ///<summary>
+        /// None - Overlaying of the image will be avioded (when possible)
+        ///</summary>
+        None,
+
+        ///<summary>
+        /// Top
+        ///</summary>
+        Top,
+
+        ///<summary>
+        /// Middle
+        ///</summary>
+        Middle,
+
+        ///<summary>
+        /// Bottom
+        ///</summary>
+        Bottom,
+    }
+
+    #endregion
+
+    #region ImageSizeMode
+
+    ///<summary>
+    /// ImageSizeMode
+    ///</summary>
+    public enum ImageSizeMode
+    {
+        ///<summary>
+        /// Not set
+        ///</summary>
+        NotSet = -1,
+
+        ///<summary>
+        /// The image is placed according to the specified 
+        /// Alignment, and is clipped if needed to fit.
+        ///</summary>
+        Normal,
+
+        ///<summary>
+        /// The image is stretched or shrunk to fit.
+        ///</summary>
+        Stretch,
+
+        ///<summary>
+        /// The image is tiled to fill the area.
+        ///</summary>
+        Tile,
+
+        ///<summary>
+        /// The size of the image is increased or decreased to fit the
+        /// area, maintaining the image size ratio.
+        ///</summary>
+        Zoom,
+    }
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/CrosshairValuelVisualStyle.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/CrosshairValuelVisualStyle.cs
new file mode 100644
index 00000000..0e4eb0c6
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/CrosshairValuelVisualStyle.cs	
@@ -0,0 +1,269 @@
+using System.ComponentModel;
+using System.Drawing;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Charts.Style
+{
+    /// <summary>
+    /// Represents the visual style of an element.
+    /// </summary>
+    [TypeConverter(typeof(VisualStylesConverter))]
+    public class CrosshairValueVisualStyle : VisualStyle
+    {
+        #region Private variables
+
+        private string _TextFormat;
+        private DropShadowVisualStyle _DropShadow;
+
+        #endregion
+
+        #region Public properties
+
+        #region DropShadow
+
+        /// <summary>
+        /// Gets or sets the visual style for the DropShadow.
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates the visual style for the DropShadow.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public DropShadowVisualStyle DropShadow
+        {
+            get
+            {
+                if (_DropShadow == null)
+                {
+                    _DropShadow = new DropShadowVisualStyle();
+
+                    UpdateChangeHandler(null, _DropShadow);
+                }
+
+                return (_DropShadow);
+            }
+
+            set
+            {
+                if (_DropShadow != value)
+                {
+                    DropShadowVisualStyle oldValue = _DropShadow;
+
+                    _DropShadow = value;
+
+                    OnStyleChanged("DropShadow", oldValue, value);
+
+                    if (oldValue != null)
+                        oldValue.Dispose();
+                }
+            }
+        }
+
+        #endregion
+
+        #region TextFormat
+
+        /// <summary>
+        /// Gets or sets the Text Format specifier
+        /// </summary>
+        [DefaultValue(null)]
+        [Description("Indicates the Text Format specifier")]
+        public string TextFormat
+        {
+            get { return (_TextFormat); }
+
+            set
+            {
+                if (_TextFormat != value)
+                {
+                    _TextFormat = value;
+
+                    OnPropertyChangedEx("TextFormat", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region IsEmpty
+
+        /// <summary>
+        /// Gets whether the style is logically Empty.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        [Description("Gets whether the style is logically Empty.")]
+        public override bool IsEmpty
+        {
+            get
+            {
+                return ((_DropShadow == null || _DropShadow.IsEmpty) &&
+                    (string.IsNullOrEmpty(_TextFormat) == true) &&
+                    (base.IsEmpty == true));
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ApplyStyle
+
+        /// <summary>
+        /// Applies the style to instance of this style.
+        /// </summary>
+        /// <param name="style">Style to apply.</param>
+        public void ApplyStyle(CrosshairValueVisualStyle style)
+        {
+            if (style != null)
+            {
+                base.ApplyStyle(style);
+
+                if (style._DropShadow != null && style.DropShadow.IsEmpty == false)
+                    DropShadow.ApplyStyle(style.DropShadow);
+
+                if (string.IsNullOrEmpty(style.TextFormat) == false)
+                    _TextFormat = style.TextFormat;
+            }
+        }
+
+        #endregion
+
+        #region ApplyDefaults
+
+        public override void ApplyDefaults()
+        {
+            if (Background.IsEmpty == true)
+                Background = new Background(ControlPaint.LightLight(Color.Fuchsia));
+
+            if (BorderColor.IsEmpty == true)
+                BorderColor = new BorderColor(Color.Black);
+
+            if (BorderPattern.IsEmpty == true)
+                BorderPattern = new BorderPattern(LinePattern.Solid);
+
+            if (BorderThickness.IsEmpty == true)
+                BorderThickness = new Thickness(1);
+
+            base.ApplyDefaults();
+        }
+
+        #endregion
+
+        #region Copy
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public new CrosshairValueVisualStyle Copy()
+        {
+            CrosshairValueVisualStyle style = new CrosshairValueVisualStyle();
+
+            CopyTo(style);
+
+            return (style);
+        }
+
+        #endregion
+
+        #region CopyTo
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public void CopyTo(CrosshairValueVisualStyle style)
+        {
+            base.CopyTo(style);
+
+            style.DropShadow = (_DropShadow != null) ? DropShadow.Copy() : null;
+            style.TextFormat = _TextFormat;
+        }
+
+        #endregion
+
+        #region GetSerialData
+
+        internal override SerialElementCollection GetSerialData(string serialName)
+        {
+            SerialElementCollection sec = new SerialElementCollection();
+
+            if (serialName != null)
+            {
+                if (serialName.Equals("") == true)
+                    serialName = "CrosshairValueVisualStyle";
+
+                sec.AddStartElement(serialName);
+            }
+
+            if (_DropShadow != null && _DropShadow.IsEmpty == false)
+                sec.AddElement(_DropShadow.GetSerialData("DropShadow"));
+
+            sec.AddValue("TextFormat", TextFormat, null);
+
+            sec.AddElement(base.GetSerialData(null));
+
+            if (serialName != null)
+                sec.AddEndElement(serialName);
+
+            return (sec);
+        }
+
+        #endregion
+
+        #region PutSerialData
+
+        #region ProcessValue
+
+        internal override void ProcessValue(SerialElement se)
+        {
+            switch (se.Name)
+            {
+                case "TextFormat":
+                    TextFormat = se.StringValue;
+                    break;
+
+                default:
+                    base.ProcessValue(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region ProcessCollection
+
+        internal override void ProcessCollection(SerialElement se)
+        {
+            SerialElementCollection sec = se.Sec;
+
+            switch (se.Name)
+            {
+                case "DropShadow":
+                    sec.PutSerialData(DropShadow);
+                    break;
+
+                default:
+                    base.ProcessCollection(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IDisposable
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        public override void Dispose()
+        {
+            DropShadow = null;
+
+            base.Dispose();
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/CrosshairVisualStyle.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/CrosshairVisualStyle.cs
new file mode 100644
index 00000000..9cd4fbe4
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/CrosshairVisualStyle.cs	
@@ -0,0 +1,778 @@
+using System.ComponentModel;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Charts.Style
+{
+    /// <summary>
+    /// Represents the visual style of an element.
+    /// </summary>
+    [TypeConverter(typeof(VisualStylesConverter))]
+    public class CrosshairVisualStyle : BaseVisualStyle
+    {
+        #region Private variables
+
+        private Background _Background;
+        private Color _BorderColor = Color.Empty;
+        private LinePattern _BorderPattern = LinePattern.NotSet;
+        private int _BorderThickness;
+
+        private Color _TextColor = Color.Empty;
+
+        private ChartLineVisualStyle _ValueXLineStyle;
+        private ChartLineVisualStyle _ValueYLineStyle;
+
+        private Font _GroupHeaderFont;
+        private Color _GroupHeaderTextColor = Color.Empty;
+
+        private Font _Font;
+        private Padding _Margin;
+        private Padding _Padding;
+
+        #endregion
+
+        #region Public properties
+
+        #region Background
+
+        /// <summary>
+        /// Gets or sets the style background.
+        /// </summary>
+        [Description("Indicates the style background")]
+        public Background Background
+        {
+            get
+            {
+                if (_Background == null)
+                {
+                    _Background = Background.Empty;
+
+                    UpdateChangeHandler(null, _Background);
+                }
+
+                return (_Background);
+            }
+
+            set
+            {
+                if (_Background != value)
+                {
+                    UpdateChangeHandler(_Background, value);
+
+                    _Background = value;
+
+                    OnPropertyChangedEx("Background", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeBackground()
+        {
+            return (_Background != null && _Background.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetBackground()
+        {
+            Background = null;
+        }
+
+        #endregion
+
+        #region BorderColor
+
+        /// <summary>
+        /// Gets or sets the style border color.
+        /// </summary>
+        [Description("Indicates the style Border Color")]
+        public Color BorderColor
+        {
+            get { return (_BorderColor); }
+
+            set
+            {
+                if (_BorderColor != value)
+                {
+                    _BorderColor = value;
+
+                    OnPropertyChangedEx("BorderColor", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeBorderColor()
+        {
+            return (_BorderColor.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetBorderColor()
+        {
+            BorderColor = Color.Empty;
+        }
+
+        #endregion
+
+        #region BorderPattern
+
+        /// <summary>
+        /// Gets or sets the style border pattern (Solid, Dash, ...)
+        /// </summary>
+        [DefaultValue(LinePattern.NotSet)]
+        [Description("Indicates the style border pattern (Solid, Dash, ...)")]
+        public LinePattern BorderPattern
+        {
+            get { return (_BorderPattern); }
+
+            set
+            {
+                if (_BorderPattern != value)
+                {
+                    _BorderPattern = value;
+
+                    OnPropertyChangedEx("BorderPattern", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region BorderThickness
+
+        /// <summary>
+        /// Gets or sets the style border thickness.
+        /// </summary>
+        [DefaultValue(0)]
+        [Description("Indicates the style border thickness")]
+        public int BorderThickness
+        {
+            get { return (_BorderThickness); }
+
+            set
+            {
+                if (_BorderThickness != value)
+                {
+                    _BorderThickness = value;
+
+                    OnPropertyChangedEx("BorderThickness", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region GroupHeaderFont
+
+        /// <summary>
+        /// Gets or sets the GroupHeader Font
+        /// </summary>
+        [DefaultValue(null)]
+        [Description("Indicates the GroupHeader Font")]
+        public Font GroupHeaderFont
+        {
+            get { return (_GroupHeaderFont); }
+
+            set
+            {
+                if (_GroupHeaderFont != value)
+                {
+                    _GroupHeaderFont = value;
+
+                    OnPropertyChangedEx("GroupHeaderFont", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region GroupHeaderTextColor
+
+        /// <summary>
+        /// Gets or sets the Color of the GroupHeaderText.
+        /// </summary>
+        [Category("Appearance")]
+        [Description("Indicates the Color of the GroupHeaderText.")]
+        public Color GroupHeaderTextColor
+        {
+            get { return (_GroupHeaderTextColor); }
+
+            set
+            {
+                if (_GroupHeaderTextColor != value)
+                {
+                    _GroupHeaderTextColor = value;
+
+                    OnPropertyChangedEx("GroupHeaderTextColor", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeGroupHeaderTextColor()
+        {
+            return (_GroupHeaderTextColor.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetGroupHeaderTextColor()
+        {
+            GroupHeaderTextColor = Color.Empty;
+        }
+
+        #endregion
+
+        #region Font
+
+        /// <summary>
+        /// Gets or sets the Font
+        /// </summary>
+        [DefaultValue(null)]
+        [Description("Indicates the Font")]
+        public Font Font
+        {
+            get { return (_Font); }
+
+            set
+            {
+                if (_Font != value)
+                {
+                    _Font = value;
+
+                    OnPropertyChangedEx("Font", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region Margin
+
+        /// <summary>
+        /// Gets or sets the spacing between the border and outside content.
+        /// </summary>
+        [Description("Indicates the spacing between the border and outside content")]
+        public Padding Margin
+        {
+            get
+            {
+                if (_Margin == null)
+                {
+                    _Margin = Padding.Empty;
+
+                    UpdateChangeHandler(null, _Margin);
+                }
+
+                return (_Margin);
+            }
+
+            set
+            {
+                if (_Margin != value)
+                {
+                    UpdateChangeHandler(_Margin, value);
+
+                    _Margin = value;
+
+                    OnPropertyChangedEx("Margin", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeMargin()
+        {
+            return (_Margin != null && _Margin.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetMargin()
+        {
+            Margin = null;
+        }
+
+        #endregion
+
+        #region Padding
+
+        /// <summary>
+        /// Gets or sets spacing between the content and edges of the element.
+        /// </summary>
+        [Description("Indicates the spacing between the content and edges of the element")]
+        public Padding Padding
+        {
+            get
+            {
+                if (_Padding == null)
+                {
+                    _Padding = Padding.Empty;
+
+                    UpdateChangeHandler(null, _Padding);
+                }
+
+                return (_Padding);
+            }
+
+            set
+            {
+                if (_Padding != value)
+                {
+                    UpdateChangeHandler(_Padding, value);
+
+                    _Padding = value;
+
+                    OnPropertyChangedEx("Padding", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializePadding()
+        {
+            return (_Padding != null && _Padding.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetPadding()
+        {
+            Padding = null;
+        }
+
+        #endregion
+
+        #region TextColor
+
+        /// <summary>
+        /// Gets or sets the Text color
+        /// </summary>
+        [Description("Indicates the Text color")]
+        public Color TextColor
+        {
+            get { return (_TextColor); }
+
+            set
+            {
+                if (_TextColor != value)
+                {
+                    _TextColor = value;
+
+                    OnPropertyChangedEx("TextColor", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeTextColor()
+        {
+            return (_TextColor.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetTextColor()
+        {
+            TextColor = Color.Empty;
+        }
+
+        #endregion
+
+        #region ValueXLineStyle
+
+        /// <summary>
+        /// Gets or sets the visual style for the X Value Line.
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates the visual style for the X Value Line.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ChartLineVisualStyle ValueXLineStyle
+        {
+            get
+            {
+                if (_ValueXLineStyle == null)
+                {
+                    _ValueXLineStyle = new ChartLineVisualStyle();
+
+                    UpdateChangeHandler(null, _ValueXLineStyle);
+                }
+
+                return (_ValueXLineStyle);
+            }
+
+            set
+            {
+                if (_ValueXLineStyle != value)
+                {
+                    ChartLineVisualStyle oldValue = _ValueXLineStyle;
+
+                    _ValueXLineStyle = value;
+
+                    OnStyleChanged("ValueXLineStyle", oldValue, value);
+
+                    if (oldValue != null)
+                        oldValue.Dispose();
+                }
+            }
+        }
+
+        #endregion
+
+        #region ValueYLineStyle
+
+        /// <summary>
+        /// Gets or sets the visual style for the Y Value Line.
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates the visual style for the Y Value Line.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ChartLineVisualStyle ValueYLineStyle
+        {
+            get
+            {
+                if (_ValueYLineStyle == null)
+                {
+                    _ValueYLineStyle = new ChartLineVisualStyle();
+
+                    UpdateChangeHandler(null, _ValueYLineStyle);
+                }
+
+                return (_ValueYLineStyle);
+            }
+
+            set
+            {
+                if (_ValueYLineStyle != value)
+                {
+                    ChartLineVisualStyle oldValue = _ValueYLineStyle;
+
+                    _ValueYLineStyle = value;
+
+                    OnStyleChanged("ValueYLineStyle", oldValue, value);
+
+                    if (oldValue != null)
+                        oldValue.Dispose();
+                }
+            }
+        }
+
+        #endregion
+
+        #region IsEmpty
+
+        /// <summary>
+        /// Gets whether the style is logically Empty.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        [Description("Gets whether the style is logically Empty.")]
+        public override bool IsEmpty
+        {
+            get
+            {
+                return ((_Background == null || _Background.IsEmpty == true) &&
+                    (_BorderColor.IsEmpty == true) &&
+                    (_BorderPattern == LinePattern.NotSet) &&
+                    (_BorderThickness <= 0) &&
+                    (_GroupHeaderFont == null) &&
+                    (_Font == null) &&
+                    (_GroupHeaderTextColor.IsEmpty == true) &&
+                    (_Margin == null || _Margin.IsEmpty == true) &&
+                    (_Padding == null || _Padding.IsEmpty == true) &&
+                    (_TextColor.IsEmpty == true) &&
+                    (_ValueXLineStyle == null || _ValueXLineStyle.IsEmpty) &&
+                    (_ValueYLineStyle == null || _ValueYLineStyle.IsEmpty) &&
+                    (base.IsEmpty == true));
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ApplyStyle
+
+        /// <summary>
+        /// Applies the style to instance of this style.
+        /// </summary>
+        /// <param name="style">Style to apply.</param>
+        public void ApplyStyle(CrosshairVisualStyle style)
+        {
+            if (style != null)
+            {
+                base.ApplyStyle(style);
+
+                if (style._Background != null && style._Background.IsEmpty == false)
+                    Background = style._Background.Copy();
+
+                if (style._BorderColor.IsEmpty == false)
+                    BorderColor = style._BorderColor;
+
+                if (style._BorderPattern != LinePattern.NotSet)
+                    BorderPattern = style._BorderPattern;
+
+                if (style._BorderThickness > 0)
+                    BorderThickness = style._BorderThickness;
+
+                if (style.GroupHeaderFont != null)
+                    GroupHeaderFont = style.GroupHeaderFont;
+
+                if (style._Font != null)
+                    Font = style.Font;
+
+                if (style.GroupHeaderTextColor.IsEmpty == false)
+                    GroupHeaderTextColor = style.GroupHeaderTextColor;
+
+                if (style._Margin != null && style._Margin.IsEmpty == false)
+                    Margin = style.Margin.Copy();
+
+                if (style._Padding != null && style._Padding.IsEmpty == false)
+                    Padding = style.Padding.Copy();
+
+                if (style._TextColor.IsEmpty == false)
+                    TextColor = style._TextColor;
+
+                if (style._ValueXLineStyle != null && style.ValueXLineStyle.IsEmpty == false)
+                    ValueXLineStyle.ApplyStyle(style.ValueXLineStyle);
+
+                if (style._ValueYLineStyle != null && style.ValueYLineStyle.IsEmpty == false)
+                    ValueYLineStyle.ApplyStyle(style.ValueYLineStyle);
+            }
+        }
+
+        #endregion
+
+        #region Copy
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public new CrosshairVisualStyle Copy()
+        {
+            CrosshairVisualStyle style = new CrosshairVisualStyle();
+
+            CopyTo(style);
+
+            return (style);
+        }
+
+        #endregion
+
+        #region CopyTo
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public void CopyTo(CrosshairVisualStyle style)
+        {
+            base.CopyTo(style);
+
+            style.Background = (_Background != null) ? _Background.Copy() : null;
+
+            style.BorderColor = _BorderColor;
+            style.BorderPattern = _BorderPattern;
+            style.BorderThickness = _BorderThickness;
+
+            style.GroupHeaderFont = (_GroupHeaderFont != null) ? (Font)_GroupHeaderFont.Clone() : null;
+            style.GroupHeaderTextColor = _GroupHeaderTextColor;
+
+            style.Font = (_Font != null) ? (Font)_Font.Clone() : null;
+            style.Margin = (_Margin != null) ? _Margin.Copy() : null;
+            style.Padding = (_Padding != null) ? _Padding.Copy() : null;
+
+            style.TextColor = _TextColor;
+
+            style.ValueXLineStyle = (_ValueXLineStyle != null) ? _ValueXLineStyle.Copy() : null;
+            style.ValueYLineStyle = (_ValueYLineStyle != null) ? _ValueYLineStyle.Copy() : null;
+        }
+
+        #endregion
+
+        #region GetSerialData
+
+        internal override SerialElementCollection GetSerialData(string serialName)
+        {
+            SerialElementCollection sec = new SerialElementCollection();
+
+            if (serialName != null)
+            {
+                if (serialName.Equals("") == true)
+                    serialName = "CrosshairVisualStyle";
+
+                sec.AddStartElement(serialName);
+            }
+
+            if (_Background != null && _Background.IsEmpty == false)
+                sec.AddElement(_Background.GetSerialData("Background"));
+
+            sec.AddValue("BorderColor", BorderColor, Color.Empty);
+            sec.AddValue("BorderPattern", BorderPattern, LinePattern.NotSet);
+            sec.AddValue("BorderThickness", BorderThickness, 0);
+
+            if (_GroupHeaderFont != null)
+                sec.AddValue("GroupHeaderFont", XmlSerializableFont.ConvertToString(GroupHeaderFont));
+
+            sec.AddValue("GroupHeaderTextColor", GroupHeaderTextColor, Color.Empty);
+
+            if (_Font != null)
+                sec.AddValue("Font", XmlSerializableFont.ConvertToString(Font));
+
+            if (_Margin != null && _Margin.IsEmpty == false)
+                sec.AddElement(_Margin.GetSerialData("Margin"));
+
+            if (_Padding != null && _Padding.IsEmpty == false)
+                sec.AddElement(_Padding.GetSerialData("Padding"));
+
+            sec.AddValue("TextColor", TextColor, Color.Empty);
+
+            if (_ValueXLineStyle != null && _ValueXLineStyle.IsEmpty == false)
+                sec.AddElement(_ValueXLineStyle.GetSerialData("ValueXLineStyle"));
+
+            if (_ValueYLineStyle != null && _ValueYLineStyle.IsEmpty == false)
+                sec.AddElement(_ValueYLineStyle.GetSerialData("ValueYLineStyle"));
+
+            sec.AddElement(base.GetSerialData(null));
+
+            if (serialName != null)
+                sec.AddEndElement(serialName);
+
+            return (sec);
+        }
+
+        #endregion
+
+        #region PutSerialData
+
+        #region ProcessValue
+
+        internal override void ProcessValue(SerialElement se)
+        {
+            switch (se.Name)
+            {
+                case "BorderColor":
+                    BorderColor = se.GetValueColor();
+                    break;
+
+                case "BorderPattern":
+                    BorderPattern = (LinePattern)se.GetValueEnum(typeof(LinePattern));
+                    break;
+
+                case "BorderThickness":
+                    BorderThickness = int.Parse(se.StringValue);
+                    break;
+
+                case "GroupHeaderFont":
+                    GroupHeaderFont = XmlSerializableFont.ConvertFromString(se.StringValue);
+                    break;
+
+                case "GroupHeaderTextColor":
+                    GroupHeaderTextColor = se.GetValueColor();
+                    break;
+
+                case "Font":
+                    Font = XmlSerializableFont.ConvertFromString(se.StringValue);
+                    break;
+
+                case "TextColor":
+                    TextColor = se.GetValueColor();
+                    break;
+
+                default:
+                    base.ProcessValue(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region ProcessCollection
+
+        internal override void ProcessCollection(SerialElement se)
+        {
+            SerialElementCollection sec = se.Sec;
+
+            switch (se.Name)
+            {
+                case "Background":
+                    sec.PutSerialData(Background);
+                    break;
+
+                case "Margin":
+                    sec.PutSerialData(Margin);
+                    break;
+
+                case "Padding":
+                    sec.PutSerialData(Padding);
+                    break;
+
+                case "ValueXLineStyle":
+                    sec.PutSerialData(ValueXLineStyle);
+                    break;
+
+                case "ValueYLineStyle":
+                    sec.PutSerialData(ValueYLineStyle);
+                    break;
+
+                default:
+                    base.ProcessCollection(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IDisposable
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        public override void Dispose()
+        {
+            Margin = null;
+            Padding = null;
+            ValueXLineStyle = null;
+            ValueYLineStyle = null;
+
+            base.Dispose();
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/DataLabelVisualStyle.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/DataLabelVisualStyle.cs
new file mode 100644
index 00000000..43c997a3
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/DataLabelVisualStyle.cs	
@@ -0,0 +1,1221 @@
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Charts.Style
+{
+    /// <summary>
+    /// Represents a SeriesLabelVisualStyle.
+    /// </summary>
+    [TypeConverter(typeof(VisualStylesConverter))]
+    public class DataLabelVisualStyle : BaseVisualStyle
+    {
+        #region Private variables
+
+        private ConnectorLineVisualStyle _ConnectorLineStyle;
+
+        private Tbool _CenterLabel = Tbool.NotSet;
+        private Tbool _DrawConnector = Tbool.NotSet;
+        private Tbool _DrawPointMarker = Tbool.NotSet;
+
+        private RotateDegrees _RotateDegrees = RotateDegrees.NotSet;
+
+        private Background _Background;
+        private Color _BorderColor = Color.Empty;
+        private LinePattern _BorderPattern = LinePattern.NotSet;
+        private int _BorderThickness = -1;
+        private Padding _Padding;
+
+        private Font _Font;
+        private Color _TextColor = Color.Empty;
+        private LineAlignment _TextAlignment = LineAlignment.NotSet;
+        
+        private Background _HighlightBackground;
+        private Color _HighlightBorderColor = Color.Empty;
+        private LinePattern _HighlightBorderPattern = LinePattern.NotSet;
+        private Color _HighlightTextColor = Color.Empty;
+
+        private int _MaxTextLineCount = -1;
+        private int _MaxTextWidth = -1;
+
+        private string _TextFormat;
+        private DropShadowVisualStyle _DropShadow;
+
+        #endregion
+
+        #region Public properties
+
+        #region Background
+
+        /// <summary>
+        /// Gets or sets the style background.
+        /// </summary>
+        [Description("Indicates the style background")]
+        public Background Background
+        {
+            get
+            {
+                if (_Background == null)
+                {
+                    _Background = Background.Empty;
+
+                    UpdateChangeHandler(null, _Background);
+                }
+
+                return (_Background);
+            }
+
+            set
+            {
+                if (_Background != value)
+                {
+                    UpdateChangeHandler(_Background, value);
+
+                    _Background = value;
+
+                    OnPropertyChangedEx("Background", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeBackground()
+        {
+            return (_Background != null && _Background.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetBackground()
+        {
+            Background = null;
+        }
+
+        #endregion
+
+        #region BorderColor
+
+        /// <summary>
+        /// Gets or sets the style border color.
+        /// </summary>
+        [Description("Indicates the style Border Color")]
+        public Color BorderColor
+        {
+            get { return (_BorderColor); }
+
+            set
+            {
+                if (value != _BorderColor)
+                {
+                    _BorderColor = value;
+
+                    OnPropertyChangedEx("BorderColor", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeBorderColor()
+        {
+            return (_BorderColor.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetBorderColor()
+        {
+            _BorderColor = Color.Empty;
+        }
+
+        #endregion
+
+        #region BorderPattern
+
+        /// <summary>
+        /// Gets or sets the style border pattern (Solid, Dash, ...)
+        /// </summary>
+        [DefaultValue(LinePattern.NotSet)]
+        [Description("Indicates the style border pattern (Solid, Dash, ...)")]
+        public LinePattern BorderPattern
+        {
+            get { return (_BorderPattern); }
+
+            set
+            {
+                if (value != _BorderPattern)
+                {
+                    _BorderPattern = value;
+
+                    OnPropertyChangedEx("BorderPattern", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region BorderThickness
+
+        /// <summary>
+        /// Gets or sets the style border thickness.
+        /// </summary>
+        [Description("Indicates the style border thickness")]
+        [DefaultValue(-1)]
+        public int BorderThickness
+        {
+            get { return (_BorderThickness); }
+
+            set
+            {
+                if (value != _BorderThickness)
+                {
+                    _BorderThickness = value;
+
+                    OnPropertyChangedEx("BorderThickness", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region DropShadow
+
+        /// <summary>
+        /// Gets or sets the visual style for the DropShadow.
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates the visual style for the DropShadow.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public DropShadowVisualStyle DropShadow
+        {
+            get
+            {
+                if (_DropShadow == null)
+                {
+                    _DropShadow = new DropShadowVisualStyle();
+
+                    UpdateChangeHandler(null, _DropShadow);
+                }
+
+                return (_DropShadow);
+            }
+
+            set
+            {
+                if (_DropShadow != value)
+                {
+                    DropShadowVisualStyle oldValue = _DropShadow;
+
+                    _DropShadow = value;
+
+                    OnStyleChanged("DropShadow", oldValue, value);
+
+                    if (oldValue != null)
+                        oldValue.Dispose();
+                }
+            }
+        }
+
+        #endregion
+
+        #region Font
+
+        /// <summary>
+        /// Gets or sets the style Font
+        /// </summary>
+        [DefaultValue(null)]
+        [Description("Indicates the style Font")]
+        public Font Font
+        {
+            get { return (_Font); }
+
+            set
+            {
+                if (_Font != value)
+                {
+                    _Font = value;
+
+                    OnPropertyChangedEx("Font", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region TextColor
+
+        /// <summary>
+        /// Gets or sets the Text color
+        /// </summary>
+        [Description("Indicates the Text color")]
+        public Color TextColor
+        {
+            get { return (_TextColor); }
+
+            set
+            {
+                if (_TextColor != value)
+                {
+                    _TextColor = value;
+
+                    OnPropertyChangedEx("TextColor", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeTextColor()
+        {
+            return (_TextColor.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetTextColor()
+        {
+            _TextColor = Color.Empty;
+        }
+
+        #endregion
+
+        #region CenterLabel
+
+        ///<summary>
+        /// Gets or sets whether the label is centered on top of the data point.
+        ///</summary>
+        [DefaultValue(Tbool.NotSet), Category("DataLabel")]
+        [Description("Indicates whether the label is centered on top of the data point.")]
+        public Tbool CenterLabel
+        {
+            get { return (_CenterLabel); }
+
+            set
+            {
+                if (value != _CenterLabel)
+                {
+                    _CenterLabel = value;
+
+                    OnPropertyChangedEx("CenterLabel", Style.VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ConnectorStyle
+
+        /// <summary>
+        /// Gets or sets the visual style for the line Connector.
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates the visual style for the line Connector.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        [NotifyParentProperty(true)]
+        public ConnectorLineVisualStyle ConnectorLineStyle
+        {
+            get
+            {
+                if (_ConnectorLineStyle == null)
+                {
+                    _ConnectorLineStyle = new ConnectorLineVisualStyle();
+
+                    UpdateChangeHandler(null, _ConnectorLineStyle);
+                }
+
+                return (_ConnectorLineStyle);
+            }
+
+            set
+            {
+                if (_ConnectorLineStyle != value)
+                {
+                    ConnectorLineVisualStyle oldValue = _ConnectorLineStyle;
+
+                    _ConnectorLineStyle = value;
+
+                    OnStyleChanged("ConnectorLineStyle", oldValue, value);
+
+                    if (oldValue != null)
+                        oldValue.Dispose();
+                }
+            }
+        }
+
+        #endregion
+
+        #region DrawConnector
+
+        ///<summary>
+        /// Gets or sets whether a connecting line is drawn to the data point.
+        ///</summary>
+        [DefaultValue(Tbool.NotSet), Category("DataLabel")]
+        [Description("Indicates whether a connecting line is drawn to the data point.")]
+        public Tbool DrawConnector
+        {
+            get { return (_DrawConnector); }
+
+            set
+            {
+                if (value != _DrawConnector)
+                {
+                    _DrawConnector = value;
+
+                    OnPropertyChangedEx("DrawConnector", Style.VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region DrawPointMarker
+
+        ///<summary>
+        /// Gets or sets whether the associated Point Marker is drawn for the data point.
+        ///</summary>
+        [DefaultValue(Tbool.NotSet), Category("DataLabel")]
+        [Description("Indicates whether the associated Point Marker is drawn for the data point.")]
+        public Tbool DrawPointMarker
+        {
+            get { return (_DrawPointMarker); }
+
+            set
+            {
+                if (value != _DrawPointMarker)
+                {
+                    _DrawPointMarker = value;
+
+                    OnPropertyChangedEx("DrawPointMarker", Style.VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region HighlightBackground
+
+        /// <summary>
+        /// Gets or sets the Highlight style background.
+        /// </summary>
+        [Description("Indicates the Highlight style background")]
+        public Background HighlightBackground
+        {
+            get
+            {
+                if (_HighlightBackground == null)
+                {
+                    _HighlightBackground = Background.Empty;
+
+                    UpdateChangeHandler(null, _HighlightBackground);
+                }
+
+                return (_HighlightBackground);
+            }
+
+            set
+            {
+                if (_HighlightBackground != value)
+                {
+                    UpdateChangeHandler(_HighlightBackground, value);
+
+                    _HighlightBackground = value;
+
+                    OnPropertyChangedEx("HighlightBackground", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeHighlightBackground()
+        {
+            return (_HighlightBackground != null && _HighlightBackground.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetHighlightBackground()
+        {
+            HighlightBackground = null;
+        }
+
+        #endregion
+
+        #region HighlightBorderColor
+
+        /// <summary>
+        /// Gets or sets the Highlight style border color.
+        /// </summary>
+        [Description("Indicates the Highlight style Border Color")]
+        public Color HighlightBorderColor
+        {
+            get { return (_HighlightBorderColor); }
+
+            set
+            {
+                if (value != _HighlightBorderColor)
+                {
+                    _HighlightBorderColor = value;
+
+                    OnPropertyChangedEx("HighlightBorderColor", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeHighlightBorderColor()
+        {
+            return (_HighlightBorderColor.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetHighlightBorderColor()
+        {
+            _HighlightBorderColor = Color.Empty;
+        }
+
+        #endregion
+
+        #region HighlightBorderPattern
+
+        /// <summary>
+        /// Gets or sets the Highlight style border pattern (Solid, Dash, ...)
+        /// </summary>
+        [DefaultValue(LinePattern.NotSet)]
+        [Description("Indicates the Highlight style border pattern (Solid, Dash, ...)")]
+        public LinePattern HighlightBorderPattern
+        {
+            get { return (_HighlightBorderPattern); }
+
+            set
+            {
+                if (value != _HighlightBorderPattern)
+                {
+                    _HighlightBorderPattern = value;
+
+                    OnPropertyChangedEx("HighlightBorderPattern", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region HighlightTextColor
+
+        /// <summary>
+        /// Gets or sets the Highlight Text color
+        /// </summary>
+        [Description("Indicates the Highlight Text color")]
+        public Color HighlightTextColor
+        {
+            get { return (_HighlightTextColor); }
+
+            set
+            {
+                if (value != _HighlightTextColor)
+                {
+                    _HighlightTextColor = value;
+
+                    OnPropertyChangedEx("HighlightTextColor", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeHighlightTextColor()
+        {
+            return (_HighlightTextColor.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetHighlightTextColor()
+        {
+            _HighlightTextColor = Color.Empty;
+        }
+
+        #endregion
+
+        #region MaxTextLineCount
+
+        /// <summary>
+        /// Gets or sets the maximum number of Label Text lines.
+        /// </summary>
+        [DefaultValue(-1), Category("Appearance")]
+        [Description("Indicates the maximum number of Label Text lines.")]
+        public int MaxTextLineCount
+        {
+            get { return (_MaxTextLineCount); }
+
+            set
+            {
+                if (value != _MaxTextLineCount)
+                {
+                    _MaxTextLineCount = value;
+
+                    OnPropertyChangedEx("MaxTextLineCount", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region MaxTextWidth
+
+        /// <summary>
+        /// Gets or sets the maximum width of the label text.
+        /// </summary>
+        [DefaultValue(-1), Category("Appearance")]
+        [Description("Indicates the maximum width of the label text.")]
+        public int MaxTextWidth
+        {
+            get { return (_MaxTextWidth); }
+
+            set
+            {
+                if (value != _MaxTextWidth)
+                {
+                    _MaxTextWidth = value;
+
+                    OnPropertyChangedEx("MaxTextWidth", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region Padding
+
+        /// <summary>
+        /// Gets or sets spacing between the content and edges of the element.
+        /// </summary>
+        [Description("Indicates the spacing between the content and edges of the element")]
+        public Padding Padding
+        {
+            get
+            {
+                if (_Padding == null)
+                {
+                    _Padding = Padding.Empty;
+
+                    UpdateChangeHandler(null, _Padding);
+                }
+
+                return (_Padding);
+            }
+
+            set
+            {
+                if (_Padding != value)
+                {
+                    UpdateChangeHandler(_Padding, value);
+
+                    _Padding = value;
+
+                    OnPropertyChangedEx("Padding", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializePadding()
+        {
+            return (_Padding != null && _Padding.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetPadding()
+        {
+            Padding = null;
+        }
+
+        #endregion
+
+        #region RotateDegrees
+
+        /// <summary>
+        /// Gets or sets the label display rotation.
+        /// </summary>
+        [DefaultValue(RotateDegrees.NotSet), Category("Appearance")]
+        [Description("Indicates the label display rotation.")]
+        public RotateDegrees RotateDegrees
+        {
+            get { return (_RotateDegrees); }
+
+            set
+            {
+                if (value != _RotateDegrees)
+                {
+                    _RotateDegrees = value;
+
+                    OnPropertyChangedEx("RotateDegrees", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region TextAlignment
+
+        /// <summary>
+        /// Gets or sets the alignment of the text
+        /// </summary>
+        [DefaultValue(LineAlignment.NotSet), Category("Appearance")]
+        [Description("Indicates the alignment of the text.")]
+        public LineAlignment TextAlignment
+        {
+            get { return (_TextAlignment); }
+
+            set
+            {
+                if (value != _TextAlignment)
+                {
+                    _TextAlignment = value;
+
+                    OnPropertyChangedEx("TextAlignment", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region TextFormat
+
+        // "{S}\\n{X:yyyy} ({Y:##,##0})"
+        // "{Y:C}"
+        // "X", "Y", "Y0", "Yn"
+        // "S" (name)
+
+        /// <summary>
+        /// Gets or sets the Text Format specifier
+        /// </summary>
+        [DefaultValue(null)]
+        [Description("Indicates the Text Format specifier")]
+        public string TextFormat
+        {
+            get { return (_TextFormat); }
+
+            set
+            {
+                if (_TextFormat != value)
+                {
+                    _TextFormat = value;
+
+                    OnPropertyChangedEx("TextFormat", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region IsEmpty
+
+        /// <summary>
+        /// Gets whether the style is logically Empty.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        [Description("Gets whether the style is logically Empty.")]
+        public override bool IsEmpty
+        {
+            get
+            {
+                return ((_Background == null || _Background.IsEmpty == true) &&
+                    (_BorderColor.IsEmpty == true) &&
+                    (_BorderPattern == LinePattern.NotSet) &&
+                    (_BorderThickness < 0) &&
+                    (_CenterLabel == Tbool.NotSet) &&
+                    (_ConnectorLineStyle != null && _ConnectorLineStyle.IsEmpty == true) &&
+                    (_DrawConnector == Tbool.NotSet) &&
+                    (_DrawPointMarker == Tbool.NotSet) &&
+                    (_DropShadow == null || _DropShadow.IsEmpty) && 
+                    (_HighlightBackground == null || _HighlightBackground.IsEmpty == true) &&
+                    (_HighlightBorderColor.IsEmpty == true) &&
+                    (_HighlightBorderPattern == LinePattern.NotSet) &&
+                    (_HighlightTextColor.IsEmpty == true) &&
+                    (_MaxTextLineCount == -1) &&
+                    (_MaxTextWidth == -1) &&
+                    (_Padding == null || _Padding.IsEmpty == true) &&
+                    (_RotateDegrees == RotateDegrees.NotSet) &&
+                    (_TextAlignment == LineAlignment.NotSet) && 
+                    (_TextColor.IsEmpty == true) &&
+                    (string.IsNullOrEmpty(_TextFormat) == true) &&
+                    (base.IsEmpty == true));
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region HasBorder
+
+        internal bool HasBorder
+        {
+            get { return (BorderPattern != LinePattern.None &&
+                BorderColor.IsEmpty == false && BorderThickness > 0); }
+        }
+
+        #endregion
+
+        #region HasHighlightBorder
+
+        internal bool HasHighlightBorder
+        {
+            get
+            {
+                return (HighlightBorderPattern != LinePattern.None &&
+                    HighlightBorderColor.IsEmpty == false && BorderThickness > 0);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetStringFormatFlags
+
+        internal void GetStringFormatFlags(StringFormat sf)
+        {
+            sf.LineAlignment = StringAlignment.Center;
+
+            switch (TextAlignment)
+            {
+                case LineAlignment.Far:
+                    sf.Alignment = StringAlignment.Far;
+                    break;
+
+                case LineAlignment.Center:
+                    sf.Alignment = StringAlignment.Center;
+                    break;
+
+                default:
+                    sf.Alignment = StringAlignment.Near;
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region ApplyStyle
+
+        /// <summary>
+        /// Applies the style to instance of this style.
+        /// </summary>
+        /// <param name="style">Style to apply.</param>
+        public void ApplyStyle(DataLabelVisualStyle style)
+        {
+            if (style != null)
+            {
+                base.ApplyStyle(style);
+
+                if (style._Background != null && style._Background.IsEmpty == false)
+                    Background = style.Background.Copy();
+
+                if (style.BorderColor.IsEmpty == false)
+                    BorderColor = style.BorderColor;
+
+                if (style._BorderPattern != LinePattern.NotSet)
+                    BorderPattern = style.BorderPattern;
+
+                if (style.BorderThickness >= 0)
+                    BorderThickness = style.BorderThickness;
+
+                if (style.ConnectorLineStyle.IsEmpty == false)
+                    ConnectorLineStyle.ApplyStyle(style.ConnectorLineStyle);
+
+                if (style.CenterLabel != Tbool.NotSet)
+                    CenterLabel = style.CenterLabel;
+
+                if (style.DrawConnector != Tbool.NotSet)
+                    DrawConnector = style.DrawConnector;
+
+                if (style.DrawPointMarker != Tbool.NotSet)
+                    DrawPointMarker = style.DrawPointMarker;
+
+                if (style._DropShadow != null && style.DropShadow.IsEmpty == false)
+                    DropShadow.ApplyStyle(style.DropShadow);
+
+                if (style.Font != null)
+                    Font = (Font)style.Font.Clone();
+
+                if (style._HighlightBackground != null && style._HighlightBackground.IsEmpty == false)
+                    HighlightBackground = style.HighlightBackground.Copy();
+
+                if (style.HighlightBorderColor.IsEmpty == false)
+                    HighlightBorderColor = style.HighlightBorderColor;
+
+                if (style.HighlightBorderPattern != LinePattern.NotSet)
+                    HighlightBorderPattern = style.HighlightBorderPattern;
+
+                if (style.HighlightTextColor.IsEmpty == false)
+                    HighlightTextColor = style.HighlightTextColor;
+
+                if (style.MaxTextLineCount >= 0)
+                    MaxTextLineCount = style.MaxTextLineCount;
+
+                if (style.MaxTextWidth >= 0)
+                    MaxTextWidth = style.MaxTextWidth;
+
+                if (style._Padding != null && style._Padding.IsEmpty == false)
+                    Padding = style.Padding.Copy();
+
+                if (style.RotateDegrees != RotateDegrees.NotSet)
+                    RotateDegrees = style.RotateDegrees;
+
+                if (style.TextAlignment != LineAlignment.NotSet)
+                    TextAlignment = style.TextAlignment;
+
+                if (style.TextColor.IsEmpty == false)
+                    TextColor = style.TextColor;
+
+                if (string.IsNullOrEmpty(style.TextFormat) == false)
+                    TextFormat = style.TextFormat;
+            }
+        }
+
+        #endregion
+
+        #region ApplyDefaults
+
+        public override void ApplyDefaults()
+        {
+            if (Font == null)
+                Font = SystemFonts.DefaultFont;
+
+            if (TextColor.IsEmpty == true)
+                TextColor = Color.Black;
+
+            if (BorderColor.IsEmpty == true)
+                BorderColor = Color.Black;
+
+            if (BorderPattern == LinePattern.NotSet)
+                BorderPattern = LinePattern.Solid;
+
+            if (BorderThickness < 0)
+                BorderThickness = 1;
+
+            if (Background.IsEmpty)
+                Background = new Background(Color.WhiteSmoke);
+
+            if (DrawConnector == Tbool.NotSet)
+                DrawConnector = Tbool.True;
+
+            if (DrawPointMarker == Tbool.NotSet)
+                DrawPointMarker = Tbool.True;
+
+            if (HighlightBackground.IsEmpty)
+                HighlightBackground = new Background(Color.Yellow);
+
+            if (HighlightTextColor.IsEmpty == true)
+                HighlightTextColor = Color.Black;
+
+            if (HighlightBorderColor.IsEmpty == true)
+                HighlightBorderColor = Color.Black;
+
+            if (HighlightBorderPattern == LinePattern.NotSet)
+                HighlightBorderPattern = LinePattern.Solid;
+
+            ConnectorLineStyle.ApplyDefaults();
+
+            base.ApplyDefaults();
+        }
+
+        #endregion
+
+        #region Copy
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public new DataLabelVisualStyle Copy()
+        {
+            DataLabelVisualStyle style = new DataLabelVisualStyle();
+
+            CopyTo(style);
+
+            return (style);
+        }
+
+        #endregion
+
+        #region CopyTo
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public void CopyTo(DataLabelVisualStyle style)
+        {
+            base.CopyTo(style);
+
+            style.Background = (_Background == null) ? null : _Background.Copy();
+            style.BorderColor = _BorderColor;
+            style.BorderPattern = _BorderPattern;
+            style.BorderThickness = _BorderThickness;
+
+            style.ConnectorLineStyle = (_ConnectorLineStyle == null) ? null : _ConnectorLineStyle.Copy();
+
+            style.CenterLabel = _CenterLabel;
+            style.DrawConnector = _DrawConnector;
+            style.DrawPointMarker = _DrawPointMarker;
+
+            style.DropShadow = (_DropShadow != null) ? DropShadow.Copy() : null;
+            style.Font = (_Font == null) ? null : (Font)_Font.Clone();
+
+            style.HighlightBackground = (_HighlightBackground == null) ? null : _HighlightBackground.Copy();
+            style.HighlightBorderColor = _HighlightBorderColor;
+            style.HighlightBorderPattern = _HighlightBorderPattern;
+            style.HighlightTextColor = _HighlightTextColor;
+
+            style.MaxTextLineCount = _MaxTextLineCount;
+            style.MaxTextWidth = _MaxTextWidth;
+            style.Padding = (_Padding == null) ? null : _Padding.Copy();
+            style.RotateDegrees = _RotateDegrees;
+
+            style.TextAlignment = _TextAlignment;
+            style.TextColor = _TextColor;
+            style.TextFormat = _TextFormat;
+        }
+
+        #endregion
+
+        #region GetSerialData
+
+        internal override SerialElementCollection GetSerialData(string serialName)
+        {
+            SerialElementCollection sec = new SerialElementCollection();
+
+            if (serialName != null)
+            {
+                if (serialName.Equals("") == true)
+                    serialName = "DataLabelVisualStyle";
+
+                sec.AddStartElement(serialName);
+            }
+
+            if (_Background != null && _Background.IsEmpty == false)
+                sec.AddElement(_Background.GetSerialData("Background"));
+
+            sec.AddValue("BorderColor", BorderColor, Color.Empty);
+            sec.AddValue("BorderPattern", BorderPattern, LinePattern.NotSet);
+            sec.AddValue("BorderThickness", BorderThickness, -1);
+
+            if (_ConnectorLineStyle != null && _ConnectorLineStyle.IsEmpty == false)
+                sec.AddElement(_ConnectorLineStyle.GetSerialData("ConnectorLineStyle"));
+
+            sec.AddValue("CenterLabel", CenterLabel, Tbool.NotSet);
+            sec.AddValue("DrawConnector", DrawConnector, Tbool.NotSet);
+            sec.AddValue("DrawPointMarker", DrawPointMarker, Tbool.NotSet);
+
+            if (_DropShadow != null && _DropShadow.IsEmpty == false)
+                sec.AddElement(_DropShadow.GetSerialData("DropShadow"));
+
+            if (_Font != null)
+                sec.AddValue("Font", XmlSerializableFont.ConvertToString(Font));
+
+            if (_HighlightBackground != null && _HighlightBackground.IsEmpty == false)
+                sec.AddElement(_HighlightBackground.GetSerialData("HighlightBackground"));
+
+            sec.AddValue("HighlightBorderColor", HighlightBorderColor, Color.Empty);
+            sec.AddValue("HighlightBorderPattern", HighlightBorderPattern, LinePattern.NotSet);
+            sec.AddValue("HighlightTextColor", HighlightTextColor, Color.Empty);
+
+            sec.AddValue("MaxTextLineCount", MaxTextLineCount, -1);
+            sec.AddValue("MaxTextWidth", MaxTextWidth, -1);
+
+            if (_Padding != null && _Padding.IsEmpty == false)
+                sec.AddElement(_Padding.GetSerialData("Padding"));
+
+            sec.AddValue("RotateDegrees", RotateDegrees, RotateDegrees.NotSet);
+            sec.AddValue("TextAlignment", TextAlignment, LineAlignment.NotSet);
+
+            sec.AddValue("TextColor", TextColor, Color.Empty);
+            sec.AddValue("TextFormat", TextFormat, null);
+
+            sec.AddElement(base.GetSerialData(null));
+
+            if (serialName != null)
+                sec.AddEndElement(serialName);
+
+            return (sec);
+        }
+
+        #endregion
+
+        #region PutSerialData
+
+        #region ProcessValue
+
+        internal override void ProcessValue(SerialElement se)
+        {
+            switch (se.Name)
+            {
+                case "BorderColor":
+                    BorderColor = se.GetValueColor();
+                    break;
+
+                case "BorderPattern":
+                    BorderPattern = (LinePattern)se.GetValueEnum(typeof(LinePattern));
+                    break;
+
+                case "BorderThickness":
+                    BorderThickness = int.Parse(se.StringValue);
+                    break;
+
+                case "CenterLabel":
+                    CenterLabel = (Tbool)se.GetValueEnum(typeof(Tbool));
+                    break;
+
+                case "DrawConnector":
+                    DrawConnector = (Tbool)se.GetValueEnum(typeof(Tbool));
+                    break;
+
+                case "DrawPointMarker":
+                    DrawPointMarker = (Tbool)se.GetValueEnum(typeof(Tbool));
+                    break;
+
+                case "Font":
+                    Font = XmlSerializableFont.ConvertFromString(se.StringValue);
+                    break;
+
+                case "HighlightBorderColor":
+                    HighlightBorderColor = se.GetValueColor();
+                    break;
+
+                case "HighlightBorderPattern":
+                    HighlightBorderPattern = (LinePattern)se.GetValueEnum(typeof(LinePattern));
+                    break;
+
+                case "HighlightTextColor":
+                    HighlightTextColor = se.GetValueColor();
+                    break;
+
+                case "MaxTextLineCount":
+                    MaxTextLineCount = int.Parse(se.StringValue);
+                    break;
+
+                case "MaxTextWidth":
+                    MaxTextWidth = int.Parse(se.StringValue);
+                    break;
+
+                case "RotateDegrees":
+                    RotateDegrees = (RotateDegrees)se.GetValueEnum(typeof(RotateDegrees));
+                    break;
+
+                case "TextAlignment":
+                    TextAlignment = (LineAlignment)se.GetValueEnum(typeof(LineAlignment));
+                    break;
+
+                case "TextColor":
+                    TextColor = se.GetValueColor();
+                    break;
+
+                case "TextFormat":
+                    TextFormat = se.StringValue;
+                    break;
+
+                default:
+                    base.ProcessValue(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region ProcessCollection
+
+        internal override void ProcessCollection(SerialElement se)
+        {
+            SerialElementCollection sec = se.Sec;
+
+            switch (se.Name)
+            {
+                case "Background":
+                    sec.PutSerialData(Background);
+                    break;
+
+                case "ConnectorLineStyle":
+                    sec.PutSerialData(ConnectorLineStyle);
+                    break;
+
+                case "DropShadow":
+                    sec.PutSerialData(DropShadow);
+                    break;
+
+                case "HighlightBackground":
+                    sec.PutSerialData(HighlightBackground);
+                    break;
+
+                case "Padding":
+                    sec.PutSerialData(Padding);
+                    break;
+
+                default:
+                    base.ProcessCollection(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IDisposable
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        public override void Dispose()
+        {
+            Background = null;
+            DropShadow = null;
+            ConnectorLineStyle = null;
+            HighlightBackground = null;
+            Padding = null;
+
+            base.Dispose();
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/DefaultVisualStyles.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/DefaultVisualStyles.cs
new file mode 100644
index 00000000..2e35a998
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/DefaultVisualStyles.cs	
@@ -0,0 +1,1347 @@
+using System;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar.Charts.Style
+{
+    /// <summary>
+    /// Defines set of default visual styles that are defined on the container control.
+    /// </summary>
+    [TypeConverter(typeof(VisualStylesConverter))]
+    public class DefaultVisualStyles : IProcessSerialElement, INotifyPropertyChanged, IDisposable
+    {
+        #region Private variables
+
+        // Multi state style definitions
+
+        private ContainerVisualStyles _ContainerVisualStyles;
+
+        private ChartLegendVisualStyles _ChartLegendVisualStyles;
+        private ChartLegendItemVisualStyles _ChartLegendItemVisualStyles;
+
+        private ChartSliceVisualStyles _SliceVisualStyles;
+        private ChartSliceVisualStyles _OtherSliceVisualStyles;
+
+        private ScrollBarVisualStyles _HScrollBarVisualStyles;
+        private ScrollBarVisualStyles _VScrollBarVisualStyles;
+
+        // Single state style definitions
+
+        private ChartAxisVisualStyle _ChartXAxisVisualStyle;
+        private ChartAxisVisualStyle _ChartYAxisVisualStyle;
+
+        private ChartPanelVisualStyle _ChartPanelVisualStyle;
+        private ChartSeriesVisualStyle _ChartSeriesVisualStyle;
+        private ChartTickmarkVisualStyle _ChartTickmarkVisualStyle;
+        private ChartTitleVisualStyle _ChartTitleVisualStyle;
+        private ChartXyVisualStyle _ChartXyVisualStyle;
+        private DataLabelVisualStyle _DataLabelVisualStyle;
+
+        private CrosshairValueVisualStyle _CrosshairLabelVisualStyle;
+        private CrosshairVisualStyle _CrosshairVisualStyle;
+
+        private DividerLineVisualStyle _DividerLineVisualStyle;
+        private PieGridLineVisualStyle _GridLineVisualStyle;
+        private PieChartVisualStyle _PieChartVisualStyle;
+
+        private ReferenceLineVisualStyle _ReferenceLineVisualStyle;
+        private RegressionLineVisualStyle _RegressionLineVisualStyle;
+        private TrendLineVisualStyle _TrendLineVisualStyle;
+
+        private TickmarkLabelVisualStyle _TickmarkLabelVisualStyle;
+
+        #endregion
+
+        #region Public properties
+
+        #region ChartLegendItemVisualStyles
+
+        /// <summary>
+        /// Gets or sets the visual styles to be used for ChartLegendItem elements 
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates visual styles to be used for ChartLegendI tem elements")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ChartLegendItemVisualStyles ChartLegendItemVisualStyles
+        {
+            get
+            {
+                if (_ChartLegendItemVisualStyles == null)
+                {
+                    _ChartLegendItemVisualStyles = new ChartLegendItemVisualStyles();
+
+                    StyleChangeHandler(null, _ChartLegendItemVisualStyles);
+                }
+
+                return (_ChartLegendItemVisualStyles);
+            }
+
+            set
+            {
+                if (value != _ChartLegendItemVisualStyles)
+                {
+                    ChartLegendItemVisualStyles oldValue = _ChartLegendItemVisualStyles;
+                    _ChartLegendItemVisualStyles = value;
+
+                    OnStyleChanged("ChartLegendVisualStyles", oldValue, value);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ChartLegendVisualStyles
+
+        /// <summary>
+        /// Gets or sets the visual styles to be used for ChartLegend elements 
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates visual styles to be used for ChartLegend elements")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ChartLegendVisualStyles ChartLegendVisualStyles
+        {
+            get
+            {
+                if (_ChartLegendVisualStyles == null)
+                {
+                    _ChartLegendVisualStyles = new ChartLegendVisualStyles();
+
+                    StyleChangeHandler(null, _ChartLegendVisualStyles);
+                }
+
+                return (_ChartLegendVisualStyles);
+            }
+
+            set
+            {
+                if (value != _ChartLegendVisualStyles)
+                {
+                    ChartLegendVisualStyles oldValue = _ChartLegendVisualStyles;
+                    _ChartLegendVisualStyles = value;
+
+                    OnStyleChanged("ChartLegendVisualStyles", oldValue, value);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ChartPanelVisualStyle
+
+        /// <summary>
+        /// Gets or sets the visual style to be used for ChartPanel elements 
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates visual style to be used for ChartPanel elements")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ChartPanelVisualStyle ChartPanelVisualStyle
+        {
+            get
+            {
+                if (_ChartPanelVisualStyle == null)
+                {
+                    _ChartPanelVisualStyle = new ChartPanelVisualStyle();
+
+                    StyleChangeHandler(null, _ChartPanelVisualStyle);
+                }
+
+                return (_ChartPanelVisualStyle);
+            }
+
+            set
+            {
+                if (_ChartPanelVisualStyle != value)
+                {
+                    ChartPanelVisualStyle oldValue = _ChartPanelVisualStyle;
+                    _ChartPanelVisualStyle = value;
+
+                    OnStyleChanged("ChartPanelVisualStyle", oldValue, value);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ChartSeriesVisualStyle
+
+        /// <summary>
+        /// Gets or sets the visual style to be used for ChartSeries elements 
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates visual style to be used for ChartSeries elements")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ChartSeriesVisualStyle ChartSeriesVisualStyle
+        {
+            get
+            {
+                if (_ChartSeriesVisualStyle == null)
+                {
+                    _ChartSeriesVisualStyle = new ChartSeriesVisualStyle();
+
+                    StyleChangeHandler(null, _ChartSeriesVisualStyle);
+                }
+
+                return (_ChartSeriesVisualStyle);
+            }
+
+            set
+            {
+                if (value != _ChartSeriesVisualStyle)
+                {
+                    ChartSeriesVisualStyle oldValue = _ChartSeriesVisualStyle;
+                    _ChartSeriesVisualStyle = value;
+
+                    OnStyleChanged("ChartSeriesVisualStyle", oldValue, value);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ChartTickmarkVisualStyle
+
+        /// <summary>
+        /// Gets or sets the visual style to be used for chart Tickmark elements 
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates visual style to be used for chart Tickmark elements ")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ChartTickmarkVisualStyle ChartTickmarkVisualStyle
+        {
+            get
+            {
+                if (_ChartTickmarkVisualStyle == null)
+                {
+                    _ChartTickmarkVisualStyle = new ChartTickmarkVisualStyle();
+
+                    StyleChangeHandler(null, _ChartTickmarkVisualStyle);
+                }
+
+                return (_ChartTickmarkVisualStyle);
+            }
+
+            set
+            {
+                if (_ChartTickmarkVisualStyle != value)
+                {
+                    ChartTickmarkVisualStyle oldValue = _ChartTickmarkVisualStyle;
+                    _ChartTickmarkVisualStyle = value;
+
+                    OnStyleChanged("ChartTickmarkVisualStyle", oldValue, value);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ChartTitleVisualStyle
+
+        /// <summary>
+        /// Gets or sets the visual style to be used for ChartTitle elements 
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates visual style to be used for ChartTitle elements")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ChartTitleVisualStyle ChartTitleVisualStyle
+        {
+            get
+            {
+                if (_ChartTitleVisualStyle == null)
+                {
+                    _ChartTitleVisualStyle = new ChartTitleVisualStyle();
+
+                    StyleChangeHandler(null, _ChartTitleVisualStyle);
+                }
+
+                return (_ChartTitleVisualStyle);
+            }
+
+            set
+            {
+                if (_ChartTitleVisualStyle != value)
+                {
+                    ChartTitleVisualStyle oldValue = _ChartTitleVisualStyle;
+                    _ChartTitleVisualStyle = value;
+
+                    OnStyleChanged("ChartTitleVisualStyle", oldValue, value);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ChartXAxisVisualStyle
+
+        /// <summary>
+        /// Gets or sets the visual style to be used for X Axis elements 
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates visual style to be used for X Axis elements ")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ChartAxisVisualStyle ChartXAxisVisualStyle
+        {
+            get
+            {
+                if (_ChartXAxisVisualStyle == null)
+                {
+                    _ChartXAxisVisualStyle = new ChartAxisVisualStyle();
+
+                    StyleChangeHandler(null, _ChartXAxisVisualStyle);
+                }
+
+                return (_ChartXAxisVisualStyle);
+            }
+
+            set
+            {
+                if (_ChartXAxisVisualStyle != value)
+                {
+                    ChartAxisVisualStyle oldValue = _ChartXAxisVisualStyle;
+                    _ChartXAxisVisualStyle = value;
+
+                    OnStyleChanged("ChartXAxisVisualStyle", oldValue, value);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ChartXyVisualStyle
+
+        /// <summary>
+        /// Gets or sets the visual style to be used for XyChart elements 
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates visual style to be used for XyChart elements")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ChartXyVisualStyle ChartXyVisualStyle
+        {
+            get
+            {
+                if (_ChartXyVisualStyle == null)
+                {
+                    _ChartXyVisualStyle = new ChartXyVisualStyle();
+
+                    StyleChangeHandler(null, _ChartXyVisualStyle);
+                }
+
+                return (_ChartXyVisualStyle);
+            }
+
+            set
+            {
+                if (_ChartXyVisualStyle != value)
+                {
+                    ChartXyVisualStyle oldValue = _ChartXyVisualStyle;
+                    _ChartXyVisualStyle = value;
+
+                    OnStyleChanged("ChartXyVisualStyle", oldValue, value);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ChartYAxisVisualStyle
+
+        /// <summary>
+        /// Gets or sets the visual style to be used for Y Axis elements 
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates visual style to be used for Y Axis elements ")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ChartAxisVisualStyle ChartYAxisVisualStyle
+        {
+            get
+            {
+                if (_ChartYAxisVisualStyle == null)
+                {
+                    _ChartYAxisVisualStyle = new ChartAxisVisualStyle();
+
+                    StyleChangeHandler(null, _ChartYAxisVisualStyle);
+                }
+
+                return (_ChartYAxisVisualStyle);
+            }
+
+            set
+            {
+                if (_ChartYAxisVisualStyle != value)
+                {
+                    ChartAxisVisualStyle oldValue = _ChartYAxisVisualStyle;
+                    _ChartYAxisVisualStyle = value;
+
+                    OnStyleChanged("ChartYAxisVisualStyle", oldValue, value);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ContainerVisualStyles
+
+        /// <summary>
+        /// Gets or sets the visual stylse to be used for Chart Container elements 
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates visual styles to be used for XyChart elements")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ContainerVisualStyles ContainerVisualStyles
+        {
+            get
+            {
+                if (_ContainerVisualStyles == null)
+                {
+                    _ContainerVisualStyles = new ContainerVisualStyles();
+
+                    StyleChangeHandler(null, _ContainerVisualStyles);
+                }
+
+                return (_ContainerVisualStyles);
+            }
+
+            set
+            {
+                if (_ContainerVisualStyles != value)
+                {
+                    ContainerVisualStyles oldValue = _ContainerVisualStyles;
+                    _ContainerVisualStyles = value;
+
+                    OnStyleChanged("ContainerVisualStyles", oldValue, value);
+                }
+            }
+        }
+
+        #endregion
+
+        #region CrosshairLabelVisualStyle
+
+        /// <summary>
+        /// Gets or sets the visual style to be used for Crosshair label elements 
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates visual style to be used for Crosshair label elements")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public CrosshairValueVisualStyle CrosshairLabelVisualStyle
+        {
+            get
+            {
+                if (_CrosshairLabelVisualStyle == null)
+                {
+                    _CrosshairLabelVisualStyle = new CrosshairValueVisualStyle();
+
+                    StyleChangeHandler(null, _CrosshairLabelVisualStyle);
+                }
+
+                return (_CrosshairLabelVisualStyle);
+            }
+
+            set
+            {
+                if (_CrosshairLabelVisualStyle != value)
+                {
+                    CrosshairValueVisualStyle oldValue = _CrosshairLabelVisualStyle;
+                    _CrosshairLabelVisualStyle = value;
+
+                    OnStyleChanged("CrosshairLabelVisualStyle", oldValue, value);
+                }
+            }
+        }
+
+        #endregion
+
+        #region CrosshairVisualStyle
+
+        /// <summary>
+        /// Gets or sets the visual style to be used for Crosshair elements 
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates visual style to be used for Crosshair elements")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public CrosshairVisualStyle CrosshairVisualStyle
+        {
+            get
+            {
+                if (_CrosshairVisualStyle == null)
+                {
+                    _CrosshairVisualStyle = new CrosshairVisualStyle();
+
+                    StyleChangeHandler(null, _CrosshairVisualStyle);
+                }
+
+                return (_CrosshairVisualStyle);
+            }
+
+            set
+            {
+                if (_CrosshairVisualStyle != value)
+                {
+                    CrosshairVisualStyle oldValue = _CrosshairVisualStyle;
+                    _CrosshairVisualStyle = value;
+
+                    OnStyleChanged("CrosshairVisualStyle", oldValue, value);
+                }
+            }
+        }
+
+        #endregion
+
+        #region DataLabelVisualStyle
+
+        /// <summary>
+        /// Gets or sets the visual style to be used for DataLabel elements 
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates visual style to be used for DataLabel elements")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public DataLabelVisualStyle DataLabelVisualStyle
+        {
+            get
+            {
+                if (_DataLabelVisualStyle == null)
+                {
+                    _DataLabelVisualStyle = new DataLabelVisualStyle();
+
+                    StyleChangeHandler(null, _DataLabelVisualStyle);
+                }
+
+                return (_DataLabelVisualStyle);
+            }
+
+            set
+            {
+                if (value != _DataLabelVisualStyle)
+                {
+                    DataLabelVisualStyle oldValue = _DataLabelVisualStyle;
+                    _DataLabelVisualStyle = value;
+
+                    OnStyleChanged("DataLabelVisualStyle", oldValue, value);
+                }
+            }
+        }
+
+        #endregion
+
+        #region DividerLineVisualStyle
+
+        /// <summary>
+        /// Gets or sets the visual style to be used for DividerLine elements 
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates visual style to be used for DividerLine elements ")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public DividerLineVisualStyle DividerLineVisualStyle
+        {
+            get
+            {
+                if (_DividerLineVisualStyle == null)
+                {
+                    _DividerLineVisualStyle = new DividerLineVisualStyle();
+
+                    StyleChangeHandler(null, _DividerLineVisualStyle);
+                }
+
+                return (_DividerLineVisualStyle);
+            }
+
+            set
+            {
+                if (_DividerLineVisualStyle != value)
+                {
+                    DividerLineVisualStyle oldValue = _DividerLineVisualStyle;
+                    _DividerLineVisualStyle = value;
+
+                    OnStyleChanged("DividerLineVisualStyle", oldValue, value);
+                }
+            }
+        }
+
+        #endregion
+
+        #region GridLineVisualStyle
+
+        /// <summary>
+        /// Gets or sets the visual style to be used for GridLine elements 
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates visual style to be used for GridLine elements ")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public PieGridLineVisualStyle GridLineVisualStyle
+        {
+            get
+            {
+                if (_GridLineVisualStyle == null)
+                {
+                    _GridLineVisualStyle = new PieGridLineVisualStyle();
+
+                    StyleChangeHandler(null, _GridLineVisualStyle);
+                }
+
+                return (_GridLineVisualStyle);
+            }
+
+            set
+            {
+                if (_GridLineVisualStyle != value)
+                {
+                    PieGridLineVisualStyle oldValue = _GridLineVisualStyle;
+                    _GridLineVisualStyle = value;
+
+                    OnStyleChanged("GridLinesVisualStyle", oldValue, value);
+                }
+            }
+        }
+
+        #endregion
+
+        #region HScrollBarVisualStyles
+
+        /// <summary>
+        /// Gets or sets the visual styles to be used for Horizontal ScrollBar elements 
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates visual styles to be used for Horizontal ScrollBar elements ")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ScrollBarVisualStyles HScrollBarVisualStyles
+        {
+            get
+            {
+                if (_HScrollBarVisualStyles == null)
+                {
+                    _HScrollBarVisualStyles = new ScrollBarVisualStyles();
+
+                    StyleChangeHandler(null, _HScrollBarVisualStyles);
+                }
+
+                return (_HScrollBarVisualStyles);
+            }
+
+            set
+            {
+                if (_HScrollBarVisualStyles != value)
+                {
+                    ScrollBarVisualStyles oldValue = _HScrollBarVisualStyles;
+                    _HScrollBarVisualStyles = value;
+
+                    OnStyleChanged("HScrollBarVisualStyles", oldValue, value);
+                }
+            }
+        }
+
+        #endregion
+
+        #region OtherSliceVisualStyles
+
+        /// <summary>
+        /// Gets or sets the default visual style for the series 'Other' slice.
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates the default visual style for the series 'Other' slice.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ChartSliceVisualStyles OtherSliceVisualStyles
+        {
+            get
+            {
+                if (_OtherSliceVisualStyles == null)
+                {
+                    _OtherSliceVisualStyles = new ChartSliceVisualStyles();
+
+                    StyleChangeHandler(null, _OtherSliceVisualStyles);
+                }
+
+                return (_OtherSliceVisualStyles);
+            }
+
+            set
+            {
+                if (_OtherSliceVisualStyles != value)
+                {
+                    ChartSliceVisualStyles oldValue = _OtherSliceVisualStyles;
+
+                    _OtherSliceVisualStyles = value;
+
+                    OnStyleChanged("OtherSliceVisualStyles", oldValue, value);
+
+                    if (oldValue != null)
+                        oldValue.Dispose();
+                }
+            }
+        }
+
+        #endregion
+
+        #region PieChartVisualStyles
+
+        /// <summary>
+        /// Gets or sets the visual style to be used for PieChart elements 
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates visual style to be used for PieChart elements")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public PieChartVisualStyle PieChartVisualStyle
+        {
+            get
+            {
+                if (_PieChartVisualStyle == null)
+                {
+                    _PieChartVisualStyle = new PieChartVisualStyle();
+
+                    StyleChangeHandler(null, _PieChartVisualStyle);
+                }
+
+                return (_PieChartVisualStyle);
+            }
+
+            set
+            {
+                if (_PieChartVisualStyle != value)
+                {
+                    PieChartVisualStyle oldValue = _PieChartVisualStyle;
+                    _PieChartVisualStyle = value;
+
+                    OnStyleChanged("PieChartVisualStyle", oldValue, value);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ReferenceLineVisualStyle
+
+        /// <summary>
+        /// Gets or sets the visual style to be used for ReferenceLine elements 
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates visual style to be used for ReferenceLine elements ")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ReferenceLineVisualStyle ReferenceLineVisualStyle
+        {
+            get
+            {
+                if (_ReferenceLineVisualStyle == null)
+                {
+                    _ReferenceLineVisualStyle = new ReferenceLineVisualStyle();
+
+                    StyleChangeHandler(null, _ReferenceLineVisualStyle);
+                }
+
+                return (_ReferenceLineVisualStyle);
+            }
+
+            set
+            {
+                if (_ReferenceLineVisualStyle != value)
+                {
+                    ReferenceLineVisualStyle oldValue = _ReferenceLineVisualStyle;
+                    _ReferenceLineVisualStyle = value;
+
+                    OnStyleChanged("ReferenceLineVisualStyle", oldValue, value);
+                }
+            }
+        }
+
+        #endregion
+
+        #region RegressionLineVisualStyle
+
+        /// <summary>
+        /// Gets or sets the visual style to be used for RegressionIndicator elements 
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates visual style to be used for RegressionIndicator elements ")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public RegressionLineVisualStyle RegressionLineVisualStyle
+        {
+            get
+            {
+                if (_RegressionLineVisualStyle == null)
+                {
+                    _RegressionLineVisualStyle = new RegressionLineVisualStyle();
+
+                    StyleChangeHandler(null, _RegressionLineVisualStyle);
+                }
+
+                return (_RegressionLineVisualStyle);
+            }
+
+            set
+            {
+                if (_RegressionLineVisualStyle != value)
+                {
+                    RegressionLineVisualStyle oldValue = _RegressionLineVisualStyle;
+                    _RegressionLineVisualStyle = value;
+
+                    OnStyleChanged("RegressionLineVisualStyle", oldValue, value);
+                }
+            }
+        }
+
+        #endregion
+
+        #region SliceVisualStyles
+
+        /// <summary>
+        /// Gets or sets the visual style to be used for Pie Slice elements 
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates visual style to be used for Pie Slice elements")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ChartSliceVisualStyles SliceVisualStyles
+        {
+            get
+            {
+                if (_SliceVisualStyles == null)
+                {
+                    _SliceVisualStyles = new ChartSliceVisualStyles();
+
+                    StyleChangeHandler(null, _SliceVisualStyles);
+                }
+
+                return (_SliceVisualStyles);
+            }
+
+            set
+            {
+                if (value != _SliceVisualStyles)
+                {
+                    ChartSliceVisualStyles oldValue = _SliceVisualStyles;
+                    _SliceVisualStyles = value;
+
+                    OnStyleChanged("SliceVisualStyles", oldValue, value);
+                }
+            }
+        }
+
+        #endregion
+
+        #region TickmarkLabelVisualStyle
+
+        /// <summary>
+        /// Gets or sets the visual styles to be used for Axis Lable 
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates visual styles to be used for Axis Lable ")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public TickmarkLabelVisualStyle TickmarkLabelVisualStyle
+        {
+            get
+            {
+                if (_TickmarkLabelVisualStyle == null)
+                {
+                    _TickmarkLabelVisualStyle = new TickmarkLabelVisualStyle();
+
+                    StyleChangeHandler(null, _TickmarkLabelVisualStyle);
+                }
+
+                return (_TickmarkLabelVisualStyle);
+            }
+
+            set
+            {
+                if (_TickmarkLabelVisualStyle != value)
+                {
+                    TickmarkLabelVisualStyle oldValue = _TickmarkLabelVisualStyle;
+                    _TickmarkLabelVisualStyle = value;
+
+                    OnStyleChanged("TickmarkLabelVisualStyles", oldValue, value);
+                }
+            }
+        }
+
+        #endregion
+
+        #region TrendLineVisualStyle
+
+        /// <summary>
+        /// Gets or sets the visual style to be used for TrendLine elements 
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates visual style to be used for TrendLine elements ")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public TrendLineVisualStyle TrendLineVisualStyle
+        {
+            get
+            {
+                if (_TrendLineVisualStyle == null)
+                {
+                    _TrendLineVisualStyle = new TrendLineVisualStyle();
+
+                    StyleChangeHandler(null, _TrendLineVisualStyle);
+                }
+
+                return (_TrendLineVisualStyle);
+            }
+
+            set
+            {
+                if (_TrendLineVisualStyle != value)
+                {
+                    TrendLineVisualStyle oldValue = _TrendLineVisualStyle;
+                    _TrendLineVisualStyle = value;
+
+                    OnStyleChanged("TrendLineVisualStyle", oldValue, value);
+                }
+            }
+        }
+
+        #endregion
+
+        #region VScrollBarVisualStyles
+
+        /// <summary>
+        /// Gets or sets the visual styles to be used for Vertical ScrollBar elements 
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates visual styles to be used for Vertical ScrollBar elements ")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ScrollBarVisualStyles VScrollBarVisualStyles
+        {
+            get
+            {
+                if (_VScrollBarVisualStyles == null)
+                {
+                    _VScrollBarVisualStyles = new ScrollBarVisualStyles();
+
+                    StyleChangeHandler(null, _VScrollBarVisualStyles);
+                }
+
+                return (_VScrollBarVisualStyles);
+            }
+
+            set
+            {
+                if (_VScrollBarVisualStyles != value)
+                {
+                    ScrollBarVisualStyles oldValue = _VScrollBarVisualStyles;
+                    _VScrollBarVisualStyles = value;
+
+                    OnStyleChanged("VScrollBarVisualStyles", oldValue, value);
+                }
+            }
+        }
+
+        #endregion
+
+        #region IsEmpty
+
+        /// <summary>
+        /// Gets whether the style collection is logically Empty.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        [Description("Gets whether the style collection is logically Empty.")]
+        public bool IsEmpty
+        {
+            get
+            {
+                if (_ChartLegendItemVisualStyles != null && _ChartLegendItemVisualStyles.IsEmpty == false)
+                    return (false);
+
+                if (_ChartLegendVisualStyles != null && _ChartLegendVisualStyles.IsEmpty == false)
+                    return (false);
+
+                if (_ChartPanelVisualStyle != null && _ChartPanelVisualStyle.IsEmpty == false)
+                    return (false);
+
+                if (_HScrollBarVisualStyles != null && _HScrollBarVisualStyles.IsEmpty == false)
+                    return (false);
+
+                if (_VScrollBarVisualStyles != null && _VScrollBarVisualStyles.IsEmpty == false)
+                    return (false);
+
+                if (_ChartSeriesVisualStyle != null && _ChartSeriesVisualStyle.IsEmpty == false)
+                    return (false);
+
+                if (_ChartTickmarkVisualStyle != null && _ChartTickmarkVisualStyle.IsEmpty == false)
+                    return (false);
+
+                if (_ChartTitleVisualStyle != null && _ChartTitleVisualStyle.IsEmpty == false)
+                    return (false);
+
+                if (_ChartXAxisVisualStyle != null && _ChartXAxisVisualStyle.IsEmpty == false)
+                    return (false);
+
+                if (_ChartXyVisualStyle != null && _ChartXyVisualStyle.IsEmpty == false)
+                    return (false);
+
+                if (_ChartYAxisVisualStyle != null && _ChartYAxisVisualStyle.IsEmpty == false)
+                    return (false);
+
+                if (_ContainerVisualStyles != null && _ContainerVisualStyles.IsEmpty == false)
+                    return (false);
+
+                if (_CrosshairLabelVisualStyle != null && _CrosshairLabelVisualStyle.IsEmpty == false)
+                    return (false);
+
+                if (_CrosshairVisualStyle != null && _CrosshairVisualStyle.IsEmpty == false)
+                    return (false);
+
+                if (_DataLabelVisualStyle != null && _DataLabelVisualStyle.IsEmpty == false)
+                    return (false);
+
+                if (_DividerLineVisualStyle != null && _DividerLineVisualStyle.IsEmpty == false)
+                    return (false);
+
+                if (_GridLineVisualStyle != null && _GridLineVisualStyle.IsEmpty == false)
+                    return (false);
+
+                if (_ReferenceLineVisualStyle != null && _ReferenceLineVisualStyle.IsEmpty == false)
+                    return (false);
+
+                if (_TickmarkLabelVisualStyle != null && _TickmarkLabelVisualStyle.IsEmpty == false)
+                    return (false);
+
+                if (_TrendLineVisualStyle != null && _TrendLineVisualStyle.IsEmpty == false)
+                    return (false);
+
+                return (true);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region OnStyleChanged
+
+        private void OnStyleChanged(string property,
+            INotifyPropertyChanged oldValue, INotifyPropertyChanged newValue)
+        {
+            StyleChangeHandler(oldValue, newValue);
+
+            OnPropertyChanged(new VisualPropertyChangedEventArgs(property));
+        }
+
+        #endregion
+
+        #region StyleChangeHandler
+
+        private void StyleChangeHandler(
+            INotifyPropertyChanged oldValue, INotifyPropertyChanged newValue)
+        {
+            if (oldValue != null)
+                oldValue.PropertyChanged -= StyleChanged;
+
+            if (newValue != null)
+                newValue.PropertyChanged += StyleChanged;
+        }
+
+        #endregion
+
+        #region StyleChanged
+
+        /// <summary>
+        /// Occurs when one of element visual styles has property changes.
+        /// Default implementation invalidates visual appearance of element.
+        /// </summary>
+        /// <param name="sender">VisualStyle that changed.</param>
+        /// <param name="e">Event arguments.</param>
+        protected virtual void StyleChanged(object sender, PropertyChangedEventArgs e)
+        {
+            OnPropertyChanged(e);
+        }
+
+        #endregion
+
+        #region Copy/CopyTo
+
+        public DefaultVisualStyles Copy()
+        {
+            DefaultVisualStyles copy = new DefaultVisualStyles();
+
+            CopyTo(copy);
+
+            return (copy);
+        }
+
+        public void CopyTo(DefaultVisualStyles c)
+        {
+            for (int i = 0; i < ChartLegendItemVisualStyles.Styles.Length; i++)
+            {
+                if (ChartLegendItemVisualStyles.Styles[i] != null)
+                    c.ChartLegendItemVisualStyles.Styles[i] = ChartLegendItemVisualStyles.Styles[i].Copy();
+            }
+
+            for (int i = 0; i < ChartLegendVisualStyles.Styles.Length; i++)
+            {
+                if (ChartLegendVisualStyles.Styles[i] != null)
+                    c.ChartLegendVisualStyles.Styles[i] = ChartLegendVisualStyles.Styles[i].Copy();
+            }
+
+            ChartPanelVisualStyle.CopyTo(c.ChartPanelVisualStyle);
+            ChartSeriesVisualStyle.CopyTo(c.ChartSeriesVisualStyle);
+            ChartTickmarkVisualStyle.CopyTo(c.ChartTickmarkVisualStyle);
+            ChartTitleVisualStyle.CopyTo(c.ChartTitleVisualStyle);
+            ChartXAxisVisualStyle.CopyTo(c.ChartXAxisVisualStyle);
+            ChartXyVisualStyle.CopyTo(c.ChartXyVisualStyle);
+            ChartYAxisVisualStyle.CopyTo(c.ChartYAxisVisualStyle);
+
+            for (int i = 0; i < ContainerVisualStyles.Styles.Length; i++)
+            {
+                if (ContainerVisualStyles.Styles[i] != null)
+                    c.ContainerVisualStyles.Styles[i] = ContainerVisualStyles.Styles[i].Copy();
+            }
+
+            CrosshairLabelVisualStyle.CopyTo(c.CrosshairLabelVisualStyle);
+            CrosshairVisualStyle.CopyTo(c.CrosshairVisualStyle);
+            DataLabelVisualStyle.CopyTo(c.DataLabelVisualStyle);
+            DividerLineVisualStyle.CopyTo(c.DividerLineVisualStyle);
+            GridLineVisualStyle.CopyTo(c.GridLineVisualStyle);
+
+            for (int i = 0; i < HScrollBarVisualStyles.Styles.Length; i++)
+            {
+                if (HScrollBarVisualStyles.Styles[i] != null)
+                    c.HScrollBarVisualStyles.Styles[i] = HScrollBarVisualStyles.Styles[i].Copy();
+            }
+
+            for (int i = 0; i < OtherSliceVisualStyles.Styles.Length; i++)
+            {
+                if (OtherSliceVisualStyles.Styles[i] != null)
+                    c.OtherSliceVisualStyles.Styles[i] = OtherSliceVisualStyles.Styles[i].Copy();
+            }
+
+            PieChartVisualStyle.CopyTo(c.PieChartVisualStyle);
+            ReferenceLineVisualStyle.CopyTo(c.ReferenceLineVisualStyle);
+            RegressionLineVisualStyle.CopyTo(c.RegressionLineVisualStyle);
+
+            for (int i = 0; i < SliceVisualStyles.Styles.Length; i++)
+            {
+                if (SliceVisualStyles.Styles[i] != null)
+                    c.SliceVisualStyles.Styles[i] = SliceVisualStyles.Styles[i].Copy();
+            }
+
+            TickmarkLabelVisualStyle.CopyTo(c.TickmarkLabelVisualStyle);
+            TrendLineVisualStyle.CopyTo(c.TrendLineVisualStyle);
+
+            for (int i = 0; i < VScrollBarVisualStyles.Styles.Length; i++)
+            {
+                if (VScrollBarVisualStyles.Styles[i] != null)
+                    c.VScrollBarVisualStyles.Styles[i] = VScrollBarVisualStyles.Styles[i].Copy();
+            }
+        }
+
+        #endregion
+
+        #region GetSerialData
+
+        internal SerialElementCollection GetSerialData()
+        {
+            return (GetSerialData(true));
+        }
+
+        internal SerialElementCollection GetSerialData(bool root)
+        {
+            SerialElementCollection sec = new SerialElementCollection();
+
+            if (root == true)
+                sec.AddStartElement("DefaultVisualStyles");
+
+            if (_ChartLegendItemVisualStyles != null && _ChartLegendItemVisualStyles.IsEmpty == false)
+                sec.AddElement(_ChartLegendItemVisualStyles.GetSerialData("ChartLegendItemVisualStyles"));
+
+            if (_ChartLegendVisualStyles != null && _ChartLegendVisualStyles.IsEmpty == false)
+                sec.AddElement(_ChartLegendVisualStyles.GetSerialData("ChartLegendVisualStyles"));
+
+            sec.AddElement(_ChartPanelVisualStyle);
+            sec.AddElement(_ChartSeriesVisualStyle);
+            sec.AddElement(_ChartTickmarkVisualStyle);
+            sec.AddElement(_ChartTitleVisualStyle);
+            sec.AddElement(_ChartXAxisVisualStyle);
+            sec.AddElement(_ChartXyVisualStyle);
+            sec.AddElement(_ChartYAxisVisualStyle);
+
+            if (_ContainerVisualStyles != null && _ContainerVisualStyles.IsEmpty == false)
+                sec.AddElement(_ContainerVisualStyles.GetSerialData("ContainerVisualStyles"));
+
+            sec.AddElement(_CrosshairLabelVisualStyle);
+            sec.AddElement(_CrosshairVisualStyle);
+            sec.AddElement(_DataLabelVisualStyle);
+            sec.AddElement(_DividerLineVisualStyle);
+            sec.AddElement(_GridLineVisualStyle);
+
+            if (_HScrollBarVisualStyles != null && _HScrollBarVisualStyles.IsEmpty == false)
+                sec.AddElement(_HScrollBarVisualStyles.GetSerialData("HScrollBarVisualStyles"));
+
+            if (_OtherSliceVisualStyles != null && _OtherSliceVisualStyles.IsEmpty == false)
+                sec.AddElement(_OtherSliceVisualStyles.GetSerialData("OtherSliceVisualStyles"));
+
+            sec.AddElement(_PieChartVisualStyle);
+            sec.AddElement(_ReferenceLineVisualStyle);
+            sec.AddElement(_RegressionLineVisualStyle);
+
+            if (_SliceVisualStyles != null && _SliceVisualStyles.IsEmpty == false)
+                sec.AddElement(_SliceVisualStyles.GetSerialData("SliceVisualStyles"));
+
+            sec.AddElement(_TickmarkLabelVisualStyle);
+            sec.AddElement(_TrendLineVisualStyle);
+
+            if (_VScrollBarVisualStyles != null && _VScrollBarVisualStyles.IsEmpty == false)
+                sec.AddElement(_VScrollBarVisualStyles.GetSerialData("VScrollBarVisualStyles"));
+
+            if (root == true)
+                sec.AddEndElement("DefaultVisualStyles");
+
+            return (sec);
+        }
+
+        #endregion
+
+        #region PutSerialData
+
+        #region ProcessValue
+
+        void IProcessSerialElement.ProcessValue(SerialElement se)
+        {
+            throw new Exception("Unknown Serial Value (" + se.Name + ")");
+        }
+
+        #endregion
+
+        #region ProcessCollection
+
+        void IProcessSerialElement.ProcessCollection(SerialElement se)
+        {
+            switch (se.Name)
+            {
+                case "ChartLegendItemVisualStyles":
+                    se.Sec.PutSerialData(ChartLegendItemVisualStyles);
+                    break;
+
+                case "ChartLegendVisualStyles":
+                    se.Sec.PutSerialData(ChartLegendVisualStyles);
+                    break;
+
+                case "ChartPanelVisualStyle":
+                    se.Sec.PutSerialData(ChartPanelVisualStyle);
+                    break;
+
+                case "ChartSeriesVisualStyle":
+                    se.Sec.PutSerialData(ChartSeriesVisualStyle);
+                    break;
+
+                case "ChartTickmarkVisualStyle":
+                    se.Sec.PutSerialData(ChartTickmarkVisualStyle);
+                    break;
+
+                case "ChartTitleVisualStyle":
+                    se.Sec.PutSerialData(ChartTitleVisualStyle);
+                    break;
+
+                case "ChartXAxisVisualStyle":
+                    se.Sec.PutSerialData(ChartXAxisVisualStyle);
+                    break;
+
+                case "ChartXyVisualStyle":
+                    se.Sec.PutSerialData(ChartXyVisualStyle);
+                    break;
+
+                case "ChartYAxisVisualStyle":
+                    se.Sec.PutSerialData(ChartYAxisVisualStyle);
+                    break;
+
+                case "ContainerVisualStyles":
+                    se.Sec.PutSerialData(ContainerVisualStyles);
+                    break;
+
+                case "CrosshairLabelVisualStyle":
+                    se.Sec.PutSerialData(CrosshairLabelVisualStyle);
+                    break;
+
+                case "CrosshairVisualStyle":
+                    se.Sec.PutSerialData(CrosshairVisualStyle);
+                    break;
+
+                case "DataLabelVisualStyle":
+                    se.Sec.PutSerialData(DataLabelVisualStyle);
+                    break;
+
+                case "DividerLineVisualStyle":
+                    se.Sec.PutSerialData(DividerLineVisualStyle);
+                    break;
+
+                case "GridLineVisualStyle":
+                    se.Sec.PutSerialData(GridLineVisualStyle);
+                    break;
+
+                case "HScrollBarVisualStyles":
+                    se.Sec.PutSerialData(HScrollBarVisualStyles);
+                    break;
+
+                case "OtherSliceVisualStyles":
+                    se.Sec.PutSerialData(OtherSliceVisualStyles);
+                    break;
+
+                case "PieChartVisualStyle":
+                    se.Sec.PutSerialData(PieChartVisualStyle);
+                    break;
+
+                case "ReferenceLineVisualStyle":
+                    se.Sec.PutSerialData(ReferenceLineVisualStyle);
+                    break;
+
+                case "RegressionLineVisualStyle":
+                    se.Sec.PutSerialData(RegressionLineVisualStyle);
+                    break;
+
+                case "SliceVisualStyles":
+                    se.Sec.PutSerialData(SliceVisualStyles);
+                    break;
+
+                case "TickmarkLableVisualStyle":
+                    se.Sec.PutSerialData(TickmarkLabelVisualStyle);
+                    break;
+
+                case "TrendLineVisualStyle":
+                    se.Sec.PutSerialData(TrendLineVisualStyle);
+                    break;
+
+                case "VScrollBarVisualStyles":
+                    se.Sec.PutSerialData(VScrollBarVisualStyles);
+                    break;
+
+                default:
+                    throw new Exception("Unknown Serial Collection (" + se.Name + ")");
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region INotifyPropertyChanged Members
+
+        /// <summary>
+        /// Occurs when property value has changed.
+        /// </summary>
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        /// <summary>
+        /// Raises the PropertyChanged event.
+        /// </summary>
+        /// <param name="e">Event arguments</param>
+        protected virtual void OnPropertyChanged(PropertyChangedEventArgs e)
+        {
+            PropertyChangedEventHandler eh = PropertyChanged;
+
+            if (eh != null)
+                eh(this, e);
+        }
+
+        #endregion
+
+        #region IDisposable
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        public void Dispose()
+        {
+            ChartPanelVisualStyle = null;
+            ChartTitleVisualStyle = null;
+
+            ChartXAxisVisualStyle = null;
+            ChartYAxisVisualStyle = null;
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/DividerLineVisualStyle.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/DividerLineVisualStyle.cs
new file mode 100644
index 00000000..f737c9dc
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/DividerLineVisualStyle.cs	
@@ -0,0 +1,56 @@
+using System.ComponentModel;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Charts.Style
+{
+    /// <summary>
+    /// Represents the visual style of a Legend element.
+    /// </summary>
+    [TypeConverter(typeof(VisualStylesConverter))]
+    public class DividerLineVisualStyle : ChartLineVisualStyle
+    {
+        #region ApplyStyle
+
+        /// <summary>
+        /// Applies the style to the instance of this style.
+        /// </summary>
+        /// <param name="style">Style to apply.</param>
+        public void ApplyStyle(DividerLineVisualStyle style)
+        {
+            if (style != null)
+                base.ApplyStyle(style);
+        }
+
+        #endregion
+
+        #region Copy
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public new DividerLineVisualStyle Copy()
+        {
+            DividerLineVisualStyle style = new DividerLineVisualStyle();
+
+            CopyTo(style);
+
+            return (style);
+        }
+
+        #endregion
+
+        #region CopyTo
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public void CopyTo(DividerLineVisualStyle style)
+        {
+            base.CopyTo(style);
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/DropShadowVisualStyle.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/DropShadowVisualStyle.cs
new file mode 100644
index 00000000..161c8362
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/DropShadowVisualStyle.cs	
@@ -0,0 +1,309 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Globalization;
+
+namespace DevComponents.DotNetBar.Charts.Style
+{
+    /// <summary>
+    /// Represents the visual style of a DropShadow
+    /// </summary>
+    [ToolboxItem(false), DesignTimeVisible(false)]
+    [TypeConverter(typeof(DropShadowStyleConvertor))]
+    public class DropShadowVisualStyle : BaseVisualStyle
+    {
+        #region Private variables
+
+        private Tbool _Enabled = Tbool.NotSet;
+        private Color _ShadowColor = Color.Empty;
+
+        #endregion
+
+        #region Public properties
+
+        #region ShadowColor
+
+        /// <summary>
+        /// Gets or sets the DropShadow color
+        /// </summary>
+        [Description("Indicates the DropShadow color")]
+        public Color ShadowColor
+        {
+            get { return (_ShadowColor); }
+
+            set
+            {
+                if (value != _ShadowColor)
+                {
+                    _ShadowColor = value;
+
+                    OnPropertyChangedEx("ShadowColor", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeShadowColor()
+        {
+            return (_ShadowColor.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetShadowColor()
+        {
+            _ShadowColor = Color.Empty;
+        }
+
+        #endregion
+
+        #region Enabled
+
+        /// <summary>
+        /// Gets or sets whether drop shadow is displayed.
+        /// </summary>
+        [DefaultValue(Tbool.NotSet), Category("Appearance")]
+        [Description("Indicates whether drop shadow is displayed.")]
+        public Tbool Enabled
+        {
+            get { return (_Enabled); }
+
+            set
+            {
+                if (value != _Enabled)
+                {
+                    _Enabled = value;
+
+                    OnPropertyChangedEx("Enabled", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region IsEmpty
+
+        /// <summary>
+        /// Gets whether the style is logically Empty.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        [Description("Gets whether the style is logically Empty.")]
+        public override bool IsEmpty
+        {
+            get
+            {
+                return ((_ShadowColor.IsEmpty == true) &&
+                    (_Enabled == Tbool.NotSet) &&
+                    (base.IsEmpty == true));
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderDropShadow
+
+        internal virtual void RenderDropShadow(
+            Graphics g, Rectangle r, bool drawBot, bool drawRight)
+        {
+            Color color = (_ShadowColor.IsEmpty == false) ? _ShadowColor : Color.Black;
+
+            Point[] pts = new Point[]
+            {
+                new Point(r.X + 3, r.Bottom),
+                new Point(r.Right, r.Bottom),
+                new Point(r.Right, r.Y + 3)
+            };
+
+            using (Pen pen1 = new Pen(Color.FromArgb(100, color)))
+                g.DrawLines(pen1, pts);
+
+            IncShadowPts(pts);
+
+            using (Pen pen2 = new Pen(Color.FromArgb(64, color)))
+                g.DrawLines(pen2, pts);
+
+            IncShadowPts(pts);
+
+            using (Pen pen3 = new Pen(Color.FromArgb(32, color)))
+                g.DrawLines(pen3, pts);
+
+            IncShadowPts(pts);
+        }
+
+        #region IncShadowPts
+
+        private void IncShadowPts(Point[] pts)
+        {
+            pts[0].X++;
+            pts[0].Y++;
+
+            pts[1].X++;
+            pts[1].Y++;
+
+            pts[2].X++;
+            pts[2].Y++;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ApplyStyle
+
+        /// <summary>
+        /// Applies the style to instance of this style.
+        /// </summary>
+        /// <param name="style">Style to apply.</param>
+        public void ApplyStyle(DropShadowVisualStyle style)
+        {
+            if (style != null)
+            {
+                base.ApplyStyle(style);
+
+                if (style.ShadowColor.IsEmpty == false)
+                    ShadowColor = style.ShadowColor;
+
+                if (style.Enabled != Tbool.NotSet)
+                    Enabled = style.Enabled;
+            }
+        }
+
+        #endregion
+
+        #region Copy
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public new DropShadowVisualStyle Copy()
+        {
+            DropShadowVisualStyle style = new DropShadowVisualStyle();
+
+            CopyTo(style);
+
+            return (style);
+        }
+
+        #endregion
+
+        #region CopyTo
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public void CopyTo(DropShadowVisualStyle style)
+        {
+            base.CopyTo(style);
+
+            style.Enabled = _Enabled;
+            style.ShadowColor = _ShadowColor;
+        }
+
+        #endregion
+
+        #region GetSerialData
+
+        internal override SerialElementCollection GetSerialData(string serialName)
+        {
+            SerialElementCollection sec = new SerialElementCollection();
+
+            if (serialName != null)
+            {
+                if (serialName.Equals("") == true)
+                    serialName = "DropShadowVisualStyle";
+
+                sec.AddStartElement(serialName);
+            }
+
+            sec.AddValue("Enabled", Enabled, Tbool.NotSet);
+            sec.AddValue("ShadowColor", ShadowColor, Color.Empty);
+
+            sec.AddElement(base.GetSerialData(null));
+
+            if (serialName != null)
+                sec.AddEndElement(serialName);
+
+            return (sec);
+        }
+
+        #endregion
+
+        #region PutSerialData
+
+        #region ProcessValue
+
+        internal override void ProcessValue(SerialElement se)
+        {
+            switch (se.Name)
+            {
+                case "Enabled":
+                    Enabled = (Tbool)se.GetValueEnum(typeof(Tbool));
+                    break;
+
+                case "ShadowColor":
+                    ShadowColor = se.GetValueColor();
+                    break;
+
+                default:
+                    base.ProcessValue(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IDisposable
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        public override void Dispose()
+        {
+            base.Dispose();
+        }
+
+        #endregion
+    }
+
+    #region DropShadowStyleConvertor
+
+    public class DropShadowStyleConvertor : ExpandableObjectConverter
+    {
+        public override object ConvertTo(
+            ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+        {
+            if (destinationType == typeof(string))
+            {
+                DropShadowVisualStyle dsc = value as DropShadowVisualStyle;
+
+                if (dsc != null)
+                {
+                    ColorConverter cvt = new ColorConverter();
+
+                    if (dsc.Enabled == Tbool.NotSet)
+                        return (" "); 
+                        
+                    return ((dsc.Enabled == Tbool.True) ? "Enabled" : "Disabled");
+                }
+            }
+
+            return (base.ConvertTo(context, culture, value, destinationType));
+        }
+    }
+
+    #endregion
+
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/EffectiveStyles.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/EffectiveStyles.cs
new file mode 100644
index 00000000..b73190fe
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/EffectiveStyles.cs	
@@ -0,0 +1,338 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using DevComponents.DotNetBar.Charts.Style;
+
+namespace DevComponents.DotNetBar.Charts
+{
+    /// <summary>
+    /// Provides helpers when working with EffectiveStyles.
+    /// </summary>
+    public class EffectiveStyles<T> where T : BaseVisualStyle, new()
+    {
+        #region Private variables
+
+        private IEffectiveStyle _ChartElement;
+        private VisualStyles<T> _Styles = new VisualStyles<T>();
+
+        private ushort[] _StyleUpdateCount;
+        private ushort[] _GlobalStyleUpdateCount;
+
+        private List<BaseVisualStyle>[] _StyleList;
+
+        #endregion
+
+        public EffectiveStyles(IEffectiveStyle chartElement)
+        {
+            _ChartElement = chartElement;
+
+            int len = Enum.GetValues(typeof(StyleType)).Length - 1;
+
+            _StyleUpdateCount = new ushort[len];
+            _GlobalStyleUpdateCount = new ushort[len];
+
+            _StyleList = new List<BaseVisualStyle>[len];
+
+            for (int i = 0; i < len; i++)
+            {
+                _StyleUpdateCount[i] = ushort.MaxValue;
+                _GlobalStyleUpdateCount[i] = ushort.MaxValue;
+            }
+        }
+
+        #region Public properties
+
+        #region StyleType Indexer
+
+        public T this[StyleType type]
+        {
+            get { return (GetEffectiveStyle(type)); }
+        }
+
+        #endregion
+
+        #region StyleState Indexer
+
+        public T this[StyleState state]
+        {
+            get { return (GetEffectiveStyle(state)); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetEffectiveStyle
+
+        internal T GetEffectiveStyle(StyleType type)
+        {
+            return (GetStyle(type));
+        }
+
+        internal T GetEffectiveStyle(StyleState state)
+        {
+            if (_ChartElement.ChartControl.DesignerHosted == true)
+                state &= ~(StyleState.MouseOver | StyleState.Selected);
+
+            switch (state)
+            {
+                case StyleState.MouseOver:
+                    return (GetStyle(StyleType.MouseOver));
+
+                case StyleState.Selected:
+                    return (GetStyle(StyleType.Selected));
+
+                case StyleState.Selected | StyleState.MouseOver:
+                    return (GetStyle(StyleType.SelectedMouseOver));
+
+                default:
+                    return (GetStyle(StyleType.Default));
+            }
+        }
+
+        #endregion
+
+        #region GetStyle
+
+        internal T GetStyle(StyleType e)
+        {
+            VisualStyles<T> cvs = _Styles;
+
+            if (cvs == null)
+                cvs = new VisualStyles<T>();
+
+            int styleIndex = cvs.StyleIndex(e);
+
+            ushort styleUpdateCount = _StyleUpdateCount[styleIndex];
+            ushort globalUpdateCount = _ChartElement.ChartControl.GlobalUpdateCount;
+
+            T style = cvs.Style(e);
+
+            if (_GlobalStyleUpdateCount[styleIndex] != globalUpdateCount)
+            {
+                if (style != null)
+                    styleUpdateCount = GetStyleUpdateCount(styleIndex);
+            }
+
+            if (style == null || _StyleUpdateCount[styleIndex] != styleUpdateCount)
+            {
+                style = new T();
+
+                if (_StyleList[styleIndex] == null)
+                    _StyleList[styleIndex] = new List<BaseVisualStyle>();
+
+                _StyleList[styleIndex].Clear();
+
+                style.StyleType = e;
+                style.StyleList = _StyleList[styleIndex];
+                style.StyleUpdateMode = StyleUpdateMode.UpdateCount;
+
+                StyleType[] css = style.GetApplyStyleTypes(e);
+
+                if (css != null)
+                {
+                    foreach (StyleType cs in css)
+                        _ChartElement.ApplyStyles(style, cs);
+                }
+
+                style.StyleUpdateMode = StyleUpdateMode.None;
+
+                _ChartElement.ApplyDefaults(style, e);
+
+                style.StyleUpdateMode = (StyleUpdateMode.UpdateCount | StyleUpdateMode.Notify);
+
+                BaseVisualStyle vstyle = (BaseVisualStyle)style;
+                _ChartElement.GetElementStyle(_ChartElement, e, ref vstyle);
+
+                _StyleUpdateCount[styleIndex] = GetStyleUpdateCount(styleIndex);
+
+                style.StyleList = null;
+
+                cvs[e] = style;
+
+                _Styles = cvs;
+            }
+
+            _GlobalStyleUpdateCount[styleIndex] = globalUpdateCount;
+
+            return (cvs[e]);
+        }
+
+        #region GetStyleUpdateCount
+
+        private ushort GetStyleUpdateCount(int styleIndex)
+        {
+            ushort styleCount = 0;
+
+            List<BaseVisualStyle> slist = _StyleList[styleIndex];
+
+            if (slist != null)
+            {
+                foreach (BaseVisualStyle style in slist)
+                    styleCount += style.StyleUpdateCount;
+            }
+
+            return (styleCount);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InvalidateStyle
+
+        public bool InvalidateStyle(StyleType type)
+        {
+            if (_Styles != null)
+            {
+                if (_Styles[type] != null)
+                {
+                    _Styles[type].Dispose();
+                    _Styles[type] = null;
+
+                    return (true);
+                }
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region InvalidateStyles
+
+        public void InvalidateStyles()
+        {
+            if (_Styles != null)
+            {
+                _Styles.Dispose();
+                _Styles = null;
+            }
+        }
+
+        #endregion
+    }
+
+    /// <summary>
+    /// Provides helpers when working with EffectiveStyle.
+    /// </summary>
+    public class EffectiveStyle<T> where T : BaseVisualStyle, new()
+    {
+        #region Private variables
+
+        private IEffectiveStyle _ChartElement;
+        private T _Style;
+
+        private ushort _StyleUpdateCount = ushort.MaxValue;
+        private ushort _GlobalStyleUpdateCount = ushort.MaxValue;
+
+        private List<BaseVisualStyle> _StyleList = new List<BaseVisualStyle>();
+
+        #endregion
+
+        public EffectiveStyle(IEffectiveStyle chartElement)
+        {
+            _ChartElement = chartElement;
+        }
+
+        #region Style
+
+        internal T Style
+        {
+            get
+            {
+                ushort styleUpdateCount = _StyleUpdateCount;
+                ushort globalUpdateCount = _ChartElement.ChartControl.GlobalUpdateCount;
+
+                if (_GlobalStyleUpdateCount != globalUpdateCount)
+                {
+                    if (_Style != null)
+                        styleUpdateCount = GetStyleUpdateCount();
+                }
+
+                if (_Style == null || _StyleUpdateCount != styleUpdateCount)
+                {
+                    T style = new T();
+
+                    _StyleList.Clear();
+
+                    style.StyleList = _StyleList;
+                    style.StyleType = StyleType.Default;
+
+                    _ChartElement.ApplyStyles(style);
+                    _ChartElement.ApplyDefaults(style, StyleType.Default);
+
+                    BaseVisualStyle vstyle = (BaseVisualStyle)style;
+                    _ChartElement.GetElementStyle(_ChartElement, StyleType.Default, ref vstyle);
+
+                    _StyleUpdateCount = GetStyleUpdateCount();
+
+                    style.StyleList = null;
+
+                    _Style = style;
+                }
+
+                _GlobalStyleUpdateCount = globalUpdateCount;
+
+                return (_Style);
+            }
+        }
+
+        #region GetStyleUpdateCount
+
+        private ushort GetStyleUpdateCount()
+        {
+            ushort styleCount = 0;
+
+            List<BaseVisualStyle> slist = _StyleList;
+
+            if (slist != null)
+            {
+                foreach (BaseVisualStyle style in slist)
+                    styleCount += style.StyleUpdateCount;
+            }
+
+            return (styleCount);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InvalidateStyle
+
+        public bool InvalidateStyle()
+        {
+            if (_Style != null)
+            {
+                _Style.Dispose();
+                _Style = null;
+
+                return (true);
+            }
+
+            return (false);
+        }
+
+        #endregion
+    }
+
+    #region IEffectiveStyle
+
+    public interface IEffectiveStyle
+    {
+        void ApplyStyles(BaseVisualStyle style);
+        void ApplyStyles(BaseVisualStyle style, StyleType styleType);
+
+        void ApplyDefaults(BaseVisualStyle style, StyleType styleType);
+
+        void GetElementStyle(IEffectiveStyle chartElement, StyleType styleType, ref BaseVisualStyle style);
+
+        ChartControl ChartControl
+        {
+            get;
+        }
+    }
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/GridLineVisualStyle .cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/GridLineVisualStyle .cs
new file mode 100644
index 00000000..3ac91f8f
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/GridLineVisualStyle .cs	
@@ -0,0 +1,44 @@
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Charts.Style
+{
+    /// <summary>
+    /// Represents a GridLineVisualStyle.
+    /// </summary>
+    [TypeConverter(typeof(VisualStylesConverter))]
+    public class GridLineVisualStyle : ChartLineVisualStyle
+    {
+        #region Copy
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public new GridLineVisualStyle Copy()
+        {
+            GridLineVisualStyle style = new GridLineVisualStyle();
+
+            CopyTo(style);
+
+            return (style);
+        }
+
+        #endregion
+
+        #region CopyTo
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public void CopyTo(GridLineVisualStyle style)
+        {
+            base.CopyTo(style);
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/HiLoBarSegmentStyle.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/HiLoBarSegmentStyle.cs
new file mode 100644
index 00000000..3f4b54a6
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/HiLoBarSegmentStyle.cs	
@@ -0,0 +1,763 @@
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar.Charts.Style
+{
+    /// <summary>
+    /// Represents HiLoBarSegment visual style.
+    /// </summary>
+    [ToolboxItem(false), DesignTimeVisible(false)]
+    [TypeConverter(typeof(VisualStylesConverter))]
+    public class HiLoBarSegmentStyle : BaseVisualStyle
+    {
+        #region Static data
+
+        /// <summary>
+        /// Returns Empty instance of HiLoBarSegmentStyle.
+        /// </summary>
+        public static HiLoBarSegmentStyle Empty
+        {
+            get { return (new HiLoBarSegmentStyle()); }
+        }
+
+        #endregion
+
+        #region Private variables
+
+        private ChartLineVisualStyle _Default;
+
+        private ChartLineVisualStyle _OpenWhisker;
+        private ChartLineVisualStyle _CloseWhisker;
+
+        private ChartLineVisualStyle _CenterLine;
+        private ChartLineVisualStyle _MedianLine;
+
+        private ChartLineVisualStyle _HighWhisker;
+        private ChartLineVisualStyle _LowWhisker;
+
+        private ChartLineVisualStyle _HighWhiskerCap;
+        private ChartLineVisualStyle _LowWhiskerCap;
+
+        private Background _BoxBackground;
+        private ChartLineVisualStyle _BoxBorder;
+
+        #endregion
+
+        #region Public properties
+
+        #region BoxBackground
+
+        /// <summary>
+        /// Gets or sets the visual style for the Box Background (Box, Candle only).
+        /// </summary>
+        [Description("Indicates the the visual style for Box Background (Box, Candle only).")]
+        public Background BoxBackground
+        {
+            get
+            {
+                if (_BoxBackground == null)
+                {
+                    _BoxBackground = Background.Empty;
+
+                    UpdateChangeHandler(null, _BoxBackground);
+                }
+
+                return (_BoxBackground);
+            }
+
+            set
+            {
+                if (_BoxBackground != value)
+                {
+                    Background oldValue = _BoxBackground;
+
+                    _BoxBackground = value;
+
+                    OnStyleChanged("BoxBackground", oldValue, value);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeBoxBackground()
+        {
+            return (_BoxBackground != null && _BoxBackground.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetBoxBackground()
+        {
+            BoxBackground = null;
+        }
+
+        #endregion
+
+        #region BoxBorder
+
+        /// <summary>
+        /// Gets or sets the visual style for the Box Border (Box, Candle only).
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates the visual style for the Box Border (Box, Candle only).")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ChartLineVisualStyle BoxBorder
+        {
+            get
+            {
+                if (_BoxBorder == null)
+                {
+                    _BoxBorder = new ChartLineVisualStyle();
+
+                    UpdateChangeHandler(null, _BoxBorder);
+                }
+
+                return (_BoxBorder);
+            }
+
+            set
+            {
+                if (_BoxBorder != value)
+                {
+                    ChartLineVisualStyle oldValue = _BoxBorder;
+
+                    _BoxBorder = value;
+
+                    OnStyleChanged("BoxBorder", oldValue, value);
+
+                    if (oldValue != null)
+                        oldValue.Dispose();
+                }
+            }
+        }
+
+        #endregion
+
+        #region CenterLine
+
+        /// <summary>
+        /// Gets or sets the visual style for the Center Line segment. This is the 
+        /// style used for the center Hilo segment and the Box/Candle segment when
+        /// no Open or Close values are specified.
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates the visual style for the Center Line segment. This is the style used for the center Hilo segment and the Box/Candle segment when no Open or Close values are specified.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ChartLineVisualStyle CenterLine
+        {
+            get
+            {
+                if (_CenterLine == null)
+                {
+                    _CenterLine = new ChartLineVisualStyle();
+
+                    UpdateChangeHandler(null, _CenterLine);
+                }
+
+                return (_CenterLine);
+            }
+
+            set
+            {
+                if (_CenterLine != value)
+                {
+                    ChartLineVisualStyle oldValue = _CenterLine;
+
+                    _CenterLine = value;
+
+                    OnStyleChanged("CenterLine", oldValue, value);
+
+                    if (oldValue != null)
+                        oldValue.Dispose();
+                }
+            }
+        }
+
+        #endregion
+
+        #region CloseWhisker
+
+        /// <summary>
+        /// Gets or sets the visual style for the Close Whisker (Hilo only).
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates the visual style for the Close Whisker (Hilo only).")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ChartLineVisualStyle CloseWhisker
+        {
+            get
+            {
+                if (_CloseWhisker == null)
+                {
+                    _CloseWhisker = new ChartLineVisualStyle();
+
+                    UpdateChangeHandler(null, _CloseWhisker);
+                }
+
+                return (_CloseWhisker);
+            }
+
+            set
+            {
+                if (_CloseWhisker != value)
+                {
+                    ChartLineVisualStyle oldValue = _CloseWhisker;
+
+                    _CloseWhisker = value;
+
+                    OnStyleChanged("CloseWhisker", oldValue, value);
+
+                    if (oldValue != null)
+                        oldValue.Dispose();
+                }
+            }
+        }
+
+        #endregion
+
+        #region Default
+
+        /// <summary>
+        /// Gets or sets the visual style used as the Default when
+        /// a segment style is not specified (ie BoxBorder, HighWhisker, etc).
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates the visual style used as the Default when a segment style is not specified (ie BoxBorder, HighWhisker, etc).")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ChartLineVisualStyle Default
+        {
+            get
+            {
+                if (_Default == null)
+                {
+                    _Default = new ChartLineVisualStyle();
+
+                    UpdateChangeHandler(null, _Default);
+                }
+
+                return (_Default);
+            }
+
+            set
+            {
+                if (_Default != value)
+                {
+                    ChartLineVisualStyle oldValue = _Default;
+
+                    _Default = value;
+
+                    OnStyleChanged("Default", oldValue, value);
+
+                    if (oldValue != null)
+                        oldValue.Dispose();
+                }
+            }
+        }
+
+        #endregion
+
+        #region HighWhisker
+
+        /// <summary>
+        /// Gets or sets the visual style for the High Whisker.
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates the visual style for the High Whisker.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ChartLineVisualStyle HighWhisker
+        {
+            get
+            {
+                if (_HighWhisker == null)
+                {
+                    _HighWhisker = new ChartLineVisualStyle();
+
+                    UpdateChangeHandler(null, _HighWhisker);
+                }
+
+                return (_HighWhisker);
+            }
+
+            set
+            {
+                if (_HighWhisker != value)
+                {
+                    ChartLineVisualStyle oldValue = _HighWhisker;
+
+                    _HighWhisker = value;
+
+                    OnStyleChanged("HighWhisker", oldValue, value);
+
+                    if (oldValue != null)
+                        oldValue.Dispose();
+                }
+            }
+        }
+
+        #endregion
+
+        #region HighWhiskerCap
+
+        /// <summary>
+        /// Gets or sets the visual style for the High Whisker Cap.
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates the visual style for the High Whisker Cap.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ChartLineVisualStyle HighWhiskerCap
+        {
+            get
+            {
+                if (_HighWhiskerCap == null)
+                {
+                    _HighWhiskerCap = new ChartLineVisualStyle();
+
+                    UpdateChangeHandler(null, _HighWhiskerCap);
+                }
+
+                return (_HighWhiskerCap);
+            }
+
+            set
+            {
+                if (_HighWhiskerCap != value)
+                {
+                    ChartLineVisualStyle oldValue = _HighWhiskerCap;
+
+                    _HighWhiskerCap = value;
+
+                    OnStyleChanged("HighWhiskerCap", oldValue, value);
+
+                    if (oldValue != null)
+                        oldValue.Dispose();
+                }
+            }
+        }
+
+        #endregion
+
+        #region LowWhisker
+
+        /// <summary>
+        /// Gets or sets the visual style for the Low Whisker.
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates the visual style for the Low Whisker.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ChartLineVisualStyle LowWhisker
+        {
+            get
+            {
+                if (_LowWhisker == null)
+                {
+                    _LowWhisker = new ChartLineVisualStyle();
+
+                    UpdateChangeHandler(null, _LowWhisker);
+                }
+
+                return (_LowWhisker);
+            }
+
+            set
+            {
+                if (_LowWhisker != value)
+                {
+                    ChartLineVisualStyle oldValue = _LowWhisker;
+
+                    _LowWhisker = value;
+
+                    OnStyleChanged("LowWhisker", oldValue, value);
+
+                    if (oldValue != null)
+                        oldValue.Dispose();
+                }
+            }
+        }
+
+        #endregion
+
+        #region LowWhiskerCap
+
+        /// <summary>
+        /// Gets or sets the visual style for the Low Whisker Cap.
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates the visual style for the Low Whisker Cap.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ChartLineVisualStyle LowWhiskerCap
+        {
+            get
+            {
+                if (_LowWhiskerCap == null)
+                {
+                    _LowWhiskerCap = new ChartLineVisualStyle();
+
+                    UpdateChangeHandler(null, _LowWhiskerCap);
+                }
+
+                return (_LowWhiskerCap);
+            }
+
+            set
+            {
+                if (_LowWhiskerCap != value)
+                {
+                    ChartLineVisualStyle oldValue = _LowWhiskerCap;
+
+                    _LowWhiskerCap = value;
+
+                    OnStyleChanged("LowWhiskerCap", oldValue, value);
+
+                    if (oldValue != null)
+                        oldValue.Dispose();
+                }
+            }
+        }
+
+        #endregion
+
+        #region MedianLine
+
+        /// <summary>
+        /// Gets or sets the visual style for the Median Line.
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates the visual style for the Median Line.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ChartLineVisualStyle MedianLine
+        {
+            get
+            {
+                if (_MedianLine == null)
+                {
+                    _MedianLine = new ChartLineVisualStyle();
+
+                    UpdateChangeHandler(null, _MedianLine);
+                }
+
+                return (_MedianLine);
+            }
+
+            set
+            {
+                if (_MedianLine != value)
+                {
+                    ChartLineVisualStyle oldValue = _MedianLine;
+
+                    _MedianLine = value;
+
+                    OnStyleChanged("MedianLine", oldValue, value);
+
+                    if (oldValue != null)
+                        oldValue.Dispose();
+                }
+            }
+        }
+
+        #endregion
+
+        #region OpenWhisker
+
+        /// <summary>
+        /// Gets or sets the visual style for the Open Whisker (Hilo only).
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates the visual style for the Open Whisker (Hilo only).")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ChartLineVisualStyle OpenWhisker
+        {
+            get
+            {
+                if (_OpenWhisker == null)
+                {
+                    _OpenWhisker = new ChartLineVisualStyle();
+
+                    UpdateChangeHandler(null, _OpenWhisker);
+                }
+
+                return (_OpenWhisker);
+            }
+
+            set
+            {
+                if (_OpenWhisker != value)
+                {
+                    ChartLineVisualStyle oldValue = _OpenWhisker;
+
+                    _OpenWhisker = value;
+
+                    OnStyleChanged("OpenWhisker", oldValue, value);
+
+                    if (oldValue != null)
+                        oldValue.Dispose();
+                }
+            }
+        }
+
+        #endregion
+
+        #region IsEmpty
+
+        /// <summary>
+        /// Gets whether both colors assigned are empty.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override bool IsEmpty
+        {
+            get
+            {
+                return ((_BoxBackground == null || _BoxBackground.IsEmpty) &&
+                    (_BoxBorder == null || _BoxBorder.IsEmpty) &&
+                    (_CenterLine == null || _CenterLine.IsEmpty) &&
+                    (_CloseWhisker == null || _CloseWhisker.IsEmpty) &&
+                    (_Default == null || _Default.IsEmpty) &&
+                    (_HighWhisker == null || _HighWhisker.IsEmpty) &&
+                    (_HighWhiskerCap == null || _HighWhiskerCap.IsEmpty) &&
+                    (_LowWhisker == null || _LowWhisker.IsEmpty) &&
+                    (_LowWhiskerCap == null || _LowWhiskerCap.IsEmpty) &&
+                    (_OpenWhisker == null || _OpenWhisker.IsEmpty) &&
+                    (_MedianLine == null || _MedianLine.IsEmpty) &&
+                    (base.IsEmpty == true));
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ApplyStyle
+
+        /// <summary>
+        /// Applies the style to instance of this style.
+        /// </summary>
+        /// <param name="style">Style to apply.</param>
+        public void ApplyStyle(HiLoBarSegmentStyle style)
+        {
+            if (style != null)
+            {
+                base.ApplyStyle(style);
+
+                if (style._BoxBackground != null && style._BoxBackground.IsEmpty == false)
+                    BoxBackground = style._BoxBackground.Copy();
+
+                if (style._BoxBorder != null && style._BoxBorder.IsEmpty == false)
+                    BoxBorder.ApplyStyle(style._BoxBorder);
+
+                if (style._CenterLine != null && style._CenterLine.IsEmpty == false)
+                    CenterLine.ApplyStyle(style._CenterLine);
+
+                if (style._CloseWhisker != null && style._CloseWhisker.IsEmpty == false)
+                    CloseWhisker.ApplyStyle(style._CloseWhisker);
+
+                if (style._Default != null && style._Default.IsEmpty == false)
+                    Default.ApplyStyle(style._Default);
+
+                if (style._HighWhisker != null && style._HighWhisker.IsEmpty == false)
+                    HighWhisker.ApplyStyle(style._HighWhisker);
+
+                if (style._HighWhiskerCap != null && style._HighWhiskerCap.IsEmpty == false)
+                    HighWhiskerCap.ApplyStyle(style._HighWhiskerCap);
+
+                if (style._LowWhisker != null && style._LowWhisker.IsEmpty == false)
+                    LowWhisker.ApplyStyle(style._LowWhisker);
+
+                if (style._LowWhiskerCap != null && style._LowWhiskerCap.IsEmpty == false)
+                    LowWhiskerCap.ApplyStyle(style._LowWhiskerCap);
+
+                if (style._MedianLine != null && style._MedianLine.IsEmpty == false)
+                    MedianLine.ApplyStyle(style._MedianLine);
+
+                if (style._OpenWhisker != null && style._OpenWhisker.IsEmpty == false)
+                    OpenWhisker.ApplyStyle(style._OpenWhisker);
+            }
+        }
+
+        #endregion
+
+        #region Copy
+
+        /// <summary>
+        /// Creates an exact copy of the OhlcBarSegmentStyle.
+        /// </summary>
+        /// <returns>Copy of the OhlcBarSegmentStyle.</returns>
+        public new HiLoBarSegmentStyle Copy()
+        {
+            HiLoBarSegmentStyle style = new HiLoBarSegmentStyle();
+
+            CopyTo(style);
+
+            return (style);
+        }
+
+        #endregion
+
+        #region CopyTo
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public void CopyTo(HiLoBarSegmentStyle style)
+        {
+            style.BoxBackground = (_BoxBackground != null) ? _BoxBackground.Copy() : null;
+            style.BoxBorder = (_BoxBorder != null) ? _BoxBorder.Copy() : null;
+            style.CenterLine = (_CenterLine != null) ? _CenterLine.Copy() : null;
+            style.CloseWhisker = (_CloseWhisker != null) ? _CloseWhisker.Copy() : null;
+            style.Default = (_Default != null) ? _Default.Copy() : null;
+            style.HighWhisker = (_HighWhisker != null) ? _HighWhisker.Copy() : null;
+            style.HighWhiskerCap = (_HighWhiskerCap != null) ? _HighWhiskerCap.Copy() : null;
+            style.LowWhisker = (_LowWhisker != null) ? _LowWhisker.Copy() : null;
+            style.LowWhiskerCap = (_LowWhiskerCap != null) ? _LowWhiskerCap.Copy() : null;
+            style.MedianLine = (_MedianLine != null) ? _MedianLine.Copy() : null;
+            style.OpenWhisker = (_OpenWhisker != null) ? _OpenWhisker.Copy() : null;
+        }
+
+        #endregion
+
+        #region GetSerialData
+
+        internal override SerialElementCollection GetSerialData(string serialName)
+        {
+            SerialElementCollection sec = new SerialElementCollection();
+
+            if (serialName != null)
+            {
+                if (serialName.Equals("") == true)
+                    serialName = "HiLoBarSegmentStyle";
+
+                sec.AddStartElement(serialName);
+            }
+
+            if (_BoxBackground != null && _BoxBackground.IsEmpty == false)
+                sec.AddElement(_BoxBackground.GetSerialData("BoxBackground"));
+
+            if (_BoxBorder != null && _BoxBorder.IsEmpty == false)
+                sec.AddElement(_BoxBorder.GetSerialData("BoxBorder"));
+
+            if (_CenterLine != null && _CenterLine.IsEmpty == false)
+                sec.AddElement(_CenterLine.GetSerialData("CenterLine"));
+
+            if (_CloseWhisker != null && _CloseWhisker.IsEmpty == false)
+                sec.AddElement(_CloseWhisker.GetSerialData("CloseWhisker"));
+
+            if (_Default != null && _Default.IsEmpty == false)
+                sec.AddElement(_Default.GetSerialData("Default"));
+
+            if (_HighWhisker != null && _HighWhisker.IsEmpty == false)
+                sec.AddElement(_HighWhisker.GetSerialData("HighWhisker"));
+
+            if (_HighWhiskerCap != null && _HighWhiskerCap.IsEmpty == false)
+                sec.AddElement(_HighWhiskerCap.GetSerialData("HighWhiskerCap"));
+
+            if (_LowWhisker != null && _LowWhisker.IsEmpty == false)
+                sec.AddElement(_LowWhisker.GetSerialData("LowWhisker"));
+
+            if (_LowWhiskerCap != null && _LowWhiskerCap.IsEmpty == false)
+                sec.AddElement(_LowWhiskerCap.GetSerialData("LowWhiskerCap"));
+
+            if (_MedianLine != null && _MedianLine.IsEmpty == false)
+                sec.AddElement(_MedianLine.GetSerialData("MedianLine"));
+
+            if (_OpenWhisker != null && _OpenWhisker.IsEmpty == false)
+                sec.AddElement(_OpenWhisker.GetSerialData("OpenWhisker"));
+
+            sec.AddElement(base.GetSerialData(null));
+
+            if (serialName != null)
+                sec.AddEndElement(serialName);
+
+            return (sec);
+        }
+
+        #endregion
+
+        #region PutSerialData
+
+        #region ProcessCollection
+
+        internal override void ProcessCollection(SerialElement se)
+        {
+            SerialElementCollection sec = se.Sec;
+
+            switch (se.Name)
+            {
+                case "BoxBackground":
+                    sec.PutSerialData(BoxBackground);
+                    break;
+
+                case "BoxBorder":
+                    sec.PutSerialData(BoxBorder);
+                    break;
+
+                case "CenterLine":
+                    sec.PutSerialData(CenterLine);
+                    break;
+
+                case "CloseWhisker":
+                    sec.PutSerialData(CloseWhisker);
+                    break;
+
+                case "Default":
+                    sec.PutSerialData(Default);
+                    break;
+
+                case "HighWhisker":
+                    sec.PutSerialData(HighWhisker);
+                    break;
+
+                case "HighWhiskerCap":
+                    sec.PutSerialData(HighWhiskerCap);
+                    break;
+
+                case "LowWhisker":
+                    sec.PutSerialData(LowWhisker);
+                    break;
+
+                case "LowWhiskerCap":
+                    sec.PutSerialData(LowWhiskerCap);
+                    break;
+
+                case "MedianLine":
+                    sec.PutSerialData(MedianLine);
+                    break;
+
+                case "OpenWhisker":
+                    sec.PutSerialData(OpenWhisker);
+                    break;
+
+                default:
+                    base.ProcessCollection(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IDisposable
+
+        public override void Dispose()
+        {
+            BoxBorder = null;
+            CenterLine = null;
+            CloseWhisker = null;
+            Default = null;
+            HighWhisker = null;
+            HighWhiskerCap = null;
+            LowWhisker = null;
+            LowWhiskerCap = null;
+            MedianLine = null;
+            OpenWhisker = null;
+
+            base.Dispose();
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/Padding.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/Padding.cs
new file mode 100644
index 00000000..f81c0093
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/Padding.cs	
@@ -0,0 +1,292 @@
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+
+namespace DevComponents.DotNetBar.Charts.Style
+{
+    ///<summary>
+    /// Padding
+    ///</summary>
+    [TypeConverter(typeof(PaddingTypeConverter))]
+    public class Padding : Thickness
+    {
+        #region Static data
+
+        /// <summary>
+        /// Returns Empty instance of Thickness.
+        /// </summary>
+        public new static Padding Empty
+        {
+            get { return (new Padding()); }
+        }
+
+        #endregion
+
+        #region Constructors
+
+        /// <summary>
+        /// Creates new instance of the class and initializes it.
+        /// </summary>
+        /// <param name="left">Left padding</param>
+        /// <param name="right">Right padding</param>
+        /// <param name="top">Top padding</param>
+        /// <param name="bottom">Bottom padding</param>
+        public Padding(int left, int top, int right, int bottom)
+            : base(left, top, right, bottom)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the Padding class.
+        /// </summary>
+        /// <param name="all">Uniform padding.</param>
+        public Padding(int all)
+            : base(all)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the Padding class.
+        /// </summary>
+        public Padding()
+        {
+        }
+
+        #endregion
+
+        #region Copy
+
+        /// <summary>
+        /// Creates an exact copy of the Padding.
+        /// </summary>
+        /// <returns>Copy of the Padding.</returns>
+        public new Padding Copy()
+        {
+            Padding copy = new Padding(Left, Top, Right, Bottom);
+
+            return (copy);
+        }
+
+        #endregion
+
+        #region GetSerialData
+
+        internal override SerialElementCollection GetSerialData(string name)
+        {
+            SerialElementCollection sec = new SerialElementCollection();
+
+            sec.AddStartElement(name);
+
+            if (IsUniform == true)
+            {
+                sec.AddValue("All", Left, 0);
+            }
+            else
+            {
+                sec.AddValue("Left", Left, 0);
+                sec.AddValue("Top", Top, 0);
+                sec.AddValue("Right", Right, 0);
+                sec.AddValue("Bottom", Bottom, 0);
+            }
+
+            sec.AddEndElement(name);
+
+            return (sec);
+        }
+
+        #endregion
+
+        #region PutSerialData
+
+        #region ProcessValue
+
+        internal override void ProcessValue(SerialElement se)
+        {
+            switch (se.Name)
+            {
+                case "All":
+                    All = int.Parse(se.StringValue);
+                    break;
+
+                case "Left":
+                    Left = int.Parse(se.StringValue);
+                    break;
+
+                case "Top":
+                    Top = int.Parse(se.StringValue);
+                    break;
+
+                case "Right":
+                    Right = int.Parse(se.StringValue);
+                    break;
+
+                case "Bottom":
+                    Bottom = int.Parse(se.StringValue);
+                    break;
+
+                default:
+                    base.ProcessValue(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+    }
+
+    #region PaddingTypeConverter
+
+    ///<summary>
+    /// PaddingTypeConverter
+    ///</summary>
+    public class PaddingTypeConverter : ExpandableObjectConverter
+    {
+        #region CanConvertTo
+
+        /// <summary>
+        /// CanConvertTo
+        /// </summary>
+        /// <param name="context"></param>
+        /// <param name="destinationType"></param>
+        /// <returns></returns>
+        public override bool CanConvertTo(
+            ITypeDescriptorContext context, Type destinationType)
+        {
+            if (destinationType == typeof(string))
+                return (true);
+
+            return (base.CanConvertTo(context, destinationType));
+        }
+
+        #endregion
+
+        #region ConvertTo
+
+        /// <summary>
+        /// ConvertTo
+        /// </summary>
+        /// <param name="context"></param>
+        /// <param name="culture"></param>
+        /// <param name="value"></param>
+        /// <param name="destinationType"></param>
+        /// <returns></returns>
+        public override object ConvertTo(
+            ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+        {
+            if (destinationType == typeof(string))
+            {
+                Padding p = value as Padding;
+
+                if (p != null)
+                {
+                    if (p.IsUniform == true)
+                        return (p.Left.ToString());
+
+                    return (String.Format("{0:d}, {1:d}, {2:d}, {3:d}",
+                        p.Bottom, p.Left, p.Right, p.Top));
+                }
+            }
+
+            return (base.ConvertTo(context, culture, value, destinationType));
+        }
+
+        #endregion
+
+        #region CanConvertFrom
+
+        /// <summary>
+        /// CanConvertFrom
+        /// </summary>
+        /// <param name="context"></param>
+        /// <param name="sourceType"></param>
+        /// <returns></returns>
+        public override bool CanConvertFrom(
+            ITypeDescriptorContext context, Type sourceType)
+        {
+            if (sourceType == typeof(string))
+                return (true);
+
+            return (base.CanConvertFrom(context, sourceType));
+        }
+
+        #endregion
+
+        #region ConvertFrom
+
+        /// <summary>
+        /// ConvertFrom
+        /// </summary>
+        /// <param name="context"></param>
+        /// <param name="culture"></param>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public override object ConvertFrom(
+            ITypeDescriptorContext context, CultureInfo culture, object value)
+        {
+            if (value is string)
+            {
+                string[] values = ((string)value).Split(',');
+
+                if (values.Length != 1 && values.Length != 4)
+                    throw new ArgumentException("Invalid value to convert.");
+
+                try
+                {
+                    int[] v = new int[values.Length];
+
+                    for (int i = 0; i < values.Length; i++)
+                        v[i] = int.Parse(values[i]);
+
+                    Padding p = (values.Length == 1)
+                        ? new Padding(v[0])
+                        : new Padding(v[1], v[3], v[2], v[0]);
+
+                    return (p);
+                }
+                catch (Exception)
+                {
+                    throw new ArgumentException("Invalid value to convert.");
+                }
+            }
+
+            return base.ConvertFrom(context, culture, value);
+        }
+
+        #endregion
+
+        #region GetCreateInstanceSupported
+
+        /// <summary>
+        /// GetCreateInstanceSupported
+        /// </summary>
+        /// <param name="context"></param>
+        /// <returns></returns>
+        public override bool GetCreateInstanceSupported(ITypeDescriptorContext context)
+        {
+            return (true);
+        }
+
+        #endregion
+
+        #region CreateInstance
+
+        /// <summary>
+        /// CreateInstance
+        /// </summary>
+        /// <param name="context"></param>
+        /// <param name="propertyValues"></param>
+        /// <returns></returns>
+        public override object CreateInstance(
+            ITypeDescriptorContext context, IDictionary propertyValues)
+        {
+            return (new Padding((int)propertyValues["Left"], (int)propertyValues["Top"],
+                (int)propertyValues["Right"], (int)propertyValues["Bottom"]));
+        }
+
+        #endregion
+    }
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/PieCenterVisualStyle.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/PieCenterVisualStyle.cs
new file mode 100644
index 00000000..c7a1a098
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/PieCenterVisualStyle.cs	
@@ -0,0 +1,1861 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Drawing.Drawing2D;
+using System.Drawing.Text;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Charts.Style
+{
+    ///<summary>
+    /// PieCenterVisualStyles
+    ///</summary>
+    [TypeConverter(typeof(VisualStylesConverter))]
+    public class PieCenterVisualStyles : VisualStyles<PieCenterVisualStyle>
+    {
+        #region Copy
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public PieCenterVisualStyles Copy()
+        {
+            PieCenterVisualStyles styles = new PieCenterVisualStyles();
+
+            for (int i = 0; i < Styles.Length; i++)
+            {
+                PieCenterVisualStyle vstyle = Styles[i];
+
+                if (vstyle != null)
+                    styles.Styles[i] = vstyle.Copy();
+            }
+
+            return (styles);
+        }
+
+        #endregion
+    }
+
+    /// <summary>
+    /// Represents the visual style of a Pie Center.
+    /// </summary>
+    [ToolboxItem(false), DesignTimeVisible(false)]
+    [TypeConverter(typeof(BlankExpandableObjectConverter))]
+    public class PieCenterVisualStyle : BaseVisualStyle
+    {
+        #region Private variables
+
+        private Tbool _AllowWrap = Tbool.NotSet;
+        private Alignment _Alignment = Alignment.NotSet;
+
+        private Background _Background;
+        private ChartLineVisualStyle _Border;
+        private Padding _Padding;
+
+        private Color _TextColor = Color.Empty;
+        private Font _Font;
+
+        private Image _Image;
+        private int _ImageIndex = -1;
+        private ImageList _ImageList;
+
+        private Padding _ImagePadding;
+
+        private Alignment _ImageAlignment = Alignment.NotSet;
+        private ImageOverlay _ImageOverlay = ImageOverlay.NotSet;
+        private ImageSizeMode _ImageSizeMode = ImageSizeMode.NotSet;
+
+        private double _ImageScale = double.NaN;
+
+        private Size _FigureSizeEx;
+
+        private Tbool _ImageInscribed = Tbool.NotSet;
+        private Tbool _TextInscribed = Tbool.NotSet;
+
+        private SymbolDef _SymbolDef;
+        private SymbolDef _ScaleSymDef;
+
+        private float _SymFontScale = -1;
+
+        #endregion
+
+        #region Public properties
+
+        #region Alignment
+
+        /// <summary>
+        /// Gets or sets the alignment of the text.
+        /// </summary>
+        [DefaultValue(Alignment.NotSet), Category("Appearance")]
+        [Description("Indicates the alignment of the text.")]
+        public Alignment Alignment
+        {
+            get { return (_Alignment); }
+
+            set
+            {
+                if (_Alignment != value)
+                {
+                    _Alignment = value;
+
+                    OnPropertyChangedEx("Alignment", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region AllowWrap
+
+        /// <summary>
+        /// Gets or sets whether text wrapping is permitted.
+        /// </summary>
+        [DefaultValue(Tbool.NotSet), Category("Appearance")]
+        [Description("Indicates whether text wrapping is permitted.")]
+        public Tbool AllowWrap
+        {
+            get { return (_AllowWrap); }
+
+            set
+            {
+                if (_AllowWrap != value)
+                {
+                    _AllowWrap = value;
+
+                    OnPropertyChangedEx("AllowWrap", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region Background
+
+        /// <summary>
+        /// Gets or sets the background style.
+        /// </summary>
+        [Description("Indicates the background style")]
+        public Background Background
+        {
+            get
+            {
+                if (_Background == null)
+                {
+                    _Background = Background.Empty;
+
+                    UpdateChangeHandler(null, _Background);
+                }
+
+                return (_Background);
+            }
+
+            set
+            {
+                if (_Background != value)
+                {
+                    UpdateChangeHandler(_Background, value);
+
+                    _Background = value;
+
+                    OnPropertyChangedEx("Background", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeBackground()
+        {
+            return (_Background != null && _Background.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetBackground()
+        {
+            Background = null;
+        }
+
+        #endregion
+
+        #region Border
+
+        /// <summary>
+        /// Gets or sets the pie center border.
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates the pie center border.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ChartLineVisualStyle Border
+        {
+            get
+            {
+                if (_Border == null)
+                {
+                    _Border = new ChartLineVisualStyle();
+
+                    UpdateChangeHandler(null, _Border);
+                }
+
+                return (_Border);
+            }
+
+            set
+            {
+                if (_Border != value)
+                {
+                    ChartLineVisualStyle oldValue = _Border;
+
+                    _Border = value;
+
+                    OnStyleChanged("Border", oldValue, value);
+
+                    if (oldValue != null)
+                        oldValue.Dispose();
+                }
+            }
+        }
+
+        #endregion
+
+        #region Font
+
+        /// <summary>
+        /// Gets or sets the style Font.
+        /// </summary>
+        [DefaultValue(null)]
+        [Description("Indicates the style Font.")]
+        public Font Font
+        {
+            get { return (_Font); }
+
+            set
+            {
+                if (_Font != value)
+                {
+                    _Font = value;
+
+                    OnPropertyChangedEx("Font", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region Image
+
+        /// <summary>
+        /// Gets or sets the element Image.
+        /// </summary>
+        [DefaultValue(null), Category("Appearance")]
+        [Description("Indicates the element image.")]
+        public Image Image
+        {
+            get { return (_Image); }
+
+            set
+            {
+                if (_Image != value)
+                {
+                    _Image = value;
+
+                    OnPropertyChangedEx("Image", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ImageAlignment
+
+        /// <summary>
+        /// Gets or sets the alignment of the Image.
+        /// </summary>
+        [DefaultValue(Alignment.NotSet), Category("Appearance")]
+        [Description("Indicates the alignment of the Image.")]
+        public Alignment ImageAlignment
+        {
+            get { return (_ImageAlignment); }
+
+            set
+            {
+                if (_ImageAlignment != value)
+                {
+                    _ImageAlignment = value;
+
+                    OnPropertyChangedEx("ImageAlignment", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ImageIndex
+
+        /// <summary>
+        /// Gets or sets the image index.
+        /// </summary>
+        [DefaultValue(-1)]
+        [Category("Appearance"), Description("Indicates the image index.")]
+        [Editor("DevComponents.SuperGrid.Design.ImageIndexEditor, DevComponents.SuperGrid.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(UITypeEditor))]
+        [TypeConverter(typeof(ImageIndexConverter))]
+        public int ImageIndex
+        {
+            get { return (_ImageIndex); }
+
+            set
+            {
+                if (_ImageIndex != value)
+                {
+                    _ImageIndex = value;
+
+                    OnPropertyChangedEx("ImageIndex", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ImageInscribed
+
+        /// <summary>
+        /// Gets or sets whether the image is inscribed in the
+        /// PieCenter area (true = inscribed, false = circumscribed).
+        /// </summary>
+        [DefaultValue(Tbool.NotSet), Category("Appearance")]
+        [Description("Indicates whether the image is inscribed in the PieCenter area (true = inscribed, false = circumscribed).")]
+        public Tbool ImageInscribed
+        {
+            get { return (_ImageInscribed); }
+
+            set
+            {
+                if (_ImageInscribed != value)
+                {
+                    _ImageInscribed = value;
+
+                    OnPropertyChangedEx("ImageInscribed", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ImageList
+
+        /// <summary>
+        /// Gets or sets the ImageList.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), DefaultValue(null)]
+        [Description("Indicates the ImageList.")]
+        public ImageList ImageList
+        {
+            get { return (_ImageList); }
+
+            set
+            {
+                if (_ImageList != value)
+                {
+                    _ImageList = value;
+
+                    OnPropertyChangedEx("ImageList", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ImageOverlay
+
+        /// <summary>
+        /// Gets or sets how to overlay the image with respect to the center content.
+        /// </summary>
+        [DefaultValue(ImageOverlay.NotSet), Category("Appearance")]
+        [Description("Indicates how to overlay the image with respect to the center content.")]
+        public ImageOverlay ImageOverlay
+        {
+            get { return (_ImageOverlay); }
+
+            set
+            {
+                if (_ImageOverlay != value)
+                {
+                    _ImageOverlay = value;
+
+                    OnPropertyChangedEx("ImageOverlay", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ImagePadding
+
+        /// <summary>
+        /// Gets or sets the spacing between content and edges of the Image.
+        /// </summary>
+        [Description("Indicates the spacing between content and edges of the Image.")]
+        public Padding ImagePadding
+        {
+            get
+            {
+                if (_ImagePadding == null)
+                {
+                    _ImagePadding = Padding.Empty;
+
+                    UpdateChangeHandler(null, _ImagePadding);
+                }
+
+                return (_ImagePadding);
+            }
+
+            set
+            {
+                if (_ImagePadding != value)
+                {
+                    UpdateChangeHandler(_ImagePadding, value);
+
+                    _ImagePadding = value;
+
+                    OnPropertyChangedEx("ImagePadding", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeImagePadding()
+        {
+            return (_ImagePadding != null && _ImagePadding.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetImagePadding()
+        {
+            ImagePadding = null;
+        }
+
+        #endregion
+
+        #region ImageScale
+
+        /// <summary>
+        /// Gets or sets the 'scale' factor for the image/symbol. This property informs the
+        /// chart to scale the image (or symbol) based upon the available space at its offset
+        /// position in the slice - the image is moved in or out of the slice, the image will
+        /// grow of shrink accordingly.
+        /// </summary>
+        [DefaultValue(double.NaN), Category("Display")]
+        [Description("Indicates the 'scale' factor for the image/symbol. This property informs the chart to scale the image (or symbol) based upon the available space at its offset position in the slice - the image is moved in or out of the slice, the image will grow of shrink accordingly.")]
+        [Editor("DevComponents.Charts.Design.RadiusRangeValueEditor, DevComponents.Charts.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(UITypeEditor))]
+        public double ImageScale
+        {
+            get { return (_ImageScale); }
+
+            set
+            {
+                if (value != _ImageScale)
+                {
+                    if (value < 0)
+                        throw new Exception("ImageScale can not be negative.");
+
+                    _ImageScale = value;
+
+                    OnPropertyChangedEx("ImageScale", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ImageSizeMode
+
+        /// <summary>
+        /// Gets or sets the 'mode' used to display the image.
+        /// </summary>
+        [DefaultValue(ImageSizeMode.NotSet), Category("Appearance")]
+        [Description("Indicates the 'mode' used to display the image.")]
+        public ImageSizeMode ImageSizeMode
+        {
+            get { return (_ImageSizeMode); }
+
+            set
+            {
+                if (value!= _ImageSizeMode)
+                {
+                    _ImageSizeMode = value;
+
+                    OnPropertyChangedEx("ImageSizeMode", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region Padding
+
+        /// <summary>
+        /// Gets or sets the spacing between content and edges of the Image.
+        /// </summary>
+        [Description("Indicates the spacing between content and edges of the Image.")]
+        public Padding Padding
+        {
+            get
+            {
+                if (_Padding == null)
+                {
+                    _Padding = Padding.Empty;
+
+                    UpdateChangeHandler(null, _Padding);
+                }
+
+                return (_Padding);
+            }
+
+            set
+            {
+                if (_Padding != value)
+                {
+                    UpdateChangeHandler(_Padding, value);
+
+                    _Padding = value;
+
+                    OnPropertyChangedEx("Padding", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializePadding()
+        {
+            return (_Padding != null && _Padding.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetPadding()
+        {
+            Padding = null;
+        }
+
+        #endregion
+
+        #region SymbolDef
+
+        /// <summary>
+        /// Gets or sets the element Symbol Definition. Note that Symbol definition
+        /// takes precedence over Image definition. Also note that the supporting Image
+        /// properties (such as ImageAlignment, ImageOverlay, etc) apply to a set
+        /// Symbol as well as to a set Image.
+        /// </summary>
+        [DefaultValue(null), Category("Appearance")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        [Description("Indicates the element Symbol Definition. Note that Symbol definition takes precedence over Image definition. Also note that the supporting Image properties (such as ImageAlignment, ImageOverlay, etc) apply to a set Symbol as well as to a set Image.")]
+        public SymbolDef SymbolDef
+        {
+            get
+            {
+                if (_SymbolDef == null)
+                {
+                    _SymbolDef = new SymbolDef();
+
+                    UpdateChangeHandler(null, _SymbolDef);
+                }
+
+                return (_SymbolDef);
+            }
+
+            set
+            {
+                if (_SymbolDef != value)
+                {
+                    UpdateChangeHandler(_SymbolDef, value);
+
+                    _SymbolDef = value;
+
+                    OnPropertyChangedEx("SymbolDef", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeSymbolDef()
+        {
+            return (_SymbolDef != null && _SymbolDef.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetSymbolDef()
+        {
+            SymbolDef = null;
+        }
+
+        #endregion
+
+        #region TextColor
+
+        /// <summary>
+        /// Gets or sets the Text color.
+        /// </summary>
+        [Description("Indicates the Text color.")]
+        public Color TextColor
+        {
+            get { return (_TextColor); }
+
+            set
+            {
+                if (_TextColor != value)
+                {
+                    _TextColor = value;
+
+                    OnPropertyChangedEx("TextColor", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeTextColor()
+        {
+            return (_TextColor.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetTextColor()
+        {
+            TextColor = Color.Empty;
+        }
+
+        #endregion
+
+        #region TextInscribed
+
+        /// <summary>
+        /// Gets or sets whether the Text is inscribed in the
+        /// PieCenter area (true = inscribed, false = circumscribed).
+        /// </summary>
+        [DefaultValue(Tbool.NotSet), Category("Appearance")]
+        [Description("Indicates whether the Text is inscribed in the PieCenter area (true = inscribed, false = circumscribed).")]
+        public Tbool TextInscribed
+        {
+            get { return (_TextInscribed); }
+
+            set
+            {
+                if (_TextInscribed != value)
+                {
+                    _TextInscribed = value;
+
+                    OnPropertyChangedEx("TextInscribed", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region IsEmpty
+
+        /// <summary>
+        /// Gets whether the style is logically Empty.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        [Description("Gets whether the style is logically Empty.")]
+        public override bool IsEmpty
+        {
+            get
+            {
+                return ((_Alignment == Alignment.NotSet) &&
+                    (_AllowWrap == Tbool.NotSet) &&
+                    (_Background == null || _Background.IsEmpty == true) &&
+                    (_Border == null || _Border.IsEmpty == true) &&
+                    (_Font == null) &&
+                    (_Image == null) &&
+                    (_ImageAlignment == Alignment.NotSet) &&
+                    (_ImageIndex == -1) &&
+                    (_ImageInscribed == Tbool.NotSet) &&
+                    (_ImageList == null) &&
+                    (_ImageOverlay == ImageOverlay.NotSet) &&
+                    (_ImagePadding == null || _ImagePadding.IsEmpty == true) &&
+                    (double.IsNaN(_ImageScale) == true) &&
+                    (_ImageSizeMode == Style.ImageSizeMode.NotSet) &&
+                    (_Padding == null || _Padding.IsEmpty == true) &&
+                    (_SymbolDef == null || _SymbolDef.IsEmpty == true) &&
+                    (_TextColor.IsEmpty == true) &&
+                    (_TextInscribed == Tbool.NotSet) &&
+                    (base.IsEmpty == true));
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region IsOverlayImage
+
+        internal bool IsOverlayImage
+        {
+            get
+            {
+                return (_ImageOverlay == ImageOverlay.Top ||
+                    _ImageOverlay == ImageOverlay.Middle ||
+                    _ImageOverlay == ImageOverlay.Bottom);
+            }
+        }
+
+        #endregion
+
+        #region IsValidFigure
+
+        internal bool IsValidFigure
+        {
+            get
+            {
+                if (IsSymbolFigure == true)
+                    return (true);
+
+                return (GetImage() != null);
+            }
+        }
+
+        #endregion
+
+        #region IsSymbolFigure
+
+        internal bool IsSymbolFigure
+        {
+            get { return (_SymbolDef != null &&  _SymbolDef.IsValidSymbol == true); }
+        }
+
+        #endregion
+
+        #region FigureSizeEx
+
+        internal Size FigureSizeEx
+        {
+            get { return (_FigureSizeEx); }
+            set { _FigureSizeEx = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetFigure
+
+        internal object GetFigure()
+        {
+            if (_SymbolDef != null && _SymbolDef.IsEmpty == false)
+                return (_SymbolDef);
+
+            return (GetImage());
+        }
+
+        #region GetImage
+
+        internal Image GetImage()
+        {
+            if (_Image != null)
+                return (_Image);
+
+            if (_ImageIndex >= 0)
+            {
+                ImageList imageList = ImageList;
+
+                if (imageList != null && _ImageIndex < imageList.Images.Count)
+                    return (imageList.Images[_ImageIndex]);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetSymbol
+
+        internal string GetSymbol()
+        {
+            if (_SymbolDef != null && _SymbolDef.IsEmpty == false)
+                return (_SymbolDef.SymbolRealized);
+
+            return (null);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetFigureSize
+
+        internal Size GetFigureSize(Graphics g)
+        {
+            Size size = Size.Empty;
+
+            if (IsSymbolFigure == true)
+                size = _SymbolDef.GetSymbolSize(g);
+
+            else
+            {
+                Image image = GetImage();
+
+                if (image != null)
+                    size = Dpi.Size(image.Size);
+            }
+
+            return (size);
+        }
+
+        #endregion
+
+        #region GetFigureBounds
+
+        internal Rectangle GetFigureBounds(Graphics g, Rectangle r)
+        {
+            if (IsSymbolFigure == true)
+                return (GetSymbolBounds(g, r));
+
+            return (GetImageBounds(g, r));
+        }
+
+        #region GetImageBounds
+
+        internal Rectangle GetImageBounds(Graphics g, Rectangle r)
+        {
+            Image image = GetImage();
+
+            return (GetImageBounds(g, r, image));
+        }
+
+        private Rectangle GetImageBounds(Graphics g, Rectangle r, Image image)
+        {
+            if (image != null)
+            {
+                Size size = Dpi.Size(image.Size);
+
+                if (double.IsNaN(ImageScale) == false)
+                {
+                    if (ImageScale != 1)
+                        size = FigureSizeEx;
+                }
+
+                return (GetSizeBounds(r, size, ImageAlignment));
+            }
+
+            return (Rectangle.Empty);
+        }
+
+        #endregion
+
+        #region GetSymbolBounds
+
+        internal Rectangle GetSymbolBounds(Graphics g, Rectangle r)
+        {
+            if (_SymbolDef != null && _SymbolDef.IsEmpty == false)
+            {
+                Size size = _SymbolDef.GetSymbolSize(g);
+
+                if (double.IsNaN(ImageScale) == false)
+                {
+                    if (ImageScale != 1)
+                        size = FigureSizeEx;
+                }
+
+                return (GetSizeBounds(r, size, ImageAlignment));
+            }
+
+            return (Rectangle.Empty);
+        }
+
+        #endregion
+
+        #region GetSizeBounds
+
+        internal Rectangle GetSizeBounds(Rectangle r,
+            Size size, Padding padding, Alignment alignment)
+        {
+            switch (alignment)
+            {
+                case Alignment.NotSet:
+                case Alignment.MiddleLeft:
+                    r.Y += (r.Height - size.Height) / 2;
+
+                    r.X += Dpi.Width(padding.Left);
+                    r.Y += Dpi.Height(padding.Top - padding.Bottom);
+                    break;
+
+                case Alignment.TopLeft:
+                    r.X += Dpi.Width(padding.Left);
+                    r.Y += Dpi.Height(padding.Top);
+                    break;
+
+                case Alignment.BottomLeft:
+                    r.Y = r.Bottom - size.Height;
+
+                    r.X += Dpi.Width(padding.Left);
+                    r.Y -= Dpi.Height(padding.Bottom);
+                    break;
+
+                case Alignment.TopCenter:
+                    r.X += (r.Width - size.Width) / 2;
+
+                    r.X += Dpi.Width(padding.Left - padding.Right);
+                    r.Y += Dpi.Height(padding.Top);
+                    break;
+
+                case Alignment.MiddleCenter:
+                    r.X += (r.Width - size.Width) / 2;
+                    r.Y += (r.Height - size.Height) / 2;
+
+                    r.X += Dpi.Width(padding.Left - padding.Right);
+                    r.Y += Dpi.Height(padding.Top - padding.Bottom);
+                    break;
+
+                case Alignment.BottomCenter:
+                    r.X += (r.Width - size.Width) / 2;
+                    r.Y = r.Bottom - size.Height;
+
+                    r.X += Dpi.Width(padding.Left - padding.Right);
+                    r.Y -= Dpi.Height(padding.Bottom);
+                    break;
+
+                case Alignment.TopRight:
+                    r.X = r.Right - size.Width;
+
+                    r.X -= Dpi.Width(padding.Right);
+                    r.Y += Dpi.Height(padding.Top);
+                    break;
+
+                case Alignment.MiddleRight:
+                    r.X = r.Right - size.Width;
+                    r.Y += (r.Height - size.Height) / 2;
+
+                    r.X -= Dpi.Width(padding.Right);
+                    r.Y += Dpi.Height(padding.Top - padding.Bottom);
+                    break;
+
+                case Alignment.BottomRight:
+                    r.X = r.Right - size.Width;
+                    r.Y = r.Bottom - size.Height;
+
+                    r.X -= Dpi.Width(padding.Right);
+                    r.Y -= Dpi.Height(padding.Bottom);
+                    break;
+            }
+
+            r.Size = size;
+
+            return (r);
+        }
+
+        #endregion
+
+        #region GetSizeBounds
+
+        internal Rectangle GetSizeBounds(Rectangle r, Size size, Alignment alignment)
+        {
+            switch (alignment)
+            {
+                case Alignment.NotSet:
+                case Alignment.MiddleLeft:
+                    r.Y += (r.Height - size.Height) / 2;
+                    break;
+
+                case Alignment.BottomLeft:
+                    r.Y = r.Bottom - size.Height;
+                    break;
+
+                case Alignment.TopCenter:
+                    r.X += (r.Width - size.Width) / 2;
+                    break;
+
+                case Alignment.MiddleCenter:
+                    r.X += (r.Width - size.Width) / 2;
+                    r.Y += (r.Height - size.Height) / 2;
+                    break;
+
+                case Alignment.BottomCenter:
+                    r.X += (r.Width - size.Width) / 2;
+                    r.Y = r.Bottom - size.Height;
+                    break;
+
+                case Alignment.TopRight:
+                    r.X = r.Right - size.Width;
+                    break;
+
+                case Alignment.MiddleRight:
+                    r.X = r.Right - size.Width;
+                    r.Y += (r.Height - size.Height) / 2;
+                    break;
+
+                case Alignment.BottomRight:
+                    r.X = r.Right - size.Width;
+                    r.Y = r.Bottom - size.Height;
+                    break;
+            }
+
+            r.Size = size;
+
+            return (r);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetTextBounds
+
+        internal Rectangle GetTextBounds(Rectangle r, Size size)
+        {
+            return (GetSizeBounds(r, size, ImagePadding, Alignment));
+        }
+
+        #endregion
+
+        #region RenderBackgroundFigure
+
+        internal void RenderBackgroundFigure(Graphics g, Rectangle bounds)
+        {
+            RenderBackgroundFigure(g, bounds, bounds);
+        }
+
+        internal void RenderBackgroundFigure(Graphics g, Rectangle bounds, Rectangle clipBounds)
+        {
+            if (IsSymbolFigure == true)
+                RenderBackgroundSymbol(g, bounds, clipBounds);
+            else
+                RenderBackgroundImage(g, bounds, clipBounds);
+        }
+
+        #region RenderBackgroundImage
+
+        internal void RenderBackgroundImage(Graphics g, Rectangle bounds, Rectangle clipBounds)
+        {
+            Image image = GetImage();
+
+            if (image != null)
+            {
+                Region clip = g.Clip;
+
+                if (ImageSizeMode == ImageSizeMode.NotSet ||
+                    ImageSizeMode == ImageSizeMode.Normal)
+                {
+                    Rectangle dbounds = GetImageBounds(g, clipBounds, image);
+
+                    g.SetClip(Rectangle.Intersect(bounds, dbounds), CombineMode.Intersect);
+
+                    g.DrawImage(image, dbounds,
+                        new Rectangle(Point.Empty, image.Size), GraphicsUnit.Pixel);
+                }
+                else
+                {
+                    Rectangle r = GetAdjustedBounds(clipBounds, ImagePadding);
+
+                    g.SetClip(r, CombineMode.Intersect);
+
+                    switch (ImageSizeMode)
+                    {
+                        case ImageSizeMode.Stretch:
+                            g.PixelOffsetMode = PixelOffsetMode.Half;
+                            g.DrawImage(image, r);
+                            g.PixelOffsetMode = PixelOffsetMode.Default;
+                            break;
+
+                        case ImageSizeMode.Tile:
+                            RenderImageTiled(g, image, r);
+                            break;
+
+                        case ImageSizeMode.Zoom:
+                            RenderImageZoomed(g, image, r);
+                            break;
+                    }
+                }
+
+                g.Clip = clip;
+            }
+        }
+
+        #region GetAdjustedBounds
+
+        private Rectangle GetAdjustedBounds(Rectangle bounds, Thickness padding)
+        {
+            if (padding.IsEmpty == false)
+            {
+                if (bounds.Height > padding.Vertical)
+                {
+                    bounds.Y += padding.Top;
+                    bounds.Height -= padding.Vertical;
+                }
+
+                if (bounds.Width > padding.Horizontal)
+                {
+                    bounds.X += padding.Left;
+                    bounds.Width -= padding.Horizontal;
+                }
+            }
+
+            return (bounds);
+        }
+
+        #endregion
+
+        #region RenderImageTiled
+
+        private void RenderImageTiled(Graphics g, Image image, Rectangle bounds)
+        {
+            Size size = image.Size;
+
+            Rectangle sr = new Rectangle(Point.Empty, size);
+            Rectangle dr = new Rectangle(bounds.Location, size);
+
+            Rectangle r = new Rectangle();
+            r.X = bounds.X + bounds.Width / 2;
+            r.Y = bounds.Y + bounds.Height / 2;
+
+            int dx = ((bounds.Width / 2) / size.Width + 2) * size.Width;
+            int dy = ((bounds.Height / 2) / size.Height + 2) * size.Height;
+
+            dr.X = r.X - dx + size.Width / 2;
+            dr.Y = r.Y - dy + size.Height / 2;
+
+            int x = dr.X;
+
+            while (dr.Top < bounds.Bottom)
+            {
+                while (dr.Left < bounds.Right)
+                {
+                    g.DrawImage(image, dr, sr, GraphicsUnit.Pixel);
+
+                    dr.X += image.Size.Width;
+                }
+
+                dr.X = x;
+                dr.Y += image.Size.Height;
+            }
+        }
+
+        #endregion
+
+        #region RenderImageZoomed
+
+        private void RenderImageZoomed(
+            Graphics g, Image image, Rectangle r)
+        {
+            SizeF size = new SizeF(image.Width / image.HorizontalResolution,
+                image.Height / image.VerticalResolution);
+
+            float scale = Math.Min(r.Width / size.Width, r.Height / size.Height);
+
+            size.Width *= scale;
+            size.Height *= scale;
+
+            Point pt = r.Location;
+
+            if (Math.Abs(r.Width - size.Width) > 2)
+            {
+                switch (ImageAlignment)
+                {
+                    case Alignment.TopCenter:
+                    case Alignment.MiddleCenter:
+                    case Alignment.BottomCenter:
+                        pt.X += (int)((r.Width - size.Width) / 2);
+                        break;
+
+                    case Alignment.TopRight:
+                    case Alignment.MiddleRight:
+                    case Alignment.BottomRight:
+                        pt.X = (int)(r.Right - size.Width);
+                        break;
+                }
+            }
+            else
+            {
+                switch (ImageAlignment)
+                {
+                    case Alignment.MiddleLeft:
+                    case Alignment.MiddleCenter:
+                    case Alignment.MiddleRight:
+                        pt.Y += (int)((r.Height - size.Height) / 2);
+                        break;
+
+                    case Alignment.BottomLeft:
+                    case Alignment.BottomCenter:
+                    case Alignment.BottomRight:
+                        pt.Y = (int)(r.Bottom - size.Height);
+                        break;
+                }
+            }
+
+            g.PixelOffsetMode = PixelOffsetMode.Half;
+
+            g.DrawImage(image,
+                pt.X, pt.Y, size.Width, size.Height);
+
+            g.PixelOffsetMode = PixelOffsetMode.Default;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderBackgroundSymbol
+
+        internal void RenderBackgroundSymbol(Graphics g, Rectangle bounds, Rectangle clipBounds)
+        {
+            string symbol = GetSymbol();
+
+            if (symbol != null)
+            {
+                Region clip = g.Clip;
+
+                TextRenderingHint hint = g.TextRenderingHint;
+                g.TextRenderingHint = TextRenderingHint.AntiAlias;
+
+                bounds.X += (ImagePadding.Left - ImagePadding.Right);
+                bounds.Y += (ImagePadding.Top - ImagePadding.Bottom);
+
+                if (ImageSizeMode == Style.ImageSizeMode.Stretch ||
+                    ImageSizeMode == Style.ImageSizeMode.Zoom)
+                {
+                    if (_ScaleSymDef == null)
+                        _ScaleSymDef = new SymbolDef();
+
+                    float n = Math.Max(bounds.Width, bounds.Height);
+
+                    if (_SymFontScale < 0)
+                    {
+                        _ScaleSymDef.SymbolSize = n;
+                        _ScaleSymDef.SymbolSet = _SymbolDef.SymbolSet;
+
+                        _SymFontScale = n / _ScaleSymDef.SymbolFont.Height * .8f;
+                    }
+
+                    _ScaleSymDef.SymbolSize = n * _SymFontScale;
+                    _ScaleSymDef.SymbolSet = _SymbolDef.SymbolSet;
+
+                    Rectangle t = bounds;
+
+                    if (t.Height > _ScaleSymDef.SymbolFont.Height)
+                    {
+                        t.Height = _ScaleSymDef.SymbolFont.Height;
+                        t.Y += (bounds.Height - _ScaleSymDef.SymbolFont.Height) / 2;
+                    }
+
+                    using (StringFormat sf = new StringFormat())
+                    {
+                        sf.Alignment = StringAlignment.Center;
+
+                        using (Brush br = new SolidBrush(_SymbolDef.SymbolColor))
+                            g.DrawString(_SymbolDef.SymbolRealized, _ScaleSymDef.SymbolFont, br, t, sf);
+                    }
+                }
+                else if (ImageSizeMode == ImageSizeMode.Tile)
+                {
+                    Rectangle r = GetAdjustedBounds(clipBounds, ImagePadding);
+
+                    g.SetClip(r, CombineMode.Intersect);
+
+                    RenderSymbolTiled(g, symbol, r);
+                }
+                else
+                {
+                    Rectangle dbounds = GetSymbolBounds(g, clipBounds);
+
+                    float n = Math.Max(bounds.Width, bounds.Height);
+
+                    if (double.IsNaN(ImageScale) == false)
+                    {
+                        if (ImageScale != 1)
+                            n = (int)(n * ImageScale);
+                    }
+
+                    n = dbounds.Width;
+
+                    if (_ScaleSymDef == null)
+                        _ScaleSymDef = new SymbolDef();
+
+                    if (_SymFontScale < 0)
+                    {
+                        _ScaleSymDef.SymbolSize = n;
+                        _ScaleSymDef.SymbolSet = _SymbolDef.SymbolSet;
+
+                        _SymFontScale = n / _ScaleSymDef.SymbolFont.Height * .8f;
+                    }
+
+                    _ScaleSymDef.SymbolSize = n * _SymFontScale;
+                    _ScaleSymDef.SymbolSet = _SymbolDef.SymbolSet;
+
+                    Rectangle t = dbounds;
+
+                    if (t.Height > _ScaleSymDef.SymbolFont.Height)
+                    {
+                        t.Height = _ScaleSymDef.SymbolFont.Height;
+                        t.Y += (dbounds.Height - _ScaleSymDef.SymbolFont.Height) / 2;
+                    }
+
+                    g.SetClip(Rectangle.Intersect(bounds, t), CombineMode.Intersect);
+
+                    using (Brush br = new SolidBrush(_SymbolDef.SymbolColor))
+                        g.DrawString(symbol, _ScaleSymDef.SymbolFont, br, t);
+                }
+
+                g.TextRenderingHint = hint;
+
+                g.Clip = clip;
+            }
+        }
+
+        #region RenderSymbolTiled
+
+        private void RenderSymbolTiled(Graphics g, string symbol, Rectangle bounds)
+        {
+            Font font = _SymbolDef.SymbolFont;
+            Color color = _SymbolDef.SymbolColor;
+
+            Size size = _SymbolDef.GetSymbolSize(g);
+            Rectangle dr = new Rectangle(bounds.Location, size);
+
+            Rectangle r = new Rectangle();
+            r.X = bounds.X + bounds.Width / 2;
+            r.Y = bounds.Y + bounds.Height / 2;
+
+            int dx = ((bounds.Width / 2) / size.Width + 2) * size.Width;
+            int dy = ((bounds.Height / 2) / size.Height + 2) * size.Height;
+            
+            dr.X = r.X - dx + size.Width / 2;
+            dr.Y = r.Y - dy + size.Height / 2;
+
+            int x = dr.X;
+
+            using (StringFormat sf = new StringFormat())
+            {
+                sf.Alignment = StringAlignment.Center;
+                sf.LineAlignment = StringAlignment.Center;
+
+                while (dr.Top < bounds.Bottom)
+                {
+                    using (Brush br = new SolidBrush(_SymbolDef.SymbolColor))
+                    {
+                        while (dr.Left < bounds.Right)
+                        {
+                            g.DrawString(symbol, font, br, dr, sf);
+
+                            dr.X += size.Width;
+                        }
+                    }
+
+                    dr.X = x;
+                    dr.Y += size.Height;
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region GetStringFormatFlags
+
+        internal void GetStringFormatFlags(StringFormat sf)
+        {
+            if (AllowWrap == Tbool.False)
+                sf.FormatFlags |= StringFormatFlags.NoWrap;
+
+            switch (Alignment)
+            {
+                case Alignment.TopCenter:
+                    sf.LineAlignment = StringAlignment.Near;
+                    sf.Alignment = StringAlignment.Center;
+                    break;
+
+                case Alignment.TopRight:
+                    sf.LineAlignment = StringAlignment.Near;
+                    sf.Alignment = StringAlignment.Far;
+                    break;
+
+                case Alignment.MiddleLeft:
+                    sf.LineAlignment = StringAlignment.Center;
+                    sf.Alignment = StringAlignment.Near;
+                    break;
+
+                case Alignment.MiddleCenter:
+                    sf.LineAlignment = StringAlignment.Center;
+                    sf.Alignment = StringAlignment.Center;
+                    break;
+
+                case Alignment.MiddleRight:
+                    sf.LineAlignment = StringAlignment.Center;
+                    sf.Alignment = StringAlignment.Far;
+                    break;
+
+                case Alignment.BottomLeft:
+                    sf.LineAlignment = StringAlignment.Far;
+                    sf.Alignment = StringAlignment.Near;
+                    break;
+
+                case Alignment.BottomCenter:
+                    sf.LineAlignment = StringAlignment.Far;
+                    sf.Alignment = StringAlignment.Center;
+                    break;
+
+                case Alignment.BottomRight:
+                    sf.LineAlignment = StringAlignment.Far;
+                    sf.Alignment = StringAlignment.Far;
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region GetTextFormatFlags
+
+        internal eTextFormat GetTextFormatFlags()
+        {
+            eTextFormat tf = eTextFormat.WordEllipsis |
+                eTextFormat.NoPadding | eTextFormat.NoPrefix;
+
+            if (AllowWrap == Tbool.True)
+                tf |= eTextFormat.WordBreak;
+
+            switch (Alignment)
+            {
+                case Alignment.TopCenter:
+                    tf |= eTextFormat.HorizontalCenter;
+                    break;
+
+                case Alignment.TopRight:
+                    tf |= eTextFormat.Right;
+                    break;
+
+                case Alignment.MiddleLeft:
+                    tf |= eTextFormat.VerticalCenter;
+                    break;
+
+                case Alignment.NotSet:
+                case Alignment.MiddleCenter:
+                    tf |= eTextFormat.HorizontalCenter;
+                    tf |= eTextFormat.VerticalCenter;
+                    break;
+
+                case Alignment.MiddleRight:
+                    tf |= eTextFormat.Right;
+                    tf |= eTextFormat.VerticalCenter;
+                    break;
+
+                case Alignment.BottomLeft:
+                    tf |= eTextFormat.Bottom;
+                    break;
+
+                case Alignment.BottomCenter:
+                    tf |= eTextFormat.Bottom;
+                    tf |= eTextFormat.HorizontalCenter;
+                    break;
+
+                case Alignment.BottomRight:
+                    tf |= eTextFormat.Bottom;
+                    tf |= eTextFormat.Right;
+                    break;
+            }
+
+            return (tf);
+        }
+
+        #endregion
+
+        #region ApplyStyle
+
+        /// <summary>
+        /// Applies the style to instance of this style.
+        /// </summary>
+        /// <param name="style">Style to apply.</param>
+        public void ApplyStyle(PieCenterVisualStyle style)
+        {
+            base.ApplyStyle(style);
+
+            if (style != null)
+            {
+                if (style.Alignment != Alignment.NotSet)
+                    Alignment = style.Alignment;
+
+                if (style.AllowWrap != Tbool.NotSet)
+                    AllowWrap = style.AllowWrap;
+
+                if (style._Background != null && style._Background.IsEmpty == false)
+                    Background = style._Background.Copy();
+
+                if (style._Border != null && style._Border.IsEmpty == false)
+                    Border = style._Border.Copy();
+
+                if (style.Font != null)
+                    Font = style.Font;
+
+                if (style.Image != null)
+                {
+                    Image = style.Image;
+                    ImageIndex = -1;
+                }
+
+                if (style.ImageAlignment != Alignment.NotSet)
+                    ImageAlignment = style.ImageAlignment;
+
+                if (style.ImageIndex >= 0)
+                {
+                    Image = null;
+                    ImageIndex = style.ImageIndex;
+                }
+
+                if (style.ImageInscribed != Tbool.NotSet)
+                    ImageInscribed = style.ImageInscribed;
+
+                if (style.ImageList != null)
+                    ImageList = style.ImageList;
+
+                if (style._ImageOverlay != ImageOverlay.NotSet)
+                    ImageOverlay = style.ImageOverlay;
+
+                if (style._ImagePadding != null && style._ImagePadding.IsEmpty == false)
+                    ImagePadding = style._ImagePadding.Copy();
+
+                if (double.IsNaN(style._ImageScale) == false)
+                    ImageScale = style._ImageScale;
+
+                if (style._ImageSizeMode != ImageSizeMode.NotSet)
+                    ImageSizeMode = style.ImageSizeMode;
+
+                if (style._Padding != null && style._Padding.IsEmpty == false)
+                    Padding = style._Padding.Copy();
+
+                if (style._SymbolDef != null && style._SymbolDef.IsEmpty == false)
+                    SymbolDef = style._SymbolDef.Copy();
+
+                if (style._TextColor.IsEmpty == false)
+                    TextColor = style._TextColor;
+
+                if (style._TextInscribed != Tbool.NotSet)
+                    TextInscribed = style.TextInscribed;
+            }
+        }
+
+        #endregion
+
+        #region ApplyDefaults
+
+        public override void ApplyDefaults()
+        {
+            if (_Alignment == Alignment.NotSet)
+                Alignment = Alignment.MiddleCenter;
+
+            if (_Border != null)
+                Border.ApplyDefaults();
+
+            if (_Font == null)
+                Font = SystemFonts.DefaultFont;
+
+            if (_ImageAlignment == Alignment.NotSet)
+                ImageAlignment = Alignment.MiddleLeft;
+
+            if (_ImageInscribed == Tbool.NotSet)
+                ImageInscribed = Tbool.True;
+
+            if (_ImageSizeMode == ImageSizeMode.NotSet)
+                ImageSizeMode = ImageSizeMode.Normal;
+
+            if (_SymbolDef != null && _SymbolDef.IsValidSymbol == true)
+            {
+                if (_SymbolDef.SymbolSize == 0)
+                {
+                    if (Font != null)
+                        SymbolDef.SymbolSize = Font.SizeInPoints;
+                }
+
+                if (_SymbolDef.SymbolColor.IsEmpty == true)
+                {
+                    SymbolDef.SymbolColor = 
+                        (TextColor.IsEmpty == false) ? TextColor : Color.Black;
+                }
+            }
+
+            if (_TextColor.IsEmpty == true)
+                TextColor = Color.Black;
+
+            if (_TextInscribed == Tbool.NotSet)
+                TextInscribed = Tbool.True;
+
+            base.ApplyDefaults();
+        }
+
+        #endregion
+
+        #region Copy
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public new PieCenterVisualStyle Copy()
+        {
+            PieCenterVisualStyle style = new PieCenterVisualStyle();
+
+            CopyTo(style);
+
+            return (style);
+        }
+
+        #endregion
+
+        #region CopyTo
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public void CopyTo(PieCenterVisualStyle style)
+        {
+            base.CopyTo(style);
+
+            style.Alignment = _Alignment;
+            style.AllowWrap = _AllowWrap;
+
+            style.Background = (_Background == null) ? null : _Background.Copy();
+            style.Border = (_Border != null) ? _Border.Copy() : null;
+
+            style.Font = (_Font == null) ? null : (Font)_Font.Clone();
+
+            style.Image = _Image;
+            style.ImageAlignment = _ImageAlignment;
+            style.ImageIndex = _ImageIndex;
+            style.ImageInscribed = _ImageInscribed;
+            style.ImageList = _ImageList;
+            style.ImageOverlay = _ImageOverlay;
+            style.ImagePadding = (_ImagePadding != null) ? _ImagePadding.Copy() : null;
+            style.ImageScale = _ImageScale;
+            style.ImageSizeMode = _ImageSizeMode;
+
+            style.Padding = (_Padding != null) ? _Padding.Copy() : null;
+            style.SymbolDef = (_SymbolDef != null) ? _SymbolDef.Copy() : null;
+
+            style.TextColor = _TextColor;
+            style.TextInscribed = _TextInscribed;
+        }
+
+        #endregion
+
+        #region GetSerialData
+
+        internal override SerialElementCollection GetSerialData(string serialName)
+        {
+            SerialElementCollection sec = new SerialElementCollection();
+
+            if (serialName != null)
+            {
+                if (serialName.Equals("") == true)
+                    serialName = "PieCenterVisualStyle";
+
+                sec.AddStartElement(serialName);
+            }
+
+            sec.AddValue("Alignment", Alignment, Alignment.NotSet);
+            sec.AddValue("AllowWrap", AllowWrap, Tbool.NotSet);
+
+            if (_Background != null && _Background.IsEmpty == false)
+                sec.AddElement(_Background.GetSerialData("Background"));
+
+            if (_Border != null && _Border.IsEmpty == false)
+                sec.AddElement(_Border.GetSerialData("Border"));
+
+            if (_Font != null)
+                sec.AddValue("Font", XmlSerializableFont.ConvertToString(Font));
+
+            sec.AddValue("Image", Image);
+            sec.AddValue("ImageAlignment", ImageAlignment, Alignment.NotSet);
+            sec.AddValue("ImageIndex", ImageIndex, -1);
+            sec.AddValue("ImageInscribed", ImageInscribed, Tbool.NotSet);
+
+            if (_ImageList != null)
+                sec.AddValue("ImageList", XmlSerializableImageList.ConvertToString(ImageList));
+
+            sec.AddValue("ImageOverlay", ImageOverlay, ImageOverlay.NotSet);
+
+            if (_ImagePadding != null && _ImagePadding.IsEmpty == false)
+                sec.AddElement(_ImagePadding.GetSerialData("ImagePadding"));
+
+            sec.AddValue("ImageScale", ImageScale, double.NaN);
+            sec.AddValue("ImageSizeMode", ImageSizeMode, ImageSizeMode.NotSet);
+
+            if (_Padding != null && _Padding.IsEmpty == false)
+                sec.AddElement(_Padding.GetSerialData("Padding"));
+
+            if (_SymbolDef != null && _SymbolDef.IsEmpty == false)
+                sec.AddElement(_SymbolDef.GetSerialData("SymbolDef"));
+
+            sec.AddValue("TextColor", TextColor, Color.Empty);
+            sec.AddValue("TextInscribed", TextInscribed, Tbool.NotSet);
+
+            sec.AddElement(base.GetSerialData(null));
+
+            if (serialName != null)
+                sec.AddEndElement("ContainerVisualStyle");
+
+            return (sec);
+        }
+
+        #endregion
+
+        #region PutSerialData
+
+        #region ProcessValue
+
+        internal override void ProcessValue(SerialElement se)
+        {
+            switch (se.Name)
+            {
+                case "Alignment":
+                    Alignment = (Alignment)se.GetValueEnum(typeof(Alignment));
+                    break;
+
+                case "AllowWrap":
+                    AllowWrap = (Tbool)se.GetValueEnum(typeof(Tbool));
+                    break;
+
+                case "Font":
+                    Font = XmlSerializableFont.ConvertFromString(se.StringValue);
+                    break;
+
+                case "Image":
+                    Image = se.GetValueImage();
+                    break;
+
+                case "ImageAlignment":
+                    ImageAlignment = (Alignment)se.GetValueEnum(typeof(Alignment));
+                    break;
+
+                case "ImageIndex":
+                    ImageIndex = int.Parse(se.StringValue);
+                    break;
+
+                case "ImageInscribed":
+                    ImageInscribed = (Tbool)se.GetValueEnum(typeof(Tbool));
+                    break;
+
+                case "ImageList":
+                    ImageList = XmlSerializableImageList.ConvertFromString(se.StringValue);
+                    break;
+
+                case "ImageOverlay":
+                    ImageOverlay = (ImageOverlay)se.GetValueEnum(typeof(ImageOverlay));
+                    break;
+
+                case "ImageScale":
+                    ImageScale = double.Parse(se.StringValue);
+                    break;
+
+                case "ImageSizeMode":
+                    ImageSizeMode = (ImageSizeMode)se.GetValueEnum(typeof(ImageSizeMode));
+                    break;
+
+                case "TextColor":
+                    TextColor = se.GetValueColor();
+                    break;
+
+                case "TextInscribed":
+                    TextInscribed = (Tbool)se.GetValueEnum(typeof(Tbool));
+                    break;
+
+                default:
+                    base.ProcessValue(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region ProcessCollection
+
+        internal override void ProcessCollection(SerialElement se)
+        {
+            SerialElementCollection sec = se.Sec;
+
+            switch (se.Name)
+            {
+                case "Background":
+                    sec.PutSerialData(Background);
+                    break;
+
+                case "Border":
+                    sec.PutSerialData(Border);
+                    break;
+
+                case "ImagePadding":
+                    sec.PutSerialData(ImagePadding);
+                    break;
+
+                case "Padding":
+                    sec.PutSerialData(Padding);
+                    break;
+
+                case "SymbolDef":
+                    sec.PutSerialData(SymbolDef);
+                    break;
+
+                default:
+                    base.ProcessCollection(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IDisposable
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        public override void Dispose()
+        {
+            Background = null;
+            Border = null;
+
+            ImagePadding = null;
+            Padding = null;
+
+            SymbolDef = null;
+            _ScaleSymDef = null;
+
+            base.Dispose();
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/PieChartVisualStyle.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/PieChartVisualStyle.cs
new file mode 100644
index 00000000..a7734604
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/PieChartVisualStyle.cs	
@@ -0,0 +1,491 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Charts.Style
+{
+    ///<summary>
+    /// PieChartVisualStyles
+    ///</summary>
+    [TypeConverter(typeof(VisualStylesConverter))]
+    public class PieChartVisualStyles : VisualStyles<PieChartVisualStyle>
+    {
+        #region Copy
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public PieChartVisualStyles Copy()
+        {
+            PieChartVisualStyles styles = new PieChartVisualStyles();
+
+            for (int i = 0; i < Styles.Length; i++)
+            {
+                PieChartVisualStyle vstyle = Styles[i];
+
+                if (vstyle != null)
+                    styles.Styles[i] = vstyle.Copy();
+            }
+
+            return (styles);
+        }
+
+        #endregion
+    }
+
+    /// <summary>
+    /// Represents the visual style of a Pie Chart element.
+    /// </summary>
+    [TypeConverter(typeof(BlankExpandableObjectConverter))]
+    public class PieChartVisualStyle : ContainerVisualStyle
+    {
+        #region Private variables
+
+        private Background _AlternateGridBackground;
+
+        private PieGridLineVisualStyle _GridLineVisualStyle;
+        private PieReferenceLineVisualStyle _ReferenceLineVisualStyle;
+        private PieCenterVisualStyles _PieCenterVisualStyles;
+
+        #endregion
+
+        #region Public properties
+
+        #region AlternateGridBackground
+
+        /// <summary>
+        /// Gets or sets the alternate, or interlaced, pie background (used
+        /// when ShowPieGrid is enabled).
+        /// </summary>
+        [Description("Indicates the alternate, or interlaced, pie background (used when ShowPieGrid is enabled)")]
+        public Background AlternateGridBackground
+        {
+            get
+            {
+                if (_AlternateGridBackground == null)
+                {
+                    _AlternateGridBackground = Background.Empty;
+
+                    UpdateChangeHandler(null, _AlternateGridBackground);
+                }
+
+                return (_AlternateGridBackground);
+            }
+
+            set
+            {
+                if (_AlternateGridBackground != value)
+                {
+                    UpdateChangeHandler(_AlternateGridBackground, value);
+
+                    _AlternateGridBackground = value;
+
+                    OnPropertyChangedEx("AlternateGridBackground", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeAlternateGridBackground()
+        {
+            return (_AlternateGridBackground != null && _AlternateGridBackground.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetAlternateGridBackground()
+        {
+            AlternateGridBackground = null;
+        }
+
+        #endregion
+
+        #region GridLineVisualStyle
+
+        /// <summary>
+        /// Gets or sets the visual style to be used for GridLine elements.
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates visual style to be used for GridLine elements.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public PieGridLineVisualStyle GridLineVisualStyle
+        {
+            get
+            {
+                if (_GridLineVisualStyle == null)
+                {
+                    _GridLineVisualStyle = new PieGridLineVisualStyle();
+
+                    UpdateChangeHandler(null, _GridLineVisualStyle);
+                }
+
+                return (_GridLineVisualStyle);
+            }
+
+            set
+            {
+                if (_GridLineVisualStyle != value)
+                {
+                    PieGridLineVisualStyle oldValue = _GridLineVisualStyle;
+                    _GridLineVisualStyle = value;
+
+                    OnStyleChanged("GridLinesVisualStyle", oldValue, value);
+                }
+            }
+        }
+
+        #endregion
+
+        #region PieCenterVisualStyles
+
+        /// <summary>
+        /// Gets or sets the visual styles to be used for Pie Center elements.
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates visual styles to be used for Pie Center elements.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public PieCenterVisualStyles PieCenterVisualStyles
+        {
+            get
+            {
+                if (_PieCenterVisualStyles == null)
+                {
+                    _PieCenterVisualStyles = new PieCenterVisualStyles();
+
+                    UpdateChangeHandler(null, _PieCenterVisualStyles);
+                    UpdatePropertyHandler(null, _PieCenterVisualStyles);
+                }
+
+                return (_PieCenterVisualStyles);
+            }
+
+            set
+            {
+                if (value != _PieCenterVisualStyles)
+                {
+                    PieCenterVisualStyles oldValue = _PieCenterVisualStyles;
+                    _PieCenterVisualStyles = value;
+
+                    OnStyleChanged("PieCenterVisualStyles", oldValue, value);
+
+                    UpdatePropertyHandler(oldValue, value);
+                }
+            }
+        }
+
+        #region UpdatePropertyHandler
+
+        protected void UpdatePropertyHandler(
+            PieCenterVisualStyles oldValue, PieCenterVisualStyles newValue)
+        {
+            if (oldValue != null)
+            {
+                for (int i = 0; i < oldValue.Count; i++)
+                {
+                    BaseVisualStyle style = oldValue[(StyleType)i];
+
+                    style.PropertyChanged -= style_PropertyChanged;
+                }
+            }
+
+            if (newValue != null)
+            {
+                for (int i = 0; i < newValue.Count; i++)
+                {
+                    BaseVisualStyle style = newValue[(StyleType)i];
+
+                    style.PropertyChanged += style_PropertyChanged;
+                }
+            }
+        }
+
+        #region style_PropertyChanged
+
+        void style_PropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            BaseVisualStyle style = sender as BaseVisualStyle;
+
+            if (style != null)
+            {
+                style.StyleUpdateCount++;
+
+                BaseVisualStyle parent = style.Parent;
+
+                while (parent != null)
+                {
+                    parent.StyleUpdateCount++;
+
+                    parent = parent.Parent;
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region ReferenceLineVisualStyle
+
+        /// <summary>
+        /// Gets or sets the visual style to be used for ReferenceLine elements 
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates visual style to be used for ReferenceLine elements ")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public PieReferenceLineVisualStyle ReferenceLineVisualStyle
+        {
+            get
+            {
+                if (_ReferenceLineVisualStyle == null)
+                {
+                    _ReferenceLineVisualStyle = new PieReferenceLineVisualStyle();
+
+                    UpdateChangeHandler(null, _ReferenceLineVisualStyle);
+                }
+
+                return (_ReferenceLineVisualStyle);
+            }
+
+            set
+            {
+                if (_ReferenceLineVisualStyle != value)
+                {
+                    PieReferenceLineVisualStyle oldValue = _ReferenceLineVisualStyle;
+                    _ReferenceLineVisualStyle = value;
+
+                    OnStyleChanged("ReferenceLineVisualStyle", oldValue, value);
+                }
+            }
+        }
+
+        #endregion
+
+        #region IsEmpty
+
+        /// <summary>
+        /// Gets whether the style is logically Empty.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        [Description("Gets whether the style is logically Empty.")]
+        public override bool IsEmpty
+        {
+            get
+            {
+                return ((_AlternateGridBackground == null || _AlternateGridBackground.IsEmpty) &&
+                    (_GridLineVisualStyle == null || _GridLineVisualStyle.IsEmpty) &&
+                    (_PieCenterVisualStyles == null || _PieCenterVisualStyles.IsEmpty) &&
+                    (_ReferenceLineVisualStyle == null || _ReferenceLineVisualStyle.IsEmpty) &&
+                    (base.IsEmpty == true));
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ApplyStyle
+
+        /// <summary>
+        /// Applies the style to instance of this style.
+        /// </summary>
+        /// <param name="style">Style to apply.</param>
+        public void ApplyStyle(PieChartVisualStyle style)
+        {
+            base.ApplyStyle(style);
+
+            if (style != null)
+            {
+                if (style._AlternateGridBackground != null && style.AlternateGridBackground.IsEmpty == false)
+                    AlternateGridBackground = style.AlternateGridBackground.Copy();
+
+                if (style._GridLineVisualStyle != null && style._GridLineVisualStyle.IsEmpty == false)
+                    GridLineVisualStyle.ApplyStyle(style.GridLineVisualStyle);
+
+                if (style._PieCenterVisualStyles != null)
+                {
+                    for (int i = 0; i < style._PieCenterVisualStyles.Styles.Length; i++)
+                    {
+                        if (style._PieCenterVisualStyles.Styles[i] != null)
+                            PieCenterVisualStyles.GetStyle(i).ApplyStyle(style._PieCenterVisualStyles.Styles[i]);
+                    }
+                }
+
+                if (style._ReferenceLineVisualStyle != null && style._ReferenceLineVisualStyle.IsEmpty == false)
+                    ReferenceLineVisualStyle.ApplyStyle(style._ReferenceLineVisualStyle);
+            }
+        }
+
+        #endregion
+
+        #region ApplyDefaults
+
+        public override void ApplyDefaults()
+        {
+            if (Alignment == Alignment.NotSet)
+                Alignment = Alignment.MiddleCenter;
+
+            if (_AlternateGridBackground == null)
+                AlternateGridBackground = new Background(Color.AliceBlue);
+
+            GridLineVisualStyle.ApplyDefaults();
+
+            if (_GridLineVisualStyle.LineColor.IsEmpty == true)
+                GridLineVisualStyle.LineColor = Color.LightGray;
+
+            ReferenceLineVisualStyle.ApplyDefaults();
+
+            base.ApplyDefaults();
+        }
+
+        #endregion
+
+        #region Copy
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public new PieChartVisualStyle Copy()
+        {
+            PieChartVisualStyle style = new PieChartVisualStyle();
+
+            CopyTo(style);
+
+            return (style);
+        }
+
+        #endregion
+
+        #region CopyTo
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public void CopyTo(PieChartVisualStyle style)
+        {
+            base.CopyTo(style);
+
+            style.AlternateGridBackground = (_AlternateGridBackground != null) ? _AlternateGridBackground.Copy() : null;
+
+            style.GridLineVisualStyle = (_GridLineVisualStyle != null) ? _GridLineVisualStyle.Copy() : null;
+            style.ReferenceLineVisualStyle = (_ReferenceLineVisualStyle != null) ? _ReferenceLineVisualStyle.Copy() : null;
+
+            style.PieCenterVisualStyles = (_PieCenterVisualStyles != null) ? _PieCenterVisualStyles.Copy() : null;
+        }
+
+        #endregion
+
+        #region GetSerialData
+
+        internal override SerialElementCollection GetSerialData(string serialName)
+        {
+            SerialElementCollection sec = new SerialElementCollection();
+
+            if (serialName != null)
+            {
+                if (serialName.Equals("") == true)
+                    serialName = "PieChartVisualStyle";
+
+                sec.AddStartElement(serialName);
+            }
+
+            if (_AlternateGridBackground != null && _AlternateGridBackground.IsEmpty == false)
+                sec.AddElement(_AlternateGridBackground.GetSerialData("AlternateBackground"));
+
+            if (_GridLineVisualStyle != null && _GridLineVisualStyle.IsEmpty == false)
+                sec.AddElement(_GridLineVisualStyle.GetSerialData("GridLineVisualStyle"));
+
+            if (_PieCenterVisualStyles != null && _PieCenterVisualStyles.IsEmpty == false)
+                sec.AddElement(_PieCenterVisualStyles.GetSerialData("PieCenterVisualStyles"));
+
+            if (_ReferenceLineVisualStyle != null && _ReferenceLineVisualStyle.IsEmpty == false)
+                sec.AddElement(_ReferenceLineVisualStyle.GetSerialData("ReferenceLineVisualStyle"));
+
+            sec.AddElement(base.GetSerialData(null));
+
+            if (serialName != null)
+                sec.AddEndElement(serialName);
+
+            return (sec);
+        }
+
+        #endregion
+
+        #region PutSerialData
+
+        #region ProcessValue
+
+        internal override void ProcessValue(SerialElement se)
+        {
+            switch (se.Name)
+            {
+                default:
+                    base.ProcessValue(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region ProcessCollection
+
+        internal override void ProcessCollection(SerialElement se)
+        {
+            SerialElementCollection sec = se.Sec;
+
+            switch (se.Name)
+            {
+                case "AlternateBackground":
+                    sec.PutSerialData(AlternateGridBackground);
+                    break;
+
+                case "GridLineVisualStyle":
+                    sec.PutSerialData(GridLineVisualStyle);
+                    break;
+
+                case "PieCenterVisualStyles":
+                    sec.PutSerialData(PieCenterVisualStyles);
+                    break;
+
+                case "ReferenceLineVisualStyle":
+                    sec.PutSerialData(ReferenceLineVisualStyle);
+                    break;
+
+                default:
+                    base.ProcessCollection(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IDisposable
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        public override void Dispose()
+        {
+            AlternateGridBackground = null;
+
+            GridLineVisualStyle = null;
+            PieCenterVisualStyles = null;
+
+            base.Dispose();
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/PieGridLineVisualStyle .cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/PieGridLineVisualStyle .cs
new file mode 100644
index 00000000..b37912f8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/PieGridLineVisualStyle .cs	
@@ -0,0 +1,44 @@
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Charts.Style
+{
+    /// <summary>
+    /// Represents a PieGridLineVisualStyle.
+    /// </summary>
+    [TypeConverter(typeof(VisualStylesConverter))]
+    public class PieGridLineVisualStyle : ChartLineVisualStyle
+    {
+        #region Copy
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public new PieGridLineVisualStyle Copy()
+        {
+            PieGridLineVisualStyle style = new PieGridLineVisualStyle();
+
+            CopyTo(style);
+
+            return (style);
+        }
+
+        #endregion
+
+        #region CopyTo
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public void CopyTo(PieGridLineVisualStyle style)
+        {
+            base.CopyTo(style);
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/PieReferenceLineVisualStyle.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/PieReferenceLineVisualStyle.cs
new file mode 100644
index 00000000..80434f20
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/PieReferenceLineVisualStyle.cs	
@@ -0,0 +1,53 @@
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Charts.Style
+{
+    /// <summary>
+    /// Represents a PieReferenceLineVisualStyle.
+    /// </summary>
+    [TypeConverter(typeof(VisualStylesConverter))]
+    public class PieReferenceLineVisualStyle : ChartLineVisualStyle
+    {
+        #region ApplyDefaults
+
+        public override void ApplyDefaults()
+        {
+            base.ApplyDefaults();
+        }
+
+        #endregion
+
+        #region Copy
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public new PieReferenceLineVisualStyle Copy()
+        {
+            PieReferenceLineVisualStyle style = new PieReferenceLineVisualStyle();
+
+            CopyTo(style);
+
+            return (style);
+        }
+
+        #endregion
+
+        #region CopyTo
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public void CopyTo(PieReferenceLineVisualStyle style)
+        {
+            base.CopyTo(style);
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/PointMarkerVisualStyle.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/PointMarkerVisualStyle.cs
new file mode 100644
index 00000000..a75e6a96
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/PointMarkerVisualStyle.cs	
@@ -0,0 +1,765 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Charts.Style
+{
+    /// <summary>
+    /// Represents the visual style of a PointMarker
+    /// </summary>
+    [ToolboxItem(false), DesignTimeVisible(false)]
+    [TypeConverter(typeof(VisualStylesConverter))]
+    public class PointMarkerVisualStyle : BaseVisualStyle
+    {
+        #region Private variables
+
+        private PointMarkerType _Type = PointMarkerType.NotSet;
+
+        private Background _Background;
+        private Color _BorderColor = Color.Empty;
+        private Size _Size = Size.Empty;
+
+        private int _BorderWidth = -1;
+        private int _PointCount;
+        private int _Rotation = -1;
+
+        private Image _Image;
+        private int _ImageIndex = -1;
+        private ImageList _ImageList;
+
+        private Image _MarkerImage;
+
+        #endregion
+
+        #region Public properties
+
+        #region Background
+
+        /// <summary>
+        /// Gets or sets the Marker background for series points.
+        /// </summary>
+        [Description("Indicates the Marker background for series points")]
+        public Background Background
+        {
+            get
+            {
+                if (_Background == null)
+                {
+                    _Background = Background.Empty;
+
+                    UpdateChangeHandler(null, _Background);
+                }
+
+                return (_Background);
+            }
+
+            set
+            {
+                if (_Background != value)
+                {
+                    UpdateChangeHandler(_Background, value);
+
+                    _Background = value;
+
+                    OnPropertyChangedEx("Background", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeBackground()
+        {
+            return (_Background != null && _Background.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetBackground()
+        {
+            Background = null;
+        }
+
+        #endregion
+
+        #region BorderColor
+
+        /// <summary>
+        /// Gets or sets the Marker border color for series points.
+        /// </summary>
+        [Description("Indicates the point Marker Border Color for series points")]
+        public Color BorderColor
+        {
+            get { return (_BorderColor); }
+
+            set
+            {
+                if (_BorderColor != value)
+                {
+                    _BorderColor = value;
+
+                    OnPropertyChangedEx("BorderColor", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeBorderColor()
+        {
+            return (_BorderColor.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetBorderColor()
+        {
+            BorderColor = Color.Empty;
+        }
+
+        #endregion
+
+        #region BorderWidth
+
+        /// <summary>
+        /// Gets or sets the Marker border width for series points.
+        /// </summary>
+        [DefaultValue(-1)]
+        [Description("Indicates the point Marker Border width for series points")]
+        public int BorderWidth
+        {
+            get { return (_BorderWidth); }
+
+            set
+            {
+                if (_BorderWidth != value)
+                {
+                    _BorderWidth = value;
+
+                    OnPropertyChangedEx("BorderWidth", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region Image
+
+        /// <summary>
+        /// Gets or sets the PointMarker Image
+        /// </summary>
+        [DefaultValue(null), Category("Appearance")]
+        [Description("Indicates the PointMarker image")]
+        public Image Image
+        {
+            get { return (_Image); }
+
+            set
+            {
+                if (_Image != value)
+                {
+                    _Image = value;
+
+                    FreeMarkerImage();
+
+                    OnPropertyChangedEx("Image", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ImageIndex
+
+        /// <summary>
+        /// Gets or sets the PointMarker image index
+        /// </summary>
+        [DefaultValue(-1)]
+        [Category("Appearance"), Description("Indicates the image index")]
+        [Editor("DevComponents.SuperGrid.Design.ImageIndexEditor, DevComponents.SuperGrid.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(UITypeEditor))]
+        [TypeConverter(typeof(ImageIndexConverter))]
+        public int ImageIndex
+        {
+            get { return (_ImageIndex); }
+
+            set
+            {
+                if (_ImageIndex != value)
+                {
+                    _ImageIndex = value;
+
+                    FreeMarkerImage();
+
+                    OnPropertyChangedEx("ImageIndex", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ImageList
+
+        /// <summary>
+        /// Gets or sets the ImageList.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), DefaultValue(null)]
+        [Description("Indicates the ImageList.")]
+        public ImageList ImageList
+        {
+            get { return (_ImageList); }
+
+            set
+            {
+                if (_ImageList != value)
+                {
+                    _ImageList = value;
+
+                    FreeMarkerImage();
+
+                    OnPropertyChangedEx("ImageList", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region PointCount
+
+        /// <summary>
+        /// Gets or sets the number of points for series markers (3 = triangle, 4 square, etc).
+        /// </summary>
+        [DefaultValue(0)]
+        [Description("Indicates the number of points for series markers (3 = triangle, 4 square, etc).")]
+        public int PointCount
+        {
+            get { return (_PointCount); }
+
+            set
+            {
+                if (_PointCount != value)
+                {
+                    if (value < 0)
+                        throw new Exception("PointMarkerPoints must be >= 0");
+
+                    _PointCount = value;
+
+                    OnPropertyChangedEx("PointCount", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region Rotation
+
+        /// <summary>
+        /// Gets or sets the Marker rotation angle for series points.
+        /// </summary>
+        [Description("Indicates the Marker rotation angle for series points.")]
+        [DefaultValue(-1)]
+        public int Rotation
+        {
+            get { return (_Rotation); }
+
+            set
+            {
+                if (_Rotation != value)
+                {
+                    _Rotation = value;
+
+                    OnPropertyChangedEx("Rotation", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region Size
+
+        /// <summary>
+        /// Gets or sets the Marker size for series points
+        /// </summary>
+        [Description("Indicates the Marker size for series points.")]
+        public Size Size
+        {
+            get { return (_Size); }
+
+            set
+            {
+                if (_Size != value)
+                {
+                    _Size = value;
+
+                    OnPropertyChangedEx("Size", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeSize()
+        {
+            return (Size.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetSize()
+        {
+            Size = Size.Empty;
+        }
+
+        #endregion
+
+        #region Type
+
+        /// <summary>
+        /// Gets or sets the Marker type.
+        /// </summary>
+        [Description("Indicates the Marker type.")]
+        [DefaultValue(PointMarkerType.NotSet)]
+        public PointMarkerType Type
+        {
+            get { return (_Type); }
+
+            set
+            {
+                if (_Type != value)
+                {
+                    _Type = value;
+
+                    OnPropertyChangedEx("Type", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region IsEmpty
+
+        /// <summary>
+        /// Gets whether the style is logically Empty.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        [Description("Gets whether the style is logically Empty.")]
+        public override bool IsEmpty
+        {
+            get
+            {
+                return ((_Background == null || _Background.IsEmpty == true) &&
+                    (_BorderColor == null || _BorderColor.IsEmpty == true) &&
+                    (_BorderWidth == -1) &&
+                    (_Image == null) &&
+                    (_ImageIndex == -1) &&
+                    (_ImageList == null) &&
+                    (_PointCount <= 0) &&
+                    (_Rotation == -1) &&
+                    (_Size.IsEmpty == true) &&
+                    (_Type == PointMarkerType.NotSet) &&
+                    (base.IsEmpty == true));
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetPointMarkerImage
+
+        internal Image GetPointMarkerImage()
+        {
+            if (_MarkerImage != null)
+                return (_MarkerImage);
+
+            _MarkerImage = GetPointMarkerImageEx();
+
+            if (_MarkerImage != null)
+            {
+                if (Dpi.UseFactor == true)
+                {
+                    Size size = _MarkerImage.Size;
+
+                    size.Width *= Dpi.Width1;
+                    size.Height *= Dpi.Width1;
+
+                    _MarkerImage = new Bitmap(_MarkerImage, size);
+                }
+            }
+
+            return (_MarkerImage);
+        }
+
+        #region GetPointMarkerImageEx
+
+        private Image GetPointMarkerImageEx()
+        {
+            if (_Image != null)
+                return (_Image);
+
+            if (_ImageIndex >= 0)
+            {
+                ImageList imageList = ImageList;
+
+                if (imageList != null && _ImageIndex < imageList.Images.Count)
+                    return (imageList.Images[_ImageIndex]);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region FreeMarkerImage
+
+        private void FreeMarkerImage()
+        {
+            if (_MarkerImage != null)
+            {
+                _MarkerImage.Dispose();
+
+                _MarkerImage = null;
+            }
+        }
+
+        #endregion
+
+        #region RenderMarker
+
+        internal void RenderMarker(
+            Graphics g, PointMarker pointMarker, Rectangle bounds, Color color)
+        {
+            Image marker = GetPointMarkerImage();
+
+            if (marker != null)
+            {
+                g.DrawImage(marker, bounds);
+            }
+            else
+            {
+                if (Type != PointMarkerType.NotSet && Type != PointMarkerType.None)
+                {
+                    if (Background.IsEmpty == true)
+                    {
+                        using (Background back = new Background(color))
+                        {
+                            marker = pointMarker.GetMarkerBitmap(g, Type, PointCount,
+                                bounds.Size, Rotation, back, BorderColor, BorderWidth);
+                        }
+                    }
+                    else
+                    {
+                        marker = pointMarker.GetMarkerBitmap(g, Type, PointCount,
+                            bounds.Size, Rotation, Background, BorderColor, BorderWidth);
+                    }
+                }
+
+                if (marker != null)
+                {
+                    // Make allowances for the fact that GetPointMarker() adjusts the
+                    // size and pos of the image to allow for better anti-aliasing
+
+                    bounds.X--;
+                    bounds.Y--;
+
+                    g.DrawImageUnscaled(marker, bounds);
+                }
+                else
+                {
+                    RenderDefaultMarker(g, bounds, color);
+                }
+            }
+        }
+
+        #region RenderDefaultMarker
+
+        private void RenderDefaultMarker(Graphics g, Rectangle bounds, Color color)
+        {
+            bounds.Width++;
+            bounds.Height++;
+
+            Background background = Background;
+
+            if (background.IsEmpty == true)
+            {
+                if (color.IsEmpty == true)
+                    color = Color.DimGray;
+
+                using (Brush br = new SolidBrush(color))
+                    g.FillRectangle(br, bounds);
+            }
+            else
+            {
+                using (Brush br = background.GetBrush(bounds))
+                    g.FillRectangle(br, bounds);
+            }
+
+            if (BorderColor.IsEmpty == false && BorderWidth > 0)
+            {
+                using (Pen pen = new Pen(BorderColor, BorderWidth))
+                {
+                    pen.Alignment = System.Drawing.Drawing2D.PenAlignment.Inset;
+
+                    g.DrawRectangle(pen, bounds);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ApplyStyle
+
+        /// <summary>
+        /// Applies the style to instance of this style.
+        /// </summary>
+        /// <param name="style">Style to apply.</param>
+        public void ApplyStyle(PointMarkerVisualStyle style)
+        {
+            if (style != null)
+            {
+                base.ApplyStyle(style);
+
+                if (style._Background != null && style._Background.IsEmpty == false)
+                    Background = style._Background.Copy();
+
+                if (style.BorderColor.IsEmpty == false)
+                    BorderColor = style.BorderColor;
+
+                if (style.BorderWidth >= 0)
+                    BorderWidth = style.BorderWidth;
+
+                if (style.Image != null)
+                    Image = style.Image;
+
+                if (style.ImageIndex >= 0)
+                    ImageIndex = style.ImageIndex;
+
+                if (style._ImageList != null)
+                    ImageList = style._ImageList;
+
+                if (style.PointCount > 0)
+                    PointCount = style.PointCount;
+
+                if (style.Rotation != -1)
+                    Rotation = style.Rotation;
+
+                if (style.Size.IsEmpty == false)
+                    Size = style.Size;
+
+                if (style.Type != PointMarkerType.NotSet)
+                    Type = style.Type;
+            }
+        }
+
+        #endregion
+
+        #region ApplyDefaults
+
+        public override void ApplyDefaults()
+        {
+            if (PointCount <= 0)
+                PointCount = 5;
+
+            if (Size.IsEmpty)
+                Size = new Size(5, 5);
+
+            if (BorderWidth == -1)
+                BorderWidth = 1;
+
+            base.ApplyDefaults();
+        }
+
+        #endregion
+
+        #region Copy
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public new PointMarkerVisualStyle Copy()
+        {
+            PointMarkerVisualStyle style = new PointMarkerVisualStyle();
+
+            CopyTo(style);
+
+            return (style);
+        }
+
+        #endregion
+
+        #region CopyTo
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public void CopyTo(PointMarkerVisualStyle style)
+        {
+            base.CopyTo(style);
+
+            style.Background = (_Background != null) ? _Background.Copy() : null;
+
+            style.BorderColor = _BorderColor;
+            style.BorderWidth = _BorderWidth;
+
+            style.Image = _Image;
+            style.ImageIndex = _ImageIndex;
+            style.ImageList = _ImageList;
+
+            style.PointCount = _PointCount;
+            style.Rotation = _Rotation;
+            style.Size = _Size;
+            style.Type = _Type;
+        }
+
+        #endregion
+
+        #region GetSerialData
+
+        internal override SerialElementCollection GetSerialData(string serialName)
+        {
+            SerialElementCollection sec = new SerialElementCollection();
+
+            if (serialName != null)
+            {
+                if (serialName.Equals("") == true)
+                    serialName = "PointMarkerVisualStyle";
+
+                sec.AddStartElement(serialName);
+            }
+
+            if (_Background != null && _Background.IsEmpty == false)
+                sec.AddElement(_Background.GetSerialData("Background"));
+
+            sec.AddValue("BorderColor", _BorderColor, Color.Empty);
+            sec.AddValue("BorderWidth", _BorderWidth, -1);
+
+            sec.AddValue("Image", Image);
+            sec.AddValue("ImageIndex", _ImageIndex, -1);
+
+            if (_ImageList != null)
+                sec.AddValue("ImageList", XmlSerializableImageList.ConvertToString(ImageList));
+
+            sec.AddValue("PointCount", _PointCount, 0);
+            sec.AddValue("Rotation", _Rotation, -1);
+            sec.AddValue("Size", _Size, Size.Empty);
+            sec.AddValue("Type", _Type, PointMarkerType.NotSet);
+
+            sec.AddElement(base.GetSerialData(null));
+
+            if (serialName != null)
+                sec.AddEndElement(serialName);
+
+            return (sec);
+        }
+
+        #endregion
+
+        #region PutSerialData
+
+        #region ProcessValue
+
+        internal override void ProcessValue(SerialElement se)
+        {
+            switch (se.Name)
+            {
+                case "BorderColor":
+                    BorderColor = se.GetValueColor();
+                    break;
+
+                case "BorderWidth":
+                    BorderWidth = int.Parse(se.StringValue);
+                    break;
+
+                case "Image":
+                    Image = se.GetValueImage();
+                    break;
+
+                case "ImageIndex":
+                    ImageIndex = int.Parse(se.StringValue);
+                    break;
+
+                case "ImageList":
+                    ImageList = XmlSerializableImageList.ConvertFromString(se.StringValue);
+                    break;
+
+                case "PointCount":
+                    PointCount = int.Parse(se.StringValue);
+                    break;
+
+                case "Rotation":
+                    Rotation = int.Parse(se.StringValue);
+                    break;
+
+                case "Size":
+                    Size = se.GetValueSize();
+                    break;
+
+                case "Type":
+                    Type = (PointMarkerType)se.GetValueEnum(typeof(PointMarkerType));
+                    break;
+
+                default:
+                    base.ProcessValue(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region ProcessCollection
+
+        internal override void ProcessCollection(SerialElement se)
+        {
+            SerialElementCollection sec = se.Sec;
+
+            switch (se.Name)
+            {
+                case "Background":
+                    sec.PutSerialData(Background);
+                    break;
+
+                default:
+                    base.ProcessCollection(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IDisposable
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        public override void Dispose()
+        {
+            Background = null;
+
+            base.Dispose();
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/ReferenceLineVisualStyle.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/ReferenceLineVisualStyle.cs
new file mode 100644
index 00000000..2d162549
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/ReferenceLineVisualStyle.cs	
@@ -0,0 +1,460 @@
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Charts.Style
+{
+    /// <summary>
+    /// Represents a ReferenceLineVisualStyle.
+    /// </summary>
+    [TypeConverter(typeof(VisualStylesConverter))]
+    public class ReferenceLineVisualStyle : ChartLineVisualStyle
+    {
+        #region Private variables
+
+        private Alignment _TextAlignment = Alignment.NotSet;
+        private Tbool _AllowWrap = Tbool.NotSet;
+        private Color _TextColor = Color.Empty;
+        private Padding _TextPadding;
+        private Font _Font;
+
+        #endregion
+
+        #region Public properties
+
+        #region AllowWrap
+
+        /// <summary>
+        /// Gets or sets whether text wrapping is permitted
+        /// </summary>
+        [DefaultValue(Tbool.NotSet), Category("Appearance")]
+        [Description("Indicates whether text wrapping is permitted.")]
+        public Tbool AllowWrap
+        {
+            get { return (_AllowWrap); }
+
+            set
+            {
+                if (_AllowWrap != value)
+                {
+                    _AllowWrap = value;
+
+                    OnPropertyChangedEx("AllowWrap", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region Font
+
+        /// <summary>
+        /// Gets or sets the style Font
+        /// </summary>
+        [DefaultValue(null)]
+        [Description("Indicates the style Font")]
+        public Font Font
+        {
+            get { return (_Font); }
+
+            set
+            {
+                if (_Font != value)
+                {
+                    _Font = value;
+
+                    OnPropertyChangedEx("Font", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region TextAlignment
+
+        ///<summary>
+        /// Gets or sets the Text alignment.
+        ///</summary>
+        [DefaultValue(Alignment.NotSet), Category("Appearance")]
+        [Description("Indicates the Text alignment.")]
+        public Alignment TextAlignment
+        {
+            get { return (_TextAlignment); }
+
+            set
+            {
+                if (value != _TextAlignment)
+                {
+                    _TextAlignment = value;
+
+                    OnPropertyChangedEx("TextAlignment", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region TextColor
+
+        ///<summary>
+        /// Gets or sets the Reference Line Text Color.
+        ///</summary>
+        [Category("Appearance")]
+        [Description("Indicates the Reference Line Text Color.")]
+        public Color TextColor
+        {
+            get { return (_TextColor); }
+
+            set
+            {
+                if (value != _TextColor)
+                {
+                    _TextColor = value;
+
+                    OnPropertyChangedEx("TextColor", Style.VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeTextColor()
+        {
+            return (_TextColor.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetTextColor()
+        {
+            _TextColor = Color.Empty;
+        }
+
+        #endregion
+
+        #region TextPadding
+
+        /// <summary>
+        /// Gets or sets spacing between the content and edges of the Text.
+        /// </summary>
+        [Description("Indicates the spacing between the content and edges of the Text")]
+        public Padding TextPadding
+        {
+            get
+            {
+                if (_TextPadding == null)
+                {
+                    _TextPadding = Padding.Empty;
+
+                    UpdateChangeHandler(null, _TextPadding);
+                }
+
+                return (_TextPadding);
+            }
+
+            set
+            {
+                if (_TextPadding != value)
+                {
+                    UpdateChangeHandler(_TextPadding, value);
+
+                    _TextPadding = value;
+
+                    OnPropertyChangedEx("TextPadding", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeTextPadding()
+        {
+            return (_TextPadding != null && _TextPadding.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetTextPadding()
+        {
+            TextPadding = null;
+        }
+
+        #endregion
+
+        #region IsEmpty
+
+        /// <summary>
+        /// Gets whether the style is logically Empty.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        [Description("Gets whether the style is logically Empty.")]
+        public override bool IsEmpty
+        {
+            get
+            {
+                return ((_AllowWrap == Tbool.NotSet) &&
+                    (_Font == null) &&
+                    (_TextAlignment == Alignment.NotSet) &&
+                    (_TextColor.IsEmpty == true) &&
+                    (_TextPadding == null || _TextPadding.IsEmpty == true) &&
+                    (base.IsEmpty == true));
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetStringFormatFlags
+
+        internal void GetStringFormatFlags(StringFormat sf)
+        {
+            if (AllowWrap == Tbool.False)
+            {
+                sf.FormatFlags |= StringFormatFlags.NoWrap;
+                sf.Trimming = StringTrimming.None;
+            }
+
+            switch (TextAlignment)
+            {
+                case Alignment.TopLeft:
+                    sf.Alignment = StringAlignment.Near;
+                    break;
+
+                case Alignment.TopCenter:
+                    sf.Alignment = StringAlignment.Center;
+                    break;
+
+                case Alignment.TopRight:
+                    sf.Alignment = StringAlignment.Far;
+                    break;
+
+                case Alignment.MiddleLeft:
+                    sf.Alignment = StringAlignment.Near;
+                    break;
+
+                case Alignment.MiddleCenter:
+                    sf.Alignment = StringAlignment.Center;
+                    break;
+
+                case Alignment.MiddleRight:
+                    sf.Alignment = StringAlignment.Far;
+                    break;
+
+                case Alignment.BottomLeft:
+                    sf.Alignment = StringAlignment.Near;
+                    break;
+
+                case Alignment.BottomCenter:
+                    sf.Alignment = StringAlignment.Center;
+                    break;
+
+                case Alignment.BottomRight:
+                    sf.Alignment = StringAlignment.Far;
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region ApplyStyle
+
+        /// <summary>
+        /// Applies the style to instance of this style.
+        /// </summary>
+        /// <param name="style">Style to apply.</param>
+        public void ApplyStyle(ReferenceLineVisualStyle style)
+        {
+            if (style != null)
+            {
+                base.ApplyStyle(style);
+
+                if (style.AllowWrap != Tbool.NotSet)
+                    _AllowWrap = style.AllowWrap;
+
+                if (style.Font != null)
+                    _Font = (Font)style.Font.Clone();
+
+                if (style.TextAlignment != Alignment.NotSet)
+                    _TextAlignment = style.TextAlignment;
+
+                if (style.TextColor.IsEmpty == false)
+                    _TextColor = style.TextColor;
+
+                if (style._TextPadding != null && style._TextPadding.IsEmpty == false)
+                    TextPadding = style.TextPadding.Copy();
+            }
+        }
+
+        #endregion
+
+        #region Copy
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public new ReferenceLineVisualStyle Copy()
+        {
+            ReferenceLineVisualStyle style = new ReferenceLineVisualStyle();
+
+            CopyTo(style);
+
+            return (style);
+        }
+
+        #endregion
+
+        #region CopyTo
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public void CopyTo(ReferenceLineVisualStyle style)
+        {
+            base.CopyTo(style);
+
+            style.AllowWrap = _AllowWrap;
+
+            style.Font = (_Font != null) ? (Font)_Font.Clone() : null;
+
+            style.TextAlignment = _TextAlignment;
+            style.TextColor = _TextColor;
+
+            style.TextPadding = (_TextPadding != null) ? _TextPadding.Copy() : null;
+        }
+
+        #endregion
+
+        #region GetSerialData
+
+        internal override SerialElementCollection GetSerialData(string serialName)
+        {
+            SerialElementCollection sec = new SerialElementCollection();
+
+            if (serialName != null)
+            {
+                if (serialName.Equals("") == true)
+                    serialName = "ReferenceLineVisualStyle";
+
+                sec.AddStartElement(serialName);
+            }
+
+            sec.AddValue("AllowWrap", AllowWrap, Tbool.NotSet);
+
+            if (_Font != null)
+                sec.AddValue("Font", XmlSerializableFont.ConvertToString(Font));
+
+            sec.AddValue("TextAlignment", TextAlignment, Alignment.NotSet);
+            sec.AddValue("TextColor", TextColor, Color.Empty);
+
+            if (_TextPadding != null && _TextPadding.IsEmpty == false)
+                sec.AddElement(_TextPadding.GetSerialData("TextPadding"));
+
+            sec.AddElement(base.GetSerialData(null));
+
+            if (serialName != null)
+                sec.AddEndElement(serialName);
+
+            return (sec);
+        }
+
+        #endregion
+
+        #region PutSerialData
+
+        #region ProcessValue
+
+        internal override void ProcessValue(SerialElement se)
+        {
+            switch (se.Name)
+            {
+                case "AllowWrap":
+                    AllowWrap = (Tbool)se.GetValueEnum(typeof(Tbool));
+                    break;
+
+                case "Font":
+                    Font = XmlSerializableFont.ConvertFromString(se.StringValue);
+                    break;
+
+                case "TextAlignment":
+                    TextAlignment = (Alignment)se.GetValueEnum(typeof(Alignment));
+                    break;
+
+                case "TextColor":
+                    TextColor = se.GetValueColor();
+                    break;
+
+                default:
+                    base.ProcessValue(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region ProcessCollection
+
+        internal override void ProcessCollection(SerialElement se)
+        {
+            SerialElementCollection sec = se.Sec;
+
+            switch (se.Name)
+            {
+                case "TextPadding":
+                    sec.PutSerialData(TextPadding);
+                    break;
+
+                default:
+                    base.ProcessCollection(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IDisposable
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        public override void Dispose()
+        {
+            TextPadding = null;
+
+            base.Dispose();
+        }
+
+        #endregion
+    }
+
+    #region enums
+
+    #region NearAlignment
+
+    public enum NearAlignment
+    {
+        NotSet = -1,
+
+        Near,
+
+        Far,
+    }
+
+    #endregion
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/RegressionLineVisualStyle.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/RegressionLineVisualStyle.cs
new file mode 100644
index 00000000..28f90b83
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/RegressionLineVisualStyle.cs	
@@ -0,0 +1,42 @@
+using System.ComponentModel;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Charts.Style
+{
+    /// <summary>
+    /// Represents the visual style of a Legend element.
+    /// </summary>
+    [TypeConverter(typeof(VisualStylesConverter))]
+    public class RegressionLineVisualStyle : ChartCapLineVisualStyle
+    {
+        #region Copy
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public new RegressionLineVisualStyle Copy()
+        {
+            RegressionLineVisualStyle style = new RegressionLineVisualStyle();
+
+            CopyTo(style);
+
+            return (style);
+        }
+
+        #endregion
+
+        #region CopyTo
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public void CopyTo(RegressionLineVisualStyle style)
+        {
+            base.CopyTo(style);
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/ScrollBarVisualStyle.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/ScrollBarVisualStyle.cs
new file mode 100644
index 00000000..1692ffc6
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/ScrollBarVisualStyle.cs	
@@ -0,0 +1,739 @@
+using System.ComponentModel;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Charts.Style
+{
+    ///<summary>
+    /// ScrollBarVisualStyle
+    ///</summary>
+    [TypeConverter(typeof(VisualStylesConverter))]
+    public class ScrollBarVisualStyles : VisualStyles<ScrollBarVisualStyle>
+    {
+        #region Copy
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public ScrollBarVisualStyles Copy()
+        {
+            ScrollBarVisualStyles styles = new ScrollBarVisualStyles();
+
+            for (int i = 0; i < Styles.Length; i++)
+            {
+                ScrollBarVisualStyle vstyle = Styles[i];
+
+                if (vstyle != null)
+                    styles.Styles[i] = vstyle.Copy();
+            }
+
+            return (styles);
+        }
+
+        #endregion
+    }
+
+    /// <summary>
+    /// Represents the visual style of a ScrollBar element.
+    /// </summary>
+    [TypeConverter(typeof(VisualStylesConverter))]
+    public class ScrollBarVisualStyle : BaseVisualStyle
+    {
+        #region Private variables
+
+        private Color _ArrowColor;
+        private Color _ArrowBorderColor;
+        private Background _ArrowBackground;
+
+        private Color _ThumbColor;
+        private Color _ThumbBorderColor;
+        private Background _ThumbBackground;
+
+        private Color _BorderColor;
+        private Background _TrackBackground;
+
+        private Tbool _NoAlphaOnMouseOver = Tbool.NotSet;
+
+        #endregion
+
+        #region Public properties
+
+        #region ArrowBackground
+
+        /// <summary>
+        /// Gets or sets the Background of the Increase/Decrease Arrow elements of the ScrollBar.
+        /// </summary>
+        [Description("Indicates the Background of the Increase/Decrease Arrow elements of the ScrollBar")]
+        public Background ArrowBackground
+        {
+            get
+            {
+                if (_ArrowBackground == null)
+                {
+                    _ArrowBackground = Background.Empty;
+
+                    UpdateChangeHandler(null, _ArrowBackground);
+                }
+
+                return (_ArrowBackground);
+            }
+
+            set
+            {
+                if (value != _ArrowBackground)
+                {
+                    UpdateChangeHandler(_ArrowBackground, value);
+
+                    _ArrowBackground = value;
+
+                    OnPropertyChangedEx("ArrowBackground", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeArrowBackground()
+        {
+            return (_ArrowBackground != null && _ArrowBackground.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetArrowBackground()
+        {
+            ArrowBackground = null;
+        }
+
+        #endregion
+
+        #region ArrowBorderColor
+
+        /// <summary>
+        /// Gets or sets the Arrow Increase/Decrease border color.
+        /// </summary>
+        [Description("Indicates the Arrow Increase/Decrease border color")]
+        public Color ArrowBorderColor
+        {
+            get { return (_ArrowBorderColor); }
+
+            set
+            {
+                if (value != _ArrowBorderColor)
+                {
+                    _ArrowBorderColor = value;
+
+                    OnPropertyChangedEx("ArrowBorderColor", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeArrowBorderColor()
+        {
+            return (_ArrowBorderColor.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetArrowBorderColor()
+        {
+            ArrowBorderColor = Color.Empty;
+        }
+
+        #endregion
+        
+        #region ArrowColor
+
+        /// <summary>
+        /// Gets or sets the Color of the Increase/Decrease Arrow elements of the scrollBar.
+        /// </summary>
+        [Description("Indicates the Color of the Increase/Decrease Arrow elements of the scrollBar")]
+        public Color ArrowColor
+        {
+            get { return (_ArrowColor); }
+
+            set
+            {
+                if (value != _ArrowColor)
+                {
+                    _ArrowColor = value;
+
+                    OnPropertyChangedEx("ArrowColor", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeArrowColor()
+        {
+            return (_ArrowColor.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetArrowColor()
+        {
+            ArrowColor = Color.Empty;
+        }
+
+        #endregion
+
+        #region BorderColor
+
+        /// <summary>
+        /// Gets or sets the border color of the scrollBar.
+        /// </summary>
+        [Description("Indicates the Border Color of the scrollBar")]
+        public Color BorderColor
+        {
+            get { return (_BorderColor); }
+
+            set
+            {
+                if (value != _BorderColor)
+                {
+                    _BorderColor = value;
+
+                    OnPropertyChangedEx("BorderColor", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeBorderColor()
+        {
+            return (_BorderColor.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetBorderColor()
+        {
+            BorderColor = Color.Empty;
+        }
+
+        #endregion
+
+        #region NoAlphaOnMouseOver
+
+        /// <summary>
+        /// Gets or sets whether color alpha values are ignored when the mouse is over the scrollbar.
+        /// </summary>
+        [DefaultValue(Tbool.NotSet)]
+        [Description("Indicates whether color alpha values are ignored when the mouse is over the scrollbar.")]
+        public Tbool NoAlphaOnMouseOver
+        {
+            get { return (_NoAlphaOnMouseOver); }
+
+            set
+            {
+                if (value != _NoAlphaOnMouseOver)
+                {
+                    _NoAlphaOnMouseOver = value;
+
+                    OnPropertyChangedEx("NoAlphaOnMouseOver", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ThumbBackground
+
+        /// <summary>
+        /// Gets or sets the Background of the Thumb element of the ScrollBar.
+        /// </summary>
+        [Description("Indicates the Background of the Thumb element of the ScrollBar")]
+        public Background ThumbBackground
+        {
+            get
+            {
+                if (_ThumbBackground == null)
+                {
+                    _ThumbBackground = Background.Empty;
+
+                    UpdateChangeHandler(null, _ThumbBackground);
+                }
+
+                return (_ThumbBackground);
+            }
+
+            set
+            {
+                if (value != _ThumbBackground)
+                {
+                    UpdateChangeHandler(_ThumbBackground, value);
+
+                    _ThumbBackground = value;
+
+                    OnPropertyChangedEx("ThumbBackground", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeThumbBackground()
+        {
+            return (_ThumbBackground != null && _ThumbBackground.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetThumbBackground()
+        {
+            ThumbBackground = null;
+        }
+
+        #endregion
+
+        #region ThumbBorderColor
+
+        /// <summary>
+        /// Gets or sets the Thumb border color.
+        /// </summary>
+        [Description("Indicates the Thumb border color")]
+        public Color ThumbBorderColor
+        {
+            get { return (_ThumbBorderColor); }
+
+            set
+            {
+                if (value != _ThumbBorderColor)
+                {
+                    _ThumbBorderColor = value;
+
+                    OnPropertyChangedEx("ThumbBorderColor", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeThumbBorderColor()
+        {
+            return (_ThumbBorderColor.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetThumbBorderColor()
+        {
+            ThumbBorderColor = Color.Empty;
+        }
+
+        #endregion
+
+        #region ThumbColor
+
+        /// <summary>
+        /// Gets or sets the Color of the Thumb content element (hash marks) of the scrollBar.
+        /// </summary>
+        [Description("Indicates the Color of the Thumb content element (hash marks) of the scrollBar")]
+        public Color ThumbColor
+        {
+            get { return (_ThumbColor); }
+
+            set
+            {
+                if (value != _ThumbColor)
+                {
+                    _ThumbColor = value;
+
+                    OnPropertyChangedEx("ThumbColor", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeThumbColor()
+        {
+            return (_ThumbColor.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetThumbColor()
+        {
+            ThumbColor = Color.Empty;
+        }
+
+        #endregion
+
+        #region TrackBackground
+
+        /// <summary>
+        /// Gets or sets the Background of the Increase/Decrease Track elements of the ScrollBar.
+        /// </summary>
+        [Description("Indicates the Background of the Increase/Decrease Track elements of the ScrollBar")]
+        public Background TrackBackground
+        {
+            get
+            {
+                if (_TrackBackground == null)
+                {
+                    _TrackBackground = Background.Empty;
+
+                    UpdateChangeHandler(null, _TrackBackground);
+                }
+
+                return (_TrackBackground);
+            }
+
+            set
+            {
+                if (_TrackBackground != value)
+                {
+                    UpdateChangeHandler(_TrackBackground, value);
+
+                    _TrackBackground = value;
+
+                    OnPropertyChangedEx("TrackBackground", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeTrackBackground()
+        {
+            return (_TrackBackground != null && _TrackBackground.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetTrackBackground()
+        {
+            TrackBackground = null;
+        }
+
+        #endregion
+
+        #region IsEmpty
+
+        /// <summary>
+        /// Gets whether the style is logically Empty.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        [Description("Gets whether the style is logically Empty.")]
+        public override bool IsEmpty
+        {
+            get
+            {
+                return ((_ArrowBackground == null || _ArrowBackground.IsEmpty) &&
+                    (_ArrowBorderColor.IsEmpty) &&
+                    (_ArrowColor.IsEmpty) &&
+                    (_BorderColor.IsEmpty) &&
+                    (_NoAlphaOnMouseOver == Tbool.NotSet) &&
+                    (_ThumbBackground == null || _ThumbBackground.IsEmpty) &&
+                    (_ThumbBorderColor.IsEmpty) &&
+                    (_ThumbColor.IsEmpty) &&
+                    (_TrackBackground == null || _TrackBackground.IsEmpty) &&
+                    (base.IsEmpty == true));
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetColor
+
+        internal Color GetColor(Color color, bool noAlpha)
+        {
+            if (noAlpha == false)
+                return (color);
+
+            uint argb = (uint)color.ToArgb() | 0xff000000;
+
+            return (Color.FromArgb((int)argb));
+        }
+
+        #endregion
+
+        #region ApplyStyle
+
+        /// <summary>
+        /// Applies the style to instance of this style.
+        /// </summary>
+        /// <param name="style">Style to apply.</param>
+        public void ApplyStyle(ScrollBarVisualStyle style)
+        {
+            if (style != null)
+            {
+                base.ApplyStyle(style);
+
+                if (style.ArrowBackground.IsEmpty == false)
+                    ArrowBackground = style.ArrowBackground.Copy();
+
+                if (style.ArrowBorderColor.IsEmpty == false)
+                    ArrowBorderColor = style.ArrowBorderColor;
+
+                if (style.ArrowColor.IsEmpty == false)
+                    ArrowColor = style.ArrowColor;
+
+                if (style.BorderColor.IsEmpty == false)
+                    BorderColor = style.BorderColor;
+
+                if (style.NoAlphaOnMouseOver != Tbool.NotSet)
+                    NoAlphaOnMouseOver = style.NoAlphaOnMouseOver;
+
+                if (style.ThumbBackground.IsEmpty == false)
+                    ThumbBackground = style.ThumbBackground.Copy();
+
+                if (style.ThumbBorderColor.IsEmpty == false)
+                    ThumbBorderColor = style.ThumbBorderColor;
+
+                if (style.ThumbColor.IsEmpty == false)
+                    ThumbColor = style.ThumbColor;
+
+                if (style.TrackBackground.IsEmpty == false)
+                    TrackBackground = style.TrackBackground.Copy();
+            }
+        }
+
+        #endregion
+
+        #region ApplyDefaults
+
+        public override void ApplyDefaults()
+        {
+            if (ArrowBackground.IsEmpty)
+                ArrowBackground = new Background(Color.Gainsboro);
+
+            if (ThumbBackground.IsEmpty)
+                ThumbBackground = new Background(Color.White, Color.Gainsboro);
+
+            if (TrackBackground.IsEmpty)
+                TrackBackground = new Background(Color.Gainsboro);
+
+            if (BorderColor.IsEmpty)
+                BorderColor = Color.Gray;
+
+            if (ThumbBorderColor.IsEmpty)
+                ThumbBorderColor = Color.Gray;
+
+            if (ArrowColor.IsEmpty)
+                ArrowColor = Color.DimGray;
+
+            if (ThumbColor.IsEmpty)
+                ThumbColor = Color.Black;
+
+            if (ArrowBorderColor.IsEmpty)
+                ArrowBorderColor = Color.Gray;
+
+            if (NoAlphaOnMouseOver == Tbool.NotSet)
+                NoAlphaOnMouseOver = Tbool.False;
+
+            base.ApplyDefaults();
+        }
+
+        #endregion
+
+        #region Copy
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public new ScrollBarVisualStyle Copy()
+        {
+            ScrollBarVisualStyle style = new ScrollBarVisualStyle();
+
+            CopyTo(style);
+
+            return (style);
+        }
+
+        #endregion
+
+        #region CopyTo
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public void CopyTo(ScrollBarVisualStyle style)
+        {
+            base.CopyTo(style);
+
+            style.ArrowBackground = (_ArrowBackground != null ? _ArrowBackground.Copy() : null);
+
+            style.ArrowBorderColor = _ArrowBorderColor;
+            style.ArrowColor = _ArrowColor;
+            style.BorderColor = _BorderColor;
+            style.NoAlphaOnMouseOver = _NoAlphaOnMouseOver;
+
+            style.ThumbBackground = (_ThumbBackground != null ? _ThumbBackground.Copy() : null);
+
+            style.ThumbBorderColor = _ThumbBorderColor;
+            style.ThumbColor = _ThumbColor;
+
+            style.TrackBackground = (_TrackBackground != null ? _TrackBackground.Copy() : null);
+        }
+
+        #endregion
+
+        #region GetSerialData
+
+        internal override SerialElementCollection GetSerialData(string serialName)
+        {
+            SerialElementCollection sec = new SerialElementCollection();
+
+            if (serialName != null)
+            {
+                if (serialName.Equals("") == true)
+                    serialName = "ScrollBarVisualStyle";
+
+                sec.AddStartElement(serialName);
+            }
+
+            if (_ArrowBackground != null && _ArrowBackground.IsEmpty == false)
+                sec.AddElement(_ArrowBackground.GetSerialData("ArrowBackground"));
+
+            sec.AddValue("ArrowBorderColor", ArrowBorderColor, Color.Empty);
+            sec.AddValue("ArrowColor", ArrowColor, Color.Empty);
+            sec.AddValue("BorderColor", BorderColor, Color.Empty);
+            sec.AddValue("NoAlphaOnMouseOver", NoAlphaOnMouseOver, Tbool.NotSet);
+
+            if (_ThumbBackground != null && _ThumbBackground.IsEmpty == false)
+                sec.AddElement(_ThumbBackground.GetSerialData("ThumbBackground"));
+
+            sec.AddValue("ThumbBorderColor", ThumbBorderColor, Color.Empty);
+            sec.AddValue("ThumbColor", ThumbColor, Color.Empty);
+
+            if (_TrackBackground != null && _TrackBackground.IsEmpty == false)
+                sec.AddElement(_TrackBackground.GetSerialData("TrackBackground"));
+
+            sec.AddElement(base.GetSerialData(null));
+
+            if (serialName != null)
+                sec.AddEndElement(serialName);
+
+            return (sec);
+        }
+
+        #endregion
+
+        #region PutSerialData
+
+        #region ProcessValue
+
+        internal override void ProcessValue(SerialElement se)
+        {
+            switch (se.Name)
+            {
+                case "ArrowBorderColor":
+                    ArrowBorderColor = se.GetValueColor();
+                    break;
+
+                case "ArrowColor":
+                    ArrowColor = se.GetValueColor();
+                    break;
+
+                case "BorderColor":
+                    BorderColor = se.GetValueColor();
+                    break;
+
+                case "NoAlphaOnMouseOver":
+                    NoAlphaOnMouseOver = (Tbool)se.GetValueEnum(typeof(Tbool));
+                    break;
+
+                case "ThumbBorderColor":
+                    ThumbBorderColor = se.GetValueColor();
+                    break;
+
+                case "ThumbColor":
+                    ThumbColor = se.GetValueColor();
+                    break;
+
+                default:
+                    base.ProcessValue(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region ProcessCollection
+
+        internal override void ProcessCollection(SerialElement se)
+        {
+            SerialElementCollection sec = se.Sec;
+
+            switch (se.Name)
+            {
+                case "ArrowBackground":
+                    sec.PutSerialData(ArrowBackground);
+                    break;
+
+                case "ThumbBackground":
+                    sec.PutSerialData(ThumbBackground);
+                    break;
+
+                case "TrackBackground":
+                    sec.PutSerialData(TrackBackground);
+                    break;
+
+                default:
+                    base.ProcessCollection(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IDisposable
+
+        public override void Dispose()
+        {
+            ArrowBackground = null;
+            ThumbBackground = null;
+            TrackBackground = null;
+
+            base.Dispose();
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/SeriesLabelVisualStyle.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/SeriesLabelVisualStyle.cs
new file mode 100644
index 00000000..0cdb01d5
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/SeriesLabelVisualStyle.cs	
@@ -0,0 +1,602 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Drawing.Drawing2D;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Charts.Style
+{
+    /// <summary>
+    /// Represents a SeriesLabelVisualStyle.
+    /// </summary>
+    [TypeConverter(typeof(VisualStylesConverter))]
+    public class SeriesLabelVisualStyle : ContainerVisualStyle
+    {
+        #region Private variables
+
+        private Color _ConnectorColor = Color.Empty;
+        private LinePattern _ConnectorPattern = LinePattern.NotSet;
+
+        private int _ConnectorLength = -1;
+        private int _ConnectorThickness = -1;
+
+        private Tbool _DrawConnector = Tbool.NotSet;
+        private Tbool _ShowBaseValueLabels = Tbool.NotSet;
+
+        private Size _MaximumSize = Size.Empty;
+        private Size _MinimumSize = Size.Empty;
+
+        private Point _Offset;
+
+        private float _Rotation = float.NaN;
+
+        private string _TextFormat;
+
+        #endregion
+
+        #region Public properties
+
+        #region ConnectorColor
+
+        /// <summary>
+        /// Gets or sets the style border color.
+        /// </summary>
+        [Description("Indicates the style Border Color")]
+        public Color ConnectorColor
+        {
+            get { return (_ConnectorColor); }
+
+            set
+            {
+                if (value != _ConnectorColor)
+                {
+                    _ConnectorColor = value;
+
+                    OnPropertyChangedEx("ConnectorColor", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeConnectorColor()
+        {
+            return (_ConnectorColor.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetConnectorColor()
+        {
+            _ConnectorColor = Color.Empty;
+        }
+
+        #endregion
+
+        #region ConnectorLength
+
+        /// <summary>
+        /// Gets or sets the length of the line connecting the slice
+        /// and the slice label.
+        /// </summary>
+        [DefaultValue(-1), Category("Appearance")]
+        [Description("Indicates the length of the line connecting the slice and the slice label.")]
+        public int ConnectorLength
+        {
+            get { return (_ConnectorLength); }
+
+            set
+            {
+                if (value != _ConnectorLength)
+                {
+                    if (value < 0)
+                        throw new InvalidPropertyValueException("value cannot be negative.");
+
+                    _ConnectorLength = value;
+
+                    OnPropertyChangedEx("ConnectorLength", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ConnectorPattern
+
+        /// <summary>
+        /// Gets or sets the style border pattern (Solid, Dash, ...)
+        /// </summary>
+        [Description("Indicates the style border pattern (Solid, Dash, ...)")]
+        [DefaultValue(LinePattern.NotSet)]
+        public LinePattern ConnectorPattern
+        {
+            get { return (_ConnectorPattern); }
+
+            set
+            {
+                if (value != _ConnectorPattern)
+                {
+                    _ConnectorPattern = value;
+
+                    OnPropertyChangedEx("ConnectorPattern", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ConnectorThickness
+
+        /// <summary>
+        /// Gets or sets the style border thickness.
+        /// </summary>
+        [DefaultValue(-1), Category("Appearance")]
+        [Description("Indicates the style border thickness")]
+        public int ConnectorThickness
+        {
+            get { return (_ConnectorThickness); }
+
+            set
+            {
+                if (value != _ConnectorThickness)
+                {
+                    _ConnectorThickness = value;
+
+                    OnPropertyChangedEx("ConnectorThickness", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region DrawConnector
+
+        ///<summary>
+        /// Gets or sets whether a connecting line is drawn to the data point.
+        ///</summary>
+        [DefaultValue(Tbool.NotSet), Category("DataLabel")]
+        [Description("Indicates whether a connecting line is drawn to the data point.")]
+        public Tbool DrawConnector
+        {
+            get { return (_DrawConnector); }
+
+            set
+            {
+                if (value != _DrawConnector)
+                {
+                    _DrawConnector = value;
+
+                    OnPropertyChangedEx("DrawConnector", Style.VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region MaximumSize
+
+        /// <summary>
+        /// Gets or sets the maximum size of the label.
+        /// </summary>
+        [Category("Appearance")]
+        [Description("Indicates the maximum size of the label.")]
+        public Size MaximumSize
+        {
+            get { return (_MaximumSize); }
+
+            set
+            {
+                if (value != _MaximumSize)
+                {
+                    _MaximumSize = value;
+
+                    OnPropertyChangedEx("MaximumSize", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeCMaximumSize()
+        {
+            return (_MaximumSize.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetMaximumSize()
+        {
+            MaximumSize = Size.Empty;
+        }
+
+        #endregion
+
+        #region MinimumSize
+
+        /// <summary>
+        /// Gets or sets the minimum size of the label.
+        /// </summary>
+        [Category("Appearance")]
+        [Description("Indicates the minimum size of the label.")]
+        public Size MinimumSize
+        {
+            get { return (_MinimumSize); }
+
+            set
+            {
+                if (value != _MinimumSize)
+                {
+                    _MinimumSize = value;
+
+                    OnPropertyChangedEx("MinimumSize", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeMinimumSize()
+        {
+            return (_MinimumSize.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetMinimumSize()
+        {
+            MinimumSize = Size.Empty;
+        }
+
+        #endregion
+
+        #region Offset
+
+        ///<summary>
+        /// Gets or sets the offset of the label relative to the data point.
+        ///</summary>
+        [Category("Appearance")]
+        [Description("Indicates the offset of the label relative to the data point.")]
+        public Point Offset
+        {
+            get { return (_Offset); }
+
+            set
+            {
+                if (value != _Offset)
+                {
+                    _Offset = value;
+
+                    OnPropertyChangedEx("Offset", Style.VisualChangeType.Layout);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeOffset()
+        {
+            return (_Offset.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetOffset()
+        {
+            Offset = Point.Empty;
+        }
+
+        #endregion
+
+        #region Rotation
+
+        ///<summary>
+        /// Gets or sets the amount to rotate the label body.
+        ///</summary>
+        [DefaultValue(float.NaN), Category("Appearance")]
+        [Description("Indicates the amount to rotate the label body.")]
+        public float Rotation
+        {
+            get { return (_Rotation); }
+
+            set
+            {
+                if (value != _Rotation)
+                {
+                    _Rotation = value;
+
+                    OnPropertyChangedEx("Rotation", Style.VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowBaseValueLabels
+
+        ///<summary>
+        /// Gets or sets whether Labels are shown for Base Values.
+        ///</summary>
+        [DefaultValue(Tbool.NotSet), Category("DataLabel")]
+        [Description("Indicates whether Labels are shown for Base Values.")]
+        public Tbool ShowBaseValueLabels
+        {
+            get { return (_ShowBaseValueLabels); }
+
+            set
+            {
+                if (value != _ShowBaseValueLabels)
+                {
+                    _ShowBaseValueLabels = value;
+
+                    OnPropertyChangedEx("ShowBaseValueLabels", Style.VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region TextFormat
+
+        ///<summary>
+        /// Gets or sets the format specifier for the label text.
+        ///</summary>
+        [Category("Appearance")]
+        [Description("Indicates the format specifier for the label text.")]
+        public string TextFormat
+        {
+            get { return (_TextFormat); }
+
+            set
+            {
+                if (value != _TextFormat)
+                {
+                    _TextFormat = value;
+
+                    OnPropertyChangedEx("TextFormat", Style.VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region IsEmpty
+
+        /// <summary>
+        /// Gets whether the style is logically Empty.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        [Description("Gets whether the style is logically Empty.")]
+        public override bool IsEmpty
+        {
+            get
+            {
+                return ((_ConnectorColor == Color.Empty) &&
+                    (_ConnectorLength == -1) &&
+                    (_ConnectorPattern == LinePattern.NotSet) &&
+                    (_ConnectorThickness == -1) &&
+                    (_DrawConnector == Tbool.NotSet) &&
+                    (_MaximumSize == Size.Empty) &&
+                    (_MinimumSize == Size.Empty) &&
+                    (_Offset == Point.Empty) &&
+                    (_Rotation == float.NaN) &&
+                    (_ShowBaseValueLabels == Tbool.NotSet) &&
+                    (String.IsNullOrEmpty(_TextFormat)) &&
+                    (base.IsEmpty == true));
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ApplyStyle
+
+        /// <summary>
+        /// Applies the style to instance of this style.
+        /// </summary>
+        /// <param name="style">Style to apply.</param>
+        public void ApplyStyle(SeriesLabelVisualStyle style)
+        {
+            if (style != null)
+            {
+                base.ApplyStyle(style);
+
+                if (style.ConnectorColor != Color.Empty)
+                    _ConnectorColor = style.ConnectorColor;
+
+                if (style.ConnectorLength != -1)
+                    _ConnectorLength = style.ConnectorLength;
+
+                if (style.ConnectorPattern != LinePattern.NotSet)
+                    _ConnectorPattern = style.ConnectorPattern;
+
+                if (style.ConnectorThickness != -1)
+                    _ConnectorThickness = style.ConnectorThickness;
+
+                if (style.DrawConnector != Tbool.NotSet)
+                    _DrawConnector = style.DrawConnector;
+
+                if (style.MaximumSize != Size.Empty)
+                    _MaximumSize = style.MaximumSize;
+
+                if (style.MinimumSize != Size.Empty)
+                    _MinimumSize = style.MinimumSize;
+
+                if (style.Offset != Point.Empty)
+                    _Offset = style.Offset;
+
+                if (style.Rotation == float.NaN)
+                    _Rotation = style.Rotation;
+
+                if (style.ShowBaseValueLabels == Tbool.NotSet)
+                    _ShowBaseValueLabels = style.ShowBaseValueLabels;
+
+                if (String.IsNullOrEmpty(style.TextFormat) == false)
+                    _TextFormat = style.TextFormat;
+            }
+        }
+
+        #endregion
+
+        #region Copy
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public new SeriesLabelVisualStyle Copy()
+        {
+            SeriesLabelVisualStyle style = new SeriesLabelVisualStyle();
+
+            CopyTo(style);
+
+            return (style);
+        }
+
+        #endregion
+
+        #region CopyTo
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public void CopyTo(SeriesLabelVisualStyle style)
+        {
+            base.CopyTo(style);
+
+            style.ConnectorColor = _ConnectorColor;
+            style.ConnectorLength = _ConnectorLength;
+            style.ConnectorPattern = _ConnectorPattern;
+            style.ConnectorThickness = _ConnectorThickness;
+            style.DrawConnector = _DrawConnector;
+            style.MaximumSize = _MaximumSize;
+            style.MinimumSize = _MinimumSize;
+            style.Offset = _Offset;
+            style.Rotation = _Rotation;
+            style.ShowBaseValueLabels = _ShowBaseValueLabels;
+            style.TextFormat = _TextFormat;
+        }
+
+        #endregion
+
+        #region GetSerialData
+
+        internal override SerialElementCollection GetSerialData(string serialName)
+        {
+            SerialElementCollection sec = new SerialElementCollection();
+
+            if (serialName != null)
+            {
+                if (serialName.Equals("") == true)
+                    serialName = "SeriesLabelVisualStyle";
+
+                sec.AddStartElement(serialName);
+            }
+
+            sec.AddValue("ConnectorColor", ConnectorColor, Color.Empty);
+            sec.AddValue("ConnectorLength", ConnectorLength, -1);
+            sec.AddValue("ConnectorPattern", ConnectorPattern, LinePattern.NotSet);
+            sec.AddValue("ConnectorThickness", ConnectorThickness, -1);
+            sec.AddValue("DrawConnector", DrawConnector, Tbool.NotSet);
+
+            sec.AddValue("MaximumSize", MaximumSize, Size.Empty);
+            sec.AddValue("MinimumSize", MinimumSize, Size.Empty);
+
+            sec.AddValue("Offset", Offset, Point.Empty);
+            sec.AddValue("Rotation", Rotation, float.NaN);
+
+            sec.AddValue("ShowBaseValueLabels", ShowBaseValueLabels, Tbool.NotSet);
+            sec.AddValue("TextFormat", TextFormat, null);
+
+            sec.AddElement(base.GetSerialData(null));
+
+            if (serialName != null)
+                sec.AddEndElement(serialName);
+
+            return (sec);
+        }
+
+        #endregion
+
+        #region PutSerialData
+
+        #region ProcessValue
+
+        internal override void ProcessValue(SerialElement se)
+        {
+            switch (se.Name)
+            {
+                case "ConnectorColor":
+                    ConnectorColor = se.GetValueColor();
+                    break;
+
+                case "ConnectorLength":
+                    ConnectorLength = int.Parse(se.StringValue);
+                    break;
+
+                case "ConnectorPattern":
+                    ConnectorPattern = (LinePattern)se.GetValueEnum(typeof(LinePattern));
+                    break;
+
+                case "ConnectorThickness":
+                    ConnectorThickness = int.Parse(se.StringValue);
+                    break;
+
+                case "DrawConnector":
+                    DrawConnector = (Tbool)se.GetValueEnum(typeof(Tbool));
+                    break;
+
+                case "MaximumSize":
+                    MaximumSize = se.GetValueSize();
+                    break;
+
+                case "MinimumSize":
+                    MinimumSize = se.GetValueSize();
+                    break;
+
+                case "Offset":
+                    Offset = se.GetValuePoint();
+                    break;
+
+                case "Rotation":
+                    Rotation = float.Parse(se.StringValue);
+                    break;
+
+                case "ShowBaseValueLabels":
+                    ShowBaseValueLabels = (Tbool)se.GetValueEnum(typeof(Tbool));
+                    break;
+
+                case "TextFormat":
+                    TextFormat = se.StringValue;
+                    break;
+
+                default:
+                    base.ProcessValue(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/SliceCenterLineVisualStyle.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/SliceCenterLineVisualStyle.cs
new file mode 100644
index 00000000..6d7f3ef7
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/SliceCenterLineVisualStyle.cs	
@@ -0,0 +1,226 @@
+using System.ComponentModel;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Charts.Style
+{
+    /// <summary>
+    /// Represents the visual style of a Legend element.
+    /// </summary>
+    [TypeConverter(typeof(VisualStylesConverter))]
+    public class SliceCenterLineVisualStyle : ChartLineVisualStyle
+    {
+        #region Private variables
+
+        private int _InnerExtent;
+        private int _OuterExtent;
+
+        #endregion
+
+        #region Public properties
+
+        #region InnerExtent
+
+        /// <summary>
+        /// Gets or sets the distance (in pixels) to which the center line
+        /// is extended prior to the slice inner radius.
+        /// </summary>
+        [Description("Indicates the distance (in pixels) to which the center line is extended prior to the slice inner radius.")]
+        [DefaultValue(0)]
+        public int InnerExtent
+        {
+            get { return (_InnerExtent); }
+
+            set
+            {
+                if (_InnerExtent != value)
+                {
+                    _InnerExtent = value;
+
+                    OnPropertyChangedEx("InnerExtent", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region OuterExtent
+
+        /// <summary>
+        /// Gets or sets the distance (in pixels) to which the center line
+        /// is extended past to the slice Outer radius.
+        /// </summary>
+        [Description("Indicates the distance (in pixels) to which the center line is extended past the slice Outer radius.")]
+        [DefaultValue(0)]
+        public int OuterExtent
+        {
+            get { return (_OuterExtent); }
+
+            set
+            {
+                if (_OuterExtent != value)
+                {
+                    _OuterExtent = value;
+
+                    OnPropertyChangedEx("OuterExtent", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region IsEmpty
+
+        /// <summary>
+        /// Gets whether the style is logically Empty.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        [Description("Gets whether the style is logically Empty.")]
+        public override bool IsEmpty
+        {
+            get
+            {
+                return ((_InnerExtent == 0) &&
+                    (_OuterExtent == 0) &&
+                    (base.IsEmpty == true));
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ApplyStyle
+
+        /// <summary>
+        /// Applies the style to the instance of this style.
+        /// </summary>
+        /// <param name="style">Style to apply.</param>
+        public void ApplyStyle(SliceCenterLineVisualStyle style)
+        {
+            if (style != null)
+            {
+                base.ApplyStyle(style);
+
+                if (style.InnerExtent != 0)
+                    InnerExtent = style.InnerExtent;
+
+                if (style.OuterExtent != 0)
+                    OuterExtent = style.OuterExtent;
+            }
+        }
+
+        #endregion
+
+        #region ApplyDefaults
+
+        public override void ApplyDefaults()
+        {
+            base.ApplyDefaults();
+        }
+
+        #endregion
+
+        #region Copy
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public new SliceCenterLineVisualStyle Copy()
+        {
+            SliceCenterLineVisualStyle style = new SliceCenterLineVisualStyle();
+
+            CopyTo(style);
+
+            return (style);
+        }
+
+        #endregion
+
+        #region CopyTo
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public void CopyTo(SliceCenterLineVisualStyle style)
+        {
+            base.CopyTo(style);
+
+            style.InnerExtent = _InnerExtent;
+            style.OuterExtent = _OuterExtent;
+        }
+
+        #endregion
+
+        #region GetSerialData
+
+        internal override SerialElementCollection GetSerialData(string serialName)
+        {
+            SerialElementCollection sec = new SerialElementCollection();
+
+            if (serialName != null)
+            {
+                if (serialName.Equals("") == true)
+                    serialName = "SliceCenterLineVisualStyle";
+
+                sec.AddStartElement(serialName);
+            }
+
+            sec.AddValue("InnerExtent", InnerExtent, 0);
+            sec.AddValue("OuterExtent", OuterExtent, 0);
+
+            sec.AddElement(base.GetSerialData(null));
+
+            if (serialName != null)
+                sec.AddEndElement(serialName);
+
+            return (sec);
+        }
+
+        #endregion
+
+        #region PutSerialData
+
+        #region ProcessValue
+
+        internal override void ProcessValue(SerialElement se)
+        {
+            switch (se.Name)
+            {
+                case "InnerExtent":
+                    InnerExtent = int.Parse(se.StringValue);
+                    break;
+
+                case "OuterExtent":
+                    OuterExtent = int.Parse(se.StringValue);
+                    break;
+
+                default:
+                    base.ProcessValue(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region ProcessCollection
+
+        internal override void ProcessCollection(SerialElement se)
+        {
+            SerialElementCollection sec = se.Sec;
+
+            switch (se.Name)
+            {
+                default:
+                    base.ProcessCollection(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/SliceLabelVisualStyle.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/SliceLabelVisualStyle.cs
new file mode 100644
index 00000000..1dd6147a
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/SliceLabelVisualStyle.cs	
@@ -0,0 +1,1954 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Drawing.Drawing2D;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Charts.Style
+{
+    /// <summary>
+    /// Represents the visual style of a series Slice.
+    /// </summary>
+    [TypeConverter(typeof(VisualStylesConverter))]
+    public class SliceLabelVisualStyle : BaseVisualStyle
+    {
+        #region Private variables
+
+        private Tbool _AllowWrap = Tbool.NotSet;
+        private SliceLabelAlignment _Alignment = SliceLabelAlignment.NotSet;
+
+        private Background _Background;
+        private Color _TextColor = Color.Empty;
+        private Font _Font;
+
+        private int _MaxLineCount = -1;
+
+        #endregion
+
+        #region Public properties
+
+        #region Alignment
+
+        /// <summary>
+        /// Gets or sets the alignment of the label.
+        /// </summary>
+        [DefaultValue(SliceLabelAlignment.NotSet), Category("Layout")]
+        [Description("Indicates the alignment of the label.")]
+        public SliceLabelAlignment Alignment
+        {
+            get { return (_Alignment); }
+
+            set
+            {
+                if (value != _Alignment)
+                {
+                    _Alignment = value;
+
+                    OnPropertyChangedEx("Alignment", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region AllowWrap
+
+        /// <summary>
+        /// Gets or sets whether text wrapping is permitted
+        /// </summary>
+        [DefaultValue(Tbool.NotSet), Category("Appearance")]
+        [Description("Indicates whether text wrapping is permitted.")]
+        public Tbool AllowWrap
+        {
+            get { return (_AllowWrap); }
+
+            set
+            {
+                if (value != _AllowWrap)
+                {
+                    _AllowWrap = value;
+
+                    OnPropertyChangedEx("AllowWrap", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region Background
+
+        /// <summary>
+        /// Gets or sets the style background.
+        /// </summary>
+        [Description("Indicates the style background")]
+        public Background Background
+        {
+            get
+            {
+                if (_Background == null)
+                {
+                    _Background = Background.Empty;
+
+                    UpdateChangeHandler(null, _Background);
+                }
+
+                return (_Background);
+            }
+
+            set
+            {
+                if (_Background != value)
+                {
+                    UpdateChangeHandler(_Background, value);
+
+                    _Background = value;
+
+                    OnPropertyChangedEx("Background", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeBackground()
+        {
+            return (_Background != null && _Background.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetBackground()
+        {
+            Background = null;
+        }
+
+        #endregion
+
+        #region Font
+
+        /// <summary>
+        /// Gets or sets the style Font
+        /// </summary>
+        [DefaultValue(null)]
+        [Description("Indicates the style Font")]
+        public Font Font
+        {
+            get { return (_Font); }
+
+            set
+            {
+                if (_Font != value)
+                {
+                    _Font = value;
+
+                    OnPropertyChangedEx("Font", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region MaxLineCount
+
+        /// <summary>
+        /// Gets or sets the maximum number of lines for label text.
+        /// </summary>
+        [DefaultValue(-1), Category("Appearance")]
+        [Description("Indicates the maximum number of lines for label text.")]
+        public int MaxLineCount
+        {
+            get { return (_MaxLineCount); }
+
+            set
+            {
+                if (value != _MaxLineCount)
+                {
+                    _MaxLineCount = value;
+
+                    OnPropertyChangedEx("MaxLineCount", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region TextColor
+
+        /// <summary>
+        /// Gets or sets the Text color.
+        /// </summary>
+        [Description("Indicates the Text color")]
+        public Color TextColor
+        {
+            get { return (_TextColor); }
+
+            set
+            {
+                if (_TextColor != value)
+                {
+                    _TextColor = value;
+
+                    OnPropertyChangedEx("TextColor", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeTextColor()
+        {
+            return (_TextColor.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetTextColor()
+        {
+            TextColor = Color.Empty;
+        }
+
+        #endregion
+
+        #region IsEmpty
+
+        /// <summary>
+        /// Gets whether the style is logically Empty.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        [Description("Gets whether the style is logically Empty.")]
+        public override bool IsEmpty
+        {
+            get
+            {
+                return ((_Alignment == SliceLabelAlignment.NotSet) &&
+                    (_AllowWrap == Tbool.NotSet) &&
+                    (_Background == null || _Background.IsEmpty == true) &&
+                    (_Font == null) &&
+                    (_MaxLineCount < 0) &&
+                    (_TextColor.IsEmpty == true) &&
+                    (base.IsEmpty == true));
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetStringFormatFlags
+
+        internal void GetStringFormatFlags(StringFormat sf, bool flip)
+        {
+            if (_AllowWrap == Tbool.False || _MaxLineCount == 1)
+                sf.FormatFlags |= StringFormatFlags.NoWrap;
+
+            sf.Trimming = StringTrimming.EllipsisCharacter;
+
+            switch (Alignment)
+            {
+                case SliceLabelAlignment.OuterLeft:
+                    sf.LineAlignment = (flip ? StringAlignment.Far : StringAlignment.Near);
+                    break;
+
+                case SliceLabelAlignment.NotSet:
+                case SliceLabelAlignment.OuterCenter:
+                    sf.LineAlignment = (flip ? StringAlignment.Far : StringAlignment.Near);
+                    sf.Alignment = StringAlignment.Center;
+                    break;
+
+                case SliceLabelAlignment.OuterRight:
+                    sf.LineAlignment = (flip ? StringAlignment.Far : StringAlignment.Near);
+                    sf.Alignment = StringAlignment.Far;
+                    break;
+
+                case SliceLabelAlignment.MiddleLeft:
+                    sf.LineAlignment = StringAlignment.Center;
+                    sf.Alignment = StringAlignment.Near;
+                    break;
+
+                case SliceLabelAlignment.MiddleCenter:
+                    sf.LineAlignment = StringAlignment.Center;
+                    sf.Alignment = StringAlignment.Center;
+                    break;
+
+                case SliceLabelAlignment.MiddleRight:
+                    sf.LineAlignment = StringAlignment.Center;
+                    sf.Alignment = StringAlignment.Far;
+                    break;
+
+                case SliceLabelAlignment.InnerLeft:
+                    sf.LineAlignment = (flip ? StringAlignment.Near : StringAlignment.Far);
+                    sf.Alignment = StringAlignment.Near;
+                    break;
+
+                case SliceLabelAlignment.InnerCenter:
+                    sf.LineAlignment = (flip ? StringAlignment.Near : StringAlignment.Far);
+                    sf.Alignment = StringAlignment.Center;
+                    break;
+
+                case SliceLabelAlignment.InnerRight:
+                    sf.LineAlignment = (flip ? StringAlignment.Near : StringAlignment.Far);
+                    sf.Alignment = StringAlignment.Far;
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region ApplyStyle
+
+        /// <summary>
+        /// Applies the style to instance of this style.
+        /// </summary>
+        /// <param name="style">Style to apply.</param>
+        public void ApplyStyle(SliceLabelVisualStyle style)
+        {
+            if (style != null)
+            {
+                base.ApplyStyle(style);
+
+                if (style.Alignment != SliceLabelAlignment.NotSet)
+                    Alignment = style._Alignment;
+
+                if (style.AllowWrap != Tbool.NotSet)
+                    AllowWrap = style._AllowWrap;
+
+                if (style._Background != null && style._Background.IsEmpty == false)
+                    Background = style._Background.Copy();
+
+                if (style.Font != null)
+                    Font = style.Font;
+
+                if (style.MaxLineCount >= 0)
+                    MaxLineCount = style._MaxLineCount;
+
+                if (style._TextColor.IsEmpty == false)
+                    TextColor = style._TextColor;
+            }
+        }
+
+        #endregion
+
+        #region ApplyDefaults
+
+        public override void ApplyDefaults()
+        {
+            if (_Alignment == SliceLabelAlignment.NotSet)
+                _Alignment = SliceLabelAlignment.OuterCenter;
+
+            if (_AllowWrap == Tbool.NotSet)
+                _AllowWrap = Tbool.True;
+
+            if (_Font == null)
+                _Font = SystemFonts.DefaultFont;
+
+            if (_TextColor.IsEmpty == true)
+                _TextColor = Color.Black;
+
+            base.ApplyDefaults();
+        }
+
+        #endregion
+
+        #region Copy
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public new SliceLabelVisualStyle Copy()
+        {
+            SliceLabelVisualStyle style = new SliceLabelVisualStyle();
+
+            CopyTo(style);
+
+            return (style);
+        }
+
+        #endregion
+
+        #region CopyTo
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public void CopyTo(SliceLabelVisualStyle style)
+        {
+            base.CopyTo(style);
+
+            style.Alignment = _Alignment;
+            style.AllowWrap = _AllowWrap;
+
+            style.Background = (_Background != null) ? _Background.Copy() : null;
+            style.Font = (_Font != null) ? (Font)_Font.Clone() : null;
+
+            style.MaxLineCount = _MaxLineCount;
+
+            style.TextColor = _TextColor;
+        }
+
+        #endregion
+
+        #region GetSerialData
+
+        internal override SerialElementCollection GetSerialData(string serialName)
+        {
+            SerialElementCollection sec = new SerialElementCollection();
+
+            if (serialName != null)
+            {
+                if (serialName.Equals("") == true)
+                    serialName = "SliceLabelVisualStyle";
+
+                sec.AddStartElement(serialName);
+            }
+
+            sec.AddValue("Alignment", _Alignment, SliceLabelAlignment.NotSet);
+            sec.AddValue("AllowWrap", _AllowWrap, Tbool.NotSet);
+
+            if (_Background != null && _Background.IsEmpty == false)
+                sec.AddElement(_Background.GetSerialData("Background"));
+
+            if (_Font != null)
+                sec.AddValue("Font", XmlSerializableFont.ConvertToString(Font));
+
+            sec.AddValue("MaxLineCount", _MaxLineCount, 0);
+            sec.AddValue("TextColor", _TextColor, Color.Empty);
+
+            sec.AddElement(base.GetSerialData(null));
+
+            if (serialName != null)
+                sec.AddEndElement(serialName);
+
+            return (sec);
+        }
+
+        #endregion
+
+        #region PutSerialData
+
+        #region ProcessValue
+
+        internal override void ProcessValue(SerialElement se)
+        {
+            switch (se.Name)
+            {
+                case "AllowWrap":
+                    AllowWrap = (Tbool)se.GetValueEnum(typeof(Tbool));
+                    break;
+
+                case "Alignment":
+                    Alignment = (SliceLabelAlignment)se.GetValueEnum(typeof(SliceLabelAlignment));
+                    break;
+
+                case "Font":
+                    Font = XmlSerializableFont.ConvertFromString(se.StringValue);
+                    break;
+
+                case "MaxLineCount":
+                    MaxLineCount = int.Parse(se.StringValue);
+                    break;
+
+                case "TextColor":
+                    TextColor = se.GetValueColor();
+                    break;
+
+                default:
+                    base.ProcessValue(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region ProcessCollection
+
+        internal override void ProcessCollection(SerialElement se)
+        {
+            SerialElementCollection sec = se.Sec;
+
+            switch (se.Name)
+            {
+                case "Background":
+                    sec.PutSerialData(Background);
+                    break;
+
+                default:
+                    base.ProcessCollection(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IDisposable
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        public override void Dispose()
+        {
+            Background = null;
+
+            base.Dispose();
+        }
+
+        #endregion
+    }
+
+    /// <summary>
+    /// Represents the visual style of a series Slice.
+    /// </summary>
+    [TypeConverter(typeof(VisualStylesConverter))]
+    public class SliceInnerLabelVisualStyle : SliceLabelVisualStyle
+    {
+        #region Private variables
+
+        private Tbool _AutoRotate = Tbool.NotSet;
+        private Tbool _AutoOrientLabel = Tbool.NotSet;
+
+        private double _AngleMargin = double.NaN;
+        private double _OuterRadiusOffset = double.NaN;
+        private double _InnerRadiusOffset = double.NaN;
+
+        private double _CustomAngleOffset = double.NaN;
+        private double _CustomRadiusOffset = double.NaN;
+        private double _CustomFontAngle = double.NaN;
+
+        private double _CustomWidth = double.NaN;
+        private double _CustomHeight = double.NaN;
+
+        private OuterRadiusOffsetBase _OuterRadiusOffsetBase = OuterRadiusOffsetBase.NotSet;
+
+        #endregion
+
+        #region Public properties
+
+        #region AngleMargin
+
+        /// <summary>
+        /// Gets or sets the margin (in degrees) to inset the label from 
+        /// both the start and ending slice angles.
+        /// </summary>
+        [DefaultValue(double.NaN), Category("Appearance")]
+        [Description("Indicates the margin (in degrees) to inset the label from both the start and ending slice angles.")]
+        [Editor("DevComponents.Charts.Design.AngleMarginRangeValueEditor, DevComponents.Charts.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(UITypeEditor))]
+        public double AngleMargin
+        {
+            get { return (_AngleMargin); }
+
+            set
+            {
+                if (value != _AngleMargin)
+                {
+                    _AngleMargin = value;
+
+                    OnPropertyChangedEx("AngleMargin", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region AutoOrientLabel
+
+        /// <summary>
+        /// Gets or sets whether the label will be auto oriented away from being upside down.
+        /// </summary>
+        [DefaultValue(Tbool.NotSet), Category("Behavior")]
+        [Description("Indicates whether the label will be auto oriented away from being upside down.")]
+        public Tbool AutoOrientLabel
+        {
+            get { return (_AutoOrientLabel); }
+
+            set
+            {
+                if (_AutoOrientLabel != value)
+                {
+                    _AutoOrientLabel = value;
+
+                    OnPropertyChangedEx("AutoOrientLabel", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region AutoRotate
+
+        /// <summary>
+        /// Gets or sets whether the label is auto rotated to match
+        /// the angle of the slice (only valid for 'Custom' orientation mode).
+        /// </summary>
+        [DefaultValue(Tbool.NotSet), Category("Display")]
+        [Description("Indicates whether the label is auto rotated to match the angle of the slice (only valid for 'Custom' orientation mode).")]
+        public Tbool AutoRotate
+        {
+            get { return (_AutoRotate); }
+
+            set
+            {
+                if (value != _AutoRotate)
+                {
+                    _AutoRotate = value;
+
+                    OnPropertyChangedEx("AutoRotate", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region CustomAngleOffset
+
+        /// <summary>
+        /// Gets or sets the display angle offset for the label when
+        /// the label orientation is set to 'Custom'. The label can be
+        /// offset toward the end angle (positive offset) or toward
+        /// the start angle (negative offset). The offset is either a
+        /// percentage (if value is between 0 and 1) or pixel amount (if value > 1).
+        /// </summary>
+        [DefaultValue(double.NaN), Category("Display")]
+        [Description("Indicates the display angle offset for the label when the label orientation is set to 'Custom'. The label can be offset toward the end angle (positive offset) or toward the start angle (negative offset). The offset is either a percentage (if value is between 0 and 1) or pixel amount (if value > 1).")]
+        [Editor("DevComponents.Charts.Design.AngleOffsetRangeValueEditor, DevComponents.Charts.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(UITypeEditor))]
+        public double CustomAngleOffset
+        {
+            get { return (_CustomAngleOffset); }
+
+            set
+            {
+                if (value != _CustomAngleOffset)
+                {
+                    _CustomAngleOffset = value;
+
+                    OnPropertyChangedEx("CustomAngleOffset", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region CustomFontAngle
+
+        /// <summary>
+        /// Gets or sets the custom font angle when the label orientation
+        /// is set to 'Custom'. The FontAngle is the additional number of
+        /// degrees the label will be rotated.
+        /// </summary>
+        [DefaultValue(double.NaN), Category("Appearance")]
+        [Description("Indicates the custom font angle when the label orientation is set to 'Custom'. The FontAngle is the additional number of degrees the label will be rotated.")]
+        [Editor("DevComponents.Charts.Design.AngleRangeValueEditor, DevComponents.Charts.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(UITypeEditor))]
+        public double CustomFontAngle
+        {
+            get { return (_CustomFontAngle); }
+
+            set
+            {
+                if (value != _CustomFontAngle)
+                {
+                    _CustomFontAngle = value;
+
+                    OnPropertyChangedEx("CustomFontAngle", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region CustomHeight
+
+        /// <summary>
+        /// Gets or sets the height of the bounding rectangle for the label when
+        /// the label orientation is set to 'Custom'. The height can be a percentage
+        /// of the slice height (if the value is between 0 and 1), or an absolute
+        /// pixel amount (if the value is > 1).
+        /// </summary>
+        [DefaultValue(double.NaN), Category("Display")]
+        [Description("Indicates the height of the bounding rectangle for the label when the label orientation is set to 'Custom'. The height can be a percentage of the slice height (if the value is between 0 and 1), or an absolute pixel amount (if the value is > 1).")]
+        [Editor("DevComponents.Charts.Design.RadiusRangeValueEditor, DevComponents.Charts.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(UITypeEditor))]
+        public double CustomHeight
+        {
+            get { return (_CustomHeight); }
+
+            set
+            {
+                if (value != _CustomHeight)
+                {
+                    _CustomHeight = value;
+
+                    OnPropertyChangedEx("CustomHeight", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region CustomRadiusOffset
+
+        /// <summary>
+        /// Gets or sets the display radius offset for the label when the label orientation
+        /// is set to 'Custom. The label can be offset toward the outer radius
+        /// (positive offset) or toward the inner radius (negative offset). The
+        /// offset can either be a percentage (if value is between 0 and 1) or pixel
+        /// amount (if value > 1).
+        /// </summary>
+        [DefaultValue(double.NaN), Category("Display")]
+        [Description("Indicates the display radius offset for the label when the label orientation is set to 'Custom. The label can be offset toward the outer radius (positive offset) or toward the inner radius (negative offset). The offset can either be a percentage (if value is between 0 and 1) or pixel amount (if value > 1)..")]
+        [Editor("DevComponents.Charts.Design.RadiusRangeValueEditor, DevComponents.Charts.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(UITypeEditor))]
+        public double CustomRadiusOffset
+        {
+            get { return (_CustomRadiusOffset); }
+
+            set
+            {
+                if (value != _CustomRadiusOffset)
+                {
+                    _CustomRadiusOffset = value;
+
+                    OnPropertyChangedEx("CustomRadiusOffset", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region CustomWidth
+
+        /// <summary>
+        /// Gets or sets the custom width for the bounding rectangle of the
+        /// label when the label orientation is set to 'Custom'. The width can
+        /// be a percentage of the slice width at the set RadiusOffset
+        /// (if the value is between 0 and 1), or an absolute pixel amount (if the
+        /// value is > 1).
+        /// </summary>
+        [DefaultValue(double.NaN), Category("Display")]
+        [Description("Indicates the custom width for the bounding rectangle of the label when the label orientation is set to 'Custom'. The width can be a percentage of the slice width at the set RadiusOffset (if the value is between 0 and 1), or an absolute pixel amount (if the value is > 1).")]
+        [Editor("DevComponents.Charts.Design.RadiusRangeValueEditor, DevComponents.Charts.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(UITypeEditor))]
+        public double CustomWidth
+        {
+            get { return (_CustomWidth); }
+
+            set
+            {
+                if (value != _CustomWidth)
+                {
+                    _CustomWidth = value;
+
+                    OnPropertyChangedEx("CustomWidth", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region InnerRadiusOffset
+
+        /// <summary>
+        /// Gets or sets the offset of the inner edge of the rectangular label area from the
+        /// outer slice radius, as measured by a percentage of the slice radius 
+        /// (if less than 1), or absolute pixel amount (if greater than 1).
+        /// </summary>
+        [DefaultValue(double.NaN), Category("Display")]
+        [Description("Indicates the offset of the inner edge of the rectangular label area from the outer slice radius, as measured by a percentage of the slice radius (if less than 1), or absolute pixel amount (if greater than 1).")]
+        [Editor("DevComponents.Charts.Design.RadiusRangeValueEditor, DevComponents.Charts.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(UITypeEditor))]
+        public double InnerRadiusOffset
+        {
+            get { return (_InnerRadiusOffset); }
+
+            set
+            {
+                if (value != _InnerRadiusOffset)
+                {
+                    _InnerRadiusOffset = value;
+
+                    OnPropertyChangedEx("InnerRadiusOffset", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region OuterRadiusOffset
+
+        /// <summary>
+        /// Gets or sets the offset of the outer edge of the rectangular label area from the
+        /// outer slice radius, as measured by a percentage of the slice radius 
+        /// (if less than 1), or absolute pixel amount (if greater than 1).
+        /// </summary>
+        [DefaultValue(double.NaN), Category("Display")]
+        [Description("Indicates the offset of the outer edge of the rectangular label area from the outer slice radius, as measured by a percentage of the slice radius (if less than 1), or absolute pixel amount (if greater than 1).")]
+        [Editor("DevComponents.Charts.Design.RadiusRangeValueEditor, DevComponents.Charts.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(UITypeEditor))]
+        public double OuterRadiusOffset
+        {
+            get { return (_OuterRadiusOffset); }
+
+            set
+            {
+                if (value != _OuterRadiusOffset)
+                {
+                    _OuterRadiusOffset = value;
+
+                    OnPropertyChangedEx("OuterRadiusOffset", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region OuterRadiusOffsetBase
+
+        /// <summary>
+        /// Gets or sets whether the label's OuterRadiusOffset is relative
+        /// to the slice OuterRadius or the slice ExtentRadius. 
+        /// </summary>
+        [Category("Behavior"), DefaultValue(OuterRadiusOffsetBase.NotSet)]
+        [Description("Indicates whether the label's OuterRadiusOffset is relative to the slice OuterRadius or the slice ExtentRadius.")]
+        public OuterRadiusOffsetBase OuterRadiusOffsetBase
+        {
+            get { return (_OuterRadiusOffsetBase); }
+
+            set
+            {
+                if (_OuterRadiusOffsetBase != value)
+                {
+                    _OuterRadiusOffsetBase = value;
+
+                    OnPropertyChangedEx("OuterRadiusOffsetBase", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region IsEmpty
+
+        /// <summary>
+        /// Gets whether the style is logically Empty.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        [Description("Gets whether the style is logically Empty.")]
+        public override bool IsEmpty
+        {
+            get
+            {
+                return ((double.IsNaN(_AngleMargin) == true) &&
+                    (_AutoOrientLabel == Tbool.NotSet) &&
+                    (_AutoRotate == Tbool.NotSet) &&
+                    (double.IsNaN(_CustomAngleOffset) == true) &&
+                    (double.IsNaN(_CustomHeight) == true) &&
+                    (double.IsNaN(_CustomRadiusOffset) == true) &&
+                    (double.IsNaN(_CustomWidth) == true) &&
+                    (double.IsNaN(_CustomFontAngle) == true) &&
+                    (double.IsNaN(_InnerRadiusOffset) == true) &&
+                    (double.IsNaN(_OuterRadiusOffset) == true) &&
+                    (_OuterRadiusOffsetBase == OuterRadiusOffsetBase.NotSet) &&
+                    (base.IsEmpty == true));
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ApplyStyle
+
+        /// <summary>
+        /// Applies the style to instance of this style.
+        /// </summary>
+        /// <param name="style">Style to apply.</param>
+        public void ApplyStyle(SliceInnerLabelVisualStyle style)
+        {
+            if (style != null)
+            {
+                base.ApplyStyle(style);
+
+                if (double.IsNaN(style._AngleMargin) == false)
+                    AngleMargin = style._AngleMargin;
+
+                if (style.AutoOrientLabel != Tbool.NotSet)
+                    AutoOrientLabel = style._AutoOrientLabel;
+
+                if (style._AutoRotate != Tbool.NotSet)
+                    AutoRotate = style._AutoRotate;
+
+                if (double.IsNaN(style._CustomAngleOffset) == false)
+                    CustomAngleOffset = style._CustomAngleOffset;
+
+                if (double.IsNaN(style._CustomHeight) == false)
+                    CustomHeight = style._CustomHeight;
+
+                if (double.IsNaN(style._CustomRadiusOffset) == false)
+                    CustomRadiusOffset = style._CustomRadiusOffset;
+
+                if (double.IsNaN(style._CustomWidth) == false)
+                    CustomWidth = style._CustomWidth;
+
+                if (double.IsNaN(style._CustomFontAngle) == false)
+                    CustomFontAngle = style._CustomFontAngle;
+
+                if (double.IsNaN(style._InnerRadiusOffset) == false)
+                    InnerRadiusOffset = style._InnerRadiusOffset;
+
+                if (double.IsNaN(style._OuterRadiusOffset) == false)
+                    OuterRadiusOffset = style._OuterRadiusOffset;
+
+                if (style.OuterRadiusOffsetBase != OuterRadiusOffsetBase.NotSet)
+                    OuterRadiusOffsetBase = style._OuterRadiusOffsetBase;
+            }
+        }
+
+        #endregion
+
+        #region ApplyDefaults
+
+        public override void ApplyDefaults()
+        {
+            if (_AutoRotate == Tbool.NotSet)
+                _AutoRotate = Tbool.False;
+
+            if (double.IsNaN(_CustomFontAngle) == true)
+                _CustomFontAngle = 0;
+
+            if (double.IsNaN(_AngleMargin) == true)
+                _AngleMargin = 1;
+
+            if (_AutoOrientLabel == Tbool.NotSet)
+                _AutoOrientLabel = Tbool.True;
+
+            if (double.IsNaN(_InnerRadiusOffset) == true)
+                _InnerRadiusOffset = .1;
+
+            if (double.IsNaN(_OuterRadiusOffset) == true)
+                _OuterRadiusOffset = -.05;
+
+            if (_OuterRadiusOffsetBase == OuterRadiusOffsetBase.NotSet)
+                _OuterRadiusOffsetBase = OuterRadiusOffsetBase.ExtentRadius;
+
+            base.ApplyDefaults();
+        }
+
+        #endregion
+
+        #region Copy
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public new SliceInnerLabelVisualStyle Copy()
+        {
+            SliceInnerLabelVisualStyle style = new SliceInnerLabelVisualStyle();
+
+            CopyTo(style);
+
+            return (style);
+        }
+
+        #endregion
+
+        #region CopyTo
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public void CopyTo(SliceInnerLabelVisualStyle style)
+        {
+            base.CopyTo(style);
+
+            style.AngleMargin = _AngleMargin;
+            style.AutoOrientLabel = _AutoOrientLabel;
+            style.AutoRotate = _AutoRotate;
+
+            style.CustomAngleOffset = _CustomAngleOffset;
+            style.CustomHeight = _CustomHeight;
+            style.CustomRadiusOffset = _CustomRadiusOffset;
+            style.CustomWidth = _CustomWidth;
+
+            style.CustomFontAngle = _CustomFontAngle;
+
+            style.InnerRadiusOffset = _InnerRadiusOffset;
+            style.OuterRadiusOffset = _OuterRadiusOffset;
+            style.OuterRadiusOffsetBase = _OuterRadiusOffsetBase;
+        }
+
+        #endregion
+
+        #region GetSerialData
+
+        internal override SerialElementCollection GetSerialData(string serialName)
+        {
+            SerialElementCollection sec = new SerialElementCollection();
+
+            if (serialName != null)
+            {
+                if (serialName.Equals("") == true)
+                    serialName = "SliceInnerLabelVisualStyle";
+
+                sec.AddStartElement(serialName);
+            }
+
+            sec.AddValue("AngleMargin", AngleMargin, double.NaN);
+            sec.AddValue("AutoOrientLabel", AutoOrientLabel, Tbool.NotSet);
+            sec.AddValue("AutoRotate", AutoRotate, Tbool.NotSet);
+
+            sec.AddValue("CustomAngleOffset", CustomAngleOffset, double.NaN);
+            sec.AddValue("CustomHeight", CustomHeight, double.NaN);
+            sec.AddValue("CustomRadiusOffset", CustomRadiusOffset, double.NaN);
+            sec.AddValue("CustomWidth", CustomWidth, double.NaN);
+
+            sec.AddValue("CustomFontAngle", CustomFontAngle, double.NaN);
+
+            sec.AddValue("InnerRadiusOffset", InnerRadiusOffset, double.NaN);
+            sec.AddValue("OuterRadiusOffset", OuterRadiusOffset, double.NaN);
+            sec.AddValue("OuterRadiusOffsetBase", OuterRadiusOffsetBase, OuterRadiusOffsetBase.NotSet);
+
+            sec.AddElement(base.GetSerialData(null));
+
+            if (serialName != null)
+                sec.AddEndElement(serialName);
+
+            return (sec);
+        }
+
+        #endregion
+
+        #region PutSerialData
+
+        #region ProcessValue
+
+        internal override void ProcessValue(SerialElement se)
+        {
+            switch (se.Name)
+            {
+                case "AngleMargin":
+                    AngleMargin = double.Parse(se.StringValue);
+                    break;
+
+                case "AutoOrientLabel":
+                    AutoOrientLabel = (Tbool)se.GetValueEnum(typeof(Tbool));
+                    break;
+
+                case "AutoRotate":
+                    AutoRotate = (Tbool)se.GetValueEnum(typeof(Tbool));
+                    break;
+
+                case "CustomAngleOffset":
+                    CustomAngleOffset = double.Parse(se.StringValue);
+                    break;
+
+                case "CustomFontAngle":
+                    CustomFontAngle = double.Parse(se.StringValue);
+                    break;
+
+                case "CustomHeight":
+                    CustomHeight = double.Parse(se.StringValue);
+                    break;
+
+                case "CustomRadiusOffset":
+                    CustomRadiusOffset = double.Parse(se.StringValue);
+                    break;
+
+                case "CustomWidth":
+                    CustomWidth = double.Parse(se.StringValue);
+                    break;
+
+                case "InnerRadiusOffset":
+                    InnerRadiusOffset = double.Parse(se.StringValue);
+                    break;
+
+                case "OuterRadiusOffset":
+                    OuterRadiusOffset = double.Parse(se.StringValue);
+                    break;
+
+                case "OuterRadiusOffsetBase":
+                    OuterRadiusOffsetBase = (OuterRadiusOffsetBase)se.GetValueEnum(typeof(OuterRadiusOffsetBase));
+                    break;
+
+                default:
+                    base.ProcessValue(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region ProcessCollection
+
+        internal override void ProcessCollection(SerialElement se)
+        {
+            SerialElementCollection sec = se.Sec;
+
+            switch (se.Name)
+            {
+                default:
+                    base.ProcessCollection(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IDisposable
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        public override void Dispose()
+        {
+            base.Dispose();
+        }
+
+        #endregion
+    }
+
+    /// <summary>
+    /// Represents the visual style of a series Slice.
+    /// </summary>
+    [TypeConverter(typeof(VisualStylesConverter))]
+    public class SliceOuterLabelVisualStyle : SliceLabelVisualStyle
+    {
+        #region Private variables
+
+        private double _MaxLabelHeight = double.NaN;
+        private double _MaxLabelWidth = double.NaN;
+        private double _MinLabelHeight = double.NaN;
+        private double _MinLabelWidth = double.NaN;
+
+        private int _LabelMargin = -1;
+
+        private Tbool _DrawConnector = Tbool.NotSet;
+
+        private Color _ConnectorColor = Color.Empty;
+        private LinePattern _ConnectorPattern = LinePattern.NotSet;
+
+        private int _ConnectorLength = -1;
+        private int _ConnectorTickLength = -1;
+        private int _ConnectorThickness = -1;
+
+        private ChartLineVisualStyle _Border;
+        private Padding _Padding;
+
+        #endregion
+
+        #region Public properties
+
+        #region Border
+
+        /// <summary>
+        /// Gets or sets the visual style for the label border.
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates the visual styles for the label border.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ChartLineVisualStyle Border
+        {
+            get
+            {
+                if (_Border == null)
+                {
+                    _Border = new ChartLineVisualStyle();
+
+                    UpdateChangeHandler(null, _Border);
+                }
+
+                return (_Border);
+            }
+
+            set
+            {
+                if (_Border != value)
+                {
+                    ChartLineVisualStyle oldValue = _Border;
+
+                    _Border = value;
+
+                    OnStyleChanged("Border", oldValue, value);
+
+                    if (oldValue != null)
+                        oldValue.Dispose();
+                }
+            }
+        }
+
+        #endregion
+
+        #region ConnectorColor
+
+        /// <summary>
+        /// Gets or sets the style connector color.
+        /// </summary>
+        [Description("Indicates the style connector color"), Category("Appearance")]
+        public Color ConnectorColor
+        {
+            get { return (_ConnectorColor); }
+
+            set
+            {
+                if (value != _ConnectorColor)
+                {
+                    _ConnectorColor = value;
+
+                    OnPropertyChangedEx("ConnectorColor", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeConnectorColor()
+        {
+            return (_ConnectorColor.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetConnectorColor()
+        {
+            _ConnectorColor = Color.Empty;
+        }
+
+        #endregion
+
+        #region ConnectorLength
+
+        /// <summary>
+        /// Gets or sets the length of the line connecting the slice
+        /// and the slice label.
+        /// </summary>
+        [DefaultValue(-1), Category("Appearance")]
+        [Description("Indicates the length of the line connecting the slice and the slice label.")]
+        public int ConnectorLength
+        {
+            get { return (_ConnectorLength); }
+
+            set
+            {
+                if (value != _ConnectorLength)
+                {
+                    if (value < 0)
+                        throw new InvalidPropertyValueException("value cannot be negative.");
+
+                    _ConnectorLength = value;
+
+                    OnPropertyChangedEx("ConnectorLength", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ConnectorPattern
+
+        /// <summary>
+        /// Gets or sets the style border pattern (Solid, Dash, ...)
+        /// </summary>
+        [Description("Indicates the style border pattern (Solid, Dash, ...)")]
+        [DefaultValue(LinePattern.NotSet), Category("Appearance")]
+        public LinePattern ConnectorPattern
+        {
+            get { return (_ConnectorPattern); }
+
+            set
+            {
+                if (value != _ConnectorPattern)
+                {
+                    _ConnectorPattern = value;
+
+                    OnPropertyChangedEx("ConnectorPattern", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ConnectorThickness
+
+        /// <summary>
+        /// Gets or sets the style connector thickness.
+        /// </summary>
+        [DefaultValue(-1), Category("Appearance")]
+        [Description("Indicates the style connector thickness.")]
+        public int ConnectorThickness
+        {
+            get { return (_ConnectorThickness); }
+
+            set
+            {
+                if (value != _ConnectorThickness)
+                {
+                    _ConnectorThickness = value;
+
+                    OnPropertyChangedEx("ConnectorThickness", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ConnectorTickLength
+
+        /// <summary>
+        /// Gets or sets the length of the 'tick' line connecting the
+        /// label text with the main connector line associated with the pie slice.
+        /// </summary>
+        [DefaultValue(-1), Category("Appearance")]
+        [Description("Indicates the length of the length of the 'tick' line connecting the label text with the main connector line associated with the pie slice.")]
+        public int ConnectorTickLength
+        {
+            get { return (_ConnectorTickLength); }
+
+            set
+            {
+                if (value != _ConnectorTickLength)
+                {
+                    if (value < 0)
+                        throw new InvalidPropertyValueException("value cannot be negative.");
+
+                    _ConnectorTickLength = value;
+
+                    OnPropertyChangedEx("ConnectorTickLength", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region DrawConnector
+
+        ///<summary>
+        /// Gets or sets whether a connecting line is drawn from the slice
+        /// to the outer slice label.
+        ///</summary>
+        [DefaultValue(Tbool.NotSet), Category("Appearance")]
+        [Description("Indicates whether a connecting line is drawn from the slice to the outer slice label.")]
+        public Tbool DrawConnector
+        {
+            get { return (_DrawConnector); }
+
+            set
+            {
+                if (value != _DrawConnector)
+                {
+                    _DrawConnector = value;
+
+                    OnPropertyChangedEx("DrawConnector", Style.VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region LabelMargin
+
+        /// <summary>
+        /// Gets or sets the pixel margin between the outer label
+        /// and the chart outer radius, as well as between the label and
+        /// any adjacent slice labels.
+        /// </summary>
+        [DefaultValue(-1), Category("Appearance")]
+        [Description("Indicates the pixel margin between the outer label and the chart outer radius, as well as between the label and any adjacent slice labels.")]
+        public int LabelMargin
+        {
+            get { return (_LabelMargin); }
+
+            set
+            {
+                if (value != _LabelMargin)
+                {
+                    _LabelMargin = value;
+
+                    OnPropertyChangedEx("LabelMargin", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region MaxLabelHeight
+
+        /// <summary>
+        /// Gets or sets the maximum vertical size of the label, as
+        /// measured by a percentage of the chart height (if less than 1),
+        /// or absolute pixel amount (if greater than 1).
+        /// </summary>
+        [DefaultValue(double.NaN), Category("Appearance")]
+        [Description("Indicates the maximum vertical size of the label, as measured by a percentage of the chart height (if less than 1), or absolute pixel amount (if greater than 1).")]
+        public double MaxLabelHeight
+        {
+            get { return (_MaxLabelHeight); }
+
+            set
+            {
+                if (value != _MaxLabelHeight)
+                {
+                    if (value < 0)
+                        throw new ArgumentOutOfRangeException("value", "Must be greater than zero.");
+
+                    _MaxLabelHeight = value;
+
+                    OnPropertyChangedEx("MaxLabelHeight", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region MaxLabelWidth
+
+        /// <summary>
+        /// Gets or sets the maximum horizontal size of the label, as
+        /// measured by a percentage of the chart width (if less than 1),
+        /// or absolute pixel amount (if greater than 1).
+        /// </summary>
+        [DefaultValue(double.NaN), Category("Appearance")]
+        [Description("Indicates the maximum horizontal size of the label, as measured by a percentage of the chart width (if less than 1), or absolute pixel amount (if greater than 1).")]
+        public double MaxLabelWidth
+        {
+            get { return (_MaxLabelWidth); }
+
+            set
+            {
+                if (value != _MaxLabelWidth)
+                {
+                    if (value < 0)
+                        throw new ArgumentOutOfRangeException("value", "Must be greater than zero.");
+
+                    _MaxLabelWidth = value;
+
+                    OnPropertyChangedEx("MaxLabelWidth", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region MinLabelHeight
+
+        /// <summary>
+        /// Gets or sets the Minimum vertical size of the label, as
+        /// measured by a percentage of the chart height (if less than 1),
+        /// or absolute pixel amount (if greater than 1).
+        /// </summary>
+        [DefaultValue(double.NaN), Category("Appearance")]
+        [Description("Indicates the Minimum vertical size of the label, as measured by a percentage of the chart height (if less than 1), or absolute pixel amount (if greater than 1).")]
+        public double MinLabelHeight
+        {
+            get { return (_MinLabelHeight); }
+
+            set
+            {
+                if (value != _MinLabelHeight)
+                {
+                    if (value < 0)
+                        throw new ArgumentOutOfRangeException("value", "Must be greater than zero.");
+
+                    _MinLabelHeight = value;
+
+                    OnPropertyChangedEx("MinLabelHeight", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region MinLabelWidth
+
+        /// <summary>
+        /// Gets or sets the minimum horizontal size of the label, as
+        /// measured by a percentage of the chart width (if less than 1),
+        /// or absolute pixel amount (if greater than 1).
+        /// </summary>
+        [DefaultValue(double.NaN), Category("Appearance")]
+        [Description("Indicates the minimum horizontal size of the label, as measured by a percentage of the chart width (if less than 1), or absolute pixel amount (if greater than 1).")]
+        public double MinLabelWidth
+        {
+            get { return (_MinLabelWidth); }
+
+            set
+            {
+                if (value != _MinLabelWidth)
+                {
+                    if (value < 0)
+                        throw new ArgumentOutOfRangeException("value", "Must be greater than zero.");
+
+                    _MinLabelWidth = value;
+
+                    OnPropertyChangedEx("MinLabelWidth", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region Padding
+
+        /// <summary>
+        /// Gets or sets spacing between the content and edges of the element.
+        /// </summary>
+        [Description("Indicates the spacing between the content and edges of the element")]
+        public Padding Padding
+        {
+            get
+            {
+                if (_Padding == null)
+                {
+                    _Padding = Padding.Empty;
+
+                    UpdateChangeHandler(null, _Padding);
+                }
+
+                return (_Padding);
+            }
+
+            set
+            {
+                if (_Padding != value)
+                {
+                    UpdateChangeHandler(_Padding, value);
+
+                    _Padding = value;
+
+                    OnPropertyChangedEx("Padding", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializePadding()
+        {
+            return (_Padding != null && _Padding.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetPadding()
+        {
+            Padding = null;
+        }
+
+        #endregion
+
+        #region IsEmpty
+
+        /// <summary>
+        /// Gets whether the style is logically Empty.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        [Description("Gets whether the style is logically Empty.")]
+        public override bool IsEmpty
+        {
+            get
+            {
+                return ((_Border == null || _Border.IsEmpty == true) &&
+                    (_ConnectorColor == Color.Empty) &&
+                    (_ConnectorLength == -1) &&
+                    (_ConnectorPattern == LinePattern.NotSet) &&
+                    (_ConnectorThickness == -1) &&
+                    (_ConnectorTickLength == -1) &&
+                    (_DrawConnector == Tbool.NotSet) &&
+                    (_LabelMargin == -1) &&
+                    (_Padding == null || _Padding.IsEmpty == true) &&
+                    (double.IsNaN(_MaxLabelHeight) == true) &&
+                    (double.IsNaN(_MaxLabelWidth) == true) &&
+                    (double.IsNaN(_MinLabelHeight) == true) &&
+                    (double.IsNaN(_MinLabelWidth) == true) &&
+                    (base.IsEmpty == true));
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ApplyStyle
+
+        /// <summary>
+        /// Applies the style to instance of this style.
+        /// </summary>
+        /// <param name="style">Style to apply.</param>
+        public void ApplyStyle(SliceOuterLabelVisualStyle style)
+        {
+            if (style != null)
+            {
+                base.ApplyStyle(style);
+
+                if (style._Border != null && style._Border.IsEmpty == false)
+                    Border = style._Border.Copy();
+
+                if (style.ConnectorColor != Color.Empty)
+                    _ConnectorColor = style.ConnectorColor;
+
+                if (style.ConnectorLength != -1)
+                    _ConnectorLength = style.ConnectorLength;
+
+                if (style.ConnectorPattern != LinePattern.NotSet)
+                    _ConnectorPattern = style.ConnectorPattern;
+
+                if (style.ConnectorThickness != -1)
+                    _ConnectorThickness = style.ConnectorThickness;
+
+                if (style.ConnectorTickLength != -1)
+                    _ConnectorTickLength = style.ConnectorTickLength;
+
+                if (style.DrawConnector != Tbool.NotSet)
+                    _DrawConnector = style.DrawConnector;
+
+                if (style.LabelMargin != -1)
+                    _LabelMargin = style.LabelMargin;
+
+                if (double.IsNaN(style._MaxLabelHeight) == false)
+                    _MaxLabelHeight = style._MaxLabelHeight;
+
+                if (double.IsNaN(style._MaxLabelWidth) == false)
+                    _MaxLabelWidth = style._MaxLabelWidth;
+
+                if (double.IsNaN(style._MinLabelHeight) == false)
+                    _MinLabelHeight = style._MinLabelHeight;
+
+                if (double.IsNaN(style._MinLabelWidth) == false)
+                    _MinLabelWidth = style._MinLabelWidth;
+
+                if (style._Padding != null && style._Padding.IsEmpty == false)
+                    Padding = style._Padding.Copy();
+            }
+        }
+
+        #endregion
+
+        #region ApplyDefaults
+
+        public override void ApplyDefaults()
+        {
+            if (_ConnectorColor == Color.Empty)
+                _ConnectorColor = Color.Gray;
+
+            if (_ConnectorLength == -1)
+                _ConnectorLength = 15;
+
+            if (_ConnectorPattern == LinePattern.NotSet)
+                _ConnectorPattern = LinePattern.Solid;
+
+            if (_ConnectorThickness == -1)
+                _ConnectorThickness = 1;
+
+            if (_ConnectorTickLength == -1)
+                _ConnectorTickLength = 10;
+
+            if (_DrawConnector == Tbool.NotSet)
+                _DrawConnector = Tbool.True;
+
+            if (double.IsNaN(_MaxLabelHeight) == true)
+                _MaxLabelHeight = .25;
+
+            if (double.IsNaN(_MaxLabelWidth) == true)
+                _MaxLabelWidth = .25;
+
+            if (_LabelMargin == -1)
+                _LabelMargin = 10;
+
+            base.ApplyDefaults();
+        }
+
+        #endregion
+
+        #region Copy
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public new SliceOuterLabelVisualStyle Copy()
+        {
+            SliceOuterLabelVisualStyle style = new SliceOuterLabelVisualStyle();
+
+            CopyTo(style);
+
+            return (style);
+        }
+
+        #endregion
+
+        #region CopyTo
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public void CopyTo(SliceOuterLabelVisualStyle style)
+        {
+            base.CopyTo(style);
+
+            style.Border = (_Border != null) ? _Border.Copy() : null;
+
+            style.ConnectorColor = _ConnectorColor;
+            style.ConnectorLength = _ConnectorLength;
+            style.ConnectorPattern = _ConnectorPattern;
+            style.ConnectorThickness = _ConnectorThickness;
+            style.ConnectorTickLength = _ConnectorTickLength;
+            style.DrawConnector = _DrawConnector;
+
+            style.LabelMargin = _LabelMargin;
+            style.Padding = (_Padding == null) ? null : _Padding.Copy();
+
+            style.MaxLabelHeight = _MaxLabelHeight;
+            style.MaxLabelWidth = _MaxLabelWidth;
+            style.MinLabelHeight = _MinLabelHeight;
+            style.MinLabelWidth = _MinLabelWidth;
+        }
+
+        #endregion
+
+        #region GetSerialData
+
+        internal override SerialElementCollection GetSerialData(string serialName)
+        {
+            SerialElementCollection sec = new SerialElementCollection();
+
+            if (serialName != null)
+            {
+                if (serialName.Equals("") == true)
+                    serialName = "ChartSliceVisualStyle";
+
+                sec.AddStartElement(serialName);
+            }
+
+            if (_Border != null && _Border.IsEmpty == false)
+                sec.AddElement(_Border.GetSerialData("Border"));
+
+            sec.AddValue("ConnectorColor", ConnectorColor, Color.Empty);
+            sec.AddValue("ConnectorLength", ConnectorLength, -1);
+            sec.AddValue("ConnectorPattern", ConnectorPattern, LinePattern.NotSet);
+            sec.AddValue("ConnectorThickness", ConnectorThickness, -1);
+            sec.AddValue("ConnectorTickLength", ConnectorTickLength, -1);
+
+            sec.AddValue("DrawConnector", DrawConnector, Tbool.NotSet);
+            sec.AddValue("LabelMargin", LabelMargin, -1);
+
+            if (_Padding != null && _Padding.IsEmpty == false)
+                sec.AddElement(_Padding.GetSerialData("Padding"));
+
+            sec.AddValue("MaxLabelHeight", MaxLabelHeight, double.NaN);
+            sec.AddValue("MaxLabelWidth", MaxLabelWidth, double.NaN);
+            sec.AddValue("MinLabelHeight", MinLabelHeight, double.NaN);
+            sec.AddValue("MinLabelWidth", MinLabelWidth, double.NaN);
+
+            sec.AddElement(base.GetSerialData(null));
+
+            if (serialName != null)
+                sec.AddEndElement(serialName);
+
+            return (sec);
+        }
+
+        #endregion
+
+        #region PutSerialData
+
+        #region ProcessValue
+
+        internal override void ProcessValue(SerialElement se)
+        {
+            switch (se.Name)
+            {
+                case "ConnectorColor":
+                    ConnectorColor = se.GetValueColor();
+                    break;
+
+                case "ConnectorLength":
+                    ConnectorLength = int.Parse(se.StringValue);
+                    break;
+
+                case "ConnectorPattern":
+                    ConnectorPattern = (LinePattern)se.GetValueEnum(typeof(LinePattern));
+                    break;
+
+                case "ConnectorThickness":
+                    ConnectorThickness = int.Parse(se.StringValue);
+                    break;
+
+                case "ConnectorTickLength":
+                    ConnectorTickLength = int.Parse(se.StringValue);
+                    break;
+
+                case "DrawConnector":
+                    DrawConnector = (Tbool)se.GetValueEnum(typeof(Tbool));
+                    break;
+
+                case "MaxLabelHeight":
+                    MaxLabelHeight = double.Parse(se.StringValue);
+                    break;
+
+                case "MaxLabelWidth":
+                    MaxLabelWidth = double.Parse(se.StringValue);
+                    break;
+
+                case "MinLabelHeight":
+                    MinLabelHeight = double.Parse(se.StringValue);
+                    break;
+
+                case "MinLabelWidth":
+                    MinLabelWidth = double.Parse(se.StringValue);
+                    break;
+
+                default:
+                    base.ProcessValue(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region ProcessCollection
+
+        internal override void ProcessCollection(SerialElement se)
+        {
+            SerialElementCollection sec = se.Sec;
+
+            switch (se.Name)
+            {
+                case "Border":
+                    sec.PutSerialData(Border);
+                    break;
+
+                case "Padding":
+                    se.Sec.PutSerialData(Padding);
+                    break;
+
+                default:
+                    base.ProcessCollection(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IDisposable
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        public override void Dispose()
+        {
+            Border = null;
+            Padding = null;
+
+            base.Dispose();
+        }
+
+        #endregion
+    }
+
+    #region OuterRadiusOffsetBase
+
+    /// <summary>
+    /// Defines what the label's OuterRadiusOffset is relative
+    /// to (slice OuterRadius or slice ExtentRadius).
+    /// </summary>
+    public enum OuterRadiusOffsetBase
+    {
+        /// <summary>
+        /// NotSet
+        /// </summary>
+        NotSet = -1,
+
+        /// <summary>
+        /// OuterRadius
+        /// </summary>
+        OuterRadius,
+
+        /// <summary>
+        /// ExtentRadius (default)
+        /// </summary>
+        ExtentRadius,
+    }
+
+#endregion
+
+    #region SliceLabelAlignment
+
+    /// <summary>
+    /// SliceLabelAlignment
+    /// </summary>
+    public enum SliceLabelAlignment
+    {
+        ///<summary>
+        /// NotSet
+        ///</summary>
+        NotSet = -1,
+
+        ///<summary>
+        /// OuterLeft
+        ///</summary>
+        OuterLeft,
+
+        ///<summary>
+        /// OuterCenter
+        ///</summary>
+        OuterCenter,
+
+        ///<summary>
+        /// OuterRight
+        ///</summary>
+        OuterRight,
+
+        ///<summary>
+        /// MiddleLeft
+        ///</summary>
+        MiddleLeft,
+
+        ///<summary>
+        /// MiddleCenter
+        ///</summary>
+        MiddleCenter,
+
+        /// <summary>
+        /// MiddleRight
+        /// </summary>
+        MiddleRight,
+
+        /// <summary>
+        /// InnerLeft
+        /// </summary>
+        InnerLeft,
+
+        /// <summary>
+        /// InnerCenter
+        /// </summary>
+        InnerCenter,
+
+        /// <summary>
+        /// InnerRight
+        /// </summary>
+        InnerRight,
+    }
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/Thickness.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/Thickness.cs
new file mode 100644
index 00000000..99d984ba
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/Thickness.cs	
@@ -0,0 +1,619 @@
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.Drawing;
+using System.Globalization;
+
+namespace DevComponents.DotNetBar.Charts.Style
+{
+    /// <summary>
+    /// Defines Thickness class.
+    /// </summary>
+    [TypeConverter(typeof(ThicknessTypeConverter))]
+    public class Thickness : IEquatable<Thickness>, IProcessSerialElement, INotifyPropertyChanged
+    {
+        #region Static data
+
+        /// <summary>
+        /// Returns Empty instance of Thickness.
+        /// </summary>
+        public static Thickness Empty
+        {
+            get { return (new Thickness(0)); }
+        }
+
+        #endregion
+
+        #region Private variables
+
+        private int _Bottom;
+        private int _Left;
+        private int _Right;
+        private int _Top;
+
+        #endregion
+
+        #region Constructors
+
+        /// <summary>
+        /// Creates new instance of the object.
+        /// </summary>
+        /// <param name="left">Left thickness in pixels.</param>
+        /// <param name="top">Top thickness in pixels.</param>
+        /// <param name="right">Right thickness in pixels.</param>
+        /// <param name="bottom">Bottom thickness in pixels.</param>
+        public Thickness(int left, int top, int right, int bottom)
+        {
+            _Left = left;
+            _Top = top;
+            _Right = right;
+            _Bottom = bottom;
+        }
+
+        /// <summary>
+        /// Creates new instance of the object.
+        /// </summary>
+        /// <param name="all">Specifies uniform Thickness.</param>
+        public Thickness(int all)
+            : this(all, all, all, all)
+        {
+        }
+
+        /// <summary>
+        /// Creates new instance of the object.
+        /// </summary>
+        public Thickness()
+        {
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region All
+
+        /// <summary>
+        /// Gets or sets the thickness of all sides
+        /// </summary>
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public int All
+        {
+            set { _Top = _Left = _Bottom = _Right = value; }
+        }
+
+        #endregion
+
+        #region Bottom
+
+        /// <summary>
+        /// Gets or sets the Bottom thickness in pixels.
+        /// </summary>
+        [DefaultValue(0)]
+        [Description("Indicates the Bottom thickness in pixels.")]
+        public int Bottom
+        {
+            get { return (_Bottom); }
+
+            set
+            {
+                if (_Bottom != value)
+                {
+                    _Bottom = value;
+
+                    OnPropertyChanged(new VisualPropertyChangedEventArgs("Bottom"));
+                }
+            }
+        }
+
+        #endregion
+
+        #region Horizontal
+
+        /// <summary>
+        /// Gets horizontal thickness (Left + Right)
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public int Horizontal
+        {
+            get { return (_Left + _Right); }
+        }
+
+        #endregion
+
+        #region Left
+
+        /// <summary>
+        /// Gets or sets the left thickness in pixels
+        /// </summary>
+        [DefaultValue(0)]
+        [Description("Indicates the left thickness in pixels")]
+        public int Left
+        {
+            get { return (_Left); }
+
+            set
+            {
+                if (_Left != value)
+                {
+                    _Left = value;
+
+                    OnPropertyChanged(new VisualPropertyChangedEventArgs("Left"));
+                }
+            }
+        }
+
+        #endregion
+
+        #region Right
+
+        /// <summary>
+        /// Gets or sets the Right thickness in pixels
+        /// </summary>
+        [DefaultValue(0)]
+        [Description("Indicates the Right thickness in pixels")]
+        public int Right
+        {
+            get { return (_Right); }
+
+            set
+            {
+                if (_Right != value)
+                {
+                    _Right = value;
+
+                    OnPropertyChanged(new VisualPropertyChangedEventArgs("Right"));
+                }
+            }
+        }
+
+        #endregion
+
+        #region Top
+
+        /// <summary>
+        /// Gets or sets the Top thickness in pixels
+        /// </summary>
+        [DefaultValue(0)]
+        [Description("Indicates the Top thickness in pixels")]
+        public int Top
+        {
+            get { return (_Top); }
+
+            set
+            {
+                if (_Top != value)
+                {
+                    _Top = value;
+
+                    OnPropertyChanged(new VisualPropertyChangedEventArgs("Top"));
+                }
+            }
+        }
+
+        #endregion
+
+        #region Vertical
+
+        /// <summary>
+        /// Gets vertical thickness (Top + Bottom)
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public int Vertical
+        {
+            get { return (_Top + _Bottom); }
+        }
+
+        #endregion
+
+        #region IsEmpty
+
+        /// <summary>
+        /// Gets whether the item is empty.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsEmpty
+        {
+            get
+            {
+                return (_Left == 0 && _Right == 0 &&
+                        _Top == 0 && _Bottom == 0);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region IsUniform
+
+        internal bool IsUniform
+        {
+            get
+            {
+                return (_Left == _Top &&
+                        _Left == _Right && _Left == _Bottom);
+            }
+        }
+
+        #endregion
+
+        #region IsZero
+
+        internal bool IsZero
+        {
+            get
+            {
+                return (_Left == 0 && _Top == 0 &&
+                        _Right == 0 && _Bottom == 0);
+            }
+        }
+
+        #endregion
+
+        #region Size
+
+        internal Size Size
+        {
+            get { return (new Size(_Left + _Right, _Top + _Bottom)); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Equals
+
+        /// <summary>
+        /// Gets whether two instances are equal.
+        /// </summary>
+        /// <param name="obj">Instance to compare to.</param>
+        /// <returns>true if equal otherwise false.</returns>
+        public override bool Equals(object obj)
+        {
+            if (obj is Thickness)
+                return (this == (Thickness)obj);
+
+            return (false);
+        }
+
+        /// <summary>
+        /// Gets whether two instances are equal.
+        /// </summary>
+        /// <param name="thickness">Instance to compare to</param>
+        /// <returns>true if equal otherwise false</returns>
+        public bool Equals(Thickness thickness)
+        {
+            return (this == thickness);
+        }
+
+        #endregion
+
+        #region GetHashCode
+
+        /// <summary>
+        /// Returns hash-code.
+        /// </summary>
+        /// <returns>hash-code</returns>
+        public override int GetHashCode()
+        {
+            return (((_Left.GetHashCode() ^ _Top.GetHashCode()) ^
+                     _Right.GetHashCode()) ^ _Bottom.GetHashCode());
+        }
+
+        #endregion
+
+        #region Operators
+
+        #region "==" operator
+
+        /// <summary>
+        /// Implements == operator.
+        /// </summary>
+        /// <param name="t1">Object 1</param>
+        /// <param name="t2">Object 2</param>
+        /// <returns>true if equals</returns>
+        public static bool operator ==(Thickness t1, Thickness t2)
+        {
+            if (ReferenceEquals(t1, t2))
+                return (true);
+
+            if (((object)t1 == null) || ((object)t2 == null))
+                return (false);
+
+            return (t1._Left == t2._Left && t1._Right == t2._Right &&
+                    t1._Top == t2._Top && t1._Bottom == t2._Bottom);
+        }
+
+        #endregion
+
+        #region "!=" operator
+
+        /// <summary>
+        /// Implements != operator
+        /// </summary>
+        /// <param name="t1">Object 1</param>
+        /// <param name="t2">Object 2</param>
+        /// <returns>true if different</returns>
+        public static bool operator !=(Thickness t1, Thickness t2)
+        {
+            return ((t1 == t2) == false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Copy
+
+        /// <summary>
+        /// Creates an exact copy of the Thickness.
+        /// </summary>
+        /// <returns>Copy of the Thickness.</returns>
+        public Thickness Copy()
+        {
+            Thickness copy = new Thickness(_Left, _Top, _Right, _Bottom);
+
+            return (copy);
+        }
+
+        #endregion
+
+        #region GetSerialData
+
+        internal virtual SerialElementCollection GetSerialData(string name)
+        {
+            SerialElementCollection sec = new SerialElementCollection();
+
+            sec.AddStartElement(name);
+
+            if (IsUniform == true)
+            {
+                sec.AddValue("All", Left, 0);
+            }
+            else
+            {
+                sec.AddValue("Left", Left, 0);
+                sec.AddValue("Top", Top, 0);
+                sec.AddValue("Right", Right, 0);
+                sec.AddValue("Bottom", Bottom, 0);
+            }
+
+            sec.AddEndElement(name);
+
+            return (sec);
+        }
+
+        #endregion
+
+        #region PutSerialData
+
+        #region ProcessValue
+
+        void IProcessSerialElement.ProcessValue(SerialElement se)
+        {
+            ProcessValue(se);
+        }
+
+        internal virtual void ProcessValue(SerialElement se)
+        {
+            switch (se.Name)
+            {
+                case "All":
+                    All = int.Parse(se.StringValue);
+                    break;
+
+                case "Left":
+                    Left = int.Parse(se.StringValue);
+                    break;
+
+                case "Top":
+                    Top = int.Parse(se.StringValue);
+                    break;
+
+                case "Right":
+                    Right = int.Parse(se.StringValue);
+                    break;
+
+                case "Bottom":
+                    Bottom = int.Parse(se.StringValue);
+                    break;
+
+                default:
+                    throw new Exception("Unknown Serial Value (" + se.Name + ")");
+            }
+        }
+
+        #endregion
+
+        #region ProcessCollection
+
+        void IProcessSerialElement.ProcessCollection(SerialElement se)
+        {
+            throw new Exception("Unknown Serial Collection (" + se.Name + ")");
+        }
+
+        #endregion
+
+        #endregion
+
+        #region INotifyPropertyChanged Members
+
+        /// <summary>
+        /// Occurs when property value has changed.
+        /// </summary>
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        /// <summary>
+        /// Raises the PropertyChanged event.
+        /// </summary>
+        /// <param name="e">Event arguments</param>
+        void OnPropertyChanged(VisualPropertyChangedEventArgs e)
+        {
+            PropertyChangedEventHandler eh = PropertyChanged;
+
+            if (eh != null)
+                eh(this, e);
+        }
+
+        #endregion
+    }
+
+    #region ThicknessTypeConverter
+
+    ///<summary>
+    /// ThicknessTypeConverter
+    ///</summary>
+    public class ThicknessTypeConverter : ExpandableObjectConverter
+    {
+        #region CanConvertTo
+
+        /// <summary>
+        /// CanConvertTo
+        /// </summary>
+        /// <param name="context"></param>
+        /// <param name="destinationType"></param>
+        /// <returns></returns>
+        public override bool CanConvertTo(
+            ITypeDescriptorContext context, Type destinationType)
+        {
+            if (destinationType == typeof(string))
+                return (true);
+
+            return (base.CanConvertTo(context, destinationType));
+        }
+
+        #endregion
+
+        #region ConvertTo
+
+        /// <summary>
+        /// ConvertTo
+        /// </summary>
+        /// <param name="context"></param>
+        /// <param name="culture"></param>
+        /// <param name="value"></param>
+        /// <param name="destinationType"></param>
+        /// <returns></returns>
+        public override object ConvertTo(
+            ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+        {
+            if (destinationType == typeof(string))
+            {
+                Thickness t = value as Thickness;
+
+                if (t != null)
+                {
+                    if (t.IsUniform == true)
+                        return (t.Left.ToString());
+
+                    return (String.Format("{0:d}, {1:d}, {2:d}, {3:d}",
+                        t.Bottom, t.Left, t.Right, t.Top));
+                }
+            }
+
+            return (base.ConvertTo(context, culture, value, destinationType));
+        }
+
+        #endregion
+
+        #region CanConvertFrom
+
+        /// <summary>
+        /// CanConvertFrom
+        /// </summary>
+        /// <param name="context"></param>
+        /// <param name="sourceType"></param>
+        /// <returns></returns>
+        public override bool CanConvertFrom(
+            ITypeDescriptorContext context, Type sourceType)
+        {
+            if (sourceType == typeof(string))
+                return (true);
+
+            return (base.CanConvertFrom(context, sourceType));
+        }
+
+        #endregion
+
+        #region ConvertFrom
+
+        /// <summary>
+        /// ConvertFrom
+        /// </summary>
+        /// <param name="context"></param>
+        /// <param name="culture"></param>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public override object ConvertFrom(
+            ITypeDescriptorContext context, CultureInfo culture, object value)
+        {
+            if (value is string)
+            {
+                string[] values = ((string)value).Split(',');
+
+                if (values.Length != 1 && values.Length != 4)
+                    throw new ArgumentException("Invalid value to convert.");
+
+                try
+                {
+                    int[] v = new int[values.Length];
+
+                    for (int i = 0; i < values.Length; i++)
+                        v[i] = int.Parse(values[i]);
+
+                    Thickness t = (values.Length == 1)
+                        ? new Thickness(v[0])
+                        : new Thickness(v[1], v[3], v[2], v[0]);
+
+                    return (t);
+                }
+                catch (Exception)
+                {
+                    throw new ArgumentException("Invalid value to convert.");
+                }
+            }
+
+            return base.ConvertFrom(context, culture, value);
+        }
+
+        #endregion
+
+        #region GetCreateInstanceSupported
+
+        /// <summary>
+        /// GetCreateInstanceSupported
+        /// </summary>
+        /// <param name="context"></param>
+        /// <returns></returns>
+        public override bool GetCreateInstanceSupported(ITypeDescriptorContext context)
+        {
+            return (true);
+        }
+
+        #endregion
+
+        #region CreateInstance
+
+        /// <summary>
+        /// CreateInstance
+        /// </summary>
+        /// <param name="context"></param>
+        /// <param name="propertyValues"></param>
+        /// <returns></returns>
+        public override object CreateInstance(
+            ITypeDescriptorContext context, IDictionary propertyValues)
+        {
+            return (new Thickness((int)propertyValues["Left"], (int)propertyValues["Top"],
+                (int)propertyValues["Right"], (int)propertyValues["Bottom"]));
+        }
+
+        #endregion
+    }
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/TickmarkLableVisualStyle.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/TickmarkLableVisualStyle.cs
new file mode 100644
index 00000000..764d3156
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/TickmarkLableVisualStyle.cs	
@@ -0,0 +1,444 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Charts.Style
+{
+    /// <summary>
+    /// Represents the visual style of a Tickmark Label element.
+    /// </summary>
+    [TypeConverter(typeof(VisualStylesConverter))]
+    public class TickmarkLabelVisualStyle : BaseVisualStyle
+    {
+        #region Private variables
+
+        private Font _Font;
+
+        private Tbool _AllowWrap = Tbool.NotSet;
+
+        private Color _TextColor = Color.Empty;
+        private Alignment _TextAlignment = Alignment.NotSet;
+        private string _TextFormat;
+
+        private int _MaxLineCount = -1;
+        private int _MaxWidth = -1;
+
+        #endregion
+
+        #region Public properties
+
+        #region AllowWrap
+
+        /// <summary>
+        /// Gets or sets whether text wrapping is permitted
+        /// </summary>
+        [DefaultValue(Tbool.NotSet), Category("Appearance")]
+        [Description("Indicates whether text wrapping is permitted.")]
+        public Tbool AllowWrap
+        {
+            get { return (_AllowWrap); }
+
+            set
+            {
+                if (_AllowWrap != value)
+                {
+                    _AllowWrap = value;
+
+                    OnPropertyChangedEx("AllowWrap", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region Font
+
+        /// <summary>
+        /// Gets or sets the style Font
+        /// </summary>
+        [DefaultValue(null)]
+        [Description("Indicates the style Font")]
+        public Font Font
+        {
+            get { return (_Font); }
+
+            set
+            {
+                if (_Font != value)
+                {
+                    _Font = value;
+
+                    OnPropertyChangedEx("Font", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region MaxLineCount
+
+        /// <summary>
+        /// Gets or sets the maximum number of Label Text lines.
+        /// </summary>
+        [DefaultValue(-1), Category("Appearance")]
+        [Description("Indicates the maximum number of Label Text lines.")]
+        public int MaxLineCount
+        {
+            get { return (_MaxLineCount); }
+
+            set
+            {
+                if (value != _MaxLineCount)
+                {
+                    _MaxLineCount = value;
+
+                    OnPropertyChangedEx("MaxLineCount", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region MaxWidth
+
+        /// <summary>
+        /// Gets or sets the maximum width of the lable.
+        /// </summary>
+        [DefaultValue(-1), Category("Appearance")]
+        [Description("Indicates the maximum width of the lable.")]
+        public int MaxWidth
+        {
+            get { return (_MaxWidth); }
+
+            set
+            {
+                if (value != _MaxWidth)
+                {
+                    _MaxWidth = value;
+
+                    OnPropertyChangedEx("MaxWidth", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region TextAlignment
+
+        /// <summary>
+        /// Gets or sets the alignment of the axis Text
+        /// </summary>
+        [DefaultValue(Alignment.NotSet), Category("Appearance")]
+        [Description("Indicates the alignment of the axis Text.")]
+        public Alignment TextAlignment
+        {
+            get { return (_TextAlignment); }
+
+            set
+            {
+                if (_TextAlignment != value)
+                {
+                    _TextAlignment = value;
+
+                    OnPropertyChangedEx("TextAlignment", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region TextColor
+
+        /// <summary>
+        /// Gets or sets the Text color
+        /// </summary>
+        [Description("Indicates the Text color")]
+        public Color TextColor
+        {
+            get { return (_TextColor); }
+
+            set
+            {
+                if (_TextColor != value)
+                {
+                    _TextColor = value;
+
+                    OnPropertyChangedEx("TextColor", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeTextColor()
+        {
+            return (_TextColor.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetTextColor()
+        {
+            TextColor = Color.Empty;
+        }
+
+        #endregion
+
+        #region TextFormat
+
+        /// <summary>
+        /// Gets or sets the Text Format specifier
+        /// </summary>
+        [DefaultValue(null)]
+        [Description("Indicates the Text Format specifier")]
+        public string TextFormat
+        {
+            get { return (_TextFormat); }
+
+            set
+            {
+                if (_TextFormat != value)
+                {
+                    _TextFormat = value;
+
+                    OnPropertyChangedEx("TextFormat", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region IsEmpty
+
+        /// <summary>
+        /// Gets whether the style is logically Empty.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        [Description("Gets whether the style is logically Empty.")]
+        public override bool IsEmpty
+        {
+            get
+            {
+                return ((_AllowWrap == Tbool.NotSet) &&
+                    (_Font == null) &&
+                    (_MaxLineCount < 0) &&
+                    (_MaxWidth < 0) &&
+                    (_TextAlignment == Alignment.NotSet) &&
+                    (_TextColor.IsEmpty == true) &&
+                    (string.IsNullOrEmpty(_TextFormat) == true) &&
+                    (base.IsEmpty == true));
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetTextFormatFlags
+
+        internal eTextFormat GetTextFormatFlags()
+        {
+            eTextFormat tf = eTextFormat.WordEllipsis |
+                eTextFormat.NoPadding | eTextFormat.NoPrefix;
+
+            if (AllowWrap == Tbool.True)
+                tf |= eTextFormat.WordBreak;
+
+            tf |= eTextFormat.HorizontalCenter | eTextFormat.VerticalCenter;
+
+            return (tf);
+        }
+
+        #endregion
+
+        #region GetStringFormatFlags
+
+        internal void GetStringFormatFlags(StringFormat sf)
+        {
+            if (AllowWrap == Tbool.False)
+                sf.FormatFlags |= StringFormatFlags.NoWrap;
+
+            sf.LineAlignment = StringAlignment.Center;
+            sf.Alignment = StringAlignment.Center;
+        }
+
+        #endregion
+
+        #region ApplyStyle
+
+        /// <summary>
+        /// Applies the style to instance of this style.
+        /// </summary>
+        /// <param name="style">Style to apply.</param>
+        public void ApplyStyle(TickmarkLabelVisualStyle style)
+        {
+            if (style != null)
+            {
+                base.ApplyStyle(style);
+
+                if (style.AllowWrap != Tbool.NotSet)
+                    AllowWrap = style.AllowWrap;
+
+                if (style.Font != null)
+                    Font = style.Font;
+
+                if (style.MaxLineCount > 0)
+                    MaxLineCount = style.MaxLineCount;
+
+                if (style.MaxWidth > 0)
+                    MaxWidth = style.MaxWidth;
+
+                if (style.TextAlignment != Alignment.NotSet)
+                    TextAlignment = style.TextAlignment;
+
+                if (style.TextColor.IsEmpty == false)
+                    TextColor = style.TextColor;
+
+                if (string.IsNullOrEmpty(style.TextFormat) == false)
+                    TextFormat = style.TextFormat;
+            }
+        }
+
+        #endregion
+
+        #region Copy
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public new TickmarkLabelVisualStyle Copy()
+        {
+            TickmarkLabelVisualStyle style = new TickmarkLabelVisualStyle();
+
+            CopyTo(style);
+
+            return (style);
+        }
+
+        #endregion
+
+        #region CopyTo
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public void CopyTo(TickmarkLabelVisualStyle style)
+        {
+            base.CopyTo(style);
+
+            style.AllowWrap = _AllowWrap;
+
+            style.Font = (_Font != null) ? (Font)_Font.Clone() : null;
+
+            style.MaxLineCount = _MaxLineCount;
+            style.MaxWidth = _MaxWidth;
+
+            style.TextAlignment = _TextAlignment;
+            style.TextColor = _TextColor;
+            style.TextFormat = _TextFormat;
+        }
+
+        #endregion
+
+        #region GetSerialData
+
+        internal override SerialElementCollection GetSerialData(string serialName)
+        {
+            SerialElementCollection sec = new SerialElementCollection();
+
+            if (serialName != null)
+            {
+                if (serialName.Equals("") == true)
+                    serialName = "TickmarkLabelVisualStyle";
+
+                sec.AddStartElement(serialName);
+            }
+
+            sec.AddValue("AllowWrap", AllowWrap, Tbool.NotSet);
+
+            if (_Font != null)
+                sec.AddValue("Font", XmlSerializableFont.ConvertToString(Font));
+
+            sec.AddValue("MaxLineCount", MaxLineCount, -1);
+            sec.AddValue("MaxWidth", MaxWidth, -1);
+
+            sec.AddValue("TextAlignment", TextAlignment, Alignment.NotSet);
+            sec.AddValue("TextColor", TextColor, Color.Empty);
+            sec.AddValue("TextFormat", TextFormat, null);
+
+            sec.AddElement(base.GetSerialData(null));
+
+            if (serialName != null)
+                sec.AddEndElement(serialName);
+
+            return (sec);
+        }
+
+        #endregion
+
+        #region PutSerialData
+
+        #region ProcessValue
+
+        internal override void ProcessValue(SerialElement se)
+        {
+            switch (se.Name)
+            {
+                case "AllowWrap":
+                    AllowWrap = (Tbool)se.GetValueEnum(typeof(Tbool));
+                    break;
+
+                case "Font":
+                    Font = XmlSerializableFont.ConvertFromString(se.StringValue);
+                    break;
+
+                case "MaxLineCount":
+                    MaxLineCount = int.Parse(se.StringValue);
+                    break;
+
+                case "MaxWidth":
+                    MaxWidth = int.Parse(se.StringValue);
+                    break;
+
+                case "TextAlignment":
+                    TextAlignment = (Alignment)se.GetValueEnum(typeof(Alignment));
+                    break;
+
+                case "TextColor":
+                    TextColor = se.GetValueColor();
+                    break;
+
+                case "TextFormat":
+                    TextFormat = se.StringValue;
+                    break;
+
+                default:
+                    base.ProcessValue(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IDisposable
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        public override void Dispose()
+        {
+            base.Dispose();
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/TrendLineVisualStyle.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/TrendLineVisualStyle.cs
new file mode 100644
index 00000000..b413a813
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/TrendLineVisualStyle.cs	
@@ -0,0 +1,42 @@
+using System.ComponentModel;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Charts.Style
+{
+    /// <summary>
+    /// Represents the visual style of a TrendLine Indicator element.
+    /// </summary>
+    [TypeConverter(typeof(VisualStylesConverter))]
+    public class TrendLineVisualStyle : ChartCapLineVisualStyle
+    {
+        #region Copy
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public new TrendLineVisualStyle Copy()
+        {
+            TrendLineVisualStyle style = new TrendLineVisualStyle();
+
+            CopyTo(style);
+
+            return (style);
+        }
+
+        #endregion
+
+        #region CopyTo
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public void CopyTo(TrendLineVisualStyle style)
+        {
+            base.CopyTo(style);
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/VisualStyle.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/VisualStyle.cs
new file mode 100644
index 00000000..97207aa1
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/VisualStyle.cs	
@@ -0,0 +1,986 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+
+namespace DevComponents.DotNetBar.Charts.Style
+{
+    /// <summary>
+    /// Represents the visual style.
+    /// </summary>
+    [ToolboxItem(false), DesignTimeVisible(false)]
+    [TypeConverter(typeof(ExpandableObjectConverter))]
+    public class VisualStyle : BaseVisualStyle
+    {
+        #region Private variables
+
+        private Background _Background;
+        private BorderColor _BorderColor;
+        private BorderPattern _BorderPattern;
+        private Thickness _BorderThickness;
+
+        private Color _TextColor = Color.Empty;
+
+        private Padding _Margin;
+        private Padding _Padding;
+
+        private Font _Font;
+
+        #endregion
+
+        #region Public properties
+
+        #region Background
+
+        /// <summary>
+        /// Gets or sets the style background.
+        /// </summary>
+        [Description("Indicates the style background")]
+        public Background Background
+        {
+            get
+            {
+                if (_Background == null)
+                {
+                    _Background = Background.Empty;
+
+                    UpdateChangeHandler(null, _Background);
+                }
+
+                return (_Background);
+            }
+
+            set
+            {
+                if (_Background != value)
+                {
+                    UpdateChangeHandler(_Background, value);
+
+                    _Background = value;
+
+                    OnPropertyChangedEx("Background", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeBackground()
+        {
+            return (_Background != null && _Background.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetBackground()
+        {
+            Background = null;
+        }
+
+        #endregion
+
+        #region BorderColor
+
+        /// <summary>
+        /// Gets or sets the style border color.
+        /// </summary>
+        [Description("Indicates the style Border Color")]
+        public BorderColor BorderColor
+        {
+            get
+            {
+                if (_BorderColor == null)
+                {
+                    _BorderColor = BorderColor.Empty;
+
+                    UpdateChangeHandler(null, _BorderColor);
+                }
+
+                return (_BorderColor);
+            }
+
+            set
+            {
+                if (_BorderColor != value)
+                {
+                    UpdateChangeHandler(_BorderColor, value);
+
+                    _BorderColor = value;
+
+                    OnPropertyChangedEx("BorderColor", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeBorderColor()
+        {
+            return (_BorderColor != null && _BorderColor.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetBorderColor()
+        {
+            BorderColor = null;
+        }
+
+        #endregion
+
+        #region BorderPattern
+
+        /// <summary>
+        /// Gets or sets the style border pattern (Solid, Dash, ...)
+        /// </summary>
+        [Description("Indicates the style border pattern (Solid, Dash, ...)")]
+        public BorderPattern BorderPattern
+        {
+            get
+            {
+                if (_BorderPattern == null)
+                {
+                    _BorderPattern = BorderPattern.Empty;
+
+                    UpdateChangeHandler(null, _BorderPattern);
+                }
+
+                return (_BorderPattern);
+            }
+
+            set
+            {
+                if (_BorderPattern != value)
+                {
+                    UpdateChangeHandler(_BorderPattern, value);
+
+                    _BorderPattern = value;
+
+                    OnPropertyChangedEx("BorderPattern", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeBorderPattern()
+        {
+            return (_BorderPattern != null && _BorderPattern.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetBorderPattern()
+        {
+            BorderPattern = null;
+        }
+
+        #endregion
+
+        #region BorderThickness
+
+        /// <summary>
+        /// Gets or sets the style border thickness.
+        /// </summary>
+        [Description("Indicates the style border thickness")]
+        public Thickness BorderThickness
+        {
+            get
+            {
+                if (_BorderThickness == null)
+                {
+                    _BorderThickness = Thickness.Empty;
+
+                    UpdateChangeHandler(null, _BorderThickness);
+                }
+
+                return (_BorderThickness);
+            }
+
+            set
+            {
+                if (_BorderThickness != value)
+                {
+                    UpdateChangeHandler(_BorderThickness, value);
+                    
+                    _BorderThickness = value;
+
+                    OnPropertyChangedEx("BorderThickness", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeBorderThickness()
+        {
+            return (_BorderThickness != null && _BorderThickness.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetBorderThickness()
+        {
+            BorderThickness = null;
+        }
+
+        #endregion
+
+        #region Font
+
+        /// <summary>
+        /// Gets or sets the style Font
+        /// </summary>
+        [DefaultValue(null)]
+        [Description("Indicates the style Font")]
+        public Font Font
+        {
+            get { return (_Font); }
+
+            set
+            {
+                if (_Font != value)
+                {
+                    _Font = value;
+
+                    OnPropertyChangedEx("Font", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region Margin
+
+        /// <summary>
+        /// Gets or sets the spacing between the border and outside content.
+        /// </summary>
+        [Description("Indicates the spacing between the border and outside content")]
+        public Padding Margin
+        {
+            get
+            {
+                if (_Margin == null)
+                {
+                    _Margin = Padding.Empty;
+
+                    UpdateChangeHandler(null, _Margin);
+                }
+
+                return (_Margin);
+            }
+
+            set
+            {
+                if (_Margin != value)
+                {
+                    UpdateChangeHandler(_Margin, value);
+
+                    _Margin = value;
+
+                    OnPropertyChangedEx("Margin", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeMargin()
+        {
+            return (_Margin != null && _Margin.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetMargin()
+        {
+            Margin = null;
+        }
+
+        #endregion
+
+        #region Padding
+
+        /// <summary>
+        /// Gets or sets spacing between the content and edges of the element.
+        /// </summary>
+        [Description("Indicates the spacing between the content and edges of the element")]
+        public Padding Padding
+        {
+            get
+            {
+                if (_Padding == null)
+                {
+                    _Padding = Padding.Empty;
+
+                    UpdateChangeHandler(null, _Padding);
+                }
+
+                return (_Padding);
+            }
+
+            set
+            {
+                if (_Padding != value)
+                {
+                    UpdateChangeHandler(_Padding, value);
+
+                    _Padding = value;
+
+                    OnPropertyChangedEx("Padding", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializePadding()
+        {
+            return (_Padding != null && _Padding.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetPadding()
+        {
+            Padding = null;
+        }
+
+        #endregion
+
+        #region TextColor
+
+        /// <summary>
+        /// Gets or sets the Text color
+        /// </summary>
+        [Description("Indicates the Text color")]
+        public Color TextColor
+        {
+            get { return (_TextColor); }
+
+            set
+            {
+                if (_TextColor != value)
+                {
+                    _TextColor = value;
+
+                    OnPropertyChangedEx("TextColor", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeTextColor()
+        {
+            return (_TextColor.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetTextColor()
+        {
+            TextColor = Color.Empty;
+        }
+
+        #endregion
+
+        #region IsEmpty
+
+        /// <summary>
+        /// Gets whether the style is logically Empty.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        [Description("Gets whether the style is logically Empty.")]
+        public override bool IsEmpty
+        {
+            get
+            {
+                return ((_Background == null || _Background.IsEmpty == true) &&
+                        (_BorderColor == null || _BorderColor.IsEmpty == true) &&
+                        (_BorderPattern == null || _BorderPattern.IsEmpty == true) &&
+                        (_BorderThickness == null || _BorderThickness.IsEmpty == true) &&
+                        (_Margin == null || _Margin.IsEmpty == true) &&
+                        (_Padding == null || _Padding.IsEmpty == true) &&
+                        (_Font == null) &&
+                        (_TextColor.IsEmpty == true) &&
+                        (base.IsEmpty == true)); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderBackground
+
+        internal void RenderBackground(Graphics g, Rectangle bounds)
+        {
+            if (bounds.Width > 1 && bounds.Height > 1)
+            {
+                using (Brush br = Background.GetBrush(bounds))
+                {
+                    if (br != null)
+                        g.FillRectangle(br, bounds);
+                }
+            }
+        }
+
+        #endregion
+
+        #region RenderBorder
+
+        internal void RenderBorder(Graphics g, Rectangle r)
+        {
+            RenderBorderEx(g, r, BorderPattern, BorderThickness, BorderColor);
+        }
+
+        internal void RenderBorderEx(Graphics g, Rectangle r,
+            BorderPattern borderPattern, Thickness borderThickness, BorderColor borderColor)
+        {
+            if (r.Width > 2 && r.Height > 2)
+            {
+                if (borderPattern == null || borderThickness == null || borderColor == null)
+                    return;
+
+                SmoothingMode sm = g.SmoothingMode;
+                g.SmoothingMode = SmoothingMode.None;
+
+                if (borderColor.IsUniform == true &&
+                    borderThickness.IsUniform == true && borderPattern.IsUniform == true)
+                {
+                    RenderUniformBorder(g, r, borderPattern, borderThickness, borderColor);
+                }
+                else
+                {
+                    RenderVariableBorder(g, r, borderPattern, borderThickness, borderColor);
+                }
+
+                g.SmoothingMode = sm;
+            }
+        }
+
+        #region RenderUniformBorder
+
+        private void RenderUniformBorder(Graphics g, Rectangle r,
+            BorderPattern borderPattern, Thickness borderThickness, BorderColor borderColor)
+        {
+            if (borderPattern.Top != LinePattern.None &&
+                (borderThickness.Top > 0 && borderColor.Top.IsEmpty == false))
+            {
+                using (Pen pen = new
+                    Pen(borderColor.Top, Dpi.Width(borderThickness.Top)))
+                {
+                    LinePattern pattern = (borderPattern.Top == LinePattern.NotSet)
+                        ? LinePattern.Solid : borderPattern.Top;
+
+                    if (borderThickness.Top > 1)
+                    {
+                        pen.Alignment = PenAlignment.Inset;
+                    }
+                    else
+                    {
+                        r.Width--;
+                        r.Height--;
+                    }
+
+                    pen.DashStyle = (DashStyle)pattern;
+
+                    g.DrawRectangle(pen, r);
+                }
+            }
+        }
+
+        #endregion
+
+        #region RenderVariableBorder
+
+        private void RenderVariableBorder(Graphics g, Rectangle r, 
+            BorderPattern borderPattern, Thickness borderThickness, BorderColor borderColor)
+        {
+            Pen[] pens = GetBorderPens(borderPattern, borderThickness, borderColor);
+
+            if (pens[(int)BorderSide.Left] != null)
+            {
+                int n = (int)Math.Floor((double)borderThickness.Left / 2);
+                int left = r.Left + n;
+
+                g.DrawLine(pens[(int)BorderSide.Left], left, r.Top, left, r.Bottom - 1);
+            }
+
+            if (pens[(int)BorderSide.Right] != null)
+            {
+                int n = (int)Math.Ceiling((double)borderThickness.Right / 2);
+                int right = r.Right - n;
+
+                g.DrawLine(pens[(int)BorderSide.Right], right, r.Top, right, r.Bottom);
+            }
+
+            if (pens[(int)BorderSide.Top] != null)
+            {
+                int n = (int)Math.Floor((double)borderThickness.Top / 2);
+                int top = r.Top + n;
+
+                g.DrawLine(pens[(int)BorderSide.Top], r.X, top, r.Right - 1, top);
+            }
+
+            if (pens[(int)BorderSide.Bottom] != null)
+            {
+                int n = (int)Math.Ceiling((double)borderThickness.Bottom / 2);
+                int bottom = r.Bottom - n;
+
+                g.DrawLine(pens[(int)BorderSide.Bottom], r.X, bottom, r.Right, bottom);
+            }
+
+            foreach (Pen pen in pens)
+            {
+                if (pen != null)
+                    pen.Dispose();
+            }
+        }
+
+        #region GetBorderPens
+
+        internal Pen[] GetBorderPens(
+            BorderPattern borderPattern, Thickness borderThickness, BorderColor borderColor)
+        {
+            Pen[] pens = new Pen[4];
+
+            pens[(int)BorderSide.Top] = GetBorderPen(pens,
+                borderColor.Top, borderThickness.Top, borderPattern.Top);
+
+            pens[(int)BorderSide.Left] = GetBorderPen(pens,
+                borderColor.Left, borderThickness.Left, borderPattern.Left);
+
+            pens[(int)BorderSide.Bottom] = GetBorderPen(pens,
+                borderColor.Bottom, borderThickness.Bottom, borderPattern.Bottom);
+
+            pens[(int)BorderSide.Right] = GetBorderPen(pens,
+                borderColor.Right, borderThickness.Right, borderPattern.Right);
+
+            return (pens);
+        }
+
+        #region GetBorderPen
+
+        private Pen GetBorderPen(IEnumerable<Pen> pens,
+            Color color, int width, LinePattern pattern)
+        {
+            if (color.IsEmpty == true ||
+                pattern == LinePattern.None || width <= 0)
+            {
+                return (null);
+            }
+
+            width = Dpi.Width(width);
+
+            foreach (Pen pen in pens)
+            {
+                if (pen != null)
+                {
+                    if (pen.Color == color && pen.Width == width &&
+                        pen.DashStyle == (DashStyle)pattern)
+                    {
+                        return (pen);
+                    }
+                }
+            }
+
+            Pen npen = new Pen(color, width);
+
+            if (pattern == LinePattern.NotSet)
+                pattern = LinePattern.Solid;
+
+            npen.DashStyle = (DashStyle)pattern;
+
+            return (npen);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region GetBorderSize
+
+        internal Size GetBorderSize(bool inclPadding)
+        {
+            Size size = Size.Empty;
+
+            size.Width += (BorderThickness.Horizontal + Margin.Horizontal);
+            size.Height += (BorderThickness.Vertical + Margin.Vertical);
+
+            if (inclPadding == true)
+            {
+                size.Width += Padding.Horizontal;
+                size.Height += Padding.Vertical;
+            }
+
+            return (size);
+        }
+
+        #endregion
+
+        #region ApplyStyle
+
+        /// <summary>
+        /// Applies the style to instance of this style.
+        /// </summary>
+        /// <param name="style">Style to apply.</param>
+        public void ApplyStyle(VisualStyle style)
+        {
+            base.ApplyStyle(style);
+
+            if (style != null)
+            {
+                if (style._Background != null && style._Background.IsEmpty == false)
+                    Background = style._Background.Copy();
+
+                if (style._BorderColor != null && style._BorderColor.IsEmpty == false)
+                    BorderColor = style._BorderColor.Copy();
+
+                if (style._BorderPattern != null && style._BorderPattern.IsEmpty == false)
+                    BorderPattern.ApplyPattern(style._BorderPattern);
+
+                if (style._BorderThickness != null && style._BorderThickness.IsZero == false)
+                    BorderThickness = style._BorderThickness.Copy();
+
+                if (style.Font != null)
+                    Font = style.Font;
+
+                if (style._Margin != null && style._Margin.IsEmpty == false)
+                    Margin = style.Margin.Copy();
+
+                if (style._Padding != null && style._Padding.IsEmpty == false)
+                    Padding = style.Padding.Copy();
+
+                if (style._TextColor.IsEmpty == false)
+                    TextColor = style._TextColor;
+            }
+        }
+
+        #endregion
+
+        #region ApplyDefaults
+
+        private Background _DefaultBackground = new Background(Color.Transparent);
+
+        public override void ApplyDefaults()
+        {
+            base.ApplyDefaults();
+
+            if (_TextColor.IsEmpty == true)
+                TextColor = Color.Black;
+
+            if (Font == null)
+                Font = SystemFonts.DefaultFont;
+
+            if (Background == null)
+                Background = _DefaultBackground;
+        }
+
+        #endregion
+
+        #region Copy
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public new VisualStyle Copy()
+        {
+            VisualStyle style = new VisualStyle();
+
+            CopyTo(style);
+
+            return (style);
+        }
+
+        #endregion
+
+        #region CopyTo
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public void CopyTo(VisualStyle style)
+        {
+            base.CopyTo(style);
+
+            style.Background = (_Background == null) ? null : _Background.Copy();
+            style.BorderColor = (_BorderColor == null) ? null : _BorderColor.Copy();
+            style.BorderPattern = (_BorderPattern == null) ? null : _BorderPattern.Copy();
+            style.BorderThickness = (_BorderThickness == null) ? null : _BorderThickness.Copy();
+            style.Font = (_Font == null) ? null : (Font)_Font.Clone();
+            style.Margin = (_Margin == null) ? null : _Margin.Copy();
+            style.Padding = (_Padding == null) ? null : _Padding.Copy();
+            style.TextColor = _TextColor;
+        }
+
+        #endregion
+
+        #region GetSerialData
+
+        internal override SerialElementCollection GetSerialData(string serialName)
+        {
+            SerialElementCollection sec = new SerialElementCollection();
+
+            if (serialName != null)
+            {
+                if (serialName.Equals("") == true)
+                    serialName = "VisualStyle";
+
+                sec.AddStartElement(serialName);
+            }
+
+            if (_Background != null && _Background.IsEmpty == false)
+                sec.AddElement(_Background.GetSerialData("Background"));
+
+            if (_BorderColor != null && _BorderColor.IsEmpty == false)
+                sec.AddElement(_BorderColor.GetSerialData("BorderColor"));
+
+            if (_BorderPattern != null && _BorderPattern.IsEmpty == false)
+                sec.AddElement(_BorderPattern.GetSerialData("BorderPattern"));
+
+            if (_BorderThickness != null && _BorderThickness.IsEmpty == false)
+                sec.AddElement(_BorderThickness.GetSerialData("BorderThickness"));
+
+            if (_Font != null)
+                sec.AddValue("Font", XmlSerializableFont.ConvertToString(_Font));
+
+            if (_Margin != null && _Margin.IsEmpty == false)
+                sec.AddElement(_Margin.GetSerialData("Margin"));
+
+            if (_Padding != null && _Padding.IsEmpty == false)
+                sec.AddElement(_Padding.GetSerialData("Padding"));
+
+            sec.AddValue("TextColor", TextColor, Color.Empty);
+
+            sec.AddElement(base.GetSerialData(null));
+
+            if (serialName != null)
+                sec.AddEndElement(serialName);
+
+            return (sec);
+        }
+
+        #endregion
+
+        #region PutSerialData
+
+        #region ProcessValue
+
+        internal override void ProcessValue(SerialElement se)
+        {
+            switch (se.Name)
+            {
+                case "TextColor":
+                    TextColor = se.GetValueColor();
+                    break;
+
+                case "Font":
+                    Font = XmlSerializableFont.ConvertFromString(se.StringValue);
+                    break;
+
+                default:
+                    base.ProcessValue(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region ProcessCollection
+
+        internal override void ProcessCollection(SerialElement se)
+        {
+            switch (se.Name)
+            {
+                case "Background":
+                    se.Sec.PutSerialData(Background);
+                    break;
+
+                case "BorderColor":
+                    se.Sec.PutSerialData(BorderColor);
+                   break;
+
+                case "BorderPattern":
+                   se.Sec.PutSerialData(BorderPattern);
+                    break;
+
+                case "BorderThickness":
+                    se.Sec.PutSerialData(BorderThickness);
+                    break;
+
+                case "Margin":
+                    se.Sec.PutSerialData(Margin);
+                    break;
+
+                case "Padding":
+                    se.Sec.PutSerialData(Padding);
+                    break;
+
+                default:
+                    base.ProcessCollection(se);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IDisposable
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        public override void Dispose()
+        {
+            Background = null;
+            BorderColor = null;
+            BorderPattern = null;
+            BorderThickness = null;
+            Margin = null;
+            Padding = null;
+
+            base.Dispose();
+        }
+
+        #endregion
+    }
+
+    #region Alignment
+
+    ///<summary>
+    /// Alignment of the content
+    ///</summary>
+    public enum Alignment
+    {
+        ///<summary>
+        ///</summary>
+        NotSet = -1,
+
+        ///<summary>
+        /// TopLeft
+        ///</summary>
+        TopLeft,
+
+        ///<summary>
+        /// TopCenter
+        ///</summary>
+        TopCenter,
+
+        ///<summary>
+        /// TopRight
+        ///</summary>
+        TopRight,
+
+        ///<summary>
+        /// MiddleLeft
+        ///</summary>
+        MiddleLeft,
+
+        ///<summary>
+        /// MiddleCenter
+        ///</summary>
+        MiddleCenter,
+
+        /// <summary>
+        /// MiddleRight
+        /// </summary>
+        MiddleRight,
+
+        /// <summary>
+        /// BottomLeft
+        /// </summary>
+        BottomLeft,
+
+        /// <summary>
+        /// BottomCenter
+        /// </summary>
+        BottomCenter,
+
+        /// <summary>
+        /// BottomRight
+        /// </summary>
+        BottomRight,
+    }
+
+    #endregion
+
+    #region LineAlignment
+
+    ///<summary>
+    /// LineAlignment of the content
+    ///</summary>
+    public enum LineAlignment
+    {
+        ///<summary>
+        /// Not Set
+        ///</summary>
+        NotSet = -1,
+
+        ///<summary>
+        /// Near
+        ///</summary>
+        Near,
+
+        ///<summary>
+        /// Center
+        ///</summary>
+        Center,
+
+        ///<summary>
+        /// Far
+        ///</summary>
+        Far,
+    }
+
+    #endregion
+
+    #region BorderSide
+
+    internal enum BorderSide
+    {
+        Top,
+        Left,
+        Bottom,
+        Right
+    }
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/VisualStyles.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/VisualStyles.cs
new file mode 100644
index 00000000..aec72703
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/Style/VisualStyles.cs	
@@ -0,0 +1,429 @@
+using System;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar.Charts.Style
+{
+    ///<summary>
+    /// VisualStyles
+    ///</summary>
+    [TypeConverter(typeof(VisualStylesConverter))]
+    public class VisualStyles<T> : IDisposable, INotifyPropertyChanged, IProcessSerialElement
+        where T : BaseVisualStyle, new()
+    {
+        #region Private variables
+
+        private T[] _Styles;
+
+        #endregion
+
+        ///<summary>
+        /// Constructor
+        ///</summary>
+        public VisualStyles()
+        {
+            _Styles = new T[Enum.GetValues(typeof(StyleType)).Length - 1];
+        }
+
+        #region Public properties
+
+        #region Indexer
+
+        /// <summary>
+        /// Gets or sets the visual style
+        /// assigned to the element. Default value is null.
+        /// </summary>
+        [DefaultValue(null), Category("Style")]
+        [Description("Indicates visual style assigned to the element")]
+        public T this[StyleType e]
+        {
+            get
+            {
+                int n = StyleIndex(e);
+
+                return (GetStyle(n));
+            }
+
+            set
+            {
+                int n = StyleIndex(e);
+
+                SetStyle(n, value);
+            }
+        }
+
+        #endregion
+
+        #region Default
+
+        ///<summary>
+        /// The normal, default style
+        ///</summary>
+        [Description("Style to use for normal, default items")]
+        [TypeConverter(typeof(VisualStylesConverter))]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public T Default
+        {
+            get { return (GetStyle((int) StyleType.Default)); }
+            set { SetStyle((int) StyleType.Default, value); }
+        }
+
+        #endregion
+
+        #region MouseOver
+
+        ///<summary>
+        /// MouseOver
+        ///</summary>
+        [Description("Style to use when the Mouse is over an item")]
+        [TypeConverter(typeof(VisualStylesConverter))]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public T MouseOver
+        {
+            get { return (GetStyle((int)StyleType.MouseOver)); }
+            set { SetStyle((int)StyleType.MouseOver, value); }
+        }
+
+        #endregion
+
+        #region Selected
+
+        ///<summary>
+        /// Selected
+        ///</summary>
+        [Description("Style to use when the item is selected")]
+        [TypeConverter(typeof(VisualStylesConverter))]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public T Selected
+        {
+            get { return (GetStyle((int)StyleType.Selected)); }
+            set { SetStyle((int)StyleType.Selected, value); }
+        }
+
+        #endregion
+
+        #region SelectedMouseOver
+
+        ///<summary>
+        /// MouseOver
+        ///</summary>
+        [Description("Style to use when the item is selected and the Mouse is over it")]
+        [TypeConverter(typeof(VisualStylesConverter))]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public T SelectedMouseOver
+        {
+            get { return (GetStyle((int)StyleType.SelectedMouseOver)); }
+            set { SetStyle((int)StyleType.SelectedMouseOver, value); }
+        }
+
+        #endregion
+
+        #region Styles
+
+        ///<summary>
+        /// Styles array
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public T[] Styles
+        {
+            get { return (_Styles); }
+        }
+
+        #endregion
+
+        #region IsEmpty
+
+        /// <summary>
+        /// Gets whether the style collection is logically Empty.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        [Description("Gets whether the style collection is logically Empty.")]
+        public bool IsEmpty
+        {
+            get
+            {
+                for (int i = 0; i < Styles.Length; i++)
+                {
+                    T vstyle = Styles[i];
+
+                    if (vstyle != null && vstyle.IsEmpty == false)
+                        return (false);
+                }
+
+                return (true);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Count
+
+        internal int Count
+        {
+            get { return (_Styles.Length); }
+        }
+
+        #endregion
+
+        #region GetStyle
+
+        internal T GetStyle(int n)
+        {
+            if (_Styles[n] == null)
+            {
+                _Styles[n] = new T();
+
+                OnStyleChangeHandler(null, _Styles[n]);
+            }
+
+            return (_Styles[n]);
+        }
+
+        #endregion
+
+        #region SetStyle
+
+        internal void SetStyle(int n, T value)
+        {
+            if (_Styles[n] != value)
+            {
+                T oldValue = _Styles[n];
+
+                _Styles[n] = value;
+
+                OnStyleChanged(Enum.GetName(typeof(StyleType), n), oldValue, value);
+            }
+        }
+
+        #endregion
+
+        #region GetSerialData
+
+        internal SerialElementCollection GetSerialData(string serialName)
+        {
+            if (IsEmpty == false)
+            {
+                SerialElementCollection sec = new SerialElementCollection();
+
+                if (serialName != null)
+                {
+                    if (serialName.Equals("") == true)
+                    {
+                        serialName = this.ToString();
+
+                        serialName = serialName.Substring(serialName.LastIndexOf('.') + 1);
+                    }
+
+                    sec.AddStartElement(serialName);
+                }
+
+                string[] enums = Enum.GetNames(typeof(StyleType));
+
+                for (int i = 0; i < Styles.Length; i++)
+                {
+                    T vstyle = Styles[i];
+
+                    if (vstyle != null && vstyle.IsEmpty == false)
+                    {
+                        sec.AddStartElement(enums[i]);
+                        sec.AddElement(vstyle.GetSerialData(null));
+                        sec.AddEndElement(enums[i]);
+                    }
+                }
+
+                if (serialName != null)
+                    sec.AddEndElement(serialName);
+
+                return (sec);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region PutSerialData
+
+        #region ProcessValue
+
+        void IProcessSerialElement.ProcessValue(SerialElement se)
+        {
+            throw new Exception("Unknown Serial Value (" + se.Name + ")");
+        }
+
+        #endregion
+
+        #region ProcessCollection
+
+        void IProcessSerialElement.ProcessCollection(SerialElement se)
+        {
+            switch (se.Name)
+            {
+                case "Default":
+                    se.Sec.PutSerialData(Default);
+                    break;
+
+                case "MouseOver":
+                    se.Sec.PutSerialData(MouseOver);
+                    break;
+
+                case "Selected":
+                    se.Sec.PutSerialData(Selected);
+                    break;
+
+                case "SelectedMouseOver":
+                    se.Sec.PutSerialData(SelectedMouseOver);
+                    break;
+
+                default:
+                    throw new Exception("Unknown Serial Collection (" + se.Name + ")");
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region OnStyleChanged
+
+        private void OnStyleChanged(
+            string property, T oldValue, T newValue)
+        {
+            OnStyleChangeHandler(oldValue, newValue);
+
+            OnPropertyChanged(new VisualPropertyChangedEventArgs(property));
+        }
+
+        #endregion
+
+        #region StyleIndex
+
+        internal int StyleIndex(Enum e)
+        {
+            int n = ((IConvertible)e).ToInt32(null);
+
+            if (n < 0 || n > _Styles.Length)
+                throw new Exception("Invalid Style indexer");
+
+            return (n);
+        }
+
+        #endregion
+
+        #region IsValid
+
+        internal T Style(Enum e)
+        {
+            int n = ((IConvertible) e).ToInt32(null);
+
+            if (n < 0 || n > _Styles.Length)
+                throw new Exception("Invalid Style indexer");
+
+            return (_Styles[n]);
+        }
+
+        #endregion
+
+        #region GetStyleType
+
+        internal StyleType GetStyleType(StyleState state)
+        {
+            switch (state)
+            {
+                case StyleState.MouseOver:
+                    return (StyleType.MouseOver);
+
+                case StyleState.Selected:
+                    return (StyleType.Selected);
+
+                case StyleState.Selected | StyleState.MouseOver:
+                    return (StyleType.SelectedMouseOver);
+
+                default:
+                    return (StyleType.Default);
+            }
+        }
+
+        #endregion
+
+        #region Style support routines
+
+        #region StyleVisualChangeHandler
+
+        private void OnStyleChangeHandler(T oldValue, T newValue)
+        {
+            if (oldValue != null)
+                oldValue.PropertyChanged -= StyleChanged;
+
+            if (newValue != null)
+                newValue.PropertyChanged += StyleChanged;
+        }
+
+        #endregion
+
+        #region StyleChanged
+
+        /// <summary>
+        /// Occurs when one of element visual styles has property changes.
+        /// Default implementation invalidates visual appearance of element.
+        /// </summary>
+        /// <param name="sender">VisualStyle that changed.</param>
+        /// <param name="e">Event arguments.</param>
+        protected virtual void StyleChanged(object sender, PropertyChangedEventArgs e)
+        {
+            OnPropertyChanged(e);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region INotifyPropertyChanged Members
+
+        /// <summary>
+        /// Occurs when property value has changed.
+        /// </summary>
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        /// <summary>
+        /// Raises the PropertyChanged event.
+        /// </summary>
+        /// <param name="e">Event arguments</param>
+        protected virtual void OnPropertyChanged(PropertyChangedEventArgs e)
+        {
+            PropertyChangedEventHandler eh = PropertyChanged;
+
+            if (eh != null)
+                eh(this, e);
+        }
+
+        #endregion
+
+        #region IDisposable
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        public void Dispose()
+        {
+            for (int i = 0; i < _Styles.Length; i++)
+            {
+                T style = _Styles[i];
+
+                if (style != null)
+                {
+                    SetStyle(i, null);
+
+                    style.Dispose();
+                }
+            }
+
+            _Styles = null;
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/TextMarkup/BodyElement.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/TextMarkup/BodyElement.cs
new file mode 100644
index 00000000..1636411d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/TextMarkup/BodyElement.cs	
@@ -0,0 +1,89 @@
+using System;
+using System.Text;
+using System.Windows.Forms;
+
+namespace DevComponents.Charts.TextMarkup
+{
+    internal class BodyElement : ContainerElement
+    {
+        #region Private Variables
+        private MarkupElementCollection m_ActiveElements=null;
+        private IActiveMarkupElement m_MouseOverElement = null;
+        internal bool HasExpandElement = false;
+        internal string PlainText = "";
+        #endregion
+
+        #region Events
+        public event EventHandler HyperLinkClick;
+        #endregion
+
+        #region Internal Implementation
+        public BodyElement()
+        {
+            m_ActiveElements = new MarkupElementCollection(null);
+        }
+
+        public MarkupElementCollection ActiveElements
+        {
+            get { return m_ActiveElements; }
+        }
+
+        public void MouseLeave(Control parent)
+        {
+            if (m_MouseOverElement != null)
+                m_MouseOverElement.MouseLeave(parent);
+            m_MouseOverElement = null;
+        }
+
+        public void MouseMove(Control parent, MouseEventArgs e)
+        {
+            if (m_MouseOverElement != null && m_MouseOverElement.HitTest(e.X, e.Y))
+                return;
+            if (m_MouseOverElement != null)
+                m_MouseOverElement.MouseLeave(parent);
+            
+            m_MouseOverElement = null;
+
+            foreach(IActiveMarkupElement el in m_ActiveElements)
+            {
+                if (el.HitTest(e.X, e.Y))
+                {
+                    m_MouseOverElement = el;
+                    m_MouseOverElement.MouseEnter(parent);
+                }
+            }
+        }
+
+        public void MouseDown(Control parent, MouseEventArgs e)
+        {
+            if (m_MouseOverElement != null)
+                m_MouseOverElement.MouseDown(parent, e);
+        }
+
+        public void MouseUp(Control parent, MouseEventArgs e)
+        {
+            if (m_MouseOverElement != null)
+                m_MouseOverElement.MouseUp(parent, e);
+        }
+
+        public void Click(Control parent)
+        {
+            if (m_MouseOverElement != null)
+            {
+                m_MouseOverElement.Click(parent);
+                if (m_MouseOverElement is HyperLink)
+                {
+                    if (HyperLinkClick != null)
+                        HyperLinkClick(m_MouseOverElement, new EventArgs());
+                }
+            }
+        }
+
+        internal IActiveMarkupElement MouseOverElement
+        {
+            get { return (m_MouseOverElement); }
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/TextMarkup/ContainerElement.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/TextMarkup/ContainerElement.cs
new file mode 100644
index 00000000..2a055218
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/TextMarkup/ContainerElement.cs	
@@ -0,0 +1,104 @@
+using System;
+using System.Text;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+
+namespace DevComponents.Charts.TextMarkup
+{
+    internal class ContainerElement : MarkupElement
+    {
+        #region Private Variables
+        private SerialContentLayoutManager m_Layout = null;
+        private MarkupLayoutManager m_MarkupLayout = null;
+        #endregion
+
+        #region Internal Implementation
+        public override void Measure(Size availableSize, MarkupDrawContext d)
+        {
+            ArrangeInternal(new Rectangle(Point.Empty, availableSize), d);
+        }
+
+        protected virtual SerialContentLayoutManager GetLayoutManager(bool mutliLine)
+        {
+            if (m_Layout == null)
+            {
+                m_Layout = new SerialContentLayoutManager();
+                m_Layout.MultiLine = mutliLine;
+                m_Layout.ContentVerticalAlignment = eContentVerticalAlignment.Top;
+                m_Layout.BlockLineAlignment = eContentVerticalAlignment.Top;
+                m_Layout.BlockSpacing = 0;
+            }
+
+            m_Layout.EvenHeight = true;
+            return m_Layout;
+        }
+
+        private MarkupLayoutManager GetMarkupLayout()
+        {
+            if (m_MarkupLayout == null)
+            {
+                m_MarkupLayout = new MarkupLayoutManager();
+            }
+            return m_MarkupLayout;
+        }
+
+        public override void Render(MarkupDrawContext d)
+        {
+            Point offset = this.GetContainerOffset();
+            d.Offset.Offset(offset.X, offset.Y);
+
+            try
+            {
+                foreach (MarkupElement e in this.Elements)
+                {
+                    e.Render(d);
+                }
+            }
+            finally
+            {
+                d.Offset.Offset(-offset.X, -offset.Y);
+            }
+        }
+
+        protected virtual Point GetContainerOffset()
+        {
+            return this.Bounds.Location;
+        }
+
+        protected override void ArrangeCore(Rectangle finalRect, MarkupDrawContext d)
+        {
+            this.Bounds = finalRect;
+            ArrangeInternal(finalRect, d);
+        }
+
+        protected virtual void ArrangeInternal(Rectangle bounds, MarkupDrawContext d)
+        {
+            SerialContentLayoutManager layout = GetLayoutManager(d.AllowMultiLine);
+            layout.RightToLeft = d.RightToLeft;
+            MarkupLayoutManager markupLayout = GetMarkupLayout();
+            markupLayout.MarkupDrawContext = d;
+            try
+            {
+                MarkupElement[] blocks = new MarkupElement[this.Elements.Count];
+                this.Elements.CopyTo(blocks);
+
+                Rectangle r = layout.Layout(new Rectangle(Point.Empty, bounds.Size), blocks, markupLayout);
+                this.Bounds = new Rectangle(bounds.Location, r.Size);
+            }
+            finally
+            {
+                markupLayout.MarkupDrawContext = null;
+            }
+        }
+
+        /// <summary>
+        /// Returns whether markup element is an block element that always consumes a whole line in layout.
+        /// </summary>
+        public override bool IsBlockElement
+        {
+            get { return true; }
+        }
+        #endregion
+        
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/TextMarkup/Div.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/TextMarkup/Div.cs
new file mode 100644
index 00000000..b8659bdf
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/TextMarkup/Div.cs	
@@ -0,0 +1,161 @@
+using System;
+using System.Text;
+using System.Drawing;
+using System.Xml;
+using DevComponents.DotNetBar;
+
+namespace DevComponents.Charts.TextMarkup
+{
+    internal class Div : ContainerElement
+    {
+        #region Private Variables
+        private eParagraphAlignment m_Align = eParagraphAlignment.Left;
+        private eParagraphVerticalAlignment m_VAlign = eParagraphVerticalAlignment.Top;
+        private int m_Width = 0;
+        private Padding m_Padding = new Padding(0, 0, 0, 0);
+        #endregion
+
+        #region Internal Implementation
+        public eParagraphAlignment Align
+        {
+            get { return m_Align; }
+            set { m_Align = value; }
+        }
+
+        protected override SerialContentLayoutManager GetLayoutManager(bool multiLine)
+        {
+            SerialContentLayoutManager sm = base.GetLayoutManager(multiLine);
+            if (m_Align == eParagraphAlignment.Left)
+                sm.ContentAlignment = eContentAlignment.Left;
+            else if (m_Align == eParagraphAlignment.Right)
+                sm.ContentAlignment = eContentAlignment.Right;
+            else if (m_Align == eParagraphAlignment.Center)
+                sm.ContentAlignment = eContentAlignment.Center;
+
+            if (m_VAlign != eParagraphVerticalAlignment.Top)
+            {
+                sm.EvenHeight = false;
+                sm.BlockLineAlignment = (m_VAlign == eParagraphVerticalAlignment.Bottom ? eContentVerticalAlignment.Bottom : eContentVerticalAlignment.Middle);
+            }
+
+            return sm;
+        }
+
+        protected override Point GetContainerOffset()
+        {
+            if (m_Padding.Left == 0 && m_Padding.Top == 0)
+                return base.GetContainerOffset();
+            
+            Point p = base.GetContainerOffset();
+            p.X += m_Padding.Left;
+            p.Y += m_Padding.Top;
+            return p;
+        }
+
+        protected override void ArrangeInternal(Rectangle bounds, MarkupDrawContext d)
+        {
+            Rectangle r = bounds;
+            if (m_Width > 0)
+                r.Width = m_Width;
+            if (m_Padding.IsEmpty)
+            {
+                base.ArrangeInternal(r, d);
+                if (m_Width > 0)
+                    this.Bounds = new Rectangle(this.Bounds.X, this.Bounds.Y, m_Width, this.Bounds.Height + m_Padding.Bottom);
+            }
+            else
+            {
+                r.X += m_Padding.Left;
+                r.Y += m_Padding.Top;
+                base.ArrangeInternal(r, d);
+
+                r = new Rectangle(bounds.X, bounds.Y, this.Bounds.Width + m_Padding.Horizontal, this.Bounds.Height + m_Padding.Vertical);
+                if (m_Width > 0)
+                    r.Width = m_Width;
+                
+                this.Bounds = r;
+            }
+        }
+
+        public override void ReadAttributes(XmlTextReader reader)
+        {
+            for (int i = 0; i < reader.AttributeCount; i++)
+            {
+                reader.MoveToAttribute(i);
+                if (reader.Name.ToLower() == "align")
+                {
+                    string s = reader.Value.ToLower();
+                    if (s == "left")
+                        m_Align = eParagraphAlignment.Left;
+                    else if (s == "right")
+                        m_Align = eParagraphAlignment.Right;
+                    else if (s == "center")
+                        m_Align = eParagraphAlignment.Center;
+                }
+                else if (reader.Name.ToLower() == "valign")
+                {
+                    string s = reader.Value.ToLower();
+                    if (s == "top")
+                        m_VAlign = eParagraphVerticalAlignment.Top;
+                    else if (s == "middle")
+                        m_VAlign = eParagraphVerticalAlignment.Middle;
+                    else if (s == "bottom")
+                        m_VAlign = eParagraphVerticalAlignment.Bottom;
+                }
+                else if (reader.Name.ToLower() == "width")
+                {
+                    try
+                    {
+                        m_Width = Int32.Parse(reader.Value);
+                    }
+                    catch
+                    {
+                        m_Width = 0;
+                    }
+                }
+                else if (reader.Name.ToLower() == "padding")
+                {
+                    try
+                    {
+                        string[] values = reader.Value.Split(',');
+                        if (values.Length > 0)
+                            m_Padding.Left = Int32.Parse(values[0]);
+                        if (values.Length > 1)
+                            m_Padding.Right = Int32.Parse(values[1]);
+                        if (values.Length > 2)
+                            m_Padding.Top = Int32.Parse(values[2]);
+                        if (values.Length > 3)
+                            m_Padding.Bottom = Int32.Parse(values[3]);
+                    }
+                    catch
+                    {
+                        m_Padding = new Padding(0,0,0,0);
+                    }
+                }
+            }
+        }
+        #endregion
+    }
+
+    #region eParagraphAlignment
+    /// <summary>
+    /// Indicates paragraph content alignment
+    /// </summary>
+    internal enum eParagraphAlignment
+    {
+        Left,
+        Right,
+        Center
+    }
+
+    /// <summary>
+    /// Indicates paragraph content alignment
+    /// </summary>
+    internal enum eParagraphVerticalAlignment
+    {
+        Top,
+        Middle,
+        Bottom
+    }
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/TextMarkup/EndMarkupElement.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/TextMarkup/EndMarkupElement.cs
new file mode 100644
index 00000000..68758c14
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/TextMarkup/EndMarkupElement.cs	
@@ -0,0 +1,42 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.Charts.TextMarkup
+{
+    internal class EndMarkupElement : MarkupElement
+    {
+        #region Internap Implementation
+        private MarkupElement m_StartElement = null;
+
+        public EndMarkupElement(MarkupElement startElement)
+        {
+            m_StartElement = startElement;
+        }
+
+        public override void Measure(System.Drawing.Size availableSize, MarkupDrawContext d)
+        {
+            m_StartElement.MeasureEnd(availableSize, d);
+            this.Bounds = Rectangle.Empty;
+        }
+
+        public override void Render(MarkupDrawContext d)
+        {
+            m_StartElement.RenderEnd(d);
+        }
+
+        protected override void ArrangeCore(System.Drawing.Rectangle finalRect, MarkupDrawContext d)
+        {
+            this.Bounds = Rectangle.Empty;
+        }
+
+        /// <summary>
+        /// Gets reference to markup start element.
+        /// </summary>
+        public MarkupElement StartElement
+        {
+            get { return m_StartElement; }
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/TextMarkup/ExpandElement.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/TextMarkup/ExpandElement.cs
new file mode 100644
index 00000000..6e60b3e9
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/TextMarkup/ExpandElement.cs	
@@ -0,0 +1,193 @@
+using System;
+using System.Text;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Xml;
+
+namespace DevComponents.Charts.TextMarkup
+{
+    internal class ExpandElement : MarkupElement
+    {
+        #region Internal Implementation
+        private Size m_DefaultSize = new Size(5, 4);
+        private eExpandDirection m_Direction = eExpandDirection.Default;
+
+        public override void Measure(System.Drawing.Size availableSize, MarkupDrawContext d)
+        {
+            this.Bounds = new Rectangle(Point.Empty, m_DefaultSize);
+        }
+
+        protected override void ArrangeCore(System.Drawing.Rectangle finalRect, MarkupDrawContext d) { }
+
+        public override void Render(MarkupDrawContext d)
+        {
+            Rectangle r = this.Bounds;
+            r.Offset(d.Offset);
+
+            if (!d.ClipRectangle.IsEmpty && !r.IntersectsWith(d.ClipRectangle))
+                return;
+
+            Graphics g = d.Graphics;
+            Color color = d.CurrentForeColor;
+            //Color shadeColor = Color.FromArgb(96, Color.White);
+
+            eExpandDirection direction = eExpandDirection.Bottom;
+            if (m_Direction != eExpandDirection.Default)
+                direction = m_Direction;
+
+            #if DOTNETBAR
+            if(d.ContextObject is ButtonItem)
+            {
+                if (m_Direction == eExpandDirection.Default)
+                {
+                    ButtonItem item = d.ContextObject as ButtonItem;
+                    if (item.IsOnMenu)
+                    {
+                        direction = eExpandDirection.Right;
+                        if (item.PopupSide == ePopupSide.Default && d.RightToLeft || item.PopupSide == ePopupSide.Left)
+                            direction = eExpandDirection.Left;
+                    }
+                    else if (item.PopupSide == ePopupSide.Default)
+                        direction = eExpandDirection.Bottom;
+                    else if (item.PopupSide == ePopupSide.Left)
+                        direction = eExpandDirection.Left;
+                    else if (item.PopupSide == ePopupSide.Right)
+                        direction = eExpandDirection.Right;
+                    else if (item.PopupSide == ePopupSide.Bottom)
+                        direction = eExpandDirection.Bottom;
+                    else if (item.PopupSide == ePopupSide.Top)
+                        direction = eExpandDirection.Top;
+                }
+            }
+            #endif
+
+            SmoothingMode sm = g.SmoothingMode;
+            g.SmoothingMode = SmoothingMode.None;
+
+            Rectangle shadeRect = r;
+            if (direction == eExpandDirection.Bottom || direction == eExpandDirection.PopupDropDown)
+                shadeRect.Offset(0, 1);
+            else if (direction == eExpandDirection.Top)
+                shadeRect.Offset(0, -1);
+            else if (direction == eExpandDirection.Left)
+                shadeRect.Offset(1, 0);
+            else if (direction == eExpandDirection.Right)
+                shadeRect.Offset(-1, 0);
+            Point[] p = GetExpandPolygon(shadeRect, direction);
+            //using (SolidBrush brush = new SolidBrush(shadeColor))
+            //    g.FillPolygon(brush, p);
+
+            p = GetExpandPolygon(r, direction);
+            using(SolidBrush brush = new SolidBrush(color))
+                g.FillPolygon(brush, p);
+
+            if (direction == eExpandDirection.PopupDropDown)
+            {
+                using (Pen pen = new Pen(color, 1))
+                    g.DrawLine(pen, r.X, r.Y - 2, r.Right - 1, r.Y - 2);
+                //using (Pen pen = new Pen(shadeColor, 1))
+                //    g.DrawLine(pen, r.X, r.Y - 1, r.Right - 1, r.Y - 1);
+            }
+
+            g.SmoothingMode = sm;
+
+            this.RenderBounds = r;
+        }
+
+        private Point[] GetExpandPolygon(Rectangle r, eExpandDirection direction)
+        {
+            Point[] p = new Point[3];
+            switch (direction)
+            {
+                case eExpandDirection.Right:
+                    {
+                        p[0].X = r.Left + 1;
+                        p[0].Y = r.Top + (r.Height - m_DefaultSize.Height) / 2 - 1;
+                        p[1].X = p[0].X;
+                        p[1].Y = p[0].Y + 6;
+                        p[2].X = p[0].X + 3;
+                        p[2].Y = p[0].Y + 3;
+                        break;
+                    }
+                case eExpandDirection.Left:
+                    {
+                        p[0].X = r.Left + 3;
+                        p[0].Y = r.Top + (r.Height - m_DefaultSize.Height) / 2 - 1;
+                        p[1].X = p[0].X;
+                        p[1].Y = p[0].Y + 6;
+                        p[2].X = p[0].X - 3;
+                        p[2].Y = p[0].Y + 3;
+                        break;
+                    }
+                case eExpandDirection.Top:
+                    {
+                        p[0].X = r.Left - 1;
+                        p[0].Y = r.Top + (r.Height - m_DefaultSize.Height) / 2 + m_DefaultSize.Height;
+                        p[1].X = p[0].X + 6;
+                        p[1].Y = p[0].Y;
+                        p[2].X = p[0].X + 3;
+                        p[2].Y = p[0].Y - 4;
+                        break;
+                    }
+                case eExpandDirection.Bottom:
+                case eExpandDirection.PopupDropDown:
+                    {
+                        p[0].X = r.Left;
+                        p[0].Y = r.Top + (r.Height - m_DefaultSize.Height) / 2 + 1;
+                        p[1].X = p[0].X + 5;
+                        p[1].Y = p[0].Y;
+                        p[2].X = p[0].X + 2;
+                        p[2].Y = p[0].Y + 3;
+                        break;
+                    }
+            }
+            return p;
+        }
+
+        public override void ReadAttributes(XmlTextReader reader)
+        {
+            m_Direction = eExpandDirection.Default;
+
+            for (int i = 0; i < reader.AttributeCount; i++)
+            {
+                reader.MoveToAttribute(i);
+                if (reader.Name.ToLower() == "direction")
+                {
+                    string s = reader.Value.ToLower();
+                    if (s == "left")
+                        m_Direction = eExpandDirection.Left;
+                    else if (s == "right")
+                        m_Direction = eExpandDirection.Right;
+                    else if (s == "top")
+                        m_Direction = eExpandDirection.Top;
+                    else if (s == "bottom")
+                        m_Direction = eExpandDirection.Bottom;
+                    else if (s == "popup")
+                        m_Direction = eExpandDirection.PopupDropDown;
+                    break;
+                }
+            }
+        }
+
+        private enum eExpandDirection
+        {
+            Left,
+            Right,
+            Top,
+            Bottom,
+            Default,
+            PopupDropDown
+        }
+
+        /// <summary>
+        /// Returns whether layout manager can start new line with this element.
+        /// </summary>
+        public override bool CanStartNewLine
+        {
+            get { return false; }
+        }
+        #endregion
+
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/TextMarkup/FontChangeElement.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/TextMarkup/FontChangeElement.cs
new file mode 100644
index 00000000..f77c3711
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/TextMarkup/FontChangeElement.cs	
@@ -0,0 +1,49 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.Charts.TextMarkup
+{
+    internal class FontChangeElement : MarkupElement
+    {
+        #region Private Variables
+        protected Font m_OldFont = null;
+        #endregion
+
+        #region Internal Implementation
+
+        public override void Measure(Size availableSize, MarkupDrawContext d)
+        {
+            this.Bounds = Rectangle.Empty;
+            SetFont(d);
+        }
+
+        public override void Render(MarkupDrawContext d)
+        {
+            SetFont(d);
+        }
+
+        protected virtual void SetFont(MarkupDrawContext d)
+        {
+            
+        }
+
+        public override void RenderEnd(MarkupDrawContext d)
+        {
+            if(m_OldFont!=null)
+                d.CurrentFont = m_OldFont;
+            m_OldFont = null;
+            base.RenderEnd(d);
+        }
+
+        public override void MeasureEnd(Size availableSize, MarkupDrawContext d)
+        {
+            if (m_OldFont != null)
+                d.CurrentFont = m_OldFont;
+            m_OldFont = null;
+            base.MeasureEnd(availableSize, d);
+        }
+        protected override void ArrangeCore(Rectangle finalRect, MarkupDrawContext d) { }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/TextMarkup/FontElement.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/TextMarkup/FontElement.cs
new file mode 100644
index 00000000..3fb893f3
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/TextMarkup/FontElement.cs	
@@ -0,0 +1,180 @@
+using DevComponents.DotNetBar.Charts;
+using System;
+using System.Drawing;
+using System.Xml;
+using DevComponents.DotNetBar.Charts.Primitives;
+
+namespace DevComponents.Charts.TextMarkup
+{
+    internal class FontElement : FontChangeElement
+    {
+        #region Private Variables
+
+        private Color _MForeColor = Color.Empty;
+        private Color _MOldForeColor = Color.Empty;
+        private int _MSize;
+        private bool _MRelativeSize;
+        private string _MFace = "";
+        private string _MSystemColorName = "";
+
+        #endregion
+
+        #region Internal Implementation
+        protected override void SetFont(MarkupDrawContext d)
+        {
+            Font font = d.CurrentFont;
+            try
+            {
+                if (_MFace != "" || _MSize != 0 && _MRelativeSize || _MSize>4 && !_MRelativeSize)
+                {
+                    if (_MFace != "")
+                        d.CurrentFont = new Font(_MFace, ((_MRelativeSize || _MSize == 0)?font.SizeInPoints + _MSize:_MSize), font.Style);
+                    else
+                        d.CurrentFont = new Font(font.FontFamily, ((_MRelativeSize || _MSize == 0)? font.SizeInPoints + _MSize : _MSize), font.Style);
+                }
+                else
+                    font = null;
+            }
+            catch
+            {
+                font = null;
+            }
+
+            if (font != null)
+                m_OldFont = font;
+
+            if (!d.IgnoreFormattingColors)
+            {
+                if (!_MForeColor.IsEmpty)
+                {
+                    _MOldForeColor = d.CurrentForeColor;
+                    d.CurrentForeColor = _MForeColor;
+                }
+                else if (_MSystemColorName != "")
+                {
+#if DOTNETBAR
+                    if (Rendering.GlobalManager.Renderer is Rendering.Office2007Renderer)
+                    {
+                        m_OldForeColor = d.CurrentForeColor;
+                        d.CurrentForeColor = ((Rendering.Office2007Renderer)Rendering.GlobalManager.Renderer).ColorTable.Form.Active.CaptionTextExtra;
+                    }
+#endif
+                }
+            }
+        }
+
+        public override void RenderEnd(MarkupDrawContext d)
+        {
+            RestoreForeColor(d);
+
+            base.RenderEnd(d);
+        }
+
+        public override void MeasureEnd(Size availableSize, MarkupDrawContext d)
+        {
+            RestoreForeColor(d);
+            base.MeasureEnd(availableSize, d);
+        }
+
+        protected virtual void RestoreForeColor(MarkupDrawContext d)
+        {
+            if (!_MOldForeColor.IsEmpty)
+                d.CurrentForeColor = _MOldForeColor;
+            _MOldForeColor = Color.Empty;
+        }
+
+        public Color ForeColor
+        {
+            get { return _MForeColor; }
+            set { _MForeColor = value; }
+        }
+
+        public int Size
+        {
+            get { return _MSize; }
+            set { _MSize = value; }
+        }
+
+        public string Face
+        {
+            get { return _MFace; }
+            set { _MFace = value; }
+        }
+
+        private Color GetColorFromName(string name)
+        {
+            string s = name.ToLower();
+            _MSystemColorName = "";
+            if (s == "syscaptiontextextra")
+            {
+                _MSystemColorName = s;
+                return Color.Empty;
+            }
+
+            return Color.FromName(name);
+        }
+
+        public override void ReadAttributes(XmlTextReader reader)
+        {
+            _MRelativeSize = false;
+            for (int i = 0; i < reader.AttributeCount; i++)
+            {
+                reader.MoveToAttribute(i);
+                if (reader.Name.ToLower() == "color")
+                {
+                    try
+                    {
+                        string s = reader.Value;
+                        if (s.StartsWith("#"))
+                        {
+                            if (s.Length == 7)
+                                _MForeColor = ColorFactory.GetColor(s.Substring(1));
+                        }
+                        else
+                        {
+                            _MForeColor = GetColorFromName(s);
+                        }
+                    }
+                    catch
+                    {
+                        _MForeColor = Color.Empty;
+                    }
+                }
+                else if (reader.Name.ToLower() == "size")
+                {
+                    string s = reader.Value;
+                    if (s.StartsWith("+"))
+                    {
+                        try
+                        {
+                            _MSize = Int32.Parse(s.Substring(1));
+                            _MRelativeSize = true;
+                        }
+                        catch
+                        {
+                            _MSize = 0;
+                        }
+                    }
+                    else
+                    {
+                        if (s.StartsWith("-"))
+                            _MRelativeSize = true;
+                        try
+                        {
+                            _MSize = Int32.Parse(s);
+                        }
+                        catch
+                        {
+                            _MSize = 0;
+                        }
+                    }
+                }
+                else if (reader.Name.ToLower() == "face")
+                {
+                    _MFace = reader.Value;
+                }
+            }
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/TextMarkup/Heading.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/TextMarkup/Heading.cs
new file mode 100644
index 00000000..44c23494
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/TextMarkup/Heading.cs	
@@ -0,0 +1,89 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.Charts.TextMarkup
+{
+    internal class Heading: ContainerElement
+    {
+        #region Private Variables
+        private int m_Level = 1;
+        private Font m_OldFont = null;
+        #endregion
+
+        #region Internal Implementation
+        public Heading() { }
+        public Heading(int level)
+        {
+            m_Level = level;
+        }
+
+        public override void Measure(Size availableSize, MarkupDrawContext d)
+        {
+            SetFont(d);
+            base.Measure(availableSize, d);
+            if (m_OldFont != null)
+                d.CurrentFont = m_OldFont;
+        }
+
+        public override void Render(MarkupDrawContext d)
+        {
+            SetFont(d);
+            base.Render(d);
+            if (m_OldFont != null)
+                d.CurrentFont = m_OldFont;
+        }
+
+        protected virtual void SetFont(MarkupDrawContext d)
+        {
+            Font font = d.CurrentFont;
+            try
+            {
+                float size = d.CurrentFont.SizeInPoints;
+                if (m_Level == 1)
+                {
+                    size += 12;
+                }
+                else if (m_Level == 2)
+                {
+                    size += 8;
+                }
+                else if (m_Level == 3)
+                {
+                    size += 6;
+                }
+                else if (m_Level == 4)
+                {
+                    size += 4;
+                }
+                else if (m_Level == 5)
+                {
+                    size += 2;
+                }
+                else if (m_Level == 6)
+                {
+                    size += 1;
+                }
+
+                d.CurrentFont = new Font(d.CurrentFont.FontFamily, size, FontStyle.Bold);
+            }
+            catch
+            {
+                font = null;
+            }
+
+            if (font != null)
+                m_OldFont = font;
+        }
+
+        /// <summary>
+        /// Gets or sets heading level. Values from 1 to 6 are valid. Default is 1.
+        /// </summary>
+        public int Level
+        {
+            get { return m_Level; }
+            set { m_Level = value; }
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/TextMarkup/HyperLink.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/TextMarkup/HyperLink.cs
new file mode 100644
index 00000000..3400ebfd
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/TextMarkup/HyperLink.cs	
@@ -0,0 +1,215 @@
+using System;
+using System.Text;
+using System.Drawing;
+using System.Xml;
+using System.Windows.Forms;
+using System.Drawing.Drawing2D;
+
+namespace DevComponents.Charts.TextMarkup
+{
+    internal class HyperLink : MarkupElement, IActiveMarkupElement
+    {
+        #region Private Variables
+        private Color m_ForeColor = Color.Empty;
+        private Color m_OldForeColor = Color.Empty;
+        private string m_HRef = "";
+        private string m_Name = "";
+        private Cursor m_OldCursor = null;
+        private bool m_IsMouseOver = false;
+        private bool m_Visited = false;
+        #endregion
+
+        #region Internal Implementation
+        public override void Measure(Size availableSize, MarkupDrawContext d)
+        {
+            this.Bounds = Rectangle.Empty;
+            SetForeColor(d);
+        }
+
+        public override void Render(MarkupDrawContext d)
+        {
+            d.HyperLink = true;
+            d.HyperlinkStyle = GetHyperlinkStyle();
+            if (!d.HyperlinkStyle.BackColor.IsEmpty)
+            {
+                using (GraphicsPath gp = new GraphicsPath())
+                {
+                    MarkupElementCollection col = this.Parent.Elements;
+                    int start = col.IndexOf(this) + 1;
+                    for (int i = start; i < col.Count; i++)
+                    {
+                        MarkupElement elem = col[i];
+                        if (!elem.Visible) continue;
+                        if (elem is EndMarkupElement && ((EndMarkupElement)elem).StartElement == this)
+                            break;
+                        gp.AddRectangle(elem.RenderBounds);
+                    }
+
+                    using (SolidBrush brush = new SolidBrush(d.HyperlinkStyle.BackColor))
+                        d.Graphics.FillPath(brush, gp);
+                }
+            }
+            SetForeColor(d);
+        }
+
+        private HyperlinkStyle GetHyperlinkStyle()
+        {
+            if (m_IsMouseOver && MarkupSettings.MouseOverHyperlink.IsChanged)
+                return MarkupSettings.MouseOverHyperlink;
+            else if (m_Visited && MarkupSettings.VisitedHyperlink.IsChanged)
+                return MarkupSettings.VisitedHyperlink;
+
+            return MarkupSettings.NormalHyperlink;
+        }
+
+        protected virtual void SetForeColor(MarkupDrawContext d)
+        {
+            Color c = Color.Empty;
+            HyperlinkStyle style = GetHyperlinkStyle();
+            if (style != null && !style.TextColor.IsEmpty)
+                c = style.TextColor;
+
+            if (!m_ForeColor.IsEmpty)
+                c = m_ForeColor;
+            if (!c.IsEmpty)
+            {
+                m_OldForeColor = d.CurrentForeColor;
+                d.CurrentForeColor = c;
+            }
+        }
+
+        public override void RenderEnd(MarkupDrawContext d)
+        {
+            RestoreForeColor(d);
+            d.HyperLink = false;
+            d.HyperlinkStyle = null;
+            base.RenderEnd(d);
+        }
+
+        public override void MeasureEnd(Size availableSize, MarkupDrawContext d)
+        {
+            RestoreForeColor(d);
+            base.MeasureEnd(availableSize, d);
+        }
+
+        protected override void ArrangeCore(Rectangle finalRect, MarkupDrawContext d) { }
+
+        protected virtual void RestoreForeColor(MarkupDrawContext d)
+        {
+            if (!m_OldForeColor.IsEmpty)
+                d.CurrentForeColor = m_OldForeColor;
+            m_OldForeColor = Color.Empty;
+        }
+
+        public Color ForeColor
+        {
+            get { return m_ForeColor; }
+            set { m_ForeColor = value; }
+        }
+
+        public string HRef
+        {
+            get { return m_HRef; }
+            set { m_HRef = value; }
+        }
+
+        public string Name
+        {
+            get { return m_Name; }
+            set { m_Name = value; }
+        }
+
+        public override void ReadAttributes(XmlTextReader reader)
+        {
+            for (int i = 0; i < reader.AttributeCount; i++)
+            {
+                reader.MoveToAttribute(i);
+                if (reader.Name.ToLower() == "href")
+                {
+                    m_HRef = reader.Value;
+                }
+                else if (reader.Name.ToLower() == "name")
+                {
+                    m_Name = reader.Value;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Returns whether hyper-link contains specified coordinates.
+        /// </summary>
+        /// <param name="x"></param>
+        /// <param name="y"></param>
+        /// <returns></returns>
+        public bool HitTest(int x, int y)
+        {
+            if (this.Parent == null)
+                return false;
+
+            MarkupElementCollection col = this.Parent.Elements;
+            int start = col.IndexOf(this)+1;
+            for (int i = start; i < col.Count; i++)
+            {
+                MarkupElement el = col[i];
+                if (el is EndMarkupElement && ((EndMarkupElement)el).StartElement == this)
+                    break;
+
+                if (col[i].RenderBounds.Contains(x, y))
+                    return true;
+
+            }
+
+            return false;
+        }
+
+        public void MouseEnter(Control parent)
+        {
+            m_OldCursor = parent.Cursor;
+            parent.Cursor = Cursors.Hand;
+            m_IsMouseOver = true;
+            if (MarkupSettings.MouseOverHyperlink.IsChanged)
+            {
+                InvalidateElements(parent);
+            }
+        }
+
+        public void MouseLeave(Control parent)
+        {
+            if (m_OldCursor != null && parent!=null)
+                parent.Cursor = m_OldCursor;
+            m_OldCursor = null;
+            m_IsMouseOver = false;
+            if (MarkupSettings.MouseOverHyperlink.IsChanged)
+            {
+                InvalidateElements(parent);
+            }
+        }
+
+        public void MouseDown(Control parent, MouseEventArgs e) { }
+        public void MouseUp(Control parent, MouseEventArgs e) { }
+        public void Click(Control parent)
+        {
+            m_Visited = true;
+            if (MarkupSettings.VisitedHyperlink.IsChanged)
+            {
+                InvalidateElements(parent);
+            }
+        }
+
+        private void InvalidateElements(Control parent)
+        {
+            if (this.Parent == null) return;
+            MarkupElementCollection col = this.Parent.Elements;
+            int start = col.IndexOf(this) + 1;
+            for (int i = start; i < col.Count; i++)
+            {
+                MarkupElement elem = col[i];
+                if (!elem.Visible) continue;
+                if (elem is EndMarkupElement && ((EndMarkupElement)elem).StartElement == this)
+                    break;
+                parent.Invalidate(elem.RenderBounds);
+            }
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/TextMarkup/IActiveMarkupElement.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/TextMarkup/IActiveMarkupElement.cs
new file mode 100644
index 00000000..86405a41
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/TextMarkup/IActiveMarkupElement.cs	
@@ -0,0 +1,16 @@
+using System;
+using System.Text;
+using System.Windows.Forms;
+
+namespace DevComponents.Charts.TextMarkup
+{
+    internal interface IActiveMarkupElement
+    {
+        bool HitTest(int x, int y);
+        void MouseEnter(Control parent);
+        void MouseLeave(Control parent);
+        void MouseDown(Control parent, MouseEventArgs e);
+        void MouseUp(Control parent, MouseEventArgs e);
+        void Click(Control parent);
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/TextMarkup/ImageElement.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/TextMarkup/ImageElement.cs
new file mode 100644
index 00000000..ee064019
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/TextMarkup/ImageElement.cs	
@@ -0,0 +1,180 @@
+using System;
+using System.Text;
+using System.Drawing;
+using System.Xml;
+using System.Reflection;
+
+namespace DevComponents.Charts.TextMarkup
+{
+    internal class ImageElement : MarkupElement
+    {
+        #region Private Variables
+        private Size m_ImageSize = Size.Empty;
+        private string m_ImageSource = "";
+        private Image m_Image = null;
+        #endregion
+
+        #region Internal Implementation
+        public override void Measure(System.Drawing.Size availableSize, MarkupDrawContext d)
+        {
+            if (!m_ImageSize.IsEmpty)
+                this.Bounds = new Rectangle(Point.Empty, m_ImageSize);
+            else if (m_ImageSource.Length == 0)
+                this.Bounds = Rectangle.Empty;
+            else
+            {
+                Image img = this.GetImage();
+                if (img != null)
+                    this.Bounds = new Rectangle(Point.Empty, img.Size);
+                else
+                    this.Bounds = new Rectangle(Point.Empty, new Size(16,16));
+            }
+        }
+
+        public override bool IsBlockElement
+        {
+            get
+            {
+                return false;
+            }
+        }
+
+        private Image GetImage()
+        {
+            if (m_Image != null) return m_Image;
+            Assembly a = null;
+
+            // Load from format: ClassLibrary1/ClassLibrary1.MyImage.png or ClassLibrary1/global::ClassLibrary1.Resources.MyImage
+            if (m_ImageSource.IndexOf('/') >= 0)
+            {
+                string[] parts = m_ImageSource.Split('/');
+                a = Assembly.Load(parts[0]);
+                string ResourceName = parts[1];
+                if (a != null)
+                {
+                    m_Image = LoadImageGlobalResource(parts[1], a);
+                    if (m_Image == null)
+                        m_Image = LoadImageResource(parts[1], a);
+
+                    if (m_Image != null) return m_Image;
+                }
+            }
+
+            // Probe Executing Assembly
+            a = Assembly.GetExecutingAssembly();
+            m_Image = LoadImageGlobalResource(m_ImageSource, a);
+            if(m_Image==null)
+                m_Image = LoadImageResource(m_ImageSource, a);
+
+            // Probe Entry Assembly
+            if (m_Image == null)
+            {
+                a = Assembly.GetEntryAssembly();
+                m_Image = LoadImageGlobalResource(m_ImageSource, a);
+                if (m_Image == null)
+                    m_Image = LoadImageResource(m_ImageSource, a);
+            }
+
+            return m_Image;
+        }
+
+        private Image LoadImageGlobalResource(string imageSource, Assembly a)
+        {
+            Image img = null;
+#if FRAMEWORK20
+            if (imageSource.StartsWith("global::"))
+            {
+                string name = imageSource.Substring(8);
+                if (name.Length > 0)
+                {
+                    try
+                    {
+                        int i = name.LastIndexOf('.');
+                        string resName = name.Substring(0, i);
+                        name = name.Substring(i + 1);
+                        System.Resources.ResourceManager r = new System.Resources.ResourceManager(resName, a);
+                        object obj = r.GetObject(name);
+                        img = (Bitmap)obj;
+                    }
+                    catch
+                    {
+                        img = null;
+                    }
+                }
+            }
+#endif
+            return img;
+        }
+
+        private Image LoadImageResource(string imageSource, Assembly a)
+        {
+            Image img = null;
+            try
+            {
+                img = new Bitmap(a.GetManifestResourceStream(imageSource));
+            }
+            catch { }
+
+            return img;
+        }
+
+        public override void Render(MarkupDrawContext d)
+        {
+            Rectangle r = this.Bounds;
+            r.Offset(d.Offset);
+
+            if (!d.ClipRectangle.IsEmpty && !r.IntersectsWith(d.ClipRectangle))
+                return;
+
+            Image img = this.GetImage();
+            if (img != null)
+            {
+                Rectangle imageRect = r;
+                imageRect.Size = img.Size;
+                d.Graphics.DrawImage(img, imageRect);
+            }
+            else
+            {
+                using (SolidBrush brush = new SolidBrush(Color.White))
+                {
+                    d.Graphics.FillRectangle(brush, r);
+                }
+                using (Pen pen = new Pen(Color.DarkGray, 1))
+                {
+                    d.Graphics.DrawRectangle(pen, r);
+                    d.Graphics.DrawLine(pen, r.X, r.Y, r.Right, r.Bottom);
+                    d.Graphics.DrawLine(pen, r.Right, r.Y, r.X, r.Bottom);
+                }
+            }
+        }
+
+        protected override void ArrangeCore(System.Drawing.Rectangle finalRect, MarkupDrawContext d)  { }
+
+        public override void ReadAttributes(XmlTextReader reader)
+        {
+            m_ImageSize = Size.Empty;
+            m_ImageSource = "";
+            m_Image = null;
+
+            for (int i = 0; i < reader.AttributeCount; i++)
+            {
+                reader.MoveToAttribute(i);
+                if (reader.Name.ToLower() == "width")
+                {
+                    string s = reader.Value;
+                    m_ImageSize.Width = int.Parse(s);
+                }
+                else if (reader.Name.ToLower() == "height")
+                {
+                    string s = reader.Value;
+                    m_ImageSize.Height = int.Parse(s);
+                }
+                else if (reader.Name.ToLower() == "src")
+                {
+                    m_ImageSource = reader.Value;
+                }
+            }
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/TextMarkup/Italic.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/TextMarkup/Italic.cs
new file mode 100644
index 00000000..bf5af5ad
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/TextMarkup/Italic.cs	
@@ -0,0 +1,27 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.Charts.TextMarkup
+{
+    internal class Italic : FontChangeElement
+    {
+        #region Internal Implementation
+        protected override void SetFont(MarkupDrawContext d)
+        {
+            Font font = d.CurrentFont;
+            FontStyle style=font.Style | FontStyle.Italic;
+
+            if (!font.Italic && d.CurrentFont.FontFamily.IsStyleAvailable(style))
+                d.CurrentFont = new Font(font, style);
+            else
+                font = null;
+
+            if (font != null)
+                m_OldFont = font;
+
+            base.SetFont(d);
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/TextMarkup/MarkupDrawContext.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/TextMarkup/MarkupDrawContext.cs
new file mode 100644
index 00000000..ff3e0ef5
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/TextMarkup/MarkupDrawContext.cs	
@@ -0,0 +1,50 @@
+using System;
+using System.Drawing;
+using System.Text;
+
+namespace DevComponents.Charts.TextMarkup
+{
+    internal class MarkupDrawContext
+    {
+        public Graphics Graphics = null;
+        public Font CurrentFont = null;
+        public Color CurrentForeColor = SystemColors.ControlText;
+        public bool RightToLeft = false;
+        public Point Offset = Point.Empty;
+        public bool HyperLink = false;
+        public HyperlinkStyle HyperlinkStyle = null;
+        public bool Underline = false;
+        public Rectangle ClipRectangle = Rectangle.Empty;
+        public bool HotKeyPrefixVisible = false;
+        public object ContextObject = null;
+        public bool AllowMultiLine = true;
+        public bool IgnoreFormattingColors = false;
+        public bool StrikeOut;
+
+        public MarkupDrawContext(Graphics g, Font currentFont, Color currentForeColor, bool rightToLeft) : this(g, currentFont, currentForeColor, rightToLeft, Rectangle.Empty, false)
+        {
+        }
+
+        public MarkupDrawContext(Graphics g, Font currentFont, Color currentForeColor, bool rightToLeft, Rectangle clipRectangle, bool hotKeyPrefixVisible)
+        {
+            this.Graphics = g;
+            this.CurrentFont = currentFont;
+            this.CurrentForeColor  = currentForeColor;
+            this.RightToLeft = rightToLeft;
+            this.ClipRectangle = clipRectangle;
+            this.HotKeyPrefixVisible = hotKeyPrefixVisible;
+        }
+
+        public MarkupDrawContext(Graphics g, Font currentFont, Color currentForeColor, bool rightToLeft, Rectangle clipRectangle, bool hotKeyPrefixVisible, object contextObject)
+        {
+            this.Graphics = g;
+            this.CurrentFont = currentFont;
+            this.CurrentForeColor = currentForeColor;
+            this.RightToLeft = rightToLeft;
+            this.ClipRectangle = clipRectangle;
+            this.HotKeyPrefixVisible = hotKeyPrefixVisible;
+            this.ContextObject = contextObject;
+        }
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/TextMarkup/MarkupElement.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/TextMarkup/MarkupElement.cs
new file mode 100644
index 00000000..ce2f4dfc
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/TextMarkup/MarkupElement.cs	
@@ -0,0 +1,191 @@
+using DevComponents.UI.ContentManager;
+using System;
+using System.Drawing;
+using System.Text;
+using System.Xml;
+
+namespace DevComponents.Charts.TextMarkup
+{
+    internal abstract class MarkupElement : IBlockExtended
+    {
+        #region Private Variables
+        private MarkupElementCollection m_Elements = null;
+        private MarkupElement m_Parent = null;
+        private Rectangle m_Bounds = Rectangle.Empty;
+        private bool m_Visible = true;
+        private bool m_SizeValid = false;
+        private Rectangle m_RenderBounds = Rectangle.Empty;
+        #endregion
+
+        #region Internal Implementation
+        public MarkupElement()
+        {
+            m_Elements = new MarkupElementCollection(this);
+        }
+
+        /// <summary>
+        /// Returns whether markup element is an block element that always consumes a whole line in layout.
+        /// </summary>
+        public virtual bool IsBlockElement
+        {
+            get { return false; }
+        }
+
+        /// <summary>
+        /// Returns whether layout manager switches to new line after processing this element.
+        /// </summary>
+        public virtual bool IsNewLineAfterElement
+        {
+            get { return false; }
+        }
+
+        /// <summary>
+        /// Returns whether layout manager can start new line with this element.
+        /// </summary>
+        public virtual bool CanStartNewLine
+        {
+            get { return true; }
+        }
+
+        /// <summary>
+        /// Gets the collection of child elements if any for this markup element.
+        /// </summary>
+        public virtual MarkupElementCollection Elements
+        {
+            get
+            {
+                if (m_Elements == null)
+                    m_Elements = new MarkupElementCollection(this);
+                return m_Elements; 
+            }
+        }
+
+        internal void InvalidateElementsSize()
+        {
+            this.IsSizeValid = false;
+            if (m_Elements==null || m_Elements.Count == 0)
+                return;
+            foreach (MarkupElement e in m_Elements)
+            {
+                e.InvalidateElementsSize();
+                e.IsSizeValid = false;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether element size is valid. When size is not valid element Measure method will be called to validate size.
+        /// </summary>
+        public virtual bool IsSizeValid
+        {
+            get { return m_SizeValid; }
+            set { m_SizeValid = value; }
+        }
+
+        /// <summary>
+        /// Gets element parent or null if parent is not set.
+        /// </summary>
+        public virtual MarkupElement Parent
+        {
+            get { return m_Parent; }
+        }
+
+        internal void SetParent(MarkupElement parent)
+        {
+            m_Parent = parent;
+        }
+
+        /// <summary>
+        /// Gets or sets actual rendering bounds.
+        /// </summary>
+        public Rectangle Bounds
+        {
+            get { return m_Bounds; }
+            set { m_Bounds = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether markup element is visible.
+        /// </summary>
+        public bool Visible
+        {
+            get { return m_Visible; }
+            set { m_Visible = value; }
+        }
+
+        /// <summary>
+        /// Measures the element given available size.
+        /// </summary>
+        /// <param name="availableSize">Size available to element</param>
+        /// <param name="d">Reference to graphics object</param>
+        public abstract void Measure(Size availableSize, MarkupDrawContext d);
+
+        /// <summary>
+        /// Measures the end tag of an element. Most implementations do not need to do anything but implementations like the ones
+        /// that change color should return state back at this time.
+        /// </summary>
+        /// <param name="availableSize"></param>
+        /// <param name="d"></param>
+        public virtual void MeasureEnd(Size availableSize, MarkupDrawContext d) { }
+
+        /// <summary>
+        /// Renders element.
+        /// </summary>
+        /// <param name="d">Provides markup drawing context information.</param>
+        public abstract void Render(MarkupDrawContext d);
+
+        /// <summary>
+        /// Renders element tag end. Most implementations do not need to do anything but mplementations like the ones
+        /// that change color should return state back at this time.
+        /// </summary>
+        /// <param name="d">Provides markup drawing context information.</param>
+        public virtual void RenderEnd(MarkupDrawContext d) { }
+
+        /// <summary>
+        /// Provides final rectangle to element and lets it arrange it's content given new constraint.
+        /// </summary>
+        /// <param name="finalRect">Final rectangle.</param>
+        /// <param name="d"></param>
+        protected abstract void ArrangeCore(Rectangle finalRect, MarkupDrawContext d);
+
+        /// <summary>
+        /// Arranges the element given the final size. Layout is two step process with Measure followed by Arrange.
+        /// </summary>
+        /// <param name="finalSize"></param>
+        /// <param name="d"></param>
+        public void Arrange(Rectangle finalSize, MarkupDrawContext d)
+        {
+            this.ArrangeCore(finalSize, d);
+        }
+
+        public virtual void ReadAttributes(XmlTextReader reader) { }
+
+        /// <summary>
+        /// Gets or sets actual rendered bounds for a give markup element if applicable.
+        /// </summary>
+        public Rectangle RenderBounds
+        {
+            get { return m_RenderBounds; }
+            set { m_RenderBounds = value; }
+        }
+        #endregion
+
+
+        public bool IsBlockContainer
+        {
+            get { throw new NotImplementedException(); }
+        }
+
+
+        public DotNetBar.Padding Margin
+        {
+            get
+            {
+                throw new NotImplementedException();
+            }
+            set
+            {
+                throw new NotImplementedException();
+            }
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/TextMarkup/MarkupElementCollection.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/TextMarkup/MarkupElementCollection.cs
new file mode 100644
index 00000000..919e2941
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/TextMarkup/MarkupElementCollection.cs	
@@ -0,0 +1,133 @@
+using System;
+using System.Text;
+using System.Collections;
+
+namespace DevComponents.Charts.TextMarkup
+{
+    internal class MarkupElementCollection : CollectionBase
+    {
+        #region Private Variables
+        private MarkupElement m_Parent = null;
+        #endregion
+
+        #region Internal Implementation
+        /// <summary>Creates new instance of the class.</summary>
+        public MarkupElementCollection(MarkupElement parent)
+		{
+            m_Parent = parent;
+		}
+
+        /// <summary>
+        /// Gets or sets the collection parent element.
+        /// </summary>
+        public MarkupElement Parent
+        {
+            get { return m_Parent; }
+            set { m_Parent = value; }
+        }
+
+		/// <summary>
+		/// Adds new object to the collection.
+		/// </summary>
+		/// <param name="MarkupElement">Object to add.</param>
+		/// <returns>Index of newly added object.</returns>
+		public int Add(MarkupElement MarkupElement)
+		{
+			return List.Add(MarkupElement);
+		}
+		/// <summary>
+		/// Returns reference to the object in collection based on it's index.
+		/// </summary>
+		public MarkupElement this[int index]
+		{
+			get {return (MarkupElement)(List[index]);}
+			set {List[index] = value;}
+		}
+
+		/// <summary>
+		/// Inserts new object into the collection.
+		/// </summary>
+		/// <param name="index">Position of the object.</param>
+		/// <param name="value">Object to insert.</param>
+		public void Insert(int index, MarkupElement value) 
+		{
+			List.Insert(index, value);
+		}
+
+		/// <summary>
+		/// Returns index of the object inside of the collection.
+		/// </summary>
+		/// <param name="value">Reference to the object.</param>
+		/// <returns>Index of the object.</returns>
+		public int IndexOf(MarkupElement value) 
+		{
+			return List.IndexOf(value);
+		}
+
+		/// <summary>
+		/// Returns whether collection contains specified object.
+		/// </summary>
+		/// <param name="value">Object to look for.</param>
+		/// <returns>true if object is part of the collection, otherwise false.</returns>
+		public bool Contains(MarkupElement value) 
+		{
+			return List.Contains(value);
+		}
+
+		/// <summary>
+		/// Removes specified object from the collection.
+		/// </summary>
+		/// <param name="value"></param>
+		public void Remove(MarkupElement value) 
+		{
+			List.Remove(value);
+		}
+
+		protected override void OnRemoveComplete(int index,object value)
+		{
+			base.OnRemoveComplete(index,value);
+			MarkupElement me=value as MarkupElement;
+            if (m_Parent != null)
+            {
+                me.SetParent(null);
+                m_Parent.IsSizeValid = false;
+            }
+		}
+		protected override void OnInsertComplete(int index,object value)
+		{
+			base.OnInsertComplete(index,value);
+			MarkupElement me=value as MarkupElement;
+            if (m_Parent != null)
+            {
+                me.SetParent(m_Parent);
+                m_Parent.IsSizeValid = false;
+            }
+		}
+
+		/// <summary>
+		/// Copies collection into the specified array.
+		/// </summary>
+		/// <param name="array">Array to copy collection to.</param>
+		/// <param name="index">Starting index.</param>
+		public void CopyTo(MarkupElement[] array, int index) 
+		{
+			List.CopyTo(array, index);
+		}
+
+		/// <summary>
+		/// Copies contained items to the MarkupElement array.
+		/// </summary>
+		/// <param name="array">Array to copy to.</param>
+		internal void CopyTo(MarkupElement[] array)
+		{
+			List.CopyTo(array,0);
+		}
+
+		protected override void OnClear()
+		{
+			base.OnClear();
+		}
+
+		#endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/TextMarkup/MarkupLayoutManager.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/TextMarkup/MarkupLayoutManager.cs
new file mode 100644
index 00000000..7c8f578d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/TextMarkup/MarkupLayoutManager.cs	
@@ -0,0 +1,32 @@
+using System.Collections;
+using System.Drawing;
+using System.Text;
+
+namespace DevComponents.Charts.TextMarkup
+{
+    internal class MarkupLayoutManager : BlockLayoutManager
+    {
+        private MarkupDrawContext m_MarkupDrawContext = null;
+
+        public MarkupDrawContext MarkupDrawContext
+        {
+            get { return m_MarkupDrawContext; }
+            set { m_MarkupDrawContext = value; }
+        }
+
+        public override void Layout(IBlock block, Size availableSize)
+        {
+            if (block is MarkupElement)
+            {
+                MarkupElement m = block as MarkupElement;
+                if(!m.IsSizeValid)
+                    m.Measure(availableSize, m_MarkupDrawContext);
+            }
+        }
+
+        public override Rectangle FinalizeLayout(Rectangle containerBounds, Rectangle blocksBounds, ArrayList lines)
+        {
+            return (blocksBounds);
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/TextMarkup/MarkupParser.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/TextMarkup/MarkupParser.cs
new file mode 100644
index 00000000..17543ed1
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/TextMarkup/MarkupParser.cs	
@@ -0,0 +1,250 @@
+using System;
+using System.Text;
+using System.IO;
+using System.Xml;
+using System.Collections;
+using System.Text.RegularExpressions;
+
+namespace DevComponents.Charts.TextMarkup
+{
+    internal class MarkupParser
+    {
+        #region Private Variables
+        private static string TextElementName = "text";
+        private static string BodyTag = "body";
+        #endregion
+
+        #region Internal Implementation
+        public static BodyElement Parse(string text)
+        {
+            StringBuilder plainText = new StringBuilder(text.Length);
+            BodyElement root = new BodyElement();
+            root.HasExpandElement = false;
+            MarkupElement currentParent = root;
+            Stack openTags = new Stack();
+            openTags.Push(root);
+            // Input text is not wrapped into the container tag so we wrap it here
+            text = text.Replace("&nbsp;", "{ent_nbsp}");
+            text = text.Replace("&zwsp;", "{ent_zwsp}");
+            text = text.Replace("&lt;", "{ent_lt}");
+            text = text.Replace("&gt;", "{ent_gt}");
+            text = text.Replace("&amp;", "{ent_amp}");
+            text = text.Replace("|", "{ent_l}");
+            text = text.Replace("&", "|");
+            text = text.Replace("{ent_nbsp}", "&nbsp;");
+            text = text.Replace("{ent_zwsp}", "&zwsp;"); 
+            text = text.Replace("{ent_lt}", "&lt;");
+            text = text.Replace("{ent_gt}", "&gt;");
+            StringReader sr = new StringReader("<"+BodyTag+">" + text + "</"+BodyTag+">");
+#if !DEBUG
+            try
+#endif
+            {
+                XmlTextReader reader = new XmlTextReader(sr);
+                //reader.EntityHandling = EntityHandling.ExpandCharEntities;
+                while (reader.Read())
+                {
+                    if (reader.NodeType == XmlNodeType.Element)
+                    {
+                        if (reader.Name == BodyTag)
+                            continue;
+                        MarkupElement el = CreateMarkupElement(reader.Name);
+                        if (el == null)
+                        {
+                            reader.Skip();
+                            continue;
+                        }
+                        else if (el is ExpandElement)
+                            root.HasExpandElement = true;
+
+                        if (el is IActiveMarkupElement)
+                            root.ActiveElements.Add(el);
+
+                        // Parse any attributes here
+                        if (reader.AttributeCount > 0)
+                        {
+                            el.ReadAttributes(reader);
+                            reader.MoveToElement();
+                        }
+
+                        currentParent.Elements.Add(el);
+
+                        if (el is ContainerElement)
+                            currentParent = el;
+
+                        if (!reader.IsEmptyElement)
+                            openTags.Push(el);
+                    }
+                    else if (reader.NodeType == XmlNodeType.Text)
+                    {
+                        if (reader.Value.Length == 1)
+                        {
+                            TextElement el = CreateMarkupElement(TextElementName) as TextElement;
+                            if (reader.Value == " ")
+                            {
+                                el.TrailingSpace = true;
+                                plainText.Append(' ');
+                            }
+                            else
+                            {
+                                el.Text = reader.Value;
+                                el.Text = el.Text.Replace("|", "&");
+                                el.Text = el.Text.Replace("{ent_l}", "|");
+                                el.Text = el.Text.Replace("{ent_amp}", "&&");
+                                plainText.Append(el.Text+" ");
+                            }
+                            currentParent.Elements.Add(el);
+                        }
+                        else
+                        {
+                            string s = reader.Value;
+                            if (s.StartsWith("\r\n"))
+                                s = s.TrimStart(new char[] { '\r', '\n' });
+                            s = s.Replace("\r\n", " ");
+                            string[] words = s.Split(' ');
+                            bool space = false;
+                            if (currentParent.Elements.Count > 0 && currentParent.Elements[currentParent.Elements.Count - 1] is NewLine)
+                                space = true;
+                            for (int i = 0; i < words.Length; i++)
+                            {
+                                if (words[i].Length == 0)
+                                {
+                                    if (space)
+                                        continue;
+                                    space = true;
+                                }
+                                else
+                                    space = false;
+
+                                TextElement el = CreateMarkupElement(TextElementName) as TextElement;
+                                el.Text = words[i].Replace("|","&");
+                                el.Text = el.Text.Replace("{ent_l}", "|");
+                                el.Text = el.Text.Replace("{ent_amp}", "&&");
+                                plainText.Append(el.Text + " ");
+                                if (i < words.Length - 1)
+                                {
+                                    el.TrailingSpace = true;
+                                    space = true;
+                                }
+
+                                currentParent.Elements.Add(el);
+                            }
+                        }
+                    }
+                    else if (reader.NodeType == XmlNodeType.Whitespace)
+                    {
+                        if (reader.Value.IndexOf(' ') >= 0)
+                        {
+                            TextElement el = CreateMarkupElement(TextElementName) as TextElement;
+                            el.TrailingSpace = true;
+                            currentParent.Elements.Add(el);
+                        }
+                    }
+                    else if (reader.NodeType == XmlNodeType.EntityReference)
+                    {
+                        TextElement el = CreateMarkupElement(TextElementName) as TextElement;
+                        if (reader.Name == "nbsp")
+                        {
+                            el.TrailingSpace = true;
+                        }
+                        else if (reader.Name == "zwsp")
+                        {
+                            el.TrailingSpace = false;
+                        }
+                        else
+                            el.Text = reader.Name;
+                        el.EnablePrefixHandling = false;
+                        currentParent.Elements.Add(el);
+                    }
+                    else if (reader.NodeType == XmlNodeType.EndElement)
+                    {
+                        MarkupElement el = openTags.Pop() as MarkupElement;
+                        if (el != currentParent)
+                        {
+                            currentParent.Elements.Add(new EndMarkupElement(el));
+                        }
+                        else
+                        {
+                            if (currentParent != root)
+                                currentParent = currentParent.Parent;
+                        }
+                    }
+                }
+            }
+#if !DEBUG
+            catch
+            {
+                return null;
+            }
+#endif
+            root.PlainText = plainText.ToString();
+            return root;
+        }
+
+        public static MarkupElement CreateMarkupElement(string elementName)
+        {
+            if (elementName == "b" || elementName == "strong")
+                return new Strong();
+            else if (elementName == "i" || elementName == "em")
+                return new Italic();
+            else if (elementName == "u")
+                return new Underline();
+            else if (elementName == "br")
+                return new NewLine();
+            else if (elementName == "expand")
+                return new ExpandElement();
+            else if (elementName == "a")
+                return new HyperLink();
+            else if (elementName == "p")
+                return new Paragraph();
+            else if (elementName == "div")
+                return new Div();
+            else if (elementName == "span")
+                return new Span();
+            else if (elementName == "img")
+                return new ImageElement();
+            else if (elementName == "h1")
+                return new Heading();
+            else if (elementName == "h2")
+                return new Heading(2);
+            else if (elementName == "h3")
+                return new Heading(3);
+            else if (elementName == "h4")
+                return new Heading(4);
+            else if (elementName == "h5")
+                return new Heading(5);
+            else if (elementName == "h6")
+                return new Heading(6);
+            else if (elementName == "font")
+                return new FontElement();
+            else if (elementName == "s" || elementName == "strike")
+                return new Strike();
+            else if (elementName == TextElementName)
+                return new TextElement();
+
+            return null;
+        }
+
+        /// <summary>
+        /// Tests whether input text could be markup text.
+        /// </summary>
+        /// <param name="text">Text to test.</param>
+        /// <returns>true if text could be markup, otherwise false</returns>
+        public static bool IsMarkup(string text)
+        {
+            if (string.IsNullOrEmpty(text) ||
+                (text.IndexOf("</") < 0 && text.IndexOf("/>") < 0))
+            {
+                return false;
+            }
+
+            return true;
+        }
+
+        internal static string RemoveExpand(string text)
+        {
+            return Regex.Replace(text, "<expand.*?>", "", RegexOptions.IgnoreCase);
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/TextMarkup/MarkupSettings.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/TextMarkup/MarkupSettings.cs
new file mode 100644
index 00000000..5254bef2
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/TextMarkup/MarkupSettings.cs	
@@ -0,0 +1,150 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.Charts.TextMarkup
+{
+    /// <summary>
+    /// Holds text-markup related settings.
+    /// </summary>
+    public static class MarkupSettings
+    {
+        private static HyperlinkStyle _NormalHyperlink = new HyperlinkStyle(Color.Blue, eHyperlinkUnderlineStyle.SolidLine);
+        /// <summary>
+        /// Gets the style of the hyperlink in its default state.
+        /// </summary>
+        public static HyperlinkStyle NormalHyperlink
+        {
+            get { return _NormalHyperlink; }
+        }
+
+        private static HyperlinkStyle _MouseOverHyperlink = new HyperlinkStyle();
+        /// <summary>
+        /// Gets the style of the hyperlink when mouse is over the link.
+        /// </summary>
+        public static HyperlinkStyle MouseOverHyperlink
+        {
+            get { return _MouseOverHyperlink; }
+        }
+
+        private static HyperlinkStyle _VisitedHyperlink = new HyperlinkStyle();
+        /// <summary>
+        /// Gets the style of the visited hyperlink.
+        /// </summary>
+        public static HyperlinkStyle VisitedHyperlink
+        {
+            get { return _VisitedHyperlink; }
+        }
+    }
+
+    /// <summary>
+    /// Defines the text-markup hyperlink appearance style.
+    /// </summary>
+    public class HyperlinkStyle
+    {
+        /// <summary>
+        /// Initializes a new instance of the HyperlinkStyle class.
+        /// </summary>
+        public HyperlinkStyle()
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the HyperlinkStyle class.
+        /// </summary>
+        /// <param name="textColor"></param>
+        /// <param name="underlineStyle"></param>
+        public HyperlinkStyle(Color textColor, eHyperlinkUnderlineStyle underlineStyle)
+        {
+            _TextColor = textColor;
+            _UnderlineStyle = underlineStyle;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the HyperlinkStyle class.
+        /// </summary>
+        /// <param name="textColor"></param>
+        /// <param name="backColor"></param>
+        /// <param name="underlineStyle"></param>
+        public HyperlinkStyle(Color textColor, Color backColor, eHyperlinkUnderlineStyle underlineStyle)
+        {
+            _TextColor = textColor;
+            _BackColor = backColor;
+            _UnderlineStyle = underlineStyle;
+        }
+        private Color _TextColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets hyperlink text color.
+        /// </summary>
+        public Color TextColor
+        {
+            get { return _TextColor; }
+            set
+            {
+                if (_TextColor != value)
+                {
+                    _TextColor = value;
+                }
+            }
+        }
+
+        private Color _BackColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets hyperlink back color.
+        /// </summary>
+        public Color BackColor
+        {
+            get { return _BackColor; }
+            set
+            {
+                if (_BackColor != value)
+                {
+                    _BackColor = value;
+                }
+            }
+        }
+
+        private eHyperlinkUnderlineStyle _UnderlineStyle = eHyperlinkUnderlineStyle.None;
+        /// <summary>
+        /// Gets or sets the underline style for the hyperlink.
+        /// </summary>
+        public eHyperlinkUnderlineStyle UnderlineStyle
+        {
+            get { return _UnderlineStyle; }
+            set
+            {
+                if (_UnderlineStyle != value)
+                {
+                    _UnderlineStyle = value;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether style has been changed from its default state.
+        /// </summary>
+        public bool IsChanged
+        {
+            get { return !_TextColor.IsEmpty || !_BackColor.IsEmpty || _UnderlineStyle != eHyperlinkUnderlineStyle.None; }
+        }
+    }
+
+    /// <summary>
+    /// Defines hyperlink styles.
+    /// </summary>
+    public enum eHyperlinkUnderlineStyle
+    {
+        /// <summary>
+        /// Hyper links are not marked.
+        /// </summary>
+        None,
+        /// <summary>
+        /// Hyper links are underlined using solid line.
+        /// </summary>
+        SolidLine,
+        /// <summary>
+        /// Hyper links are underlined using dashed line.
+        /// </summary>
+        DashedLine
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/TextMarkup/NewLine.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/TextMarkup/NewLine.cs
new file mode 100644
index 00000000..e1ec3e91
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/TextMarkup/NewLine.cs	
@@ -0,0 +1,39 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.Charts.TextMarkup
+{
+    internal class NewLine : MarkupElement
+    {
+        #region Internal Implementation
+        public override void Measure(System.Drawing.Size availableSize, MarkupDrawContext d)
+        {
+            // Causes layout manager to switch to the new line
+            this.Bounds = new Rectangle(0, 0, 0, d.CurrentFont.Height);
+        }
+
+        /// <summary>
+        /// Gets or sets whether element size is valid. When size is not valid element Measure method will be called to validate size.
+        /// </summary>
+        public override bool IsSizeValid
+        {
+            get { return false; }
+            set {  }
+        }
+
+        public override void Render(MarkupDrawContext d) {}
+
+        protected override void ArrangeCore(System.Drawing.Rectangle finalRect, MarkupDrawContext d) { }
+
+        /// <summary>
+        /// Returns whether layout manager switches to new line after processing this element.
+        /// </summary>
+        public override bool IsNewLineAfterElement
+        {
+            get { return true; }
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/TextMarkup/Paragraph.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/TextMarkup/Paragraph.cs
new file mode 100644
index 00000000..af8b16d3
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/TextMarkup/Paragraph.cs	
@@ -0,0 +1,20 @@
+using System;
+using System.Text;
+using System.Drawing;
+using System.Xml;
+
+namespace DevComponents.Charts.TextMarkup
+{
+    internal class Paragraph : Div
+    {
+        #region Internal Implementation
+        protected override void ArrangeInternal(Rectangle bounds, MarkupDrawContext d)
+        {
+            base.ArrangeInternal(bounds, d);
+            this.Bounds = new Rectangle(this.Bounds.X, this.Bounds.Y, this.Bounds.Width , this.Bounds.Height + d.CurrentFont.Height);
+        }
+        #endregion
+    }
+
+    
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/TextMarkup/Span.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/TextMarkup/Span.cs
new file mode 100644
index 00000000..98e6266d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/TextMarkup/Span.cs	
@@ -0,0 +1,16 @@
+using System;
+using System.Text;
+
+namespace DevComponents.Charts.TextMarkup
+{
+    internal class Span : Div
+    {
+        /// <summary>
+        /// Returns whether markup element is an block element that always consumes a whole line in layout.
+        /// </summary>
+        public override bool IsBlockElement
+        {
+            get { return false; }
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/TextMarkup/Strike.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/TextMarkup/Strike.cs
new file mode 100644
index 00000000..0e2af6af
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/TextMarkup/Strike.cs	
@@ -0,0 +1,28 @@
+using System.Drawing;
+
+namespace DevComponents.Charts.TextMarkup
+{
+    internal class Strike : MarkupElement
+    {
+        public override void Measure(Size availableSize, MarkupDrawContext d)
+        {
+            Bounds = Rectangle.Empty;
+        }
+
+        public override void Render(MarkupDrawContext d)
+        {
+            d.StrikeOut = true;
+        }
+
+        public override void RenderEnd(MarkupDrawContext d)
+        {
+            d.StrikeOut = false;
+
+            base.RenderEnd(d);
+        }
+
+        protected override void ArrangeCore(Rectangle finalRect, MarkupDrawContext d)
+        {
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/TextMarkup/Strong.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/TextMarkup/Strong.cs
new file mode 100644
index 00000000..902e8d83
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/TextMarkup/Strong.cs	
@@ -0,0 +1,27 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.Charts.TextMarkup
+{
+    internal class Strong : FontChangeElement
+    {
+        #region Internal Implementation
+        protected override void SetFont(MarkupDrawContext d)
+        {
+            Font font = d.CurrentFont;
+            FontStyle style = d.CurrentFont.Style | FontStyle.Bold;
+
+            if (!font.Bold && font.FontFamily.IsStyleAvailable(style))
+                d.CurrentFont = new Font(d.CurrentFont, style);
+            else
+                font = null;
+
+            if (font != null)
+                m_OldFont = font;
+
+            base.SetFont(d);
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/TextMarkup/TextElement.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/TextMarkup/TextElement.cs
new file mode 100644
index 00000000..18469c8a
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/TextMarkup/TextElement.cs	
@@ -0,0 +1,223 @@
+using DevComponents.DotNetBar.Charts;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+
+namespace DevComponents.Charts.TextMarkup
+{
+    internal class TextElement : MarkupElement
+    {
+        private static bool PadText;
+        static TextElement()
+        {
+            string lc = System.Windows.Forms.Application.CurrentCulture.TwoLetterISOLanguageName;
+            if (lc == "ja")
+                PadText = true;
+        }
+        #region Private Variables
+        private string m_Text = "";
+        private bool m_TrailingSpace;
+        private bool m_EnablePrefixHandling = true;
+        #endregion
+
+        #region Internal Implementation
+        public override void Measure(System.Drawing.Size availableSize, MarkupDrawContext d)
+        {
+#if (FRAMEWORK20)
+            if (BarUtilities.UseTextRenderer)
+            {
+                eTextFormat format = eTextFormat.Default | eTextFormat.NoPadding;
+                if (!d.HotKeyPrefixVisible || m_EnablePrefixHandling)
+                    format |= eTextFormat.HidePrefix;
+                Size size = Size.Empty;
+                if (m_TrailingSpace)
+                {
+                    if (d.CurrentFont.Italic)
+                    {
+                        size = Size.Ceiling(TextDrawing.MeasureString(d.Graphics, m_Text, d.CurrentFont, 0, format));
+                        size.Width += (int)(d.Graphics.MeasureString("||", d.CurrentFont).Width / 4);
+                    }
+                    else
+                        size = Size.Ceiling(TextDrawing.MeasureString(d.Graphics, m_Text + (BarFunctions.IsVista && m_Text.Length > 0 ? "|" : "||"), d.CurrentFont, 0, format));
+                }
+                else
+                    size = Size.Ceiling(TextDrawing.MeasureString(d.Graphics, m_Text, d.CurrentFont, 0, format));
+                if (PadText)
+                {
+                    size.Width += BarUtilities.TextMarkupCultureSpecificPadding;
+                    size.Height += BarUtilities.TextMarkupCultureSpecificPadding;
+                }
+                this.Bounds = new Rectangle(Point.Empty, size);
+            }
+            else
+#endif
+            {
+                using (StringFormat format = new StringFormat(StringFormat.GenericTypographic))
+                {
+                    format.FormatFlags = StringFormatFlags.NoWrap;
+                    if (d.HotKeyPrefixVisible || !m_EnablePrefixHandling)
+                        format.HotkeyPrefix = System.Drawing.Text.HotkeyPrefix.Show;
+                    else
+                        format.HotkeyPrefix = System.Drawing.Text.HotkeyPrefix.Hide;
+
+                    if (m_TrailingSpace)
+                    {
+                        if (d.CurrentFont.Italic)
+                        {
+                            Size size = Size.Ceiling(d.Graphics.MeasureString(m_Text, d.CurrentFont, 0, format));
+                            size.Width += (int)(d.Graphics.MeasureString("|", d.CurrentFont).Width / 4);
+                            if (PadText)
+                            {
+                                size.Width += TextHelper.TextMarkupCultureSpecificPadding;
+                                size.Height += TextHelper.TextMarkupCultureSpecificPadding;
+                            }
+                            this.Bounds = new Rectangle(Point.Empty, size);
+                        }
+                        else
+                        {
+                            Size size = Size.Ceiling(d.Graphics.MeasureString(m_Text + "|", d.CurrentFont, 0, format));
+                            if (PadText)
+                            {
+                                size.Width += TextHelper.TextMarkupCultureSpecificPadding;
+                                size.Height += TextHelper.TextMarkupCultureSpecificPadding;
+                            }
+                            this.Bounds = new Rectangle(Point.Empty, size);
+                        }
+                    }
+                    else
+                    {
+                        Size size = Size.Ceiling(d.Graphics.MeasureString(m_Text, d.CurrentFont, 0, format));
+                        if (PadText)
+                        {
+                            size.Width += TextHelper.TextMarkupCultureSpecificPadding;
+                            size.Height += TextHelper.TextMarkupCultureSpecificPadding;
+                        }
+                        this.Bounds = new Rectangle(Point.Empty, size);
+                    }
+                }
+            }
+            IsSizeValid = true;
+        }
+
+        public override void Render(MarkupDrawContext d)
+        {
+            Rectangle r = this.Bounds;
+            r.Offset(d.Offset);
+
+            if (!d.ClipRectangle.IsEmpty && !r.IntersectsWith(d.ClipRectangle))
+                return;
+
+            Graphics g = d.Graphics;
+            #if (FRAMEWORK20)
+            if (BarUtilities.UseTextRenderer)
+            {
+                eTextFormat format = eTextFormat.Default | eTextFormat.NoClipping | eTextFormat.NoPadding;
+                if (d.RightToLeft) format |= eTextFormat.RightToLeft;
+                if (!d.HotKeyPrefixVisible)
+                    format |= eTextFormat.HidePrefix;
+
+                if (!d.ClipRectangle.IsEmpty && r.Right > d.ClipRectangle.Right)
+                {
+                    format|= eTextFormat.EndEllipsis;
+                    r.Width -= (r.Right - d.ClipRectangle.Right);
+                }
+                TextDrawing.DrawString(g, m_Text, d.CurrentFont, d.CurrentForeColor, r, format);
+                
+            }
+            else
+            #endif
+            {
+                using (StringFormat format = new StringFormat(StringFormat.GenericTypographic))
+                {
+                    format.FormatFlags |= StringFormatFlags.NoWrap;
+
+                    if (d.RightToLeft) 
+                        format.FormatFlags |= StringFormatFlags.DirectionRightToLeft;
+
+                    if (d.HotKeyPrefixVisible)
+                        format.HotkeyPrefix = System.Drawing.Text.HotkeyPrefix.Show;
+                    else
+                        format.HotkeyPrefix = System.Drawing.Text.HotkeyPrefix.Hide;
+
+                    if (!d.ClipRectangle.IsEmpty && r.Right > d.ClipRectangle.Right)
+                    {
+                        format.Trimming = StringTrimming.EllipsisCharacter;
+                        r.Width -= (r.Right - d.ClipRectangle.Right);
+                    }
+
+                    // LineLimit causes problems with rotated text
+
+                    format.FormatFlags &= ~StringFormatFlags.LineLimit;
+
+                    using (SolidBrush brush = new SolidBrush(d.CurrentForeColor))
+                        g.DrawString(m_Text, d.CurrentFont, brush, r, format);
+                }
+            }
+
+            if (d.StrikeOut == true)
+            {
+                // StrikeOut
+
+                float descent = d.CurrentFont.FontFamily.GetCellDescent(d.CurrentFont.Style) *
+                    d.CurrentFont.Size / d.CurrentFont.FontFamily.GetEmHeight(d.CurrentFont.Style) + 1;
+
+                using (Pen pen = new Pen(d.CurrentForeColor, 1))
+                {
+                    SmoothingMode sm = g.SmoothingMode;
+                    g.SmoothingMode = SmoothingMode.Default;
+
+                    float y = r.Top + (r.Height + descent) / 2;
+
+                    g.DrawLine(pen, r.X, y, r.Right - 1, y);
+                    g.SmoothingMode = sm;
+                }
+            }
+
+            if ((d.HyperLink && (d.HyperlinkStyle == null || d.HyperlinkStyle.UnderlineStyle != eHyperlinkUnderlineStyle.None)) || d.Underline)
+            {
+                // Underline Hyperlink
+                float descent = d.CurrentFont.FontFamily.GetCellDescent(d.CurrentFont.Style) * d.CurrentFont.Size / d.CurrentFont.FontFamily.GetEmHeight(d.CurrentFont.Style);
+                using (Pen pen = new Pen(d.CurrentForeColor, 1))
+                {
+                    if (d.HyperLink && d.HyperlinkStyle != null && d.HyperlinkStyle.UnderlineStyle == eHyperlinkUnderlineStyle.DashedLine)
+                        pen.DashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
+                    descent -= 1;
+                    System.Drawing.Drawing2D.SmoothingMode sm = g.SmoothingMode;
+                    g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.Default;
+                    g.DrawLine(pen, r.X, r.Bottom - descent, r.Right - 1, r.Bottom - descent);
+                    g.SmoothingMode = sm;
+                }
+            }
+
+            this.RenderBounds = r;
+        }
+
+        protected override void ArrangeCore(System.Drawing.Rectangle finalRect, MarkupDrawContext d) {}
+
+        public string Text
+        {
+            get { return m_Text; }
+            set
+            {
+                m_Text = value;
+                this.IsSizeValid = false;
+            }
+        }
+
+        public bool TrailingSpace
+        {
+            get { return m_TrailingSpace; }
+            set
+            {
+                m_TrailingSpace = value;
+                this.IsSizeValid = false;
+            }
+        }
+
+        public bool EnablePrefixHandling
+        {
+            get { return m_EnablePrefixHandling; }
+            set { m_EnablePrefixHandling = value; }
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/TextMarkup/Underline.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/TextMarkup/Underline.cs
new file mode 100644
index 00000000..23e86052
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/TextMarkup/Underline.cs	
@@ -0,0 +1,40 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.Charts.TextMarkup
+{
+    internal class Underline : FontChangeElement
+    {
+        #region Internal Implementation
+        protected override void SetFont(MarkupDrawContext d)
+        {
+            d.Underline = true;
+            //Font font = d.CurrentFont;
+            //FontStyle style = d.CurrentFont.Style | FontStyle.Underline;
+
+            //if (!font.Underline && font.FontFamily.IsStyleAvailable(style))
+            //    d.CurrentFont = new Font(font, style);
+            //else
+            //    font = null;
+
+            //if (font != null)
+            //    m_OldFont = font;
+
+            base.SetFont(d);
+        }
+
+        public override void MeasureEnd(Size availableSize, MarkupDrawContext d)
+        {
+            d.Underline = false;
+            base.MeasureEnd(availableSize, d);
+        }
+
+        public override void RenderEnd(MarkupDrawContext d)
+        {
+            d.Underline = false;
+            base.RenderEnd(d);
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/VisualStyles/MetroStyleFactory.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/VisualStyles/MetroStyleFactory.cs
new file mode 100644
index 00000000..2dfd8081
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/VisualStyles/MetroStyleFactory.cs	
@@ -0,0 +1,49 @@
+using System.Drawing;
+using DevComponents.DotNetBar.Metro.ColorTables;
+using DevComponents.DotNetBar.Metro.Rendering;
+using DevComponents.DotNetBar.Rendering;
+
+namespace DevComponents.DotNetBar.Charts.Style
+{
+    /// <summary>
+    /// Create the Metro Visual Style for ChartControl.
+    /// </summary>
+    public class MetroStyleFactory : VisualStyleFactory
+    {
+        private MetroPartColors _MetroPartColors;
+
+        /// <summary>
+        /// Initializes a new instance of the MetroStyleFactory class.
+        /// </summary>
+        public MetroStyleFactory()
+        {
+            _MetroPartColors = MetroRender.GetColorTable().MetroPartColors;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the MetroStyleFactory class.
+        /// </summary>
+        /// <param name="metroPartColors">Metro Part Colors to Initialize Style with.</param>
+        public MetroStyleFactory(MetroPartColors metroPartColors)
+        {
+            _MetroPartColors = metroPartColors;
+
+            if (metroPartColors == null)
+                _MetroPartColors = MetroRender.GetColorTable().MetroPartColors;
+        }
+
+        /// <summary>
+        /// Create the DefaultVisualStyle for ChartControl.
+        /// </summary>
+        /// <param name="factory">Color-Factory used to generate colors.</param>
+        /// <returns>New instance of DefaultVisualStyles class.</returns>s
+        public override DefaultVisualStyles CreateStyle(ColorFactory factory)
+        {
+            DefaultVisualStyles visualStyle = new DefaultVisualStyles();
+
+            // TODO: Add int code
+
+            return (visualStyle);
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/VisualStyles/Office2010BlackStyleFactory.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/VisualStyles/Office2010BlackStyleFactory.cs
new file mode 100644
index 00000000..ae962116
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/VisualStyles/Office2010BlackStyleFactory.cs	
@@ -0,0 +1,23 @@
+using System.Drawing;
+using DevComponents.DotNetBar.Rendering;
+
+namespace DevComponents.DotNetBar.Charts.Style
+{
+    ///<summary>
+    /// Office2010BlackStyleFactory
+    ///</summary>
+    public class Office2010BlackStyleFactory : VisualStyleFactory
+    {
+        /// <summary>
+        /// Create the DefaultVisualStyle for the ChartControl.
+        /// </summary>
+        /// <param name="factory">Color-Factory used to generate colors.</param>
+        /// <returns>New instance of DefaultVisualStyles class.</returns>s
+        public override DefaultVisualStyles CreateStyle(ColorFactory factory)
+        {
+            DefaultVisualStyles visualStyle = new DefaultVisualStyles();
+
+            return (visualStyle);
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/VisualStyles/Office2010BlueStyleFactory.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/VisualStyles/Office2010BlueStyleFactory.cs
new file mode 100644
index 00000000..69cdee91
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/VisualStyles/Office2010BlueStyleFactory.cs	
@@ -0,0 +1,23 @@
+using System.Drawing;
+using DevComponents.DotNetBar.Rendering;
+
+namespace DevComponents.DotNetBar.Charts.Style
+{
+    /// <summary>
+    /// Create the Office 2010 Blue Visual Style for the ChartControl.
+    /// </summary>
+    public class Office2010BlueStyleFactory : VisualStyleFactory
+    {
+        /// <summary>
+        /// Create the DefaultVisualStyle for the ChartControl.
+        /// </summary>
+        /// <param name="factory">Color-Factory used to generate colors.</param>
+        /// <returns>New instance of DefaultVisualStyles class.</returns>s
+        public override DefaultVisualStyles CreateStyle(ColorFactory factory)
+        {
+            DefaultVisualStyles visualStyle = new DefaultVisualStyles();
+
+            return (visualStyle);
+        } 
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/VisualStyles/Office2010SilverStyleFactory.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/VisualStyles/Office2010SilverStyleFactory.cs
new file mode 100644
index 00000000..4d0cbda5
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/VisualStyles/Office2010SilverStyleFactory.cs	
@@ -0,0 +1,23 @@
+using System.Drawing;
+using DevComponents.DotNetBar.Rendering;
+
+namespace DevComponents.DotNetBar.Charts.Style
+{
+    /// <summary>
+    /// Create the Office 2010 Silver Visual Style for the ChartControl.
+    /// </summary>
+    public class Office2010SilverStyleFactory : VisualStyleFactory
+    {
+        /// <summary>
+        /// Create the DefaultVisualStyle for the ChartControl.
+        /// </summary>
+        /// <param name="factory">Color-Factory used to generate colors.</param>
+        /// <returns>New instance of DefaultVisualStyles class.</returns>s
+        public override DefaultVisualStyles CreateStyle(ColorFactory factory)
+        {
+            DefaultVisualStyles visualStyle = new DefaultVisualStyles();
+
+            return (visualStyle);
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/VisualStyles/VisualStyleFactory.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/VisualStyles/VisualStyleFactory.cs
new file mode 100644
index 00000000..61869cf1
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/VisualStyles/VisualStyleFactory.cs	
@@ -0,0 +1,52 @@
+using System;
+
+namespace DevComponents.DotNetBar.Charts.Style
+{
+    /// <summary>
+    /// Represents base class that each visual style factory for the ChartControl inherits from.
+    /// </summary>
+    public abstract class VisualStyleFactory
+    {
+        /// <summary>
+        /// Create the DefaultVisualStyle for the ChartControl.
+        /// </summary>
+        /// <param name="factory">Color-Factory used to generate colors.</param>
+        /// <returns>New instance of DefaultVisualStyles class.</returns>
+        public abstract DefaultVisualStyles CreateStyle(Rendering.ColorFactory factory);
+
+        /// <summary>
+        /// Create the DefaultVisualStyle for the ChartControl with empty color factory.
+        /// </summary>
+        /// <returns>New instance of DefaultVisualStyles class.</returns>
+        public virtual DefaultVisualStyles CreateStyle()
+        {
+            if (StyleManager.ColorTint.IsEmpty)
+                return CreateStyle(Rendering.ColorFactory.Empty);
+
+            return CreateStyle(new Rendering.ColorBlendFactory(StyleManager.ColorTint));
+        }
+
+        /// <summary>
+        /// Returns the style factory for specified visual style.
+        /// </summary>
+        /// <param name="style">Style to create factory for.</param>
+        /// <returns>An instance of VisualStyleFactory.</returns>
+        public static VisualStyleFactory GetStyleFactory(ChartControlStyle style)
+        {
+            if (style == ChartControlStyle.Office2010Blue)
+                return new Office2010BlueStyleFactory();
+
+            if (style == ChartControlStyle.Office2010Silver)
+                return new Office2010SilverStyleFactory();
+
+            if (style == ChartControlStyle.Office2010Black)
+                return new Office2010BlackStyleFactory();
+
+            if (style == ChartControlStyle.Metro)
+                return new MetroStyleFactory();
+
+            throw new ArgumentException(string.Format(
+                "Specified style '{0}' factory has not been implemented.", style));
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/VisualStyles/VisualStylesTable.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/VisualStyles/VisualStylesTable.cs
new file mode 100644
index 00000000..cc83f564
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Charts/VisualStyles/VisualStylesTable.cs	
@@ -0,0 +1,75 @@
+using System.Collections.Generic;
+
+namespace DevComponents.DotNetBar.Charts.Style
+{
+    ///<summary>
+    /// VisualStylesTable
+    ///</summary>
+    public static class VisualStylesTable
+    {
+        private static Dictionary<ChartControlStyle, DefaultVisualStyles>
+            _DefaultStyles = new Dictionary<ChartControlStyle, DefaultVisualStyles>();
+
+        /// <summary>
+        /// Gets the DefaultVisualStyles for specified Chart style.
+        /// </summary>
+        /// <param name="style">ChartControl Style to return.</param>
+        /// <returns>An instance of DefaultVisualStyle.</returns>
+        public static DefaultVisualStyles GetStyle(ChartControlStyle style)
+        {
+            DefaultVisualStyles visualStyle;
+            bool cacheStyle = true;
+
+            if (style == ChartControlStyle.Metro || !StyleManager.ColorTint.IsEmpty)
+                cacheStyle = false;
+
+            if (cacheStyle == false || !_DefaultStyles.TryGetValue(style, out visualStyle))
+            {
+                VisualStyleFactory factory = VisualStyleFactory.GetStyleFactory(style);
+
+                visualStyle = factory.CreateStyle();
+
+                if (cacheStyle) // Do not cache Metro style
+                    _DefaultStyles.Add(style, visualStyle);
+            }
+
+            return visualStyle;
+        }
+
+        /// <summary>
+        /// Replaces an system style with the specified visual style.
+        /// </summary>
+        /// <param name="style">ChartControlStyle to replace.</param>
+        /// <param name="visualStyle">DefaultVisualStyles to replace the system style with.</param>
+        public static void SetStyleFactory(ChartControlStyle style, DefaultVisualStyles visualStyle)
+        {
+            _DefaultStyles[style] = visualStyle;
+        }
+    }
+
+    /// <summary>
+    /// Defines available pre-defined ChartControl visual styles.
+    /// </summary>
+    public enum ChartControlStyle
+    {
+        /// <summary>
+        /// Office 2010 Blue style.
+        /// </summary>
+        Office2010Blue,
+
+        /// <summary>
+        /// Office 2010 Silver style.
+        /// </summary>
+        Office2010Silver,
+
+        /// <summary>
+        /// Office 2010 Black style.
+        /// </summary>
+        Office2010Black,
+
+        /// <summary>
+        /// Metro Style.
+        /// </summary>
+        Metro
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Keyboard/DevComponents.DotNetBar.Keyboard.csproj b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Keyboard/DevComponents.DotNetBar.Keyboard.csproj
new file mode 100644
index 00000000..692131a8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Keyboard/DevComponents.DotNetBar.Keyboard.csproj	
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{57C1D8BE-55D4-4403-BC65-FC59D8148504}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>DevComponents.DotNetBar.Keyboard</RootNamespace>
+    <AssemblyName>DevComponents.DotNetBar.Keyboard</AssemblyName>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <DocumentationFile>bin\Release\DevComponents.DotNetBar.Keyboard.XML</DocumentationFile>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release2005|AnyCPU'">
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <CodeAnalysisLogFile>bin\Release\DevComponents.DotNetBar.Keyboard.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
+    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
+    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
+    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
+    <DocumentationFile>bin\Release\DevComponents.DotNetBar.Keyboard.XML</DocumentationFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseTrial2005|AnyCPU' ">
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE;TRIAL</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <CodeAnalysisLogFile>bin\Release\DevComponents.DotNetBar.Keyboard.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
+    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
+    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
+    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
+    <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
+    <CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
+    <DocumentationFile>bin\Release\DevComponents.DotNetBar.Keyboard.XML</DocumentationFile>
+  </PropertyGroup>
+  <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>dotnetbar.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Dpi.cs" />
+    <Compile Include="Keyboard.cs" />
+    <Compile Include="PopupVirtualKeyboard.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Renderer.cs" />
+    <Compile Include="TouchKeyboard.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Touch\TouchHandler.cs" />
+    <Compile Include="Touch\WinApi.cs" />
+    <Compile Include="KeyboardControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="VirtualKeyboardColors.cs" />
+    <Service Include="{94E38DFF-614B-4cbd-B67C-F211BB35CE8B}" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="dotnetbar.snk" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="KeyboardControl.ico" />
+    <EmbeddedResource Include="TouchKeyboard.ico" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Keyboard/Dpi.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Keyboard/Dpi.cs
new file mode 100644
index 00000000..87d6940b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Keyboard/Dpi.cs	
@@ -0,0 +1,230 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Drawing;
+using System.Text;
+
+namespace DevComponents.DotNetBar.Keyboard
+{
+    /// <summary>
+    /// Provides High DPI support for DotNetBar controls.
+    /// </summary>
+    public static class Dpi
+    {
+        private static SizeF _Factor = new SizeF(1f, 1f);
+        private static bool _UseFactor = false;
+
+        static Dpi()
+        {
+            Debug.WriteLine("Static constructor");
+        }
+
+        public static SizeF Factor
+        {
+            get { return _Factor; }
+        }
+        public static Size Size(Size size)
+        {
+            if (!_UseFactor) return size;
+            size.Width = (int)(size.Width * _Factor.Width);
+            size.Height = (int)(size.Height * _Factor.Height);
+            return size;
+        }
+        public static Rectangle Size(Rectangle r)
+        {
+            if (!_UseFactor) return r;
+            r.Width = (int)(r.Width * _Factor.Width);
+            r.Height = (int)(r.Height * _Factor.Height);
+            return r;
+        }
+
+        public static Point Size(Point p)
+        {
+            if (!_UseFactor) return p;
+            p.X = (int)(p.X * _Factor.Width);
+            p.Y = (int)(p.Y * _Factor.Height);
+            return p;
+        }
+
+        //public static DevComponents.DotNetBar.Padding Size(DevComponents.DotNetBar.Padding padding)
+        //{
+        //    if (!_UseFactor) return padding;
+        //    return new Padding((int)(padding.Left * _Factor.Width), (int)(padding.Right * _Factor.Width), (int)(padding.Top * _Factor.Height), (int)(padding.Bottom * _Factor.Height));
+        //}
+
+        public static int DescaleWidth(int width)
+        {
+            if (!_UseFactor) return width;
+            return (int)(width / _Factor.Width);
+        }
+        public static int DescaleHeight(int height)
+        {
+            if (!_UseFactor) return height;
+            return (int)(height / _Factor.Height);
+        }
+
+        internal static System.Drawing.Size Descale(System.Drawing.Size size)
+        {
+            if (!_UseFactor) return size;
+            size.Width = (int)(size.Width / _Factor.Width);
+            size.Height = (int)(size.Height / _Factor.Height);
+            return size;
+        }
+
+        public static int Width(int width)
+        {
+            if (!_UseFactor) return width;
+            return (int)(width * _Factor.Width);
+        }
+
+        public static int Height(int height)
+        {
+            if (!_UseFactor) return height;
+            return (int)(height * _Factor.Height);
+        }
+
+        public static float Height(float height)
+        {
+            if (!_UseFactor) return height;
+            return (height * _Factor.Height);
+        }
+
+        private static int _CaptionVerticalPadding = 10;
+        public static int CaptionVerticalPadding
+        {
+            get
+            {
+                if (!_UseFactor) return 0;
+                return _CaptionVerticalPadding;
+            }
+        }
+
+        public static void SetScaling(SizeF factor)
+        {
+            if(factor==_Factor) return;
+            
+            if (factor.Width == 1f && factor.Height == 1f)
+            {
+                _UseFactor = false;
+                _Factor = factor;
+            }
+            else
+            {
+                _UseFactor = true;
+                _Factor = factor;
+            }
+
+            UpdateStaticSizes();
+        }
+
+        private static void UpdateStaticSizes()
+        {
+            Width1 = Dpi.Width(1);
+            Width2 = Dpi.Width(2);
+            Width3 = Dpi.Width(3);
+            Width4 = Dpi.Width(4);
+            Width5 = Dpi.Width(5);
+            Width6 = Dpi.Width(6);
+            Width7 = Dpi.Width(7);
+            Width8 = Dpi.Width(8);
+            Width9 = Dpi.Width(9);
+            Width10 = Dpi.Width(10);
+            Width11 = Dpi.Width(11);
+            Width12 = Dpi.Width(12);
+            Width13 = Dpi.Width(13);
+            Width14 = Dpi.Width(14);
+            Width15 = Dpi.Width(15);
+            Width16 = Dpi.Width(16);
+            Width17 = Dpi.Width(17);
+            Width18 = Dpi.Width(18);
+            Width22 = Dpi.Width(22);
+            Width24 = Dpi.Width(24);
+            Width25 = Dpi.Width(25);
+            Width28 = Dpi.Width(28);
+            Width32 = Dpi.Width(32);
+            Width34 = Dpi.Width(34);
+
+            Height1 = Dpi.Height(1);
+            Height2 = Dpi.Height(2);
+            Height3 = Dpi.Height(3);
+            Height4 = Dpi.Height(4);
+            Height5 = Dpi.Height(5);
+            Height6 = Dpi.Height(6);
+            Height7 = Dpi.Height(7);
+            Height8 = Dpi.Height(8);
+            Height9 = Dpi.Height(9);
+            Height10 = Dpi.Height(10);
+            Height11 = Dpi.Height(11);
+            Height12 = Dpi.Height(12);
+            Height13 = Dpi.Height(13);
+            Height14 = Dpi.Height(14);
+            Height15 = Dpi.Height(15);
+            Height16 = Dpi.Height(16);
+            Height17 = Dpi.Height(17);
+            Height18 = Dpi.Height(18);
+            Height20 = Dpi.Height(20);
+            Height22 = Dpi.Height(22);
+            Height23 = Dpi.Height(23);
+            Height24 = Dpi.Height(24);
+            Height25 = Dpi.Height(25);
+            Height28 = Dpi.Height(28);
+            Height32 = Dpi.Height(32);
+        }
+
+        #region Static Sizes
+
+        public static int Width1 = 1;
+        public static int Width2 = 2;
+        public static int Width3 = 3;
+        public static int Width5 = 5;
+        public static int Width4 = 4;
+        public static int Width6 = 6;
+        public static int Width7 = 7;
+        public static int Width8 = 8;
+        public static int Width9 = 9;
+        public static int Width10 = 10;
+        public static int Width11 = 11;
+        public static int Width12 = 12;
+        public static int Width13 = 13;
+        public static int Width14 = 14;
+        public static int Width15 = 15;
+        public static int Width16 = 16;
+        public static int Width17 = 17;
+        public static int Width18 = 18;
+        public static int Width22 = 22;
+        public static int Width24 = 24;
+        public static int Width25 = 25;
+        public static int Width28 = 28;
+        public static int Width32 = 32;
+        public static int Width34 = 34;
+        
+        public static int Height1 = 1;
+        public static int Height2 = 2;
+        public static int Height3 = 3;
+        public static int Height4 = 4;
+        public static int Height5 = 5;
+        public static int Height6 = 6;
+        public static int Height7 = 7;
+        public static int Height8 = 8;
+        public static int Height9 = 9;
+        public static int Height10 = 10;
+        public static int Height11 = 11;
+        public static int Height12 = 12;
+        public static int Height13 = 13;
+        public static int Height14 = 14;
+        public static int Height15 = 15;
+        public static int Height16 = 16;
+        public static int Height17 = 17;
+        public static int Height18 = 18;
+        public static int Height20 = 20;
+        public static int Height22 = 22;
+        public static int Height23 = 23;
+        public static int Height24 = 24;
+        public static int Height25 = 25;
+        public static int Height28 = 28;
+        public static int Height32 = 32;
+
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Keyboard/Keyboard.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Keyboard/Keyboard.cs
new file mode 100644
index 00000000..5ddfe14b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Keyboard/Keyboard.cs	
@@ -0,0 +1,778 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+using System.Collections.ObjectModel;
+
+namespace DevComponents.DotNetBar.Keyboard
+{
+    // A Keyboard is defined by one or more KeyboardLayout objects.
+    // A KeyboardLayout is a layout of certain Key objects.
+    // A Key object represents all the data that a virtual key needs (caption, actual key-information to send 
+    // to the attached control, hint, bounds, style, etc).
+
+    // Because in this version of the VirtualKeyboard control the user cannot design new layouts for the keyboard, 
+    // we will not publicly expose the model classes of the keyboard.
+
+    /// <summary>
+    /// Holds information about a single virtual keyboard Key.
+    /// </summary>
+    public class Key
+    {
+        private string _Caption;
+        
+        /// <summary>
+        /// Gets the caption on the key.
+        /// </summary>
+        public string Caption
+        {
+            get { return _Caption; }
+        }
+
+
+        private string _Info;
+        
+        /// <summary>
+        /// Gets the actual key-information that is sent to the attached control. The format of this information
+        /// must confirm to the description for the SendKeys.Send function. For more details, see:
+        /// http://msdn.microsoft.com/en-us/library/system.windows.forms.sendkeys.aspx
+        /// </summary>
+        public string Info
+        {
+            get { return _Info; }
+        }
+
+
+        private Rectangle _Bounds;
+
+        /// <summary>
+        /// Gets the bounds of the key.
+        /// </summary>
+        public Rectangle Bounds
+        {
+            get { return _Bounds; }
+            internal set { _Bounds = value; }
+        }
+
+        
+        private KeyStyle _Style;
+
+        /// <summary>
+        /// Gets a value representing the way the key looks on the virtual keyboard. A key might look normal, 
+        /// lighter, darker or with a pressed effect.
+        /// </summary>
+        public KeyStyle Style
+        {
+            get { return _Style; }
+        }
+
+        
+        private int _ChangeToLayout;
+
+        /// <summary>
+        /// Gets the index of the layout to change to, if this key is pressed. A positive value represents a new layout.
+        /// KeyboardLayout.NoChange and KeyboardLayout.PreviousLayout constants can also be used with special meaning.
+        /// </summary>
+        /// <remarks>
+        /// If this is a positive integer ( >= 0 ), it represents the index of the layout to switch to when this key 
+        /// is pressed. In this case, the keyboard does not send any key information to the attached control (the Info
+        /// field is ignored), only changes the layout.
+        /// 
+        /// If this is KeyboardLayout.NoChange the keyboard will send the info to the attached control.
+        /// 
+        /// If this is KeyboardLayout.PreviousLayout the keyboard will switch to the previous set layout. The keyboard
+        /// maintains internally a stack of all used layouts. If no more layouts in the stakc, the keyboard switches to
+        /// the layout with index 0.
+        /// </remarks>
+        public int ChangeToLayout
+        {
+            get { return _ChangeToLayout; }
+        }
+
+
+        private int _ChangeToLayoutEx;
+
+        /// <summary>
+        /// Gets the index of the layout to change to, when this key is double clicked. A positive value represents a new layout.
+        /// KeyboardLayout.NoChange and KeyboardLayout.PreviousLayout constants can also be used with special meaning.
+        /// </summary>
+        /// <remarks>
+        /// If this is a positive integer ( >= 0 ), it represents the index of the layout to switch to when this key 
+        /// is pressed. In this case, the keyboard does not send any key information to the attached control (the Info
+        /// field is ignored), only changes the layout.
+        /// 
+        /// If this is KeyboardLayout.NoChange the keyboard will send the info to the attached control.
+        /// 
+        /// If this is KeyboardLayout.PreviousLayout the keyboard will switch to the previous set layout. The keyboard
+        /// maintains internally a stack of all used layouts. If no more layouts in the stakc, the keyboard switches to
+        /// the layout with index 0.
+        /// </remarks>
+        public int ChangeToLayoutEx
+        {
+            get { return _ChangeToLayoutEx; }
+        }
+
+        
+        private string _Hint;
+
+        /// <summary>
+        /// Gets the text that will be displayed in the upper part of the keyboard, as a hint for what the key does,
+        /// usually in combination with a modifier key (e.g. Underline, Undo, etc).
+        /// </summary>
+        public string Hint
+        {
+            get { return _Hint; }
+        }
+
+
+        /// <summary>
+        /// Creates a new Key object.
+        /// </summary>
+        /// <param name="caption">The text displayed on the key.</param>
+        /// <param name="info">The information that will be sent to the attached control.</param>
+        /// <param name="hint">The text in the upper part of the key, that provides a hint for the user about what the key does.</param>
+        /// <param name="style">The way the key looks.</param>
+        /// <param name="changeToLayout">The index of the layout to switch to.</param>
+        public Key(string caption, string info = null, string hint = "", KeyStyle style = KeyStyle.Normal, int changeToLayout = KeyboardLayout.NoChange, int changeToLayoutEx = KeyboardLayout.NoChange)
+        {
+            _Caption = caption;
+            _Info = info != null ? info : caption;
+            _Style = style;
+            _Hint = hint;
+            _ChangeToLayout = changeToLayout;
+            _ChangeToLayoutEx = changeToLayoutEx;
+        }
+
+        /// <summary>
+        /// Returns a string that represents the current Key.
+        /// </summary>
+        /// <returns>A string that represents the current Key.</returns>
+        public override string ToString()
+        {
+            return Caption;
+        }
+    }
+
+
+    /// <summary>
+    /// Specifies the way a key looks, specifically what color it uses from the ColorTable.
+    /// </summary>
+    public enum KeyStyle
+    {
+        /// <summary>
+        /// Key should be drawn as a normal key colors.
+        /// </summary>
+        Normal,
+
+        /// <summary>
+        /// Key should be drawn with lighter colors.
+        /// </summary>
+        Light,
+
+        /// <summary>
+        /// Key should be drawn with darker colors.
+        /// </summary>
+        Dark,
+
+        /// <summary>
+        /// Key should be drawn with the pressed color.
+        /// </summary>
+        Pressed,
+
+        /// <summary>
+        /// Key should be drawn with the toggled color.
+        /// </summary>
+        Toggled
+    }
+
+
+    /// <summary>
+    /// Represents a layout for a virtual keyboard.
+    /// </summary>
+    /// The Keys have coordinates in the KeyboardLayout specified in logical layout units. By default for this version
+    /// of the control, a normal key is 10 logical units (LUs) width and 10 LUs height. A space between two keys is 1 LU.
+    /// When rendering, we assume the whole Layout is stretched over the Keyboard control, so we need to change from 
+    /// LUs (ranging from 0 to layout.LogicalWidth) to pixels (ranging from 0 to control.Width).
+    /// This allows the layout to be resized to almost any sizes.
+    public class KeyboardLayout
+    {
+        /// <summary>
+        /// Indicates that a key should switch the Keyboard to the previous layout.
+        /// </summary>
+        public const int PreviousLayout = -2;
+
+        /// <summary>
+        /// Indicates that a key does not switch to any layout.
+        /// </summary>
+        public const int NoChange = -1;
+
+        private KeysCollection _Keys = new KeysCollection();
+
+        /// <summary>
+        /// Gets the collection of the Keys in this KeyboardLayout.
+        /// </summary>
+        public KeysCollection Keys
+        {
+            get { return _Keys; }
+        }
+
+        /// <summary>
+        /// Gets the logical width of this KeyboardLayout.
+        /// </summary>
+        public virtual int LogicalWidth
+        {
+            get
+            {
+                int w = 0;
+                foreach (Key key in Keys)
+                {
+                    if (key.Bounds.Right > w)
+                        w = key.Bounds.Right;
+                }
+
+                return w;
+            }
+        }
+
+        /// <summary>
+        /// Gets the logical height of this KeyboardLayout.
+        /// </summary>
+        public virtual int LogicalHeight
+        {
+            get
+            {
+                int h = 0;
+                foreach (Key key in Keys)
+                {
+                    if (key.Bounds.Bottom > h)
+                        h = key.Bounds.Bottom;
+                }
+
+                return h;
+            }
+        }
+
+        /// <summary>
+        /// Tests if a certain point hits a key on the virtual keyboard.
+        /// </summary>
+        /// <param name="x">The x-coordinate of the hit point (in logical units of this KeyboardLayout)</param>
+        /// <param name="y">The y-coordinate of the hit point (in logical units of this KeyboardLayout)</param>
+        /// <returns>Returns the key that was hit, or null if the point didn't hit any keys.</returns>
+        public Key KeyHitTest(int x, int y)
+        {
+            foreach (Key key in Keys)
+            {
+                if (key.Bounds.Contains(x, y))
+                    return key;
+            }
+
+            return null;
+        }
+    }
+
+
+    /// <summary>
+    /// Represents a layout for a virtual keyboard in which keys are defined in a linear way. This class
+    /// allows creation of layouts in which keys can be ordered from left to right and from top to bottom.
+    /// </summary>
+    /// <remarks>
+    /// With the linear layout, the keys are allowed to have any width. The height, however, must be the same.
+    /// This layout is build by adding to it spaces, keys and new lines.
+    /// A key represents a virtual key AND a space after it.
+    /// A space represents a placeholder between two keys and it is used when there is need for a larger space
+    /// between two certain keys
+    /// A new line represents the fact that a new line of keys should be defined.
+    /// </remarks>
+    /// <example>
+    /// The default virtual keyboard of the VirtualKeyboard control is defined in the following way:
+    /// <code>
+    /// AddKey("q");
+    /// AddKey("w");
+    /// AddKey("e");
+    /// // ...
+    /// AddKey("p");
+    /// AddKey("Backspace");
+    ///
+    /// AddLine(); // Starts a new row of keys.
+    /// AddSpace(4); // Creates a larger space at the beginning of the second row.
+    ///
+    /// AddKey("a");
+    /// AddKey("s");
+    /// // ...
+    /// </code>
+    /// </example>
+    public class LinearKeyboardLayout : KeyboardLayout
+    {
+        private int _LastXOffset = 0;
+        private int _LastYOffset = 0;
+
+        /// <summary>
+        /// The logical size of the space between two keys.
+        /// </summary>
+        public const int SpaceSize = 1;
+
+        /// <summary>
+        /// The logical size of a key.
+        /// </summary>
+        public const int NormalKeySize = 10;
+
+        /// <summary>
+        /// Adds a space to this LinearKeyboardLayout.
+        /// </summary>
+        /// <param name="width">The size of the space, in logical units.</param>
+        public void AddSpace(int width = SpaceSize)
+        {
+            width = Dpi.Width(width);
+            _LastXOffset += width;
+        }
+
+
+        /// <summary>
+        /// Starts a new row of keys in this LinearKeyboardLayout.
+        /// </summary>
+        public void AddLine()
+        {
+            _LastXOffset = 0;
+            _LastYOffset += Dpi.Width(NormalKeySize + SpaceSize);
+        }
+
+
+        /// <summary>
+        /// Adds a new key to this LinearKeayboardLayout.
+        /// </summary>
+        /// <param name="caption">The text displayed on the key.</param>
+        /// <param name="info">The information that will be sent to the attached control.</param>
+        /// <param name="hint">The text in the upper part of the key, that provides a hint for the user about what the key does.</param>
+        /// <param name="width">The width of the key, in logical units.</param>
+        /// <param name="height">The height of the key, in logical units.</param>
+        /// <param name="style">The way the key looks.</param>
+        /// <param name="changeToLayout">The index of the layout to switch to.</param>
+        /// <param name="changeToLayoutEx">The index of the layout to switch to, when key is double clicked.</param>
+        public void AddKey(string caption, string info = null, string hint = "", int width = NormalKeySize, int height = NormalKeySize, KeyStyle style = KeyStyle.Normal, int layout = KeyboardLayout.NoChange, int layoutEx = KeyboardLayout.NoChange)
+        {
+            Key key = new Key(caption, info, hint, style, layout, layoutEx);
+            width = Dpi.Width(width);
+            height = Dpi.Height(height);
+            key.Bounds = new Rectangle(_LastXOffset, _LastYOffset, width, height);
+            
+            _LastXOffset += width;
+            AddSpace();
+
+            Keys.Add(key);
+        }
+    }
+
+
+    /// <summary>
+    /// Represents a Virtual Keyboard.
+    /// </summary>
+    /// Each Keyboard has a collection of KeyboardLayout objects. The Keyboard also maintains the current Layout among all its layouts.
+    public class Keyboard
+    {
+        private KeyboardLayoutsCollection _Layouts = new KeyboardLayoutsCollection();
+
+        /// <summary>
+        /// Gets the collection of the keyboard layouts in this Keyboard.
+        /// </summary>
+        public KeyboardLayoutsCollection Layouts
+        {
+            get { return _Layouts; }
+        }
+
+        private int _CurrentLayoutIndex;
+
+        /// <summary>
+        /// Gets or sets the current layout index of this Keyboard.
+        /// </summary>
+        public int CurrentLayoutIndex
+        {
+            get { return _CurrentLayoutIndex; }
+            set
+            {
+                _LayoutStack.Push(_CurrentLayoutIndex);
+                _CurrentLayoutIndex = value;
+            }
+        }
+
+
+        /// <summary>
+        /// Gets the current layout of this Keyboard.
+        /// </summary>
+        public KeyboardLayout CurrentLayout
+        {
+            get { return _Layouts[_CurrentLayoutIndex]; }
+        }
+
+
+        private Stack<int> _LayoutStack = new Stack<int>();
+
+        /// <summary>
+        /// Switches the Keyboard to the previous layout.
+        /// </summary>
+        public void ChangeToPreviousLayout()
+        {
+            if (_LayoutStack.Count > 0)
+                _CurrentLayoutIndex = _LayoutStack.Pop();
+            else
+                _CurrentLayoutIndex = 0;
+        }
+
+        /// <summary>
+        /// Switches the Keyboard to the first layout and resets the layout stack.
+        /// </summary>
+        public void ResetLayoutStack()
+        {
+            _LayoutStack.Clear();
+            _CurrentLayoutIndex = 0;
+        }
+
+
+        /// <summary>
+        /// Creates the default Keyboard populated with common layouts and functionality.
+        /// </summary>
+        /// <returns>A new Keyboard instance representing a default keyboard.</returns>
+        public static Keyboard CreateDefaultKeyboard()
+        {
+            Keyboard keyboard = new Keyboard();
+
+            LinearKeyboardLayout kc; // Actually there are 4 layout objects, but for code simplicity this variable is reused for creating each of them.
+
+            #region Normal style configuration (no modifier keys pressed)
+            
+            kc = new LinearKeyboardLayout();
+            keyboard._Layouts.Add(kc);
+
+            kc.AddKey("q");
+            kc.AddKey("w");
+            kc.AddKey("e");
+            kc.AddKey("r");
+            kc.AddKey("t");
+            kc.AddKey("y");
+            kc.AddKey("u");
+            kc.AddKey("i");
+            kc.AddKey("o");
+            kc.AddKey("p");
+            kc.AddKey("Backspace", info: "{BACKSPACE}", width: 21);
+
+            kc.AddLine();
+            kc.AddSpace(4);
+
+            kc.AddKey("a");
+            kc.AddKey("s");
+            kc.AddKey("d");
+            kc.AddKey("f");
+            kc.AddKey("g");
+            kc.AddKey("h");
+            kc.AddKey("j");
+            kc.AddKey("k");
+            kc.AddKey("l");
+            kc.AddKey("'");
+            kc.AddKey("Enter", info: "{ENTER}", width: 17);
+
+            kc.AddLine();
+
+            kc.AddKey("Shift", info: "", style: KeyStyle.Dark, layout: 1);
+            kc.AddKey("z");
+            kc.AddKey("x");
+            kc.AddKey("c");
+            kc.AddKey("v");
+            kc.AddKey("b");
+            kc.AddKey("n");
+            kc.AddKey("m");
+            kc.AddKey(",");
+            kc.AddKey(".");
+            kc.AddKey("?");
+            kc.AddKey("Shift", info: "", style: KeyStyle.Dark, layout: 1);
+
+            kc.AddLine();
+
+            kc.AddKey("Ctrl", info: "", style: KeyStyle.Dark, layout: 2);
+            kc.AddKey("&123", info: "", style: KeyStyle.Dark, layout: 3);
+            kc.AddKey(":-)", info: ":-{)}", style: KeyStyle.Dark);
+            //kc.AddKey("Alt", info: "%", style: KeyStyle.Dark);
+            kc.AddKey(" ", width: 76);
+            kc.AddKey("<", info: "{LEFT}", style: KeyStyle.Dark);
+            kc.AddKey(">", info: "{RIGHT}", style: KeyStyle.Dark);
+
+            #endregion
+
+            #region Shift modifier pressed
+
+            kc = new LinearKeyboardLayout();
+            keyboard._Layouts.Add(kc);
+
+            kc.AddKey("Q", layout: KeyboardLayout.PreviousLayout);
+            kc.AddKey("W", layout: KeyboardLayout.PreviousLayout);
+            kc.AddKey("E", layout: KeyboardLayout.PreviousLayout);
+            kc.AddKey("R", layout: KeyboardLayout.PreviousLayout);
+            kc.AddKey("T", layout: KeyboardLayout.PreviousLayout);
+            kc.AddKey("Y", layout: KeyboardLayout.PreviousLayout);
+            kc.AddKey("U", layout: KeyboardLayout.PreviousLayout);
+            kc.AddKey("I", layout: KeyboardLayout.PreviousLayout);
+            kc.AddKey("O", layout: KeyboardLayout.PreviousLayout);
+            kc.AddKey("P", layout: KeyboardLayout.PreviousLayout);
+            kc.AddKey("Backspace", info: "{BACKSPACE}", width: 21);
+
+            kc.AddLine();
+            kc.AddSpace(4);
+
+            kc.AddKey("A", layout: KeyboardLayout.PreviousLayout);
+            kc.AddKey("S", layout: KeyboardLayout.PreviousLayout);
+            kc.AddKey("D", layout: KeyboardLayout.PreviousLayout);
+            kc.AddKey("F", layout: KeyboardLayout.PreviousLayout);
+            kc.AddKey("G", layout: KeyboardLayout.PreviousLayout);
+            kc.AddKey("H", layout: KeyboardLayout.PreviousLayout);
+            kc.AddKey("J", layout: KeyboardLayout.PreviousLayout);
+            kc.AddKey("K", layout: KeyboardLayout.PreviousLayout);
+            kc.AddKey("L", layout: KeyboardLayout.PreviousLayout);
+            kc.AddKey("\"", layout: KeyboardLayout.PreviousLayout);
+            kc.AddKey("Enter", info: "{ENTER}", width: 17);
+
+            kc.AddLine();
+
+            kc.AddKey("Shift", info: "", style: KeyStyle.Pressed, layout: 0, layoutEx: 4);
+            kc.AddKey("Z", layout: KeyboardLayout.PreviousLayout);
+            kc.AddKey("X", layout: KeyboardLayout.PreviousLayout);
+            kc.AddKey("C", layout: KeyboardLayout.PreviousLayout);
+            kc.AddKey("V", layout: KeyboardLayout.PreviousLayout);
+            kc.AddKey("B", layout: KeyboardLayout.PreviousLayout);
+            kc.AddKey("N", layout: KeyboardLayout.PreviousLayout);
+            kc.AddKey("M", layout: KeyboardLayout.PreviousLayout);
+            kc.AddKey(";", layout: KeyboardLayout.PreviousLayout);
+            kc.AddKey(":", layout: KeyboardLayout.PreviousLayout);
+            kc.AddKey("!", layout: KeyboardLayout.PreviousLayout);
+            kc.AddKey("Shift", info: "", style: KeyStyle.Pressed, layout: 0, layoutEx: 4);
+
+            kc.AddLine();
+
+            kc.AddKey("Ctrl", info: "", style: KeyStyle.Dark, layout: 2);
+            kc.AddKey("&123", info: "", style: KeyStyle.Dark, layout: 3);
+            kc.AddKey(":-)", info: ":-{)}", style: KeyStyle.Dark, layout: KeyboardLayout.PreviousLayout);
+            kc.AddKey(" ", width: 76, layout: KeyboardLayout.PreviousLayout);
+            kc.AddKey("<", info: "+{LEFT}", style: KeyStyle.Dark, layout: KeyboardLayout.PreviousLayout);
+            kc.AddKey(">", info: "+{RIGHT}", style: KeyStyle.Dark, layout: KeyboardLayout.PreviousLayout);
+            
+            #endregion
+
+            #region Ctrl modifier pressed
+            
+            kc = new LinearKeyboardLayout();
+            keyboard._Layouts.Add(kc);
+
+            kc.AddKey("q", info: "^q", layout: KeyboardLayout.PreviousLayout);
+            kc.AddKey("w", info: "^w", layout: KeyboardLayout.PreviousLayout);
+            kc.AddKey("e", info: "^e", layout: KeyboardLayout.PreviousLayout);
+            kc.AddKey("r", info: "^r", layout: KeyboardLayout.PreviousLayout);
+            kc.AddKey("t", info: "^t", layout: KeyboardLayout.PreviousLayout);
+            kc.AddKey("y", info: "^y", layout: KeyboardLayout.PreviousLayout);
+            kc.AddKey("u", info: "^u", hint: "Underline", layout: KeyboardLayout.PreviousLayout);
+            kc.AddKey("i", info: "^i", hint: "Italic", layout: KeyboardLayout.PreviousLayout);
+            kc.AddKey("o", info: "^o", layout: KeyboardLayout.PreviousLayout);
+            kc.AddKey("p", info: "^p", layout: KeyboardLayout.PreviousLayout);
+            kc.AddKey("Backspace", info: "^{BACKSPACE}", width: 21, layout: KeyboardLayout.PreviousLayout);
+
+            kc.AddLine();
+            kc.AddSpace(4);
+
+            kc.AddKey("a", info: "^a", hint: "Select all", layout: KeyboardLayout.PreviousLayout);
+            kc.AddKey("s", info: "^s", layout: KeyboardLayout.PreviousLayout);
+            kc.AddKey("d", info: "^d", layout: KeyboardLayout.PreviousLayout);
+            kc.AddKey("f", info: "^f", layout: KeyboardLayout.PreviousLayout);
+            kc.AddKey("g", info: "^g", layout: KeyboardLayout.PreviousLayout);
+            kc.AddKey("h", info: "^h", layout: KeyboardLayout.PreviousLayout);
+            kc.AddKey("j", info: "^j", layout: KeyboardLayout.PreviousLayout);
+            kc.AddKey("k", info: "^k", layout: KeyboardLayout.PreviousLayout);
+            kc.AddKey("l", info: "^l", layout: KeyboardLayout.PreviousLayout);
+            kc.AddKey("'", info: "^'", layout: KeyboardLayout.PreviousLayout);
+            kc.AddKey("Enter", info: "^{ENTER}", width: 17, layout: KeyboardLayout.PreviousLayout);
+
+            kc.AddLine();
+
+            kc.AddKey("Shift", info: "", layout: 1);
+            kc.AddKey("z", info: "^z", hint: "Undo", layout: KeyboardLayout.PreviousLayout);
+            kc.AddKey("x", info: "^x", hint: "Cut", layout: KeyboardLayout.PreviousLayout);
+            kc.AddKey("c", info: "^c", hint: "Copy", layout: KeyboardLayout.PreviousLayout);
+            kc.AddKey("v", info: "^v", hint: "Paste", layout: KeyboardLayout.PreviousLayout);
+            kc.AddKey("b", info: "^b", hint: "Bold", layout: KeyboardLayout.PreviousLayout);
+            kc.AddKey("n", info: "^n", layout: KeyboardLayout.PreviousLayout);
+            kc.AddKey("m", info: "^m", layout: KeyboardLayout.PreviousLayout);
+            kc.AddKey(",", info: "^,", layout: KeyboardLayout.PreviousLayout);
+            kc.AddKey(".", info: "^.", layout: KeyboardLayout.PreviousLayout);
+            kc.AddKey("?", info: "^?", layout: KeyboardLayout.PreviousLayout);
+            kc.AddKey("Shift", info: "", layout: 1);
+
+            kc.AddLine();
+
+            kc.AddKey("Ctrl", info: "", style: KeyStyle.Pressed, layout: KeyboardLayout.PreviousLayout);
+            kc.AddKey("&123", info: "", style: KeyStyle.Dark, layout: 3);
+            kc.AddKey(":-)", info: "^:-{)}", style: KeyStyle.Dark, layout: KeyboardLayout.PreviousLayout);
+            kc.AddKey(" ", info: "^ ", width: 76, layout: KeyboardLayout.PreviousLayout);
+            kc.AddKey("<", info: "^{LEFT}", style: KeyStyle.Dark, layout: KeyboardLayout.PreviousLayout);
+            kc.AddKey(">", info: "^{RIGHT}", style: KeyStyle.Dark, layout: KeyboardLayout.PreviousLayout);
+
+            #endregion
+
+            #region Symbols and numbers (&123) modifier pressed
+
+            kc = new LinearKeyboardLayout();
+            keyboard._Layouts.Add(kc);
+
+            kc.AddKey("!");
+            kc.AddKey("@");
+            kc.AddKey("#");
+            kc.AddKey("$");
+            kc.AddKey("½");
+            kc.AddKey("-");
+            kc.AddKey("+", info: "{+}");
+
+            kc.AddSpace(5);
+
+            kc.AddKey("1", style: KeyStyle.Light);
+            kc.AddKey("2", style: KeyStyle.Light);
+            kc.AddKey("3", style: KeyStyle.Light);
+
+            kc.AddSpace(5);
+
+            kc.AddKey("Bcks", info: "{BACKSPACE}", style: KeyStyle.Dark);
+
+            kc.AddLine();
+
+            // second line
+            kc.AddKey(";");
+            kc.AddKey(":");
+            kc.AddKey("\"");
+            kc.AddKey("%", info: "{%}");
+            kc.AddKey("&");
+            kc.AddKey("/");
+            kc.AddKey("*");
+
+            kc.AddSpace(5);
+
+            kc.AddKey("4", style: KeyStyle.Light);
+            kc.AddKey("5", style: KeyStyle.Light);
+            kc.AddKey("6", style: KeyStyle.Light);
+
+            kc.AddSpace(5);
+
+            kc.AddKey("Enter", info: "{ENTER}", style: KeyStyle.Dark);
+
+            kc.AddLine();
+
+            // third line
+            kc.AddKey("(", info: "{(}");
+            kc.AddKey(")", info: "{)}");
+            kc.AddKey("[", info: "{[}");
+            kc.AddKey("]", info: "{]}");
+            kc.AddKey("_");
+            kc.AddKey("\\");
+            kc.AddKey("=");
+
+            kc.AddSpace(5);
+
+            kc.AddKey("7", style: KeyStyle.Light);
+            kc.AddKey("8", style: KeyStyle.Light);
+            kc.AddKey("9", style: KeyStyle.Light);
+
+            kc.AddSpace(5);
+
+            kc.AddKey("Tab", info: "{TAB}", style: KeyStyle.Dark);
+
+            kc.AddLine();
+
+            // forth line
+            kc.AddKey("...", style: KeyStyle.Dark, layout: KeyboardLayout.PreviousLayout);
+            kc.AddKey("&123", info: "", style: KeyStyle.Pressed, layout: KeyboardLayout.PreviousLayout);
+            kc.AddKey(":-)", info: ":-{)}", style: KeyStyle.Dark);
+            kc.AddKey("<", info: "{LEFT}", style: KeyStyle.Dark);
+            kc.AddKey(">", info: "{RIGHT}", style: KeyStyle.Dark);
+            kc.AddKey("Space", info: "^ ", width: 21);
+            
+            kc.AddSpace(5);
+
+            kc.AddKey("0", style:KeyStyle.Light, width: 21);
+            kc.AddKey(System.Globalization.CultureInfo.CurrentCulture.NumberFormat.NumberDecimalSeparator, style: KeyStyle.Dark);
+
+            kc.AddSpace(5);
+
+            kc.AddLine();
+
+            #endregion
+
+            #region Shift modifier toggled
+
+            kc = new LinearKeyboardLayout();
+            keyboard._Layouts.Add(kc);
+
+            kc.AddKey("Q");
+            kc.AddKey("W");
+            kc.AddKey("E");
+            kc.AddKey("R");
+            kc.AddKey("T");
+            kc.AddKey("Y");
+            kc.AddKey("U");
+            kc.AddKey("I");
+            kc.AddKey("O");
+            kc.AddKey("P");
+            kc.AddKey("Backspace", info: "{BACKSPACE}", width: 21);
+
+            kc.AddLine();
+            kc.AddSpace(4);
+
+            kc.AddKey("A");
+            kc.AddKey("S");
+            kc.AddKey("D");
+            kc.AddKey("F");
+            kc.AddKey("G");
+            kc.AddKey("H");
+            kc.AddKey("J");
+            kc.AddKey("K");
+            kc.AddKey("L");
+            kc.AddKey("'");
+            kc.AddKey("Enter", info: "{ENTER}", width: 17);
+
+            kc.AddLine();
+
+            kc.AddKey("Shift", info: "", style: KeyStyle.Toggled, layout: 0);
+            kc.AddKey("Z");
+            kc.AddKey("X");
+            kc.AddKey("C");
+            kc.AddKey("V");
+            kc.AddKey("B");
+            kc.AddKey("N");
+            kc.AddKey("M");
+            kc.AddKey(",");
+            kc.AddKey(".");
+            kc.AddKey("?");
+            kc.AddKey("Shift", info: "", style: KeyStyle.Toggled, layout: 0);
+
+            kc.AddLine();
+
+            kc.AddKey("Ctrl", info: "", style: KeyStyle.Dark, layout: 2);
+            kc.AddKey("&123", info: "", style: KeyStyle.Dark, layout: 3);
+            kc.AddKey(":-)", info: ":-{)}", style: KeyStyle.Dark);
+            kc.AddKey(" ", width: 76);
+            kc.AddKey("<", info: "+{LEFT}", style: KeyStyle.Dark);
+            kc.AddKey(">", info: "+{RIGHT}", style: KeyStyle.Dark);
+
+            #endregion
+
+            return keyboard;
+        }
+    }
+
+    /// <summary>
+    /// Contains a collection of Key objects.
+    /// </summary>
+    public class KeysCollection : Collection<Key>
+    {
+
+    }
+
+    /// <summary>
+    /// Contains a collection of KeyboardLayout objects.
+    /// </summary>
+    public class KeyboardLayoutsCollection : Collection<KeyboardLayout>
+    {
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Keyboard/KeyboardControl.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Keyboard/KeyboardControl.cs
new file mode 100644
index 00000000..efa021ce
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Keyboard/KeyboardControl.cs	
@@ -0,0 +1,874 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+using System.ComponentModel;
+using System.Collections;
+using System.Runtime.InteropServices;
+using DevComponents.DotNetBar.Touch;
+
+
+namespace DevComponents.DotNetBar.Keyboard
+{
+    /// <summary>
+    /// Represents virtual keyboard control.
+    /// </summary>
+    [ToolboxItem(true)]
+    public class KeyboardControl : Control
+    {
+        private TouchHandler _TouchHandler = null;
+        /// <summary>
+        /// Creates a new VirtualKeyboard control.
+        /// </summary>
+        public KeyboardControl()
+        {
+            _ColorTable = _DefaultColorTable;
+
+            // Do not allow the control to receive focus.
+            SetStyle(ControlStyles.Selectable, false);
+
+            // Do not call OnPaintBackground().
+            SetStyle(ControlStyles.Opaque, true);
+
+            // Enable double buffering. OptimizedDoubleBuffer and AllPaintingInWmPaint are set by the DoubleBuffered property below.
+            //SetStyle(ControlStyles.OptimizedDoubleBuffer, true);
+            //SetStyle(ControlStyles.AllPaintingInWmPaint, true);
+
+            DoubleBuffered = true;
+
+            ResizeRedraw = true;
+
+            _RepeatTimer = new Timer();
+            _RepeatTimer.Tick += new EventHandler(RepeatTimer_Tick);
+        }
+
+        // The model for the Keyboard. This object contains all the information about the keys
+        // and the possible layouts of the keyboard.
+        private Keyboard _Keyboard = null; //Keyboard.CreateDefaultKeyboard();
+
+        /// <summary>
+        /// Gets or sets the Keyboard object that describes the VirtualKeyboard.
+        /// </summary>
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public Keyboard Keyboard
+        {
+            get
+            {
+                if(_Keyboard==null)
+                    _Keyboard = Keyboard.CreateDefaultKeyboard();
+                return _Keyboard;
+            }
+            set { _Keyboard = value; }
+        }
+
+        /// <summary>
+        /// Default width for the keyboard in pixels.
+        /// </summary>
+        public static int DefaultWidth
+        {
+            get { return 740; }
+        }
+
+        /// <summary>
+        /// Default height for the keyboard in pixels.
+        /// </summary>
+        public static int DefaultHeight {
+            get { return 250; }
+        }
+
+        protected override Size DefaultSize
+        {
+            get
+            {
+                return Dpi.Size(new Size(DefaultWidth, DefaultHeight));
+            }
+        }
+
+
+        private VirtualKeyboardColorTable _DefaultColorTable = new VirtualKeyboardColorTable();
+
+        private VirtualKeyboardColorTable _ColorTable;
+        /// <summary>
+        /// Gets or set the ColorTable used to draw the keyboard.
+        /// </summary>
+        public VirtualKeyboardColorTable ColorTable
+        {
+            get { return _ColorTable; }
+            set
+            {
+                _ColorTable = value;
+                Invalidate(); // Ok to invalidate entire control, to render everything with the new colors.
+            }
+        }
+
+
+        private Renderer _Renderer = new FlatStyleRenderer();
+        /// <summary>
+        /// Gets or sets the Renderer used to render the keyboard.
+        /// </summary>
+        public Renderer Renderer
+        {
+            get { return _Renderer; }
+            set
+            {
+                if (value == null)
+                    value = new FlatStyleRenderer();
+                _Renderer = value;
+                Invalidate(); // Ok to invalidate entire control, to redraw everything with the new renderer.
+            }
+        }
+
+        // Through this method, the keys generated by the Virtual Keyboard are sent to the target control.
+        // In this version, the current target control is always the control with input focus and the keyboard
+        // is only visible when the control (to which the keyboard was previously attached) has input focus.
+        // Therefore, SendKeys.Send offers all the logic needed for this version of the keyboard.
+        //
+        // For future versions, we might consider using the Win32 API SendInput function for greater flexibility.
+        private void SendKeysToTarget(string info)
+        {
+            KeyboardKeyCancelEventArgs cancelArgs = new KeyboardKeyCancelEventArgs(info);
+            OnSendingKey(cancelArgs);
+            if (cancelArgs.Cancel) return;
+            SendKeys.Send(info);
+            OnKeySent(new KeyboardKeyEventArgs(info));
+        }
+
+
+        #region Send repeating key if mouse is hold down
+
+        private Timer _RepeatTimer; // Used to send repeated keys to the target control.
+        private Key _PressedKey; // Used to keep the keys that is repeatedly sent to the target control.
+
+        private void RepeatTimer_Tick(object sender, EventArgs e)
+        {
+            if (_PressedKey != null)
+            {
+                if (_RepeatTimer.Interval == KeyboardDelay)
+                    _RepeatTimer.Interval = KeyboardSpeed;
+                SendKeysToTarget(_PressedKey.Info);
+            }
+        }
+
+
+        private void CancelRepeatKey()
+        {
+            _PressedKey = null;
+            _RepeatTimer.Stop();
+        }
+
+
+        private void StartRepeatKey(Key key)
+        {
+            _PressedKey = key;
+            _RepeatTimer.Start();
+            _RepeatTimer.Interval = KeyboardDelay;
+        }
+
+
+        private static int KeyboardDelay
+        {
+            get
+            {
+                // SystemInformation.KeyboardDelay is between 0 (2.5 repetitions per second) and 31 (about 30 per second)
+                // but these values arre hardware dependendant, so the fomula below is a fast and accurate enough not to feel
+                // any difference between this and a real keyboard at the same values.
+                return 1000 / (SystemInformation.KeyboardDelay + 1);
+            }
+        }
+
+
+        private static int KeyboardSpeed
+        {
+            get
+            {
+                // See KeyboardDelay for details.
+                return 1000 / (SystemInformation.KeyboardSpeed + 1);
+            }
+        }
+
+        #endregion
+
+        private bool _IsTopBarVisible = true;
+        /// <summary>
+        /// Gets or sets a value indicating if the top bar of the keyboard is visible.
+        /// </summary>
+        [DefaultValue(true)]
+        [Description("Indicates if the top bar of  the keyboard is visible.")]
+        [Category("Appearance")]
+        public bool IsTopBarVisible
+        {
+            get { return _IsTopBarVisible; }
+            set
+            {
+                _IsTopBarVisible = value;
+                this.Invalidate();
+            }
+        }
+
+        private int _CaptionHeight = 20;
+        /// <summary>
+        /// Indicates the height of the keyboard caption which hosts the close button.
+        /// </summary>
+        [DefaultValue(20), Category("Appearance"), Description("Indicates the height of the keyboard caption which hosts the close button.")]
+        public int CaptionHeight
+        {
+            get { return _CaptionHeight; }
+            set
+            {
+                if (value != _CaptionHeight)
+                {
+                    int oldValue = _CaptionHeight;
+                    _CaptionHeight = value;
+                    this.Invalidate();
+                }
+            }
+        }
+        
+        //private const int TopBarHeight = 20;
+
+        private int TopBarVisibleHeight
+        {
+            get { return IsTopBarVisible ? ActualCaptionHeight + Border : 0; }
+        }
+
+        public int Border {
+            get { return Dpi.Width10; }
+        }
+
+        private readonly Key HideKeyboardKey = new Key("Hide", info: null);
+
+        private int ActualCaptionHeight
+        {
+            get { return Dpi.Height(_CaptionHeight); }
+        }
+        private Rectangle TopBarRectangle
+        {
+            get { return new Rectangle(Border, Border, Width - 2 * Border, ActualCaptionHeight); }
+        }
+
+        private Rectangle CloseButtonRectangle
+        {
+            get { return new Rectangle(Width - ActualCaptionHeight - Border, Border, ActualCaptionHeight, ActualCaptionHeight); }
+        }
+
+        private Rectangle KeysRectangle
+        {
+            get
+            {
+                Rectangle rect = new Rectangle(Border, Border, Width - 2 * Border, Height - 2 * Border);
+                if (IsTopBarVisible)
+                {
+                    rect.Y += ActualCaptionHeight + Border;
+                    rect.Height -= ActualCaptionHeight + Border;
+                }
+                return rect;
+            }
+        }
+
+        protected override void ScaleControl(SizeF factor, BoundsSpecified specified)
+        {
+            Dpi.SetScaling(factor);
+            base.ScaleControl(factor, specified);
+        }
+
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            KeyboardLayout currentLayout = Keyboard.CurrentLayout;
+
+            if (currentLayout.LogicalWidth <= 0 || currentLayout.LogicalHeight <= 0)
+                return;
+
+            Rectangle rectKeys = KeysRectangle;
+
+            float sfx = (float)rectKeys.Width / currentLayout.LogicalWidth;
+            float sfy = (float)rectKeys.Height / currentLayout.LogicalHeight;
+
+            Renderer.ColorTable = ColorTable;
+
+            Renderer.BeginFrame(new BeginFrameRendererEventArgs(e.Graphics, e.ClipRectangle, rectKeys, Font, currentLayout));
+
+            Renderer.DrawBackground(new BackgroundRendererEventArgs(e.Graphics, e.ClipRectangle, new Rectangle(0, 0, Width, Height)));
+
+            if (IsTopBarVisible)
+            {
+                Renderer.DrawTopBar(new TopBarRendererEventArgs(e.Graphics, e.ClipRectangle, TopBarRectangle, Text, Font));
+                Renderer.DrawCloseButton(new CloseButtonRendererEventArgs(e.Graphics, _PressedKey == HideKeyboardKey, e.ClipRectangle, CloseButtonRectangle));
+            }
+
+            foreach (Key key in currentLayout.Keys)
+            {
+                Rectangle rectKey = new Rectangle((int)(key.Bounds.X * sfx), (int)(key.Bounds.Y * sfy),
+                    (int)(key.Bounds.Width * sfx), (int)(key.Bounds.Height * sfy));
+
+                rectKey.Offset(rectKeys.Left, rectKeys.Top);
+
+                Renderer.DrawKey(new KeyRendererEventArgs(e.Graphics, key, key == _PressedKey, e.ClipRectangle, rectKey));
+            }
+
+            Renderer.EndFrame();
+
+#if TRIAL
+            using (Font font = new System.Drawing.Font(this.Font.FontFamily, 7, FontStyle.Regular))
+            {
+                using (SolidBrush brush = new SolidBrush(Color.FromArgb(24, Color.White)))
+                    e.Graphics.DrawString("DotNetBar Trial Version", font, brush, (this.ClientRectangle.Width - 80) / 2, this.ClientRectangle.Height - 32);
+            }
+#endif
+        }
+
+        private void PerformMoveAction(Point location)
+        {
+            if (IsTopBarVisible && CloseButtonRectangle.Contains(location))
+            {
+                Cursor = Cursors.Hand;
+            }
+            else
+            {
+                KeyboardLayout currentLayout = Keyboard.CurrentLayout;
+                Rectangle rectKeys = KeysRectangle;
+
+                float fx = (float)rectKeys.Width / currentLayout.LogicalWidth;
+                float fy = (float)rectKeys.Height / currentLayout.LogicalHeight;
+
+                if (_PressedKey == HideKeyboardKey)
+                {
+                    if (_PressedKey != null)
+                    {
+                        Invalidate(GetKeyPhysicalBounds(_PressedKey, fx, fy));
+                    }
+                    _PressedKey = null;
+                    Invalidate(CloseButtonRectangle);
+                    this.Update();
+                }
+
+                Key key = null;
+
+                if (KeysRectangle.Contains(location))
+                    key = currentLayout.KeyHitTest((int)((location.X - rectKeys.Left) / fx), (int)((location.Y - rectKeys.Top) / fy));
+
+                // If the mouse is over a key, change the cursor to the Hand cursor, to provide
+                // a visual feedback for the user to know that it can interact with this key.
+                Key pressedKey = _PressedKey;
+                if (key == null)
+                {
+                    Cursor = Cursors.Arrow;
+                    CancelRepeatKey();
+
+                    if (pressedKey != null)
+                    {
+                        Invalidate(GetKeyPhysicalBounds(pressedKey, fx, fy)); // Only invalidate area under the currently pressed key.
+                        this.Update();
+                    }
+                }
+                else if (key != pressedKey)
+                {
+                    Cursor = Cursors.Hand;
+                    CancelRepeatKey();
+                    if (pressedKey != null)
+                    {
+                        Invalidate(GetKeyPhysicalBounds(pressedKey, fx, fy)); // Only invalidate area under the currently pressed key.
+                        this.Update();
+                    }
+                }
+                else
+                {
+                    Cursor = Cursors.Hand;
+                }
+            }
+        }
+        protected override void OnMouseMove(MouseEventArgs e)
+        {
+            if (ProcessMouseAction)
+            {
+                PerformMoveAction(e.Location);
+                _LastTouchAction = null;
+            }
+            base.OnMouseMove(e);
+        }
+
+
+        protected override void OnMouseLeave(EventArgs e)
+        {
+            KeyboardLayout currentLayout = Keyboard.CurrentLayout;
+            Rectangle rectKeys = KeysRectangle;
+
+            float fx = (float)rectKeys.Width / currentLayout.LogicalWidth;
+            float fy = (float)rectKeys.Height / currentLayout.LogicalHeight;
+
+            if (_PressedKey != HideKeyboardKey)
+                Invalidate(CloseButtonRectangle);
+            else if (_PressedKey != null)
+            {
+                Invalidate(GetKeyPhysicalBounds(_PressedKey, fx, fy)); // Only invalidate area under the currently pressed key.
+                this.Update();
+            }
+
+            CancelRepeatKey();
+        }
+
+        private bool _TouchEnabled = true;
+        /// <summary>
+        /// Indicates whether touch support is enabled when provided by hardware.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether touch support is enabled when provided by hardware.")]
+        public bool TouchEnabled
+        {
+            get { return _TouchEnabled; }
+            set
+            {
+                if (value != _TouchEnabled)
+                {
+                    bool oldValue = _TouchEnabled;
+                    _TouchEnabled = value;
+                    OnTouchEnabledChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when TouchEnabled property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnTouchEnabledChanged(bool oldValue, bool newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("TouchEnabled"));
+        }
+
+        protected override void OnHandleCreated(EventArgs e)
+        {
+            if (TouchHandler.IsTouchEnabled)
+            {
+                _TouchHandler = new TouchHandler(this, eTouchHandlerType.Touch);
+                _TouchHandler.TouchDown += new EventHandler<TouchEventArgs>(TouchHandlerTouchDown);
+                _TouchHandler.TouchUp += new EventHandler<TouchEventArgs>(TouchHandlerTouchUp);
+                // Don't need touch move action for keyboard handling
+                //_TouchHandler.TouchMove += new EventHandler<TouchEventArgs>(TouchHandlerTouchMove);
+            }
+            base.OnHandleCreated(e);
+        }
+
+        private DateTime? _LastTouchAction = null;
+        //void TouchHandlerTouchMove(object sender, TouchEventArgs e)
+        //{
+        //    PerformMoveAction(e.Location);
+        //    _LastTouchAction = DateTime.Now;
+        //}
+        void TouchHandlerTouchUp(object sender, TouchEventArgs e)
+        {
+            if (_TouchEnabled)
+            {
+                // Process keybaord hiding through the MouseUp event instead of touch event since if closed using touch the mouse up will occur on control
+                // which is under keyboard after keyboard is hidden which is not desired
+                if (IsTopBarVisible && CloseButtonRectangle.Contains(e.Location))
+                {
+                    _LastTouchAction = null;
+                    return;
+                }
+                PerformUpAction(e.Location);
+                _LastTouchAction = DateTime.Now;
+            }
+        }
+        void TouchHandlerTouchDown(object sender, TouchEventArgs e)
+        {
+            if (_TouchEnabled)
+            {
+                PerformDownAction(e.Location);
+                _LastTouchAction = DateTime.Now;
+            }
+        }
+
+        /// <summary>
+        /// Returns the Key at given location. Location expected is in control coordinates.
+        /// </summary>
+        /// <param name="location">Location is control coordinates.</param>
+        /// <returns>Key if there is a key at given location or null/nothing if no key exists at given location.</returns>
+        public Key HitTest(Point location)
+        {
+            KeyboardLayout currentLayout = Keyboard.CurrentLayout;
+            Rectangle rectKeys = KeysRectangle;
+
+            float fx = (float)rectKeys.Width / currentLayout.LogicalWidth;
+            float fy = (float)rectKeys.Height / currentLayout.LogicalHeight;
+
+            Key key = null;
+            if (KeysRectangle.Contains(location))
+                key = currentLayout.KeyHitTest((int)((location.X - rectKeys.Left) / fx), (int)((location.Y - rectKeys.Top) / fy));
+
+            return key;
+        }
+
+        private void PerformDownAction(Point location)
+        {
+            if (_PressedKey != null) // This can happen because multi-touch can send multiple down messages
+            {
+                PerformUpAction(location);
+            }
+
+            if (IsTopBarVisible && CloseButtonRectangle.Contains(location))
+            {
+                _PressedKey = HideKeyboardKey;
+                Invalidate(CloseButtonRectangle);
+            }
+            else
+            {
+                KeyboardLayout currentLayout = Keyboard.CurrentLayout;
+                Rectangle rectKeys = KeysRectangle;
+
+                float fx = (float)rectKeys.Width / currentLayout.LogicalWidth;
+                float fy = (float)rectKeys.Height / currentLayout.LogicalHeight;
+
+                Key key = HitTest(location);
+
+                if (key != null)
+                {
+                    TimeSpan ts = DateTime.Now.Subtract(_LastMouseUpEvent);
+                    if (_LastKeyUp != null && key.Caption == _LastKeyUp.Caption && ts < TimeSpan.FromMilliseconds(SystemInformation.DoubleClickTime) && key.ChangeToLayoutEx >= 0)
+                    {
+                        Keyboard.CurrentLayoutIndex = key.ChangeToLayoutEx;
+                        _LastMouseUpEvent = DateTime.MinValue;
+                        Invalidate();
+                    }
+                    else
+                    {
+                        _PressedKey = key;
+
+                        if (_PressedKey.Info != null && _PressedKey.Info != "")
+                        {
+                            StartRepeatKey(key);
+                            SendKeysToTarget(key.Info);
+                        }
+                    }
+                    Invalidate(GetKeyPhysicalBounds(key, fx, fy)); // Only invalidate area under the currently pressed key.
+                }
+            }
+            this.Update();
+        }
+
+        private int TouchMouseInputFilterDelay = 2000;
+        private bool ProcessMouseAction
+        {
+            get
+            {
+                return _LastTouchAction == null ||
+                    (_LastTouchAction != null && DateTime.Now.Subtract(_LastTouchAction.Value).TotalMilliseconds > TouchMouseInputFilterDelay);
+            }
+        }
+        protected override void OnMouseDown(MouseEventArgs e)
+        {
+            if (ProcessMouseAction)
+            {
+                PerformDownAction(e.Location);
+                _LastTouchAction = null;
+            }
+            base.OnMouseDown(e);
+        }
+
+        private DateTime _LastMouseUpEvent = DateTime.MinValue;
+        private Key _LastKeyUp = null;
+
+        private void PerformUpAction(Point location)
+        {
+            if (IsTopBarVisible && CloseButtonRectangle.Contains(location))
+            {
+                if (_PressedKey == HideKeyboardKey)
+                {
+                    HideKeyboard();
+                    _PressedKey = null;
+                }
+                CancelRepeatKey();
+            }
+            else
+            {
+                Key pressedKey = _PressedKey;
+                CancelRepeatKey();
+                if (pressedKey != null)
+                {
+                    KeyboardLayout currentLayout = Keyboard.CurrentLayout;
+                    Rectangle rectKeys = KeysRectangle;
+
+                    float fx = (float)rectKeys.Width / currentLayout.LogicalWidth;
+                    float fy = (float)rectKeys.Height / currentLayout.LogicalHeight;
+
+                    _LastMouseUpEvent = DateTime.Now;
+                    _LastKeyUp = pressedKey;
+
+                    if (pressedKey.ChangeToLayout >= 0)
+                    {
+                        Keyboard.CurrentLayoutIndex = pressedKey.ChangeToLayout;
+                        Invalidate(); // Ok to invalidate entire control because we need to draw a whole new layout.
+                    }
+                    else if (pressedKey.ChangeToLayout == KeyboardLayout.PreviousLayout)
+                    {
+                        Keyboard.ChangeToPreviousLayout();
+                        Invalidate(); // Ok to invalidate entire control because we need to draw a whole new layout.
+                    }
+                    else
+                    {
+                        Invalidate(GetKeyPhysicalBounds(pressedKey, fx, fy)); // Only invalidate area under the currently pressed key.
+                    }
+                }
+            }
+            this.Update();
+        }
+        protected override void OnMouseUp(MouseEventArgs e)
+        {
+            if (ProcessMouseAction)
+            {
+                PerformUpAction(e.Location);
+                base.OnMouseUp(e);
+            }
+            _LastTouchAction = null;
+        }
+
+        private Rectangle GetKeyPhysicalBounds(Key key, float scaleFactorX, float scaleFactorY)
+        {
+            Rectangle r = key.Bounds;
+
+            r.X = (int)(r.X * scaleFactorX) + Border;
+            r.Y = (int)(r.Y * scaleFactorY) + Border + TopBarVisibleHeight;
+            r.Width = (int)(r.Width * scaleFactorX);
+            r.Height = (int)(r.Height * scaleFactorY);
+
+            return r;
+        }
+
+
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                if (_DefaultColorTable != null)
+                    _DefaultColorTable.Dispose();
+                if (_RepeatTimer != null)
+                    _RepeatTimer.Dispose();
+            }
+
+            base.Dispose(disposing);
+        }
+
+
+        /// <summary>
+        /// Attaches the Keyboard to the specified control. The keyboard will automatically appear when the control receives input focus.
+        /// </summary>
+        /// <param name="control">The control to which the Keyboard will be attached.</param>
+        public void AttachTo(Control control)
+        {
+            control.GotFocus += new EventHandler(control_GotFocus);
+            control.LostFocus += new EventHandler(control_LostFocus);
+        }
+
+
+        /// <summary>
+        /// Detaches the Keyboard from the specified control.
+        /// </summary>
+        /// <param name="control">The control from which the Keyboard will be detached.</param>
+        public void DetachFrom(Control control)
+        {
+            control.GotFocus -= new EventHandler(control_GotFocus);
+            control.LostFocus -= new EventHandler(control_LostFocus);
+        }
+
+        public void UnlockCapsLock()
+        {
+            if (Control.IsKeyLocked(Keys.CapsLock))
+            {
+                OSVERSIONINFO info=new OSVERSIONINFO();
+                info.dwOSVersionInfoSize= System.Runtime.InteropServices.Marshal.SizeOf(typeof(OSVERSIONINFO));
+                GetVersionEx(ref info);
+                byte[] keys= new byte[255];
+                if(info.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS) // Win95/98
+                {
+                    keys[VK_CAPITAL] = 1;
+                    SetKeyboardState(keys);
+                }
+                else if (info.dwPlatformId == VER_PLATFORM_WIN32_NT)
+                {
+                    // Simulate Key Press
+                    keybd_event(VK_CAPITAL, 0X45, KEYEVENTF_EXTENDEDKEY | 0, 0);
+                    // Simulate Key Release
+                    keybd_event(VK_CAPITAL, 0x45, KEYEVENTF_EXTENDEDKEY | KEYEVENTF_KEYUP, 0);
+                }
+            }
+        }
+
+        void control_GotFocus(object sender, EventArgs e)
+        {
+            Show();
+        }
+
+
+        void control_LostFocus(object sender, EventArgs e)
+        {
+            HideKeyboard();
+        }
+
+        private void HideKeyboard()
+        {
+            CancelEventArgs ce = new CancelEventArgs();
+            OnKeyboardClosing(ce);
+            if (ce.Cancel) return;
+
+            this.Hide();
+
+            OnKeyboardClosed(EventArgs.Empty);
+        }
+
+        /// <summary>
+        /// Occurs before the keyboard is closed and allows canceling of keyboard closing.
+        /// </summary>
+        [Description("Occurs before the keyboard is closed and allows canceling of keyboard closing.")]
+        public event CancelEventHandler KeyboardClosing;
+        /// <summary>
+        /// Raises KeyboardClosing event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnKeyboardClosing(CancelEventArgs e)
+        {
+            CancelEventHandler handler = KeyboardClosing;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        /// <summary>
+        /// Occurs after keyboard is closed.
+        /// </summary>
+        [Description("Occurs after keyboard is closed.")]
+        public event EventHandler KeyboardClosed;
+        /// <summary>
+        /// Raises KeyboardClosed event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnKeyboardClosed(EventArgs e)
+        {
+            EventHandler handler = KeyboardClosed;
+            if (handler != null)
+                handler(this, e);
+        }
+        /// <summary>
+        /// Occurs before the key pressed on keyboard is sent to target control and allows cancellation of the message
+        /// </summary>
+        [Description("Occurs before the key pressed on keyboard is sent to target control and allows cancellation of the message.")]
+        public event KeyCancelEventHandler SendingKey;
+        /// <summary>
+        /// Raises SendingKey event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnSendingKey(KeyboardKeyCancelEventArgs e)
+        {
+            KeyCancelEventHandler handler = SendingKey;
+            if (handler != null)
+                handler(this, e);
+        }
+        /// <summary>
+        /// Occurs after the key is sent to target control.
+        /// </summary>
+        [Description("Occurs after the key is sent to target control.")]
+        public event KeyEventHandler KeySent;
+        /// <summary>
+        /// Raises KeySent event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnKeySent(KeyboardKeyEventArgs e)
+        {
+            KeyEventHandler handler = KeySent;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        protected override void OnTextChanged(EventArgs e)
+        {
+            this.Invalidate();
+            base.OnTextChanged(e);
+        }
+
+        #region Windows API
+        //  Declare Type for API call:
+        [StructLayout(LayoutKind.Sequential)]
+        internal struct OSVERSIONINFO
+        {
+            public int dwOSVersionInfoSize;
+            public int dwMajorVersion;
+            public int dwMinorVersion;
+            public int dwBuildNumber;
+            public int dwPlatformId;
+            [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 128)]
+            public string szCSDVersion;
+        }
+        //  Constant declarations:
+        const int VK_CAPITAL = 0x14;
+        const int KEYEVENTF_EXTENDEDKEY = 1;
+        const int KEYEVENTF_KEYUP = 2;
+        const int VER_PLATFORM_WIN32_NT = 2;
+        const int VER_PLATFORM_WIN32_WINDOWS = 1;
+
+
+        //  API declarations:
+        [DllImport("kernel32.Dll")]
+        private static extern short GetVersionEx(ref OSVERSIONINFO o);
+
+        [DllImport("user32.dll")]
+        static extern void keybd_event(byte bVk, byte bScan, uint dwFlags, int dwExtraInfo);
+
+        [DllImport("user32.dll")]
+        static extern bool SetKeyboardState(byte[] lpKeyState);
+        #endregion
+    }
+
+    /// <summary>
+    /// Defines delegate for key-related events.
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    public delegate void KeyEventHandler(object sender, KeyboardKeyEventArgs e);
+    /// <summary>
+    /// Provides data for key related events.
+    /// </summary>
+    public class KeyboardKeyEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets the key being pressed. The format of this information
+        /// must confirm to the description for the SendKeys.Send function. For more details, see:
+        /// http://msdn.microsoft.com/en-us/library/system.windows.forms.sendkeys.aspx
+        /// </summary>
+        public readonly string Key;
+        /// <summary>
+        /// Initializes a new instance of the KeyboardKeyEventArgs class.
+        /// </summary>
+        /// <param name="key"></param>
+        public KeyboardKeyEventArgs(string key)
+        {
+            Key = key;
+        }
+    }
+
+    /// <summary>
+    /// Defines delegate for key-related events.
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    public delegate void KeyCancelEventHandler(object sender, KeyboardKeyCancelEventArgs e);
+    /// <summary>
+    /// Provides data for key related events.
+    /// </summary>
+    public class KeyboardKeyCancelEventArgs : CancelEventArgs
+    {
+        /// <summary>
+        /// Gets the key being pressed. The format of this information
+        /// must confirm to the description for the SendKeys.Send function. For more details, see:
+        /// http://msdn.microsoft.com/en-us/library/system.windows.forms.sendkeys.aspx
+        /// </summary>
+        public readonly string Key;
+        /// <summary>
+        /// Initializes a new instance of the KeyCancelEventArgs class.
+        /// </summary>
+        /// <param name="key"></param>
+        public KeyboardKeyCancelEventArgs(string key)
+        {
+            Key = key;
+        }
+    }
+
+
+    
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Keyboard/KeyboardControl.ico b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Keyboard/KeyboardControl.ico
new file mode 100644
index 00000000..e82c50f9
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Keyboard/KeyboardControl.ico differ
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Keyboard/PopupVirtualKeyboard.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Keyboard/PopupVirtualKeyboard.cs
new file mode 100644
index 00000000..2edbc112
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Keyboard/PopupVirtualKeyboard.cs	
@@ -0,0 +1,171 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows.Forms;
+using System.Drawing;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar.Keyboard
+{
+    internal class PopupVirtualKeyboard : Form
+    {
+        /// <summary>
+        /// Creates a new floating virtual keyboard.
+        /// </summary>
+        public PopupVirtualKeyboard()
+        {
+            StartPosition = FormStartPosition.Manual;
+            
+            // Make sure the popup window does not appear in the taskbar.
+            ShowInTaskbar = false;
+            
+            MinimizeBox = false;
+            MaximizeBox = false;
+            //ControlBox = false;
+        }
+
+
+        #region Window activation handling
+
+        // We need to prevent the keyboard window from activating, otherwise will still focus from our target control.
+        // Also to achieve this effect, there must be no focusable control in the popup window.
+
+        private const int WM_MOUSEACTIVATE = 0x0021;
+        private const int MA_NOACTIVATE = 0x0003;
+        private const int WS_EX_NOACTIVATE = 0x08000000;
+
+        // Override CreateParams to specify that this Form should not be activated.
+        protected override CreateParams CreateParams
+        {
+            get
+            {
+                CreateParams createParams = base.CreateParams;
+                createParams.ExStyle = createParams.ExStyle & WS_EX_NOACTIVATE;
+                return createParams;
+            }
+        }
+
+
+        protected override void WndProc(ref Message m)
+        {
+            // This prevents the window from being activated with the mouse, 
+            // but allows the window to be resized (with the mouse).
+            if (m.Msg == WM_MOUSEACTIVATE)
+            {
+                m.Result = (IntPtr)MA_NOACTIVATE;
+            }
+            else
+            {
+                base.WndProc(ref m);
+            }
+        }
+
+
+        protected override void OnActivated(EventArgs e)
+        {
+            Owner.Activate();
+        }
+
+        #endregion
+
+
+        protected override void OnClosing(CancelEventArgs e)
+        {
+            // Cancel the Closing event as this will Dispose the form.
+            e.Cancel = true;
+            Hide();
+        }
+
+
+        protected override void OnVisibleChanged(EventArgs e)
+        {
+            base.OnVisibleChanged(e);
+
+            if (Visible && CurrentControl != _LastControl && CurrentControl != null)
+            {
+                _LastControl = CurrentControl;
+            }
+        }
+
+
+        internal Control CurrentControl { get; set; }
+        private Control _LastControl;
+        /*
+        public void MoveNearControl(Control control)
+        {
+            // We want to show the keyboard near the target control, horizontally centered, 
+            // under the control or above it and without overlapping it, if possible.
+
+            // First try to position the Keyboard under the target control.
+            Point location = control.PointToScreen(Point.Empty);
+            location.Offset(control.Width / 2 - Width / 2, control.Height);
+            Location = location;
+
+            // And make sure it is in the screen containing the control.
+            EnsureInScreen(control);
+
+            // Now check if this position does not overlap the control.
+            if (!OverlapsControl(control))
+                return;
+
+            // Now we try to position the Keyboard above the control.
+            location = control.PointToScreen(Point.Empty);
+            location.Offset(control.Width / 2 - Width / 2, -Height);
+            Location = location;
+
+            // And again make sure this location is in the screen with the control.
+            EnsureInScreen(control);
+
+            // And check if it does not overlap the control.
+            if (!OverlapsControl(control))
+                return;
+
+            // If both below and above the control was not a good position, then this means the
+            // target control is quite large, so show the Keyboard inside it.
+            location = control.PointToScreen(Point.Empty);
+            location.Offset(control.Width / 2 - Width / 2, control.Height / 2 - Height / 2);
+
+            // And again, make sure the Keybboard is not clipped by the screen.
+            EnsureInScreen(control);
+        }
+
+        /// <summary>
+        /// Returns true if the Keyboard overlaps the specified control.
+        /// </summary>
+        /// <param name="control">The control for which to check if it is overlapped by the Keyboard.</param>
+        /// <returns></returns>
+        private bool OverlapsControl(Control control)
+        {
+            Rectangle rect = new Rectangle(control.PointToScreen(Point.Empty), control.Size);
+            return rect.IntersectsWith(Bounds);
+        }
+
+        /// <summary>
+        /// Checks if the Keyboard is in the screen containing the specified control, and if 
+        /// the Keyboard is not fully visible, adjusts it's location accordingly.
+        /// </summary>
+        /// <param name="control">The control from which the screen is checked. If null, the primary screen is used.</param>
+        private void EnsureInScreen(Control control)
+        {
+            Screen screen = Screen.PrimaryScreen;
+            
+            if(control != null)
+                screen = Screen.FromControl(control);
+
+            Rectangle rect = screen.WorkingArea;
+
+            if (Location.X < rect.Left)
+                Location = new Point(rect.Left, Location.Y);
+
+            if (Location.Y < rect.Top)
+                Location = new Point(Location.X, rect.Top);
+
+            if (Bounds.Right > rect.Right)
+                Location = new Point(rect.Right - Width, Location.Y);
+
+            if (Bounds.Bottom > rect.Bottom)
+                Location = new Point(Location.X, rect.Bottom - Height);
+        }
+        */
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Keyboard/Renderer.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Keyboard/Renderer.cs
new file mode 100644
index 00000000..0db151dd
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Keyboard/Renderer.cs	
@@ -0,0 +1,546 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+using System.Diagnostics;
+using System.Windows.Forms;
+using System.Drawing.Drawing2D;
+
+namespace DevComponents.DotNetBar.Keyboard
+{
+    /// <summary>
+    /// Represents a renderer for a VirtualKeyboard.
+    /// </summary>
+    public abstract class Renderer
+    {
+        private VirtualKeyboardColorTable _ColorTable;
+        /// <summary>
+        /// Gets or sets the ColorTable used by this renderer to render the virtual keyboard.
+        /// </summary>
+        public VirtualKeyboardColorTable ColorTable
+        {
+            get { return _ColorTable; }
+            set { _ColorTable = value; }
+        }
+
+        /// <summary>
+        /// Draws the top bar of the VirtualKeyboard.
+        /// </summary>
+        /// <param name="args"></param>
+        public abstract void DrawTopBar(TopBarRendererEventArgs args);
+
+
+        public abstract void DrawCloseButton(CloseButtonRendererEventArgs args);
+
+        /// <summary>
+        /// Draws the background of the VirtualKeyboard.
+        /// </summary>
+        /// <param name="args">Provides context information.</param>
+        public abstract void DrawBackground(BackgroundRendererEventArgs args);
+
+        /// <summary>
+        /// Draws a key of the VirtualKeyboard.
+        /// </summary>
+        /// <param name="args">Provides context information.</param>
+        public abstract void DrawKey(KeyRendererEventArgs args);
+
+        /// <summary>
+        /// Called when the control starts rendering a new frame.
+        /// </summary>
+        /// <param name="args">Provides context information.</param>
+        public virtual void BeginFrame(BeginFrameRendererEventArgs args) { }
+
+        /// <summary>
+        /// Called after the control finished rendering the frame.
+        /// </summary>
+        public virtual void EndFrame() { }
+    }
+
+
+    /// <summary>
+    /// Represents a VirtualKeyboard renderer with a flat style.
+    /// </summary>
+    public class FlatStyleRenderer : Renderer
+    {
+        // The ratio between the key size and the font that displays the letters on the keys.
+        private const float _KeyFontSizeRatio = 4;
+
+        // The ratio between the key size and the font that displays the hints (e.g. Underline, Italic) on the keys.
+        private const float _HintFontSizeRatio = 7;
+
+        private StringFormat _CenteredTextStringFormat;
+        private StringFormat _TopCenteredTextStringFormat;
+        private float _ScaleFactorX;
+        private float _ScaleFactorY;
+        private Font _KeyFont;
+        private Font _HintFont;
+        private Rectangle _KeysBounds;
+
+        private static VirtualKeyboardColorTable _DefaultColorTable = new VirtualKeyboardColorTable();
+
+
+        /// <summary>
+        /// Gets or sets whether anti-alias smoothing is used while painting. Default value is true.
+        /// </summary>
+        public bool ForceAntiAlias { get; set; }
+
+
+        /// <summary>
+        /// Starts rendering a new frame with the black style. This gives the renderer a chance to cash some resources.
+        /// </summary>
+        public override void BeginFrame(BeginFrameRendererEventArgs args)
+        {
+            _CenteredTextStringFormat = new StringFormat();
+            _CenteredTextStringFormat.Alignment = StringAlignment.Center;
+            _CenteredTextStringFormat.LineAlignment = StringAlignment.Center;
+
+            _TopCenteredTextStringFormat = new StringFormat();
+            _TopCenteredTextStringFormat.Alignment = StringAlignment.Center;
+            _TopCenteredTextStringFormat.LineAlignment = StringAlignment.Near;
+
+            // With this fx and fy we convert between logical units and pixels.
+            _ScaleFactorX = (float)args.Bounds.Width / args.Layout.LogicalWidth;
+            _ScaleFactorY = (float)args.Bounds.Height / args.Layout.LogicalHeight;
+
+            _KeysBounds = args.Bounds;
+
+            float min = Math.Min(_ScaleFactorX, _ScaleFactorY);
+
+            float keyFontSize = min * LinearKeyboardLayout.NormalKeySize / _KeyFontSizeRatio;
+            float hintFontSize = min * LinearKeyboardLayout.NormalKeySize / _HintFontSizeRatio;
+
+            if (keyFontSize < 1)
+                keyFontSize = 1;
+            if (hintFontSize < 1)
+                hintFontSize = 1;
+
+            _KeyFont = new Font(args.Font.FontFamily, keyFontSize);
+            _HintFont = new Font(args.Font.FontFamily, hintFontSize);
+
+            if (ForceAntiAlias)
+                args.Graphics.TextRenderingHint = System.Drawing.Text.TextRenderingHint.AntiAlias;
+        }
+
+
+        /// <summary>
+        /// Ends rendering a new frame with the black style. This gives the renderer a chance to free resources used during the frame.
+        /// </summary>
+        public override void EndFrame()
+        {
+            if (_CenteredTextStringFormat != null)
+                _CenteredTextStringFormat.Dispose();
+
+            if (_TopCenteredTextStringFormat != null)
+                _TopCenteredTextStringFormat.Dispose();
+
+            if (_KeyFont != null)
+                _KeyFont.Dispose();
+
+            if (_HintFont != null)
+                _HintFont.Dispose();
+        }
+
+
+        /// <summary>
+        /// Creates a new renderer for the black style.
+        /// </summary>
+        public FlatStyleRenderer()
+        {
+            ColorTable = _DefaultColorTable;
+        }
+
+
+        /// <summary>
+        /// Draws the background of a VirtualKeyboard.
+        /// </summary>
+        /// <param name="args">Provides context information.</param>
+        public override void DrawBackground(BackgroundRendererEventArgs args)
+        {
+            if (ColorTable != null)
+                args.Graphics.FillRectangle(ColorTable.BackgroundBrush, args.ClipRectangle);
+        }
+
+
+        internal static void DrawBackspaceSign(Graphics g, Rectangle rect, Brush background, Brush foreground)
+        {
+            SmoothingMode osm = g.SmoothingMode; // old smoothing mode, to restore it at the end.
+            g.SmoothingMode = SmoothingMode.AntiAlias;
+
+            int unit = Math.Min(rect.Width, rect.Height);
+
+            Point[] points = new Point[]
+            {
+                new Point(-2 * unit, 0),
+                new Point(-1 * unit, -1 * unit),
+                new Point(2 * unit, -1 * unit),
+                new Point(2 * unit, 1 * unit),
+                new Point(-1 * unit, 1 * unit),
+                new Point(-2 * unit, 0)
+            };
+
+            g.TranslateTransform(rect.Left + rect.Width / 2, rect.Top + rect.Height / 2);
+            g.ScaleTransform(0.125f, 0.125f);
+
+            g.FillPolygon(foreground, points);
+
+            g.ScaleTransform(8, 8);
+
+
+            g.ScaleTransform(0.125f, 0.125f);
+            g.TranslateTransform(unit / 2, 0);
+
+            using (Pen p = new Pen(background, unit * 8 / 20))
+            {
+                g.DrawLine(p, -unit / 2, -unit / 2, unit / 2, unit / 2);
+                g.DrawLine(p, -unit / 2, unit / 2, unit / 2, -unit / 2);
+            }
+
+            g.TranslateTransform(-unit / 2, 0);
+            g.ScaleTransform(8, 8);
+
+            g.TranslateTransform(-(rect.Left + rect.Width / 2), -(rect.Top + rect.Height / 2));
+            g.SmoothingMode = osm;
+        }
+
+
+        internal static void DrawSmileySign(Graphics g, Rectangle rect, Brush background, Brush foreground)
+        {
+            SmoothingMode osm = g.SmoothingMode; // old smoothing mode, to restore it at the end.
+            g.SmoothingMode = SmoothingMode.AntiAlias;
+
+            int unit = Math.Min(rect.Width, rect.Height) * 2 / 5;
+            float u = unit / 20f;
+
+            PointF[] points = new PointF[]
+            {
+                new PointF(-5, 0),
+                new PointF(-7, 1),
+                new PointF(-6, 5),
+                new PointF(-2, 8),
+                new PointF(2, 8),
+                new PointF(6, 5),
+                new PointF(7, 1),
+                new PointF(5, 0),
+                new PointF(0, 2)
+            };
+
+            for (int i = 0; i < points.Length; i++)
+            {
+                points[i].X *= u;
+                points[i].Y *= u;
+            }
+
+            g.TranslateTransform(rect.Left + rect.Width / 2, rect.Top + rect.Height / 2);
+
+            g.FillEllipse(foreground, new Rectangle(-unit / 2, -unit / 2, unit, unit));
+
+            g.FillClosedCurve(background, points, System.Drawing.Drawing2D.FillMode.Winding, 0.5f);
+
+            g.FillEllipse(background, new Rectangle((int)(-7 * u), (int)(-7 * u), (int)(5 * u), (int)(5 * u)));
+            g.FillEllipse(background, new Rectangle((int)(2 * u), (int)(-7 * u), (int)(5 * u), (int)(5 * u)));
+
+            g.TranslateTransform(-(rect.Left + rect.Width / 2), -(rect.Top + rect.Height / 2));
+
+            g.SmoothingMode = osm;
+        }
+
+
+        internal static void DrawUpArrow(Graphics g, Rectangle rect, Brush background, Brush foreground)
+        {
+            SmoothingMode osm = g.SmoothingMode; // old smoothing mode, to restore it at the end.
+            g.SmoothingMode = SmoothingMode.AntiAlias;
+
+            int unit = Math.Min(rect.Width, rect.Height) / 2 / 4;
+
+            g.TranslateTransform(rect.Left + rect.Width / 2, rect.Top + rect.Height / 2);
+
+            using (Pen p = new Pen(foreground, unit / 2f))
+            {
+                g.DrawLine(p, 0, -unit * 1.5f, 0, unit * 1.5f);
+                g.DrawLine(p, 0, -unit * 1.5f, -unit, 0);
+                g.DrawLine(p, 0, -unit * 1.5f, unit, 0);
+            }
+
+            g.TranslateTransform(-(rect.Left + rect.Width / 2), -(rect.Top + rect.Height / 2));
+
+            g.SmoothingMode = osm;
+        }
+
+
+
+        /// <summary>
+        /// Draws the key of a VirtualKeyboard.
+        /// </summary>
+        /// <param name="args">Provides context information.</param>
+        public override void DrawKey(KeyRendererEventArgs args)
+        {
+            Key key = args.Key;
+
+            if (ColorTable != null)
+            {
+                Rectangle rect = args.Bounds;
+
+                if (args.ClipRectangle.IntersectsWith(rect))
+                {
+                    Brush keyBrush = ColorTable.KeysBrush;
+                    if (key.Style == KeyStyle.Dark)
+                        keyBrush = ColorTable.DarkKeysBrush;
+                    else if (key.Style == KeyStyle.Light)
+                        keyBrush = ColorTable.LightKeysBrush;
+                    else if (key.Style == KeyStyle.Pressed)
+                        keyBrush = ColorTable.PressedKeysBrush;
+                    else if (key.Style == KeyStyle.Toggled)
+                        keyBrush = ColorTable.KeysBrush;
+
+                    if (args.IsDown)
+                        keyBrush = ColorTable.DownKeysBrush;
+
+                    Brush textBrush = ColorTable.TextBrush;
+                    if (key.Style == KeyStyle.Toggled)
+                        textBrush = ColorTable.ToggleTextBrush;
+                    if (args.IsDown)
+                        textBrush = ColorTable.DownTextBrush;
+
+                    args.Graphics.FillRectangle(keyBrush, rect);
+
+
+                    if (key.Info == "{BACKSPACE}")
+                    {
+                        DrawBackspaceSign(args.Graphics, rect, keyBrush, textBrush);
+                    }
+                    else if (key.Caption == ":-)")
+                    {
+                        DrawSmileySign(args.Graphics, rect, keyBrush, textBrush);
+                    }
+                    else if (key.Caption == "Shift")
+                    {
+                        DrawUpArrow(args.Graphics, rect, keyBrush, textBrush);
+                    }
+                    else
+                    {
+                        args.Graphics.DrawString(key.Caption, _KeyFont, textBrush, rect, _CenteredTextStringFormat);
+
+                        if (key.Hint != null)
+                        {
+                            args.Graphics.DrawString(key.Hint, _HintFont, textBrush, rect, _TopCenteredTextStringFormat);
+                        }
+                    }
+                }
+            }
+        }
+
+
+        public override void DrawCloseButton(CloseButtonRendererEventArgs args)
+        {
+            Rectangle rect = args.Bounds;
+            rect.Inflate(-4, -4);
+            if (args.IsDown)
+            {
+                args.Graphics.FillRectangle(ColorTable.DownKeysBrush, args.Bounds);
+                using (Pen p = new Pen(ColorTable.DownTextBrush, 4))
+                {
+                    args.Graphics.DrawLine(p, rect.Left, rect.Top, rect.Right, rect.Bottom);
+                    args.Graphics.DrawLine(p, rect.Left, rect.Bottom, rect.Right, rect.Top);
+                }
+            }
+            else
+            {
+                //args.Graphics.FillRectangle(ColorTable.KeysBrush, args.Bounds);
+                using (Pen p = new Pen(ColorTable.TextBrush, 4))
+                {
+                    args.Graphics.DrawLine(p, rect.Left, rect.Top, rect.Right, rect.Bottom);
+                    args.Graphics.DrawLine(p, rect.Left, rect.Bottom, rect.Right, rect.Top);
+                }
+            }
+
+        }
+
+
+        public override void DrawTopBar(TopBarRendererEventArgs args)
+        {
+            args.Graphics.DrawString(args.Text, args.Font, ColorTable.TopBarTextBrush, args.Bounds);
+        }
+    }
+
+
+    /// <summary>
+    /// Provides data for Key rendering.
+    /// </summary>
+    public class KeyRendererEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets a reference to the Key instance being rendered.
+        /// </summary>
+        public Key Key { get; private set; }
+
+        public Rectangle Bounds { get; private set; }
+
+        /// <summary>
+        /// Gets a reference to the Graphics object to be used for rendering.
+        /// </summary>
+        public Graphics Graphics { get; private set; }
+
+        /// <summary>
+        /// Gets a value indicating if this key is currently down.
+        /// </summary>
+        public bool IsDown { get; private set; }
+
+        /// <summary>
+        /// Gets the rectangle in which to paint.
+        /// </summary>
+        public Rectangle ClipRectangle { get; private set; }
+
+        /// <summary>
+        /// Creates a new instance and initializes it with provided values.
+        /// </summary>
+        /// <param name="graphics">The Graphics object to be used for rendering.</param>
+        /// <param name="key">The Key instance being rendered.</param>
+        /// <param name="isDown">Indicates if the key is currently hold down.</param>
+        /// <param name="clipRectangle">The rectangle in which to paint.</param>
+        public KeyRendererEventArgs(Graphics graphics, Key key, bool isDown, Rectangle clipRectangle, Rectangle bounds)
+        {
+            Key = key;
+            Graphics = graphics;
+            IsDown = isDown;
+            ClipRectangle = clipRectangle;
+            Bounds = bounds;
+        }
+    }
+
+
+    /// <summary>
+    /// Provides data for rendering the background of a VirtualKeyboard.
+    /// </summary>
+    public class BackgroundRendererEventArgs : EventArgs
+    {
+        public Rectangle Bounds { get; private set; }
+
+        /// <summary>
+        /// Gets a reference to the Graphics object to be used for rendering.
+        /// </summary>
+        public Graphics Graphics { get; private set; }
+
+        /// <summary>
+        /// Gets the rectangle in which to paint.
+        /// </summary>
+        public Rectangle ClipRectangle { get; private set; }
+
+        /// <summary>
+        /// Creates a new instance and initializes it with provided values.
+        /// </summary>
+        /// <param name="graphics">The Graphics object to be used for rendering.</param>
+        /// <param name="size">The area where the background should be drawn.</param>
+        public BackgroundRendererEventArgs(Graphics graphics, Rectangle clipRectangle, Rectangle bounds)
+        {
+            Graphics = graphics;
+            ClipRectangle = clipRectangle;
+            Bounds = bounds;
+        }
+    }
+
+
+    public class BeginFrameRendererEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets a reference to the Graphics object to be used for rendering.
+        /// </summary>
+        public Graphics Graphics { get; private set; }
+
+        /// <summary>
+        /// Gets the rectangle in which to paint.
+        /// </summary>
+        public Rectangle ClipRectangle { get; private set; }
+
+        /// <summary>
+        /// Gets the size of the background area in which to render the keyboard.
+        /// </summary>
+        //public Size Size { get; private set; }
+        public Rectangle Bounds { get; private set; }
+
+        /// <summary>
+        /// Gets the font on the control.
+        /// </summary>
+        public Font Font { get; private set; }
+
+        /// <summary>
+        /// Gets the current KeyboardLayout which will be rendered in this frame.
+        /// </summary>
+        public KeyboardLayout Layout { get; private set; }
+
+        /// <summary>
+        /// Creates a new instance and initializes it with provided values.
+        /// </summary>
+        /// <param name="size">The size of the background area.</param>
+        /// <param name="font">The font of the control.</param>
+        /// <param name="layout">The current KeyboardLayout that will be rendered in this frame.</param>
+        public BeginFrameRendererEventArgs(Graphics graphics, Rectangle clipRectangle, Rectangle bounds, Font font, KeyboardLayout layout)
+        {
+            Graphics = graphics;
+            ClipRectangle = clipRectangle;
+            Bounds = bounds;
+            Font = font;
+            Layout = layout;
+        }
+    }
+
+
+    public class TopBarRendererEventArgs : EventArgs
+    {
+        public string Text { get; private set; }
+
+        public Rectangle Bounds { get; private set; }
+
+        /// <summary>
+        /// Gets a reference to the Graphics object to be used for rendering.
+        /// </summary>
+        public Graphics Graphics { get; private set; }
+
+        /// <summary>
+        /// Gets the rectangle in which to paint.
+        /// </summary>
+        public Rectangle ClipRectangle { get; private set; }
+
+        /// <summary>
+        /// Gets the font on the control.
+        /// </summary>
+        public Font Font { get; private set; }
+
+        public TopBarRendererEventArgs(Graphics graphics, Rectangle clipRectangle, Rectangle bounds, string text, Font font)
+        {
+            Graphics = graphics;
+            ClipRectangle = clipRectangle;
+            Bounds = bounds;
+            Text = text;
+            Font = font;
+        }
+    }
+
+
+    public class CloseButtonRendererEventArgs : EventArgs
+    {
+        public Rectangle Bounds { get; private set; }
+
+        /// <summary>
+        /// Gets a reference to the Key instance being rendered.
+        /// </summary>
+        public Graphics Graphics { get; private set; }
+
+        /// <summary>
+        /// Gets the area where background should be drawn.
+        /// </summary>
+        public Rectangle ClipRectangle { get; private set; }
+
+        /// <summary>
+        /// Gets a value indicating if this key is currently down.
+        /// </summary>
+        public bool IsDown { get; private set; }
+
+        public CloseButtonRendererEventArgs(Graphics graphics, bool isDown, Rectangle clipRectangle, Rectangle bounds)
+        {
+            Graphics = graphics;
+            ClipRectangle = clipRectangle;
+            Bounds = bounds;
+            IsDown = isDown;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Keyboard/Touch/TouchHandler.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Keyboard/Touch/TouchHandler.cs
new file mode 100644
index 00000000..f33878f5
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Keyboard/Touch/TouchHandler.cs	
@@ -0,0 +1,916 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows.Forms;
+using System.Drawing;
+using System.Runtime.InteropServices;
+using System.Data;
+
+namespace DevComponents.DotNetBar.Touch
+{
+    internal class TouchHandler
+    {
+        #region Events
+        public event EventHandler<GestureEventArgs> PanBegin;
+        /// <summary>
+        /// Raises PanBegin event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnPanBegin(GestureEventArgs e)
+        {
+            EventHandler<GestureEventArgs> handler = PanBegin;
+            if (handler != null)
+                handler(this, e);
+        }
+        public event EventHandler<GestureEventArgs> PanEnd;
+        /// <summary>
+        /// Raises PanBegin event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnPanEnd(GestureEventArgs e)
+        {
+            EventHandler<GestureEventArgs> handler = PanEnd;
+            if (handler != null)
+                handler(this, e);
+        }
+        public event EventHandler<GestureEventArgs> Pan;
+        /// <summary>
+        /// Raises PanBegin event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnPan(GestureEventArgs e)
+        {
+            EventHandler<GestureEventArgs> handler = Pan;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        public event EventHandler<GestureEventArgs> Begin;
+        /// <summary>
+        /// Raises Begin event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnBegin(GestureEventArgs e)
+        {
+            EventHandler<GestureEventArgs> handler = Begin;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        public event EventHandler<GestureEventArgs> End;
+        /// <summary>
+        /// Raises End event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnEnd(GestureEventArgs e)
+        {
+            EventHandler<GestureEventArgs> handler = End;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        public event EventHandler<GestureEventArgs> PressAndTap;
+        /// <summary>
+        /// Raises PressAndTap event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnPressAndTap(GestureEventArgs e)
+        {
+            EventHandler<GestureEventArgs> handler = PressAndTap;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        public event EventHandler<GestureEventArgs> RotateBegin;
+        /// <summary>
+        /// Raises RotateBegin event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnRotateBegin(GestureEventArgs e)
+        {
+            EventHandler<GestureEventArgs> handler = RotateBegin;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        public event EventHandler<GestureEventArgs> Rotate;
+        /// <summary>
+        /// Raises Rotate event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnRotate(GestureEventArgs e)
+        {
+            EventHandler<GestureEventArgs> handler = Rotate;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        public event EventHandler<GestureEventArgs> RotateEnd;
+        /// <summary>
+        /// Raises RotateEnd event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnRotateEnd(GestureEventArgs e)
+        {
+            EventHandler<GestureEventArgs> handler = RotateEnd;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        public event EventHandler<GestureEventArgs> TwoFingerTap;
+        /// <summary>
+        /// Raises TwoFingerTap event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnTwoFingerTap(GestureEventArgs e)
+        {
+            EventHandler<GestureEventArgs> handler = TwoFingerTap;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        public event EventHandler<GestureEventArgs> ZoomBegin;
+        /// <summary>
+        /// Raises ZoomBegin event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnZoomBegin(GestureEventArgs e)
+        {
+            EventHandler<GestureEventArgs> handler = ZoomBegin;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        public event EventHandler<GestureEventArgs> Zoom;
+        /// <summary>
+        /// Raises Zoom event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnZoom(GestureEventArgs e)
+        {
+            EventHandler<GestureEventArgs> handler = Zoom;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        public event EventHandler<GestureEventArgs> ZoomEnd;
+        /// <summary>
+        /// Raises ZoomEnd event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnZoomEnd(GestureEventArgs e)
+        {
+            EventHandler<GestureEventArgs> handler = ZoomEnd;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        // Touch events
+        public event EventHandler<TouchEventArgs> TouchDown;
+        /// <summary>
+        /// Raises TouchDown event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnTouchDown(TouchEventArgs e)
+        {
+            EventHandler<TouchEventArgs> handler = TouchDown;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        public event EventHandler<TouchEventArgs> TouchUp;
+        /// <summary>
+        /// Raises TouchDown event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnTouchUp(TouchEventArgs e)
+        {
+            EventHandler<TouchEventArgs> handler = TouchUp;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        public event EventHandler<TouchEventArgs> TouchMove;
+        /// <summary>
+        /// Raises TouchDown event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnTouchMove(TouchEventArgs e)
+        {
+            EventHandler<TouchEventArgs> handler = TouchMove;
+            if (handler != null)
+                handler(this, e);
+        }
+        #endregion
+
+        #region Constructor
+        private Control _ParentControl = null;
+        private eTouchHandlerType _HandlerType = eTouchHandlerType.Gesture;
+        /// <summary>
+        /// Initializes a new instance of the TouchHandler class.
+        /// </summary>
+        /// <param name="parentControl"></param>
+        public TouchHandler(Control parentControl) : this(parentControl, eTouchHandlerType.Gesture) { }
+
+        /// <summary>
+        /// Initializes a new instance of the TouchHandler class.
+        /// </summary>
+        /// <param name="parentControl"></param>
+        public TouchHandler(Control parentControl, eTouchHandlerType handlerType)
+        {
+            _ParentControl = parentControl;
+            _HandlerType = handlerType;
+            if (IsTouchEnabled)
+            {
+                if (_ParentControl.IsHandleCreated)
+                    Initialize();
+                else
+                    _ParentControl.HandleCreated += new EventHandler(ParentControlHandleCreated);
+            }
+        }
+        #endregion
+
+        #region Implementation
+        void ParentControlHandleCreated(object sender, EventArgs e)
+        {
+            Initialize();
+        }
+
+        private IntPtr _originalWindowProcId;
+        private WinApi.WindowProcDelegate _windowProcDelegate;
+        /// <summary>
+        /// Initializes handler
+        /// </summary>
+        private void Initialize()
+        {
+            if (!RegisterTouchWindow())
+            {
+                throw new NotSupportedException("Cannot register window");
+            }
+
+            _windowProcDelegate = WindowProc;
+
+            _originalWindowProcId = IntPtr.Size == 4 ?
+                WinApi.SubclassWindow(_ParentControl.Handle, WinApi.GWLP_WNDPROC, _windowProcDelegate) :
+                WinApi.SubclassWindow64(_ParentControl.Handle, WinApi.GWLP_WNDPROC, _windowProcDelegate);
+
+            //take the desktop DPI
+            using (Graphics graphics = Graphics.FromHwnd(_ParentControl.Handle))
+            {
+                DpiX = graphics.DpiX;
+                DpiY = graphics.DpiY;
+            }
+        }
+
+
+        public Control ParentControl
+        {
+            get { return _ParentControl; }
+        }
+
+        /// <summary>
+        /// The Windows message handler.
+        /// </summary>
+        private uint WindowProc(IntPtr hWnd, int msg, IntPtr wParam, IntPtr lParam)
+        {
+            if(msg == WinApi.WM_TOUCH && (_HandlerType & eTouchHandlerType.Touch)== eTouchHandlerType.Touch)
+            {
+                foreach (TouchEventArgs arg in DecodeMessage(hWnd, msg, wParam, lParam, DpiX, DpiY))
+                {
+
+                    if (arg.IsTouchDown)
+                        OnTouchDown(arg);
+                
+                    if (arg.IsTouchMove)
+                        OnTouchMove(arg);
+                
+                    if (arg.IsTouchUp)
+                        OnTouchUp(arg);
+                }
+                return 1;
+            }
+
+            // Handle only gesture message
+            if (msg != WinApi.WM_GESTURE)
+            {
+                return WinApi.CallWindowProc(_originalWindowProcId, hWnd, msg, wParam, lParam);
+            }
+
+            WinApi.GESTUREINFO gestureInfo = new WinApi.GESTUREINFO();
+            gestureInfo.cbSize = (uint)Marshal.SizeOf(typeof(WinApi.GESTUREINFO));
+
+            bool result = WinApi.GetGestureInfo(lParam, ref gestureInfo);
+
+            if (!result)
+                throw new Exception("Cannot retrieve gesture information");
+
+            //Decode the gesture info and get the message event argument
+            GestureEventArgs eventArgs = new GestureEventArgs(this, ref gestureInfo);
+            try
+            {
+                //Fire the event using the event map
+                uint gestureId = GetGestureEventId(gestureInfo.dwID, gestureInfo.dwFlags);
+                if (gestureId == GestureEventId.Begin)
+                    OnBegin(eventArgs);
+                else if (gestureId == GestureEventId.End)
+                    OnEnd(eventArgs);
+                else if (gestureId == GestureEventId.Pan)
+                    OnPan(eventArgs);
+                else if (gestureId == GestureEventId.PanBegin)
+                    OnPanBegin(eventArgs);
+                else if (gestureId == GestureEventId.PanEnd)
+                    OnPanEnd(eventArgs);
+                else if (gestureId == GestureEventId.PressAndTap)
+                    OnPressAndTap(eventArgs);
+                else if (gestureId == GestureEventId.Rotate)
+                    OnRotate(eventArgs);
+                else if (gestureId == GestureEventId.RotateBegin)
+                    OnRotateBegin(eventArgs);
+                else if (gestureId == GestureEventId.RotateEnd)
+                    OnRotateEnd(eventArgs);
+                else if (gestureId == GestureEventId.TwoFingerTap)
+                    OnTwoFingerTap(eventArgs);
+                else if (gestureId == GestureEventId.Zoom)
+                    OnZoom(eventArgs);
+                else if (gestureId == GestureEventId.ZoomBegin)
+                    OnZoomBegin(eventArgs);
+                else if (gestureId == GestureEventId.ZoomEnd)
+                    OnZoomEnd(eventArgs);
+            }
+            catch (ArgumentOutOfRangeException) //In case future releases will introduce new event values
+            {
+            }
+
+            //Keep the last message for relative calculations
+            LastEventArgs = eventArgs;
+
+            //Keep the first message for relative calculations
+            if (eventArgs.IsBegin)
+                LastBeginEventArgs = eventArgs;
+
+            WinApi.CloseGestureInfoHandle(lParam);
+
+            return 1;
+        }
+
+        /// <summary>
+        /// Decode the message and create a collection of event arguments
+        /// </summary>
+        private IEnumerable<TouchEventArgs> DecodeMessage(IntPtr hWnd, int msg, IntPtr wParam, IntPtr lParam, float dpiX, float dpiY)
+        {
+            // More than one touch input can be associated with a touch message
+            int inputCount = WinApi.LoWord(wParam.ToInt32()); // Number of touch inputs, actual per-contact messages
+
+            WinApi.TOUCHINPUT[] inputs; // Array of TOUCHINPUT structures
+            inputs = new WinApi.TOUCHINPUT[inputCount]; // Allocate the storage for the parameters of the per-contact messages
+            try
+            {
+                // Unpack message parameters into the array of TOUCHINPUT structures, each representing a message for one single contact.
+                if (!WinApi.GetTouchInputInfo(lParam, inputCount, inputs, Marshal.SizeOf(inputs[0])))
+                {
+                    // Touch info failed.
+                    throw new Exception("Error calling GetTouchInputInfo API");
+                }
+
+                // For each contact, dispatch the message to the appropriate message handler.
+                // For WM_TOUCHDOWN you can get down & move notifications and for WM_TOUCHUP you can get up & move notifications
+                // WM_TOUCHMOVE will only contain move notifications and up & down notifications will never come in the same message
+                for (int i = 0; i < inputCount; i++)
+                {
+                    TouchEventArgs touchEventArgs = new TouchEventArgs(this, dpiX, dpiY, ref inputs[i]);
+                    yield return touchEventArgs;
+                }
+            }
+            finally
+            {
+                WinApi.CloseTouchInputHandle(lParam);
+            }
+        }
+
+        private GestureEventArgs _LastBeginEventArgs;
+        /// <summary>
+        /// The event arguments that started the current gesture
+        /// </summary>
+        internal GestureEventArgs LastBeginEventArgs
+        {
+            get { return _LastBeginEventArgs; }
+            set { _LastBeginEventArgs = value; }
+        }
+        /// <summary>
+        /// The last event in the current gesture event sequence
+        /// </summary>
+        private GestureEventArgs _LastEventArgs;
+        internal GestureEventArgs LastEventArgs
+        {
+            get { return _LastEventArgs; }
+            set { _LastEventArgs = value; }
+        }
+
+
+        private static class GestureEventId
+        {
+            public static readonly uint Begin = GetGestureEventId(WinApi.GID_BEGIN, 0);
+            public static readonly uint End = GetGestureEventId(WinApi.GID_END, 0);
+            public static readonly uint PanBegin = GetGestureEventId(WinApi.GID_PAN, WinApi.GF_BEGIN);
+            public static readonly uint Pan = GetGestureEventId(WinApi.GID_PAN, 0);
+            public static readonly uint PanEnd = GetGestureEventId(WinApi.GID_PAN, WinApi.GF_END);
+            public static readonly uint PressAndTap = GetGestureEventId(WinApi.GID_PRESSANDTAP, 0);
+            public static readonly uint RotateBegin = GetGestureEventId(WinApi.GID_ROTATE, WinApi.GF_BEGIN);
+            public static readonly uint Rotate = GetGestureEventId(WinApi.GID_ROTATE, 0);
+            public static readonly uint RotateEnd = GetGestureEventId(WinApi.GID_ROTATE, WinApi.GF_END);
+            public static readonly uint TwoFingerTap = GetGestureEventId(WinApi.GID_TWOFINGERTAP, 0);
+            public static readonly uint ZoomBegin = GetGestureEventId(WinApi.GID_ZOOM, WinApi.GF_BEGIN);
+            public static readonly uint Zoom = GetGestureEventId(WinApi.GID_ZOOM, 0);
+            public static readonly uint ZoomEnd = GetGestureEventId(WinApi.GID_ZOOM, WinApi.GF_END);
+        }
+        private static uint GetGestureEventId(uint dwID, uint dwFlags)
+        {
+            return (dwID << 3) + (dwID == WinApi.GID_TWOFINGERTAP || dwID == WinApi.GID_PRESSANDTAP
+                || dwID == WinApi.GID_BEGIN || dwID == WinApi.GID_END ?
+                0 : dwFlags & 5);
+        }
+
+        /// <summary>
+        /// Register for touch event
+        /// </summary>
+        /// <returns>true if succeeded</returns>
+        private bool RegisterTouchWindow()
+        {
+            bool result = false;
+            if ((_HandlerType & eTouchHandlerType.Gesture) == eTouchHandlerType.Gesture)
+            {
+                WinApi.GESTURECONFIG[] gestureConfig = new WinApi.GESTURECONFIG[] { new WinApi.GESTURECONFIG(0, WinApi.GC_ALLGESTURES, 0) };
+                result = WinApi.SetGestureConfig(_ParentControl.Handle, 0, 1, gestureConfig, (uint)Marshal.SizeOf(typeof(WinApi.GESTURECONFIG)));
+            }
+
+            if ((_HandlerType & eTouchHandlerType.Touch) == eTouchHandlerType.Touch)
+            {
+                result |= WinApi.RegisterTouchWindow(_ParentControl.Handle, _DisablePalmRejection ? WinApi.TouchWindowFlag.WantPalm : 0);
+            }
+            return result;
+        }
+
+        private bool _DisablePalmRejection;
+        /// <summary>
+        /// Gets or sets whether palm rejection is enabled.
+        /// </summary>
+        public bool DisablePalmRejection
+        {
+            get
+            {
+                return _DisablePalmRejection;
+            }
+            set
+            {
+                if (_DisablePalmRejection == value)
+                    return;
+
+                _DisablePalmRejection = value;
+
+                if (_ParentControl.IsHandleCreated)
+                {
+                    WinApi.UnregisterTouchWindow(_ParentControl.Handle);
+                    RegisterTouchWindow();
+                }
+            }
+        }
+
+        private float _DpiX;
+        public float DpiX
+        {
+            get { return _DpiX; }
+            set { _DpiX = value; }
+        }
+
+        private float _DpiY;
+        public float DpiY
+        {
+            get { return _DpiY; }
+            set { _DpiY = value; }
+        }
+
+        /// <summary>
+        /// Check if Multi-touch support device is ready
+        /// </summary>
+        public static bool IsTouchEnabled
+        {
+            get
+            {
+                return (WinApi.GetDigitizerStatus() & (WinApi.DigitizerStatus.StackReady | WinApi.DigitizerStatus.MultiInput)) != 0;
+            }
+        }
+        #endregion
+    }
+    [Flags]
+    internal enum eTouchHandlerType : short
+    {
+        Gesture = 1,
+        Touch = 2
+    }
+
+    internal class GestureEventArgs : EventArgs
+    {
+        private readonly uint _Flags;
+
+        /// <summary>
+        /// Create new gesture event instance and decode the gesture info structure
+        /// </summary>
+        /// <param name="handler">The gesture handler</param>
+        /// <param name="gestureInfo">The gesture information</param>
+        internal GestureEventArgs(TouchHandler handler, ref WinApi.GESTUREINFO gestureInfo)
+        {
+            _Flags = gestureInfo.dwFlags;
+            GestureId = gestureInfo.dwID;
+            GestureArguments = gestureInfo.ullArguments;
+
+            //Get the last event from the handler
+            LastEvent = handler.LastEventArgs;
+
+            //Get the last begin event from the handler 
+            LastBeginEvent = handler.LastBeginEventArgs;
+
+            ParseGesture(handler.ParentControl, ref gestureInfo);
+
+            //new gesture, clear last and first event fields
+            if (IsBegin)
+            {
+                LastBeginEvent = null;
+                LastEvent = null;
+            }
+        }
+
+        //Decode the gesture
+        private void ParseGesture(Control parentControl, ref WinApi.GESTUREINFO gestureInfo)
+        {
+            Location = parentControl.PointToClient(new Point(gestureInfo.ptsLocation.x, gestureInfo.ptsLocation.y));
+
+            Center = Location;
+
+            switch (GestureId)
+            {
+                case WinApi.GID_ROTATE:
+                    ushort lastArguments = (ushort)(IsBegin ? 0 : LastEvent.GestureArguments);
+
+                    RotateAngle = WinApi.GID_ROTATE_ANGLE_FROM_ARGUMENT((ushort)(gestureInfo.ullArguments - lastArguments));
+                    break;
+
+
+                case WinApi.GID_ZOOM:
+                    Point first = IsBegin ? Location : LastBeginEvent.Location;
+                    Center = new Point((Location.X + first.X) / 2, (Location.Y + first.Y) / 2);
+                    ZoomFactor = IsBegin ? 1 : (double)gestureInfo.ullArguments / LastEvent.GestureArguments;
+                    //DistanceBetweenFingers = WinApi.LoDWord(gestureInfo.ullArguments);
+                    break;
+
+                case WinApi.GID_PAN:
+                    PanTranslation = IsBegin ? new Size(0, 0) :
+                        new Size(Location.X - LastEvent.Location.X, Location.Y - LastEvent.Location.Y);
+                    int panVelocity = WinApi.HiDWord((long)(gestureInfo.ullArguments));
+                    PanVelocity = new Size(WinApi.LoWord(panVelocity), WinApi.HiWord(panVelocity));
+                    //DistanceBetweenFingers = WinApi.LoDWord(gestureInfo.ullArguments);
+                    break;
+            }
+
+            
+        }
+
+        private uint _GestureId;
+        public uint GestureId
+        {
+            get { return _GestureId; }
+            private set { _GestureId = value; }
+        }
+
+        private ulong _GestureArguments;
+        public ulong GestureArguments
+        {
+            get { return _GestureArguments; }
+            private set { _GestureArguments = value; }
+        }
+
+        private Point _Location;
+        /// <summary>
+        /// The client location of gesture.
+        /// </summary>
+        public Point Location
+        {
+            get { return _Location; }
+            private set { _Location = value; }
+        }
+
+        /// <summary>
+        /// Is this the first event of a gesture.
+        /// </summary>
+        public bool IsBegin
+        {
+            get
+            {
+                return (_Flags & WinApi.GF_BEGIN) != 0;
+            }
+        }
+
+        /// <summary>
+        /// It this last event of a gesture.
+        /// </summary>
+        public bool IsEnd
+        {
+            get
+            {
+                return (_Flags & WinApi.GF_END) != 0;
+            }
+        }
+
+        /// <summary>
+        /// Has gesture triggered inertia.
+        /// </summary>
+        public bool IsInertia
+        {
+            get
+            {
+                return (_Flags & WinApi.GF_INERTIA) != 0;
+            }
+        }
+
+        /// <summary>
+        /// Gesture relative rotation angle for Rotate event.
+        /// </summary>
+        private double _RotateAngle;
+        public double RotateAngle
+        {
+            get { return _RotateAngle; }
+            private set { _RotateAngle = value; }
+        }
+
+        /// <summary>
+        /// Indicates calculated gesture center.
+        /// </summary>
+        private Point _Center;
+        public Point Center
+        {
+            get { return _Center; }
+            private set { _Center = value; }
+        }
+        
+        /// <summary>
+        /// Gesture zoom factor for Zoom event.
+        /// </summary>
+        private double _ZoomFactor;
+        public double ZoomFactor
+        {
+            get { return _ZoomFactor; }
+            private set { _ZoomFactor = value; }
+        }
+
+        /// <summary>
+        /// Gesture relative panning translation for Pan event.
+        /// </summary>
+        private Size _PanTranslation;
+        public Size PanTranslation
+        {
+            get { return _PanTranslation; }
+            set { _PanTranslation = value; }
+        }
+
+        /// <summary>
+        /// Gesture velocity vector of the pan gesture for custom inertia implementations.
+        /// </summary>
+        private Size _PanVelocity;
+        public Size PanVelocity
+        {
+            get { return _PanVelocity; }
+            private set { _PanVelocity = value; }
+        }
+
+        private GestureEventArgs _LastBeginEvent;
+        /// <summary>
+        /// The first touch arguments in this gesture event sequence.
+        /// </summary>
+        public GestureEventArgs LastBeginEvent
+        {
+            get { return _LastBeginEvent; }
+            internal set { _LastBeginEvent = value; }
+        }
+        
+        /// <summary>
+        /// The last touch arguments in this gesture event sequence.
+        /// </summary>
+        private GestureEventArgs _LastEvent;
+        public GestureEventArgs LastEvent
+        {
+            get { return _LastEvent; }
+            internal set { _LastEvent = value; }
+        }
+    }
+
+    /// <summary>
+    /// EventArgs passed to Touch handlers 
+    /// </summary>
+    internal class TouchEventArgs : EventArgs
+    {
+        private readonly TouchHandler _ParentHandler;
+        private readonly float _dpiXFactor;
+        private readonly float _dpiYFactor;
+
+        /// <summary>
+        /// Create new touch event argument instance
+        /// </summary>
+        /// <param name="hWndWrapper">The target control</param>
+        /// <param name="touchInput">one of the inner touch input in the message</param>
+        internal TouchEventArgs(TouchHandler parentHandler, float dpiX, float dpiY, ref WinApi.TOUCHINPUT touchInput)
+        {
+            _ParentHandler = parentHandler;
+            _dpiXFactor = 96F / dpiX;
+            _dpiYFactor = 96F / dpiY;
+            DecodeTouch(ref touchInput);
+        }
+
+        private bool CheckFlag(int value)
+        {
+            return (Flags & value) != 0;
+        }
+
+
+
+        // Decodes and handles WM_TOUCH* messages.
+        private void DecodeTouch(ref WinApi.TOUCHINPUT touchInput)
+        {
+            // TOUCHINFO point coordinates and contact size is in 1/100 of a pixel; convert it to pixels.
+            // Also convert screen to client coordinates.
+            if ((touchInput.dwMask & WinApi.TOUCHINPUTMASKF_CONTACTAREA) != 0)
+                ContactSize = new Size(AdjustDpiX(touchInput.cyContact / 100), AdjustDpiY(touchInput.cyContact / 100));
+
+            Id = touchInput.dwID;
+
+            Point p = _ParentHandler.ParentControl.PointToClient(new Point(touchInput.x / 100, touchInput.y / 100));
+            Location = p; // new Point(AdjustDpiX(p.X), AdjustDpiY(p.Y));
+
+            Time = touchInput.dwTime;
+            TimeSpan ellapse = TimeSpan.FromMilliseconds(Environment.TickCount - touchInput.dwTime);
+            AbsoluteTime = DateTime.Now - ellapse;
+
+            Mask = touchInput.dwMask;
+            Flags = touchInput.dwFlags;
+        }
+
+
+        private int AdjustDpiX(int value)
+        {
+            return (int)(value * _dpiXFactor);
+        }
+
+        private int AdjustDpiY(int value)
+        {
+            return (int)(value * _dpiYFactor);
+        }
+
+        /// <summary>
+        /// Touch client coordinate in pixels
+        /// </summary>
+        private Point _Location;
+        public Point Location
+        {
+            get { return _Location; }
+            private set
+            {
+                _Location = value;
+            }
+        }
+        
+        /// <summary>
+        /// A touch point identifier that distinguishes a particular touch input
+        /// </summary>
+        private int _Id;
+        public int Id
+        {
+            get { return _Id; }
+            private set
+            {
+                _Id = value;
+            }
+        }
+        
+        /// <summary>
+        /// A set of bit flags that specify various aspects of touch point
+        /// press, release, and motion. 
+        /// </summary>
+        private int _Flags;
+        public int Flags
+        {
+            get { return _Flags; }
+            private set
+            {
+                _Flags = value;
+            }
+        }
+        
+        /// <summary>
+        /// mask which fields in the structure are valid
+        /// </summary>
+        private int _Mask;
+        public int Mask
+        {
+            get { return _Mask; }
+            private set
+            {
+                _Mask = value;
+            }
+        }
+
+        /// <summary>
+        /// touch event time
+        /// </summary>
+        private DateTime _AbsoluteTime;
+        public DateTime AbsoluteTime
+        {
+            get { return _AbsoluteTime; }
+            private set { _AbsoluteTime = value; }
+        }
+
+        /// <summary>
+        /// touch event time from system up
+        /// </summary>
+        private int _Time;
+        public int Time
+        {
+            get { return _Time; }
+            private set
+            {
+                _Time = value;
+            }
+        }
+        /// <summary>
+        /// the size of the contact area in pixels
+        /// </summary>
+        private Size? _ContactSize;
+        public Size? ContactSize
+        {
+            get { return _ContactSize; }
+            private set { _ContactSize = value; }
+        }
+
+        /// <summary>
+        /// Is Primary Contact (The first touch sequence)
+        /// </summary>
+        public bool IsPrimaryContact
+        {
+            get { return (Flags & WinApi.TOUCHEVENTF_PRIMARY) != 0; }
+        }
+
+        /// <summary>
+        /// Specifies that movement occurred
+        /// </summary>
+        public bool IsTouchMove
+        {
+            get { return CheckFlag(WinApi.TOUCHEVENTF_MOVE); }
+        }
+
+        /// <summary>
+        /// Specifies that the corresponding touch point was established through a new contact
+        /// </summary>
+        public bool IsTouchDown
+        {
+            get { return CheckFlag(WinApi.TOUCHEVENTF_DOWN); }
+        }
+
+        /// <summary>
+        /// Specifies that a touch point was removed
+        /// </summary>
+        public bool IsTouchUp
+        {
+            get { return CheckFlag(WinApi.TOUCHEVENTF_UP); }
+        }
+
+        /// <summary>
+        /// Specifies that a touch point is in range
+        /// </summary>
+        public bool IsTouchInRange
+        {
+            get { return CheckFlag(WinApi.TOUCHEVENTF_INRANGE); }
+        }
+
+        /// <summary>
+        /// specifies that this input was not coalesced.
+        /// </summary>
+        public bool IsTouchNoCoalesce
+        {
+            get { return CheckFlag(WinApi.TOUCHEVENTF_NOCOALESCE); }
+        }
+
+        /// <summary>
+        /// Specifies that the touch point is associated with a pen contact
+        /// </summary>
+        public bool IsTouchPen
+        {
+            get { return CheckFlag(WinApi.TOUCHEVENTF_PEN); }
+        }
+
+        /// <summary>
+        /// The touch event came from the user's palm
+        /// </summary>
+        /// <remarks>Set <see cref="DisablePalmRejection"/> to true</remarks>
+        public bool IsTouchPalm
+        {
+            get { return CheckFlag(WinApi.TOUCHEVENTF_PALM); }
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Keyboard/Touch/WinApi.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Keyboard/Touch/WinApi.cs
new file mode 100644
index 00000000..6f29679d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Keyboard/Touch/WinApi.cs	
@@ -0,0 +1,290 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Runtime.InteropServices;
+
+namespace DevComponents.DotNetBar.Touch
+{
+    internal class WinApi
+    {
+        #region Functions
+        [DllImport("user32")]
+        public static extern bool SetGestureConfig(
+                                    IntPtr hwnd,                        // window for which configuration is specified
+                                    uint dwReserved,                    // reserved, must be 0
+                                    uint cIDs,                          // count of GESTURECONFIG structures
+                                    GESTURECONFIG[] pGestureConfig,    // array of GESTURECONFIG structures, dwIDs will be processed in the
+            // order specified and repeated occurances will overwrite previous ones
+                                    uint cbSize);                       // sizeof(GESTURECONFIG)
+
+        [DllImport("user32")]
+        public static extern bool RegisterTouchWindow(System.IntPtr hWnd, TouchWindowFlag flags);
+
+        [DllImport("user32")]
+        public static extern bool UnregisterTouchWindow(System.IntPtr hWnd);
+
+        [DllImport("user32")]
+        public static extern bool IsTouchWindow(System.IntPtr hWnd, out uint ulFlags);
+
+        [DllImport("user32")]
+        public static extern bool GetTouchInputInfo(System.IntPtr hTouchInput, int cInputs, [In, Out] TOUCHINPUT[] pInputs, int cbSize);
+
+        [DllImport("user32")]
+        public static extern void CloseTouchInputHandle(System.IntPtr lParam);
+
+        [DllImport("user32")]
+        public static extern bool SetProp(IntPtr hWnd, string lpString, IntPtr hData);
+
+        //Touch
+        [DllImport("user32", EntryPoint = "GetSystemMetrics")]
+        public static extern int GetDigitizerCapabilities(DigitizerIndex index);
+        [DllImport("user32")]
+        public static extern bool GetGestureInfo(IntPtr hGestureInfo, ref GESTUREINFO pGestureInfo);
+        [DllImport("user32")]
+        public static extern bool CloseGestureInfoHandle(IntPtr hGestureInfo);
+        [DllImport("user32", EntryPoint = "SetWindowLongPtr")]
+        public static extern IntPtr SubclassWindow64(IntPtr hWnd, int nIndex, WindowProcDelegate dwNewLong);
+
+        [DllImport("user32", EntryPoint = "SetWindowLong")]
+        public static extern IntPtr SubclassWindow(IntPtr hWnd, int nIndex, WindowProcDelegate dwNewLong);
+
+
+        [DllImport("user32")]
+        public static extern uint CallWindowProc(IntPtr prevWndFunc, IntPtr hWnd, int msg, IntPtr wparam, IntPtr lparam);
+
+        public delegate uint WindowProcDelegate(IntPtr hWnd, int msg, IntPtr wparam, IntPtr lparam);
+
+        /// <summary>
+        /// Get the current Digitizer Status
+        /// </summary>
+        public static DigitizerStatus GetDigitizerStatus()
+        {
+            return (DigitizerStatus)GetDigitizerCapabilities(DigitizerIndex.SM_DIGITIZER);
+        }
+        #endregion
+
+        #region Structures & Constants
+        [StructLayout(LayoutKind.Sequential)]
+        public struct GESTURECONFIG
+        {
+            public uint dwID;                     // gesture ID
+            public uint dwWant;                   // settings related to gesture ID that are to be turned on
+            public uint dwBlock;                  // settings related to gesture ID that are to be turned off
+            /// <summary>
+            /// Initializes a new instance of the GESTURECONFIG structure.
+            /// </summary>
+            /// <param name="dwID"></param>
+            /// <param name="dwWant"></param>
+            /// <param name="dwBlock"></param>
+            public GESTURECONFIG(uint dwID, uint dwWant, uint dwBlock)
+            {
+                this.dwID = dwID;
+                this.dwWant = dwWant;
+                this.dwBlock = dwBlock;
+            }
+        }
+        /// <summary>
+        /// Specifies available digitizer capabilities
+        /// </summary>
+        [Flags]
+        public enum DigitizerStatus : byte
+        {
+            IntegratedTouch = 0x01,
+            ExternalTouch = 0x02,
+            IntegratedPan = 0x04,
+            ExternalPan = 0x08,
+            MultiInput = 0x40,
+            StackReady = 0x80
+        }
+        public enum DigitizerIndex
+        {
+            SM_DIGITIZER = 94,
+            SM_MAXIMUMTOUCHES = 95
+        }
+        public const int GWLP_WNDPROC = -4;
+        // Gesture argument helpers
+        //   - Angle should be a double in the range of -2pi to +2pi
+        //   - Argument should be an unsigned 16-bit value
+        //
+        public static ushort GID_ROTATE_ANGLE_TO_ARGUMENT(ushort arg) { return ((ushort)(((arg + 2.0 * 3.14159265) / (4.0 * 3.14159265)) * 65535.0)); }
+        public static double GID_ROTATE_ANGLE_FROM_ARGUMENT(ushort arg) { return ((((double)arg / 65535.0) * 4.0 * 3.14159265) - 2.0 * 3.14159265); }
+
+        //Gesture flags - GESTUREINFO.dwFlags
+        public const uint GF_BEGIN = 0x00000001;
+        public const uint GF_INERTIA = 0x00000002;
+        public const uint GF_END = 0x00000004;
+
+        //Gesture IDs
+        public const uint GID_BEGIN = 1;
+        public const uint GID_END = 2;
+        public const uint GID_ZOOM = 3;
+        public const uint GID_PAN = 4;
+        public const uint GID_ROTATE = 5;
+        public const uint GID_TWOFINGERTAP = 6;
+        public const uint GID_PRESSANDTAP = 7;
+
+        public const uint GC_ALLGESTURES = 0x00000001;
+
+        public const uint WM_GESTURE = 0x0119;
+
+        public const uint WM_GESTURENOTIFY = 0x011A;
+
+        // Touch event window message constants [winuser.h]
+        public const int WM_TOUCH = 0x0240;
+
+        // Touch input mask values (TOUCHINPUT.dwMask) [winuser.h]
+        public const int TOUCHINPUTMASKF_TIMEFROMSYSTEM = 0x0001; // the dwTime field contains a system generated value
+        public const int TOUCHINPUTMASKF_EXTRAINFO = 0x0002; // the dwExtraInfo field is valid
+        public const int TOUCHINPUTMASKF_CONTACTAREA = 0x0004; // the cxContact and cyContact fields are valid
+
+        // Touch event flags ((TOUCHINPUT.dwFlags) [winuser.h]
+        public const int TOUCHEVENTF_MOVE = 0x0001;
+        public const int TOUCHEVENTF_DOWN = 0x0002;
+        public const int TOUCHEVENTF_UP = 0x0004;
+        public const int TOUCHEVENTF_INRANGE = 0x0008;
+        public const int TOUCHEVENTF_PRIMARY = 0x0010;
+        public const int TOUCHEVENTF_NOCOALESCE = 0x0020;
+        public const int TOUCHEVENTF_PEN = 0x0040;
+        public const int TOUCHEVENTF_PALM = 0x0080;
+
+        public enum TouchWindowFlag : uint
+        {
+            FineTouch = 0x1,
+            WantPalm = 0x2
+        }
+        /// <summary>
+        /// Gesture Info Interop Structure
+        /// </summary>
+        [StructLayout(LayoutKind.Sequential)]
+        public struct GESTUREINFO
+        {
+            public uint cbSize;                // size, in bytes, of this structure (including variable length Args field)
+            public uint dwFlags;               // see GF_* flags
+            public uint dwID;                  // gesture ID, see GID_* defines
+            public IntPtr hwndTarget;          // handle to window targeted by this gesture
+            public POINTS ptsLocation;          // current location of this gesture
+            public uint dwInstanceID;          // internally used
+            public uint dwSequenceID;          // internally used
+            public ulong ullArguments;         // arguments for gestures whose arguments fit in 8 BYTES
+            public uint cbExtraArgs;           // size, in bytes, of extra arguments, if any, that accompany this gesture
+        }
+        /// <summary>
+        /// A Simple POINTS Interop structure
+        /// </summary>
+        [StructLayout(LayoutKind.Sequential)]
+        public struct POINTS
+        {
+            public short x;
+            public short y;
+        }
+
+        /// <summary>
+        /// A Simple POINT Interop structure
+        /// </summary>
+        [StructLayout(LayoutKind.Sequential)]
+        public struct POINT
+        {
+            public int x;
+            public int y;
+        }
+        /// <summary>
+        /// Touch API defined structures [winuser.h]
+        /// </summary>
+        [StructLayout(LayoutKind.Sequential)]
+        public struct TOUCHINPUT
+        {
+            public int x;
+            public int y;
+            public System.IntPtr hSource;
+            public int dwID;
+            public int dwFlags;
+            public int dwMask;
+            public int dwTime;
+            public System.IntPtr dwExtraInfo;
+            public int cxContact;
+            public int cyContact;
+        }
+
+        // Extracts lower 16-bit word from an 32-bit int.
+        // in:
+        //      number      int
+        // returns:
+        //      lower word
+        public static ushort LoWord(uint number)
+        {
+            return (ushort)(number & 0xffff);
+        }
+
+        // Extracts higher 16-bit word from an 32-bit int.
+        // in:
+        //      number      uint
+        // returns:
+        //      lower word
+        public static ushort HiWord(uint number)
+        {
+            return (ushort)((number >> 16) & 0xffff);
+        }
+
+        // Extracts lower 32-bit word from an 64-bit int.
+        // in:
+        //      number      ulong
+        // returns:
+        //      lower word
+        public static uint LoDWord(ulong number)
+        {
+            return (uint)(number & 0xffffffff);
+        }
+
+        // Extracts higher 32-bit word from an 64-bit int.
+        // in:
+        //      number      ulong
+        // returns:
+        //      lower word
+        public static uint HiDWord(ulong number)
+        {
+            return (uint)((number >> 32) & 0xffffffff);
+        }
+
+
+        // Extracts lower 16-bit word from an 32-bit int.
+        // in:
+        //      number      int
+        // returns:
+        //      lower word
+        public static short LoWord(int number)
+        {
+            return (short)number;
+        }
+
+        // Extracts higher 16-bit word from an 32-bit int.
+        // in:
+        //      number      int
+        // returns:
+        //      lower word
+        public static short HiWord(int number)
+        {
+            return (short)(number >> 16);
+        }
+
+        // Extracts lower 32-bit word from an 64-bit int.
+        // in:
+        //      number      long
+        // returns:
+        //      lower word
+        public static int LoDWord(long number)
+        {
+            return (int)(number);
+        }
+
+        // Extracts higher 32-bit word from an 64-bit int.
+        // in:
+        //      number      long
+        // returns:
+        //      lower word
+        public static int HiDWord(long number)
+        {
+            return (int)((number >> 32));
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Keyboard/TouchKeyboard.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Keyboard/TouchKeyboard.cs
new file mode 100644
index 00000000..2d085f5b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Keyboard/TouchKeyboard.cs	
@@ -0,0 +1,801 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel;
+using System.Windows.Forms;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Keyboard
+{
+    [ToolboxItem(true), ProvideProperty("ShowTouchKeyboard", typeof(Control))]
+    public class TouchKeyboard : Component, IExtenderProvider
+    {
+        private List<Control> _Targets = new List<Control>();
+        private Control _CurrentTarget;
+        private PopupVirtualKeyboard _PopupKeyboard;
+        private KeyboardControl _VirtualKeyboard;
+
+
+        public TouchKeyboard()
+        {
+            _PopupKeyboard = new PopupVirtualKeyboard();
+            _VirtualKeyboard = new KeyboardControl();
+
+            //_PopupKeyboard.Size = Dpi.Size(new Size(KeyboardControl.DefaultWidth, KeyboardControl.DefaultHeight));
+
+            // Track floating keyboard location and size changed. The user can change this at runtime with the mouse.
+            //_PopupKeyboard.SizeChanged += new EventHandler(PopupKeyboard_SizeChanged);
+            _PopupKeyboard.ResizeEnd += PopupKeyboard_ResizeEnd;
+            _PopupKeyboard.LocationChanged += new EventHandler(PopupKeyboard_LocationChanged);
+
+            // Track changes when the keyboard is inline.
+            _VirtualKeyboard.SizeChanged += new EventHandler(VirtualKeyboard_SizeChanged);
+            _VirtualKeyboard.LocationChanged += new EventHandler(VirtualKeyboard_LocationChanged);
+            _VirtualKeyboard.DockChanged += new EventHandler(VirtualKeyboard_DockChanged);
+            _VirtualKeyboard.SendingKey += new KeyCancelEventHandler(VirtualKeyboardSendingKey);
+            _VirtualKeyboard.KeySent += new KeyEventHandler(VirtualKeyboardKeySent);
+        }
+
+        #region Handle Changed events.
+        /// <summary>
+        /// Occurs before the key pressed on keyboard is sent to target control and allows cancellation of the message
+        /// </summary>
+        [Description("Occurs before the key pressed on keyboard is sent to target control and allows cancellation of the message.")]
+        public event KeyCancelEventHandler SendingKey;
+        /// <summary>
+        /// Raises SendingKey event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnSendingKey(KeyboardKeyCancelEventArgs e)
+        {
+            KeyCancelEventHandler handler = SendingKey;
+            if (handler != null)
+                handler(this, e);
+        }
+        /// <summary>
+        /// Occurs after the key is sent to target control.
+        /// </summary>
+        [Description("Occurs after the key is sent to target control.")]
+        public event KeyEventHandler KeySent;
+        /// <summary>
+        /// Raises KeySent event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnKeySent(KeyboardKeyEventArgs e)
+        {
+            KeyEventHandler handler = KeySent;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        private void VirtualKeyboardKeySent(object sender, KeyboardKeyEventArgs e)
+        {
+            OnKeySent(e);
+        }
+
+        private void VirtualKeyboardSendingKey(object sender, KeyboardKeyCancelEventArgs e)
+        {
+            OnSendingKey(e);
+        }
+
+        void PopupKeyboard_ResizeEnd(object sender, EventArgs e)
+        {
+            _FloatingSize = _PopupKeyboard.Size;
+            OnFloatingSizeChanged();
+        }
+
+        //void PopupKeyboard_SizeChanged(object sender, EventArgs e)
+        //{
+        //    _FloatingSize = _PopupKeyboard.Size;
+        //    OnFloatingSizeChanged();
+        //}
+
+        void PopupKeyboard_LocationChanged(object sender, EventArgs e)
+        {
+            OnFloatingLocationChanged();
+        }
+
+        void VirtualKeyboard_LocationChanged(object sender, EventArgs e)
+        {
+            if (_VirtualKeyboard.FindForm() != _PopupKeyboard)
+            {
+                OnLocationChanged();
+            }
+        }
+
+        void VirtualKeyboard_SizeChanged(object sender, EventArgs e)
+        {
+            if (_VirtualKeyboard.FindForm() != _PopupKeyboard)
+            {
+                _Size = _VirtualKeyboard.Size;
+                OnSizeChanged();
+            }
+
+        }
+
+        void VirtualKeyboard_DockChanged(object sender, EventArgs e)
+        {
+            if (_VirtualKeyboard.FindForm() != _PopupKeyboard)
+            {
+                OnDockChanged();
+            }
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Gets the reference to internal keyboard control that is used to provide Keyboard visual.
+        /// </summary>
+        [Browsable(false)]
+        public KeyboardControl KeyboardControl 
+        {
+            get
+            {
+                return _VirtualKeyboard;
+            }
+        }
+
+        /// <summary>
+        /// Attaches the Keyboard to the specified control. The keyboard will automatically appear when the control receives input focus.
+        /// </summary>
+        /// <param name="control">The control to which the Keyboard will be attached.</param>
+        private void AttachTo(Control control)
+        {
+            control.GotFocus += new EventHandler(control_GotFocus);
+            control.LostFocus += new EventHandler(control_LostFocus);
+
+            _Targets.Add(control);
+        }
+
+
+        /// <summary>
+        /// Detaches the Keyboard from the specified control.
+        /// </summary>
+        /// <param name="control">The control from which the Keyboard will be detached.</param>
+        private void DetachFrom(Control control)
+        {
+            if (_Targets.Contains(control))
+            {
+                control.GotFocus -= new EventHandler(control_GotFocus);
+                control.LostFocus -= new EventHandler(control_LostFocus);
+
+                _Targets.Remove(control);
+            }
+        }
+
+        /// <summary>
+        /// Occurs before keyboard is shown and allows canceling of opening.
+        /// </summary>
+        [Description("Occurs before keyboard is shown and allows canceling of opening.")]
+        public event CancelKeyboardEventHandler KeyboardOpening;
+        /// <summary>
+        /// Raises KeyboardOpening event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnKeyboardOpening(CancelKeyboardEventArgs e)
+        {
+            CancelKeyboardEventHandler handler = KeyboardOpening;
+            if (handler != null)
+                handler(this, e);
+        }
+        /// <summary>
+        /// Occurs after keyboard is shown.
+        /// </summary>
+        [Description("Occurs after keyboard is shown.")]
+        public event EventHandler KeyboardOpened;
+        /// <summary>
+        /// Raises KeyboardOpened event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnKeyboardOpened(EventArgs e)
+        {
+            EventHandler handler = KeyboardOpened;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        private bool _ShowingFloatingKeyboard = false;
+        public void ShowKeyboard(Control control, TouchKeyboardStyle style)
+        {
+            CancelKeyboardEventArgs ce = new CancelKeyboardEventArgs(control, style);
+            OnKeyboardOpening(ce);
+            if (ce.Cancel) return;
+
+            _CurrentTarget = ce.TargetControl;
+            style = ce.Style;
+
+            _PopupKeyboard.CurrentControl = _CurrentTarget;
+
+            _VirtualKeyboard.UnlockCapsLock();
+
+            if (_CurrentTarget != null)
+            {
+                if (style == TouchKeyboardStyle.Floating)
+                {
+                    try
+                    {
+                        if (_FloatingSize.IsEmpty)
+                            _PopupKeyboard.Size = Dpi.Size(new Size(KeyboardControl.DefaultWidth, KeyboardControl.DefaultHeight));
+                        else
+                            _PopupKeyboard.Size = _FloatingSize;
+
+                        _ShowingFloatingKeyboard = true;
+                        _PopupKeyboard.Owner = _CurrentTarget.FindForm();
+                        _PopupKeyboard.Controls.Add(_VirtualKeyboard);
+                        _VirtualKeyboard.Dock = DockStyle.Fill;
+                        _VirtualKeyboard.Visible = true;
+                        _PopupKeyboard.Show();
+
+                        // When floating, don't show the top bar. The information on the top bar are on the window's title bar.
+                        _VirtualKeyboard.IsTopBarVisible = false;
+                    }
+                    finally
+                    {
+                        _ShowingFloatingKeyboard = false;
+                    }
+                }
+                else if (style == TouchKeyboardStyle.Inline)
+                {
+                    Form owner = _CurrentTarget.FindForm();
+                    if (_Size.IsEmpty)
+                        _VirtualKeyboard.Size = Dpi.Size(new Size(KeyboardControl.DefaultWidth, KeyboardControl.DefaultHeight));
+                    else
+                        _VirtualKeyboard.Size = _Size;
+                    _VirtualKeyboard.Dock = Dock;
+                    owner.Controls.Add(_VirtualKeyboard);
+                    _VirtualKeyboard.BringToFront();
+                    _VirtualKeyboard.Visible = true;
+
+                    // When inline, show the top bar.
+                    _VirtualKeyboard.IsTopBarVisible = true;
+                }
+            }
+
+            OnKeyboardOpened(EventArgs.Empty);
+        }
+
+        /// <summary>
+        /// Gets keyboard target control.
+        /// </summary>
+        [Browsable(false)]
+        public Control CurrentKeyboardTarget
+        {
+            get { return _CurrentTarget; }
+        }
+
+        /// <summary>
+        /// Occurs before the keyboard is closed and allows canceling of keyboard closing.
+        /// </summary>
+        [Description("Occurs before the keyboard is closed and allows canceling of keyboard closing.")]
+        public event CancelEventHandler KeyboardClosing;
+        /// <summary>
+        /// Raises KeyboardClosing event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnKeyboardClosing(CancelEventArgs e)
+        {
+            CancelEventHandler handler = KeyboardClosing;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        /// <summary>
+        /// Occurs after keyboard is closed.
+        /// </summary>
+        [Description("Occurs after keyboard is closed.")]
+        public event EventHandler KeyboardClosed;
+        /// <summary>
+        /// Raises KeyboardClosed event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnKeyboardClosed(EventArgs e)
+        {
+            EventHandler handler = KeyboardClosed;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        /// <summary>
+        /// Hides the keyboard.
+        /// </summary>
+        public void HideKeyboard()
+        {
+            CancelEventArgs ce = new CancelEventArgs();
+            OnKeyboardClosing(ce);
+            if (ce.Cancel) return;
+
+            _PopupKeyboard.Hide();
+            Form form = _VirtualKeyboard.FindForm();
+            if (form != null && !(form is PopupVirtualKeyboard))
+            {
+                form.Controls.Remove(_VirtualKeyboard);
+            }
+
+            OnKeyboardClosed(EventArgs.Empty);
+        }
+
+        /// <summary>
+        /// Gets reference to the form which hosts popup keyboard.
+        /// </summary>
+        public Form FloatingKeyboardForm
+        {
+            get { return _PopupKeyboard; }
+        }
+
+
+        void control_GotFocus(object sender, EventArgs e)
+        {
+            Control control = sender as Control;
+
+            if (control != null)
+            {
+                TouchKeyboardStyle style = TouchKeyboardStyle.No;
+                TouchKeyboardStyle formStyle = GetShowTouchKeyboard(control.FindForm());
+
+                // If the form specifies a mode to show the keyboard, then use that mode. If we want for the control to have the last
+                // word about how to show the keyboard, the following two if instructions should be inverted.
+
+                if (_ExtendedControls.ContainsKey(control))
+                    style = _ExtendedControls[control];
+
+                if (formStyle != TouchKeyboardStyle.No)
+                    style = formStyle;
+
+                if (style != TouchKeyboardStyle.No)
+                {
+                    ShowKeyboard(control, style);
+                }
+            }
+        }
+
+        private bool IsPopupKeyboardActivated 
+        {
+            get
+            {
+                if (_PopupKeyboard == null) return false;
+                return Form.ActiveForm == _PopupKeyboard;
+            }
+        }
+
+        void control_LostFocus(object sender, EventArgs e)
+        {
+            if (!_ShowingFloatingKeyboard && !IsPopupKeyboardActivated)
+            {
+                _CurrentTarget = null;
+                HideKeyboard();
+            }
+        }
+
+
+        /// <summary> 
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                if (_VirtualKeyboard != null)
+                    _VirtualKeyboard.Dispose();
+                if (_PopupKeyboard != null)
+                    _PopupKeyboard.Dispose();
+            }
+
+            base.Dispose(disposing);
+        }
+
+
+        bool IExtenderProvider.CanExtend(object extendee)
+        {
+            if (extendee is Control && !(extendee is KeyboardControl))
+                return true;
+            else
+                return false;
+        }
+
+
+        Dictionary<Control, TouchKeyboardStyle> _ExtendedControls = new Dictionary<Control, TouchKeyboardStyle>();
+
+
+        /// <summary>
+        /// Retursn the way the keyboard will be shown when controls receive focus.
+        /// </summary>
+        /// <param name="extendee">The control for which to retrieve the value.</param>
+        /// <returns>A TouchKeyboardStyle value defining the way the keyboard appears.</returns>
+        [Description("Shows an on screen touch keyboard when the control is focused.")]
+        [Category("Touch Keyboard")]
+        [DefaultValue(TouchKeyboardStyle.No)]
+        public TouchKeyboardStyle GetShowTouchKeyboard(Control extendee)
+        {
+            if (extendee == null)
+                return TouchKeyboardStyle.No;
+
+            if (_ExtendedControls.ContainsKey(extendee))
+                return _ExtendedControls[extendee];
+            else
+                return TouchKeyboardStyle.No;
+        }
+
+        /// <summary>
+        /// Sets the way the keyboard will be shown when controls receive focus. If the control is a Form,
+        /// all controls on the Form will support this way of displaying the touch keyboard.
+        /// </summary>
+        /// <param name="extendee">The control for which this value is specified.</param>
+        /// <param name="value">A TouchKeyboardStyle value defining the way the keyboard appears.</param>
+        public void SetShowTouchKeyboard(Control extendee, TouchKeyboardStyle value)
+        {
+            if (extendee is Form)
+            {
+                if (value != TouchKeyboardStyle.No)
+                {
+                    foreach (Control c in extendee.Controls)
+                    {
+                        AttachTo(c);
+                    }
+
+                    // If other controls are added to the form, attach to those controls also.
+                    extendee.ControlAdded += new ControlEventHandler(form_ControlAdded);
+
+                    // If controls are removed from the form, dettach from them, we don't want to keep a reference to them.
+                    extendee.ControlRemoved += new ControlEventHandler(form_ControlRemoved);
+                }
+            }
+
+            if (!_ExtendedControls.ContainsKey(extendee))
+                _ExtendedControls.Add(extendee, value);
+            else
+                _ExtendedControls[extendee] = value;
+
+            if (value == TouchKeyboardStyle.No)
+                DetachFrom(extendee);
+            else
+                AttachTo(extendee);
+        }
+
+
+        void form_ControlAdded(object sender, ControlEventArgs e)
+        {
+            if (sender is KeyboardControl)
+                return;
+
+            AttachTo(e.Control);
+        }
+
+
+        void form_ControlRemoved(object sender, ControlEventArgs e)
+        {
+            if (sender is KeyboardControl)
+                return;
+
+            DetachFrom(e.Control);
+        }
+
+
+        /// <summary>
+        /// Gets or set the ColorTable used to draw the keyboard.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public VirtualKeyboardColorTable ColorTable
+        {
+            get { return _VirtualKeyboard.ColorTable; }
+            set { _VirtualKeyboard.ColorTable = value; }
+        }
+
+
+        /// <summary>
+        /// Gets or set the Renderer used to draw the keyboard.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public Renderer Renderer
+        {
+            get { return _VirtualKeyboard.Renderer; }
+            set { _VirtualKeyboard.Renderer = value; }
+        }
+
+
+        private Size _Size = Size.Empty; //new Size(KeyboardControl.DefaultWidth, KeyboardControl.DefaultHeight);
+        /// <summary>
+        /// Gets or sets the size of the keyboard, when shown inline.
+        /// </summary>
+        [Category("Inline Layout")]
+        [Description("Gets or sets the size of the keyboard, when the keyboard is shown inline.")]
+        [Browsable(true)]
+        public Size Size
+        {
+            get { return _Size; }
+            set
+            {
+                if (_Size != value)
+                {
+                    _Size = value; 
+                    OnSizeChanged();
+                }
+            }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeSize()
+        {
+            return !_Size.IsEmpty;
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetSize()
+        {
+            Size = Size.Empty;
+        }
+        private void OnSizeChanged()
+        {
+            Size newSize = Size;
+            if (newSize.IsEmpty)
+                newSize = Dpi.Size(new Size(KeyboardControl.DefaultWidth, KeyboardControl.DefaultHeight));
+
+            _VirtualKeyboard.Size = newSize;
+
+            if (SizeChanged != null)
+                SizeChanged(this, EventArgs.Empty);
+        }
+
+
+        /// <summary>
+        /// Gets or sets the coordinates of the upper-left corner of the keyboard when shown inline, relative to the form.
+        /// </summary>
+        [Category("Inline Layout")]
+        [Description("The coordinates of the upper-left corner of the keyboard, when the keyboard is shown inline, relative to the form.")]
+        [Browsable(true)]
+        public Point Location
+        {
+            get { return _VirtualKeyboard.Location; }
+            set 
+            {
+                if (_VirtualKeyboard.Location != value)
+                {
+                    _VirtualKeyboard.Location = value;
+                    OnLocationChanged();
+                }
+            }
+        }
+
+        private void OnLocationChanged()
+        {
+            if (LocationChanged != null)
+                LocationChanged(this, EventArgs.Empty);
+        }
+
+
+        private DockStyle _Dock = DockStyle.Bottom;
+        /// <summary>
+        /// Defines which borders of the keyboard are bound to the container.
+        /// </summary>
+        [Category("Inline Layout")]
+        [Description("Defines which border of the keyboard are bound to the form, when the keyboard is shown inline. Default value is DockStyle.Bottom.")]
+        [DefaultValue(DockStyle.Bottom)]
+        [Browsable(true)]
+        public DockStyle Dock
+        {
+            get { return _Dock; }
+            set
+            {
+                if (_Dock != value)
+                {
+                    _Dock = value; 
+                    OnDockChanged();
+                }
+            }
+        }
+
+        private void OnDockChanged()
+        {
+            // When keybaord style is Floating, dock is always fill (to fill to popup window).
+            if (_PopupKeyboard.Controls.Contains(_VirtualKeyboard))
+                _VirtualKeyboard.Dock = DockStyle.Fill;
+            else
+                _VirtualKeyboard.Dock = _Dock;
+
+            if (DockChanged != null)
+                DockChanged(this, EventArgs.Empty);
+        }
+
+
+        /// <summary>
+        /// Gets or sets the coordinates of the upper-left corner of the keyboard when shown floating, relative to the screen.
+        /// </summary>
+        [Category("Floating Layout")]
+        [Description("The coordinates of the upper-left corner of the keyboard, when the keyboard is shown floating, relative to the screen.")]
+        [Browsable(true)]
+        public Point FloatingLocation
+        {
+            get { return _PopupKeyboard.Location; }
+            set
+            {
+                if (_PopupKeyboard.Location != value)
+                {
+                    _PopupKeyboard.Location = value;
+                    OnFloatingLocationChanged();
+                }
+            }
+        }
+
+        private void OnFloatingLocationChanged()
+        {
+            if (FloatingLocationChanged != null)
+                FloatingLocationChanged(this, EventArgs.Empty);
+        }
+
+        /// <summary>
+        /// Indicates whether touch support is enabled when provided by hardware.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether touch support is enabled when provided by hardware.")]
+        public bool TouchEnabled
+        {
+            get { return _VirtualKeyboard.TouchEnabled; }
+            set
+            {
+                _VirtualKeyboard.TouchEnabled = value;
+            }
+        }
+
+        private Size _FloatingSize = System.Drawing.Size.Empty;
+        /// <summary>
+        /// Gets or sets the size of the keyboard, when shown floating.
+        /// </summary>
+        [Category("Floating Layout")]
+        [Description("Gets or sets the size of the keyboard, when the keyboard is shown floating.")]
+        [Browsable(true)]
+        public Size FloatingSize
+        {
+            get { return _FloatingSize; }
+            set 
+            {
+                if (_FloatingSize != value)
+                {
+                    _FloatingSize = value;
+                    OnFloatingSizeChanged();
+                }
+            }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeFloatingSize()
+        {
+            return !_FloatingSize.IsEmpty;
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetFloatingSize()
+        {
+            FloatingSize = Size.Empty;
+        }
+        private void OnFloatingSizeChanged()
+        {
+            Size newSize = FloatingSize;
+            if (newSize.IsEmpty)
+                newSize = Dpi.Size(new Size(KeyboardControl.DefaultWidth, KeyboardControl.DefaultHeight));
+
+            _PopupKeyboard.Size = newSize;
+
+            if (FloatingSizeChanged != null)
+                FloatingSizeChanged(this, EventArgs.Empty);
+        }
+
+        /// <summary>
+        /// Gets or sets a text associated with this control.
+        /// </summary>
+        [Category("Appearance")]
+        [Description("The text associated with this control.")]
+        [Browsable(true)]
+        public string Text
+        {
+            get { return _VirtualKeyboard.Text; }
+            set 
+            {
+                _VirtualKeyboard.Text = value; 
+                _PopupKeyboard.Text = value; 
+                OnTextChanged(); 
+            }
+        }
+
+        /// <summary>
+        /// Raises the TextChanged event.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Advanced)]
+        protected void OnTextChanged()
+        {
+            if (TextChanged != null)
+                TextChanged(this, EventArgs.Empty);
+        }
+
+        /// <summary>
+        /// Occurs when the Text property has changed.
+        /// </summary>
+        [Category("PropertyChanged")]
+        [Description("Event raised when the Text property has changed.")]
+        public event EventHandler TextChanged;
+
+        /// <summary>
+        /// Occurs when the Size property has changed.
+        /// </summary>
+        [Category("Inline Layout")]
+        [Description("Event raised when the Size property has changed.")]
+        public event EventHandler SizeChanged;
+
+        /// <summary>
+        /// Occurs when the Location property has changed.
+        /// </summary>
+        [Category("Inline Layout")]
+        [Description("Event raised when the Location property has changed.")]
+        public event EventHandler LocationChanged;
+
+        /// <summary>
+        /// Occurs when the Dock property has changed.
+        /// </summary>
+        [Category("Inline Layout")]
+        [Description("Event raised when the Dock property has changed.")]
+        public event EventHandler DockChanged;
+
+        /// <summary>
+        /// Occurs when the FloatingSize property has changed.
+        /// </summary>
+        [Category("Floating Layout")]
+        [Description("Event raised when the FloatingSize property has changed.")]
+        public event EventHandler FloatingSizeChanged;
+
+        /// <summary>
+        /// Occurs when the FloatingLocation property has changed.
+        /// </summary>
+        [Category("Floating Layout")]
+        [Description("Event raised when the FloatingLocation property has changed.")]
+        public event EventHandler FloatingLocationChanged;
+    }
+
+
+    /// <summary>
+    /// Defines the way the touch keyboard will appear when attached to controls.
+    /// </summary>
+    public enum TouchKeyboardStyle
+    {
+        /// <summary>
+        /// Touch keyboard will not be visible.
+        /// </summary>
+        No,
+
+        /// <summary>
+        /// Touch keyboard will appear inline in the form.
+        /// </summary>
+        Inline,
+
+        /// <summary>
+        /// Touch keyboard will appear floating on the screen.
+        /// </summary>
+        Floating
+    }
+
+    /// <summary>
+    /// Defines delegate for keyboard events.
+    /// </summary>
+    public delegate void CancelKeyboardEventHandler(object sender, CancelKeyboardEventArgs e);
+    /// <summary>
+    /// Defines event arguments for keyboard based events.
+    /// </summary>
+    public class CancelKeyboardEventArgs : CancelEventArgs
+    {
+        /// <summary>
+        /// Initializes a new instance of the CancelKeyboardEventArgs class.
+        /// </summary>
+        /// <param name="targetControl"></param>
+        /// <param name="style"></param>
+        public CancelKeyboardEventArgs(Control targetControl, TouchKeyboardStyle style)
+        {
+            TargetControl = targetControl;
+            Style = style;
+        }
+        /// <summary>
+        /// Gets or sets the keyboard target control.
+        /// </summary>
+        public Control TargetControl;
+
+        /// <summary>
+        /// Gets or sets the keyboard style.
+        /// </summary>
+        public TouchKeyboardStyle Style;
+    }
+
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Keyboard/TouchKeyboard.ico b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Keyboard/TouchKeyboard.ico
new file mode 100644
index 00000000..4f72c9f9
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Keyboard/TouchKeyboard.ico differ
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Keyboard/VirtualKeyboardColors.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Keyboard/VirtualKeyboardColors.cs
new file mode 100644
index 00000000..06ca41a5
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Keyboard/VirtualKeyboardColors.cs	
@@ -0,0 +1,277 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Keyboard
+{
+    /// <summary>
+    /// Defines the VirtualKeyboard colors.
+    /// </summary>
+    /// <remarks>
+    /// This class maintains internally a Brush for each Color. These Brush objects are disposed internally when not needed anymore.
+    /// A Brush of a certain color is obtained by setting the same Color property to that color.
+    /// Maintaining the brushes here helps to have less GDI handles created / destroyed on each drawing of the keyboard.
+    /// </remarks>
+    public sealed class VirtualKeyboardColorTable : IDisposable
+    {
+        /// <summary>
+        /// Creates a new color table for the VirtualKeyoard.
+        /// </summary>
+        public VirtualKeyboardColorTable()
+        {
+            _BackgroundBrush = new SolidBrush(BackgroundColor);
+            _KeysBrush = new SolidBrush(KeysColor);
+            _LightKeysBrush = new SolidBrush(LightKeysColor);
+            _DarkKeysBrush = new SolidBrush(DarkKeysColor);
+            _PressedKeysBrush = new SolidBrush(PressedKeysColor);
+            _TextBrush = new SolidBrush(TextColor);
+            _DownKeysBrush = new SolidBrush(DownKeysColor);
+            _DownTextBrush = new SolidBrush(DownTextColor);
+            _TopBarTextBrush = new SolidBrush(TopBarTextColor);
+            _ToggleTextBrush = new SolidBrush(ToggleTextColor);
+        }
+
+        private static void ReCreateBrush(ref Brush brush, Color color)
+        {
+            if (brush != null)
+                brush.Dispose();
+
+            brush = new SolidBrush(color);
+        }
+
+
+        private Color _BackgroundColor = Color.Black;
+        /// <summary>
+        /// Gets or sets the color used to draw the background of the keyboard.
+        /// </summary>
+        public Color BackgroundColor
+        {
+            get { return _BackgroundColor; }
+            set { _BackgroundColor = value; ReCreateBrush(ref _BackgroundBrush, _BackgroundColor); }
+        }
+
+        private Brush _BackgroundBrush;
+        /// <summary>
+        /// Gets a brush used for drawing the background of the keyboard.
+        /// </summary>
+        public Brush BackgroundBrush
+        {
+            get { return _BackgroundBrush; }
+        }
+        
+
+        private Color _KeysColor = Color.FromArgb(0x30, 0x2f, 0x37);
+        /// <summary>
+        /// Gets or sets the color used for drawing normal keys.
+        /// </summary>
+        public Color KeysColor
+        {
+            get { return _KeysColor; }
+            set { _KeysColor = value; ReCreateBrush(ref _KeysBrush, _KeysColor); }
+        }
+
+        private Brush _KeysBrush;
+        /// <summary>
+        /// Gets a brush used for drawing normal keys. 
+        /// </summary>
+        public Brush KeysBrush
+        {
+            get { return _KeysBrush; }
+        }
+        
+        
+        private Color _LightKeysColor = Color.FromArgb(0x45, 0x44, 0x4c);
+        /// <summary>
+        /// Gets or sets the color used for drawing light keys.
+        /// </summary>
+        public Color LightKeysColor
+        {
+            get { return _LightKeysColor; }
+            set { _LightKeysColor = value; ReCreateBrush(ref _LightKeysBrush, _LightKeysColor); }
+        }
+
+        private Brush _LightKeysBrush;
+        /// <summary>
+        /// Gets a brush used for drawing light keys.
+        /// </summary>
+        public Brush LightKeysBrush
+        {
+            get { return _LightKeysBrush; }
+        }
+
+
+        private Color _DarkKeysColor = Color.FromArgb(0x1d, 0x1c, 0x21);
+        /// <summary>
+        /// Gets or sets the color used for drawing dark keys.
+        /// </summary>
+        public Color DarkKeysColor
+        {
+            get { return _DarkKeysColor; }
+            set { _DarkKeysColor = value; ReCreateBrush(ref _DarkKeysBrush, _DarkKeysColor); }
+        }
+        
+        private Brush _DarkKeysBrush;
+        /// <summary>
+        /// Gets a brush used for drawing dark keys.
+        /// </summary>
+        public Brush DarkKeysBrush
+        {
+            get { return _DarkKeysBrush; }
+        }
+
+
+        private Color _PressedKeysColor = Color.FromArgb(0x10, 0xa1, 0x51);
+        /// <summary>
+        /// Gets or sets a brush used for drawing pressed keys.
+        /// </summary>
+        public Color PressedKeysColor
+        {
+            get { return _PressedKeysColor; }
+            set { _PressedKeysColor = value; ReCreateBrush(ref _PressedKeysBrush, _PressedKeysColor); }
+        }
+
+        private Brush _PressedKeysBrush;
+        /// <summary>
+        /// Gets a brush used for drawing pressed keys.
+        /// </summary>
+        public Brush PressedKeysBrush
+        {
+            get { return _PressedKeysBrush; }
+        }
+
+
+        private Color _DownKeysColor = Color.White;
+        /// <summary>
+        /// Gets or sets a brush used for drawing pressed key when the key is down.
+        /// </summary>
+        public Color DownKeysColor
+        {
+            get { return _DownKeysColor; }
+            set { _DownKeysColor = value; ReCreateBrush(ref _DownKeysBrush, _DownKeysColor); }
+        }
+
+        private Brush _DownKeysBrush;
+        /// <summary>
+        /// Gets a brush used for drawing pressed key when the key is down.
+        /// </summary>
+        public Brush DownKeysBrush
+        {
+            get { return _DownKeysBrush; }
+        }
+
+
+        private Color _TextColor = Color.White;
+        /// <summary>
+        ///  Gets or sets a color used for drawing the text on the keys.
+        /// </summary>
+        public Color TextColor
+        {
+            get { return _TextColor; }
+            set { _TextColor = value; ReCreateBrush(ref _TextBrush, _TextColor); }
+        }
+
+        private Brush _TextBrush;
+        /// <summary>
+        /// Gets a brush used for drawing the text on the keys.
+        /// </summary>
+        public Brush TextBrush
+        {
+            get { return _TextBrush; }
+        }
+
+
+        private Color _DownTextColor = Color.FromArgb(0x20, 0x20, 0x20);
+        /// <summary>
+        ///  Gets or sets a color used for drawing the text on a key when the key is down.
+        /// </summary>
+        public Color DownTextColor
+        {
+            get { return _DownTextColor; }
+            set { _DownTextColor = value; ReCreateBrush(ref _DownTextBrush, _DownTextColor); }
+        }
+
+        private Brush _DownTextBrush;
+        /// <summary>
+        /// Gets a brush used for drawing the text on a key when the key is down.
+        /// </summary>
+        public Brush DownTextBrush
+        {
+            get { return _DownTextBrush; }
+        }
+
+
+        private Color _TopBarTextColor = Color.White;
+        /// <summary>
+        ///  Gets or sets a color used for drawing the text on the top bar.
+        /// </summary>
+        public Color TopBarTextColor
+        {
+            get { return _TopBarTextColor; }
+            set { _TopBarTextColor = value; ReCreateBrush(ref _TopBarTextBrush, _TopBarTextColor); }
+        }
+
+        private Brush _TopBarTextBrush;
+        /// <summary>
+        /// Gets a brush used for drawing the text on the top bar.
+        /// </summary>
+        public Brush TopBarTextBrush
+        {
+            get { return _TopBarTextBrush; }
+        }
+
+
+        private Color _ToggleTextColor = Color.Green;
+        /// <summary>
+        /// Gets or sets a color used for drawing the text on a key when the key is in its toggled state.
+        /// </summary>
+        public Color ToggleTextColor
+        {
+            get { return _ToggleTextColor; }
+            set { _ToggleTextColor = value; ReCreateBrush(ref _ToggleTextBrush, _ToggleTextColor); }
+        }
+
+        private Brush _ToggleTextBrush;
+        /// <summary>
+        /// Gets a brush used for drawing the text on a key when the key is in its toggled state.
+        /// </summary>
+        public Brush ToggleTextBrush
+        {
+            get { return _ToggleTextBrush; }
+        }
+
+
+        public void Dispose()
+        {
+            if (_BackgroundBrush != null)
+                _BackgroundBrush.Dispose();
+
+            if (_KeysBrush != null)
+                _KeysBrush.Dispose();
+
+            if (_LightKeysBrush != null)
+                _LightKeysBrush.Dispose();
+
+            if (_DarkKeysBrush != null)
+                _DarkKeysBrush.Dispose();
+
+            if (_PressedKeysBrush != null)
+                _PressedKeysBrush.Dispose();
+
+            if (_TextBrush != null)
+                _TextBrush.Dispose();
+
+            if (_DownTextBrush != null)
+                _DownTextBrush.Dispose();
+
+            if (_DownKeysBrush != null)
+                _DownKeysBrush.Dispose();
+
+            if (_TopBarTextBrush != null)
+                _TopBarTextBrush.Dispose();
+
+            if (_ToggleTextBrush != null)
+                _ToggleTextBrush.Dispose();
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout.Design/ColorHelpers.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout.Design/ColorHelpers.cs
new file mode 100644
index 00000000..62f98599
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout.Design/ColorHelpers.cs	
@@ -0,0 +1,52 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Layout.Design
+{
+    internal static class ColorHelpers
+    {
+        /// <summary>
+        /// Converts hex string to Color type.
+        /// </summary>
+        /// <param name="rgbHex">Hexadecimal color representation.</param>
+        /// <returns>Reference to Color object.</returns>
+        public static Color GetColor(string rgbHex)
+        {
+            if (string.IsNullOrEmpty(rgbHex))
+                return Color.Empty;
+            if (rgbHex.Length == 8)
+                return Color.FromArgb(Convert.ToInt32(rgbHex.Substring(0, 2), 16),
+                Convert.ToInt32(rgbHex.Substring(2, 2), 16),
+                Convert.ToInt32(rgbHex.Substring(4, 2), 16),
+                Convert.ToInt32(rgbHex.Substring(6, 2), 16));
+
+            return Color.FromArgb(Convert.ToInt32(rgbHex.Substring(0, 2), 16),
+                Convert.ToInt32(rgbHex.Substring(2, 2), 16),
+                Convert.ToInt32(rgbHex.Substring(4, 2), 16));
+        }
+
+        /// <summary>
+        /// Converts hex string to Color type.
+        /// </summary>
+        /// <param name="rgb">Color representation as 32-bit RGB value.</param>
+        /// <returns>Reference to Color object.</returns>
+        public static Color GetColor(int rgb)
+        {
+            if (rgb == -1) return Color.Empty;
+            return Color.FromArgb((rgb & 0xFF0000) >> 16, (rgb & 0xFF00) >> 8, rgb & 0xFF);
+        }
+
+        /// <summary>
+        /// Converts hex string to Color type.
+        /// </summary>
+        /// <param name="rgb">Color representation as 32-bit RGB value.</param>
+        /// <returns>Reference to Color object.</returns>
+        public static Color GetColor(int alpha, int rgb)
+        {
+            if (rgb == -1) return Color.Empty;
+            return Color.FromArgb(alpha, (rgb & 0xFF0000) >> 16, (rgb & 0xFF00) >> 8, rgb & 0xFF);
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout.Design/DevComponents.DotNetBar.Layout.Design.csproj b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout.Design/DevComponents.DotNetBar.Layout.Design.csproj
new file mode 100644
index 00000000..fa434511
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout.Design/DevComponents.DotNetBar.Layout.Design.csproj	
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{56C369D3-61C2-4608-9C47-C7494A7875E3}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>DevComponents.DotNetBar.Layout.Design</RootNamespace>
+    <AssemblyName>DevComponents.DotNetBar.Layout.Design</AssemblyName>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>dotnetbar.snk</AssemblyOriginatorKeyFile>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>2.0</OldToolsVersion>
+    <UpgradeBackupLocation />
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE;LAYOUT</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseTrialLayoutDesign|AnyCPU' ">
+    <OutputPath>bin\ReleaseTrialLayoutDesign\</OutputPath>
+    <DefineConstants>TRACE;LAYOUT;TRIAL</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Accessibility" />
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Design" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Drawing.Design" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="ColorHelpers.cs" />
+    <Compile Include="Helpers.cs" />
+    <Compile Include="LayoutControlDesigner.cs" />
+    <Compile Include="LayoutControlItemDesigner.cs" />
+    <Compile Include="LayoutGroupDesigner.cs" />
+    <Compile Include="LayoutItemBaseDesigner.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="SymbolTypeEditor.cs" />
+    <Compile Include="TextMarkupEditor.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="TextMarkupUIEditor.cs" />
+    <Compile Include="WinApi.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\DevComponents.DotNetBar.Layout\DevComponents.DotNetBar.Layout.csproj">
+      <Project>{1641B2CE-259C-4A52-A460-48C936B13951}</Project>
+      <Name>DevComponents.DotNetBar.Layout</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\DotNetBar.csproj">
+      <Project>{36546CE3-335C-4AB6-A2F3-40F8C818BC66}</Project>
+      <Name>DotNetBar</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="dotnetbar.snk" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TextMarkupEditor.resx">
+      <DependentUpon>TextMarkupEditor.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="SystemImages\ColorPickerButtonImage.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+      <Visible>False</Visible>
+      <ProductName>Windows Installer 3.1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout.Design/Helpers.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout.Design/Helpers.cs
new file mode 100644
index 00000000..f993acbb
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout.Design/Helpers.cs	
@@ -0,0 +1,69 @@
+using System;
+using System.Text;
+using System.Drawing;
+using System.Reflection;
+
+namespace DevComponents.DotNetBar.Layout.Design
+{
+    internal static class Helpers
+    {
+        internal static Bitmap LoadBitmap(string imageName)
+        {
+            DotNetBarResourcesAttribute att = Attribute.GetCustomAttribute(System.Reflection.Assembly.GetExecutingAssembly(), typeof(DotNetBarResourcesAttribute)) as DotNetBarResourcesAttribute;
+            if (att != null && att.NamespacePrefix != "")
+            {
+                return new Bitmap(Assembly.GetExecutingAssembly().GetManifestResourceStream(att.NamespacePrefix + "." + imageName));
+            }
+            else
+                return new Bitmap(typeof(DevComponents.DotNetBar.DotNetBarManager), imageName);
+        }
+
+        internal static Icon LoadIcon(string imageName)
+        {
+            DotNetBarResourcesAttribute att = Attribute.GetCustomAttribute(System.Reflection.Assembly.GetExecutingAssembly(), typeof(DotNetBarResourcesAttribute)) as DotNetBarResourcesAttribute;
+            if (att != null && att.NamespacePrefix != "")
+            {
+                return new Icon(Assembly.GetExecutingAssembly().GetManifestResourceStream(att.NamespacePrefix + "." + imageName));
+            }
+            else
+                return new Icon(typeof(DevComponents.DotNetBar.DotNetBarManager), imageName);
+        }
+
+        public static void DrawDesignTimeSelection(Graphics g, Rectangle r, Color backColor, Color border, int penWidth)
+        {
+            if (r.Width <= 0 || r.Height <= 0)
+                return;
+            if (!backColor.IsEmpty && backColor != Color.Transparent)
+            {
+                if ((double)backColor.GetBrightness() < 0.5)
+                    border = System.Windows.Forms.ControlPaint.Light(backColor);
+                else
+                    border = System.Windows.Forms.ControlPaint.Dark(backColor);
+            }
+            using (Pen pen = new Pen(border, penWidth))
+            {
+                pen.DashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
+                r.Width--;
+                r.Height--;
+                g.DrawRectangle(pen, r);
+            }
+        }
+
+        public static bool IsOffice2007Style(eDotNetBarStyle style)
+        {
+            if (style == eDotNetBarStyle.StyleManagerControlled)
+                style = StyleManager.GetEffectiveStyle();
+            return (style == eDotNetBarStyle.Office2007 || style == eDotNetBarStyle.Office2010 || style == eDotNetBarStyle.Windows7 || StyleManager.IsMetro(style));
+        }
+
+        internal static string GetItemErrorInfo(System.Xml.XmlElement xmlItem)
+        {
+            string s = "";
+            if (xmlItem.HasAttribute("assembly"))
+                s = s + xmlItem.GetAttribute("assembly");
+            if (xmlItem.HasAttribute("class"))
+                s = s + xmlItem.GetAttribute("class");
+            return s;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout.Design/LayoutControlDesigner.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout.Design/LayoutControlDesigner.cs
new file mode 100644
index 00000000..74a06041
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout.Design/LayoutControlDesigner.cs	
@@ -0,0 +1,767 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows.Forms.Design;
+using DevComponents.DotNetBar.Layout;
+using System.Drawing;
+using System.ComponentModel.Design;
+using System.Windows.Forms;
+using System.ComponentModel;
+using System.Collections;
+using System.Drawing.Drawing2D;
+
+namespace DevComponents.DotNetBar.Layout.Design
+{
+    public class LayoutControlDesigner : ParentControlDesigner
+    {
+        #region Constructor
+
+        #endregion
+
+        #region Implementation
+        public override void Initialize(System.ComponentModel.IComponent component)
+        {
+            base.Initialize(component);
+
+            IComponentChangeService changeService = (IComponentChangeService)GetService(typeof(IComponentChangeService));
+            if (changeService != null)
+            {
+                changeService.ComponentAdded += new ComponentEventHandler(ComponentAdded);
+                changeService.ComponentAdding += new ComponentEventHandler(ComponentAdding);
+                changeService.ComponentChanged += new ComponentChangedEventHandler(ComponentChanged);
+                changeService.ComponentRemoved += OnComponentRemoved;
+                changeService.ComponentRemoving += OnComponentRemoving;
+            }
+            //ISelectionService selectionService = (ISelectionService)GetService(typeof(ISelectionService));
+            //if (selectionService != null)
+            //    selectionService.SelectionChanged += SelectionChanged;
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            IComponentChangeService ss = (IComponentChangeService)GetService(typeof(IComponentChangeService));
+            if (ss != null)
+            {
+                ss.ComponentAdded -= ComponentAdded;
+                ss.ComponentAdding -= ComponentAdding;
+                ss.ComponentChanged -= ComponentChanged;
+                ss.ComponentRemoved -= OnComponentRemoved;
+            }
+
+            //ISelectionService selectionService = (ISelectionService)GetService(typeof(ISelectionService));
+            //if (selectionService != null)
+            //    selectionService.SelectionChanged -= SelectionChanged;
+            base.Dispose(disposing);
+        }
+
+        private bool _ControlDeleting = false;
+        private void DestroyChildItems(LayoutItemBase parent, IDesignerHost dh)
+        {
+            LayoutGroup group = parent as LayoutGroup;
+            if (group == null) return;
+
+            foreach (LayoutItemBase item in group.Items)
+            {
+                DestroyChildItems(item, dh);
+                dh.DestroyComponent(item);
+            }
+        }
+        private void OnComponentRemoving(object sender, ComponentEventArgs e)
+        {
+            if (e.Component != this.Component)
+                return;
+
+            IDesignerHost dh = (IDesignerHost)GetService(typeof(IDesignerHost));
+            if (dh == null)
+                return;
+
+            _ControlDeleting = true;
+            
+            LayoutControl lc = (LayoutControl)e.Component;
+            if (lc.RootGroup.Items.Count == 0) return;
+
+            LayoutItemBase[] items = new LayoutItemBase[lc.RootGroup.Items.Count];
+            lc.RootGroup.Items.CopyTo(items);
+            foreach (LayoutItemBase item in items)
+            {
+                DestroyChildItems(item, dh);
+                dh.DestroyComponent(item);
+            }
+
+            _ControlDeleting = false;
+        }
+
+        private void OnComponentRemoved(object sender, ComponentEventArgs e)
+        {
+            if (_ControlDeleting) return;
+            if (e.Component is LayoutItemBase && ((LayoutItemBase)e.Component).GetLayoutControl() == this.Control && !_DestroyingItem)
+            {
+                CleanupRemovedControls(false);
+                CleanupRemovedItems((LayoutItemBase)e.Component, true, false);
+            }
+            else if (e.Component is Control && IsContained((Control)e.Component))
+            {
+                LayoutControl lc = (LayoutControl)this.Control;
+                if (lc != null)
+                {
+                    LayoutItemBase item = lc.FindControlItem((Control)e.Component);
+                    if (item != null)
+                        CleanupRemovedItems(item, false, true);
+                }
+            }
+
+        }
+        private bool IsContained(Control c)
+        {
+            LayoutControl lc = (LayoutControl)this.Control;
+            if (lc == null || c == null || lc == c) return false;
+            Control stopParent = lc.Parent;
+            Control test = c;
+            do
+            {
+                if (test == lc) return true;
+                test = test.Parent;
+            } while (test != null && test != stopParent);
+            return false;
+        }
+        private bool _DestroyingItem = false;
+        private void CleanupRemovedItems(LayoutItemBase item, bool removeControl, bool destroyItem)
+        {
+            if (item == null || item.Parent == null) return;
+            LayoutControl lc = this.Control as LayoutControl;
+            if (lc == null) return;
+
+            IDesignerHost host = (IDesignerHost)GetService(typeof(IDesignerHost));
+            IComponentChangeService cc = (IComponentChangeService)GetService(typeof(IComponentChangeService));
+            DesignerTransaction dt = host.CreateTransaction("Removing Layout Item");
+            cc.OnComponentChanging(lc, TypeDescriptor.GetProperties(lc)["RootGroup"]);
+            ISelectionService ss = (ISelectionService)GetService(typeof(ISelectionService));
+            ICollection selectedComponents = ss.GetSelectedComponents();
+            if (IsSelected(selectedComponents, item))
+            {
+                ss.SetSelectedComponents(new IComponent[] { item }, SelectionTypes.Remove);
+            }
+
+            if (item.Parent is LayoutGroup)
+            {
+                LayoutGroup parentGroup = null;
+                if (item.Parent != lc.RootGroup && item.Parent is LayoutGroup)
+                {
+                    parentGroup = (LayoutGroup)item.Parent;
+                    cc.OnComponentChanging(parentGroup, TypeDescriptor.GetProperties(parentGroup)["Items"]);
+                }
+                ((LayoutGroup)item.Parent).Items.Remove(item);
+                if (parentGroup != null)
+                    cc.OnComponentChanged(parentGroup, TypeDescriptor.GetProperties(parentGroup)["Items"], null, null);
+                if (destroyItem)
+                {
+                    _DestroyingItem = true;
+                    try
+                    {
+                        host.DestroyComponent(item);
+                    }
+                    finally
+                    {
+                        _DestroyingItem = false;
+                    }
+                }
+            }
+            if (removeControl && item is LayoutControlItem)
+            {
+                LayoutControlItem lci = (LayoutControlItem)item;
+                if (lci.Control != null && lci.Control.Parent == lc)
+                {
+                    cc.OnComponentChanging(lc, TypeDescriptor.GetProperties(lc)["Controls"]);
+                    lc.Controls.Remove(lci.Control);
+                    cc.OnComponentChanged(lc, TypeDescriptor.GetProperties(lc)["Controls"], null, null);
+                    host.DestroyComponent(lci.Control);
+                }
+            }
+            cc.OnComponentChanged(lc, TypeDescriptor.GetProperties(lc)["RootGroup"], null, null);
+            dt.Commit();
+            lc.PerformLayout();
+            ss.SetSelectedComponents(new IComponent[] { lc }, SelectionTypes.Replace);
+
+        }
+        private void CleanupRemovedControls(bool destroyComponents)
+        {
+            LayoutControl lc = this.Control as LayoutControl;
+            if (lc == null) return;
+            List<LayoutItemBase> removed = lc.FindOrphanedControlItems();
+            if (removed != null && removed.Count > 0)
+            {
+
+                IDesignerHost host = (IDesignerHost)GetService(typeof(IDesignerHost));
+                IComponentChangeService cc = (IComponentChangeService)GetService(typeof(IComponentChangeService));
+                DesignerTransaction dt = host.CreateTransaction("Removing Layout Control Item");
+                cc.OnComponentChanging(lc, TypeDescriptor.GetProperties(lc)["RootGroup"]);
+                ISelectionService ss = (ISelectionService)GetService(typeof(ISelectionService));
+                ICollection selectedComponents = ss.GetSelectedComponents();
+                foreach (LayoutItemBase item in removed)
+                {
+                    LayoutControlItem lci = item as LayoutControlItem;
+                    if (IsSelected(selectedComponents, item))
+                    {
+                        ss.SetSelectedComponents(new IComponent[] { item }, SelectionTypes.Remove);
+                    }
+                    if (lci != null && IsSelected(selectedComponents, lci.Control))
+                    {
+                        ss.SetSelectedComponents(new IComponent[] { lci.Control }, SelectionTypes.Remove);
+                    }
+                    lci.Control = null;
+
+                    if (lci.Parent is LayoutGroup)
+                    {
+                        LayoutGroup parentGroup = null;
+                        if (item.Parent != lc.RootGroup && item.Parent is LayoutGroup)
+                        {
+                            parentGroup = (LayoutGroup)item.Parent;
+                            cc.OnComponentChanging(parentGroup, TypeDescriptor.GetProperties(parentGroup)["Items"]);
+                        }
+                        ((LayoutGroup)lci.Parent).Items.Remove(item);
+                        if (parentGroup != null)
+                            cc.OnComponentChanged(parentGroup, TypeDescriptor.GetProperties(parentGroup)["Items"], null, null);
+                    }
+                    if (destroyComponents)
+                        host.DestroyComponent(item);
+                }
+                cc.OnComponentChanged(lc, TypeDescriptor.GetProperties(lc)["RootGroup"], null, null);
+                dt.Commit();
+                lc.PerformLayout();
+                ss.SetSelectedComponents(new IComponent[] { lc }, SelectionTypes.Replace);
+            }
+        }
+        private bool IsControlSelected
+        {
+            get
+            {
+                ISelectionService ss = (ISelectionService)GetService(typeof(ISelectionService));
+                if (ss == null) return false;
+                ICollection selected = ss.GetSelectedComponents();
+                if (IsSelected(selected, this.Control))
+                    return true;
+                return false;
+            }
+        }
+        private bool IsSelected(ICollection selectedComponents, object item)
+        {
+            foreach (object o in selectedComponents)
+            {
+                if (o == item) return true;
+            }
+            return false;
+        }
+        void ComponentChanged(object sender, ComponentChangedEventArgs e)
+        {
+            if (e.Component == this.Control)
+            {
+                if (e.Member != null && e.Member.Name == "Controls")
+                {
+                    // Find out what changed...
+                    LayoutControl lc = (LayoutControl)this.Control;
+                    if (lc == null) return;
+                    foreach (Control c in lc.Controls)
+                    {
+                        if (lc.IsSystemControl(c)) continue;
+                        LayoutItemBase item = lc.FindControlItem(c);
+                        if (item == null)
+                        {
+                            IDesignerHost host = (IDesignerHost)GetService(typeof(IDesignerHost));
+                            IComponentChangeService cc = (IComponentChangeService)GetService(typeof(IComponentChangeService));
+                            DesignerTransaction dt = host.CreateTransaction("Creating Layout Control Item");
+                            LayoutControlItem lci = (LayoutControlItem)host.CreateComponent(typeof(LayoutControlItem));
+                            TypeDescriptor.GetProperties(lci)["Control"].SetValue(lci, c);
+                            lc.SetupControlItem(lci);
+                            cc.OnComponentChanging(lc, TypeDescriptor.GetProperties(lc)["RootGroup"]);
+                            cc.OnComponentChanging(lc.RootGroup, TypeDescriptor.GetProperties(lc)["Items"]);
+
+                            lc.RootGroup.Items.Add(lci);
+
+                            cc.OnComponentChanged(lc.RootGroup, TypeDescriptor.GetProperties(lc)["Items"], null, null);
+                            cc.OnComponentChanged(lc, TypeDescriptor.GetProperties(lc)["RootGroup"], null, null);
+
+                            dt.Commit();
+                            lc.PerformLayout();
+                        }
+                    }
+
+                    // Check removed
+                    CleanupRemovedControls(true);
+                }
+            }
+        }
+        protected override bool AllowSetChildIndexOnDrop
+        {
+            get
+            {
+                return false;
+            }
+        }
+
+        protected override void OnMouseDragBegin(int x, int y)
+        {
+            //base.OnMouseDragBegin(x, y);
+        }
+        protected override void OnDragEnter(DragEventArgs de)
+        {
+            if (de.Data is LayoutItemDataObject)
+            {
+                de.Effect = DragDropEffects.Move;
+                //LayoutControl lc = (LayoutControl)this.Control;
+                //lc.Text = string.Format("{0} DragEnter", DateTime.Now.TimeOfDay);
+                //lc.Invalidate();
+                return;
+            }
+
+            base.OnDragEnter(de);
+        }
+        protected override void OnDragOver(DragEventArgs de)
+        {
+            LayoutControl lc = (LayoutControl)this.Control;
+            if (lc == null) return;
+            //lc.Text = de.Data.GetType().ToString();
+            //lc.Invalidate();
+            //lc.Text = "DragOver";
+            //lc.Invalidate();
+            ISelectionService selectionService = (ISelectionService)this.GetService(typeof(ISelectionService));
+            //lc.Text = string.Format("GetSelectedComponents().Count={0}", selectionService.GetSelectedComponents().Count);
+            if (selectionService != null && (selectionService.PrimarySelection is Control || de.Data is LayoutItemDataObject) && selectionService.GetSelectedComponents().Count == 1)
+            {
+                LayoutItemBase item = null;
+                if (de.Data is LayoutItemDataObject)
+                {
+                    LayoutItemDataObject d = (LayoutItemDataObject)de.Data;
+                    item = d.DragComponent;
+                }
+                else
+                {
+                    Control c = (Control)selectionService.PrimarySelection;
+                    item = lc.FindControlItem(c);
+                }
+                if (item != null)
+                {
+                    HitTestInsertInfo info = lc.GetHitTestInsertInfo(item, lc.PointToClient(new Point(de.X, de.Y)));
+                    if (!info.InsertMarkerBounds.IsEmpty)
+                        lc.ShowInsertMarker(info.InsertMarkerBounds);
+                    else
+                        lc.HideInsertMarker();
+                    de.Effect = DragDropEffects.Move;
+                    return;
+                }
+            }
+
+            base.OnDragOver(de);
+        }
+
+        protected override void OnDragLeave(EventArgs e)
+        {
+            LayoutControl lc = (LayoutControl)this.Control;
+            if (lc == null) return;
+            lc.HideInsertMarker();
+            base.OnDragLeave(e);
+        }
+
+        protected override void OnDragDrop(DragEventArgs de)
+        {
+            LayoutControl lc = (LayoutControl)this.Control;
+            if (lc == null) return;
+            lc.HideInsertMarker();
+
+            ISelectionService selectionService = (ISelectionService)this.GetService(typeof(ISelectionService));
+            if (selectionService != null && (selectionService.PrimarySelection is Control || de.Data is LayoutItemDataObject) && selectionService.GetSelectedComponents().Count == 1)
+            {
+                LayoutItemBase item = null;
+                if (de.Data is LayoutItemDataObject)
+                {
+                    item = ((LayoutItemDataObject)de.Data).DragComponent;
+                }
+                else
+                {
+                    Control c = (Control)selectionService.PrimarySelection;
+                    item = lc.FindControlItem(c);
+                }
+                if (item != null)
+                {
+                    HitTestInsertInfo info = lc.GetHitTestInsertInfo(item, lc.PointToClient(new Point(de.X, de.Y)));
+                    if (info.Parent != null)
+                    {
+                        IDesignerHost host = (IDesignerHost)GetService(typeof(IDesignerHost));
+                        IComponentChangeService cc = (IComponentChangeService)GetService(typeof(IComponentChangeService));
+                        DesignerTransaction dt = host.CreateTransaction("Moving Layout Control Item");
+                        cc.OnComponentChanging(lc, TypeDescriptor.GetProperties(lc)["RootGroup"]);
+                        //lc.Text = string.Format("Moving at: {0}", info.InsertIndex);
+                        //lc.Invalidate();
+                        if (info.Parent != item.Parent)
+                        {
+                            LayoutGroup parentGroup = (LayoutGroup)item.Parent;
+                            if (parentGroup != lc.RootGroup)
+                                cc.OnComponentChanging(parentGroup, TypeDescriptor.GetProperties(parentGroup)["Items"]);
+                            parentGroup.Items.Remove(item);
+                            if (parentGroup != lc.RootGroup)
+                                cc.OnComponentChanged(parentGroup, TypeDescriptor.GetProperties(parentGroup)["Items"], null, null);
+                            if (info.Parent != lc.RootGroup)
+                                cc.OnComponentChanging(info.Parent, TypeDescriptor.GetProperties(parentGroup)["Items"]);
+                            if (info.InsertIndex >= 0)
+                                info.Parent.Items.Insert(info.InsertIndex, item);
+                            else
+                                info.Parent.Items.Add(item);
+                            if (info.Parent != lc.RootGroup)
+                                cc.OnComponentChanged(info.Parent, TypeDescriptor.GetProperties(parentGroup)["Items"], null, null);
+                        }
+                        else
+                        {
+                            LayoutGroup parentGroup = (LayoutGroup)item.Parent;
+                            if (parentGroup != lc.RootGroup)
+                                cc.OnComponentChanging(parentGroup, TypeDescriptor.GetProperties(parentGroup)["Items"]);
+                            info.Parent.Items.Move(item, info.InsertIndex);
+                            if (parentGroup != lc.RootGroup)
+                                cc.OnComponentChanged(parentGroup, TypeDescriptor.GetProperties(parentGroup)["Items"], null, null);
+                        }
+
+                        cc.OnComponentChanged(lc, TypeDescriptor.GetProperties(lc)["RootGroup"], null, null);
+                        dt.Commit();
+                        lc.PerformLayout();
+
+                        SelectionRefresh();
+                    }
+                    return;
+                }
+            }
+
+
+            base.OnDragDrop(de);
+        }
+
+        void ComponentAdding(object sender, ComponentEventArgs e)
+        {
+            //Control c = e.Component as Control;
+            //if (c != null)
+            //{
+            //    if (c != null && c.Parent == this.Control)
+            //    {
+            //        MessageBox.Show("Component ADDING");
+            //    }
+            //    else
+            //        MessageBox.Show(string.Format("Component ADDING UNRECOGNIZED Parent: {0} Site:{1}", c.Parent, e.Component.Site));
+            //}
+        }
+
+        void ComponentAdded(object sender, ComponentEventArgs e)
+        {
+            //Control c = e.Component as Control;
+
+            //if (c != null)
+            //{
+            //    if (c != null && c.Parent == this.Control)
+            //    {
+            //        MessageBox.Show("Component ADDED");
+            //    }
+            //    else
+            //        MessageBox.Show(string.Format("Component ADDED UNRECOGNIZED Parent: {0}", c.Parent));
+            //}
+        }
+        protected override bool GetHitTest(System.Drawing.Point point)
+        {
+            if (base.GetHitTest(point))
+                return true;
+
+            LayoutControl c = this.Control as LayoutControl;
+            if (c == null) return false;
+
+            Point pc = c.PointToClient(point);
+            if (c.VScrollBar.Visible && c.VScrollBar.Bounds.Contains(pc))
+                return true;
+            if (c.HScrollBar.Visible && c.HScrollBar.Bounds.Contains(pc))
+                return true;
+
+            return base.GetHitTest(point);
+        }
+
+        public void SelectionRefresh()
+        {
+            Message m = new Message();
+            m.Msg = 0x115;
+            base.WndProc(ref m);
+        }
+        private System.Windows.Forms.Control _DesignerHost = null;
+        /// <summary>
+        /// Selection support for items on container.
+        /// </summary>
+        protected override void WndProc(ref Message m)
+        {
+            if (_DesignerHost == null)
+                _DesignerHost = System.Windows.Forms.Control.FromHandle(m.HWnd);
+            switch (m.Msg)
+            {
+                case WinApi.WM_LBUTTONDOWN:
+                case WinApi.WM_RBUTTONDOWN:
+                    {
+                        if (OnMouseDown(ref m, m.Msg == WinApi.WM_LBUTTONDOWN ? MouseButtons.Left : MouseButtons.Right))
+                            return;
+                        break;
+                    }
+                case WinApi.WM_RBUTTONUP:
+                case WinApi.WM_LBUTTONUP:
+                    {
+                        if (OnMouseUp(ref m, m.Msg == WinApi.WM_LBUTTONDOWN ? MouseButtons.Left : MouseButtons.Right))
+                            return;
+
+                        break;
+                    }
+            }
+
+            base.WndProc(ref m);
+        }
+
+        protected virtual bool OnMouseUp(ref Message m, MouseButtons param1)
+        {
+            if (_MouseDownSelectionPerformed)
+            {
+                _MouseDownSelectionPerformed = false;
+                return true;
+            }
+            return false;
+        }
+        private bool _MouseDownSelectionPerformed = false;
+        protected virtual bool OnMouseDown(ref Message m, MouseButtons button)
+        {
+            LayoutControl lc = this.Control as LayoutControl;
+            if (lc == null) return false;
+            Point p = new Point(WinApi.LOWORD(m.LParam), WinApi.HIWORD(m.LParam));
+            LayoutItemBase item = lc.HitTest(p);
+            if (item != null)
+            {
+                SelectComponent(item, (Control.ModifierKeys == Keys.Control || Control.ModifierKeys == Keys.Shift) ? SelectionTypes.Add : SelectionTypes.Primary);
+                _MouseDownSelectionPerformed = true;
+                return true;
+            }
+            else if (!IsControlSelected)
+            {
+                SelectComponent(this.Control, SelectionTypes.Replace);
+                //return true;
+            }
+            return false;
+        }
+
+        protected virtual void SelectComponent(IComponent comp, SelectionTypes selectionType)
+        {
+            ISelectionService selection = (ISelectionService)this.GetService(typeof(ISelectionService));
+            if (selection != null && comp != null)
+            {
+                ArrayList arr = new ArrayList(1);
+                arr.Add(comp);
+                selection.SetSelectedComponents(arr, selectionType);
+            }
+        }
+
+        public override ICollection AssociatedComponents
+        {
+            get
+            {
+                ArrayList list = base.AssociatedComponents as ArrayList;
+                if (list == null) list = new ArrayList();
+
+                LayoutControl lc = (LayoutControl)this.Control;
+                if (lc == null) return list;
+
+                if (list != null)
+                {
+                    foreach (LayoutItemBase item in lc.RootGroup.Items)
+                    {
+                        list.Add(item);
+                    }
+                }
+
+                return list;
+            }
+        }
+
+        protected override void OnPaintAdornments(PaintEventArgs pe)
+        {
+            LayoutControl lc = (LayoutControl)base.Component;
+            if (lc != null && lc.Visible)
+            {
+                using (Pen borderPen = this.BorderPen)
+                {
+                    Rectangle clientRectangle = this.Control.ClientRectangle;
+                    clientRectangle.Width--;
+                    clientRectangle.Height--;
+                    pe.Graphics.DrawRectangle(borderPen, clientRectangle);
+                }
+            }
+            base.OnPaintAdornments(pe);
+        }
+        protected Pen BorderPen
+        {
+            get
+            {
+                Color color = (this.Control.BackColor.GetBrightness() < 0.5) ? ControlPaint.Light(this.Control.BackColor) : ControlPaint.Dark(this.Control.BackColor);
+                Pen pen = new Pen(color);
+                pen.DashStyle = DashStyle.Dash;
+                return pen;
+            }
+        }
+
+        public override DesignerVerbCollection Verbs
+        {
+            get
+            {
+                DesignerVerb[] verbs;
+                verbs = new DesignerVerb[]
+				{
+					new DesignerVerb("Add Spacer", new EventHandler(AddSpacerItem)),
+                    new DesignerVerb("Add Group", new EventHandler(AddGroupItem))
+				};
+                return new DesignerVerbCollection(verbs);
+            }
+        }
+        //private void AddLabelItem(object sender, EventArgs e)
+        //{
+        //    AddLabelItem();
+        //}
+
+        //private void AddLabelItem()
+        //{
+        //    IDesignerHost dh = (IDesignerHost)GetService(typeof(IDesignerHost));
+        //    LayoutControl lc = this.Control as LayoutControl;
+        //    if (lc == null || dh == null)
+        //        return;
+
+        //    DesignerTransaction dt = dh.CreateTransaction("Creating Label Item");
+        //    try
+        //    {
+        //        IComponentChangeService cc = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+        //        if (cc != null)
+        //        {
+        //            cc.OnComponentChanging(this.Component, null);
+        //            cc.OnComponentChanging(lc, TypeDescriptor.GetProperties(lc)["RootGroup"]);
+        //            cc.OnComponentChanging(lc.RootGroup, TypeDescriptor.GetProperties(lc)["Items"]);
+        //        }
+
+        //        LayoutLabelItem item = null;
+        //        item = dh.CreateComponent(typeof(LayoutLabelItem)) as LayoutLabelItem;
+        //        item.Width = 100;
+        //        item.WidthType = eLayoutSizeType.Percent;
+        //        item.Height = 22;
+        //        item.Text = "Layout Label";
+        //        lc.RootGroup.Items.Add(item);
+        //        lc.PerformLayout();
+        //        if (cc != null)
+        //        {
+        //            cc.OnComponentChanged(lc.RootGroup, TypeDescriptor.GetProperties(lc)["Items"], null, null);
+        //            cc.OnComponentChanged(lc, TypeDescriptor.GetProperties(lc)["RootGroup"], null, null);
+        //            cc.OnComponentChanged(this.Component, null, null, null);
+        //        }
+
+        //        SelectComponent(item, SelectionTypes.Replace);
+        //    }
+        //    catch
+        //    {
+        //        dt.Cancel();
+        //    }
+        //    finally
+        //    {
+        //        if (!dt.Canceled) dt.Commit();
+        //    }
+        //}
+        private void AddSpacerItem(object sender, EventArgs e)
+        {
+            AddSpacerItem();
+        }
+
+        private void AddSpacerItem()
+        {
+            IDesignerHost dh = (IDesignerHost)GetService(typeof(IDesignerHost));
+            LayoutControl lc = this.Control as LayoutControl;
+            if (lc == null || dh == null)
+                return;
+
+            DesignerTransaction dt = dh.CreateTransaction("Creating Spacer Item");
+            try
+            {
+                IComponentChangeService cc = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+                if (cc != null)
+                {
+                    cc.OnComponentChanging(this.Component, null);
+                    cc.OnComponentChanging(lc, TypeDescriptor.GetProperties(lc)["RootGroup"]);
+                    cc.OnComponentChanging(lc.RootGroup, TypeDescriptor.GetProperties(lc)["Items"]);
+                }
+
+                LayoutSpacerItem item = null;
+                item = dh.CreateComponent(typeof(LayoutSpacerItem)) as LayoutSpacerItem;
+                item.Width = 32;
+                item.Height = 32;
+                lc.RootGroup.Items.Add(item);
+                lc.PerformLayout();
+                if (cc != null)
+                {
+                    cc.OnComponentChanged(lc.RootGroup, TypeDescriptor.GetProperties(lc)["Items"], null, null);
+                    cc.OnComponentChanged(lc, TypeDescriptor.GetProperties(lc)["RootGroup"], null, null);
+                    cc.OnComponentChanged(this.Component, null, null, null);
+                }
+
+                SelectComponent(item, SelectionTypes.Replace);
+            }
+            catch
+            {
+                dt.Cancel();
+            }
+            finally
+            {
+                if (!dt.Canceled) dt.Commit();
+            }
+        }
+
+        private void AddGroupItem(object sender, EventArgs e)
+        {
+            AddGroupItem();
+        }
+
+        private void AddGroupItem()
+        {
+            IDesignerHost dh = (IDesignerHost)GetService(typeof(IDesignerHost));
+            LayoutControl lc = this.Control as LayoutControl;
+            if (lc == null || dh == null)
+                return;
+
+            DesignerTransaction dt = dh.CreateTransaction("Creating Group Item");
+            try
+            {
+                IComponentChangeService cc = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+                if (cc != null)
+                {
+                    cc.OnComponentChanging(this.Component, null);
+                    cc.OnComponentChanging(lc, TypeDescriptor.GetProperties(lc)["RootGroup"]);
+                    cc.OnComponentChanging(lc.RootGroup, TypeDescriptor.GetProperties(lc)["Items"]);
+                }
+
+                LayoutGroup item = null;
+                item = dh.CreateComponent(typeof(LayoutGroup)) as LayoutGroup;
+                item.Width = 200;
+                item.Height = 100;
+                item.TextPosition = eLayoutPosition.Top;
+                item.MinSize = new Size(120, 32);
+                lc.RootGroup.Items.Add(item);
+                lc.PerformLayout();
+                if (cc != null)
+                {
+                    cc.OnComponentChanged(lc.RootGroup, TypeDescriptor.GetProperties(lc)["Items"], null, null);
+                    cc.OnComponentChanged(lc, TypeDescriptor.GetProperties(lc)["RootGroup"], null, null);
+                    cc.OnComponentChanged(this.Component, null, null, null);
+                }
+
+                SelectComponent(item, SelectionTypes.Replace);
+            }
+            catch
+            {
+                dt.Cancel();
+            }
+            finally
+            {
+                if (!dt.Canceled) dt.Commit();
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout.Design/LayoutControlItemDesigner.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout.Design/LayoutControlItemDesigner.cs
new file mode 100644
index 00000000..86c806d4
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout.Design/LayoutControlItemDesigner.cs	
@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using DevComponents.DotNetBar.Layout;
+using System.Collections;
+
+namespace DevComponents.DotNetBar.Layout.Design
+{
+    public class LayoutControlItemDesigner : LayoutItemBaseDesigner
+    {
+        #region Constructor
+
+        #endregion
+
+        #region Implementation
+        public override System.Collections.ICollection AssociatedComponents
+        {
+            get
+            {
+                LayoutControlItem item = (LayoutControlItem)this.Component;
+
+                if (item.Control != null && item.Control.Site != null)
+                {
+                    ArrayList list = new ArrayList();
+                    list.Add(item.Control);
+                    return list;
+                }
+
+                return base.AssociatedComponents;
+            }
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout.Design/LayoutGroupDesigner.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout.Design/LayoutGroupDesigner.cs
new file mode 100644
index 00000000..61851e7b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout.Design/LayoutGroupDesigner.cs	
@@ -0,0 +1,222 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Collections;
+using System.ComponentModel.Design;
+using System.ComponentModel;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Layout.Design
+{
+    public class LayoutGroupDesigner : LayoutItemBaseDesigner
+    {
+        #region Constructor
+
+        #endregion
+
+        #region Implementation
+
+        public override System.Collections.ICollection AssociatedComponents
+        {
+            get
+            {
+                LayoutGroup group = (LayoutGroup)this.Component;
+
+                if (group.Items.Count>0)
+                {
+                    ArrayList list = new ArrayList();
+                    foreach (LayoutItemBase child in group.Items)
+                    {
+                        if (child.Site != null)
+                            list.Add(child);
+                    }
+                    return list;
+                }
+
+                return base.AssociatedComponents;
+            }
+        }
+
+        public override DesignerVerbCollection Verbs
+        {
+            get
+            {
+                DesignerVerb[] verbs;
+                verbs = new DesignerVerb[]
+				{
+                    new DesignerVerb("Add Spacer", new EventHandler(AddSpacerItem)),
+                    new DesignerVerb("Add Group", new EventHandler(AddGroupItem)),
+					new DesignerVerb("Apply Panel Style", new EventHandler(PanelStyle)),
+                    new DesignerVerb("Apply Group Panel Style", new EventHandler(GroupPanelStyle)),
+                    new DesignerVerb("Remove Panel Style", new EventHandler(RemovePanelStyle))
+				};
+                return new DesignerVerbCollection(verbs);
+            }
+        }
+        private void AddSpacerItem(object sender, EventArgs e)
+        {
+            AddSpacerItem();
+        }
+
+        private void AddSpacerItem()
+        {
+            IDesignerHost dh = (IDesignerHost)GetService(typeof(IDesignerHost));
+            LayoutGroup lc = this.Component as LayoutGroup;
+            if (lc == null || dh == null)
+                return;
+
+            DesignerTransaction dt = dh.CreateTransaction("Creating Spacer Item");
+            try
+            {
+                IComponentChangeService cc = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+                if (cc != null)
+                {
+                    cc.OnComponentChanging(this.Component, null);
+                    cc.OnComponentChanging(lc, TypeDescriptor.GetProperties(lc)["Items"]);
+                }
+
+                LayoutSpacerItem item = null;
+                item = dh.CreateComponent(typeof(LayoutSpacerItem)) as LayoutSpacerItem;
+                item.Width = 32;
+                item.Height = 32;
+                lc.Items.Add(item);
+                lc.InvalidateLayout();
+                if (cc != null)
+                {
+                    cc.OnComponentChanged(lc, TypeDescriptor.GetProperties(lc)["Items"], null, null);
+                    cc.OnComponentChanged(this.Component, null, null, null);
+                }
+
+                SelectComponent(item, SelectionTypes.Replace);
+            }
+            catch
+            {
+                dt.Cancel();
+            }
+            finally
+            {
+                if (!dt.Canceled) dt.Commit();
+            }
+        }
+
+        private void AddGroupItem(object sender, EventArgs e)
+        {
+            AddGroupItem();
+        }
+
+        private void AddGroupItem()
+        {
+            IDesignerHost dh = (IDesignerHost)GetService(typeof(IDesignerHost));
+            LayoutGroup lc = this.Component as LayoutGroup;
+            if (lc == null || dh == null)
+                return;
+
+            DesignerTransaction dt = dh.CreateTransaction("Creating Group Item");
+            try
+            {
+                IComponentChangeService cc = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+                if (cc != null)
+                {
+                    cc.OnComponentChanging(this.Component, null);
+                    cc.OnComponentChanging(lc, TypeDescriptor.GetProperties(lc)["Items"]);
+                }
+
+                LayoutGroup item = null;
+                item = dh.CreateComponent(typeof(LayoutGroup)) as LayoutGroup;
+                item.Width = 200;
+                item.Height = 100;
+                item.TextPosition = eLayoutPosition.Top;
+                item.MinSize = new Size(120, 32);
+                lc.Items.Add(item);
+                lc.InvalidateLayout();
+                if (cc != null)
+                {
+                    cc.OnComponentChanged(lc, TypeDescriptor.GetProperties(lc)["Items"], null, null);
+                    cc.OnComponentChanged(this.Component, null, null, null);
+                }
+
+                SelectComponent(item, SelectionTypes.Replace);
+            }
+            catch
+            {
+                dt.Cancel();
+            }
+            finally
+            {
+                if (!dt.Canceled) dt.Commit();
+            }
+        }
+
+        private void PanelStyle(object sender, EventArgs e)
+        {
+            LayoutGroup group = (LayoutGroup)this.Component;
+            IDesignerHost dh = (IDesignerHost)GetService(typeof(IDesignerHost));
+            if (group == null || dh == null)
+                return;
+
+            DesignerTransaction dt = dh.CreateTransaction("Apply Panel Style");
+
+            TypeDescriptor.GetProperties(group)["Appearance"].SetValue(group, eGroupAppearance.Panel); // group.Appearance = eGroupAppearance.Panel;
+            TypeDescriptor.GetProperties(group)["CaptionHeight"].SetValue(group, 22); // group.CaptionHeight = 22;
+            TypeDescriptor.GetProperties(group)["TextLineAlignment"].SetValue(group, DevComponents.DotNetBar.Layout.eTextLineAlignment.Middle); // group.TextLineAlignment = DevComponents.DotNetBar.Layout.eTextLineAlignment.Middle;
+            TypeDescriptor.GetProperties(group)["TextPosition"].SetValue(group, DevComponents.DotNetBar.Layout.eLayoutPosition.Top); // group.TextPosition = DevComponents.DotNetBar.Layout.eLayoutPosition.Top;
+            TypeDescriptor.GetProperties(group)["TextAlignment"].SetValue(group, eTextAlignment.Default); // group.TextAlignment = eTextAlignment.Default;
+            if (string.IsNullOrEmpty(group.Text))
+                TypeDescriptor.GetProperties(group)["Text"].SetValue(group, "Caption"); // group.Text = "Caption";
+
+            dt.Commit();
+            
+        }
+
+        private void GroupPanelStyle(object sender, EventArgs e)
+        {
+            LayoutGroup group = (LayoutGroup)this.Component;
+            IDesignerHost dh = (IDesignerHost)GetService(typeof(IDesignerHost));
+            if (group == null || dh == null)
+                return;
+
+            DesignerTransaction dt = dh.CreateTransaction("Apply Group Panel Style");
+
+            TypeDescriptor.GetProperties(group)["Appearance"].SetValue(group, eGroupAppearance.GroupPanel); // group.Appearance = eGroupAppearance.GroupPanel;
+            TypeDescriptor.GetProperties(group)["CaptionHeight"].SetValue(group, 18); // group.CaptionHeight = 18;
+            TypeDescriptor.GetProperties(group)["TextLineAlignment"].SetValue(group, DevComponents.DotNetBar.Layout.eTextLineAlignment.Middle); // group.TextLineAlignment = DevComponents.DotNetBar.Layout.eTextLineAlignment.Middle;
+            TypeDescriptor.GetProperties(group)["TextPosition"].SetValue(group, DevComponents.DotNetBar.Layout.eLayoutPosition.Top); // group.TextPosition = DevComponents.DotNetBar.Layout.eLayoutPosition.Top;
+            TypeDescriptor.GetProperties(group)["TextAlignment"].SetValue(group, eTextAlignment.Center); // group.TextAlignment = eTextAlignment.Center;
+            if (string.IsNullOrEmpty(group.Text))
+                TypeDescriptor.GetProperties(group)["Text"].SetValue(group, "Caption"); // group.Text = "Caption";
+
+            dt.Commit();
+        }
+
+        private void RemovePanelStyle(object sender, EventArgs e)
+        {
+            LayoutGroup group = (LayoutGroup)this.Component;
+            IDesignerHost dh = (IDesignerHost)GetService(typeof(IDesignerHost));
+            if (group == null || dh == null)
+                return;
+
+            DesignerTransaction dt = dh.CreateTransaction("Remove Panel Style");
+
+            TypeDescriptor.GetProperties(group)["Appearance"].SetValue(group, eGroupAppearance.None); // group.Appearance = eGroupAppearance.None;
+            TypeDescriptor.GetProperties(group)["TextLineAlignment"].SetValue(group, DevComponents.DotNetBar.Layout.eTextLineAlignment.Default); // group.TextLineAlignment = DevComponents.DotNetBar.Layout.eTextLineAlignment.Default;
+            TypeDescriptor.GetProperties(group)["CaptionHeight"].SetValue(group, 0); // group.CaptionHeight = 0;
+            TypeDescriptor.GetProperties(group)["TextPosition"].SetValue(group, DevComponents.DotNetBar.Layout.eLayoutPosition.Default); // group.TextPosition = DevComponents.DotNetBar.Layout.eLayoutPosition.Default;
+            TypeDescriptor.GetProperties(group)["TextAlignment"].SetValue(group, eTextAlignment.Default); // group.TextAlignment = eTextAlignment.Default;
+            TypeDescriptor.GetProperties(group)["Text"].SetValue(group, ""); // group.Text = "Caption";
+            dt.Commit();
+            
+        }
+
+        protected virtual void SelectComponent(IComponent comp, SelectionTypes selectionType)
+        {
+            ISelectionService selection = (ISelectionService)this.GetService(typeof(ISelectionService));
+            if (selection != null && comp != null)
+            {
+                ArrayList arr = new ArrayList(1);
+                arr.Add(comp);
+                selection.SetSelectedComponents(arr, selectionType);
+            }
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout.Design/LayoutItemBaseDesigner.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout.Design/LayoutItemBaseDesigner.cs
new file mode 100644
index 00000000..73474dce
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout.Design/LayoutItemBaseDesigner.cs	
@@ -0,0 +1,543 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel.Design;
+using System.Collections;
+using System.Windows.Forms.Design.Behavior;
+using System.Windows.Forms;
+using System.Drawing;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar.Layout.Design
+{
+    public class LayoutItemBaseDesigner : ComponentDesigner
+    {
+        #region Constructor
+        /// <summary>
+        /// Initializes a new instance of the LayoutItemBaseDesigner class.
+        /// </summary>
+        public LayoutItemBaseDesigner()
+        {
+
+        }
+        #endregion
+
+        #region Implementation
+        public override void Initialize(System.ComponentModel.IComponent component)
+        {
+            base.Initialize(component);
+
+            ISelectionService selectionService = (ISelectionService)GetService(typeof(ISelectionService));
+            if (selectionService != null)
+                selectionService.SelectionChanged += SelectionChanged;
+
+            BehaviorService behaviorService = (BehaviorService)GetService(typeof(BehaviorService));
+            Adorner designerActionAdorner = new Adorner();
+            behaviorService.Adorners.Add(designerActionAdorner);
+            LayoutItemGlyph glyph = new LayoutItemGlyph(behaviorService, (LayoutItemBase)component);
+            designerActionAdorner.Glyphs.Add(glyph);
+        }
+        protected override void Dispose(bool disposing)
+        {
+            ISelectionService selectionService = (ISelectionService)GetService(typeof(ISelectionService));
+            if (selectionService != null)
+                selectionService.SelectionChanged -= SelectionChanged;
+            base.Dispose(disposing);
+        }
+        private void OnComponentRemoved(object sender, ComponentEventArgs e)
+        {
+            if (e.Component == this.Component)
+            {
+                LayoutItemBase item = e.Component as LayoutItemBase;
+                LayoutGroup parent = item.Parent as LayoutGroup;
+                LayoutControl lc = null;
+                if (parent != null) lc = parent.GetLayoutControl();
+                if (item != null && parent != null && parent.Items.Contains(item))
+                {
+                    IComponentChangeService cc = (IComponentChangeService)GetService(typeof(IComponentChangeService));
+                    if (cc != null)
+                        cc.OnComponentChanging(parent, TypeDescriptor.GetProperties(parent)["Items"]);
+                    parent.Items.Remove(item);
+                    if (cc != null)
+                        cc.OnComponentChanged(parent, TypeDescriptor.GetProperties(parent)["Items"], null, null);
+                    if (lc != null)
+                    {
+                        lc.Invalidate();
+                        IDesignerHost host = (IDesignerHost)GetService(typeof(IDesignerHost));
+                        if (host != null)
+                        {
+                            IDesigner designer = host.GetDesigner(lc);
+                            if (designer is LayoutControlDesigner)
+                            {
+                                ((LayoutControlDesigner)designer).SelectionRefresh();
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        private void SelectionChanged(object sender, EventArgs e)
+        {
+            bool selected = false;
+            ISelectionService selectionService = (ISelectionService)GetService(typeof(ISelectionService));
+            if (selectionService.PrimarySelection == this.Component)
+                selected = true;
+            else
+            {
+                ICollection selectedComponents = selectionService.GetSelectedComponents();
+                foreach (object o in selectedComponents)
+                {
+                    if (o == this.Component)
+                    {
+                        selected = true;
+                        break;
+                    }
+                }
+            }
+
+            LayoutItemBase item = (LayoutItemBase)this.Component;
+            item.IsSelected = selected;
+        }
+
+        public override System.Collections.ICollection AssociatedComponents
+        {
+            get
+            {
+                LayoutGroup group = this.Component as LayoutGroup;
+                if (group == null)
+                    return base.AssociatedComponents;
+                List<LayoutItemBase> items = new List<LayoutItemBase>();
+                group.Items.CopyTo(items);
+                return items;
+            }
+        }
+
+        protected override void PreFilterProperties(IDictionary properties)
+        {
+            base.PreFilterProperties(properties);
+            properties["Visible"] = TypeDescriptor.CreateProperty(typeof(LayoutItemBaseDesigner), (PropertyDescriptor)properties["Visible"], new Attribute[]
+				{
+					new DefaultValueAttribute(true),
+					new BrowsableAttribute(true),
+					new CategoryAttribute("Appearance")});
+        }
+        /// <summary>
+        /// Gets or sets whether item is visible.
+        /// </summary>
+        [DefaultValue(true), Browsable(true), Category("Appearance"), Description("Indicates visiblity of the item.")]
+        public bool Visible
+        {
+            get
+            {
+                return (bool)ShadowProperties["Visible"];
+            }
+            set
+            {
+                // this value is not passed to the actual control
+                this.ShadowProperties["Visible"] = value;
+            }
+        }
+        #endregion
+    }
+
+    class LayoutItemGlyph : Glyph
+    {
+        LayoutItemBase _Item;
+        BehaviorService _BehaviorSvc;
+
+        public LayoutItemGlyph(BehaviorService behaviorSvc, LayoutItemBase item)
+            :
+            base(new LayoutItemBehavior())
+        {
+            _BehaviorSvc = behaviorSvc;
+            _Item = item;
+        }
+
+        public LayoutItemBase Item
+        {
+            get
+            {
+                return _Item;
+            }
+        }
+
+        public override Rectangle Bounds
+        {
+            get
+            {
+                // Glyph coordinates are in adorner window coordinates, so we must map using the behavior service.
+                Rectangle bounds = Rectangle.Empty;
+                if (_Item != null && _Item.GetLayoutControl() != null)
+                {
+                    Point edge = _BehaviorSvc.ControlToAdornerWindow(_Item.GetLayoutControl());
+
+                    if (_Item is LayoutControlItem)
+                        bounds = _Item.ActualTextBounds;
+                    else
+                        bounds = _Item.Bounds;
+                    bounds.Offset(edge);
+                }
+
+                return bounds;
+            }
+        }
+
+        public Rectangle CompleteBounds
+        {
+            get
+            {
+                Rectangle bounds = Rectangle.Empty;
+                if (_Item != null && _Item.GetLayoutControl() != null)
+                {
+                    Point edge = _BehaviorSvc.ControlToAdornerWindow(_Item.GetLayoutControl());
+                    bounds = _Item.Bounds;
+                    bounds.Offset(edge);
+                }
+                return bounds;
+            }
+        }
+
+        public override Cursor GetHitTest(Point p)
+        {
+            if (_Item != null && !_Item.IsSelected)
+                return null;
+            // GetHitTest is called to see if the point is 
+            // within this glyph.  This gives us a chance to decide 
+            // what cursor to show.  Returning null from here means 
+            // the mouse pointer is not currently inside of the glyph. 
+            // Returning a valid cursor here indicates the pointer is 
+            // inside the glyph, and also enables our Behavior property 
+            // as the active behavior. 
+            if (Bounds.Contains(p))
+            {
+                return Cursors.SizeAll;
+            }
+
+            return null;
+        }
+
+        private bool GetIsItemVisible()
+        {
+            if (_Item == null)
+                return false;
+            LayoutControl lc = _Item.GetLayoutControl();
+            if (lc != null)
+            {
+                if (!lc.Visible) return false;
+                if (lc.Parent != null && !lc.Parent.Visible) return false;
+                if(lc.Parent is TabControlPanel && ((TabControlPanel)lc.Parent).TabItem!=null && !((TabControlPanel)lc.Parent).TabItem.IsSelected)
+                    return false;
+                if (lc.Parent is SuperTabControlPanel && ((SuperTabControlPanel)lc.Parent).TabItem != null && !((SuperTabControlPanel)lc.Parent).TabItem.IsSelected)
+                    return false;
+            }
+            return true;
+        }
+
+        public override void Paint(PaintEventArgs pe)
+        {
+            // Draw our glyph
+            if (_Item != null)
+            {
+                if (_Item.IsSelected)
+                {
+                    Rectangle r = CompleteBounds;
+                    r.Width--;
+                    r.Height--;
+                    Graphics g = pe.Graphics;
+                    using (Pen pen = new Pen(SelectionColor))
+                    {
+                        pen.DashStyle = System.Drawing.Drawing2D.DashStyle.Dot;
+                        g.DrawRectangle(pen, r);
+                    }
+                }
+                else if ((!_Item.TextVisible || string.IsNullOrEmpty(_Item.Text)) && GetIsItemVisible())
+                {
+                    Rectangle r = CompleteBounds;
+                    r.Width--;
+                    r.Height--;
+                    Graphics g = pe.Graphics;
+                    using (Pen pen = new Pen(SelectableColor))
+                    {
+                        pen.DashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
+                        g.DrawRectangle(pen, r);
+                    }
+                }
+            }
+
+        }
+
+        private static readonly Color SelectableColor = ColorHelpers.GetColor(0x8C8C91);
+        private static readonly Color SelectionColor = ColorHelpers.GetColor(0x696969);
+
+        // By providing our own behavior we can do something interesting 
+        // when the user clicks or manipulates our glyph. 
+        class LayoutItemBehavior : Behavior
+        {
+            //public override bool OnMouseUp(Glyph g, MouseButtons button)
+            //{
+            //    //MessageBox.Show("Hey, you clicked the mouse here");
+            //    //return true; // indicating we processed this event.
+            //    return base.OnMouseUp(g, button);
+            //}
+
+            private Point _MouseDownLocation = Point.Empty;
+            public override bool OnMouseDown(Glyph g, MouseButtons button, Point mouseLoc)
+            {
+                LayoutItemGlyph itemGlyph = (LayoutItemGlyph)g;
+                if (itemGlyph._Item != null && itemGlyph._Item.Site != null && (!itemGlyph._Item.IsSelected || itemGlyph._Item is LayoutGroup))
+                {
+                    LayoutItemBase item = itemGlyph._Item;
+                    IComponent selectItem = item;
+                    if (item is LayoutGroup)
+                    {
+                        LayoutControl lc = item.GetLayoutControl();
+                        if (lc == null) return base.OnMouseDown(g, button, mouseLoc);
+                        Point loc = lc.PointToClient(Control.MousePosition);
+                        LayoutItemBase itemAt = lc.HitTest(loc);
+                        if (itemAt != null && itemAt != item && itemAt.Site != null)
+                        {
+                            // Selection is selecting something inside of group
+                            selectItem = itemAt;
+                            if (itemAt is LayoutControlItem)
+                            {
+                                LayoutControlItem lci = (LayoutControlItem)itemAt;
+                                if (lci.Control != null && lci.Control.ClientRectangle.Contains(lci.Control.PointToClient(Control.MousePosition)) && lci.Control.Site != null)
+                                    selectItem = lci.Control;
+                            }
+                        }
+                        // No need to re-select
+                        if (selectItem == itemGlyph._Item && itemGlyph.Item.IsSelected)
+                            return base.OnMouseDown(g, button, mouseLoc);
+                    }
+                    ISelectionService selectionService = (ISelectionService)selectItem.Site.GetService(typeof(ISelectionService));
+                    if (selectionService != null && selectItem != null)
+                    {
+                        selectionService.SetSelectedComponents(new IComponent[] { selectItem });
+                        return true;
+                    }
+                }
+                return base.OnMouseDown(g, button, mouseLoc);
+            }
+            public override bool OnMouseUp(Glyph g, MouseButtons button)
+            {
+                _MouseDownLocation = Point.Empty;
+                return base.OnMouseUp(g, button);
+            }
+            public override bool OnMouseMove(Glyph g, MouseButtons button, Point mouseLoc)
+            {
+                if (button == MouseButtons.Left && _MouseDownLocation.IsEmpty)
+                    _MouseDownLocation = mouseLoc;
+                if (button == MouseButtons.Left && !_MouseDownLocation.IsEmpty &&
+                    (Math.Abs(mouseLoc.X - _MouseDownLocation.X) > 1 || Math.Abs(mouseLoc.Y - _MouseDownLocation.Y) > 1))
+                {
+                    LayoutItemGlyph glyph = g as LayoutItemGlyph;
+                    if (glyph != null && glyph.Item != null)
+                    {
+                        ISelectionService selectionService = GetSelectionService(glyph.Item);
+                        if (selectionService != null && selectionService.PrimarySelection == glyph.Item && selectionService.GetSelectedComponents().Count == 1)
+                        {
+                            _MouseDownLocation = Point.Empty;
+                            this.DropSource.QueryContinueDrag += new QueryContinueDragEventHandler(this.QueryContinueDrag);
+                            this.DropSource.DoDragDrop(new LayoutItemDataObject(glyph.Item), DragDropEffects.Move | DragDropEffects.Copy | DragDropEffects.Scroll);
+                        }
+                    }
+                }
+
+                return false;// base.OnMouseMove(g, button, mouseLoc);
+            }
+
+            public override void OnDragDrop(Glyph g, DragEventArgs e)
+            {
+                if (e.Data is LayoutItemDataObject)
+                {
+                    LayoutItemDataObject d = (LayoutItemDataObject)e.Data;
+                    LayoutControl lc = d.DragComponent.GetLayoutControl();
+                    if (lc != null)
+                    {
+                        lc.HideInsertMarker();
+                        LayoutItemBase item = d.DragComponent;
+                        ISelectionService selectionService = GetSelectionService(item);
+                        IDesignerHost host = GetDesignerHostService(item);
+                        IComponentChangeService cc = GetComponentChangeService(item);
+                        if (selectionService != null && host != null && cc != null)
+                        {
+                            HitTestInsertInfo info = lc.GetHitTestInsertInfo(item, lc.PointToClient(new Point(e.X, e.Y)));
+                            if (info.Parent != null)
+                            {
+                                DesignerTransaction dt = host.CreateTransaction("Moving Layout Control Item");
+                                cc.OnComponentChanging(lc, TypeDescriptor.GetProperties(lc)["RootGroup"]);
+                                //lc.Text = string.Format("Moving at B: {0}", info.InsertIndex);
+                                //lc.Invalidate();
+                                if (info.Parent != item.Parent)
+                                {
+                                    LayoutGroup group = (LayoutGroup)item.Parent;
+                                    if (group != lc.RootGroup)
+                                        cc.OnComponentChanging(group, TypeDescriptor.GetProperties(lc)["Items"]);
+                                    group.Items.Remove(item);
+                                    if (group != lc.RootGroup)
+                                        cc.OnComponentChanged(group, TypeDescriptor.GetProperties(lc)["Items"], null, null);
+                                    if (info.Parent != lc.RootGroup)
+                                        cc.OnComponentChanging(info.Parent, TypeDescriptor.GetProperties(lc)["Items"]);
+                                    if (info.InsertIndex >= 0)
+                                        info.Parent.Items.Insert(info.InsertIndex, item);
+                                    else
+                                        info.Parent.Items.Add(item);
+                                    if (info.Parent != lc.RootGroup)
+                                        cc.OnComponentChanged(info.Parent, TypeDescriptor.GetProperties(lc)["Items"], null, null);
+                                }
+                                else
+                                {
+                                    if (info.Parent != lc.RootGroup)
+                                        cc.OnComponentChanging(info.Parent, TypeDescriptor.GetProperties(lc)["Items"]);
+                                    info.Parent.Items.Move(item, info.InsertIndex);
+                                    if (info.Parent != lc.RootGroup)
+                                        cc.OnComponentChanged(info.Parent, TypeDescriptor.GetProperties(lc)["Items"], null, null);
+                                }
+
+                                cc.OnComponentChanged(lc, TypeDescriptor.GetProperties(lc)["RootGroup"], null, null);
+                                dt.Commit();
+                                lc.PerformLayout();
+                                lc.Invalidate(true);
+
+                                IDesigner designer = host.GetDesigner(lc);
+                                if (designer is LayoutControlDesigner)
+                                    ((LayoutControlDesigner)designer).SelectionRefresh();
+                            }
+                        }
+                    }
+                }
+                base.OnDragDrop(g, e);
+            }
+            public override void OnDragLeave(Glyph g, EventArgs e)
+            {
+                LayoutItemGlyph glyph = g as LayoutItemGlyph;
+                if (glyph != null && glyph.Item != null)
+                {
+                    LayoutControl lc = glyph.Item.GetLayoutControl();
+                    if (lc != null)
+                        lc.HideInsertMarker();
+                }
+                base.OnDragLeave(g, e);
+            }
+
+            public override void OnDragOver(Glyph g, DragEventArgs e)
+            {
+                if (e.Data is LayoutItemDataObject)
+                {
+                    e.Effect = DragDropEffects.Move;
+                    LayoutItemDataObject d = (LayoutItemDataObject)e.Data;
+                    LayoutControl lc = d.DragComponent.GetLayoutControl();
+                    if (lc != null)
+                    {
+                        HitTestInsertInfo info = lc.GetHitTestInsertInfo(d.DragComponent, lc.PointToClient(new Point(e.X, e.Y)));
+                        if (!info.InsertMarkerBounds.IsEmpty)
+                            lc.ShowInsertMarker(info.InsertMarkerBounds);
+                        else
+                            lc.HideInsertMarker();
+                        e.Effect = DragDropEffects.Move;
+                        return;
+                    }
+                }
+                e.Effect = DragDropEffects.None;
+                return;
+                base.OnDragOver(g, e);
+            }
+
+            public override void OnDragEnter(Glyph g, DragEventArgs e)
+            {
+                if (e.Data is LayoutItemDataObject)
+                {
+                    e.Effect = DragDropEffects.Move;
+                }
+                else
+                    e.Effect = DragDropEffects.None;
+                return;
+                base.OnDragEnter(g, e);
+            }
+
+            private void QueryContinueDrag(object sender, QueryContinueDragEventArgs e)
+            {
+                if ((e.Action != DragAction.Continue) && e.EscapePressed)
+                {
+                    e.Action = DragAction.Cancel;
+                    //ToolStripItem glyphItem = sender as ToolStripItem;
+                    //this.SetParentDesignerValuesForDragDrop(glyphItem, false, Point.Empty);
+                    //ISelectionService selectionService = this.GetSelectionService(glyphItem);
+                    //if (selectionService != null)
+                    //{
+                    //    selectionService.SetSelectedComponents(new IComponent[] { glyphItem }, SelectionTypes.Auto);
+                    //}
+                    //ToolStripDesigner.dragItem = null;
+                }
+            }
+            private ISelectionService GetSelectionService(LayoutItemBase item)
+            {
+                if (item.Site != null)
+                {
+                    return (ISelectionService)item.Site.GetService(typeof(ISelectionService));
+                }
+                return null;
+            }
+            private IDesignerHost GetDesignerHostService(LayoutItemBase item)
+            {
+                if (item.Site != null)
+                {
+                    return (IDesignerHost)item.Site.GetService(typeof(IDesignerHost));
+                }
+                return null;
+            }
+            private IComponentChangeService GetComponentChangeService(LayoutItemBase item)
+            {
+                if (item.Site != null)
+                {
+                    return (IComponentChangeService)item.Site.GetService(typeof(IComponentChangeService));
+                }
+                return null;
+            }
+
+
+            private Control _DropSource = null;
+            private Control DropSource
+            {
+                get
+                {
+                    if (_DropSource == null)
+                    {
+                        _DropSource = new Control();
+                    }
+                    return _DropSource;
+                }
+            }
+
+
+
+
+        }
+    }
+
+
+    #region LayoutItemDataObject
+    internal class LayoutItemDataObject : DataObject
+    {
+        private LayoutItemBase _DragComponent;
+
+        // Methods
+        internal LayoutItemDataObject(LayoutItemBase dragComponents)
+        {
+            _DragComponent = dragComponents;
+        }
+
+        // Properties
+        internal LayoutItemBase DragComponent
+        {
+            get
+            {
+                return _DragComponent;
+            }
+        }
+    }
+    #endregion
+
+
+
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout.Design/SymbolTypeEditor.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout.Design/SymbolTypeEditor.cs
new file mode 100644
index 00000000..9a156985
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout.Design/SymbolTypeEditor.cs	
@@ -0,0 +1,185 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows.Forms.Design;
+using System.ComponentModel;
+using System.Windows.Forms;
+using System.Drawing.Design;
+using System.Reflection;
+using DevComponents.DotNetBar;
+using System.Runtime.InteropServices;
+using System.Drawing;
+using DevComponents.DotNetBar.Rendering;
+
+namespace DevComponents.DotNetBar.Layout.Design
+{
+    public class SymbolTypeEditor : System.Drawing.Design.UITypeEditor
+    {
+        #region Implementation
+        private IWindowsFormsEditorService edSvc = null;
+        public override object EditValue(ITypeDescriptorContext context, IServiceProvider provider, object value)
+        {
+            if (context != null
+                && context.Instance != null
+                && provider != null)
+            {
+                edSvc = provider.GetService(typeof(IWindowsFormsEditorService)) as IWindowsFormsEditorService;
+                string stringValue = null;
+                if (value != null) stringValue = value.ToString();
+
+                if (edSvc != null)
+                {
+                    ItemPanel itemPanel = new ItemPanel();
+                    itemPanel.Font = Symbols.FontAwesome;
+                    itemPanel.MultiLine = true;
+                    itemPanel.AutoScroll = true;
+                    itemPanel.LayoutOrientation = eOrientation.Horizontal;
+                    itemPanel.SelectedIndexChanged += new EventHandler(ItemPanelSelectedIndexChanged);
+#if !TRIAL
+                    itemPanel.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F";
+#endif
+                    SetColors(itemPanel);
+
+                    Dictionary<int, bool> supportedChars = GetFontSupportedChars(itemPanel.Font);
+                    for (int i = 0xf000; i <= 0xf200; i++)
+                    {
+                        if (!supportedChars.ContainsKey(i)) continue;
+                        ButtonItem button = new ButtonItem();
+                        button.AutoCheckOnClick = true;
+                        button.OptionGroup = "sym";
+                        button.Text = char.ConvertFromUtf32(i);
+                        button.Tooltip = string.Format("{0:x}", i);
+                        if (button.Text == stringValue) button.Checked = true;
+                        itemPanel.Items.Add(button);
+                    }
+                    edSvc.DropDownControl(itemPanel);
+                    itemPanel.SelectedIndexChanged -= new EventHandler(ItemPanelSelectedIndexChanged);
+                    if (itemPanel.SelectedItem != null)
+                        return itemPanel.SelectedItem.Text;
+                }
+            }
+
+            return value;
+        }
+
+        private void SetColors(ItemPanel itemPanel)
+        {
+            Office2007ColorTable table = ((Office2007Renderer)GlobalManager.Renderer).ColorTable;
+            ElementStyle style = (ElementStyle)table.StyleClasses[ElementStyleClassKeys.ItemPanelKey];
+            itemPanel.BackgroundStyle.BackColor = style.BackColor;
+            itemPanel.BackgroundStyle.BackColor2 = style.BackColor2;
+        }
+
+        void ItemPanelSelectedIndexChanged(object sender, EventArgs e)
+        {
+            if (edSvc != null)
+                edSvc.CloseDropDown();
+        }
+
+        /// <summary>
+        /// Gets the editor style used by the EditValue method.
+        /// </summary>
+        /// <param name="context">An ITypeDescriptorContext that can be used to gain additional context information.</param>
+        /// <returns>A UITypeEditorEditStyle value that indicates the style of editor used by EditValue. If the UITypeEditor does not support this method, then GetEditStyle will return None</returns>
+        public override UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext context)
+        {
+            if (context != null && context.Instance != null)
+            {
+                return UITypeEditorEditStyle.DropDown;
+            }
+            return base.GetEditStyle(context);
+        }
+
+        // This method indicates to the design environment that
+        // the type editor will paint additional content in the
+        // LightShape entry in the PropertyGrid.
+        public override bool GetPaintValueSupported(
+            ITypeDescriptorContext context)
+        {
+            return true;
+        }
+
+        public override void PaintValue(PaintValueEventArgs e)
+        {
+            string symbol = (string)e.Value;
+            Font font = Symbols.GetFontAwesome(10);
+            e.Graphics.DrawString(symbol, font, Brushes.Brown, e.Bounds.X, e.Bounds.Y + 2, StringFormat.GenericDefault);
+
+        }
+        #endregion
+
+        #region GetFontSupportedChars
+        private static readonly IntPtr HGDI_ERROR = new IntPtr(-1);
+        private const int UIntSize = 4;
+        [DllImport("gdi32.dll")]
+        private static extern uint GetFontUnicodeRanges(IntPtr hdc, IntPtr lpgs);
+        [DllImport("gdi32.dll")]
+        private static extern IntPtr SelectObject(IntPtr hdc, IntPtr hgdiobj);
+        private Dictionary<int, bool> GetFontSupportedChars(Font font)
+        {
+            Dictionary<int, bool> table = new Dictionary<int, bool>();
+
+            IntPtr glyphSetData = IntPtr.Zero;
+            IntPtr savedFont = HGDI_ERROR;
+            IntPtr hdc = IntPtr.Zero;
+            Graphics g = null;
+
+            try 
+            {
+                g = Graphics.FromHwnd(IntPtr.Zero);
+                hdc = g.GetHdc();
+                IntPtr hFont = font.ToHfont();
+                savedFont = SelectObject(hdc, hFont);
+                if (savedFont == HGDI_ERROR)
+                    throw new Exception(
+                        "Unexpected failure of SelectObject.");
+                uint size = GetFontUnicodeRanges(hdc, IntPtr.Zero);
+                if (size == 0)
+                    throw new Exception(
+                        "Unexpected failure of GetFontUnicodeRanges.");
+                glyphSetData = Marshal.AllocHGlobal((int)size);
+                if (GetFontUnicodeRanges(hdc, glyphSetData) == 0)
+                    throw new Exception(
+                        "Unexpected failure of GetFontUnicodeRanges.");
+                int offset = UIntSize;
+                uint flags = (uint)Marshal.ReadInt32(
+                    glyphSetData, offset);
+                offset += UIntSize;
+                uint codePointCount = (uint)Marshal.ReadInt32(
+                    glyphSetData, offset);
+                offset += UIntSize;
+                uint rangeCount = (uint)Marshal.ReadInt32(
+                    glyphSetData, offset);
+                offset += UIntSize;
+                for (uint index = 0; index < rangeCount; index++)
+                {
+                    ushort first = (ushort)Marshal.ReadInt16(
+                        glyphSetData, offset);
+                    offset += Marshal.SizeOf(typeof(ushort));
+                    ushort count = (ushort)Marshal.ReadInt16(
+                        glyphSetData, offset);
+                    offset += Marshal.SizeOf(typeof(ushort));
+                    for (int i = first; i < first + count; i++)
+                    {
+                        table.Add(i, true);
+                    }
+                } 
+            }
+			finally 
+            {
+                if (glyphSetData != IntPtr.Zero)
+                    Marshal.FreeHGlobal(glyphSetData);
+                if (savedFont != HGDI_ERROR)
+                    SelectObject(hdc, savedFont);
+                if (g != null)
+                {
+                    if (hdc != IntPtr.Zero)
+                        g.ReleaseHdc(hdc);
+                    g.Dispose();
+                } 
+            }
+            return table;
+        }        
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout.Design/SystemImages/ColorPickerButtonImage.png b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout.Design/SystemImages/ColorPickerButtonImage.png
new file mode 100644
index 00000000..06c2e80d
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout.Design/SystemImages/ColorPickerButtonImage.png differ
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout.Design/TextMarkupEditor.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout.Design/TextMarkupEditor.cs
new file mode 100644
index 00000000..8e96c1e4
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout.Design/TextMarkupEditor.cs	
@@ -0,0 +1,324 @@
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.Drawing;
+using System.Data;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Layout.Design
+{
+	/// <summary>
+	/// Summary description for TextMarkupEditor.
+	/// </summary>
+	[ToolboxItem(false)]
+    public class TextMarkupEditor : PanelEx
+    {
+        public System.Windows.Forms.Button buttonCancel;
+		public System.Windows.Forms.Button buttonOK;
+		private System.Windows.Forms.Timer timer1;
+		private DevComponents.DotNetBar.PanelEx previewPanel;
+		public System.Windows.Forms.TextBox inputText;
+        private Label label2;
+		private System.ComponentModel.IContainer components;
+        private Bar bar1;
+        private ButtonItem buttonBold;
+        private ButtonItem buttonItalic;
+        private ButtonItem buttonUnderline;
+        private ColorPickerDropDown buttonColor;
+        private SuperTooltipControl m_Tooltip = null;
+
+		public TextMarkupEditor()
+		{
+			// This call is required by the Windows.Forms Form Designer.
+			InitializeComponent();
+
+			this.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
+			this.ApplyLabelStyle();
+			this.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder;
+			this.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+            this.TabStop = false;
+		}
+
+		/// <summary> 
+		/// Clean up any resources being used.
+		/// </summary>
+		protected override void Dispose( bool disposing )
+		{
+			if( disposing )
+			{
+				if(components != null)
+				{
+					components.Dispose();
+				}
+			}
+			base.Dispose( disposing );
+		}
+
+		#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.inputText = new System.Windows.Forms.TextBox();
+            this.previewPanel = new DevComponents.DotNetBar.PanelEx();
+            this.buttonCancel = new System.Windows.Forms.Button();
+            this.buttonOK = new System.Windows.Forms.Button();
+            this.timer1 = new System.Windows.Forms.Timer(this.components);
+            this.label2 = new System.Windows.Forms.Label();
+            this.bar1 = new DevComponents.DotNetBar.Bar();
+            this.buttonBold = new DevComponents.DotNetBar.ButtonItem();
+            this.buttonItalic = new DevComponents.DotNetBar.ButtonItem();
+            this.buttonUnderline = new DevComponents.DotNetBar.ButtonItem();
+            this.buttonColor = new DevComponents.DotNetBar.ColorPickerDropDown();
+            ((System.ComponentModel.ISupportInitialize)(this.bar1)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // inputText
+            // 
+            this.inputText.AcceptsReturn = true;
+            this.inputText.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+                        | System.Windows.Forms.AnchorStyles.Left)
+                        | System.Windows.Forms.AnchorStyles.Right)));
+            this.inputText.Location = new System.Drawing.Point(8, 8);
+            this.inputText.Multiline = true;
+            this.inputText.Name = "inputText";
+            this.inputText.Size = new System.Drawing.Size(332, 110);
+            this.inputText.TabIndex = 0;
+            this.inputText.TextChanged += new System.EventHandler(this.inputText_TextChanged);
+            // 
+            // previewPanel
+            // 
+            this.previewPanel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
+                        | System.Windows.Forms.AnchorStyles.Right)));
+            this.previewPanel.AutoScroll = true;
+            this.previewPanel.CanvasColor = System.Drawing.SystemColors.Control;
+            this.previewPanel.Location = new System.Drawing.Point(8, 152);
+            this.previewPanel.Name = "previewPanel";
+            this.previewPanel.Size = new System.Drawing.Size(332, 75);
+            this.previewPanel.Style.BackColor1.Color = System.Drawing.Color.White;
+            this.previewPanel.Style.BackgroundImagePosition = DevComponents.DotNetBar.eBackgroundImagePosition.Tile;
+            this.previewPanel.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+            this.previewPanel.Style.BorderColor.Color = System.Drawing.Color.DarkGray;
+            this.previewPanel.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText;
+            this.previewPanel.Style.GradientAngle = 90;
+            this.previewPanel.Style.LineAlignment = System.Drawing.StringAlignment.Near;
+            this.previewPanel.TabIndex = 1;
+            // 
+            // buttonCancel
+            // 
+            this.buttonCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+            this.buttonCancel.FlatStyle = System.Windows.Forms.FlatStyle.System;
+            this.buttonCancel.Location = new System.Drawing.Point(269, 233);
+            this.buttonCancel.Name = "buttonCancel";
+            this.buttonCancel.Size = new System.Drawing.Size(71, 24);
+            this.buttonCancel.TabIndex = 4;
+            this.buttonCancel.Text = "Cancel";
+            this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click);
+            // 
+            // buttonOK
+            // 
+            this.buttonOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonOK.DialogResult = System.Windows.Forms.DialogResult.OK;
+            this.buttonOK.FlatStyle = System.Windows.Forms.FlatStyle.System;
+            this.buttonOK.Location = new System.Drawing.Point(194, 233);
+            this.buttonOK.Name = "buttonOK";
+            this.buttonOK.Size = new System.Drawing.Size(71, 24);
+            this.buttonOK.TabIndex = 3;
+            this.buttonOK.Text = "OK";
+            this.buttonOK.Click += new System.EventHandler(this.buttonOK_Click);
+            // 
+            // timer1
+            // 
+            this.timer1.Interval = 1000;
+            this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
+            // 
+            // label2
+            // 
+            this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.label2.BackColor = System.Drawing.Color.WhiteSmoke;
+            this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.label2.Location = new System.Drawing.Point(316, 133);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(24, 16);
+            this.label2.TabIndex = 5;
+            this.label2.Text = "?";
+            this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            this.label2.MouseLeave += new System.EventHandler(this.label2_MouseLeave);
+            this.label2.MouseEnter += new System.EventHandler(this.label2_MouseEnter);
+            // 
+            // bar1
+            // 
+            this.bar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+            this.buttonBold,
+            this.buttonItalic,
+            this.buttonUnderline,
+            this.buttonColor});
+            this.bar1.Location = new System.Drawing.Point(8, 124);
+            this.bar1.Name = "bar1";
+            this.bar1.Size = new System.Drawing.Size(174, 25);
+            this.bar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
+            this.bar1.TabIndex = 6;
+            this.bar1.TabStop = false;
+            this.bar1.Text = "bar1";
+            // 
+            // buttonBold
+            // 
+            this.buttonBold.Name = "buttonBold";
+            this.buttonBold.Shortcuts.Add(DevComponents.DotNetBar.eShortcut.CtrlB);
+            this.buttonBold.Text = "Bold";
+            this.buttonBold.Click += new System.EventHandler(this.buttonBold_Click);
+            // 
+            // buttonItalic
+            // 
+            this.buttonItalic.Name = "buttonItalic";
+            this.buttonItalic.Shortcuts.Add(DevComponents.DotNetBar.eShortcut.CtrlI);
+            this.buttonItalic.Text = "Italic";
+            this.buttonItalic.Click += new System.EventHandler(this.buttonItalic_Click);
+            // 
+            // buttonUnderline
+            // 
+            this.buttonUnderline.Name = "buttonUnderline";
+            this.buttonUnderline.Shortcuts.Add(DevComponents.DotNetBar.eShortcut.CtrlU);
+            this.buttonUnderline.Text = "Underline";
+            this.buttonUnderline.Click += new System.EventHandler(this.buttonUnderline_Click);
+            // 
+            // buttonColor
+            // 
+            this.buttonColor.Name = "buttonColor";
+            this.buttonColor.Tooltip = "Sets the text color";
+            this.buttonColor.Image = Helpers.LoadBitmap("SystemImages.ColorPickerButtonImage.png");
+            this.buttonColor.SelectedColorImageRectangle = new System.Drawing.Rectangle(2, 2, 12, 12);
+            this.buttonColor.Click += new System.EventHandler(this.buttonColor_SelectedColorChanged);
+            // 
+            // TextMarkupEditor
+            // 
+            this.Controls.Add(this.bar1);
+            this.Controls.Add(this.label2);
+            this.Controls.Add(this.buttonOK);
+            this.Controls.Add(this.buttonCancel);
+            this.Controls.Add(this.previewPanel);
+            this.Controls.Add(this.inputText);
+            this.Name = "TextMarkupEditor";
+            this.Size = new System.Drawing.Size(348, 263);
+            ((System.ComponentModel.ISupportInitialize)(this.bar1)).EndInit();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+		}
+
+        void buttonCancel_Click(object sender, EventArgs e)
+        {
+            DestroyTooltip();
+            this.DialogResult = DialogResult.Cancel;
+        }
+
+        void buttonOK_Click(object sender, EventArgs e)
+        {
+            DestroyTooltip();
+            this.DialogResult = DialogResult.OK;
+        }
+		#endregion
+
+		private void inputText_TextChanged(object sender, System.EventArgs e)
+		{
+			timer1.Stop();
+			timer1.Start();
+		}
+
+		private void timer1_Tick(object sender, System.EventArgs e)
+		{
+			timer1.Stop();
+            UpdatePreview();
+		}
+
+        private void UpdatePreview()
+        {
+            previewPanel.Text = inputText.Text;
+        }
+
+        protected override void OnGotFocus(EventArgs e)
+        {
+            base.OnGotFocus(e);
+            inputText.Focus();
+        }
+
+        private void label2_MouseEnter(object sender, EventArgs e)
+        {
+            DestroyTooltip();
+
+            m_Tooltip = new SuperTooltipControl();
+            m_Tooltip.AntiAlias = false;
+            SuperTooltipInfo info = new SuperTooltipInfo();
+            info.HeaderText = "Markup tags available";
+            info.BodyText = "<b>b</b> - Bold <br/>" +
+                "<b>i</b> - Italic <br/>" +
+                "<b>u</b> - Underline <br/>" +
+                "<b>p</b> - Paragraph container, <b>width</b> attribute indicates width of block element <br/>" +
+                "<b>div</b> - Block-level container, <b>width</b> attribute indicates width of block element<br/>" +
+                "<b>span</b> - Inline container, <b>width</b> attribute indicates width of block element. Can be used to create tables<br/>" +
+                "<b>br</b> - Line break<br/>" +
+                "<b>font</b> - Changes font, color, size. <b>size</b> attribute indicates absolute or relative font size. <b>color</b> attribute to change the color" +
+                "You can use relative sizing for example +1 to increase font size by one point or -1 to decrease by one point. <b>face</b> attribute can be employed to set the specific font name to use.<br/>" +
+                "<b>h1</b> - Header markup. You can use h1, h2, h3, h4, h5, h6 to represent header sizes<br/>" +
+                "<b>a</b> - Denotes hypertext link. <b>href</b> and <b>name</b> attributes are supported<br/>" +
+                "<b>expand</b> - Displays the expand part of the button" +
+                "<br/>All tags must be lower case and they must be well formed i.e. each tag must be closed with end tag or be an empty tag.";
+            info.Color = eTooltipColor.Default;
+            Point p = label2.PointToScreen(new Point(0, label2.Height + 1));
+            m_Tooltip.ShowTooltip(info, p.X, p.Y, true);
+        }
+
+        private void DestroyTooltip()
+        {
+            if (m_Tooltip == null)
+                return;
+            m_Tooltip.Hide();
+            m_Tooltip.Dispose();
+            m_Tooltip = null;
+        }
+
+        private void label2_MouseLeave(object sender, EventArgs e)
+        {
+            DestroyTooltip();
+        }
+
+        private void buttonBold_Click(object sender, EventArgs e)
+        {
+            ApplyTag("<b>", "</b>");
+        }
+
+        private void buttonItalic_Click(object sender, EventArgs e)
+        {
+            ApplyTag("<i>", "</i>");
+        }
+
+        private void buttonUnderline_Click(object sender, EventArgs e)
+        {
+            ApplyTag("<u>", "</u>");
+        }
+
+        private void buttonColor_SelectedColorChanged(object sender, EventArgs e)
+        {
+            ApplyTag("<font color=\"" + GetHexColor(buttonColor.SelectedColor) +"\">", "</font>");
+        }
+
+        private void ApplyTag(string startTag, string endTag)
+        {
+            if (inputText.SelectionLength == 0)
+                inputText.SelectedText = startTag + endTag;
+            else
+                inputText.SelectedText = startTag + inputText.SelectedText + endTag;
+
+            UpdatePreview();
+        }
+
+        private string GetHexColor(Color color)
+        {
+            return "#" + color.R.ToString("X02") + color.G.ToString("X02") + color.B.ToString("X02");
+        }
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout.Design/TextMarkupEditor.resx b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout.Design/TextMarkupEditor.resx
new file mode 100644
index 00000000..fce63f71
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout.Design/TextMarkupEditor.resx	
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout.Design/TextMarkupUIEditor.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout.Design/TextMarkupUIEditor.cs
new file mode 100644
index 00000000..62c0648d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout.Design/TextMarkupUIEditor.cs	
@@ -0,0 +1,72 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Windows.Forms.Design;
+using System.Windows.Forms;
+using System.ComponentModel.Design;
+using System.Collections;
+
+namespace DevComponents.DotNetBar.Layout.Design
+{
+    public class TextMarkupUIEditor : System.Drawing.Design.UITypeEditor
+    {
+        #region Private Variables
+        private IWindowsFormsEditorService m_EditorService = null;
+        #endregion
+
+        #region Internal Implementation
+        public override object EditValue(ITypeDescriptorContext context, IServiceProvider provider, object value)
+        {
+            if (context != null
+                && context.Instance != null
+                && provider != null)
+            {
+                m_EditorService = provider.GetService(typeof(IWindowsFormsEditorService)) as IWindowsFormsEditorService;
+
+                if (m_EditorService != null)
+                {
+                    TextMarkupEditor editor = new TextMarkupEditor();
+                    editor.buttonOK.Click += new EventHandler(MarkupEditorButtonClick);
+                    editor.buttonCancel.Click += new EventHandler(MarkupEditorButtonClick);
+                    
+                    if(value!=null)
+                        editor.inputText.Text = value.ToString();
+
+                    m_EditorService.DropDownControl(editor);
+
+                    if (editor.DialogResult == DialogResult.OK)
+                    {
+                        string text = editor.inputText.Text;
+                        editor.Dispose();
+                        return text;
+                    }
+                    editor.Dispose();
+                }
+            }
+
+            return value;
+        }
+
+        void MarkupEditorButtonClick(object sender, EventArgs e)
+        {
+            if (m_EditorService != null)
+                m_EditorService.CloseDropDown();
+        }
+
+        /// <summary>
+        /// Gets the editor style used by the EditValue method.
+        /// </summary>
+        /// <param name="context">An ITypeDescriptorContext that can be used to gain additional context information.</param>
+        /// <returns>A UITypeEditorEditStyle value that indicates the style of editor used by EditValue. If the UITypeEditor does not support this method, then GetEditStyle will return None</returns>
+        public override UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext context)
+        {
+            if (context != null && context.Instance != null)
+            {
+                return UITypeEditorEditStyle.DropDown;
+            }
+            return base.GetEditStyle(context);
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout.Design/WinApi.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout.Design/WinApi.cs
new file mode 100644
index 00000000..b5bc224c
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout.Design/WinApi.cs	
@@ -0,0 +1,115 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Runtime.InteropServices;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Layout.Design
+{
+    internal static class WinApi
+    {
+        [DllImport("gdi32.dll", CharSet = CharSet.Auto)]
+        public static extern IntPtr SelectObject(IntPtr hDC, IntPtr hObject);
+        [DllImport("gdi32")]
+        public static extern bool DeleteObject(IntPtr hObject);
+
+        [DllImport("gdi32.dll", CharSet = CharSet.Auto)]
+        public static extern bool GetTextMetrics(HandleRef hdc, TEXTMETRIC tm);
+        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
+        public class TEXTMETRIC
+        {
+            public int tmHeight;
+            public int tmAscent;
+            public int tmDescent;
+            public int tmInternalLeading;
+            public int tmExternalLeading;
+            public int tmAveCharWidth;
+            public int tmMaxCharWidth;
+            public int tmWeight;
+            public int tmOverhang;
+            public int tmDigitizedAspectX;
+            public int tmDigitizedAspectY;
+            public char tmFirstChar;
+            public char tmLastChar;
+            public char tmDefaultChar;
+            public char tmBreakChar;
+            public byte tmItalic;
+            public byte tmUnderlined;
+            public byte tmStruckOut;
+            public byte tmPitchAndFamily;
+            public byte tmCharSet;
+        }
+
+        [DllImport("user32")]
+        public static extern int SendMessage(IntPtr hWnd, int Msg, IntPtr wParam, IntPtr lParam);
+        [DllImport("user32")]
+        public static extern int SendMessage(IntPtr hWnd, int Msg, int wParam, int lParam);
+        public const int WM_SETREDRAW = 0x000B;
+
+        public const int WM_LBUTTONDOWN = 0x0201;
+        public const int WM_LBUTTONUP = 0x0202;
+        public const int WM_RBUTTONDOWN = 0x0204;
+        public const int WM_RBUTTONUP = 0x0205;
+        public const int WM_MOUSEMOVE = 0x0200;
+        public const int WM_MOUSELEAVE = 0x02A3;
+        public const int WM_HSCROLL = 0x0114;
+        public const int WM_VSCROLL = 0x0115;
+        public const int WM_LBUTTONDBLCLK = 0x0203;
+
+        public static int LOWORD(int n)
+        {
+            return (short)(n & 0xffff);
+        }
+        public static int HIWORD(int n)
+        {
+            return (int)((n >> 0x10) & 0xffff);
+        }
+        public static int LOWORD(IntPtr n)
+        {
+            return LOWORD((int)((long)n));
+        }
+        public static int HIWORD(IntPtr n)
+        {
+            return unchecked((short)((uint)n >> 16));
+        }
+
+        //[DllImport("user32.dll", CharSet = CharSet.Auto, SetLastError = true, ExactSpelling = true)]
+        //public static extern int ScrollWindowEx(HandleRef hWnd, int nXAmount, int nYAmount, ref RECT rectScrollRegion, ref RECT rectClip, IntPtr hrgnUpdate, ref RECT prcUpdate, int flags);
+        //[StructLayout(LayoutKind.Sequential)]
+        //public struct RECT
+        //{
+        //    public int left;
+        //    public int top;
+        //    public int right;
+        //    public int bottom;
+        //    public RECT(int left, int top, int right, int bottom)
+        //    {
+        //        this.left = left;
+        //        this.top = top;
+        //        this.right = right;
+        //        this.bottom = bottom;
+        //    }
+
+        //    public RECT(Rectangle r)
+        //    {
+        //        this.left = r.Left;
+        //        this.top = r.Top;
+        //        this.right = r.Right;
+        //        this.bottom = r.Bottom;
+        //    }
+
+        //    public static RECT FromXYWH(int x, int y, int width, int height)
+        //    {
+        //        return new RECT(x, y, x + width, y + height);
+        //    }
+
+        //    public Size Size
+        //    {
+        //        get
+        //        {
+        //            return new Size(this.right - this.left, this.bottom - this.top);
+        //        }
+        //    }
+        //}
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/Background.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/Background.cs
new file mode 100644
index 00000000..5fe2e147
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/Background.cs	
@@ -0,0 +1,375 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+using System.ComponentModel;
+using System.Drawing.Drawing2D;
+using System.Globalization;
+
+namespace DevComponents.DotNetBar.Layout
+{
+    [TypeConverter(typeof(BackgroundConvertor))]
+    public class Background : INotifyPropertyChanged
+    {
+        #region Constructor
+        /// <summary>
+        /// Initializes a new instance of the Background class.
+        /// </summary>
+        public Background()
+        {
+
+        }
+        /// <summary>
+        /// Initializes a new instance of the Background class with single solid backgruond color.
+        /// </summary>
+        public Background(Color backColor)
+        {
+            _Colors = new Color[] { backColor };
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the Background class.
+        /// </summary>
+        /// <param name="colors"></param>
+        public Background(Color[] colors)
+        {
+            _Colors = colors;
+        }
+        /// <summary>
+        /// Initializes a new instance of the Background class.
+        /// </summary>
+        /// <param name="colors"></param>
+        /// <param name="positions"></param>
+        public Background(Color[] colors, float[] positions)
+        {
+            _Colors = colors;
+            _Positions = positions;
+        }
+        /// <summary>
+        /// Initializes a new instance of the Background class.
+        /// </summary>
+        /// <param name="colors"></param>
+        /// <param name="positions"></param>
+        /// <param name="gradientType"></param>
+        public Background(Color[] colors, float[] positions, eGradientType gradientType)
+        {
+            _Colors = colors;
+            _Positions = positions;
+            _GradientType = gradientType;
+        }
+        /// <summary>
+        /// Initializes a new instance of the Background class.
+        /// </summary>
+        /// <param name="colors"></param>
+        /// <param name="positions"></param>
+        /// <param name="gradientType"></param>
+        /// <param name="linearGradientAngle"></param>
+        public Background(Color[] colors, float[] positions, eGradientType gradientType, int linearGradientAngle)
+        {
+            _Colors = colors;
+            _Positions = positions;
+            _GradientType = gradientType;
+            _LinearGradientAngle = linearGradientAngle;
+        }
+        #endregion
+
+        #region Implementation
+        /// <summary>
+        /// Gets whether class is empty.
+        /// </summary>
+        [Browsable(false)]
+        public bool IsEmpty
+        {
+            get
+            {
+                return (_Colors == null || _Colors.Length == 0) &&
+                    (_Positions == null || _Positions.Length == 0);
+            }
+        }
+        /// <summary>
+        /// Gets whether background is visible, i.e. colors are assigned.
+        /// </summary>
+        [Browsable(false)]
+        public bool IsBackgroundSet
+        {
+            get
+            {
+                return !(_Colors == null || _Colors.Length == 0);
+            }
+        }
+        /// <summary>
+        /// Creates the brush which represents the background.
+        /// </summary>
+        /// <param name="r">Bounds for the brush.</param>
+        /// <returns>New instance of the brush or null if brush cannot be created.</returns>
+        public Brush CreateBrush(Rectangle r)
+        {
+            if (!IsBackgroundSet)
+                return null;
+            if (_Colors.Length == 1)
+                return new SolidBrush(_Colors[0]);
+            if (_GradientType == eGradientType.LinearGradient)
+            {
+                LinearGradientBrush brush = null;
+                if (_Colors.Length == 2)
+                {
+                    brush = new LinearGradientBrush(r, _Colors[0], _Colors[1], _LinearGradientAngle);
+                    if (_Positions != null && _Positions.Length != 2) return brush;
+                }
+                else
+                    brush = new LinearGradientBrush(r, _Colors[0], _Colors[_Colors.Length - 1], _LinearGradientAngle);
+                ColorBlend cb = GetColorBlend();
+                if (cb != null)
+                    brush.InterpolationColors = cb;
+                return brush;
+            }
+            else
+            {
+                int n = (int)Math.Sqrt(r.Width * r.Width + r.Height * r.Height) + 4;
+                using (GraphicsPath path = new GraphicsPath())
+                {
+                    path.AddEllipse(r.X - (n - r.Width) / 2, r.Y - (n - r.Height) / 2, n, n);
+
+                    PathGradientBrush pbr = new PathGradientBrush(path);
+
+                    pbr.CenterColor = _Colors[0];
+                    pbr.SurroundColors = new Color[] { _Colors[_Colors.Length - 1] };
+
+                    ColorBlend cb = GetColorBlend();
+
+                    if (cb != null)
+                        pbr.InterpolationColors = cb;
+
+                    return (pbr);
+                }
+            }
+        }
+        private ColorBlend GetColorBlend()
+        {
+            if (_Colors != null &&
+                _Colors != null && _Colors.Length > 0)
+            {
+                ColorBlend cb = new ColorBlend(_Colors.Length);
+
+                cb.Colors = _Colors;
+                cb.Positions = GetPositions();
+
+                return (cb);
+            }
+
+            return (null);
+        }
+        private float[] GetPositions()
+        {
+            float[] cp = _Positions;
+
+            if (cp == null || cp.Length != _Colors.Length)
+            {
+                cp = new float[_Colors.Length];
+
+                float f = 1f / _Colors.Length;
+
+                for (int i = 0; i < cp.Length; i++)
+                    cp[i] = i * f;
+
+                cp[_Colors.Length - 1] = 1;
+            }
+
+            return (cp);
+        }
+
+
+        private Color[] _Colors = null;
+        /// <summary>
+        /// Indicates the array of colors that make up background.
+        /// </summary>
+        [DefaultValue(null), Category("Appearance"), Description("Indicates the array of colors that make up background."), TypeConverter(typeof(ArrayConverter))]
+        public Color[] Colors
+        {
+            get
+            {
+                return _Colors;
+            }
+            set
+            {
+                if (_Colors != value)
+                {
+                    _Colors = value;
+                    OnPropertyChanged(new PropertyChangedEventArgs("Colors"));
+                }
+            }
+        }
+
+        private float[] _Positions = null;
+        /// <summary>
+        /// Indicates the positions for the gradient colors when multiple colors are set to Colors property. When not set
+        /// the gradient color positions are evenly distributed.
+        /// </summary>
+        [DefaultValue(null), Category("Appearance"), Description("Indicates the positions for the gradient colors when multiple colors are set to Colors property."), TypeConverter(typeof(ArrayConverter))]
+        public float[] Positions
+        {
+            get
+            {
+                return _Positions;
+            }
+            set
+            {
+                _Positions = value;
+                OnPropertyChanged(new PropertyChangedEventArgs("Positions"));
+            }
+        }
+
+        private eGradientType _GradientType = eGradientType.LinearGradient;
+        /// <summary>
+        /// Indicates the gradient type used when multiple Colors are specified.
+        /// </summary>
+        [DefaultValue(eGradientType.LinearGradient), Category("Appearance"), Description("Indicates the gradient type used when multiple Colors are specified.")]
+        public eGradientType GradientType
+        {
+            get { return _GradientType; }
+            set { _GradientType = value; OnPropertyChanged(new PropertyChangedEventArgs("GradientType")); }
+        }
+
+        private int _LinearGradientAngle = 90;
+        /// <summary>
+        /// Indicates the linear gradient angle.
+        /// </summary>
+        [DefaultValue(90), Description("Indicates the linear gradient angle."), Category("Appearance")]
+        public int LinearGradientAngle
+        {
+            get { return _LinearGradientAngle; }
+            set { _LinearGradientAngle = value; OnPropertyChanged(new PropertyChangedEventArgs("LinearGradientAngle")); }
+        }
+        #endregion
+
+        #region INotifyPropertyChanged Members
+
+        /// <summary>
+        /// Occurs when property value has changed.
+        /// </summary>
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        /// <summary>
+        /// Raises the PropertyChanged event.
+        /// </summary>
+        /// <param name="e">Event arguments</param>
+        protected virtual void OnPropertyChanged(PropertyChangedEventArgs e)
+        {
+            PropertyChangedEventHandler eh = PropertyChanged;
+
+            if (eh != null)
+                eh(this, e);
+        }
+
+        /// <summary>
+        /// Raises the PropertyChanged event.
+        /// </summary>
+        /// <param name="s">Event arguments</param>
+        protected virtual void OnPropertyChangedEx(string s)
+        {
+            PropertyChangedEventHandler eh = PropertyChanged;
+
+            if (eh != null)
+            {
+                PropertyChangedEventArgs e =
+                    new PropertyChangedEventArgs(s);
+
+                eh(this, e);
+            }
+        }
+
+        #endregion
+    }
+
+    public enum eGradientType
+    {
+        LinearGradient,
+        RadialGradient
+    }
+
+    #region BackgroundConvertor
+
+    ///<summary>
+    /// BackgroundConvertor
+    ///</summary>
+    public class BackgroundConvertor : ExpandableObjectConverter
+    {
+        public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
+        {
+            return ((sourceType == typeof(string)) || base.CanConvertFrom(context, sourceType));
+        }
+        public override object ConvertTo(
+            ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+        {
+            if (destinationType == typeof(string))
+            {
+                Background gc = value as Background;
+
+                if (gc != null)
+                {
+                    if (gc.IsEmpty)
+                        return "(Empty)";
+
+                    if (gc.Colors != null && gc.Colors.Length == 1)
+                        return ColorHelpers.ToArgbString(gc.Colors[0]);
+
+                    if (gc.Colors != null && gc.Colors.Length > 1)
+                        return ("Blended");
+
+                    
+                    return "";
+                }
+            }
+
+            return (base.ConvertTo(context, culture, value, destinationType));
+        }
+        public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
+        {
+            string str = value as string;
+            if (string.IsNullOrEmpty(str))
+            {
+                return new BorderColors();
+            }
+            string str2 = str.Trim();
+            if (str2.Length == 0)
+            {
+                return null;
+            }
+            if (culture == null)
+            {
+                culture = CultureInfo.CurrentCulture;
+            }
+            if (str2.IndexOf(culture.TextInfo.ListSeparator[0]) == -1)
+            {
+                Color c = Color.FromName(str2);
+                if (c.IsEmpty)
+                    c = ColorHelpers.GetColor(str2);
+                return new Background(c);
+            }
+
+            throw new ArgumentException("Text Parsing Failed");
+
+            //char ch = culture.TextInfo.ListSeparator[0];
+            //string[] strArray = str2.Split(new char[] { ch });
+            //Color[] numArray = new Color[strArray.Length];
+            ////TypeConverter converter = TypeDescriptor.GetConverter(typeof(Color));
+            //for (int i = 0; i < numArray.Length; i++)
+            //{
+            //    numArray[i] = ColorHelpers.GetColor(strArray[i]);// (Color)converter.ConvertFromString(context, culture, strArray[i]);
+            //}
+
+            //if (numArray.Length == 1)
+            //{
+            //    return new BorderColors(numArray[0]);
+            //}
+
+            //if (numArray.Length != 4)
+            //{
+            //    throw new ArgumentException("Text Parsing Failed");
+            //}
+            //return new BorderColors(numArray[0], numArray[1], numArray[2], numArray[3]);
+        }
+    }
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/BorderColors.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/BorderColors.cs
new file mode 100644
index 00000000..f2b445c0
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/BorderColors.cs	
@@ -0,0 +1,339 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+using System.Globalization;
+using System.ComponentModel;
+using System.Runtime.InteropServices;
+using System.Collections;
+using System.ComponentModel.Design.Serialization;
+using System.Reflection;
+
+namespace DevComponents.DotNetBar.Layout
+{
+
+    /// <summary>
+    /// Defines BorderColors structure used to define border colors.
+    /// </summary>
+    [StructLayout(LayoutKind.Sequential), TypeConverter(typeof(BorderColorsConverter))]
+    public struct BorderColors : IEquatable<BorderColors>
+    {
+        #region Constructor
+        private Color _Left;
+        private Color _Top;
+        private Color _Right;
+        private Color _Bottom;
+
+        /// <summary>
+        /// Creates new instance of the object.
+        /// </summary>
+        /// <param name="uniformLength">Uniform BorderColors</param>
+        public BorderColors(Color uniformBorderColors)
+        {
+            _Left = _Top = _Right = _Bottom = uniformBorderColors;
+        }
+        /// <summary>
+        /// Creates new instance of the object.
+        /// </summary>
+        /// <param name="left">Left BorderColors</param>
+        /// <param name="top">Top BorderColors</param>
+        /// <param name="right">Right BorderColors</param>
+        /// <param name="bottom">Bottom BorderColors</param>
+        public BorderColors(Color left, Color top, Color right, Color bottom)
+        {
+            _Left = left;
+            _Top = top;
+            _Right = right;
+            _Bottom = bottom;
+        }
+        #endregion
+
+        #region Implementation
+        /// <summary>
+        /// Gets whether object equals to this instance.
+        /// </summary>
+        /// <param name="obj">object to test.</param>
+        /// <returns>returns whether objects are Equals</returns>
+        public override bool Equals(object obj)
+        {
+            if (obj is BorderColors)
+            {
+                BorderColors BorderColors = (BorderColors)obj;
+                return (this == BorderColors);
+            }
+            return false;
+        }
+        /// <summary>
+        /// Gets whether object equals to this instance.
+        /// </summary>
+        /// <param name="BorderColors">object to test.</param>
+        /// <returns>returns whether objects are Equals</returns>
+        public bool Equals(BorderColors BorderColors)
+        {
+            return (this == BorderColors);
+        }
+        /// <summary>
+        /// Returns hash code for object.
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            return (((_Left.GetHashCode() ^ _Top.GetHashCode()) ^ _Right.GetHashCode()) ^ _Bottom.GetHashCode());
+        }
+
+        const string StringValueSeparator = ",";
+        /// <summary>
+        /// Returns string representation of object.
+        /// </summary>
+        /// <returns>string representing BorderColors</returns>
+        public override string ToString()
+        {
+            return Convert.ToString(_Left) + StringValueSeparator + Convert.ToString(_Top) + StringValueSeparator + Convert.ToString(_Right) + StringValueSeparator + Convert.ToString(_Bottom);
+        }
+        /// <summary>
+        /// Gets string representation of object.
+        /// </summary>
+        /// <param name="cultureInfo">Culture info.</param>
+        /// <returns>string representing BorderColors</returns>
+        internal string ToString(CultureInfo cultureInfo)
+        {
+            return Convert.ToString(_Left, cultureInfo) + StringValueSeparator + Convert.ToString(_Top, cultureInfo) + StringValueSeparator + Convert.ToString(_Right, cultureInfo) + StringValueSeparator + Convert.ToString(_Bottom, cultureInfo);
+        }
+        /// <summary>
+        /// Returns whether all values are empty.
+        /// </summary>
+        [Browsable(false)]
+        public bool IsEmpty
+        {
+            get
+            {
+                return (this.Left.IsEmpty && this.Top.IsEmpty && this.Right.IsEmpty && this.Bottom.IsEmpty);
+            }
+        }
+        /// <summary>
+        /// Returns whether all values are the same.
+        /// </summary>
+        [Browsable(false)]
+        public bool IsUniform
+        {
+            get
+            {
+                return (this.Left == this.Top && this.Top == this.Right && this.Right == this.Bottom);
+            }
+        }
+
+        public static bool operator ==(BorderColors t1, BorderColors t2)
+        {
+            return (t1._Left == t2._Left && t1._Top == t2._Top && t1._Right == t2._Right && t1._Bottom == t2._Bottom);
+        }
+
+        public static bool operator !=(BorderColors t1, BorderColors t2)
+        {
+            return !(t1 == t2);
+        }
+        /// <summary>
+        /// Gets or sets the left BorderColors.
+        /// </summary>
+        public Color Left
+        {
+            get
+            {
+                return _Left;
+            }
+            set
+            {
+                _Left = value;
+            }
+        }
+        /// <summary>
+        /// Gets or sets the top BorderColors.
+        /// </summary>
+        public Color Top
+        {
+            get
+            {
+                return _Top;
+            }
+            set
+            {
+                _Top = value;
+            }
+        }
+        /// <summary>
+        /// Gets or sets the Right BorderColors.
+        /// </summary>
+        public Color Right
+        {
+            get
+            {
+                return _Right;
+            }
+            set
+            {
+                _Right = value;
+            }
+        }
+        /// <summary>
+        /// Gets or sets the Bottom BorderColors.
+        /// </summary>
+        public Color Bottom
+        {
+            get
+            {
+                return _Bottom;
+            }
+            set
+            {
+                _Bottom = value;
+            }
+        }
+        #endregion
+    }
+
+
+    #region BorderColorsConverter
+    /// <summary>
+    /// Provides BorderColors TypeConverter.
+    /// </summary>
+    public class BorderColorsConverter : TypeConverter
+    {
+        public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
+        {
+            return ((sourceType == typeof(string)) || base.CanConvertFrom(context, sourceType));
+        }
+
+        public override bool CanConvertTo(ITypeDescriptorContext context, Type destinationType)
+        {
+            return ((destinationType == typeof(InstanceDescriptor)) || base.CanConvertTo(context, destinationType));
+        }
+
+        public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
+        {
+            string str = value as string;
+            if (string.IsNullOrEmpty(str))
+            {
+                return new BorderColors();
+            }
+            string str2 = str.Trim();
+            if (str2.Length == 0)
+            {
+                return null;
+            }
+            if (culture == null)
+            {
+                culture = CultureInfo.CurrentCulture;
+            }
+            if (str2.IndexOf(culture.TextInfo.ListSeparator[0]) == -1)
+            {
+                Color c = Color.FromName(str2);
+                if(c.IsEmpty)
+                    c = ColorHelpers.GetColor(str2);
+                return new BorderColors(c);
+            }
+
+            char ch = culture.TextInfo.ListSeparator[0];
+            string[] strArray = str2.Split(new char[] { ch });
+            Color[] numArray = new Color[strArray.Length];
+            //TypeConverter converter = TypeDescriptor.GetConverter(typeof(Color));
+            for (int i = 0; i < numArray.Length; i++)
+            {
+                numArray[i] = ColorHelpers.GetColor(strArray[i]);// (Color)converter.ConvertFromString(context, culture, strArray[i]);
+            }
+
+            if (numArray.Length == 1)
+            {
+                return new BorderColors(numArray[0]);
+            }
+
+            if (numArray.Length != 4)
+            {
+                throw new ArgumentException("Text Parsing Failed");
+            }
+            return new BorderColors(numArray[0], numArray[1], numArray[2], numArray[3]);
+        }
+
+        private string ToArgbString(Color color)
+        {
+            if (color.IsEmpty) return "";
+            if (color.A == 255)
+                return color.R.ToString("X2") + color.G.ToString("X2") + color.B.ToString("X2");
+            return color.A.ToString("X2") + color.R.ToString("X2") + color.G.ToString("X2") + color.B.ToString("X2");
+        }
+        public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+        {
+            if (destinationType == null)
+            {
+                throw new ArgumentNullException("destinationType");
+            }
+            if (value is BorderColors)
+            {
+                if (destinationType == typeof(string))
+                {
+                    BorderColors colors = (BorderColors)value;
+                    if (colors.IsEmpty) return "";
+                    if (colors.IsUniform) return ToArgbString(colors.Left);
+                    if (culture == null)
+                    {
+                        culture = CultureInfo.CurrentCulture;
+                    }
+                    string separator = culture.TextInfo.ListSeparator + " ";
+                    //TypeConverter converter = TypeDescriptor.GetConverter(typeof(Color));
+                    string[] strArray = new string[4];
+                    int num = 0;
+                    //strArray[num++] = converter.ConvertToString(context, culture, BorderColors.Left);
+                    //strArray[num++] = converter.ConvertToString(context, culture, BorderColors.Top);
+                    //strArray[num++] = converter.ConvertToString(context, culture, BorderColors.Right);
+                    //strArray[num++] = converter.ConvertToString(context, culture, BorderColors.Bottom);
+                    strArray[num++] = ToArgbString(colors.Left);
+                    strArray[num++] = ToArgbString(colors.Top);
+                    strArray[num++] = ToArgbString(colors.Right);
+                    strArray[num++] = ToArgbString(colors.Bottom);
+                    return string.Join(separator, strArray);
+                }
+                if (destinationType == typeof(InstanceDescriptor))
+                {
+                    BorderColors BorderColors2 = (BorderColors)value;
+                    ConstructorInfo constructor = typeof(BorderColors).GetConstructor(new Type[] { typeof(Color), typeof(Color), typeof(Color), typeof(Color) });
+                    if (constructor != null)
+                    {
+                        return new InstanceDescriptor(constructor, new object[] { BorderColors2.Left, BorderColors2.Top, BorderColors2.Right, BorderColors2.Bottom });
+                    }
+                }
+            }
+            return base.ConvertTo(context, culture, value, destinationType);
+        }
+
+        public override object CreateInstance(ITypeDescriptorContext context, IDictionary propertyValues)
+        {
+            if (propertyValues == null)
+            {
+                throw new ArgumentNullException("propertyValues");
+            }
+            object left = propertyValues["Left"];
+            object top = propertyValues["Top"];
+            object right = propertyValues["Right"];
+            object bottom = propertyValues["Bottom"];
+            if ((((left == null) || (top == null)) || ((right == null) || (bottom == null))) || ((!(left is Color) || !(top is Color)) || (!(right is Color) || !(bottom is Color))))
+            {
+                throw new ArgumentException(string.Format("Property Value Invalid: left={0}, top={1}, right={2}, bottom={3}", left, top, right, bottom));
+            }
+            return new BorderColors((Color)left, (Color)top, (Color)right, (Color)bottom);
+        }
+
+        public override bool GetCreateInstanceSupported(ITypeDescriptorContext context)
+        {
+            return true;
+        }
+
+        public override PropertyDescriptorCollection GetProperties(ITypeDescriptorContext context, object value, Attribute[] attributes)
+        {
+            return TypeDescriptor.GetProperties(typeof(BorderColors), attributes).Sort(new string[] { "Left", "Top", "Right", "Bottom" });
+        }
+
+        public override bool GetPropertiesSupported(ITypeDescriptorContext context)
+        {
+            return true;
+        }
+    }
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/BorderPattern.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/BorderPattern.cs
new file mode 100644
index 00000000..06166941
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/BorderPattern.cs	
@@ -0,0 +1,493 @@
+using System;
+using System.ComponentModel;
+using System.Drawing.Drawing2D;
+using System.Globalization;
+
+namespace DevComponents.DotNetBar.Layout
+{
+    /// <summary>
+    /// Defines Thickness class.
+    /// </summary>
+    [TypeConverter(typeof(BlankExpandableObjectConverter))]
+    public class BorderPattern : IEquatable<BorderPattern>, INotifyPropertyChanged
+    {
+        #region Static data
+
+        /// <summary>
+        /// Returns Empty instance of BorderPattern.
+        /// </summary>
+        public static BorderPattern Empty
+        {
+            get { return (new BorderPattern()); }
+        }
+
+        #endregion
+
+        #region Private variables
+
+        private LinePattern _Bottom = LinePattern.NotSet;
+        private LinePattern _Left = LinePattern.NotSet;
+        private LinePattern _Right = LinePattern.NotSet;
+        private LinePattern _Top = LinePattern.NotSet;
+
+        #endregion
+
+        #region Constructors
+
+        /// <summary>
+        /// Creates new instance of the object.
+        /// </summary>
+        /// <param name="left">Left BorderPatternStyle.</param>
+        /// <param name="top">Top BorderPatternStyle.</param>
+        /// <param name="right">Right BorderPatternStyle.</param>
+        /// <param name="bottom">Bottom BorderPatternStyle.</param>
+        public BorderPattern(LinePattern left,
+            LinePattern top, LinePattern right, LinePattern bottom)
+        {
+            _Left = left;
+            _Top = top;
+            _Right = right;
+            _Bottom = bottom;
+
+            PropertyChanged = null;
+        }
+
+        /// <summary>
+        /// Creates new instance of the object.
+        /// </summary>
+        /// <param name="all">Specifies uniform Thickness.</param>
+        public BorderPattern(LinePattern all)
+            : this(all, all, all, all)
+        {
+        }
+
+        ///<summary>
+        /// Creates new instance of the object.
+        ///</summary>
+        public BorderPattern()
+        {
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region All
+
+        /// <summary>
+        /// Gets or sets the thickness of all sides.
+        /// </summary>
+        //[Browsable(false)]
+        //[EditorBrowsable(EditorBrowsableState.Never)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public LinePattern All
+        {
+            set { _Top = _Left = _Bottom = _Right = value; }
+        }
+
+        #endregion
+
+        #region Bottom
+
+        /// <summary>
+        /// Gets or sets the bottom Border Pattern
+        /// </summary>
+        [DefaultValue(LinePattern.NotSet)]
+        [Description("Indicates the bottom Border Pattern")]
+        public LinePattern Bottom
+        {
+            get { return (_Bottom); }
+
+            set
+            {
+                if (_Bottom != value)
+                {
+                    _Bottom = value;
+
+                    OnPropertyChanged(new PropertyChangedEventArgs("Bottom"));
+                }
+            }
+        }
+
+        #endregion
+
+        #region Left
+
+        /// <summary>
+        /// Gets or sets the left Border Pattern
+        /// </summary>
+        [DefaultValue(LinePattern.NotSet)]
+        [Description("Indicates the left Border Pattern")]
+        public LinePattern Left
+        {
+            get { return (_Left); }
+
+            set
+            {
+                if (_Left != value)
+                {
+                    _Left = value;
+
+                    OnPropertyChanged(new PropertyChangedEventArgs("Left"));
+                }
+            }
+        }
+
+        #endregion
+
+        #region Right
+
+        /// <summary>
+        /// Gets or sets the Right Border Pattern
+        /// </summary>
+        [DefaultValue(LinePattern.NotSet)]
+        [Description("Indicates the Right Border Pattern")]
+        public LinePattern Right
+        {
+            get { return (_Right); }
+
+            set
+            {
+                if (_Right != value)
+                {
+                    _Right = value;
+
+                    OnPropertyChanged(new PropertyChangedEventArgs("Right"));
+                }
+            }
+        }
+
+        #endregion
+
+        #region Top
+
+        /// <summary>
+        /// Gets or sets the Top Border Pattern
+        /// </summary>
+        [Browsable(true), DefaultValue(LinePattern.NotSet)]
+        [Description("Indicates the Top Border Pattern")]
+        public LinePattern Top
+        {
+            get { return (_Top); }
+
+            set
+            {
+                if (_Top != value)
+                {
+                    _Top = value;
+
+                    OnPropertyChanged(new PropertyChangedEventArgs("Top"));
+                }
+            }
+        }
+
+        #endregion
+
+        #region IsEmpty
+
+        /// <summary>
+        /// Gets whether the item is empty
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsEmpty
+        {
+            get
+            {
+                return (_Left == LinePattern.NotSet &&
+                        _Right == LinePattern.NotSet &&
+                        _Top == LinePattern.NotSet &&
+                        _Bottom == LinePattern.NotSet);
+            }
+        }
+
+        /// <summary>
+        /// Gets whether left border is visible.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsLeftVisible
+        {
+            get
+            {
+                return (_Left != LinePattern.NotSet && _Left != LinePattern.None);
+            }
+        }
+        /// <summary>
+        /// Gets whether right border is visible.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsRightVisible
+        {
+            get
+            {
+                return (_Right != LinePattern.NotSet && _Right != LinePattern.None);
+            }
+        }
+        /// <summary>
+        /// Gets whether top border is visible.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsTopVisible
+        {
+            get
+            {
+                return (_Top != LinePattern.NotSet && _Top != LinePattern.None);
+            }
+        }
+        /// <summary>
+        /// Gets whether bottom border is visible.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsBottomVisible
+        {
+            get
+            {
+                return (_Bottom != LinePattern.NotSet && _Bottom != LinePattern.None);
+            }
+        }
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region IsUniform
+
+        internal bool IsUniform
+        {
+            get
+            {
+                return (_Left == _Top &&
+                        _Left == _Right && _Left == _Bottom);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Equals
+
+        /// <summary>
+        /// Gets whether two instances are equal.
+        /// </summary>
+        /// <param name="obj">Instance to compare to.</param>
+        /// <returns>true if equal otherwise false.</returns>
+        public override bool Equals(object obj)
+        {
+            if (obj is BorderPattern)
+                return (this == (BorderPattern)obj);
+
+            return (false);
+        }
+
+        /// <summary>
+        /// Gets whether two instances are equal.
+        /// </summary>
+        /// <param name="borderPattern">Instance to compare to</param>
+        /// <returns>true if equal otherwise false</returns>
+        public bool Equals(BorderPattern borderPattern)
+        {
+            return (this == borderPattern);
+        }
+
+        #endregion
+
+        #region GetHashCode
+
+        /// <summary>
+        /// Returns hash-code.
+        /// </summary>
+        /// <returns>hash-code</returns>
+        public override int GetHashCode()
+        {
+            return (((_Left.GetHashCode() ^ _Top.GetHashCode()) ^
+                     _Right.GetHashCode()) ^ _Bottom.GetHashCode());
+        }
+
+        #endregion
+
+        #region Operators
+
+        #region "==" operator
+
+        /// <summary>
+        /// Implements == operator.
+        /// </summary>
+        /// <param name="t1">Object 1</param>
+        /// <param name="t2">Object 2</param>
+        /// <returns>true if equals</returns>
+        public static bool operator ==(BorderPattern t1, BorderPattern t2)
+        {
+            if (ReferenceEquals(t1, t2))
+                return (true);
+
+            if (((object)t1 == null) || ((object)t2 == null))
+                return (false);
+
+            return (t1._Left == t2._Left && t1._Right == t2._Right &&
+                    t1._Top == t2._Top && t1._Bottom == t2._Bottom);
+        }
+
+        #endregion
+
+        #region "!=" operator
+
+        /// <summary>
+        /// Implements != operator
+        /// </summary>
+        /// <param name="t1">Object 1</param>
+        /// <param name="t2">Object 2</param>
+        /// <returns>true if different</returns>
+        public static bool operator !=(BorderPattern t1, BorderPattern t2)
+        {
+            return ((t1 == t2) == false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ApplyPattern
+
+        /// <summary>
+        /// Applies the pattern to instance of this pattern.
+        /// </summary>
+        /// <param name="pattern">Pattern to apply.</param>
+        public void ApplyPattern(BorderPattern pattern)
+        {
+            if (pattern != null)
+            {
+                if (pattern.Top != LinePattern.NotSet)
+                    _Top = pattern.Top;
+
+                if (pattern.Left != LinePattern.NotSet)
+                    _Left = pattern.Left;
+
+                if (pattern.Bottom != LinePattern.NotSet)
+                    _Bottom = pattern.Bottom;
+
+                if (pattern.Right != LinePattern.NotSet)
+                    _Right = pattern.Right;
+            }
+        }
+
+        #endregion
+
+        #region Copy
+
+        /// <summary>
+        /// Creates an exact copy of the BorderPattern.
+        /// </summary>
+        /// <returns>Copy of the BorderPattern.</returns>
+        public BorderPattern Copy()
+        {
+            BorderPattern copy = new BorderPattern(_Left, _Top, _Right, _Bottom);
+
+            return (copy);
+        }
+
+        #endregion
+
+        #region INotifyPropertyChanged Members
+
+        /// <summary>
+        /// Occurs when property value has changed.
+        /// </summary>
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        /// <summary>
+        /// Raises the PropertyChanged event.
+        /// </summary>
+        /// <param name="e">Event arguments</param>
+        void OnPropertyChanged(PropertyChangedEventArgs e)
+        {
+            PropertyChangedEventHandler eh = PropertyChanged;
+
+            if (eh != null)
+                eh(this, e);
+        }
+
+        #endregion
+    }
+
+    #region enums
+
+    #region LinePattern
+
+    ///<summary>
+    /// LinePattern
+    ///</summary>
+    public enum LinePattern
+    {
+        ///<summary>
+        /// None
+        ///</summary>
+        None = -2,
+
+        ///<summary>
+        /// NotSet
+        ///</summary>
+        NotSet = -1,
+
+        ///<summary>
+        /// Solid
+        ///</summary>
+        Solid = DashStyle.Solid,
+
+        ///<summary>
+        /// Dash
+        ///</summary>
+        Dash = DashStyle.Dash,
+
+        ///<summary>
+        /// Dot
+        ///</summary>
+        Dot = DashStyle.Dot,
+
+        ///<summary>
+        /// DashDot
+        ///</summary>
+        DashDot = DashStyle.DashDot,
+
+        ///<summary>
+        /// DashDotDot
+        ///</summary>
+        DashDotDot = DashStyle.DashDotDot,
+    }
+
+    #endregion
+
+    #endregion
+
+    #region BlankExpandableObjectConverter
+
+    ///<summary>
+    /// BlankExpandableObjectConverter
+    ///</summary>
+    public class BlankExpandableObjectConverter : ExpandableObjectConverter
+    {
+        ///<summary>
+        /// ConvertTo
+        ///</summary>
+        ///<param name="context"></param>
+        ///<param name="culture"></param>
+        ///<param name="value"></param>
+        ///<param name="destinationType"></param>
+        ///<returns></returns>
+        public override object ConvertTo(
+            ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+        {
+            if (destinationType == typeof(string))
+                return (" ");
+
+            return (base.ConvertTo(context, culture, value, destinationType));
+        }
+    }
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/ColorHelpers.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/ColorHelpers.cs
new file mode 100644
index 00000000..030e635c
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/ColorHelpers.cs	
@@ -0,0 +1,60 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Layout
+{
+    internal static class ColorHelpers
+    {
+        /// <summary>
+        /// Converts hex string to Color type.
+        /// </summary>
+        /// <param name="rgbHex">Hexadecimal color representation.</param>
+        /// <returns>Reference to Color object.</returns>
+        public static Color GetColor(string rgbHex)
+        {
+            if (string.IsNullOrEmpty(rgbHex))
+                return Color.Empty;
+            if (rgbHex.Length == 8)
+                return Color.FromArgb(Convert.ToInt32(rgbHex.Substring(0, 2), 16),
+                Convert.ToInt32(rgbHex.Substring(2, 2), 16),
+                Convert.ToInt32(rgbHex.Substring(4, 2), 16),
+                Convert.ToInt32(rgbHex.Substring(6, 2), 16));
+
+            return Color.FromArgb(Convert.ToInt32(rgbHex.Substring(0, 2), 16),
+                Convert.ToInt32(rgbHex.Substring(2, 2), 16),
+                Convert.ToInt32(rgbHex.Substring(4, 2), 16));
+        }
+
+        /// <summary>
+        /// Converts hex string to Color type.
+        /// </summary>
+        /// <param name="rgb">Color representation as 32-bit RGB value.</param>
+        /// <returns>Reference to Color object.</returns>
+        public static Color GetColor(int rgb)
+        {
+            if (rgb == -1) return Color.Empty;
+            return Color.FromArgb((rgb & 0xFF0000) >> 16, (rgb & 0xFF00) >> 8, rgb & 0xFF);
+        }
+
+        /// <summary>
+        /// Converts hex string to Color type.
+        /// </summary>
+        /// <param name="rgb">Color representation as 32-bit RGB value.</param>
+        /// <returns>Reference to Color object.</returns>
+        public static Color GetColor(int alpha, int rgb)
+        {
+            if (rgb == -1) return Color.Empty;
+            return Color.FromArgb(alpha, (rgb & 0xFF0000) >> 16, (rgb & 0xFF00) >> 8, rgb & 0xFF);
+        }
+
+        public static string ToArgbString(Color color)
+        {
+            if (color.IsEmpty) return "";
+            if (color.A == 255)
+                return color.R.ToString("X2") + color.G.ToString("X2") + color.B.ToString("X2");
+            return color.A.ToString("X2") + color.R.ToString("X2") + color.G.ToString("X2") + color.B.ToString("X2");
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/ContentManager/BlockLayoutManager.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/ContentManager/BlockLayoutManager.cs
new file mode 100644
index 00000000..c828e842
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/ContentManager/BlockLayoutManager.cs	
@@ -0,0 +1,46 @@
+using System.Collections;
+using System.Drawing;
+
+#if AdvTree
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.UI.ContentManager
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#elif LAYOUT
+namespace DevComponents.DotNetBar.Layout.TextMarkup
+#endif
+{
+	/// <summary>
+	/// Represents block layout manager responsible for sizing the content blocks.
+	/// </summary>
+	public abstract class BlockLayoutManager
+	{
+		private Graphics m_Graphics;
+
+	    /// <summary>
+		/// Resizes the content block and sets it's Bounds property to reflect new size.
+		/// </summary>
+		/// <param name="block">Content block to resize.</param>
+        /// <param name="availableSize">Content size available for the block in the given line.</param>
+		public abstract void Layout(IBlock block, Size availableSize);
+
+        /// <summary>
+        /// Performs layout finalization
+        /// </summary>
+        /// <param name="containerBounds"></param>
+        /// <param name="blocksBounds"></param>
+        /// <param name="lines"></param>
+        /// <returns></returns>
+        public abstract Rectangle FinalizeLayout(Rectangle containerBounds, Rectangle blocksBounds, ArrayList lines);
+
+		/// <summary>
+		/// Gets or sets the graphics object used by layout manager.
+		/// </summary>
+		public System.Drawing.Graphics Graphics
+		{
+			get {return m_Graphics;}
+			set {m_Graphics=value;}
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/ContentManager/Enums.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/ContentManager/Enums.cs
new file mode 100644
index 00000000..e61ff8a7
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/ContentManager/Enums.cs	
@@ -0,0 +1,66 @@
+using System;
+
+#if AdvTree
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.UI.ContentManager
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#elif LAYOUT
+namespace DevComponents.DotNetBar.Layout.TextMarkup
+#endif
+
+{
+	/// <summary>
+	/// Specifies orientation of content.
+	/// </summary>
+	public enum eContentOrientation
+	{
+		/// <summary>
+		/// Indicates Horizontal orientation of the content.
+		/// </summary>
+		Horizontal,
+		/// <summary>
+		/// Indicates Vertical orientation of the content.
+		/// </summary>
+		Vertical
+	}
+
+	/// <summary>
+	/// Specifies content horizontal alignment.
+	/// </summary>
+	public enum eContentAlignment
+	{
+		/// <summary>
+		/// Content is left aligned.UI
+		/// </summary>
+		Left,
+		/// <summary>
+		/// Content is right aligned.
+		/// </summary>
+		Right,
+		/// <summary>
+		/// Content is centered.
+		/// </summary>
+		Center
+	}
+
+	/// <summary>
+	/// Specifies content vertical alignment.
+	/// </summary>
+	public enum eContentVerticalAlignment
+	{
+		/// <summary>
+		/// Content is top aligned.
+		/// </summary>
+		Top,
+		/// <summary>
+		/// Content is bottom aligned.
+		/// </summary>
+		Bottom,
+		/// <summary>
+		/// Content is in the middle.
+		/// </summary>
+		Middle
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/ContentManager/IBlock.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/ContentManager/IBlock.cs
new file mode 100644
index 00000000..b2487100
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/ContentManager/IBlock.cs	
@@ -0,0 +1,35 @@
+using System;
+using System.Drawing;
+using DevComponents.DotNetBar;
+using System.Windows.Forms;
+
+#if AdvTree
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.UI.ContentManager
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#elif LAYOUT
+namespace DevComponents.DotNetBar.Layout.TextMarkup
+#endif
+
+{
+	/// <summary>
+	/// Represents a content block interface.
+	/// </summary>
+	public interface IBlock
+	{
+		/// <summary>
+		/// Gets or sets the bounds of the content block.
+		/// </summary>
+		Rectangle Bounds {get;set;}
+		/// <summary>
+		/// Gets or sets whether content block is visible.
+		/// </summary>
+		bool Visible {get;set;}
+        /// <summary>
+        /// Gets or sets the block margins.
+        /// </summary>
+        Padding Margin { get;set;}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/ContentManager/IBlockExtended.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/ContentManager/IBlockExtended.cs
new file mode 100644
index 00000000..a263b22b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/ContentManager/IBlockExtended.cs	
@@ -0,0 +1,28 @@
+using System;
+using System.Text;
+
+#if AdvTree
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.UI.ContentManager
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#elif LAYOUT
+namespace DevComponents.DotNetBar.Layout.TextMarkup
+#endif
+
+{
+    /// <summary>
+    /// Represents a extended content block interface for advanced layout information.
+    /// </summary>
+    public interface IBlockExtended : IBlock
+    {
+        bool IsBlockElement { get;}
+        bool IsNewLineAfterElement { get;}
+        bool CanStartNewLine { get; }
+        /// <summary>
+        /// Returns whether element is an container so it receives full available size of parent control for layout.
+        /// </summary>
+        bool IsBlockContainer { get; }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/ContentManager/IContentLayoutManager.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/ContentManager/IContentLayoutManager.cs
new file mode 100644
index 00000000..d9426e1b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/ContentManager/IContentLayoutManager.cs	
@@ -0,0 +1,29 @@
+using System;
+using System.Drawing;
+
+#if AdvTree
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.UI.ContentManager
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#elif LAYOUT
+namespace DevComponents.DotNetBar.Layout.TextMarkup
+#endif
+
+{
+	/// <summary>
+	/// Represents interface for block layout.
+	/// </summary>
+	public interface IContentLayout
+	{
+		/// <summary>
+		/// Performs layout of the content block.
+		/// </summary>
+		/// <param name="containerBounds">Container bounds to layout content blocks in.</param>
+		/// <param name="contentBlocks">Content blocks to layout.</param>
+		/// <param name="blockLayout">Block layout manager that resizes the content blocks.</param>
+		/// <returns>The bounds of the content blocks within the container bounds.</returns>
+		Rectangle Layout(Rectangle containerBounds, IBlock[] contentBlocks, BlockLayoutManager blockLayout);
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/ContentManager/SerialContentLayoutManager.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/ContentManager/SerialContentLayoutManager.cs
new file mode 100644
index 00000000..a3c251c0
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/ContentManager/SerialContentLayoutManager.cs	
@@ -0,0 +1,659 @@
+using System;
+using System.Collections;
+using System.Drawing;
+
+#if AdvTree
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.UI.ContentManager
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#elif LAYOUT
+namespace DevComponents.DotNetBar.Layout.TextMarkup
+#endif
+
+{
+	/// <summary>
+	/// Represents the serial content layout manager that arranges content blocks in series next to each other.
+	/// </summary>
+	public class SerialContentLayoutManager:IContentLayout
+    {
+        #region Events
+        /// <summary>
+        /// Occurs when X, Y position of next block is calcualted.
+        /// </summary>
+        public event LayoutManagerPositionEventHandler NextPosition;
+
+        /// <summary>
+        /// Occurs before new block is layed out.
+        /// </summary>
+        public event LayoutManagerLayoutEventHandler BeforeNewBlockLayout;
+        #endregion
+
+        #region Private Variables
+        private int m_BlockSpacing=0;
+		private bool m_FitContainerOversize=false;
+        private bool m_FitContainer = false;
+        private bool m_VerticalFitContainerWidth = false;
+        private bool m_HorizontalFitContainerHeight = false;
+		private eContentOrientation m_ContentOrientation=eContentOrientation.Horizontal;
+		private eContentAlignment m_ContentAlignment=eContentAlignment.Left;
+		private eContentVerticalAlignment m_ContentVerticalAlignment=eContentVerticalAlignment.Middle;
+        private eContentVerticalAlignment m_BlockLineAlignment = eContentVerticalAlignment.Middle;
+		private bool m_EvenHeight=false;
+		private bool m_MultiLine=false;
+        private bool m_RightToLeft = false;
+        private bool m_OversizeDistribute = false;
+		#endregion
+
+		/// <summary>
+		/// Creates new instance of the class.
+		/// </summary>
+		public SerialContentLayoutManager()
+		{
+		}
+
+		#region IContentLayout Members
+		/// <summary>
+		/// Performs layout of the content block.
+		/// </summary>
+		/// <param name="containerBounds">Container bounds to layout content blocks in.</param>
+		/// <param name="contentBlocks">Content blocks to layout.</param>
+		/// <param name="blockLayout">Block layout manager that resizes the content blocks.</param>
+		/// <returns>The bounds of the content blocks within the container bounds.</returns>
+		public virtual Rectangle Layout(Rectangle containerBounds, IBlock[] contentBlocks, BlockLayoutManager blockLayout)
+		{
+			Rectangle blocksBounds=Rectangle.Empty;
+			Point position=containerBounds.Location;
+			ArrayList lines=new ArrayList();
+			lines.Add(new BlockLineInfo());
+			BlockLineInfo currentLine=lines[0] as BlockLineInfo;
+            bool switchToNewLine = false;
+            bool canStartOnNewLine = true;
+            int visibleIndex = 0;
+
+			foreach(IBlock block in contentBlocks)
+			{
+				if(!block.Visible)
+                {
+                    block.Bounds = Rectangle.Empty;
+					continue;
+                }
+
+                if (BeforeNewBlockLayout != null)
+                {
+                    LayoutManagerLayoutEventArgs e = new LayoutManagerLayoutEventArgs(block, position, visibleIndex);
+                    BeforeNewBlockLayout(this, e);
+                    position = e.CurrentPosition;
+                    if (e.CancelLayout)
+                        continue;
+                }
+                visibleIndex++;
+
+                Size availableSize = containerBounds.Size;
+                bool isBlockElement = false;
+                bool isNewLineTriggger = false;
+                bool isContainer = false;
+                if (block is IBlockExtended)
+                {
+                    IBlockExtended ex = block as IBlockExtended;
+                    isBlockElement = ex.IsBlockElement;
+                    isNewLineTriggger = ex.IsNewLineAfterElement;
+                    canStartOnNewLine = ex.CanStartNewLine;
+                    isContainer = ex.IsBlockContainer;
+                }
+                else
+                    canStartOnNewLine = true;
+
+                if (!isBlockElement && !isContainer)
+                {
+                    if (m_ContentOrientation == eContentOrientation.Horizontal)
+                        availableSize.Width = (containerBounds.Right - position.X);
+                    else
+                        availableSize.Height = (containerBounds.Bottom - position.Y);
+                }
+
+				// Resize the content block
+                blockLayout.Layout(block, availableSize);
+
+				if(m_MultiLine && currentLine.Blocks.Count > 0)
+				{
+                    if (m_ContentOrientation == eContentOrientation.Horizontal && (position.X + block.Bounds.Width > containerBounds.Right && canStartOnNewLine || isBlockElement || switchToNewLine))
+					{
+						position.X=containerBounds.X;
+						position.Y+=(currentLine.LineSize.Height+m_BlockSpacing);
+						currentLine=new BlockLineInfo();
+						currentLine.Line=lines.Count;
+						lines.Add(currentLine);
+					}
+                    else if (m_ContentOrientation == eContentOrientation.Vertical && (position.Y + block.Bounds.Height > containerBounds.Bottom && canStartOnNewLine || isBlockElement || switchToNewLine))
+					{
+						position.Y=containerBounds.Y;
+						position.X+=(currentLine.LineSize.Width+m_BlockSpacing);
+						currentLine=new BlockLineInfo();
+						currentLine.Line=lines.Count;
+						lines.Add(currentLine);
+					}
+				}
+
+				if(m_ContentOrientation==eContentOrientation.Horizontal)
+				{
+					if(block.Bounds.Height>currentLine.LineSize.Height)
+						currentLine.LineSize.Height=block.Bounds.Height;
+					currentLine.LineSize.Width=position.X+block.Bounds.Width-containerBounds.X;
+				}
+				else if(m_ContentOrientation==eContentOrientation.Vertical)
+				{
+					if(block.Bounds.Width>currentLine.LineSize.Width)
+						currentLine.LineSize.Width=block.Bounds.Width;
+					currentLine.LineSize.Height=position.Y+block.Bounds.Height-containerBounds.Y;
+				}
+
+				currentLine.Blocks.Add(block);
+                if (block.Visible) currentLine.VisibleItemsCount++;
+                Rectangle r = new Rectangle(position, block.Bounds.Size);
+                r.X += block.Margin.Left;
+                r.Y += block.Margin.Top;
+                block.Bounds = r;
+
+                if (blocksBounds.IsEmpty)
+                {
+                    r = block.Bounds; // Make sure that blocks bounds take in account any margin
+                    r.X -= block.Margin.Left;
+                    r.Y -= block.Margin.Top;
+                    r.Width += block.Margin.Horizontal;
+                    r.Height += block.Margin.Vertical;
+                    blocksBounds = r;
+                }
+                else
+                    blocksBounds = Rectangle.Union(blocksBounds, block.Bounds);
+
+                switchToNewLine = isBlockElement | isNewLineTriggger;
+
+                position=GetNextPosition(block, position);    
+			}
+
+			blocksBounds=AlignResizeBlocks(containerBounds, blocksBounds, lines);
+
+            if (m_RightToLeft)
+                blocksBounds = MirrorContent(containerBounds, blocksBounds, contentBlocks);
+
+            blocksBounds = blockLayout.FinalizeLayout(containerBounds, blocksBounds, lines);
+
+			return blocksBounds;
+		}
+
+		#endregion
+
+		#region Internals
+        private struct SizeExtended
+        {
+            public int Width;
+            public int Height;
+            public float WidthReduction;
+            public float HeightReduction;
+            public bool UseAbsoluteWidth;
+        }
+
+		private Rectangle AlignResizeBlocks(Rectangle containerBounds,Rectangle blocksBounds,ArrayList lines)
+		{
+			Rectangle newBounds=Rectangle.Empty;
+			if(containerBounds.IsEmpty || blocksBounds.IsEmpty || ((BlockLineInfo)lines[0]).Blocks.Count==0)
+				return newBounds;
+	
+			if(m_ContentAlignment==eContentAlignment.Left && m_ContentVerticalAlignment==eContentVerticalAlignment.Top && 
+                !m_FitContainer && !m_FitContainerOversize && !m_EvenHeight && m_BlockLineAlignment==eContentVerticalAlignment.Top)
+				return blocksBounds;
+
+			Point[] offset=new Point[lines.Count];
+            SizeExtended[] sizeOffset = new SizeExtended[lines.Count];
+			foreach(BlockLineInfo lineInfo in lines)
+			{
+				if(m_ContentOrientation==eContentOrientation.Horizontal)
+				{
+					if(m_FitContainer && containerBounds.Width>lineInfo.LineSize.Width ||
+						m_FitContainerOversize && lineInfo.LineSize.Width>containerBounds.Width)
+					{
+                        if (m_OversizeDistribute && containerBounds.Width < lineInfo.LineSize.Width * .75)
+                        {
+                            sizeOffset[lineInfo.Line].Width = (int)Math.Floor((float)(containerBounds.Width - lineInfo.VisibleItemsCount * m_BlockSpacing) / (float)lineInfo.VisibleItemsCount);
+                            sizeOffset[lineInfo.Line].UseAbsoluteWidth = true;
+                        }
+                        else
+                            sizeOffset[lineInfo.Line].Width = ((containerBounds.Width - lineInfo.VisibleItemsCount * m_BlockSpacing) - lineInfo.LineSize.Width) / lineInfo.VisibleItemsCount;
+                        sizeOffset[lineInfo.Line].WidthReduction = (float)(containerBounds.Width - lineInfo.VisibleItemsCount * m_BlockSpacing) / (float)lineInfo.LineSize.Width;
+						blocksBounds.Width=containerBounds.Width;
+					}
+
+                    if (m_HorizontalFitContainerHeight && containerBounds.Height > blocksBounds.Height)
+                        sizeOffset[lineInfo.Line].Height = (containerBounds.Height - lineInfo.LineSize.Height) / lines.Count;
+				}
+				else
+				{
+					if(m_FitContainer && containerBounds.Height>lineInfo.LineSize.Height ||
+						m_FitContainerOversize && lineInfo.LineSize.Height>containerBounds.Height)
+					{
+                        if (m_OversizeDistribute && containerBounds.Width < lineInfo.LineSize.Width * .75)
+                        {
+                            sizeOffset[lineInfo.Line].Height = (int)Math.Floor((float)(containerBounds.Height - lineInfo.VisibleItemsCount * m_BlockSpacing) / (float)lineInfo.VisibleItemsCount);
+                            sizeOffset[lineInfo.Line].UseAbsoluteWidth = true;
+                        }
+                        else
+                        sizeOffset[lineInfo.Line].Height = ((containerBounds.Height - lineInfo.VisibleItemsCount * m_BlockSpacing) - lineInfo.LineSize.Height) / lineInfo.VisibleItemsCount;
+                        sizeOffset[lineInfo.Line].HeightReduction = (float)(containerBounds.Height - lineInfo.VisibleItemsCount * m_BlockSpacing) / (float)lineInfo.LineSize.Height;
+						blocksBounds.Height=containerBounds.Height;
+					}
+
+                    if (m_VerticalFitContainerWidth && containerBounds.Width > blocksBounds.Width)
+                        sizeOffset[lineInfo.Line].Width = (containerBounds.Width - lineInfo.LineSize.Width) / lines.Count;
+				}
+
+
+				if(m_ContentOrientation==eContentOrientation.Horizontal && !m_FitContainer)
+				{
+					if(containerBounds.Width>blocksBounds.Width && m_FitContainerOversize || !m_FitContainerOversize)
+					{
+						switch(m_ContentAlignment)
+						{
+							case eContentAlignment.Right:
+                                if (containerBounds.Width > lineInfo.LineSize.Width)
+                                    offset[lineInfo.Line].X = containerBounds.Width - lineInfo.LineSize.Width;
+								break;
+							case eContentAlignment.Center:
+                                if (containerBounds.Width > lineInfo.LineSize.Width)
+                                    offset[lineInfo.Line].X = (containerBounds.Width - lineInfo.LineSize.Width) / 2;
+								break;
+						}
+					}
+				}
+
+				if(m_ContentOrientation==eContentOrientation.Vertical && !m_FitContainer)
+				{
+					if(containerBounds.Height>blocksBounds.Height && m_FitContainerOversize || !m_FitContainerOversize)
+					{
+						switch(m_ContentVerticalAlignment)
+						{
+							case eContentVerticalAlignment.Bottom:
+                                if (containerBounds.Height > lineInfo.LineSize.Height)
+                                    offset[lineInfo.Line].Y = containerBounds.Height - lineInfo.LineSize.Height;
+								break;
+							case eContentVerticalAlignment.Middle:
+                                if (containerBounds.Height > lineInfo.LineSize.Height)
+                                    offset[lineInfo.Line].Y = (containerBounds.Height - lineInfo.LineSize.Height) / 2;
+								break;
+						}
+					}
+				}
+			}
+
+            if (m_VerticalFitContainerWidth && containerBounds.Width > blocksBounds.Width && m_ContentOrientation==eContentOrientation.Vertical)
+                blocksBounds.Width = containerBounds.Width;
+            else if(m_HorizontalFitContainerHeight && containerBounds.Height>blocksBounds.Height && m_ContentOrientation==eContentOrientation.Horizontal)
+                blocksBounds.Height = containerBounds.Height;
+
+			if(m_ContentOrientation==eContentOrientation.Horizontal)
+			{
+				foreach(BlockLineInfo lineInfo in lines)
+				{
+					foreach(IBlock block in lineInfo.Blocks)
+					{
+						if(!block.Visible)
+							continue;
+						Rectangle r=block.Bounds;
+						if(m_EvenHeight && lineInfo.LineSize.Height>0)
+							r.Height=lineInfo.LineSize.Height;
+						r.Offset(offset[lineInfo.Line]);
+						
+						if(m_ContentVerticalAlignment==eContentVerticalAlignment.Middle)
+						{
+							// Takes care of offset rounding error when both content is vertically centered and blocks in line are centered
+							if (m_BlockLineAlignment == eContentVerticalAlignment.Middle)
+								r.Offset(0,((containerBounds.Height-blocksBounds.Height)+(lineInfo.LineSize.Height-r.Height))/2);
+							else
+								r.Offset(0,(containerBounds.Height-blocksBounds.Height)/2);
+
+							// Line alignment of the block
+							if (m_BlockLineAlignment == eContentVerticalAlignment.Bottom)
+								r.Offset(0, lineInfo.LineSize.Height - r.Height);
+						}
+						else if(m_ContentVerticalAlignment==eContentVerticalAlignment.Bottom)
+							r.Offset(0,containerBounds.Height-blocksBounds.Height);
+						
+						// To avoid rounding offset errors when dividing this is split see upper part
+						if(m_ContentVerticalAlignment!=eContentVerticalAlignment.Middle)
+						{
+							// Line alignment of the block
+							if (m_BlockLineAlignment == eContentVerticalAlignment.Middle)
+								r.Offset(0, (lineInfo.LineSize.Height - r.Height) / 2);
+							else if (m_BlockLineAlignment == eContentVerticalAlignment.Bottom)
+								r.Offset(0, lineInfo.LineSize.Height - r.Height);
+						}
+
+						if(sizeOffset[lineInfo.Line].Width!=0)
+						{
+                            if (m_OversizeDistribute)
+                            {
+                                int nw = sizeOffset[lineInfo.Line].UseAbsoluteWidth ? sizeOffset[lineInfo.Line].Width : (int)Math.Floor(r.Width * sizeOffset[lineInfo.Line].WidthReduction);
+                                offset[lineInfo.Line].X += nw - r.Width;
+                                r.Width = nw;
+                            }
+                            else
+                            {
+                                r.Width += sizeOffset[lineInfo.Line].Width;
+                                offset[lineInfo.Line].X += sizeOffset[lineInfo.Line].Width;
+                            }
+						}
+						r.Height+=sizeOffset[lineInfo.Line].Height;
+						block.Bounds=r;
+						if(newBounds.IsEmpty)
+							newBounds=block.Bounds;
+						else
+							newBounds=Rectangle.Union(newBounds,block.Bounds);
+					}
+					// Adjust for left-over size adjustment for odd difference between container width and the total block width
+                    if (!m_OversizeDistribute && sizeOffset[lineInfo.Line].Width != 0 && containerBounds.Width - (lineInfo.LineSize.Width + sizeOffset[lineInfo.Line].Width * lineInfo.Blocks.Count) != 0)
+					{
+						Rectangle r=((IBlock)lineInfo.Blocks[lineInfo.Blocks.Count-1]).Bounds;
+						r.Width+=containerBounds.Width-(lineInfo.LineSize.Width+sizeOffset[lineInfo.Line].Width*lineInfo.Blocks.Count);
+						((IBlock)lineInfo.Blocks[lineInfo.Blocks.Count-1]).Bounds=r;
+					}
+				}
+			}
+			else
+			{
+				foreach(BlockLineInfo lineInfo in lines)
+				{
+					foreach(IBlock block in lineInfo.Blocks)
+					{
+						if(!block.Visible)
+							continue;
+						Rectangle r=block.Bounds;
+						if(m_EvenHeight && lineInfo.LineSize.Width>0)
+							r.Width=lineInfo.LineSize.Width - block.Margin.Horizontal;
+						r.Offset(offset[lineInfo.Line]);
+						if(m_ContentAlignment==eContentAlignment.Center)
+							r.Offset(((containerBounds.Width-blocksBounds.Width)+(lineInfo.LineSize.Width-r.Width))/2,0); //r.Offset((containerBounds.Width-blocksBounds.Width)/2+(lineInfo.LineSize.Width-r.Width)/2,0);
+						else if(m_ContentAlignment==eContentAlignment.Right)
+							r.Offset((containerBounds.Width-blocksBounds.Width)+lineInfo.LineSize.Width-r.Width,0);
+						r.Width+=sizeOffset[lineInfo.Line].Width;
+						if(sizeOffset[lineInfo.Line].Height!=0)
+						{
+                            if (m_OversizeDistribute)
+                            {
+                                int nw = sizeOffset[lineInfo.Line].UseAbsoluteWidth ? sizeOffset[lineInfo.Line].Height : (int)Math.Floor(r.Height * sizeOffset[lineInfo.Line].HeightReduction);
+                                offset[lineInfo.Line].Y += nw - r.Height;
+                                r.Height = nw;
+                            }
+                            else
+                            {
+                                r.Height += sizeOffset[lineInfo.Line].Height;
+                                offset[lineInfo.Line].Y += sizeOffset[lineInfo.Line].Height;
+                            }
+						}
+						block.Bounds=r;
+                        if (newBounds.IsEmpty)
+                        {
+                            r.Y -= block.Margin.Top; // Account for any margin set on first element
+                            r.X -= block.Margin.Left;
+                            r.Width += block.Margin.Horizontal;
+                            r.Height += block.Margin.Vertical;
+                            newBounds = r;
+                        }
+                        else
+                            newBounds = Rectangle.Union(newBounds, block.Bounds);
+					}
+                    if (!m_OversizeDistribute && sizeOffset[lineInfo.Line].Height != 0 && containerBounds.Height - (lineInfo.LineSize.Height + sizeOffset[lineInfo.Line].Height * lineInfo.Blocks.Count) != 0)
+					{
+						Rectangle r=((IBlock)lineInfo.Blocks[lineInfo.Blocks.Count-1]).Bounds;
+						r.Height+=containerBounds.Height-(lineInfo.LineSize.Height+sizeOffset[lineInfo.Line].Height*lineInfo.Blocks.Count);
+						((IBlock)lineInfo.Blocks[lineInfo.Blocks.Count-1]).Bounds=r;
+					}
+				}
+			}
+			return newBounds;
+		}
+
+		private Point GetNextPosition(IBlock block, Point position)
+		{
+            if (NextPosition != null)
+            {
+                LayoutManagerPositionEventArgs e = new LayoutManagerPositionEventArgs();
+                e.Block = block;
+                e.CurrentPosition = position;
+                NextPosition(this, e);
+                if (e.Cancel)
+                    return e.NextPosition;
+            }
+
+            if (m_ContentOrientation == eContentOrientation.Horizontal)
+                position.X += block.Bounds.Width + m_BlockSpacing + block.Margin.Horizontal;
+            else
+                position.Y += block.Bounds.Height + m_BlockSpacing + block.Margin.Vertical;
+			return position;
+		}
+
+		internal class BlockLineInfo
+		{
+			public BlockLineInfo() {}
+			public ArrayList Blocks=new ArrayList();
+			public Size LineSize=Size.Empty;
+			public int Line=0;
+            public int VisibleItemsCount = 0;
+		}
+
+        private Rectangle MirrorContent(Rectangle containerBounds, Rectangle blockBounds, IBlock[] contentBlocks)
+        {
+            int xOffset = (blockBounds.X - containerBounds.X);
+
+            if (blockBounds.Width < containerBounds.Width)
+                blockBounds.X = containerBounds.Right - ((blockBounds.X - containerBounds.X) + blockBounds.Width);
+            else if (blockBounds.Width > containerBounds.Width)
+                containerBounds.Width = blockBounds.Width;
+            foreach (IBlock block in contentBlocks)
+            {
+                if (!block.Visible)
+                    continue;
+                Rectangle r = block.Bounds;
+                block.Bounds = new Rectangle(containerBounds.Right - ((r.X - containerBounds.X) + r.Width), r.Y, r.Width, r.Height);
+            }
+
+            return blockBounds;
+        }
+		#endregion
+
+		#region Properties
+		/// <summary>
+		/// Gets or sets the spacing in pixels between content blocks. Default value is 0.
+		/// </summary>
+		public virtual int BlockSpacing
+		{
+			get {return m_BlockSpacing;}
+			set {m_BlockSpacing=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets whether content blocks are forced to fit the container bounds if they 
+		/// occupy more space than it is available by container. Default value is false.
+		/// </summary>
+		public virtual bool FitContainerOversize
+		{
+			get {return m_FitContainerOversize;}
+			set {m_FitContainerOversize=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets whether content blocks are resized to fit the container bound if they
+		/// occupy less space than it is available by container. Default value is false.
+		/// </summary>
+		public virtual bool FitContainer
+		{
+			get {return m_FitContainer;}
+			set {m_FitContainer=value;}
+		}
+
+        /// <summary>
+        /// Gets or sets whether content blocks are resized (Width) to fit container bounds if they
+        /// occupy less space than the actual container width. Applies to the Vertical orientation only. Default value is false.
+        /// </summary>
+        public virtual bool VerticalFitContainerWidth
+        {
+            get { return m_VerticalFitContainerWidth; }
+            set { m_VerticalFitContainerWidth = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether content blocks are resized (Height) to fit container bounds if they
+        /// occupy less space than the actual container height. Applies to the Horizontal orientation only. Default value is false.
+        /// </summary>
+        public virtual bool HorizontalFitContainerHeight
+        {
+            get { return m_HorizontalFitContainerHeight; }
+            set { m_HorizontalFitContainerHeight = value; }
+        }
+
+		/// <summary>
+		/// Gets or sets the content orientation. Default value is Horizontal.
+		/// </summary>
+		public virtual eContentOrientation ContentOrientation
+		{
+			get {return m_ContentOrientation;}
+			set {m_ContentOrientation=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets the content vertical alignment. Default value is Middle.
+		/// </summary>
+		public virtual eContentVerticalAlignment ContentVerticalAlignment
+		{
+			get {return m_ContentVerticalAlignment;}
+			set {m_ContentVerticalAlignment=value;}
+		}
+
+        /// <summary>
+        /// Gets or sets the block line vertical alignment. Default value is Middle.
+        /// </summary>
+        public virtual eContentVerticalAlignment BlockLineAlignment
+        {
+            get { return m_BlockLineAlignment; }
+            set { m_BlockLineAlignment = value; }
+        }
+
+		/// <summary>
+		/// Gets or sets the content horizontal alignment. Default value is Left.
+		/// </summary>
+		public virtual eContentAlignment ContentAlignment
+		{
+			get {return m_ContentAlignment;}
+			set {m_ContentAlignment=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets whether all content blocks are resized so they have same height which is height of the tallest content block. Default value is false.
+		/// </summary>
+		public virtual bool EvenHeight
+		{
+			get {return m_EvenHeight;}
+			set {m_EvenHeight=value;}
+		}
+
+        /// <summary>
+        /// Gets or sets whether oversized blocks are resized based on the percentage reduction instead of based on equal pixel distribution. Default value is false.
+        /// </summary>
+        public virtual bool OversizeDistribute
+        {
+            get { return m_OversizeDistribute; }
+            set { m_OversizeDistribute = value; }
+        }
+
+		/// <summary>
+		/// Gets or sets whether content is wrapped into new line if it exceeds the width of the container.
+		/// </summary>
+		public bool MultiLine
+		{
+			get {return m_MultiLine;}
+			set {m_MultiLine=value;}
+		}
+
+        /// <summary>
+        /// Gets or sets whether layout is right-to-left.
+        /// </summary>
+        public bool RightToLeft
+        {
+            get { return m_RightToLeft; }
+            set { m_RightToLeft = value; }
+        }
+
+		#endregion
+	}
+
+    /// <summary>
+    /// Represents event arguments for SerialContentLayoutManager.NextPosition event.
+    /// </summary>
+    public class LayoutManagerPositionEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets or sets the block that is layed out.
+        /// </summary>
+        public IBlock Block = null;
+        /// <summary>
+        /// Gets or sets the current block position.
+        /// </summary>
+        public Point CurrentPosition = Point.Empty;
+        /// <summary>
+        /// Gets or sets the calculated next block position.
+        /// </summary>
+        public Point NextPosition = Point.Empty;
+        /// <summary>
+        /// Cancels default position calculation.
+        /// </summary>
+        public bool Cancel = false;
+    }
+
+    /// <summary>
+    /// Represents event arguments for the SerialContentLayoutManager layout events.
+    /// </summary>
+    public class LayoutManagerLayoutEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets or sets the reference block object.
+        /// </summary>
+        public IBlock Block = null;
+
+        /// <summary>
+        /// Gets or sets the position block will assume.
+        /// </summary>
+        public Point CurrentPosition = Point.Empty;
+
+        /// <summary>
+        /// Cancel the layout of the block, applies only to BeforeXXX layout event.
+        /// </summary>
+        public bool CancelLayout = false;
+
+        /// <summary>
+        /// Gets or sets the visibility index of the block.
+        /// </summary>
+        public int BlockVisibleIndex = 0;
+
+        /// <summary>
+        /// Creates new instance of the class and initializes it with default values.
+        /// </summary>
+        public LayoutManagerLayoutEventArgs(IBlock block, Point currentPosition, int visibleIndex)
+        {
+            this.Block = block;
+            this.CurrentPosition = currentPosition;
+            this.BlockVisibleIndex = visibleIndex;
+        }
+    }
+
+    /// <summary>
+    /// Delegate for SerialContentLayoutManager.NextPosition event.
+    /// </summary>
+    public delegate void LayoutManagerPositionEventHandler(object sender, LayoutManagerPositionEventArgs e);
+
+    /// <summary>
+    /// Delegate for the SerialContentLayoutManager layout events.
+    /// </summary>
+    public delegate void LayoutManagerLayoutEventHandler(object sender, LayoutManagerLayoutEventArgs e);
+    
+
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/DevComponents.DotNetBar.Layout.csproj b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/DevComponents.DotNetBar.Layout.csproj
new file mode 100644
index 00000000..7a80b6cb
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/DevComponents.DotNetBar.Layout.csproj	
@@ -0,0 +1,207 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{1641B2CE-259C-4A52-A460-48C936B13951}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>DevComponents.DotNetBar.Layout</RootNamespace>
+    <AssemblyName>DevComponents.DotNetBar.Layout</AssemblyName>
+    <StartupObject>
+    </StartupObject>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>dotnetbar.snk</AssemblyOriginatorKeyFile>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>2.0</OldToolsVersion>
+    <UpgradeBackupLocation />
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;LAYOUT</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE;LAYOUT</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <DocumentationFile>bin\Release\DevComponents.DotNetBar.Layout.XML</DocumentationFile>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseLayout|AnyCPU' ">
+    <OutputPath>bin\ReleaseLayout\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseTrialLayout|AnyCPU' ">
+    <OutputPath>bin\ReleaseTrialLayout\</OutputPath>
+    <DefineConstants>TRACE;LAYOUT;TRIAL</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Deployment" />
+    <Reference Include="System.Design" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Drawing.Design" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Background.cs" />
+    <Compile Include="BorderColors.cs" />
+    <Compile Include="BorderPattern.cs" />
+    <Compile Include="ColorHelpers.cs" />
+    <Compile Include="ContentManager\BlockLayoutManager.cs" />
+    <Compile Include="ContentManager\Enums.cs" />
+    <Compile Include="ContentManager\IBlock.cs" />
+    <Compile Include="ContentManager\IBlockExtended.cs" />
+    <Compile Include="ContentManager\IContentLayoutManager.cs" />
+    <Compile Include="ContentManager\SerialContentLayoutManager.cs" />
+    <Compile Include="DotNetBarResourcesAttribute.cs" />
+    <Compile Include="LayoutLabelItem.cs" />
+    <Compile Include="Symbols.cs" />
+    <Compile Include="TextDrawing.cs" />
+    <Compile Include="TextMarkup\BarUtilities.cs" />
+    <Compile Include="TextMarkup\DisplayHelp.cs" />
+    <Compile Include="DoubleHelpers.cs" />
+    <Compile Include="DrawingHelpers.cs" />
+    <Compile Include="Helpers.cs" />
+    <Compile Include="InsertMarker.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="ItemLayout.cs" />
+    <Compile Include="LayoutContext.cs" />
+    <Compile Include="LayoutControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="LayoutControlItem.cs" />
+    <Compile Include="LayoutGroup.cs" />
+    <Compile Include="LayoutItemBase.cs">
+    </Compile>
+    <Compile Include="LayoutItemCollection.cs" />
+    <Compile Include="LayoutSpacerItem.cs" />
+    <Compile Include="PaintContext.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+      <DesignTime>True</DesignTime>
+    </Compile>
+    <None Include="dotnetbar.snk" />
+    <None Include="Properties\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
+    <EmbeddedResource Include="SystemImages\FontAwesome.ttf" />
+    <Compile Include="Properties\Settings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
+    <Compile Include="SimpleStyle.cs" />
+    <Compile Include="TextMarkup\BodyElement.cs" />
+    <Compile Include="TextMarkup\ContainerElement.cs" />
+    <Compile Include="TextMarkup\Div.cs" />
+    <Compile Include="TextMarkup\EndMarkupElement.cs" />
+    <Compile Include="TextMarkup\ExpandElement.cs" />
+    <Compile Include="TextMarkup\FontChangeElement.cs" />
+    <Compile Include="TextMarkup\FontElement.cs" />
+    <Compile Include="TextMarkup\Heading.cs" />
+    <Compile Include="TextMarkup\HyperLink.cs" />
+    <Compile Include="TextMarkup\IActiveMarkupElement.cs" />
+    <Compile Include="TextMarkup\ImageElement.cs" />
+    <Compile Include="TextMarkup\Italic.cs" />
+    <Compile Include="TextMarkup\MarkupDrawContext.cs" />
+    <Compile Include="TextMarkup\MarkupElement.cs" />
+    <Compile Include="TextMarkup\MarkupElementCollection.cs" />
+    <Compile Include="TextMarkup\MarkupLayoutManager.cs" />
+    <Compile Include="TextMarkup\MarkupParser.cs" />
+    <Compile Include="TextMarkup\MarkupSettings.cs" />
+    <Compile Include="TextMarkup\NewLine.cs" />
+    <Compile Include="TextMarkup\Paragraph.cs" />
+    <Compile Include="TextMarkup\Span.cs" />
+    <Compile Include="TextMarkup\Strike.cs" />
+    <Compile Include="TextMarkup\Strong.cs" />
+    <Compile Include="TextMarkup\SymbolElement.cs" />
+    <Compile Include="TextMarkup\TextElement.cs" />
+    <Compile Include="TextMarkup\Underline.cs" />
+    <Compile Include="Thickness.cs" />
+    <Compile Include="WinApi.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\DotNetBar.csproj">
+      <Project>{36546CE3-335C-4AB6-A2F3-40F8C818BC66}</Project>
+      <Name>DotNetBar</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="LayoutControl.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+      <Visible>False</Visible>
+      <ProductName>Windows Installer 3.1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/DotNetBarResourcesAttribute.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/DotNetBarResourcesAttribute.cs
new file mode 100644
index 00000000..64cba962
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/DotNetBarResourcesAttribute.cs	
@@ -0,0 +1,22 @@
+using System;
+
+namespace DevComponents.DotNetBar.Layout
+{
+	/// <summary>
+	/// Summary description for DotNetBarResourcesAttribute.
+	/// </summary>
+	[AttributeUsage(AttributeTargets.Assembly)]
+	public class DotNetBarLayoutResourcesAttribute:System.Attribute
+	{
+		private string m_NamespacePrefix="";
+        public DotNetBarLayoutResourcesAttribute(string namespacePrefix)
+		{
+			m_NamespacePrefix=namespacePrefix;
+		}
+
+		public virtual string NamespacePrefix
+		{
+			get {return m_NamespacePrefix;}
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/DoubleHelpers.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/DoubleHelpers.cs
new file mode 100644
index 00000000..840e73f5
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/DoubleHelpers.cs	
@@ -0,0 +1,64 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Runtime.InteropServices;
+
+namespace DevComponents.DotNetBar.Layout
+{
+    internal static class DoubleHelpers
+    {
+        /// <summary>
+        /// Gets whether values are close.
+        /// </summary>
+        /// <param name="value1">First value.</param>
+        /// <param name="value2">Second value</param>
+        /// <returns>true if values are close enough</returns>
+        public static bool AreClose(double value1, double value2)
+        {
+            if (value1 == value2)
+            {
+                return true;
+            }
+            double num2 = ((Math.Abs(value1) + Math.Abs(value2)) + 10.0) * 2.2204460492503131E-16;
+            double num = value1 - value2;
+            return ((-num2 < num) && (num2 > num));
+        }
+        /// <summary>
+        /// Gets whether value is zero
+        /// </summary>
+        /// <param name="value">value to check</param>
+        /// <returns>true if value is considered zero</returns>
+        public static bool IsZero(double value)
+        {
+            return (Math.Abs(value) < 2.2204460492503131E-15);
+        }
+
+        /// <summary>
+        /// Gets whether value is not an number.
+        /// </summary>
+        /// <param name="value">value to test</param>
+        /// <returns>true if value is not an number</returns>
+        public static bool IsNaN(double value)
+        {
+            NanUnion union = new NanUnion();
+            union.DoubleValue = value;
+            ulong num = union.UintValue & 18442240474082181120L;
+            ulong num2 = union.UintValue & ((ulong)0xfffffffffffffL);
+            if ((num != 0x7ff0000000000000L) && (num != 18442240474082181120L))
+            {
+                return false;
+            }
+            return (num2 != 0L);
+        }
+
+        [StructLayout(LayoutKind.Explicit)]
+        private struct NanUnion
+        {
+            // Fields
+            [FieldOffset(0)]
+            internal double DoubleValue;
+            [FieldOffset(0)]
+            internal ulong UintValue;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/DrawingHelpers.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/DrawingHelpers.cs
new file mode 100644
index 00000000..98fd19f3
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/DrawingHelpers.cs	
@@ -0,0 +1,95 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Layout
+{
+    internal static class DrawingHelpers
+    {
+        /// <summary>
+        /// Draws the border.
+        /// </summary>
+        /// <param name="g">Graphics canvas.</param>
+        /// <param name="bounds">Bounds for border.</param>
+        /// <param name="borderThickness">Border thickness.</param>
+        /// <param name="borderPattern">Border pattern.</param>
+        /// <param name="borderColor">Border color.</param>
+        public static void DrawBorder(Graphics g, RectangleF bounds, Thickness borderThickness, BorderPattern borderPattern, BorderColors borderColor)
+        {
+            if (borderColor.IsEmpty || borderThickness.IsZero || borderPattern.IsEmpty) return;
+
+            Region oldClip = g.Clip;
+            g.SetClip(bounds, System.Drawing.Drawing2D.CombineMode.Intersect);
+
+            bounds.Width -= Math.Max(1, (float)borderThickness.Horizontal / 2);
+            bounds.Height -= Math.Max(1, (float)borderThickness.Vertical / 2);
+
+            if (borderThickness.Left > 1)
+                bounds.X += (float)borderThickness.Left / 2;
+            if (borderThickness.Top > 1)
+                bounds.Y += (float)borderThickness.Top / 2;
+
+            if (borderThickness.Left > 0d && !borderColor.Left.IsEmpty && borderPattern.IsLeftVisible)
+            {
+                using (Pen pen = new Pen(borderColor.Left, (float)borderThickness.Left))
+                {
+                    pen.DashStyle = (System.Drawing.Drawing2D.DashStyle)borderPattern.Left;
+                    pen.Alignment = System.Drawing.Drawing2D.PenAlignment.Inset;
+                    g.DrawLine(pen, bounds.X, bounds.Y - (float)(borderThickness.Top / 2), bounds.X, bounds.Bottom + (float)(borderThickness.Bottom / 2));
+                }
+            }
+
+            if (borderThickness.Right > 0d && !borderColor.Right.IsEmpty && borderPattern.IsRightVisible)
+            {
+                using (Pen pen = new Pen(borderColor.Right, (float)borderThickness.Right))
+                {
+                    pen.DashStyle = (System.Drawing.Drawing2D.DashStyle)borderPattern.Right;
+                    pen.Alignment = System.Drawing.Drawing2D.PenAlignment.Inset;
+                    g.DrawLine(pen, bounds.Right, bounds.Y - (float)(borderThickness.Top / 2), bounds.Right, bounds.Bottom + (float)(borderThickness.Bottom / 2));
+                }
+            }
+            
+            if (borderThickness.Top > 0d && !borderColor.Top.IsEmpty && borderPattern.IsTopVisible)
+            {
+                using (Pen pen = new Pen(borderColor.Top, (float)borderThickness.Top))
+                {
+                    pen.DashStyle = (System.Drawing.Drawing2D.DashStyle)borderPattern.Top;
+                    pen.Alignment = System.Drawing.Drawing2D.PenAlignment.Inset;
+                    g.DrawLine(pen, bounds.X, bounds.Y, bounds.Right, bounds.Y);
+                }
+            }
+
+            
+
+            if (borderThickness.Bottom > 0d && !borderColor.Bottom.IsEmpty && borderPattern.IsBottomVisible)
+            {
+                using (Pen pen = new Pen(borderColor.Bottom, (float)borderThickness.Bottom))
+                {
+                    pen.DashStyle = (System.Drawing.Drawing2D.DashStyle)borderPattern.Bottom;
+                    pen.Alignment = System.Drawing.Drawing2D.PenAlignment.Inset;
+                    g.DrawLine(pen, bounds.X, bounds.Bottom, bounds.Right, bounds.Bottom);
+                }
+            }
+
+            g.Clip = oldClip;
+            if (oldClip != null) oldClip.Dispose();
+        }
+
+        public static void PaintStyle(Graphics g, SimpleStyle style, Rectangle bounds)
+        {
+            if (style.IsPainted && !bounds.IsEmpty)
+            {
+                if (style.Background.IsBackgroundSet)
+                {
+                    using (Brush brush = style.Background.CreateBrush(bounds))
+                        g.FillRectangle(brush, bounds);
+                }
+                if (!style.BorderColors.IsEmpty && !style.BorderThickness.IsZero)
+                {
+                    DrawingHelpers.DrawBorder(g, bounds, style.BorderThickness, style.BorderPattern, style.BorderColors);
+                }
+            }
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/Helpers.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/Helpers.cs
new file mode 100644
index 00000000..7ebfc735
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/Helpers.cs	
@@ -0,0 +1,79 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+using System.Windows.Forms;
+using System.Runtime.InteropServices;
+
+namespace DevComponents.DotNetBar.Layout
+{
+    internal static class Helpers
+    {
+        public static Size Max(Size s1, Size s2)
+        {
+            return new Size(Math.Max(s1.Width, s2.Width), Math.Max(s1.Height, s2.Height));
+        }
+        public static Rectangle Deflate(Rectangle r, System.Windows.Forms.Padding padding)
+        {
+            r.X += padding.Left;
+            r.Width -= padding.Horizontal;
+            r.Y += padding.Top;
+            r.Height -= padding.Vertical;
+
+            return r;
+        }
+        public static Rectangle Deflate(Rectangle r, DevComponents.DotNetBar.Padding padding)
+        {
+            r.X += padding.Left;
+            r.Width -= padding.Horizontal;
+            r.Y += padding.Top;
+            r.Height -= padding.Vertical;
+
+            return r;
+        }
+
+        public static int GetTextBaseline(Control ctrl, ContentAlignment alignment)
+        {
+            return GetTextBaseline(ctrl, ctrl.Font, alignment);
+        }
+
+        public static int GetTextBaseline(Control ctrl, Font font, ContentAlignment alignment)
+        {
+            Rectangle clientRect = ctrl.ClientRectangle;
+            int ascent = 0;
+            int height = 0;
+            using (Graphics g = ctrl.CreateGraphics())
+            {
+                IntPtr hdc = g.GetHdc();
+                IntPtr hFont = font.ToHfont();
+                try
+                {
+                    IntPtr oldObject = WinApi.SelectObject(hdc, hFont);
+                    WinApi.TEXTMETRIC tm = new WinApi.TEXTMETRIC();
+                    WinApi.GetTextMetrics(new HandleRef(ctrl, hdc), tm);
+                    ascent = tm.tmAscent + 1;
+                    height = tm.tmHeight;
+                    WinApi.SelectObject(hdc, oldObject);
+                }
+                finally
+                {
+                    WinApi.DeleteObject(hFont);
+                    g.ReleaseHdc(hdc);
+                }
+            }
+            if ((alignment & (ContentAlignment.TopRight | ContentAlignment.TopCenter | ContentAlignment.TopLeft)) != (ContentAlignment)0)
+            {
+                return (clientRect.Top + ascent);
+            }
+            if ((alignment & (ContentAlignment.MiddleRight | ContentAlignment.MiddleCenter | ContentAlignment.MiddleLeft)) != (ContentAlignment)0)
+            {
+                return (((clientRect.Top + (clientRect.Height / 2)) - (height / 2)) + ascent);
+            }
+            return ((clientRect.Bottom - height) + ascent);
+        }
+        public static bool IsEmpty(System.Windows.Forms.Padding p)
+        {
+            return p.Left == 0 && p.Right == 0 && p.Top == 0 && p.Bottom == 0;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/InsertMarker.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/InsertMarker.cs
new file mode 100644
index 00000000..2ca8c820
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/InsertMarker.cs	
@@ -0,0 +1,72 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows.Forms;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+
+namespace DevComponents.DotNetBar.Layout
+{
+    internal class InsertMarker : Control
+    {
+        #region Constructor
+        /// <summary>
+        /// Initializes a new instance of the InsertMarker class.
+        /// </summary>
+        public InsertMarker()
+        {
+            this.SetStyle(ControlStyles.UserPaint | ControlStyles.ResizeRedraw | ControlStyles.OptimizedDoubleBuffer, true);
+        }
+        #endregion
+
+        #region Implementation
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            Graphics g = e.Graphics;
+            using (SolidBrush brush = new SolidBrush(this.ForeColor))
+            {
+                g.FillRectangle(brush, new Rectangle(0, 0, this.Width, 2));
+                g.FillRectangle(brush, new Rectangle(0, this.Height - 2, this.Width, 2));
+                g.FillRectangle(brush, this.Width / 2 - 1, 0, 2, this.Height);
+            }
+            base.OnPaint(e);
+        }
+        protected override void OnHandleCreated(EventArgs e)
+        {
+            UpdateRegion();
+            base.OnHandleCreated(e);
+        }
+        protected override void OnResize(EventArgs e)
+        {
+            UpdateRegion();
+            base.OnResize(e);
+        }
+        private void UpdateRegion()
+        {
+            GraphicsPath path = new GraphicsPath();
+            path.AddLine(0, 0, this.Width, 0);
+            path.AddLine(this.Width, 0, this.Width, 2);
+            path.AddLine(this.Width, 2, this.Width / 2 - 1, 2);
+            path.AddLine(this.Width / 2 + 1, 2, this.Width / 2 + 1, this.Height-2);
+            path.AddLine(this.Width / 2 + 1, this.Height - 2, this.Width, this.Height-2);
+            path.AddLine(this.Width, this.Height - 2, this.Width, this.Height);
+            path.AddLine(this.Width, this.Height, 0, this.Height);
+            path.AddLine(0, this.Height, 0, this.Height-2);
+            path.AddLine(0, this.Height - 2, this.Width/2-1, this.Height-2);
+            path.AddLine(this.Width / 2 - 1, this.Height - 2, this.Width/2-1, 2);
+            path.AddLine(this.Width / 2 - 1, 2, 0, 2);
+            path.CloseAllFigures();
+
+            Region reg = new Region();
+            reg.MakeEmpty();
+            reg.Union(path);
+
+            path.Widen(SystemPens.Control);
+            //Region r2 = new Region(path);
+            reg.Union(path);
+
+            this.Region = reg;
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/ItemLayout.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/ItemLayout.cs
new file mode 100644
index 00000000..e1e067bd
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/ItemLayout.cs	
@@ -0,0 +1,371 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Layout
+{
+    internal class ItemLayout
+    {
+        public void Layout(LayoutGroup group, Rectangle clientBounds, LayoutContext context)
+        {
+            if (clientBounds.IsEmpty) return;
+            List<LayoutItemStrip> strips = SliceItemsInStrips(group, clientBounds, context);
+            ResizeStrips(strips, clientBounds);
+            Rectangle totalBounds = FinalizeItemSize(strips, clientBounds, context);
+            group.ActualBounds = totalBounds;
+            //Console.WriteLine("{0} -> {1}", clientBounds, totalBounds);
+        }
+
+        private LayoutContext CreateLayoutContext(LayoutContext context, int startAbsoluteIndex)
+        {
+            LayoutContext newContext = new LayoutContext(context.LayoutControl, context.Graphics, context.Font);
+            newContext.RightToLeft = context.RightToLeft;
+            newContext.AbsoluteIndex = startAbsoluteIndex;
+            return newContext;
+        }
+        private Rectangle FinalizeItemSize(List<LayoutItemStrip> strips, Rectangle clientBounds, LayoutContext context)
+        {
+            int sizeLimit = GetSizeLimit(clientBounds);
+            int stripSizeLimit = GetStripsSizeLimit(clientBounds);
+            Rectangle totalBounds = new Rectangle(clientBounds.Location, Size.Empty);
+            Point loc = clientBounds.Location;
+            Rectangle fullClientBounds = clientBounds;
+
+            int absIndex = context.AbsoluteIndex;
+
+            foreach (LayoutItemStrip strip in strips)
+            {
+                LayoutItemBase layoutItem = strip.Items[0];
+                int clientBoundsWidth = clientBounds.Width;
+                if (strip.IsLeftSpanStrip)
+                {
+                    Size size = new Size(Math.Max(MinItemSize(layoutItem), ActualItemSize(layoutItem, fullClientBounds.Width)),
+                        Math.Max(strip.MinStripHeightAbsolute, clientBounds.Height));
+                    Rectangle r = new Rectangle(loc, size);
+                    clientBounds.X += size.Width;
+                    clientBounds.Width -= size.Width;
+                    loc = clientBounds.Location;
+                    layoutItem.SetBounds(r, (layoutItem.SharedTextSizeEnabled ? context.LargestTextSize : layoutItem.RealTextSize));
+                    if (layoutItem is LayoutGroup)
+                    {
+                        LayoutContext groupContext = CreateLayoutContext(context, absIndex++);
+                        ((LayoutGroup)layoutItem).Layout(groupContext);
+                        absIndex = groupContext.AbsoluteIndex;
+                    }
+                    totalBounds = Rectangle.Union(r, totalBounds);
+                    layoutItem.AbsoluteIndex = absIndex++;
+                    continue;
+                }
+                else if (strip.IsRightSpanStrip)
+                {
+                    Size size = new Size(Math.Max(MinItemSize(layoutItem), ActualItemSize(layoutItem, fullClientBounds.Width)),
+                        Math.Max(strip.MinStripHeightAbsolute, clientBounds.Height));
+                    Rectangle r = new Rectangle(clientBounds.Right - size.Width, clientBounds.Y, size.Width, size.Height);
+                    clientBounds.Width -= size.Width;
+                    layoutItem.SetBounds(r, layoutItem.SharedTextSizeEnabled ? context.LargestTextSize : layoutItem.RealTextSize);
+                    if (layoutItem is LayoutGroup)
+                    {
+                        LayoutContext groupContext = CreateLayoutContext(context, 10000/*absIndex++*/); // Pushing the tab index for right span strip to the right most
+                        ((LayoutGroup)layoutItem).Layout(groupContext);
+                        //absIndex = groupContext.AbsoluteIndex;
+                    }
+                    totalBounds = Rectangle.Union(r, totalBounds);
+                    layoutItem.AbsoluteIndex = absIndex++;
+                    //layoutItem.ActualTextSize = layoutItem.SharedTextSizeEnabled ? context.LargestTextSize : layoutItem.RealTextSize;
+                    continue;
+                }
+
+                bool repeat = false;
+                int repeatCount = 0;
+                int startAbsIndex = absIndex;
+                do
+                {
+                    loc.X = clientBounds.X;
+                    repeatCount++;
+                    absIndex = startAbsIndex;
+                    int totalPercentWidth = 0;
+                    foreach (LayoutItemBase item in strip.Items)
+                    {
+                        Size size = new Size(Math.Max(MinItemSize(item), ActualItemSize(item, clientBoundsWidth - strip.TotalFixedWidth)),
+                            strip.StripHeightAbsolute);
+                        if (item.WidthType == eLayoutSizeType.Percent)
+                            totalPercentWidth += item.Width;
+                        if (strip.Items.Count == 1 && size.Width < clientBoundsWidth && clientBoundsWidth >= MinItemSize(item) && item.WidthType == eLayoutSizeType.Percent)
+                            size.Width = clientBoundsWidth;
+                        else if (loc.X + size.Width > clientBounds.X + clientBoundsWidth && strip.Items.Count > 1)
+                        {
+                            if (strip.Items[strip.Items.Count - 1] == item && MinItemSize(item) <= clientBoundsWidth - (loc.X - clientBounds.X))
+                                size.Width = clientBoundsWidth - (loc.X - clientBounds.X);
+                            else
+                            {
+                                clientBoundsWidth -= (loc.X + size.Width) - (clientBounds.X + clientBoundsWidth);
+                                repeat = true;
+                                break;
+                            }
+                        }
+                        else if(strip.TotalFixedWidth == 0 && totalPercentWidth == 100 && strip.Items[strip.Items.Count - 1] == item && size.Width<clientBoundsWidth - (loc.X - clientBounds.X))
+                            size.Width = clientBoundsWidth - (loc.X - clientBounds.X);
+                        Rectangle r = new Rectangle(loc, size);
+                        item.StripTextBaseline = strip.LargestTextBaseline;
+                        item.SetBounds(r, item.SharedTextSizeEnabled ? context.LargestTextSize : item.RealTextSize);
+                        if (item is LayoutGroup)
+                        {
+                            LayoutContext groupContext = CreateLayoutContext(context, absIndex++);
+                            ((LayoutGroup)item).Layout(groupContext);
+                            absIndex = groupContext.AbsoluteIndex;
+                        }
+                        item.AbsoluteIndex = absIndex++;
+                        totalBounds = Rectangle.Union(r, totalBounds);
+                        loc.X += size.Width;
+                    }
+                } while (repeat && repeatCount < 2);
+
+                loc.Y += strip.StripHeightAbsolute;
+                loc.X = clientBounds.X;
+            }
+            context.AbsoluteIndex = absIndex;
+            return totalBounds;
+        }
+        private void ResizeStrips(List<LayoutItemStrip> strips, Rectangle clientBounds)
+        {
+            int totalFixedSize = 0;
+            List<LayoutItemStrip> percenageStrips = new List<LayoutItemStrip>();
+            foreach (LayoutItemStrip strip in strips)
+            {
+                if (strip.StripHeightPercentage == 0)
+                    totalFixedSize += strip.StripHeightAbsolute;
+                else
+                    percenageStrips.Add(strip);
+            }
+            if (percenageStrips.Count > 0)
+            {
+                int sizeLimit = GetStripsSizeLimit(clientBounds);
+                if (totalFixedSize < sizeLimit)
+                    sizeLimit -= totalFixedSize;
+                foreach (LayoutItemStrip strip in percenageStrips)
+                {
+                    strip.StripHeightAbsolute = Math.Max(strip.StripHeightAbsolute, (sizeLimit * strip.StripHeightPercentage) / 100);
+                    strip.StripHeightAbsolute = Math.Max(strip.StripHeightAbsolute, strip.MinStripHeightAbsolute);
+                }
+            }
+        }
+
+        private List<LayoutItemStrip> SliceItemsInStrips(LayoutGroup group, Rectangle clientBounds, LayoutContext context)
+        {
+            LayoutItemCollection items = group.Items;
+            List<LayoutItemStrip> strips = new List<LayoutItemStrip>();
+
+            if (items.Count == 0) return strips;
+
+            int sizeLimit = GetSizeLimit(clientBounds);
+            int currentPercent = 0;
+            int currentFixedSize = 0;
+            int currentTotalMinSize = 0;
+            int start = 0, end = items.Count;
+            Size largestTextSize = Size.Empty;
+
+            LayoutItemStrip currentStrip = new LayoutItemStrip();
+
+            // Check whether first or last item spans total client bounds effectively reducing the client width
+            int firstVisibleIndex = GetFirstVisibleItemIndex(items);
+            int lastVisibleIndex = GetLastVisibleItemIndex(items);
+            LayoutItemBase spanItem = null;
+            if (firstVisibleIndex >= 0) spanItem = items[firstVisibleIndex];
+            if (spanItem != null && !IsFixedStripSize(spanItem) && ItemStripSize(spanItem) >= 100)
+            {
+                if (spanItem.IsTextSizeShared)
+                    largestTextSize = Helpers.Max(largestTextSize, spanItem.MeasureText(context));
+                else
+                    spanItem.MeasureText(context);
+                sizeLimit -= ActualItemSize(spanItem, clientBounds.Width);
+                currentStrip.IsLeftSpanStrip = true;
+                currentStrip.StripHeightPercentage = 100;
+                currentStrip.MinStripHeightAbsolute = spanItem.MinSize.Height;
+                currentStrip.Items.Add(spanItem);
+                strips.Add(currentStrip);
+                currentStrip = new LayoutItemStrip();
+                start = firstVisibleIndex + 1;
+            }
+            if (firstVisibleIndex != lastVisibleIndex && lastVisibleIndex > 0)
+            {
+                spanItem = items[lastVisibleIndex];
+                if (!IsFixedStripSize(spanItem) && ItemStripSize(spanItem) >= 100 && !(!IsFixedSize(spanItem) && ItemSize(spanItem) >= 100))
+                {
+                    if (spanItem.IsTextSizeShared)
+                        largestTextSize = Helpers.Max(largestTextSize, spanItem.MeasureText(context));
+                    else
+                        spanItem.MeasureText(context);
+                    sizeLimit -= ActualItemSize(spanItem, clientBounds.Width);
+                    currentStrip.IsRightSpanStrip = true;
+                    currentStrip.StripHeightPercentage = 100;
+                    currentStrip.MinStripHeightAbsolute = spanItem.MinSize.Height;
+                    currentStrip.Items.Add(spanItem);
+                    strips.Add(currentStrip);
+                    currentStrip = new LayoutItemStrip();
+                    end = lastVisibleIndex;
+                }
+            }
+
+            for (int i = start; i < end; i++)
+            {
+                LayoutItemBase item = items[i];
+                if (!item.Visible) continue;
+                int itemSize = ItemSize(item);
+
+                if (item.IsTextSizeShared)
+                    largestTextSize = Helpers.Max(largestTextSize, item.MeasureText(context));
+                else
+                    item.MeasureText(context);
+
+                if (IsFixedSize(item))
+                {
+                    if (currentTotalMinSize + itemSize > sizeLimit && currentTotalMinSize > 0 || currentPercent >= 100)
+                    {
+                        // Trigger new line
+                        currentStrip.TotalFixedWidth = currentFixedSize;
+                        strips.Add(currentStrip);
+                        currentStrip = new LayoutItemStrip();
+                        currentFixedSize = Math.Max(itemSize, MinItemSize(item)); ;
+                        currentTotalMinSize = itemSize;
+                        currentPercent = 0;
+                    }
+                    else
+                    {
+                        currentFixedSize += Math.Max(itemSize, MinItemSize(item));
+                        currentTotalMinSize += itemSize;
+                    }
+                    if (item.HeightType == eLayoutSizeType.Percent)
+                        currentStrip.StripHeightPercentage = Math.Max(currentStrip.StripHeightPercentage, item.Height);
+                    else
+                        currentStrip.StripHeightAbsolute = Math.Max(currentStrip.StripHeightAbsolute, item.Height);
+                }
+                else
+                {
+                    int minItemSize = MinItemSize(item);
+                    if (currentPercent + itemSize > 100 && currentPercent > 0 || (currentTotalMinSize + minItemSize > sizeLimit || itemSize > 100) && currentTotalMinSize > 0)
+                    {
+                        // Trigger new line
+                        currentStrip.TotalFixedWidth = currentFixedSize;
+                        strips.Add(currentStrip);
+                        currentStrip = new LayoutItemStrip();
+                        currentFixedSize = 0;
+                        currentTotalMinSize = 0;
+                        currentPercent = 0;
+                    }
+                    //else
+                    //{
+                    currentPercent += itemSize;
+                    currentTotalMinSize += minItemSize;
+                    //}
+                    if (item.HeightType == eLayoutSizeType.Percent)
+                        currentStrip.StripHeightPercentage = Math.Max(currentStrip.StripHeightPercentage, item.Height);
+                    else
+                        currentStrip.StripHeightAbsolute = Math.Max(currentStrip.StripHeightAbsolute, item.Height);
+                }
+                currentStrip.MinStripHeightAbsolute = Math.Max(currentStrip.MinStripHeightAbsolute, item.MinSize.Height);
+                if (item.IsTextBaselineShared)
+                    currentStrip.LargestTextBaseline = Math.Max(currentStrip.LargestTextBaseline, item.TextBaseline);
+                currentStrip.Items.Add(item);
+            }
+            if (currentStrip.Items.Count > 0)
+            {
+                strips.Add(currentStrip);
+                currentStrip.TotalFixedWidth = currentFixedSize;
+            }
+
+            context.LargestTextSize = largestTextSize;
+
+            return strips;
+        }
+
+        private int GetFirstVisibleItemIndex(LayoutItemCollection items)
+        {
+            for (int i = 0; i < items.Count; i++)
+            {
+                if (items[i].Visible) return i;
+            }
+            return -1;
+        }
+        private int GetLastVisibleItemIndex(LayoutItemCollection items)
+        {
+            for (int i = items.Count - 1; i >= 0; i--)
+            {
+                if (items[i].Visible) return i;
+            }
+            return -1;
+        }
+
+        private int ActualItemSize(LayoutItemBase item, int clientSize)
+        {
+            if (item.WidthType == eLayoutSizeType.Absolute)
+                return item.Width;
+            else
+                return (Math.Min(100, (item.Width == 99 ? 100 : item.Width)) * clientSize) / 100; // 99% is special case where we have relative size item inside of fixed size items on single line
+        }
+        private int MinItemSize(LayoutItemBase item)
+        {
+            return item.MinSize.Width;
+        }
+        private int GetSizeLimit(Rectangle clientBounds)
+        {
+            return clientBounds.Width;
+        }
+        private int GetStripsSizeLimit(Rectangle clientBounds)
+        {
+            return clientBounds.Height;
+        }
+        private int ItemSize(LayoutItemBase item)
+        {
+            return item.Width;
+        }
+        private int ItemStripSize(LayoutItemBase item)
+        {
+            return item.Height;
+        }
+        private bool IsFixedSize(LayoutItemBase item)
+        {
+            return item.IsWidthFixed;
+        }
+        private bool IsFixedStripSize(LayoutItemBase item)
+        {
+            return item.IsHeightFixed;
+        }
+    }
+
+    internal class LayoutItemStrip
+    {
+        /// <summary>
+        /// Collection of items inside of strip.
+        /// </summary>
+        public List<LayoutItemBase> Items = new List<LayoutItemBase>();
+        /// <summary>
+        /// Total width of all items with fixed width in the strip.
+        /// </summary>
+        public int TotalFixedWidth = 0;
+        /// <summary>
+        /// True if this is left most strip in group which spans whole group height.
+        /// </summary>
+        public bool IsLeftSpanStrip = false;
+        /// <summary>
+        /// True if this is right most strip in group which spans whole group height.
+        /// </summary>
+        public bool IsRightSpanStrip = false;
+        /// <summary>
+        /// Strip height determined as maximum height of items in it.
+        /// </summary>
+        public int StripHeightAbsolute = 0;
+        /// <summary>
+        /// Minimum strip height according to the larges MinSize of contained items.
+        /// </summary>
+        public int MinStripHeightAbsolute = 0;
+        /// <summary>
+        /// Maximum percentage strip height for all items in it.
+        /// </summary>
+        public int StripHeightPercentage = 0;
+        /// <summary>
+        /// The largest text-baseline for all items in strip.
+        /// </summary>
+        public int LargestTextBaseline = 0;
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/LayoutContext.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/LayoutContext.cs
new file mode 100644
index 00000000..330dc3cc
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/LayoutContext.cs	
@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Layout
+{
+    public class LayoutContext
+    {
+
+        /// <summary>
+        /// Initializes a new instance of the LayoutContext class.
+        /// </summary>
+        /// <param name="layoutControl"></param>
+        /// <param name="graphics"></param>
+        /// <param name="font"></param>
+        public LayoutContext(LayoutControl layoutControl, Graphics graphics, Font font)
+        {
+            LayoutControl = layoutControl;
+            Graphics = graphics;
+            Font = font;
+            FontBaseline = Helpers.GetTextBaseline(layoutControl, font, ContentAlignment.TopLeft);
+            RightToLeft = (layoutControl.RightToLeft == System.Windows.Forms.RightToLeft.Yes);
+        }
+
+        public LayoutControl LayoutControl = null;
+        public Graphics Graphics = null;
+        public Font Font = null;
+        public Size LargestTextSize = Size.Empty;
+        public int FontBaseline = 0;
+        public bool RightToLeft = false;
+        public int AbsoluteIndex = 0;
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/LayoutControl.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/LayoutControl.cs
new file mode 100644
index 00000000..50ee9e51
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/LayoutControl.cs	
@@ -0,0 +1,1378 @@
+using System;
+using System.Collections.Generic;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Windows.Forms;
+using System.Drawing;
+using System.Windows.Forms.Layout;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar.Layout
+{
+    [ToolboxItem(true)]
+    [Designer("DevComponents.DotNetBar.Layout.Design.LayoutControlDesigner, DevComponents.DotNetBar.Layout.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=7eb7c3a35b91de04")]
+    [ToolboxBitmap(typeof(LayoutControl), "LayoutControl.ico")]
+    public class LayoutControl : ContainerControl
+    {
+        /// <summary>
+        /// Initializes a new instance of the LayoutControl class.
+        /// </summary>
+        public LayoutControl()
+        {
+            this.SetStyle(ControlStyles.UserPaint | ControlStyles.ResizeRedraw | ControlStyles.OptimizedDoubleBuffer
+                | ControlStyles.SupportsTransparentBackColor | ControlStyles.Opaque, true);
+            this.SetStyle(ControlStyles.AllPaintingInWmPaint, true);
+            //this.SetStyle(ControlStyles.Opaque, true);
+
+            _RootGroup.IsRootGroup = true;
+
+            _HScrollBar = new DevComponents.DotNetBar.ScrollBar.HScrollBarAdv();
+            _HScrollBar.Height = SystemInformation.HorizontalScrollBarHeight;
+            _HScrollBar.Visible = false;
+            _HScrollBar.Scroll += new ScrollEventHandler(HScrollBarScroll);
+            this.Controls.Add(_HScrollBar);
+
+            _VScrollBar = new VScrollBarAdv();
+            _VScrollBar.Width = SystemInformation.VerticalScrollBarWidth;
+            _VScrollBar.Visible = false;
+            _VScrollBar.Scroll += VScrollBarScroll;
+            this.Controls.Add(_VScrollBar);
+
+            _Thumb = new Control();
+            _Thumb.Width = SystemInformation.VerticalScrollBarWidth;
+            _Thumb.Height = SystemInformation.HorizontalScrollBarHeight;
+            _Thumb.Visible = false;
+            this.Controls.Add(_Thumb);
+
+            _InsertMarker = new InsertMarker();
+            _InsertMarker.Visible = false;
+            this.Controls.Add(_InsertMarker);
+
+            _RootGroup.LayoutControl = this;
+
+            this.FocusStyle = new SimpleStyle();
+
+            if (BarFunctions.IsWindows7 && DevComponents.DotNetBar.Touch.TouchHandler.IsTouchEnabled)
+            {
+                _TouchHandler = new DevComponents.DotNetBar.Touch.TouchHandler(this, DevComponents.DotNetBar.Touch.eTouchHandlerType.Gesture);
+                _TouchHandler.PanBegin += new EventHandler<DevComponents.DotNetBar.Touch.GestureEventArgs>(TouchHandlerPanBegin);
+                _TouchHandler.Pan += new EventHandler<DevComponents.DotNetBar.Touch.GestureEventArgs>(TouchHandlerPan);
+                _TouchHandler.PanEnd += new EventHandler<DevComponents.DotNetBar.Touch.GestureEventArgs>(TouchHandlerPanEnd);
+            }
+
+            StyleManager.Register(this);
+        }
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing) StyleManager.Unregister(this);
+            base.Dispose(disposing);
+        }
+
+        private Color _CurrentBackColor = Color.Empty;
+        private void UpdateBackColor()
+        {
+            DevComponents.DotNetBar.Rendering.Office2007ColorTable table = ((DevComponents.DotNetBar.Rendering.Office2007Renderer)DevComponents.DotNetBar.Rendering.GlobalManager.Renderer).ColorTable;
+            _CurrentBackColor = table.Form.BackColor;
+        }
+        /// <summary>
+        /// Called by StyleManager to notify control that style on manager has changed and that control should refresh its appearance if
+        /// its style is controlled by StyleManager.
+        /// </summary>
+        /// <param name="newStyle">New active style.</param>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void StyleManagerStyleChanged(eDotNetBarStyle newStyle)
+        {
+            UpdateBackColor();
+            this.Invalidate(true);
+        }
+        void HScrollBarScroll(object sender, ScrollEventArgs e)
+        {
+            if (e.NewValue != e.OldValue)
+                ScrollControls(-e.NewValue, 0);
+        }
+
+        void VScrollBarScroll(object sender, ScrollEventArgs e)
+        {
+            if (e.NewValue != e.OldValue)
+                ScrollControls(0, -e.NewValue);
+            //Console.WriteLine("{0}  {1}   {2}", e.Type, e.NewValue, _RootGroup.ActualBounds.Height);
+        }
+
+        private Control _Thumb = null;
+        private DevComponents.DotNetBar.ScrollBar.HScrollBarAdv _HScrollBar = null;
+        private VScrollBarAdv _VScrollBar = null;
+        private InsertMarker _InsertMarker = null;
+        protected override void OnPaint(PaintEventArgs e)
+        {
+#if TRIAL
+			if(WinApi.ColorExpAlt())
+			{
+				StringFormat format=new StringFormat(StringFormat.GenericDefault);
+				format.Alignment=StringAlignment.Center;
+				format.FormatFlags=format.FormatFlags & ~(format.FormatFlags & StringFormatFlags.NoWrap);	
+				e.Graphics.DrawString("Thank you very much for trying DotNetBar. Unfortunately your trial period is over. To continue using DotNetBar you should purchase license at http://www.devcomponents.com",new Font(this.Font.FontFamily,12),SystemBrushes.Highlight,this.ClientRectangle,format);
+				format.Dispose();
+				return;
+			}
+#endif
+            if ((this.BackColor.IsEmpty || this.BackColor == Color.Transparent))
+            {
+                base.OnPaintBackground(e);
+            }
+            else if(this.BackColor == SystemColors.Control && !_CurrentBackColor.IsEmpty)
+            {
+                using (SolidBrush brush = new SolidBrush(_CurrentBackColor))
+                    e.Graphics.FillRectangle(brush, this.ClientRectangle);
+            }
+            else
+            {
+                using (SolidBrush brush = new SolidBrush(this.BackColor))
+                    e.Graphics.FillRectangle(brush, this.ClientRectangle);
+            }
+            using (PaintContext context = new PaintContext(this, e.Graphics, _HotkeyPrefix))
+            {
+                _RootGroup.Paint(context);
+            }
+            //if (!string.IsNullOrEmpty(this.Text))
+            //    e.Graphics.DrawString(this.Text, this.Font, Brushes.Black, new PointF(0, this.Height - 32));
+            base.OnPaint(e);
+        }
+        protected override void OnHandleCreated(EventArgs e)
+        {
+            UpdateBackColor();
+            _RootGroup.SetBounds(GetLayoutBounds());
+            //LayoutGroup();
+            base.OnHandleCreated(e);
+        }
+        private void LayoutGroup()
+        {
+            if (this.IsHandleCreated)
+            {
+                using (Graphics g = this.CreateGraphics())
+                {
+                    LayoutContext context = new LayoutContext(this, g, _LabelFont ?? this.Font);
+                    _RootGroup.Layout(context);
+                }
+            }
+        }
+        private Rectangle GetLayoutBounds()
+        {
+            Rectangle r = this.ClientRectangle;
+            return r;
+        }
+        protected override void OnLayout(LayoutEventArgs levent)
+        {
+            if (_VScrollBar == null || _HScrollBar == null || !this.IsHandleCreated) return;
+
+            Rectangle r = GetLayoutBounds();
+            if (r.Width <= 0 || r.Height <= 0) return;
+
+            WinApi.SendMessage(this.Handle, WinApi.WM_SETREDRAW, 0, 0);
+
+            r.Offset(_ScrollPosition);
+            _RootGroup.SetBounds(r);
+            LayoutGroup();
+
+            bool hScrollBarVisible = false, vScrollBarVisible = false;
+
+            if (_RootGroup.ActualBounds.Height > r.Height + 1)
+            {
+                vScrollBarVisible = true;
+
+                r.Width -= _VScrollBar.Width;
+                _RootGroup.SetBounds(r);
+                LayoutGroup();
+
+                if (_RootGroup.ActualBounds.Width > r.Width + 1)
+                {
+                    hScrollBarVisible = true;
+                    r.Height -= _HScrollBar.Height;
+                    _RootGroup.SetBounds(r);
+                    LayoutGroup();
+                }
+
+            }
+            else if (_RootGroup.ActualBounds.Width > r.Width + 1)
+            {
+                hScrollBarVisible = true;
+
+                r.Height -= _HScrollBar.Height;
+
+                _RootGroup.SetBounds(r);
+                LayoutGroup();
+
+                if (_RootGroup.ActualBounds.Height > r.Height + 1)
+                {
+                    vScrollBarVisible = true;
+                    r.Width -= _VScrollBar.Width;
+                    _RootGroup.SetBounds(r);
+                    LayoutGroup();
+                }
+
+            }
+
+            bool performLayout = false;
+            if (vScrollBarVisible && r.Height > 0)
+            {
+                _VScrollBar.Location = new Point(this.ClientRectangle.Right - _VScrollBar.Width, this.ClientRectangle.Y);
+                _VScrollBar.Height = this.ClientRectangle.Height - (hScrollBarVisible ? _HScrollBar.Height : 0);
+                if (_VScrollBar.Visible != vScrollBarVisible)
+                {
+                    _VScrollBar.Value = 0;
+                    _VScrollBar.Visible = true;
+                    _VScrollBar.BringToFront();
+                }
+                _VScrollBar.Minimum = 0;
+                _VScrollBar.Maximum = _RootGroup.ActualBounds.Height - 1;
+                _VScrollBar.LargeChange = r.Height;
+                _VScrollBar.SmallChange = 16;
+            }
+            else if (_VScrollBar.Visible)
+            {
+                _VScrollBar.Visible = false;
+                if (_ScrollPosition.Y != 0)
+                {
+                    _ScrollPosition.Y = 0;
+                    performLayout = true;
+                }
+            }
+
+            if (hScrollBarVisible && r.Width > 0)
+            {
+                _HScrollBar.Location = new Point(this.ClientRectangle.X, this.ClientRectangle.Bottom - _HScrollBar.Height);
+                _HScrollBar.Width = this.ClientRectangle.Width - (vScrollBarVisible ? _VScrollBar.Width : 0);
+                if (_HScrollBar.Visible != hScrollBarVisible)
+                {
+                    _HScrollBar.Value = 0;
+                    _HScrollBar.Visible = true;
+                    _HScrollBar.BringToFront();
+                }
+                _HScrollBar.Minimum = 0;
+                _HScrollBar.Maximum = _RootGroup.ActualBounds.Width - 1;
+                _HScrollBar.LargeChange = r.Width;
+                _HScrollBar.SmallChange = 16;
+            }
+            else if (_HScrollBar.Visible)
+            {
+                _HScrollBar.Visible = false;
+                if (_ScrollPosition.X != 0)
+                {
+                    _ScrollPosition.X = 0;
+                    performLayout = true;
+                }
+            }
+
+            if (vScrollBarVisible && hScrollBarVisible && r.Height > 0 && r.Width > 0)
+            {
+                _Thumb.Bounds = new Rectangle(this.ClientRectangle.Right - _VScrollBar.Width, this.ClientRectangle.Bottom - _HScrollBar.Height, _VScrollBar.Width, _HScrollBar.Height);
+                _Thumb.Visible = true;
+                _Thumb.BringToFront();
+            }
+            else if (_Thumb.Visible)
+                _Thumb.Visible = false;
+
+            if (performLayout)
+            {
+                r = GetLayoutBounds();
+                r.Offset(_ScrollPosition);
+                _RootGroup.SetBounds(r);
+                LayoutGroup();
+            }
+
+            WinApi.SendMessage(this.Handle, WinApi.WM_SETREDRAW, 1, 0);
+            this.Refresh();
+            base.OnLayout(levent);
+        }
+
+        protected override void OnMouseWheel(MouseEventArgs e)
+        {
+            if (_VScrollBar.Visible)
+            {
+                int y = -_VScrollBar.Value + Math.Sign(e.Delta) * _VScrollBar.SmallChange;
+                if (-y < 0) y = 0;
+                ScrollControls(0, y);
+                _VScrollBar.Value = Math.Min(_VScrollBar.Maximum - _VScrollBar.LargeChange, -y);
+
+            }
+            base.OnMouseWheel(e);
+        }
+
+        public new void ScrollControlIntoView(Control control)
+        {
+            LayoutItemBase item = FindControlItem(control);
+            if (item == null) return;
+            ScrollItemIntoView(item);
+        }
+
+        /// <summary>
+        /// Brings specified item that belongs to this LayoutControl into view by scrolling control if necessary.
+        /// </summary>
+        /// <param name="item">Item to bring into view.</param>
+        public void ScrollItemIntoView(LayoutItemBase item)
+        {
+            if (item.GetLayoutControl() != this)
+                throw new ArgumentException("item does not belong to this control");
+            if (!_HScrollBar.Visible && !_VScrollBar.Visible) return;
+
+            Rectangle clientRect = this.ClientRectangle;
+            Rectangle itemBounds = item.Bounds;
+            //itemBounds.Offset(-_ScrollPosition.X,-_ScrollPosition.Y);
+            if (clientRect.Contains(itemBounds)) return;
+
+            Point scroll = new Point();
+            if (item.Bounds.Y < clientRect.Y)
+            {
+                scroll.Y = clientRect.Y - itemBounds.Y;
+            }
+            else if (item.Bounds.Bottom > clientRect.Bottom)
+            {
+                scroll.Y = Math.Max(-(_VScrollBar.Maximum - _VScrollBar.LargeChange), clientRect.Bottom - itemBounds.Bottom);
+            }
+
+            if (item.Bounds.X < clientRect.X)
+            {
+                scroll.X = clientRect.X - itemBounds.X;
+            }
+            else if (item.Bounds.Right > clientRect.Right)
+            {
+                scroll.X = clientRect.Right - itemBounds.Right;
+            }
+
+            if (!scroll.IsEmpty)
+            {
+                ScrollControls(_ScrollPosition.X + scroll.X, _ScrollPosition.Y + scroll.Y);
+                _VScrollBar.Value = Math.Max(0, Math.Min(Math.Abs(_ScrollPosition.Y), _VScrollBar.Maximum));
+            }
+
+        }
+
+        private LayoutGroup _RootGroup = new LayoutGroup();
+        /// <summary>
+        /// Gets the LayoutGroup for the control. LayoutGroup should not be changed.
+        /// </summary>
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content), Browsable(false)]
+        public LayoutGroup RootGroup
+        {
+            get { return _RootGroup; }
+            set
+            {
+                if (value != _RootGroup)
+                {
+                    LayoutGroup oldValue = _RootGroup;
+                    _RootGroup = value;
+                    OnRootGroupChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when RootGroup property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnRootGroupChanged(LayoutGroup oldValue, LayoutGroup newValue)
+        {
+            if (oldValue != null)
+            {
+                oldValue.LayoutControl = null;
+                oldValue.IsRootGroup = false;
+            }
+            if (newValue != null)
+            {
+                newValue.LayoutControl = this;
+                newValue.IsRootGroup = true;
+            }
+            //OnPropertyChanged(new PropertyChangedEventArgs("RootGroup"));
+
+        }
+
+        private Font _LabelFont = null;
+        /// <summary>
+        /// Indicates font used for the item labels.
+        /// </summary>
+        [DefaultValue(null), Category("Appearance"), Description("Indicates font used for the item labels.")]
+        public Font LabelFont
+        {
+            get { return _LabelFont; }
+            set
+            {
+                if (value != _LabelFont)
+                {
+                    Font oldValue = _LabelFont;
+                    _LabelFont = value;
+                    OnLabelFontChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when LabelFont property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnLabelFontChanged(Font oldValue, Font newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("LabelFont"));
+            this.PerformLayout();
+            this.Invalidate();
+        }
+
+        private Color _LabelTextColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets the color of the label text.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates color of label text.")]
+        public Color LabelTextColor
+        {
+            get { return _LabelTextColor; }
+            set { _LabelTextColor = value; /*OnPropertyChanged("LabelTextColor");*/ this.Invalidate(); }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeLabelTextColor()
+        {
+            return !_LabelTextColor.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetLabelTextColor()
+        {
+            this.LabelTextColor = Color.Empty;
+        }
+
+        private eTextAlignment _LabelTextAlignment = eTextAlignment.Default;
+        /// <summary>
+        /// Indicates the label text alignment within the text bounds.
+        /// </summary>
+        [DefaultValue(eTextAlignment.Default), Category("Appearance"), Description("Indicates the label text alignment within the text bounds.")]
+        public eTextAlignment LabelTextAlignment
+        {
+            get { return _LabelTextAlignment; }
+            set
+            {
+                if (value != _LabelTextAlignment)
+                {
+                    eTextAlignment oldValue = _LabelTextAlignment;
+                    _LabelTextAlignment = value;
+                    OnLabelTextAlignmentChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when LabelTextAlignment property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnLabelTextAlignmentChanged(eTextAlignment oldValue, eTextAlignment newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("LabelTextAlignment"));
+            this.Invalidate();
+        }
+
+        private EmptyLayoutManager _EmptyLayout = new EmptyLayoutManager();
+        public override LayoutEngine LayoutEngine
+        {
+            get
+            {
+                return _EmptyLayout;
+            }
+        }
+
+        /// <summary>
+        /// Sets default property values for LayoutControlItem given the control assigned to it.
+        /// </summary>
+        /// <param name="item">Reference to LayoutControlItem</param>
+        public void SetupControlItem(DevComponents.DotNetBar.Layout.LayoutControlItem item)
+        {
+            if (item == null || item.Control == null) return;
+
+            Control c = item.Control;
+
+            c.Margin = new System.Windows.Forms.Padding();
+
+            if (c is TextBoxBase)
+            {
+                item.Width = 100;
+                item.WidthType = eLayoutSizeType.Percent;
+                item.Height = c.Height + item.Padding.Vertical;
+                item.Text = "Label:";
+                item.MinSize = new Size(120, 0);
+            }
+            else if (c is ButtonBase || c is IButtonControl)
+            {
+                //item.ControlSize = c.Size;
+                item.Width = c.Width + item.Padding.Horizontal;
+                item.Height = c.Height + item.Padding.Vertical;
+                item.Text = "";
+                item.MinSize = new Size(32, 20);
+            }
+            else if(c is DevComponents.DotNetBar.Controls.RatingStar)
+            {
+                c.Text = "";
+                item.Width = c.Width + item.Padding.Horizontal;
+                item.Height = c.Height + item.Padding.Vertical;
+                item.Text = "Rating:";
+                item.MinSize = new Size(85, 23);
+            }
+            else
+            {
+                item.Width = c.Width + item.Padding.Horizontal;
+                item.Height = c.Height + item.Padding.Vertical;
+                item.Text = "Label:";
+                item.MinSize = new Size(64, 18);
+            }
+        }
+
+        private LayoutItemBase FindItemForMnemonic(LayoutGroup group, char charCode)
+        {
+            foreach (LayoutItemBase item in group.Items)
+            {
+                LayoutGroup childGroup = item as LayoutGroup;
+                if (childGroup != null)
+                {
+                    LayoutItemBase item2 = FindItemForMnemonic(childGroup, charCode);
+                    if (item2 != null) return item2;
+                }
+                else if (item.TextVisible && !string.IsNullOrEmpty(item.Text) && IsMnemonic(charCode, item.Text))
+                {
+                    return item;
+                }
+            }
+            return null;
+        }
+        private bool IsMnemonicProcessed(char charCode)
+        {
+            LayoutItemBase item = FindItemForMnemonic(_RootGroup, charCode);
+            if (item != null)
+                return item.ProcessMnemonic(charCode);
+
+            return false;
+        }
+        protected override bool ProcessMnemonic(char charCode)
+        {
+            if (this.Visible && _MnemonicsEnabled && IsMnemonicProcessed(charCode))
+                return true;
+            return base.ProcessMnemonic(charCode);
+        }
+
+        private bool _MnemonicsEnabled = true;
+        /// <summary>
+        /// Indicates whether accelerator keys assigned to item Text property are processed by items which respond to them.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether accelerator keys assigned to item Text property are processed by items which respond to them.")]
+        public bool MnemonicsEnabled
+        {
+            get { return _MnemonicsEnabled; }
+            set
+            {
+                if (value != _MnemonicsEnabled)
+                {
+                    bool oldValue = _MnemonicsEnabled;
+                    _MnemonicsEnabled = value;
+                    OnMnemonicsEnabledChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when MnemonicsEnabled property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnMnemonicsEnabledChanged(bool oldValue, bool newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("MnemonicsEnabled"));
+        }
+
+        private System.Drawing.Text.HotkeyPrefix _HotkeyPrefix = System.Drawing.Text.HotkeyPrefix.Show;
+        /// <summary>
+        /// Indicates visibility of the hot-key prefixes, accelerator keys, that are set using ampersand in item Text.
+        /// </summary>
+        [DefaultValue(System.Drawing.Text.HotkeyPrefix.Show), Category("Behavior"), Description("Indicates visibility of the hot-key prefixes, accelerator keys, that are set using ampersand in item Text.")]
+        public System.Drawing.Text.HotkeyPrefix HotkeyPrefix
+        {
+            get { return _HotkeyPrefix; }
+            set
+            {
+                if (value != _HotkeyPrefix)
+                {
+                    System.Drawing.Text.HotkeyPrefix oldValue = _HotkeyPrefix;
+                    _HotkeyPrefix = value;
+                    OnHotkeyPrefixChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when HotkeyPrefix property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnHotkeyPrefixChanged(System.Drawing.Text.HotkeyPrefix oldValue, System.Drawing.Text.HotkeyPrefix newValue)
+        {
+            this.Invalidate();
+            //OnPropertyChanged(new PropertyChangedEventArgs("HotkeyPrefix"));
+
+        }
+        private Size GetAutoScrollMinSize()
+        {
+            Rectangle clientRectangle = GetLayoutBounds();
+            Rectangle displayRect = _RootGroup.ActualBounds;
+            return new Size(Math.Abs(Math.Min(clientRectangle.Width - displayRect.Width, 0)),
+                Math.Abs(Math.Min(clientRectangle.Height - displayRect.Height, 0)));
+        }
+        private Point _ScrollPosition = new Point();
+        private void ScrollControls(Point scrollPosition)
+        {
+            ScrollControls(scrollPosition.X, scrollPosition.Y);
+        }
+        private void ScrollControls(int x, int y)
+        {
+            int xScroll = 0;
+            int yScroll = 0;
+            Rectangle clientRectangle = GetLayoutBounds();
+            if (_VScrollBar.Visible)
+                clientRectangle.Width -= _VScrollBar.Width;
+            if (_HScrollBar.Visible)
+                clientRectangle.Height -= _HScrollBar.Height;
+
+            Rectangle displayRect = _RootGroup.ActualBounds;
+            int maxXScroll = Math.Min(clientRectangle.Width - displayRect.Width, 0);
+            int maxYScroll = Math.Min(clientRectangle.Height - displayRect.Height, 0);
+            if (x > 0)
+                x = 0;
+            if (y > 0)
+                y = 0;
+            if (x < maxXScroll)
+                x = maxXScroll;
+            if (y < maxYScroll)
+                y = maxYScroll;
+            if (_ScrollPosition.X != x)
+                xScroll = x - displayRect.X;
+            if (_ScrollPosition.Y != y)
+                yScroll = y - displayRect.Y;
+            _ScrollPosition.X = x;
+            _ScrollPosition.Y = y;
+
+            bool useScrollWindowEx = !(_VScrollBar.Visible && _HScrollBar.Visible);
+
+            if ((xScroll != 0) || ((yScroll != 0) && this.IsHandleCreated))
+            {
+                DateTime start = DateTime.Now;
+
+                if (useScrollWindowEx)
+                {
+                    _RootGroup.UpdateScrollBounds(xScroll, yScroll, false); // Move Items but not controls
+                    Rectangle clipBounds = clientRectangle;
+                    WinApi.RECT rectClip = WinApi.RECT.FromXYWH(clipBounds.X, clipBounds.Y, clipBounds.Width, clipBounds.Height);
+                    WinApi.RECT prcUpdate = WinApi.RECT.FromXYWH(clipBounds.X, clipBounds.Y, clipBounds.Width, clipBounds.Height);
+                    WinApi.RECT rectScroll = WinApi.RECT.FromXYWH(displayRect.X, displayRect.Y, displayRect.Width, displayRect.Height);
+                    WinApi.ScrollWindowEx(new System.Runtime.InteropServices.HandleRef(this, this.Handle),
+                        xScroll,
+                        yScroll,
+                        ref rectScroll,
+                        ref rectClip,
+                        IntPtr.Zero,
+                        ref prcUpdate,
+                        7);
+                    if (_HScrollBar.Visible)
+                    {
+                        _HScrollBar.Location = new Point(this.ClientRectangle.X, this.ClientRectangle.Bottom - _HScrollBar.Height);
+                        _HScrollBar.BringToFront();
+                        _HScrollBar.Refresh();
+                    }
+                    if (_VScrollBar.Visible)
+                    {
+                        _VScrollBar.Location = new Point(this.ClientRectangle.Right - _VScrollBar.Width, this.ClientRectangle.Y);
+                        _VScrollBar.BringToFront();
+                        _VScrollBar.Refresh();
+                    }
+
+                    Type t = typeof(Control);
+                    System.Reflection.MethodInfo mi = t.GetMethod("UpdateBounds", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance, System.Type.DefaultBinder, new Type[0], new System.Reflection.ParameterModifier[0]);
+                    if (mi != null)
+                    {
+                        for (int i = 0; i < base.Controls.Count; i++)
+                        {
+                            Control control = base.Controls[i];
+                            if ((control != null) && control.IsHandleCreated && control != _VScrollBar && control != _HScrollBar)
+                            {
+                                mi.Invoke(control, null); //control.UpdateBounds();
+                            }
+                        }
+                    }
+                    this.Refresh();
+                }
+                else
+                {
+                    WinApi.SendMessage(this.Handle, WinApi.WM_SETREDRAW, 0, 0);
+                    _RootGroup.UpdateScrollBounds(xScroll, yScroll, true);
+                    WinApi.SendMessage(this.Handle, WinApi.WM_SETREDRAW, 1, 0);
+                    this.Refresh();
+                }
+
+                DateTime end = DateTime.Now;
+                //Console.WriteLine("ScrollTime:{0}", end.Subtract(start).TotalMilliseconds);
+            }
+        }
+
+        /// <summary>
+        /// Padding property is not supported by LayoutControl.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), EditorBrowsable(EditorBrowsableState.Never)]
+        public new System.Windows.Forms.Padding Padding
+        {
+            get
+            {
+                return base.Padding;
+            }
+            set
+            {
+            }
+        }
+
+        private bool _AutoScaleLayout = true;
+        /// <summary>
+        /// Indicates whether layout control automatically scales the items if the parent Form performs scaling due to AutoScale settings.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether layout control automatically scales the items if the parent Form performs scaling due to AutoScale settings.")]
+        public bool AutoScaleLayout
+        {
+            get { return _AutoScaleLayout; }
+            set
+            {
+                _AutoScaleLayout = value;
+            }
+        }
+
+
+        protected virtual void ScaleItems(LayoutGroup group, SizeF factor)
+        {
+            foreach (LayoutItemBase item in group.Items)
+            {
+                item.ScaleItem(factor);
+                if (item is LayoutGroup)
+                    ScaleItems((LayoutGroup)item, factor);
+            }
+        }
+        protected override void ScaleControl(SizeF factor, BoundsSpecified specified)
+        {
+            //Console.WriteLine("ScaleControl   factor={0}  boundsSpecified={1}", factor, specified);
+            if (_AutoScaleLayout && (factor.Width != 1f || factor.Height != 1f))
+            {
+                this.SuspendLayout();
+                try
+                {
+                    ScaleItems(_RootGroup, factor);
+                }
+                finally
+                {
+                    ResumeLayout();
+                }
+            }
+            base.ScaleControl(factor, specified);
+        }
+        protected override void ScaleCore(float dx, float dy)
+        {
+            //Console.WriteLine("ScaleCore   dx={0}  dy={1}", dx, dy);
+            base.ScaleCore(dx, dy);
+        }
+
+        private SimpleStyle _FocusStyle = null;
+        /// <summary>
+        /// Indicates the focus style applied to the item which hosts an Control when that control contains input focus.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates the focus style applied to the item which hosts an Control when that control contains input focus."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public SimpleStyle FocusStyle
+        {
+            get { return _FocusStyle; }
+            internal set
+            {
+                if (value != _FocusStyle)
+                {
+                    SimpleStyle oldValue = _FocusStyle;
+                    _FocusStyle = value;
+                    OnFocusStyleChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when FocusStyle property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnFocusStyleChanged(SimpleStyle oldValue, SimpleStyle newValue)
+        {
+            if (oldValue != null)
+                oldValue.PropertyChanged -= FocusStylePropertyChanged;
+            if (newValue != null)
+                newValue.PropertyChanged += FocusStylePropertyChanged;
+            //OnPropertyChanged(new PropertyChangedEventArgs("FocusStyle"));
+
+        }
+        private void FocusStylePropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            this.Invalidate();
+        }
+
+        /// <summary>
+        /// Gets the vertical scrollbar used by control.
+        /// </summary>
+        [Browsable(false)]
+        public VScrollBarAdv VScrollBar
+        {
+            get
+            {
+                return _VScrollBar;
+            }
+        }
+        /// <summary>
+        /// Gets the horizontal scrollbar used by the control.
+        /// </summary>
+        [Browsable(false)]
+        public DevComponents.DotNetBar.ScrollBar.HScrollBarAdv HScrollBar
+        {
+            get
+            {
+                return _HScrollBar;
+            }
+        }
+        /// <summary>
+        /// Finds the item which is responsible for the control or returns null if there is no item that represents the control or control is not 
+        /// contained by the layout control.
+        /// </summary>
+        /// <param name="c"></param>
+        /// <returns></returns>
+        public LayoutItemBase FindControlItem(Control c)
+        {
+            if (c == null || c.Parent != this) return null;
+
+            return FindControlItem(_RootGroup, c);
+        }
+        private LayoutItemBase FindControlItem(LayoutGroup group, Control c)
+        {
+            foreach (LayoutItemBase item in group.Items)
+            {
+                if (item is LayoutControlItem && ((LayoutControlItem)item).Control == c)
+                    return item;
+                LayoutGroup childGroup = item as LayoutGroup;
+                if (childGroup != null)
+                {
+                    LayoutItemBase childItem = FindControlItem(childGroup, c);
+                    if (childItem != null) return childItem;
+                }
+            }
+            return null;
+        }
+
+        /// <summary>
+        /// Finds the layout items which have controls assigned but controls are not parented by the layout control or one of its child controls.
+        /// </summary>
+        /// <returns></returns>
+        public List<LayoutItemBase> FindOrphanedControlItems()
+        {
+            List<LayoutItemBase> list = new List<LayoutItemBase>();
+            FindOrphanedControlItems(list, _RootGroup);
+            return list;
+        }
+
+        private void FindOrphanedControlItems(List<LayoutItemBase> list, LayoutGroup group)
+        {
+            foreach (LayoutItemBase item in group.Items)
+            {
+                if (item is LayoutControlItem && !IsChildControl(((LayoutControlItem)item).Control))
+                    list.Add(item);
+                else
+                {
+                    LayoutGroup childGroup = item as LayoutGroup;
+                    if (childGroup != null)
+                        FindOrphanedControlItems(list, childGroup);
+                }
+            }
+        }
+        private bool IsChildControl(Control control)
+        {
+            if (control == null) return true;
+            do
+            {
+                if (control.Parent == this) return true;
+                control = control.Parent;
+            } while (control != null && control.Parent != null);
+            return false;
+        }
+        /// <summary>
+        /// Returns whether control is an system control used internally by LayoutControl.
+        /// </summary>
+        /// <param name="c"></param>
+        /// <returns></returns>
+        public bool IsSystemControl(Control c)
+        {
+            return c == _VScrollBar || c == _HScrollBar || c == _InsertMarker || c == _Thumb;
+        }
+
+        private bool _DisposeControlsOnRootGroupClear = true;
+        /// <summary>
+        /// Indicates whether controls associated with layout items are automatically disposed when RootGroup.Clear method is called. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether controls are automatically disposed when RootGroup.Clear method is called.")]
+        public bool DisposeControlsOnRootGroupClear
+        {
+            get { return _DisposeControlsOnRootGroupClear; }
+            set
+            {
+                _DisposeControlsOnRootGroupClear = value;
+            }
+        }
+        
+
+        private LayoutItemBase _MouseOverItem = null;
+        protected override void OnMouseMove(MouseEventArgs e)
+        {
+            if (_MouseOverItem != null && _MouseOverItem.Bounds.Contains(e.Location))
+            {
+                _MouseOverItem.OnMouseMove(this, e);
+            }
+            else
+            {
+                LayoutItemBase item = HitTest(e.Location);
+                if (item != _MouseOverItem)
+                {
+                    if (_MouseOverItem != null)
+                        _MouseOverItem.OnMouseLeave(this, e);
+                    _MouseOverItem = item;
+
+                    if (_MouseOverItem != null)
+                    {
+                        _MouseOverItem.OnMouseEnter(this, e);
+                        _MouseOverItem.OnMouseMove(this, e);
+                    }
+                }
+            }
+
+            base.OnMouseMove(e);
+        }
+        protected override void OnMouseLeave(EventArgs e)
+        {
+            if (_MouseOverItem != null)
+            {
+                _MouseOverItem.OnMouseLeave(this, e);
+                _MouseOverItem = null;
+            }
+            base.OnMouseLeave(e);
+        }
+        protected override void OnMouseDown(MouseEventArgs e)
+        {
+            if (_MouseOverItem != null)
+                _MouseOverItem.OnMouseDown(this, e);
+            base.OnMouseDown(e);
+        }
+        protected override void OnMouseUp(MouseEventArgs e)
+        {
+            if (_MouseOverItem != null)
+                _MouseOverItem.OnMouseUp(this, e);
+            base.OnMouseUp(e);
+        }
+        protected override void OnClick(EventArgs e)
+        {
+            if (_MouseOverItem != null)
+                _MouseOverItem.OnClick(this, e);
+            base.OnClick(e);
+        }
+        protected override void OnMouseHover(EventArgs e)
+        {
+            if (_MouseOverItem != null)
+                _MouseOverItem.OnMouseHover(this, e);
+            base.OnMouseHover(e);
+        }
+        private bool _ShowToolTips = true;
+        /// <summary>
+        /// Gets or sets whether tooltips are shown when mouse is over the item when Tooltip property is set.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether tooltips are shown when mouse is over the item when Tooltip property is set.")]
+        public bool ShowToolTips
+        {
+            get { return _ShowToolTips; }
+            set
+            {
+                _ShowToolTips = value;
+            }
+        }
+        /// <summary>
+        /// Gets the layout item at specified location.
+        /// </summary>
+        /// <param name="clientLoc">LayoutControl client coordinates to test.</param>
+        /// <returns>Layout item or null.</returns>
+        public LayoutItemBase HitTest(Point clientLoc)
+        {
+            return HitTest(_RootGroup, clientLoc);
+        }
+
+        private LayoutItemBase HitTest(LayoutGroup group, Point clientLoc)
+        {
+            foreach (LayoutItemBase item in group.Items)
+            {
+                LayoutGroup childGroup = item as LayoutGroup;
+                if (childGroup != null)
+                {
+                    LayoutItemBase childItem = HitTest(childGroup, clientLoc);
+                    if (childItem != null) return childItem;
+                }
+                if (item.Bounds.Contains(clientLoc))
+                    return item;
+            }
+            return null;
+        }
+        private bool IsContainedBy(LayoutItemBase item, LayoutItemBase parent)
+        {
+            if (parent == null || item == null) return false;
+            do
+            {
+                if (item.Parent == parent)
+                    return true;
+                item = item.Parent;
+            } while (item != null);
+            return false;
+        }
+        /// <summary>
+        /// Gets the HitTestInsertInfo structure that provides information on insertion point for an item based on the 
+        /// specified client coordinates.
+        /// </summary>
+        /// <param name="clientLoc">Client coordinates to determine insert location for.</param>
+        /// <returns>Instance of HitTestInsertInfo or null if item cannot be placed.</returns>
+        public HitTestInsertInfo GetHitTestInsertInfo(LayoutItemBase insertItem, Point clientLoc)
+        {
+            HitTestInsertInfo insertInfo = new HitTestInsertInfo();
+            insertInfo.Parent = _RootGroup;
+            LayoutItemBase item = HitTestInsert(_RootGroup, clientLoc);
+            if (item != null)
+            {
+                if (IsContainedBy(item, insertItem) || insertItem.IsChildItem(item))
+                    return new HitTestInsertInfo();
+                else if (item is LayoutGroup && item != _RootGroup && item != insertItem)
+                {
+                    insertInfo.Parent = (LayoutGroup)item;
+                    if (insertInfo.Parent.Items.Count == 0)
+                    {
+                        insertInfo.InsertIndex = 0;
+                        insertInfo.InsertMarkerBounds = new Rectangle(item.Bounds.X, item.Bounds.Y, 1, item.Bounds.Height);
+                    }
+                    else
+                    {
+                        LayoutItemBase lastItem = insertInfo.Parent.Items[insertInfo.Parent.Items.Count - 1];
+                        insertInfo.InsertIndex = insertInfo.Parent.Items.Count;
+                        insertInfo.InsertMarkerBounds = new Rectangle(lastItem.Bounds.Right, lastItem.Bounds.Y, 1, lastItem.Bounds.Height);
+                    }
+                }
+                else
+                {
+                    insertInfo.Parent = (LayoutGroup)item.Parent;
+                    if (clientLoc.X < item.Bounds.X + item.Bounds.Width / 2)
+                    {
+                        insertInfo.InsertIndex = insertInfo.Parent.Items.IndexOf(item);
+                        insertInfo.InsertMarkerBounds = new Rectangle(item.Bounds.X, item.Bounds.Y, 1, item.Bounds.Height);
+                    }
+                    else
+                    {
+                        insertInfo.InsertIndex = insertInfo.Parent.Items.IndexOf(item) + 1;
+                        insertInfo.InsertMarkerBounds = new Rectangle(item.Bounds.Right, item.Bounds.Y, 1, item.Bounds.Height);
+                    }
+                }
+            }
+            else
+            {
+                if (_RootGroup.Items.Count == 0)
+                    insertInfo.InsertMarkerBounds = new Rectangle(_RootGroup.Bounds.X, _RootGroup.Bounds.Y, 1, insertItem.Bounds.Height);
+                else
+                {
+                    insertInfo.InsertIndex = _RootGroup.Items.Count;
+                    LayoutItemBase lastItem = _RootGroup.Items[_RootGroup.Items.Count - 1];
+                    insertInfo.InsertMarkerBounds = new Rectangle(lastItem.Bounds.Right, lastItem.Bounds.Y, 1, lastItem.Bounds.Height);
+                }
+            }
+
+            return insertInfo;
+        }
+        /// <summary>
+        /// Returns item which contains specified client point or null.
+        /// </summary>
+        /// <param name="clientLoc">Client location to test.</param>
+        /// <returns></returns>
+        private LayoutItemBase HitTestInsert(LayoutGroup group, Point clientLoc)
+        {
+            LayoutItemBase relItem = null;
+            foreach (LayoutItemBase item in group.Items)
+            {
+                LayoutGroup childGroup = item as LayoutGroup;
+
+                if (childGroup != null)
+                {
+                    relItem = HitTestInsert(childGroup, clientLoc);
+                    if (relItem != null)
+                        return relItem;
+                }
+
+                if (item.Bounds.Contains(clientLoc))
+                    return item;
+
+                if (group.IsRootGroup && clientLoc.Y >= item.Bounds.Y && clientLoc.Y <= item.Bounds.Bottom)
+                {
+                    if (item.Bounds.X < clientLoc.X || clientLoc.X > item.Bounds.Right)
+                        relItem = item;
+                }
+            }
+            return relItem;
+        }
+
+        public void HideInsertMarker()
+        {
+            _InsertMarker.Visible = false;
+        }
+        public void ShowInsertMarker(Rectangle r)
+        {
+            if (r.Width < 6) r.Width = 6;
+            _InsertMarker.Bounds = r;
+            if (!_InsertMarker.Visible)
+                _InsertMarker.Visible = true;
+            _InsertMarker.BringToFront();
+        }
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public new Size AutoScrollMargin
+        {
+            get
+            {
+                return base.AutoScrollMargin;
+            }
+            set
+            {
+            }
+        }
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public new Size AutoScrollMinSize
+        {
+            get
+            {
+                return base.AutoScrollMinSize;
+            }
+            set { }
+        }
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override bool AutoScroll
+        {
+            get
+            {
+                return base.AutoScroll;
+            }
+            set
+            {
+                //base.AutoScroll = value;
+            }
+        }
+        [Browsable(false)]
+        public override string Text
+        {
+            get
+            {
+                return base.Text;
+            }
+            set
+            {
+                base.Text = value;
+            }
+        }
+
+        protected override Size DefaultSize
+        {
+            get
+            {
+                return new Size(200, 200);
+            }
+        }
+
+        #region Touch Handling
+        private DevComponents.DotNetBar.Touch.TouchHandler _TouchHandler = null;
+        private bool _TouchEnabled = true;
+        /// <summary>
+        /// Indicates whether touch support for scrolling is enabled.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether touch support for scrolling is enabled.")]
+        public bool TouchEnabled
+        {
+            get { return _TouchEnabled; }
+            set
+            {
+                if (value != _TouchEnabled)
+                {
+                    bool oldValue = _TouchEnabled;
+                    _TouchEnabled = value;
+                    OnTouchEnabledChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when TouchEnabled property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnTouchEnabledChanged(bool oldValue, bool newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("TouchEnabled"));
+        }
+        private int TriggerPageChangeOffset
+        {
+            get
+            {
+                return 32;
+            }
+        }
+        private int MaximumReversePageOffset
+        {
+            get
+            {
+                return 0; //Math.Min(32, this.Width / 6);
+            }
+        }
+        private bool _TouchDrag = false;
+        private Point _TouchStartLocation = Point.Empty;
+        private Point _TouchStartScrollPosition = Point.Empty;
+        private Rectangle _TouchInnerBounds = Rectangle.Empty;
+        private void TouchHandlerPanBegin(object sender, DevComponents.DotNetBar.Touch.GestureEventArgs e)
+        {
+            if (_TouchEnabled)
+            {
+                _TouchInnerBounds = GetLayoutBounds();
+                _TouchStartLocation = e.Location;
+                _TouchStartScrollPosition = _ScrollPosition;
+                _TouchDrag = true;
+                e.Handled = true;
+            }
+        }
+
+        private void TouchHandlerPanEnd(object sender, DevComponents.DotNetBar.Touch.GestureEventArgs e)
+        {
+            if (_TouchDrag)
+            {
+                EndTouchPan();
+                e.Handled = true;
+            }
+        }
+
+        private void EndTouchPan()
+        {
+            _TouchDrag = false;
+            Point autoScrollPosition = _ScrollPosition;
+            Size autoScrollMinSize = GetAutoScrollMinSize();
+            if (autoScrollMinSize.Width > 0)
+            {
+                if (autoScrollMinSize.Width < -autoScrollPosition.X)
+                    autoScrollPosition = new Point(autoScrollMinSize.Width, autoScrollPosition.Y);
+                else if (-autoScrollPosition.X < 0)
+                    autoScrollPosition = new Point(0, autoScrollPosition.Y);
+            }
+
+            if (autoScrollMinSize.Height > 0)
+            {
+                if (autoScrollMinSize.Height < -autoScrollPosition.Y)
+                    autoScrollPosition = new Point(autoScrollPosition.X, autoScrollMinSize.Height);
+                else if (-autoScrollPosition.Y < 0)
+                    autoScrollPosition = new Point(autoScrollPosition.X, 0);
+            }
+
+            ScrollControls(autoScrollPosition);
+            UpdateScrollbarsFromScrollPosition();
+        }
+
+        private void TouchHandlerPan(object sender, DevComponents.DotNetBar.Touch.GestureEventArgs e)
+        {
+            if (_TouchDrag)
+            {
+                Point autoScrollPosition = _ScrollPosition;
+                Size autoScrollMinSize = GetAutoScrollMinSize();
+                int offset = (e.Location.X - _TouchStartLocation.X);
+                int offsetChange = offset + _TouchStartScrollPosition.X;
+
+                bool overflowH = false;
+
+                if (autoScrollMinSize.Width > 0)
+                {
+                    if (-offsetChange + MaximumReversePageOffset > autoScrollMinSize.Width)
+                    {
+                        autoScrollPosition.X = -(autoScrollMinSize.Width + MaximumReversePageOffset);
+                        overflowH = true;
+                    }
+                    else if (offsetChange > MaximumReversePageOffset)
+                    {
+                        autoScrollPosition.X = MaximumReversePageOffset;
+                        overflowH = true;
+                    }
+                    else
+                        autoScrollPosition.X = offsetChange;
+                }
+
+                // Y Scroll
+                bool overflowV = false;
+                if (autoScrollMinSize.Height > 0)
+                {
+                    offset = (e.Location.Y - _TouchStartLocation.Y);
+                    offsetChange = offset + _TouchStartScrollPosition.Y;
+
+                    if (-offsetChange + MaximumReversePageOffset > autoScrollMinSize.Height)
+                    {
+                        autoScrollPosition.Y = -(autoScrollMinSize.Height + MaximumReversePageOffset);
+                        overflowV = true;
+                    }
+                    else if (offsetChange > MaximumReversePageOffset)
+                    {
+                        autoScrollPosition.Y = MaximumReversePageOffset;
+                        overflowV = true;
+                    }
+                    else
+                        autoScrollPosition.Y = offsetChange;
+                }
+
+                if (_ScrollPosition != autoScrollPosition)
+                {
+                    ScrollControls(autoScrollPosition);
+                    Update();
+                }
+                if (overflowH && overflowV && e.IsInertia) EndTouchPan();
+
+
+                UpdateScrollbarsFromScrollPosition();
+                e.Handled = true;
+            }
+        }
+
+        private void UpdateScrollbarsFromScrollPosition()
+        {
+            if (_VScrollBar != null && _VScrollBar.Visible && _VScrollBar.Value != -_ScrollPosition.Y)
+                _VScrollBar.Value = Math.Min(_VScrollBar.Maximum, Math.Max(0, -_ScrollPosition.Y));
+            if (_HScrollBar != null && _HScrollBar.Visible && _HScrollBar.Value != -_ScrollPosition.X)
+                _HScrollBar.Value = Math.Min(_HScrollBar.Maximum, Math.Max(0, -_ScrollPosition.X));
+        }
+        #endregion
+    }
+
+    #region HitTestInsertInfo
+    public class HitTestInsertInfo
+    {
+        public LayoutGroup Parent = null;
+        public int InsertIndex = -1;
+        public Rectangle InsertMarkerBounds = Rectangle.Empty;
+    }
+    #endregion
+
+    #region EmptyLayoutManager
+    internal class EmptyLayoutManager : LayoutEngine
+    {
+        public override void InitLayout(object child, BoundsSpecified specified)
+        {
+
+        }
+
+        public override bool Layout(object container, LayoutEventArgs layoutEventArgs)
+        {
+            return true;
+        }
+    }
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/LayoutControl.ico b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/LayoutControl.ico
new file mode 100644
index 00000000..33ca4ed9
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/LayoutControl.ico differ
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/LayoutControlItem.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/LayoutControlItem.cs
new file mode 100644
index 00000000..b6023e1d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/LayoutControlItem.cs	
@@ -0,0 +1,484 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows.Forms;
+using System.ComponentModel;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Layout
+{
+    /// <summary>
+    /// Represents layout item which hosts a Windows Forms Control.
+    /// </summary>
+    [Designer("DevComponents.DotNetBar.Layout.Design.LayoutControlItemDesigner, DevComponents.DotNetBar.Layout.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=7eb7c3a35b91de04")]
+    public class LayoutControlItem : LayoutItemBase
+    {
+        #region Constructor
+        protected override void OnDispose()
+        {
+            UnhookControlEventHandlers(_Control);
+            base.OnDispose();
+        }
+        #endregion
+
+        #region Implementation
+        protected override void OnUpdateLayout()
+        {
+            base.OnUpdateLayout();
+
+            if (_Control != null)
+            {
+                Rectangle bounds = Helpers.Deflate(this.Bounds, this.Padding);
+                Rectangle r = bounds;
+                if (this.TextVisible && !string.IsNullOrEmpty(this.Text))
+                {
+                    Rectangle actualTextBounds = this.ActualTextBounds;
+                    if (IsImageVisible)
+                        actualTextBounds = Rectangle.Union(actualTextBounds, this.ActualImageBounds);
+                    if (this.TextPosition == eLayoutPosition.Default || this.TextPosition == eLayoutPosition.Left)
+                    {
+                        r.X = actualTextBounds.Right + _TextControlSpacing;
+                        r.Width = bounds.Right - r.X;
+                    }
+                    else if (this.TextPosition == eLayoutPosition.Top)
+                    {
+                        r.Y = actualTextBounds.Bottom + _TextControlSpacing;
+                        r.Height = bounds.Bottom - r.Y;
+                    }
+                    else if (this.TextPosition == eLayoutPosition.Bottom)
+                    {
+                        r.Height = actualTextBounds.Y - bounds.Y - _TextControlSpacing;
+                    }
+                    else if (this.TextPosition == eLayoutPosition.Right)
+                    {
+                        r.Width = actualTextBounds.X - r.X - _TextControlSpacing;
+                    }
+                }
+                if (_Control.Margin.Horizontal > 0 || _Control.Margin.Vertical > 0)
+                {
+                    r.X += _Control.Margin.Left;
+                    r.Width -= _Control.Margin.Horizontal;
+                    r.Y += _Control.Margin.Top;
+                    r.Height -= _Control.Margin.Vertical;
+                }
+
+                if (!_ControlSize.IsEmpty && _Control.Dock != DockStyle.Fill && (_ControlSize.Width > 0 && r.Width > _ControlSize.Width) || (_ControlSize.Height > 0 && r.Height > _ControlSize.Height))
+                {
+                    Size controlSize = new Size(_ControlSize.Width > 0 ? Math.Min(r.Width, _ControlSize.Width) : r.Width,
+                            _ControlSize.Height > 0 ? Math.Min(r.Height, _ControlSize.Height) : r.Height);
+                    if (_Control.Dock != DockStyle.None)
+                    {
+                        if (_Control.Dock == DockStyle.Left)
+                            r = new Rectangle(r.X, r.Y, controlSize.Width, r.Height);
+                        else if (_Control.Dock == DockStyle.Right)
+                            r = new Rectangle(r.Right - controlSize.Width, r.Y, controlSize.Width, r.Height);
+                        else if (_Control.Dock == DockStyle.Top)
+                            r = new Rectangle(r.X, r.Y, r.Width, controlSize.Height);
+                        else if (_Control.Dock == DockStyle.Bottom)
+                            r = new Rectangle(r.X, r.Bottom - controlSize.Height, r.Width, controlSize.Height);
+                    }
+                    else
+                    {
+                        if (_Control.Anchor == (AnchorStyles.Left | AnchorStyles.Right | AnchorStyles.Top | AnchorStyles.Bottom))
+                        {
+                            // Center into the bounding box
+                            r.X += (r.Width - controlSize.Width) / 2;
+                            r.Y += (r.Height - controlSize.Height) / 2;
+                            r.Size = controlSize;
+                        }
+                        else if (_Control.Anchor == (AnchorStyles.Left | AnchorStyles.Top))
+                        {
+                            r.Size = controlSize;
+                        }
+                        else if (_Control.Anchor == (AnchorStyles.Left | AnchorStyles.Top | AnchorStyles.Right))
+                        {
+                            r.X += (r.Width - controlSize.Width) / 2;
+                            r.Size = controlSize;
+                        }
+                        else if (_Control.Anchor == (AnchorStyles.Left | AnchorStyles.Top | AnchorStyles.Bottom))
+                        {
+                            r.Y += (r.Height - controlSize.Height) / 2;
+                            r.Size = controlSize;
+                        }
+                        else if (_Control.Anchor == (AnchorStyles.Left | AnchorStyles.Bottom))
+                        {
+                            r.Y = r.Bottom - controlSize.Height;
+                            r.Size = controlSize;
+                        }
+                        else if (_Control.Anchor == (AnchorStyles.Left | AnchorStyles.Bottom | AnchorStyles.Right))
+                        {
+                            r.Y = r.Bottom - controlSize.Height;
+                            r.X += (r.Width - controlSize.Width) / 2;
+                            r.Size = controlSize;
+                        }
+                        else if (_Control.Anchor == (AnchorStyles.Right | AnchorStyles.Top))
+                        {
+                            r.X = r.Right - controlSize.Width;
+                            r.Size = controlSize;
+                        }
+                        else if (_Control.Anchor == (AnchorStyles.Right | AnchorStyles.Bottom))
+                        {
+                            r.X = r.Right - controlSize.Width;
+                            r.Y = r.Bottom - controlSize.Height;
+                            r.Size = controlSize;
+                        }
+                        else if (_Control.Anchor == (AnchorStyles.Right | AnchorStyles.Bottom | AnchorStyles.Top))
+                        {
+                            r.X = r.Right - controlSize.Width;
+                            r.Y += (r.Height - controlSize.Height) / 2;
+                            r.Size = controlSize;
+                        }
+                        else
+                            r.Size = controlSize;
+                    }
+                }
+
+                _Control.Bounds = r;
+            }
+        }
+
+        protected override void OnPaintBackground(PaintContext context)
+        {
+            base.OnPaintBackground(context);
+
+            if (IsKeyboardFocusWithin && context.FocusStyle != null)
+            {
+                DrawingHelpers.PaintStyle(context.Graphics, context.FocusStyle, this.Bounds);
+            }
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override void ScaleItem(SizeF factor)
+        {
+            base.ScaleItem(factor);
+
+            bool widthChanged = factor.Width != 1f;
+            bool heightChanged = factor.Height != 1f;
+
+            if (!_ControlSize.IsEmpty && (widthChanged || heightChanged))
+            {
+                Size newSize = new Size();
+                if (widthChanged)
+                    newSize.Width = (int)(_ControlSize.Width * factor.Width);
+                else
+                    newSize.Width = _ControlSize.Width;
+                if (heightChanged)
+                    newSize.Height = (int)(_ControlSize.Height * factor.Height);
+                else
+                    newSize.Height = _ControlSize.Height;
+                ControlSize = newSize;
+            }
+        }
+
+        internal override void UpdateScrollBounds(int xScroll, int yScroll, bool moveControls)
+        {
+            base.UpdateScrollBounds(xScroll, yScroll, moveControls);
+            if (moveControls && _Control != null)
+                _Control.Location = new Point(_Control.Location.X + xScroll, _Control.Location.Y + yScroll);
+        }
+
+        protected override Size OnMeasureText(LayoutContext c)
+        {
+            if (_Control is TextBoxBase && this.TextPosition == eLayoutPosition.Default)
+            {
+                TextBoxBase textBox = (TextBoxBase)_Control;
+                int textBaseLine = Helpers.GetTextBaseline(_Control, ContentAlignment.TopLeft);
+                if (textBox is DevComponents.DotNetBar.Controls.TextBoxX)
+                    textBaseLine += 3;
+                else if (textBox.BorderStyle == BorderStyle.FixedSingle || textBox.BorderStyle == BorderStyle.None)
+                    textBaseLine += 2;
+                else if (textBox.BorderStyle == BorderStyle.Fixed3D)
+                    textBaseLine += 3;
+                _ControlTextBaseline = textBaseLine;
+            }
+            else
+                _ControlTextBaseline = 0;
+
+            return base.OnMeasureText(c);
+        }
+
+        internal override int TextBaseline
+        {
+            get
+            {
+                if (_ControlTextBaseline > 0 && _ControlTextBaseline > base.TextBaseline)
+                    return _ControlTextBaseline;
+                return base.TextBaseline;
+            }
+            set
+            {
+                base.TextBaseline = value;
+            }
+        }
+
+        private int _ControlTextBaseline = 0;
+
+        private Control _Control = null;
+        /// <summary>
+        /// Gets or sets the control managed by layout item.
+        /// </summary>
+        [DefaultValue(null), Category("Data"), Description("Indicates control managed by layout item.")]
+        public Control Control
+        {
+            get { return _Control; }
+            set
+            {
+                if (value != _Control)
+                {
+                    Control oldValue = _Control;
+                    _Control = value;
+                    OnControlChanged(oldValue, value);
+                }
+            }
+        }
+        private void UnhookControlEventHandlers(Control control)
+        {
+            if (control == null) return;
+            control.Enter -= ControlEnter;
+            control.Leave -= ControlLeave;
+            control.MouseHover -= ControlMouseHover;
+            control.MouseDown -= ControlMouseDown;
+            control.MouseMove -= ControlMouseMove;
+            control.MouseLeave -= ControlMouseLeave;
+        }
+        /// <summary>
+        /// Called when Control property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnControlChanged(Control oldValue, Control newValue)
+        {
+            if (oldValue != null)
+            {
+                UnhookControlEventHandlers(oldValue);
+            }
+            OnPropertyChanged(new PropertyChangedEventArgs("Control"));
+            if (_Control != null)
+            {
+                _Control.Enter += ControlEnter;
+                _Control.Leave += ControlLeave;
+                _Control.MouseHover += ControlMouseHover;
+                _Control.MouseDown += ControlMouseDown;
+                _Control.MouseMove += ControlMouseMove;
+                _Control.MouseLeave += ControlMouseLeave;
+
+                if (_Control.Visible != this.Visible)
+                    _Control.Visible = this.Visible;
+            }
+            InvalidateLayout();
+        }
+        private Point _MouseTooltipLocation = Point.Empty;
+        void ControlMouseLeave(object sender, EventArgs e)
+        {
+            _MouseTooltipLocation = Point.Empty;
+            if (ToolTipVisible)
+                HideToolTip();
+        }
+
+        void ControlMouseMove(object sender, MouseEventArgs e)
+        {
+            if (!_MouseTooltipLocation.IsEmpty && ToolTipVisible && (Math.Abs(_MouseTooltipLocation.X - e.X) > 1 || Math.Abs(_MouseTooltipLocation.Y - e.Y) > 1))
+                HideToolTip();
+        }
+
+        void ControlMouseDown(object sender, MouseEventArgs e)
+        {
+            if (ToolTipVisible)
+                HideToolTip();
+        }
+
+        void ControlMouseHover(object sender, EventArgs e)
+        {
+            if (_EnableControlTooltip)
+            {
+                ShowToolTip();
+                _MouseTooltipLocation = _Control.PointToClient(Control.MousePosition);
+            }
+        }
+
+        private void ControlLeave(object sender, EventArgs e)
+        {
+            IsKeyboardFocusWithin = false;
+        }
+
+        private void ControlEnter(object sender, EventArgs e)
+        {
+            IsKeyboardFocusWithin = true;
+        }
+
+        private bool _EnableControlTooltip = true;
+        /// <summary>
+        /// Indicates whether Tooltip for the item is shown when mouse is over the control.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether Tooltip for the item is shown when mouse is over the control.")]
+        public bool EnableControlTooltip
+        {
+            get { return _EnableControlTooltip; }
+            set
+            {
+                if (value != _EnableControlTooltip)
+                {
+                    bool oldValue = _EnableControlTooltip;
+                    _EnableControlTooltip = value;
+                    OnEnableControlTooltipChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when EnableControlTooltip property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnEnableControlTooltipChanged(bool oldValue, bool newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("EnableControlTooltip"));
+        }
+
+        private int _TextControlSpacing = 3;
+        /// <summary>
+        /// Indicates spacing between text and the control.
+        /// </summary>
+        [DefaultValue(3), Category("Appearance"), Description("Indicates spacing between text and the control."), RefreshProperties(RefreshProperties.All)]
+        public int TextControlSpacing
+        {
+            get { return _TextControlSpacing; }
+            set
+            {
+                if (value != _TextControlSpacing)
+                {
+                    int oldValue = _TextControlSpacing;
+                    _TextControlSpacing = value;
+                    OnTextControlSpacingChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when TextControlSpacing property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnTextControlSpacingChanged(int oldValue, int newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("TextControlSpacing"));
+            InvalidateLayout();
+        }
+
+        /// <summary>
+        /// Processes accelerator key for the item.
+        /// </summary>
+        /// <param name="charCode"></param>
+        internal override bool ProcessMnemonic(char charCode)
+        {
+            if (MnemonicsEnabled && _Control != null && _Control.CanSelect)
+            {
+                _Control.Select();
+                return true;
+            }
+            return false;
+        }
+
+        private Size _ControlSize = Size.Empty;
+        /// <summary>
+        /// Indicates suggested control size which is used only if calculated layout size for the control exceeds the size specified here. Either width or height may be set or both.
+        /// ControlSize property can be used in conjuction with Dock and Anchor properties on the Control. When available space for the Control
+        /// exceeds ControlSize the Dock and Anchor properties will indicate the control position inside of the control box.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates suggested control size which is used only if calculated layout size for the control exceeds the size specified here. Either width or height may be set or both.")]
+        public Size ControlSize
+        {
+            get { return _ControlSize; }
+            set
+            {
+                if (value != _ControlSize)
+                {
+                    Size oldValue = _ControlSize;
+                    _ControlSize = value;
+                    OnControlSizeChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when ControlSize property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnControlSizeChanged(Size oldValue, Size newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("ControlSize"));
+            InvalidateLayout();
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeControlSize()
+        {
+            return !_ControlSize.IsEmpty;
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetControlSize()
+        {
+            ControlSize = Size.Empty;
+        }
+
+        private bool _AutoSetTabIndex = true;
+        /// <summary>
+        /// Indicates whether Control TabIndex is automatically set based on the position of the item inside of the layout.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether Control TabIndex is automatically set based on the position of the item inside of the layout.")]
+        public bool AutoSetTabIndex
+        {
+            get { return _AutoSetTabIndex; }
+            set
+            {
+                if (value != _AutoSetTabIndex)
+                {
+                    bool oldValue = _AutoSetTabIndex;
+                    _AutoSetTabIndex = value;
+                    OnAutoSetTabIndexChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when AutoSetTabIndex property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnAutoSetTabIndexChanged(bool oldValue, bool newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("AutoSetTabIndex"));
+
+        }
+
+        protected override void OnAbsoluteIndexChanged(int oldValue, int newValue)
+        {
+            if (_Control != null && _AutoSetTabIndex) _Control.TabIndex = newValue;
+
+            base.OnAbsoluteIndexChanged(oldValue, newValue);
+        }
+
+        private bool _FocusVisualStyleEnabled = true;
+        /// <summary>
+        /// Indicates whether LayoutControl.FocusStyle is used to paint background of item when control has input focus.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether LayoutControl.FocusStyle is used to paint background of item when control has input focus.")]
+        public bool FocusVisualStyleEnabled
+        {
+            get { return _FocusVisualStyleEnabled; }
+            set
+            {
+                if (_FocusVisualStyleEnabled == value)
+                    return;
+                _FocusVisualStyleEnabled = value;
+                if (this.IsKeyboardFocusWithin)
+                    this.Invalidate();
+                OnPropertyChanged(new PropertyChangedEventArgs("FocusVisualStyleEnabled"));
+            }
+        }
+
+        protected override void OnVisibleChanged(bool oldValue, bool newValue)
+        {
+            if (_Control != null)
+                _Control.Visible = newValue;
+            base.OnVisibleChanged(oldValue, newValue);
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/LayoutGroup.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/LayoutGroup.cs
new file mode 100644
index 00000000..139001fc
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/LayoutGroup.cs	
@@ -0,0 +1,805 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Layout
+{
+    [Designer("DevComponents.DotNetBar.Layout.Design.LayoutGroupDesigner, DevComponents.DotNetBar.Layout.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=7eb7c3a35b91de04")]
+    public class LayoutGroup : LayoutItemBase
+    {
+        #region Constructor
+        /// <summary>
+        /// Initializes a new instance of the LayoutGroup class.
+        /// </summary>
+        public LayoutGroup()
+        {
+            _CaptionStyle = new SimpleStyle();
+            _CaptionStyle.PropertyChanged += CaptionStylePropertyChanged;
+
+            _Items = new LayoutItemCollection();
+            _Items.SetParentItem(this);
+        }
+
+        protected override void OnDispose()
+        {
+            _CaptionStyle.PropertyChanged -= CaptionStylePropertyChanged;
+            base.OnDispose();
+        }
+        #endregion
+
+        #region Implementation
+        private Rectangle _ActualBounds = Rectangle.Empty;
+        /// <summary>
+        /// Gets actual bounds of elements inside of group. The actual bounds may differ from requested layout bounds due to minium
+        /// size constraint.
+        /// </summary>
+        internal Rectangle ActualBounds
+        {
+            get
+            {
+                return _ActualBounds;
+            }
+            set
+            {
+                _ActualBounds = value;
+            }
+        }
+        protected override void OnPaint(PaintContext context)
+        {
+            OnPaintBackground(context);
+
+            if (!_CaptionBounds.IsEmpty)
+            {
+                bool isImageVisible = this.IsImageVisible;
+                Graphics g = context.Graphics;
+                //context.Graphics.FillRectangle(Brushes.Aqua, _CaptionBounds);
+
+                Color textColor = context.LabelTextColor;
+                bool dispose = false;
+                Brush textBrush = context.LabelTextBrush;
+
+                if (_Appearance == eGroupAppearance.Panel)
+                {
+                    textColor = PaintPanelCaption(context);
+                    textBrush = new SolidBrush(textColor);
+                    dispose = true;
+                }
+                else if (_Appearance == eGroupAppearance.GroupPanel)
+                {
+                    textColor = PaintGroupPanelCaption(context);
+                    textBrush = new SolidBrush(textColor);
+                    dispose = true;
+                }
+                else if (_CaptionStyle.IsPainted)
+                {
+                    DrawingHelpers.PaintStyle(g, _CaptionStyle, _CaptionBounds);
+                }
+                if (!_CaptionStyle.TextColor.IsEmpty)
+                {
+                    textColor = _CaptionStyle.TextColor;
+                    textBrush = new SolidBrush(textColor);
+                    dispose = true;
+                }
+                if (this.TextPosition == eLayoutPosition.Top || this.TextPosition == eLayoutPosition.Bottom)
+                {
+                    PaintText(context, isImageVisible, textColor, ActualTextBounds, textBrush);
+                }
+                else
+                {
+                    // Rotate rendering
+                    g.RotateTransform(-90);
+                    //Rectangle r = new Rectangle(_CaptionBounds.Top, -_CaptionBounds.Right, _CaptionBounds.Height, _CaptionBounds.Width);
+                    //Rectangle r = new Rectangle(-_CaptionBounds.Bottom, _CaptionBounds.X, _CaptionBounds.Height, _CaptionBounds.Width);
+                    Rectangle r = new Rectangle(-ActualTextBounds.Bottom, ActualTextBounds.X, ActualTextBounds.Height, ActualTextBounds.Width);
+                    PaintText(context, isImageVisible, textColor, r, textBrush);
+                    g.ResetTransform();
+                }
+                if (dispose)
+                    textBrush.Dispose();
+
+                if (isImageVisible)
+                    PaintImage(context, textColor);
+            }
+
+            foreach (LayoutItemBase item in _Items)
+            {
+                if (!item.Visible) continue;
+                item.Paint(context);
+            }
+            //context.Graphics.DrawRectangle(Pens.Green, ActualBounds);
+        }
+        private Color PaintPanelCaption(PaintContext context)
+        {
+            Rectangle bounds = _CaptionBounds;
+            if (!this.CaptionStyle.Margin.IsEmpty)
+                bounds = Helpers.Deflate(bounds, this.CaptionStyle.Margin);
+            Graphics g = context.Graphics;
+            DevComponents.DotNetBar.Rendering.Office2007ColorTable table = ((DevComponents.DotNetBar.Rendering.Office2007Renderer)DevComponents.DotNetBar.Rendering.GlobalManager.Renderer).ColorTable;
+
+            Color border = table.LegacyColors.PanelBorder;
+            Color back1 = table.LegacyColors.PanelBackground;
+            Color back2 = table.LegacyColors.PanelBackground2;
+            Color textColor = table.LegacyColors.PanelText;
+            int backAngle = table.LegacyColors.PanelBackgroundGradientAngle;
+
+            PaintRectangle(bounds, g, border, back1, back2, backAngle);
+
+            return textColor;
+        }
+        private Color PaintGroupPanelCaption(PaintContext context)
+        {
+            Rectangle r = _CaptionBounds;
+            Graphics g = context.Graphics;
+            ElementStyleDisplayInfo info = new ElementStyleDisplayInfo(_GroupPanelStyle, g, r);
+            ElementStyleDisplay.Paint(info);
+            
+            return _GroupPanelStyle.TextColor;
+        }
+        const int CaptionEdgeDistance = 4;
+        private Rectangle GetGroupPanelCaptionBounds(Rectangle r)
+        {
+            eLayoutPosition textPosition = TextPosition;
+            eTextAlignment textAlignment = TextAlignment;
+            Size imageSize = GetImageSize();
+            if (!imageSize.IsEmpty) imageSize.Width += this.ImageTextSpacing;
+            int captionWidth = this.RealTextSize.Width + TextPadding.Horizontal + imageSize.Width;
+            if (textPosition == eLayoutPosition.Top || textPosition == eLayoutPosition.Bottom)
+            {
+                if (textAlignment == eTextAlignment.Left || textAlignment == eTextAlignment.Default)
+                {
+                    r.Width = captionWidth;
+                    r.X += CaptionEdgeDistance;
+                }
+                else if (textAlignment == eTextAlignment.Right)
+                {
+                    r.X = r.Right - (captionWidth) - CaptionEdgeDistance;
+                    r.Width = captionWidth;
+                }
+                else if (textAlignment == eTextAlignment.Center)
+                {
+                    r.X += (r.Width - captionWidth) / 2;
+                    r.Width = captionWidth;
+                }
+            }
+            else // Left/Right
+            {
+                if (textAlignment == eTextAlignment.Left || textAlignment == eTextAlignment.Default)
+                {
+                    r.Y = r.Bottom - captionWidth - CaptionEdgeDistance;
+                    r.Height = captionWidth;
+
+                }
+                else if (textAlignment == eTextAlignment.Right)
+                {
+                    r.Height = captionWidth;
+                    r.Y += CaptionEdgeDistance;
+                }
+                else if (textAlignment == eTextAlignment.Center)
+                {
+                    r.Y += (r.Height - captionWidth) / 2;
+                    r.Height = captionWidth;
+                }
+            }
+
+            return r;
+        }
+
+        /// <summary>
+        /// Paints the background of the item.
+        /// </summary>
+        /// <param name="context"></param>
+        protected override void OnPaintBackground(PaintContext context)
+        {
+            if (_Appearance == eGroupAppearance.Panel)
+                PaintPanelBackground(context);
+            else if (_Appearance == eGroupAppearance.GroupPanel)
+                PaintGroupPanelBackground(context);
+            else
+                base.OnPaintBackground(context);
+        }
+
+        private void PaintPanelBackground(PaintContext context)
+        {
+            Rectangle bounds = this.Bounds;
+            if (!this.Style.Margin.IsEmpty)
+                bounds = Helpers.Deflate(bounds, this.Style.Margin);
+            Graphics g = context.Graphics;
+            DevComponents.DotNetBar.Rendering.Office2007ColorTable table = ((DevComponents.DotNetBar.Rendering.Office2007Renderer)DevComponents.DotNetBar.Rendering.GlobalManager.Renderer).ColorTable;
+
+            Color border = table.LegacyColors.PanelBorder;
+            Color back1 = table.LegacyColors.PanelBackground;
+            Color back2 = table.LegacyColors.PanelBackground2;
+            int backAngle = table.LegacyColors.PanelBackgroundGradientAngle;
+
+            PaintRectangle(bounds, g, border, back1, back2, backAngle);
+        }
+        private static void PaintRectangle(Rectangle bounds, Graphics g, Color border, Color back1, Color back2, int backAngle)
+        {
+            if (bounds.Width <= 0 || bounds.Height <= 0)
+                return;
+
+            if (back2.IsEmpty)
+            {
+                if (!back1.IsEmpty)
+                {
+                    using (SolidBrush brush = new SolidBrush(back1))
+                        g.FillRectangle(brush, bounds);
+                }
+            }
+            else
+            {
+                using (System.Drawing.Drawing2D.LinearGradientBrush brush = new System.Drawing.Drawing2D.LinearGradientBrush(bounds, back1, back2, backAngle))
+                    g.FillRectangle(brush, bounds);
+            }
+            if (!border.IsEmpty)
+            {
+                Rectangle borderBounds = bounds;
+                borderBounds.Width--; borderBounds.Height--;
+                using (Pen pen = new Pen(border))
+                    g.DrawRectangle(pen, borderBounds);
+            }
+        }
+        private ElementStyle _GroupPanelStyle = null;
+        private void PaintGroupPanelBackground(PaintContext context)
+        {
+            InitializeGroupPanelStyle();
+            DevComponents.DotNetBar.Rendering.Office2007ColorTable table = ((DevComponents.DotNetBar.Rendering.Office2007Renderer)DevComponents.DotNetBar.Rendering.GlobalManager.Renderer).ColorTable;
+            _GroupPanelStyle.SetColorScheme(table.LegacyColors);
+            Rectangle bounds = this.Bounds;
+            if (!_CaptionBounds.IsEmpty)
+            {
+                eLayoutPosition tp = this.TextPosition;
+                if (tp == eLayoutPosition.Top)
+                {
+                    bounds.Y += _CaptionBounds.Height / 2;
+                    bounds.Height -= _CaptionBounds.Height / 2;
+                }
+                else if (tp == eLayoutPosition.Bottom)
+                    bounds.Height -= _CaptionBounds.Height / 2;
+                else if (tp == eLayoutPosition.Left || tp == eLayoutPosition.Default)
+                {
+                    bounds.X += _CaptionBounds.Width / 2;
+                    bounds.Width -= _CaptionBounds.Width / 2;
+                }
+                else // Right
+                    bounds.Width -= _CaptionBounds.Width / 2;
+            }
+            if (!this.Style.Margin.IsEmpty)
+                bounds = Helpers.Deflate(bounds, this.Style.Margin);
+            Graphics g = context.Graphics;
+            ElementStyleDisplayInfo info = new ElementStyleDisplayInfo(_GroupPanelStyle, g, bounds);
+            ElementStyleDisplay.Paint(info);
+        }
+        private void InitializeGroupPanelStyle()
+        {
+            if (_GroupPanelStyle != null) return;
+            _GroupPanelStyle = new ElementStyle();
+            _GroupPanelStyle.BackColorSchemePart = eColorSchemePart.PanelBackground;
+            _GroupPanelStyle.BackColor2SchemePart = eColorSchemePart.PanelBackground2;
+            _GroupPanelStyle.BorderColorSchemePart = eColorSchemePart.PanelBorder;
+            _GroupPanelStyle.BackColorGradientAngle = 90;
+            _GroupPanelStyle.CornerDiameter = 4;
+            _GroupPanelStyle.BorderWidth = 1;
+            _GroupPanelStyle.Border = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            _GroupPanelStyle.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
+            _GroupPanelStyle.TextColorSchemePart = eColorSchemePart.PanelText;
+        }
+        protected override void OnUpdateLayout()
+        {
+            base.OnUpdateLayout();
+        }
+
+        private Rectangle _ContentBounds = Rectangle.Empty;
+        private ItemLayout _Layout = new ItemLayout();
+        /// <summary>
+        /// Performs group layout.
+        /// </summary>
+        /// <param name="context">Layout context information.</param>
+        public void Layout(LayoutContext context)
+        {
+            Rectangle r = this.Bounds;
+
+            // Calculate text-position
+            r = LayoutGroupCaption(context, r);
+
+            if (!_IsRootGroup)
+                r = Helpers.Deflate(r, this.Padding);
+            _ContentBounds = r;
+            _Layout.Layout(this, r, context);
+        }
+
+        private int _CaptionHeight = 0;
+        /// <summary>
+        /// Indicates explicit caption height in pixels.
+        /// </summary>
+        [DefaultValue(0), Category("Appearance"), Description("Indicates caption height in pixels.")]
+        public int CaptionHeight
+        {
+            get { return _CaptionHeight; }
+            set
+            {
+                if (value != _CaptionHeight)
+                {
+                    int oldValue = _CaptionHeight;
+                    _CaptionHeight = value;
+                    OnCaptionHeightChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when CaptionHeight property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnCaptionHeightChanged(int oldValue, int newValue)
+        {
+            this.InvalidateLayout();
+            OnPropertyChanged(new PropertyChangedEventArgs("CaptionHeight"));
+        }
+
+        protected override Font GetTextFont(Font defaultFont)
+        {
+            Font font = defaultFont;
+            if (_CaptionStyle.Font != null)
+                font = _CaptionStyle.Font;
+            return font;
+        }
+        /// <summary>
+        /// Updates the layout of the text inside of item.
+        /// </summary>
+        protected override void UpdateTextBounds()
+        {
+            if (_CaptionBounds.IsEmpty) return;
+
+            Rectangle actualTextBounds = Helpers.Deflate(_CaptionBounds, this.TextPadding);
+            Rectangle actualImageBounds = Rectangle.Empty;
+            bool isImageVisible = IsImageVisible;
+            Size imageSize = Size.Empty;
+            if (isImageVisible)
+                imageSize = GetImageSize();
+
+            eTextAlignment textAlignment = this.TextAlignment;
+            Size realTextSize = this.RealTextSize;
+
+            if (isImageVisible)
+            {
+                eLayoutPosition imagePosition = ImagePosition;
+                int imageTextSpacing = ImageTextSpacing;
+
+                if (TextPosition == eLayoutPosition.Top || TextPosition == eLayoutPosition.Bottom)
+                {
+                    if (imagePosition == eLayoutPosition.Default || imagePosition == eLayoutPosition.Right)
+                    {
+                        if (textAlignment == eTextAlignment.Right)
+                            actualImageBounds = new Rectangle(actualTextBounds.Right - imageSize.Width - imageTextSpacing, actualTextBounds.Y + (actualTextBounds.Height - imageSize.Height) / 2, imageSize.Width, imageSize.Height);
+                        else if (textAlignment == eTextAlignment.Center)
+                        {
+                            if (Appearance == eGroupAppearance.GroupPanel)
+                            {
+                                actualImageBounds = new Rectangle(actualTextBounds.Right - (imageSize.Width + CaptionEdgeDistance), actualTextBounds.Y + (actualTextBounds.Height - imageSize.Height) / 2, imageSize.Width, imageSize.Height);
+                                actualTextBounds.Width = realTextSize.Width;
+                            }
+                            else
+                                actualImageBounds = new Rectangle(actualTextBounds.X + actualTextBounds.Width / 2 + realTextSize.Width / 2 + this.ImageTextSpacing, actualTextBounds.Y + (actualTextBounds.Height - imageSize.Height) / 2, imageSize.Width, imageSize.Height);
+                        }
+                        else
+                        {
+                            actualImageBounds = new Rectangle(actualTextBounds.X + imageTextSpacing + realTextSize.Width, actualTextBounds.Y + (actualTextBounds.Height - imageSize.Height) / 2, imageSize.Width, imageSize.Height);
+                            if (Appearance == eGroupAppearance.GroupPanel)
+                                actualImageBounds.X -= CaptionEdgeDistance;
+                        }
+                    }
+                    else if (imagePosition == eLayoutPosition.Left)
+                    {
+                        if (textAlignment == eTextAlignment.Right)
+                        {
+                            actualImageBounds = new Rectangle(actualTextBounds.Right - (realTextSize.Width + imageSize.Width + imageTextSpacing), actualTextBounds.Y + (actualTextBounds.Height - imageSize.Height) / 2, imageSize.Width, imageSize.Height);
+                            if (Appearance == eGroupAppearance.GroupPanel)
+                                actualImageBounds.X += CaptionEdgeDistance;
+                        }
+                        else if (textAlignment == eTextAlignment.Center)
+                        {
+                            if (Appearance == eGroupAppearance.GroupPanel)
+                            {
+                                actualImageBounds = new Rectangle(actualTextBounds.X + CaptionEdgeDistance, actualTextBounds.Y + (actualTextBounds.Height - imageSize.Height) / 2, imageSize.Width, imageSize.Height);
+                                actualTextBounds.X = actualImageBounds.Right;
+                                actualTextBounds.Width = realTextSize.Width;
+                            }
+                            else
+                                actualImageBounds = new Rectangle(actualTextBounds.X + actualTextBounds.Width / 2 - (realTextSize.Width / 2 + this.ImageTextSpacing + imageSize.Width), actualTextBounds.Y + (actualTextBounds.Height - imageSize.Height) / 2, imageSize.Width, imageSize.Height);
+                        }
+                        else
+                        {
+                            actualImageBounds = new Rectangle(actualTextBounds.X, actualTextBounds.Y + (actualTextBounds.Height - imageSize.Height) / 2, imageSize.Width, imageSize.Height);
+                            actualTextBounds.X += actualImageBounds.Width + imageTextSpacing;
+                            actualTextBounds.Width -= actualImageBounds.Width + imageTextSpacing;
+                        }
+                    }
+                    else if (imagePosition == eLayoutPosition.Top)
+                    {
+                        actualImageBounds = new Rectangle(actualTextBounds.X + (actualTextBounds.Width - imageSize.Width) / 2,
+                                                 actualTextBounds.Y - (imageSize.Height + imageTextSpacing),
+                                                 imageSize.Width,
+                                                 imageSize.Height);
+                    }
+                    else if (imagePosition == eLayoutPosition.Bottom)
+                    {
+                        actualImageBounds = new Rectangle(actualTextBounds.X + (actualTextBounds.Width - imageSize.Width) / 2,
+                                                 actualTextBounds.Bottom + imageTextSpacing,
+                                                 imageSize.Width,
+                                                 imageSize.Height);
+                    }
+                }
+                else
+                {
+                    if (imagePosition == eLayoutPosition.Default || imagePosition == eLayoutPosition.Right)
+                    {
+                        if (textAlignment == eTextAlignment.Right)
+                        {
+                            actualImageBounds = new Rectangle(actualTextBounds.X + (actualTextBounds.Width - imageSize.Width) / 2, actualTextBounds.Y + imageTextSpacing, imageSize.Width, imageSize.Height);
+                            actualTextBounds.Y += imageTextSpacing;
+                            actualImageBounds.Height -= imageTextSpacing;
+                            if (Appearance == eGroupAppearance.GroupPanel)
+                            {
+                                actualTextBounds.Y = actualImageBounds.Bottom - 10;
+                                actualTextBounds.Height = (_CaptionBounds.Bottom - actualTextBounds.Y)+4;
+                            }
+                        }
+                        else if (textAlignment == eTextAlignment.Center)
+                        {
+                            if (Appearance == eGroupAppearance.GroupPanel)
+                            {
+                                actualImageBounds = new Rectangle(actualTextBounds.X + (actualTextBounds.Width - imageSize.Width) / 2, actualTextBounds.Y + CaptionEdgeDistance, imageSize.Width, imageSize.Height);
+                                actualTextBounds.Y = actualImageBounds.Bottom;
+                                actualTextBounds.Height = _CaptionBounds.Bottom - actualTextBounds.Y;
+                            }
+                            else
+                                actualImageBounds = new Rectangle(actualTextBounds.X + (actualTextBounds.Width - imageSize.Width) / 2, actualTextBounds.Y + actualTextBounds.Height / 2 - (realTextSize.Width / 2 + imageTextSpacing + imageSize.Height), imageSize.Width, imageSize.Height);
+                        }
+                        else
+                        {
+                            actualImageBounds = new Rectangle(actualTextBounds.X + (actualTextBounds.Width - imageSize.Width) / 2, actualTextBounds.Bottom - (realTextSize.Width + imageTextSpacing + imageSize.Height), imageSize.Width, imageSize.Height);
+                            if (Appearance == eGroupAppearance.GroupPanel)
+                                actualImageBounds.Y += CaptionEdgeDistance;
+                        }
+                    }
+                    else if (imagePosition == eLayoutPosition.Left)
+                    {
+                        if (textAlignment == eTextAlignment.Right)
+                        {
+                            actualImageBounds = new Rectangle(actualTextBounds.X + (actualTextBounds.Width - imageSize.Width) / 2, actualTextBounds.Y + imageTextSpacing, imageSize.Width, imageSize.Height);
+                            actualTextBounds.Y += imageTextSpacing;
+                            actualImageBounds.Height -= imageTextSpacing;
+                            if (Appearance == eGroupAppearance.GroupPanel)
+                            {
+                                actualImageBounds = new Rectangle(actualTextBounds.X + (actualTextBounds.Width - imageSize.Width) / 2, actualTextBounds.Bottom - (CaptionEdgeDistance+imageSize.Width), imageSize.Width, imageSize.Height);
+                                actualTextBounds.Height = actualImageBounds.Y - _CaptionBounds.Y;
+                            }
+                        }
+                        else if (textAlignment == eTextAlignment.Center)
+                        {
+                            if (Appearance == eGroupAppearance.GroupPanel)
+                            {
+                                actualImageBounds = new Rectangle(actualTextBounds.X + (actualTextBounds.Width - imageSize.Width) / 2, actualTextBounds.Bottom - (imageSize.Height + CaptionEdgeDistance), imageSize.Width, imageSize.Height);
+                                actualTextBounds.Height -= realTextSize.Height;
+                            }
+                            else
+                                actualImageBounds = new Rectangle(actualTextBounds.X + (actualTextBounds.Width - imageSize.Width) / 2, actualTextBounds.Y + actualTextBounds.Height / 2 + realTextSize.Width / 2 + this.ImageTextSpacing, imageSize.Width, imageSize.Height);
+                        }
+                        else
+                        {
+                            actualImageBounds = new Rectangle(actualTextBounds.X + (actualTextBounds.Width - imageSize.Width) / 2, actualTextBounds.Bottom - imageSize.Height - imageTextSpacing, imageSize.Width, imageSize.Height);
+                            actualTextBounds.Height -= actualImageBounds.Height + imageTextSpacing;
+                        }
+                    }
+                    else if (imagePosition == eLayoutPosition.Top)
+                    {
+                        actualImageBounds = new Rectangle(actualTextBounds.X + imageTextSpacing,
+                                                 actualTextBounds.Y + (actualTextBounds.Height - imageSize.Height) / 2,
+                                                 imageSize.Width,
+                                                 imageSize.Height);
+                        actualTextBounds.X += imageSize.Width + imageTextSpacing;
+                        actualTextBounds.Width -= imageSize.Width + imageTextSpacing;
+                    }
+                    else if (imagePosition == eLayoutPosition.Bottom)
+                    {
+                        actualImageBounds = new Rectangle(actualTextBounds.Right - (imageSize.Width + imageTextSpacing),
+                                                 actualTextBounds.Y + (actualTextBounds.Height - imageSize.Height) / 2,
+                                                 imageSize.Width,
+                                                 imageSize.Height);
+                        actualTextBounds.Width -= imageSize.Width + imageTextSpacing;
+                    }
+                }
+            }
+
+            this.ActualTextBounds = actualTextBounds;
+            this.ActualImageBounds = actualImageBounds;
+        }
+        private Rectangle _CaptionBounds = Rectangle.Empty;
+        protected virtual Rectangle LayoutGroupCaption(LayoutContext context, Rectangle r)
+        {
+            _CaptionBounds = Rectangle.Empty;
+            if (string.IsNullOrEmpty(this.Text) || !this.TextVisible)
+                return r;
+
+            eLayoutPosition textPosition = this.TextPosition;
+
+            Size textSize = new Size();
+            if (_CaptionHeight > 0)
+            {
+                textSize.Width = r.Width;
+                textSize.Height = _CaptionHeight;
+            }
+            else
+            {
+                textSize = MeasureText(context);
+                if (IsImageVisible)
+                {
+                    Size imageSize = GetImageSize();
+                    textSize.Height = Math.Max(textSize.Height, imageSize.Height);
+                }
+            }
+
+            if (textPosition == eLayoutPosition.Top)
+            {
+                _CaptionBounds = new Rectangle(r.X, r.Y, r.Width, textSize.Height);
+                r.Y += _CaptionBounds.Height;
+                r.Height -= _CaptionBounds.Height;
+            }
+            else if (textPosition == eLayoutPosition.Bottom)
+            {
+                _CaptionBounds = new Rectangle(r.X, r.Bottom - textSize.Height, r.Width, textSize.Height);
+                r.Height -= _CaptionBounds.Height;
+            }
+            else if (textPosition == eLayoutPosition.Left || textPosition == eLayoutPosition.Default) // Text rotated to the side
+            {
+                _CaptionBounds = new Rectangle(r.X, r.Y, textSize.Height, r.Height);
+                r.X += _CaptionBounds.Width;
+                r.Width -= _CaptionBounds.Width;
+            }
+            else if (textPosition == eLayoutPosition.Right) // Text rotated to the side
+            {
+                _CaptionBounds = new Rectangle(r.Right - textSize.Height, r.Y, textSize.Height, r.Height);
+                r.Width -= _CaptionBounds.Width;
+            }
+
+            if (Appearance == eGroupAppearance.GroupPanel)
+                _CaptionBounds = GetGroupPanelCaptionBounds(_CaptionBounds);
+
+            UpdateTextBounds();
+
+            //if (Appearance == eGroupAppearance.GroupPanel && !ActualImageBounds.IsEmpty)
+            //{
+            //    if (textPosition == eLayoutPosition.Top || textPosition == eLayoutPosition.Bottom || textPosition == eLayoutPosition.Default)
+            //    {
+            //        if (TextAlignment != eTextAlignment.Center)
+            //            ActualImageBounds = new Rectangle(ActualImageBounds.X + CaptionEdgeDistance, ActualImageBounds.Y, ActualImageBounds.Width, ActualImageBounds.Height);
+            //    }
+            //    else
+            //    {
+            //        ActualImageBounds = new Rectangle(ActualImageBounds.X, ActualImageBounds.Y + CaptionEdgeDistance, ActualImageBounds.Width, ActualImageBounds.Height);
+            //    }
+            //}
+
+            return r;
+        }
+
+        private LayoutItemCollection _Items = null;
+        /// <summary>
+        /// Gets the collection of layout items objects assigned to the current group. 
+        /// </summary>
+        [Browsable(true), Category("Items"), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public LayoutItemCollection Items
+        {
+            get
+            {
+                return _Items;
+            }
+        }
+
+        //private eLayoutType _LayoutType = eLayoutType.Horizontal;
+        ///// <summary>
+        ///// Indicates layout type performed by the group.
+        ///// </summary>
+        //[DefaultValue(eLayoutType.Horizontal), Category("Appearance"), Description("Indicates layout type performed by the group.")]
+        //public eLayoutType LayoutType
+        //{
+        //    get { return _LayoutType; }
+        //    set
+        //    {
+        //        if (value != _LayoutType)
+        //        {
+        //            eLayoutType oldValue = _LayoutType;
+        //            _LayoutType = value;
+        //            OnLayoutTypeChanged(oldValue, value);
+        //        }
+        //    }
+        //}
+        ///// <summary>
+        ///// Called when LayoutType property has changed.
+        ///// </summary>
+        ///// <param name="oldValue">Old property value</param>
+        ///// <param name="newValue">New property value</param>
+        //protected virtual void OnLayoutTypeChanged(eLayoutType oldValue, eLayoutType newValue)
+        //{
+        //    OnPropertyChanged(new PropertyChangedEventArgs("LayoutType"));
+        //}
+        internal override void UpdateScrollBounds(int xScroll, int yScroll, bool moveControls)
+        {
+            base.UpdateScrollBounds(xScroll, yScroll, moveControls);
+            _ActualBounds.Offset(xScroll, yScroll);
+            _CaptionBounds.Offset(xScroll, yScroll);
+            _ContentBounds.Offset(xScroll, yScroll);
+            foreach (LayoutItemBase item in this.Items)
+            {
+                item.UpdateScrollBounds(xScroll, yScroll, moveControls);
+            }
+        }
+
+        private bool _IsRootGroup = false;
+        /// <summary>
+        /// Indicates whether group is used as a root group in LayoutControl.
+        /// </summary>
+        [Browsable(false)]
+        public bool IsRootGroup
+        {
+            get { return _IsRootGroup; }
+            internal set
+            {
+                if (_IsRootGroup == value)
+                    return;
+                _IsRootGroup = value;
+                OnPropertyChanged(new PropertyChangedEventArgs("IsRootGroup"));
+            }
+        }
+
+        private SimpleStyle _CaptionStyle;
+        /// <summary>
+        /// Gets the style for the group caption represented by Text property.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), Description("Gets the style for the group caption represented by Text property"), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public SimpleStyle CaptionStyle
+        {
+            get { return _CaptionStyle; }
+        }
+        private void CaptionStylePropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            this.Invalidate();
+            //throw new Exception("The method or operation is not implemented.");
+        }
+        /// <summary>
+        /// Returns whether item is contained as child item by this item or one of its children.
+        /// </summary>
+        /// <param name="value">Item to check.</param>
+        /// <returns>true if item is contained otherwise false</returns>
+        public override bool IsChildItem(LayoutItemBase value)
+        {
+            foreach (LayoutItemBase item in _Items)
+            {
+                if (item == value) return true;
+                if (item.IsChildItem(value)) return true;
+            }
+            return false;
+        }
+
+        private eGroupAppearance _Appearance = eGroupAppearance.None;
+        /// <summary>
+        /// Indicates the built-in appearance of group. When set group is painted using one of the pre-defined styles.
+        /// When set to None, default value, you can use Style and CaptionStyle properties to change the group appearance.
+        /// </summary>
+        [DefaultValue(eGroupAppearance.None), Category("Appearance"), Description("Indicates the built-in appearance of group.")]
+        public eGroupAppearance Appearance
+        {
+            get { return _Appearance; }
+            set
+            {
+                if (value != _Appearance)
+                {
+                    eGroupAppearance oldValue = _Appearance;
+                    _Appearance = value;
+                    OnAppearanceChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when Appearance property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnAppearanceChanged(eGroupAppearance oldValue, eGroupAppearance newValue)
+        {
+            this.Invalidate();
+            this.InvalidateLayout();
+            OnPropertyChanged(new PropertyChangedEventArgs("Appearance"));
+        }
+
+        /// <summary>
+        /// Scales item in response to the scaling of the LayoutControl. Should never be called directly.
+        /// </summary>
+        /// <param name="factor"></param>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override void ScaleItem(SizeF factor)
+        {
+            base.ScaleItem(factor);
+            if (_CaptionHeight > 0)
+            {
+                bool widthChanged = factor.Width != 1f;
+                bool heightChanged = factor.Height != 1f;
+
+                if (heightChanged)
+                {
+                    _CaptionHeight = (int)(_CaptionHeight * factor.Height);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether this item text-size is shared with other items inside of its parent group.
+        /// </summary>
+        [Browsable(false)]
+        public override bool IsTextSizeShared
+        {
+            get
+            {
+                return false;
+            }
+        }
+        /// <summary>
+        /// Gets whether this item's text-baseline is shared with other items inside of its parent group.
+        /// </summary>
+        [Browsable(false)]
+        public override bool IsTextBaselineShared
+        {
+            get
+            {
+                return false;
+            }
+        }
+
+        protected override void OnVisibleChanged(bool oldValue, bool newValue)
+        {
+            foreach (LayoutItemBase item in _Items)
+            {
+                item.Visible = newValue;
+            }
+            base.OnVisibleChanged(oldValue, newValue);
+        }
+        #endregion
+    }
+
+    /// <summary>
+    /// Specifies the layout type.
+    /// </summary>
+    public enum eLayoutType
+    {
+        /// <summary>
+        /// Horizontal layout type where items are first ordered from left to right then wrapped to next line.
+        /// </summary>
+        Horizontal,
+        /// <summary>
+        /// Vertical layout type where items are ordered first from top to bottom then wrapped onto the next column.
+        /// </summary>
+        Vertical
+    }
+
+    /// <summary>
+    /// Specifies built-in appearance for the LayoutGroup.
+    /// </summary>
+    public enum eGroupAppearance
+    {
+        /// <summary>
+        /// Group does not use any built-in appearance.
+        /// </summary>
+        None,
+        /// <summary>
+        /// Group is rendered like standard DotNetBar Panel control.
+        /// </summary>
+        Panel,
+        /// <summary>
+        /// Group is rendered like GroupPanel control.
+        /// </summary>
+        GroupPanel
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/LayoutItemBase.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/LayoutItemBase.cs
new file mode 100644
index 00000000..8d401398
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/LayoutItemBase.cs	
@@ -0,0 +1,2158 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel;
+using System.Drawing;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Layout
+{
+    /// <summary>
+    /// Represents the base item for layout control.
+    /// </summary>
+    [ToolboxItem(false), DesignTimeVisible(false)]
+    [Designer("DevComponents.DotNetBar.Layout.Design.LayoutItemBaseDesigner, DevComponents.DotNetBar.Layout.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=7eb7c3a35b91de04")]
+    public class LayoutItemBase : IComponent, IDisposable, INotifyPropertyChanged
+    {
+        #region Constructor
+        /// <summary>
+        /// Initializes a new instance of the LayoutItemBase class.
+        /// </summary>
+        public LayoutItemBase()
+        {
+            _Style = new SimpleStyle();
+            _Style.PropertyChanged += StylePropertyChanged;
+        }
+        #endregion
+
+        #region Implementation
+        /// <summary>
+        /// Paints the item. Actual code doing painting goes into the OnPaint method which should be overridden.
+        /// </summary>
+        /// <param name="context">Provides Paint Context.</param>
+        internal void Paint(PaintContext context)
+        {
+            OnPaint(context);
+        }
+        /// <summary>
+        /// Paints the background of the item.
+        /// </summary>
+        /// <param name="context"></param>
+        protected virtual void OnPaintBackground(PaintContext context)
+        {
+            Rectangle bounds = _Bounds;
+            Graphics g = context.Graphics;
+
+            if (_Style.IsPainted)
+            {
+                DrawingHelpers.PaintStyle(g, _Style, bounds);
+            }
+        }
+        protected virtual void PaintText(PaintContext context, bool isImageVisible, Color textColor, Rectangle textBounds, Brush textBrush)
+        {
+            Graphics g = context.Graphics;
+            eTextAlignment textAlign = _TextAlignment;
+            if (textAlign == eTextAlignment.Default)
+                textAlign = context.TextAlignment;
+            using (StringFormat format = new StringFormat())
+            {
+                if (textAlign == eTextAlignment.Right)
+                {
+                    if (isImageVisible && (_ImagePosition == eLayoutPosition.Right || _ImagePosition == eLayoutPosition.Default))
+                        textBounds.Width -= _ActualImageBounds.Width + _ImageTextSpacing;
+                    format.Alignment = StringAlignment.Far;
+                }
+                else if (textAlign == eTextAlignment.Center)
+                    format.Alignment = StringAlignment.Center;
+                if (_TextLineAlignment == eTextLineAlignment.Middle)
+                    format.LineAlignment = StringAlignment.Center;
+                else if (_TextLineAlignment == eTextLineAlignment.Bottom)
+                    format.LineAlignment = StringAlignment.Far;
+                format.HotkeyPrefix = context.HotkeyPrefix;
+                Font font = GetTextFont(context.DefaultFont);
+                if (_TextMarkup == null)
+                    g.DrawString(_Text, font, textBrush, textBounds, format);
+                else
+                {
+                    TextMarkup.MarkupDrawContext d = new TextMarkup.MarkupDrawContext(g, font, textColor, false);
+                    d.HotKeyPrefixVisible = (context.HotkeyPrefix == System.Drawing.Text.HotkeyPrefix.Show);
+                    Rectangle mr = new Rectangle(textBounds.X, textBounds.Y, _TextMarkup.Bounds.Width, _TextMarkup.Bounds.Height);
+                    _TextMarkup.Bounds = mr;
+                    _TextMarkup.Render(d);
+                }
+            }
+        }
+        protected virtual void PaintImage(PaintContext context, Color textColor)
+        {
+            Graphics g = context.Graphics;
+            if (!string.IsNullOrEmpty(_Symbol))
+            {
+                Font font = _SymbolSize > 0 ? Symbols.GetFontAwesome(_SymbolSize) : Symbols.FontAwesome;
+                TextDrawing.DrawStringLegacy(g, _Symbol, font,
+                    (_SymbolColor.IsEmpty ? textColor : _SymbolColor),
+                    new Rectangle(_ActualImageBounds.Location, Size.Empty),
+                    eTextFormat.Default);
+            }
+            else
+                g.DrawImage(_Image, _ActualImageBounds);
+        }
+        /// <summary>
+        /// Actual painting implementation.
+        /// </summary>
+        /// <param name="context"></param>
+        protected virtual void OnPaint(PaintContext context)
+        {
+            Rectangle bounds = _Bounds;
+            Graphics g = context.Graphics;
+
+            OnPaintBackground(context);
+
+            bounds = Helpers.Deflate(bounds, _Padding);
+            bool isImageVisible = IsImageVisible;
+            Color textColor = context.LabelTextColor;
+
+            if (_TextVisible && !string.IsNullOrEmpty(_Text))
+            {
+                Rectangle textBounds = _ActualTextBounds;
+                if (_StripTextBaseline > 0 && UseStripBaseline)
+                    textBounds = new Rectangle(textBounds.X,
+                                                textBounds.Y + (_StripTextBaseline - _TextBaseline),
+                                                textBounds.Width,
+                                                textBounds.Height);
+
+                bool dispose = false;
+                Brush textBrush = context.LabelTextBrush;
+
+                if (this.IsKeyboardFocusWithin && context.FocusStyle != null && !context.FocusStyle.TextColor.IsEmpty)
+                {
+                    textColor = context.FocusStyle.TextColor;
+                    textBrush = new SolidBrush(textColor);
+                    dispose = true;
+                }
+                else if (!_Style.TextColor.IsEmpty)
+                {
+                    textColor = _Style.TextColor;
+                    textBrush = new SolidBrush(textColor);
+                    dispose = true;
+                }
+
+                PaintText(context,isImageVisible, textColor, textBounds, textBrush);
+
+                if (dispose)
+                    textBrush.Dispose();
+            }
+
+
+            if (isImageVisible)
+            {
+                PaintImage(context, textColor);
+            }
+
+            if (_IsSelected)
+                OnPaintSelection(context);
+        }
+        /// <summary>
+        /// Returns whether strip text base line value is used when calculating position of the rendered text label.
+        /// </summary>
+        protected bool UseStripBaseline
+        {
+            get
+            {
+                return TextBaseLineEnabled && TextPosition == eLayoutPosition.Default && (!IsImageVisible || IsImageVisible && (_ImagePosition == eLayoutPosition.Default || _ImagePosition == eLayoutPosition.Left || _ImagePosition == eLayoutPosition.Right));
+            }
+        }
+
+        private bool _TextBaseLineEnabled = true;
+        /// <summary>
+        /// Indicates whether shared text baseline between items is enabled so the text-base aligns.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance"), Description("Indicates whether shared text baseline between items is enabled so the text-base aligns.")]
+        public bool TextBaseLineEnabled
+        {
+            get { return _TextBaseLineEnabled; }
+            set
+            {
+                if (value != _TextBaseLineEnabled)
+                {
+                    bool oldValue = _TextBaseLineEnabled;
+                    _TextBaseLineEnabled = value;
+                    OnTextBaseLineEnabledChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when TextBaseLineEnabled property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnTextBaseLineEnabledChanged(bool oldValue, bool newValue)
+        {
+            UpdateTextBounds();
+            this.Invalidate();
+            OnPropertyChanged(new PropertyChangedEventArgs("TextBaseLineEnabled"));
+        }
+        
+
+        private static readonly Color SelectionColor = ColorHelpers.GetColor(0x696969);
+        /// <summary>
+        /// Paints the selection adorner around the item.
+        /// </summary>
+        /// <param name="context"></param>
+        protected virtual void OnPaintSelection(PaintContext context)
+        {
+            if (this.DesignMode) return;
+            Rectangle r = _Bounds;
+            r.Width--;
+            r.Height--;
+            Graphics g = context.Graphics;
+            using (Pen pen = new Pen(SelectionColor))
+            {
+                pen.DashStyle = System.Drawing.Drawing2D.DashStyle.Dot;
+                g.DrawRectangle(pen, r);
+            }
+        }
+
+        /// <summary>
+        /// Updates bounds of the item in response to the scrolling of LayoutControl.
+        /// </summary>
+        /// <param name="xScroll"></param>
+        /// <param name="yScroll"></param>
+        internal virtual void UpdateScrollBounds(int xScroll, int yScroll, bool moveControls)
+        {
+            _Bounds.Offset(xScroll, yScroll);
+            if (!_ActualTextBounds.IsEmpty)
+                _ActualTextBounds.Offset(xScroll, yScroll);
+            if(!_ActualImageBounds.IsEmpty)
+                _ActualImageBounds.Offset(xScroll, yScroll);
+        }
+
+        private Rectangle _Bounds;
+        /// <summary>
+        /// Gets the bounds of the item.
+        /// </summary>
+        [Browsable(false)]
+        public virtual Rectangle Bounds
+        {
+            get
+            {
+                return _Bounds;
+            }
+        }
+        /// <summary>
+        /// Processes accelerator key for the item.
+        /// </summary>
+        /// <param name="charCode"></param>
+        internal virtual bool ProcessMnemonic(char charCode)
+        {
+            return false;
+        }
+
+        /// <summary>
+        /// Sets new bounds of the item.
+        /// </summary>
+        /// <param name="r">New bounds.</param>
+        public virtual void SetBounds(Rectangle r)
+        {
+            _Bounds = r;
+            UpdateLayout();
+        }
+        /// <summary>
+        /// Sets new bounds of the item and actual text size.
+        /// </summary>
+        /// <param name="r"></param>
+        /// <param name="actualTextSize"></param>
+        public virtual void SetBounds(Rectangle r, Size actualTextSize)
+        {
+            _Bounds = r;
+            ActualTextSize = actualTextSize;
+            UpdateLayout();
+        }
+        /// <summary>
+        /// Updates the item layout. Actual layout is performed in OnUpdateLayout method.
+        /// </summary>
+        internal void UpdateLayout()
+        {
+            OnUpdateLayout();
+        }
+        /// <summary>
+        /// Actual layout update implementation.
+        /// </summary>
+        protected virtual void OnUpdateLayout()
+        {
+            UpdateTextBounds();
+        }
+        /// <summary>
+        /// Updates the layout of the text inside of item.
+        /// </summary>
+        protected virtual void UpdateTextBounds()
+        {
+            Rectangle bounds = Helpers.Deflate(_Bounds, _Padding);
+            _ActualTextBounds = Helpers.Deflate(bounds, _TextPadding);
+            _ActualImageBounds = Rectangle.Empty;
+            bool isImageVisible = IsImageVisible;
+            Size imageSize = Size.Empty;
+            if (isImageVisible)
+                imageSize = GetImageSize();
+
+            eTextAlignment textAlignment = _TextAlignment;
+            if (textAlignment == eTextAlignment.Default)
+            {
+                LayoutControl lc = GetLayoutControl();
+                if (lc != null)
+                    textAlignment = lc.LabelTextAlignment;
+            }
+
+            if (_TextPosition == eLayoutPosition.Default || _TextPosition == eLayoutPosition.Left ||
+                _TextPosition == eLayoutPosition.Right)
+            {
+                if (_TextLineAlignment == eTextLineAlignment.Middle)
+                    _ActualTextBounds.Y += (_ActualTextBounds.Height - _ActualTextSize.Height) / 2;
+                else if (_TextLineAlignment == eTextLineAlignment.Bottom)
+                    _ActualTextBounds.Y = _ActualTextBounds.Bottom - _ActualTextSize.Height;
+            }
+
+            if (_TextPosition == eLayoutPosition.Default || _TextPosition == eLayoutPosition.Left || _TextPosition == eLayoutPosition.Top)
+            {
+                _ActualTextBounds.Size = _ActualTextSize;
+            }
+            else if (_TextPosition == eLayoutPosition.Bottom)
+            {
+                _ActualTextBounds.Y = _ActualTextBounds.Bottom - _ActualTextSize.Height;
+                _ActualTextBounds.Size = _ActualTextSize;
+            }
+            else if (_TextPosition == eLayoutPosition.Right)
+            {
+                _ActualTextBounds.X = _ActualTextBounds.Right - _ActualTextSize.Width;
+                _ActualTextBounds.Size = _ActualTextSize;
+            }
+            else if (_TextPosition == eLayoutPosition.Top)
+            {
+                _ActualTextBounds.Y = _ActualTextBounds.Bottom - _ActualTextSize.Height;
+                _ActualTextBounds.Size = _ActualTextSize;
+            }
+
+            if (isImageVisible)
+            {
+                if (_ImagePosition == eLayoutPosition.Default || _ImagePosition == eLayoutPosition.Right)
+                {
+                    if (textAlignment == eTextAlignment.Right)
+                        _ActualImageBounds = new Rectangle(_ActualTextBounds.Right - imageSize.Width, _ActualTextBounds.Y + (-_ActualTextBounds.Height - imageSize.Height) / 2, imageSize.Width, imageSize.Height);
+                    else
+                        _ActualImageBounds = new Rectangle(_ActualTextBounds.X + _ImageTextSpacing + _RealTextSize.Width, _ActualTextBounds.Y + (_ActualTextBounds.Height - imageSize.Height) / 2, imageSize.Width, imageSize.Height);
+                }
+                else if (_ImagePosition == eLayoutPosition.Left)
+                {
+                    if (textAlignment == eTextAlignment.Right)
+                        _ActualImageBounds = new Rectangle(_ActualTextBounds.Right - (_RealTextSize.Width + imageSize.Width + _ImageTextSpacing), _ActualTextBounds.Y + (_ActualTextBounds.Height - imageSize.Height) / 2, imageSize.Width, imageSize.Height);
+                    else
+                    {
+                        _ActualImageBounds = new Rectangle(_ActualTextBounds.X, _ActualTextBounds.Y + (_ActualTextBounds.Height - imageSize.Height) / 2, imageSize.Width, imageSize.Height);
+                        _ActualTextBounds.X += _ActualImageBounds.Width + _ImageTextSpacing;
+                    }
+                }
+                else if (_ImagePosition == eLayoutPosition.Top)
+                {
+                    _ActualImageBounds = new Rectangle(_ActualTextBounds.X + (_ActualTextBounds.Width - imageSize.Width) / 2,
+                                             _ActualTextBounds.Y - (imageSize.Height + _ImageTextSpacing),
+                                             imageSize.Width,
+                                             imageSize.Height);
+                }
+                else if (_ImagePosition == eLayoutPosition.Bottom)
+                {
+                    _ActualImageBounds = new Rectangle(_ActualTextBounds.X + (_ActualTextBounds.Width - imageSize.Width) / 2,
+                                             _ActualTextBounds.Bottom + _ImageTextSpacing,
+                                             imageSize.Width,
+                                             imageSize.Height);
+                }
+            }
+        }
+        protected virtual Size GetImageSize()
+        {
+            if (!string.IsNullOrEmpty(_Symbol))
+                return _SymbolTextSize;
+            if (_Image != null)
+                return _Image.Size;
+            return Size.Empty;
+        }
+        protected bool IsImageVisible
+        {
+            get
+            {
+                return _Image != null || !string.IsNullOrEmpty(_Symbol);
+            }
+        }
+        /// <summary>
+        /// Scales item in response to the scaling of the LayoutControl. Should never be called directly.
+        /// </summary>
+        /// <param name="factor"></param>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public virtual void ScaleItem(SizeF factor)
+        {
+            bool widthChanged = factor.Width != 1f;
+            bool heightChanged = factor.Height != 1f;
+
+            if (!_MinSize.IsEmpty && (widthChanged || heightChanged))
+            {
+                Size newMinSize = new Size();
+                if (widthChanged)
+                    newMinSize.Width = (int)(_MinSize.Width * factor.Width);
+                else
+                    newMinSize.Width = _MinSize.Width;
+                if (heightChanged)
+                    newMinSize.Height = (int)(_MinSize.Height * factor.Height);
+                else
+                    newMinSize.Height = _MinSize.Height;
+                MinSize = newMinSize;
+            }
+            
+            if (widthChanged && _WidthType == eLayoutSizeType.Absolute)
+            {
+                int newWidth = (int)Math.Round(_Width * factor.Width);
+
+                if (_MinSize.Width > newWidth)
+                    newWidth = _MinSize.Width;
+
+                this.Width = newWidth;
+            }
+            if (heightChanged && _HeightType == eLayoutSizeType.Absolute)
+            {
+                int newHeight = (int)Math.Round(_Height * factor.Height);
+
+                if (_MinSize.Height > newHeight)
+                    newHeight = _MinSize.Height;
+
+                this.Height = newHeight;
+            }
+
+            if (!_TextSize.IsEmpty && (widthChanged || heightChanged))
+            {
+                Size newTextSize = new Size();
+                if (widthChanged)
+                    newTextSize.Width = (int)(_TextSize.Width * factor.Width);
+                else
+                    newTextSize.Width = _TextSize.Width;
+                if (heightChanged)
+                    newTextSize.Height = (int)(_TextSize.Height * factor.Height);
+                else
+                    newTextSize.Height = _TextSize.Height;
+                TextSize = newTextSize;
+            }
+
+            if (!Helpers.IsEmpty(_TextPadding) && (widthChanged || heightChanged))
+            {
+                System.Windows.Forms.Padding newTextPadding = _TextPadding;
+                if (widthChanged)
+                {
+                    newTextPadding.Left = (int)(_TextPadding.Left * factor.Width);
+                    newTextPadding.Right = (int)(_TextPadding.Right * factor.Width);
+                }
+                if (heightChanged)
+                {
+                    newTextPadding.Top = (int)(_TextPadding.Top * factor.Height);
+                    newTextPadding.Bottom = (int)(_TextPadding.Bottom * factor.Height);
+                }
+                TextPadding = newTextPadding;
+            }
+
+            if (!Helpers.IsEmpty(_Padding) && (widthChanged || heightChanged))
+            {
+                System.Windows.Forms.Padding newPadding = _Padding;
+                if (widthChanged)
+                {
+                    newPadding.Left = (int)(_Padding.Left * factor.Width);
+                    newPadding.Right = (int)(_Padding.Right * factor.Width);
+                }
+                if (heightChanged)
+                {
+                    newPadding.Top = (int)(_Padding.Top * factor.Height);
+                    newPadding.Bottom = (int)(_Padding.Bottom * factor.Height);
+                }
+                Padding = newPadding;
+            }
+        }
+
+        /// <summary>
+        /// Measures the size of the item text. Actual measurement is done in OnMeasureText method.
+        /// </summary>
+        /// <param name="c"></param>
+        /// <returns></returns>
+        internal Size MeasureText(LayoutContext c)
+        {
+            return OnMeasureText(c);
+        }
+
+        protected virtual Font GetTextFont(Font defaultFont)
+        {
+            Font font = defaultFont;
+            if (_Style.Font != null)
+                font = _Style.Font;
+            return font;
+        }
+        /// <summary>
+        /// Returns the size of the items text.
+        /// </summary>
+        /// <param name="c"></param>
+        /// <returns></returns>
+        protected virtual Size OnMeasureText(LayoutContext c)
+        {
+            if (!_TextVisible) return Size.Empty;
+
+            if (_TextSize.Width > 0 && _TextSize.Height > 0)
+                return _TextSize;
+
+            Size size = Size.Empty;
+            Graphics g = c.Graphics;
+
+            Font font = GetTextFont(c.Font);
+
+            if (_TextMarkup == null)
+            { // Plain Text
+                if (_TextSize.Width > 0)
+                {
+                    size = Size.Ceiling(g.MeasureString(_Text, font, _TextSize.Width));
+                }
+                else
+                {
+                    size = Size.Ceiling(g.MeasureString(_Text, font));
+                }
+            }
+            else
+            {
+                // Text Markup
+                Size availSize = new Size(_TextSize.Width > 0 ? _TextSize.Width : 1600, 1);
+                TextMarkup.MarkupDrawContext d = new TextMarkup.MarkupDrawContext(g, font, Color.Empty, false);
+                _TextMarkup.InvalidateElementsSize();
+                _TextMarkup.Measure(availSize, d);
+                availSize = _TextMarkup.Bounds.Size;
+                d.RightToLeft = c.RightToLeft;
+                _TextMarkup.Arrange(new Rectangle(0, 0, availSize.Width, availSize.Height), d);
+
+                size = _TextMarkup.Bounds.Size;
+            }
+
+            if (_TextSize.Height > 0)
+                size.Height = _TextSize.Height;
+            size.Width += _TextPadding.Horizontal;
+            size.Height += _TextPadding.Vertical;
+            _RealTextSize = size;
+            _TextBaseline = c.FontBaseline;
+
+            if (IsImageVisible)
+            {
+                if (!string.IsNullOrEmpty(_Symbol))
+                {
+                    Font symFont = Symbols.GetFontAwesome(_SymbolSize);
+
+                    _SymbolTextSize = TextDrawing.MeasureString(g, _Symbol, symFont);
+
+                    int descent = (int)Math.Ceiling((symFont.FontFamily.GetCellDescent(symFont.Style) *
+                    symFont.Size / symFont.FontFamily.GetEmHeight(symFont.Style)));
+                    _SymbolTextSize.Height -= descent;
+                }
+                else
+                    _SymbolTextSize = Size.Empty;
+                if (_ImagePosition == eLayoutPosition.Default || _ImagePosition == eLayoutPosition.Left || _ImagePosition == eLayoutPosition.Right)
+                    size.Width += _ImageTextSpacing + GetImageSize().Width;
+            }
+
+            return size;
+        }
+
+        private Size _RealTextSize = Size.Empty;
+         //<summary>
+         // Returns the real text-size for the text label that is valid after MeasureText is called.
+         //</summary>
+        [Browsable(false)]
+        public Size RealTextSize
+        {
+            get
+            {
+                return _RealTextSize;
+            }
+        }
+
+        private int _StripTextBaseline = 0;
+        /// <summary>
+        /// Gets or sets the text-baseline that is used by whole strip.
+        /// </summary>
+        internal virtual int StripTextBaseline
+        {
+            get { return _StripTextBaseline; }
+            set
+            {
+                _StripTextBaseline = value;
+            }
+        }
+
+        private int _TextBaseline = 0;
+        /// <summary>
+        /// Returns the text base line.
+        /// </summary>
+        internal virtual int TextBaseline
+        {
+            get
+            {
+                return _TextBaseline;
+            }
+            set
+            {
+                _TextBaseline = value;
+            }
+        }
+
+        private object _Tag = "";
+        /// <summary>
+        /// Gets or sets an object that contains additional data attached to the item.
+        /// </summary>
+        [Bindable(true), DefaultValue(""), Localizable(false), TypeConverter(typeof(StringConverter)), Description("Indicates an object that contains additional data attached to the item")]
+        public object Tag
+        {
+            get { return _Tag; }
+            set
+            {
+                if (value != _Tag)
+                {
+                    object oldValue = _Tag;
+                    _Tag = value;
+                    OnTagChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when Tag property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnTagChanged(object oldValue, object newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("Tag"));
+        }
+
+        private string _Text = "";
+        /// <summary>
+        /// Indicates the item caption.
+        /// </summary>
+        [Bindable(true), Category("Text"), DefaultValue(""), Localizable(true), Description("Indicates the item caption.")]
+        [Editor("DevComponents.DotNetBar.Layout.Design.TextMarkupUIEditor, DevComponents.DotNetBar.Layout.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=7eb7c3a35b91de04", typeof(System.Drawing.Design.UITypeEditor))]
+        public virtual string Text
+        {
+            get { return _Text; }
+            set
+            {
+                if (value != _Text)
+                {
+                    string oldValue = _Text;
+                    _Text = value;
+                    OnTextChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when Text property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnTextChanged(string oldValue, string newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("Text"));
+            MarkupTextChanged();
+            InvalidateLayout();
+        }
+
+        private Size _TextSize = Size.Empty;
+        /// <summary>
+        /// Gets or sets the explicit size of the text part of item.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates explicit size of text part of the item")]
+        public Size TextSize
+        {
+            get { return _TextSize; }
+            set
+            {
+                if (value != _TextSize)
+                {
+                    Size oldValue = _TextSize;
+                    _TextSize = value;
+                    OnTextSizeChanged(oldValue, value);
+                }
+            }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeTextSize()
+        {
+            return !_TextSize.IsEmpty;
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetTextSize()
+        {
+            TextSize = Size.Empty;
+        }
+        /// <summary>
+        /// Called when TextSize property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnTextSizeChanged(Size oldValue, Size newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("TextSize"));
+            InvalidateLayout();
+        }
+
+        private Rectangle _ActualTextBounds = Rectangle.Empty;
+        /// <summary>
+        /// Gets actual text bounds.
+        /// </summary>
+        [Browsable(false)]
+        public Rectangle ActualTextBounds
+        {
+            get
+            {
+                return _ActualTextBounds;
+            }
+            internal set
+            {
+                _ActualTextBounds = value;
+            }
+        }
+
+        private Size _ActualTextSize = Size.Empty;
+        /// <summary>
+        /// Gets actual text-size as used by the layout item.
+        /// </summary>
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), Browsable(false)]
+        public Size ActualTextSize
+        {
+            get { return _ActualTextSize; }
+            internal set
+            {
+                if (value != _ActualTextSize)
+                {
+                    Size oldValue = _ActualTextSize;
+                    _ActualTextSize = value;
+                    OnActualTextSizeChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when ActualTextSize property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnActualTextSizeChanged(Size oldValue, Size newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("ActualTextSize"));
+        }
+
+        private System.Windows.Forms.Padding _TextPadding = new System.Windows.Forms.Padding(0, 0, 0, 0);
+        /// <summary>
+        /// Gets or sets text padding.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), Description("Gets or sets text padding.")]
+        public System.Windows.Forms.Padding TextPadding
+        {
+            get { return _TextPadding; }
+            set
+            {
+                System.Windows.Forms.Padding oldValue = value;
+                _TextPadding = value;
+                OnTextPaddingChanged(oldValue, value);
+            }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeTextPadding()
+        {
+            return _TextPadding.Bottom != 0 || _TextPadding.Top != 0 || _TextPadding.Left != 0 || _TextPadding.Right != 0;
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetTextPadding()
+        {
+            _TextPadding = new System.Windows.Forms.Padding(0, 0, 0, 0);
+        }
+        /// <summary>
+        /// Called when TextPadding property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnTextPaddingChanged(System.Windows.Forms.Padding oldValue, System.Windows.Forms.Padding newValue)
+        {
+            this.InvalidateLayout();
+            this.Invalidate();
+            OnPropertyChanged(new PropertyChangedEventArgs("TextPadding"));
+        }
+
+        private bool _TextVisible = true;
+        /// <summary>
+        /// Indicates whether caption/text is visible.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance"), Description("Indicates whether caption/text is visible."), Bindable(true)]
+        public bool TextVisible
+        {
+            get { return _TextVisible; }
+            set
+            {
+                if (value != _TextVisible)
+                {
+                    bool oldValue = _TextVisible;
+                    _TextVisible = value;
+                    OnTextVisibleChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when TextVisible property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnTextVisibleChanged(bool oldValue, bool newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("TextVisible"));
+            InvalidateLayout();
+        }
+
+        private eLayoutPosition _TextPosition = eLayoutPosition.Default;
+        /// <summary>
+        /// Gets or sets the text position in relation to the other parts of the layout item. Default is same as Left.
+        /// </summary>
+        [DefaultValue(eLayoutPosition.Default), Category("Appearance"), Description("Indicates text position in relation to the other parts of the layout item.")]
+        public eLayoutPosition TextPosition
+        {
+            get { return _TextPosition; }
+            set
+            {
+                if (value != _TextPosition)
+                {
+                    eLayoutPosition oldValue = _TextPosition;
+                    _TextPosition = value;
+                    OnTextPositionChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when TextPosition property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnTextPositionChanged(eLayoutPosition oldValue, eLayoutPosition newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("TextPosition"));
+            InvalidateLayout();
+        }
+
+        private int _Width = 0;
+        /// <summary>
+        /// Indicates the total width of the item. The value specified here depends on the WidthType property setting. When using WidthType=Percentage the value specified here indicates the percent of the available client size of group.
+        /// For example setting of 20 indicates 20% of the available client width.
+        /// </summary>
+        [DefaultValue(0), Category("Appearance"), Description("Indicates the total width of the item. The value specified here depends on the WidthType property setting.")]
+        public int Width
+        {
+            get { return _Width; }
+            set
+            {
+                if (value != _Width)
+                {
+                    int oldValue = _Width;
+                    _Width = value;
+                    OnWidthChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when Width property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnWidthChanged(int oldValue, int newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("Width"));
+            InvalidateLayout();
+        }
+
+        private eLayoutSizeType _WidthType = eLayoutSizeType.Absolute;
+        /// <summary>
+        /// Indicates width type used by the item.
+        /// </summary>
+        [DefaultValue(eLayoutSizeType.Absolute), Category("Appearance"), Description("Indicates width type used by the item.")]
+        public eLayoutSizeType WidthType
+        {
+            get { return _WidthType; }
+            set
+            {
+                if (value != _WidthType)
+                {
+                    eLayoutSizeType oldValue = _WidthType;
+                    _WidthType = value;
+                    OnWidthTypeChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when WidthType property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnWidthTypeChanged(eLayoutSizeType oldValue, eLayoutSizeType newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("WidthType"));
+            InvalidateLayout();
+        }
+
+        /// <summary>
+        /// Indicates whether width type is the fixed width type, different than eLayoutSizeType.Percent
+        /// </summary>
+        [Browsable(false)]
+        public bool IsWidthFixed
+        {
+            get
+            {
+                return (_WidthType != eLayoutSizeType.Percent);
+            }
+        }
+
+        private int _Height = 0;
+        /// <summary>
+        /// Indicates the total height of the item. The value specified here depends on the HeightType property setting. When using HeightType=Percentage the value specified here indicates the percent of the available client size of group.
+        /// For example setting of 10 indicates 10% of the available client height.
+        /// </summary>
+        [DefaultValue(0), Category("Appearance"), Description("Indicates the total height of the item. The value specified here depends on the HeightType property setting.")]
+        public int Height
+        {
+            get { return _Height; }
+            set
+            {
+                if (value != _Height)
+                {
+                    int oldValue = _Height;
+                    _Height = value;
+                    OnHeightChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when Height property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnHeightChanged(int oldValue, int newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("Height"));
+            InvalidateLayout();
+        }
+
+        private eLayoutSizeType _HeightType = eLayoutSizeType.Absolute;
+        /// <summary>
+        /// Indicates height type used by the item.
+        /// </summary>
+        [DefaultValue(eLayoutSizeType.Absolute), Category("Appearance"), Description("Indicates height type used by the item.")]
+        public eLayoutSizeType HeightType
+        {
+            get { return _HeightType; }
+            set
+            {
+                if (value != _HeightType)
+                {
+                    eLayoutSizeType oldValue = _HeightType;
+                    _HeightType = value;
+                    OnHeightTypeChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when HeightType property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnHeightTypeChanged(eLayoutSizeType oldValue, eLayoutSizeType newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("HeightType"));
+            InvalidateLayout();
+        }
+
+        /// <summary>
+        /// Indicates whether height type is the fixed height type, different than eLayoutSizeType.Percent
+        /// </summary>
+        [Browsable(false)]
+        public bool IsHeightFixed
+        {
+            get
+            {
+                return (_HeightType != eLayoutSizeType.Percent);
+            }
+        }
+
+        private Size _MinSize = Size.Empty;
+        /// <summary>
+        /// Indicates the minimum size of the item. Setting Width or Height to zero indicates unconstrained minimum size for given dimension.
+        /// </summary>
+        [Description("Indicates the minimum size of the item"), Category("Appearance")]
+        public Size MinSize
+        {
+            get { return _MinSize; }
+            set
+            {
+                if (value != _MinSize)
+                {
+                    Size oldValue = _MinSize;
+                    _MinSize = value;
+                    OnMinSizeChanged(oldValue, value);
+                }
+            }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeMinSize()
+        {
+            return !_MinSize.IsEmpty;
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetMinSize()
+        {
+            MinSize = Size.Empty;
+        }
+        /// <summary>
+        /// Called when MinSize property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnMinSizeChanged(Size oldValue, Size newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("MinSize"));
+            InvalidateLayout();
+        }
+
+        private int _SuggestedGroupId = 0;
+        /// <summary>
+        /// When set to value greater than 0 it suggests to layout engine that items with same id that are in collection after each other should be kept on same line if possible.
+        /// This is only suggestion to layout engine and engine will ignore it if there is insufficient client size available or other size constraints
+        /// prevent it from keeping items in same line.
+        /// </summary>
+        [DefaultValue(0), Category("Behavior"), Description("When set to value greater than 0 it suggests to layout engine that items with same id that are in collection after each other should be kept on same line if possible.")]
+        public int SuggestedGroupId
+        {
+            get { return _SuggestedGroupId; }
+            set
+            {
+                if (value != _SuggestedGroupId)
+                {
+                    int oldValue = _SuggestedGroupId;
+                    _SuggestedGroupId = value;
+                    OnSuggestedGroupIdChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when SuggestedGroupId property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnSuggestedGroupIdChanged(int oldValue, int newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("SuggestedGroupId"));
+
+        }
+
+        private bool _MnemonicsEnabled = true;
+        /// <summary>
+        /// Indicates whether accelerator keys assigned to item Text property are processed by items which respond to them.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether accelerator keys assigned to item Text property are processed by items which respond to them.")]
+        public bool MnemonicsEnabled
+        {
+            get { return _MnemonicsEnabled; }
+            set
+            {
+                if (value != _MnemonicsEnabled)
+                {
+                    bool oldValue = _MnemonicsEnabled;
+                    _MnemonicsEnabled = value;
+                    OnMnemonicsEnabledChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when MnemonicsEnabled property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnMnemonicsEnabledChanged(bool oldValue, bool newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("MnemonicsEnabled"));
+
+        }
+
+        private SimpleStyle _Style;
+        /// <summary>
+        /// Gets the style for the background of the control.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), Description("Gets the style for the background of the item."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public SimpleStyle Style
+        {
+            get { return _Style; }
+        }
+        private void StylePropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            this.Invalidate();
+            //throw new Exception("The method or operation is not implemented.");
+        }
+        private static readonly System.Windows.Forms.Padding DefaultPadding = new System.Windows.Forms.Padding(4);
+        private System.Windows.Forms.Padding _Padding = DefaultPadding;
+        /// <summary>
+        /// Specifies the amount of padding inside of the item. Padding is the spacing between the edges of item and its content.
+        /// </summary>
+        [Category("Appearance"), Description("Specifies the amount of padding inside of the item.")]
+        public System.Windows.Forms.Padding Padding
+        {
+            get { return _Padding; }
+            set
+            {
+                if (value != _Padding)
+                {
+                    System.Windows.Forms.Padding oldValue = _Padding;
+                    _Padding = value;
+                    OnPaddingChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when Padding property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnPaddingChanged(System.Windows.Forms.Padding oldValue, System.Windows.Forms.Padding newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("Padding"));
+            InvalidateLayout();
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializePadding()
+        {
+            return _Padding != DefaultPadding;
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetPadding()
+        {
+            Padding = DefaultPadding;
+        }
+
+        private int _AbsoluteIndex = -1;
+        /// <summary>
+        /// Indicates the absolute index of the item inside of the LayoutControl.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public int AbsoluteIndex
+        {
+            get { return _AbsoluteIndex; }
+            internal set
+            {
+                if (value != _AbsoluteIndex)
+                {
+                    int oldValue = _AbsoluteIndex;
+                    _AbsoluteIndex = value;
+                    OnAbsoluteIndexChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when AbsoluteIndex property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnAbsoluteIndexChanged(int oldValue, int newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("AbsoluteIndex"));
+        }
+
+        /// <summary>
+        /// Returns the LayoutControl which hosts the item, if available.
+        /// </summary>
+        /// <returns>reference to LayoutControl or null.</returns>
+        public LayoutControl GetLayoutControl()
+        {
+            if (_LayoutControl != null) return _LayoutControl;
+            LayoutItemBase item = this.Parent;
+            while (item != null)
+            {
+                if (item.LayoutControl != null) return item.LayoutControl;
+                item = item.Parent;
+            }
+            return null;
+        }
+
+        /// <summary>
+        /// Invalidates the paint region of the item.
+        /// </summary>
+        public void Invalidate()
+        {
+            LayoutControl control = GetLayoutControl();
+            if (control != null)
+                control.Invalidate(_Bounds);
+        }
+
+        /// <summary>
+        /// Invalidates layout of the item and causes the LayoutControl to perform layout.
+        /// </summary>
+        public void InvalidateLayout()
+        {
+            LayoutControl control = GetLayoutControl();
+            if (control != null)
+            {
+                if (this.DesignMode)
+                    control.Invalidate(true);
+                control.PerformLayout();
+            }
+        }
+
+        private LayoutControl _LayoutControl = null;
+        /// <summary>
+        /// Gets the LayoutControl this group is directly attached too through RootGroup property.
+        /// </summary>
+        [Browsable(false)]
+        internal LayoutControl LayoutControl
+        {
+            get
+            {
+                return _LayoutControl;
+            }
+            set
+            {
+                _LayoutControl = value;
+            }
+        }
+
+        private LayoutItemBase _Parent = null;
+        /// <summary>
+        /// Gets the reference to parent item.
+        /// </summary>
+        [Browsable(false)]
+        public LayoutItemBase Parent
+        {
+            get { return _Parent; }
+            internal set
+            {
+                if (value != _Parent)
+                {
+                    if (value == this) throw new ArgumentException("Item cannot parent itself");
+                    if (IsChildItem(value)) throw new ArgumentException("Cannot set as Parent item that is child of this item");
+                    LayoutItemBase oldValue = _Parent;
+                    _Parent = value;
+                    OnParentChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when Parent property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnParentChanged(LayoutItemBase oldValue, LayoutItemBase newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("Parent"));
+
+        }
+
+        /// <summary>
+        /// Returns whether item is contained as child item by this item or one of its children.
+        /// </summary>
+        /// <param name="value">Item to check.</param>
+        /// <returns>true if item is contained otherwise false</returns>
+        public virtual bool IsChildItem(LayoutItemBase value)
+        {
+            return false;
+        }
+
+        private bool _IsKeyboardFocusWithin = false;
+        /// <summary>
+        /// Gets whether keyboard focus is within the control which is assigned to the item.
+        /// </summary>
+        [Browsable(false)]
+        public bool IsKeyboardFocusWithin
+        {
+            get
+            {
+                return _IsKeyboardFocusWithin;
+            }
+            internal set
+            {
+                if (value != _IsKeyboardFocusWithin)
+                {
+                    _IsKeyboardFocusWithin = value;
+                    this.Invalidate();
+                }
+            }
+        }
+
+        private Image _Image = null;
+        /// <summary>
+        /// Indicates the image that is displayed next to the item text label.
+        /// </summary>
+        [DefaultValue(null), Category("Appearance"), Description("Indicates the image that is displayed next to the item text label.")]
+        public Image Image
+        {
+            get { return _Image; }
+            set
+            {
+                if (value != _Image)
+                {
+                    Image oldValue = _Image;
+                    _Image = value;
+                    OnImageChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when Image property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnImageChanged(Image oldValue, Image newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("Image"));
+            this.InvalidateLayout();
+        }
+
+        private int _ImageTextSpacing = 4;
+        /// <summary>
+        /// Specifies the distance between image and text.
+        /// </summary>
+        [DefaultValue(4), Category("Appearance"), Description("Specifies the distance between image and text.")]
+        public int ImageTextSpacing
+        {
+            get { return _ImageTextSpacing; }
+            set
+            {
+                if (value != _ImageTextSpacing)
+                {
+                    int oldValue = _ImageTextSpacing;
+                    _ImageTextSpacing = value;
+                    OnImageTextSpacingChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when ImageTextSpacing property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnImageTextSpacingChanged(int oldValue, int newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("ImageTextSpacing"));
+            this.InvalidateLayout();
+        }
+
+        private eLayoutPosition _ImagePosition = eLayoutPosition.Default;
+        /// <summary>
+        /// Indicates the position of the image in relation to the text label of item.
+        /// </summary>
+        [DefaultValue(eLayoutPosition.Default), Category("Appearance"), Description("Indicates the position of the image in relation to the text label of item.")]
+        public eLayoutPosition ImagePosition
+        {
+            get { return _ImagePosition; }
+            set
+            {
+                if (value != _ImagePosition)
+                {
+                    eLayoutPosition oldValue = _ImagePosition;
+                    _ImagePosition = value;
+                    OnImagePositionChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when ImagePosition property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnImagePositionChanged(eLayoutPosition oldValue, eLayoutPosition newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("ImagePosition"));
+            this.InvalidateLayout();
+        }
+
+        private Rectangle _ActualImageBounds = Rectangle.Empty;
+        /// <summary>
+        /// Gets actual image bounds if visible or Rectangle.Empty if image is not visible.
+        /// </summary>
+        [Browsable(false)]
+        public Rectangle ActualImageBounds
+        {
+            get { return _ActualImageBounds; }
+            internal set { _ActualImageBounds = value; }
+        }
+
+        private Color _SymbolColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets the color of the Symbol.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates color of the Symbol.")]
+        public Color SymbolColor
+        {
+            get { return _SymbolColor; }
+            set { _SymbolColor = value; this.Invalidate(); }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeSymbolColor()
+        {
+            return !_SymbolColor.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetSymbolColor()
+        {
+            this.SymbolColor = Color.Empty;
+        }
+
+        private Size _SymbolTextSize = Size.Empty;
+        private string _Symbol = "";
+        /// <summary>
+        /// Indicates the symbol displayed on face of the item instead of the image. Setting the symbol overrides the image setting.
+        /// </summary>
+        [DefaultValue(""), Category("Appearance"), Description("Indicates the symbol displayed on face of the button instead of the image. Setting the symbol overrides the image setting.")]
+        [Editor("DevComponents.DotNetBar.Layout.Design.SymbolTypeEditor, DevComponents.DotNetBar.Layout.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=7eb7c3a35b91de04", typeof(System.Drawing.Design.UITypeEditor))]
+        public string Symbol
+        {
+            get { return _Symbol; }
+            set
+            {
+                if (value != _Symbol)
+                {
+                    string oldValue = _Symbol;
+                    _Symbol = value;
+                    OnSymbolChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when Symbol property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnSymbolChanged(string oldValue, string newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("Symbol"));
+            this.InvalidateLayout();
+            this.Invalidate();
+        }
+
+        private float _SymbolSize = 0f;
+        /// <summary>
+        /// Indicates the size of the symbol in points.
+        /// </summary>
+        [DefaultValue(0f), Category("Appearance"), Description("Indicates the size of the symbol in points.")]
+        public float SymbolSize
+        {
+            get { return _SymbolSize; }
+            set
+            {
+                if (value != _SymbolSize)
+                {
+                    float oldValue = _SymbolSize;
+                    _SymbolSize = value;
+                    OnSymbolSizeChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when SymbolSize property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnSymbolSizeChanged(float oldValue, float newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("SymbolSize"));
+            this.InvalidateLayout();
+            this.Invalidate();
+        }
+
+        private bool _SharedTextSizeEnabled = true;
+        /// <summary>
+        /// Indicates whether uniform text-size is used for text label. When shared text-size is used it ensures that all text-labels in LayoutControl use same text-size which is determined as largest text label size.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether uniform text-size is used for text label. When shared text-size is used it ensures that all text-labels in LayoutControl use same text-size which is determined as largest text label size.")]
+        public bool SharedTextSizeEnabled
+        {
+            get { return _SharedTextSizeEnabled; }
+            set
+            {
+                if (value != _SharedTextSizeEnabled)
+                {
+                    bool oldValue = _SharedTextSizeEnabled;
+                    _SharedTextSizeEnabled = value;
+                    OnSharedTextSizeEnabledChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when SharedTextSizeEnabled property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnSharedTextSizeEnabledChanged(bool oldValue, bool newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("SharedTextSizeEnabled"));
+            this.InvalidateLayout();
+            this.Invalidate();
+        }
+
+        /// <summary>
+        /// Brings item into view by scrolling the control if necessary.
+        /// </summary>
+        public virtual void BringIntoView()
+        {
+            LayoutControl lc = GetLayoutControl();
+            if (lc != null)
+                lc.ScrollItemIntoView(this);
+        }
+        #endregion
+
+        #region IDisposable Members
+
+        protected virtual void OnDispose()
+        {
+            EventHandler eh = Disposed;
+            if (eh != null) eh(this, EventArgs.Empty);
+
+            _Style.PropertyChanged -= StylePropertyChanged;
+        }
+        public void Dispose()
+        {
+            OnDispose();
+        }
+
+        #endregion
+
+        #region IComponent Members
+        /// <summary>
+        /// Occurs when item is disposed.
+        /// </summary>
+        [Description("Occurs when item is disposed.")]
+        public event EventHandler Disposed;
+
+        private string _Name = "";
+        /// <summary>
+        /// Gets or sets the name of the item.
+        /// </summary>
+        [DefaultValue(""), Category("Design"), Description("Indicates name of the item.")]
+        public string Name
+        {
+            get
+            {
+                if (_ComponentSite != null)
+                    _Name = _ComponentSite.Name;
+                return _Name;
+            }
+            set
+            {
+                if (_ComponentSite != null)
+                    _ComponentSite.Name = value;
+                if (value == null)
+                    _Name = "";
+                else
+                    _Name = value;
+            }
+        }
+
+        private ISite _ComponentSite = null;
+        /// <summary>
+        /// Gets or sets the Site associated with this component. Used by Windows forms designer.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public virtual System.ComponentModel.ISite Site
+        {
+            get
+            {
+                return _ComponentSite;
+            }
+            set
+            {
+                _ComponentSite = value;
+            }
+        }
+
+        private bool _DesignMode = false;
+        /// <summary>
+        /// Returns whether item is in design mode.
+        /// </summary>
+        internal bool DesignMode
+        {
+            get
+            {
+                return _DesignMode || _ComponentSite != null && _ComponentSite.DesignMode;
+            }
+            set
+            {
+                _DesignMode = value;
+            }
+        }
+
+        private bool _IsSelected = false;
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), EditorBrowsable(EditorBrowsableState.Never)]
+        public bool IsSelected
+        {
+            get { return _IsSelected; }
+            set
+            {
+                if (value != _IsSelected)
+                {
+                    bool oldValue = _IsSelected;
+                    _IsSelected = value;
+                    OnIsSelectedChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when IsSelected property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnIsSelectedChanged(bool oldValue, bool newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("IsSelected"));
+            this.Invalidate();
+        }
+
+        public override string ToString()
+        {
+            return string.Format("Text:'{0}', Name:{1}, LayoutItemBase");
+
+        }
+
+        private eTextAlignment _TextAlignment = eTextAlignment.Default;
+        /// <summary>
+        /// Indicates the text alignment within the text bounds. Depending on layout item type not all alignments are available.
+        /// </summary>
+        [DefaultValue(eTextAlignment.Default), Category("Appearance"), Description("Indicates the text alignment within the text bounds.")]
+        public eTextAlignment TextAlignment
+        {
+            get { return _TextAlignment; }
+            set
+            {
+                if (value != _TextAlignment)
+                {
+                    eTextAlignment oldValue = _TextAlignment;
+                    _TextAlignment = value;
+                    OnTextAlignmentChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when TextAlignment property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnTextAlignmentChanged(eTextAlignment oldValue, eTextAlignment newValue)
+        {
+            this.InvalidateLayout();
+            this.Invalidate();
+            OnPropertyChanged(new PropertyChangedEventArgs("TextAlignment"));
+        }
+
+        private eTextLineAlignment _TextLineAlignment = eTextLineAlignment.Default;
+        /// <summary>
+        /// Indicates text line alignment. Usually there is no need to change this property value since Default setting will use text-base line so text-box text and captions align.
+        /// </summary>
+        [DefaultValue(eTextLineAlignment.Default), Category("Appearance"), Description("Indicates text line alignment. Usually there is no need to change this property value since Default setting will use text-base line so text-box text and captions align.")]
+        public eTextLineAlignment TextLineAlignment
+        {
+            get { return _TextLineAlignment; }
+            set
+            {
+                if (value != _TextLineAlignment)
+                {
+                    eTextLineAlignment oldValue = _TextLineAlignment;
+                    _TextLineAlignment = value;
+                    OnTextLineAlignmentChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when TextLineAlignment property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnTextLineAlignmentChanged(eTextLineAlignment oldValue, eTextLineAlignment newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("TextLineAlignment"));
+            this.Invalidate();
+        }
+
+        /// <summary>
+        /// Gets whether this item text-size is shared with other items inside of its parent group.
+        /// </summary>
+        [Browsable(false)]
+        public virtual bool IsTextSizeShared
+        {
+            get
+            {
+                return _SharedTextSizeEnabled;
+            }
+        }
+
+        /// <summary>
+        /// Gets whether this item's text-baseline is shared with other items inside of its parent group.
+        /// </summary>
+        [Browsable(false)]
+        public virtual bool IsTextBaselineShared
+        {
+            get
+            {
+                return true;
+            }
+        }
+
+        private bool _Visible = true;
+        /// <summary>
+        /// Indicates visibility of the item.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance"), Description("Indicates visibility of the item.")]
+        public bool Visible
+        {
+            get { return _Visible; }
+            set
+            {
+                if (value !=_Visible)
+                {
+                    bool oldValue = _Visible;
+                    _Visible = value;
+                    OnVisibleChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when Visible property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnVisibleChanged(bool oldValue, bool newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("Visible"));
+            InvalidateLayout();
+        }
+        #endregion
+
+        #region TextMarkup
+        /// <summary>
+        /// Occurs when text markup link is clicked. Markup links can be created using "a" tag, for example:
+        /// <a name="MyLink">Markup link</a>
+        /// </summary>
+        [Description("Occurs when text markup link is clicked. Markup links can be created using a tag.")]
+        public event MarkupLinkClickEventHandler MarkupLinkClick;
+        protected virtual void TextMarkupLinkClick(object sender, EventArgs e)
+        {
+            TextMarkup.HyperLink link = sender as TextMarkup.HyperLink;
+            if (link != null)
+                OnMarkupLinkClick(new MarkupLinkClickEventArgs(link.Name, link.HRef));
+
+        }
+        protected virtual void OnMarkupLinkClick(MarkupLinkClickEventArgs e)
+        {
+            if (this.MarkupLinkClick != null)
+                MarkupLinkClick(this, e);
+        }
+
+        private TextMarkup.BodyElement _TextMarkup = null;
+
+        private void MarkupTextChanged()
+        {
+            if (!IsMarkupSupported)
+                return;
+
+            if (_TextMarkup != null)
+                _TextMarkup.HyperLinkClick -= this.TextMarkupLinkClick;
+
+            _TextMarkup = null;
+
+            if (!TextMarkup.MarkupParser.IsMarkup(ref _Text))
+                return;
+
+            _TextMarkup = TextMarkup.MarkupParser.Parse(_Text);
+
+            if (_TextMarkup != null)
+                _TextMarkup.HyperLinkClick += TextMarkupLinkClick;
+        }
+
+        /// <summary>
+        /// Gets reference to parsed markup body element if text was markup otherwise returns null.
+        /// </summary>
+        internal TextMarkup.BodyElement TextMarkupBody
+        {
+            get { return _TextMarkup; }
+        }
+
+        private bool _TextMarkupEnabled = true;
+        /// <summary>
+        /// Gets or sets whether item supports and renders text markup. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Gets or sets whether item supports and renders text markup.")]
+        public bool TextMarkupEnabled
+        {
+            get { return _TextMarkupEnabled; }
+            set
+            {
+                if (_TextMarkupEnabled != value)
+                {
+                    _TextMarkupEnabled = value;
+                    this.InvalidateLayout();
+                    this.Invalidate();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether item supports text markup. Default is false.
+        /// </summary>
+        protected virtual bool IsMarkupSupported
+        {
+            get { return _TextMarkupEnabled; }
+        }
+
+        private bool _IsMouseOver = false;
+        /// <summary>
+        /// Gets whether mouse is over the item.
+        /// </summary>
+        [Browsable(false)]
+        internal bool IsMouseOver
+        {
+            get { return _IsMouseOver; }
+            set
+            {
+                _IsMouseOver = value;
+            }
+        }
+        private bool _HostedItemMouseEntered = false;
+        protected internal virtual void OnMouseEnter(object sender, EventArgs e)
+        {
+            IsMouseOver = true;
+            LayoutControl lc = GetLayoutControl();
+            ResetHover(lc);
+        }
+        protected internal virtual void OnMouseMove(object sender, MouseEventArgs e)
+        {
+            if (_TextMarkup != null)
+                _TextMarkup.MouseMove(sender as Control, e);
+
+            if (!IsMouseOver) HideToolTip();
+        }
+        protected internal virtual void OnMouseDown(object sender, MouseEventArgs e)
+        {
+            HideToolTip();
+
+            if (_TextMarkup != null)
+                _TextMarkup.MouseDown(sender as Control, e);
+        }
+
+        protected internal virtual void OnMouseUp(object sender, MouseEventArgs e)
+        {
+            if (_TextMarkup != null)
+                _TextMarkup.MouseUp(sender as Control, e);
+        }
+
+        protected internal virtual void OnMouseLeave(object sender, EventArgs e)
+        {
+            HideToolTip();
+
+            if (_TextMarkup != null)
+                _TextMarkup.MouseLeave(sender as Control);
+
+            IsMouseOver = false;
+        }
+
+        protected internal virtual void OnClick(object sender, EventArgs e)
+        {
+            if (_TextMarkup != null)
+                _TextMarkup.Click(sender as Control);
+        }
+
+        protected internal virtual void OnMouseHover(object sender, EventArgs e)
+        {
+            if (System.Windows.Forms.Control.MouseButtons == System.Windows.Forms.MouseButtons.None)
+                this.ShowToolTip();
+        }
+        #endregion
+
+        #region Tooltip Support
+
+        /// <summary>
+        /// Occurs after Tooltip text has changed.
+        /// </summary>
+        protected virtual void OnTooltipChanged() { }
+        private string _Tooltip = "";
+        /// <summary>
+        /// Gets/Sets informational text (tooltip) for the cell.
+        /// </summary>
+        [Browsable(true), DefaultValue(""), Category("Appearance"), Description("Indicates the text that is displayed when mouse hovers over the cell."), Localizable(true)]
+        public string Tooltip
+        {
+            get
+            {
+
+                return _Tooltip;
+            }
+            set
+            {
+                if (_Tooltip == value)
+                    return;
+                if (value == null) value = "";
+                _Tooltip = value;
+
+                if (this.ToolTipVisible)
+                {
+                    if (string.IsNullOrEmpty(_Tooltip))
+                        this.HideToolTip();
+                    else
+                    {
+                        DevComponents.DotNetBar.ToolTip tooltipWindow = _ToolTipWnd;
+                        tooltipWindow.Text = _Tooltip;
+                        tooltipWindow.ShowToolTip();
+                        tooltipWindow.Invalidate();
+                    }
+                }
+                OnTooltipChanged();
+            }
+        }
+        /// <summary>
+        /// Gets whether tooltip is visible or not.
+        /// </summary>
+        internal protected bool ToolTipVisible
+        {
+            get
+            {
+                return (_ToolTipWnd != null);
+            }
+        }
+        /// <summary>
+        /// Called when tooltip is shown and hidden.
+        /// </summary>
+        /// <param name="isShown">true if tooltip is being shown otherwise false.</param>
+        protected virtual void OnTooltip(bool isShown)
+        {
+        }
+        private DevComponents.DotNetBar.ToolTip _ToolTipWnd = null;
+        /// <summary>
+        /// Shows tooltip for this item.
+        /// </summary>
+        public virtual void ShowToolTip()
+        {
+            if (this.DesignMode)
+                return;
+
+            LayoutControl lc = this.GetLayoutControl();
+            if (lc != null && !lc.ShowToolTips || !this.ShowToolTips)
+                return;
+            OnTooltip(true);
+            if (_Tooltip != "")
+            {
+                if (_ToolTipWnd == null)
+                    _ToolTipWnd = new DevComponents.DotNetBar.ToolTip();
+                _ToolTipWnd.Style = StyleManager.GetEffectiveStyle();
+                _ToolTipWnd.Text = _Tooltip;
+                _ToolTipWnd.ReferenceRectangle = ScreenRectangle;
+
+                OnToolTipVisibleChanged(new EventArgs());
+                _ToolTipWnd.ShowToolTip();
+            }
+
+        }
+        /// <summary>
+        /// Destroys tooltip window.
+        /// </summary>
+        internal protected void HideToolTip()
+        {
+            if (_ToolTipWnd != null)
+            {
+                System.Drawing.Rectangle tipRect = _ToolTipWnd.Bounds;
+                tipRect.Width += 5;
+                tipRect.Height += 6;
+
+                OnTooltip(false);
+                OnToolTipVisibleChanged(new EventArgs());
+                try
+                {
+                    if (_ToolTipWnd != null)
+                    {
+                        _ToolTipWnd.Hide();
+                        _ToolTipWnd.Dispose();
+                        _ToolTipWnd = null;
+                    }
+                }
+                catch { }
+                LayoutControl lc = this.GetLayoutControl();
+                if (lc != null)
+                {
+                    lc.Invalidate(lc.RectangleToClient(tipRect), false);
+                }
+            }
+        }
+        /// <summary>
+        /// Resets Hoover timer.
+        /// </summary>
+        protected virtual void ResetHover(System.Windows.Forms.Control ctrl)
+        {
+            if (ctrl == null || ctrl.IsDisposed || !ctrl.IsHandleCreated)
+                return;
+            // We need to reset hover thing since it is fired only first time mouse hovers inside the window and we need it for each of our items
+            WinApi.TRACKMOUSEEVENT tme = new WinApi.TRACKMOUSEEVENT();
+            tme.dwFlags = WinApi.TME_QUERY;
+            tme.hwndTrack = ctrl.Handle;
+            tme.cbSize = System.Runtime.InteropServices.Marshal.SizeOf(tme);
+            WinApi.TrackMouseEvent(ref tme);
+            tme.dwFlags = tme.dwFlags | WinApi.TME_HOVER;
+            WinApi.TrackMouseEvent(ref tme);
+            ctrl = null;
+        }
+        /// <summary>
+        /// Occurs when item's tooltip visibility has changed.
+        /// </summary>
+        [System.ComponentModel.Description("Occurs when item's tooltip visibility has changed.")]
+        public event EventHandler ToolTipVisibleChanged;
+        private void OnToolTipVisibleChanged(EventArgs eventArgs)
+        {
+            EventHandler h = ToolTipVisibleChanged;
+            if (h != null)
+                ToolTipVisibleChanged(this, eventArgs);
+        }
+        private Rectangle ScreenRectangle
+        {
+            get
+            {
+                LayoutControl lc = this.GetLayoutControl();
+                if (lc == null) return Rectangle.Empty;
+                return new Rectangle(lc.PointToScreen(this.Bounds.Location), this.Bounds.Size);
+            }
+        }
+
+        private bool _ShowToolTips = true;
+        /// <summary>
+        /// Gets or sets whether tooltips are shown when mouse is over the item when Tooltip property is set.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether tooltips are shown when mouse is over the item when Tooltip property is set.")]
+        public bool ShowToolTips
+        {
+            get { return _ShowToolTips; }
+            set
+            {
+                _ShowToolTips = value;
+            }
+        }
+        #endregion
+
+        #region INotifyPropertyChanged Members
+
+        /// <summary>
+        /// Raises the PropertyChanged event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnPropertyChanged(PropertyChangedEventArgs e)
+        {
+            PropertyChangedEventHandler handler = PropertyChanged;
+            if (handler != null) handler(this, e);
+        }
+        /// <summary>
+        /// Occurs when property on object has changed.
+        /// </summary>
+        [Description("Occurs when property on object has changed.")]
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        #endregion
+    }
+
+
+    /// <summary>
+    /// Specifies how layout items elements should be sized relative to their container.
+    /// </summary>
+    public enum eLayoutSizeType
+    {
+        /// <summary>
+        /// The item should be sized to an exact number of pixels.
+        /// </summary>
+        Absolute,
+        /// <summary>
+        /// The item should be sized as a percentage of the parent container.
+        /// </summary>
+        Percent,
+    }
+
+    /// <summary>
+    /// Contains values that specify how a specific element is positioned relative to another element.
+    /// </summary>
+    public enum eLayoutPosition
+    {
+        /// <summary>
+        /// Default location, i.e. left.
+        /// </summary>
+        Default = 0,
+        /// <summary>
+        /// Item is located at the left edge of another item.
+        /// </summary>
+        Left = 1,
+        /// <summary>
+        /// Item is located at the right edge of another item.
+        /// </summary>
+        Right = 2,
+        /// <summary>
+        /// Item is located at the top edge of another item.
+        /// </summary>
+        Top = 3,
+        /// <summary>
+        /// Item is located at the bottom edge of another item.
+        /// </summary>
+        Bottom = 4,
+    }
+    /// <summary>
+    /// Specifies layout text alignment within the text bounds.
+    /// </summary>
+    public enum eTextAlignment
+    {
+        Default,
+        Left,
+        Right,
+        Center
+    }
+    /// <summary>
+    /// Specifies layout text line alignment within the text bounds.
+    /// </summary>
+    public enum eTextLineAlignment
+    {
+        Default,
+        Top,
+        Middle,
+        Bottom
+    }
+
+    #region MarkupLinkClickEventArgs
+    /// <summary>
+    /// Provides more information about MarkupLinkClick event.
+    /// </summary>
+    public class MarkupLinkClickEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets the value of href attribute from the markup link that was clicked.
+        /// </summary>
+        public readonly string HRef = "";
+
+        /// <summary>
+        /// Gets the value of name attribute from the markup link that was clicked.
+        /// </summary>
+        public readonly string Name = "";
+
+        /// <summary>
+        /// Creates new instance of the object.
+        /// </summary>
+        /// <param name="name">Value of name attribute.</param>
+        /// <param name="href">Value of href attribute.</param>
+        public MarkupLinkClickEventArgs(string name, string href)
+        {
+            this.HRef = href;
+            this.Name = name;
+        }
+    }
+
+    /// <summary>
+    /// Defines delegate for MarkupLinkClick event.
+    /// </summary>
+    public delegate void MarkupLinkClickEventHandler(object sender, MarkupLinkClickEventArgs e);
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/LayoutItemCollection.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/LayoutItemCollection.cs
new file mode 100644
index 00000000..fc9f8eaa
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/LayoutItemCollection.cs	
@@ -0,0 +1,371 @@
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.Collections.Generic;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Layout
+{
+    /// <summary>
+    /// Represents collection for LayoutItemBase objects.
+    /// </summary>
+    public class LayoutItemCollection : CollectionBase
+    {
+        #region Private Variables
+        private LayoutItemBase _ParentItem = null;
+        #endregion
+
+        #region Internal Implementation
+        public LayoutItemCollection()
+        {
+        }
+        /// <summary>
+        /// Gets or sets the item this collection is associated with.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public LayoutItemBase ParentItem
+        {
+            get { return _ParentItem; }
+        }
+        /// <summary>
+        /// Sets the item collection belongs to.
+        /// </summary>
+        /// <param name="parent">Item that is parent of this collection.</param>
+        internal void SetParentItem(LayoutItemBase parent)
+        {
+            _ParentItem = parent;
+        }
+
+        /// <summary>
+        /// Adds new object to the collection.
+        /// </summary>
+        /// <param name="item">Object to add.</param>
+        /// <returns>Index of newly added object.</returns>
+        public virtual int Add(LayoutItemBase item)
+        {
+            if (this.List.Contains(item))
+                return IndexOf(item); // throw new InvalidOperationException("Item already contained in collection");
+            return List.Add(item);
+        }
+
+        /// <summary>
+        /// Adds an array of objects to the collection. 
+        /// </summary>
+        /// <param name="items">Array of item objects.</param>
+        public virtual void AddRange(LayoutItemBase[] items)
+        {
+            foreach (LayoutItemBase item in items)
+                this.Add(item);
+        }
+
+        /// <summary>
+        /// Returns reference to the object in collection based on it's index.
+        /// </summary>
+        public LayoutItemBase this[int index]
+        {
+            get { return (LayoutItemBase)(List[index]); }
+            set { List[index] = value; }
+        }
+
+        /// <summary>
+        /// Inserts new object into the collection.
+        /// </summary>
+        /// <param name="index">Position of the object.</param>
+        /// <param name="value">Object to insert.</param>
+        public virtual void Insert(int index, LayoutItemBase value)
+        {
+            List.Insert(index, value);
+        }
+
+        /// <summary>
+        /// Returns index of the object inside of the collection.
+        /// </summary>
+        /// <param name="value">Reference to the object.</param>
+        /// <returns>Index of the object.</returns>
+        public int IndexOf(LayoutItemBase value)
+        {
+            return List.IndexOf(value);
+        }
+
+        /// <summary>
+        /// Returns whether collection contains specified object.
+        /// </summary>
+        /// <param name="value">Object to look for.</param>
+        /// <returns>true if object is part of the collection, otherwise false.</returns>
+        public bool Contains(LayoutItemBase value)
+        {
+            return List.Contains(value);
+        }
+
+        /// <summary>
+        /// Removes specified object from the collection.
+        /// </summary>
+        /// <param name="value"></param>
+        public virtual void Remove(LayoutItemBase value)
+        {
+            List.Remove(value);
+        }
+
+        protected override void OnRemove(int index, object value)
+        {
+            //if (!_PassiveCollection)
+            //{
+            //    AdvTree tree = GetTreeControl();
+            //    if (tree != null)
+            //        tree.InvokeBeforeNodeRemove(m_SourceAction, value as Node, m_ParentNode);
+            //}
+            base.OnRemove(index, value);
+        }
+
+
+        protected override void OnRemoveComplete(int index, object value)
+        {
+            base.OnRemoveComplete(index, value);
+            if(!_MovingItem)
+                ItemRemoveComplete(index, value);
+        }
+
+        private void ItemRemoveComplete(int index, object value)
+        {
+            LayoutItemBase item = value as LayoutItemBase;
+            item.Parent = null;
+        }
+
+        protected override void OnSetComplete(int index, object oldValue, object newValue)
+        {
+            base.OnSetComplete(index, oldValue, newValue);
+            if (!_MovingItem)
+            {
+                ItemRemoveComplete(index, oldValue);
+                ItemInsertComplete(newValue);
+            }
+        }
+
+        protected override void OnSet(int index, object oldValue, object newValue)
+        {
+            //if (!_PassiveCollection)
+            //{
+            //    AdvTree tree = GetTreeControl();
+
+            //    if (tree != null)
+            //        tree.InvokeBeforeNodeRemove(m_SourceAction, oldValue as Node, m_ParentNode);
+
+            //    if (tree != null)
+            //        tree.InvokeBeforeNodeInsert(m_SourceAction, newValue as Node, m_ParentNode);
+            //}
+            base.OnSet(index, oldValue, newValue);
+        }
+        private bool _MovingItem = false;
+        /// <summary>
+        /// Moves an item in collection from its current location to new location.
+        /// </summary>
+        /// <param name="item"></param>
+        /// <param name="moveToIndex"></param>
+        public void Move(DevComponents.DotNetBar.Layout.LayoutItemBase item, int moveToIndex)
+        {
+            _MovingItem = true;
+            try
+            {
+                if (moveToIndex > this.Count - 1) moveToIndex = this.Count - 1;
+                if (moveToIndex < 0) moveToIndex = 0;
+                List.Remove(item);
+                List.Insert(moveToIndex, item);
+
+                //LayoutItemBase temp = this[moveToIndex];
+                //int index = List.IndexOf(item);
+                //List[moveToIndex] = item;
+                //List[index] = temp;
+            }
+            finally
+            {
+                _MovingItem = false;
+            }
+        }
+        protected override void OnInsert(int index, object value)
+        {
+            //if (!_PassiveCollection)
+            //{
+            //    AdvTree tree = GetTreeControl();
+            //    if (tree != null)
+            //        tree.InvokeBeforeNodeInsert(m_SourceAction, value as Node, m_ParentNode);
+            //}
+            base.OnInsert(index, value);
+        }
+
+        protected override void OnInsertComplete(int index, object value)
+        {
+            base.OnInsertComplete(index, value);
+            if(!_MovingItem)
+                ItemInsertComplete(value);
+        }
+
+        private void ItemInsertComplete(object value)
+        {
+            LayoutItemBase item = value as LayoutItemBase;
+            item.Parent = _ParentItem;
+            //if (!_PassiveCollection)
+            //{
+            //    Node node = value as Node;
+            //    if (m_ParentNode != null)
+            //    {
+            //        if (node.Parent != null && node.Parent != m_ParentNode)
+            //            node.Remove();
+            //        node.SetParent(m_ParentNode);
+            //        if (m_ParentNode.NodesColumns.IsSorted)
+            //        {
+            //            AdvTree parentTree = m_TreeControl;
+            //            if (parentTree == null) parentTree = m_ParentNode.TreeControl;
+            //            if (parentTree != null)
+            //                parentTree.PushSortRequest(m_ParentNode);
+            //        }
+            //    }
+            //    else
+            //    {
+            //        if (node.Parent != null)
+            //            node.Remove();
+            //        else
+            //            node.InvokeOnParentChanged();
+            //        if (m_TreeControl != null && m_TreeControl.Columns.IsSorted)
+            //        {
+            //            m_TreeControl.PushSortRequest();
+            //        }
+            //    }
+            //    node.internalTreeControl = m_TreeControl;
+
+            //    if (m_ParentNode != null)
+            //        m_ParentNode.OnChildNodeInserted(node);
+            //    else
+            //        node.SizeChanged = true;
+
+            //    AdvTree tree = GetTreeControl();
+            //    if (tree != null)
+            //        tree.InvokeAfterNodeInsert(m_SourceAction, value as Node, m_ParentNode);
+            //}
+            //m_SourceAction = eTreeAction.Code;
+        }
+        /// <summary>
+        /// Copies collection into the specified array.
+        /// </summary>
+        /// <param name="array">Array to copy collection to.</param>
+        /// <param name="index">Starting index.</param>
+        public void CopyTo(LayoutItemBase[] array, int index)
+        {
+            List.CopyTo(array, index);
+        }
+
+        /// <summary>
+        /// Copies contained items to the item array.
+        /// </summary>
+        /// <param name="array">Array to copy to.</param>
+        public void CopyTo(LayoutItemBase[] array)
+        {
+            List.CopyTo(array, 0);
+        }
+
+        /// <summary>
+        /// Copies contained items to the item array.
+        /// </summary>
+        /// <param name="array">Array to copy to.</param>
+        public void CopyTo(List<LayoutItemBase> list)
+        {
+            foreach (LayoutItemBase item in this.List)
+            {
+                list.Add(item);
+            }
+        }
+
+        protected override void OnClear()
+        {
+            foreach (LayoutItemBase item in this.List)
+            {
+                item.Parent = null;
+            }
+            base.OnClear();
+        }
+
+        protected override void OnClearComplete()
+        {
+            if (_ParentItem is LayoutGroup && ((LayoutGroup)_ParentItem).IsRootGroup)
+            {
+                // Remove all the controls as well from layout control
+                List<Control> controlsToRemove = new List<Control>();
+                LayoutControl lc = ((LayoutGroup)_ParentItem).LayoutControl;
+                if (lc != null)
+                {
+                    lc.SuspendLayout();
+                    foreach (Control c in lc.Controls)
+                    {
+                        if (!lc.IsSystemControl(c))
+                            controlsToRemove.Add(c);
+                    }
+                    foreach (Control c in controlsToRemove)
+                    {
+                        lc.Controls.Remove(c);
+                        if (lc.DisposeControlsOnRootGroupClear)
+                            c.Dispose();
+                    }
+                    lc.ResumeLayout();
+                }
+            }
+            base.OnClearComplete();
+        }
+
+        /// <summary>
+        /// Sorts the elements in the entire collection using the IComparable implementation of each element.
+        /// </summary>
+        public virtual void Sort()
+        {
+            this.Sort(0, this.Count, Comparer.Default);
+        }
+        /// <summary>
+        /// Sorts the elements in the entire collection using the specified comparer.
+        /// </summary>
+        /// <param name="comparer">The IComparer implementation to use when comparing elements.-or- null to use the IComparable implementation of each element.</param>
+        public virtual void Sort(IComparer comparer)
+        {
+            this.Sort(0, this.Count, comparer);
+        }
+        /// <summary>
+        /// Sorts the elements in a range of elements in collection using the specified comparer.
+        /// </summary>
+        /// <param name="index"></param>
+        /// <param name="count"></param>
+        /// <param name="comparer"></param>
+        public virtual void Sort(int index, int count, IComparer comparer)
+        {
+            //AdvTree tree = GetTreeControl();
+            //if (!_PassiveCollection && tree != null)
+            //    tree.BeginUpdate();
+
+            this.InnerList.Sort(index, count, comparer);
+
+            //if (tree != null && tree.DeepSort)
+            //{
+            //    foreach (Node node in this.InnerList)
+            //    {
+            //        node.Nodes.Sort(0, node.Nodes.Count, comparer);
+            //    }
+            //}
+
+            //if (!_PassiveCollection && tree != null)
+            //    tree.EndUpdate();
+        }
+
+        /// <summary>
+        /// Finds the items with specified key, optionally searching sub-nodes.
+        /// </summary>
+        /// <param name="name">The name of the tree node to search for.</param>
+        /// <param name="searchAllChildren">true to search child nodes of tree nodes; otherwise, false. </param>
+        /// <returns>An array of Node objects whose Name property matches the specified key.</returns>
+        //public LayoutItemBase[] Find(string name, bool searchAllChildren)
+        //{
+        //    ArrayList list = new ArrayList();
+        //    NodeOperations.FindNodesByName(this, name, searchAllChildren, list);
+        //    Node[] nodes = new Node[list.Count];
+        //    if (list.Count > 0) list.CopyTo(nodes);
+        //    return nodes;
+        //}
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/LayoutLabelItem.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/LayoutLabelItem.cs
new file mode 100644
index 00000000..5c6f509c
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/LayoutLabelItem.cs	
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace DevComponents.DotNetBar.Layout
+{
+    /// <summary>
+    /// Represents the label item.
+    /// </summary>
+    internal class LayoutLabelItem : LayoutItemBase
+    {
+        #region Constructor
+
+        #endregion
+
+        #region Implementation
+        
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/LayoutSpacerItem.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/LayoutSpacerItem.cs
new file mode 100644
index 00000000..098376b3
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/LayoutSpacerItem.cs	
@@ -0,0 +1,50 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Layout
+{
+    /// <summary>
+    /// Represents the item used as empty spacer element.
+    /// </summary>
+    public class LayoutSpacerItem : LayoutItemBase
+    {
+        #region Constructor
+
+        #endregion
+
+        #region Implementation
+        protected override void OnPaintBackground(PaintContext context)
+        {
+            base.OnPaintBackground(context);
+
+            if (this.DesignMode && !this.IsSelected && this.Bounds.Width > 0 && this.Bounds.Height > 0)
+            {
+                using (Pen borderPen = this.DesignTimeBorderPen)
+                {
+                    Rectangle clientRectangle = this.Bounds;
+                    clientRectangle.Width--;
+                    clientRectangle.Height--;
+                    context.Graphics.DrawRectangle(borderPen, clientRectangle);
+                }
+            }
+        }
+        protected Pen DesignTimeBorderPen
+        {
+            get
+            {
+                Color color = (SystemColors.Control.GetBrightness() < 0.5) ? ControlPaint.Light(SystemColors.Control) : ControlPaint.Dark(SystemColors.Control);
+                LayoutControl lc = GetLayoutControl();
+                if (lc != null)
+                    color = (lc.BackColor.GetBrightness() < 0.5) ? ControlPaint.Light(lc.BackColor) : ControlPaint.Dark(lc.BackColor);
+                Pen pen = new Pen(color);
+                pen.DashStyle = DashStyle.Dash;
+                return pen;
+            }
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/PaintContext.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/PaintContext.cs
new file mode 100644
index 00000000..b19980e0
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/PaintContext.cs	
@@ -0,0 +1,51 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Layout
+{
+    public class PaintContext : IDisposable
+    {
+        /// <summary>
+        /// Initializes a new instance of the PaintContext class.
+        /// </summary>
+        /// <param name="control"></param>
+        /// <param name="graphics"></param>
+        public PaintContext(LayoutControl control, Graphics graphics, System.Drawing.Text.HotkeyPrefix hotkeyPrefix)
+        {
+            Control = control;
+            Graphics = graphics;
+            DefaultFont = control.LabelFont ?? control.Font;
+            HotkeyPrefix = hotkeyPrefix;
+            if (control.FocusStyle != null && control.FocusStyle.IsPainted)
+                this.FocusStyle = control.FocusStyle;
+            if (control.LabelTextColor.IsEmpty)
+                LabelTextColor = control.ForeColor;
+            else
+                LabelTextColor = control.LabelTextColor;
+            LabelTextBrush = new SolidBrush(LabelTextColor);
+            TextAlignment = control.LabelTextAlignment;
+        }
+        public LayoutControl Control = null;
+        public Graphics Graphics = null;
+        public Font DefaultFont = null;
+        public System.Drawing.Text.HotkeyPrefix HotkeyPrefix = System.Drawing.Text.HotkeyPrefix.Show;
+        public SimpleStyle FocusStyle = null;
+        public Color LabelTextColor = Color.Empty;
+        public Brush LabelTextBrush = null;
+        public eTextAlignment TextAlignment = eTextAlignment.Default;
+        #region IDisposable Members
+
+        public void Dispose()
+        {
+            if (LabelTextBrush != null)
+            {
+                LabelTextBrush.Dispose();
+                LabelTextBrush = null;
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/Properties/Resources.Designer.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/Properties/Resources.Designer.cs
new file mode 100644
index 00000000..4f7a02b1
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/Properties/Resources.Designer.cs	
@@ -0,0 +1,63 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace DevComponents.DotNetBar.Layout.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DevComponents.DotNetBar.Layout.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/Properties/Resources.resx b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/Properties/Resources.resx
new file mode 100644
index 00000000..af7dbebb
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/Properties/Resources.resx	
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/Properties/Settings.Designer.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/Properties/Settings.Designer.cs
new file mode 100644
index 00000000..88bbea34
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/Properties/Settings.Designer.cs	
@@ -0,0 +1,26 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace DevComponents.DotNetBar.Layout.Properties {
+    
+    
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
+        
+        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
+        
+        public static Settings Default {
+            get {
+                return defaultInstance;
+            }
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/Properties/Settings.settings b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/Properties/Settings.settings
new file mode 100644
index 00000000..39645652
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/Properties/Settings.settings	
@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='utf-8'?>
+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)">
+  <Profiles>
+    <Profile Name="(Default)" />
+  </Profiles>
+  <Settings />
+</SettingsFile>
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/SimpleStyle.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/SimpleStyle.cs
new file mode 100644
index 00000000..f9af9f06
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/SimpleStyle.cs	
@@ -0,0 +1,321 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel;
+using System.Drawing;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Layout
+{
+    [TypeConverter(typeof(System.ComponentModel.ExpandableObjectConverter))]
+    public class SimpleStyle : INotifyPropertyChanged, IDisposable
+    {
+        #region Constructor
+        /// <summary>
+        /// Initializes a new instance of the SimpleStyle class.
+        /// </summary>
+        public SimpleStyle()
+        {
+            _Background.PropertyChanged += BackgroundPropertyChanged;
+            _BorderPattern.PropertyChanged += BorderPatternPropertyChanged;
+        }
+        #endregion
+
+        #region Implementation
+        /// <summary>
+        /// Gets whether any properties on the style have been set that would cause style to be painted.
+        /// </summary>
+        [Browsable(false)]
+        public bool IsPainted
+        {
+            get
+            {
+                return _Background.IsBackgroundSet || !_BorderColors.IsEmpty && !_BorderThickness.IsZero || _Font != null;
+            }
+        }
+        private Background _Background = new Background();
+        /// <summary>
+        /// Gets or sets the style background.
+        /// </summary>
+        [Description("Indicates the style background")]
+        public Background Background
+        {
+            get
+            {
+                return _Background;
+            }
+
+            set
+            {
+                if (_Background != value)
+                {
+                    if (_Background != null)
+                        _Background.PropertyChanged -= BackgroundPropertyChanged;
+                    _Background = value;
+                    if (_Background != null)
+                        _Background.PropertyChanged += BackgroundPropertyChanged;
+                    OnPropertyChanged(new PropertyChangedEventArgs("Background"));
+                }
+            }
+        }
+        private void BackgroundPropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("Background." + e.PropertyName));
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeBackground()
+        {
+            return (_Background != null && !_Background.IsEmpty);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetBackground()
+        {
+            Background = new Background();
+        }
+
+
+        private Color _TextColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets text color.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates text color.")]
+        public Color TextColor
+        {
+            get { return _TextColor; }
+            set { _TextColor = value; OnPropertyChanged(new PropertyChangedEventArgs("TextColor")); }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeTextColor()
+        {
+            return !_TextColor.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetTextColor()
+        {
+            this.TextColor = Color.Empty;
+        }
+        private Font _Font = null;
+        /// <summary>
+        /// Indicates the text font.
+        /// </summary>
+        [DefaultValue(null), Category("Appearance"), Description("Indicates the text font.")]
+        public Font Font
+        {
+            get { return _Font; }
+            set
+            {
+                if (value != _Font)
+                {
+                    Font oldValue = _Font;
+                    _Font = value;
+                    OnFontChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when Font property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnFontChanged(Font oldValue, Font newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("Font"));
+
+        }
+        private BorderPattern _BorderPattern = new BorderPattern();
+        /// <summary>
+        /// Indicates the border line pattern.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates the border line pattern.")]
+        public BorderPattern BorderPattern
+        {
+            get { return _BorderPattern; }
+            set
+            {
+                if (value != _BorderPattern)
+                {
+                    BorderPattern oldValue = _BorderPattern;
+                    _BorderPattern = value;
+                    OnBorderPatternChanged(oldValue, value);
+                }
+            }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeBorderPattern()
+        {
+            return !_BorderPattern.IsEmpty;
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetBorderPattern()
+        {
+            this.BorderPattern = new BorderPattern();
+        }
+        /// <summary>
+        /// Called when BorderPattern property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnBorderPatternChanged(BorderPattern oldValue, BorderPattern newValue)
+        {
+            if (oldValue != null)
+                oldValue.PropertyChanged -= BorderPatternPropertyChanged;
+            if (newValue != null)
+                newValue.PropertyChanged += BorderPatternPropertyChanged;
+            OnPropertyChanged(new PropertyChangedEventArgs("BorderPattern"));
+        }
+        private void BorderPatternPropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("BorderPattern" + e.PropertyName));
+        }
+        private BorderColors _BorderColors = new BorderColors();
+        /// <summary>
+        /// Gets or sets the border color.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates border color.")]
+        public BorderColors BorderColors
+        {
+            get { return _BorderColors; }
+            set { _BorderColors = value; OnPropertyChanged(new PropertyChangedEventArgs("BorderColors")); }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeBorderColors()
+        {
+            return !_BorderColors.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetBorderColors()
+        {
+            this.BorderColors = new BorderColors();
+        }
+
+        private Thickness _BorderThickness = new Thickness();
+        /// <summary>
+        /// Indicates the border thickness.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates the border thickness")]
+        public Thickness BorderThickness
+        {
+            get { return _BorderThickness; }
+            set
+            {
+                if (value != _BorderThickness)
+                {
+                    Thickness oldValue = _BorderThickness;
+                    _BorderThickness = value;
+                    OnBorderThicknessChanged(oldValue, value);
+                }
+            }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeBorderThickness()
+        {
+            return _BorderThickness.Bottom != 0 || _BorderThickness.Top != 0 || _BorderThickness.Left != 0 || _BorderThickness.Right != 0;
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetBorderThickness()
+        {
+            _BorderThickness = new Thickness(0);
+        }
+        /// <summary>
+        /// Called when BorderThickness property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnBorderThicknessChanged(Thickness oldValue, Thickness newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("BorderThickness"));
+        }
+
+        private Padding _Margin = new Padding(0);
+        /// <summary>
+        /// Gets or sets spacing between the edge of the item and the border and background. This does not influence the actual layout or size of the item rather applies to rendering of the style only.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), Description("Indicates spacing between the edge of the item and the border and background. This does not influence the actual layout or size of the item rather applies to rendering of the style only."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public Padding Margin
+        {
+            get { return _Margin; }
+            set
+            {
+                if (_Margin != value)
+                {
+                    Padding oldValue = _Margin;
+                    _Margin = value;
+                    OnMarginChanged(oldValue, value);
+                }
+
+            }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeMargin()
+        {
+            return _Margin.Bottom != 0 || _Margin.Top != 0 || _Margin.Left != 0 || _Margin.Right != 0;
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetMargin()
+        {
+            _Margin = new Padding(0);
+        }
+        /// <summary>
+        /// Called when Margin property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnMarginChanged(Padding oldValue, Padding newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("Margin"));
+        }
+        #endregion
+
+        #region IDisposable Members
+
+        protected virtual void OnDispose()
+        {
+
+        }
+        public void Dispose()
+        {
+            OnDispose();
+        }
+
+        #endregion
+
+        #region INotifyPropertyChanged Members
+
+        /// <summary>
+        /// Raises the PropertyChanged event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnPropertyChanged(PropertyChangedEventArgs e)
+        {
+            PropertyChangedEventHandler handler = PropertyChanged;
+            if (handler != null) handler(this, e);
+        }
+        /// <summary>
+        /// Occurs when property on object has changed.
+        /// </summary>
+        [Description("Occurs when property on object has changed.")]
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/Symbols.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/Symbols.cs
new file mode 100644
index 00000000..881e2537
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/Symbols.cs	
@@ -0,0 +1,143 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+using System.Drawing.Text;
+using System.Runtime.InteropServices;
+using System.Windows.Forms;
+using System.ComponentModel;
+using System.IO;
+using System.Reflection;
+#if LAYOUT
+namespace DevComponents.DotNetBar.Layout
+#else
+namespace DevComponents.DotNetBar
+#endif
+{
+    // Uses Font Awesome - http://fortawesome.github.com/Font-Awesome
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public static class Symbols
+    {
+        #region WinApi
+        [DllImport("gdi32")]
+        static extern IntPtr AddFontMemResourceEx(IntPtr pbFont,
+                                                           uint cbFont,
+                                                           IntPtr pdv,
+                                                           [In] ref uint pcFonts);
+        [DllImport("gdi32")]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        static extern bool RemoveFontMemResourceEx(IntPtr fh);
+        #endregion
+
+
+        #region Internal Implementation
+        private static Dictionary<float, Font> _FontAwesomeCache = new Dictionary<float, Font>(10);
+        /// <summary>
+        /// Returns FontAwesome at specific size.
+        /// </summary>
+        /// <param name="fontSize">Font size in points</param>
+        /// <returns>Font in desired size.</returns>
+        public static Font GetFontAwesome(float fontSize)
+        {
+            Font font = null;
+            EnsureFontLoaded();
+            if (fontSize <= 0) return _FontAwesome;
+            if(_FontAwesomeCache.TryGetValue(fontSize, out font))
+                return font;
+            font = new Font(_FontAwesome.FontFamily, fontSize, FontStyle.Regular, GraphicsUnit.Point);
+            _FontAwesomeCache.Add(fontSize, font);
+            return font;
+        }
+
+        private static Font _FontAwesome = null;
+        /// <summary>
+        /// Gets FontAwesome at default size.
+        /// </summary>
+        public static Font FontAwesome
+        {
+            get
+            {
+                EnsureFontLoaded();
+                return _FontAwesome;
+            }
+        }
+        /// <summary>
+        /// Returns FontAwesome Family.
+        /// </summary>
+        public static FontFamily FontAwesomeFamily
+        {
+            get
+            {
+                EnsureFontLoaded();
+                return _FontAwesome.FontFamily;
+            }
+        }
+
+        private static PrivateFontCollection _PrivateFontCollection;
+        private static GCHandle _FontAwesomeHandle;
+        private static IntPtr _FontAwesomePointer;
+        private static void EnsureFontLoaded()
+        {
+            if (_FontAwesome == null)
+            {
+                _PrivateFontCollection = new PrivateFontCollection();
+
+                byte[] fontAwesomeBuffer = LoadFont("SystemImages.FontAwesome.ttf");
+                _FontAwesomeHandle = GCHandle.Alloc(fontAwesomeBuffer, GCHandleType.Pinned);
+                _PrivateFontCollection.AddMemoryFont(_FontAwesomeHandle.AddrOfPinnedObject(), fontAwesomeBuffer.Length);
+                uint rsxCnt = 1;
+                _FontAwesomePointer = AddFontMemResourceEx(_FontAwesomeHandle.AddrOfPinnedObject(),
+                                                     (uint)fontAwesomeBuffer.Length, IntPtr.Zero, ref rsxCnt);
+                using (FontFamily ff = _PrivateFontCollection.Families[0])
+                {
+                    if (ff.IsStyleAvailable(FontStyle.Regular))
+                    {
+                        _FontAwesome = new Font(ff, _FontAwesomeDefaultSize, FontStyle.Regular, GraphicsUnit.Point);
+                        _FontAwesomeCache.Add(_FontAwesomeDefaultSize, _FontAwesome);
+                    }
+                    else
+                    {
+                        // Error use default font...
+                        _FontAwesome = SystemInformation.MenuFont;
+                    }
+                }
+            }
+        }
+
+        private static float _FontAwesomeDefaultSize = 18;
+        /// <summary>
+        /// Gets the default size for the FontAwesome font size in points.
+        /// </summary>
+        public static float FontAwesomeDefaultSize
+        {
+            get { return _FontAwesomeDefaultSize; }
+        }
+
+        internal static byte[] LoadFont(string fontFileName)
+        {
+            DotNetBarLayoutResourcesAttribute att = Attribute.GetCustomAttribute(System.Reflection.Assembly.GetExecutingAssembly(), typeof(DotNetBarLayoutResourcesAttribute)) as DotNetBarLayoutResourcesAttribute;
+            if (att != null && att.NamespacePrefix != "")
+            {
+                using (Stream fontStream = Assembly.GetExecutingAssembly().GetManifestResourceStream(att.NamespacePrefix + "." + fontFileName))
+                {
+                    byte[] fontData = new byte[fontStream.Length];
+                    fontStream.Read(fontData, 0, fontData.Length);
+                    fontStream.Close();
+                    return fontData;
+                }
+            }
+            else
+            {
+                using (Stream fontStream = typeof(LayoutControl).Module.Assembly.GetManifestResourceStream(typeof(LayoutControl), fontFileName))
+                {
+                    byte[] fontData = new byte[fontStream.Length];
+                    fontStream.Read(fontData, 0, fontData.Length);
+                    fontStream.Close();
+                    return fontData;
+                }
+            }
+            return new byte[0];
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/SystemImages/FontAwesome.ttf b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/SystemImages/FontAwesome.ttf
new file mode 100644
index 00000000..d3659246
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/SystemImages/FontAwesome.ttf differ
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextDrawing.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextDrawing.cs
new file mode 100644
index 00000000..cde27826
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextDrawing.cs	
@@ -0,0 +1,276 @@
+using System;
+using System.Text;
+using System.Drawing;
+using System.Windows.Forms;
+using System.Drawing.Text;
+using System.Collections.Generic;
+
+#if DOTNETBAR
+namespace DevComponents.DotNetBar
+#elif LAYOUT
+namespace DevComponents.DotNetBar.Layout
+#else
+namespace DevComponents.Tree
+#endif
+{
+    public class TextDrawing
+    {
+        static TextDrawing()
+        {
+            string lc = Application.CurrentCulture.TwoLetterISOLanguageName;
+            if (lc == "ja" || lc == "ko" || lc == "zh" || lc == "ar")
+                UseGenericDefault = true;
+        }
+
+        public static bool TextDrawingEnabled = true;
+        public static bool UseTextRenderer = false;
+
+        public static void DrawString(Graphics g, string text, Font font, Color color, int x, int y, eTextFormat format)
+        {
+            DrawString(g, text, font, color, new Rectangle(x, y, 0, 0), format);
+        }
+        public static void DrawString(Graphics g, string text, Font font, Color color, Rectangle bounds, eTextFormat format)
+        {
+            #if FRAMEWORK20
+            if (UseTextRenderer && (format & eTextFormat.Vertical) == 0)
+                TextRenderer.DrawText(g, text, font, bounds, color, GetTextFormatFlags(format));
+            else
+                DrawStringLegacy(g, text, font, color, bounds, format);
+            #else
+            DrawStringLegacy(g, text, font, color, bounds, format);
+            #endif
+        }
+
+        public static void DrawStringLegacy(Graphics g, string text, Font font, Color color, Rectangle bounds, eTextFormat format)
+        {
+            if (color.IsEmpty || !TextDrawingEnabled)
+                return;
+
+            using (SolidBrush brush = new SolidBrush(color))
+            {
+                //using (StringFormat sf = GetStringFormat(format))
+                StringFormat sf = GetStringFormat(format);
+                    g.DrawString(text, font, brush, bounds, sf);
+            }
+        }
+        public static void DrawStringLegacy(Graphics g, string text, Font font, Color color, RectangleF bounds, eTextFormat format)
+        {
+            if (color.IsEmpty || !TextDrawingEnabled)
+                return;
+
+            using (SolidBrush brush = new SolidBrush(color))
+            {
+                StringFormat sf = GetStringFormat(format);
+                g.DrawString(text, font, brush, bounds, sf);
+            }
+        }
+
+
+        public static Size MeasureString(Graphics g, string text, Font font)
+        {
+            return MeasureString(g, text, font, Size.Empty, eTextFormat.Default);
+        }
+
+        public static Size MeasureString(Graphics g, string text, Font font, int proposedWidth, eTextFormat format)
+        {
+            return MeasureString(g, text, font, new Size(proposedWidth, 0), format);
+        }
+
+        public static Size MeasureString(Graphics g, string text, Font font, int proposedWidth)
+        {
+            return MeasureString(g, text, font, new Size(proposedWidth, 0), eTextFormat.Default);
+        }
+
+        public static Size MeasureString(Graphics g, string text, Font font, Size proposedSize, eTextFormat format)
+        {
+            #if FRAMEWORK20
+            if (UseTextRenderer && (format & eTextFormat.Vertical) == 0)
+            {
+                format = format & ~(format & eTextFormat.VerticalCenter); // Bug in .NET Framework 2.0
+                format = format & ~(format & eTextFormat.Bottom); // Bug in .NET Framework 2.0
+                format = format & ~(format & eTextFormat.HorizontalCenter); // Bug in .NET Framework 2.0
+                format = format & ~(format & eTextFormat.Right); // Bug in .NET Framework 2.0
+                format = format & ~(format & eTextFormat.EndEllipsis); // Bug in .NET Framework 2.0
+                return Size.Ceiling(TextRenderer.MeasureText(g, text, font, proposedSize, GetTextFormatFlags(format)));
+            }
+            //using (StringFormat sf = GetStringFormat(format))
+            StringFormat sf = GetStringFormat(format);
+                return Size.Ceiling(g.MeasureString(text, font, proposedSize, sf));
+            #else
+            //using (StringFormat sf = GetStringFormat(format))
+            StringFormat sf = GetStringFormat(format);
+                return Size.Ceiling(g.MeasureString(text, font, proposedSize, sf));
+#endif
+            }
+
+        public static Size MeasureStringLegacy(Graphics g, string text, Font font, Size proposedSize, eTextFormat format)
+        {
+            //using (StringFormat sf = GetStringFormat(format))
+            StringFormat sf = GetStringFormat(format);
+                return g.MeasureString(text, font, proposedSize, sf).ToSize();
+        }
+
+
+        public static eTextFormat TranslateHorizontal(StringAlignment align)
+        {
+            if (align == StringAlignment.Center)
+                return eTextFormat.HorizontalCenter;
+            else if (align == StringAlignment.Far)
+                return eTextFormat.Right;
+            return eTextFormat.Default;
+        }
+
+        public static eTextFormat TranslateVertical(StringAlignment align)
+        {
+            if (align == StringAlignment.Center)
+                return eTextFormat.VerticalCenter;
+            else if (align == StringAlignment.Far)
+                return eTextFormat.Bottom;
+            return eTextFormat.Default;
+        }
+
+#if FRAMEWORK20
+        private static TextFormatFlags GetTextFormatFlags(eTextFormat format)
+        {
+            format |= eTextFormat.PreserveGraphicsTranslateTransform | eTextFormat.PreserveGraphicsClipping;
+            if((format & eTextFormat.SingleLine)==eTextFormat.SingleLine && (format & eTextFormat.WordBreak)==eTextFormat.WordBreak)
+                format = format & ~(format & eTextFormat.SingleLine);
+            return (TextFormatFlags)format;
+        }
+#endif
+        internal static bool UseGenericDefault = false;
+
+        private static Dictionary<eTextFormat, StringFormat> _CachedFormats = new Dictionary<eTextFormat, StringFormat>();
+        public static StringFormat GetStringFormat(eTextFormat format)
+        {
+            StringFormat sf;
+
+            if (_CachedFormats.TryGetValue(format, out sf)) return sf;
+
+            if (UseGenericDefault)
+                sf = (StringFormat)StringFormat.GenericDefault.Clone(); //new StringFormat(StringFormat.GenericDefault);
+            else
+                sf = (StringFormat)StringFormat.GenericTypographic.Clone(); // new StringFormat(StringFormat.GenericTypographic);
+
+            if (format == eTextFormat.Default)
+            {
+                sf.HotkeyPrefix = HotkeyPrefix.Show;
+                _CachedFormats.Add(format, sf);
+                return sf;
+            }
+            if ((format & eTextFormat.HorizontalCenter) == eTextFormat.HorizontalCenter)
+                sf.Alignment = StringAlignment.Center;
+            else if ((format & eTextFormat.Right) == eTextFormat.Right)
+                sf.Alignment=StringAlignment.Far;
+            if ((format & eTextFormat.VerticalCenter) == eTextFormat.VerticalCenter)
+                sf.LineAlignment=StringAlignment.Center;
+            else if ((format & eTextFormat.Bottom) == eTextFormat.Bottom)
+                sf.LineAlignment=StringAlignment.Far;
+
+            if ((format & eTextFormat.EndEllipsis) == eTextFormat.EndEllipsis)
+                sf.Trimming = StringTrimming.EllipsisCharacter;
+            else
+                sf.Trimming = StringTrimming.Character;
+
+            if ((format & eTextFormat.HidePrefix) == eTextFormat.HidePrefix)
+                sf.HotkeyPrefix = HotkeyPrefix.Hide;
+            else if ((format & eTextFormat.NoPrefix) == eTextFormat.NoPrefix)
+                sf.HotkeyPrefix = HotkeyPrefix.None;
+            else
+                sf.HotkeyPrefix = HotkeyPrefix.Show;
+
+            if ((format & eTextFormat.WordBreak) == eTextFormat.WordBreak)
+                sf.FormatFlags = sf.FormatFlags & ~(sf.FormatFlags & StringFormatFlags.NoWrap);
+            else
+                sf.FormatFlags |= StringFormatFlags.NoWrap;
+				
+			if ((format & eTextFormat.LeftAndRightPadding) == eTextFormat.LeftAndRightPadding)
+                sf.FormatFlags |= StringFormatFlags.MeasureTrailingSpaces;
+
+            if ((format & eTextFormat.RightToLeft) == eTextFormat.RightToLeft)
+                sf.FormatFlags |= StringFormatFlags.DirectionRightToLeft;
+
+            if ((format & eTextFormat.Vertical) == eTextFormat.Vertical)
+                sf.FormatFlags |= StringFormatFlags.DirectionVertical;
+
+            if ((format & eTextFormat.NoClipping) == eTextFormat.NoClipping)
+                sf.FormatFlags |= StringFormatFlags.NoClip;
+
+            _CachedFormats.Add(format, sf);
+
+            return sf;
+        }
+#if DOTNETBAR
+        public static ThemeTextFormat GetTextFormat(eTextFormat format)
+        {
+            ThemeTextFormat ttf = ThemeTextFormat.Left;
+            if (format == eTextFormat.Default)
+                return ttf;
+
+            if ((format & eTextFormat.HorizontalCenter) == eTextFormat.HorizontalCenter)
+                ttf |= ThemeTextFormat.Center;
+            else if ((format & eTextFormat.Right) == eTextFormat.Right)
+                ttf|= ThemeTextFormat.Right;
+            if ((format & eTextFormat.VerticalCenter) == eTextFormat.VerticalCenter)
+                ttf |= ThemeTextFormat.VCenter;
+            else if ((format & eTextFormat.Bottom) == eTextFormat.Bottom)
+                ttf |= ThemeTextFormat.Bottom;
+
+            if ((format & eTextFormat.EndEllipsis) == eTextFormat.EndEllipsis)
+                ttf |= ThemeTextFormat.EndEllipsis;
+
+            if ((format & eTextFormat.HidePrefix) == eTextFormat.HidePrefix)
+                ttf |= ThemeTextFormat.HidePrefix;
+            else if ((format & eTextFormat.NoPrefix) == eTextFormat.NoPrefix)
+                ttf |= ThemeTextFormat.NoPrefix;
+
+            if ((format & eTextFormat.WordBreak) == eTextFormat.WordBreak)
+                ttf |= ThemeTextFormat.WordBreak;
+            else
+                ttf |= ThemeTextFormat.SingleLine;
+
+            if ((format & eTextFormat.RightToLeft) == eTextFormat.RightToLeft)
+                ttf |= ThemeTextFormat.RtlReading;
+
+            if ((format & eTextFormat.NoClipping) == eTextFormat.NoClipping)
+                ttf |= ThemeTextFormat.NoClip;
+
+            return ttf;
+        }
+#endif
+    }
+
+    [Flags]
+    public enum eTextFormat
+    {
+        Bottom = 8,
+        Default = 0,
+        EndEllipsis = 0x8000,
+        ExpandTabs = 0x40,
+        ExternalLeading = 0x200,
+        GlyphOverhangPadding = 0,
+        HidePrefix = 0x100000,
+        HorizontalCenter = 1,
+        Internal = 0x1000,
+        Left = 0,
+        LeftAndRightPadding = 0x20000000,
+        ModifyString = 0x10000,
+        NoClipping = 0x100,
+        NoFullWidthCharacterBreak = 0x80000,
+        NoPadding = 0x10000000,
+        NoPrefix = 0x800,
+        PathEllipsis = 0x4000,
+        PrefixOnly = 0x200000,
+        PreserveGraphicsClipping = 0x1000000,
+        PreserveGraphicsTranslateTransform = 0x2000000,
+        Right = 2,
+        RightToLeft = 0x20000,
+        SingleLine = 0x20,
+        TextBoxControl = 0x2000,
+        Top = 0,
+        VerticalCenter = 4,
+        WordBreak = 0x10,
+        WordEllipsis = 0x40000,
+        Vertical = 0x40000000
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextMarkup/BarUtilities.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextMarkup/BarUtilities.cs
new file mode 100644
index 00000000..3e36cf0a
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextMarkup/BarUtilities.cs	
@@ -0,0 +1,185 @@
+using System;
+using System.ComponentModel;
+using System.Runtime.InteropServices;
+using System.Drawing.Text;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Layout
+{
+	/// <summary>
+	/// Represents class with static functions that provide commonly used utility functions when working with
+	/// Bar objects and items hosted by Bar object.
+	/// </summary>
+	internal class BarUtilities
+    {
+        /// <summary>
+        /// Gets or sets whether StringFormat internally used by all DotNetBar controls to render text is GenericDefault. Default value is false
+        /// which indicates that GenericTypographic is used.
+        /// </summary>
+        public static bool UseGenericDefaultStringFormat
+        {
+            get { return TextDrawing.UseGenericDefault; }
+            set { TextDrawing.UseGenericDefault = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the anti-alias text rendering hint that will be used to render text on controls that have AntiAlias property set to true.
+        /// </summary>
+        public static TextRenderingHint AntiAliasTextRenderingHint
+        {
+            get
+            {
+                return DisplayHelp.AntiAliasTextRenderingHint;
+            }
+            set
+            {
+            	DisplayHelp.AntiAliasTextRenderingHint = value;
+            }
+        }
+
+#if FRAMEWORK20
+        /// <summary>
+        /// Gets or sets whether .NET Framework TextRenderer class is used for text rendering instead of Graphics.DrawString. 
+        /// Default value is false. 
+        /// Using TextRenderer will disable the Fade and Animation effects on controls because of issues in TextRenderer when drawing text on transparent
+        /// surfaces.
+        /// </summary>
+        public static bool UseTextRenderer
+        {
+            get { return TextDrawing.UseTextRenderer; }
+            set { TextDrawing.UseTextRenderer = value; }
+        }
+#endif
+
+
+        private static bool _AlwaysGenerateAccessibilityFocusEvent = false;
+        /// <summary>
+        /// Gets or sets whether items always generate the Focus accessibility event when mouse enters the item. Default value is false which indicates
+        /// that focus event will be raised only when item is on menu bar.
+        /// </summary>
+        public static bool AlwaysGenerateAccessibilityFocusEvent
+        {
+            get { return _AlwaysGenerateAccessibilityFocusEvent; }
+            set
+            {
+                _AlwaysGenerateAccessibilityFocusEvent = value;
+            }
+        }
+
+        internal static bool IsModalFormOpen
+        {
+            get
+            {
+#if (FRAMEWORK20)
+                for (int i = 0; i < System.Windows.Forms.Application.OpenForms.Count; i++)
+                {
+                    System.Windows.Forms.Form form = System.Windows.Forms.Application.OpenForms[i];
+                    if (form.Modal) return true;
+                }
+#endif
+                return false;
+            }
+        }
+
+        private static bool _AutoRemoveMessageFilter = false;
+        /// <summary>
+        /// Gets or sets whether Application Message Filter that is registered by popup controls
+        /// is automatically unregistered when last control is disposed. Default value is false and
+        /// in most cases should not be changed.
+        /// </summary>
+        public static bool AutoRemoveMessageFilter
+        {
+            get { return _AutoRemoveMessageFilter; }
+            set { _AutoRemoveMessageFilter = value; }
+        }
+
+        private static int _TextMarkupCultureSpecific = 3;
+        /// <summary>
+        /// Get or sets the text-markup padding for text measurement when running on Japanese version of Windows.
+        /// </summary>
+        public static int TextMarkupCultureSpecificPadding
+        {
+            get { return _TextMarkupCultureSpecific; }
+            set
+            {
+                _TextMarkupCultureSpecific = value;
+            }
+        }
+
+        private static bool _DisposeItemImages = false;
+        /// <summary>
+        /// Gets or sets whether Image and Icon resources assigned to items and controls are automatically disposed when
+        /// control or item is disposed. Default value is false.
+        /// </summary>
+        public static bool DisposeItemImages
+        {
+            get
+            {
+                return _DisposeItemImages;
+            }
+            set
+            {
+                _DisposeItemImages = value;
+            }
+        }
+
+        /// <summary>
+        /// Disposes image reference and sets it to null.
+        /// </summary>
+        /// <param name="image">Reference to image to dispose.</param>
+        internal static void DisposeImage(ref System.Drawing.Image image)
+        {
+            if (image == null) return;
+            image.Dispose();
+            image = null;
+        }
+        /// <summary>
+        /// Disposes image reference and sets it to null.
+        /// </summary>
+        /// <param name="image">Reference to image to dispose.</param>
+        internal static void DisposeImage(ref System.Drawing.Icon icon)
+        {
+            if (icon == null) return;
+            icon.Dispose();
+            icon = null;
+        }
+
+        #region Delayed Invoke
+        /// <summary>
+        /// Invokes the method asynchronously using the WinForms Timer.
+        /// </summary>
+        /// <param name="method">Method to invoke.</param>
+        public static void InvokeDelayed(MethodInvoker method)
+        {
+            InvokeDelayed(method, 10);
+        }
+        /// <summary>
+        /// Invokes the method asynchronously using the WinForms Timer.
+        /// </summary>
+        /// <param name="method">Method to invoke.</param>
+        /// <param name="delayInterval">Time in milliseconds after which method is invoked.</param>
+        public static void InvokeDelayed(MethodInvoker method, int delayInterval)
+        {
+            Timer delayedInvokeTimer = new Timer();
+            delayedInvokeTimer = new Timer();
+            delayedInvokeTimer.Tag = method;
+            delayedInvokeTimer.Interval = delayInterval;
+            delayedInvokeTimer.Tick += new EventHandler(DelayedInvokeTimerTick);
+            delayedInvokeTimer.Start();
+        }
+        private static void DelayedInvokeTimerTick(object sender, EventArgs e)
+        {
+            Timer timer = (Timer)sender;
+            MethodInvoker method = (MethodInvoker)timer.Tag;
+            timer.Stop();
+            timer.Dispose();
+            method.Invoke();
+        }
+        #endregion
+    }
+
+	internal class BarPropertyBagKeys
+	{
+		public static string AutoHideSetting="autohide";
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextMarkup/BodyElement.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextMarkup/BodyElement.cs
new file mode 100644
index 00000000..b201c176
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextMarkup/BodyElement.cs	
@@ -0,0 +1,91 @@
+using System;
+using System.Text;
+using System.Windows.Forms;
+
+#if AdvTree
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#elif LAYOUT
+namespace DevComponents.DotNetBar.Layout.TextMarkup
+#endif
+{
+    internal class BodyElement : ContainerElement
+    {
+        #region Private Variables
+        private MarkupElementCollection m_ActiveElements=null;
+        private IActiveMarkupElement m_MouseOverElement = null;
+        internal bool HasExpandElement = false;
+        internal string PlainText = "";
+        #endregion
+
+        #region Events
+        public event EventHandler HyperLinkClick;
+        #endregion
+
+        #region Internal Implementation
+        public BodyElement()
+        {
+            m_ActiveElements = new MarkupElementCollection(null);
+        }
+
+        public MarkupElementCollection ActiveElements
+        {
+            get { return m_ActiveElements; }
+        }
+
+        public void MouseLeave(Control parent)
+        {
+            if (m_MouseOverElement != null)
+                m_MouseOverElement.MouseLeave(parent);
+            m_MouseOverElement = null;
+        }
+
+        public void MouseMove(Control parent, MouseEventArgs e)
+        {
+            if (m_MouseOverElement != null && m_MouseOverElement.HitTest(e.X, e.Y))
+                return;
+            if (m_MouseOverElement != null)
+                m_MouseOverElement.MouseLeave(parent);
+            
+            m_MouseOverElement = null;
+
+            foreach(IActiveMarkupElement el in m_ActiveElements)
+            {
+                if (el.HitTest(e.X, e.Y))
+                {
+                    m_MouseOverElement = el;
+                    m_MouseOverElement.MouseEnter(parent);
+                }
+            }
+        }
+
+        public void MouseDown(Control parent, MouseEventArgs e)
+        {
+            if (m_MouseOverElement != null)
+                m_MouseOverElement.MouseDown(parent, e);
+        }
+
+        public void MouseUp(Control parent, MouseEventArgs e)
+        {
+            if (m_MouseOverElement != null)
+                m_MouseOverElement.MouseUp(parent, e);
+        }
+
+        public void Click(Control parent)
+        {
+            if (m_MouseOverElement != null)
+            {
+                m_MouseOverElement.Click(parent);
+                if (m_MouseOverElement is HyperLink)
+                {
+                    if (HyperLinkClick != null)
+                        HyperLinkClick(m_MouseOverElement, new EventArgs());
+                }
+            }
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextMarkup/ContainerElement.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextMarkup/ContainerElement.cs
new file mode 100644
index 00000000..dabe4124
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextMarkup/ContainerElement.cs	
@@ -0,0 +1,113 @@
+using System;
+using System.Text;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+
+#if AdvTree
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+using DevComponents.UI.ContentManager;
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#elif LAYOUT
+namespace DevComponents.DotNetBar.Layout.TextMarkup
+#endif
+{
+    internal class ContainerElement : MarkupElement
+    {
+        #region Private Variables
+        private SerialContentLayoutManager m_Layout = null;
+        private MarkupLayoutManager m_MarkupLayout = null;
+        #endregion
+
+        #region Internal Implementation
+        public override void Measure(Size availableSize, MarkupDrawContext d)
+        {
+            ArrangeInternal(new Rectangle(Point.Empty, availableSize), d);
+        }
+
+        protected virtual SerialContentLayoutManager GetLayoutManager(bool mutliLine)
+        {
+            if (m_Layout == null)
+            {
+                m_Layout = new SerialContentLayoutManager();
+                m_Layout.MultiLine = mutliLine;
+                m_Layout.ContentVerticalAlignment = eContentVerticalAlignment.Top;
+                m_Layout.BlockLineAlignment = eContentVerticalAlignment.Top;
+                m_Layout.BlockSpacing = 0;
+            }
+
+            m_Layout.EvenHeight = true;
+            return m_Layout;
+        }
+
+        private MarkupLayoutManager GetMarkupLayout()
+        {
+            if (m_MarkupLayout == null)
+            {
+                m_MarkupLayout = new MarkupLayoutManager();
+            }
+            return m_MarkupLayout;
+        }
+
+        public override void Render(MarkupDrawContext d)
+        {
+            Point offset = this.GetContainerOffset();
+            d.Offset.Offset(offset.X, offset.Y);
+
+            try
+            {
+                foreach (MarkupElement e in this.Elements)
+                {
+                    e.Render(d);
+                }
+            }
+            finally
+            {
+                d.Offset.Offset(-offset.X, -offset.Y);
+            }
+        }
+
+        protected virtual Point GetContainerOffset()
+        {
+            return this.Bounds.Location;
+        }
+
+        protected override void ArrangeCore(Rectangle finalRect, MarkupDrawContext d)
+        {
+            this.Bounds = finalRect;
+            ArrangeInternal(finalRect, d);
+        }
+
+        protected virtual void ArrangeInternal(Rectangle bounds, MarkupDrawContext d)
+        {
+            SerialContentLayoutManager layout = GetLayoutManager(d.AllowMultiLine);
+            layout.RightToLeft = d.RightToLeft;
+            MarkupLayoutManager markupLayout = GetMarkupLayout();
+            markupLayout.MarkupDrawContext = d;
+            try
+            {
+                MarkupElement[] blocks = new MarkupElement[this.Elements.Count];
+                this.Elements.CopyTo(blocks);
+
+                Rectangle r = layout.Layout(new Rectangle(Point.Empty, bounds.Size), blocks, markupLayout);
+                this.Bounds = new Rectangle(bounds.Location, r.Size);
+            }
+            finally
+            {
+                markupLayout.MarkupDrawContext = null;
+            }
+        }
+
+        /// <summary>
+        /// Returns whether markup element is an block element that always consumes a whole line in layout.
+        /// </summary>
+        public override bool IsBlockElement
+        {
+            get { return true; }
+        }
+        #endregion
+        
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextMarkup/DisplayHelp.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextMarkup/DisplayHelp.cs
new file mode 100644
index 00000000..3318673e
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextMarkup/DisplayHelp.cs	
@@ -0,0 +1,932 @@
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System;
+using System.Drawing.Text;
+
+#if AdvTree
+namespace DevComponents.Tree
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar
+#elif LAYOUT
+namespace DevComponents.DotNetBar.Layout
+#endif
+{
+	/// <summary>
+	/// Summary description for Display.
+	/// </summary>
+	public class DisplayHelp
+	{
+		private DisplayHelp()
+		{
+		}
+
+		public static LinearGradientBrush CreateLinearGradientBrush(Rectangle r,Color color1, Color color2,float gradientAngle)
+		{
+			if(r.Width<=0)
+				r.Width=1;
+			if(r.Height<=0)
+				r.Height=1;
+			return new LinearGradientBrush(new Rectangle(r.X,r.Y-1,r.Width,r.Height+1),color1,color2,gradientAngle);
+		}
+
+		public static LinearGradientBrush CreateLinearGradientBrush(RectangleF r,Color color1, Color color2,float gradientAngle)
+		{
+			if(r.Width<=0)
+				r.Width=1;
+			if(r.Height<=0)
+				r.Height=1;
+			return new LinearGradientBrush(new RectangleF(r.X,r.Y-1,r.Width,r.Height+1),color1,color2,gradientAngle);
+		}
+
+		public static LinearGradientBrush CreateLinearGradientBrush(Rectangle r,Color color1, Color color2,float gradientAngle, bool isAngleScalable)
+		{
+			if(r.Width<=0)
+				r.Width=1;
+			if(r.Height<=0)
+				r.Height=1;
+			return new LinearGradientBrush(new Rectangle(r.X,r.Y-1,r.Width,r.Height+1),color1,color2,gradientAngle,isAngleScalable);
+		}
+
+		public static Rectangle GetDrawRectangle(Rectangle r)
+		{
+			r.Width--;
+			r.Height--;
+			return r;
+		}
+
+		public static Rectangle GetPathRectangle(Rectangle r)
+		{
+			//r.Width++;
+			//r.Height++;
+			return r;
+		}
+
+        public static void DrawRectangle(System.Drawing.Graphics g, Color color, int x, int y, int width, int height)
+        {
+            using (Pen pen = new Pen(color, 1))
+                DrawRectangle(g, pen, x, y, width, height);
+        }
+        public static void DrawRectangle(System.Drawing.Graphics g, Color color, System.Drawing.Rectangle r)
+        {
+            DrawRectangle(g, color, r.X, r.Y, r.Width, r.Height);
+        }
+
+		public static void DrawRectangle(System.Drawing.Graphics g, System.Drawing.Pen pen,  int x, int y, int width, int height)
+		{
+			// Fix for GDI issue
+			width--;
+			height--;
+			g.DrawRectangle(pen,x,y,width,height);
+		}
+		public static void DrawRectangle(System.Drawing.Graphics g, System.Drawing.Pen pen, System.Drawing.Rectangle r)
+		{
+			DrawRectangle(g,pen,r.X,r.Y,r.Width,r.Height);
+		}
+
+        //public static void DrawRoundedRectangle(System.Drawing.Graphics g, Color color, DevComponents.DotNetBar.Rendering.LinearGradientColorTable fillColor, Rectangle bounds, int cornerSize)
+        //{
+        //    using (Brush fill = CreateBrush(bounds, fillColor))
+        //    {
+        //        using (Pen pen = new Pen(color))
+        //            DrawRoundedRectangle(g, pen, fill, bounds.X, bounds.Y, bounds.Width, bounds.Height, cornerSize);
+        //    }
+        //}
+#if !LAYOUT
+        public static void DrawRoundedRectangle(System.Drawing.Graphics g, Color color, Color fillColor, Rectangle bounds, int cornerSize)
+        {
+            using (Brush fill = new SolidBrush(fillColor))
+            {
+                using (Pen pen = new Pen(color))
+                    DrawRoundedRectangle(g, pen, fill, bounds.X, bounds.Y, bounds.Width, bounds.Height, cornerSize);
+            }
+        }
+
+        public static void DrawRoundedRectangle(System.Drawing.Graphics g, Color color, Rectangle bounds, int cornerSize)
+        {
+            if (!color.IsEmpty)
+            {
+                using (Pen pen = new Pen(color))
+                    DrawRoundedRectangle(g, pen, bounds.X, bounds.Y, bounds.Width, bounds.Height, cornerSize);
+            }
+        }
+
+        public static void DrawRoundedRectangle(System.Drawing.Graphics g, Color color, int x, int y, int width, int height, int cornerSize)
+        {
+            if (!color.IsEmpty)
+            {
+                using (Pen pen = new Pen(color))
+                    DrawRoundedRectangle(g, pen, x, y, width, height, cornerSize);
+            }
+        }
+
+        public static void DrawRoundedRectangle(System.Drawing.Graphics g, System.Drawing.Pen pen, Rectangle bounds, int cornerSize)
+        {
+            DrawRoundedRectangle(g, pen, bounds.X, bounds.Y, bounds.Width, bounds.Height, cornerSize);
+        }
+        public static void DrawRoundedRectangle(System.Drawing.Graphics g, System.Drawing.Pen pen, int x, int y, int width, int height, int cornerSize)
+        {
+            DrawRoundedRectangle(g, pen, null, x, y, width, height, cornerSize);
+        }
+        public static void DrawRoundedRectangle(System.Drawing.Graphics g, System.Drawing.Pen pen, Brush fill, int x, int y, int width, int height, int cornerSize)
+        {
+            // Fix for GDI issue
+            width--;
+            height--;
+
+            Rectangle r = new Rectangle(x, y, width, height);
+
+            //SmoothingMode sm = g.SmoothingMode;
+            //g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.HighQuality;
+            
+            using (GraphicsPath path = GetRoundedRectanglePath(r, cornerSize))
+            {
+                if (fill != null)
+                    g.FillPath(fill, path);
+                g.DrawPath(pen, path);
+            }
+
+            //g.SmoothingMode = sm;
+        }
+
+        public static GraphicsPath GetRoundedRectanglePath(Rectangle r, int cornerSize)
+        {
+            GraphicsPath path = new GraphicsPath();
+            if (cornerSize == 0)
+                path.AddRectangle(r);
+            else
+            {
+                ElementStyleDisplay.AddCornerArc(path, r, cornerSize, eCornerArc.TopLeft);
+                ElementStyleDisplay.AddCornerArc(path, r, cornerSize, eCornerArc.TopRight);
+                ElementStyleDisplay.AddCornerArc(path, r, cornerSize, eCornerArc.BottomRight);
+                ElementStyleDisplay.AddCornerArc(path, r, cornerSize, eCornerArc.BottomLeft);
+                path.CloseAllFigures();
+            }
+            return path;
+        }
+
+        public static GraphicsPath GetRoundedRectanglePath(Rectangle r, int cornerTopLeft, int cornerTopRight, int cornerBottomRight, int cornerBottomLeft)
+        {
+            GraphicsPath path = new GraphicsPath();
+            ElementStyleDisplay.AddCornerArc(path, r, cornerTopLeft, eCornerArc.TopLeft);
+            ElementStyleDisplay.AddCornerArc(path, r, cornerTopRight, eCornerArc.TopRight);
+            ElementStyleDisplay.AddCornerArc(path, r, cornerBottomRight, eCornerArc.BottomRight);
+            ElementStyleDisplay.AddCornerArc(path, r, cornerBottomLeft, eCornerArc.BottomLeft);
+            path.CloseAllFigures();
+            return path;
+        }
+#endif
+        //public static GraphicsPath GetRoundedRectanglePath(Rectangle clientRectangle, int cornerSize, eStyleBackgroundPathPart pathPart,
+        //    eCornerType topLeftCornerType, eCornerType topRightCornerType, eCornerType bottomLeftCornerType, eCornerType bottomRightCornerType)
+        //{
+        //    return GetRoundedRectanglePath(clientRectangle, cornerSize, pathPart, topLeftCornerType, topRightCornerType, bottomLeftCornerType, bottomRightCornerType, 0);
+        //}
+
+        //public static GraphicsPath GetRoundedRectanglePath(Rectangle clientRectangle, int cornerSize, eStyleBackgroundPathPart pathPart,
+        //    eCornerType topLeftCornerType, eCornerType topRightCornerType, eCornerType bottomLeftCornerType, eCornerType bottomRightCornerType, float partSize)
+        //{
+        //    return GetRoundedRectanglePath(clientRectangle, cornerSize, cornerSize, cornerSize, cornerSize, pathPart, topLeftCornerType, topRightCornerType, bottomLeftCornerType, bottomRightCornerType, partSize);
+        //}
+
+        //public static GraphicsPath GetRoundedRectanglePath(Rectangle clientRectangle, int topLeftCornerSize, int topRightCornerSize, int bottomLeftCornerSize, int bottomRightCornerSize, eStyleBackgroundPathPart pathPart,
+        //    eCornerType topLeftCornerType, eCornerType topRightCornerType, eCornerType bottomLeftCornerType, eCornerType bottomRightCornerType, float partSize)
+        //{
+        //    GraphicsPath path = new GraphicsPath();
+
+        //    if (pathPart == eStyleBackgroundPathPart.TopHalf)
+        //    {
+        //        if (partSize == 0)
+        //            clientRectangle.Height = clientRectangle.Height / 2;
+        //        else
+        //            clientRectangle.Height = (int)(clientRectangle.Height * partSize);
+        //    }
+        //    else if (pathPart == eStyleBackgroundPathPart.BottomHalf)
+        //    {
+        //        int h = clientRectangle.Height;
+        //        if (partSize == 0)
+        //            clientRectangle.Height = clientRectangle.Height / 2;
+        //        else
+        //            clientRectangle.Height = (int)(clientRectangle.Height * partSize);
+        //        clientRectangle.Y += (h - clientRectangle.Height - 1);
+        //    }
+
+        //    eCornerType corner = topLeftCornerType;
+        //    if (corner == eCornerType.Inherit)
+        //        corner = eCornerType.Square;
+
+        //    if (pathPart == eStyleBackgroundPathPart.BottomHalf)
+        //        corner = eCornerType.Square;
+
+        //    if (corner == eCornerType.Rounded && topLeftCornerSize>0)
+        //    {
+        //        ArcData ad = ElementStyleDisplay.GetCornerArc(clientRectangle, topLeftCornerSize, eCornerArc.TopLeft);
+        //        path.AddArc(ad.X, ad.Y, ad.Width, ad.Height, ad.StartAngle, ad.SweepAngle);
+        //    }
+        //    else if (corner == eCornerType.Diagonal)
+        //    {
+        //        path.AddLine(clientRectangle.X, clientRectangle.Y + topLeftCornerSize, clientRectangle.X + topLeftCornerSize, clientRectangle.Y);
+        //    }
+        //    else
+        //    {
+        //        path.AddLine(clientRectangle.X, clientRectangle.Y + 2, clientRectangle.X, clientRectangle.Y);
+        //        path.AddLine(clientRectangle.X, clientRectangle.Y, clientRectangle.X + 2, clientRectangle.Y);
+        //    }
+
+        //    corner = topRightCornerType;
+        //    if (corner == eCornerType.Inherit)
+        //        corner = eCornerType.Square;
+        //    if (pathPart == eStyleBackgroundPathPart.BottomHalf)
+        //        corner = eCornerType.Square;
+        //    if (corner == eCornerType.Rounded && topRightCornerSize>0)
+        //    {
+        //        ArcData ad = ElementStyleDisplay.GetCornerArc(clientRectangle, topRightCornerSize, eCornerArc.TopRight);
+        //        path.AddArc(ad.X, ad.Y, ad.Width, ad.Height, ad.StartAngle, ad.SweepAngle);
+        //    }
+        //    else if (corner == eCornerType.Diagonal)
+        //    {
+        //        path.AddLine(clientRectangle.Right - topRightCornerSize - 1, clientRectangle.Y, clientRectangle.Right, clientRectangle.Y + topRightCornerSize);
+        //    }
+        //    else
+        //    {
+        //        path.AddLine(clientRectangle.Right - 2, clientRectangle.Y, clientRectangle.Right, clientRectangle.Y);
+        //        path.AddLine(clientRectangle.Right, clientRectangle.Y, clientRectangle.Right, clientRectangle.Y + 2);
+        //    }
+
+        //    corner = bottomRightCornerType;
+        //    if (corner == eCornerType.Inherit)
+        //        corner = eCornerType.Square;
+        //    if (pathPart == eStyleBackgroundPathPart.TopHalf)
+        //        corner = eCornerType.Square;
+        //    if (corner == eCornerType.Rounded && bottomRightCornerSize>0)
+        //    {
+        //        ArcData ad = ElementStyleDisplay.GetCornerArc(clientRectangle, bottomRightCornerSize, eCornerArc.BottomRight);
+        //        path.AddArc(ad.X, ad.Y, ad.Width, ad.Height, ad.StartAngle, ad.SweepAngle);
+        //    }
+        //    else if (corner == eCornerType.Diagonal)
+        //    {
+        //        path.AddLine(clientRectangle.Right, clientRectangle.Bottom - bottomRightCornerSize - 1, clientRectangle.Right - bottomRightCornerSize - 1, clientRectangle.Bottom);
+        //    }
+        //    else
+        //    {
+        //        path.AddLine(clientRectangle.Right, clientRectangle.Bottom - 2, clientRectangle.Right, clientRectangle.Bottom);
+        //        path.AddLine(clientRectangle.Right, clientRectangle.Bottom, clientRectangle.Right - 2, clientRectangle.Bottom);
+        //    }
+
+        //    corner = bottomLeftCornerType;
+        //    if (corner == eCornerType.Inherit)
+        //        corner = eCornerType.Square;
+        //    if (pathPart == eStyleBackgroundPathPart.TopHalf)
+        //        corner = eCornerType.Square;
+        //    if (corner == eCornerType.Rounded && bottomLeftCornerSize>0)
+        //    {
+        //        ArcData ad = ElementStyleDisplay.GetCornerArc(clientRectangle, bottomLeftCornerSize, eCornerArc.BottomLeft);
+        //        path.AddArc(ad.X, ad.Y, ad.Width, ad.Height, ad.StartAngle, ad.SweepAngle);
+        //    }
+        //    else if (corner == eCornerType.Diagonal)
+        //    {
+        //        path.AddLine(clientRectangle.X + 2, clientRectangle.Bottom, clientRectangle.X, clientRectangle.Bottom - bottomLeftCornerSize - 1);
+        //    }
+        //    else
+        //    {
+        //        path.AddLine(clientRectangle.X + 2, clientRectangle.Bottom, clientRectangle.X, clientRectangle.Bottom);
+        //        path.AddLine(clientRectangle.X, clientRectangle.Bottom, clientRectangle.X, clientRectangle.Bottom - 2);
+        //    }
+
+        //    path.CloseAllFigures();
+        //    return path;
+        //}
+
+        //public static GraphicsPath GetBorderPath(Rectangle clientRectangle, int cornerSize, eStyleBackgroundPathPart pathPart,
+        //    eCornerType topLeftCornerType, eCornerType topRightCornerType, eCornerType bottomLeftCornerType, eCornerType bottomRightCornerType,
+        //    bool leftBorder, bool rightBorder, bool topBorder, bool bottomBorder)
+        //{
+        //    GraphicsPath path = new GraphicsPath();
+
+        //    if (pathPart == eStyleBackgroundPathPart.TopHalf)
+        //        clientRectangle.Height = clientRectangle.Height / 2;
+        //    else if (pathPart == eStyleBackgroundPathPart.BottomHalf)
+        //    {
+        //        int h = clientRectangle.Height;
+        //        clientRectangle.Height = clientRectangle.Height / 2;
+        //        clientRectangle.Y += (h - clientRectangle.Height - 1);
+        //    }
+
+        //    eCornerType corner = topLeftCornerType;
+        //    if (corner == eCornerType.Inherit)
+        //        corner = eCornerType.Square;
+
+        //    if (pathPart == eStyleBackgroundPathPart.BottomHalf)
+        //        corner = eCornerType.Square;
+
+        //    if (leftBorder)
+        //    {
+        //        path.AddLine(clientRectangle.X, clientRectangle.Bottom -
+        //            (bottomBorder && (bottomLeftCornerType == eCornerType.Diagonal || bottomLeftCornerType == eCornerType.Rounded) ? cornerSize : 0),
+        //            clientRectangle.X, clientRectangle.Y +
+        //            (topBorder && (topLeftCornerType == eCornerType.Diagonal || topLeftCornerType == eCornerType.Rounded) ? cornerSize : 0));
+        //    }
+
+        //    if (leftBorder && topBorder)
+        //    {
+        //        if (corner == eCornerType.Rounded)
+        //        {
+        //            ArcData ad = ElementStyleDisplay.GetCornerArc(clientRectangle, cornerSize, eCornerArc.TopLeft);
+        //            path.AddArc(ad.X, ad.Y, ad.Width, ad.Height, ad.StartAngle, ad.SweepAngle);
+        //        }
+        //        else if (corner == eCornerType.Diagonal)
+        //        {
+        //            path.AddLine(clientRectangle.X, clientRectangle.Y + cornerSize, clientRectangle.X + cornerSize, clientRectangle.Y);
+        //        }
+        //    }
+
+        //    if (topBorder)
+        //    {
+        //        path.AddLine(clientRectangle.X + 
+        //            ((topLeftCornerType == eCornerType.Diagonal || topLeftCornerType == eCornerType.Rounded) ? cornerSize : 0)
+        //            , clientRectangle.Y, clientRectangle.Right -
+        //            (rightBorder && (topRightCornerType == eCornerType.Diagonal || topRightCornerType == eCornerType.Rounded) ? cornerSize : 0),
+        //            clientRectangle.Y);
+        //    }
+
+        //    corner = topRightCornerType;
+        //    if (corner == eCornerType.Inherit)
+        //        corner = eCornerType.Square;
+        //    if (pathPart == eStyleBackgroundPathPart.BottomHalf)
+        //        corner = eCornerType.Square;
+
+        //    if (topBorder && rightBorder)
+        //    {
+        //        if (corner == eCornerType.Rounded)
+        //        {
+        //            ArcData ad = ElementStyleDisplay.GetCornerArc(clientRectangle, cornerSize, eCornerArc.TopRight);
+        //            path.AddArc(ad.X, ad.Y, ad.Width, ad.Height, ad.StartAngle, ad.SweepAngle);
+        //        }
+        //        else if (corner == eCornerType.Diagonal)
+        //        {
+        //            path.AddLine(clientRectangle.Right - cornerSize - 1, clientRectangle.Y, clientRectangle.Right, clientRectangle.Y + cornerSize);
+        //        }
+        //    }
+
+        //    if (rightBorder)
+        //    {
+        //        path.AddLine(clientRectangle.Right, clientRectangle.Y +
+        //            ((topRightCornerType == eCornerType.Diagonal || topRightCornerType == eCornerType.Rounded) ? cornerSize : 0),
+        //            clientRectangle.Right, clientRectangle.Bottom -
+        //            (bottomBorder && (bottomRightCornerType == eCornerType.Diagonal || bottomRightCornerType == eCornerType.Rounded) ? cornerSize : 0));
+        //    }
+
+        //    corner = bottomRightCornerType;
+        //    if (corner == eCornerType.Inherit)
+        //        corner = eCornerType.Square;
+        //    if (pathPart == eStyleBackgroundPathPart.TopHalf)
+        //        corner = eCornerType.Square;
+        //    if (corner == eCornerType.Rounded)
+        //    {
+        //        ArcData ad = ElementStyleDisplay.GetCornerArc(clientRectangle, cornerSize, eCornerArc.BottomRight);
+        //        path.AddArc(ad.X, ad.Y, ad.Width, ad.Height, ad.StartAngle, ad.SweepAngle);
+        //    }
+        //    else if (corner == eCornerType.Diagonal)
+        //    {
+        //        path.AddLine(clientRectangle.Right, clientRectangle.Bottom - cornerSize - 1, clientRectangle.Right - cornerSize - 1, clientRectangle.Bottom);
+        //    }
+
+        //    if (bottomBorder)
+        //    {
+        //        path.AddLine(clientRectangle.Right -
+        //            ((bottomRightCornerType == eCornerType.Diagonal || bottomRightCornerType == eCornerType.Rounded) ? cornerSize : 0),
+        //            clientRectangle.Bottom,
+        //            clientRectangle.X + 
+        //            ((bottomLeftCornerType == eCornerType.Diagonal || bottomLeftCornerType == eCornerType.Rounded) ? cornerSize : 0),
+        //            clientRectangle.Bottom);
+        //    }
+
+        //    corner = bottomLeftCornerType;
+        //    if (corner == eCornerType.Inherit)
+        //        corner = eCornerType.Square;
+        //    if (pathPart == eStyleBackgroundPathPart.TopHalf)
+        //        corner = eCornerType.Square;
+        //    if (corner == eCornerType.Rounded)
+        //    {
+        //        ArcData ad = ElementStyleDisplay.GetCornerArc(clientRectangle, cornerSize, eCornerArc.BottomLeft);
+        //        path.AddArc(ad.X, ad.Y, ad.Width, ad.Height, ad.StartAngle, ad.SweepAngle);
+        //    }
+        //    else if (corner == eCornerType.Diagonal)
+        //    {
+        //        path.AddLine(clientRectangle.X + 2, clientRectangle.Bottom, clientRectangle.X, clientRectangle.Bottom - cornerSize - 1);
+        //    }
+            
+        //    return path;
+        //}
+#if !LAYOUT
+        public static void FillRoundedRectangle(Graphics g, Rectangle bounds, int cornerSize, Color color1, Color color2, int gradientAngle)
+        {
+            if (color2.IsEmpty)
+            {
+                if (!color1.IsEmpty)
+                {
+                    using (SolidBrush brush = new SolidBrush(color1))
+                        FillRoundedRectangle(g, brush, bounds, cornerSize);
+                }
+            }
+            else
+            {
+                using (LinearGradientBrush brush = CreateLinearGradientBrush(bounds, color1, color2, gradientAngle))
+                    FillRoundedRectangle(g, brush, bounds, cornerSize);
+            }
+        }
+
+        public static void FillRoundedRectangle(Graphics g, Rectangle bounds, int cornerSize, Color color1, Color color2)
+        {
+            FillRoundedRectangle(g, bounds, cornerSize, color1, color2, 90);
+        }
+
+        public static void FillRoundedRectangle(Graphics g, Rectangle bounds, int cornerSize, Color color1)
+        {
+            using (SolidBrush brush = new SolidBrush(color1))
+                FillRoundedRectangle(g, brush, bounds, cornerSize);
+        }
+
+        public static void FillRoundedRectangle(Graphics g, Brush brush, Rectangle bounds, int cornerSize)
+        {
+            // Fix for GDI issue
+            bounds.Width--;
+            bounds.Height--;
+
+            using (GraphicsPath path = GetRoundedRectanglePath(bounds, cornerSize))
+            {
+                g.FillPath(brush, path);
+            }
+        }
+#endif
+        public static void FillRectangle(Graphics g, Rectangle bounds, Color color1)
+        {
+            FillRectangle(g, bounds, color1, Color.Empty, 90);
+        }
+
+        public static void FillRectangle(Graphics g, Rectangle bounds, Color color1, Color color2)
+        {
+            FillRectangle(g, bounds, color1, color2, 90);
+        }
+
+		#if DOTNETBAR
+        public static void FillRectangle(Graphics g, Rectangle r, Rendering.LinearGradientColorTable table)
+        {
+            FillRectangle(g, r, table.Start, table.End, table.GradientAngle);
+        }
+		#endif
+
+        public static void FillRectangle(Graphics g, Rectangle r, Color color1, Color color2, int gradientAngle)
+        {
+            if (r.Width == 0 || r.Height == 0)
+                return;
+
+            if (color2.IsEmpty)
+            {
+                if (!color1.IsEmpty)
+                {
+                    SmoothingMode sm = g.SmoothingMode;
+                    g.SmoothingMode = SmoothingMode.None;
+                    using (SolidBrush brush = new SolidBrush(color1))
+                        g.FillRectangle(brush, r);
+                    g.SmoothingMode = sm;
+                }
+            }
+            else
+            {
+                using (LinearGradientBrush brush = CreateLinearGradientBrush(r, color1, color2, gradientAngle))
+                    g.FillRectangle(brush, r);
+            }
+        }
+
+        public static void FillRectangle(Graphics g, Rectangle r, Color color1, Color color2, int gradientAngle, float[] factors, float[] positions)
+        {
+            if (r.Width == 0 || r.Height == 0)
+                return;
+
+            if (color2.IsEmpty)
+            {
+                if (!color1.IsEmpty)
+                {
+                    SmoothingMode sm = g.SmoothingMode;
+                    g.SmoothingMode = SmoothingMode.None;
+                    using (SolidBrush brush = new SolidBrush(color1))
+                        g.FillRectangle(brush, r);
+                    g.SmoothingMode = sm;
+                }
+            }
+            else
+            {
+                using (LinearGradientBrush brush = CreateLinearGradientBrush(r, color1, color2, gradientAngle))
+                {
+                    Blend blend = new Blend(factors.Length);
+                    blend.Factors = factors;
+                    blend.Positions = positions;
+                    brush.Blend = blend;
+                    g.FillRectangle(brush, r);
+                }
+            }
+        }
+
+        public static void FillPath(Graphics g, GraphicsPath path, Color color1, Color color2)
+        {
+            FillPath(g, path, color1, color2, 90);
+        }
+        
+		#if DOTNETBAR
+        public static void FillPath(Graphics g, GraphicsPath path, Rendering.LinearGradientColorTable table)
+        {
+            FillPath(g, path, table.Start, table.End, table.GradientAngle);
+        }
+		#endif
+
+        public static void FillPath(Graphics g, GraphicsPath path, Color color1, Color color2, int gradientAngle)
+        {
+            if (color2.IsEmpty)
+            {
+                if (!color1.IsEmpty)
+                {
+                    using (SolidBrush brush = new SolidBrush(color1))
+                        g.FillPath(brush, path);
+                }
+            }
+            else if(!color1.IsEmpty)
+            {
+                using (LinearGradientBrush brush = CreateLinearGradientBrush(path.GetBounds(), color1, color2, gradientAngle))
+                    g.FillPath(brush, path);
+            }
+        }
+
+        //public static void DrawGradientLine(Graphics g, Point start, Point end, Color color1, Color color2, int gradientAngle, int penWidth)
+        //{
+        //    if (color1.IsEmpty || penWidth <= 0 || start == end)
+        //        return;
+
+        //    using (GraphicsPath path = new GraphicsPath())
+        //    {
+        //        start.Offset(-1, -1);
+        //        end.Offset(-1, -1);
+        //        path.AddLine(start, end);
+        //        using (Pen pen = new Pen(Color.White, penWidth))
+        //            path.Widen(pen);
+        //        Rectangle r = Rectangle.Ceiling(path.GetBounds());
+        //        r.Inflate(1, 1);
+        //        using (LinearGradientBrush brush = CreateLinearGradientBrush(r, color1, color2, gradientAngle))
+        //            g.FillPath(brush, path);
+        //    }
+        //}
+
+        public static void DrawLine(Graphics g, Point start, Point end, Color color, int penWidth)
+        {
+            if (!color.IsEmpty)
+            {
+                using (Pen pen = new Pen(color, penWidth))
+                    g.DrawLine(pen, start, end);
+            }
+        }
+
+        public static void DrawLine(Graphics g, int x1, int y1, int x2, int y2, Color color, int penWidth)
+        {
+            if (!color.IsEmpty)
+            {
+                using (Pen pen = new Pen(color, penWidth))
+                    g.DrawLine(pen, x1, y1, x2, y2);
+            }
+        }
+
+		#if DOTNETBAR
+        public static void DrawGradientRectangle(Graphics g, Rectangle bounds, Rendering.LinearGradientColorTable table, int penWidth)
+        {
+            DrawGradientRectangle(g, bounds, table.Start, table.End, table.GradientAngle, penWidth);
+        }
+		#endif
+
+        public static void DrawGradientRectangle(Graphics g, Rectangle bounds, Color color1, Color color2, int gradientAngle, int penWidth)
+        {
+            if (color1.IsEmpty || bounds.Width <= 0 || bounds.Height <= 0 || penWidth <= 0)
+                return;
+
+            Rectangle r = bounds;
+            // Workaround for GDI+ bug
+            r.Width--;
+            r.Height--;
+
+            if (color2.IsEmpty)
+            {
+                using (Pen pen = new Pen(color1, penWidth))
+                    g.DrawRectangle(pen, r);
+                return;
+            }
+
+            using (GraphicsPath path = new GraphicsPath())
+            {
+                path.AddRectangle(r);
+
+                DrawGradientPath(g, path, r, color1, color2, gradientAngle, penWidth);
+            }
+        }
+
+        //public static void DrawGradientPath(Graphics g, GraphicsPath path, Rectangle bounds, Rendering.LinearGradientColorTable table, int penWidth)
+        //{
+        //    DrawGradientPath(g, path, bounds, table.Start, table.End, table.GradientAngle, penWidth);
+        //}
+
+        public static void DrawGradientPath(Graphics g, GraphicsPath path, Rectangle bounds, Color color1, Color color2, int gradientAngle, int penWidth)
+        {
+            using (Pen pen = new Pen(color1, penWidth))
+                path.Widen(pen);
+
+            if (color2.IsEmpty)
+            {
+                if (!color1.IsEmpty)
+                {
+                    using (SolidBrush brush = new SolidBrush(color1))
+                        g.FillPath(brush, path);
+                }
+            }
+            else if (!color1.IsEmpty)
+            {
+                using (LinearGradientBrush brush = new LinearGradientBrush(bounds, color1, color2, gradientAngle))
+                    g.FillPath(brush, path);
+            }
+        }
+
+		#if DOTNETBAR
+        public static void DrawRoundGradientRectangle(Graphics g, Rectangle bounds, Rendering.LinearGradientColorTable table, int penWidth, int roundCornerSize)
+        {
+            DrawRoundGradientRectangle(g, bounds, table.Start, table.End, table.GradientAngle, penWidth, roundCornerSize);
+        }
+		
+
+        public static void DrawRoundGradientRectangle(Graphics g, Rectangle bounds, Color color1, Color color2, int gradientAngle, int penWidth, int roundCornerSize)
+        {
+            if (color1.IsEmpty && color2.IsEmpty || bounds.Width <= 0 || bounds.Height <= 0 || roundCornerSize <= 0 || penWidth <= 0)
+                return;
+
+            if (color2.IsEmpty)
+            {
+                using (Pen pen = new Pen(color1, penWidth))
+                    DrawRoundedRectangle(g, pen, bounds, roundCornerSize);
+                return;
+            }
+
+            Rectangle r = bounds;
+            // Workaround for GDI+ bug
+            r.Width--;
+            r.Height--;
+
+            using (GraphicsPath roundPath = GetRoundedRectanglePath(r, roundCornerSize))
+            {
+                using (Pen pen = new Pen(color1, penWidth))
+                    roundPath.Widen(pen);
+
+                using (LinearGradientBrush brush = new LinearGradientBrush(bounds, color1, color2, gradientAngle))
+                    g.FillPath(brush, roundPath);
+            }
+        }
+
+		
+        public static void DrawGradientPathBorder(Graphics g, GraphicsPath path, Rendering.LinearGradientColorTable table, int penWidth)
+        {
+            DrawGradientPathBorder(g, path, table.Start, table.End, table.GradientAngle, penWidth);
+        }
+		#endif
+
+        public static void DrawGradientPathBorder(Graphics g, GraphicsPath path, Color color1, Color color2, int gradientAngle, int penWidth)
+        {
+            if (color1.IsEmpty && color2.IsEmpty) return;
+            using (Pen pen = new Pen(color1, penWidth))
+                path.Widen(pen);
+
+            Rectangle r = Rectangle.Ceiling(path.GetBounds());
+            r.Inflate(1, 1);
+
+            if (color2.IsEmpty)
+            {
+                if (!color1.IsEmpty)
+                {
+                    using (SolidBrush brush = new SolidBrush(color1))
+                        g.FillPath(brush, path);
+                }
+            }
+            else if(!color1.IsEmpty)
+            {
+                using (LinearGradientBrush brush = new LinearGradientBrush(r, color1, color2, gradientAngle))
+                    g.FillPath(brush, path);
+            }
+        }
+		#if DOTNETBAR
+        public static void DrawGradientLine(Graphics g, Point start, Point end, Rendering.LinearGradientColorTable table, int penWidth)
+        {
+            DrawGradientLine(g, start, end, table.Start, table.End, table.GradientAngle, penWidth);
+        }
+        public static void DrawGradientLine(Graphics g, int x1, int y1, int x2, int y2, Rendering.LinearGradientColorTable table, int penWidth)
+        {
+            DrawGradientLine(g, new Point(x1, y1), new Point(x2, y2), table.Start, table.End, table.GradientAngle, penWidth);
+        }
+		#endif
+        public static void DrawGradientLine(Graphics g, Point start, Point end, Color color1, Color color2, int gradientAngle, int penWidth)
+        {
+            if (color2.IsEmpty || penWidth == 1 && start.Y == end.Y && gradientAngle == 90)
+            {
+                if (!color1.IsEmpty)
+                {
+                    using (Pen pen = new Pen(color1, penWidth))
+                    {
+                        g.DrawLine(pen, start, end);
+                    }
+                }
+            }
+            else if (!color1.IsEmpty)
+            {
+                using (GraphicsPath path = new GraphicsPath())
+                {
+                    //start.Offset(-1, -1);
+                    //end.Offset(-1, -1);
+                    path.AddLine(start, end);
+                    using (Pen pen = new Pen(color1, penWidth))
+                        path.Widen(pen);
+                    Rectangle r = Rectangle.Ceiling(path.GetBounds());
+                    r.Inflate(1, 1);
+                    SmoothingMode sm = g.SmoothingMode;
+                    g.SmoothingMode = SmoothingMode.Default;
+                    using (LinearGradientBrush brush = DisplayHelp.CreateLinearGradientBrush(r, color1, color2, gradientAngle))
+                        g.FillPath(brush, path);
+                    g.SmoothingMode = sm;
+                }
+            }
+        }
+
+        public static void DrawGradientLine(Graphics g, Point start, Point end, Color color1, Color color2, int gradientAngle, int penWidth, float[] factors, float[] positions)
+        {
+            if (color2.IsEmpty)
+            {
+                if (!color1.IsEmpty)
+                {
+                    using (Pen pen = new Pen(color1, penWidth))
+                        g.DrawLine(pen, start, end);
+                }
+            }
+            else if (!color1.IsEmpty)
+            {
+                using (GraphicsPath path = new GraphicsPath())
+                {
+                    start.Offset(-1, -1);
+                    end.Offset(-1, -1);
+                    path.AddLine(start, end);
+                    using (Pen pen = new Pen(color1, penWidth))
+                        path.Widen(pen);
+                    Rectangle r = Rectangle.Ceiling(path.GetBounds());
+                    r.Inflate(1, 1);
+                    using (LinearGradientBrush brush = DisplayHelp.CreateLinearGradientBrush(r, color1, color2, gradientAngle))
+                    {
+                        Blend blend = new Blend(factors.Length);
+                        blend.Factors = factors;
+                        blend.Positions = positions;
+                        brush.Blend = blend;
+                        g.FillPath(brush, path);
+                    }
+                }
+            }
+        }
+#if DOTNETBAR
+        public static Brush CreateBrush(Rectangle bounds, GradientColorTable colorBlend)
+        {
+            return CreateBrush(bounds, colorBlend.Colors, colorBlend.LinearGradientAngle, colorBlend.GradientType);
+        }
+        public static Brush CreateBrush(Rectangle bounds, DevComponents.DotNetBar.Rendering.LinearGradientColorTable colorTable)
+        {
+            if (colorTable.End.IsEmpty) return new SolidBrush(colorTable.Start);
+            return new LinearGradientBrush(bounds, colorTable.Start, colorTable.End, colorTable.GradientAngle);
+        }
+
+        public static Brush CreateBrush(Rectangle bounds, BackgroundColorBlendCollection colorBlend, int gradientAngle, eGradientType gradientType)
+        {
+            eBackgroundColorBlendType blendType = colorBlend.GetBlendType();
+            if (blendType == eBackgroundColorBlendType.Invalid)
+                return null;
+
+            if (blendType == eBackgroundColorBlendType.SolidColor)
+            {
+                return new SolidBrush(colorBlend[0].Color);
+            }
+            else if (blendType == eBackgroundColorBlendType.Relative)
+            {
+                try
+                {
+                    if (gradientType == eGradientType.Linear)
+                    {
+                        bounds.Inflate(1, 1);
+                        LinearGradientBrush brush =
+                        DisplayHelp.CreateLinearGradientBrush(bounds, colorBlend[0].Color, colorBlend[colorBlend.Count - 1].Color,
+                                                          gradientAngle);
+                        brush.InterpolationColors = colorBlend.GetColorBlend();
+                        return brush;
+                    }
+                    else if (gradientType == eGradientType.Radial)
+                    {
+                        int d = (int)Math.Sqrt(bounds.Width * bounds.Width + bounds.Height * bounds.Height) + 4;
+                        GraphicsPath fillPath = new GraphicsPath();
+                        fillPath.AddEllipse(bounds.X - (d - bounds.Width) / 2, bounds.Y - (d - bounds.Height) / 2, d, d);
+                        PathGradientBrush brush = new PathGradientBrush(fillPath);
+                        brush.CenterColor = colorBlend[0].Color;
+                        brush.SurroundColors = new Color[] { colorBlend[colorBlend.Count - 1].Color };
+                        brush.InterpolationColors = colorBlend.GetColorBlend();
+                        return brush;
+                    }
+                }
+                catch
+                {
+                    return null;
+                }
+            }
+            else
+            {
+                BackgroundColorBlendCollection bc = colorBlend;
+                for (int i = 0; i < bc.Count; i += 2)
+                {
+                    BackgroundColorBlend b1 = bc[i];
+                    BackgroundColorBlend b2 = null;
+                    if (i < bc.Count)
+                        b2 = bc[i + 1];
+                    if (b1 != null && b2 != null)
+                    {
+                        Rectangle rb = new Rectangle(bounds.X, bounds.Y + (int)b1.Position, bounds.Width,
+                            (b2.Position == 1f ? bounds.Height : (int)b2.Position) - (int)b1.Position);
+                        return DisplayHelp.CreateLinearGradientBrush(rb, b1.Color, b2.Color, gradientAngle);
+                    }
+                }
+            }
+
+            return null;
+        }
+#endif
+        public static System.Windows.Forms.ControlStyles DoubleBufferFlag
+        {
+            get
+            {
+                #if FRAMEWORK20
+                return System.Windows.Forms.ControlStyles.OptimizedDoubleBuffer;
+#else
+                return System.Windows.Forms.ControlStyles.DoubleBuffer;
+#endif
+            }
+        }
+
+        private static TextRenderingHint s_AntiAliasTextRenderingHint = TextRenderingHint.ClearTypeGridFit;
+        public static TextRenderingHint AntiAliasTextRenderingHint
+        {
+            get
+            {
+                return s_AntiAliasTextRenderingHint;
+            }
+            set
+            {
+                s_AntiAliasTextRenderingHint = value;
+            }
+        }
+
+        public static Rectangle[] ExcludeRectangle(Rectangle r1, Rectangle exclude)
+        {
+            if (r1.X >= exclude.X && exclude.Right < r1.Right) // Left aligned
+                return new Rectangle[] { new Rectangle(exclude.Right, r1.Y, r1.Width - (exclude.Right - r1.X), r1.Height) };
+            else if (r1.Right <= exclude.Right && exclude.X > r1.X) // Right aligned
+                return new Rectangle[] { new Rectangle(r1.X, r1.Y, r1.Width - (r1.Right - exclude.X), r1.Height) };
+            else if (exclude.X > r1.X && exclude.Right < r1.Right)
+            {
+                return new Rectangle[] { new Rectangle(r1.X, r1.Y, exclude.X-r1.X, r1.Height),
+                    new Rectangle(exclude.Right, r1.Y, r1.Right - exclude.Right, r1.Height)};
+            }
+            else if (exclude.Bottom >= r1.Bottom && exclude.Y > r1.Y) // Bottom Aligned
+            {
+                return new Rectangle[] { new Rectangle(r1.X, r1.Y, r1.Width, Math.Max(0, exclude.Y - r1.Y)) };
+            }
+            else if (exclude.Y <= r1.Y && exclude.Bottom < r1.Bottom) // Top Aligned
+            {
+                return new Rectangle[] { new Rectangle(r1.X, exclude.Bottom, r1.Width, r1.Bottom - exclude.Bottom) };
+            }
+            return new Rectangle[] { };
+        }
+
+        internal static Size MaxSize(Size size1, Size size2)
+        {
+            if (size2.Width > size1.Width) size1.Width = size2.Width;
+            if (size2.Height > size1.Height) size1.Height = size2.Height;
+            return size1;
+        }
+
+        internal static void ExcludeEdgeRect(ref Rectangle captionRect, Rectangle exclude)
+        {
+            if (exclude.X + exclude.Width / 2 < captionRect.X + captionRect.Width / 2)
+            {
+                // Left aligned
+                int r = exclude.Right - captionRect.X;
+                captionRect.X = exclude.Right;
+                captionRect.Width -= r;
+            }
+            else
+            {
+                // Right aligned
+                captionRect.Width -= (captionRect.Right - exclude.X);
+            }
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextMarkup/Div.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextMarkup/Div.cs
new file mode 100644
index 00000000..4456e1f2
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextMarkup/Div.cs	
@@ -0,0 +1,223 @@
+using System;
+using System.Text;
+using System.Drawing;
+using System.Xml;
+using System.Windows.Forms;
+
+#if AdvTree
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+using DevComponents.UI.ContentManager;
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#elif LAYOUT
+namespace DevComponents.DotNetBar.Layout.TextMarkup
+#endif
+{
+    internal class Div : ContainerElement
+    {
+        #region Private Variables
+        private eParagraphAlignment m_Align = eParagraphAlignment.Left;
+        private eParagraphVerticalAlignment m_VAlign = eParagraphVerticalAlignment.Top;
+        private int m_Width = 0;
+        private int m_Height = 0;
+        private Padding m_Padding = new Padding(0, 0, 0, 0);
+        private Color m_BackColor = Color.Empty;
+        #endregion
+
+        #region Internal Implementation
+        public override void Render(MarkupDrawContext d)
+        {
+            Rectangle r = this.Bounds;
+            r.Offset(d.Offset);
+            if (!m_BackColor.IsEmpty)
+            {
+                DisplayHelp.FillRectangle(d.Graphics, r, m_BackColor);
+            }
+
+            base.Render(d);
+        }
+
+        public eParagraphAlignment Align
+        {
+            get { return m_Align; }
+            set { m_Align = value; }
+        }
+
+        protected override SerialContentLayoutManager GetLayoutManager(bool multiLine)
+        {
+            SerialContentLayoutManager sm = base.GetLayoutManager(multiLine);
+            if (m_Align == eParagraphAlignment.Left)
+                sm.ContentAlignment = eContentAlignment.Left;
+            else if (m_Align == eParagraphAlignment.Right)
+                sm.ContentAlignment = eContentAlignment.Right;
+            else if (m_Align == eParagraphAlignment.Center)
+                sm.ContentAlignment = eContentAlignment.Center;
+
+            if (m_VAlign != eParagraphVerticalAlignment.Top)
+            {
+                sm.EvenHeight = false;
+                sm.BlockLineAlignment = (m_VAlign == eParagraphVerticalAlignment.Bottom ? eContentVerticalAlignment.Bottom : eContentVerticalAlignment.Middle);
+            }
+
+            return sm;
+        }
+
+        protected override Point GetContainerOffset()
+        {
+            if (m_Padding.Left == 0 && m_Padding.Top == 0)
+                return base.GetContainerOffset();
+            
+            Point p = base.GetContainerOffset();
+            p.X += m_Padding.Left;
+            p.Y += m_Padding.Top;
+            return p;
+        }
+
+        protected override void ArrangeInternal(Rectangle bounds, MarkupDrawContext d)
+        {
+            Rectangle r = bounds;
+            if (m_Width > 0)
+                r.Width = m_Width;
+            if (m_Height > 0)
+                r.Height = m_Height;
+            if (m_Padding.All == 0)
+            {
+                base.ArrangeInternal(r, d);
+                if (m_Width > 0)
+                    this.Bounds = new Rectangle(this.Bounds.X, this.Bounds.Y, m_Width, m_Height > 0 ? m_Height : this.Bounds.Height + m_Padding.Bottom);
+                else if(m_Height>0)
+                    this.Bounds = new Rectangle(this.Bounds.X, this.Bounds.Y, this.Bounds.Width, m_Height);
+            }
+            else
+            {
+                r.X += m_Padding.Left;
+                r.Y += m_Padding.Top;
+                r.Width -= m_Padding.Horizontal;
+                r.Height -= m_Padding.Vertical;
+                base.ArrangeInternal(r, d);
+
+                r = new Rectangle(bounds.X, bounds.Y, this.Bounds.Width + m_Padding.Horizontal, this.Bounds.Height + m_Padding.Vertical);
+                if (m_Width > 0)
+                    r.Width = m_Width;
+                if (m_Height > 0)
+                    r.Height = m_Height;
+                
+                this.Bounds = r;
+            }
+        }
+
+        public override void ReadAttributes(XmlTextReader reader)
+        {
+            for (int i = 0; i < reader.AttributeCount; i++)
+            {
+                reader.MoveToAttribute(i);
+                if (reader.Name.ToLower() == "align")
+                {
+                    string s = reader.Value.ToLower();
+                    if (s == "left")
+                        m_Align = eParagraphAlignment.Left;
+                    else if (s == "right")
+                        m_Align = eParagraphAlignment.Right;
+                    else if (s == "center")
+                        m_Align = eParagraphAlignment.Center;
+                }
+                else if (reader.Name.ToLower() == "valign")
+                {
+                    string s = reader.Value.ToLower();
+                    if (s == "top")
+                        m_VAlign = eParagraphVerticalAlignment.Top;
+                    else if (s == "middle")
+                        m_VAlign = eParagraphVerticalAlignment.Middle;
+                    else if (s == "bottom")
+                        m_VAlign = eParagraphVerticalAlignment.Bottom;
+                }
+                else if (reader.Name.ToLower() == "width")
+                {
+                    try
+                    {
+                        m_Width = Int32.Parse(reader.Value);
+                    }
+                    catch
+                    {
+                        m_Width = 0;
+                    }
+                }
+                else if (reader.Name.ToLower() == "height")
+                {
+                    try
+                    {
+                        m_Height = Int32.Parse(reader.Value);
+                    }
+                    catch
+                    {
+                        m_Height = 0;
+                    }
+                }
+                else if (reader.Name.ToLower() == "padding")
+                {
+                    try
+                    {
+                        string[] values = reader.Value.Split(',');
+                        if (values.Length > 0)
+                            m_Padding.Left = Int32.Parse(values[0]);
+                        if (values.Length > 1)
+                            m_Padding.Right = Int32.Parse(values[1]);
+                        if (values.Length > 2)
+                            m_Padding.Top = Int32.Parse(values[2]);
+                        if (values.Length > 3)
+                            m_Padding.Bottom = Int32.Parse(values[3]);
+                    }
+                    catch
+                    {
+                        m_Padding = new Padding(0,0,0,0);
+                    }
+                }
+                else if (reader.Name.ToLower() == "bgcolor")
+                {
+                    try
+                    {
+                        string s = reader.Value;
+                        if (s.StartsWith("#"))
+                        {
+                            if (s.Length == 7)
+                                m_BackColor = ColorHelpers.GetColor(s.Substring(1));
+                        }
+                        else
+                        {
+                            m_BackColor = Color.FromName(s);
+                        }
+                    }
+                    catch
+                    {
+                        m_BackColor = Color.Empty;
+                    }
+                }
+            }
+        }
+        #endregion
+    }
+
+    #region eParagraphAlignment
+    /// <summary>
+    /// Indicates paragraph content alignment
+    /// </summary>
+    internal enum eParagraphAlignment
+    {
+        Left,
+        Right,
+        Center
+    }
+
+    /// <summary>
+    /// Indicates paragraph content alignment
+    /// </summary>
+    internal enum eParagraphVerticalAlignment
+    {
+        Top,
+        Middle,
+        Bottom
+    }
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextMarkup/EndMarkupElement.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextMarkup/EndMarkupElement.cs
new file mode 100644
index 00000000..6196699b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextMarkup/EndMarkupElement.cs	
@@ -0,0 +1,50 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+#if AdvTree
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#elif LAYOUT
+namespace DevComponents.DotNetBar.Layout.TextMarkup
+#endif
+{
+    internal class EndMarkupElement : MarkupElement
+    {
+        #region Internap Implementation
+        private MarkupElement m_StartElement = null;
+
+        public EndMarkupElement(MarkupElement startElement)
+        {
+            m_StartElement = startElement;
+        }
+
+        public override void Measure(System.Drawing.Size availableSize, MarkupDrawContext d)
+        {
+            m_StartElement.MeasureEnd(availableSize, d);
+            this.Bounds = Rectangle.Empty;
+        }
+
+        public override void Render(MarkupDrawContext d)
+        {
+            m_StartElement.RenderEnd(d);
+        }
+
+        protected override void ArrangeCore(System.Drawing.Rectangle finalRect, MarkupDrawContext d)
+        {
+            this.Bounds = Rectangle.Empty;
+        }
+
+        /// <summary>
+        /// Gets reference to markup start element.
+        /// </summary>
+        public MarkupElement StartElement
+        {
+            get { return m_StartElement; }
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextMarkup/ExpandElement.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextMarkup/ExpandElement.cs
new file mode 100644
index 00000000..20242bd7
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextMarkup/ExpandElement.cs	
@@ -0,0 +1,201 @@
+using System;
+using System.Text;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Xml;
+
+#if AdvTree
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#elif LAYOUT
+namespace DevComponents.DotNetBar.Layout.TextMarkup
+#endif
+{
+    internal class ExpandElement : MarkupElement
+    {
+        #region Internal Implementation
+        private Size m_DefaultSize = new Size(5, 4);
+        private eExpandDirection m_Direction = eExpandDirection.Default;
+
+        public override void Measure(System.Drawing.Size availableSize, MarkupDrawContext d)
+        {
+            this.Bounds = new Rectangle(Point.Empty, m_DefaultSize);
+        }
+
+        protected override void ArrangeCore(System.Drawing.Rectangle finalRect, MarkupDrawContext d) { }
+
+        public override void Render(MarkupDrawContext d)
+        {
+            Rectangle r = this.Bounds;
+            r.Offset(d.Offset);
+
+            if (!d.ClipRectangle.IsEmpty && !r.IntersectsWith(d.ClipRectangle))
+                return;
+
+            Graphics g = d.Graphics;
+            Color color = d.CurrentForeColor;
+            //Color shadeColor = Color.FromArgb(96, Color.White);
+
+            eExpandDirection direction = eExpandDirection.Bottom;
+            if (m_Direction != eExpandDirection.Default)
+                direction = m_Direction;
+
+            #if DOTNETBAR
+            if(d.ContextObject is ButtonItem)
+            {
+                if (m_Direction == eExpandDirection.Default)
+                {
+                    ButtonItem item = d.ContextObject as ButtonItem;
+                    if (item.IsOnMenu)
+                    {
+                        direction = eExpandDirection.Right;
+                        if (item.PopupSide == ePopupSide.Default && d.RightToLeft || item.PopupSide == ePopupSide.Left)
+                            direction = eExpandDirection.Left;
+                    }
+                    else if (item.PopupSide == ePopupSide.Default)
+                        direction = eExpandDirection.Bottom;
+                    else if (item.PopupSide == ePopupSide.Left)
+                        direction = eExpandDirection.Left;
+                    else if (item.PopupSide == ePopupSide.Right)
+                        direction = eExpandDirection.Right;
+                    else if (item.PopupSide == ePopupSide.Bottom)
+                        direction = eExpandDirection.Bottom;
+                    else if (item.PopupSide == ePopupSide.Top)
+                        direction = eExpandDirection.Top;
+                }
+            }
+            #endif
+
+            SmoothingMode sm = g.SmoothingMode;
+            g.SmoothingMode = SmoothingMode.None;
+
+            Rectangle shadeRect = r;
+            if (direction == eExpandDirection.Bottom || direction == eExpandDirection.PopupDropDown)
+                shadeRect.Offset(0, 1);
+            else if (direction == eExpandDirection.Top)
+                shadeRect.Offset(0, -1);
+            else if (direction == eExpandDirection.Left)
+                shadeRect.Offset(1, 0);
+            else if (direction == eExpandDirection.Right)
+                shadeRect.Offset(-1, 0);
+            Point[] p = GetExpandPolygon(shadeRect, direction);
+            //using (SolidBrush brush = new SolidBrush(shadeColor))
+            //    g.FillPolygon(brush, p);
+
+            p = GetExpandPolygon(r, direction);
+            using(SolidBrush brush = new SolidBrush(color))
+                g.FillPolygon(brush, p);
+
+            if (direction == eExpandDirection.PopupDropDown)
+            {
+                using (Pen pen = new Pen(color, 1))
+                    g.DrawLine(pen, r.X, r.Y - 2, r.Right - 1, r.Y - 2);
+                //using (Pen pen = new Pen(shadeColor, 1))
+                //    g.DrawLine(pen, r.X, r.Y - 1, r.Right - 1, r.Y - 1);
+            }
+
+            g.SmoothingMode = sm;
+
+            this.RenderBounds = r;
+        }
+
+        private Point[] GetExpandPolygon(Rectangle r, eExpandDirection direction)
+        {
+            Point[] p = new Point[3];
+            switch (direction)
+            {
+                case eExpandDirection.Right:
+                    {
+                        p[0].X = r.Left + 1;
+                        p[0].Y = r.Top + (r.Height - m_DefaultSize.Height) / 2 - 1;
+                        p[1].X = p[0].X;
+                        p[1].Y = p[0].Y + 6;
+                        p[2].X = p[0].X + 3;
+                        p[2].Y = p[0].Y + 3;
+                        break;
+                    }
+                case eExpandDirection.Left:
+                    {
+                        p[0].X = r.Left + 3;
+                        p[0].Y = r.Top + (r.Height - m_DefaultSize.Height) / 2 - 1;
+                        p[1].X = p[0].X;
+                        p[1].Y = p[0].Y + 6;
+                        p[2].X = p[0].X - 3;
+                        p[2].Y = p[0].Y + 3;
+                        break;
+                    }
+                case eExpandDirection.Top:
+                    {
+                        p[0].X = r.Left - 1;
+                        p[0].Y = r.Top + (r.Height - m_DefaultSize.Height) / 2 + m_DefaultSize.Height;
+                        p[1].X = p[0].X + 6;
+                        p[1].Y = p[0].Y;
+                        p[2].X = p[0].X + 3;
+                        p[2].Y = p[0].Y - 4;
+                        break;
+                    }
+                case eExpandDirection.Bottom:
+                case eExpandDirection.PopupDropDown:
+                    {
+                        p[0].X = r.Left;
+                        p[0].Y = r.Top + (r.Height - m_DefaultSize.Height) / 2 + 1;
+                        p[1].X = p[0].X + 5;
+                        p[1].Y = p[0].Y;
+                        p[2].X = p[0].X + 2;
+                        p[2].Y = p[0].Y + 3;
+                        break;
+                    }
+            }
+            return p;
+        }
+
+        public override void ReadAttributes(XmlTextReader reader)
+        {
+            m_Direction = eExpandDirection.Default;
+
+            for (int i = 0; i < reader.AttributeCount; i++)
+            {
+                reader.MoveToAttribute(i);
+                if (reader.Name.ToLower() == "direction")
+                {
+                    string s = reader.Value.ToLower();
+                    if (s == "left")
+                        m_Direction = eExpandDirection.Left;
+                    else if (s == "right")
+                        m_Direction = eExpandDirection.Right;
+                    else if (s == "top")
+                        m_Direction = eExpandDirection.Top;
+                    else if (s == "bottom")
+                        m_Direction = eExpandDirection.Bottom;
+                    else if (s == "popup")
+                        m_Direction = eExpandDirection.PopupDropDown;
+                    break;
+                }
+            }
+        }
+
+        private enum eExpandDirection
+        {
+            Left,
+            Right,
+            Top,
+            Bottom,
+            Default,
+            PopupDropDown
+        }
+
+        /// <summary>
+        /// Returns whether layout manager can start new line with this element.
+        /// </summary>
+        public override bool CanStartNewLine
+        {
+            get { return false; }
+        }
+        #endregion
+
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextMarkup/FontChangeElement.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextMarkup/FontChangeElement.cs
new file mode 100644
index 00000000..fbc1c7c7
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextMarkup/FontChangeElement.cs	
@@ -0,0 +1,57 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+#if AdvTree
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#elif LAYOUT
+namespace DevComponents.DotNetBar.Layout.TextMarkup
+#endif
+{
+    internal class FontChangeElement : MarkupElement
+    {
+        #region Private Variables
+        protected Font m_OldFont = null;
+        #endregion
+
+        #region Internal Implementation
+
+        public override void Measure(Size availableSize, MarkupDrawContext d)
+        {
+            this.Bounds = Rectangle.Empty;
+            SetFont(d);
+        }
+
+        public override void Render(MarkupDrawContext d)
+        {
+            SetFont(d);
+        }
+
+        protected virtual void SetFont(MarkupDrawContext d)
+        {
+            
+        }
+
+        public override void RenderEnd(MarkupDrawContext d)
+        {
+            if(m_OldFont!=null)
+                d.CurrentFont = m_OldFont;
+            m_OldFont = null;
+            base.RenderEnd(d);
+        }
+
+        public override void MeasureEnd(Size availableSize, MarkupDrawContext d)
+        {
+            if (m_OldFont != null)
+                d.CurrentFont = m_OldFont;
+            m_OldFont = null;
+            base.MeasureEnd(availableSize, d);
+        }
+        protected override void ArrangeCore(Rectangle finalRect, MarkupDrawContext d) { }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextMarkup/FontElement.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextMarkup/FontElement.cs
new file mode 100644
index 00000000..feced86c
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextMarkup/FontElement.cs	
@@ -0,0 +1,187 @@
+using System;
+using System.Text;
+using System.Drawing;
+using System.Xml;
+
+#if AdvTree
+using DevComponents.Tree;
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#elif LAYOUT
+namespace DevComponents.DotNetBar.Layout.TextMarkup
+#endif
+{
+    internal class FontElement : FontChangeElement
+    {
+        #region Private Variables
+        private Color m_ForeColor = Color.Empty;
+        private Color m_OldForeColor = Color.Empty;
+        private int m_Size = 0;
+        private bool m_RelativeSize = false;
+        private string m_Face = "";
+        private string m_SystemColorName = "";
+        #endregion
+
+        #region Internal Implementation
+        protected override void SetFont(MarkupDrawContext d)
+        {
+            Font font = d.CurrentFont;
+            try
+            {
+                if (m_Face != "" || m_Size != 0 && m_RelativeSize || m_Size>4 && !m_RelativeSize)
+                {
+                    if (m_Face != "")
+                        d.CurrentFont = new Font(m_Face, ((m_RelativeSize || m_Size == 0)?font.SizeInPoints + m_Size:m_Size), font.Style);
+                    else
+                        d.CurrentFont = new Font(font.FontFamily, ((m_RelativeSize || m_Size == 0)? font.SizeInPoints + m_Size : m_Size), font.Style);
+                }
+                else
+                    font = null;
+            }
+            catch
+            {
+                font = null;
+            }
+
+            if (font != null)
+                m_OldFont = font;
+
+            if (!d.IgnoreFormattingColors)
+            {
+                if (!m_ForeColor.IsEmpty)
+                {
+                    m_OldForeColor = d.CurrentForeColor;
+                    d.CurrentForeColor = m_ForeColor;
+                }
+                else if (m_SystemColorName != "")
+                {
+#if DOTNETBAR
+                    if (Rendering.GlobalManager.Renderer is Rendering.Office2007Renderer)
+                    {
+                        m_OldForeColor = d.CurrentForeColor;
+                        d.CurrentForeColor = ((Rendering.Office2007Renderer)Rendering.GlobalManager.Renderer).ColorTable.Form.Active.CaptionTextExtra;
+                    }
+#endif
+                }
+            }
+        }
+
+        public override void RenderEnd(MarkupDrawContext d)
+        {
+            RestoreForeColor(d);
+
+            base.RenderEnd(d);
+        }
+
+        public override void MeasureEnd(Size availableSize, MarkupDrawContext d)
+        {
+            RestoreForeColor(d);
+            base.MeasureEnd(availableSize, d);
+        }
+
+        protected virtual void RestoreForeColor(MarkupDrawContext d)
+        {
+            if (d == null) return;
+            if (!m_OldForeColor.IsEmpty)
+                d.CurrentForeColor = m_OldForeColor;
+            m_OldForeColor = Color.Empty;
+        }
+
+        public Color ForeColor
+        {
+            get { return m_ForeColor; }
+            set { m_ForeColor = value; }
+        }
+
+        public int Size
+        {
+            get { return m_Size; }
+            set { m_Size = value; }
+        }
+
+        public string Face
+        {
+            get { return m_Face; }
+            set { m_Face = value; }
+        }
+
+        private Color GetColorFromName(string name)
+        {
+            string s = name.ToLower();
+            m_SystemColorName = "";
+            if (s == "syscaptiontextextra")
+            {
+                m_SystemColorName = s;
+                return Color.Empty;
+            }
+
+            return Color.FromName(name);
+        }
+
+        public override void ReadAttributes(XmlTextReader reader)
+        {
+            m_RelativeSize = false;
+            for (int i = 0; i < reader.AttributeCount; i++)
+            {
+                reader.MoveToAttribute(i);
+                if (reader.Name.ToLower() == "color")
+                {
+                    try
+                    {
+                        string s = reader.Value;
+                        if (s.StartsWith("#"))
+                        {
+                            if (s.Length == 7)
+                                m_ForeColor = ColorHelpers.GetColor(s.Substring(1));
+                        }
+                        else
+                        {
+                            m_ForeColor = GetColorFromName(s);
+                        }
+                    }
+                    catch
+                    {
+                        m_ForeColor = Color.Empty;
+                    }
+                }
+                else if (reader.Name.ToLower() == "size")
+                {
+                    string s = reader.Value;
+                    if (s.StartsWith("+"))
+                    {
+                        try
+                        {
+                            m_Size = Int32.Parse(s.Substring(1));
+                            m_RelativeSize = true;
+                        }
+                        catch
+                        {
+                            m_Size = 0;
+                        }
+                    }
+                    else
+                    {
+                        if (s.StartsWith("-"))
+                            m_RelativeSize = true;
+                        try
+                        {
+                            m_Size = Int32.Parse(s);
+                        }
+                        catch
+                        {
+                            m_Size = 0;
+                        }
+                    }
+                }
+                else if (reader.Name.ToLower() == "face")
+                {
+                    m_Face = reader.Value;
+                }
+            }
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextMarkup/Heading.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextMarkup/Heading.cs
new file mode 100644
index 00000000..fa06d9c2
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextMarkup/Heading.cs	
@@ -0,0 +1,97 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+#if AdvTree
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#elif LAYOUT
+namespace DevComponents.DotNetBar.Layout.TextMarkup
+#endif
+{
+    internal class Heading: ContainerElement
+    {
+        #region Private Variables
+        private int m_Level = 1;
+        private Font m_OldFont = null;
+        #endregion
+
+        #region Internal Implementation
+        public Heading() { }
+        public Heading(int level)
+        {
+            m_Level = level;
+        }
+
+        public override void Measure(Size availableSize, MarkupDrawContext d)
+        {
+            SetFont(d);
+            base.Measure(availableSize, d);
+            if (m_OldFont != null)
+                d.CurrentFont = m_OldFont;
+        }
+
+        public override void Render(MarkupDrawContext d)
+        {
+            SetFont(d);
+            base.Render(d);
+            if (m_OldFont != null)
+                d.CurrentFont = m_OldFont;
+        }
+
+        protected virtual void SetFont(MarkupDrawContext d)
+        {
+            Font font = d.CurrentFont;
+            try
+            {
+                float size = d.CurrentFont.SizeInPoints;
+                if (m_Level == 1)
+                {
+                    size += 12;
+                }
+                else if (m_Level == 2)
+                {
+                    size += 8;
+                }
+                else if (m_Level == 3)
+                {
+                    size += 6;
+                }
+                else if (m_Level == 4)
+                {
+                    size += 4;
+                }
+                else if (m_Level == 5)
+                {
+                    size += 2;
+                }
+                else if (m_Level == 6)
+                {
+                    size += 1;
+                }
+
+                d.CurrentFont = new Font(d.CurrentFont.FontFamily, size, FontStyle.Bold);
+            }
+            catch
+            {
+                font = null;
+            }
+
+            if (font != null)
+                m_OldFont = font;
+        }
+
+        /// <summary>
+        /// Gets or sets heading level. Values from 1 to 6 are valid. Default is 1.
+        /// </summary>
+        public int Level
+        {
+            get { return m_Level; }
+            set { m_Level = value; }
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextMarkup/HyperLink.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextMarkup/HyperLink.cs
new file mode 100644
index 00000000..93383690
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextMarkup/HyperLink.cs	
@@ -0,0 +1,249 @@
+using System;
+using System.Text;
+using System.Drawing;
+using System.Xml;
+using System.Windows.Forms;
+using System.Drawing.Drawing2D;
+
+#if AdvTree
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#elif LAYOUT
+namespace DevComponents.DotNetBar.Layout.TextMarkup
+#endif
+{
+    internal class HyperLink : MarkupElement, IActiveMarkupElement
+    {
+        #region Private Variables
+        private Color m_ForeColor = Color.Empty;
+        private Color m_OldForeColor = Color.Empty;
+        private string m_HRef = "";
+        private string m_Name = "";
+        private Cursor m_OldCursor = null;
+        private bool m_IsMouseOver = false;
+        private bool m_Visited = false;
+        #endregion
+
+        #region Internal Implementation
+        public override void Measure(Size availableSize, MarkupDrawContext d)
+        {
+            this.Bounds = Rectangle.Empty;
+            SetForeColor(d);
+        }
+
+        public override void Render(MarkupDrawContext d)
+        {
+            d.HyperLink = true;
+            d.HyperlinkStyle = GetHyperlinkStyle();
+            if (!d.HyperlinkStyle.BackColor.IsEmpty)
+            {
+                using (GraphicsPath gp = new GraphicsPath())
+                {
+                    MarkupElementCollection col = this.Parent.Elements;
+                    int start = col.IndexOf(this) + 1;
+                    for (int i = start; i < col.Count; i++)
+                    {
+                        MarkupElement elem = col[i];
+                        if (!elem.Visible) continue;
+                        if (elem is EndMarkupElement && ((EndMarkupElement)elem).StartElement == this)
+                            break;
+                        gp.AddRectangle(elem.RenderBounds);
+                    }
+
+                    using (SolidBrush brush = new SolidBrush(d.HyperlinkStyle.BackColor))
+                        d.Graphics.FillPath(brush, gp);
+                }
+            }
+            SetForeColor(d);
+        }
+
+        private HyperlinkStyle GetHyperlinkStyle()
+        {
+            if (m_IsMouseOver && MarkupSettings.MouseOverHyperlink.IsChanged)
+                return MarkupSettings.MouseOverHyperlink;
+            else if (m_Visited && MarkupSettings.VisitedHyperlink.IsChanged)
+                return MarkupSettings.VisitedHyperlink;
+
+            return MarkupSettings.NormalHyperlink;
+        }
+
+        protected virtual void SetForeColor(MarkupDrawContext d)
+        {
+            Color c = Color.Empty;
+            HyperlinkStyle style = GetHyperlinkStyle();
+            if (style != null && !style.TextColor.IsEmpty)
+                c = style.TextColor;
+
+            if (!m_ForeColor.IsEmpty)
+                c = m_ForeColor;
+            if (!c.IsEmpty)
+            {
+                m_OldForeColor = d.CurrentForeColor;
+                d.CurrentForeColor = c;
+            }
+        }
+
+        public override void RenderEnd(MarkupDrawContext d)
+        {
+            RestoreForeColor(d);
+            d.HyperLink = false;
+            d.HyperlinkStyle = null;
+            base.RenderEnd(d);
+        }
+
+        public override void MeasureEnd(Size availableSize, MarkupDrawContext d)
+        {
+            RestoreForeColor(d);
+            base.MeasureEnd(availableSize, d);
+        }
+
+        protected override void ArrangeCore(Rectangle finalRect, MarkupDrawContext d) { }
+
+        protected virtual void RestoreForeColor(MarkupDrawContext d)
+        {
+            if (d == null) return;
+            if (!m_OldForeColor.IsEmpty)
+                d.CurrentForeColor = m_OldForeColor;
+            m_OldForeColor = Color.Empty;
+        }
+
+        public Color ForeColor
+        {
+            get { return m_ForeColor; }
+            set { m_ForeColor = value; }
+        }
+
+        public string HRef
+        {
+            get { return m_HRef; }
+            set { m_HRef = value; }
+        }
+
+        public string Name
+        {
+            get { return m_Name; }
+            set { m_Name = value; }
+        }
+
+        public override void ReadAttributes(XmlTextReader reader)
+        {
+            for (int i = 0; i < reader.AttributeCount; i++)
+            {
+                reader.MoveToAttribute(i);
+                if (reader.Name.ToLower() == "href")
+                {
+                    m_HRef = reader.Value;
+                }
+                else if (reader.Name.ToLower() == "name")
+                {
+                    m_Name = reader.Value;
+                }
+                else if (reader.Name.ToLower() == "color")
+                {
+                    try
+                    {
+                        string s = reader.Value;
+                        if (s.StartsWith("#"))
+                        {
+                            if (s.Length == 7)
+                                m_ForeColor = ColorHelpers.GetColor(s.Substring(1));
+                        }
+                        else
+                        {
+                            m_ForeColor = GetColorFromName(s);
+                        }
+                    }
+                    catch
+                    {
+                        m_ForeColor = Color.Empty;
+                    }
+                }
+            }
+        }
+
+        private Color GetColorFromName(string name)
+        {
+            return Color.FromName(name);
+        }
+
+        /// <summary>
+        /// Returns whether hyper-link contains specified coordinates.
+        /// </summary>
+        /// <param name="x"></param>
+        /// <param name="y"></param>
+        /// <returns></returns>
+        public bool HitTest(int x, int y)
+        {
+            if (this.Parent == null)
+                return false;
+
+            MarkupElementCollection col = this.Parent.Elements;
+            int start = col.IndexOf(this)+1;
+            for (int i = start; i < col.Count; i++)
+            {
+                MarkupElement el = col[i];
+                if (el is EndMarkupElement && ((EndMarkupElement)el).StartElement == this)
+                    break;
+
+                if (col[i].RenderBounds.Contains(x, y))
+                    return true;
+
+            }
+
+            return false;
+        }
+
+        public void MouseEnter(Control parent)
+        {
+            m_OldCursor = parent.Cursor;
+            parent.Cursor = Cursors.Hand;
+            m_IsMouseOver = true;
+            if (MarkupSettings.MouseOverHyperlink.IsChanged)
+            {
+                InvalidateElements(parent);
+            }
+        }
+
+        public void MouseLeave(Control parent)
+        {
+            if (m_OldCursor != null && parent!=null)
+                parent.Cursor = m_OldCursor;
+            m_OldCursor = null;
+            m_IsMouseOver = false;
+            if (MarkupSettings.MouseOverHyperlink.IsChanged)
+            {
+                InvalidateElements(parent);
+            }
+        }
+
+        public void MouseDown(Control parent, MouseEventArgs e) { }
+        public void MouseUp(Control parent, MouseEventArgs e) { }
+        public void Click(Control parent)
+        {
+            m_Visited = true;
+            if (MarkupSettings.VisitedHyperlink.IsChanged)
+            {
+                InvalidateElements(parent);
+            }
+        }
+
+        private void InvalidateElements(Control parent)
+        {
+            if (this.Parent == null) return;
+            MarkupElementCollection col = this.Parent.Elements;
+            int start = col.IndexOf(this) + 1;
+            for (int i = start; i < col.Count; i++)
+            {
+                MarkupElement elem = col[i];
+                if (!elem.Visible) continue;
+                if (elem is EndMarkupElement && ((EndMarkupElement)elem).StartElement == this)
+                    break;
+                parent.Invalidate(elem.RenderBounds);
+            }
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextMarkup/IActiveMarkupElement.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextMarkup/IActiveMarkupElement.cs
new file mode 100644
index 00000000..95fb6608
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextMarkup/IActiveMarkupElement.cs	
@@ -0,0 +1,24 @@
+using System;
+using System.Text;
+using System.Windows.Forms;
+
+#if AdvTree
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#elif LAYOUT
+namespace DevComponents.DotNetBar.Layout.TextMarkup
+#endif
+{
+    internal interface IActiveMarkupElement
+    {
+        bool HitTest(int x, int y);
+        void MouseEnter(Control parent);
+        void MouseLeave(Control parent);
+        void MouseDown(Control parent, MouseEventArgs e);
+        void MouseUp(Control parent, MouseEventArgs e);
+        void Click(Control parent);
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextMarkup/ImageElement.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextMarkup/ImageElement.cs
new file mode 100644
index 00000000..d78a25c7
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextMarkup/ImageElement.cs	
@@ -0,0 +1,202 @@
+using System;
+using System.Text;
+using System.Drawing;
+using System.Xml;
+using System.Reflection;
+
+#if AdvTree
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#elif LAYOUT
+namespace DevComponents.DotNetBar.Layout.TextMarkup
+#endif
+
+{
+    internal class ImageElement : MarkupElement
+    {
+        #region Private Variables
+        private Size m_ImageSize = Size.Empty;
+        private string m_ImageSource = "";
+        private Image m_Image = null;
+        #endregion
+
+        #region Internal Implementation
+        public override void Measure(System.Drawing.Size availableSize, MarkupDrawContext d)
+        {
+            if (!m_ImageSize.IsEmpty)
+                this.Bounds = new Rectangle(Point.Empty, m_ImageSize);
+            else if (m_ImageSource.Length == 0)
+                this.Bounds = Rectangle.Empty;
+            else
+            {
+                Image img = this.GetImage();
+                if (img != null)
+                    this.Bounds = new Rectangle(Point.Empty, img.Size);
+                else
+                    this.Bounds = new Rectangle(Point.Empty, new Size(16,16));
+            }
+        }
+
+        public override bool IsBlockElement
+        {
+            get
+            {
+                return false;
+            }
+        }
+
+        private Image GetImage()
+        {
+            if (m_Image != null) return m_Image;
+            Assembly a = null;
+
+            // Try static custom image resolver
+            ResolveImageEventArgs e = new ResolveImageEventArgs();
+            e.Key = m_ImageSource;
+            e.ResolvedImage = null;
+            MarkupSettings.InvokeResolveImage(e);
+            if (e.Handled)
+                return e.ResolvedImage;
+
+            // Load from format: ClassLibrary1/ClassLibrary1.MyImage.png or ClassLibrary1/global::ClassLibrary1.Resources.MyImage
+            if (m_ImageSource.IndexOf('/') >= 0)
+            {
+                string[] parts = m_ImageSource.Split('/');
+                a = Assembly.Load(parts[0]);
+                string ResourceName = parts[1];
+                if (a != null)
+                {
+                    m_Image = LoadImageGlobalResource(parts[1], a);
+                    if (m_Image == null)
+                        m_Image = LoadImageResource(parts[1], a);
+
+                    if (m_Image != null) return m_Image;
+                }
+            }
+
+            // Probe Executing Assembly
+            a = Assembly.GetExecutingAssembly();
+            m_Image = LoadImageGlobalResource(m_ImageSource, a);
+            if(m_Image==null)
+                m_Image = LoadImageResource(m_ImageSource, a);
+
+            // Probe Entry Assembly
+            if (m_Image == null)
+            {
+                a = Assembly.GetEntryAssembly();
+                m_Image = LoadImageGlobalResource(m_ImageSource, a);
+                if (m_Image == null)
+                    m_Image = LoadImageResource(m_ImageSource, a);
+            }
+
+            return m_Image;
+        }
+
+        private Image LoadImageGlobalResource(string imageSource, Assembly a)
+        {
+            Image img = null;
+#if FRAMEWORK20
+            if (imageSource.StartsWith("global::"))
+            {
+                string name = imageSource.Substring(8);
+                if (name.Length > 0)
+                {
+                    try
+                    {
+                        int i = name.LastIndexOf('.');
+                        string resName = name.Substring(0, i);
+                        name = name.Substring(i + 1);
+                        System.Resources.ResourceManager r = new System.Resources.ResourceManager(resName, a);
+                        object obj = r.GetObject(name);
+                        img = (Bitmap)obj;
+                    }
+                    catch
+                    {
+                        img = null;
+                    }
+                }
+            }
+#endif
+            return img;
+        }
+
+        private Image LoadImageResource(string imageSource, Assembly a)
+        {
+            Image img = null;
+            try
+            {
+                img = new Bitmap(a.GetManifestResourceStream(imageSource));
+            }
+            catch { }
+
+            return img;
+        }
+
+        public override void Render(MarkupDrawContext d)
+        {
+            Rectangle r = this.Bounds;
+            r.Offset(d.Offset);
+
+            if (!d.ClipRectangle.IsEmpty && !r.IntersectsWith(d.ClipRectangle))
+                return;
+
+            Image img = this.GetImage();
+            if (img != null)
+            {
+                Rectangle imageRect = r;
+                if (m_ImageSize.IsEmpty)
+                    imageRect.Size = img.Size;
+                else
+                    imageRect.Size = m_ImageSize;
+                d.Graphics.DrawImage(img, imageRect);
+            }
+            else
+            {
+                using (SolidBrush brush = new SolidBrush(Color.White))
+                {
+                    d.Graphics.FillRectangle(brush, r);
+                }
+                using (Pen pen = new Pen(Color.DarkGray, 1))
+                {
+                    d.Graphics.DrawRectangle(pen, r);
+                    d.Graphics.DrawLine(pen, r.X, r.Y, r.Right, r.Bottom);
+                    d.Graphics.DrawLine(pen, r.Right, r.Y, r.X, r.Bottom);
+                }
+            }
+
+            this.RenderBounds = r;
+        }
+
+        protected override void ArrangeCore(System.Drawing.Rectangle finalRect, MarkupDrawContext d)  { }
+
+        public override void ReadAttributes(XmlTextReader reader)
+        {
+            m_ImageSize = Size.Empty;
+            m_ImageSource = "";
+            m_Image = null;
+
+            for (int i = 0; i < reader.AttributeCount; i++)
+            {
+                reader.MoveToAttribute(i);
+                if (reader.Name.ToLower() == "width")
+                {
+                    string s = reader.Value;
+                    m_ImageSize.Width = int.Parse(s);
+                }
+                else if (reader.Name.ToLower() == "height")
+                {
+                    string s = reader.Value;
+                    m_ImageSize.Height = int.Parse(s);
+                }
+                else if (reader.Name.ToLower() == "src")
+                {
+                    m_ImageSource = reader.Value;
+                }
+            }
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextMarkup/Italic.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextMarkup/Italic.cs
new file mode 100644
index 00000000..d43310c7
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextMarkup/Italic.cs	
@@ -0,0 +1,35 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+#if AdvTree
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#elif LAYOUT
+namespace DevComponents.DotNetBar.Layout.TextMarkup
+#endif
+{
+    internal class Italic : FontChangeElement
+    {
+        #region Internal Implementation
+        protected override void SetFont(MarkupDrawContext d)
+        {
+            Font font = d.CurrentFont;
+            FontStyle style=font.Style | FontStyle.Italic;
+
+            if (!font.Italic && d.CurrentFont.FontFamily.IsStyleAvailable(style))
+                d.CurrentFont = new Font(font, style);
+            else
+                font = null;
+
+            if (font != null)
+                m_OldFont = font;
+
+            base.SetFont(d);
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextMarkup/MarkupDrawContext.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextMarkup/MarkupDrawContext.cs
new file mode 100644
index 00000000..ad87cc3c
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextMarkup/MarkupDrawContext.cs	
@@ -0,0 +1,58 @@
+using System;
+using System.Drawing;
+using System.Text;
+
+#if AdvTree
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#elif LAYOUT
+namespace DevComponents.DotNetBar.Layout.TextMarkup
+#endif
+{
+    public class MarkupDrawContext
+    {
+        public Graphics Graphics = null;
+        public Font CurrentFont = null;
+        public Color CurrentForeColor = SystemColors.ControlText;
+        public bool RightToLeft = false;
+        public Point Offset = Point.Empty;
+        public bool HyperLink = false;
+        public HyperlinkStyle HyperlinkStyle = null;
+        public bool Underline = false;
+        public Rectangle ClipRectangle = Rectangle.Empty;
+        public bool HotKeyPrefixVisible = false;
+        public object ContextObject = null;
+        public bool AllowMultiLine = true;
+        public bool IgnoreFormattingColors = false;
+        public bool StrikeOut;
+
+        public MarkupDrawContext(Graphics g, Font currentFont, Color currentForeColor, bool rightToLeft) : this(g, currentFont, currentForeColor, rightToLeft, Rectangle.Empty, false)
+        {
+        }
+
+        public MarkupDrawContext(Graphics g, Font currentFont, Color currentForeColor, bool rightToLeft, Rectangle clipRectangle, bool hotKeyPrefixVisible)
+        {
+            this.Graphics = g;
+            this.CurrentFont = currentFont;
+            this.CurrentForeColor  = currentForeColor;
+            this.RightToLeft = rightToLeft;
+            this.ClipRectangle = clipRectangle;
+            this.HotKeyPrefixVisible = hotKeyPrefixVisible;
+        }
+
+        public MarkupDrawContext(Graphics g, Font currentFont, Color currentForeColor, bool rightToLeft, Rectangle clipRectangle, bool hotKeyPrefixVisible, object contextObject)
+        {
+            this.Graphics = g;
+            this.CurrentFont = currentFont;
+            this.CurrentForeColor = currentForeColor;
+            this.RightToLeft = rightToLeft;
+            this.ClipRectangle = clipRectangle;
+            this.HotKeyPrefixVisible = hotKeyPrefixVisible;
+            this.ContextObject = contextObject;
+        }
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextMarkup/MarkupElement.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextMarkup/MarkupElement.cs
new file mode 100644
index 00000000..c11ebf37
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextMarkup/MarkupElement.cs	
@@ -0,0 +1,198 @@
+using System;
+using System.Drawing;
+using System.Text;
+using System.Xml;
+using System.Windows.Forms;
+
+#if AdvTree
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+using DevComponents.UI.ContentManager;
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#elif LAYOUT
+namespace DevComponents.DotNetBar.Layout.TextMarkup
+#endif
+{
+    internal abstract class MarkupElement : IBlockExtended
+    {
+        #region Private Variables
+        private MarkupElementCollection m_Elements = null;
+        private MarkupElement m_Parent = null;
+        private Rectangle m_Bounds = Rectangle.Empty;
+        private bool m_Visible = true;
+        private bool m_SizeValid = false;
+        private Rectangle m_RenderBounds = Rectangle.Empty;
+        #endregion
+
+        #region Internal Implementation
+        public MarkupElement()
+        {
+            m_Elements = new MarkupElementCollection(this);
+        }
+        /// <summary>
+        /// Returns whether markup element is an container so it receives full available size of parent control for layout.
+        /// </summary>
+        public virtual bool IsBlockContainer
+        {
+            get { return false; }
+        }
+
+        /// <summary>
+        /// Returns whether markup element is an block element that always consumes a whole line in layout.
+        /// </summary>
+        public virtual bool IsBlockElement
+        {
+            get { return false; }
+        }
+
+        /// <summary>
+        /// Returns whether layout manager switches to new line after processing this element.
+        /// </summary>
+        public virtual bool IsNewLineAfterElement
+        {
+            get { return false; }
+        }
+
+        /// <summary>
+        /// Returns whether layout manager can start new line with this element.
+        /// </summary>
+        public virtual bool CanStartNewLine
+        {
+            get { return true; }
+        }
+
+        /// <summary>
+        /// Gets the collection of child elements if any for this markup element.
+        /// </summary>
+        public virtual MarkupElementCollection Elements
+        {
+            get
+            {
+                if (m_Elements == null)
+                    m_Elements = new MarkupElementCollection(this);
+                return m_Elements; 
+            }
+        }
+
+        internal void InvalidateElementsSize()
+        {
+            this.IsSizeValid = false;
+            if (m_Elements==null || m_Elements.Count == 0)
+                return;
+            foreach (MarkupElement e in m_Elements)
+            {
+                e.InvalidateElementsSize();
+                e.IsSizeValid = false;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether element size is valid. When size is not valid element Measure method will be called to validate size.
+        /// </summary>
+        public virtual bool IsSizeValid
+        {
+            get { return m_SizeValid; }
+            set { m_SizeValid = value; }
+        }
+
+        /// <summary>
+        /// Gets element parent or null if parent is not set.
+        /// </summary>
+        public virtual MarkupElement Parent
+        {
+            get { return m_Parent; }
+        }
+
+        internal void SetParent(MarkupElement parent)
+        {
+            m_Parent = parent;
+        }
+
+        /// <summary>
+        /// Gets or sets actual rendering bounds.
+        /// </summary>
+        public Rectangle Bounds
+        {
+            get { return m_Bounds; }
+            set { m_Bounds = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether markup element is visible.
+        /// </summary>
+        public bool Visible
+        {
+            get { return m_Visible; }
+            set { m_Visible = value; }
+        }
+
+        private Padding _Margin = new Padding(0);
+        /// <summary>
+        /// Gets or sets the element margin.
+        /// </summary>
+        public Padding Margin
+        {
+            get { return _Margin; }
+            set { _Margin = value; }
+        }
+
+        /// <summary>
+        /// Measures the element given available size.
+        /// </summary>
+        /// <param name="availableSize">Size available to element</param>
+        /// <param name="g">Reference to graphics object</param>
+        public abstract void Measure(Size availableSize, MarkupDrawContext d);
+
+        /// <summary>
+        /// Measures the end tag of an element. Most implementations do not need to do anything but implementations like the ones
+        /// that change color should return state back at this time.
+        /// </summary>
+        /// <param name="availableSize"></param>
+        /// <param name="d"></param>
+        public virtual void MeasureEnd(Size availableSize, MarkupDrawContext d) { }
+
+        /// <summary>
+        /// Renders element.
+        /// </summary>
+        /// <param name="d">Provides markup drawing context information.</param>
+        public abstract void Render(MarkupDrawContext d);
+
+        /// <summary>
+        /// Renders element tag end. Most implementations do not need to do anything but mplementations like the ones
+        /// that change color should return state back at this time.
+        /// </summary>
+        /// <param name="d">Provides markup drawing context information.</param>
+        public virtual void RenderEnd(MarkupDrawContext d) { }
+
+        /// <summary>
+        /// Provides final rectangle to element and lets it arrange it's content given new constraint.
+        /// </summary>
+        /// <param name="finalRect">Final rectangle.</param>
+        /// <param name="g"></param>
+        protected abstract void ArrangeCore(Rectangle finalRect, MarkupDrawContext d);
+
+        /// <summary>
+        /// Arranges the element given the final size. Layout is two step process with Measure followed by Arrange.
+        /// </summary>
+        /// <param name="finalSize"></param>
+        /// <param name="g"></param>
+        public void Arrange(Rectangle finalSize, MarkupDrawContext d)
+        {
+            this.ArrangeCore(finalSize, d);
+        }
+
+        public virtual void ReadAttributes(XmlTextReader reader) { }
+
+        /// <summary>
+        /// Gets or sets actual rendered bounds for a give markup element if applicable.
+        /// </summary>
+        public Rectangle RenderBounds
+        {
+            get { return m_RenderBounds; }
+            set { m_RenderBounds = value; }
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextMarkup/MarkupElementCollection.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextMarkup/MarkupElementCollection.cs
new file mode 100644
index 00000000..d98ff9dc
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextMarkup/MarkupElementCollection.cs	
@@ -0,0 +1,141 @@
+using System;
+using System.Text;
+using System.Collections;
+
+#if AdvTree
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#elif LAYOUT
+namespace DevComponents.DotNetBar.Layout.TextMarkup
+#endif
+{
+    internal class MarkupElementCollection : CollectionBase
+    {
+        #region Private Variables
+        private MarkupElement m_Parent = null;
+        #endregion
+
+        #region Internal Implementation
+        /// <summary>Creates new instance of the class.</summary>
+        public MarkupElementCollection(MarkupElement parent)
+		{
+            m_Parent = parent;
+		}
+
+        /// <summary>
+        /// Gets or sets the collection parent element.
+        /// </summary>
+        public MarkupElement Parent
+        {
+            get { return m_Parent; }
+            set { m_Parent = value; }
+        }
+
+		/// <summary>
+		/// Adds new object to the collection.
+		/// </summary>
+		/// <param name="MarkupElement">Object to add.</param>
+		/// <returns>Index of newly added object.</returns>
+		public int Add(MarkupElement MarkupElement)
+		{
+			return List.Add(MarkupElement);
+		}
+		/// <summary>
+		/// Returns reference to the object in collection based on it's index.
+		/// </summary>
+		public MarkupElement this[int index]
+		{
+			get {return (MarkupElement)(List[index]);}
+			set {List[index] = value;}
+		}
+
+		/// <summary>
+		/// Inserts new object into the collection.
+		/// </summary>
+		/// <param name="index">Position of the object.</param>
+		/// <param name="value">Object to insert.</param>
+		public void Insert(int index, MarkupElement value) 
+		{
+			List.Insert(index, value);
+		}
+
+		/// <summary>
+		/// Returns index of the object inside of the collection.
+		/// </summary>
+		/// <param name="value">Reference to the object.</param>
+		/// <returns>Index of the object.</returns>
+		public int IndexOf(MarkupElement value) 
+		{
+			return List.IndexOf(value);
+		}
+
+		/// <summary>
+		/// Returns whether collection contains specified object.
+		/// </summary>
+		/// <param name="value">Object to look for.</param>
+		/// <returns>true if object is part of the collection, otherwise false.</returns>
+		public bool Contains(MarkupElement value) 
+		{
+			return List.Contains(value);
+		}
+
+		/// <summary>
+		/// Removes specified object from the collection.
+		/// </summary>
+		/// <param name="value"></param>
+		public void Remove(MarkupElement value) 
+		{
+			List.Remove(value);
+		}
+
+		protected override void OnRemoveComplete(int index,object value)
+		{
+			base.OnRemoveComplete(index,value);
+			MarkupElement me=value as MarkupElement;
+            if (m_Parent != null)
+            {
+                me.SetParent(null);
+                m_Parent.IsSizeValid = false;
+            }
+		}
+		protected override void OnInsertComplete(int index,object value)
+		{
+			base.OnInsertComplete(index,value);
+			MarkupElement me=value as MarkupElement;
+            if (m_Parent != null)
+            {
+                me.SetParent(m_Parent);
+                m_Parent.IsSizeValid = false;
+            }
+		}
+
+		/// <summary>
+		/// Copies collection into the specified array.
+		/// </summary>
+		/// <param name="array">Array to copy collection to.</param>
+		/// <param name="index">Starting index.</param>
+		public void CopyTo(MarkupElement[] array, int index) 
+		{
+			List.CopyTo(array, index);
+		}
+
+		/// <summary>
+		/// Copies contained items to the MarkupElement array.
+		/// </summary>
+		/// <param name="array">Array to copy to.</param>
+		internal void CopyTo(MarkupElement[] array)
+		{
+			List.CopyTo(array,0);
+		}
+
+		protected override void OnClear()
+		{
+			base.OnClear();
+		}
+
+		#endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextMarkup/MarkupLayoutManager.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextMarkup/MarkupLayoutManager.cs
new file mode 100644
index 00000000..660a8a98
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextMarkup/MarkupLayoutManager.cs	
@@ -0,0 +1,41 @@
+using System.Collections;
+using System.Drawing;
+using System.Text;
+
+#if AdvTree
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+using DevComponents.UI.ContentManager;
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#elif LAYOUT
+namespace DevComponents.DotNetBar.Layout.TextMarkup
+#endif
+{
+    internal class MarkupLayoutManager : BlockLayoutManager
+    {
+        private MarkupDrawContext m_MarkupDrawContext = null;
+
+        public MarkupDrawContext MarkupDrawContext
+        {
+            get { return m_MarkupDrawContext; }
+            set { m_MarkupDrawContext = value; }
+        }
+
+        public override void Layout(IBlock block, Size availableSize)
+        {
+            if (block is MarkupElement)
+            {
+                MarkupElement m = block as MarkupElement;
+                if(!m.IsSizeValid)
+                    m.Measure(availableSize, m_MarkupDrawContext);
+            }
+        }
+
+        public override Rectangle FinalizeLayout(Rectangle containerBounds, Rectangle blocksBounds, ArrayList lines)
+        {
+            return (blocksBounds);
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextMarkup/MarkupParser.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextMarkup/MarkupParser.cs
new file mode 100644
index 00000000..40462afa
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextMarkup/MarkupParser.cs	
@@ -0,0 +1,256 @@
+using System;
+using System.Text;
+using System.IO;
+using System.Xml;
+using System.Collections;
+using System.Text.RegularExpressions;
+
+#if AdvTree
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#elif LAYOUT
+namespace DevComponents.DotNetBar.Layout.TextMarkup
+#endif
+{
+    internal class MarkupParser
+    {
+        #region Private Variables
+        private static string TextElementName = "text";
+        private static string BodyTag = "body";
+        #endregion
+
+        #region Internal Implementation
+        public static BodyElement Parse(string text)
+        {
+            StringBuilder plainText = new StringBuilder(text.Length);
+            BodyElement root = new BodyElement();
+            root.HasExpandElement = false;
+            MarkupElement currentParent = root;
+            Stack openTags = new Stack();
+            openTags.Push(root);
+            // Input text is not wrapped into the container tag so we wrap it here
+            text = text.Replace("&nbsp;", "{ent_nbsp}");
+            text = text.Replace("&zwsp;", "{ent_zwsp}");
+            text = text.Replace("&lt;", "{ent_lt}");
+            text = text.Replace("&gt;", "{ent_gt}");
+            text = text.Replace("&amp;", "{ent_amp}");
+            text = text.Replace("|", "{ent_l}");
+            text = text.Replace("&", "|");
+            text = text.Replace("{ent_nbsp}", "&nbsp;");
+            text = text.Replace("{ent_zwsp}", "&zwsp;"); 
+            text = text.Replace("{ent_lt}", "&lt;");
+            text = text.Replace("{ent_gt}", "&gt;");
+            StringReader sr = new StringReader("<"+BodyTag+">" + text + "</"+BodyTag+">");
+#if !DEBUG
+            try
+#endif
+            {
+                XmlTextReader reader = new XmlTextReader(sr);
+                //reader.EntityHandling = EntityHandling.ExpandCharEntities;
+                while (reader.Read())
+                {
+                    if (reader.NodeType == XmlNodeType.Element)
+                    {
+                        if (reader.Name == BodyTag)
+                            continue;
+                        MarkupElement el = CreateMarkupElement(reader.Name);
+                        if (el == null)
+                        {
+                            reader.Skip();
+                            continue;
+                        }
+                        else if (el is ExpandElement)
+                            root.HasExpandElement = true;
+
+                        if (el is IActiveMarkupElement)
+                            root.ActiveElements.Add(el);
+
+                        // Parse any attributes here
+                        if (reader.AttributeCount > 0)
+                        {
+                            el.ReadAttributes(reader);
+                            reader.MoveToElement();
+                        }
+
+                        currentParent.Elements.Add(el);
+
+                        if (el is ContainerElement)
+                            currentParent = el;
+
+                        if (!reader.IsEmptyElement)
+                            openTags.Push(el);
+                    }
+                    else if (reader.NodeType == XmlNodeType.Text)
+                    {
+                        if (reader.Value.Length == 1)
+                        {
+                            TextElement el = CreateMarkupElement(TextElementName) as TextElement;
+                            if (reader.Value == " ")
+                            {
+                                el.TrailingSpace = true;
+                                plainText.Append(' ');
+                            }
+                            else
+                            {
+                                el.Text = reader.Value;
+                                el.Text = el.Text.Replace("|", "&");
+                                el.Text = el.Text.Replace("{ent_l}", "|");
+                                el.Text = el.Text.Replace("{ent_amp}", "&&");
+                                plainText.Append(el.Text+" ");
+                            }
+                            currentParent.Elements.Add(el);
+                        }
+                        else
+                        {
+                            string s = reader.Value;
+                            if (s.StartsWith("\r\n"))
+                                s = s.TrimStart(new char[] { '\r', '\n' });
+                            s = s.Replace("\r\n", " ");
+                            string[] words = s.Split(' ');
+                            bool space = false;
+                            if (currentParent.Elements.Count > 0 && currentParent.Elements[currentParent.Elements.Count - 1] is NewLine)
+                                space = true;
+                            for (int i = 0; i < words.Length; i++)
+                            {
+                                if (words[i].Length == 0)
+                                {
+                                    if (space)
+                                        continue;
+                                    space = true;
+                                }
+                                else
+                                    space = false;
+
+                                TextElement el = CreateMarkupElement(TextElementName) as TextElement;
+                                el.Text = words[i].Replace("|","&");
+                                el.Text = el.Text.Replace("{ent_l}", "|");
+                                el.Text = el.Text.Replace("{ent_amp}", "&&");
+                                plainText.Append(el.Text + " ");
+                                if (i < words.Length - 1)
+                                {
+                                    el.TrailingSpace = true;
+                                    space = true;
+                                }
+
+                                currentParent.Elements.Add(el);
+                            }
+                        }
+                    }
+                    else if (reader.NodeType == XmlNodeType.Whitespace)
+                    {
+                        if (reader.Value.IndexOf(' ') >= 0)
+                        {
+                            TextElement el = CreateMarkupElement(TextElementName) as TextElement;
+                            el.TrailingSpace = true;
+                            currentParent.Elements.Add(el);
+                        }
+                    }
+                    else if (reader.NodeType == XmlNodeType.EntityReference)
+                    {
+                        TextElement el = CreateMarkupElement(TextElementName) as TextElement;
+                        if (reader.Name == "nbsp")
+                        {
+                            el.TrailingSpace = true;
+                        }
+                        else if (reader.Name == "zwsp")
+                        {
+                            el.TrailingSpace = false;
+                        }
+                        else
+                            el.Text = reader.Name;
+                        el.EnablePrefixHandling = false;
+                        currentParent.Elements.Add(el);
+                    }
+                    else if (reader.NodeType == XmlNodeType.EndElement)
+                    {
+                        MarkupElement el = openTags.Pop() as MarkupElement;
+                        if (el != currentParent)
+                        {
+                            currentParent.Elements.Add(new EndMarkupElement(el));
+                        }
+                        else
+                        {
+                            if (currentParent != root)
+                                currentParent = currentParent.Parent;
+                        }
+                    }
+                }
+            }
+#if !DEBUG
+            catch
+            {
+                return null;
+            }
+#endif
+            root.PlainText = plainText.ToString();
+            return root;
+        }
+
+        public static MarkupElement CreateMarkupElement(string elementName)
+        {
+            if (elementName == "b" || elementName == "strong")
+                return new Strong();
+            else if (elementName == "i" || elementName == "em")
+                return new Italic();
+            else if (elementName == "u")
+                return new Underline();
+            else if (elementName == "br")
+                return new NewLine();
+            else if (elementName == "expand")
+                return new ExpandElement();
+            else if (elementName == "a")
+                return new HyperLink();
+            else if (elementName == "p")
+                return new Paragraph();
+            else if (elementName == "div")
+                return new Div();
+            else if (elementName == "span")
+                return new Span();
+            else if (elementName == "img")
+                return new ImageElement();
+            else if (elementName == "h1")
+                return new Heading();
+            else if (elementName == "h2")
+                return new Heading(2);
+            else if (elementName == "h3")
+                return new Heading(3);
+            else if (elementName == "h4")
+                return new Heading(4);
+            else if (elementName == "h5")
+                return new Heading(5);
+            else if (elementName == "h6")
+                return new Heading(6);
+            else if (elementName == "font")
+                return new FontElement();
+            else if (elementName == "s" || elementName == "strike")
+                return new Strike();
+            else if (elementName == TextElementName)
+                return new TextElement();
+            else if (elementName == "symbol")
+                return new SymbolElement();
+
+            return null;
+        }
+
+        /// <summary>
+        /// Tests whether input text could be markup text.
+        /// </summary>
+        /// <param name="text">Text to test.</param>
+        /// <returns>true if text could be markup, otherwise false</returns>
+        public static bool IsMarkup(ref string text)
+        {
+            if (text.IndexOf("</") < 0 && text.IndexOf("/>") < 0)
+                return false;
+            return true;
+        }
+
+        internal static string RemoveExpand(string text)
+        {
+            return Regex.Replace(text, "<expand.*?>", "", RegexOptions.IgnoreCase);
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextMarkup/MarkupSettings.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextMarkup/MarkupSettings.cs
new file mode 100644
index 00000000..1f4e47d9
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextMarkup/MarkupSettings.cs	
@@ -0,0 +1,189 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+#if AdvTree
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#elif LAYOUT
+namespace DevComponents.DotNetBar.Layout.TextMarkup
+#endif
+{
+#if FRAMEWORK20
+    public static class MarkupSettings
+#else
+    public class MarkupSettings
+#endif
+    {
+        private static HyperlinkStyle _NormalHyperlink = new HyperlinkStyle(Color.Blue, eHyperlinkUnderlineStyle.SolidLine);
+        /// <summary>
+        /// Gets the style of the hyperlink in its default state.
+        /// </summary>
+        public static HyperlinkStyle NormalHyperlink
+        {
+            get { return _NormalHyperlink; }
+        }
+
+        private static HyperlinkStyle _MouseOverHyperlink = new HyperlinkStyle();
+        /// <summary>
+        /// Gets the style of the hyperlink when mouse is over the link.
+        /// </summary>
+        public static HyperlinkStyle MouseOverHyperlink
+        {
+            get { return _MouseOverHyperlink; }
+        }
+
+        private static HyperlinkStyle _VisitedHyperlink = new HyperlinkStyle();
+        /// <summary>
+        /// Gets the style of the visited hyperlink.
+        /// </summary>
+        public static HyperlinkStyle VisitedHyperlink
+        {
+            get { return _VisitedHyperlink; }
+        }
+
+        /// <summary>
+        /// Represents the method that will handle the ResolveImage event.
+        /// </summary>
+        public delegate void ResolveImageEventHandler(object sender, ResolveImageEventArgs e);
+        // <summary>
+        /// Occurs when DotNetBar is looking for an image for one of the internal img tags that is
+        /// used within the minimarkup. You need to set Handled=true if you want your custom image
+        /// to be used instead of the built-in resource resolving mechanism.
+        /// </summary>
+        public static event ResolveImageEventHandler ResolveImage;
+        internal static void InvokeResolveImage(ResolveImageEventArgs e)
+        {
+            if (ResolveImage != null)
+                ResolveImage(null, e);
+        }
+    }
+
+    /// <summary>
+    /// Defines the text-markup hyperlink appearance style.
+    /// </summary>
+    public class HyperlinkStyle
+    {
+        /// <summary>
+        /// Initializes a new instance of the HyperlinkStyle class.
+        /// </summary>
+        public HyperlinkStyle()
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the HyperlinkStyle class.
+        /// </summary>
+        /// <param name="textColor"></param>
+        /// <param name="underlineStyle"></param>
+        public HyperlinkStyle(Color textColor, eHyperlinkUnderlineStyle underlineStyle)
+        {
+            _TextColor = textColor;
+            _UnderlineStyle = underlineStyle;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the HyperlinkStyle class.
+        /// </summary>
+        /// <param name="textColor"></param>
+        /// <param name="backColor"></param>
+        /// <param name="underlineStyle"></param>
+        public HyperlinkStyle(Color textColor, Color backColor, eHyperlinkUnderlineStyle underlineStyle)
+        {
+            _TextColor = textColor;
+            _BackColor = backColor;
+            _UnderlineStyle = underlineStyle;
+        }
+        private Color _TextColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets hyperlink text color.
+        /// </summary>
+        public Color TextColor
+        {
+            get { return _TextColor; }
+            set
+            {
+                if (_TextColor != value)
+                {
+                    _TextColor = value;
+                }
+            }
+        }
+
+        private Color _BackColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets hyperlink back color.
+        /// </summary>
+        public Color BackColor
+        {
+            get { return _BackColor; }
+            set
+            {
+                if (_BackColor != value)
+                {
+                    _BackColor = value;
+                }
+            }
+        }
+
+        private eHyperlinkUnderlineStyle _UnderlineStyle = eHyperlinkUnderlineStyle.None;
+        /// <summary>
+        /// Gets or sets the underline style for the hyperlink.
+        /// </summary>
+        public eHyperlinkUnderlineStyle UnderlineStyle
+        {
+            get { return _UnderlineStyle; }
+            set
+            {
+                if (_UnderlineStyle != value)
+                {
+                    _UnderlineStyle = value;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether style has been changed from its default state.
+        /// </summary>
+        public bool IsChanged
+        {
+            get { return !_TextColor.IsEmpty || !_BackColor.IsEmpty || _UnderlineStyle != eHyperlinkUnderlineStyle.None; }
+        }
+    }
+
+    public enum eHyperlinkUnderlineStyle
+    {
+        None,
+        SolidLine,
+        DashedLine
+    }
+
+    /// <summary>
+    /// <summary>
+    /// Event arguments for ResolveImage event.
+    /// </summary>
+    public class ResolveImageEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Indicates that event has been handled and that ResolvedImage should be used.
+        /// </summary>
+        public bool Handled = false;
+        /// <summary>
+        /// Indicates the string key parameters in url-style for the image that needs to be resolved.
+        /// </summary>
+        public string Key = "";
+        /// <summary>
+        /// Indicates the resolved image value.
+        /// you need to set this value to the resolved image and you need to set Handled property to true.
+        /// </summary>
+       public Image ResolvedImage = null;
+        /// <summary>
+        /// Default constructor.
+        /// </summary>
+        public ResolveImageEventArgs() { }
+    }
+
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextMarkup/NewLine.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextMarkup/NewLine.cs
new file mode 100644
index 00000000..74085447
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextMarkup/NewLine.cs	
@@ -0,0 +1,47 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+#if AdvTree
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#elif LAYOUT
+namespace DevComponents.DotNetBar.Layout.TextMarkup
+#endif
+{
+    internal class NewLine : MarkupElement
+    {
+        #region Internal Implementation
+        public override void Measure(System.Drawing.Size availableSize, MarkupDrawContext d)
+        {
+            // Causes layout manager to switch to the new line
+            this.Bounds = new Rectangle(0, 0, 0, d.CurrentFont.Height);
+        }
+
+        /// <summary>
+        /// Gets or sets whether element size is valid. When size is not valid element Measure method will be called to validate size.
+        /// </summary>
+        public override bool IsSizeValid
+        {
+            get { return false; }
+            set {  }
+        }
+
+        public override void Render(MarkupDrawContext d) {}
+
+        protected override void ArrangeCore(System.Drawing.Rectangle finalRect, MarkupDrawContext d) { }
+
+        /// <summary>
+        /// Returns whether layout manager switches to new line after processing this element.
+        /// </summary>
+        public override bool IsNewLineAfterElement
+        {
+            get { return true; }
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextMarkup/Paragraph.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextMarkup/Paragraph.cs
new file mode 100644
index 00000000..e1bac6f6
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextMarkup/Paragraph.cs	
@@ -0,0 +1,29 @@
+using System;
+using System.Text;
+using System.Drawing;
+using System.Xml;
+
+#if AdvTree
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+using DevComponents.UI.ContentManager;
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#elif LAYOUT
+namespace DevComponents.DotNetBar.Layout.TextMarkup
+#endif
+{
+    internal class Paragraph : Div
+    {
+        #region Internal Implementation
+        protected override void ArrangeInternal(Rectangle bounds, MarkupDrawContext d)
+        {
+            base.ArrangeInternal(bounds, d);
+            this.Bounds = new Rectangle(this.Bounds.X, this.Bounds.Y, this.Bounds.Width , this.Bounds.Height + d.CurrentFont.Height);
+        }
+        #endregion
+    }
+
+    
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextMarkup/Span.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextMarkup/Span.cs
new file mode 100644
index 00000000..1947de36
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextMarkup/Span.cs	
@@ -0,0 +1,25 @@
+using System;
+using System.Text;
+
+#if AdvTree
+using DevComponents.Tree;
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#elif LAYOUT
+namespace DevComponents.DotNetBar.Layout.TextMarkup
+#endif
+{
+    internal class Span : Div
+    {
+        /// <summary>
+        /// Returns whether markup element is an block element that always consumes a whole line in layout.
+        /// </summary>
+        public override bool IsBlockElement
+        {
+            get { return false; }
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextMarkup/Strike.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextMarkup/Strike.cs
new file mode 100644
index 00000000..0d49fd04
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextMarkup/Strike.cs	
@@ -0,0 +1,36 @@
+using System.Drawing;
+
+#if AdvTree
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#elif LAYOUT
+namespace DevComponents.DotNetBar.Layout.TextMarkup
+#endif
+{
+    internal class Strike : MarkupElement
+    {
+        public override void Measure(Size availableSize, MarkupDrawContext d)
+        {
+            Bounds = Rectangle.Empty;
+        }
+
+        public override void Render(MarkupDrawContext d)
+        {
+            d.StrikeOut = true;
+        }
+
+        public override void RenderEnd(MarkupDrawContext d)
+        {
+            d.StrikeOut = false;
+
+            base.RenderEnd(d);
+        }
+
+        protected override void ArrangeCore(Rectangle finalRect, MarkupDrawContext d)
+        {
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextMarkup/Strong.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextMarkup/Strong.cs
new file mode 100644
index 00000000..c63ba948
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextMarkup/Strong.cs	
@@ -0,0 +1,35 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+#if AdvTree
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#elif LAYOUT
+namespace DevComponents.DotNetBar.Layout.TextMarkup
+#endif
+{
+    internal class Strong : FontChangeElement
+    {
+        #region Internal Implementation
+        protected override void SetFont(MarkupDrawContext d)
+        {
+            Font font = d.CurrentFont;
+            FontStyle style = d.CurrentFont.Style | FontStyle.Bold;
+
+            if (!font.Bold && font.FontFamily.IsStyleAvailable(style))
+                d.CurrentFont = new Font(d.CurrentFont, style);
+            else
+                font = null;
+
+            if (font != null)
+                m_OldFont = font;
+
+            base.SetFont(d);
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextMarkup/SymbolElement.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextMarkup/SymbolElement.cs
new file mode 100644
index 00000000..f91c0b0e
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextMarkup/SymbolElement.cs	
@@ -0,0 +1,95 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Xml;
+
+#if AdvTree
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#elif LAYOUT
+namespace DevComponents.DotNetBar.Layout.TextMarkup
+#endif
+{
+    internal class SymbolElement : MarkupElement
+    {
+        #region Internal Implementation
+        private Size _DefaultSize = new Size(16, 16);
+        private eSymbol _Symbol = eSymbol.XInCircle;
+
+        public override void Measure(System.Drawing.Size availableSize, MarkupDrawContext d)
+        {
+            this.Bounds = new Rectangle(Point.Empty, _DefaultSize);
+        }
+
+        protected override void ArrangeCore(System.Drawing.Rectangle finalRect, MarkupDrawContext d) { }
+
+        public override void Render(MarkupDrawContext d)
+        {
+            Rectangle r = this.Bounds;
+            r.Offset(d.Offset);
+
+            if (!d.ClipRectangle.IsEmpty && !r.IntersectsWith(d.ClipRectangle))
+                return;
+
+            Graphics g = d.Graphics;
+            Color color = d.CurrentForeColor;
+
+            SmoothingMode sm = g.SmoothingMode;
+            g.SmoothingMode = SmoothingMode.AntiAlias;
+
+            if (_Symbol == eSymbol.XInCircle)
+            {
+                Rectangle sr = new Rectangle(r.X + (r.Width - 14) / 2, r.Y + (r.Height - 14) / 2, 14, 14);
+                using (Pen pen = new Pen(color, 1.51f))
+                {
+                    //sr.Width-=2;
+                    //sr.Height-=2;
+                    g.DrawEllipse(pen, sr); 
+                    g.DrawLine(pen, sr.X + 4, sr.Y + 4, sr.X + 10, sr.Y + 10);
+                    g.DrawLine(pen, sr.X + 10, sr.Y + 4, sr.X + 4, sr.Y + 10);
+                }
+            }
+
+            g.SmoothingMode = sm;
+
+            this.RenderBounds = r;
+        }
+
+        public override void ReadAttributes(XmlTextReader reader)
+        {
+            _Symbol = eSymbol.XInCircle;
+
+            for (int i = 0; i < reader.AttributeCount; i++)
+            {
+                reader.MoveToAttribute(i);
+                if (reader.Name.ToLower() == "type")
+                {
+                    string s = reader.Value.ToLower();
+                    if (s == "xincircle")
+                        _Symbol = eSymbol.XInCircle;
+                    break;
+                }
+            }
+        }
+
+        private enum eSymbol
+        {
+            XInCircle
+        }
+
+        /// <summary>
+        /// Returns whether layout manager can start new line with this element.
+        /// </summary>
+        public override bool CanStartNewLine
+        {
+            get { return false; }
+        }
+        #endregion
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextMarkup/TextElement.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextMarkup/TextElement.cs
new file mode 100644
index 00000000..fb2c5797
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextMarkup/TextElement.cs	
@@ -0,0 +1,224 @@
+using System;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Text;
+
+#if AdvTree
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#elif LAYOUT
+namespace DevComponents.DotNetBar.Layout.TextMarkup
+#endif
+{
+    internal class TextElement : MarkupElement
+    {
+        private static bool PadText = false;
+        static TextElement()
+        {
+            string lc = System.Windows.Forms.Application.CurrentCulture.TwoLetterISOLanguageName;
+            if (lc == "ja")
+                PadText = true;
+        }
+        #region Private Variables
+        private string m_Text = "";
+        private bool m_TrailingSpace = false;
+        private bool m_EnablePrefixHandling = true;
+        #endregion
+
+        #region Internal Implementation
+        public override void Measure(System.Drawing.Size availableSize, MarkupDrawContext d)
+        {
+#if (FRAMEWORK20)
+            if (BarUtilities.UseTextRenderer)
+            {
+                eTextFormat format = eTextFormat.Default | eTextFormat.NoPadding;
+                if (!d.HotKeyPrefixVisible || m_EnablePrefixHandling)
+                    format |= eTextFormat.HidePrefix;
+                Size size = Size.Empty;
+                if (m_TrailingSpace)
+                {
+                    if (d.CurrentFont.Italic)
+                    {
+                        size = Size.Ceiling(TextDrawing.MeasureString(d.Graphics, m_Text, d.CurrentFont, 0, format));
+                        size.Width += (int)(d.Graphics.MeasureString("||", d.CurrentFont).Width / 4);
+                    }
+                    else
+                        size = Size.Ceiling(TextDrawing.MeasureString(d.Graphics, m_Text + (BarFunctions.IsVista && m_Text.Length > 0 ? "|" : "||"), d.CurrentFont, 0, format));
+                }
+                else
+                    size = Size.Ceiling(TextDrawing.MeasureString(d.Graphics, m_Text, d.CurrentFont, 0, format));
+                if (PadText)
+                {
+                    size.Width += BarUtilities.TextMarkupCultureSpecificPadding;
+                    size.Height += BarUtilities.TextMarkupCultureSpecificPadding;
+                }
+                this.Bounds = new Rectangle(Point.Empty, size);
+            }
+            else
+#endif
+            {
+                using (StringFormat format = new StringFormat(StringFormat.GenericTypographic))
+                {
+                    format.FormatFlags = StringFormatFlags.NoWrap;
+                    if (d.HotKeyPrefixVisible || !m_EnablePrefixHandling)
+                        format.HotkeyPrefix = System.Drawing.Text.HotkeyPrefix.Show;
+                    else
+                        format.HotkeyPrefix = System.Drawing.Text.HotkeyPrefix.Hide;
+
+                    if (m_TrailingSpace)
+                    {
+                        if (d.CurrentFont.Italic)
+                        {
+                            Size size = Size.Ceiling(d.Graphics.MeasureString(m_Text, d.CurrentFont, 0, format));
+                            size.Width += (int)(d.Graphics.MeasureString("|", d.CurrentFont).Width / 4);
+                            if (PadText)
+                            {
+                                size.Width += BarUtilities.TextMarkupCultureSpecificPadding;
+                                size.Height += BarUtilities.TextMarkupCultureSpecificPadding;
+                            }
+                            this.Bounds = new Rectangle(Point.Empty, size);
+                        }
+                        else
+                        {
+                            Size size = Size.Ceiling(d.Graphics.MeasureString(m_Text + "|", d.CurrentFont, 0, format));
+                            if (PadText)
+                            {
+                                size.Width += BarUtilities.TextMarkupCultureSpecificPadding;
+                                size.Height += BarUtilities.TextMarkupCultureSpecificPadding;
+                            }
+                            this.Bounds = new Rectangle(Point.Empty, size);
+                        }
+                    }
+                    else
+                    {
+                        Size size = Size.Ceiling(d.Graphics.MeasureString(m_Text, d.CurrentFont, 0, format));
+                        if (PadText)
+                        {
+                            size.Width += BarUtilities.TextMarkupCultureSpecificPadding;
+                            size.Height += BarUtilities.TextMarkupCultureSpecificPadding;
+                        }
+                        this.Bounds = new Rectangle(Point.Empty, size);
+                    }
+                }
+            }
+            IsSizeValid = true;
+        }
+
+        public override void Render(MarkupDrawContext d)
+        {
+            Rectangle r = this.Bounds;
+            r.Offset(d.Offset);
+
+            if (!d.ClipRectangle.IsEmpty && !r.IntersectsWith(d.ClipRectangle))
+                return;
+
+            Graphics g = d.Graphics;
+            #if (FRAMEWORK20)
+            if (BarUtilities.UseTextRenderer)
+            {
+                eTextFormat format = eTextFormat.Default | eTextFormat.NoClipping | eTextFormat.NoPadding;
+                if (d.RightToLeft) format |= eTextFormat.RightToLeft;
+                if (!d.HotKeyPrefixVisible)
+                    format |= eTextFormat.HidePrefix;
+
+                if (!d.ClipRectangle.IsEmpty && r.Right > d.ClipRectangle.Right)
+                {
+                    format|= eTextFormat.EndEllipsis;
+                    r.Width -= (r.Right - d.ClipRectangle.Right);
+                }
+                TextDrawing.DrawString(g, m_Text, d.CurrentFont, d.CurrentForeColor, r, format);
+                
+            }
+            else
+            #endif
+            {
+                using (StringFormat format = new StringFormat(StringFormat.GenericTypographic))
+                {
+                    format.FormatFlags |= StringFormatFlags.NoWrap;
+                    if (d.RightToLeft) format.FormatFlags |= StringFormatFlags.DirectionRightToLeft;
+                    if (d.HotKeyPrefixVisible)
+                        format.HotkeyPrefix = System.Drawing.Text.HotkeyPrefix.Show;
+                    else
+                        format.HotkeyPrefix = System.Drawing.Text.HotkeyPrefix.Hide;
+                    if (!d.ClipRectangle.IsEmpty && r.Right > d.ClipRectangle.Right)
+                    {
+                        format.Trimming = StringTrimming.EllipsisCharacter;
+                        r.Width -= (r.Right - d.ClipRectangle.Right);
+                    }
+                    
+                    using (SolidBrush brush = new SolidBrush(d.CurrentForeColor))
+                        g.DrawString(m_Text, d.CurrentFont, brush, r, format);
+                }
+            }
+
+            if (d.StrikeOut == true)
+            {
+                // StrikeOut
+
+                float descent = d.CurrentFont.FontFamily.GetCellDescent(d.CurrentFont.Style) *
+                    d.CurrentFont.Size / d.CurrentFont.FontFamily.GetEmHeight(d.CurrentFont.Style) + 1;
+
+                using (Pen pen = new Pen(d.CurrentForeColor, 1))
+                {
+                    SmoothingMode sm = g.SmoothingMode;
+                    g.SmoothingMode = SmoothingMode.Default;
+
+                    float y = r.Top + (r.Height + descent) / 2;
+
+                    g.DrawLine(pen, r.X, y, r.Right - 1, y);
+                    g.SmoothingMode = sm;
+                }
+            }
+
+            if ((d.HyperLink && (d.HyperlinkStyle == null || d.HyperlinkStyle.UnderlineStyle != eHyperlinkUnderlineStyle.None)) || d.Underline)
+            {
+                // Underline Hyperlink
+                float descent = d.CurrentFont.FontFamily.GetCellDescent(d.CurrentFont.Style) * d.CurrentFont.Size / d.CurrentFont.FontFamily.GetEmHeight(d.CurrentFont.Style);
+                using (Pen pen = new Pen(d.CurrentForeColor, 1))
+                {
+                    if (d.HyperLink && d.HyperlinkStyle != null && d.HyperlinkStyle.UnderlineStyle == eHyperlinkUnderlineStyle.DashedLine)
+                        pen.DashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
+                    descent -= 1;
+                    System.Drawing.Drawing2D.SmoothingMode sm = g.SmoothingMode;
+                    g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.Default;
+                    g.DrawLine(pen, r.X, r.Bottom - descent, r.Right - 1, r.Bottom - descent);
+                    g.SmoothingMode = sm;
+                }
+            }
+
+            this.RenderBounds = r;
+        }
+
+        protected override void ArrangeCore(System.Drawing.Rectangle finalRect, MarkupDrawContext d) {}
+
+        public string Text
+        {
+            get { return m_Text; }
+            set
+            {
+                m_Text = value;
+                this.IsSizeValid = false;
+            }
+        }
+
+        public bool TrailingSpace
+        {
+            get { return m_TrailingSpace; }
+            set
+            {
+                m_TrailingSpace = value;
+                this.IsSizeValid = false;
+            }
+        }
+
+        public bool EnablePrefixHandling
+        {
+            get { return m_EnablePrefixHandling; }
+            set { m_EnablePrefixHandling = value; }
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextMarkup/Underline.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextMarkup/Underline.cs
new file mode 100644
index 00000000..1343a8cb
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/TextMarkup/Underline.cs	
@@ -0,0 +1,48 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+#if AdvTree
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#elif LAYOUT
+namespace DevComponents.DotNetBar.Layout.TextMarkup
+#endif
+{
+    internal class Underline : FontChangeElement
+    {
+        #region Internal Implementation
+        protected override void SetFont(MarkupDrawContext d)
+        {
+            d.Underline = true;
+            //Font font = d.CurrentFont;
+            //FontStyle style = d.CurrentFont.Style | FontStyle.Underline;
+
+            //if (!font.Underline && font.FontFamily.IsStyleAvailable(style))
+            //    d.CurrentFont = new Font(font, style);
+            //else
+            //    font = null;
+
+            //if (font != null)
+            //    m_OldFont = font;
+
+            base.SetFont(d);
+        }
+
+        public override void MeasureEnd(Size availableSize, MarkupDrawContext d)
+        {
+            d.Underline = false;
+            base.MeasureEnd(availableSize, d);
+        }
+
+        public override void RenderEnd(MarkupDrawContext d)
+        {
+            d.Underline = false;
+            base.RenderEnd(d);
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/Thickness.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/Thickness.cs
new file mode 100644
index 00000000..8c3eb740
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/Thickness.cs	
@@ -0,0 +1,376 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Runtime.InteropServices;
+using System.ComponentModel;
+using System.Globalization;
+using System.Drawing;
+using System.Collections;
+using System.Reflection;
+using System.ComponentModel.Design.Serialization;
+
+namespace DevComponents.DotNetBar.Layout
+{
+    /// <summary>
+    /// Defines Thickness structure used by borders and margins.
+    /// </summary>
+    [StructLayout(LayoutKind.Sequential), TypeConverter(typeof(ThicknessConverter))]
+    public struct Thickness : IEquatable<Thickness>
+    {
+        #region Constructor
+        private double _Left;
+        private double _Top;
+        private double _Right;
+        private double _Bottom;
+
+        /// <summary>
+        /// Creates new instance of the object.
+        /// </summary>
+        /// <param name="uniformLength">Uniform Thickness</param>
+        public Thickness(double uniformThickness)
+        {
+            _Left = _Top = _Right = _Bottom = uniformThickness;
+        }
+        /// <summary>
+        /// Creates new instance of the object.
+        /// </summary>
+        /// <param name="left">Left Thickness</param>
+        /// <param name="top">Top Thickness</param>
+        /// <param name="right">Right Thickness</param>
+        /// <param name="bottom">Bottom Thickness</param>
+        public Thickness(double left, double top, double right, double bottom)
+        {
+            _Left = left;
+            _Top = top;
+            _Right = right;
+            _Bottom = bottom;
+        }
+        #endregion
+
+        #region Implementation
+        /// <summary>
+        /// Gets whether object equals to this instance.
+        /// </summary>
+        /// <param name="obj">object to test.</param>
+        /// <returns>returns whether objects are Equals</returns>
+        public override bool Equals(object obj)
+        {
+            if (obj is Thickness)
+            {
+                Thickness thickness = (Thickness)obj;
+                return (this == thickness);
+            }
+            return false;
+        }
+        /// <summary>
+        /// Gets whether object equals to this instance.
+        /// </summary>
+        /// <param name="thickness">object to test.</param>
+        /// <returns>returns whether objects are Equals</returns>
+        public bool Equals(Thickness thickness)
+        {
+            return (this == thickness);
+        }
+        /// <summary>
+        /// Returns hash code for object.
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            return (((_Left.GetHashCode() ^ _Top.GetHashCode()) ^ _Right.GetHashCode()) ^ _Bottom.GetHashCode());
+        }
+
+        const string StringValueSeparator = ",";
+        /// <summary>
+        /// Returns string representation of object.
+        /// </summary>
+        /// <returns>string representing Thickness</returns>
+        public override string ToString()
+        {
+            return Convert.ToString(_Left) + StringValueSeparator + Convert.ToString(_Top) + StringValueSeparator + Convert.ToString(_Right) + StringValueSeparator + Convert.ToString(_Bottom);
+        }
+        /// <summary>
+        /// Gets string representation of object.
+        /// </summary>
+        /// <param name="cultureInfo">Culture info.</param>
+        /// <returns>string representing Thickness</returns>
+        internal string ToString(CultureInfo cultureInfo)
+        {
+            return Convert.ToString(_Left, cultureInfo) + StringValueSeparator + Convert.ToString(_Top, cultureInfo) + StringValueSeparator + Convert.ToString(_Right, cultureInfo) + StringValueSeparator + Convert.ToString(_Bottom, cultureInfo);
+        }
+        /// <summary>
+        /// Returns whether all values are zero.
+        /// </summary>
+        [Browsable(false)]
+        public bool IsZero
+        {
+            get
+            {
+                return (((DoubleHelpers.IsZero(this.Left) && DoubleHelpers.IsZero(this.Top)) && DoubleHelpers.IsZero(this.Right)) && DoubleHelpers.IsZero(this.Bottom));
+            }
+        }
+        /// <summary>
+        /// Returns whether all values are the same.
+        /// </summary>
+        [Browsable(false)]
+        public bool IsUniform
+        {
+            get
+            {
+                return ((DoubleHelpers.AreClose(this.Left, this.Top) && DoubleHelpers.AreClose(this.Left, this.Right)) && DoubleHelpers.AreClose(this.Left, this.Bottom));
+            }
+        }
+        /// <summary>
+        /// Returns whether object holds valid value.
+        /// </summary>
+        /// <param name="allowNegative">Specifies whether negative values are allowed.</param>
+        /// <param name="allowNaN">Specifies whether NaN values are allowed.</param>
+        /// <param name="allowPositiveInfinity">Specifies whether positive infinity values are allowed</param>
+        /// <param name="allowNegativeInfinity">Specifies whether negative infinity values are allowed</param>
+        /// <returns>true if object holds valid value</returns>
+        internal bool IsValid(bool allowNegative, bool allowNaN, bool allowPositiveInfinity, bool allowNegativeInfinity)
+        {
+            if (!allowNegative && (((this.Left < 0.0) || (this.Right < 0.0)) || ((this.Top < 0.0) || (this.Bottom < 0.0))))
+            {
+                return false;
+            }
+            if (!allowNaN && ((DoubleHelpers.IsNaN(this.Left) || DoubleHelpers.IsNaN(this.Right)) || (DoubleHelpers.IsNaN(this.Top) || DoubleHelpers.IsNaN(this.Bottom))))
+            {
+                return false;
+            }
+            if (!allowPositiveInfinity && ((double.IsPositiveInfinity(this.Left) || double.IsPositiveInfinity(this.Right)) || (double.IsPositiveInfinity(this.Top) || double.IsPositiveInfinity(this.Bottom))))
+            {
+                return false;
+            }
+            return (allowNegativeInfinity || ((!double.IsNegativeInfinity(this.Left) && !double.IsNegativeInfinity(this.Right)) && (!double.IsNegativeInfinity(this.Top) && !double.IsNegativeInfinity(this.Bottom))));
+        }
+        /// <summary>
+        /// Returns true if two objects are close.
+        /// </summary>
+        /// <param name="thickness">Thickness to test.</param>
+        /// <returns>true if values are close.</returns>
+        internal bool IsClose(Thickness thickness)
+        {
+            return (((DoubleHelpers.AreClose(this.Left, thickness.Left) && DoubleHelpers.AreClose(this.Top, thickness.Top)) && DoubleHelpers.AreClose(this.Right, thickness.Right)) && DoubleHelpers.AreClose(this.Bottom, thickness.Bottom));
+        }
+        /// <summary>
+        /// Returns true if two objects are close.
+        /// </summary>
+        /// <param name="thickness1">Thickness 1</param>
+        /// <param name="thickness2">Thickness 2</param>
+        /// <returns>true if values are close.</returns>
+        internal static bool AreClose(Thickness thickness1, Thickness thickness2)
+        {
+            return thickness1.IsClose(thickness2);
+        }
+
+        public static bool operator ==(Thickness t1, Thickness t2)
+        {
+            return (((((t1._Left == t2._Left) || (DoubleHelpers.IsNaN(t1._Left) && DoubleHelpers.IsNaN(t2._Left))) && ((t1._Top == t2._Top) || (DoubleHelpers.IsNaN(t1._Top) && DoubleHelpers.IsNaN(t2._Top)))) && ((t1._Right == t2._Right) || (DoubleHelpers.IsNaN(t1._Right) && DoubleHelpers.IsNaN(t2._Right)))) && ((t1._Bottom == t2._Bottom) || (DoubleHelpers.IsNaN(t1._Bottom) && DoubleHelpers.IsNaN(t2._Bottom))));
+        }
+
+        public static bool operator !=(Thickness t1, Thickness t2)
+        {
+            return !(t1 == t2);
+        }
+        /// <summary>
+        /// Gets or sets the left Thickness.
+        /// </summary>
+        public double Left
+        {
+            get
+            {
+                return _Left;
+            }
+            set
+            {
+                _Left = value;
+            }
+        }
+        /// <summary>
+        /// Gets or sets the top Thickness.
+        /// </summary>
+        public double Top
+        {
+            get
+            {
+                return _Top;
+            }
+            set
+            {
+                _Top = value;
+            }
+        }
+        /// <summary>
+        /// Gets or sets the Right Thickness.
+        /// </summary>
+        public double Right
+        {
+            get
+            {
+                return _Right;
+            }
+            set
+            {
+                _Right = value;
+            }
+        }
+        /// <summary>
+        /// Gets or sets the Bottom Thickness.
+        /// </summary>
+        public double Bottom
+        {
+            get
+            {
+                return _Bottom;
+            }
+            set
+            {
+                _Bottom = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the total horizontal thickness i.e. Left+Right.
+        /// </summary>
+        [Browsable(false)]
+        public double Horizontal
+        {
+            get
+            {
+                return _Left + _Right;
+            }
+        }
+        /// <summary>
+        /// Gets the total vertical thickness i.e. Top+Bottom.
+        /// </summary>
+        [Browsable(false)]
+        public double Vertical
+        {
+            get
+            {
+                return _Top + _Bottom;
+            }
+        }
+        #endregion
+    }
+
+    #region ThicknessConverter
+    /// <summary>
+    /// Provides Thickness TypeConverter.
+    /// </summary>
+    public class ThicknessConverter : TypeConverter
+    {
+        public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
+        {
+            return ((sourceType == typeof(string)) || base.CanConvertFrom(context, sourceType));
+        }
+
+        public override bool CanConvertTo(ITypeDescriptorContext context, Type destinationType)
+        {
+            return ((destinationType == typeof(InstanceDescriptor)) || base.CanConvertTo(context, destinationType));
+        }
+
+        public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
+        {
+            string str = value as string;
+            if (str == null)
+            {
+                return base.ConvertFrom(context, culture, value);
+            }
+            string str2 = str.Trim();
+            if (str2.Length == 0)
+            {
+                return new Thickness();
+            }
+            if (culture == null)
+            {
+                culture = CultureInfo.CurrentCulture;
+            }
+            char ch = culture.TextInfo.ListSeparator[0];
+            string[] strArray = str2.Split(new char[] { ch });
+            double[] numArray = new double[strArray.Length];
+            TypeConverter converter = TypeDescriptor.GetConverter(typeof(double));
+            for (int i = 0; i < numArray.Length; i++)
+            {
+                numArray[i] = (double)converter.ConvertFromString(context, culture, strArray[i]);
+            }
+            if (numArray.Length != 4)
+            {
+                throw new ArgumentException("Text Parsing Failed");
+            }
+            return new Thickness(numArray[0], numArray[1], numArray[2], numArray[3]);
+        }
+
+        public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+        {
+            if (destinationType == null)
+            {
+                throw new ArgumentNullException("destinationType");
+            }
+            if (value is Thickness)
+            {
+                if (destinationType == typeof(string))
+                {
+                    Thickness Thickness = (Thickness)value;
+                    if (culture == null)
+                    {
+                        culture = CultureInfo.CurrentCulture;
+                    }
+                    string separator = culture.TextInfo.ListSeparator + " ";
+                    TypeConverter converter = TypeDescriptor.GetConverter(typeof(double));
+                    string[] strArray = new string[4];
+                    int num = 0;
+                    strArray[num++] = converter.ConvertToString(context, culture, Thickness.Left);
+                    strArray[num++] = converter.ConvertToString(context, culture, Thickness.Top);
+                    strArray[num++] = converter.ConvertToString(context, culture, Thickness.Right);
+                    strArray[num++] = converter.ConvertToString(context, culture, Thickness.Bottom);
+                    return string.Join(separator, strArray);
+                }
+                if (destinationType == typeof(InstanceDescriptor))
+                {
+                    Thickness Thickness2 = (Thickness)value;
+                    ConstructorInfo constructor = typeof(Thickness).GetConstructor(new Type[] { typeof(double), typeof(double), typeof(double), typeof(double) });
+                    if (constructor != null)
+                    {
+                        return new InstanceDescriptor(constructor, new object[] { Thickness2.Left, Thickness2.Top, Thickness2.Right, Thickness2.Bottom });
+                    }
+                }
+            }
+            return base.ConvertTo(context, culture, value, destinationType);
+        }
+
+        public override object CreateInstance(ITypeDescriptorContext context, IDictionary propertyValues)
+        {
+            if (propertyValues == null)
+            {
+                throw new ArgumentNullException("propertyValues");
+            }
+            object left = propertyValues["Left"];
+            object top = propertyValues["Top"];
+            object right = propertyValues["Right"];
+            object bottom = propertyValues["Bottom"];
+            if ((((left == null) || (top == null)) || ((right == null) || (bottom == null))) || ((!(left is double) || !(top is double)) || (!(right is double) || !(bottom is double))))
+            {
+                throw new ArgumentException(string.Format("Property Value Invalid: left={0}, top={1}, right={2}, bottom={3}", left, top, right, bottom));
+            }
+            return new Thickness((double)left, (double)top, (double)right, (double)bottom);
+        }
+
+        public override bool GetCreateInstanceSupported(ITypeDescriptorContext context)
+        {
+            return true;
+        }
+
+        public override PropertyDescriptorCollection GetProperties(ITypeDescriptorContext context, object value, Attribute[] attributes)
+        {
+            return TypeDescriptor.GetProperties(typeof(Thickness), attributes).Sort(new string[] { "Left", "Top", "Right", "Bottom" });
+        }
+
+        public override bool GetPropertiesSupported(ITypeDescriptorContext context)
+        {
+            return true;
+        }
+    }
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/WinApi.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/WinApi.cs
new file mode 100644
index 00000000..c1e47230
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Layout/WinApi.cs	
@@ -0,0 +1,289 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Runtime.InteropServices;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Layout
+{
+    internal static class WinApi
+    {
+        [DllImport("gdi32.dll", CharSet = CharSet.Auto)]
+        public static extern IntPtr SelectObject(IntPtr hDC, IntPtr hObject);
+        [DllImport("gdi32")]
+        public static extern bool DeleteObject(IntPtr hObject);
+
+        [DllImport("gdi32.dll", CharSet = CharSet.Auto)]
+        public static extern bool GetTextMetrics(HandleRef hdc, TEXTMETRIC tm);
+        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
+        public class TEXTMETRIC
+        {
+            public int tmHeight;
+            public int tmAscent;
+            public int tmDescent;
+            public int tmInternalLeading;
+            public int tmExternalLeading;
+            public int tmAveCharWidth;
+            public int tmMaxCharWidth;
+            public int tmWeight;
+            public int tmOverhang;
+            public int tmDigitizedAspectX;
+            public int tmDigitizedAspectY;
+            public char tmFirstChar;
+            public char tmLastChar;
+            public char tmDefaultChar;
+            public char tmBreakChar;
+            public byte tmItalic;
+            public byte tmUnderlined;
+            public byte tmStruckOut;
+            public byte tmPitchAndFamily;
+            public byte tmCharSet;
+        }
+
+        [DllImport("user32")]
+        public static extern int SendMessage(IntPtr hWnd, int Msg, IntPtr wParam, IntPtr lParam);
+        [DllImport("user32")]
+        public static extern int SendMessage(IntPtr hWnd, int Msg, int wParam, int lParam);
+        public const int WM_SETREDRAW = 0x000B;
+
+        public const int WM_LBUTTONDOWN = 0x0201;
+        public const int WM_LBUTTONUP = 0x0202;
+        public const int WM_RBUTTONDOWN = 0x0204;
+        public const int WM_RBUTTONUP = 0x0205;
+        public const int WM_MOUSEMOVE = 0x0200;
+        public const int WM_MOUSELEAVE = 0x02A3;
+        public const int WM_HSCROLL = 0x0114;
+        public const int WM_VSCROLL = 0x0115;
+        public const int WM_LBUTTONDBLCLK = 0x0203;
+
+        public static int LOWORD(int n)
+        {
+            return (short)(n & 0xffff);
+        }
+        public static int HIWORD(int n)
+        {
+            return (int)((n >> 0x10) & 0xffff);
+        }
+        public static int LOWORD(IntPtr n)
+        {
+            return LOWORD((int)((long)n));
+        }
+        public static int HIWORD(IntPtr n)
+        {
+            return unchecked((short)((uint)n >> 16));
+        }
+
+        [DllImport("user32.dll", CharSet = CharSet.Auto, SetLastError = true, ExactSpelling = true)]
+        public static extern int ScrollWindowEx(HandleRef hWnd, int nXAmount, int nYAmount, ref RECT rectScrollRegion, ref RECT rectClip, IntPtr hrgnUpdate, ref RECT prcUpdate, int flags);
+        [StructLayout(LayoutKind.Sequential)]
+        public struct RECT
+        {
+            public int left;
+            public int top;
+            public int right;
+            public int bottom;
+            public RECT(int left, int top, int right, int bottom)
+            {
+                this.left = left;
+                this.top = top;
+                this.right = right;
+                this.bottom = bottom;
+            }
+
+            public RECT(Rectangle r)
+            {
+                this.left = r.Left;
+                this.top = r.Top;
+                this.right = r.Right;
+                this.bottom = r.Bottom;
+            }
+
+            public static RECT FromXYWH(int x, int y, int width, int height)
+            {
+                return new RECT(x, y, x + width, y + height);
+            }
+
+            public Size Size
+            {
+                get
+                {
+                    return new Size(this.right - this.left, this.bottom - this.top);
+                }
+            }
+        }
+        internal static bool ModifyHwndStyle(IntPtr hwnd, int removeStyle, int addStyle)
+        {
+            int curWindowStyle = GetWindowLongPtr(hwnd, (int)GWL.GWL_STYLE).ToInt32();
+            int newStyle = (curWindowStyle & ~removeStyle) | addStyle;
+            if (curWindowStyle == newStyle)
+            {
+                return false;
+            }
+
+            SetWindowLong(hwnd, (int)GWL.GWL_STYLE, newStyle);
+            return true;
+        }
+        // This static method is required because legacy OSes do not support
+        // GetWindowLongPtr 
+        public static IntPtr GetWindowLongPtr(IntPtr hWnd, int nIndex)
+        {
+            if (IntPtr.Size == 8)
+                return GetWindowLongPtr64(hWnd, nIndex);
+            else
+                return new IntPtr(GetWindowLong32(hWnd, nIndex));
+        }
+
+        [DllImport("user32.dll", EntryPoint = "GetWindowLong")]
+        public static extern int GetWindowLong32(IntPtr hWnd, int nIndex);
+
+        [DllImport("user32.dll", EntryPoint = "GetWindowLongPtr")]
+        public static extern IntPtr GetWindowLongPtr64(IntPtr hWnd, int nIndex);
+
+        [DllImport("user32.dll")]
+        public static extern int SetWindowLong(IntPtr hWnd, int nIndex, int dwNewLong);
+
+        public static IntPtr SetWindowLongPtr(IntPtr hwnd, int nIndex, IntPtr dwNewLong)
+        {
+            if (IntPtr.Size == 8)
+            {
+                return SetWindowLongPtr64(hwnd, nIndex, dwNewLong);
+            }
+            return new IntPtr(SetWindowLongPtr32(hwnd, nIndex, dwNewLong.ToInt32()));
+        }
+        [DllImport("user32.dll", EntryPoint = "SetWindowLong", SetLastError = true)]
+        private static extern int SetWindowLongPtr32(IntPtr hWnd, int nIndex, int dwNewLong);
+        [DllImport("user32.dll", EntryPoint = "SetWindowLongPtr", SetLastError = true)]
+        private static extern IntPtr SetWindowLongPtr64(IntPtr hWnd, int nIndex, IntPtr dwNewLong);
+        public enum GWL
+        {
+            GWL_WNDPROC = (-4),
+            GWL_HINSTANCE = (-6),
+            GWL_HWNDPARENT = (-8),
+            GWL_STYLE = (-16),
+            GWL_EXSTYLE = (-20),
+            GWL_USERDATA = (-21),
+            GWL_ID = (-12)
+        }
+
+        public enum RedrawWindowFlags : uint
+        {
+            RDW_INVALIDATE = 0x0001,
+            RDW_INTERNALPAINT = 0x0002,
+            RDW_ERASE = 0x0004,
+            RDW_VALIDATE = 0x0008,
+            RDW_NOINTERNALPAINT = 0x0010,
+            RDW_NOERASE = 0x0020,
+            RDW_NOCHILDREN = 0x0040,
+            RDW_ALLCHILDREN = 0x0080,
+            RDW_UPDATENOW = 0x0100,
+            RDW_ERASENOW = 0x0200,
+            RDW_FRAME = 0x0400,
+            RDW_NOFRAME = 0x0800
+        }
+        [Flags()]
+        public enum WindowStyles
+        {
+            WS_VISIBLE = 0x10000000,
+            WS_CAPTION = 0x00C00000,
+            WS_BORDER = 0x800000,
+            WS_DLGFRAME = 0x400000,
+            WS_THICKFRAME = 0x00040000,
+            WS_HSCROLL = 0x100000,
+            WS_VSCROLL = 0x200000
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        public struct TRACKMOUSEEVENT
+        {
+            public int cbSize;
+            public uint dwFlags;
+            public int dwHoverTime;
+            public IntPtr hwndTrack;
+        }
+        [DllImport("user32")]
+        public static extern bool TrackMouseEvent(ref TRACKMOUSEEVENT tme);
+        // Track Mouse Event Flags
+        public const uint
+            TME_HOVER = 0x00000001,
+            TME_LEAVE = 0x00000002,
+            TME_NONCLIENT = 0x00000010,
+            TME_QUERY = 0x40000000,
+            TME_CANCEL = 0x80000000,
+            HOVER_DEFAULT = 0xFFFFFFFF;
+
+#if TRIAL
+        private static Color m_ColorExpFlag = Color.Empty;
+        internal static int ColorCountExp = 0;
+        internal static bool ColorExpAlt()
+        {
+            Color clr = SystemColors.Control;
+            Color clr2;
+            Color clr3;
+            clr2 = clr;
+            if (clr2.ToArgb() == clr.ToArgb())
+            {
+                clr3 = clr2;
+            }
+            else
+            {
+                clr3 = clr;
+            }
+
+            ColorCountExp = clr.A;
+
+            if (!m_ColorExpFlag.IsEmpty)
+            {
+                return (m_ColorExpFlag == Color.Black ? false : true);
+            }
+            try
+            {
+                Microsoft.Win32.RegistryKey key = Microsoft.Win32.Registry.ClassesRoot;
+                key = key.CreateSubKey("CLSID\\{57FEED69-A5E0-45e7-8E02-5F4131F5EE63}\\InprocServer32");
+
+                try
+                {
+                    if (key.GetValue("") == null || key.GetValue("").ToString() == "")
+                    {
+                        key.SetValue("", DateTime.Today.ToOADate().ToString());
+                    }
+                    else
+                    {
+                        if (key.GetValue("").ToString() == "windows3.dll")
+                        {
+                            m_ColorExpFlag = Color.White;
+                            key.Close();
+                            key = null;
+                            return true;
+                        }
+                        DateTime date = DateTime.FromOADate(double.Parse(key.GetValue("").ToString()));
+                        if (((TimeSpan)DateTime.Today.Subtract(date)).TotalDays > 30)
+                        {
+                            m_ColorExpFlag = Color.White;
+                            key.SetValue("", "windows3.dll");
+                            key.Close();
+                            key = null;
+                            return true;
+                        }
+                        if (((TimeSpan)DateTime.Today.Subtract(date)).TotalDays < 0)
+                        {
+                            m_ColorExpFlag = Color.White;
+                            key.SetValue("", "windows2.dll");
+                            key.Close();
+                            key = null;
+                            return true;
+                        }
+                    }
+                }
+                finally
+                {
+                    if (key != null)
+                        key.Close();
+                }
+            }
+            catch { }
+            m_ColorExpFlag = Color.Black;
+            return false;
+        }
+#endif
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/AppointmentView/AppointmentHView.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/AppointmentView/AppointmentHView.cs
new file mode 100644
index 00000000..8f2d5443
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/AppointmentView/AppointmentHView.cs	
@@ -0,0 +1,495 @@
+#if FRAMEWORK20
+using System;
+using DevComponents.Schedule.Model;
+using System.Drawing;
+using DevComponents.WinForms.Drawing;
+using System.Drawing.Drawing2D;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Schedule
+{
+    public class AppointmentHView : AppointmentView
+    {
+        #region Private variables
+        private eViewEnds _ViewEnds = eViewEnds.Complete;
+        #endregion
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="baseView"></param>
+        /// <param name="appointment"></param>
+        public AppointmentHView(BaseView baseView, Appointment appointment)
+            : base(baseView, appointment)
+        {
+        }
+
+        #region Private properties
+
+        /// <summary>
+        /// Gets whether the appointment is mutable
+        /// </summary> 
+        private bool IsMutable
+        {
+            get
+            {
+                return (IsSelected == true &&
+                    Appointment.Locked == false &&
+                    Appointment.IsRecurringInstance == false);
+            }
+        }
+
+        #endregion
+
+        #region Protected properties
+
+        protected eViewEnds ViewEnds
+        {
+            get { return (_ViewEnds); }
+            set { _ViewEnds = value; }
+        }
+
+        protected virtual Rectangle ParentBounds
+        {
+            get { return (Bounds); }
+        }
+
+        #endregion
+
+        #region Start/End TimeChanged event handling
+
+        /// <summary>
+        /// Handles StartTime value changes
+        /// </summary>
+        /// <param name="sender">CalendarItem</param>
+        /// <param name="e">EventArgs</param>
+        protected override void AppointmentView_StartTimeChanged(object sender, EventArgs e)
+        {
+            base.AppointmentView_StartTimeChanged(sender, e);
+
+            SetViewEnds();
+        }
+
+        /// <summary>
+        /// Handles EndTime value changes
+        /// </summary>
+        /// <param name="sender">CalendarItem</param>
+        /// <param name="e">EventArgs</param>
+        protected override void AppointmentView_EndTimeChanged(object sender, EventArgs e)
+        {
+            base.AppointmentView_EndTimeChanged(sender, e);
+
+            SetViewEnds();
+        }
+
+        #endregion
+
+        #region SetViewEnds
+
+        /// <summary>
+        /// Sets the view display end types
+        /// </summary>
+        protected virtual void SetViewEnds()
+        {
+            _ViewEnds = eViewEnds.Complete;
+        }
+
+        #endregion
+
+        #region Appointment rendering
+
+        /// <summary>
+        /// Paint processing
+        /// </summary>
+        /// <param name="e">ItemPaintArgs</param>
+        public override void Paint(ItemPaintArgs e)
+        {
+            SetViewEnds();
+
+            AppointmentColor.SetColorTable();
+
+            int n = (Bounds.Width < 20) ? 0 : 5;
+
+            CornerRadius cornerRadius = new CornerRadius(n);
+            Rectangle r = GetViewRect(ref cornerRadius);
+
+            if (r.Width > 1 && r.Height > 0)
+            {
+                if (EffectiveStyle == eDotNetBarStyle.Office2010 || StyleManager.IsMetro(EffectiveStyle))
+                    DrawMetroAppointment(e, r);
+                else
+                    DrawDefaultAppointment(e, r, n, cornerRadius);
+
+                if (IsMutable == true)
+                    DrawGribits(e, r);
+            }
+        }
+
+        #region DrawMetroAppointment
+
+        private void DrawMetroAppointment(ItemPaintArgs e, Rectangle r)
+        {
+            Graphics g = e.Graphics;
+
+            using (Brush br = BackBrush(r))
+                e.Graphics.FillRectangle(br, r);
+
+            if (BaseView.CalendarView.DoAppointmentViewPreRender(this, g, r, null) == false)
+            {
+                DrawContent(e, r);
+
+                BaseView.CalendarView.DoAppointmentViewPostRender(this, g, r, null);
+            }
+
+            DrawMetroBorder(e, r);
+        }
+
+        #region DrawMetroBorder
+
+        private void DrawMetroBorder(ItemPaintArgs e, Rectangle r)
+        {
+            Graphics g = e.Graphics;
+
+            if ((_ViewEnds & eViewEnds.PartialLeft) != eViewEnds.PartialLeft)
+            {
+                if (r.Width > 10)
+                    DrawTimeMarker(g, r, 0);
+            }
+
+            if (IsSelected == true)
+            {
+                if (r.Width > 10)
+                {
+                    using (Pen pen = new Pen(Color.Black, 2))
+                        g.DrawRectangle(pen, r);
+                }
+                else
+                {
+                    g.DrawRectangle(Pens.Black, r);
+                }
+            }
+            else
+            {
+                using (Pen pen = BorderPen)
+                    g.DrawRectangle(pen, r);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region DrawDefaultAppointment
+
+        private void DrawDefaultAppointment(ItemPaintArgs e,
+            Rectangle r, int n, CornerRadius cornerRadius)
+        {
+            Graphics g = e.Graphics;
+
+            using (GraphicsPath path = GetItemPath(r, n * 2, cornerRadius))
+            {
+                using (Brush br = BackBrush(r))
+                    g.FillPath(br, path);
+
+                if (BaseView.CalendarView.DoAppointmentViewPreRender(this, g, r, path) == false)
+                {
+                    DrawContent(e, r);
+
+                    BaseView.CalendarView.DoAppointmentViewPostRender(this, g, r, path);
+                }
+
+                DrawDefaultBorder(e, r, path, n);
+            }
+        }
+
+        #region DrawDefaultBorder
+
+        private void DrawDefaultBorder(ItemPaintArgs e,
+            Rectangle r, GraphicsPath path, int n)
+        {
+            Graphics g = e.Graphics;
+
+            if ((_ViewEnds & eViewEnds.PartialLeft) != eViewEnds.PartialLeft)
+            {
+                if (r.Width > 10)
+                    DrawTimeMarker(g, r, n);
+            }
+
+            if (IsSelected == true)
+            {
+                if (r.Width > 10)
+                {
+                    using (Pen pen = SelectedBorderPen)
+                        g.DrawPath(pen, path);
+                }
+                else
+                {
+                    g.DrawPath(Pens.Black, path);
+                }
+            }
+            else
+            {
+                using (Pen pen = BorderPen)
+                    g.DrawPath(pen, path);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region DrawContent
+
+        private void DrawContent(ItemPaintArgs e, Rectangle r)
+        {
+            Image image = Image;
+
+            Rectangle rText = r;
+            rText.X += 4;
+            rText.Width -= 6;
+
+            if (Appointment.TimeMarkedAs != null)
+            {
+                rText.X += 4;
+                rText.Width -= 4;
+            }
+
+            Rectangle rImage = GetItemBounds(rText, ref rText, image);
+
+            DrawContentImage(e, r, rImage, image);
+            DrawContentText(e, rText);
+        }
+
+        #region DrawContentText
+
+        /// <summary>
+        /// DrawContentText
+        /// </summary>
+        /// <param name="e"></param>
+        /// <param name="r"></param>
+        private void DrawContentText(ItemPaintArgs e, Rectangle r)
+        {
+            Graphics g = e.Graphics;
+
+            // Format the appointment text
+
+            if (DisplayTemplateText(e, r) == false)
+            {
+                string s = (Appointment.IsMultiDayOrAllDayEvent)
+                               ? Appointment.Subject
+                               : String.Format("{0} {1}", Appointment.StartTime.ToShortTimeString(), Appointment.Subject);
+
+                // Output the appointment text and
+                // appropriately weighted bounding path
+
+                Font font = Font ?? e.Font;
+                const eTextFormat tf = eTextFormat.VerticalCenter |
+                    eTextFormat.EndEllipsis | eTextFormat.NoPadding | eTextFormat.NoPrefix;
+
+                if (r.Width > 10)
+                    TextDrawing.DrawString(g, s, font, TextColor, r, tf);
+
+                Size size = TextDrawing.MeasureString(g, s, font, r.Width, tf);
+
+                IsTextClipped = (r.Width < size.Width || r.Height < size.Height);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetViewRect
+
+        /// <summary>
+        /// Gets the view rect for the appointment
+        /// </summary>
+        /// <param name="cornerRadius">Corner radius</param>
+        /// <returns>View rect</returns>
+        private Rectangle GetViewRect(ref CornerRadius cornerRadius)
+        {
+            Rectangle r = DisplayRectangle;
+
+            r.Intersect(ParentBounds);
+
+            if (r.Left == ParentBounds.Left)
+            {
+                r.X++;
+                r.Width--;
+            }
+
+            if ((_ViewEnds & eViewEnds.PartialLeft) == eViewEnds.PartialLeft)
+                cornerRadius.TopLeft = cornerRadius.BottomLeft = 0;
+
+            if ((_ViewEnds & eViewEnds.PartialRight) == eViewEnds.PartialRight)
+                cornerRadius.TopRight = cornerRadius.BottomRight = 0;
+
+            // If the view is selected, then allow
+            // for a thicker selection rect
+
+            if (IsSelected == true)
+                r.Height--;
+
+            return (r);
+        }
+
+        #endregion
+
+        #region GetItemPath
+
+        /// <summary>
+        /// Gets a path defining the item
+        /// </summary>
+        /// <param name="viewRect"></param>
+        /// <param name="radius"></param>
+        /// <param name="cornerRadius"></param>
+        /// <returns></returns>
+        private GraphicsPath GetItemPath(Rectangle viewRect, int radius, CornerRadius cornerRadius)
+        {
+            GraphicsPath path = new GraphicsPath();
+
+            Rectangle r = viewRect;
+
+            Rectangle ar = new
+                Rectangle(r.Right - radius, r.Bottom - radius, radius, radius);
+
+            if (cornerRadius.BottomRight > 0)
+                path.AddArc(ar, 0, 90);
+            else
+                path.AddLine(r.Right, r.Bottom, r.Right, r.Bottom);
+
+            ar.X = r.X;
+
+            if (cornerRadius.BottomLeft > 0)
+                path.AddArc(ar, 90, 90);
+            else
+                path.AddLine(r.Left, r.Bottom, r.Left, r.Bottom);
+
+            ar.Y = r.Y;
+
+            if (cornerRadius.TopLeft > 0)
+                path.AddArc(ar, 180, 90);
+            else
+                path.AddLine(r.Left, r.Top, r.Left, r.Top);
+
+            ar.X = r.Right - radius;
+
+            if (cornerRadius.TopRight > 0)
+                path.AddArc(ar, 270, 90);
+            else
+                path.AddLine(r.Right, r.Top, r.Right, r.Top);
+
+            path.CloseAllFigures();
+
+            return (path);
+        }
+
+        #endregion
+
+        #region DrawGribits
+
+        /// <summary>
+        /// Draws the resize gribits for the view
+        /// </summary>
+        /// <param name="e"></param>
+        /// <param name="r">View rectangle</param>
+        private void DrawGribits(ItemPaintArgs e, Rectangle r)
+        {
+            if (r.Width >= 8)
+            {
+                Graphics g = e.Graphics;
+
+                Rectangle r2 =
+                    new Rectangle(r.X, r.Y + (r.Height / 2) - 2, 5, 5);
+
+                // Left gribit
+
+                if ((_ViewEnds & eViewEnds.PartialLeft) == 0)
+                {
+                    r2.X = r.X - 3;
+
+                    g.FillRectangle(Brushes.White, r2);
+                    g.DrawRectangle(Pens.Black, r2);
+                }
+
+                // Right gribit
+
+                if ((_ViewEnds & eViewEnds.PartialRight) == 0)
+                {
+                    r2.X = r.Right - 2;
+
+                    g.FillRectangle(Brushes.White, r2);
+                    g.DrawRectangle(Pens.Black, r2);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Mouse processing
+
+        /// <summary>
+        /// Handles mouseDown processing
+        /// </summary>
+        /// <param name="objArg">MouseEventArgs</param>
+        public override void InternalMouseMove(MouseEventArgs objArg)
+        {
+            HitArea = GetHitArea(objArg);
+
+            base.InternalMouseMove(objArg);
+        }
+
+        /// <summary>
+        /// Gets the HitArea from the current
+        /// mouse position
+        /// </summary>
+        /// <param name="objArg"></param>
+        /// <returns></returns>
+        private eHitArea GetHitArea(MouseEventArgs objArg)
+        {
+            if (IsMutable == true)
+            {
+                CornerRadius cornerRadius = new CornerRadius(5);
+                Rectangle r = GetViewRect(ref cornerRadius);
+
+                //if (r.Width > 10)
+                {
+                    Rectangle r2 =
+                        new Rectangle(r.X, r.Y + (r.Height / 2) - 2, 5, 5);
+
+                    if ((_ViewEnds & eViewEnds.PartialLeft) == 0)
+                    {
+                        r2.X = r.X - 3;
+
+                        r2.Inflate(2, 2);
+
+                        if (r2.Contains(objArg.Location))
+                            return (eHitArea.LeftResize);
+                    }
+
+                    if ((_ViewEnds & eViewEnds.PartialRight) == 0)
+                    {
+                        r2.X = r.Right - 2;
+
+                        r2.Inflate(2, 2);
+
+                        if (r2.Contains(objArg.Location))
+                            return (eHitArea.RightResize);
+                    }
+                }
+
+                // By default we are in the move area
+
+                return (eHitArea.Move);
+            }
+
+            return (eHitArea.None);
+        }
+
+        #endregion
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/AppointmentView/AppointmentMonthView.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/AppointmentView/AppointmentMonthView.cs
new file mode 100644
index 00000000..a25c1d05
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/AppointmentView/AppointmentMonthView.cs	
@@ -0,0 +1,81 @@
+#if FRAMEWORK20
+using System;
+using DevComponents.Schedule.Model;
+
+namespace DevComponents.DotNetBar.Schedule
+{
+    public class AppointmentMonthView : AppointmentHView
+    {
+        #region Constants
+        private const int DaysInWeek = 7;
+        #endregion
+
+        #region Private variables
+        private MonthWeek _MonthWeek;
+        #endregion
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="baseView"></param>
+        /// <param name="appointment"></param>
+        public AppointmentMonthView(BaseView baseView, Appointment appointment)
+            : base(baseView, appointment)
+        {
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets and sets View MonthWeek
+        /// </summary>
+        public MonthWeek MonthWeek
+        {
+            get { return (_MonthWeek); }
+
+            set
+            {
+                if (_MonthWeek != value)
+                {
+                    _MonthWeek = value;
+
+                    SetViewEnds();
+                }
+            }
+        }
+
+        #endregion
+
+        #region SetViewEnds
+
+        /// <summary>
+        /// Sets the view display end types
+        /// </summary>
+        protected override void SetViewEnds()
+        {
+            if (_MonthWeek != null)
+            {
+                DateTime start = _MonthWeek.FirstDayOfWeek;
+                DateTime end = start.AddDays(DaysInWeek);
+
+                ViewEnds = eViewEnds.Complete;
+
+                // Check to see if we can only display
+                // a partial representation for the view
+
+                if (EndTime >= start && StartTime < end)
+                {
+                    if (StartTime < start)
+                        ViewEnds |= eViewEnds.PartialLeft;
+
+                    if (EndTime > end)
+                        ViewEnds |= eViewEnds.PartialRight;
+                }
+            }
+        }
+
+        #endregion
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/AppointmentView/AppointmentTimeLineView.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/AppointmentView/AppointmentTimeLineView.cs
new file mode 100644
index 00000000..51bd5963
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/AppointmentView/AppointmentTimeLineView.cs	
@@ -0,0 +1,81 @@
+#if FRAMEWORK20
+using DevComponents.Schedule.Model;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Schedule
+{
+    public class AppointmentTimeLineView : AppointmentHView
+    {
+        #region Private variables
+        private TimeLineView _TimeLineView;
+        #endregion
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="baseView"></param>
+        /// <param name="appointment"></param>
+        public AppointmentTimeLineView(BaseView baseView, Appointment appointment)
+            : base(baseView, appointment)
+        {
+        }
+
+        #region Public properties
+
+        public TimeLineView TimeLineView
+        {
+            get { return (_TimeLineView); }
+
+            set
+            {
+                if (_TimeLineView != value)
+                {
+                    _TimeLineView = value;
+
+                    if (_TimeLineView != null)
+                        SetViewEnds();
+                }
+            }
+        }
+
+        #endregion
+
+        #region SetViewEnds
+
+        /// <summary>
+        /// Sets the view display end types
+        /// </summary>
+        protected override void SetViewEnds()
+        {
+            ViewEnds = eViewEnds.Complete;
+
+            Rectangle r = DisplayRectangle;
+            Rectangle p = ParentBounds;
+
+            if (r.Left < p.Left)
+                ViewEnds |= eViewEnds.PartialLeft;
+
+            if (r.Right > p.Right)
+                ViewEnds |= eViewEnds.PartialRight;
+        }
+
+        #endregion
+
+        #region Protected properties
+
+        protected override Rectangle ParentBounds
+        {
+            get
+            {
+                if (_TimeLineView != null)
+                    return (_TimeLineView.ClientRect);
+
+                return (base.ParentBounds);
+            }
+        }
+
+        #endregion
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/AppointmentView/AppointmentView.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/AppointmentView/AppointmentView.cs
new file mode 100644
index 00000000..ff573c06
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/AppointmentView/AppointmentView.cs	
@@ -0,0 +1,804 @@
+#if FRAMEWORK20
+using System;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Globalization;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.Rendering;
+using DevComponents.DotNetBar.TextMarkup;
+using DevComponents.Schedule.Model;
+
+namespace DevComponents.DotNetBar.Schedule
+{
+    public class AppointmentView : CalendarItem
+    {
+        #region enums
+
+        [Flags]
+        public enum eViewEnds          // View display ends
+        {
+            Complete = 0,
+            PartialLeft = 1,
+            PartialRight = 2
+        }
+
+        #endregion
+
+        #region Static variables
+
+        static private AppointmentColor _appointmentColor = new AppointmentColor();
+
+        #endregion
+
+        #region Private variables
+
+        private Font _Font;
+        private BaseView _BaseView;
+        private Appointment _Appointment;
+        private bool _IsTextClipped;
+        private int _BorderWidth;
+
+        #endregion
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="baseView"></param>
+        /// <param name="appointment"></param>
+        public AppointmentView(BaseView baseView, Appointment appointment)
+        {
+            _BaseView = baseView;
+            _Appointment = appointment;
+
+            MouseUpNotification = true;
+
+            StartTime = appointment.StartTime;
+            EndTime = appointment.EndTime;
+            ModelItem = appointment;
+
+            IsRecurring = (appointment.IsRecurringInstance == true ||
+                appointment.Recurrence != null);
+
+            RootItem = (appointment.IsRecurringInstance == true) ?
+                appointment.RootAppointment : appointment;
+
+            StartTimeChanged += AppointmentView_StartTimeChanged;
+            EndTimeChanged += AppointmentView_EndTimeChanged;
+        }
+
+        #region Public properties
+
+        #region Appointment
+
+        /// <summary>
+        /// Gets and sets the view Appointment
+        /// </summary>
+        public Appointment Appointment
+        {
+            get { return (_Appointment); }
+            set { _Appointment = value; }
+        }
+
+        #endregion
+
+        #region AppointmentColor
+
+        /// <summary>
+        /// Gets and sets the appointment color
+        /// </summary>
+        public AppointmentColor AppointmentColor
+        {
+            get { return (_appointmentColor); }
+            set { _appointmentColor = value; }
+        }
+
+        #endregion
+
+        #region BorderWidth
+
+        public int BorderWidth
+        {
+            get { return (_BorderWidth); }
+
+            set
+            {
+                if (_BorderWidth != value)
+                {
+                    _BorderWidth = value;
+
+                    Invalidate(_BaseView.CalendarView);
+                }
+            }
+        }
+
+        #endregion
+
+        #region Font
+
+        /// <summary>
+        /// Gets and sets the view font
+        /// </summary>
+        public Font Font
+        {
+            get { return (_Font); }
+            set { _Font = value; }
+        }
+
+        #endregion
+
+        #region IsTextClipped
+
+        /// <summary>
+        /// Gets whether the Appointment display Text is clipped
+        /// </summary>
+        public bool IsTextClipped
+        {
+            get { return (_IsTextClipped); }
+            internal set { _IsTextClipped = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region BaseView
+
+        /// <summary>
+        /// BaseView
+        /// </summary>
+        internal BaseView BaseView
+        {
+            get { return (_BaseView); }
+        }
+
+        #endregion
+
+        #region Image
+
+        /// <summary>
+        /// Image
+        /// </summary>
+        internal Image Image
+        {
+            get
+            {
+                if (string.IsNullOrEmpty(Appointment.ImageKey) == true)
+                    return (null);
+
+                ImageList images;
+
+                switch (_BaseView.CalendarView.ImageSize)
+                {
+                    case eBarImageSize.Medium:
+                        images = _BaseView.CalendarView.ImagesMedium;
+                        break;
+
+                    case eBarImageSize.Large:
+                        images = _BaseView.CalendarView.ImagesLarge;
+                        break;
+
+                    default:
+                        images = _BaseView.CalendarView.Images;
+                        break;
+                }
+
+                return (images != null ?
+                    images.Images[Appointment.ImageKey] : null);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Start/End TimeChanged event handling
+
+        /// <summary>
+        /// Handles StartTime value changes
+        /// </summary>
+        /// <param name="sender">CalendarItem</param>
+        /// <param name="e">EventArgs</param>
+        protected virtual void AppointmentView_StartTimeChanged(object sender, EventArgs e)
+        {
+            _Appointment.StartTime = StartTime;
+        }
+
+        /// <summary>
+        /// Handles EndTime value changes
+        /// </summary>
+        /// <param name="sender">CalendarItem</param>
+        /// <param name="e">EventArgs</param>
+        protected virtual void AppointmentView_EndTimeChanged(object sender, EventArgs e)
+        {
+            _Appointment.EndTime = EndTime;
+        }
+
+        #endregion
+
+        #region DisplayTemplateText
+
+        /// <summary>
+        /// DisplayTemplateText
+        /// </summary>
+        /// <param name="e"></param>
+        /// <param name="r"></param>
+        /// <returns>true is displayed</returns>
+        internal bool DisplayTemplateText(ItemPaintArgs e, Rectangle r)
+        {
+            if (_BaseView.CalendarView.EnableMarkup == true)
+            {
+                if (string.IsNullOrEmpty(Appointment.DisplayTemplate) == false)
+                {
+                    Text = GetDisplayTemplateText(r);
+                }
+                else
+                {
+                    string text = Appointment.Subject;
+
+                    if (IsUsingTextMarkup)
+                    {
+                        if (Appointment.IsMultiDayOrAllDayEvent == false)
+                            text += "<br/>" + Appointment.Description;
+                    }
+
+                    Text = text;
+                }
+
+                if (IsUsingTextMarkup)
+                {
+                    Graphics g = e.Graphics;
+
+                    MarkupDrawContext d =
+                        new MarkupDrawContext(g, Font ?? e.Font, TextColor, true);
+
+                    Size size = new Size(5000, 5000);
+
+                    TextMarkupBodyMeasure(size, d);
+
+                    d.RightToLeft = false;
+
+                    r.Y += 3;
+                    r.Height -= 3;
+
+                    TextMarkupBodyArrange(new Rectangle(r.Location, TextMarkupBodyBounds.Size), d);
+
+                    _IsTextClipped = (TextMarkupBodyBounds.Size.Width > r.Width ||
+                        TextMarkupBodyBounds.Size.Height > r.Height);
+
+                    Region oldClip = g.Clip;
+                    Rectangle clipRect = r;
+
+                    g.SetClip(clipRect, CombineMode.Intersect);
+
+                    TextMarkupBodyRender(d);
+
+                    g.Clip = oldClip;
+
+                    return (true);
+                }
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region GetDisplayTemplateText
+
+        /// <summary>
+        /// GetDisplayTemplateText
+        /// </summary>
+        /// <param name="r"></param>
+        /// <returns>Templatized text</returns>
+        private string GetDisplayTemplateText(Rectangle r)
+        {
+            string s = Appointment.DisplayTemplate;
+
+            if (String.IsNullOrEmpty(s) == true)
+                return (s);
+
+            Regex reg = new Regex("\\[\\w+\\]");
+            MatchCollection mc = reg.Matches(s);
+
+            int index = 0;
+            StringBuilder sb = new StringBuilder();
+
+            sb.Append("<p width=\"" + r.Width.ToString() + "\">");
+
+            for (int i = 0; i < mc.Count; i++)
+            {
+                Match ma = mc[i];
+
+                if (ma.Index > index)
+                    sb.Append(s.Substring(index, ma.Index - index));
+
+                switch (ma.Value)
+                {
+                    case "[StartTime]":
+                        sb.Append(Appointment.StartTime.ToString("t",
+                            _BaseView.CalendarView.Is24HourFormat ? DateTimeFormatInfo.InvariantInfo : null));
+                        break;
+
+                    case "[StartDate]":
+                        sb.Append(Appointment.StartTime.ToShortDateString());
+                        break;
+
+                    case "[EndTime]":
+                        sb.Append(Appointment.EndTime.ToString("t",
+                            _BaseView.CalendarView.Is24HourFormat ? DateTimeFormatInfo.InvariantInfo : null));
+                        break;
+
+                    case "[EndDate]":
+                        sb.Append(Appointment.EndTime.ToShortDateString());
+                        break;
+
+                    case "[Subject]":
+                        sb.Append(Appointment.Subject);
+                        break;
+
+                    case "[Description]":
+                        sb.Append(Appointment.Description);
+                        break;
+
+                    case "[Id]":
+                        sb.Append(Appointment.Id);
+                        break;
+
+                    case "[Tag]":
+                        sb.Append(Appointment.Tag.ToString());
+                        break;
+
+                    default:
+                        sb.Append(_BaseView.CalendarView.DoGetDisplayTemplateText(this, ma.Value, ma.Value));
+                        break;
+                }
+
+                index = ma.Index + ma.Length;
+            }
+
+            if (s.Length > index)
+                sb.Append(s.Substring(index));
+
+            sb.Append("</p>");
+
+            return (sb.ToString());
+        }
+
+        #endregion
+
+        #region Paint
+
+        /// <summary>
+        /// Paint processing
+        /// </summary>
+        /// <param name="e">ItemPaintArgs</param>
+        public override void Paint(ItemPaintArgs e)
+        {
+        }
+
+        #region GetItemBounds
+
+        /// <summary>
+        /// Gets the item text and image bounds
+        /// </summary>
+        /// <param name="r"></param>
+        /// <param name="rText"></param>
+        /// <param name="image"></param>
+        /// <returns></returns>
+        protected virtual Rectangle GetItemBounds(Rectangle r, ref Rectangle rText, Image image)
+        {
+            Rectangle ri = r;
+
+            if (Image != null)
+            {
+                const int vpad = 2;
+                const int hpad = 3;
+
+                ri.Inflate(0, -vpad);
+
+                switch (Appointment.ImageAlign)
+                {
+                    case eImageContentAlignment.TopLeft:
+                        rText.X += (image.Size.Width + hpad);
+                        rText.Width -= (image.Size.Width + hpad);
+                        break;
+
+                    case eImageContentAlignment.TopRight:
+                        ri.X = rText.Right - image.Size.Width;
+                        rText.Width -= image.Size.Width;
+                        break;
+
+                    case eImageContentAlignment.TopCenter:
+                        ri.X += (ri.Width - image.Size.Width) / 2;
+                        rText.Y += (image.Size.Height + hpad);
+                        rText.Height -= (image.Size.Height + hpad);
+                        break;
+
+                    case eImageContentAlignment.MiddleLeft:
+                        ri.Y += (ri.Height - image.Size.Height) / 2;
+                        rText.X += (image.Size.Width + hpad);
+                        rText.Width -= (image.Size.Width + hpad);
+                        break;
+
+                    case eImageContentAlignment.MiddleRight:
+                        ri.X = ri.Right - image.Size.Width;
+                        ri.Y += (ri.Height - image.Size.Height) / 2;
+                        rText.Width -= (image.Size.Width + hpad);
+                        break;
+
+                    case eImageContentAlignment.MiddleCenter:
+                        ri.X = ri.X + (ri.Width - image.Size.Width) / 2;
+                        ri.Y += (ri.Height - image.Size.Height) / 2;
+                        break;
+
+                    case eImageContentAlignment.BottomLeft:
+                        ri.Y = ri.Bottom - image.Size.Height;
+                        rText.X += (image.Size.Width + hpad);
+                        rText.Width -= (image.Size.Width + hpad);
+                        break;
+
+                    case eImageContentAlignment.BottomRight:
+                        ri.X = ri.Right - image.Size.Width;
+                        ri.Y = ri.Bottom - image.Size.Height;
+                        rText.Width -= (image.Size.Width - hpad);
+                        break;
+
+                    default:
+                        ri.X = ri.X + (ri.Width - image.Size.Width) / 2;
+                        ri.Y = ri.Bottom - image.Size.Height;
+                        break;
+                }
+
+                ri.Size = image.Size;
+
+                if (ri.X < r.X)
+                    ri.X = r.X;
+
+                if (ri.Y < r.Y + vpad)
+                    ri.Y = r.Y + vpad;
+            }
+
+            return (ri);
+        }
+
+        #endregion
+
+        #region DrawContentImage
+
+        /// <summary>
+        /// DrawContentImage
+        /// </summary>
+        /// <param name="e"></param>
+        /// <param name="r"></param>
+        /// <param name="rImage"></param>
+        /// <param name="image"></param>
+        protected virtual void DrawContentImage(
+            ItemPaintArgs e, Rectangle r, Rectangle rImage, Image image)
+        {
+            if (image != null)
+            {
+                Graphics g = e.Graphics;
+
+                rImage.Intersect(r);
+                g.DrawImageUnscaledAndClipped(image, rImage);
+            }
+        }
+
+        #endregion
+
+        #region DrawTimeMarker
+
+        #region DrawTimeMarker
+
+        /// <summary>
+        /// Initiates the drawing of the appointment Time Marker
+        /// </summary>
+        /// <param name="g">Graphics</param>
+        /// <param name="r">Appointment rectangle</param>
+        /// <param name="corner">Corner radius</param>
+        protected virtual void DrawTimeMarker(Graphics g, Rectangle r, int corner)
+        {
+            if (Appointment.TimeMarkedAs != null)
+            {
+                if (Appointment.TimeMarkedAs.Equals(Appointment.TimerMarkerTentative))
+                {
+                    using (HatchBrush br =
+                        new HatchBrush(HatchStyle.WideUpwardDiagonal, BorderColor, Color.White))
+                    {
+                        g.RenderingOrigin = new Point(r.X, r.Y);
+
+                        RenderMarker(g, br, r, corner);
+                    }
+                }
+                else
+                {
+                    using (Brush br = TimeMarkerBrush(r))
+                    {
+                        if (br != null)
+                            RenderMarker(g, br, r, corner);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region RenderMarker
+
+        /// <summary>
+        /// RenderMarker
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="br">Brush</param>
+        /// <param name="r">Rectangle</param>
+        /// <param name="corner">Corner</param>
+        private void RenderMarker(Graphics g, Brush br, Rectangle r, int corner)
+        {
+            using (Pen pen = BorderPen)
+            {
+                if (corner > 0)
+                {
+                    using (GraphicsPath path = GetLeftRoundedRectanglePath(r, corner))
+                    {
+                        g.FillPath(br, path);
+                        g.DrawPath(pen, path);
+                    }
+                }
+                else
+                {
+                    int x = Math.Min(5, r.Height / 2);
+                    x = Math.Min(x, r.Width / 2);
+
+                    r.Width = x;
+
+                    g.FillRectangle(br, r);
+                    g.DrawRectangle(pen, r);
+                }
+            }
+        }
+
+        #endregion
+
+        #region GetLeftRoundedRectanglePath
+
+        /// <summary>
+        /// Creates a left rounded rectangle path to be
+        /// used for the Time Marker
+        /// </summary>
+        /// <param name="r">Appointment rectangle</param>
+        /// <param name="corner">Corner radius</param>
+        /// <returns>Graphics path</returns>
+        private GraphicsPath GetLeftRoundedRectanglePath(Rectangle r, int corner)
+        {
+            GraphicsPath path = new GraphicsPath();
+
+            ElementStyleDisplay.AddCornerArc(path, r, corner, eCornerArc.TopLeft);
+            path.AddLine(r.X + corner, r.Y, r.X + corner, r.Bottom);
+            ElementStyleDisplay.AddCornerArc(path, r, corner, eCornerArc.BottomLeft);
+
+            return (path);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region Color support
+
+        #region BackBrush
+
+        /// <summary>
+        /// Gets the appointment BackGround brush
+        /// </summary>
+        /// <param name="r">Bounding rectangle</param>
+        /// <returns></returns>
+        protected Brush BackBrush(Rectangle r)
+        {
+            string category = _Appointment.CategoryColor;
+
+            if (category != null)
+            {
+                // Check to see if we have any user defined
+                // AppointmentCategoryColors
+
+                if (_BaseView.CalendarView.HasCategoryColors == true)
+                {
+                    AppointmentCategoryColor acc =
+                        _BaseView.CalendarView.CategoryColors[category];
+
+                    if (acc != null)
+                        return (_appointmentColor.BrushPart(acc.BackColor, r));
+                }
+
+                // Just use the default color set
+
+                if (category.StartsWith("#") == true)
+                    return (new SolidBrush(ColorFactory.Empty.GetColor(category.Substring(1))));
+
+                if (category.Equals(Appointment.CategoryBlue))
+                    return (_appointmentColor.BrushPart((int)eAppointmentPart.BlueBackground, r));
+
+                if (category.Equals(Appointment.CategoryGreen))
+                    return (_appointmentColor.BrushPart((int)eAppointmentPart.GreenBackground, r));
+
+                if (category.Equals(Appointment.CategoryOrange))
+                    return (_appointmentColor.BrushPart((int)eAppointmentPart.OrangeBackground, r));
+
+                if (category.Equals(Appointment.CategoryPurple))
+                    return (_appointmentColor.BrushPart((int)eAppointmentPart.PurpleBackground, r));
+
+                if (category.Equals(Appointment.CategoryRed))
+                    return (_appointmentColor.BrushPart((int)eAppointmentPart.RedBackground, r));
+
+                if (category.Equals(Appointment.CategoryYellow))
+                    return (_appointmentColor.BrushPart((int)eAppointmentPart.YellowBackground, r));
+            }
+
+            return (_appointmentColor.BrushPart((int)eAppointmentPart.DefaultBackground, r));
+        }
+
+        #endregion
+
+        #region BorderColor
+
+        /// <summary>
+        /// Gets the border color for the Category
+        /// </summary>
+        protected Color BorderColor
+        {
+            get
+            {
+                string category = _Appointment.CategoryColor;
+
+                if (category != null)
+                {
+                    // Check to see if we have any user defined
+                    // AppointmentCategoryColors
+
+                    if (_BaseView.CalendarView.HasCategoryColors == true)
+                    {
+                        AppointmentCategoryColor acc =
+                            _BaseView.CalendarView.CategoryColors[category];
+
+                        if (acc != null)
+                            return (acc.BorderColor);
+                    }
+
+                    // Just use the default color set
+
+                    if (category.Equals(Appointment.CategoryBlue))
+                        return (_appointmentColor.GetColor((int)eAppointmentPart.BlueBorder));
+
+                    if (category.Equals(Appointment.CategoryGreen))
+                        return (_appointmentColor.GetColor((int)eAppointmentPart.GreenBorder));
+
+                    if (category.Equals(Appointment.CategoryOrange))
+                        return (_appointmentColor.GetColor((int)eAppointmentPart.OrangeBorder));
+
+                    if (category.Equals(Appointment.CategoryPurple))
+                        return (_appointmentColor.GetColor((int)eAppointmentPart.PurpleBorder));
+
+                    if (category.Equals(Appointment.CategoryRed))
+                        return (_appointmentColor.GetColor((int)eAppointmentPart.RedBorder));
+
+                    if (category.Equals(Appointment.CategoryYellow))
+                        return (_appointmentColor.GetColor((int)eAppointmentPart.YellowBorder));
+                }
+
+                return (_appointmentColor.GetColor((int)eAppointmentPart.DefaultBorder));
+            }
+        }
+
+        #endregion
+
+        #region BorderPen
+
+        /// <summary>
+        /// Gets the border pen
+        /// </summary>
+        protected Pen BorderPen
+        {
+            get
+            {
+                int n = (_BorderWidth > 0) ?
+                    _BorderWidth : _BaseView.CalendarView.AppointmentBorderWidth;
+
+                return (new Pen(BorderColor, n));
+            }
+        }
+
+        #endregion
+
+        #region SelectedBorderPen
+
+        /// <summary>
+        /// Gets the selected border pen
+        /// </summary>
+        protected Pen SelectedBorderPen
+        {
+            get
+            {
+                int n = (_BorderWidth > 0) ?
+                    _BorderWidth : _BaseView.CalendarView.AppointmentBorderWidth;
+
+                return (new Pen(Color.Black, n + 1));
+            }
+        }
+
+        #endregion
+
+        #region TextColor
+
+        /// <summary>
+        /// Gets the Text color for the Category
+        /// </summary>
+        protected Color TextColor
+        {
+            get
+            {
+                string category = _Appointment.CategoryColor;
+
+                // Check to see if we have any user defined
+                // AppointmentCategoryColors
+
+                if (category != null)
+                {
+                    if (_BaseView.CalendarView.HasCategoryColors == true)
+                    {
+                        AppointmentCategoryColor acc =
+                            _BaseView.CalendarView.CategoryColors[category];
+
+                        if (acc != null)
+                            return (acc.TextColor);
+                    }
+                }
+
+                return (Color.Black);
+            }
+        }
+
+        #endregion
+
+        #region TimeMarkerBrush
+
+        /// <summary>
+        /// Gets the appointment TimeMarkerBrush
+        /// </summary>
+        /// <param name="r">Bounding rectangle</param>
+        /// <returns></returns>
+        protected Brush TimeMarkerBrush(Rectangle r)
+        {
+            string timeMarkedAs = _Appointment.TimeMarkedAs;
+
+            if (timeMarkedAs != null)
+            {
+                if (timeMarkedAs.StartsWith("#") == true)
+                    return (new SolidBrush(ColorFactory.Empty.GetColor(timeMarkedAs.Substring(1))));
+
+                if (timeMarkedAs.Equals(Appointment.TimerMarkerFree))
+                    return (_appointmentColor.BrushPart((int)eAppointmentPart.FreeTimeMarker, r));
+
+                if (timeMarkedAs.Equals(Appointment.TimerMarkerBusy))
+                    return (_appointmentColor.BrushPart((int)eAppointmentPart.BusyTimeMarker, r));
+
+                if (timeMarkedAs.Equals(Appointment.TimerMarkerOutOfOffice))
+                    return (_appointmentColor.BrushPart((int)eAppointmentPart.OutOfOfficeTimeMarker, r));
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #endregion
+
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/AppointmentView/AppointmentWeekDayView.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/AppointmentView/AppointmentWeekDayView.cs
new file mode 100644
index 00000000..99f72fb1
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/AppointmentView/AppointmentWeekDayView.cs	
@@ -0,0 +1,527 @@
+#if FRAMEWORK20
+using System;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Windows.Forms;
+using DevComponents.Schedule.Model;
+
+namespace DevComponents.DotNetBar.Schedule
+{
+    public class AppointmentWeekDayView : AppointmentView
+    {
+        #region Private variables
+
+        private DayColumn _DayColumn;
+        private AllDayPanel _AllDayPanel;
+        private eViewEnds _ViewEnds = eViewEnds.Complete;
+
+        #endregion
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="baseView"></param>
+        /// <param name="appointment"></param>
+        public AppointmentWeekDayView(BaseView baseView, Appointment appointment)
+            : base(baseView, appointment)
+        {
+            SetViewEnds();
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets and sets View DayColumn
+        /// </summary>
+        public DayColumn DayColumn
+        {
+            get { return (_DayColumn); }
+            set { _DayColumn = value; }
+        }
+
+        /// <summary>
+        /// Gets and sets View AllDayPanel
+        /// </summary>
+        public AllDayPanel AllDayPanel
+        {
+            get { return (_AllDayPanel); }
+
+            set
+            {
+                if (_AllDayPanel != value)
+                {
+                    _AllDayPanel = value;
+
+                    SetViewEnds();
+                }
+            }
+        }
+
+        #endregion
+
+        #region Private properties
+
+        /// <summary>
+        /// Gets the default horizontal padding
+        /// </summary>
+        private int HorizontalPadding
+        {
+            get { return (6); }
+        }
+
+        /// <summary>
+        /// Gets whether the appointment is mutable
+        /// </summary> 
+        private bool IsMutable
+        {
+            get
+            {
+                WeekDayView wv = (WeekDayView)BaseView;
+
+                return (IsSelected == true &&
+                    wv.IsAllDayItem(this) == false &&
+                    Appointment.Locked == false &&
+                    Appointment.IsRecurringInstance == false);
+            }
+        }
+
+        #endregion
+
+        #region Start/End TimeChanged event handling
+
+        /// <summary>
+        /// Handles StartTime value changes
+        /// </summary>
+        /// <param name="sender">CalendarItem</param>
+        /// <param name="e">EventArgs</param>
+        protected override void AppointmentView_StartTimeChanged(object sender, EventArgs e)
+        {
+            base.AppointmentView_StartTimeChanged(sender, e);
+
+            SetViewEnds();
+        }
+
+        /// <summary>
+        /// Handles EndTime value changes
+        /// </summary>
+        /// <param name="sender">CalendarItem</param>
+        /// <param name="e">EventArgs</param>
+        protected override void AppointmentView_EndTimeChanged(object sender, EventArgs e)
+        {
+            base.AppointmentView_EndTimeChanged(sender, e);
+
+            SetViewEnds();
+        }
+
+        #endregion
+
+        #region SetViewEnds
+
+        /// <summary>
+        /// Sets the view display end types
+        /// </summary>
+        private void SetViewEnds()
+        {
+            if (_AllDayPanel != null)
+            {
+                _ViewEnds = eViewEnds.Complete;
+
+                int col, n;
+
+                DateTime start = GetDateCol(StartTime, out col, out n);
+                DateTime end = start.AddDays(n);
+
+                // Check to see if we can only display
+                // a partial representation for the view
+
+                if (col > 0 || start > StartTime)
+                    _ViewEnds |= eViewEnds.PartialLeft;
+
+                TimeSpan ts = new TimeSpan(24, 0, 0);
+
+                if (end > EndTime || EndTime - end > ts)
+                    _ViewEnds |= eViewEnds.PartialRight;
+            }
+            else
+            {
+                _ViewEnds = eViewEnds.PartialLeft | eViewEnds.PartialRight;
+            }
+        }
+
+        /// <summary>
+        /// Gets the initial starting DayColumn col and max col
+        /// for the given date
+        /// </summary>
+        /// <param name="selDate">Selection date</param>
+        /// <param name="col">Column</param>
+        /// <param name="n">Max col</param>
+        /// <returns></returns>
+        private DateTime GetDateCol(DateTime selDate, out int col, out int n)
+        {
+            DayColumn[] dayColumns = _AllDayPanel.WeekDayView.DayColumns;
+
+            // Loop through each column
+
+            col = 0;
+            n = 0;
+
+            for (int i = 0; i < dayColumns.Length; i++)
+            {
+                DateTime date = dayColumns[i].Date;
+
+                // If we have found our containing column, then
+                // calculate the absolute slice value and return it
+
+                if (date.Year >= selDate.Year ||
+                    date.Month >= selDate.Month || date.Day >= selDate.Day)
+                {
+                    col = i;
+                    n = dayColumns.Length - col - 1;
+
+                    return (date);
+                }
+            }
+
+            return (selDate);
+        }
+
+        #endregion
+
+        #region Appointment rendering
+
+        /// <summary>
+        /// Paint processing
+        /// </summary>
+        /// <param name="e">ItemPaintArgs</param>
+        public override void Paint(ItemPaintArgs e)
+        {
+            AppointmentColor.SetColorTable();
+
+            Rectangle r = GetViewRect();
+
+            if (r.Width > 1 && r.Height > 0)
+            {
+                if (EffectiveStyle == eDotNetBarStyle.Office2010 || StyleManager.IsMetro(EffectiveStyle))
+                    DrawMetroAppointment(e, r);
+                else
+                    DrawDefaultAppointment(e, r);
+
+                if (IsMutable == true)
+                    DrawResizeHandles(e, r);
+            }
+        }
+
+        #region DrawDefaultAppointment
+
+        private void DrawDefaultAppointment(ItemPaintArgs e, Rectangle r)
+        {
+            Graphics g = e.Graphics;
+
+            int top = Math.Min(Math.Min(r.Width / 2, r.Height / 2), 5);
+            int bot = top;
+
+            if (DayColumn != null)
+            {
+                if (StartTime.Date < DayColumn.Date.Date)
+                    top = 0;
+
+                if (EndTime.Date > DayColumn.Date.Date.AddDays(1))
+                    bot = 0;
+            }
+
+            using (GraphicsPath path = DisplayHelp.GetRoundedRectanglePath(r, top, top, bot, bot))
+            {
+                using (Brush br = BackBrush(r))
+                    g.FillPath(br, path);
+
+                if (BaseView.CalendarView.DoAppointmentViewPreRender(this, g, r, path) == false)
+                {
+                    DrawContent(e, r);
+
+                    BaseView.CalendarView.DoAppointmentViewPostRender(this, g, r, path);
+                }
+
+                DrawDefaultBorder(g, top, bot, r, path);
+            }
+        }
+
+        #region DrawDefaultBorder
+
+        private void DrawDefaultBorder(Graphics g,
+            int top, int bot, Rectangle r, GraphicsPath path)
+        {
+            DrawTimeMarker(g, r, top);
+
+            if (IsSelected == true)
+            {
+                using (Pen pen = SelectedBorderPen)
+                    g.DrawPath(pen, path);
+            }
+            else
+            {
+                using (Pen pen = BorderPen)
+                    g.DrawPath(pen, path);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region DrawMetroAppointment
+
+        private void DrawMetroAppointment(ItemPaintArgs e, Rectangle r)
+        {
+            Graphics g = e.Graphics;
+
+            using (Brush br = BackBrush(r))
+                g.FillRectangle(br, r);
+
+            if (BaseView.CalendarView.DoAppointmentViewPreRender(this, g, r, null) == false)
+            {
+                DrawContent(e, r);
+
+                BaseView.CalendarView.DoAppointmentViewPostRender(this, g, r, null);
+            }
+
+            DrawMetroBorder(g, r);
+        }
+
+        #region DrawMetroBorder
+
+        private void DrawMetroBorder(Graphics g, Rectangle r)
+        {
+            DrawTimeMarker(g, r, 0);
+
+            if (IsSelected == true)
+            {
+                using (Pen pen = new Pen(Color.Black, 2))
+                    g.DrawRectangle(pen, r);
+            }
+            else
+            {
+                using (Pen pen = BorderPen)
+                    g.DrawRectangle(pen, r);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetViewRect
+
+        /// <summary>
+        /// Gets the view rect for the appointment
+        /// </summary>
+        /// <returns>View rect</returns>
+        private Rectangle GetViewRect()
+        {
+            Rectangle r = DisplayRectangle;
+
+            if ((_ViewEnds & eViewEnds.PartialLeft) != eViewEnds.PartialLeft)
+            {
+                r.X += HorizontalPadding;
+                r.Width -= HorizontalPadding;
+            }
+
+            if ((_ViewEnds & eViewEnds.PartialRight) != eViewEnds.PartialRight)
+                r.Width -= HorizontalPadding;
+
+            // If the view is selected, then allow
+            // for a thicker selection rect
+
+            if (IsSelected == true && Appointment.IsMultiDayOrAllDayEvent == false)
+                r.Height -= 1;
+
+            return (r);
+        }
+
+        #endregion
+
+        #region DrawContent
+
+        /// <summary>
+        /// DrawContent
+        /// </summary>
+        /// <param name="e"></param>
+        /// <param name="r"></param>
+        private void DrawContent(ItemPaintArgs e, Rectangle r)
+        {
+            Image image = Image;
+
+            Rectangle rText = r;
+            rText.X += 4;
+            rText.Width -= 6;
+
+            if (Appointment.TimeMarkedAs != null)
+            {
+                rText.X += 4;
+                rText.Width -= 4;
+            }
+
+            Rectangle rImage = GetItemBounds(rText, ref rText, image);
+
+            DrawContentImage(e, r, rImage, image);
+            DrawContentText(e, rText);
+        }
+
+        #region DrawContentText
+
+        /// <summary>
+        /// Draws the content text
+        /// </summary>
+        /// <param name="e"></param>
+        /// <param name="r"></param>
+        private void DrawContentText(ItemPaintArgs e, Rectangle r)
+        {
+            Graphics g = e.Graphics;
+
+            if (DisplayTemplateText(e, r) == false)
+            {
+                string s = Appointment.Subject;
+
+                eTextFormat tf = eTextFormat.NoPadding | eTextFormat.NoPrefix;
+                WeekDayView wv = BaseView as WeekDayView;
+
+                if (wv != null && wv.IsAllDayItem(Appointment) == false)
+                {
+                    s += "\n" + Appointment.Description;
+
+                    r.Y += 3;
+                    r.Height -= 3;
+
+                    tf |= eTextFormat.WordBreak;
+                }
+                else
+                {
+                    tf |= eTextFormat.VerticalCenter;
+                }
+
+                Font font = Font ?? e.Font;
+
+                if (r.Width > 4)
+                    TextDrawing.DrawString(g, s, font, TextColor, r, tf);
+
+                Size size = TextDrawing.MeasureString(g, s, font, r.Width, tf);
+
+                IsTextClipped = (r.Width < size.Width || r.Height < size.Height);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region DrawResizeHandles
+
+        /// <summary>
+        /// Draws the resize handles for the view
+        /// </summary>
+        /// <param name="e"></param>
+        /// <param name="r">View rectangle</param>
+        private void DrawResizeHandles(ItemPaintArgs e, Rectangle r)
+        {
+            if (r.Width > 6)
+            {
+                Graphics g = e.Graphics;
+
+                Rectangle r2 =
+                    new Rectangle(r.X + (r.Width / 2) - 2, r.Y - 3, 5, 5);
+
+                if (DayColumn != null)
+                {
+                    // Top handle
+
+                    if (StartTime >= DayColumn.Date)
+                    {
+                        g.FillRectangle(Brushes.White, r2);
+                        g.DrawRectangle(Pens.Black, r2);
+                    }
+
+                    // Bottom handle
+
+                    if (EndTime <= DayColumn.Date.AddDays(1))
+                    {
+                        r2.Y = r.Bottom - 2;
+
+                        g.FillRectangle(Brushes.White, r2);
+                        g.DrawRectangle(Pens.Black, r2);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Mouse processing
+
+        #region MouseMove processing
+
+        /// <summary>
+        /// Handles mouseDown processing
+        /// </summary>
+        /// <param name="objArg">MouseEventArgs</param>
+        public override void InternalMouseMove(MouseEventArgs objArg)
+        {
+            HitArea = GetHitArea(objArg);
+
+            base.InternalMouseMove(objArg);
+        }
+
+        /// <summary>
+        /// Gets the HitArea from the current
+        /// mouse position
+        /// </summary>
+        /// <param name="objArg"></param>
+        /// <returns>eHitArea</returns>
+        private eHitArea GetHitArea(MouseEventArgs objArg)
+        {
+            if (IsMutable == true)
+            {
+                Rectangle r = GetViewRect();
+
+                Rectangle r2 =
+                    new Rectangle(r.X + (r.Width / 2) - 7, r.Y - 7, 14, 14);
+
+                if (DayColumn != null)
+                {
+                    // See if we are in the top resize area
+
+                    if (StartTime >= DayColumn.Date)
+                    {
+                        if (r2.Contains(objArg.Location))
+                            return (eHitArea.TopResize);
+                    }
+
+                    // See if we are in the bottom resize area
+
+                    if (EndTime <= DayColumn.Date.AddDays(1))
+                    {
+                        r2.Y = r.Bottom - 10;
+
+                        if (r2.Contains(objArg.Location))
+                            return (eHitArea.BottomResize);
+                    }
+                }
+
+                // By default we are in the move area
+
+                return (eHitArea.Move);
+            }
+
+            // No valid area to report
+
+            return (eHitArea.None);
+        }
+
+        #endregion
+
+        #endregion
+
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/BaseView.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/BaseView.cs
new file mode 100644
index 00000000..f19585e4
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/BaseView.cs	
@@ -0,0 +1,2286 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Windows.Forms;
+using DevComponents.Schedule.Model;
+
+namespace DevComponents.DotNetBar.Schedule
+{
+    public class BaseView : BaseItem
+    {
+        #region Events
+
+        /// <summary>
+        /// Occurs when SelectedItem has Changed
+        /// </summary>
+        public event EventHandler<SelectedItemChangedEventArgs> SelectedItemChanged;
+
+        /// <summary>
+        /// Occurs when CalendarColor has Changed
+        /// </summary>
+        public event EventHandler<CalendarColorChangedEventArgs> CalendarColorChanged;
+
+        #endregion
+
+        #region Constants
+
+        protected const int DaysInWeek = 7;
+        private const int TabRadius = 3;
+        private const int TabDia = TabRadius * 2;
+
+        #endregion
+
+        #region Static variables
+
+        private static DateTime _oldStartTime;          // Pre-move/resize CalendarItem StartTime
+        private static DateTime _oldEndTime;            // Pre-move/resize CalendarItem EndTime
+        private static string _oldOwnerKey;             // Pre-move CalendarItem OwnerKey
+
+        #endregion
+
+        #region SubClasses
+
+        internal class NonClientData
+        {
+            #region Data members
+
+            public eTabOrientation TabOrientation; // Tab orientation
+
+            public int TabBorder;                  // Tab border color
+            public int TabFore;                    // Tab foreground color
+            public int TabBack;                    // Tab background color
+            public int ContBack;                   // Tab content background
+            public int TabSelFore;                 // Tab selected foreground
+            public int TabSelBack;                 // Tab selected background
+
+            #endregion
+
+            /// <summary>
+            /// Constructor
+            /// </summary>
+            /// <param name="tabOrientation">Tab Orientation</param>
+            /// <param name="tabBorder">Tab border color</param>
+            /// <param name="tabFore">Tab foreground color</param>
+            /// <param name="tabBack">Tab background color</param>
+            /// <param name="contBack">Tab content background</param>
+            /// <param name="tabSelFore">Tab selected foreground</param>
+            /// <param name="tabSelBack">Tab selected background</param>
+            public NonClientData(
+                eTabOrientation tabOrientation,
+                int tabBorder, int tabFore, int tabBack,
+                int contBack, int tabSelFore, int tabSelBack)
+            {
+                TabOrientation = tabOrientation;
+
+                TabBorder = tabBorder;
+                TabFore = tabFore;
+                TabBack = tabBack;
+                ContBack = contBack;
+                TabSelFore = tabSelFore;
+                TabSelBack = tabSelBack;
+            }
+        }
+
+        #endregion
+
+        #region Private variables
+
+        private CalendarView _CalendarView;             // CalendarView
+        private eCalendarView _ECalendarView;           // Enum CalendarView
+
+        private ModelViewConnector _Connector;          // Connector
+
+        private DateTime? _DateSelectionStart;          // Date selection start
+        private DateTime? _DateSelectionEnd;            // Date selection end
+        private DateTime? _DateSelectionAnchor;         // Date selection anchor
+
+        private DateTime _StartDate;                    // Display start date
+        private DateTime _EndDate;                      // Display end date
+        private bool _DateRangeChanged;                 // Date range has changed
+
+        private CalendarColor _CalendarColor;           // CalendarColor
+
+        private Rectangle _ClientRect;                  // View client area
+        private NonClientData _NClientData;             // Non-client data
+        private int _TabWidth;                          // Tab width
+
+        private PosWin _PosWin;                         // Move/Resize Position window
+
+        private bool _IsMouseDown;                      // Mouse is down
+        private bool _IsMoving;                         // Flag denoting app moving
+        private bool _IsStartResizing;                  // Flag denoting appt start resizing
+        private bool _IsEndResizing;                    // Flag denoting appt end resizing
+        private bool _IsTabMoving;                      // Flag denoting Tab is moving
+        private bool _IsCondMoving;                     // Flag denoting Condensed view movement
+        private bool _IsCopyDrag;                       // Flag denoting Appointment copy is dragging
+        private bool _IsNewCopyDrag;
+
+        private int _LastViewIndex;                     // Last MultiUser view index
+
+        private string _OwnerKey;                       // Owner key
+        private string _DisplayName;                    // Display name
+        private int _DisplayedOwnerKeyIndex = -1;       // DisplayedOwnerKey index
+
+        private bool _IsViewSelected;                   // View selected?
+        private bool _IsSelecting;                      // Selection inprogress flag
+        private CalendarItem _SelectedItem;             // Selected CalendarItem
+
+        private bool _NeedRecalcLayout = true;          // Layout needs recalculated
+
+        private DaysOfTheWeek _DaysOfTheWeek;           // Days of the week
+
+        private Font _Font = SystemFonts.CaptionFont;   // Display font
+
+        private Font _BoldFont =                        // Bold display font
+            new Font(SystemFonts.CaptionFont, FontStyle.Bold);
+
+        #endregion
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="calendarView"></param>
+        /// <param name="ecv"></param>
+        public BaseView(CalendarView calendarView, eCalendarView ecv)
+        {
+            // Save the provided CalendarView and
+            // tell the system we are a container
+
+            _CalendarView = calendarView;
+            _ECalendarView = ecv;
+
+            SetIsContainer(true);
+
+            SubItems.AllowParentRemove = false;
+
+            // Make sure we see all our mouse events
+
+            MouseDownCapture = true;
+            MouseUpNotification = true;
+
+            // Hook our events
+
+            HookEvents(true);
+        }       
+
+        #region Public properties
+
+        #region BoldFont
+
+        /// <summary>
+        /// Gets the Bold display font
+        /// </summary>
+        public Font BoldFont
+        {
+            get { return (_BoldFont); }
+        }
+
+        #endregion
+
+        #region Bounds
+
+        /// <summary>
+        /// Gets and sets the view bounding rectangle
+        /// </summary>
+        public override Rectangle Bounds
+        {
+            get { return (base.Bounds); }
+
+            set
+            {
+                if (base.Bounds != value)
+                {
+                    Rectangle r = base.Bounds;
+                    base.Bounds = value;
+
+                    InvalidateRect(r);
+
+                    NeedRecalcLayout = true;
+                }
+            }
+        }
+
+        #endregion
+
+        #region DisplayedOwnerKey
+
+        /// <summary>
+        /// Gets and sets the DisplayedOwnerKey
+        /// </summary>
+        public string DisplayedOwnerKey
+        {
+            get
+            {
+                if (_DisplayedOwnerKeyIndex < 0 ||
+                    _DisplayedOwnerKeyIndex > _CalendarView.DisplayedOwners.Count)
+                {
+                    return ("");
+                }
+
+                return (_CalendarView.DisplayedOwners[_DisplayedOwnerKeyIndex]);
+            }
+        }
+        
+        /// <summary>
+        /// Gets and sets the DisplayedOwnerKeyIndex
+        /// </summary>
+        public int DisplayedOwnerKeyIndex
+        {
+            get { return (_DisplayedOwnerKeyIndex); }
+            internal set { _DisplayedOwnerKeyIndex = value; }
+        }
+
+        /// <summary>
+        /// Gets and sets the view Owner Key
+        /// </summary>
+        public string OwnerKey
+        {
+            get { return (_OwnerKey); }
+            internal set { _OwnerKey = value; }
+        }
+
+        /// <summary>
+        /// Gets and sets the view Display Name
+        /// </summary>
+        public string DisplayName
+        {
+            get { return (_DisplayName); }
+
+            set
+            {
+                if (_DisplayName != value)
+                {
+                    _DisplayName = value;
+
+                    this.Refresh();
+                }
+            }
+        }
+
+        #endregion
+
+        #region Start/EndDate
+
+        /// <summary>
+        /// Gets and sets the display start date
+        /// </summary>
+        public DateTime StartDate
+        {
+            get { return (_StartDate); }
+
+            set
+            {
+                if (_StartDate != value)
+                {
+                    _StartDate = value;
+                    _DateRangeChanged = true;
+
+                    NeedRecalcLayout = true;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets and sets the display end date
+        /// </summary>
+        public DateTime EndDate
+        {
+            get { return (_EndDate); }
+
+            set
+            {
+                if (_EndDate != value)
+                {
+                    _EndDate = value;
+                    _DateRangeChanged = true;
+
+                    NeedRecalcLayout = true;
+                }
+            }
+        }
+
+        #endregion
+
+        #region DateSelectionStart
+
+        /// <summary>
+        /// Gets and sets the date selection start
+        /// </summary>
+        public DateTime? DateSelectionStart
+        {
+            get { return (_DateSelectionStart); }
+
+            set
+            {
+                if (_DateSelectionStart != value)
+                {
+                    _DateSelectionStart = value;
+
+                    // Update our dayRects selection status
+
+                    UpdateDateSelection();
+                }
+            }
+        }
+
+        #endregion
+
+        #region DateSelectionEnd
+
+        /// <summary>
+        /// Gets or sets the end date of selection.
+        /// </summary>
+        public DateTime? DateSelectionEnd
+        {
+            get { return (_DateSelectionEnd); }
+
+            set
+            {
+                if (_DateSelectionEnd != value)
+                {
+                    _DateSelectionEnd = value;
+
+                    // Update our dayRects selection status
+
+                    UpdateDateSelection();
+                }
+            }
+        }
+
+        #endregion
+
+        #region CalendarColorTable
+
+        /// <summary>
+        /// Gets and sets the CalendarColorTable
+        /// </summary>
+        public CalendarColor CalendarColorTable
+        {
+            get { return (_CalendarColor); }
+            internal set { _CalendarColor = value; }
+        }
+
+        #endregion
+
+        #region CalendarColor
+
+        /// <summary>
+        /// Gets and sets the display calendar color scheme
+        /// </summary>
+        public eCalendarColor CalendarColor
+        {
+            get { return (_CalendarColor.ColorSch); }
+
+            set
+            {
+                if (_CalendarColor.ColorSch != value)
+                {
+                    eCalendarColor oldValue = _CalendarColor.ColorSch;
+                    _CalendarColor.ColorSch = value;
+
+                    OnCalendarColorChanged(oldValue, value);
+
+                    if (IsViewSelected == true)
+                        InvalidateRect(Bounds);
+                }
+            }
+        }
+
+        /// <summary>
+        /// OnCalendarColorChanged event propagation
+        /// </summary>
+        protected virtual void
+            OnCalendarColorChanged(eCalendarColor oldValue, eCalendarColor newValue)
+        {
+            if (CalendarColorChanged != null)
+            {
+                CalendarColorChanged(this,
+                    new CalendarColorChangedEventArgs(oldValue, newValue));
+            }
+
+            // Reflect the change in alternate views
+
+            CalendarView.UpdateAltViewCalendarColor(newValue, DisplayedOwnerKeyIndex);
+
+            // Update the CalendarModel ColorScheme
+
+            OwnerCollection owners = CalendarView.CalendarModel.Owners;
+
+            foreach (Owner owner in owners)
+            {
+                if (owner.Key.Equals(OwnerKey) == true)
+                {
+                    owner.ColorScheme = newValue;
+                    break;
+                }
+            }
+        }
+
+        #endregion
+
+        #region Font
+
+        /// <summary>
+        /// Get and sets the calendar font.
+        /// </summary>
+        public virtual Font Font
+        {
+            get { return (_Font); }
+
+            set
+            {
+                if (value != null && _Font.Equals(value) == false)
+                {
+                    if (_Font != null)
+                        _Font.Dispose();
+
+                    if (_BoldFont != null)
+                        _BoldFont.Dispose();
+
+                    _Font = value;
+                    _BoldFont = new Font(_Font, FontStyle.Bold);
+
+                    InvalidateRect(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region Selection support
+
+        /// <summary>
+        /// Gets and sets the currently selected CalendarItem
+        /// </summary>
+        public CalendarItem SelectedItem
+        {
+            get { return _SelectedItem; }
+
+            set
+            {
+                if (_SelectedItem != value)
+                {
+                    CalendarItem oldValue = _SelectedItem;
+                    _SelectedItem = value;
+
+                    if (value != null)
+                    {
+                        CalendarView.DateSelectionStart = null;
+                        CalendarView.DateSelectionEnd = null;
+                        
+                        DateSelectionAnchor = null;
+
+                        UpdateItemOrder(value);
+                    }
+
+                    SetSelectedItem(oldValue, value);
+
+                    OnSelectedItemChanged(oldValue, value);
+                }
+            }
+        }
+
+        internal void UpdateItemOrder(CalendarItem ci)
+        {
+            int n = SubItems.IndexOf(ci);
+            int index = FirstCalendarItem();
+
+            if (index >= 0 && index < n)
+            {
+                SubItems._RemoveAt(n);
+                SubItems._Insert(index, ci);
+            }
+        }
+
+        private int FirstCalendarItem()
+        {
+            for (int i = 0; i < SubItems.Count; i++)
+            {
+                if (SubItems[i] is CalendarItem)
+                    return (i);
+            }
+
+            return (-1);
+        }
+
+        /// <summary>
+        /// SelectedItemChanged event propagation
+        /// </summary>
+        protected virtual void
+            OnSelectedItemChanged(CalendarItem oldValue, CalendarItem newValue)
+        {
+            if (SelectedItemChanged != null)
+            {
+                SelectedItemChanged(this,
+                    new SelectedItemChangedEventArgs(oldValue, newValue));
+            }
+        }
+
+        /// <summary>
+        /// Gets the selected state of the view
+        /// </summary>
+        public bool IsViewSelected
+        {
+            get { return (_IsViewSelected); }
+            internal set {_IsViewSelected = value; }
+        }
+
+        #endregion
+
+        #region SelectedAppointments
+
+        /// <summary>
+        /// Gets a ReadOnlyCollection of the
+        /// currently selected appointments for the view
+        /// </summary>
+        public ReadOnlyCollection<AppointmentView> SelectedAppointments
+        {
+            get
+            {
+                List<AppointmentView> apps = new List<AppointmentView>();
+
+                AppointmentView view = _SelectedItem as AppointmentView;
+
+                if (view != null)
+                    apps.Add(view);
+
+                return (new ReadOnlyCollection<AppointmentView>(apps));
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Protected properties
+
+        #region CalendarModel
+
+        /// <summary>
+        /// Gets the View CalendarModel
+        /// </summary>
+        protected CalendarModel CalendarModel
+        {
+            get { return (CalendarView.CalendarModel); }
+        }
+
+        #endregion
+
+        #region Mouse related properties
+
+        /// <summary>
+        /// IsMouseDown
+        /// </summary>
+        protected bool IsMouseDown
+        {
+            get { return (_IsMouseDown); }
+            set { _IsMouseDown = value; }
+        }
+
+        /// <summary>
+        /// IsStartResizing
+        /// </summary>
+        protected bool IsStartResizing
+        {
+            get { return (_IsStartResizing); }
+            set { _IsStartResizing = value; }
+        }
+
+        /// <summary>
+        /// IsEndResizing
+        /// </summary>
+        protected bool IsEndResizing
+        {
+            get { return (_IsEndResizing); }
+            set { _IsEndResizing = value; }
+        }
+
+        /// <summary>
+        /// IsResizing
+        /// </summary>
+        protected bool IsResizing
+        {
+            get { return (_IsStartResizing || _IsEndResizing); }
+        }
+
+        /// <summary>
+        /// IsMoving
+        /// </summary>
+        protected bool IsMoving
+        {
+            get { return (_IsMoving); }
+            set { _IsMoving = value; }
+        }
+
+        /// <summary>
+        /// IsTabMoving
+        /// </summary>
+        protected bool IsTabMoving
+        {
+            get { return (_IsTabMoving); }
+            set { _IsTabMoving = value; }
+        }
+
+        /// <summary>
+        /// IsConMoving
+        /// </summary>
+        protected bool IsCondMoving
+        {
+            get { return (_IsCondMoving); }
+            set { _IsCondMoving = value; }
+        }
+
+        /// <summary>
+        /// CanDrag
+        /// </summary>
+        protected bool CanDrag
+        {
+            get { return (SelectedItem != null && CalendarView.EnableDragDrop == true); }
+        }
+
+        /// <summary>
+        /// Pre-move/resize StartTime
+        /// </summary>
+        protected DateTime OldStartTime
+        {
+            get { return (_oldStartTime); }
+            set { _oldStartTime = value; }
+        }
+
+        /// <summary>
+        /// Pre-move/resize EndTime
+        /// </summary>
+        protected DateTime OldEndTime
+        {
+            get { return (_oldEndTime); }
+            set { _oldEndTime = value; }
+        }
+
+        #endregion
+
+        #region Cursor properties
+
+        /// <summary>
+        /// Sets local view cursor
+        /// </summary>
+        protected Cursor MyCursor
+        {
+            set { CalendarView.ViewCursor = value; }
+        }
+
+        /// <summary>
+        /// Gets CalendarView default cursor
+        /// </summary>
+        protected Cursor DefaultCursor
+        {
+            get { return (CalendarView.DefaultViewCursor); }
+        }
+
+        #endregion
+
+        #region PosWin
+
+        /// <summary>
+        /// Gets and sets the view position window
+        /// </summary>
+        protected PosWin PosWin
+        {
+            get { return (_PosWin); }
+            set { _PosWin = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        /// <summary>
+        /// Gets the CalendarView
+        /// </summary>
+        internal CalendarView CalendarView
+        {
+            get { return (_CalendarView); }
+        }
+
+        /// <summary>
+        /// Gets the ECalendarView
+        /// </summary>
+        internal eCalendarView ECalendarView
+        {
+            get { return (_ECalendarView); }
+        }
+
+        /// <summary>
+        /// Gets and sets the ModelViewConnector
+        /// </summary>
+        internal ModelViewConnector Connector
+        {
+            get { return (_Connector); }
+
+            set
+            {
+                if (value != _Connector)
+                {
+                    _Connector = value;
+
+                    _Connector.DisplayOwnerKey = DisplayedOwnerKey;
+                    _Connector.Connect();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets the DayOfWeekHeader height
+        /// </summary>
+        internal int DayOfWeekHeaderHeight
+        {
+            get { return (Font.Height + 4); }
+        }
+
+        /// <summary>
+        /// IsCopyDrag
+        /// </summary>
+        internal bool IsCopyDrag
+        {
+            get { return (_IsCopyDrag); }
+            set { _IsCopyDrag = value; }
+        }
+
+        /// <summary>
+        /// IsNewCopyDrag
+        /// </summary>
+        internal bool IsNewCopyDrag
+        {
+            get { return (_IsNewCopyDrag); }
+            set { _IsNewCopyDrag = value; }
+        }
+
+        /// <summary>
+        /// OldOwnerKey
+        /// </summary>
+        internal string OldOwnerKey
+        {
+            get { return (_oldOwnerKey); }
+            set { _oldOwnerKey = value; }
+        }
+
+        #region MonthHeaderHeight
+
+        internal int MonthHeaderHeight
+        {
+            get { return (Font.Height + 4); }
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Gets the MultiUserTabHeight
+        /// </summary>
+        internal int MultiUserTabHeight
+        {
+            get { return (_CalendarView.MultiUserTabHeight); }
+        }
+
+        /// <summary>
+        /// Gets the MultiUserTabWidth
+        /// </summary>
+        internal int MultiUserTabWidth
+        {
+            get { return (_CalendarView.TimeLineMultiUserTabWidth); }
+        }
+
+        /// <summary>
+        /// Gets the Appointment height
+        /// </summary>
+        internal int AppointmentHeight
+        {
+            get { return (Font.Height + 4); }
+        }
+
+        /// <summary>
+        /// Gets and sets the date selection anchor
+        /// </summary>
+        internal DateTime? DateSelectionAnchor
+        {
+            get { return (_DateSelectionAnchor); }
+            set { _DateSelectionAnchor = value; }
+        }
+
+        /// <summary>
+        /// Gets and sets the Days of the week object
+        /// </summary>
+        internal DaysOfTheWeek DaysOfTheWeek
+        {
+            get { return (_DaysOfTheWeek); }
+            set { _DaysOfTheWeek = value; }
+        }
+
+        /// <summary>
+        /// Gets and sets the selecting status
+        /// </summary>
+        internal bool IsSelecting
+        {
+            get { return (_IsSelecting); }
+            set { _IsSelecting = value; }
+        }
+
+        /// <summary>
+        /// Gets and sets recalc layout need
+        /// </summary>
+        internal bool NeedRecalcLayout
+        {
+            get { return (_NeedRecalcLayout); }
+
+            set
+            {
+                _NeedRecalcLayout = value;
+
+                if (value == true)
+                    InvalidateRect(true);
+            }
+        }
+
+        /// <summary>
+        /// Gets and sets the view client rectangle
+        /// </summary>
+        internal Rectangle ClientRect
+        {
+            get { return (_ClientRect); }
+            set { _ClientRect = value; }
+        }
+
+        /// <summary>
+        /// Gets and sets the DateRangeChanged state
+        /// </summary>
+        internal bool DateRangeChanged
+        {
+            get { return (_DateRangeChanged); }
+            set { _DateRangeChanged = value; }
+        }
+
+        /// <summary>
+        /// Gets and sets the base non-client data
+        /// </summary>
+        internal NonClientData NClientData
+        {
+            get { return (_NClientData); }
+            set { _NClientData = value; }
+        }
+
+        #endregion
+
+        #region HookEvents
+
+        /// <summary>
+        /// Hooks and unhooks our object events
+        /// </summary>
+        /// <param name="hook">True - hook, false - unhook</param>
+        private void HookEvents(bool hook)
+        {
+            if (hook == true)
+            {
+                CalendarView.ModelChanged += CalendarViewModelChanged;
+                CalendarView.DateSelectionStartChanged += CalendarViewDateSelectionStartChanged;
+                CalendarView.DateSelectionEndChanged += CalendarViewDateSelectionEndChanged;
+            }
+            else
+            {
+                CalendarView.ModelChanged -= CalendarViewModelChanged;
+                CalendarView.DateSelectionStartChanged -= CalendarViewDateSelectionStartChanged;
+                CalendarView.DateSelectionEndChanged -= CalendarViewDateSelectionEndChanged;
+            }
+        }
+
+        #endregion
+
+        #region Event processing
+
+        /// <summary>
+        /// DateSelectionEndChanged
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void CalendarViewDateSelectionEndChanged(object sender, DateSelectionEventArgs e)
+        {
+            if (CalendarView.SelectedOwnerIndex == DisplayedOwnerKeyIndex)
+                this.DateSelectionEnd = CalendarView.DateSelectionEnd;
+            else
+                this.DateSelectionEnd = null;
+        }
+
+        /// <summary>
+        /// DateSelectionStartChanged
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void CalendarViewDateSelectionStartChanged(object sender, DateSelectionEventArgs e)
+        {
+            if (CalendarView.SelectedOwnerIndex == DisplayedOwnerKeyIndex)
+                this.DateSelectionStart = CalendarView.DateSelectionStart;
+            else
+                this.DateSelectionStart = null;
+        }
+
+        /// <summary>
+        /// ModelChanged
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void CalendarViewModelChanged(object sender, ModelEventArgs e)
+        {
+            ResetView();
+        }
+
+        #endregion
+
+        #region RecalcSize
+
+        /// <summary>
+        /// Performs NeedRecalcSize requests
+        /// </summary>
+        public override void RecalcSize()
+        {
+            base.RecalcSize();
+
+            Rectangle r = Bounds;
+
+            if (CalendarView.IsMultiCalendar == true)
+            {
+                if (NClientData.TabOrientation == eTabOrientation.Horizontal)
+                {
+                    r.Inflate(-2, -2);
+
+                    if (CalendarView.ShowTabs == true)
+                    {
+                        r.Y += MultiUserTabHeight;
+                        r.Height -= MultiUserTabHeight;
+                    }
+                }
+                else
+                {
+                    if (CalendarView.ShowTabs == true)
+                    {
+                        if (CalendarView.TimeLineMultiUserTabOrientation == eOrientation.Vertical)
+                        {
+                            r.X += MultiUserTabHeight + Dpi.Width4;
+                            r.Width -= (MultiUserTabHeight + Dpi.Width4);
+                        }
+                        else
+                        {
+                            r.X += MultiUserTabWidth + Dpi.Width4;
+                            r.Width -= (MultiUserTabWidth + Dpi.Width4);
+                        }
+                    }
+                }
+            }
+
+            ClientRect = r;
+        }
+
+        #endregion
+
+        #region Paint processing
+
+        /// <summary>
+        /// Paint processing
+        /// </summary>
+        /// <param name="e"></param>
+        public override void Paint(ItemPaintArgs e)
+        {
+            if (CalendarView.IsMultiCalendar == true)
+            {
+                if (NClientData.TabOrientation == eTabOrientation.Horizontal)
+                    DrawHorizontalLayout(e);
+                else
+                    DrawVerticalLayout(e);
+            }
+        }
+
+        #region DrawHorizontalLayout
+
+        /// <summary>
+        /// Draws horizontal tab layout
+        /// </summary>
+        /// <param name="e"></param>
+        private void DrawHorizontalLayout(ItemPaintArgs e)
+        {
+            Graphics g = e.Graphics;
+
+            Rectangle r = Bounds;
+            r.Width = _ClientRect.Width;
+            r.Height = MultiUserTabHeight + 3;
+
+            if (r.Width > 0)
+            {
+                // Size-up the tab dimensions
+
+                string s = string.IsNullOrEmpty(DisplayName) ? OwnerKey : DisplayName;
+                Size sz = TextDrawing.MeasureString(g, s, Font);
+
+                // Draw the control background border, and tab,
+
+                DrawBackBorder(g, sz.Width);
+                DrawHTab(e, s, sz.Width, r);
+            }
+        }
+
+        #region DrawBackBorder
+
+        /// <summary>
+        /// Draws the background border around
+        /// the entire control view
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="width"></param>
+        private void DrawBackBorder(Graphics g, int width)
+        {
+            Rectangle r = _ClientRect;
+
+            if (g.ClipBounds.X > r.X)
+            {
+                r.Width -= (int) (g.ClipBounds.X - r.X);
+                r.X = (int) g.ClipBounds.X + 1;
+            }
+
+            if (g.ClipBounds.Right < r.Right)
+                r.Width = (int) g.ClipBounds.Right - r.X - 1;
+
+            if (CalendarView.DoRenderViewBorder(g, this, r) == false)
+            {
+                using (Pen pen = new
+                    Pen(_CalendarColor.GetColor(_NClientData.ContBack)))
+                {
+                    g.DrawLines(pen, new Point[]
+                    {
+                        new Point(r.Left - 1, r.Y - 1),
+                        new Point(r.Right, r.Top - 1),
+                        new Point(r.Right, r.Bottom),
+                        new Point(r.Left - 1, r.Bottom),
+                        new Point(r.Left - 1, r.Top - 2),
+                        new Point(r.Right, r.Top - 2),
+                    });
+                }
+
+                using (Pen pen = new
+                    Pen(_CalendarColor.GetColor(_NClientData.TabBorder)))
+                {
+                    // Draw the tab border
+
+                    if (width + MultiUserTabHeight < _ClientRect.Width)
+                    {
+                        g.DrawLine(pen,
+                            _ClientRect.Left + width + MultiUserTabHeight, _ClientRect.Top - 2,
+                            _ClientRect.Right + 1, _ClientRect.Top - 2);
+                    }
+
+                    g.DrawLines(pen, new Point[]
+                    {
+                        new Point(_ClientRect.Right + 1, _ClientRect.Top - 2),
+                        new Point(_ClientRect.Right + 1, _ClientRect.Bottom + 1),
+                        new Point(_ClientRect.Left - 2, _ClientRect.Bottom + 1),
+                        new Point(_ClientRect.Left - 2, _ClientRect.Top - 2),
+                    });
+                }
+            }
+        }
+
+        #endregion
+
+        #region DrawHTab
+
+        /// <summary>
+        /// Draws the tab - border and content
+        /// </summary>
+        /// <param name="e">ItemPaintArgs</param>
+        /// <param name="text">Tab text</param>
+        /// <param name="width">Text measured width</param>
+        /// <param name="r">Bounding rectangle</param>
+        private void DrawHTab(ItemPaintArgs e, string text, int width, Rectangle r)
+        {
+            _TabWidth = Math.Min(width, _ClientRect.Width);
+
+            if (CalendarView.ShowTabs == true)
+            {
+                if (e.ClipRectangle.Y < _ClientRect.Y)
+                {
+                    Graphics g = e.Graphics;
+
+                    bool isSelected = 
+                        (CalendarView.SelectedOwnerIndex == DisplayedOwnerKeyIndex);
+
+                    // Draw the tab
+
+                    using (GraphicsPath path = GetHTabPath(_TabWidth))
+                    {
+                        if (CalendarView.DoRenderTabBackground(g, path, this, isSelected) == false)
+                        {
+                            using (Brush br = _CalendarColor.BrushPart(
+                                isSelected ? _NClientData.TabSelBack : _NClientData.TabBack, r))
+                            {
+                                g.FillPath(br, path);
+                            }
+
+                            using (Pen pen = new
+                                Pen(_CalendarColor.GetColor(_NClientData.TabBorder)))
+                            {
+                                g.DrawPath(pen, path);
+                            }
+                        }
+
+                        // Draw the tab text
+
+                        if (CalendarView.DoRenderTabContent(
+                            g, path, this, ref text, isSelected) == false)
+                        {
+                            r.X += 4;
+
+                            Color color = _CalendarColor.GetColor(isSelected
+                                ? _NClientData.TabSelFore : _NClientData.TabFore);
+
+                            TextDrawing.DrawString(g, text, Font, color, r, eTextFormat.VerticalCenter);
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region GetHTabPath
+
+        /// <summary>
+        /// Gets the tab graphics path
+        /// </summary>
+        /// <param name="tabWidth">Tab width</param>
+        /// <returns>GraphicsPath</returns>
+        protected GraphicsPath GetHTabPath(int tabWidth)
+        {
+            GraphicsPath path = new GraphicsPath();
+
+            Rectangle r = ClientRect;
+
+            r.Width = tabWidth;
+            r.Height = MultiUserTabHeight;
+
+            path.AddLine(ClientRect.Left - 2, ClientRect.Top - 2,
+                ClientRect.Left - 2, Bounds.Top + TabRadius);
+
+            path.AddArc(ClientRect.Left - 2, Bounds.Y, TabDia, TabDia, 180, 90);
+
+            if (tabWidth + MultiUserTabHeight < ClientRect.Width)
+            {
+                // Full tab
+
+                 path.AddLines(new Point[] {
+                    new Point(ClientRect.Left - 2 + TabRadius, Bounds.Top),
+                    new Point(ClientRect.Left + tabWidth, Bounds.Top),
+                    new Point(ClientRect.Left + tabWidth + MultiUserTabHeight, ClientRect.Top - 2) });
+            }
+            else if (tabWidth < ClientRect.Width)                   
+            {
+                // Partial tab with end slant
+
+                int n = ClientRect.Width - tabWidth + 2;
+
+                path.AddLines(new Point[] {
+                    new Point(ClientRect.Left - 2 + TabRadius, Bounds.Top),
+                    new Point(ClientRect.Left + tabWidth, Bounds.Top),
+                    new Point(ClientRect.Left - 2 + tabWidth + n, Bounds.Top + n),
+                    new Point(ClientRect.Left - 2 + tabWidth + n, ClientRect.Top - 2) });
+            }
+            else
+            {
+                // partial tab with no end slant
+
+                path.AddLines(new Point[] {
+                    new Point(ClientRect.Left - 2 + TabRadius, Bounds.Top),
+                    new Point(ClientRect.Right + 1, Bounds.Top),
+                    new Point(ClientRect.Right + 1, ClientRect.Top - 2) });
+            }
+
+            return (path);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region DrawVerticalLayout
+
+        /// <summary>
+        /// Draws vertical tab layout
+        /// </summary>
+        /// <param name="e"></param>
+        private void DrawVerticalLayout(ItemPaintArgs e)
+        {
+            if (CalendarView.ShowTabs == true)
+            {
+                Rectangle r = ClientRect;
+
+                if (r.Height > 0)
+                {
+                    if (CalendarView.TimeLineMultiUserTabOrientation == eOrientation.Vertical)
+                    {
+                        r.X -= MultiUserTabHeight;
+                        r.Width = MultiUserTabHeight;
+
+                        DrawVTab(e, string.IsNullOrEmpty(DisplayName)
+                                        ? OwnerKey
+                                        : DisplayName, r);
+                    }
+                    else
+                    {
+                        r.X -= MultiUserTabWidth;
+                        r.Width = MultiUserTabWidth;
+
+                        DrawVTab2(e, string.IsNullOrEmpty(DisplayName)
+                                         ? OwnerKey
+                                         : DisplayName, r);
+                    }
+                }
+            }
+        }
+
+        #region DrawVTab
+
+        /// <summary>
+        /// Draws the tab - border and content
+        /// </summary>
+        /// <param name="e">ItemPaintArgs</param>
+        /// <param name="text">Tab text</param>
+        /// <param name="r">Bounding rectangle</param>
+        private void DrawVTab(ItemPaintArgs e, string text, Rectangle r)
+        {
+            if (e.ClipRectangle.X < _ClientRect.X)
+            {
+                Graphics g = e.Graphics;
+
+                _TabWidth = _ClientRect.Height - MultiUserTabHeight;
+
+                if (_TabWidth < MultiUserTabHeight)
+                    _TabWidth = Math.Min(MultiUserTabHeight, Math.Max(0, _ClientRect.Height - 4));
+
+                bool isSelected = CalendarView.SelectedOwnerIndex == DisplayedOwnerKeyIndex;
+
+                using (GraphicsPath path = GetVTabPath(_TabWidth))
+                {
+                    // Draw the tab
+
+                    if (CalendarView.DoRenderTabBackground(g, path, this, isSelected) == false)
+                    {
+                        using (Brush br = _CalendarColor.BrushPart(
+                            isSelected ? _NClientData.TabSelBack : _NClientData.TabBack, r))
+                        {
+                            g.FillPath(br, path);
+                        }
+
+                        using (Pen pen = new
+                            Pen(_CalendarColor.GetColor(_NClientData.TabBorder)))
+                        {
+                            g.DrawPath(pen, path);
+                        }
+                    }
+
+                    // Draw the tab text
+
+                    if (CalendarView.DoRenderTabContent(g, path, this, ref text, isSelected) == false)
+                    {
+                        r.Height -= 4;
+
+                        // Set uo our output to have vertically centered text
+
+                        StringFormat sf = new StringFormat();
+
+                        sf.FormatFlags = StringFormatFlags.NoWrap;
+                        sf.Alignment = StringAlignment.Center;
+
+                        // Calc our rect origin and prepare to
+                        // output the SideBar text
+
+                        PointF ptf = new PointF(r.X, r.Bottom);
+                        Rectangle rf = new Rectangle(0, 0, _TabWidth, MultiUserTabHeight);
+
+                        g.TranslateTransform(ptf.X, ptf.Y);
+                        g.RotateTransform(-90);
+
+                        using (Brush br = _CalendarColor.BrushPart(
+                            isSelected ? _NClientData.TabSelFore : _NClientData.TabFore, rf))
+                        {
+                            g.DrawString(text, Font, br, rf, sf);
+                        }
+
+                        g.ResetTransform();
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region GetVTabPath
+
+        /// <summary>
+        /// Gets the tab graphics path
+        /// </summary>
+        /// <param name="tabWidth">Tab width</param>
+        /// <returns>GraphicsPath</returns>
+        protected GraphicsPath GetVTabPath(int tabWidth)
+        {
+            GraphicsPath path = new GraphicsPath();
+
+            Rectangle r = ClientRect;
+
+            r.X -= (MultiUserTabHeight + 1);
+            r.Width = MultiUserTabHeight;
+
+            path.AddLine(r.Right, r.Bottom - 1,
+                r.X + TabRadius, r.Bottom - 1);
+
+            path.AddArc(r.X, r.Bottom - 1 - TabDia, TabDia, TabDia, 90, 90);
+
+            if (r.Height > MultiUserTabHeight * 2)
+            {
+                // Full tab
+
+                 path.AddLines(new Point[] {
+                    new Point(r.X, r.Bottom - TabRadius),
+                    new Point(r.X, r.Bottom - tabWidth),
+                    new Point(r.Right, r.Bottom - tabWidth - MultiUserTabHeight) });
+            }
+            else if (r.Height > MultiUserTabHeight)
+            {
+                // Partial tab with end slant
+
+                int n = r.Height - MultiUserTabHeight;
+
+                path.AddLines(new Point[] {
+                    new Point(r.X, r.Bottom - TabRadius),
+                    new Point(r.X, r.Top + n),
+                    new Point(r.X + n, r.Y),
+                    new Point(r.Right, r.Y) });
+            }
+            else
+            {
+                // partial tab with no end slant
+
+                path.AddLines(new Point[] {
+                    new Point(r.X, Bounds.Bottom - TabRadius),
+                    new Point(r.X, Bounds.Top),
+                    new Point(r.X + MultiUserTabHeight, Bounds.Top) });
+            }
+
+            return (path);
+        }
+
+        #endregion
+
+        #region DrawVTab2
+
+        /// <summary>
+        /// Draws the tab - border and content
+        /// </summary>
+        /// <param name="e">ItemPaintArgs</param>
+        /// <param name="text">Tab text</param>
+        /// <param name="r">Bounding rectangle</param>
+        private void DrawVTab2(ItemPaintArgs e, string text, Rectangle r)
+        {
+            if (e.ClipRectangle.X < _ClientRect.X)
+            {
+                Graphics g = e.Graphics;
+
+                _TabWidth = _ClientRect.Width - MultiUserTabWidth;
+
+                if (_TabWidth < MultiUserTabWidth)
+                    _TabWidth = Math.Min(MultiUserTabWidth, Math.Max(0, _ClientRect.Width - 4));
+
+                bool isSelected = CalendarView.SelectedOwnerIndex == DisplayedOwnerKeyIndex;
+
+                using (GraphicsPath path = GetVTab2Path(_TabWidth))
+                {
+                    // Draw the tab
+
+                    if (CalendarView.DoRenderTabBackground(g, path, this, isSelected) == false)
+                    {
+                        using (Brush br = _CalendarColor.BrushPart(
+                            isSelected ? _NClientData.TabSelBack : _NClientData.TabBack, r))
+                        {
+                            g.FillPath(br, path);
+                        }
+
+                        using (Pen pen = new
+                            Pen(_CalendarColor.GetColor(_NClientData.TabBorder)))
+                        {
+                            g.DrawPath(pen, path);
+                        }
+                    }
+
+                    // Draw the tab text
+
+                    if (CalendarView.DoRenderTabContent(g, path, this, ref text, isSelected) == false)
+                    {
+                        r.Y += 2;
+                        r.Height -= 4;
+
+                        // Set uo our output to have vertically centered text
+
+                        StringFormat sf = new StringFormat();
+
+                        sf.FormatFlags = StringFormatFlags.NoWrap;
+                        sf.Alignment = StringAlignment.Center;
+                        sf.LineAlignment = StringAlignment.Center;
+
+                        // Calc our rect origin and prepare to
+                        // output the SideBar text
+
+                        using (Brush br = _CalendarColor.BrushPart(
+                            isSelected ? _NClientData.TabSelFore : _NClientData.TabFore, r))
+                        {
+                            g.DrawString(text, Font, br, r, sf);
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region GetVTab2Path
+
+        /// <summary>
+        /// Gets the tab graphics path
+        /// </summary>
+        /// <param name="tabWidth">Tab width</param>
+        /// <returns>GraphicsPath</returns>
+        protected GraphicsPath GetVTab2Path(int tabWidth)
+        {
+            GraphicsPath path = new GraphicsPath();
+
+            Rectangle r = ClientRect;
+
+            r.X -= (MultiUserTabWidth + 1);
+            r.Width = MultiUserTabWidth;
+
+            path.AddLine(r.Right, r.Bottom - 1,
+                r.X + TabRadius, r.Bottom - 1);
+
+            path.AddArc(r.X, r.Bottom - 1 - TabDia, TabDia, TabDia, 90, 90);
+            path.AddArc(r.X, r.Top, TabDia, TabDia, 180, 90);
+
+            path.AddLine(r.Right, r.Top, r.Right, r.Bottom - 1);
+
+            path.CloseFigure();
+
+            return (path);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region GetTabPath
+
+        /// <summary>
+        /// Gets the multiuser tab path
+        /// </summary>
+        /// <param name="tabWidth"></param>
+        /// <returns></returns>
+        GraphicsPath GetTabPath(int tabWidth)
+        {
+            if (NClientData.TabOrientation == eTabOrientation.Horizontal)
+                return (GetHTabPath(tabWidth));
+
+            if (CalendarView.TimeLineMultiUserTabOrientation == eOrientation.Horizontal)
+                return (GetVTab2Path(tabWidth));
+
+            return (GetVTabPath(tabWidth));
+        }
+
+        #endregion
+
+        #region PointInTab
+
+        /// <summary>
+        /// Determines if the given Point is
+        /// within the View tab area
+        /// </summary>
+        /// <param name="pt">Point in question</param>
+        /// <returns>true if the Point is in the tab</returns>
+        private bool PointInTab(Point pt)
+        {
+            bool isInTab = false;
+
+            if (CalendarView.IsMultiCalendar == true)
+            {
+                if (NClientData.TabOrientation == eTabOrientation.Horizontal)
+                {
+                    if (pt.Y < ClientRect.Y)
+                    {
+                        using (GraphicsPath path = GetHTabPath(_TabWidth))
+                        {
+                            if (path.IsVisible(pt) == true)
+                                isInTab = true;
+                        }
+                    }
+                }
+                else
+                {
+                    if (pt.X < ClientRect.X)
+                    {
+                        if (CalendarView.TimeLineMultiUserTabOrientation == eOrientation.Vertical)
+                        {
+                            using (GraphicsPath path = GetVTabPath(_TabWidth))
+                            {
+                                if (path.IsVisible(pt) == true)
+                                    isInTab = true;
+                            }
+                        }
+                        else
+                        {
+                            using (GraphicsPath path = GetVTab2Path(_TabWidth))
+                            {
+                                if (path.IsVisible(pt) == true)
+                                    isInTab = true;
+                            }
+                        }
+                    }
+                }
+
+            }
+
+            return (isInTab);
+        }
+
+        #endregion
+
+        #region Mouse support
+
+        #region InternalMouseDown
+
+        /// <summary>
+        /// MouseDown processing
+        /// </summary>
+        /// <param name="objArg">MouseEventArgs</param>
+        public override void InternalMouseDown(MouseEventArgs objArg)
+        {
+            // Pass the event on through
+
+            base.InternalMouseDown(objArg);
+
+            // Check to see if the use is attempting to reorder
+            // the view via MouseDown in the view tab
+
+            Point pt = objArg.Location;
+
+            if (PointInTab(pt) == true)
+            {
+                SelectedItem = null;
+
+                _CalendarView.SelectedOwnerIndex = DisplayedOwnerKeyIndex;
+                
+                if (objArg.Button == MouseButtons.Left)
+                {
+                    if (CalendarView.AllowTabReorder && CalendarView.DisplayedOwners.Count > 1)
+                    {
+                        _IsTabMoving = true;
+                        _LastViewIndex = CalendarView.GetViewIndexFromPoint(pt);
+                    }
+                }
+            }
+            else if (pt.Y >= ClientRect.Y)
+            {
+                _CalendarView.SelectedOwnerIndex = DisplayedOwnerKeyIndex;
+            }
+
+            IsNewCopyDrag = false;
+        }
+
+        #endregion
+
+        #region InternalMouseMove
+
+        /// <summary>
+        /// MouseMove processing
+        /// </summary>
+        /// <param name="objArg"></param>
+        public override void InternalMouseMove(MouseEventArgs objArg)
+        {
+            // Pass the event on through
+
+            base.InternalMouseMove(objArg);
+
+            // If the user has initiated a tab reorder, then
+            // track the tab movement
+
+            if (_IsTabMoving == true)
+            {
+                Point pt = objArg.Location;
+
+                int viewIndex = CalendarView.GetViewIndexFromPoint(pt);
+
+                // If the user has dragged the tab to another view location
+                // then reorder the tabs accordingly
+
+                if (viewIndex >= 0 && viewIndex != _LastViewIndex)
+                {
+                    CalendarView.ReorderViews(_LastViewIndex, viewIndex);
+                    _LastViewIndex = viewIndex;
+                }
+
+                MyCursor = Cursors.SizeAll;
+            }
+        }
+
+        #endregion
+
+        #region InternalMouseUp
+
+        /// <summary>
+        /// MouseUp processing
+        /// </summary>
+        /// <param name="objArg"></param>
+        public override void InternalMouseUp(MouseEventArgs objArg)
+        {
+            base.InternalMouseUp(objArg);
+
+            // Hide our PosWindow if it is visible
+
+            if (_PosWin != null)
+                _PosWin.Hide();
+
+            if (SelectedItem != null)
+            {
+                // DoAppointmentViewChanged
+
+                if (IsMoving == true)
+                {
+                    if (TimeChanged(SelectedItem) == true || OwnerChanged() == true ||
+                        IsCopyDrag == true || IsNewCopyDrag == true)
+                    {
+                        DoViewChanged(SelectedItem, eViewOperation.AppointmentMove);
+                    }
+                }
+                else if (IsResizing == true)
+                {
+                    if (TimeChanged(SelectedItem) == true)
+                        DoViewChanged(SelectedItem, eViewOperation.AppointmentResize);
+                }
+            }
+
+            // Reset our mouse states
+
+            ClearMouseStates();
+        }
+
+        private bool TimeChanged(CalendarItem item)
+        {
+            return (item.StartTime != _oldStartTime || item.EndTime != _oldEndTime);
+        }
+
+        private bool OwnerChanged()
+        {
+            if (OwnerKey != null)
+                return (OwnerKey.Equals(_oldOwnerKey) == false);
+
+            return (false);
+        }
+
+        private void DoViewChanged(CalendarItem item, eViewOperation eop)
+        {
+            if (item.StartTime != _oldStartTime)
+                UpdateReminders(item, _oldStartTime);
+
+            CalendarView.DoAppointmentViewChanged(item, _oldOwnerKey, _oldStartTime, _oldEndTime, eop, _IsNewCopyDrag);
+        }
+
+        /// <summary>
+        /// Clears all mouse related state flags
+        /// </summary>
+        protected void ClearMouseStates()
+        {
+            _IsMouseDown = false;
+            _IsMoving = false;
+            _IsStartResizing = false;
+            _IsEndResizing = false;
+            _IsTabMoving = false;
+            _IsCondMoving = false;
+            _IsCopyDrag = false;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region DragItem
+
+        /// <summary>
+        /// Initiates dragging of a copy of the
+        /// current selectedItem - if the ctrl-key is pressed
+        /// </summary>
+        /// <returns></returns>
+        protected bool DragCopy()
+        {
+            if (CalendarView.EnableDragCopy == true)
+            {
+                if (IsCopyDrag == false && IsNewCopyDrag == false &&
+                    (Control.ModifierKeys & Keys.Control) == Keys.Control)
+                {
+                    AppointmentView av = SelectedItem as AppointmentView;
+
+                    if (av != null)
+                    {
+                        Appointment ap = av.Appointment.Copy();
+
+                        CalendarModel.Appointments.Add(ap);
+
+                        IsNewCopyDrag = true;
+
+                        return (true);
+                    }
+                }
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region UpdateReminders
+
+        /// <summary>
+        /// Updates associated appointment reminders
+        /// after an appointment has been moved
+        /// </summary>
+        protected void UpdateReminders(CalendarItem item, DateTime oldStartTime)
+        {
+            //AppointmentView view = item as AppointmentView;
+
+            //if (view != null)
+            //{
+            //    ReminderCollection rc = view.Appointment.Reminders;
+
+            //    if (rc != null && rc.Count > 0)
+            //    {
+            //        TimeSpan ts = item.StartTime - oldStartTime;
+
+            //        for (int i = 0; i < rc.Count; i++)
+            //            rc[i].ReminderTime = rc[i].ReminderTime.Add(ts);
+            //    }
+            //}
+        }
+
+        #endregion
+
+        #region GetViewAreaFromPoint
+
+        /// <summary>
+        /// Gets the view area under the given mouse
+        /// point (tab, header, content, etc)
+        /// </summary>
+        /// <param name="pt">Point</param>
+        /// <returns>eViewArea</returns>
+        public virtual eViewArea GetViewAreaFromPoint(Point pt)
+        {
+            if (Bounds.Contains(pt) == true)
+            {
+                if (NClientData.TabOrientation == eTabOrientation.Horizontal)
+                {
+                    if (pt.Y < ClientRect.Y)
+                    {
+                        using (GraphicsPath path = GetTabPath(_TabWidth))
+                        {
+                            if (path.IsVisible(pt) == true)
+                                return (eViewArea.InTab);
+                        }
+                    }
+                }
+                else
+                {
+                    if (pt.X < ClientRect.X)
+                    {
+                        using (GraphicsPath path = GetTabPath(_TabWidth))
+                        {
+                            if (path.IsVisible(pt) == true)
+                                return (eViewArea.InTab);
+                        }
+                    }
+                }
+            }
+
+            return (eViewArea.NotInView);
+        }
+
+        #endregion
+
+        #region GetDateSelectionFromPoint
+
+        /// <summary>
+        /// Gets the date selection from the given point. The startDate
+        /// and endDate will vary based upon the view type (WeekDay / Month)
+        /// </summary>
+        /// <param name="pt">Point in question</param>
+        /// <param name="startDate">out start date</param>
+        /// <param name="endDate">out end date</param>
+        /// <returns>True if a valid selection exists
+        /// at the given point</returns>
+        public virtual bool GetDateSelectionFromPoint(
+            Point pt, out DateTime startDate, out DateTime endDate)
+        {
+            startDate = new DateTime();
+            endDate = new DateTime();
+
+            return (false);
+        }
+
+        #endregion
+
+        #region GetAppointmentView
+
+        /// <summary>
+        /// Gets the appointment view created for an appointment in this view
+        /// </summary>
+        /// <param name="appointment">The appointment</param>
+        /// <returns>Reference to AppointmentView or null if no view is found</returns>
+        public virtual AppointmentView GetAppointmentView(Appointment appointment)
+        {
+            for (int i = 0; i < SubItems.Count; i++)
+            {
+                AppointmentView view = SubItems[i] as AppointmentView;
+
+                if (view != null)
+                {
+                    if (view.Appointment == appointment)
+                        return (view);
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetAppointmentViewFromPoint
+
+        /// <summary>
+        /// Gets the appointment view created for an appointment in this view
+        /// </summary>
+        /// <param name="appointment">The appointment</param>
+        /// <returns>Reference to AppointmentView or null if no view is found</returns>
+        public virtual AppointmentView GetAppointmentViewFromPoint(Point pt)
+        {
+            for (int i = 0; i < SubItems.Count; i++)
+            {
+                AppointmentView view = SubItems[i] as AppointmentView;
+
+                if (view != null)
+                {
+                    if (view.Bounds.Contains(pt))
+                        return (view);
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+
+        #region CustomCalendarItem
+
+        /// <summary>
+        /// Gets the CustomCalendarItem created for this view
+        /// </summary>
+        /// <returns>Reference to CustomCalendarItem or null if none found</returns>
+        public virtual CustomCalendarItem GetCustomCalendarItem(CustomCalendarItem item)
+        {
+            if (item.BaseCalendarItem != null)
+                item = item.BaseCalendarItem;
+
+            for (int i = 0; i < SubItems.Count; i++)
+            {
+                CustomCalendarItem view = SubItems[i] as CustomCalendarItem;
+
+                if (view != null)
+                {
+                    if (view == item || view.BaseCalendarItem == item)
+                        return (view);
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region Invalidate routines
+
+        /// <summary>
+        /// Invalidates the given rectangle
+        /// </summary>
+        internal void InvalidateRect()
+        {
+            InvalidateRect(ClientRect, false);
+        }
+
+        /// <summary>
+        /// Invalidates the entire calendar
+        /// bounding rect area
+        /// </summary>
+        /// <param name="needRecalc">NeedRecalcSize flag</param>
+        internal void InvalidateRect(bool needRecalc)
+        {
+            InvalidateRect(ClientRect, needRecalc);
+        }
+
+        /// <summary>
+        /// Invalidates the entire calendar
+        /// bounding rect area
+        /// </summary>
+        internal void InvalidateRect(Rectangle rect)
+        {
+            InvalidateRect(rect, false);
+        }
+
+        /// <summary>
+        /// Invalidates the given rectangle
+        /// </summary>
+        /// <param name="rect">Rectangle to invalidate</param>
+        /// <param name="needRecalc">NeedRecalcSize flag</param>
+        internal void InvalidateRect(Rectangle rect, bool needRecalc)
+        {
+            Control c = (Control)this.GetContainerControl(true);
+
+            if (c != null)
+            {
+                rect.Height += 0;
+                rect.Width += 0;
+
+                if (rect.Bottom >= ClientRect.Bottom)
+                    rect.Width += 0;
+
+                c.Invalidate(rect);
+            }
+
+            if (needRecalc == true)
+                this.NeedRecalcSize = true;
+        }
+
+        #endregion
+
+        #region ResetView
+
+        /// <summary>
+        /// Disconnects and resets the Model connection
+        /// </summary>
+        internal virtual void ResetView()
+        {
+            if (_Connector != null)
+            {
+                // Disconnect the Model
+
+                _Connector.Disconnect();
+                _Connector = null;
+
+                // Reset our selected item
+
+                SelectedItem = null;
+            }
+
+            DateRangeChanged = false;
+
+            NeedRecalcLayout = true;
+            NeedRecalcSize = true;
+        }
+
+        #endregion
+
+        #region ReloadView
+
+        internal void ReloadView()
+        {
+            if (CalendarModel != null)
+            {
+                CalendarModel.BeginUpdate();
+                CalendarModel.EndUpdate();
+            }
+        }
+
+        #endregion
+
+        #region SetSelectedItem
+
+        /// <summary>
+        /// Sets the current selected item
+        /// </summary>
+        /// <param name="pci">Previously selected CalendarItem</param>
+        /// <param name="nci">New CalendarItem to select</param>
+        /// <returns>Base selected CalendarItem</returns>
+        protected virtual CalendarItem SetSelectedItem(CalendarItem pci, CalendarItem nci)
+        {
+            return (null);
+        }
+
+        #endregion
+
+        #region UpdateDateSelection
+
+        /// <summary>
+        /// Updates each monthWeeks DayRects to reflect
+        /// the date selection start and end values
+        /// </summary>
+        protected virtual void UpdateDateSelection()
+        {
+        }
+
+        internal void SetDateSelection(DateTime dateStart, DateTime dateEnd)
+        {
+            UpdateDateSelection();
+        }
+
+        #endregion
+
+        #region AutoSyncViewDate
+
+        /// <summary>
+        /// AutoSync our view start date
+        /// </summary>
+        /// <param name="syncView"></param>
+        protected void AutoSyncViewDate(eCalendarView syncView)
+        {
+            if (CalendarView.AutoSyncViewDates == true)
+            {
+                if (CalendarView.AutoSyncDate != DateTime.MinValue)
+                {
+                    DateTime syncDate = CalendarView.AutoSyncDate;
+
+                    CalendarView.ShowViewDate(this.ECalendarView, syncDate);
+
+                    CalendarView.AutoSyncDate = syncDate;
+                }
+            }
+        }
+
+        #endregion
+
+        #region ExtendSelection
+
+        /// <summary>
+        /// Extends the selection if the shift-key
+        /// is pressed with selection
+        /// </summary>
+        /// <param name="startDate"></param>
+        /// <param name="endDate"></param>
+        protected void ExtendSelection(ref DateTime startDate, ref DateTime endDate)
+        {
+            if (DateSelectionAnchor.HasValue == false ||
+                ((Control.ModifierKeys & Keys.Shift) != Keys.Shift))
+            {
+                DateSelectionAnchor = startDate;
+            }
+            else
+            {
+                if (DateSelectionAnchor < startDate)
+                    startDate = DateSelectionAnchor.Value;
+
+                else
+                {
+                    DateTime anchorEnd = DateSelectionAnchor.Value.Add(endDate - startDate);
+
+                    if (anchorEnd > endDate)
+                        endDate = anchorEnd;
+                }
+            }
+
+            CalendarView.AutoSyncDate = startDate;
+        }
+
+        #endregion
+
+        #region ValidDateSelection
+
+        protected bool ValidDateSelection()
+        {
+            if (DateSelectionStart.HasValue && DateSelectionEnd.HasValue)
+            {
+                if (DateSelectionAnchor.HasValue == false)
+                    DateSelectionAnchor = DateSelectionStart;
+
+                return (DateSelectionStart <= DateSelectionEnd);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region PosWindow support
+
+        /// <summary>
+        /// Pos window update
+        /// </summary>
+        protected void UpdatePosWin(Rectangle viewRect)
+        {
+            if (IsStartResizing || IsEndResizing || IsMoving)
+            {
+                // Only display if the Alt key is pressed
+
+                if ((Control.ModifierKeys & Keys.Alt) == Keys.Alt)
+                {
+                    // Allocate our pos window if not
+                    // previously allocated
+
+                    if (PosWin == null)
+                    {
+                        PosWin = new PosWin(this);
+                        PosWin.Size = new Size(1, 1);
+
+                        Control c = (Control)this.GetContainerControl(true);
+
+                        if (c != null)
+                            PosWin.Owner = c.FindForm();
+                    }
+
+                    PosWin.UpdateWin(viewRect);
+                }
+                else
+                {
+                    if (PosWin != null)
+                        PosWin.Hide();
+                }
+            }
+        }
+
+        #endregion
+
+        #region GetIndicatorRect
+
+        internal virtual Rectangle GetIndicatorRect(TimeIndicator ti)
+        {
+            return (Rectangle.Empty);
+        }
+
+        internal virtual Rectangle GetIndicatorRect(TimeIndicator ti, DateTime time)
+        {
+            return (Rectangle.Empty);
+        }
+
+
+        #endregion
+
+        #region InternalKeyUp
+
+        internal virtual void InternalKeyUp(KeyEventArgs e)
+        {
+        }
+
+        #endregion
+
+        #region Copy implementation
+
+        /// <summary>
+		/// Returns copy of the item.
+		/// </summary>
+        public override BaseItem Copy()
+        {
+            BaseView objCopy = new BaseView(_CalendarView, _ECalendarView);
+            CopyToItem(objCopy);
+
+            return (objCopy);
+        }
+
+        /// <summary>
+		/// Copies the BaseView specific properties to new instance of the item.
+		/// </summary>
+		/// <param name="copy">New BaseView instance</param>
+        protected override void CopyToItem(BaseItem copy)
+        {
+            BaseView objCopy = copy as BaseView;
+
+            if (objCopy != null)
+            {
+                base.CopyToItem(objCopy);
+
+                objCopy._DateSelectionStart = this._DateSelectionStart;
+                objCopy._DateSelectionEnd = this._DateSelectionEnd;
+                objCopy._DisplayName = this._DisplayName;
+                objCopy._EndDate = this._EndDate;
+                objCopy._StartDate = this._StartDate;
+            }
+        }
+
+        #endregion
+  
+        #region IDisposable Members
+
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing == true && IsDisposed == false)
+            {
+                ResetView();
+                HookEvents(false);
+            }
+
+            base.Dispose(disposing);
+        }
+
+        #endregion
+    }
+
+    #region enums
+
+    public enum eViewArea
+    {
+        NotInView,
+
+        InTab,
+        InContent,
+        InAllDayPanel,
+        InDayOfWeekHeader,
+        InWeekHeader,
+        InSideBarPanel,
+        InIntervalHeader,
+        InPeriodHeader,
+        InCondensedView,
+        InMonthHeader
+    }
+
+    public enum eTabOrientation
+    {
+        Vertical,
+        Horizontal,
+    }
+
+    #endregion
+
+    #region EventsArgs
+    /// <summary>
+    /// SelectedItemChangedEventArgs
+    /// </summary>
+    public class SelectedItemChangedEventArgs : ValueChangedEventArgs<CalendarItem, CalendarItem>
+    {
+        public SelectedItemChangedEventArgs(CalendarItem oldValue, CalendarItem newValue)
+            : base(oldValue, newValue)
+        {
+        }
+    }
+
+    /// <summary>
+    /// CalendarColorChangedEventArgs
+    /// </summary>
+    public class CalendarColorChangedEventArgs : ValueChangedEventArgs<eCalendarColor, eCalendarColor>
+    {
+        public CalendarColorChangedEventArgs(eCalendarColor oldValue, eCalendarColor newValue)
+            : base(oldValue, newValue)
+        {
+        }
+    }
+
+    #endregion
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/CalendarItem.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/CalendarItem.cs
new file mode 100644
index 00000000..f903f26a
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/CalendarItem.cs	
@@ -0,0 +1,420 @@
+#if FRAMEWORK20
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Windows.Forms;
+using DevComponents.Schedule.Model;
+
+namespace DevComponents.DotNetBar.Schedule
+{
+    public class CalendarItem : PopupItem
+    {
+        #region enums
+
+        public enum eHitArea
+        {
+            None,
+            Move,
+            LeftResize,
+            RightResize,
+            TopResize,
+            BottomResize
+        }
+
+        #endregion
+
+        #region Events
+
+        /// <summary>
+        /// Occurs when CategoryColor has changed
+        /// </summary>
+        [Description("Occurs when the CategoryColor property has changed.")]
+        public event EventHandler<EventArgs> CategoryColorChanged;
+
+        /// <summary>
+        /// Occurs when StartTime has Changed
+        /// </summary>
+        public event EventHandler StartTimeChanged;
+
+        /// <summary>
+        /// Occurs when EndTime has Changed
+        /// </summary>
+        public event EventHandler EndTimeChanged;
+
+        /// <summary>
+        /// Occurs when IsSelected has Changed
+        /// </summary>
+        public event EventHandler IsSelectedChanged;
+
+        /// <summary>
+        /// Occurs when CollateId has Changed
+        /// </summary>
+        public event EventHandler CollateIdChanged;
+
+        #endregion
+
+        #region Private variables
+
+        private DateTime _StartTime;        // Start time
+        private DateTime _EndTime;          // End time
+        private string _CategoryColor;      // CategoryColor
+
+        private int _CollateId = -1;
+
+        private object _ModelItem;          // Model item
+        private object _RootItem;           // Root model item
+        private bool _IsRecurring;          // Is recurring
+        private bool _IsSelected;           // Is selected
+
+        private eHitArea _HitArea = eHitArea.None;
+        private DateTime _LastMouseDown = DateTime.MinValue;
+
+        private uint _RefreshCount;
+
+        #endregion
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        public CalendarItem()
+        {
+            // Set our default Model item
+
+            _ModelItem = this;
+
+            MouseUpNotification = true;
+
+            SetIsContainer(true);
+        }
+
+        #region Public properties
+
+        #region CollateId
+
+        /// <summary>
+        /// Gets or sets the CollateId used for TimeLine row collation.
+        /// </summary>
+        public virtual int CollateId
+        {
+            get { return (_CollateId); }
+
+            set
+            {
+                if (_CollateId != value)
+                {
+                    _CollateId = value;
+
+                    OnCollateIdChanged();
+                }
+            }
+        }
+
+        protected virtual void OnCollateIdChanged()
+        {
+            if (CollateIdChanged != null)
+                CollateIdChanged(this, new EventArgs());
+
+            this.Refresh();
+        }
+
+        #endregion
+
+        #region StartTime
+
+        /// <summary>
+        /// Gets or sets the CalendarItem Start time.
+        /// </summary>
+        public virtual DateTime StartTime
+        {
+            get { return (_StartTime); }
+
+            set
+            {
+                if (_StartTime != value)
+                {
+                    _StartTime = value;
+
+                    OnStartTimeChanged();
+                }
+            }
+        }
+
+        protected virtual void OnStartTimeChanged()
+        {
+            if (StartTimeChanged != null)
+                StartTimeChanged(this, new EventArgs());
+
+            this.Refresh();
+        }
+
+        #endregion
+
+        #region EndTime
+
+        /// <summary>
+        /// Gets or sets the CalendarItem End time.
+        /// </summary>
+        public virtual DateTime EndTime
+        {
+            get { return (_EndTime); }
+
+            set
+            {
+                if (_EndTime != value)
+                {
+                    _EndTime = value;
+
+                    OnEndTimeChanged();
+                }
+            }
+        }
+
+        protected virtual void OnEndTimeChanged()
+        {
+            if (EndTimeChanged != null)
+                EndTimeChanged(this, new EventArgs());
+
+            this.Refresh();
+        }
+
+        #endregion
+
+        #region CategoryColor
+
+        /// <summary>
+        /// Gets or sets the category color used for TimeLine CondensedView markers.
+        /// Use static members on Appointment class to assign the category color for example Appointment.CategoryRed.
+        /// </summary>
+        public virtual string CategoryColor
+        {
+            get { return (_CategoryColor); }
+
+            set
+            {
+                if (_CategoryColor == null || _CategoryColor.Equals(value) == false)
+                {
+                    string oldValue = _CategoryColor;
+                    _CategoryColor = value;
+
+                    OnCategoryColorChanged(oldValue, value);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Sends ChangedEvent for the CategoryColor property
+        /// </summary>
+        /// <param name="oldValue">Old CategoryColor</param>
+        /// <param name="newValue">New CategoryColor</param>
+        protected virtual void OnCategoryColorChanged(string oldValue, string newValue)
+        {
+            if (CategoryColorChanged != null)
+                CategoryColorChanged(this, new CategoryColorChangedEventArgs(oldValue, newValue));
+        }
+
+        #endregion
+
+        #region ModelItem
+
+        /// <summary>
+        /// Gets and sets the Model item
+        /// </summary>
+        public object ModelItem
+        {
+            get { return (_ModelItem); }
+            set { _ModelItem = value; }
+        }
+
+        #endregion
+
+        #region RootItem
+
+        /// <summary>
+        /// Gets and sets the Root Model item
+        /// </summary>
+        public object RootItem
+        {
+            get { return (_RootItem); }
+            set { _RootItem = value; }
+        }
+
+        #endregion
+
+        #region IsRecurring
+
+        /// <summary>
+        /// Gets and sets the IsRecurring item status
+        /// </summary>
+        public bool IsRecurring
+        {
+            get { return (_IsRecurring); }
+            set { _IsRecurring = value; }
+        }
+
+        #endregion
+
+        #region IsSelected
+
+        /// <summary>
+        /// Gets and sets the selection state
+        /// </summary>
+        public virtual bool IsSelected
+        {
+            get { return (_IsSelected); }
+
+            set
+            {
+                if (_IsSelected != value)
+                {
+                    _IsSelected = value;
+
+                    Control c = this.ContainerControl as Control;
+
+                    if (c != null)
+                    {
+                        Rectangle r = Bounds;
+                        r.Inflate(4, 4);
+
+                        c.Invalidate(r);
+                    }
+
+                    Appointment ap = ModelItem as Appointment;
+
+                    if (ap != null)
+                        ap.IsSelected = value;
+
+                    OnIsSelectedChanged();
+                }
+            }
+        }
+
+        private void OnIsSelectedChanged()
+        {
+            if (IsSelectedChanged != null)
+                IsSelectedChanged(this, new EventArgs());
+        }
+
+        #endregion
+
+        #region HitArea
+
+        /// <summary>
+        /// Gets and sets the last hit area
+        /// </summary>
+        public eHitArea HitArea
+        {
+            get { return (_HitArea); }
+            set { _HitArea = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        internal uint RefreshCount
+        {
+            get { return (_RefreshCount); }
+            set { _RefreshCount = value; }
+        }
+
+        #endregion
+
+        #region Mouse support
+
+        /// <summary>
+        /// Handles control MouseDown events
+        /// </summary>
+        /// <param name="objArg">MouseEventArgs</param>
+        public override void InternalMouseDown(MouseEventArgs objArg)
+        {
+            base.InternalMouseDown(objArg);
+
+            if (objArg.Button == MouseButtons.Left)
+            {
+                if (IsSimpleMouseDown())
+                    this.IsSelected = true;
+
+                InternalMouseMove(objArg);
+
+                _LastMouseDown = DateTime.Now;
+            }
+        }
+
+        /// <summary>
+        /// Determines if it is a simple, single-click MouseDown
+        /// </summary>
+        /// <returns></returns>
+        private bool IsSimpleMouseDown()
+        {
+            return (_LastMouseDown == DateTime.MinValue ||
+                    _LastMouseDown != DateTime.MinValue &&
+                    DateTime.Now.Subtract(_LastMouseDown).TotalMilliseconds > SystemInformation.DoubleClickTime);
+        }
+
+        #endregion
+
+        #region RecalcSize
+
+        public override void RecalcSize()
+        {
+        }
+
+        #endregion
+
+        #region Paint
+
+        public override void Paint(ItemPaintArgs p)
+        {
+        }
+
+        #endregion
+
+        #region IsMarkupSupported
+
+        /// <summary>
+        /// IsMarkupSupported
+        /// </summary>
+        protected override bool IsMarkupSupported
+        {
+            get { return (true); }
+        }
+
+        #endregion
+
+        #region Copy object
+
+        /// <summary>
+        /// Returns copy of the item.
+        /// </summary>
+        public override BaseItem Copy()
+        {
+            CalendarItem objCopy = new CalendarItem();
+            CopyToItem(objCopy);
+
+            return (objCopy);
+        }
+
+        /// <summary>
+        /// Copies the CalendarItem specific properties to new instance of the item.
+        /// </summary>
+        /// <param name="copy">New CalendarItem instance</param>
+        protected override void CopyToItem(BaseItem copy)
+        {
+            CalendarItem objCopy = copy as CalendarItem;
+
+            if (objCopy != null)
+            {
+                base.CopyToItem(objCopy);
+
+                objCopy._StartTime = this._StartTime;
+                objCopy._EndTime = this._EndTime;
+            }
+        }
+
+        #endregion
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/CalendarView.ico b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/CalendarView.ico
new file mode 100644
index 00000000..6b06e7ec
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/CalendarView.ico differ
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/CalendarView/CalendarPanel.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/CalendarView/CalendarPanel.cs
new file mode 100644
index 00000000..250b561b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/CalendarView/CalendarPanel.cs	
@@ -0,0 +1,1339 @@
+#if FRAMEWORK20
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.ScrollBar;
+using DevComponents.DotNetBar.Touch;
+
+namespace DevComponents.DotNetBar.Schedule
+{
+    public class CalendarPanel : BaseItem
+    {
+        #region Private variables
+
+        private CalendarView _CalendarView;         // Associated CalendarView
+
+        private HScrollBarAdv _HScrollBar;          // Horizontal scroll bar
+        private int _HScrollPos;
+        private int _HsMaximum;
+
+        private VScrollBarAdv _VScrollBar;          // Vertical scroll bar
+        private int _VScrollPos;
+        private int _VsMaximum;
+
+        private Size _AutoScrollMinSize = Size.Empty;
+        private Point _AutoScrollPosition = Point.Empty;
+
+        private TouchHandler _TouchHandler;
+        private Rectangle _InnerBounds;
+
+        private HScrollBarAdv _AHScrollBar;         // Active Horizontal scroll bar
+        private VScrollBarAdv _AVScrollBar;         // Active Vertical scroll bar
+
+        #endregion
+
+        /// <summary>
+        /// This is the main container panel for all
+        /// BaseView and TimeRulerPanel objects
+        /// </summary>
+        /// <param name="calendarView">CalendarView</param>
+        public CalendarPanel(CalendarView calendarView)
+        {
+            _CalendarView = calendarView;
+
+            SetIsContainer(true);
+
+            _CalendarView.SelectedViewChanged += _CalendarView_SelectedViewChanged;
+
+            if (BarFunctions.IsWindows7 && TouchHandler.IsTouchEnabled)
+            {
+                _TouchHandler = new TouchHandler(_CalendarView, eTouchHandlerType.Gesture);
+
+                _TouchHandler.PanBegin += TouchHandlerPanBegin;
+                _TouchHandler.Pan += TouchHandlerPan;
+                _TouchHandler.PanEnd += TouchHandlerPanEnd;
+            }
+        }
+
+        #region Internal properties
+
+        #region AutoScrollMinSize
+
+        internal Size AutoScrollMinSize
+        {
+            get { return (_AutoScrollMinSize); }
+
+            set
+            {
+                _AutoScrollMinSize = value;
+
+                RecalcSize();
+            }
+        }
+
+        #endregion
+
+        #region AutoScrollPosition
+
+        internal Point AutoScrollPosition
+        {
+            get
+            {
+                Point pt = Point.Empty;
+
+                if (_AHScrollBar != null && _AHScrollBar.Visible == true)
+                    pt.X = _AHScrollBar.Value * _CalendarView.TimeLineColumnWidth;
+
+                if (_AVScrollBar != null && _AVScrollBar.Visible == true)
+                    pt.Y = _AVScrollBar.Value;
+
+                return (pt);
+            }
+
+            set
+            {
+                if (_CalendarView.SelectedView == eCalendarView.TimeLine)
+                {
+                    if (_CalendarView.TimeLineColumnWidth > 0)
+                        value.X /= _CalendarView.TimeLineColumnWidth;
+                }
+
+                if (_AHScrollBar != null && _AHScrollBar.Visible == true)
+                {
+                    if (value.X != _AHScrollBar.Value)
+                    {
+                        _AHScrollBar.Value =
+                            Math.Min(_AHScrollBar.Maximum,
+                            Math.Max(_AHScrollBar.Minimum, value.X));
+                    }
+                }
+
+                if (_AVScrollBar != null && _AVScrollBar.Visible == true)
+                {
+                    if (value.Y != _AVScrollBar.Value)
+                    {
+                        _AVScrollBar.Value =
+                            Math.Min(_AVScrollBar.Maximum,
+                            Math.Max(_AVScrollBar.Minimum, value.Y));
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region AHScrollBar
+
+        internal HScrollBarAdv AHScrollBar
+        {
+            get { return (_AHScrollBar); }
+            set { _AHScrollBar = value; }
+        }
+
+        #endregion
+
+        #region AVScrollBar
+
+        internal VScrollBarAdv AVScrollBar
+        {
+            get { return (_AVScrollBar); }
+            set { _AVScrollBar = value; }
+        }
+
+        #endregion
+
+        #region Checkit
+
+        internal bool Checkit
+        {
+            get { return (m_CheckMouseMovePressed); }
+            set { m_CheckMouseMovePressed = value; }
+        }
+
+        #endregion
+
+        #region HScrollBar
+
+        internal HScrollBarAdv HScrollBar
+        {
+            get { return (_HScrollBar); }
+        }
+
+        #endregion
+
+        #region InnerBounds
+
+        internal Rectangle InnerBounds
+        {
+            get { return (_InnerBounds); }
+        }
+
+        #endregion
+
+        #region VScrollBar
+
+        internal VScrollBarAdv VScrollBar
+        {
+            get { return (_VScrollBar); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Event processing
+
+        /// <summary>
+        /// Handles SelectedView changes
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void _CalendarView_SelectedViewChanged(object sender, SelectedViewEventArgs e)
+        {
+            if (e.OldValue == eCalendarView.TimeLine)
+            {
+                if (_AVScrollBar != null)
+                    _AVScrollBar.Visible = false;
+            }
+
+            if (e.NewValue == eCalendarView.TimeLine)
+            {
+                if (_HScrollBar != null)
+                    _HScrollBar.Visible = false;
+            }
+
+            switch (e.NewValue)
+            {
+                case eCalendarView.TimeLine:
+                    AVScrollBar = VScrollBar;
+                    AHScrollBar = _CalendarView.TimeLineHScrollPanel.ScrollBar;
+                    break;
+
+                case eCalendarView.Day:
+                case eCalendarView.Week:
+                    AVScrollBar = _CalendarView.WeekDayVScrollBar;
+                    AHScrollBar = HScrollBar;
+                    break;
+
+                case eCalendarView.Year:
+                    AVScrollBar = _CalendarView.YearVScrollPanel.ScrollBar;
+                    AHScrollBar = HScrollBar;
+                    break;
+
+                default:
+                    AVScrollBar = null;
+                    AHScrollBar = null;
+                    break;
+            }
+
+            Size asMinSize = Size.Empty;
+
+            if (_AVScrollBar != null && _AVScrollBar.Visible == true)
+                asMinSize.Height = _AVScrollBar.Maximum;
+
+            if (_AHScrollBar != null && _AHScrollBar.Visible == true)
+            {
+                asMinSize.Width = _AHScrollBar.Maximum;
+
+                if (e.NewValue == eCalendarView.TimeLine)
+                    asMinSize.Width *= _CalendarView.TimeLineColumnWidth;
+            }
+
+            _AutoScrollMinSize = asMinSize;
+        }
+
+        #endregion
+
+        #region RecalcSize
+
+        /// <summary>
+        /// Performs object recalc processing
+        /// </summary>
+        public override void RecalcSize()
+        {
+            _InnerBounds = Bounds;
+
+            if (SubItems.Count > 0)
+            {
+                if (Bounds.Width > 0 && Bounds.Height > 0)
+                {
+                    switch (_CalendarView.SelectedView)
+                    {
+                        case eCalendarView.Day:
+                        case eCalendarView.Week:
+                            RecalcWeekDay();
+                            break;
+
+                        case eCalendarView.Month:
+                            RecalcMonth();
+                            break;
+
+                        case eCalendarView.Year:
+                            RecalcYear();
+                            break;
+
+                        case eCalendarView.TimeLine:
+                            RecalcTimeLine();
+                            break;
+                    }
+
+                    base.RecalcSize();
+                }
+            }
+        }
+
+        #region RecalcWeekDay
+
+        /// <summary>
+        /// Recalculates all WeekDay views
+        /// </summary>
+        private void RecalcWeekDay()
+        {
+            // Calculate the necessary params for calculating
+            // the divided width for each subItems in our panel
+
+            int trWidth = 0;
+            int vsWidth = 0;
+
+            int vCount = SubItems.Count;
+
+            if (SubItems[0] is VScrollPanel)
+            {
+                vCount--;
+                vsWidth = _CalendarView.VsWidth;
+
+                if (SubItems[1] is TimeRulerPanel)
+                {
+                    vCount--;
+                    trWidth = _CalendarView.TimeRulerWidth;
+                }
+            }
+
+            // Configure the subItems based upon the
+            // previously calculated display params
+
+            if (vCount > 0)
+                ConfigureWeekDayItems(vCount, trWidth, vsWidth);
+
+            _InnerBounds.X += trWidth;
+            _InnerBounds.Width -= (trWidth + vsWidth);
+
+            _InnerBounds.Y += _CalendarView.WeekDayVScrollBar.Location.Y;
+            _InnerBounds.Height -= _InnerBounds.Y;
+        }
+
+        #region ConfigureWeekDayItems
+
+        /// <summary>
+        /// Configures the CalendarPanel subItems
+        /// </summary>
+        /// <param name="vCount">View count</param>
+        /// <param name="trWidth">TimeRuler width</param>
+        /// <param name="vsWidth">Vert Scrollbar width</param>
+        private void ConfigureWeekDayItems(int vCount, int trWidth, int vsWidth)
+        {
+            Rectangle r = Bounds;
+
+            // Calculate our default viewWidth
+
+            int bvWidth = Bounds.Width - (trWidth + vsWidth);
+            float viewWidth = (float)bvWidth / vCount;
+
+            // Sync our current item params with our current
+            // horizontal scrollBar states
+
+            ConfigDhScrollBar(ref r,
+                ref viewWidth, vCount, trWidth, vsWidth);
+
+            // If we have a TimRulerPanel, then
+            // set it's location and size
+
+            if (trWidth > 0)
+            {
+                r.X = Bounds.X;
+                r.Width = trWidth;
+
+                SubItems[1].Bounds = r;
+                SubItems[1].RecalcSize();
+            }
+
+            // Loop through each BaseView item,
+            // setting it's location and size 
+
+            _CalendarView.StartSlice = -1;
+            _CalendarView.NumberOfSlices = 0;
+
+            float fxPos = Bounds.X + trWidth + _HScrollPos;
+            BaseView view = null;
+
+            int n = vCount;
+
+            for (int i = 0; i < SubItems.Count; i++)
+            {
+                if (SubItems[i] is BaseView)
+                {
+                    r.X = (int)fxPos;
+                    fxPos += viewWidth;
+
+                    r.Width = (int)(fxPos - r.X - (--n > 0 ? 2 : 0));
+
+                    SubItems[i].Bounds = r;
+                    SubItems[i].Displayed = r.IntersectsWith(Bounds);
+
+                    if (SubItems[i].Displayed == true)
+                    {
+                        view = SubItems[i] as BaseView;
+
+                        if (view != null)
+                        {
+                            view.NeedRecalcLayout = true;
+                            view.RecalcSize();
+                        }
+                    }
+                }
+            }
+
+            // If we need to align the WorkDay times, then
+            // make sure all displayed WeekDay views are kept in sync
+
+            if (_CalendarView.ShowOnlyWorkDayHours == true && _CalendarView.IsMultiCalendar == true)
+            {
+                for (int i = 0; i < SubItems.Count; i++)
+                {
+                    WeekDayView wv = SubItems[i] as WeekDayView;
+
+                    if (wv != null && wv.Displayed == true)
+                    {
+                        if (wv.LocalStartSlice != _CalendarView.StartSlice ||
+                            wv.LocalNumberOfSlices != _CalendarView.NumberOfSlices)
+                        {
+                            wv.NeedRecalcLayout = true;
+                            wv.RecalcSize();
+                        }
+                    }
+                }
+            }
+
+            // If we have a VScrollPanel, then
+            // set it's location and size
+
+            if (vsWidth > 0)
+            {
+                r.X = Bounds.Right - vsWidth;
+                r.Width = vsWidth;
+
+                int delta = _CalendarView.AllDayPanelHeight;
+
+                r.Y = delta;
+                r.Height = 50;
+
+                if (view != null)
+                {
+                    r.Y += view.ClientRect.Y + view.DayOfWeekHeaderHeight;
+                    r.Height = Math.Max(r.Height, view.ClientRect.Height - (delta + view.DayOfWeekHeaderHeight));
+                }
+
+                SubItems[0].Bounds = r;
+                SubItems[0].RecalcSize();
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RecalcMonth
+
+        /// <summary>
+        /// Recalculates Month views
+        /// </summary>
+        private void RecalcMonth()
+        {
+            // Configure the subItems based upon the
+            // previously calculated display params
+
+            ConfigureMonthItems(SubItems.Count);
+        }
+
+        #region ConfigureMonthItems
+
+        /// <summary>
+        /// Configures the CalendarPanel subItems
+        /// </summary>
+        /// <param name="vCount">View count</param>
+        private void ConfigureMonthItems(int vCount)
+        {
+            Rectangle r = Bounds;
+
+            // Calculate our default viewWidth
+
+            float viewWidth = (float)Bounds.Width / vCount;
+
+            // Sync our current item params with our current
+            // horizontal scrollBar states
+
+            ConfigDhScrollBar(ref r, ref viewWidth, vCount, 0, 0);
+
+            // Loop through each BaseView item,
+            // setting it's location and size 
+
+            float fxPos = Bounds.X + _HScrollPos;
+            int n = vCount;
+
+            for (int i = 0; i < SubItems.Count; i++)
+            {
+                if (SubItems[i] is BaseView)
+                {
+                    r.X = (int)fxPos;
+                    fxPos += viewWidth;
+
+                    r.Width = (int)(fxPos - r.X - (--n > 0 ? 2 : 0));
+
+                    SubItems[i].Bounds = r;
+                    SubItems[i].Displayed = r.IntersectsWith(Bounds);
+
+                    if (SubItems[i].Displayed == true)
+                    {
+                        BaseView view = SubItems[i] as BaseView;
+
+                        if (view != null)
+                        {
+                            view.NeedRecalcLayout = true;
+                            view.RecalcSize();
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RecalcYear
+
+        /// <summary>
+        /// Recalculates all Year views
+        /// </summary>
+        private void RecalcYear()
+        {
+            // Calculate the necessary params for calculating
+            // the divided width for each subItems in our panel
+
+            int vsWidth = 0;
+
+            int vCount = SubItems.Count;
+
+            if (SubItems[0] is VScrollPanel)
+            {
+                vCount--;
+                vsWidth = _CalendarView.VsWidth;
+            }
+
+            // Configure the subItems based upon the
+            // previously calculated display params
+
+            if (vCount > 0)
+                ConfigureYearItems(vCount, vsWidth);
+
+            _InnerBounds.Y = _CalendarView.YearVScrollPanel.ScrollBar.Location.Y;
+            _InnerBounds.Height -= _InnerBounds.Y;
+
+        }
+
+        #region ConfigureYearItems
+
+        /// <summary>
+        /// Configures the CalendarPanel subItems
+        /// </summary>
+        /// <param name="vCount">View count</param>
+        /// <param name="vsWidth">Vert Scrollbar width</param>
+        private void ConfigureYearItems(int vCount, int vsWidth)
+        {
+            Rectangle r = Bounds;
+
+            // Calculate our default viewWidth
+
+            int bvWidth = Bounds.Width;
+            float viewWidth = (float) bvWidth/vCount;
+
+            // Sync our current item params with our current
+            // horizontal scrollBar states
+
+            ConfigDhScrollBar(ref r, ref viewWidth, vCount, 0, vsWidth);
+
+            // Locate and calculate the default size of our YearView
+
+            BaseView view = null;
+
+            for (int i = 0; i < SubItems.Count; i++)
+            {
+                view = SubItems[i] as BaseView;
+
+                if (view != null)
+                {
+                    Rectangle t = r;
+                    t.Width = (int) viewWidth;
+
+                    SubItems[i].Bounds = t;
+
+                    view.NeedRecalcLayout = true;
+                    view.RecalcSize();
+
+                    break;
+                }
+            }
+
+            if (view != null)
+            {
+                // If we have a VScrollPanel, then
+                // set it's location and size
+
+                if (vsWidth > 0)
+                {
+                    if (_CalendarView.YearViewMax + 1 == view.ClientRect.Height)
+                    {
+                        SubItems[0].Visible = false;
+                        ((VScrollPanel)SubItems[0]).DisableScrollBar();
+                    }
+                    else
+                    {
+                        bvWidth = Bounds.Width - vsWidth;
+                        viewWidth = (float)bvWidth / vCount;
+
+                        r = Bounds;
+                        ConfigDhScrollBar(ref r, ref viewWidth, vCount, 0, vsWidth);
+
+                        Rectangle t = r;
+                        t.Y += view.ClientRect.Y;
+                        t.Height = Math.Max(50, view.ClientRect.Height);
+
+                        t.X = Bounds.Right - vsWidth;
+                        t.Width = vsWidth;
+
+                        SubItems[0].Bounds = t;
+                        SubItems[0].RecalcSize();
+                        SubItems[0].Visible = true;
+                    }
+                }
+
+                // Loop through each BaseView item,
+                // setting it's location and size
+
+                float fxPos = Bounds.X + _HScrollPos;
+                int n = vCount;
+
+                for (int i = 0; i < SubItems.Count; i++)
+                {
+                    if (SubItems[i] is BaseView)
+                    {
+                        r.X = (int) fxPos;
+                        fxPos += viewWidth;
+
+                        r.Width = (int) (fxPos - r.X - (--n > 0 ? 2 : 0));
+
+                        SubItems[i].Bounds = r;
+                        SubItems[i].Displayed = r.IntersectsWith(Bounds);
+
+                        if (SubItems[i].Displayed == true)
+                        {
+                            view = SubItems[i] as BaseView;
+
+                            if (view != null)
+                            {
+                                view.NeedRecalcLayout = true;
+                                view.RecalcSize();
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RecalcTimeLine
+
+        /// <summary>
+        /// Recalculates TimeLine views
+        /// </summary>
+        private void RecalcTimeLine()
+        {
+            int vCount = SubItems.Count;
+
+            if (SubItems.Contains("TimeLineHScrollPanel"))
+                vCount--;
+
+            if (SubItems.Contains("TimeLineHeaderPanel"))
+                vCount--;
+
+            if (vCount > 0)
+                ConfigureTItems(vCount);
+        }
+
+        #region ConfigureTItems
+
+        /// <summary>
+        /// Configures TimeLine view items
+        /// </summary>
+        /// <param name="vCount"></param>
+        private void ConfigureTItems(int vCount)
+        {
+            Rectangle r = Bounds;
+
+            if (_CalendarView.TimeLineShowHScrollBar == true)
+                r.Height -= _CalendarView.HsHeight;
+
+            // TimeLineHeaderPanel
+
+            int headerHeight = 0;
+            int iHeaderPanel = SubItems.IndexOf("TimeLineHeaderPanel");
+
+            if (iHeaderPanel >= 0)
+            {
+                if (iHeaderPanel != 0)
+                {
+                    BaseItem bi = SubItems[iHeaderPanel];
+
+                    SubItems.RemoveAt(iHeaderPanel);
+                    SubItems.Insert(0, bi);
+
+                    iHeaderPanel = 0;
+                }
+
+                if (_CalendarView.TimeLineShowIntervalHeader == true)
+                    headerHeight += _CalendarView.TimeLineIntervalHeaderHeight;
+
+                if (_CalendarView.TimeLineShowPeriodHeader == true)
+                    headerHeight += _CalendarView.TimeLinePeriodHeaderHeight;
+
+                r.Y += headerHeight;
+                r.Height -= headerHeight;
+            }
+
+            _InnerBounds.Y = r.Y;
+            _InnerBounds.Height = r.Height;
+
+            // Calculate our viewHeight
+
+            int vsWidth = 0;
+
+            float viewHeight = (float) r.Height/vCount;
+
+            if (_CalendarView.TimeLineHeight > viewHeight)
+            {
+                viewHeight = _CalendarView.TimeLineHeight;
+                vsWidth = _CalendarView.VsWidth;
+            }
+
+            // VScrollPanel
+
+            ConfigureTvScrollBar(r, vCount, vsWidth);
+
+            // Sync our current item params with our current
+            // horizontal scrollBar states
+
+            r.Width -= vsWidth;
+
+            Rectangle r2 = r;
+
+            if (_CalendarView.IsMultiCalendar == true &&
+                _CalendarView.ShowTabs == true)
+            {
+                if (_CalendarView.TimeLineMultiUserTabOrientation == eOrientation.Vertical)
+                {
+                    r2.X += _CalendarView.MultiUserTabHeight + 4;
+                    r2.Width -= (_CalendarView.MultiUserTabHeight + 4);
+                }
+                else
+                {
+                    r2.X += _CalendarView.TimeLineMultiUserTabWidth + 4;
+                    r2.Width -= (_CalendarView.TimeLineMultiUserTabWidth + 4);
+                }
+
+                _InnerBounds.X = r2.X;
+                _InnerBounds.Width = r2.Width;
+            }
+
+            // TimeLineHeaderPanel
+
+            if (iHeaderPanel >= 0)
+            {
+                r2.Y = Bounds.Y;
+                r2.Height = headerHeight;
+
+                SubItems[iHeaderPanel].Bounds = r2;
+                SubItems[iHeaderPanel].RecalcSize();
+            }
+
+            // TimeLineView
+
+            r2 = r;
+
+            float fxPos = r2.Y + _VScrollPos;
+
+            for (int i = 0; i < SubItems.Count; i++)
+            {
+                if (SubItems[i] is TimeLineView)
+                {
+                    r2.Y = (int) fxPos;
+                    fxPos += viewHeight;
+
+                    r2.Height = (int) (fxPos - r2.Y);
+
+                    SubItems[i].Bounds = r2;
+                    SubItems[i].Displayed = r2.IntersectsWith(Bounds);
+
+                    if (SubItems[i].Displayed == true)
+                        SubItems[i].RecalcSize();
+                }
+            }
+
+            // If we have an HScrollPanel, then
+            // set it's location and size
+
+            int iScrollPanel = SubItems.IndexOf("TimeLineHScrollPanel");
+
+            if (iScrollPanel >= 0)
+            {
+                if (_CalendarView.IsMultiCalendar == true &&
+                    _CalendarView.ShowTabs == true)
+                {
+                    if (_CalendarView.TimeLineMultiUserTabOrientation == eOrientation.Vertical)
+                    {
+                        r.X += (_CalendarView.MultiUserTabHeight + 4);
+                        r.Width -= (_CalendarView.MultiUserTabHeight + 4);
+                    }
+                    else
+                    {
+                        r.X += (_CalendarView.TimeLineMultiUserTabWidth + 4);
+                        r.Width -= (_CalendarView.TimeLineMultiUserTabWidth + 4);
+                    }
+                }
+
+                r.Y = Bounds.Bottom - _CalendarView.HsHeight;
+                r.Height = _CalendarView.HsHeight;
+
+                SubItems[iScrollPanel].Bounds = r;
+                SubItems[iScrollPanel].RecalcSize();
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Horizontal scrollbar support
+
+        #region ConfigDhScrollBar
+
+        /// <summary>
+        /// Configures default view horizontal scrollBar
+        /// </summary>
+        /// <param name="r"></param>
+        /// <param name="viewWidth"></param>
+        /// <param name="vCount"></param>
+        /// <param name="trWidth"></param>
+        /// <param name="vsWidth"></param>
+        private void ConfigDhScrollBar(ref Rectangle r,
+            ref float viewWidth, int vCount, int trWidth, int vsWidth)
+        {
+            if (_CalendarView.ViewWidth > viewWidth)
+            {
+                viewWidth = _CalendarView.ViewWidth + 2;
+                r.Height -= _CalendarView.HsHeight;
+
+                _HsMaximum = (int)(viewWidth * vCount);
+
+                if (_HScrollBar == null)
+                    SetUpDhScrollBar();
+
+                if (_HScrollBar != null)
+                {
+                    UpdateDhScrollBar(trWidth, vsWidth);
+
+                    if (_HScrollBar.Value > _HsMaximum - _HScrollBar.LargeChange + 1)
+                    {
+                        _HScrollPos = -_HsMaximum - _HScrollBar.LargeChange;
+                        _HScrollBar.Value = _HsMaximum - _HScrollBar.LargeChange;
+                    }
+                }
+            }
+            else
+            {
+                if (_HScrollBar != null)
+                {
+                    _HScrollPos = 0;
+                    _HScrollBar.Value = 0;
+
+                    _HScrollBar.Visible = false;
+                }
+            }
+        }
+
+        #endregion
+
+        #region SetUpDhScrollBar
+
+        /// <summary>
+        /// Sets up default view horizontal scrollbar
+        /// </summary>
+        private void SetUpDhScrollBar()
+        {
+            _HScrollBar = new HScrollBarAdv();
+            _HScrollBar.Height = _CalendarView.HsHeight;
+
+            Control c = (Control)this.GetContainerControl(true);
+
+            if (c != null)
+                c.Controls.Add(_HScrollBar);
+
+            _HScrollBar.ValueChanged += DhScrollBarValueChanged;
+        }
+
+        #endregion
+
+        #region UpdateDhScrollBar
+
+        /// <summary>
+        /// Updates default view horizontal scrollbar
+        /// </summary>
+        private void UpdateDhScrollBar(int trWidth, int vsWidth)
+        {
+            Point pt = new Point(Bounds.X + trWidth,
+                Bounds.Bottom - _CalendarView.HsHeight);
+
+            _HScrollBar.Location = pt;
+            _HScrollBar.Width = Math.Max(50, Bounds.Width - (trWidth + vsWidth));
+
+            _HScrollBar.SmallChange = 10;
+            _HScrollBar.LargeChange = _HScrollBar.Width;
+            _HScrollBar.Maximum = _HsMaximum;
+
+            _HScrollBar.Visible = true;
+            _HScrollBar.BringToFront();
+
+            _HScrollBar.Refresh();
+        }
+
+        #endregion
+
+        #region DhScrollBarValueChanged
+
+        /// <summary>
+        /// Processes default view horizontal
+        /// scrollbar value changes
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void DhScrollBarValueChanged(object sender, EventArgs e)
+        {
+            if (_HScrollPos != -_HScrollBar.Value)
+            {
+                _HScrollPos = -_HScrollBar.Value;
+
+                NeedRecalcSize = true;
+                Refresh();
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Vertical scrollbar support
+
+        #region ConfigureTvScrollBar
+
+        /// <summary>
+        /// Configures TimeLine View vertical scrollbar
+        /// </summary>
+        /// <param name="r"></param>
+        /// <param name="vCount"></param>
+        /// <param name="vsWidth"></param>
+        private void ConfigureTvScrollBar(Rectangle r, int vCount, int vsWidth)
+        {
+            if (vsWidth > 0)
+            {
+                _VsMaximum = _CalendarView.TimeLineHeight * vCount + 2;
+
+                if (_VScrollBar == null)
+                    SetUpTvScrollBar();
+
+                if (_VScrollBar != null)
+                {
+                    UpdateTvScrollBar(r, vsWidth);
+
+                    if (_VScrollBar.Value > _VsMaximum)
+                        _VScrollBar.Value = _VsMaximum;
+                }
+            }
+            else
+            {
+                if (_VScrollBar != null)
+                {
+                    _VScrollPos = 0;
+                    _VScrollBar.Value = 0;
+
+                    _VScrollBar.Visible = false;
+                }
+            }
+        }
+
+        #endregion
+
+        #region SetUpTvScrollBar
+
+        /// <summary>
+        /// Sets up TimeLine vertical scrollbar
+        /// </summary>
+        private void SetUpTvScrollBar()
+        {
+            _VScrollBar = new VScrollBarAdv();
+            _VScrollBar.Width = _CalendarView.VsWidth;
+
+            Control c = (Control)this.GetContainerControl(true);
+
+            if (c != null)
+                c.Controls.Add(_VScrollBar);
+
+            _VScrollBar.ValueChanged += VScrollBar_ValueChanged;
+        }
+
+        #endregion
+
+        #region UpdateTvScrollBar
+
+        /// <summary>
+        /// Updates our vertical scrollbar
+        /// </summary>
+        /// <param name="r"></param>
+        /// <param name="vsWidth"></param>
+        private void UpdateTvScrollBar(Rectangle r, int vsWidth)
+        {
+            Point pt = new Point(r.Right - vsWidth, r.Top);
+
+            _VScrollBar.Location = pt;
+            _VScrollBar.Height = Math.Max(30, r.Height);
+
+            _VScrollBar.SmallChange = _CalendarView.TimeLineHeight;
+            _VScrollBar.LargeChange = _VScrollBar.Height;
+            _VScrollBar.Maximum = _VsMaximum;
+
+            _VScrollBar.Visible = true;
+            _VScrollBar.BringToFront();
+
+            _VScrollBar.Refresh();
+        }
+
+        #endregion
+
+        #region VScrollBar_ValueChanged
+
+        /// <summary>
+        /// Processes TimeLine vertical scrollbar changes
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void VScrollBar_ValueChanged(object sender, EventArgs e)
+        {
+            if (_VScrollPos != -_VScrollBar.Value)
+            {
+                _VScrollPos = -_VScrollBar.Value;
+
+                NeedRecalcSize = true;
+                Refresh();
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region Paint
+
+        /// <summary>
+        /// Paint processing
+        /// </summary>
+        /// <param name="e"></param>
+        public override void Paint(ItemPaintArgs e)
+        {
+            if (_CalendarView.IsUpdateSuspended == false)
+            {
+                if (SubItems.Count > 0)
+                {
+                    PaintNonViewItems(e);
+                    PaintBaseViewItems(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Paints the non-BaseView items
+        /// </summary>
+        /// <param name="e">ItemPaintArgs</param>
+        private void PaintNonViewItems(ItemPaintArgs e)
+        {
+            // Loop through each item, initiating
+            // a paint on each one
+
+            for (int i = 0; i < SubItems.Count; i++)
+            {
+                if ((SubItems[i] is BaseView) == false)
+                {
+                    if (SubItems[i].Bounds.IntersectsWith(e.ClipRectangle))
+                        SubItems[i].Paint(e);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Paints the BaseView items
+        /// </summary>
+        /// <param name="e">ItemPaintArgs</param>
+        private void PaintBaseViewItems(ItemPaintArgs e)
+        {
+            Rectangle r = Bounds;
+
+            if (_CalendarView.SelectedView == eCalendarView.TimeLine)
+            {
+                int n = 0;
+
+                if (_CalendarView.TimeLineShowIntervalHeader == true)
+                    n += _CalendarView.TimeLineIntervalHeaderHeight;
+                
+                if (_CalendarView.TimeLineShowPeriodHeader == true)
+                    n += _CalendarView.TimeLinePeriodHeaderHeight;
+
+                r.Y += n;
+
+                if (_CalendarView.TimeLineShowHScrollBar == true)
+                    r.Height -= (_CalendarView.HsHeight + n);
+            }
+            else
+            {
+                if (SubItems[0] is VScrollPanel)
+                {
+                    if (SubItems[0].Visible == true)
+                        r.Width -= _CalendarView.VsWidth;
+                }
+
+                if (SubItems.Count > 1 && SubItems[1] is TimeRulerPanel)
+                {
+                    r.X = _CalendarView.TimeRulerWidth;
+                    r.Width -= _CalendarView.TimeRulerWidth;
+                }
+            }
+
+            Region rgnSave = e.Graphics.Clip;
+
+            using (Region rgn = new Region(r))
+            {
+                e.Graphics.Clip = rgn;
+
+                for (int i = 0; i < SubItems.Count; i++)
+                {
+                    if (SubItems[i] is BaseView)
+                    {
+                        if (SubItems[i].Displayed == true)
+                            SubItems[i].Paint(e);
+                    }
+                }
+            }
+
+            e.Graphics.Clip = rgnSave;
+        }
+
+        #endregion
+
+        #region Touch Handling
+
+        #region Private variables
+
+        private bool _TouchDrag;
+
+        private Point _TouchStartLocation;
+        private Point _TouchStartScrollPosition;
+
+        private Rectangle _TouchInnerBounds;
+
+        #endregion
+
+        #region Private properties
+
+        private int MaximumReversePageOffset
+        {
+            get { return 0; }
+        }
+
+        #endregion
+
+        #region TouchHandlerPanBegin
+
+        private void TouchHandlerPanBegin(object sender, Touch.GestureEventArgs e)
+        {
+            if (_CalendarView.TouchEnabled == true)
+            {
+                _TouchInnerBounds = _InnerBounds;
+                _TouchStartLocation = e.Location;
+                _TouchStartScrollPosition = AutoScrollPosition;
+                _TouchDrag = true;
+
+                e.Handled = true;
+            }
+        }
+
+        #endregion
+
+        #region TouchHandlerPan
+
+        private void TouchHandlerPan(object sender, Touch.GestureEventArgs e)
+        {
+            if (_TouchDrag)
+            {
+                Point autoScrollPosition = AutoScrollPosition;
+                Size autoScrollMinSize = AutoScrollMinSize;
+
+                int offset = (_TouchStartLocation.X - e.Location.X);
+                int offsetChange = offset + _TouchStartScrollPosition.X;
+
+                // X Scroll
+
+                bool overflowH = false;
+
+                if (autoScrollMinSize.Width > _TouchInnerBounds.Width)
+                {
+                    if (offsetChange + MaximumReversePageOffset > autoScrollMinSize.Width)
+                    {
+                        autoScrollPosition.X = autoScrollMinSize.Width;
+                        overflowH = true;
+                    }
+                    else if (offsetChange < MaximumReversePageOffset)
+                    {
+                        autoScrollPosition.X = MaximumReversePageOffset;
+                        overflowH = true;
+                    }
+                    else
+                        autoScrollPosition.X = offsetChange;
+                }
+
+                // Y Scroll
+
+                bool overflowV = false;
+
+                if (autoScrollMinSize.Height > _TouchInnerBounds.Height)
+                {
+                    offset = (_TouchStartLocation.Y - e.Location.Y);
+                    offsetChange = offset + _TouchStartScrollPosition.Y;
+
+                    if (offsetChange + MaximumReversePageOffset > autoScrollMinSize.Height)
+                    {
+                        autoScrollPosition.Y = autoScrollMinSize.Height;
+                        overflowV = true;
+                    }
+                    else if (offsetChange < MaximumReversePageOffset)
+                    {
+                        autoScrollPosition.Y = MaximumReversePageOffset;
+                        overflowV = true;
+                    }
+                    else
+                        autoScrollPosition.Y = offsetChange;
+                }
+
+                if (AutoScrollPosition != autoScrollPosition)
+                {
+                    AutoScrollPosition = autoScrollPosition;
+                    Update();
+                }
+
+                if (overflowH && overflowV && e.IsInertia)
+                    EndTouchPan();
+
+                e.Handled = true;
+            }
+        }
+
+        #endregion
+
+        #region TouchHandlerPanEnd
+
+        private void TouchHandlerPanEnd(object sender, Touch.GestureEventArgs e)
+        {
+            if (_TouchDrag)
+            {
+                EndTouchPan();
+
+                e.Handled = true;
+            }
+        }
+
+        #endregion
+
+        #region EndTouchPan
+
+        private void EndTouchPan()
+        {
+            _TouchDrag = false;
+
+            Point autoScrollPosition = AutoScrollPosition;
+            Size autoScrollMinSize = AutoScrollMinSize;
+
+            if (autoScrollMinSize.Width > _TouchInnerBounds.Width)
+            {
+                if (autoScrollMinSize.Width < autoScrollPosition.X)
+                    autoScrollPosition = new Point(autoScrollMinSize.Width, autoScrollPosition.Y);
+
+                else if (autoScrollPosition.X < 0)
+                    autoScrollPosition = new Point(0, autoScrollPosition.Y);
+            }
+
+            if (autoScrollMinSize.Height > _TouchInnerBounds.Height)
+            {
+                if (autoScrollMinSize.Height < autoScrollPosition.Y)
+                    autoScrollPosition = new Point(autoScrollPosition.X, autoScrollMinSize.Height);
+
+                else if (autoScrollPosition.Y < 0)
+                    autoScrollPosition = new Point(autoScrollPosition.X, 0);
+            }
+
+            if (AutoScrollPosition != autoScrollPosition)
+                AutoScrollPosition = autoScrollPosition;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Copy
+
+        /// <summary>
+        /// Returns copy of the item.
+        /// </summary>
+        public override BaseItem Copy()
+        {
+            CalendarPanel objCopy = new CalendarPanel(_CalendarView);
+            CopyToItem(objCopy);
+
+            return (objCopy);
+        }
+
+        /// <summary>
+        /// Copies the CalendarPanel specific properties to new instance of the item.
+        /// </summary>
+        /// <param name="copy">New CalendarPanel instance</param>
+        protected override void CopyToItem(BaseItem copy)
+        {
+            CalendarPanel objCopy = copy as CalendarPanel;
+            base.CopyToItem(objCopy);
+        }
+
+        #endregion
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/CalendarView/CalendarView.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/CalendarView/CalendarView.cs
new file mode 100644
index 00000000..0ba005fb
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/CalendarView/CalendarView.cs	
@@ -0,0 +1,10346 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.Controls;
+using DevComponents.DotNetBar.Rendering;
+using DevComponents.DotNetBar.ScrollBar;
+using DevComponents.Schedule.Model;
+
+namespace DevComponents.DotNetBar.Schedule
+{
+    [ToolboxItem(true), ToolboxBitmap(typeof(CalendarView), "Schedule.CalendarView.ico")]
+    [Designer("DevComponents.DotNetBar.Design.CalendarViewDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+    public class CalendarView : ItemControl
+    {
+        #region Constants
+
+        private const int MinutesPerHour = 60;
+        private const int HoursPerDay = 24;
+        private const int DaysPerYear = 365;
+
+        private const int MinutesPerDay = MinutesPerHour * HoursPerDay;
+        private const int MinutesPerYear = MinutesPerDay * DaysPerYear;
+
+        private const int MaxMinuteDuration = 60;
+        private const int MaxHourDuration = 24;
+        private const int MaxDayDuration = 365;
+        private const int MaxYearDuration = 10;
+
+        #endregion
+
+        #region Events
+
+        #region BaseView Events
+
+        /// <summary>
+        /// Occurs when CalendarModel has changed
+        /// </summary>
+        [Description("Occurs when CalendarModel has changed.")]
+        public event EventHandler<ModelEventArgs> ModelChanged;
+
+        /// <summary>
+        /// Occurs when DateSelectionStart has changed
+        /// </summary>
+        [Description("Occurs when DateSelectionStart has changed.")]
+        public event EventHandler<DateSelectionEventArgs> DateSelectionStartChanged;
+
+        /// <summary>
+        /// Occurs when DateSelectionEnd has changed
+        /// </summary>
+        [Description("Occurs when DateSelectionEnd has changed.")]
+        public event EventHandler<DateSelectionEventArgs> DateSelectionEndChanged;
+
+        /// <summary>
+        /// Occurs when the Day, Week, or Month view date(s) have changed
+        /// </summary>
+        [Description("Occurs when the Day, Week, or Month view date(s) have changed.")]
+        public event EventHandler<ViewDateChangedEventArgs> ViewDateChanged;
+
+        /// <summary>
+        /// Occurs when SelectedView has Changed
+        /// </summary>
+        [Description("Occurs when SelectedView has Changed.")]
+        public event EventHandler<SelectedViewEventArgs> SelectedViewChanged;
+
+        /// <summary>
+        /// Occurs when SelectedOwner has Changed
+        /// </summary>
+        [Description("Occurs when SelectedOwner has Changed.")]
+        public event EventHandler<SelectedOwnerChangedEventArgs> SelectedOwnerChanged;
+
+        /// <summary>
+        /// Occurs when EnableDragDrop has changed
+        /// </summary>
+        [Description("Occurs when EnableDragDrop has changed.")]
+        public event EventHandler<EnableDragDropChangedEventArgs> EnableDragDropChanged;
+
+        /// <summary>
+        /// Occurs when DisplayedOwners has Changed
+        /// </summary>
+        [Description("Occurs when DisplayedOwners has Changed.")]
+        public event EventHandler<EventArgs> DisplayedOwnersChanged;
+
+        /// <summary>
+        /// Occurs when TimeIndicators has changed
+        /// </summary>
+        [Description("Occurs when TimeIndicators has changed.")]
+        public event EventHandler<EventArgs> TimeIndicatorsChanged;
+
+        /// <summary>
+        /// Occurs when a TimeIndicator time has changed
+        /// </summary>
+        [Description("Occurs when a TimeIndicator time has changed.")]
+        public event EventHandler<TimeIndicatorTimeChangedEventArgs> TimeIndicatorTimeChanged;
+
+        /// <summary>
+        /// Occurs when a TimeIndicator Color has changed
+        /// </summary>
+        [Description("Occurs when a TimeIndicator Color has changed.")]
+        public event EventHandler<TimeIndicatorColorChangedEventArgs> TimeIndicatorColorChanged;
+
+        /// <summary>
+        /// Occurs when ViewDisplayCustomizations have changed
+        /// </summary>
+        [Description("Occurs when ViewDisplayCustomizations have changed.")]
+        public event EventHandler<EventArgs> ViewDisplayCustomizationsChanged;
+
+        /// <summary>
+        /// Occurs when a Tab's background needs rendered
+        /// </summary>
+        [Description("Occurs when a Tab's background needs rendered.")]
+        public event EventHandler<RenderTabBackgroundEventArgs> RenderTabBackground;
+
+        /// <summary>
+        /// Occurs when a Tab's content (text, etc) needs rendered
+        /// </summary>
+        [Description("Occurs when a Tab's content (text, etc)  needs rendered.")]
+        public event EventHandler<RenderTabContentEventArgs> RenderTabContent;
+
+        /// <summary>
+        /// Occurs when a View Border needs rendered
+        /// </summary>
+        [Description("Occurs when a View Border needs rendered.")]
+        public event EventHandler<RenderViewBorderEventArgs> RenderViewBorder;
+
+        /// <summary>
+        /// Occurs when a view load/reload has occurred
+        /// </summary>
+        [Description("Occurs when a view load/reload has occurred.")]
+        public event EventHandler<ViewLoadCompleteEventArgs> ViewLoadComplete;
+
+        /// <summary>
+        /// Occurs when a View date is changing
+        /// </summary>
+        [Description("Occurs when a View date is changing.")]
+        public event EventHandler<ViewDateChangingEventArgs> ViewDateChanging;
+
+        #endregion
+
+        #region AppointmentView Events
+
+        /// <summary>
+        /// Occurs before an AppointmentView is about to change
+        /// </summary>
+        [Description("Occurs before an AppointmentView is about to change.")]
+        public event EventHandler<BeforeAppointmentViewChangeEventArgs> BeforeAppointmentViewChange;
+
+        /// <summary>
+        /// Occurs when an AppointmentView is changing
+        /// </summary>
+        [Description("Occurs when an AppointmentView is changing.")]
+        public event EventHandler<AppointmentViewChangingEventArgs> AppointmentViewChanging;
+
+        /// <summary>
+        /// Occurs when an AppointmentView has changed
+        /// </summary>
+        [Description("Occurs when an AppointmentView has changed.")]
+        public event EventHandler<AppointmentViewChangedEventArgs> AppointmentViewChanged;
+
+        /// <summary>
+        /// Occurs when Appointment Reminder has been reached.")]
+        /// </summary>
+        [Description("Occurs when Appointment Reminder has been reached.")]
+        public event EventHandler<ReminderEventArgs> AppointmentReminder;
+
+        /// <summary>
+        /// Occurs when Appointment StartTime has been reached.")]
+        /// </summary>
+        [Description("Occurs when Appointment StartTime has been reached.")]
+        public event EventHandler<AppointmentEventArgs> AppointmentStartTimeReached;
+
+        /// <summary>
+        /// Occurs when Appointment DisplayTemplate text is needed
+        /// </summary>
+        [Description("Occurs when Appointment DisplayTemplate text is needed.")]
+        public event EventHandler<GetDisplayTemplateTextEventArgs> GetDisplayTemplateText;
+
+        /// <summary>
+        /// Occurs when an AppointmentView is about to be rendered
+        /// </summary>
+        [Description("Occurs when an AppointmentView is about to be rendered.")]
+        public event EventHandler<AppointmentViewPreRenderEventArgs> AppointmentViewPreRender;
+
+        /// <summary>
+        /// Occurs when an AppointmentView has been rendered
+        /// </summary>
+        [Description("Occurs when an AppointmentView has been rendered.")]
+        public event EventHandler<AppointmentViewPostRenderEventArgs> AppointmentViewPostRender;
+
+        /// <summary>
+        /// Occurs when Appointment GroupId is needed (used to logically group
+        /// appointments together when displayed in the WeekDay view)
+        /// </summary>
+        [Description("Occurs when Appointment GroupId is needed (used to logically group appointments together when displayed in the WeekDay view).")]
+        public event EventHandler<GetAppointmentGroupIdEventArgs> GetAppointmentGroupId;
+
+        /// <summary>
+        /// Occurs when two CalendarItems need detail sorting.
+        /// When items are of equal sort value, based upon their calendar time, this
+        /// event will be raised to give the user the ability to perform more detailed
+        /// sorting as needed - such as via Subject and/or Description, etc).
+        /// </summary>
+        [Description("Occurs when two CalendarItems need detail sorting. When items are of equal sort value, based upon their calendar time, this event will be raised to give the user the ability to perform more detailed sorting as needed - such as via Subject and/or Description, etc).")]
+        public event EventHandler<CalendarItemEventArgs> CalendarItemDetailSort;
+
+        #endregion
+
+        #region DayView Events
+
+        /// <summary>
+        /// Occurs when DayViewDate has Changed
+        /// </summary>
+        [Description("Occurs when DayViewDate has Changed.")]
+        public event EventHandler<DateChangeEventArgs> DayViewDateChanged;
+
+        #endregion
+
+        #region WeekView Events
+
+        /// <summary>
+        /// Occurs when WeekViewStartDate has Changed
+        /// </summary>
+        [Description("Occurs when WeekViewStartDate has Changed.")]
+        public event EventHandler<DateChangeEventArgs> WeekViewStartDateChanged;
+
+        /// <summary>
+        /// Occurs when WeekViewEndDate has Changed
+        /// </summary>
+        [Description("Occurs when WeekViewEndDate has Changed.")]
+        public event EventHandler<DateChangeEventArgs> WeekViewEndDateChanged;
+
+        #endregion
+
+        #region WeekDayView Events
+
+        /// <summary>
+        /// Occurs when LabelTimeSlots has changed
+        /// </summary>
+        [Description("Occurs when LabelTimeSlots has changed.")]
+        public event EventHandler<LabelTimeSlotsChangedEventArgs> LabelTimeSlotsChanged;
+
+        /// <summary>
+        /// Occurs when TimeSlotDuration has changed
+        /// </summary>
+        [Description("Occurs when TimeSlotDuration has changed.")]
+        public event EventHandler<TimeSlotDurationChangedEventArgs> TimeSlotDurationChanged;
+
+        /// <summary>
+        /// Occurs when Is24HourFormat has changed
+        /// </summary>
+        [Description("Occurs when Is24HourFormat has changed.")]
+        public event EventHandler<Is24HourFormatChangedEventArgs> Is24HourFormatChanged;
+
+        /// <summary>
+        /// Occurs when FixedAllDayPanelHeight has changed
+        /// </summary>
+        [Description("Occurs when FixedAllDayPanelHeight has changed.")]
+        public event EventHandler<FixedAllDayPanelHeightChangedEventArgs> FixedAllDayPanelHeightChanged;
+
+        /// <summary>
+        /// Occurs when MaximumAllDayPanelHeight has Changed
+        /// </summary>
+        [Description("Occurs when MaximumAllDayPanelHeight has Changed.")]
+        public event EventHandler<MaximumAllDayPanelHeightChangedEventArgs> MaximumAllDayPanelHeightChanged;
+
+        /// <summary>
+        /// Occurs when MinimumTimeSlotHeight has Changed
+        /// </summary>
+        [Description("Occurs when MinimumTimeSlotHeight has Changed.")]
+        public event EventHandler<MinimumTimeSlotHeightChangedEventArgs> MinimumTimeSlotHeightChanged;
+
+        /// <summary>
+        /// Occurs when IsTimeRulerVisible has changed
+        /// </summary>
+        [Description("Occurs when IsTimeRulerVisible has changed.")]
+        public event EventHandler<IsTimeRulerVisibleChangedEventArgs> IsTimeRulerVisibleChanged;
+
+        /// <summary>
+        /// Occurs when ShowOnlyWorkDayHours has changed
+        /// </summary>
+        [Description("Occurs when ShowOnlyWorkDayHours has changed.")]
+        public event EventHandler<ShowOnlyWorkDayHoursChangedEventArgs> ShowOnlyWorkDayHoursChanged;
+
+        /// <summary>
+        /// Occurs when DaySlotAppearance Text needs rendered
+        /// </summary>
+        [Description("Occurs when DaySlotAppearance Text needs rendered.")]
+        public event EventHandler<RenderDaySlotAppearanceTextEventArgs> RenderDaySlotAppearanceText;
+
+        /// <summary>
+        /// Occurs when WeekDayCanExtendRange has changed
+        /// </summary>
+        [Description("Occurs when WeekDayCanExtendRange has changed.")]
+        public event EventHandler<WeekDayCanExtendRangeChangedEventArgs> WeekDayCanExtendRangeChanged;
+
+        /// <summary>
+        /// Occurs when the WeekDay DaySlot background needs to be rendered
+        /// </summary>
+        [Description("Occurs when a WeekDay DaySlot background needs to be rendered.")]
+        public event EventHandler<PreRenderWeekDaySlotBackgroundEventArgs> PreRenderWeekDaySlotBackground;
+
+        /// <summary>
+        /// Occurs when the WeekDay DaySlot background has been rendered
+        /// </summary>
+        [Description("Occurs when the WeekDay DaySlot background has been rendered.")]
+        public event EventHandler<PostRenderWeekDaySlotBackgroundEventArgs> PostRenderWeekDaySlotBackground;
+
+        /// <summary>
+        /// Occurs when the WeekDay header is about to be rendered
+        /// </summary>
+        [Description("Occurs when the WeekDay header is about to be rendered.")]
+        public event EventHandler<PreRenderWeekDayHeaderEventArgs> PreRenderWeekDayHeader;
+
+        /// <summary>
+        /// Occurs when the WeekDay header has been rendered
+        /// </summary>
+        [Description("Occurs when the WeekDay header has been rendered.")]
+        public event EventHandler<PostRenderWeekDayHeaderEventArgs> PostRenderWeekDayHeader;
+
+        #endregion
+
+        #region MonthView Events
+
+        /// <summary>
+        /// Occurs when MonthViewStartDate has Changed
+        /// </summary>
+        [Description("Occurs when MonthViewStartDate has Changed.")]
+        public event EventHandler<DateChangeEventArgs> MonthViewStartDateChanged;
+
+        /// <summary>
+        /// Occurs when MonthViewEndDate has Changed
+        /// </summary>
+        [Description("Occurs when MonthViewEndDate has Changed.")]
+        public event EventHandler<DateChangeEventArgs> MonthViewEndDateChanged;
+
+        /// <summary>
+        /// Occurs when IsMonthSideBarVisible has changed
+        /// </summary>
+        [Description("Occurs when IsMonthSideBarVisible has changed.")]
+        public event EventHandler<IsMonthSideBarVisibleChangedEventArgs> IsMonthSideBarVisibleChanged;
+
+        /// <summary>
+        /// Occurs when IsMonthMoreItemsIndicatorVisible has changed
+        /// </summary>
+        [Description("Occurs when IsMonthMoreItemsIndicatorVisible has changed.")]
+        public event EventHandler<IsMonthMoreItemsIndicatorVisibleChangedEventArgs> IsMonthMoreItemsIndicatorVisibleChanged;
+
+        /// <summary>
+        /// Occurs when a MonthView Slot Background is about to be rendered
+        /// </summary>
+        [Description("Occurs when a MonthView Slot Background is about to be rendered.")]
+        public event EventHandler<MonthViewPreRenderSlotBackgroundEventArgs> MonthViewPreRenderSlotBackground;
+
+        /// <summary>
+        /// Occurs when a MonthView Slot Background has just been rendered
+        /// </summary>
+        [Description("Occurs when a MonthView Slot Background has just been rendered.")]
+        public event EventHandler<MonthViewPostRenderSlotBackgroundEventArgs> MonthViewPostRenderSlotBackground;
+
+        /// <summary>
+        /// Occurs when a MonthView 'MoreItemsIndicator' has been clicked
+        /// </summary>
+        [Description("Occurs when a MonthView 'MoreItemsIndicator' has been clicked.")]
+        public event EventHandler<MonthMoreItemsIndicatorClickEventArgs> MonthMoreItemsIndicatorClick;
+
+        /// <summary>
+        /// Occurs when the MonthView header is about to be rendered
+        /// </summary>
+        [Description("Occurs when the MonthView header is about to be rendered.")]
+        public event EventHandler<PreRenderMonthHeaderEventArgs> PreRenderMonthHeader;
+
+        /// <summary>
+        /// Occurs when the MonthView header has been rendered
+        /// </summary>
+        [Description("Occurs when the MonthView header has been rendered.")]
+        public event EventHandler<PostRenderMonthHeaderEventArgs> PostRenderMonthHeader;
+
+        /// <summary>
+        /// Occurs when MonthViewHorizontalPadding has changed
+        /// </summary>
+        [Description("Occurs when MonthViewHorizontalPadding has changed.")]
+        public event EventHandler<MonthViewHorizontalPaddingChangedEventArgs> MonthViewHorizontalPaddingChanged;
+
+        #endregion
+
+        #region YearView Events
+
+        /// <summary>
+        /// Occurs when YearViewStartDate has Changed
+        /// </summary>
+        [Description("Occurs when YearViewStartDate has Changed.")]
+        public event EventHandler<DateChangeEventArgs> YearViewStartDateChanged;
+
+        /// <summary>
+        /// Occurs when YearViewEndDate has Changed
+        /// </summary>
+        [Description("Occurs when YearViewEndDate has Changed.")]
+        public event EventHandler<DateChangeEventArgs> YearViewEndDateChanged;
+
+        /// <summary>
+        /// Occurs when YearViewShowGridLines has changed
+        /// </summary>
+        [Description("Occurs when YearViewShowGridLines has changed.")]
+        public event EventHandler<ShowGridLinesChangedEventArgs> YearViewShowGridLinesChanged;
+
+        /// <summary>
+        /// Occurs when YearViewAllowDateSelection has changed
+        /// </summary>
+        [Description("Occurs when YearViewAllowDateSelection has changed.")]
+        public event EventHandler<AllowDateSelectionChangedEventArgs> YearViewAllowDateSelectionChanged;
+
+        /// <summary>
+        /// Occurs when YearViewLinkView has changed
+        /// </summary>
+        [Description("Occurs when YearViewLinkView has changed.")]
+        public event EventHandler<LinkViewChangedEventArgs> YearViewLinkViewChanged;
+
+        /// <summary>
+        /// Occurs when YearViewAppointmentLink has changed
+        /// </summary>
+        [Description("Occurs when YearViewAppointmentLink has changed.")]
+        public event EventHandler<DayLinkChangedEventArgs> YearViewAppointmentLinkChanged;
+
+        /// <summary>
+        /// Occurs when YearViewLinkAction has changed
+        /// </summary>
+        [Description("Occurs when YearViewLinkAction has changed.")]
+        public event EventHandler<LinkViewActionChangedEventArgs> YearViewLinkActionChanged;
+
+        /// <summary>
+        /// Occurs when YearViewNonAppointmentLink has changed
+        /// </summary>
+        [Description("Occurs when YearViewNonAppointmentLink has changed.")]
+        public event EventHandler<DayLinkChangedEventArgs> YearViewNonAppointmentLinkChanged;
+
+        /// <summary>
+        /// Occurs when YearViewLinkStyle has changed
+        /// </summary>
+        [Description("Occurs when YearViewLinkStyle has changed.")]
+        public event EventHandler<LinkViewStyleChangedEventArgs> YearViewLinkStyleChanged;
+
+        /// <summary>
+        /// Occurs when YearViewLink has been selected
+        /// </summary>
+        [Description("Occurs when YearViewLink has been selected.")]
+        public event EventHandler<LinkViewSelectedEventArgs> YearViewLinkSelected;
+
+        /// <summary>
+        /// Occurs when YearView Day Background needs drawn
+        /// </summary>
+        [Description("Occurs when YearView Day Background needs drawn.")]
+        public event EventHandler<YearViewDrawDayBackgroundEventArgs> YearViewDrawDayBackground;
+
+        /// <summary>
+        /// Occurs when YearView Day Text needs drawn
+        /// </summary>
+        [Description("Occurs when YearView Day Text needs drawn.")]
+        public event EventHandler<YearViewDrawDayTextEventArgs> YearViewDrawDayText;
+
+        #endregion
+
+        #region TimeLine Events
+
+        /// <summary>
+        /// Occurs when TimeLineViewStartDate has Changed
+        /// </summary>
+        [Description("Occurs when TimeLineViewStartDate has Changed.")]
+        public event EventHandler<DateChangeEventArgs> TimeLineViewStartDateChanged;
+
+        /// <summary>
+        /// Occurs when TimeLineViewEndDate has Changed
+        /// </summary>
+        [Description("Occurs when TimeLineViewEndDate has Changed.")]
+        public event EventHandler<DateChangeEventArgs> TimeLineViewEndDateChanged;
+
+        /// <summary>
+        /// Occurs when TimeLineViewViewScrollDate has Changed
+        /// </summary>
+        [Description("Occurs when TimeLineViewViewScrollDate has Changed.")]
+        public event EventHandler<DateChangeEventArgs> TimeLineViewScrollDateChanged;
+
+        /// <summary>
+        /// Occurs when TimeLineInterval has Changed
+        /// </summary>
+        [Description("Occurs when TimeLineInterval has Changed.")]
+        public event EventHandler<TimeLineIntervalChangedEventArgs> TimeLineIntervalChanged;
+
+        /// <summary>
+        /// Occurs when TimeLineIntervalPeriod has Changed
+        /// </summary>
+        [Description("Occurs when TimeLineIntervalPeriod has Changed.")]
+        public event EventHandler<TimeLineIntervalPeriodChangedEventArgs> TimeLineIntervalPeriodChanged;
+
+        /// <summary>
+        /// Occurs when TimeLineColumnWidth has changed
+        /// </summary>
+        [Description("Occurs when TimeLineColumnWidth has changed.")]
+        public event EventHandler<TimeLineColumnWidthChangedEventArgs> TimeLineColumnWidthChanged;
+
+        /// <summary>
+        /// Occurs when TimeLineMaxColumnCount has changed
+        /// </summary>
+        [Description("Occurs when TimeLineMaxColumnCount has changed.")]
+        public event EventHandler<TimeLineMaxColumnCountChangedEventArgs> TimeLineMaxColumnCountChanged;
+
+        /// <summary>
+        /// Occurs when TimeLineHorizontalPadding has changed
+        /// </summary>
+        [Description("Occurs when TimeLineHorizontalPadding has changed.")]
+        public event EventHandler<TimeLineHorizontalPaddingChangedEventArgs> TimeLineHorizontalPaddingChanged;
+
+        /// <summary>
+        /// Occurs when TimeLineShowPeriodHeader has changed
+        /// </summary>
+        [Description("Occurs when TimeLineShowPeriodHeader has changed.")]
+        public event EventHandler<TimeLineShowPeriodHeaderChangedEventArgs> TimeLineShowPeriodHeaderChanged;
+
+        /// <summary>
+        /// Occurs when TimeLineShowIntervalHeader has changed
+        /// </summary>
+        [Description("Occurs when TimeLineShowIntervalHeader has changed.")]
+        public event EventHandler<TimeLineShowIntervalHeaderChangedEventArgs> TimeLineShowIntervalHeaderChanged;
+
+        /// <summary>
+        /// Occurs when TimeLineShowPageNavigation has changed
+        /// </summary>
+        [Description("Occurs when TimeLineShowPageNavigation has changed.")]
+        public event EventHandler<TimeLineShowPageNavigationChangedEventArgs> TimeLineShowPageNavigationChanged;
+
+        /// <summary>
+        /// Occurs when TimeLineCondensedViewVisibility has changed
+        /// </summary>
+        [Description("Occurs when TimeLineCondensedViewVisibility has changed.")]
+        public event EventHandler<TimeLineCondensedViewVisibilityChangedEventArgs> TimeLineCondensedViewVisibilityChanged;
+
+        /// <summary>
+        /// Occurs when TimeLineCondensedViewHeight has changed
+        /// </summary>
+        [Description("Occurs when TimeLineCondensedViewHeight has changed.")]
+        public event EventHandler<TimeLineCondensedViewHeightChangedEventArgs> TimeLineCondensedViewHeightChanged;
+
+        /// <summary>
+        /// Occurs when TimeLineView Period Header needs rendered
+        /// </summary>
+        [Description("Occurs when TimeLineView Period Header needs rendered.")]
+        public event EventHandler<TimeLineRenderPeriodHeaderEventArgs> TimeLineRenderPeriodHeader;
+
+        /// <summary>
+        /// Occurs when a TimeLineView Slot Background is about to be rendered
+        /// </summary>
+        [Description("Occurs when a TimeLineView Slot Background is about to be rendered.")]
+        public event EventHandler<TimeLinePreRenderSlotBackgroundEventArgs> TimeLinePreRenderSlotBackground;
+
+        /// <summary>
+        /// Occurs when a TimeLineView Slot Background has just been rendered
+        /// </summary>
+        [Description("Occurs when a TimeLineView Slot Background has just been rendered.")]
+        public event EventHandler<TimeLinePostRenderSlotBackgroundEventArgs> TimeLinePostRenderSlotBackground;
+
+        /// <summary>
+        /// Occurs when a TimeLineView Slot Border needs rendered
+        /// </summary>
+        [Description("Occurs when a TimeLineView Slot Border needs rendered.")]
+        public event EventHandler<TimeLineRenderSlotBorderEventArgs> TimeLineRenderSlotBorder;
+
+        /// <summary>
+        /// Occurs when a TimeLineView Border needs rendered
+        /// </summary>
+        [Description("Occurs when a TimeLineView Border needs rendered.")]
+        public event EventHandler<TimeLineRenderViewBorderEventArgs> TimeLineRenderViewBorder;
+
+        /// <summary>
+        /// Occurs when TimeLineView needs to get the Appointment row height
+        /// </summary>
+        [Description("Occurs when TimeLineView needs to get the Appointment row height.")]
+        public event EventHandler<TimeLineGetRowHeightEventArgs> TimeLineGetRowHeight;
+
+        /// <summary>
+        /// Occurs when TimeLineView needs to get the row collate Id (used to group rows).
+        /// </summary>
+        [Description("Occurs when TimeLineView needs to get the row collate Id (used to group rows).")]
+        public event EventHandler<TimeLineGetRowCollateIdEventArgs> TimeLineGetRowCollateId;
+
+        /// <summary>
+        /// Occurs when a PageNavigator control button has been clicked
+        /// </summary>
+        [Description("Occurs when a PageNavigator control button has been clicked.")]
+        public event EventHandler<PageNavigatorClickEventArgs> PageNavigatorClick;
+
+        /// <summary>
+        /// Occurs when the TimeLineView needs Date Header Text for a column
+        /// </summary>
+        [Description("Occurs when the TimeLineView needs Date Header Text for a column.")]
+        public event EventHandler<TimeLineGetHeaderTextEventArgs> TimeLineGetHeaderText;
+
+        #endregion
+
+        #endregion
+
+        #region Private variables
+
+        #region Base variables
+
+        private CalendarModel _CalendarModel;               // Calendar Model
+        private CalendarPanel _CalendarPanel;               // Calendar Panel
+
+        private DateTime _AutoSyncDate;                     // AutoSync Start Date
+        private DateTime? _DateSelectionStart;              // Selection start
+        private DateTime? _DateSelectionEnd;                // Selection ent
+
+        private eCalendarView _SelectedView = eCalendarView.None;   // Selected view
+
+        private DisplayedOwnerCollection _DisplayedOwners;
+        private int _SelectedOwnerIndex = -1;               // Selected owner index
+        private int _ViewWidth = 250;
+
+        private bool _AllowTabReorder = true;               // Can reorder multi-user tabs?
+        private bool _AutoSyncViewDates = true;             // View dates AutoSynced?
+        private bool _EnableDragDrop = true;                // DragDrop enabled state
+        private bool _EnableDragCopy = true;
+        private bool _EnableMarkup = true;
+        private bool _SetCursor;                            // Local cursor set flag
+        private bool _HighlightCurrentDay;
+
+        private Cursor _DefaultViewCursor;                  // Default View cursor
+        private int _DefaultCalendarColor;
+
+        private AppointmentCategoryColorCollection _CategoryColors;
+
+        private TimeIndicatorCollection _TimeIndicators;
+        private TimeIndicator _TimeIndicator;
+
+        private CustomCalendarItemCollection
+            _CustomItems = new CustomCalendarItemCollection();
+
+        private ViewDisplayCustomizations _ViewDisplayCustomizations;
+
+        private bool _ShowTabs = true;
+        private int _AppointmentBorderWidth = 1;
+
+        private bool _TouchEnabled = true;
+
+        #endregion
+
+        #region WeekDay variables
+
+        private DayView _DayView;
+        private DateTime _DayViewDate;
+
+        private WeekView _WeekView;
+        private DateTime _WeekViewStartDate;
+        private DateTime _WeekViewEndDate;
+
+        private CalendarViewCollection<DayView> _MultiCalendarDayViews;
+        private CalendarViewCollection<WeekView> _MultiCalendarWeekViews;
+
+        private bool _Is24HourFormat;
+        private bool _IsTimeRulerVisible = true;
+        private bool _LabelTimeSlots;
+        private bool _ShowOnlyWorkDayHours;
+        private bool _WeekDayCanExtendRange = true;
+
+        private int _TimeSlotDuration = 30;
+        private int _FixedAllDayPanelHeight = -1;
+        private int _MinimumTimeSlotHeight;
+        private int _MaximumAllDayPanelHeight = 120;
+        private int _NumberOfSlices;
+        private int _StartSlice;
+        private int _SlotsPerHour;
+        private float _TimeSliceHeight;
+
+        private TimeRulerPanel _TimeRulerPanel;
+        private WeekDayVScrollPanel _WeekDayVScrollPanel;
+
+        private eAllDayDisplayMode _AllDayDisplayMode = eAllDayDisplayMode.ByDayBoundary;
+
+        private Font _TimeRulerFont;
+        private Font _TimeRulerFontSm;
+
+        #endregion
+
+        #region Month variables
+
+        private MonthView _MonthView;
+        private DateTime _MonthViewStartDate;
+        private DateTime _MonthViewEndDate;
+
+        private CalendarViewCollection<MonthView> _MultiCalendarMonthViews;
+
+        private bool _IsMonthSideBarVisible = true;
+        private bool _IsMonthMoreItemsIndicatorVisible = true;
+
+        private int _MonthViewHorizontalPadding = 6;
+
+        #endregion
+
+        #region YearView variables
+
+        private YearView _YearView;
+        private DateTime _YearViewStartDate;
+        private DateTime _YearViewEndDate;
+
+        private CalendarViewCollection<YearView> _MultiCalendarYearViews;
+
+        private bool _YearViewShowGridLines = true;
+        private bool _YearViewAllowDateSelection = true;
+
+        private eCalendarView _YearViewLinkView = eCalendarView.Day;
+        private eYearViewLinkAction _YearViewLinkAction = eYearViewLinkAction.GoToDate;
+        private eYearViewDayLink _YearViewAppointmentLink = eYearViewDayLink.Click;
+        private eYearViewDayLink _YearViewNonAppointmentLink = eYearViewDayLink.DoubleClick;
+        private eYearViewLinkStyle _YearViewAppointmentLinkStyle = eYearViewLinkStyle.Style1;
+
+        private YearVScrollPanel _YearVScrollPanel;
+
+        private int _YearViewMax;
+
+        #endregion
+
+        #region TimeLineView variables
+
+        private TimeLineView _TimeLineView;
+        private DateTime _TimeLineViewStartDate;
+        private DateTime _TimeLineViewEndDate;
+
+        private CalendarViewCollection<TimeLineView> _MultiCalendarTimeLineViews;
+
+        private bool _TimeLinePeriodHeaderEnableMarkup = true;
+        private bool _TimeLineShowPeriodHeader = true;
+        private bool _TimeLineShowIntervalHeader = true;
+        private bool _TimeLineShowPageNavigation = true;
+        private bool _TimeLineStretchRowHeight;
+        private bool _TimeLineCanExtendRange = true;
+        private bool _TimeLineShowCollateLines;
+
+        private int _TimeLineColumnCount;
+        private int _TimeLineMaxColumnCount = 500;
+        private int _TimeLineColumnWidth = 80;
+        private int _TimeLineMinAppointmentWidth = 20;
+        private int _TimeLineHeight = 100;
+        private int _TimeLineHorizontalPadding = 6;
+        private int _TimeLineCondensedViewHeight = 20;
+        private int _TimeLinePeriodHeaderHeight = -1;
+        private int _TimeLineInterval = 30;
+        private double _BaseInterval = 30;
+
+        private eOrientation _TimeLineMultiUserTabOrientation = eOrientation.Vertical;
+        private int _TimeLineMultiUserTabWidth = 80;
+
+        private DateTime _TimeLineViewScrollStartDate;
+        private TimeLineHeaderPanel _TimeLineHeaderPanel;
+        private TimeLineHScrollPanel _TimeLineHScrollPanel;
+
+        private eItemAlignment _TimeLinePeriodHeaderAlignment = eItemAlignment.Center;
+
+        private eCondensedViewVisibility
+            _TimeLineCondensedViewVisibility = eCondensedViewVisibility.AllResources;
+
+        private eTimeLinePeriod _TimeLinePeriod = eTimeLinePeriod.Minutes;
+
+        private string _TimeLinePageNavigatorTodayTooltip = "Today";
+        private string _TimeLinePageNavigatorNextPageTooltip = "Next Page";
+        private string _TimeLinePageNavigatorPreviousPageTooltip = "Previous Page";
+
+        private bool _TimeLineShowHScrollBar = true;
+
+        private TimeLineStretchRowHeightMode 
+            _TimeLineStretchRowHeightMode = TimeLineStretchRowHeightMode.Partial;
+
+        #endregion
+
+        #endregion
+
+        /// <summary>
+        /// CalendarView constructor
+        /// </summary>
+        public CalendarView()
+        {
+            // Allocate our CalendarPanel to hold all our
+            // BaseView and TimeRulerPanel objects
+
+            _CalendarPanel = new CalendarPanel(this);
+
+            _CalendarPanel.Bounds = ClientRectangle;
+
+            _CalendarPanel.GlobalItem = false;
+            _CalendarPanel.ContainerControl = this;
+            _CalendarPanel.Stretch = false;
+            _CalendarPanel.Displayed = true;
+            _CalendarPanel.SetOwner(this);
+
+            SetBaseItemContainer(_CalendarPanel);
+
+            // Allocate our DisplayedOwners collection, used
+            // to track all multi-user calendar views
+
+            _DisplayedOwners = new DisplayedOwnerCollection(this);
+
+            // Establish our default view dates and
+            // set our default view to single-user Day
+
+            InitDefaultViews();
+            SelectedView = eCalendarView.Day;
+
+            // Register with the StyleManager
+
+            StyleManager.Register(this);
+            CalendarPanel.Style = eDotNetBarStyle.StyleManagerControlled;
+
+            // Alloc our default CalendarModel
+
+            CalendarModel = new CalendarModel();
+        }
+
+        protected override void ScaleControl(SizeF factor, BoundsSpecified specified)
+        {
+            Dpi.SetScaling(factor);
+
+            base.ScaleControl(factor, specified);
+
+            _CalendarPanel.RecalcSize();
+            _CalendarPanel.Refresh();
+        }
+
+        #region DefaultSize
+
+        protected override Size DefaultSize
+        {
+            get
+            {
+                return new Size(300, 150);
+            }
+        }
+        #endregion
+
+        #region Public properties
+
+        #region Licensing
+#if !TRIAL
+        private string _LicenseKey = "";
+        [Browsable(false), DefaultValue("")]
+        public string LicenseKey
+        {
+            get { return _LicenseKey; }
+            set
+            {
+                if (NativeFunctions.ValidateLicenseKey(value))
+                    return;
+                _LicenseKey = (!NativeFunctions.CheckLicenseKey(value) ? "9dsjkhds7" : value);
+            }
+        }
+#endif
+        #endregion
+
+        #region Browsable properties
+
+        #region AllowTabReorder
+
+        /// <summary>
+        /// Gets and sets whether the control will permit
+        /// tab reordering via the user interface
+        /// </summary>
+        [DefaultValue(true)]
+        [Category("Behavior")]
+        [Description("Indicates whether the user can reorder Multi-User tabs through the user interface.")]
+        public bool AllowTabReorder
+        {
+            get { return (_AllowTabReorder); }
+            set { _AllowTabReorder = value; }
+        }
+
+        #endregion
+
+        #region AutoSyncViewDates
+        /// <summary>
+        /// Gets or sets whether view dates are automatically
+        /// synced to the currently viewed date range
+        /// </summary>
+        [DefaultValue(true)]
+        [Category("Behavior")]
+        [Description("Indicates whether view dates are automatically synced to the currently viewed date range.")]
+        public bool AutoSyncViewDates
+        {
+            get { return (_AutoSyncViewDates); }
+            set { _AutoSyncViewDates = value; }
+        }
+
+        #endregion
+
+        #region AppointmentBorderWidth
+
+        /// <summary>
+        /// Gets and sets the default appointment border width
+        /// </summary>
+        [DefaultValue(1)]
+        [Category("Appearance")]
+        [Description("Indicates whether the default appointment border width.")]
+        public int AppointmentBorderWidth
+        {
+            get { return (_AppointmentBorderWidth); }
+
+            set
+            {
+                if (_AppointmentBorderWidth != value)
+                {
+                    _AppointmentBorderWidth = value;
+
+                    Refresh();
+                }
+            }
+        }
+
+        #endregion
+
+        #region AllDayDisplayMode
+
+        /// <summary>
+        /// Gets or sets how DayView "AllDay" appointments are displayed
+        /// </summary>
+        [DefaultValue(eAllDayDisplayMode.ByDayBoundary), Category("Appearance")]
+        [Description("Indicates how DayView 'AllDay' appointments are displayed.")]
+        public eAllDayDisplayMode AllDayDisplayMode
+        {
+            get { return (_AllDayDisplayMode); }
+
+            set
+            {
+                if (_AllDayDisplayMode != value)
+                {
+                    _AllDayDisplayMode = value;
+
+                    if (_CalendarModel != null)
+                    {
+                        _CalendarModel.BeginUpdate();
+                        _CalendarModel.EndUpdate();
+                    }
+
+                    Refresh();
+                }
+            }
+        }
+
+        #endregion
+
+        #region EnableMarkup
+
+        /// <summary>
+        /// Gets or sets whether Appointment text-markup support is enabled
+        /// </summary>
+        [DefaultValue(true), Category("Appearance")]
+        [Description("Indicates whether Appointment text-markup support is enabled.")]
+        public bool EnableMarkup
+        {
+            get { return (_EnableMarkup); }
+
+            set
+            {
+                if (_EnableMarkup != value)
+                {
+                    _EnableMarkup = value;
+                    Refresh();
+                }
+            }
+        }
+
+        #endregion
+
+        #region SelectedView
+
+        /// <summary>
+        /// Gets and sets the selected calendar view
+        /// </summary>
+        [DefaultValue(eCalendarView.Day)]
+        [Category("Appearance")]
+        [Description("Indicates whether the Day, Week, or Month view is displayed.")]
+        public eCalendarView SelectedView
+        {
+            get { return (_SelectedView); }
+
+            set
+            {
+                if (_SelectedView != value)
+                {
+                    eCalendarView oldView = _SelectedView;
+
+                    SetSelectedView(value);
+
+                    OnSelectedViewChanged(oldView, _SelectedView);
+                }
+            }
+        }
+
+        /// <summary>
+        /// SelectedViewChanged event propagation
+        /// </summary>
+        protected virtual void OnSelectedViewChanged(eCalendarView oldView, eCalendarView newView)
+        {
+            if (SelectedViewChanged != null)
+                SelectedViewChanged(this, new SelectedViewEventArgs(oldView, newView));
+        }
+
+        #endregion
+
+        #region FixedAllDayPanelHeight
+
+        /// <summary>
+        /// Gets and sets the fixed (constant) AllDayPanel
+        /// height for all WeekDay views. Setting this value to -1
+        /// will let the height change dynamically
+        /// </summary>
+        [DefaultValue(-1)]
+        [Category("Layout")]
+        [Description("Indicates the fixed (constant) AllDayPanel height for all Day and Week views. Setting this value to -1 will let the height change dynamically.")]
+        public int FixedAllDayPanelHeight
+        {
+            get { return (_FixedAllDayPanelHeight); }
+
+            set
+            {
+                if (_FixedAllDayPanelHeight != value)
+                {
+                    int oldValue = _FixedAllDayPanelHeight;
+                    _FixedAllDayPanelHeight = value;
+
+                    OnFixedAllDayPanelHeightChanged(oldValue, value);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Propagates FixedAllDayPanelHeightChanged events
+        /// </summary>
+        /// <param name="oldValue">Old value</param>
+        /// <param name="newValue">New value</param>
+        private void OnFixedAllDayPanelHeightChanged(int oldValue, int newValue)
+        {
+            if (FixedAllDayPanelHeightChanged != null)
+            {
+                FixedAllDayPanelHeightChanged(this,
+                    new FixedAllDayPanelHeightChangedEventArgs(oldValue, newValue));
+            }
+        }
+
+        #endregion
+
+        #region HilightCurrentDay
+
+        /// <summary>
+        /// Gets or sets whether the current calendar day is highlighted
+        /// </summary>
+        [DefaultValue(false)]
+        [Category("Appearance")]
+        [Description("Indicates whether the current calendar day is highlighted.")]
+        public bool HighlightCurrentDay
+        {
+            get { return (_HighlightCurrentDay); }
+
+            set
+            {
+                if (_HighlightCurrentDay != value)
+                {
+                    _HighlightCurrentDay = value;
+
+                    Refresh();
+                }
+            }
+        }
+
+        #endregion
+
+        #region MaximumAllDayPanelHeight
+
+        /// <summary>
+        /// Gets or sets the maximum height of the All Day Appointment panel
+        /// </summary>
+        [DefaultValue(120)]
+        [Category("Layout")]
+        [Description("Indicates the maximum AllDayPanel height for all Day and Week views.")]
+        public int MaximumAllDayPanelHeight
+        {
+            get { return (_MaximumAllDayPanelHeight); }
+
+            set
+            {
+                if (_MaximumAllDayPanelHeight != value)
+                {
+                    int oldValue = _MaximumAllDayPanelHeight;
+                    _MaximumAllDayPanelHeight = value;
+
+                    OnMaximumAllDayPanelHeightChanged(oldValue, value);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Propagates MaximumAllDayPanelHeightChanged events
+        /// </summary>
+        /// <param name="oldValue">Old value</param>
+        /// <param name="newValue">New value</param>
+        private void OnMaximumAllDayPanelHeightChanged(int oldValue, int newValue)
+        {
+            if (MaximumAllDayPanelHeightChanged != null)
+            {
+                MaximumAllDayPanelHeightChanged(this,
+                    new MaximumAllDayPanelHeightChangedEventArgs(oldValue, newValue));
+            }
+        }
+
+        #endregion
+
+        #region MinimumTimeSlotHeight
+
+        /// <summary>
+        /// Gets or sets the minimum height of the WeekDay time slots
+        /// </summary>
+        [DefaultValue(0)]
+        [Category("Layout")]
+        [Description("Indicates the minimum height of the WeekDay time slots.")]
+        public int MinimumTimeSlotHeight
+        {
+            get { return (_MinimumTimeSlotHeight); }
+
+            set
+            {
+                if (_MinimumTimeSlotHeight != value)
+                {
+                    int oldValue = _MinimumTimeSlotHeight;
+                    _MinimumTimeSlotHeight = value;
+
+                    CalendarPanel.NeedRecalcSize = true;
+                    CalendarPanel.Refresh();
+
+                    OnMinimumTimeSlotHeightChanged(oldValue, value);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Propagates MinimumTimeSlotHeightChanged events
+        /// </summary>
+        /// <param name="oldValue">Old value</param>
+        /// <param name="newValue">New value</param>
+        private void OnMinimumTimeSlotHeightChanged(int oldValue, int newValue)
+        {
+            if (MinimumTimeSlotHeightChanged != null)
+            {
+                MinimumTimeSlotHeightChanged(this,
+                    new MinimumTimeSlotHeightChangedEventArgs(oldValue, newValue));
+            }
+        }
+
+        #endregion
+
+        #region MultiUserTabHeight
+
+        private int _MultiUserTabHeight;
+
+        /// <summary>
+        /// Gets and sets the Calendar multi-user tab height
+        /// </summary>
+        [DefaultValue(0)]
+        [Category("Layout")]
+        [Description("Indicates the Calendar multi-user tab height.")]
+        public int MultiUserTabHeight
+        {
+            get
+            {
+                return ((_MultiUserTabHeight > 0)
+                    ? _MultiUserTabHeight : Font.Height + Dpi.Height(6));
+            }
+
+            set
+            {
+                if (_MultiUserTabHeight != value)
+                {
+                    _MultiUserTabHeight = value;
+
+                    CalendarPanel.NeedRecalcSize = true;
+                    CalendarPanel.Refresh();
+                }
+            }
+        }
+
+        #endregion
+
+        #region TimeIndicator
+
+        /// <summary>
+        /// Gets or sets the default TimeIndicator
+        /// </summary>
+        [Browsable(true)]
+        [Description("Default CalendarView TimeIndicator.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public TimeIndicator TimeIndicator
+        {
+            get
+            {
+                if (_TimeIndicator == null)
+                    TimeIndicator = new TimeIndicator();
+
+                return (_TimeIndicator);
+            }
+
+            set
+            {
+                if (_TimeIndicator != null)
+                {
+                    _TimeIndicator.IsProtected = false;
+
+                    TimeIndicators.Remove(_TimeIndicator);
+                }
+
+                _TimeIndicator = value;
+
+                if (value != null)
+                {
+                    _TimeIndicator.IsProtected = true;
+                    _TimeIndicator.IsDesignMode = DesignMode;
+
+                    TimeIndicators.Add(_TimeIndicator);
+                }
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetTimeIndicator()
+        {
+            TimeIndicator = new TimeIndicator();
+        }
+
+        #endregion
+
+        #region TimeSlotDuration
+
+        /// <summary>
+        /// Gets and sets the Time slot duration for all Day and Week views.
+        /// This value, in minutes, must be greater than 0 and less than or
+        /// equal to 30. Set values must also evenly divide the hour. This means
+        /// that values like 6, 10 and 20 are valid values, whereas 7, 11 and 31 are not
+        /// </summary>
+        [DefaultValue(MaxMinuteDuration)]
+        [Category("Layout")]
+        [Description("Indicates the Time Slot Duration for all Day and Week views. This value, in minutes, must be greater than 0 and less than or equal to 30. Set values must also evenly divide the hour. This means that values like 6, 10 and 20 are valid values, whereas 7, 11 and 31 are not.")]
+        public int TimeSlotDuration
+        {
+            get { return (_TimeSlotDuration); }
+
+            set
+            {
+                value = GetValidIntervalMinutes(value);
+
+                if (_TimeSlotDuration != value)
+                {
+                    int oldValue = _TimeSlotDuration;
+                    _TimeSlotDuration = value;
+
+                    _SlotsPerHour = MinutesPerHour / _TimeSlotDuration;
+
+                    OnTimeSlotDurationChanged(oldValue, value);
+                }
+            }
+        }
+
+        /// <summary>
+        /// OnTimeSlotDurationChanged event propagation
+        /// </summary>
+        protected virtual void OnTimeSlotDurationChanged(int oldVal, int newVal)
+        {
+            if (TimeSlotDurationChanged != null)
+                TimeSlotDurationChanged(this, new TimeSlotDurationChangedEventArgs(oldVal, newVal));
+        }
+
+        #endregion
+
+        #region TimeRulerFont
+
+        /// <summary>
+        /// Gets and sets the TimeRuler Font. If not set, the default used
+        /// is a percentage of the System Caption Font.
+        /// </summary>
+        [Category("Layout")]
+        [Description("Indicates the TimeRuler Font. If not set, the default used is a percentage of the System Caption Font.")]
+        public Font TimeRulerFont
+        {
+            get
+            {
+                if (_TimeRulerFont == null)
+                    _TimeRulerFont = new Font(SystemFonts.CaptionFont.FontFamily, SystemFonts.CaptionFont.Size * 1.3f);
+
+                return (_TimeRulerFont);
+            }
+
+            set
+            {
+                if (_TimeRulerFont != null)
+                    _TimeRulerFont.Dispose();
+
+                _TimeRulerFont = value;
+                
+                Refresh();
+            }
+        }
+
+        #endregion
+
+        #region TimeRulerFontSm
+
+        /// <summary>
+        /// Gets and sets the TimeRuler 'Small' Font. If not set, the default used
+        /// is a percentage of the System Caption Font.
+        /// </summary>
+        [Category("Layout")]
+        [Description("Indicates the TimeRuler 'Small' Font. If not set, the default used is a percentage of the System Caption Font.")]
+        public Font TimeRulerFontSm
+        {
+            get
+            {
+                if (_TimeRulerFontSm == null)
+                    _TimeRulerFontSm = new Font(SystemFonts.CaptionFont.FontFamily, SystemFonts.CaptionFont.Size * .8f);
+
+                return (_TimeRulerFontSm);
+            }
+
+            set
+            {
+                if (_TimeRulerFontSm != null)
+                    _TimeRulerFontSm.Dispose();
+
+                _TimeRulerFontSm = value;
+
+                Refresh();
+            }
+        }
+
+        #endregion
+
+        #region Is24HourFormat
+
+        /// <summary>
+        /// Gets and sets the 12 or 24 hour
+        /// formatting that is used in the Day and Week views
+        /// </summary>
+        [DefaultValue(false)]
+        [Category("Appearance")]
+        [Description("Indicates whether 12 or 24 hour formatting is used in the Day and Week views.")]
+        public bool Is24HourFormat
+        {
+            get { return (_Is24HourFormat); }
+
+            set
+            {
+                if (_Is24HourFormat != value)
+                {
+                    _Is24HourFormat = value;
+
+                    OnIs24HourFormatChanged(!value, value);
+                }
+            }
+        }
+
+        /// <summary>
+        /// OnIs24HourFormatChanged event propagation
+        /// </summary>
+        private void OnIs24HourFormatChanged(bool oldValue, bool newValue)
+        {
+            if (Is24HourFormatChanged != null)
+                Is24HourFormatChanged(this, new Is24HourFormatChangedEventArgs(oldValue, newValue));
+        }
+
+        #endregion
+
+        #region LabelTimeSlots
+
+        /// <summary>
+        /// Gets and sets whether time slot labels are
+        /// displayed in the Day and Week view TimeRulerPanel
+        /// </summary>
+        [DefaultValue(false)]
+        [Category("Appearance")]
+        [Description("Indicates whether minor time labels are displayed in the Day and Week view TimeRulerPanel.")]
+        public bool LabelTimeSlots
+        {
+            get { return (_LabelTimeSlots); }
+
+            set
+            {
+                if (_LabelTimeSlots != value)
+                {
+                    bool oldValue = _LabelTimeSlots;
+                    _LabelTimeSlots = value;
+
+                    OnLabelTimeSlotsChanged(oldValue, value);
+                }
+            }
+        }
+
+        /// <summary>
+        /// OnLabelTimeSlotsChanged event propagation
+        /// </summary>
+        protected virtual void OnLabelTimeSlotsChanged(bool oldVal, bool newVal)
+        {
+            if (LabelTimeSlotsChanged != null)
+                LabelTimeSlotsChanged(this, new LabelTimeSlotsChangedEventArgs(oldVal, newVal));
+        }
+
+        #endregion
+
+        #region ShowOnlyWorkDayHours
+
+        /// <summary>
+        /// Gets and sets whether only WorkDay hours are
+        /// displayed in the Day and Week views
+        /// </summary>
+        [DefaultValue(false)]
+        [Category("Appearance")]
+        [Description("Indicates whether only WorkDay hours are displayed in the Day and Week views.")]
+        public bool ShowOnlyWorkDayHours
+        {
+            get { return (_ShowOnlyWorkDayHours); }
+
+            set
+            {
+                if (_ShowOnlyWorkDayHours != value)
+                {
+                    bool oldValue = _ShowOnlyWorkDayHours;
+                    _ShowOnlyWorkDayHours = value;
+
+                    CalendarPanel.RecalcSize();
+
+                    OnShowOnlyWorkDayHoursChanged(oldValue, value);
+                }
+            }
+        }
+
+        /// <summary>
+        /// OnShowOnlyWorkDayHoursChanged event propagation
+        /// </summary>
+        protected virtual void OnShowOnlyWorkDayHoursChanged(bool oldVal, bool newVal)
+        {
+            if (ShowOnlyWorkDayHoursChanged != null)
+                ShowOnlyWorkDayHoursChanged(this, new ShowOnlyWorkDayHoursChangedEventArgs(oldVal, newVal));
+        }
+
+        #endregion
+
+        #region ShowTabs
+
+        /// <summary>
+        /// Gets and sets multi-user tab visibility
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Appearance")]
+        [Description("Indicates multi-user tab visibility.")]
+        public bool ShowTabs
+        {
+            get { return (_ShowTabs); }
+
+            set
+            {
+                if (_ShowTabs != value)
+                {
+                    _ShowTabs = value;
+
+                    CalendarPanel.NeedRecalcSize = true;
+                    CalendarPanel.Refresh();
+                }
+            }
+        }
+
+        #endregion
+
+        #region IsMonthSideBarVisible
+
+        /// <summary>
+        /// Gets and sets the default Month view SideBar visibility
+        /// </summary>
+        [DefaultValue(true)]
+        [Category("Behavior")]
+        [Description("Indicates the default Month view SideBar visibility.")]
+        public bool IsMonthSideBarVisible
+        {
+            get { return (_IsMonthSideBarVisible); }
+
+            set
+            {
+                if (_IsMonthSideBarVisible != value)
+                {
+                    bool oldValue = _IsMonthSideBarVisible;
+                    _IsMonthSideBarVisible = value;
+
+                    OnIsMonthSideBarVisibleChanged(oldValue, value);
+
+                    Refresh();
+                }
+            }
+        }
+
+        /// <summary>
+        /// OnIsMonthSideBarVisibleChanged event propagation
+        /// </summary>
+        protected virtual void OnIsMonthSideBarVisibleChanged(bool oldVal, bool newVal)
+        {
+            if (IsMonthSideBarVisibleChanged != null)
+                IsMonthSideBarVisibleChanged(this, new IsMonthSideBarVisibleChangedEventArgs(oldVal, newVal));
+        }
+
+        #endregion
+
+        #region IsMonthMoreItemsIndicatorVisible
+
+        /// <summary>
+        /// Gets and sets the Month view 'More Items' indicator visibility
+        /// </summary>
+        [DefaultValue(true)]
+        [Category("Behavior")]
+        [Description("Indicates the Month view 'More Items' indicator visibility.")]
+        public bool IsMonthMoreItemsIndicatorVisible
+        {
+            get { return (_IsMonthMoreItemsIndicatorVisible); }
+
+            set
+            {
+                if (_IsMonthMoreItemsIndicatorVisible != value)
+                {
+                    bool oldValue = _IsMonthMoreItemsIndicatorVisible;
+                    _IsMonthMoreItemsIndicatorVisible = value;
+
+                    OnIsMonthMoreItemsIndicatorVisibleChanged(oldValue, value);
+
+                    Refresh();
+                }
+            }
+        }
+
+        /// <summary>
+        /// OnIsMonthMoreItemsIndicatorVisibleChanged event propagation
+        /// </summary>
+        protected virtual void OnIsMonthMoreItemsIndicatorVisibleChanged(bool oldVal, bool newVal)
+        {
+            if (IsMonthMoreItemsIndicatorVisibleChanged != null)
+                IsMonthMoreItemsIndicatorVisibleChanged(this, new IsMonthMoreItemsIndicatorVisibleChangedEventArgs(oldVal, newVal));
+        }
+
+        #endregion
+
+        #region IsTimeRulerVisible
+
+        /// <summary>
+        /// Gets and sets whether the Week/Day view TimeRuler is visible
+        /// </summary>
+        [DefaultValue(true)]
+        [Category("Behavior")]
+        [Description("Indicates whether the Week/Day view TimeRuler is visible.")]
+        public bool IsTimeRulerVisible
+        {
+            get { return (_IsTimeRulerVisible); }
+
+            set
+            {
+                if (_IsTimeRulerVisible != value)
+                {
+                    bool oldValue = _IsTimeRulerVisible;
+                    _IsTimeRulerVisible = value;
+
+                    OnIsTimeRulerVisibleChanged(oldValue, value);
+
+                    SetSelectedView(SelectedView);
+                }
+            }
+        }
+
+        /// <summary>
+        /// OnIsTimeRulerVisibleChanged event propagation
+        /// </summary>
+        protected virtual void OnIsTimeRulerVisibleChanged(bool oldVal, bool newVal)
+        {
+            if (IsTimeRulerVisibleChanged != null)
+                IsTimeRulerVisibleChanged(this, new IsTimeRulerVisibleChangedEventArgs(oldVal, newVal));
+        }
+
+        #endregion
+
+        #region EnableDragDrop
+
+        /// <summary>
+        /// Gets and sets whether DragDrop across calendar views is enabled
+        /// </summary>
+        [DefaultValue(true)]
+        [Category("Behavior")]
+        [Description("Indicates whether DragDrop operations are enabled between calendar views.")]
+        public bool EnableDragDrop
+        {
+            get { return (_EnableDragDrop); }
+
+            set
+            {
+                if (_EnableDragDrop != value)
+                {
+                    _EnableDragDrop = value;
+
+                    OnEnableDragDropChanged(!value, value);
+                }
+            }
+        }
+
+        /// <summary>
+        /// OnEnableDragDropChanged event propagation
+        /// </summary>
+        protected virtual void OnEnableDragDropChanged(bool oldVal, bool newVal)
+        {
+            if (EnableDragDropChanged != null)
+                EnableDragDropChanged(this, new EnableDragDropChangedEventArgs(oldVal, newVal));
+        }
+
+        #endregion
+
+        #region EnableDragCopy
+
+        /// <summary>
+        /// Gets or sets whether a new copy of an item will be
+        /// created when holding the Control-Key while dragging it.
+        /// </summary>
+        [DefaultValue(true)]
+        [Category("Behavior")]
+        [Description("Indicates whether a new copy of an item will be created when holding the Control-Key while dragging it.")]
+        public bool EnableDragCopy
+        {
+            get { return (_EnableDragCopy); }
+            set { _EnableDragCopy = value; }
+        }
+
+        #endregion
+
+        #region TouchEnabled
+
+        /// <summary>
+        /// Indicates whether touch support for scrolling is enabled.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior")]
+        [Description("Indicates whether touch support for scrolling is enabled.")]
+        public bool TouchEnabled
+        {
+            get { return _TouchEnabled; }
+            set { _TouchEnabled = value; }
+        }
+
+        #endregion
+
+        #region YearViewAllowDateSelection
+
+        /// <summary>
+        /// Gets and sets whether date selection is permitted
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Behavior")]
+        [Description("Indicates whether YearView date selection is permitted.")]
+        public bool YearViewAllowDateSelection
+        {
+            get { return (_YearViewAllowDateSelection); }
+
+            set
+            {
+                if (_YearViewAllowDateSelection != value)
+                {
+                    bool oldValue = _YearViewAllowDateSelection;
+                    _YearViewAllowDateSelection = value;
+
+                    OnYearViewAllowDateSelectionChanged(oldValue, value);
+                }
+            }
+        }
+
+        /// <summary>
+        /// YearViewAllowDateSelectionChanged event propagation
+        /// </summary>
+        protected virtual void OnYearViewAllowDateSelectionChanged(bool oldVal, bool newVal)
+        {
+            if (YearViewAllowDateSelectionChanged != null)
+                YearViewAllowDateSelectionChanged(this, new AllowDateSelectionChangedEventArgs(oldVal, newVal));
+        }
+
+        #endregion
+
+        #region YearViewAppointmentLink
+
+        /// <summary>
+        /// Gets and sets the YearView Appointment Link mode. This defines the
+        /// interaction between the mouse and YearView days that contain appointments.
+        /// </summary>
+        [Browsable(true), DefaultValue(eYearViewDayLink.Click), Category("Behavior")]
+        [Description("Indicates the YearView Appointment Link mode. This defines the interaction between the mouse and YearView days that contain appointments.")]
+        public eYearViewDayLink YearViewAppointmentLink
+        {
+            get { return (_YearViewAppointmentLink); }
+
+            set
+            {
+                if (_YearViewAppointmentLink != value)
+                {
+                    eYearViewDayLink oldValue = _YearViewAppointmentLink;
+                    _YearViewAppointmentLink = value;
+
+                    OnYearViewAppointmentLinkChanged(oldValue, value);
+                }
+            }
+        }
+
+        /// <summary>
+        /// YearViewAppointmentLinkChanged event propagation
+        /// </summary>
+        private void OnYearViewAppointmentLinkChanged(eYearViewDayLink oldVal, eYearViewDayLink newVal)
+        {
+            if (YearViewAppointmentLinkChanged != null)
+                YearViewAppointmentLinkChanged(this, new DayLinkChangedEventArgs(oldVal, newVal));
+        }
+
+        #endregion
+
+        #region YearViewNonAppointmentLink
+
+        /// <summary>
+        /// Gets and sets the YearView Non-Appointment Link mode. This defines the
+        /// interaction between the mouse and YearView days that do not contain appointments.
+        /// </summary>
+        [Browsable(true), DefaultValue(eYearViewDayLink.DoubleClick), Category("Behavior")]
+        [Description("Indicates the YearView Non-Appointment Link mode. This defines the interaction between the mouse and YearView days that do not contain appointments.")]
+        public eYearViewDayLink YearViewNonAppointmentLink
+        {
+            get { return (_YearViewNonAppointmentLink); }
+
+            set
+            {
+                if (_YearViewNonAppointmentLink != value)
+                {
+                    eYearViewDayLink oldValue = _YearViewNonAppointmentLink;
+                    _YearViewNonAppointmentLink = value;
+
+                    OnYearViewNonAppointmentLinkChanged(oldValue, value);
+                }
+            }
+        }
+
+        /// <summary>
+        /// YearViewNonAppointmentLinkChanged event propagation
+        /// </summary>
+        private void OnYearViewNonAppointmentLinkChanged(eYearViewDayLink oldVal, eYearViewDayLink newVal)
+        {
+            if (YearViewNonAppointmentLinkChanged != null)
+                YearViewNonAppointmentLinkChanged(this, new DayLinkChangedEventArgs(oldVal, newVal));
+        }
+
+        #endregion
+
+        #region YearViewLinkView
+
+        /// <summary>
+        /// Gets or sets the Link Calendar View. This defines the
+        /// View that is activated when a YearView date 'link' is selected.
+        /// </summary>
+        [Browsable(true), DefaultValue(eCalendarView.Day), Category("Behavior")]
+        [Description("Indicates the Link Calendar View. This defines the View that is activated when a YearView date 'link' is selected.")]
+        public eCalendarView YearViewLinkView
+        {
+            get { return (_YearViewLinkView); }
+
+            set
+            {
+                if (_YearViewLinkView != value)
+                {
+                    eCalendarView oldValue = _YearViewLinkView;
+                    _YearViewLinkView = value;
+
+                    OnYearYearViewLinkViewChanged(oldValue, value);
+                }
+            }
+        }
+
+        /// <summary>
+        /// YearYearViewLinkViewChanged event propagation
+        /// </summary>
+        protected virtual void OnYearYearViewLinkViewChanged(eCalendarView oldVal, eCalendarView newVal)
+        {
+            if (YearViewLinkViewChanged != null)
+                YearViewLinkViewChanged(this, new LinkViewChangedEventArgs(oldVal, newVal));
+        }
+
+        #endregion
+
+        #region YearViewLinkAction
+
+        /// <summary>
+        /// Gets or sets the Link action. This defines the
+        /// action that is taken when a YearView date 'link' is selected.
+        /// </summary>
+        [Browsable(true), DefaultValue(eYearViewLinkAction.GoToDate), Category("Behavior")]
+        [Description("Indicates the Link Calendar View. This defines the View that is activated when a YearView date 'link' is selected.")]
+        public eYearViewLinkAction YearViewLinkAction
+        {
+            get { return (_YearViewLinkAction); }
+
+            set
+            {
+                if (_YearViewLinkAction != value)
+                {
+                    eYearViewLinkAction oldValue = _YearViewLinkAction;
+                    _YearViewLinkAction = value;
+
+                    OnYearViewLinkActionChanged(oldValue, value);
+                }
+            }
+        }
+
+        /// <summary>
+        /// YearViewLinkActionChanged event propagation
+        /// </summary>
+        private void OnYearViewLinkActionChanged(eYearViewLinkAction oldVal, eYearViewLinkAction newVal)
+        {
+            if (YearViewLinkActionChanged != null)
+                YearViewLinkActionChanged(this, new LinkViewActionChangedEventArgs(oldVal, newVal));
+        }
+
+        #endregion
+
+        #region YearViewAppointmentLinkStyle
+
+        /// <summary>
+        /// Gets or sets the AppointmentLink display style. This defines the
+        /// style that is used when 'highlighting' YearView date links.
+        /// </summary>
+        [Browsable(true), DefaultValue(eYearViewLinkStyle.Style1), Category("Appearance")]
+        [Description("Indicates the AppointmentLink display style. This defines the style that is used when 'highlighting' YearView date links.")]
+        public eYearViewLinkStyle YearViewAppointmentLinkStyle
+        {
+            get { return (_YearViewAppointmentLinkStyle); }
+
+            set
+            {
+                if (_YearViewAppointmentLinkStyle != value)
+                {
+                    eYearViewLinkStyle oldValue = _YearViewAppointmentLinkStyle;
+                    _YearViewAppointmentLinkStyle = value;
+
+                    OnYearViewLinkStyleChanged(oldValue, value);
+
+                    Refresh();
+                }
+            }
+        }
+
+        /// <summary>
+        /// YearViewLinkStyleChanged event propagation
+        /// </summary>
+        private void OnYearViewLinkStyleChanged(eYearViewLinkStyle oldVal, eYearViewLinkStyle newVal)
+        {
+            if (YearViewLinkStyleChanged != null)
+                YearViewLinkStyleChanged(this, new LinkViewStyleChangedEventArgs(oldVal, newVal));
+        }
+
+        #endregion
+
+        #region YearViewShowGridLines
+
+        /// <summary>
+        /// Gets and sets the YearView grid lines visibility
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Behavior")]
+        [Description("Indicates the YearView grid lines visibility.")]
+        public bool YearViewShowGridLines
+        {
+            get { return (_YearViewShowGridLines); }
+
+            set
+            {
+                if (_YearViewShowGridLines != value)
+                {
+                    bool oldValue = _YearViewShowGridLines;
+                    _YearViewShowGridLines = value;
+
+                    OnYearViewShowGridLinesChanged(oldValue, value);
+
+                    Refresh();
+                }
+            }
+        }
+
+        /// <summary>
+        /// OnYearViewShowGridLinesChanged event propagation
+        /// </summary>
+        protected virtual void OnYearViewShowGridLinesChanged(bool oldVal, bool newVal)
+        {
+            if (YearViewShowGridLinesChanged != null)
+                YearViewShowGridLinesChanged(this, new ShowGridLinesChangedEventArgs(oldVal, newVal));
+        }
+
+        #endregion
+
+        #region WeekDayCanExtendRange
+
+        /// <summary>
+        /// Gets or sets whether the Week or Day View Start and End dates can be
+        /// can be automatically extended by the control when the user presses
+        /// the left or right arrow keys.
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Behavior")]
+        [Description("Indicates whether the Week or Day View Start and End dates can be can be automatically extended by the control when the user presses the left or right arrow keys..")]
+        public bool WeekDayCanExtendRange
+        {
+            get { return (_WeekDayCanExtendRange); }
+
+            set
+            {
+                if (_WeekDayCanExtendRange != value)
+                {
+                    bool oldValue = _WeekDayCanExtendRange;
+                    _WeekDayCanExtendRange = value;
+
+                    OnWeekDayCanExtendRangeChanged(oldValue, value);
+                }
+            }
+        }
+
+        /// <summary>
+        /// OnWeekDayCanExtendRangeChanged event propagation
+        /// </summary>
+        protected virtual void OnWeekDayCanExtendRangeChanged(bool oldVal, bool newVal)
+        {
+            if (WeekDayCanExtendRangeChanged != null)
+                WeekDayCanExtendRangeChanged(this, new WeekDayCanExtendRangeChangedEventArgs(oldVal, newVal));
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Non-Browsable properties
+
+        #region AutoScrollMinSize
+
+        public new Size AutoScrollMinSize
+        {
+            get { return (CalendarPanel.AutoScrollMinSize); }
+            set { CalendarPanel.AutoScrollMinSize = value; }
+        }
+
+        #endregion
+
+        #region AutoScrollPosition
+
+        public new Point AutoScrollPosition
+        {
+            get { return (CalendarPanel.AutoScrollPosition); }
+            set { CalendarPanel.AutoScrollPosition = value; }
+        }
+
+        #endregion
+
+        #region CalendarModel
+
+        /// <summary>
+        /// Gets and sets the calendar Model
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public CalendarModel CalendarModel
+        {
+            get { return (_CalendarModel); }
+
+            set
+            {
+                if (_CalendarModel != value)
+                {
+                    if (_CalendarModel != null)
+                        HookModelEvents(false);
+
+                    CalendarModel oldModel = _CalendarModel;
+                    _CalendarModel = value;
+
+                    HookModelEvents(true);
+
+                    OnModelChanged(oldModel, value);
+                }
+            }
+        }
+
+        /// <summary>
+        /// OnModelChanged event propagation
+        /// </summary>
+        protected virtual void OnModelChanged(CalendarModel oldModel, CalendarModel newModel)
+        {
+            if (ModelChanged != null)
+                ModelChanged(this, new ModelEventArgs(oldModel, newModel));
+
+            if (IsMultiCalendar)
+            {
+                for (int i = 0; i < DisplayedOwners.Count; i++)
+                {
+                    if (MultiCalendarDayViews.Views[i] != null)
+                        UpdateModelData(i, MultiCalendarDayViews.Views[i]);
+
+                    if (MultiCalendarWeekViews.Views[i] != null)
+                        UpdateModelData(i, MultiCalendarWeekViews.Views[i]);
+
+                    if (MultiCalendarMonthViews.Views[i] != null)
+                        UpdateModelData(i, MultiCalendarMonthViews.Views[i]);
+
+                    if (MultiCalendarYearViews.Views[i] != null)
+                        UpdateModelData(i, MultiCalendarYearViews.Views[i]);
+
+                    if (MultiCalendarTimeLineViews.Views[i] != null)
+                        UpdateModelData(i, MultiCalendarTimeLineViews.Views[i]);
+                }
+            }
+
+            _CalendarPanel.RecalcSize();
+        }
+
+        #region UpdateModelData
+
+        private void UpdateModelData(int index, BaseView view)
+        {
+            Owner owner = _CalendarModel.Owners[view.OwnerKey];
+
+            if (owner != null)
+            {
+                view.CalendarColor = owner.ColorScheme;
+                view.DisplayName = owner.DisplayName;
+            }
+            else
+            {
+                view.CalendarColor = GetViewColor(null, index);
+                view.DisplayName = view.OwnerKey;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region CategoryColors
+
+        /// <summary>
+        /// Appointment CategoryColors
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public AppointmentCategoryColorCollection CategoryColors
+        {
+            get
+            {
+                if (_CategoryColors == null)
+                {
+                    _CategoryColors = new AppointmentCategoryColorCollection();
+
+                    _CategoryColors.AppointmentCategoryColorCollectionChanged +=
+                        CategoryColorsAppointmentCategoryColorCollectionChanged;
+                }
+
+                return (_CategoryColors);
+            }
+        }
+
+        #endregion
+
+        #region CustomItems
+
+        /// <summary>
+        /// Gets the collection of user defined custom
+        /// CalendarItems
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public CustomCalendarItemCollection CustomItems
+        {
+            get { return (_CustomItems); }
+        }
+
+        #endregion
+
+        #region DateSelectionStart
+
+        /// <summary>
+        /// Gets or sets the selection start date
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public DateTime? DateSelectionStart
+        {
+            get { return (_DateSelectionStart); }
+
+            set
+            {
+                if (_DateSelectionStart != value)
+                {
+                    DateTime? oldDate = _DateSelectionStart;
+                    _DateSelectionStart = value;
+
+                    OnDateSelectionStartChanged(oldDate, value);
+                }
+            }
+        }
+
+        /// <summary>
+        /// OnDateSelectionStartChanged event propagation
+        /// </summary>
+        protected virtual void OnDateSelectionStartChanged(DateTime? oldDate, DateTime? newDate)
+        {
+            if (DateSelectionStartChanged != null)
+                DateSelectionStartChanged(this, new DateSelectionEventArgs(oldDate, newDate));
+        }
+
+        #endregion
+
+        #region DateSelectionEnd
+
+        /// <summary>
+        /// Gets or sets the end date selection
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public DateTime? DateSelectionEnd
+        {
+            get { return (_DateSelectionEnd); }
+
+            set
+            {
+                if (_DateSelectionEnd != value)
+                {
+                    DateTime? oldDate = _DateSelectionEnd;
+                    _DateSelectionEnd = value;
+
+                    OnDateSelectionEndChanged(oldDate, value);
+                }
+            }
+        }
+
+        /// <summary>
+        /// OnDateSelectionEndChanged event propagation
+        /// </summary>
+        protected virtual void OnDateSelectionEndChanged(DateTime? oldDate, DateTime? newDate)
+        {
+            if (DateSelectionEndChanged != null)
+                DateSelectionEndChanged(this, new DateSelectionEventArgs(oldDate, newDate));
+        }
+
+        #endregion
+
+        #region DayView properties
+
+        /// <summary>
+        /// Gets the Day View
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public DayView DayView
+        {
+            get
+            {
+                if (_DayView == null)
+                {
+                    // Single-user DayView is not accessible
+                    // when in multi-user mode
+
+                    if (IsMultiCalendar == false)
+                    {
+                        _DayView = new DayView(this);
+
+                        _DayView.StartDate = _DayViewDate;
+                        _DayView.EndDate = _DayViewDate;
+
+                        _DayView.CalendarColor = GetViewColor(_DayView, 0);
+                    }
+                }
+
+                return (_DayView);
+            }
+
+            internal set
+            {
+                if (_DayView != value)
+                {
+                    if (_DayView != null)
+                        _DayView.Dispose();
+
+                    _DayView = value;
+                }
+            }
+        }
+
+        #region DayViewDate
+
+        /// <summary>
+        /// Gets and sets the DayView date
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public DateTime DayViewDate
+        {
+            get { return (_DayViewDate); }
+
+            set
+            {
+                value = value.Date;
+
+                if (_DayViewDate != value)
+                {
+                    DateTime oldDate = _DayViewDate;
+                    _DayViewDate = value;
+
+                    // Inform interested parties of the change
+
+                    OnDayViewDateChanged(oldDate, value);
+                    OnViewDateChanged(DayView, oldDate, value, oldDate, value);
+
+                    // Save AutoSyncDate
+
+                    _AutoSyncDate = value;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Sends DayViewDateChanged event
+        /// </summary>
+        /// <param name="oldDate">Old date</param>
+        /// <param name="newDate">New date</param>
+        private void OnDayViewDateChanged(DateTime oldDate, DateTime newDate)
+        {
+            if (DayViewDateChanged != null)
+                DayViewDateChanged(this, new DateChangeEventArgs(oldDate, newDate));
+        }
+
+        private void OnViewDateChanged(BaseView view, DateTime oldStartDate,
+            DateTime newStartDate, DateTime oldEndDate, DateTime newEndDate)
+        {
+            if (ViewDateChanged != null)
+            {
+                ViewDateChanged(this, new ViewDateChangedEventArgs(
+                    view, oldStartDate, newStartDate, oldEndDate, newEndDate));
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region HScrollBar
+
+        /// <summary>
+        /// Gets and sets the Calendar Multiuser Horizontal scrollbar
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public HScrollBarAdv HScrollBar
+        {
+            get { return (_CalendarPanel.HScrollBar); }
+        }
+
+        #endregion
+
+        #region WeekView properties
+
+        /// <summary>
+        /// Gets the Week View
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public WeekView WeekView
+        {
+            get
+            {
+                if (_WeekView == null)
+                {
+                    // Single-user WeekView is not accessible
+                    // when in multi-user mode
+
+                    if (IsMultiCalendar == false)
+                    {
+                        _WeekView = new WeekView(this);
+
+                        _WeekView.StartDate = _WeekViewStartDate;
+                        _WeekView.EndDate = _WeekViewEndDate;
+
+                        _WeekView.CalendarColor = GetViewColor(_WeekView, 0);
+                    }
+                }
+
+                return (_WeekView);
+            }
+
+            internal set
+            {
+                if (_WeekView != value)
+                {
+                    if (_WeekView != null)
+                        _WeekView.Dispose();
+
+                    _WeekView = value;
+                }
+            }
+        }
+
+        #region WeekViewStartDate
+
+        /// <summary>
+        /// Gets and sets the week start date
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public DateTime WeekViewStartDate
+        {
+            get { return (_WeekViewStartDate); }
+
+            set
+            {
+                value = value.Date;
+
+                if (_WeekViewStartDate.Equals(value) == false)
+                {
+                    DateTime oldDate = _WeekViewStartDate;
+                    _WeekViewStartDate = value;
+
+                    // Inform interested parties of the change
+
+                    OnWeekViewStartDateChanged(oldDate, value);
+
+                    OnViewDateChanged(WeekView,
+                        oldDate, value, _WeekViewEndDate, _WeekViewEndDate);
+
+                    // Save AutoSyncDate
+
+                    _AutoSyncDate = value;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Sends WeekViewStartDateChanged event
+        /// </summary>
+        /// <param name="oldDate">Old date</param>
+        /// <param name="newDate">New date</param>
+        private void OnWeekViewStartDateChanged(DateTime oldDate, DateTime newDate)
+        {
+            if (WeekViewStartDateChanged != null)
+                WeekViewStartDateChanged(this, new DateChangeEventArgs(oldDate, newDate));
+        }
+
+        #endregion
+
+        #region WeekViewEndDate
+
+        /// <summary>
+        /// Gets the week end date
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public DateTime WeekViewEndDate
+        {
+            get { return (_WeekViewEndDate); }
+
+            set
+            {
+                value = value.Date;
+
+                if (_WeekViewEndDate.Equals(value) == false)
+                {
+                    DateTime oldDate = _WeekViewEndDate;
+                    _WeekViewEndDate = value;
+
+                    // Inform interested parties of the change
+
+                    OnWeekViewEndDateChanged(oldDate, value);
+
+                    OnViewDateChanged(WeekView,
+                        _WeekViewStartDate, _WeekViewStartDate, oldDate, value);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Sends WeekViewEndDateChanged event
+        /// </summary>
+        /// <param name="oldDate">Old date</param>
+        /// <param name="newDate">New date</param>
+        private void OnWeekViewEndDateChanged(DateTime oldDate, DateTime newDate)
+        {
+            if (WeekViewEndDateChanged != null)
+                WeekViewEndDateChanged(this, new DateChangeEventArgs(oldDate, newDate));
+        }
+
+        #endregion
+
+        #endregion
+
+        #region MonthView properties
+
+        /// <summary>
+        /// Gets the Month View
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public MonthView MonthView
+        {
+            get
+            {
+                if (_MonthView == null)
+                {
+                    // Single-user MonthView is not accessible
+                    // when in multi-user mode
+
+                    if (IsMultiCalendar == false)
+                    {
+                        _MonthView = new MonthView(this);
+
+                        _MonthView.StartDate = _MonthViewStartDate;
+                        _MonthView.EndDate = _MonthViewEndDate;
+
+                        _MonthView.IsSideBarVisible = _IsMonthSideBarVisible;
+                        _MonthView.CalendarColor = GetViewColor(_MonthView, 0);
+                    }
+                }
+
+                return (_MonthView);
+            }
+
+            internal set
+            {
+                if (_MonthView != value)
+                {
+                    if (_MonthView != null)
+                        _MonthView.Dispose();
+
+                    _MonthView = value;
+                }
+            }
+        }
+
+        #region MonthViewStartDate
+
+        /// <summary>
+        /// Gets and sets the month start date
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public DateTime MonthViewStartDate
+        {
+            get { return (_MonthViewStartDate); }
+
+            set
+            {
+                value = value.Date;
+
+                if (_MonthViewStartDate.Equals(value) == false)
+                {
+                    DateTime oldDate = _MonthViewStartDate;
+                    _MonthViewStartDate = value;
+
+                    // Inform interested parties of the change
+
+                    OnMonthViewStartDateChanged(oldDate, value);
+
+                    OnViewDateChanged(MonthView,
+                        oldDate, value, _MonthViewEndDate, _MonthViewEndDate);
+
+                    // Save AutoSyncDate
+
+                    _AutoSyncDate = value;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Sends MonthViewStartDateChanged event
+        /// </summary>
+        /// <param name="oldDate">Old date</param>
+        /// <param name="newDate">New date</param>
+        private void OnMonthViewStartDateChanged(DateTime oldDate, DateTime newDate)
+        {
+            if (MonthViewStartDateChanged != null)
+                MonthViewStartDateChanged(this, new DateChangeEventArgs(oldDate, newDate));
+        }
+
+        #endregion
+
+        #region MonthViewEndDate
+
+        /// <summary>
+        /// Gets the month end date
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public DateTime MonthViewEndDate
+        {
+            get { return (_MonthViewEndDate); }
+
+            set
+            {
+                value = value.Date;
+
+                if (_MonthViewEndDate.Equals(value) == false)
+                {
+                    DateTime oldDate = _MonthViewEndDate;
+                    _MonthViewEndDate = value;
+
+                    // Inform interested parties of the change
+
+                    OnMonthViewEndDateChanged(oldDate, value);
+
+                    OnViewDateChanged(MonthView,
+                        _MonthViewStartDate, _MonthViewStartDate, oldDate, value);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Sends MonthViewEndDateChanged event
+        /// </summary>
+        /// <param name="oldDate">Old date</param>
+        /// <param name="newDate">New date</param>
+        private void OnMonthViewEndDateChanged(DateTime oldDate, DateTime newDate)
+        {
+            if (MonthViewEndDateChanged != null)
+                MonthViewEndDateChanged(this, new DateChangeEventArgs(oldDate, newDate));
+        }
+
+        #endregion
+
+        #region MonthViewHorizontalPadding
+
+        /// <summary>
+        /// Gets and sets the horizontal padding used between
+        /// items displayed in the Month view
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public int MonthViewHorizontalPadding
+        {
+            get { return (_MonthViewHorizontalPadding); }
+
+            set
+            {
+                if (_MonthViewHorizontalPadding != value)
+                {
+                    int oldValue = _MonthViewHorizontalPadding;
+                    _MonthViewHorizontalPadding = value;
+
+                    CalendarPanel.Refresh();
+
+                    // Inform interested parties of the change
+
+                    OnMonthViewHorizontalPaddingChanged(oldValue, value);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Sends MonthViewHorizontalPaddingChanged events
+        /// </summary>
+        /// <param name="oldValue">Old padding</param>
+        /// <param name="newValue">New padding</param>
+        private void OnMonthViewHorizontalPaddingChanged(int oldValue, int newValue)
+        {
+            if (MonthViewHorizontalPaddingChanged != null)
+                MonthViewHorizontalPaddingChanged(this, new MonthViewHorizontalPaddingChangedEventArgs(oldValue, newValue));
+        }
+
+        #endregion
+
+        #endregion
+
+        #region YearView properties
+
+        /// <summary>
+        /// Gets the Year View
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public YearView YearView
+        {
+            get
+            {
+                if (_YearView == null)
+                {
+                    // Single-user YearView is not accessible
+                    // when in multi-user mode
+
+                    if (IsMultiCalendar == false)
+                    {
+                        _YearView = new YearView(this);
+
+                        _YearView.StartDate = _YearViewStartDate;
+                        _YearView.EndDate = _YearViewEndDate;
+
+                        _YearView.CalendarColor = GetViewColor(_YearView, 0);
+                    }
+                }
+
+                return (_YearView);
+            }
+
+            internal set
+            {
+                if (_YearView != value)
+                {
+                    if (_YearView != null)
+                        _YearView.Dispose();
+
+                    _YearView = value;
+                }
+            }
+        }
+
+        #region YearViewStartDate
+
+        /// <summary>
+        /// Gets and sets the YearView start date
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public DateTime YearViewStartDate
+        {
+            get { return (_YearViewStartDate); }
+
+            set
+            {
+                value = value.Date;
+
+                if (_YearViewStartDate.Equals(value) == false)
+                {
+                    DateTime oldDate = _YearViewStartDate;
+                    _YearViewStartDate = value;
+
+                    // Inform interested parties of the change
+
+                    OnYearViewStartDateChanged(oldDate, value);
+
+                    OnViewDateChanged(YearView,
+                        oldDate, value, _YearViewStartDate, _YearViewEndDate);
+
+                    // Save AutoSyncDate
+
+                    _AutoSyncDate = value;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Sends OnYearViewStartDateChanged event
+        /// </summary>
+        /// <param name="oldDate">Old date</param>
+        /// <param name="newDate">New date</param>
+        private void OnYearViewStartDateChanged(DateTime oldDate, DateTime newDate)
+        {
+            if (YearViewStartDateChanged != null)
+                YearViewStartDateChanged(this, new DateChangeEventArgs(oldDate, newDate));
+        }
+
+        #endregion
+
+        #region YearViewEndDate
+
+        /// <summary>
+        /// Gets the YearView end date
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public DateTime YearViewEndDate
+        {
+            get { return (_YearViewEndDate); }
+
+            set
+            {
+                value = value.Date;
+
+                if (_YearViewEndDate.Equals(value) == false)
+                {
+                    DateTime oldDate = _YearViewEndDate;
+                    _YearViewEndDate = value;
+
+                    // Inform interested parties of the change
+
+                    OnYearViewEndDateChanged(oldDate, value);
+
+                    OnViewDateChanged(MonthView,
+                        _YearViewStartDate, _YearViewStartDate, oldDate, value);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Sends OnYearViewEndDateChanged event
+        /// </summary>
+        /// <param name="oldDate">Old date</param>
+        /// <param name="newDate">New date</param>
+        private void OnYearViewEndDateChanged(DateTime oldDate, DateTime newDate)
+        {
+            if (YearViewEndDateChanged != null)
+                YearViewEndDateChanged(this, new DateChangeEventArgs(oldDate, newDate));
+        }
+
+        #endregion
+
+        #endregion
+
+        #region TimeLineView properties
+
+        /// <summary>
+        /// Gets the TimeLine View
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public TimeLineView TimeLineView
+        {
+            get
+            {
+                if (_TimeLineView == null)
+                {
+                    _TimeLineView = new TimeLineView(this, eCalendarView.TimeLine);
+
+                    _TimeLineView.StartDate = _TimeLineViewStartDate;
+                    _TimeLineView.EndDate = _TimeLineViewEndDate;
+                }
+
+                return (_TimeLineView);
+            }
+
+            internal set
+            {
+                if (_TimeLineView != value)
+                {
+                    if (_TimeLineView != null)
+                        _TimeLineView.Dispose();
+
+                    _TimeLineView = value;
+                }
+            }
+        }
+
+        #region TimeLineViewStartDate
+
+        /// <summary>
+        /// Gets and sets the TimeLine start date
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public DateTime TimeLineViewStartDate
+        {
+            get { return (_TimeLineViewStartDate); }
+
+            set
+            {
+                if (_TimeLineViewStartDate.Equals(value) == false)
+                {
+                    DateTime oldDate = _TimeLineViewStartDate;
+                    _TimeLineViewStartDate = value;
+
+                    // Update our column count and scrollBar values
+
+                    CalcTimeLineColumnCount(true);
+                    TimeLineHScrollPanel.UpdatePanel();
+
+                    // Inform interested parties of the change
+
+                    OnTimeLineViewStartDateChanged(oldDate, value);
+
+                    OnViewDateChanged(TimeLineView,
+                        oldDate, value, _TimeLineViewEndDate, _TimeLineViewEndDate);
+
+                    // Save AutoSyncDate
+
+                    _AutoSyncDate = TimeLineViewScrollStartDate;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Sends TimeLineViewStartDateChanged event
+        /// </summary>
+        /// <param name="oldDate">Old date</param>
+        /// <param name="newDate">New date</param>
+        private void OnTimeLineViewStartDateChanged(DateTime oldDate, DateTime newDate)
+        {
+            if (TimeLineViewStartDateChanged != null)
+                TimeLineViewStartDateChanged(this, new DateChangeEventArgs(oldDate, newDate));
+        }
+
+        #endregion
+
+        #region TimeLineViewEndDate
+
+        /// <summary>
+        /// Gets or sets the TimeLine end date
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public DateTime TimeLineViewEndDate
+        {
+            get { return (_TimeLineViewEndDate); }
+
+            set
+            {
+                if (_TimeLineViewEndDate.Equals(value) == false)
+                {
+                    DateTime oldDate = _TimeLineViewEndDate;
+                    _TimeLineViewEndDate = value;
+
+                    // Update our column count and scrollBar values
+
+                    CalcTimeLineColumnCount(false);
+                    TimeLineHScrollPanel.UpdatePanel();
+
+                    // Inform interested parties of the change
+
+                    OnTimeLineViewEndDateChanged(oldDate, value);
+
+                    OnViewDateChanged(TimeLineView,
+                        _TimeLineViewStartDate, _TimeLineViewStartDate, oldDate, value);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Sends TimeLineViewEndDateChanged event
+        /// </summary>
+        /// <param name="oldDate">Old date</param>
+        /// <param name="newDate">New date</param>
+        private void OnTimeLineViewEndDateChanged(DateTime oldDate, DateTime newDate)
+        {
+            if (TimeLineViewEndDateChanged != null)
+                TimeLineViewEndDateChanged(this, new DateChangeEventArgs(oldDate, newDate));
+        }
+
+        #endregion
+
+        #region TimeLineViewScrollStartDate
+
+        /// <summary>
+        /// Gets and sets the TimeLine Scrolled start date
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public DateTime TimeLineViewScrollStartDate
+        {
+            get { return (_TimeLineViewScrollStartDate); }
+
+            set
+            {
+                if (_TimeLineViewScrollStartDate.Equals(value) == false)
+                {
+                    DateTime oldValue = _TimeLineViewScrollStartDate;
+                    _TimeLineViewScrollStartDate = value;
+
+                    value = UpdateViewScroll(value);
+
+                    // Tell others about the change
+
+                    OnTimeLineViewScrollDateChanged(oldValue, value);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Updates the TimeLine scroll value
+        /// </summary>
+        /// <param name="value">Value</param>
+        private DateTime UpdateViewScroll(DateTime value)
+        {
+            TimeLineHScrollPanel.BeginUpdate();
+
+            bool canScroll = _TimeLineCanExtendRange;
+
+            if (value < _TimeLineViewStartDate)
+            {
+                if (canScroll == true)
+                    TimeLineViewStartDate = value;
+            }
+            else
+            {
+                DateTime endDate;
+                int n = Bounds.Width / TimeLineColumnWidth;
+
+                try
+                {
+                    endDate = value.AddMinutes(n * BaseInterval);
+
+                    if (endDate > _TimeLineViewEndDate)
+                    {
+                        if (canScroll == true)
+                            TimeLineViewEndDate = endDate;
+                    }
+                    else
+                    {
+                        canScroll = true;
+                    }
+                }
+                catch
+                {
+                    if (canScroll == true)
+                    {
+                        endDate = new DateTime(9970, 1, 1);
+                        value = endDate.AddMinutes(-n * BaseInterval);
+
+                        _TimeLineViewScrollStartDate = value;
+                        TimeLineViewEndDate = endDate;
+                    }
+                }
+            }
+
+            if (canScroll == true)
+            {
+                TimeSpan ts = value - _TimeLineViewStartDate;
+
+                TimeLineHScrollPanel.ScrollBar.Value =
+                    (int)(ts.TotalMinutes / _BaseInterval);
+            }
+
+            TimeLineHScrollPanel.EndUpdate();
+
+            return (value);
+        }
+
+        /// <summary>
+        /// Sends TimeLineViewScrollDateChanged event
+        /// </summary>
+        /// <param name="oldDate">Old date</param>
+        /// <param name="newDate">New date</param>
+        private void OnTimeLineViewScrollDateChanged(DateTime oldDate, DateTime newDate)
+        {
+            if (TimeLineViewScrollDateChanged != null)
+                TimeLineViewScrollDateChanged(this, new DateChangeEventArgs(oldDate, newDate));
+        }
+
+        #endregion
+
+        #region TimeLineViewScrollEndDate
+
+        /// <summary>
+        /// Gets the TimeLine Scrolled end date
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public DateTime TimeLineViewScrollEndDate
+        {
+            get
+            {
+                DateTime date = TimeLineViewScrollStartDate;
+
+                if (TimeLineHScrollPanel != null)
+                {
+                    int intervals =
+                        _TimeLineHeaderPanel.Bounds.Width / _TimeLineColumnWidth;
+
+                    date = date.AddMinutes(_BaseInterval * intervals);
+                }
+
+                return (date);
+            }
+        }
+
+        #endregion
+
+        #region CalcTimeLineColumnCount
+
+        /// <summary>
+        /// Calculates number of TimeLine columns
+        /// </summary>
+        /// <param name="alterEnd"></param>
+        private void CalcTimeLineColumnCount(bool alterEnd)
+        {
+            TimeSpan ts = _TimeLineViewEndDate - _TimeLineViewStartDate;
+
+            double tc = Math.Max(1, ts.TotalMinutes / _BaseInterval);
+
+            if (Math.Floor(tc) > _TimeLineMaxColumnCount)
+            {
+                AdjustViewTime(alterEnd, _TimeLineMaxColumnCount);
+            }
+            else if (tc * TimeLineColumnWidth >= Int32.MaxValue)
+            {
+                AdjustViewTime(alterEnd, Int32.MaxValue / TimeLineColumnWidth);
+            }
+            else
+            {
+                if (tc * TimeLineColumnWidth < Bounds.Width)
+                    tc = Bounds.Width / TimeLineColumnWidth * 2;
+
+                _TimeLineColumnCount = (int)tc;
+            }
+        }
+
+        private void AdjustViewTime(bool alterEnd, int tc)
+        {
+            if (alterEnd == true)
+                TimeLineViewEndDate = TimeLineAddInterval(TimeLineViewStartDate, tc);
+            else
+                TimeLineViewStartDate = TimeLineAddInterval(TimeLineViewEndDate, -tc);
+        }
+
+        #endregion
+
+        #region TimeLineColumnWidth
+
+        /// <summary>
+        /// Gets and sets the Calendar TimeLineColumnWidth
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public int TimeLineColumnWidth
+        {
+            get { return (_TimeLineColumnWidth); }
+
+            set
+            {
+                if (_TimeLineColumnWidth != value)
+                {
+                    int oldValue = _TimeLineColumnWidth;
+                    _TimeLineColumnWidth = value;
+
+                    CalcTimeLineColumnCount(true);
+                    TimeLineHScrollPanel.UpdatePanel();
+
+                    // Inform interested parties of the change
+
+                    OnTimeLineColumnWidthChanged(oldValue, value);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Sends TimeLineColumnWidthChanged event
+        /// </summary>
+        /// <param name="oldValue">Old width</param>
+        /// <param name="newValue">New width</param>
+        private void OnTimeLineColumnWidthChanged(int oldValue, int newValue)
+        {
+            if (TimeLineColumnWidthChanged != null)
+                TimeLineColumnWidthChanged(this, new TimeLineColumnWidthChangedEventArgs(oldValue, newValue));
+        }
+
+        #endregion
+
+        #region TimeLineHorizontalPadding
+
+        /// <summary>
+        /// Gets and sets the horizontal padding used between
+        /// items displayed in the TimeLine view
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public int TimeLineHorizontalPadding
+        {
+            get { return (_TimeLineHorizontalPadding); }
+
+            set
+            {
+                if (_TimeLineHorizontalPadding != value)
+                {
+                    int oldValue = _TimeLineHorizontalPadding;
+                    _TimeLineHorizontalPadding = value;
+
+                    CalendarPanel.Refresh();
+
+                    // Inform interested parties of the change
+
+                    OnTimeLineHorizontalPaddingChanged(oldValue, value);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Sends TimeLineHorizontalPaddingChanged events
+        /// </summary>
+        /// <param name="oldValue">Old padding</param>
+        /// <param name="newValue">New padding</param>
+        private void OnTimeLineHorizontalPaddingChanged(int oldValue, int newValue)
+        {
+            if (TimeLineHorizontalPaddingChanged != null)
+                TimeLineHorizontalPaddingChanged(this, new TimeLineHorizontalPaddingChangedEventArgs(oldValue, newValue));
+        }
+
+        #endregion
+
+        #region TimeLineIntervalHeaderHeight
+
+        private int _TimeLineIntervalHeaderHeight;
+
+        /// <summary>
+        /// Gets and sets the TimeLine Interval Header height
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public int TimeLineIntervalHeaderHeight
+        {
+            get
+            {
+                return ((_TimeLineIntervalHeaderHeight > 0)
+                    ? _TimeLineIntervalHeaderHeight : Font.Height + 7);
+            }
+
+            set
+            {
+                if (_TimeLineIntervalHeaderHeight != value)
+                {
+                    _TimeLineIntervalHeaderHeight = value;
+
+                    CalendarPanel.NeedRecalcSize = true;
+                    CalendarPanel.Refresh();
+                }
+            }
+        }
+
+        #endregion
+
+        #region TimeLinePeriodHeaderAlignment
+
+        /// <summary>
+        /// Gets or sets the text alignment for the TimeLineView Period Header text
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public eItemAlignment TimeLinePeriodHeaderAlignment
+        {
+            get { return (_TimeLinePeriodHeaderAlignment); }
+
+            set
+            {
+                if (_TimeLinePeriodHeaderAlignment != value)
+                {
+                    _TimeLinePeriodHeaderAlignment = value;
+
+                    CalendarPanel.Refresh();
+                }
+            }
+        }
+
+        #endregion
+
+        #region TimeLinePeriodHeaderEnableMarkup
+
+        /// <summary>
+        /// Gets or sets whether text-markup support is enabled for the
+        /// TimeLineView Period Header text
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool TimeLinePeriodHeaderEnableMarkup
+        {
+            get { return (_TimeLinePeriodHeaderEnableMarkup); }
+
+            set
+            {
+                if (_TimeLinePeriodHeaderEnableMarkup != value)
+                {
+                    _TimeLinePeriodHeaderEnableMarkup = value;
+
+                    CalendarPanel.Refresh();
+                }
+            }
+        }
+
+        #endregion
+
+        #region TimeLineMaxColumnCount
+
+        /// <summary>
+        /// Gets and sets the Calendar TimeLineMaxColumnCount
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public int TimeLineMaxColumnCount
+        {
+            get { return (_TimeLineMaxColumnCount); }
+
+            set
+            {
+                value = Math.Max(100, value);
+
+                if (_TimeLineMaxColumnCount != value)
+                {
+                    int oldValue = _TimeLineMaxColumnCount;
+                    _TimeLineMaxColumnCount = value;
+
+                    CalcTimeLineColumnCount(true);
+                    TimeLineHScrollPanel.UpdatePanel();
+
+                    // Inform interested parties of the change
+
+                    OnTimeLineMaxColumnCountChanged(oldValue, value);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Sends TimeLineMaxColumnCountChanged event
+        /// </summary>
+        /// <param name="oldValue">Old width</param>
+        /// <param name="newValue">New width</param>
+        private void OnTimeLineMaxColumnCountChanged(int oldValue, int newValue)
+        {
+            if (TimeLineMaxColumnCountChanged != null)
+                TimeLineMaxColumnCountChanged(this, new TimeLineMaxColumnCountChangedEventArgs(oldValue, newValue));
+        }
+
+        #endregion
+
+        #region TimeLineInterval
+
+        /// <summary>
+        /// Gets and sets the Calendar TimeLineInterval
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public int TimeLineInterval
+        {
+            get { return (_TimeLineInterval); }
+
+            set
+            {
+                value = GetValidInterval(value);
+
+                if (_TimeLineInterval != value)
+                {
+                    int oldValue = _TimeLineInterval;
+                    _TimeLineInterval = value;
+
+                    UpdateBaseInterval();
+
+                    DateTime date =
+                        TimeLineViewStartDate.Date.AddMinutes(_BaseInterval * 200);
+
+                    if (date > TimeLineViewEndDate)
+                    {
+                        TimeLineViewEndDate = date.Date;
+                    }
+                    else
+                    {
+                        TimeLineViewStartDate = TimeLineViewStartDate.Date;
+                        CalcTimeLineColumnCount(true);
+                    }
+
+                    TimeLineHScrollPanel.ScrollBar.Value = 0;
+                    TimeLineHScrollPanel.UpdatePanel();
+
+                    OnTimeLineIntervalChanged(oldValue, value);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Sends TimeLineIntervalChanged events
+        /// </summary>
+        /// <param name="oldValue"></param>
+        /// <param name="newValue"></param>
+        private void OnTimeLineIntervalChanged(int oldValue, int newValue)
+        {
+            if (TimeLineIntervalChanged != null)
+                TimeLineIntervalChanged(this, new TimeLineIntervalChangedEventArgs(oldValue, newValue));
+        }
+
+        #region GetValidInterval
+
+        /// <summary>
+        /// Coerces the user supplied interval period into
+        /// an evenly divisible duration
+        /// </summary>
+        /// <param name="value">Original value</param>
+        /// <returns>Validated value</returns>
+        private int GetValidInterval(int value)
+        {
+            if (value < 1)
+                return (1);
+
+            switch (_TimeLinePeriod)
+            {
+                case eTimeLinePeriod.Minutes:
+                    return (GetValidIntervalMinutes(value));
+
+                case eTimeLinePeriod.Hours:
+                    return (GetValidIntervalHours(value));
+
+                case eTimeLinePeriod.Days:
+                    return (value >= MaxDayDuration ? MaxDayDuration : value);
+
+                case eTimeLinePeriod.Years:
+                    return (value >= MaxYearDuration ? MaxYearDuration : value);
+            }
+
+            return (1);
+        }
+
+        #region GetValidIntervalMinutes
+
+        /// <summary>
+        /// Gets a valid minute interval from the
+        /// given user supplied value
+        /// </summary>
+        /// <param name="value">Supplied value</param>
+        /// <returns>Valid interval</returns>
+        private int GetValidIntervalMinutes(int value)
+        {
+            if (value < MaxMinuteDuration)
+            {
+                for (int i = 0; i < MaxMinuteDuration; i++)
+                {
+                    if (MaxMinuteDuration % (value + i) == 0)
+                        return (value + i);
+                }
+            }
+
+            return (MaxMinuteDuration);
+        }
+
+        #endregion
+
+        #region GetValidIntervalHours
+
+        /// <summary>
+        /// Gets a valid hour interval from the
+        /// given user supplied value
+        /// </summary>
+        /// <param name="value">Supplied value</param>
+        /// <returns>Valid interval</returns>
+        private int GetValidIntervalHours(int value)
+        {
+            if (value < MaxHourDuration)
+            {
+                for (int i = 0; i < MaxHourDuration; i++)
+                {
+                    if (HoursPerDay % (value + i) == 0)
+                        return (value + i);
+                }
+            }
+
+            return (MaxHourDuration);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region UpdateBaseInterval
+
+        /// <summary>
+        /// Updates the BaseInterval value (interval total minutes)
+        /// </summary>
+        private void UpdateBaseInterval()
+        {
+            switch (_TimeLinePeriod)
+            {
+                case eTimeLinePeriod.Minutes:
+                    _BaseInterval = _TimeLineInterval;
+                    break;
+
+                case eTimeLinePeriod.Hours:
+                    _BaseInterval = _TimeLineInterval * MinutesPerHour;
+                    break;
+
+                case eTimeLinePeriod.Days:
+                    _BaseInterval = _TimeLineInterval * MinutesPerDay;
+                    break;
+
+                case eTimeLinePeriod.Years:
+                    _BaseInterval = _TimeLineInterval * MinutesPerYear;
+                    break;
+            }
+
+            TimeLineViewStartDate = (_TimeLinePeriod == eTimeLinePeriod.Years) ?
+                new DateTime(TimeLineViewStartDate.Year, 1, 1) : TimeLineViewStartDate.Date;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region TimeLinePeriod
+
+        /// <summary>
+        /// Gets and sets the Calendar TimeLinePeriod
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public eTimeLinePeriod TimeLinePeriod
+        {
+            get { return (_TimeLinePeriod); }
+
+            set
+            {
+                if (_TimeLinePeriod != value)
+                {
+                    eTimeLinePeriod oldValue = _TimeLinePeriod;
+                    _TimeLinePeriod = value;
+
+                    TimeLineInterval =
+                        (value == eTimeLinePeriod.Minutes) ? 30 : 1;
+
+                    UpdateBaseInterval();
+                    UpdateBasePeriod();
+
+                    TimeLineHScrollPanel.ScrollBar.Value = 0;
+
+                    OnTimeLineIntervalPeriodChanged(oldValue, value);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Sends TimeLineIntervalPeriodChanged events
+        /// </summary>
+        /// <param name="oldValue"></param>
+        /// <param name="newValue"></param>
+        private void OnTimeLineIntervalPeriodChanged(
+            eTimeLinePeriod oldValue, eTimeLinePeriod newValue)
+        {
+            if (TimeLineIntervalPeriodChanged != null)
+                TimeLineIntervalPeriodChanged(this, new TimeLineIntervalPeriodChangedEventArgs(oldValue, newValue));
+        }
+
+        #region UpdateBasePeriod
+
+        /// <summary>
+        /// Updates the view end date period given the
+        /// new base interval
+        /// </summary>
+        private void UpdateBasePeriod()
+        {
+            int intervals = 1;
+
+            switch (_TimeLinePeriod)
+            {
+                case eTimeLinePeriod.Minutes:
+                    intervals = (7 * 24 * 2);
+                    break;
+
+                case eTimeLinePeriod.Hours:
+                    intervals = (7 * 24);
+                    break;
+
+                case eTimeLinePeriod.Days:
+                    intervals = (365 / 2);
+                    break;
+
+                case eTimeLinePeriod.Years:
+                    intervals = _TimeLineMaxColumnCount;
+                    break;
+            }
+
+            TimeLineViewStartDate = (_TimeLinePeriod == eTimeLinePeriod.Years) ?
+                new DateTime(TimeLineViewStartDate.Year, 1, 1) : TimeLineViewStartDate.Date;
+
+            TimeLineViewEndDate = TimeLineAddInterval(TimeLineViewStartDate, intervals);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region TimeLinePeriodHeaderHeight
+
+        /// <summary>
+        /// Gets or sets the TimeLine period header height. Set to -1 for default.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public int TimeLinePeriodHeaderHeight
+        {
+            get
+            {
+                if (_TimeLinePeriodHeaderHeight < 0)
+                    return (Font.Height + 7);
+
+                return (_TimeLinePeriodHeaderHeight);
+            }
+
+            set
+            {
+                if (_TimeLinePeriodHeaderHeight != value)
+                {
+                    _TimeLinePeriodHeaderHeight = value;
+
+                    CalendarPanel.NeedRecalcSize = true;
+                    CalendarPanel.Refresh();
+                }
+            }
+        }
+
+        #endregion
+
+        #region TimeLineHeight
+
+        /// <summary>
+        /// Gets and sets the Calendar TimeLineHeight
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public int TimeLineHeight
+        {
+            get { return (_TimeLineHeight); }
+
+            set
+            {
+                if (_TimeLineHeight != value)
+                {
+                    _TimeLineHeight = value;
+
+                    CalendarPanel.NeedRecalcSize = true;
+                    CalendarPanel.Refresh();
+                }
+            }
+        }
+
+        #endregion
+
+        #region TimeLineShowPeriodHeader
+
+        /// <summary>
+        /// Gets and sets the Calendar TimeLineShowPeriodHeader
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool TimeLineShowPeriodHeader
+        {
+            get { return (_TimeLineShowPeriodHeader); }
+
+            set
+            {
+                if (_TimeLineShowPeriodHeader != value)
+                {
+                    _TimeLineShowPeriodHeader = value;
+
+                    OnTimeLineShowPeriodHeaderChanged(!value, value);
+
+                    CalendarPanel.NeedRecalcSize = true;
+                    CalendarPanel.Refresh();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Sends TimeLineShowPeriodHeaderChanged event
+        /// </summary>
+        /// <param name="oldValue"></param>
+        /// <param name="newValue"></param>
+        private void OnTimeLineShowPeriodHeaderChanged(bool oldValue, bool newValue)
+        {
+            if (TimeLineShowPeriodHeaderChanged != null)
+                TimeLineShowPeriodHeaderChanged(this, new TimeLineShowPeriodHeaderChangedEventArgs(oldValue, newValue));
+        }
+
+        #endregion
+
+        #region TimeLineShowIntervalHeader
+
+        /// <summary>
+        /// Gets and sets the Calendar TimeLineShowIntervalHeader
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool TimeLineShowIntervalHeader
+        {
+            get { return (_TimeLineShowIntervalHeader); }
+
+            set
+            {
+                if (_TimeLineShowIntervalHeader != value)
+                {
+                    _TimeLineShowIntervalHeader = value;
+
+                    OnTimeLineShowIntervalHeaderChanged(!value, value);
+
+                    CalendarPanel.NeedRecalcSize = true;
+                    CalendarPanel.Refresh();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Sends TimeLineShowIntervalHeader event
+        /// </summary>
+        /// <param name="oldValue"></param>
+        /// <param name="newValue"></param>
+        private void OnTimeLineShowIntervalHeaderChanged(bool oldValue, bool newValue)
+        {
+            if (TimeLineShowIntervalHeaderChanged != null)
+                TimeLineShowIntervalHeaderChanged(this, new TimeLineShowIntervalHeaderChangedEventArgs(oldValue, newValue));
+        }
+
+        #endregion
+
+        #region TimeLineShowPageNavigation
+
+        /// <summary>
+        /// Gets and sets the Calendar TimeLineShowPageNavigation
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool TimeLineShowPageNavigation
+        {
+            get { return (_TimeLineShowPageNavigation); }
+
+            set
+            {
+                if (_TimeLineShowPageNavigation != value)
+                {
+                    _TimeLineShowPageNavigation = value;
+
+                    OnTimeLineShowPageNavigationChanged(!value, value);
+
+                    CalendarPanel.NeedRecalcSize = true;
+                    CalendarPanel.Refresh();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Sends TimeLineShowPageNavigationChanged event
+        /// </summary>
+        /// <param name="oldValue"></param>
+        /// <param name="newValue"></param>
+        private void OnTimeLineShowPageNavigationChanged(bool oldValue, bool newValue)
+        {
+            if (TimeLineShowPageNavigationChanged != null)
+                TimeLineShowPageNavigationChanged(this, new TimeLineShowPageNavigationChangedEventArgs(oldValue, newValue));
+        }
+
+        #endregion
+
+        #region TimeLineShowHScrollBar
+
+        /// <summary>
+        /// Gets or sets whether the Horizontal TimeLine scroll bar is shown
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool TimeLineShowHScrollBar
+        {
+            get { return (_TimeLineShowHScrollBar); }
+
+            set
+            {
+                if (_TimeLineShowHScrollBar != value)
+                {
+                    _TimeLineShowHScrollBar = value;
+
+                    if (_TimeLineHScrollPanel != null)
+                    {
+                        if (value == true)
+                        {
+                            _TimeLineHScrollPanel.Visible = true;
+                            _TimeLineHScrollPanel.Displayed = true;
+                        }
+                        else
+                        {
+                            _TimeLineHScrollPanel.Visible = false;
+                            _TimeLineHScrollPanel.Displayed = false;
+                        }
+                    }
+
+                    CalendarPanel.NeedRecalcSize = true;
+                    CalendarPanel.Refresh();
+                }
+            }
+        }
+
+        #endregion
+
+        #region TimeLineCondensedViewVisibility
+
+        /// <summary>
+        /// Gets and sets the Condensed View visibility
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public eCondensedViewVisibility TimeLineCondensedViewVisibility
+        {
+            get { return (_TimeLineCondensedViewVisibility); }
+
+            set
+            {
+                if (_TimeLineCondensedViewVisibility != value)
+                {
+                    eCondensedViewVisibility oldValue = _TimeLineCondensedViewVisibility;
+                    _TimeLineCondensedViewVisibility = value;
+
+                    OnTimeLineCondensedViewVisibilityChanged(oldValue, value);
+
+                    CalendarPanel.NeedRecalcSize = true;
+                    CalendarPanel.Refresh();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Sends OnTimeLineCondensedViewVisibilityChanged event
+        /// </summary>
+        /// <param name="oldValue"></param>
+        /// <param name="newValue"></param>
+        private void OnTimeLineCondensedViewVisibilityChanged(
+            eCondensedViewVisibility oldValue, eCondensedViewVisibility newValue)
+        {
+            if (TimeLineCondensedViewVisibilityChanged != null)
+                TimeLineCondensedViewVisibilityChanged(this,
+                    new TimeLineCondensedViewVisibilityChangedEventArgs(oldValue, newValue));
+        }
+
+        #endregion
+
+        #region TimeLineCondensedViewHeight
+
+        /// <summary>
+        /// Gets and sets the Condensed View height
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public int TimeLineCondensedViewHeight
+        {
+            get { return (_TimeLineCondensedViewHeight); }
+
+            set
+            {
+                if (_TimeLineCondensedViewHeight != value)
+                {
+                    int oldValue = _TimeLineCondensedViewHeight;
+                    _TimeLineCondensedViewHeight = value;
+
+                    OnTimeLineCondensedViewHeightChanged(oldValue, value);
+
+                    CalendarPanel.NeedRecalcSize = true;
+                    CalendarPanel.Refresh();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Sends OnTimeLineCondensedViewHeightChanged event
+        /// </summary>
+        /// <param name="oldValue"></param>
+        /// <param name="newValue"></param>
+        private void OnTimeLineCondensedViewHeightChanged(int oldValue, int newValue)
+        {
+            if (TimeLineCondensedViewHeightChanged != null)
+                TimeLineCondensedViewHeightChanged(this,
+                    new TimeLineCondensedViewHeightChangedEventArgs(oldValue, newValue));
+        }
+
+        #endregion
+
+        #region TimeLineStretchRowHeight
+
+        /// <summary>
+        /// Gets or sets whether the row height is stretched
+        /// to fill the TimeLine appointment content area
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool TimeLineStretchRowHeight
+        {
+            get { return (_TimeLineStretchRowHeight); }
+
+            set
+            {
+                if (_TimeLineStretchRowHeight != value)
+                {
+                    _TimeLineStretchRowHeight = value;
+
+                    CalendarPanel.Refresh();
+                }
+            }
+        }
+
+        #endregion
+
+        #region TimeLineStretchRowHeightMode
+
+        /// <summary>
+        /// Gets or sets how the row height is stretched to fill the TimeLine
+        /// appointment content area (TimeLineStretchRowHeight must be set to true).
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public TimeLineStretchRowHeightMode TimeLineStretchRowHeightMode
+        {
+            get { return (_TimeLineStretchRowHeightMode); }
+
+            set
+            {
+                if (_TimeLineStretchRowHeightMode != value)
+                {
+                    _TimeLineStretchRowHeightMode = value;
+
+                    CalendarPanel.Refresh();
+                }
+            }
+        }
+
+        #endregion
+
+        #region TimeLineCanExtendRange
+
+        /// <summary>
+        /// Gets or sets whether the TimeLine Start and End dates can be
+        /// can be automatically extended by the control
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool TimeLineCanExtendRange
+        {
+            get { return (_TimeLineCanExtendRange); }
+            set { _TimeLineCanExtendRange = value; }
+        }
+
+        #endregion
+
+        #region TimeLineShowCollateLines
+
+        /// <summary>
+        /// Gets or sets whether the TimeLine view will draw collate lines
+        /// between each group of collated rows (see TimeLineViewGetRowCollateId event)
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool TimeLineShowCollateLines
+        {
+            get { return (_TimeLineShowCollateLines); }
+            set { _TimeLineShowCollateLines = value; }
+        }
+
+        #endregion
+
+        #region TimeLineMultiUserTabWidth
+
+        /// <summary>
+        /// Gets and sets the Calendar TimeLine horizontal tab width
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public int TimeLineMultiUserTabWidth
+        {
+            get { return (_TimeLineMultiUserTabWidth); }
+
+            set
+            {
+                if (_TimeLineMultiUserTabWidth != value)
+                {
+                    _TimeLineMultiUserTabWidth = value;
+
+                    CalendarPanel.NeedRecalcSize = true;
+                    CalendarPanel.Refresh();
+                }
+            }
+        }
+
+        #endregion
+
+        #region TimeLineMultiUserTabOrientation
+
+        /// <summary>
+        /// Gets and sets the Calendar TimeLine horizontal tab orientation
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public eOrientation TimeLineMultiUserTabOrientation
+        {
+            get { return (_TimeLineMultiUserTabOrientation); }
+
+            set
+            {
+                if (_TimeLineMultiUserTabOrientation != value)
+                {
+                    _TimeLineMultiUserTabOrientation = value;
+
+                    CalendarPanel.NeedRecalcSize = true;
+                    CalendarPanel.Refresh();
+                }
+            }
+        }
+
+        #endregion
+
+        #region TimeLinePageNavigatorTodayTooltip
+
+        /// <summary>
+        /// Gets or sets the Calendar TimeLineView PageNavigator TodayTooltip
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public string TimeLinePageNavigatorTodayTooltip
+        {
+            get { return (_TimeLinePageNavigatorTodayTooltip); }
+
+            set
+            {
+                _TimeLinePageNavigatorTodayTooltip = value;
+
+                if (_TimeLineHScrollPanel != null && _TimeLineHScrollPanel.PageNavigator != null)
+                    _TimeLineHScrollPanel.PageNavigator.TodayTooltip = value;
+            }
+        }
+
+        #endregion
+
+        #region TimeLinePageNavigatorPreviousPageTooltip
+
+        /// <summary>
+        /// Gets or sets the Calendar TimeLineView PageNavigator PreviousPageTooltip
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public string TimeLinePageNavigatorPreviousPageTooltip
+        {
+            get { return (_TimeLinePageNavigatorPreviousPageTooltip); }
+
+            set
+            {
+                _TimeLinePageNavigatorPreviousPageTooltip = value;
+
+                if (_TimeLineHScrollPanel != null && _TimeLineHScrollPanel.PageNavigator != null)
+                    _TimeLineHScrollPanel.PageNavigator.PreviousPageTooltip = value;
+            }
+        }
+
+        #endregion
+
+        #region TimeLinePageNavigatorNextPageTooltip
+
+        /// <summary>
+        /// Gets or sets the Calendar TimeLineView PageNavigator NextPageTooltip
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public string TimeLinePageNavigatorNextPageTooltip
+        {
+            get { return (_TimeLinePageNavigatorNextPageTooltip); }
+
+            set
+            {
+                _TimeLinePageNavigatorNextPageTooltip = value;
+
+                if (_TimeLineHScrollPanel != null && _TimeLineHScrollPanel.PageNavigator != null)
+                    _TimeLineHScrollPanel.PageNavigator.NextPageTooltip = value;
+            }
+        }
+
+        #endregion
+
+        #region TimeLineMinAppointmentWidth
+
+        /// <summary>
+        /// Gets and sets the Calendar TimeLineView Minimum Appointment Width
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public int TimeLineMinAppointmentWidth
+        {
+            get { return (_TimeLineMinAppointmentWidth); }
+
+            set
+            {
+                if (_TimeLineMinAppointmentWidth != value)
+                {
+                    _TimeLineMinAppointmentWidth = value;
+
+                    CalendarPanel.Refresh();
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region MultiCalendarView properties
+
+        /// <summary>
+        /// Gets the multiCalendar state or mode
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsMultiCalendar
+        {
+            get { return (MultiCalendarDayViews != null); }
+        }
+
+        /// <summary>
+        /// Gets the MultiCalendarDayViews collection
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public CalendarViewCollection<DayView> MultiCalendarDayViews
+        {
+            get { return (_MultiCalendarDayViews); }
+        }
+
+        /// <summary>
+        /// Gets the MultiCalendarWeekViews collection
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public CalendarViewCollection<WeekView> MultiCalendarWeekViews
+        {
+            get { return (_MultiCalendarWeekViews); }
+        }
+
+        /// <summary>
+        /// Gets the MultiCalendarMonthViews collection
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public CalendarViewCollection<MonthView> MultiCalendarMonthViews
+        {
+            get { return (_MultiCalendarMonthViews); }
+        }
+
+        /// <summary>
+        /// Gets the MultiCalendarYearViews collection
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public CalendarViewCollection<YearView> MultiCalendarYearViews
+        {
+            get { return (_MultiCalendarYearViews); }
+        }
+
+        /// <summary>
+        /// Gets the MultiCalendarTimeLineViews collection
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public CalendarViewCollection<TimeLineView> MultiCalendarTimeLineViews
+        {
+            get { return (_MultiCalendarTimeLineViews); }
+        }
+
+        #endregion
+
+        #region DisplayedOwners
+
+        /// <summary>
+        /// Gets the DisplayedOwners collection
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public DisplayedOwnerCollection DisplayedOwners
+        {
+            get { return (_DisplayedOwners); }
+        }
+
+        #endregion
+
+        #region SelectedOwner
+
+        /// <summary>
+        /// Gets and sets the current selected multi-user owner
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public string SelectedOwner
+        {
+            get
+            {
+                if (_SelectedOwnerIndex >= 0 && _SelectedOwnerIndex < _DisplayedOwners.Count)
+                    return (_DisplayedOwners[_SelectedOwnerIndex]);
+
+                return ("");
+            }
+
+            set
+            {
+                SelectedOwnerIndex = _DisplayedOwners.IndexOf(value);
+            }
+        }
+
+        /// <summary>
+        /// Gets and sets the current selected multi-user owner
+        /// using a DisplayedOwner index
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public int SelectedOwnerIndex
+        {
+            get { return (_SelectedOwnerIndex); }
+
+            set
+            {
+                if (_SelectedOwnerIndex != value)
+                {
+                    if (value < 0 || value >= _DisplayedOwners.Count)
+                        value = -1;
+
+                    int oldValue = _SelectedOwnerIndex;
+                    _SelectedOwnerIndex = value;
+
+                    RefreshDisplayTabs(oldValue, value);
+
+                    DateSelectionStart = null;
+                    DateSelectionEnd = null;
+
+                    OnSelectedOwnerChanged(oldValue, value);
+                }
+            }
+        }
+
+        #region RefreshDisplayTabs
+
+        /// <summary>
+        /// Refreshes the deselected and newly selected tabs
+        /// </summary>
+        /// <param name="oldValue">Old tab index</param>
+        /// <param name="newValue">New tab index</param>
+        private void RefreshDisplayTabs(int oldValue, int newValue)
+        {
+            if (IsMultiCalendar == true)
+            {
+                switch (SelectedView)
+                {
+                    case eCalendarView.Day:
+                        if (oldValue >= 0 && oldValue < MultiCalendarDayViews.Views.Count)
+                            RefreshHTab(MultiCalendarDayViews.Views[oldValue], true);
+
+                        if (newValue >= 0 && newValue < MultiCalendarDayViews.Views.Count)
+                            RefreshHTab(MultiCalendarDayViews.Views[newValue], false);
+                        break;
+
+                    case eCalendarView.Week:
+                        if (oldValue >= 0 && oldValue < MultiCalendarWeekViews.Views.Count)
+                            RefreshHTab(MultiCalendarWeekViews.Views[oldValue], true);
+
+                        if (newValue >= 0 && newValue < MultiCalendarWeekViews.Views.Count)
+                            RefreshHTab(MultiCalendarWeekViews.Views[newValue], false);
+                        break;
+
+                    case eCalendarView.Month:
+                        if (oldValue >= 0 && oldValue < MultiCalendarMonthViews.Views.Count)
+                            RefreshHTab(MultiCalendarMonthViews.Views[oldValue], true);
+
+                        if (newValue >= 0 && newValue < MultiCalendarMonthViews.Views.Count)
+                            RefreshHTab(MultiCalendarMonthViews.Views[newValue], false);
+                        break;
+
+                    case eCalendarView.Year:
+                        if (oldValue >= 0 && oldValue < MultiCalendarYearViews.Views.Count)
+                            RefreshHTab(MultiCalendarYearViews.Views[oldValue], true);
+
+                        if (newValue >= 0 && newValue < MultiCalendarYearViews.Views.Count)
+                            RefreshHTab(MultiCalendarYearViews.Views[newValue], false);
+                        break;
+
+                    case eCalendarView.TimeLine:
+                        if (oldValue >= 0 && oldValue < MultiCalendarTimeLineViews.Views.Count)
+                            RefreshVTab(MultiCalendarTimeLineViews.Views[oldValue], true);
+
+                        if (newValue >= 0 && newValue < MultiCalendarTimeLineViews.Views.Count)
+                            RefreshVTab(MultiCalendarTimeLineViews.Views[newValue], false);
+                        break;
+                }
+            }
+        }
+
+        #endregion
+
+        #region RefreshHTab
+
+        /// <summary>
+        /// Invalidates the given view tab
+        /// </summary>
+        /// <param name="view"></param>
+        /// <param name="resetSelItem"></param>
+        private void RefreshHTab(BaseView view, bool resetSelItem)
+        {
+            Rectangle r = view.Bounds;
+            r.Height = MultiUserTabHeight;
+
+            view.InvalidateRect(r);
+
+            // Reset the selected item for the old view
+
+            if (resetSelItem == true)
+                view.SelectedItem = null;
+
+            // Invalidate any active TimeIndicators
+
+            InvalidateTimeIndicators(view);
+        }
+
+        #endregion
+
+        #region RefreshVTab
+
+        /// <summary>
+        /// Invalidates the given view tab
+        /// </summary>
+        /// <param name="view"></param>
+        /// <param name="resetSelItem"></param>
+        private void RefreshVTab(TimeLineView view, bool resetSelItem)
+        {
+            Rectangle r = view.Bounds;
+
+            if (_TimeLineMultiUserTabOrientation == eOrientation.Vertical)
+                r.Width = view.MultiUserTabHeight + 4;
+            else
+                r.Width = _TimeLineMultiUserTabWidth + 4;
+
+            view.InvalidateRect(r);
+
+            // Reset the selected item for the old view
+
+            if (resetSelItem == true)
+                view.SelectedItem = null;
+
+            // Invalidate any condensed views and any
+            // active TimeIndicators
+
+            InvalidateCondensedViews(view);
+            InvalidateTimeIndicators(view);
+        }
+
+        #endregion
+
+        #region InvalidateCondensedViews
+
+        /// <summary>
+        /// InvalidateCondensedViews
+        /// </summary>
+        /// <param name="view"></param>
+        private void InvalidateCondensedViews(TimeLineView view)
+        {
+            // If the user has condensed TimeLine showing
+            // then make sure it gets refreshed
+
+            if (TimeLineCondensedViewVisibility != eCondensedViewVisibility.Hidden)
+            {
+                view.UpdateCondensedColumnList();
+
+                Rectangle r = view.ClientRect;
+
+                r.Y = r.Bottom - TimeLineCondensedViewHeight;
+                r.Height = TimeLineCondensedViewHeight;
+
+                view.InvalidateRect(r);
+            }
+        }
+
+        #endregion
+
+        #region InvalidateTimeIndicators
+
+        /// <summary>
+        /// InvalidateTimeIndicators
+        /// </summary>
+        /// <param name="view"></param>
+        private void InvalidateTimeIndicators(BaseView view)
+        {
+            for (int i = 0; i < TimeIndicators.Count; i++)
+            {
+                TimeIndicator ti = TimeIndicators[i];
+
+                if (ti.Visibility == eTimeIndicatorVisibility.SelectedResource)
+                    InvalidateTimeIndicator(view, ti, ti.IndicatorDisplayTime);
+            }
+        }
+
+        #endregion
+
+        #region InvalidateTimeIndicator
+
+        /// <summary>
+        /// Invalidates TimeIndicator display area
+        ///  for the given view DateTime
+        /// </summary>
+        /// <param name="view"></param>
+        /// <param name="ti"></param>
+        /// <param name="dateTime"></param>
+        private void InvalidateTimeIndicator(BaseView view, TimeIndicator ti, DateTime dateTime)
+        {
+            Rectangle r = view.GetIndicatorRect(ti, dateTime);
+
+            if (r.IsEmpty == false)
+            {
+                r.Inflate(4, 4);
+
+                view.InvalidateRect(r);
+            }
+        }
+
+        #endregion
+
+        #region OnSelectedOwnerChanged
+
+        /// <summary>
+        /// Propagates SelectedOwnerChanged events
+        /// </summary>
+        /// <param name="oldValue">Old index</param>
+        /// <param name="newValue">New index</param>
+        private void OnSelectedOwnerChanged(int oldValue, int newValue)
+        {
+            if (SelectedOwnerChanged != null)
+            {
+                SelectedOwnerChanged(this,
+                    new SelectedOwnerChangedEventArgs(oldValue, newValue));
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region SelectedAppointments
+
+        /// <summary>
+        /// Gets the read-only collection of currently selected
+        /// appointments in the current view
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public ReadOnlyCollection<AppointmentView> SelectedAppointments
+        {
+            get
+            {
+                if (IsMultiCalendar == true)
+                {
+                    switch (_SelectedView)
+                    {
+                        case eCalendarView.Day:
+                            return (_MultiCalendarDayViews[_SelectedOwnerIndex].SelectedAppointments);
+
+                        case eCalendarView.Week:
+                            return (_MultiCalendarWeekViews[_SelectedOwnerIndex].SelectedAppointments);
+
+                        case eCalendarView.Month:
+                            return (_MultiCalendarMonthViews[_SelectedOwnerIndex].SelectedAppointments);
+
+                        case eCalendarView.TimeLine:
+                            return (_MultiCalendarTimeLineViews[_SelectedOwnerIndex].SelectedAppointments);
+                    }
+                }
+                else
+                {
+                    switch (SelectedView)
+                    {
+                        case eCalendarView.Day:
+                            return (DayView.SelectedAppointments);
+
+                        case eCalendarView.Week:
+                            return (WeekView.SelectedAppointments);
+
+                        case eCalendarView.Month:
+                            return (MonthView.SelectedAppointments);
+
+                        case eCalendarView.TimeLine:
+                            return (TimeLineView.SelectedAppointments);
+                    }
+                }
+
+                return (null);
+            }
+        }
+
+        #endregion
+
+        #region TimeIndicators
+
+        /// <summary>
+        /// TimeIndicators
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public TimeIndicatorCollection TimeIndicators
+        {
+            get
+            {
+                if (_TimeIndicators == null)
+                {
+                    _TimeIndicators = new TimeIndicatorCollection();
+
+                    _TimeIndicators.TimeIndicatorCollectionChanged += TimeIndicatorsTimeIndicatorCollectionChanged;
+                    _TimeIndicators.TimeIndicatorTimeChanged += TimeIndicatorsTimeIndicatorTimeChanged;
+                    _TimeIndicators.TimeIndicatorColorChanged += TimeIndicatorsTimeIndicatorColorChanged;
+                }
+
+                return (_TimeIndicators);
+            }
+        }
+
+        #endregion
+
+        #region ViewDisplayCustomizations
+
+        /// <summary>
+        /// Gets the CalendarView ViewDisplayCustomizations
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public ViewDisplayCustomizations ViewDisplayCustomizations
+        {
+            get
+            {
+                if (_ViewDisplayCustomizations == null)
+                {
+                    _ViewDisplayCustomizations = new ViewDisplayCustomizations(this);
+
+                    _ViewDisplayCustomizations.CollectionChanged += ViewDisplayCustomizationsCollectionChanged;
+                }
+
+                return (_ViewDisplayCustomizations);
+            }
+        }
+
+        #endregion
+
+        #region ViewWidth
+
+        /// <summary>
+        /// Gets and sets the Calendar ViewWidth
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        [DefaultValue(250)]
+        public int ViewWidth
+        {
+            get { return (_ViewWidth); }
+
+            set
+            {
+                if (_ViewWidth != value)
+                {
+                    _ViewWidth = value;
+
+                    if (CalendarPanel.HScrollBar != null)
+                        CalendarPanel.HScrollBar.Value = 0;
+
+                    CalendarPanel.NeedRecalcSize = true;
+                    CalendarPanel.Refresh();
+                }
+            }
+        }
+
+        #endregion
+
+        #region VScrollBar
+
+        /// <summary>
+        /// Gets the Calendar Multiuser Vertical scrollbar
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public VScrollBarAdv VScrollBar
+        {
+            get { return (_CalendarPanel.VScrollBar); }
+        }
+
+        #endregion
+
+        #region WeekDayVScrollBar
+
+        /// <summary>
+        /// Gets the WeekDay Vertical scrollbar
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public VScrollBarAdv WeekDayVScrollBar
+        {
+            get { return (WeekDayVScrollPanel != null ? WeekDayVScrollPanel.ScrollBar : null); }
+        }
+
+        #endregion
+
+        #region Style
+
+        /// <summary>
+        /// Gets/Sets the visual style of the CalendarView
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(true)]
+        [Category("Appearance"), Description("Specifies the visual style of the Control.")]
+        [DefaultValue(eDotNetBarStyle.StyleManagerControlled)]
+        public eDotNetBarStyle Style
+        {
+            get
+            {
+                return (CalendarPanel.Style);
+            }
+            set
+            {
+                if (CalendarPanel.Style != value)
+                {
+                    CalendarPanel.Style = value;
+
+                    Invalidate();
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region Private properties
+
+        /// <summary>
+        /// Gets the default (cycling) color scheme
+        /// </summary>
+        private eCalendarColor DefaultCalendarColor
+        {
+            get
+            {
+                if (IsMultiCalendar == true)
+                {
+                    eCalendarColor c = (eCalendarColor)_DefaultCalendarColor++;
+
+                    if (_DefaultCalendarColor >= (int)eCalendarColor.Automatic)
+                        _DefaultCalendarColor = 0;
+
+                    return (c);
+                }
+
+                return (eCalendarColor.Automatic);
+            }
+        }
+
+        #endregion
+
+        #region Internal properties
+
+        #region Base properties
+
+        /// <summary>
+        /// Gets the CalendarPanel object
+        /// </summary>
+        internal CalendarPanel CalendarPanel
+        {
+            get { return (_CalendarPanel); }
+        }
+
+        /// <summary>
+        /// Gets the width of a vertical scrollbar
+        /// </summary>
+        internal int VsWidth
+        {
+            get { return (SystemInformation.VerticalScrollBarWidth); }
+        }
+
+        /// <summary>
+        /// Gets the height of a horizontal scrollbar
+        /// </summary>
+        internal int HsHeight
+        {
+            get { return (SystemInformation.HorizontalScrollBarHeight); }
+        }
+
+        /// <summary>
+        /// Gets and sets the AutoSyncDate
+        /// </summary>
+        internal DateTime AutoSyncDate
+        {
+            get { return (_AutoSyncDate); }
+            set { _AutoSyncDate = value; }
+        }
+
+        /// <summary>
+        /// Gets whether any CategoryColors have been defined
+        /// </summary>
+        internal bool HasCategoryColors
+        {
+            get { return (_CategoryColors != null); }
+        }
+
+        #endregion
+
+        #region WeekDay properties
+
+        /// <summary>
+        /// Gets the default TimeSlice height
+        /// </summary>
+        internal float TimeSliceHeight
+        {
+            get { return (_TimeSliceHeight); }
+
+            set
+            {
+                int n = (_MinimumTimeSlotHeight > 0)
+                    ? _MinimumTimeSlotHeight : Font.Height + Dpi.Height(7);
+
+                if (value < n)
+                    value = n;
+
+                _TimeSliceHeight = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the number of WeekDay time slices
+        /// </summary>
+        internal int NumberOfSlices
+        {
+            get { return (_NumberOfSlices); }
+            set { _NumberOfSlices = value; }
+        }
+
+        /// <summary>
+        /// Gets the NumberOfActiveSlices
+        /// </summary>
+        internal int NumberOfActiveSlices
+        {
+            get { return (_NumberOfSlices - 1); }
+        }
+
+        /// <summary>
+        /// WeekDay starting Slice
+        /// </summary>
+        internal int StartSlice
+        {
+            get { return (_StartSlice); }
+            set { _StartSlice = value; }
+        }
+
+        /// <summary>
+        /// Gets the number of slots per hour
+        /// </summary>
+        internal int SlotsPerHour
+        {
+            get { return (_SlotsPerHour); }
+        }
+
+        /// <summary>
+        /// Gets the WeekDay Vertical Scroll panel
+        /// </summary>
+        internal WeekDayVScrollPanel WeekDayVScrollPanel
+        {
+            get
+            {
+                if (_WeekDayVScrollPanel == null)
+                    _WeekDayVScrollPanel = new WeekDayVScrollPanel(this);
+                
+                return (_WeekDayVScrollPanel);
+            }
+        }
+
+        /// <summary>
+        /// Gets the Year Vertical Scroll panel
+        /// </summary>
+        internal YearVScrollPanel YearVScrollPanel
+        {
+            get
+            {
+                if (_YearVScrollPanel == null)
+                    _YearVScrollPanel = new YearVScrollPanel(this);
+
+                return (_YearVScrollPanel);
+            }
+        }
+
+        /// <summary>
+        /// Gets the AllDay panel height
+        /// </summary>
+        internal int AllDayPanelHeight
+        {
+            get
+            {
+                for (int i = 0; i < _CalendarPanel.SubItems.Count; i++)
+                {
+                    WeekDayView wv = _CalendarPanel.SubItems[i] as WeekDayView;
+
+                    if (wv != null)
+                        return (wv.AllDayPanel.PanelHeight);
+                }
+
+                return (0);
+            }
+        }
+
+        /// <summary>
+        /// Gets the TimerRuler width
+        /// </summary>
+        internal int TimeRulerWidth
+        {
+            get { return (Dpi.Width(40)); }
+        }
+
+        #endregion
+
+        #region Year properties
+
+        internal int YearViewMax
+        {
+            get { return (_YearViewMax); }
+            set { _YearViewMax = value; }
+        }
+
+        #endregion
+
+        #region TimeLine properties
+
+        /// <summary>
+        /// Gets the base interval (total minutes)
+        /// </summary>
+        internal double BaseInterval
+        {
+            get { return (_BaseInterval); }
+        }
+
+        /// <summary>
+        /// Gets the TimeLine column count
+        /// </summary>
+        internal int TimeLineColumnCount
+        {
+            get { return (_TimeLineColumnCount); }
+        }
+
+        /// <summary>
+        /// Gets the TimeLine Horizontal Scroll panel
+        /// </summary>
+        internal TimeLineHScrollPanel TimeLineHScrollPanel
+        {
+            get
+            {
+                if (_TimeLineHScrollPanel == null)
+                    _TimeLineHScrollPanel = new TimeLineHScrollPanel(this);
+
+                return (_TimeLineHScrollPanel);
+            }
+        }
+
+        internal bool HasTimeLineSlotBackgroundCallout
+        {
+            get
+            {
+                return (TimeLinePreRenderSlotBackground != null ||
+                        TimeLinePostRenderSlotBackground != null);
+            }
+        }
+
+        internal bool HasTimeLineGetRowCollateIdCallout
+        {
+            get { return (TimeLineGetRowCollateId != null); }
+        }
+
+        #endregion
+
+        #region HasViewDisplayCustomizations
+
+        /// <summary>
+        /// Gets whether the user has defined any ViewDisplayCustomizations
+        /// </summary>
+        internal bool HasViewDisplayCustomizations
+        {
+            get { return (_ViewDisplayCustomizations != null); }
+        }
+
+        #endregion
+
+        #region Cursor support
+
+        /// <summary>
+        /// Sets the local view cursor
+        /// </summary>
+        internal Cursor ViewCursor
+        {
+            set
+            {
+                try
+                {
+                    _SetCursor = true;
+
+                    Cursor = value;
+                }
+                finally
+                {
+                    _SetCursor = false;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets the default cursor
+        /// </summary>
+        internal Cursor DefaultViewCursor
+        {
+            get { return (_DefaultViewCursor); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Public methods
+
+        #region ShowDate
+
+        /// <summary>
+        /// Navigates the current calendar view to show the given date
+        /// </summary>
+        /// <param name="date">Date to show in the calendar view</param>
+        public void ShowDate(DateTime date)
+        {
+            ShowViewDate(SelectedView, date.Date);
+        }
+
+        /// <summary>
+        /// Navigates the given view to show date
+        /// </summary>
+        /// <param name="view">View to navigate</param>
+        /// <param name="date">Date to navigate to</param>
+        internal void ShowViewDate(eCalendarView view, DateTime date)
+        {
+            if (view == eCalendarView.Day)
+            {
+                DayViewDate = date;
+            }
+            else if (view == eCalendarView.Week &&
+                (date < WeekViewStartDate || date > WeekViewEndDate))
+            {
+                WeekViewStartDate = DateHelper.GetDateForDayOfWeek(date, DateHelper.GetFirstDayOfWeek());
+                WeekViewEndDate = WeekViewStartDate.AddDays(6);
+            }
+            else if (view == eCalendarView.Month &&
+                (date < MonthViewStartDate || date > MonthViewEndDate))
+            {
+                MonthViewStartDate = date.AddDays(-(date.Day - 1));
+                MonthViewEndDate = MonthViewStartDate.AddMonths(1).AddMinutes(-1);
+            }
+            else if (view == eCalendarView.Year &&
+                (date < YearViewStartDate || date > YearViewEndDate))
+            {
+                int monthSpan = (YearViewEndDate.Year * 12 + YearViewEndDate.Month) -
+                    (YearViewStartDate.Year * 12 + YearViewStartDate.Month) + 1;
+
+                YearViewStartDate = date.AddDays(-(date.Day - 1));
+                YearViewEndDate = YearViewStartDate.AddMonths(monthSpan).AddDays(-1);
+            }
+            else if (view == eCalendarView.TimeLine &&
+                (date < TimeLineViewScrollStartDate || date > TimeLineViewScrollEndDate))
+            {
+                TimeLineViewScrollStartDate = date;
+            }
+        }
+
+        #endregion
+
+        #region ScrollToTime
+
+        /// <summary>
+        /// Scrolls the Day/Week calendar view to the
+        /// specified hour and minute
+        /// </summary>
+        /// <param name="hour">Hour to scroll to</param>
+        /// <param name="minute">Minute to scroll to</param>
+        public void ScrollToTime(int hour, int minute)
+        {
+            if (SelectedView == eCalendarView.Day || SelectedView == eCalendarView.Week)
+            {
+                int offset = (int)(hour * _SlotsPerHour * TimeSliceHeight +
+                    (TimeSliceHeight * minute) / _TimeSlotDuration);
+
+                offset -= (int)(StartSlice * TimeSliceHeight);
+
+                offset = Math.Min(offset, _WeekDayVScrollPanel.ScrollBar.Maximum);
+                offset = Math.Max(offset, 0);
+
+                _WeekDayVScrollPanel.ScrollBar.Value = offset;
+            }
+        }
+
+        #endregion
+
+        #region EnsureVisible
+
+        /// <summary>
+        /// Ensures that the given Appointment is visible
+        /// in the current view. It will change the view date and
+        /// scroll as necessary to ensure the appointment is visible
+        /// </summary>
+        /// <param name="appointment">Appointment to bring into view</param>
+        public void EnsureVisible(Appointment appointment)
+        {
+            EnsureVisible(appointment.StartTime, appointment.EndTime);
+        }
+
+        /// <summary>
+        /// Ensures that the given CustomCalendarItem is visible
+        /// in the current view. It will change the view date and
+        /// scroll as necessary to ensure the item is visible
+        /// </summary>
+        /// <param name="item">Appointment to bring into view</param>
+        public void EnsureVisible(CustomCalendarItem item)
+        {
+            EnsureVisible(item.StartTime, item.EndTime);
+        }
+
+        /// <summary>
+        /// Ensures that the given calendarItem is visible
+        /// in the current view. It will change the view date and
+        /// scroll as necessary to ensure it is visible
+        /// </summary>
+        /// <param name="startTime">Item start time</param>
+        /// <param name="endTime">Item end time</param>
+        public void EnsureVisible(DateTime startTime, DateTime endTime)
+        {
+            bool multiday = (startTime < endTime &&
+                (endTime.Subtract(startTime).TotalDays >= 1 ||
+                DateTimeHelper.IsSameDay(startTime, endTime) == false));
+
+            switch (SelectedView)
+            {
+                case eCalendarView.Day:
+                    DayViewDate = startTime.Date;
+
+                    if (multiday == false)
+                        ScrollToTime(startTime.Hour, startTime.Minute);
+                    break;
+
+                case eCalendarView.Week:
+                    if (startTime < WeekViewStartDate || startTime > WeekViewEndDate)
+                    {
+                        TimeSpan span = TimeSpan.FromDays(6);
+
+                        if (WeekViewStartDate != DateTime.MinValue && WeekViewEndDate != DateTime.MinValue)
+                            span = WeekViewEndDate.Subtract(WeekViewStartDate);
+
+                        DateTime date = DateHelper.GetDateForDayOfWeek(startTime,
+                                                                       DateHelper.GetFirstDayOfWeek());
+
+                        WeekViewStartDate = date.Date;
+                        WeekViewEndDate = WeekViewStartDate.Add(span);
+                    }
+
+                    if (multiday == false)
+                        ScrollToTime(startTime.Hour, startTime.Minute);
+                    break;
+
+                case eCalendarView.Month:
+                    if (startTime < MonthViewStartDate || startTime > MonthViewEndDate)
+                    {
+                        DateTime date = startTime.Date;
+
+                        MonthViewStartDate = date.Date.AddDays(-(date.Day - 1));
+                        MonthViewEndDate = MonthViewStartDate.AddMonths(1).AddMinutes(-1);
+                    }
+                    break;
+
+                case eCalendarView.TimeLine:
+                    if (startTime < TimeLineViewScrollStartDate ||
+                        startTime > TimeLineViewScrollEndDate)
+                    {
+                        TimeLineViewScrollStartDate = startTime;
+                    }
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region GetAppointmentView
+
+        /// <summary>
+        /// Gets the AppointmentView in the current displayed
+        /// view that was created for the given appointment
+        /// </summary>
+        /// <returns>Reference to AppointmentView or null if not found</returns>
+        public AppointmentView GetAppointmentView(Appointment appointment)
+        {
+            for (int i = 0; i < _CalendarPanel.SubItems.Count; i++)
+            {
+                BaseView view = _CalendarPanel.SubItems[i] as BaseView;
+
+                if (view != null)
+                {
+                    AppointmentView apv = view.GetAppointmentView(appointment);
+
+                    if (apv != null)
+                        return (apv);
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetAppointmentViewFromPoint
+
+        /// <summary>
+        /// Gets the AppointmentView in the current displayed
+        /// view that was created for the given appointment
+        /// </summary>
+        /// <returns>Reference to AppointmentView or null if not found</returns>
+        public AppointmentView GetAppointmentViewFromPoint(Point pt)
+        {
+            BaseView bv = GetViewFromPoint(pt);
+
+            if (bv != null)
+                return (bv.GetAppointmentViewFromPoint(pt));
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetDateSelectionFromPoint
+
+        /// <summary>
+        /// Gets the default date selection from the given point. The startDate
+        /// and endDate will vary based upon the view type (WeekDay / Month)
+        /// </summary>
+        /// <param name="pt">Point in question</param>
+        /// <param name="startDate">[out] Start date</param>
+        /// <param name="endDate">[out] End date</param>
+        /// <returns>True if a valid selection exists
+        /// at the given point</returns>
+        public bool GetDateSelectionFromPoint(
+            Point pt, out DateTime startDate, out DateTime endDate)
+        {
+            BaseView bv = GetViewFromPoint(pt);
+
+            if (bv != null)
+                return (bv.GetDateSelectionFromPoint(pt, out startDate, out endDate));
+
+            startDate = new DateTime();
+            endDate = new DateTime();
+
+            return (false);
+        }
+
+        #endregion
+
+        #region GetViewFromPoint
+
+        /// <summary>
+        /// Gets the View that contains the given point
+        /// </summary>
+        /// <param name="pt">Point in question</param>
+        /// <returns>BaseView containing the given point, or null</returns>
+        public BaseView GetViewFromPoint(Point pt)
+        {
+            if (_CalendarPanel != null)
+            {
+                for (int i = 0; i < _CalendarPanel.SubItems.Count; i++)
+                {
+                    BaseView bv = _CalendarPanel.SubItems[i] as BaseView;
+
+                    if (bv != null)
+                    {
+                        if (bv.Bounds.Contains(pt))
+                            return (bv);
+                    }
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetSelectedView
+
+        /// <summary>
+        /// Gets the current selected BaseView
+        /// </summary>
+        /// <returns></returns>
+        public BaseView GetSelectedView()
+        {
+            if (_CalendarPanel != null)
+            {
+                for (int i = 0; i < _CalendarPanel.SubItems.Count; i++)
+                {
+                    BaseView bv = _CalendarPanel.SubItems[i] as BaseView;
+
+                    if (bv != null)
+                    {
+                        if (bv.IsViewSelected == true &&
+                            bv.DisplayedOwnerKeyIndex == SelectedOwnerIndex)
+                        {
+                            return (bv);
+                        }
+                    }
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal methods
+
+        internal DateTime TimeLineAddInterval(DateTime startDate, int interval)
+        {
+            return ((TimeLinePeriod == eTimeLinePeriod.Years) ?
+                startDate.AddYears(interval * TimeLineInterval) :
+                startDate.AddMinutes(interval * BaseInterval));
+        }
+
+        #endregion
+
+        #region HookModelEvents
+
+        /// <summary>
+        /// Hooks needed events
+        /// </summary>
+        /// <param name="hook">True to hook, false to unhook</param>
+        private void HookModelEvents(bool hook)
+        {
+            if (hook == true)
+            {
+                _CalendarModel.AppointmentStartTimeReached +=
+                    CalendarModelAppointmentStartTimeReached;
+
+                _CalendarModel.ReminderNotification +=
+                    CalendarModelReminderNotification;
+            }
+            else
+            {
+                _CalendarModel.AppointmentStartTimeReached -=
+                    CalendarModelAppointmentStartTimeReached;
+
+                _CalendarModel.ReminderNotification -=
+                    CalendarModelReminderNotification;
+            }
+        }
+
+        #endregion
+
+        #region Event handling
+
+        #region Theme Changing
+
+        /// <summary>
+        /// Called by StyleManager to notify control that style on manager has changed and that control should refresh its appearance if
+        /// its style is controlled by StyleManager.
+        /// </summary>
+        /// <param name="newStyle">New active style.</param>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void StyleManagerStyleChanged(eDotNetBarStyle newStyle)
+        {
+            if (BarFunctions.IsHandleValid(this))
+                Invalidate(true);
+
+            BackColor = ((Office2007Renderer)
+                GlobalManager.Renderer).ColorTable.CalendarView.TimeRulerColors[0].Colors[0];
+        }
+
+        #endregion
+
+        #region ReminderNotification
+
+        /// <summary>
+        /// ReminderNotification
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void CalendarModelReminderNotification(object sender, ReminderEventArgs e)
+        {
+            if (AppointmentReminder != null)
+                ReminderNotification(e);
+        }
+
+        /// <summary>
+        /// Dispatches ReminderNotification to UI thread
+        /// </summary>
+        /// <param name="e"></param>
+        private void ReminderNotification(ReminderEventArgs e)
+        {
+            if (InvokeRequired)
+            {
+                BeginInvoke(new
+                    MethodInvoker(delegate { ReminderNotification(e); }));
+            }
+            else
+            {
+                AppointmentReminder(this, e);
+            }
+        }
+
+        #endregion
+
+        #region AppointmentStartTimeReached
+
+        /// <summary>
+        /// AppointmentStartTimeReached
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void CalendarModelAppointmentStartTimeReached(object sender, AppointmentEventArgs e)
+        {
+            if (AppointmentStartTimeReached != null)
+                StartTimeReachedNotification(e);
+        }
+
+        /// <summary>
+        /// Dispatches AppointmentStartTimeReached to UI thread
+        /// </summary>
+        /// <param name="e"></param>
+        private void StartTimeReachedNotification(AppointmentEventArgs e)
+        {
+            if (InvokeRequired)
+            {
+                BeginInvoke(new
+                    MethodInvoker(delegate { StartTimeReachedNotification(e); }));
+            }
+            else
+            {
+                AppointmentStartTimeReached(this, e);
+            }
+        }
+
+        #endregion
+
+        #region AppointmentCategoryColorCollectionChanged
+
+        /// <summary>
+        /// AppointmentCategoryColorCollectionChanged
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void CategoryColorsAppointmentCategoryColorCollectionChanged(object sender, EventArgs e)
+        {
+            Invalidate();
+        }
+
+        #endregion
+
+        #region TimeIndicatorCollectionChanged
+
+        /// <summary>
+        /// TimeIndicatorCollectionChanged
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void TimeIndicatorsTimeIndicatorCollectionChanged(object sender, EventArgs e)
+        {
+            if (TimeIndicatorsChanged != null)
+                TimeIndicatorsChanged(this, EventArgs.Empty);
+
+            Invalidate();
+        }
+
+        #endregion
+
+        #region TimeIndicatorColorChanged
+
+        /// <summary>
+        /// Processes TimeIndicatorColorChanged events
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void TimeIndicatorsTimeIndicatorColorChanged(object sender, TimeIndicatorColorChangedEventArgs e)
+        {
+            if (TimeIndicatorColorChanged != null)
+                TimeIndicatorColorChanged(this, e);
+
+            TimeIndicator ti = e.TimeIndicator;
+
+            if (ti.Visibility != eTimeIndicatorVisibility.Hidden &&
+                (ti.IndicatorArea == eTimeIndicatorArea.All ||
+                 ti.IndicatorArea == eTimeIndicatorArea.Content))
+            {
+                for (int i = 0; i < CalendarPanel.SubItems.Count; i++)
+                {
+                    BaseView view = CalendarPanel.SubItems[i] as BaseView;
+
+                    if (view != null && view.Displayed == true)
+                        InvalidateTimeIndicator(view, ti, ti.IndicatorDisplayTime);
+                }
+            }
+        }
+
+        #endregion
+
+        #region TimeIndicatorTimeChanged
+
+        /// <summary>
+        /// Processes TimeIndicatorTimeChanged events
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void TimeIndicatorsTimeIndicatorTimeChanged(object sender, TimeIndicatorTimeChangedEventArgs e)
+        {
+            if (TimeIndicatorTimeChanged != null)
+                TimeIndicatorTimeChanged(this, e);
+
+            TimeIndicator ti = e.TimeIndicator;
+
+            if (ti.Visibility != eTimeIndicatorVisibility.Hidden &&
+                (ti.IndicatorArea == eTimeIndicatorArea.All ||
+                 ti.IndicatorArea == eTimeIndicatorArea.Content))
+            {
+                for (int i = 0; i < CalendarPanel.SubItems.Count; i++)
+                {
+                    BaseView view = CalendarPanel.SubItems[i] as BaseView;
+
+                    if (view != null && view.Displayed == true)
+                    {
+                        InvalidateTimeIndicator(view, ti, e.OldTime);
+                        InvalidateTimeIndicator(view, ti, e.NewTime);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region ViewDisplayCustomizations_CollectionChanged
+
+        void ViewDisplayCustomizationsCollectionChanged(object sender, EventArgs e)
+        {
+            if (ViewDisplayCustomizationsChanged != null)
+                ViewDisplayCustomizationsChanged(this, e);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InitDefaultViews
+
+        /// <summary>
+        /// InitDefaultViews
+        /// </summary>
+        private void InitDefaultViews()
+        {
+            _DayViewDate = DateTime.Today;
+            _AutoSyncDate = _DayViewDate;
+            _WeekViewStartDate = DateHelper.GetDateForDayOfWeek(DateTime.Today, DateHelper.GetFirstDayOfWeek());
+            _WeekViewEndDate = WeekViewStartDate.AddDays(6);
+
+            _MonthViewStartDate = DateTime.Today.AddDays(-(DateTime.Today.Day - 1));
+            _MonthViewEndDate = MonthViewStartDate.AddMonths(1).AddDays(-1);
+
+            _YearViewStartDate = DateTime.Today.AddDays(-(DateTime.Today.Day - 1));
+            _YearViewEndDate = _YearViewStartDate.AddMonths(12).AddDays(-1);
+
+            _TimeLineViewStartDate = DateTime.Today;
+            _TimeLineViewEndDate = _TimeLineViewStartDate.AddDays(7);
+
+            CalcTimeLineColumnCount(true);
+
+            _NumberOfSlices = HoursPerDay * (MinutesPerHour / _TimeSlotDuration);
+            _SlotsPerHour = MinutesPerHour / _TimeSlotDuration;
+        }
+
+        #endregion
+
+        #region SetSelectedView
+
+        /// <summary>
+        /// Sets the selected view
+        /// </summary>
+        /// <param name="value">View to select</param>
+        internal void SetSelectedView(eCalendarView value)
+        {
+            _SelectedView = value;
+
+            _CalendarPanel.SubItems.Clear();
+
+            if (IsMultiCalendar)
+                InstallMultiCalendar(value);
+            else
+                InstallSingleCalendar(value);
+
+            _CalendarPanel.RecalcSize();
+            _CalendarPanel.Refresh();
+        }
+
+        #region Single Calendar Install
+
+        /// <summary>
+        /// Installs single-user calendar
+        /// </summary>
+        /// <param name="value">eCalendarView</param>
+        private void InstallSingleCalendar(eCalendarView value)
+        {
+            switch (value)
+            {
+                case eCalendarView.Day:
+                    SetupWeekDayView();
+                    InstallView(DayView);
+                    break;
+
+                case eCalendarView.Week:
+                    SetupWeekDayView();
+                    InstallView(WeekView);
+                    break;
+
+                case eCalendarView.Month:
+                    SetupMonthView();
+                    InstallView(MonthView);
+                    break;
+
+                case eCalendarView.Year:
+                    SetupYearView();
+                    InstallView(YearView);
+                    break;
+
+                case eCalendarView.TimeLine:
+                    SetupTimeLineView();
+                    InstallView(TimeLineView);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region MultiCalendar Install
+
+        /// <summary>
+        /// Installs multi-user calendar
+        /// </summary>
+        /// <param name="value"></param>
+        private void InstallMultiCalendar(eCalendarView value)
+        {
+            switch (value)
+            {
+                case eCalendarView.Day:
+                    InstallMultiDayCalendar();
+                    break;
+
+                case eCalendarView.Week:
+                    InstallMultiWeekCalendar();
+                    break;
+
+                case eCalendarView.Month:
+                    InstallMultiMonthCalendar();
+                    break;
+
+                case eCalendarView.Year:
+                    InstallMultiYearCalendar();
+                    break;
+
+                case eCalendarView.TimeLine:
+                    InstallMultiTimeLineCalendar();
+                    break;
+            }
+        }
+
+        #region InstallMultiDayCalendar
+
+        /// <summary>
+        /// Installs multi-user DayView calendar
+        /// </summary>
+        private void InstallMultiDayCalendar()
+        {
+            if (_MultiCalendarDayViews.Count > 0)
+            {
+                SetupWeekDayView();
+
+                for (int i = 0; i < _MultiCalendarDayViews.Count; i++)
+                    InstallView(_MultiCalendarDayViews[i]);
+            }
+        }
+
+        #endregion
+
+        #region InstallMultiWeekCalendar
+
+        /// <summary>
+        /// Installs multi-user WeekView calendar
+        /// </summary>
+        private void InstallMultiWeekCalendar()
+        {
+            if (_MultiCalendarWeekViews.Count > 0)
+            {
+                SetupWeekDayView();
+
+                for (int i = 0; i < _MultiCalendarWeekViews.Count; i++)
+                    InstallView(_MultiCalendarWeekViews[i]);
+            }
+        }
+
+        #endregion
+
+        #region InstallMultiMonthCalendar
+
+        /// <summary>
+        /// Installs multi-user MonthView calendar
+        /// </summary>
+        private void InstallMultiMonthCalendar()
+        {
+            if (_MultiCalendarMonthViews.Count > 0)
+            {
+                SetupMonthView();
+
+                for (int i = 0; i < _MultiCalendarMonthViews.Count; i++)
+                    InstallView(_MultiCalendarMonthViews[i]);
+            }
+        }
+
+        #endregion
+
+        #region InstallMultiYearCalendar
+
+        /// <summary>
+        /// Installs multi-user YearView calendar
+        /// </summary>
+        private void InstallMultiYearCalendar()
+        {
+            if (_MultiCalendarYearViews.Count > 0)
+            {
+                SetupYearView();
+
+                for (int i = 0; i < _MultiCalendarYearViews.Count; i++)
+                    InstallView(_MultiCalendarYearViews[i]);
+            }
+        }
+
+        #endregion
+
+        #region InstallMultiTimeLineCalendar
+
+        /// <summary>
+        /// Installs multi-user TimeLineView calendar
+        /// </summary>
+        private void InstallMultiTimeLineCalendar()
+        {
+            if (_MultiCalendarTimeLineViews.Count > 0)
+            {
+                SetupTimeLineView();
+
+                for (int i = 0; i < _MultiCalendarTimeLineViews.Count; i++)
+                    InstallView(_MultiCalendarTimeLineViews[i]);
+            }
+        }
+
+        #endregion
+
+        #region TimeRulePanel support
+
+        /// <summary>
+        /// Installs the TimeRulerPanel
+        /// </summary>
+        private void InstallTimerPanel()
+        {
+            if (_IsTimeRulerVisible == true)
+            {
+                if (_TimeRulerPanel == null)
+                    _TimeRulerPanel = new TimeRulerPanel(this);
+
+                _TimeRulerPanel.Displayed = true;
+
+                _CalendarPanel.SubItems.Add(_TimeRulerPanel);
+            }
+        }
+
+        /// <summary>
+        /// Release the TimeRulerPanel
+        /// </summary>
+        private void ReleaseTimeRulerPanel()
+        {
+            if (_TimeRulerPanel != null)
+                _TimeRulerPanel.Displayed = false;
+        }
+
+        #endregion
+
+        #region WeekDayVScrollPanel support
+
+        private void InstallWeekDayVScrollPanel()
+        {
+            if (_WeekDayVScrollPanel == null)
+                _WeekDayVScrollPanel = new WeekDayVScrollPanel(this);
+
+            _WeekDayVScrollPanel.Visible = true;
+            _WeekDayVScrollPanel.Displayed = true;
+
+            _CalendarPanel.SubItems.Add(_WeekDayVScrollPanel);
+        }
+
+        private void ReleaseWeekDayVScrollPanel()
+        {
+            if (_WeekDayVScrollPanel != null)
+                _WeekDayVScrollPanel.Visible = false;
+        }
+
+        #endregion
+
+        #region YearVScrollPanel support
+
+        private void InstallYearVScrollPanel()
+        {
+            if (_YearVScrollPanel == null)
+                _YearVScrollPanel = new YearVScrollPanel(this);
+
+            _CalendarPanel.SubItems.Add(_YearVScrollPanel);
+        }
+
+        private void ReleaseYearVScrollPanel()
+        {
+            if (_YearVScrollPanel != null)
+                _YearVScrollPanel.Visible = false;
+        }
+
+        #endregion
+
+        #region TimeLineHeaderPanel support
+
+        private void InstallTimeLineHeaderPanel()
+        {
+            if (_TimeLineHeaderPanel == null)
+                _TimeLineHeaderPanel = new TimeLineHeaderPanel(this);
+
+            _TimeLineHeaderPanel.Displayed = true;
+
+            _CalendarPanel.SubItems.Add(_TimeLineHeaderPanel);
+        }
+
+        /// <summary>
+        /// Release the TimeLineHeaderPanel
+        /// </summary>
+        private void ReleaseTimeLineHeaderPanel()
+        {
+            if (_TimeLineHeaderPanel != null)
+                _TimeLineHeaderPanel.Displayed = false;
+        }
+
+        #endregion
+
+        #region TimeLineHScrollPanel support
+
+        /// <summary>
+        /// Installs the TimeLine Horizontal Scroll Panel
+        /// </summary>
+        private void InstallTimeLineHScrollPanel()
+        {
+            if (_TimeLineHScrollPanel == null)
+                _TimeLineHScrollPanel = new TimeLineHScrollPanel(this);
+
+            _TimeLineHScrollPanel.ScrollPanelChanged -= ScrollPanelChanged;
+            _TimeLineHScrollPanel.ScrollPanelChanged += ScrollPanelChanged;
+
+            if (_TimeLineShowHScrollBar == true)
+            {
+                _TimeLineHScrollPanel.Visible = true;
+                _TimeLineHScrollPanel.Displayed = true;
+            }
+            else
+            {
+                _TimeLineHScrollPanel.Visible = false;
+                _TimeLineHScrollPanel.Displayed = false;
+            }
+
+            _CalendarPanel.SubItems.Add(_TimeLineHScrollPanel);
+        }
+
+        /// <summary>
+        /// Handles Scroll Panel updates
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ScrollPanelChanged(object sender, EventArgs e)
+        {
+            TimeLineViewScrollStartDate =
+                _TimeLineViewStartDate.AddMinutes(_BaseInterval * TimeLineHScrollPanel.ScrollBar.Value);
+        }
+
+        /// <summary>
+        /// Releases the Horizontal Scroll Panel
+        /// </summary>
+        private void ReleaseTimeLineHScrollPanel()
+        {
+            if (_TimeLineHScrollPanel != null)
+            {
+                _TimeLineHScrollPanel.Visible = false;
+
+                _TimeLineHScrollPanel.ScrollPanelChanged -= ScrollPanelChanged;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region SetupView support
+
+        #region SetupWeekDayView
+
+        private void SetupWeekDayView()
+        {
+            ReleaseTimeLineHeaderPanel();
+            ReleaseTimeLineHScrollPanel();
+            ReleaseYearVScrollPanel();
+
+            InstallWeekDayVScrollPanel();
+            InstallTimerPanel();
+        }
+
+        #endregion
+
+        #region SetupMonthView
+
+        private void SetupMonthView()
+        {
+            ReleaseTimeRulerPanel();
+            ReleaseWeekDayVScrollPanel();
+            ReleaseYearVScrollPanel();
+            ReleaseTimeLineHeaderPanel();
+            ReleaseTimeLineHScrollPanel();
+        }
+
+        #endregion
+
+        #region SetupYearView
+
+        private void SetupYearView()
+        {
+            ReleaseTimeRulerPanel();
+            ReleaseWeekDayVScrollPanel();
+            ReleaseTimeLineHeaderPanel();
+            ReleaseTimeLineHScrollPanel();
+
+            InstallYearVScrollPanel();
+        }
+
+        #endregion
+
+        #region SetupTimeLineView
+
+        private void SetupTimeLineView()
+        {
+            ReleaseTimeRulerPanel();
+            ReleaseWeekDayVScrollPanel();
+            ReleaseYearVScrollPanel();
+
+            InstallTimeLineHScrollPanel();
+            InstallTimeLineHeaderPanel();
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InstallView
+
+        /// <summary>
+        /// Installs the given View into the CalendarPanel
+        /// </summary>
+        /// <param name="view">View to install</param>
+        private void InstallView(BaseView view)
+        {
+            if (view != null)
+            {
+                view.Displayed = true;
+                view.IsViewSelected = true;
+                view.Style = _CalendarPanel.Style;
+
+                _CalendarPanel.SubItems.Add(view);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region AppointmentView
+
+        #region DoAppointmentViewChanging
+
+        /// <summary>
+        /// Routine to initiate the OnChange user events
+        /// </summary>
+        /// <param name="calendarItem">Affected item</param>
+        /// <param name="ownerKey"></param>
+        /// <param name="startTime">New start time</param>
+        /// <param name="endTime">New end time</param>
+        /// <param name="viewOperation">Move, resize, etc</param>
+        /// <param name="isCopyDrag"></param>
+        /// <returns></returns>
+        internal bool DoAppointmentViewChanging(CalendarItem calendarItem, string ownerKey,
+            DateTime startTime, DateTime endTime, eViewOperation viewOperation, bool isCopyDrag)
+        {
+            bool cancel = OnAppointmentViewChanging(
+                calendarItem, ownerKey, startTime, endTime, viewOperation, isCopyDrag);
+
+            return (cancel);
+        }
+
+        #endregion
+
+        #region DoBeforeAppointmentViewChange
+
+        /// <summary>
+        /// Routine to initiate the BeforeAppointmentViewChange event
+        /// </summary>
+        /// <param name="baseView">BaseView</param>
+        /// <param name="calendarItem">Affected item</param>
+        /// <param name="viewOperation">Move, resize, etc</param>
+        /// <returns></returns>
+        internal bool DoBeforeAppointmentViewChange(BaseView baseView,
+            CalendarItem calendarItem, eViewOperation viewOperation)
+        {
+            return (OnBeforeAppointmentViewChange(baseView, calendarItem, viewOperation));
+        }
+
+        #endregion
+
+        #region OnBeforeAppointmentViewChange
+
+        /// <summary>
+        /// OnBeforeAppointmentViewChange event propagation
+        /// </summary>
+        protected virtual bool OnBeforeAppointmentViewChange(BaseView baseView,
+            CalendarItem calendarItem, eViewOperation viewOperation)
+        {
+            if (BeforeAppointmentViewChange != null)
+            {
+                bool isCopyDrag = ((baseView.IsCopyDrag == false) &&
+                    (ModifierKeys & Keys.Control) == Keys.Control);
+
+                BeforeAppointmentViewChangeEventArgs ev = new
+                    BeforeAppointmentViewChangeEventArgs(calendarItem, viewOperation, isCopyDrag);
+
+                BeforeAppointmentViewChange(this, ev);
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region OnAppointmentViewChanging
+
+        /// <summary>
+        /// OnAppointmentViewChanging event propagation
+        /// </summary>
+        protected virtual bool OnAppointmentViewChanging(CalendarItem calendarItem,
+            string ownerKey, DateTime startTime, DateTime endTime, eViewOperation viewOperation, bool isCopyDrag)
+        {
+            if (AppointmentViewChanging != null)
+            {
+                AppointmentViewChangingEventArgs ev = new AppointmentViewChangingEventArgs(
+                    calendarItem, ownerKey, startTime, endTime, viewOperation, isCopyDrag);
+
+                AppointmentViewChanging(this, ev);
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region DoAppointmentViewChanged
+
+        /// <summary>
+        /// DoAppointmentViewChanged event propagation
+        /// </summary>
+        internal virtual void DoAppointmentViewChanged(CalendarItem calendarItem, string oldOwnerKey,
+            DateTime oldStartTime, DateTime oldEndTime, eViewOperation viewOperation, bool isCopyDrag)
+        {
+            if (AppointmentViewChanged != null)
+            {
+                AppointmentViewChanged(this, new AppointmentViewChangedEventArgs(
+                        calendarItem, oldOwnerKey, oldStartTime, oldEndTime, viewOperation, isCopyDrag));
+            }
+        }
+
+        #endregion
+
+        #region DoGetDisplayTemplateText
+
+        /// <summary>
+        /// DoGetDisplayTemplateText event propagation
+        /// </summary>
+        internal virtual int DoGetAppointmentGroupId(
+            CalendarItem calendarItem, int groupId)
+        {
+            if (GetAppointmentGroupId != null)
+            {
+                GetAppointmentGroupIdEventArgs e =
+                    new GetAppointmentGroupIdEventArgs(calendarItem, groupId);
+
+                GetAppointmentGroupId(this, e);
+
+                return (e.GroupId);
+            }
+
+            return (groupId);
+        }
+
+        #endregion
+
+        #region DoGetDisplayTemplateText
+
+        /// <summary>
+        /// DoGetDisplayTemplateText event propagation
+        /// </summary>
+        internal virtual string DoGetDisplayTemplateText(
+            CalendarItem calendarItem, string displayTemplate, string displayText)
+        {
+            if (GetDisplayTemplateText != null)
+            {
+                GetDisplayTemplateTextEventArgs e =
+                    new GetDisplayTemplateTextEventArgs(calendarItem, displayTemplate, displayText);
+
+                GetDisplayTemplateText(this, e);
+
+                return (e.DisplayText);
+            }
+
+            return (displayText);
+        }
+
+        #endregion
+
+        #region DoAppointmentViewPreRender
+
+        /// <summary>
+        /// Handles DoAppointmentViewPreRender events
+        /// </summary>
+        internal bool DoAppointmentViewPreRender(
+            CalendarItem calendarItem, Graphics g, Rectangle bounds, GraphicsPath path)
+        {
+            if (AppointmentViewPreRender != null)
+            {
+                AppointmentViewPreRenderEventArgs ev = new
+                    AppointmentViewPreRenderEventArgs(calendarItem, g, bounds, path);
+
+                AppointmentViewPreRender(this, ev);
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region DoAppointmentViewPostRender
+
+        /// <summary>
+        /// Handles DoAppointmentViewPostRender events
+        /// </summary>
+        internal void DoAppointmentViewPostRender(
+            CalendarItem calendarItem, Graphics g, Rectangle bounds, GraphicsPath path)
+        {
+            if (AppointmentViewPostRender != null)
+            {
+                AppointmentViewPostRenderEventArgs ev = new
+                    AppointmentViewPostRenderEventArgs(calendarItem, g, bounds, path);
+
+                AppointmentViewPostRender(this, ev);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region DoViewDateChanged
+
+        internal void DoViewDateChanged(BaseView view,
+            DateTime oldStartDate, DateTime oldEndDate, DateTime newStartDate, DateTime newEndDate)
+        {
+            if (ViewDateChanged != null)
+            {
+                ViewDateChangedEventArgs ev = new ViewDateChangedEventArgs(
+                    view, oldStartDate, oldEndDate, newStartDate, newEndDate);
+
+                ViewDateChanged(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region DoViewDateChanging
+
+        internal bool DoViewDateChanging(BaseView view,
+            DateTime oldStartDate, DateTime oldEndDate, ref DateTime newStartDate, ref DateTime newEndDate)
+        {
+            if (ViewDateChanging != null)
+            {
+                ViewDateChangingEventArgs ev = new ViewDateChangingEventArgs(
+                    view, oldStartDate, oldEndDate, newStartDate, newEndDate);
+
+                ViewDateChanging(this, ev);
+
+                if (ev.Cancel == true)
+                    return (true);
+
+                newStartDate = ev.NewStartTime;
+                newEndDate = ev.NewEndTime;
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region DoDetailSortEvent
+
+        /// <summary>
+        /// DoDetailSortEvent
+        /// </summary>
+        internal void DoDetailSortEvent(
+            BaseView view, CalendarItem item1, CalendarItem item2, ref int result)
+        {
+            if (CalendarItemDetailSort != null)
+            {
+                CalendarItemEventArgs e =
+                    new CalendarItemEventArgs(view, item1, item2);
+
+                CalendarItemDetailSort(this, e);
+
+                result = e.Result;
+            }
+        }
+
+        #endregion
+
+        #region DoTimeLineViewRenderPeriodHeader
+
+        /// <summary>
+        /// Handles invocation of DoTimeLineViewRenderPeriodHeader event
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="startTime"></param>
+        /// <param name="endTime"></param>
+        /// <param name="bounds"></param>
+        /// <param name="text"></param>
+        /// <returns></returns>
+        internal bool DoTimeLineViewRenderPeriodHeader(Graphics g,
+            DateTime startTime, DateTime endTime, Rectangle bounds, ref string text)
+        {
+            if (TimeLineRenderPeriodHeader != null)
+            {
+                TimeLineRenderPeriodHeaderEventArgs ev = new
+                    TimeLineRenderPeriodHeaderEventArgs(g, startTime, endTime, bounds, text);
+
+                TimeLineRenderPeriodHeader(this, ev);
+
+                text = ev.Text;
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region DoTimeLineViewPreRenderSlotBackground
+
+        /// <summary>
+        /// Handles invocation of DoTimeLineViewPreRenderSlotBackground event
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="endTime"></param>
+        /// <param name="bounds"></param>
+        /// <param name="state"></param>
+        /// <param name="view"></param>
+        /// <param name="startTime"></param>
+        /// <returns></returns>
+        internal bool DoTimeLineViewPreRenderSlotBackground(Graphics g, BaseView view,
+            DateTime startTime, DateTime endTime, Rectangle bounds, ref eSlotDisplayState state)
+        {
+            if (TimeLinePreRenderSlotBackground != null)
+            {
+                TimeLinePreRenderSlotBackgroundEventArgs ev = new
+                    TimeLinePreRenderSlotBackgroundEventArgs(g, view, startTime, endTime, bounds, state);
+
+                TimeLinePreRenderSlotBackground(this, ev);
+
+                state = ev.State;
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region DoTimeLineViewPostRenderSlotBackground
+
+        /// <summary>
+        /// Handles invocation of DoTimeLineViewPostRenderSlotBackground event
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="endTime"></param>
+        /// <param name="bounds"></param>
+        /// <param name="state"></param>
+        /// <param name="view"></param>
+        /// <param name="startTime"></param>
+        /// <returns></returns>
+        internal void DoTimeLineViewPostRenderSlotBackground(Graphics g, BaseView view,
+            DateTime startTime, DateTime endTime, Rectangle bounds, eSlotDisplayState state)
+        {
+            if (TimeLinePostRenderSlotBackground != null)
+            {
+                TimeLinePostRenderSlotBackgroundEventArgs ev = new
+                    TimeLinePostRenderSlotBackgroundEventArgs(g, view, startTime, endTime, bounds, state);
+
+                TimeLinePostRenderSlotBackground(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region DoTimeLineViewRenderSlotBorder
+
+        /// <summary>
+        /// DoTimeLineViewRenderSlotBorder
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="view"></param>
+        /// <param name="col"></param>
+        /// <param name="hourly"></param>
+        /// <param name="state"></param>
+        /// <param name="pt1"></param>
+        /// <param name="pt2"></param>
+        /// <param name="pen"></param>
+        /// <returns></returns>
+        internal bool DoTimeLineViewRenderSlotBorder(
+            Graphics g, TimeLineView view, int col, bool hourly,
+            eSlotDisplayState state, Point pt1, Point pt2, Pen pen)
+        {
+            if (TimeLineRenderSlotBorder != null)
+            {
+                DateTime startTime = view.StartDate.AddMinutes(col * _BaseInterval);
+
+                TimeLineRenderSlotBorderEventArgs ev = new
+                    TimeLineRenderSlotBorderEventArgs(g, startTime, hourly, state, pt1, pt2, pen.Color);
+
+                TimeLineRenderSlotBorder(this, ev);
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region DoTimeLineViewRenderViewBorder
+
+        /// <summary>
+        /// DoTimeLineViewRenderViewBorder
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="view"></param>
+        /// <param name="startColumn"></param>
+        /// <param name="endColumn"></param>
+        /// <param name="bounds"></param>
+        /// <param name="color"></param>
+        /// <returns></returns>
+        internal bool DoTimeLineViewRenderViewBorder(
+            Graphics g, TimeLineView view, int startColumn, int endColumn, Rectangle bounds, Color color)
+        {
+            if (TimeLineRenderViewBorder != null)
+            {
+                TimeLineRenderViewBorderEventArgs ev = new
+                    TimeLineRenderViewBorderEventArgs(g, startColumn, endColumn, bounds, color);
+
+                TimeLineRenderViewBorder(this, ev);
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region DoTimeLineGetRowHeight
+
+        /// <summary>
+        /// DoTimeLineGetRowHeight
+        /// </summary>
+        /// <param name="e"></param>
+        internal void DoTimeLineGetRowHeight(TimeLineGetRowHeightEventArgs e)
+        {
+            if (TimeLineGetRowHeight != null)
+                TimeLineGetRowHeight(this, e);
+        }
+
+        #endregion
+
+        #region DoTimeLineGetRowCollateId
+
+        /// <summary>
+        /// DoTimeLineGetRowCollateId
+        /// </summary>
+        /// <param name="e"></param>
+        internal void DoTimeLineGetRowCollateId(TimeLineGetRowCollateIdEventArgs e)
+        {
+            if (TimeLineGetRowCollateId != null)
+                TimeLineGetRowCollateId(this, e);
+        }
+
+        #endregion
+
+        #region DoTimeLineGetHeaderText
+
+        /// <summary>
+        /// DoTimeLineGetHeaderText
+        /// </summary>
+        /// <param name="header"></param>
+        /// <param name="date"></param>
+        /// <param name="text"></param>
+        internal void DoTimeLineGetHeaderText(
+            TimeLineHeaderPanel header, DateTime date, ref string text)
+        {
+            if (TimeLineGetHeaderText != null)
+            {
+                TimeLineGetHeaderTextEventArgs e =
+                    new TimeLineGetHeaderTextEventArgs(header, date, text);
+
+                TimeLineGetHeaderText(this, e);
+
+                text = e.Text;
+            }
+        }
+
+        #endregion
+
+        #region DoPageNavigatorClick
+
+        /// <summary>
+        /// Handles invocation of PageNavigatorClick events
+        /// </summary>
+        /// <returns></returns>
+        internal bool DoPageNavigatorClick(BaseView view,
+            PageNavigator pageNavigator, PageNavigatorButton button, ref DateTime navigateTime)
+        {
+            if (PageNavigatorClick != null)
+            {
+                PageNavigatorClickEventArgs ev = new
+                    PageNavigatorClickEventArgs(view, pageNavigator, button, navigateTime);
+
+                PageNavigatorClick(this, ev);
+
+                navigateTime = ev.NavigateTime;
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region DoYearViewLinkSelected
+
+        /// <summary>
+        /// Handles invocation of DoYearViewLinkSelected event
+        /// </summary>
+        internal bool DoYearViewLinkSelected(
+            ref DateTime startDate, ref DateTime endDate, ref eCalendarView calendarView)
+        {
+            if (YearViewLinkSelected != null)
+            {
+                LinkViewSelectedEventArgs ev = new
+                    LinkViewSelectedEventArgs(startDate, endDate, calendarView);
+
+                YearViewLinkSelected(this, ev);
+
+                startDate = ev.StartDate;
+                endDate = ev.EndDate;
+                calendarView = ev.ECalendarView;
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region DoYearViewDrawDayBackground
+
+        /// <summary>
+        /// Handles invocation of YearViewDrawDayBackground event
+        /// </summary>
+        internal bool DoYearViewDrawDayBackground(Graphics g,
+            YearMonth yearMonth, DateTime date, Rectangle bounds, ref eYearViewLinkStyle style)
+        {
+            if (YearViewDrawDayBackground != null)
+            {
+                YearViewDrawDayBackgroundEventArgs ev = new
+                    YearViewDrawDayBackgroundEventArgs(g, yearMonth, date, bounds, style);
+
+                YearViewDrawDayBackground(this, ev);
+
+                style = ev.LinkStyle;
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region DoYearViewDrawDayText
+
+        /// <summary>
+        /// Handles invocation of YearViewDrawDayText event
+        /// </summary>
+        internal bool DoYearViewDrawDayText(Graphics g,
+            YearMonth yearMonth, DateTime date, Rectangle bounds)
+        {
+            if (YearViewDrawDayText != null)
+            {
+                YearViewDrawDayTextEventArgs ev = new
+                    YearViewDrawDayTextEventArgs(g, yearMonth, date, bounds);
+
+                YearViewDrawDayText(this, ev);
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region DoMonthViewPreRenderSlotBackground
+
+        /// <summary>
+        /// Handles invocation of MonthViewPreRenderSlotBackground event
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="endTime"></param>
+        /// <param name="bounds"></param>
+        /// <param name="state"></param>
+        /// <param name="view"></param>
+        /// <param name="startTime"></param>
+        /// <returns></returns>
+        internal bool DoMonthViewPreRenderSlotBackground(Graphics g, BaseView view,
+            DateTime startTime, DateTime endTime, Rectangle bounds, ref eSlotDisplayState state)
+        {
+            if (MonthViewPreRenderSlotBackground != null)
+            {
+                MonthViewPreRenderSlotBackgroundEventArgs ev = new
+                    MonthViewPreRenderSlotBackgroundEventArgs(g, view, startTime, endTime, bounds, state);
+
+                MonthViewPreRenderSlotBackground(this, ev);
+
+                state = ev.State;
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region DoMonthViewPostRenderSlotBackground
+
+        /// <summary>
+        /// Handles invocation of MonthViewPostRenderSlotBackground event
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="endTime"></param>
+        /// <param name="bounds"></param>
+        /// <param name="state"></param>
+        /// <param name="view"></param>
+        /// <param name="startTime"></param>
+        /// <returns></returns>
+        internal void DoMonthViewPostRenderSlotBackground(Graphics g, BaseView view,
+            DateTime startTime, DateTime endTime, Rectangle bounds, eSlotDisplayState state)
+        {
+            if (MonthViewPostRenderSlotBackground != null)
+            {
+                MonthViewPostRenderSlotBackgroundEventArgs ev = new
+                    MonthViewPostRenderSlotBackgroundEventArgs(g, view, startTime, endTime, bounds, state);
+
+                MonthViewPostRenderSlotBackground(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region DoRenderDaySlotAppearanceText
+
+        /// <summary>
+        /// Handles invocation of RenderDaySlotAppearanceText events
+        /// </summary>
+        internal bool DoRenderDaySlotAppearanceText(Graphics g, Rectangle bounds,
+            DaySlotAppearance appearance, DateTime startTime, DateTime endTime, bool selected, ref string text)
+        {
+            if (RenderDaySlotAppearanceText != null)
+            {
+                RenderDaySlotAppearanceTextEventArgs ev = new
+                    RenderDaySlotAppearanceTextEventArgs(g, bounds, appearance, startTime, endTime, selected);
+
+                RenderDaySlotAppearanceText(this, ev);
+
+                text = ev.Text;
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region DoRenderTabBackground
+
+        /// <summary>
+        /// Handles invocation of RenderTabBackground event
+        /// </summary>
+        internal bool DoRenderTabBackground(
+            Graphics g, GraphicsPath path, BaseView view, bool isSelected)
+        {
+            if (RenderTabBackground != null)
+            {
+                RenderTabBackgroundEventArgs ev = new
+                    RenderTabBackgroundEventArgs(g, path, view, isSelected);
+
+                RenderTabBackground(this, ev);
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region DoRenderTabContent
+
+        /// <summary>
+        /// Handles invocation of RenderTabContent events
+        /// </summary>
+        internal bool DoRenderTabContent(Graphics g,
+            GraphicsPath path, BaseView view, ref string text, bool isSelected)
+        {
+            if (RenderTabContent != null)
+            {
+                RenderTabContentEventArgs ev = new
+                    RenderTabContentEventArgs(g, path, view, isSelected, text);
+
+                RenderTabContent(this, ev);
+
+                text = ev.Text;
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region DoRenderViewBorder
+
+        /// <summary>
+        /// DoRenderViewBorder
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="view"></param>
+        /// <param name="bounds"></param>
+        /// <returns></returns>
+        internal bool DoRenderViewBorder(
+            Graphics g, BaseView view, Rectangle bounds)
+        {
+            if (RenderViewBorder != null)
+            {
+                RenderViewBorderEventArgs ev = new
+                    RenderViewBorderEventArgs(g, bounds);
+
+                RenderViewBorder(this, ev);
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region DoViewLoadComplete
+
+        /// <summary>
+        /// Handles invocation of ViewLoadComplete events
+        /// </summary>
+        internal void DoViewLoadComplete(BaseView view)
+        {
+            if (ViewLoadComplete != null)
+            {
+                ViewLoadCompleteEventArgs ev = new
+                    ViewLoadCompleteEventArgs(view);
+
+                ViewLoadComplete(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region DoMonthMoreItemsIndicatorClick
+
+        /// <summary>
+        /// Handles invocation of MonthMoreItemsIndicatorClick events
+        /// </summary>
+        /// <returns></returns>
+        internal bool DoMonthMoreItemsIndicatorClick(
+            BaseView view, ref eCalendarView selectView, ref DateTime startTime)
+        {
+            if (MonthMoreItemsIndicatorClick != null)
+            {
+                MonthMoreItemsIndicatorClickEventArgs ev = new
+                    MonthMoreItemsIndicatorClickEventArgs(view, selectView, startTime);
+
+                MonthMoreItemsIndicatorClick(this, ev);
+
+                startTime = ev.StartTime;
+                selectView = ev.SelectView;
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region DoPreRenderWeekDaySlotBackground
+
+        internal bool DoPreRenderWeekDaySlotBackground(
+            Graphics g, WeekDayView view, int dayColumnIndex, int daySliceIndex, Rectangle bounds)
+        {
+            if (PreRenderWeekDaySlotBackground != null)
+            {
+                PreRenderWeekDaySlotBackgroundEventArgs ev = new
+                    PreRenderWeekDaySlotBackgroundEventArgs(g, view, dayColumnIndex, daySliceIndex, bounds);
+
+                PreRenderWeekDaySlotBackground(this, ev);
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region DoPostRenderWeekDaySlotBackground
+
+        internal void DoPostRenderWeekDaySlotBackground(
+            Graphics g, WeekDayView view, int dayColumnIndex, int daySliceIndex, Rectangle bounds)
+        {
+            if (PostRenderWeekDaySlotBackground != null)
+            {
+                PostRenderWeekDaySlotBackgroundEventArgs ev = new
+                    PostRenderWeekDaySlotBackgroundEventArgs(g, view, dayColumnIndex, daySliceIndex, bounds);
+
+                PostRenderWeekDaySlotBackground(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region DoPreRenderWeekDayHeader
+
+        internal bool DoPreRenderWeekDayHeader(
+            Graphics g, WeekDayView view, int colIndex, Rectangle bounds)
+        {
+            if (PreRenderWeekDayHeader != null)
+            {
+                PreRenderWeekDayHeaderEventArgs ev = new
+                    PreRenderWeekDayHeaderEventArgs(g, view, colIndex, bounds);
+
+                PreRenderWeekDayHeader(this, ev);
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region DoPostRenderWeekDayHeader
+
+        internal void DoPostRenderWeekDayHeader(
+            Graphics g, WeekDayView view, int colIndex, Rectangle bounds)
+        {
+            if (PostRenderWeekDayHeader != null)
+            {
+                PostRenderWeekDayHeaderEventArgs ev = new
+                    PostRenderWeekDayHeaderEventArgs(g, view, colIndex, bounds);
+
+                PostRenderWeekDayHeader(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region DoPreRenderMonthHeader
+
+        internal bool DoPreRenderMonthHeader(
+            Graphics g, MonthView view, int colIndex, Rectangle bounds)
+        {
+            if (PreRenderMonthHeader != null)
+            {
+                PreRenderMonthHeaderEventArgs ev = new
+                    PreRenderMonthHeaderEventArgs(g, view, colIndex, bounds);
+
+                PreRenderMonthHeader(this, ev);
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region DoPostRenderMonthHeader
+
+        internal void DoPostRenderMonthHeader(
+            Graphics g, MonthView view, int colIndex, Rectangle bounds)
+        {
+            if (PostRenderMonthHeader != null)
+            {
+                PostRenderMonthHeaderEventArgs ev = new
+                    PostRenderMonthHeaderEventArgs(g, view, colIndex, bounds);
+
+                PostRenderMonthHeader(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region DisplayedsOwner support
+
+        #region DisplayedOwnersAdded
+
+        /// <summary>
+        /// This routine is called after an element has been
+        /// added to the DisplayedOwners list.  It is responsible
+        /// for updating the MultiCalendar views accordingly.
+        /// </summary>
+        internal void DisplayedOwnersAdded(int index)
+        {
+            if (_MultiCalendarDayViews == null)
+            {
+                _MultiCalendarDayViews = new CalendarViewCollection<DayView>(this);
+                _MultiCalendarWeekViews = new CalendarViewCollection<WeekView>(this);
+                _MultiCalendarMonthViews = new CalendarViewCollection<MonthView>(this);
+                _MultiCalendarYearViews = new CalendarViewCollection<YearView>(this);
+                _MultiCalendarTimeLineViews = new CalendarViewCollection<TimeLineView>(this);
+
+                // No need to keep the single-user views
+                // while we are in multi-user mode
+
+                DayView = null;
+                WeekView = null;
+                MonthView = null;
+                YearView = null;
+                TimeLineView = null;
+
+                SelectedOwnerIndex = 0;
+            }
+
+            // Are we appending, or inserting?
+
+            if (index == _MultiCalendarDayViews.Count)
+            {
+                // Loop through all newly added DisplayOwners, creating
+                // corresponding Day, Week, and Month views for each one
+
+                for (int i = _MultiCalendarDayViews.Count; i < _DisplayedOwners.Count; i++)
+                {
+                    _MultiCalendarDayViews.Views.Add(null);
+                    _MultiCalendarWeekViews.Views.Add(null);
+                    _MultiCalendarMonthViews.Views.Add(null);
+                    _MultiCalendarYearViews.Views.Add(null);
+                    _MultiCalendarTimeLineViews.Views.Add(null);
+                }
+            }
+            else
+            {
+                // Add the new view to the end of the list and
+                // then reorder the lists to reflect the change
+
+                _MultiCalendarDayViews.Views.Add(null);
+                _MultiCalendarWeekViews.Views.Add(null);
+                _MultiCalendarMonthViews.Views.Add(null);
+                _MultiCalendarYearViews.Views.Add(null);
+                _MultiCalendarTimeLineViews.Views.Add(null);
+
+                ReorderDayViews(_DisplayedOwners.Count - 1, index);
+                ReorderWeekViews(_DisplayedOwners.Count - 1, index);
+                ReorderMonthViews(_DisplayedOwners.Count - 1, index);
+                ReorderYearViews(_DisplayedOwners.Count - 1, index);
+                ReorderTimeLineViews(_DisplayedOwners.Count - 1, index);
+            }
+
+            // Reflect the changes to the display
+
+            SetSelectedView(SelectedView);
+
+            // Tell the user things changed
+
+            OnDisplayedOwnersChanged();
+        }
+
+        #endregion
+
+        #region DisplayedOwnersRemoved
+
+        /// <summary>
+        /// This routine is called after an element has been
+        /// removed from the DisplayedOwners list.  It is responsible
+        /// for updating the MultiCalendar views accordingly.
+        /// </summary>
+        /// <param name="start">Starting index to remove</param>
+        /// <param name="end">Ending index to remove</param>
+        internal void DisplayedOwnersRemoved(int start, int end)
+        {
+            // Remove each view individually
+
+            for (int i = end - 1; i >= start; i--)
+                RemoveView(i);
+
+            // If all multi-user entries have been removed
+            // then revert back to single-user mode
+
+            if (_MultiCalendarDayViews == null || _MultiCalendarDayViews.Count == 0)
+            {
+                _MultiCalendarDayViews = null;
+                _MultiCalendarWeekViews = null;
+                _MultiCalendarMonthViews = null;
+                _MultiCalendarYearViews = null;
+                _MultiCalendarTimeLineViews = null;
+            }
+
+            // Reflect the changes to the user
+
+            int n = _SelectedOwnerIndex;
+
+            if (n >= _DisplayedOwners.Count)
+                n = _DisplayedOwners.Count - 1;
+
+            _SelectedOwnerIndex = -1;
+            SelectedOwnerIndex = n;
+
+            SetSelectedView(_SelectedView);
+
+            // Tell the user things changed
+
+            OnDisplayedOwnersChanged();
+        }
+
+        /// <summary>
+        /// Removes individual views
+        /// </summary>
+        /// <param name="index">Index to remove</param>
+        private void RemoveView(int index)
+        {
+            // Day views
+
+            if (_MultiCalendarDayViews.Views[index] != null)
+                _MultiCalendarDayViews.Views[index].Dispose();
+
+            _MultiCalendarDayViews.Views.RemoveAt(index);
+
+            for (int i = index; i < _MultiCalendarDayViews.Views.Count; i++)
+            {
+                if (_MultiCalendarDayViews.Views[i] != null)
+                    _MultiCalendarDayViews.Views[i].DisplayedOwnerKeyIndex = i;
+            }
+
+            // Week views
+
+            if (_MultiCalendarWeekViews.Views[index] != null)
+                _MultiCalendarWeekViews.Views[index].Dispose();
+
+            _MultiCalendarWeekViews.Views.RemoveAt(index);
+
+            for (int i = index; i < _MultiCalendarWeekViews.Views.Count; i++)
+            {
+                if (_MultiCalendarWeekViews.Views[i] != null)
+                    _MultiCalendarWeekViews.Views[i].DisplayedOwnerKeyIndex = i;
+            }
+
+            // Month views
+
+            if (_MultiCalendarMonthViews.Views[index] != null)
+                _MultiCalendarMonthViews.Views[index].Dispose();
+
+            _MultiCalendarMonthViews.Views.RemoveAt(index);
+
+            for (int i = index; i < _MultiCalendarMonthViews.Views.Count; i++)
+            {
+                if (_MultiCalendarMonthViews.Views[i] != null)
+                    _MultiCalendarMonthViews.Views[i].DisplayedOwnerKeyIndex = i;
+            }
+
+            // Year views
+
+            if (_MultiCalendarYearViews.Views[index] != null)
+                _MultiCalendarYearViews.Views[index].Dispose();
+
+            _MultiCalendarYearViews.Views.RemoveAt(index);
+
+            for (int i = index; i < _MultiCalendarYearViews.Views.Count; i++)
+            {
+                if (_MultiCalendarYearViews.Views[i] != null)
+                    _MultiCalendarYearViews.Views[i].DisplayedOwnerKeyIndex = i;
+            }
+
+            // TimeLine views
+
+            if (_MultiCalendarTimeLineViews.Views[index] != null)
+                _MultiCalendarTimeLineViews.Views[index].Dispose();
+
+            _MultiCalendarTimeLineViews.Views.RemoveAt(index);
+
+            for (int i = index; i < _MultiCalendarTimeLineViews.Views.Count; i++)
+            {
+                if (_MultiCalendarTimeLineViews.Views[i] != null)
+                    _MultiCalendarTimeLineViews.Views[i].DisplayedOwnerKeyIndex = i;
+            }
+        }
+
+        #endregion
+
+        #region DisplayedOwnersSet
+
+        /// <summary>
+        /// This routine is called after an element has been
+        /// reset in the DisplayedOwners list.  It is responsible
+        /// for updating the MultiCalendar views accordingly.
+        /// </summary>
+        /// <param name="index"></param>
+        internal void DisplayedOwnersSet(int index)
+        {
+            // Day view
+
+            if (_MultiCalendarDayViews.Views[index] != null)
+                SetView(_MultiCalendarDayViews.Views[index], index);
+
+            // Week view
+
+            if (_MultiCalendarWeekViews.Views[index] != null)
+                SetView(_MultiCalendarWeekViews.Views[index], index);
+
+            // Month view
+
+            if (_MultiCalendarMonthViews.Views[index] != null)
+                SetView(_MultiCalendarMonthViews.Views[index], index);
+
+            // Year view
+
+            if (_MultiCalendarYearViews.Views[index] != null)
+                SetView(_MultiCalendarYearViews.Views[index], index);
+
+            // TimeLine view
+
+            if (_MultiCalendarTimeLineViews.Views[index] != null)
+                SetView(_MultiCalendarTimeLineViews.Views[index], index);
+
+            if (SelectedOwnerIndex == index)
+            {
+                _SelectedOwnerIndex = -1;
+
+                SelectedOwnerIndex = index;
+            }
+
+            // Tell the user things changed
+
+            OnDisplayedOwnersChanged();
+        }
+
+        #endregion
+
+        #region GetViewIndexFromPoint
+
+        /// <summary>
+        /// Gets the view index from a given Point
+        /// </summary>
+        /// <param name="pt">Point</param>
+        /// <returns></returns>
+        internal int GetViewIndexFromPoint(Point pt)
+        {
+            if (IsMultiCalendar == true)
+            {
+                switch (SelectedView)
+                {
+                    case eCalendarView.Day:
+                        for (int i = 0; i < MultiCalendarDayViews.Count; i++)
+                        {
+                            if (MultiCalendarDayViews.Views[i].Bounds.Contains(pt))
+                                return (i);
+                        }
+                        break;
+
+                    case eCalendarView.Week:
+                        for (int i = 0; i < MultiCalendarWeekViews.Count; i++)
+                        {
+                            if (MultiCalendarWeekViews.Views[i].Bounds.Contains(pt))
+                                return (i);
+                        }
+                        break;
+
+                    case eCalendarView.Month:
+                        for (int i = 0; i < MultiCalendarMonthViews.Count; i++)
+                        {
+                            if (MultiCalendarMonthViews.Views[i].Bounds.Contains(pt))
+                                return (i);
+                        }
+                        break;
+
+                    case eCalendarView.Year:
+                        for (int i = 0; i < MultiCalendarYearViews.Count; i++)
+                        {
+                            if (MultiCalendarYearViews.Views[i].Bounds.Contains(pt))
+                                return (i);
+                        }
+                        break;
+
+                    case eCalendarView.TimeLine:
+                        for (int i = 0; i < MultiCalendarTimeLineViews.Count; i++)
+                        {
+                            if (MultiCalendarTimeLineViews.Views[i].Bounds.Contains(pt))
+                                return (i);
+                        }
+                        break;
+                }
+            }
+
+            return (-1);
+        }
+
+        #endregion
+
+        #region ReorderViews
+
+        #region ReorderViews
+
+        /// <summary>
+        /// Reorders views in the MultiCalendar and
+        /// DisplayOwner arrays
+        /// </summary>
+        /// <param name="startIndex">Starting index</param>
+        /// <param name="endIndex">Ending index</param>
+        internal void ReorderViews(int startIndex, int endIndex)
+        {
+            if (IsMultiCalendar == true && startIndex != endIndex)
+            {
+                try
+                {
+                    DisplayedOwners.SuspendUpdate = true;
+
+                    ReorderDayViews(startIndex, endIndex);
+                    ReorderWeekViews(startIndex, endIndex);
+                    ReorderMonthViews(startIndex, endIndex);
+                    ReorderYearViews(startIndex, endIndex);
+                    ReorderTimeLineViews(startIndex, endIndex);
+
+                    ReorderDisplayedOwners(startIndex, endIndex);
+                }
+                finally
+                {
+                    DisplayedOwners.SuspendUpdate = false;
+                }
+
+                SelectedOwnerIndex = endIndex;
+                SetSelectedView(SelectedView);
+
+                // Tell the user things changed
+
+                OnDisplayedOwnersChanged();
+            }
+        }
+
+        /// <summary>
+        /// SelectedViewChanged event propagation
+        /// </summary>
+        protected virtual void OnDisplayedOwnersChanged()
+        {
+            if (DisplayedOwnersChanged != null)
+                DisplayedOwnersChanged(this, EventArgs.Empty);
+        }
+
+        #endregion
+
+        #region ReorderDayViews
+
+        /// <summary>
+        /// Reorders Day view in the MultiCalendar and
+        /// DisplayOwner arrays
+        /// </summary>
+        /// <param name="startIndex">Starting index</param>
+        /// <param name="endIndex">Ending index</param>
+        private void ReorderDayViews(int startIndex, int endIndex)
+        {
+            DayView dayView = MultiCalendarDayViews.Views[startIndex];
+
+            int n = (startIndex > endIndex) ? -1 : 1;
+
+            while (startIndex != endIndex)
+            {
+                MultiCalendarDayViews.Views[startIndex] = MultiCalendarDayViews.Views[startIndex + n];
+
+                if (MultiCalendarDayViews.Views[startIndex] != null)
+                    MultiCalendarDayViews.Views[startIndex].DisplayedOwnerKeyIndex = startIndex;
+
+                startIndex += n;
+            }
+
+            MultiCalendarDayViews.Views[endIndex] = dayView;
+
+            if (dayView != null)
+                dayView.DisplayedOwnerKeyIndex = endIndex;
+        }
+
+        #endregion
+
+        #region ReorderWeekViews
+
+        /// <summary>
+        /// Reorders Week view in the MultiCalendar and
+        /// DisplayOwner arrays
+        /// </summary>
+        /// <param name="startIndex">Starting index</param>
+        /// <param name="endIndex">Ending index</param>
+        private void ReorderWeekViews(int startIndex, int endIndex)
+        {
+            WeekView weekView = MultiCalendarWeekViews.Views[startIndex];
+
+            int n = (startIndex > endIndex) ? -1 : 1;
+
+            while (startIndex != endIndex)
+            {
+                MultiCalendarWeekViews.Views[startIndex] = MultiCalendarWeekViews.Views[startIndex + n];
+
+                if (MultiCalendarWeekViews.Views[startIndex] != null)
+                    MultiCalendarWeekViews.Views[startIndex].DisplayedOwnerKeyIndex = startIndex;
+
+                startIndex += n;
+            }
+
+            MultiCalendarWeekViews.Views[endIndex] = weekView;
+
+            if (weekView != null)
+                weekView.DisplayedOwnerKeyIndex = endIndex;
+        }
+
+        #endregion
+
+        #region ReorderMonthViews
+
+        /// <summary>
+        /// Reorders Month view in the MultiCalendar and
+        /// DisplayOwner arrays
+        /// </summary>
+        /// <param name="startIndex">Starting index</param>
+        /// <param name="endIndex">Ending index</param>
+        private void ReorderMonthViews(int startIndex, int endIndex)
+        {
+            MonthView monthView = MultiCalendarMonthViews.Views[startIndex];
+
+            int n = (startIndex > endIndex) ? -1 : 1;
+
+            while (startIndex != endIndex)
+            {
+                MultiCalendarMonthViews.Views[startIndex] = MultiCalendarMonthViews.Views[startIndex + n];
+
+                if (MultiCalendarMonthViews.Views[startIndex] != null)
+                    MultiCalendarMonthViews.Views[startIndex].DisplayedOwnerKeyIndex = startIndex;
+
+                startIndex += n;
+            }
+
+            MultiCalendarMonthViews.Views[endIndex] = monthView;
+
+            if (monthView != null)
+                monthView.DisplayedOwnerKeyIndex = endIndex;
+        }
+
+        #endregion
+
+        #region ReorderYearViews
+
+        /// <summary>
+        /// Reorders Year view in the MultiCalendar and
+        /// DisplayOwner arrays
+        /// </summary>
+        /// <param name="startIndex">Starting index</param>
+        /// <param name="endIndex">Ending index</param>
+        private void ReorderYearViews(int startIndex, int endIndex)
+        {
+            YearView yearView = MultiCalendarYearViews.Views[startIndex];
+
+            int n = (startIndex > endIndex) ? -1 : 1;
+
+            while (startIndex != endIndex)
+            {
+                MultiCalendarYearViews.Views[startIndex] = MultiCalendarYearViews.Views[startIndex + n];
+
+                if (MultiCalendarYearViews.Views[startIndex] != null)
+                    MultiCalendarYearViews.Views[startIndex].DisplayedOwnerKeyIndex = startIndex;
+
+                startIndex += n;
+            }
+
+            MultiCalendarYearViews.Views[endIndex] = yearView;
+
+            if (yearView != null)
+                yearView.DisplayedOwnerKeyIndex = endIndex;
+        }
+
+        #endregion
+
+        #region ReorderTimeLineViews
+
+        /// <summary>
+        /// Reorders TimeLine view in the MultiCalendar and
+        /// DisplayOwner arrays
+        /// </summary>
+        /// <param name="startIndex">Starting index</param>
+        /// <param name="endIndex">Ending index</param>
+        private void ReorderTimeLineViews(int startIndex, int endIndex)
+        {
+            TimeLineView timeView = MultiCalendarTimeLineViews.Views[startIndex];
+
+            int n = (startIndex > endIndex) ? -1 : 1;
+
+            while (startIndex != endIndex)
+            {
+                MultiCalendarTimeLineViews.Views[startIndex] =
+                    MultiCalendarTimeLineViews.Views[startIndex + n];
+
+                if (MultiCalendarTimeLineViews.Views[startIndex] != null)
+                    MultiCalendarTimeLineViews.Views[startIndex].DisplayedOwnerKeyIndex = startIndex;
+
+                startIndex += n;
+            }
+
+            MultiCalendarTimeLineViews.Views[endIndex] = timeView;
+
+            if (timeView != null)
+                timeView.DisplayedOwnerKeyIndex = endIndex;
+        }
+
+        #endregion
+
+        #region ReorderDisplayedOwners
+
+        /// <summary>
+        /// Reorders the DisplayedOwner list
+        /// </summary>
+        /// <param name="startIndex">Starting index</param>
+        /// <param name="endIndex">Ending index</param>
+        private void ReorderDisplayedOwners(int startIndex, int endIndex)
+        {
+            string owner = DisplayedOwners[startIndex];
+
+            int n = (startIndex > endIndex) ? -1 : 1;
+
+            while (startIndex != endIndex)
+            {
+                DisplayedOwners[startIndex] = DisplayedOwners[startIndex + n];
+                startIndex += n;
+            }
+
+            DisplayedOwners[endIndex] = owner;
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region NewView
+
+        /// <summary>
+        /// Creates a new calendar base view of
+        /// the given type
+        /// </summary>
+        /// <param name="type">Type of view to create</param>
+        /// <param name="index">DisplayedOwner index</param>
+        /// <returns>Created view</returns>
+        internal object NewView(Type type, int index)
+        {
+            if (type == typeof(DayView))
+                return (NewDayView(index));
+
+            if (type == typeof(WeekView))
+                return (NewWeekView(index));
+
+            if (type == typeof(MonthView))
+                return (NewMonthView(index));
+
+            if (type == typeof(YearView))
+                return (NewYearView(index));
+
+            return (NewTimeLineView(index));
+        }
+
+        /// <summary>
+        /// Creates new DayViews
+        /// </summary>
+        /// <param name="index">DisplayedOwner index</param>
+        /// <returns>Created DayView</returns>
+        private DayView NewDayView(int index)
+        {
+            DayView dv = new DayView(this);
+
+            dv.StartDate = _DayViewDate;
+            dv.EndDate = _DayViewDate;
+
+            SetView(dv, index);
+
+            return (dv);
+        }
+
+        /// <summary>
+        /// Creates new WeekViews
+        /// </summary>
+        /// <param name="index">DisplayedOwner index</param>
+        /// <returns>Created WeekView</returns>
+        private WeekView NewWeekView(int index)
+        {
+            WeekView wv = new WeekView(this);
+
+            wv.StartDate = _WeekViewStartDate;
+            wv.EndDate = _WeekViewEndDate;
+
+            SetView(wv, index);
+
+            return (wv);
+        }
+
+        /// <summary>
+        /// Creates new MonthViews
+        /// </summary>
+        /// <param name="index">DisplayedOwner index</param>
+        /// <returns>Created MonthView</returns>
+        private MonthView NewMonthView(int index)
+        {
+            MonthView mv = new MonthView(this);
+
+            mv.StartDate = _MonthViewStartDate;
+            mv.EndDate = _MonthViewEndDate;
+
+            mv.IsSideBarVisible = _IsMonthSideBarVisible;
+
+            SetView(mv, index);
+
+            return (mv);
+        }
+
+        /// <summary>
+        /// Creates new YearView
+        /// </summary>
+        /// <param name="index">DisplayedOwner index</param>
+        /// <returns>Created YearView</returns>
+        private YearView NewYearView(int index)
+        {
+            YearView yv = new YearView(this);
+
+            yv.StartDate = _YearViewStartDate;
+            yv.EndDate = _YearViewEndDate;
+
+            SetView(yv, index);
+
+            return (yv);
+        }
+
+        /// <summary>
+        /// Creates new TimeLineViews
+        /// </summary>
+        /// <param name="index">DisplayedOwner index</param>
+        /// <returns>Created WeekView</returns>
+        private TimeLineView NewTimeLineView(int index)
+        {
+            TimeLineView tv = new TimeLineView(this, eCalendarView.TimeLine);
+
+            tv.StartDate = _TimeLineViewStartDate;
+            tv.EndDate = _TimeLineViewEndDate;
+
+            SetView(tv, index);
+
+            return (tv);
+        }
+
+        #endregion
+
+        #region SetView
+
+        /// <summary>
+        /// Completes the setup of the created view
+        /// </summary>
+        /// <param name="view">Newly created view</param>
+        /// <param name="index">DisplayedOwner index</param>
+        private void SetView(BaseView view, int index)
+        {
+            view.DisplayedOwnerKeyIndex = index;
+            view.OwnerKey = _DisplayedOwners[index];
+
+            // Check to see it the CalendarModel has
+            // any new info to give us for this view
+
+            Owner owner = _CalendarModel.Owners[view.OwnerKey];
+
+            if (owner != null)
+            {
+                view.DisplayName = owner.DisplayName;
+                view.CalendarColor = owner.ColorScheme;
+            }
+            else
+            {
+                view.DisplayName = view.OwnerKey;
+                view.CalendarColor = GetViewColor(view, index);
+            }
+
+            // View is all setup, let it know it
+            // needs to recalculate it's entire layout
+
+            view.ResetView();
+            view.NeedRecalcLayout = true;
+        }
+
+        /// <summary>
+        /// Gets the default eCalendarColor for the view
+        /// </summary>
+        /// <param name="view">View in question</param>
+        /// <param name="index">Index of view</param>
+        /// <returns>View color</returns>
+        private eCalendarColor GetViewColor(BaseView view, int index)
+        {
+            if (IsMultiCalendar == true)
+            {
+                BaseView bv = MultiCalendarDayViews.Views[index];
+
+                if (bv != null && bv != view)
+                    return (bv.CalendarColor);
+
+                bv = MultiCalendarWeekViews.Views[index];
+
+                if (bv != null && bv != view)
+                    return (bv.CalendarColor);
+
+                bv = MultiCalendarMonthViews.Views[index];
+
+                if (bv != null && bv != view)
+                    return (bv.CalendarColor);
+
+                bv = MultiCalendarYearViews.Views[index];
+
+                if (bv != null && bv != view)
+                    return (bv.CalendarColor);
+
+                bv = MultiCalendarTimeLineViews.Views[index];
+
+                if (bv != null && bv != view)
+                    return (bv.CalendarColor);
+            }
+            else
+            {
+                if (_DayView != null && view != _DayView)
+                    return (_DayView.CalendarColor);
+
+                if (_WeekView != null && view != _WeekView)
+                    return (_WeekView.CalendarColor);
+
+                if (_MonthView != null && view != _MonthView)
+                    return (_MonthView.CalendarColor);
+
+                if (_YearView != null && view != _YearView)
+                    return (_YearView.CalendarColor);
+
+                if (_TimeLineView != null && view != _TimeLineView)
+                    return (_TimeLineView.CalendarColor);
+            }
+
+            return (DefaultCalendarColor);
+        }
+
+        #endregion
+
+        #region UpdateAltViewCalendarColor
+
+        /// <summary>
+        /// Updates all view CalendarColor settings
+        /// </summary>
+        /// <param name="color">New color</param>
+        /// <param name="index">Multi-user index</param>
+        internal void UpdateAltViewCalendarColor(eCalendarColor color, int index)
+        {
+            if (IsMultiCalendar == true)
+            {
+                if (MultiCalendarDayViews.Views[index] != null)
+                    MultiCalendarDayViews.Views[index].CalendarColor = color;
+
+                if (MultiCalendarWeekViews.Views[index] != null)
+                    MultiCalendarWeekViews.Views[index].CalendarColor = color;
+
+                if (MultiCalendarMonthViews.Views[index] != null)
+                    MultiCalendarMonthViews.Views[index].CalendarColor = color;
+
+                if (MultiCalendarYearViews.Views[index] != null)
+                    MultiCalendarYearViews.Views[index].CalendarColor = color;
+
+                if (MultiCalendarTimeLineViews.Views[index] != null)
+                    MultiCalendarTimeLineViews.Views[index].CalendarColor = color;
+            }
+            else
+            {
+                if (_DayView != null)
+                    _DayView.CalendarColor = color;
+
+                if (_WeekView != null)
+                    _WeekView.CalendarColor = color;
+
+                if (_MonthView != null)
+                    _MonthView.CalendarColor = color;
+
+                if (_YearView != null)
+                    _YearView.CalendarColor = color;
+
+                if (_TimeLineView != null)
+                    _TimeLineView.CalendarColor = color;
+            }
+        }
+
+        #endregion
+
+        #region OnMousewheel support
+
+        /// <summary>
+        /// Mouse Wheel support
+        /// </summary>
+        /// <param name="hWnd">Window handle</param>
+        /// <param name="wParam">wParam</param>
+        /// <param name="lParam">lParam</param>
+        /// <returns>false</returns>
+        protected override bool OnMouseWheel(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+            Rectangle r = this.DisplayRectangle;
+            r.Location = this.PointToScreen(r.Location);
+
+            Point mousePos = MousePosition;
+
+            if (r.Contains(mousePos))
+            {
+                IntPtr handle = WinApi.WindowFromPoint(new WinApi.POINT(mousePos));
+                Control c = FromChildHandle(handle) ?? FromHandle(handle);
+
+                if (c is CalendarView)
+                {
+                    short detents = (short)WinApi.HIWORD(wParam);
+
+                    int delta = (detents / SystemInformation.MouseWheelScrollDelta);
+                    MouseWheelHandler(delta);
+                    return true;
+                }
+            }
+
+            return (false);
+        }
+        private void MouseWheelHandler(int delta)
+        {
+            int value = -(delta * SystemInformation.MouseWheelScrollLines);
+
+            switch (SelectedView)
+            {
+                case eCalendarView.Week:
+                case eCalendarView.Day:
+                    value *= (int)TimeSliceHeight;
+                    value += _WeekDayVScrollPanel.ScrollBar.Value;
+
+                    value = Math.Max(value, 0);
+                    value = Math.Min(value, _WeekDayVScrollPanel.ScrollBar.Maximum);
+
+                    _WeekDayVScrollPanel.ScrollBar.Value = value;
+                    break;
+
+                case eCalendarView.Year:
+                    if (_YearVScrollPanel.Visible == true)
+                    {
+                        value *= 10;
+                        value += _YearVScrollPanel.ScrollBar.Value;
+
+                        value = Math.Max(value, 0);
+                        value = Math.Min(value, _YearVScrollPanel.ScrollBar.Maximum);
+
+                        _YearVScrollPanel.ScrollBar.Value = value;
+                    }
+                    break;
+
+                case eCalendarView.TimeLine:
+                    if (CalendarPanel.VScrollBar != null && CalendarPanel.VScrollBar.Visible)
+                    {
+                        value = -delta * TimeLineHeight;
+                        value += CalendarPanel.VScrollBar.Value;
+
+                        value = Math.Max(value, 0);
+                        value = Math.Min(value, CalendarPanel.VScrollBar.Maximum);
+
+                        CalendarPanel.VScrollBar.Value = value;
+                    }
+                    break;
+            }
+        }
+        protected override void OnMouseWheel(MouseEventArgs e)
+        {
+            MouseWheelHandler(e.Delta / SystemInformation.MouseWheelScrollDelta);
+            base.OnMouseWheel(e);
+        }
+        #endregion
+
+        #region OnMouseDown support
+
+        /// <summary>
+        /// OnMouseDown
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnMouseDown(MouseEventArgs e)
+        {
+            base.OnMouseDown(e);
+
+            this.Focus();
+        }
+
+        #endregion
+
+        #region ProcessCmdKey
+
+        /// <summary>
+        /// Processes KeyDown events
+        /// </summary>
+        /// <param name="msg"></param>
+        /// <param name="keyData"></param>
+        /// <returns></returns>
+        protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
+        {
+            BaseView view = GetSelectedView();
+
+            if (view != null)
+            {
+                KeyEventArgs args = new KeyEventArgs(keyData);
+
+                view.InternalKeyDown(args);
+
+                if (args.Handled == true)
+                    return (true);
+            }
+
+            return (base.ProcessCmdKey(ref msg, keyData));
+        }
+
+        protected override void OnKeyUp(KeyEventArgs e)
+        {
+            base.OnKeyUp(e);
+
+            BaseView view = GetSelectedView();
+
+            if (view != null)
+                view.InternalKeyUp(e);
+        }
+
+        #endregion
+
+        #region OnResize handling
+
+        /// <summary>
+        /// Control resize processing
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnResize(EventArgs e)
+        {
+            _CalendarPanel.Bounds = this.ClientRectangle;
+
+            _CalendarPanel.RecalcSize();
+            _CalendarPanel.Refresh();
+
+            base.OnResize(e);
+        }
+
+        #endregion
+
+        #region OnCursorChanged
+
+        /// <summary>
+        /// OnCursorChanged
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnCursorChanged(EventArgs e)
+        {
+            base.OnCursorChanged(e);
+
+            if (_SetCursor == false)
+                _DefaultViewCursor = Cursor;
+        }
+
+        #endregion
+
+        #region Refresh
+
+        public override void Refresh()
+        {
+            if (IsUpdateSuspended == false)
+                base.Refresh();
+        }
+
+        #endregion
+
+        #region Trial Version
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            base.OnPaint(e);
+#if TRIAL
+            Graphics g = e.Graphics;
+            using (Font font = new Font(this.Font.FontFamily, 14, FontStyle.Bold))
+            {
+                using (SolidBrush brush = new SolidBrush(Color.FromArgb(40, Color.Black)))
+                    g.DrawString("DotNetBar Trial", font, brush, (this.ClientRectangle.Width - 64) / 2, this.ClientRectangle.Height - font.SizeInPoints - 14);
+            }
+#endif
+        }
+        #endregion
+
+        protected override void Dispose(bool disposing)
+        {
+            if (_TimeIndicator != null)
+            {
+                _TimeIndicator.Dispose();
+
+                _TimeIndicator = null;
+            }
+
+            if (_TimeIndicators != null)
+            {
+                _TimeIndicators.TimeIndicatorCollectionChanged -= TimeIndicatorsTimeIndicatorCollectionChanged;
+                _TimeIndicators.TimeIndicatorTimeChanged -= TimeIndicatorsTimeIndicatorTimeChanged;
+                _TimeIndicators.TimeIndicatorColorChanged -= TimeIndicatorsTimeIndicatorColorChanged;
+
+                _TimeIndicators.Dispose();
+
+                _TimeIndicators = null;
+            }
+
+            ReleaseTimeLineHScrollPanel();
+
+            // Dispose of our fonts
+
+            TimeRulerFont = null;
+            TimeRulerFontSm = null;
+
+            base.Dispose(disposing);
+        }
+    }
+
+    #region enums
+
+    #region eViewOperation
+
+    /// <summary>
+    /// Defines the available view operations
+    /// </summary>
+    public enum eViewOperation
+    {
+        AppointmentMove,                // Appointment move
+        AppointmentResize               // Appointment resize
+    }
+
+    #endregion
+
+    #region eCalendarView
+
+    /// <summary>
+    /// Defines views available on CalendarView control.
+    /// </summary>
+    public enum eCalendarView
+    {
+        Day,
+        Week,
+        Month,
+        Year,
+        TimeLine,
+
+        None
+    }
+
+    #endregion
+
+    #region eTimeLinePeriod
+
+    /// <summary>
+    /// Defines TimeLine interval period
+    /// </summary>
+    public enum eTimeLinePeriod
+    {
+        Minutes,
+        Hours,
+        Days,
+        Years
+    }
+
+    #endregion
+
+    #region TimeLineStretchRowHeightMode
+
+    /// <summary>
+    /// Defines TimeLine interval period
+    /// </summary>
+    public enum TimeLineStretchRowHeightMode
+    {
+        /// <summary>
+        /// Row height is partially stretched, based upon the
+        /// number of overlapping rows.
+        /// </summary>
+        Partial,
+
+        /// <summary>
+        /// Row height is extended fully (if possible), irrespective of the
+        /// number of overlapping rows.
+        /// </summary>
+        Full
+    }
+
+    #endregion
+
+    #region eCondensedViewVisibility
+
+    /// <summary>
+    /// Defines Condensed View visibility
+    /// </summary>
+    public enum eCondensedViewVisibility
+    {
+        AllResources,
+        SelectedResource,
+        Hidden
+    }
+
+    #endregion
+
+    #region eYearViewDayLink
+
+    /// <summary>
+    /// Defines link mode for YearView dates containing appointments
+    /// </summary>
+    [Flags]
+    public enum eYearViewDayLink
+    {
+        None = 0,
+
+        Click = 1 << 0,
+        CtrlClick = 1 << 1,
+        DoubleClick = 1 << 2
+    }
+
+    #endregion
+
+    #region eYearViewLinkAction
+
+    /// <summary>
+    /// Defines link action for YearView dates containing Appointments or CalendarItems
+    /// </summary>
+    public enum eYearViewLinkAction
+    {
+        GoToDate,
+        GoToFirstCalendarItem,
+    }
+
+    #endregion
+
+    #region eYearViewLinkStyle
+
+    /// <summary>
+    /// Defines link mode for YearView dates containing appointments
+    /// </summary>
+    public enum eYearViewLinkStyle
+    {
+        None,
+
+        Style1,
+        Style2,
+        Style3,
+        Style4,
+        Style5
+    }
+
+    #endregion
+
+    #region eSlotDisplayState
+
+    /// <summary>
+    /// Defines the "display state" (work, inactive, selected) of the slot
+    /// </summary>
+    [Flags]
+    public enum eSlotDisplayState
+    {
+        None = 0,
+
+        Work = (1 << 0),
+        Selected = (1 << 2)
+    }
+
+    #endregion
+
+    #region eAllDayDisplayMode
+
+    /// <summary>
+    /// Defines how All "All Day" appointments are displayed
+    /// </summary>
+    public enum eAllDayDisplayMode
+    {
+        None,               // AllDay area will not be displayed.
+
+        ByDayBoundary,      // AllDay items displayed by day boundary (default).
+        ByDayPeriod         // AllDay items displayed by 24 hr day period.
+    }
+
+    #endregion
+
+    #endregion
+
+    #region EventArgs
+
+    #region ValueChangedEventArgs
+
+    /// <summary>
+    /// Generic ValueChangedEventArgs
+    /// </summary>
+    /// <typeparam name="T1">oldValue type</typeparam>
+    /// <typeparam name="T2">newValue type</typeparam>
+    public class ValueChangedEventArgs<T1, T2> : EventArgs
+    {
+        #region Private variables
+
+        private T1 _OldValue;
+        private T2 _NewValue;
+
+        #endregion
+
+        public ValueChangedEventArgs(T1 oldValue, T2 newValue)
+        {
+            _OldValue = oldValue;
+            _NewValue = newValue;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the old value
+        /// </summary>
+        public T1 OldValue
+        {
+            get { return (_OldValue); }
+        }
+
+        /// <summary>
+        /// Gets the new value
+        /// </summary>
+        public T2 NewValue
+        {
+            get { return (_NewValue); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region SelectedViewEventArgs
+    /// <summary>
+    /// SelectedViewEventArgs
+    /// </summary>
+    public class SelectedViewEventArgs : ValueChangedEventArgs<eCalendarView, eCalendarView>
+    {
+        public SelectedViewEventArgs(eCalendarView oldValue, eCalendarView newValue)
+            : base(oldValue, newValue)
+        {
+        }
+    }
+    #endregion
+
+    #region ModelEventArgs
+    /// <summary>
+    /// ModelEventArgs
+    /// </summary>
+    public class ModelEventArgs : ValueChangedEventArgs<CalendarModel, CalendarModel>
+    {
+        public ModelEventArgs(CalendarModel oldValue, CalendarModel newValue)
+            : base(oldValue, newValue)
+        {
+        }
+    }
+    #endregion
+
+    #region DateSelectionEventArgs
+    /// <summary>
+    /// DateSelectionEventArgs
+    /// </summary>
+    public class DateSelectionEventArgs : ValueChangedEventArgs<DateTime?, DateTime?>
+    {
+        public DateSelectionEventArgs(DateTime? oldValue, DateTime? newValue)
+            : base(oldValue, newValue)
+        {
+        }
+    }
+    #endregion
+
+    #region LabelTimeSlotsChangedEventArgs
+    /// <summary>
+    /// LabelTimeSlotsChangedEventArgs
+    /// </summary>
+    public class LabelTimeSlotsChangedEventArgs : ValueChangedEventArgs<bool, bool>
+    {
+        public LabelTimeSlotsChangedEventArgs(bool oldValue, bool newValue)
+            : base(oldValue, newValue)
+        {
+        }
+    }
+    #endregion
+
+    #region TimeSlotDurationChangedEventArgs
+    /// <summary>
+    /// TimeSlotDurationChangedEventArgs
+    /// </summary>
+    public class TimeSlotDurationChangedEventArgs : ValueChangedEventArgs<int, int>
+    {
+        public TimeSlotDurationChangedEventArgs(int oldValue, int newValue)
+            : base(oldValue, newValue)
+        {
+        }
+    }
+    #endregion
+
+    #region Is24HourFormatChangedEventArgs
+    /// <summary>
+    /// Is24HourFormatChangedEventArgs
+    /// </summary>
+    public class Is24HourFormatChangedEventArgs : ValueChangedEventArgs<bool, bool>
+    {
+        public Is24HourFormatChangedEventArgs(bool oldValue, bool newValue)
+            : base(oldValue, newValue)
+        {
+        }
+    }
+    #endregion
+
+    #region IsMonthSideBarVisibleChangedEventArgs
+    /// <summary>
+    /// IsMonthSideBarVisibleChangedEventArgs
+    /// </summary>
+    public class IsMonthSideBarVisibleChangedEventArgs : ValueChangedEventArgs<bool, bool>
+    {
+        public IsMonthSideBarVisibleChangedEventArgs(bool oldValue, bool newValue)
+            : base(oldValue, newValue)
+        {
+        }
+    }
+    #endregion
+
+    #region IsMonthMoreItemsIndicatorVisibleChangedEventArgs
+    /// <summary>
+    /// IsMonthMoreItemsIndicatorVisibleChangedEventArgs
+    /// </summary>
+    public class IsMonthMoreItemsIndicatorVisibleChangedEventArgs : ValueChangedEventArgs<bool, bool>
+    {
+        public IsMonthMoreItemsIndicatorVisibleChangedEventArgs(bool oldValue, bool newValue)
+            : base(oldValue, newValue)
+        {
+        }
+    }
+    #endregion
+
+    #region IsTimeRulerVisibleChangedEventArgs
+    /// <summary>
+    /// IsTimeRulerVisibleChangedEventArgs
+    /// </summary>
+    public class IsTimeRulerVisibleChangedEventArgs : ValueChangedEventArgs<bool, bool>
+    {
+        public IsTimeRulerVisibleChangedEventArgs(bool oldValue, bool newValue)
+            : base(oldValue, newValue)
+        {
+        }
+    }
+    #endregion
+
+    #region BeforeAppointmentViewChangeEventArgs
+    /// <summary>
+    /// BeforeAppointmentViewChangeEventArgs
+    /// </summary>
+    public class BeforeAppointmentViewChangeEventArgs : CancelEventArgs
+    {
+        #region Private variables
+
+        private CalendarItem _CalendarItem;
+        private eViewOperation _eViewOperation;
+        private bool _IsCopyDrag;
+
+        #endregion
+
+        public BeforeAppointmentViewChangeEventArgs(
+            CalendarItem calendarItem, eViewOperation eViewOperation, bool isCopyDrag)
+        {
+            _CalendarItem = calendarItem;
+            _eViewOperation = eViewOperation;
+            _IsCopyDrag = isCopyDrag;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the CalendarItem being affected
+        /// </summary>
+        public CalendarItem CalendarItem
+        {
+            get { return (_CalendarItem); }
+        }
+
+        /// <summary>
+        /// Gets the operation to be performed
+        /// </summary>
+        public eViewOperation eViewOperation
+        {
+            get { return (_eViewOperation); }
+        }
+
+        /// <summary>
+        /// Gets whether the operation is being 
+        /// performed on a drag created copy item
+        /// </summary>
+        public bool IsCopyDrag
+        {
+            get { return (_IsCopyDrag); }
+        }
+
+        #endregion
+    }
+    #endregion
+
+    #region AppointmentViewChangingEventArgs
+    /// <summary>
+    /// AppointmentViewChangingEventArgs
+    /// </summary>
+    public class AppointmentViewChangingEventArgs : CancelEventArgs
+    {
+        #region Private variables
+
+        private CalendarItem _CalendarItem;
+
+        private string _OwnerKey;
+        private DateTime _StartTime;
+        private DateTime _EndTime;
+
+        private eViewOperation _eViewOperation;
+        private bool _IsCopyDrag;
+
+        #endregion
+
+        public AppointmentViewChangingEventArgs(CalendarItem calendarItem, string ownerKey,
+            DateTime startTime, DateTime endTime, eViewOperation eViewOperation, bool isCopyDrag)
+        {
+            _CalendarItem = calendarItem;
+
+            _OwnerKey = ownerKey;
+            _StartTime = startTime;
+            _EndTime = endTime;
+
+            _eViewOperation = eViewOperation;
+            _IsCopyDrag = isCopyDrag;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the CalendarItem being changed
+        /// </summary>
+        public CalendarItem CalendarItem
+        {
+            get { return (_CalendarItem); }
+        }
+
+        /// <summary>
+        /// Gets the OwnerKey to be applied. 
+        /// This value will be null if no new OwnerKey is to be applied.
+        /// </summary>
+        public string OwnerKey
+        {
+            get { return (_OwnerKey); }
+        }
+
+        /// <summary>
+        /// Gets the new StartTime to be applied
+        /// </summary>
+        public DateTime StartTime
+        {
+            get { return (_StartTime); }
+        }
+
+        /// <summary>
+        /// Gets the new EndTime to be applied
+        /// </summary>
+        public DateTime EndTime
+        {
+            get { return (_EndTime); }
+        }
+
+        /// <summary>
+        /// Gets the operation to be performed
+        /// </summary>
+        public eViewOperation eViewOperation
+        {
+            get { return (_eViewOperation); }
+        }
+
+        /// <summary>
+        /// Gets whether the operation is being 
+        /// performed on a drag created copy item
+        /// </summary>
+        public bool IsCopyDrag
+        {
+            get { return (_IsCopyDrag); }
+        }
+        #endregion
+    }
+    #endregion
+
+    #region AppointmentViewChangedEventArgs
+    /// <summary>
+    /// AppointmentViewChangedEventArgs
+    /// </summary>
+    public class AppointmentViewChangedEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private CalendarItem _CalendarItem;
+
+        private string _OldOwnerKey;
+        private DateTime _OldStartTime;
+        private DateTime _OldEndTime;
+
+        private eViewOperation _eViewOperation;
+        private bool _IsCopyDrag;
+
+        #endregion
+
+        public AppointmentViewChangedEventArgs(CalendarItem calendarItem, string oldOwnerKey,
+            DateTime oldStartTime, DateTime oldEndTime, eViewOperation eViewOperation, bool isCopyDrag)
+        {
+            _CalendarItem = calendarItem;
+
+            _OldOwnerKey = oldOwnerKey;
+            _OldStartTime = oldStartTime;
+            _OldEndTime = oldEndTime;
+
+            _eViewOperation = eViewOperation;
+            _IsCopyDrag = isCopyDrag;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the CalendarItem that was changed
+        /// </summary>
+        public CalendarItem CalendarItem
+        {
+            get { return (_CalendarItem); }
+        }
+
+        /// <summary>
+        /// Gets th old, previous OwnerKey
+        /// </summary>
+        public string OldOwnerKey
+        {
+            get { return (_OldOwnerKey); }
+        }
+
+        /// <summary>
+        /// Gets th old, previous start time
+        /// </summary>
+        public DateTime OldStartTime
+        {
+            get { return (_OldStartTime); }
+        }
+
+        /// <summary>
+        /// Gets the old, previous end time
+        /// </summary>
+        public DateTime OldEndTime
+        {
+            get { return (_OldEndTime); }
+        }
+
+        /// <summary>
+        /// Gets the operation that was performed
+        /// </summary>
+        public eViewOperation eViewOperation
+        {
+            get { return (_eViewOperation); }
+        }
+
+        /// <summary>
+        /// Gets whether the operation is being 
+        /// performed on a drag created copy item
+        /// </summary>
+        public bool IsCopyDrag
+        {
+            get { return (_IsCopyDrag); }
+        }
+
+        #endregion
+    }
+    #endregion
+
+    #region AppointmentViewPostRenderEventArgs
+
+    /// <summary>
+    /// AppointmentViewPostRenderEventArgs
+    /// </summary>
+    public class AppointmentViewPostRenderEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private CalendarItem _CalendarItem;
+        private Graphics _Graphics;
+        private Rectangle _Bounds;
+        private GraphicsPath _GraphicsPath;
+
+        #endregion
+
+        public AppointmentViewPostRenderEventArgs(
+            CalendarItem calendarItem, Graphics g, Rectangle bounds, GraphicsPath path)
+        {
+            _CalendarItem = calendarItem;
+            _Graphics = g;
+            _Bounds = bounds;
+            _GraphicsPath = path;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the CalendarItem being changed
+        /// </summary>
+        public CalendarItem CalendarItem
+        {
+            get { return (_CalendarItem); }
+        }
+
+        /// <summary>
+        /// Gets the associated Graphics object.
+        /// </summary>
+        public Graphics Graphics
+        {
+            get { return (_Graphics); }
+        }
+
+        /// <summary>
+        /// Gets the associated GraphicsPath. 
+        /// This item may be null, based upon appointment style.
+        /// </summary>
+        public GraphicsPath GraphicsPath
+        {
+            get { return (_GraphicsPath); }
+        }
+
+        /// <summary>
+        /// Gets the item bounding rectangle
+        /// </summary>
+        public Rectangle Bounds
+        {
+            get { return (_Bounds); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region AppointmentViewPreRenderEventArgs
+
+    /// <summary>
+    /// AppointmentViewPreRenderEventArgs
+    /// </summary>
+    public class AppointmentViewPreRenderEventArgs : AppointmentViewPostRenderEventArgs
+    {
+        #region Private variables
+
+        private bool _Cancel;
+
+        #endregion
+
+        public AppointmentViewPreRenderEventArgs(
+            CalendarItem calendarItem, Graphics g, Rectangle bounds, GraphicsPath path)
+            : base(calendarItem, g, bounds, path)
+        {
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets or sets whether to cancel
+        /// further item rendering.
+        /// </summary>
+        public bool Cancel
+        {
+            get { return (_Cancel); }
+            set { _Cancel = value; }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GetAppointmentGroupIdEventArgs
+    /// <summary>
+    /// GetAppointmentGroupIdEventArgs
+    /// </summary>
+    public class GetAppointmentGroupIdEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private CalendarItem _CalendarItem;
+
+        private int _GroupId;
+
+        #endregion
+
+        public GetAppointmentGroupIdEventArgs(CalendarItem calendarItem, int groupId)
+        {
+            _CalendarItem = calendarItem;
+
+            _GroupId = groupId;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the CalendarItem that was changed
+        /// </summary>
+        public CalendarItem CalendarItem
+        {
+            get { return (_CalendarItem); }
+        }
+
+        /// <summary>
+        /// Gets or sets the GroupId
+        /// </summary>
+        public int GroupId
+        {
+            get { return (_GroupId); }
+            set { _GroupId = value; }
+        }
+
+        #endregion
+    }
+    #endregion
+
+    #region GetDisplayTemplateTextEventArgs
+    /// <summary>
+    /// GetDisplayTemplateTextEventArgs
+    /// </summary>
+    public class GetDisplayTemplateTextEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private CalendarItem _CalendarItem;
+
+        private string _DisplayTemplate;
+        private string _DisplayText;
+
+        #endregion
+
+        public GetDisplayTemplateTextEventArgs(CalendarItem calendarItem,
+            string displayTemplate, string displayText)
+        {
+            _CalendarItem = calendarItem;
+
+            _DisplayTemplate = displayTemplate;
+            _DisplayText = displayText;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the CalendarItem that was changed
+        /// </summary>
+        public CalendarItem CalendarItem
+        {
+            get { return (_CalendarItem); }
+        }
+
+        /// <summary>
+        /// Gets the DisplayTemplate
+        /// </summary>
+        public string DisplayTemplate
+        {
+            get { return (_DisplayTemplate); }
+        }
+
+        /// <summary>
+        /// Gets or sets the Display Text for the given DisplayTemplate
+        /// </summary>
+        public string DisplayText
+        {
+            get { return (_DisplayText); }
+            set { _DisplayText = value; }
+        }
+
+        #endregion
+    }
+    #endregion
+
+    #region DateChangeEventArgs
+    /// <summary>
+    /// DateChangeEventArgs
+    /// </summary>
+    public class DateChangeEventArgs : ValueChangedEventArgs<DateTime, DateTime>
+    {
+        public DateChangeEventArgs(DateTime oldValue, DateTime newValue)
+            : base(oldValue, newValue)
+        {
+        }
+    }
+    #endregion
+
+    #region ViewDateChangedEventArgs
+    /// <summary>
+    /// ViewDateChangedEventArgs
+    /// </summary>
+    public class ViewDateChangedEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private BaseView _View;
+
+        private DateTime _OldStartTime;
+        private DateTime _NewStartTime;
+        private DateTime _OldEndTime;
+        private DateTime _NewEndTime;
+
+        #endregion
+
+        public ViewDateChangedEventArgs(BaseView view,
+            DateTime oldStartTime, DateTime newStartTime, DateTime oldEndTime, DateTime newEndTime)
+        {
+            _View = view;
+
+            _OldStartTime = oldStartTime;
+            _NewStartTime = newStartTime;
+            _OldEndTime = oldEndTime;
+            _NewEndTime = newEndTime;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the View
+        /// </summary>
+        public BaseView View
+        {
+            get { return (_View); }
+        }
+
+        /// <summary>
+        /// Gets the eCalendarView
+        /// </summary>
+        public eCalendarView eCalendarView
+        {
+            get { return (_View.ECalendarView); }
+        }
+
+        /// <summary>
+        /// Gets th old, previous start time
+        /// </summary>
+        public DateTime OldStartTime
+        {
+            get { return (_OldStartTime); }
+        }
+
+        /// <summary>
+        /// Gets the old, previous end time
+        /// </summary>
+        public DateTime OldEndTime
+        {
+            get { return (_OldEndTime); }
+        }
+
+        /// <summary>
+        /// Gets or sets the new start time
+        /// </summary>
+        public DateTime NewStartTime
+        {
+            get { return (_NewStartTime); }
+            set { _NewStartTime = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the new end time
+        /// </summary>
+        public DateTime NewEndTime
+        {
+            get { return (_NewEndTime); }
+            set { _NewStartTime = value; }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region ViewDateChangingEventArgs
+
+    /// <summary>
+    /// DateViewChangingEventArgs
+    /// </summary>
+    public class ViewDateChangingEventArgs : CancelEventArgs
+    {
+        #region Private variables
+
+        private BaseView _View;
+        private eCalendarView _eCalendarView;
+
+        private DateTime _OldStartTime;
+        private DateTime _NewStartTime;
+        private DateTime _OldEndTime;
+        private DateTime _NewEndTime;
+
+        #endregion
+
+        public ViewDateChangingEventArgs(BaseView view,
+            DateTime oldStartTime, DateTime oldEndTime, DateTime newStartTime, DateTime newEndTime)
+        {
+            _View = view;
+
+            _OldStartTime = oldStartTime;
+            _NewStartTime = newStartTime;
+            _OldEndTime = oldEndTime;
+            _NewEndTime = newEndTime;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the View
+        /// </summary>
+        public BaseView View
+        {
+            get { return (_View); }
+        }
+
+        /// <summary>
+        /// Gets the eCalendarView
+        /// </summary>
+        public eCalendarView eCalendarView
+        {
+            get { return (_View.ECalendarView); }
+        }
+
+        /// <summary>
+        /// Gets th old, previous start time
+        /// </summary>
+        public DateTime OldStartTime
+        {
+            get { return (_OldStartTime); }
+        }
+
+        /// <summary>
+        /// Gets the old, previous end time
+        /// </summary>
+        public DateTime OldEndTime
+        {
+            get { return (_OldEndTime); }
+        }
+
+        /// <summary>
+        /// Gets or sets the new start time
+        /// </summary>
+        public DateTime NewStartTime
+        {
+            get { return (_NewStartTime); }
+            set { _NewStartTime = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the new end time
+        /// </summary>
+        public DateTime NewEndTime
+        {
+            get { return (_NewEndTime); }
+            set { _NewStartTime = value; }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region CalendarItemEventArgs
+
+    /// <summary>
+    /// CalendarItemEventArgs
+    /// </summary>
+    public class CalendarItemEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private BaseView _View;
+
+        private CalendarItem _Item1;
+        private CalendarItem _Item2;
+
+        private int _Result;
+
+        #endregion
+
+        public CalendarItemEventArgs(BaseView view, CalendarItem item1, CalendarItem item2)
+        {
+            _View = view;
+
+            _Item1 = item1;
+            _Item2 = item2;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the View
+        /// </summary>
+        public BaseView View
+        {
+            get { return (_View); }
+        }
+
+        /// <summary>
+        /// Gets the eCalendarView
+        /// </summary>
+        public eCalendarView eCalendarView
+        {
+            get { return (_View.ECalendarView); }
+        }
+
+        /// <summary>
+        /// Gets item1 comparison element
+        /// </summary>
+        public CalendarItem Item1
+        {
+            get { return (_Item1); }
+        }
+
+        /// <summary>
+        /// Gets item2 comparison element
+        /// </summary>
+        public CalendarItem Item2
+        {
+            get { return (_Item2); }
+        }
+
+        /// <summary>
+        /// Gets or sets the comparison result.
+        /// (-1 item1 < item2, 0 item1 == item2, +1 item1 > item2)
+        /// </summary>
+        public int Result
+        {
+            get { return (_Result); }
+            set { _Result = value; }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region SelectedOwnerChangedEventArgs
+    /// <summary>
+    /// SelectedOwnerChangedEventArgs
+    /// </summary>
+    /// 
+    public class SelectedOwnerChangedEventArgs : ValueChangedEventArgs<int, int>
+    {
+        public SelectedOwnerChangedEventArgs(int oldValue, int newValue)
+            : base(oldValue, newValue)
+        {
+        }
+    }
+    #endregion
+
+    #region FixedAllDayPanelHeightChangedEventArgs
+    /// <summary>
+    /// FixedAllDayPanelHeightChangedEventArgs
+    /// </summary>
+    /// 
+    public class FixedAllDayPanelHeightChangedEventArgs : ValueChangedEventArgs<int, int>
+    {
+        public FixedAllDayPanelHeightChangedEventArgs(int oldValue, int newValue)
+            : base(oldValue, newValue)
+        {
+        }
+    }
+    #endregion
+
+    #region MaximumAllDayPanelHeightChangedEventArgs
+    /// <summary>
+    /// MaximumAllDayPanelHeightChangedEventArgs
+    /// </summary>
+    /// 
+    public class MaximumAllDayPanelHeightChangedEventArgs : ValueChangedEventArgs<int, int>
+    {
+        public MaximumAllDayPanelHeightChangedEventArgs(int oldValue, int newValue)
+            : base(oldValue, newValue)
+        {
+        }
+    }
+
+    #endregion
+
+    #region MinimumTimeSlotHeightChangedEventArgs
+    /// <summary>
+    /// MinimumTimeSlotHeightChangedEventArgs
+    /// </summary>
+    /// 
+    public class MinimumTimeSlotHeightChangedEventArgs : ValueChangedEventArgs<int, int>
+    {
+        public MinimumTimeSlotHeightChangedEventArgs(int oldValue, int newValue)
+            : base(oldValue, newValue)
+        {
+        }
+    }
+
+    #endregion
+
+    #region TimeLineIntervalChangedEventArgs
+    /// <summary>
+    /// TimeLineIntervalChangedEventArgs
+    /// </summary>
+    public class TimeLineIntervalChangedEventArgs : ValueChangedEventArgs<int, int>
+    {
+        public TimeLineIntervalChangedEventArgs(int oldValue, int newValue)
+            : base(oldValue, newValue)
+        {
+        }
+    }
+    #endregion
+
+    #region TimeLineIntervalPeriodChangedEventArgs
+    /// <summary>
+    /// TimeLineIntervalPeriodChangedEventArgs
+    /// </summary>
+    public class TimeLineIntervalPeriodChangedEventArgs : ValueChangedEventArgs<eTimeLinePeriod, eTimeLinePeriod>
+    {
+        public TimeLineIntervalPeriodChangedEventArgs(eTimeLinePeriod oldValue, eTimeLinePeriod newValue)
+            : base(oldValue, newValue)
+        {
+        }
+    }
+    #endregion
+
+    #region EnableDragDropChangedEventArgs
+    /// <summary>
+    /// EnableDragDropChangedEventArgs
+    /// </summary>
+    public class EnableDragDropChangedEventArgs : ValueChangedEventArgs<bool, bool>
+    {
+        public EnableDragDropChangedEventArgs(bool oldValue, bool newValue)
+            : base(oldValue, newValue)
+        {
+        }
+    }
+    #endregion
+
+    #region TimeLineColumnWidthChangedEventArgs
+    /// <summary>
+    /// TimeLineColumnWidthChangedEventArgs
+    /// </summary>
+    public class TimeLineColumnWidthChangedEventArgs : ValueChangedEventArgs<int, int>
+    {
+        public TimeLineColumnWidthChangedEventArgs(int oldValue, int newValue)
+            : base(oldValue, newValue)
+        {
+        }
+    }
+    #endregion
+
+    #region TimeLineMaxColumnCountChangedEventArgs
+    /// <summary>
+    /// TimeLineMaxColumnCountChangedEventArgs
+    /// </summary>
+    public class TimeLineMaxColumnCountChangedEventArgs : ValueChangedEventArgs<int, int>
+    {
+        public TimeLineMaxColumnCountChangedEventArgs(int oldValue, int newValue)
+            : base(oldValue, newValue)
+        {
+        }
+    }
+    #endregion
+
+    #region TimeLineHorizontalPaddingChangedEventArgs
+    /// <summary>
+    /// TimeLineHorizontalPaddingChangedEventArgs
+    /// </summary>
+    public class TimeLineHorizontalPaddingChangedEventArgs : ValueChangedEventArgs<int, int>
+    {
+        public TimeLineHorizontalPaddingChangedEventArgs(int oldValue, int newValue)
+            : base(oldValue, newValue)
+        {
+        }
+    }
+    #endregion
+
+    #region TimeLineShowPeriodHeaderChangedEventArgs
+    /// <summary>
+    /// TimeLineShowPeriodHeaderChangedEventArgs
+    /// </summary>
+    public class TimeLineShowPeriodHeaderChangedEventArgs : ValueChangedEventArgs<bool, bool>
+    {
+        public TimeLineShowPeriodHeaderChangedEventArgs(bool oldValue, bool newValue)
+            : base(oldValue, newValue)
+        {
+        }
+    }
+    #endregion
+
+    #region TimeLineShowIntervalHeaderChangedEventArgs
+    /// <summary>
+    /// TimeLineShowIntervalHeaderChangedEventArgs
+    /// </summary>
+    public class TimeLineShowIntervalHeaderChangedEventArgs : ValueChangedEventArgs<bool, bool>
+    {
+        public TimeLineShowIntervalHeaderChangedEventArgs(bool oldValue, bool newValue)
+            : base(oldValue, newValue)
+        {
+        }
+    }
+    #endregion
+
+    #region TimeLineShowPageNavigationChangedEventArgs
+    /// <summary>
+    /// TimeLineShowPageNavigationChangedEventArgs
+    /// </summary>
+    public class TimeLineShowPageNavigationChangedEventArgs : ValueChangedEventArgs<bool, bool>
+    {
+        public TimeLineShowPageNavigationChangedEventArgs(bool oldValue, bool newValue)
+            : base(oldValue, newValue)
+        {
+        }
+    }
+    #endregion
+
+    #region TimeLineCondensedViewVisibilityChangedEventArgs
+    /// <summary>
+    /// TimeLineCondensedViewVisibilityChangedEventArgs
+    /// </summary>
+    public class TimeLineCondensedViewVisibilityChangedEventArgs :
+        ValueChangedEventArgs<eCondensedViewVisibility, eCondensedViewVisibility>
+    {
+        public TimeLineCondensedViewVisibilityChangedEventArgs(
+            eCondensedViewVisibility oldValue, eCondensedViewVisibility newValue)
+            : base(oldValue, newValue)
+        {
+        }
+    }
+    #endregion
+
+    #region TimeLineCondensedViewHeightChangedEventArgs
+    /// <summary>
+    /// TimeLineCondensedViewHeightChangedEventArgs
+    /// </summary>
+    public class TimeLineCondensedViewHeightChangedEventArgs : ValueChangedEventArgs<int, int>
+    {
+        public TimeLineCondensedViewHeightChangedEventArgs(int oldValue, int newValue)
+            : base(oldValue, newValue)
+        {
+        }
+    }
+    #endregion
+
+    #region TimeLineRenderPeriodHeaderEventArgs
+    /// <summary>
+    /// TimeLineRenderPeriodHeaderEventArgs
+    /// </summary>
+    public class TimeLineRenderPeriodHeaderEventArgs : CancelEventArgs
+    {
+        #region Private variables
+
+        private Graphics _Graphics;
+        private DateTime _StartTime;
+        private DateTime _EndTime;
+        private Rectangle _Bounds;
+        private string _Text;
+
+        #endregion
+
+        public TimeLineRenderPeriodHeaderEventArgs(Graphics graphics,
+            DateTime startTime, DateTime endTime, Rectangle bounds, string text)
+        {
+            _Graphics = graphics;
+
+            _StartTime = startTime;
+            _EndTime = endTime;
+
+            _Bounds = bounds;
+            _Text = text;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the Graphics object used to render
+        /// the Period Header
+        /// </summary>
+        public Graphics Graphics
+        {
+            get { return (_Graphics); }
+        }
+
+        /// <summary>
+        /// Gets the Bounding Text Rectangle
+        /// </summary>
+        public Rectangle Bounds
+        {
+            get { return (_Bounds); }
+        }
+
+        /// <summary>
+        /// Gets the visible display StartTime
+        /// </summary>
+        public DateTime StartTime
+        {
+            get { return (_StartTime); }
+        }
+
+        /// <summary>
+        /// Gets the visible display EndTime
+        /// </summary>
+        public DateTime EndTime
+        {
+            get { return (_EndTime); }
+        }
+
+        /// <summary>
+        /// Gets or sets the header Text
+        /// </summary>
+        public string Text
+        {
+            get { return (_Text); }
+            set { _Text = value; }
+        }
+
+        #endregion
+    }
+    #endregion
+
+    #region TimeLinePreRenderSlotBackgroundEventArgs
+    /// <summary>
+    /// TimeLinePreRenderSlotBackgroundEventArgs
+    /// </summary>
+    public class TimeLinePreRenderSlotBackgroundEventArgs : TimeLinePostRenderSlotBackgroundEventArgs
+    {
+        #region Private variables
+
+        private bool _Cancel;
+
+        #endregion
+
+        public TimeLinePreRenderSlotBackgroundEventArgs(Graphics graphics, BaseView view,
+            DateTime startTime, DateTime endTime, Rectangle bounds, eSlotDisplayState state)
+            : base(graphics, view, startTime, endTime, bounds, state)
+        {
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets or Sets whether the event should be canceled
+        /// </summary>
+        public bool Cancel
+        {
+            get { return (_Cancel); }
+            set { _Cancel = value; }
+        }
+
+        #endregion
+    }
+    #endregion
+
+    #region TimeLinePostRenderSlotBackgroundEventArgs
+    /// <summary>
+    /// TimeLinePreRenderSlotBackgroundEventArgs
+    /// </summary>
+    public class TimeLinePostRenderSlotBackgroundEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private Graphics _Graphics;
+        private DateTime _StartTime;
+        private DateTime _EndTime;
+        private Rectangle _Bounds;
+
+        private eSlotDisplayState _State;
+        private BaseView _View;
+
+        #endregion
+
+        public TimeLinePostRenderSlotBackgroundEventArgs(Graphics graphics, BaseView view,
+            DateTime startTime, DateTime endTime, Rectangle bounds, eSlotDisplayState state)
+        {
+            _Graphics = graphics;
+
+            _View = view;
+            _StartTime = startTime;
+            _EndTime = endTime;
+
+            _Bounds = bounds;
+            _State = state;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the Graphics object used to render
+        /// the slot
+        /// </summary>
+        public Graphics Graphics
+        {
+            get { return (_Graphics); }
+        }
+
+        /// <summary>
+        /// Gets the slot bounding Rectangle
+        /// </summary>
+        public Rectangle Bounds
+        {
+            get { return (_Bounds); }
+        }
+
+        /// <summary>
+        /// Gets the slot StartTime
+        /// </summary>
+        public DateTime StartTime
+        {
+            get { return (_StartTime); }
+        }
+
+        /// <summary>
+        /// Gets the slot EndTime
+        /// </summary>
+        public DateTime EndTime
+        {
+            get { return (_EndTime); }
+        }
+
+        /// <summary>
+        /// Gets the slot display state
+        /// </summary>
+        public eSlotDisplayState State
+        {
+            get { return (_State); }
+            set { _State = value; }
+        }
+
+        /// <summary>
+        /// Gets the associated View
+        /// </summary>
+        public BaseView View
+        {
+            get { return (_View); }
+        }
+
+        #endregion
+    }
+    #endregion
+
+    #region TimeLineRenderSlotBorderEventArgs
+    /// <summary>
+    /// TimeLineRenderSlotBorderEventArgs
+    /// </summary>
+    public class TimeLineRenderSlotBorderEventArgs : CancelEventArgs
+    {
+        #region Private variables
+
+        private Graphics _Graphics;
+        private DateTime _StartTime;
+        private bool _Hourly;
+        private eSlotDisplayState _State;
+        private Point _StartPoint;
+        private Point _EndPoint;
+        private Color _Color;
+
+        #endregion
+
+        public TimeLineRenderSlotBorderEventArgs(Graphics graphics,
+            DateTime startTime, bool hourly, eSlotDisplayState state, Point pt1, Point pt2, Color color)
+        {
+            _Graphics = graphics;
+
+            _StartTime = startTime;
+            _Hourly = hourly;
+            _State = state;
+            _StartPoint = pt1;
+            _EndPoint = pt2;
+            _Color = color;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the Graphics object used to render
+        /// the slot
+        /// </summary>
+        public Graphics Graphics
+        {
+            get { return (_Graphics); }
+        }
+
+        /// <summary>
+        /// Gets whether the border if an hourly border
+        /// </summary>
+        public bool Hourly
+        {
+            get { return (_Hourly); }
+        }
+
+        /// <summary>
+        /// Gets the slot display state
+        /// </summary>
+        public eSlotDisplayState State
+        {
+            get { return (_State); }
+            set { _State = value; }
+        }
+
+        /// <summary>
+        /// Gets the slot Starting Time
+        /// </summary>
+        public DateTime StartTime
+        {
+            get { return (_StartTime); }
+        }
+
+        /// <summary>
+        /// Gets the slot starting Point
+        /// </summary>
+        public Point StartPoint
+        {
+            get { return (_StartPoint); }
+        }
+
+        /// <summary>
+        /// Gets the slot ending Point
+        /// </summary>
+        public Point EndPoint
+        {
+            get { return (_EndPoint); }
+        }
+
+        /// <summary>
+        /// Gets the slot border Color
+        /// </summary>
+        public Color Color
+        {
+            get { return (_Color); }
+        }
+
+        #endregion
+    }
+    #endregion
+
+    #region TimeLineRenderViewBorderEventArgs
+    /// <summary>
+    /// TimeLineRenderViewBorderEventArgs
+    /// </summary>
+    public class TimeLineRenderViewBorderEventArgs : CancelEventArgs
+    {
+        #region Private variables
+
+        private Graphics _Graphics;
+        private int _ColumnStart;
+        private int _ColumnEnd;
+        private Rectangle _Bounds;
+        private Color _Color;
+
+        #endregion
+
+        public TimeLineRenderViewBorderEventArgs(Graphics graphics,
+            int columnStart, int columnEnd, Rectangle bounds, Color color)
+        {
+            _Graphics = graphics;
+
+            _ColumnStart = columnStart;
+            _ColumnEnd = columnEnd;
+            _Bounds = bounds;
+            _Color = color;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the Graphics object used to render
+        /// the slot
+        /// </summary>
+        public Graphics Graphics
+        {
+            get { return (_Graphics); }
+        }
+
+        /// <summary>
+        /// Gets the starting column
+        /// </summary>
+        public int ColumnStart
+        {
+            get { return (_ColumnStart); }
+        }
+
+        /// <summary>
+        /// Gets the ending column
+        /// </summary>
+        public int ColumnEnd
+        {
+            get { return (_ColumnEnd); }
+        }
+
+        /// <summary>
+        /// Gets the bounding rectangle
+        /// </summary>
+        public Rectangle Bounds
+        {
+            get { return (_Bounds); }
+        }
+
+        /// <summary>
+        /// Gets the default border Pen
+        /// </summary>
+        public Color Color
+        {
+            get { return (_Color); }
+        }
+
+        #endregion
+    }
+    #endregion
+
+    #region ShowOnlyWorkDayHoursChangedEventArgs
+    /// <summary>
+    /// ShowOnlyWorkDayHoursChangedEventArgs
+    /// </summary>
+    public class ShowOnlyWorkDayHoursChangedEventArgs : ValueChangedEventArgs<bool, bool>
+    {
+        public ShowOnlyWorkDayHoursChangedEventArgs(bool oldValue, bool newValue)
+            : base(oldValue, newValue)
+        {
+        }
+    }
+    #endregion
+
+    #region TimeLineGetRowHeightEventArgs
+    /// <summary>
+    /// TimeLineGetRowHeightEventArgs
+    /// </summary>
+    public class TimeLineGetRowHeightEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private CalendarItem _CalendarItem;
+        private int _Height;
+
+        #endregion
+
+        public TimeLineGetRowHeightEventArgs(CalendarItem calendarItem, int height)
+        {
+            _CalendarItem = calendarItem;
+            _Height = height;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets or sets the Height
+        /// </summary>
+        public int Height
+        {
+            get { return (_Height); }
+            set { _Height = value; }
+        }
+
+        /// <summary>
+        /// Gets the associated CalendarItem
+        /// </summary>
+        public CalendarItem CalendarItem
+        {
+            get { return (_CalendarItem); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region TimeLineGetRowCollateIdEventArgs
+    /// <summary>
+    /// TimeLineGetRowCollateIdEventArgs
+    /// </summary>
+    public class TimeLineGetRowCollateIdEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private CalendarItem _CalendarItem;
+        private int _CollateId;
+
+        #endregion
+
+        public TimeLineGetRowCollateIdEventArgs(CalendarItem calendarItem)
+        {
+            _CalendarItem = calendarItem;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets or sets the row CollateId
+        /// </summary>
+        public int CollateId
+        {
+            get { return (_CollateId); }
+
+            set
+            {
+                if (value < 0)
+                    throw new Exception("CollateId must be 0 or greater.");
+
+                _CollateId = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the associated CalendarItem
+        /// </summary>
+        public CalendarItem CalendarItem
+        {
+            get { return (_CalendarItem); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region PageNavigatorClickEventArgs
+    /// <summary>
+    /// PageNavigatorClickEventArgs
+    /// </summary>
+    public class PageNavigatorClickEventArgs : CancelEventArgs
+    {
+        #region Private variables
+
+        private BaseView _View;
+        private PageNavigator _PageNavigator;
+        private PageNavigatorButton _Button;
+        private DateTime _NavigateTime;
+
+        #endregion
+
+        public PageNavigatorClickEventArgs(BaseView view,
+            PageNavigator pageNavigator, PageNavigatorButton button, DateTime navigateTime)
+        {
+            _View = view;
+            _PageNavigator = pageNavigator;
+            _Button = button;
+            _NavigateTime = navigateTime;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the PageNavigator
+        /// </summary>
+        public PageNavigator PageNavigator
+        {
+            get { return (_PageNavigator); }
+        }
+
+        /// <summary>
+        /// Gets the associated CalendarView
+        /// </summary>
+        public BaseView View
+        {
+            get { return (_View); }
+        }
+
+        /// <summary>
+        /// Gets which button was clicked
+        /// </summary>
+        public PageNavigatorButton Button
+        {
+            get { return (_Button); }
+        }
+
+        /// <summary>
+        /// Gets or sets the time to navigate to 
+        /// </summary>
+        public DateTime NavigateTime
+        {
+            get { return (_NavigateTime); }
+            set { _NavigateTime = value; }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region AllowDateSelectionChangedEventArgs
+    /// <summary>
+    /// AllowDateSelectionChangedEventArgs
+    /// </summary>
+    public class AllowDateSelectionChangedEventArgs : ValueChangedEventArgs<bool, bool>
+    {
+        public AllowDateSelectionChangedEventArgs(bool oldValue, bool newValue)
+            : base(oldValue, newValue)
+        {
+        }
+    }
+    #endregion
+
+    #region DayLinkChangedEventArgs
+    /// <summary>
+    /// DayLinkChangedEventArgs
+    /// </summary>
+    public class DayLinkChangedEventArgs : ValueChangedEventArgs<eYearViewDayLink, eYearViewDayLink>
+    {
+        public DayLinkChangedEventArgs(eYearViewDayLink oldValue, eYearViewDayLink newValue)
+            : base(oldValue, newValue)
+        {
+        }
+    }
+    #endregion
+
+    #region LinkViewChangedEventArgs
+    /// <summary>
+    /// LinkViewChangedEventArgs
+    /// </summary>
+    public class LinkViewChangedEventArgs : ValueChangedEventArgs<eCalendarView, eCalendarView>
+    {
+        public LinkViewChangedEventArgs(eCalendarView oldValue, eCalendarView newValue)
+            : base(oldValue, newValue)
+        {
+        }
+    }
+    #endregion
+
+    #region LinkViewActionChangedEventArgs
+    /// <summary>
+    /// LinkViewActionChangedEventArgs
+    /// </summary>
+    public class LinkViewActionChangedEventArgs : ValueChangedEventArgs<eYearViewLinkAction, eYearViewLinkAction>
+    {
+        public LinkViewActionChangedEventArgs(eYearViewLinkAction oldValue, eYearViewLinkAction newValue)
+            : base(oldValue, newValue)
+        {
+        }
+    }
+    #endregion
+
+    #region LinkViewStyleChangedEventArgs
+    /// <summary>
+    /// LinkViewStyleChangedEventArgs
+    /// </summary>
+    public class LinkViewStyleChangedEventArgs : ValueChangedEventArgs<eYearViewLinkStyle, eYearViewLinkStyle>
+    {
+        public LinkViewStyleChangedEventArgs(eYearViewLinkStyle oldValue, eYearViewLinkStyle newValue)
+            : base(oldValue, newValue)
+        {
+        }
+    }
+    #endregion
+
+    #region LinkViewSelectedEventArgs
+    /// <summary>
+    /// LinkViewSelectedEventArgs
+    /// </summary>
+    public class LinkViewSelectedEventArgs : CancelEventArgs
+    {
+        #region Private variables
+
+        private DateTime _StartDate;
+        private DateTime _EndDate;
+        private eCalendarView _ECalendarView;
+
+        #endregion
+
+        public LinkViewSelectedEventArgs(
+            DateTime startDate, DateTime endDate, eCalendarView calendarView)
+        {
+            _StartDate = startDate;
+            _EndDate = endDate;
+            _ECalendarView = calendarView;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the selected StartDate
+        /// </summary>
+        public DateTime StartDate
+        {
+            get { return (_StartDate); }
+            set { _StartDate = value; }
+        }
+
+        /// <summary>
+        /// Gets the selected EndDate
+        /// </summary>
+        public DateTime EndDate
+        {
+            get { return (_EndDate); }
+            set { _EndDate = value; }
+        }
+
+        /// <summary>
+        /// Gets the eCalendarView to activate
+        /// </summary>
+        public eCalendarView ECalendarView
+        {
+            get { return (_ECalendarView); }
+            set { _ECalendarView = value; }
+        }
+        #endregion
+    }
+    #endregion
+
+    #region ShowGridLinesChangedEventArgs
+    /// <summary>
+    /// ShowGridLinesChangedEventArgs
+    /// </summary>
+    public class ShowGridLinesChangedEventArgs : ValueChangedEventArgs<bool, bool>
+    {
+        public ShowGridLinesChangedEventArgs(bool oldValue, bool newValue)
+            : base(oldValue, newValue)
+        {
+        }
+    }
+    #endregion
+
+    #region YearViewDrawDayBackgroundEventArgs
+    /// <summary>
+    /// YearViewDrawDayBackgroundEventArgs
+    /// </summary>
+    public class YearViewDrawDayBackgroundEventArgs : CancelEventArgs
+    {
+        #region Private variables
+
+        private Graphics _Graphics;
+        private YearMonth _YearMonth;
+        private DateTime _Date;
+        private Rectangle _Bounds;
+        private eYearViewLinkStyle _LinkStyle;
+
+        #endregion
+
+        public YearViewDrawDayBackgroundEventArgs(Graphics g, YearMonth yearMonth,
+            DateTime date, Rectangle bounds, eYearViewLinkStyle linkStyle)
+        {
+            _Graphics = g;
+            _YearMonth = yearMonth;
+            _Date = date;
+            _Bounds = bounds;
+            _LinkStyle = linkStyle;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the Graphics object
+        /// </summary>
+        public Graphics Graphics
+        {
+            get { return (_Graphics); }
+        }
+
+        /// <summary>
+        /// Gets the YearMonth
+        /// </summary>
+        public YearMonth YearMonth
+        {
+            get { return (_YearMonth); }
+        }
+
+        /// <summary>
+        /// Gets the date to draw
+        /// </summary>
+        public DateTime Date
+        {
+            get { return (_Date); }
+        }
+
+        /// <summary>
+        /// Gets the bounding rectangle
+        /// </summary>
+        public Rectangle Bounds
+        {
+            get { return (_Bounds); }
+        }
+
+        /// <summary>
+        /// Gets or sets the Appointment Link style
+        /// </summary>
+        public eYearViewLinkStyle LinkStyle
+        {
+            get { return (_LinkStyle); }
+            set { _LinkStyle = value; }
+        }
+
+        #endregion
+    }
+    #endregion
+
+    #region YearViewDrawDayTextEventArgs
+    /// <summary>
+    /// YearViewDrawDayTextEventArgs
+    /// </summary>
+    public class YearViewDrawDayTextEventArgs : CancelEventArgs
+    {
+        #region Private variables
+
+        private Graphics _Graphics;
+        private YearMonth _YearMonth;
+        private DateTime _Date;
+        private Rectangle _Bounds;
+
+        #endregion
+
+        public YearViewDrawDayTextEventArgs(Graphics g,
+            YearMonth yearMonth, DateTime date, Rectangle bounds)
+        {
+            _Graphics = g;
+            _YearMonth = yearMonth;
+            _Date = date;
+            _Bounds = bounds;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the Graphics object
+        /// </summary>
+        public Graphics Graphics
+        {
+            get { return (_Graphics); }
+        }
+
+        /// <summary>
+        /// Gets the YearMonth
+        /// </summary>
+        public YearMonth YearMonth
+        {
+            get { return (_YearMonth); }
+        }
+
+        /// <summary>
+        /// Gets the date to draw
+        /// </summary>
+        public DateTime Date
+        {
+            get { return (_Date); }
+        }
+
+        /// <summary>
+        /// Gets the bounding rectangle
+        /// </summary>
+        public Rectangle Bounds
+        {
+            get { return (_Bounds); }
+        }
+
+        #endregion
+    }
+    #endregion
+
+    #region RenderDaySlotAppearanceTextEventArgs
+    /// <summary>
+    /// RenderDaySlotAppearanceTextEventArgs
+    /// </summary>
+    public class RenderDaySlotAppearanceTextEventArgs : CancelEventArgs
+    {
+        #region Private variables
+
+        private Graphics _Graphics;
+        private Rectangle _Bounds;
+        private DaySlotAppearance _Appearance;
+        private DateTime _StartTime;
+        private DateTime _EndTime;
+        private string _Text;
+        private bool _Selected;
+
+        #endregion
+
+        public RenderDaySlotAppearanceTextEventArgs(Graphics g, Rectangle bounds,
+            DaySlotAppearance appearance, DateTime startTime, DateTime endTime, bool selected)
+        {
+            _Graphics = g;
+            _Bounds = bounds;
+            _Appearance = appearance;
+            _StartTime = startTime;
+            _EndTime = endTime;
+            _Selected = selected;
+
+            _Text = appearance.Text;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the Graphics object
+        /// </summary>
+        public Graphics Graphics
+        {
+            get { return (_Graphics); }
+        }
+
+        /// <summary>
+        /// Gets the DaySlotAppearance
+        /// </summary>
+        public DaySlotAppearance Appearance
+        {
+            get { return (_Appearance); }
+        }
+
+        /// <summary>
+        /// Gets the start DateTime
+        /// </summary>
+        public DateTime StartTime
+        {
+            get { return (_StartTime); }
+        }
+
+        /// <summary>
+        /// Gets the bounding rectangle
+        /// </summary>
+        public Rectangle Bounds
+        {
+            get { return (_Bounds); }
+        }
+
+        /// <summary>
+        /// Gets the end DateTime
+        /// </summary>
+        public DateTime EndTime
+        {
+            get { return (_EndTime); }
+        }
+
+        /// <summary>
+        /// Gets whether the area is selected
+        /// </summary>
+        public bool Selected
+        {
+            get { return (_Selected); }
+        }
+
+        /// <summary>
+        /// Gets or Sets the Text to render
+        /// </summary>
+        public string Text
+        {
+            get { return (_Text); }
+            set { _Text = value; }
+        }
+
+        #endregion
+    }
+    #endregion
+
+    #region MonthViewPreRenderSlotBackgroundEventArgs
+    /// <summary>
+    /// MonthViewPreRenderSlotBackgroundEventArgs
+    /// </summary>
+    public class MonthViewPreRenderSlotBackgroundEventArgs : TimeLinePreRenderSlotBackgroundEventArgs
+    {
+        public MonthViewPreRenderSlotBackgroundEventArgs(Graphics graphics, BaseView view,
+            DateTime startTime, DateTime endTime, Rectangle bounds, eSlotDisplayState state)
+            : base(graphics, view, startTime, endTime, bounds, state)
+        {
+        }
+    }
+    #endregion
+
+    #region MonthViewPostRenderSlotBackgroundEventArgs
+    /// <summary>
+    /// MonthViewPreRenderSlotBackgroundEventArgs
+    /// </summary>
+    public class MonthViewPostRenderSlotBackgroundEventArgs : TimeLinePostRenderSlotBackgroundEventArgs
+    {
+        public MonthViewPostRenderSlotBackgroundEventArgs(Graphics graphics, BaseView view,
+            DateTime startTime, DateTime endTime, Rectangle bounds, eSlotDisplayState state)
+            : base(graphics, view, startTime, endTime, bounds, state)
+        {
+        }
+    }
+    #endregion
+
+    #region MonthViewHorizontalPaddingChangedEventArgs
+    /// <summary>
+    /// MonthViewHorizontalPaddingChangedEventArgs
+    /// </summary>
+    public class MonthViewHorizontalPaddingChangedEventArgs : ValueChangedEventArgs<int, int>
+    {
+        public MonthViewHorizontalPaddingChangedEventArgs(int oldValue, int newValue)
+            : base(oldValue, newValue)
+        {
+        }
+    }
+    #endregion
+
+    #region RenderTabBackgroundEventArgs
+    /// <summary>
+    /// RenderTabBackgroundEventArgs
+    /// </summary>
+    public class RenderTabBackgroundEventArgs : CancelEventArgs
+    {
+        #region Private variables
+
+        private Graphics _Graphics;
+        private GraphicsPath _Path;
+        private BaseView _View;
+        private bool _IsSelected;
+
+        #endregion
+
+        public RenderTabBackgroundEventArgs(
+            Graphics graphics, GraphicsPath path, BaseView view, bool isSelected)
+        {
+            _Graphics = graphics;
+            _Path = path;
+            _View = view;
+            _IsSelected = isSelected;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the Graphics object
+        /// </summary>
+        public Graphics Graphics
+        {
+            get { return (_Graphics); }
+        }
+
+        /// <summary>
+        /// Gets the tab GraphicsPath
+        /// </summary>
+        public GraphicsPath Path
+        {
+            get { return (_Path); }
+        }
+
+        /// <summary>
+        /// Gets the tab BaseView
+        /// </summary>
+        public BaseView View
+        {
+            get { return (_View); }
+        }
+
+        /// <summary>
+        /// Gets whether the tab is selected or not
+        /// </summary>
+        public bool IsSelected
+        {
+            get { return (_IsSelected); }
+        }
+
+        #endregion
+    }
+    #endregion
+
+    #region RenderTabBackgroundEventArgs
+    /// <summary>
+    /// RenderTabBackgroundEventArgs
+    /// </summary>
+    public class RenderTabContentEventArgs : RenderTabBackgroundEventArgs
+    {
+        #region Private variables
+
+        private string _Text;
+
+        #endregion
+
+        public RenderTabContentEventArgs(Graphics graphics,
+            GraphicsPath path, BaseView view, bool isSelected, string text)
+            : base(graphics, path, view, isSelected)
+        {
+            _Text = text;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets or sets the tab text
+        /// </summary>
+        public string Text
+        {
+            get { return (_Text); }
+            set { _Text = value; }
+        }
+
+        #endregion
+    }
+    #endregion
+
+    #region RenderViewBorderEventArgs
+    /// <summary>
+    /// RenderViewBorderEventArgs
+    /// </summary>
+    public class RenderViewBorderEventArgs : CancelEventArgs
+    {
+        #region Private variables
+
+        private Graphics _Graphics;
+        private Rectangle _Bounds;
+
+        #endregion
+
+        public RenderViewBorderEventArgs(Graphics graphics, Rectangle bounds)
+        {
+            _Graphics = graphics;
+            _Bounds = bounds;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the Graphics object used to render
+        /// the slot
+        /// </summary>
+        public Graphics Graphics
+        {
+            get { return (_Graphics); }
+        }
+
+        /// <summary>
+        /// Gets the bounding rectangle
+        /// </summary>
+        public Rectangle Bounds
+        {
+            get { return (_Bounds); }
+        }
+
+        #endregion
+    }
+    #endregion
+
+    #region ViewLoadCompleteEventArgs
+    /// <summary>
+    /// ViewLoadCompleteEventArgs
+    /// </summary>
+    public class ViewLoadCompleteEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private BaseView _View;
+
+        #endregion
+
+        public ViewLoadCompleteEventArgs(BaseView view)
+        {
+            _View = view;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the tab BaseView
+        /// </summary>
+        public BaseView View
+        {
+            get { return (_View); }
+        }
+
+        #endregion
+    }
+    #endregion
+
+    #region MonthMoreItemsIndicatorClickEventArgs
+
+    /// <summary>
+    /// MonthMoreItemsIndicatorClickEventArgs
+    /// </summary>
+    public class MonthMoreItemsIndicatorClickEventArgs : CancelEventArgs
+    {
+        #region Private variables
+
+        private BaseView _View;
+        private eCalendarView _SelectView;
+        private DateTime _StartTime;
+
+        #endregion
+
+        public MonthMoreItemsIndicatorClickEventArgs(
+            BaseView view, eCalendarView selectView, DateTime startTime)
+        {
+            _View = view;
+            _SelectView = selectView;
+            _StartTime = startTime;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated MonthView
+        /// </summary>
+        public BaseView View
+        {
+            get { return (_View); }
+        }
+
+        /// <summary>
+        /// Gets the eCalendarView to select
+        /// </summary>
+        public eCalendarView SelectView
+        {
+            get { return (_SelectView); }
+            set { _SelectView = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the starting time to navigate to 
+        /// </summary>
+        public DateTime StartTime
+        {
+            get { return (_StartTime); }
+            set { _StartTime = value; }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region TimeLineGetHeaderTextEventArgs
+    /// <summary>
+    /// TimeLineGetHeaderTextEventArgs
+    /// </summary>
+    public class TimeLineGetHeaderTextEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private DateTime _Date;
+        private TimeLineHeaderPanel _Header;
+        private string _Text;
+
+        #endregion
+
+        public TimeLineGetHeaderTextEventArgs(
+            TimeLineHeaderPanel header, DateTime date, string text)
+        {
+            _Header = header;
+            _Date = date;
+            _Text = text;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated TimeLineHeaderPanel
+        /// </summary>
+        public TimeLineHeaderPanel Header
+        {
+            get { return (_Header); }
+        }
+
+        /// <summary>
+        /// Gets the Header date / time
+        /// </summary>
+        public DateTime Date
+        {
+            get { return (_Date); }
+        }
+
+        /// <summary>
+        /// Gets or sets the Header Text
+        /// </summary>
+        public string Text
+        {
+            get { return (_Text); }
+            set { _Text = value; }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region WeekDayCanExtendRangeChangedEventArgs
+    /// <summary>
+    /// WeekDayCanExtendRangeChangedEventArgs
+    /// </summary>
+    public class WeekDayCanExtendRangeChangedEventArgs : ValueChangedEventArgs<bool, bool>
+    {
+        public WeekDayCanExtendRangeChangedEventArgs(bool oldValue, bool newValue)
+            : base(oldValue, newValue)
+        {
+        }
+    }
+    #endregion
+
+    #region PostRenderWeekDayHeaderEventArgs
+
+    /// <summary>
+    /// PostRenderWeekDayHeaderEventArgs
+    /// </summary>
+    public class PostRenderWeekDayHeaderEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private Graphics _Graphics;
+        private WeekDayView _View;
+        private int _ColumnIndex;
+        private Rectangle _Bounds;
+
+        #endregion
+
+        public PostRenderWeekDayHeaderEventArgs(
+            Graphics g, WeekDayView view, int colIndex, Rectangle bounds)
+        {
+            _Graphics = g;
+            _View = view;
+            _ColumnIndex = colIndex;
+            _Bounds = bounds;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the Graphics object
+        /// </summary>
+        public Graphics Graphics
+        {
+            get { return (_Graphics); }
+        }
+
+        /// <summary>
+        /// Gets the WeekDayView
+        /// </summary>
+        public WeekDayView View
+        {
+            get { return (_View); }
+        }
+
+        /// <summary>
+        /// Gets the DayColumn index
+        /// </summary>
+        public int ColumnIndex
+        {
+            get { return (_ColumnIndex); }
+        }
+
+        /// <summary>
+        /// Gets the bounding rectangle
+        /// </summary>
+        public Rectangle Bounds
+        {
+            get { return (_Bounds); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region PreRenderWeekDaySlotBackgroundEventArgs
+
+    /// <summary>
+    /// PreRenderWeekDaySlotBackgroundEventArgs
+    /// </summary>
+    public class PreRenderWeekDaySlotBackgroundEventArgs : PostRenderWeekDaySlotBackgroundEventArgs
+    {
+        #region Private variables
+
+        private bool _Cancel;
+
+        #endregion
+
+        public PreRenderWeekDaySlotBackgroundEventArgs(Graphics g,
+            WeekDayView view, int dayColumnIndex,int daySliceIndex, Rectangle bounds)
+            : base(g, view, dayColumnIndex, daySliceIndex, bounds)
+        {
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets or sets whether to cancel default rendering
+        /// </summary>
+        public bool Cancel
+        {
+            get { return (_Cancel); }
+            set { _Cancel = value; }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region PostRenderWeekDaySlotBackgroundEventArgs
+
+    /// <summary>
+    /// PostRenderWeekDaySlotBackgroundEventArgs
+    /// </summary>
+    public class PostRenderWeekDaySlotBackgroundEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private Graphics _Graphics;
+        private WeekDayView _View;
+        private int _DayColumnIndex;
+        private int _DaySliceIndex;
+        private Rectangle _Bounds;
+
+        #endregion
+
+        public PostRenderWeekDaySlotBackgroundEventArgs(
+            Graphics g, WeekDayView view, int dayColumnIndex, int daySliceIndex, Rectangle bounds)
+        {
+            _Graphics = g;
+            _View = view;
+            _DayColumnIndex = dayColumnIndex;
+            _DaySliceIndex = daySliceIndex;
+            _Bounds = bounds;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the Graphics object
+        /// </summary>
+        public Graphics Graphics
+        {
+            get { return (_Graphics); }
+        }
+
+        /// <summary>
+        /// Gets the WeekDayView
+        /// </summary>
+        public WeekDayView View
+        {
+            get { return (_View); }
+        }
+
+        /// <summary>
+        /// Gets the associated DayColumn index
+        /// </summary>
+        public int DayColumnIndex
+        {
+            get { return (_DayColumnIndex); }
+        }
+
+        /// <summary>
+        /// Gets the associated Slice index
+        /// </summary>
+        public int DaySliceIndex
+        {
+            get { return (_DaySliceIndex); }
+        }
+
+        /// <summary>
+        /// Gets the bounding rectangle
+        /// </summary>
+        public Rectangle Bounds
+        {
+            get { return (_Bounds); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region PreRenderWeekDayHeaderEventArgs
+
+    /// <summary>
+    /// PreRenderWeekDayHeaderEventArgs
+    /// </summary>
+    public class PreRenderWeekDayHeaderEventArgs : PostRenderWeekDayHeaderEventArgs
+    {
+        #region Private variables
+
+        private bool _Cancel;
+
+        #endregion
+
+        public PreRenderWeekDayHeaderEventArgs(Graphics g, WeekDayView view, int colIndex, Rectangle bounds)
+            : base (g, view, colIndex, bounds)
+        {
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets or sets whether to cancel default rendering
+        /// </summary>
+        public bool Cancel
+        {
+            get { return (_Cancel); }
+            set { _Cancel = value; }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region PostRenderMonthHeaderEventArgs
+
+    /// <summary>
+    /// PostRenderMonthHeaderEventArgs
+    /// </summary>
+    public class PostRenderMonthHeaderEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private Graphics _Graphics;
+        private MonthView _View;
+        private int _ColumnIndex;
+        private Rectangle _Bounds;
+
+        #endregion
+
+        public PostRenderMonthHeaderEventArgs(
+            Graphics g, MonthView view, int colIndex, Rectangle bounds)
+        {
+            _Graphics = g;
+            _View = view;
+            _ColumnIndex = colIndex;
+            _Bounds = bounds;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the Graphics object
+        /// </summary>
+        public Graphics Graphics
+        {
+            get { return (_Graphics); }
+        }
+
+        /// <summary>
+        /// Gets the MonthView
+        /// </summary>
+        public MonthView View
+        {
+            get { return (_View); }
+        }
+
+        /// <summary>
+        /// Gets the column index
+        /// </summary>
+        public int ColumnIndex
+        {
+            get { return (_ColumnIndex); }
+        }
+
+        /// <summary>
+        /// Gets the bounding rectangle
+        /// </summary>
+        public Rectangle Bounds
+        {
+            get { return (_Bounds); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region PreRenderMonthHeaderEventArgs
+
+    /// <summary>
+    /// PreRenderMonthHeaderEventArgs
+    /// </summary>
+    public class PreRenderMonthHeaderEventArgs : PostRenderMonthHeaderEventArgs
+    {
+        #region Private variables
+
+        private bool _Cancel;
+
+        #endregion
+
+        public PreRenderMonthHeaderEventArgs(Graphics g, MonthView view, int colIndex, Rectangle bounds)
+            : base(g, view, colIndex, bounds)
+        {
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets or sets whether to cancel default rendering
+        /// </summary>
+        public bool Cancel
+        {
+            get { return (_Cancel); }
+            set { _Cancel = value; }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #endregion
+}
+
+#endif
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/CalendarView/CalendarViewCollection.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/CalendarView/CalendarViewCollection.cs
new file mode 100644
index 00000000..59a1886a
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/CalendarView/CalendarViewCollection.cs	
@@ -0,0 +1,112 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+
+namespace DevComponents.DotNetBar.Schedule
+{
+    public class CalendarViewCollection<T> where T : BaseView
+    {
+        #region Private variables
+
+        private CalendarView _CalendarView;         // Assoc CalendarView
+        private List<T> _Views = new List<T>();     // BaseView items
+
+        #endregion
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="calendarView">CalendarView</param>
+        public CalendarViewCollection(CalendarView calendarView)
+        {
+            _CalendarView = calendarView;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the count of items in the collection
+        /// </summary>
+        public int Count
+        {
+            get { return (_Views.Count); }
+        }
+
+        /// <summary>
+        /// Gets the view at the given index
+        /// </summary>
+        /// <param name="index">Index</param>
+        /// <returns>Requested view</returns>
+        public T this[int index]
+        {
+            get { return (GetView(index)); }
+        }
+
+        /// <summary>
+        /// Gets the view for the given DisplayedOwner
+        /// </summary>
+        /// <param name="key">DisplayedOwner</param>
+        /// <returns>Requested view</returns>
+        public T this[string key]
+        {
+            get { return (GetView(FindDisplayedOwner(key))); }
+        }
+
+        /// <summary>
+        /// Locates the view index from the given
+        /// DisplayedOwner text
+        /// </summary>
+        /// <param name="key">DisplayedOwner</param>
+        /// <returns>View index, or -1 if not found</returns>
+        private int FindDisplayedOwner(string key)
+        {
+            for (int i = 0; i < _CalendarView.DisplayedOwners.Count; i++)
+            {
+                if (_CalendarView.DisplayedOwners[i].Equals(key))
+                    return (i);
+            }
+
+            return (-1);
+        }
+
+        /// <summary>
+        /// Returns the given view at the specified index.
+        /// 
+        /// This routine will initiate the creation
+        /// of the view if it has not previously been created.
+        /// </summary>
+        /// <param name="index">Index</param>
+        /// <returns>Requested view</returns>
+        private T GetView(int index)
+        {
+            if (index >= 0 && index < _Views.Count)
+            {
+                if (_Views[index] == null)
+                {
+                    Type type = typeof(T);
+
+                    _Views[index] = (T)_CalendarView.NewView(type, index);
+                }
+
+                return (_Views[index]);
+            }
+
+            return (default(T));
+        }
+
+        #endregion
+
+        #region Internal properties
+
+        /// <summary>
+        /// Gets the collection view list
+        /// </summary>
+        internal List<T> Views
+        {
+            get { return (_Views); }
+        }
+
+        #endregion
+    }
+}
+#endif
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/CalendarView/DisplayedOwnerCollection.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/CalendarView/DisplayedOwnerCollection.cs
new file mode 100644
index 00000000..3e431a6f
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/CalendarView/DisplayedOwnerCollection.cs	
@@ -0,0 +1,142 @@
+#if FRAMEWORK20
+using System.Collections.ObjectModel;
+
+namespace DevComponents.DotNetBar.Schedule
+{
+    public class DisplayedOwnerCollection : Collection<string>
+    {
+        #region Private variables
+
+        private CalendarView _CalendarView;     // Assoc CalendarView
+        private bool _IsRangeSet;               // Range set flag
+        private bool _SuspendUpdate;
+
+        #endregion
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="calendarView">CalendarView</param>
+        public DisplayedOwnerCollection(CalendarView calendarView)
+        {
+            _CalendarView = calendarView;
+        }
+
+        #region Internal properties
+
+        /// <summary>
+        /// Gets and sets the SuspendUpdate state
+        /// </summary>
+        internal bool SuspendUpdate
+        {
+            get { return (_SuspendUpdate); }
+            set { _SuspendUpdate = value; }
+        }
+
+        #endregion
+
+        #region AddRange
+
+        /// <summary>
+        /// Adds a range of Owners to the DisplayedOwner collection
+        /// </summary>
+        /// <param name="items">Array of Owners to add</param>
+        public void AddRange(string[] items)
+        {
+            int index = Count;
+
+            try
+            {
+                _IsRangeSet = true;
+
+                for (int i = 0; i < items.Length; i++)
+                    Add(items[i]);
+            }
+            finally
+            {
+                _IsRangeSet = false;
+
+                _CalendarView.DisplayedOwnersAdded(index);
+            }
+        }
+
+        #endregion
+
+        #region RemoveItem
+
+        /// <summary>
+        /// Processes list RemoveItem calls
+        /// </summary>
+        /// <param name="index">Index to remove</param>
+        protected override void RemoveItem(int index)
+        {
+            base.RemoveItem(index);
+
+            if (_SuspendUpdate == false)
+                _CalendarView.DisplayedOwnersRemoved(index, index + 1);
+        }
+
+        #endregion
+
+        #region InsertItem
+
+        /// <summary>
+        /// Processes list InsertItem calls
+        /// </summary>
+        /// <param name="index">Index to add</param>
+        /// <param name="item">Text to add</param>
+        protected override void InsertItem(int index, string item)
+        {
+            if (string.IsNullOrEmpty(item) == false)
+            {
+                base.InsertItem(index, item);
+
+                if (_SuspendUpdate == false)
+                {
+                    if (_IsRangeSet == false)
+                        _CalendarView.DisplayedOwnersAdded(index);
+                }
+            }
+        }
+
+        #endregion
+
+        #region SetItem
+
+        /// <summary>
+        /// Processes list SetItem calls (e.g. replace)
+        /// </summary>
+        /// <param name="index">Index to replace</param>
+        /// <param name="newItem">Text to replace</param>
+        protected override void SetItem(int index, string newItem)
+        {
+            base.SetItem(index, newItem);
+
+            if (_SuspendUpdate == false)
+                _CalendarView.DisplayedOwnersSet(index);
+        }
+
+        #endregion
+
+        #region ClearItems
+
+        /// <summary>
+        /// Processes list Clear calls (e.g. remove all)
+        /// </summary>
+        protected override void ClearItems()
+        {
+            if (Count > 0)
+            {
+                int n = Count;
+
+                base.ClearItems();
+
+                _CalendarView.DisplayedOwnersRemoved(0, n);
+            }
+        }
+
+        #endregion
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/CalendarView/ViewDisplayCustomizations.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/CalendarView/ViewDisplayCustomizations.cs
new file mode 100644
index 00000000..2981ddbc
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/CalendarView/ViewDisplayCustomizations.cs	
@@ -0,0 +1,916 @@
+using System;
+using System.Collections.ObjectModel;
+using System.Drawing;
+using DevComponents.Schedule.Model;
+
+namespace DevComponents.DotNetBar.Schedule
+{
+    /// <summary>
+    /// ViewDisplayCustomizations
+    /// </summary>
+    public class ViewDisplayCustomizations
+    {
+        #region Events
+
+        /// <summary>
+        /// Occurs when the ViewDisplayCustomizations have changed
+        /// </summary>
+        public event EventHandler<EventArgs> CollectionChanged;
+
+        #endregion
+
+        #region Private variables
+
+        private CalendarView _CalendarView;
+        private DaySlotBackgrounds _DaySlotBackgrounds;
+
+        #endregion
+
+        /// <summary>
+        /// ViewDisplayCustomizations
+        /// </summary>
+        /// <param name="calendarView"></param>
+        public ViewDisplayCustomizations(CalendarView calendarView)
+        {
+            _CalendarView = calendarView;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// DaySlotBackgrounds
+        /// </summary>
+        public DaySlotBackgrounds DaySlotBackgrounds
+        {
+            get
+            {
+                if (_DaySlotBackgrounds == null)
+                {
+                    _DaySlotBackgrounds = new DaySlotBackgrounds();
+                    _DaySlotBackgrounds.CollectionChanged += _DaySlotBackgrounds_CollectionChanged;
+                }
+
+                return (_DaySlotBackgrounds);
+            }
+
+            set
+            {
+                if (_DaySlotBackgrounds != null)
+                    _DaySlotBackgrounds.CollectionChanged -= _DaySlotBackgrounds_CollectionChanged;
+
+                _DaySlotBackgrounds = value;
+
+                if (_DaySlotBackgrounds != null)
+                    _DaySlotBackgrounds.CollectionChanged += _DaySlotBackgrounds_CollectionChanged;
+            }
+        }
+        
+        #endregion
+
+        #region Event handling
+
+        /// <summary>
+        /// Handles DaySlotBackgrounds CollectionChanged events
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void _DaySlotBackgrounds_CollectionChanged(object sender, EventArgs e)
+        {
+            _CalendarView.Refresh();
+
+            if (CollectionChanged != null)
+                CollectionChanged(this, EventArgs.Empty);
+        }
+
+        #endregion
+
+        #region GetDaySlotAppearance
+
+        /// <summary>
+        /// Retrieves the DaySlotAppearance from the given criteris
+        /// </summary>
+        /// <param name="ownerKey"></param>
+        /// <param name="dateTime"></param>
+        /// <param name="wkStart"></param>
+        /// <param name="wkEnd"></param>
+        /// <returns></returns>
+        internal DaySlotAppearance GetDaySlotAppearance(
+            string ownerKey, DateTime dateTime, WorkTime wkStart, WorkTime wkEnd)
+        {
+            foreach (DaySlotBackground dsb in DaySlotBackgrounds)
+            {
+                if (IsValidSlot(dsb, dateTime, wkStart, wkEnd) == true)
+                {
+                    if (IsValidOwner(dsb, ownerKey) == true)
+                        return (dsb.Appearance);
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region IsValidSlot
+
+        /// <summary>
+        /// Determines if the given slot is a valid
+        /// day and time slot
+        /// </summary>
+        /// <param name="dsb"></param>
+        /// <param name="dateTime"></param>
+        /// <param name="wkStart"></param>
+        /// <param name="wkEnd"></param>
+        /// <returns></returns>
+        private bool IsValidSlot(DaySlotBackground dsb,
+            DateTime dateTime, WorkTime wkStart, WorkTime wkEnd)
+        {
+            if (IsValidDaySlot(dsb, dateTime) == true)
+                return (IsValidTimeSlot(dsb, wkStart, wkEnd));
+
+            return (false);
+        }
+
+        #endregion
+
+        #region IsValidTimeSlot
+
+        /// <summary>
+        /// Determines if the given slot is a valid time slot
+        /// </summary>
+        /// <param name="dsb"></param>
+        /// <param name="wkStart"></param>
+        /// <param name="wkEnd"></param>
+        /// <returns></returns>
+        private bool IsValidTimeSlot(DaySlotBackground dsb, WorkTime wkStart, WorkTime wkEnd)
+        {
+            return (wkStart < dsb.Appearance.EndTime && wkEnd > dsb.Appearance.StartTime);
+        }
+
+        #endregion
+
+        #region IsValidDaySlot
+
+        /// <summary>
+        /// Determines if the given slot is a valid time slot
+        /// </summary>
+        /// <param name="dsb"></param>
+        /// <param name="dateTime"></param>
+        /// <returns></returns>
+        private bool IsValidDaySlot(DaySlotBackground dsb, DateTime dateTime)
+        {
+            if (dsb.DateTime == DateTime.MinValue)
+                return (dsb.DayOfWeek == dateTime.DayOfWeek);
+
+            return (dsb.DateTime.Date == dateTime.Date);
+        }
+
+        #endregion
+
+        #region IsValidOwner
+
+        /// <summary>
+        /// Determines if the given owner key is valid for the slot
+        /// </summary>
+        /// <param name="dsb"></param>
+        /// <param name="ownerKey"></param>
+        /// <returns></returns>
+        private bool IsValidOwner(DaySlotBackground dsb, string ownerKey)
+        {
+            if (dsb.HasOwnerKeys == true)
+            {
+                if (dsb.OwnerKeys.Contains("") == true)
+                    return (true);
+
+                if (dsb.OwnerKeys.Contains(ownerKey) == false)
+                    return (false);
+            }
+
+            return (true);
+        }
+
+        #endregion
+    }
+
+    /// <summary>
+    /// DaySlotBackgrounds
+    /// </summary>
+    public class DaySlotBackgrounds : Collection<DaySlotBackground>
+    {
+        #region Events
+
+        /// <summary>
+        /// Occurs when the DaySlotBackgrounds collection changes
+        /// </summary>
+        public event EventHandler<EventArgs> CollectionChanged;
+
+        #endregion
+
+        #region Private variables
+
+        private bool _IsRangeSet;
+        private bool _SuspendUpdate;
+
+        #endregion
+
+        #region Internal properties
+
+        /// <summary>
+        /// Gets and sets the SuspendUpdate state
+        /// </summary>
+        internal bool SuspendUpdate
+        {
+            get { return (_SuspendUpdate); }
+            set { _SuspendUpdate = value; }
+        }
+
+        #endregion
+
+        #region Remove
+
+        /// <summary>
+        /// Removes the DaySlotBackground for the given DateTime
+        /// </summary>
+        /// <param name="dateTime"></param>
+        public void Remove(DateTime dateTime)
+        {
+            int n = Items.Count;
+
+            try
+            {
+                SuspendUpdate = true;
+
+                for (int i = Items.Count - 1; i >= 0; i--)
+                {
+                    DaySlotBackground dsb = Items[i];
+
+                    if (dsb.DateTime.Equals(dateTime) == true)
+                        RemoveAt(i);
+                }
+            }
+            finally
+            {
+                SuspendUpdate = false;
+
+                if (Items.Count != n)
+                    OnCollectionChanged();
+            }
+        }
+
+        /// <summary>
+        /// Removes the DaySlotBackground for the given DayOfWeek
+        /// </summary>
+        /// <param name="dayOfWeek"></param>
+        public void Remove(DayOfWeek dayOfWeek)
+        {
+            int n = Items.Count;
+
+            try
+            {
+                SuspendUpdate = true;
+
+                for (int i = Items.Count - 1; i >= 0; i--)
+                {
+                    DaySlotBackground dsb = Items[i];
+
+                    if (dsb.DateTime.Equals(DateTime.MinValue) == true)
+                    {
+                        if (dsb.DayOfWeek == dayOfWeek)
+                            RemoveAt(i);
+                    }
+                }
+            }
+            finally
+            {
+                SuspendUpdate = false;
+
+                if (Items.Count != n)
+                    OnCollectionChanged();
+            }
+        }
+
+        #endregion
+
+        #region AddRange
+
+        /// <summary>
+        /// Adds a range of DaySlotBackgrounds
+        /// </summary>
+        /// <param name="daySlotBackgrounds"></param>
+        public void AddRange(DaySlotBackgrounds daySlotBackgrounds)
+        {
+            try
+            {
+                _IsRangeSet = true;
+
+                foreach (DaySlotBackground dsb in daySlotBackgrounds)
+                    Add(dsb);
+            }
+            finally
+            {
+                _IsRangeSet = false;
+
+                OnCollectionChanged();
+            }
+        }
+
+        #endregion
+
+        #region RemoveItem
+
+        /// <summary>
+        /// Processes list RemoveItem calls
+        /// </summary>
+        /// <param name="index">Index to remove</param>
+        protected override void RemoveItem(int index)
+        {
+            base.RemoveItem(index);
+
+            OnCollectionChanged();
+        }
+
+        #endregion
+
+        #region InsertItem
+
+        /// <summary>
+        /// Processes list InsertItem calls
+        /// </summary>
+        /// <param name="index">Index to add</param>
+        /// <param name="item">Text to add</param>
+        protected override void InsertItem(int index, DaySlotBackground item)
+        {
+            if (item != null)
+            {
+                base.InsertItem(index, item);
+
+                item.DaySlotBackgrounds = this;
+
+                OnCollectionChanged();
+            }
+        }
+
+        #endregion
+
+        #region SetItem
+
+        /// <summary>
+        /// Processes list SetItem calls (e.g. replace)
+        /// </summary>
+        /// <param name="index">Index to replace</param>
+        /// <param name="newItem">Text to replace</param>
+        protected override void SetItem(int index, DaySlotBackground newItem)
+        {
+            base.SetItem(index, newItem);
+
+            newItem.DaySlotBackgrounds = this;
+
+            OnCollectionChanged();
+        }
+
+        #endregion
+
+        #region ClearItems
+
+        /// <summary>
+        /// Processes list Clear calls (e.g. remove all)
+        /// </summary>
+        protected override void ClearItems()
+        {
+            if (Count > 0)
+            {
+                base.ClearItems();
+
+                OnCollectionChanged();
+            }
+        }
+
+        #endregion
+
+        #region OnCollectionChanged
+
+        /// <summary>
+        /// Handles collection change notification
+        /// </summary>
+        private void OnCollectionChanged()
+        {
+            if (_SuspendUpdate == false && _IsRangeSet == false)
+            {
+                if (CollectionChanged != null)
+                    CollectionChanged(this, EventArgs.Empty);
+            }
+        }
+
+        #endregion
+    }
+
+    /// <summary>
+    /// DaySlotBackground
+    /// </summary>
+    public class DaySlotBackground
+    {
+        #region Events
+
+        /// <summary>
+        /// Occurs when the DaySlotBackground collection changes
+        /// </summary>
+        public event EventHandler<EventArgs> CollectionChanged;
+
+        #endregion
+
+        #region Private variables
+
+        private DayOfWeek _DayOfWeek;
+        private DateTime _DateTime = DateTime.MinValue;
+
+        private DaySlotAppearance _Appearance;
+        private DaySlotBackgrounds _DaySlotBackgrounds;
+
+        private OwnerKeyCollection _OwnerKeys;
+
+        #endregion
+
+        #region Constructors
+
+        public DaySlotBackground(DateTime dateTime, DaySlotAppearance appearance)
+        {
+            _DateTime = dateTime;
+
+            _Appearance = appearance;
+        }
+
+        public DaySlotBackground(DayOfWeek dayOfWeek, DaySlotAppearance appearance)
+        {
+            _DayOfWeek = dayOfWeek;
+            _DateTime = DateTime.MinValue;
+
+            _Appearance = appearance;
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region Appearance
+
+        /// <summary>
+        /// Gets or sets the Appearance
+        /// </summary>
+        public DaySlotAppearance Appearance
+        {
+            get { return (_Appearance); }
+
+            set
+            {
+                _Appearance = value;
+
+                OnCollectionChanged();
+            }
+        }
+
+        #endregion
+
+        #region DateTime
+
+        /// <summary>
+        /// Gets or sets the DateTime
+        /// </summary>
+        public DateTime DateTime
+        {
+            get { return (_DateTime); }
+
+            set
+            {
+                if (_DateTime != value)
+                {
+                    _DateTime = value;
+
+                    OnCollectionChanged();
+                }
+            }
+        }
+
+        #endregion
+
+        #region DayOfWeek
+
+        /// <summary>
+        /// Gets or sets the DayOfWeek
+        /// </summary>
+        public DayOfWeek DayOfWeek
+        {
+            get { return (_DayOfWeek); }
+
+            set
+            {
+                if (_DayOfWeek != value)
+                {
+                    _DayOfWeek = value;
+
+                    OnCollectionChanged();
+                }
+            }
+        }
+
+        #endregion
+
+        #region OwnerKeys
+
+        /// <summary>
+        /// Gets or sets the OwnerKeyCollection
+        /// </summary>
+        public OwnerKeyCollection OwnerKeys
+        {
+            get
+            {
+                if (_OwnerKeys == null)
+                {
+                    _OwnerKeys = new OwnerKeyCollection();
+
+                    _OwnerKeys.CollectionChanged += OwnerKeys_CollectionChanged;
+                }
+
+                return (_OwnerKeys);
+            }
+
+            set
+            {
+                if (_OwnerKeys != null)
+                    _OwnerKeys.CollectionChanged -= OwnerKeys_CollectionChanged;
+
+                _OwnerKeys = value;
+
+                if (_OwnerKeys != null)
+                    _OwnerKeys.CollectionChanged += OwnerKeys_CollectionChanged;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region DaySlotBackgrounds
+
+        /// <summary>
+        /// Gets or sets the DaySlotBackgrounds
+        /// </summary>
+        internal DaySlotBackgrounds DaySlotBackgrounds
+        {
+            get { return (_DaySlotBackgrounds); }
+
+            set
+            {
+                _DaySlotBackgrounds = value;
+
+                OnCollectionChanged();
+            }
+        }
+
+        #endregion
+
+        #region HasOwnerKeys
+
+        /// <summary>
+        /// HasOwnerKeys
+        /// </summary>
+        internal bool HasOwnerKeys
+        {
+            get { return (_OwnerKeys != null && _OwnerKeys.Count > 0); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Event processing
+
+        /// <summary>
+        /// Processes OwnerKeys_CollectionChanged events
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void OwnerKeys_CollectionChanged(object sender, EventArgs e)
+        {
+            OnCollectionChanged();
+        } 
+
+        #endregion
+
+        #region OnCollectionChanged
+
+        /// <summary>
+        /// Handles collection change notification
+        /// </summary>
+        private void OnCollectionChanged()
+        {
+            if (CollectionChanged != null)
+                CollectionChanged(this, EventArgs.Empty);
+        }
+
+        #endregion
+    }
+
+    /// <summary>
+    /// DaySlotAppearance
+    /// </summary>
+    public class DaySlotAppearance
+    {
+        #region Private variables
+
+        private WorkTime _StartTime;
+        private WorkTime _EndTime;
+
+        private Color _BackColor;
+        private Color _HourBorderColor;
+        private Color _HalfHourBorderColor;
+
+        private string _Text;
+        private ContentAlignment _TextAlignment;
+        private Color _TextColor;
+        private Color _SelectedTextColor;
+        private Font _Font;
+
+        private bool _OnTop;
+        private bool _ShowTextWhenSelected = true;
+
+        #endregion
+
+        #region Constructors
+
+        public DaySlotAppearance(WorkTime startTime, WorkTime endTime,
+            Color backColor, Color hourBorderColor, Color halfHourBorderColor)
+        {
+            _StartTime = startTime;
+            _EndTime = endTime;
+
+            _BackColor = backColor;
+            _HourBorderColor = hourBorderColor;
+            _HalfHourBorderColor = halfHourBorderColor;
+        }
+
+        public DaySlotAppearance(int startHour, int startMinute,
+            int endHour, int endMinute, Color backColor, Color hourBorderColor, Color halfHourBorderColor)
+            : this(new WorkTime(startHour, startMinute), new WorkTime(endHour, endMinute), backColor, hourBorderColor, halfHourBorderColor)
+        {
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region BackColor
+
+        /// <summary>
+        /// Gets or sets the BackColor
+        /// </summary>
+        public Color BackColor
+        {
+            get { return (_BackColor); }
+            set { _BackColor = value; }
+        }
+
+        #endregion
+
+        #region EndTime
+
+        /// <summary>
+        /// Gets or sets the Appearance end time
+        /// </summary>
+        public WorkTime EndTime
+        {
+            get { return (_EndTime); }
+            set { _EndTime = value; }
+        }
+
+        #endregion
+
+        #region Font
+
+        /// <summary>
+        /// Gets or sets the DaySlot Font
+        /// </summary>
+        public Font Font
+        {
+            get { return (_Font); }
+            set { _Font = value; }
+        }
+
+        #endregion
+
+        #region HalfHourBorderColor
+
+        /// <summary>
+        /// Gets or sets the HalfHourBorderColor
+        /// </summary>
+        public Color HalfHourBorderColor
+        {
+            get { return (_HalfHourBorderColor); }
+            set { _HalfHourBorderColor = value; }
+        }
+
+        #endregion
+
+        #region HourBorderColor
+
+        /// <summary>
+        /// Gets or sets the HourBorderColor
+        /// </summary>
+        public Color HourBorderColor
+        {
+            get { return (_HourBorderColor); }
+            set { _HourBorderColor = value; }
+        }
+
+        #endregion
+
+        #region OnTop
+
+        /// <summary>
+        /// Gets or sets whether the Text is on top of the borders
+        /// </summary>
+        public bool OnTop
+        {
+            get { return (_OnTop); }
+            set { _OnTop = value; }
+        }
+
+        #endregion
+
+        #region StartTime
+
+        /// <summary>
+        /// Gets or sets the Appearance start time
+        /// </summary>
+        public WorkTime StartTime
+        {
+            get { return (_StartTime); }
+            set { _StartTime = value; }
+        }
+
+        #endregion
+
+        #region Text
+
+        /// <summary>
+        /// Gets or sets the Text
+        /// </summary>
+        public string Text
+        {
+            get { return (_Text); }
+            set { _Text = value; }
+        }
+
+        #endregion
+
+        #region TextAlignment
+
+        /// <summary>
+        /// Gets or sets the Text Alignment
+        /// </summary>
+        public ContentAlignment TextAlignment
+        {
+            get { return (_TextAlignment); }
+            set { _TextAlignment = value; }
+        }
+
+        #endregion
+
+        #region TextColor
+
+        /// <summary>
+        /// Gets or sets the Text Color
+        /// </summary>
+        public Color TextColor
+        {
+            get { return (_TextColor); }
+            set { _TextColor = value; }
+        }
+
+        #endregion
+
+        #region SelectedTextColor
+
+        /// <summary>
+        /// Gets or sets the Selected Text Color
+        /// </summary>
+        public Color SelectedTextColor
+        {
+            get { return (_SelectedTextColor); }
+            set { _SelectedTextColor = value; }
+        }
+
+        #endregion
+
+        #region ShowTextWhenSelected
+
+        /// <summary>
+        /// Gets or sets wheter the Text is displayed when cells are selected
+        /// </summary>
+        public bool ShowTextWhenSelected
+        {
+            get { return (_ShowTextWhenSelected); }
+            set { _ShowTextWhenSelected = value; }
+        }
+
+        #endregion
+
+        #endregion
+    }
+
+    /// <summary>
+    /// OwnerKeyCollection
+    /// </summary>
+    public class OwnerKeyCollection : Collection<string>
+    {
+        #region Events
+
+        /// <summary>
+        /// Occurs when the OwnerKeyCollection changes
+        /// </summary>
+        public event EventHandler<EventArgs> CollectionChanged;
+
+        #endregion
+
+        #region RemoveItem
+
+        /// <summary>
+        /// Processes list RemoveItem calls
+        /// </summary>
+        /// <param name="index">Index to remove</param>
+        protected override void RemoveItem(int index)
+        {
+            base.RemoveItem(index);
+
+            OnCollectionChanged();
+        }
+
+        #endregion
+
+        #region InsertItem
+
+        /// <summary>
+        /// Processes list InsertItem calls
+        /// </summary>
+        /// <param name="index">Index to add</param>
+        /// <param name="item">Text to add</param>
+        protected override void InsertItem(int index, string item)
+        {
+            if (item != null)
+            {
+                base.InsertItem(index, item);
+
+                OnCollectionChanged();
+            }
+        }
+
+        #endregion
+
+        #region SetItem
+
+        /// <summary>
+        /// Processes list SetItem calls (e.g. replace)
+        /// </summary>
+        /// <param name="index">Index to replace</param>
+        /// <param name="newItem">Text to replace</param>
+        protected override void SetItem(int index, string newItem)
+        {
+            base.SetItem(index, newItem);
+
+            OnCollectionChanged();
+        }
+
+        #endregion
+
+        #region ClearItems
+
+        /// <summary>
+        /// Processes list Clear calls (e.g. remove all)
+        /// </summary>
+        protected override void ClearItems()
+        {
+            if (Count > 0)
+            {
+                base.ClearItems();
+
+                OnCollectionChanged();
+            }
+        }
+
+        #endregion
+
+        #region OnCollectionChanged
+
+        /// <summary>
+        /// Handles collection change notification
+        /// </summary>
+        private void OnCollectionChanged()
+        {
+            if (CollectionChanged != null)
+                CollectionChanged(this, EventArgs.Empty);
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Color/AppointmentCategoryColor.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Color/AppointmentCategoryColor.cs
new file mode 100644
index 00000000..24805959
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Color/AppointmentCategoryColor.cs	
@@ -0,0 +1,149 @@
+#if FRAMEWORK20
+using System;
+using System.ComponentModel;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Schedule
+{
+    public class AppointmentCategoryColor
+    {
+        #region Events
+
+        /// <summary>
+        /// Occurs when AppointmentCategoryColorCollection has changed
+        /// </summary>
+        [Description("Occurs when the AppointmentCategoryColorCollection has changed.")]
+        public event EventHandler<EventArgs> AppointmentCategoryColorChanged;
+
+        #endregion
+
+        #region Private variables
+
+        private string _ColorName;
+        private Color _TextColor;
+        private Color _BorderColor;
+        private ColorDef _BackColor;
+
+        #endregion
+
+        /// <summary>
+        /// AppointmentCategoryColor
+        /// </summary>
+        /// <param name="colorName">Color name</param>
+        /// <param name="textColor">Text Color</param>
+        /// <param name="borderColor">Border Color</param>
+        /// <param name="backColor">Background Color</param>
+        public AppointmentCategoryColor(string colorName,
+            Color textColor, Color borderColor, ColorDef backColor)
+        {
+            _ColorName = colorName;
+
+            _TextColor = textColor;
+            _BorderColor = borderColor;
+            _BackColor = backColor;
+        }
+
+        /// <summary>
+        /// AppointmentCategoryColor
+        /// </summary>
+        /// <param name="colorName">Color name</param>
+        public AppointmentCategoryColor(string colorName)
+            : this(colorName, Color.Black, Color.Black, new ColorDef(Color.White))
+        {
+        }
+
+        #region Public properties
+
+        #region ColorName
+
+        /// <summary>
+        /// Color name
+        /// </summary>
+        public string ColorName
+        {
+            get { return (_ColorName); }
+            internal set { _ColorName = value; }
+        }
+
+        #endregion
+
+        #region TextColor
+
+        /// <summary>
+        /// Text Color
+        /// </summary>
+        public Color TextColor
+        {
+            get { return (_TextColor); }
+
+            set
+            {
+                if (_TextColor != value)
+                {
+                    _TextColor = value;
+
+                    OnAppointmentCategoryColorChanged();
+                }
+            }
+        }
+
+        #endregion
+
+        #region BorderColor
+
+        /// <summary>
+        /// Border Color
+        /// </summary>
+        public Color BorderColor
+        {
+            get { return (_BorderColor); }
+
+            set
+            {
+                if (_BorderColor != value)
+                {
+                    _BorderColor = value;
+
+                    OnAppointmentCategoryColorChanged();
+                }
+            }
+        }
+
+        #endregion
+
+        #region BackColor
+
+        /// <summary>
+        /// Background Color
+        /// </summary>
+        public ColorDef BackColor
+        {
+            get { return (_BackColor); }
+
+            set
+            {
+                if (_BackColor != value)
+                {
+                    _BackColor = value;
+
+                    OnAppointmentCategoryColorChanged();
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region OnAppointmentCategoryColorChanged
+
+        private void OnAppointmentCategoryColorChanged()
+        {
+            if (AppointmentCategoryColorChanged != null)
+                AppointmentCategoryColorChanged(this, EventArgs.Empty);
+        }
+
+        #endregion
+    }
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Color/AppointmentCategoryColorCollection.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Color/AppointmentCategoryColorCollection.cs
new file mode 100644
index 00000000..cea048ee
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Color/AppointmentCategoryColorCollection.cs	
@@ -0,0 +1,178 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar.Schedule
+{
+    public class AppointmentCategoryColorCollection
+    {
+        #region Events
+
+        /// <summary>
+        /// Occurs when AppointmentCategoryColorCollection has changed
+        /// </summary>
+        [Description("Occurs when the AppointmentCategoryColorCollection has changed.")]
+        public event EventHandler<EventArgs> AppointmentCategoryColorCollectionChanged;
+
+        #endregion
+
+        #region Private variables
+
+        private Dictionary<string, AppointmentCategoryColor> _List;
+
+        #endregion
+
+        /// <summary>
+        /// AppointmentCategoryColorCollection
+        /// </summary>
+        public AppointmentCategoryColorCollection()
+        {
+            _List = new Dictionary<string, AppointmentCategoryColor>();
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the Count of items defined
+        /// </summary>
+        public int Count
+        {
+            get { return (_List.Count); }
+        }
+
+        #endregion
+
+        #region Add
+
+        /// <summary>
+        /// Adds a AppointmentCategoryColor to the collection
+        /// </summary>
+        /// <param name="acc"></param>
+        public void Add(AppointmentCategoryColor acc)
+        {
+            _List[acc.ColorName] = acc;
+
+            acc.AppointmentCategoryColorChanged += CategoryColorChanged;
+
+            OnAppointmentCategoryColorCollectionChanged();
+        }
+
+        #endregion
+
+        #region Remove
+
+        /// <summary>
+        /// Removes an entry from the collection, by color name
+        /// </summary>
+        /// <param name="colorName">Color name</param>
+        public void Remove(string colorName)
+        {
+            if (_List.ContainsKey(colorName))
+            {
+                _List[colorName].AppointmentCategoryColorChanged -= CategoryColorChanged;
+
+                _List.Remove(colorName);
+
+                OnAppointmentCategoryColorCollectionChanged();
+            }
+        }
+
+        /// <summary>
+        /// Removes an entry from the collection, by AppointmentCategoryColor
+        /// </summary>
+        /// <param name="categoryColor">AppointmentCategoryColor</param>
+        public void Remove(AppointmentCategoryColor categoryColor)
+        {
+            Remove(categoryColor.ColorName);
+        }
+
+        #endregion
+
+        #region Clear
+
+        /// <summary>
+        /// Clears the AppointmentCategoryColor collection
+        /// </summary>
+        public void Clear()
+        {
+            foreach (AppointmentCategoryColor ac in _List.Values)
+                ac.AppointmentCategoryColorChanged -= CategoryColorChanged;
+
+            _List.Clear();
+
+            OnAppointmentCategoryColorCollectionChanged();
+        }
+
+        #endregion
+
+        #region Items
+
+        /// <summary>
+        /// Gets the entire list of added AppointmentCategoryColor items
+        /// </summary>
+        public AppointmentCategoryColor[] Items
+        {
+            get
+            {
+                AppointmentCategoryColor[] items = new AppointmentCategoryColor[_List.Count];
+
+                _List.Values.CopyTo(items, 0);
+
+                return (items);
+            }
+        }
+
+        #endregion
+
+        #region this
+
+        /// <summary>
+        /// Gets the AppointmentCategoryColor from the given
+        /// color name string index
+        /// </summary>
+        /// <param name="colorName"></param>
+        /// <returns></returns>
+        public AppointmentCategoryColor this[string colorName]
+        {
+            get
+            {
+                AppointmentCategoryColor acc;
+
+                _List.TryGetValue(colorName, out acc);
+
+                return (acc);
+            }
+        }
+
+        #endregion
+
+        #region CategoryColorChanged
+
+        /// <summary>
+        /// CategoryColorChanged
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void CategoryColorChanged(object sender, EventArgs e)
+        {
+            OnAppointmentCategoryColorCollectionChanged();
+        }
+
+        #endregion
+
+        #region OnAppointmentCategoryColorCollectionChanged
+
+        /// <summary>
+        /// OnAppointmentCategoryColorCollectionChanged
+        /// </summary>
+        private void OnAppointmentCategoryColorCollectionChanged()
+        {
+            if (AppointmentCategoryColorCollectionChanged != null)
+                AppointmentCategoryColorCollectionChanged(this, EventArgs.Empty);
+        }
+
+        #endregion
+    }
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Color/AppointmentColor.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Color/AppointmentColor.cs
new file mode 100644
index 00000000..73e2d325
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Color/AppointmentColor.cs	
@@ -0,0 +1,121 @@
+#if FRAMEWORK20
+using DevComponents.DotNetBar.Rendering;
+
+namespace DevComponents.DotNetBar.Schedule
+{
+    #region enum definitions
+
+    /// <summary>
+    /// Appointment parts enum
+    /// </summary>
+    public enum eAppointmentPart
+    {
+        DefaultBorder,
+        DefaultBackground,
+
+        BlueBorder,
+        BlueBackground,
+
+        GreenBorder,
+        GreenBackground,
+
+        OrangeBorder,
+        OrangeBackground,
+
+        PurpleBorder,
+        PurpleBackground,
+
+        RedBorder,
+        RedBackground,
+
+        YellowBorder,
+        YellowBackground,
+
+        BusyTimeMarker,
+        FreeTimeMarker,
+        OutOfOfficeTimeMarker
+    }
+
+    #endregion
+
+    public class AppointmentColor : CalendarColor
+    {
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        public AppointmentColor()
+            : base(eCalendarColor.Automatic)
+        {
+        }
+
+        #region SetColorTable routine
+
+        /// <summary>
+        /// Sets our current color table to either
+        /// a local or global definition
+        /// </summary>
+        public override void SetColorTable()
+        {
+            // Use the globally set color table
+
+            Office2007Renderer r =
+                GlobalManager.Renderer as Office2007Renderer;
+
+            ColorTable = (r != null)
+                ? r.ColorTable.CalendarView.AppointmentColors
+                : _LocalColorTable;
+        }
+
+        #endregion
+
+        #region Static Color definitions
+
+        // Array of predefined colors
+
+        static ColorDef[] _LocalColorTable = new ColorDef[]
+        {
+            new ColorDef(0x4B71A2),                         // DefaultBorder
+
+            new ColorDef(new int[] {0xFDFEFF, 0xC1D3EA},    // DefaultBackground
+                         new float[] {0f, 1f}, 90f),
+
+            new ColorDef(0x28518E),                         // BlueBorder
+
+            new ColorDef(new int[] {0xB1C5EC, 0x759DDA},    // BlueBackground
+                         new float[] {0f, 1f}, 90f),
+
+            new ColorDef(0x2C6524),                         // GreenBorder
+
+            new ColorDef(new int[] {0xC2E8BC, 0x84D17B},    // GreenBackground
+                         new float[] {0f, 1f}, 90f),
+
+            new ColorDef(0x8B3E0A),                         // OrangeBorder
+
+            new ColorDef(new int[] {0xF9C7A0, 0xF49758},    // OrangeBackground
+                         new float[] {0f, 1f}, 90f),
+
+            new ColorDef(0x3E2771),                         // PurpleBorder
+
+            new ColorDef(new int[] {0xC5B5E6, 0x957BD2},    // PurpleBackground
+                         new float[] {0f, 1f}, 90f),
+
+            new ColorDef(0x86171C),                         // RedBorder
+
+            new ColorDef(new int[] {0xF1AAAC, 0xE5676E},    // RedBackground
+                         new float[] {0f, 1f}, 90f),
+
+            new ColorDef(0x7C7814),                         // YellowBorder
+
+            new ColorDef(new int[] {0xFFFCAA, 0xFFF958},    // YellowBackground
+                         new float[] {0f, 1f}, 90f),
+
+            new ColorDef(-1),                               // BusyTimeMarker
+            new ColorDef(0xFFFFFF),                         // FreeTimeMarker
+            new ColorDef(0x800080),                         // OutOfOfficeTimeMarker
+        };
+
+        #endregion
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Color/CalendarColor.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Color/CalendarColor.cs
new file mode 100644
index 00000000..a982364c
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Color/CalendarColor.cs	
@@ -0,0 +1,439 @@
+#if FRAMEWORK20
+using System.Drawing;
+using System.Drawing.Drawing2D;
+
+namespace DevComponents.DotNetBar.Schedule
+{
+    //#region ColorDef
+
+    ///// <summary>
+    ///// Color definition class
+    ///// </summary>
+    //[TypeConverter(typeof(ColorDefConvertor))]
+    //public class ColorDef
+    //{
+    //    #region Events
+
+    //    /// <summary>
+    //    /// Event raised when the SuperTabColorStates is changed
+    //    /// </summary>
+    //    [Description("Event raised when the ColorDef is changed")]
+    //    public event EventHandler<EventArgs> ColorDefChanged;
+
+    //    #endregion
+
+    //    #region Private variables
+
+    //    private Color[] _Colors;        // Color values
+    //    private float[] _Positions;     // Gradient color positions
+    //    private float _Angle;           // Gradient angle
+
+    //    #endregion
+
+    //    #region Constructors
+
+    //    public ColorDef()
+    //    {
+    //    }
+
+    //    /// <summary>
+    //    /// Constructor - solid def
+    //    /// </summary>
+    //    /// <param name="rgb">RGB value</param>
+    //    public ColorDef(int rgb)
+    //        : this(ColorScheme.GetColor(rgb))
+    //    {
+    //    }
+
+    //    /// <summary>
+    //    /// Constructor - solid def
+    //    /// </summary>
+    //    /// <param name="color">Color</param>
+    //    public ColorDef(Color color)
+    //    {
+    //        _Colors = new Color[1];
+
+    //        _Colors[0] = color;
+    //        _Positions = null;
+    //    }
+
+    //    /// <summary>
+    //    /// Constructor - 2 color def
+    //    /// </summary>
+    //    /// <param name="start">Start Color</param>
+    //    /// <param name="end">End Color</param>
+    //    public ColorDef(Color start, Color end)
+    //        : this(start, end, 90f)
+    //    {
+    //    }
+
+    //    /// <summary>
+    //    /// Constructor - 2 color def
+    //    /// </summary>
+    //    /// <param name="start">Start Color</param>
+    //    /// <param name="end">End Color</param>
+    //    /// <param name="angle">Gradient angle</param>
+    //    public ColorDef(Color start, Color end, float angle)
+    //    {
+    //        _Colors = new Color[] { start, end };
+    //        _Positions = new float[] { 0, 1 };
+
+    //        _Angle = angle;
+    //    }
+
+    //    /// <summary>
+    //    /// Constructor - Gradient def
+    //    /// </summary>
+    //    /// <param name="rgbs">Array of RGB values</param>
+    //    /// <param name="cPositions">Gradient positions</param>
+    //    public ColorDef(int[] rgbs, float[] cPositions)
+    //        : this(rgbs, cPositions, 90f)
+    //    {
+    //    }
+
+    //    /// <summary>
+    //    /// Constructor - Gradient def
+    //    /// </summary>
+    //    /// <param name="colors">Array of Color values</param>
+    //    /// <param name="cPositions">Gradient positions</param>
+    //    public ColorDef(Color[] colors, float[] cPositions)
+    //        : this(colors, cPositions, 90f)
+    //    {
+    //    }
+
+    //    /// <summary>
+    //    /// Constructor - Gradient def
+    //    /// </summary>
+    //    /// <param name="rgbs">Array of RGB values</param>
+    //    /// <param name="cPositions">Gradient positions</param>
+    //    /// <param name="angle">Gradient angle</param>
+    //    public ColorDef(int[] rgbs, float[] cPositions, float angle)
+    //    {
+    //        _Colors = new Color[rgbs.Length];
+
+    //        for (int i = 0; i < rgbs.Length; i++)
+    //            _Colors[i] = ColorScheme.GetColor(rgbs[i]);
+
+    //        _Positions = cPositions;
+    //        _Angle = angle;
+    //    }
+
+    //    /// <summary>
+    //    /// Constructor - Gradient def
+    //    /// </summary>
+    //    /// <param name="colors">Array of Color values</param>
+    //    /// <param name="cPositions">Gradient positions</param>
+    //    /// <param name="angle">Gradient angle</param>
+    //    public ColorDef(Color[] colors, float[] cPositions, float angle)
+    //    {
+    //        _Colors = colors;
+    //        _Positions = cPositions;
+    //        _Angle = angle;
+    //    }
+
+    //    #endregion
+
+    //    #region Public properties
+
+    //    #region Colors
+
+    //    /// <summary>
+    //    /// Gets or sets the Color array
+    //    /// </summary>
+    //    [Browsable(true), DefaultValue(null)]
+    //    [NotifyParentProperty(true)]
+    //    [Description("Indicates the Color array")]
+    //    public Color[] Colors
+    //    {
+    //        get { return (_Colors); }
+    //        set { _Colors = value; OnColorDefChanged(); }
+    //    }
+
+    //    #endregion
+
+    //    #region Positions
+
+    //    /// <summary>
+    //    /// Gets or sets the Color Positions
+    //    /// </summary>
+    //    [Browsable(true), DefaultValue(null)]
+    //    [NotifyParentProperty(true)]
+    //    [Description("Indicates the Color Positions.")]
+    //    public float[] Positions
+    //    {
+    //        get { return (_Positions); }
+    //        set { _Positions = value; OnColorDefChanged(); }
+    //    }
+
+    //    #endregion
+
+    //    #region Angle
+
+    //    /// <summary>
+    //    /// Gets or sets the Gradient Angle
+    //    /// </summary>
+    //    [Browsable(true), DefaultValue(0f)]
+    //    [NotifyParentProperty(true)]
+    //    [Description("Indicates the Gradient Angle.")]
+    //    public float Angle
+    //    {
+    //        get { return (_Angle); }
+    //        set { _Angle = value; OnColorDefChanged(); }
+    //    }
+
+    //    #endregion
+
+    //    #region IsEmpty
+
+    //    /// <summary>
+    //    /// IsEmpty
+    //    /// </summary>
+    //    [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+    //    public bool IsEmpty
+    //    {
+    //        get { return (_Colors == null || 
+    //            _Colors.Length == 1 && _Colors[0].IsEmpty); }
+    //    }
+
+    //    #endregion
+
+    //    #endregion
+
+    //    #region OnColorDefChanged
+
+    //    /// <summary>
+    //    /// OnColorDefChanged
+    //    /// </summary>
+    //    private void OnColorDefChanged()
+    //    {
+    //        if (ColorDefChanged != null)
+    //            ColorDefChanged(this, EventArgs.Empty);
+    //    }
+
+    //    #endregion
+    //}
+
+    //#region ColorDefConvertor
+
+    ///// <summary>
+    ///// ColorDefConvertor
+    ///// </summary>
+    //public class ColorDefConvertor : ExpandableObjectConverter
+    //{
+    //    public override object ConvertTo(
+    //        ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+    //    {
+    //        if (destinationType == typeof(string))
+    //        {
+    //            ColorDef cd = value as ColorDef;
+
+    //            if (cd != null)
+    //            {
+    //                ColorConverter cvt = new ColorConverter();
+
+    //                if (cd.Colors != null)
+    //                {
+    //                    if (cd.Colors[0] != Color.Empty)
+    //                        return (cvt.ConvertToString(cd.Colors[0]));
+
+    //                    if (cd.Colors.Length > 1 && cd.Colors[1] != Color.Empty)
+    //                        return (cvt.ConvertToString(cd.Colors[1]));
+    //                }
+
+    //                if (cd.Angle != 0)
+    //                    return (cd.Angle.ToString());
+    //            }
+
+    //            return (String.Empty);
+    //        }
+
+    //        return (base.ConvertTo(context, culture, value, destinationType));
+    //    }
+    //}
+
+    //#endregion
+
+    //#endregion
+
+    #region CalendarColor
+
+    public class CalendarColor
+    {
+        #region Private variables
+
+        private eCalendarColor _ColorSch;   // Current color scheme enum
+        private ColorDef[] _ColorTable;     // Color scheme definition
+
+        #endregion
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="colorSch">eCalendarColor</param>
+        public CalendarColor(eCalendarColor colorSch)
+        {
+            _ColorSch = colorSch;
+
+            SetColorTable();
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets and sets ColorTable
+        /// </summary>
+        public ColorDef[] ColorTable
+        {
+            get { return (_ColorTable); }
+            set { _ColorTable = value; }
+        }
+
+        /// <summary>
+        /// Gets and sets calendar color scheme
+        /// </summary>
+        public eCalendarColor ColorSch
+        {
+            get { return (_ColorSch); }
+
+            set
+            {
+                if (_ColorSch != value)
+                {
+                    _ColorSch = value;
+
+                    SetColorTable();
+                }
+            }
+        }
+
+        #region SetColorTable
+
+        public virtual void SetColorTable()
+        {
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Get Color
+
+        /// <summary>
+        /// Gets the Color of the calendar part
+        /// </summary>
+        /// <param name="part">Calendar part</param>
+        /// <returns>Color</returns>
+        public Color GetColor(int part)
+        {
+            return (_ColorTable[part].Colors[0]);
+        }
+
+        #endregion
+
+        #region GetColorDef
+
+        /// <summary>
+        /// Gets the ColorDef of the part
+        /// </summary>
+        /// <param name="part">Calendar part</param>
+        /// <returns>Part ColorDef</returns>
+        public ColorDef GetColorDef(int part)
+        {
+            return (_ColorTable[part]);
+        }
+
+        #endregion
+
+        #region BrushPart routines
+
+        /// <summary>
+        /// Creates a LinearGradientBrush from the given part
+        /// </summary>
+        /// <param name="part">Color part</param>
+        /// <param name="r">Gradient Rectangle</param>
+        /// <returns>Created Brush</returns>
+        public Brush BrushPart(int part, Rectangle r)
+        {
+            return (BrushPart(GetColorDef(part), r));
+        }
+
+        /// <summary>
+        /// Creates a LinearGradientBrush from the given ColorDef
+        /// </summary>
+        /// <param name="cDef">ColorDef</param>
+        /// <param name="r">Gradient Rectangle</param>
+        /// <returns>Created Brush</returns>
+        public Brush BrushPart(ColorDef cDef, Rectangle r)
+        {
+            return (BrushPart(cDef, r, cDef.Angle));
+        }
+        
+        /// <summary>
+        /// Creates a LinearGradientBrush from the given ColorDef
+        /// </summary>
+        /// <param name="cDef">ColorDef</param>
+        /// <param name="r">Gradient Rectangle</param>
+        /// <param name="angle">Gradient angle</param>
+        /// <returns>Created Brush</returns>
+        public Brush BrushPart(ColorDef cDef, Rectangle r, float angle)
+        {
+            if (cDef.Colors.Length == 1)
+                return (new SolidBrush(cDef.Colors[0]));
+
+            LinearGradientBrush lbr =
+                new LinearGradientBrush(r, Color.White, Color.White, angle);
+
+            lbr.InterpolationColors = GetColorBlend(cDef);
+
+            return (lbr);
+        }
+
+        /// <summary>
+        /// Creates a ColorBlend from the given ColorDef
+        /// </summary>
+        /// <param name="cDef">ColorDef for blend</param>
+        /// <returns>ColorBlend</returns>
+        private ColorBlend GetColorBlend(ColorDef cDef)
+        {
+            ColorBlend cb = new ColorBlend(cDef.Colors.Length);
+
+            // Set each Color and position from the
+            // provided color definition
+
+            cb.Colors = cDef.Colors;
+            cb.Positions = GetPositions(cDef);
+
+            return (cb);
+        }
+
+        /// <summary>
+        /// Gets the array of color positions
+        /// </summary>
+        /// <param name="cDef"></param>
+        /// <returns></returns>
+        private float[] GetPositions(ColorDef cDef)
+        {
+            float[] cp = cDef.Positions;
+
+            if (cp == null || cp.Length != cDef.Colors.Length)
+            {
+                cp = new float[cDef.Colors.Length];
+
+                float f = 1f / cDef.Colors.Length;
+
+                for (int i = 0; i < cp.Length; i++)
+                    cp[i] = i * f;
+
+                cp[cDef.Colors.Length - 1] = 1;
+            }
+
+            return (cp);
+        }
+
+        #endregion
+    }
+
+    #endregion
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Color/CalendarMonthColor.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Color/CalendarMonthColor.cs
new file mode 100644
index 00000000..44858963
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Color/CalendarMonthColor.cs	
@@ -0,0 +1,691 @@
+#if FRAMEWORK20
+using DevComponents.DotNetBar.Rendering;
+
+namespace DevComponents.DotNetBar.Schedule
+{
+    #region enum definitions
+
+    /// <summary>
+    /// Month calendar parts enum
+    /// </summary>
+    public enum eCalendarMonthPart
+    {
+        DayOfTheWeekHeaderBorder,
+        DayOfTheWeekHeaderBackground,
+        DayOfTheWeekHeaderForeground,
+
+        SideBarBorder,
+        SideBarBackground,
+        SideBarForeground,
+
+        DayHeaderBorder,
+        DayHeaderBackground,
+        DayHeaderForeground,
+
+        DayContentBorder,
+        DayContentSelectionBackground,
+        DayContentActiveBackground,  
+        DayContactInactiveBackground,
+
+        OwnerTabBorder,
+        OwnerTabBackground,
+        OwnerTabForeground,
+        OwnerTabContentBackground,
+        OwnerTabSelectedForeground,
+        OwnerTabSelectedBackground,
+
+        NowDayHeaderBorder,
+        NowDayHeaderForeground,
+        NowDayHeaderBackground,
+
+        ContentLinkForeground,
+        ContentLinkBackground,
+    }
+
+    #endregion
+
+    public class CalendarMonthColor : CalendarColor
+    {
+        #region Private variables
+
+        private ColorDef[][] _LocalColorTable =
+             { _Blue, _Green, _Maroon, _Steel, _Teal, _Purple, _Olive,
+               _Red, _DarkPeach, _DarkSteel, _DarkGreen, _Yellow};
+
+        #endregion
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="eColor">Default color</param>
+        public CalendarMonthColor(eCalendarColor eColor)
+            : base(eColor)
+        {
+        }
+
+        #region SetColorTable routine
+
+        /// <summary>
+        /// Sets our current color table to either
+        /// a local or global definition
+        /// </summary>
+        public override void SetColorTable()
+        {
+            if (ColorSch != eCalendarColor.Automatic)
+            {
+                // Use the requested local color table
+
+                ColorTable = _LocalColorTable[(int)ColorSch];
+            }
+            else
+            {
+                // Use the globally set color table
+
+                Office2007Renderer r =
+                    GlobalManager.Renderer as Office2007Renderer;
+
+                ColorTable = (r != null) 
+                    ? r.ColorTable.CalendarView.MonthViewColors
+                    : _LocalColorTable[(int)eCalendarColor.Blue];
+            }
+        }
+
+        #endregion
+ 
+        #region Static Color definitions
+
+        // Array of predefined color
+
+        #region Blue
+
+        static ColorDef[] _Blue = new ColorDef[]
+        {
+            new ColorDef(0x8DAED9),     // DayOfWeekHeaderBorder
+
+            new ColorDef(new int[] {0xE4ECF6, 0xD6E2F1, 0xC2D4EB, 0xD0DEEF},    // DayOfWeekHeaderBackground
+                         new float[] {0f, .6f, .6f, 1f}, 90f),
+
+            new ColorDef(0x000000),     // DayOfWeekHeaderForeground - 0x15428B
+            new ColorDef(0x5D8CC9),     // SideBarBorder
+
+            new ColorDef(new int[] {0xE4ECF6, 0xD6E2F1, 0xC2D4EB, 0xD0DEEF},     // SideBarBackground
+                         new float[] {0f, .6f, .6f, 1f}, 0f),
+
+            new ColorDef(0x000000),     // SideBarForeground - 0x15428B
+            new ColorDef(0x5D8CC9),     // DayHeaderBorder
+
+            new ColorDef(new int[] {0xE4ECF6, 0xD6E2F1, 0xC2D4EB, 0xD0DEEF},    // DayHeaderBackground
+                         new float[] {0f, .6f, .6f, 1f}, 90f),
+
+            new ColorDef(0x000000),     // DayHeaderForeground
+            new ColorDef(0x8DAED9),     // DayContentBorder
+            new ColorDef(0xE6EDF7),     // DayContentSelectionBackground
+            new ColorDef(0xFFFFFF),     // DayContentActiveDayBackground
+            new ColorDef(0xA5BFE1),     // DayContentInactiveDayBackground
+
+            new ColorDef(0x5D8CC9),     // OwnerTabBorder
+
+            new ColorDef(new int[] {0xBBCFE9, 0x8DAED9},    // OwnerTabBackground
+                         new float[] {0f, 1f}, 90f),
+
+            new ColorDef(0x000000),     // OwnerTabForeground
+            new ColorDef(0x8DAED9),     // OwnerTabContentBackground
+            new ColorDef(0x000000),     // OwnerTabSelectedForeground
+            new ColorDef(0xFFFFFF),     // OwnerTabSelectionBackground
+
+            new ColorDef(0xEB8900),     // NowDayViewBorder
+            new ColorDef(0x000000),     // NowDayHeaderForeground - 0x15428B
+
+            new ColorDef(new int[] {0xFFED79, 0xFFD86B, 0xFFBB00, 0xFFEA77},      // NowDayHeaderBackground
+                         new float[] {0f, .55f, .058f, 1f}, 90f),
+
+            new ColorDef(0x000000),     // ContentLinkForeground - DayHeaderForeground
+            new ColorDef(0xFFFFFF),     // ContentLinkBackground - DayContentActiveBackground
+        };
+
+        #endregion
+
+        #region Green
+
+        static ColorDef[] _Green = new ColorDef[]
+        {
+            new ColorDef(0x72A45A),     // DayOfWeekHeaderBorder
+
+            new ColorDef(new int[] {0xE7F0E4, 0xDDE8D7, 0xCCDEC2, 0xD8E5D0},    // DayOfWeekHeaderBackground
+                         new float[] {0f, .6f, .6f, 1f}, 90f),
+
+            new ColorDef(0x50734D),     // DayOfWeekHeaderForeground
+            new ColorDef(0x72A45A),     // SideBarBorder
+
+            new ColorDef(new int[] {0xE7F0E4, 0xDEE9D8, 0xCBDDC2, 0xD7E5D0},     // SideBarBackground
+                         new float[] {0f, .6f, .6f, 1f}, 0f),
+
+            new ColorDef(0x000000),     // SideBarForeground
+            new ColorDef(0x50733F),     // DayHeaderBorder
+
+            new ColorDef(new int[] {0xE7F0E4, 0xDDE8D7, 0xCCDEC2, 0xD8E5D0},    // DayHeaderBackground
+                         new float[] {0f, .55f, .58f, 1f}, 90f),
+
+            new ColorDef(0x000000),     // DayHeaderForeground
+            new ColorDef(0x72A45A),     // DayContentBorder
+            new ColorDef(0xE9F1E6),     // DayContentSelectionBackground
+            new ColorDef(0xFFFFFF),     // DayContentActiveDayBackground
+            new ColorDef(0xB1CDA4),     // DayContentInactiveDayBackground
+
+            new ColorDef(0x72A45A),     // OwnerTabBorder
+
+            new ColorDef(new int[] {0xC3D9B9, 0x9CBF8B},    // OwnerTabBackground
+                         new float[] {0f, 1f}, 90f),
+
+            new ColorDef(0x000000),     // OwnerTabForeground
+            new ColorDef(0x9CBF8B),     // OwnerTabContentBackground
+            new ColorDef(0x000000),     // OwnerTabSelectedForeground
+            new ColorDef(0xFFFFFF),     // OwnerTabSelectionBackground
+
+            new ColorDef(0xEB8900),     // NowDayViewBorder
+            new ColorDef(0x000000),     // NowDayHeaderForeground - 0x15428B
+
+            new ColorDef(new int[] {0xFFED79, 0xFFD86B, 0xFFBB00, 0xFFEA77},      // NowDayHeaderBackground
+                         new float[] {0f, .55f, .058f, 1f}, 90f),
+            
+            new ColorDef(0x000000),     // ContentLinkForeground - DayHeaderForeground
+            new ColorDef(0xFFFFFF),     // ContentLinkBackground - DayContentActiveBackground
+        };
+
+        #endregion
+
+        #region Maroon
+
+        static ColorDef[] _Maroon = new ColorDef[]
+        {
+            new ColorDef(0x85495E),     // DayOfWeekHeaderBorder
+
+            new ColorDef(new int[] {0xF4E6EB, 0xEFDAE2, 0xE6C6D2, 0xEDD4DD},    // DayOfWeekHeaderBackground
+                         new float[] {0f, .6f, .6f, 1f}, 90f),
+
+            new ColorDef(0x85496B),     // DayOfWeekHeaderForeground
+            new ColorDef(0xBE6886),     // SideBarBorder
+ 
+            new ColorDef(new int[] {0xF4E6EB, 0xF0DBE3, 0xE7C7D3, 0xECD4DD},     // SideBarBackground
+                         new float[] {0f, .6f, .6f, 1f}, 0f),
+
+            new ColorDef(0x000000),     // SideBarForeground
+            new ColorDef(0x85495E),     // DayHeaderBorder
+
+            new ColorDef(new int[] {0xF4E6EB, 0xEFDAE2, 0xE6C6D2, 0xEDD4DD},    // DayHeaderBackground
+                         new float[] {0f, .55f, .58f, 1f}, 90f),
+
+            new ColorDef(0x000000),     // DayHeaderForeground
+            new ColorDef(0xBE6886),     // DayContentBorder
+            new ColorDef(0xF5E8EC),     // DayContentSelectionBackground
+            new ColorDef(0xFFFFFF),     // DayContentActiveDayBackground
+            new ColorDef(0xDBACBC),     // DayContentInactiveDayBackground
+
+            new ColorDef(0xBE6886),     // OwnerTabBorder
+
+            new ColorDef(new int[] {0xE4BFCB, 0xD195AA},    // OwnerTabBackground
+                         new float[] {0f, 1f}, 90f),
+
+            new ColorDef(0x000000),     // OwnerTabForeground
+            new ColorDef(0xD195AA),     // OwnerTabContentBackground
+            new ColorDef(0x000000),     // OwnerTabSelectedForeground
+            new ColorDef(0xFFFFFF),     // OwnerTabSelectionBackground
+
+            new ColorDef(0xEB8900),     // NowDayViewBorder
+            new ColorDef(0x000000),     // NowDayHeaderForeground - 0x15428B
+
+            new ColorDef(new int[] {0xFFED79, 0xFFD86B, 0xFFBB00, 0xFFEA77},      // NowDayHeaderBackground
+                         new float[] {0f, .55f, .058f, 1f}, 90f),
+       
+            new ColorDef(0x000000),     // ContentLinkForeground - DayHeaderForeground
+            new ColorDef(0xFFFFFF),     // ContentLinkBackground - DayContentActiveBackground
+        };
+
+        #endregion
+
+        #region Steel
+
+        static ColorDef[] _Steel = new ColorDef[]
+        {
+            new ColorDef(0x9199A4),     // DayOfWeekHeaderBorder
+
+            new ColorDef(new int[] {0xDCDFE2, 0xD3D6DA, 0xB4BAC1, 0xCBCED4},    // DayOfWeekHeaderBackground
+                         new float[] {0f, .55f, .58f, 1f}, 90f),
+
+            new ColorDef(0x616A76),     // DayOfWeekHeaderForeground
+            new ColorDef(0x9199A4),     // SideBarBorder
+
+            new ColorDef(new int[] {0xDCDFE2, 0xD2D5DA, 0xB7BCC3, 0xCACED4},     // SideBarBackground
+                         new float[] {0f, .6f, .6f, 1f}, 0f),
+
+            new ColorDef(0x000000),     // SideBarForeground
+            new ColorDef(0x9199A4),     // DayHeaderBorder
+
+            new ColorDef(new int[] {0xDCDFE2, 0xD3D6DA, 0xB4BAC1, 0xCBCED4},    // DayHeaderBackground
+                         new float[] {0f, .55f, .58f, 1f}, 90f),
+
+            new ColorDef(0x000000),     // DayHeaderForeground
+            new ColorDef(0x9199A4),     // DayContentBorder
+            new ColorDef(0xE8EAEC),     // DayContentSelectionBackground
+            new ColorDef(0xFFFFFF),     // DayContentActiveDayBackground
+            new ColorDef(0xC7CBD1),     // DayContentInactiveDayBackground
+
+            new ColorDef(0x9199A4),     // OwnerTabBorder
+
+            new ColorDef(new int[] {0xCFD2D8, 0xB0B6BE},    // OwnerTabBackground
+                         new float[] {0f, 1f}, 90f),
+
+            new ColorDef(0x000000),     // OwnerTabForeground
+            new ColorDef(0xB0B6BE),     // OwnerTabContentBackground
+            new ColorDef(0x000000),     // OwnerTabSelectedForeground
+            new ColorDef(0xFFFFFF),     // OwnerTabSelectionBackground
+
+            new ColorDef(0xEB8900),     // NowDayViewBorder
+            new ColorDef(0x000000),     // NowDayHeaderForeground - 0x15428B
+
+            new ColorDef(new int[] {0xFFED79, 0xFFD86B, 0xFFBB00, 0xFFEA77},      // NowDayHeaderBackground
+                         new float[] {0f, .55f, .058f, 1f}, 90f),
+       
+            new ColorDef(0x000000),     // ContentLinkForeground - DayHeaderForeground
+            new ColorDef(0xFFFFFF),     // ContentLinkBackground - DayContentActiveBackground
+        };
+
+        #endregion
+
+        #region Teal
+
+        static ColorDef[] _Teal = new ColorDef[]
+        {
+           new ColorDef(0x3F7373),     // DayOfWeekHeaderBorder
+
+            new ColorDef(new int[] {0xDCDFE2, 0xD7E8E8, 0xC0DDDD, 0xD0E5E5},    // DayOfWeekHeaderBackground
+                         new float[] {0f, .55f, .58f, 1f}, 90f),
+
+            new ColorDef(0x3F7380),     // DayOfWeekHeaderForeground
+            new ColorDef(0x5AA4A4),     // SideBarBorder
+
+            new ColorDef(new int[] {0xE4F0F0, 0xD6E8E8, 0xC2DDDD, 0xD0E5E5},     // SideBarBackground
+                         new float[] {0f, .6f, .6f, 1f}, 0f),
+
+            new ColorDef(0x000000),     // SideBarForeground
+            new ColorDef(0x3F7373),     // DayHeaderBorder
+
+            new ColorDef(new int[] {0xDCDFE2, 0xD7E8E8, 0xC0DDDD, 0xD0E5E5},    // DayHeaderBackground
+                         new float[] {0f, .55f, .58f, 1f}, 90f),
+
+            new ColorDef(0x000000),     // DayHeaderForeground
+            new ColorDef(0x5AA4A4),     // DayContentBorder
+            new ColorDef(0xE6F1F1),     // DayContentSelectionBackground
+            new ColorDef(0xFFFFFF),     // DayContentActiveDayBackground
+            new ColorDef(0xA4CDCD),     // DayContentInactiveDayBackground
+
+            new ColorDef(0x5AA4A4),     // OwnerTabBorder
+
+            new ColorDef(new int[] {0xB9D9D9, 0x8CBFC0},    // OwnerTabBackground
+                         new float[] {0f, 1f}, 90f),
+
+            new ColorDef(0x000000),     // OwnerTabForeground
+            new ColorDef(0x8CBFC0),     // OwnerTabContentBackground
+            new ColorDef(0x000000),     // OwnerTabSelectedForeground
+            new ColorDef(0xFFFFFF),     // OwnerTabSelectionBackground
+
+            new ColorDef(0xEB8900),     // NowDayViewBorder
+            new ColorDef(0x000000),     // NowDayHeaderForeground - 0x15428B
+
+            new ColorDef(new int[] {0xFFED79, 0xFFD86B, 0xFFBB00, 0xFFEA77},      // NowDayHeaderBackground
+                         new float[] {0f, .55f, .058f, 1f}, 90f),
+       
+            new ColorDef(0x000000),     // ContentLinkForeground - DayHeaderForeground
+            new ColorDef(0xFFFFFF),     // ContentLinkBackground - DayContentActiveBackground
+        };
+
+        #endregion
+
+        #region Purple
+
+        static ColorDef[] _Purple = new ColorDef[]
+        {
+            new ColorDef(0x7171CD),     // DayOfWeekHeaderBorder
+
+            new ColorDef(new int[] {0xE6E6F6, 0xDCDCF2, 0xC9C9EC, 0xD7D7F0},    // DayOfWeekHeaderBackground
+                         new float[] {0f, .55f, .58f, 1f}, 90f),
+
+            new ColorDef(0x4F4F90),     // DayOfWeekHeaderForeground
+            new ColorDef(0x7171CD),     // SideBarBorder
+
+            new ColorDef(new int[] {0xE6E6F6, 0xDCDCF2, 0xC9C9EC, 0xD7D7F0},     // SideBarBackground
+                         new float[] {0f, .55f, .58f, 1f}, 0f),
+
+            new ColorDef(0x000000),     // SideBarForeground
+            new ColorDef(0x4F4F90),     // DayHeaderBorder
+
+            new ColorDef(new int[] {0xE6E6F6, 0xDCDCF2, 0xC9C9EC, 0xD7D7F0},    // DayHeaderBackground
+                         new float[] {0f, .55f, .58f, 1f}, 90f),
+
+            new ColorDef(0x000000),     // DayHeaderForeground
+            new ColorDef(0x7171CD),     // DayContentBorder
+            new ColorDef(0xE9E9F7),     // DayContentSelectionBackground
+            new ColorDef(0xFFFFFF),     // DayContentActiveDayBackground
+            new ColorDef(0x9B9BDC),     // DayContentInactiveDayBackground
+
+            new ColorDef(0x7171CD),     // OwnerTabBorder
+
+            new ColorDef(new int[] {0xC1C1EA, 0x8C8CD7},    // OwnerTabBackground
+                         new float[] {0f, 1f}, 90f),
+
+            new ColorDef(0x000000),     // OwnerTabForeground
+            new ColorDef(0x8C8CD7),     // OwnerTabContentBackground
+            new ColorDef(0x000000),     // OwnerTabSelectedForeground
+            new ColorDef(0xFFFFFF),     // OwnerTabSelectionBackground
+
+            new ColorDef(0xEB8900),     // NowDayViewBorder
+            new ColorDef(0x000000),     // NowDayHeaderForeground - 0x15428B
+
+            new ColorDef(new int[] {0xFFED79, 0xFFD86B, 0xFFBB00, 0xFFEA77},      // NowDayHeaderBackground
+                         new float[] {0f, .55f, .058f, 1f}, 90f),
+       
+            new ColorDef(0x000000),     // ContentLinkForeground - DayHeaderForeground
+            new ColorDef(0xFFFFFF),     // ContentLinkBackground - DayContentActiveBackground
+        };
+
+        #endregion
+
+        #region Olive
+
+        static ColorDef[] _Olive = new ColorDef[]
+        {
+            new ColorDef(0x9D9D57),     // DayOfWeekHeaderBorder
+
+            new ColorDef(new int[] {0xEFEFE3, 0xE8E8D8, 0xDADABF, 0xE3E3CF},    // DayOfWeekHeaderBackground
+                         new float[] {0f, .55f, .58f, 1f}, 90f),
+
+            new ColorDef(0x6E6E3D),     // DayOfWeekHeaderForeground
+            new ColorDef(0x9D9D57),     // SideBarBorder
+
+            new ColorDef(new int[] {0xEFEFE3, 0xE8E8D8, 0xDADABF, 0xE3E3CF},     // SideBarBackground
+                         new float[] {0f, .55f, .58f, 1f}, 0f),
+
+            new ColorDef(0x000000),     // SideBarForeground
+            new ColorDef(0x6E6E3D),     // DayHeaderBorder
+
+            new ColorDef(new int[] {0xEFEFE3, 0xE8E8D8, 0xDADABF, 0xE3E3CF},    // DayHeaderBackground
+                         new float[] {0f, .55f, .58f, 1f}, 90f),
+
+            new ColorDef(0x000000),     // DayHeaderForeground
+            new ColorDef(0x9D9D57),     // DayContentBorder
+            new ColorDef(0xF0F0E5),     // DayContentSelectionBackground
+            new ColorDef(0xFFFFFF),     // DayContentActiveDayBackground
+            new ColorDef(0xC9C9A2),     // DayContentInactiveDayBackground
+
+            new ColorDef(0x9D9D57),     // OwnerTabBorder
+
+            new ColorDef(new int[] {0xD5D5B8, 0xBABA89},    // OwnerTabBackground
+                         new float[] {0f, 1f}, 90f),
+
+            new ColorDef(0x000000),     // OwnerTabForeground
+            new ColorDef(0xBABA89),     // OwnerTabContentBackground
+            new ColorDef(0x000000),     // OwnerTabSelectedForeground
+            new ColorDef(0xFFFFFF),     // OwnerTabSelectionBackground
+
+            new ColorDef(0xEB8900),     // NowDayViewBorder
+            new ColorDef(0x000000),     // NowDayHeaderForeground - 0x15428B
+
+            new ColorDef(new int[] {0xFFED79, 0xFFD86B, 0xFFBB00, 0xFFEA77},      // NowDayHeaderBackground
+                         new float[] {0f, .55f, .058f, 1f}, 90f),
+       
+            new ColorDef(0x000000),     // ContentLinkForeground - DayHeaderForeground
+            new ColorDef(0xFFFFFF),     // ContentLinkBackground - DayContentActiveBackground
+        };
+
+        #endregion
+
+        #region Red
+
+        static ColorDef[] _Red = new ColorDef[]
+        {
+            new ColorDef(0xC16969),     // DayOfWeekHeaderBorder
+
+            new ColorDef(new int[] {0xF5E6E6, 0xEFDADA, 0xE7C6C6, 0xEDD4D4},    // DayOfWeekHeaderBackground
+                         new float[] {0f, .55f, .58f, 1f}, 90f),
+
+            new ColorDef(0x874A4A),     // DayOfWeekHeaderForeground
+            new ColorDef(0xC16969),     // SideBarBorder
+
+            new ColorDef(new int[] {0xF5E6E6, 0xEFDADA, 0xE7C6C6, 0xEDD4D4},     // SideBarBackground
+                         new float[] {0f, .55f, .58f, 1f}, 0f),
+
+            new ColorDef(0x000000),     // SideBarForeground
+            new ColorDef(0x874A4A),     // DayHeaderBorder
+
+            new ColorDef(new int[] {0xF5E6E6, 0xEFDADA, 0xE7C6C6, 0xEDD4D4},    // DayHeaderBackground
+                         new float[] {0f, .55f, .58f, 1f}, 90f),
+
+            new ColorDef(0x000000),     // DayHeaderForeground
+            new ColorDef(0xC16969),     // DayContentBorder
+            new ColorDef(0xF6E8E8),     // DayContentSelectionBackground
+            new ColorDef(0xFFFFFF),     // DayContentActiveDayBackground
+            new ColorDef(0xDDACAC),     // DayContentInactiveDayBackground
+
+            new ColorDef(0xC16969),     // OwnerTabBorder
+
+            new ColorDef(new int[] {0xE5BFBF, 0xD39696},    // OwnerTabBackground
+                         new float[] {0f, 1f}, 90f),
+
+            new ColorDef(0x000000),     // OwnerTabForeground
+            new ColorDef(0xD39696),     // OwnerTabContentBackground
+            new ColorDef(0x000000),     // OwnerTabSelectedForeground
+            new ColorDef(0xFFFFFF),     // OwnerTabSelectionBackground
+
+            new ColorDef(0xEB8900),     // NowDayViewBorder
+            new ColorDef(0x000000),     // NowDayHeaderForeground - 0x15428B
+
+            new ColorDef(new int[] {0xFFED79, 0xFFD86B, 0xFFBB00, 0xFFEA77},      // NowDayHeaderBackground
+                         new float[] {0f, .55f, .058f, 1f}, 90f),
+       
+            new ColorDef(0x000000),     // ContentLinkForeground - DayHeaderForeground
+            new ColorDef(0xFFFFFF),     // ContentLinkBackground - DayContentActiveBackground
+        };
+
+        #endregion
+
+        #region DarkPeach
+
+        static ColorDef[] _DarkPeach = new ColorDef[]
+        {
+            new ColorDef(0xA98F5D),     // DayOfWeekHeaderBorder
+
+            new ColorDef(new int[] {0xF1EDE4, 0xE9E4D7, 0xDFD5C1, 0xE6E0D1},    // DayOfWeekHeaderBackground
+                         new float[] {0f, .55f, .58f, 1f}, 90f),
+
+            new ColorDef(0x776441),     // DayOfWeekHeaderForeground
+            new ColorDef(0xA98F5D),     // SideBarBorder
+
+            new ColorDef(new int[] {0xF1EDE4, 0xDFD5C1, 0xDFD5C1, 0xE6E0D1},     // SideBarBackground
+                         new float[] {0f, .55f, .58f, 1f}, 0f),
+
+            new ColorDef(0x000000),     // SideBarForeground
+            new ColorDef(0x776441),     // DayHeaderBorder
+
+            new ColorDef(new int[] {0xF1EDE4, 0xE9E4D7, 0xDFD5C1, 0xE6E0D1},    // DayHeaderBackground
+                         new float[] {0f, .55f, .58f, 1f}, 90f),
+
+            new ColorDef(0x000000),     // DayHeaderForeground
+            new ColorDef(0xA98F5D),     // DayContentBorder
+            new ColorDef(0xF2EEE6),     // DayContentSelectionBackground
+            new ColorDef(0xFFFFFF),     // DayContentActiveDayBackground
+            new ColorDef(0xCFC1A5),     // DayContentInactiveDayBackground
+
+            new ColorDef(0xA98F5D),     // OwnerTabBorder
+
+            new ColorDef(new int[] {0xDBCFBA, 0xC3B08D},    // OwnerTabBackground
+                         new float[] {0f, 1f}, 90f),
+
+            new ColorDef(0x000000),     // OwnerTabForeground
+            new ColorDef(0xC3B08D),     // OwnerTabContentBackground
+            new ColorDef(0x000000),     // OwnerTabSelectedForeground
+            new ColorDef(0xFFFFFF),     // OwnerTabSelectionBackground
+
+            new ColorDef(0xEB8900),     // NowDayViewBorder
+            new ColorDef(0x000000),     // NowDayHeaderForeground - 0x15428B
+
+            new ColorDef(new int[] {0xFFED79, 0xFFD86B, 0xFFBB00, 0xFFEA77},      // NowDayHeaderBackground
+                         new float[] {0f, .55f, .058f, 1f}, 90f),
+       
+            new ColorDef(0x000000),     // ContentLinkForeground - DayHeaderForeground
+            new ColorDef(0xFFFFFF),     // ContentLinkBackground - DayContentActiveBackground
+        };
+
+        #endregion
+
+        #region DarkSteel
+
+        static ColorDef[] _DarkSteel = new ColorDef[]
+        {
+            new ColorDef(0x6197B1),     // DayOfWeekHeaderBorder
+
+            new ColorDef(new int[] {0xE5EEF2, 0xD8E5EB, 0xC3D7E1, 0xD2E2E9},    // DayOfWeekHeaderBackground
+                         new float[] {0f, .55f, .58f, 1f}, 90f),
+
+            new ColorDef(0x446A96),     // DayOfWeekHeaderForeground
+            new ColorDef(0x6197B1),     // SideBarBorder
+
+            new ColorDef(new int[] {0xE5EEF2, 0xD8E5EB, 0xC3D7E1, 0xD2E2E9},     // SideBarBackground
+                         new float[] {0f, .55f, .58f, 1f}, 0f),
+
+            new ColorDef(0x000000),     // SideBarForeground
+            new ColorDef(0x446A7C),     // DayHeaderBorder
+
+            new ColorDef(new int[] {0xE5EEF2, 0xD8E5EB, 0xC3D7E1, 0xD2E2E9},    // DayHeaderBackground
+                         new float[] {0f, .55f, .58f, 1f}, 90f),
+
+            new ColorDef(0x000000),     // DayHeaderForeground
+            new ColorDef(0x6197B1),     // DayContentBorder
+            new ColorDef(0xE7EFF3),     // DayContentSelectionBackground
+            new ColorDef(0xFFFFFF),     // DayContentActiveDayBackground
+            new ColorDef(0xA8C5D4),     // DayContentInactiveDayBackground
+
+            new ColorDef(0x6197B1),     // OwnerTabBorder
+
+            new ColorDef(new int[] {0xBCD2DE, 0x90B6C8},    // OwnerTabBackground
+                         new float[] {0f, 1f}, 90f),
+
+            new ColorDef(0x000000),     // OwnerTabForeground
+            new ColorDef(0x90B6C8),     // OwnerTabContentBackground
+            new ColorDef(0x000000),     // OwnerTabSelectedForeground
+            new ColorDef(0xFFFFFF),     // OwnerTabSelectionBackground
+
+            new ColorDef(0xEB8900),     // NowDayViewBorder
+            new ColorDef(0x000000),     // NowDayHeaderForeground - 0x15428B
+
+            new ColorDef(new int[] {0xFFED79, 0xFFD86B, 0xFFBB00, 0xFFEA77},      // NowDayHeaderBackground
+                         new float[] {0f, .55f, .058f, 1f}, 90f),
+       
+            new ColorDef(0x000000),     // ContentLinkForeground - DayHeaderForeground
+            new ColorDef(0xFFFFFF),     // ContentLinkBackground - DayContentActiveBackground
+        };
+
+        #endregion
+
+        #region DarkGreen
+
+        static ColorDef[] _DarkGreen = new ColorDef[]
+        {
+           new ColorDef(0x5AA48C),     // DayOfWeekHeaderBorder
+
+            new ColorDef(new int[] {0xE4F0EC, 0xD7E8E3, 0xC0DDD4, 0xD0E5DF},    // DayOfWeekHeaderBackground
+                         new float[] {0f, .55f, .58f, 1f}, 90f),
+
+            new ColorDef(0x3F7362),     // DayOfWeekHeaderForeground
+            new ColorDef(0x5AA48C),     // SideBarBorder
+
+            new ColorDef(new int[] {0xE4F0EC, 0xD7E8E3, 0xC0DDD4, 0xD0E5DF},     // SideBarBackground
+                         new float[] {0f, .55f, .58f, 1f}, 0f),
+
+            new ColorDef(0x000000),     // SideBarForeground
+            new ColorDef(0x3F7362),     // DayHeaderBorder
+
+            new ColorDef(new int[] {0xE4F0EC, 0xD7E8E3, 0xC0DDD4, 0xD0E5DF},    // DayHeaderBackground
+                         new float[] {0f, .55f, .58f, 1f}, 90f),
+
+            new ColorDef(0x000000),     // DayHeaderForeground
+            new ColorDef(0x5AA48C),     // DayContentBorder
+            new ColorDef(0xE6F1ED),     // DayContentSelectionBackground
+            new ColorDef(0xFFFFFF),     // DayContentActiveDayBackground
+            new ColorDef(0xA4CDBF),     // DayContentInactiveDayBackground
+
+            new ColorDef(0x5AA48C),     // OwnerTabBorder
+
+            new ColorDef(new int[] {0xB9D9CE, 0x8BBFAE},    // OwnerTabBackground
+                         new float[] {0f, 1f}, 90f),
+
+            new ColorDef(0x000000),     // OwnerTabForeground
+            new ColorDef(0x8BBFAE),     // OwnerTabContentBackground
+            new ColorDef(0x000000),     // OwnerTabSelectedForeground
+            new ColorDef(0xFFFFFF),     // OwnerTabSelectionBackground
+
+            new ColorDef(0xEB8900),     // NowDayViewBorder
+            new ColorDef(0x000000),     // NowDayHeaderForeground - 0x15428B
+
+            new ColorDef(new int[] {0xFFED79, 0xFFD86B, 0xFFBB00, 0xFFEA77},      // NowDayHeaderBackground
+                         new float[] {0f, .55f, .058f, 1f}, 90f),
+        
+            new ColorDef(0x000000),     // ContentLinkForeground - DayHeaderForeground
+            new ColorDef(0xFFFFFF),     // ContentLinkBackground - DayContentActiveBackground
+       };
+
+        #endregion
+
+        #region Yellow
+
+        static ColorDef[] _Yellow = new ColorDef[]
+        {
+            new ColorDef(0xFFD151),     // DayOfWeekHeaderBorder
+
+            new ColorDef(new int[] {0xFFF8E2, 0xFFF5D7, 0xFFEDBD, 0xFFF2CE},    // DayOfWeekHeaderBackground
+                         new float[] {0f, .55f, .58f, 1f}, 90f),
+
+            new ColorDef(0x7F6628),     // DayOfWeekHeaderForeground
+            new ColorDef(0xFFD151),     // SideBarBorder
+
+            new ColorDef(new int[] {0xFFF8E2, 0xFFF5D7, 0xFFEDBD, 0xFFF2CE},     // SideBarBackground
+                         new float[] {0f, .55f, .58f, 1f}, 0f),
+
+            new ColorDef(0x7F6628),     // SideBarForeground
+            new ColorDef(0xD3AC40),     // DayHeaderBorder
+
+            new ColorDef(new int[] {0xFFF8E2, 0xFFF5D7, 0xFFEDBD, 0xFFF2CE},    // DayHeaderBackground
+                         new float[] {0f, .55f, .58f, 1f}, 90f),
+
+            new ColorDef(0x000000),     // DayHeaderForeground
+            new ColorDef(0xFFD151),     // DayContentBorder
+            new ColorDef(0xFFF8E4),     // DayContentSelectionBackground
+            new ColorDef(0xFFFFFF),     // DayContentActiveDayBackground
+            new ColorDef(0xFFE69F),     // DayContentInactiveDayBackground
+
+            new ColorDef(0xFFD151),     // OwnerTabBorder
+
+            new ColorDef(new int[] {0xFFEBB6, 0xFFDF86},    // OwnerTabBackground
+                         new float[] {0f, 1f}, 90f),
+
+            new ColorDef(0x000000),     // OwnerTabForeground
+            new ColorDef(0xFFDF86),     // OwnerTabContentBackground
+            new ColorDef(0x000000),     // OwnerTabSelectedForeground
+            new ColorDef(0xFFFFFF),     // OwnerTabSelectionBackground
+
+            new ColorDef(0xEB8900),     // NowDayViewBorder
+            new ColorDef(0x000000),     // NowDayHeaderForeground - 0x15428B
+
+            new ColorDef(new int[] {0xFFED79, 0xFFD86B, 0xFFBB00, 0xFFEA77},      // NowDayHeaderBackground
+                         new float[] {0f, .55f, .058f, 1f}, 90f),
+       
+            new ColorDef(0x000000),     // ContentLinkForeground - DayHeaderForeground
+            new ColorDef(0xFFFFFF),     // ContentLinkBackground - DayContentActiveBackground
+        };
+
+        #endregion
+
+        #endregion
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Color/CalendarViewColor.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Color/CalendarViewColor.cs
new file mode 100644
index 00000000..6aadee11
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Color/CalendarViewColor.cs	
@@ -0,0 +1,73 @@
+#if FRAMEWORK20
+namespace DevComponents.DotNetBar.Schedule
+{
+    #region enum definitions
+
+    #region eCalendarViewPart
+
+    /// <summary>
+    /// View calendar parts enum
+    /// </summary>
+    public enum eCalendarViewPart
+    {
+        OwnerTabBorder,
+        OwnerTabBackground,
+        OwnerTabForeground,
+        OwnerTabContentBackground
+    }
+
+    #endregion
+
+    #region eCalendarColor
+
+    /// <summary>
+    /// Defines available custom calendar color
+    /// </summary>
+    public enum eCalendarColor
+    {
+        Blue,
+        Green,
+        Maroon,
+        Steel,
+        Teal,
+        Purple,
+        Olive,
+        Red,
+        DarkPeach,
+        DarkSteel,
+        DarkGreen,
+        Yellow,
+
+        Automatic
+    }
+
+    #endregion
+
+    #endregion
+
+    public class CalendarViewColor : CalendarColor
+    {
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="eColor">Default color</param>
+        public CalendarViewColor(eCalendarColor eColor)
+            : base(eColor)
+        {
+        }
+
+        #region SetColorTable routine
+
+        /// <summary>
+        /// Sets our current color table to either
+        /// a local or global definition
+        /// </summary>
+        public override void SetColorTable()
+        {
+        }
+
+        #endregion
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Color/CalendarWeekDayColor.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Color/CalendarWeekDayColor.cs
new file mode 100644
index 00000000..135d675a
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Color/CalendarWeekDayColor.cs	
@@ -0,0 +1,667 @@
+#if FRAMEWORK20
+using DevComponents.DotNetBar.Rendering;
+
+namespace DevComponents.DotNetBar.Schedule
+{
+    #region enum definitions
+
+    /// <summary>
+    /// Week/Day calendar parts enum
+    /// </summary>
+    public enum eCalendarWeekDayPart : int
+    {
+        DayViewBorder,
+
+        DayHeaderForeground,
+        DayHeaderBackground,
+        DayHeaderBorder,
+
+        DayWorkHoursBackground,
+        DayAllDayEventBackground,
+        DayOffWorkHoursBackground,
+
+        DayHourBorder,
+        DayHalfHourBorder,
+
+        SelectionBackground,
+
+        OwnerTabBorder,
+        OwnerTabBackground,
+        OwnerTabForeground,
+        OwnerTabContentBackground,
+        OwnerTabSelectedForeground,
+        OwnerTabSelectedBackground,
+
+        CondensedViewBackground,
+
+        NowDayHeaderBorder,
+        NowDayHeaderForeground,
+        NowDayHeaderBackground,
+
+        TimeIndicator,
+        TimeIndicatorBorder
+    }
+
+    #endregion
+
+    public class CalendarWeekDayColor : CalendarColor
+    {
+        #region Private variables
+
+        private ColorDef[][] _LocalColorTable =
+             { _Blue, _Green, _Maroon, _Steel, _Teal, _Purple, _Olive,
+               _Red, _DarkPeach, _DarkSteel, _DarkGreen, _Yellow};
+
+        #endregion
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="eColor">Default color</param>
+        public CalendarWeekDayColor(eCalendarColor eColor)
+            : base(eColor)
+        {
+        }
+
+        #region SetColorTable routine
+
+        /// <summary>
+        /// Sets our current color table to either
+        /// a local or global definition
+        /// </summary>
+        public override void SetColorTable()
+        {
+            if (ColorSch != eCalendarColor.Automatic)
+            {
+                // Use the requested local color table
+
+                ColorTable = _LocalColorTable[(int)ColorSch];
+            }
+            else
+            {
+                // Use the globally set color table
+
+                Office2007Renderer r =
+                    GlobalManager.Renderer as Office2007Renderer;
+
+                ColorTable = (r != null)
+                    ? r.ColorTable.CalendarView.WeekDayViewColors
+                    : _LocalColorTable[(int)eCalendarColor.Blue];
+            }
+        }
+
+        #endregion
+
+        #region Static Color definitions
+
+        // Array of predefined color
+
+        #region Blue
+
+        static ColorDef[] _Blue = new ColorDef[]
+        {
+            new ColorDef(0x5D8CC9),     // DayViewBorder
+            new ColorDef(0x000000),     // DayHeaderForeground - 0x15428B
+
+            new ColorDef(new int[] {0xE4ECF6, 0xD6E2F1, 0xC2D4EB, 0xD0DEEF},    // DayHeaderBackground
+                         new float[] {0f, .55f, .58f, 1f}, 90f),
+
+            new ColorDef(0x8DAED9),     // DayHeaderBorder
+
+            new ColorDef(0xFFFFFF),     // DayWorkHoursBackground
+            new ColorDef(0x8DAED9),     // DayAllDayEventBackground
+            new ColorDef(0xE6EDF7),     // DayOffWorkHoursBackground
+
+            new ColorDef(0xA5BFE1),     // DayHourBorder
+            new ColorDef(0xD5E1F1),     // DayHalfHourBorder
+
+            new ColorDef(0x294C7A),     // SelectionBackground
+
+            new ColorDef(0x5D8CC9),     // OwnerTabBorder
+
+            new ColorDef(new int[] {0xBBCFE9, 0x8DAED9},    // OwnerTabBackground
+                         new float[] {0f, 1f}, 90f),
+
+            new ColorDef(0x000000),     // OwnerTabForeground
+            new ColorDef(0x8DAED9),     // OwnerTabContentBackground
+            new ColorDef(0x000000),     // OwnerTabSelectedForeground
+            new ColorDef(0xFFFFFF),     // OwnerTabSelectionBackground
+
+            new ColorDef(0xF5F5F5),     // CondensedViewBackground
+
+            new ColorDef(0xEB8900),     // NowDayViewBorder
+            new ColorDef(0x000000),     // NowDayHeaderForeground - 0x15428B
+
+            new ColorDef(new int[] {0xFFED79, 0xFFD86B, 0xFFBB00, 0xFFEA77},      // NowDayHeaderBackground
+                         new float[] {0f, .55f, .058f, 1f}, 90f),
+
+            new ColorDef(new int[] {0xFFED79, 0xFFD86B, 0xFFBB00, 0xFFEA77},      // TimeIndicator
+                         new float[] {0f, .55f ,58f, 1f}, 90f),
+
+            new ColorDef(0xEB8900),     // TimeIndicatorBorder
+        };
+
+        #endregion
+
+        #region Green
+
+        static ColorDef[] _Green = new ColorDef[]
+        {
+            new ColorDef(0x72A45A),     // DayViewBorder
+            new ColorDef(0x50734D),     // DayHeaderForeground
+
+            new ColorDef(new int[] {0xE7F0E4, 0xDDE8D7, 0xCADDC0, 0xD8E5D0},    // DayHeaderBackground
+                         new float[] {0f, .55f, .58f, 1f}, 90f),
+
+            new ColorDef(0x72A45A),     // DayHeaderBorder
+
+            new ColorDef(0xFFFFFF),     // DayWorkHoursBackground
+            new ColorDef(0xB1CDA4),     // DayAllDayEventBackground
+            new ColorDef(0xE9F1E6),     // DayOffWorkHoursBackground
+
+            new ColorDef(0xB1CDA4),     // DayHourBorder
+            new ColorDef(0xD6DDD2),     // DayHalfHourBorder
+
+            new ColorDef(0x3F5B32),     // SelectionBackground
+
+            new ColorDef(0x72A45A),     // OwnerTabBorder
+
+            new ColorDef(new int[] {0xC3D9B9, 0x9CBF8B},    // OwnerTabBackground
+                         new float[] {0f, 1f}, 90f),
+
+            new ColorDef(0x000000),     // OwnerTabForeground
+            new ColorDef(0x9CBF8B),     // OwnerTabContentBackground
+            new ColorDef(0x000000),     // OwnerTabSelectedForeground
+            new ColorDef(0xFFFFFF),     // OwnerTabSelectionBackground
+
+            new ColorDef(0xF5F5F5),     // CondensedViewBackground
+
+            new ColorDef(0xEB8900),     // NowDayViewBorder
+            new ColorDef(0x000000),     // NowDayHeaderForeground - 0x15428B
+
+            new ColorDef(new int[] {0xFFED79, 0xFFD86B, 0xFFBB00, 0xFFEA77},      // NowDayHeaderBackground
+                         new float[] {0f, .55f, .058f, 1f}, 90f),
+
+            new ColorDef(new int[] {0xFFED79, 0xFFD86B, 0xFFBB00, 0xFFEA77},      // TimeIndicator
+                         new float[] {0f, .55f ,58f, 1f}, 90f),
+
+            new ColorDef(0xEB8900),     // TimeIndicatorBorder
+        };
+
+        #endregion
+
+        #region Maroon
+
+        static ColorDef[] _Maroon = new ColorDef[]
+        {
+            new ColorDef(0xBE6886),     // DayViewBorder
+            new ColorDef(0x85496B),     // DayHeaderForeground
+
+            new ColorDef(new int[] {0xF4E6EB, 0xEFDAE2, 0xE7C8D3, 0xEDD4DD},    // DayHeaderBackground
+                         new float[] {0f, .55f, .58f, 1f}, 90f),
+
+            new ColorDef(0xBE6886),     // DayHeaderBorder
+
+            new ColorDef(0xFFFFFF),     // DayWorkHoursBackground
+            new ColorDef(0xDBACBC),     // DayAllDayEventBackground
+            new ColorDef(0xF5E8EC),     // DayOffWorkHoursBackground
+
+            new ColorDef(0xDBACBC),     // DayHourBorder
+            new ColorDef(0xE5D3D9),     // DayHalfHourBorder
+
+            new ColorDef(0x693A4A),     // SelectionBackground
+
+            new ColorDef(0xBE6886),     // OwnerTabBorder
+
+            new ColorDef(new int[] {0xE4BFCB, 0xD195AA},    // OwnerTabBackground
+                         new float[] {0f, 1f}, 90f),
+
+            new ColorDef(0x000000),     // OwnerTabForeground
+            new ColorDef(0xD195AA),     // OwnerTabContentBackground
+            new ColorDef(0x000000),     // OwnerTabSelectedForeground
+            new ColorDef(0xFFFFFF),     // OwnerTabSelectionBackground
+
+            new ColorDef(0xF5F5F5),     // CondensedViewBackground
+
+            new ColorDef(0xEB8900),     // NowDayViewBorder
+            new ColorDef(0x000000),     // NowDayHeaderForeground - 0x15428B
+
+            new ColorDef(new int[] {0xFFED79, 0xFFD86B, 0xFFBB00, 0xFFEA77},      // NowDayHeaderBackground
+                         new float[] {0f, .55f, .058f, 1f}, 90f),
+
+            new ColorDef(new int[] {0xFFED79, 0xFFD86B, 0xFFBB00, 0xFFEA77},      // TimeIndicator
+                         new float[] {0f, .55f ,58f, 1f}, 90f),
+
+            new ColorDef(0xEB8900),     // TimeIndicatorBorder
+       };
+
+        #endregion
+
+        #region Steel
+
+        static ColorDef[] _Steel = new ColorDef[]
+        {
+            new ColorDef(0x616A76),     // DayViewBorder
+            new ColorDef(0x616A76),     // DayHeaderForeground
+
+            new ColorDef(new int[] {0xDCDFE2, 0xD3D6DA, 0xB4BAC1, 0xCBCED4},    // DayHeaderBackground
+                         new float[] {0f, .55f, .58f, 1f}, 90f),
+
+            new ColorDef(0x9199A4),     // DayHeaderBorder
+
+            new ColorDef(0xFFFFFF),     // DayWorkHoursBackground
+            new ColorDef(0xC7CBD1),     // DayAllDayEventBackground
+            new ColorDef(0xE8EAEC),     // DayOffWorkHoursBackground
+
+            new ColorDef(0xC7CBD1),     // DayHourBorder
+            new ColorDef(0xDDDDDD),     // DayHalfHourBorder
+
+            new ColorDef(0x4C535C),     // SelectionBackground
+
+            new ColorDef(0x9199A4),     // OwnerTabBorder
+
+            new ColorDef(new int[] {0xCFD2D8, 0xB0B6BE},    // OwnerTabBackground
+                         new float[] {0f, 1f}, 90f),
+
+            new ColorDef(0x000000),     // OwnerTabForeground
+            new ColorDef(0xB0B6BE),     // OwnerTabContentBackground
+            new ColorDef(0x000000),     // OwnerTabSelectedForeground
+            new ColorDef(0xFFFFFF),     // OwnerTabSelectionBackground
+
+            new ColorDef(0xF5F5F5),     // CondensedViewBackground
+
+            new ColorDef(0xEB8900),     // NowDayViewBorder
+            new ColorDef(0x000000),     // NowDayHeaderForeground - 0x15428B
+
+            new ColorDef(new int[] {0xFFED79, 0xFFD86B, 0xFFBB00, 0xFFEA77},      // NowDayHeaderBackground
+                         new float[] {0f, .55f, .058f, 1f}, 90f),
+
+            new ColorDef(new int[] {0xFFED79, 0xFFD86B, 0xFFBB00, 0xFFEA77},      // TimeIndicator
+                         new float[] {0f, .55f ,58f, 1f}, 90f),
+
+            new ColorDef(0xEB8900),     // TimeIndicatorBorder
+        };
+
+        #endregion
+
+        #region Teal
+
+        static ColorDef[] _Teal = new ColorDef[]
+        {
+            new ColorDef(0x5AA4A4),     // DayViewBorder
+            new ColorDef(0x3F7380),     // DayHeaderForeground
+
+            new ColorDef(new int[] {0xE4F0F0, 0xD7E8E8, 0xC0DDDD, 0xD0E5E5},    // DayHeaderBackground
+                         new float[] {0f, .55f, .58f, 1f}, 90f),
+
+            new ColorDef(0x8CBFC0),     // DayHeaderBorder
+
+            new ColorDef(0xFFFFFF),     // DayWorkHoursBackground
+            new ColorDef(0xA4CDCD),     // DayAllDayEventBackground
+            new ColorDef(0xE6F1F1),     // DayOffWorkHoursBackground
+
+            new ColorDef(0xA4CDCD),     // DayHourBorder
+            new ColorDef(0xD2DDDD),     // DayHalfHourBorder
+
+            new ColorDef(0x325B5B),     // SelectionBackground
+
+            new ColorDef(0x5AA4A4),     // OwnerTabBorder
+
+            new ColorDef(new int[] {0xB9D9D9, 0x8CBFC0},    // OwnerTabBackground
+                         new float[] {0f, 1f}, 90f),
+
+            new ColorDef(0x000000),     // OwnerTabForeground
+            new ColorDef(0x8CBFC0),     // OwnerTabContentBackground
+            new ColorDef(0x000000),     // OwnerTabSelectedForeground
+            new ColorDef(0xFFFFFF),     // OwnerTabSelectionBackground
+
+            new ColorDef(0xF5F5F5),     // CondensedViewBackground
+
+            new ColorDef(0xEB8900),     // NowDayViewBorder
+            new ColorDef(0x000000),     // NowDayHeaderForeground - 0x15428B
+
+            new ColorDef(new int[] {0xFFED79, 0xFFD86B, 0xFFBB00, 0xFFEA77},      // NowDayHeaderBackground
+                         new float[] {0f, .55f, .058f, 1f}, 90f),
+
+            new ColorDef(new int[] {0xFFED79, 0xFFD86B, 0xFFBB00, 0xFFEA77},      // TimeIndicator
+                         new float[] {0f, .55f ,58f, 1f}, 90f),
+
+            new ColorDef(0xEB8900),     // TimeIndicatorBorder
+        };
+
+        #endregion
+
+        #region Purple
+
+        static ColorDef[] _Purple = new ColorDef[]
+        {
+            new ColorDef(0x7171CD),     // DayViewBorder
+            new ColorDef(0x4F4F90),     // DayHeaderForeground
+
+            new ColorDef(new int[] {0xE7E7F6, 0xDCDCF2, 0xC9C9EC, 0xD7D7F0},    // DayHeaderBackground
+                         new float[] {0f, .55f, .58f, 1f}, 90f),
+
+            new ColorDef(0x8C8CD7),     // DayHeaderBorder
+
+            new ColorDef(0xFFFFFF),     // DayWorkHoursBackground
+            new ColorDef(0x9B9BDC),     // DayAllDayEventBackground
+            new ColorDef(0xE9E9F7),     // DayOffWorkHoursBackground
+
+            new ColorDef(0x9B9BDC),     // DayHourBorder
+            new ColorDef(0xD5D5E8),     // DayHalfHourBorder
+
+            new ColorDef(0x3E3E71),     // SelectionBackground
+
+            new ColorDef(0x7171CD),     // OwnerTabBorder
+
+            new ColorDef(new int[] {0xC1C1EA, 0x8C8CD7},    // OwnerTabBackground
+                         new float[] {0f, 1f}, 90f),
+
+            new ColorDef(0x000000),     // OwnerTabForeground
+            new ColorDef(0x8C8CD7),     // OwnerTabContentBackground
+            new ColorDef(0x000000),     // OwnerTabSelectedForeground
+            new ColorDef(0xFFFFFF),     // OwnerTabSelectionBackground
+
+            new ColorDef(0xF5F5F5),     // CondensedViewBackground
+
+            new ColorDef(0xEB8900),     // NowDayViewBorder
+            new ColorDef(0x000000),     // NowDayHeaderForeground - 0x15428B
+
+            new ColorDef(new int[] {0xFFED79, 0xFFD86B, 0xFFBB00, 0xFFEA77},      // NowDayHeaderBackground
+                         new float[] {0f, .55f, .058f, 1f}, 90f),
+ 
+            new ColorDef(new int[] {0xFFED79, 0xFFD86B, 0xFFBB00, 0xFFEA77},      // TimeIndicator
+                         new float[] {0f, .55f ,58f, 1f}, 90f),
+
+            new ColorDef(0xEB8900),     // TimeIndicatorBorder
+       };
+
+        #endregion
+
+        #region Olive
+
+        static ColorDef[] _Olive = new ColorDef[]
+        {
+            new ColorDef(0x9D9D57),     // DayViewBorder
+            new ColorDef(0x6E6E3D),     // DayHeaderForeground
+
+            new ColorDef(new int[] {0xEFEFE3, 0xE8E8D8, 0xDADABF, 0xE3E3CF},    // DayHeaderBackground
+                         new float[] {0f, .55f, .58f, 1f}, 90f),
+
+            new ColorDef(0xBABA89),     // DayHeaderBorder
+
+            new ColorDef(0xFFFFFF),     // DayWorkHoursBackground
+            new ColorDef(0xC9C9A2),     // DayAllDayEventBackground
+            new ColorDef(0xF0F0E5),     // DayOffWorkHoursBackground
+
+            new ColorDef(0xC9C9A2),     // DayHourBorder
+            new ColorDef(0xDBDBD0),     // DayHalfHourBorder
+
+            new ColorDef(0x575730),     // SelectionBackground
+
+            new ColorDef(0x9D9D57),     // OwnerTabBorder
+
+            new ColorDef(new int[] {0xD5D5B8, 0xBABA89},    // OwnerTabBackground
+                         new float[] {0f, 1f}, 90f),
+
+            new ColorDef(0x000000),     // OwnerTabForeground
+            new ColorDef(0xBABA89),     // OwnerTabContentBackground
+            new ColorDef(0x000000),     // OwnerTabSelectedForeground
+            new ColorDef(0xFFFFFF),     // OwnerTabSelectionBackground
+
+            new ColorDef(0xF5F5F5),     // CondensedViewBackground
+
+            new ColorDef(0xEB8900),     // NowDayViewBorder
+            new ColorDef(0x000000),     // NowDayHeaderForeground - 0x15428B
+
+            new ColorDef(new int[] {0xFFED79, 0xFFD86B, 0xFFBB00, 0xFFEA77},      // NowDayHeaderBackground
+                         new float[] {0f, .55f, .058f, 1f}, 90f),
+
+            new ColorDef(new int[] {0xFFED79, 0xFFD86B, 0xFFBB00, 0xFFEA77},      // TimeIndicator
+                         new float[] {0f, .55f ,58f, 1f}, 90f),
+
+            new ColorDef(0xEB8900),     // TimeIndicatorBorder
+       };
+
+        #endregion
+
+        #region Red
+
+        static ColorDef[] _Red = new ColorDef[]
+        {
+            new ColorDef(0xC16969),     // DayViewBorder
+            new ColorDef(0x874A4A),     // DayHeaderForeground
+
+            new ColorDef(new int[] {0xF5E6E6, 0xEFDADA, 0xE7C6C6, 0xEDD4D4},    // DayHeaderBackground
+                         new float[] {0f, .55f, .58f, 1f}, 90f),
+
+            new ColorDef(0xD39696),     // DayHeaderBorder
+
+            new ColorDef(0xFFFFFF),     // DayWorkHoursBackground
+            new ColorDef(0xDDACAC),     // DayAllDayEventBackground
+            new ColorDef(0xF6E8E8),     // DayOffWorkHoursBackground
+
+            new ColorDef(0xDDACAC),     // DayHourBorder
+            new ColorDef(0xE8D7D7),     // DayHalfHourBorder
+
+            new ColorDef(0x6B3A3A),     // SelectionBackground
+
+            new ColorDef(0xC16969),     // OwnerTabBorder
+
+            new ColorDef(new int[] {0xE5BFBF, 0xD39696},    // OwnerTabBackground
+                         new float[] {0f, 1f}, 90f),
+
+            new ColorDef(0x000000),     // OwnerTabForeground
+            new ColorDef(0xD39696),     // OwnerTabContentBackground
+            new ColorDef(0x000000),     // OwnerTabSelectedForeground
+            new ColorDef(0xFFFFFF),     // OwnerTabSelectionBackground
+
+            new ColorDef(0xF5F5F5),     // CondensedViewBackground
+
+            new ColorDef(0xEB8900),     // NowDayViewBorder
+            new ColorDef(0x000000),     // NowDayHeaderForeground - 0x15428B
+
+            new ColorDef(new int[] {0xFFED79, 0xFFD86B, 0xFFBB00, 0xFFEA77},      // NowDayHeaderBackground
+                         new float[] {0f, .55f, .058f, 1f}, 90f),
+
+            new ColorDef(new int[] {0xFFED79, 0xFFD86B, 0xFFBB00, 0xFFEA77},      // TimeIndicator
+                         new float[] {0f, .55f ,58f, 1f}, 90f),
+
+            new ColorDef(0xEB8900),     // TimeIndicatorBorder
+        };
+
+        #endregion
+
+        #region DarkPeach
+
+        static ColorDef[] _DarkPeach = new ColorDef[]
+        {
+            new ColorDef(0xA98F5D),     // DayViewBorder
+            new ColorDef(0x776441),     // DayHeaderForeground
+
+            new ColorDef(new int[] {0xF1EDE4, 0xE9E4D7, 0xDFD5C1, 0xE6E0D1},    // DayHeaderBackground
+                         new float[] {0f, .55f, .58f, 1f}, 90f),
+
+            new ColorDef(0xC3B08D),     // DayHeaderBorder
+
+            new ColorDef(0xFFFFFF),     // DayWorkHoursBackground
+            new ColorDef(0xCFC1A5),     // DayAllDayEventBackground
+            new ColorDef(0xF2EEE6),     // DayOffWorkHoursBackground
+
+            new ColorDef(0xCFC1A5),     // DayHourBorder
+            new ColorDef(0xE0D7C5),     // DayHalfHourBorder
+
+            new ColorDef(0x5D4F33),     // SelectionBackground
+
+            new ColorDef(0xA98F5D),     // OwnerTabBorder
+
+            new ColorDef(new int[] {0xDBCFBA, 0xC3B08D},    // OwnerTabBackground
+                         new float[] {0f, 1f}, 90f),
+
+            new ColorDef(0x000000),     // OwnerTabForeground
+            new ColorDef(0xC3B08D),     // OwnerTabContentBackground
+            new ColorDef(0x000000),     // OwnerTabSelectedForeground
+            new ColorDef(0xFFFFFF),     // OwnerTabSelectionBackground
+
+            new ColorDef(0xF5F5F5),     // CondensedViewBackground
+
+            new ColorDef(0xEB8900),     // NowDayViewBorder
+            new ColorDef(0x000000),     // NowDayHeaderForeground - 0x15428B
+
+            new ColorDef(new int[] {0xFFED79, 0xFFD86B, 0xFFBB00, 0xFFEA77},      // NowDayHeaderBackground
+                         new float[] {0f, .55f, .058f, 1f}, 90f),
+ 
+            new ColorDef(new int[] {0xFFED79, 0xFFD86B, 0xFFBB00, 0xFFEA77},      // TimeIndicator
+                         new float[] {0f, .55f ,58f, 1f}, 90f),
+
+            new ColorDef(0xEB8900),     // TimeIndicatorBorder
+       };
+
+        #endregion
+
+        #region DarkSteel
+
+        static ColorDef[] _DarkSteel = new ColorDef[]
+        {
+            new ColorDef(0x6197B1),     // DayViewBorder
+            new ColorDef(0x446A96),     // DayHeaderForeground
+
+            new ColorDef(new int[] {0xE5EEF2, 0xD8E5EB, 0xC3D7E1, 0xD2E2E9},    // DayHeaderBackground
+                         new float[] {0f, .55f, .58f, 1f}, 90f),
+
+            new ColorDef(0x90B6C8),     // DayHeaderBorder
+
+            new ColorDef(0xFFFFFF),     // DayWorkHoursBackground
+            new ColorDef(0xA8C5D4),     // DayAllDayEventBackground
+            new ColorDef(0xE7EFF3),     // DayOffWorkHoursBackground
+
+            new ColorDef(0xA8C5D4),     // DayHourBorder
+            new ColorDef(0xDCE5E3),     // DayHalfHourBorder
+
+            new ColorDef(0x365362),     // SelectionBackground
+
+            new ColorDef(0x6197B1),     // OwnerTabBorder
+
+            new ColorDef(new int[] {0xBCD2DE, 0x90B6C8},    // OwnerTabBackground
+                         new float[] {0f, 1f}, 90f),
+
+            new ColorDef(0x000000),     // OwnerTabForeground
+            new ColorDef(0x90B6C8),     // OwnerTabContentBackground
+            new ColorDef(0x000000),     // OwnerTabSelectedForeground
+            new ColorDef(0xFFFFFF),     // OwnerTabSelectionBackground
+
+            new ColorDef(0xF5F5F5),     // CondensedViewBackground
+
+            new ColorDef(0xEB8900),     // NowDayViewBorder
+            new ColorDef(0x000000),     // NowDayHeaderForeground - 0x15428B
+
+            new ColorDef(new int[] {0xFFED79, 0xFFD86B, 0xFFBB00, 0xFFEA77},      // NowDayHeaderBackground
+                         new float[] {0f, .55f, .058f, 1f}, 90f),
+ 
+            new ColorDef(new int[] {0xFFED79, 0xFFD86B, 0xFFBB00, 0xFFEA77},      // TimeIndicator
+                         new float[] {0f, .55f ,58f, 1f}, 90f),
+
+            new ColorDef(0xEB8900),     // TimeIndicatorBorder
+       };
+
+        #endregion
+
+        #region DarkGreen
+
+        static ColorDef[] _DarkGreen = new ColorDef[]
+        {
+            new ColorDef(0x5AA48C),     // DayViewBorder
+            new ColorDef(0x3F7362),     // DayHeaderForeground
+
+            new ColorDef(new int[] {0xE4F0EC, 0xD7E8E3, 0xC0DDD4, 0xD0E5DF},    // DayHeaderBackground
+                         new float[] {0f, .55f, .58f, 1f}, 90f),
+
+            new ColorDef(0x8BBFAE),     // DayHeaderBorder
+
+            new ColorDef(0xFFFFFF),     // DayWorkHoursBackground
+            new ColorDef(0xA4CDBF),     // DayAllDayEventBackground
+            new ColorDef(0xE6F1ED),     // DayOffWorkHoursBackground
+
+            new ColorDef(0xA4CDBF),     // DayHourBorder
+            new ColorDef(0xD0DDD9),     // DayHalfHourBorder
+
+            new ColorDef(0x325B4D),     // SelectionBackground
+
+            new ColorDef(0x5AA48C),     // OwnerTabBorder
+
+            new ColorDef(new int[] {0xB9D9CE, 0x8BBFAE},    // OwnerTabBackground
+                         new float[] {0f, 1f}, 90f),
+
+            new ColorDef(0x000000),     // OwnerTabForeground
+            new ColorDef(0x8BBFAE),     // OwnerTabContentBackground
+            new ColorDef(0x000000),     // OwnerTabSelectedForeground
+            new ColorDef(0xFFFFFF),     // OwnerTabSelectionBackground
+
+            new ColorDef(0xF5F5F5),     // CondensedViewBackground
+
+            new ColorDef(0xEB8900),     // NowDayViewBorder
+            new ColorDef(0x000000),     // NowDayHeaderForeground - 0x15428B
+
+            new ColorDef(new int[] {0xFFED79, 0xFFD86B, 0xFFBB00, 0xFFEA77},      // NowDayHeaderBackground
+                         new float[] {0f, .55f, .058f, 1f}, 90f),
+
+            new ColorDef(new int[] {0xFFED79, 0xFFD86B, 0xFFBB00, 0xFFEA77},      // TimeIndicator
+                         new float[] {0f, .55f ,58f, 1f}, 90f),
+
+            new ColorDef(0xEB8900),     // TimeIndicatorBorder
+        };
+
+        #endregion
+
+        #region Yellow
+
+        static ColorDef[] _Yellow = new ColorDef[]
+        {
+            new ColorDef(0xFFD151),     // DayViewBorder
+            new ColorDef(0x7F6628),     // DayHeaderForeground
+
+            new ColorDef(new int[] {0xFFF8E2, 0xFFF5D7, 0xFFEDBD, 0xFFF2CE},    // DayHeaderBackground
+                         new float[] {0f, .55f, .58f, 1f}, 90f),
+
+            new ColorDef(0xFFDF86),     // DayHeaderBorder
+
+            new ColorDef(0xFFFFFF),     // DayWorkHoursBackground
+            new ColorDef(0xFFE69F),     // DayAllDayEventBackground
+            new ColorDef(0xFFF8E4),     // DayOffWorkHoursBackground
+
+            new ColorDef(0xFFE69F),     // DayHourBorder
+            new ColorDef(0xFFE69F),     // DayHalfHourBorder
+
+            new ColorDef(0xB39540),     // SelectionBackground
+
+            new ColorDef(0xFFD151),     // OwnerTabBorder
+
+            new ColorDef(new int[] {0xFFEBB6, 0xFFDF86},    // OwnerTabBackground
+                         new float[] {0f, 1f}, 90f),
+
+            new ColorDef(0x000000),     // OwnerTabForeground
+            new ColorDef(0xFFDF86),     // OwnerTabContentBackground
+            new ColorDef(0x000000),     // OwnerTabSelectedForeground
+            new ColorDef(0xFFFFFF),     // OwnerTabSelectionBackground
+
+            new ColorDef(0xF5F5F5),     // CondensedViewBackground
+
+            new ColorDef(0xEB8900),     // NowDayViewBorder
+            new ColorDef(0x000000),     // NowDayHeaderForeground - 0x15428B
+
+            new ColorDef(new int[] {0xFFED79, 0xFFD86B, 0xFFBB00, 0xFFEA77},      // NowDayHeaderBackground
+                         new float[] {0f, .55f, .058f, 1f}, 90f),
+
+            new ColorDef(new int[] {0xFFED79, 0xFFD86B, 0xFFBB00, 0xFFEA77},      // TimeIndicator
+                         new float[] {0f, .55f ,58f, 1f}, 90f),
+
+            new ColorDef(0xEB8900),     // TimeIndicatorBorder
+        };
+
+        #endregion
+
+        #endregion
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Color/TimeRulerColor.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Color/TimeRulerColor.cs
new file mode 100644
index 00000000..4f9a780d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Color/TimeRulerColor.cs	
@@ -0,0 +1,54 @@
+#if FRAMEWORK20
+using DevComponents.DotNetBar.Rendering;
+
+namespace DevComponents.DotNetBar.Schedule
+{
+    #region enum definitions
+
+    /// <summary>
+    /// Week/Day calendar parts enum
+    /// </summary>
+    public enum eTimeRulerPart : int
+    {
+        TimeRulerBackground,
+        TimeRulerForeground,
+        TimeRulerBorder,
+        TimeRulerTickBorder,
+
+        TimeRulerIndicator,
+        TimeRulerIndicatorBorder
+    }
+
+    #endregion
+
+    public class TimeRulerColor : CalendarColor
+    {
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        public TimeRulerColor()
+            : base(eCalendarColor.Automatic)
+        {
+        }
+
+        #region SetColorTable routine
+
+        /// <summary>
+        /// Sets our current color table to either
+        /// a local or global definition
+        /// </summary>
+        public override void SetColorTable()
+        {
+            // Use the globally set color table
+
+            Office2007Renderer r =
+                GlobalManager.Renderer as Office2007Renderer;
+
+            if (r != null)
+                ColorTable = r.ColorTable.CalendarView.TimeRulerColors;
+        }
+
+        #endregion
+    }
+}
+#endif
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/CustomCalendarItem.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/CustomCalendarItem.cs
new file mode 100644
index 00000000..6a895d9f
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/CustomCalendarItem.cs	
@@ -0,0 +1,480 @@
+#if FRAMEWORK20
+using System;
+using System.Windows.Forms;
+using DevComponents.Schedule.Model;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar.Schedule
+{
+    public class CustomCalendarItem : CalendarItem
+    {
+        #region Events
+
+        /// <summary>
+        /// Occurs when the OwnerKey has changed
+        /// </summary>
+        [Description("Occurs when the OwnerKey has changed.")]
+        public event EventHandler<EventArgs> OwnerKeyChanged;
+
+        /// <summary>
+        /// Occurs when Locked has changed
+        /// </summary>
+        [Description("Occurs when the Locked property has changed.")]
+        public event EventHandler<EventArgs> LockedChanged;
+
+        #endregion
+
+        #region Private variables
+
+        private string _OwnerKey = "";      // OwnerKey
+        private bool _Locked;               // Locked state
+
+        private CustomCalendarItem _BaseCalendarItem;       // Base CalendarItem
+        private CalendarView _CalendarView;
+
+        #endregion
+
+        #region Public properties
+
+        #region CollateId
+
+        /// <summary>
+        /// Gets or sets the CollateId used for TimeLine row collation.
+        /// </summary>
+        public override int CollateId
+        {
+            get
+            {
+                if (_BaseCalendarItem != null)
+                    return (_BaseCalendarItem.CollateId);
+
+                return (base.CollateId);
+            }
+
+            set
+            {
+                if (_BaseCalendarItem != null)
+                    _BaseCalendarItem.CollateId = value;
+
+                base.CollateId = value;
+            }
+        }
+
+        #endregion
+
+        #region OwnerKey
+
+        /// <summary>
+        /// Gets and sets the item OwnerKey
+        /// </summary>
+        public string OwnerKey
+        {
+            get
+            {
+                if (_BaseCalendarItem != null)
+                    return (_BaseCalendarItem.OwnerKey);
+                
+                return (_OwnerKey);
+            }
+
+            set
+            {
+                if (_BaseCalendarItem != null)
+                {
+                    _BaseCalendarItem.OwnerKey = value;
+                }
+                else
+                {
+                    if (value == null)
+                        value = "";
+
+                    if (_OwnerKey.Equals(value) == false)
+                    {
+                        string oldValue = _OwnerKey;
+                        _OwnerKey = value;
+
+                        OnOwnerKeyChanged(oldValue, value);
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Sends ChangedEvent for the OwnerKey property
+        /// </summary>
+        /// <param name="oldValue">Old OwnerKey</param>
+        /// <param name="newValue">New OwnerKey</param>
+        protected virtual void OnOwnerKeyChanged(string oldValue, string newValue)
+        {
+            if (OwnerKeyChanged != null)
+                OwnerKeyChanged(this, new OwnerKeyChangedEventArgs(oldValue, newValue));
+        }
+
+        #endregion
+
+        #region Locked
+
+        /// <summary>
+        /// Gets and set whether modification is enabled
+        /// through the user interface"
+        /// </summary>
+        public bool Locked
+        {
+            get
+            {
+                if (_BaseCalendarItem != null)
+                    return (_BaseCalendarItem.Locked);
+
+                return (_Locked);
+            }
+
+            set
+            {
+                if (_BaseCalendarItem != null)
+                {
+                    _BaseCalendarItem.Locked = value;
+                }
+                else
+                {
+                    if (_Locked != value)
+                    {
+                        bool oldValue = _Locked;
+                        _Locked = value;
+
+                        OnLockedChanged(oldValue, value);
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Sends ChangedEvent for the Locked property
+        /// </summary>
+        /// <param name="oldValue">Old OwnerKey</param>
+        /// <param name="newValue">New OwnerKey</param>
+        protected virtual void OnLockedChanged(bool oldValue, bool newValue)
+        {
+            if (LockedChanged != null)
+                LockedChanged(this, new LockedChangedEventArgs(oldValue, newValue));
+        }
+
+        #endregion
+
+        #region StartTime
+
+        public override DateTime StartTime
+        {
+            get
+            {
+                if (_BaseCalendarItem != null)
+                    return (_BaseCalendarItem.StartTime);
+
+                return (base.StartTime);
+            }
+
+            set
+            {
+                if (_BaseCalendarItem != null)
+                    _BaseCalendarItem.StartTime = value;
+
+                base.StartTime = value;
+            }
+        }
+
+        #endregion
+
+        #region EndTime
+
+        public override DateTime EndTime
+        {
+            get
+            {
+                if (_BaseCalendarItem != null)
+                    return (_BaseCalendarItem.EndTime);
+
+                return (base.EndTime);
+            }
+
+            set
+            {
+                if (_BaseCalendarItem != null)
+                    _BaseCalendarItem.EndTime = value;
+
+                base.EndTime = value;
+            }
+        }
+
+        #endregion
+
+        #region BaseCalendarItem
+
+        /// <summary>
+        /// Base CalendarItem
+        /// 
+        /// This property holds the base CalendarItem from which
+        /// each displayed CustomItem (of this type) is based.
+        /// 
+        /// In order to keep all displayed items "in-sync", it is necessary
+        /// to propagate data to and from the base CalendarItem.  This is
+        /// accomplished via hooking those members you are interested in, at
+        /// both the item (HookEvents) and BaseCalendarItem (HookBaseEvents)
+        /// level.
+        /// 
+        /// </summary>
+        public virtual CustomCalendarItem BaseCalendarItem
+        {
+            get { return (_BaseCalendarItem); }
+            set { _BaseCalendarItem = value; }
+        }
+
+        #endregion
+
+        #region IsMultiDayOrAllDayEvent
+
+        public bool IsMultiDayOrAllDayEvent
+        {
+            get
+            {
+                return (StartTime < EndTime &&
+                    (EndTime.Subtract(StartTime).TotalDays >= 1 ||
+                    DateTimeHelper.IsSameDay(StartTime, EndTime) == false));
+            }
+        }
+
+        #endregion
+
+        #region CategoryColor
+
+        /// <summary>
+        /// Gets or sets the category color used for TimeLine CondensedView markers.
+        /// Use static members on Appointment class to assign the category color for example Appointment.CategoryRed.
+        /// </summary>
+        public override string CategoryColor
+        {
+            get
+            {
+                if (_BaseCalendarItem != null)
+                    return (_BaseCalendarItem.CategoryColor);
+
+                return (base.CategoryColor);
+            }
+
+            set
+            {
+                if (_BaseCalendarItem != null)
+                    _BaseCalendarItem.CategoryColor = value;
+
+                base.CategoryColor = value;
+            }
+        }
+
+        #endregion
+
+        #region IsSelected
+
+        /// <summary>
+        /// Gets or sets whether the item is selected.
+        /// </summary>
+        public override bool IsSelected
+        {
+            get
+            {
+                if (_BaseCalendarItem != null)
+                    return (_BaseCalendarItem.IsSelected);
+
+                return (base.IsSelected);
+            }
+
+            set
+            {
+                if (_BaseCalendarItem != null)
+                    _BaseCalendarItem.IsSelected = value;
+
+                base.IsSelected = value;
+            }
+        }
+
+        #endregion
+
+        #region Visible
+
+        /// <summary>
+        /// Gets and sets the item Visibility
+        /// </summary>
+        public override bool Visible
+        {
+            get
+            {
+                if (_BaseCalendarItem != null)
+                    return (_BaseCalendarItem.Visible);
+
+                return (base.Visible);
+            }
+
+            set
+            {
+                if (_BaseCalendarItem != null)
+                {
+                    _BaseCalendarItem.Visible = value;
+                }
+                else
+                {
+                    if (_BaseCalendarItem != null)
+                        _BaseCalendarItem.Visible = value;
+
+                    base.Visible = value;
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region CalendarView
+
+        internal CalendarView CalendarView
+        {
+            get { return (_CalendarView); }
+            set { _CalendarView = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Refresh
+
+        public override void Refresh()
+        {
+            if (_CalendarView != null)
+            {
+                Control c = (Control)_CalendarView.GetContainerControl();
+
+                if (c != null)
+                {
+                    foreach (BaseItem item in _CalendarView.CalendarPanel.SubItems)
+                    {
+                        BaseView view = item as BaseView;
+
+                        if (view != null)
+                            RefreshItems(c, view.SubItems);
+                    }
+                }
+            }
+        }
+
+        private void RefreshItems(Control c, SubItemsCollection subItems)
+        {
+            foreach (BaseItem item in subItems)
+            {
+                CustomCalendarItem ci = item as CustomCalendarItem;
+
+                if (ci != null)
+                {
+                    if (ci == this || ci.BaseCalendarItem == this)
+                        ci.Invalidate(c);
+                }
+                else if (item is AllDayPanel)
+                {
+                    RefreshItems(c, item.SubItems);
+                }
+            }
+        }
+    
+        #endregion
+
+        #region Paint
+
+        public override void Paint(ItemPaintArgs e)
+        {
+        }
+
+        #endregion
+
+        #region Copy
+
+        /// <summary>
+        /// Returns copy of the item.
+        /// </summary>
+        public override BaseItem Copy()
+        {
+            CustomCalendarItem objCopy = new CustomCalendarItem();
+            CopyToItem(objCopy);
+
+            return (objCopy);
+        }
+
+        /// <summary>
+        /// Copies the CustomCalendarItem specific properties to new instance of the item.
+        /// </summary>
+        /// <param name="copy">New CustomCalendarItem instance</param>
+        protected override void CopyToItem(BaseItem copy)
+        {
+            CustomCalendarItem objCopy = copy as CustomCalendarItem;
+
+            if (objCopy != null)
+            {
+                base.CopyToItem(objCopy);
+
+                objCopy._OwnerKey = this._OwnerKey;
+                objCopy._Locked = this.Locked;
+                objCopy._CalendarView = this.CalendarView;
+            }
+        }
+
+        #endregion
+    }
+
+    #region OwnerKeyChangedEventArgs
+
+    /// <summary>
+    /// OwnerKeyChangedEventArgs
+    /// </summary>
+    /// 
+    public class OwnerKeyChangedEventArgs : ValueChangedEventArgs<string, string>
+    {
+        public OwnerKeyChangedEventArgs(string oldValue, string newValue)
+            : base(oldValue, newValue)
+        {
+        }
+    }
+
+    #endregion
+
+    #region LockedChangedEventArgs
+
+    /// <summary>
+    /// LockedChangedEventArgs
+    /// </summary>
+    /// 
+    public class LockedChangedEventArgs : ValueChangedEventArgs<bool, bool>
+    {
+        public LockedChangedEventArgs(bool oldValue, bool newValue)
+            : base(oldValue, newValue)
+        {
+        }
+    }
+
+    #endregion
+
+    #region CategoryColorChangedEventArgs
+
+    /// <summary>
+    /// CategoryColorChangedEventArgs
+    /// </summary>
+    /// 
+    public class CategoryColorChangedEventArgs : ValueChangedEventArgs<string, string>
+    {
+        public CategoryColorChangedEventArgs(string oldValue, string newValue)
+            : base(oldValue, newValue)
+        {
+        }
+    }
+
+    #endregion
+
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/CustomCalendarItemCollection.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/CustomCalendarItemCollection.cs
new file mode 100644
index 00000000..1be60e38
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/CustomCalendarItemCollection.cs	
@@ -0,0 +1,288 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar.Schedule
+{
+    public class CustomCalendarItemCollection : Collection<CustomCalendarItem>, IDisposable
+    {
+        #region Events
+
+        /// <summary>
+        /// Occurs when the collection has changed
+        /// </summary>
+        [Description("Occurs when the collection has changed.")]
+        public event EventHandler<EventArgs> CollectionChanged;
+
+        #endregion
+
+        #region Private variables
+
+        private int _UpdateCount;
+
+        #endregion
+
+        #region AddRange
+
+        /// <summary>
+        /// Adds a range of CustomCalendarItems to the collection
+        /// </summary>
+        /// <param name="items">Array of items to add</param>
+        public void AddRange(CustomCalendarItem[] items)
+        {
+            for (int i = 0; i < items.Length; i++)
+                Add(items[i]);
+
+            OnCollectionChanged();
+        }
+
+        #endregion
+
+        #region Remove
+
+        /// <summary>
+        /// Removes a CustomCalendarItem from
+        /// the collection.
+        /// </summary>
+        /// <param name="item">Item to remove</param>
+        public new void Remove(CustomCalendarItem item)
+        {
+            if (item.BaseCalendarItem != null)
+                item = item.BaseCalendarItem;
+
+            base.Remove(item);
+        }
+
+        #endregion
+
+        #region RemoveItem
+
+        /// <summary>
+        /// Processes list RemoveItem calls
+        /// </summary>
+        /// <param name="index">Index to remove</param>
+        protected override void RemoveItem(int index)
+        {
+            HookItem(Items[index], false);
+
+            base.RemoveItem(index);
+
+            OnCollectionChanged();
+        }
+
+        #endregion
+
+        #region InsertItem
+
+        /// <summary>
+        /// Processes list InsertItem calls
+        /// </summary>
+        /// <param name="index">Index to add</param>
+        /// <param name="item">CustomCalendarItem to add</param>
+        protected override void InsertItem(int index, CustomCalendarItem item)
+        {
+            if (item != null)
+            {
+                HookItem(item, true);
+
+                base.InsertItem(index, item);
+
+                OnCollectionChanged();
+            }
+        }
+
+        #endregion
+
+        #region SetItem
+
+        /// <summary>
+        /// Processes list SetItem calls (e.g. replace)
+        /// </summary>
+        /// <param name="index">Index to replace</param>
+        /// <param name="newItem">CustomCalendarItem to replace</param>
+        protected override void SetItem(int index, CustomCalendarItem newItem)
+        {
+            if (newItem != null)
+            {
+                HookItem(Items[index], false);
+                HookItem(newItem, true);
+
+                base.SetItem(index, newItem);
+
+                OnCollectionChanged();
+            }
+        }
+
+        #endregion
+
+        #region ClearItems
+
+        /// <summary>
+        /// Processes list Clear calls (e.g. remove all)
+        /// </summary>
+        protected override void ClearItems()
+        {
+            for (int i = 0; i < Count; i++)
+                HookItem(Items[i], false);
+
+            base.ClearItems();
+
+            OnCollectionChanged();
+        }
+
+        #endregion
+
+        #region HookItem
+
+        /// <summary>
+        /// Hooks needed system events
+        /// </summary>
+        /// <param name="item"></param>
+        /// <param name="hook"></param>
+        private void HookItem(CustomCalendarItem item, bool hook)
+        {
+            if (hook == true)
+            {
+                item.StartTimeChanged += ItemStartTimeChanged;
+                item.EndTimeChanged += ItemEndTimeChanged;
+                item.OwnerKeyChanged += ItemOwnerKeyChanged;
+                item.CategoryColorChanged += ItemCategoryColorChanged;
+                item.VisibleChanged += ItemVisibleChanged;
+                item.CollateIdChanged += ItemCollateIdChanged;
+            }
+            else
+            {
+                item.StartTimeChanged -= ItemStartTimeChanged;
+                item.EndTimeChanged -= ItemEndTimeChanged;
+                item.OwnerKeyChanged -= ItemOwnerKeyChanged;
+                item.CategoryColorChanged -= ItemCategoryColorChanged;
+                item.VisibleChanged -= ItemVisibleChanged;
+                item.CollateIdChanged -= ItemCollateIdChanged;
+            }
+        }
+
+        #endregion
+
+        #region Event processing
+
+        /// <summary>
+        /// Processes OwnerKeyChanged events
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ItemOwnerKeyChanged(object sender, EventArgs e)
+        {
+            OnCollectionChanged();
+        }
+
+        /// <summary>
+        /// Processes StartTimeChanged events
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ItemStartTimeChanged(object sender, EventArgs e)
+        {
+            OnCollectionChanged();
+        }
+
+        /// <summary>
+        /// Processes EndTimeChanged events
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ItemEndTimeChanged(object sender, EventArgs e)
+        {
+            OnCollectionChanged();
+        }
+
+        /// <summary>
+        /// Processes ItemCategoryColorChanged events
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void ItemCategoryColorChanged(object sender, EventArgs e)
+        {
+            OnCollectionChanged();
+        }
+
+        /// <summary>
+        /// Processes ItemVisibleChanged events
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void ItemVisibleChanged(object sender, EventArgs e)
+        {
+            OnCollectionChanged();
+        }
+
+        /// <summary>
+        /// Processes ItemCollateIdChanged events
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void ItemCollateIdChanged(object sender, EventArgs e)
+        {
+            OnCollectionChanged();
+        }
+
+        #endregion
+
+        #region OnCollectionChanged
+
+        /// <summary>
+        /// Propagates CollectionChanged events
+        /// </summary>
+        protected virtual void OnCollectionChanged()
+        {
+            if (_UpdateCount == 0)
+            {
+                if (CollectionChanged != null)
+                    CollectionChanged(this, EventArgs.Empty);
+            }
+        }
+
+        #endregion
+
+        #region Begin/EndUpdate
+
+        /// <summary>
+        /// Begins Update block
+        /// </summary>
+        public void BeginUpdate()
+        {
+            _UpdateCount++;
+        }
+
+        /// <summary>
+        /// Ends update block
+        /// </summary>
+        public void EndUpdate()
+        {
+            if (_UpdateCount == 0)
+            {
+                throw new InvalidOperationException(
+                    "EndUpdate must be called After BeginUpdate");
+            }
+
+            _UpdateCount--;
+
+            if (_UpdateCount == 0)
+                OnCollectionChanged();
+        }
+
+        #endregion
+
+        #region IDisposable
+
+        public void Dispose()
+        {
+            for (int i = 0; i < Count; i++)
+                HookItem(Items[i], false);
+        }
+
+        #endregion
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/DateHelper.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/DateHelper.cs
new file mode 100644
index 00000000..077ebe6f
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/DateHelper.cs	
@@ -0,0 +1,154 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows;
+using System.Globalization;
+
+namespace DevComponents.DotNetBar.Schedule
+{
+    internal static class DateHelper
+    {
+        #region Date/Time Helpers
+
+        /// <summary>
+        /// Returns the date that is 30 minutes before or after input date if input date minute is 0 or 30. Otherwise it returns next increment to 0 or 30.
+        /// </summary>
+        /// <param name="date">Date and time.</param>
+        /// <param name="forward">Indicates whether to add or subtract minutes.</param>
+        /// <returns>New date time.</returns>
+        public static DateTime GetNext30Minute(DateTime date, bool forward)
+        {
+            if (date.Minute == 0 || date.Minute == 30)
+                return (date.AddMinutes(forward ? 30 : -30));
+
+            return (date.AddMinutes((forward ? 1 : -1) * Math.Abs(30 - date.Minute)));
+        }
+
+        /// <summary>
+        /// Returns date that starts with the day. If passed date is not on the requested date function returns first date with day that is before passed date.
+        /// </summary>
+        /// <param name="date">Date to inspect.</param>
+        /// <param name="dayOfWeek">Day of week</param>
+        /// <returns>Date that starts on given day of week.</returns>
+        public static DateTime GetDateForDayOfWeek(DateTime date, DayOfWeek dayOfWeek)
+        {
+            if (date.DayOfWeek != dayOfWeek)
+            {
+                // Go back to the first day of week
+                while (date.DayOfWeek != dayOfWeek)
+                {
+                    date = date.AddDays(-1);
+                }
+            }
+
+            return (date);
+        }
+
+        public static DateTime GetEndOfWeek(DateTime date, DayOfWeek lastDayOfWeek)
+        {
+            while (date.DayOfWeek != lastDayOfWeek)
+                date = date.AddDays(1);
+
+            return (date);
+        }
+
+        internal static DayOfWeek GetFirstDayOfWeek()
+        {
+            return (ScheduleSettings.GetActiveCulture().DateTimeFormat.FirstDayOfWeek);
+        }
+
+        internal static DayOfWeek GetLastDayOfWeek()
+        {
+            DayOfWeek firstDay = GetFirstDayOfWeek();
+
+            int lastDay = (int)firstDay + 6;
+
+            if (lastDay > 6) 
+                lastDay = lastDay - 7;
+
+            return (DayOfWeek)lastDay;
+        }
+
+        /// <summary>
+        /// Returns whether two days fall on same month and year.
+        /// </summary>
+        /// <param name="date1">First date</param>
+        /// <param name="date2">Second date</param>
+        /// <returns>true if dates are on same month and year</returns>
+        public static bool IsSameMonth(DateTime date1, DateTime date2)
+        {
+            return (date1.Year == date2.Year && date1.Month == date2.Month);
+        }
+
+        public static DayOfWeek GetNextDay(DayOfWeek currentDay)
+        {
+            if ((int)currentDay == 6) 
+                return (DayOfWeek)0;
+
+            return (DayOfWeek)(currentDay + 1);
+        }
+
+        /// <summary>
+        /// Returns true if time periods overlap.
+        /// </summary>
+        /// <param name="startTime1">Start of first period.</param>
+        /// <param name="endTime1">End of first period.</param>
+        /// <param name="startTime2">Start of second period.</param>
+        /// <param name="endTime2">End of second period.</param>
+        /// <returns>true if periods overlap</returns>
+        public static bool TimePeriodsOverlap(DateTime startTime1, DateTime endTime1, DateTime startTime2, DateTime endTime2)
+        {
+            return (startTime1 <= startTime2 && endTime1 > startTime2 ||
+                startTime1 >= startTime2 && startTime1 < endTime2);
+        }
+
+        public static int GetNumberOfWeeks(DateTime startDate, DateTime endDate)
+        {
+            if (startDate == DateTime.MinValue && endDate == DateTime.MinValue)
+            {
+                startDate = DateTime.Today.Date;
+                endDate = startDate.AddMonths(1);
+            }
+
+            if (startDate == DateTime.MinValue || endDate == DateTime.MinValue || endDate < startDate)
+            {
+                return (0);
+            }
+
+            endDate = GetEndOfWeek(endDate, DateHelper.GetLastDayOfWeek());
+            startDate = GetDateForDayOfWeek(startDate, DateHelper.GetFirstDayOfWeek());
+
+            return ((int)Math.Max(Math.Ceiling(endDate.Subtract(startDate).TotalDays / 7), 1));
+        }
+
+        /// <summary>
+        /// Gets the abbreviated month name for
+        /// the given date
+        /// </summary>
+        /// <param name="date">Date</param>
+        /// <returns>Abbreviated name</returns>
+        public static string GetThreeLetterMonth(DateTime date)
+        {
+            CultureInfo ci = ScheduleSettings.GetActiveCulture();
+
+            return (ci.DateTimeFormat.GetAbbreviatedMonthName(date.Month));
+        }
+
+        /// <summary>
+        /// Gets the abbreviated day name for
+        /// the given date
+        /// </summary>
+        /// <param name="dayOfWeek">Day of week</param>
+        /// <returns>Abbreviated name</returns>
+        public static string GetThreeLetterDayOfWeek(DayOfWeek dayOfWeek)
+        {
+            CultureInfo ci = ScheduleSettings.GetActiveCulture();
+
+            return (ci.DateTimeFormat.GetAbbreviatedDayName(dayOfWeek));
+        }
+
+        #endregion
+    }
+}
+#endif
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/DateNavigator.Designer.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/DateNavigator.Designer.cs
new file mode 100644
index 00000000..77262545
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/DateNavigator.Designer.cs	
@@ -0,0 +1,94 @@
+#if FRAMEWORK20
+namespace DevComponents.DotNetBar.Schedule
+{
+    partial class DateNavigator
+    {
+        /// <summary> 
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing)
+                CalendarView = null;
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #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.CurrentDateLabel = new LabelX();
+            this.NavigateForward = new DevComponents.DotNetBar.ButtonX();
+            this.NavigateBack = new DevComponents.DotNetBar.ButtonX();
+            this.SuspendLayout();
+            // 
+            // CurrentDateLabel
+            // 
+            this.CurrentDateLabel.AutoSize = true;
+            this.CurrentDateLabel.AutoSize = true;
+            this.CurrentDateLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.CurrentDateLabel.Location = new System.Drawing.Point(54, 4);
+            this.CurrentDateLabel.Name = "CurrentDateLabel";
+            this.CurrentDateLabel.Size = new System.Drawing.Size(132, 20);
+            this.CurrentDateLabel.TabIndex = 1;
+            this.CurrentDateLabel.Text = "October 20, 2009";
+            // 
+            // NavigateForward
+            // 
+            this.NavigateForward.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+            this.NavigateForward.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+            this.NavigateForward.Location = new System.Drawing.Point(31, 4);
+            this.NavigateForward.Name = "NavigateForward";
+            this.NavigateForward.Shape = new DevComponents.DotNetBar.EllipticalShapeDescriptor();
+            this.NavigateForward.Size = new System.Drawing.Size(20, 20);
+            this.NavigateForward.TabIndex = 0;
+            this.NavigateForward.Click += new System.EventHandler(this.NavigateForwardClick);
+            this.NavigateForward.FocusCuesEnabled = false;
+            // 
+            // NavigateBack
+            // 
+            this.NavigateBack.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+            this.NavigateBack.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+            this.NavigateBack.Location = new System.Drawing.Point(5, 4);
+            this.NavigateBack.Name = "NavigateBack";
+            this.NavigateBack.Shape = new DevComponents.DotNetBar.EllipticalShapeDescriptor();
+            this.NavigateBack.Size = new System.Drawing.Size(20, 20);
+            this.NavigateBack.TabIndex = 0;
+            this.NavigateBack.Click += new System.EventHandler(this.NavigateBackClick);
+            this.NavigateBack.FocusCuesEnabled = false;
+            // 
+            // DateNavigator
+            // 
+            this.Controls.Add(this.CurrentDateLabel);
+            this.Controls.Add(this.NavigateForward);
+            this.Controls.Add(this.NavigateBack);
+            this.Name = "DateNavigator";
+            this.Size = new System.Drawing.Size(223, 30);
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private ButtonX NavigateBack;
+        private ButtonX NavigateForward;
+        private LabelX CurrentDateLabel;
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/DateNavigator.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/DateNavigator.cs
new file mode 100644
index 00000000..f2e8c3b7
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/DateNavigator.cs	
@@ -0,0 +1,1713 @@
+#if FRAMEWORK20
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Imaging;
+using DevComponents.DotNetBar.Rendering;
+
+namespace DevComponents.DotNetBar.Schedule
+{
+    /// <summary>
+    /// Represents date-navigation control that is used with CalendarView to provide calendar date navigation.
+    /// </summary>
+    [ToolboxItem(true), ToolboxBitmap(typeof(DateNavigator), "Schedule.DateNavigator.ico")]
+    [Designer("DevComponents.DotNetBar.Design.DateNavigatorDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+    public partial class DateNavigator : PanelEx
+    {
+        #region Events
+
+        /// <summary>
+        /// Occurs when a date Navigation is occurring
+        /// </summary>
+        [Description("Occurs when a date Navigation is occurring.")]
+        public event EventHandler<DateChangingEventArgs> DateChanging;
+
+        /// <summary>
+        /// Occurs when a date Navigation has occurred
+        /// </summary>
+        [Description("Occurs when a date Navigation has occurred.")]
+        public event EventHandler<DateChangedEventArgs> DateChanged;
+
+        /// <summary>
+        /// Occurs when the DateNavigator needs a formatted date label
+        /// </summary>
+        [Description("Occurs when the DateNavigator needs a formatted date label.")]
+        public event EventHandler<GetDateLabelEventArgs> GetDateLabel;
+        
+        #endregion
+
+        #region Constants
+
+        private const int MaxYearMonthSpan = 120;
+
+        #endregion
+
+        #region Private variables
+
+        private CalendarView _CalendarView;
+
+        private string _CurrentDayLabel = "MMMM dd, yyyy";
+
+        private string _CurrentWeekStartLabel = "MMMM dd, yyyy";
+        private string _CurrentWeekEndLabel = "MMMM dd, yyyy";
+        private string _CurrentWeekSameYearStartLabel = "MMMM dd";
+        private string _CurrentWeekSameYearEndLabel = "MMMM dd, yyyy";
+        private string _CurrentWeekSameMonthYearStartLabel = "MMMM dd";
+        private string _CurrentWeekSameMonthYearEndLabel = "dd, yyyy";
+
+        private string _CurrentMonthStartLabel = "MMMM yyyy";
+        private string _CurrentMonthEndLabel = "MMMM yyyy";
+
+        private string _CurrentYearStartLabel = "MMMM yyyy";
+        private string _CurrentYearEndLabel = "MMMM yyyy";
+
+        private string _CurrentTimeLineHourLabel = "MMMM dd, yyyy";
+        private string _CurrentTimeLineDayStartLabel = "MMMM dd, yyyy";
+        private string _CurrentTimeLineDayEndLabel = "MMMM dd, yyyy";
+        private string _CurrentTimeLineDaySameYearStartLabel = "MMMM dd";
+        private string _CurrentTimeLineDaySameYearEndLabel = "MMMM dd, yyyy";
+        private string _CurrentTimeLineDaySameMonthYearStartLabel = "MMMM dd";
+        private string _CurrentTimeLineDaySameMonthYearEndLabel = "dd, yyyy";
+        private string _CurrentTimeLineYearStartLabel = "yyyy";
+        private string _CurrentTimeLineYearEndLabel = "yyyy";
+
+        #endregion
+
+        public DateNavigator()
+        {
+            InitializeComponent();
+            UpdateButtonImages();
+
+            Style.BackColor1.Color =
+                ((Office2007Renderer)GlobalManager.Renderer).ColorTable.CalendarView.TimeRulerColors[0].Colors[0];
+
+            StyleManager.Register(this);
+        }
+
+        #region Public properties
+
+        #region CalendarView
+
+        /// <summary>
+        /// Gets or sets the CalendarView date navigation will be applied to.
+        /// </summary>
+        [DefaultValue(null), Category("Behavior")]
+        [Description("Indicates CalendarView date navigation will be applied to.")]
+        public CalendarView CalendarView
+        {
+            get { return _CalendarView; }
+
+            set
+            {
+                if (_CalendarView != null)
+                {
+                    _CalendarView.SelectedViewChanged -= CalendarSelectedViewChanged;
+                    _CalendarView.ViewDateChanged -= CalendarViewViewDateChanged;
+                    _CalendarView.TimeLineViewScrollDateChanged -= CalendarViewTimeLineViewScrollDateChanged;
+                }
+
+                _CalendarView = value;
+
+                if (_CalendarView != null)
+                {
+                    _CalendarView.SelectedViewChanged += CalendarSelectedViewChanged;
+                    _CalendarView.ViewDateChanged += CalendarViewViewDateChanged;
+                    _CalendarView.TimeLineViewScrollDateChanged += CalendarViewTimeLineViewScrollDateChanged;
+                }
+
+                UpdateDisplay();
+            }
+        }
+
+        /// <summary>
+        /// Handles CalendarView ViewDateChanged events
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void CalendarViewViewDateChanged(object sender, ViewDateChangedEventArgs e)
+        {
+            UpdateDisplay();
+        }
+
+        /// <summary>
+        /// Handle CalendarView SelectedViewChanged events
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void CalendarSelectedViewChanged(object sender, SelectedViewEventArgs e)
+        {
+            UpdateDisplay();
+        }
+
+        /// <summary>
+        /// Handles CalendarView_TimeLineViewScrollDateChanged events
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void CalendarViewTimeLineViewScrollDateChanged(object sender, EventArgs e)
+        {
+            UpdateDisplay();
+        }
+
+        #endregion
+
+        #region CurrentDayLabel
+
+        /// <summary>
+        /// Gets or sets the current Day format label
+        /// </summary>
+        [Localizable(true), DefaultValue("MMMM dd, yyyy"), Category("Appearance")]
+        [Description("Indicates the current Day format label.")]
+        public string CurrentDayLabel
+        {
+            get { return (_CurrentDayLabel); }
+
+            set
+            {
+                if (value == null)
+                    value = "";
+
+                _CurrentDayLabel = value;
+
+                UpdateDisplay();
+            }
+        }
+
+        #endregion
+
+        #region CurrentWeekStartLabel
+
+        /// <summary>
+        /// Gets or sets the current Week, start format label
+        /// </summary>
+        [Localizable(true), DefaultValue("MMMM dd, yyyy"), Category("Appearance")]
+        [Description("Indicates the current Week, start format label.")]
+        public string CurrentWeekStartLabel
+        {
+            get { return (_CurrentWeekStartLabel); }
+
+            set
+            {
+                if (value == null)
+                    value = "";
+
+                _CurrentWeekStartLabel = value;
+
+                UpdateDisplay();
+            }
+        }
+
+        #endregion
+
+        #region CurrentWeekEndLabel
+
+        /// <summary>
+        /// Gets or sets the current Week, end format label
+        /// </summary>
+        [Localizable(true), DefaultValue("MMMM dd, yyyy"), Category("Appearance")]
+        [Description("Indicates the current Week, end format label.")]
+        public string CurrentWeekEndLabel
+        {
+            get { return (_CurrentWeekEndLabel); }
+
+            set
+            {
+                if (value == null)
+                    value = "";
+
+                _CurrentWeekEndLabel = value;
+
+                UpdateDisplay();
+            }
+        }
+
+        #endregion
+
+        #region CurrentWeekSameYearStartLabel
+
+        /// <summary>
+        /// Gets or sets the current Week, same Year, start format label
+        /// </summary>
+        [Localizable(true), DefaultValue("MMMM dd"), Category("Appearance")]
+        [Description("Indicates the current Week, same Year, start format label.")]
+        public string CurrentWeekSameYearStartLabel
+        {
+            get { return (_CurrentWeekSameYearStartLabel); }
+
+            set
+            {
+                if (value == null)
+                    value = "";
+
+                _CurrentWeekSameYearStartLabel = value;
+
+                UpdateDisplay();
+            }
+        }
+
+        #endregion
+
+        #region CurrentWeekSameYearEndLabel
+
+        /// <summary>
+        /// Gets or sets the current Week, same Year, end format label
+        /// </summary>
+        [Localizable(true), DefaultValue("MMMM dd, yyyy"), Category("Appearance")]
+        [Description("Indicates the current Week, same Year, end format label.")]
+        public string CurrentWeekSameYearEndLabel
+        {
+            get { return (_CurrentWeekSameYearEndLabel); }
+
+            set
+            {
+                if (value == null)
+                    value = "";
+
+                _CurrentWeekSameYearEndLabel = value;
+
+                UpdateDisplay();
+            }
+        }
+
+        #endregion
+
+        #region CurrentWeekSameMonthYearStartLabel
+
+        /// <summary>
+        /// Gets or sets the current Week, same Month & Year, start format label
+        /// </summary>
+        [Localizable(true), DefaultValue("MMMM dd"), Category("Appearance")]
+        [Description("Indicates the current Week, same Month & Year, start format label.")]
+        public string CurrentWeekSameMonthYearStartLabel
+        {
+            get { return (_CurrentWeekSameMonthYearStartLabel); }
+
+            set
+            {
+                if (value == null)
+                    value = "";
+
+                _CurrentWeekSameMonthYearStartLabel = value;
+
+                UpdateDisplay();
+            }
+        }
+
+        #endregion
+
+        #region CurrentWeekSameMonthYearEndLabel
+
+        /// <summary>
+        /// Gets or sets the current Week, same Month & Year, end format label
+        /// </summary>
+        [Localizable(true), DefaultValue("dd, yyyy"), Category("Appearance")]
+        [Description("Indicates the current Week, same Month & Year, end format label.")]
+        public string CurrentWeekSameMonthYearEndLabel
+        {
+            get { return (_CurrentWeekSameMonthYearEndLabel); }
+
+            set
+            {
+                if (value == null)
+                    value = "";
+
+                _CurrentWeekSameMonthYearEndLabel = value;
+
+                UpdateDisplay();
+            }
+        }
+
+        #endregion
+
+        #region CurrentMonthStartLabel
+
+        /// <summary>
+        /// Gets or sets the current Month, start format label
+        /// </summary>
+        [Localizable(true), DefaultValue("MMMM yyyy"), Category("Appearance")]
+        [Description("Indicates the current Month, start format label.")]
+        public string CurrentMonthStartLabel
+        {
+            get { return (_CurrentMonthStartLabel); }
+
+            set
+            {
+                if (value == null)
+                    value = "";
+
+                _CurrentMonthStartLabel = value;
+
+                UpdateDisplay();
+            }
+        }
+
+        #endregion
+
+        #region CurrentMonthEndLabel
+
+        /// <summary>
+        /// Gets or sets the current Month, end format label
+        /// </summary>
+        [Localizable(true), DefaultValue("MMMM yyyy"), Category("Appearance")]
+        [Description("Indicates the current Month, end format label.")]
+        public string CurrentMonthEndLabel
+        {
+            get { return (_CurrentMonthEndLabel); }
+
+            set
+            {
+                if (value == null)
+                    value = "";
+
+                _CurrentMonthEndLabel = value;
+
+                UpdateDisplay();
+            }
+        }
+
+        #endregion
+
+        #region CurrentYearStartLabel
+
+        /// <summary>
+        /// Gets or sets the current Year, start format label
+        /// </summary>
+        [Localizable(true), DefaultValue("MMMM yyyy"), Category("Appearance")]
+        [Description("Indicates the current Year, start format label.")]
+        public string CurrentYearStartLabel
+        {
+            get { return (_CurrentYearStartLabel); }
+
+            set
+            {
+                if (value == null)
+                    value = "";
+
+                _CurrentYearStartLabel = value;
+
+                UpdateDisplay();
+            }
+        }
+
+        #endregion
+
+        #region CurrentYearEndLabel
+
+        /// <summary>
+        /// Gets or sets the current Year, end format label
+        /// </summary>
+        [Localizable(true), DefaultValue("MMMM yyyy"), Category("Appearance")]
+        [Description("Indicates the current Year, end format label.")]
+        public string CurrentYearEndLabel
+        {
+            get { return (_CurrentYearEndLabel); }
+
+            set
+            {
+                if (value == null)
+                    value = "";
+
+                _CurrentYearEndLabel = value;
+
+                UpdateDisplay();
+            }
+        }
+
+        #endregion
+
+        #region CurrentTimeLineHourLabel
+
+        /// <summary>
+        /// Gets or sets the current TimeLine Hour format label
+        /// </summary>
+        [Localizable(true), DefaultValue("MMMM dd, yyyy"), Category("Appearance")]
+        [Description("Indicates the current TimeLine Hour format label.")]
+        public string CurrentTimeLineHourLabel
+        {
+            get { return (_CurrentTimeLineHourLabel); }
+
+            set
+            {
+                if (value == null)
+                    value = "";
+
+                _CurrentTimeLineHourLabel = value;
+
+                UpdateDisplay();
+            }
+        }
+
+        #endregion
+
+        #region CurrentTimeLineDayStartLabel
+
+        /// <summary>
+        /// Gets or sets the current TimeLine Day, start format label
+        /// </summary>
+        [Localizable(true), DefaultValue("MMMM dd, yyyy"), Category("Appearance")]
+        [Description("Indicates the current TimeLine Day, start format label.")]
+        public string CurrentTimeLineDayStartLabel
+        {
+            get { return (_CurrentTimeLineDayStartLabel); }
+
+            set
+            {
+                if (value == null)
+                    value = "";
+
+                _CurrentTimeLineDayStartLabel = value;
+
+                UpdateDisplay();
+            }
+        }
+
+        #endregion
+
+        #region CurrentTimeLineDayEndLabel
+
+        /// <summary>
+        /// Gets or sets the current TimeLine Day, end format label
+        /// </summary>
+        [Localizable(true), DefaultValue("MMMM dd, yyyy"), Category("Appearance")]
+        [Description("Indicates the current TimeLine Day, end format label.")]
+        public string CurrentTimeLineDayEndLabel
+        {
+            get { return (_CurrentTimeLineDayEndLabel); }
+
+            set
+            {
+                if (value == null)
+                    value = "";
+
+                _CurrentTimeLineDayEndLabel = value;
+
+                UpdateDisplay();
+            }
+        }
+
+        #endregion
+
+        #region CurrentTimeLineDaySameYearStartLabel
+
+        /// <summary>
+        /// Gets or sets the current TimeLine Day, same Year, start format label
+        /// </summary>
+        [Localizable(true), DefaultValue("MMMM dd"), Category("Appearance")]
+        [Description("Indicates the current TimeLine Day, same Year, start format label.")]
+        public string CurrentTimeLineDaySameYearStartLabel
+        {
+            get { return (_CurrentTimeLineDaySameYearStartLabel); }
+
+            set
+            {
+                if (value == null)
+                    value = "";
+
+                _CurrentTimeLineDaySameYearStartLabel = value;
+
+                UpdateDisplay();
+            }
+        }
+
+        #endregion
+
+        #region CurrentTimeLineDaySameYearEndLabel
+
+        /// <summary>
+        /// Gets or sets the current TimeLine Day, same Year, end format label
+        /// </summary>
+        [Localizable(true), DefaultValue("MMMM dd, yyyy"), Category("Appearance")]
+        [Description("Indicates the current TimeLine Day, same Year, end format label.")]
+        public string CurrentTimeLineDaySameYearEndLabel
+        {
+            get { return (_CurrentTimeLineDaySameYearEndLabel); }
+
+            set
+            {
+                if (value == null)
+                    value = "";
+
+                _CurrentTimeLineDaySameYearEndLabel = value;
+
+                UpdateDisplay();
+            }
+        }
+
+        #endregion
+
+        #region CurrentTimeLineDaySameMonthYearStartLabel
+
+        /// <summary>
+        /// Gets or sets the current TimeLine Day, same Month & Year, start format label
+        /// </summary>
+        [Localizable(true), DefaultValue("MMMM dd"), Category("Appearance")]
+        [Description("Indicates the current TimeLine Day, same Month & Year, start format label.")]
+        public string CurrentTimeLineDaySameMonthYearStartLabel
+        {
+            get { return (_CurrentTimeLineDaySameMonthYearStartLabel); }
+
+            set
+            {
+                if (value == null)
+                    value = "";
+
+                _CurrentTimeLineDaySameMonthYearStartLabel = value;
+
+                UpdateDisplay();
+            }
+        }
+
+        #endregion
+
+        #region CurrentTimeLineDaySameMonthYearEndLabel
+
+        /// <summary>
+        /// Gets or sets the current TimeLine Day, same Month & Year, end format label
+        /// </summary>
+        [Localizable(true), DefaultValue("dd, yyyy"), Category("Appearance")]
+        [Description("Indicates the current TimeLine Day, same Month & Year, end format label.")]
+        public string CurrentTimeLineDaySameMonthYearEndLabel
+        {
+            get { return (_CurrentTimeLineDaySameMonthYearEndLabel); }
+
+            set
+            {
+                if (value == null)
+                    value = "";
+
+                _CurrentTimeLineDaySameMonthYearEndLabel = value;
+
+                UpdateDisplay();
+            }
+        }
+
+        #endregion
+
+        #region CurrentTimeLineYearStartLabel
+
+        /// <summary>
+        /// Gets or sets the current TimeLine Year, start format label
+        /// </summary>
+        [Localizable(true), DefaultValue("yyyy"), Category("Appearance")]
+        [Description("Indicates the current TimeLine Year, start format label.")]
+        public string CurrentTimeLineYearStartLabel
+        {
+            get { return (_CurrentTimeLineYearStartLabel); }
+
+            set
+            {
+                if (value == null)
+                    value = "";
+
+                _CurrentTimeLineYearStartLabel = value;
+
+                UpdateDisplay();
+            }
+        }
+
+        #endregion
+
+        #region CurrentTimeLineYearEndLabel
+
+        /// <summary>
+        /// Gets or sets the current TimeLine Year, end format label
+        /// </summary>
+        [Localizable(true), DefaultValue("yyyy"), Category("Appearance")]
+        [Description("Indicates the current TimeLine Year, end format label.")]
+        public string CurrentTimeLineYearEndLabel
+        {
+            get { return (_CurrentTimeLineYearEndLabel); }
+
+            set
+            {
+                if (value == null)
+                    value = "";
+
+                _CurrentTimeLineYearEndLabel = value;
+
+                UpdateDisplay();
+            }
+        }
+
+        #endregion
+
+        #region WeekDaysNavigationEnabled
+
+        private bool _WeekDaysNavigationEnabled = true;
+
+        /// <summary>
+        /// Gets or sets whether in Week View week-days navigation is enabled. Default value is true. When week-days navigation is enabled
+        /// and start date points to Monday and end date points to Friday, navigating to next day will navigate to next Monday-Friday view.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior")]
+        [Description("Indicates whether in Week View week-days navigation is enabled. When week-days navigation is enabled and start date points to Monday and end date points to Friday, navigating to next day will navigate to next Monday-Friday view.")]
+        public bool WeekDaysNavigationEnabled
+        {
+            get { return _WeekDaysNavigationEnabled; }
+            set
+            {
+                _WeekDaysNavigationEnabled = value;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region StyleManagerStyleChanged
+
+        /// <summary>
+        /// Called by StyleManager to notify control that style on manager has changed and that control should refresh its appearance if
+        /// its style is controlled by StyleManager.
+        /// </summary>
+        /// <param name="newStyle">New active style.</param>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override void StyleManagerStyleChanged(eDotNetBarStyle newStyle)
+        {
+            base.StyleManagerStyleChanged(newStyle);
+            UpdateButtonImages();
+            this.Style.BackColor1.Color = ((Office2007Renderer)GlobalManager.Renderer).ColorTable.CalendarView.TimeRulerColors[0].Colors[0];
+        }
+
+        #endregion
+
+        #region Navigate_click routines
+
+        /// <summary>
+        /// Handles NavigateForward button clicks
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void NavigateForwardClick(object sender, EventArgs e)
+        {
+            NavigateDatesForward();
+        }
+
+        /// <summary>
+        /// Handles NavigateBack button clicks
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void NavigateBackClick(object sender, EventArgs e)
+        {
+            NavigateDatesBack();
+        }
+
+        #endregion
+
+        #region NavigateDatesForward
+
+        /// <summary>
+        /// Navigates forward
+        /// </summary>
+        private void NavigateDatesForward()
+        {
+            if (_CalendarView != null)
+            {
+                switch (_CalendarView.SelectedView)
+                {
+                    case eCalendarView.Day:
+                        NavigateDayForward();
+                        break;
+
+                    case eCalendarView.Week:
+                        NavigateWeekForward();
+                        break;
+
+                    case eCalendarView.Month:
+                        NavigateMonthForward();
+                        break;
+
+                    case eCalendarView.Year:
+                        NavigateYearForward();
+                        break;
+
+                    case eCalendarView.TimeLine:
+                        NavigateTimeLineForward();
+                        break;
+                }
+
+                UpdateDisplay();
+            }
+        }
+
+        #region NavigateDayForward
+
+        /// <summary>
+        /// NavigateDayForward
+        /// </summary>
+        private void NavigateDayForward()
+        {
+            DateTime oldDate = _CalendarView.DayViewDate;
+            DateTime newDate = _CalendarView.DayViewDate.AddDays(1);
+
+            if (DoDateChanging(NavigationDirection.Forward,
+                oldDate, oldDate, ref newDate, ref newDate) == false)
+            {
+                _CalendarView.DayViewDate = newDate;
+
+                DoDateChanged(NavigationDirection.Forward, oldDate, oldDate, newDate, newDate);
+            }
+        }
+
+        #endregion
+
+        #region NavigateWeekForward
+
+        /// <summary>
+        /// NavigateWeekForward
+        /// </summary>
+        private void NavigateWeekForward()
+        {
+            DateTime calendarStart = _CalendarView.WeekViewStartDate;
+            DateTime calendarEnd = _CalendarView.WeekViewEndDate;
+
+            TimeSpan span = calendarEnd.Subtract(calendarStart);
+            DateTime start = calendarStart.AddDays(1).Add(span);
+            DateTime end = calendarEnd.AddDays(1).Add(span);
+
+            if (WeekDaysNavigationEnabled &&
+                calendarStart.DayOfWeek == DayOfWeek.Monday && calendarEnd.DayOfWeek == DayOfWeek.Friday)
+            {
+                // Browse week-days only
+
+                start = calendarStart.AddDays(7);
+                end = start.AddDays(4);
+            }
+
+            if (DoDateChanging(NavigationDirection.Forward,
+                calendarStart, calendarEnd, ref start, ref end) == false)
+            {
+                _CalendarView.WeekViewStartDate = start;
+                _CalendarView.WeekViewEndDate = end;
+
+                DoDateChanged(NavigationDirection.Forward, calendarStart, calendarEnd, start, end);
+            }
+        }
+
+        #endregion
+
+        #region NavigateMonthForward
+
+        /// <summary>
+        /// NavigateMonthForward
+        /// </summary>
+        private void NavigateMonthForward()
+        {
+            DateTime calendarStart = _CalendarView.MonthViewStartDate;
+            DateTime calendarEnd = _CalendarView.MonthViewEndDate;
+
+            TimeSpan span = calendarEnd.Subtract(calendarStart);
+            DateTime start = calendarStart.AddMonths(1);
+            DateTime end = start.Add(span);
+
+            if (calendarStart.Day == 1 &&
+                calendarEnd.Day == ScheduleSettings.GetActiveCulture().Calendar.GetDaysInMonth(calendarEnd.Year, calendarEnd.Month))
+            {
+                end = start.AddMonths(1).AddMinutes(-1);
+            }
+
+            if (DoDateChanging(NavigationDirection.Forward,
+                calendarStart, calendarEnd, ref start, ref end) == false)
+            {
+                _CalendarView.MonthViewStartDate = start;
+                _CalendarView.MonthViewEndDate = end;
+
+                DoDateChanged(NavigationDirection.Forward, calendarStart, calendarEnd, start, end);
+            }
+        }
+
+        #endregion
+
+        #region NavigateYearForward
+
+        /// <summary>
+        /// NavigateYearForward
+        /// </summary>
+        private void NavigateYearForward()
+        {
+            DateTime calendarStart = _CalendarView.YearViewStartDate;
+            DateTime calendarEnd = _CalendarView.YearViewEndDate;
+
+            int months = CountMonthSpan(calendarStart, calendarEnd);
+
+            DateTime start = calendarEnd.AddMonths(1);
+            start = start.AddDays(-start.Day + 1);
+
+            DateTime end = start.AddMonths(months + 1);
+            end = end.AddDays(-1);
+
+            if (DoDateChanging(NavigationDirection.Forward,
+                calendarStart, calendarEnd, ref start, ref end) == false)
+            {
+                _CalendarView.YearViewStartDate = start;
+                _CalendarView.YearViewEndDate = end;
+
+                DoDateChanged(NavigationDirection.Forward, calendarStart, calendarEnd, start, end);
+            }
+        }
+
+        #endregion
+
+        #region NavigateTimeLineForward
+
+        /// <summary>
+        /// NavigateTimeLineForward
+        /// </summary>
+        private void NavigateTimeLineForward()
+        {
+            DateTime calendarStart = _CalendarView.TimeLineViewScrollStartDate;
+            DateTime calendarEnd = _CalendarView.TimeLineViewScrollEndDate;
+
+            DateTime start = GetForwardPeriodDate(_CalendarView.TimeLineViewScrollStartDate);
+            DateTime end = start;
+
+            if (DoDateChanging(NavigationDirection.Forward,
+                calendarStart, calendarEnd, ref start, ref end) == false)
+            {
+                _CalendarView.TimeLineViewScrollStartDate = start;
+
+                DoDateChanged(NavigationDirection.Forward, calendarStart, calendarEnd,
+                    _CalendarView.TimeLineViewScrollStartDate, _CalendarView.TimeLineViewScrollEndDate);
+            }
+        }
+
+        #endregion
+
+        #region GetForwardPeriodDate
+
+        /// <summary>
+        /// Gets the next forward TimeLine Period Date
+        /// </summary>
+        /// <param name="calendarStart">Current date</param>
+        /// <returns>Next Period Date</returns>
+        private DateTime GetForwardPeriodDate(DateTime calendarStart)
+        {
+            // Hours or Minutes
+
+            if (_CalendarView.TimeLinePeriod == eTimeLinePeriod.Minutes ||
+                _CalendarView.TimeLinePeriod == eTimeLinePeriod.Hours)
+            {
+                // Move forward by a day
+
+                calendarStart = calendarStart.AddDays(1);
+
+                return (new DateTime(calendarStart.Year,
+                    calendarStart.Month, calendarStart.Day, 0, 0, 0));
+            }
+
+            // Days
+
+            if (_CalendarView.TimeLinePeriod == eTimeLinePeriod.Days)
+            {
+                // If our interval is a single day, then
+                // move forward by a month
+
+                if (_CalendarView.TimeLineInterval == 1)
+                {
+                    calendarStart = calendarStart.AddMonths(1);
+
+                    return (new DateTime(calendarStart.Year, calendarStart.Month, 1));
+                }
+
+                // The interval is multiple days, so
+                // move forward by a year
+
+                calendarStart = calendarStart.AddYears(1);
+
+                if (calendarStart.AddMinutes(_CalendarView.BaseInterval).Year > calendarStart.Year)
+                    calendarStart = calendarStart.AddYears(1);
+
+                return (new DateTime(calendarStart.Year, 1, 1));
+            }
+
+            // Years
+
+            if (_CalendarView.TimeLinePeriod == eTimeLinePeriod.Years)
+            {
+                TimeSpan ts = calendarStart - _CalendarView.TimeLineViewStartDate;
+
+                // Move forward by 10 columns at a time
+
+                int interval = (int)(ts.TotalMinutes / _CalendarView.BaseInterval);
+
+                interval = ((interval + 10) / 10) * 10;
+
+                return (_CalendarView.TimeLineViewStartDate.AddMinutes(
+                    interval * _CalendarView.BaseInterval));
+            }
+
+            return (calendarStart);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region NavigateDatesBack
+
+        /// <summary>
+        /// Navigates back
+        /// </summary>
+        private void NavigateDatesBack()
+        {
+            if (_CalendarView != null)
+            {
+                switch (_CalendarView.SelectedView)
+                {
+                    case eCalendarView.Day:
+                        NavigateDayBack();
+                        break;
+
+                    case eCalendarView.Week:
+                        NavigateWeekBack();
+                        break;
+
+                    case eCalendarView.Month:
+                        NavigateMonthBack();
+                        break;
+
+                    case eCalendarView.Year:
+                        NavigateYearBack();
+                        break;
+
+                    case eCalendarView.TimeLine:
+                        NavigateTimeLineBack();
+                        break;
+                }
+
+                UpdateDisplay();
+            }
+        }
+
+        #region NavigateDayBack
+
+        /// <summary>
+        /// NavigateDayBack
+        /// </summary>
+        private void NavigateDayBack()
+        {
+            DateTime oldDate = _CalendarView.DayViewDate;
+            DateTime newDate = _CalendarView.DayViewDate.AddDays(-1);
+
+            if (DoDateChanging(NavigationDirection.Backward,
+                oldDate, oldDate, ref newDate, ref newDate) == false)
+            {
+                _CalendarView.DayViewDate = newDate;
+
+                DoDateChanged(NavigationDirection.Backward, oldDate, oldDate, newDate, newDate);
+            }
+        }
+
+        #endregion
+
+        #region NavigateWeekBack
+
+        /// <summary>
+        /// NavigateWeekBack
+        /// </summary>
+        private void NavigateWeekBack()
+        {
+            DateTime calendarStart = _CalendarView.WeekViewStartDate;
+            DateTime calendarEnd = _CalendarView.WeekViewEndDate;
+
+            TimeSpan span = calendarEnd.Subtract(calendarStart).Negate();
+            DateTime start = calendarStart.AddDays(-1).Add(span);
+            DateTime end = calendarEnd.AddDays(-1).Add(span);
+
+            if (WeekDaysNavigationEnabled &&
+                calendarStart.DayOfWeek == DayOfWeek.Monday && calendarEnd.DayOfWeek == DayOfWeek.Friday)
+            {
+                // Browse week-days only
+
+                start = calendarStart.AddDays(-7);
+                end = start.AddDays(4);
+            }
+
+            if (DoDateChanging(NavigationDirection.Backward,
+                calendarStart, calendarEnd, ref start, ref end) == false)
+            {
+                _CalendarView.WeekViewStartDate = start;
+                _CalendarView.WeekViewEndDate = end;
+
+                DoDateChanged(NavigationDirection.Backward, calendarStart, calendarEnd, start, end);
+            }
+        }
+
+        #endregion
+
+        #region NavigateMonthBack
+
+        /// <summary>
+        /// NavigateMonthBack
+        /// </summary>
+        private void NavigateMonthBack()
+        {
+            DateTime calendarStart = _CalendarView.MonthViewStartDate;
+            DateTime calendarEnd = _CalendarView.MonthViewEndDate;
+
+            TimeSpan span = calendarEnd.Subtract(calendarStart);
+            DateTime start = calendarStart.AddMonths(-1);
+            DateTime end = start.Add(span);
+
+            if (calendarStart.Day == 1 &&
+                calendarEnd.Day == ScheduleSettings.GetActiveCulture().Calendar.GetDaysInMonth(calendarEnd.Year, calendarEnd.Month))
+            {
+                end = start.AddMonths(1).AddMinutes(-1);
+            }
+
+            if (DoDateChanging(NavigationDirection.Backward,
+                calendarStart, calendarEnd, ref start, ref end) == false)
+            {
+                _CalendarView.MonthViewStartDate = start;
+                _CalendarView.MonthViewEndDate = end;
+
+                DoDateChanged(NavigationDirection.Backward, calendarStart, calendarEnd, start, end);
+            }
+        }
+
+        #endregion
+
+        #region NavigateYearBack
+
+        /// <summary>
+        /// NavigateYearBack
+        /// </summary>
+        private void NavigateYearBack()
+        {
+            DateTime calendarStart = _CalendarView.YearViewStartDate;
+            DateTime calendarEnd = _CalendarView.YearViewEndDate;
+
+            int months = CountMonthSpan(calendarStart, calendarEnd);
+
+            DateTime end = calendarStart.AddDays(-1);
+            DateTime start = end.AddMonths(-months);
+            start = start.AddDays(-start.Day + 1);
+
+            if (DoDateChanging(NavigationDirection.Backward,
+                calendarStart, calendarEnd, ref start, ref end) == false)
+            {
+                _CalendarView.YearViewStartDate = start;
+                _CalendarView.YearViewEndDate = end;
+
+                DoDateChanged(NavigationDirection.Backward, calendarStart, calendarEnd, start, end);
+            }
+        }
+
+        #endregion
+
+        #region NavigateTimeLineBack
+
+        /// <summary>
+        /// NavigateTimeLineBack
+        /// </summary>
+        private void NavigateTimeLineBack()
+        {
+            DateTime calendarStart = _CalendarView.TimeLineViewScrollStartDate;
+            DateTime calendarEnd = _CalendarView.TimeLineViewScrollEndDate;
+
+            DateTime start = GetBackPeriodDate(_CalendarView.TimeLineViewScrollStartDate);
+            DateTime end = start;
+
+            if (DoDateChanging(NavigationDirection.Backward,
+                calendarStart, calendarEnd, ref start, ref end) == false)
+            {
+                _CalendarView.TimeLineViewScrollStartDate = start;
+
+                DoDateChanged(NavigationDirection.Backward, calendarStart, calendarEnd,
+                    _CalendarView.TimeLineViewScrollStartDate, _CalendarView.TimeLineViewScrollEndDate);
+            }
+        }
+
+        #endregion
+
+        #region GetBackPeriodDate
+
+        /// <summary>
+        /// Gets the next back TimeLine Period Date
+        /// </summary>
+        /// <param name="calendarStart">Current date</param>
+        /// <returns>Next back Period Date</returns>
+        private DateTime GetBackPeriodDate(DateTime calendarStart)
+        {
+            // Hours or minutes
+
+            if (_CalendarView.TimeLinePeriod == eTimeLinePeriod.Minutes ||
+                _CalendarView.TimeLinePeriod == eTimeLinePeriod.Hours)
+            {
+                // Go back by a day
+
+                if (calendarStart.Hour == 0)
+                    calendarStart = calendarStart.AddDays(-1);
+
+                return (new DateTime(calendarStart.Year,
+                    calendarStart.Month, calendarStart.Day, 0, 0, 0));
+            }
+
+            // Days
+
+            if (_CalendarView.TimeLinePeriod == eTimeLinePeriod.Days)
+            {
+                // If the interval is a single day
+                // then go back by a month
+
+                if (_CalendarView.TimeLineInterval == 1)
+                {
+                    if (calendarStart.Day == 1)
+                        calendarStart = calendarStart.AddMonths(-1);
+
+                    return (new DateTime(calendarStart.Year, calendarStart.Month, 1));
+                }
+
+                // Multi-day interval, go back
+                // by a year
+
+                if (calendarStart.AddMinutes(-_CalendarView.BaseInterval).Year < calendarStart.Year)
+                    calendarStart = calendarStart.AddYears(-1);
+
+                return (new DateTime(calendarStart.Year, 1, 1));
+            }
+
+            // Years
+
+            if (_CalendarView.TimeLinePeriod == eTimeLinePeriod.Years)
+            {
+                TimeSpan ts = calendarStart - _CalendarView.TimeLineViewStartDate;
+
+                // Go back 10 columns
+
+                int interval = (int)(ts.TotalMinutes / _CalendarView.BaseInterval);
+
+                interval = ((interval % 10 == 0)
+                    ? interval - 10 : (interval / 10) * 10);
+
+                return (_CalendarView.TimeLineViewStartDate.AddMinutes(
+                    interval * _CalendarView.BaseInterval));
+            }
+
+            return (calendarStart);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region CountMonthSpan
+
+        /// <summary>
+        /// CountMonthSpan
+        /// </summary>
+        /// <param name="calendarStart"></param>
+        /// <param name="calendarEnd"></param>
+        /// <returns></returns>
+        private int CountMonthSpan(DateTime calendarStart, DateTime calendarEnd)
+        {
+            int monthSpan = (calendarEnd.Year * 12 + calendarEnd.Month) -
+                (calendarStart.Year * 12 + calendarStart.Month);
+
+            return (monthSpan > MaxYearMonthSpan ? MaxYearMonthSpan : monthSpan);
+        }
+
+        #endregion
+
+        #region UpdateDisplay
+
+        #region UpdateDisplay
+
+        /// <summary>
+        /// Updates the Date Label text
+        /// </summary>
+        public void UpdateDisplay()
+        {
+            if (IsDisposed == false)
+            {
+                if (_CalendarView == null)
+                {
+                    CurrentDateLabel.Text = "";
+                }
+                else
+                {
+                    if (GetDateLabel != null)
+                    {
+                        GetDateLabelEventArgs args = new GetDateLabelEventArgs();
+
+                        GetDateLabel(this, args);
+
+                        if (string.IsNullOrEmpty(args.DateLabel) == false)
+                        {
+                            CurrentDateLabel.Text = args.DateLabel;
+                            return;
+                        }
+                    }
+
+                    IFormatProvider formatProvider =
+                        ScheduleSettings.GetActiveCulture(); //.GetFormat(typeof (DateTime));
+
+                    switch (_CalendarView.SelectedView)
+                    {
+                        case eCalendarView.Day:
+                            UpdateDayDisplay(formatProvider, _CalendarView.DayViewDate);
+                            break;
+
+                        case eCalendarView.Week:
+                            UpdateWeekDisplay(formatProvider,
+                                _CalendarView.WeekViewStartDate, _CalendarView.WeekViewEndDate);
+                            break;
+
+                        case eCalendarView.Month:
+                            UpdateMonthDisplay(formatProvider,
+                                _CalendarView.MonthViewStartDate, _CalendarView.MonthViewEndDate);
+                            break;
+
+                        case eCalendarView.Year:
+                            UpdateYearDisplay(formatProvider,
+                                _CalendarView.YearViewStartDate, _CalendarView.YearViewEndDate);
+                            break;
+
+                        case eCalendarView.TimeLine:
+                            UpdateTimeLineDisplay(formatProvider,
+                                _CalendarView.TimeLineViewScrollStartDate,
+                                _CalendarView.TimeLineViewScrollEndDate);
+                            break;
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region UpdateDayDisplay
+
+        /// <summary>
+        /// Updates the DayView display
+        /// </summary>
+        /// <param name="formatProvider"></param>
+        /// <param name="start"></param>
+        private void UpdateDayDisplay(IFormatProvider formatProvider, DateTime start)
+        {
+            CurrentDateLabel.Text = (start == DateTime.MinValue)
+                ? "" : start.ToString(CurrentDayLabel, formatProvider);
+        }
+
+        #endregion
+
+        #region UpdateWeekDisplay
+
+        /// <summary>
+        /// Updates the WeekView display
+        /// </summary>
+        /// <param name="formatProvider"></param>
+        /// <param name="start"></param>
+        /// <param name="end"></param>
+        private void UpdateWeekDisplay(IFormatProvider formatProvider, DateTime start, DateTime end)
+        {
+            if (start == DateTime.MinValue || end == DateTime.MinValue)
+            {
+                CurrentDateLabel.Text = "";
+            }
+            else
+            {
+                if (start.Year == end.Year && start.Month == end.Month)
+                {
+                    CurrentDateLabel.Text =
+                        start.ToString(CurrentWeekSameYearStartLabel, formatProvider) + @" - " +
+                        end.ToString(CurrentWeekSameYearEndLabel, formatProvider);
+                }
+                else if (start.Year == end.Year)
+                {
+                    CurrentDateLabel.Text =
+                        start.ToString(CurrentWeekSameMonthYearStartLabel, formatProvider) + @" - " +
+                        end.ToString(CurrentWeekSameMonthYearEndLabel, formatProvider);
+                }
+                else
+                {
+                    CurrentDateLabel.Text =
+                        start.ToString(CurrentWeekStartLabel, formatProvider) + @" - " +
+                        end.ToString(CurrentWeekEndLabel, formatProvider);
+                }
+            }
+        }
+
+        #endregion
+
+        #region UpdateMonthDisplay
+
+        /// <summary>
+        /// Updates the MonthView display
+        /// </summary>
+        /// <param name="formatProvider"></param>
+        /// <param name="start"></param>
+        /// <param name="end"></param>
+        private void UpdateMonthDisplay(IFormatProvider formatProvider, DateTime start, DateTime end)
+        {
+            if (start == DateTime.MinValue || end == DateTime.MinValue)
+            {
+                CurrentDateLabel.Text = "";
+            }
+            else
+            {
+                string s = start.ToString(CurrentMonthStartLabel, formatProvider);
+
+                if (end.Year != start.Year)
+                    s += " - " + end.ToString(CurrentMonthEndLabel, formatProvider);
+
+                CurrentDateLabel.Text = s;
+            }
+        }
+
+        #endregion
+
+        #region UpdateYearDisplay
+
+        /// <summary>
+        /// Updates the YearView display
+        /// </summary>
+        /// <param name="formatProvider"></param>
+        /// <param name="start"></param>
+        /// <param name="end"></param>
+        private void UpdateYearDisplay(IFormatProvider formatProvider, DateTime start, DateTime end)
+        {
+            if (start == DateTime.MinValue)
+            {
+                CurrentDateLabel.Text = "";
+            }
+            else
+            {
+                string s = start.ToString(CurrentYearStartLabel, formatProvider);
+
+                if (start.Month != end.Month || start.Year != end.Year)
+                    s += " - " + end.ToString(CurrentYearEndLabel, formatProvider);
+
+                CurrentDateLabel.Text = s;
+            }
+        }
+
+        #endregion
+
+        #region UpdateTimeLineDisplay
+
+        /// <summary>
+        /// Updates the TimeLineView display
+        /// </summary>
+        /// <param name="formatProvider"></param>
+        /// <param name="start"></param>
+        /// <param name="end"></param>
+        private void UpdateTimeLineDisplay(IFormatProvider formatProvider, DateTime start, DateTime end)
+        {
+            if (start == DateTime.MinValue || end == DateTime.MinValue)
+            {
+                CurrentDateLabel.Text = "";
+            }
+            else
+            {
+                switch (_CalendarView.TimeLinePeriod)
+                {
+                    case eTimeLinePeriod.Hours:
+                    case eTimeLinePeriod.Minutes:
+                        CurrentDateLabel.Text = start.ToString(CurrentTimeLineHourLabel, formatProvider);
+                        break;
+
+                    case eTimeLinePeriod.Days:
+                        if (start.Year == end.Year && start.Month == end.Month)
+                        {
+                            CurrentDateLabel.Text =
+                                start.ToString(CurrentTimeLineDaySameMonthYearStartLabel, formatProvider) + @" - " +
+                                end.ToString(CurrentTimeLineDaySameMonthYearEndLabel, formatProvider);
+                        }
+                        else if (start.Year == end.Year)
+                        {
+                            CurrentDateLabel.Text =
+                                start.ToString(CurrentTimeLineDaySameYearStartLabel, formatProvider) + @" - " +
+                                end.ToString(CurrentTimeLineDaySameYearEndLabel, formatProvider);
+                        }
+                        else
+                        {
+                            CurrentDateLabel.Text =
+                                start.ToString(CurrentTimeLineDayStartLabel, formatProvider) + @" - " +
+                                end.ToString(CurrentTimeLineDayEndLabel, formatProvider);
+                        }
+                        break;
+
+                    case eTimeLinePeriod.Years:
+                        CurrentDateLabel.Text =
+                            start.ToString(CurrentTimeLineYearStartLabel, formatProvider) + @" - " +
+                            end.ToString(CurrentTimeLineYearEndLabel, formatProvider);
+                        break;
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region UpdateButtonImages
+
+        /// <summary>
+        /// Updates the button images
+        /// </summary>
+        private void UpdateButtonImages()
+        {
+            Bitmap image = new Bitmap(10, 10, PixelFormat.Format32bppArgb);
+            using (Graphics g = Graphics.FromImage(image))
+            {
+                g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.AntiAlias;
+                using (Pen pen = new Pen(GetImageForeColor(), 2))
+                {
+                    g.DrawLines(pen, new Point[] {
+                        new Point(5,0),
+                        new Point(1,4),
+                        new Point(5,8)
+                    });
+                    g.DrawLines(pen, new Point[] {
+                        new Point(1,4),
+                        new Point(9,4)
+                    });
+
+                }
+            }
+            if (NavigateBack.Image != null)
+            {
+                Image img = NavigateBack.Image;
+                NavigateBack.Image = null;
+                img.Dispose();
+            }
+            NavigateBack.Image = image;
+
+
+            image = new Bitmap(10, 10, PixelFormat.Format32bppArgb);
+            using (Graphics g = Graphics.FromImage(image))
+            {
+                g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.AntiAlias;
+                using (Pen pen = new Pen(GetImageForeColor(), 2))
+                {
+                    g.DrawLines(pen, new Point[] {
+                        new Point(0,4),
+                        new Point(8,4),
+                        new Point(4,0),
+                        new Point(8,4),
+                        new Point(4,8)
+                    });
+                }
+            }
+            if (NavigateForward.Image != null)
+            {
+                Image img = NavigateForward.Image;
+                NavigateForward.Image = null;
+                img.Dispose();
+            }
+            NavigateForward.Image = image;
+        }
+
+        /// <summary>
+        /// Gets image fore color
+        /// </summary>
+        /// <returns></returns>
+        private Color GetImageForeColor()
+        {
+            if (GlobalManager.Renderer is Office2007Renderer)
+            {
+                return ((Office2007Renderer)GlobalManager.Renderer).ColorTable.CheckBoxItem.Default.Text;
+            }
+
+            return this.ColorScheme.ItemText;
+        }
+
+        #endregion
+
+        #region DoDateChanging
+
+        private bool DoDateChanging(NavigationDirection direction,
+            DateTime oldStartDate, DateTime oldEndDate, ref DateTime newStartDate, ref DateTime newEndDate)
+        {
+            if (DateChanging != null)
+            {
+                DateChangingEventArgs ev = new DateChangingEventArgs(
+                    direction, oldStartDate, oldEndDate, newStartDate, newEndDate);
+
+                DateChanging(this, ev);
+
+                if (ev.Cancel == true)
+                    return (true);
+
+                newStartDate = ev.NewStartDate;
+                newEndDate = ev.NewEndDate;
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region DoDateChanged
+
+        private void DoDateChanged(NavigationDirection direction,
+            DateTime oldStartDate, DateTime oldEndDate, DateTime newStartDate, DateTime newEndDate)
+        {
+            if (DateChanged != null)
+            {
+                DateChangedEventArgs ev = new DateChangedEventArgs(
+                    direction, oldStartDate, oldEndDate, newStartDate, newEndDate);
+
+                DateChanged(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region DateChangingEventArgs
+
+        /// <summary>
+        /// DateChangingEventArgs
+        /// </summary>
+        public class DateChangingEventArgs : DateChangedEventArgs
+        {
+            #region Private variables
+
+            private bool _Cancel;
+
+            #endregion
+
+            public DateChangingEventArgs(NavigationDirection direction,
+                DateTime oldStartDate, DateTime oldEndDate, DateTime newStartDate, DateTime newEndDate)
+                : base(direction, oldStartDate, oldEndDate, newStartDate, newEndDate)
+            {
+            }
+
+            #region Public properties
+
+            /// <summary>
+            /// Gets or sets whether to cancel the operation
+            /// </summary>
+            public bool Cancel
+            {
+                get { return (_Cancel); }
+                set { _Cancel = value; }
+            }
+
+            #endregion
+        }
+
+        #endregion
+
+        #region DateChangedEventArgs
+
+        /// <summary>
+        /// DateChangingEventArgs
+        /// </summary>
+        public class DateChangedEventArgs : EventArgs
+        {
+            #region Private variables
+
+            NavigationDirection _Direction;
+
+            private DateTime _OldStartDate;
+            private DateTime _OldEndDate;
+            private DateTime _NewStartDate;
+            private DateTime _NewEndDate;
+
+            #endregion
+
+            public DateChangedEventArgs(NavigationDirection direction,
+                DateTime oldStartDate, DateTime oldEndDate, DateTime newStartDate, DateTime newEndDate)
+            {
+                _Direction = direction;
+
+                _OldStartDate = oldStartDate;
+                _OldEndDate = oldEndDate;
+                _NewStartDate = newStartDate;
+                _NewEndDate = newEndDate;
+            }
+
+            #region Public properties
+
+            /// <summary>
+            /// Gets the navigation direction
+            /// </summary>
+            public NavigationDirection Direction
+            {
+                get { return (_Direction); }
+                set { _Direction = value; }
+            }
+
+            /// <summary>
+            /// Gets the old navigation start date
+            /// </summary>
+            public DateTime OldStartDate
+            {
+                get { return (_OldStartDate); }
+            }
+
+            /// <summary>
+            /// Gets the old navigation end date
+            /// </summary>
+            public DateTime OldEndDate
+            {
+                get { return (_OldEndDate); }
+            }
+
+            /// <summary>
+            /// Gets or sets the new navigation start date
+            /// </summary>
+            public DateTime NewStartDate
+            {
+                get { return (_NewStartDate); }
+                set { _NewStartDate = value; }
+            }
+
+            /// <summary>
+            /// Gets or sets the new navigation end date
+            /// </summary>
+            public DateTime NewEndDate
+            {
+                get { return (_NewEndDate); }
+                set { _NewEndDate = value; }
+            }
+
+            #endregion
+        }
+
+        #endregion
+
+        #region GetDateLabelEventArgs
+
+        /// <summary>
+        /// GetDateLabelEventArgs
+        /// </summary>
+        public class GetDateLabelEventArgs : EventArgs
+        {
+            #region Private variables
+
+            private string _DateLabel;
+
+            #endregion
+
+            #region Public properties
+
+            /// <summary>
+            /// Gets the formatted DateLabel
+            /// </summary>
+            public string DateLabel
+            {
+                get { return (_DateLabel); }
+                set { _DateLabel = value; }
+            }
+
+            #endregion
+        }
+
+        #endregion
+    }
+
+    #region enums
+
+    public enum NavigationDirection
+    {
+        Forward,
+        Backward
+    }
+
+    #endregion
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/DateNavigator.ico b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/DateNavigator.ico
new file mode 100644
index 00000000..017d6e9a
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/DateNavigator.ico differ
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/DateNavigator.resx b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/DateNavigator.resx
new file mode 100644
index 00000000..19dc0dd8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/DateNavigator.resx	
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/DaysOfTheWeek.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/DaysOfTheWeek.cs
new file mode 100644
index 00000000..4e4f49b3
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/DaysOfTheWeek.cs	
@@ -0,0 +1,158 @@
+#if FRAMEWORK20
+using System;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Schedule
+{
+    public class DaysOfTheWeek
+    {
+        #region enums
+
+        public enum eDayType
+        {
+            Long,       // Long text
+            Short,      // Short text
+            Single,
+            None
+        }
+
+        #endregion
+
+        #region Private variables
+
+        private int _DayCount;          // Count of days
+
+        private string[][] _DayText;    // Days of the week text
+        private Size[][] _DaySize;      // Days of the week measure
+
+        private bool _NeedsMeasured;    // Text measure flag
+
+        #endregion
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        public DaysOfTheWeek()
+            : this(DateHelper.GetFirstDayOfWeek(), 7)
+        {
+        }
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="day">Day of the week</param>
+        /// <param name="count">Count of days</param>
+        public DaysOfTheWeek(DayOfWeek day, int count)
+        {
+            LoadDays(day, count);
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the DayText string arrays
+        /// </summary>
+        public string[][] DayText
+        {
+            get { return (_DayText); }
+        }
+
+        /// <summary>
+        /// Gets the DaySize Size arrays
+        /// </summary>
+        public Size[][] DaySize
+        {
+            get {return (_DaySize); }
+        }
+
+        /// <summary>
+        /// Day text NeedsMeasured flag
+        /// </summary>
+        public bool NeedsMeasured
+        {
+            get { return (_NeedsMeasured); }
+            set { _NeedsMeasured = value; }
+        }
+
+        #endregion
+
+        #region LoadDays
+
+        /// <summary>
+        /// Loads the DayText arrays
+        /// </summary>
+        /// <param name="day">Starting day of week</param>
+        /// <param name="count">Count of days</param>
+        public void LoadDays(DayOfWeek day, int count)
+        {
+            _DayCount = count;
+
+            // Allocate our Day text and Size arrays
+
+            _DayText = new string[3][];
+            _DaySize = new Size[3][];
+
+            for (int i = 0; i < 3; i++)
+            {
+                _DayText[i] = new string[count];
+                _DaySize[i] = new Size[count];
+            }
+
+            // Loop through each day of the week, getting
+            // the long and short text strings for the day
+
+            for (int i = 0; i < _DayCount; i++)
+            {
+                _DayText[0][i] =
+                    ScheduleSettings.GetActiveCulture().DateTimeFormat.GetDayName(day);
+
+                _DayText[1][i] =
+                    DateHelper.GetThreeLetterDayOfWeek(day);
+
+                _DayText[2][i] = _DayText[1][i].Substring(0, 1);
+
+                day = DateHelper.GetNextDay(day);
+            }
+
+            // Flag that the text will need to be measured
+
+            _NeedsMeasured = true;
+        }
+
+        #endregion
+
+        #region MeasureText
+
+        /// <summary>
+        /// Measures the day text
+        /// </summary>
+        /// <param name="g">Graphics</param>
+        /// <param name="font">Text font</param>
+        public void MeasureText(Graphics g, Font font)
+        {
+            // Calculate our header text threshold, if
+            // we haven't done so already
+
+            if (_NeedsMeasured == true)
+            {
+                for (int i = 0; i < _DayCount; i++)
+                {
+                    _DaySize[0][i] =
+                        TextDrawing.MeasureString(g, _DayText[0][i], font);
+
+                    _DaySize[1][i] =
+                        TextDrawing.MeasureString(g, _DayText[1][i], font);
+
+                    _DaySize[2][i] =
+                        TextDrawing.MeasureString(g, _DayText[2][i], font);
+                }
+
+                _NeedsMeasured = false;
+            }
+        }
+
+        #endregion
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/DevComponents.DotNetBar.Schedule.csproj b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/DevComponents.DotNetBar.Schedule.csproj
new file mode 100644
index 00000000..bad49602
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/DevComponents.DotNetBar.Schedule.csproj	
@@ -0,0 +1,268 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{C25DFA40-9897-47FA-A525-7528C5BE7724}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>DevComponents.DotNetBar.Schedule</RootNamespace>
+    <AssemblyName>DevComponents.DotNetBar.Schedule</AssemblyName>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>dotnetbar.snk</AssemblyOriginatorKeyFile>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>2.0</OldToolsVersion>
+    <UpgradeBackupLocation />
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;FRAMEWORK20</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE;FRAMEWORK20</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <DocumentationFile>bin\Release\DevComponents.DotNetBar.Schedule.XML</DocumentationFile>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseTrialSchedule|AnyCPU' ">
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>FRAMEWORK20;TRIAL</DefineConstants>
+    <DocumentationFile>bin\Release\DevComponents.DotNetBar.Schedule.XML</DocumentationFile>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="AppointmentView\AppointmentHView.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="AppointmentView\AppointmentMonthView.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="AppointmentView\AppointmentTimeLineView.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="AppointmentView\AppointmentView.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="AppointmentView\AppointmentWeekDayView.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="BaseView.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="CalendarItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="CalendarView\CalendarPanel.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="CalendarView\CalendarView.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="CalendarView\CalendarViewCollection.cs" />
+    <Compile Include="CalendarView\DisplayedOwnerCollection.cs" />
+    <Compile Include="CalendarView\ViewDisplayCustomizations.cs" />
+    <Compile Include="Color\AppointmentCategoryColor.cs" />
+    <Compile Include="Color\AppointmentCategoryColorCollection.cs" />
+    <Compile Include="Color\AppointmentColor.cs" />
+    <Compile Include="Color\CalendarColor.cs" />
+    <Compile Include="Color\CalendarMonthColor.cs" />
+    <Compile Include="Color\CalendarViewColor.cs" />
+    <Compile Include="Color\CalendarWeekDayColor.cs" />
+    <Compile Include="Color\TimeRulerColor.cs" />
+    <Compile Include="CustomCalendarItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="CustomCalendarItemCollection.cs" />
+    <Compile Include="DateHelper.cs" />
+    <Compile Include="DateNavigator.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="DateNavigator.Designer.cs">
+      <DependentUpon>DateNavigator.cs</DependentUpon>
+    </Compile>
+    <Compile Include="DaysOfTheWeek.cs" />
+    <Compile Include="ItemRect.cs" />
+    <Compile Include="ModelViewConnector.cs" />
+    <Compile Include="Model\Appointment.cs" />
+    <Compile Include="Model\AppointmentCollection.cs" />
+    <Compile Include="Model\AppointmentRecurrence.cs" />
+    <Compile Include="Model\AppointmentSubsetCollection.cs" />
+    <Compile Include="Model\BaseWorkDay.cs" />
+    <Compile Include="Model\CalendarModel.cs" />
+    <Compile Include="Model\CalendarWorkDay.cs" />
+    <Compile Include="Model\CalendarWorkDayCollection.cs" />
+    <Compile Include="Model\DailyRecurrenceSettings.cs" />
+    <Compile Include="Model\DateTimeHelper.cs" />
+    <Compile Include="Model\Day.cs" />
+    <Compile Include="Model\Enums.cs" />
+    <Compile Include="Model\HolidaysCollection.cs" />
+    <Compile Include="Model\ImportExport\CalendarEntry.cs" />
+    <Compile Include="Model\ImportExport\ICS\IcsExporter.cs" />
+    <Compile Include="Model\ImportExport\ICS\IcsImporter.cs" />
+    <Compile Include="Model\INotifySubPropertyChanged.cs" />
+    <Compile Include="Model\Month.cs" />
+    <Compile Include="Model\MonthlyRecurrenceSettings.cs" />
+    <Compile Include="Model\NotificationRequest.cs" />
+    <Compile Include="Model\NotificationServer.cs" />
+    <Compile Include="Model\NotificationServerEventArgs.cs" />
+    <Compile Include="Model\Owner.cs" />
+    <Compile Include="Model\OwnerCollection.cs" />
+    <Compile Include="Model\Primitives\CustomCollectionBase.cs" />
+    <Compile Include="Model\RecurrenceGenerator.cs" />
+    <Compile Include="Model\Reminder.cs" />
+    <Compile Include="Model\ReminderCollection.cs" />
+    <Compile Include="Model\WeeklyRecurrenceSettings.cs" />
+    <Compile Include="Model\WorkDay.cs" />
+    <Compile Include="Model\WorkDayCollection.cs" />
+    <Compile Include="Model\WorkTime.cs" />
+    <Compile Include="Model\Year.cs" />
+    <Compile Include="Model\YearlyRecurrenceSettings.cs" />
+    <Compile Include="MonthView\ModelMonthViewConnector.cs" />
+    <Compile Include="MonthView\MonthView.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="MonthView\MonthWeek.cs" />
+    <Compile Include="NativeFunctions.cs" />
+    <Compile Include="PosWin.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="PosWin.Designer.cs">
+      <DependentUpon>PosWin.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="ScheduleSettings.cs" />
+    <Compile Include="TimeIndicator\TimeIndicator.cs" />
+    <Compile Include="TimeIndicator\TimeIndicatorCollection.cs" />
+    <Compile Include="TimeLineView\DayInfo.cs" />
+    <Compile Include="TimeLineView\ModelTimeLineViewConnector.cs" />
+    <Compile Include="TimeLineView\TimeLineHeaderPanel.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="TimeLineView\TimeLineHScrollPanel.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="TimeLineView\TimeLineView.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="TimeLineView\TimeLineVScrollPanel.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="VScrollPanel.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="WeekView\AllDayPanel.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="WeekView\ColumnList.cs" />
+    <Compile Include="WeekView\DayColumn.cs" />
+    <Compile Include="WeekView\DayView.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="WeekView\ModelWeekDayViewConnector.cs" />
+    <Compile Include="WeekView\TimeRulerPanel.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="WeekView\WeekDayView.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="WeekView\WeekDayVScrollPanel.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="WeekView\WeekView.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="WinApi.cs" />
+    <Compile Include="YearView\ModelYearViewConnector.cs" />
+    <Compile Include="YearView\YearMonth.cs" />
+    <Compile Include="YearView\YearView.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="YearView\YearViewVScrollPanel.cs">
+      <SubType>Component</SubType>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="CalendarView.ico" />
+    <EmbeddedResource Include="DateNavigator.resx">
+      <DependentUpon>DateNavigator.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="DateNavigator.ico" />
+    <EmbeddedResource Include="PosWin.resx">
+      <DependentUpon>PosWin.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="dotnetbar.snk" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\DotNetBar.csproj">
+      <Project>{36546CE3-335C-4AB6-A2F3-40F8C818BC66}</Project>
+      <Name>DotNetBar</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+      <Visible>False</Visible>
+      <ProductName>Windows Installer 3.1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/ItemRect.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/ItemRect.cs
new file mode 100644
index 00000000..63afa52f
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/ItemRect.cs	
@@ -0,0 +1,128 @@
+#if FRAMEWORK20
+using System.Drawing;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Schedule
+{
+    /// <summary>
+    /// DayRect array management class
+    /// </summary>
+    public class ItemRects
+    {
+        #region Private variables
+
+        private ItemRect[] _ItemRects;
+
+        #endregion
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="baseItem"></param>
+        /// <param name="length">Rectangle array length</param>
+        public ItemRects(BaseItem baseItem, int length)
+        {
+            _ItemRects = new ItemRect[length];
+
+            for (int i = 0; i < length; i++)
+                _ItemRects[i] = new ItemRect(baseItem);
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the Rectangle array
+        /// </summary>
+        public ItemRect[] Rects
+        {
+            get { return (_ItemRects); }
+        }
+
+        /// <summary>
+        /// Gets  and sets a specific array Rectangle
+        /// </summary>
+        /// <param name="index">Rectangle index to get</param>
+        /// <returns>Rectangle</returns>
+        public ItemRect this[int index]
+        {
+            get { return (_ItemRects[index]); }
+            set { _ItemRects[index] = value; }
+        }
+
+        #endregion
+    }
+
+    /// <summary>
+    /// Simple DayRect class
+    /// </summary>
+    public class ItemRect
+    {
+        #region Private variables
+
+        private BaseItem _BaseItem;     // BaseItem
+        private Rectangle _Bounds;      // Bounds
+        private bool _IsSelected;       // Rect selection
+
+        #endregion
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="baseItem">BaseItem</param>
+        public ItemRect(BaseItem baseItem)
+        {
+            _BaseItem = baseItem;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets and sets the bounding rect
+        /// </summary>
+        public Rectangle Bounds
+        {
+            get { return (_Bounds); }
+            set { _Bounds = value; }
+        }
+
+        /// <summary>
+        /// Gets and sets the rect selection status
+        /// </summary>
+        public bool IsSelected
+        {
+            get { return (_IsSelected); }
+
+            set
+            {
+                if (_IsSelected != value)
+                {
+                    _IsSelected = value;
+
+                    Invalidate();
+                }
+            }
+        }
+
+        #endregion
+
+        #region Public methods
+
+        /// <summary>
+        /// Invalidates the given rectangle
+        /// </summary>
+        public void Invalidate()
+        {
+            if (_BaseItem != null)
+            {
+                Control c = (Control)_BaseItem.GetContainerControl(true);
+
+                if (c != null)
+                    c.Invalidate(_Bounds);
+            }
+        }
+
+        #endregion
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/Appointment.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/Appointment.cs
new file mode 100644
index 00000000..f563b001
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/Appointment.cs	
@@ -0,0 +1,1214 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel;
+using System.Collections.ObjectModel;
+using System.Collections;
+
+namespace DevComponents.Schedule.Model
+{
+    /// <summary>
+    /// Represents an calendar appointment.
+    /// </summary>
+    public class Appointment : INotifyPropertyChanged, INotifySubPropertyChanged
+    {
+        #region Private Variables
+
+        private static long AutoIdCounter;
+        private States _States;
+
+        #endregion
+
+        #region Events
+        /// <summary>
+        /// Occurs when system time reaches the appointment start time and StartTimeAction is set to fire event. Note that event handler will be called on the thread of System.Timer which is different
+        /// than UI thread. You should use BeginInvoke calls to marshal the calls to your UI thread.
+        /// </summary>
+        [Description("Occurs when system time reaches the appointment start time and StartTimeAction is set to fire event.")]
+        public event EventHandler StartTimeReached;
+        
+        #endregion
+
+        #region Constructor
+        /// <summary>
+        /// Initializes a new instance of the Appointment class.
+        /// </summary>
+        public Appointment()
+        {
+            InitDefaultStates();
+
+            _Reminders = new ReminderCollection(this);
+            _AutoId = ++AutoIdCounter;
+        }
+        /// <summary>
+        /// Initializes a new instance of the Appointment class.
+        /// </summary>
+        /// <param name="subject">Appointment subject.</param>
+        /// <param name="startTime">Appointment start time</param>
+        /// <param name="endTime">Appointment end time</param>
+        public Appointment(DateTime startTime, DateTime endTime, string subject)
+            : this()
+        {
+            Subject = subject;
+            StartTime = startTime;
+            EndTime = endTime;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the Appointment class.
+        /// </summary>
+        /// <param name="subject">Appointment subject.</param>
+        /// <param name="startTime">Appointment start time</param>
+        /// <param name="endTime">Appointment end time</param>
+        /// <param name="ownerKey">Appointment owner key</param>
+        public Appointment(DateTime startTime, DateTime endTime, string subject, string ownerKey)
+            : this()
+        {
+            Subject = subject;
+            StartTime = startTime;
+            EndTime = endTime;
+            OwnerKey = ownerKey;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the Appointment class.
+        /// </summary>
+        /// <param name="subject">Appointment subject.</param>
+        /// <param name="startTime">Appointment start time</param>
+        /// <param name="durationInMinutes">Appointment duration in minutes</param>
+        public Appointment(DateTime startTime, double durationInMinutes, string subject)
+            : this()
+        {
+            Subject = subject;
+            StartTime = startTime;
+            EndTime = startTime.AddMinutes(durationInMinutes);
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the Appointment class.
+        /// </summary>
+        /// <param name="subject">Appointment subject.</param>
+        /// <param name="startTime">Appointment start time</param>
+        /// <param name="durationInMinutes">Appointment duration in minutes</param>
+        /// <param name="ownerKey">Appointment owner key</param>
+        public Appointment(DateTime startTime, double durationInMinutes, string subject, string ownerKey)
+            : this()
+        {
+            Subject = subject;
+            StartTime = startTime;
+            EndTime = startTime.AddMinutes(durationInMinutes);
+            OwnerKey = ownerKey;
+        }
+
+        #region InitDefaultStates
+
+        private void InitDefaultStates()
+        {
+            SetState(States.Visible, true);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal Implementation
+
+        /// <summary>
+        /// Gets or sets whether appointment is 'private'. This only has
+        /// meaning in ICS import/export procesing. Default value is false.
+        /// </summary>
+        [DefaultValue(false)]
+        public bool Private
+        {
+            get { return (TestState(States.Private)); }
+
+            set
+            {
+                if (value != Private)
+                {
+                    bool oldValue = Private;
+
+                    SetState(States.Private, value);
+
+                    OnPropertyChanged(new PropertyChangedEventArgs("Private"));
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether appointment is visible in user interface views. Default value is true.
+        /// </summary>
+        [DefaultValue(true)]
+        public bool Visible
+        {
+            get { return (TestState(States.Visible)); }
+
+            set
+            {
+                if (value != Visible)
+                {
+                    bool oldValue = Visible;
+
+                    SetState(States.Visible, value);
+
+                    OnVisibleChanged(oldValue, value);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Called when Visible property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnVisibleChanged(bool oldValue, bool newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("Visible"));
+        }
+
+        private string _Tooltip = "";
+        /// <summary>
+        /// Gets or sets the tooltip that is assigned to the appointment view.
+        /// </summary>
+        [DefaultValue("")]
+        public string Tooltip
+        {
+            get { return _Tooltip; }
+            set
+            {
+                if (value == null) value = "";
+                if (value != _Tooltip)
+                {
+                    object oldValue = _Tooltip;
+                    _Tooltip = value;
+                    OnTooltipChanged(oldValue, value);
+                }
+            }
+        }
+
+        private void OnTooltipChanged(object oldValue, object newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("Tooltip"));
+            
+        }
+        private string _CategoryColor;
+        /// <summary>
+        /// Gets or sets the appointment category color string based key that is used to lookup for appointment background and border colors.
+        /// Use static members on Appointment class to assign the category color for example Appointment.CategoryRed.
+        /// </summary>
+        public string CategoryColor
+        {
+            get { return _CategoryColor; }
+            set
+            {
+                if (value != _CategoryColor)
+                {
+                    string oldValue = _CategoryColor;
+                    _CategoryColor = value;
+                    OnCategoryColorChanged(oldValue, value);
+                }
+            }
+        }
+
+        private void OnCategoryColorChanged(string oldValue, string newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("CategoryColor"));
+        }
+
+        private string _TimeMarkedAs;
+        /// <summary>
+        /// Gets or sets how the time used by appointment is marked on calendar. For example Free, Tentative, Busy etc.
+        /// Use static members on Appointment class to assign the time marker for example Appointment.TimeMarkerBusy
+        /// </summary>
+        public string TimeMarkedAs
+        {
+            get { return _TimeMarkedAs; }
+            set
+            {
+                if (value != _TimeMarkedAs)
+                {
+                    string oldValue = _TimeMarkedAs;
+                    _TimeMarkedAs = value;
+                    OnTimeMarkedAsChanged(oldValue, value);
+                }
+            }
+        }
+        private void OnTimeMarkedAsChanged(string oldValue, string newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("TimeMarkedAs"));
+            
+        }
+
+        private ReminderCollection _Reminders = null;
+        /// <summary>
+        /// Gets the collection of reminders associated with this Appointment.
+        /// </summary>
+        [Browsable(false)]
+        public ReminderCollection Reminders
+        {
+            get { return _Reminders; }
+        }
+
+        private string _Subject = "";
+        /// <summary>
+        /// Gets or sets the appointment subject.
+        /// </summary>
+        [DefaultValue("")]
+        public string Subject
+        {
+            get { return _Subject; }
+            set
+            {
+                if (_Subject != value)
+                {
+                    string oldValue = _Subject;
+                    _Subject = value;
+                    OnSubjectChanged(oldValue, _Subject);
+                }
+            }
+        }
+
+        private void OnSubjectChanged(string oldValue, string newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("Subject"));
+        }
+
+        private string _Description = "";
+        /// <summary>
+        /// Gets or sets the appointment description.
+        /// </summary>
+        [DefaultValue("")]
+        public string Description
+        {
+            get { return _Description; }
+            set
+            {
+                if (_Description != value)
+                {
+                    string oldValue = _Description;
+                    _Description = value;
+                    OnDescriptionChanged(oldValue, _Description);
+                }
+            }
+        }
+
+        private void OnDescriptionChanged(string oldValue, string newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("Description"));
+        }
+
+        private string _DisplayTemplate = "";
+        /// <summary>
+        /// Gets or sets the appointment display template.
+        /// </summary>
+        [DefaultValue("")]
+        public string DisplayTemplate
+        {
+            get { return _DisplayTemplate; }
+
+            set
+            {
+                if (_DisplayTemplate != value)
+                {
+                    _DisplayTemplate = value;
+
+                    OnDisplayTemplateChanged();
+                }
+            }
+        }
+
+        private void OnDisplayTemplateChanged()
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("DisplayTemplate"));
+        }
+
+        /// <summary>
+        /// Gets or sets whether appointment is selected in the user interface.
+        /// </summary>
+        [Browsable(false)]
+        public bool IsSelected
+        {
+            get { return (TestState(States.Selected)); }
+
+            set
+            {
+                if (value != IsSelected)
+                {
+                    bool oldValue = IsSelected;
+
+                    SetState(States.Selected, value);
+
+                    OnIsSelectedChanged(oldValue, value);
+                }
+            }
+        }
+
+        private void OnIsSelectedChanged(bool oldValue, bool newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("IsSelected"));
+            
+        }
+
+        /// <summary>
+        /// Gets or sets whether appointment modification through user interface is disabled. Default value is false.
+        /// </summary>
+        [DefaultValue(false)]
+        public bool Locked
+        {
+            get { return (TestState(States.Locked)); }
+
+            set
+            {
+                if (value != Locked)
+                {
+                    bool oldValue = Locked;
+
+                    SetState(States.Locked, value);
+
+                    OnLockedChanged(oldValue, value);
+                }
+            }
+        }
+
+        private void OnLockedChanged(bool oldValue, bool newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("Locked"));
+            
+        }
+
+        private DateTime _StartTime;
+        /// <summary>
+        /// Gets or sets the appointment start time.
+        /// </summary>
+        public DateTime StartTime
+        {
+            get { return GetTimeZoneDateTime(_StartTime); }
+            set
+            {
+                value = GetUTCDateTime(CalendarModel.GetCalendarDateTime(value));
+                if (!_StartTime.Equals(value))
+                {
+                    bool oldMultiDay = this.IsMultiDayOrAllDayEvent;
+                    DateTime oldValue = _StartTime;
+                    _StartTime = value;
+                    OnStartTimeChanged(oldValue, _StartTime);
+                    if(oldMultiDay!=this.IsMultiDayOrAllDayEvent)
+                        OnPropertyChanged(new PropertyChangedEventArgs("IsMultiDayOrAllDayEvent"));
+                }
+            }
+        }
+
+        private void UpdateReminderStartTime(DateTime oldStartTime, DateTime newStartTime)
+        {
+            if(oldStartTime==DateTime.MinValue) return;
+
+            foreach (Reminder item in _Reminders)
+            {
+                item.ReminderTime = newStartTime.Add(item.ReminderTime.Subtract(oldStartTime));
+            }
+        }
+        private void OnStartTimeChanged(DateTime oldValue, DateTime newValue)
+        {
+            UpdateReminderStartTime(oldValue, newValue);
+            UpdateNotification();
+            OnPropertyChanged(new AppointmentTimePropertyChangedEventArgs("StartTime", oldValue, newValue));
+            OnPropertyChanged(new PropertyChangedEventArgs("LocalStartTime"));
+        }
+
+        internal void InvokeLocalTimePropertyChange()
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("LocalStartTime"));
+            OnPropertyChanged(new PropertyChangedEventArgs("LocalEndTime"));
+        }
+
+        private DateTime _EndTime;
+        /// <summary>
+        /// Gets or sets the appointment end time.
+        /// </summary>
+        public DateTime EndTime
+        {
+            get 
+            {
+                return GetTimeZoneDateTime(_EndTime); 
+            }
+            set 
+            {
+                value = GetUTCDateTime(CalendarModel.GetCalendarDateTime(value));
+                if (!_EndTime.Equals(value))
+                {
+                    bool oldMultiDay = this.IsMultiDayOrAllDayEvent;
+
+                    DateTime oldValue = _EndTime;
+                    _EndTime = value;
+                    OnEndTimeChanged(oldValue, _EndTime);
+
+                    if (oldMultiDay != this.IsMultiDayOrAllDayEvent)
+                        OnPropertyChanged(new PropertyChangedEventArgs("IsMultiDayOrAllDayEvent"));
+                }
+            }
+        }
+
+        private void OnEndTimeChanged(DateTime oldValue, DateTime newValue)
+        {
+            OnPropertyChanged(new AppointmentTimePropertyChangedEventArgs("EndTime", oldValue, newValue));
+            OnPropertyChanged(new PropertyChangedEventArgs("LocalEndTime"));
+        }
+
+        internal bool InMoveTo
+        {
+            get { return TestState(States.InMoveTo); }
+            set { SetState(States.InMoveTo, value); }
+        }
+
+        internal bool StartTimeNotificationRegistered
+        {
+            get { return TestState(States.StartTimeNotificationRegistered); }
+            set { SetState(States.StartTimeNotificationRegistered, value); }
+        }
+
+        /// <summary>
+        /// Moves the appointment to the specified date and time while keeping its duration constant.
+        /// </summary>
+        /// <param name="newStartTime">New start date and time for appointment.</param>
+        public void MoveTo(DateTime newStartTime)
+        {
+            TimeSpan duration = EndTime.Subtract(StartTime);
+            DateTime oldStartTime = this.LocalStartTime;
+            try
+            {
+                InMoveTo = true;
+                this.LocalStartTime = newStartTime;
+                this.LocalEndTime = newStartTime.Add(duration);
+
+                foreach (Reminder item in this.Reminders)
+                {
+                    TimeSpan span = item.ReminderTime.Subtract(oldStartTime);
+                    item.ReminderTime = newStartTime.Add(span);
+                }
+            }
+            finally
+            {
+                InMoveTo = false;
+            }
+        }
+
+        private TimeZoneInfo _TimeZone;
+        /// <summary>
+        /// Gets or sets the time-zone this appointment is defined in. Default value is null which indicates that appointment is
+        /// in current system time zone. Note that setting the time zone will affect StartTime and EndTime of appointment if set.
+        /// It will convert them to the TimeZone you set but as absolute values meaning that 10:00 AM in previous time zone
+        /// will become 10:00 AM in TimeZone you just assigned.
+        /// </summary>
+        [DefaultValue(null)]
+        public TimeZoneInfo TimeZone
+        {
+            get { return _TimeZone; }
+            set
+            {
+                if (value != _TimeZone)
+                {
+                    TimeZoneInfo oldValue = _TimeZone;
+                    _TimeZone = value;
+                    OnTimeZoneChanged(oldValue, value);
+                }
+            }
+        }
+
+        private void OnTimeZoneChanged(TimeZoneInfo oldValue, TimeZoneInfo newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("TimeZone"));
+            // Update start and end time
+            if (_StartTime.Kind == DateTimeKind.Utc)
+            {
+                DateTime date = TimeZoneInfo.ConvertTimeFromUtc(_StartTime, oldValue ?? TimeZoneInfo.Local);
+                this.StartTime = date;
+            }
+            if (_EndTime.Kind == DateTimeKind.Utc)
+            {
+                DateTime date = TimeZoneInfo.ConvertTimeFromUtc(_EndTime, oldValue ?? TimeZoneInfo.Local);
+                this.EndTime = date;
+            }
+        }
+
+        internal DateTime GetValidDateTime(DateTime date)
+        {
+            if (date == DateTime.MinValue || date == DateTime.MaxValue || date.Kind == DateTimeKind.Utc)
+                return date;
+            TimeZoneInfo timeZone = _TimeZone ?? TimeZoneInfo.Local;
+            if (timeZone.IsInvalidTime(date))
+            {
+                while (timeZone.IsInvalidTime(date))
+                    date = date.AddHours(1);
+            }
+            return date;
+        }
+
+        internal DateTime GetUTCDateTime(DateTime date)
+        {
+            if (date == DateTime.MinValue || date == DateTime.MaxValue || date.Kind == DateTimeKind.Utc)
+                return date;
+            if (_TimeZone == null)
+                return TimeZoneInfo.ConvertTimeToUtc(date);
+            return TimeZoneInfo.ConvertTimeToUtc(date, _TimeZone);
+        }
+
+        private DateTime GetTimeZoneDateTime(DateTime date)
+        {
+            if (date.Kind != DateTimeKind.Utc) return date;
+            TimeZoneInfo zone = _TimeZone;
+            if (zone == null) zone = TimeZoneInfo.Local;
+            return TimeZoneInfo.ConvertTimeFromUtc(date, zone);
+        }
+
+        /// <summary>
+        /// Gets or sets the StartTime of appointment in local, display time-zone.
+        /// </summary>
+        public DateTime LocalStartTime
+        {
+            get
+            {
+                return GetLocalDateTime(_StartTime);
+            }
+            set
+            {
+                StartTime = LocalToCurrenTimeZone(value);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the StartTime of appointment in local, display time-zone.
+        /// </summary>
+        public DateTime LocalEndTime
+        {
+            get
+            {
+                return GetLocalDateTime(_EndTime);
+            }
+            set
+            {
+                EndTime = LocalToCurrenTimeZone(value);
+            }
+        }
+
+        /// <summary>
+        /// Gets the UTC Start Time of appointment.
+        /// </summary>
+        public DateTime UtcStartTime
+        {
+            get { return _StartTime; }
+        }
+
+        /// <summary>
+        /// Gets the UTC End Time of appointment.
+        /// </summary>
+        public DateTime UtcEndTime
+        {
+            get { return _EndTime; }
+        }
+
+        private DateTime LocalToCurrenTimeZone(DateTime value)
+        {
+            if (_TimeZone == null)
+            {
+                return TimeZoneInfo.ConvertTimeFromUtc(TimeZoneInfo.ConvertTimeToUtc(value, GetLocalTimeZone()), TimeZoneInfo.Local);
+            }
+
+            DateTime date = TimeZoneInfo.ConvertTimeToUtc(value, GetLocalTimeZone());
+            return TimeZoneInfo.ConvertTimeFromUtc(date, _TimeZone);
+        }
+
+        internal DateTime GetLocalDateTime(DateTime value)
+        {
+            if (value.Kind != DateTimeKind.Utc || value == DateTime.MinValue || value == DateTime.MaxValue) return value;
+            return TimeZoneInfo.ConvertTimeFromUtc(value, GetLocalTimeZone());
+        }
+
+        private TimeZoneInfo GetLocalTimeZone()
+        {
+            if (!string.IsNullOrEmpty(_OwnerKey) && _Calendar != null)
+            {
+                Owner owner = _Calendar.Owners[_OwnerKey];
+                if (owner != null && owner.DisplayTimeZone != null)
+                    return owner.DisplayTimeZone;
+            }
+            if (_Calendar == null || _Calendar.DisplayTimeZone == null) return TimeZoneInfo.Local;
+            return _Calendar.DisplayTimeZone;
+        }
+
+        private CalendarModel _Calendar = null;
+        /// <summary>
+        /// Gets the calendar appointment is associated with.
+        /// </summary>
+        [Browsable(false)]
+        public CalendarModel Calendar
+        {
+            get { return _Calendar; }
+            internal set
+            {
+                if (_Calendar != value)
+                {
+                    _Calendar = value;
+                    UpdateNotification();
+                }
+            }
+        }
+
+        private void UpdateNotification()
+        {
+            if (_Calendar == null)
+            {
+                if (StartTimeNotificationRegistered)
+                    NotificationServer.Unregister(this.StartTimeNotificationRequest);
+                StartTimeNotificationRegistered = false;
+                this.StartTimeNotificationRequest = null;
+
+                foreach (Reminder reminder in this.Reminders)
+                {
+                    reminder.UpdateNotifications();
+                }
+                return;
+            }
+
+            // Get Now in UTC of current machine, _StartTime is already UTC
+            DateTime now = TimeZoneInfo.ConvertTimeToUtc(CalendarModel.GetCalendarDateTime(CalendarModel.CurrentDateTime));
+
+            // Check start-time notification requirement
+            if (_StartTime != DateTime.MinValue && _StartTimeAction != eStartTimeAction.None && _StartTime > now)
+            {
+                if (StartTimeNotificationRegistered)
+                    NotificationServer.Unregister(this.StartTimeNotificationRequest);
+                NotificationServer.Register(this.StartTimeNotificationRequest);
+                StartTimeNotificationRegistered = true;
+            }
+            else if (StartTimeNotificationRegistered)
+                NotificationServer.Unregister(this.StartTimeNotificationRequest);
+
+            // Check reminders notification requirement
+            foreach (Reminder reminder in this.Reminders)
+            {
+                reminder.UpdateNotifications();
+            }
+        }
+
+        private DateTime GetNextNotificationTime()
+        {
+            DateTime nextNotify = DateTime.MinValue;
+
+            if (_StartTime != DateTime.MinValue && _StartTimeAction != eStartTimeAction.None)
+                nextNotify = _StartTime;
+
+            return nextNotify;
+        }
+
+        private bool NeedsNotification
+        {
+            get
+            {
+                if (_StartTime > DateTime.MinValue && _StartTimeAction != eStartTimeAction.None)
+                    return true;
+                // Check reminders
+
+                return false;
+            }
+        }
+
+        private eStartTimeAction _StartTimeAction = eStartTimeAction.None;
+        /// <summary>
+        /// Gets or sets the action performed when StartTime of appointment is reached. Default is none.
+        /// </summary>
+        [DefaultValue(eStartTimeAction.None)]
+        public eStartTimeAction StartTimeAction
+        {
+            get { return _StartTimeAction; }
+            set 
+            {
+                if (_StartTimeAction != value)
+                {
+                    eStartTimeAction oldValue = _StartTimeAction;
+                    _StartTimeAction = value;
+                    OnStartTimeActionChanged(oldValue, _StartTimeAction);
+                }
+            }
+        }
+
+        private void OnStartTimeActionChanged(eStartTimeAction oldValue, eStartTimeAction newValue)
+        {
+            if (oldValue == eStartTimeAction.None || newValue == eStartTimeAction.None)
+                UpdateNotification();
+            OnPropertyChanged(new PropertyChangedEventArgs("StartTimeAction"));
+        }
+
+        private NotificationRequest _StartTimeNotificationRequest = null;
+        private NotificationRequest StartTimeNotificationRequest
+        {
+            get
+            {
+                if (_StartTimeNotificationRequest == null)
+                {
+                    _StartTimeNotificationRequest = new NotificationRequest(_StartTime, new NotificationServerEventHandler(OnStartTimeNotification));
+                }
+                else
+                    _StartTimeNotificationRequest.NotificationTime = _StartTime;
+                return _StartTimeNotificationRequest;
+            }
+            set
+            {
+                _StartTimeNotificationRequest = value;
+            }
+        }
+
+        private void OnStartTimeNotification(NotificationRequest request, NotificationServerEventArgs e)
+        {
+            if (_StartTimeAction != eStartTimeAction.None)
+            {
+                this.StartTimeNotificationRequest = null;
+                ProcessStartTimeReachedActions();
+            }
+        }
+
+        private void ProcessStartTimeReachedActions()
+        {
+            if (_Calendar != null)
+            {
+                _Calendar.InvokeAppointmentStartTimeReached(this);
+            }
+
+            if (_StartTimeAction == eStartTimeAction.None) return;
+
+            if ((_StartTimeAction & eStartTimeAction.StartTimeReachedEvent) != 0)
+            {
+                OnStartTimeReached(new EventArgs());
+            }
+
+            if ((_StartTimeAction & eStartTimeAction.Command) != 0)
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        /// <summary>
+        /// Raises the StartTimeReached event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnStartTimeReached(EventArgs e)
+        {
+            EventHandler h = StartTimeReached;
+            if (h != null)
+                h(this, e);
+        }
+
+        /// <summary>
+        /// Gets whether this appointment is the recurring appointment instance.
+        /// </summary>
+        [Browsable(false)]
+        public bool IsRecurringInstance
+        {
+            get { return (TestState(States.RecurringInstance)); }
+
+            set
+            {
+                if (value != IsRecurringInstance)
+                {
+                    bool oldValue = IsRecurringInstance;
+
+                    SetState(States.RecurringInstance, value);
+
+                    OnIsRecurringInstanceChanged(oldValue, value);
+                }
+            }
+        }
+
+        private void OnIsRecurringInstanceChanged(bool oldValue, bool newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("IsRecurringInstance"));
+        }
+
+        private Appointment _RootAppointment = null;
+        /// <summary>
+        /// Gets or sets the root appointment if this instance is an recurring appointment instance (IsRecurringInstance=true).
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public Appointment RootAppointment
+        {
+            get { return _RootAppointment; }
+            internal set { _RootAppointment = value; }
+        }
+
+        private object _Tag = null;
+        /// <summary>
+        /// Gets or sets additional data associated with the object.
+        /// </summary>
+        [DefaultValue(null)]
+        public object Tag
+        {
+            get { return _Tag; }
+            set
+            {
+                if (value != _Tag)
+                {
+                    object oldValue = _Tag;
+                    _Tag = value;
+                    OnTagChanged(oldValue, value);
+                }
+            }
+        }
+
+        private void OnTagChanged(object oldValue, object newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("Tag"));
+            
+        }
+
+        private AppointmentRecurrence _Recurrence = null;
+        /// <summary>
+        /// Gets or sets the reference to the appointment recurrence definition object which defines
+        /// recurring appointment properties and range.
+        /// </summary>
+        [DefaultValue(null)]
+        public AppointmentRecurrence Recurrence
+        {
+            get { return _Recurrence; }
+            set
+            {
+                if (value != _Recurrence)
+                {
+                    AppointmentRecurrence oldValue = _Recurrence;
+                    _Recurrence = value;
+                    OnRecurrenceChanged(oldValue, value);
+                }
+            }
+        }
+
+        private void OnRecurrenceChanged(AppointmentRecurrence oldValue, AppointmentRecurrence newValue)
+        {
+            if (oldValue != null)
+            {
+                oldValue.Appointment = null;
+                oldValue.SubPropertyChanged -= this.ChildPropertyChangedEventHandler;
+            }
+
+            if (newValue != null)
+            {
+                if (newValue.Appointment != null)
+                    throw new ArgumentException("Recurrence value already assigned to the appointment. Recurrence can be assigned to single appointment only");
+                newValue.Appointment = this;
+                newValue.SubPropertyChanged += this.ChildPropertyChangedEventHandler;
+            }
+            OnPropertyChanged(new PropertyChangedEventArgs("Recurrence"));
+        }
+
+        private SubPropertyChangedEventHandler _ChildPropertyChangedEventHandler = null;
+        private SubPropertyChangedEventHandler ChildPropertyChangedEventHandler
+        {
+            get
+            {
+                if (_ChildPropertyChangedEventHandler == null) _ChildPropertyChangedEventHandler = new SubPropertyChangedEventHandler(ChildPropertyChanged);
+                return _ChildPropertyChangedEventHandler;
+            }
+        }
+
+        private void ChildPropertyChanged(object sender, SubPropertyChangedEventArgs e)
+        {
+            OnSubPropertyChanged(e);
+        }
+
+        /// <summary>
+        /// Creates an copy of the appointment.
+        /// </summary>
+        /// <returns>Appointment copy.</returns>
+        public virtual Appointment Copy()
+        {
+            Appointment copy =
+                Activator.CreateInstance(this.GetType()) as Appointment;
+
+            copy.OwnerKey = this.OwnerKey;
+            copy.Description = this.Description;
+            copy.EndTime = this.EndTime;
+            copy.CategoryColor = this.CategoryColor;
+            copy.DisplayTemplate = this.DisplayTemplate;
+            copy.ImageAlign = this.ImageAlign;
+            copy.ImageKey = this.ImageKey;
+            copy.Locked = this.Locked;
+            copy.TimeMarkedAs = this.TimeMarkedAs;
+            copy.TimeZone = this.TimeZone;
+            copy.Tooltip = this.Tooltip;
+
+            if (_Reminders != null)
+            {
+                foreach (Reminder rem in _Reminders)
+                    copy.Reminders.Add(rem.Copy());
+            }
+
+            copy.StartTime = this.StartTime;
+            copy.StartTimeAction = this.StartTimeAction;
+
+            if (StartTimeReached != null)
+                copy.StartTimeReached = (EventHandler)this.StartTimeReached.Clone();
+
+            copy.Subject = this.Subject;
+            copy.Tag = this.Tag;
+
+            return copy;
+        }
+
+        private string _OwnerKey = "";
+        /// <summary>
+        /// Gets or sets the owner of the appointment. Default value is empty string which indicates default owner.
+        /// </summary>
+        public string OwnerKey
+        {
+            get { return _OwnerKey; }
+            set
+            {
+                if (value == null) value = "";
+                if (value != _OwnerKey)
+                {
+                    string oldValue = _OwnerKey;
+                    _OwnerKey = value;
+                    OnOwnerKeyChanged(oldValue, value);
+                }
+            }
+        }
+
+        private void OnOwnerKeyChanged(string oldValue, string newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("OwnerKey"));
+        }
+
+        /// <summary>
+        /// Gets whether appointment is all day event or whether it spans multiple days.
+        /// </summary>
+        public bool IsMultiDayOrAllDayEvent
+        {
+            get
+            {
+                if (this.StartTime < this.EndTime && (this.EndTime.Subtract(this.StartTime).TotalDays >= 1 || !DateTimeHelper.IsSameDay(this.StartTime, this.EndTime)))
+                    return true;
+                return false;
+            }
+        }
+
+        private int _Id = 0;
+        /// <summary>
+        /// Gets or sets the appointment identifier. This property is provided for your usage in serialization scenarios. It is not set by the control.
+        /// </summary>
+        [DefaultValue(0)]
+        public int Id
+        {
+            get { return _Id; }
+            set
+            {
+                if (value != _Id)
+                {
+                    int oldValue = _Id;
+                    _Id = value;
+                    OnIdChanged(oldValue, value);
+                }
+            }
+        }
+
+        private void OnIdChanged(int oldValue, int newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("Id"));
+        }
+
+        private long _AutoId;
+        /// <summary>
+        /// Gets the automatically generated identifier that identifies appointment.
+        /// </summary>
+        public long AutoId
+        {
+            get
+            {
+                return _AutoId;
+            }
+        }
+
+        public override string ToString()
+        {
+            return string.Format("Subject: {0}, StartTime: {1}, EndTime: {2}, Id: {3}, AutoId: {4}", this.Subject, this.StartTime, this.EndTime, this.Id, this.AutoId);
+        }
+
+        private string _ImageKey;
+        /// <summary>
+        /// Gets or sets the image key for the image displayed on appointment view. ImageList property on CalendarView must be set for this property to work.
+        /// </summary>
+        public string ImageKey
+        {
+            get { return _ImageKey; }
+            set
+            {
+                if (value != _ImageKey)
+                {
+                    string oldValue = _ImageKey;
+                    _ImageKey = value;
+                    OnImageKeyChanged(oldValue, value);
+                }
+            }
+        }
+
+        private void OnImageKeyChanged(string oldValue, string newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("ImageKey"));
+        }
+
+        private eImageContentAlignment _ImageAlign = eImageContentAlignment.TopLeft;
+        /// <summary>
+        /// Gets or sets the image alignment in relation to the appointment view content. Default value is TopLeft.
+        /// </summary>
+        public eImageContentAlignment ImageAlign
+        {
+            get { return _ImageAlign; }
+            set
+            {
+                if (value != _ImageAlign)
+                {
+                    eImageContentAlignment oldValue = _ImageAlign;
+                    _ImageAlign = value;
+                    OnImageAlignChanged(oldValue, value);
+                }
+            }
+        }
+
+        private void OnImageAlignChanged(eImageContentAlignment oldValue, eImageContentAlignment newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("ImageAlign"));
+            
+        }
+        #endregion
+
+        #region States
+
+        [Flags]
+        private enum States : uint
+        {
+            ReminderNotificationRegistered = (1U << 0),
+            StartTimeNotificationRegistered = (1U << 1),
+
+            Locked = (1U << 2),
+            Selected = (1U << 3),
+            Private = (1U << 4),
+            Visible = (1U << 5),
+
+            InMoveTo = (1U << 6),
+            RecurringInstance = (1U << 7),
+        }
+
+        #region TestState
+
+        private bool TestState(States state)
+        {
+            return ((_States & state) == state);
+        }
+
+        #endregion
+
+        #region SetState
+
+        private void SetState(States state, bool value)
+        {
+            if (value == true)
+                _States |= state;
+            else
+                _States &= ~state;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Static Members
+        public static readonly string CategoryYellow = "Yellow";
+        public static readonly string CategoryDefault = null;
+        public static readonly string CategoryBlue = "Blue";
+        public static readonly string CategoryGreen = "Green";
+        public static readonly string CategoryOrange = "Orange";
+        public static readonly string CategoryPurple = "Purple";
+        public static readonly string CategoryRed = "Red";
+
+        public static readonly string TimerMarkerDefault = null;
+        public static readonly string TimerMarkerBusy = "Busy";
+        public static readonly string TimerMarkerFree = "Free";
+        public static readonly string TimerMarkerTentative = "Tentative";
+        public static readonly string TimerMarkerOutOfOffice = "OutOfOffice";
+
+        internal static readonly string RecurrencePropertyName = "Recurrence";
+        #endregion
+
+        #region INotifyPropertyChanged Members
+        /// <summary>
+        /// Occurs when property value has changed.
+        /// </summary>
+        public event PropertyChangedEventHandler PropertyChanged;
+        /// <summary>
+        /// Raises the PropertyChanged event.
+        /// </summary>
+        /// <param name="e">Event arguments</param>
+        protected virtual void OnPropertyChanged(PropertyChangedEventArgs e)
+        {
+            PropertyChangedEventHandler eh = PropertyChanged;
+            if (eh != null) eh(this, e);
+            OnSubPropertyChanged(new SubPropertyChangedEventArgs(this, e));
+        }
+        #endregion
+
+        #region INotifySubPropertyChanged Members
+        /// <summary>
+        /// Occurs when property or property of child objects has changed. This event is similar to PropertyChanged event with key
+        /// difference that it occurs for the property changed of child objects as well.
+        /// </summary>
+        public event SubPropertyChangedEventHandler SubPropertyChanged;
+        /// <summary>
+        /// Raises the SubPropertyChanged event.
+        /// </summary>
+        /// <param name="e">Event arguments</param>
+        protected virtual void OnSubPropertyChanged(SubPropertyChangedEventArgs e)
+        {
+            SubPropertyChangedEventHandler eh = SubPropertyChanged;
+            if (eh != null) eh(this, e);
+        }
+        #endregion
+    }
+    /// <summary>
+    /// Provides more information about the time change for appointment StartTime and EndTime property changes.
+    /// </summary>
+    public class AppointmentTimePropertyChangedEventArgs : PropertyChangedEventArgs
+    {
+        /// <summary>
+        /// Gets the old value.
+        /// </summary>
+        public readonly DateTime OldTimeValue;
+        /// <summary>
+        /// Gets the new value.
+        /// </summary>
+        public readonly DateTime NewTimeValue;
+
+        /// <summary>
+        /// Initializes a new instance of the AppointmentTimePropertyChangedEventArgs class.
+        /// </summary>
+        /// <param name="oldTimeValue"></param>
+        /// <param name="newTimeValue"></param>
+        public AppointmentTimePropertyChangedEventArgs(string propertyName, DateTime oldTimeValue, DateTime newTimeValue)
+            : base(propertyName)
+        {
+            OldTimeValue = oldTimeValue;
+            NewTimeValue = newTimeValue;
+        }
+    }
+
+    public enum eImageContentAlignment
+    {
+        BottomCenter = 0x200,
+        BottomLeft = 0x100,
+        BottomRight = 0x400,
+        MiddleCenter = 0x20,
+        MiddleLeft = 0x10,
+        MiddleRight = 0x40,
+        TopCenter = 2,
+        TopLeft = 1,
+        TopRight = 4
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/AppointmentCollection.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/AppointmentCollection.cs
new file mode 100644
index 00000000..c88b7d4e
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/AppointmentCollection.cs	
@@ -0,0 +1,105 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Collections.ObjectModel;
+
+namespace DevComponents.Schedule.Model
+{
+    public class AppointmentCollection : Collection<Appointment>
+    {
+        #region Constructor
+        /// <summary>
+        /// Initializes a new instance of the AppointmentCollection class.
+        /// </summary>
+        /// <param name="calendar"></param>
+        public AppointmentCollection(CalendarModel calendar)
+        {
+            _Calendar = calendar;
+        }
+
+        #endregion
+
+        #region Internal Implementation
+
+
+        private CalendarModel _Calendar = null;
+        /// <summary>
+        /// Gets the calendar collection is associated with.
+        /// </summary>
+        public CalendarModel Calendar
+        {
+            get { return _Calendar; }
+            internal set { _Calendar = value; }
+        }
+
+        protected override void InsertItem(int index, Appointment item)
+        {
+            OnBeforeInsert(index, item);
+            base.InsertItem(index, item);
+            OnAfterInsert(index, item);
+        }
+
+        private void OnAfterInsert(int index, Appointment item)
+        {
+            _Calendar.InternalAppointmentAdded(item);
+        }
+
+        private void OnBeforeInsert(int index, Appointment item)
+        {
+            item.Calendar = _Calendar;
+        }
+
+        protected override void SetItem(int index, Appointment item)
+        {
+            Appointment app = this[index];
+            OnBeforeSetItem(index, app, item);
+            base.SetItem(index, item);
+            OnAfterSetItem(index, app, item);
+        }
+
+        private void OnAfterSetItem(int index, Appointment oldItem, Appointment newItem)
+        {
+            _Calendar.InternalAppointmentRemoved(oldItem, false);
+            _Calendar.InternalAppointmentAdded(newItem);
+        }
+
+        private void OnBeforeSetItem(int index, Appointment oldItem, Appointment newItem)
+        {
+            oldItem.Calendar = null;
+            newItem.Calendar = _Calendar;
+        }
+
+        protected override void RemoveItem(int index)
+        {
+            Appointment app = this[index];
+            OnBeforeRemove(index);
+            base.RemoveItem(index);
+            OnAfterRemove(index, app);
+        }
+
+        private void OnAfterRemove(int index, Appointment app)
+        {
+            _Calendar.InternalAppointmentRemoved(app, false);
+        }
+
+        private void OnBeforeRemove(int index)
+        {
+            this[index].Calendar = null;
+        }
+
+        protected override void ClearItems()
+        {
+            foreach (Appointment item in this)
+            {
+                item.Calendar = null;
+                _Calendar.InternalAppointmentRemoved(item, true);
+            }
+            base.ClearItems();
+            _Calendar.InternalAppointmentsCleared();
+        }
+        #endregion
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/AppointmentRecurrence.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/AppointmentRecurrence.cs
new file mode 100644
index 00000000..4a488efe
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/AppointmentRecurrence.cs	
@@ -0,0 +1,378 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel;
+using DevComponents.Schedule.Model.Primitives;
+
+namespace DevComponents.Schedule.Model
+{
+    /// <summary>
+    /// Represents appointment recurrence definition.
+    /// </summary>
+    public class AppointmentRecurrence : INotifyPropertyChanged, INotifySubPropertyChanged
+    {
+        #region Internal Implementation
+        public AppointmentRecurrence()
+        {
+            _SkippedRecurrences = new CustomCollection<DateTime>();
+            _SkippedRecurrences.CollectionChanged += new NotifyCollectionChangedEventHandler(SkippedRecurrencesCollectionChanged);
+        }
+
+        private eRecurrenceRangeLimitType _RangeType = eRecurrenceRangeLimitType.NoEndDate;
+        /// <summary>
+        /// Gets or sets the range type for the recurrence. Default value is no end date for recurrence.
+        /// </summary>
+        [DefaultValue(eRecurrenceRangeLimitType.NoEndDate)]
+        public eRecurrenceRangeLimitType RangeLimitType
+        {
+            get { return _RangeType; }
+            set
+            {
+                if (_RangeType != value)
+                {
+                    eRecurrenceRangeLimitType oldValue = _RangeType;
+                    _RangeType = value;
+                    OnRangeTypeChanged(oldValue, _RangeType);
+                }
+            }
+        }
+
+        private void OnRangeTypeChanged(eRecurrenceRangeLimitType oldValue, eRecurrenceRangeLimitType newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("RangeLimitType"));
+        }
+
+        private DateTime _RangeEndDate = DateTime.MinValue;
+        /// <summary>
+        /// Gets or sets the recurrence end date. To specify the end date for recurrence set this property and RangeLimitType property to RangeEndDate.
+        /// </summary>
+        public DateTime RangeEndDate
+        {
+            get { return _RangeEndDate; }
+            set 
+            {
+                if (_RangeEndDate != value)
+                {
+                    DateTime oldValue = _RangeEndDate;
+                    _RangeEndDate = value;
+                    OnRangeEndDateChanged(oldValue, _RangeEndDate);
+                }
+            }
+        }
+
+        private void OnRangeEndDateChanged(DateTime oldValue, DateTime newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("RangeEndDate"));
+        }
+
+        private int _RangeNumberOfOccurrences = 0;
+        /// <summary>
+        /// Gets or sets number of occurrences after which recurrence ends. To specify limited number of recurrences
+        /// set this property and set RangeLimitType to RangeNumberOfOccurrences.
+        /// </summary>
+        [DefaultValue(0)]
+        public int RangeNumberOfOccurrences
+        {
+            get { return _RangeNumberOfOccurrences; }
+            set
+            {
+                if (_RangeNumberOfOccurrences != value)
+                {
+                    if (value < 0) throw new ArgumentException("Negative values not allows for range limit.");
+
+                    int oldValue = _RangeNumberOfOccurrences;
+                    _RangeNumberOfOccurrences = value;
+                    OnRangeNumberOfOccurrencesChanged(oldValue, _RangeNumberOfOccurrences);
+                }
+            }
+        }
+
+        private void OnRangeNumberOfOccurrencesChanged(int oldValue, int newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("RangeNumberOfOccurrences"));
+        }
+
+        private object _Tag = null;
+        /// <summary>
+        /// Gets or sets additional data associated with the object.
+        /// </summary>
+        [DefaultValue(null)]
+        public object Tag
+        {
+            get { return _Tag; }
+            set
+            {
+                if (value != _Tag)
+                {
+                    object oldValue = _Tag;
+                    _Tag = value;
+                    OnTagChanged(oldValue, value);
+                }
+            }
+        }
+
+        private void OnTagChanged(object oldValue, object newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("Tag"));
+
+        }
+
+        private eRecurrencePatternType _RecurrenceType = eRecurrencePatternType.Daily;
+        /// <summary>
+        /// Gets or sets the recurring frequency for appointment i.e. daily, weekly, monthly or yearly.
+        /// Default value is Daily.
+        /// </summary>
+        [DefaultValue(eRecurrencePatternType.Daily)]
+        public eRecurrencePatternType RecurrenceType
+        {
+            get { return _RecurrenceType; }
+            set
+            {
+                if (value != _RecurrenceType)
+                {
+                    eRecurrencePatternType oldValue = _RecurrenceType;
+                    _RecurrenceType = value;
+                    OnRecurrenceTypeChanged(oldValue, value);
+                }
+            }
+        }
+
+        private void OnRecurrenceTypeChanged(eRecurrencePatternType oldValue, eRecurrencePatternType newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("RecurrenceType"));
+        }
+
+        internal void GenerateSubset(AppointmentSubsetCollection subsetCollection, DateTime startDate, DateTime endDate)
+        {
+            IRecurrenceGenerator generator = GetRecurrenceGenerator();
+
+            if (_RecurrenceType == eRecurrencePatternType.Daily)
+            {
+                generator.GenerateDailyRecurrence(subsetCollection, this, startDate, endDate);
+            }
+            else if (_RecurrenceType == eRecurrencePatternType.Weekly)
+            {
+                generator.GenerateWeeklyRecurrence(subsetCollection, this, startDate, endDate);
+            }
+            else if (_RecurrenceType == eRecurrencePatternType.Monthly)
+            {
+                generator.GenerateMonthlyRecurrence(subsetCollection, this, startDate, endDate);
+            }
+            else if (_RecurrenceType == eRecurrencePatternType.Yearly)
+            {
+                generator.GenerateYearlyRecurrence(subsetCollection, this, startDate, endDate);
+            }
+        }
+
+        private IRecurrenceGenerator _Generator = null;
+        private IRecurrenceGenerator GetRecurrenceGenerator()
+        {
+            if (_Generator == null) _Generator = new RecurrenceGenerator();
+            return _Generator;
+        }
+
+        private Appointment _Appointment;
+        /// <summary>
+        /// Gets reference to appointment recurrence is assigned to.
+        /// </summary>
+        [Browsable(false)]
+        public Appointment Appointment
+        {
+            get { return _Appointment; }
+            internal set { _Appointment = value; }
+        }
+
+        private DailyRecurrenceSettings _Daily;
+        /// <summary>
+        /// Gets the settings for Daily recurrence type.
+        /// </summary>
+        [Browsable(false)]
+        public DailyRecurrenceSettings Daily
+        {
+            get 
+            {
+                if (_Daily == null)
+                {
+                    _Daily = new DailyRecurrenceSettings(this);
+                    _Daily.SubPropertyChanged += this.ChildPropertyChangedEventHandler;
+                }
+                return _Daily; 
+            }
+        }
+
+        private WeeklyRecurrenceSettings _Weekly;
+        /// <summary>
+        /// Gets the settings for Weekly recurrence type.
+        /// </summary>
+        public WeeklyRecurrenceSettings Weekly
+        {
+            get 
+            {
+                if (_Weekly == null)
+                {
+                    _Weekly = new WeeklyRecurrenceSettings(this);
+                    _Weekly.SubPropertyChanged += this.ChildPropertyChangedEventHandler;
+                }
+                return _Weekly; 
+            }
+        }
+
+        private MonthlyRecurrenceSettings _Monthly;
+        /// <summary>
+        /// Gets the settings for monthly recurrence type.
+        /// </summary>
+        [Browsable(false)]
+        public MonthlyRecurrenceSettings Monthly
+        {
+            get 
+            {
+                if (_Monthly == null)
+                {
+                    _Monthly = new MonthlyRecurrenceSettings(this);
+                    _Monthly.SubPropertyChanged += this.ChildPropertyChangedEventHandler;
+                }
+                return _Monthly; 
+            }
+        }
+
+        private YearlyRecurrenceSettings _Yearly = null;
+        /// <summary>
+        /// Gets the settings for yearly recurrence type.
+        /// </summary>
+        public YearlyRecurrenceSettings Yearly
+        {
+            get
+            {
+                if (_Yearly == null)
+                {
+                    _Yearly = new YearlyRecurrenceSettings(this);
+                    _Yearly.SubPropertyChanged += this.ChildPropertyChangedEventHandler;
+                }
+                return _Yearly; 
+            }
+        }
+
+        private DateTime _RecurrenceStartDate = DateTime.MinValue;
+        /// <summary>
+        /// Gets or sets the recurrence start date. Default value is DateTime.MinValue which indicates that recurrence starts after
+        /// the appointment ends.
+        /// </summary>
+        public DateTime RecurrenceStartDate
+        {
+            get { return _RecurrenceStartDate; }
+            set
+            {
+                if (value != _RecurrenceStartDate)
+                {
+                    DateTime oldValue = _RecurrenceStartDate;
+                    _RecurrenceStartDate = value;
+                    OnRecurrenceStartDateChanged(oldValue, value);
+                }
+            }
+        }
+
+        private void OnRecurrenceStartDateChanged(DateTime oldValue, DateTime newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("RecurrenceStartDate"));
+        }
+
+        private SubPropertyChangedEventHandler _ChildPropertyChangedEventHandler = null;
+        private SubPropertyChangedEventHandler ChildPropertyChangedEventHandler
+        {
+            get
+            {
+                if (_ChildPropertyChangedEventHandler == null) _ChildPropertyChangedEventHandler = new SubPropertyChangedEventHandler(ChildPropertyChanged);
+                return _ChildPropertyChangedEventHandler;
+            }
+        }
+
+        private void ChildPropertyChanged(object sender, SubPropertyChangedEventArgs e)
+        {
+            OnSubPropertyChanged(e);
+        }
+
+        private CustomCollection<DateTime> _SkippedRecurrences = null;
+        /// <summary>
+        /// Gets or set the list of dates on which the recurrences are skipped.
+        /// </summary>
+        public CustomCollection<DateTime> SkippedRecurrences
+        {
+            get
+            {
+                return _SkippedRecurrences;
+            }
+        }
+        private void SkippedRecurrencesCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("SkippedRecurrences"));
+        }
+
+        private bool _IndependentVisibility = false;
+        /// <summary>
+        /// Gets or sets whether generated recurring appointments have independent Visible property setting from root Appointment. 
+        /// When set to true recurring appointment instances will not by default have Visible property set to the Visible property of root appointment. 
+        /// Default value is false which means recurring instances by default have Visible property set to the root appointment Visible property.
+        /// </summary>
+        public bool IndependentVisibility
+        {
+            get { return _IndependentVisibility; }
+            set
+            {
+                if (value != _IndependentVisibility)
+                {
+                    bool oldValue = _IndependentVisibility;
+                    _IndependentVisibility = value;
+                    OnIndependentVisibilityChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when IndependentVisibility property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnIndependentVisibilityChanged(bool oldValue, bool newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("IndependentVisibility"));
+        }
+        
+        #endregion
+
+        #region INotifyPropertyChanged Members
+        /// <summary>
+        /// Occurs when property value has changed.
+        /// </summary>
+        public event PropertyChangedEventHandler PropertyChanged;
+        /// <summary>
+        /// Raises the PropertyChanged event.
+        /// </summary>
+        /// <param name="e">Event arguments</param>
+        protected virtual void OnPropertyChanged(PropertyChangedEventArgs e)
+        {
+            PropertyChangedEventHandler eh = PropertyChanged;
+            if (eh != null) eh(this, e);
+            OnSubPropertyChanged(new SubPropertyChangedEventArgs(this, e));
+        }
+        #endregion
+
+        #region INotifySubPropertyChanged Members
+        /// <summary>
+        /// Occurs when property or property of child objects has changed. This event is similar to PropertyChanged event with key
+        /// difference that it occurs for the property changed of child objects as well.
+        /// </summary>
+        public event SubPropertyChangedEventHandler SubPropertyChanged;
+        /// <summary>
+        /// Raises the SubPropertyChanged event.
+        /// </summary>
+        /// <param name="e">Event arguments</param>
+        protected virtual void OnSubPropertyChanged(SubPropertyChangedEventArgs e)
+        {
+            SubPropertyChangedEventHandler eh = SubPropertyChanged;
+            if (eh != null) eh(this, e);
+        }
+        #endregion
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/AppointmentSubsetCollection.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/AppointmentSubsetCollection.cs
new file mode 100644
index 00000000..995fd1a2
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/AppointmentSubsetCollection.cs	
@@ -0,0 +1,232 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Collections.ObjectModel;
+using DevComponents.Schedule.Model.Primitives;
+
+namespace DevComponents.Schedule.Model
+{
+    /// <summary>
+    /// Represents subset of appointments collection.
+    /// </summary>
+    public class AppointmentSubsetCollection : CustomCollection<Appointment>
+    {
+        #region Private Variables
+        private DateTime _StartDate = DateTime.MinValue;
+        private DateTime _EndDate = DateTime.MinValue;
+        #endregion
+
+        #region Constructor
+        /// <summary>
+        /// Initializes a new instance of the AppointmentSubsetCollection class with appointments between given start and end date.
+        /// </summary>
+        /// <param name="calendar"></param>
+        /// <param name="start"></param>
+        /// <param name="end"></param>
+        public AppointmentSubsetCollection(CalendarModel calendar, DateTime start, DateTime end)
+        {
+            _Calendar = calendar;
+            _StartDate = start;
+            _EndDate = end;
+            PopulateCollection();
+        }
+        #endregion
+
+        #region Internal Implementation
+
+        private CalendarModel _Calendar = null;
+        /// <summary>
+        /// Gets the calendar collection is associated with this collection.
+        /// </summary>
+        public CalendarModel Calendar
+        {
+            get { return _Calendar; }
+            internal set { _Calendar = value; }
+        }
+
+        protected override void InsertItem(int index, Appointment item)
+        {
+            OnBeforeInsert(index, item);
+            base.InsertItem(index, item);
+        }
+
+        private void OnBeforeInsert(int index, Appointment item)
+        {
+            item.SubPropertyChanged += this.ChildPropertyChangedEventHandler;
+            item.Calendar = _Calendar;
+            if (item.IsRecurringInstance && _Calendar != null)
+                _Calendar.InternalAppointmentAdded(item);
+
+        }
+
+        protected override void SetItem(int index, Appointment item)
+        {
+            OnBeforeSetItem(index, item);
+            base.SetItem(index, item);
+        }
+
+        private void OnBeforeSetItem(int index, Appointment item)
+        {
+            Appointment app = this[index];
+            app.SubPropertyChanged -= this.ChildPropertyChangedEventHandler;
+            app.Calendar = null;
+            item.SubPropertyChanged += this.ChildPropertyChangedEventHandler;
+            app.Calendar = _Calendar;
+        }
+
+        protected override void RemoveItem(int index)
+        {
+            OnBeforeRemove(index);
+            base.RemoveItem(index);
+        }
+
+        private void OnBeforeRemove(int index)
+        {
+            Appointment item = this[index];
+            OnAppointmentRemoved(item);
+        }
+
+        private void OnAppointmentRemoved(Appointment item)
+        {
+            item.SubPropertyChanged -= this.ChildPropertyChangedEventHandler;
+            if (item.IsRecurringInstance && _Calendar != null)
+                _Calendar.InternalAppointmentRemoved(item, false);
+            if (item.IsRecurringInstance)
+                item.Calendar = null;
+        }
+        protected override void ClearItems()
+        {
+            foreach (Appointment item in this.GetItemsDirect())
+            {
+                OnAppointmentRemoved(item);
+            }
+            base.ClearItems();
+        }
+
+        private void PopulateCollection()
+        {
+            this.Clear();
+
+            foreach (Appointment app in _Calendar.Appointments)
+            {
+                if (app.LocalStartTime >= _StartDate && app.LocalStartTime <= _EndDate || app.LocalEndTime > _StartDate && (app.LocalEndTime <= _EndDate || app.LocalStartTime < _StartDate))
+                {
+                    this.Add(app);
+                }
+                if (app.Recurrence != null && IsRecurrenceInRange(app, _StartDate, _EndDate))
+                {
+                    int count = this.GetItemsDirect().Count;
+                    app.Recurrence.GenerateSubset(this, _StartDate, _EndDate);
+                    if (count == this.GetItemsDirect().Count && TotalDaysDuration(app.StartTime, app.EndTime) >= 1 &&
+                        app.LocalEndTime < _StartDate)
+                    {
+                        // Nothing generated lets wind back and look to see is there an recurrence that needs to be captured in this view
+                        int daysLookBack = TotalDaysDuration(app.StartTime, app.EndTime);
+                        DateTime start = _StartDate;
+                        for (int i = 0; i < daysLookBack; i++)
+                        {
+                            start = start.AddDays(-1);
+                            AppointmentSubsetCollection dayCollection = _Calendar.GetDay(start).Appointments;
+                            foreach (Appointment subAppointment in dayCollection)
+                            {
+                                if (subAppointment.IsRecurringInstance && subAppointment.RootAppointment == app &&
+                                    (subAppointment.LocalStartTime >= _StartDate && subAppointment.LocalStartTime <= _EndDate ||
+                                     subAppointment.LocalEndTime > _StartDate && (subAppointment.LocalEndTime <= _EndDate ||
+                                                                             subAppointment.LocalStartTime < _StartDate)))
+                                {
+                                    this.Add(subAppointment);
+                                    daysLookBack = -1;
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            _IsCollectionUpToDate = true;
+        }
+
+        private int TotalDaysDuration(DateTime startTime, DateTime endTime)
+        {
+            if (endTime.Hour == 0 && endTime.Minute == 0 && endTime.Second == 0)
+                endTime = endTime.AddMinutes(-1);
+            return (int)Math.Max(0, Math.Ceiling(endTime.Date.Subtract(startTime.Date).TotalDays));
+        }
+
+        private bool IsRecurrenceInRange(Appointment app, DateTime startDate, DateTime endDate)
+        {
+            if (app.Recurrence.RecurrenceType == eRecurrencePatternType.Yearly)
+            {
+                // Simple range check on number of occurrences
+                if (app.Recurrence.RangeLimitType == eRecurrenceRangeLimitType.RangeNumberOfOccurrences && app.LocalEndTime.Subtract(endDate).TotalDays / 365 > app.Recurrence.RangeNumberOfOccurrences)
+                    return false;
+                // Date check based on next expected recurrence date
+                if (app.Recurrence.Yearly.RepeatInterval > 1)
+                {
+                    DateTime nextRecurrence = DateTimeHelper.MaxDate(app.Recurrence.RecurrenceStartDate, app.EndTime.AddDays(1).Date);
+                    while (nextRecurrence < startDate)
+                        nextRecurrence = RecurrenceGenerator.GetNextYearlyRecurrence(app.Recurrence, nextRecurrence);
+                    if (nextRecurrence > endDate || nextRecurrence.Add(endDate.Subtract(startDate)) < startDate)
+                        return false;
+                }
+                else
+                {
+
+                    DateTime nextRecurrence = RecurrenceGenerator.GetNextYearlyRecurrence(app.Recurrence, startDate.Date.AddDays(-startDate.DayOfYear));
+                    if (nextRecurrence > endDate || nextRecurrence.Add(endDate.Subtract(startDate)) < startDate)
+                        return false;
+                }
+            }
+
+            if (app.Recurrence.RangeEndDate == DateTime.MinValue || app.Recurrence.RangeEndDate >= _EndDate || app.Recurrence.RangeEndDate < _EndDate && app.Recurrence.RangeEndDate > _StartDate)
+                return true;
+
+            return false;
+        }
+
+        private SubPropertyChangedEventHandler _ChildPropertyChangedEventHandler = null;
+        private SubPropertyChangedEventHandler ChildPropertyChangedEventHandler
+        {
+            get
+            {
+                if (_ChildPropertyChangedEventHandler == null) _ChildPropertyChangedEventHandler = new SubPropertyChangedEventHandler(ChildPropertyChanged);
+                return _ChildPropertyChangedEventHandler;
+            }
+        }
+
+        private void ChildPropertyChanged(object sender, SubPropertyChangedEventArgs e)
+        {
+            InvalidateCollection();
+        }
+
+        /// <summary>
+        /// Invalidates collection content due to the change to appointments or some other condition. Invalidating collection
+        /// content causes the collection elements to be re-generated on next collection read access.
+        /// </summary>
+        public virtual void InvalidateCollection()
+        {
+            _IsCollectionUpToDate = false;
+        }
+
+        protected override void OnCollectionReadAccess()
+        {
+            if (!_IsCollectionUpToDate) PopulateCollection();
+            base.OnCollectionReadAccess();
+        }
+
+        private bool _IsCollectionUpToDate = false;
+        internal bool IsCollectionUpToDate
+        {
+            get { return _IsCollectionUpToDate; }
+            set
+            {
+                _IsCollectionUpToDate = value;
+            }
+        }
+        
+        #endregion
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/BaseWorkDay.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/BaseWorkDay.cs
new file mode 100644
index 00000000..050d0b9e
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/BaseWorkDay.cs	
@@ -0,0 +1,116 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel;
+
+namespace DevComponents.Schedule.Model
+{
+    /// <summary>
+    /// Defines a working day.
+    /// </summary>
+    public abstract class BaseWorkDay : INotifyPropertyChanged, INotifySubPropertyChanged
+    {
+        #region Internal Implementation
+        protected WorkTime _WorkStartTime = new WorkTime(8, 0);
+        /// <summary>
+        /// Gets or sets the work start time.
+        /// </summary>
+        public WorkTime WorkStartTime
+        {
+            get { return _WorkStartTime; }
+            set
+            {
+                WorkTime oldValue = _WorkStartTime;
+                _WorkStartTime = value;
+                OnWorkStartTimeChanged(oldValue, value);
+            }
+        }
+        /// <summary>
+        /// Called when WorkStartTime has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value.</param>
+        /// <param name="newValue">New property value.</param>
+        protected virtual void OnWorkStartTimeChanged(WorkTime oldValue, WorkTime newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("WorkStartTime"));
+        }
+
+        protected WorkTime _WorkEndTime = new WorkTime(17, 0);
+        /// <summary>
+        /// Gets or sets the work end time.
+        /// </summary>
+        public WorkTime WorkEndTime
+        {
+            get { return _WorkEndTime; }
+            set
+            {
+                WorkTime oldValue = _WorkEndTime;
+                _WorkEndTime = value;
+                OnWorkEndTimeChanged(oldValue, value);
+            }
+        }
+        /// <summary>
+        /// Called when WorkEndTime has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value.</param>
+        /// <param name="newValue">New property value.</param>
+        protected virtual void OnWorkEndTimeChanged(WorkTime oldValue, WorkTime newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("WorkEndTime"));
+
+        }
+
+        private CalendarModel _Calendar = null;
+        /// <summary>
+        /// Gets the calendar work day is associated with.
+        /// </summary>
+        [Browsable(false)]
+        public CalendarModel Calendar
+        {
+            get { return _Calendar; }
+            internal set
+            {
+                if (_Calendar != value)
+                {
+                    _Calendar = value;
+                }
+            }
+        }
+        #endregion
+
+
+        #region INotifyPropertyChanged Members
+        /// <summary>
+        /// Occurs when property value has changed.
+        /// </summary>
+        public event PropertyChangedEventHandler PropertyChanged;
+        /// <summary>
+        /// Raises the PropertyChanged event.
+        /// </summary>
+        /// <param name="e">Event arguments</param>
+        protected virtual void OnPropertyChanged(PropertyChangedEventArgs e)
+        {
+            PropertyChangedEventHandler eh = PropertyChanged;
+            if (eh != null) eh(this, e);
+            OnSubPropertyChanged(new SubPropertyChangedEventArgs(this, e));
+        }
+        #endregion
+
+        #region INotifySubPropertyChanged Members
+        /// <summary>
+        /// Occurs when property or property of child objects has changed. This event is similar to PropertyChanged event with key
+        /// difference that it occurs for the property changed of child objects as well.
+        /// </summary>
+        public event SubPropertyChangedEventHandler SubPropertyChanged;
+        /// <summary>
+        /// Raises the SubPropertyChanged event.
+        /// </summary>
+        /// <param name="e">Event arguments</param>
+        protected virtual void OnSubPropertyChanged(SubPropertyChangedEventArgs e)
+        {
+            SubPropertyChangedEventHandler eh = SubPropertyChanged;
+            if (eh != null) eh(this, e);
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/CalendarModel.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/CalendarModel.cs
new file mode 100644
index 00000000..610da751
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/CalendarModel.cs	
@@ -0,0 +1,595 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.ComponentModel;
+
+namespace DevComponents.Schedule.Model
+{
+    /// <summary>
+    /// Represents the calendar model control.
+    /// </summary>
+    public class CalendarModel : INotifyPropertyChanged, INotifySubPropertyChanged
+    {
+        #region Events
+        /// <summary>
+        /// Occurs when an appointment has been added to the model.
+        /// </summary>
+        public event AppointmentEventHandler AppointmentAdded;
+        /// <summary>
+        /// Occurs when an appointment has been removed from the model.
+        /// </summary>
+        public event AppointmentEventHandler AppointmentRemoved;
+        /// <summary>
+        /// Occurs when AppointmentStartTime has been reached. This event can be used to trigger appointment reminders. Note that event handler will be called on the thread of System.Timer which is different
+        /// than UI thread. You should use BeginInvoke calls to marshal the calls to your UI thread.
+        /// </summary>
+        public event AppointmentEventHandler AppointmentStartTimeReached;
+        /// <summary>
+        /// Occurs when Reminder's ReminderTime has been reached. Note that event handler will be called on the thread of System.Timer which is different
+        /// than UI thread. You should use BeginInvoke calls to marshal the calls to your UI thread.
+        /// </summary>
+        [Description("Occurs when Reminder's ReminderTime has been reached.")]
+        public event ReminderEventHandler ReminderNotification;
+        /// <summary>
+        /// Occurs when Appointments collection has been cleared.
+        /// </summary>
+        public event EventHandler AppointmentsCleared;
+        #endregion
+
+        #region Constructor
+
+        /// <summary>
+        /// Initializes a new instance of the CalendarModel class.
+        /// </summary>
+        public CalendarModel()
+        {
+            _Appointments = new AppointmentCollection(this);
+            _Owners = new OwnerCollection(this);
+            _WorkDays = new WorkDayCollection(this);
+            _CalendarWorkDays = new CalendarWorkDayCollection(this);
+            // Initialize default work-days
+            _WorkDays.Add(new WorkDay(DayOfWeek.Monday));
+            _WorkDays.Add(new WorkDay(DayOfWeek.Tuesday));
+            _WorkDays.Add(new WorkDay(DayOfWeek.Wednesday));
+            _WorkDays.Add(new WorkDay(DayOfWeek.Thursday));
+            _WorkDays.Add(new WorkDay(DayOfWeek.Friday));
+        }
+        #endregion
+
+        #region Internal Implementation
+        private AppointmentCollection _Appointments;
+        /// <summary>
+        /// Gets appointments associated with this calendar.
+        /// </summary>
+        public AppointmentCollection Appointments
+        {
+            get { return _Appointments; }
+        }
+
+        private OwnerCollection _Owners;
+        /// <summary>
+        /// Gets owners of appointments associated with this calendar.
+        /// </summary>
+        public OwnerCollection Owners
+        {
+            get { return _Owners; }
+        }
+
+        private WorkDayCollection _WorkDays;
+        /// <summary>
+        /// Gets working days associated with this calendar.
+        /// </summary>
+        public WorkDayCollection WorkDays
+        {
+            get { return _WorkDays; }
+        }
+
+        private CalendarWorkDayCollection _CalendarWorkDays = null;
+        /// <summary>
+        /// Gets the calendar/date based working days collection. This collection allows you to specify working time for specific dates. Values specified here take precedence over working hours set through WorkDays collection.
+        /// </summary>
+        public CalendarWorkDayCollection CalendarWorkDays
+        {
+            get { return _CalendarWorkDays; }
+        }
+
+        /// <summary>
+        /// Gets reference to the Day object which represents day in calendar.
+        /// </summary>
+        /// <param name="date">Date to retrieve day for.</param>
+        /// <returns>Returns reference to Day object.</returns>
+        public Day GetDay(DateTime date)
+        {
+            Year year = null;
+            if(!_Years.TryGetValue(date.Year, out year))
+                year = CreateYear(date.Year);
+
+            return year.Months[date.Month - 1].Days[date.Day - 1];
+            //return new Day(date, this);
+        }
+
+        private Year CreateYear(int y)
+        {
+            Year year = new Year(y, this);
+            _Years.Add(y, year);
+            return year;
+        }
+
+        /// <summary>
+        /// Returns true if appointment overlapps with one or more of the appointments in the model.
+        /// </summary>
+        /// <param name="app">Appointment to check overlap for.</param>
+        /// <returns>true if there are appointments overlapping appointment otherwise false.</returns>
+        public bool ContainsOverlappingAppointments(Appointment app)
+        {
+            int duration = (int)Math.Max(1, app.EndTime.Subtract(app.StartTime).TotalDays);
+            for (int i = 0; i < duration; i++)
+            {
+                DateTime date = app.StartTime.Date.AddDays(i);
+                Day day = GetDay(date);
+                foreach (Appointment item in day.Appointments)
+                {
+                    if (item != app && DateTimeHelper.TimePeriodsOverlap(item.StartTime, item.EndTime, app.StartTime, app.EndTime))
+                        return true;
+                }
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// Finds appointments that overlap with the parameter appointment.
+        /// </summary>
+        /// <param name="app">Appointment to use to find overlapps</param>
+        /// <returns>Array of appointments that overlap parameter.</returns>
+        public Appointment[] FindOverlappingAppointments(Appointment app)
+        {
+            List<Appointment> overlaps = new List<Appointment>();
+            int duration = (int)Math.Max(1, app.EndTime.Subtract(app.StartTime).TotalDays);
+            for (int i = 0; i < duration; i++)
+            {
+                DateTime date = app.StartTime.Date.AddDays(i);
+                Day day = GetDay(date);
+                foreach (Appointment item in day.Appointments)
+                {
+                    if (item != app && DateTimeHelper.TimePeriodsOverlap(item.StartTime, item.EndTime, app.StartTime, app.EndTime))
+                        overlaps.Add(item);
+                }
+            }
+
+            return overlaps.ToArray();
+        }
+
+        //public Month GetMonth(int year, int month)
+        //{
+        //    return null;
+        //}
+
+        //private HolidaysCollection _Holidays;
+        ///// <summary>
+        ///// Gets the collection of holidays associated with calendar.
+        ///// </summary>
+        //public HolidaysCollection Holidays
+        //{
+        //    get { return _Holidays; }
+        //}
+
+        /// <summary>
+        /// Returns the calendar date time which has seconds part set to 0.
+        /// </summary>
+        /// <param name="dt"></param>
+        /// <returns></returns>
+        public static DateTime GetCalendarDateTime(DateTime dt)
+        {
+            if (_PreciseDateTimeValues)
+                return dt;
+            return new DateTime(dt.Year, dt.Month, dt.Day, dt.Hour, dt.Minute, 0);
+        }
+
+        private static bool _PreciseDateTimeValues = false;
+        /// <summary>
+        /// Gets or sets whether Appointment StartTime and EndTime values retain seconds and milliseconds. When
+        /// set to false seconds and milliseconds are discarded. When set to true the DateTime set to appointment
+        /// StartTime and EndTime is used as is including seconds and milliseconds. Default value is false.
+        /// </summary>
+        public static bool PreciseDateTimeValues
+        {
+            get
+            {
+                return _PreciseDateTimeValues;
+            }
+            set
+            {
+                _PreciseDateTimeValues = value;
+            }
+        }
+
+        public static DateTime CurrentDateTime
+        {
+            get
+            {
+                DateTime dt = DateTime.Now;
+                return dt;
+            }
+        }
+
+        internal System.Globalization.Calendar GetCalendar()
+        {
+            return CultureInfo.CurrentCulture.Calendar;
+        }
+
+        private Dictionary<int, Year> _Years = new Dictionary<int, Year>();
+
+        internal void InternalAppointmentRemoved(Appointment item, bool isClearing)
+        {
+            item.SubPropertyChanged -= this.ChildPropertyChangedEventHandler;
+            if (!item.IsRecurringInstance && !isClearing)
+                InvalidateAppointmentCache(item);
+            if (!isClearing)
+                OnAppointmentRemoved(new AppointmentEventArgs(item));
+        }
+
+        internal void InternalAppointmentsCleared()
+        {
+            InvalidateAppointmentCache();
+            OnAppointmentsCleared(EventArgs.Empty);
+        }
+
+        protected virtual void OnAppointmentsCleared(EventArgs e)
+        {
+            EventHandler handler = AppointmentsCleared;
+            if (handler != null) handler(this, e);
+        }
+
+        /// <summary>
+        /// Raises the AppointmentRemoved event.
+        /// </summary>
+        /// <param name="appointmentEventArgs">Event arguments</param>
+        protected virtual void OnAppointmentRemoved(AppointmentEventArgs appointmentEventArgs)
+        {
+            AppointmentEventHandler handler = AppointmentRemoved;
+            if (handler != null) handler(this, appointmentEventArgs);
+        }
+
+        internal void InternalAppointmentAdded(Appointment item)
+        {
+            item.SubPropertyChanged += this.ChildPropertyChangedEventHandler;
+            if (!item.IsRecurringInstance)
+                InvalidateAppointmentCache(item);
+            OnAppointmentAdded(new AppointmentEventArgs(item));
+        }
+
+        /// <summary>
+        /// Raises the AppointmentAdded event.
+        /// </summary>
+        /// <param name="appointmentEventArgs">Event arguments</param>
+        protected virtual void OnAppointmentAdded(AppointmentEventArgs appointmentEventArgs)
+        {
+            AppointmentEventHandler handler = AppointmentAdded;
+            if (handler != null) handler(this, appointmentEventArgs);
+        }
+
+        internal void OwnerRemoved(Owner item)
+        {
+            item.SubPropertyChanged -= this.ChildPropertyChangedEventHandler;
+            OnPropertyChanged(new PropertyChangedEventArgs("Owners"));
+        }
+
+        internal void OwnerAdded(Owner item)
+        {
+            item.SubPropertyChanged += this.ChildPropertyChangedEventHandler;
+            OnPropertyChanged(new PropertyChangedEventArgs("Owners"));
+        }
+
+        internal void WorkDayRemoved(WorkDay item)
+        {
+            item.SubPropertyChanged -= this.ChildPropertyChangedEventHandler;
+            OnPropertyChanged(new PropertyChangedEventArgs("WorkDays"));
+        }
+
+        internal void WorkDayAdded(WorkDay item)
+        {
+            item.SubPropertyChanged += this.ChildPropertyChangedEventHandler;
+            OnPropertyChanged(new PropertyChangedEventArgs("WorkDays"));
+        }
+
+        internal void CalendarWorkDateRemoved(CalendarWorkDay item)
+        {
+            item.SubPropertyChanged -= this.ChildPropertyChangedEventHandler;
+            OnPropertyChanged(new PropertyChangedEventArgs("CalendarWorkDays"));
+        }
+
+        internal void CalendarWorkDateAdded(CalendarWorkDay item)
+        {
+            item.SubPropertyChanged += this.ChildPropertyChangedEventHandler;
+            OnPropertyChanged(new PropertyChangedEventArgs("CalendarWorkDays"));
+        }
+
+        private SubPropertyChangedEventHandler _ChildPropertyChangedEventHandler = null;
+        private SubPropertyChangedEventHandler ChildPropertyChangedEventHandler
+        {
+            get
+            {
+                if (_ChildPropertyChangedEventHandler == null) _ChildPropertyChangedEventHandler = new SubPropertyChangedEventHandler(ChildPropertyChanged);
+                return _ChildPropertyChangedEventHandler;
+            }
+        }
+
+        private void ChildPropertyChanged(object sender, SubPropertyChangedEventArgs e)
+        {
+            Appointment app = sender as Appointment;
+            OnSubPropertyChanged(e);
+
+            if (app != null)
+            {
+                if (IsNonTimeProperty(e.PropertyChangedArgs.PropertyName)) return;
+                if (app.InMoveTo && e.PropertyChangedArgs.PropertyName != "EndTime") return;
+                if (IsRecurranceProperty(e.PropertyChangedArgs.PropertyName) ||
+                    e.Source is DailyRecurrenceSettings || 
+                    e.Source is WeeklyRecurrenceSettings || 
+                    e.Source is YearlyRecurrenceSettings || 
+                    e.Source is MonthlyRecurrenceSettings)
+                    InvalidateAppointmentCache();
+                else
+                    InvalidateAppointmentCache(app);
+            }
+        }
+
+        private bool IsRecurranceProperty(string propertyName)
+        {
+            return propertyName == Appointment.RecurrencePropertyName;
+        }
+
+        private void InvalidateAppointmentCache(Appointment app)
+        {
+            if (IsUpdateSuspended) return;
+            if (app.Recurrence != null)
+            {
+                // Invalidate all
+                InvalidateAppointmentCache();
+            }
+            else if (_Years.ContainsKey(app.LocalStartTime.Year))
+            {
+                DateTime d = DateTimeHelper.BeginningOfDay(app.LocalStartTime);
+                DateTime end = app.LocalEndTime;
+                int year = d.Year;
+                while (d < end)
+                {
+                    _Years[d.Year].InvalidateAppointments(d.Month, d.Day);
+                    d = d.AddDays(1);
+                    if (d.Year != year && !_Years.ContainsKey(d.Year))
+                        break;
+                }
+            }
+            AccessToday();
+            OnPropertyChanged(new PropertyChangedEventArgs(AppointmentsPropertyName));
+        }
+
+        /// <summary>
+        /// Invalidates appointments cache store and causes recurrences to be regenerated when requested.
+        /// </summary>
+        public void InvalidateAppointmentCache()
+        {
+            if (IsUpdateSuspended) return;
+
+            // Invalidate all
+            foreach (Year year in _Years.Values)
+            {
+                year.InvalidateAppointments();
+            }
+            AccessToday();
+            OnPropertyChanged(new PropertyChangedEventArgs(AppointmentsPropertyName));
+        }
+
+        private void AccessToday()
+        {
+            DateTime today = DateTime.Today;
+            Day day = this.GetDay(today);
+            int appCount = day.Appointments.Count;
+        }
+        private bool IsNonTimeProperty(string propertyName)
+        {
+            if (propertyName == "Description" || propertyName == "IsRecurringInstance" || propertyName == "Tag"
+                || propertyName == "OwnerKey" || propertyName == "IsSelected" || propertyName == "Locked" || propertyName=="LocalStartTime" || propertyName=="LocalEndTime")
+                return true;
+            return false;
+        }
+
+        private int _UpdatesCount = 0;
+        /// <summary>
+        /// Suspends internal control updates to the cache structures etc. When making changes on multiple appointments 
+        /// time related properties or when adding multiple appointments before doing so call BeginUpdate and after 
+        /// updates are done call EndUpdate method to optimize performance.
+        /// <remarks>Calls to BeginUpdate method can be nested and only last outer most EndUpdate call will resume internal control updates.</remarks>
+        /// </summary>
+        public void BeginUpdate()
+        {
+            _UpdatesCount++;
+        }
+        /// <summary>
+        /// Resumes internal control updates that were suspended using BeginUpdate call and invalidates internal cache.
+        /// </summary>
+        public void EndUpdate()
+        {
+            if (_UpdatesCount == 0)
+                throw new InvalidOperationException("EndUpdate must be called AFTER BeginUpdate");
+            _UpdatesCount--;
+            if (_UpdatesCount == 0)
+                InvalidateAppointmentCache();
+        }
+
+        /// <summary>
+        /// Gets whether internal control update is suspended due to the call to BeginUpdate method.
+        /// </summary>
+        [Browsable(false)]
+        public bool IsUpdateSuspended
+        {
+            get
+            {
+                return _UpdatesCount > 0;
+            }
+        }
+
+        internal static string AppointmentsPropertyName
+        {
+            get { return "Appointments"; }
+        }
+        internal static string WorkDaysPropertyName
+        {
+            get { return "WorkDays"; }
+        }
+        internal static string CalendarWorkDaysPropertyName
+        {
+            get { return "CalendarWorkDays"; }
+        }
+
+        private TimeZoneInfo _DisplayTimeZone = null;
+        /// <summary>
+        /// Gets or sets the default display time zone used for the appointments. Default value is null which indicates that system time-zone is used.
+        /// Display Time zone can also be set for each Owner on Owner object. Value set here is used if specific display time-zone is not set on user.
+        /// </summary>
+        [DefaultValue(null)]
+        public TimeZoneInfo DisplayTimeZone
+        {
+            get { return _DisplayTimeZone; }
+            set
+            {
+                if (value != _DisplayTimeZone)
+                {
+                    TimeZoneInfo oldValue = _DisplayTimeZone;
+                    _DisplayTimeZone = value;
+                    InvalidateAppointmentTimes();
+                    InvalidateAppointmentCache();
+                    OnDisplayTimeZoneChanged(oldValue, value);
+                }
+            }
+        }
+
+        private void InvalidateAppointmentTimes()
+        {
+            foreach (Appointment item in _Appointments)
+            {
+                item.InvokeLocalTimePropertyChange();
+            }
+        }
+
+        private void OnDisplayTimeZoneChanged(TimeZoneInfo oldValue, TimeZoneInfo newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("DisplayTimeZone"));
+            
+        }
+
+
+        internal void InvokeAppointmentStartTimeReached(Appointment appointment)
+        {
+            OnAppointmentStartTimeReached(new AppointmentEventArgs(appointment));
+        }
+
+        /// <summary>
+        /// Raises AppointmentStartTimeReached event.
+        /// </summary>
+        /// <param name="appointmentEventArgs">Event arguments</param>
+        protected virtual void OnAppointmentStartTimeReached(AppointmentEventArgs appointmentEventArgs)
+        {
+            AppointmentEventHandler handler = AppointmentStartTimeReached;
+            if (handler != null)
+                handler(this, appointmentEventArgs);
+        }
+
+        internal void InvokeReminderNotification(Reminder reminder)
+        {
+            OnReminderNotification(new ReminderEventArgs(reminder));
+        }
+        /// <summary>
+        /// Raises ReminderNotification event.
+        /// </summary>
+        /// <param name="e">Event arguments</param>
+        protected virtual void OnReminderNotification(ReminderEventArgs e)
+        {
+            ReminderEventHandler h = ReminderNotification;
+            if (h != null)
+                h(this, e);
+        }
+        #endregion
+
+        #region INotifyPropertyChanged Members
+        /// <summary>
+        /// Occurs when property value has changed.
+        /// </summary>
+        public event PropertyChangedEventHandler PropertyChanged;
+        /// <summary>
+        /// Raises the PropertyChanged event.
+        /// </summary>
+        /// <param name="e">Event arguments</param>
+        protected virtual void OnPropertyChanged(PropertyChangedEventArgs e)
+        {
+            PropertyChangedEventHandler eh = PropertyChanged;
+
+            if (eh != null)
+                eh(this, e);
+
+            OnSubPropertyChanged(new SubPropertyChangedEventArgs(this, e));
+        }
+
+        #endregion
+
+        #region INotifySubPropertyChanged Members
+
+        /// <summary>
+        /// Occurs when property or property of child objects has changed. This event is similar to PropertyChanged event with key
+        /// difference that it occurs for the property changed of child objects as well.
+        /// </summary>
+        public event SubPropertyChangedEventHandler SubPropertyChanged;
+        /// <summary>
+        /// Raises the SubPropertyChanged event.
+        /// </summary>
+        /// <param name="e">Event arguments</param>
+        protected virtual void OnSubPropertyChanged(SubPropertyChangedEventArgs e)
+        {
+            SubPropertyChangedEventHandler eh = SubPropertyChanged;
+            if (eh != null) eh(this, e);
+        }
+        #endregion
+
+        #region CustomReminders
+        private ReminderCollection _CustomReminders = null;
+        /// <summary>
+        /// Gets the collection of custom reminders that are not associated with appointments.
+        /// </summary>
+        public ReminderCollection CustomReminders
+        {
+            get
+            {
+                if (_CustomReminders == null) _CustomReminders = new ReminderCollection(this);
+                return _CustomReminders;
+            }
+        }
+        #endregion
+    }
+
+    #region Events Support
+    public delegate void AppointmentEventHandler(object sender, AppointmentEventArgs e);
+    /// <summary>
+    /// Defines arguments for appointment related events.
+    /// </summary>
+    public class AppointmentEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets the appointment referenced by this event.
+        /// </summary>
+        public Appointment Appointment;
+
+        /// <summary>
+        /// Initializes a new instance of the AppointmentEventArgs class.
+        /// </summary>
+        /// <param name="appointment"></param>
+        public AppointmentEventArgs(Appointment appointment)
+        {
+            Appointment = appointment;
+        }
+    }
+    #endregion
+    
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/CalendarWorkDay.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/CalendarWorkDay.cs
new file mode 100644
index 00000000..3fc6c4f2
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/CalendarWorkDay.cs	
@@ -0,0 +1,59 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel;
+
+namespace DevComponents.Schedule.Model
+{
+    /// <summary>
+    /// Represents specific date based work day.
+    /// </summary>
+    public class CalendarWorkDay : BaseWorkDay
+    {
+        #region Internal Implementation
+        /// <summary>
+        /// Initializes a new instance of the WorkDay class.
+        /// </summary>
+        public CalendarWorkDay()
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the WorkDay class.
+        /// </summary>
+        /// <param name="date">Date this work-day represents</param>
+        public CalendarWorkDay(DateTime date)
+        {
+            _Date = date;
+        }
+
+        private DateTime _Date = DateTime.MinValue;
+        /// <summary>
+        /// Gets or sets the date this day represents.
+        /// </summary>
+        public DateTime Date
+        {
+            get { return _Date; }
+            set
+            {
+                value = value.Date;
+                if (value != _Date)
+                {
+                    DateTime oldValue = _Date;
+                    _Date = value;
+                    OnDateChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when Date property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value.</param>
+        /// <param name="newValue">New property value.</param>
+        protected virtual void OnDateChanged(DateTime oldValue, DateTime newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("Date"));
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/CalendarWorkDayCollection.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/CalendarWorkDayCollection.cs
new file mode 100644
index 00000000..7ce1f987
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/CalendarWorkDayCollection.cs	
@@ -0,0 +1,177 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Collections.ObjectModel;
+
+namespace DevComponents.Schedule.Model
+{
+    /// <summary>
+    /// Represents collection of calendar work days.
+    /// </summary>
+    public class CalendarWorkDayCollection : Collection<CalendarWorkDay>
+    {
+        #region Constructor
+        /// <summary>
+        /// Initializes a new instance of the AppointmentCollection class.
+        /// </summary>
+        /// <param name="calendar"></param>
+        public CalendarWorkDayCollection(CalendarModel calendar)
+        {
+            _Calendar = calendar;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the CalendarWorkDayCollection class.
+        /// </summary>
+        /// <param name="owner"></param>
+        public CalendarWorkDayCollection(Owner owner)
+        {
+            _Owner = owner;
+        }
+        #endregion
+
+        #region Internal Implementation
+        private Dictionary<DateTime, CalendarWorkDay> _ItemsDictionary = new Dictionary<DateTime, CalendarWorkDay>();
+
+        private Owner _Owner = null;
+        /// <summary>
+        /// Gets the Owner of work-day collection.
+        /// </summary>
+        public Owner Owner
+        {
+            get { return _Owner; }
+            internal set { _Owner = value; }
+        }
+
+        private CalendarModel _Calendar = null;
+        /// <summary>
+        /// Gets the calendar collection is associated with.
+        /// </summary>
+        public CalendarModel Calendar
+        {
+            get { return _Calendar; }
+            internal set
+            {
+                _Calendar = value;
+                UpdateItemsCalendarModel();
+            }
+        }
+
+        internal void UpdateItemsCalendarModel()
+        {
+            CalendarModel model = GetCalendarModel();
+            foreach (CalendarWorkDay item in this.Items)
+            {
+                item.Calendar = model;
+            }
+        }
+
+        protected override void RemoveItem(int index)
+        {
+            CalendarWorkDay day = this[index];
+            OnBeforeRemove(index, day);
+            base.RemoveItem(index);
+            OnAfterRemove(index, day);
+        }
+
+        private void OnAfterRemove(int index, CalendarWorkDay day)
+        {
+            _ItemsDictionary.Remove(day.Date);
+
+            CalendarModel model = GetCalendarModel();
+            if (model != null)
+                model.CalendarWorkDateRemoved(day);
+        }
+
+        private void OnBeforeRemove(int index, CalendarWorkDay day)
+        {
+            day.Calendar = null;
+        }
+
+        protected override void InsertItem(int index, CalendarWorkDay item)
+        {
+            OnBeforeInsert(index, item);
+            base.InsertItem(index, item);
+            OnAfterInsert(index, item);
+        }
+
+        private void OnAfterInsert(int index, CalendarWorkDay item)
+        {
+            CalendarModel model = GetCalendarModel();
+            if (model != null)
+                model.CalendarWorkDateAdded(item);
+            _ItemsDictionary.Add(item.Date, item);
+        }
+
+        private void OnBeforeInsert(int index, CalendarWorkDay item)
+        {
+            if (this[item.Date] != null)
+                throw new InvalidOperationException("Date '" + item.Date.ToString() + "' already in collection.");
+            item.Calendar = GetCalendarModel();
+        }
+
+        private CalendarModel GetCalendarModel()
+        {
+            if (_Calendar != null) return _Calendar;
+            if (_Owner != null) return _Owner.Calendar;
+            return null;
+        }
+
+        protected override void SetItem(int index, CalendarWorkDay newItem)
+        {
+            CalendarWorkDay oldItem = this[index];
+            OnBeforeSetItem(index, oldItem, newItem);
+            base.SetItem(index, newItem);
+            OnAfterSetItem(index, oldItem, newItem);
+        }
+
+        private void OnAfterSetItem(int index, CalendarWorkDay oldItem, CalendarWorkDay newItem)
+        {
+            CalendarModel model = GetCalendarModel();
+            if (model != null)
+            {
+                model.CalendarWorkDateRemoved(oldItem);
+                model.CalendarWorkDateAdded(newItem);
+            }
+        }
+
+        private void OnBeforeSetItem(int index, CalendarWorkDay oldItem, CalendarWorkDay newItem)
+        {
+            if (this[newItem.Date] != null)
+                throw new InvalidOperationException("Date '" + newItem.Date.ToString() + "' already in collection.");
+
+            oldItem.Calendar = null;
+            newItem.Calendar = GetCalendarModel();
+        }
+
+        protected override void ClearItems()
+        {
+            CalendarModel model = GetCalendarModel();
+            foreach (CalendarWorkDay item in this)
+            {
+                item.Calendar = null;
+                if (model != null)
+                    model.CalendarWorkDateRemoved(item);
+            }
+            base.ClearItems();
+        }
+
+        /// <summary>
+        /// Gets the item based on the Key assigned to the item
+        /// </summary>
+        /// <param name="date">Date to retrieve data for.</param>
+        /// <returns>Reference to CalendarWorkDay or null if no day in collection.</returns>
+        public CalendarWorkDay this[DateTime date]
+        {
+            get
+            {
+                CalendarWorkDay item = null;
+                if (_ItemsDictionary.TryGetValue(date.Date, out item))
+                    return item;
+
+                return null;
+            }
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/DailyRecurrenceSettings.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/DailyRecurrenceSettings.cs
new file mode 100644
index 00000000..32f1b883
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/DailyRecurrenceSettings.cs	
@@ -0,0 +1,142 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel;
+
+namespace DevComponents.Schedule.Model
+{
+    /// <summary>
+    /// Defines the daily recurrence settings.
+    /// </summary>
+    public class DailyRecurrenceSettings : INotifyPropertyChanged, INotifySubPropertyChanged
+    {
+        #region Internal Implementation
+        private AppointmentRecurrence _Recurrence = null;
+
+        /// <summary>
+        /// Initializes a new instance of the DailyRecurrenceSettings class.
+        /// </summary>
+        /// <param name="recurrence"></param>
+        public DailyRecurrenceSettings(AppointmentRecurrence recurrence)
+        {
+            _Recurrence = recurrence;
+        }
+
+        private eDailyRecurrenceRepeat _RepeatOnDaysOfWeek = eDailyRecurrenceRepeat.All;
+        /// <summary>
+        /// Gets or sets the days of week on which appointment is repeated.
+        /// </summary>
+        [DefaultValue(eDailyRecurrenceRepeat.All)]
+        public eDailyRecurrenceRepeat RepeatOnDaysOfWeek
+        {
+            get { return _RepeatOnDaysOfWeek; }
+            set
+            {
+                if (value != _RepeatOnDaysOfWeek)
+                {
+                    eDailyRecurrenceRepeat oldValue = _RepeatOnDaysOfWeek;
+                    _RepeatOnDaysOfWeek = value;
+                    OnRepeatOnDaysOfWeekChanged(oldValue, value);
+                }
+            }
+        }
+
+        private void OnRepeatOnDaysOfWeekChanged(eDailyRecurrenceRepeat oldValue, eDailyRecurrenceRepeat newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("RepeatOnDaysOfWeek"));
+        }
+
+        private int _RepeatInterval = 1;
+        /// <summary>
+        /// Gets or sets the interval between recurring appointments. Default value is 1. Setting this value to for example 3 means that
+        /// recurrence is repeated every 3 days.
+        /// </summary>
+        [DefaultValue(1)]
+        public int RepeatInterval
+        {
+            get { return _RepeatInterval; }
+            set
+            {
+                if (value != _RepeatInterval)
+                {
+                    int oldValue = _RepeatInterval;
+                    _RepeatInterval = value;
+                    OnRepeatIntervalChanged(oldValue, value);
+                }
+            }
+        }
+
+        private void OnRepeatIntervalChanged(int oldValue, int newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("RepeatInterval"));
+        }
+
+        private bool _ExplicitDailyRecurrence = false;
+        /// <summary>
+        /// Indicates whether appointment is explicitly repeated every day regardless of its end time. By default end time of appointment + 1 day is considered as next
+        /// starting point for appointment. When this property is set to true appointment start time + 1 day is used as next starting point of recurrence.
+        /// </summary>
+        [DefaultValue(false), Description("Indicates whether appointment is explicitly repeated every day regardless of its end time. By default end time of appointment + 1 day is considered as next starting point for appointment. When this property is set to true appointment start time + 1 day is used as next starting point of recurrence.")]
+        public bool ExplicitDailyRecurrence
+        {
+            get { return _ExplicitDailyRecurrence; }
+            set
+            {
+                if (value != _ExplicitDailyRecurrence)
+                {
+                    bool oldValue = _ExplicitDailyRecurrence;
+                    _ExplicitDailyRecurrence = value;
+                    OnExplicitDailyRecurrenceChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when ExplicitDailyRecurrence property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnExplicitDailyRecurrenceChanged(bool oldValue, bool newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("ExplicitDailyRecurrence"));
+            
+        }
+        #endregion
+
+        #region INotifyPropertyChanged Members
+        /// <summary>
+        /// Occurs when property value has changed.
+        /// </summary>
+        public event PropertyChangedEventHandler PropertyChanged;
+        /// <summary>
+        /// Raises the PropertyChanged event.
+        /// </summary>
+        /// <param name="e">Event arguments</param>
+        protected virtual void OnPropertyChanged(PropertyChangedEventArgs e)
+        {
+            PropertyChangedEventHandler eh = PropertyChanged;
+            if (eh != null) eh(this, e);
+            OnSubPropertyChanged(new SubPropertyChangedEventArgs(this, e));
+        }
+        #endregion
+
+        #region INotifySubPropertyChanged Members
+        /// <summary>
+        /// Occurs when property or property of child objects has changed. This event is similar to PropertyChanged event with key
+        /// difference that it occurs for the property changed of child objects as well.
+        /// </summary>
+        public event SubPropertyChangedEventHandler SubPropertyChanged;
+        /// <summary>
+        /// Raises the SubPropertyChanged event.
+        /// </summary>
+        /// <param name="e">Event arguments</param>
+        protected virtual void OnSubPropertyChanged(SubPropertyChangedEventArgs e)
+        {
+            SubPropertyChangedEventHandler eh = SubPropertyChanged;
+            if (eh != null) eh(this, e);
+        }
+        #endregion
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/DateTimeHelper.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/DateTimeHelper.cs
new file mode 100644
index 00000000..6a106360
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/DateTimeHelper.cs	
@@ -0,0 +1,206 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace DevComponents.Schedule.Model
+{
+    public static class DateTimeHelper
+    {
+        /// <summary>
+        /// Returns number of weekdays (Monday-Friday) between two dates.
+        /// </summary>
+        /// <param name="startDateTime">Start date</param>
+        /// <param name="endDateTime">End date</param>
+        /// <returns>Total number of weekdays between two dates</returns>
+        public static int TotalWeekDays(DateTime startDateTime, DateTime endDateTime)
+        {
+            int totalDays = 0;
+            startDateTime = new DateTime(startDateTime.Year, startDateTime.Month, startDateTime.Day);
+            endDateTime = new DateTime(endDateTime.Year, endDateTime.Month, endDateTime.Day, 23, 59, 0);
+            
+            // Start date to monday
+            if (startDateTime.DayOfWeek == DayOfWeek.Saturday)
+                startDateTime = startDateTime.AddDays(2);
+            else if (startDateTime.DayOfWeek == DayOfWeek.Sunday)
+                startDateTime = startDateTime.AddDays(1);
+            else
+            {
+                DateTime newStartDateTime = startDateTime.AddDays(8 - (int)startDateTime.DayOfWeek);
+                if (newStartDateTime > endDateTime)
+                {
+                    if (endDateTime.DayOfWeek == DayOfWeek.Saturday)
+                        endDateTime = endDateTime.AddDays(-1);
+                    else if (endDateTime.DayOfWeek == DayOfWeek.Sunday)
+                        endDateTime = endDateTime.AddDays(-2);
+                    return (int)Math.Ceiling(Math.Max(0, endDateTime.Subtract(startDateTime).TotalDays));
+                }
+                totalDays = 6 - (int)startDateTime.DayOfWeek;
+                startDateTime = newStartDateTime;
+            }
+
+            // End date to Sunday
+            if (endDateTime.DayOfWeek == DayOfWeek.Saturday)
+                endDateTime = endDateTime.AddDays(1);
+            else if (endDateTime.DayOfWeek != DayOfWeek.Sunday)
+            {
+                int d = (int)endDateTime.DayOfWeek;
+                DateTime newEndDateTime = endDateTime.AddDays(-(int)endDateTime.DayOfWeek);
+                totalDays += d;
+                endDateTime=newEndDateTime;
+            }
+
+            int t = (int)Math.Max(0, Math.Ceiling(endDateTime.Subtract(startDateTime).TotalDays));
+            if (t > 0)
+                totalDays += (t / 7) * 5;
+
+            return totalDays;
+            
+        }
+
+        /// <summary>
+        /// Return total number of days specified by day parameter between two dates.
+        /// </summary>
+        /// <param name="startDate">Start date.</param>
+        /// <param name="endDate">End date.</param>
+        /// <param name="day">Day of week</param>
+        /// <returns>Number of days between two dates</returns>
+        public static int TotalDays(DateTime startDate, DateTime endDate, DayOfWeek day)
+        {
+            if (endDate < startDate) return 0;
+
+
+            if (startDate.DayOfWeek > day)
+                startDate = startDate.AddDays(7 - ((int)startDate.DayOfWeek - (int)day));
+            else
+                startDate = startDate.AddDays(day - startDate.DayOfWeek);
+            if (endDate < startDate) return 0;
+
+            if (endDate.DayOfWeek < day)
+                endDate = endDate.AddDays(-(7 - ((int)day - (int)endDate.DayOfWeek)));
+            else
+                endDate = endDate.AddDays(day - endDate.DayOfWeek);
+
+            if (endDate.Subtract(startDate).TotalDays <= 1) return 1;
+
+            int t = (int)Math.Ceiling(endDate.Subtract(startDate).TotalDays);
+            int totalDays = (int)Math.Floor(Math.Max(1, (double)t / 7)) + 1; // +1 since endDate is always on the day
+            //if (endDate.RelativeDayOfWeek == day) totalDays++;
+            return totalDays;
+        }
+
+        public static int TotalNumberOfDays(DateTime startDate, DateTime endDate, eDayOfWeekRecurrence daysOfWeek)
+        {
+            int totalDays=0;
+            if (daysOfWeek == eDayOfWeekRecurrence.All)
+                return (int)Math.Ceiling(endDate.Subtract(startDate).TotalDays);
+
+            if ((daysOfWeek & eDayOfWeekRecurrence.Friday) != 0)
+                totalDays += TotalDays(startDate, endDate, DayOfWeek.Friday);
+            if ((daysOfWeek & eDayOfWeekRecurrence.Monday) != 0)
+                totalDays += TotalDays(startDate, endDate, DayOfWeek.Monday);
+            if ((daysOfWeek & eDayOfWeekRecurrence.Saturday) != 0)
+                totalDays += TotalDays(startDate, endDate, DayOfWeek.Saturday);
+            if ((daysOfWeek & eDayOfWeekRecurrence.Sunday) != 0)
+                totalDays += TotalDays(startDate, endDate, DayOfWeek.Sunday);
+            if ((daysOfWeek & eDayOfWeekRecurrence.Thursday) != 0)
+                totalDays += TotalDays(startDate, endDate, DayOfWeek.Thursday);
+            if ((daysOfWeek & eDayOfWeekRecurrence.Tuesday) != 0)
+                totalDays += TotalDays(startDate, endDate, DayOfWeek.Tuesday);
+            if ((daysOfWeek & eDayOfWeekRecurrence.Wednesday) != 0)
+                totalDays += TotalDays(startDate, endDate, DayOfWeek.Wednesday);
+
+            return totalDays;
+        }
+
+        /// <summary>
+        /// Returns the date/time that represents end of the day value.
+        /// </summary>
+        /// <param name="_DayDate"></param>
+        /// <returns></returns>
+        public static DateTime EndOfDay(DateTime day)
+        {
+            return new DateTime(day.Year, day.Month, day.Day, 23, 59, 59);
+        }
+
+        /// <summary>
+        /// Returns the date/time that represents beginning of the day value.
+        /// </summary>
+        /// <param name="_DayDate"></param>
+        /// <returns></returns>
+        public static DateTime BeginningOfDay(DateTime day)
+        {
+            return new DateTime(day.Year, day.Month, day.Day, 0, 0, 0);
+        }
+
+        /// <summary>
+        /// Returns true if date falls at begging of the day 12:00 AM
+        /// </summary>
+        /// <param name="_DayDate"></param>
+        /// <returns></returns>
+        public static bool IsBeginningOfDay(DateTime day)
+        {
+            return day.Equals(BeginningOfDay(day));
+        }
+
+        internal static bool HasDay(DayOfWeek dayOfWeek, eDayOfWeekRecurrence days)
+        {
+            if (dayOfWeek == DayOfWeek.Monday && (days & eDayOfWeekRecurrence.Monday) != 0) return true;
+            if (dayOfWeek == DayOfWeek.Tuesday && (days & eDayOfWeekRecurrence.Tuesday) != 0) return true;
+            if (dayOfWeek == DayOfWeek.Wednesday && (days & eDayOfWeekRecurrence.Wednesday) != 0) return true;
+            if (dayOfWeek == DayOfWeek.Thursday && (days & eDayOfWeekRecurrence.Thursday) != 0) return true;
+            if (dayOfWeek == DayOfWeek.Friday && (days & eDayOfWeekRecurrence.Friday) != 0) return true;
+            if (dayOfWeek == DayOfWeek.Saturday && (days & eDayOfWeekRecurrence.Saturday) != 0) return true;
+            if (dayOfWeek == DayOfWeek.Sunday && (days & eDayOfWeekRecurrence.Sunday) != 0) return true;
+
+            return false;
+        }
+
+        public static bool IsWeekendDay(DateTime currentDay)
+        {
+            return currentDay.DayOfWeek == DayOfWeek.Sunday || currentDay.DayOfWeek == DayOfWeek.Saturday;
+        }
+
+        /// <summary>
+        /// Gets greater date between two dates.
+        /// </summary>
+        /// <param name="date1">Date 1</param>
+        /// <param name="date2">Date 2</param>
+        /// <returns>Greater date.</returns>
+        public static DateTime MaxDate(DateTime date1, DateTime date2)
+        {
+            return date1 > date2 ? date1 : date2;
+        }
+
+        /// <summary>
+        /// Returns true if both dates are on same day and year.
+        /// </summary>
+        /// <param name="date1">First date</param>
+        /// <param name="date2">Second date</param>
+        /// <returns>true if dates are on same day and year</returns>
+        public static bool IsSameDay(DateTime date1, DateTime date2)
+        {
+            return (date1.Year == date2.Year && date1.Month == date2.Month &&
+                date1.Day == date2.Day) || date1.Date.AddDays(1) == date2;
+
+            //return date1.Year == date2.Year && date1.Month == date2.Month && date1.Day == date2.Day;
+        }
+
+        /// <summary>
+        /// Returns true if time periods overlap.
+        /// </summary>
+        /// <param name="startTime1">Start of first period.</param>
+        /// <param name="endTime1">End of first period.</param>
+        /// <param name="startTime2">Start of second period.</param>
+        /// <param name="endTime2">End of second period.</param>
+        /// <returns>true if periods overlap</returns>
+        public static bool TimePeriodsOverlap(DateTime startTime1, DateTime endTime1, DateTime startTime2, DateTime endTime2)
+        {
+            if (startTime1 <= startTime2 && endTime1 > startTime2 || startTime1 >= startTime2 && startTime1 < endTime2)
+                return true;
+            return false;
+        }
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/Day.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/Day.cs
new file mode 100644
index 00000000..f9888b87
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/Day.cs	
@@ -0,0 +1,77 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel;
+
+namespace DevComponents.Schedule.Model
+{
+    /// <summary>
+    /// Represents the calendar day.
+    /// </summary>
+    public class Day
+    {
+        #region Constructor
+        /// <summary>
+        /// Initializes a new instance of the Day class.
+        /// </summary>
+        /// <param name="dayDate"></param>
+        /// <param name="calendar"></param>
+        public Day(DateTime dayDate, CalendarModel calendar)
+        {
+            _DayDate = dayDate;
+            _Calendar = calendar;
+        }
+
+        #endregion
+
+        #region Internal Implementation
+        private AppointmentSubsetCollection _Appointments;
+        /// <summary>
+        /// Gets appointments that start on this day.
+        /// </summary>
+        public AppointmentSubsetCollection Appointments
+        {
+            get 
+            {
+                if (_Appointments == null)
+                    _Appointments = new AppointmentSubsetCollection(_Calendar, _DayDate, DateTimeHelper.EndOfDay(_DayDate));
+                return _Appointments; 
+            }
+        }
+
+        /// <summary>
+        /// Invalidate the day appointments
+        /// </summary>
+        internal void InvalidateAppointments()
+        {
+            if (_Appointments != null)
+                _Appointments.InvalidateCollection();
+        }
+
+        private DateTime _DayDate = DateTime.MinValue;
+        /// <summary>
+        /// Gets the date this day represents.
+        /// </summary>
+        [Browsable(false)]
+        public DateTime DayDate
+        {
+            get { return _DayDate; }
+            internal set { _DayDate = value; }
+        }
+
+        private CalendarModel _Calendar;
+        /// <summary>
+        /// Gets the Calendar this day is part of.
+        /// </summary>
+        [Browsable(false)]
+        public CalendarModel Calendar
+        {
+            get { return _Calendar; }
+            internal set { _Calendar = value; }
+        }
+        #endregion
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/Enums.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/Enums.cs
new file mode 100644
index 00000000..3eec83f0
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/Enums.cs	
@@ -0,0 +1,191 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace DevComponents.Schedule.Model
+{
+    /// <summary>
+    /// Specifies notification type when appointment start time has been reached.
+    /// </summary>
+    [Flags()]
+    public enum eStartTimeAction
+    {
+        /// <summary>
+        /// No action is taken.
+        /// </summary>
+        None = 0,
+        /// <summary>
+        /// StartTimeReached event is fired.
+        /// </summary>
+        StartTimeReachedEvent = 1,
+        /// <summary>
+        /// StartTimeCommand is executed.
+        /// </summary>
+        Command = 2,
+        /// <summary>
+        /// Both event and command are performed.
+        /// </summary>
+        StartTimeReachedEventAndCommand = StartTimeReachedEvent | Command
+    }
+
+    /// <summary>
+    /// Specifies notification type when reminder time has been reached.
+    /// </summary>
+    [Flags()]
+    public enum eReminderAction
+    {
+        /// <summary>
+        /// No action is taken.
+        /// </summary>
+        None = 0,
+        /// <summary>
+        /// Reminder event is fired.
+        /// </summary>
+        Event = 1,
+        /// <summary>
+        /// Reminder Command is executed.
+        /// </summary>
+        Command = 2,
+        /// <summary>
+        /// Both event and command are performed.
+        /// </summary>
+        EventAndCommand = Event | Command
+    }
+
+    /// <summary>
+    /// Specifies the recurrence range type.
+    /// </summary>
+    public enum eRecurrenceRangeLimitType
+    {
+        /// <summary>
+        /// Recurrence range has no end date specified.
+        /// </summary>
+        NoEndDate,
+        /// <summary>
+        /// Recurrence ends on date specified by RangeEndDate property.
+        /// </summary>
+        RangeEndDate,
+        /// <summary>
+        /// Recurrence ends after specified number of repeats by RangeNumberOfOccurrences property.
+        /// </summary>
+        RangeNumberOfOccurrences
+    }
+
+    /// <summary>
+    /// Specifies the pattern type for appointment recurrence.
+    /// </summary>
+    public enum eRecurrencePatternType
+    {
+        /// <summary>
+        /// Appointment recurs daily.
+        /// </summary>
+        Daily,
+        /// <summary>
+        /// Appointment recurs weekly.
+        /// </summary>
+        Weekly,
+        /// <summary>
+        /// Appointment recurs monthly.
+        /// </summary>
+        Monthly,
+        /// <summary>
+        /// Appointment recurs yearly.
+        /// </summary>
+        Yearly
+    }
+
+    /// <summary>
+    /// Specifies the relative day in month for recurrence.
+    /// </summary>
+    public enum eRelativeDayInMonth
+    {
+        /// <summary>
+        /// No value specified.
+        /// </summary>
+        None,
+        /// <summary>
+        /// The first occurrence of the specified day in its month. 
+        /// </summary>
+        First,
+        /// <summary>
+        /// The second occurrence of the specified day in its month. 
+        /// </summary>
+        Second,
+        /// <summary>
+        /// The third occurrence of the specified day in its month. 
+        /// </summary>
+        Third,
+        /// <summary>
+        /// The fourth occurrence of the specified day in its month. 
+        /// </summary>
+        Fourth,
+        /// <summary>
+        /// The last occurrence of the specified day in its month. 
+        /// </summary>
+        Last
+    }
+
+    /// <summary>
+    /// Specifies on which day the appointment is repeated.
+    /// </summary>
+    [Flags()]
+    public enum eDayOfWeekRecurrence
+    {
+        None = 0,
+        Monday = 1,
+        Tuesday = 2,
+        Wednesday = 4,
+        Thursday = 8,
+        Friday = 16,
+        Saturday = 32,
+        Sunday = 64,
+        WeekendDays = Saturday | Sunday,
+        WeekDays = Monday | Tuesday | Wednesday | Thursday | Friday,
+        All = Monday | Tuesday | Wednesday | Thursday | Friday | Saturday | Sunday
+    }
+
+    /// <summary>
+    /// Specifies on which days daily recurrence is repeated.
+    /// </summary>
+    public enum eDailyRecurrenceRepeat
+    {
+        /// <summary>
+        /// Appointment is repeated on all days.
+        /// </summary>
+        All = eDayOfWeekRecurrence.Monday | eDayOfWeekRecurrence.Tuesday | eDayOfWeekRecurrence.Wednesday | eDayOfWeekRecurrence.Thursday | eDayOfWeekRecurrence.Friday | eDayOfWeekRecurrence.Saturday | eDayOfWeekRecurrence.Sunday,
+        
+        /// <summary>
+        /// Appointment is repeated on week-days only, Monday-Friday.
+        /// </summary>
+        WeekDays = eDayOfWeekRecurrence.Monday | eDayOfWeekRecurrence.Tuesday | eDayOfWeekRecurrence.Wednesday | eDayOfWeekRecurrence.Thursday | eDayOfWeekRecurrence.Friday,
+        
+        /// <summary>
+        /// Appointment is repeated on weekend-days only, Saturday-Sunday.
+        /// </summary>
+        WeekendDays = eDayOfWeekRecurrence.WeekendDays
+    }
+
+    /// <summary>
+    /// Specifies on which month monthly appointment recurrence is repeated.
+    /// </summary>
+    [Flags()]
+    public enum eMonthRecurrence
+    {
+        January = 1,
+        February = 2,
+        March = 4,
+        April = 8,
+        May = 16,
+        June = 32,
+        July = 64,
+        August = 128,
+        September = 256,
+        October = 512,
+        November = 1024,
+        December = 2048,
+        All = January | February | March | April | May | June | July | August | September | October | November | December
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/HolidaysCollection.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/HolidaysCollection.cs
new file mode 100644
index 00000000..dcd1b0bf
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/HolidaysCollection.cs	
@@ -0,0 +1,16 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace DevComponents.Schedule.Model
+{
+    /// <summary>
+    /// Represents collection of holidays.
+    /// </summary>
+    public class HolidaysCollection
+    {
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/INotifySubPropertyChanged.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/INotifySubPropertyChanged.cs
new file mode 100644
index 00000000..0dfa7393
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/INotifySubPropertyChanged.cs	
@@ -0,0 +1,48 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel;
+
+namespace DevComponents.Schedule.Model
+{
+    /// <summary>
+    /// Defines an interface for property notification change.
+    /// </summary>
+    public interface INotifySubPropertyChanged
+    {
+        /// <summary>
+        /// Occurs when property on object or its sub-objects has changed.
+        /// </summary>
+        event SubPropertyChangedEventHandler SubPropertyChanged;
+    }
+
+    public delegate void SubPropertyChangedEventHandler(object sender, SubPropertyChangedEventArgs e);
+    /// <summary>
+    /// Defines event arguments for SubPropertyChanged event.
+    /// </summary>
+    public class SubPropertyChangedEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Reference to PropertyChangedArgs of changed property.
+        /// </summary>
+        public PropertyChangedEventArgs PropertyChangedArgs = null;
+        /// <summary>
+        /// Reference to the source object of the event.
+        /// </summary>
+        public object Source = null;
+
+        /// <summary>
+        /// Initializes a new instance of the SubPropertyChangedEventArgs class.
+        /// </summary>
+        /// <param name="propertyChangedArgs"></param>
+        /// <param name="source"></param>
+        public SubPropertyChangedEventArgs(object source, PropertyChangedEventArgs propertyChangedArgs)
+        {
+            PropertyChangedArgs = propertyChangedArgs;
+            Source = source;
+        }
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/ImportExport/CalendarEntry.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/ImportExport/CalendarEntry.cs
new file mode 100644
index 00000000..89ca21d4
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/ImportExport/CalendarEntry.cs	
@@ -0,0 +1,156 @@
+using System.Collections.Generic;
+
+namespace DevComponents.Schedule.Model.Serialization
+{
+    public class CalendarEntry
+    {
+        #region Private variables
+
+        private string _Id = "";
+        private string _Value = "";
+
+        private List<AttributeData> _Attributes;
+
+        private int _LineStart;
+        private int _LineEnd;
+
+        #endregion
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="lineStart">Text line start</param>
+        /// <param name="lineEnd">Text line end</param>
+        public CalendarEntry(int lineStart, int lineEnd)
+        {
+            _LineStart = lineStart;
+            _LineEnd = lineEnd;
+
+            _Attributes = new List<AttributeData>();
+        }
+
+        #region Public properties
+
+        #region Attributes
+
+        /// <summary>
+        /// Attributes
+        /// </summary>
+        public List<AttributeData> Attributes
+        {
+            get { return (_Attributes); }
+            set { _Attributes = value; }
+        }
+
+        #endregion
+
+        #region Id
+
+        /// <summary>
+        /// Id
+        /// </summary>
+        public string Id
+        {
+            get { return (_Id); }
+            set { _Id = value; }
+        }
+
+        #endregion
+
+        #region LineEnd
+
+        /// <summary>
+        /// LineEnd
+        /// </summary>
+        public int LineEnd
+        {
+            get { return (_LineEnd); }
+            set { _LineEnd = value; }
+        }
+
+        #endregion
+
+        #region LineStart
+
+        /// <summary>
+        /// LineStart
+        /// </summary>
+        public int LineStart
+        {
+            get { return (_LineStart); }
+            set { _LineStart = value; }
+        }
+
+        #endregion
+
+        #region Value
+
+        /// <summary>
+        /// Value
+        /// </summary>
+        public string Value
+        {
+            get { return (_Value); }
+            set { _Value = value; }
+        }
+
+        #endregion
+
+        #endregion
+    }
+
+    #region AttributeData
+
+    public class AttributeData
+    {
+        #region Private variables
+
+        private string _Id;
+        private string _Value;
+
+        #endregion
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="id">Id</param>
+        /// <param name="value">Value</param>
+        public AttributeData(string id, string value)
+        {
+            _Id = id;
+            _Value = value;
+        }
+
+        #region Public properties
+
+        #region Id
+
+        /// <summary>
+        /// Gets or sets the attribute Id
+        /// </summary>
+        public string Id
+        {
+            get { return (_Id); }
+            set { _Id = value; }
+        }
+
+        #endregion
+
+        #region Value
+
+        /// <summary>
+        /// Gets or sets the attribute value
+        /// </summary>
+        public string Value
+        {
+            get { return (_Value); }
+            set { _Value = value; }
+        }
+
+        #endregion
+
+        #endregion
+    }
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/ImportExport/ICS/IcsExporter.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/ImportExport/ICS/IcsExporter.cs
new file mode 100644
index 00000000..b50c2319
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/ImportExport/ICS/IcsExporter.cs	
@@ -0,0 +1,989 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+
+namespace DevComponents.Schedule.Model.Serialization
+{
+    /// <summary>
+    /// Export DNB internal Model/Appointment data layout into
+    /// ICS (Internet Calendaring and Scheduling - RFC5545) format file.
+    /// </summary>
+    public class IcsExporter
+    {
+        #region Private constants
+
+        private const int FoldCount = 74;
+
+        #endregion
+
+        #region Private variables
+
+        private DateTime _DtStamp = DateTime.Now;
+
+        private string _ProdId = "PRODID:-//DotNetBar\\, Inc//iCal 1.0//EN";
+
+        private CalendarModel _Model;
+
+        private string[] _CalNames;
+        private string[] _OwnerKeys;
+
+        private string _ExportFile;
+        private StreamWriter _StreamWriter;
+
+        #endregion
+
+        #region Constructors
+
+        /// <summary>
+        /// IcsExporter
+        /// </summary>
+        public IcsExporter()
+        {
+        }
+
+        /// <summary>
+        /// IcsExporter
+        /// </summary>
+        /// <param name="model"></param>
+        public IcsExporter(CalendarModel model)
+        {
+            Model = model;
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region ProdId
+
+        /// <summary>
+        /// Gets or sets the Calendar Product Id.
+        /// </summary>
+        public string ProdId
+        {
+            get { return (_ProdId); }
+            set { _ProdId = value; }
+        }
+
+        #endregion
+
+        #region Model
+
+        /// <summary>
+        /// CalendarModel
+        /// </summary>
+        public CalendarModel Model
+        {
+            get { return (_Model); }
+            set { _Model = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Export
+
+        /// <summary>
+        /// Exports Appointment data in the iCalendar format
+        /// </summary>
+        /// <param name="ownerKeys">Array of OwnerKeys</param>
+        /// <param name="calNames">Array of CalendarNames</param>
+        /// <param name="streamWriter">Export StreamWriter</param>
+        public void Export(string[] ownerKeys, string[] calNames, StreamWriter streamWriter)
+        {
+            if (_Model == null)
+                throw new Exception("Model can not be null.");
+
+            _CalNames = calNames;
+            _OwnerKeys = ownerKeys;
+
+            if (streamWriter == null)
+                throw new Exception("Invalid StreamWriter.");
+
+            _StreamWriter = streamWriter;
+
+            if (String.IsNullOrEmpty(_ExportFile) == true)
+                _ExportFile = streamWriter.BaseStream.ToString();
+
+            ExportOwnerData();
+
+            streamWriter.Flush();
+        }
+
+        #region Export variations
+
+        /// <summary>
+        /// Exports all appointments to the given export file.
+        /// </summary>
+        /// <param name="exportFile">Output file path</param>
+        public void Export(string exportFile)
+        {
+            Export((string[])null, null, exportFile);
+        }
+
+        /// <summary>
+        /// Exports all appointments to the given export stream.
+        /// </summary>
+        /// <param name="streamWriter">Output StreamWriter</param>
+        public void Export(StreamWriter streamWriter)
+        {
+            Export((string[])null, null, streamWriter);
+        }
+
+        /// <summary>
+        /// Exports all appointments for the specified OwnerKey to
+        /// the given export file.
+        /// </summary>
+        /// <param name="ownerKey">Appointment OwnerKey</param>
+        /// <param name="exportFile">Output file path</param>
+        public void Export(string ownerKey, string exportFile)
+        {
+            Export(ownerKey, ownerKey, exportFile);
+        }
+
+        /// <summary>
+        /// Exports all appointments for the specified OwnerKey to
+        /// the given export stream.
+        /// </summary>
+        /// <param name="ownerKey">Appointment OwnerKey</param>
+        /// <param name="streamWriter">Output StreamWriter</param>
+        public void Export(string ownerKey, StreamWriter streamWriter)
+        {
+            Export(ownerKey, ownerKey, streamWriter);
+        }
+
+        /// <summary>
+        /// Exports all appointments for the specified OwnerKey to
+        /// the given export file, using the specified calendar name.
+        /// </summary>
+        /// <param name="ownerKey">Appointment OwnerKey</param>
+        /// <param name="calName">Associated Calendar Name</param>
+        /// <param name="exportFile">Output file path</param>
+        public void Export(string ownerKey, string calName, string exportFile)
+        {
+            string[] ownerKeys = new string[] { ownerKey };
+            string[] calNames = new string[] { calName };
+
+            Export(ownerKeys, calNames, exportFile);
+        }
+
+        /// <summary>
+        /// Exports all appointments for the specified OwnerKey to
+        /// the given export stream, using the specified calendar name.
+        /// </summary>
+        /// <param name="ownerKey">Appointment OwnerKey</param>
+        /// <param name="calName">Associated Calendar Name</param>
+        /// <param name="streamWriter">Output StreamWriter</param>
+        public void Export(string ownerKey, string calName, StreamWriter streamWriter)
+        {
+            string[] ownerKeys = new string[] { ownerKey };
+            string[] calNames = new string[] { calName };
+
+            Export(ownerKeys, calNames, streamWriter);
+        }
+
+        /// <summary>
+        /// Exports all appointments for the specified OwnerKey array to
+        /// the given export file, using the specified associated calendar name array.
+        /// </summary>
+        /// <param name="ownerKeys">Array of OwnerKeys</param>
+        /// <param name="calNames">Array of 1:1 associated Calendar Names</param>
+        /// <param name="exportFile">Output file path</param>
+        public virtual void Export(string[] ownerKeys, string[] calNames, string exportFile)
+        {
+            using (StreamWriter streamWriter = new StreamWriter(exportFile))
+                Export(ownerKeys, calNames, streamWriter);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ExportOwnerData
+
+        /// <summary>
+        /// Exports model data for each requested OwnerKey
+        /// </summary>
+        private void ExportOwnerData()
+        {
+            if (_OwnerKeys == null)
+                _OwnerKeys = GetDefaultOwnerKeys();
+
+            if (_CalNames == null)
+                _CalNames = _OwnerKeys;
+
+            string lastCalName = null;
+
+            for (int i = 0; i < _OwnerKeys.Length; i++)
+            {
+                string ownerKey = _OwnerKeys[i] ?? "";
+
+                string calName = ((i < _CalNames.Length)
+                                      ? _CalNames[i]
+                                      : _CalNames[_CalNames.Length - 1]) ?? ownerKey;
+
+                if (calName.Equals(lastCalName) == false)
+                {
+                    if (lastCalName != null)
+                        ExportCalEnd();
+
+                    ExportCalBegin(calName);
+
+                    lastCalName = calName;
+                }
+
+                foreach (Appointment app in Model.Appointments)
+                {
+                    if (IsAppointmentVisible(app, ownerKey) == true)
+                        ExportVEvent(app);
+                }
+            }
+
+            if (lastCalName != null)
+                ExportCalEnd();
+        }
+
+        #endregion
+
+        #region ExportCalBegin
+
+        /// <summary>
+        /// Exports the beginning calendar sequence
+        /// </summary>
+        /// <param name="calName"></param>
+        private void ExportCalBegin(string calName)
+        {
+            ExportLine("BEGIN:VCALENDAR");
+            ExportLine("CALSCALE:GREGORIAN");
+
+            if (_ProdId != null)
+                ExportLine(_ProdId);
+
+            ExportLine("X-WR-CALNAME;VALUE=TEXT:" + calName);
+            ExportLine("VERSION:2.0");
+        }
+
+        #endregion
+
+        #region ExportCalEnd
+
+        /// <summary>
+        /// Exports the ending calendar sequence
+        /// </summary>
+        private void ExportCalEnd()
+        {
+            ExportLine("END:VCALENDAR\n");
+        }
+
+        #endregion
+
+        #region ExportVEvent
+
+        #region ExportVEvent
+
+        /// <summary>
+        /// Exports a calendar event (appointment)
+        /// </summary>
+        /// <param name="app"></param>
+        private void ExportVEvent(Appointment app)
+        {
+            ExportLine("\nBEGIN:VEVENT");
+
+            if (String.IsNullOrEmpty(app.Subject) == false)
+                ExportLine("SUMMARY:" + AddMetaData(app.Subject));
+
+            if (String.IsNullOrEmpty(app.Description) == false)
+                ExportLine("DESCRIPTION:" + AddMetaData(app.Description));
+
+            ExportLine("UID:" + Guid.NewGuid().ToString());
+            ExportLine("DTSTAMP:" + GetUniversalTime(_DtStamp));
+
+            if (String.IsNullOrEmpty(app.CategoryColor) == false)
+                ExportLine("X-DNB-CATEGORYCOLOR:" + app.CategoryColor);
+
+            if (String.IsNullOrEmpty(app.DisplayTemplate) == false)
+                ExportLine("X-DNB-DISPLAYTEMPLATE:" + AddMetaData(app.DisplayTemplate));
+
+            if (app.ImageAlign != eImageContentAlignment.TopLeft)
+                ExportLine("X-DNB-IMAGEALIGN:" + Enum.GetName(typeof(eImageContentAlignment), app.ImageAlign));
+
+            if (String.IsNullOrEmpty(app.ImageKey) == false)
+                ExportLine("X-DNB-IMAGEKEY:" + app.ImageKey);
+
+            if (app.Locked == true)
+                ExportLine("X-DNB-LOCKED:true");
+
+            if (app.StartTimeAction != eStartTimeAction.None)
+                ExportLine("X-DNB-STARTTIMEACTION:" + Enum.GetName(typeof(eStartTimeAction), app.StartTimeAction));
+
+            if (String.IsNullOrEmpty(app.TimeMarkedAs) == false)
+                ExportLine("X-DNB-TIMEMARKEDAS:" + app.TimeMarkedAs);
+
+            if (String.IsNullOrEmpty(app.Tooltip) == false)
+                ExportLine("X-DNB-TOOLTIP:" + AddMetaData(app.Tooltip));
+
+            if ((app.StartTime.Hour == 0 && app.StartTime.Minute == 0) &&
+                (app.EndTime.Hour == 0 && app.EndTime.Minute == 0))
+            {
+                ExportLine("DTSTART;VALUE=DATE:" + app.StartTime.ToString("yyyyMMdd"));
+
+                if ((app.EndTime - app.StartTime).TotalMinutes != 60 * 24)
+                    ExportLine("DTEND;VALUE=DATE:" + app.EndTime.ToString("yyyyMMdd"));
+            }
+            else
+            {
+                ExportLine("DTSTART:" + GetUniversalTime(app.StartTime));
+                ExportLine("DTEND:" + GetUniversalTime(app.EndTime));
+            }
+
+            if (app.Private == true)
+                ExportLine("CLASS:PRIVATE");
+
+            ExportRRule(app);
+            ExportAlarms(app);
+
+            ExportLine("END:VEVENT");
+        }
+
+        #region ExportRRule
+
+        #region ExportRRule
+
+        /// <summary>
+        /// Exports the appointment Recurrence Rule
+        /// </summary>
+        /// <param name="app"></param>
+        private void ExportRRule(Appointment app)
+        {
+            if (app.Recurrence != null)
+            {
+                switch (app.Recurrence.RecurrenceType)
+                {
+                    case eRecurrencePatternType.Daily:
+                        ExportDailyRRule(app.Recurrence);
+                        break;
+
+                    case eRecurrencePatternType.Weekly:
+                        ExportWeeklyRRule(app.Recurrence);
+                        break;
+
+                    case eRecurrencePatternType.Monthly:
+                        ExportMonthlyRRule(app.Recurrence);
+                        break;
+
+                    default:
+                        ExportYearlyRRule(app);
+                        break;
+                }
+
+                ExportExDate(app.Recurrence);
+            }
+        }
+
+        #endregion
+
+        #region ExportDailyRRule
+
+        /// <summary>
+        /// ExportDailyRRule
+        /// </summary>
+        /// <param name="recur"></param>
+        private void ExportDailyRRule(AppointmentRecurrence recur)
+        {
+            StringBuilder sb = new StringBuilder();
+
+            sb.Append("RRULE:FREQ=DAILY");
+
+            AddRRuleInterval(sb, recur.Daily.RepeatInterval);
+            AddRRuleByDay(sb, recur);
+
+            AddRRuleRangeInfo(sb, recur);
+
+            ExportLine(sb.ToString());
+        }
+
+        #endregion
+
+        #region ExportWeeklyRRule
+
+        /// <summary>
+        /// ExportWeeklyRRule
+        /// </summary>
+        /// <param name="recur"></param>
+        private void ExportWeeklyRRule(AppointmentRecurrence recur)
+        {
+            StringBuilder sb = new StringBuilder();
+
+            sb.Append("RRULE:FREQ=WEEKLY");
+
+            AddRRuleInterval(sb, recur.Weekly.RepeatInterval);
+
+            if (recur.Weekly.RepeatOnDaysOfWeek != eDayOfWeekRecurrence.None)
+                AddRRuleByDay(sb, recur.Weekly.RepeatOnDaysOfWeek);
+
+            AddRRuleRangeInfo(sb, recur);
+
+            ExportLine(sb.ToString());
+        }
+
+        #endregion
+
+        #region ExportMonthlyRRule
+
+        /// <summary>
+        /// ExportMonthlyRRule
+        /// </summary>
+        /// <param name="recur"></param>
+        private void ExportMonthlyRRule(AppointmentRecurrence recur)
+        {
+            StringBuilder sb = new StringBuilder();
+
+            sb.Append("RRULE:FREQ=MONTHLY");
+
+            AddRRuleInterval(sb, recur.Monthly.RepeatInterval);
+
+            if (recur.Monthly.RepeatOnRelativeDayInMonth == eRelativeDayInMonth.None)
+                sb.AppendFormat("{0}{1:D}", ";BYMONTHDAY=", recur.Monthly.RepeatOnDayOfMonth);
+            else
+                AddRRuleByDay(sb, recur.Monthly.RepeatOnRelativeDayInMonth, recur.Monthly.RelativeDayOfWeek);
+
+            AddRRuleRangeInfo(sb, recur);
+
+            ExportLine(sb.ToString());
+        }
+
+        #endregion
+
+        #region ExportYearlyRRule
+
+        /// <summary>
+        /// ExportYearlyRRule
+        /// </summary>
+        /// <param name="app"></param>
+        private void ExportYearlyRRule(Appointment app)
+        {
+            AppointmentRecurrence recur = app.Recurrence;
+
+            StringBuilder sb = new StringBuilder();
+
+            sb.Append("RRULE:FREQ=YEARLY");
+            sb.AppendFormat("{0}{1:D}", ";BYMONTH=", recur.Yearly.RepeatOnMonth);
+
+            if (recur.Yearly.RepeatOnRelativeDayInMonth == eRelativeDayInMonth.None)
+            {
+                if (recur.Yearly.RepeatOnDayOfMonth != app.StartTime.Day)
+                    sb.AppendFormat("{0}{1:D}", ";BYMONTHDAY=", recur.Yearly.RepeatOnDayOfMonth);
+            }
+            else
+            {
+                AddRRuleByDay(sb, recur.Yearly.RepeatOnRelativeDayInMonth, recur.Yearly.RelativeDayOfWeek);
+            }
+
+            AddRRuleRangeInfo(sb, recur);
+
+            ExportLine(sb.ToString());
+        }
+
+        #endregion
+
+        #region AddRRuleByDay
+
+        /// <summary>
+        /// AddRRuleByDay
+        /// </summary>
+        /// <param name="sb"></param>
+        /// <param name="repeat"></param>
+        private void AddRRuleByDay(StringBuilder sb, eDayOfWeekRecurrence repeat)
+        {
+            sb.Append(";BYDAY=");
+
+            if ((repeat & eDayOfWeekRecurrence.Sunday) != 0)
+                sb.Append("SU,");
+
+            if ((repeat & eDayOfWeekRecurrence.Monday) != 0)
+                sb.Append("MO,");
+
+            if ((repeat & eDayOfWeekRecurrence.Tuesday) != 0)
+                sb.Append("TU,");
+
+            if ((repeat & eDayOfWeekRecurrence.Wednesday) != 0)
+                sb.Append("WE,");
+
+            if ((repeat & eDayOfWeekRecurrence.Thursday) != 0)
+                sb.Append("TH,");
+
+            if ((repeat & eDayOfWeekRecurrence.Friday) != 0)
+                sb.Append("FR,");
+
+            if ((repeat & eDayOfWeekRecurrence.Saturday) != 0)
+                sb.Append("SA,");
+
+            sb.Length--;
+        }
+
+        #endregion
+
+        #region AddRRuleByDay
+
+        /// <summary>
+        /// AddRRuleByDay
+        /// </summary>
+        /// <param name="sb"></param>
+        /// <param name="repeat"></param>
+        private void AddRRuleByDay(StringBuilder sb, AppointmentRecurrence recur)
+        {
+            if (recur.Daily.RepeatInterval > 1)
+            {
+                sb.Append(";BYDAY=");
+            }
+            else
+            {
+                switch (recur.Daily.RepeatOnDaysOfWeek)
+                {
+                    case eDailyRecurrenceRepeat.All:
+                        sb.Append(";BYDAY=SU,MO,TU,WE,TH,FR,SA");
+                        break;
+
+                    case eDailyRecurrenceRepeat.WeekDays:
+                        sb.Append(";BYDAY=MO,TU,WE,TH,FR");
+                        break;
+
+                    default:
+                        sb.Append(";BYDAY=SA,SU");
+                        break;
+                }
+            }
+        }
+
+        #endregion
+
+        #region AddRRuleByDay
+
+        /// <summary>
+        /// AddRRuleByDay
+        /// </summary>
+        /// <param name="sb"></param>
+        /// <param name="rday"></param>
+        /// <param name="dow"></param>
+        private void AddRRuleByDay(StringBuilder sb, eRelativeDayInMonth rday, DayOfWeek dow)
+        {
+            sb.Append(";BYDAY=");
+
+            switch (dow)
+            {
+                case DayOfWeek.Sunday:
+                    sb.Append("SU");
+                    break;
+
+                case DayOfWeek.Monday:
+                    sb.Append("MO");
+                    break;
+
+                case DayOfWeek.Tuesday:
+                    sb.Append("TU");
+                    break;
+
+                case DayOfWeek.Wednesday:
+                    sb.Append("WE");
+                    break;
+
+                case DayOfWeek.Thursday:
+                    sb.Append("TH");
+                    break;
+
+                case DayOfWeek.Friday:
+                    sb.Append("FR");
+                    break;
+
+                default:
+                    sb.Append("SA");
+                    break;
+            }
+
+            switch (rday)
+            {
+                case eRelativeDayInMonth.First:
+                    sb.Append(";BYSETPOS=1");
+                    break;
+
+                case eRelativeDayInMonth.Second:
+                    sb.Append(";BYSETPOS=2");
+                    break;
+
+                case eRelativeDayInMonth.Third:
+                    sb.Append(";BYSETPOS=3");
+                    break;
+
+                case eRelativeDayInMonth.Fourth:
+                    sb.Append(";BYSETPOS=4");
+                    break;
+
+                case eRelativeDayInMonth.Last:
+                    sb.Append(";BYSETPOS=-1");
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region AddRRuleInterval
+
+        /// <summary>
+        /// AddRRuleInterval
+        /// </summary>
+        /// <param name="sb"></param>
+        /// <param name="interval"></param>
+        private void AddRRuleInterval(StringBuilder sb, int interval)
+        {
+            if (interval > 1)
+                sb.Append(";INTERVAL=" + interval.ToString());
+        }
+
+        #endregion
+
+        #region AddRRuleRangeInfo
+
+        /// <summary>
+        /// AddRRuleRangeInfo
+        /// </summary>
+        /// <param name="sb"></param>
+        /// <param name="recur"></param>
+        private void AddRRuleRangeInfo(StringBuilder sb, AppointmentRecurrence recur)
+        {
+            switch (recur.RangeLimitType)
+            {
+                case eRecurrenceRangeLimitType.RangeNumberOfOccurrences:
+                    if (recur.RangeNumberOfOccurrences > 0)
+                        sb.Append(";COUNT=" + (recur.RangeNumberOfOccurrences + 1).ToString());
+                    break;
+
+                case eRecurrenceRangeLimitType.RangeEndDate:
+                    sb.Append(";UNTIL=" + GetUtcDate(recur.RangeEndDate));
+                    break;
+            }
+
+            if (recur.RecurrenceStartDate != DateTime.MinValue && recur.RecurrenceStartDate != recur.Appointment.StartTime)
+                ExportLine("X-DNB-RECSTARTDATE=" + GetUtcDate(recur.RecurrenceStartDate));
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ExportExDate
+
+        /// <summary>
+        /// ExportExDate
+        /// </summary>
+        /// <param name="recur"></param>
+        private void ExportExDate(AppointmentRecurrence recur)
+        {
+            if (recur.SkippedRecurrences != null)
+            {
+                foreach (DateTime date in recur.SkippedRecurrences)
+                    ExportLine("EXDATE:" + GetUtcDate(date));
+            }
+        }
+
+        #endregion
+
+        #region ExportAlarms
+
+        /// <summary>
+        /// ExportAlarms
+        /// </summary>
+        /// <param name="app"></param>
+        private void ExportAlarms(Appointment app)
+        {
+            if (app.Reminders != null)
+            {
+                foreach (Reminder rem in app.Reminders)
+                {
+                    ExportLine("\nBEGIN:VALARM");
+
+                    if (string.IsNullOrEmpty(rem.Description) == false)
+                        ExportLine("DESCRIPTION:" + rem.Description);
+
+                    ExportLine("TRIGGER;VALUE=DURATION:" + GetDuration(rem.ReminderTime - app.StartTime));
+                    ExportLine("ACTION:DISPLAY");
+                    ExportLine("END:VALARM");
+                }
+            }
+
+            if (app.StartTimeAction != eStartTimeAction.None)
+            {
+                ExportLine("\nBEGIN:VALARM");
+                ExportLine("TRIGGER;VALUE=DURATION:PT0M");
+                ExportLine("ACTION:DISPLAY");
+                ExportLine("END:VALARM\n");
+            }
+        }
+
+        #endregion
+
+        #region GetDuration
+
+        /// <summary>
+        /// GetDuration
+        /// </summary>
+        /// <param name="ts"></param>
+        /// <returns></returns>
+        private string GetDuration(TimeSpan ts)
+        {
+            StringBuilder sb = new StringBuilder();
+
+            if (ts.TotalMinutes < 0)
+                sb.Append("-");
+
+            sb.Append("P");
+
+            int totalMinutes = (int)Math.Abs(ts.TotalMinutes);
+
+            int days = totalMinutes / (24 * 60);
+
+            if (days > 0)
+            {
+                sb.Append(days + "D");
+                totalMinutes %= (24 * 60);
+            }
+
+            if (totalMinutes > 0)
+            {
+                sb.Append("T");
+
+                int hours = totalMinutes / 60;
+
+                if (hours > 0)
+                {
+                    sb.Append(hours + "H");
+                    totalMinutes %= 60;
+                }
+
+                if (totalMinutes > 0)
+                    sb.Append(totalMinutes + "M");
+            }
+
+            return (sb.ToString());
+        }
+
+        #endregion
+
+        #region GetUtcDate
+
+        /// <summary>
+        /// GetUtcDate
+        /// </summary>
+        /// <param name="dateTime"></param>
+        /// <returns></returns>
+        private string GetUtcDate(DateTime dateTime)
+        {
+            DateTime date = dateTime.ToUniversalTime();
+
+            return (date.ToString("yyyyMMdd\\tHHmms\\z"));
+        }
+
+        #endregion
+
+        #endregion
+
+        #region AddMetaData
+
+        /// <summary>
+        /// Adds escape chars to text meta data
+        /// </summary>
+        /// <param name="s"></param>
+        /// <returns></returns>
+        private string AddMetaData(string s)
+        {
+            Regex p = new Regex("[,;\\n]");
+            MatchCollection mc = p.Matches(s);
+
+            if (mc.Count > 0)
+            {
+                StringBuilder sb = new StringBuilder();
+
+                int index = 0;
+
+                foreach (Match ma in mc)
+                {
+                    if (index < ma.Index)
+                        sb.Append(s.Substring(index, ma.Index - index));
+
+                    index = ma.Index + ma.Length;
+
+                    char c = ma.Value[0];
+
+                    if (c == '\n')
+                        c = 'n';
+
+                    sb.Append('\\');
+                    sb.Append(c);
+                }
+
+                if (index < s.Length)
+                    sb.Append(s.Substring(index, s.Length - index));
+
+                return (sb.ToString());
+            }
+
+            return (s);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ExportLine
+
+        /// <summary>
+        /// Exports a line
+        /// </summary>
+        /// <param name="text"></param>
+        private void ExportLine(string text)
+        {
+            _StreamWriter.WriteLine(WrapLine(text, FoldCount));
+        }
+
+        #region WrapLine
+
+        /// <summary>
+        /// Performs line wrapping (aka folding)
+        /// </summary>
+        /// <param name="text">Text to wrap</param>
+        /// <param name="wrapLength">Wrapping length</param>
+        /// <returns></returns>
+        private string WrapLine(string text, int wrapLength)
+        {
+            if (text.Length <= wrapLength)
+                return (text);
+
+            StringBuilder sb = new StringBuilder();
+
+            int len;
+
+            for (int i = 0; i < text.Length; i += len)
+            {
+                len = text.Length - i;
+
+                if (len > wrapLength)
+                    len = BreakLine(text, i, wrapLength);
+
+                if (i > 0)
+                    sb.Append("\n ");
+
+                sb.Append(text, i, len);
+            }
+
+            return (sb.ToString());
+        }
+
+        #endregion
+
+        #region BreakLine
+
+        /// <summary>
+        /// Determines where to break a line of text
+        /// </summary>
+        /// <param name="text">Text</param>
+        /// <param name="pos">Current text pos</param>
+        /// <param name="max">Max line length</param>
+        /// <returns></returns>
+        private int BreakLine(string text, int pos, int max)
+        {
+            int i = max - 1;
+
+            while (i > 0 && IsBreakChar(text[pos + i]) == false)
+                i--;
+
+            if (i <= 0)
+                return (max);
+
+            while (i >= 0 && Char.IsWhiteSpace(text[pos + i]) == true)
+                i--;
+
+            return (i + 1);
+        }
+
+        #endregion
+
+        #region IsBreakChar
+
+        /// <summary>
+        /// Determines if a char is a break char
+        /// </summary>
+        /// <param name="c"></param>
+        /// <returns>true if break char</returns>
+        private bool IsBreakChar(char c)
+        {
+            return (Char.IsWhiteSpace(c) || c == ',' || c == ';');
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetDefaultOwnerKeys
+
+        /// <summary>
+        /// GetDefaultOwnerKeys
+        /// </summary>
+        /// <returns>A list of all defined model OwnerKeys</returns>
+        private string[] GetDefaultOwnerKeys()
+        {
+            List<string> list = new List<string>();
+
+            foreach (Appointment app in Model.Appointments)
+            {
+                string key = app.OwnerKey ?? "";
+
+                if (list.Contains(app.OwnerKey) == false)
+                    list.Add(key);
+            }
+
+            list.Sort();
+
+            string[] ownerKeys = new string[list.Count];
+            list.CopyTo(ownerKeys);
+
+            return (ownerKeys);
+        }
+
+        #endregion
+
+        #region GetUniversalTime
+
+        /// <summary>
+        /// GetUniversalTime
+        /// </summary>
+        /// <param name="date"></param>
+        /// <returns></returns>
+        private string GetUniversalTime(DateTime date)
+        {
+            return (date.ToUniversalTime().ToString("yyyyMMdd\\tHHmms\\z"));
+        }
+
+        #endregion
+
+        #region IsAppointmentVisible
+
+        /// <summary>
+        /// Determines if an appointment is visible
+        /// with respect to the given ownerKey
+        /// </summary>
+        /// <param name="app"></param>
+        /// <param name="ownerKey"></param>
+        /// <returns></returns>
+        protected virtual bool IsAppointmentVisible(Appointment app, string ownerKey)
+        {
+            if (string.IsNullOrEmpty(ownerKey))
+                return (true);
+
+            return (app.OwnerKey == ownerKey);
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/ImportExport/ICS/IcsImporter.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/ImportExport/ICS/IcsImporter.cs
new file mode 100644
index 00000000..48143c37
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/ImportExport/ICS/IcsImporter.cs	
@@ -0,0 +1,4206 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Globalization;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+
+namespace DevComponents.Schedule.Model.Serialization
+{
+    /// <summary>
+    /// ICS (Internet Calendaring and Scheduling - RFC5545) import into
+    /// corresponding DNB internal Model/Appointment data layout
+    /// </summary>
+    public class IcsImporter
+    {
+        #region Static data
+
+        #region Component token data
+
+        private static TokenRegistry[] _components = new TokenRegistry[]
+        {
+            new TokenRegistry("daylight", (int)ComponentToken.Daylight),
+            new TokenRegistry("standard", (int)ComponentToken.Standard),
+            new TokenRegistry("valarm", (int)ComponentToken.VAlarm),
+            new TokenRegistry("vcalendar", (int)ComponentToken.VCalendar),
+            new TokenRegistry("vevent", (int)ComponentToken.VEvent),
+            new TokenRegistry("vfreebusy", (int)ComponentToken.VFreeBusy),
+            new TokenRegistry("vjournal", (int)ComponentToken.VJournal),
+            new TokenRegistry("vtimezone", (int)ComponentToken.VTimezone),
+            new TokenRegistry("vtodo", (int)ComponentToken.VTodo),
+        };
+
+        #endregion
+
+        #region Property token data
+
+        private static TokenRegistry[] _properties = new TokenRegistry[]
+        {
+            //new TokenRegistry("action", (int)PropertyToken.Action),
+            //new TokenRegistry("attach", (int)PropertyToken.Attach),
+            //new TokenRegistry("attendee", (int)PropertyToken.Attendee),
+            new TokenRegistry("begin", (int)PropertyToken.Begin),
+            new TokenRegistry("calscale", (int)PropertyToken.CalScale),
+            //new TokenRegistry("categories", (int)PropertyToken.Categories),
+            new TokenRegistry("class", (int)PropertyToken.Class),
+            new TokenRegistry("comment", (int)PropertyToken.Comment),
+            //new TokenRegistry("completed", (int)PropertyToken.Completed),
+            //new TokenRegistry("contact", (int)PropertyToken.Contact),
+            //new TokenRegistry("created", (int)PropertyToken.Created),
+            new TokenRegistry("description", (int)PropertyToken.Description),
+            new TokenRegistry("dtend", (int)PropertyToken.DtEnd),
+            new TokenRegistry("dtstamp", (int)PropertyToken.DtStamp),
+            new TokenRegistry("dtstart", (int)PropertyToken.DtStart),
+            new TokenRegistry("due", (int)PropertyToken.Due),
+            new TokenRegistry("duration", (int)PropertyToken.Duration),
+            new TokenRegistry("end", (int)PropertyToken.End),
+            new TokenRegistry("exdate", (int)PropertyToken.ExDate),
+            //new TokenRegistry("exrule", (int)PropertyToken.ExRule),
+            //new TokenRegistry("freebusy", (int)PropertyToken.FreeBusy),
+            //new TokenRegistry("geo", (int)PropertyToken.Geo),
+            //new TokenRegistry("last-modified", (int)PropertyToken.LastModified),
+            //new TokenRegistry("location", (int)PropertyToken.Location),
+            //new TokenRegistry("method", (int)PropertyToken.Method),
+            //new TokenRegistry("organizer", (int)PropertyToken.Organizer),
+            //new TokenRegistry("percent-complete", (int)PropertyToken.PercentComplete),
+            //new TokenRegistry("priority", (int)PropertyToken.Priority),
+            //new TokenRegistry("progid", (int)PropertyToken.ProgId),
+            new TokenRegistry("rdate", (int)PropertyToken.RDate),
+            new TokenRegistry("recurrence-id", (int)PropertyToken.RecurrenceId),
+            //new TokenRegistry("related-to", (int)PropertyToken.RelatedTo),
+            //new TokenRegistry("repeat", (int)PropertyToken.Repeat),
+            //new TokenRegistry("request-status", (int)PropertyToken.RequestStatus),
+            //new TokenRegistry("resources", (int)PropertyToken.Resources),
+            new TokenRegistry("rrule", (int)PropertyToken.RRule),
+            //new TokenRegistry("sequence", (int)PropertyToken.Sequence),
+            //new TokenRegistry("status", (int)PropertyToken.Status),
+            new TokenRegistry("summary", (int)PropertyToken.Summary),
+            //new TokenRegistry("transp", (int)PropertyToken.Transp),
+            new TokenRegistry("trigger", (int)PropertyToken.Trigger),
+            new TokenRegistry("tzid", (int)PropertyToken.TzId),
+            new TokenRegistry("tzname", (int)PropertyToken.TzName),
+            new TokenRegistry("tzoffsetfrom", (int)PropertyToken.TzOffsetFrom),
+            new TokenRegistry("tzoffsetto", (int)PropertyToken.TzOffsetTo),
+            //new TokenRegistry("tzurl", (int)PropertyToken.TzUrl),
+            new TokenRegistry("uid", (int)PropertyToken.Uid),
+            //new TokenRegistry("url", (int)PropertyToken.Url),
+            new TokenRegistry("version", (int)PropertyToken.Version),
+            new TokenRegistry("x-dnb-categorycolor", (int)PropertyToken.XDnbCategoryColor),
+            new TokenRegistry("x-dnb-displaytemplate", (int)PropertyToken.XDnbDisplayTemplate),
+            new TokenRegistry("x-dnb-imagealign", (int)PropertyToken.XDnbImageAlign),
+            new TokenRegistry("x-dnb-imagekey", (int)PropertyToken.XDnbImageKey),
+            new TokenRegistry("x-dnb-locked", (int)PropertyToken.XDnbLocked),
+            new TokenRegistry("x-dnb-recstartdate", (int)PropertyToken.XDnbRecStartDate),
+            new TokenRegistry("x-dnb-starttimeaction", (int)PropertyToken.XDnbStartTimeAction),
+            new TokenRegistry("x-dnb-timemarkedas", (int)PropertyToken.XDnbTimeMarkedAs),
+            new TokenRegistry("x-dnb-tooltip", (int)PropertyToken.XDnbTooltip),
+            new TokenRegistry("x-wr-calname", (int)PropertyToken.XWrCalname),
+        };
+
+        #endregion
+
+        #region Parameter token data
+
+        private static TokenRegistry[] _parameters = new TokenRegistry[]
+        {
+            //new TokenRegistry("altrep", (int)eParameterToken.AltRep),
+            //new TokenRegistry("cn", (int)eParameterToken.Cn),
+            //new TokenRegistry("cutype", (int)eParameterToken.CuType),
+            //new TokenRegistry("delegated-from", (int)eParameterToken.DelegatedFrom),
+            //new TokenRegistry("delegated-to", (int)eParameterToken.DelegatedTo),
+            //new TokenRegistry("dir", (int)eParameterToken.Dir),
+            //new TokenRegistry("encoding", (int)eParameterToken.Encoding),
+            //new TokenRegistry("fmttype", (int)eParameterToken.FmtType),
+            //new TokenRegistry("fbtype", (int)eParameterToken.FbType),
+            //new TokenRegistry("language", (int)eParameterToken.Language),
+            //new TokenRegistry("member", (int)eParameterToken.Member),
+            //new TokenRegistry("parstat", (int)eParameterToken.ParStat),
+            //new TokenRegistry("range", (int)eParameterToken.Range),
+            //new TokenRegistry("related", (int)eParameterToken.Related),
+            //new TokenRegistry("reltype", (int)eParameterToken.RelType),
+            //new TokenRegistry("role", (int)eParameterToken.Role),
+            //new TokenRegistry("rsvp", (int)eParameterToken.Rsvp),
+            //new TokenRegistry("sent-by", (int)eParameterToken.SentBy),
+            new TokenRegistry("tzid", (int)ParameterToken.TzId),
+            new TokenRegistry("value", (int)ParameterToken.Value),
+        };
+
+        #endregion
+
+        #region Value token data
+
+        private static TokenRegistry[] _values = new TokenRegistry[]
+        {
+            new TokenRegistry("byday", (int)ValueToken.ByDay),
+            new TokenRegistry("byhour", (int)ValueToken.ByHour),
+            new TokenRegistry("byminute", (int)ValueToken.ByMinute),
+            new TokenRegistry("bymonth", (int)ValueToken.ByMonth),
+            new TokenRegistry("bymonthday", (int)ValueToken.ByMonthDay),
+            new TokenRegistry("bysecond", (int)ValueToken.BySecond),
+            new TokenRegistry("bysetpos", (int)ValueToken.BySetPos),
+            new TokenRegistry("byweekno", (int)ValueToken.ByWeekNo),
+            new TokenRegistry("byyearday", (int)ValueToken.ByYearDay),
+            new TokenRegistry("count", (int)ValueToken.Count),
+            new TokenRegistry("daily", (int)ValueToken.Daily),
+            new TokenRegistry("date", (int)ValueToken.Date),
+            new TokenRegistry("datetime", (int)ValueToken.DateTime),
+            new TokenRegistry("duration", (int)ValueToken.Duration),
+            new TokenRegistry("end", (int)ValueToken.End),
+            new TokenRegistry("fr", (int)ValueToken.Fr),
+            new TokenRegistry("freq", (int)ValueToken.Freq),
+            new TokenRegistry("gregorian", (int)ValueToken.Gregorian),
+            new TokenRegistry("hourly", (int)ValueToken.Hourly),
+            new TokenRegistry("interval", (int)ValueToken.Interval),
+            new TokenRegistry("minutely", (int)ValueToken.Minutely),
+            new TokenRegistry("mo", (int)ValueToken.Mo),
+            new TokenRegistry("monthly", (int)ValueToken.Monthly),
+            new TokenRegistry("period", (int)ValueToken.Period),
+            new TokenRegistry("sa", (int)ValueToken.Sa),
+            new TokenRegistry("secondly", (int)ValueToken.Secondly),
+            new TokenRegistry("start", (int)ValueToken.Start),
+            new TokenRegistry("su", (int)ValueToken.Su),
+            new TokenRegistry("text", (int)ValueToken.Text),
+            new TokenRegistry("th", (int)ValueToken.Th),
+            new TokenRegistry("tu", (int)ValueToken.Tu),
+            new TokenRegistry("until", (int)ValueToken.Until),
+            new TokenRegistry("we", (int)ValueToken.We),
+            new TokenRegistry("weekly", (int)ValueToken.Weekly),
+            new TokenRegistry("wkst", (int)ValueToken.WkSt),
+            new TokenRegistry("yearly", (int)ValueToken.Yearly),
+        };
+
+        #endregion
+
+        #endregion
+
+        #region Constants
+
+        private const string Version = "2.0";
+
+        #endregion
+
+        #region Constructors
+
+        public IcsImporter()
+        {
+        }
+
+        public IcsImporter(CalendarModel model)
+        {
+            Model = model;
+        }
+
+        #endregion
+
+        #region Private variables
+
+        private int _EntryIndex;
+
+        private IcsComponent _IncludeComponent = IcsComponent.All;
+        private Dictionary<string, List<Appointment>> _Uid = new Dictionary<string, List<Appointment>>();
+        private List<CalendarTimeZone> _CalendarTimeZone;
+
+        private List<CalendarEntry> _CalendarEntries = new List<CalendarEntry>();
+
+        private CalendarModel _Model;
+
+        private string[] _CalNames;
+        private string[] _OwnerKeys;
+
+        private string _ImportFile;
+
+        private bool _IgnoreErrors;
+
+        #endregion
+
+        #region Public properties
+
+        #region IgnoreErrors
+
+        /// <summary>
+        /// Ignore import Errors
+        /// </summary>
+        public bool IgnoreErrors
+        {
+            get { return (_IgnoreErrors); }
+            set { _IgnoreErrors = value; }
+        }
+
+        #endregion
+
+        #region IncludeComponent
+
+        /// <summary>
+        /// Gets or sets the iCalendar components to include in the import.
+        /// </summary>
+        [DefaultValue(IcsComponent.All)]
+        [Description("Indicates which iCalendar component to include in the import.")]
+        public IcsComponent IncludeComponent
+        {
+            get { return (_IncludeComponent); }
+            set { _IncludeComponent = value; }
+        }
+
+        #endregion
+
+        #region Model
+
+        /// <summary>
+        /// CalendarModel
+        /// </summary>
+        public CalendarModel Model
+        {
+            get { return (_Model); }
+            set { _Model = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Import
+
+        /// <summary>
+        /// Imports all appointments from the given export file's
+        /// calName array Calendar entries, and associates them with the
+        /// given OwnerKey array entries.
+        /// </summary>
+        /// <param name="calNames">Array of Calendar names</param>
+        /// <param name="ownerKeys">Array of associated OwnerKeys</param>
+        /// <param name="streamReader">Import file path.</param>
+        public void Import(string[] calNames, string[] ownerKeys, StreamReader streamReader)
+        {
+            if (_Model == null)
+                throw new Exception("Model can not be null.");
+
+            if (streamReader == null)
+                throw new Exception("Invalid StreamReader.");
+
+            _CalNames = calNames;
+            _OwnerKeys = ownerKeys;
+
+            if (String.IsNullOrEmpty(_ImportFile) == true)
+                _ImportFile = streamReader.BaseStream.ToString();
+
+            _CalendarEntries.Clear();
+
+            Parse(streamReader);
+
+            if (_CalendarEntries.Count > 0)
+            {
+                CalendarEntry entry = GetFirstEntry();
+
+                try
+                {
+                    Model.BeginUpdate();
+
+                    ProcessCalendarEntries(entry);
+                }
+                finally
+                {
+                    Model.EndUpdate();
+                }
+            }
+        }
+
+        #region Import variations
+
+        /// <summary>
+        /// Imports all appointments from the given input file.
+        /// </summary>
+        /// <param name="importFile">Input file</param>
+        public void Import(string importFile)
+        {
+            Import((string[])null, null, importFile);
+        }
+
+        /// <summary>
+        /// Imports all appointments from the given input stream.
+        /// </summary>
+        /// <param name="streamReader">Input file StreamReader</param>
+        public void Import(StreamReader streamReader)
+        {
+            Import((string[])null, null, streamReader);
+        }
+
+        /// <summary>
+        /// Imports all appointments from the given export file
+        /// calName Calendar entry.
+        /// </summary>
+        /// <param name="calName">Calendar entry name</param>
+        /// <param name="importFile">Import file path.</param>
+        public void Import(string calName, string importFile)
+        {
+            Import(calName, calName, importFile);
+        }
+
+        /// <summary>
+        /// Imports all appointments from the given export stream
+        /// calName Calendar entry.
+        /// </summary>
+        /// <param name="calName">Calendar entry name</param>
+        /// <param name="streamReader">Import file StreamReader.</param>
+        public void Import(string calName, StreamReader streamReader)
+        {
+            Import(calName, calName, streamReader);
+        }
+
+        /// <summary>
+        /// Imports all appointments from the given export file
+        /// calName Calendar entry, and associates them with the
+        /// given OwnerKey.
+        /// </summary>
+        /// <param name="calName">Calendar entry name</param>
+        /// <param name="ownerKey">Associated OwnerKey</param>
+        /// <param name="importFile">Import file path.</param>
+        public void Import(string calName, string ownerKey, string importFile)
+        {
+            string[] calNames = new string[] { calName };
+            string[] ownerKeys = new string[] { ownerKey };
+
+            Import(calNames, ownerKeys, importFile);
+        }
+
+        /// <summary>
+        /// Imports all appointments from the given export stream
+        /// calName Calendar entry, and associates them with the
+        /// given OwnerKey.
+        /// </summary>
+        /// <param name="calName">Calendar entry name</param>
+        /// <param name="ownerKey">Associated OwnerKey</param>
+        /// <param name="streamReader">Import file StreamReader.</param>
+        public void Import(string calName, string ownerKey, StreamReader streamReader)
+        {
+            string[] calNames = new string[] { calName };
+            string[] ownerKeys = new string[] { ownerKey };
+
+            Import(calNames, ownerKeys, streamReader);
+        }
+
+        /// <summary>
+        /// Imports all appointments from the given export file
+        /// calName array Calendar entries, and associates them with the
+        /// given OwnerKey array entries.
+        /// </summary>
+        /// <param name="calNames">Array of Calendar names</param>
+        /// <param name="ownerKeys">Array of associated OwnerKeys</param>
+        /// <param name="importFile">Import file path.</param>
+        public void Import(string[] calNames, string[] ownerKeys, string importFile)
+        {
+            _ImportFile = importFile;
+
+            using (StreamReader streamReader = new StreamReader(importFile))
+                Import(calNames, ownerKeys, streamReader);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ProcessCalendarEntries
+
+        /// <summary>
+        /// Initiates the processing of each calendar component entry
+        /// </summary>
+        /// <param name="entry"></param>
+        private void ProcessCalendarEntries(CalendarEntry entry)
+        {
+            while (entry != null)
+            {
+                switch ((PropertyToken)GetToken(_properties, entry.Id))
+                {
+                    case PropertyToken.Begin:
+                        switch ((ComponentToken)GetToken(_components, entry.Value))
+                        {
+                            case ComponentToken.VCalendar:
+                                ProcessVCalendar();
+                                break;
+                        }
+                        break;
+                }
+
+                entry = GetNextEntry();
+            }
+        }
+
+        #endregion
+
+        #region ProcessVCalendar
+
+        #region ProcessVCalendar
+
+        /// <summary>
+        /// Processes individual calendar component entries
+        /// </summary>
+        private void ProcessVCalendar()
+        {
+            string ownerKey = "";
+            bool validCalName = true;
+
+            CalendarEntry entry = GetNextEntry();
+
+            while (entry != null)
+            {
+                switch ((PropertyToken) GetToken(_properties, entry.Id))
+                {
+                    case PropertyToken.Begin:
+                        bool include = false;
+                        ComponentToken ctkn = (ComponentToken)GetToken(_components, entry.Value);
+
+                        if (validCalName == true)
+                        {
+                            switch (ctkn)
+                            {
+                                case ComponentToken.VEvent:
+                                    include = (_IncludeComponent & IcsComponent.Event) != 0;
+
+                                    if (include == true)
+                                        ProcessVEvent(ownerKey);
+                                    break;
+
+                                case ComponentToken.VTimezone:
+                                    include = (_IncludeComponent & IcsComponent.Timezone) != 0;
+
+                                    if (include == true)
+                                        ProcessVTimezone();
+                                    break;
+
+                                case ComponentToken.VTodo:
+                                    include = (_IncludeComponent & IcsComponent.Todo) != 0;
+
+                                    if (include == true)
+                                        ProcessVTodo(ownerKey);
+                                    break;
+
+                                case ComponentToken.VFreeBusy:
+                                case ComponentToken.VJournal:
+                                    break;
+
+                                default:
+                                    ReportError(entry, "Unexpected \"BEGIN:" + entry.Value.ToUpper() + "\"");
+                                    break;
+                            }
+                        }
+
+                        if (include == false)
+                            SkipComponent(ctkn);
+                        break;
+
+                    case PropertyToken.CalScale:
+                        ProcessCalScale(entry);
+                        break;
+
+                    case PropertyToken.End:
+                        ProcessCalEnd(entry);
+                        return;
+
+                    case PropertyToken.Version:
+                        ProcessVersion(entry);
+                        break;
+
+                    case PropertyToken.XWrCalname:
+                        string calName = ProcessWrCalName(entry);
+
+                        validCalName = IsValidCalName(calName);
+
+                        if (validCalName == true)
+                            ownerKey = GetOwnerKey(calName);
+                        break;
+                }
+
+                entry = GetNextEntry();
+            }
+
+            ReportError(entry, "Expected \"END:VCALENDAR\"");
+        }
+
+        #endregion
+
+        #region ProcessCalEnd
+
+        /// <summary>
+        /// Processes final Calendar component termination
+        /// </summary>
+        /// <param name="entry"></param>
+        private void ProcessCalEnd(CalendarEntry entry)
+        {
+            if ((ComponentToken)GetToken(_components, entry.Value) != ComponentToken.VCalendar)
+                ReportError(entry, "Expected \"END:VCALENDAR\"");
+        }
+
+        #endregion
+
+        #region ProcessCalScale
+
+        /// <summary>
+        /// Processes Calendar Scale (Gregorian only support)
+        /// </summary>
+        /// <param name="entry"></param>
+        private void ProcessCalScale(CalendarEntry entry)
+        {
+            ValueToken tkn = (ValueToken)GetToken(_values, entry.Value);
+
+            if (tkn != ValueToken.Gregorian)
+                ReportError(entry, "Only GREGORIAN calendar scale is supported");
+        }
+
+        #endregion
+
+        #region ProcessVersion
+
+        /// <summary>
+        /// Processes Calendar version entries
+        /// </summary>
+        /// <param name="entry"></param>
+        private void ProcessVersion(CalendarEntry entry)
+        {
+            if (entry.Value.Equals(Version) == false)
+                ReportError(entry, "iCalendar VERSION 2.0 is required");
+        }
+
+        #endregion
+
+        #region ProcessVEvent
+
+        #region ProcessVEvent
+
+        /// <summary>
+        /// Processes Event components for the given OwnerKey
+        /// </summary>
+        /// <param name="ownerKey">Associated OwnerKey</param>
+        private void ProcessVEvent(string ownerKey)
+        {
+            Appointment app = new Appointment();
+            app.OwnerKey = ownerKey;
+
+            VEventData evData = new VEventData();
+
+            CalendarEntry entry = GetNextEntry();
+
+            while (entry != null)
+            {
+                PropertyToken tkn = (PropertyToken)GetToken(_properties, entry.Id);
+
+                switch (tkn)
+                {
+                    case PropertyToken.Begin:
+                        ComponentToken ctkn = (ComponentToken)GetToken(_components, entry.Value);
+
+                        switch (ctkn)
+                        {
+                            case ComponentToken.VAlarm:
+                                ProcessVAlarm(evData);
+                                break;
+
+                            default:
+                                ReportError(entry, "Unexpected \"BEGIN:" + entry.Value.ToUpper() + "\"");
+                                SkipComponent(ctkn);
+                                break;
+                        }
+                        break;
+
+                    case PropertyToken.Class:
+                        app.Private = ProcessClass(entry, evData);
+                        break;
+
+                    case PropertyToken.Description:
+                        app.Description = ProcessDescription(entry, evData);
+                        break;
+
+                    case PropertyToken.DtEnd:
+                        app.EndTime = ProcessDate(entry, ref evData.IsDtEndValue);
+                        break;
+
+                    case PropertyToken.DtStart:
+                        app.StartTime = ProcessDate(entry, ref evData.IsDtStartValue);
+                        break;
+
+                    case PropertyToken.Duration:
+                        evData.Duration = ProcessDuration(entry, entry.Value);
+                        break;
+
+                    case PropertyToken.End:
+                        if ((ComponentToken)GetToken(_components, entry.Value) != ComponentToken.VEvent)
+                            ReportError(entry, "Expected \"END:VEVENT\"");
+
+                        ProcessVEventEnd(entry, app, evData);
+                        return;
+
+                    case PropertyToken.ExDate:
+                        ProcessExDate(entry, evData);
+                        break;
+
+                    case PropertyToken.RDate:
+                        evData.RecurDate = ProcessRDate(entry, evData.RecurDate);
+                        break;
+
+                    case PropertyToken.RecurrenceId:
+                        evData.RecIdDate = ProcessRecurrenceId(entry);
+                        break;
+
+                    case PropertyToken.RRule:
+                        evData.RecurRule = ProcessRRule(entry);
+                        break;
+
+                    case PropertyToken.Summary:
+                        app.Subject = ProcessSummary(entry, evData);
+                        break;
+
+                    case PropertyToken.Uid:
+                        evData.UidApps = ProcessUid(entry, app);
+                        break;
+
+                    case PropertyToken.XDnbCategoryColor:
+                        app.CategoryColor = ProcessXDnbCategoryColor(entry, evData);
+                        break;
+
+                    case PropertyToken.XDnbDisplayTemplate:
+                        app.DisplayTemplate = ProcessXDnbDisplayTemplate(entry, evData);
+                        break;
+
+                    case PropertyToken.XDnbImageAlign:
+                        app.ImageAlign = ProcessXDnbImageAlign(entry, evData);
+                        break;
+
+                    case PropertyToken.XDnbImageKey:
+                        app.ImageKey = ProcessXDnbImageKey(entry, evData);
+                        break;
+
+                    case PropertyToken.XDnbLocked:
+                        app.Locked = ProcessXDnbLocked(entry, evData);
+                        break;
+
+                    case PropertyToken.XDnbRecStartDate:
+                        evData.RecStartDate = ProcessXDnbRecStartDate(entry);
+                        break;
+
+                    case PropertyToken.XDnbStartTimeAction:
+                        app.StartTimeAction = ProcessXDnbStartTimeAction(entry, evData);
+                        break;
+
+                    case PropertyToken.XDnbTimeMarkedAs:
+                        app.TimeMarkedAs = ProcessXDnbTimeMarkedAs(entry, evData);
+                        break;
+
+                    case PropertyToken.XDnbTooltip:
+                        app.Tooltip = ProcessXDnbTooltip(entry, evData);
+                        break;
+                }
+
+                entry = GetNextEntry();
+            }
+
+            ReportError(entry, "Expected \"END:VEVENT\"");
+        }
+
+        #endregion
+
+        #region ProcessVEventEnd
+
+        #region ProcessVEventEnd
+
+        /// <summary>
+        /// Processes Event termination
+        /// </summary>
+        /// <param name="entry"></param>
+        /// <param name="app"></param>
+        /// <param name="evData"></param>
+        private void ProcessVEventEnd(CalendarEntry entry, Appointment app, VEventData evData)
+        {
+            if (evData.RecIdDate != DateTime.MinValue)
+                ProcessRecurrenceId(entry, app, evData);
+            else
+                ProcessEventEndEx(Model, entry, app, evData);
+        }
+
+        #endregion
+
+        #region ProcessEventEndEx
+
+        /// <summary>
+        /// ProcessEventEndEx
+        /// </summary>
+        /// <param name="model"></param>
+        /// <param name="entry"></param>
+        /// <param name="app"></param>
+        /// <param name="evData"></param>
+        private void ProcessEventEndEx(CalendarModel model,
+            CalendarEntry entry, Appointment app, VEventData evData)
+        {
+            if (ValidateAppTime(entry, app, evData) == true)
+            {
+                if (evData.UidApps == null)
+                {
+                    evData.UidApps = new List<Appointment>();
+                    evData.UidApps.Add(app);
+                }
+
+                if (evData.RecurRule != null)
+                {
+                    switch (evData.RecurRule.Freq)
+                    {
+                        case Frequency.Daily:
+                            ProcessDailyRecurrence(model, app, evData);
+                            break;
+
+                        case Frequency.Weekly:
+                            ProcessWeeklyRecurrence(model, app, evData);
+                            break;
+
+                        case Frequency.Monthly:
+                            ProcessMonthlyRecurrence(model, app, evData);
+                            break;
+
+                        case Frequency.Yearly:
+                            ProcessYearlyRecurrence(model, app, evData);
+                            break;
+                    }
+
+                    ProcessRDateRange(model, app, evData);
+                }
+                else
+                {
+                    model.Appointments.Add(app);
+                }
+
+                ProcessVEventReminder(evData);
+            }
+        }
+
+        #region ValidateAppTime
+
+        private bool ValidateAppTime(CalendarEntry entry, Appointment app, VEventData evData)
+        {
+            if (app.StartTime == DateTime.MinValue)
+            {
+                ReportError(entry, "DTSTART not set");
+                return (false);
+            }
+
+            if (evData.Duration.TotalSeconds != 0)
+                app.EndTime = app.StartTime.Add(evData.Duration);
+
+            else if (app.EndTime == DateTime.MinValue)
+            {
+                app.EndTime = (evData.IsDtStartValue == true)
+                                  ? app.StartTime.AddDays(1)
+                                  : app.StartTime;
+            }
+
+            if (app.StartTime > app.EndTime)
+            {
+                ReportError(entry, "DTSTART is greater than DTEND");
+                return (false);
+            }
+
+            evData.StartTime = app.StartTime;
+            evData.EndTime = app.EndTime;
+
+            return (true);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ProcessDailyRecurrence
+
+        /// <summary>
+        /// Processes Daily recurrences
+        /// </summary>
+        /// <param name="model"></param>
+        /// <param name="app"></param>
+        /// <param name="evData"></param>
+        private void ProcessDailyRecurrence(CalendarModel model, Appointment app, VEventData evData)
+        {
+            AppointmentRecurrence recur = new AppointmentRecurrence();
+
+            recur.RecurrenceType = eRecurrencePatternType.Daily;
+
+            recur.Daily.RepeatInterval = evData.RecurRule.Interval;
+
+            switch (evData.RecurRule.ByDays)
+            {
+                case eDayOfWeekRecurrence.WeekDays:
+                    recur.Daily.RepeatOnDaysOfWeek = eDailyRecurrenceRepeat.WeekDays;
+                    break;
+
+                case eDayOfWeekRecurrence.WeekendDays:
+                    recur.Daily.RepeatOnDaysOfWeek = eDailyRecurrenceRepeat.WeekendDays;
+                    break;
+            }
+
+            ProcessRecurrenceRange(app, recur, evData);
+
+            app.Recurrence = recur;
+
+            model.Appointments.Add(app);
+        }
+
+        #endregion
+
+        #region ProcessWeeklyRecurrence
+
+        /// <summary>
+        /// Processes Weekly recurrences
+        /// </summary>
+        /// <param name="model"></param>
+        /// <param name="app"></param>
+        /// <param name="evData"></param>
+        private void ProcessWeeklyRecurrence(CalendarModel model, Appointment app, VEventData evData)
+        {
+            AppointmentRecurrence recur = new AppointmentRecurrence();
+
+            recur.RecurrenceType = eRecurrencePatternType.Weekly;
+
+            recur.Weekly.RepeatInterval = evData.RecurRule.Interval;
+
+            recur.Weekly.RepeatOnDaysOfWeek = (evData.RecurRule.ByDays == eDayOfWeekRecurrence.None)
+                                                  ? GetRecurrenceDay(app.StartTime)
+                                                  : evData.RecurRule.ByDays;
+
+            ProcessRecurrenceRange(app, recur, evData);
+
+            app.Recurrence = recur;
+
+            model.Appointments.Add(app);
+        }
+
+        #region GetRecurrenceDay
+
+        private eDayOfWeekRecurrence GetRecurrenceDay(DateTime dateTime)
+        {
+            switch (dateTime.DayOfWeek)
+            {
+                case DayOfWeek.Monday:
+                    return (eDayOfWeekRecurrence.Monday);
+
+                case DayOfWeek.Tuesday:
+                    return (eDayOfWeekRecurrence.Tuesday);
+
+                case DayOfWeek.Wednesday:
+                    return (eDayOfWeekRecurrence.Wednesday);
+
+                case DayOfWeek.Thursday:
+                    return (eDayOfWeekRecurrence.Thursday);
+
+                case DayOfWeek.Friday:
+                    return (eDayOfWeekRecurrence.Friday);
+
+                case DayOfWeek.Saturday:
+                    return (eDayOfWeekRecurrence.Saturday);
+
+                default:
+                    return (eDayOfWeekRecurrence.Sunday);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ProcessMonthlyRecurrence
+
+        #region ProcessMonthlyRecurrence
+
+        /// <summary>
+        /// Processes Monthly recurrences
+        /// </summary>
+        /// <param name="model"></param>
+        /// <param name="app"></param>
+        /// <param name="evData"></param>
+        private void ProcessMonthlyRecurrence(CalendarModel model, Appointment app, VEventData evData)
+        {
+            RRule rrule = evData.RecurRule;
+
+            if (rrule.ByDays == eDayOfWeekRecurrence.None)
+            {
+                if (rrule.ByMonthDay != null)
+                {
+                    foreach (int day in rrule.ByMonthDay)
+                        AddMonthlyByMonthDay(model, app, day, evData);
+                }
+                else
+                {
+                    AddMonthlyByMonthDay(model, app, app.StartTime.Day, evData);
+                }
+            }
+            else
+            {
+                for (int i = 0; i < rrule.ByDay.Length; i++)
+                {
+                    eDayOfWeekRecurrence eday = ((eDayOfWeekRecurrence)(1 << i));
+                    DayOfWeek dayOfWeek = GetRelativeDayOfWeek(eday);
+
+                    if ((rrule.ByDays & eday) != 0)
+                    {
+                        foreach (int byDay in rrule.ByDay[i])
+                            AddMonthlyByDay(model, app, dayOfWeek, byDay, evData);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region AddMonthlyByDay
+
+        #region AddMonthlyByDay
+
+        private void AddMonthlyByDay(CalendarModel model,
+            Appointment app, DayOfWeek dayOfWeek, int byDay, VEventData evData)
+        {
+            AppointmentRecurrence recur = new AppointmentRecurrence();
+
+            recur.RecurrenceType = eRecurrencePatternType.Monthly;
+
+            recur.Monthly.RepeatInterval = evData.RecurRule.Interval;
+            recur.Monthly.RelativeDayOfWeek = dayOfWeek;
+            recur.Monthly.RepeatOnRelativeDayInMonth = GetRelativeDay(byDay);
+
+            if (app.Recurrence != null)
+            {
+                app = app.Copy();
+
+                app.StartTime = evData.StartTime;
+                app.EndTime = evData.EndTime;
+
+                evData.UidApps.Add(app);
+            }
+
+            model.Appointments.Add(app);
+
+            DateTime oldStartTime = app.StartTime;
+
+            SetNewByDayAppStartTime(app, dayOfWeek, byDay, evData.RecurRule.BySetPos);
+
+            if (app.StartTime < oldStartTime)
+                recur.SkippedRecurrences.Add(app.StartTime);
+
+            ProcessRecurrenceRange(app, recur, evData);
+
+            app.Recurrence = recur;
+        }
+
+        #endregion
+
+        #region SetNewByDayAppStartTime
+
+        /// <summary>
+        /// SetNewByDayAppStartTime
+        /// </summary>
+        /// <param name="app"></param>
+        /// <param name="dayOfWeek"></param>
+        /// <param name="byDay"></param>
+        private void SetNewByDayAppStartTime(
+            Appointment app, DayOfWeek dayOfWeek, int byDay, int bySetPos)
+        {
+            DateTime date = app.StartTime.AddDays(-app.StartTime.Day + 1);
+
+            if (byDay >= 0)
+            {
+                while (date.DayOfWeek != dayOfWeek)
+                    date = date.AddDays(1);
+
+                if (byDay > 0)
+                    date = date.AddDays((byDay - 1) * 7);
+            }
+            else
+            {
+                date = date.AddMonths(1).AddDays(-1);
+
+                while (date.DayOfWeek != dayOfWeek)
+                    date = date.AddDays(-1);
+            }
+
+            if (bySetPos != 0)
+            {
+                if (bySetPos == -1)
+                {
+                    while (date.AddDays(7).Month == date.Month)
+                        date = date.AddDays(7);
+                }
+                else if (bySetPos > 1)
+                {
+                    date = date.AddDays(7 * (bySetPos - 1));
+                }
+            }
+
+            if (app.StartTime != date)
+                app.MoveTo(date);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region AddMonthlyByMonthDay
+
+        private void AddMonthlyByMonthDay(CalendarModel model,
+            Appointment app, int byMonthDay, VEventData evData)
+        {
+            AppointmentRecurrence recur = new AppointmentRecurrence();
+
+            recur.RecurrenceType = eRecurrencePatternType.Monthly;
+
+            recur.Monthly.RepeatOnRelativeDayInMonth = eRelativeDayInMonth.None;
+            recur.Monthly.RepeatOnDayOfMonth = byMonthDay;
+            recur.Monthly.RepeatInterval = evData.RecurRule.Interval;
+
+            if (app.Recurrence != null)
+            {
+                app = app.Copy();
+
+                evData.UidApps.Add(app);
+            }
+
+            model.Appointments.Add(app);
+
+            int day = DateTime.DaysInMonth(app.StartTime.Year, app.StartTime.Month);
+
+            if (day < byMonthDay)
+                byMonthDay = day;
+
+            DateTime startTime = new DateTime(app.StartTime.Year,
+                app.StartTime.Month, byMonthDay, app.StartTime.Hour, app.StartTime.Minute, 0);
+
+            if (startTime < app.StartTime)
+                recur.SkippedRecurrences.Add(startTime);
+
+            if (app.StartTime != startTime)
+                app.MoveTo(startTime);
+
+            ProcessRecurrenceRange(app, recur, evData);
+
+            app.Recurrence = recur;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ProcessYearlyRecurrence
+
+        #region ProcessYearlyRecurrence
+
+        /// <summary>
+        /// Processes Yearly recurrences
+        /// </summary>
+        /// <param name="model"></param>
+        /// <param name="app"></param>
+        /// <param name="evData"></param>
+        private void ProcessYearlyRecurrence(
+            CalendarModel model, Appointment app, VEventData evData)
+        {
+            RRule rrule = evData.RecurRule;
+
+            if (rrule.ByMonth == null)
+            {
+                rrule.ByMonth = new int[1];
+                rrule.ByMonth[0] = app.StartTime.Month;
+            }
+
+            foreach (int byMonth in rrule.ByMonth)
+            {
+                if (rrule.ByDays == eDayOfWeekRecurrence.None)
+                {
+                    if (rrule.ByMonthDay != null)
+                    {
+                        foreach (int day in rrule.ByMonthDay)
+                            AddYearlyByMonthDay(model, app, byMonth, day, evData);
+                    }
+                    else
+                    {
+                        AddYearlyByMonthDay(model, app, byMonth, app.StartTime.Day, evData);
+                    }
+                }
+                else
+                {
+                    for (int i = 0; i < rrule.ByDay.Length; i++)
+                    {
+                        eDayOfWeekRecurrence eday = ((eDayOfWeekRecurrence)(1 << i));
+                        DayOfWeek dayOfWeek = GetRelativeDayOfWeek(eday);
+
+                        if ((rrule.ByDays & eday) != 0)
+                        {
+                            foreach (int byDay in rrule.ByDay[i])
+                                AddYearlyByDay(model, app, byMonth, dayOfWeek, byDay, evData);
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region AddYearlyByDay
+
+        private void AddYearlyByDay(CalendarModel model, Appointment app,
+            int byMonth, DayOfWeek dayOfWeek, int byDay, VEventData evData)
+        {
+            AppointmentRecurrence recur = new AppointmentRecurrence();
+
+            recur.RecurrenceType = eRecurrencePatternType.Yearly;
+
+            recur.Yearly.RepeatOnMonth = byMonth;
+            recur.Yearly.RelativeDayOfWeek = dayOfWeek;
+            recur.Yearly.RepeatOnRelativeDayInMonth = GetRelativeDay(byDay);
+
+            if (app.Recurrence != null)
+            {
+                app = app.Copy();
+
+                evData.UidApps.Add(app);
+            }
+
+            model.Appointments.Add(app);
+
+            DateTime oldStartTime = app.StartTime;
+
+            SetNewByDayAppStartTime(app, dayOfWeek, byDay, evData.RecurRule.BySetPos);
+
+            if (app.StartTime < oldStartTime)
+                recur.SkippedRecurrences.Add(app.StartTime);
+
+            ProcessRecurrenceRange(app, recur, evData);
+
+            app.Recurrence = recur;
+        }
+
+        #endregion
+
+        #region AddYearlyByMonthDay
+
+        private void AddYearlyByMonthDay(CalendarModel model,
+            Appointment app, int byMonth, int byMonthDay, VEventData evData)
+        {
+            AppointmentRecurrence recur = new AppointmentRecurrence();
+
+            recur.RecurrenceType = eRecurrencePatternType.Yearly;
+
+            recur.Yearly.RepeatOnMonth = byMonth;
+            recur.Yearly.RepeatOnRelativeDayInMonth = eRelativeDayInMonth.None;
+            recur.Yearly.RepeatOnDayOfMonth = byMonthDay;
+
+            if (app.Recurrence != null)
+            {
+                app = app.Copy();
+
+                evData.UidApps.Add(app);
+            }
+
+            model.Appointments.Add(app);
+
+            int day = DateTime.DaysInMonth(app.StartTime.Year, byMonth);
+
+            if (day < byMonthDay)
+                byMonthDay = day;
+
+            DateTime startTime = new DateTime(app.StartTime.Year,
+                byMonth, byMonthDay, app.StartTime.Hour, app.StartTime.Minute, 0);
+
+            if (startTime < app.StartTime)
+                recur.SkippedRecurrences.Add(startTime);
+
+            if (app.StartTime != startTime)
+                app.MoveTo(startTime);
+
+            ProcessRecurrenceRange(app, recur, evData);
+
+            app.Recurrence = recur;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ProcessVEventReminder
+
+        /// <summary>
+        /// Processes event reminders
+        /// </summary>
+        /// <param name="evData"></param>
+        private void ProcessVEventReminder(VEventData evData)
+        {
+            if (evData.VAlarms != null)
+            {
+                foreach (VAlarm valarm in evData.VAlarms)
+                {
+                    foreach (Appointment app in evData.UidApps)
+                    {
+                        if ((valarm.Rel == Related.Start && valarm.Duration.TotalSeconds == 0) ||
+                            (valarm.Rel == Related.Date && valarm.Date.Add(valarm.Duration) == app.StartTime))
+                        {
+                            app.StartTimeAction = eStartTimeAction.StartTimeReachedEvent;
+                        }
+                        else
+                        {
+                            string s = String.IsNullOrEmpty(valarm.Description)
+                                           ? app.Description
+                                           : valarm.Description;
+
+                            DateTime date = app.StartTime;
+
+                            switch (valarm.Rel)
+                            {
+                                case Related.End:
+                                    date = app.EndTime;
+                                    break;
+
+                                case Related.Date:
+                                    date = valarm.Date;
+                                    break;
+                            }
+
+                            date = date.Add(valarm.Duration);
+
+                            app.Reminders.Add(new Reminder(s, date));
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region ProcessRecurrenceId
+
+        /// <summary>
+        /// Processes RecurrenceId events
+        /// </summary>
+        /// <param name="entry"></param>
+        /// <param name="app"></param>
+        /// <param name="evData"></param>
+        private void ProcessRecurrenceId(CalendarEntry entry, Appointment app, VEventData evData)
+        {
+            if (evData.UidApps != null)
+            {
+                Appointment uidApp = null;
+
+                foreach (Appointment uApp in evData.UidApps)
+                {
+                    if (uApp.Recurrence != null)
+                    {
+                        if (uidApp == null)
+                            uidApp = uApp;
+
+                        uApp.Recurrence.SkippedRecurrences.Add(evData.RecIdDate);
+                    }
+                }
+
+                if (uidApp != null)
+                {
+                    if (app.StartTime == DateTime.MinValue)
+                        app.StartTime = evData.RecIdDate;
+
+                    if (evData.Duration.TotalSeconds != 0)
+                        app.EndTime = app.StartTime.Add(evData.Duration);
+
+                    else if (app.EndTime == DateTime.MinValue)
+                        app.EndTime = app.StartTime.Add(uidApp.EndTime - uidApp.StartTime);
+
+                    if (app.StartTime > app.EndTime)
+                    {
+                        ReportError(entry, "DTSTART is greater than DTEND");
+                        app.EndTime = app.StartTime.Add(uidApp.EndTime - uidApp.StartTime);
+                    }
+
+                    if ((evData.AppPropSet & AppProp.Description) == 0)
+                        app.Description = uidApp.Description;
+
+                    if ((evData.AppPropSet & AppProp.Summary) == 0)
+                        app.Subject = uidApp.Subject;
+
+                    if ((evData.AppPropSet & AppProp.XDnbCategoryColor) == 0)
+                        app.CategoryColor = uidApp.CategoryColor;
+
+                    if ((evData.AppPropSet & AppProp.XDnbDisplayTemplate) == 0)
+                        app.DisplayTemplate = uidApp.DisplayTemplate;
+
+                    if ((evData.AppPropSet & AppProp.XDnbImageAlign) == 0)
+                        app.ImageAlign = uidApp.ImageAlign;
+
+                    if ((evData.AppPropSet & AppProp.XDnbImageKey) == 0)
+                        app.ImageKey = uidApp.ImageKey;
+
+                    if ((evData.AppPropSet & AppProp.XDnbLocked) == 0)
+                        app.Locked = uidApp.Locked;
+
+                    if ((evData.AppPropSet & AppProp.XDnbStartTimeAction) == 0)
+                        app.StartTimeAction = uidApp.StartTimeAction;
+
+                    if ((evData.AppPropSet & AppProp.XDnbTimeMarkedAs) == 0)
+                        app.TimeMarkedAs = uidApp.TimeMarkedAs;
+
+                    if ((evData.AppPropSet & AppProp.XDnbTooltip) == 0)
+                        app.Tooltip = uidApp.Tooltip;
+
+                    Model.Appointments.Add(app);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ProcessRecurrenceRange
+
+        /// <summary>
+        /// Processes Recurrence range values
+        /// </summary>
+        /// <param name="app"></param>
+        /// <param name="recur"></param>
+        /// <param name="evData"></param>
+        private void ProcessRecurrenceRange(
+            Appointment app, AppointmentRecurrence recur, VEventData evData)
+        {
+            recur.RecurrenceStartDate =
+                (evData.RecStartDate != DateTime.MinValue) ? evData.RecStartDate : app.StartTime;
+
+            if (evData.RecurRule.BySetPos != 0)
+            {
+                if (evData.RecurRule.BySetPos == -1)
+                    recur.Monthly.RepeatOnRelativeDayInMonth = eRelativeDayInMonth.Last;
+
+                else if (evData.RecurRule.BySetPos == 1)
+                    recur.Monthly.RepeatOnRelativeDayInMonth = eRelativeDayInMonth.First;
+
+                else if (evData.RecurRule.BySetPos == 2)
+                    recur.Monthly.RepeatOnRelativeDayInMonth = eRelativeDayInMonth.Second;
+
+                else if (evData.RecurRule.BySetPos == 3)
+                    recur.Monthly.RepeatOnRelativeDayInMonth = eRelativeDayInMonth.Third;
+
+                else if (evData.RecurRule.BySetPos == 4)
+                    recur.Monthly.RepeatOnRelativeDayInMonth = eRelativeDayInMonth.Fourth;
+            }
+
+            if (evData.RecurRule.Count > 0)
+            {
+                recur.RangeLimitType = eRecurrenceRangeLimitType.RangeNumberOfOccurrences;
+                recur.RangeNumberOfOccurrences = evData.RecurRule.Count - 1;
+            }
+
+            if (evData.RecurRule.Until != DateTime.MinValue)
+            {
+                recur.RangeLimitType = eRecurrenceRangeLimitType.RangeEndDate;
+                recur.RangeEndDate = evData.RecurRule.Until;
+            }
+
+            if (evData.ExDates != null)
+            {
+                foreach (DateTime date in evData.ExDates)
+                {
+                    if (date >= app.StartTime)
+                    {
+                        if (IsSkippableDate(app, date, evData) == true)
+                            recur.SkippedRecurrences.Add(date);
+                    }
+                }
+            }
+        }
+
+        #region IsSkippableDate
+
+        #region IsSkippableDate
+
+        /// <summary>
+        /// Determines if the given date is a valid
+        /// SkippedRecurrence date.
+        /// </summary>
+        /// <param name="app"></param>
+        /// <param name="date"></param>
+        /// <param name="evData"></param>
+        /// <returns></returns>
+        private bool IsSkippableDate(Appointment app, DateTime date, VEventData evData)
+        {
+            if (IsSkippableByMonth(app, date, evData) == false)
+                return (false);
+
+            if (IsSkippableByMonthDay(app, date, evData) == false)
+                return (false);
+
+            return (IsSkippableByDay(date, evData));
+        }
+
+        #endregion
+
+        #region IsSkippableByMonthDay
+
+        /// <summary>
+        /// Determines if the given date is a skippable
+        /// byMonthDate
+        /// </summary>
+        /// <param name="app"></param>
+        /// <param name="date"></param>
+        /// <param name="evData"></param>
+        /// <returns></returns>
+        private bool IsSkippableByMonthDay(Appointment app, DateTime date, VEventData evData)
+        {
+            if (evData.RecurRule.ByMonthDay != null)
+            {
+                if (date.Day != app.StartTime.Day)
+                    return (false);
+            }
+
+            return (true);
+        }
+
+        #endregion
+
+        #region IsSkippableByMonth
+
+        /// <summary>
+        /// Determines if the given date is a skippable ByMonth date
+        /// </summary>
+        /// <param name="app"></param>
+        /// <param name="date"></param>
+        /// <param name="evData"></param>
+        /// <returns></returns>
+        private bool IsSkippableByMonth(Appointment app, DateTime date, VEventData evData)
+        {
+            if (evData.RecurRule.ByMonth != null)
+            {
+                if (date.Month != app.StartTime.Month)
+                    return (false);
+            }
+
+            return (true);
+        }
+
+        #endregion
+
+        #region IsSkippableByDay
+
+        /// <summary>
+        /// Determines if the given date is a skippable ByDays date
+        /// </summary>
+        /// <param name="date"></param>
+        /// <param name="evData"></param>
+        /// <returns></returns>
+        private bool IsSkippableByDay(DateTime date, VEventData evData)
+        {
+            if (evData.RecurRule.ByDays != eDayOfWeekRecurrence.None)
+            {
+                string s = Enum.GetName(typeof(DayOfWeek), date.DayOfWeek);
+                eDayOfWeekRecurrence edow = (eDayOfWeekRecurrence)Enum.Parse(typeof(eDayOfWeekRecurrence), s);
+
+                return ((evData.RecurRule.ByDays & edow) == edow);
+            }
+
+            return (true);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region ProcessRDateRange
+
+        /// <summary>
+        /// ProcessRDateRange
+        /// </summary>
+        /// <param name="model"></param>
+        /// <param name="app"></param>
+        /// <param name="evData"></param>
+        private void ProcessRDateRange(
+            CalendarModel model, Appointment app, VEventData evData)
+        {
+            if (evData.RecurDate != null)
+            {
+                if (evData.RecurDate.DtRange != null)
+                {
+                    foreach (DateRange range in evData.RecurDate.DtRange)
+                    {
+                        Appointment appRange = app.Copy();
+
+                        appRange.StartTime = range.StartTime;
+                        appRange.EndTime = range.EndTime;
+
+                        model.Appointments.Add(appRange);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ProcessClass
+
+        /// <summary>
+        /// Processes event Class values
+        /// </summary>
+        /// <param name="entry"></param>
+        /// <param name="evData"></param>
+        /// <returns></returns>
+        private bool ProcessClass(CalendarEntry entry, VEventData evData)
+        {
+            evData.AppPropSet |= AppProp.Class;
+
+            if (string.IsNullOrEmpty(entry.Value))
+                return (false);
+
+            return (entry.Value.ToUpper().Equals("PRIVATE"));
+        }
+
+        #endregion
+
+        #region ProcessDate
+
+        #region ProcessDate
+
+        /// <summary>
+        /// Processes Attribute date values
+        /// </summary>
+        /// <param name="entry"></param>
+        /// <param name="isDateValue"></param>
+        /// <returns></returns>
+        private DateTime ProcessDate(CalendarEntry entry, ref bool isDateValue)
+        {
+            isDateValue = false;
+
+            if (entry.Attributes.Count > 0)
+            {
+                foreach (AttributeData attr in entry.Attributes)
+                {
+                    ParameterToken tkn = (ParameterToken)GetToken(_parameters, attr.Id);
+
+                    switch (tkn)
+                    {
+                        case ParameterToken.TzId:
+                            return (ProcessTzIdDateTime(attr.Value, entry, entry.Value));
+
+                        case ParameterToken.Value:
+                            switch ((ValueToken)GetToken(_values, attr.Value))
+                            {
+                                case ValueToken.Date:
+                                    isDateValue = true;
+
+                                    return (ProcessDateValue(entry, entry.Value));
+
+                                case ValueToken.DateTime:
+                                    return (ProcessDateTime(entry, entry.Value));
+
+                                default:
+                                    ReportError(entry,
+                                        "Unrecognized Date attribute Value (" + attr.Id + "=" + attr.Value + ")");
+
+                                    return (DateTime.MinValue);
+                            }
+                    }
+                }
+            }
+
+            if (entry.Value.Length > 8)
+                return (ProcessDateTime(entry, entry.Value));
+
+            isDateValue = true;
+
+            return (ProcessDateValue(entry, entry.Value));
+        }
+
+        #endregion
+
+        #region ProcessDateTime
+
+        /// <summary>
+        /// Processes attribute DateTime values
+        /// </summary>
+        /// <param name="entry"></param>
+        /// <param name="sdate"></param>
+        /// <returns></returns>
+        private DateTime ProcessDateTime(CalendarEntry entry, string sdate)
+        {
+            sdate = sdate.ToLower();
+
+            DateTime date;
+
+            if (sdate.EndsWith("z"))
+            {
+                if (DateTime.TryParseExact(sdate, "yyyyMMdd\\tHHmms\\z",
+                                           CultureInfo.InvariantCulture, DateTimeStyles.None, out date) == false)
+                {
+                    ReportError(entry, "Invalid DateTime value specified");
+                }
+                else
+                {
+                    date = date.ToLocalTime();
+                }
+            }
+            else
+            {
+                if (DateTime.TryParseExact(sdate, "yyyyMMdd\\tHHmms",
+                    CultureInfo.InvariantCulture, DateTimeStyles.None, out date) == false)
+                {
+                    ReportError(entry, "Invalid DateTime value specified");
+                }
+            }
+
+            return (date);
+        }
+
+        #endregion
+
+        #region ProcessDateValue
+
+        /// <summary>
+        /// Processes Value=Date entries
+        /// </summary>
+        /// <param name="entry"></param>
+        /// <param name="sDate"></param>
+        /// <returns></returns>
+        private DateTime ProcessDateValue(CalendarEntry entry, string sDate)
+        {
+            DateTime date;
+
+            if (DateTime.TryParseExact(sDate, "yyyyMMdd",
+                CultureInfo.InvariantCulture, DateTimeStyles.None, out date) == false)
+            {
+                ReportError(entry, "Invalid Date Value specified");
+            }
+
+            return (date);
+        }
+
+        #endregion
+
+        #region ProcessTzIdDateTime
+
+        #region ProcessTzIdDateTime
+
+        /// <summary>
+        /// Processes TxId attribute DateTime values
+        /// </summary>
+        /// <param name="tzId"></param>
+        /// <param name="entry"></param>
+        /// <param name="sdate"></param>
+        /// <returns></returns>
+        private DateTime ProcessTzIdDateTime(string tzId, CalendarEntry entry, string sdate)
+        {
+            sdate = sdate.ToLower();
+            
+            DateTime date = ProcessDateTime(entry, sdate);
+
+            if (sdate.EndsWith("z"))
+                return (date);
+
+            date = date.ToLocalTime();
+
+            TimeSpan ts = GetTzIdDelta(tzId, date);
+
+            return (date.Add(ts));
+        }
+
+        #endregion
+
+        #region GetTzIdDelta
+
+        /// <summary>
+        /// GetTzIdDelta
+        /// </summary>
+        /// <param name="tzId"></param>
+        /// <param name="date"></param>
+        /// <returns></returns>
+        private TimeSpan GetTzIdDelta(string tzId, DateTime date)
+        {
+            CalendarTimeZone zone = GetTimeZone(tzId);
+
+            if (zone != null && zone.Part != null)
+            {
+                TimeZonePart tzPart = null;
+                TimeSpan tzSpan = TimeSpan.MaxValue;
+
+                foreach (TimeZonePart part in zone.Part)
+                {
+                    if (part.RecurRule != null)
+                    {
+                        DateTime pdate = GetLastPartDate(part, date);
+
+                        TimeSpan span = date - pdate;
+
+                        if (span >= TimeSpan.Zero && span < tzSpan)
+                        {
+                            tzSpan = span;
+                            tzPart = part;
+                        }
+                    }
+                }
+
+                if (tzPart != null)
+                    return (new TimeSpan(0, -tzPart.OffsetTo, 0));
+            }
+
+            return (TimeSpan.Zero);
+        }
+
+        #endregion
+
+        #region GetLastPartDate
+
+        /// <summary>
+        /// GetLastPartDate
+        /// </summary>
+        /// <param name="part"></param>
+        /// <param name="date"></param>
+        /// <returns></returns>
+        private DateTime GetLastPartDate(TimeZonePart part, DateTime date)
+        {
+            DateTime pdate = part.StartDate;
+
+            if (part.Appc == null)
+            {
+                CalendarModel model = new CalendarModel();
+                Appointment app = new Appointment();
+
+                app.StartTime = part.StartDate.Date;
+                app.EndTime = app.StartTime;
+
+                VEventData evData = new VEventData();
+
+                evData.RecurRule = part.RecurRule;
+
+                ProcessEventEndEx(model, null, app, evData);
+
+                part.Appc = new AppointmentSubsetCollection(model, part.StartDate, date);
+            }
+
+            if (part.Appc.Count > 0)
+            {
+                foreach (Appointment app in part.Appc)
+                {
+                    if (app.StartTime > pdate && app.StartTime <= date)
+                        pdate = app.StartTime;
+                }
+            }
+
+            return (pdate);
+        }
+
+        #endregion
+
+        #region GetTimeZone
+
+        /// <summary>
+        /// GetTimeZone
+        /// </summary>
+        /// <param name="tzId"></param>
+        /// <returns></returns>
+        private CalendarTimeZone GetTimeZone(string tzId)
+        {
+            if (_CalendarTimeZone != null)
+            {
+                foreach (CalendarTimeZone zone in _CalendarTimeZone)
+                {
+                    if (zone.TzId.Equals(tzId) == true)
+                        return (zone);
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region ProcessDescription
+
+        /// <summary>
+        /// Processes event Description values
+        /// </summary>
+        /// <param name="entry"></param>
+        /// <param name="evData"></param>
+        /// <returns></returns>
+        private string ProcessDescription(CalendarEntry entry, VEventData evData)
+        {
+            evData.AppPropSet |= AppProp.Description;
+
+            return (entry.Value);
+        }
+
+        #endregion
+
+        #region ProcessDuration
+
+        /// <summary>
+        /// Processes event Duration values
+        /// </summary>
+        /// <param name="entry"></param>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        private TimeSpan ProcessDuration(CalendarEntry entry, string value)
+        {
+            const string s = "^(?<sign>[+-]+)*";
+            const string d = "P((?<days>\\d+)D)*";
+            const string t = "(T((?<hours>\\d+)H)*((?<minutes>\\d+)M)*((?<seconds>\\d+)S)*)*";
+            const string w = "((?<weeks>\\d+)W)*";
+
+            Regex p = new Regex(s + d + t + w);
+            Match ma = p.Match(value);
+
+            if (ma.Success == true)
+            {
+                int sign = ma.Groups["sign"].Value.Equals("-") ? -1 : 1;
+
+                int days = GetGroupIntValue(ma, "days", sign);
+                int hours = GetGroupIntValue(ma, "hours", sign);
+                int minutes = GetGroupIntValue(ma, "minutes", sign);
+                int seconds = GetGroupIntValue(ma, "seconds", sign);
+                int weeks = GetGroupIntValue(ma, "weeks", sign);
+
+                return (new TimeSpan(weeks * 7 + days, hours, minutes, seconds));
+            }
+
+            ReportError(entry, "Invalid DURATION specified");
+
+            return (TimeSpan.Zero);
+        }
+
+        #region GetGroupIntValue
+
+        /// <summary>
+        /// Gets the int value from the given Regex Match
+        /// </summary>
+        /// <param name="ma"></param>
+        /// <param name="group"></param>
+        /// <param name="sign"></param>
+        /// <returns></returns>
+        private int GetGroupIntValue(Match ma, string group, int sign)
+        {
+            string s = ma.Groups[group].Value;
+
+            return (string.IsNullOrEmpty(s) ? 0 : int.Parse(s) * sign);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ProcessExDate
+
+        /// <summary>
+        /// Processes event ExDate values
+        /// </summary>
+        /// <param name="entry"></param>
+        /// <param name="evData"></param>
+        private void ProcessExDate(CalendarEntry entry, VEventData evData)
+        {
+            List<DateTime> exDates = null;
+
+            if (entry.Attributes.Count > 0)
+            {
+                foreach (AttributeData attr in entry.Attributes)
+                {
+                    ParameterToken tkn = (ParameterToken) GetToken(_parameters, attr.Id);
+
+                    switch (tkn)
+                    {
+                        case ParameterToken.TzId:
+                            if (exDates != null)
+                                ReportError(entry, "Multiple EXDATE parameter types");
+
+                            exDates = ProcessTzIdExDateTimeValues(attr.Value, entry, entry.Value);
+                            break;
+
+                        case ParameterToken.Value:
+                            if (exDates != null)
+                                ReportError(entry, "Multiple EXDATE parameter types");
+
+                            switch ((ValueToken)GetToken(_values, attr.Value))
+                            {
+                                case ValueToken.Date:
+                                    exDates = ProcessExDateValues(entry);
+                                    break;
+
+                                case ValueToken.DateTime:
+                                    exDates = ProcessExDateTimeValues(entry, entry.Value);
+                                    break;
+
+                                default:
+                                    ReportError(entry, "Unrecognized ExDate attribute Value (" +
+                                        attr.Id + "=" + attr.Value + ")");
+
+                                    break;
+                            } 
+                            break;
+                    }
+                }
+            }
+
+            if (exDates == null)
+                exDates = ProcessExDateTimeValues(entry, entry.Value);
+
+            UnionExDates(evData, exDates);
+        }
+
+        #region ProcessExDateValues
+
+        /// <summary>
+        /// Processes ExDate Value=Date values
+        /// </summary>
+        /// <param name="entry"></param>
+        /// <returns></returns>
+        private List<DateTime> ProcessExDateValues(CalendarEntry entry)
+        {
+            string[] dates = entry.Value.Split(',');
+
+            if (dates.Length > 0)
+            {
+                List<DateTime> exDates = new List<DateTime>(dates.Length);
+
+                for (int i = 0; i < dates.Length; i++)
+                    exDates.Add(ProcessDateValue(entry, dates[i]));
+
+                return (exDates);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region ProcessExDateTimeValues
+
+        /// <summary>
+        /// Processes ExDate Value=DateTime values
+        /// </summary>
+        /// <param name="entry"></param>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        private List<DateTime> ProcessExDateTimeValues(CalendarEntry entry, string value)
+        {
+            string[] dates = value.Split(',');
+
+            if (dates.Length > 0)
+            {
+                List<DateTime> exDates = new List<DateTime>(dates.Length);
+
+                for (int i = 0; i < dates.Length; i++)
+                    exDates.Add(ProcessDateTime(entry, dates[i]));
+
+                return (exDates);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region ProcessTzIdExDateTimeValues
+
+        /// <summary>
+        /// Processes ExDate Value=DateTime values
+        /// </summary>
+        /// <param name="tzId"></param>
+        /// <param name="entry"></param>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        private List<DateTime> ProcessTzIdExDateTimeValues(string tzId, CalendarEntry entry, string value)
+        {
+            string[] dates = value.Split(',');
+
+            if (dates.Length > 0)
+            {
+                List<DateTime> exDates = new List<DateTime>(dates.Length);
+
+                for (int i = 0; i < dates.Length; i++)
+                    exDates.Add(ProcessTzIdDateTime(tzId, entry, dates[i]));
+
+                return (exDates);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region UnionExDates
+
+        /// <summary>
+        /// Combines the main evData exDates list with a secondary
+        /// accumulated exDates list
+        /// </summary>
+        /// <param name="evData"></param>
+        /// <param name="exDates"></param>
+        private void UnionExDates(VEventData evData, List<DateTime> exDates)
+        {
+            if (evData.ExDates == null)
+            {
+                evData.ExDates = exDates;
+            }
+            else if (exDates != null)
+            {
+                foreach (DateTime date in exDates)
+                {
+                    if (evData.ExDates.Contains(date) == false)
+                        evData.ExDates.Add(date);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ProcessRDate
+
+        #region ProcessRDate
+
+        /// <summary>
+        /// Processes RDate attributes and values
+        /// </summary>
+        /// <param name="entry"></param>
+        /// <param name="rdateOld"></param>
+        /// <returns></returns>
+        private RDate ProcessRDate(CalendarEntry entry, RDate rdateOld)
+        {
+            RDate rdateNew = null;
+
+            if (entry.Attributes.Count > 0)
+            {
+                foreach (AttributeData attr in entry.Attributes)
+                {
+                    ParameterToken tkn = (ParameterToken)GetToken(_parameters, attr.Id);
+
+                    switch (tkn)
+                    {
+                        case ParameterToken.TzId:
+                            if (rdateNew != null)
+                                ReportError(entry, "Multiple RDATE parameter types");
+
+                            rdateNew = ProcessTzIdRDateTimeValues(attr.Value, entry, entry.Value);
+                            break;
+
+                        case ParameterToken.Value:
+                            if (rdateNew != null)
+                                ReportError(entry, "Multiple RDATE parameter types");
+
+                            switch ((ValueToken)GetToken(_values, attr.Value))
+                            {
+                                case ValueToken.Date:
+                                    rdateNew = ProcessRDateValues(entry);
+                                    break;
+
+                                case ValueToken.DateTime:
+                                    rdateNew = ProcessRDateTimeValues(entry, entry.Value);
+                                    break;
+
+                                case ValueToken.Period:
+                                    rdateNew = ProcessRDatePeriod(entry);
+                                    break;
+
+                                default:
+                                    ReportError(entry, "Unrecognized RDate attribute Value (" +
+                                        attr.Id + "=" + attr.Value + ")");
+
+                                    break;
+                            }
+                            break;
+                    }
+                }
+            }
+
+            if (rdateNew == null)
+                rdateNew = ProcessRDateTimeValues(entry, entry.Value);
+
+            return (UnionRDates(rdateOld, rdateNew));
+        }
+
+        #endregion
+
+        #region ProcessRDateValues
+
+        /// <summary>
+        /// Processes RDate Value=Date values
+        /// </summary>
+        /// <param name="entry"></param>
+        /// <returns></returns>
+        private RDate ProcessRDateValues(CalendarEntry entry)
+        {
+            string[] dates = entry.Value.Split(',');
+
+            if (dates.Length > 0)
+            {
+                RDate rdate = new RDate();
+
+                rdate.DtRange = new DateRange[dates.Length];
+
+                for (int i = 0; i < dates.Length; i++)
+                    rdate.DtRange[i].StartTime = ProcessDateValue(entry, dates[i]);
+
+                return (rdate);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region ProcessRDateTimeValues
+
+        /// <summary>
+        /// Processes RDate Value=DateTime values
+        /// </summary>
+        /// <param name="entry"></param>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        private RDate ProcessRDateTimeValues(CalendarEntry entry, string value)
+        {
+            string[] dates = value.Split(',');
+
+            if (dates.Length > 0)
+            {
+                RDate rdate = new RDate();
+
+                rdate.DtRange = new DateRange[dates.Length];
+
+                for (int i = 0; i < dates.Length; i++)
+                    rdate.DtRange[i].StartTime = ProcessDateTime(entry, dates[i]);
+
+                return (rdate);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region ProcessTzIdRDateTimeValues
+
+        /// <summary>
+        /// Processes RDate Value=DateTime values
+        /// </summary>
+        /// <param name="tzId"></param>
+        /// <param name="entry"></param>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        private RDate ProcessTzIdRDateTimeValues(string tzId, CalendarEntry entry, string value)
+        {
+            string[] dates = value.Split(',');
+
+            if (dates.Length > 0)
+            {
+                RDate rdate = new RDate();
+
+                rdate.DtRange = new DateRange[dates.Length];
+
+                for (int i = 0; i < dates.Length; i++)
+                    rdate.DtRange[i].StartTime = ProcessTzIdDateTime(tzId, entry, dates[i]);
+
+                return (rdate);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region ProcessRDatePeriod
+
+        /// <summary>
+        /// Processes RDate Value=Period values
+        /// </summary>
+        /// <param name="entry"></param>
+        /// <returns></returns>
+        private RDate ProcessRDatePeriod(CalendarEntry entry)
+        {
+            string[] dates = entry.Value.Split(',');
+
+            if (dates.Length > 0)
+            {
+                RDate rdate = new RDate();
+
+                rdate.DtRange = new DateRange[dates.Length];
+
+                for (int i = 0; i < dates.Length; i++)
+                {
+                    string[] parts = dates[i].Split('/');
+
+                    if (parts.Length != 2)
+                    {
+                        ReportError(entry, "RDATE PERIOD not formed correctly");
+                        break;
+                    }
+
+                    rdate.DtRange[i] = new DateRange();
+                    rdate.DtRange[i].StartTime = ProcessDateTime(entry, parts[0]);
+
+                    parts[1] = parts[1].TrimStart(' ');
+
+                    if (parts[1].StartsWith("P") == true)
+                    {
+                        TimeSpan duration = ProcessDuration(entry, parts[1]);
+
+                        rdate.DtRange[i].EndTime =
+                            rdate.DtRange[i].StartTime.Add(duration);
+                    }
+                    else
+                    {
+                        rdate.DtRange[i].EndTime = ProcessDateTime(entry, parts[1]);
+                    }
+                }
+
+                return (rdate);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region UnionRDates
+
+        /// <summary>
+        /// Combines RDate values
+        /// </summary>
+        /// <param name="rdateOld"></param>
+        /// <param name="rdateNew"></param>
+        /// <returns></returns>
+        private RDate UnionRDates(RDate rdateOld, RDate rdateNew)
+        {
+            if (rdateNew != null)
+            {
+                if (rdateOld != null)
+                {
+                    DateRange[] range = new
+                        DateRange[rdateOld.DtRange.Length + rdateNew.DtRange.Length];
+
+                    Array.Copy(rdateOld.DtRange, range, rdateOld.DtRange.Length);
+                    Array.Copy(rdateNew.DtRange, 0, range, rdateOld.DtRange.Length, rdateNew.DtRange.Length);
+
+                    rdateNew.DtRange = range;
+                }
+
+                return (rdateNew);
+            }
+
+            return (rdateOld);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ProcessRecurrenceId
+
+        /// <summary>
+        /// Processes RecurrenceId entries
+        /// </summary>
+        /// <param name="entry"></param>
+        /// <returns></returns>
+        private DateTime ProcessRecurrenceId(CalendarEntry entry)
+        {
+            bool isDateValue = true;
+
+            return (ProcessDate(entry, ref isDateValue));
+        }
+
+        #endregion
+
+        #region ProcessRRule
+
+        #region ProcessRRule
+
+        /// <summary>
+        /// Processes RRule entries
+        /// </summary>
+        /// <param name="entry"></param>
+        /// <returns></returns>
+        private RRule ProcessRRule(CalendarEntry entry)
+        {
+            RRule rrule = new RRule();
+            List<AttributeData> attributes = new List<AttributeData>();
+
+            string s = ";" + entry.Value;
+
+            ParseAttributeData(attributes, ref s);
+
+            foreach (AttributeData attr in attributes)
+            {
+                ValueToken tkn = (ValueToken)GetToken(_values, attr.Id);
+
+                switch (tkn)
+                {
+                    case ValueToken.ByDay:
+                        ProcessByDay(entry, rrule, attr.Value);
+                        break;
+
+                    case ValueToken.ByMonth:
+                        rrule.ByMonth = ProcessByIntValues(entry, attr.Value, 1, 12, tkn);
+                        break;
+
+                    case ValueToken.ByMonthDay:
+                        rrule.ByMonthDay = ProcessByIntValues(entry, attr.Value, 1, 31, tkn);
+                        break;
+
+                    case ValueToken.Count:
+                        ProcessCount(entry, rrule, attr);
+                        break;
+
+                    case ValueToken.Freq:
+                        ProcessFreq(entry, rrule, attr);
+                        break;
+
+                    case ValueToken.Interval:
+                        ProcessInterval(entry, rrule, attr);
+                        break;
+
+                    case ValueToken.Until:
+                        ProcessUntil(entry, rrule, attr);
+                        break;
+
+                    case ValueToken.BySetPos:
+                        ProcessBySetPos(entry, rrule, attr);
+                        break;
+
+                    case ValueToken.BySecond:
+                    case ValueToken.ByMinute:
+                    case ValueToken.ByHour:
+                    case ValueToken.ByYearDay:
+                    case ValueToken.ByWeekNo:
+                    case ValueToken.WkSt:
+                        break;
+
+                    default:
+                        ReportError(entry, "Unrecognized RRULE Value - " + attr.Id);
+                        break;
+                }
+            }
+
+            return (rrule);
+        }
+
+        #endregion
+
+        #region ProcessByDay
+
+        /// <summary>
+        /// Processes ByDay= attribute entries
+        /// </summary>
+        /// <param name="entry"></param>
+        /// <param name="rrule"></param>
+        /// <param name="value"></param>
+        private void ProcessByDay(CalendarEntry entry, RRule rrule, string value)
+        {
+            rrule.ByDays = eDayOfWeekRecurrence.None;
+
+            Regex p = new Regex("(?<dayNum>[+-]{0,1}\\d+)*(?<weekDay>\\w+)");
+            MatchCollection mc = p.Matches(value);
+
+            if (mc.Count > 0)
+            {
+                rrule.ByDay = new List<int>[7];
+
+                foreach (Match ma in mc)
+                {
+                    int dayOfWeek;
+                    eDayOfWeekRecurrence weekDay = ProcessWeekDay(entry, ma.Groups["weekDay"].Value, out dayOfWeek);
+
+                    rrule.ByDays |= weekDay;
+
+                    string s = ma.Groups["dayNum"].Value;
+
+                    int n = 0;
+
+                    if (String.IsNullOrEmpty(s) == false)
+                    {
+                        n = int.Parse(s);
+
+                        if (Math.Abs(n) > 53)
+                        {
+                            ReportError(entry,
+                                String.Format("BYDAY value ({0}) is not in the range +/- 1 to 53", n));
+
+                            n = 0;
+                        }
+                    }
+
+                    if (rrule.ByDay[dayOfWeek] == null)
+                        rrule.ByDay[dayOfWeek] = new List<int>();
+
+                    rrule.ByDay[dayOfWeek].Add(n);
+                }
+            }
+        }
+
+        #region ProcessWeekDay
+
+        /// <summary>
+        /// Processes individual ByDay.WeekDay entries
+        /// </summary>
+        /// <param name="entry"></param>
+        /// <param name="s"></param>
+        /// <param name="dayOfWeek"></param>
+        /// <returns></returns>
+        private eDayOfWeekRecurrence ProcessWeekDay(
+            CalendarEntry entry, string s, out int dayOfWeek)
+        {
+            ValueToken tkn = (ValueToken)GetToken(_values, s);
+
+            switch (tkn)
+            {
+                case ValueToken.Mo:
+                    dayOfWeek = 0;
+                    return (eDayOfWeekRecurrence.Monday);
+
+                case ValueToken.Tu:
+                    dayOfWeek = 1;
+                    return (eDayOfWeekRecurrence.Tuesday);
+
+                case ValueToken.We:
+                    dayOfWeek = 2;
+                    return (eDayOfWeekRecurrence.Wednesday);
+
+                case ValueToken.Th:
+                    dayOfWeek = 3;
+                    return (eDayOfWeekRecurrence.Thursday);
+
+                case ValueToken.Fr:
+                    dayOfWeek = 4;
+                    return (eDayOfWeekRecurrence.Friday);
+
+                case ValueToken.Sa:
+                    dayOfWeek = 5;
+                    return (eDayOfWeekRecurrence.Saturday);
+
+                case ValueToken.Su:
+                    dayOfWeek = 6;
+                    return (eDayOfWeekRecurrence.Sunday);
+
+                default:
+                    dayOfWeek = 0;
+                    ReportError(entry, "Unrecognized WeekDay - " + s);
+                    return (eDayOfWeekRecurrence.None);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ProcessByIntValues
+
+        /// <summary>
+        /// Processes ByMonth= and ByMonthDay= attribute entries
+        /// </summary>
+        /// <param name="entry"></param>
+        /// <param name="value"></param>
+        /// <param name="minValue"></param>
+        /// <param name="maxValue"></param>
+        /// <param name="tkn"></param>
+        /// <returns></returns>
+        private int[] ProcessByIntValues(CalendarEntry entry,
+            string value, int minValue, int maxValue, ValueToken tkn)
+        {
+            string[] byValues = value.Split(',');
+
+            if (byValues.Length > 0)
+            {
+                int[] byIntValues = new int[byValues.Length];
+
+                for (int i = 0; i < byValues.Length; i++)
+                {
+                    int n;
+
+                    if (int.TryParse(byValues[i], out n) == false)
+                    {
+                        ReportError(entry, String.Format("\"{0}\" is not a valid Integer value", byValues[i]));
+
+                        n = minValue;
+                    }
+                    else
+                    {
+                        int absn = Math.Abs(n);
+
+                        if (absn < minValue || absn > maxValue)
+                        {
+                            ReportError(entry, String.Format(
+                                "{0} value ({1}) is not in the range +/- {2} to {3}",
+                                n, _values[(int) tkn].Text.ToUpper(), minValue, maxValue));
+
+                            break;
+                        }
+                    }
+
+                    byIntValues[i] = n;
+                }
+
+                return (byIntValues);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region ProcessBySetPos
+
+        private void ProcessBySetPos(CalendarEntry entry, RRule rrule, AttributeData attr)
+        {
+            int n;
+
+            if (int.TryParse(attr.Value, out n) == false)
+            {
+                n = 1;
+                ReportError(entry, String.Format("\"{0}\" is not a valid INTERVAL value", attr.Value));
+            }
+
+            rrule.BySetPos = n;
+        }
+
+        #endregion
+
+        #region ProcessCount
+
+        /// <summary>
+        /// Processes RRule Count attribute entries
+        /// </summary>
+        /// <param name="entry"></param>
+        /// <param name="rrule"></param>
+        /// <param name="attr"></param>
+        private void ProcessCount(CalendarEntry entry, RRule rrule, AttributeData attr)
+        {
+            int n;
+
+            if (int.TryParse(attr.Value, out n) == false)
+            {
+                n = 1;
+                ReportError(entry, String.Format("\"{0}\" is not a valid COUNT value", attr.Value));
+            }
+
+            rrule.Count = n;
+        }
+
+        #endregion
+
+        #region ProcessFreq
+
+        /// <summary>
+        /// Processes Freq= attribute entries
+        /// </summary>
+        /// <param name="entry"></param>
+        /// <param name="rrule"></param>
+        /// <param name="attr"></param>
+        private void ProcessFreq(CalendarEntry entry, RRule rrule, AttributeData attr)
+        {
+            ValueToken tkn = (ValueToken)GetToken(_values, attr.Value);
+
+            switch (tkn)
+            {
+                case ValueToken.Secondly:
+                    rrule.Freq = Frequency.Secondly;
+                    break;
+
+                case ValueToken.Minutely:
+                    rrule.Freq = Frequency.Minutely;
+                    break;
+
+                case ValueToken.Hourly:
+                    rrule.Freq = Frequency.Hourly;
+                    break;
+
+                case ValueToken.Daily:
+                    rrule.Freq = Frequency.Daily;
+                    break;
+
+                case ValueToken.Weekly:
+                    rrule.Freq = Frequency.Weekly;
+                    break;
+
+                case ValueToken.Monthly:
+                    rrule.Freq = Frequency.Monthly;
+                    break;
+
+                case ValueToken.Yearly:
+                    rrule.Freq = Frequency.Yearly;
+                    break;
+
+                default:
+                    ReportError(entry, "Invalid FREQ value");
+                    rrule.Freq = Frequency.Daily;
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region ProcessInterval
+
+        /// <summary>
+        /// Processes Interval= attribute entries
+        /// </summary>
+        /// <param name="entry"></param>
+        /// <param name="rrule"></param>
+        /// <param name="attr"></param>
+        private void ProcessInterval(CalendarEntry entry, RRule rrule, AttributeData attr)
+        {
+            int n;
+
+            if (int.TryParse(attr.Value, out n) == false)
+            {
+                n = 1;
+                ReportError(entry, String.Format("\"{0}\" is not a valid INTERVAL value", attr.Value));
+            }
+
+            rrule.Interval = n;
+        }
+
+        #endregion
+
+        #region ProcessUntil
+
+        /// <summary>
+        /// Processes Until= attribute entries
+        /// </summary>
+        /// <param name="entry"></param>
+        /// <param name="rrule"></param>
+        /// <param name="attr"></param>
+        private void ProcessUntil(CalendarEntry entry, RRule rrule, AttributeData attr)
+        {
+            rrule.Until = (attr.Value.Length > 8)
+                              ? ProcessDateTime(entry, attr.Value)
+                              : ProcessDateValue(entry, attr.Value);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ProcessSummary
+
+        /// <summary>
+        /// Processes Summary entries
+        /// </summary>
+        /// <param name="entry"></param>
+        /// <param name="evData"></param>
+        /// <returns></returns>
+        private string ProcessSummary(CalendarEntry entry, VEventData evData)
+        {
+            evData.AppPropSet |= AppProp.Summary;
+
+            return (entry.Value);
+        }
+
+        #endregion
+
+        #region ProcessUid
+
+        /// <summary>
+        /// Processes UID entries
+        /// </summary>
+        /// <param name="entry"></param>
+        /// <param name="app"></param>
+        /// <returns></returns>
+        private List<Appointment> ProcessUid(CalendarEntry entry, Appointment app)
+        {
+            List<Appointment> uidApp;
+
+            if (_Uid.TryGetValue(entry.Value, out uidApp) == false)
+            {
+                uidApp = new List<Appointment>();
+                uidApp.Add(app);
+
+                _Uid.Add(entry.Value, uidApp);
+            }
+
+            return (uidApp);
+        }
+
+        #endregion
+
+        #region ProcessVAlarm
+
+        /// <summary>
+        /// Processes VAlarm component entries
+        /// </summary>
+        /// <param name="evData"></param>
+        private void ProcessVAlarm(VEventData evData)
+        {
+            VAlarm valarm = new VAlarm();
+
+            CalendarEntry entry = GetNextEntry();
+
+            while (entry != null)
+            {
+                PropertyToken tkn = (PropertyToken)GetToken(_properties, entry.Id);
+
+                switch (tkn)
+                {
+                    case PropertyToken.Description:
+                        valarm.Description = entry.Value;
+                        break;
+
+                    case PropertyToken.End:
+                        if ((ComponentToken)GetToken(_components, entry.Value) != ComponentToken.VAlarm)
+                            ReportError(entry, "Expected \"END:VALARM\"");
+
+                        if (evData.VAlarms == null)
+                            evData.VAlarms = new List<VAlarm>();
+
+                        evData.VAlarms.Add(valarm);
+                        return;
+
+                    case PropertyToken.Trigger:
+                        ProcessTrigger(entry, valarm);
+                        break;
+                }
+
+                entry = GetNextEntry();
+            }
+
+            ReportError(entry, "Expected \"END:VALARM\"");
+        }
+
+        #region ProcessTrigger
+
+        /// <summary>
+        /// Processes VAlarm Trigger properties
+        /// </summary>
+        /// <param name="entry"></param>
+        /// <param name="valarm"></param>
+        private void ProcessTrigger(CalendarEntry entry, VAlarm valarm)
+        {
+            if (entry.Attributes.Count > 0)
+            {
+                foreach (AttributeData attr in entry.Attributes)
+                {
+                    ParameterToken tkn = (ParameterToken)GetToken(_parameters, attr.Id);
+
+                    switch (tkn)
+                    {
+                        case ParameterToken.Related:
+                            valarm.Rel = ProcessRelated(entry, attr.Value);
+                            break;
+
+                        case ParameterToken.Value:
+                            switch ((ValueToken)GetToken(_values, attr.Value))
+                            {
+                                case ValueToken.Date:
+                                    valarm.Rel = Related.Date;
+                                    valarm.Date = ProcessDateValue(entry, entry.Value);
+                                    break;
+
+                                case ValueToken.DateTime:
+                                    valarm.Rel = Related.Date;
+                                    valarm.Date = ProcessDateTime(entry, entry.Value);
+                                    break;
+
+                                case ValueToken.Duration:
+                                    valarm.Duration = ProcessDuration(entry, entry.Value);
+                                    break;
+                            }
+                            break;
+                    }
+                }
+            }
+            else
+            {
+                valarm.Duration = ProcessDuration(entry, entry.Value);
+            }
+        }
+
+        #region ProcessRelated
+
+        private Related ProcessRelated(CalendarEntry entry, string value)
+        {
+            ValueToken rtkn = (ValueToken)GetToken(_values, value);
+
+            switch (rtkn)
+            {
+                case ValueToken.Start:
+                    return (Related.Start);
+
+                case ValueToken.End:
+                    return (Related.End);
+
+                default:
+                    ReportError(entry, "Invalid RELATED value: " + value.ToUpper());
+                    return (Related.Date);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region Process DNB specific
+
+        #region ProcessXDnbCategoryColor
+
+        /// <summary>
+        /// Processes DNB CategoryColor entries
+        /// </summary>
+        /// <param name="entry"></param>
+        /// <param name="evData"></param>
+        /// <returns></returns>
+        private string ProcessXDnbCategoryColor(CalendarEntry entry, VEventData evData)
+        {
+            evData.AppPropSet |= AppProp.XDnbCategoryColor;
+
+            return(entry.Value);
+        }
+
+        #endregion
+
+        #region ProcessXDnbDisplayTemplate
+
+        /// <summary>
+        /// Processes DNB DisplayTemplate entries
+        /// </summary>
+        /// <param name="entry"></param>
+        /// <param name="evData"></param>
+        /// <returns></returns>
+        private string ProcessXDnbDisplayTemplate(CalendarEntry entry, VEventData evData)
+        {
+            evData.AppPropSet |= AppProp.XDnbDisplayTemplate;
+
+            return (entry.Value);
+        }
+
+        #endregion
+
+        #region ProcessXDnbImageAlign
+
+        /// <summary>
+        /// Processes DNB specific ImageAlign entries
+        /// </summary>
+        /// <param name="entry"></param>
+        /// <param name="evData"></param>
+        /// <returns></returns>
+        private eImageContentAlignment ProcessXDnbImageAlign(CalendarEntry entry, VEventData evData)
+        {
+            evData.AppPropSet |= AppProp.XDnbImageAlign;
+
+            return ((eImageContentAlignment)
+                GetEnumValue(typeof(eImageContentAlignment), entry.Value));
+        }
+
+        #endregion
+
+        #region ProcessXDnbImageKey
+
+        /// <summary>
+        /// Processes DNB ImageKey entries
+        /// </summary>
+        /// <param name="entry"></param>
+        /// <param name="evData"></param>
+        /// <returns></returns>
+        private string ProcessXDnbImageKey(CalendarEntry entry, VEventData evData)
+        {
+            evData.AppPropSet |= AppProp.XDnbImageKey;
+
+            return (entry.Value);
+        }
+
+        #endregion
+
+        #region ProcessXDnbLocked
+
+        /// <summary>
+        /// Processes DNB Locked entries
+        /// </summary>
+        /// <param name="entry"></param>
+        /// <param name="evData"></param>
+        /// <returns></returns>
+        private bool ProcessXDnbLocked(CalendarEntry entry, VEventData evData)
+        {
+            evData.AppPropSet |= AppProp.XDnbLocked;
+
+            return (entry.Value.ToLower().Equals("true"));
+        }
+
+        #endregion
+
+        #region ProcessXDnbRecStartDate
+
+        /// <summary>
+        /// Processes DNB RecStartDate entries
+        /// </summary>
+        /// <param name="entry"></param>
+        /// <returns></returns>
+        private DateTime ProcessXDnbRecStartDate(CalendarEntry entry)
+        {
+            return (ProcessDateTime(entry, entry.Value));
+        }
+
+        #endregion
+
+        #region ProcessXDnbStartTimeAction
+
+        /// <summary>
+        /// Processes DNB StartTimeAction entries
+        /// </summary>
+        /// <param name="entry"></param>
+        /// <param name="evData"></param>
+        /// <returns></returns>
+        private eStartTimeAction ProcessXDnbStartTimeAction(CalendarEntry entry, VEventData evData)
+        {
+            evData.AppPropSet |= AppProp.XDnbStartTimeAction;
+
+            return ((eStartTimeAction)
+                GetEnumValue(typeof(eStartTimeAction), entry.Value));
+        }
+
+        #endregion
+
+        #region ProcessXDnbTimeMarkedAs
+
+        /// <summary>
+        /// Processes DNB TimeMarkedAs entries
+        /// </summary>
+        /// <param name="entry"></param>
+        /// <param name="evData"></param>
+        /// <returns></returns>
+        private string ProcessXDnbTimeMarkedAs(CalendarEntry entry, VEventData evData)
+        {
+            evData.AppPropSet |= AppProp.XDnbTimeMarkedAs;
+
+            return (entry.Value);
+        }
+
+        #endregion
+
+        #region ProcessXDnbTooltip
+
+        /// <summary>
+        /// Processes DNB ToolTip entries
+        /// </summary>
+        /// <param name="entry"></param>
+        /// <param name="evData"></param>
+        /// <returns></returns>
+        private string ProcessXDnbTooltip(CalendarEntry entry, VEventData evData)
+        {
+            evData.AppPropSet |= AppProp.XDnbTooltip;
+
+            return (entry.Value);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region ProcessVTimezone
+
+        #region ProcessVTimezone
+
+        /// <summary>
+        /// Processes VTimeZone components
+        /// </summary>
+        private void ProcessVTimezone()
+        {
+            CalendarTimeZone zone = new CalendarTimeZone();
+
+            CalendarEntry entry = GetNextEntry();
+
+            while (entry != null)
+            {
+                PropertyToken tkn = (PropertyToken)GetToken(_properties, entry.Id);
+
+                switch (tkn)
+                {
+                     case PropertyToken.Begin:
+                        ComponentToken ctkn = (ComponentToken) GetToken(_components, entry.Value);
+
+                        switch (ctkn)
+                        {
+                            case ComponentToken.Daylight:
+                            case ComponentToken.Standard:
+                                ProcessZonePart(zone, ctkn);
+                                break;
+                        }
+                        break;
+                
+                    case PropertyToken.End:
+                        ProcessVTimezoneEnd(entry, zone);
+                        return;
+
+                    case PropertyToken.TzId:
+                        zone.TzId = ProcessTzId(entry);
+                        break;
+                }
+
+                entry = GetNextEntry();
+            }
+
+            ReportError(entry, "Expected \"END:VTIMEZONE\"");
+        }
+
+        #endregion
+
+        #region ProcessTzId
+
+        /// <summary>
+        /// Processes TxId values
+        /// </summary>
+        /// <param name="entry"></param>
+        /// <returns></returns>
+        private string ProcessTzId(CalendarEntry entry)
+        {
+            return (entry.Value);
+        }
+
+        #endregion
+
+        #region ProcessTzOffset
+
+        /// <summary>
+        /// Processes TzOffset values
+        /// </summary>
+        /// <param name="entry"></param>
+        /// <returns></returns>
+        private int ProcessTzOffset(CalendarEntry entry)
+        {
+            const string s = "^(?<sign>[+-]+)*";
+            const string t = "((?<hours>\\d{2})(?<minutes>\\d{2})*)*";
+
+            Regex p = new Regex(s + t);
+            Match ma = p.Match(entry.Value);
+
+            if (ma.Success == true)
+            {
+                int sign = ma.Groups["sign"].Value.Equals("-") ? -1 : 1;
+
+                int hours = GetGroupIntValue(ma, "hours", sign);
+                int minutes = GetGroupIntValue(ma, "minutes", sign);
+
+                return (hours * 60 + minutes);
+            }
+
+            ReportError(entry, "Invalid TZOFFSET");
+
+            return (0);
+        }
+
+        #endregion
+
+        #region ProcessVTimezoneEnd
+
+        /// <summary>
+        /// ProcessVTimezoneEnd
+        /// </summary>
+        /// <param name="entry"></param>
+        /// <param name="zone"></param>
+        private void ProcessVTimezoneEnd(CalendarEntry entry, CalendarTimeZone zone)
+        {
+            if ((ComponentToken)GetToken(_components, entry.Value) != ComponentToken.VTimezone)
+                ReportError(entry, "Expected \"END:VTIMEZONE\"");
+
+            if (_CalendarTimeZone == null)
+                _CalendarTimeZone = new List<CalendarTimeZone>();
+
+            _CalendarTimeZone.Add(zone);
+        }
+
+        #endregion
+
+        #region ProcessZonePart
+
+        /// <summary>
+        /// Processes VTimeZone parts (DayLight, Standard)
+        /// </summary>
+        /// <param name="zone"></param>
+        /// <param name="tkn"></param>
+        private void ProcessZonePart(CalendarTimeZone zone, ComponentToken tkn)
+        {
+            bool isDtStartValue = false;
+
+            TimeZonePart part = new TimeZonePart();
+
+            CalendarEntry entry = GetNextEntry();
+
+            while (entry != null)
+            {
+                switch ((PropertyToken) GetToken(_properties, entry.Id))
+                {
+                    case PropertyToken.DtStart:
+                        part.StartDate = ProcessDate(entry, ref isDtStartValue);
+                        break;
+
+                    case PropertyToken.RDate:
+                        part.RecurDate = ProcessRDate(entry, part.RecurDate);
+                        break;
+
+                    case PropertyToken.RRule:
+                        part.RecurRule = ProcessRRule(entry);
+                        break;
+
+                    case PropertyToken.TzOffsetTo:
+                        part.OffsetTo = ProcessTzOffset(entry);
+                        break;
+
+                    case PropertyToken.End:
+                        ProcessZonePartEnd(entry, zone, part, tkn);
+                        return;
+                }
+
+                entry = GetNextEntry();
+            }
+
+            ReportError(entry, "Expected \"END:" + _components[(int)tkn].Text.ToUpper() + "\"");
+        }
+
+        private void ProcessZonePartEnd(CalendarEntry entry,
+            CalendarTimeZone zone, TimeZonePart part, ComponentToken tkn)
+        {
+            if ((ComponentToken)GetToken(_components, entry.Value) != tkn)
+                ReportError(entry, "Expected \"END:" + _components[(int)tkn].Text.ToUpper() + "\"");
+
+            if (zone.Part == null)
+                zone.Part = new List<TimeZonePart>();
+
+            zone.Part.Add(part);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ProcessVTodo
+
+        /// <summary>
+        /// Processes VToDo entries
+        /// </summary>
+        /// <param name="ownerKey"></param>
+        private void ProcessVTodo(string ownerKey)
+        {
+            Appointment app = new Appointment();
+            app.OwnerKey = ownerKey;
+
+            VEventData evData = new VEventData();
+
+            CalendarEntry entry = GetNextEntry();
+
+            while (entry != null)
+            {
+                PropertyToken tkn = (PropertyToken)GetToken(_properties, entry.Id);
+
+                switch (tkn)
+                {
+                    case PropertyToken.Begin:
+                        ComponentToken ctkn = (ComponentToken)GetToken(_components, entry.Value);
+
+                        switch (ctkn)
+                        {
+                            case ComponentToken.VAlarm:
+                                ProcessVAlarm(evData);
+                                break;
+
+                            default:
+                                ReportError(entry, "Unexpected \"BEGIN:" + entry.Value.ToUpper() + "\"");
+                                SkipComponent(ctkn);
+                                break;
+                        }
+                        break;
+
+                    case PropertyToken.Description:
+                        app.Description = entry.Value;
+                        break;
+
+                    case PropertyToken.DtEnd:
+                    case PropertyToken.Due:
+                        app.EndTime = ProcessDate(entry, ref evData.IsDtEndValue);
+                        break;
+
+                    case PropertyToken.DtStart:
+                        app.StartTime = ProcessDate(entry, ref evData.IsDtStartValue);
+                        break;
+
+                    case PropertyToken.Duration:
+                        evData.Duration = ProcessDuration(entry, entry.Value);
+                        break;
+
+                    case PropertyToken.End:
+                        if ((ComponentToken)GetToken(_components, entry.Value) != ComponentToken.VTodo)
+                            ReportError(entry, "Expected \"END:VTODO\"");
+                        
+                        ProcessVEventEnd(entry, app, evData);
+                        return;
+
+                    case PropertyToken.RDate:
+                        evData.RecurDate = ProcessRDate(entry, evData.RecurDate);
+                        break;
+
+                    case PropertyToken.RRule:
+                        evData.RecurRule = ProcessRRule(entry);
+                        break;
+
+                    case PropertyToken.Summary:
+                        app.Subject = entry.Value;
+                        break;
+                }
+
+                entry = GetNextEntry();
+            }
+
+            ReportError(entry, "Expected \"END:VTODO\"");
+        }
+
+        #endregion
+
+        #region ProcessWrCalName
+
+        /// <summary>
+        /// Processes X-WR-CALNAME entries
+        /// </summary>
+        /// <param name="entry"></param>
+        /// <returns></returns>
+        private string ProcessWrCalName(CalendarEntry entry)
+        {
+            if (entry.Attributes.Count > 0)
+            {
+                foreach (AttributeData attr in entry.Attributes)
+                {
+                    ParameterToken tkn = (ParameterToken)GetToken(_parameters, attr.Id);
+
+                    if (tkn == ParameterToken.Value)
+                        return (entry.Value);
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region SkipComponent
+
+        /// <summary>
+        /// Skips the given component block (until it reaches
+        /// the corresponding ctkn:END value)
+        /// </summary>
+        /// <param name="ctkn"></param>
+        private void SkipComponent(ComponentToken ctkn)
+        {
+            int level = 1;
+
+            CalendarEntry entry = GetNextEntry();
+
+            while (entry != null)
+            {
+                PropertyToken tkn = (PropertyToken) GetToken(_properties, entry.Id);
+
+                switch (tkn)
+                {
+                    case PropertyToken.Begin:
+                        level++;
+                        break;
+
+                    case PropertyToken.End:
+                        level--;
+
+                        if (level == 0)
+                        {
+                            if ((ComponentToken) GetToken(_components, entry.Value) != ctkn)
+                            {
+                                ReportError(entry, "Expected \"END:" +
+                                                    Enum.GetName(typeof(ComponentToken), ctkn).ToUpper() + "\"");
+                            }
+                            return;
+                        }
+                        break;
+                }
+
+                entry = GetNextEntry();
+            }
+
+            ReportError(entry, "Expected \"END:" +
+                                Enum.GetName(typeof(ComponentToken), ctkn).ToUpper() + "\"");
+        }
+
+        #endregion
+
+        #region Token processing
+
+        #region GetToken
+
+        /// <summary>
+        /// Gets the token associated with the given text
+        /// </summary>
+        /// <param name="reg">Token registry</param>
+        /// <param name="text">Token text</param>
+        /// <returns>Token, or -1 if not found</returns>
+        private int GetToken(TokenRegistry[] reg, string text)
+        {
+            int index = Array.BinarySearch(reg, text.ToLower());
+
+            if (index >= 0)
+                return (reg[index].Token);
+
+            return (-1);
+        }
+
+        #endregion
+
+        #region GetFirstEntry
+
+        /// <summary>
+        /// Gets the first CalendarEntry
+        /// </summary>
+        /// <returns></returns>
+        private CalendarEntry GetFirstEntry()
+        {
+            _EntryIndex = 0;
+
+            return (GetNextEntry());
+        }
+
+        #endregion
+
+        #region GetNextEntry
+
+        /// <summary>
+        /// Gets the next CalendarEntry
+        /// </summary>
+        /// <returns></returns>
+        private CalendarEntry GetNextEntry()
+        {
+            if (_EntryIndex >= _CalendarEntries.Count)
+                return (null);
+
+            return (_CalendarEntries[_EntryIndex++]);
+        }
+
+        #endregion
+
+        #region GetEnumValue
+
+        /// <summary>
+        /// Gets the enum value, given the token type and text
+        /// </summary>
+        /// <param name="type"></param>
+        /// <param name="name"></param>
+        /// <returns></returns>
+        public int GetEnumValue(Type type, string name)
+        {
+            return ((int)Enum.Parse(type, name));
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Parse support
+
+        #region Parse
+
+        /// <summary>
+        /// Initiates the parsing of the given import file
+        /// </summary>
+        /// <param name="streamReader"></param>
+        private void Parse(StreamReader streamReader)
+        {
+            int lineStart = 1;
+            int lineEnd = 1;
+
+            string s = GetNextLine(streamReader, ref lineStart, ref lineEnd);
+
+            while (s != null)
+            {
+                ParseLine(s, lineStart, lineEnd);
+
+                s = GetNextLine(streamReader, ref lineStart, ref lineEnd);
+            }
+        }
+
+        #endregion
+
+        #region GetNextLine
+
+        /// <summary>
+        /// Gets the next logical line of text
+        /// </summary>
+        /// <param name="sr"></param>
+        /// <param name="lineStart"></param>
+        /// <param name="lineEnd"></param>
+        /// <returns></returns>
+        private string GetNextLine(
+            StreamReader sr, ref int lineStart, ref int lineEnd)
+        {
+            string s = null;
+
+            if (sr.EndOfStream == false)
+            {
+                s = sr.ReadLine();
+
+                lineStart = lineEnd;
+                lineEnd++;
+
+                while (sr.EndOfStream == false)
+                {
+                    if (Char.IsWhiteSpace((char)sr.Peek()) == false)
+                        break;
+
+                    string t = sr.ReadLine();
+
+                    if (t.Length > 0)
+                        s += t.Substring(1);
+
+                    lineEnd++;
+                }
+            }
+
+            return (s);
+        }
+
+        #endregion
+
+        #region ParseLine
+
+        /// <summary>
+        /// Initiates the syntactic parsing of the given line
+        /// </summary>
+        /// <param name="s"></param>
+        /// <param name="lineStart"></param>
+        /// <param name="lineEnd"></param>
+        private void ParseLine(string s, int lineStart, int lineEnd)
+        {
+            if (IsBlankLine(s) == false)
+            {
+                CalendarEntry entry = new CalendarEntry(lineStart, lineEnd);
+
+                if (ParseId(entry, ref s) == true)
+                {
+                    ParseAttributes(entry, ref s);
+                    ParseValue(entry, ref s);
+
+                    _CalendarEntries.Add(entry);
+                }
+            }
+        }
+
+        #region IsBlankLine
+
+        /// <summary>
+        /// Determines if the given line is blank
+        /// </summary>
+        /// <param name="s"></param>
+        /// <returns></returns>
+        private bool IsBlankLine(IEnumerable<char> s)
+        {
+            foreach (char c in s)
+            {
+                if (Char.IsWhiteSpace(c) == false)
+                    return (false);
+            }
+
+            return (true);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ParseId
+
+        /// <summary>
+        /// Parses the Id portion of the given line
+        /// </summary>
+        /// <param name="entry"></param>
+        /// <param name="s"></param>
+        /// <returns></returns>
+        private bool ParseId(CalendarEntry entry, ref string s)
+        {
+            Regex p = new Regex("^[^;:]+\\s*");
+            Match ma = p.Match(s);
+
+            if (ma.Success == false)
+            {
+                ReportError(entry, "Expected ID:");
+                return (false);
+            }
+
+            entry.Id = ma.Value;
+
+            s = s.Substring(ma.Index + ma.Length);
+
+            return (true);
+        }
+
+        #endregion
+
+        #region ParseAttributes
+
+        #region ParseAttributes
+
+        /// <summary>
+        /// Initiates the parsing of the line attributes
+        /// </summary>
+        /// <param name="entry"></param>
+        /// <param name="s"></param>
+        private void ParseAttributes(CalendarEntry entry, ref string s)
+        {
+            if (s.StartsWith(";") == true)
+                ParseAttributeData(entry.Attributes, ref s);
+        }
+
+        #endregion
+
+        #region ParseAttributeData
+
+        /// <summary>
+        /// Parses line attribute data
+        /// </summary>
+        /// <param name="list"></param>
+        /// <param name="s"></param>
+        private void ParseAttributeData(List<AttributeData> list, ref string s)
+        {
+            Regex p = new Regex("\\s*;\\s*(?<id>\\w+)\\s*=\\s*((?<value>\"[^\"]*\")|(?<value>[^;:]+))");
+            MatchCollection mc = p.Matches(s);
+
+            if (mc.Count > 0)
+            {
+                for (int i = 0; i < mc.Count; i++)
+                {
+                    AttributeData attr = new
+                        AttributeData(mc[i].Groups["id"].Value, mc[i].Groups["value"].Value);
+
+                    list.Add(attr);
+                }
+
+                s = s.Substring(mc[mc.Count - 1].Index + mc[mc.Count - 1].Length);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ParseValue
+
+        #region ParseValue
+
+        /// <summary>
+        /// Parses the value portion of the given line
+        /// </summary>
+        /// <param name="entry"></param>
+        /// <param name="s"></param>
+        private void ParseValue(CalendarEntry entry, ref string s)
+        {
+            Regex p = new Regex("^:\\s*((?<value>\"[^\"]\")|(?<value>.+))");
+            Match ma = p.Match(s);
+
+            if (ma.Success == true)
+            {
+                entry.Value = RemoveMetaData(ma.Groups["value"].Value);
+
+                s = s.Substring(ma.Index + ma.Length);
+            }
+        }
+
+        #endregion
+
+        #region RemoveMetaData
+
+        /// <summary>
+        /// Removes Meta data from the value text
+        /// </summary>
+        /// <param name="s"></param>
+        /// <returns></returns>
+        private string RemoveMetaData(string s)
+        {
+            Regex p = new Regex("\\\\[\\\\,;nN]");
+            MatchCollection mc = p.Matches(s);
+
+            if (mc.Count > 0)
+            {
+                StringBuilder sb = new StringBuilder();
+
+                int index = 0;
+
+                foreach (Match ma in mc)
+                {
+                    if (index < ma.Index)
+                        sb.Append(s.Substring(index, ma.Index - index));
+
+                    index = ma.Index + ma.Length;
+
+                    char c = ma.Value[1];
+
+                    if (c == 'n' || c == 'N')
+                        c = '\n';
+
+                    sb.Append(c);
+                }
+
+                if (index < s.Length)
+                    sb.Append(s.Substring(index, s.Length - index));
+
+                return (sb.ToString());
+            }
+
+            return (s);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region GetRelativeDay
+
+        /// <summary>
+        /// Gets the eRelativeDayInMonth from the given dayOfWeek
+        /// </summary>
+        /// <param name="dayOfWeek"></param>
+        /// <returns></returns>
+        protected virtual eRelativeDayInMonth GetRelativeDay(int dayOfWeek)
+        {
+            switch (dayOfWeek)
+            {
+                case 0:
+                    return eRelativeDayInMonth.First;
+
+                case 1:
+                case 2:
+                case 3:
+                case 4:
+                    return ((eRelativeDayInMonth)dayOfWeek);
+
+                default:
+                    return (eRelativeDayInMonth.Last);
+            }
+        }
+
+        #endregion
+
+        #region GetRelativeDayOfWeek
+
+        /// <summary>
+        /// Gets the DayOfWeek from the given eDayOfWeekRecurrence 
+        /// </summary>
+        /// <param name="byDays"></param>
+        /// <returns></returns>
+        protected virtual DayOfWeek GetRelativeDayOfWeek(eDayOfWeekRecurrence byDays)
+        {
+            if ((byDays & eDayOfWeekRecurrence.Monday) != 0)
+                return (DayOfWeek.Monday);
+
+            if ((byDays & eDayOfWeekRecurrence.Tuesday) != 0)
+                return (DayOfWeek.Tuesday);
+
+            if ((byDays & eDayOfWeekRecurrence.Wednesday) != 0)
+                return (DayOfWeek.Wednesday);
+
+            if ((byDays & eDayOfWeekRecurrence.Thursday) != 0)
+                return (DayOfWeek.Thursday);
+
+            if ((byDays & eDayOfWeekRecurrence.Friday) != 0)
+                return (DayOfWeek.Friday);
+
+            if ((byDays & eDayOfWeekRecurrence.Saturday) != 0)
+                return (DayOfWeek.Saturday);
+
+            return (DayOfWeek.Sunday);
+        }
+
+        #endregion
+
+        #region IsValidCalName
+
+        /// <summary>
+        /// Determines if the given Calendar (by it's name) is
+        /// a valid calendar to import
+        /// </summary>
+        /// <param name="calName"></param>
+        /// <returns></returns>
+        protected virtual bool IsValidCalName(string calName)
+        {
+            if (_CalNames == null)
+                return (true);
+
+            if (String.IsNullOrEmpty(calName) == true)
+                return (true);
+
+            for (int i = 0; i < _CalNames.Length; i++)
+            {
+                string name = _CalNames[i];
+
+                if (string.IsNullOrEmpty(name) || name.Equals(calName))
+                    return (true);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region GetOwnerKey
+
+        /// <summary>
+        /// Gets the OwnerKey based upon the
+        /// given Calendar name
+        /// </summary>
+        /// <param name="calName"></param>
+        /// <returns></returns>
+        protected virtual string GetOwnerKey(string calName)
+        {
+            if (String.IsNullOrEmpty(calName) == true)
+                return ("");
+
+            if (_CalNames != null && _OwnerKeys != null)
+            {
+                for (int i = 0; i < _CalNames.Length; i++)
+                {
+                    string name = _CalNames[i];
+
+                    if (string.IsNullOrEmpty(name) || name.Equals(calName))
+                    {
+                        if (_OwnerKeys.Length > i)
+                            return (_OwnerKeys[i] ?? "");
+
+                        break;
+                    }
+                }
+            }
+
+            return (calName);
+        }
+
+        #endregion
+
+        #region ReportError
+
+        /// <summary>
+        /// Reports encountered import errors
+        /// </summary>
+        /// <param name="entry"></param>
+        /// <param name="text"></param>
+        private void ReportError(CalendarEntry entry, string text)
+        {
+            if (IgnoreErrors == false)
+            {
+                if (entry != null)
+                {
+                    string s = String.Format("Error: {0}. \n{1}: Line {2}",
+                                             text, _ImportFile, entry.LineStart);
+
+                    if (entry.LineEnd - entry.LineStart > 1)
+                        s += ("-" + (entry.LineEnd - 1));
+
+                    throw new Exception(s);
+                }
+                else
+                {
+                    string s = String.Format("Error: {0}. {1}:", text, _ImportFile);
+
+                    throw new Exception(s);
+                }
+            }
+        }
+
+        #endregion
+
+        #region Class defs
+
+        #region CalendarTimeZone
+
+        private class CalendarTimeZone
+        {
+            #region Public variables
+
+            public string TzId;
+            public List<TimeZonePart> Part;
+
+            #endregion
+        }
+
+        #endregion
+
+        #region RDate
+
+        #region RDate
+
+        private class RDate
+        {
+            #region Public variables
+
+            public DateRange[] DtRange;
+
+            #endregion
+        }
+
+        #endregion
+
+        #region DateRange
+
+        private class DateRange
+        {
+            #region Public variables
+
+            public DateTime StartTime;
+            public DateTime EndTime;
+
+            #endregion
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RRule
+
+        private class RRule
+        {
+            #region Public variables
+
+            public Frequency Freq;
+            public DateTime Until;
+
+            public int Count;
+            public int Interval = 1;
+            public int BySetPos;
+
+            public List<int>[] ByDay;
+
+            public int[] ByMonth;
+            public int[] ByMonthDay;
+
+            public eDayOfWeekRecurrence ByDays;
+
+            #endregion
+        }
+
+        #endregion
+
+        #region TimeZonePart
+
+        private class TimeZonePart
+        {
+            #region Public variables
+
+            public DateTime StartDate;
+
+            public int OffsetTo;
+
+            public RRule RecurRule;
+            public RDate RecurDate;
+
+            public AppointmentSubsetCollection Appc;
+
+            #endregion
+        }
+
+        #endregion
+
+        #region TokenRegistry
+
+        private class TokenRegistry : IComparable
+        {
+            #region Public variables
+
+            public int Token;
+            public string Text;
+
+            #endregion
+
+            public TokenRegistry(string text, int token)
+            {
+                Token = token;
+                Text = text;
+            }
+
+            #region IComparable Members
+
+            public int CompareTo(object obj)
+            {
+                string s = obj as string;
+
+                return (s != null ? Text.CompareTo(s) : 0);
+            }
+
+            #endregion
+        }
+
+        #endregion
+
+        #region VAlarm
+
+        private class VAlarm
+        {
+            #region Public variables
+
+            public DateTime Date;
+            public TimeSpan Duration;
+            public Related Rel = Related.Start;
+            public string Description;
+
+            #endregion
+        }
+
+        #endregion
+
+        #region VEventData
+
+        private class VEventData
+        {
+            #region Public variables
+
+            public bool IsDtEndValue;
+            public bool IsDtStartValue;
+
+            public RRule RecurRule;
+            public RDate RecurDate;
+
+            public TimeSpan Duration;
+            public List<VAlarm> VAlarms;
+            public List<Appointment> UidApps;
+
+            public DateTime RecIdDate;
+            public DateTime RecStartDate;
+
+            public AppProp AppPropSet;
+
+            public List<DateTime> ExDates;
+
+            public DateTime StartTime;
+            public DateTime EndTime;
+
+            #endregion
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Private enums
+
+        #region Frequency
+
+        private enum Frequency
+        {
+            Secondly,
+            Minutely,
+            Hourly,
+            Daily,
+            Weekly,
+            Monthly,
+            Yearly
+        }
+
+        #endregion
+
+        #region Related
+
+        private enum Related
+        {
+            Start,
+            End,
+            Date,
+        }
+
+        #endregion
+
+        #region AppProp
+
+        [Flags]
+        private enum AppProp
+        {
+            Class = (1 << 0),
+            Description = (1 << 1),
+            Summary = (1 << 2),
+
+            XDnbCategoryColor = (1 << 3),
+            XDnbDisplayTemplate = (1 << 4),
+            XDnbImageAlign = (1 << 5),
+            XDnbImageKey = (1 << 6),
+            XDnbLocked = (1 << 7),
+            XDnbStartTimeAction = (1 << 8),
+            XDnbTimeMarkedAs = (1 << 9),
+            XDnbTooltip = (1 << 10),
+        }
+
+        #endregion
+
+        #region Registry tokens
+
+        #region ComponentToken
+
+        private enum ComponentToken
+        {
+            Daylight,
+            Standard,
+            VAlarm,
+            VCalendar,
+            VEvent,
+            VFreeBusy,
+            VJournal,
+            VTimezone,
+            VTodo,
+        }
+
+        #endregion
+
+        #region PropertyToken
+
+        private enum PropertyToken
+        {
+            //Action,
+            //Attach,
+            //Attendee,
+            Begin,
+            CalScale,
+            //Categories,
+            Class,
+            Comment,
+            //Completed,
+            //Contact,
+            //Created,
+            Description,
+            DtEnd,
+            DtStamp,
+            DtStart,
+            Due,
+            Duration,
+            End,
+            ExDate,
+            //ExRule,
+            //FreeBusy,
+            //Geo,
+            //LastModified,
+            //Location,
+            //Method,
+            //Organizer,
+            //PercentComplete,
+            //Priority,
+            //ProgId,
+            RDate,
+            RecurrenceId,
+            //RelatedTo,
+            //Repeat,
+            //RequestStatus,
+            //Resources,
+            RRule,
+            //Sequence,
+            //Status,
+            Summary,
+            //Transp,
+            Trigger,
+            TzId,
+            TzName,
+            TzOffsetFrom,
+            TzOffsetTo,
+            //TzUrl,
+            Uid,
+            //Url,
+            Version,
+            XDnbCategoryColor,
+            XDnbDisplayTemplate,
+            XDnbImageAlign,
+            XDnbImageKey,
+            XDnbLocked,
+            XDnbRecStartDate,
+            XDnbStartTimeAction,
+            XDnbTimeMarkedAs,
+            XDnbTooltip,
+            XWrCalname,
+        }
+
+        #endregion
+
+        #region ParameterToken
+
+        private enum ParameterToken
+        {
+            //AltRep,
+            //Cn,
+            //CuType,
+            //DelegatedFrom,
+            //DelegatedTo,
+            //Dir,
+            //Encoding,
+            //FmtType,
+            //FbType,
+            //Language,
+            //Member,
+            //ParStat,
+            //Range,
+            Related,
+            //RelType,
+            //Role,
+            //Rsvp,
+            //SentBy,
+            TzId,
+            Value,
+        }
+
+        #endregion
+
+        #region ValueToken
+
+        private enum ValueToken
+        {
+            ByDay,
+            ByHour,
+            ByMinute,
+            ByMonth,
+            ByMonthDay,
+            BySecond,
+            BySetPos,
+            ByWeekNo,
+            ByYearDay,
+            Count,
+            Daily,
+            Date,
+            DateTime,
+            Duration,
+            End,
+            Fr,
+            Freq,
+            Gregorian,
+            Hourly,
+            Interval,
+            Minutely,
+            Mo,
+            Monthly,
+            Period,
+            Sa,
+            Secondly,
+            Start,
+            Su,
+            Text,
+            Th,
+            Tu,
+            Until,
+            We,
+            Weekly,
+            WkSt,
+            Yearly,
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region Public enums
+
+        [Flags]
+        public enum IcsComponent
+        {
+            None = 0,
+
+            Alarm = (1 << 0),
+            Event = (1 << 1),
+            Timezone = (1 << 2),
+            Todo = (1 << 3),
+
+            All = (Alarm | Event | Timezone |Todo),
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/Month.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/Month.cs
new file mode 100644
index 00000000..6db5c9b1
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/Month.cs	
@@ -0,0 +1,114 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Globalization;
+
+namespace DevComponents.Schedule.Model
+{
+    /// <summary>
+    /// Represents the calendar month.
+    /// </summary>
+    public class Month
+    {
+        #region Private Variables
+        private int _Year = 0, _Month = 0;
+        private ReadOnlyCollection<Day> _ReadOnlyDays = null;
+        private List<Day> _Days = null;
+        private CalendarModel _CalendarModel = null;
+        #endregion
+
+        #region Internal Implementation
+        /// <summary>
+        /// Initializes a new instance of the Month class.
+        /// </summary>
+        /// <param name="year"></param>
+        /// <param name="month"></param>
+        public Month(CalendarModel calendar, int year, int month)
+        {
+            _CalendarModel = calendar;
+            _Year = year;
+            _Month = month;
+        }
+
+        /// <summary>
+        /// Gets collection of days in this month.
+        /// </summary>
+        public ReadOnlyCollection<Day> Days
+        {
+            get
+            {
+                if (_ReadOnlyDays == null)
+                    CreateDayCollection();
+                return _ReadOnlyDays;
+            }
+        }
+
+        private void CreateDayCollection()
+        {
+            Calendar cal = _CalendarModel.GetCalendar();
+            int daysCount = cal.GetDaysInMonth(_Year, _Month);
+            _Days = new List<Day>(daysCount);
+            for (int i = 0; i < daysCount; i++)
+            {
+                Day day = new Day(new DateTime(_Year, _Month, i + 1), _CalendarModel);
+  
+                _Days.Add(day);
+            }
+            _ReadOnlyDays = new ReadOnlyCollection<Day>(_Days);
+        }
+
+        /// <summary>
+        /// Gets the month year.
+        /// </summary>
+        [Browsable(false)]
+        public int Year
+        {
+            get { return _Year; }
+        }
+
+        /// <summary>
+        /// Gets the month.
+        /// </summary>
+        [Browsable(false)]
+        public int MonthOfYear
+        {
+            get { return _Month; }
+        }
+
+        /// <summary>
+        /// Gets the Calendar this day is part of.
+        /// </summary>
+        [Browsable(false)]
+        public CalendarModel CalendarModel
+        {
+            get { return _CalendarModel; }
+            internal set { _CalendarModel = value; }
+        }
+
+        internal void InvalidateAppointments()
+        {
+            if (_Days == null) return;
+
+            foreach (Day day in _Days)
+            {
+                day.InvalidateAppointments();
+            }
+        } 
+        
+        internal void InvalidateAppointments(int day)
+        {
+            if (_Days == null) return;
+
+            _Days[day - 1].InvalidateAppointments();
+        }
+        #endregion
+
+
+
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/MonthlyRecurrenceSettings.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/MonthlyRecurrenceSettings.cs
new file mode 100644
index 00000000..37666d88
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/MonthlyRecurrenceSettings.cs	
@@ -0,0 +1,195 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel;
+
+namespace DevComponents.Schedule.Model
+{
+    /// <summary>
+    /// Defines monthly recurrence settings.
+    /// </summary>
+    public class MonthlyRecurrenceSettings : INotifyPropertyChanged, INotifySubPropertyChanged
+    {
+        #region Internal Implementation
+        private AppointmentRecurrence _Recurrence = null;
+        /// <summary>
+        /// Initializes a new instance of the MonthlyRecurrenceSettings class.
+        /// </summary>
+        /// <param name="recurrence"></param>
+        public MonthlyRecurrenceSettings(AppointmentRecurrence recurrence)
+        {
+            _Recurrence = recurrence;
+        }
+
+
+        private int _RepeatOnDayOfMonth = 1;
+        /// <summary>
+        /// Gets or sets the day of month on which appointment is repeated.
+        /// When RepeatOnRelativeDayInMonth property is set to value other than None value of this property is not used.
+        /// </summary>
+        [DefaultValue(1)]
+        public int RepeatOnDayOfMonth
+        {
+            get { return _RepeatOnDayOfMonth; }
+            set
+            {
+                if (value != _RepeatOnDayOfMonth)
+                {
+                    int oldValue = _RepeatOnDayOfMonth;
+                    _RepeatOnDayOfMonth = value;
+                    OnRepeatOnDayOfMonthChanged(oldValue, value);
+                }
+            }
+        }
+
+        private void OnRepeatOnDayOfMonthChanged(int oldValue, int newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("RepeatOnDayOfMonth"));
+        }
+
+
+        private eRelativeDayInMonth _RepeatOnRelativeDayInMonth = eRelativeDayInMonth.None;
+        /// <summary>
+        /// Gets or sets whether appointment should repeat on first, second, third, fourth or last day in month as specified
+        /// by RepeatOnDayOfMonth property. Property applies only for RecurrenceType Monthly or Yearly.
+        /// </summary>
+        [DefaultValue(eRelativeDayInMonth.None)]
+        public eRelativeDayInMonth RepeatOnRelativeDayInMonth
+        {
+            get { return _RepeatOnRelativeDayInMonth; }
+            set
+            {
+                if (value != _RepeatOnRelativeDayInMonth)
+                {
+                    eRelativeDayInMonth oldValue = _RepeatOnRelativeDayInMonth;
+                    _RepeatOnRelativeDayInMonth = value;
+                    OnRepeatOnRelativeDayInMonthChanged(oldValue, value);
+                }
+            }
+        }
+
+        private void OnRepeatOnRelativeDayInMonthChanged(eRelativeDayInMonth oldValue, eRelativeDayInMonth newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("RepeatOnRelativeDayInMonth"));
+        }
+
+        private int _RepeatInterval = 1;
+        /// <summary>
+        /// Gets or sets the interval between recurring appointments. Default value is 1.
+        /// <remarks>
+        /// For example, setting RepeatInterval to 2 means that appointment will recur every 2 months.
+        /// </remarks>
+        /// </summary>
+        [DefaultValue(1)]
+        public int RepeatInterval
+        {
+            get { return _RepeatInterval; }
+            set
+            {
+                if (value != _RepeatInterval)
+                {
+                    int oldValue = _RepeatInterval;
+                    _RepeatInterval = value;
+                    OnRepeatIntervalChanged(oldValue, value);
+                }
+            }
+        }
+
+        private void OnRepeatIntervalChanged(int oldValue, int newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("RepeatInterval"));
+        }
+
+        private DayOfWeek _RelativeDayOfWeek = DayOfWeek.Monday;
+        /// <summary>
+        /// Gets or sets the day of week on which relative repeat as specified by RepeatOnRelativeDayInMonth is effective.
+        /// For example setting RepeatOnRelativeDayInMonth to First and RelativeDayOfWeek to Monday will repeat the appointment on first
+        /// Monday in a month.
+        /// </summary>
+        [DefaultValue(DayOfWeek.Monday)]
+        public DayOfWeek RelativeDayOfWeek
+        {
+            get { return _RelativeDayOfWeek; }
+            set
+            {
+                if (value != _RelativeDayOfWeek)
+                {
+                    DayOfWeek oldValue = _RelativeDayOfWeek;
+                    _RelativeDayOfWeek = value;
+                    OnRelativeDayOfWeekChanged(oldValue, value);
+                }
+            }
+        }
+
+        private void OnRelativeDayOfWeekChanged(DayOfWeek oldValue, DayOfWeek newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("RelativeDayOfWeek"));
+        }
+
+        private eMonthRecurrence _RepeatOnMonths = eMonthRecurrence.All;
+        /// <summary>
+        /// Gets or sets the months on which appointment is repeated. This property is represented by bit-flag enum
+        /// which means that you can combine the values from eMonthRecurrence enum using OR operator to specify multiple values.
+        /// Default value is All.
+        /// <remarks>
+        /// <para>For example you could set this property to eMonthRecurrence.January | eMonthRecurrence.July to repeat appointments on January and July only.</para> 
+        /// </remarks>
+        /// </summary>
+        [DefaultValue(eMonthRecurrence.All)]
+        public eMonthRecurrence RepeatOnMonths
+        {
+            get { return _RepeatOnMonths; }
+            set
+            {
+                if (value != _RepeatOnMonths)
+                {
+                    eMonthRecurrence oldValue = _RepeatOnMonths;
+                    _RepeatOnMonths = value;
+                    OnRepeatOnMonthsChanged(oldValue, value);
+                }
+            }
+        }
+        private void OnRepeatOnMonthsChanged(eMonthRecurrence oldValue, eMonthRecurrence newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("RepeatOnMonths"));
+        }
+        #endregion
+
+        #region INotifyPropertyChanged Members
+        /// <summary>
+        /// Occurs when property value has changed.
+        /// </summary>
+        public event PropertyChangedEventHandler PropertyChanged;
+        /// <summary>
+        /// Raises the PropertyChanged event.
+        /// </summary>
+        /// <param name="e">Event arguments</param>
+        protected virtual void OnPropertyChanged(PropertyChangedEventArgs e)
+        {
+            PropertyChangedEventHandler eh = PropertyChanged;
+            if (eh != null) eh(this, e);
+            OnSubPropertyChanged(new SubPropertyChangedEventArgs(this, e));
+        }
+        #endregion
+
+        #region INotifySubPropertyChanged Members
+        /// <summary>
+        /// Occurs when property or property of child objects has changed. This event is similar to PropertyChanged event with key
+        /// difference that it occurs for the property changed of child objects as well.
+        /// </summary>
+        public event SubPropertyChangedEventHandler SubPropertyChanged;
+        /// <summary>
+        /// Raises the SubPropertyChanged event.
+        /// </summary>
+        /// <param name="e">Event arguments</param>
+        protected virtual void OnSubPropertyChanged(SubPropertyChangedEventArgs e)
+        {
+            SubPropertyChangedEventHandler eh = SubPropertyChanged;
+            if (eh != null) eh(this, e);
+        }
+        #endregion
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/NotificationRequest.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/NotificationRequest.cs
new file mode 100644
index 00000000..3e10c797
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/NotificationRequest.cs	
@@ -0,0 +1,58 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace DevComponents.Schedule.Model
+{
+    internal class NotificationRequest
+    {
+        #region Internal Implementation
+        /// <summary>
+        /// Initializes a new instance of the NotificationRequest class.
+        /// </summary>
+        /// <param name="notificationTime"></param>
+        /// <param name="notificationHandler"></param>
+        public NotificationRequest(DateTime notificationTime, NotificationServerEventHandler notificationHandler)
+        {
+            _NotificationTime = notificationTime;
+            _NotificationHandler = notificationHandler;
+            _ThreadId = System.Threading.Thread.CurrentThread.ManagedThreadId;
+        }
+
+        private int _ThreadId;
+        public int ThreadId
+        {
+            get { return _ThreadId; }
+        }
+        
+
+
+        private DateTime _NotificationTime = DateTime.MinValue;
+        /// <summary>
+        /// Gets or sets requested notification time.
+        /// </summary>
+        public DateTime NotificationTime
+        {
+            get { return _NotificationTime; }
+            set
+            {
+            	_NotificationTime = value;
+            }
+        }
+
+        private NotificationServerEventHandler _NotificationHandler = null;
+        /// <summary>
+        /// Gets the callback handler for notification when notification time is reached.
+        /// </summary>
+        public NotificationServerEventHandler NotificationHandler
+        {
+            get { return _NotificationHandler; }
+        }
+        
+
+        #endregion
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/NotificationServer.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/NotificationServer.cs
new file mode 100644
index 00000000..514ae8ca
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/NotificationServer.cs	
@@ -0,0 +1,173 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Microsoft.Win32;
+using System.Timers;
+
+namespace DevComponents.Schedule.Model
+{
+    /// <summary>
+    /// Provides notification support for appointments.
+    /// </summary>
+    internal static class NotificationServer
+    {
+        #region Private Variables
+        private static Timer _Timer = null;
+        internal static event NotificationServerEventHandler NotifySubscribers;
+        private static DateTime _NextEventTime;
+        private static List<NotificationRequest> _RequestList = new List<NotificationRequest>();
+        #endregion
+
+        #region Constructor
+        static NotificationServer()
+        {
+            _Timer = new Timer();
+            _Timer.Elapsed += new ElapsedEventHandler(NotificationEventTimerTick);
+            SystemEvents.TimeChanged += new EventHandler(SystemEvents_TimeChanged);
+            _NextEventTime = DateTime.MinValue;
+        }
+
+        static void SystemEvents_TimeChanged(object sender, EventArgs e)
+        {
+            if (_NextEventTime > DateTime.MinValue && UtcNow.Subtract(_NextEventTime).TotalSeconds <= 0)
+                NotifySubscribersOnTimeEvent();
+        }
+
+        static void NotificationEventTimerTick(object sender, ElapsedEventArgs e)
+        {
+            NotifySubscribersOnTimeEvent();
+        }
+
+        private static bool _Notifying = false;
+        private static void NotifySubscribersOnTimeEvent()
+        {
+            try
+            {
+                _Notifying = true;
+                _Timer.Stop();
+#if DEBUG
+                Console.WriteLine("{0} NotificationServer notifying subscribers count: {1}", DateTime.Now, _RequestList.Count);
+#endif
+                // Reset next notification time...
+                _NextEventTime = DateTime.MinValue;
+
+                if (_RequestList.Count == 0)
+                {
+                    return;
+                }
+                DateTime now = CalendarModel.GetCalendarDateTime(UtcNow);
+                NotificationRequest[] requestList = new NotificationRequest[_RequestList.Count];
+                _RequestList.CopyTo(requestList);
+                DateTime nextNotification = DateTime.MinValue;
+                foreach (NotificationRequest item in requestList)
+                {
+                    if (item.NotificationTime <= now)
+                    {
+                        if (item.NotificationHandler != null)
+                        {
+                            //if (System.Threading.Thread.CurrentThread.ManagedThreadId != item.ThreadId)
+                            //{
+                                
+                            //    //System.Threading.SendOrPostCallback callback = new System.Threading.SendOrPostCallback(SendNotification);
+                            //    //System.Windows.Threading.DispatcherSynchronizationContext.Current.Post(callback, item);
+                            //}
+                            //else
+                                item.NotificationHandler(item, new NotificationServerEventArgs(now));
+                        }
+                        _RequestList.Remove(item);
+                    }
+                    else if (item.NotificationTime < nextNotification || nextNotification == DateTime.MinValue)
+                        nextNotification = item.NotificationTime;
+                }
+
+                if (nextNotification > DateTime.MinValue)
+                {
+                    SetNextEventTime(nextNotification);
+                }
+                //else
+                //    Console.WriteLine("Not setting next notification time...");
+            }
+            finally
+            {
+                _Notifying = false;
+            }
+        }
+
+        private static void SendNotification(object e)
+        {
+            NotificationRequest item = (NotificationRequest)e;
+            if (item.NotificationHandler != null)
+            {
+                if (System.Threading.Thread.CurrentThread.ManagedThreadId != item.ThreadId)
+                {
+                    Console.WriteLine("Different THREAD");
+                }
+                else
+                {
+                    DateTime now = CalendarModel.GetCalendarDateTime(UtcNow);
+                    item.NotificationHandler(item, new NotificationServerEventArgs(now));
+                }
+            }
+        }
+
+
+        private static void SetNextEventTime(DateTime dateTime)
+        {
+            DateTime now = CalendarModel.GetCalendarDateTime(UtcNow);
+            if (dateTime.Subtract(now).TotalSeconds <= 0)
+            {
+                if (!_Notifying)
+                    NotifySubscribersOnTimeEvent();
+                else
+                    _NextEventTime = DateTime.MinValue;
+            }
+            else if (dateTime.Subtract(now).TotalSeconds > 0 && (_NextEventTime == DateTime.MinValue || dateTime < _NextEventTime))
+            {
+                double nextEvent = dateTime.Subtract(UtcNow).TotalSeconds + 1;
+                if (nextEvent > int.MaxValue / 1000)
+                    nextEvent = (int.MaxValue - 1) / 1000;
+                _Timer.Interval = (int)Math.Max(5, nextEvent * 1000);
+#if DEBUG
+                Console.WriteLine("{0} NotificationServer scheduling next event on: {1}, previous scheduled event on: {2}", DateTime.Now, dateTime, _NextEventTime);
+#endif
+                _Timer.Start();
+                _NextEventTime = dateTime;
+            }
+            //else
+            //    _NextEventTime = DateTime.MinValue;
+        }
+
+        private static DateTime UtcNow
+        {
+            get
+            {
+                return TimeZoneInfo.ConvertTimeToUtc(CalendarModel.CurrentDateTime);
+            }
+        }
+
+        public static void UpdateNotification(NotificationRequest request)
+        {
+            SetNextEventTime(request.NotificationTime);
+        }
+
+        #endregion
+
+        #region Internal Implementation
+        public static void Register(NotificationRequest request)
+        {
+            _RequestList.Add(request);
+            SetNextEventTime(request.NotificationTime);
+        }
+
+        public static void Unregister(NotificationRequest request)
+        {
+            _RequestList.Remove(request);
+        }
+        #endregion
+    }
+
+    internal delegate void NotificationServerEventHandler(NotificationRequest sender, NotificationServerEventArgs e);
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/NotificationServerEventArgs.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/NotificationServerEventArgs.cs
new file mode 100644
index 00000000..d8a61ce4
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/NotificationServerEventArgs.cs	
@@ -0,0 +1,49 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace DevComponents.Schedule.Model
+{
+    internal class NotificationServerEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Initializes a new instance of the NotificationServerEventArgs class.
+        /// </summary>
+        /// <param name="notificationTime"></param>
+        public NotificationServerEventArgs(DateTime notificationTime)
+        {
+            _NotificationTime = notificationTime;
+        }
+
+        private DateTime _NotificationTime;
+        /// <summary>
+        /// Gets the time notification is sent on.
+        /// </summary>
+        public DateTime NotificationTime
+        {
+            get { return _NotificationTime; }
+        }
+
+        private DateTime _NextRequestedNotificationTime = DateTime.MinValue;
+        /// <summary>
+        /// Gets or sets the next requested notification time by the handler of the event.
+        /// Handler of event must set this to the desired next notification time in order to be notified.
+        /// The value recorded will be the lowest value set by all handlers.
+        /// </summary>
+        public DateTime NextRequestedNotificationTime
+        {
+            get { return _NextRequestedNotificationTime; }
+            set 
+            {
+                value = CalendarModel.GetCalendarDateTime(value);
+                if (value > NotificationTime && (value < _NextRequestedNotificationTime || _NextRequestedNotificationTime == DateTime.MinValue))
+                {
+                    _NextRequestedNotificationTime = value;
+                }
+            }
+        }
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/Owner.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/Owner.cs
new file mode 100644
index 00000000..f14cf9b0
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/Owner.cs	
@@ -0,0 +1,296 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel;
+using DevComponents.DotNetBar.Schedule;
+
+namespace DevComponents.Schedule.Model
+{
+    public class Owner : INotifyPropertyChanged, INotifySubPropertyChanged
+    {
+        #region Constructors
+        /// <summary>
+        /// Initializes a new instance of the Owner class.
+        /// </summary>
+        public Owner()
+        {
+            _WorkDays = new WorkDayCollection(this);
+            _CalendarWorkDays = new CalendarWorkDayCollection(this);
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the Owner class.
+        /// </summary>
+        /// <param name="key"></param>
+        public Owner(string key)
+            : this()
+        {
+            _Key = key;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the Owner class.
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="displayName"></param>
+        public Owner(string key, string displayName)
+            : this()
+        {
+            _Key = key;
+            _DisplayName = displayName;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the Owner class.
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="displayName"></param>
+        /// <param name="colorScheme"></param>
+        public Owner(string key, string displayName, eCalendarColor colorScheme)
+            : this()
+        {
+            _Key = key;
+            _ColorScheme = colorScheme;
+            _DisplayName = displayName;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the Owner class.
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="colorScheme"></param>
+        public Owner(string key, eCalendarColor colorScheme)
+            : this()
+        {
+            _Key = key;
+            _ColorScheme = colorScheme;
+        }
+        #endregion
+
+        #region Internal Implementation
+        private WorkDayCollection _WorkDays;
+        /// <summary>
+        /// Gets working days associated with this owner. If empty WorkDays from CalendarModel are used instead.
+        /// </summary>
+        public WorkDayCollection WorkDays
+        {
+            get { return _WorkDays; }
+        }
+
+        private CalendarWorkDayCollection _CalendarWorkDays;
+        /// <summary>
+        /// Gets date based working days associated with this owner. Date specific working days take precedence over days specified in WorkDays collection. If empty WorkDays on owner or from CalendarModel are used instead.
+        /// </summary>
+        public CalendarWorkDayCollection CalendarWorkDays
+        {
+            get { return _CalendarWorkDays; }
+        }
+
+        private string _Key = "";
+        /// <summary>
+        /// Gets or sets the unique key that identifies the owner.
+        /// </summary>
+        [DefaultValue("")]
+        public string Key
+        {
+            get { return _Key; }
+            set
+            {
+                if (value != _Key)
+                {
+                    string oldValue = _Key;
+                    _Key = value;
+                    OnKeyChanged(oldValue, value);
+                }
+            }
+        }
+
+        private void OnKeyChanged(string oldValue, string newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("Key"));
+        }
+
+        private string _Description = "";
+        /// <summary>
+        /// Gets or sets the owner description. For example if owner represents person, it would be person name or if owner represents resource
+        /// like room it would be the room name.
+        /// </summary>
+        [DefaultValue("")]
+        public string Description
+        {
+            get { return _Description; }
+            set
+            {
+                if (value != _Description)
+                {
+                    string oldValue = _Description;
+                    _Description = value;
+                    OnDescriptionChanged(oldValue, value);
+                }
+            }
+        }
+
+        private void OnDescriptionChanged(string oldValue, string newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("Description"));
+            
+        }
+
+        private object _Tag = null;
+        /// <summary>
+        /// Gets or sets custom data associated with the object.
+        /// </summary>
+        [DefaultValue(null)]
+        public object Tag
+        {
+            get { return _Tag; }
+            set
+            {
+                if (value != _Tag)
+                {
+                    object oldValue = _Tag;
+                    _Tag = value;
+                    OnTagChanged(oldValue, value);
+                }
+            }
+        }
+
+        private void OnTagChanged(object oldValue, object newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("Tag"));
+        }
+
+        private CalendarModel _Calendar = null;
+        /// <summary>
+        /// Gets the calendar owner is associated with.
+        /// </summary>
+        [Browsable(false)]
+        public CalendarModel Calendar
+        {
+            get { return _Calendar; }
+            internal set
+            {
+                if (_Calendar != value)
+                {
+                    _Calendar = value;
+                }
+            }
+        }
+
+        private TimeZoneInfo _DisplayTimeZone = null;
+        /// <summary>
+        /// Gets or sets the display time-zone for this owner. Default value is null.
+        /// </summary>
+        [DefaultValue(null)]
+        public TimeZoneInfo DisplayTimeZone
+        {
+            get { return _DisplayTimeZone; }
+            set
+            {
+                if (value != _DisplayTimeZone)
+                {
+                    TimeZoneInfo oldValue = _DisplayTimeZone;
+                    _DisplayTimeZone = value;
+                    OnDisplayTimeZoneChanged(oldValue, value);
+                }
+            }
+        }
+
+        private void OnDisplayTimeZoneChanged(TimeZoneInfo oldValue, TimeZoneInfo newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("DisplayTimeZone"));
+            
+        }
+
+
+        private eCalendarColor _ColorScheme = eCalendarColor.Automatic;
+        /// <summary>
+        /// Gets or sets the owner color scheme used to represent owner data in user interface.
+        /// </summary>
+        [DefaultValue(eCalendarColor.Automatic)]
+        public eCalendarColor ColorScheme
+        {
+            get { return _ColorScheme; }
+            set
+            {
+                if (value != _ColorScheme)
+                {
+                    eCalendarColor oldValue = _ColorScheme;
+                    _ColorScheme = value;
+                    OnColorSchemeChanged(oldValue, value);
+                }
+            }
+        }
+
+        private void OnColorSchemeChanged(eCalendarColor oldValue, eCalendarColor newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("ColorScheme"));
+            
+        }
+        private string _DisplayName = null;
+        /// <summary>
+        /// Gets or sets the display name for the owner. Display name is used in User Interface to identify the owner.
+        /// If not specified the Key is used instead in UI.
+        /// </summary>
+        [DefaultValue(null)]
+        public string DisplayName
+        {
+            get { return _DisplayName; }
+            set
+            {
+                if (value != _DisplayName)
+                {
+                    string oldValue = _DisplayName;
+                    _DisplayName = value;
+                    OnDisplayNameChanged(oldValue, value);
+                }
+            }
+        }
+
+        private void OnDisplayNameChanged(string oldValue, string newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("DisplayName"));
+            
+        }
+
+        internal static string DisplayNamePropertyName = "DisplayName";
+        #endregion
+
+        #region INotifyPropertyChanged Members
+        /// <summary>
+        /// Occurs when property value has changed.
+        /// </summary>
+        public event PropertyChangedEventHandler PropertyChanged;
+        /// <summary>
+        /// Raises the PropertyChanged event.
+        /// </summary>
+        /// <param name="e">Event arguments</param>
+        protected virtual void OnPropertyChanged(PropertyChangedEventArgs e)
+        {
+            PropertyChangedEventHandler eh = PropertyChanged;
+            if (eh != null) eh(this, e);
+            OnSubPropertyChanged(new SubPropertyChangedEventArgs(this, e));
+        }
+        #endregion
+
+        #region INotifySubPropertyChanged Members
+        /// <summary>
+        /// Occurs when property or property of child objects has changed. This event is similar to PropertyChanged event with key
+        /// difference that it occurs for the property changed of child objects as well.
+        /// </summary>
+        public event SubPropertyChangedEventHandler SubPropertyChanged;
+        /// <summary>
+        /// Raises the SubPropertyChanged event.
+        /// </summary>
+        /// <param name="e">Event arguments</param>
+        protected virtual void OnSubPropertyChanged(SubPropertyChangedEventArgs e)
+        {
+            SubPropertyChangedEventHandler eh = SubPropertyChanged;
+            if (eh != null) eh(this, e);
+        }
+        #endregion
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/OwnerCollection.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/OwnerCollection.cs
new file mode 100644
index 00000000..0976fef1
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/OwnerCollection.cs	
@@ -0,0 +1,123 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Collections.ObjectModel;
+
+namespace DevComponents.Schedule.Model
+{
+    public class OwnerCollection : Collection<Owner>
+    {
+        #region Constructor
+        /// <summary>
+        /// Initializes a new instance of the AppointmentCollection class.
+        /// </summary>
+        /// <param name="calendar"></param>
+        public OwnerCollection(CalendarModel calendar)
+        {
+            _Calendar = calendar;
+        }
+
+        #endregion
+        #region Internal Implementation
+        private CalendarModel _Calendar = null;
+        /// <summary>
+        /// Gets the calendar collection is associated with.
+        /// </summary>
+        public CalendarModel Calendar
+        {
+            get { return _Calendar; }
+            internal set { _Calendar = value; }
+        }
+
+        protected override void RemoveItem(int index)
+        {
+            Owner owner = this[index];
+            OnBeforeRemove(index, owner);
+            base.RemoveItem(index);
+            OnAfterRemove(index, owner);
+        }
+
+        private void OnAfterRemove(int index, Owner owner)
+        {
+            _Calendar.OwnerRemoved(owner);
+        }
+
+        private void OnBeforeRemove(int index, Owner owner)
+        {
+            owner.Calendar = null;
+        }
+
+        protected override void InsertItem(int index, Owner item)
+        {
+            OnBeforeInsert(index, item);
+            base.InsertItem(index, item);
+            OnAfterInsert(index, item);
+        }
+
+        private void OnAfterInsert(int index, Owner item)
+        {
+            _Calendar.OwnerAdded(item);
+        }
+
+        private void OnBeforeInsert(int index, Owner item)
+        {
+            item.Calendar = _Calendar;
+        }
+
+        protected override void SetItem(int index, Owner newItem)
+        {
+            Owner oldItem = this[index];
+            OnBeforeSetItem(index, oldItem, newItem);
+            base.SetItem(index, newItem);
+            OnAfterSetItem(index, oldItem, newItem);
+        }
+
+        private void OnAfterSetItem(int index, Owner oldItem, Owner newItem)
+        {
+            _Calendar.OwnerRemoved(oldItem);
+            _Calendar.OwnerAdded(newItem);
+        }
+
+        private void OnBeforeSetItem(int index, Owner oldItem, Owner newItem)
+        {
+            oldItem.Calendar = null;
+            newItem.Calendar = _Calendar;
+        }
+
+        protected override void ClearItems()
+        {
+            foreach (Owner item in this)
+            {
+                item.Calendar = null;
+                _Calendar.OwnerRemoved(item);
+            }
+            base.ClearItems();
+        }
+
+        /// <summary>
+        /// Gets the item based on the Key assigned to the item
+        /// </summary>
+        /// <param name="ownerKey"></param>
+        /// <returns></returns>
+        public Owner this[string ownerKey]
+        {
+            get 
+            {
+                foreach (Owner item in this.Items)
+                {
+                    if (item.Key == ownerKey) return item;
+                }
+                return null;
+            }
+            //set 
+            //{
+            //    Owner owner = this[ownerKey];
+            //    this[IndexOf(owner)] = value;
+            //}
+        }
+        #endregion
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/Primitives/CustomCollectionBase.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/Primitives/CustomCollectionBase.cs
new file mode 100644
index 00000000..5cafab77
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/Primitives/CustomCollectionBase.cs	
@@ -0,0 +1,1006 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Collections;
+using System.Diagnostics;
+using System.Runtime.InteropServices;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Collections.Specialized;
+
+namespace DevComponents.Schedule.Model.Primitives
+{
+    /// <summary>
+    /// Represents custom collection with INotifyPropertyChanged and INotifyCollectionChanged interface support.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    [Serializable, DebuggerDisplay("Count = {Count}"), ComVisible(false)]
+    public class CustomCollection<T> : IList<T>, ICollection<T>, IEnumerable<T>, IList, ICollection, IEnumerable, INotifyPropertyChanged, INotifyCollectionChanged
+    {
+        #region Events
+        /// <summary>
+        /// Occurs when property value has changed.
+        /// </summary>
+        public event PropertyChangedEventHandler PropertyChanged;
+        #endregion
+
+        #region Internal Implementation
+        private SimpleMonitor<T> _monitor;
+
+        [NonSerialized]
+        private object _syncRoot;
+        private IList<T> items;
+
+        /// <summary>
+        /// Creates new instance of object.
+        /// </summary>
+        public CustomCollection()
+        {
+            this._monitor = new SimpleMonitor<T>();
+            this.items = new List<T>();
+        }
+        /// <summary>
+        /// Creates new instance of object.
+        /// </summary>
+        /// <param name="list">List to initialize collection with.</param>
+        public CustomCollection(IList<T> list)
+        {
+            if (list == null)
+            {
+                throw new ArgumentNullException("list");
+            }
+            this._monitor = new SimpleMonitor<T>();
+            this.items = list;
+        }
+        /// <summary>
+        /// Add item to collection.
+        /// </summary>
+        /// <param name="item">Item to add.</param>
+        public void Add(T item)
+        {
+            if (this.items.IsReadOnly)
+            {
+                throw new NotSupportedException("collection is read-only");
+            }
+            int count = this.items.Count;
+            this.InsertItem(count, item);
+        }
+        /// <summary>
+        /// Remove all items from collection.
+        /// </summary>
+        public void Clear()
+        {
+            if (this.items.IsReadOnly)
+            {
+                throw new NotSupportedException("collection is read-only");
+            }
+            this.ClearItems();
+        }
+        /// <summary>
+        /// Remove all items from collection.
+        /// </summary>
+        protected virtual void ClearItems()
+        {
+            this.CheckReentrancy();
+            this.items.Clear();
+            OnPropertyChanged(new PropertyChangedEventArgs(this.CountString));
+            OnPropertyChanged(new PropertyChangedEventArgs(this.ItemString));
+            this.OnCollectionReset();
+        }
+        /// <summary>
+        /// Checks whether collection contains item.
+        /// </summary>
+        /// <param name="item">Item to look for.</param>
+        /// <returns>true if item is in collection.</returns>
+        public bool Contains(T item)
+        {
+            OnCollectionReadAccess();
+            return this.items.Contains(item);
+        }
+        /// <summary>
+        /// Copy collection to array.
+        /// </summary>
+        /// <param name="array">Array to copy to.</param>
+        /// <param name="index">Index to copy from.</param>
+        public void CopyTo(T[] array, int index)
+        {
+            OnCollectionReadAccess();
+            this.items.CopyTo(array, index);
+        }
+        /// <summary>
+        /// Gets enumerator for collection.
+        /// </summary>
+        /// <returns>Enumerator.</returns>
+        public IEnumerator<T> GetEnumerator()
+        {
+            OnCollectionReadAccess();
+            return this.items.GetEnumerator();
+        }
+        /// <summary>
+        /// Returns index of an item.
+        /// </summary>
+        /// <param name="item">Reference to item.</param>
+        /// <returns>Index of item.</returns>
+        public int IndexOf(T item)
+        {
+            OnCollectionReadAccess();
+            return this.items.IndexOf(item);
+        }
+        /// <summary>
+        /// Insert item at specified location.
+        /// </summary>
+        /// <param name="index">Index to insert item in.</param>
+        /// <param name="item">Item to insert.</param>
+        public void Insert(int index, T item)
+        {
+            if ((index < 0) || (index > this.items.Count))
+            {
+                throw new ArgumentOutOfRangeException("index");
+            }
+            this.InsertItem(index, item);
+        }
+        /// <summary>
+        /// Inserts item.
+        /// </summary>
+        /// <param name="index">Index to insert item at.</param>
+        /// <param name="item">Reference to item.</param>
+        protected virtual void InsertItem(int index, T item)
+        {
+            this.CheckReentrancy();
+            this.items.Insert(index, item);
+            OnPropertyChanged(new PropertyChangedEventArgs(this.CountString));
+            this.OnCollectionChanged(NotifyCollectionChangedAction.Add, item, index);
+        }
+
+        private static bool IsCompatibleObject(object value)
+        {
+            if (!(value is T) && ((value != null) || typeof(T).IsValueType))
+            {
+                return false;
+            }
+            return true;
+        }
+        /// <summary>
+        /// Removes item from collection.
+        /// </summary>
+        /// <param name="item">Item to remove.</param>
+        /// <returns>true if item was removed.</returns>
+        public bool Remove(T item)
+        {
+            if (this.items.IsReadOnly)
+            {
+                throw new NotSupportedException("collection is read-only");
+            }
+            int index = this.items.IndexOf(item);
+            if (index < 0)
+            {
+                return false;
+            }
+            this.RemoveItem(index);
+            return true;
+        }
+        /// <summary>
+        /// Remove item at specified location.
+        /// </summary>
+        /// <param name="index">Index of item to remove.</param>
+        public void RemoveAt(int index)
+        {
+            if (this.items.IsReadOnly)
+            {
+                throw new NotSupportedException("collection is read-only");
+            }
+            if ((index < 0) || (index >= this.items.Count))
+            {
+                throw new ArgumentOutOfRangeException();
+            }
+            this.RemoveItem(index);
+        }
+        /// <summary>
+        /// Remove item at specified location.
+        /// </summary>
+        /// <param name="index">Index of item to remove.</param>
+        protected virtual void RemoveItem(int index)
+        {
+            this.CheckReentrancy();
+
+            object item = items[index];
+            this.items.RemoveAt(index);
+            OnPropertyChanged(new PropertyChangedEventArgs(this.CountString));
+            this.OnCollectionChanged(NotifyCollectionChangedAction.Remove, item, index);
+        }
+        /// <summary>
+        /// Set item on location.
+        /// </summary>
+        /// <param name="index">Index</param>
+        /// <param name="item">Item to assign.</param>
+        protected virtual void SetItem(int index, T item)
+        {
+            this.CheckReentrancy();
+            T oldItem = items[index];
+            this.items[index] = item;
+            OnPropertyChanged(new PropertyChangedEventArgs(this.CountString));
+            OnPropertyChanged(new PropertyChangedEventArgs(this.ItemString));
+            this.OnCollectionChanged(NotifyCollectionChangedAction.Replace, oldItem, item, index);
+        }
+
+        void ICollection.CopyTo(Array array, int index)
+        {
+            this.CheckReentrancy();
+            OnCollectionReadAccess();
+            if (array == null)
+            {
+                throw new ArgumentNullException("array");
+            }
+            if (array.Rank != 1)
+            {
+                throw new ArgumentException("Argument array.Rank multi-dimensional not supported");
+            }
+            if (array.GetLowerBound(0) != 0)
+            {
+                throw new ArgumentException("Argument array non zero lower bound not supported");
+            }
+            if (index < 0)
+            {
+                throw new ArgumentOutOfRangeException("index must be non-negative number");
+            }
+            if ((array.Length - index) < this.Count)
+            {
+                throw new ArgumentException("array too small");
+            }
+            T[] localArray = array as T[];
+            if (localArray != null)
+            {
+                this.items.CopyTo(localArray, index);
+            }
+            else
+            {
+                Type elementType = array.GetType().GetElementType();
+                Type c = typeof(T);
+                if (!elementType.IsAssignableFrom(c) && !c.IsAssignableFrom(elementType))
+                {
+                    throw new ArgumentException("Argument array of invalid type");
+                }
+                object[] objArray = array as object[];
+                if (objArray == null)
+                {
+                    throw new ArgumentException("Argument array invalid type");
+                }
+                int count = this.items.Count;
+                try
+                {
+                    for (int i = 0; i < count; i++)
+                    {
+                        objArray[index++] = this.items[i];
+                    }
+                }
+                catch (ArrayTypeMismatchException)
+                {
+                    throw new ArgumentException("Argument array invalid type");
+                }
+            }
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            OnCollectionReadAccess();
+            return this.items.GetEnumerator();
+        }
+
+        int IList.Add(object value)
+        {
+            if (this.items.IsReadOnly)
+            {
+                throw new NotSupportedException("collection is read-only");
+            }
+            VerifyValueType(value);
+            this.Add((T)value);
+            return (this.Count - 1);
+        }
+
+        private static void VerifyValueType(object value)
+        {
+            if (!IsCompatibleObject(value))
+            {
+                throw new ArgumentException("value is of wrong type");
+            }
+        }
+
+
+        bool IList.Contains(object value)
+        {
+            return (CustomCollection<T>.IsCompatibleObject(value) && this.Contains((T)value));
+        }
+
+        int IList.IndexOf(object value)
+        {
+            OnCollectionReadAccess();
+            if (CustomCollection<T>.IsCompatibleObject(value))
+            {
+                return this.IndexOf((T)value);
+            }
+            return -1;
+        }
+
+        void IList.Insert(int index, object value)
+        {
+            if (this.items.IsReadOnly)
+            {
+                throw new NotSupportedException("collection is read-only");
+            }
+            VerifyValueType(value);
+            this.Insert(index, (T)value);
+        }
+
+        void IList.Remove(object value)
+        {
+            if (this.items.IsReadOnly)
+            {
+                throw new NotSupportedException("collection is read-only");
+            }
+            if (CustomCollection<T>.IsCompatibleObject(value))
+            {
+                this.Remove((T)value);
+            }
+        }
+
+        /// <summary>
+        /// Returns number of items in collection.
+        /// </summary>
+        public int Count
+        {
+            get
+            {
+                OnCollectionReadAccess();
+                return this.items.Count;
+            }
+        }
+
+        /// <summary>
+        /// Returns item at index.
+        /// </summary>
+        /// <param name="index">Index of item.</param>
+        /// <returns>Item at index.</returns>
+        public T this[int index]
+        {
+            get
+            {
+                OnCollectionReadAccess();
+                return this.items[index];
+            }
+            set
+            {
+                if (this.items.IsReadOnly)
+                {
+                    throw new NotSupportedException("collection is read-only");
+                }
+                if ((index < 0) || (index >= this.items.Count))
+                {
+                    throw new ArgumentOutOfRangeException();
+                }
+                this.SetItem(index, value);
+            }
+        }
+
+        /// <summary>
+        /// Returns the IList interface for items in collection.
+        /// </summary>
+        protected IList<T> Items
+        {
+            get
+            {
+                OnCollectionReadAccess();
+                return this.items;
+            }
+        }
+        /// <summary>
+        /// Returns items directly without checks.
+        /// </summary>
+        /// <returns>List of items.</returns>
+        protected IList<T> GetItemsDirect()
+        {
+            return this.items;
+        }
+
+        bool ICollection<T>.IsReadOnly
+        {
+            get
+            {
+                return this.items.IsReadOnly;
+            }
+        }
+
+        bool ICollection.IsSynchronized
+        {
+            get
+            {
+                return false;
+            }
+        }
+
+        object ICollection.SyncRoot
+        {
+            get
+            {
+                if (this._syncRoot == null)
+                {
+                    ICollection items = this.items as ICollection;
+                    if (items != null)
+                    {
+                        this._syncRoot = items.SyncRoot;
+                    }
+                    else
+                    {
+                        System.Threading.Interlocked.CompareExchange(ref this._syncRoot, new object(), null);
+                    }
+                }
+                return this._syncRoot;
+            }
+        }
+
+        bool IList.IsFixedSize
+        {
+            get
+            {
+                IList items = this.items as IList;
+                return ((items != null) && items.IsFixedSize);
+            }
+        }
+
+        bool IList.IsReadOnly
+        {
+            get
+            {
+                return this.items.IsReadOnly;
+            }
+        }
+
+        object IList.this[int index]
+        {
+            get
+            {
+                OnCollectionReadAccess();
+                return this.items[index];
+            }
+            set
+            {
+                VerifyValueType(value);
+                this[index] = (T)value;
+            }
+        }
+        /// <summary>
+        /// Occurs when collection is read.
+        /// </summary>
+        protected virtual void OnCollectionReadAccess()
+        {
+        }
+        /// <summary>
+        /// Occurs when collection property has changed.
+        /// </summary>
+        /// <param name="e">Event arguments.</param>
+        protected virtual void OnPropertyChanged(PropertyChangedEventArgs e)
+        {
+            if (this.PropertyChanged != null)
+            {
+                this.PropertyChanged(this, e);
+            }
+        }
+
+        private string CountString
+        {
+            get { return "Count"; }
+        }
+        private string ItemString
+        {
+            get { return "Item[]"; }
+        }
+        /// <summary>
+        /// Blocks the collection re-entrancy.
+        /// </summary>
+        /// <returns>IDisposable to end re-entrancy</returns>
+        protected IDisposable BlockReentrancy()
+        {
+            this._monitor.Enter();
+            return this._monitor;
+        }
+        /// <summary>
+        /// Checks whether call creates re-entrancy.
+        /// </summary>
+        protected void CheckReentrancy()
+        {
+            if ((this._monitor.Busy && (this.CollectionChanged != null)) && (this.CollectionChanged.GetInvocationList().Length > 1))
+            {
+                throw new InvalidOperationException("CustomCollectionReentrancyNotAllowed");
+            }
+        }
+
+
+        #region SimpleMonitor
+        [Serializable]
+        private class SimpleMonitor<TY> : IDisposable
+        {
+            // Fields
+            private int _busyCount;
+
+            // Methods
+            public void Dispose()
+            {
+                this._busyCount--;
+            }
+
+            public void Enter()
+            {
+                this._busyCount++;
+            }
+
+            // Properties
+            public bool Busy
+            {
+                get
+                {
+                    return (this._busyCount > 0);
+                }
+            }
+        }
+        #endregion
+
+        #endregion
+
+        #region INotifyCollectionChanged Members
+        /// <summary>
+        /// Occurs when collection has changed.
+        /// </summary>
+        public event NotifyCollectionChangedEventHandler CollectionChanged;
+
+        private void OnCollectionChanged(NotifyCollectionChangedAction action, object item, int index)
+        {
+            this.OnCollectionChanged(new NotifyCollectionChangedEventArgs(action, item, index));
+        }
+
+        private void OnCollectionChanged(NotifyCollectionChangedAction action, object item, int index, int oldIndex)
+        {
+            this.OnCollectionChanged(new NotifyCollectionChangedEventArgs(action, item, index, oldIndex));
+        }
+
+        private void OnCollectionChanged(NotifyCollectionChangedAction action, object oldItem, object newItem, int index)
+        {
+            this.OnCollectionChanged(new NotifyCollectionChangedEventArgs(action, newItem, oldItem, index));
+        }
+
+        private void OnCollectionReset()
+        {
+            this.OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset));
+        }
+
+        /// <summary>
+        /// Called when collection has changed.
+        /// </summary>
+        /// <param name="e">Event arguments.</param>
+        protected virtual void OnCollectionChanged(NotifyCollectionChangedEventArgs e)
+        {
+            if (this.CollectionChanged != null)
+            {
+                using (this.BlockReentrancy())
+                {
+                    this.CollectionChanged(this, e);
+                }
+            }
+        }
+        #endregion
+    }
+
+    #region INotifyCollectionChanged
+    /// <summary>
+    /// Represents collection changed notification interface.
+    /// </summary>
+    public interface INotifyCollectionChanged
+    {
+        /// <summary>
+        /// Occurs when collection changed.
+        /// </summary>
+        event NotifyCollectionChangedEventHandler CollectionChanged;
+    }
+    /// <summary>
+    /// Defines change actions.
+    /// </summary>
+    public enum NotifyCollectionChangedAction
+    {
+        /// <summary>
+        /// Items were added.
+        /// </summary>
+        Add,
+        /// <summary>
+        /// Items were removed.
+        /// </summary>
+        Remove,
+        /// <summary>
+        /// Items were replaced.
+        /// </summary>
+        Replace,
+        /// <summary>
+        /// Items were moved.
+        /// </summary>
+        Move,
+        /// <summary>
+        /// Collection was reset.
+        /// </summary>
+        Reset
+    }
+    /// <summary>
+    /// Defines delegate for collection notification events.
+    /// </summary>
+    /// <param name="sender">Event sender.</param>
+    /// <param name="e">Event arguments.</param>
+    public delegate void NotifyCollectionChangedEventHandler(object sender, NotifyCollectionChangedEventArgs e);
+    /// <summary>
+    /// Defines collection change notification event arguments.
+    /// </summary>
+    public class NotifyCollectionChangedEventArgs : EventArgs
+    {
+        #region Private Vars
+        private NotifyCollectionChangedAction _action;
+        private IList _newItems;
+        private int _newStartingIndex;
+        private IList _oldItems;
+        private int _oldStartingIndex;
+        #endregion
+
+        /// <summary>
+        /// Create new instance of object.
+        /// </summary>
+        /// <param name="action">Action</param>
+        public NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction action)
+        {
+            this._newStartingIndex = -1;
+            this._oldStartingIndex = -1;
+            if (action != NotifyCollectionChangedAction.Reset)
+            {
+                throw new ArgumentException("WrongActionForCtor");
+            }
+            this.InitializeAdd(action, null, -1);
+        }
+        /// <summary>
+        /// Creates new instance of object.
+        /// </summary>
+        /// <param name="action">Specifies action.</param>
+        /// <param name="changedItems">List of changed items.</param>
+        public NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction action, IList changedItems)
+        {
+            this._newStartingIndex = -1;
+            this._oldStartingIndex = -1;
+            if (((action != NotifyCollectionChangedAction.Add) && (action != NotifyCollectionChangedAction.Remove)) && (action != NotifyCollectionChangedAction.Reset))
+            {
+                throw new ArgumentException("MustBeResetAddOrRemoveActionForCtor");
+            }
+            if (action == NotifyCollectionChangedAction.Reset)
+            {
+                if (changedItems != null)
+                {
+                    throw new ArgumentException("ResetActionRequiresNullItem");
+                }
+                this.InitializeAdd(action, null, -1);
+            }
+            else
+            {
+                if (changedItems == null)
+                {
+                    throw new ArgumentNullException("changedItems");
+                }
+                this.InitializeAddOrRemove(action, changedItems, -1);
+            }
+        }
+        /// <summary>
+        /// Creates new instance of object.
+        /// </summary>
+        /// <param name="action">Specifies action.</param>
+        /// <param name="changedItem">Item that was changed.</param>
+        public NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction action, object changedItem)
+        {
+            this._newStartingIndex = -1;
+            this._oldStartingIndex = -1;
+            if (((action != NotifyCollectionChangedAction.Add) && (action != NotifyCollectionChangedAction.Remove)) && (action != NotifyCollectionChangedAction.Reset))
+            {
+                throw new ArgumentException("MustBeResetAddOrRemoveActionForCtor");
+            }
+            if (action == NotifyCollectionChangedAction.Reset)
+            {
+                if (changedItem != null)
+                {
+                    throw new ArgumentException("ResetActionRequiresNullItem");
+                }
+                this.InitializeAdd(action, null, -1);
+            }
+            else
+            {
+                this.InitializeAddOrRemove(action, new object[] { changedItem }, -1);
+            }
+        }
+
+        /// <summary>
+        /// Creates new instance of object.
+        /// </summary>
+        /// <param name="action">Action.</param>
+        /// <param name="newItems">New items in collection.</param>
+        /// <param name="oldItems">Old items in collection.</param>
+        public NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction action, IList newItems, IList oldItems)
+        {
+            this._newStartingIndex = -1;
+            this._oldStartingIndex = -1;
+            if (action != NotifyCollectionChangedAction.Replace)
+            {
+                throw new ArgumentException("WrongActionForCtor");
+            }
+            if (newItems == null)
+            {
+                throw new ArgumentNullException("newItems");
+            }
+            if (oldItems == null)
+            {
+                throw new ArgumentNullException("oldItems");
+            }
+            this.InitializeMoveOrReplace(action, newItems, oldItems, -1, -1);
+        }
+        /// <summary>
+        /// Creates new instance of object.
+        /// </summary>
+        /// <param name="action">Action.</param>
+        /// <param name="changedItems">List of changed items.</param>
+        /// <param name="startingIndex">Starting index of change.</param>
+        public NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction action, IList changedItems, int startingIndex)
+        {
+            this._newStartingIndex = -1;
+            this._oldStartingIndex = -1;
+            if (((action != NotifyCollectionChangedAction.Add) && (action != NotifyCollectionChangedAction.Remove)) && (action != NotifyCollectionChangedAction.Reset))
+            {
+                throw new ArgumentException("MustBeResetAddOrRemoveActionForCtor");
+            }
+            if (action == NotifyCollectionChangedAction.Reset)
+            {
+                if (changedItems != null)
+                {
+                    throw new ArgumentException("ResetActionRequiresNullItem");
+                }
+                if (startingIndex != -1)
+                {
+                    throw new ArgumentException("ResetActionRequiresIndexMinus1");
+                }
+                this.InitializeAdd(action, null, -1);
+            }
+            else
+            {
+                if (changedItems == null)
+                {
+                    throw new ArgumentNullException("changedItems");
+                }
+                if (startingIndex < -1)
+                {
+                    throw new ArgumentException("IndexCannotBeNegative");
+                }
+                this.InitializeAddOrRemove(action, changedItems, startingIndex);
+            }
+        }
+        /// <summary>
+        /// Creates new instance of object.
+        /// </summary>
+        /// <param name="action">Action</param>
+        /// <param name="changedItem">Changed item</param>
+        /// <param name="index">Index of change</param>
+        public NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction action, object changedItem, int index)
+        {
+            this._newStartingIndex = -1;
+            this._oldStartingIndex = -1;
+            if (((action != NotifyCollectionChangedAction.Add) && (action != NotifyCollectionChangedAction.Remove)) && (action != NotifyCollectionChangedAction.Reset))
+            {
+                throw new ArgumentException("MustBeResetAddOrRemoveActionForCtor");
+            }
+            if (action == NotifyCollectionChangedAction.Reset)
+            {
+                if (changedItem != null)
+                {
+                    throw new ArgumentException("ResetActionRequiresNullItem");
+                }
+                if (index != -1)
+                {
+                    throw new ArgumentException("ResetActionRequiresIndexMinus1");
+                }
+                this.InitializeAdd(action, null, -1);
+            }
+            else
+            {
+                this.InitializeAddOrRemove(action, new object[] { changedItem }, index);
+            }
+        }
+        /// <summary>
+        /// Creates new instance of object.
+        /// </summary>
+        /// <param name="action">Action</param>
+        /// <param name="newItem">New item</param>
+        /// <param name="oldItem">Old item</param>
+        public NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction action, object newItem, object oldItem)
+        {
+            this._newStartingIndex = -1;
+            this._oldStartingIndex = -1;
+            if (action != NotifyCollectionChangedAction.Replace)
+            {
+                throw new ArgumentException("WrongActionForCtor");
+            }
+            this.InitializeMoveOrReplace(action, new object[] { newItem }, new object[] { oldItem }, -1, -1);
+        }
+        /// <summary>
+        /// Creates new instance of object.
+        /// </summary>
+        /// <param name="action">Action</param>
+        /// <param name="newItems">New items.</param>
+        /// <param name="oldItems">Removed items.</param>
+        /// <param name="startingIndex">Starting index of change.</param>
+        public NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction action, IList newItems, IList oldItems, int startingIndex)
+        {
+            this._newStartingIndex = -1;
+            this._oldStartingIndex = -1;
+            if (action != NotifyCollectionChangedAction.Replace)
+            {
+                throw new ArgumentException("WrongActionForCtor");
+            }
+            if (newItems == null)
+            {
+                throw new ArgumentNullException("newItems");
+            }
+            if (oldItems == null)
+            {
+                throw new ArgumentNullException("oldItems");
+            }
+            this.InitializeMoveOrReplace(action, newItems, oldItems, startingIndex, startingIndex);
+        }
+        /// <summary>
+        /// Creates new instance of object.
+        /// </summary>
+        /// <param name="action">Action</param>
+        /// <param name="changedItems">Changed items</param>
+        /// <param name="index">New index</param>
+        /// <param name="oldIndex">Old index</param>
+        public NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction action, IList changedItems, int index, int oldIndex)
+        {
+            this._newStartingIndex = -1;
+            this._oldStartingIndex = -1;
+            if (action != NotifyCollectionChangedAction.Move)
+            {
+                throw new ArgumentException("WrongActionForCtor");
+            }
+            if (index < 0)
+            {
+                throw new ArgumentException("IndexCannotBeNegative");
+            }
+            this.InitializeMoveOrReplace(action, changedItems, changedItems, index, oldIndex);
+        }
+        /// <summary>
+        /// Creates new instance of object.
+        /// </summary>
+        /// <param name="action">Action</param>
+        /// <param name="changedItem">Changed item</param>
+        /// <param name="index">New index</param>
+        /// <param name="oldIndex">Old index</param>
+        public NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction action, object changedItem, int index, int oldIndex)
+        {
+            this._newStartingIndex = -1;
+            this._oldStartingIndex = -1;
+            if (action != NotifyCollectionChangedAction.Move)
+            {
+                throw new ArgumentException("WrongActionForCtor");
+            }
+            if (index < 0)
+            {
+                throw new ArgumentException("IndexCannotBeNegative");
+            }
+            object[] newItems = new object[] { changedItem };
+            this.InitializeMoveOrReplace(action, newItems, newItems, index, oldIndex);
+        }
+        /// <summary>
+        /// Creates new instance of object.
+        /// </summary>
+        /// <param name="action">Action.</param>
+        /// <param name="newItem">New item</param>
+        /// <param name="oldItem">Old item</param>
+        /// <param name="index">New index</param>
+        public NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction action, object newItem, object oldItem, int index)
+        {
+            this._newStartingIndex = -1;
+            this._oldStartingIndex = -1;
+            if (action != NotifyCollectionChangedAction.Replace)
+            {
+                throw new ArgumentException("WrongActionForCtor");
+            }
+            this.InitializeMoveOrReplace(action, new object[] { newItem }, new object[] { oldItem }, index, index);
+        }
+
+        private void InitializeAdd(NotifyCollectionChangedAction action, IList newItems, int newStartingIndex)
+        {
+            this._action = action;
+            this._newItems = (newItems == null) ? null : ArrayList.ReadOnly(newItems);
+            this._newStartingIndex = newStartingIndex;
+        }
+
+        private void InitializeAddOrRemove(NotifyCollectionChangedAction action, IList changedItems, int startingIndex)
+        {
+            if (action == NotifyCollectionChangedAction.Add)
+            {
+                this.InitializeAdd(action, changedItems, startingIndex);
+            }
+            else if (action == NotifyCollectionChangedAction.Remove)
+            {
+                this.InitializeRemove(action, changedItems, startingIndex);
+            }
+            else
+            {
+                //Invariant.Assert(false, "Unsupported action: {0}", action.ToString());
+            }
+        }
+
+        private void InitializeMoveOrReplace(NotifyCollectionChangedAction action, IList newItems, IList oldItems, int startingIndex, int oldStartingIndex)
+        {
+            this.InitializeAdd(action, newItems, startingIndex);
+            this.InitializeRemove(action, oldItems, oldStartingIndex);
+        }
+
+        private void InitializeRemove(NotifyCollectionChangedAction action, IList oldItems, int oldStartingIndex)
+        {
+            this._action = action;
+            this._oldItems = (oldItems == null) ? null : ArrayList.ReadOnly(oldItems);
+            this._oldStartingIndex = oldStartingIndex;
+        }
+
+        /// <summary>
+        /// Gets the type of the collection change action.
+        /// </summary>
+        public NotifyCollectionChangedAction Action
+        {
+            get
+            {
+                return this._action;
+            }
+        }
+        /// <summary>
+        /// Gets list of newly added items.
+        /// </summary>
+        public IList NewItems
+        {
+            get
+            {
+                return this._newItems;
+            }
+        }
+        /// <summary>
+        /// Gets new starting index.
+        /// </summary>
+        public int NewStartingIndex
+        {
+            get
+            {
+                return this._newStartingIndex;
+            }
+        }
+        /// <summary>
+        /// Gets list of removed items.
+        /// </summary>
+        public IList OldItems
+        {
+            get
+            {
+                return this._oldItems;
+            }
+        }
+        /// <summary>
+        /// Old starting index.
+        /// </summary>
+        public int OldStartingIndex
+        {
+            get
+            {
+                return this._oldStartingIndex;
+            }
+        }
+    }
+    #endregion
+
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/RecurrenceGenerator.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/RecurrenceGenerator.cs
new file mode 100644
index 00000000..c64e70c1
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/RecurrenceGenerator.cs	
@@ -0,0 +1,600 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Globalization;
+
+namespace DevComponents.Schedule.Model
+{
+    internal class RecurrenceGenerator : IRecurrenceGenerator
+    {
+
+        #region IRecurrenceGenerator Members
+
+        /// <summary>
+        /// Generates Daily recurring appointments. If appointment is assigned to calendar method must populate the Calendar.Appointments collection as well.
+        /// </summary>
+        /// <param name="subsetCollection">Collection to add generated recurrences to</param>
+        /// <param name="recurrence">Recurrence description, must be of Daily recurrence type.</param>
+        /// <param name="startDate">Start date for generation.</param>
+        /// <param name="endDate">End date for generation.</param>
+        public void GenerateDailyRecurrence(AppointmentSubsetCollection subsetCollection, AppointmentRecurrence recurrence, DateTime startDate, DateTime endDate)
+        {
+            Appointment app = recurrence.Appointment;
+            int appointmentDaysDuration = recurrence.Daily.ExplicitDailyRecurrence ? 0 : (int)Math.Max(0, Math.Ceiling(app.EndTime.Date.Subtract(app.StartTime.Date).TotalDays));
+            DateTime recurrenceStartDate = DateTimeHelper.MaxDate(recurrence.RecurrenceStartDate,
+                recurrence.Daily.ExplicitDailyRecurrence ? (app.StartTime.AddDays(1).Date) : (DateTimeHelper.IsBeginningOfDay(app.EndTime) ? app.EndTime : app.EndTime.AddDays(recurrence.Daily.RepeatInterval).Date));
+
+            if (recurrenceStartDate > endDate) return;
+
+            int repeats = 0;
+
+            // Check the range first
+            if (recurrence.RangeLimitType == eRecurrenceRangeLimitType.RangeEndDate)
+            {
+                if (startDate > recurrence.RangeEndDate) return;
+            }
+            else if (recurrence.RangeLimitType == eRecurrenceRangeLimitType.RangeNumberOfOccurrences)
+            {
+                DateTime rangeStartDate = DateTimeHelper.MaxDate(recurrence.RecurrenceStartDate,
+                    recurrence.Daily.ExplicitDailyRecurrence ? (app.LocalStartTime.AddDays(1).Date) : (DateTimeHelper.IsBeginningOfDay(app.LocalEndTime) ? app.LocalEndTime : app.LocalEndTime.AddDays(recurrence.Daily.RepeatInterval).Date));
+                int totalDays = (int)Math.Ceiling(startDate.Subtract(rangeStartDate).TotalDays);
+
+                switch (recurrence.Daily.RepeatOnDaysOfWeek)
+                {
+                    case eDailyRecurrenceRepeat.All:
+                        repeats = Math.Max(0, totalDays / (recurrence.Daily.RepeatInterval + appointmentDaysDuration));
+
+                        if (repeats >= recurrence.RangeNumberOfOccurrences)
+                            return;
+                        break;
+
+                    case eDailyRecurrenceRepeat.WeekDays:
+                        repeats = Math.Max(0, DateTimeHelper.TotalWeekDays(recurrenceStartDate, startDate) / (recurrence.Daily.RepeatInterval + appointmentDaysDuration));
+
+                        // Assume weekdays repeat
+                        if (repeats > recurrence.RangeNumberOfOccurrences)
+                            return;
+                        break;
+
+                    default:
+                        repeats = Math.Max(0, DateTimeHelper.TotalWeekDays(recurrenceStartDate, startDate));
+                        repeats = Math.Max(0, totalDays - repeats);
+
+                        // Assume weekend days repeat
+                        if (repeats > recurrence.RangeNumberOfOccurrences)
+                            return;
+                        break;
+                }
+
+                //repeats = 0;
+            }
+
+            DateTime currentDay = recurrenceStartDate; // DateTimeHelper.MaxDate(startDate, recurrenceStartDate);
+
+            while (currentDay <= endDate)
+            {
+                if (currentDay >= startDate || currentDay < startDate && IsRecurringOnDay(currentDay, startDate, endDate, app))
+                {
+                    if (!IsRecurringOnDay(currentDay, startDate, endDate, app)) break;
+                    if (recurrence.Daily.RepeatOnDaysOfWeek == eDailyRecurrenceRepeat.All ||
+                        (recurrence.Daily.RepeatOnDaysOfWeek == eDailyRecurrenceRepeat.WeekDays && !DateTimeHelper.IsWeekendDay(currentDay)) ||
+                        (recurrence.Daily.RepeatOnDaysOfWeek == eDailyRecurrenceRepeat.WeekendDays && DateTimeHelper.IsWeekendDay(currentDay)))
+                    {
+                        if (!IsIgnoredRecurrence(currentDay, recurrence))
+                        {
+                            subsetCollection.Add(CreateRecurringAppointmentInstance(currentDay, app));
+                            repeats++;
+                        }
+                    }
+                }
+
+                switch (recurrence.Daily.RepeatOnDaysOfWeek)
+                {
+                    case eDailyRecurrenceRepeat.All:
+                        currentDay = currentDay.AddDays(recurrence.Daily.RepeatInterval + appointmentDaysDuration);
+                        break;
+
+                    case eDailyRecurrenceRepeat.WeekDays:
+                        //currentDay = currentDay.AddDays(currentDay.DayOfWeek == DayOfWeek.Saturday ? 2 : Math.Max(1, recurrence.Daily.RepeatInterval + appointmentDaysDuration));
+                        currentDay = currentDay.AddDays(Math.Max(1, recurrence.Daily.RepeatInterval + appointmentDaysDuration)); // Changed for consistency
+                        break;
+
+                    case eDailyRecurrenceRepeat.WeekendDays:
+                        while (true)
+                        {
+                            currentDay = currentDay.AddDays(1);
+
+                            if (DateTimeHelper.IsWeekendDay(currentDay) == true)
+                                break;
+                        }
+                        break;
+                }
+
+                if (recurrence.RangeLimitType == eRecurrenceRangeLimitType.RangeEndDate && currentDay >= recurrence.RangeEndDate ||
+                    recurrence.RangeLimitType == eRecurrenceRangeLimitType.RangeNumberOfOccurrences && repeats >= recurrence.RangeNumberOfOccurrences)
+                    break;
+            }
+        }
+
+        private static bool IsIgnoredRecurrence(DateTime currentDay, AppointmentRecurrence recurrence)
+        {
+            if (recurrence.SkippedRecurrences.Count == 0) return false;
+            foreach (DateTime date in recurrence.SkippedRecurrences)
+            {
+                if (date.Date == currentDay.Date)
+                    return true;
+            }
+            return false;
+        }
+
+        private bool IsRecurringOnDay(DateTime currentDay, DateTime rangeStart, DateTime rangeEnd, Appointment rootAppointment)
+        {
+            TimeSpan duration = rootAppointment.EndTime.Subtract(rootAppointment.StartTime);
+            DateTime startTime = rootAppointment.GetValidDateTime(new DateTime(currentDay.Year, currentDay.Month, currentDay.Day, rootAppointment.StartTime.Hour, rootAppointment.StartTime.Minute, 0));
+            DateTime endTime = rootAppointment.GetValidDateTime(startTime.Add(duration));
+
+            DateTime localStartTime = rootAppointment.GetLocalDateTime(rootAppointment.GetUTCDateTime(startTime));
+            DateTime localEndTime = rootAppointment.GetLocalDateTime(rootAppointment.GetUTCDateTime(endTime));
+
+            // If time-zone is not used return false
+            //if (startTime == localStartTime) return currentDay >= rangeStart;
+
+            return DateTimeHelper.TimePeriodsOverlap(localStartTime, localEndTime, rangeStart, rangeEnd);
+        }
+
+        private DateTime GetAppointmentEndTime(DateTime currentDay, Appointment rootAppointment)
+        {
+            TimeSpan duration = rootAppointment.EndTime.Subtract(rootAppointment.StartTime);
+            DateTime startTime = rootAppointment.GetValidDateTime(new DateTime(currentDay.Year, currentDay.Month, currentDay.Day, rootAppointment.StartTime.Hour, rootAppointment.StartTime.Minute, 0));
+            DateTime endTime = rootAppointment.GetValidDateTime(startTime.Add(duration));
+
+            return endTime;
+        }
+
+        private Appointment CreateRecurringAppointmentInstance(DateTime currentDay, Appointment rootAppointment)
+        {
+            Appointment app = rootAppointment.Copy();
+            TimeSpan duration = rootAppointment.EndTime.Subtract(rootAppointment.StartTime);
+            DateTime startTime = app.GetValidDateTime(new DateTime(currentDay.Year, currentDay.Month, currentDay.Day, rootAppointment.StartTime.Hour, rootAppointment.StartTime.Minute, 0));
+            DateTime endTime = app.GetValidDateTime(startTime.Add(duration));
+
+            app.StartTime = startTime;
+            app.EndTime = endTime;
+            app.IsRecurringInstance = true;
+            app.RootAppointment = rootAppointment;
+            app.Tooltip = rootAppointment.Tooltip;
+            if (rootAppointment.Recurrence == null || !rootAppointment.Recurrence.IndependentVisibility)
+                app.Visible = rootAppointment.Visible;
+
+            foreach (Reminder reminder in app.Reminders)
+            {
+                //reminder.ReminderTime = app.StartTime.Add(reminder.ReminderTime.Subtract(rootAppointment.StartTime));
+                reminder.IsActive = true;
+            }
+
+            return app;
+        }
+
+        /// <summary>
+        /// Generates Weekly recurring appointments. If appointment is assigned to calendar method must populate the Calendar.Appointments collection as well.
+        /// </summary>
+        /// <param name="subsetCollection">Collection to add generated recurrences to</param>
+        /// <param name="recurrence">Recurrence description, must be of Weekly recurrence type.</param>
+        /// <param name="startDate">Start date for generation.</param>
+        /// <param name="endDate">End date for generation.</param>
+        public void GenerateWeeklyRecurrence(AppointmentSubsetCollection subsetCollection, AppointmentRecurrence recurrence, DateTime startDate, DateTime endDate)
+        {
+            Appointment app = recurrence.Appointment;
+
+            DateTime baseStartDate = app.EndTime.Date;
+            if (app.EndTime.Date > app.StartTime.Date && app.EndTime.TimeOfDay > app.StartTime.TimeOfDay && baseStartDate != DateTime.MinValue)
+                baseStartDate = baseStartDate.AddDays(1);
+            DateTime recurrenceStartDate = baseStartDate;
+            int repeatInterval = recurrence.Weekly.RepeatInterval;
+
+            if (RepeatsOnSingleDayOnly(recurrence.Weekly.RepeatOnDaysOfWeek) && !(app.StartTime.Date == startDate.Date && endDate.Date == startDate.Date))
+            {
+                recurrenceStartDate = baseStartDate.AddMilliseconds(-1).AddDays((repeatInterval) * 7 /*+ (recurrence.Weekly.RepeatInterval > 1 ? (8 - (int)baseStartDate.DayOfWeek) : 1)*/).Date;
+                if (recurrenceStartDate.DayOfWeek != GetDayOfWeek(recurrence.Weekly.RepeatOnDaysOfWeek))
+                {
+                    DayOfWeek dayOfWeek = GetDayOfWeek(recurrence.Weekly.RepeatOnDaysOfWeek);
+                    while (recurrenceStartDate.DayOfWeek != dayOfWeek)
+                        recurrenceStartDate = recurrenceStartDate.AddDays(1);
+                }
+            }
+            else
+            {
+                if (app.EndTime.Date > app.StartTime.Date && app.EndTime.TimeOfDay < app.StartTime.TimeOfDay)
+                    recurrenceStartDate = app.StartTime.Date.AddDays(1);
+                else
+                    recurrenceStartDate = app.EndTime.Date.AddDays(1);
+            }
+
+            recurrenceStartDate = DateTimeHelper.MaxDate(recurrence.RecurrenceStartDate, recurrenceStartDate);
+
+            if (recurrenceStartDate > endDate) return;
+
+            int totalRecurrences = 0;
+            // Check the range first
+            if (recurrence.RangeLimitType == eRecurrenceRangeLimitType.RangeEndDate)
+            {
+                if (startDate > recurrence.RangeEndDate) return;
+            }
+            else if (recurrence.RangeLimitType == eRecurrenceRangeLimitType.RangeNumberOfOccurrences && repeatInterval == 1)
+            {
+                int totalDays = (int)Math.Ceiling(endDate.Subtract(recurrenceStartDate).TotalDays);
+                int occurrencesPerWeek = GetNumberOfDays(recurrence.Weekly.RepeatOnDaysOfWeek);
+                if (occurrencesPerWeek == 0)
+                    throw new ArgumentException("Weekly recurrence must have at least single day selected using RepeatOnDaysOfWeek property.");
+                totalRecurrences = DateTimeHelper.TotalNumberOfDays(recurrenceStartDate, endDate, recurrence.Weekly.RepeatOnDaysOfWeek);
+                if (totalRecurrences > recurrence.RangeNumberOfOccurrences) return;
+            }
+
+            bool countTotalRecurrences = false;
+            if (repeatInterval > 1 && recurrence.RangeLimitType == eRecurrenceRangeLimitType.RangeNumberOfOccurrences)
+                countTotalRecurrences = true;
+
+            bool spansDays = app.StartTime.Day != app.EndTime.Day && endDate.Subtract(startDate).TotalDays <= 1;
+
+            DateTime currentDay = recurrenceStartDate;// DateTimeHelper.MaxDate(recurrenceStartDate, startDate);
+            while (currentDay <= endDate)
+            {
+                if ((currentDay >= startDate || spansDays && GetAppointmentEndTime(currentDay, app) >= startDate) && DateTimeHelper.HasDay(currentDay.DayOfWeek, recurrence.Weekly.RepeatOnDaysOfWeek) &&
+                    !IsIgnoredRecurrence(currentDay, recurrence))
+                {
+                    subsetCollection.Add(CreateRecurringAppointmentInstance(currentDay, app));
+                    totalRecurrences++;
+                }
+                else if (countTotalRecurrences && currentDay < startDate && DateTimeHelper.HasDay(currentDay.DayOfWeek, recurrence.Weekly.RepeatOnDaysOfWeek)
+                             && !IsIgnoredRecurrence(currentDay, recurrence))
+                {
+                    totalRecurrences++;
+                    if (totalRecurrences >= recurrence.RangeNumberOfOccurrences)
+                        return;
+                }
+
+                if (currentDay.DayOfWeek != DayOfWeek.Sunday)
+                {
+                    while (currentDay.DayOfWeek != DayOfWeek.Sunday)
+                    {
+                        currentDay = currentDay.AddDays(1);
+                        if (currentDay > endDate || recurrence.RangeLimitType == eRecurrenceRangeLimitType.RangeEndDate && currentDay > recurrence.RangeEndDate)
+                            break;
+                        if ((currentDay >= startDate || spansDays && GetAppointmentEndTime(currentDay, app) >= startDate) && DateTimeHelper.HasDay(currentDay.DayOfWeek, recurrence.Weekly.RepeatOnDaysOfWeek)
+                             && !IsIgnoredRecurrence(currentDay, recurrence))
+                        {
+                            subsetCollection.Add(CreateRecurringAppointmentInstance(currentDay, app));
+                        }
+                        else if (countTotalRecurrences && currentDay < startDate && DateTimeHelper.HasDay(currentDay.DayOfWeek, recurrence.Weekly.RepeatOnDaysOfWeek)
+                             && !IsIgnoredRecurrence(currentDay, recurrence))
+                        {
+                            totalRecurrences++;
+                            if (totalRecurrences >= recurrence.RangeNumberOfOccurrences)
+                                return;
+                        }
+                    }
+                }
+                currentDay = currentDay.AddDays(1 + (repeatInterval - 1) * 7);
+                if (recurrence.RangeLimitType == eRecurrenceRangeLimitType.RangeEndDate && currentDay > recurrence.RangeEndDate ||
+                    recurrence.RangeLimitType == eRecurrenceRangeLimitType.RangeNumberOfOccurrences && totalRecurrences > recurrence.RangeNumberOfOccurrences)
+                    break;
+            }
+        }
+
+        private DayOfWeek GetDayOfWeek(eDayOfWeekRecurrence d)
+        {
+            if (d == eDayOfWeekRecurrence.Monday)
+                return DayOfWeek.Monday;
+            else if (d == eDayOfWeekRecurrence.Tuesday)
+                return DayOfWeek.Tuesday;
+            else if (d == eDayOfWeekRecurrence.Wednesday)
+                return DayOfWeek.Wednesday;
+            else if (d == eDayOfWeekRecurrence.Thursday)
+                return DayOfWeek.Thursday;
+            else if (d == eDayOfWeekRecurrence.Friday)
+                return DayOfWeek.Friday;
+            else if (d == eDayOfWeekRecurrence.Saturday)
+                return DayOfWeek.Saturday;
+            else
+                return DayOfWeek.Sunday;
+        }
+
+        private bool RepeatsOnSingleDayOnly(eDayOfWeekRecurrence dow)
+        {
+            return dow == eDayOfWeekRecurrence.Monday || dow == eDayOfWeekRecurrence.Tuesday ||
+                dow == eDayOfWeekRecurrence.Wednesday || dow == eDayOfWeekRecurrence.Thursday ||
+                dow == eDayOfWeekRecurrence.Friday || dow == eDayOfWeekRecurrence.Saturday || dow == eDayOfWeekRecurrence.Sunday;
+        }
+
+        private int GetNumberOfDays(eDayOfWeekRecurrence daysOfWeek)
+        {
+            int days = 0;
+            if ((daysOfWeek & eDayOfWeekRecurrence.Friday) != 0)
+                days++;
+            if ((daysOfWeek & eDayOfWeekRecurrence.Monday) != 0)
+                days++;
+            if ((daysOfWeek & eDayOfWeekRecurrence.Saturday) != 0)
+                days++;
+            if ((daysOfWeek & eDayOfWeekRecurrence.Sunday) != 0)
+                days++;
+            if ((daysOfWeek & eDayOfWeekRecurrence.Thursday) != 0)
+                days++;
+            if ((daysOfWeek & eDayOfWeekRecurrence.Tuesday) != 0)
+                days++;
+            if ((daysOfWeek & eDayOfWeekRecurrence.Wednesday) != 0)
+                days++;
+
+            return days;
+        }
+
+        /// <summary>
+        /// Generates Monthly recurring appointments. If appointment is assigned to calendar method must populate the Calendar.Appointments collection as well.
+        /// </summary>
+        /// <param name="subsetCollection">Collection to add generated recurrences to</param>
+        /// <param name="recurrence">Recurrence description, must be of Monthly recurrence type.</param>
+        /// <param name="startDate">Start date for generation.</param>
+        /// <param name="endDate">End date for generation.</param>
+        public void GenerateMonthlyRecurrence(AppointmentSubsetCollection subsetCollection, AppointmentRecurrence recurrence, DateTime startDate, DateTime endDate)
+        {
+            Appointment app = recurrence.Appointment;
+            DateTime recurrenceStartDate = DateTimeHelper.MaxDate(recurrence.RecurrenceStartDate, app.EndTime/*.AddDays(1).Date*/);
+            if (recurrenceStartDate > endDate) return;
+
+            int totalRecurrences = 0;
+            // Check the range first
+            if (recurrence.RangeLimitType == eRecurrenceRangeLimitType.RangeEndDate)
+            {
+                if (startDate > recurrence.RangeEndDate) return;
+            }
+            else if (recurrence.RangeLimitType == eRecurrenceRangeLimitType.RangeNumberOfOccurrences && recurrence.RangeNumberOfOccurrences > 0)
+            {
+                int count = recurrence.RangeNumberOfOccurrences + 1;
+                DateTime testDate = DateTimeHelper.BeginningOfDay(recurrenceStartDate);
+                DateTime startDateOnly = DateTimeHelper.BeginningOfDay(startDate);
+                while (count > 0 && testDate < startDateOnly)
+                {
+                    int repeatInterval = recurrence.Monthly.RepeatInterval;
+                    while (repeatInterval > 0)
+                    {
+                        testDate = GetNextMonthlyRecurrence(recurrence, testDate);
+                        repeatInterval--;
+                    }
+                    if (testDate < startDate)
+                        totalRecurrences++;
+                    count--;
+                }
+                if (count == 0) return;
+            }
+
+            DateTime currentDate = recurrenceStartDate;// DateTimeHelper.MaxDate(recurrenceStartDate, startDate).AddMonths(-1);
+
+            do
+            {
+                int repeatCount = recurrence.Monthly.RepeatInterval;
+                do
+                {
+                    repeatCount--;
+                    currentDate = GetNextMonthlyRecurrence(recurrence, currentDate);
+                } while (repeatCount > 0);
+
+                if (recurrence.RangeLimitType == eRecurrenceRangeLimitType.RangeEndDate && currentDate > recurrence.RangeEndDate ||
+                    recurrence.RangeLimitType == eRecurrenceRangeLimitType.RangeNumberOfOccurrences && totalRecurrences >= recurrence.RangeNumberOfOccurrences)
+                    break;
+
+                if (currentDate >= startDate && currentDate <= endDate && !IsIgnoredRecurrence(currentDate, recurrence))
+                {
+                    subsetCollection.Add(CreateRecurringAppointmentInstance(currentDate, app));
+                    totalRecurrences++;
+                }
+            } while (currentDate <= endDate);
+        }
+
+        private DateTime GetNextMonthlyRecurrence(AppointmentRecurrence recurrence, DateTime startDate)
+        {
+            MonthlyRecurrenceSettings monthly = recurrence.Monthly;
+            return GetNextMonthlyRecurrence(startDate, monthly.RepeatOnRelativeDayInMonth,
+                monthly.RelativeDayOfWeek, monthly.RepeatOnDayOfMonth, monthly.RepeatOnMonths);
+        }
+
+        private static void AdjustForRepeatOnMonths(ref DateTime dt, eMonthRecurrence repeatOnMonths)
+        {
+            while (((int)Math.Pow(2, (dt.Month - 1)) & (int)repeatOnMonths) == 0)
+                dt = dt.AddMonths(1);
+        }
+        private static DateTime GetNextMonthlyRecurrence(DateTime startDate, eRelativeDayInMonth repeatOnRelativeDayInMonth, DayOfWeek relativeDayOfWeek, int repeatOnDayOfMonth, eMonthRecurrence repeatOnMonths)
+        {
+            Calendar cal = GetCalendar();
+
+            if (repeatOnRelativeDayInMonth == eRelativeDayInMonth.None)
+            {
+                DateTime dt = startDate.AddDays(cal.GetDaysInMonth(startDate.Year, startDate.Month) - startDate.Day + 1);
+                if (repeatOnMonths != eMonthRecurrence.All) AdjustForRepeatOnMonths(ref dt, repeatOnMonths); // Adjust for repeat on Months
+                return dt.AddDays(Math.Min(cal.GetDaysInMonth(dt.Year, dt.Month), repeatOnDayOfMonth) - 1);
+            }
+            else
+            {
+                if (repeatOnRelativeDayInMonth == eRelativeDayInMonth.First)
+                {
+                    DateTime dt = startDate.AddDays(cal.GetDaysInMonth(startDate.Year, startDate.Month) - startDate.Day + 1);
+                    if (repeatOnMonths != eMonthRecurrence.All) AdjustForRepeatOnMonths(ref dt, repeatOnMonths); // Adjust for repeat on Months
+                    while (dt.DayOfWeek != relativeDayOfWeek)
+                        dt = dt.AddDays(1);
+                    return dt;
+                }
+                else if (repeatOnRelativeDayInMonth == eRelativeDayInMonth.Last)
+                {
+                    DateTime dt = startDate.AddDays(cal.GetDaysInMonth(startDate.Year, startDate.Month) - startDate.Day + 1);
+                    if (repeatOnMonths != eMonthRecurrence.All) AdjustForRepeatOnMonths(ref dt, repeatOnMonths); // Adjust for repeat on Months
+                    dt = dt.AddDays(cal.GetDaysInMonth(dt.Year, dt.Month) - 1);
+                    while (dt.DayOfWeek != relativeDayOfWeek)
+                        dt = dt.AddDays(-1);
+                    return dt;
+                }
+                else
+                {
+                    // Second, third and forth
+                    int relCount = 2;
+                    if (repeatOnRelativeDayInMonth == eRelativeDayInMonth.Third)
+                        relCount = 3;
+                    else if (repeatOnRelativeDayInMonth == eRelativeDayInMonth.Fourth)
+                        relCount = 4;
+                    DateTime dt = startDate.AddDays(cal.GetDaysInMonth(startDate.Year, startDate.Month) - startDate.Day);
+                    if (repeatOnMonths != eMonthRecurrence.All) AdjustForRepeatOnMonths(ref dt, repeatOnMonths); // Adjust for repeat on Months
+                    while (relCount > 0)
+                    {
+                        dt = dt.AddDays(1);
+                        if (dt.DayOfWeek == relativeDayOfWeek)
+                            relCount--;
+                    }
+                    return dt;
+                }
+            }
+            throw new InvalidOperationException("Could not find the next relative date for monthly recurrence starting on " + startDate.ToString() + " RelativeDayInMonth=" + repeatOnRelativeDayInMonth.ToString() + " RelativeDayOfWeek=" + relativeDayOfWeek.ToString());
+        }
+
+        private static Calendar GetCalendar()
+        {
+            return CultureInfo.CurrentCulture.Calendar;
+        }
+
+        /// <summary>
+        /// Generates Yearly recurring appointments. If appointment is assigned to calendar method must populate the Calendar.Appointments collection as well.
+        /// </summary>
+        /// <param name="subsetCollection">Collection to add generated recurrences to</param>
+        /// <param name="recurrence">Recurrence description, must be of Monthly recurrence type.</param>
+        /// <param name="startDate">Start date for generation.</param>
+        /// <param name="endDate">End date for generation.</param>
+        public void GenerateYearlyRecurrence(AppointmentSubsetCollection subsetCollection, AppointmentRecurrence recurrence, DateTime startDate, DateTime endDate)
+        {
+            Appointment app = recurrence.Appointment;
+            DateTime recurrenceStartDate = DateTimeHelper.MaxDate(recurrence.RecurrenceStartDate, app.EndTime.AddDays(1).Date);
+            if (recurrenceStartDate > endDate) return;
+
+            if (!(startDate.Month <= recurrence.Yearly.RepeatOnMonth && endDate.Month >= recurrence.Yearly.RepeatOnMonth) && endDate.Subtract(startDate).TotalDays < 28)
+                return;
+            int totalRecurrences = 0;
+            // Check the range first
+            if (recurrence.RangeLimitType == eRecurrenceRangeLimitType.RangeEndDate)
+            {
+                if (startDate > recurrence.RangeEndDate) return;
+            }
+            else if (recurrence.RangeLimitType == eRecurrenceRangeLimitType.RangeNumberOfOccurrences && recurrence.RangeNumberOfOccurrences > 0 && recurrenceStartDate < startDate)
+            {
+                int count = recurrence.RangeNumberOfOccurrences + 1;
+                DateTime testDate = DateTimeHelper.BeginningOfDay(recurrenceStartDate.AddDays(-(recurrenceStartDate.Day - 1))).AddMonths(-1);
+                if (testDate < app.EndTime)
+                    testDate = app.EndTime.Date.AddDays(1);
+                DateTime startDateOnly = DateTimeHelper.BeginningOfDay(startDate);
+                while (count > 0 && testDate < startDateOnly)
+                {
+                    testDate = GetNextYearlyRecurrence(recurrence, testDate);
+                    if (testDate >= startDateOnly) break;
+                    count--;
+                    totalRecurrences++;
+                }
+                if (count == 0) return;
+            }
+
+            DateTime currentDate = DateTimeHelper.MaxDate(startDate, recurrenceStartDate).AddDays(-1);
+            if (recurrence.Yearly.RepeatInterval > 1)
+                currentDate = recurrenceStartDate;
+            do
+            {
+                currentDate = GetNextYearlyRecurrence(recurrence, currentDate);
+
+                if (recurrence.RangeLimitType == eRecurrenceRangeLimitType.RangeEndDate && currentDate > recurrence.RangeEndDate ||
+                    recurrence.RangeLimitType == eRecurrenceRangeLimitType.RangeNumberOfOccurrences && totalRecurrences >= recurrence.RangeNumberOfOccurrences)
+                    break;
+
+                if (currentDate >= startDate && currentDate <= endDate && !IsIgnoredRecurrence(currentDate, recurrence))
+                {
+                    subsetCollection.Add(CreateRecurringAppointmentInstance(currentDate, app));
+                    totalRecurrences++;
+                }
+            } while (currentDate <= endDate);
+        }
+        internal static DateTime GetNextYearlyRecurrence(AppointmentRecurrence recurrence, DateTime startDate)
+        {
+            YearlyRecurrenceSettings yearly = recurrence.Yearly;
+            if (yearly.RepeatInterval > 1)
+            {
+                DateTime currentDate = startDate;
+                for (int i = 0; i < yearly.RepeatInterval; i++)
+                {
+                    currentDate = GetNextSingleYearlyRecurrence(recurrence, currentDate);
+                }
+                return currentDate;
+            }
+            else
+            {
+                return GetNextSingleYearlyRecurrence(recurrence, startDate);
+            }
+        }
+        internal static DateTime GetNextSingleYearlyRecurrence(AppointmentRecurrence recurrence, DateTime startDate)
+        {
+            YearlyRecurrenceSettings yearly = recurrence.Yearly;
+            Calendar cal = GetCalendar();
+
+            if (startDate.Month < yearly.RepeatOnMonth)
+            {
+                startDate = startDate.AddMonths((yearly.RepeatOnMonth - startDate.Month) - 1);
+                return GetNextMonthlyRecurrence(startDate, yearly.RepeatOnRelativeDayInMonth, yearly.RelativeDayOfWeek, yearly.RepeatOnDayOfMonth, eMonthRecurrence.All);
+            }
+            else if (startDate.Month == yearly.RepeatOnMonth)
+            {
+                DateTime refDate = startDate.AddDays(-(startDate.Day));
+                DateTime ret = GetNextMonthlyRecurrence(refDate, yearly.RepeatOnRelativeDayInMonth, yearly.RelativeDayOfWeek, yearly.RepeatOnDayOfMonth, eMonthRecurrence.All);
+                if (ret > startDate) return ret;
+            }
+
+            // Forward to next year and right month
+            startDate = startDate.AddDays(cal.GetDaysInYear(startDate.Year) - startDate.DayOfYear).AddMonths(yearly.RepeatOnMonth - 1);
+            return GetNextMonthlyRecurrence(startDate, yearly.RepeatOnRelativeDayInMonth, yearly.RelativeDayOfWeek, yearly.RepeatOnDayOfMonth, eMonthRecurrence.All);
+        }
+
+        #endregion
+    }
+
+    internal interface IRecurrenceGenerator
+    {
+        /// <summary>
+        /// Generates Daily recurring appointments. If appointment is assigned to calendar method must populate the Calendar.Appointments collection as well.
+        /// </summary>
+        /// <param name="subsetCollection">Collection to add generated recurrences to</param>
+        /// <param name="recurrence">Recurrence description, must be of Daily recurrence type.</param>
+        /// <param name="startDate">Start date for generation.</param>
+        /// <param name="endDate">End date for generation.</param>
+        void GenerateDailyRecurrence(AppointmentSubsetCollection subsetCollection, AppointmentRecurrence recurrence, DateTime startDate, DateTime endDate);
+
+        /// <summary>
+        /// Generates Weekly recurring appointments. If appointment is assigned to calendar method must populate the Calendar.Appointments collection as well.
+        /// </summary>
+        /// <param name="subsetCollection">Collection to add generated recurrences to</param>
+        /// <param name="recurrence">Recurrence description, must be of Weekly recurrence type.</param>
+        /// <param name="startDate">Start date for generation.</param>
+        /// <param name="endDate">End date for generation.</param>
+        void GenerateWeeklyRecurrence(AppointmentSubsetCollection subsetCollection, AppointmentRecurrence recurrence, DateTime startDate, DateTime endDate);
+
+        /// <summary>
+        /// Generates Monthly recurring appointments. If appointment is assigned to calendar method must populate the Calendar.Appointments collection as well.
+        /// </summary>
+        /// <param name="subsetCollection">Collection to add generated recurrences to</param>
+        /// <param name="recurrence">Recurrence description, must be of Monthly recurrence type.</param>
+        /// <param name="startDate">Start date for generation.</param>
+        /// <param name="endDate">End date for generation.</param>
+        void GenerateMonthlyRecurrence(AppointmentSubsetCollection subsetCollection, AppointmentRecurrence recurrence, DateTime startDate, DateTime endDate);
+
+        /// <
+        /// summary>
+        /// Generates Yearly recurring appointments. If appointment is assigned to calendar method must populate the Calendar.Appointments collection as well.
+        /// </summary>
+        /// <param name="subsetCollection">Collection to add generated recurrences to</param>
+        /// <param name="recurrence">Recurrence description, must be of Monthly recurrence type.</param>
+        /// <param name="startDate">Start date for generation.</param>
+        /// <param name="endDate">End date for generation.</param>
+        void GenerateYearlyRecurrence(AppointmentSubsetCollection subsetCollection, AppointmentRecurrence recurrence, DateTime startDate, DateTime endDate);
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/Reminder.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/Reminder.cs
new file mode 100644
index 00000000..070de8c3
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/Reminder.cs	
@@ -0,0 +1,482 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel;
+
+namespace DevComponents.Schedule.Model
+{
+    /// <summary>
+    /// Represents an appointment reminder.
+    /// </summary>
+    public class Reminder
+    {
+        #region Private variables
+        private bool _NotificationRequestRegistered = false;
+
+        #endregion
+
+        #region Constructors
+        /// <summary>
+        /// Initializes a new instance of the Reminder class.
+        /// </summary>
+        public Reminder()
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the Reminder class.
+        /// </summary>
+        /// <param name="reminderTime"></param>
+        public Reminder(DateTime reminderTime)
+        {
+            ReminderTime = reminderTime;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the Reminder class.
+        /// </summary>
+        /// <param name="description"></param>
+        /// <param name="reminderTime"></param>
+        public Reminder(string description, DateTime reminderTime)
+        {
+            Description = description;
+            ReminderTime = reminderTime;
+        }
+        #endregion
+
+        #region Events
+        /// <summary>
+        /// Occurs when ReminderTime has been reached. Note that event handler will be called on the thread of System.Timer which is different
+        /// than UI thread. You should use BeginInvoke calls to marshal the calls to your UI thread.
+        /// </summary>
+        [Description("Occurs when ReminderTime has been reached.")]
+        public event ReminderEventHandler ReminderNotification;
+
+        #endregion
+
+        #region Internal Implementation
+        private bool _IsActiveForPastAppointments = true;
+        /// <summary>
+        /// Gets or sets whether reminder will be active for appointments that are in the past. Default value is true.
+        /// This property is useful if you are creating recurring appointments with reminders that start in past but don't want reminders
+        /// for past instances of appointment to be active.
+        /// </summary>
+        public bool IsActiveForPastAppointments
+        {
+            get { return _IsActiveForPastAppointments; }
+            set
+            {
+                if (value != _IsActiveForPastAppointments)
+                {
+                    bool oldValue = _IsActiveForPastAppointments;
+                    _IsActiveForPastAppointments = value;
+                    OnIsActiveForPastAppointmentsChanged(oldValue, value);
+                }
+            }
+        }
+
+        private void OnIsActiveForPastAppointmentsChanged(bool oldValue, bool newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("IsActiveForPastAppointments"));
+            ReminderCollection parentCollection = this.ParentCollection;
+            
+            if (parentCollection != null)
+            {
+                Appointment app = this.ParentCollection.Appointment;
+                if (app != null)
+                {
+                    UpdateNotifications();
+                }
+            }
+        }
+
+        private string _Description = "";
+        /// <summary>
+        /// Gets or sets the reminder description.
+        /// </summary>
+        public string Description
+        {
+            get { return _Description; }
+            set
+            {
+                if (value != _Description)
+                {
+                    string oldValue = _Description;
+                    _Description = value;
+                    OnDescriptionChanged(oldValue, _Description);
+                }
+            }
+        }
+
+        private void OnDescriptionChanged(string oldValue, string newValue)
+        {
+
+        }
+
+        private object _Tag = null;
+        /// <summary>
+        /// Gets or sets additional data associated with the object.
+        /// </summary>
+        [DefaultValue(null)]
+        public object Tag
+        {
+            get { return _Tag; }
+            set
+            {
+                if (value != _Tag)
+                {
+                    object oldValue = _Tag;
+                    _Tag = value;
+                    OnTagChanged(oldValue, value);
+                }
+            }
+        }
+
+        private void OnTagChanged(object oldValue, object newValue)
+        {
+
+        }
+
+
+        /// <summary>
+        /// Gets or sets the date and time reminder will be executed at.
+        /// <remarks>
+        /// Unless you mark reminder as inactive by setting the IsActive=false the reminder will occur next time
+        /// notifications are updated or when appointment data is loaded.
+        /// </remarks>
+        /// </summary>
+        private DateTime _ReminderTime = DateTime.MinValue;
+        public DateTime ReminderTime
+        {
+            get { return GetTimeZoneDateTime(_ReminderTime); }
+            set
+            {
+                value = GetUTCDateTime(CalendarModel.GetCalendarDateTime(value));
+                if (_ReminderTime != value)
+                {
+                    DateTime oldValue = _ReminderTime;
+                    _ReminderTime = value;
+                    OnReminderTimeChanged(oldValue, _ReminderTime);
+                }
+            }
+        }
+
+        private DateTime GetUTCDateTime(DateTime date)
+        {
+            if (date == DateTime.MinValue || date == DateTime.MaxValue || date.Kind == DateTimeKind.Utc)
+                return date;
+            return TimeZoneInfo.ConvertTimeToUtc(date);
+        }
+
+        private DateTime GetTimeZoneDateTime(DateTime date)
+        {
+            if (date.Kind != DateTimeKind.Utc) return date;
+            TimeZoneInfo zone = TimeZoneInfo.Local;
+            return TimeZoneInfo.ConvertTimeFromUtc(date, zone);
+        }
+
+        private void OnReminderTimeChanged(DateTime oldValue, DateTime newValue)
+        {
+            if (NeedsNotification)
+                UpdateNotifications();
+        }
+
+        private bool NeedsNotification
+        {
+            get
+            {
+                return _ReminderAction != eReminderAction.None && _IsActive;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the action performed when reminder time is reached. Default value is Event and Command.
+        /// </summary>
+        private eReminderAction _ReminderAction = eReminderAction.EventAndCommand;
+        [DefaultValue(eReminderAction.EventAndCommand)]
+        public eReminderAction ReminderAction
+        {
+            get { return _ReminderAction; }
+            set
+            {
+                if (_ReminderAction != value)
+                {
+                    eReminderAction oldValue = _ReminderAction;
+                    _ReminderAction = value;
+                    OnReminderActionChanged(oldValue, _ReminderAction);
+                }
+            }
+        }
+
+        private void OnReminderActionChanged(eReminderAction oldValue, eReminderAction newValue)
+        {
+            if (oldValue == eReminderAction.None || newValue == eReminderAction.None)
+                UpdateNotifications();
+        }
+
+        internal void UpdateNotifications()
+        {
+            if (_Appointment != null && !_IsActiveForPastAppointments && _Appointment.StartTime.Date < DateTime.Today)
+            {
+                UnregisterNotification();
+                return;
+            }
+
+            if ((_Appointment != null && _Appointment.Calendar != null || _Parent != null && _Parent.ParentModel != null) &&
+                _IsActive && _ReminderTime > DateTime.MinValue && _ReminderAction != eReminderAction.None)
+            {
+                NotificationRequest request = this.NotificationRequest;
+                RegisterNotification(request);
+            }
+            else
+            {
+                UnregisterNotification();
+            }
+        }
+
+        private void RegisterNotification(NotificationRequest request)
+        {
+            if (_NotificationRequestRegistered)
+                NotificationServer.UpdateNotification(request);
+            else
+                NotificationServer.Register(request);
+            _NotificationRequestRegistered = true;
+        }
+
+        private Appointment _Appointment;
+        /// <summary>
+        /// Gets the Appointment reminder is attached to.
+        /// </summary>
+        [Browsable(false)]
+        public Appointment Appointment
+        {
+            get { return _Appointment; }
+            internal set
+            {
+                if (_Appointment != value)
+                {
+                    _Appointment = value;
+                    if (NeedsNotification) UpdateNotifications();
+                }
+            }
+        }
+
+        private bool _IsActive = true;
+        /// <summary>
+        /// Gets or sets whether reminder is active. Active reminders fire events or execute commands when 
+        /// reminder time has been reached. Set this value to false to dismiss the reminder.
+        /// </summary>
+        [DefaultValue(true)]
+        public bool IsActive
+        {
+            get { return _IsActive; }
+            set
+            {
+                if (_IsActive != value)
+                {
+                    bool oldValue = _IsActive;
+                    _IsActive = value;
+                    OnIsActiveChanged(oldValue, _IsActive);
+                }
+            }
+        }
+
+        private void OnIsActiveChanged(bool oldValue, bool newValue)
+        {
+            UpdateNotifications();
+        }
+
+        private NotificationRequest _NotificationRequest = null;
+        private NotificationRequest NotificationRequest
+        {
+            get
+            {
+                if (_NotificationRequest == null)
+                {
+                    _NotificationRequest = new NotificationRequest(((_IsSnoozeReminder && _SnoozeDateTime != DateTime.MinValue) ? _SnoozeDateTime : _ReminderTime), new NotificationServerEventHandler(OnReminderNotification));
+                }
+                else
+                    _NotificationRequest.NotificationTime = ((_IsSnoozeReminder && _SnoozeDateTime != DateTime.MinValue) ? _SnoozeDateTime : _ReminderTime);
+                return _NotificationRequest;
+            }
+            set
+            {
+                _NotificationRequest = value;
+            }
+        }
+
+        private DateTime _SnoozeDateTime = DateTime.MinValue;
+        /// <summary>
+        /// Gets or sets the next snooze time for the reminder. Use the Snooze method if you want to snooze the reminder correctly.
+        /// </summary>
+        public DateTime SnoozeDateTime
+        {
+            get { return _SnoozeDateTime; }
+            set
+            {
+                value = CalendarModel.GetCalendarDateTime(value);
+                value = value.Kind == DateTimeKind.Utc ? value : GetUTCDateTime(value);
+                if (value != _SnoozeDateTime)
+                {
+                    DateTime oldValue = _SnoozeDateTime;
+                    _SnoozeDateTime = value;
+                    if (_SnoozeDateTime == DateTime.MinValue)
+                    {
+                        this.IsSnoozeReminder = false;
+                        UnregisterNotification();
+                    }
+                    OnSnoozeDateTimeChanged(oldValue, value);
+                }
+            }
+        }
+
+        private void OnSnoozeDateTimeChanged(DateTime oldValue, DateTime newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("SnoozeDateTime"));
+
+        }
+
+        /// <summary>
+        /// Snoozes reminder so it occurs at specified notification time. This method should be used instead of the SnoozeDateTime property and it will
+        /// set the SnoozeDateTime property to the next notification time.
+        /// </summary>
+        /// <param name="nextNotificationTime">Next reminder notification time.</param>
+        public void Snooze(DateTime nextNotificationTime)
+        {
+            nextNotificationTime = CalendarModel.GetCalendarDateTime(nextNotificationTime);
+            DateTime utcTime = nextNotificationTime.Kind == DateTimeKind.Utc ? nextNotificationTime : GetUTCDateTime(nextNotificationTime);
+            UnregisterNotification();
+            this.SnoozeDateTime = nextNotificationTime;
+            this.IsSnoozeReminder = true;
+            NotificationRequest request = this.NotificationRequest;
+            request.NotificationTime = utcTime;
+            RegisterNotification(request);
+        }
+
+        private void UnregisterNotification()
+        {
+            if (_NotificationRequestRegistered)
+            {
+                NotificationServer.Unregister(this.NotificationRequest);
+                _NotificationRequestRegistered = false;
+                this.NotificationRequest = null;
+            }
+        }
+
+        private void OnReminderNotification(NotificationRequest request, NotificationServerEventArgs e)
+        {
+            if (_ReminderAction != eReminderAction.None)
+            {
+                this.NotificationRequest = null;
+                ProcessNotification();
+            }
+        }
+
+        /// <summary>
+        /// Runs the ReminderNotification as if the reminder time has been reached.
+        /// <remarks>This method is automatically called by reminder once ReminderTime has been reached.</remarks>
+        /// </summary>
+        public void ProcessNotification()
+        {
+            if (_Appointment != null && _Appointment.Calendar != null)
+                _Appointment.Calendar.InvokeReminderNotification(this);
+            else if (_Parent != null && _Parent.ParentModel != null)
+                _Parent.ParentModel.InvokeReminderNotification(this);
+
+            if (_ReminderAction == eReminderAction.None) return;
+
+            if ((_ReminderAction & eReminderAction.Event) != 0)
+            {
+                OnReminderNotification(new ReminderEventArgs(this));
+            }
+
+            if ((_ReminderAction & eReminderAction.Command) != 0)
+            {
+                //throw new NotImplementedException();
+            }
+        }
+
+        /// <summary>
+        /// Raises the ReminderNotification event.
+        /// </summary>
+        /// <param name="eventArgs"></param>
+        protected virtual void OnReminderNotification(ReminderEventArgs eventArgs)
+        {
+            ReminderEventHandler h = ReminderNotification;
+            if (h != null)
+                h(this, eventArgs);
+        }
+
+        /// <summary>
+        /// Creates an copy of the reminder.
+        /// </summary>
+        /// <returns>Reminder copy.</returns>
+        public Reminder Copy()
+        {
+            Reminder copy = new Reminder();
+            copy.Description = _Description;
+            copy.Tag = _Tag;
+            copy.IsActive = _IsActive;
+            copy.ReminderAction = _ReminderAction;
+            copy.IsActiveForPastAppointments = this.IsActiveForPastAppointments;
+            if (ReminderNotification != null)
+                copy.ReminderNotification = (ReminderEventHandler)ReminderNotification.Clone();
+            copy.ReminderTime = ReminderTime;
+            copy.IsSnoozeReminder = _IsSnoozeReminder;
+            return copy;
+        }
+
+        private bool _IsSnoozeReminder = false;
+        /// <summary>
+        /// Gets or sets whether this reminder is snooze reminder usually created by Reminder dialog when user hits the Snooze button.
+        /// Default value is false.
+        /// </summary>
+        public bool IsSnoozeReminder
+        {
+            get { return _IsSnoozeReminder; }
+            set
+            {
+                _IsSnoozeReminder = value;
+            }
+        }
+
+        private ReminderCollection _Parent = null;
+        internal ReminderCollection ParentCollection
+        {
+            get { return _Parent; }
+            set
+            {
+                _Parent = value;
+                if (NeedsNotification)
+                    UpdateNotifications();
+            }
+        }
+        #endregion
+    }
+
+    #region Events Support
+    public delegate void ReminderEventHandler(object sender, ReminderEventArgs e);
+    /// <summary>
+    /// Defines arguments for reminder related events.
+    /// </summary>
+    public class ReminderEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets the reminder referenced by this event.
+        /// </summary>
+        public Reminder Reminder = null;
+
+        /// <summary>
+        /// Initializes a new instance of the ReminderEventArgs class.
+        /// </summary>
+        /// <param name="appointment"></param>
+        public ReminderEventArgs(Reminder reminder)
+        {
+            Reminder = reminder;
+        }
+    }
+    #endregion
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/ReminderCollection.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/ReminderCollection.cs
new file mode 100644
index 00000000..87193b7f
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/ReminderCollection.cs	
@@ -0,0 +1,107 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Collections.ObjectModel;
+
+namespace DevComponents.Schedule.Model
+{
+    /// <summary>
+    /// Represents collection of reminders.
+    /// </summary>
+    public class ReminderCollection : Collection<Reminder>
+    {
+        #region Constructor
+        /// <summary>
+        /// Initializes a new instance of the ReminderCollection class.
+        /// </summary>
+        /// <param name="parent"></param>
+        public ReminderCollection(Appointment parent)
+        {
+            _Appointment = parent;
+        }
+        CalendarModel _Model = null;
+        /// <summary>
+        /// Initializes a new instance of the ReminderCollection class.
+        /// </summary>
+        /// <param name="parent"></param>
+        public ReminderCollection(CalendarModel parentModel)
+        {
+            _Model = parentModel;
+        }
+        #endregion
+
+        #region Internal Implementation
+        protected override void InsertItem(int index, Reminder item)
+        {
+            OnBeforeInsert(index, item);
+            base.InsertItem(index, item);
+        }
+
+        private void OnBeforeInsert(int index, Reminder item)
+        {
+            item.Appointment = _Appointment;
+            item.ParentCollection = this;
+        }
+
+        protected override void SetItem(int index, Reminder item)
+        {
+            OnBeforeSetItem(index, item);
+            base.SetItem(index, item);
+        }
+
+        private void OnBeforeSetItem(int index, Reminder item)
+        {
+            this[index].Appointment = null;
+            this[index].ParentCollection = null;
+            item.Appointment = _Appointment;
+            item.ParentCollection = this;
+        }
+
+        protected override void RemoveItem(int index)
+        {
+            OnBeforeRemove(index);
+            base.RemoveItem(index);
+        }
+
+        private void OnBeforeRemove(int index)
+        {
+            this[index].Appointment = null;
+            this[index].ParentCollection = null;
+        }
+
+        protected override void ClearItems()
+        {
+            foreach (Reminder item in this)
+            {
+                item.Appointment = null;
+            }
+            base.ClearItems();
+        }
+
+        private Appointment _Appointment;
+        /// <summary>
+        /// Gets parent appointment.
+        /// </summary>
+        public Appointment Appointment
+        {
+            get { return _Appointment; }
+            internal set
+            {
+                _Appointment = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets parent model if collection is custom reminders collection.
+        /// </summary>
+        public CalendarModel ParentModel
+        {
+            get { return _Model; }
+            internal set { _Model = value; }
+        }
+        #endregion
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/TimeZoneInfo/NativeMethods.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/TimeZoneInfo/NativeMethods.cs
new file mode 100644
index 00000000..c43d93cc
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/TimeZoneInfo/NativeMethods.cs	
@@ -0,0 +1,128 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Runtime.InteropServices;
+
+namespace DevComponents.Schedule
+{
+    internal class NativeMethods
+    {
+        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
+        internal struct TimeZoneInformation
+        {
+            [MarshalAs(UnmanagedType.I4)]
+            public int Bias;
+            [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 0x20)]
+            public string StandardName;
+            public NativeMethods.SystemTime StandardDate;
+            [MarshalAs(UnmanagedType.I4)]
+            public int StandardBias;
+            [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 0x20)]
+            public string DaylightName;
+            public NativeMethods.SystemTime DaylightDate;
+            [MarshalAs(UnmanagedType.I4)]
+            public int DaylightBias;
+            public TimeZoneInformation(NativeMethods.DynamicTimeZoneInformation dtzi)
+            {
+                this.Bias = dtzi.Bias;
+                this.StandardName = dtzi.StandardName;
+                this.StandardDate = dtzi.StandardDate;
+                this.StandardBias = dtzi.StandardBias;
+                this.DaylightName = dtzi.DaylightName;
+                this.DaylightDate = dtzi.DaylightDate;
+                this.DaylightBias = dtzi.DaylightBias;
+            }
+        }
+
+        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
+        internal struct DynamicTimeZoneInformation
+        {
+            [MarshalAs(UnmanagedType.I4)]
+            public int Bias;
+            [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 0x20)]
+            public string StandardName;
+            public NativeMethods.SystemTime StandardDate;
+            [MarshalAs(UnmanagedType.I4)]
+            public int StandardBias;
+            [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 0x20)]
+            public string DaylightName;
+            public NativeMethods.SystemTime DaylightDate;
+            [MarshalAs(UnmanagedType.I4)]
+            public int DaylightBias;
+            [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 0x80)]
+            public string TimeZoneKeyName;
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        internal struct SystemTime
+        {
+            [MarshalAs(UnmanagedType.U2)]
+            public short Year;
+            [MarshalAs(UnmanagedType.U2)]
+            public short Month;
+            [MarshalAs(UnmanagedType.U2)]
+            public short DayOfWeek;
+            [MarshalAs(UnmanagedType.U2)]
+            public short Day;
+            [MarshalAs(UnmanagedType.U2)]
+            public short Hour;
+            [MarshalAs(UnmanagedType.U2)]
+            public short Minute;
+            [MarshalAs(UnmanagedType.U2)]
+            public short Second;
+            [MarshalAs(UnmanagedType.U2)]
+            public short Milliseconds;
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        internal struct RegistryTimeZoneInformation
+        {
+            [MarshalAs(UnmanagedType.I4)]
+            public int Bias;
+            [MarshalAs(UnmanagedType.I4)]
+            public int StandardBias;
+            [MarshalAs(UnmanagedType.I4)]
+            public int DaylightBias;
+            public NativeMethods.SystemTime StandardDate;
+            public NativeMethods.SystemTime DaylightDate;
+            public RegistryTimeZoneInformation(NativeMethods.TimeZoneInformation tzi)
+            {
+                this.Bias = tzi.Bias;
+                this.StandardDate = tzi.StandardDate;
+                this.StandardBias = tzi.StandardBias;
+                this.DaylightDate = tzi.DaylightDate;
+                this.DaylightBias = tzi.DaylightBias;
+            }
+
+            public RegistryTimeZoneInformation(byte[] bytes)
+            {
+                if ((bytes == null) || (bytes.Length != 0x2c))
+                {
+                    throw new ArgumentException("Argument_InvalidREG_TZI_FORMAT", "bytes");
+                }
+                this.Bias = BitConverter.ToInt32(bytes, 0);
+                this.StandardBias = BitConverter.ToInt32(bytes, 4);
+                this.DaylightBias = BitConverter.ToInt32(bytes, 8);
+                this.StandardDate.Year = BitConverter.ToInt16(bytes, 12);
+                this.StandardDate.Month = BitConverter.ToInt16(bytes, 14);
+                this.StandardDate.DayOfWeek = BitConverter.ToInt16(bytes, 0x10);
+                this.StandardDate.Day = BitConverter.ToInt16(bytes, 0x12);
+                this.StandardDate.Hour = BitConverter.ToInt16(bytes, 20);
+                this.StandardDate.Minute = BitConverter.ToInt16(bytes, 0x16);
+                this.StandardDate.Second = BitConverter.ToInt16(bytes, 0x18);
+                this.StandardDate.Milliseconds = BitConverter.ToInt16(bytes, 0x1a);
+                this.DaylightDate.Year = BitConverter.ToInt16(bytes, 0x1c);
+                this.DaylightDate.Month = BitConverter.ToInt16(bytes, 30);
+                this.DaylightDate.DayOfWeek = BitConverter.ToInt16(bytes, 0x20);
+                this.DaylightDate.Day = BitConverter.ToInt16(bytes, 0x22);
+                this.DaylightDate.Hour = BitConverter.ToInt16(bytes, 0x24);
+                this.DaylightDate.Minute = BitConverter.ToInt16(bytes, 0x26);
+                this.DaylightDate.Second = BitConverter.ToInt16(bytes, 40);
+                this.DaylightDate.Milliseconds = BitConverter.ToInt16(bytes, 0x2a);
+            }
+        }
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/TimeZoneInfo/TimeZoneInfo.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/TimeZoneInfo/TimeZoneInfo.cs
new file mode 100644
index 00000000..3f5c7568
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/TimeZoneInfo/TimeZoneInfo.cs	
@@ -0,0 +1,2655 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Security.Permissions;
+using System.Runtime.Serialization;
+using System.Globalization;
+using System.Security;
+using Microsoft.Win32;
+using System.Runtime.InteropServices;
+using System.Security.AccessControl;
+using System.IO;
+using System.Runtime.ConstrainedExecution;
+
+namespace DevComponents.Schedule
+{
+    [Serializable, HostProtection(SecurityAction.LinkDemand, MayLeakOnAbort = true)]
+    public sealed class TimeZoneInfo : IEquatable<TimeZoneInfo>, ISerializable, IDeserializationCallback
+    {
+        // Fields
+        private const string c_daylightValue = "Dlt";
+        private const string c_disableDST = "DisableAutoDaylightTimeSet";
+        private const string c_disableDynamicDST = "DynamicDaylightTimeDisabled";
+        private const string c_displayValue = "Display";
+        private const string c_firstEntryValue = "FirstEntry";
+        private const string c_lastEntryValue = "LastEntry";
+        private const string c_localId = "Local";
+        private const int c_maxKeyLength = 0xff;
+        private const string c_muiDaylightValue = "MUI_Dlt";
+        private const string c_muiDisplayValue = "MUI_Display";
+        private const string c_muiStandardValue = "MUI_Std";
+        private const string c_standardValue = "Std";
+        private const long c_ticksPerDay = 0xc92a69c000L;
+        private const long c_ticksPerDayRange = 0xc92a6998f0L;
+        private const long c_ticksPerHour = 0x861c46800L;
+        private const long c_ticksPerMillisecond = 0x2710L;
+        private const long c_ticksPerMinute = 0x23c34600L;
+        private const long c_ticksPerSecond = 0x989680L;
+        private const string c_timeZoneInfoRegistryHive = @"SYSTEM\CurrentControlSet\Control\TimeZoneInformation";
+        private const string c_timeZoneInfoRegistryHivePermissionList = @"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\TimeZoneInformation";
+        private const string c_timeZoneInfoValue = "TZI";
+        private const string c_timeZonesRegistryHive = @"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones";
+        private const string c_timeZonesRegistryHivePermissionList = @"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones";
+        private const string c_utcId = "UTC";
+        private AdjustmentRule[] m_adjustmentRules;
+        private TimeSpan m_baseUtcOffset;
+        private string m_daylightDisplayName;
+        private string m_displayName;
+        private string m_id;
+        private string m_standardDisplayName;
+        private bool m_supportsDaylightSavingTime;
+        private static bool s_allSystemTimeZonesRead = false;
+        private static object s_hiddenInternalSyncObject;
+        private static Dictionary<string, TimeZoneInfo> s_hiddenSystemTimeZones;
+        private static TimeZoneInfo s_localTimeZone;
+        private static List<TimeZoneInfo> s_readOnlySystemTimeZones;
+        private static TimeZoneInfo s_utcTimeZone;
+
+        // Methods
+        private TimeZoneInfo(NativeMethods.TimeZoneInformation zone, bool dstDisabled)
+        {
+            if (string.IsNullOrEmpty(zone.StandardName))
+            {
+                this.m_id = "Local";
+            }
+            else
+            {
+                this.m_id = zone.StandardName;
+            }
+            this.m_baseUtcOffset = new TimeSpan(0, -zone.Bias, 0);
+            if (!dstDisabled)
+            {
+                NativeMethods.RegistryTimeZoneInformation timeZoneInformation = new NativeMethods.RegistryTimeZoneInformation(zone);
+                AdjustmentRule rule = CreateAdjustmentRuleFromTimeZoneInformation(timeZoneInformation, DateTime.MinValue.Date, DateTime.MaxValue.Date);
+                if (rule != null)
+                {
+                    this.m_adjustmentRules = new AdjustmentRule[] { rule };
+                }
+            }
+            ValidateTimeZoneInfo(this.m_id, this.m_baseUtcOffset, this.m_adjustmentRules, out this.m_supportsDaylightSavingTime);
+            this.m_displayName = zone.StandardName;
+            this.m_standardDisplayName = zone.StandardName;
+            this.m_daylightDisplayName = zone.DaylightName;
+        }
+
+        private TimeZoneInfo(SerializationInfo info, StreamingContext context)
+        {
+            if (info == null)
+            {
+                throw new ArgumentNullException("info");
+            }
+            this.m_id = (string)info.GetValue("Id", typeof(string));
+            this.m_displayName = (string)info.GetValue("DisplayName", typeof(string));
+            this.m_standardDisplayName = (string)info.GetValue("StandardName", typeof(string));
+            this.m_daylightDisplayName = (string)info.GetValue("DaylightName", typeof(string));
+            this.m_baseUtcOffset = (TimeSpan)info.GetValue("BaseUtcOffset", typeof(TimeSpan));
+            this.m_adjustmentRules = (AdjustmentRule[])info.GetValue("AdjustmentRules", typeof(AdjustmentRule[]));
+            this.m_supportsDaylightSavingTime = (bool)info.GetValue("SupportsDaylightSavingTime", typeof(bool));
+        }
+
+        private TimeZoneInfo(string id, TimeSpan baseUtcOffset, string displayName, string standardDisplayName, string daylightDisplayName, AdjustmentRule[] adjustmentRules, bool disableDaylightSavingTime)
+        {
+            bool flag;
+            ValidateTimeZoneInfo(id, baseUtcOffset, adjustmentRules, out flag);
+            if ((!disableDaylightSavingTime && (adjustmentRules != null)) && (adjustmentRules.Length > 0))
+            {
+                this.m_adjustmentRules = (AdjustmentRule[])adjustmentRules.Clone();
+            }
+            this.m_id = id;
+            this.m_baseUtcOffset = baseUtcOffset;
+            this.m_displayName = displayName;
+            this.m_standardDisplayName = standardDisplayName;
+            this.m_daylightDisplayName = disableDaylightSavingTime ? null : daylightDisplayName;
+            this.m_supportsDaylightSavingTime = flag && !disableDaylightSavingTime;
+        }
+
+        [SecurityCritical, SecurityTreatAsSafe]
+        private static bool CheckDaylightSavingTimeDisabled()
+        {
+            try
+            {
+                PermissionSet set = new PermissionSet(PermissionState.None);
+                set.AddPermission(new RegistryPermission(RegistryPermissionAccess.Read, @"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\TimeZoneInformation"));
+                set.Assert();
+                using (RegistryKey key = Registry.LocalMachine.OpenSubKey(@"SYSTEM\CurrentControlSet\Control\TimeZoneInformation", RegistryKeyPermissionCheck.Default, RegistryRights.ExecuteKey))
+                {
+                    if (key == null)
+                    {
+                        return false;
+                    }
+                    int num = 0;
+                    try
+                    {
+                        num = (int)key.GetValue("DisableAutoDaylightTimeSet", 0, RegistryValueOptions.None);
+                    }
+                    catch (InvalidCastException)
+                    {
+                    }
+                    if (num != 1)
+                    {
+                        try
+                        {
+                            num = (int)key.GetValue("DynamicDaylightTimeDisabled", 0, RegistryValueOptions.None);
+                        }
+                        catch (InvalidCastException)
+                        {
+                        }
+                        if (num != 1)
+                        {
+                            goto Label_009C;
+                        }
+                    }
+                    return true;
+                }
+            }
+            finally
+            {
+                PermissionSet.RevertAssert();
+            }
+        Label_009C:
+            return false;
+        }
+
+        private static bool CheckDaylightSavingTimeNotSupported(NativeMethods.TimeZoneInformation timeZone)
+        {
+            return (((((timeZone.DaylightDate.Year == timeZone.StandardDate.Year) && (timeZone.DaylightDate.Month == timeZone.StandardDate.Month)) && ((timeZone.DaylightDate.DayOfWeek == timeZone.StandardDate.DayOfWeek) && (timeZone.DaylightDate.Day == timeZone.StandardDate.Day))) && (((timeZone.DaylightDate.Hour == timeZone.StandardDate.Hour) && (timeZone.DaylightDate.Minute == timeZone.StandardDate.Minute)) && (timeZone.DaylightDate.Second == timeZone.StandardDate.Second))) && (timeZone.DaylightDate.Milliseconds == timeZone.StandardDate.Milliseconds));
+        }
+
+        private static bool CheckIsDst(DateTime startTime, DateTime time, DateTime endTime)
+        {
+            if (startTime.Year != endTime.Year)
+            {
+                endTime = endTime.AddYears(startTime.Year - endTime.Year);
+            }
+            if (startTime.Year != time.Year)
+            {
+                time = time.AddYears(startTime.Year - time.Year);
+            }
+            if (startTime > endTime)
+            {
+                return ((time < endTime) || (time >= startTime));
+            }
+            return ((time >= startTime) && (time < endTime));
+        }
+
+        public static void ClearCachedData()
+        {
+            lock (s_internalSyncObject)
+            {
+                s_localTimeZone = null;
+                s_utcTimeZone = null;
+                s_systemTimeZones = null;
+                s_readOnlySystemTimeZones = null;
+                s_allSystemTimeZonesRead = false;
+            }
+        }
+
+        public static DateTime ConvertTime(DateTime dateTime, TimeZoneInfo destinationTimeZone)
+        {
+            if (destinationTimeZone == null)
+            {
+                throw new ArgumentNullException("destinationTimeZone");
+            }
+            if (dateTime.Kind == DateTimeKind.Utc)
+            {
+                lock (s_internalSyncObject)
+                {
+                    return ConvertTime(dateTime, Utc, destinationTimeZone);
+                }
+            }
+            lock (s_internalSyncObject)
+            {
+                return ConvertTime(dateTime, Local, destinationTimeZone);
+            }
+        }
+
+        public static DateTimeOffset ConvertTime(DateTimeOffset dateTimeOffset, TimeZoneInfo destinationTimeZone)
+        {
+            if (destinationTimeZone == null)
+            {
+                throw new ArgumentNullException("destinationTimeZone");
+            }
+            DateTime utcDateTime = dateTimeOffset.UtcDateTime;
+            TimeSpan utcOffsetFromUtc = GetUtcOffsetFromUtc(utcDateTime, destinationTimeZone);
+            long ticks = utcDateTime.Ticks + utcOffsetFromUtc.Ticks;
+            if (ticks > DateTimeOffset.MaxValue.Ticks)
+            {
+                return DateTimeOffset.MaxValue;
+            }
+            if (ticks < DateTimeOffset.MinValue.Ticks)
+            {
+                return DateTimeOffset.MinValue;
+            }
+            return new DateTimeOffset(ticks, utcOffsetFromUtc);
+        }
+
+        public static DateTime ConvertTime(DateTime dateTime, TimeZoneInfo sourceTimeZone, TimeZoneInfo destinationTimeZone)
+        {
+            return ConvertTime(dateTime, sourceTimeZone, destinationTimeZone, TimeZoneInfoOptions.None);
+        }
+
+        internal static DateTime ConvertTime(DateTime dateTime, TimeZoneInfo sourceTimeZone, TimeZoneInfo destinationTimeZone, TimeZoneInfoOptions flags)
+        {
+            if (sourceTimeZone == null)
+            {
+                throw new ArgumentNullException("sourceTimeZone");
+            }
+            if (destinationTimeZone == null)
+            {
+                throw new ArgumentNullException("destinationTimeZone");
+            }
+            DateTimeKind correspondingKind = sourceTimeZone.GetCorrespondingKind();
+            if ((((flags & TimeZoneInfoOptions.NoThrowOnInvalidTime) == 0) && (dateTime.Kind != DateTimeKind.Unspecified)) && (dateTime.Kind != correspondingKind))
+            {
+                throw new ArgumentException("Argument_ConvertMismatch", "sourceTimeZone");
+            }
+            AdjustmentRule adjustmentRuleForTime = sourceTimeZone.GetAdjustmentRuleForTime(dateTime);
+            TimeSpan baseUtcOffset = sourceTimeZone.BaseUtcOffset;
+            if (adjustmentRuleForTime != null)
+            {
+                bool flag = false;
+                DaylightTime daylightTime = GetDaylightTime(dateTime.Year, adjustmentRuleForTime);
+                if (((flags & TimeZoneInfoOptions.NoThrowOnInvalidTime) == 0) && GetIsInvalidTime(dateTime, adjustmentRuleForTime, daylightTime))
+                {
+                    throw new ArgumentException("Argument_DateTimeIsInvalid", "dateTime");
+                }
+                flag = GetIsDaylightSavings(dateTime, adjustmentRuleForTime, daylightTime);
+                baseUtcOffset += flag ? adjustmentRuleForTime.DaylightDelta : TimeSpan.Zero;
+            }
+            DateTimeKind kind = destinationTimeZone.GetCorrespondingKind();
+            if (((dateTime.Kind != DateTimeKind.Unspecified) && (correspondingKind != DateTimeKind.Unspecified)) && (correspondingKind == kind))
+            {
+                return dateTime;
+            }
+            long ticks = dateTime.Ticks - baseUtcOffset.Ticks;
+            DateTime time2 = ConvertUtcToTimeZone(ticks, destinationTimeZone);
+            if (kind == DateTimeKind.Local)
+            {
+                kind = DateTimeKind.Unspecified;
+            }
+            return new DateTime(time2.Ticks, kind);
+        }
+
+        public static DateTime ConvertTimeBySystemTimeZoneId(DateTime dateTime, string destinationTimeZoneId)
+        {
+            return ConvertTime(dateTime, FindSystemTimeZoneById(destinationTimeZoneId));
+        }
+
+        public static DateTimeOffset ConvertTimeBySystemTimeZoneId(DateTimeOffset dateTimeOffset, string destinationTimeZoneId)
+        {
+            return ConvertTime(dateTimeOffset, FindSystemTimeZoneById(destinationTimeZoneId));
+        }
+
+        public static DateTime ConvertTimeBySystemTimeZoneId(DateTime dateTime, string sourceTimeZoneId, string destinationTimeZoneId)
+        {
+            if ((dateTime.Kind == DateTimeKind.Local) && (string.Compare(sourceTimeZoneId, Local.Id, StringComparison.OrdinalIgnoreCase) == 0))
+            {
+                lock (s_internalSyncObject)
+                {
+                    return ConvertTime(dateTime, Local, FindSystemTimeZoneById(destinationTimeZoneId));
+                }
+            }
+            if ((dateTime.Kind == DateTimeKind.Utc) && (string.Compare(sourceTimeZoneId, Utc.Id, StringComparison.OrdinalIgnoreCase) == 0))
+            {
+                lock (s_internalSyncObject)
+                {
+                    return ConvertTime(dateTime, Utc, FindSystemTimeZoneById(destinationTimeZoneId));
+                }
+            }
+            return ConvertTime(dateTime, FindSystemTimeZoneById(sourceTimeZoneId), FindSystemTimeZoneById(destinationTimeZoneId));
+        }
+
+        public static DateTime ConvertTimeFromUtc(DateTime dateTime, TimeZoneInfo destinationTimeZone)
+        {
+            lock (s_internalSyncObject)
+            {
+                return ConvertTime(dateTime, Utc, destinationTimeZone);
+            }
+        }
+
+        public static DateTime ConvertTimeToUtc(DateTime dateTime)
+        {
+            if (dateTime.Kind == DateTimeKind.Utc)
+            {
+                return dateTime;
+            }
+            lock (s_internalSyncObject)
+            {
+                return ConvertTime(dateTime, Local, Utc);
+            }
+        }
+
+        public static DateTime ConvertTimeToUtc(DateTime dateTime, TimeZoneInfo sourceTimeZone)
+        {
+            lock (s_internalSyncObject)
+            {
+                return ConvertTime(dateTime, sourceTimeZone, Utc);
+            }
+        }
+
+        private static DateTime ConvertUtcToTimeZone(long ticks, TimeZoneInfo destinationTimeZone)
+        {
+            DateTime maxValue;
+            if (ticks > DateTime.MaxValue.Ticks)
+            {
+                maxValue = DateTime.MaxValue;
+            }
+            else if (ticks < DateTime.MinValue.Ticks)
+            {
+                maxValue = DateTime.MinValue;
+            }
+            else
+            {
+                maxValue = new DateTime(ticks);
+            }
+            TimeSpan utcOffsetFromUtc = GetUtcOffsetFromUtc(maxValue, destinationTimeZone);
+            ticks += utcOffsetFromUtc.Ticks;
+            if (ticks > DateTime.MaxValue.Ticks)
+            {
+                return DateTime.MaxValue;
+            }
+            if (ticks < DateTime.MinValue.Ticks)
+            {
+                return DateTime.MinValue;
+            }
+            return new DateTime(ticks);
+        }
+
+        private static AdjustmentRule CreateAdjustmentRuleFromTimeZoneInformation(NativeMethods.RegistryTimeZoneInformation timeZoneInformation, DateTime startDate, DateTime endDate)
+        {
+            if (timeZoneInformation.StandardDate.Month == 0)
+            {
+                return null;
+            }
+            TransitionTime? nullable = TransitionTimeFromTimeZoneInformation(timeZoneInformation, true);
+            if (!nullable.HasValue)
+            {
+                return null;
+            }
+            TransitionTime? nullable2 = TransitionTimeFromTimeZoneInformation(timeZoneInformation, false);
+            if (!nullable2.HasValue)
+            {
+                return null;
+            }
+            if (nullable.Equals(nullable2))
+            {
+                return null;
+            }
+            return AdjustmentRule.CreateAdjustmentRule(startDate, endDate, new TimeSpan(0, -timeZoneInformation.DaylightBias, 0), nullable.Value, nullable2.Value);
+        }
+
+        public static TimeZoneInfo CreateCustomTimeZone(string id, TimeSpan baseUtcOffset, string displayName, string standardDisplayName)
+        {
+            return new TimeZoneInfo(id, baseUtcOffset, displayName, standardDisplayName, standardDisplayName, null, false);
+        }
+
+        public static TimeZoneInfo CreateCustomTimeZone(string id, TimeSpan baseUtcOffset, string displayName, string standardDisplayName, string daylightDisplayName, AdjustmentRule[] adjustmentRules)
+        {
+            return new TimeZoneInfo(id, baseUtcOffset, displayName, standardDisplayName, daylightDisplayName, adjustmentRules, false);
+        }
+
+        public static TimeZoneInfo CreateCustomTimeZone(string id, TimeSpan baseUtcOffset, string displayName, string standardDisplayName, string daylightDisplayName, AdjustmentRule[] adjustmentRules, bool disableDaylightSavingTime)
+        {
+            return new TimeZoneInfo(id, baseUtcOffset, displayName, standardDisplayName, daylightDisplayName, adjustmentRules, disableDaylightSavingTime);
+        }
+
+        public bool Equals(TimeZoneInfo other)
+        {
+            return (((other != null) && (string.Compare(this.m_id, other.m_id, StringComparison.OrdinalIgnoreCase) == 0)) && this.HasSameRules(other));
+        }
+
+        [SecurityCritical, SecurityTreatAsSafe]
+        private static string FindIdFromTimeZoneInformation(NativeMethods.TimeZoneInformation timeZone, out bool dstDisabled)
+        {
+            dstDisabled = false;
+            try
+            {
+                PermissionSet set = new PermissionSet(PermissionState.None);
+                set.AddPermission(new RegistryPermission(RegistryPermissionAccess.Read, @"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones"));
+                set.Assert();
+                using (RegistryKey key = Registry.LocalMachine.OpenSubKey(@"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones", RegistryKeyPermissionCheck.Default, RegistryRights.ExecuteKey))
+                {
+                    if (key == null)
+                    {
+                        return null;
+                    }
+                    foreach (string str in key.GetSubKeyNames())
+                    {
+                        if (TryCompareTimeZoneInformationToRegistry(timeZone, str, out dstDisabled))
+                        {
+                            return str;
+                        }
+                    }
+                }
+            }
+            finally
+            {
+                PermissionSet.RevertAssert();
+            }
+            return null;
+        }
+
+        public static TimeZoneInfo FindSystemTimeZoneById(string id)
+        {
+            if (string.Compare(id, "UTC", StringComparison.OrdinalIgnoreCase) == 0)
+            {
+                return Utc;
+            }
+            lock (s_internalSyncObject)
+            {
+                return GetTimeZone(id);
+            }
+        }
+
+        public static TimeZoneInfo FromSerializedString(string source)
+        {
+            if (source == null)
+            {
+                throw new ArgumentNullException("source");
+            }
+            if (source.Length == 0)
+            {
+                throw new ArgumentException("Argument_InvalidSerializedString source");
+            }
+            return StringSerializer.GetDeserializedTimeZoneInfo(source);
+        }
+
+        private AdjustmentRule GetAdjustmentRuleForTime(DateTime dateTime)
+        {
+            if ((this.m_adjustmentRules != null) && (this.m_adjustmentRules.Length != 0))
+            {
+                DateTime date = dateTime.Date;
+                for (int i = 0; i < this.m_adjustmentRules.Length; i++)
+                {
+                    if ((this.m_adjustmentRules[i].DateStart <= date) && (this.m_adjustmentRules[i].DateEnd >= date))
+                    {
+                        return this.m_adjustmentRules[i];
+                    }
+                }
+            }
+            return null;
+        }
+
+        public AdjustmentRule[] GetAdjustmentRules()
+        {
+            if (this.m_adjustmentRules == null)
+            {
+                return new AdjustmentRule[0];
+            }
+            return (AdjustmentRule[])this.m_adjustmentRules.Clone();
+        }
+
+        public TimeSpan[] GetAmbiguousTimeOffsets(DateTime dateTime)
+        {
+            DateTime time;
+            bool flag;
+            if (!this.m_supportsDaylightSavingTime)
+            {
+                throw new ArgumentException("Argument_DateTimeIsNotAmbiguous", "dateTime");
+            }
+            if (dateTime.Kind == DateTimeKind.Local)
+            {
+                lock (s_internalSyncObject)
+                {
+                    time = ConvertTime(dateTime, Local, this, TimeZoneInfoOptions.NoThrowOnInvalidTime);
+                    goto Label_007D;
+                }
+            }
+            if (dateTime.Kind == DateTimeKind.Utc)
+            {
+                lock (s_internalSyncObject)
+                {
+                    time = ConvertTime(dateTime, Utc, this, TimeZoneInfoOptions.NoThrowOnInvalidTime);
+                    goto Label_007D;
+                }
+            }
+            time = dateTime;
+        Label_007D:
+            flag = false;
+            AdjustmentRule adjustmentRuleForTime = this.GetAdjustmentRuleForTime(time);
+            if (adjustmentRuleForTime != null)
+            {
+                DaylightTime daylightTime = GetDaylightTime(time.Year, adjustmentRuleForTime);
+                flag = GetIsAmbiguousTime(time, adjustmentRuleForTime, daylightTime);
+            }
+            if (!flag)
+            {
+                throw new ArgumentException("Argument_DateTimeIsNotAmbiguous", "dateTime");
+            }
+            TimeSpan[] spanArray = new TimeSpan[2];
+            if (adjustmentRuleForTime.DaylightDelta > TimeSpan.Zero)
+            {
+                spanArray[0] = this.m_baseUtcOffset;
+                spanArray[1] = this.m_baseUtcOffset + adjustmentRuleForTime.DaylightDelta;
+                return spanArray;
+            }
+            spanArray[0] = this.m_baseUtcOffset + adjustmentRuleForTime.DaylightDelta;
+            spanArray[1] = this.m_baseUtcOffset;
+            return spanArray;
+        }
+
+        public TimeSpan[] GetAmbiguousTimeOffsets(DateTimeOffset dateTimeOffset)
+        {
+            if (!this.m_supportsDaylightSavingTime)
+            {
+                throw new ArgumentException("Argument_DateTimeOffsetIsNotAmbiguous", "dateTimeOffset");
+            }
+            DateTime dateTime = ConvertTime(dateTimeOffset, this).DateTime;
+            bool flag = false;
+            AdjustmentRule adjustmentRuleForTime = this.GetAdjustmentRuleForTime(dateTime);
+            if (adjustmentRuleForTime != null)
+            {
+                DaylightTime daylightTime = GetDaylightTime(dateTime.Year, adjustmentRuleForTime);
+                flag = GetIsAmbiguousTime(dateTime, adjustmentRuleForTime, daylightTime);
+            }
+            if (!flag)
+            {
+                throw new ArgumentException("Argument_DateTimeOffsetIsNotAmbiguous", "dateTimeOffset");
+            }
+            TimeSpan[] spanArray = new TimeSpan[2];
+            if (adjustmentRuleForTime.DaylightDelta > TimeSpan.Zero)
+            {
+                spanArray[0] = this.m_baseUtcOffset;
+                spanArray[1] = this.m_baseUtcOffset + adjustmentRuleForTime.DaylightDelta;
+                return spanArray;
+            }
+            spanArray[0] = this.m_baseUtcOffset + adjustmentRuleForTime.DaylightDelta;
+            spanArray[1] = this.m_baseUtcOffset;
+            return spanArray;
+        }
+
+        private DateTimeKind GetCorrespondingKind()
+        {
+            if (this == s_utcTimeZone)
+            {
+                return DateTimeKind.Utc;
+            }
+            if (this == s_localTimeZone)
+            {
+                return DateTimeKind.Local;
+            }
+            return DateTimeKind.Unspecified;
+        }
+
+        private static DaylightTime GetDaylightTime(int year, AdjustmentRule rule)
+        {
+            TimeSpan daylightDelta = rule.DaylightDelta;
+            DateTime start = TransitionTimeToDateTime(year, rule.DaylightTransitionStart);
+            return new DaylightTime(start, TransitionTimeToDateTime(year, rule.DaylightTransitionEnd), daylightDelta);
+        }
+
+        public override int GetHashCode()
+        {
+            return this.m_id.ToUpperInvariant().GetHashCode();
+        }
+
+        private static bool GetIsAmbiguousTime(DateTime time, AdjustmentRule rule, DaylightTime daylightTime)
+        {
+            bool flag = false;
+            if ((rule != null) && (rule.DaylightDelta != TimeSpan.Zero))
+            {
+                DateTime end;
+                DateTime time3;
+                DateTime time4;
+                DateTime time5;
+                if (rule.DaylightDelta > TimeSpan.Zero)
+                {
+                    end = daylightTime.End;
+                    time3 = daylightTime.End - rule.DaylightDelta;
+                }
+                else
+                {
+                    end = daylightTime.Start;
+                    time3 = daylightTime.Start + rule.DaylightDelta;
+                }
+                flag = (time >= time3) && (time < end);
+                if (flag || (end.Year == time3.Year))
+                {
+                    return flag;
+                }
+                try
+                {
+                    time4 = end.AddYears(1);
+                    time5 = time3.AddYears(1);
+                    flag = (time >= time5) && (time < time4);
+                }
+                catch (ArgumentOutOfRangeException)
+                {
+                }
+                if (flag)
+                {
+                    return flag;
+                }
+                try
+                {
+                    time4 = end.AddYears(-1);
+                    time5 = time3.AddYears(-1);
+                    flag = (time >= time5) && (time < time4);
+                }
+                catch (ArgumentOutOfRangeException)
+                {
+                }
+            }
+            return flag;
+        }
+
+        private static bool GetIsDaylightSavings(DateTime time, AdjustmentRule rule, DaylightTime daylightTime)
+        {
+            if (rule == null)
+            {
+                return false;
+            }
+            bool flag = rule.DaylightDelta > TimeSpan.Zero;
+            DateTime startTime = daylightTime.Start + (flag ? rule.DaylightDelta : TimeSpan.Zero);
+            DateTime endTime = daylightTime.End + (flag ? -(rule.DaylightDelta) : TimeSpan.Zero);
+            return CheckIsDst(startTime, time, endTime);
+        }
+
+        private static bool GetIsDaylightSavingsFromUtc(DateTime time, int Year, TimeSpan utc, AdjustmentRule rule)
+        {
+            if (rule == null)
+            {
+                return false;
+            }
+            TimeSpan span = utc;
+            DaylightTime daylightTime = GetDaylightTime(Year, rule);
+            DateTime startTime = daylightTime.Start - span;
+            DateTime endTime = (daylightTime.End - span) - rule.DaylightDelta;
+            return CheckIsDst(startTime, time, endTime);
+        }
+
+        private static bool GetIsInvalidTime(DateTime time, AdjustmentRule rule, DaylightTime daylightTime)
+        {
+            bool flag = false;
+            if ((rule != null) && (rule.DaylightDelta != TimeSpan.Zero))
+            {
+                DateTime end;
+                DateTime time3;
+                DateTime time4;
+                DateTime time5;
+                if (rule.DaylightDelta < TimeSpan.Zero)
+                {
+                    end = daylightTime.End;
+                    time3 = daylightTime.End - rule.DaylightDelta;
+                }
+                else
+                {
+                    end = daylightTime.Start;
+                    time3 = daylightTime.Start + rule.DaylightDelta;
+                }
+                flag = (time >= end) && (time < time3);
+                if (flag || (end.Year == time3.Year))
+                {
+                    return flag;
+                }
+                try
+                {
+                    time4 = end.AddYears(1);
+                    time5 = time3.AddYears(1);
+                    flag = (time >= time4) && (time < time5);
+                }
+                catch (ArgumentOutOfRangeException)
+                {
+                }
+                if (flag)
+                {
+                    return flag;
+                }
+                try
+                {
+                    time4 = end.AddYears(-1);
+                    time5 = time3.AddYears(-1);
+                    flag = (time >= time4) && (time < time5);
+                }
+                catch (ArgumentOutOfRangeException)
+                {
+                }
+            }
+            return flag;
+        }
+
+        [SecurityCritical]
+        private static TimeZoneInfo GetLocalTimeZone()
+        {
+            string id = null;
+            try
+            {
+                TimeZoneInfo info;
+                Exception exception;
+                TimeZoneInfo info2;
+                Exception exception2;
+                NativeMethods.DynamicTimeZoneInformation lpDynamicTimeZoneInformation = new NativeMethods.DynamicTimeZoneInformation();
+                long dynamicTimeZoneInformation = UnsafeNativeMethods.GetDynamicTimeZoneInformation(out lpDynamicTimeZoneInformation);
+                if (dynamicTimeZoneInformation == -1L)
+                {
+                    return CreateCustomTimeZone("Local", TimeSpan.Zero, "Local", "Local");
+                }
+                NativeMethods.TimeZoneInformation timeZone = new NativeMethods.TimeZoneInformation(lpDynamicTimeZoneInformation);
+                bool dstDisabled = CheckDaylightSavingTimeDisabled();
+                if (!string.IsNullOrEmpty(lpDynamicTimeZoneInformation.TimeZoneKeyName) && (TryGetTimeZone(lpDynamicTimeZoneInformation.TimeZoneKeyName, dstDisabled, out info, out exception) == TimeZoneInfoResult.Success))
+                {
+                    return info;
+                }
+                id = FindIdFromTimeZoneInformation(timeZone, out dstDisabled);
+                if ((id != null) && (TryGetTimeZone(id, dstDisabled, out info2, out exception2) == TimeZoneInfoResult.Success))
+                {
+                    return info2;
+                }
+                return GetLocalTimeZoneFromWin32Data(timeZone, dstDisabled);
+            }
+            catch (EntryPointNotFoundException)
+            {
+                bool flag2;
+                TimeZoneInfo info3;
+                Exception exception3;
+                NativeMethods.TimeZoneInformation lpTimeZoneInformation = new NativeMethods.TimeZoneInformation();
+                long timeZoneInformation = UnsafeNativeMethods.GetTimeZoneInformation(out lpTimeZoneInformation);
+                if (timeZoneInformation == -1L)
+                {
+                    return CreateCustomTimeZone("Local", TimeSpan.Zero, "Local", "Local");
+                }
+                id = FindIdFromTimeZoneInformation(lpTimeZoneInformation, out flag2);
+                if ((id != null) && (TryGetTimeZone(id, flag2, out info3, out exception3) == TimeZoneInfoResult.Success))
+                {
+                    return info3;
+                }
+                return GetLocalTimeZoneFromWin32Data(lpTimeZoneInformation, flag2);
+            }
+        }
+
+        private static TimeZoneInfo GetLocalTimeZoneFromWin32Data(NativeMethods.TimeZoneInformation timeZoneInformation, bool dstDisabled)
+        {
+            TimeZoneInfo info = null;
+            try
+            {
+                info = new TimeZoneInfo(timeZoneInformation, dstDisabled);
+            }
+            catch (ArgumentException)
+            {
+            }
+            catch (InvalidTimeZoneException)
+            {
+            }
+            return info;
+            try
+            {
+                info = new TimeZoneInfo(timeZoneInformation, true);
+            }
+            catch (ArgumentException)
+            {
+            }
+            catch (InvalidTimeZoneException)
+            {
+            }
+            return info;
+        }
+
+        [SecurityTreatAsSafe, SecurityCritical]
+        public static List<TimeZoneInfo> GetSystemTimeZones()
+        {
+            lock (s_internalSyncObject)
+            {
+                if (!s_allSystemTimeZonesRead)
+                {
+                    PermissionSet set = new PermissionSet(PermissionState.None);
+                    set.AddPermission(new RegistryPermission(RegistryPermissionAccess.Read, @"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones"));
+                    set.Assert();
+                    using (RegistryKey key = Registry.LocalMachine.OpenSubKey(@"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones", RegistryKeyPermissionCheck.Default, RegistryRights.ExecuteKey))
+                    {
+                        if (key == null)
+                        {
+                            List<TimeZoneInfo> list;
+                            if (s_systemTimeZones != null)
+                            {
+                                list = new List<TimeZoneInfo>(s_systemTimeZones.Values);
+                            }
+                            else
+                            {
+                                list = new List<TimeZoneInfo>();
+                            }
+                            s_readOnlySystemTimeZones = new List<TimeZoneInfo>(list);
+                            s_allSystemTimeZonesRead = true;
+                            return s_readOnlySystemTimeZones;
+                        }
+                        foreach (string str in key.GetSubKeyNames())
+                        {
+                            TimeZoneInfo info;
+                            Exception exception;
+                            TryGetTimeZone(str, false, out info, out exception);
+                        }
+                    }
+                    IComparer<TimeZoneInfo> comparer = new TimeZoneInfoComparer();
+                    List<TimeZoneInfo> list2 = new List<TimeZoneInfo>(s_systemTimeZones.Values);
+                    list2.Sort(comparer);
+                    s_readOnlySystemTimeZones = new List<TimeZoneInfo>(list2);
+                    s_allSystemTimeZonesRead = true;
+                }
+                return s_readOnlySystemTimeZones;
+            }
+        }
+
+        private static TimeZoneInfo GetTimeZone(string id)
+        {
+            TimeZoneInfo info;
+            Exception exception;
+            if (id == null)
+            {
+                throw new ArgumentNullException("id");
+            }
+            if (((id.Length == 0) || (id.Length > 0xff)) || id.Contains("\0"))
+            {
+                throw new TimeZoneNotFoundException("TimeZoneNotFound_MissingRegistryData, id");
+            }
+            switch (TryGetTimeZone(id, false, out info, out exception))
+            {
+                case TimeZoneInfoResult.Success:
+                    return info;
+
+                case TimeZoneInfoResult.InvalidTimeZoneException:
+                    throw new InvalidTimeZoneException("InvalidTimeZone_InvalidRegistryData, id", exception);
+
+                case TimeZoneInfoResult.SecurityException:
+                    throw new SecurityException("Security_CannotReadRegistryData, id", exception);
+            }
+            throw new TimeZoneNotFoundException("TimeZoneNotFound_MissingRegistryData, id", exception);
+        }
+
+        public TimeSpan GetUtcOffset(DateTime dateTime)
+        {
+            if (dateTime.Kind == DateTimeKind.Local)
+            {
+                DateTime time;
+                lock (s_internalSyncObject)
+                {
+                    if (this.GetCorrespondingKind() == DateTimeKind.Local)
+                    {
+                        return GetUtcOffset(dateTime, this);
+                    }
+                    time = ConvertTime(dateTime, Local, Utc, TimeZoneInfoOptions.NoThrowOnInvalidTime);
+                }
+                return GetUtcOffsetFromUtc(time, this);
+            }
+            if (dateTime.Kind != DateTimeKind.Utc)
+            {
+                return GetUtcOffset(dateTime, this);
+            }
+            if (this.GetCorrespondingKind() == DateTimeKind.Utc)
+            {
+                return this.m_baseUtcOffset;
+            }
+            return GetUtcOffsetFromUtc(dateTime, this);
+        }
+
+        public TimeSpan GetUtcOffset(DateTimeOffset dateTimeOffset)
+        {
+            return GetUtcOffsetFromUtc(dateTimeOffset.UtcDateTime, this);
+        }
+
+        private static TimeSpan GetUtcOffset(DateTime time, TimeZoneInfo zone)
+        {
+            TimeSpan baseUtcOffset = zone.BaseUtcOffset;
+            AdjustmentRule adjustmentRuleForTime = zone.GetAdjustmentRuleForTime(time);
+            if (adjustmentRuleForTime != null)
+            {
+                DaylightTime daylightTime = GetDaylightTime(time.Year, adjustmentRuleForTime);
+                bool flag = GetIsDaylightSavings(time, adjustmentRuleForTime, daylightTime);
+                baseUtcOffset += flag ? adjustmentRuleForTime.DaylightDelta : TimeSpan.Zero;
+            }
+            return baseUtcOffset;
+        }
+
+        private static TimeSpan GetUtcOffsetFromUtc(DateTime time, TimeZoneInfo zone)
+        {
+            bool flag;
+            return GetUtcOffsetFromUtc(time, zone, out flag);
+        }
+
+        private static TimeSpan GetUtcOffsetFromUtc(DateTime time, TimeZoneInfo zone, out bool isDaylightSavings)
+        {
+            int year;
+            AdjustmentRule adjustmentRuleForTime;
+            isDaylightSavings = false;
+            TimeSpan baseUtcOffset = zone.BaseUtcOffset;
+            if (time > new DateTime(0x270f, 12, 0x1f))
+            {
+                adjustmentRuleForTime = zone.GetAdjustmentRuleForTime(DateTime.MaxValue);
+                year = 0x270f;
+            }
+            else if (time < new DateTime(1, 1, 2))
+            {
+                adjustmentRuleForTime = zone.GetAdjustmentRuleForTime(DateTime.MinValue);
+                year = 1;
+            }
+            else
+            {
+                DateTime dateTime = time + baseUtcOffset;
+                year = time.Year;
+                adjustmentRuleForTime = zone.GetAdjustmentRuleForTime(dateTime);
+            }
+            if (adjustmentRuleForTime != null)
+            {
+                isDaylightSavings = GetIsDaylightSavingsFromUtc(time, year, zone.m_baseUtcOffset, adjustmentRuleForTime);
+                baseUtcOffset += isDaylightSavings ? adjustmentRuleForTime.DaylightDelta : TimeSpan.Zero;
+            }
+            return baseUtcOffset;
+        }
+
+        public bool HasSameRules(TimeZoneInfo other)
+        {
+            if (other == null)
+            {
+                throw new ArgumentNullException("other");
+            }
+            if ((this.m_baseUtcOffset != other.m_baseUtcOffset) || (this.m_supportsDaylightSavingTime != other.m_supportsDaylightSavingTime))
+            {
+                return false;
+            }
+            AdjustmentRule[] adjustmentRules = this.m_adjustmentRules;
+            AdjustmentRule[] ruleArray2 = other.m_adjustmentRules;
+            bool flag = ((adjustmentRules == null) && (ruleArray2 == null)) || ((adjustmentRules != null) && (ruleArray2 != null));
+            if (!flag)
+            {
+                return false;
+            }
+            if (adjustmentRules != null)
+            {
+                if (adjustmentRules.Length != ruleArray2.Length)
+                {
+                    return false;
+                }
+                for (int i = 0; i < adjustmentRules.Length; i++)
+                {
+                    if (!adjustmentRules[i].Equals(ruleArray2[i]))
+                    {
+                        return false;
+                    }
+                }
+            }
+            return flag;
+        }
+
+        public bool IsAmbiguousTime(DateTime dateTime)
+        {
+            DateTime time;
+            AdjustmentRule rule;
+            if (!this.m_supportsDaylightSavingTime)
+            {
+                return false;
+            }
+            if (dateTime.Kind == DateTimeKind.Local)
+            {
+                lock (s_internalSyncObject)
+                {
+                    time = ConvertTime(dateTime, Local, this, TimeZoneInfoOptions.NoThrowOnInvalidTime);
+                    goto Label_0068;
+                }
+            }
+            if (dateTime.Kind == DateTimeKind.Utc)
+            {
+                lock (s_internalSyncObject)
+                {
+                    time = ConvertTime(dateTime, Utc, this, TimeZoneInfoOptions.NoThrowOnInvalidTime);
+                    goto Label_0068;
+                }
+            }
+            time = dateTime;
+        Label_0068:
+            rule = this.GetAdjustmentRuleForTime(time);
+            if (rule != null)
+            {
+                DaylightTime daylightTime = GetDaylightTime(time.Year, rule);
+                return GetIsAmbiguousTime(time, rule, daylightTime);
+            }
+            return false;
+        }
+
+        public bool IsAmbiguousTime(DateTimeOffset dateTimeOffset)
+        {
+            if (!this.m_supportsDaylightSavingTime)
+            {
+                return false;
+            }
+            DateTimeOffset offset = ConvertTime(dateTimeOffset, this);
+            return this.IsAmbiguousTime(offset.DateTime);
+        }
+
+        public bool IsDaylightSavingTime(DateTime dateTime)
+        {
+            DateTime time;
+            AdjustmentRule rule;
+            if (!this.m_supportsDaylightSavingTime || (this.m_adjustmentRules == null))
+            {
+                return false;
+            }
+            if (dateTime.Kind == DateTimeKind.Local)
+            {
+                lock (s_internalSyncObject)
+                {
+                    time = ConvertTime(dateTime, Local, this, TimeZoneInfoOptions.NoThrowOnInvalidTime);
+                    goto Label_0064;
+                }
+            }
+            if (dateTime.Kind == DateTimeKind.Utc)
+            {
+                bool flag;
+                if (this.GetCorrespondingKind() == DateTimeKind.Utc)
+                {
+                    return false;
+                }
+                GetUtcOffsetFromUtc(dateTime, this, out flag);
+                return flag;
+            }
+            time = dateTime;
+        Label_0064:
+            rule = this.GetAdjustmentRuleForTime(time);
+            if (rule != null)
+            {
+                DaylightTime daylightTime = GetDaylightTime(time.Year, rule);
+                return GetIsDaylightSavings(time, rule, daylightTime);
+            }
+            return false;
+        }
+
+        public bool IsDaylightSavingTime(DateTimeOffset dateTimeOffset)
+        {
+            bool flag;
+            GetUtcOffsetFromUtc(dateTimeOffset.UtcDateTime, this, out flag);
+            return flag;
+        }
+
+        public bool IsInvalidTime(DateTime dateTime)
+        {
+            bool flag = false;
+            if ((dateTime.Kind != DateTimeKind.Unspecified) && ((dateTime.Kind != DateTimeKind.Local) || (this.GetCorrespondingKind() != DateTimeKind.Local)))
+            {
+                return flag;
+            }
+            AdjustmentRule adjustmentRuleForTime = this.GetAdjustmentRuleForTime(dateTime);
+            if (adjustmentRuleForTime != null)
+            {
+                DaylightTime daylightTime = GetDaylightTime(dateTime.Year, adjustmentRuleForTime);
+                return GetIsInvalidTime(dateTime, adjustmentRuleForTime, daylightTime);
+            }
+            return false;
+        }
+
+        void IDeserializationCallback.OnDeserialization(object sender)
+        {
+            try
+            {
+                bool flag;
+                ValidateTimeZoneInfo(this.m_id, this.m_baseUtcOffset, this.m_adjustmentRules, out flag);
+                if (flag != this.m_supportsDaylightSavingTime)
+                {
+                   throw new SerializationException("Serialization_CorruptField, SupportsDaylightSavingTime" );
+                }
+            }
+            catch (ArgumentException exception)
+            {
+                throw new SerializationException("Serialization_InvalidData", exception);
+            }
+            catch (InvalidTimeZoneException exception2)
+            {
+                throw new SerializationException("Serialization_InvalidData", exception2);
+            }
+        }
+
+        [SecurityPermission(SecurityAction.LinkDemand, Flags = SecurityPermissionFlag.SerializationFormatter)]
+        void ISerializable.GetObjectData(SerializationInfo info, StreamingContext context)
+        {
+            if (info == null)
+            {
+                throw new ArgumentNullException("info");
+            }
+            info.AddValue("Id", this.m_id);
+            info.AddValue("DisplayName", this.m_displayName);
+            info.AddValue("StandardName", this.m_standardDisplayName);
+            info.AddValue("DaylightName", this.m_daylightDisplayName);
+            info.AddValue("BaseUtcOffset", this.m_baseUtcOffset);
+            info.AddValue("AdjustmentRules", this.m_adjustmentRules);
+            info.AddValue("SupportsDaylightSavingTime", this.m_supportsDaylightSavingTime);
+        }
+
+        public string ToSerializedString()
+        {
+            return StringSerializer.GetSerializedString(this);
+        }
+
+        public override string ToString()
+        {
+            return this.DisplayName;
+        }
+
+        private static TransitionTime? TransitionTimeFromTimeZoneInformation(NativeMethods.RegistryTimeZoneInformation timeZoneInformation, bool readStartDate)
+        {
+            TransitionTime time;
+            if (timeZoneInformation.StandardDate.Month == 0)
+            {
+                return null;
+            }
+            if (readStartDate)
+            {
+                if (timeZoneInformation.DaylightDate.Year == 0)
+                {
+                    time = TransitionTime.CreateFloatingDateRule(new DateTime(1, 1, 1, timeZoneInformation.DaylightDate.Hour, timeZoneInformation.DaylightDate.Minute, timeZoneInformation.DaylightDate.Second, timeZoneInformation.DaylightDate.Milliseconds), timeZoneInformation.DaylightDate.Month, timeZoneInformation.DaylightDate.Day, (DayOfWeek)timeZoneInformation.DaylightDate.DayOfWeek);
+                }
+                else
+                {
+                    time = TransitionTime.CreateFixedDateRule(new DateTime(1, 1, 1, timeZoneInformation.DaylightDate.Hour, timeZoneInformation.DaylightDate.Minute, timeZoneInformation.DaylightDate.Second, timeZoneInformation.DaylightDate.Milliseconds), timeZoneInformation.DaylightDate.Month, timeZoneInformation.DaylightDate.Day);
+                }
+            }
+            else if (timeZoneInformation.StandardDate.Year == 0)
+            {
+                time = TransitionTime.CreateFloatingDateRule(new DateTime(1, 1, 1, timeZoneInformation.StandardDate.Hour, timeZoneInformation.StandardDate.Minute, timeZoneInformation.StandardDate.Second, timeZoneInformation.StandardDate.Milliseconds), timeZoneInformation.StandardDate.Month, timeZoneInformation.StandardDate.Day, (DayOfWeek)timeZoneInformation.StandardDate.DayOfWeek);
+            }
+            else
+            {
+                time = TransitionTime.CreateFixedDateRule(new DateTime(1, 1, 1, timeZoneInformation.StandardDate.Hour, timeZoneInformation.StandardDate.Minute, timeZoneInformation.StandardDate.Second, timeZoneInformation.StandardDate.Milliseconds), timeZoneInformation.StandardDate.Month, timeZoneInformation.StandardDate.Day);
+            }
+            return new TransitionTime?(time);
+        }
+
+        private static DateTime TransitionTimeToDateTime(int year, TransitionTime transitionTime)
+        {
+            DateTime time;
+            DateTime timeOfDay = transitionTime.TimeOfDay;
+            if (transitionTime.IsFixedDateRule)
+            {
+                int num = DateTime.DaysInMonth(year, transitionTime.Month);
+                return new DateTime(year, transitionTime.Month, (num < transitionTime.Day) ? num : transitionTime.Day, timeOfDay.Hour, timeOfDay.Minute, timeOfDay.Second, timeOfDay.Millisecond);
+            }
+            if (transitionTime.Week <= 4)
+            {
+                time = new DateTime(year, transitionTime.Month, 1, timeOfDay.Hour, timeOfDay.Minute, timeOfDay.Second, timeOfDay.Millisecond);
+                int dayOfWeek = (int)time.DayOfWeek;
+                int num3 = ((int)transitionTime.DayOfWeek) - dayOfWeek;
+                if (num3 < 0)
+                {
+                    num3 += 7;
+                }
+                num3 += 7 * (transitionTime.Week - 1);
+                if (num3 > 0)
+                {
+                    time = time.AddDays((double)num3);
+                }
+                return time;
+            }
+            int day = DateTime.DaysInMonth(year, transitionTime.Month);
+            time = new DateTime(year, transitionTime.Month, day, timeOfDay.Hour, timeOfDay.Minute, timeOfDay.Second, timeOfDay.Millisecond);
+            int num6 = (int)(time.DayOfWeek - transitionTime.DayOfWeek);
+            if (num6 < 0)
+            {
+                num6 += 7;
+            }
+            if (num6 > 0)
+            {
+                time = time.AddDays((double)-num6);
+            }
+            return time;
+        }
+
+        private static bool TryCompareStandardDate(NativeMethods.TimeZoneInformation timeZone, NativeMethods.RegistryTimeZoneInformation registryTimeZoneInfo)
+        {
+            return ((((((timeZone.Bias == registryTimeZoneInfo.Bias) && (timeZone.StandardBias == registryTimeZoneInfo.StandardBias)) && ((timeZone.StandardDate.Year == registryTimeZoneInfo.StandardDate.Year) && (timeZone.StandardDate.Month == registryTimeZoneInfo.StandardDate.Month))) && (((timeZone.StandardDate.DayOfWeek == registryTimeZoneInfo.StandardDate.DayOfWeek) && (timeZone.StandardDate.Day == registryTimeZoneInfo.StandardDate.Day)) && ((timeZone.StandardDate.Hour == registryTimeZoneInfo.StandardDate.Hour) && (timeZone.StandardDate.Minute == registryTimeZoneInfo.StandardDate.Minute)))) && (timeZone.StandardDate.Second == registryTimeZoneInfo.StandardDate.Second)) && (timeZone.StandardDate.Milliseconds == registryTimeZoneInfo.StandardDate.Milliseconds));
+        }
+
+        [SecurityTreatAsSafe, SecurityCritical]
+        private static bool TryCompareTimeZoneInformationToRegistry(NativeMethods.TimeZoneInformation timeZone, string id, out bool dstDisabled)
+        {
+            bool flag2;
+            dstDisabled = false;
+            try
+            {
+                PermissionSet set = new PermissionSet(PermissionState.None);
+                set.AddPermission(new RegistryPermission(RegistryPermissionAccess.Read, @"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones"));
+                set.Assert();
+                using (RegistryKey key = Registry.LocalMachine.OpenSubKey(string.Format(CultureInfo.InvariantCulture, @"{0}\{1}", new object[] { @"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones", id }), RegistryKeyPermissionCheck.Default, RegistryRights.ExecuteKey))
+                {
+                    NativeMethods.RegistryTimeZoneInformation information;
+                    if (key == null)
+                    {
+                        return false;
+                    }
+                    try
+                    {
+                        information = new NativeMethods.RegistryTimeZoneInformation((byte[])key.GetValue("TZI", null, RegistryValueOptions.None));
+                    }
+                    catch (InvalidCastException)
+                    {
+                        return false;
+                    }
+                    catch (ArgumentException)
+                    {
+                        return false;
+                    }
+                    if (!TryCompareStandardDate(timeZone, information))
+                    {
+                        return false;
+                    }
+                    dstDisabled = CheckDaylightSavingTimeDisabled();
+                    bool flag = (dstDisabled || CheckDaylightSavingTimeNotSupported(timeZone)) || (((((timeZone.DaylightBias == information.DaylightBias) && (timeZone.DaylightDate.Year == information.DaylightDate.Year)) && ((timeZone.DaylightDate.Month == information.DaylightDate.Month) && (timeZone.DaylightDate.DayOfWeek == information.DaylightDate.DayOfWeek))) && (((timeZone.DaylightDate.Day == information.DaylightDate.Day) && (timeZone.DaylightDate.Hour == information.DaylightDate.Hour)) && ((timeZone.DaylightDate.Minute == information.DaylightDate.Minute) && (timeZone.DaylightDate.Second == information.DaylightDate.Second)))) && (timeZone.DaylightDate.Milliseconds == information.DaylightDate.Milliseconds));
+                    if (flag)
+                    {
+                        string strA = key.GetValue("Std", string.Empty, RegistryValueOptions.None) as string;
+                        flag = string.Compare(strA, timeZone.StandardName, StringComparison.Ordinal) == 0;
+                    }
+                    flag2 = flag;
+                }
+            }
+            finally
+            {
+                PermissionSet.RevertAssert();
+            }
+            return flag2;
+        }
+
+        private static bool TryCreateAdjustmentRules(string id, NativeMethods.RegistryTimeZoneInformation defaultTimeZoneInformation, out AdjustmentRule[] rules, out Exception e)
+        {
+            e = null;
+            try
+            {
+                using (RegistryKey key = Registry.LocalMachine.OpenSubKey(string.Format(CultureInfo.InvariantCulture, @"{0}\{1}\Dynamic DST", new object[] { @"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones", id }), RegistryKeyPermissionCheck.Default, RegistryRights.ExecuteKey))
+                {
+                    if (key == null)
+                    {
+                        AdjustmentRule rule = CreateAdjustmentRuleFromTimeZoneInformation(defaultTimeZoneInformation, DateTime.MinValue.Date, DateTime.MaxValue.Date);
+                        if (rule == null)
+                        {
+                            rules = null;
+                        }
+                        else
+                        {
+                            rules = new AdjustmentRule[] { rule };
+                        }
+                        return true;
+                    }
+                    int year = (int)key.GetValue("FirstEntry", -1, RegistryValueOptions.None);
+                    int num2 = (int)key.GetValue("LastEntry", -1, RegistryValueOptions.None);
+                    if (((year == -1) || (num2 == -1)) || (year > num2))
+                    {
+                        rules = null;
+                        return false;
+                    }
+                    NativeMethods.RegistryTimeZoneInformation timeZoneInformation = new NativeMethods.RegistryTimeZoneInformation((byte[])key.GetValue(year.ToString(CultureInfo.InvariantCulture), null, RegistryValueOptions.None));
+                    if (year == num2)
+                    {
+                        AdjustmentRule rule2 = CreateAdjustmentRuleFromTimeZoneInformation(timeZoneInformation, DateTime.MinValue.Date, DateTime.MaxValue.Date);
+                        if (rule2 == null)
+                        {
+                            rules = null;
+                        }
+                        else
+                        {
+                            rules = new AdjustmentRule[] { rule2 };
+                        }
+                        return true;
+                    }
+                    List<AdjustmentRule> list = new List<AdjustmentRule>(1);
+                    AdjustmentRule item = CreateAdjustmentRuleFromTimeZoneInformation(timeZoneInformation, DateTime.MinValue.Date, new DateTime(year, 12, 0x1f));
+                    if (item != null)
+                    {
+                        list.Add(item);
+                    }
+                    for (int i = year + 1; i < num2; i++)
+                    {
+                        timeZoneInformation = new NativeMethods.RegistryTimeZoneInformation((byte[])key.GetValue(i.ToString(CultureInfo.InvariantCulture), null, RegistryValueOptions.None));
+                        AdjustmentRule rule4 = CreateAdjustmentRuleFromTimeZoneInformation(timeZoneInformation, new DateTime(i, 1, 1), new DateTime(i, 12, 0x1f));
+                        if (rule4 != null)
+                        {
+                            list.Add(rule4);
+                        }
+                    }
+                    timeZoneInformation = new NativeMethods.RegistryTimeZoneInformation((byte[])key.GetValue(num2.ToString(CultureInfo.InvariantCulture), null, RegistryValueOptions.None));
+                    AdjustmentRule rule5 = CreateAdjustmentRuleFromTimeZoneInformation(timeZoneInformation, new DateTime(num2, 1, 1), DateTime.MaxValue.Date);
+                    if (rule5 != null)
+                    {
+                        list.Add(rule5);
+                    }
+                    rules = list.ToArray();
+                    if ((rules != null) && (rules.Length == 0))
+                    {
+                        rules = null;
+                    }
+                }
+            }
+            catch (InvalidCastException exception)
+            {
+                rules = null;
+                e = exception;
+                return false;
+            }
+            catch (ArgumentOutOfRangeException exception2)
+            {
+                rules = null;
+                e = exception2;
+                return false;
+            }
+            catch (ArgumentException exception3)
+            {
+                rules = null;
+                e = exception3;
+                return false;
+            }
+            return true;
+        }
+
+        [SecurityTreatAsSafe, SecurityCritical, FileIOPermission(SecurityAction.Assert, AllLocalFiles = FileIOPermissionAccess.PathDiscovery)]
+        private static string TryGetLocalizedNameByMuiNativeResource(string resource)
+        {
+            string str;
+            int num;
+            if (string.IsNullOrEmpty(resource))
+            {
+                return string.Empty;
+            }
+            string[] strArray = resource.Split(new char[] { ',' }, StringSplitOptions.None);
+            if (strArray.Length != 2)
+            {
+                return string.Empty;
+            }
+            string folderPath = Environment.GetFolderPath(Environment.SpecialFolder.System);
+            string str3 = strArray[0].TrimStart(new char[] { '@' });
+            try
+            {
+                str = Path.Combine(folderPath, str3);
+            }
+            catch (ArgumentException)
+            {
+                return string.Empty;
+            }
+            if (!int.TryParse(strArray[1], NumberStyles.Integer, CultureInfo.InvariantCulture, out num))
+            {
+                return string.Empty;
+            }
+            num = -num;
+            try
+            {
+                StringBuilder fileMuiPath = new StringBuilder(260);
+                fileMuiPath.Length = 260;
+                int fileMuiPathLength = 260;
+                int languageLength = 0;
+                long enumerator = 0L;
+                if (!UnsafeNativeMethods.GetFileMUIPath(0x10, str, null, ref languageLength, fileMuiPath, ref fileMuiPathLength, ref enumerator))
+                {
+                    return string.Empty;
+                }
+                return TryGetLocalizedNameByNativeResource(fileMuiPath.ToString(), num);
+            }
+            catch (EntryPointNotFoundException)
+            {
+                return string.Empty;
+            }
+        }
+
+        [SecurityCritical]
+        private static string TryGetLocalizedNameByNativeResource(string filePath, int resource)
+        {
+            if (File.Exists(filePath))
+            {
+                using (SafeLibraryHandle handle = UnsafeNativeMethods.LoadLibraryEx(filePath, IntPtr.Zero, 2))
+                {
+                    if (!handle.IsInvalid)
+                    {
+                        StringBuilder buffer = new StringBuilder(500);
+                        buffer.Length = 500;
+                        if (UnsafeNativeMethods.LoadString(handle, resource, buffer, buffer.Length) != 0)
+                        {
+                            return buffer.ToString();
+                        }
+                    }
+                }
+            }
+            return string.Empty;
+        }
+
+        private static bool TryGetLocalizedNamesByRegistryKey(RegistryKey key, out string displayName, out string standardName, out string daylightName)
+        {
+            displayName = string.Empty;
+            standardName = string.Empty;
+            daylightName = string.Empty;
+            string str = key.GetValue("MUI_Display", string.Empty, RegistryValueOptions.None) as string;
+            string str2 = key.GetValue("MUI_Std", string.Empty, RegistryValueOptions.None) as string;
+            string str3 = key.GetValue("MUI_Dlt", string.Empty, RegistryValueOptions.None) as string;
+            if (!string.IsNullOrEmpty(str))
+            {
+                displayName = TryGetLocalizedNameByMuiNativeResource(str);
+            }
+            if (!string.IsNullOrEmpty(str2))
+            {
+                standardName = TryGetLocalizedNameByMuiNativeResource(str2);
+            }
+            if (!string.IsNullOrEmpty(str3))
+            {
+                daylightName = TryGetLocalizedNameByMuiNativeResource(str3);
+            }
+            if (string.IsNullOrEmpty(displayName))
+            {
+                displayName = key.GetValue("Display", string.Empty, RegistryValueOptions.None) as string;
+            }
+            if (string.IsNullOrEmpty(standardName))
+            {
+                standardName = key.GetValue("Std", string.Empty, RegistryValueOptions.None) as string;
+            }
+            if (string.IsNullOrEmpty(daylightName))
+            {
+                daylightName = key.GetValue("Dlt", string.Empty, RegistryValueOptions.None) as string;
+            }
+            return true;
+        }
+
+        private static TimeZoneInfoResult TryGetTimeZone(string id, bool dstDisabled, out TimeZoneInfo value, out Exception e)
+        {
+            TimeZoneInfoResult success = TimeZoneInfoResult.Success;
+            e = null;
+            TimeZoneInfo info = null;
+            if (s_systemTimeZones.TryGetValue(id, out info))
+            {
+                if (dstDisabled && info.m_supportsDaylightSavingTime)
+                {
+                    value = CreateCustomTimeZone(info.m_id, info.m_baseUtcOffset, info.m_displayName, info.m_standardDisplayName);
+                    return success;
+                }
+                value = new TimeZoneInfo(info.m_id, info.m_baseUtcOffset, info.m_displayName, info.m_standardDisplayName, info.m_daylightDisplayName, info.m_adjustmentRules, false);
+                return success;
+            }
+            if (!s_allSystemTimeZonesRead)
+            {
+                success = TryGetTimeZoneByRegistryKey(id, out info, out e);
+                if (success == TimeZoneInfoResult.Success)
+                {
+                    s_systemTimeZones.Add(id, info);
+                    if (dstDisabled && info.m_supportsDaylightSavingTime)
+                    {
+                        value = CreateCustomTimeZone(info.m_id, info.m_baseUtcOffset, info.m_displayName, info.m_standardDisplayName);
+                        return success;
+                    }
+                    value = new TimeZoneInfo(info.m_id, info.m_baseUtcOffset, info.m_displayName, info.m_standardDisplayName, info.m_daylightDisplayName, info.m_adjustmentRules, false);
+                    return success;
+                }
+                value = null;
+                return success;
+            }
+            success = TimeZoneInfoResult.TimeZoneNotFoundException;
+            value = null;
+            return success;
+        }
+
+        [SecurityCritical, SecurityTreatAsSafe]
+        private static TimeZoneInfoResult TryGetTimeZoneByRegistryKey(string id, out TimeZoneInfo value, out Exception e)
+        {
+            TimeZoneInfoResult invalidTimeZoneException;
+            e = null;
+            try
+            {
+                PermissionSet set = new PermissionSet(PermissionState.None);
+                set.AddPermission(new RegistryPermission(RegistryPermissionAccess.Read, @"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones"));
+                set.Assert();
+                using (RegistryKey key = Registry.LocalMachine.OpenSubKey(string.Format(CultureInfo.InvariantCulture, @"{0}\{1}", new object[] { @"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones", id }), RegistryKeyPermissionCheck.Default, RegistryRights.ExecuteKey))
+                {
+                    NativeMethods.RegistryTimeZoneInformation information;
+                    AdjustmentRule[] ruleArray;
+                    string str;
+                    string str2;
+                    string str3;
+                    if (key == null)
+                    {
+                        value = null;
+                        return TimeZoneInfoResult.TimeZoneNotFoundException;
+                    }
+                    try
+                    {
+                        information = new NativeMethods.RegistryTimeZoneInformation((byte[])key.GetValue("TZI", null, RegistryValueOptions.None));
+                    }
+                    catch (InvalidCastException exception)
+                    {
+                        value = null;
+                        e = exception;
+                        return TimeZoneInfoResult.InvalidTimeZoneException;
+                    }
+                    catch (ArgumentException exception2)
+                    {
+                        value = null;
+                        e = exception2;
+                        return TimeZoneInfoResult.InvalidTimeZoneException;
+                    }
+                    if (!TryCreateAdjustmentRules(id, information, out ruleArray, out e))
+                    {
+                        value = null;
+                        return TimeZoneInfoResult.InvalidTimeZoneException;
+                    }
+                    if (!TryGetLocalizedNamesByRegistryKey(key, out str, out str2, out str3))
+                    {
+                        value = null;
+                        invalidTimeZoneException = TimeZoneInfoResult.InvalidTimeZoneException;
+                    }
+                    else
+                    {
+                        try
+                        {
+                            value = new TimeZoneInfo(id, new TimeSpan(0, -information.Bias, 0), str, str2, str3, ruleArray, false);
+                            invalidTimeZoneException = TimeZoneInfoResult.Success;
+                        }
+                        catch (ArgumentException exception3)
+                        {
+                            value = null;
+                            e = exception3;
+                            invalidTimeZoneException = TimeZoneInfoResult.InvalidTimeZoneException;
+                        }
+                        catch (InvalidTimeZoneException exception4)
+                        {
+                            value = null;
+                            e = exception4;
+                            invalidTimeZoneException = TimeZoneInfoResult.InvalidTimeZoneException;
+                        }
+                    }
+                }
+            }
+            finally
+            {
+                PermissionSet.RevertAssert();
+            }
+            return invalidTimeZoneException;
+        }
+
+        internal static bool UtcOffsetOutOfRange(TimeSpan offset)
+        {
+            if (offset.TotalHours >= -14.0)
+            {
+                return (offset.TotalHours > 14.0);
+            }
+            return true;
+        }
+
+        private static void ValidateTimeZoneInfo(string id, TimeSpan baseUtcOffset, AdjustmentRule[] adjustmentRules, out bool adjustmentRulesSupportDst)
+        {
+            adjustmentRulesSupportDst = false;
+            if (id == null)
+            {
+                throw new ArgumentNullException("id");
+            }
+            if (id.Length == 0)
+            {
+                throw new ArgumentException("Argument_InvalidId , id");
+            }
+            if (UtcOffsetOutOfRange(baseUtcOffset))
+            {
+                throw new ArgumentOutOfRangeException("baseUtcOffset", "ArgumentOutOfRange_UtcOffset");
+            }
+            if ((baseUtcOffset.Ticks % 0x23c34600L) != 0L)
+            {
+                throw new ArgumentException("Argument_TimeSpanHasSeconds", "baseUtcOffset");
+            }
+            if ((adjustmentRules != null) && (adjustmentRules.Length != 0))
+            {
+                adjustmentRulesSupportDst = true;
+                AdjustmentRule rule = null;
+                AdjustmentRule rule2 = null;
+                for (int i = 0; i < adjustmentRules.Length; i++)
+                {
+                    rule = rule2;
+                    rule2 = adjustmentRules[i];
+                    if (rule2 == null)
+                    {
+                        throw new InvalidTimeZoneException("Argument_AdjustmentRulesNoNulls");
+                    }
+                    if (UtcOffsetOutOfRange(baseUtcOffset + rule2.DaylightDelta))
+                    {
+                        throw new InvalidTimeZoneException("ArgumentOutOfRange_UtcOffsetAndDaylightDelta");
+                    }
+                    if ((rule != null) && (rule2.DateStart <= rule.DateEnd))
+                    {
+                        throw new InvalidTimeZoneException("Argument_AdjustmentRulesOutOfOrder");
+                    }
+                }
+            }
+        }
+
+        // Properties
+        public TimeSpan BaseUtcOffset
+        {
+            get
+            {
+                return this.m_baseUtcOffset;
+            }
+        }
+
+        public string DaylightName
+        {
+            get
+            {
+                if (this.m_daylightDisplayName != null)
+                {
+                    return this.m_daylightDisplayName;
+                }
+                return string.Empty;
+            }
+        }
+
+        public string DisplayName
+        {
+            get
+            {
+                if (this.m_displayName != null)
+                {
+                    return this.m_displayName;
+                }
+                return string.Empty;
+            }
+        }
+
+        public string Id
+        {
+            get
+            {
+                return this.m_id;
+            }
+        }
+
+        public static TimeZoneInfo Local
+        {
+            [SecurityCritical]
+            get
+            {
+                TimeZoneInfo info = s_localTimeZone;
+                if (info != null)
+                {
+                    return info;
+                }
+                lock (s_internalSyncObject)
+                {
+                    if (s_localTimeZone == null)
+                    {
+                        TimeZoneInfo localTimeZone = GetLocalTimeZone();
+                        s_localTimeZone = new TimeZoneInfo(localTimeZone.m_id, localTimeZone.m_baseUtcOffset, localTimeZone.m_displayName, localTimeZone.m_standardDisplayName, localTimeZone.m_daylightDisplayName, localTimeZone.m_adjustmentRules, false);
+                    }
+                    return s_localTimeZone;
+                }
+            }
+        }
+
+        private static object s_internalSyncObject
+        {
+            get
+            {
+                if (s_hiddenInternalSyncObject == null)
+                {
+                    object obj2 = new object();
+                    System.Threading.Interlocked.CompareExchange(ref s_hiddenInternalSyncObject, obj2, null);
+                }
+                return s_hiddenInternalSyncObject;
+            }
+        }
+
+        private static Dictionary<string, TimeZoneInfo> s_systemTimeZones
+        {
+            get
+            {
+                if (s_hiddenSystemTimeZones == null)
+                {
+                    s_hiddenSystemTimeZones = new Dictionary<string, TimeZoneInfo>();
+                }
+                return s_hiddenSystemTimeZones;
+            }
+            set
+            {
+                s_hiddenSystemTimeZones = value;
+            }
+        }
+
+        public string StandardName
+        {
+            get
+            {
+                if (this.m_standardDisplayName != null)
+                {
+                    return this.m_standardDisplayName;
+                }
+                return string.Empty;
+            }
+        }
+
+        public bool SupportsDaylightSavingTime
+        {
+            get
+            {
+                return this.m_supportsDaylightSavingTime;
+            }
+        }
+
+        public static TimeZoneInfo Utc
+        {
+            get
+            {
+                TimeZoneInfo info = s_utcTimeZone;
+                if (info != null)
+                {
+                    return info;
+                }
+                lock (s_internalSyncObject)
+                {
+                    if (s_utcTimeZone == null)
+                    {
+                        s_utcTimeZone = CreateCustomTimeZone("UTC", TimeSpan.Zero, "UTC", "UTC");
+                    }
+                    return s_utcTimeZone;
+                }
+            }
+        }
+
+        // Nested Types
+        [Serializable, HostProtection(SecurityAction.LinkDemand, MayLeakOnAbort = true), HostProtection(SecurityAction.LinkDemand, MayLeakOnAbort = true)]
+        public sealed class AdjustmentRule : IEquatable<TimeZoneInfo.AdjustmentRule>, ISerializable, IDeserializationCallback
+        {
+            // Fields
+            private DateTime m_dateEnd;
+            private DateTime m_dateStart;
+            private TimeSpan m_daylightDelta;
+            private TimeZoneInfo.TransitionTime m_daylightTransitionEnd;
+            private TimeZoneInfo.TransitionTime m_daylightTransitionStart;
+
+            // Methods
+            private AdjustmentRule()
+            {
+            }
+
+            private AdjustmentRule(SerializationInfo info, StreamingContext context)
+            {
+                if (info == null)
+                {
+                    throw new ArgumentNullException("info");
+                }
+                this.m_dateStart = (DateTime)info.GetValue("DateStart", typeof(DateTime));
+                this.m_dateEnd = (DateTime)info.GetValue("DateEnd", typeof(DateTime));
+                this.m_daylightDelta = (TimeSpan)info.GetValue("DaylightDelta", typeof(TimeSpan));
+                this.m_daylightTransitionStart = (TimeZoneInfo.TransitionTime)info.GetValue("DaylightTransitionStart", typeof(TimeZoneInfo.TransitionTime));
+                this.m_daylightTransitionEnd = (TimeZoneInfo.TransitionTime)info.GetValue("DaylightTransitionEnd", typeof(TimeZoneInfo.TransitionTime));
+            }
+
+            public static TimeZoneInfo.AdjustmentRule CreateAdjustmentRule(DateTime dateStart, DateTime dateEnd, TimeSpan daylightDelta, TimeZoneInfo.TransitionTime daylightTransitionStart, TimeZoneInfo.TransitionTime daylightTransitionEnd)
+            {
+                ValidateAdjustmentRule(dateStart, dateEnd, daylightDelta, daylightTransitionStart, daylightTransitionEnd);
+                TimeZoneInfo.AdjustmentRule rule = new TimeZoneInfo.AdjustmentRule();
+                rule.m_dateStart = dateStart;
+                rule.m_dateEnd = dateEnd;
+                rule.m_daylightDelta = daylightDelta;
+                rule.m_daylightTransitionStart = daylightTransitionStart;
+                rule.m_daylightTransitionEnd = daylightTransitionEnd;
+                return rule;
+            }
+
+            public bool Equals(TimeZoneInfo.AdjustmentRule other)
+            {
+                return ((((((other != null) && (this.m_dateStart == other.m_dateStart)) && (this.m_dateEnd == other.m_dateEnd)) && (this.m_daylightDelta == other.m_daylightDelta)) && this.m_daylightTransitionEnd.Equals(other.m_daylightTransitionEnd)) && this.m_daylightTransitionStart.Equals(other.m_daylightTransitionStart));
+            }
+
+            public override int GetHashCode()
+            {
+                return this.m_dateStart.GetHashCode();
+            }
+
+            void IDeserializationCallback.OnDeserialization(object sender)
+            {
+                try
+                {
+                    ValidateAdjustmentRule(this.m_dateStart, this.m_dateEnd, this.m_daylightDelta, this.m_daylightTransitionStart, this.m_daylightTransitionEnd);
+                }
+                catch (ArgumentException exception)
+                {
+                    throw new SerializationException("Serialization_InvalidData", exception);
+                }
+            }
+
+            [SecurityPermission(SecurityAction.LinkDemand, Flags = SecurityPermissionFlag.SerializationFormatter)]
+            void ISerializable.GetObjectData(SerializationInfo info, StreamingContext context)
+            {
+                if (info == null)
+                {
+                    throw new ArgumentNullException("info");
+                }
+                info.AddValue("DateStart", this.m_dateStart);
+                info.AddValue("DateEnd", this.m_dateEnd);
+                info.AddValue("DaylightDelta", this.m_daylightDelta);
+                info.AddValue("DaylightTransitionStart", this.m_daylightTransitionStart);
+                info.AddValue("DaylightTransitionEnd", this.m_daylightTransitionEnd);
+            }
+
+            private static void ValidateAdjustmentRule(DateTime dateStart, DateTime dateEnd, TimeSpan daylightDelta, TimeZoneInfo.TransitionTime daylightTransitionStart, TimeZoneInfo.TransitionTime daylightTransitionEnd)
+            {
+                if (dateStart.Kind != DateTimeKind.Unspecified)
+                {
+                    throw new ArgumentException("Argument_DateTimeKindMustBeUnspecified", "dateStart");
+                }
+                if (dateEnd.Kind != DateTimeKind.Unspecified)
+                {
+                    throw new ArgumentException("Argument_DateTimeKindMustBeUnspecified", "dateEnd");
+                }
+                if (daylightTransitionStart.Equals(daylightTransitionEnd))
+                {
+                    throw new ArgumentException("Argument_TransitionTimesAreIdentical", "daylightTransitionEnd");
+                }
+                if (dateStart > dateEnd)
+                {
+                    throw new ArgumentException("Argument_OutOfOrderDateTimes", "dateStart");
+                }
+                if (TimeZoneInfo.UtcOffsetOutOfRange(daylightDelta))
+                {
+                    throw new ArgumentOutOfRangeException("daylightDelta", daylightDelta, "ArgumentOutOfRange_UtcOffset");
+                }
+                if ((daylightDelta.Ticks % 0x23c34600L) != 0L)
+                {
+                    throw new ArgumentException("Argument_TimeSpanHasSeconds", "daylightDelta");
+                }
+                if (dateStart.TimeOfDay != TimeSpan.Zero)
+                {
+                    throw new ArgumentException("Argument_DateTimeHasTimeOfDay", "dateStart");
+                }
+                if (dateEnd.TimeOfDay != TimeSpan.Zero)
+                {
+                    throw new ArgumentException("Argument_DateTimeHasTimeOfDay", "dateEnd");
+                }
+            }
+
+            // Properties
+            public DateTime DateEnd
+            {
+                get
+                {
+                    return this.m_dateEnd;
+                }
+            }
+
+            public DateTime DateStart
+            {
+                get
+                {
+                    return this.m_dateStart;
+                }
+            }
+
+            public TimeSpan DaylightDelta
+            {
+                get
+                {
+                    return this.m_daylightDelta;
+                }
+            }
+
+            public TimeZoneInfo.TransitionTime DaylightTransitionEnd
+            {
+                get
+                {
+                    return this.m_daylightTransitionEnd;
+                }
+            }
+
+            public TimeZoneInfo.TransitionTime DaylightTransitionStart
+            {
+                get
+                {
+                    return this.m_daylightTransitionStart;
+                }
+            }
+        }
+
+        private sealed class StringSerializer
+        {
+            // Fields
+            private const string dateTimeFormat = "MM:dd:yyyy";
+            private const char esc = '\\';
+            private const string escapedEsc = @"\\";
+            private const string escapedLhs = @"\[";
+            private const string escapedRhs = @"\]";
+            private const string escapedSep = @"\;";
+            private const string escString = @"\";
+            private const int initialCapacityForString = 0x40;
+            private const char lhs = '[';
+            private const string lhsString = "[";
+            private int m_currentTokenStartIndex;
+            private string m_serializedText;
+            private State m_state;
+            private const char rhs = ']';
+            private const string rhsString = "]";
+            private const char sep = ';';
+            private const string sepString = ";";
+            private const string timeOfDayFormat = "HH:mm:ss.FFF";
+
+            // Methods
+            private StringSerializer(string str)
+            {
+                this.m_serializedText = str;
+                this.m_state = State.StartOfToken;
+            }
+
+            public static TimeZoneInfo GetDeserializedTimeZoneInfo(string source)
+            {
+                TimeZoneInfo info;
+                TimeZoneInfo.StringSerializer serializer = new TimeZoneInfo.StringSerializer(source);
+                string nextStringValue = serializer.GetNextStringValue(false);
+                TimeSpan nextTimeSpanValue = serializer.GetNextTimeSpanValue(false);
+                string displayName = serializer.GetNextStringValue(false);
+                string standardDisplayName = serializer.GetNextStringValue(false);
+                string daylightDisplayName = serializer.GetNextStringValue(false);
+                TimeZoneInfo.AdjustmentRule[] nextAdjustmentRuleArrayValue = serializer.GetNextAdjustmentRuleArrayValue(false);
+                try
+                {
+                    info = TimeZoneInfo.CreateCustomTimeZone(nextStringValue, nextTimeSpanValue, displayName, standardDisplayName, daylightDisplayName, nextAdjustmentRuleArrayValue);
+                }
+                catch (ArgumentException exception)
+                {
+                    throw new SerializationException("Serialization_InvalidData", exception);
+                }
+                catch (InvalidTimeZoneException exception2)
+                {
+                    throw new SerializationException("Serialization_InvalidData", exception2);
+                }
+                return info;
+            }
+
+            private TimeZoneInfo.AdjustmentRule[] GetNextAdjustmentRuleArrayValue(bool canEndWithoutSeparator)
+            {
+                List<TimeZoneInfo.AdjustmentRule> list = new List<TimeZoneInfo.AdjustmentRule>(1);
+                int num = 0;
+                for (TimeZoneInfo.AdjustmentRule rule = this.GetNextAdjustmentRuleValue(true); rule != null; rule = this.GetNextAdjustmentRuleValue(true))
+                {
+                    list.Add(rule);
+                    num++;
+                }
+                if (!canEndWithoutSeparator)
+                {
+                    if (this.m_state == State.EndOfLine)
+                    {
+                        throw new SerializationException("Serialization_InvalidData");
+                    }
+                    if ((this.m_currentTokenStartIndex < 0) || (this.m_currentTokenStartIndex >= this.m_serializedText.Length))
+                    {
+                        throw new SerializationException("Serialization_InvalidData");
+                    }
+                }
+                if (num == 0)
+                {
+                    return null;
+                }
+                return list.ToArray();
+            }
+
+            private TimeZoneInfo.AdjustmentRule GetNextAdjustmentRuleValue(bool canEndWithoutSeparator)
+            {
+                TimeZoneInfo.AdjustmentRule rule;
+                if (this.m_state == State.EndOfLine)
+                {
+                    if (!canEndWithoutSeparator)
+                    {
+                        throw new SerializationException("Serialization_InvalidData");
+                    }
+                    return null;
+                }
+                if ((this.m_currentTokenStartIndex < 0) || (this.m_currentTokenStartIndex >= this.m_serializedText.Length))
+                {
+                    throw new SerializationException("Serialization_InvalidData");
+                }
+                if (this.m_serializedText[this.m_currentTokenStartIndex] == ';')
+                {
+                    return null;
+                }
+                if (this.m_serializedText[this.m_currentTokenStartIndex] != '[')
+                {
+                    throw new SerializationException("Serialization_InvalidData");
+                }
+                this.m_currentTokenStartIndex++;
+                DateTime nextDateTimeValue = this.GetNextDateTimeValue(false, "MM:dd:yyyy");
+                DateTime dateEnd = this.GetNextDateTimeValue(false, "MM:dd:yyyy");
+                TimeSpan nextTimeSpanValue = this.GetNextTimeSpanValue(false);
+                TimeZoneInfo.TransitionTime nextTransitionTimeValue = this.GetNextTransitionTimeValue(false);
+                TimeZoneInfo.TransitionTime daylightTransitionEnd = this.GetNextTransitionTimeValue(false);
+                if ((this.m_state == State.EndOfLine) || (this.m_currentTokenStartIndex >= this.m_serializedText.Length))
+                {
+                    throw new SerializationException("Serialization_InvalidData");
+                }
+                if (this.m_serializedText[this.m_currentTokenStartIndex] != ']')
+                {
+                    this.SkipVersionNextDataFields(1);
+                }
+                else
+                {
+                    this.m_currentTokenStartIndex++;
+                }
+                try
+                {
+                    rule = TimeZoneInfo.AdjustmentRule.CreateAdjustmentRule(nextDateTimeValue, dateEnd, nextTimeSpanValue, nextTransitionTimeValue, daylightTransitionEnd);
+                }
+                catch (ArgumentException exception)
+                {
+                    throw new SerializationException("Serialization_InvalidData", exception);
+                }
+                if (this.m_currentTokenStartIndex >= this.m_serializedText.Length)
+                {
+                    this.m_state = State.EndOfLine;
+                    return rule;
+                }
+                this.m_state = State.StartOfToken;
+                return rule;
+            }
+
+            private DateTime GetNextDateTimeValue(bool canEndWithoutSeparator, string format)
+            {
+                DateTime time;
+                if (!DateTime.TryParseExact(this.GetNextStringValue(canEndWithoutSeparator), format, DateTimeFormatInfo.InvariantInfo, DateTimeStyles.None, out time))
+                {
+                    throw new SerializationException("Serialization_InvalidData");
+                }
+                return time;
+            }
+
+            private int GetNextInt32Value(bool canEndWithoutSeparator)
+            {
+                int num;
+                if (!int.TryParse(this.GetNextStringValue(canEndWithoutSeparator), NumberStyles.AllowLeadingSign, CultureInfo.InvariantCulture, out num))
+                {
+                    throw new SerializationException("Serialization_InvalidData");
+                }
+                return num;
+            }
+
+            private string GetNextStringValue(bool canEndWithoutSeparator)
+            {
+                if (this.m_state == State.EndOfLine)
+                {
+                    if (!canEndWithoutSeparator)
+                    {
+                        throw new SerializationException("Serialization_InvalidData");
+                    }
+                    return null;
+                }
+                if ((this.m_currentTokenStartIndex < 0) || (this.m_currentTokenStartIndex >= this.m_serializedText.Length))
+                {
+                    throw new SerializationException("Serialization_InvalidData");
+                }
+                State notEscaped = State.NotEscaped;
+                StringBuilder builder = new StringBuilder(0x40);
+                for (int i = this.m_currentTokenStartIndex; i < this.m_serializedText.Length; i++)
+                {
+                    if (notEscaped == State.Escaped)
+                    {
+                        VerifyIsEscapableCharacter(this.m_serializedText[i]);
+                        builder.Append(this.m_serializedText[i]);
+                        notEscaped = State.NotEscaped;
+                    }
+                    else if (notEscaped == State.NotEscaped)
+                    {
+                        switch (this.m_serializedText[i])
+                        {
+                            case '[':
+                                throw new SerializationException("Serialization_InvalidData");
+
+                            case '\\':
+                                notEscaped = State.Escaped;
+                                break;
+
+                            case ']':
+                                if (!canEndWithoutSeparator)
+                                {
+                                    throw new SerializationException("Serialization_InvalidData");
+                                }
+                                this.m_currentTokenStartIndex = i;
+                                this.m_state = State.StartOfToken;
+                                return builder.ToString();
+
+                            case ';':
+                                this.m_currentTokenStartIndex = i + 1;
+                                if (this.m_currentTokenStartIndex >= this.m_serializedText.Length)
+                                {
+                                    this.m_state = State.EndOfLine;
+                                }
+                                else
+                                {
+                                    this.m_state = State.StartOfToken;
+                                }
+                                return builder.ToString();
+
+                            case '\0':
+                                throw new SerializationException("Serialization_InvalidData");
+
+                            default:
+                                builder.Append(this.m_serializedText[i]);
+                                break;
+                        }
+                    }
+                }
+                if (notEscaped == State.Escaped)
+                {
+                    throw new SerializationException("Serialization_InvalidEscapeSequence");
+                }
+                if (!canEndWithoutSeparator)
+                {
+                    throw new SerializationException("Serialization_InvalidData");
+                }
+                this.m_currentTokenStartIndex = this.m_serializedText.Length;
+                this.m_state = State.EndOfLine;
+                return builder.ToString();
+            }
+
+            private TimeSpan GetNextTimeSpanValue(bool canEndWithoutSeparator)
+            {
+                TimeSpan span;
+                int minutes = this.GetNextInt32Value(canEndWithoutSeparator);
+                try
+                {
+                    span = new TimeSpan(0, minutes, 0);
+                }
+                catch (ArgumentOutOfRangeException exception)
+                {
+                    throw new SerializationException("Serialization_InvalidData", exception);
+                }
+                return span;
+            }
+
+            private TimeZoneInfo.TransitionTime GetNextTransitionTimeValue(bool canEndWithoutSeparator)
+            {
+                TimeZoneInfo.TransitionTime time;
+                if ((this.m_state == State.EndOfLine) || ((this.m_currentTokenStartIndex < this.m_serializedText.Length) && (this.m_serializedText[this.m_currentTokenStartIndex] == ']')))
+                {
+                    throw new SerializationException("Serialization_InvalidData");
+                }
+                if ((this.m_currentTokenStartIndex < 0) || (this.m_currentTokenStartIndex >= this.m_serializedText.Length))
+                {
+                    throw new SerializationException("Serialization_InvalidData");
+                }
+                if (this.m_serializedText[this.m_currentTokenStartIndex] != '[')
+                {
+                    throw new SerializationException("Serialization_InvalidData");
+                }
+                this.m_currentTokenStartIndex++;
+                int num = this.GetNextInt32Value(false);
+                if ((num != 0) && (num != 1))
+                {
+                    throw new SerializationException("Serialization_InvalidData");
+                }
+                DateTime nextDateTimeValue = this.GetNextDateTimeValue(false, "HH:mm:ss.FFF");
+                nextDateTimeValue = new DateTime(1, 1, 1, nextDateTimeValue.Hour, nextDateTimeValue.Minute, nextDateTimeValue.Second, nextDateTimeValue.Millisecond);
+                int month = this.GetNextInt32Value(false);
+                if (num == 1)
+                {
+                    int day = this.GetNextInt32Value(false);
+                    try
+                    {
+                        time = TimeZoneInfo.TransitionTime.CreateFixedDateRule(nextDateTimeValue, month, day);
+                        goto Label_015B;
+                    }
+                    catch (ArgumentException exception)
+                    {
+                        throw new SerializationException("Serialization_InvalidData", exception);
+                    }
+                }
+                int week = this.GetNextInt32Value(false);
+                int num5 = this.GetNextInt32Value(false);
+                try
+                {
+                    time = TimeZoneInfo.TransitionTime.CreateFloatingDateRule(nextDateTimeValue, month, week, (DayOfWeek)num5);
+                }
+                catch (ArgumentException exception2)
+                {
+                    throw new SerializationException("Serialization_InvalidData", exception2);
+                }
+            Label_015B:
+                if ((this.m_state == State.EndOfLine) || (this.m_currentTokenStartIndex >= this.m_serializedText.Length))
+                {
+                    throw new SerializationException("Serialization_InvalidData");
+                }
+                if (this.m_serializedText[this.m_currentTokenStartIndex] != ']')
+                {
+                    this.SkipVersionNextDataFields(1);
+                }
+                else
+                {
+                    this.m_currentTokenStartIndex++;
+                }
+                bool flag = false;
+                if ((this.m_currentTokenStartIndex < this.m_serializedText.Length) && (this.m_serializedText[this.m_currentTokenStartIndex] == ';'))
+                {
+                    this.m_currentTokenStartIndex++;
+                    flag = true;
+                }
+                if (!flag && !canEndWithoutSeparator)
+                {
+                    throw new SerializationException("Serialization_InvalidData");
+                }
+                if (this.m_currentTokenStartIndex >= this.m_serializedText.Length)
+                {
+                    this.m_state = State.EndOfLine;
+                    return time;
+                }
+                this.m_state = State.StartOfToken;
+                return time;
+            }
+
+            public static string GetSerializedString(TimeZoneInfo zone)
+            {
+                StringBuilder serializedText = new StringBuilder();
+                serializedText.Append(SerializeSubstitute(zone.Id));
+                serializedText.Append(';');
+                serializedText.Append(SerializeSubstitute(zone.BaseUtcOffset.TotalMinutes.ToString(CultureInfo.InvariantCulture)));
+                serializedText.Append(';');
+                serializedText.Append(SerializeSubstitute(zone.DisplayName));
+                serializedText.Append(';');
+                serializedText.Append(SerializeSubstitute(zone.StandardName));
+                serializedText.Append(';');
+                serializedText.Append(SerializeSubstitute(zone.DaylightName));
+                serializedText.Append(';');
+                TimeZoneInfo.AdjustmentRule[] adjustmentRules = zone.GetAdjustmentRules();
+                if ((adjustmentRules != null) && (adjustmentRules.Length > 0))
+                {
+                    for (int i = 0; i < adjustmentRules.Length; i++)
+                    {
+                        TimeZoneInfo.AdjustmentRule rule = adjustmentRules[i];
+                        serializedText.Append('[');
+                        serializedText.Append(SerializeSubstitute(rule.DateStart.ToString("MM:dd:yyyy", DateTimeFormatInfo.InvariantInfo)));
+                        serializedText.Append(';');
+                        serializedText.Append(SerializeSubstitute(rule.DateEnd.ToString("MM:dd:yyyy", DateTimeFormatInfo.InvariantInfo)));
+                        serializedText.Append(';');
+                        serializedText.Append(SerializeSubstitute(rule.DaylightDelta.TotalMinutes.ToString(CultureInfo.InvariantCulture)));
+                        serializedText.Append(';');
+                        SerializeTransitionTime(rule.DaylightTransitionStart, serializedText);
+                        serializedText.Append(';');
+                        SerializeTransitionTime(rule.DaylightTransitionEnd, serializedText);
+                        serializedText.Append(';');
+                        serializedText.Append(']');
+                    }
+                }
+                serializedText.Append(';');
+                return serializedText.ToString();
+            }
+
+            private static string SerializeSubstitute(string text)
+            {
+                text = text.Replace(@"\", @"\\");
+                text = text.Replace("[", @"\[");
+                text = text.Replace("]", @"\]");
+                return text.Replace(";", @"\;");
+            }
+
+            private static void SerializeTransitionTime(TimeZoneInfo.TransitionTime time, StringBuilder serializedText)
+            {
+                serializedText.Append('[');
+                serializedText.Append((time.IsFixedDateRule ? 1 : 0).ToString(CultureInfo.InvariantCulture));
+                serializedText.Append(';');
+                if (time.IsFixedDateRule)
+                {
+                    serializedText.Append(SerializeSubstitute(time.TimeOfDay.ToString("HH:mm:ss.FFF", DateTimeFormatInfo.InvariantInfo)));
+                    serializedText.Append(';');
+                    serializedText.Append(SerializeSubstitute(time.Month.ToString(CultureInfo.InvariantCulture)));
+                    serializedText.Append(';');
+                    serializedText.Append(SerializeSubstitute(time.Day.ToString(CultureInfo.InvariantCulture)));
+                    serializedText.Append(';');
+                }
+                else
+                {
+                    serializedText.Append(SerializeSubstitute(time.TimeOfDay.ToString("HH:mm:ss.FFF", DateTimeFormatInfo.InvariantInfo)));
+                    serializedText.Append(';');
+                    serializedText.Append(SerializeSubstitute(time.Month.ToString(CultureInfo.InvariantCulture)));
+                    serializedText.Append(';');
+                    serializedText.Append(SerializeSubstitute(time.Week.ToString(CultureInfo.InvariantCulture)));
+                    serializedText.Append(';');
+                    serializedText.Append(SerializeSubstitute(((int)time.DayOfWeek).ToString(CultureInfo.InvariantCulture)));
+                    serializedText.Append(';');
+                }
+                serializedText.Append(']');
+            }
+
+            private void SkipVersionNextDataFields(int depth)
+            {
+                if ((this.m_currentTokenStartIndex < 0) || (this.m_currentTokenStartIndex >= this.m_serializedText.Length))
+                {
+                    throw new SerializationException("Serialization_InvalidData");
+                }
+                State notEscaped = State.NotEscaped;
+                for (int i = this.m_currentTokenStartIndex; i < this.m_serializedText.Length; i++)
+                {
+                    switch (notEscaped)
+                    {
+                        case State.Escaped:
+                            {
+                                VerifyIsEscapableCharacter(this.m_serializedText[i]);
+                                notEscaped = State.NotEscaped;
+                                continue;
+                            }
+                        case State.NotEscaped:
+                            switch (this.m_serializedText[i])
+                            {
+                                case '[':
+                                    {
+                                        depth++;
+                                        continue;
+                                    }
+                                case '\\':
+                                    {
+                                        notEscaped = State.Escaped;
+                                        continue;
+                                    }
+                                case ']':
+                                    depth--;
+                                    if (depth != 0)
+                                    {
+                                        continue;
+                                    }
+                                    this.m_currentTokenStartIndex = i + 1;
+                                    if (this.m_currentTokenStartIndex < this.m_serializedText.Length)
+                                    {
+                                        goto Label_00B5;
+                                    }
+                                    this.m_state = State.EndOfLine;
+                                    return;
+
+                                case '\0':
+                                    throw new SerializationException("Serialization_InvalidData");
+                            }
+                            break;
+                    }
+                    continue;
+                Label_00B5:
+                    this.m_state = State.StartOfToken;
+                    return;
+                }
+                throw new SerializationException("Serialization_InvalidData");
+            }
+
+            private static void VerifyIsEscapableCharacter(char c)
+            {
+                if (((c != '\\') && (c != ';')) && ((c != '[') && (c != ']')))
+                {
+                    throw new SerializationException("Serialization_InvalidEscapeSequence " + c.ToString());
+                }
+            }
+
+            // Nested Types
+            private enum State
+            {
+                Escaped,
+                NotEscaped,
+                StartOfToken,
+                EndOfLine
+            }
+        }
+
+        private class TimeZoneInfoComparer : IComparer<TimeZoneInfo>
+        {
+            // Methods
+            int IComparer<TimeZoneInfo>.Compare(TimeZoneInfo x, TimeZoneInfo y)
+            {
+                return DevComponents.AdvTree.Utilities.CompareAlphaNumeric(x.Id, y.Id);
+            }
+        }
+
+        private enum TimeZoneInfoResult
+        {
+            Success,
+            TimeZoneNotFoundException,
+            InvalidTimeZoneException,
+            SecurityException
+        }
+
+        [Serializable, StructLayout(LayoutKind.Sequential), HostProtection(SecurityAction.LinkDemand, MayLeakOnAbort = true), HostProtection(SecurityAction.LinkDemand, MayLeakOnAbort = true)]
+        public struct TransitionTime : IEquatable<TimeZoneInfo.TransitionTime>, ISerializable, IDeserializationCallback
+        {
+            private DateTime m_timeOfDay;
+            private byte m_month;
+            private byte m_week;
+            private byte m_day;
+            private DayOfWeek m_dayOfWeek;
+            private bool m_isFixedDateRule;
+            public DateTime TimeOfDay
+            {
+                get
+                {
+                    return this.m_timeOfDay;
+                }
+            }
+            public int Month
+            {
+                get
+                {
+                    return this.m_month;
+                }
+            }
+            public int Week
+            {
+                get
+                {
+                    return this.m_week;
+                }
+            }
+            public int Day
+            {
+                get
+                {
+                    return this.m_day;
+                }
+            }
+            public DayOfWeek DayOfWeek
+            {
+                get
+                {
+                    return this.m_dayOfWeek;
+                }
+            }
+            public bool IsFixedDateRule
+            {
+                get
+                {
+                    return this.m_isFixedDateRule;
+                }
+            }
+            public override bool Equals(object obj)
+            {
+                return ((obj is TimeZoneInfo.TransitionTime) && this.Equals((TimeZoneInfo.TransitionTime)obj));
+            }
+
+            public static bool operator ==(TimeZoneInfo.TransitionTime left, TimeZoneInfo.TransitionTime right)
+            {
+                return left.Equals(right);
+            }
+
+            public static bool operator !=(TimeZoneInfo.TransitionTime left, TimeZoneInfo.TransitionTime right)
+            {
+                return !left.Equals(right);
+            }
+
+            public bool Equals(TimeZoneInfo.TransitionTime other)
+            {
+                bool flag = ((this.m_isFixedDateRule == other.m_isFixedDateRule) && (this.m_timeOfDay == other.m_timeOfDay)) && (this.m_month == other.m_month);
+                if (!flag)
+                {
+                    return flag;
+                }
+                if (other.m_isFixedDateRule)
+                {
+                    return (this.m_day == other.m_day);
+                }
+                return ((this.m_week == other.m_week) && (this.m_dayOfWeek == other.m_dayOfWeek));
+            }
+
+            public override int GetHashCode()
+            {
+                return (this.m_month ^ (this.m_week << 8));
+            }
+
+            public static TimeZoneInfo.TransitionTime CreateFixedDateRule(DateTime timeOfDay, int month, int day)
+            {
+                return CreateTransitionTime(timeOfDay, month, 1, day, DayOfWeek.Sunday, true);
+            }
+
+            public static TimeZoneInfo.TransitionTime CreateFloatingDateRule(DateTime timeOfDay, int month, int week, DayOfWeek dayOfWeek)
+            {
+                return CreateTransitionTime(timeOfDay, month, week, 1, dayOfWeek, false);
+            }
+
+            private static TimeZoneInfo.TransitionTime CreateTransitionTime(DateTime timeOfDay, int month, int week, int day, DayOfWeek dayOfWeek, bool isFixedDateRule)
+            {
+                ValidateTransitionTime(timeOfDay, month, week, day, dayOfWeek);
+                TimeZoneInfo.TransitionTime time = new TimeZoneInfo.TransitionTime();
+                time.m_isFixedDateRule = isFixedDateRule;
+                time.m_timeOfDay = timeOfDay;
+                time.m_dayOfWeek = dayOfWeek;
+                time.m_day = (byte)day;
+                time.m_week = (byte)week;
+                time.m_month = (byte)month;
+                return time;
+            }
+
+            private static void ValidateTransitionTime(DateTime timeOfDay, int month, int week, int day, DayOfWeek dayOfWeek)
+            {
+                if (timeOfDay.Kind != DateTimeKind.Unspecified)
+                {
+                    throw new ArgumentException("Argument_DateTimeKindMustBeUnspecified", "timeOfDay");
+                }
+                if ((month < 1) || (month > 12))
+                {
+                    throw new ArgumentOutOfRangeException("month", "ArgumentOutOfRange_Month");
+                }
+                if ((day < 1) || (day > 0x1f))
+                {
+                    throw new ArgumentOutOfRangeException("day", "ArgumentOutOfRange_Day");
+                }
+                if ((week < 1) || (week > 5))
+                {
+                    throw new ArgumentOutOfRangeException("week", "ArgumentOutOfRange_Week");
+                }
+                if ((dayOfWeek < DayOfWeek.Sunday) || (dayOfWeek > DayOfWeek.Saturday))
+                {
+                    throw new ArgumentOutOfRangeException("dayOfWeek", "ArgumentOutOfRange_DayOfWeek");
+                }
+                if (((timeOfDay.Year != 1) || (timeOfDay.Month != 1)) || ((timeOfDay.Day != 1) || ((timeOfDay.Ticks % 0x2710L) != 0L)))
+                {
+                    throw new ArgumentException("Argument_DateTimeHasTicks", "timeOfDay");
+                }
+            }
+
+            void IDeserializationCallback.OnDeserialization(object sender)
+            {
+                try
+                {
+                    ValidateTransitionTime(this.m_timeOfDay, this.m_month, this.m_week, this.m_day, this.m_dayOfWeek);
+                }
+                catch (ArgumentException exception)
+                {
+                    throw new SerializationException("Serialization_InvalidData", exception);
+                }
+            }
+
+            [SecurityPermission(SecurityAction.LinkDemand, Flags = SecurityPermissionFlag.SerializationFormatter)]
+            void ISerializable.GetObjectData(SerializationInfo info, StreamingContext context)
+            {
+                if (info == null)
+                {
+                    throw new ArgumentNullException("info");
+                }
+                info.AddValue("TimeOfDay", this.m_timeOfDay);
+                info.AddValue("Month", this.m_month);
+                info.AddValue("Week", this.m_week);
+                info.AddValue("Day", this.m_day);
+                info.AddValue("RelativeDayOfWeek", this.m_dayOfWeek);
+                info.AddValue("IsFixedDateRule", this.m_isFixedDateRule);
+            }
+
+            private TransitionTime(SerializationInfo info, StreamingContext context)
+            {
+                if (info == null)
+                {
+                    throw new ArgumentNullException("info");
+                }
+                this.m_timeOfDay = (DateTime)info.GetValue("TimeOfDay", typeof(DateTime));
+                this.m_month = (byte)info.GetValue("Month", typeof(byte));
+                this.m_week = (byte)info.GetValue("Week", typeof(byte));
+                this.m_day = (byte)info.GetValue("Day", typeof(byte));
+                this.m_dayOfWeek = (DayOfWeek)info.GetValue("RelativeDayOfWeek", typeof(DayOfWeek));
+                this.m_isFixedDateRule = (bool)info.GetValue("IsFixedDateRule", typeof(bool));
+            }
+        }
+    }
+
+    [Flags]
+    internal enum TimeZoneInfoOptions
+    {
+        None = 1,
+        NoThrowOnInvalidTime = 2
+    }
+
+    [Serializable, HostProtection(SecurityAction.LinkDemand, MayLeakOnAbort = true)]
+    public class InvalidTimeZoneException : Exception
+    {
+        // Methods
+        public InvalidTimeZoneException()
+        {
+        }
+
+        public InvalidTimeZoneException(string message)
+            : base(message)
+        {
+        }
+
+        protected InvalidTimeZoneException(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
+
+        public InvalidTimeZoneException(string message, Exception innerException)
+            : base(message, innerException)
+        {
+        }
+    }
+
+    [Serializable, HostProtection(SecurityAction.LinkDemand, MayLeakOnAbort = true)]
+    public class TimeZoneNotFoundException : Exception
+    {
+        // Methods
+        public TimeZoneNotFoundException()
+        {
+        }
+
+        public TimeZoneNotFoundException(string message)
+            : base(message)
+        {
+        }
+
+        protected TimeZoneNotFoundException(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
+
+        public TimeZoneNotFoundException(string message, Exception innerException)
+            : base(message, innerException)
+        {
+        }
+    }
+
+    [SuppressUnmanagedCodeSecurity, HostProtection(SecurityAction.LinkDemand, MayLeakOnAbort = true)]
+    internal sealed class SafeLibraryHandle : Microsoft.Win32.SafeHandles.SafeHandleZeroOrMinusOneIsInvalid
+    {
+        // Methods
+        internal SafeLibraryHandle()
+            : base(true)
+        {
+        }
+
+        [ReliabilityContract(Consistency.WillNotCorruptState, Cer.Success), DllImport("kernel32.dll", CharSet = CharSet.Unicode)]
+        private static extern bool FreeLibrary(IntPtr hModule);
+        [DllImport("kernel32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
+        internal static extern SafeLibraryHandle LoadLibraryEx(string libFilename, IntPtr reserved, int flags);
+        protected override bool ReleaseHandle()
+        {
+            return FreeLibrary(base.handle);
+        }
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/TimeZoneInfo/UnsafeNativeMethods.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/TimeZoneInfo/UnsafeNativeMethods.cs
new file mode 100644
index 00000000..35e36361
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/TimeZoneInfo/UnsafeNativeMethods.cs	
@@ -0,0 +1,36 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Runtime.InteropServices;
+using System.Security;
+
+namespace DevComponents.Schedule
+{
+    [SuppressUnmanagedCodeSecurity]
+    internal static class UnsafeNativeMethods
+    {
+        [DllImport("kernel32.dll", SetLastError=true, ExactSpelling=true)]
+        internal static extern int GetDynamicTimeZoneInformation(out NativeMethods.DynamicTimeZoneInformation lpDynamicTimeZoneInformation);
+
+        [DllImport("kernel32.dll", SetLastError = true, ExactSpelling = true)]
+        internal static extern int GetTimeZoneInformation(out NativeMethods.TimeZoneInformation lpTimeZoneInformation);
+
+        [return: MarshalAs(UnmanagedType.Bool)]
+        [DllImport("kernel32.dll", SetLastError = true, ExactSpelling = true)]
+        internal static extern bool GetFileMUIPath(int flags, [MarshalAs(UnmanagedType.LPWStr)] string filePath, [MarshalAs(UnmanagedType.LPWStr)] StringBuilder language, ref int languageLength, [MarshalAs(UnmanagedType.LPWStr)] StringBuilder fileMuiPath, ref int fileMuiPathLength, ref long enumerator);
+
+        [SecurityCritical, DllImport("kernel32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
+        internal static extern SafeLibraryHandle LoadLibraryEx(string libFilename, IntPtr reserved, int flags);
+
+        [SecurityCritical, DllImport("user32.dll", EntryPoint = "LoadStringW", CallingConvention = CallingConvention.StdCall, CharSet = CharSet.Unicode, SetLastError = true, ExactSpelling = true)]
+        internal static extern int LoadString(SafeLibraryHandle handle, int id, StringBuilder buffer, int bufferLength);
+ 
+
+ 
+
+
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/WeeklyRecurrenceSettings.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/WeeklyRecurrenceSettings.cs
new file mode 100644
index 00000000..90a279bc
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/WeeklyRecurrenceSettings.cs	
@@ -0,0 +1,122 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel;
+
+namespace DevComponents.Schedule.Model
+{
+    /// <summary>
+    /// Defines weekly recurrence settings.
+    /// </summary>
+    public class WeeklyRecurrenceSettings : INotifyPropertyChanged, INotifySubPropertyChanged
+    {
+        #region Internal Implementation
+        private AppointmentRecurrence _Recurrence = null;
+        /// <summary>
+        /// Initializes a new instance of the WeeklyRecurrenceSettings class.
+        /// </summary>
+        /// <param name="recurrence"></param>
+        public WeeklyRecurrenceSettings(AppointmentRecurrence recurrence)
+        {
+            _Recurrence = recurrence;
+        }
+
+
+        private eDayOfWeekRecurrence _RepeatOnDaysOfWeek = eDayOfWeekRecurrence.All;
+        /// <summary>
+        /// Gets or sets the days of week on which appointment is repeated. This property is represented by bit-flag enum
+        /// which means that you can combine the values from eDayOfWeekRecurrence enum using OR operator to specify multiple values.
+        /// Default value is All.
+        /// <remarks>
+        /// <para>This property value cannot be set to eDayOfWeekRecurrence.None.</para> 
+        /// </remarks>
+        /// </summary>
+        [DefaultValue(eDayOfWeekRecurrence.All)]
+        public eDayOfWeekRecurrence RepeatOnDaysOfWeek
+        {
+            get { return _RepeatOnDaysOfWeek; }
+            set
+            {
+                if (value == eDayOfWeekRecurrence.None)
+                    throw new ArgumentException("RepeatOnDaysOfWeek cannot be set to eDayOfWeekRecurrence.None");
+
+                if (value != _RepeatOnDaysOfWeek)
+                {
+                    eDayOfWeekRecurrence oldValue = _RepeatOnDaysOfWeek;
+                    _RepeatOnDaysOfWeek = value;
+                    OnRepeatOnDaysOfWeekChanged(oldValue, value);
+                }
+            }
+        }
+
+        private void OnRepeatOnDaysOfWeekChanged(eDayOfWeekRecurrence oldValue, eDayOfWeekRecurrence newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("RepeatOnDaysOfWeek"));
+        }
+
+        private int _RepeatInterval = 1;
+        /// <summary>
+        /// Gets or sets the interval between recurring appointments. Default value is 1.
+        /// <remarks>
+        /// For example, setting RepeatInterval to 2 means that appointment will recur every 2 weeks.
+        /// </remarks>
+        /// </summary>
+        [DefaultValue(1)]
+        public int RepeatInterval
+        {
+            get { return _RepeatInterval; }
+            set
+            {
+                if (value != _RepeatInterval)
+                {
+                    int oldValue = _RepeatInterval;
+                    _RepeatInterval = value;
+                    OnRepeatIntervalChanged(oldValue, value);
+                }
+            }
+        }
+
+        private void OnRepeatIntervalChanged(int oldValue, int newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("RepeatInterval"));
+        }
+        #endregion
+
+        #region INotifyPropertyChanged Members
+        /// <summary>
+        /// Occurs when property value has changed.
+        /// </summary>
+        public event PropertyChangedEventHandler PropertyChanged;
+        /// <summary>
+        /// Raises the PropertyChanged event.
+        /// </summary>
+        /// <param name="e">Event arguments</param>
+        protected virtual void OnPropertyChanged(PropertyChangedEventArgs e)
+        {
+            PropertyChangedEventHandler eh = PropertyChanged;
+            if (eh != null) eh(this, e);
+            OnSubPropertyChanged(new SubPropertyChangedEventArgs(this, e));
+        }
+        #endregion
+
+        #region INotifySubPropertyChanged Members
+        /// <summary>
+        /// Occurs when property or property of child objects has changed. This event is similar to PropertyChanged event with key
+        /// difference that it occurs for the property changed of child objects as well.
+        /// </summary>
+        public event SubPropertyChangedEventHandler SubPropertyChanged;
+        /// <summary>
+        /// Raises the SubPropertyChanged event.
+        /// </summary>
+        /// <param name="e">Event arguments</param>
+        protected virtual void OnSubPropertyChanged(SubPropertyChangedEventArgs e)
+        {
+            SubPropertyChangedEventHandler eh = SubPropertyChanged;
+            if (eh != null) eh(this, e);
+        }
+        #endregion
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/WorkDay.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/WorkDay.cs
new file mode 100644
index 00000000..a19bd64d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/WorkDay.cs	
@@ -0,0 +1,70 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel;
+
+namespace DevComponents.Schedule.Model
+{
+    /// <summary>
+    /// Represents working day in calendar.
+    /// </summary>
+    public class WorkDay : BaseWorkDay
+    {
+        #region Internal Implementation
+        /// <summary>
+        /// Initializes a new instance of the WorkDay class.
+        /// </summary>
+        public WorkDay()
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the WorkDay class.
+        /// </summary>
+        /// <param name="dayOfWeek"></param>
+        public WorkDay(DayOfWeek dayOfWeek)
+        {
+            _DayOfWeek = dayOfWeek;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the WorkDay class.
+        /// </summary>
+        /// <param name="dayOfWeek"></param>
+        /// <param name="workStartTime"></param>
+        /// <param name="workEndTime"></param>
+        public WorkDay(DayOfWeek dayOfWeek, WorkTime workStartTime, WorkTime workEndTime)
+        {
+            _DayOfWeek = dayOfWeek;
+            _WorkStartTime = workStartTime;
+            _WorkEndTime = workEndTime;
+        }
+
+        private DayOfWeek _DayOfWeek = DayOfWeek.Monday;
+        /// <summary>
+        /// Gets or sets the day of week this instance represents.
+        /// </summary>
+        public DayOfWeek DayOfWeek
+        {
+            get { return _DayOfWeek; }
+            set
+            {
+                if (value != _DayOfWeek)
+                {
+                    DayOfWeek oldValue = _DayOfWeek;
+                    _DayOfWeek = value;
+                    OnDayOfWeekChanged(oldValue, value);
+                }
+            }
+        }
+
+        private void OnDayOfWeekChanged(DayOfWeek oldValue, DayOfWeek newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("DayOfWeek"));
+        }
+        #endregion
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/WorkDayCollection.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/WorkDayCollection.cs
new file mode 100644
index 00000000..8269ef37
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/WorkDayCollection.cs	
@@ -0,0 +1,171 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Collections.ObjectModel;
+
+namespace DevComponents.Schedule.Model
+{
+    /// <summary>
+    /// Represents collection of working days.
+    /// </summary>
+    public class WorkDayCollection : Collection<WorkDay>
+    {
+        #region Constructor
+        /// <summary>
+        /// Initializes a new instance of the AppointmentCollection class.
+        /// </summary>
+        /// <param name="calendar"></param>
+        public WorkDayCollection(CalendarModel calendar)
+        {
+            _Calendar = calendar;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the WorkDayCollection class.
+        /// </summary>
+        /// <param name="owner"></param>
+        public WorkDayCollection(Owner owner)
+        {
+            _Owner = owner;
+        }
+        #endregion
+        #region Internal Implementation
+        private Owner _Owner = null;
+        /// <summary>
+        /// Gets the Owner of work-day collection.
+        /// </summary>
+        public Owner Owner
+        {
+            get { return _Owner; }
+            internal set { _Owner = value; }
+        }
+
+        private CalendarModel _Calendar = null;
+        /// <summary>
+        /// Gets the calendar collection is associated with.
+        /// </summary>
+        public CalendarModel Calendar
+        {
+            get { return _Calendar; }
+            internal set
+            {
+                _Calendar = value;
+                UpdateItemsCalendarModel();
+            }
+        }
+
+        internal void UpdateItemsCalendarModel()
+        {
+            CalendarModel model = GetCalendarModel();
+            foreach (WorkDay item in this.Items)
+            {
+                item.Calendar = model;
+            }
+        }
+
+        protected override void RemoveItem(int index)
+        {
+            WorkDay day = this[index];
+            OnBeforeRemove(index, day);
+            base.RemoveItem(index);
+            OnAfterRemove(index, day);
+        }
+
+        private void OnAfterRemove(int index, WorkDay day)
+        {
+            CalendarModel model = GetCalendarModel();
+            if (model != null)
+                model.WorkDayRemoved(day);
+        }
+
+        private void OnBeforeRemove(int index, WorkDay day)
+        {
+            day.Calendar = null;
+        }
+
+        protected override void InsertItem(int index, WorkDay item)
+        {
+            OnBeforeInsert(index, item);
+            base.InsertItem(index, item);
+            OnAfterInsert(index, item);
+        }
+
+        private void OnAfterInsert(int index, WorkDay item)
+        {
+            CalendarModel model = GetCalendarModel();
+            if (model != null)
+                model.WorkDayAdded(item);
+        }
+
+        private void OnBeforeInsert(int index, WorkDay item)
+        {
+            if (this[item.DayOfWeek] != null)
+                throw new InvalidOperationException("Day '" + item.DayOfWeek.ToString() + "' already in collection.");
+            item.Calendar = GetCalendarModel();
+        }
+
+        private CalendarModel GetCalendarModel()
+        {
+            if (_Calendar != null) return _Calendar;
+            if (_Owner != null) return _Owner.Calendar;
+            return null;
+        }
+
+        protected override void SetItem(int index, WorkDay newItem)
+        {
+            WorkDay oldItem = this[index];
+            OnBeforeSetItem(index, oldItem, newItem);
+            base.SetItem(index, newItem);
+            OnAfterSetItem(index, oldItem, newItem);
+        }
+
+        private void OnAfterSetItem(int index, WorkDay oldItem, WorkDay newItem)
+        {
+            CalendarModel model = GetCalendarModel();
+            if (model != null)
+            {
+                model.WorkDayRemoved(oldItem);
+                model.WorkDayAdded(newItem);
+            }
+        }
+
+        private void OnBeforeSetItem(int index, WorkDay oldItem, WorkDay newItem)
+        {
+            oldItem.Calendar = null;
+            newItem.Calendar = GetCalendarModel();
+        }
+
+        protected override void ClearItems()
+        {
+            CalendarModel model = GetCalendarModel();
+            foreach (WorkDay item in this)
+            {
+                item.Calendar = null;
+                if (model != null)
+                    model.WorkDayRemoved(item);
+            }
+            base.ClearItems();
+        }
+
+        /// <summary>
+        /// Gets the item based on the Key assigned to the item
+        /// </summary>
+        /// <param name="day">Day of week to retrive data for.</param>
+        /// <returns>Reference to WorkDay or null if no day in collection.</returns>
+        public WorkDay this[DayOfWeek day]
+        {
+            get
+            {
+                foreach (WorkDay item in this.Items)
+                {
+                    if (item.DayOfWeek == day) return item;
+                }
+                return null;
+            }
+        }
+        #endregion
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/WorkTime.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/WorkTime.cs
new file mode 100644
index 00000000..fd8bd243
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/WorkTime.cs	
@@ -0,0 +1,132 @@
+#if FRAMEWORK20
+using System;
+
+namespace DevComponents.Schedule.Model
+{
+    /// <summary>
+    /// Represents a work time.
+    /// </summary>
+    public struct WorkTime
+    {
+        #region Private variables
+
+        private int _Hour;      // Hour
+        private int _Minute;    // Minute
+
+        #endregion
+
+        /// <summary>
+        /// Initializes a new instance of the WorkTime structure.
+        /// </summary>
+        /// <param name="hour"></param>
+        /// <param name="minute"></param>
+        public WorkTime(int hour, int minute)
+        {
+            if (hour < 0 || hour > 23)
+                throw new ArgumentException("Hour value must be from 0 to 23");
+
+            if (minute < 0 || minute > 59)
+                throw new ArgumentException("Minute value must be from 0 to 59");
+
+            _Hour = hour;
+            _Minute = minute;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets or sets the hour from 0 to 23 this time instance represents.
+        /// </summary>
+        public int Hour
+        {
+            get { return _Hour; }
+
+            set
+            {
+                if (value < 0 || value > 23)
+                    throw new ArgumentException("Hour value must be from 0 to 23");
+
+                _Hour = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the minute from 0 to 59 this time instance represents.
+        /// </summary>
+        public int Minute
+        {
+            get { return _Minute; }
+
+            set
+            {
+                if (value < 0 || value > 59)
+                    throw new ArgumentException("Minute value must be from 0 to 59");
+
+                _Minute = value;
+            }
+        }
+
+        /// <summary>
+        /// Determines if the WorkTime is Empty
+        /// </summary>
+        public bool IsEmpty
+        {
+            get
+            {
+                return (_Hour == 0 && _Minute == 0);
+            }
+        }
+
+        #endregion
+
+        #region Operator overloades
+
+        public static bool operator >=(WorkTime op1, WorkTime op2)
+        {
+            if ((op1.Hour > op2.Hour) ||
+                (op1.Hour == op2.Hour && op1.Minute >= op2.Minute))
+            {
+                return (true);
+            }
+
+            return (false);
+        }
+
+        public static bool operator <=(WorkTime op1, WorkTime op2)
+        {
+            if ((op1.Hour < op2.Hour) ||
+                (op1.Hour == op2.Hour && op1.Minute <= op2.Minute))
+            {
+                return (true);
+            }
+
+            return (false);
+        }
+
+        public static bool operator >(WorkTime op1, WorkTime op2)
+        {
+            if ((op1.Hour > op2.Hour) ||
+                (op1.Hour == op2.Hour && op1.Minute > op2.Minute))
+            {
+                return (true);
+            }
+
+            return (false);
+        }
+
+        public static bool operator <(WorkTime op1, WorkTime op2)
+        {
+            if ((op1.Hour < op2.Hour) ||
+                (op1.Hour == op2.Hour && op1.Minute < op2.Minute))
+            {
+                return (true);
+            }
+
+            return (false);
+        }
+
+        #endregion
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/Year.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/Year.cs
new file mode 100644
index 00000000..4e24b8de
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/Year.cs	
@@ -0,0 +1,72 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Collections.ObjectModel;
+
+namespace DevComponents.Schedule.Model
+{
+    /// <summary>
+    /// Represents the calendar year.
+    /// </summary>
+    public class Year
+    {
+        #region Internal Implementation
+        private int _Year = 0;
+        private CalendarModel _CalendarModel = null;
+        private ReadOnlyCollection<Month> _ReadOnlyMonths = null;
+        private List<Month> _Months = null;
+
+        /// <summary>
+        /// Initializes a new instance of the Year class.
+        /// </summary>
+        /// <param name="year"></param>
+        /// <param name="calendarModel"></param>
+        public Year(int year, CalendarModel calendarModel)
+        {
+            _Year = year;
+            _CalendarModel = calendarModel;
+        }
+
+        /// <summary>
+        /// Returns read-only collection of months in year.
+        /// </summary>
+        public ReadOnlyCollection<Month> Months
+        {
+            get
+            {
+                if (_ReadOnlyMonths == null)
+                    CreateCollection();
+                return _ReadOnlyMonths;
+            }
+        }
+
+        private void CreateCollection()
+        {
+            _Months = new List<Month>(12);
+            for (int i = 0; i < 12; i++)
+            {
+                _Months.Add(new Month(_CalendarModel, _Year, i + 1));
+            }
+            _ReadOnlyMonths = new ReadOnlyCollection<Month>(_Months);
+        }
+
+        internal void InvalidateAppointments()
+        {
+            if (_Months == null) return;
+            foreach (Month month in _Months)
+            {
+                month.InvalidateAppointments();
+            }
+        }
+
+        internal void InvalidateAppointments(int month, int day)
+        {
+            if (_Months == null) return;
+            _Months[month - 1].InvalidateAppointments(day);
+        }
+        #endregion
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/YearlyRecurrenceSettings.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/YearlyRecurrenceSettings.cs
new file mode 100644
index 00000000..fbf0a1a0
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/Model/YearlyRecurrenceSettings.cs	
@@ -0,0 +1,193 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel;
+
+namespace DevComponents.Schedule.Model
+{
+    /// <summary>
+    /// Defines yearly recurrence settings.
+    /// </summary>
+    public class YearlyRecurrenceSettings : INotifyPropertyChanged, INotifySubPropertyChanged
+    {
+        #region Internal Implementation
+        private AppointmentRecurrence _Recurrence = null;
+
+        /// <summary>
+        /// Initializes a new instance of the YearlyRecurrenceSettings class.
+        /// </summary>
+        /// <param name="recurrence"></param>
+        public YearlyRecurrenceSettings(AppointmentRecurrence recurrence)
+        {
+            _Recurrence = recurrence;
+        }
+
+        private int _RepeatInterval = 1;
+        /// <summary>
+        /// Gets or sets the interval between recurring appointments. Default value is 1.
+        /// <remarks>
+        /// For example, setting RepeatInterval to 2 means that appointment will recur every 2 years.
+        /// </remarks>
+        /// </summary>
+        [DefaultValue(1)]
+        public int RepeatInterval
+        {
+            get { return _RepeatInterval; }
+            set
+            {
+                if (value != _RepeatInterval)
+                {
+                    int oldValue = _RepeatInterval;
+                    _RepeatInterval = value;
+                    OnRepeatIntervalChanged(oldValue, value);
+                }
+            }
+        }
+
+        private void OnRepeatIntervalChanged(int oldValue, int newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("RepeatInterval"));
+        }
+
+        private int _RepeatOnDayOfMonth = 1;
+        /// <summary>
+        /// Gets or sets the day of month on which appointment is repeated.
+        /// When RepeatOnRelativeDayInMonth property is set to value other than None value of this property is not used.
+        /// </summary>
+        [DefaultValue(1)]
+        public int RepeatOnDayOfMonth
+        {
+            get { return _RepeatOnDayOfMonth; }
+            set
+            {
+                if (value != _RepeatOnDayOfMonth)
+                {
+                    int oldValue = _RepeatOnDayOfMonth;
+                    _RepeatOnDayOfMonth = value;
+                    OnRepeatOnDayOfMonthChanged(oldValue, value);
+                }
+            }
+        }
+
+        private void OnRepeatOnDayOfMonthChanged(int oldValue, int newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("RepeatOnDayOfMonth"));
+        }
+
+
+        private eRelativeDayInMonth _RepeatOnRelativeDayInMonth = eRelativeDayInMonth.None;
+        /// <summary>
+        /// Gets or sets whether appointment should repeat on first, second, third, fourth or last day in month as specified
+        /// by RepeatOnDayOfMonth property. Default value is None.
+        /// </summary>
+        [DefaultValue(eRelativeDayInMonth.None)]
+        public eRelativeDayInMonth RepeatOnRelativeDayInMonth
+        {
+            get { return _RepeatOnRelativeDayInMonth; }
+            set
+            {
+                if (value != _RepeatOnRelativeDayInMonth)
+                {
+                    eRelativeDayInMonth oldValue = _RepeatOnRelativeDayInMonth;
+                    _RepeatOnRelativeDayInMonth = value;
+                    OnRepeatOnRelativeDayInMonthChanged(oldValue, value);
+                }
+            }
+        }
+
+        private void OnRepeatOnRelativeDayInMonthChanged(eRelativeDayInMonth oldValue, eRelativeDayInMonth newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("RepeatOnRelativeDayInMonth"));
+        }
+
+        private DayOfWeek _RelativeDayOfWeek = DayOfWeek.Monday;
+        /// <summary>
+        /// Gets or sets the day of week on which relative repeat as specified by RepeatOnRelativeDayInMonth is effective.
+        /// For example setting RepeatOnRelativeDayInMonth to First and RelativeDayOfWeek to Monday will repeat the appointment on first
+        /// Monday in a month.
+        /// </summary>
+        [DefaultValue(DayOfWeek.Monday)]
+        public DayOfWeek RelativeDayOfWeek
+        {
+            get { return _RelativeDayOfWeek; }
+            set
+            {
+                if (value != _RelativeDayOfWeek)
+                {
+                    DayOfWeek oldValue = _RelativeDayOfWeek;
+                    _RelativeDayOfWeek = value;
+                    OnRelativeDayOfWeekChanged(oldValue, value);
+                }
+            }
+        }
+
+        private void OnRelativeDayOfWeekChanged(DayOfWeek oldValue, DayOfWeek newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("RelativeDayOfWeek"));
+        }
+
+        private int _RepeatOnMonth = 1;
+        /// <summary>
+        /// Gets or sets the month the appointment is repeated on every year.
+        /// </summary>
+        [DefaultValue(1)]
+        public int RepeatOnMonth
+        {
+            get { return _RepeatOnMonth; }
+            set
+            {
+                if (value < 1 || value > 12)
+                    throw new ArgumentException("Valid RepeatOnMonth values are between 1-12");
+                if (value != _RepeatOnMonth)
+                {
+                    int oldValue = _RepeatOnMonth;
+                    _RepeatOnMonth = value;
+                    OnRepeatOnMonthChanged(oldValue, value);
+                }
+            }
+        }
+
+        private void OnRepeatOnMonthChanged(int oldValue, int newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("RepeatOnMonth"));
+        }
+        #endregion
+
+        #region INotifyPropertyChanged Members
+        /// <summary>
+        /// Occurs when property value has changed.
+        /// </summary>
+        public event PropertyChangedEventHandler PropertyChanged;
+        /// <summary>
+        /// Raises the PropertyChanged event.
+        /// </summary>
+        /// <param name="e">Event arguments</param>
+        protected virtual void OnPropertyChanged(PropertyChangedEventArgs e)
+        {
+            PropertyChangedEventHandler eh = PropertyChanged;
+            if (eh != null) eh(this, e);
+            OnSubPropertyChanged(new SubPropertyChangedEventArgs(this, e));
+        }
+        #endregion
+
+        #region INotifySubPropertyChanged Members
+        /// <summary>
+        /// Occurs when property or property of child objects has changed. This event is similar to PropertyChanged event with key
+        /// difference that it occurs for the property changed of child objects as well.
+        /// </summary>
+        public event SubPropertyChangedEventHandler SubPropertyChanged;
+        /// <summary>
+        /// Raises the SubPropertyChanged event.
+        /// </summary>
+        /// <param name="e">Event arguments</param>
+        protected virtual void OnSubPropertyChanged(SubPropertyChangedEventArgs e)
+        {
+            SubPropertyChangedEventHandler eh = SubPropertyChanged;
+            if (eh != null) eh(this, e);
+        }
+        #endregion
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/ModelViewConnector.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/ModelViewConnector.cs
new file mode 100644
index 00000000..51293b1c
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/ModelViewConnector.cs	
@@ -0,0 +1,113 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using DevComponents.Schedule.Model;
+
+namespace DevComponents.DotNetBar.Schedule
+{
+    /// <summary>
+    /// Represents base class for the model to view connectors.
+    /// </summary>
+    internal abstract class ModelViewConnector
+    {
+        #region Internal Implementation
+
+        #region Private variables
+
+        private string _DisplayOwnerKey = "";
+
+        #endregion
+
+        #region Abstract defines
+
+        /// <summary>
+        /// Connects View to a model.
+        /// </summary>
+        public abstract void Connect();
+
+        /// <summary>
+        /// Disconnects view from model.
+        /// </summary>
+        public abstract void Disconnect();
+
+        /// <summary>
+        /// Gets whether connector has connected model to a view.
+        /// </summary>
+        public abstract bool IsConnected { get; }
+
+        public abstract eCalendarView GetView();
+
+        #endregion
+
+        #region Virtual methods
+
+        protected virtual bool IsAppointmentVisible(Appointment app)
+        {
+            if (app.Visible == false)
+                return (false);
+
+            if (string.IsNullOrEmpty(_DisplayOwnerKey)) 
+                return (true);
+
+            return (app.OwnerKey == _DisplayOwnerKey);
+        }
+
+        protected virtual bool IsCustomItemVisible(CustomCalendarItem item)
+        {
+            if (item.Visible == false)
+                return (false);
+
+            if (string.IsNullOrEmpty(_DisplayOwnerKey))
+                return (true);
+
+            return (item.OwnerKey.Equals(_DisplayOwnerKey));
+        }
+
+        /// <summary>
+        /// Gets or sets the owner key of the owner of the appointments displayed on the view.
+        /// </summary>
+        public virtual string DisplayOwnerKey
+        {
+            get { return _DisplayOwnerKey; }
+
+            set
+            {
+                if (value == null)
+                    value = "";
+
+                if (_DisplayOwnerKey != null)
+                {
+                    _DisplayOwnerKey = value;
+                }
+            }
+        }
+
+        public virtual List<Appointment> 
+            GetAppointmentList(CalendarModel model, DateTime startDate, DateTime endDate)
+        {
+            List<Appointment> appts = new List<Appointment>();
+
+            for (DateTime date = startDate; date <= endDate; date = date.AddDays(1))
+            {
+                Day day = model.GetDay(date);
+
+                if (day.Appointments.Count > 0)
+                {
+                    foreach (Appointment ap in day.Appointments)
+                    {
+                        if (appts.Contains(ap) == false)
+                            appts.Add(ap);
+                    }
+                }
+            }
+
+            return (appts);
+        }
+
+        #endregion
+
+        #endregion
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/MonthView/ModelMonthViewConnector.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/MonthView/ModelMonthViewConnector.cs
new file mode 100644
index 00000000..386cb539
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/MonthView/ModelMonthViewConnector.cs	
@@ -0,0 +1,598 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using DevComponents.Schedule.Model;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar.Schedule
+{
+    internal class ModelMonthViewConnector : ModelViewConnector
+    {
+        #region Constants
+
+        private const int DaysInWeek = 7;
+
+        #endregion
+
+        #region Private variables
+
+        private CalendarModel _Model;       // The associated CalendarModel
+        private MonthView _View;            // The associated MonthView
+
+        private bool _IsConnected;          // Connection status
+        private uint _RefreshCount;
+
+        #endregion
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="model">Assoc CalendarModel</param>
+        /// <param name="monthView">Assoc MonthView</param>
+        public ModelMonthViewConnector(CalendarModel model, MonthView monthView)
+        {
+            _Model = model;
+            _View = monthView;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the connection status
+        /// </summary>
+        public override bool IsConnected
+        {
+            get { return _IsConnected; }
+        }
+
+        #endregion
+
+        #region Connect
+
+        /// <summary>
+        /// Performs Model connection processing
+        /// </summary>
+        public override void Connect()
+        {
+            VerifyModel();
+
+            // Load the connection data
+
+            if (_IsConnected)
+                Disconnect();
+
+            LoadData();
+
+            // Get notification on Model property changes
+
+            _Model.PropertyChanged += ModelPropertyChanged;
+            _Model.SubPropertyChanged += ModelSubPropertyChanged;
+
+            _View.CalendarView.CustomItems.CollectionChanged += CustomItemsCollectionChanged;
+
+            _IsConnected = true;
+        }
+
+        #endregion
+
+        #region Disconnect
+
+        /// <summary>
+        /// Severs the Model/MonthView connection
+        /// </summary>
+        public override void Disconnect()
+        {
+            VerifyModel();
+
+            if (_IsConnected)
+            {
+                // Loop through each week, clearing each
+                // associated view connection
+
+                for (int i = 0; i < _View.MonthWeeks.Length; i++)
+                    ClearMonthWeek(_View.MonthWeeks[i]);
+
+                _View.SubItems.Clear();
+
+                // Stop notification on Model property changes
+
+                _Model.PropertyChanged -= ModelPropertyChanged;
+                _Model.SubPropertyChanged -= ModelSubPropertyChanged;
+
+                _View.CalendarView.CustomItems.CollectionChanged -= CustomItemsCollectionChanged;
+
+                _IsConnected = false;
+            }
+        }
+
+        /// <summary>
+        /// Clears individual MonthWeek view connections
+        /// </summary>
+        /// <param name="monthWeek">MonthWeek</param>
+        private void ClearMonthWeek(MonthWeek monthWeek)
+        {
+            if (monthWeek.CalendarItems.Count > 0)
+            {
+                // Loop through each CalendarItem, resetting
+                // it's associated connection
+
+                for (int i = monthWeek.CalendarItems.Count - 1; i >= 0; i--)
+                {
+                    AppointmentMonthView view =
+                        monthWeek.CalendarItems[i] as AppointmentMonthView;
+
+                    if (view != null)
+                    {
+                        view.IsSelectedChanged -= _View.ItemIsSelectedChanged;
+
+                        view.Appointment = null;
+                        view.IsSelected = false;
+                        view.MonthWeek = null;
+                    }
+
+                    monthWeek.CalendarItems.RemoveAt(i);
+                }
+            }
+        }
+
+        #endregion
+
+        #region LoadData
+
+        /// <summary>
+        /// Loads Model/MonthView connection data
+        /// </summary>
+        private void LoadData()
+        {
+            MonthWeek[] wks = _View.MonthWeeks;
+
+            if (wks.Length > 0)
+            {
+                _RefreshCount++;
+
+                DateTime startDate = wks[0].FirstDayOfWeek;
+                DateTime endDate = DateTimeHelper.EndOfDay(wks[wks.Length - 1].LastDayOfWeek);
+
+                DateTime appStartDate = startDate.AddMonths(-1);
+
+                List<Appointment> appts = GetAppointmentList(_Model, appStartDate, endDate);
+
+                for (int i = 0; i < wks.Length; i++)
+                {
+                    MonthWeek monthWeek = wks[i];
+
+                    startDate = monthWeek.FirstDayOfWeek;
+                    endDate = DateTimeHelper.EndOfDay(monthWeek.LastDayOfWeek);
+
+                    UpdateWeekView(monthWeek, appts, startDate, endDate);
+                    UpdateCustomItems(monthWeek, startDate, endDate);
+                }
+            }
+        }
+
+        #endregion
+
+        #region RefreshData
+
+        /// <summary>
+        /// Refreshes the data in a previously established
+        /// and loaded connection
+        /// </summary>
+        public void RefreshData()
+        {
+            LoadData();
+
+            List<CalendarItem> removedViews = null;
+
+            foreach (MonthWeek monthWeek in _View.MonthWeeks)
+                RemoveOutdatedViews(monthWeek, ref removedViews);
+
+            ProcessRemovedData(removedViews);
+        }
+
+        #region RemoveOutdatedViews
+
+        private void RemoveOutdatedViews(
+            MonthWeek monthWeek, ref List<CalendarItem> removedViews)
+        {
+            for (int i = monthWeek.CalendarItems.Count - 1; i >= 0; i--)
+            {
+                CalendarItem view = monthWeek.CalendarItems[i];
+
+                if (view != null)
+                {
+                    if (view.RefreshCount != _RefreshCount)
+                    {
+                        if (removedViews == null)
+                            removedViews = new List<CalendarItem>();
+
+                        removedViews.Add(view);
+
+                        _View.SubItems._Remove(view);
+                        _View.NeedRecalcSize = true;
+
+                        monthWeek.CalendarItems.RemoveAt(i);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region ProcessRemovedData
+
+        private void ProcessRemovedData(List<CalendarItem> removedViews)
+        {
+            if (removedViews != null && removedViews.Count > 0)
+            {
+                for (int i = 0; i < removedViews.Count; i++)
+                {
+                    CalendarItem item = removedViews[i];
+
+                    item.IsSelectedChanged -= _View.ItemIsSelectedChanged;
+
+                    item.Dispose();
+                }
+
+                _View.NeedRecalcLayout = true;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region UpdateWeekView
+
+        private void UpdateWeekView(MonthWeek monthWeek,
+            List<Appointment> apps, DateTime startDate, DateTime endDate)
+        {
+            // Loop through each appointment
+            // updating the assoc view accordingly
+
+            foreach (Appointment app in  apps)
+            {
+                if (app.StartTime < endDate && app.EndTime > startDate)
+                {
+                    if (IsAppointmentVisible(app))
+                    {
+                        // Get the assoc view
+
+                        AppointmentMonthView view = GetViewFromWeek(monthWeek, app) ??
+                                                    GetNewView(app);
+
+                        // Set the view start and end times to
+                        // match the assoc appointment
+
+                        view.StartTime = app.StartTime;
+                        view.EndTime = app.EndTime;
+
+                        view.RefreshCount = _RefreshCount;
+
+                        // And update the MonthWeek data
+
+                        if (view.MonthWeek == null)
+                        {
+                            view.MonthWeek = monthWeek;
+
+                            monthWeek.CalendarItems.Add(view);
+
+                            _View.SubItems.Add(view);
+                        }
+
+                        view.IsSelected = app.IsSelected;
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region UpdateCustomItems
+
+        private void UpdateCustomItems(
+            MonthWeek monthWeek, DateTime startDate, DateTime endDate)
+        {
+            CustomCalendarItemCollection items = _View.CalendarView.CustomItems;
+
+            if (items != null && items.Count > 0)
+            {
+                for (int i = 0; i < items.Count; i++)
+                {
+                    CustomCalendarItem item = items[i];
+
+                    if (IsCustomItemVisible(item) == true &&
+                        (item.StartTime < endDate && item.EndTime > startDate))
+                    {
+                        item.CalendarView = _View.CalendarView;
+
+                        CustomCalendarItem ci = GetItemFromWeek(monthWeek, item);
+
+                        if (ci == null)
+                        {
+                            ci = GetNewCustomItem(item);
+
+                            monthWeek.CalendarItems.Add(ci);
+
+                            _View.SubItems.Insert(0, ci);
+                        }
+
+                        ci.RefreshCount = _RefreshCount;
+
+                        if (ci.BaseCalendarItem != item)
+                        {
+                            ci.StartTime = item.StartTime;
+                            ci.EndTime = item.EndTime;
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region GetViewFrom
+
+        private List<AppointmentMonthView> GetViewsFromAll(Appointment app)
+        {
+            List<AppointmentMonthView> list = new List<AppointmentMonthView>();
+
+            for (int i = 0; i < _View.MonthWeeks.Length; i++)
+            {
+                AppointmentMonthView view =
+                    GetViewFromWeek(_View.MonthWeeks[i], app);
+
+                if (view != null)
+                    list.Add(view);
+            }
+
+            return (list);
+        }
+
+        private AppointmentMonthView GetViewFromWeek(MonthWeek monthWeek, Appointment appointment)
+        {
+            foreach (CalendarItem item in monthWeek.CalendarItems)
+            {
+                AppointmentMonthView view = item as AppointmentMonthView;
+
+                if (view != null && view.Appointment == appointment)
+                    return (view);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetItemFromWeek
+
+        private CustomCalendarItem GetItemFromWeek(MonthWeek monthWeek, CustomCalendarItem item)
+        {
+            foreach (CalendarItem citem in monthWeek.CalendarItems)
+            {
+                CustomCalendarItem view = citem as CustomCalendarItem;
+
+                if (view != null && (view == item || view.BaseCalendarItem == item))
+                    return (view);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetNewView
+
+        /// <summary>
+        /// Gets a new appointment view
+        /// </summary>
+        /// <param name="appointment">Appointment</param>
+        /// <returns>New view</returns>
+        private AppointmentMonthView GetNewView(Appointment appointment)
+        {
+            AppointmentMonthView view = new AppointmentMonthView(_View, appointment);
+
+            view.Tooltip = appointment.Tooltip;
+
+            // Set the selected state to match any current
+            // views that are present for this appointment
+
+            for (int i = 0; i < _View.MonthWeeks.Length; i++)
+            {
+                AppointmentMonthView viewPart =
+                    GetViewFromWeek(_View.MonthWeeks[i], appointment);
+
+                if (viewPart != null)
+                {
+                    view.IsSelected = viewPart.IsSelected;
+                    break;
+                }
+            }
+
+            view.IsSelectedChanged += _View.ItemIsSelectedChanged;
+
+            return (view);
+        }
+
+        #endregion
+
+        #region GetNewCustomItem
+
+        /// <summary>
+        /// Gets a new CustomItem
+        /// </summary>
+        /// <param name="item"></param>
+        /// <returns></returns>
+        private CustomCalendarItem GetNewCustomItem(CustomCalendarItem item)
+        {
+            CustomCalendarItem ci = (CustomCalendarItem)item.Copy();
+
+            ci.BaseCalendarItem = item;
+            ci.ModelItem = item;
+
+            // Set the selected state to match any current
+            // views that are present for this appointment
+
+            for (int i = 0; i < _View.MonthWeeks.Length; i++)
+            {
+                CustomCalendarItem viewPart =
+                    GetItemFromWeek(_View.MonthWeeks[i], item);
+
+                if (viewPart != null)
+                {
+                    ci.IsSelected = viewPart.IsSelected;
+                    break;
+                }
+            }
+
+            ci.IsSelectedChanged += _View.ItemIsSelectedChanged;
+
+            return (ci);
+        }
+
+        #endregion
+
+        #region GetView
+
+        /// <summary>
+        /// Returns the Month view
+        /// </summary>
+        /// <returns></returns>
+        public override eCalendarView GetView()
+        {
+            return (eCalendarView.Month);
+        }
+
+        /// <summary>
+        /// Verifies the Model and MonthView are valid
+        /// </summary>
+        private void VerifyModel()
+        {
+            if (_Model == null)
+                throw new NullReferenceException("CalendarModel must be set on connector.");
+
+            if (_View == null)
+                throw new NullReferenceException("MonthCalendarView must be set on connector.");
+        }
+
+        #endregion
+
+        #region ModelPropertyChanged
+
+        /// <summary>
+        /// Handles Model property change notifications
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ModelPropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            if (e.PropertyName == CalendarModel.AppointmentsPropertyName)
+            {
+                RefreshData();
+
+                _View.NeedRecalcSize = true;
+                _View.Refresh();
+            }
+        }
+
+        #endregion
+
+        #region ModelSubPropertyChanged
+
+        /// <summary>
+        /// Handles ModelSubProperty change notifications
+        /// </summary>
+        /// <param name="sender">object</param>
+        /// <param name="e">SubPropertyChangedEventArgs</param>
+        private void ModelSubPropertyChanged(object sender, SubPropertyChangedEventArgs e)
+        {
+            if (e.Source is Owner)
+            {
+                Owner owner = (Owner)e.Source;
+
+                if (_View.OwnerKey != null && _View.OwnerKey.Equals(owner.Key))
+                {
+                    if (e.PropertyChangedArgs.PropertyName == Owner.DisplayNamePropertyName)
+                        _View.DisplayName = owner.DisplayName;
+
+                    else if (e.PropertyChangedArgs.PropertyName.Equals("ColorScheme"))
+                        _View.CalendarColor = owner.ColorScheme;
+                }
+            }
+            else if (e.Source is Appointment)
+            {
+                Appointment app = e.Source as Appointment;
+                List<AppointmentMonthView> list;
+
+                string name = e.PropertyChangedArgs.PropertyName;
+
+                if (name.Equals("Tooltip"))
+                {
+                    list = GetViewsFromAll(app);
+
+                    for (int i = 0; i < list.Count; i++)
+                        list[i].Tooltip = app.Tooltip;
+                }
+                else if (name.Equals("IsSelected"))
+                {
+                    list = GetViewsFromAll(app);
+
+                    for (int i = 0; i < list.Count; i++)
+                        list[i].IsSelected = app.IsSelected;
+                }
+                else if (name.Equals("CategoryColor") || name.Equals("TimeMarkedAs"))
+                {
+                    list = GetViewsFromAll(app);
+
+                    for (int i = 0; i < list.Count; i++)
+                        list[i].Refresh();
+                }
+                else if (name.Equals("OwnerKey"))
+                {
+                    if (_View.CalendarView.IsMultiCalendar == true)
+                    {
+                        if (_View.OwnerKey == app.OwnerKey)
+                        {
+                            RefreshData();
+
+                            _View.NeedRecalcSize = true;
+                            _View.Refresh();
+                        }
+                        else
+                        {
+                            list = GetViewsFromAll(app);
+
+                            if (list.Count > 0)
+                            {
+                                RefreshData();
+
+                                _View.NeedRecalcSize = true;
+                                _View.Refresh();
+                            }
+                        }
+                    }
+                }
+                else if (name.Equals("Visible"))
+                {
+                    RefreshData();
+                }
+            }
+        }
+
+        #endregion
+
+        #region CustomItems_CollectionChanged
+
+        void CustomItemsCollectionChanged(object sender, EventArgs e)
+        {
+            RefreshData();
+
+            _View.NeedRecalcSize = true;
+            _View.Refresh();
+        }
+
+        #endregion
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/MonthView/MonthView.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/MonthView/MonthView.cs
new file mode 100644
index 00000000..65367731
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/MonthView/MonthView.cs	
@@ -0,0 +1,2755 @@
+#if FRAMEWORK20
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Globalization;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Schedule
+{
+    public class MonthView : BaseView
+    {
+        #region Constants
+        private const int MaxNumberOfWeeks = 52;
+        #endregion
+
+        #region Events
+
+        public event EventHandler<IsSideBarVisibleChangedEventArgs> IsSideBarVisibleChanged;
+
+        #endregion
+
+        #region Private variables
+
+        private int _NumberOfWeeks;             // Number of week in display
+        private MonthWeek[] _MonthWeeks;        // Array of weeks
+
+        private CalendarMonthColor _ViewColor =         // View display color table
+            new CalendarMonthColor(eCalendarColor.Automatic);
+
+        private int _DaysOffset;                // Moving day offset
+        private bool _IsSideBarVisible = true;  // Flag denoting SideBar visibility
+
+        private Size _MoreImageSize = new Size(16, 16);
+        private Bitmap _MoreImage;
+        private Bitmap _MoreImageHot;
+
+        private ItemRect _MoreRect;
+
+        #endregion
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="calendarView">Parent CalendarView</param>
+        public MonthView(CalendarView calendarView)
+            : base(calendarView, eCalendarView.Month)
+        {
+            // Set our non-client drawing info and our CalendarColor
+
+            NClientData = new NonClientData(
+                eTabOrientation.Horizontal,
+                (int)eCalendarMonthPart.OwnerTabBorder,
+                (int)eCalendarMonthPart.OwnerTabForeground,
+                (int)eCalendarMonthPart.OwnerTabBackground,
+                (int)eCalendarMonthPart.OwnerTabContentBackground,
+                (int)eCalendarMonthPart.OwnerTabSelectedForeground,
+                (int)eCalendarMonthPart.OwnerTabSelectedBackground);
+
+            CalendarColorTable = _ViewColor;
+
+            // Hook onto needed event
+
+            HookEvents(true);
+        }
+
+        #region Public properties
+
+        #region MonthWeek
+
+        public MonthWeek[] MonthWeeks
+        {
+            get { return (_MonthWeeks); }
+        }
+
+        #endregion
+
+        #region IsSideBarVisible
+
+        /// <summary>
+        /// Gets and sets the SideBar visibility
+        /// </summary>
+        public bool IsSideBarVisible
+        {
+            get { return (_IsSideBarVisible); }
+
+            set
+            {
+                if (_IsSideBarVisible != value)
+                {
+                    bool oldValue = _IsSideBarVisible;
+                    _IsSideBarVisible = value;
+
+                    OnIsSideBarVisibleChanged(oldValue, value);
+
+                    InvalidateRect(true);
+                }
+            }
+        }
+
+        /// <summary>
+        /// OnIsSideBarVisibleChanged event propagation
+        /// </summary>
+        protected virtual void OnIsSideBarVisibleChanged(bool oldVal, bool newVal)
+        {
+            if (IsSideBarVisibleChanged != null)
+                IsSideBarVisibleChanged(this, new IsSideBarVisibleChangedEventArgs(oldVal, newVal));
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Private properties
+
+        /// <summary>
+        /// Gets the sidebar width
+        /// </summary>
+        private int SideBarWidth
+        {
+            get
+            {
+                return (_IsSideBarVisible ? Font.Height + 6 : 0);
+            }
+        }
+
+        /// <summary>
+        /// Gets the DayHeader height
+        /// </summary>
+        private int DayHeaderHeight
+        {
+            get { return (Font.Height + 4); }
+        }
+
+        #endregion
+
+        #region HookEvents
+
+        /// <summary>
+        /// Hooks (or unhooks) needed events
+        /// </summary>
+        /// <param name="hook">True to hook, false to unhook</param>
+        private void HookEvents(bool hook)
+        {
+            if (hook == true)
+            {
+                CalendarView.SelectedViewChanged += SelectedViewChanged;
+                CalendarView.MonthViewStartDateChanged += MonthViewStartDateChanged;
+                CalendarView.MonthViewEndDateChanged += MonthViewEndDateChanged;
+                CalendarView.IsMonthSideBarVisibleChanged += IsMonthSideBarVisibleChanged;
+            }
+            else
+            {
+                CalendarView.SelectedViewChanged -= SelectedViewChanged;
+                CalendarView.MonthViewStartDateChanged -= MonthViewStartDateChanged;
+                CalendarView.MonthViewEndDateChanged -= MonthViewEndDateChanged;
+                CalendarView.IsMonthSideBarVisibleChanged -= IsMonthSideBarVisibleChanged;
+            }
+        }
+
+        #endregion
+
+        #region Event handling
+
+        #region SelectedViewChanged
+
+        /// <summary>
+        /// Processes CalendarView SelectedViewChanged events
+        /// </summary>
+        /// <param name="sender">CalendarView</param>
+        /// <param name="e">SelectedViewEventArgs</param>
+        void SelectedViewChanged(object sender, SelectedViewEventArgs e)
+        {
+            IsViewSelected = (e.NewValue == eCalendarView.Month);
+
+            if (IsViewSelected == true)
+            {
+                AutoSyncViewDate(e.OldValue);
+                UpdateDateSelection();
+            }
+            else
+            {
+                ResetView();
+            }
+        }
+
+        #endregion
+
+        #region MonthViewStartDateChanged
+
+        /// <summary>
+        /// Processes StartDate changes
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void MonthViewStartDateChanged(object sender, DateChangeEventArgs e)
+        {
+            StartDate = e.NewValue;
+        }
+
+        #endregion
+
+        #region MonthViewEndDateChanged
+
+        /// <summary>
+        /// Processes EndDate changes
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void MonthViewEndDateChanged(object sender, DateChangeEventArgs e)
+        {
+            EndDate = e.NewValue;
+        }
+
+        #endregion
+
+        #region IsMonthSideBarVisibleChanged
+
+        /// <summary>
+        /// Processes CalendarView IsMonthSideBarVisibleChanged events
+        /// </summary>
+        /// <param name="sender">CalendarView</param>
+        /// <param name="e">SelectedViewEventArgs</param>
+        void IsMonthSideBarVisibleChanged(
+            object sender, IsMonthSideBarVisibleChangedEventArgs e)
+        {
+            IsSideBarVisible = e.NewValue;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetViewAreaFromPoint
+
+        /// <summary>
+        /// Gets the view area under the given mouse
+        /// point (tab, header, content, etc)
+        /// </summary>
+        /// <param name="pt">Point</param>
+        /// <returns>eViewArea</returns>
+        public override eViewArea GetViewAreaFromPoint(Point pt)
+        {
+            if (Bounds.Contains(pt) == true)
+            {
+                if (ClientRect.Contains(pt))
+                {
+                    if (pt.X < Bounds.X + SideBarWidth)
+                        return (eViewArea.InSideBarPanel);
+
+                    if (pt.Y < ClientRect.Y + DayOfWeekHeaderHeight)
+                        return (eViewArea.InDayOfWeekHeader);
+
+                    if (pt.X >= _MonthWeeks[0].Bounds.X)
+                    {
+                        for (int i = 0; i < _NumberOfWeeks; i++)
+                        {
+                            if (pt.Y < _MonthWeeks[i].Bounds.Y + DayHeaderHeight)
+                                return (eViewArea.InWeekHeader);
+
+                            if (pt.Y < _MonthWeeks[i].Bounds.Bottom)
+                                return (eViewArea.InContent);
+                        }
+                    }
+
+                    return (eViewArea.NotInView);
+                }
+
+                return (base.GetViewAreaFromPoint(pt));
+            }
+
+            return (eViewArea.NotInView);
+        }
+
+        #endregion
+
+        #region GetDateSelectionFromPoint
+
+        /// <summary>
+        /// Gets the date selection from the given point. The startDate
+        /// and endDate will vary based upon the view type (WeekDay / Month)
+        /// </summary>
+        /// <param name="pt">Point in question</param>
+        /// <param name="startDate">out start date</param>
+        /// <param name="endDate">out end date</param>
+        /// <returns>True if a valid selection exists
+        /// at the given point</returns>
+        public override bool GetDateSelectionFromPoint(
+            Point pt, out DateTime startDate, out DateTime endDate)
+        {
+            base.GetDateSelectionFromPoint(pt, out startDate, out endDate);
+
+            int week, day;
+
+            if (GetPointItem(pt, out week, out day))
+            {
+                startDate = _MonthWeeks[week].FirstDayOfWeek.AddDays(day);
+                endDate = startDate.AddDays(1);
+
+                return (true);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region GetItemWeek
+
+        public MonthWeek GetItemWeek(CalendarItem item)
+        {
+            for (int i = 0; i < _NumberOfWeeks; i++)
+            {
+                if (_MonthWeeks[i].CalendarItems.Contains(item))
+                    return (_MonthWeeks[i]);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region SetSelectedItem
+
+        /// <summary>
+        /// Handles selected item changes
+        /// </summary>
+        /// <param name="sender">CalendarItem</param>
+        /// <param name="e">EventArgs</param>
+        public void ItemIsSelectedChanged(object sender, EventArgs e)
+        {
+            CalendarItem ci = sender as CalendarItem;
+
+            if (ci != null && IsSelecting == false)
+            {
+                try
+                {
+                    IsSelecting = true;
+
+                    if (ci.IsSelected == true)
+                    {
+                        SelectedItem = SetSelectedItem(SelectedItem, ci);
+                    }
+                    else
+                    {
+                        if (ci == SelectedItem)
+                            SelectedItem = null;
+                    }
+                }
+                finally
+                {
+                    IsSelecting = false;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Sets the current selected item
+        /// </summary>
+        /// <param name="pci">Previous CalendarItem</param>
+        /// <param name="nci">New CalendarItem to select</param>
+        /// <returns>Base selected CalendarItem</returns>
+        protected override CalendarItem SetSelectedItem(CalendarItem pci, CalendarItem nci)
+        {
+            CalendarItem selItem = null;
+
+            for (int i = 0; i < _NumberOfWeeks; i++)
+            {
+                List<CalendarItem> items = _MonthWeeks[i].CalendarItems;
+
+                for (int j = 0; j < items.Count; j++)
+                {
+                    CalendarItem item = items[j];
+
+                    item.IsSelected = (nci != null ? (item.ModelItem == nci.ModelItem) : false);
+
+                    if (item.IsSelected == true && selItem == null)
+                    {
+                        selItem = item;
+                        SelectedItem = item;
+                    }
+                }
+            }
+
+            return (selItem);
+        }
+
+        #endregion
+
+        #region UpdateDateSelection
+
+        /// <summary>
+        /// Updates each monthWeeks DayRects to reflect
+        /// the date selection start and end values
+        /// </summary>
+        protected override void UpdateDateSelection()
+        {
+            if (IsViewSelected == true)
+            {
+                // Loop through each week
+
+                for (int i = 0; i < _NumberOfWeeks; i++)
+                {
+                    DateTime date = _MonthWeeks[i].FirstDayOfWeek;
+
+                    // loop through each day of the week, setting
+                    // the selection status according to the date
+                    // selection range
+
+                    for (int j = 0; j < DaysInWeek; j++)
+                    {
+                        bool selected = (DateSelectionStart.HasValue && DateSelectionEnd.HasValue &&
+                            date >= DateSelectionStart && date < DateSelectionEnd);
+
+                        _MonthWeeks[i].DayRects[j].IsSelected = selected;
+
+                        date = date.AddDays(1);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region RecalcSize routines
+
+        /// <summary>
+        /// Performs NeedRecalcSize requests
+        /// </summary>
+        public override void RecalcSize()
+        {
+            base.RecalcSize();
+
+            if (IsViewSelected == true)
+            {
+                // Normalize our start and end dates
+
+                DateTime startDate;
+                DateTime endDate;
+
+                NormalizeDates(out startDate, out endDate);
+
+                // Calculate each weeks display info
+
+                CalcMonthWeeks(startDate, endDate);
+
+                // Update our Model connection and views
+
+                UpdateView();
+                UpdateDateSelection();
+
+                if (DaysOfTheWeek != null)
+                    DaysOfTheWeek.NeedsMeasured = true;
+
+                NeedRecalcLayout = false;
+            }
+        }
+
+        #region NormalizeDates
+
+        /// <summary>
+        /// Normalizes the user specified start and end dates
+        /// </summary>
+        /// <param name="startDate">[out] Normalized start date</param>
+        /// <param name="endDate">[out] Normalized end date</param>
+        private void NormalizeDates(out DateTime startDate, out DateTime endDate)
+        {
+            startDate = this.StartDate;
+            endDate = this.EndDate;
+
+            // If both values are unset, then set them to
+            // today's date / + 1 month
+
+            if (startDate == DateTime.MinValue && endDate == DateTime.MinValue)
+            {
+                startDate = DateTime.Today.Date;
+                endDate = startDate.AddMonths(1);
+            }
+
+            endDate = DateHelper.GetEndOfWeek(endDate, DateHelper.GetLastDayOfWeek());
+            startDate = DateHelper.GetDateForDayOfWeek(startDate, DateHelper.GetFirstDayOfWeek());
+
+            DaysOfTheWeek = new DaysOfTheWeek();
+        }
+
+        #endregion
+
+        #region Update View
+
+        /// <summary>
+        /// Updates our connection model view
+        /// </summary>
+        private void UpdateView()
+        {
+            // If we have had a date range change, just
+            // reset our entire view
+
+            if (DateRangeChanged == true)
+                ResetView();
+
+            // If we have no Model connection, attempt
+            // to reconnect if this view is selected
+
+            if (Connector == null)
+            {
+                if (CalendarModel != null)
+                    Connector = new ModelMonthViewConnector(CalendarModel, this);
+            }
+
+            // We have a connection, so update our CalendarItems
+
+            if (Connector != null)
+            {
+                UpdateCalendarItems();
+
+                CalendarView.DoViewLoadComplete(this);
+            }
+        }
+
+        #region UpdateCalendarItems
+
+        /// <summary>
+        /// Updates our CalendarItems list
+        /// </summary>
+        private void UpdateCalendarItems()
+        {
+            // Get a working list of our CalendarItems
+
+            List<CalendarItem>[] items = SortCalendarItems();
+
+            // Go through our CalendarItems on a per week basis
+
+            bool moreItems = false;
+
+            int days = _NumberOfWeeks * DaysInWeek;
+
+            ulong[] acc = new ulong[days];
+
+            for (int i = 0; i < _NumberOfWeeks; i++)
+            {
+                // Calculate the display bounds for each item
+
+                for (int j = 0; j < items[i].Count; j++)
+                    CalcAppointmentBounds(items[i][j], i, acc);
+
+                moreItems |= UpdateMoreItems(_MonthWeeks[i], acc, i);
+            }
+
+            // If we have no need of our previously allocated "More" 
+            // images then dispose of them and reset our handles
+
+            if (moreItems == false)
+            {
+                if (_MoreImage != null)
+                {
+                    _MoreImage.Dispose();
+                    _MoreImage = null;
+                }
+
+                if (_MoreImageHot != null)
+                {
+                    _MoreImageHot.Dispose();
+                    _MoreImageHot = null;
+                }
+            }
+
+            // Update our current day selection
+
+            UpdateDateSelection();
+        }
+
+        #region SortCalendarItems
+
+        /// <summary>
+        /// Sorts the provided CalendarItems
+        /// </summary>
+        /// <returns>Sorted CalendarItems</returns>
+        private List<CalendarItem>[] SortCalendarItems()
+        {
+            List<CalendarItem>[] items = new List<CalendarItem>[_NumberOfWeeks];
+
+            for (int i = 0; i < _NumberOfWeeks; i++)
+            {
+                items[i] = new List<CalendarItem>(_MonthWeeks[i].CalendarItems.Count);
+
+                if (_MonthWeeks[i].CalendarItems.Count > 0)
+                {
+                    items[i].AddRange(_MonthWeeks[i].CalendarItems);
+
+                    items[i].Sort(
+
+                       delegate(CalendarItem c1, CalendarItem c2)
+                       {
+                           int n = c1.StartTime.TimeOfDay.CompareTo(c2.StartTime.TimeOfDay);
+
+                           if (n != 0)
+                                return (n);
+
+                           n = c1.StartTime.CompareTo(c2.StartTime);
+
+                           if (n != 0)
+                               return (n);
+
+                           n = c1.EndTime.CompareTo(c2.EndTime);
+
+                           if (n != 0)
+                               return (n);
+
+                           int result = 0;
+                           CalendarView.DoDetailSortEvent(this, c1, c2, ref result);
+
+                           return (result);
+                       }
+                   );
+                }
+            }
+
+            return (items);
+        }
+
+        #endregion
+
+        #region CalcAppointmentBounds
+
+        /// <summary>
+        /// Calculates the display bounds for the AppointmentView
+        /// </summary>
+        /// <param name="item">CalendarItem</param>
+        /// <param name="week">Week associated with the view</param>
+        /// <param name="acc">Row accumulator</param>
+        private void CalcAppointmentBounds(
+            CalendarItem item, int week, ulong[] acc)
+        {
+            // Determine the starting day index for
+            // the given appointment
+
+            int ns = GetDayIndex(week, item);
+
+            // Calculate the top and height for the item
+
+            Rectangle r = _MonthWeeks[week].DayRects[ns].Bounds;
+
+            r.Y += DayHeaderHeight + 1;
+            r.Height = AppointmentHeight;
+            r.Width = 0;
+
+            // Determine the ending day index
+
+            DateTime st = _MonthWeeks[week].FirstDayOfWeek.AddDays(ns);
+
+            int ne = ns + (item.EndTime - st).Days;
+
+            if (item.EndTime.Hour > 0 || item.EndTime.Minute > 0 || item.EndTime.Second > 0)
+                ne++;
+
+            if (ne > DaysInWeek)
+                ne = DaysInWeek;
+
+            int weekOffset = week * DaysInWeek;
+
+            int freeAcc = GetFreeAcc(weekOffset + ns, weekOffset + ne, acc);
+
+            if (freeAcc >= 0)
+            {
+                ulong u = (1ul << freeAcc);
+
+                for (int i = ns; i < ne; i++)
+                {
+                    r.Width += _MonthWeeks[week].DayRects[i].Bounds.Width;
+
+                    acc[weekOffset + i] |= u;
+                }
+
+                r.Y += (freeAcc * AppointmentHeight);
+            }
+            else
+            {
+                r.Y = _MonthWeeks[week].Bounds.Bottom;
+            }
+
+            DateTime start = _MonthWeeks[week].FirstDayOfWeek;
+            DateTime end = start.AddDays(DaysInWeek);
+
+            // Check to see if we can only display
+            // a partial representation for the view
+
+            if (item.EndTime >= start && item.StartTime < end)
+            {
+                int hpad = CalendarView.MonthViewHorizontalPadding;
+
+                if (item.StartTime >= start)
+                {
+                    r.X += hpad;
+                    r.Width -= hpad;
+                }
+
+                if (item.EndTime <= end)
+                    r.Width -= hpad;
+            }
+
+            // Now that we have calculated the items height and
+            // width, invoke a Recalc on the item
+
+            item.WidthInternal = r.Width - 1;
+            item.HeightInternal = r.Height - 1;
+
+            item.RecalcSize();
+
+            // Set our bounds for the item
+
+            r.Width = item.WidthInternal;
+            r.Height = item.HeightInternal;
+
+            item.Bounds = r;
+
+            // Set it's display state
+
+            if (CalendarView.IsMonthMoreItemsIndicatorVisible == true)
+                item.Displayed = (r.Bottom < _MonthWeeks[week].Bounds.Bottom - _MoreImageSize.Height);
+            else
+                item.Displayed = (r.Top < _MonthWeeks[week].Bounds.Bottom - 2);
+        }
+
+        #region GetFreeAcc
+
+        private int GetFreeAcc(int ns, int ne, ulong[] acc)
+        {
+            for (int i = 0; i < sizeof(ulong) * 8; i++)
+            {
+                if (CheckFreeAcc(ns, ne, acc, i) == true)
+                    return (i);
+            }
+
+            return (-1);
+        }
+
+        #region CheckFreeAcc
+
+        private bool CheckFreeAcc(int ns, int ne, ulong[] acc, int n)
+        {
+            for (int i = ns; i < ne; i++)
+            {
+                ulong u = acc[i];
+
+                if ((u & (1ul << n)) != 0)
+                    return (false);
+            }
+
+            return (true);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetDayIndex
+
+        /// <summary>
+        /// Gets the starting day index for the given appointment
+        /// </summary>
+        /// <param name="week">Week index</param>
+        /// <param name="item">CalendarItem</param>
+        /// <returns>Day of week index (0-6)</returns>
+        private int GetDayIndex(int week, CalendarItem item)
+        {
+            DateTime date = _MonthWeeks[week].FirstDayOfWeek;
+
+            for (int i = 0; i < DaysInWeek; i++)
+            {
+                date = date.AddDays(1);
+
+                if (date > item.StartTime)
+                    return (i);
+            }
+
+            return (0);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region UpdateMoreItems
+
+        /// <summary>
+        /// UpdateMoreItems
+        /// </summary>
+        /// <param name="monthWeek"></param>
+        /// <param name="acc"></param>
+        /// <returns></returns>
+        private bool UpdateMoreItems(MonthWeek monthWeek, ulong[] acc, int week)
+        {
+            bool moreItems = false;
+            int weekOffset = week * DaysInWeek;
+
+            int rowHeight = monthWeek.DayRects[0].Bounds.Height -
+                DayHeaderHeight - _MoreImageSize.Height - 1;
+
+            for (int j = 0; j < DaysInWeek; j++)
+            {
+                int height = GetMoreHeight(acc[weekOffset + j]);
+
+                if (CalendarView.IsMonthMoreItemsIndicatorVisible == false || height <= rowHeight)
+                {
+                    monthWeek.MoreItems[j].Bounds = Rectangle.Empty;
+                }
+                else
+                {
+                    moreItems = true;
+
+                    Rectangle r = monthWeek.DayRects[j].Bounds;
+
+                    r.X = r.Right - _MoreImageSize.Width;
+                    r.Y = r.Bottom - _MoreImageSize.Height;
+                    r.Size = _MoreImageSize;
+
+                    monthWeek.MoreItems[j].Bounds = r;
+                }
+            }
+
+            return (moreItems);
+        }
+
+        #region GetMoreHeight
+
+        private int GetMoreHeight(ulong u)
+        {
+            int height = 0;
+
+            while (u != 0)
+            {
+                height += AppointmentHeight;
+
+                u = u >> 1;
+            }
+
+            return (height);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region CalcMonthWeeks
+
+        /// <summary>
+        /// Calculates display info for the MonthWeek data
+        /// </summary>
+        /// <param name="startDate">Start date</param>
+        /// <param name="endDate">End date</param>
+        private void CalcMonthWeeks(DateTime startDate, DateTime endDate)
+        {
+            // Get the number of weeks for the date range
+
+            _NumberOfWeeks = DateHelper.GetNumberOfWeeks(startDate, endDate);
+
+            _NumberOfWeeks = Math.Max(1, _NumberOfWeeks);
+            _NumberOfWeeks = Math.Min(_NumberOfWeeks, MaxNumberOfWeeks);
+
+            // Allocate our MonthWeeks array to
+            // hold our weeks info
+
+            if (_MonthWeeks == null || _MonthWeeks.Length != _NumberOfWeeks)
+                _MonthWeeks = new MonthWeek[_NumberOfWeeks];
+
+            // Update display info on each week
+
+            float dy = 0;
+
+            float weekHeight =
+                ((float)ClientRect.Height - DayOfWeekHeaderHeight) / _NumberOfWeeks;
+
+            int sx = ClientRect.X + SideBarWidth;
+            int sy = ClientRect.Y + DayOfWeekHeaderHeight;
+            int y2 = sy;
+
+            // Loop through each week
+
+            for (int i = 0; i < _NumberOfWeeks; i++)
+            {
+                if (_MonthWeeks[i] == null)
+                    _MonthWeeks[i] = new MonthWeek(this);
+
+                // Set the weeks first day of the week
+
+                _MonthWeeks[i].FirstDayOfWeek = startDate.AddDays(i * DaysInWeek);
+
+                // Calculate the bounding rect limits
+
+                dy += weekHeight;
+
+                int y1 = y2;
+                y2 = sy + (int)dy;
+
+                if (i + 1 == _NumberOfWeeks)
+                    y2 = ClientRect.Y + ClientRect.Height - 1;
+
+                // Set the bounding rect
+
+                _MonthWeeks[i].Bounds =
+                    new Rectangle(sx, y1, ClientRect.Width - SideBarWidth - 1, y2 - y1);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region Paint processing
+
+        #region Root paint code
+
+        /// <summary>
+        /// Paint processing
+        /// </summary>
+        /// <param name="e">ItemPaintArgs</param>
+        public override void Paint(ItemPaintArgs e)
+        {
+            // Set our current color table
+
+            _ViewColor.SetColorTable();
+
+            // Only draw something if we have something to draw
+
+            if (_NumberOfWeeks > 0)
+            {
+                // Calculate our drawing ranges
+
+                int dayStart, dayEnd, dayCount;
+                int weekStart, weekEnd, weekCount;
+
+                if (e.ClipRectangle.Contains(ClientRect))
+                {
+                    // The clipping rect encompasses our entire calendar
+                    // so set our start and end values accordingly
+
+                    dayStart = 0; dayEnd = DaysInWeek - 1;
+                    dayCount = DaysInWeek;
+
+                    weekStart = 0; weekEnd = _NumberOfWeeks - 1;
+                    weekCount = _NumberOfWeeks;
+                }
+                else
+                {
+                    // We only need to draw part of our calendar, so
+                    // calculate our day and week count and range
+
+                    dayCount = GetDayRange(e, out dayStart, out dayEnd);
+                    weekCount = GetWeekRange(e, out weekStart, out weekEnd);
+                }
+
+                // Draw our calendar parts
+
+                if (dayCount > 0)
+                {
+                    DrawDayOfTheWeekHeader(e, dayStart, dayEnd);
+
+                    if (weekCount > 0)
+                    {
+                        DrawDays(e, weekStart, weekEnd, dayStart, dayEnd);
+
+                        if (Connector != null && Connector.IsConnected)
+                            DrawWeekAppointments(e, weekStart, weekEnd);
+                    }
+                }
+
+                if (_IsSideBarVisible == true && weekCount > 0)
+                    DrawSideBarHeader(e, weekStart, weekEnd);
+            }
+
+            // Let the base painting take place
+
+            base.Paint(e);
+        }
+
+        #region Clip range routines
+
+        /// <summary>
+        /// Calculates the range of days needed to be drawn
+        /// to satisfy the specified paint request
+        /// </summary>
+        /// <param name="e">ItemPaintArgs</param>
+        /// <param name="dayStart">[out] Day start index</param>
+        /// <param name="dayEnd">[out] Day end index</param>
+        /// <returns>Day range count (end - start)</returns>
+        private int GetDayRange(ItemPaintArgs e, out int dayStart, out int dayEnd)
+        {
+            // Calc our starting index
+
+            int start = 0;
+
+            while (start < DaysInWeek)
+            {
+                Rectangle dr1 = _MonthWeeks[0].DayRects[start].Bounds;
+
+                if (dr1.Right >= e.ClipRectangle.X)
+                    break;
+
+                start++;
+            }
+
+            // Calc our ending index
+
+            int end = start;
+
+            while (end < DaysInWeek)
+            {
+                Rectangle dr2 = _MonthWeeks[0].DayRects[end].Bounds;
+
+                if (dr2.X >= e.ClipRectangle.Right)
+                    break;
+
+                end++;
+            }
+
+            // Set the user supplied 'out' values, and
+            // return the range count to the caller
+
+            if (end - start == 0)
+            {
+                dayStart = 0;
+                dayEnd = 0;
+
+                return (0);
+            }
+
+            dayStart = start;
+            dayEnd = end - 1;
+
+            return (end - start);
+        }
+
+        /// <summary>
+        /// Calculates the range of weeks needed to be drawn
+        /// to satisfy the specified paint request
+        /// </summary>
+        /// <param name="e">ItemPaintArgs</param>
+        /// <param name="weekStart">[out] Week start index</param>
+        /// <param name="weekEnd">[out] Week end index</param>
+        /// <returns>Week range count (end - start)</returns>
+        private int GetWeekRange(ItemPaintArgs e, out int weekStart, out int weekEnd)
+        {
+            // Calc our starting index
+
+            int start = 0;
+
+            while (start < _NumberOfWeeks)
+            {
+                if (_MonthWeeks[start].Bounds.Bottom > e.ClipRectangle.Y)
+                    break;
+
+                start++;
+            }
+
+            // Calc our ending index
+
+            int end = start;
+
+            while (end < _NumberOfWeeks)
+            {
+                if (_MonthWeeks[end].Bounds.Y >= e.ClipRectangle.Bottom)
+                    break;
+
+                end++;
+            }
+
+            // Set the user supplied 'out' values, and
+            // return the range count to the caller
+
+            if (end - start == 0)
+            {
+                weekStart = 0;
+                weekEnd = 0;
+
+                return (0);
+            }
+
+            weekStart = start;
+            weekEnd = end - 1;
+
+            return (end - start);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region DayOfTheWeek header drawing
+
+        #region DrawDayOfTheWeekHeader
+
+        /// <summary>
+        /// Draws the top Day of the week header
+        /// </summary>
+        /// <param name="e">ItemPaintArgs</param>
+        /// <param name="dayStart">Start day index</param>
+        /// <param name="dayEnd">End day index</param>
+        private void DrawDayOfTheWeekHeader(ItemPaintArgs e, int dayStart, int dayEnd)
+        {
+            Graphics g = e.Graphics;
+
+            Rectangle r = new Rectangle(ClientRect.X - 1, ClientRect.Y - 1,
+                SideBarWidth + 1, DayOfWeekHeaderHeight + 1);
+
+            using (Brush br =
+                _ViewColor.BrushPart((int)eCalendarMonthPart.OwnerTabContentBackground, r))
+            {
+                g.FillRectangle(br, r);
+            }
+
+            // Calculate our contiguous header rect
+            // area so we can fill it all at once
+
+            r = new Rectangle(
+                _MonthWeeks[0].DayRects[dayStart].Bounds.X, ClientRect.Y,
+                _MonthWeeks[0].DayRects[dayEnd].Bounds.Right -
+                _MonthWeeks[0].DayRects[dayStart].Bounds.X, DayOfWeekHeaderHeight);
+
+            if (r.Width > 0 && r.Height > 0)
+            {
+                using (Brush lbr =
+                    _ViewColor.BrushPart((int)eCalendarMonthPart.DayOfTheWeekHeaderBackground, r))
+                {
+                    g.FillRectangle(lbr, r);
+                }
+
+                // Establish our Days Of The Week text type
+
+                DaysOfTheWeek.eDayType type = GetDaysOfTheWeekType(g);
+
+                // Loop through each day, drawing the
+                // day of the week text in the header area
+
+                eTextFormat tf = eTextFormat.VerticalCenter | eTextFormat.NoPadding;
+
+                using (Pen pen = new Pen(
+                    _ViewColor.GetColor((int)eCalendarMonthPart.DayOfTheWeekHeaderBorder)))
+                {
+                    for (int i = dayStart; i <= dayEnd; i++)
+                    {
+                        r.X = _MonthWeeks[0].DayRects[i].Bounds.X;
+                        r.Width = _MonthWeeks[0].DayRects[i].Bounds.Width;
+
+                        if (CalendarView.DoPreRenderMonthHeader(g, this, i, r) == false)
+                        {
+                            // Center the header text until the text
+                            // will no longer fit, then left justify it
+
+                            if (DaysOfTheWeek.DaySize[(int) type][i].Width < r.Width)
+                                tf |= eTextFormat.HorizontalCenter;
+
+                            // Draw the text and header border
+
+                            TextDrawing.DrawString(g, DaysOfTheWeek.DayText[(int) type][i], Font,
+                                _ViewColor.GetColor((int) eCalendarMonthPart.DayOfTheWeekHeaderForeground), r, tf);
+
+                            CalendarView.DoPostRenderMonthHeader(g, this, i, r);
+                        }
+
+                        g.DrawRectangle(pen, r);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region GetDaysOfTheWeekType
+
+        private DaysOfTheWeek.eDayType GetDaysOfTheWeekType(Graphics g)
+        {
+            // Determine if the current DayRect bounds
+            // are constrained by the text threshold
+
+            DaysOfTheWeek.MeasureText(g, Font);
+
+            for (int i = 0; i < DaysInWeek; i++)
+            {
+                if (_MonthWeeks[0].DayRects[i].Bounds.Width <
+                    DaysOfTheWeek.DaySize[(int)DaysOfTheWeek.eDayType.Long][i].Width)
+                {
+                    return (DaysOfTheWeek.eDayType.Short);
+                }
+            }
+
+            return (DaysOfTheWeek.eDayType.Long);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Day drawing
+
+        #region DrawDays
+
+        /// <summary>
+        /// Draws day header and content
+        /// </summary>
+        /// <param name="e">ItemPaintArgs</param>
+        /// <param name="weekStart">Week start index</param>
+        /// <param name="weekEnd">Week end index</param>
+        /// <param name="dayStart">Day start index</param>
+        /// <param name="dayEnd">Day end index</param>
+        private void DrawDays(ItemPaintArgs e,
+            int weekStart, int weekEnd, int dayStart, int dayEnd)
+        {
+            Graphics g = e.Graphics;
+
+            Rectangle r = new Rectangle(
+                _MonthWeeks[0].DayRects[dayStart].Bounds.X, 0,
+                _MonthWeeks[0].DayRects[dayEnd].Bounds.Right -
+                _MonthWeeks[0].DayRects[dayStart].Bounds.X, DayHeaderHeight);
+
+            if (r.Width > 0 && r.Height > 0)
+            {
+                // Loop through each day in each week, displaying
+                // the associated day content and header
+
+                int nowHeaderWeek = -1;
+                int nowHeaderDay = -1;
+
+                DateTime now = DateTime.Now;
+
+                using (Pen pen1 = new Pen(
+                    _ViewColor.GetColor((int) eCalendarMonthPart.DayContentBorder)))
+                {
+                    using (Pen pen2 = new Pen(
+                        _ViewColor.GetColor((int) eCalendarMonthPart.DayHeaderBorder)))
+                    {
+                        for (int i = weekStart; i <= weekEnd; i++)
+                        {
+                            for (int j = dayStart; j <= dayEnd; j++)
+                            {
+                                if (CalendarView.HighlightCurrentDay == true)
+                                {
+                                    DateTime date = _MonthWeeks[i].FirstDayOfWeek.AddDays(j);
+
+                                    if (now.Date.Equals(date.Date) == true)
+                                    {
+                                        nowHeaderDay = i;
+                                        nowHeaderWeek = j;
+
+                                        continue;
+                                    }
+                                }
+
+                                DrawDayBackground(g, i, j, eCalendarMonthPart.DayHeaderBackground);
+
+                                DrawDayContent(g, i, j, pen1);
+                                DrawDayHeader(g, i, j, pen2);
+                            }
+                        }
+                    }
+                }
+
+                // Draw "Now" day header and border
+
+                if (nowHeaderDay >= 0)
+                {
+                    using (Pen pen1 = new Pen(
+                        _ViewColor.GetColor((int) eCalendarMonthPart.NowDayHeaderBorder)))
+                    {
+                        using (Pen pen2 = new Pen(
+                            _ViewColor.GetColor((int) eCalendarMonthPart.NowDayHeaderBorder)))
+                        {
+                            DrawDayBackground(g, nowHeaderDay, nowHeaderWeek, eCalendarMonthPart.NowDayHeaderBackground);
+
+                            DrawDayContent(g, nowHeaderDay, nowHeaderWeek, pen1);
+                            DrawDayHeader(g, nowHeaderDay, nowHeaderWeek, pen2);
+                        }
+                    }
+                }
+            }
+        }
+
+        #region DrawDayBackground
+
+        /// <summary>
+        /// DrawDayBackground
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="week"></param>
+        /// <param name="day"></param>
+        /// <param name="part"></param>
+        private void DrawDayBackground(Graphics g,
+            int week, int day, eCalendarMonthPart part)
+        {
+            Rectangle r = _MonthWeeks[week].DayRects[day].Bounds;
+            r.Height = DayHeaderHeight;
+
+            using (Brush br = _ViewColor.BrushPart((int)part, r))
+                g.FillRectangle(br, r);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region DrawDayContent
+
+        /// <summary>
+        /// Draws the day content
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="iweek">Week index</param>
+        /// <param name="iday">Day index</param>
+        /// <param name="pen">Pen</param>
+        private void DrawDayContent(Graphics g, int iweek, int iday, Pen pen)
+        {
+            Rectangle r = _MonthWeeks[iweek].DayRects[iday].Bounds;
+
+            r.Y += DayHeaderHeight;
+            r.Height -= DayHeaderHeight;
+
+            DrawBackground(g, iweek, iday, r);
+            DrawMoreImage(g, iweek, iday, r);
+            DrawBorder(g, pen, iweek, r);
+        }
+
+        #region DrawBackground
+
+        private void DrawBackground(Graphics g,
+            int iweek, int iday, Rectangle r)
+        {
+            DateTime date = _MonthWeeks[iweek].FirstDayOfWeek.AddDays(iday);
+            int dayMonth = date.Month;
+
+            DateTime startTime = date;
+            DateTime endTime = date.AddDays(1).AddMinutes(-1);
+
+            eSlotDisplayState state = GetSlotState(iweek, iday, dayMonth);
+
+            if (CalendarView.DoMonthViewPreRenderSlotBackground(
+                g, this, startTime, endTime, r, ref state) == false)
+            {
+                eCalendarMonthPart part = GetContentPart(state);
+
+                using (Brush br = _ViewColor.BrushPart((int)part, r))
+                    g.FillRectangle(br, r);
+
+                CalendarView.DoMonthViewPostRenderSlotBackground(
+                    g, this, startTime, endTime, r, state);
+            }
+        }
+
+        #region GetSlotState
+
+        /// <summary>
+        /// GetSlotState
+        /// </summary>
+        /// <returns></returns>
+        private eSlotDisplayState
+            GetSlotState(int iweek, int iday, int dayMonth)
+        {
+            eSlotDisplayState state = eSlotDisplayState.None;
+
+            if (DisplayedOwnerKeyIndex == CalendarView.SelectedOwnerIndex)
+            {
+                if (_MonthWeeks[iweek].DayRects[iday].IsSelected)
+                    state |= eSlotDisplayState.Selected;
+            }
+
+            if (dayMonth == StartDate.Month)
+                state |= eSlotDisplayState.Work;
+
+            return (state);
+        }
+
+        #endregion
+
+        #region GetContentPart
+
+        /// <summary>
+        /// Gets the content calendar part for the given
+        /// week and dayMonth
+        /// </summary>
+        /// <returns></returns>
+        private eCalendarMonthPart GetContentPart(eSlotDisplayState state)
+        {
+            if ((state & eSlotDisplayState.Selected) == eSlotDisplayState.Selected)
+                return (eCalendarMonthPart.DayContentSelectionBackground);
+
+            if ((state & eSlotDisplayState.Work) == eSlotDisplayState.Work)
+                return (eCalendarMonthPart.DayContentActiveBackground);
+
+            return (eCalendarMonthPart.DayContactInactiveBackground);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region DrawMoreImage
+
+        private void DrawMoreImage(Graphics g, int iweek, int iday, Rectangle r)
+        {
+            ItemRect moreRect = _MonthWeeks[iweek].MoreItems[iday];
+
+            if (moreRect.Bounds.IsEmpty == false)
+            {
+                Bitmap bm = moreRect.IsSelected ? GetMoreImageHot(g) : GetMoreImage(g);
+
+                if (bm != null)
+                {
+                    Region regSave = g.Clip;
+
+                    g.SetClip(r, CombineMode.Intersect);
+                    g.DrawImageUnscaledAndClipped(bm, moreRect.Bounds);
+                    g.Clip = regSave;
+                }
+            }
+        }
+
+        #endregion
+
+        #region DrawBorder
+
+        private void DrawBorder(
+            Graphics g, Pen pen, int iweek, Rectangle r)
+        {
+            if (iweek < _NumberOfWeeks - 1)
+                r.Height--;
+
+            g.DrawRectangle(pen, r);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region DrawDayHeader
+
+        /// <summary>
+        /// Draws day header
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="iweek">Week index</param>
+        /// <param name="iday">Day index</param>
+        /// <param name="pen">Text pen</param>
+        private void DrawDayHeader(Graphics g, int iweek, int iday, Pen pen)
+        {
+            // Calculate the display rect and draw the text
+
+            Rectangle r = _MonthWeeks[iweek].DayRects[iday].Bounds;
+            r.Height = Math.Min(DayHeaderHeight, r.Height);
+
+            if (r.Height > 0)
+            {
+                // Draw the border area
+
+                g.DrawRectangle(pen, r);
+
+                // Get the associated day and text
+
+                DateTime day = _MonthWeeks[iweek].FirstDayOfWeek.AddDays(iday);
+
+                string s = GetDayHeaderText(day);
+
+                r.Inflate(-2, 0);
+
+                TextDrawing.DrawString(g, s, BoldFont,
+                    _ViewColor.GetColor((int)eCalendarMonthPart.DayHeaderForeground), r,
+                    eTextFormat.VerticalCenter | eTextFormat.Left | eTextFormat.NoPadding);
+            }
+        }
+
+        #region GetDayHeaderText
+
+        /// <summary>
+        /// GetDayHeaderText
+        /// </summary>
+        /// <param name="date"></param>
+        /// <returns></returns>
+        private string GetDayHeaderText(DateTime date)
+        {
+            if (date.Day == 1)
+            {
+                DateTimeFormatInfo dtfi =
+                    ScheduleSettings.GetActiveCulture().DateTimeFormat;
+
+                string s = dtfi.MonthDayPattern.Replace("dd", "d");
+
+                return (date.ToString(s));
+            }
+
+            return (String.Format("{0}", date.Day));
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region DrawWeekAppointments
+
+        /// <summary>
+        /// Initiates the drawing of weekly appointments
+        /// </summary>
+        /// <param name="e">ItemPaintArgs</param>
+        /// <param name="weekStart">Week start index</param>
+        /// <param name="weekEnd">Week end index</param>
+        private void DrawWeekAppointments(ItemPaintArgs e, int weekStart, int weekEnd)
+        {
+            Graphics g = e.Graphics;
+
+            // Loop through each subItem - on a weekly basis - so that
+            // we can set an appropriate clipping region for the week
+
+            for (int i = weekStart; i <= weekEnd; i++)
+            {
+                List<CalendarItem> items = _MonthWeeks[i].CalendarItems;
+
+                if (items.Count > 0)
+                {
+                    // Set our week-based clipping region
+
+                    Rectangle r = _MonthWeeks[i].Bounds;
+                    r.Height -= 1;
+
+                    Region regSave = g.Clip;
+
+                    g.SetClip(r, CombineMode.Intersect);
+
+                    // Loop through each CalendarItem in the week
+
+                    for (int j = 0; j < items.Count; j++)
+                    {
+                        // If we can display the item, then initiate the paint
+
+                        if (items[j].Displayed == true)
+                        {
+                            if (e.ClipRectangle.IsEmpty ||
+                                e.ClipRectangle.IntersectsWith(items[j].DisplayRectangle))
+                            {
+                                items[j].Paint(e);
+                            }
+                        }
+                    }
+
+                    // Restore the original clip region
+
+                    g.Clip = regSave;
+
+                    regSave.Dispose();
+                }
+            }
+        }
+
+        #endregion
+
+        #region GetMoreImage
+
+        private Bitmap GetMoreImage(Graphics g)
+        {
+            if (_MoreImage == null)
+                _MoreImage = GetMoreBitmap(g, Color.LightGray);
+
+            return (_MoreImage);
+        }
+
+        #endregion
+
+        #region GetMoreImageHot
+
+        private Bitmap GetMoreImageHot(Graphics g)
+        {
+            if (_MoreImageHot == null)
+                _MoreImageHot = GetMoreBitmap(g, _ViewColor.GetColor((int)eCalendarMonthPart.NowDayHeaderBorder));
+
+            return (_MoreImageHot);
+        }
+
+        #endregion
+
+        #region GetMoreBitmap
+
+        private Bitmap GetMoreBitmap(Graphics g, Color color)
+        {
+            Bitmap bmp = new Bitmap(_MoreImageSize.Width, _MoreImageSize.Height, g);
+
+            using (Graphics gBmp = Graphics.FromImage(bmp))
+            {
+                gBmp.CompositingQuality = CompositingQuality.HighQuality;
+                gBmp.SmoothingMode = SmoothingMode.AntiAlias;
+
+                using (GraphicsPath path = GetMoreImagePath())
+                {
+                    using (Brush br = new SolidBrush(color))
+                        gBmp.FillPath(br, path);
+
+                    gBmp.DrawPath(Pens.White, path);               
+                }
+            }
+
+            return (bmp);
+        }
+
+        #endregion
+
+        #region GetMoreImagePath
+
+        /// <summary>
+        /// Gets the More image path
+        /// </summary>
+        /// <returns></returns>
+        private GraphicsPath GetMoreImagePath()
+        {
+            GraphicsPath path = new GraphicsPath();
+
+            path.AddLines(new Point[] 
+            {
+                new Point(2, 3), 
+                new Point(7, 11), 
+                new Point(12, 3) 
+            });
+
+            path.CloseAllFigures();
+
+            return (path);
+        }
+
+        #endregion
+
+        #region SideBar header drawing
+
+        /// <summary>
+        /// Draws the SideBar header
+        /// </summary>
+        /// <param name="e">ItemPaintArgs</param>
+        /// <param name="weekStart">Week start index</param>
+        /// <param name="weekEnd">Week end index</param>
+        private void DrawSideBarHeader(ItemPaintArgs e, int weekStart, int weekEnd)
+        {
+            // Calc the contiguous SideBar background rect
+
+            Rectangle r = new Rectangle(ClientRect.X, _MonthWeeks[weekStart].Bounds.Y,
+                SideBarWidth, _MonthWeeks[weekEnd].Bounds.Bottom - _MonthWeeks[weekStart].Bounds.Y);
+
+            // Make sure we have something to draw
+
+            if (r.Height > 0 && r.Width > 0 && e.ClipRectangle.IntersectsWith(r))
+            {
+                Graphics g = e.Graphics;
+
+                // Fill the bar with our color gradient
+
+                using (Brush lbr = _ViewColor.BrushPart((int)eCalendarMonthPart.SideBarBackground, r))
+                {
+                    g.FillRectangle(lbr, r);
+                }
+
+                // Set uo our output to have both
+                // vertically and horizontally centered text
+
+                using (StringFormat sf = new StringFormat())
+                {
+                    sf.FormatFlags = StringFormatFlags.NoWrap;
+                    sf.Alignment = StringAlignment.Center;
+                    sf.LineAlignment = StringAlignment.Center;
+
+                    // Calc our rect origin and prepare to
+                    // output the SideBar text
+
+                    PointF ptf = new PointF(ClientRect.X, 0);
+                    Rectangle rf = new Rectangle(0, 0, 0, SideBarWidth);
+
+                    using (Brush br =
+                        _ViewColor.BrushPart((int)eCalendarMonthPart.SideBarForeground, rf))
+                    {
+                        using (Pen pen = new Pen(
+                            _ViewColor.GetColor((int)eCalendarMonthPart.SideBarBorder)))
+                        {
+                            // Loop through each individual week, displaying
+                            // the rotated header text appropriately
+
+                            for (int i = weekStart; i <= weekEnd; i++)
+                            {
+                                rf.Width = _MonthWeeks[i].Bounds.Height;
+
+                                if (rf.Width > 0)
+                                {
+                                    ptf.Y = _MonthWeeks[i].Bounds.Y + rf.Width;
+
+                                    g.TranslateTransform(ptf.X, ptf.Y);
+                                    g.RotateTransform(-90);
+
+                                    g.DrawString(_MonthWeeks[i].WeekRange, Font, br, rf, sf);
+                                    g.DrawRectangle(pen, rf.X, rf.Y, rf.Width, rf.Height);
+
+                                    g.ResetTransform();
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Mouse routines
+
+        #region MouseDown processing
+
+        /// <summary>
+        /// MouseDown event processing
+        /// </summary>
+        /// <param name="objArg"></param>
+        public override void InternalMouseDown(MouseEventArgs objArg)
+        {
+            // Forward on the event
+
+            base.InternalMouseDown(objArg);
+
+            if (objArg.Button == MouseButtons.Left)
+            {
+                if (IsTabMoving == false)
+                {
+                    // Locate where the event took place
+
+                    int week, day;
+
+                    if (GetPointItem(objArg.Location, out week, out day))
+                    {
+                        MyCursor = GetCursor();
+
+                        if (ProcessCilButtonDown(week, day) == false)
+                        {
+                            if (ProcessMoreButtonDown(week, day) == false)
+                                ProcessMvlButtonDown(week, day);
+                        }
+                    }
+
+                    IsCopyDrag = false;
+                }
+            }
+        }
+
+        #region CalendarItem MouseDown processing
+
+        /// <summary>
+        /// CalendarItem left mouseDown processing
+        /// </summary>
+        /// <param name="week">Week index</param>
+        /// <param name="day">Day index</param>
+        private bool ProcessCilButtonDown(int week, int day)
+        {
+            CalendarItem item = m_HotSubItem as CalendarItem;
+
+            if (item != null)
+            {
+                if (item.HitArea != CalendarItem.eHitArea.None)
+                {
+                    // Give the user a chance to cancel the
+                    // operation before it starts
+
+                    if (CalendarView.DoBeforeAppointmentViewChange(this, item,
+                        ((item.HitArea == CalendarItem.eHitArea.Move) ?
+                        eViewOperation.AppointmentMove : eViewOperation.AppointmentResize)) == false)
+                    {
+                        if (IsResizing == false && IsMoving == false)
+                        {
+                            OldStartTime = item.StartTime;
+                            OldEndTime = item.EndTime;
+                            OldOwnerKey = OwnerKey;
+                        }
+
+                        // Flag appropriate action
+
+                        if (item.HitArea == CalendarItem.eHitArea.LeftResize)
+                            IsStartResizing = true;
+
+                        else if (item.HitArea == CalendarItem.eHitArea.RightResize)
+                            IsEndResizing = true;
+
+                        else if (item.HitArea == CalendarItem.eHitArea.Move)
+                        {
+                            TimeSpan ts = _MonthWeeks[week].FirstDayOfWeek.AddDays(day) - item.StartTime;
+
+                            _DaysOffset = (int)(Math.Ceiling(ts.TotalDays));
+
+                            IsMoving = true;
+                        }
+                    }
+                }
+
+                return (true);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region MonthView MouseDown processing
+
+        /// <summary>
+        /// Handles MonthView left MouseDown events
+        /// </summary>
+        /// <param name="week">Week index</param>
+        /// <param name="day">Day index</param>
+        private void ProcessMvlButtonDown(int week, int day)
+        {
+            DateTime startDate = _MonthWeeks[week].FirstDayOfWeek.AddDays(day);
+            DateTime endDate = startDate.AddDays(1);
+
+            ExtendSelection(ref startDate, ref endDate);
+
+            CalendarView.DateSelectionStart = startDate;
+            CalendarView.DateSelectionEnd = endDate;
+
+            SelectedItem = null;
+        }
+
+        #endregion
+
+        #region MoreItems MouseDown processing
+
+        /// <summary>
+        /// ProcessMoreButtonDown
+        /// </summary>
+        /// <param name="week"></param>
+        /// <param name="day"></param>
+        /// <returns></returns>
+        private bool ProcessMoreButtonDown(int week, int day)
+        {
+            if (CalendarView.IsMonthMoreItemsIndicatorVisible == true)
+            {
+                ItemRect moreRect = _MonthWeeks[week].MoreItems[day];
+
+                if (moreRect.IsSelected == true)
+                {
+                    eCalendarView calendarView = eCalendarView.Day;
+                    DateTime startDate = _MonthWeeks[week].FirstDayOfWeek.AddDays(day);
+
+                    if (CalendarView.DoMonthMoreItemsIndicatorClick(
+                        this, ref calendarView, ref startDate) == false)
+                    {
+                        moreRect.IsSelected = false;
+
+                        DateSelectionAnchor = null;
+                        CalendarView.DateSelectionStart = null;
+                        CalendarView.DateSelectionEnd = null;
+
+                        CalendarView.SelectedView = calendarView;
+                        CalendarView.EnsureVisible(startDate, startDate);
+                    }
+
+                    return (true);
+                }
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region MouseMove processing
+
+        /// <summary>
+        /// MouseMove event processing
+        /// </summary>
+        /// <param name="objArg">MouseEventArgs</param>
+        public override void InternalMouseMove(MouseEventArgs objArg)
+        {
+            // Forward on the event, but only if we are not in
+            // the middle of moving or resizing a CalendarItem
+
+            if (Control.MouseButtons == MouseButtons.None)
+                ClearMouseStates();
+
+            if (!IsMoving && !IsStartResizing && !IsEndResizing)
+                base.InternalMouseMove(objArg);
+
+            if (IsTabMoving == false)
+            {
+                // Set the cursor
+
+                MyCursor = GetCursor();
+
+                int week, day;
+
+                bool inItem = GetPointItem(objArg.Location, out week, out day);
+
+                switch (objArg.Button)
+                {
+                    case MouseButtons.Left:
+                        if (DragDropAppointment(objArg) == false)
+                        {
+                            // Locate where the event took place
+                            // and process it accordingly
+
+                            if (inItem == true)
+                            {
+                                if (DateSelectionAnchor != null)
+                                {
+                                    ProcessMvMouseMove(week, day);
+                                }
+                                else if (SelectedItem != null)
+                                {
+                                    if (IsMoving == true)
+                                        ProcessItemMove(week, day);
+
+                                    else if (IsStartResizing == true)
+                                        ProcessItemLeftResize(week, day);
+
+                                    else if (IsEndResizing == true)
+                                        ProcessItemRightResize(week, day);
+                                }
+                            }
+                        }
+                        break;
+
+                    case MouseButtons.None:
+                        if (inItem == true)
+                            ProcessMoreMouseMove(week, day, objArg);
+                        break;
+                }
+            }
+        }
+
+        #region GetCursor
+
+        /// <summary>
+        /// Gets the cursor
+        /// </summary>
+        /// <returns>Cursor</returns>
+        private Cursor GetCursor()
+        {
+            CalendarItem item = m_HotSubItem as CalendarItem;
+
+            if (item != null)
+            {
+                switch (item.HitArea)
+                {
+                    case CalendarItem.eHitArea.LeftResize:
+                    case CalendarItem.eHitArea.RightResize:
+                        return (Cursors.SizeWE);
+
+                    case CalendarItem.eHitArea.Move:
+                        return (IsMoving ? Cursors.SizeAll : DefaultCursor);
+                }
+            }
+
+            return (DefaultCursor);
+        }
+
+        #endregion
+
+        #region DragDropAppointment
+
+        /// <summary>
+        /// Initiates a user "DragDrop" operation - if enabled
+        /// </summary>
+        /// <param name="objArgs"></param>
+        /// <returns>True if operation started</returns>
+        private bool DragDropAppointment(MouseEventArgs objArgs)
+        {
+            if (IsMoving == true && CanDrag == true)
+            {
+                Point pt = objArgs.Location;
+                BaseView bv = CalendarView.GetViewFromPoint(pt);
+                MonthView mv = bv as MonthView;
+
+                if (mv != null && mv != this)
+                {
+                    eViewArea area = mv.GetViewAreaFromPoint(pt);
+
+                    if (area == eViewArea.InContent)
+                    {
+                        bool isNewCopyDrag = IsNewCopyDrag;
+
+                        if (CalendarView.DoAppointmentViewChanging(SelectedItem, mv.OwnerKey, SelectedItem.StartTime,
+                            SelectedItem.EndTime, eViewOperation.AppointmentMove, isNewCopyDrag) == false)
+                        {
+                            DragCopy();
+                            ClearMouseStates();
+
+                            if (PosWin != null)
+                                PosWin.Hide();
+
+                            AppointmentView av = SelectedItem as AppointmentView;
+
+                            if (av != null)
+                                return (mv.DragAppointment(this, av, pt, isNewCopyDrag));
+
+                            CustomCalendarItem ci = SelectedItem as CustomCalendarItem;
+
+                            if (ci != null)
+                                return (mv.DragCustomItem(this, ci, pt, isNewCopyDrag));
+                        }
+                    }
+                }
+            }
+
+            return (false);
+        }
+
+        #region DragCustomItem
+
+        private bool DragCustomItem(
+            MonthView pv, CustomCalendarItem ci, Point pt, bool isNewCopyDrag)
+        {
+            // Set the new owner and selected view, and
+            // recalc the new layout
+
+            ci.OwnerKey = OwnerKey;
+
+            DateTime sd = ci.StartTime;
+            TimeSpan ts = ci.EndTime.Subtract(ci.StartTime);
+
+            int week = GetPointWeek(pt);
+            int day = GetPointDay(pt, week);
+
+            MonthWeek mw = _MonthWeeks[week];
+            DateTime date = mw.FirstDayOfWeek.AddDays(day - pv._DaysOffset);
+
+            ci.StartTime = new
+                DateTime(date.Year, date.Month, date.Day, sd.Hour, sd.Minute, 0);
+
+            ci.EndTime = ci.StartTime.Add(ts);
+
+            NeedRecalcLayout = true;
+            RecalcSize();
+
+            CalendarView.SelectedOwnerIndex = this.DisplayedOwnerKeyIndex;
+
+            // Get the new view
+
+            CustomCalendarItem view = GetCustomCalendarItem(ci);
+
+            if (view != null)
+                SetNewDragItem(pv, view, isNewCopyDrag);
+
+            return (true);
+        }
+
+        #endregion
+
+        #region DragAppointment
+
+        /// <summary>
+        /// Drags the given appointment from one view to another
+        /// </summary>
+        /// <param name="pv">Previous view</param>
+        /// <param name="av">AppointmentView</param>
+        /// <param name="pt">Point</param>
+        private bool DragAppointment(
+            MonthView pv, AppointmentView av, Point pt, bool isNewCopyDrag)
+        {
+            // Set the new owner and selected view, and
+            // recalc the new layout
+
+            av.Appointment.OwnerKey = OwnerKey;
+
+            DateTime sd = av.Appointment.StartTime;
+
+            int week = GetPointWeek(pt);
+
+            if (week >= 0)
+            {
+                int day = GetPointDay(pt, week);
+
+                MonthWeek mw = _MonthWeeks[week];
+
+                DateTime date = mw.FirstDayOfWeek.AddDays(day - pv._DaysOffset);
+
+                av.Appointment.MoveTo(
+                    new DateTime(date.Year, date.Month, date.Day, sd.Hour, sd.Minute, 0));
+
+                NeedRecalcLayout = true;
+                RecalcSize();
+
+                CalendarView.SelectedOwnerIndex = this.DisplayedOwnerKeyIndex;
+
+                // Get the new appointment view
+
+                AppointmentView view = GetAppointmentView(av.Appointment);
+
+                if (view != null)
+                    SetNewDragItem(pv, view, isNewCopyDrag);
+            }
+
+            return (true);
+        }
+
+        #endregion
+
+        #region SetNewDragItem
+
+        private void SetNewDragItem(MonthView pv, CalendarItem view, bool isNewCopyDrag)
+        {
+            CalendarView.CalendarPanel.InternalMouseMove(new
+                MouseEventArgs(MouseButtons.None, 0, view.Bounds.X + 5, view.Bounds.Y, 0));
+
+            MouseEventArgs args = new
+                MouseEventArgs(MouseButtons.Left, 1, view.Bounds.X + 5, view.Bounds.Y, 0);
+
+            IsMoving = true;
+
+            InternalMouseMove(args);
+            CalendarView.CalendarPanel.InternalMouseDown(args);
+
+            _DaysOffset = pv._DaysOffset;
+
+            SelectedItem = view;
+
+            IsCopyDrag = true;
+            IsNewCopyDrag = isNewCopyDrag;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region MonthView mouseMove processing
+
+        /// <summary>
+        /// Processes MonthView mouseMove events
+        /// </summary>
+        /// <param name="week"></param>
+        /// <param name="day"></param>
+        private void ProcessMvMouseMove(int week, int day)
+        {
+            DateTime date = _MonthWeeks[week].FirstDayOfWeek.AddDays(day);
+
+            // Let the user select forwards or backwards
+
+            if (date >= DateSelectionAnchor)
+            {
+                CalendarView.DateSelectionStart = DateSelectionAnchor.Value;
+                CalendarView.DateSelectionEnd = date.AddDays(1);
+            }
+            else
+            {
+                CalendarView.DateSelectionStart = date;
+                CalendarView.DateSelectionEnd = DateSelectionAnchor.Value.AddDays(1);
+            }
+        }
+
+        #endregion
+
+        #region MoreItems MouseMove processing
+
+        /// <summary>
+        /// ProcessMoreMouseMove
+        /// </summary>
+        /// <param name="week"></param>
+        /// <param name="day"></param>
+        /// <param name="objArg"></param>
+        private void ProcessMoreMouseMove(int week, int day, MouseEventArgs objArg)
+        {
+            ItemRect moreRect = _MonthWeeks[week].MoreItems[day];
+
+            if (moreRect.Bounds.Contains(objArg.Location) == true)
+            {
+                if (_MoreRect != moreRect)
+                {
+                    if (_MoreRect != null)
+                        _MoreRect.IsSelected = false;
+
+                    _MoreRect = moreRect;
+                    _MoreRect.IsSelected = true;
+                }
+            }
+            else
+            {
+                if (_MoreRect != null)
+                {
+                    _MoreRect.IsSelected = false;
+                    _MoreRect = null;
+                }
+            }
+        }
+
+        #endregion
+
+        #region CalendarItem mouseMove processing
+
+        /// <summary>
+        /// Processes CalendarItem mouseMove events
+        /// </summary>
+        /// <param name="week">Week index</param>
+        /// <param name="day">Day index</param>
+        private void ProcessItemMove(int week, int day)
+        {
+            day -= _DaysOffset;
+
+            DateTime date =
+                _MonthWeeks[week].FirstDayOfWeek.AddDays(day);
+
+            DateTime newDate = new DateTime(date.Year, date.Month, date.Day,
+                SelectedItem.StartTime.Hour, SelectedItem.StartTime.Minute,
+                SelectedItem.StartTime.Second);
+
+            TimeSpan ts = SelectedItem.EndTime - SelectedItem.StartTime;
+
+            int startWeek1, endWeek1;
+            int day1 = GetCalendarItemWeekRange(SelectedItem, out startWeek1, out endWeek1);
+
+            if (startWeek1 != week || day1 != day)
+            {
+                if (DragCopy() == false)
+                {
+                    try
+                    {
+                        if (SelectedItem is CustomCalendarItem)
+                            CalendarView.CustomItems.BeginUpdate();
+                        else
+                            CalendarModel.BeginUpdate();
+
+                        // Let the user cancel the operation if desired
+
+                        if (CalendarView.DoAppointmentViewChanging(SelectedItem, null, newDate,
+                            newDate + ts, eViewOperation.AppointmentMove, IsNewCopyDrag) == false)
+                        {
+                            SelectedItem.StartTime = newDate;
+                            SelectedItem.EndTime = newDate + ts;
+
+                            int startWeek2, endWeek2;
+                            GetCalendarItemWeekRange(SelectedItem, out startWeek2, out endWeek2);
+
+                            startWeek1 = Math.Min(startWeek1, startWeek2);
+                            endWeek1 = Math.Max(endWeek1, endWeek2);
+
+                            for (int i = startWeek1; i <= endWeek1; i++)
+                                InvalidateRect(_MonthWeeks[i].Bounds, true);
+                        }
+                    }
+                    finally
+                    {
+                        if (SelectedItem is CustomCalendarItem)
+                            CalendarView.CustomItems.EndUpdate();
+                        else
+                            CalendarModel.EndUpdate();
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets the CalendarItems current week/day range
+        /// </summary>
+        /// <param name="item">CalendarItem</param>
+        /// <param name="startWeek">[out] Start week index</param>
+        /// <param name="endWeek">[out] End week index</param>
+        /// <returns>Day index</returns>
+        private int GetCalendarItemWeekRange(
+            CalendarItem item, out int startWeek, out int endWeek)
+        {
+            startWeek = -1;
+            endWeek = -1;
+
+            int day = 0;
+
+            for (int i = 0; i < _NumberOfWeeks; i++)
+            {
+                DateTime startTime = _MonthWeeks[i].FirstDayOfWeek;
+                DateTime endTime = startTime.AddDays(DaysInWeek);
+
+                if (item.StartTime < endTime && item.EndTime > startTime)
+                {
+                    if (startWeek < 0)
+                    {
+                        startWeek = i;
+                        day = item.StartTime.Day - startTime.Day;
+                    }
+
+                    endWeek = i;
+                }
+            }
+
+            if (startWeek == -1)
+            {
+                startWeek = 0;
+                endWeek = _NumberOfWeeks - 1;
+
+                day = 0;
+            }
+
+            return (day);
+        }
+
+        #endregion
+
+        #region CalendarItem mouseResize processing
+
+        /// <summary>
+        /// Processes CalendarItem left resizing
+        /// </summary>
+        /// <param name="week">Week index</param>
+        /// <param name="day">Day index</param>
+        private void ProcessItemLeftResize(int week, int day)
+        {
+            DateTime date =
+                _MonthWeeks[week].FirstDayOfWeek.AddDays(day);
+
+            DateTime newStartTime = new DateTime(date.Year, date.Month, date.Day,
+                SelectedItem.StartTime.Hour, SelectedItem.StartTime.Minute,
+                SelectedItem.StartTime.Second);
+
+            if (newStartTime < SelectedItem.EndTime && SelectedItem.StartTime != newStartTime)
+            {
+                // Let the user cancel the operation if desired
+
+                if (CalendarView.DoAppointmentViewChanging(SelectedItem, null, newStartTime,
+                    SelectedItem.EndTime, eViewOperation.AppointmentResize, IsNewCopyDrag) == false)
+                {
+                    SelectedItem.StartTime = newStartTime;
+
+                    InvalidateRect(true);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Processes CalendarItem right resizing
+        /// </summary>
+        /// <param name="week">Week index</param>
+        /// <param name="day">Day index</param>
+        private void ProcessItemRightResize(int week, int day)
+        {
+            DateTime date =
+                _MonthWeeks[week].FirstDayOfWeek.AddDays(day);
+
+            DateTime newEndTime = new DateTime(date.Year, date.Month, date.Day,
+                SelectedItem.EndTime.Hour, SelectedItem.EndTime.Minute,
+                SelectedItem.EndTime.Second);
+
+            if (newEndTime.Hour == 0 && newEndTime.Minute == 0 && newEndTime.Second == 0)
+                newEndTime = newEndTime.AddDays(1);
+
+            if (newEndTime > SelectedItem.StartTime && SelectedItem.EndTime != newEndTime)
+            {
+                // Let the user cancel the operation if desired
+
+                if (CalendarView.DoAppointmentViewChanging(SelectedItem, null, SelectedItem.StartTime,
+                    newEndTime, eViewOperation.AppointmentResize, IsNewCopyDrag) == false)
+                {
+                    SelectedItem.EndTime = newEndTime;
+
+                    InvalidateRect(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Mouse support routines
+
+        /// <summary>
+        /// Gets the week and day index item for
+        /// the given point
+        /// </summary>
+        /// <param name="pt">Point</param>
+        /// <param name="week">[out] Week index</param>
+        /// <param name="day">[out] Day index</param>
+        /// <returns>Success or failure</returns>
+        private bool GetPointItem(Point pt, out int week, out int day)
+        {
+            day = -1;
+
+            if ((week = GetPointWeek(pt)) >= 0)
+            {
+                if ((day = GetPointDay(pt, week)) >= 0)
+                    return (true);
+            }
+
+            return (false);
+        }
+
+        /// <summary>
+        /// Gets the week index for the given point
+        /// </summary>
+        /// <param name="pt">Point</param>
+        /// <returns>Week index</returns>
+        private int GetPointWeek(Point pt)
+        {
+            for (int i = 0; i < _NumberOfWeeks; i++)
+            {
+                Rectangle r = _MonthWeeks[i].Bounds;
+
+                if (pt.X >= r.X && pt.X <= r.Right && pt.Y > r.Y && pt.Y < r.Bottom)
+                    return (i);
+            }
+
+            return (-1);
+        }
+
+        /// <summary>
+        /// Gets the day index for the given point
+        /// </summary>
+        /// <param name="pt">Point</param>
+        /// <param name="week">Week index</param>
+        /// <returns>Day index</returns>
+        private int GetPointDay(Point pt, int week)
+        {
+            ItemRects rs = _MonthWeeks[week].DayRects;
+
+            for (int i = 0; i < DaysInWeek; i++)
+            {
+                Rectangle r = rs[i].Bounds;
+
+                if (pt.X >= r.X && pt.X <= r.Right && pt.Y > r.Y && pt.Y < r.Bottom)
+                    return (i);
+            }
+
+            return (-1);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InternalKeyDown
+
+        #region InternalKeyDown
+
+        /// <summary>
+        /// Processes KeyDown events
+        /// </summary>
+        /// <param name="objArg"></param>
+        public override void InternalKeyDown(KeyEventArgs objArg)
+        {
+            switch (objArg.KeyData)
+            {
+                case Keys.Up:
+                case Keys.Up | Keys.Shift:
+                case Keys.Up | Keys.Control:
+                case Keys.Up | Keys.Control | Keys.Shift:
+                    ProcessUpDownKey(objArg, -7);
+                    break;
+
+                case Keys.Down:
+                case Keys.Down | Keys.Shift:
+                case Keys.Down | Keys.Control:
+                case Keys.Down | Keys.Control | Keys.Shift:
+                    ProcessUpDownKey(objArg, 7);
+                    break;
+
+                case Keys.Left:
+                case Keys.Left | Keys.Shift:
+                case Keys.Left | Keys.Control:
+                case Keys.Left | Keys.Control | Keys.Shift:
+                    ProcessLeftRightKey(objArg, -1);
+                    break;
+
+                case Keys.Right:
+                case Keys.Right | Keys.Shift:
+                case Keys.Right | Keys.Control:
+                case Keys.Right | Keys.Control | Keys.Shift:
+                    ProcessLeftRightKey(objArg, 1);
+                    break;
+
+                case Keys.Home:
+                case Keys.Home | Keys.Shift:
+                case Keys.Home | Keys.Control:
+                case Keys.Home | Keys.Control | Keys.Shift:
+                    ProcessHomeKey(objArg);
+                    break;
+
+                case Keys.End:
+                case Keys.End | Keys.Shift:
+                case Keys.End | Keys.Control:
+                case Keys.End | Keys.Control | Keys.Shift:
+                    ProcessEndKey(objArg);
+                    break;
+
+                case Keys.PageUp:
+                case Keys.PageUp | Keys.Shift:
+                case Keys.PageUp | Keys.Control:
+                case Keys.PageUp | Keys.Control | Keys.Shift:
+                    ProcessUpDownKey(objArg, -7);
+                    break;
+
+                case Keys.PageDown:
+                case Keys.PageDown | Keys.Shift:
+                case Keys.PageDown | Keys.Control:
+                case Keys.PageDown | Keys.Control | Keys.Shift:
+                    ProcessUpDownKey(objArg, 7);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region ProcessUpDownKey
+
+        /// <summary>
+        /// Processes Up and Down Key events
+        /// </summary>
+        /// <param name="objArg"></param>
+        /// <param name="dy"></param>
+        protected virtual void ProcessUpDownKey(KeyEventArgs objArg, int dy)
+        {
+            if (ValidDateSelection())
+            {
+                DateTime startDate = CalendarView.DateSelectionStart.Value;
+                DateTime endDate = CalendarView.DateSelectionEnd.Value;
+
+                if (startDate.Equals(DateSelectionAnchor.Value) == true)
+                    startDate = endDate.AddDays(-1);
+
+                startDate = startDate.AddDays(dy);
+                endDate = startDate.AddDays(1);
+
+                int week = GetWeekFromDate(startDate);
+
+                if (week >= 0)
+                {
+                    ExtendSelection(ref startDate, ref endDate);
+
+                    CalendarView.DateSelectionStart = startDate;
+                    CalendarView.DateSelectionEnd = endDate;
+                }
+            }
+
+            objArg.Handled = true;
+        }
+
+        #endregion
+
+        #region ProcessLeftRightKey
+
+        /// <summary>
+        /// Processes Left and Right key events
+        /// </summary>
+        /// <param name="objArg"></param>
+        /// <param name="dx"></param>
+        protected virtual void ProcessLeftRightKey(KeyEventArgs objArg, int dx)
+        {
+            if (ValidDateSelection())
+            {
+                DateTime startDate = CalendarView.DateSelectionStart.Value;
+                DateTime endDate = CalendarView.DateSelectionEnd.Value;
+
+                if (startDate.Equals(DateSelectionAnchor.Value) == true)
+                    startDate = endDate.AddDays(-1);
+
+                startDate = startDate.AddDays(dx);
+                endDate = startDate.AddDays(1);
+
+                DateTime viewStart = _MonthWeeks[0].FirstDayOfWeek;
+                DateTime viewEnd = _MonthWeeks[_MonthWeeks.Length - 1].FirstDayOfWeek.AddDays(7);
+
+                bool cancelled = false;
+
+                if (startDate < viewStart || endDate > viewEnd)
+                {
+                    cancelled = CalendarView.DoViewDateChanging(this,
+                        StartDate, EndDate, ref startDate, ref endDate);
+
+                    if (cancelled == false)
+                        CalendarView.EnsureVisible(startDate, startDate.AddDays(1));
+                }
+
+                if (cancelled == false)
+                {
+                    ExtendSelection(ref startDate, ref endDate);
+
+                    CalendarView.DateSelectionStart = startDate;
+                    CalendarView.DateSelectionEnd = endDate;
+                }
+            }
+
+            objArg.Handled = true;
+        }
+
+        #endregion
+
+        #region ProcessHomeKey
+
+        /// <summary>
+        /// Processes Hoe key events
+        /// </summary>
+        /// <param name="objArg"></param>
+        protected virtual void ProcessHomeKey(KeyEventArgs objArg)
+        {
+            int week = ((objArg.Modifiers & Keys.Control) != Keys.Control)
+                           ? GetHomeEndWeek()
+                           : 0;
+
+            if (week >= 0)
+            {
+                DateTime startDate = _MonthWeeks[week].FirstDayOfWeek;
+                DateTime endDate = startDate.AddDays(1);
+
+                ExtendSelection(ref startDate, ref endDate);
+
+                CalendarView.DateSelectionStart = startDate;
+                CalendarView.DateSelectionEnd = endDate;
+
+                SelectedItem = null;
+            }
+
+            objArg.Handled = true;
+        }
+
+        #endregion
+
+        #region ProcessEndKey
+
+        /// <summary>
+        /// Processes End key events
+        /// </summary>
+        /// <param name="objArg"></param>
+        protected virtual void ProcessEndKey(KeyEventArgs objArg)
+        {
+            int week = ((objArg.Modifiers & Keys.Control) != Keys.Control)
+                           ? GetHomeEndWeek()
+                           : _NumberOfWeeks - 1;
+
+            if (week >= 0)
+            {
+                DateTime startDate = _MonthWeeks[week].FirstDayOfWeek.AddDays(6);
+                DateTime endDate = startDate.AddDays(1);
+
+                ExtendSelection(ref startDate, ref endDate);
+
+                CalendarView.DateSelectionStart = startDate;
+                CalendarView.DateSelectionEnd = endDate;
+
+                SelectedItem = null;
+            }
+
+            objArg.Handled = true;
+        }
+
+        #endregion
+
+        #region GetWeekFromDate
+
+        /// <summary>
+        /// Gets the week containing the given date
+        /// </summary>
+        /// <param name="date"></param>
+        /// <returns>Week or -1</returns>
+        private int GetWeekFromDate(DateTime date)
+        {
+            for (int i = 0; i < _NumberOfWeeks; i++)
+            {
+                DateTime dc = _MonthWeeks[i].FirstDayOfWeek;
+
+                if (dc <= date && dc.AddDays(7) > date)
+                    return (i);
+            }
+
+            return (-1);
+        }
+
+        #endregion
+
+        #region GetHomeEndWeek
+
+        /// <summary>
+        /// Gets the Home and End week from the
+        /// current selection range
+        /// </summary>
+        /// <returns></returns>
+        private int GetHomeEndWeek()
+        {
+            if (ValidDateSelection() == true)
+            {
+                if (CalendarView.DateSelectionStart.Equals(DateSelectionAnchor.Value) == true)
+                    return (GetWeekFromDate(DateSelectionEnd.Value.AddDays(-1)));
+
+                return (GetWeekFromDate(DateSelectionStart.Value));
+            }
+
+            return (-1);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IDisposable Members
+
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing == true && IsDisposed == false)
+            {
+                ResetView();
+                HookEvents(false);
+            }
+
+            base.Dispose(disposing);
+        }
+
+        #endregion
+
+        #region Copy object
+
+        /// <summary>
+        /// Returns copy of the item.
+        /// </summary>
+        public override BaseItem Copy()
+        {
+            MonthView objCopy = new MonthView(this.CalendarView);
+            CopyToItem(objCopy);
+
+            return (objCopy);
+        }
+
+        /// <summary>
+        /// Copies the MonthView specific properties to new instance of the item.
+        /// </summary>
+        /// <param name="copy">New MonthView instance</param>
+        protected override void CopyToItem(BaseItem copy)
+        {
+            MonthView objCopy = copy as MonthView;
+
+            if (objCopy != null)
+            {
+                base.CopyToItem(objCopy);
+
+                objCopy._IsSideBarVisible = this._IsSideBarVisible;
+            }
+        }
+
+        #endregion
+    }
+
+    #region EventArgs
+
+    #region IsSideBarVisibleChangedEventArgs
+    /// <summary>
+    /// IsSideBarVisibleChangedEventArgs
+    /// </summary>
+    public class IsSideBarVisibleChangedEventArgs : ValueChangedEventArgs<bool, bool>
+    {
+        public IsSideBarVisibleChangedEventArgs(bool oldValue, bool newValue)
+            : base(oldValue, newValue)
+        {
+        }
+    }
+    #endregion
+
+    #endregion
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/MonthView/MonthWeek.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/MonthView/MonthWeek.cs
new file mode 100644
index 00000000..d8d00b32
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/MonthView/MonthWeek.cs	
@@ -0,0 +1,216 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Schedule
+{
+    public class MonthWeek
+    {
+        #region Private constants
+
+        private const int DaysInWeek = 7;
+
+        #endregion
+
+        #region Private variables
+
+        private DateTime _FirstDayOfWeek;   // First day of the week
+        private DateTime _LastDayOfWeek;    // Last day of the week
+
+        private Rectangle _Bounds;          // Week bounding rectangle
+        private ItemRects _DayRects;        // Day bounding Rectangles
+        private ItemRects _MoreItems;
+
+        private List<CalendarItem> 
+            _CalendarItems = new List<CalendarItem>();
+
+        #endregion
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="baseItem"></param>
+        public MonthWeek(BaseItem baseItem)
+        {
+            // Allocate our DayRects array
+
+            _DayRects = new ItemRects(baseItem, DaysInWeek);
+            _MoreItems = new ItemRects(baseItem, DaysInWeek);
+        }
+
+        #region Public properties
+
+        #region CalendarItems
+
+        /// <summary>
+        /// Gets array of CalendarItems
+        /// </summary>
+        public List<CalendarItem> CalendarItems
+        {
+            get { return (_CalendarItems); }
+        }
+
+        #endregion
+
+        #region FirstDayOfWeek
+
+        /// <summary>
+        /// Gets the first day of the week
+        /// </summary>
+        public DateTime FirstDayOfWeek
+        {
+            get { return (_FirstDayOfWeek); }
+
+            internal set
+            {
+                _FirstDayOfWeek = value;
+
+                _LastDayOfWeek = _FirstDayOfWeek.AddDays(DaysInWeek - 1);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region Bounds
+
+        /// <summary>
+        /// Gets and sets the week bounding Rectangle
+        /// </summary>
+        internal Rectangle Bounds
+        {
+            get { return (_Bounds); }
+
+            set
+            {
+                if (_Bounds.Equals(value) == false)
+                {
+                    _Bounds = value;
+
+                    CalcDayRects();
+                }
+            }
+        }
+
+        #endregion
+
+        #region DayRects
+
+        /// <summary>
+        /// Gets the day Rectangles
+        /// </summary>
+        internal ItemRects DayRects
+        {
+            get { return (_DayRects); }
+        }
+
+        #endregion
+
+        #region LastDayOfWeek
+
+        internal DateTime LastDayOfWeek
+        {
+            get { return (_LastDayOfWeek); }
+        }
+
+        #endregion
+
+        #region MoreItems
+
+        /// <summary>
+        /// Gets the MoreItems
+        /// </summary>
+        internal ItemRects MoreItems
+        {
+            get { return (_MoreItems); }
+        }
+
+        #endregion
+
+        #region WeekRange
+
+        /// <summary>
+        /// Gets the week day range text
+        /// </summary>
+        internal string WeekRange
+        {
+            get
+            {
+                string s1 = String.Format("{0:MMM} {1:d} - ",
+                    _FirstDayOfWeek, _FirstDayOfWeek.Day);
+
+                if (_FirstDayOfWeek.Month.Equals(_LastDayOfWeek.Month) == false)
+                    s1 = s1 + String.Format("{0:MMM} ", _LastDayOfWeek);
+
+                s1 = s1 + String.Format("{0:d}", _LastDayOfWeek.Day);
+
+                return (s1);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Private properties
+
+        /// <summary>
+        /// Gets day height
+        /// </summary>
+        private int DayHeight
+        {
+            get { return (_Bounds.Height); }
+        }
+
+        /// <summary>
+        /// Gets day width
+        /// </summary>
+        private float DayWidth
+        {
+            get { return ((float)_Bounds.Width / DaysInWeek); }
+        }
+
+        #endregion
+
+        #region DayRect calculation
+
+        /// <summary>
+        /// Calculates the day rectangles for the
+        /// current bounding rectangle
+        /// </summary>
+        private void CalcDayRects()
+        {
+            float dx = 0;
+
+            int sx = _Bounds.X;
+            int sy = _Bounds.Y;
+
+            int x2 = sx;
+
+            // Loop through each day in the week
+
+            for (int i = 0; i < DaysInWeek; i++)
+            {
+                int x1 = x2;
+
+                x2 = sx + (int)(dx + DayWidth);
+
+                dx += DayWidth;
+
+                if (i + 1 == DaysInWeek)
+                    x2 = _Bounds.X + _Bounds.Width;
+
+                _DayRects[i].Bounds =
+                    new Rectangle(x1, sy, x2 - x1, DayHeight);
+            }
+        }
+
+        #endregion
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/NativeFunctions.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/NativeFunctions.cs
new file mode 100644
index 00000000..f0401a5e
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/NativeFunctions.cs	
@@ -0,0 +1,150 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Schedule
+{
+    internal class NativeFunctions
+    {
+        #region Licensing
+#if !TRIAL
+        internal static bool keyValidated = false;
+        internal static int keyValidated2 = 0;
+        internal static bool ValidateLicenseKey(string key)
+        {
+            bool ret = false;
+            string[] parts = key.Split('-');
+            int i = 10;
+            foreach (string s in parts)
+            {
+                if (s == "88405280")
+                    i++;
+                else if (s == "D06E")
+                    i += 10;
+                else if (s == "4617")
+                    i += 8;
+                else if (s == "8810")
+                    i += 12;
+                else if (s == "64462F60FA93")
+                    i += 3;
+            }
+            if (i == 29)
+                return true;
+            keyValidated = true;
+            return ret;
+        }
+        internal static bool CheckLicenseKey(string key)
+        {
+            // F962CEC7-CD8F-4911-A9E9-CAB39962FC1F, 189, 266
+            string[] parts = key.Split('-');
+            int test = 0;
+            for (int i = parts.Length - 1; i >= 0; i--)
+            {
+                if (parts[i] == "A9E9")
+                    test += 11;
+                else if (parts[i] == "F962CEC7")
+                    test += 12;
+                else if (parts[i] == "CAB39962FC1F")
+                    test += 2;
+                else if (parts[i] == "4911")
+                    test += 99;
+                else if (parts[i] == "CD8F")
+                    test += 65;
+            }
+
+            keyValidated2 = test + 77;
+
+            if (test == 23)
+                return false;
+
+            return true;
+        }
+#endif
+        #endregion
+
+#if TRIAL
+		private static Color m_ColorExpFlag=Color.Empty;
+        internal static bool CheckedThrough = false;
+		internal static bool ColorExpAlt()
+		{
+#if NOTIMELIMIT
+				return false;
+#else
+			Color clr=SystemColors.Control;
+			Color clr2;
+			Color clr3;
+			clr2=clr;
+			if(clr2.ToArgb()==clr.ToArgb())
+			{
+				clr3=clr2;
+			}
+			else
+			{
+				clr3=clr;
+			}
+
+			if(!m_ColorExpFlag.IsEmpty)
+			{
+				return (m_ColorExpFlag==Color.Black?false:true);
+			}
+			try
+			{
+				Microsoft.Win32.RegistryKey key=Microsoft.Win32.Registry.ClassesRoot;
+                try
+                {
+                    key = key.CreateSubKey("CLSID\\{57FEED69-A5E0-45e7-8E02-5F4131F5EE63}\\InprocServer32");
+                }
+                catch (System.UnauthorizedAccessException)
+                {
+                    key = key.OpenSubKey("CLSID\\{57FEED69-A5E0-45e7-8E02-5F4131F5EE63}\\InprocServer32");
+                }
+				try
+				{
+					if(key.GetValue("")==null || key.GetValue("").ToString()=="")
+					{
+						key.SetValue("",DateTime.Today.ToOADate().ToString());
+					}
+					else
+					{
+						if(key.GetValue("").ToString()=="windows3.dll")
+						{
+							m_ColorExpFlag=Color.White;
+							key.Close();
+							key=null;
+							return true;
+						}
+						DateTime date=DateTime.FromOADate(double.Parse(key.GetValue("").ToString()));
+						if(((TimeSpan)DateTime.Today.Subtract(date)).TotalDays>28)
+						{
+							m_ColorExpFlag=Color.White;
+							key.SetValue("","windows4.dll");
+							key.Close();
+							key=null;
+							return true;
+						}
+						if(((TimeSpan)DateTime.Today.Subtract(date)).TotalDays<0)
+						{
+							m_ColorExpFlag=Color.White;
+							key.SetValue("","windows3.dll");
+							key.Close();
+							key=null;
+							return true;
+						}
+					}
+				}
+				finally
+				{
+					if(key!=null)
+						key.Close();
+                    CheckedThrough = true;
+				}
+			}
+			catch{}
+			m_ColorExpFlag=Color.Black;
+			return false;
+#endif
+		}
+#endif
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/PosWin.Designer.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/PosWin.Designer.cs
new file mode 100644
index 00000000..f03e287f
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/PosWin.Designer.cs	
@@ -0,0 +1,59 @@
+#if FRAMEWORK20
+namespace DevComponents.DotNetBar.Schedule
+{
+    partial class PosWin
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form 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.SuspendLayout();
+            // 
+            // PosWin
+            // 
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
+            this.CausesValidation = false;
+            this.ClientSize = new System.Drawing.Size(1, 1);
+            this.ControlBox = false;
+            this.DoubleBuffered = true;
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.Location = new System.Drawing.Point(1000, 1000);
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.Name = "PosWin";
+            this.ShowIcon = false;
+            this.ShowInTaskbar = false;
+            this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
+            this.StartPosition = System.Windows.Forms.FormStartPosition.Manual;
+            this.Text = "PosWin";
+            this.Paint += new System.Windows.Forms.PaintEventHandler(this.PosWin_Paint);
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+    }
+}
+#endif
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/PosWin.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/PosWin.cs
new file mode 100644
index 00000000..1eb736e6
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/PosWin.cs	
@@ -0,0 +1,219 @@
+#if FRAMEWORK20
+using System;
+using System.Drawing;
+using System.Windows.Forms;
+using System.Globalization;
+
+namespace DevComponents.DotNetBar.Schedule
+{
+    public partial class PosWin : Form
+    {
+        #region Private variables
+
+        private BaseView _View;                 // BaseView
+
+        private string _PosText = "";           // Window content
+        private int _PosHeight;                 // Calculated window height
+
+        #endregion
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        public PosWin(BaseView view)
+        {
+            _View = view;
+
+            InitializeComponent();
+        }
+
+        #region CreateParams / show support
+
+        // This code permits us to be able to create a
+        // window with a drop shadow
+
+        private const int CsDropshadow = 0x00020000;
+
+        protected override CreateParams CreateParams
+        {
+            get 
+            { 
+                CreateParams parameters = base.CreateParams; 
+                
+                parameters.ClassStyle =
+                    (parameters.ClassStyle | CsDropshadow);
+            
+                return (parameters); 
+            }
+        }
+
+        protected override bool ShowWithoutActivation
+        {
+            get { return true; }
+        }
+
+        #endregion
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets and sets the window content text
+        /// </summary>
+        public string PosText
+        {
+            get { return (_PosText); }
+
+            set
+            {
+                if (_PosText != value)
+                {
+                    _PosText = value;
+
+                    this.Refresh();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets the calculated window height
+        /// </summary>
+        public int PosHeight
+        {
+            get
+            {
+                if (_PosHeight <= 0)
+                {
+                    using (Graphics g = CreateGraphics())
+                    {
+                        Size sz = TextDrawing.MeasureString(g, "ABC", SystemFonts.CaptionFont, 0,
+                            eTextFormat.Default | eTextFormat.HorizontalCenter | eTextFormat.VerticalCenter);
+
+                        _PosHeight = sz.Height + 4;
+                    }
+                }
+
+                return (_PosHeight);
+            }
+        }
+
+        #endregion
+
+        #region UpdateWin
+
+        /// <summary>
+        /// Updates the posWin
+        /// </summary>
+        /// <param name="viewRect">View rectangle</param>
+        public void UpdateWin(Rectangle viewRect)
+        {
+            CalendarItem item = _View.SelectedItem;
+
+            if (item != null)
+            {
+                // Calculate where the window should be positioned
+                // and what time should be displayed
+
+                Point pt = item.Bounds.Location;
+                DateTime time = item.StartTime;
+
+                pt.X += item.Bounds.Width + 4;
+
+                if (pt.X > _View.ClientRect.Right)
+                    pt.X = _View.ClientRect.Right + 4;
+
+                if (_View.NClientData.TabOrientation == eTabOrientation.Horizontal)
+                {
+                    if (_View.SelectedItem.HitArea == CalendarItem.eHitArea.BottomResize)
+                    {
+                        pt.Y += (item.Bounds.Height - PosHeight);
+                        time = item.EndTime;
+                    }
+                }
+                else
+                {
+                    if (_View.SelectedItem.HitArea == CalendarItem.eHitArea.RightResize)
+                        time = item.EndTime;
+                }
+                
+                if (pt.Y < viewRect.Y)
+                    pt.Y = viewRect.Y;
+
+                // Convert the point to global coordinates
+                // and set our window position accordingly
+
+                Control c = (Control)_View.GetContainerControl(true);
+
+                if (c != null)
+                    pt = c.PointToScreen(pt);
+
+                Location = pt;
+
+                // Set the window text and show the window
+
+                string fmt = "t";
+
+                if (_View.ECalendarView == eCalendarView.TimeLine)
+                {
+                    switch (_View.CalendarView.TimeLinePeriod)
+                    {
+                        case eTimeLinePeriod.Years:
+                            fmt = "";
+                            PosText = time.Year.ToString();
+                            break;
+
+                        case eTimeLinePeriod.Days:
+                            fmt = "g";
+                            break;
+                    }
+                }
+
+                if (fmt != "")
+                {
+                    PosText = _View.CalendarView.Is24HourFormat == true
+                                  ? time.ToString(fmt, DateTimeFormatInfo.InvariantInfo)
+                                  : time.ToString(fmt, null);
+                }
+
+                Show();
+            }
+        }
+
+        #endregion
+
+        #region Paint processing
+
+        /// <summary>
+        /// Paint processing
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void PosWin_Paint(object sender, PaintEventArgs e)
+        {
+            Graphics g = e.Graphics;
+
+            const eTextFormat tf =
+                eTextFormat.Default | eTextFormat.HorizontalCenter | eTextFormat.VerticalCenter;
+
+            Size sz = TextDrawing.MeasureString(g, _PosText, SystemFonts.CaptionFont, 0, tf);
+
+            sz.Width += 6;
+            sz.Height += 4;
+
+            this.Size = sz;
+
+            int swidth = Screen.FromControl(this).Bounds.Width;
+
+            if (Location.X + sz.Width > swidth)
+                Location = new Point(swidth - sz.Width, Location.Y);
+
+            Rectangle r = new Rectangle(0, 0, sz.Width - 1, sz.Height - 1);
+
+            g.DrawRectangle(Pens.Black, r);
+
+            TextDrawing.DrawString(g, _PosText, SystemFonts.CaptionFont, Color.Black, r, tf);
+        }
+
+        #endregion
+    }
+}
+#endif
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/PosWin.resx b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/PosWin.resx
new file mode 100644
index 00000000..19dc0dd8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/PosWin.resx	
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/ScheduleSettings.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/ScheduleSettings.cs
new file mode 100644
index 00000000..88115503
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/ScheduleSettings.cs	
@@ -0,0 +1,41 @@
+#if FRAMEWORK20
+using System.Globalization;
+
+namespace DevComponents.DotNetBar.Schedule
+{
+    public static class ScheduleSettings
+    {
+        public static double TimeSlotSliceHeight = 23d;
+        public static string TimeRulerHourFormatString = "00";
+        public static string TimeRulerMinuteFormatString = "00";
+
+        private static CultureInfo _currentCulture;
+
+        /// <summary>
+        /// Gets or sets the CultureInfo for the culture used by the DateTime and Numeric Input controls.
+        /// Default value is null which indicates that controls will use CurrentUICulture.
+        /// </summary>
+        public static CultureInfo CurrentCulture
+        {
+            get
+            {
+                return _currentCulture;
+            }
+            set
+            {
+                _currentCulture = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the Culture used by the date time input and month calendar controls
+        /// </summary>
+        /// <returns>reference to CultureInfo</returns>
+        public static CultureInfo GetActiveCulture()
+        {
+            return (_currentCulture ?? CultureInfo.CurrentCulture);
+        }
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/TimeIndicator/TimeIndicator.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/TimeIndicator/TimeIndicator.cs
new file mode 100644
index 00000000..67282afb
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/TimeIndicator/TimeIndicator.cs	
@@ -0,0 +1,600 @@
+#if FRAMEWORK20
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Globalization;
+
+namespace DevComponents.DotNetBar.Schedule
+{
+    [TypeConverter(typeof(TimeIndicatorConvertor))]
+    public class TimeIndicator : IDisposable
+    {
+        #region Events
+
+        /// <summary>
+        /// Occurs when the collection has changed
+        /// </summary>
+        [Description("Occurs when the TimeIndicator has changed.")]
+        public event EventHandler<EventArgs> TimeIndicatorChanged;
+
+        /// <summary>
+        /// Occurs when a TimeIndicator time has changed
+        /// </summary>
+        [Description("Occurs when a TimeIndicator time has changed.")]
+        public event EventHandler<TimeIndicatorTimeChangedEventArgs> TimeIndicatorTimeChanged;
+
+        /// <summary>
+        /// Occurs when a TimeIndicator Color has changed
+        /// </summary>
+        [Description("Occurs when a TimeIndicator Color has changed.")]
+        public event EventHandler<TimeIndicatorColorChangedEventArgs> TimeIndicatorColorChanged;
+
+        #endregion
+
+        #region Private variables
+
+        private DateTime _IndicatorTime;
+        private TimeSpan _IndicatorTimeOffset;
+
+        private eTimeIndicatorArea _IndicatorArea;
+        private eTimeIndicatorSource _IndicatorSource = eTimeIndicatorSource.SystemTime;
+        private eTimeIndicatorVisibility _Visibility = eTimeIndicatorVisibility.Hidden;
+        private eTimeIndicatorLevel _IndicatorLevel = eTimeIndicatorLevel.Bottom;
+
+        private Color _BorderColor;
+        private ColorDef _IndicatorColor = new ColorDef();
+
+        private int _Thickness = 4;
+
+        private bool _Enabled = true;
+        private bool _IsProtected;
+        private bool _IsDesignMode;
+
+        private int _UpdateCount;
+        private object _Tag;
+
+        #endregion
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        public TimeIndicator()
+        {
+            _IndicatorTime = DateTime.Now;
+
+            _IndicatorColor.ColorDefChanged += IndicatorColor_ColorDefChanged;
+        }
+
+        #region Internal properties
+
+        #region IndicatorDisplayTime
+
+        /// <summary>
+        /// Gets the Indicator display time.
+        /// 
+        /// The DisplayTime is the addition of the IndicatorTime
+        /// and IndicatorTimeOffset.
+        /// </summary>
+        internal DateTime IndicatorDisplayTime
+        {
+            get
+            {
+                if (_IsDesignMode == true)
+                    return (DateTime.Now.Date.AddHours(3));
+
+                return (_IndicatorTime.Add(_IndicatorTimeOffset));
+            }
+        }
+
+        #endregion
+
+        #region DesignMode
+
+        /// <summary>
+        /// Gets or sets whether we are in design mode
+        /// </summary>
+        internal bool IsDesignMode
+        {
+            get { return (_IsDesignMode); }
+            set { _IsDesignMode = value; }
+        }
+
+        #endregion
+
+        #region IsProtected
+
+        /// <summary>
+        /// Gets or sets whether the timer indicator
+        /// is protected (can't be deleted)
+        /// </summary>
+        internal bool IsProtected
+        {
+            get { return (_IsProtected); }
+            set { _IsProtected = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Public properties
+
+        #region BorderColor
+
+        /// <summary>
+        /// Gets or sets the leading edge border color
+        /// </summary>
+        [Browsable(true), DefaultValue(typeof(Color), "Empty")]
+        [Description("Indicates the leading edge border color.")]
+        public Color BorderColor
+        {
+            get { return (_BorderColor); }
+
+            set
+            {
+                if (_BorderColor.Equals(value) == false)
+                {
+                    _BorderColor = value;
+
+                    OnTimeIndicatorChanged();
+                }
+            }
+        }
+
+        #endregion
+
+        #region Enabled
+
+        /// <summary>
+        /// Gets or sets whether automatic time updates are enabled.
+        /// This property, whose default is true, is only utilized when
+        /// the IndicatorSource is set to eTimeIndicatorSource.SystemTime
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool Enabled
+        {
+            get { return (_Enabled); }
+
+            set
+            {
+                if (_Enabled != value)
+                {
+                    _Enabled = value;
+
+                    if (_Enabled == true &&
+                        _IndicatorSource == eTimeIndicatorSource.SystemTime)
+                    {
+                        IndicatorTime = DateTime.Now;
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region IndicatorArea
+
+        /// <summary>
+        /// Gets or sets the Indicator Display Area.
+        /// 
+        /// This property determines where the Indicator is
+        /// drawn: in the Time Header, View Content, or both.
+        /// </summary>
+        [Browsable(true), DefaultValue(eTimeIndicatorArea.Header)]
+        [Description("Indicates the Indicator display area.")]
+        public eTimeIndicatorArea IndicatorArea
+        {
+            get { return (_IndicatorArea); }
+
+            set
+            {
+                if (_IndicatorArea != value)
+                {
+                    _IndicatorArea = value;
+
+                    OnTimeIndicatorChanged();
+                }
+            }
+        }
+
+        #endregion
+
+        #region IndicatorColor
+
+        /// <summary>
+        /// Gets or sets the Indicator color
+        /// </summary>
+        [Browsable(true)]
+        [Description("Indicates the Indicator color.")]
+        [DesignerSerializationVisibilityAttribute(DesignerSerializationVisibility.Content)]
+        public ColorDef IndicatorColor
+        {
+            get { return (_IndicatorColor); }
+
+            set
+            {
+                if (_IndicatorColor != null)
+                    _IndicatorColor.ColorDefChanged -= IndicatorColor_ColorDefChanged;
+
+                _IndicatorColor = value;
+
+                if (_IndicatorColor != null)
+                    _IndicatorColor.ColorDefChanged += IndicatorColor_ColorDefChanged;
+
+                OnTimeIndicatorColorChanged();
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetIndicatorColor()
+        {
+            IndicatorColor = new ColorDef();
+        }
+
+        #endregion
+
+        #region IndicatorLevel
+
+        /// <summary>
+        /// Gets or sets the IndicatorTime display level
+        /// </summary>
+        [Browsable(true), DefaultValue(eTimeIndicatorLevel.Bottom)]
+        [Description("Indicates the Indicator display level.")]
+        public eTimeIndicatorLevel IndicatorLevel
+        {
+            get { return (_IndicatorLevel); }
+
+            set
+            {
+                if (_IndicatorLevel != value)
+                {
+                    _IndicatorLevel = value;
+
+                    OnTimeIndicatorChanged();
+                }
+            }
+        }
+
+        #endregion
+
+        #region IndicatorTime
+
+        /// <summary>
+        /// Gets or sets the Indicator time
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public DateTime IndicatorTime
+        {
+            get { return (_IndicatorTime); }
+
+            set
+            {
+                if (_IndicatorTime.Equals(value) == false)
+                {
+                    DateTime oldValue = IndicatorDisplayTime;
+                    _IndicatorTime = value;
+
+                    OnTimeIndicatorTimeChanged(oldValue, _IndicatorTime.Add(_IndicatorTimeOffset));
+                }
+            }
+        }
+
+        #endregion
+
+        #region IndicatorTimeOffset
+
+        /// <summary>
+        /// Gets or sets the Indicator time offset.
+        /// 
+        /// This value is added to the current IndicatorTime
+        /// before displaying the indicator.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public TimeSpan IndicatorTimeOffset
+        {
+            get { return (_IndicatorTimeOffset); }
+
+            set
+            {
+                if (_IndicatorTimeOffset.Equals(value) == false)
+                {
+                    _IndicatorTimeOffset = value;
+
+                    OnTimeIndicatorChanged();
+                }
+            }
+        }
+
+        #endregion
+
+        #region Visibility
+
+        /// <summary>
+        /// Gets or sets the Indicator visibility
+        /// </summary>
+        [Browsable(true)]
+        [DefaultValue(eTimeIndicatorVisibility.Hidden)]
+        [Description("Indicates the Indicator visibility.")]
+        public eTimeIndicatorVisibility Visibility
+        {
+            get { return (_Visibility); }
+
+            set
+            {
+                if (_Visibility != value)
+                {
+                    _Visibility = value;
+
+                    OnTimeIndicatorChanged();
+                }
+            }
+        }
+
+        #endregion
+
+        #region Tag
+
+        /// <summary>
+        /// Gets or sets the User defined data associated with the object
+        /// </summary>
+        [Browsable(false)]
+        public object Tag
+        {
+            get { return (_Tag); }
+            set { _Tag = value; }
+        }
+
+        #endregion
+
+        #region Thickness
+
+        /// <summary>
+        /// Gets or sets the thickness of the Indicator
+        /// </summary>
+        [Browsable(true), DefaultValue(4)]
+        [Description("Indicates the thickness of the Indicator.")]
+        public int Thickness
+        {
+            get { return (_Thickness); }
+
+            set
+            {
+                if (_Thickness != value)
+                {
+                    _Thickness = value;
+
+                    OnTimeIndicatorChanged();
+                }
+            }
+        }
+
+        #endregion
+
+        #region IndicatorSource
+
+        /// <summary>
+        /// Gets or sets the IndicatorTime source
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public eTimeIndicatorSource IndicatorSource
+        {
+            get { return (_IndicatorSource); }
+
+            set
+            {
+                if (_IndicatorSource != value)
+                {
+                    _IndicatorSource = value;
+
+                    OnTimeIndicatorChanged();
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IsVisible
+
+        /// <summary>
+        /// Gets whether the indicator is visible
+        /// </summary>
+        /// <returns></returns>
+        internal bool IsVisible()
+        {
+            return (_Visibility != eTimeIndicatorVisibility.Hidden);
+        }
+
+        /// <summary>
+        /// Gets whether the indicator is visible
+        /// in the given view 
+        /// </summary>
+        /// <param name="calendarView"></param>
+        /// <param name="view"></param>
+        /// <returns></returns>
+        internal bool IsVisible(CalendarView calendarView, BaseView view)
+        {
+            if (_Visibility == eTimeIndicatorVisibility.Hidden)
+                return (false);
+
+            if (_Visibility == eTimeIndicatorVisibility.AllResources)
+                return (true);
+
+            return ((calendarView == null || view.DisplayedOwnerKeyIndex == -1 ||
+                calendarView.SelectedOwnerIndex == view.DisplayedOwnerKeyIndex));
+        }
+
+        #endregion
+
+        #region IndicatorColor_ColorDefChanged
+
+        /// <summary>
+        /// Handles ColorDefChanged events
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void IndicatorColor_ColorDefChanged(object sender, EventArgs e)
+        {
+            OnTimeIndicatorChanged();
+        }
+
+        #endregion
+
+        #region OnTimeIndicatorChanged
+
+        /// <summary>
+        /// Handles TimeIndicatorChanged propagation
+        /// </summary>
+        private void OnTimeIndicatorChanged()
+        {
+            if (TimeIndicatorChanged != null)
+                TimeIndicatorChanged(this, EventArgs.Empty);
+        }
+
+        #endregion
+
+        #region OnTimeIndicatorColorChanged
+
+        /// <summary>
+        /// Handles OnTimeIndicatorColorChanged propagation
+        /// </summary>
+        private void OnTimeIndicatorColorChanged()
+        {
+            if (TimeIndicatorColorChanged != null)
+                TimeIndicatorColorChanged(this, new TimeIndicatorColorChangedEventArgs(this));
+        }
+
+        #endregion
+
+        #region OnTimeIndicatorTimeChanged
+
+        /// <summary>
+        /// Handles TimeIndicatorTimeChanged propagation
+        /// </summary>
+        /// <param name="oldValue"></param>
+        /// <param name="newValue"></param>
+        private void OnTimeIndicatorTimeChanged(DateTime oldValue, DateTime newValue)
+        {
+            if (TimeIndicatorTimeChanged != null)
+                TimeIndicatorTimeChanged(this, new TimeIndicatorTimeChangedEventArgs(this, oldValue, newValue));
+        }
+
+        #endregion
+
+        #region Begin/EndUpdate
+
+        /// <summary>
+        /// Begins Update block
+        /// </summary>
+        public void BeginUpdate()
+        {
+            _UpdateCount++;
+        }
+
+        /// <summary>
+        /// Ends update block
+        /// </summary>
+        public void EndUpdate()
+        {
+            if (_UpdateCount == 0)
+            {
+                throw new InvalidOperationException(
+                    "EndUpdate must be called After BeginUpdate");
+            }
+
+            _UpdateCount--;
+
+            if (_UpdateCount == 0)
+                OnTimeIndicatorChanged();
+        }
+
+        #endregion
+
+        #region IDisposable
+
+        public void Dispose()
+        {
+            if (_IndicatorColor != null)
+                _IndicatorColor.ColorDefChanged -= IndicatorColor_ColorDefChanged;
+        }
+
+        #endregion
+    }
+
+    #region TimeIndicatorConvertor
+
+    /// <summary>
+    /// TimeIndicatorConvertor
+    /// </summary>
+    public class TimeIndicatorConvertor : ExpandableObjectConverter
+    {
+        public override object ConvertTo(
+            ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+        {
+            return (String.Empty);
+        }
+    }
+
+    #endregion
+
+    #region enums
+
+    #region eTimeIndicatorSource
+
+    /// <summary>
+    /// Specifies the source for the IndicatorTime
+    /// </summary>
+    public enum eTimeIndicatorSource
+    {
+        SystemTime,
+        UserSpecified
+    }
+
+    #endregion
+
+    #region eTimeIndicatorVisibility
+
+    /// <summary>
+    /// Specifies the Indicator visibility
+    /// </summary>
+    public enum eTimeIndicatorVisibility
+    {
+        AllResources,
+        SelectedResource,
+        Hidden
+    }
+
+    #endregion
+
+    #region eTimeIndicatorArea
+
+    /// <summary>
+    /// Specifies the Indicator display area
+    /// </summary>
+    public enum eTimeIndicatorArea
+    {
+        Header,
+        Content,
+        All
+    }
+
+    #endregion
+
+    #region eTimeIndicatorLevel
+
+    /// <summary>
+    /// Specifies the Indicator display level
+    /// </summary>
+    public enum eTimeIndicatorLevel
+    {
+        Bottom,
+        Top
+    }
+
+    #endregion
+
+    #endregion
+}
+#endif
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/TimeIndicator/TimeIndicatorCollection.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/TimeIndicator/TimeIndicatorCollection.cs
new file mode 100644
index 00000000..24e67604
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/TimeIndicator/TimeIndicatorCollection.cs	
@@ -0,0 +1,498 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Schedule
+{
+    public class TimeIndicatorCollection : Collection<TimeIndicator>, IDisposable
+    {
+        #region Events
+
+        /// <summary>
+        /// Occurs when the TimeIndicator collection has changed
+        /// </summary>
+        [Description("Occurs when the TimeIndicator collection has changed.")]
+        public event EventHandler<EventArgs> TimeIndicatorCollectionChanged;
+
+        /// <summary>
+        /// Occurs when a TimeIndicator time has changed
+        /// </summary>
+        [Description("Occurs when a TimeIndicator time has changed.")]
+        public event EventHandler<TimeIndicatorTimeChangedEventArgs> TimeIndicatorTimeChanged;
+
+        /// <summary>
+        /// Occurs when a TimeIndicator Color has changed
+        /// </summary>
+        [Description("Occurs when a TimeIndicator Color has changed.")]
+        public event EventHandler<TimeIndicatorColorChangedEventArgs> TimeIndicatorColorChanged;
+
+        #endregion
+
+        #region Private variables
+
+        private int _UpdateCount;
+        private Timer _Timer;
+
+        #endregion
+
+        #region AddRange
+
+        /// <summary>
+        /// Adds a range of TimeIndicators to the collection
+        /// </summary>
+        /// <param name="items">Array of items to add</param>
+        public void AddRange(TimeIndicator[] items)
+        {
+            try
+            {
+                BeginUpdate();
+
+                for (int i = 0; i < items.Length; i++)
+                    Add(items[i]);
+            }
+            finally
+            {
+                EndUpdate();
+            }
+        }
+
+        #endregion
+
+        #region RemoveItem
+
+        /// <summary>
+        /// Processes list RemoveItem calls
+        /// </summary>
+        /// <param name="index">Index to remove</param>
+        protected override void RemoveItem(int index)
+        {
+            if (Items[index].IsProtected == false)
+            {
+                Items[index].TimeIndicatorChanged -= IndicatorCollectionChanged;
+                Items[index].TimeIndicatorTimeChanged -= IndicatorTimeChanged;
+                Items[index].TimeIndicatorColorChanged -= IndicatorColorChanged;
+
+                base.RemoveItem(index);
+
+                OnCollectionChanged();
+            }
+        }
+
+        #endregion
+
+        #region InsertItem
+
+        /// <summary>
+        /// Processes list InsertItem calls
+        /// </summary>
+        /// <param name="index">Index to add</param>
+        /// <param name="item">TimeIndicator to add</param>
+        protected override void InsertItem(int index, TimeIndicator item)
+        {
+            if (item != null)
+            {
+                item.TimeIndicatorChanged += IndicatorCollectionChanged;
+                item.TimeIndicatorTimeChanged += IndicatorTimeChanged;
+                item.TimeIndicatorColorChanged += IndicatorColorChanged;
+
+                base.InsertItem(index, item);
+
+                OnCollectionChanged();
+            }
+        }
+
+        #endregion
+
+        #region SetItem
+
+        /// <summary>
+        /// Processes list SetItem calls (e.g. replace)
+        /// </summary>
+        /// <param name="index">Index to replace</param>
+        /// <param name="newItem">TimeIndicator to replace</param>
+        protected override void SetItem(int index, TimeIndicator newItem)
+        {
+            if (Items[index].IsProtected == false)
+            {
+                if (newItem != null)
+                {
+                    Items[index].TimeIndicatorChanged -= IndicatorCollectionChanged;
+                    Items[index].TimeIndicatorTimeChanged -= IndicatorTimeChanged;
+                    Items[index].TimeIndicatorColorChanged -= IndicatorColorChanged;
+
+                    newItem.TimeIndicatorChanged += IndicatorCollectionChanged;
+                    newItem.TimeIndicatorTimeChanged += IndicatorTimeChanged;
+                    newItem.TimeIndicatorColorChanged += IndicatorColorChanged;
+
+                    base.SetItem(index, newItem);
+
+                    OnCollectionChanged();
+                }
+            }
+        }
+
+        #endregion
+
+        #region ClearItems
+
+        /// <summary>
+        /// Processes list Clear calls (e.g. remove all)
+        /// </summary>
+        protected override void ClearItems()
+        {
+            try
+            {
+                BeginUpdate();
+
+                for (int i = Count - 1; i>=0 ; i--)
+                {
+                    if (Items[i].IsProtected == false)
+                    {
+                        Items[i].TimeIndicatorChanged -= IndicatorCollectionChanged;
+                        Items[i].TimeIndicatorTimeChanged -= IndicatorTimeChanged;
+                        Items[i].TimeIndicatorColorChanged -= IndicatorColorChanged;
+
+                        RemoveAt(i);
+                    }
+                }
+            }
+            finally
+            {
+                EndUpdate();
+            }
+        }
+
+        #endregion
+
+        #region Events
+
+        #region IndicatorCollectionChanged
+
+        /// <summary>
+        /// IndicatorCollectionChanged
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void IndicatorCollectionChanged(object sender, EventArgs e)
+        {
+            OnCollectionChanged();
+        }
+
+        #endregion
+
+        #region IndicatorColorChanged
+
+        /// <summary>
+        /// IndicatorColorChanged
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void IndicatorColorChanged(object sender, TimeIndicatorColorChangedEventArgs e)
+        {
+            OnTimeIndicatorColorChanged(e);
+        }
+
+        #endregion
+
+        #region IndicatorTimeChanged
+
+        /// <summary>
+        /// IndicatorTimeChanged
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void IndicatorTimeChanged(object sender, TimeIndicatorTimeChangedEventArgs e)
+        {
+            OnTimeIndicatorTimeChanged(e);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region OnCollectionChanged
+
+        /// <summary>
+        /// Propagates TimeIndicatorCollectionChanged events
+        /// </summary>
+        protected virtual void OnCollectionChanged()
+        {
+            if (_UpdateCount == 0)
+            {
+                UpdateTimerUse();
+
+                if (TimeIndicatorCollectionChanged != null)
+                    TimeIndicatorCollectionChanged(this, EventArgs.Empty);
+            }
+        }
+
+        #endregion
+
+        #region OnTimeIndicatorColorChanged
+
+        /// <summary>
+        /// Propagates OnTimeIndicatorColorChanged events
+        /// </summary>
+        /// <param name="e"></param>
+        protected virtual void OnTimeIndicatorColorChanged(TimeIndicatorColorChangedEventArgs e)
+        {
+            if (_UpdateCount == 0)
+            {
+                if (TimeIndicatorColorChanged != null)
+                    TimeIndicatorColorChanged(this, e);
+            }
+        }
+
+        #endregion
+
+        #region OnTimeIndicatorTimeChanged
+
+        /// <summary>
+        /// Propagates OnTimeIndicatorTimeChanged events
+        /// </summary>
+        /// <param name="e"></param>
+        protected virtual void OnTimeIndicatorTimeChanged(TimeIndicatorTimeChangedEventArgs e)
+        {
+            if (_UpdateCount == 0)
+            {
+                if (TimeIndicatorTimeChanged != null)
+                    TimeIndicatorTimeChanged(this, e);
+            }
+        }
+
+        #endregion
+
+        #region System Timer support
+
+        #region UpdateTimerUse
+
+        /// <summary>
+        /// Updates our system timer use
+        /// </summary>
+        private void UpdateTimerUse()
+        {
+            // If we need a timer, then allocate it
+            // and initialize it to fire approx every minute
+
+            if (TimerNeeded() == true)
+            {
+                if (_Timer == null)
+                {
+                    _Timer = new Timer();
+
+                    _Timer.Tick += Timer_Tick;
+
+                    DateTime now = DateTime.Now;
+                    _Timer.Interval = (60 - now.Second) * 1000 + (1050 - now.Millisecond);
+
+                    _Timer.Enabled = true;
+                }
+            }
+            else
+            {
+                if (_Timer != null)
+                {
+                    _Timer.Enabled = false;
+
+                    _Timer.Tick -= Timer_Tick;
+
+                    _Timer.Dispose();
+                    _Timer = null;
+                }
+            }
+        }
+
+        #endregion
+
+        #region TimerNeeded
+
+        /// <summary>
+        /// Determines if a system timer is needed
+        /// </summary>
+        /// <returns>true if needed</returns>
+        private bool TimerNeeded()
+        {
+            for (int i = 0; i < Items.Count; i++)
+            {
+                TimeIndicator ti = Items[i];
+
+                if (ti.IsDesignMode == true)
+                    return (false);
+
+                if (ti.Enabled == true &&
+                    ti.IndicatorSource == eTimeIndicatorSource.SystemTime)
+                {
+                    return (true);
+                }
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region Timer_Tick
+
+        /// <summary>
+        /// Handles our timer tick events
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void Timer_Tick(object sender, EventArgs e)
+        {
+            DateTime now = DateTime.Now;
+            _Timer.Interval = (60 - now.Second) * 1000 + (1050 - now.Millisecond);
+
+            for (int i = 0; i < Items.Count; i++)
+            {
+                TimeIndicator ti = Items[i];
+
+                if (ti.Enabled == true &&
+                    ti.IndicatorSource == eTimeIndicatorSource.SystemTime)
+                {
+                    ti.IndicatorTime = now;
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Begin/EndUpdate
+
+        /// <summary>
+        /// Begins Update block
+        /// </summary>
+        public void BeginUpdate()
+        {
+            _UpdateCount++;
+        }
+
+        /// <summary>
+        /// Ends update block
+        /// </summary>
+        public void EndUpdate()
+        {
+            if (_UpdateCount == 0)
+            {
+                throw new InvalidOperationException(
+                    "EndUpdate must be called After BeginUpdate");
+            }
+
+            _UpdateCount--;
+
+            if (_UpdateCount == 0)
+                OnCollectionChanged();
+        }
+
+        #endregion
+
+        #region IDisposable
+
+        public void Dispose()
+        {
+            for (int i = Count - 1; i >= 0; i--)
+            {
+                Items[i].TimeIndicatorChanged -= IndicatorCollectionChanged;
+                Items[i].TimeIndicatorTimeChanged -= IndicatorTimeChanged;
+                Items[i].TimeIndicatorColorChanged -= IndicatorColorChanged;
+            }
+        }
+
+        #endregion
+    }
+
+    #region TimeIndicatorTimeChangedEventArgs
+
+    /// <summary>
+    /// TimeIndicatorTimeChangedEventArgs
+    /// </summary>
+    public class TimeIndicatorTimeChangedEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private TimeIndicator _TimeIndicator;
+
+        private DateTime _OldTime;
+        private DateTime _NewTime;
+
+        #endregion
+
+        public TimeIndicatorTimeChangedEventArgs(
+            TimeIndicator timeIndicator, DateTime oldTime, DateTime newTime)
+        {
+            _TimeIndicator = timeIndicator;
+
+            _OldTime = oldTime;
+            _NewTime = newTime;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the TimeIndicator being affected
+        /// </summary>
+        public TimeIndicator TimeIndicator
+        {
+            get { return (_TimeIndicator); }
+        }
+
+        /// <summary>
+        /// Gets the old DateTime
+        /// </summary>
+        public DateTime OldTime
+        {
+            get { return (_OldTime); }
+        }
+
+        /// <summary>
+        /// Gets the new DateTime
+        /// </summary>
+        public DateTime NewTime
+        {
+            get { return (_NewTime); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region TimeIndicatorColorChangedEventArgs
+
+    /// <summary>
+    /// TimeIndicatorColorChangedEventArgs
+    /// </summary>
+    public class TimeIndicatorColorChangedEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private TimeIndicator _TimeIndicator;
+
+        #endregion
+
+        public TimeIndicatorColorChangedEventArgs(TimeIndicator timeIndicator)
+        {
+            _TimeIndicator = timeIndicator;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the TimeIndicator being affected
+        /// </summary>
+        public TimeIndicator TimeIndicator
+        {
+            get { return (_TimeIndicator); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/TimeLineView/DayInfo.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/TimeLineView/DayInfo.cs
new file mode 100644
index 00000000..4bc32788
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/TimeLineView/DayInfo.cs	
@@ -0,0 +1,38 @@
+#if FRAMEWORK20
+using DevComponents.Schedule.Model;
+
+namespace DevComponents.DotNetBar.Schedule
+{
+    public class DayInfo
+    {
+        #region Private data
+
+        private WorkTime _WorkStartTime;
+        private WorkTime _WorkEndTime;
+
+        #endregion
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets and sets work start time
+        /// </summary>
+        public WorkTime WorkStartTime
+        {
+            get { return (_WorkStartTime); }
+            set { _WorkStartTime = value; }
+        }
+
+        /// <summary>
+        /// Gets and sets work end time
+        /// </summary>
+        public WorkTime WorkEndTime
+        {
+            get { return (_WorkEndTime); }
+            set { _WorkEndTime = value; }
+        }
+
+        #endregion
+    }
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/TimeLineView/ModelTimeLineViewConnector.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/TimeLineView/ModelTimeLineViewConnector.cs
new file mode 100644
index 00000000..c83e357d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/TimeLineView/ModelTimeLineViewConnector.cs	
@@ -0,0 +1,845 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using DevComponents.Schedule.Model;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar.Schedule
+{
+    internal class ModelTimeLineViewConnector : ModelViewConnector
+    {
+        #region Const
+
+        private const int DaysInWeek = 7;
+
+        #endregion
+
+        #region Static data
+
+        static private AppointmentSubsetCollection _lineAppts;
+        static private List<Appointment> _listAppts;
+
+        static private DateTime _lineStartTime;     // TimeLine start date
+        static private DateTime _lineEndTime;       // TimeLine end date
+        static private int _lineState;              // Refresh state
+
+        static private List<Appointment> _periodAppts;
+
+        static private DateTime _periodStartTime;   // Period start date
+        static private DateTime _periodEndTime;     // Period end date
+
+        #endregion
+
+        #region Private variables
+
+        private CalendarModel _Model;       // The associated CalendarModel
+        private TimeLineView _View;         // The associated _TimeLineView
+
+        private DateTime _ViewStartTime;    // View start time
+        private DateTime _ViewEndTime;      // View end time
+        private int _ViewState;             // View refresh state
+
+        private DayInfo[] _DayInfo;         // DayInfo array (WorkStartTimes)
+
+        private bool _IsConnected;          // Connection status
+
+        #endregion
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="model">Assoc CalendarModel</param>
+        /// <param name="timeLineView">Assoc TimeLineView</param>
+        public ModelTimeLineViewConnector(CalendarModel model, TimeLineView timeLineView)
+        {
+            _Model = model;
+            _View = timeLineView;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the connection status
+        /// </summary>
+        public override bool IsConnected
+        {
+            get { return (_IsConnected); }
+        }
+
+        /// <summary>
+        /// Gets the internal AppointmentSubsetCollection
+        /// </summary>
+        public AppointmentSubsetCollection Appts
+        {
+            get
+            {
+                if (_lineAppts == null)
+                    _lineAppts = new AppointmentSubsetCollection(_Model, _lineStartTime, _lineEndTime);
+
+                return (_lineAppts);
+            }
+        }
+
+        /// <summary>
+        /// Gets the list of line appointments
+        /// </summary>
+        public List<Appointment> ListAppts
+        {
+            get { return (_listAppts); }
+        }
+
+        /// <summary>
+        /// Gets the DayInfo array
+        /// </summary>
+        public DayInfo[] DayInfo
+        {
+            get { return (_DayInfo); }
+        }
+
+        #endregion
+
+        #region Connect processing
+
+        /// <summary>
+        /// Performs Model connection processing
+        /// </summary>
+        public override void Connect()
+        {
+            VerifyModel();
+
+            if (_IsConnected)
+                Disconnect();
+
+            LoadData();
+
+            // Get notification on Model property changes
+
+            HookEvents(true);
+
+            _IsConnected = true;
+        }
+
+        #endregion
+
+        #region Hook events
+
+        /// <summary>
+        /// Hooks or unhooks our system events
+        /// </summary>
+        /// <param name="hook"></param>
+        private void HookEvents(bool hook)
+        {
+            if (hook == true)
+            {
+                _Model.PropertyChanged += ModelPropertyChanged;
+                _Model.SubPropertyChanged += ModelSubPropertyChanged;
+
+                _View.CalendarView.CustomItems.CollectionChanged += CustomItemsCollectionChanged;
+            }
+            else
+            {
+                _Model.PropertyChanged -= ModelPropertyChanged;
+                _Model.SubPropertyChanged -= ModelSubPropertyChanged;
+
+                _View.CalendarView.CustomItems.CollectionChanged -= CustomItemsCollectionChanged;
+            }
+        }
+
+        #endregion
+
+        #region Event processing
+
+        #region Model property change processing
+
+        /// <summary>
+        /// Handles Model property change notifications
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ModelPropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            if (e.PropertyName == CalendarModel.AppointmentsPropertyName)
+            {
+                _ViewStartTime = new DateTime();
+
+                RefreshData(_ViewState == _lineState);
+
+                _View.NeedRecalcLayout = true;
+                _View.NeedRecalcSize = true;
+            }
+            else if (e.PropertyName == CalendarModel.WorkDaysPropertyName)
+            {
+                UpdateWorkDayDetails();
+
+                _View.Refresh();
+            }
+        }
+
+        #endregion
+
+        #region ModelSubPropertyChanged
+
+        /// <summary>
+        /// Handles ModelSubProperty change notifications
+        /// </summary>
+        /// <param name="sender">object</param>
+        /// <param name="e">SubPropertyChangedEventArgs</param>
+        private void ModelSubPropertyChanged(object sender, SubPropertyChangedEventArgs e)
+        {
+            if (e.Source is WorkDay)
+            {
+                UpdateWorkDayDetails();
+            }
+            else if (e.Source is Owner)
+            {
+                Owner owner = (Owner)e.Source;
+
+                if (_View.OwnerKey != null && _View.OwnerKey.Equals(owner.Key))
+                {
+                    if (e.PropertyChangedArgs.PropertyName == Owner.DisplayNamePropertyName)
+                        _View.DisplayName = owner.DisplayName;
+
+                    else if (e.PropertyChangedArgs.PropertyName.Equals("ColorScheme"))
+                        _View.CalendarColor = owner.ColorScheme;
+                }
+            }
+            else if (e.Source is Appointment)
+            {
+                Appointment app = e.Source as Appointment;
+                AppointmentTimeLineView appView;
+
+                string name = e.PropertyChangedArgs.PropertyName;
+
+                if (name.Equals("Tooltip"))
+                {
+                    appView = GetViewFromTimeLine(app);
+
+                    if (appView != null)
+                        appView.Tooltip = app.Tooltip;
+                }
+                else if (name.Equals("IsSelected"))
+                {
+                    appView = GetViewFromTimeLine(app);
+
+                    if (appView != null)
+                        appView.IsSelected = app.IsSelected;
+                }
+                else if (name.Equals("CategoryColor") || name.Equals("TimeMarkedAs"))
+                {
+                    appView = GetViewFromTimeLine(app);
+
+                    if (appView != null)
+                        appView.Refresh();
+                }
+                else if (name.Equals("OwnerKey"))
+                {
+                    if (_View.CalendarView.IsMultiCalendar == true)
+                    {
+                        if (_View.OwnerKey == app.OwnerKey)
+                        {
+                            _ViewStartTime = new DateTime();
+
+                            RefreshData(false);
+
+                            _View.NeedRecalcLayout = true;
+                            _View.RecalcSize();
+                        }
+                        else
+                        {
+                            appView = GetViewFromTimeLine(app);
+
+                            if (appView != null)
+                            {
+                                _ViewStartTime = new DateTime();
+
+                                RefreshData(false);
+
+                                _View.NeedRecalcLayout = true;
+                                _View.RecalcSize();
+                            }
+                        }
+                    }
+                }
+                else if (name.Equals("Visible"))
+                {
+                    RefreshData(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region CustomItems_CollectionChanged
+
+        /// <summary>
+        /// Handles CustomItemCollection change events
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void CustomItemsCollectionChanged(object sender, EventArgs e)
+        {
+            _ViewStartTime = new DateTime();
+
+            RefreshData(_ViewState == _lineState);
+
+            _View.NeedRecalcLayout = true;
+            _View.NeedRecalcSize = true;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Disconnect processing
+
+        /// <summary>
+        /// Severs the Model/TimeLineView connection
+        /// </summary>
+        public override void Disconnect()
+        {
+            VerifyModel();
+
+            if (_IsConnected)
+            {
+                _IsConnected = false;
+                _lineState = 0;
+
+                // Clear our TimeLine items and
+                // stop notification on Model property changes
+
+                ClearTimeLineItems();
+
+                HookEvents(false);
+            }
+        }
+
+        /// <summary>
+        /// Clears TimeLine view items
+        /// </summary>
+        private void ClearTimeLineItems()
+        {
+            if (_View.CalendarItems.Count > 0)
+            {
+                // Loop through each CalendarItem, resetting
+                // it's associated connection
+
+                for (int i = _View.CalendarItems.Count - 1; i >= 0; i--)
+                {
+                    AppointmentTimeLineView view =
+                        _View.CalendarItems[i] as AppointmentTimeLineView;
+
+                    if (view != null)
+                    {
+                        view.IsSelectedChanged -= _View.ItemIsSelectedChanged;
+
+                        view.Appointment = null;
+                        view.IsSelected = false;
+                    }
+
+                    _View.CalendarItems.RemoveAt(i);
+                }
+            }
+                
+            _View.SubItems.Clear();
+        }
+
+        #endregion
+
+        #region LoadData processing
+
+        /// <summary>
+        /// Loads Model/TimeLineView connection data
+        /// </summary>
+        private void LoadData()
+        {
+            LoadViewData(true, false);
+
+            UpdateWorkDayDetails();
+        }
+
+        #endregion
+
+        #region LoadViewData
+
+        /// <summary>
+        /// Loads the view data
+        /// </summary>
+        /// <param name="reload">Forceful reload</param>
+        /// <param name="validate">Validation needed</param>
+        private void LoadViewData(bool reload, bool validate)
+        {
+            DateTime startTime, endTime;
+            GetDateRange(out startTime, out endTime);
+
+            reload = LoadPeriodData(reload, startTime, endTime);
+
+            if (reload == true ||
+                _ViewStartTime != startTime || _ViewEndTime != endTime)
+            {
+                _ViewStartTime = startTime;
+                _ViewEndTime = endTime;
+
+                if (validate == true)
+                {
+                    RemoveOutdatedViews(_periodAppts);
+                    RemoveOutdatedCustomItems();
+                }
+
+                UpdateTimeLineView(_periodAppts);
+                UpdateCustomItems();
+            }
+        }
+
+        #endregion
+
+        #region LoadPeriodData
+
+        /// <summary>
+        /// Loads the Period data (visible view range)
+        /// </summary>
+        /// <param name="reload">Forceful reload</param>
+        /// <param name="startTime"></param>
+        /// <param name="endTime"></param>
+        /// <returns>reload flag</returns>
+        private bool LoadPeriodData(bool reload, DateTime startTime, DateTime endTime)
+        {
+            reload = LoadLineData(reload);
+
+            if (reload == true ||
+                _periodStartTime != startTime || _periodEndTime != endTime)
+            {
+                _periodStartTime = startTime;
+                _periodEndTime = endTime;
+
+                _periodAppts = new List<Appointment>();
+
+                if (_listAppts != null)
+                {
+                    for (int i = 0; i < _listAppts.Count; i++)
+                    {
+                        Appointment app = _listAppts[i];
+
+                        if (app.EndTime > _periodStartTime && app.StartTime < _periodEndTime)
+                            _periodAppts.Add(app);
+                    }
+                }
+
+                reload = true;
+            }
+
+            return (reload);
+        }
+
+        #endregion
+
+        #region LoadLineData
+
+        /// <summary>
+        /// Loads the TimeLine appointment data
+        /// </summary>
+        /// <param name="reload"></param>
+        private bool LoadLineData(bool reload)
+        {
+            if (reload == true ||
+                _lineStartTime != _View.StartDate || _lineEndTime != _View.EndDate)
+            {
+                _lineStartTime = _View.StartDate;
+                _lineEndTime = _View.EndDate;
+
+                _lineAppts = null;      // Legacy...
+
+                _listAppts = GetAppointmentList(_Model, _View.StartDate, _View.EndDate.AddDays(1));
+
+                _lineState = _lineState ^ 1;
+            }
+
+            if (_ViewState != _lineState)
+            {
+                _ViewState = _lineState;
+
+                 _View.ModelReloaded = true;
+
+                 reload = true;
+            }
+
+            return (reload);
+        }
+
+        #endregion
+
+        #region RefreshData processing
+
+        /// <summary>
+        /// Refreshes the data in a previously established
+        /// and loaded connection
+        /// </summary>
+        public void RefreshData(bool reload)
+        {
+            if (_View.Displayed == true)
+                LoadViewData(reload, true);
+        }
+
+        #endregion
+
+        #region GetDateRange
+
+        /// <summary>
+        /// Gets the range of appointment dates
+        /// </summary>
+        /// <param name="startDate"></param>
+        /// <param name="endDate"></param>
+        private void GetDateRange(out DateTime startDate, out DateTime endDate)
+        {
+            int scol = _View.FirstVisibleColumn;
+            int ncols = _View.ClientRect.Width / _View.ColumnWidth;
+
+            startDate = _View.StartDate;
+            endDate = startDate;
+
+            try
+            {
+                startDate = startDate.AddMinutes(scol * _View.CalendarView.BaseInterval);
+                endDate = startDate.AddMinutes(ncols * _View.CalendarView.BaseInterval);
+
+                startDate = startDate.AddMinutes(-_View.CalendarView.BaseInterval);
+                endDate = endDate.AddMinutes(_View.CalendarView.BaseInterval);
+            }
+// ReSharper disable EmptyGeneralCatchClause
+            catch
+// ReSharper restore EmptyGeneralCatchClause
+            {
+            }
+        }
+
+        #endregion
+
+        #region UpdateTimeLineView
+
+        /// <summary>
+        /// Updates the TimeLine view
+        /// </summary>
+        /// <param name="appointments"></param>
+        private void UpdateTimeLineView(List<Appointment> appointments)
+        {
+            // Loop through each appointment
+            // updating the assoc view accordingly
+
+            foreach (Appointment appointment in appointments)
+            {
+                if (IsAppointmentVisible(appointment))
+                {
+                    // Get the assoc view
+
+                    AppointmentTimeLineView view =
+                        GetViewFromTimeLine(appointment) ?? GetNewView(appointment);
+
+                    // Set the view start and end times to
+                    // match the assoc appointment
+
+                    view.StartTime = appointment.StartTime;
+                    view.EndTime = appointment.EndTime;
+
+                    // Update the item data
+
+                    if (view.TimeLineView == null)
+                    {
+                        view.TimeLineView = _View;
+
+                        _View.CalendarItems.Add(view);
+                        _View.SubItems.Add(view);
+
+                        view.IsSelectedChanged += _View.ItemIsSelectedChanged;
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region UpdateCustomItems
+
+        /// <summary>
+        /// Updates the TimeLine CustomItems
+        /// </summary>
+        private void UpdateCustomItems()
+        {
+            CustomCalendarItemCollection items = _View.CalendarView.CustomItems;
+
+            if (items != null)
+            {
+                for (int i = 0; i < items.Count; i++)
+                {
+                    CustomCalendarItem item = items[i];
+
+                    if (IsCustomItemVisible(item) == true &&
+                        (item.StartTime < _ViewEndTime && item.EndTime > _ViewStartTime))
+                    {
+                        item.CalendarView = _View.CalendarView;
+
+                        CustomCalendarItem ci =
+                            GetItemFromTimeLine(item) ?? GetNewCustomItem(item);
+
+                        if (ci.StartTime != item.StartTime || ci.EndTime != item.EndTime)
+                        {
+                            ci.StartTime = item.StartTime;
+                            ci.EndTime = item.EndTime;
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region UpdateWorkDayDetails
+
+        /// <summary>
+        /// Updates the WorkDay details array
+        /// </summary>
+        private void UpdateWorkDayDetails()
+        {
+            // Update workDay timings
+
+            if (_DayInfo == null)
+                _DayInfo = new DayInfo[DaysInWeek];
+
+            for (int i = 0; i < DaysInWeek; i++)
+            {
+                if (_DayInfo[i] == null)
+                    _DayInfo[i] = new DayInfo();
+
+                Owner owner = _Model.Owners[_View.OwnerKey];
+
+                WorkDay workDay = (owner != null && owner.WorkDays.Count > 0)
+                    ? owner.WorkDays[(DayOfWeek)i] : _Model.WorkDays[(DayOfWeek)i];
+
+                if (workDay != null)
+                {
+                    _DayInfo[i].WorkStartTime = workDay.WorkStartTime;
+                    _DayInfo[i].WorkEndTime = workDay.WorkEndTime;
+                }
+                else
+                {
+                    _DayInfo[i].WorkStartTime = new WorkTime();
+                    _DayInfo[i].WorkEndTime = new WorkTime();
+                }
+            }
+        }
+
+        #endregion
+
+        #region RemoveOutdatedViews
+
+        /// <summary>
+        /// Removes Outdated Views
+        /// </summary>
+        /// <param name="appts"></param>
+        private void RemoveOutdatedViews(List<Appointment> appts)
+        {
+            for (int i=_View.CalendarItems.Count - 1; i>=0; i--)
+            {
+                AppointmentTimeLineView view =
+                    _View.CalendarItems[i] as AppointmentTimeLineView;
+
+                if (view != null)
+                {
+                    if (ValidViewAppointment(appts, view) == false)
+                    {
+                        view.TimeLineView = null;
+
+                        _View.NeedRecalcLayout = true;
+
+                        _View.SubItems._Remove(view);
+                        _View.CalendarItems.RemoveAt(i);
+
+                        if (view == _View.SelectedItem)
+                            _View.SelectedItem = null;
+
+                        view.IsSelectedChanged -= _View.ItemIsSelectedChanged;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Determines if the provided view is valid, given
+        /// the current list of Appointments
+        /// </summary>
+        /// <param name="appts"></param>
+        /// <param name="view"></param>
+        /// <returns></returns>
+        private bool ValidViewAppointment(
+            List<Appointment> appts, AppointmentTimeLineView view)
+        {
+            if (IsAppointmentVisible(view.Appointment) == false)
+                return (false);
+
+            if (view.IsSelected == true)
+            {
+                if (_Model.Appointments.Contains(view.Appointment) == true)
+                    return (true);
+            }
+
+            return (appts.Contains(view.Appointment));
+        }
+
+        #endregion
+
+        #region RemoveOutdatedCustomItems
+
+        /// <summary>
+        /// Removes out dated CustomItems
+        /// </summary>
+        private void RemoveOutdatedCustomItems()
+        {
+            for (int i = _View.CalendarItems.Count - 1; i >= 0; i--)
+            {
+                CustomCalendarItem item = _View.CalendarItems[i] as CustomCalendarItem;
+
+                if (item != null)
+                {
+                    if (IsValidItem(item) == false ||
+                       (item.IsSelected == false && (item.EndTime < _ViewStartTime || item.StartTime > _ViewEndTime)))
+                    {
+                        _View.NeedRecalcSize = true;
+                        _View.SubItems._Remove(item);
+                        _View.CalendarItems.RemoveAt(i);
+
+                        if (item == _View.SelectedItem)
+                            _View.SelectedItem = null;
+
+                        item.IsSelectedChanged -= _View.ItemIsSelectedChanged;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Determines if the given CustomItem is valid
+        /// for the current view
+        /// </summary>
+        /// <param name="view"></param>
+        /// <returns></returns>
+        private bool IsValidItem(CustomCalendarItem view)
+        {
+            return (IsCustomItemVisible(view) == true &&
+                _View.CalendarView.CustomItems.Contains(view.BaseCalendarItem) == true);
+        }
+
+        #endregion
+
+        #region GetViewFromTimeLine
+
+        /// <summary>
+        /// Gets the AppointmentView from the timeline
+        /// </summary>
+        /// <param name="appointment"></param>
+        /// <returns>AppointmentView or null</returns>
+        private AppointmentTimeLineView GetViewFromTimeLine(Appointment appointment)
+        {
+            foreach (CalendarItem item in _View.CalendarItems)
+            {
+                AppointmentTimeLineView view = item as AppointmentTimeLineView;
+
+                if (view != null && view.Appointment == appointment)
+                    return (view);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetItemFromTimeLine
+
+        /// <summary>
+        /// Gets the CustomCalendarItem from the timeline.
+        /// </summary>
+        /// <param name="item"></param>
+        /// <returns>CustomCalendarItem or null</returns>
+        private CustomCalendarItem GetItemFromTimeLine(CustomCalendarItem item)
+        {
+            foreach (CalendarItem citem in _View.CalendarItems)
+            {
+                CustomCalendarItem view = citem as CustomCalendarItem;
+
+                if (view != null && (view == item || view.BaseCalendarItem == item))
+                    return (view);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetNewView
+
+        /// <summary>
+        /// Gets a new appointment view
+        /// </summary>
+        /// <param name="appointment">Appointment</param>
+        /// <returns>New view</returns>
+        private AppointmentTimeLineView GetNewView(Appointment appointment)
+        {
+            AppointmentTimeLineView view = new AppointmentTimeLineView(_View, appointment);
+
+            view.Tooltip = appointment.Tooltip;
+
+            return (view);
+        }
+
+        #endregion
+
+        #region GetNewCustomItem
+
+        /// <summary>
+        /// Gets a new CustomCalendarItem
+        /// </summary>
+        /// <param name="item"></param>
+        /// <returns>CustomCalendarItem</returns>
+        private CustomCalendarItem GetNewCustomItem(CustomCalendarItem item)
+        {
+            CustomCalendarItem ci = (CustomCalendarItem)item.Copy();
+            ci.BaseCalendarItem = item;
+
+            _View.CalendarItems.Add(ci);
+            _View.NeedRecalcLayout = true;
+
+            _View.SubItems.Add(ci);
+
+            ci.IsSelectedChanged += _View.ItemIsSelectedChanged;
+
+            return (ci);
+        }
+
+        #endregion
+
+        #region View support routines
+
+        /// <summary>
+        /// Returns the view
+        /// </summary>
+        /// <returns></returns>
+        public override eCalendarView GetView()
+        {
+            return (eCalendarView.TimeLine);
+        }
+
+        /// <summary>
+        /// Verifies the Model and MonthView are valid
+        /// </summary>
+        private void VerifyModel()
+        {
+            if (_Model == null)
+                throw new NullReferenceException("CalendarModel must be set on connector.");
+
+            if (_View == null)
+                throw new NullReferenceException("AppointmentTimeLineView must be set on connector.");
+        }
+
+        #endregion
+
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/TimeLineView/TimeLineHScrollPanel.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/TimeLineView/TimeLineHScrollPanel.cs
new file mode 100644
index 00000000..5ae72323
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/TimeLineView/TimeLineHScrollPanel.cs	
@@ -0,0 +1,716 @@
+#if FRAMEWORK20
+using System;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.ScrollBar;
+using System.Drawing;
+using DevComponents.DotNetBar.Controls;
+
+namespace DevComponents.DotNetBar.Schedule
+{
+    public class TimeLineHScrollPanel : BaseItem
+    {
+        #region Events
+
+        public event EventHandler<EventArgs> ScrollPanelChanged;
+
+        #endregion
+
+        #region Private variables
+
+        private CalendarView _CalendarView;      // CalendarView
+
+        private HScrollBarAdv _ScrollBar;       // Scroll bar
+        private PageNavigator _PageNavigator;   // PageNavigator
+
+        private int _UpdateCount;
+
+        #endregion
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="calendarView">_CalendarView</param>
+        public TimeLineHScrollPanel(CalendarView calendarView)
+        {
+            _CalendarView = calendarView;
+            Name = "TimeLineHScrollPanel";
+
+            SetUpPanel();
+
+            Visible = false;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets and sets the display bounds
+        /// </summary>
+        public override Rectangle Bounds
+        {
+            get { return (base.Bounds); }
+
+            set
+            {
+                if (base.Bounds != value)
+                {
+                    base.Bounds = value;
+
+                    UpdatePanel();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets and sets the visible status
+        /// </summary>
+        public override bool Visible
+        {
+            get { return (base.Visible); }
+
+            set
+            {
+                if (base.Visible != value)
+                {
+                    base.Visible = value;
+
+                    _ScrollBar.Visible = value;
+
+                    if (_PageNavigator != null)
+                        _PageNavigator.Visible = value;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets the ScrollBar
+        /// </summary>
+        public HScrollBarAdv ScrollBar
+        {
+            get { return (_ScrollBar); }
+        }
+
+        #endregion
+
+        #region Internal properties
+
+        internal PageNavigator PageNavigator
+        {
+            get { return (_PageNavigator); }
+        }
+
+        #endregion
+
+        #region Private properties
+
+        /// <summary>
+        /// Gets the scrollBar SmallChange value
+        /// </summary>
+        private int ScrollPanelSmallChange
+        {
+            get { return (1); }
+        }
+
+        /// <summary>
+        /// Gets the scrollBar LargeChange value
+        /// </summary>
+        private int ScrollPanelLargeChange
+        {
+            get { return (Math.Min(ScrollPanelMaximum, ScrollBar.Width / _CalendarView.TimeLineColumnWidth)); }
+        }
+
+        /// <summary>
+        /// Gets the scrollBar Maximum value
+        /// </summary>
+        private int ScrollPanelMaximum
+        {
+            get { return (_CalendarView.TimeLineColumnCount); }
+        }
+
+        #endregion
+
+        #region HookScrollEvents
+
+        /// <summary>
+        /// Hooks our ScrollBar events
+        /// </summary>
+        /// <param name="hook"></param>
+        private void HookScrollEvents(bool hook)
+        {
+            if (hook == true)
+            {
+                ScrollBar.Scroll += ScrollBarScroll;
+                ScrollBar.ValueChanged += ScrollBarValueChanged;
+            }
+            else
+            {
+                ScrollBar.Scroll -= ScrollBarScroll;
+                ScrollBar.ValueChanged -= ScrollBarValueChanged;
+            }
+        }
+
+        #endregion
+
+        #region HookNavigateEvents
+
+        /// <summary>
+        /// Hooks our PageNavigator events
+        /// </summary>
+        /// <param name="hook"></param>
+        private void HookNavigateEvents(bool hook)
+        {
+            if (_PageNavigator != null)
+            {
+                if (hook == true)
+                {
+                    _PageNavigator.NavigateNextPage += NavigateNextPage;
+                    _PageNavigator.NavigatePreviousPage += NavigatePreviousPage;
+                    _PageNavigator.NavigateToday += NavigateToday;
+                }
+                else
+                {
+                    _PageNavigator.NavigateNextPage -= NavigateNextPage;
+                    _PageNavigator.NavigatePreviousPage -= NavigatePreviousPage;
+                    _PageNavigator.NavigateToday -= NavigateToday;
+                }
+            }
+        }
+
+        #endregion
+
+        #region Event handling
+
+        #region ScrollBar_Scroll
+
+        /// <summary>
+        /// ScrollBar Scroll event handler
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void ScrollBarScroll(object sender, ScrollEventArgs e)
+        {
+            if (e.Type == ScrollEventType.SmallIncrement)
+            {
+                // The user has right-arrow scrolled to the very end of
+                // the scrollbar, so add another time slice to timeline
+                
+                if (ScrollBar.Value >= ScrollBar.Maximum - ScrollBar.LargeChange)
+                    IncreaseEndDate(1);
+            }
+            else if (e.Type == ScrollEventType.SmallDecrement)
+            {
+                // The user has left-arrow scrolled to the very beginning of
+                // the scrollbar, so add another time slice to timeline
+
+                if (ScrollBar.Value == 0)
+                    DecreaseStartDate(1);
+            }
+        }
+
+        #endregion
+
+        #region ScrollBar_ValueChanged
+
+        /// <summary>
+        /// Processes ScrollBar ValueChanged events
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void ScrollBarValueChanged(object sender, EventArgs e)
+        {
+            OnScrollPanelUpdate();
+        }
+
+        #endregion
+
+        #region NavigatePreviousPage
+
+        /// <summary>
+        /// Navigates to the previous page
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void NavigatePreviousPage(object sender, EventArgs e)
+        {
+            DateTime startDate;
+
+            int n = ScrollBar.LargeChange;
+            int value = ScrollBar.Value - n;
+
+            if (value < 0)
+            {
+                startDate = GetDecreaseStartDate(n);
+            }
+            else
+            {
+                startDate = 
+                    _CalendarView.TimeLineViewStartDate.AddMinutes(
+                    _CalendarView.BaseInterval * -n);
+            }
+
+            if (_CalendarView.DoPageNavigatorClick(_CalendarView.TimeLineView,
+                _PageNavigator, PageNavigatorButton.PreviousPage, ref startDate) == false)
+            {
+                _CalendarView.TimeLineViewStartDate = GetIntervalStartDate(startDate);
+            }
+        }
+
+        #endregion
+
+        #region NavigateToday
+
+        /// <summary>
+        /// Navigates to Today
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void NavigateToday(object sender, EventArgs e)
+        {
+            DateTime startDate = DateTime.Today;
+
+            if (_CalendarView.DoPageNavigatorClick(_CalendarView.TimeLineView,
+                _PageNavigator, PageNavigatorButton.Today, ref startDate) == false)
+            {
+                if (startDate < _CalendarView.TimeLineViewScrollStartDate ||
+                    startDate > _CalendarView.TimeLineViewScrollEndDate)
+                {
+                    _CalendarView.TimeLineViewScrollStartDate =
+                        GetIntervalStartDate(startDate);
+                }
+            }
+        }
+
+        #endregion
+
+        #region NavigateNextPage
+
+        /// <summary>
+        /// Navigates to the Next page
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void NavigateNextPage(object sender, EventArgs e)
+        {
+            DateTime startDate;
+
+            int n = ScrollBar.LargeChange;
+            int value = ScrollBar.Value + n;
+
+            if (value > ScrollBar.Maximum - n)
+            {
+                startDate = GetIncreaseEndDate(n);
+            }
+            else
+            {
+                startDate =
+                    _CalendarView.TimeLineViewStartDate.AddMinutes(
+                    _CalendarView.BaseInterval * n);
+            }
+
+            if (_CalendarView.DoPageNavigatorClick(_CalendarView.TimeLineView,
+                _PageNavigator, PageNavigatorButton.NextPage, ref startDate) == false)
+            {
+                _CalendarView.TimeLineViewStartDate = GetIntervalStartDate(startDate);
+            }
+        }
+
+        #endregion
+
+        #region IncreaseEndDate
+
+        /// <summary>
+        /// Increases timeline EndDate
+        /// </summary>
+        /// <param name="n">Amount to add</param>
+        private void IncreaseEndDate(int n)
+        {
+            if (_CalendarView.TimeLineCanExtendRange == true)
+            {
+                _CalendarView.TimeLineViewEndDate = GetIncreaseEndDate(n);
+
+                int value = ScrollBar.Value + n;
+
+                if (value > ScrollBar.Maximum - ScrollBar.LargeChange)
+                    value = ScrollBar.Maximum - ScrollBar.LargeChange;
+
+                if (ScrollBar.Value != value)
+                    ScrollBar.Value = value;
+                else
+                    OnScrollPanelUpdate();
+            }
+        }
+
+        #endregion
+
+        #region GetIncreaseEndDate
+
+        /// <summary>
+        /// Increases timeline EndDate
+        /// </summary>
+        /// <param name="n">Amount to add</param>
+        private DateTime GetIncreaseEndDate(int n)
+        {
+            if (_CalendarView.TimeLineCanExtendRange == true)
+            {
+                DateTime end = new DateTime(9900, 1, 1);
+
+                try
+                {
+                    DateTime date =
+                        _CalendarView.TimeLineViewEndDate.AddMinutes(
+                            _CalendarView.BaseInterval * n);
+
+                    if (date > end)
+                        date = end;
+
+                    return (date);
+                }
+                catch
+                {
+                    return (end);
+                }
+            }
+
+            return (_CalendarView.TimeLineViewEndDate);
+        }
+
+        #endregion
+
+        #region DecreaseStartDate
+
+        /// <summary>
+        /// Decreases the timeline StartDate
+        /// </summary>
+        /// <param name="n">Amount to del</param>
+        private void DecreaseStartDate(int n)
+        {
+            if (_CalendarView.TimeLineCanExtendRange == true)
+            {
+                DateTime startDate = GetDecreaseStartDate(n);
+
+                _CalendarView.TimeLineViewStartDate = startDate;
+
+                UpdatePanel();
+            }
+        }
+
+        #endregion
+
+        #region GetDecreaseStartDate
+
+        /// <summary>
+        /// Decreases the timeline StartDate
+        /// </summary>
+        /// <param name="n">Amount to del</param>
+        private DateTime GetDecreaseStartDate(int n)
+        {
+            if (_CalendarView.TimeLineCanExtendRange == true)
+            {
+                try
+                {
+                    return (_CalendarView.TimeLineViewStartDate.AddMinutes(
+                            -_CalendarView.BaseInterval * n));
+                }
+                catch
+                {
+                    return (new DateTime(1, 1, 1));
+                }
+            }
+
+            return (_CalendarView.TimeLineViewStartDate);
+        }
+
+        #endregion
+
+        #region GetIntervalStartDate
+
+        private DateTime GetIntervalStartDate(DateTime startDate)
+        {
+            TimeSpan ts = new TimeSpan(startDate.Hour, startDate.Minute, 0);
+
+            int interval = _CalendarView.TimeLineInterval;
+            int minutes = ((int)ts.TotalMinutes / interval) * interval;
+
+            return (startDate.Date.AddMinutes(minutes));
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Begin/EndUpdate
+
+        /// <summary>
+        /// Begins Update block
+        /// </summary>
+        public void BeginUpdate()
+        {
+            _UpdateCount++;
+        }
+
+        /// <summary>
+        /// Ends update block
+        /// </summary>
+        public void EndUpdate()
+        {
+            if (_UpdateCount == 0)
+            {
+                throw new InvalidOperationException(
+                    "EndUpdate must be called After BeginUpdate");
+            }
+
+            _UpdateCount--;
+
+            if (_UpdateCount == 0)
+                OnScrollPanelUpdate();
+        }
+
+        #endregion
+
+        #region SetUpPanel
+
+        /// <summary>
+        /// Performs panel setup
+        /// </summary>
+        private void SetUpPanel()
+        {
+            Control c = (Control)_CalendarView.CalendarPanel.GetContainerControl(true);
+
+            if (c != null)
+            {
+                SetupPageNavigator(c);
+                SetupScrollBar(c);
+
+                UpdatePanel();
+            }
+        }
+
+        #endregion
+
+        #region SetupPageNavigator
+
+        /// <summary>
+        /// Sets-up the PageNavigator
+        /// </summary>
+        /// <param name="c"></param>
+        private void SetupPageNavigator(Control c)
+        {
+            _PageNavigator = new PageNavigator();
+
+            _PageNavigator.Visible = false;
+            _PageNavigator.FocusCuesEnabled = false;
+
+            HookNavigateEvents(true);
+
+            c.Controls.Add(_PageNavigator);
+
+            _PageNavigator.NextPageTooltip = _CalendarView.TimeLinePageNavigatorNextPageTooltip;
+            _PageNavigator.PreviousPageTooltip = _CalendarView.TimeLinePageNavigatorPreviousPageTooltip;
+            _PageNavigator.TodayTooltip = _CalendarView.TimeLinePageNavigatorTodayTooltip;
+        }
+
+        #endregion
+
+        #region SetupScrollBar
+
+        private void SetupScrollBar(Control c)
+        {
+            _ScrollBar = new HScrollBarAdv();
+
+            _ScrollBar.Visible = false;
+            _ScrollBar.Height = SystemInformation.HorizontalScrollBarHeight;
+
+            HookScrollEvents(true);
+
+            c.Controls.Add(_ScrollBar);
+        }
+
+        #endregion
+
+        #region UpdatePanel
+
+        /// <summary>
+        /// Updates the panel
+        /// </summary>
+        public void UpdatePanel()
+        {
+            if (Bounds.Width > 0)
+            {
+                UpdatePageNavigator();
+                UpdateScrollBar();
+
+                OnScrollPanelUpdate();
+            }
+        }
+
+        #endregion
+
+        #region UpdatePageNavigator
+
+        /// <summary>
+        /// Updates the PageNavigator
+        /// </summary>
+        private void UpdatePageNavigator()
+        {
+            if (_CalendarView.TimeLineShowPageNavigation == true)
+            {
+                // We are to show the PageNavigator, so allocate it
+                // if we haven't done so already
+
+                if (_PageNavigator == null)
+                {
+                    Control c = (Control)_CalendarView.CalendarPanel.GetContainerControl(true);
+
+                    if (c != null)
+                    {
+                        SetupPageNavigator(c);
+
+                        if (_PageNavigator != null)
+                            _PageNavigator.Visible = Visible;
+                    }
+                }
+            }
+            else
+            {
+                // We are not to show a PageNavigator, so if we have already
+                // allocated one, see that we release it appropriately
+
+                if (_PageNavigator != null)
+                {
+                    Control c = (Control)_CalendarView.CalendarPanel.GetContainerControl(true);
+
+                    if (c != null)
+                    {
+                        c.Controls.Remove(_PageNavigator);
+
+                        HookNavigateEvents(false);
+
+                        _PageNavigator = null;
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region UpdateScrollBar
+
+        /// <summary>
+        /// Updates our ScrollBar
+        /// </summary>
+        private void UpdateScrollBar()
+        {
+            _ScrollBar.Maximum = ScrollPanelMaximum;
+            _ScrollBar.SmallChange = ScrollPanelSmallChange;
+            _ScrollBar.LargeChange = ScrollPanelLargeChange;
+
+            if (_ScrollBar.Value > _ScrollBar.Maximum - _ScrollBar.LargeChange)
+                _ScrollBar.Value = _ScrollBar.Maximum - _ScrollBar.LargeChange;
+
+            _ScrollBar.Refresh();
+        }
+
+        #endregion
+
+        #region OnScrollPanelUpdate
+
+        /// <summary>
+        /// Passes the scroll onto others
+        /// </summary>
+        protected void OnScrollPanelUpdate()
+        {
+            if (_UpdateCount == 0)
+            {
+                if (ScrollPanelChanged != null)
+                    ScrollPanelChanged(this, EventArgs.Empty);
+            }
+        }
+
+        #endregion
+
+        #region RecalcSize
+
+        /// <summary>
+        /// Performs control recalc
+        /// </summary>
+        public override void RecalcSize()
+        {
+            // Update our PageNavigator
+
+            UpdatePageNavigator();
+
+            int navWidth = 0;
+
+            if (_PageNavigator != null)
+            {
+                navWidth = _PageNavigator.Width;
+
+                _PageNavigator.Location =
+                    new Point(Bounds.Right - navWidth, Bounds.Y);
+            }
+
+            // Update our ScrollBar
+
+            UpdateScrollBar();
+
+            if (_ScrollBar != null)
+            {
+                _ScrollBar.Location = Bounds.Location;
+                _ScrollBar.Width = Bounds.Width - navWidth;
+            }
+
+            base.RecalcSize();
+        }
+
+        #endregion
+
+        #region Paint
+
+        public override void Paint(ItemPaintArgs p)
+        {
+        }
+
+        #endregion
+
+        #region Copy
+
+        /// <summary>
+        /// Returns copy of the item
+        /// </summary>
+        public override BaseItem Copy()
+        {
+            TimeLineHScrollPanel objCopy = new TimeLineHScrollPanel(_CalendarView);
+
+            this.CopyToItem(objCopy);
+
+            return (objCopy);
+        }
+        /// <summary>
+        /// Copies the TimeLineHScrollPanel specific properties to
+        /// new instance of the item
+        /// </summary>
+        /// <param name="copy">New PageNavigatorItem instance</param>
+        protected override void CopyToItem(BaseItem copy)
+        {
+            TimeLineHScrollPanel c = copy as TimeLineHScrollPanel;
+            base.CopyToItem(c);
+        }
+
+        #endregion
+
+        #region Dispose
+
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing == true && IsDisposed == false)
+            {
+                HookScrollEvents(false);
+                HookNavigateEvents(false);
+            }
+
+            base.Dispose(disposing);
+        }
+
+        #endregion
+    }
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/TimeLineView/TimeLineHeaderPanel.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/TimeLineView/TimeLineHeaderPanel.cs
new file mode 100644
index 00000000..9ce6100b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/TimeLineView/TimeLineHeaderPanel.cs	
@@ -0,0 +1,1083 @@
+#if FRAMEWORK20
+using System;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Globalization;
+
+namespace DevComponents.DotNetBar.Schedule
+{
+    public class TimeLineHeaderPanel : BaseItem
+    {
+        #region Private Variables
+
+        private CalendarView _CalendarView;         // Assoc CalendarView
+
+        private int _HScrollPos;                    // Horizontal scroll position
+
+        private CalendarWeekDayColor _ViewColor =   // View display color table
+            new CalendarWeekDayColor(eCalendarColor.Automatic);
+
+        #endregion
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="calendarView"></param>
+        public TimeLineHeaderPanel(CalendarView calendarView)
+        {
+            _CalendarView = calendarView;
+
+            MouseUpNotification = true;
+            Name = "TimeLineHeaderPanel";
+
+            HookEvents(true);
+        }
+
+        #region Private properties
+
+        #region Column properties
+
+        /// <summary>
+        /// Gets the ColumnWidth
+        /// </summary>
+        private int ColumnWidth
+        {
+            get { return (_CalendarView.TimeLineColumnWidth); }
+        }
+
+        /// <summary>
+        /// Gets the TimeLineColumnCount
+        /// </summary>
+        private int ColumnCount
+        {
+            get { return (_CalendarView.TimeLineColumnCount); }
+        }
+
+        #endregion
+
+        #region Header properties
+
+        /// <summary>
+        /// Gets the ShowPeriodHeader property
+        /// </summary>
+        private bool ShowPeriodHeader
+        {
+            get { return (_CalendarView.TimeLineShowPeriodHeader); }
+        }
+
+        /// <summary>
+        /// Gets the ShowIntervalHeader property
+        /// </summary>
+        private bool ShowIntervalHeader
+        {
+            get { return (_CalendarView.TimeLineShowIntervalHeader); }
+        }
+
+
+        /// <summary>
+        /// Interval header height
+        /// </summary>
+        private int IntervalHeaderHeight
+        {
+            get { return (_CalendarView.TimeLineIntervalHeaderHeight); }
+        }
+
+        /// <summary>
+        /// Period header height
+        /// </summary>
+        private int PeriodHeaderHeight
+        {
+            get
+            {
+                return (ShowPeriodHeader && _CalendarView.TimeLinePeriodHeaderHeight > 0 ?
+                    _CalendarView.TimeLinePeriodHeaderHeight - 1 : 0);
+            }
+        }
+
+        /// <summary>
+        /// Header font
+        /// </summary>
+        private Font HeaderFont
+        {
+            get { return (_CalendarView.Font); }
+        }
+
+        #endregion
+
+        #region StartDate
+
+        /// <summary>
+        /// TimeLine start date
+        /// </summary>
+        private DateTime StartDate
+        {
+            get { return (_CalendarView.TimeLineViewStartDate); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets and sets the view color
+        /// </summary>
+        public eCalendarColor CalendarColor
+        {
+            get { return (_ViewColor.ColorSch); }
+
+            set
+            {
+                _ViewColor.ColorSch = value;
+                Refresh();
+            }
+        }
+        #endregion
+
+        #region HookEvents
+
+        /// <summary>
+        /// Routine hooks all necessary events for this control
+        /// </summary>
+        /// <param name="hook">True to hook, false to unhook</param>
+        private void HookEvents(bool hook)
+        {
+            if (hook == true)
+            {
+                _CalendarView.TimeLineIntervalChanged += TimeLineIntervalChanged;
+                _CalendarView.TimeLineIntervalPeriodChanged += TimeLineIntervalPeriodChanged;
+                _CalendarView.TimeIndicatorsChanged += TimeIndicatorCollectionChanged;
+                _CalendarView.TimeIndicatorTimeChanged += TimeIndicatorTimeChanged;
+
+                _CalendarView.TimeLineHScrollPanel.ScrollPanelChanged += ScrollPanelChanged;
+            }
+            else
+            {
+                _CalendarView.TimeLineIntervalChanged -= TimeLineIntervalChanged;
+                _CalendarView.TimeLineIntervalPeriodChanged -= TimeLineIntervalPeriodChanged;
+                _CalendarView.TimeIndicatorsChanged -= TimeIndicatorCollectionChanged;
+                _CalendarView.TimeIndicatorTimeChanged -= TimeIndicatorTimeChanged;
+
+                _CalendarView.TimeLineHScrollPanel.ScrollPanelChanged -= ScrollPanelChanged;
+            }
+        }
+
+        #endregion
+
+        #region Event processing
+
+        #region TimeLineIntervalPeriodChanged
+
+        /// <summary>
+        /// TimeLineIntervalPeriod Change notification
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void TimeLineIntervalPeriodChanged(object sender, TimeLineIntervalPeriodChangedEventArgs e)
+        {
+            Refresh();
+        }
+
+        #endregion
+
+        #region TimeLineIntervalChanged
+
+        /// <summary>
+        /// TimeLineInterval Change notification
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void TimeLineIntervalChanged(object sender, TimeLineIntervalChangedEventArgs e)
+        {
+            Refresh();
+        }
+
+        #endregion
+
+        #region TimeIndicatorCollectionChanged
+
+        /// <summary>
+        /// Handles TimeIndicatorCollectionChanged events
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void TimeIndicatorCollectionChanged(object sender, EventArgs e)
+        {
+            Refresh();
+        }
+
+        #endregion
+
+        #region TimeIndicatorTimeChanged
+
+        /// <summary>
+        /// Handles TimeIndicatorTimeChanged events
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void TimeIndicatorTimeChanged(object sender, TimeIndicatorTimeChangedEventArgs e)
+        {
+            Refresh();
+        }
+
+        #endregion
+
+        #region ScrollPanelChanged
+
+        /// <summary>
+        /// Horizontal Scroll Panel change notification
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void ScrollPanelChanged(object sender, EventArgs e)
+        {
+            _HScrollPos = -_CalendarView.TimeLineHScrollPanel.ScrollBar.Value *
+                _CalendarView.TimeLineColumnWidth;
+
+            // Redraw our view
+
+            Refresh();
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IsMarkupSupported
+
+        /// <summary>
+        /// IsMarkupSupported
+        /// </summary>
+        protected override bool IsMarkupSupported
+        {
+            get { return (_CalendarView != null ?
+                _CalendarView.TimeLinePeriodHeaderEnableMarkup : true); }
+        }
+
+        #endregion
+
+        #region GetViewAreaFromPoint
+
+        /// <summary>
+        /// Gets the view area under the given mouse point
+        /// </summary>
+        /// <param name="pt">Point</param>
+        /// <returns>eViewArea</returns>
+        public eViewArea GetViewAreaFromPoint(Point pt)
+        {
+            if (Bounds.Contains(pt) == true)
+            {
+                if (ShowPeriodHeader == true)
+                {
+                    if (pt.Y < PeriodHeaderHeight)
+                        return (eViewArea.InPeriodHeader);
+                }
+
+                return (eViewArea.InIntervalHeader);
+            }
+
+            return (eViewArea.NotInView);
+        }
+
+        #endregion
+
+        #region GetIntervalDateFromPoint
+
+        /// <summary>
+        /// Gets the IntervalHeader Start Date under the given mouse point
+        /// </summary>
+        /// <param name="pt">Point</param>
+        /// <param name="startDate">ref to interval start date.</param>
+        /// <returns>'true' if valid date is returned.</returns>
+        public bool GetIntervalDateFromPoint(Point pt, ref DateTime startDate)
+        {
+            if (GetViewAreaFromPoint(pt) == eViewArea.InIntervalHeader)
+            {
+                int scol = -_HScrollPos / ColumnWidth;
+                int ecol = (-_HScrollPos + Bounds.Width + ColumnWidth - 2) / ColumnWidth;
+
+                DateTime date = _CalendarView.TimeLineAddInterval(StartDate, scol);
+
+                for (int i = scol; i <= ecol; i++)
+                {
+                    Rectangle r = GetColumnRect(i);
+
+                    if (r.Contains(pt) == true)
+                    {
+                        startDate = date;
+
+                        return (true);
+                    }
+
+                    date = _CalendarView.TimeLineAddInterval(date, 1);
+                }
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region Paint processing
+
+        /// <summary>
+        /// Paint processing routine
+        /// </summary>
+        /// <param name="e"></param>
+        public override void Paint(ItemPaintArgs e)
+        {
+            if (ShowPeriodHeader == true || ShowIntervalHeader == true)
+            {
+                // Set our current color table
+
+                _ViewColor.SetColorTable();
+
+                // Only draw something if we have something to draw
+
+                if (_CalendarView.TimeLineColumnCount > 0)
+                {
+                    // Draw our calendar parts
+
+                    int colStart, colEnd;
+
+                    if (GetColRange(e.ClipRectangle, out colStart, out colEnd) > 0)
+                    {
+                        Region rgnSave = e.Graphics.Clip;
+
+                        using (Region rgn = new Region(Bounds))
+                        {
+                            e.Graphics.Clip = rgn;
+
+                            if (ShowPeriodHeader == true)
+                                DrawDateHeader(e);
+
+                            if (ShowIntervalHeader == true)
+                                DrawIntervalHeader(e, colStart, colEnd);
+                        }
+
+                        e.Graphics.Clip = rgnSave;
+                    }
+                }
+            }
+        }
+
+        #region DrawDateHeader
+
+        /// <summary>
+        /// Draws the encompassing Date header
+        /// </summary>
+        /// <param name="e">ItemPaintArgs</param>
+        private void DrawDateHeader(ItemPaintArgs e)
+        {
+            int scol = -_HScrollPos / ColumnWidth;
+            int ecol = (-_HScrollPos + Bounds.Width + ColumnWidth - 2) / ColumnWidth;
+
+            DateTime date1 = _CalendarView.TimeLineAddInterval(StartDate, scol);
+            DateTime date2 = date1;
+
+            for (int i = scol + 1; i < ecol; i++)
+            {
+                date2 = _CalendarView.TimeLineAddInterval(StartDate, i);
+
+                if (PeriodChange(date1, date2, i) == true)
+                {
+                    DrawDatePeriod(e, scol, i - 1, date1, date2.AddMinutes(-1));
+
+                    scol = i;
+                    date1 = date2;
+                }
+            }
+
+            DrawDatePeriod(e, scol, ecol, date1, date2);
+        }
+
+        #region PeriodChange
+
+        /// <summary>
+        /// Determines if a date period change has occurred
+        /// </summary>
+        /// <param name="date1">Initial date</param>
+        /// <param name="date2">Current date</param>
+        /// <param name="col">Current column</param>
+        /// <returns></returns>
+        private bool PeriodChange(DateTime date1, DateTime date2, int col)
+        {
+            switch (_CalendarView.TimeLinePeriod)
+            {
+                case eTimeLinePeriod.Days:
+                    if (_CalendarView.TimeLineInterval == 1)
+                        return (date1.Month != date2.Month);
+
+                    return (date1.Year != date2.Year);
+
+                case eTimeLinePeriod.Years:
+                    return ((col > 0) && (col % 10 == 0));
+
+                default:
+                    return (date1.Day != date2.Day);
+            }
+        }
+
+        #endregion
+
+        #region DrawDatePeriod
+
+        /// <summary>
+        /// Draws a given date period or range
+        /// </summary>
+        /// <param name="e"></param>
+        /// <param name="scol">Starting column</param>
+        /// <param name="ecol">Ending column</param>
+        /// <param name="startDate"></param>
+        /// <param name="endDate"></param>
+        private void DrawDatePeriod(ItemPaintArgs e,
+            int scol, int ecol, DateTime startDate, DateTime endDate)
+        {
+            Graphics g = e.Graphics;
+
+            Rectangle rs = GetColumnRect(scol);
+            Rectangle re = GetColumnRect(ecol);
+
+            Rectangle r = new Rectangle(rs.X, rs.Y, re.Right - rs.X, PeriodHeaderHeight);
+
+            // Keep us in bounds
+
+            if (r.X < Bounds.X)
+            {
+                r.Width -= (Bounds.X - r.X);
+                r.X = Bounds.X;
+            }
+
+            if (r.Right > Bounds.Right)
+                r.Width -= (r.Right - Bounds.Right) + 1;
+
+            if (r.Width > 0 && r.Height > 0)
+            {
+                // Fill the area
+
+                using (Brush lbr =
+                    _ViewColor.BrushPart((int)eCalendarWeekDayPart.DayHeaderBackground, r))
+                {
+                    g.FillRectangle(lbr, r);
+                }
+
+                // Format the period text and output it both
+                // vertically and horizontally centered
+
+                string text = GetDatePeriodText(ref startDate, ref endDate);
+
+                if (_CalendarView.DoTimeLineViewRenderPeriodHeader(g, startDate, endDate, r, ref text) == false)
+                {
+                    if (String.IsNullOrEmpty(text) == false)
+                    {
+                        Text = text;
+
+                        if (IsUsingTextMarkup)
+                        {
+                            TextMarkup.MarkupDrawContext d =
+                                new TextMarkup.MarkupDrawContext(g, HeaderFont, _ViewColor.GetColor(
+                                    (int) eCalendarWeekDayPart.DayHeaderForeground), IsRightToLeft);
+
+                            TextMarkupBodyMeasure(new Size(5000, 5000), d);
+                            
+                            TextMarkupBodyArrange(new Rectangle(Point.Empty, TextMarkupBodyBounds.Size), d);
+
+                            TextMarkupBodyBounds = AlignMarkUpText(r);
+
+                            RenderMarkup(g, d);
+                        }
+                        else
+                        {
+                            Size sz = TextDrawing.MeasureString(g, Text, HeaderFont);
+
+                            eTextFormat tf = eTextFormat.VerticalCenter;
+
+                            switch (_CalendarView.TimeLinePeriodHeaderAlignment)
+                            {
+                                case eItemAlignment.Center:
+                                    if (sz.Width < r.Width)
+                                        tf |= eTextFormat.HorizontalCenter;
+                                    break;
+
+                                case eItemAlignment.Far:
+                                    if (sz.Width < r.Width)
+                                        tf |= eTextFormat.Right;
+                                    break;
+                            }
+
+                            // Draw the text
+
+                            TextDrawing.DrawString(g, Text, HeaderFont, _ViewColor.GetColor(
+                                (int) eCalendarWeekDayPart.DayHeaderForeground), r, tf);
+                        }
+                    }
+                }
+
+                // Draw the border
+
+                using (Pen pen = new Pen(
+                    _ViewColor.GetColor((int)eCalendarWeekDayPart.DayHeaderBorder)))
+                {
+                    g.DrawRectangle(pen, r);
+                }
+            }
+        }
+
+        #region AlignMarkUpText
+
+        /// <summary>
+        /// Aligns the MarkUp text
+        /// </summary>
+        /// <param name="r"></param>
+        /// <returns></returns>
+        private Rectangle AlignMarkUpText(Rectangle r)
+        {
+            if (r.Height > TextMarkupBodyBounds.Height)
+                r.Y += (r.Height - TextMarkupBodyBounds.Height) / 2;
+
+            if (r.Width > TextMarkupBodyBounds.Width)
+            {
+                switch (_CalendarView.TimeLinePeriodHeaderAlignment)
+                {
+                    case eItemAlignment.Center:
+                        r.X += (r.Width - TextMarkupBodyBounds.Width) / 2;
+                        break;
+
+                    case eItemAlignment.Far:
+                        r.X += (r.Width - TextMarkupBodyBounds.Width);
+                        break;
+
+                    default:
+                        r.X += 3;
+                        break;
+                }
+            }
+
+            return (r);
+        }
+
+        #endregion
+
+        #region RenderMarkup
+
+        /// <summary>
+        /// Renders the current MarkUp
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="d"></param>
+        private void RenderMarkup(Graphics g, TextMarkup.MarkupDrawContext d)
+        {
+            Region oldClip = g.Clip;
+            Rectangle clipRect = TextMarkupBodyBounds;
+
+            g.SetClip(clipRect, CombineMode.Intersect);
+
+            TextMarkupBodyRender(d);
+
+            g.Clip = oldClip;
+        }
+
+        #endregion
+
+        #region GetDatePeriodText
+
+        /// <summary>
+        /// Gets the default Period text
+        /// </summary>
+        /// <param name="startDate"></param>
+        /// <param name="endDate"></param>
+        /// <returns></returns>
+        private string GetDatePeriodText(ref DateTime startDate, ref DateTime endDate)
+        {
+            // Days text
+
+            if (_CalendarView.TimeLinePeriod == eTimeLinePeriod.Days)
+            {
+                if (_CalendarView.TimeLineInterval == 1)
+                    return (startDate.ToString("y"));
+
+                return (startDate.Year.ToString());
+            }
+
+            // Years text
+
+            if (_CalendarView.TimeLinePeriod == eTimeLinePeriod.Years)
+            {
+                int n = _CalendarView.TimeLineInterval * 10;
+                int m = startDate.Year - _CalendarView.TimeLineViewStartDate.Year;
+
+                m = (m / n) * n;
+
+                startDate = _CalendarView.TimeLineViewStartDate.AddYears(m);
+                endDate = startDate.AddYears(n - 1);
+
+                return (startDate.Year + " - " + endDate.Year);
+            }
+
+            // Everything else
+
+            return (startDate.Date.ToShortDateString());
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region DrawIntervalHeader
+
+        /// <summary>
+        /// Draws the time interval header
+        /// </summary>
+        /// <param name="e">ItemPaintArgs</param>
+        /// <param name="colStart">Starting column</param>
+        /// <param name="colEnd">Ending column</param>
+        private void DrawIntervalHeader(ItemPaintArgs e, int colStart, int colEnd)
+        {
+            Graphics g = e.Graphics;
+
+            Rectangle rs = GetColumnRect(colStart);
+            Rectangle re = GetColumnRect(colEnd);
+
+            Rectangle r = new Rectangle(rs.X, rs.Y + PeriodHeaderHeight,
+                re.Right - rs.X, IntervalHeaderHeight);
+
+            if (r.Width > 0 && r.Height > 0)
+            {
+                DrawBackground(g, r);
+                DrawTimeIndicators(g, colStart, colEnd, r);
+                DrawContent(g, colStart, colEnd, r);
+            }
+        }
+
+        #region DrawBackground
+
+        /// <summary>
+        /// DrawBackground
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="r"></param>
+        private void DrawBackground(Graphics g, Rectangle r)
+        {
+            using (Brush lbr = _ViewColor.BrushPart((int)eCalendarWeekDayPart.DayHeaderBackground, r))
+                g.FillRectangle(lbr, r);
+        }
+
+        #endregion
+
+        #region DrawTimeIndicators
+
+        #region DrawTimeIndicators
+
+        /// <summary>
+        /// Draws view TimeIndicators
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="colStart"></param>
+        /// <param name="colEnd"></param>
+        /// <param name="r"></param>
+        private void DrawTimeIndicators(Graphics g,
+            int colStart, int colEnd, Rectangle r)
+        {
+            DateTime start = _CalendarView.TimeLineAddInterval(StartDate, colStart);
+            DateTime end = _CalendarView.TimeLineAddInterval(StartDate, colEnd);
+
+            for (int i = 0; i < _CalendarView.TimeIndicators.Count; i++)
+            {
+                TimeIndicator ti = _CalendarView.TimeIndicators[i];
+
+                if (ti.IndicatorArea == eTimeIndicatorArea.All ||
+                    ti.IndicatorArea == eTimeIndicatorArea.Header)
+                {
+                    if (ti.IsVisible())
+                    {
+                        DateTime time = ti.IndicatorDisplayTime;
+
+                        if (time >= start && time < end)
+                            DrawTimeIndicator(g, start, r, ti);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region DrawTimeIndicator
+
+        #region DrawTimeIndicator
+
+        /// <summary>
+        /// Draws individual view TimeIndicator
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="startDate"></param>
+        /// <param name="sRect"></param>
+        /// <param name="ti"></param>
+        private void DrawTimeIndicator(Graphics g,
+            DateTime startDate, Rectangle sRect, TimeIndicator ti)
+        {
+            Rectangle r = GetIndicatorRect(ti, startDate, sRect);
+
+            if (r.IntersectsWith(sRect) == true)
+            {
+                if (r.Width > 0)
+                {
+                    ColorDef cdef = GetIndicatorColor(ti);
+
+                    if (cdef != null)
+                    {
+                        float angle = cdef.Angle - 90;
+
+                        using (Brush br = _ViewColor.BrushPart(cdef, r, angle))
+                        {
+                            if (br is LinearGradientBrush)
+                                ((LinearGradientBrush) br).WrapMode = WrapMode.TileFlipX;
+
+                            g.FillRectangle(br, r);
+                        }
+                    }
+                }
+
+                Color color = GetIndicatorBorder(ti);
+
+                if (color.IsEmpty == false)
+                {
+                    using (Pen pen = new Pen(color))
+                        g.DrawLine(pen, r.Right, r.Top, r.Right, r.Bottom - 1);
+                }
+            }
+        }
+
+        #endregion
+
+        #region GetIndicatorColor
+
+        /// <summary>
+        /// Gets the Indicator Back color
+        /// </summary>
+        /// <param name="ti"></param>
+        /// <returns></returns>
+        private ColorDef GetIndicatorColor(TimeIndicator ti)
+        {
+            ColorDef cdef = ti.IndicatorColor;
+            
+            if (cdef == null || cdef.IsEmpty == true)
+                cdef = _ViewColor.GetColorDef((int)eCalendarWeekDayPart.TimeIndicator);
+
+            return (cdef);
+        }
+
+        #endregion
+
+        #region GetIndicatorBorder
+
+        /// <summary>
+        /// Gets the Indicator Border color
+        /// </summary>
+        /// <param name="ti"></param>
+        /// <returns></returns>
+        private Color GetIndicatorBorder(TimeIndicator ti)
+        {
+            return (ti.BorderColor.IsEmpty == false ? ti.BorderColor :
+                _ViewColor.GetColor((int)eCalendarWeekDayPart.TimeIndicatorBorder));
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetIndicatorRect
+
+        /// <summary>
+        /// CalcIndicatorRect
+        /// </summary>
+        /// <param name="ti"></param>
+        /// <param name="startDate"></param>
+        /// <param name="sRect"></param>
+        /// <returns></returns>
+        private Rectangle GetIndicatorRect(
+            TimeIndicator ti, DateTime startDate, Rectangle sRect)
+        {
+            double x = ColumnWidth / _CalendarView.BaseInterval;
+
+            int offset = (int)((ti.IndicatorDisplayTime - startDate).TotalMinutes * x);
+
+            sRect.X += (offset - ti.Thickness - 1);
+            sRect.Width = ti.Thickness;
+
+            return (sRect);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region DrawContent
+
+        /// <summary>
+        /// DrawContent
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="colStart"></param>
+        /// <param name="colEnd"></param>
+        /// <param name="r"></param>
+        private void DrawContent(Graphics g,
+            int colStart, int colEnd, Rectangle r)
+        {
+            bool dcDay = _CalendarView.HighlightCurrentDay == true &&
+                _CalendarView.TimeLinePeriod == eTimeLinePeriod.Days && _CalendarView.TimeLineInterval == 1;
+
+            DateTime now = DateTime.Now.Date;
+            DateTime date = _CalendarView.TimeLineAddInterval(StartDate, colStart);
+
+            r.Width = ColumnWidth;
+
+            int x = -1;
+
+            using (Pen pen = new Pen(
+                _ViewColor.GetColor((int)eCalendarWeekDayPart.DayHeaderBorder)))
+            {
+                // Loop through each column, drawing the
+                // time text in the header area
+
+                for (int i = colStart; i <= colEnd; i++)
+                {
+                    if (dcDay == false || date.Date.Equals(now) == false)
+                    {
+                        // Draw the text and header border
+
+                        TextDrawing.DrawString(g, GetIntervalText(date), HeaderFont,
+                                               _ViewColor.GetColor((int) eCalendarWeekDayPart.DayHeaderForeground),
+                                               r, eTextFormat.VerticalCenter | eTextFormat.HorizontalCenter);
+
+                        g.DrawRectangle(pen, r);
+                    }
+                    else
+                    {
+                        x = r.X;
+                    }
+
+                    date = _CalendarView.TimeLineAddInterval(date, 1);
+
+                    r.X += ColumnWidth;
+                }
+            }
+
+            if (x >= 0)
+            {
+                r.X = x;
+
+                using (Brush br = _ViewColor.BrushPart((int)eCalendarWeekDayPart.NowDayHeaderBackground, r))
+                    g.FillRectangle(br, r);
+
+                TextDrawing.DrawString(g, GetIntervalText(now), HeaderFont,
+                                       _ViewColor.GetColor((int)eCalendarWeekDayPart.NowDayHeaderForeground),
+                                       r, eTextFormat.VerticalCenter | eTextFormat.HorizontalCenter);
+
+                using (Pen pen = new Pen(_ViewColor.GetColor((int)eCalendarWeekDayPart.NowDayHeaderBorder)))
+                    g.DrawRectangle(pen, r);
+            }
+        }
+
+        #region GetIntervalText
+
+        /// <summary>
+        /// Gets the interval text
+        /// </summary>
+        /// <param name="date">DateTime</param>
+        /// <returns>Interval text</returns>
+        public string GetIntervalText(DateTime date)
+        {
+            string s;
+
+            switch (_CalendarView.TimeLinePeriod)
+            {
+                case eTimeLinePeriod.Days:
+                    s = GetDayIntervalText(date);
+                    break;
+
+                case eTimeLinePeriod.Years:
+                    s = GetYearIntervalText(date);
+                    break;
+
+                default:
+                    s = GetMinuteIntervalText(date);
+                    break;
+            }
+
+            _CalendarView.DoTimeLineGetHeaderText(this, date, ref s);
+
+            return (s);
+        }
+
+        /// <summary>
+        /// Gets minute interval text
+        /// </summary>
+        /// <param name="date">DateTime</param>
+        /// <returns>Interval text</returns>
+        private string GetMinuteIntervalText(DateTime date)
+        {
+            if (_CalendarView.Is24HourFormat == true)
+                return (date.ToString("t", DateTimeFormatInfo.InvariantInfo));
+            
+            return (date.ToString("t", null));
+        }
+
+        /// <summary>
+        /// Gets Day interval text
+        /// </summary>
+        /// <param name="date"></param>
+        /// <returns>Interval text</returns>
+        private string GetDayIntervalText(DateTime date)
+        {
+            DateTimeFormatInfo dtfi =
+                ScheduleSettings.GetActiveCulture().DateTimeFormat;
+
+            string s = dtfi.MonthDayPattern;
+
+            s = s.Replace("MMMM", "M");
+            s = s.Replace(" ", dtfi.DateSeparator);
+
+            return (date.ToString(s));
+        }
+
+        /// <summary>
+        /// Gets year interval text
+        /// </summary>
+        /// <param name="date"></param>
+        /// <returns>Interval text</returns>
+        private string GetYearIntervalText(DateTime date)
+        {
+            return (date.Year.ToString());
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region GetColumnRect
+
+        private Rectangle GetColumnRect(int col)
+        {
+            int x = Bounds.X + (col * ColumnWidth) + _HScrollPos;
+
+            return (new Rectangle(x, Bounds.Y,
+                ColumnWidth, Bounds.Height));
+        }
+
+        #endregion
+
+        #region GetColRange
+
+        /// <summary>
+        /// Calculates the range of days needed to be drawn
+        /// to satisfy the specified paint request
+        /// </summary>
+        /// <param name="clip">Clip rectangle</param>
+        /// <param name="colStart">[out] Column start index</param>
+        /// <param name="colEnd">[out] Column end index</param>
+        /// <returns>Day range count (end - start)</returns>
+        private int GetColRange(Rectangle clip, out int colStart, out int colEnd)
+        {
+            // Calc our starting index
+
+            int start = -_HScrollPos / ColumnWidth;
+            int x = Bounds.X + start * ColumnWidth + _HScrollPos;
+
+            while (start < ColumnCount)
+            {
+                if (x + ColumnWidth > clip.X)
+                    break;
+
+                x += ColumnWidth;
+
+                start++;
+            }
+
+            // Calc our ending index
+
+            int end = start;
+
+            while (end < ColumnCount)
+            {
+                if (x >= clip.Right)
+                    break;
+
+                x += ColumnWidth;
+
+                end++;
+            }
+
+            end++;
+
+            // Set the user supplied 'out' values, and
+            // return the range count to the caller
+
+            if (end - start == 0)
+            {
+                colStart = 0;
+                colEnd = 0;
+
+                return (0);
+            }
+
+            colStart = start;
+            colEnd = end;
+
+            return (end - start);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IDisposable Members
+
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing == true && IsDisposed == false)
+                HookEvents(false);
+
+            base.Dispose(disposing);
+        }
+
+        #endregion
+
+        #region Copy
+
+        /// <summary>
+        /// Returns copy of the item.
+        /// </summary>
+        public override BaseItem Copy()
+        {
+            TimeLineHeaderPanel objCopy = new TimeLineHeaderPanel(_CalendarView);
+            CopyToItem(objCopy);
+
+            return (objCopy);
+        }
+
+        /// <summary>
+        /// Copies the TimeLineHeaderPanel specific properties to new instance of the item.
+        /// </summary>
+        /// <param name="copy">New TimeLineHeaderPanel instance</param>
+        protected override void CopyToItem(BaseItem copy)
+        {
+            TimeLineHeaderPanel objCopy = copy as TimeLineHeaderPanel;
+
+            if (objCopy != null)
+            {
+                base.CopyToItem(objCopy);
+
+                objCopy.CalendarColor = this.CalendarColor;
+            }
+        }
+
+        #endregion
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/TimeLineView/TimeLineVScrollPanel.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/TimeLineView/TimeLineVScrollPanel.cs
new file mode 100644
index 00000000..7d5a960c
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/TimeLineView/TimeLineVScrollPanel.cs	
@@ -0,0 +1,40 @@
+#if FRAMEWORK20
+namespace DevComponents.DotNetBar.Schedule
+{
+    public class TimeLineVScrollPanel : VScrollPanel
+    {
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="calendarView"></param>
+        public TimeLineVScrollPanel(CalendarView calendarView)
+            : base(calendarView)
+        {
+        }
+
+        #region Private properties
+
+        /// <summary>
+        /// Gets the ScrollBar SmallChange value
+        /// </summary>
+        protected override int ScrollPanelSmallChange
+        {
+            get { return (CalendarView.TimeLineHeight); }
+        }
+
+        /// <summary>
+        /// Gets the ScrollBar Maximum value
+        /// </summary>
+        protected override int ScrollPanelMaximum
+        {
+            get
+            {
+                return (CalendarView.TimeLineHeight *
+                    CalendarView.DisplayedOwners.Count);
+            }
+        }
+
+        #endregion
+    }
+}
+#endif
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/TimeLineView/TimeLineView.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/TimeLineView/TimeLineView.cs
new file mode 100644
index 00000000..21d6d7f7
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/TimeLineView/TimeLineView.cs	
@@ -0,0 +1,3356 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.ScrollBar;
+using DevComponents.Schedule.Model;
+
+namespace DevComponents.DotNetBar.Schedule
+{
+    public class TimeLineView : BaseView
+    {
+        #region Static variables
+
+        static private AppointmentColor _appointmentColor = new AppointmentColor();
+
+        #endregion
+
+        #region Private variables
+
+        private CalendarWeekDayColor _ViewColor =       // View display color table
+            new CalendarWeekDayColor(eCalendarColor.Automatic);
+
+        private List<CalendarItem>
+            _CalendarItems = new List<CalendarItem>();
+
+        private Point _LastMovePoint;           // Last mouse move Point
+        private Point _LastPointOffset;         // Last Point offset
+        private Rectangle _LastBounds;          // MouseDown item bounds
+
+        private int _SelectedColStart;          // Column start selection
+        private int _SelectedColEnd;            // Column end selection
+
+        private Timer _ScrollViewTimer;         // Timer used to implement auto view scrolling
+        private int _ScrollDwell;               // Scroll dwell (pause, throttle) counter
+
+        private Color _WorkColor;               // Cached Brush colors
+        private Color _OffWorkColor;
+        private Color _SelectedColor;
+
+        private Brush _WorkBrush;               // Cached Brushes
+        private Brush _OffWorkBrush;
+        private Brush _SelectedBrush;
+
+        private int _HScrollPos;                // Horizontal scroll position
+
+        private List<ColumnList> _CondensedColList;
+        private List<int> _CollateLines = new List<int>();
+
+        private bool _ModelReloaded = true;
+
+        #endregion
+
+        public TimeLineView(CalendarView calendarView, eCalendarView eCalendarView)
+            : base(calendarView, eCalendarView)
+        {
+            // Set our non-client drawing info and CalendarColor
+
+            NClientData = new NonClientData(
+                eTabOrientation.Vertical,
+                (int)eCalendarWeekDayPart.OwnerTabBorder,
+                (int)eCalendarWeekDayPart.OwnerTabForeground,
+                (int)eCalendarWeekDayPart.OwnerTabBackground,
+                (int)eCalendarWeekDayPart.OwnerTabContentBackground,
+                (int)eCalendarWeekDayPart.OwnerTabSelectedForeground,
+                (int)eCalendarWeekDayPart.OwnerTabSelectedBackground);
+
+            CalendarColorTable = _ViewColor;
+
+            // Hook onto our events
+
+            HookEvents(true);
+
+            if (calendarView.TimeLineHScrollPanel.ScrollBar != null)
+            {
+                _HScrollPos = -calendarView.TimeLineHScrollPanel.ScrollBar.Value *
+                    calendarView.TimeLineColumnWidth;
+            }
+        }
+
+        #region Public properties
+
+        #region CalendarItems
+
+        /// <summary>
+        /// Gets array of CalendarItems
+        /// </summary>
+        public List<CalendarItem> CalendarItems
+        {
+            get { return (_CalendarItems); }
+        }
+
+        #endregion
+
+        #region StartDate
+
+        /// <summary>
+        /// Start date - readonly
+        /// </summary>
+        public new DateTime StartDate
+        {
+            get { return (base.StartDate); }
+            internal set { base.StartDate = value; }
+        }
+
+        #endregion
+
+        #region EndDate
+
+        /// <summary>
+        /// End date - readonly
+        /// </summary>
+        public new DateTime EndDate
+        {
+            get { return (base.EndDate); }
+            internal set { base.EndDate = value; }
+        }
+
+        #endregion
+
+        #region ColumnWidth
+
+        /// <summary>
+        /// Gets the ColumnWidth
+        /// </summary>
+        public int ColumnWidth
+        {
+            get { return (CalendarView.TimeLineColumnWidth); }
+        }
+
+        #endregion
+
+        #region BaseInterval
+
+        /// <summary>
+        /// Gets the BaseInterval (interval in total minutes)
+        /// </summary>
+        public double BaseInterval
+        {
+            get { return (CalendarView.BaseInterval); }
+        }
+
+        #endregion
+
+        #region TimeLineColumnCount
+
+        /// <summary>
+        /// Gets the number of Columns
+        /// </summary>
+        public int TimeLineColumnCount
+        {
+            get { return (CalendarView.TimeLineColumnCount); }
+        }
+
+        #endregion
+
+        #region MinAppointmentWidth
+
+        /// <summary>
+        /// Gets the MinAppointmentWidth
+        /// </summary>
+        public int MinAppointmentWidth
+        {
+            get { return (CalendarView.TimeLineMinAppointmentWidth); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Private properties
+
+        #region ShowCondensed
+
+        /// <summary>
+        /// Gets the CondensedView visibility state
+        /// </summary>
+        private bool ShowCondensed
+        {
+            get
+            {
+                if (CalendarView.TimeLineCondensedViewVisibility == eCondensedViewVisibility.Hidden)
+                    return (false);
+
+                if (CalendarView.TimeLineCondensedViewHeight < 10)
+                    return (false);
+
+                if (CalendarView.TimeLineCondensedViewVisibility == eCondensedViewVisibility.AllResources)
+                    return (true);
+
+                return (CalendarView.SelectedOwnerIndex == DisplayedOwnerKeyIndex);
+            }
+        }
+
+        #endregion
+
+        #region Cached Brushes
+
+        #region WorkBrush
+
+        /// <summary>
+        /// Gets and sets the Work time brush
+        /// </summary>
+        private Brush WorkBrush
+        {
+            get
+            {
+                Color color = _ViewColor.GetColor(
+                    (int)eCalendarWeekDayPart.DayWorkHoursBackground);
+
+                if (_WorkColor != color)
+                {
+                    _WorkColor = color;
+
+                    WorkBrush = new SolidBrush(color);
+                }
+
+                return (_WorkBrush);
+            }
+
+            set
+            {
+                if (_WorkBrush != value)
+                {
+                    if (_WorkBrush != null)
+                        _WorkBrush.Dispose();
+
+                    _WorkBrush = value;
+                }
+            }
+        }
+
+        #endregion
+
+        #region OffWorkBrush
+
+        /// <summary>
+        /// Gets and sets the Off-hours work time brush
+        /// </summary>
+        private Brush OffWorkBrush
+        {
+            get
+            {
+                Color color = _ViewColor.GetColor(
+                    (int)eCalendarWeekDayPart.DayOffWorkHoursBackground);
+
+                if (_OffWorkColor != color)
+                {
+                    _OffWorkColor = color;
+
+                    OffWorkBrush = new SolidBrush(color);
+                }
+
+                return (_OffWorkBrush);
+            }
+
+            set
+            {
+                if (_OffWorkBrush != value)
+                {
+                    if (_OffWorkBrush != null)
+                        _OffWorkBrush.Dispose();
+
+                    _OffWorkBrush = value;
+                }
+            }
+        }
+
+        #endregion
+
+        #region SelectedBrush
+
+        /// <summary>
+        /// Gets and sets the selected brush
+        /// </summary>
+        private Brush SelectedBrush
+        {
+            get
+            {
+                Color color = _ViewColor.GetColor(
+                    (int)eCalendarWeekDayPart.SelectionBackground);
+
+                if (_SelectedColor != color)
+                {
+                    _SelectedColor = color;
+
+                    SelectedBrush = new SolidBrush(color);
+                }
+
+                return (_SelectedBrush);
+            }
+
+            set
+            {
+                if (_SelectedBrush != value)
+                {
+                    if (_SelectedBrush != null)
+                        _SelectedBrush.Dispose();
+
+                    _SelectedBrush = value;
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region Internal Properties
+
+        /// <summary>
+        /// Gets the first visible timeline column
+        /// </summary>
+        internal int FirstVisibleColumn
+        {
+            get { return (-_HScrollPos / ColumnWidth); }
+        }
+
+        /// <summary>
+        /// Gets the condensed time line height
+        /// </summary>
+        internal int CondensedLineHeight
+        {
+            get { return (CalendarView.TimeLineCondensedViewHeight); }
+        }
+
+        /// <summary>
+        /// Gets and sets the model reload state
+        /// </summary>
+        internal bool ModelReloaded
+        {
+            get { return (_ModelReloaded); }
+            set { _ModelReloaded = value; }
+        }
+
+        #endregion
+
+        #region Hook / Unhook Events
+
+        /// <summary>
+        /// Routine hooks all necessary events for this control
+        /// </summary>
+        /// <param name="hook">True to hook, false to unhook</param>
+        private void HookEvents(bool hook)
+        {
+            if (hook == true)
+            {
+                CalendarView.SelectedViewChanged += SelectedViewChanged;
+                CalendarView.SelectedOwnerChanged += SelectedOwnerChanged;
+
+                CalendarView.TimeLineViewStartDateChanged += TimeLineViewStartDateChanged;
+                CalendarView.TimeLineViewEndDateChanged += TimeLineViewEndDateChanged;
+                CalendarView.TimeLineIntervalChanged += TimeLineIntervalChanged;
+                CalendarView.TimeLineIntervalPeriodChanged += TimeLineIntervalPeriodChanged;
+                CalendarView.TimeLineCondensedViewVisibilityChanged += TimeLineCondensedViewVisibilityChanged;
+
+                CalendarView.TimeLineHScrollPanel.ScrollPanelChanged += ScrollPanelChanged;
+            }
+            else
+            {
+                CalendarView.SelectedViewChanged -= SelectedViewChanged;
+                CalendarView.SelectedOwnerChanged -= SelectedOwnerChanged;
+
+                CalendarView.TimeLineViewStartDateChanged -= TimeLineViewStartDateChanged;
+                CalendarView.TimeLineViewEndDateChanged -= TimeLineViewEndDateChanged;
+                CalendarView.TimeLineIntervalChanged -= TimeLineIntervalChanged;
+                CalendarView.TimeLineIntervalPeriodChanged -= TimeLineIntervalPeriodChanged;
+                CalendarView.TimeLineCondensedViewVisibilityChanged -= TimeLineCondensedViewVisibilityChanged;
+
+                CalendarView.TimeLineHScrollPanel.ScrollPanelChanged -= ScrollPanelChanged;
+            }
+        }
+
+        #endregion
+
+        #region Event handling routines
+
+        #region SelectedViewChanged
+
+        /// <summary>
+        /// Processes view changes
+        /// </summary>
+        /// <param name="sender">object</param>
+        /// <param name="e">SelectedViewEventArgs</param>
+        void SelectedViewChanged(object sender, SelectedViewEventArgs e)
+        {
+            // Update our IsViewSelected state
+
+            IsViewSelected = (e.NewValue == ECalendarView);
+
+            if (IsViewSelected == true)
+            {
+                AutoSyncViewDate(e.OldValue);
+                UpdateDateSelection();
+            }
+            else
+            {
+                ResetView();
+            }
+        }
+
+        #endregion
+
+        #region SelectedOwnerChanged
+
+        void SelectedOwnerChanged(object sender, SelectedOwnerChangedEventArgs e)
+        {
+            if (CalendarView.TimeLineStretchRowHeight == true)
+            {
+                if (CalendarView.TimeLineCondensedViewVisibility == eCondensedViewVisibility.SelectedResource)
+                    NeedRecalcLayout = true;
+            }
+        }
+
+        #endregion
+
+        #region TimeLineViewStartDateChanged
+
+        /// <summary>
+        /// Processes StartDate changes
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void TimeLineViewStartDateChanged(object sender, DateChangeEventArgs e)
+        {
+            StartDate = e.NewValue;
+        }
+
+        #endregion
+
+        #region TimeLineViewEndDateChanged
+
+        /// <summary>
+        /// Processes EndDate changes
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void TimeLineViewEndDateChanged(object sender, DateChangeEventArgs e)
+        {
+            EndDate = e.NewValue;
+        }
+
+        #endregion
+
+        #region TimeLineIntervalPeriodChanged
+
+        /// <summary>
+        /// Handles IntervalPeriodChange notification
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void TimeLineIntervalPeriodChanged(object sender, TimeLineIntervalPeriodChangedEventArgs e)
+        {
+            NeedRecalcSize = true;
+            NeedRecalcLayout = true;
+        }
+
+        #endregion
+
+        #region TimeLineIntervalChanged
+
+        /// <summary>
+        /// Handles IntervalChange notification
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void TimeLineIntervalChanged(object sender, TimeLineIntervalChangedEventArgs e)
+        {
+            NeedRecalcSize = true;
+            NeedRecalcLayout = true;
+        }
+
+        #endregion
+
+        #region TimeLineCondensedViewVisibilityChanged
+
+        void TimeLineCondensedViewVisibilityChanged(
+            object sender, TimeLineCondensedViewVisibilityChangedEventArgs e)
+        {
+            if (CalendarView.TimeLineStretchRowHeight == true)
+                NeedRecalcLayout = true;
+        }
+
+        #endregion
+
+        #region ScrollPanelChanged
+
+        /// <summary>
+        /// Handles ScrollPanel change notification
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void ScrollPanelChanged(object sender, EventArgs e)
+        {
+            TimeLineHScrollPanel panel = sender as TimeLineHScrollPanel;
+
+            if (panel != null)
+            {
+                HScrollBarAdv hScrollBar = panel.ScrollBar;
+
+                _HScrollPos = -hScrollBar.Value * CalendarView.TimeLineColumnWidth;
+
+                // Redraw our view
+
+                if (Displayed == true)
+                {
+                    NeedRecalcLayout = true;
+
+                    InvalidateRect(true);
+                    Refresh();
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetViewAreaFromPoint
+
+        /// <summary>
+        /// Gets the view area under the given mouse
+        /// point (tab, header, content, etc)
+        /// </summary>
+        /// <param name="pt">Point</param>
+        /// <returns>eViewArea</returns>
+        public override eViewArea GetViewAreaFromPoint(Point pt)
+        {
+            if (Bounds.Contains(pt) == true)
+            {
+                if (pt.X >= ClientRect.X)
+                {
+                    // CondensedView
+
+                    if (ShowCondensed == true)
+                    {
+                        if (GetCondensedRect().Contains(pt) == true)
+                            return (eViewArea.InCondensedView);
+                    }
+
+                    return (eViewArea.InContent);
+                }
+
+                return (base.GetViewAreaFromPoint(pt));
+            }
+
+            return (eViewArea.NotInView);
+        }
+
+        #endregion
+
+        #region GetDateSelectionFromPoint
+
+        /// <summary>
+        /// Gets the date selection from the given point. The startDate
+        /// and endDate will vary based upon the view type
+        /// </summary>
+        /// <param name="pt">Point in question</param>
+        /// <param name="startDate">out start date</param>
+        /// <param name="endDate">out end date</param>
+        /// <returns>True if a valid selection exists
+        /// at the given point</returns>
+        public override bool GetDateSelectionFromPoint(
+            Point pt, out DateTime startDate, out DateTime endDate)
+        {
+            base.GetDateSelectionFromPoint(pt, out startDate, out endDate);
+
+            int col;
+
+            if (GetPointItem(pt, out col, true) == true)
+            {
+                startDate = CalendarView.TimeLineAddInterval(StartDate, col);
+                endDate = CalendarView.TimeLineAddInterval(startDate, 1);
+
+                return (true);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region SetSelectedItem
+
+        /// <summary>
+        /// Handles selected item changes
+        /// </summary>
+        /// <param name="sender">CalendarItem</param>
+        /// <param name="e">EventArgs</param>
+        public void ItemIsSelectedChanged(object sender, EventArgs e)
+        {
+            CalendarItem ci = sender as CalendarItem;
+
+            if (ci != null)
+            {
+                if (ci.IsSelected == true)
+                {
+                    if (SelectedItem != null && ci != SelectedItem)
+                        SelectedItem.IsSelected = false;
+
+                    SelectedItem = ci;
+                }
+                else
+                {
+                    if (ci == SelectedItem)
+                        SelectedItem = null;
+                }
+
+                // Make sure the selection is reflected
+                // in the condensed view (if present)
+
+                if (ShowCondensed == true)
+                    InvalidateRect(GetCondensedRect());
+            }
+        }
+
+        /// <summary>
+        /// Sets the current selected item
+        /// </summary>
+        /// <param name="pci">Previous CalendarItem</param>
+        /// <param name="nci">New CalendarItem</param>
+        /// <returns>New selected CalendarItem</returns>
+        protected override CalendarItem SetSelectedItem(CalendarItem pci, CalendarItem nci)
+        {
+            if (nci != null)
+                nci.IsSelected = true;
+
+            else if (pci != null)
+                pci.IsSelected = false;
+
+            return (nci);
+        }
+
+        #endregion
+
+        #region UpdateDateSelection
+
+        /// <summary>
+        /// Updates our slice selection range to reflect
+        /// the given date selection start and end values
+        /// </summary>
+        protected override void UpdateDateSelection()
+        {
+            if (IsViewSelected == true)
+            {
+                // Get the new absolute slice selection range
+
+                int colStart = GetDateCol(DateSelectionStart);
+                int colEnd = GetDateCol(DateSelectionEnd);
+
+                // Limit our range to only those columns
+                // that are visible on the screen
+
+                int c1 = -_HScrollPos / ColumnWidth;
+                int c2 = c1 + ClientRect.Width / ColumnWidth + 1;
+
+                if (c2 > c1)
+                {
+                    ProcessSelRange(colStart, colEnd, c1, c2);
+
+                    // Save our new selection range
+
+                    _SelectedColStart = colStart;
+                    _SelectedColEnd = colEnd;
+                }
+
+                if (ShowCondensed == true)
+                {
+                    Rectangle r = GetCondensedRect();
+
+                    this.InvalidateRect(r);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Processes the selection time column range
+        /// </summary>
+        /// <param name="colStart">Column range start</param>
+        /// <param name="colEnd">Column range end</param>
+        /// <param name="c1">Column start limit</param>
+        /// <param name="c2">Column end limit</param>
+        private void ProcessSelRange(int colStart, int colEnd, int c1, int c2)
+        {
+            bool[] oldSelected = SelectedColumns(c1, c2, _SelectedColStart, _SelectedColEnd);
+            bool[] newSelected = SelectedColumns(c1, c2, colStart, colEnd);
+
+            // Invalidate those slices whose
+            // selection status changed
+
+            Rectangle r = GetColRect(c1);
+
+            if (r.Width > 0 && r.Height > 0)
+            {
+                for (int i = 0; i < c2 - c1; i++)
+                {
+                    if (oldSelected[i] != newSelected[i])
+                        InvalidateRect(r);
+
+                    r.X += ColumnWidth;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets an array of column selection values
+        /// over the given range of columns
+        /// </summary>
+        /// <param name="c1">Column start limit</param>
+        /// <param name="c2">Column end limit</param>
+        /// <param name="colStart">Slice range start</param>
+        /// <param name="colEnd">Slice range end</param>
+        /// <returns>Array of selection values</returns>
+        private bool[] SelectedColumns(int c1, int c2, int colStart, int colEnd)
+        {
+            // Calculate our number of entries and
+            // allocate our IsSelected array accordingly
+
+            int n = c2 - c1;
+            bool[] sel = new bool[n + 1];
+
+            // Loop through the range of entries determining if
+            // the specific col is within the selection range
+
+            for (int i = 0; i < n; i++)
+                sel[i] = (c1 + i >= colStart && c1 + i < colEnd);
+
+            // Return the array to the caller
+
+            return (sel);
+        }
+
+        #endregion
+
+        #region RecalcSize routines
+
+        /// <summary>
+        /// Performs NeedRecalcSize requests
+        /// </summary>
+        public override void RecalcSize()
+        {
+            base.RecalcSize();
+
+            if (IsViewSelected == true)
+            {
+                // Normalize our start and end dates
+
+                DateTime startDate;
+                DateTime endDate;
+                NormalizeDates(out startDate, out endDate);
+
+                // Update our Model connection view,
+                // CalendarItems, and DateSelection
+
+                UpdateView();
+                UpdateDateSelection();
+            }
+
+            NeedRecalcLayout = false;
+        }
+
+        #region NormalizeDates
+
+        /// <summary>
+        /// Normalizes the user specified start and end dates
+        /// </summary>
+        /// <param name="startDate">[out] Normalized start date</param>
+        /// <param name="endDate">[out] Normalized end date</param>
+        protected virtual void NormalizeDates(out DateTime startDate, out DateTime endDate)
+        {
+            startDate = this.StartDate;
+            endDate = this.EndDate;
+        }
+
+        #endregion
+
+        #region UpdateView
+
+        /// <summary>
+        /// Updates our connection model view
+        /// </summary>
+        private void UpdateView()
+        {
+            // Make sure we have a model connection
+
+            if (Connector == null)
+            {
+                if (CalendarModel != null)
+                    Connector = new ModelTimeLineViewConnector(CalendarModel, this);
+            }
+            else
+            {
+                // The timeline range could have changed, so let
+                // the connection refresh the data if needed
+
+                ((ModelTimeLineViewConnector)Connector).RefreshData(false);
+            }
+
+            // We have a connection, so update our CalendarItems
+
+            if (Connector != null)
+            {
+                UpdateCalendarItems();
+
+                if (ShowCondensed == true)
+                    UpdateCondensedColumnList();
+
+                CalendarView.DoViewLoadComplete(this);
+            }
+        }
+
+        #endregion
+
+        #region ResetView
+
+        /// <summary>
+        /// Disconnects and resets the Model connection
+        /// </summary>
+        internal override void ResetView()
+        {
+            _ModelReloaded = true;
+
+            base.ResetView();
+        }
+
+        #endregion
+
+        #region UpdateCalendarItems
+
+        /// <summary>
+        /// Updates our CalendarItems list
+        /// </summary>
+        private void UpdateCalendarItems()
+        {
+            if (NeedRecalcLayout == true)
+            {
+                _CollateLines.Clear();
+
+                if (_CalendarItems.Count > 0)
+                {
+                    List<CalendarItem> items = SortCalendarItems(_CalendarItems);
+
+                    if (CalendarView.HasTimeLineGetRowCollateIdCallout)
+                    {
+                        SortedDictionary<int, List<CalendarItem>> ditems = CollateCalendarItems(items);
+
+                        int dy = 0;
+
+                        foreach (KeyValuePair<int, List<CalendarItem>> kvp in ditems)
+                        {
+                            ColumnList colList = new ColumnList();
+
+                            for (int i = 0; i < kvp.Value.Count; i++)
+                                colList.AddColumnSlot(kvp.Value[i], 0);
+
+                            colList.CountColumns();
+
+                            dy = CalcAppointmentBounds(colList, dy, true);
+
+                            _CollateLines.Add(dy);
+                        }
+                    }
+                    else
+                    {
+                        ColumnList colList = new ColumnList();
+
+                        for (int i = 0; i < items.Count; i++)
+                            colList.AddColumnSlot(items[i], 0);
+
+                        colList.CountColumns();
+
+                        CalcAppointmentBounds(colList, 0, false);
+                    }
+                }
+
+                NeedRecalcLayout = false;
+
+                InvalidateRect();
+            }
+        }
+
+        #region CollateCalendarItems
+
+        private SortedDictionary<int, List<CalendarItem>>
+            CollateCalendarItems(List<CalendarItem> items)
+        {
+            SortedDictionary<int, List<CalendarItem>> citems =
+                new SortedDictionary<int, List<CalendarItem>>();
+
+            for (int i = 0; i < items.Count; i++)
+            {
+                if (items[i].CollateId < 0)
+                {
+                    TimeLineGetRowCollateIdEventArgs e =
+                        new TimeLineGetRowCollateIdEventArgs(items[i]);
+
+                    CalendarView.DoTimeLineGetRowCollateId(e);
+
+                    items[i].CollateId = e.CollateId;
+                }
+
+                int collateId = items[i].CollateId;
+
+                if (citems.ContainsKey(collateId) == false)
+                    citems.Add(collateId, new List<CalendarItem>());
+
+                citems[collateId].Add(items[i]);
+            }
+
+            return (citems);
+        }
+
+        #endregion
+
+        #region SortCalendarItems
+
+        /// <summary>
+        /// Sorts the provided CalendarItems
+        /// </summary>
+        /// <returns>Sorted CalendarItems</returns>
+        private List<CalendarItem> SortCalendarItems(IEnumerable<CalendarItem> clist)
+        {
+            List<CalendarItem> items = new List<CalendarItem>();
+
+            items.AddRange(clist);
+
+            if (items.Count > 0)
+            {
+                items.Sort(
+
+                   delegate(CalendarItem c1, CalendarItem c2)
+                   {
+                       if (c1.StartTime > c2.StartTime)
+                           return (1);
+
+                       if (c1.StartTime < c2.StartTime)
+                           return (-1);
+
+                       if (c1.EndTime < c2.EndTime)
+                           return (1);
+
+                       if (c1.EndTime > c2.EndTime)
+                           return (-1);
+
+                       int result = 0;
+                       CalendarView.DoDetailSortEvent(this, c1, c2, ref result);
+
+                       return (result);
+                   }
+               );
+            }
+
+            return (items);
+        }
+
+        #endregion
+
+        #region CalcAppointmentBounds
+
+        /// <summary>
+        /// Calculates normal appointment bounds
+        /// </summary>
+        /// <param name="colList">Accumulated ColumnList</param>
+        /// <param name="dy"></param>
+        /// <param name="collate"></param>
+        private int CalcAppointmentBounds(ColumnList colList, int dy, bool collate)
+        {
+            if (colList.SList.Count > 0)
+            {
+                // If we are stretching the rows height, then calculate
+                // the default row height and the row spread, to evenly
+                // distribute the fill remainder
+
+                bool stretchRow = (collate == false && 
+                    CalendarView.TimeLineStretchRowHeight == true);
+
+                int height = GetColRect(0).Height;
+
+                int rowSpread;
+                int rowHeight = GetColumnRowHeight(colList.SList.Count, stretchRow, height, out rowSpread) - 2;
+
+                for (int i = 0; i < colList.SList.Count; i++)
+                {
+                    int maxRowHeight = 0;
+
+                    for (int j = 0; j < colList.SList[i].Count; j++)
+                    {
+                        SlotItem sitem = colList.SList[i][j];
+                        CalendarItem item = sitem.CItem;
+
+                        Rectangle r = new Rectangle();
+
+                        r.Y = ClientRect.Y + dy;
+                        r.Height = rowHeight;
+
+                        if (stretchRow == false)
+                            r.Height = GetRowHeight(item, rowHeight);
+
+                        TimeSpan ts1 = item.StartTime - StartDate;
+                        TimeSpan ts2 = item.EndTime - item.StartTime;
+
+                        int pos = (int) ((ts1.TotalMinutes * ColumnWidth) / BaseInterval);
+                        int width = (int) ((ts2.TotalMinutes * ColumnWidth) / BaseInterval);
+
+                        if (CalendarView.TimeLinePeriod == eTimeLinePeriod.Years)
+                        {
+                            int years = item.StartTime.Year - StartDate.Year;
+
+                            pos = (years * ColumnWidth) / CalendarView.TimeLineInterval;
+                        }
+
+                        if (width < MinAppointmentWidth)
+                            width = MinAppointmentWidth;
+
+                        if (width < 4)
+                            width = 4;
+
+                        r.X = ClientRect.X + pos + _HScrollPos;
+                        r.Width = width;
+
+                        Rectangle p = ClientRect;
+                        int hpad = CalendarView.TimeLineHorizontalPadding;
+
+                        if (r.Left >= p.Left)
+                        {
+                            r.X += hpad;
+                            r.Width -= hpad;
+                        }
+
+                        if (r.Right <= p.Right)
+                            r.Width -= hpad;
+
+                        if (i < rowSpread)
+                            r.Height++;
+
+                        if (item.StartTime != item.EndTime)
+                        {
+                            if (r.Height + 2 > maxRowHeight)
+                                maxRowHeight = r.Height + 2;
+                        }
+
+                        if (stretchRow == true)
+                        {
+                            if (CalendarView.TimeLineStretchRowHeightMode == TimeLineStretchRowHeightMode.Full)
+                            {
+                                if (sitem.SList == null)
+                                {
+                                    r.Height = height - dy - 2;
+                                }
+                                else
+                                {
+                                    int n = GetColumnCount(sitem);
+
+                                    r.Height = (rowHeight + 1) * n - 1;
+
+                                    for (int k = 0; k < n; k++)
+                                    {
+                                        if (i + k >= rowSpread)
+                                            break;
+
+                                        r.Height++;
+                                    }
+                                }
+                            }
+                        }
+                            
+                        r.Height++;
+
+                        item.Bounds = r;
+
+                        // Set it's display state
+
+                        item.Displayed = r.IntersectsWith(ClientRect);
+                    }
+
+                    dy += maxRowHeight;
+                }
+            }
+
+            return (dy);
+        }
+
+        #region GetColumnCount
+
+        private int GetColumnCount(SlotItem sitem)
+        {
+            int column = int.MaxValue;
+
+            for (int i = 0; i < sitem.SList.Count; i++)
+            {
+                if (sitem.SList[i].Column < column)
+                    column = sitem.SList[i].Column;
+            }
+
+            return (column - sitem.Column);
+        }
+
+        #endregion
+
+        #region GetColumnRowHeight
+
+        private int GetColumnRowHeight(int count, bool stretchRow, int height, out int rowSpread)
+        {
+            rowSpread = 0;
+
+            int rowHeight = AppointmentHeight;
+
+            if (stretchRow == true)
+            {
+                rowHeight = height / count;
+
+                if (rowHeight < AppointmentHeight)
+                    rowHeight = AppointmentHeight;
+                else
+                    rowSpread = height - (count * rowHeight);
+            }
+
+            return (rowHeight);
+        }
+
+        #endregion
+
+        #region GetRowHeight
+
+        /// <summary>
+        /// Get the RowHeight for the given CalendarItem
+        /// </summary>
+        /// <param name="item">CalendarItem</param>
+        /// <param name="height">Calculated height</param>
+        /// <returns></returns>
+        private int GetRowHeight(CalendarItem item, int height)
+        {
+            TimeLineGetRowHeightEventArgs e =
+                new TimeLineGetRowHeightEventArgs(item, height);
+
+            CalendarView.DoTimeLineGetRowHeight(e);
+
+            return (e.Height);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region UpdateCondensedColumnList
+
+        /// <summary>
+        /// Updates the condensed view column list
+        /// </summary>
+        internal void UpdateCondensedColumnList()
+        {
+            if (_ModelReloaded == true && Connector != null)
+            {
+                _CondensedColList = new List<ColumnList>();
+
+                List<CalendarItem> items = new List<CalendarItem>();
+
+                // Get our appointment collection
+
+                GetCondensedAppts(items);
+                GetCondensedCustomItems(items);
+
+                // If we have any items, sort them and
+                // create a corresponding ColumnList
+
+                if (items.Count > 0)
+                {
+                    items = SortCalendarItems(items);
+
+                    if (CalendarView.HasTimeLineGetRowCollateIdCallout)
+                    {
+                        SortedDictionary<int, List<CalendarItem>> ditems = CollateCalendarItems(items);
+
+                        foreach (KeyValuePair<int, List<CalendarItem>> kvp in ditems)
+                        {
+                            ColumnList colList = new ColumnList();
+
+                            for (int i = 0; i < kvp.Value.Count; i++)
+                                colList.AddColumnSlot(kvp.Value[i], 0);
+
+                            colList.CountColumns();
+
+                            _CondensedColList.Add(colList);
+                        }
+                    }
+                    else
+                    {
+                        _CondensedColList.Add(new ColumnList());
+
+                        for (int i = 0; i < items.Count; i++)
+                            _CondensedColList[0].AddColumnSlot(items[i], 0);
+
+                        _CondensedColList[0].CountColumns();
+                    }
+                }
+
+                _ModelReloaded = false;
+            }
+        }
+
+        #region GetCondensedAppts
+
+        private void GetCondensedAppts(List<CalendarItem> items)
+        {
+            List<Appointment> appts =
+                ((ModelTimeLineViewConnector)Connector).ListAppts;
+
+            if (appts != null && appts.Count > 0)
+            {
+                int n = Math.Min(appts.Count, 500);
+                n = Math.Max(appts.Count / n, 1);
+
+                for (int i = 0; i < appts.Count; i += n)
+                {
+                    if (IsAppointmentVisible(appts[i]) == true)
+                    {
+                        CalendarItem ci = new CalendarItem();
+
+                        ci.StartTime = appts[i].StartTime;
+                        ci.EndTime = appts[i].EndTime;
+                        ci.ModelItem = appts[i];
+
+                        items.Add(ci);
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Determines if an appointment is visible
+        /// for the given DisplayOwner
+        /// </summary>
+        /// <param name="app"></param>
+        /// <returns></returns>
+        private bool IsAppointmentVisible(Appointment app)
+        {
+            if (string.IsNullOrEmpty(DisplayedOwnerKey))
+                return (true);
+
+            return (app.OwnerKey == DisplayedOwnerKey);
+        }
+
+        #endregion
+
+        #region GetCondensedCustomItems
+
+        private void GetCondensedCustomItems(List<CalendarItem> items)
+        {
+            for (int i = 0; i < CalendarView.CustomItems.Count; i++)
+            {
+                CustomCalendarItem item = CalendarView.CustomItems[i];
+
+                if (IsCustomItemVisible(item) == true &&
+                    (item.StartTime < EndDate && item.EndTime > StartDate))
+                {
+                    CalendarItem ci = new CalendarItem();
+
+                    ci.StartTime = item.StartTime;
+                    ci.EndTime = item.EndTime;
+                    ci.ModelItem = item;
+
+                    items.Add(ci);
+                }
+            }
+        }
+
+        private bool IsCustomItemVisible(CustomCalendarItem item)
+        {
+            if (string.IsNullOrEmpty(Connector.DisplayOwnerKey))
+                return (true);
+
+            return (item.OwnerKey.Equals(Connector.DisplayOwnerKey));
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region Paint processing
+
+        #region Root paint code
+
+        /// <summary>
+        /// Paint processing
+        /// </summary>
+        /// <param name="e">ItemPaintArgs</param>
+        public override void Paint(ItemPaintArgs e)
+        {
+            Graphics g = e.Graphics;
+
+            // Set our current color table
+
+            _ViewColor.SetColorTable();
+
+            // calculate our Column count and range
+
+            int colStart, colEnd;
+
+            if (GetColRange(e, out colStart, out colEnd) > 0)
+            {
+                Region rgnSave = g.Clip;
+
+                g.SetClip(ClientRect, CombineMode.Intersect);
+
+                // Draw the TimeLine
+
+                DrawTimeLine(g, colStart, colEnd);
+                DrawTimeIndicators(g, colStart, colEnd, eTimeIndicatorLevel.Bottom);
+
+                if (Connector != null && ShowCondensed == true)
+                    DrawCondensedLine(g);
+
+                // If we have a model connection then
+                // draw our appointments
+
+                if (Connector != null && Connector.IsConnected)
+                {
+                    Rectangle r = ClientRect;
+                    r.X += 1;
+
+                    if (ShowCondensed == true)
+                    {
+                        Rectangle r2 = GetCondensedRect();
+
+                        if (r.Bottom > r2.Top)
+                            r.Height -= (r.Bottom - r2.Top);
+                    }
+
+                    g.SetClip(r, CombineMode.Intersect);
+
+                    DrawAppointments(e);
+                }
+
+                DrawTimeIndicators(g, colStart, colEnd, eTimeIndicatorLevel.Top);
+
+                g.Clip = rgnSave;
+
+                // Update our pos window
+
+                UpdatePosWin(ClientRect);
+            }
+
+            // Let the base painting take place
+
+            base.Paint(e);
+        }
+
+        #endregion
+
+        #region DrawTimeLine
+
+        /// <summary>
+        /// Initiates the drawing of the TimeLine
+        /// </summary>
+        /// <param name="g">Graphics</param>
+        /// <param name="colStart">Starting column</param>
+        /// <param name="colEnd">Ending column</param>
+        private void DrawTimeLine(Graphics g, int colStart, int colEnd)
+        {
+            int n = colEnd - colStart;
+
+            eSlotDisplayState[] states = new eSlotDisplayState[n + 1];
+
+            for (int i = 0; i <= n; i++)
+                states[i] = GetSlotState(colStart + i);
+
+            DrawContent(g, colStart, colEnd, states);
+            DrawBorder(g, colStart, colEnd, states);
+        }
+
+        #region DrawContent
+
+        /// <summary>
+        /// Draws the content area of the TimeLine
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="colStart">Starting column</param>
+        /// <param name="colEnd">Ending column</param>
+        /// <param name="states"></param>
+        private void DrawContent(Graphics g,
+            int colStart, int colEnd, eSlotDisplayState[] states)
+        {
+            Rectangle r = GetColRect(colStart);
+
+            if (CalendarView.HasTimeLineSlotBackgroundCallout == true)
+            {
+                for (int i = colStart; i <= colEnd; i++)
+                {
+                    int n = i - colStart;
+
+                    DateTime startTime = StartDate.AddMinutes(i * BaseInterval);
+                    DateTime endTime = startTime.AddMinutes(BaseInterval);
+
+                    if (CalendarView.DoTimeLineViewPreRenderSlotBackground(
+                        g, this, startTime, endTime, r, ref states[n]) == false)
+                    {
+                        g.FillRectangle(GetContentBrush(states[n]), r);
+
+                        DrawCollateLines(g, r);
+
+                        CalendarView.DoTimeLineViewPostRenderSlotBackground(
+                            g, this, startTime, endTime, r, states[n]);
+                    }
+
+                    r.X += ColumnWidth;
+                }
+            }
+            else
+            {
+                Rectangle t = r;
+
+                for (int i = 0; i <= colEnd - colStart; i++)
+                {
+                    g.FillRectangle(GetContentBrush(states[i]), t);
+
+                    t.X += ColumnWidth;
+                }
+
+                r.Width += (t.Right - r.Right);
+
+                DrawCollateLines(g, r);
+            }
+        }
+
+        #region DrawCollateLines
+
+        private void DrawCollateLines(Graphics g, Rectangle r)
+        {
+            if (CalendarView.TimeLineShowCollateLines == true &&
+                _CollateLines.Count > 1)
+            {
+                using (Pen pen = new Pen(
+                    _ViewColor.GetColor((int) eCalendarWeekDayPart.DayHalfHourBorder)))
+                {
+                    for (int i = 0; i < _CollateLines.Count - 1; i++)
+                    {
+                        int y = _CollateLines[i];
+
+                        g.DrawLine(pen, r.X, r.Y + y, r.Right, r.Y + y);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region GetSlotState
+
+        /// <summary>
+        /// GetSlotState
+        /// </summary>
+        /// <param name="col"></param>
+        /// <returns></returns>
+        private eSlotDisplayState GetSlotState(int col)
+        {
+            eSlotDisplayState state = eSlotDisplayState.None;
+
+            if (DisplayedOwnerKeyIndex == CalendarView.SelectedOwnerIndex)
+            {
+                if (col >= _SelectedColStart && col < _SelectedColEnd)
+                    state |= eSlotDisplayState.Selected;
+            }
+
+            DateTime date = StartDate.AddMinutes(col * CalendarView.BaseInterval);
+            WorkTime workTime = new WorkTime(date.Hour, date.Minute);
+
+            if (IsWorkTime((int)date.DayOfWeek, workTime) == true)
+                state |= eSlotDisplayState.Work;
+
+            return (state);
+        }
+
+        #endregion
+
+        #region GetContentBrush
+
+        /// <summary>
+        /// Gets the background content brush
+        /// for the given time slice
+        /// </summary>
+        /// <returns>Background brush</returns>
+        private Brush GetContentBrush(eSlotDisplayState state)
+        {
+            if ((state & eSlotDisplayState.Selected) == eSlotDisplayState.Selected)
+                return (SelectedBrush);
+
+            if ((state & eSlotDisplayState.Work) == eSlotDisplayState.Work)
+                return (WorkBrush);
+
+            return (OffWorkBrush);
+        }
+
+        #endregion
+
+        #region IsWorkTime
+
+        /// <summary>
+        /// Determines if the given time is tagged as a "Work time"
+        /// </summary>
+        /// <param name="day">Day of week</param>
+        /// <param name="time">WorkTime to test</param>
+        /// <returns>true if specified "time" is a Work time</returns>
+        private bool IsWorkTime(int day, WorkTime time)
+        {
+            ModelTimeLineViewConnector tlc =
+                (ModelTimeLineViewConnector)Connector;
+
+            WorkTime workStartTime = tlc.DayInfo[day].WorkStartTime;
+            WorkTime workEndTime = tlc.DayInfo[day].WorkEndTime;
+
+            return (time >= workStartTime && time < workEndTime);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region DrawBorder
+
+        /// <summary>
+        /// Draws the TimeLine border
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="colStart">Starting column</param>
+        /// <param name="colEnd">Ending column</param>
+        /// <param name="states"></param>
+        private void DrawBorder(Graphics g,
+            int colStart, int colEnd, eSlotDisplayState[] states)
+        {
+            Rectangle r = GetColRect(colStart);
+
+            // Draw the vertical borders
+
+            if (CalendarView.TimeLinePeriod == eTimeLinePeriod.Minutes)
+                DrawHalfHourBorders(g, colStart, colEnd, r, states);
+            else
+                DrawHourBorders(g, colStart, colEnd, r, states);
+
+            // Now draw the horizontal border
+
+            r.Width = (colEnd - colStart + 1) * ColumnWidth;
+            r.Height = ClientRect.Height;
+
+            Color color = _ViewColor.GetColor((int)eCalendarWeekDayPart.DayViewBorder);
+
+            if (CalendarView.DoTimeLineViewRenderViewBorder(g, this, colStart, colEnd, r, color) == false)
+            {
+                using (Pen pen1 = new Pen(color))
+                {
+                    Point pt1 = new Point(r.X, r.Bottom - 1);
+                    Point pt2 = new Point(r.Right - 1, pt1.Y);
+
+                    g.DrawLine(pen1, pt1, pt2);
+
+                    if (CalendarView.TimeLineShowPeriodHeader == false &&
+                        CalendarView.TimeLineShowIntervalHeader == false)
+                    {
+                        pt1 = new Point(r.X, r.Top);
+                        pt2 = new Point(r.Right - 1, pt1.Y);
+
+                        g.DrawLine(pen1, pt1, pt2);
+                    }
+                }
+            }
+        }
+
+        #region DrawHalfHourBorders
+
+        /// <summary>
+        /// DrawHalfHourBorders
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="colStart"></param>
+        /// <param name="colEnd"></param>
+        /// <param name="bounds"></param>
+        /// <param name="states"></param>
+        private void DrawHalfHourBorders(Graphics g,
+            int colStart, int colEnd, Rectangle bounds, eSlotDisplayState[] states)
+        {
+            // Draw the vertical hour and half hour borders
+
+            using (Pen pen1 = new Pen(
+                _ViewColor.GetColor((int)eCalendarWeekDayPart.DayHourBorder)))
+            {
+                using (Pen pen2 = new Pen(
+                    _ViewColor.GetColor((int)eCalendarWeekDayPart.DayHalfHourBorder)))
+                {
+                    Point pt1 = new Point(bounds.X, ClientRect.Y);
+                    Point pt2 = new Point(bounds.X, ClientRect.Bottom - 1);
+
+                    int n = 60 / CalendarView.TimeLineInterval;
+                    int start = -_HScrollPos / ColumnWidth;
+
+                    for (int i = colStart; i <= colEnd; i++)
+                    {
+                        bool isHour = (i == start || (i % n) == 0);
+                        Pen pen = (isHour ? pen1 : pen2);
+
+                        if (CalendarView.DoTimeLineViewRenderSlotBorder(
+                            g, this, i, isHour, states[i - colStart], pt1, pt2, pen) == false)
+                        {
+                            g.DrawLine((isHour ? pen1 : pen2), pt1, pt2);
+                        }
+
+                        pt1.X = pt2.X = (pt1.X + ColumnWidth);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region DrawHourBorders
+
+        /// <summary>
+        /// DrawHourBorders
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="colStart"></param>
+        /// <param name="colEnd"></param>
+        /// <param name="bounds"></param>
+        /// <param name="states"></param>
+        private void DrawHourBorders(Graphics g,
+            int colStart, int colEnd, Rectangle bounds, eSlotDisplayState[] states)
+        {
+            // Draw the vertical hour borders
+
+            using (Pen pen = new Pen(
+                _ViewColor.GetColor((int)eCalendarWeekDayPart.DayHourBorder)))
+            {
+                Point pt1 = new Point(bounds.X, ClientRect.Y);
+                Point pt2 = new Point(bounds.X, ClientRect.Bottom - 1);
+
+                for (int i = colStart; i <= colEnd; i++)
+                {
+                    if (CalendarView.DoTimeLineViewRenderSlotBorder(
+                        g, this, i, true, states[i - colStart], pt1, pt2, pen) == false)
+                    {
+                        g.DrawLine(pen, pt1, pt2);
+                    }
+
+                    pt1.X = pt2.X = (pt1.X + ColumnWidth);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region DrawTimeIndicators
+
+        #region DrawTimeIndicators
+
+        /// <summary>
+        /// Draws view TimeIndicators
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="colStart"></param>
+        /// <param name="colEnd"></param>
+        private void DrawTimeIndicators(Graphics g, 
+            int colStart, int colEnd, eTimeIndicatorLevel level)
+        {
+            DateTime start = CalendarView.TimeLineAddInterval(StartDate, colStart);
+            DateTime end = CalendarView.TimeLineAddInterval(StartDate, colEnd);
+
+            Rectangle r = Rectangle.Union(GetColRect(colStart), GetColRect(colEnd));
+
+            for (int i = 0; i < CalendarView.TimeIndicators.Count; i++)
+            {
+                TimeIndicator ti = CalendarView.TimeIndicators[i];
+
+                if (ti.IndicatorLevel == level)
+                {
+                    if (ti.IndicatorArea == eTimeIndicatorArea.All ||
+                        ti.IndicatorArea == eTimeIndicatorArea.Content)
+                    {
+                        if (ti.IsVisible(CalendarView, this))
+                        {
+                            DateTime time = ti.IndicatorDisplayTime;
+
+                            if (time >= start && time < end)
+                                DrawTimeIndicator(g, start, r, ti);
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region DrawTimeIndicator
+
+        #region DrawTimeIndicator
+
+        /// <summary>
+        /// Draws individual view TimeIndicator
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="startDate"></param>
+        /// <param name="sRect"></param>
+        /// <param name="ti"></param>
+        private void DrawTimeIndicator(Graphics g,
+            DateTime startDate, Rectangle sRect, TimeIndicator ti)
+        {
+            Rectangle r = GetIndicatorRect(ti, startDate, sRect);
+
+            if (r.IntersectsWith(sRect) == true)
+            {
+                if (r.Width > 0)
+                {
+                    ColorDef cdef = GetIndicatorColor(ti);
+
+                    if (cdef != null)
+                    {
+                        float angle = cdef.Angle - 90;
+
+                        using (Brush br = _ViewColor.BrushPart(cdef, r, angle))
+                        {
+                            if (br is LinearGradientBrush)
+                                ((LinearGradientBrush) br).WrapMode = WrapMode.TileFlipX;
+
+                            g.FillRectangle(br, r);
+                        }
+                    }
+                }
+
+                Color color = GetIndicatorBorder(ti);
+
+                if (color.IsEmpty == false)
+                {
+                    using (Pen pen = new Pen(color))
+                        g.DrawLine(pen, r.Right, r.Top, r.Right, r.Bottom - 1);
+                }
+            }
+        }
+
+        #endregion
+
+        #region GetIndicatorColor
+
+        /// <summary>
+        /// Gets the Indicator Back color
+        /// </summary>
+        /// <param name="ti"></param>
+        /// <returns></returns>
+        private ColorDef GetIndicatorColor(TimeIndicator ti)
+        {
+            ColorDef cdef = ti.IndicatorColor;
+
+            if (cdef == null || cdef.IsEmpty == true)
+                cdef = _ViewColor.GetColorDef((int)eCalendarWeekDayPart.TimeIndicator);
+
+            return (cdef);
+        }
+
+        #endregion
+
+        #region GetIndicatorBorder
+
+        /// <summary>
+        /// Gets the Indicator Border color
+        /// </summary>
+        /// <param name="ti"></param>
+        /// <returns></returns>
+        private Color GetIndicatorBorder(TimeIndicator ti)
+        {
+            return (ti.BorderColor.IsEmpty == false ? ti.BorderColor :
+                _ViewColor.GetColor((int)eCalendarWeekDayPart.TimeIndicatorBorder));
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetIndicatorRect
+
+        /// <summary>
+        /// Gets the TimeIndicator Rectangle
+        /// </summary>
+        /// <param name="ti"></param>
+        /// <param name="startDate"></param>
+        /// <param name="sRect"></param>
+        /// <returns></returns>
+        private Rectangle GetIndicatorRect(
+            TimeIndicator ti, DateTime startDate, Rectangle sRect)
+        {
+            double x = ColumnWidth / CalendarView.BaseInterval;
+
+            int offset = (int)((ti.IndicatorDisplayTime - startDate).TotalMinutes * x);
+
+            sRect.X += (offset - ti.Thickness - 1);
+            sRect.Width = ti.Thickness;
+
+            return (sRect);
+        }
+
+        /// <summary>
+        /// Gets the TimeIndicator Rectangle
+        /// </summary>
+        /// <param name="ti"></param>
+        /// <returns></returns>
+        internal override Rectangle GetIndicatorRect(TimeIndicator ti)
+        {
+            return (GetIndicatorRect(ti, ti.IndicatorDisplayTime));
+        }
+
+        /// <summary>
+        /// Gets the TimeIndicator Rectangle for the given date
+        /// </summary>
+        /// <param name="ti"></param>
+        /// <param name="time"></param>
+        /// <returns></returns>
+        internal override Rectangle GetIndicatorRect(TimeIndicator ti, DateTime time)
+        {
+            int colStart = -_HScrollPos / ColumnWidth;
+            DateTime startDate = CalendarView.TimeLineAddInterval(StartDate, colStart);
+
+            double x = ColumnWidth / CalendarView.BaseInterval;
+            int offset = (int)((time - startDate).TotalMinutes * x);
+
+            Rectangle r = GetColRect(colStart);
+
+            r.X += (offset - ti.Thickness - 1);
+            r.Width = ti.Thickness;
+
+            return (r);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region DrawCondensedLine
+
+        /// <summary>
+        /// Draws the condensed TimeLine
+        /// </summary>
+        /// <param name="g"></param>
+        private void DrawCondensedLine(Graphics g)
+        {
+            TimeSpan ts0 = EndDate - StartDate;
+            float scale = (float)(ClientRect.Width / (ts0.TotalMinutes + BaseInterval));
+
+            Rectangle r = GetCondensedRect();
+
+            using (GraphicsPath path = GetCondensedViewPath(r, scale))
+            {
+                using (Brush br =
+                    _ViewColor.BrushPart((int)eCalendarWeekDayPart.CondensedViewBackground, r))
+                {
+                    g.FillRectangle(br, r);
+                }
+
+                g.FillPath(Brushes.White, path);
+
+                DrawCondensedContent(g, r, scale);
+                DrawCondensedAppointments(g, scale);
+
+                g.DrawPath(Pens.Gray, path);
+            }
+        }
+
+        #region DrawCondensedContent
+
+        /// <summary>
+        /// Draws the Condensed Content area
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="vRect"></param>
+        /// <param name="scale"></param>
+        private void DrawCondensedContent(Graphics g, Rectangle vRect, float scale)
+        {
+            using (Pen pen = new Pen(
+                _ViewColor.GetColor((int)eCalendarWeekDayPart.DayHourBorder)))
+            {
+                int selCols = _SelectedColEnd - _SelectedColStart;
+
+                if (selCols > 0)
+                {
+                    Rectangle r = vRect;
+
+                    r.X += (int)(_SelectedColStart * BaseInterval * scale);
+                    r.Width = (int)(selCols * BaseInterval * scale);
+
+                    using (Brush br =
+                        _ViewColor.BrushPart((int)eCalendarWeekDayPart.DayOffWorkHoursBackground, r))
+                    {
+                        g.FillRectangle(br, r);
+                    }
+
+                    g.DrawRectangle(pen, r);
+                }
+
+                g.DrawLine(pen, vRect.Left, vRect.Y, vRect.Right, vRect.Y);
+            }
+        }
+
+        #endregion
+
+        #region GetCondensedViewPath
+
+        /// <summary>
+        /// Gets the condensed view display path
+        /// </summary>
+        /// <param name="scale">Scale factor</param>
+        /// <param name="vRect">Condensed view rect</param>
+        /// <returns>Path</returns>
+        private GraphicsPath GetCondensedViewPath(Rectangle vRect, float scale)
+        {
+            int pos = (int)(FirstVisibleColumn * BaseInterval * scale);
+            int width = (int)((BaseInterval * ClientRect.Width) / ColumnWidth * scale);
+
+            Rectangle r = new
+                Rectangle(ClientRect.X + pos, vRect.Y, width, vRect.Height);
+
+            r.Inflate(0, -1);
+
+            return (DisplayHelp.GetRoundedRectanglePath(r, 2, 2, 2, 2));
+        }
+
+        #endregion
+
+        #region DrawCondensedAppointments
+
+        /// <summary>
+        /// Draws condensed appointments
+        /// </summary>
+        /// <param name="g">Graphics</param>
+        /// <param name="scale">Scale factor</param>
+        private void DrawCondensedAppointments(Graphics g, float scale)
+        {
+            // Display each item
+
+            SmoothingMode saveMode = g.SmoothingMode;
+            g.SmoothingMode = SmoothingMode.None;
+
+            int dy = 3;
+
+            foreach (ColumnList clist in _CondensedColList)
+            {
+                for (int i = 0; i < clist.SList.Count; i++)
+                {
+                    for (int j = 0; j < clist.SList[i].Count; j++)
+                    {
+                        CalendarItem item = clist.SList[i][j].CItem;
+
+                        TimeSpan ts1 = item.StartTime - StartDate;
+                        TimeSpan ts2 = item.EndTime - item.StartTime;
+
+                        int pos = (int)(ts1.TotalMinutes * scale);
+                        int width = (int)(ts2.TotalMinutes * scale);
+
+                        if (width < 4)
+                            width = 4;
+
+                        Point pt1 = new Point(ClientRect.X + pos,
+                                              ClientRect.Bottom - CondensedLineHeight + (i * 3) + dy);
+
+                        Point pt2 = new Point(pt1.X + width, pt1.Y);
+
+                        using (Pen pen = GetCondensedPen(item.ModelItem))
+                            g.DrawLine(pen, pt1, pt2);
+                    }
+                }
+
+                dy += (clist.SList.Count * 3);
+            }
+
+            g.SmoothingMode = saveMode;
+        }
+
+        #region GetCondensedPen
+
+        /// <summary>
+        /// Gets the appointments condensed pen
+        /// </summary>
+        /// <param name="o">Appointment object</param>
+        /// <returns></returns>
+        private Pen GetCondensedPen(object o)
+        {
+            string category = null;
+
+            if (o is Appointment)
+                category = (o as Appointment).CategoryColor;
+
+            else if (o is CustomCalendarItem)
+                category = (o as CustomCalendarItem).CategoryColor;
+
+            if (category != null)
+            {
+                // Check to see if we have any user defined
+                // AppointmentCategoryColors
+
+                if (CalendarView.HasCategoryColors == true)
+                {
+                    AppointmentCategoryColor acc =
+                        CalendarView.CategoryColors[category];
+
+                    if (acc != null)
+                    {
+                        ColorDef cdef = acc.BackColor;
+
+                        return (new Pen(cdef.Colors[cdef.Colors.Length - 1], 2));
+                    }
+                }
+
+                if (category.Equals(Appointment.CategoryBlue))
+                    return (GetCategoryPen(eAppointmentPart.BlueBackground));
+
+                if (category.Equals(Appointment.CategoryGreen))
+                    return (GetCategoryPen(eAppointmentPart.GreenBackground));
+
+                if (category.Equals(Appointment.CategoryOrange))
+                    return (GetCategoryPen(eAppointmentPart.OrangeBackground));
+
+                if (category.Equals(Appointment.CategoryPurple))
+                    return (GetCategoryPen(eAppointmentPart.PurpleBackground));
+
+                if (category.Equals(Appointment.CategoryRed))
+                    return (GetCategoryPen(eAppointmentPart.RedBackground));
+
+                if (category.Equals(Appointment.CategoryYellow))
+                    return (GetCategoryPen(eAppointmentPart.YellowBackground));
+            }
+
+            return (GetCategoryPen(eAppointmentPart.DefaultBackground));
+        }
+
+        #endregion
+
+        #region GetCategoryPen
+
+        /// <summary>
+        /// GetCategoryPen
+        /// </summary>
+        /// <param name="part"></param>
+        /// <returns></returns>
+        private Pen GetCategoryPen(eAppointmentPart part)
+        {
+            ColorDef cdef = _appointmentColor.GetColorDef((int)part);
+
+            return (new Pen(cdef.Colors[cdef.Colors.Length - 1], 2));
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region DrawAppointments
+
+        /// <summary>
+        /// Draws TimeLine appointments
+        /// </summary>
+        /// <param name="e"></param>
+        private void DrawAppointments(ItemPaintArgs e)
+        {
+            List<CalendarItem> items = CalendarItems;
+
+            if (items.Count > 0)
+            {
+                // Loop through each CalendarItem in the week
+
+                int selItem = -1;
+
+                for (int i = 0; i < items.Count; i++)
+                {
+                    // If we can display the item, then initiate the paint
+
+                    if (items[i].Displayed == true)
+                    {
+                        if (e.ClipRectangle.IsEmpty ||
+                            e.ClipRectangle.IntersectsWith(items[i].DisplayRectangle))
+                        {
+                            if (items[i].IsSelected == true)
+                                selItem = i;
+                            else
+                                items[i].Paint(e);
+                        }
+                    }
+                }
+
+                if (selItem >= 0)
+                {
+                    for (int i = 0; i < items.Count; i++)
+                    {
+                        // If we can display the item, then initiate the paint
+
+                        if (items[i].Displayed == true)
+                        {
+                            if (e.ClipRectangle.IsEmpty ||
+                                e.ClipRectangle.IntersectsWith(items[i].DisplayRectangle))
+                            {
+                                if (items[i].IsSelected == true)
+                                    items[i].Paint(e);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region GetColRange
+
+        /// <summary>
+        /// Calculates the range of columns needed to be drawn
+        /// to satisfy the specified paint request
+        /// </summary>
+        /// <param name="e">ItemPaintArgs</param>
+        /// <param name="colStart">[out] Column start index</param>
+        /// <param name="colEnd">[out] Column end index</param>
+        /// <returns>Column range count (end - start)</returns>
+        private int GetColRange(ItemPaintArgs e, out int colStart, out int colEnd)
+        {
+            // Calc our starting index
+
+            int start = -_HScrollPos / ColumnWidth;
+            int x = ClientRect.X + start * ColumnWidth + _HScrollPos;
+
+            while (start < TimeLineColumnCount)
+            {
+                if (x + ColumnWidth > e.ClipRectangle.X)
+                    break;
+
+                x += ColumnWidth;
+
+                start++;
+            }
+
+            // Calc our ending index
+
+            int end = start;
+
+            while (end < TimeLineColumnCount)
+            {
+                if (x >= e.ClipRectangle.Right)
+                    break;
+
+                x += ColumnWidth;
+
+                end++;
+            }
+
+            end++;
+
+            // Set the user supplied 'out' values, and
+            // return the range count to the caller
+
+            if (end - start == 0)
+            {
+                colStart = 0;
+                colEnd = 0;
+
+                return (0);
+            }
+
+            colStart = start;
+            colEnd = end;
+
+            return (end - start);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetColRect
+
+        /// <summary>
+        /// Gets the display rectangle for the given column
+        /// </summary>
+        /// <param name="col">Column</param>
+        /// <returns>Display rectangle</returns>
+        private Rectangle GetColRect(int col)
+        {
+            Rectangle r = ClientRect;
+
+            r.X += ((col * ColumnWidth) + _HScrollPos);
+            r.Width = ColumnWidth;
+
+            r.Height -= 1;
+
+            if (ShowCondensed == true)
+                r.Height -= (CondensedLineHeight - 1);
+
+            return (r);
+        }
+
+        #endregion
+
+        #region GetCondensedRect
+
+        /// <summary>
+        /// Gets the CondensedView rectangle
+        /// </summary>
+        /// <returns>CondensedView rectangle</returns>
+        private Rectangle GetCondensedRect()
+        {
+            Rectangle r = ClientRect;
+
+            r.X += 1;
+            r.Width -= 1;
+
+            r.Y = r.Bottom - CondensedLineHeight;
+            r.Height = CondensedLineHeight - 1;
+
+            return (r);
+        }
+
+        #endregion
+
+        #region GetDateCol
+
+        /// <summary>
+        /// Gets the absolute column value for the given date
+        /// </summary>
+        /// <param name="selDate">Selection date</param>
+        /// <returns>Absolute column</returns>
+        private int GetDateCol(DateTime? selDate)
+        {
+            if (selDate.HasValue)
+            {
+                TimeSpan ts = selDate.Value - StartDate;
+
+                return (int)(ts.TotalMinutes / CalendarView.BaseInterval);
+            }
+
+            return (0);
+        }
+
+        #endregion
+
+        #region Mouse routines
+
+        #region MouseDown processing
+
+        /// <summary>
+        /// MouseDown event processing
+        /// </summary>
+        /// <param name="objArg"></param>
+        public override void InternalMouseDown(MouseEventArgs objArg)
+        {
+            // Forward on the event
+
+            base.InternalMouseDown(objArg);
+
+            if (objArg.Button == MouseButtons.Left)
+            {
+                if (IsTabMoving == false)
+                {
+                    // Locate where the event took place
+
+                    if (ClientRect.Contains(objArg.Location) == true)
+                    {
+                        if (PointInCondensedView(objArg.Location) == true)
+                        {
+                            // User is mousing in the CondensedView area
+
+                            MyCursor = Cursors.Hand;
+
+                            ProcessCvlButtonDown(objArg);
+
+                            IsCondMoving = true;
+                        }
+                        else
+                        {
+                            int col;
+
+                            if (GetPointItem(objArg.Location, out col, true) == true)
+                            {
+                                // User is mouseing in the Content area
+
+                                MyCursor = GetContentCursor();
+
+                                if (ProcessCilButtonDown(objArg) == false)
+                                    ProcessTvlButtonDown(col);
+
+                                IsMouseDown = true;
+                            }
+
+                            IsCopyDrag = false;
+                        }
+                    }
+                }
+            }
+        }
+
+        #region CondensedView MouseDown processing
+
+        /// <summary>
+        /// Handles CondensedView Left Button Down events
+        /// </summary>
+        /// <param name="objArg"></param>
+        private void ProcessCvlButtonDown(MouseEventArgs objArg)
+        {
+            ProcessCvlPoint(objArg);
+        }
+
+        #region ProcessCvlPoint
+
+        /// <summary>
+        /// Processes CondensedView point selection
+        /// </summary>
+        /// <param name="objArg"></param>
+        private void ProcessCvlPoint(MouseEventArgs objArg)
+        {
+            TimeSpan ts0 = EndDate - StartDate;
+
+            float scale = (float)((ClientRect.Width + 2) / ts0.TotalMinutes);
+            int width = (int)((BaseInterval * ClientRect.Width) / ColumnWidth * scale);
+
+            double x = (objArg.Location.X - ClientRect.X - (width / 2)) / scale;
+            int col = (int)(x / BaseInterval);
+
+            // Make sure we stay within our bounds, and
+            // then set our new scroll value accordingly
+
+            HScrollBarAdv hScrollBar = CalendarView.TimeLineHScrollPanel.ScrollBar;
+
+            if (col < hScrollBar.Minimum)
+                col = hScrollBar.Minimum;
+
+            if (col > hScrollBar.Maximum - hScrollBar.LargeChange)
+                col = hScrollBar.Maximum - hScrollBar.LargeChange;
+
+            hScrollBar.Value = col;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region CalendarItem MouseDown processing
+
+        /// <summary>
+        /// CalendarItem left mouseDown processing
+        /// </summary>
+        /// <param name="objArg">MouseEventArgs</param>
+        private bool ProcessCilButtonDown(MouseEventArgs objArg)
+        {
+            CalendarItem item = m_HotSubItem as CalendarItem;
+
+            if (item != null)
+            {
+                if (item.HitArea != CalendarItem.eHitArea.None)
+                {
+                    // Give the user a chance to cancel the
+                    // operation before it starts
+
+                    if (CalendarView.DoBeforeAppointmentViewChange(this, item,
+                        ((item.HitArea == CalendarItem.eHitArea.Move) ?
+                        eViewOperation.AppointmentMove : eViewOperation.AppointmentResize)) == false)
+                    {
+                        _LastBounds = item.Bounds;
+                        _LastPointOffset = objArg.Location;
+                        _LastMovePoint = objArg.Location;
+
+                        if (IsResizing == false && IsMoving == false)
+                        {
+                            OldStartTime = item.StartTime;
+                            OldEndTime = item.EndTime;
+                            OldOwnerKey = OwnerKey;
+                        }
+
+                        // Flag appropriate action
+
+                        if (item.HitArea == CalendarItem.eHitArea.LeftResize)
+                            IsStartResizing = true;
+
+                        else if (item.HitArea == CalendarItem.eHitArea.RightResize)
+                            IsEndResizing = true;
+
+                        else if (item.HitArea == CalendarItem.eHitArea.Move)
+                            IsMoving = true;
+
+                        // Update our initial PosWin display
+
+                        UpdatePosWin(ClientRect);
+                    }
+                }
+
+                return (true);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region TimeLineView MouseDown processing
+
+        /// <summary>
+        /// Handles TimeLineView left MouseDown events
+        /// </summary>
+        /// <param name="col">Column index</param>
+        private void ProcessTvlButtonDown(int col)
+        {
+            DateTime startDate = CalendarView.TimeLineAddInterval(StartDate, col);
+            DateTime endDate = CalendarView.TimeLineAddInterval(startDate, 1);
+
+            ExtendSelection(ref startDate, ref endDate);
+
+            CalendarView.DateSelectionStart = startDate;
+            CalendarView.DateSelectionEnd = endDate;
+
+            SelectedItem = null;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region MouseUp processing
+
+        /// <summary>
+        /// MouseUp event processing
+        /// </summary>
+        /// <param name="objArg">MouseEventArgs</param>
+        public override void InternalMouseUp(MouseEventArgs objArg)
+        {
+            base.InternalMouseUp(objArg);
+
+            // Cancel our scroll timer
+
+            CancelScrollTimer();
+        }
+
+        #endregion
+
+        #region MouseMove processing
+
+        /// <summary>
+        /// MouseMove event processing
+        /// </summary>
+        /// <param name="objArg">MouseEventArgs</param>
+        public override void InternalMouseMove(MouseEventArgs objArg)
+        {
+            // Forward on the event, but only if we are not in
+            // the middle of moving or resizing a CalendarItem
+
+            if (Control.MouseButtons == MouseButtons.None)
+                ClearMouseStates();
+
+            if (!IsMoving && !IsStartResizing && !IsEndResizing)
+                base.InternalMouseMove(objArg);
+
+            if (IsTabMoving == false)
+            {
+                if (IsCondMoving == true || PointInCondensedView(objArg.Location) == true)
+                {
+                    // The user in the CondensedView area
+
+                    MyCursor = Cursors.Hand;
+
+                    if (IsCondMoving == true)
+                        ProcessCvlMouseMove(objArg);
+                }
+                else
+                {
+                    // The user in the Content area
+
+                    MyCursor = GetContentCursor();
+
+                    if (objArg.Button == MouseButtons.Left)
+                        ProcessContentMove(objArg);
+                }
+            }
+        }
+
+        #region ProcessCvlMouseMove
+
+        /// <summary>
+        /// Handles CondensedView mouse moves
+        /// </summary>
+        /// <param name="objArg"></param>
+        private void ProcessCvlMouseMove(MouseEventArgs objArg)
+        {
+            ProcessCvlPoint(objArg);
+        }
+
+        #endregion
+
+        #region ProcessContentMove
+
+        /// <summary>
+        /// Processes content mouse moves
+        /// </summary>
+        /// <param name="objArg">MouseEventArgs</param>
+        private void ProcessContentMove(MouseEventArgs objArg)
+        {
+            // Locate where the event took place
+            // and process it accordingly
+
+            int col;
+
+            if (GetPointItem(objArg.Location, out col, false) == true)
+            {
+                // The col is visible, so no need to
+                // enable scrolling - just process the event
+
+                EnableViewScrolling(false);
+
+                ProcessMouseMove(col, objArg);
+            }
+            else if (IsMouseDown == true)
+            {
+                // Check to see if the user is performing
+                // a "DragDrop" operation
+
+                if (DragDropAppointment(objArg) == false)
+                {
+                    // The selected slice is not visible,
+                    // so we need to enable scrolling
+
+                    EnableViewScrolling(true);
+
+                    // Only process the event if the user is selecting
+                    // time cells (auto moving apps is intrusive looking)
+
+                    if (DateSelectionAnchor != null)
+                        ProcessMouseMove(col, objArg);
+                }
+            }
+        }
+
+        #region DragDropAppointment
+
+        /// <summary>
+        /// Initiates a user "DragDrop" operation - if enabled
+        /// </summary>
+        /// <param name="objArgs"></param>
+        /// <returns>True if operation started</returns>
+        private bool DragDropAppointment(MouseEventArgs objArgs)
+        {
+            if (IsMoving == true && CanDrag == true)
+            {
+                Point pt = objArgs.Location;
+                BaseView bv = CalendarView.GetViewFromPoint(pt);
+                TimeLineView tlv = bv as TimeLineView;
+
+                if (tlv != null && tlv != this)
+                {
+                    eViewArea area = bv.GetViewAreaFromPoint(pt);
+
+                    if (area == eViewArea.InContent)
+                    {
+                        if (CalendarView.DoAppointmentViewChanging(SelectedItem, tlv.OwnerKey, SelectedItem.StartTime,
+                            SelectedItem.EndTime, eViewOperation.AppointmentMove, IsNewCopyDrag) == false)
+                        {
+                            DragCopy();
+
+                            ClearMouseStates();
+                            CancelScrollTimer();
+
+                            if (PosWin != null)
+                                PosWin.Hide();
+
+                            AppointmentView av = SelectedItem as AppointmentView;
+
+                            if (av != null)
+                                return (tlv.DragAppointment(this, av));
+
+                            CustomCalendarItem ci = SelectedItem as CustomCalendarItem;
+
+                            if (ci != null)
+                                return (tlv.DragCustomItem(this, ci));
+                        }
+                    }
+                }
+            }
+
+            return (false);
+        }
+
+        #region DragCustomItem
+
+        private bool DragCustomItem(TimeLineView pv, CustomCalendarItem ci)
+        {
+            // Set the new owner and selected view, and
+            // recalc the new layout
+
+            ci.OwnerKey = OwnerKey;
+
+            NeedRecalcLayout = true;
+            RecalcSize();
+
+            CalendarView.SelectedOwnerIndex = this.DisplayedOwnerKeyIndex;
+
+            // Get the new view
+
+            CustomCalendarItem view = GetCustomCalendarItem(ci);
+
+            if (view != null)
+                SetNewDragItem(pv, view);
+
+            return (true);
+        }
+
+        #endregion
+
+        #region DragAppointment
+
+        /// <summary>
+        /// Drags the given appointment from one view to another
+        /// </summary>
+        /// <param name="pv">Previous view</param>
+        /// <param name="av">Item to drag</param>
+        private bool DragAppointment(TimeLineView pv, AppointmentView av)
+        {
+            // Set the new owner and selected view, and
+            // recalc the new layout
+
+            av.Appointment.OwnerKey = OwnerKey;
+
+            NeedRecalcLayout = true;
+            RecalcSize();
+
+            CalendarView.SelectedOwnerIndex = this.DisplayedOwnerKeyIndex;
+
+            // Get the new view
+
+            AppointmentView view = GetAppointmentView(av.Appointment);
+
+            if (view != null)
+                SetNewDragItem(pv, view);
+
+            return (true);
+        }
+
+        #endregion
+
+        #region SetNewDragItem
+
+        private void SetNewDragItem(TimeLineView pv, CalendarItem view)
+        {
+            _LastBounds = pv._LastBounds;
+            _LastMovePoint = pv._LastMovePoint;
+            _LastPointOffset = pv._LastPointOffset;
+
+            int dx = _LastPointOffset.X - _LastBounds.X;
+
+            CalendarView.CalendarPanel.InternalMouseMove(new
+                MouseEventArgs(MouseButtons.None, 0, view.Bounds.X + dx, view.Bounds.Y, 0));
+
+            MouseEventArgs args = new
+                MouseEventArgs(MouseButtons.Left, 1, view.Bounds.X + dx, view.Bounds.Y, 0);
+
+            IsMoving = true;
+
+            InternalMouseMove(args);
+            CalendarView.CalendarPanel.InternalMouseDown(args);
+
+            SelectedItem = view;
+
+            IsCopyDrag = true;
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region GetContentCursor
+        /// <summary>
+        /// Gets the cursor
+        /// </summary>
+        /// <returns>Cursor</returns>
+        private Cursor GetContentCursor()
+        {
+            CalendarItem item = m_HotSubItem as CalendarItem;
+
+            if (item != null)
+            {
+                switch (item.HitArea)
+                {
+                    case CalendarItem.eHitArea.LeftResize:
+                    case CalendarItem.eHitArea.RightResize:
+                        return (Cursors.SizeWE);
+
+                    case CalendarItem.eHitArea.Move:
+                        return (IsMoving ? Cursors.SizeAll : DefaultCursor);
+                }
+            }
+
+            return (DefaultCursor);
+        }
+
+        #endregion
+
+        #region ProcessMouseMove
+
+        /// <summary>
+        /// Processes user MouseMove
+        /// </summary>
+        /// <param name="col">DayColumn</param>
+        /// <param name="objArg"></param>
+        private void ProcessMouseMove(int col, MouseEventArgs objArg)
+        {
+            if (DateSelectionAnchor != null)
+            {
+                ProcessTvMouseMove(col);
+            }
+            else if (SelectedItem != null)
+            {
+                if (objArg.Location.Equals(_LastMovePoint) == false)
+                {
+                    if (IsMoving == true)
+                        ProcessItemMove(col, objArg);
+
+                    else if (IsStartResizing == true)
+                        ProcessItemLeftResize(col, objArg);
+
+                    else if (IsEndResizing == true)
+                        ProcessItemRightResize(col, objArg);
+
+                    _LastMovePoint = objArg.Location;
+                }
+            }
+        }
+
+        #endregion
+
+        #region ProcessTvMouseMove
+
+        /// <summary>
+        /// Processes TimeLineView mouseMove events
+        /// </summary>
+        /// <param name="col">Column</param>
+        private void ProcessTvMouseMove(int col)
+        {
+            if (DateSelectionAnchor != null)
+            {
+                DateTime date = CalendarView.TimeLineAddInterval(StartDate, col);
+
+                // Let the user select forwards or backwards
+
+                if (date >= DateSelectionAnchor)
+                {
+                    CalendarView.DateSelectionStart = DateSelectionAnchor.Value;
+                    CalendarView.DateSelectionEnd = CalendarView.TimeLineAddInterval(date, 1);
+                }
+                else
+                {
+                    CalendarView.DateSelectionStart = date;
+                    CalendarView.DateSelectionEnd = CalendarView.TimeLineAddInterval(DateSelectionAnchor.Value, 1);
+                }
+            }
+        }
+
+        #endregion
+
+        #region CalendarItem MouseMove processing
+
+        /// <summary>
+        /// Processes CalendarItem mouseMove events
+        /// </summary>
+        /// <param name="col">Column</param>
+        /// <param name="objArg">MouseEventArgs</param>
+        private void ProcessItemMove(int col, MouseEventArgs objArg)
+        {
+            // Calculate our new item date
+
+            DateTime newDate;
+
+            if (CalendarView.TimeLinePeriod == eTimeLinePeriod.Years)
+            {
+                newDate = StartDate.AddYears(
+                    GetDeltaYears(col, true, objArg));
+            }
+            else
+            {
+                newDate = StartDate.AddMinutes(
+                    GetDeltaMinutes(col, true, objArg));
+            }
+
+            if (newDate != SelectedItem.StartTime)
+            {
+                if (DragCopy() == false)
+                {
+                    TimeSpan ts = SelectedItem.EndTime - SelectedItem.StartTime;
+
+                    try
+                    {
+                        if (SelectedItem is CustomCalendarItem)
+                            CalendarView.CustomItems.BeginUpdate();
+                        else
+                            CalendarModel.BeginUpdate();
+
+                        // Make the move
+
+                        if (CalendarView.DoAppointmentViewChanging(SelectedItem, null, newDate,
+                            newDate + ts, eViewOperation.AppointmentMove, IsNewCopyDrag) == false)
+                        {
+                            SelectedItem.StartTime = newDate;
+                            SelectedItem.EndTime = newDate + ts;
+
+                            NeedRecalcLayout = true;
+                        }
+                    }
+                    finally
+                    {
+                        if (SelectedItem is CustomCalendarItem)
+                            CalendarView.CustomItems.EndUpdate();
+                        else
+                            CalendarModel.EndUpdate();
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region CalendarItem MouseResize processing
+
+        /// <summary>
+        /// Processes CalendarItem left resizing
+        /// </summary>
+        /// <param name="col">Column</param>
+        /// <param name="objArg"></param>
+        private void ProcessItemLeftResize(int col, MouseEventArgs objArg)
+        {
+            DateTime date = (CalendarView.TimeLinePeriod == eTimeLinePeriod.Years) ?
+                StartDate.AddYears(GetDeltaYears(col, true, objArg)) :
+                StartDate.AddMinutes(GetDeltaMinutes(col, true, objArg));
+
+            if (date < SelectedItem.EndTime && SelectedItem.StartTime != date)
+                ResizeItem(date, SelectedItem.EndTime);
+        }
+
+        /// <summary>
+        /// Processes CalendarItem right resizing
+        /// </summary>
+        /// <param name="col">Column</param>
+        /// <param name="objArg"></param>
+        private void ProcessItemRightResize(int col, MouseEventArgs objArg)
+        {
+            DateTime date = (CalendarView.TimeLinePeriod == eTimeLinePeriod.Years) ?
+                StartDate.AddYears(GetDeltaYears(col, false, objArg)) :
+                StartDate.AddMinutes(GetDeltaMinutes(col, false, objArg));
+
+            if (date > SelectedItem.StartTime && SelectedItem.EndTime != date)
+                ResizeItem(SelectedItem.StartTime, date);
+        }
+
+        /// <summary>
+        /// Initiates the resize of the selected item
+        /// </summary>
+        /// <param name="startTime"></param>
+        /// <param name="endTime"></param>
+        private void ResizeItem(DateTime startTime, DateTime endTime)
+        {
+            // Let the user cancel the operation if desired
+
+            if (CalendarView.DoAppointmentViewChanging(SelectedItem, null, startTime,
+                endTime, eViewOperation.AppointmentResize, IsNewCopyDrag) == false)
+            {
+                SelectedItem.StartTime = startTime;
+                SelectedItem.EndTime = endTime;
+
+                NeedRecalcLayout = true;
+            }
+        }
+
+        #endregion
+
+        #region GetDeltaMinutes
+
+        /// <summary>
+        /// Gets the change from the last offset (in minutes)
+        /// </summary>
+        /// <param name="col">Column</param>
+        /// <param name="left">Are we going left or right</param>
+        /// <param name="objArg">MouseEventArgs</param>
+        /// <returns>Change in mnutes</returns>
+        private double GetDeltaMinutes(int col, bool left, MouseEventArgs objArg)
+        {
+            // Calculate our delta minutes
+
+            Rectangle r = GetColRect(col);
+
+            double dm = (objArg.Location.X - _LastPointOffset.X);
+
+            dm += left ? _LastBounds.Left - r.Left
+                       : _LastBounds.Right - r.Right;
+
+            dm = BaseInterval * dm / ColumnWidth;
+
+            // If the Alt key is not pressed, then round
+            // our value off to the nearest column
+
+            if ((Control.ModifierKeys & Keys.Alt) != Keys.Alt)
+            {
+                col += (int)(dm / BaseInterval);
+                dm = 0;
+            }
+
+            dm += (col * BaseInterval);
+
+            // Make sure we don't cross our day boundaries
+
+            if (left == true)
+            {
+                if (dm < 0)
+                    dm = 0;
+            }
+            else
+            {
+                dm += BaseInterval;
+            }
+
+            return (dm);
+        }
+
+        #endregion
+
+        #region GetDeltaYears
+
+        /// <summary>
+        /// Gets the change from the last offset (in years)
+        /// </summary>
+        /// <param name="col">Column</param>
+        /// <param name="left">Are we going left or right</param>
+        /// <param name="objArg">MouseEventArgs</param>
+        /// <returns>Change in years</returns>
+        private int GetDeltaYears(int col, bool left, MouseEventArgs objArg)
+        {
+            // Calculate our delta minutes
+
+            Rectangle r = GetColRect(col);
+
+            int dm = (objArg.Location.X - _LastPointOffset.X);
+
+            dm += left ? _LastBounds.Left - r.Left
+                       : _LastBounds.Right - r.Right;
+
+            dm = CalendarView.TimeLineInterval * dm / ColumnWidth;
+
+            // If the Alt key is not pressed, then round
+            // our value off to the nearest column
+
+            if ((Control.ModifierKeys & Keys.Alt) != Keys.Alt)
+            {
+                col += dm / CalendarView.TimeLineInterval;
+                dm = 0;
+            }
+
+            dm += (col * CalendarView.TimeLineInterval);
+
+            // Make sure we don't cross our day boundaries
+
+            if (left == true)
+            {
+                if (dm < 0)
+                    dm = 0;
+            }
+            else
+            {
+                dm += CalendarView.TimeLineInterval;
+            }
+
+            return (dm);
+        }
+
+        #endregion
+
+        #region View Scrolling support
+
+        /// <summary>
+        /// Routine to enable or disable view scrolling
+        /// </summary>
+        /// <param name="enable">true to enable</param>
+        private void EnableViewScrolling(bool enable)
+        {
+            if (enable == true)
+            {
+                if (_ScrollViewTimer == null)
+                {
+                    _ScrollViewTimer = new Timer();
+
+                    _ScrollViewTimer.Interval = 10;
+                    _ScrollViewTimer.Tick += ScrollViewTimerTick;
+                    _ScrollViewTimer.Start();
+                }
+
+                _ScrollDwell = 0;
+            }
+            else
+            {
+                CancelScrollTimer();
+            }
+        }
+
+        /// <summary>
+        /// Cancels the view scroll timer
+        /// </summary>
+        private void CancelScrollTimer()
+        {
+            // Dispose of our scroll timer
+
+            if (_ScrollViewTimer != null)
+            {
+                _ScrollViewTimer.Stop();
+                _ScrollViewTimer.Tick -= ScrollViewTimerTick;
+
+                _ScrollViewTimer = null;
+            }
+        }
+
+        /// <summary>
+        /// Determines the amount to scroll (which is
+        /// based loosely upon the delta magnitude)
+        /// </summary>
+        /// <param name="delta">Point delta</param>
+        /// <returns>Scroll amount</returns>
+        private int ScrollAmount(int delta)
+        {
+            _ScrollDwell++;
+
+            int dx = Math.Abs(delta);
+            int n = (dx < 16 ? 8 : dx < 32 ? 4 : 1);
+
+            if (_ScrollDwell % n == 0)
+                return (delta < 0 ? -1 : 1);
+
+            return (0);
+        }
+
+        /// <summary>
+        /// Handles view scroll timer ticks
+        /// </summary>
+        /// <param name="sender">object</param>
+        /// <param name="e">EventArgs</param>
+        void ScrollViewTimerTick(object sender, EventArgs e)
+        {
+            Control c = (Control)this.GetContainerControl(true);
+
+            if (c != null)
+            {
+                // Calculate our delta
+
+                Point pt = c.PointToClient(Cursor.Position);
+                Rectangle r = ClientRect;
+
+                int n = r.X + (ClientRect.Width / ColumnWidth) * ColumnWidth;
+
+                int dx = (pt.X < r.Left) ? ScrollAmount(pt.X - r.Left) :
+                    (pt.X >= n) ? ScrollAmount(pt.X - n) : 0;
+
+                // Make sure we stay within our upper bounds
+
+                if (dx < 0)
+                {
+                    if (CalendarView.TimeLineHScrollPanel.ScrollBar.Value + dx < 0)
+                        dx = -CalendarView.TimeLineHScrollPanel.ScrollBar.Value;
+                }
+                else
+                {
+                    int maxValue = CalendarView.TimeLineHScrollPanel.ScrollBar.Maximum -
+                        CalendarView.TimeLineHScrollPanel.ScrollBar.LargeChange;
+
+                    if (CalendarView.TimeLineHScrollPanel.ScrollBar.Value + dx > maxValue)
+                        dx = maxValue - CalendarView.TimeLineHScrollPanel.ScrollBar.Value;
+                }
+
+                // Scroll if necessary
+
+                if (dx != 0)
+                {
+                    CalendarView.TimeLineHScrollPanel.ScrollBar.Value += dx;
+
+                    if (PosWin != null)
+                        PosWin.Hide();
+
+                    InternalMouseMove(new
+                        MouseEventArgs(MouseButtons.Left, 0, pt.X, pt.Y, 0));
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetPointItem
+
+        /// <summary>
+        /// Gets the item column at the given point
+        /// </summary>
+        /// <param name="pt">Point in question</param>
+        /// <param name="col">[out] Column</param>
+        /// <param name="partial">True if partial hits are ok</param>
+        /// <returns>True if valid item</returns>
+        private bool GetPointItem(Point pt, out int col, bool partial)
+        {
+            int start = -_HScrollPos / ColumnWidth;
+            int end = start + ClientRect.Width / ColumnWidth;
+
+            Rectangle r = GetColRect(start);
+
+            for (int i = start; i <= end; i++)
+            {
+                if (r.Contains(pt) == true)
+                {
+                    col = i;
+
+                    return (IsColVisible(r, partial));
+                }
+
+                r.X += ColumnWidth;
+            }
+
+            col = (pt.X < ClientRect.X) ? 0 : TimeLineColumnCount;
+
+            return (false);
+        }
+
+        /// <summary>
+        /// Determines if a given column is visible
+        /// </summary>
+        /// <param name="r">Display rectangle</param>
+        /// <param name="partial">True if partial visibility is ok</param>
+        /// <returns>True if visible</returns>
+        private bool IsColVisible(Rectangle r, bool partial)
+        {
+            if (partial == true)
+            {
+                if (r.Right < ClientRect.Left)
+                    return (false);
+
+                if (r.Left > ClientRect.Right)
+                    return (false);
+            }
+            else
+            {
+                if (r.Left < ClientRect.Left)
+                    return (false);
+
+                if (r.Right > ClientRect.Right)
+                    return (false);
+            }
+
+            return (true);
+        }
+
+        #endregion
+
+        #region PointInCondensedView
+
+        /// <summary>
+        /// Determines if the given point in in
+        /// the CondensedView area
+        /// </summary>
+        /// <param name="pt"></param>
+        /// <returns></returns>
+        private bool PointInCondensedView(Point pt)
+        {
+            if (ShowCondensed == true)
+                return (GetCondensedRect().Contains(pt));
+
+            return (false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InternalKeyDown
+
+        #region InternalKeyDown
+
+        /// <summary>
+        /// Processes KeyDown events
+        /// </summary>
+        /// <param name="objArg"></param>
+        public override void InternalKeyDown(KeyEventArgs objArg)
+        {
+            switch (objArg.KeyData)
+            {
+                case Keys.Up:
+                case Keys.Up | Keys.Shift:
+                case Keys.Up | Keys.Control:
+                case Keys.Up | Keys.Control | Keys.Shift:
+                    objArg.Handled = true;
+                    break;
+
+                case Keys.Down:
+                case Keys.Down | Keys.Shift:
+                case Keys.Down | Keys.Control:
+                case Keys.Down | Keys.Control | Keys.Shift:
+                    objArg.Handled = true;
+                    break;
+
+                case Keys.Left:
+                case Keys.Left | Keys.Shift:
+                case Keys.Left | Keys.Control:
+                case Keys.Left | Keys.Control | Keys.Shift:
+                    ProcessLeftRightKey(objArg, -1);
+                    break;
+
+                case Keys.Right:
+                case Keys.Right | Keys.Shift:
+                case Keys.Right | Keys.Control:
+                case Keys.Right | Keys.Control | Keys.Shift:
+                    ProcessLeftRightKey(objArg, 1);
+                    break;
+
+                case Keys.Home:
+                case Keys.Home | Keys.Shift:
+                case Keys.Home | Keys.Control:
+                case Keys.Home | Keys.Control | Keys.Shift:
+                    ProcessHomeKey(objArg);
+                    break;
+
+                case Keys.End:
+                case Keys.End | Keys.Shift:
+                case Keys.End | Keys.Control:
+                case Keys.End | Keys.Control | Keys.Shift:
+                    ProcessEndKey(objArg);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region ProcessLeftRightKey
+
+        /// <summary>
+        /// Processes Left and Right Key events
+        /// </summary>
+        /// <param name="objArg"></param>
+        /// <param name="dx"></param>
+        protected virtual void ProcessLeftRightKey(KeyEventArgs objArg, int dx)
+        {
+            if (ValidDateSelection())
+            {
+// ReSharper disable PossibleInvalidOperationException
+
+                DateTime startDate = CalendarView.DateSelectionStart.Value;
+                DateTime endDate = CalendarView.DateSelectionEnd.Value;
+
+                if (startDate.Equals(DateSelectionAnchor.Value) == true)
+                    startDate = CalendarView.TimeLineAddInterval(endDate, -1);
+
+// ReSharper restore PossibleInvalidOperationException
+
+                startDate = CalendarView.TimeLineAddInterval(startDate, dx);
+                endDate = CalendarView.TimeLineAddInterval(startDate, 1);
+
+                DateTime viewStart = CalendarView.TimeLineViewScrollStartDate;
+                DateTime viewEnd = CalendarView.TimeLineViewScrollEndDate;
+
+                if (startDate < viewStart)
+                {
+                    CalendarView.TimeLineViewScrollStartDate = startDate;
+                }
+                else if (endDate > viewEnd)
+                {
+                    CalendarView.TimeLineViewScrollStartDate =
+                        CalendarView.TimeLineAddInterval(CalendarView.TimeLineViewScrollStartDate, 1);
+                }
+
+                ExtendSelection(ref startDate, ref endDate);
+
+                CalendarView.DateSelectionStart = startDate;
+                CalendarView.DateSelectionEnd = endDate;
+            }
+
+            objArg.Handled = true;
+        }
+
+        #endregion
+
+        #region ProcessHomeKey
+
+        /// <summary>
+        /// Handles Home key events
+        /// </summary>
+        /// <param name="objArg"></param>
+        protected virtual void ProcessHomeKey(KeyEventArgs objArg)
+        {
+            DateTime startDate = CalendarView.TimeLineViewScrollStartDate;
+            DateTime endDate = CalendarView.TimeLineAddInterval(startDate, 1);
+
+            ExtendSelection(ref startDate, ref endDate);
+
+            CalendarView.DateSelectionStart = startDate;
+            CalendarView.DateSelectionEnd = endDate;
+
+            SelectedItem = null;
+
+            objArg.Handled = true;
+        }
+
+        #endregion
+
+        #region ProcessEndKey
+
+        /// <summary>
+        /// Processes End key events
+        /// </summary>
+        /// <param name="objArg"></param>
+        protected virtual void ProcessEndKey(KeyEventArgs objArg)
+        {
+            DateTime endDate = CalendarView.TimeLineViewScrollEndDate;
+            DateTime startDate = CalendarView.TimeLineAddInterval(endDate, -1);
+
+            ExtendSelection(ref startDate, ref endDate);
+
+            CalendarView.DateSelectionStart = startDate;
+            CalendarView.DateSelectionEnd = endDate;
+
+            SelectedItem = null;
+
+            objArg.Handled = true;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IDisposable Members
+
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing == true && IsDisposed == false)
+            {
+                ResetView();
+
+                WorkBrush = null;
+                OffWorkBrush = null;
+                SelectedBrush = null;
+
+                HookEvents(false);
+            }
+
+            base.Dispose(disposing);
+        }
+
+        #endregion
+    }
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/VScrollPanel.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/VScrollPanel.cs
new file mode 100644
index 00000000..9c3b32d5
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/VScrollPanel.cs	
@@ -0,0 +1,237 @@
+#if FRAMEWORK20
+using System;
+using System.Drawing;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Schedule
+{
+    public class VScrollPanel : BaseItem
+    {
+        #region Events
+        public event EventHandler<EventArgs> ScrollBarChanged;
+        #endregion
+
+        #region Variables
+
+        protected CalendarView CalendarView;    // CalendarView
+        private VScrollBarAdv _ScrollBar;       // Scroll bar
+
+        #endregion
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="calendarView"></param>
+        public VScrollPanel(CalendarView calendarView)
+        {
+            CalendarView = calendarView;
+
+            SetUpScrollBar();
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets and sets the panel Bounds
+        /// </summary>
+        public override Rectangle Bounds
+        {
+            get { return (base.Bounds); }
+
+            set
+            {
+                base.Bounds = value;
+
+                UpdateScrollBar();
+            }
+        } 
+
+        /// <summary>
+        /// Gets and sets the control visibility
+        /// </summary>
+        public override bool Visible
+        {
+            get { return (base.Visible); }
+
+            set
+            {
+                if (base.Visible != value)
+                {
+                    base.Visible = value;
+
+                    ScrollBar.Visible = value;
+
+                    if (value == true)
+                        ScrollBar.BringToFront();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets the scrollBar
+        /// </summary>
+        public VScrollBarAdv ScrollBar
+        {
+            get { return (_ScrollBar); }
+        }
+
+        #endregion
+
+        #region Private properties
+
+        /// <summary>
+        /// Gets the scrollBar SmallChange value
+        /// </summary>
+        protected virtual int ScrollPanelSmallChange
+        {
+            get { return (1); }
+        }
+
+        /// <summary>
+        /// Gets the scrollBar Maximum value
+        /// </summary>
+        protected virtual int ScrollPanelMaximum
+        {
+            get { return (100); }
+        }
+
+        #endregion
+
+        #region SetupScrollBar
+
+        /// <summary>
+        /// Performs scrollBar setup
+        /// </summary>
+        private void SetUpScrollBar()
+        {
+            _ScrollBar = new VScrollBarAdv();
+
+            Control c = (Control)CalendarView.CalendarPanel.GetContainerControl(true);
+
+            if (c != null)
+                c.Controls.Add(_ScrollBar);
+
+            _ScrollBar.ValueChanged += ValueChanged;
+
+            UpdateScrollBar();
+        }
+
+        #endregion
+
+        #region UpdateScrollBar
+
+        /// <summary>
+        /// Updates our scrollbar
+        /// </summary>
+        internal void UpdateScrollBar()
+        {
+            _ScrollBar.Location = Bounds.Location;
+            _ScrollBar.Height = Bounds.Height;
+            _ScrollBar.Width = Bounds.Width;
+
+            _ScrollBar.LargeChange = Bounds.Height;
+            _ScrollBar.SmallChange = 1;
+            _ScrollBar.SmallChange = ScrollPanelSmallChange;
+            _ScrollBar.Maximum = ScrollPanelMaximum;
+
+            int n = _ScrollBar.Maximum - _ScrollBar.LargeChange + 1;
+
+            if (n < 0)
+            {
+                _ScrollBar.Maximum = Bounds.Height;
+                _ScrollBar.Value = 0;
+
+                _ScrollBar.Enabled = false;
+            }
+            else
+            {
+                _ScrollBar.Enabled = true;
+
+                if (_ScrollBar.Value > n)
+                    _ScrollBar.Value = n;
+                else
+                    Refresh();
+            }
+
+            OnScrollBarUpdate();
+        }
+
+        #endregion
+
+        #region DisableScrollBar
+
+        /// <summary>
+        /// Disables the scrollbar
+        /// </summary>
+        internal void DisableScrollBar()
+        {
+            _ScrollBar.Location = Bounds.Location;
+            _ScrollBar.Height = Bounds.Height;
+
+            _ScrollBar.LargeChange = Bounds.Height;
+            _ScrollBar.SmallChange = 1;
+            _ScrollBar.SmallChange = ScrollPanelSmallChange;
+            _ScrollBar.Maximum = Bounds.Height;
+
+            _ScrollBar.Value = 0;
+            _ScrollBar.Enabled = false;
+
+            OnScrollBarUpdate();
+        }
+
+        #endregion
+
+        #region ValueChanged
+
+        /// <param name="sender">object</param>
+        /// <param name="e">EventArgs</param>
+        void ValueChanged(object sender, EventArgs e)
+        {
+            OnScrollBarUpdate();
+        }
+
+        /// <summary>
+        /// Passes the scroll onto others
+        /// </summary>
+        private void OnScrollBarUpdate()
+        {
+            if (ScrollBarChanged != null)
+                ScrollBarChanged(this, EventArgs.Empty);
+        }
+
+        #endregion
+
+        #region IDisposable Members
+
+        protected override void Dispose(bool disposing)
+        {
+            if (_ScrollBar != null)
+            {
+                _ScrollBar.ValueChanged -= ValueChanged;
+                _ScrollBar.Dispose();
+            }
+
+            base.Dispose(disposing);
+        }
+
+        #endregion
+
+        #region Paint
+
+        public override void  Paint(ItemPaintArgs p)
+        {
+        }
+
+        #endregion
+
+        #region Copy
+
+        public override BaseItem Copy()
+        {
+            return (null);
+        }
+
+        #endregion
+    }
+}
+#endif
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/WeekView/AllDayPanel.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/WeekView/AllDayPanel.cs
new file mode 100644
index 00000000..e23b7f5c
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/WeekView/AllDayPanel.cs	
@@ -0,0 +1,613 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Schedule
+{
+    public class AllDayPanel : BaseItem
+    {
+        #region Private variables
+
+        private WeekDayView _WeekDayView;       // Assoc WeekDayView
+
+        private List<CalendarItem>              // CalendarItems list
+            _CalendarItems = new List<CalendarItem>();
+
+        private VScrollBarAdv _VScrollBar;      // Vertical scroll bar
+        private int _VScrollPos;                // Vertical scrollbar pos
+
+        private int _PanelHeight;               // Panel height (current)
+        private int _MaximumPanelHeight;        // Panel height (max)
+
+        #endregion
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="weekDayView">WeekDayView</param>
+        public AllDayPanel(WeekDayView weekDayView)
+        {
+            // Save the provided weekDayView and
+            // tell the system we are a container
+
+            _WeekDayView = weekDayView;
+
+            SetIsContainer(true);
+
+            SubItems.AllowParentRemove = false;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets and sets the panel bounding rectangle
+        /// </summary>
+        public override Rectangle Bounds
+        {
+            get { return (base.Bounds); }
+
+            set
+            {
+                base.Bounds = value;
+
+                UpdateVScrollBar();
+            }
+        }
+
+        /// <summary>
+        /// Gets the DayPanel Height
+        /// </summary>
+        public int PanelHeight
+        {
+            get { return (_PanelHeight); }
+        }
+
+        /// <summary>
+        /// Gets the panel's CalendarItem list
+        /// </summary>
+        public List<CalendarItem> CalendarItems
+        {
+            get { return (_CalendarItems); }
+        }
+
+        /// <summary>
+        /// Gets WeekDayView
+        /// </summary>
+        public WeekDayView WeekDayView
+        {
+            get { return (_WeekDayView); }
+        }
+
+        #endregion
+
+        #region Private properties
+        
+        /// <summary>
+        /// gets the Fixed AllDayPanel height
+        /// </summary>
+        private int FixedAllDayPanelHeight
+        {
+            get { return (_WeekDayView.CalendarView.FixedAllDayPanelHeight); }
+        }
+
+        /// <summary>
+        /// gets the Maximum AllDayPanel height
+        /// </summary>
+        private int MaximumAllDayPanelHeight
+        {
+            get { return (_WeekDayView.CalendarView.MaximumAllDayPanelHeight); }
+        }
+
+        /// <summary>
+        /// Gets the Appointment height
+        /// </summary>
+        private int AppointmentPadding
+        {
+            get { return (6); }
+        }
+
+        /// <summary>
+        /// Gets the width of a vertical scrollbar
+        /// </summary>
+        private int VsWidth
+        {
+            get { return (SystemInformation.VerticalScrollBarWidth); }
+        }
+
+        #endregion
+
+        #region RecalcSize
+
+        /// <summary>
+        /// Performs panel recalc support
+        /// </summary>
+        public override void RecalcSize()
+        {
+            // Reset our panel heights
+
+            _PanelHeight = 0;
+            _MaximumPanelHeight = 0;
+
+            if (_CalendarItems.Count > 0)
+            {
+                // Sort the items
+
+                List<CalendarItem> items = SortCalendarItems();
+
+                // Go through our CalendarItems on a per column basis
+                // accumulating extended appointment data
+
+                ulong[] acc = new ulong[DaysInWeek];
+
+                int maxAcc = -1;
+
+                for (int i = 0; i < items.Count; i++)
+                {
+                    int freeAcc = CalcAppointmentBounds(items[i], acc);
+
+                    if (freeAcc > maxAcc)
+                        maxAcc = freeAcc;
+                }
+
+                // Determine our current panel height from our processed data
+
+                if (_WeekDayView.CalendarView.IsMultiCalendar == false)
+                {
+                    _MaximumPanelHeight = (maxAcc + 1) * _WeekDayView.AppointmentHeight;
+
+                    // Set out current and maximum panel heights
+
+                    _MaximumPanelHeight += AppointmentPadding;
+                    _PanelHeight = _MaximumPanelHeight;
+
+                    if (_PanelHeight > MaximumAllDayPanelHeight)
+                        _PanelHeight = MaximumAllDayPanelHeight;
+                }
+            }
+
+            // Take into account the FixedAllDayPanelHeight setting
+
+            if (_WeekDayView.CalendarView.IsMultiCalendar == true)
+            {
+                _PanelHeight = (FixedAllDayPanelHeight >= 0) ? FixedAllDayPanelHeight : 50;
+                _MaximumPanelHeight = _PanelHeight;
+            }
+            else if (FixedAllDayPanelHeight >= 0)
+            {
+                _PanelHeight = FixedAllDayPanelHeight;
+            }
+
+            HeightInternal = _PanelHeight;
+
+            base.RecalcSize();
+        }
+
+        #region SortCalendarItems
+
+        /// <summary>
+        /// Sorts the CalendarItems
+        /// </summary>
+        private List<CalendarItem> SortCalendarItems()
+        {
+            List<CalendarItem> items =
+                new List<CalendarItem>(_CalendarItems.Count);
+
+            items.AddRange(_CalendarItems);
+
+            items.Sort(
+
+               delegate(CalendarItem c1, CalendarItem c2)
+               {
+                   if (c1.StartTime > c2.StartTime)
+                       return (1);
+
+                   if (c1.StartTime < c2.StartTime)
+                       return (-1);
+
+                   if (c1.EndTime > c2.EndTime)
+                       return (-1);
+
+                   if (c1.EndTime < c2.EndTime)
+                       return (1);
+
+                    return (0);
+               }
+            );
+
+            return (items);
+        }
+
+        #endregion
+
+        #region CalcAppointmentBounds
+
+        const int DaysInWeek = 7;
+
+        /// <summary>
+        /// Calculates the display bounds for the AppointmentView
+        /// </summary>
+        /// <param name="item">CalendarItem</param>
+        /// <param name="acc">Row accumulator</param>
+        private int CalcAppointmentBounds(CalendarItem item, ulong[] acc)
+        {
+            // Determine the starting day index for
+            // the given appointment
+
+            int ns = GetDayIndex(item);
+
+            // Calculate the top and height for the item
+
+            Rectangle r = _WeekDayView.DayColumns[ns].Bounds;
+
+            r.Width = 0;
+
+            r.Y = _WeekDayView.ClientRect.Y + _WeekDayView.DayOfWeekHeaderHeight + _VScrollPos + 2;
+            r.Height = _WeekDayView.AppointmentHeight;
+
+            int maxAcc = -1;
+
+            // Determine the ending day index
+
+            DateTime st = _WeekDayView.DayColumns[ns].Date;
+
+            int ne = ns + (item.EndTime - st).Days;
+
+            if (item.EndTime.Hour > 0 || item.EndTime.Minute > 0 || item.EndTime.Second > 0)
+                ne++;
+
+            if (ne > DaysInWeek)
+                ne = DaysInWeek;
+
+            int freeAcc = GetFreeAcc(ns, ne, acc);
+
+            if (freeAcc >= 0)
+            {
+                ulong u = (1ul << freeAcc);
+
+                for (int i = ns; i < ne; i++)
+                {
+                    if (i < _WeekDayView.NumberOfColumns)
+                        r.Width += _WeekDayView.DayColumns[i].Bounds.Width;
+
+                    acc[i] |= u;
+                }
+
+                r.Y += (freeAcc * _WeekDayView.AppointmentHeight);
+
+                if (freeAcc > maxAcc)
+                    maxAcc = freeAcc;
+            }
+            else
+            {
+                r.Y = _WeekDayView.DayColumns[0].Bounds.Bottom;
+            }
+
+            DateTime start = _WeekDayView.DayColumns[0].Date;
+            DateTime end = _WeekDayView.DayColumns[_WeekDayView.DayColumns.Length - 1].Date;
+
+            // Check to see if we can only display
+            // a partial representation for the view
+
+            if (item.EndTime >= start && item.StartTime < end)
+            {
+                int hpad = 4;
+
+                if (item.StartTime >= start)
+                {
+                    r.X += hpad;
+                    r.Width -= hpad;
+                }
+
+                if (item.EndTime <= end)
+                    r.Width -= hpad;
+            }
+
+            // Now that we have calculated the items height and
+            // width, invoke a Recalc on the item
+
+            item.WidthInternal = r.Width;
+            item.HeightInternal = r.Height - 1;
+
+            item.RecalcSize();
+
+            // Set our bounds for the item
+
+            r.Width = item.WidthInternal;
+            r.Height = item.HeightInternal;
+
+            item.Bounds = r;
+
+            // Set it's display state
+
+            item.Displayed = true;
+
+            return (maxAcc);
+        }
+
+        #region GetFreeAcc
+
+        private int GetFreeAcc(int ns, int ne, ulong[] acc)
+        {
+            for (int i = 0; i < sizeof(ulong) * 8; i++)
+            {
+                if (CheckFreeAcc(ns, ne, acc, i) == true)
+                    return (i);
+            }
+
+            return (-1);
+        }
+
+        #region CheckFreeAcc
+
+        private bool CheckFreeAcc(int ns, int ne, ulong[] acc, int n)
+        {
+            for (int i = ns; i < ne; i++)
+            {
+                ulong u = acc[i];
+
+                if ((u & (1ul << n)) != 0)
+                    return (false);
+            }
+
+            return (true);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetDayIndex
+
+        /// <summary>
+        /// Gets the starting day index for the given appointment
+        /// </summary>
+        /// <returns>Day of week index (0-6)</returns>
+        private int GetDayIndex(CalendarItem item)
+        {
+            DateTime date = _WeekDayView.DayColumns[0].Date;
+
+            for (int i = 0; i < _WeekDayView.DayColumns.Length; i++)
+            {
+                date = date.AddDays(1);
+
+                if (date > item.StartTime)
+                    return (i);
+            }
+
+            return (0);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region Scrollbar routines
+
+        #region UpdateVScrollBar
+
+        /// <summary>
+        /// Updates our vertical scrollbar
+        /// </summary>
+        private void UpdateVScrollBar()
+        {
+            if (_PanelHeight > 0 && _PanelHeight < _MaximumPanelHeight)
+            {
+                // If we don't have one already, allocate it
+
+                if (_VScrollBar == null)
+                {
+                    _VScrollBar = new VScrollBarAdv();
+                    _VScrollBar.Width = VsWidth;
+
+                    Control c = (Control)this.GetContainerControl(true);
+
+                    if (c != null)
+                        c.Controls.Add(_VScrollBar);
+
+                    _VScrollBar.ValueChanged += _VExtScrollBar_ValueChanged;
+                }
+
+                // Initialize the scrollbar
+
+                _VScrollBar.Location = new Point(Bounds.Right + 1, Bounds.Y);
+                _VScrollBar.Height = _PanelHeight;
+
+                _VScrollBar.SmallChange = _PanelHeight / 2;
+                _VScrollBar.LargeChange = _WeekDayView.AppointmentHeight * 2;
+
+                _VScrollBar.Maximum = _MaximumPanelHeight -
+                    _VScrollBar.Height + _VScrollBar.LargeChange;
+
+                if (_VScrollBar.Visible == false)
+                {
+                    _VScrollPos = 0;
+                    _VScrollBar.Value = 0;
+
+                    _VScrollBar.Show();
+                    _VScrollBar.BringToFront();
+                }
+                else
+                {
+                    if (_VScrollBar.Value > _VScrollBar.Maximum - _VScrollBar.LargeChange)
+                        _VScrollBar.Value = _VScrollBar.Maximum - _VScrollBar.LargeChange;
+                }
+
+                _VScrollBar.Refresh();
+            }
+            else if (_VScrollBar != null)
+            {
+                _VScrollPos = 0;
+
+                _VScrollBar.ValueChanged -= _VExtScrollBar_ValueChanged;
+
+                _VScrollBar.Dispose();
+                _VScrollBar = null;
+            }
+        }
+
+        #endregion
+
+        #region _VExtScrollBar_ValueChanged
+
+        /// <summary>
+        /// Processes Extended appointments scrollBar changes
+        /// </summary>
+        /// <param name="sender">object</param>
+        /// <param name="e">EventArgs</param>
+        void _VExtScrollBar_ValueChanged(object sender, EventArgs e)
+        {
+            int vdelta = -_VScrollBar.Value - _VScrollPos;
+
+            if (vdelta != 0)
+            {
+                _VScrollPos = -_VScrollBar.Value;
+
+                // Now that we have calculated the items height and
+                // width, invoke a Recalc on the item
+
+                for (int i = 0; i < _CalendarItems.Count; i++)
+                {
+                    CalendarItem item = _CalendarItems[i];
+
+                    Rectangle r = item.Bounds;
+                    r.Y += vdelta;
+
+                    item.Bounds = r;
+                }
+
+                Refresh();
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Reset / update view
+
+        /// <summary>
+        /// Resets the AllDayPanel view
+        /// </summary>
+        public void ResetView()
+        {
+            _VScrollPos = 0;
+
+            if (_VScrollBar != null)
+            {
+                _VScrollBar.ValueChanged -= _VExtScrollBar_ValueChanged;
+                _VScrollBar.Dispose();
+                _VScrollBar = null;
+            }
+        }
+
+        /// <summary>
+        /// Updates the AllDayPanel view
+        /// </summary>
+        public void UpdateView()
+        {
+            if (_WeekDayView.IsViewSelected == true)
+            {
+                if (_VScrollBar != null)
+                    _VScrollBar.Show();
+            }
+            else
+            {
+                if (_VScrollBar != null)
+                    _VScrollBar.Hide();
+            }
+        }
+
+        #endregion
+
+        #region Paint processing
+
+        /// <summary>
+        /// Draws extended appointments
+        /// </summary>
+        /// <param name="e">ItemPaintArgs</param>
+        public override void Paint(ItemPaintArgs e)
+        {
+            Graphics g = e.Graphics;
+
+            if (e.ClipRectangle.IntersectsWith(Bounds))
+            {
+                Region regSave = g.Clip;
+                g.SetClip(Bounds, CombineMode.Intersect);
+
+                using (Brush br =
+                    _WeekDayView.WeekDayColor.BrushPart(
+                        (int) eCalendarWeekDayPart.DayAllDayEventBackground, Bounds))
+                {
+                    g.FillRectangle(br, Bounds);
+                }
+
+                using (Pen pen = new Pen(
+                    _WeekDayView.WeekDayColor.GetColor((int) eCalendarWeekDayPart.DayViewBorder)))
+                {
+                    g.DrawLine(pen, Bounds.X, Bounds.Y, Bounds.X, Bounds.Bottom);
+                    g.DrawLine(pen, Bounds.Right - 1, Bounds.Y, Bounds.Right - 1, Bounds.Bottom);
+                }
+
+                // Loop through each day in each week, displaying
+                // the associated day content
+
+                int selItem = -1;
+
+                for (int i = 0; i < _CalendarItems.Count; i++)
+                {
+                    // Initiate the paint
+
+                    if (_CalendarItems[i].Displayed == true)
+                    {
+                        if (_CalendarItems[i].IsSelected == true)
+                            selItem = i;
+                        else
+                            _CalendarItems[i].Paint(e);
+                    }
+                }
+
+                if (selItem >= 0)
+                    _CalendarItems[selItem].Paint(e);
+
+                // Restore the original clip region
+
+                g.Clip = regSave;
+            }
+        }
+
+        #endregion
+
+        #region Copy implementation
+
+        /// <summary>
+        /// Returns copy of the item.
+        /// </summary>
+        public override BaseItem Copy()
+        {
+            AllDayPanel objCopy = new AllDayPanel(WeekDayView);
+            CopyToItem(objCopy);
+
+            return (objCopy);
+        }
+
+        /// <summary>
+        /// Copies the AllDayPanel specific properties to new instance of the item.
+        /// </summary>
+        /// <param name="copy">New AllDayPanel instance</param>
+        protected override void CopyToItem(BaseItem copy)
+        {
+            AllDayPanel objCopy = copy as AllDayPanel;
+            base.CopyToItem(objCopy);
+        }
+
+        #endregion
+
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/WeekView/ColumnList.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/WeekView/ColumnList.cs
new file mode 100644
index 00000000..167cb6c1
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/WeekView/ColumnList.cs	
@@ -0,0 +1,319 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using DevComponents.Schedule.Model;
+
+namespace DevComponents.DotNetBar.Schedule
+{
+    public class ColumnList
+    {
+        #region Private variables
+
+        private List<List<SlotItem>> _SList = new List<List<SlotItem>>();
+        private int _Id;
+
+        #endregion
+
+        public ColumnList()
+        {
+        }
+
+        public ColumnList(int id)
+        {
+            _Id = id;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the column slot Id
+        /// </summary>
+        public int Id
+        {
+            get { return (_Id); }
+            set { _Id = value; }
+        }
+
+        /// <summary>
+        /// Gets the column slot list
+        /// </summary>
+        public List<List<SlotItem>> SList
+        {
+            get { return (_SList); }
+        }
+
+        #endregion
+
+        #region Public methods
+
+        #region AddColumnSlot
+
+        /// <summary>
+        /// Adds a CalendarItem to the running slot list
+        /// </summary>
+        /// <param name="item">CalendarItem to add</param>
+        /// <param name="n">Slot level to add the item to</param>
+        /// <returns>The added slot item</returns>
+        public SlotItem AddColumnSlot(CalendarItem item, int n)
+        {
+            // Add a new SlotItem list if we have exceeded
+            // the current list count
+
+            if (n >= _SList.Count)
+                _SList.Add(new List<SlotItem>());
+
+            // Determine whether this item can fit in the
+            // the slot list at the current level
+
+            SlotItem si = GetColumnSlot(item, n);
+
+            if (si != null)
+            {
+                // The item won't fit, so allocate a new slot
+                // item and add it to the list
+
+                si.AddPeerSlot(
+                    AddColumnSlot(item, n + 1), n + 1);
+            }
+            else
+            {
+                // The item will fit, so add it to the list
+
+                si = new SlotItem(item);
+
+                _SList[n].Add(si);
+
+                // Look ahead to see it we have a peer slot
+                // in a future slot list
+
+                while (n + 1 < _SList.Count)
+                {
+                    n++;
+
+                    SlotItem ni = GetColumnSlot(item, n);
+
+                    if (ni != null)
+                    {
+                        si.AddPeerSlot(ni, n);
+                        break;
+                    }
+                }
+            }
+
+            // Return the added slot item
+
+            return (si);
+        }
+
+        /// <summary>
+        /// Returns the SlotItem (if present) in the given list for
+        /// the CalendarItem in question
+        /// </summary>
+        /// <param name="item">CalendarItem</param>
+        /// <param name="n">Slot level to scan</param>
+        /// <returns>SlotItem, if found</returns>
+        private SlotItem GetColumnSlot(CalendarItem item, int n)
+        {
+            if (n < _SList.Count)
+            {
+                // Loop through each SlotItem at the given
+                // level, looking for an intersection with the
+                // given CalendarItem
+
+                List<SlotItem> list = _SList[n];
+
+                for (int i = 0; i < list.Count; i++)
+                {
+                    SlotItem si = list[i];
+
+                    DateTime start = item.StartTime > si.CItem.StartTime ? item.StartTime : si.CItem.StartTime;
+                    DateTime end = item.EndTime < si.CItem.EndTime ? item.EndTime : si.CItem.EndTime;
+
+                    // If we found an item, return it
+
+                    if ((start < end) || 
+                        (start <= end && ( item.StartTime == item.EndTime || si.CItem.StartTime == si.CItem.EndTime)))
+                        return (si);
+                }
+            }
+
+            // Nothing currently at that slot
+
+            return (null);
+        }
+
+        #endregion
+
+        #region CountColumns
+
+        /// <summary>
+        /// Counts the number of columns for
+        /// each column zero entry slot lists
+        /// </summary>
+        public void CountColumns()
+        {
+            if (_SList.Count > 0)
+            {
+                for (int i = 0; i < _SList[0].Count; i++)
+                {
+                    SlotItem si = _SList[0][i];
+
+                    SetColumnCount(si, GetColumnCount(si, 1));
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets the max column count from all
+        /// zero level slot paths
+        /// </summary>
+        /// <param name="si">Initial SlotItem</param>
+        /// <param name="count">Running level count</param>
+        /// <returns></returns>
+        private int GetColumnCount(SlotItem si, int count)
+        {
+            if (si.Count > 0)
+                return (si.Count);
+
+            int maxCount = count;
+
+            if (si.SList != null)
+            {
+                for (int i = 0; i < si.SList.Count; i++)
+                {
+                    int c = GetColumnCount(si.SList[i], count + 1);
+
+                    if (c > maxCount)
+                        maxCount = c;
+                }
+            }
+
+            return (maxCount);
+        }
+
+        /// <summary>
+        /// Sets all column entry counts to the given
+        /// count
+        /// </summary>
+        /// <param name="si">Initial SlotItem</param>
+        /// <param name="count">Count</param>
+        private void SetColumnCount(SlotItem si, int count)
+        {
+            if (si.SList != null)
+            {
+                for (int i = 0; i < si.SList.Count; i++)
+                    SetColumnCount(si.SList[i], count);
+            }
+
+            if (si.Count == 0)
+                si.Count = count;
+        }
+
+        #endregion
+
+        #region Clear
+
+        /// <summary>
+        /// Clears the Column slot list
+        /// </summary>
+        public void Clear()
+        {
+            _SList.Clear();
+        }
+
+        #endregion
+
+        #endregion
+    }
+
+    #region SlotItem class definition
+
+    public class SlotItem
+    {
+        #region Private variables
+
+        private CalendarItem _CItem;        // CalendarItem
+        private List<SlotItem> _SList;      // List of peer SlotItems
+        private int _Count;                 // Count of peer items
+        private int _Column;
+
+        #endregion
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="cItem">CalendarItem</param>
+        public SlotItem(CalendarItem cItem)
+        {
+            _CItem = cItem;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets and sets the slots CalendarItem
+        /// </summary>
+        public CalendarItem CItem
+        {
+            get { return (_CItem); }
+            set { _CItem = value; }
+        }
+
+        /// <summary>
+        /// Gets the peer SlotItem list
+        /// </summary>
+        public List<SlotItem> SList
+        {
+            get { return (_SList); }
+        }
+
+        /// <summary>
+        /// Gets and sets the peer level count
+        /// </summary>
+        public int Count
+        {
+            get { return (_Count); }
+            set { _Count = value; }
+        }
+
+        /// <summary>
+        /// Gets and sets the peer column
+        /// </summary>
+        public int Column
+        {
+            get { return (_Column); }
+            set { _Column = value; }
+        }
+
+        #endregion
+
+        #region Public methods
+
+        /// <summary>
+        /// Adds a slot to the peer SlotItem list
+        /// </summary>
+        /// <param name="si">SlotItem to add</param>
+        /// <param name="column">Slot column</param>
+        public void AddPeerSlot(SlotItem si, int column)
+        {
+            if (si != null)
+            {
+                if (_SList == null)
+                    _SList = new List<SlotItem>();
+
+                if (_SList.Contains(si) == false)
+                {
+                    si.Column = column;
+
+                    _SList.Add(si);
+                }
+            }
+        }
+
+        #endregion
+    }
+
+    #endregion
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/WeekView/DayColumn.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/WeekView/DayColumn.cs
new file mode 100644
index 00000000..9754df62
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/WeekView/DayColumn.cs	
@@ -0,0 +1,212 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using DevComponents.Schedule.Model;
+
+namespace DevComponents.DotNetBar.Schedule
+{
+    public class DayColumn
+    {
+        #region Consts
+
+        public const int NumberOfTimeSlices = 48;
+
+        #endregion
+
+        #region Private variables
+
+        private Rectangle _Bounds;          // Slot bounding rectangle
+
+        private DateTime _Date;             // Column date
+
+        private float _TimeSliceHeight;       // TimeSlice height
+
+        private WorkTime _BusyStartTime;    // Busy time
+        private WorkTime _BusyEndTime;
+
+        private WorkTime _WorkStartTime;    // Work time
+        private WorkTime _WorkEndTime;
+
+        private List<CalendarItem>          // Column CalendarItems
+            _CalendarItems = new List<CalendarItem>();
+
+        private bool _NeedRecalcLayout = true;
+
+        #endregion
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="timeSliceHeight">Slice height</param>
+        public DayColumn(float timeSliceHeight)
+        {
+            _TimeSliceHeight = timeSliceHeight;
+        }
+
+        #region Public properties
+
+        #region BoundingRect
+
+        /// <summary>
+        /// Gets and sets the week bounding Rectangle
+        /// </summary>
+        public Rectangle Bounds
+        {
+            get { return (_Bounds); }
+
+            set
+            {
+                if (_Bounds.Equals(value) == false)
+                {
+                    int yOffset = value.Y - _Bounds.Y;
+
+                    _Bounds = value;
+
+                    if (yOffset != 0)
+                        OffsetItemRects(yOffset);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Offsets the bounding rectangles for the
+        /// DayColumn's non-extended appointments
+        /// </summary>
+        /// <param name="yOffset">Amount to offset</param>
+        private void OffsetItemRects(int yOffset)
+        {
+            for (int i = 0; i < _CalendarItems.Count; i++)
+            {
+                Rectangle r = _CalendarItems[i].Bounds;
+
+                r.Y += yOffset;
+
+                _CalendarItems[i].Bounds = r;
+            }
+        }
+
+        #endregion
+
+        #region Date
+
+        /// <summary>
+        /// Gets and sets the column date
+        /// </summary>
+        public DateTime Date
+        {
+            get { return (_Date); }
+            set { _Date = value; }
+        }
+
+        #endregion
+
+        #region TimeSliceHeight
+
+        /// <summary>
+        /// Gets and sets the TimeSlice height
+        /// </summary>
+        public float TimeSliceHeight
+        {
+            get { return (_TimeSliceHeight); }
+            set { _TimeSliceHeight = value; }
+        }
+
+        #endregion
+
+        #region WorkTime properties
+
+        /// <summary>
+        /// Gets and sets the busy time start
+        /// </summary>
+        public WorkTime BusyStartTime
+        {
+            get { return (_BusyStartTime); }
+            set { _BusyStartTime = value; }
+        }
+
+        /// <summary>
+        /// Gets and sets the busy time end
+        /// </summary>
+        public WorkTime BusyEndTime
+        {
+            get { return (_BusyEndTime); }
+            set { _BusyEndTime = value; }
+        }
+
+        /// <summary>
+        /// Gets and sets the work time start
+        /// </summary>
+        public WorkTime WorkStartTime
+        {
+            get { return (_WorkStartTime); }
+            set { _WorkStartTime = value; }
+        }
+
+        /// <summary>
+        /// Gets and sets the work time end
+        /// </summary>
+        public WorkTime WorkEndTime
+        {
+            get { return (_WorkEndTime); }
+            set { _WorkEndTime = value; }
+        }
+
+        #endregion
+
+        #region CalendarItems
+
+        /// <summary>
+        /// Gets the column CalendarItems list
+        /// </summary>
+        public List<CalendarItem> CalendarItems
+        {
+            get { return (_CalendarItems); }
+        }
+
+        #endregion
+
+        #region NeedRecalcLayout
+
+        public bool NeedRecalcLayout
+        {
+            get { return (_NeedRecalcLayout); }
+            set { _NeedRecalcLayout = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Public methods
+
+        /// <summary>
+        /// Determines if the given time is tagged as a "Busy time"
+        /// </summary>
+        /// <param name="time">WorkTime to test</param>
+        /// <returns>true if specified "time" is a Busy time</returns>
+        public bool IsBusyTime(WorkTime time)
+        {
+            return ((!BusyStartTime.IsEmpty && !BusyEndTime.IsEmpty) &&
+                    (time >= BusyStartTime && time < BusyEndTime));
+        }
+
+        /// <summary>
+        /// Determines if the given time is tagged as a "Work time"
+        /// </summary>
+        /// <param name="time">WorkTime to test</param>
+        /// <returns>true if specified "time" is a Work time</returns>
+        public bool IsWorkTime(WorkTime time)
+        {
+            if (WorkStartTime <= WorkEndTime)
+                return (time >= WorkStartTime && time < WorkEndTime);
+
+            return (time < WorkEndTime || time >= WorkStartTime);
+        }
+
+        #endregion
+
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/WeekView/DayView.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/WeekView/DayView.cs
new file mode 100644
index 00000000..f9973746
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/WeekView/DayView.cs	
@@ -0,0 +1,44 @@
+#if FRAMEWORK20
+using System;
+
+namespace DevComponents.DotNetBar.Schedule
+{
+    public class DayView : WeekDayView
+    {
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="calendarView"></param>
+        public DayView(CalendarView calendarView)
+            : base(calendarView, eCalendarView.Day)
+        {
+        }
+
+        #region RecalcSize support
+
+        /// <summary>
+        /// Normalizes the user specified start and end dates
+        /// </summary>
+        /// <param name="startDate">[out] Normalized start date</param>
+        /// <param name="endDate">[out] Normalized end date</param>
+        protected override void NormalizeDates(out DateTime startDate, out DateTime endDate)
+        {
+            startDate = this.StartDate;
+
+            // If both values are unset, then set them to
+            // today's date
+
+            if (startDate == DateTime.MinValue)
+                startDate = DateTime.Today.Date;
+
+            endDate = startDate;
+
+            DaysOfTheWeek = new DaysOfTheWeek(startDate.DayOfWeek, 1);
+        }
+
+        #endregion
+
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/WeekView/ModelWeekDayViewConnector.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/WeekView/ModelWeekDayViewConnector.cs
new file mode 100644
index 00000000..da52ff97
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/WeekView/ModelWeekDayViewConnector.cs	
@@ -0,0 +1,986 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using DevComponents.Schedule.Model;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar.Schedule
+{
+    internal class ModelWeekDayViewConnector : ModelViewConnector
+    {
+        #region Private variables
+
+        private CalendarModel _Model;       // The associated CalendarModel
+        private WeekDayView _View;          // The associated WeekDayView
+
+        private bool _IsConnected;          // Connection status
+        private uint _RefreshCount;
+
+        #endregion
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="model">Assoc CalendarModel</param>
+        /// <param name="weekDayView">Assoc WeekDayView</param>
+        public ModelWeekDayViewConnector(CalendarModel model, WeekDayView weekDayView)
+        {
+            _Model = model;
+            _View = weekDayView;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the connection status
+        /// </summary>
+        public override bool IsConnected
+        {
+            get { return (_IsConnected); }
+        }
+
+        #endregion
+
+        #region Connect processing
+
+        /// <summary>
+        /// Performs Model connection processing
+        /// </summary>
+        public override void Connect()
+        {
+            VerifyModel();
+
+            if (_IsConnected)
+                Disconnect();
+
+            LoadData();
+
+            // Get notification on Model property changes
+
+            _Model.PropertyChanged += ModelPropertyChanged;
+            _Model.SubPropertyChanged += ModelSubPropertyChanged;
+
+            _View.CalendarView.CustomItems.CollectionChanged +=
+                CustomItemsCollectionChanged;
+
+            _IsConnected = true;
+        }
+
+        #endregion
+
+        #region Disconnect processing
+
+        /// <summary>
+        /// Severs the Model/WeekDayView connection
+        /// </summary>
+        public override void Disconnect()
+        {
+            VerifyModel();
+
+            if (_IsConnected)
+            {
+                // Clear all AllDayPanel items
+
+                ClearAllDayPanelItems();
+
+                // Loop through each DayColumn, clearing each
+                // associated view connection
+
+                for (int i = 0; i < _View.DayColumns.Length; i++)
+                    ClearWeekDayColumn(_View.DayColumns[i]);
+
+                _View.SubItems.Clear();
+
+                // Stop notification on Model property changes
+
+                _Model.PropertyChanged -= ModelPropertyChanged;
+                _Model.SubPropertyChanged -= ModelSubPropertyChanged;
+
+                _View.CalendarView.CustomItems.CollectionChanged -=
+                    CustomItemsCollectionChanged;
+
+                _IsConnected = false;
+
+                OnSubItemsChanged();
+            }
+        }
+
+        #region ClearAllDayPanelItems
+
+        private void ClearAllDayPanelItems()
+        {
+            List<CalendarItem> items = _View.AllDayPanel.CalendarItems;
+
+            for (int i = items.Count - 1; i >= 0; i--)
+            {
+                AppointmentWeekDayView view = items[i] as AppointmentWeekDayView;
+
+                if (view != null)
+                {
+                    view.IsSelectedChanged -= _View.ItemIsSelectedChanged;
+
+                    view.Appointment = null;
+                    view.IsSelected = false;
+                    view.AllDayPanel = null;
+                }
+
+                items.RemoveAt(i);
+            }
+
+            _View.AllDayPanel.SubItems.Clear();
+        }
+
+        #endregion
+
+        #region ClearWeekDayColumn
+
+        /// <summary>
+        /// Clears individual DayColumn view connections
+        /// </summary>
+        /// <param name="dayColumn">DayColumn</param>
+        private void ClearWeekDayColumn(DayColumn dayColumn)
+        {
+            if (dayColumn.CalendarItems.Count > 0)
+            {
+                // Loop through each CalendarItem, resetting
+                // it's associated connection
+
+                for (int i = dayColumn.CalendarItems.Count - 1; i >= 0; i--)
+                {
+                    AppointmentWeekDayView view =
+                        dayColumn.CalendarItems[i] as AppointmentWeekDayView;
+
+                    if (view != null)
+                    {
+                        view.IsSelectedChanged -= _View.ItemIsSelectedChanged;
+
+                        view.Appointment = null;
+                        view.IsSelected = false;
+                        view.DayColumn = null;
+                    }
+
+                    dayColumn.CalendarItems.RemoveAt(i);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region LoadData processing
+
+        /// <summary>
+        /// Loads Model/WeekDayView connection data
+        /// </summary>
+        private void LoadData()
+        {
+            DayColumn[] dcs = _View.DayColumns;
+
+            if (dcs.Length > 0)
+            {
+                _RefreshCount++;
+
+                DateTime startDate = dcs[0].Date;
+                DateTime endDate = DateTimeHelper.EndOfDay(dcs[dcs.Length - 1].Date);
+
+                DateTime appStartDate = startDate.AddMonths(-1);
+
+                List<Appointment> appts = GetAppointmentList(_Model, appStartDate, endDate);
+
+                for (int i = 0; i < dcs.Length; i++)
+                {
+                    DayColumn dc = dcs[i];
+
+                    UpdateColumnAppts(dc, appts);
+                    UpdateCustomItems(dc);
+                }
+
+                UpdateAllDayPanelView(appts, startDate, endDate);
+                UpdateAllDayPanelCustomItems();
+
+                OnSubItemsChanged();
+            }
+        }
+
+        #region UpdateColumnAppts
+
+        private void UpdateColumnAppts(DayColumn dayColumn, List<Appointment> appointments)
+        {
+            foreach (Appointment app in appointments)
+            {
+                DateTime date = dayColumn.Date.Date;
+
+                if (date >= app.StartTime.Date && date <= app.EndTime.Date)
+                {
+                    if (IsAppointmentVisible(app))
+                    {
+                        // Get the assoc view
+
+                        if (_View.IsAllDayItem(app) == false)
+                        {
+                            AppointmentWeekDayView view = GetViewFromColumn(dayColumn, app, false) ??
+                                                          GetViewFromAllDayPanel(app, true) ??
+                                                          GetNewView(app);
+
+                            if (view.StartTime != app.StartTime || view.EndTime != app.EndTime)
+                                dayColumn.NeedRecalcLayout = true;
+
+                            // Set the view start and end times to
+                            // match the assoc appointment
+
+                            view.StartTime = app.StartTime;
+                            view.EndTime = app.EndTime;
+
+                            view.RefreshCount = _RefreshCount;
+
+                            // Update the DayColumn data
+
+                            if (view.DayColumn == null)
+                            {
+                                view.DayColumn = dayColumn;
+
+                                dayColumn.CalendarItems.Add(view);
+                                dayColumn.NeedRecalcLayout = true;
+
+                                _View.SubItems.Add(view);
+                                _View.UpdateItemOrder(view);
+                            }
+                        }
+                    }
+                }
+            }
+
+            // Update workDay details
+
+            UpdateWorkDayDetails(dayColumn);
+        }
+
+        #endregion
+
+        #region UpdateCustomItems
+
+        private void UpdateCustomItems(DayColumn dayColumn)
+        {
+            CustomCalendarItemCollection items = _View.CalendarView.CustomItems;
+
+            if (items != null)
+            {
+                for (int i = 0; i < items.Count; i++)
+                {
+                    CustomCalendarItem item = items[i];
+
+                    if (IsCustomItemVisible(item) == true && _View.IsAllDayItem(item) == false &&
+                        (item.StartTime < dayColumn.Date.AddDays(1) && item.EndTime > dayColumn.Date))
+                    {
+                        item.CalendarView = _View.CalendarView;
+
+                        CustomCalendarItem ci = GetItemFromColumn(dayColumn, item, false);
+
+                        if (ci == null)
+                        {
+                            ci = GetItemFromAllDayPanel(item, true) ?? GetNewCustomItem(item);
+
+                            dayColumn.CalendarItems.Add(ci);
+                            dayColumn.NeedRecalcLayout = true;
+
+                            _View.SubItems.Add(ci);
+                            _View.UpdateItemOrder(ci);
+                        }
+
+                        ci.StartTime = item.StartTime;
+                        ci.EndTime = item.EndTime;
+
+                        ci.RefreshCount = _RefreshCount;
+
+                        dayColumn.NeedRecalcLayout = true;
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RefreshData processing
+
+        /// <summary>
+        /// Refreshes the data in a previously established
+        /// and loaded connection
+        /// </summary>
+        public void RefreshData()
+        {
+            CalendarItem selItem = _View.SelectedItem;
+
+            LoadData();
+
+            List<CalendarItem> removedViews = null;
+
+            foreach (DayColumn dc in _View.DayColumns)
+                RemoveOutdatedViews(dc, ref removedViews);
+
+            RemoveOutdatedAllDayViews(ref removedViews);
+
+            ProcessRemovedData(removedViews);
+
+            if (selItem != null)
+            {
+                selItem.IsSelected = false;
+                selItem.IsSelected = true;
+            }
+        }
+
+        #region RemoveOutdatedViews
+
+        private void RemoveOutdatedViews(
+            DayColumn dayColumn, ref List<CalendarItem> removedViews)
+        {
+            for (int i = dayColumn.CalendarItems.Count - 1; i >= 0; i--)
+            {
+                CalendarItem view = dayColumn.CalendarItems[i];
+
+                if (view != null)
+                {
+                    if (view.RefreshCount != _RefreshCount)
+                    {
+                        if (removedViews == null)
+                            removedViews = new List<CalendarItem>();
+
+                        removedViews.Add(view);
+
+                        _View.SubItems._Remove(view);
+                        _View.NeedRecalcSize = true;
+
+                        dayColumn.CalendarItems.Remove(view);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region RemoveOutdatedAllDayViews
+
+        private void RemoveOutdatedAllDayViews(ref List<CalendarItem> removedViews)
+        {
+            for (int i = _View.AllDayPanel.CalendarItems.Count - 1; i >= 0; i--)
+            {
+                CalendarItem view =
+                    _View.AllDayPanel.CalendarItems[i] as CalendarItem;
+
+                if (view != null)
+                {
+                    if (view.RefreshCount != _RefreshCount ||
+                        _View.IsAllDayItem(view) == false)
+                    {
+                        if (removedViews == null)
+                            removedViews = new List<CalendarItem>();
+
+                        removedViews.Add(view);
+
+                        _View.AllDayPanel.CalendarItems.RemoveAt(i);
+                        _View.AllDayPanel.SubItems.Remove(view);
+
+                        _View.NeedRecalcLayout = true;
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region ProcessRemovedData
+
+        private void ProcessRemovedData(List<CalendarItem> removedViews)
+        {
+            if (removedViews != null && removedViews.Count > 0)
+            {
+                for (int i = 0; i < removedViews.Count; i++)
+                {
+                    CalendarItem item = removedViews[i];
+
+                    item.IsSelectedChanged -= _View.ItemIsSelectedChanged;
+
+                    item.Dispose();
+                }
+
+                _View.NeedRecalcLayout = true;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region UpdateAllDayPanelView
+
+        private void UpdateAllDayPanelView(
+            List<Appointment> appts, DateTime startDate, DateTime endDate)
+        {
+            // Loop through each appointment
+            // updating the assoc view accordingly
+
+            foreach (Appointment app in appts)
+            {
+                if (app.StartTime < endDate && app.EndTime > startDate)
+                {
+                    if (IsAppointmentVisible(app))
+                    {
+                        // Get the assoc view
+
+                        if (_View.IsAllDayItem(app) == true)
+                        {
+                            AppointmentWeekDayView view =
+                                GetViewFromAllColumns(app, true) ??
+                                GetViewFromAllDayPanel(app, false) ??
+                                GetNewView(app);
+
+                            // Set the view start and end times to
+                            // match the assoc appointment
+
+                            view.StartTime = app.StartTime;
+                            view.EndTime = app.EndTime;
+
+                            view.RefreshCount = _RefreshCount;
+
+                            if (view.AllDayPanel == null)
+                            {
+                                view.AllDayPanel = _View.AllDayPanel;
+
+                                _View.AllDayPanel.CalendarItems.Add(view);
+                                _View.AllDayPanel.SubItems.Add(view);
+
+                                _View.NeedRecalcLayout = true;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region UpdateAllDayPanelCustomItems
+
+        private void UpdateAllDayPanelCustomItems()
+        {
+            CustomCalendarItemCollection items = _View.CalendarView.CustomItems;
+
+            if (items != null)
+            {
+                DateTime startDate = _View.StartDate;
+                DateTime endDate = _View.EndDate.AddDays(1);
+
+                for (int i = 0; i < items.Count; i++)
+                {
+                    CustomCalendarItem item = items[i];
+
+                    if (IsCustomItemVisible(item) == true && _View.IsAllDayItem(item) == true &&
+                        (item.StartTime < endDate && item.EndTime > startDate))
+                    {
+                        item.CalendarView = _View.CalendarView;
+
+                        CustomCalendarItem ci = GetItemFromAllDayPanel(item, false);
+
+                        if (ci == null)
+                        {
+                            ci = GetItemFromAllColumns(item, true);
+
+                            if (ci == null)
+                                ci = GetNewCustomItem(item);
+
+                            _View.AllDayPanel.CalendarItems.Add(ci);
+                            _View.NeedRecalcLayout = true;
+
+                            _View.AllDayPanel.SubItems.Add(ci);
+                        }
+
+                        if (ci.StartTime != item.StartTime || ci.EndTime != item.EndTime)
+                        {
+                            ci.StartTime = item.StartTime;
+                            ci.EndTime = item.EndTime;
+
+                            _View.NeedRecalcLayout = true;
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region UpdateWorkDayDetails
+
+        /// <summary>
+        /// Updates DayColumn workday details
+        /// </summary>
+        /// <param name="dayColumn">DayColumn to update</param>
+        private void UpdateWorkDayDetails(DayColumn dayColumn)
+        {
+            // Update workDay timings
+
+            Owner owner = _Model.Owners[_View.OwnerKey];
+
+            if (owner == null || GetCalendarWorkDays(dayColumn, owner.CalendarWorkDays) == false)
+            {
+                if (GetCalendarWorkDays(dayColumn, _Model.CalendarWorkDays) == false)
+                {
+                    if (owner == null || GetWorkDays(dayColumn, owner.WorkDays) == false)
+                    {
+                        if (GetWorkDays(dayColumn, _Model.WorkDays) == false)
+                        {
+                            dayColumn.WorkStartTime = new WorkTime();
+                            dayColumn.WorkEndTime = new WorkTime();
+                        }
+                    }
+                }
+            }
+        }
+
+        #region GetCalendarWorkDays
+
+        /// <summary>
+        /// GetCalendarWorkDays
+        /// </summary>
+        /// <param name="dayColumn"></param>
+        /// <param name="calendarWorkDays"></param>
+        /// <returns></returns>
+        private bool GetCalendarWorkDays(
+            DayColumn dayColumn, CalendarWorkDayCollection calendarWorkDays)
+        {
+            if (calendarWorkDays != null && calendarWorkDays.Count > 0)
+            {
+                CalendarWorkDay cwd = calendarWorkDays[dayColumn.Date];
+
+                if (cwd != null)
+                {
+                    dayColumn.WorkStartTime = cwd.WorkStartTime;
+                    dayColumn.WorkEndTime = cwd.WorkEndTime;
+
+                    return (true);
+                }
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region GetWorkDays
+
+        /// <summary>
+        /// GetWorkDays
+        /// </summary>
+        /// <param name="dayColumn"></param>
+        /// <param name="workDays"></param>
+        /// <returns></returns>
+        private bool GetWorkDays(
+            DayColumn dayColumn, WorkDayCollection workDays)
+        {
+            if (workDays != null && workDays.Count > 0)
+            {
+                WorkDay wd = workDays[dayColumn.Date.DayOfWeek];
+
+                if (wd != null)
+                {
+                    dayColumn.WorkStartTime = wd.WorkStartTime;
+                    dayColumn.WorkEndTime = wd.WorkEndTime;
+                }
+                else
+                {
+                    dayColumn.WorkStartTime = new WorkTime();
+                    dayColumn.WorkEndTime = new WorkTime();
+                }
+
+                return (true);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetView routines
+
+        #region GetViewFromAll
+
+        private AppointmentWeekDayView
+            GetViewFromAll(Appointment app, bool remove)
+        {
+            AppointmentWeekDayView view = GetViewFromAllColumns(app, remove);
+
+            if (view != null)
+                return (view);
+
+            return (GetViewFromAllDayPanel(app, remove));
+        }
+
+        #endregion
+
+        #region GetViewFromAllColumns
+
+        private AppointmentWeekDayView
+            GetViewFromAllColumns(Appointment app, bool remove)
+        {
+            for (int i = 0; i < _View.NumberOfColumns; i++)
+            {
+                AppointmentWeekDayView view =
+                    GetViewFromColumn(_View.DayColumns[i], app, remove);
+
+                if (view != null)
+                    return (view);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetViewFromColumn
+
+        private AppointmentWeekDayView 
+            GetViewFromColumn(DayColumn dayColumn, Appointment appointment, bool remove)
+        {
+            foreach (CalendarItem item in dayColumn.CalendarItems)
+            {
+                AppointmentWeekDayView view = item as AppointmentWeekDayView;
+
+                if (view != null && view.Appointment == appointment)
+                {
+                    if (remove == true)
+                    {
+                        dayColumn.CalendarItems.Remove(view);
+                        _View.SubItems.Remove(view);
+
+                        view.DayColumn = null;
+                    }
+
+                    return (view);
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetViewFromAllDayPanel
+
+        private AppointmentWeekDayView 
+            GetViewFromAllDayPanel(Appointment appointment, bool remove)
+        {
+            foreach (CalendarItem item in _View.AllDayPanel.CalendarItems)
+            {
+                AppointmentWeekDayView view = item as AppointmentWeekDayView;
+
+                if (view != null && view.Appointment == appointment)
+                {
+                    if (remove == true)
+                    {
+                        _View.AllDayPanel.CalendarItems.Remove(view);
+                        _View.AllDayPanel.SubItems.Remove(view);
+
+                        view.AllDayPanel = null;
+                    }
+
+                    return (view);
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetItem routines
+
+        #region GetItemFromColumn
+
+        private CustomCalendarItem
+            GetItemFromColumn(DayColumn dayColumn, CustomCalendarItem item, bool remove)
+        {
+            foreach (CalendarItem citem in dayColumn.CalendarItems)
+            {
+                CustomCalendarItem view = citem as CustomCalendarItem;
+
+                if (view != null && (view == item || view.BaseCalendarItem == item))
+                {
+                    if (remove == true)
+                        dayColumn.CalendarItems.Remove(view);
+
+                    return (view);
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetItemFromAllColumns
+
+        private CustomCalendarItem
+            GetItemFromAllColumns(CustomCalendarItem item, bool remove)
+        {
+            for (int i = 0; i < _View.NumberOfColumns; i++)
+            {
+                CustomCalendarItem view =
+                    GetItemFromColumn(_View.DayColumns[i], item, false);
+
+                if (view != null)
+                    return (view);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetItemFromAllDayPanel
+
+        private CustomCalendarItem
+            GetItemFromAllDayPanel(CustomCalendarItem item, bool remove)
+        {
+            foreach (CalendarItem citem in _View.AllDayPanel.CalendarItems)
+            {
+                CustomCalendarItem view = citem as CustomCalendarItem;
+
+                if (view != null && (view == item || view.BaseCalendarItem == item))
+                {
+                    if (remove == true)
+                        _View.AllDayPanel.CalendarItems.Remove(view);
+
+                    return (view);
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetNewView
+
+        /// <summary>
+        /// Gets a new appointment view
+        /// </summary>
+        /// <param name="appointment">Appointment</param>
+        /// <returns>New view</returns>
+        private AppointmentWeekDayView GetNewView(Appointment appointment)
+        {
+            AppointmentWeekDayView view = new AppointmentWeekDayView(_View, appointment);
+
+            view.Tooltip = appointment.Tooltip;
+
+            view.IsSelectedChanged += _View.ItemIsSelectedChanged;
+
+            return (view);
+        }
+
+        #endregion
+
+        #region GetNewCustomItem
+
+        private CustomCalendarItem GetNewCustomItem(CustomCalendarItem item)
+        {
+            CustomCalendarItem ci = (CustomCalendarItem)item.Copy();
+            ci.BaseCalendarItem = item;
+
+            ci.IsSelectedChanged += _View.ItemIsSelectedChanged;
+
+            return (ci);
+        }
+
+        #endregion
+
+        #region View support routines
+
+        /// <summary>
+        /// Returns the view
+        /// </summary>
+        /// <returns></returns>
+        public override eCalendarView GetView()
+        {
+            return (eCalendarView.Week);
+        }
+
+        /// <summary>
+        /// Verifies the Model and MonthView are valid
+        /// </summary>
+        private void VerifyModel()
+        {
+            if (_Model == null)
+                throw new NullReferenceException("CalendarModel must be set on connector.");
+
+            if (_View == null)
+                throw new NullReferenceException("WeekDayCalendarView must be set on connector.");
+        }
+
+        #endregion
+
+        #region Model property change processing
+
+        /// <summary>
+        /// Handles Model property change notifications
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ModelPropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            if (e.PropertyName == CalendarModel.AppointmentsPropertyName)
+            {
+                RefreshData();
+                UpdateDisplay();
+            }
+            else if (e.PropertyName == CalendarModel.WorkDaysPropertyName)
+            {
+                for (int i = 0; i < _View.NumberOfColumns; i++)
+                    UpdateWorkDayDetails(_View.DayColumns[i]);
+
+                _View.CalendarView.CalendarPanel.RecalcSize();
+            }
+        }
+
+        #endregion
+
+        #region ModelSubPropertyChanged
+
+        /// <summary>
+        /// Handles ModelSubProperty change notifications
+        /// </summary>
+        /// <param name="sender">object</param>
+        /// <param name="e">SubPropertyChangedEventArgs</param>
+        private void ModelSubPropertyChanged(object sender, SubPropertyChangedEventArgs e)
+        {
+            if (e.Source is WorkDay)
+            {
+                for (int i = 0; i < _View.NumberOfColumns; i++)
+                    UpdateWorkDayDetails(_View.DayColumns[i]);
+
+                _View.CalendarView.CalendarPanel.RecalcSize();
+            }
+            else if (e.Source is Owner)
+            {
+                Owner owner = (Owner) e.Source;
+
+                if (_View.OwnerKey != null && _View.OwnerKey.Equals(owner.Key))
+                {
+                    if (e.PropertyChangedArgs.PropertyName == Owner.DisplayNamePropertyName)
+                        _View.DisplayName = owner.DisplayName;
+
+                    else if (e.PropertyChangedArgs.PropertyName.Equals("ColorScheme"))
+                        _View.CalendarColor = owner.ColorScheme;
+                }
+            }
+            else if (e.Source is Appointment)
+            {
+                Appointment app = e.Source as Appointment;
+                AppointmentWeekDayView appView;
+
+                string name = e.PropertyChangedArgs.PropertyName;
+
+                if (name.Equals("Tooltip"))
+                {
+                    appView = GetViewFromAll(app, false);
+
+                    if (appView != null)
+                        appView.Tooltip = app.Tooltip;
+                }
+                else if (name.Equals("IsSelected"))
+                {
+                    appView = GetViewFromAll(app, false);
+
+                    if (appView != null)
+                        appView.IsSelected = app.IsSelected;
+                }
+                else if (name.Equals("CategoryColor") || name.Equals("TimeMarkedAs") || name.Equals("ImageKey"))
+                {
+                    appView = GetViewFromAll(app, false);
+
+                    if (appView != null)
+                        appView.Refresh();
+                }
+                else if (name.Equals("OwnerKey"))
+                {
+                    if (_View.CalendarView.IsMultiCalendar == true)
+                    {
+                        if (_View.OwnerKey == app.OwnerKey)
+                        {
+                            RefreshData();
+                            UpdateDisplay();
+                        }
+                        else
+                        {
+                            appView = GetViewFromAll(app, false);
+
+                            if (appView != null)
+                            {
+                                RefreshData();
+                                UpdateDisplay();
+                            }
+                        }
+                    }
+                }
+                else if (name.Equals("Visible"))
+                {
+                    RefreshData();
+                    UpdateDisplay();
+                }
+            }
+        }
+
+        #endregion
+
+        #region CustomItems_CollectionChanged
+
+        void CustomItemsCollectionChanged(object sender, EventArgs e)
+        {
+            RefreshData();
+            UpdateDisplay();
+        }
+
+        #endregion
+
+        #region UpdateDisplay
+
+        private void UpdateDisplay()
+        {
+            if (_View.Displayed == true)
+            {
+                if (_View.NeedRecalcLayout == false)
+                {
+                    for (int i = 0; i < _View.NumberOfColumns; i++)
+                    {
+                        if (_View.DayColumns[i].NeedRecalcLayout)
+                        {
+                            _View.RecalcSize();
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region OnSubItemsChanged
+
+        private void OnSubItemsChanged()
+        {
+            System.Windows.Forms.Cursor.Position =
+                System.Windows.Forms.Cursor.Position;
+        }
+
+        #endregion
+
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/WeekView/PosWin.Designer.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/WeekView/PosWin.Designer.cs
new file mode 100644
index 00000000..f03e287f
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/WeekView/PosWin.Designer.cs	
@@ -0,0 +1,59 @@
+#if FRAMEWORK20
+namespace DevComponents.DotNetBar.Schedule
+{
+    partial class PosWin
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form 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.SuspendLayout();
+            // 
+            // PosWin
+            // 
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
+            this.CausesValidation = false;
+            this.ClientSize = new System.Drawing.Size(1, 1);
+            this.ControlBox = false;
+            this.DoubleBuffered = true;
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.Location = new System.Drawing.Point(1000, 1000);
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.Name = "PosWin";
+            this.ShowIcon = false;
+            this.ShowInTaskbar = false;
+            this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
+            this.StartPosition = System.Windows.Forms.FormStartPosition.Manual;
+            this.Text = "PosWin";
+            this.Paint += new System.Windows.Forms.PaintEventHandler(this.PosWin_Paint);
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+    }
+}
+#endif
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/WeekView/PosWin.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/WeekView/PosWin.cs
new file mode 100644
index 00000000..821a93f5
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/WeekView/PosWin.cs	
@@ -0,0 +1,132 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Schedule
+{
+    public partial class PosWin : Form
+    {
+        #region Private variables
+
+        private string _PosText = "";           // Window content
+        private int _PosHeight;                 // Calculated window height
+
+        #endregion
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        public PosWin()
+        {
+            InitializeComponent();
+        }
+
+        #region CreateParams / show support
+
+        // This code permits us to be able to create a
+        // window with a drop shadow
+
+        private const int CS_DROPSHADOW = 0x00020000;
+
+        protected override CreateParams CreateParams
+        {
+            get 
+            { 
+                CreateParams parameters = base.CreateParams; 
+                
+                parameters.ClassStyle =
+                    (parameters.ClassStyle | CS_DROPSHADOW);
+            
+                return (parameters); 
+            }
+        }
+
+        protected override bool ShowWithoutActivation
+        {
+            get { return true; }
+        }
+
+        #endregion
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets and sets the window content text
+        /// </summary>
+        public string PosText
+        {
+            get { return (_PosText); }
+
+            set
+            {
+                if (_PosText != value)
+                {
+                    _PosText = value;
+
+                    this.Refresh();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets the calculated window height
+        /// </summary>
+        public int PosHeight
+        {
+            get
+            {
+                if (_PosHeight <= 0)
+                {
+                    using (Graphics g = CreateGraphics())
+                    {
+                        eTextFormat tf = eTextFormat.Default |
+                            eTextFormat.HorizontalCenter | eTextFormat.VerticalCenter;
+
+                        Size sz = TextDrawing.MeasureString(g, "ABC", SystemFonts.CaptionFont, 0, tf);
+
+                        _PosHeight = sz.Height + 4;
+                    }
+                }
+
+                return (_PosHeight);
+            }
+        }
+
+        #endregion
+
+        #region Paint processing
+
+        private void PosWin_Paint(object sender, PaintEventArgs e)
+        {
+            Graphics g = e.Graphics;
+
+            eTextFormat tf = eTextFormat.Default | eTextFormat.HorizontalCenter | eTextFormat.VerticalCenter;
+
+            Size sz = TextDrawing.MeasureString(g, _PosText, SystemFonts.CaptionFont, 0, tf);
+
+            sz.Width += 6;
+            sz.Height += 4;
+
+            this.Size = sz;
+
+            int swidth = Screen.FromControl(this).Bounds.Width;
+
+            if (Location.X + sz.Width > swidth)
+                Location = new Point(swidth - sz.Width, Location.Y);
+
+            Rectangle r = new Rectangle(0, 0, sz.Width - 1, sz.Height - 1);
+
+            g.DrawRectangle(Pens.Black, r);
+
+            TextDrawing.DrawString(g, _PosText, SystemFonts.CaptionFont, Color.Black, r, tf);
+        }
+
+        #endregion
+    }
+}
+#endif
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/WeekView/PosWin.resx b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/WeekView/PosWin.resx
new file mode 100644
index 00000000..19dc0dd8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/WeekView/PosWin.resx	
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/WeekView/TimeRulerPanel.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/WeekView/TimeRulerPanel.cs
new file mode 100644
index 00000000..e8945c80
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/WeekView/TimeRulerPanel.cs	
@@ -0,0 +1,760 @@
+#if FRAMEWORK20
+using System;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+
+namespace DevComponents.DotNetBar.Schedule
+{
+    public class TimeRulerPanel : BaseItem
+    {
+        #region Private Variables
+
+        private CalendarView _CalendarView;         // Assoc CalendarView
+
+        private int _VScrollPos;                    // Vertical scroll position
+
+        private TimeRulerColor _ViewColor =         // View display color table
+            new TimeRulerColor();
+
+        #endregion
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="calendarView"></param>
+        public TimeRulerPanel(CalendarView calendarView)
+        {
+            _CalendarView = calendarView;
+
+            Name = "TimeRulerPanel";
+
+            HookEvents(true);
+        }
+
+        #region Private properties
+
+        #region General display properties
+
+        /// <summary>
+        /// Gets the TimeRuler font
+        /// </summary>
+        private Font TimeRulerFont
+        {
+            get { return (_CalendarView.TimeRulerFont); }
+        }
+
+        /// <summary>
+        /// Gets the TimeRuler font (small)
+        /// </summary>
+        private Font TimeRulerFontSm
+        {
+            get { return (_CalendarView.TimeRulerFontSm); }
+        }
+
+        #endregion
+
+        #region Time Slice Properties
+
+        /// <summary>
+        /// Gets the default Time Slice height
+        /// </summary>
+        private float TimeSliceHeight
+        {
+            get { return (_CalendarView.TimeSliceHeight); }
+        }
+
+        /// <summary>
+        /// Gets the TimeSlotDuration
+        /// </summary>
+        private int TimeSlotDuration
+        {
+            get { return (_CalendarView.TimeSlotDuration); }
+        }
+
+        /// <summary>
+        /// Gets the SlotsPerHour
+        /// </summary>
+        private int SlotsPerHour
+        {
+            get { return (_CalendarView.SlotsPerHour); }
+        }
+
+        /// <summary>
+        /// Gets the NumberOfSlices
+        /// </summary>
+        private int NumberOfSlices
+        {
+            get { return (_CalendarView.NumberOfSlices); }
+        }
+
+        /// <summary>
+        /// Gets the starting Time Slice
+        /// </summary>
+        private int StartSlice
+        {
+            get { return (_CalendarView.StartSlice); }
+        }
+
+        #endregion
+
+        #region AM / PM designators
+
+        /// <summary>
+        /// Gets the culturally correct AM time designator
+        /// </summary>
+        private string AmDesignator
+        {
+            get
+            {
+                return (ScheduleSettings.GetActiveCulture().
+                    DateTimeFormat.AMDesignator.ToLower());
+            }
+        }
+
+        /// <summary>
+        /// Gets the culturally correct PM time designator
+        /// </summary>
+        private string PmDesignator
+        {
+            get
+            {
+                return (ScheduleSettings.GetActiveCulture().
+                    DateTimeFormat.PMDesignator.ToLower());
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Hook / Unhook Events
+
+        /// <summary>
+        /// Routine hooks all necessary events for this control
+        /// </summary>
+        /// <param name="hook">True to hook, false to unhook</param>
+        private void HookEvents(bool hook)
+        {
+            if (hook == true)
+            {
+                _CalendarView.LabelTimeSlotsChanged += CalendarView_LabelTimeSlotsChanged;
+                _CalendarView.Is24HourFormatChanged += CalendarView_Is24HourFormatChanged;
+                _CalendarView.TimeSlotDurationChanged += CalendarView_TimeSlotDurationChanged;
+                _CalendarView.TimeIndicatorsChanged += CalendarView_TimeIndicatorsChanged;
+                _CalendarView.TimeIndicatorTimeChanged += CalendarView_TimeIndicatorTimeChanged;
+
+                _CalendarView.WeekDayVScrollPanel.ScrollBarChanged +=  VScrollPanel_ScrollBarChanged;
+            }
+            else
+            {
+                _CalendarView.LabelTimeSlotsChanged -= CalendarView_LabelTimeSlotsChanged;
+                _CalendarView.Is24HourFormatChanged -= CalendarView_Is24HourFormatChanged;
+                _CalendarView.TimeSlotDurationChanged -= CalendarView_TimeSlotDurationChanged;
+                _CalendarView.TimeIndicatorsChanged -= CalendarView_TimeIndicatorsChanged;
+                _CalendarView.TimeIndicatorTimeChanged -= CalendarView_TimeIndicatorTimeChanged;
+
+                _CalendarView.WeekDayVScrollPanel.ScrollBarChanged -= VScrollPanel_ScrollBarChanged;
+            }
+        }
+
+        #endregion
+
+        #region Event Processing
+
+        #region CalendarView_LabelTimeSlotsChanged
+
+        /// <summary>
+        /// Processes LabelTimeSlotsChanged events
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void CalendarView_LabelTimeSlotsChanged(
+            object sender, LabelTimeSlotsChangedEventArgs e)
+        {
+            Refresh();
+        }
+
+        #endregion
+
+        #region CalendarView_Is24HourFormatChanged
+
+        /// <summary>
+        /// Processes Is24HourFormatChanged events
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void CalendarView_Is24HourFormatChanged(
+            object sender, Is24HourFormatChangedEventArgs e)
+        {
+            Refresh();
+        }
+
+        #endregion
+
+        #region CalendarView_TimeSlotDurationChanged
+
+        /// <summary>
+        /// Processes TimeSlotDurationChanged events
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void CalendarView_TimeSlotDurationChanged(
+            object sender, TimeSlotDurationChangedEventArgs e)
+        {
+            Refresh();
+        }
+
+        #endregion
+
+        #region CalendarView_TimeIndicatorsChanged
+
+        /// <summary>
+        /// Processes CalendarView_TimeIndicatorsChanged events
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void CalendarView_TimeIndicatorsChanged(object sender, EventArgs e)
+        {
+            Refresh();
+        }
+
+        #endregion
+
+        #region CalendarView_TimeIndicatorTimeChanged
+
+        /// <summary>
+        /// Processes CalendarView_TimeIndicatorTimeChanged events
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void CalendarView_TimeIndicatorTimeChanged(
+            object sender, TimeIndicatorTimeChangedEventArgs e)
+        {
+            Refresh();
+        }
+
+        #endregion
+
+        #region VScrollPanel_ScrollBarChanged
+
+        void VScrollPanel_ScrollBarChanged(object sender, EventArgs e)
+        {
+            Refresh();
+
+            Rectangle r = Bounds;
+
+            r.Y = _CalendarView.WeekDayVScrollPanel.Bounds.Y;
+            r.Height = _CalendarView.WeekDayVScrollPanel.Bounds.Height;
+
+            Bounds = r;
+
+            _VScrollPos = -_CalendarView.WeekDayVScrollPanel.ScrollBar.Value;
+
+            Refresh();
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Paint processing
+
+        /// <summary>
+        /// Paint processing routine
+        /// </summary>
+        /// <param name="e"></param>
+        public override void Paint(ItemPaintArgs e)
+        {
+            int sliceStart, sliceEnd;
+            int sliceCount = GetSliceRange(e, out sliceStart, out sliceEnd);
+
+            if (sliceCount > 0)
+            {
+                _ViewColor.SetColorTable();
+
+                DrawTimeRuler(e, sliceStart, sliceEnd);
+            }
+        }
+
+        #region Slice Support Routines
+
+        /// <summary>
+        /// Calculates the range of slices needed to be drawn
+        /// to satisfy the specified paint request
+        /// </summary>
+        /// <param name="e">ItemPaintArgs</param>
+        /// <param name="sliceStart">[out] Slice start index</param>
+        /// <param name="sliceEnd">[out] Slice end index</param>
+        /// <returns>Slice range count (end - start)</returns>
+        internal int GetSliceRange(ItemPaintArgs e, out int sliceStart, out int sliceEnd)
+        {
+            // Calc our starting index
+
+            int start = 0;
+
+            while (start < NumberOfSlices)
+            {
+                Rectangle r = GetSliceRect(start);
+
+                if (r.Bottom > Bounds.Top)
+                {
+                    if (r.Bottom > e.ClipRectangle.Y)
+                        break;
+                }
+
+                start++;
+            }
+
+            // Calc our ending index
+
+            int end = start;
+
+            while (end < NumberOfSlices)
+            {
+                Rectangle r = GetSliceRect(end);
+                
+                if (r.Y >= e.ClipRectangle.Bottom)
+                    break;
+
+                end++;
+            }
+
+            // Set the user supplied 'out' values, and
+            // return the range count to the caller
+
+            if (end - start == 0)
+            {
+                sliceStart = 0;
+                sliceEnd = 0;
+
+                return (0);
+            }
+
+            sliceStart = start;
+            sliceEnd = end - 1;
+
+            return (end - start);
+        }
+
+        /// <summary>
+        /// Gets the given slice rectangle
+        /// </summary>
+        /// <param name="slice">Slice</param>
+        /// <returns>Bounding rectangle</returns>
+        private Rectangle GetSliceRect(int slice)
+        {
+            Rectangle r = Bounds;
+
+            float n = slice * TimeSliceHeight;
+
+            r.Y += (int)(n) + _VScrollPos;
+            r.Height = (int)(n + TimeSliceHeight) - (int)n;
+
+            return (r);
+        }
+
+        #endregion
+
+        #region DrawTimeRuler
+
+        /// <summary>
+        /// Draws the TimeRuler
+        /// </summary>
+        /// <param name="e">ItemPaintArgs</param>
+        /// <param name="sliceStart"></param>
+        /// <param name="sliceEnd"></param>
+        private void DrawTimeRuler(ItemPaintArgs e, int sliceStart, int sliceEnd)
+        {
+            Graphics g = e.Graphics;
+
+            Region regSav = g.Clip;
+            g.SetClip(Bounds);
+
+            DrawBackGround(g);
+            DrawTimeIndicators(g, sliceStart, sliceEnd);
+            DrawRulerContent(g, sliceStart, sliceEnd);
+
+            // Restore our original clip region
+
+            g.Clip = regSav;
+        }
+
+        #endregion
+
+        #region DrawBackGround
+
+        /// <summary>
+        /// DrawBackGround
+        /// </summary>
+        /// <param name="g"></param>
+        private void DrawBackGround(Graphics g)
+        {
+            using (Brush br = _ViewColor.BrushPart((int)eTimeRulerPart.TimeRulerBackground, Bounds))
+                g.FillRectangle(br, Bounds);
+        }
+
+        #endregion
+
+        #region DrawTimeIndicators
+
+        #region DrawTimeIndicators
+
+        /// <summary>
+        /// Draws TimeIndicators
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="sliceStart"></param>
+        /// <param name="sliceEnd"></param>
+        private void DrawTimeIndicators(Graphics g, int sliceStart, int sliceEnd)
+        {
+            DateTime start, end;
+            GetViewDates(out start, out end);
+
+            Rectangle r = Rectangle.Union(GetSliceRect(sliceStart), GetSliceRect(sliceEnd));
+
+            for (int i = 0; i < _CalendarView.TimeIndicators.Count; i++)
+            {
+                TimeIndicator ti = _CalendarView.TimeIndicators[i];
+
+                if (ti.IndicatorArea == eTimeIndicatorArea.All ||
+                    ti.IndicatorArea == eTimeIndicatorArea.Header)
+                {
+                    if (ti.IsVisible())
+                    {
+                        DateTime time = ti.IndicatorDisplayTime;
+
+                        if (time >= start && time < end)
+                            DrawTimeIndicator(g, r, ti);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region DrawTimeIndicator
+
+        #region DrawTimeIndicator
+
+        /// <summary>
+        /// Draws individual TimeIndicators
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="sRect"></param>
+        /// <param name="ti"></param>
+        private void DrawTimeIndicator(Graphics g, Rectangle sRect, TimeIndicator ti)
+        {
+            Rectangle r = GetIndicatorRect(ti);
+
+            if (r.IntersectsWith(sRect) == true)
+            {
+                if (r.Height > 0)
+                {
+                    ColorDef cdef = GetIndicatorColor(ti);
+
+                    if (cdef != null)
+                    {
+                        using (Brush br = _ViewColor.BrushPart(cdef, r))
+                        {
+                            if (br is LinearGradientBrush)
+                                ((LinearGradientBrush)br).WrapMode = WrapMode.TileFlipX;
+
+                            g.FillRectangle(br, r);
+                        }
+                    }
+                }
+
+                Color color = GetIndicatorBorder(ti);
+
+                if (color.IsEmpty == false)
+                {
+                    using (Pen pen = new Pen(color))
+                        g.DrawLine(pen, r.X + 1, r.Bottom, r.Right - 1, r.Bottom);
+                }
+            }
+        }
+
+        #endregion
+
+        #region GetIndicatorColor
+
+        /// <summary>
+        /// Gets the Indicator Back color
+        /// </summary>
+        /// <param name="ti"></param>
+        /// <returns></returns>
+        private ColorDef GetIndicatorColor(TimeIndicator ti)
+        {
+            ColorDef cdef = ti.IndicatorColor;
+
+            if (cdef == null || cdef.IsEmpty == true)
+                cdef = _ViewColor.GetColorDef((int)eTimeRulerPart.TimeRulerIndicator);
+
+            return (cdef);
+        }
+
+        #endregion
+
+        #region GetIndicatorBorder
+
+        /// <summary>
+        /// Gets the Indicator Border color
+        /// </summary>
+        /// <param name="ti"></param>
+        /// <returns></returns>
+        private Color GetIndicatorBorder(TimeIndicator ti)
+        {
+            return (ti.BorderColor.IsEmpty == false ? ti.BorderColor :
+                _ViewColor.GetColor((int)eTimeRulerPart.TimeRulerIndicatorBorder));
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetViewDates
+
+        /// <summary>
+        /// GetViewDates
+        /// </summary>
+        /// <param name="start"></param>
+        /// <param name="end"></param>
+        private void GetViewDates(out DateTime start, out DateTime end)
+        {
+            switch (_CalendarView.SelectedView)
+            {
+                case eCalendarView.Day:
+                    start = _CalendarView.DayViewDate;
+                    end = _CalendarView.DayViewDate.AddDays(1);
+                    break;
+
+                default:
+                    start = _CalendarView.WeekViewStartDate;
+                    end = _CalendarView.WeekViewEndDate.AddDays(1);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region GetIndicatorRect
+
+        /// <summary>
+        /// GetIndicatorRect
+        /// </summary>
+        /// <param name="ti"></param>
+        /// <returns></returns>
+        private Rectangle GetIndicatorRect(TimeIndicator ti)
+        {
+            DateTime time = ti.IndicatorDisplayTime;
+
+            int offset = (int)(time.Hour * SlotsPerHour * TimeSliceHeight +
+                    (TimeSliceHeight * time.Minute) / TimeSlotDuration);
+
+            offset -= (int)(StartSlice * TimeSliceHeight);
+
+            Rectangle r = Bounds;
+
+            r.Y += (offset - ti.Thickness + _VScrollPos);
+            r.Height = ti.Thickness;
+
+            return (r);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region DrawRulerContent
+
+        private void DrawRulerContent(Graphics g, int sliceStart, int sliceEnd)
+        {
+            Point pt1 = new Point();
+            Point pt2 = new Point();
+
+            using (Pen pen = new Pen(
+                _ViewColor.GetColor((int)eTimeRulerPart.TimeRulerBorder)))
+            {
+                pt1.X = 3;
+                pt2.X = Bounds.Width - 4;
+
+                for (int i = sliceStart; i <= sliceEnd; i++)
+                {
+                    Rectangle r = GetSliceRect(i);
+
+                    // Draw an hourly separation border line
+
+                    if ((i % SlotsPerHour) == 0)
+                    {
+                        pt1.Y = pt2.Y = r.Y;
+
+                        g.DrawLine(pen, pt1, pt2);
+                    }
+
+                    // Draw the time text
+
+                    DrawTimeRulerText(g, r, i);
+                }
+            }
+        }
+
+        #endregion
+
+        #region DrawTimeRulerText
+
+        /// <summary>
+        /// Draws the time text
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="r"></param>
+        /// <param name="slice"></param>
+        private void DrawTimeRulerText(Graphics g, Rectangle r, int slice)
+        {
+            // Get our hour and minute display text
+
+            slice += StartSlice;
+
+            int hour = slice / SlotsPerHour;
+            int minute = (slice % SlotsPerHour) * TimeSlotDuration;
+
+            if (_CalendarView.LabelTimeSlots == true || minute == 0)
+            {
+                string sHour = GetRulerHour(hour);
+                string sMinute = GetRulerMinute(hour, minute);
+
+                // Setup for our output
+
+                Color color = _ViewColor.GetColor(
+                    (int)eTimeRulerPart.TimeRulerForeground);
+
+                eTextFormat tf = eTextFormat.Top | eTextFormat.Left | eTextFormat.NoPadding;
+
+                Size sz = TextDrawing.MeasureString(g, sHour, TimeRulerFont, 0, tf);
+
+                Rectangle r2 = new Rectangle(Bounds.X, r.Y + 1,
+                    Bounds.Width / 2, (int)TimeSliceHeight - 1);
+
+                // If we are displaying an hourly marker, then display
+                // it as an offset hour and minute (or AM/PM designator) display
+
+                if (minute == 0)
+                {
+                    r2.X = r2.Right - sz.Width;
+
+                    if (r2.X < 0)
+                        r2.X = 0;
+
+                    r2.Width = sz.Width;
+
+                    TextDrawing.DrawString(g, sHour, TimeRulerFont, color, r2, tf);
+
+                    r2.X = r2.Right + 2;
+                    r2.Y += 1;
+
+                    tf = eTextFormat.Top | eTextFormat.Left | eTextFormat.NoPadding;
+
+                    TextDrawing.DrawString(g, sMinute, TimeRulerFontSm, color, r2, tf);
+                }
+                else
+                {
+                    // Non-hourly display
+
+                    r2.Width = Bounds.Width - 4;
+                    r2.Y += 2;
+
+                    tf = eTextFormat.Top | eTextFormat.Right | eTextFormat.NoPadding;
+
+                    TextDrawing.DrawString(g,
+                        sHour + ScheduleSettings.GetActiveCulture().DateTimeFormat.TimeSeparator +
+                        sMinute, TimeRulerFontSm, color, r2, tf);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets the hourly display text
+        /// </summary>
+        /// <param name="hour">Hour</param>
+        /// <returns>Hourly text</returns>
+        private string GetRulerHour(int hour)
+        {
+            if (_CalendarView.Is24HourFormat == false)
+            {
+                int h = hour % 12;
+                hour = (h == 0) ? 12 : h;
+            }
+            else
+            {
+                int h = hour % 24;
+                hour = (h == 0) ? 0 : h;
+            }
+
+            return (hour.ToString(ScheduleSettings.TimeRulerHourFormatString));
+        }
+
+        /// <summary>
+        /// Gets the minute display text
+        /// </summary>
+        /// <param name="hour">Hour</param>
+        /// <param name="minute">Minute</param>
+        /// <returns>Minute text</returns>
+        private string GetRulerMinute(int hour, int minute)
+        {
+            if (minute == 0 && _CalendarView.Is24HourFormat == false)
+            {
+                hour %= 24;
+
+                if (hour == 0)
+                    return (AmDesignator);
+
+                if (hour == 12)
+                    return (PmDesignator);
+            }
+
+            return (minute.ToString(ScheduleSettings.TimeRulerMinuteFormatString));
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IDisposable Members
+
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing == true && IsDisposed == false)
+                HookEvents(false);
+
+            base.Dispose(disposing);
+        }
+
+        #endregion
+
+        #region Copy
+
+        /// <summary>
+        /// Returns copy of the item.
+        /// </summary>
+        public override BaseItem Copy()
+        {
+            TimeRulerPanel objCopy = new TimeRulerPanel(_CalendarView);
+            CopyToItem(objCopy);
+
+            return (objCopy);
+        }
+
+        /// <summary>
+        /// Copies the TimeRulerPanel specific properties to new instance of the item.
+        /// </summary>
+        /// <param name="copy">New TimeRulerPanel instance</param>
+        protected override void CopyToItem(BaseItem copy)
+        {
+            TimeRulerPanel objCopy = copy as TimeRulerPanel;
+            base.CopyToItem(objCopy);
+        }
+
+        #endregion
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/WeekView/WeekDayVScrollPanel.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/WeekView/WeekDayVScrollPanel.cs
new file mode 100644
index 00000000..66a2115d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/WeekView/WeekDayVScrollPanel.cs	
@@ -0,0 +1,27 @@
+#if FRAMEWORK20
+namespace DevComponents.DotNetBar.Schedule
+{
+    public class WeekDayVScrollPanel : VScrollPanel
+    {
+        public WeekDayVScrollPanel(CalendarView calendarView)
+            : base(calendarView)
+        {
+        }
+
+        #region Private properties
+
+        protected override int ScrollPanelSmallChange
+        {
+            get { return ((int)CalendarView.TimeSliceHeight); }
+        }
+
+        protected override int ScrollPanelMaximum
+        {
+            get { return ((int)(CalendarView.TimeSliceHeight * CalendarView.NumberOfSlices)); }
+        }
+
+        #endregion
+        
+    }
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/WeekView/WeekDayView.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/WeekView/WeekDayView.cs
new file mode 100644
index 00000000..b2c6299b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/WeekView/WeekDayView.cs	
@@ -0,0 +1,4460 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Windows.Forms;
+using DevComponents.Schedule.Model;
+
+namespace DevComponents.DotNetBar.Schedule
+{
+    public class WeekDayView : BaseView
+    {
+        #region Constants
+
+        private const int HoursPerDay = 24;
+        private const int MinutesPerHour = 60;
+        private const int MaxNumberOfColumns = 3 * 31;
+
+        #endregion
+
+        #region Private variables
+
+        private AllDayPanel _AllDayPanel;       // AllDay items panel
+
+        private DayColumn[] _DayColumns;        // Array of DayColumns
+        private int _NumberOfColumns;           // Number of DayColumns
+        private Size[] _DayColumnSize;          // Array of day text sizes
+
+        private CalendarWeekDayColor _ViewColor =     // View display color table
+            new CalendarWeekDayColor(eCalendarColor.Automatic);
+
+        private int _LastCol;                   // Last processed column
+        private Point _LastMovePoint;           // Last mouse move Point
+        private Point _LastPointOffset;         // Last Point offset
+        private Rectangle _LastBounds;          // MouseDown item bounds
+
+        int _LastMoveCol;
+        int _LastDm;
+
+        private bool _IsPanelResizing;          // Flag denoting panel resizing
+        private bool _WasAllDayItem;
+
+        private int _SelectedSliceStart;        // Absolute slice start
+        private int _SelectedSliceEnd;          // Absolute slice end (e.g. 450 - 1440)
+
+        private Timer _ScrollViewTimer;         // Timer used to implement auto view scrolling
+        private int _VScrollPos;                // Vertical scroll bar pos
+
+        private Color _BusyColor;               // Cached brush colors
+        private Color _WorkColor;
+        private Color _OffWorkColor;
+        private Color _SelectedColor;
+
+        private Brush _BusyBrush;               // Cached brushes
+        private Brush _WorkBrush;
+        private Brush _OffWorkBrush;
+        private Brush _SelectedBrush;
+        private Brush _AllDayBrush;
+        private Color _AllDayColor;
+
+        private int _LocalStartSlice;
+        private int _LocalNumberOfSlices;
+
+        #endregion
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="calendarView">CalendarView</param>
+        /// <param name="eCalendarView"></param>
+        public WeekDayView(CalendarView calendarView, eCalendarView eCalendarView)
+            : base(calendarView, eCalendarView)
+        {
+            // Allocate our AllDayPanel
+
+            _AllDayPanel = new AllDayPanel(this);
+            _AllDayPanel.Displayed = true;
+
+            // Set our non-client drawing info and CalendarColor
+
+            NClientData = new NonClientData(
+                eTabOrientation.Horizontal,
+                (int)eCalendarWeekDayPart.OwnerTabBorder,
+                (int)eCalendarWeekDayPart.OwnerTabForeground,
+                (int)eCalendarWeekDayPart.OwnerTabBackground,
+                (int)eCalendarWeekDayPart.OwnerTabContentBackground,
+                (int)eCalendarWeekDayPart.OwnerTabSelectedForeground,
+                (int)eCalendarWeekDayPart.OwnerTabSelectedBackground);
+
+            CalendarColorTable = _ViewColor;
+
+            // Hook onto our events
+
+            HookEvents(true);
+        }
+
+        #region Public properties
+
+        #region DayColumns
+
+        /// <summary>
+        /// Gets the view DayColumns
+        /// </summary>
+        public DayColumn[] DayColumns
+        {
+            get { return (_DayColumns); }
+        }
+
+        #endregion
+
+        #region NumberOfColumns
+
+        /// <summary>
+        /// Gets the view's number of DayColumns
+        /// </summary>
+        public int NumberOfColumns
+        {
+            get { return (_NumberOfColumns); }
+        }
+
+        #endregion
+
+        #region VScrollBar
+
+        /// <summary>
+        /// Gets the WeekDay vertical scrollbar
+        /// </summary>
+        public VScrollBarAdv VScrollBar
+        {
+            get { return (CalendarView.WeekDayVScrollBar ); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region Base calendar properties
+
+        /// <summary>
+        /// Gets the Sub-Day view rectangle
+        /// </summary>
+        internal Rectangle ViewRect
+        {
+            get
+            {
+                Rectangle r = ClientRect;
+
+                int n = DayOfWeekHeaderHeight + _AllDayPanel.PanelHeight;
+
+                r.Y += n;
+                r.Height -= (n + 1);
+
+                return (r);
+            }
+        }
+
+        /// <summary>
+        /// Gets the CalendarColor
+        /// </summary>
+        internal CalendarWeekDayColor WeekDayColor
+        {
+            get { return (_ViewColor); }
+        }
+
+        #endregion
+
+        #region DayColumn properties
+
+        /// <summary>
+        /// Gets the local StartSlice
+        /// </summary>
+        internal int LocalStartSlice
+        {
+            get { return (_LocalStartSlice); }
+        }
+
+        /// <summary>
+        /// Gets the local NumberOfSlices
+        /// </summary>
+        internal int LocalNumberOfSlices
+        {
+            get { return (_LocalNumberOfSlices); }
+        }
+
+        #endregion
+
+        #region AllDayPanel properties
+
+        /// <summary>
+        /// Gets the view's AllDayPanel
+        /// </summary>
+        internal AllDayPanel AllDayPanel
+        {
+            get { return (_AllDayPanel); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Private properties
+
+        #region DayColumnWidth
+
+        /// <summary>
+        /// Gets the DayColumnWidth
+        /// </summary>
+        private float DayColumnWidth
+        {
+            get { return (((float)ClientRect.Width - 1) / _NumberOfColumns); }
+        }
+
+        #endregion
+
+        #region AllDay Panel properties
+
+        /// <summary>
+        /// Gets the maximum AllDayPanel height
+        /// </summary>
+        private int MaximumAllDayPanelHeight
+        {
+            get { return (CalendarView.MaximumAllDayPanelHeight); }
+        }
+
+        #endregion
+
+        #region Time Slice properties
+
+        /// <summary>
+        /// Gets the TimeSlotDuration
+        /// </summary>
+        private int TimeSlotDuration
+        {
+            get { return (CalendarView.TimeSlotDuration); }
+        }
+
+        /// <summary>
+        /// Gets the default Time Slice height
+        /// </summary>
+        private float TimeSliceHeight
+        {
+            get { return (CalendarView.TimeSliceHeight); }
+            set { CalendarView.TimeSliceHeight = value; }
+        }
+
+        /// <summary>
+        /// Gets the SlotsPerHour
+        /// </summary>
+        private int SlotsPerHour
+        {
+            get { return (CalendarView.SlotsPerHour); }
+        }
+
+        /// <summary>
+        /// Gets the NumberOfSlices
+        /// </summary>
+        private int NumberOfSlices
+        {
+            get { return (CalendarView.NumberOfSlices); }
+            set { CalendarView.NumberOfSlices = value; }
+        }
+
+        /// <summary>
+        /// Gets the NumberOfActiveSlices
+        /// </summary>
+        private int NumberOfActiveSlices
+        {
+            get { return (CalendarView.NumberOfActiveSlices); }
+        }
+
+        /// <summary>
+        /// Gets the StartSlice
+        /// </summary>
+        private int StartSlice
+        {
+            get { return (CalendarView.StartSlice); }
+            set { CalendarView.StartSlice = value; }
+        }
+
+        #endregion
+
+        #region BusyBrush
+
+        /// <summary>
+        /// Gets and sets the Busy time brush
+        /// </summary>
+        private Brush BusyBrush
+        {
+            get
+            {
+                Color color = _ViewColor.GetColor(
+                    (int)eCalendarWeekDayPart.DayAllDayEventBackground);
+
+                if (_BusyColor != color)
+                {
+                    _BusyColor = color;
+
+                    BusyBrush = new SolidBrush(color);
+                }
+
+                return (_BusyBrush);
+            }
+
+            set
+            {
+                if (_BusyBrush != value)
+                {
+                    if (_BusyBrush != null)
+                        _BusyBrush.Dispose();
+
+                    _BusyBrush = value;
+                }
+            }
+        }
+
+        #endregion
+
+        #region WorkBrush
+
+        /// <summary>
+        /// Gets and sets the Work time brush
+        /// </summary>
+        private Brush WorkBrush
+        {
+            get
+            {
+                Color color = _ViewColor.GetColor(
+                    (int)eCalendarWeekDayPart.DayWorkHoursBackground);
+
+                if (_WorkColor != color)
+                {
+                    _WorkColor = color;
+
+                    WorkBrush = new SolidBrush(color);
+                }
+
+                return (_WorkBrush);
+            }
+
+            set
+            {
+                if (_WorkBrush != value)
+                {
+                    if (_WorkBrush != null)
+                        _WorkBrush.Dispose();
+
+                    _WorkBrush = value;
+                }
+            }
+        }
+
+        #endregion
+
+        #region OffWorkBrush
+
+        /// <summary>
+        /// Gets and sets the Off-hours work time brush
+        /// </summary>
+        private Brush OffWorkBrush
+        {
+            get
+            {
+                Color color = _ViewColor.GetColor(
+                    (int)eCalendarWeekDayPart.DayOffWorkHoursBackground);
+
+                if (_OffWorkColor != color)
+                {
+                    _OffWorkColor = color;
+
+                    OffWorkBrush = new SolidBrush(color);
+                }
+
+                return (_OffWorkBrush);
+            }
+
+            set
+            {
+                if (_OffWorkBrush != value)
+                {
+                    if (_OffWorkBrush != null)
+                        _OffWorkBrush.Dispose();
+
+                    _OffWorkBrush = value;
+                }
+            }
+        }
+
+        #endregion
+
+        #region AllDayBrush
+
+        /// <summary>
+        /// Gets and sets the Off-hours work time brush
+        /// </summary>
+        private Brush AllDayBrush
+        {
+            get
+            {
+                Color color = _ViewColor.GetColor(
+                    (int)eCalendarWeekDayPart.DayAllDayEventBackground);
+
+                if (_AllDayColor != color)
+                {
+                    _AllDayColor = color;
+
+                    AllDayBrush = new SolidBrush(color);
+                }
+
+                return (_AllDayBrush);
+            }
+
+            set
+            {
+                if (_AllDayBrush != value)
+                {
+                    if (_AllDayBrush != null)
+                        _AllDayBrush.Dispose();
+
+                    _AllDayBrush = value;
+                }
+            }
+        }
+
+        #endregion
+
+        #region SelectedBrush
+
+        /// <summary>
+        /// Gets and sets the selected brush
+        /// </summary>
+        private Brush SelectedBrush
+        {
+            get
+            {
+                Color color = _ViewColor.GetColor(
+                    (int)eCalendarWeekDayPart.SelectionBackground);
+
+                if (_SelectedColor != color)
+                {
+                    _SelectedColor = color;
+
+                    SelectedBrush = new SolidBrush(color);
+                }
+
+                return (_SelectedBrush);
+            }
+
+            set
+            {
+                if (_SelectedBrush != value)
+                {
+                    if (_SelectedBrush != null)
+                        _SelectedBrush.Dispose();
+
+                    _SelectedBrush = value;
+                }
+            }
+        }
+
+        #endregion
+
+        #region FirstOnScreenSlice
+
+        private int FirstOnScreenSlice
+        {
+            get { return ((int)(-_VScrollPos / TimeSliceHeight)); }
+        }
+
+        #endregion
+
+        #region LastOnScreenSlice
+
+        private int LastOnScreenSlice
+        {
+            get { return (FirstOnScreenSlice + OnScreenSlices - 1); }
+        }
+
+        #endregion
+
+        #region OnScreenSlices
+
+        private int OnScreenSlices
+        {
+            get { return ((int)Math.Ceiling(VsPanel.ScrollBar.Height / TimeSliceHeight)); }
+        }
+
+        #endregion
+
+        #region VsPanel
+
+        /// <summary>
+        /// Gets the WeekDay vertical scroll panel
+        /// </summary>
+        private VScrollPanel VsPanel
+        {
+            get { return (CalendarView.WeekDayVScrollPanel); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Hook / Unhook Events
+
+        /// <summary>
+        /// Routine hooks all necessary events for this control
+        /// </summary>
+        /// <param name="hook">True to hook, false to unhook</param>
+        private void HookEvents(bool hook)
+        {
+            if (hook == true)
+            {
+                CalendarView.SelectedViewChanged += SelectedViewChanged;
+                CalendarView.TimeSlotDurationChanged += TimeSlotDurationChanged;
+                CalendarView.FixedAllDayPanelHeightChanged += FixedAllDayPanelHeightChanged;
+                CalendarView.MaximumAllDayPanelHeightChanged += MaximumAllDayPanelHeightChanged;
+                CalendarView.WeekDayVScrollPanel.ScrollBarChanged += VScrollPanelScrollBarChanged;
+
+                if (this.ECalendarView == eCalendarView.Day)
+                {
+                    CalendarView.DayViewDateChanged += DayViewDateChanged;
+                }
+                else
+                {
+                    CalendarView.WeekViewStartDateChanged += WeekViewStartDateChanged;
+                    CalendarView.WeekViewEndDateChanged += WeekViewEndDateChanged;
+                }
+            }
+            else
+            {
+                CalendarView.SelectedViewChanged -= SelectedViewChanged;
+                CalendarView.TimeSlotDurationChanged -= TimeSlotDurationChanged;
+                CalendarView.FixedAllDayPanelHeightChanged -= FixedAllDayPanelHeightChanged;
+                CalendarView.MaximumAllDayPanelHeightChanged -= MaximumAllDayPanelHeightChanged;
+                CalendarView.WeekDayVScrollPanel.ScrollBarChanged -= VScrollPanelScrollBarChanged;
+
+                if (this.ECalendarView == eCalendarView.Day)
+                {
+                    CalendarView.DayViewDateChanged -= DayViewDateChanged;
+                }
+                else
+                {
+                    CalendarView.WeekViewStartDateChanged -= WeekViewStartDateChanged;
+                    CalendarView.WeekViewEndDateChanged -= WeekViewEndDateChanged;
+                }
+            }
+        }
+
+        #endregion
+
+        #region Event handling routines
+
+        #region SelectedViewChanged
+
+        /// <summary>
+        /// Processes view changes
+        /// </summary>
+        /// <param name="sender">object</param>
+        /// <param name="e">SelectedViewEventArgs</param>
+        void SelectedViewChanged(object sender, SelectedViewEventArgs e)
+        {
+            // Update our IsViewSelected state
+
+            IsViewSelected = (e.NewValue == this.ECalendarView);
+
+            if (IsViewSelected == true)
+            {
+                AutoSyncViewDate(e.OldValue);
+
+                UpdateDateSelection();
+            }
+            else
+            {
+                ResetView();
+            }
+
+            // Update our AllDayPanel view
+
+            _AllDayPanel.UpdateView();
+
+        }
+
+        #endregion
+
+        #region DayViewDateChanged
+
+        /// <summary>
+        /// Processes DayViewDate changes
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void DayViewDateChanged(object sender, DateChangeEventArgs e)
+        {
+            StartDate = e.NewValue;
+            EndDate = e.NewValue;
+        }
+
+        #endregion
+
+        #region WeekViewStartDateChanged
+
+        /// <summary>
+        /// Processes StartDate changes
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void WeekViewStartDateChanged(object sender, DateChangeEventArgs e)
+        {
+            StartDate = e.NewValue;
+        }
+
+        #endregion
+
+        #region WeekViewEndDateChanged
+
+        /// <summary>
+        /// Processes EndDate changes
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void WeekViewEndDateChanged(object sender, DateChangeEventArgs e)
+        {
+            EndDate = e.NewValue;
+        }
+
+        #endregion
+
+        #region TimeSlotDurationChanged
+
+        /// <summary>
+        /// Handles TimeSlotDurationChanged events
+        /// </summary>
+        /// <param name="sender">object</param>
+        /// <param name="e">TimeSlotDurationChangedEventArgs</param>
+        void TimeSlotDurationChanged(
+            object sender, TimeSlotDurationChangedEventArgs e)
+        {
+            // Reset our slice selection range and
+            // invalidate our control
+
+            _SelectedSliceStart = 0;
+            _SelectedSliceEnd = 0;
+
+            NeedRecalcLayout = true;
+            RecalcSize();
+        }
+
+        #endregion
+
+        #region FixedAllDayPanelHeightChanged
+
+        /// <summary>
+        /// Handles FixedAllDayPanelHeightChanged events
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void FixedAllDayPanelHeightChanged(
+            object sender, FixedAllDayPanelHeightChangedEventArgs e)
+        {
+            NeedRecalcLayout = true;
+        }
+
+        #endregion
+
+        #region MaximumAllDayPanelHeightChanged
+
+        /// <summary>
+        /// Handles MaximumAllDayPanelHeightChanged events
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void MaximumAllDayPanelHeightChanged(
+            object sender, MaximumAllDayPanelHeightChangedEventArgs e)
+        {
+            NeedRecalcLayout = true;
+        }
+
+        #endregion
+
+        #region VScrollPanel_ScrollBarChanged
+
+        /// <summary>
+        /// Handles ScrollBarChanged events
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void VScrollPanelScrollBarChanged(object sender, EventArgs e)
+        {
+            int vdelta = -VsPanel.ScrollBar.Value - _VScrollPos;
+
+            if (vdelta != 0)
+            {
+                _VScrollPos = -VsPanel.ScrollBar.Value;
+
+                // Offset our DayColumn accordingly
+
+                for (int i = 0; i < _NumberOfColumns; i++)
+                {
+                    DayColumn dayColumn = _DayColumns[i];
+
+                    Rectangle r = dayColumn.Bounds;
+                    r.Y += vdelta;
+
+                    dayColumn.Bounds = r;
+
+                    for (int j = 0; j < dayColumn.CalendarItems.Count; j++)
+                    {
+                        dayColumn.CalendarItems[j].Displayed =
+                            dayColumn.CalendarItems[j].Bounds.IntersectsWith(ClientRect);
+                    }
+                }
+                
+                // Redraw our view
+
+                InvalidateRect(ViewRect);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetViewAreaFromPoint
+
+        /// <summary>
+        /// Gets the view area under the given mouse
+        /// point (tab, header, content, etc)
+        /// </summary>
+        /// <param name="pt">Point</param>
+        /// <returns>eViewArea</returns>
+        public override eViewArea GetViewAreaFromPoint(Point pt)
+        {
+            if (Bounds.Contains(pt) == true)
+            {
+                if (pt.Y >= ClientRect.Y)
+                {
+                    if (AllDayPanel.Bounds.Contains(pt))
+                        return (eViewArea.InAllDayPanel);
+
+                    if (pt.Y < ClientRect.Y + DayOfWeekHeaderHeight)
+                        return (eViewArea.InDayOfWeekHeader);
+
+                    return (eViewArea.InContent);
+                }
+
+                return (base.GetViewAreaFromPoint(pt));
+            }
+
+            return (eViewArea.NotInView);
+        }
+
+        #endregion
+
+        #region GetDateSelectionFromPoint
+
+        /// <summary>
+        /// Gets the date selection from the given point. The startDate
+        /// and endDate will vary based upon the view type (WeekDay / Month)
+        /// </summary>
+        /// <param name="pt">Point in question</param>
+        /// <param name="startDate">out start date</param>
+        /// <param name="endDate">out end date</param>
+        /// <returns>True if a valid selection exists
+        /// at the given point</returns>
+        public override bool GetDateSelectionFromPoint(
+            Point pt, out DateTime startDate, out DateTime endDate)
+        {
+            base.GetDateSelectionFromPoint(pt, out startDate, out endDate);
+
+            int col, slice;
+
+            if (GetPointItem(pt, out col, out slice, true) == true)
+            {
+                startDate = GetTime(_DayColumns[col].Date, slice, 0);
+                endDate = startDate.AddMinutes(TimeSlotDuration);
+
+                return (true);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region GetDateBounds
+
+        /// <summary>
+        /// Gets the bounding display rectangle for the given date/time.
+        /// </summary>
+        /// <param name="date">The date/time</param>
+        /// <returns>Bounding display rectangle</returns>
+        public Rectangle GetDateBounds(DateTime date)
+        {
+            int col = GetColumnFromDate(date);
+
+            if (col >= 0)
+            {
+                int slice = GetDateSlice(date);
+
+                if (slice >= 0)
+                    return (GetSliceRect(col, slice));
+            }
+
+            return (Rectangle.Empty);
+        }
+
+        /// <summary>
+        /// Gets the bounding display rectangle for the given
+        /// starting and ending date/time range.
+        /// </summary>
+        /// <param name="startDate">Start date</param>
+        /// <param name="endDate">End date</param>
+        /// <returns>Bounding display rectangle</returns>
+        public Rectangle GetDateBounds(DateTime startDate, DateTime endDate)
+        {
+            Rectangle r1 = GetDateBounds(startDate);
+            Rectangle r2 = GetDateBounds(endDate);
+
+            return (Rectangle.Union(r1, r2));
+        }
+
+        #endregion
+
+        #region IsAllDayItem
+
+        internal bool IsAllDayItem(CalendarItem item)
+        {
+            if (item.Equals(SelectedItem) &&
+                (IsEndResizing || IsStartResizing || IsMoving))
+            {
+                return (false);
+            }
+
+            return (IsAllDayItem(item.StartTime, item.EndTime));
+        }
+
+        internal bool IsAllDayItem(Appointment item)
+        {
+            if (SelectedItem != null && item.Equals(SelectedItem.ModelItem) &&
+                (IsEndResizing || IsStartResizing || IsMoving))
+            {
+                return (false);
+            }
+
+            return (IsAllDayItem(item.StartTime, item.EndTime));
+        }
+
+        private bool IsAllDayItem(DateTime startTime, DateTime endTime)
+        {
+            //if (NumberOfColumns > 1 || 
+            if (    CalendarView.AllDayDisplayMode != eAllDayDisplayMode.None)
+            {
+                if ((endTime - startTime).TotalDays >= 1)
+                    return (true);
+            }
+
+            //if (NumberOfColumns > 1 ||
+            if (    CalendarView.AllDayDisplayMode == eAllDayDisplayMode.ByDayBoundary)
+            {
+                return (startTime.Day != endTime.Day ||
+                        (endTime - startTime).TotalDays > 1);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region SetSelectedItem
+
+        /// <summary>
+        /// Handles selected item changes
+        /// </summary>
+        /// <param name="sender">CalendarItem</param>
+        /// <param name="e">EventArgs</param>
+        internal void ItemIsSelectedChanged(object sender, EventArgs e)
+        {
+            CalendarItem ci = sender as CalendarItem;
+
+            if (ci != null)
+            {
+                if (ci.IsSelected == true)
+                {
+                    SelectedItem = SetSelectedItem(SelectedItem, ci);
+                }
+                else
+                {
+                    if (ci == SelectedItem)
+                        SelectedItem = null;
+                }
+            }
+        }
+
+        #region SetSelectedItem
+
+        protected override CalendarItem SetSelectedItem(CalendarItem pci, CalendarItem nci)
+        {
+            CalendarItem selItem = null;
+
+            for (int i = 0; i < DayColumns.Length; i++)
+                selItem = SetSelectedCalendarItem(nci, DayColumns[i].CalendarItems, selItem);
+
+            selItem = SetSelectedCalendarItem(nci, AllDayPanel.CalendarItems, selItem);
+
+            return (selItem);
+        }
+
+        #region SetSelectedCalendarItem
+
+        private CalendarItem SetSelectedCalendarItem(
+            CalendarItem nci, List<CalendarItem> items, CalendarItem selItem)
+        {
+            for (int i = 0; i < items.Count; i++)
+            {
+                CalendarItem item = items[i];
+
+                item.IsSelected = (nci != null ? (item.ModelItem == nci.ModelItem) : false);
+
+                if (item.IsSelected == true && selItem == null)
+                {
+                    selItem = item;
+                    SelectedItem = item;
+                }
+            }
+
+            return (selItem);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region UpdateDateSelection
+
+        #region UpdateDateSelection
+
+        /// <summary>
+        /// Updates our slice selection range to reflect
+        /// the given date selection start and end values
+        /// </summary>
+        protected override void UpdateDateSelection()
+        {
+            if (IsViewSelected == true)
+            {
+                // Get the new absolute slice selection range
+
+                int sliceStart = 0;
+                int sliceEnd = 0;
+
+                if (DateSelectionStart.HasValue && DateSelectionEnd.HasValue)
+                {
+                    sliceStart = GetDateSlice(DateSelectionStart);
+                    sliceEnd = GetDateSlice(DateSelectionEnd);
+
+                    if (sliceStart < 0 && sliceEnd < 0)
+                    {
+                        sliceStart = 0;
+                        sliceEnd = 0;
+                    }
+
+                    if (sliceStart < 0)
+                        sliceStart = 0;
+
+                    if (sliceEnd < 0)
+                        sliceEnd = _NumberOfColumns * NumberOfActiveSlices;
+                }
+
+                // Limit our range to only those slices
+                // that are visible on the screen
+
+                int s1 = (int)(-_VScrollPos / TimeSliceHeight);
+                int s2 = (int)(s1 + ViewRect.Height / TimeSliceHeight + 2);
+
+                if (s2 > s1)
+                {
+                    ProcessSelRange(sliceStart, sliceEnd, s1, s2);
+
+                    // Save our new selection range
+
+                    _SelectedSliceStart = sliceStart;
+                    _SelectedSliceEnd = sliceEnd;
+                }
+            }
+        }
+
+        #endregion
+
+        #region GetDateSlice
+
+        /// <summary>
+        /// Gets the absolute slice value for the given date
+        /// </summary>
+        /// <param name="selDate">Selection date</param>
+        /// <returns>Absolute slice</returns>
+        private int GetDateSlice(DateTime? selDate)
+        {
+            if (selDate.HasValue)
+                return (GetDateSlice(selDate.Value));
+
+            return (-1);
+        }
+
+        private int GetDateSlice(DateTime selDate)
+        {
+            // Loop through each column
+
+            for (int i = 0; i < _NumberOfColumns; i++)
+            {
+                DateTime date = _DayColumns[i].Date;
+
+                // If we have found our containing column, then
+                // calculate the absolute slice value and return it
+
+                if (selDate >= date && selDate < date.AddDays(1))
+                {
+                    int slice = ((selDate.Hour * MinutesPerHour) + selDate.Minute) / TimeSlotDuration;
+
+                    return (i * NumberOfActiveSlices + slice - StartSlice);
+                }
+            }
+
+            return (-1);
+        }
+
+        #endregion
+
+        #region ProcessSelRange
+
+        /// <summary>
+        /// Processes the selection time slice range
+        /// </summary>
+        /// <param name="sliceStart">Slice range start</param>
+        /// <param name="sliceEnd">Slice range end</param>
+        /// <param name="s1">Slice start limit</param>
+        /// <param name="s2">Slice end limit</param>
+        private void ProcessSelRange(int sliceStart, int sliceEnd, int s1, int s2)
+        {
+            // Calculate our starting and ending column range
+
+            int fcol = Math.Min(_SelectedSliceStart / NumberOfActiveSlices, sliceStart / NumberOfActiveSlices);
+            int lcol = Math.Max(_SelectedSliceEnd / NumberOfActiveSlices, sliceEnd / NumberOfActiveSlices);
+
+            lcol = Math.Min(_NumberOfColumns - 1, lcol);
+
+            // Loop through each column
+
+            for (int i = fcol; i <= lcol; i++)
+            {
+                // Get the selection status for the given range
+
+                bool[] oldSelected = SelectedSlices(s1, s2, i, _SelectedSliceStart, _SelectedSliceEnd);
+                bool[] newSelected = SelectedSlices(s1, s2, i, sliceStart, sliceEnd);
+
+                // Invalidate those slices whose
+                // selection status changed
+
+                Rectangle vRect = ViewRect;
+
+                for (int j = 0; j < s2 - s1; j++)
+                {
+                    if (oldSelected[j] != newSelected[j])
+                    {
+                        Rectangle r = GetSliceRect(i, s1 + j);
+
+                        r.Intersect(vRect);
+
+                        if (r.Width > 0 && r.Height > 0)
+                            InvalidateRect(r);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region SelectedSlices
+
+        /// <summary>
+        /// Gets an array of slice selection values
+        /// over the given range of column slices
+        /// </summary>
+        /// <param name="s1">Slice start limit</param>
+        /// <param name="s2">Slice end limit</param>
+        /// <param name="col">Column</param>
+        /// <param name="sliceStart">Slice range start</param>
+        /// <param name="sliceEnd">Slice range end</param>
+        /// <returns>Array of selection values</returns>
+        private bool[] SelectedSlices(int s1, int s2, int col, int sliceStart, int sliceEnd)
+        {
+            // Calculate our number of entries and
+            // allocate our IsSelected array accordingly
+
+            int n = s2 - s1;
+
+            bool[] sel = new bool[n + 1];
+
+            // Loop through the range of entries determining if
+            // the specific slice is within the selection range
+
+            int slice = col * NumberOfActiveSlices + s1;
+
+            for (int i = 0; i < n; i++)
+            {
+                sel[i] = (slice >= sliceStart && slice < sliceEnd);
+
+                slice++;
+            }
+
+            // Return the array to the caller
+
+            return (sel);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RecalcSize routines
+
+        #region RecalcSize
+
+        /// <summary>
+        /// Performs NeedRecalcSize requests
+        /// </summary>
+        public override void RecalcSize()
+        {
+            base.RecalcSize();
+
+            if (IsViewSelected == true)
+            {
+                // Normalize our start and end dates
+
+                DateTime startDate;
+                DateTime endDate;
+
+                NormalizeDates(out startDate, out endDate);
+
+                if (NeedRecalcLayout == true)
+                    _DayColumnSize = null;
+
+                // Allocate our DayColumns
+
+                AllocateDayColumns(startDate, endDate);
+
+                // Update our Model connection view,
+                // AllDayPanel, CalendarItems, and DateSelection
+
+                UpdateView();
+
+                UpdateAllDayPanelItems();
+                UpdateDayColumns(startDate, endDate);
+                UpdateCalendarItems();
+
+                UpdateDateSelection();
+
+                // Set our display view rectangle
+
+                Rectangle r = ClientRect;
+
+                r.Y += DayOfWeekHeaderHeight;
+                r.Height -= DayOfWeekHeaderHeight;
+
+                SetViewRectangle(r);
+
+                // Final Recalc cleanup
+
+                if (DaysOfTheWeek != null)
+                    DaysOfTheWeek.NeedsMeasured = true;
+
+                NeedRecalcLayout = false;
+
+                CalendarView.DoViewLoadComplete(this);
+            }
+        }
+
+        #endregion
+
+        #region NormalizeDates
+
+        /// <summary>
+        /// Normalizes the user specified start and end dates
+        /// </summary>
+        /// <param name="startDate">[out] Normalized start date</param>
+        /// <param name="endDate">[out] Normalized end date</param>
+        protected virtual void NormalizeDates(out DateTime startDate, out DateTime endDate)
+        {
+            startDate = this.StartDate;
+            endDate = this.EndDate;
+        }
+
+        #endregion
+
+        #region AllocateDayColumns
+
+        /// <summary>
+        /// Allocates out DayColumns
+        /// </summary>
+        /// <param name="startDate"></param>
+        /// <param name="endDate"></param>
+        private void AllocateDayColumns(DateTime startDate, DateTime endDate)
+        {
+            // Allocate our DayColumns array to
+            // hold our info
+
+            _NumberOfColumns = (endDate - startDate).Days + 1;
+            _NumberOfColumns = Math.Max(_NumberOfColumns, 1);
+            _NumberOfColumns = Math.Min(_NumberOfColumns, MaxNumberOfColumns);
+
+            if (_DayColumns == null || _DayColumns.Length != _NumberOfColumns)
+                _DayColumns = new DayColumn[_NumberOfColumns];
+
+            // Prepare to update display info on each time slot
+
+            Rectangle r = ViewRect;
+            r.Y += _VScrollPos;
+
+            // Loop through each day column
+
+            float dcWidth = DayColumnWidth;
+            float x1 = r.X;
+
+            // Update each DayColumn
+
+            for (int i = 0; i < _NumberOfColumns; i++)
+            {
+                if (_DayColumns[i] == null)
+                    _DayColumns[i] = new DayColumn(0);
+
+                _DayColumns[i].Date = startDate.AddDays(i);
+
+                float x2 = (i == _NumberOfColumns - 1) ? r.Right - 1 : x1 + dcWidth;
+
+                if (IsLayoutNeeded(i) == true)
+                    _DayColumns[i].Bounds = new Rectangle((int) x1, r.Y, (int) x2 - (int) x1, r.Height);
+
+                x1 = x2;
+            }
+        }
+
+        #endregion
+
+        #region UpdateView
+
+        /// <summary>
+        /// Updates our connection model view
+        /// </summary>
+        private void UpdateView()
+        {
+            // If we have had a date range change, just
+            // reset our entire view
+
+            if (DateRangeChanged == true)
+                ResetView();
+
+            // If we have no Model connection, attempt
+            // to reconnect if this view is selected
+
+            if (Connector == null)
+            {
+                if (CalendarModel != null)
+                {
+                    Connector = new ModelWeekDayViewConnector(CalendarModel, this);
+
+                    SubItems.Insert(0, _AllDayPanel);
+                }
+            }
+       }
+
+        #endregion
+
+        #region ResetView
+
+        /// <summary>
+        /// Disconnects and resets the Model connection
+        /// </summary>
+        internal override void ResetView()
+        {
+            _AllDayPanel.ResetView();
+
+            base.ResetView();
+        }
+
+        #endregion
+
+        #region UpdateAllDayPanelItems
+
+        /// <summary>
+        /// Updates our AllDayPanel items
+        /// </summary>
+        private void UpdateAllDayPanelItems()
+        {
+            if (NeedRecalcLayout == true)
+            {
+                // Initiate a RecalcSize for the panel
+
+                _AllDayPanel.WidthInternal = ClientRect.Width;
+                _AllDayPanel.HeightInternal = MaximumAllDayPanelHeight;
+
+                _AllDayPanel.RecalcSize();
+
+                // Set the panel's bounding rect accordingly
+
+                Rectangle r = ClientRect;
+
+                r.Width = _AllDayPanel.WidthInternal;
+
+                r.Y += DayOfWeekHeaderHeight;
+                r.Height = _AllDayPanel.HeightInternal;
+
+                _AllDayPanel.Bounds = r;
+            }
+        }
+
+        private bool IsLayoutNeeded(int col)
+        {
+            return (NeedRecalcLayout == true ||
+                _DayColumns[col].NeedRecalcLayout == true);
+        }
+
+        #endregion
+
+        #region UpdateDayColumns
+
+        /// <summary>
+        /// Calculates and updates DayColumn bounds
+        /// </summary>
+        /// <param name="startDate">Start date</param>
+        /// <param name="endDate">End date</param>
+        protected void UpdateDayColumns(DateTime startDate, DateTime endDate)
+        {
+            // Establish our current TimeSlice range
+
+            GetTimeSliceData();
+
+            // Updating display info on each column
+
+            Rectangle r = ViewRect;
+
+            r.Y += _VScrollPos;
+            r.Height = (int) (TimeSliceHeight * NumberOfSlices);
+
+            for (int i = 0; i < _NumberOfColumns; i++)
+            {
+                _DayColumns[i].TimeSliceHeight = TimeSliceHeight;
+
+                if (IsLayoutNeeded(i) == true)
+                {
+                    _DayColumns[i].Bounds = new
+                        Rectangle(_DayColumns[i].Bounds.X, r.Y, _DayColumns[i].Bounds.Width, r.Height);
+
+                    InvalidateRect(_DayColumns[i].Bounds);
+                }
+            }
+        }
+
+        #region GetTimeSliceData
+
+        private void GetTimeSliceData()
+        {
+            _LocalStartSlice = 0;
+            _LocalNumberOfSlices = (HoursPerDay * MinutesPerHour) / TimeSlotDuration + 1;
+
+            if (CalendarView.ShowOnlyWorkDayHours == true)
+            {
+                WorkTime startTime = new WorkTime(23, 59);
+                WorkTime endTime = new WorkTime(0, 0);
+
+                for (int i = 0; i < NumberOfColumns; i++)
+                {
+                    DayColumn dc = _DayColumns[i];
+
+                    if (dc.WorkStartTime.IsEmpty == false || dc.WorkEndTime.IsEmpty == false)
+                    {
+                        if (dc.WorkStartTime <= dc.WorkEndTime)
+                        {
+                            if (dc.WorkStartTime < startTime)
+                                startTime = dc.WorkStartTime;
+
+                            if (dc.WorkEndTime > endTime)
+                                endTime = dc.WorkEndTime;
+                        }
+                        else
+                        {
+                            startTime = new WorkTime(0, 0);
+                            endTime = new WorkTime(23, 59);
+
+                            break;
+                        }
+                    }
+                }
+
+                if (endTime > startTime)
+                {
+                    int startMinutes = (startTime.Hour * MinutesPerHour) + startTime.Minute;
+                    int endMinutes = (endTime.Hour * MinutesPerHour) + endTime.Minute;
+
+                    _LocalStartSlice = startMinutes / TimeSlotDuration;
+                    _LocalNumberOfSlices = (endMinutes - startMinutes) / TimeSlotDuration + 1;
+                }
+
+                if (StartSlice >= 0)
+                {
+                    int endSlice = _LocalStartSlice + _LocalNumberOfSlices - 1;
+
+                    if (_LocalStartSlice > StartSlice)
+                        _LocalStartSlice = StartSlice;
+
+                    if (StartSlice + NumberOfSlices > endSlice)
+                        endSlice = StartSlice + NumberOfSlices - 1;
+
+                    _LocalNumberOfSlices = endSlice - _LocalStartSlice + 1;
+                }
+            }
+
+            StartSlice = _LocalStartSlice;
+            NumberOfSlices = _LocalNumberOfSlices;
+            
+            TimeSliceHeight = (float)ViewRect.Height / NumberOfActiveSlices;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region UpdateCalendarItems
+
+        /// <summary>
+        /// Updates our CalendarItems list
+        /// </summary>
+        private void UpdateCalendarItems()
+        {
+            List<ColumnList> list = new List<ColumnList>();
+
+            for (int i = 0; i < _NumberOfColumns; i++)
+            {
+                if (IsLayoutNeeded(i) == true)
+                {
+                    if (_DayColumns[i].CalendarItems.Count > 0)
+                    {
+                        List<CalendarItem> items = SortCalendarItems(i);
+
+                        list.Clear();
+
+                        for (int j = 0; j < items.Count; j++)
+                        {
+                            ColumnList colList = GetColList(list, items[j]);
+
+                            colList.AddColumnSlot(items[j], 0);
+                        }
+
+                        foreach (ColumnList colList in list)
+                            colList.CountColumns();
+
+                        CalcAppointmentBounds(i, list);
+                    }
+
+                    _DayColumns[i].NeedRecalcLayout = false;
+                }
+            }
+        }
+
+        #region GetColList
+
+        private ColumnList GetColList(List<ColumnList> list, CalendarItem item)
+        {
+            int id = CalendarView.DoGetAppointmentGroupId(item, -1);
+
+            int index;
+            if (GetColListIndex(list, id, out index) == true)
+                return (list[index]);
+
+            ColumnList clist = new ColumnList(id);
+
+            if (index < list.Count)
+                list.Insert(index, clist);
+            else
+                list.Add(clist);
+
+            return (clist);
+        }
+
+        #region GetColListIndex
+
+        private bool GetColListIndex(List<ColumnList> list, int id, out int index)
+        {
+            for (index=0; index < list.Count; index++)
+            {
+                ColumnList colList = list[index];
+
+                if (colList.Id == id)
+                    return (true);
+
+                if (colList.Id > id)
+                    break;
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region SortCalendarItems
+
+        /// <summary>
+        /// Sorts the DayColumn CalendarItem list
+        /// </summary>
+        /// <param name="col">DayColumn index</param>
+        private List<CalendarItem> SortCalendarItems(int col)
+        {
+            List<CalendarItem> items = new List<CalendarItem>();
+
+            items.AddRange(_DayColumns[col].CalendarItems);
+
+            if (items.Count > 0)
+            {
+                items.Sort(
+
+                   delegate(CalendarItem c1, CalendarItem c2)
+                   {
+                       if (c1.StartTime > c2.StartTime)
+                           return (1);
+
+                       if (c1.StartTime < c2.StartTime)
+                           return (-1);
+
+                       if (c1.EndTime - c1.StartTime > c2.EndTime - c2.StartTime)
+                           return (1);
+
+                       if (c1.EndTime - c1.StartTime < c2.EndTime - c2.StartTime)
+                           return (-1);
+
+                       int result = 0;
+                       CalendarView.DoDetailSortEvent(this, c1, c2, ref result);
+
+                       return (result);
+                   }
+               );
+            }
+
+            return (items);
+        }
+
+        #endregion
+
+        #region CalcAppointmentBounds
+
+        /// <summary>
+        /// Calculates normal appointment bounds
+        /// </summary>
+        /// <param name="col">DayColumn column</param>
+        /// <param name="colList">Accumulated ColumnList</param>
+        private void CalcAppointmentBounds(int col, List<ColumnList> list)
+        {
+            Rectangle r = _DayColumns[col].Bounds;
+
+            r.X++;
+            r.Width -= 8;
+
+            for (int k = 0; k < list.Count; k++)
+            {
+                ColumnList colList = list[k];
+
+                Rectangle r3 = r;
+                float dx3 = (float)r3.Width / list.Count;
+
+                r3.X += (int)(dx3 * k);
+                r3.Width = (int)dx3;
+
+                for (int i = 0; i < colList.SList.Count; i++)
+                {
+                    for (int j = 0; j < colList.SList[i].Count; j++)
+                    {
+                        Rectangle r2 = r3;
+                        SlotItem si = colList.SList[i][j];
+                        CalendarItem item = si.CItem;
+
+                        float dx = (float)r2.Width / si.Count;
+                        r2.X += (int)(dx * i);
+
+                        if (si.SList != null && si.SList.Count == 1)
+                            r2.Width = (int)(dx * (si.SList[0].Column - si.Column));
+
+                        else if (si.SList == null)
+                            r2.Width = r3.Width - (r2.X - r3.X);
+
+                        else
+                            r2.Width = (int)dx;
+
+                        DateTime startTime = item.StartTime;
+
+                        if (startTime.Date < _DayColumns[col].Date)
+                            startTime = _DayColumns[col].Date;
+
+                        DateTime endTime = item.EndTime;
+
+                        if (endTime > _DayColumns[col].Date.AddDays(1))
+                            endTime = _DayColumns[col].Date.AddDays(1);
+
+                        DateTime date = startTime.Date;
+
+                        TimeSpan ts1 = startTime.AddMinutes(-StartSlice * TimeSlotDuration) - date;
+                        TimeSpan ts2 = endTime - startTime;
+
+                        int pos = (int)(ts1.TotalMinutes / TimeSlotDuration * TimeSliceHeight);
+                        int height = (int)Math.Round(ts2.TotalMinutes / TimeSlotDuration * TimeSliceHeight);
+
+                        AppointmentView view = item as AppointmentView;
+
+                        if (view != null)
+                        {
+                            Font font = view.Font ?? CalendarView.Font;
+
+                            if (font != null)
+                                height = Math.Max(font.Height + 6, height);
+                        }
+
+                        r2.Y = r.Y + (int)pos;
+                        r2.Height = height;
+
+                        // Now that we have calculated the items height and
+                        // width, invoke a Recalc on the item
+
+                        item.WidthInternal = r2.Width;
+                        item.HeightInternal = r2.Height - 1;
+
+                        item.RecalcSize();
+
+                        // Set our bounds for the item
+
+                        r2.Width = item.WidthInternal;
+                        r2.Height = item.HeightInternal;
+
+                        if (item.Bounds != r2)
+                        {
+                            InvalidateRect(item.Bounds);
+                            InvalidateRect(r2);
+                        }
+
+                        item.Bounds = r2;
+
+                        // Set it's display state
+
+                        item.Displayed = r2.IntersectsWith(ClientRect);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region Paint processing
+
+        #region Root paint code
+
+        /// <summary>
+        /// Paint processing
+        /// </summary>
+        /// <param name="e">ItemPaintArgs</param>
+        public override void Paint(ItemPaintArgs e)
+        {
+            Graphics g = e.Graphics;
+
+            // Set our current color table
+
+            _ViewColor.SetColorTable();
+
+            // Only draw something if we have something to draw
+
+            if (_DayColumns != null)
+            {
+                // Calculate our drawing ranges
+
+                int dayStart, dayEnd;
+                int sliceStart, sliceEnd;
+
+                int dayCount = GetDayRange(e, out dayStart, out dayEnd);
+                int sliceCount = GetSliceRange(e, out sliceStart, out sliceEnd);
+
+                // Draw our calendar parts
+
+                if (dayCount > 0)
+                    DrawDayOfTheWeekHeader(e, dayStart, dayEnd);
+
+                if (sliceCount > 0 && dayCount > 0)
+                {
+                    // Set our clipping region
+
+                    Rectangle r = ViewRect;
+
+                    r.X = ClientRect.X;
+                    r.Width = ClientRect.Width;
+
+                    Region regSave = g.Clip;
+                    g.SetClip(r, CombineMode.Intersect);
+
+                    // Draw our slices and appointments
+
+                    DrawSlices(e, sliceStart, sliceEnd, dayStart, dayEnd);
+                    DrawTimeIndicators(g, sliceStart, sliceEnd, eTimeIndicatorLevel.Bottom);
+
+                    if (Connector != null && Connector.IsConnected)
+                        DrawWeekAppointments(e, dayStart, dayEnd);
+
+                    DrawTimeIndicators(g, sliceStart, sliceEnd, eTimeIndicatorLevel.Top);
+
+                    // Restore our original clip region
+
+                    g.Clip = regSave;
+                }
+
+                // Initiate the painting of our AllDay Panel
+
+                _AllDayPanel.Paint(e);
+
+                // Update our Alt-Key window
+
+                UpdatePosWin(ViewRect);
+            }
+
+            // Let the base painting take place
+
+            base.Paint(e);
+        }
+
+        #region Clip range routines
+
+        /// <summary>
+        /// Calculates the range of days needed to be drawn
+        /// to satisfy the specified paint request
+        /// </summary>
+        /// <param name="e">ItemPaintArgs</param>
+        /// <param name="dayStart">[out] Day start index</param>
+        /// <param name="dayEnd">[out] Day end index</param>
+        /// <returns>Day range count (end - start)</returns>
+        private int GetDayRange(ItemPaintArgs e, out int dayStart, out int dayEnd)
+        {
+            // Calc our starting index
+
+            int start = 0;
+
+            while (start < _NumberOfColumns)
+            {
+                if (_DayColumns[start].Bounds.Right > e.ClipRectangle.X)
+                    break;
+
+                start++;
+            }
+
+            // Calc our ending index
+
+            int end = start;
+
+            while (end < _NumberOfColumns)
+            {
+                if (_DayColumns[end].Bounds.X >= e.ClipRectangle.Right)
+                    break;
+
+                end++;
+            }
+
+            // Set the user supplied 'out' values, and
+            // return the range count to the caller
+
+            if (end - start == 0)
+            {
+                dayStart = 0;
+                dayEnd = 0;
+
+                return (0);
+            }
+
+            dayStart = start;
+            dayEnd = end - 1;
+
+            return (end - start);
+        }
+
+        /// <summary>
+        /// Calculates the range of slices needed to be drawn
+        /// to satisfy the specified paint request
+        /// </summary>
+        /// <param name="e">ItemPaintArgs</param>
+        /// <param name="sliceStart">[out] Slice start index</param>
+        /// <param name="sliceEnd">[out] Slice end index</param>
+        /// <returns>Slice range count (end - start)</returns>
+        internal int GetSliceRange(ItemPaintArgs e, out int sliceStart, out int sliceEnd)
+        {
+            // Calc our starting index
+
+            int start = 0;
+
+            Rectangle v = ViewRect;
+
+            while (start < NumberOfSlices)
+            {
+                Rectangle r = GetSliceRect(0, start);
+
+                if (r.Bottom > v.Top)
+                {
+                    if (r.Bottom > e.ClipRectangle.Y)
+                        break;
+                }
+
+                start++;
+            }
+
+            // Calc our ending index
+
+            int end = start;
+
+            while (end < NumberOfSlices)
+            {
+                Rectangle r = GetSliceRect(0, end);
+
+                if (r.Y >= e.ClipRectangle.Bottom)
+                    break;
+
+                end++;
+            }
+
+            // Set the user supplied 'out' values, and
+            // return the range count to the caller
+
+            if (end - start == 0)
+            {
+                sliceStart = 0;
+                sliceEnd = 0;
+
+                return (0);
+            }
+
+            sliceStart = start;
+            sliceEnd = end - 1;
+
+            return (end - start);
+        }
+
+        private bool SliceIsSelected(int col, int slice)
+        {
+            int nslice = col * NumberOfActiveSlices + slice;
+
+            return (nslice >= _SelectedSliceStart && nslice < _SelectedSliceEnd);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region DayOfTheWeek header drawing
+
+        #region DrawDayOfTheWeekHeader
+
+        /// <summary>
+        /// Draws the top Day of the week header
+        /// </summary>
+        /// <param name="e">ItemPaintArgs</param>
+        /// <param name="dayStart">Start day index</param>
+        /// <param name="dayEnd">End day index</param>
+        private void DrawDayOfTheWeekHeader(ItemPaintArgs e, int dayStart, int dayEnd)
+        {
+            Graphics g = e.Graphics;
+
+            Rectangle r = new Rectangle(
+                _DayColumns[dayStart].Bounds.X, ClientRect.Y,
+                _DayColumns[dayEnd].Bounds.Right -
+                _DayColumns[dayStart].Bounds.X, DayOfWeekHeaderHeight);
+
+            if (r.Width > 0 && r.Height > 0)
+            {
+                // Establish our Days Of The Week text type
+
+                DaysOfTheWeek.eDayType type = GetDaysOfTheWeekType(g);
+
+                // Loop through each day, drawing the
+                // day of the week text in the header area
+
+                int nowHeader = -1;
+
+                using (Brush br =
+                    _ViewColor.BrushPart((int) eCalendarWeekDayPart.DayHeaderBackground, r))
+                {
+                    using (Pen pen = new Pen(
+                        _ViewColor.GetColor((int) eCalendarWeekDayPart.DayHeaderBorder)))
+                    {
+                        for (int i = dayStart; i <= dayEnd; i++)
+                        {
+                            if (CalendarView.HighlightCurrentDay == true &&
+                                _DayColumns[i].Date.Date.Equals(DateTime.Now.Date))
+                            {
+                                nowHeader = i;
+                                continue;
+                            }
+
+                            DrawColumnHeader(g, i, type, r, br, pen, eCalendarWeekDayPart.DayHeaderForeground);
+                        }
+                    }
+                }
+
+                // Draw the current "Now" header
+
+                if (nowHeader >= 0)
+                {
+                    using (Brush br =
+                        _ViewColor.BrushPart((int) eCalendarWeekDayPart.NowDayHeaderBackground, r))
+                    {
+                        using (Pen pen = new Pen(
+                            _ViewColor.GetColor((int) eCalendarWeekDayPart.NowDayHeaderBorder)))
+                        {
+                            DrawColumnHeader(g, nowHeader, type, r, br, pen, eCalendarWeekDayPart.NowDayHeaderForeground);
+                        }
+                    }
+                }
+            }
+        }
+
+        #region DrawColumnHeader
+
+        /// <summary>
+        /// DrawColumnHeader
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="i"></param>
+        /// <param name="type"></param>
+        /// <param name="r"></param>
+        /// <param name="br"></param>
+        /// <param name="pen"></param>
+        /// <param name="part"></param>
+        private void DrawColumnHeader(Graphics g, int i,
+            DaysOfTheWeek.eDayType type, Rectangle r, Brush br, Pen pen, eCalendarWeekDayPart part)
+        {
+            r.X = _DayColumns[i].Bounds.X;
+            r.Width = _DayColumns[i].Bounds.Width;
+
+            g.FillRectangle(br, r);
+            g.DrawRectangle(pen, r);
+
+            Rectangle t = r;
+
+            if (CalendarView.DoPreRenderWeekDayHeader(g, this, i, t) == false)
+            {
+                // Draw the header text
+
+                int n = i % DaysInWeek;
+
+                eTextFormat tf = eTextFormat.VerticalCenter | eTextFormat.NoPadding;
+
+                r.Inflate(-2, 0);
+                r.X += 1;
+
+                TextDrawing.DrawString(g,
+                                       _DayColumns[i].Date.Day.ToString(), BoldFont, Color.Black, r, tf);
+
+                r.X += _DayColumnSize[n].Width;
+                r.Width -= _DayColumnSize[n].Width;
+
+                if (type != DaysOfTheWeek.eDayType.None)
+                {
+                    tf |= eTextFormat.HorizontalCenter;
+
+                    TextDrawing.DrawString(g, DaysOfTheWeek.DayText[(int) type][n],
+                                           Font, _ViewColor.GetColor((int) part), r, tf);
+                }
+
+                CalendarView.DoPostRenderWeekDayHeader(g, this, i, t);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetDaysOfTheWeekType
+
+        /// <summary>
+        /// Get the index for our day of the week text
+        /// </summary>
+        /// <param name="g">Graphics handle</param>
+        /// <returns>Index to header text</returns>
+        private DaysOfTheWeek.eDayType GetDaysOfTheWeekType(Graphics g)
+        {
+            // Resize our DayColumn day text if it
+            // hasn't been resized previously
+
+            if (_DayColumnSize == null)
+            {
+                _DayColumnSize = new Size[_NumberOfColumns];
+
+                for (int i = 0; i < _NumberOfColumns; i++)
+                {
+                    _DayColumnSize[i] = TextDrawing.MeasureString(g,
+                        _DayColumns[i].Date.Day.ToString(), BoldFont, 0, eTextFormat.NoPadding);
+                }
+            }
+
+            // Determine if the current DayRect bounds
+            // are constrained by the text threshold
+
+            DaysOfTheWeek.MeasureText(g, Font);
+
+            for (int i = 0; i < _NumberOfColumns; i++)
+            {
+                if (_DayColumns[i].Bounds.Width <
+                    _DayColumnSize[i].Width + DaysOfTheWeek.DaySize[(int)DaysOfTheWeek.eDayType.Short][i % 7].Width)
+                {
+                    return (DaysOfTheWeek.eDayType.None);
+                }
+            }
+
+            for (int i = 0; i < _NumberOfColumns; i++)
+            {
+                if (_DayColumns[i].Bounds.Width <
+                    _DayColumnSize[i].Width + DaysOfTheWeek.DaySize[(int)DaysOfTheWeek.eDayType.Long][i % 7].Width)
+                {
+                    return (DaysOfTheWeek.eDayType.Short);
+                }
+            }
+
+            return (DaysOfTheWeek.eDayType.Long);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region DrawSlices
+
+        #region DrawSlices
+
+        /// <summary>
+        /// Draws Normal Appointment time slices
+        /// </summary>
+        /// <param name="e">ItemPaintArgs</param>
+        /// <param name="sliceStart">Start slice</param>
+        /// <param name="sliceEnd">End slice</param>
+        /// <param name="dayStart">Day start</param>
+        /// <param name="dayEnd">Day end</param>
+        private void DrawSlices(ItemPaintArgs e,
+            int sliceStart, int sliceEnd, int dayStart, int dayEnd)
+        {
+            Graphics g = e.Graphics;
+
+            DaySlot[,] daySlots = GetDaySlots(sliceStart, sliceEnd, dayStart, dayEnd);
+
+            DrawContent(g, sliceStart, sliceEnd, dayStart, dayEnd, daySlots);
+            DrawDaySlot(g, sliceStart, sliceEnd, dayStart, dayEnd, daySlots, false);
+
+            DrawBorders(g, sliceStart, sliceEnd, dayStart, dayEnd, daySlots);
+            DrawDaySlot(g, sliceStart, sliceEnd, dayStart, dayEnd, daySlots, true);
+        }
+
+        #endregion
+
+        #region GetDaySlots
+
+        /// <summary>
+        /// Gets the array of DaySlot information
+        /// </summary>
+        /// <param name="sliceStart"></param>
+        /// <param name="sliceEnd"></param>
+        /// <param name="dayStart"></param>
+        /// <param name="dayEnd"></param>
+        /// <returns>array of DaySlots</returns>
+        private DaySlot[,] GetDaySlots(int sliceStart, int sliceEnd, int dayStart, int dayEnd)
+        {
+            DaySlot[,] daySlots = new DaySlot[dayEnd - dayStart + 1, sliceEnd - sliceStart + 1];
+
+            for (int i = dayStart; i <= dayEnd; i++)
+            {
+                for (int j = sliceStart; j <= sliceEnd; j++)
+                {
+                    DaySlot daySlot = new DaySlot();
+
+                    daySlots[i - dayStart, j - sliceStart] = daySlot;
+
+                    daySlot.Bounds = GetSliceRect(i, j);
+                    daySlot.Selected = SliceIsSelected(i, j);
+
+                    if (j <= sliceEnd &&
+                        CalendarView.HasViewDisplayCustomizations == true)
+                    {
+                        int start = ((StartSlice + j) * TimeSlotDuration) % 1440;
+                        int end = Math.Min(start + TimeSlotDuration, 1439);
+
+                        WorkTime wkStart = new WorkTime(start / MinutesPerHour, start % MinutesPerHour);
+                        WorkTime wkEnd = new WorkTime(end / MinutesPerHour, end % MinutesPerHour);
+
+                        daySlot.Appearance = CalendarView.ViewDisplayCustomizations.GetDaySlotAppearance(
+                            OwnerKey, _DayColumns[i].Date, wkStart, wkEnd);
+                    }
+                }
+            }
+
+            return (daySlots);
+        }
+
+        #endregion
+
+        #region DrawContent
+
+        /// <summary>
+        /// Time slice content drawing
+        /// </summary>
+        /// <param name="g">Graphics</param>
+        /// <param name="sliceStart">Start slice</param>
+        /// <param name="sliceEnd">End slice</param>
+        /// <param name="dayStart">Day start</param>
+        /// <param name="dayEnd">Day end</param>
+        /// <param name="daySlots"></param>
+        private void DrawContent(Graphics g,
+            int sliceStart, int sliceEnd, int dayStart, int dayEnd, DaySlot[,] daySlots)
+        {
+            // Loop through each day in each week, displaying
+            // the associated day content
+
+            for (int i = dayStart; i <= dayEnd; i++)
+            {
+                for (int j = sliceStart; j <= sliceEnd; j++)
+                {
+                    DaySlot daySlot = daySlots[i - dayStart, j - sliceStart];
+                    DaySlotAppearance dsa = daySlot.Appearance;
+
+                    if (CalendarView.DoPreRenderWeekDaySlotBackground(g, this, i, j, daySlot.Bounds) == false)
+                    {
+                        if (dsa != null && daySlot.Selected == false)
+                        {
+                            using (Brush br = new SolidBrush(dsa.BackColor))
+                                g.FillRectangle(br, daySlot.Bounds);
+
+                            continue;
+                        }
+
+                        g.FillRectangle(GetContentBrush(daySlot, i, j), daySlot.Bounds);
+                    }
+
+                    CalendarView.DoPostRenderWeekDaySlotBackground(g, this, i, j, daySlot.Bounds);
+                }
+            }
+        }
+
+        #region GetContentBrush
+
+        /// <summary>
+        /// Gets the background content brush
+        /// for the given time slice
+        /// </summary>
+        /// <param name="daySlot"></param>
+        /// <param name="col">Column index</param>
+        /// <param name="slice">Time slice</param>
+        /// <returns>Background brush</returns>
+        private Brush GetContentBrush(DaySlot daySlot, int col, int slice)
+        {
+            int start = (StartSlice + slice) * TimeSlotDuration;
+
+            if (slice < NumberOfActiveSlices)
+            {
+                if (daySlot.Selected == true)
+                    return (SelectedBrush);
+
+                WorkTime wkStart = new
+                    WorkTime(start / MinutesPerHour, start % MinutesPerHour);
+
+                if (_DayColumns[col].IsWorkTime(wkStart) == true)
+                    return (WorkBrush);
+
+                if (_DayColumns[col].IsBusyTime(wkStart) == true)
+                    return (BusyBrush);
+            }
+            else
+            {
+                return (AllDayBrush);
+            }
+
+            return (OffWorkBrush);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region DrawDaySlot
+
+        /// <summary>
+        /// Initiates DaySlot drawing
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="sliceStart"></param>
+        /// <param name="sliceEnd"></param>
+        /// <param name="dayStart"></param>
+        /// <param name="dayEnd"></param>
+        /// <param name="daySlots"></param>
+        /// <param name="onTop">On top of borders</param>
+        private void DrawDaySlot(Graphics g, int sliceStart,
+            int sliceEnd, int dayStart, int dayEnd, DaySlot[,] daySlots, bool onTop)
+        {
+            List<DaySlotAppearance> dsaList = null;
+            Rectangle dRect = Rectangle.Empty;
+
+            for (int i = dayStart; i <= dayEnd; i++)
+            {
+                DaySlot lastDaySlot = null;
+
+                for (int j = sliceStart; j <= sliceEnd; j++)
+                {
+                    DaySlot daySlot = daySlots[i - dayStart, j - sliceStart];
+
+                    Rectangle r = daySlot.Bounds;
+                    DaySlotAppearance dsa = daySlot.Appearance;
+
+                    if (lastDaySlot != null &&
+                        (lastDaySlot.Appearance != dsa || lastDaySlot.Selected != daySlot.Selected))
+                    {
+                        FlushDaySlotText(g, i, dsaList, ref dRect, lastDaySlot.Selected);
+                    }
+
+                    lastDaySlot = daySlot;
+
+                    if (dsa != null)
+                    {
+                        if (dsa.OnTop == onTop)
+                        {
+                           if (daySlot.Selected == true)
+                           {
+                               if (dsa.ShowTextWhenSelected == true)
+                                   dRect = dRect.IsEmpty ? r : Rectangle.Union(dRect, r);
+                           }
+                           else
+                           {
+                               dRect = dRect.IsEmpty ? r : Rectangle.Union(dRect, r);
+                           }
+
+                           if (dsaList == null)
+                                dsaList = new List<DaySlotAppearance>();
+
+                            if (dsaList.Contains(dsa) == false)
+                                dsaList.Add(dsa);
+                        }
+
+                        continue;
+                    }
+                }
+
+                if (lastDaySlot != null)
+                    FlushDaySlotText(g, i, dsaList, ref dRect, lastDaySlot.Selected);
+            }
+        }
+
+        #region FlushDaySlotText
+
+        /// <summary>
+        /// Flushes out pending DaySlot drawing
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="dayCol"></param>
+        /// <param name="dsaList"></param>
+        /// <param name="dRect">Display rect</param>
+        /// <param name="selected"></param>
+        private void FlushDaySlotText(Graphics g,
+            int dayCol, List<DaySlotAppearance> dsaList, ref Rectangle dRect, bool selected)
+        {
+            if (dsaList != null && dsaList.Count > 0)
+            {
+                if (dRect.IsEmpty == false)
+                    DrawDaySlotText(g, dayCol, dsaList, dRect, selected);
+
+                dsaList.Clear();
+
+                dRect = Rectangle.Empty;
+            }
+        }
+
+        #endregion
+
+        #region DrawDaySlotText
+
+        /// <summary>
+        /// Draws the DaySlot Text
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="dayCol"></param>
+        /// <param name="dsaList"></param>
+        /// <param name="cRect"></param>
+        /// <param name="selected"></param>
+        private void DrawDaySlotText(Graphics g,
+            int dayCol, IEnumerable<DaySlotAppearance> dsaList, Rectangle cRect, bool selected)
+        {
+            foreach (DaySlotAppearance dsa in dsaList)
+            {
+                DateTime startTime = GetSlotTime(dayCol, dsa.StartTime);
+                DateTime endTime = GetSlotTime(dayCol, dsa.EndTime);
+
+                DateTime e = endTime.AddMinutes(-1);
+                WorkTime wkEnd = new WorkTime(e.Hour, e.Minute);
+
+                int start = GetWorkTimeSlice(dsa.StartTime);
+                int end = GetWorkTimeSlice(wkEnd);
+
+                Rectangle r = GetSliceRect(dayCol, start);
+                r = Rectangle.Union(r, GetSliceRect(dayCol, end));
+
+                Region rgnSave = g.Clip;
+                g.SetClip(cRect, CombineMode.Intersect);
+
+                string text = dsa.Text;
+
+                if (CalendarView.DoRenderDaySlotAppearanceText(g,
+                    r, dsa, startTime, endTime, selected, ref text) == false)
+                {
+                    if (String.IsNullOrEmpty(dsa.Text) == false)
+                    {
+                        eTextFormat tf = GetTextFormat(dsa.TextAlignment);
+
+                        Font font = dsa.Font ?? Font;
+
+                        Color color = (selected == true)
+                                          ? (dsa.SelectedTextColor.IsEmpty ? Color.Black : dsa.SelectedTextColor)
+                                          : (dsa.TextColor.IsEmpty ? Color.Black : dsa.TextColor);
+
+                        TextDrawing.DrawString(g, text, font, color, r, tf);
+                    }
+                }
+
+                g.Clip = rgnSave;
+            }
+        }
+
+        #region GetSlotTime
+
+        private DateTime GetSlotTime(int dayCol, WorkTime wkTime)
+        {
+            DateTime time = _DayColumns[dayCol].Date;
+
+            time = time.AddHours(wkTime.Hour);
+            time = time.AddMinutes(wkTime.Minute);
+
+            return (time);
+        }
+
+        #endregion
+
+        #region GetWorkTimeSlice
+
+        private int GetWorkTimeSlice(WorkTime wkTime)
+        {
+            int slice = ((wkTime.Hour * MinutesPerHour) +
+                wkTime.Minute) / TimeSlotDuration;
+
+            return (slice - StartSlice);
+        }
+
+        #region GetTextFormat
+
+        private eTextFormat GetTextFormat(ContentAlignment alignment)
+        {
+            eTextFormat tf = eTextFormat.WordBreak;
+
+            switch (alignment)
+            {
+                case ContentAlignment.TopLeft:
+                    tf |= eTextFormat.Top | eTextFormat.Left;
+                    break;
+
+                case ContentAlignment.TopCenter:
+                    tf |= eTextFormat.Top | eTextFormat.HorizontalCenter;
+                    break;
+
+                case ContentAlignment.TopRight:
+                    tf |= eTextFormat.Top | eTextFormat.Right;
+                    break;
+
+                case ContentAlignment.MiddleLeft:
+                    tf |= eTextFormat.VerticalCenter | eTextFormat.Left;
+                    break;
+
+                case ContentAlignment.MiddleCenter:
+                    tf |= eTextFormat.VerticalCenter | eTextFormat.HorizontalCenter;
+                    break;
+
+                case ContentAlignment.MiddleRight:
+                    tf |= eTextFormat.VerticalCenter | eTextFormat.Right;
+                    break;
+
+                case ContentAlignment.BottomLeft:
+                    tf |= eTextFormat.Bottom | eTextFormat.Left;
+                    break;
+
+                case ContentAlignment.BottomCenter:
+                    tf |= eTextFormat.Bottom | eTextFormat.HorizontalCenter;
+                    break;
+
+                case ContentAlignment.BottomRight:
+                    tf |= eTextFormat.Bottom | eTextFormat.Right;
+                    break;
+            }
+
+            return (tf);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region DrawTimeIndicators
+
+        #region DrawTimeIndicators
+
+        /// <summary>
+        /// Draw view TimeIndicators
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="sliceStart"></param>
+        /// <param name="sliceEnd"></param>
+        private void DrawTimeIndicators(Graphics g, 
+            int sliceStart, int sliceEnd, eTimeIndicatorLevel level)
+        {
+            DateTime start = _DayColumns[0].Date;
+            DateTime end = _DayColumns[_NumberOfColumns - 1].Date.AddDays(1);
+            Rectangle r = Rectangle.Union(GetSliceRect(0, sliceStart), GetSliceRect(0, sliceEnd));
+
+            for (int i = 0; i < CalendarView.TimeIndicators.Count; i++)
+            {
+                TimeIndicator ti = CalendarView.TimeIndicators[i];
+
+                if (ti.IndicatorLevel == level)
+                {
+                    if (ti.IndicatorArea == eTimeIndicatorArea.All ||
+                        ti.IndicatorArea == eTimeIndicatorArea.Content)
+                    {
+                        if (ti.IsVisible(CalendarView, this))
+                        {
+                            DateTime time = ti.IndicatorDisplayTime;
+
+                            if (time >= start && time < end)
+                                DrawTimeIndicator(g, r, ti);
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region DrawTimeIndicator
+
+        #region DrawTimeIndicator
+
+        /// <summary>
+        /// Draws individual view TimeIndicator
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="sRect"></param>
+        /// <param name="ti"></param>
+        private void DrawTimeIndicator(Graphics g, Rectangle sRect, TimeIndicator ti)
+        {
+            Rectangle r = GetIndicatorRect(ti);
+
+            if (r.IntersectsWith(sRect) == true)
+            {
+                if (r.Height > 0)
+                {
+                    ColorDef cdef = GetIndicatorColor(ti);
+
+                    if (cdef != null)
+                    {
+                        using (Brush br = _ViewColor.BrushPart(cdef, r))
+                        {
+                            if (br is LinearGradientBrush)
+                                ((LinearGradientBrush) br).WrapMode = WrapMode.TileFlipX;
+
+                            g.FillRectangle(br, r);
+                        }
+                    }
+                }
+
+                Color color = GetIndicatorBorder(ti);
+
+                if (color.IsEmpty == false)
+                {
+                    using (Pen pen = new Pen(color))
+                        g.DrawLine(pen, r.X + 1, r.Bottom, r.Right - 1, r.Bottom);
+                }
+            }
+        }
+
+        #endregion
+
+        #region GetIndicatorRect
+
+        /// <summary>
+        /// Gets the TimeIndicator rectangle
+        /// </summary>
+        /// <param name="ti"></param>
+        /// <returns></returns>
+        internal override Rectangle GetIndicatorRect(TimeIndicator ti)
+        {
+            return (GetIndicatorRect(ti, ti.IndicatorDisplayTime));
+        }
+
+        /// <summary>
+        /// Gets the TimeIndicator rectangle for the
+        /// given DataTime
+        /// </summary>
+        /// <param name="ti"></param>
+        /// <param name="time"></param>
+        /// <returns></returns>
+        internal override Rectangle GetIndicatorRect(TimeIndicator ti, DateTime time)
+        {
+            DateTime startTime = GetTime(_DayColumns[0].Date, 0, 0);
+            DateTime endTime = GetTime(_DayColumns[NumberOfColumns - 1].Date, NumberOfActiveSlices, 0);
+
+            if (time >= startTime && time < endTime)
+            {
+                int offset = (int) (time.Hour * SlotsPerHour * TimeSliceHeight +
+                                    (TimeSliceHeight * time.Minute) / TimeSlotDuration);
+
+                offset -= (int) (StartSlice * TimeSliceHeight);
+
+                Rectangle r = ViewRect;
+                r.Width -= 1;
+
+                r.Y = _DayColumns[0].Bounds.Y + offset - ti.Thickness;
+                r.Height = ti.Thickness;
+
+                return (r);
+            }
+
+            return (Rectangle.Empty);
+        }
+
+        #endregion
+
+        #region GetIndicatorColor
+
+        /// <summary>
+        /// Gets the Indicator Back color
+        /// </summary>
+        /// <param name="ti"></param>
+        /// <returns></returns>
+        private ColorDef GetIndicatorColor(TimeIndicator ti)
+        {
+            ColorDef cdef = ti.IndicatorColor;
+
+            if (cdef == null || cdef.IsEmpty == true)
+                cdef = _ViewColor.GetColorDef((int)eCalendarWeekDayPart.TimeIndicator);
+
+            return (cdef);
+        }
+
+        #endregion
+
+        #region GetIndicatorBorder
+
+        /// <summary>
+        /// Gets the Indicator Border color
+        /// </summary>
+        /// <param name="ti"></param>
+        /// <returns></returns>
+        private Color GetIndicatorBorder(TimeIndicator ti)
+        {
+            return (ti.BorderColor.IsEmpty == false ? ti.BorderColor :
+                _ViewColor.GetColor((int)eCalendarWeekDayPart.TimeIndicatorBorder));
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region DrawBorders
+
+        #region DrawBorders
+
+        /// <summary>
+        /// Draws time slice borders
+        /// </summary>
+        /// <param name="g">Graphics</param>
+        /// <param name="sliceStart">Start slice</param>
+        /// <param name="sliceEnd">End slice</param>
+        /// <param name="dayStart">Day start</param>
+        /// <param name="dayEnd">Day end</param>
+        /// <param name="daySlots"></param>
+        private void DrawBorders(Graphics g,
+            int sliceStart, int sliceEnd, int dayStart, int dayEnd, DaySlot[,] daySlots)
+        {
+            // Draw the horizontal and vertical borders, and
+            // the current "Now" border
+
+            DrawHorizontalBorders(g, sliceStart, sliceEnd, dayStart, dayEnd, daySlots);
+            DrawVerticalBorders(g, sliceStart, sliceEnd, dayStart, dayEnd);
+
+            if (CalendarView.HighlightCurrentDay == true)
+                DrawNowBorder(g, dayStart, dayEnd);
+        }
+
+        #endregion
+
+        #region DrawHorizontalBorders
+
+        /// <summary>
+        /// Draws horizontal borders
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="sliceStart"></param>
+        /// <param name="sliceEnd"></param>
+        /// <param name="dayStart"></param>
+        /// <param name="dayEnd"></param>
+        /// <param name="daySlots"></param>
+        private void DrawHorizontalBorders(Graphics g,
+            int sliceStart, int sliceEnd, int dayStart, int dayEnd, DaySlot[,] daySlots)
+        {
+            if (CalendarView.HasViewDisplayCustomizations == true)
+            {
+                int n = MinutesPerHour / TimeSlotDuration;
+
+                Color hourBorderColor = _ViewColor.GetColor((int)eCalendarWeekDayPart.DayHourBorder);
+                Color halfHourBorderColor = _ViewColor.GetColor((int)eCalendarWeekDayPart.DayHalfHourBorder);
+
+                for (int i = dayStart; i <= dayEnd; i++)
+                {
+                    for (int j = sliceStart; j <= sliceEnd; j++)
+                    {
+                        DaySlot daySlot = daySlots[i - dayStart, j - sliceStart];
+
+                        Rectangle r = daySlot.Bounds;
+                        DaySlotAppearance dsa = daySlot.Appearance;
+
+                        Point pt1 = r.Location;
+                        Point pt2 = new Point(r.Right - 1, r.Y);
+
+                        if (dsa != null && daySlot.Selected == false)
+                        {
+                            using (Pen pen = new Pen(j % n == 0 ? dsa.HourBorderColor : dsa.HalfHourBorderColor))
+                                g.DrawLine(pen, pt1, pt2);
+
+                            continue;
+                        }
+
+                        using (Pen pen = new Pen(j % n == 0 ? hourBorderColor : halfHourBorderColor))
+                            g.DrawLine(pen, pt1, pt2);
+                    }
+                }
+            }
+            else
+            {
+                using (Pen pen1 = new Pen(
+                    _ViewColor.GetColor((int) eCalendarWeekDayPart.DayHourBorder)))
+                {
+                    using (Pen pen2 = new Pen(
+                        _ViewColor.GetColor((int) eCalendarWeekDayPart.DayHalfHourBorder)))
+                    {
+                        Point pt1 = new Point(_DayColumns[dayStart].Bounds.X, 0);
+                        Point pt2 = new Point(_DayColumns[dayEnd].Bounds.Right - 1, 0);
+
+                        int n = MinutesPerHour/TimeSlotDuration;
+
+                        for (int i = sliceStart; i <= sliceEnd; i++)
+                        {
+                            Rectangle r = GetSliceRect(0, i);
+
+                            pt1.Y = pt2.Y = r.Y;
+
+                            g.DrawLine((i%n) == 0 ? pen1 : pen2, pt1, pt2);
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region DrawVerticalBorders
+
+        /// <summary>
+        /// Draws the vertical borders
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="sliceStart"></param>
+        /// <param name="sliceEnd"></param>
+        /// <param name="dayStart"></param>
+        /// <param name="dayEnd"></param>
+        private void DrawVerticalBorders(Graphics g,
+            int sliceStart, int sliceEnd, int dayStart, int dayEnd)
+        {
+            Rectangle r1 = GetSliceRect(0, sliceStart);
+            Rectangle r2 = GetSliceRect(0, sliceEnd);
+
+            using (Pen pen1 = new Pen(
+                _ViewColor.GetColor((int)eCalendarWeekDayPart.DayViewBorder)))
+            {
+                Point pt1 = new Point(0, r1.Y);
+                Point pt2 = new Point(0, r2.Bottom);
+
+                for (int i = dayStart; i <= dayEnd; i++)
+                {
+                    pt1.X = pt2.X = _DayColumns[i].Bounds.X;
+
+                    g.DrawLine(pen1, pt1, pt2);
+                }
+
+                pt1.X = pt2.X = _DayColumns[dayEnd].Bounds.Right;
+
+                g.DrawLine(pen1, pt1, pt2);
+            }
+        }
+
+        #endregion
+
+        #region DrawNowBorder
+
+        /// <summary>
+        /// Draws the Current-Day Now border
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="dayStart"></param>
+        /// <param name="dayEnd"></param>
+        private void DrawNowBorder(Graphics g, int dayStart, int dayEnd)
+        {
+            // Draw the "Current" day border
+
+            for (int i = dayStart; i <= dayEnd; i++)
+            {
+                if (_DayColumns[i].Date.Date.Equals(DateTime.Now.Date))
+                {
+                    Rectangle r = _DayColumns[i].Bounds;
+
+                    using (Pen pen = new Pen(
+                        _ViewColor.GetColor((int)eCalendarWeekDayPart.NowDayHeaderBorder)))
+                    {
+                        g.DrawRectangle(pen, r);
+                    }
+                    break;
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region DrawWeekAppointments
+
+        /// <summary>
+        /// Initiates the drawing of weekly appointments
+        /// </summary>
+        /// <param name="e">ItemPaintArgs</param>
+        /// <param name="dayStart">Day start index</param>
+        /// <param name="dayEnd">Day end index</param>
+        private void DrawWeekAppointments(ItemPaintArgs e, int dayStart, int dayEnd)
+        {
+            if (e.ClipRectangle.IntersectsWith(ViewRect) == true)
+            {
+                // Loop through each day in each week, displaying
+                // the associated day content
+
+                List<CalendarItem> selItems = null;
+
+                for (int i = 0; i <= dayEnd; i++)
+                {
+                    List<CalendarItem> items = _DayColumns[i].CalendarItems;
+
+                    if (items != null && items.Count > 0)
+                    {
+                        int right = _DayColumns[i].Bounds.Right - 1;
+
+                        for (int j = 0; j < items.Count; j++)
+                        {
+                            CalendarItem item = items[j];
+
+                            if ((item.Displayed == true) &&
+                                (i >= dayStart || item.Bounds.Right > right))
+                            {
+                                if (item.IsSelected == false)
+                                {
+                                    item.Paint(e);
+                                }
+                                else
+                                {
+                                    if (selItems == null)
+                                        selItems = new List<CalendarItem>();
+
+                                    selItems.Add(item);
+                                }
+                            }
+                        }
+                    }
+                }
+
+                if (selItems != null)
+                {
+                    foreach (CalendarItem item in selItems)
+                        item.Paint(e);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Mouse routines
+
+        #region MouseDown processing
+
+        /// <summary>
+        /// MouseDown event processing
+        /// </summary>
+        /// <param name="objArg"></param>
+        public override void InternalMouseDown(MouseEventArgs objArg)
+        {
+            // Forward on the event
+
+            base.InternalMouseDown(objArg);
+
+            if (SelectedItem != null)
+                _WasAllDayItem = IsAllDayItem(SelectedItem);
+
+            if (objArg.Button == MouseButtons.Left)
+            {
+                if (IsTabMoving == false)
+                {
+                    // Locate where the event took place
+
+                    if (InPanelResize(objArg.Location) == true)
+                    {
+                        MyCursor = Cursors.HSplit;
+
+                        _IsPanelResizing = true;
+                    }
+                    else if (ViewRect.Contains(objArg.Location) == true)
+                    {
+                        int col, slice;
+
+                        if (GetPointItem(objArg.Location, out col, out slice, true))
+                        {
+                            MyCursor = GetContentCursor();
+                            
+                            if (ProcessCilButtonDown(col, objArg) == false)
+                                ProcessDvlButtonDown(col, slice);
+
+                            IsMouseDown = true;
+                        }
+
+                        IsCopyDrag = false;
+                    }
+                }
+            }
+        }
+
+        #region CalendarItem MouseDown processing
+
+        /// <summary>
+        /// CalendarItem left mouseDown processing
+        /// </summary>
+        /// <param name="col">DayColumn col index</param>
+        /// <param name="objArg">MouseEventArgs</param>
+        private bool ProcessCilButtonDown(int col, MouseEventArgs objArg)
+        {
+            CalendarItem item = m_HotSubItem as CalendarItem;
+
+            if (item != null)
+            {
+                _WasAllDayItem = IsAllDayItem(item);
+
+                if (item.HitArea != CalendarItem.eHitArea.None)
+                {
+                    // Give the user a chance to cancel the
+                    // operation before it starts
+
+                    if (CalendarView.DoBeforeAppointmentViewChange(this, item,
+                        ((item.HitArea == CalendarItem.eHitArea.Move) ?
+                        eViewOperation.AppointmentMove : eViewOperation.AppointmentResize)) == false)
+                    {
+                        _LastCol = col;
+                        _LastBounds = item.Bounds;
+                        _LastPointOffset = objArg.Location;
+                        _LastMovePoint = objArg.Location;
+
+                        _LastMoveCol = -1;
+                        _LastDm = int.MinValue;
+
+                        if (IsResizing == false && IsMoving == false)
+                        {
+                            OldStartTime = item.StartTime;
+                            OldEndTime = item.EndTime;
+                            OldOwnerKey = OwnerKey;
+                        }
+
+                        // Flag appropriate action
+
+                        if (item.HitArea == CalendarItem.eHitArea.TopResize)
+                            IsStartResizing = true;
+
+                        else if (item.HitArea == CalendarItem.eHitArea.BottomResize)
+                            IsEndResizing = true;
+
+                        else if (item.HitArea == CalendarItem.eHitArea.Move)
+                            IsMoving = true;
+
+                        // Update our initial PosWin display
+
+                        UpdatePosWin(ViewRect);
+                    }
+                }
+
+                return (true);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region DayView MouseDown processing
+
+        /// <summary>
+        /// Handles DayView left MouseDown events
+        /// </summary>
+        /// <param name="col">DayColumn col index</param>
+        /// <param name="slice">Time slice</param>
+        private void ProcessDvlButtonDown(int col, int slice)
+        {
+            DateTime startDate = GetTime(_DayColumns[col].Date, slice, 0);
+            DateTime endDate = startDate.AddMinutes(TimeSlotDuration);
+
+            ExtendSelection(ref startDate, ref endDate);
+
+            CalendarView.DateSelectionStart = startDate;
+            CalendarView.DateSelectionEnd = endDate;
+
+            SelectedItem = null;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region MouseUp processing
+
+        /// <summary>
+        /// MouseUp event processing
+        /// </summary>
+        /// <param name="objArg">MouseEventArgs</param>
+        public override void InternalMouseUp(MouseEventArgs objArg)
+        {
+            base.InternalMouseUp(objArg);
+
+            CancelScrollTimer();
+
+            // Reset our panel resizing flag
+
+            _IsPanelResizing = false;
+
+            if (SelectedItem != null &&
+                (IsAllDayItem(SelectedItem) != _WasAllDayItem))
+            {
+                ReloadView();
+            }
+        }
+
+        #endregion
+
+        #region MouseMove processing
+
+        #region InternalMouseMove
+
+        /// <summary>
+        /// MouseMove event processing
+        /// </summary>
+        /// <param name="objArg">MouseEventArgs</param>
+        public override void InternalMouseMove(MouseEventArgs objArg)
+        {
+            // Forward on the event, but only if we are not in
+            // the middle of moving or resizing a CalendarItem
+
+            if (Control.MouseButtons == MouseButtons.None)
+                ClearMouseStates();
+
+            if (!IsMoving && !IsStartResizing && !IsEndResizing)
+                base.InternalMouseMove(objArg);
+
+            if (IsTabMoving == false)
+            {
+                if (_IsPanelResizing == true)
+                {
+                    MyCursor = Cursors.HSplit;
+
+                    ProcessPanelMove(objArg);
+                }
+                else
+                {
+                    if (InPanelResize(objArg.Location) == true)
+                    {
+                        MyCursor = Cursors.HSplit;
+                    }
+                    else
+                    {
+                        MyCursor = GetContentCursor();
+
+                        if (objArg.Button == MouseButtons.Left)
+                            ProcessContentMove(objArg);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region InPanelResize
+
+        /// <summary>
+        /// Determines if the mouse is in the
+        /// panel resize area
+        /// </summary>
+        /// <param name="pt">Mouse location</param>
+        /// <returns>true if in the resize area</returns>
+        private bool InPanelResize(Point pt)
+        {
+            if (CalendarView.IsMultiCalendar == true)
+            {
+                Rectangle r = ViewRect;
+
+                if (pt.X > r.Left && pt.X < r.Right &&
+                    pt.Y > r.Y - 3 && pt.Y < r.Y + 3)
+                {
+                    return (true);
+                }
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region ProcessPanelMove
+
+        /// <summary>
+        /// Processes the actual panel resizing
+        /// </summary>
+        /// <param name="objArg">MouseEventArgs</param>
+        private void ProcessPanelMove(MouseEventArgs objArg)
+        {
+            if (_IsPanelResizing == true)
+            {
+                Point pt = objArg.Location;
+
+                if (pt.Y < ClientRect.Y + DayOfWeekHeaderHeight)
+                    pt.Y = ClientRect.Y + DayOfWeekHeaderHeight;
+
+                else if (pt.Y > ClientRect.Bottom - 50)
+                    pt.Y = ClientRect.Bottom - 50;
+
+                int n = pt.Y - (ClientRect.Y + DayOfWeekHeaderHeight);
+
+                CalendarView.FixedAllDayPanelHeight = n;
+            }
+        }
+
+        #endregion
+
+        #region ProcessContentMove
+
+        /// <summary>
+        /// Processes content mouse moves
+        /// </summary>
+        /// <param name="objArg">MouseEventArgs</param>
+        private void ProcessContentMove(MouseEventArgs objArg)
+        {
+            // Locate where the event took place
+            // and process it accordingly
+
+            int col, slice;
+
+            if (GetPointItem(objArg.Location, out col, out slice, false))
+            {
+                // The slice is visible, so no need to
+                // enable scrolling - just process the event
+
+                EnableViewScrolling(false);
+
+                ProcessMouseMove(col, slice, objArg);
+            }
+            else if (IsMouseDown == true)
+            {
+                if (DragDropAppointment(objArg) == false)
+                {
+                    // The selected slice is not visible,
+                    // so we need to enable scrolling
+
+                    EnableViewScrolling(true);
+
+                    // Only process the event if the user is selecting
+                    // time slice cells (auto moving apps is intrusive looking)
+
+                    if (DateSelectionAnchor != null)
+                    {
+                        if (col >= 0)
+                        {
+                            if (slice < 0)
+                                slice = 0;
+
+                            ProcessDvMouseMove(col, slice);
+                        }
+                    }
+                }
+            }
+        }
+
+        #region DragDropAppointment
+
+        /// <summary>
+        /// Initiates a user "DragDrop" operation - if enabled
+        /// </summary>
+        /// <param name="objArgs"></param>
+        /// <returns>True if operation started</returns>
+        private bool DragDropAppointment(MouseEventArgs objArgs)
+        {
+            if (IsMoving == true && CanDrag == true)
+            {
+                Point pt = objArgs.Location;
+                BaseView bv = CalendarView.GetViewFromPoint(pt);
+                WeekDayView wv = bv as WeekDayView;
+
+                if (wv != null && wv != this)
+                {
+                    eViewArea area = bv.GetViewAreaFromPoint(pt);
+
+                    if (area == eViewArea.InContent)
+                    {
+                        if (CalendarView.DoAppointmentViewChanging(SelectedItem, wv.OwnerKey, SelectedItem.StartTime,
+                            SelectedItem.EndTime, eViewOperation.AppointmentMove, IsNewCopyDrag) == false)
+                        {
+                            DragCopy();
+
+                            ClearMouseStates();
+                            CancelScrollTimer();
+
+                            if (PosWin != null)
+                                PosWin.Hide();
+
+                            AppointmentView av = SelectedItem as AppointmentView;
+
+                            if (av != null)
+                                return (wv.DragAppointment(this, av, objArgs.Location));
+
+                            CustomCalendarItem ci = SelectedItem as CustomCalendarItem;
+
+                            if (ci != null)
+                                return (wv.DragCustomItem(this, ci, objArgs.Location));
+                        }
+                    }
+                }
+            }
+
+            return (false);
+        }
+
+        #region DragCustomItem
+
+        private bool DragCustomItem(WeekDayView pv, CustomCalendarItem ci, Point pt)
+        {
+            // Set the new owner and selected view, and
+            // recalc the new layout
+
+            if (ci.BaseCalendarItem != null)
+                ci = ci.BaseCalendarItem;
+
+            ci.OwnerKey = OwnerKey;
+
+            _LastMoveCol = 0;
+            _LastDm = int.MinValue;
+
+            if (NumberOfColumns > 1)
+            {
+                DateTime sd = ci.StartTime;
+                TimeSpan ts = ci.EndTime.Subtract(ci.StartTime);
+
+                if (Bounds.X > pv.Bounds.X)
+                {
+                    ci.StartTime = new DateTime(_DayColumns[0].Date.Year,
+                        _DayColumns[0].Date.Month, _DayColumns[0].Date.Day, sd.Hour, sd.Minute, 0);
+                }
+                else
+                {
+                    _LastMoveCol = NumberOfColumns - 1;
+
+                    ci.StartTime = new DateTime(_DayColumns[NumberOfColumns - 1].Date.Year,
+                        _DayColumns[NumberOfColumns - 1].Date.Month,
+                        _DayColumns[NumberOfColumns - 1].Date.Day, sd.Hour, sd.Minute, 0);
+                }
+
+                ci.EndTime = ci.StartTime.Add(ts);
+            }
+
+            NeedRecalcLayout = true;
+            RecalcSize();
+
+            CalendarView.SelectedOwnerIndex = this.DisplayedOwnerKeyIndex;
+
+            // Get the new view
+
+            CustomCalendarItem view = GetCustomCalendarItem(ci);
+
+            if (view != null)
+                SetNewDragItem(pv, view, pt);
+
+            return (true);
+        }
+
+        #endregion
+
+        #region DragAppointment
+
+        /// <summary>
+        /// Drags the given appointment from one view to another
+        /// </summary>
+        /// <param name="pv">Previous view</param>
+        /// <param name="av">Item to move</param>
+        private bool DragAppointment(WeekDayView pv, AppointmentView av, Point pt)
+        {
+            // Set the new owner and selected view, and
+            // recalc the new layout
+
+            av.Appointment.OwnerKey = OwnerKey;
+
+            _LastMoveCol = 0;
+            _LastDm = int.MinValue;
+
+            if (NumberOfColumns > 1)
+            {
+                DateTime sd = av.Appointment.StartTime;
+
+                if (Bounds.X > pv.Bounds.X)
+                {
+                    av.Appointment.MoveTo(
+                        new DateTime(_DayColumns[0].Date.Year, _DayColumns[0].Date.Month,
+                        _DayColumns[0].Date.Day, sd.Hour, sd.Minute, 0));
+                }
+                else
+                {
+                    _LastMoveCol = NumberOfColumns - 1;
+
+                    av.Appointment.MoveTo(
+                        new DateTime(_DayColumns[NumberOfColumns - 1].Date.Year,
+                        _DayColumns[NumberOfColumns - 1].Date.Month,
+                        _DayColumns[NumberOfColumns - 1].Date.Day, sd.Hour, sd.Minute, 0));
+                }
+            }
+
+            NeedRecalcLayout = true;
+            RecalcSize();
+
+            CalendarView.SelectedOwnerIndex = this.DisplayedOwnerKeyIndex;
+
+            // Get the new view
+
+            AppointmentView view = GetAppointmentView(av.Appointment);
+
+            if (view != null)
+                SetNewDragItem(pv, view, pt);
+
+            return (true);
+        }
+
+        #endregion
+
+        #region SetNewDragItem
+
+        private void SetNewDragItem(WeekDayView pv, CalendarItem view, Point pt)
+        {
+            _LastBounds = pv._LastBounds;
+            _LastMovePoint = pv._LastMovePoint;
+            _LastPointOffset = pv._LastPointOffset;
+
+            int dy = _LastPointOffset.Y - _LastBounds.Y;
+
+            CalendarView.CalendarPanel.InternalMouseMove(new
+                MouseEventArgs(MouseButtons.None, 0, view.Bounds.X, view.Bounds.Y - dy, 0));
+
+            MouseEventArgs args = new
+                MouseEventArgs(MouseButtons.Left, 1, view.Bounds.X, view.Bounds.Y + dy, 0);
+
+            IsMoving = true;
+
+            InternalMouseMove(args);
+            CalendarView.CalendarPanel.InternalMouseDown(args);
+
+            SelectedItem = view;
+
+            IsNewCopyDrag = true;
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region GetContentCursor
+
+        /// <summary>
+        /// Gets the cursor
+        /// </summary>
+        /// <returns>Cursor</returns>
+        private Cursor GetContentCursor()
+        {
+            CalendarItem item = m_HotSubItem as CalendarItem;
+
+            if (item != null)
+            {
+                switch (item.HitArea)
+                {
+                    case CalendarItem.eHitArea.TopResize:
+                    case CalendarItem.eHitArea.BottomResize:
+                        return (Cursors.SizeNS);
+
+                    case CalendarItem.eHitArea.Move:
+                        return (IsMoving ? Cursors.SizeAll : DefaultCursor);
+                }
+            }
+
+            return (DefaultCursor);
+        }
+
+        #endregion
+
+        #region ProcessMouseMove
+
+        /// <summary>
+        /// Processes user MouseMove
+        /// </summary>
+        /// <param name="col">DayColumn</param>
+        /// <param name="slice">Slice</param>
+        /// <param name="objArg"></param>
+        private void ProcessMouseMove(int col, int slice, MouseEventArgs objArg)
+        {
+            if (DateSelectionAnchor != null)
+            {
+                ProcessDvMouseMove(col, slice);
+            }
+            else if (SelectedItem != null)
+            {
+                if (objArg.Location.Equals(_LastMovePoint) == false)
+                {
+                    if (IsMoving == true)
+                        ProcessItemMove(col, slice, objArg);
+
+                    else if (IsStartResizing == true)
+                        ProcessItemTopResize(col, slice, objArg);
+
+                    else if (IsEndResizing == true)
+                        ProcessItemBottomResize(col, slice, objArg);
+
+                    _LastMovePoint = objArg.Location;
+                }
+            }
+        }
+
+        #endregion
+
+        #region DayView mouseMove processing
+
+        /// <summary>
+        /// Processes DayView mouseMove events
+        /// </summary>
+        /// <param name="col">DayColumn col index</param>
+        /// <param name="slice">Time slice</param>
+        private void ProcessDvMouseMove(int col, int slice)
+        {
+            DateTime date = GetTime(_DayColumns[col].Date, slice, 0);
+
+            // Let the user select forwards or backwards
+
+            if (date >= DateSelectionAnchor)
+            {
+                CalendarView.DateSelectionStart = DateSelectionAnchor.Value;
+                CalendarView.DateSelectionEnd = date.AddMinutes(TimeSlotDuration);
+            }
+            else
+            {
+                CalendarView.DateSelectionStart = date;
+                CalendarView.DateSelectionEnd = DateSelectionAnchor.Value.AddMinutes(TimeSlotDuration);
+            }
+        }
+
+        #endregion
+
+        #region CalendarItem MouseMove processing
+
+        #region ProcessItemMove
+
+        /// <summary>
+        /// Processes CalendarItem mouseMove events
+        /// </summary>
+        /// <param name="col">DayColumn col index</param>
+        /// <param name="slice">Time slice</param>
+        /// <param name="objArg"></param>
+        private void ProcessItemMove(int col, int slice, MouseEventArgs objArg)
+        {
+            // Calculate our new item date
+
+            int dm = GetDeltaMinutes(slice, true, objArg);
+
+            if (_LastDm == int.MinValue)
+                _LastDm = dm;
+
+            int ddm = dm - _LastDm;
+
+            if (_LastMoveCol == -1)
+                _LastMoveCol = col;
+
+            if (col != _LastMoveCol)
+                ddm += ((col - _LastMoveCol) * HoursPerDay * MinutesPerHour);
+
+            _LastDm = dm;
+            _LastMoveCol = col;
+
+            DateTime newDate = SelectedItem.StartTime.AddMinutes(ddm);
+            TimeSpan ts = SelectedItem.EndTime - SelectedItem.StartTime;
+
+            if (newDate != SelectedItem.StartTime)
+            {
+                if (CalendarView.AllDayDisplayMode != eAllDayDisplayMode.None)
+                {
+                    // Make sure we don't cross day boundaries
+
+                    DateTime start = GetTime(_DayColumns[col].Date, 0, 0);
+                    DateTime end = start.AddMinutes(NumberOfActiveSlices * TimeSlotDuration);
+
+                    if (newDate < start)
+                        newDate = start;
+
+                    if (newDate + ts > end)
+                        newDate -= (newDate + ts) - end;
+                }
+
+                // If we have a new date, set our item to it
+
+                if (newDate != SelectedItem.StartTime)
+                {
+                    if (DragCopy() == false)
+                    {
+                        try
+                        {
+                            if (SelectedItem is CustomCalendarItem)
+                                CalendarView.CustomItems.BeginUpdate();
+                            else
+                                CalendarModel.BeginUpdate();
+
+                            // Make the move
+
+                            if (CalendarView.DoAppointmentViewChanging(SelectedItem, null, newDate,
+                                newDate + ts, eViewOperation.AppointmentMove,
+                                IsCopyDrag) == false)
+                            {
+                                SelectedItem.StartTime = newDate;
+                                SelectedItem.EndTime = newDate + ts;
+
+                                InvalidateItems(col);
+                            }
+                        }
+                        finally
+                        {
+                            if (SelectedItem is CustomCalendarItem)
+                                CalendarView.CustomItems.EndUpdate();
+                            else
+                                CalendarModel.EndUpdate();
+                        }
+                    }
+                    else
+                    {
+                        _LastMoveCol = _LastCol;
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region CalendarItem MouseResize processing
+
+        #region ProcessItemTopResize
+
+        /// <summary>
+        /// Processes CalendarItem left resizing
+        /// </summary>
+        /// <param name="slice">Time slice</param>
+        /// <param name="objArg"></param>
+        private void ProcessItemTopResize(int col, int slice, MouseEventArgs objArg)
+        {
+            int dm = GetDeltaMinutes(slice, true, objArg);
+
+            DateTime newStartTime;
+
+            if (CalendarView.AllDayDisplayMode != eAllDayDisplayMode.None)
+            {
+                newStartTime = new DateTime(
+                    SelectedItem.StartTime.Year, SelectedItem.StartTime.Month, SelectedItem.StartTime.Day);
+
+                newStartTime = GetTime(newStartTime, 0, dm);
+            }
+            else
+            {
+                newStartTime = GetTime(_DayColumns[col].Date.Date, 0, dm);
+
+                if (newStartTime < _DayColumns[0].Date)
+                    newStartTime = _DayColumns[0].Date;
+            }
+
+            if (newStartTime != SelectedItem.StartTime && newStartTime < SelectedItem.EndTime)
+            {
+                if ((SelectedItem.EndTime - newStartTime).TotalMinutes < 0)
+                    newStartTime = SelectedItem.EndTime.AddMinutes(-1);
+
+                ResizeItem(_LastCol, newStartTime, SelectedItem.EndTime);
+            }
+        }
+
+        #endregion
+
+        #region ProcessItemBottomResize
+
+        /// <summary>
+        /// Processes CalendarItem right resizing
+        /// </summary>
+        /// <param name="slice">Time slice</param>
+        /// <param name="objArg"></param>
+        private void ProcessItemBottomResize(int col, int slice, MouseEventArgs objArg)
+        {
+            int dm = GetDeltaMinutes(slice, false, objArg);
+
+            DateTime newEndTime;
+            DateTime end;
+
+            if (CalendarView.AllDayDisplayMode != eAllDayDisplayMode.None)
+            {
+                newEndTime = new DateTime(
+                    SelectedItem.StartTime.Year, SelectedItem.StartTime.Month, SelectedItem.StartTime.Day);
+
+                if (newEndTime < _DayColumns[0].Date)
+                    newEndTime = _DayColumns[0].Date;
+
+                newEndTime = GetTime(newEndTime, 0, dm);
+
+                end = GetTime(_DayColumns[_LastCol].Date, NumberOfActiveSlices, 0);
+            }
+            else
+            {
+                newEndTime = GetTime(_DayColumns[col].Date.Date, 0, dm);
+
+                if (newEndTime < _DayColumns[0].Date)
+                    newEndTime = _DayColumns[0].Date;
+
+                end = GetTime(_DayColumns[_DayColumns.Length - 1].Date, NumberOfActiveSlices, 0);
+            }
+
+            if (newEndTime > end)
+                newEndTime = end;
+
+            if (newEndTime != SelectedItem.EndTime && newEndTime > SelectedItem.StartTime)
+            {
+                if ((newEndTime - SelectedItem.StartTime).TotalMinutes < 0)
+                    newEndTime = SelectedItem.StartTime.AddMinutes(1);
+
+                ResizeItem(_LastCol, SelectedItem.StartTime, newEndTime);
+            }
+        }
+
+        #endregion
+
+        #region ResizeItem
+
+        /// <summary>
+        /// Initiates the resize of the selected item
+        /// </summary>
+        /// <param name="col"></param>
+        /// <param name="startTime"></param>
+        /// <param name="endTime"></param>
+        private void ResizeItem(int col, DateTime startTime, DateTime endTime)
+        {
+            // Let the user cancel the operation if desired
+
+            if (CalendarView.DoAppointmentViewChanging(SelectedItem, null, startTime,
+                endTime, eViewOperation.AppointmentResize, IsNewCopyDrag) == false)
+            {
+                InvalidateItems(col);
+
+                SelectedItem.StartTime = startTime;
+                SelectedItem.EndTime = endTime;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetDeltaMinutes
+
+        /// <summary>
+        /// Gets the changes in minutes
+        /// from the last mouse operation (move or resize)
+        /// </summary>
+        /// <param name="slice">Current slice</param>
+        /// <param name="ftop">Flag denoting top or bottom delta</param>
+        /// <param name="objArg">MouseEventArgs</param>
+        /// <returns>Delta minutes</returns>
+        private int GetDeltaMinutes(int slice, bool ftop, MouseEventArgs objArg)
+        {
+            // Calculate our delta minutes
+
+            Rectangle t = GetSliceRect(0, slice);
+
+            int dm = (objArg.Location.Y - _LastPointOffset.Y);
+
+            dm += ftop ? _LastBounds.Top - t.Top
+                       : _LastBounds.Bottom - t.Bottom;
+
+            dm = (int)(TimeSlotDuration * dm / TimeSliceHeight);
+
+            // If the Alt key is not pressed, then round
+            // our value off to the nearest slice
+
+            if ((Control.ModifierKeys & Keys.Alt) != Keys.Alt)
+            {
+                slice += (dm / TimeSlotDuration);
+                dm = 0;
+            }
+
+            dm += (slice * TimeSlotDuration);
+
+            // Make sure we don't cross our day boundaries
+
+            if (CalendarView.AllDayDisplayMode != eAllDayDisplayMode.None)
+            {
+                if (ftop == true)
+                {
+                    if (dm < 0)
+                        dm = 0;
+                }
+                else
+                {
+                    dm += TimeSlotDuration;
+
+                    if (dm >= MinutesPerHour * HoursPerDay)
+                        dm = MinutesPerHour * HoursPerDay - 1;
+                }
+            }
+
+            return (dm);
+        }
+
+        #endregion
+
+        #region InvalidateItems
+
+        /// <summary>
+        /// Invalidates altered DayColumns
+        /// </summary>
+        /// <param name="col">Current column</param>
+        internal void InvalidateItems(int col)
+        {
+            if (SelectedItem.IsRecurring == false)
+            {
+                _DayColumns[_LastCol].NeedRecalcLayout = true;
+                _DayColumns[col].NeedRecalcLayout = true;
+
+                InvalidateRect(_DayColumns[col].Bounds, true);
+
+                if (_LastCol != col)
+                    InvalidateRect(_DayColumns[_LastCol].Bounds);
+            }
+            else
+            {
+                NeedRecalcLayout = true;
+            }
+
+            _LastCol = col;
+        }
+
+        #endregion
+
+        #region View Scrolling support
+
+        #region EnableViewScrolling
+
+        /// <summary>
+        /// Routine to enable or disable view scrolling
+        /// </summary>
+        /// <param name="enable">true to enable</param>
+        private void EnableViewScrolling(bool enable)
+        {
+            if (enable == true)
+            {
+                if (VsPanel.ScrollBar.Maximum > VsPanel.ScrollBar.LargeChange)
+                {
+                    if (_ScrollViewTimer == null)
+                    {
+                        _ScrollViewTimer = new Timer();
+
+                        _ScrollViewTimer.Interval = 10;
+                        _ScrollViewTimer.Tick += ScrollViewTimerTick;
+                        _ScrollViewTimer.Start();
+                    }
+                }
+            }
+            else
+            {
+                CancelScrollTimer();
+            }
+        }
+
+        #endregion
+
+        #region CancelScrollTimer
+
+        /// <summary>
+        /// Cancels the view scroll timer
+        /// </summary>
+        private void CancelScrollTimer()
+        {
+            // Dispose of our scroll timer
+
+            if (_ScrollViewTimer != null)
+            {
+                _ScrollViewTimer.Stop();
+                _ScrollViewTimer.Tick -= ScrollViewTimerTick;
+
+                _ScrollViewTimer = null;
+            }
+        }
+
+        #endregion
+
+        #region ScrollAmount
+
+        /// <summary>
+        /// Determines the amount to scroll (which is
+        /// based loosely upon the delta magnitude)
+        /// </summary>
+        /// <param name="delta">Point delta</param>
+        /// <returns>Scroll amount</returns>
+        private int ScrollAmount(int delta)
+        {
+            int dy = Math.Abs(delta);
+            int amt = (dy < 16 ? 2 : dy < 32 ? 8 : 32);
+
+            return (delta < 0 ? -amt : amt);
+        }
+
+        #endregion
+
+        #region ScrollViewTimer_Tick
+
+        /// <summary>
+        /// Handles view scroll timer ticks
+        /// </summary>
+        /// <param name="sender">object</param>
+        /// <param name="e">EventArgs</param>
+        private void ScrollViewTimerTick(object sender, EventArgs e)
+        {
+            Control c = (Control)this.GetContainerControl(true);
+
+            if (c != null)
+            {
+                // Calculate our delta
+
+                Point pt = c.PointToClient(Cursor.Position);
+                Rectangle r = ViewRect;
+
+                int dy = (pt.Y < r.Top) ? ScrollAmount(pt.Y - r.Top) :
+                    (pt.Y >= r.Bottom) ? ScrollAmount(pt.Y - r.Bottom) : 0;
+
+                // Scroll if necessary
+
+                if (dy != 0)
+                {
+                    int value = VsPanel.ScrollBar.Value + dy;
+
+                    value = Math.Max(value, 0);
+                    value = Math.Min(value, VsPanel.ScrollBar.Maximum);
+
+                    if (VsPanel.ScrollBar.Value != value)
+                    {
+                        VsPanel.ScrollBar.Value = value;
+
+                        if (PosWin != null)
+                            PosWin.Hide();
+
+                        InternalMouseMove(new
+                            MouseEventArgs(MouseButtons.Left, 0, pt.X, pt.Y, 0));
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region InternalKeyDown
+
+        #region InternalKeyDown
+
+        /// <summary>
+        /// Processes KeyDown events
+        /// </summary>
+        /// <param name="objArg"></param>
+        public override void InternalKeyDown(KeyEventArgs objArg)
+        {
+            switch (objArg.KeyData)
+            {
+                case Keys.Up:
+                case Keys.Up | Keys.Shift:
+                case Keys.Up | Keys.Control:
+                case Keys.Up | Keys.Control | Keys.Shift:
+                    ProcessUpDownKey(objArg, -CalendarView.TimeSlotDuration);
+                    break;
+
+                case Keys.Down:
+                case Keys.Down | Keys.Shift:
+                case Keys.Down | Keys.Control:
+                case Keys.Down | Keys.Control | Keys.Shift:
+                    ProcessUpDownKey(objArg, CalendarView.TimeSlotDuration);
+                    break;
+
+                case Keys.Left:
+                case Keys.Left | Keys.Shift:
+                case Keys.Left | Keys.Control:
+                case Keys.Left | Keys.Control | Keys.Shift:
+                    ProcessLeftRightKey(objArg, -1);
+                    break;
+
+                case Keys.Right:
+                case Keys.Right | Keys.Shift:
+                case Keys.Right | Keys.Control:
+                case Keys.Right | Keys.Control | Keys.Shift:
+                    ProcessLeftRightKey(objArg, 1);
+                    break;
+
+                case Keys.Home:
+                case Keys.Home | Keys.Shift:
+                case Keys.Home | Keys.Control:
+                case Keys.Home | Keys.Control | Keys.Shift:
+                    ProcessHomeKey(objArg);
+                    break;
+
+                case Keys.End:
+                case Keys.End | Keys.Shift:
+                case Keys.End | Keys.Control:
+                case Keys.End | Keys.Control | Keys.Shift:
+                    ProcessEndKey(objArg);
+                    break;
+
+                case Keys.PageUp:
+                case Keys.PageUp | Keys.Shift:
+                case Keys.PageUp | Keys.Control:
+                case Keys.PageUp | Keys.Control | Keys.Shift:
+                    ProcessPageUpDownKey(objArg, -1);
+                    break;
+
+                case Keys.PageDown:
+                case Keys.PageDown | Keys.Shift:
+                case Keys.PageDown | Keys.Control:
+                case Keys.PageDown | Keys.Control | Keys.Shift:
+                    ProcessPageUpDownKey(objArg, 1);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region ProcessUpDownKey
+
+        /// <summary>
+        /// Processes Up and Down key events
+        /// </summary>
+        /// <param name="objArg"></param>
+        /// <param name="dy"></param>
+        protected virtual void ProcessUpDownKey(KeyEventArgs objArg, int dy)
+        {
+            if (ValidDateSelection())
+            {
+                DateTime startDate = CalendarView.DateSelectionStart.Value;
+                DateTime endDate = CalendarView.DateSelectionEnd.Value;
+
+                if (startDate.Equals(DateSelectionAnchor.Value) == true)
+                    startDate = endDate.AddMinutes(-TimeSlotDuration);
+
+                startDate = startDate.AddMinutes(dy);
+
+                DateTime viewStart = GetTime(DayColumns[0].Date, 0, 0);
+                DateTime viewEnd = viewStart.AddMinutes(NumberOfActiveSlices * TimeSlotDuration);
+
+                endDate = startDate.AddMinutes(TimeSlotDuration);
+
+                if (startDate >= viewStart && endDate <= viewEnd)
+                {
+                    ExtendSelection(ref startDate, ref endDate);
+
+                    CalendarView.DateSelectionStart = startDate;
+                    CalendarView.DateSelectionEnd = endDate;
+
+                    EnsureSelectionVisible();
+                }
+            }
+
+            objArg.Handled = true;
+        }
+
+        #endregion
+
+        #region ProcessLeftRightKey
+
+        /// <summary>
+        /// Processes Left and Right key events
+        /// </summary>
+        /// <param name="objArg"></param>
+        /// <param name="dx"></param>
+        protected virtual void ProcessLeftRightKey(KeyEventArgs objArg, int dx)
+        {
+            if (CalendarView.WeekDayCanExtendRange == true)
+            {
+                DateTime oldDate = CalendarView.DayViewDate;
+                DateTime newDate = CalendarView.DayViewDate.AddDays(dx);
+
+                if (CalendarView.DoViewDateChanging(this,
+                    oldDate, oldDate, ref newDate, ref newDate) == false)
+                {
+                    if (ValidDateSelection())
+                    {
+                        dx = (newDate - oldDate).Days;
+
+                        DateTime startDate = CalendarView.DateSelectionStart.Value;
+                        DateTime endDate = CalendarView.DateSelectionEnd.Value;
+
+                        startDate = startDate.AddDays(dx);
+                        endDate = endDate.AddDays(dx);
+
+                        CalendarView.DateSelectionStart = startDate;
+                        CalendarView.DateSelectionEnd = endDate;
+                        DateSelectionAnchor = DateSelectionAnchor.Value.AddDays(dx);
+                    }
+
+                    CalendarView.DayViewDate = CalendarView.DayViewDate.AddDays(dx);
+                }
+            }
+
+            objArg.Handled = true;
+        }
+
+        #endregion
+
+        #region ProcessHomeKey
+
+        /// <summary>
+        /// Processes Home key events
+        /// </summary>
+        /// <param name="objArg"></param>
+        protected virtual void ProcessHomeKey(KeyEventArgs objArg)
+        {
+            int col = GetHomeEndCol();
+
+            if (col >= 0)
+            {
+                DateTime startDate = GetTime(DayColumns[col].Date, 0, 0);
+
+                if ((objArg.Modifiers & Keys.Control) != Keys.Control)
+                {
+                    WorkTime wt = DayColumns[col].WorkStartTime;
+
+                    if (wt.IsEmpty == false)
+                        startDate = DayColumns[col].Date.AddMinutes(wt.Hour * 60 + wt.Minute);
+                }
+
+                DateTime endDate = startDate.AddMinutes(TimeSlotDuration);
+
+                ExtendSelection(ref startDate, ref endDate);
+
+                CalendarView.DateSelectionStart = startDate;
+                CalendarView.DateSelectionEnd = endDate;
+
+                EnsureSelectionVisible();
+            }
+
+            objArg.Handled = true;
+        }
+
+        #endregion
+
+        #region ProcessEndKey
+
+        /// <summary>
+        /// Processes End Key events
+        /// </summary>
+        /// <param name="objArg"></param>
+        protected virtual void ProcessEndKey(KeyEventArgs objArg)
+        {
+            int col = GetHomeEndCol();
+
+            if (col >= 0)
+            {
+                DateTime startDate = GetTime(DayColumns[col].Date, NumberOfActiveSlices, 0);
+
+                if ((objArg.Modifiers & Keys.Control) != Keys.Control)
+                {
+                    WorkTime wt = DayColumns[col].WorkEndTime;
+
+                    if (wt.IsEmpty == false)
+                        startDate = DayColumns[col].Date.AddMinutes(wt.Hour * 60 + wt.Minute);
+                }
+
+                DateTime endDate = startDate;
+                startDate = startDate.AddMinutes(-TimeSlotDuration);
+
+                ExtendSelection(ref startDate, ref endDate);
+
+                CalendarView.DateSelectionStart = startDate;
+                CalendarView.DateSelectionEnd = endDate;
+
+                EnsureSelectionVisible();
+            }
+
+            objArg.Handled = true;
+        }
+
+        #endregion
+
+        #region ProcessPageUpDownKey
+
+        /// <summary>
+        /// Processes Page Up and Down key events
+        /// </summary>
+        /// <param name="objArg"></param>
+        /// <param name="dy">Paging direction (-1, 1)</param>
+        protected virtual void ProcessPageUpDownKey(KeyEventArgs objArg, int dy)
+        {
+            if (ValidDateSelection())
+            {
+                DateTime startDate = CalendarView.DateSelectionStart.Value;
+                DateTime endDate = CalendarView.DateSelectionEnd.Value;
+
+                int col = GetColumnFromDate(startDate);
+
+                if ((uint)col < DayColumns.Length)
+                {
+                    DateTime viewStart = GetTime(DayColumns[col].Date, 0, 0);
+                    DateTime viewEnd = viewStart.AddMinutes(NumberOfActiveSlices * TimeSlotDuration);
+
+                    if (startDate.Equals(DateSelectionAnchor.Value) == true)
+                        startDate = endDate.AddMinutes(-TimeSlotDuration);
+
+                    startDate = (dy < 0)
+                        ? GetPageUpStartDate(viewStart, startDate)
+                        : GetPageDownStartDate(viewStart, viewEnd, startDate);
+
+                    endDate = startDate.AddMinutes(TimeSlotDuration);
+
+                    if (startDate >= viewStart && endDate <= viewEnd)
+                    {
+                        ExtendSelection(ref startDate, ref endDate);
+
+                        CalendarView.DateSelectionStart = startDate;
+                        CalendarView.DateSelectionEnd = endDate;
+
+                        EnsureSelectionVisible();
+                    }
+                }
+            }
+
+            objArg.Handled = true;
+        }
+
+        private DateTime GetPageUpStartDate(
+            DateTime viewStart, DateTime startDate)
+        {
+            DateTime fosDate = viewStart.AddMinutes(TimeSlotDuration*FirstOnScreenSlice);
+
+            if (startDate.Equals(fosDate) == false)
+                return (fosDate);
+
+            startDate = startDate.AddMinutes(-TimeSlotDuration * OnScreenSlices);
+
+            if (startDate < viewStart)
+                startDate = viewStart;
+
+            return (startDate);
+        }
+
+        private DateTime GetPageDownStartDate(
+            DateTime viewStart, DateTime viewEnd, DateTime startDate)
+        {
+            DateTime eosDate = viewStart.AddMinutes(TimeSlotDuration * LastOnScreenSlice);
+
+            if (startDate.Equals(eosDate) == false)
+                return (eosDate);
+
+            startDate = eosDate.AddMinutes(TimeSlotDuration * OnScreenSlices);
+
+            if (startDate > viewEnd)
+                startDate = viewEnd;
+
+            return (startDate);
+        }
+
+        #endregion
+
+        #region GetHomeEndCol
+
+        /// <summary>
+        /// Gets the Home and End column from the current
+        /// selection range
+        /// </summary>
+        /// <returns></returns>
+        private int GetHomeEndCol()
+        {
+            if (ValidDateSelection() == true)
+            {
+                if (CalendarView.DateSelectionStart.Equals(DateSelectionAnchor.Value) == true)
+                    return (GetColumnFromDate(DateSelectionEnd.Value.AddMinutes(-TimeSlotDuration)));
+
+                return (GetColumnFromDate(DateSelectionStart.Value));
+            }
+
+            return ((NumberOfColumns == 1) ? 0 : -1);
+        }
+
+        #endregion
+
+        #region GetColumnFromDate
+
+        /// <summary>
+        /// Gets the view column from the given date
+        /// </summary>
+        /// <param name="date"></param>
+        /// <returns>The DayColumns index, or -1 if invalid.</returns>
+        public int GetColumnFromDate(DateTime date)
+        {
+            for (int i = 0; i < DayColumns.Length; i++)
+            {
+                DateTime dc = DayColumns[i].Date.Date;
+
+                if (dc <= date && dc.AddDays(1) > date)
+                    return (i);
+            }
+
+            return (-1);
+        }
+
+        #endregion
+
+        #region EnsureSelectionVisible
+
+        /// <summary>
+        /// Ensures the given selection is visible
+        /// </summary>
+        protected virtual void EnsureSelectionVisible()
+        {
+            DateTime start = CalendarView.DateSelectionStart.Value;
+            DateTime end = CalendarView.DateSelectionEnd.Value;
+
+            bool refreshed = start.Equals(DateSelectionAnchor) ?
+                EnsureDateVisible(end.AddMinutes(-CalendarView.TimeSlotDuration)) :
+                EnsureDateVisible(start);
+
+            if (refreshed == false)
+                Refresh();
+        }
+
+        #endregion
+
+        #region EnsureDateVisible
+
+        /// <summary>
+        /// Ensures the given date is visible
+        /// </summary>
+        /// <param name="date"></param>
+        /// <returns></returns>
+        protected virtual bool EnsureDateVisible(DateTime date)
+        {
+            if (CalendarView.WeekDayVScrollPanel.ScrollBar.Maximum > 
+                CalendarView.WeekDayVScrollPanel.ScrollBar.LargeChange)
+            {
+                Rectangle r = ViewRect;
+
+                int offset = (int)(date.Hour * CalendarView.SlotsPerHour * CalendarView.TimeSliceHeight +
+                    (CalendarView.TimeSliceHeight * date.Minute) / CalendarView.TimeSlotDuration);
+
+                offset -= (int)(CalendarView.StartSlice * CalendarView.TimeSliceHeight);
+
+                int top = CalendarView.WeekDayVScrollPanel.ScrollBar.Value;
+                int bottom = top + r.Height;
+
+                if (offset < top || offset + CalendarView.TimeSliceHeight > bottom)
+                {
+                    if (offset + CalendarView.TimeSliceHeight > bottom)
+                        offset -= (int)(r.Height - CalendarView.TimeSliceHeight);
+
+                    offset = Math.Min(offset, CalendarView.WeekDayVScrollPanel.ScrollBar.Maximum);
+                    offset = Math.Max(offset, 0);
+
+                    CalendarView.WeekDayVScrollPanel.ScrollBar.Value = offset;
+
+                    return (true);
+                }
+
+                return (false);
+            }
+
+            return (true);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region TimeSlice support routines
+
+        #region GetPointItem
+
+        /// <summary>
+        /// Gets the column and slice index item for
+        /// the given point
+        /// </summary>
+        /// <param name="pt">Point</param>
+        /// <param name="col">[out] DayColumn column</param>
+        /// <param name="slice">[out] Time slice</param>
+        /// <param name="partial"></param>
+        /// <returns>Item visible state</returns>
+        private bool GetPointItem(Point pt, out int col, out int slice, bool partial)
+        {
+            slice = -1;
+
+            if ((col = GetPointCol(pt)) >= 0)
+            {
+                slice = GetPointSlice(pt, col);
+
+                if (slice >= 0 && slice < NumberOfActiveSlices)
+                    return (IsSliceVisible(col, slice, partial));
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region IsSliceVisible
+
+        /// <summary>
+        /// Determines if a given slice is visible
+        /// </summary>
+        /// <param name="col">DayColumn</param>
+        /// <param name="slice">Slice in question</param>
+        /// <param name="partial">Partially visible is ok</param>
+        /// <returns>Slice visibility</returns>
+        private bool IsSliceVisible(int col, int slice, bool partial)
+        {
+            Rectangle r = GetSliceRect(col, slice);
+            Rectangle t = ViewRect;
+
+            if (partial == true)
+            {
+                if (r.Bottom < t.Top)
+                    return (false);
+
+                if (r.Top > t.Bottom)
+                    return (false);
+            }
+            else
+            {
+                if (r.Top < t.Top)
+                    return (false);
+
+                if (r.Bottom > t.Bottom)
+                    return (false);
+            }
+
+            return (true);
+        }
+
+        #endregion
+
+        #region GetSliceRect
+
+        /// <summary>
+        /// Gets the given slice rectangle
+        /// </summary>
+        /// <param name="col">Column</param>
+        /// <param name="slice">Slice</param>
+        /// <returns>Bounding rectangle</returns>
+        private Rectangle GetSliceRect(int col, int slice)
+        {
+            if ((uint)col < _DayColumns.Length)
+            {
+                Rectangle r = _DayColumns[col].Bounds;
+
+                float n = slice * TimeSliceHeight;
+
+                r.Y += (int)(n);
+                r.Height = (int)(n + TimeSliceHeight) - (int)n;
+
+                return (r);
+            }
+
+            return (Rectangle.Empty);
+        }
+
+        #endregion
+
+        #region GetPointCol
+
+        /// <summary>
+        /// Gets the col index for the given point
+        /// </summary>
+        /// <param name="pt">Point</param>
+        /// <returns>Column</returns>
+        private int GetPointCol(Point pt)
+        {
+            for (int i = 0; i < _NumberOfColumns; i++)
+            {
+                if (pt.X >= _DayColumns[i].Bounds.X &&
+                    pt.X < _DayColumns[i].Bounds.Right)
+                {
+                    return (i);
+                }
+            }
+
+            return (-1);
+        }
+
+        #endregion
+
+        #region GetPointSlice
+
+        /// <summary>
+        /// Gets the slice index for the given point
+        /// </summary>
+        /// <param name="pt">Point</param>
+        /// <param name="col"></param>
+        /// <returns>Slice index</returns>
+        private int GetPointSlice(Point pt, int col)
+        {
+            int s1 = (int)(-_VScrollPos / TimeSliceHeight);
+
+            Rectangle r = GetSliceRect(col, s1);
+
+            if (pt.Y < r.Top)
+                return (s1 - 1);
+
+            for (int i = s1; i < NumberOfActiveSlices; i++)
+            {
+                r = GetSliceRect(col, i);
+
+                if (pt.Y >= r.Top && pt.Y < r.Bottom)
+                    return (i);
+            }
+
+            return (NumberOfActiveSlices - 1);
+        }
+
+        #endregion
+
+        #region GetTime
+
+        /// <summary>
+        /// Gets the DateTime adjusted by the given
+        /// slice and minutes delta
+        /// </summary>
+        /// <param name="date"></param>
+        /// <param name="slice"></param>
+        /// <param name="minutes"></param>
+        /// <returns></returns>
+        private DateTime GetTime(DateTime date, int slice, int minutes)
+        {
+            return (date.AddMinutes((StartSlice + slice) * TimeSlotDuration + minutes));
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IDisposable Members
+
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing == true && IsDisposed == false)
+            {
+                ResetView();
+
+                BusyBrush = null;
+                WorkBrush = null;
+                OffWorkBrush = null;
+                SelectedBrush = null;
+
+                HookEvents(false);
+            }
+
+            base.Dispose(disposing);
+        }
+
+        #endregion
+
+        #region Copy object support
+
+        /// <summary>
+        /// Returns copy of the item.
+        /// </summary>
+        public override BaseItem Copy()
+        {
+            WeekDayView objCopy = new WeekDayView(this.CalendarView, this.ECalendarView);
+            CopyToItem(objCopy);
+
+            return (objCopy);
+        }
+
+        /// <summary>
+        /// Copies the WeekDayView specific properties to new instance of the item.
+        /// </summary>
+        /// <param name="copy">New WeekDayView instance</param>
+        protected override void CopyToItem(BaseItem copy)
+        {
+            WeekDayView objCopy = copy as WeekDayView;
+            base.CopyToItem(objCopy);
+        }
+
+        #endregion
+
+        #region DaySlot class def
+
+        private class DaySlot
+        {
+            public Rectangle Bounds;
+            public bool Selected;
+            public DaySlotAppearance Appearance;
+        }
+
+        #endregion
+    }
+}
+#endif
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/WeekView/WeekView.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/WeekView/WeekView.cs
new file mode 100644
index 00000000..f8361477
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/WeekView/WeekView.cs	
@@ -0,0 +1,177 @@
+#if FRAMEWORK20
+using System;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Schedule
+{
+    public class WeekView : WeekDayView
+    {
+        public WeekView(CalendarView calendarView)
+            : base(calendarView, eCalendarView.Week)
+        {
+        }
+
+        #region RecalcSize support
+
+        /// <summary>
+        /// Normalizes the user specified start and end dates
+        /// </summary>
+        /// <param name="startDate">[out] Normalized start date</param>
+        /// <param name="endDate">[out] Normalized end date</param>
+        protected override void NormalizeDates(out DateTime startDate, out DateTime endDate)
+        {
+            startDate = this.StartDate;
+            endDate = this.EndDate;
+
+            DaysOfTheWeek = new DaysOfTheWeek(startDate.DayOfWeek, DaysInWeek);
+        }
+
+        #endregion
+
+        #region ProcessUpDownKey
+
+        /// <summary>
+        /// Processes Up and Down key events
+        /// </summary>
+        /// <param name="objArg"></param>
+        /// <param name="dy"></param>
+        protected override void ProcessUpDownKey(KeyEventArgs objArg, int dy)
+        {
+            if (ValidDateSelection())
+            {
+                DateTime startDate = CalendarView.DateSelectionStart.Value;
+                DateTime endDate = CalendarView.DateSelectionEnd.Value;
+
+                if (startDate.Equals(DateSelectionAnchor.Value) == true)
+                    startDate = endDate.AddMinutes(-CalendarView.TimeSlotDuration);
+
+                int col = GetColumnFromDate(startDate);
+
+                startDate = startDate.AddMinutes(dy);
+
+                if (GetColumnFromDate(startDate) == col)
+                {
+                    if (col < 0)
+                    {
+                        startDate = CalendarView.DateSelectionStart.Value;
+                        col = GetColumnFromDate(startDate);
+                    }
+
+                    if (col < 0)
+                    {
+                        startDate = CalendarView.DateSelectionEnd.Value;
+                        col = GetColumnFromDate(startDate);
+                    }
+
+                    if (col >= 0)
+                    {
+                        endDate = startDate.AddMinutes(CalendarView.TimeSlotDuration);
+
+                        DateTime sd = DayColumns[col].Date.AddMinutes(CalendarView.StartSlice * CalendarView.TimeSlotDuration);
+                        DateTime ed = sd.AddMinutes(CalendarView.NumberOfActiveSlices * CalendarView.TimeSlotDuration);
+
+                        if (startDate >= sd && endDate <= ed)
+                        {
+                            ExtendSelection(ref startDate, ref endDate);
+
+                            CalendarView.DateSelectionStart = startDate;
+                            CalendarView.DateSelectionEnd = endDate;
+
+                            EnsureSelectionVisible();
+                        }
+                    }
+                }
+            }
+
+            objArg.Handled = true;
+        }
+
+        #endregion
+
+        #region ProcessLeftRightKey
+
+        /// <summary>
+        /// Processes Left and Right Key events
+        /// </summary>
+        /// <param name="objArg"></param>
+        /// <param name="dx"></param>
+        protected override void ProcessLeftRightKey(KeyEventArgs objArg, int dx)
+        {
+            objArg.Handled = true;
+
+            if (ValidDateSelection())
+            {
+                DateTime startDate = CalendarView.DateSelectionStart.Value;
+                DateTime endDate = CalendarView.DateSelectionEnd.Value;
+
+                bool newRange = (startDate < DayColumns[0].Date ||
+                                 endDate > DayColumns[NumberOfColumns - 1].Date.AddDays(1));
+
+                if (CalendarView.WeekDayCanExtendRange == true || newRange == false)
+                {
+                    bool cancelled = false;
+
+                    if ((objArg.Modifiers & Keys.Shift) == Keys.Shift)
+                    {
+                        if (startDate.Equals(DateSelectionAnchor.Value) == true)
+                            startDate = endDate.AddMinutes(-CalendarView.TimeSlotDuration);
+
+                        startDate = startDate.AddDays(dx);
+                        endDate = startDate.AddMinutes(CalendarView.TimeSlotDuration);
+
+                        if (IsNewRange(startDate, endDate) == true)
+                        {
+                            if (CalendarView.WeekDayCanExtendRange == false)
+                                return;
+
+                            cancelled = CalendarView.DoViewDateChanging(this,
+                                StartDate, EndDate, ref startDate, ref endDate);
+
+                            if (cancelled == false)
+                                CalendarView.EnsureVisible(startDate, startDate.AddDays(1));
+                        }
+
+                        ExtendSelection(ref startDate, ref endDate);
+                    }
+                    else
+                    {
+                        startDate = startDate.AddDays(dx);
+                        endDate = endDate.AddDays(dx);
+
+                        if (IsNewRange(startDate, endDate) == true)
+                        {
+                            if (CalendarView.WeekDayCanExtendRange == false)
+                                return;
+
+                            cancelled = CalendarView.DoViewDateChanging(this,
+                               StartDate, EndDate, ref startDate, ref endDate);
+
+                            if (cancelled == false)
+                                CalendarView.EnsureVisible(startDate, startDate.AddDays(1));
+                        }
+
+                        DateSelectionAnchor = startDate;
+                    }
+
+                    if (cancelled == false)
+                    {
+                        CalendarView.DateSelectionStart = startDate;
+                        CalendarView.DateSelectionEnd = endDate;
+                    }
+
+                    EnsureSelectionVisible();
+                }
+            }
+        }
+
+        private bool IsNewRange(DateTime startDate, DateTime endDate)
+        {
+            return (startDate < DayColumns[0].Date ||
+                    endDate > DayColumns[NumberOfColumns - 1].Date.AddDays(1));
+        }
+
+        #endregion
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/WinApi.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/WinApi.cs
new file mode 100644
index 00000000..61ba30c6
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/WinApi.cs	
@@ -0,0 +1,769 @@
+using System;
+using System.Text;
+using System.Drawing;
+using System.Runtime.InteropServices;
+
+namespace DevComponents.DotNetBar.Schedule
+{
+    internal class WinApi
+    {
+        #region Windows Messages
+        public enum WindowsMessages
+        {
+            WM_NCPAINT = 0x0085,
+            WM_NCCALCSIZE = 0x0083,
+            WM_NCACTIVATE = 0x0086,
+            WM_SETTEXT = 0x000C,
+            WM_INITMENUPOPUP = 0x0117,
+            WM_WINDOWPOSCHANGED = 0x0047,
+            WM_NCHITTEST = 0x0084,
+            WM_ERASEBKGND = 0x0014,
+            WM_NCMOUSEMOVE = 0xA0,
+            WM_NCLBUTTONDOWN = 0xA1,
+            WM_NCMOUSELEAVE = 0x2A2,
+            WM_NCLBUTTONUP = 0xA2,
+            WM_NCMOUSEHOVER = 0x2A0,
+            WM_SETCURSOR = 0x20,
+            WM_SETICON = 0x0080,
+            WM_HSCROLL = 0x0114,
+            WM_VSCROLL = 0x115,
+            WM_MOUSEWHEEL = 0x020A,
+            WM_STYLECHANGED = 0x7D,
+            WM_NCLBUTTONDBLCLK = 0xA3,
+            WM_MOUSEACTIVATE = 0x21,
+            WM_MOUSEMOVE = 0x0200,
+            WM_MDISETMENU = 0x230,
+            WM_MDIREFRESHMENU = 0x234,
+            WM_KEYDOWN = 0x0100,
+            WM_SIZE = 0x5,
+            WM_DWMCOMPOSITIONCHANGED = 0x031E,
+            WM_DRAWITEM = 0x002B,
+            SBM_SETPOS = 0x00E0,
+            SBM_SETSCROLLINFO = 0x00E9,
+            EM_GETMODIFY = 0x00B8,
+            EM_SETMODIFY = 0x00B9,
+            WM_LBUTTONUP = 0x0202,
+            WM_LBUTTONDOWN = 0x0201,
+            WM_LBUTTONDBLCLK = 0x0203,
+            WM_SYSTIMER = 0x0118,
+            WM_SETFOCUS = 0x0007,
+            WM_KILLFOCUS = 0x0008,
+            WM_PAINT = 0x000F,
+            WM_COMMAND = 0x0111,
+            WM_CTLCOLORBTN = 0x0135,
+            WM_CTLCOLORSCROLLBAR = 0x0137,
+            WM_MDIACTIVATE = 0x222,
+            WM_CAPTURECHANGED = 0x0215,
+            CB_GETDROPPEDSTATE = 0x0157,
+            WVR_VALIDRECTS = 0x400,
+            WM_GETMINMAXINFO = 0x0024,
+            WM_APPCOMMAND = 0x0319
+        }
+
+        public enum ComboNotificationCodes : int
+        {
+            CBN_DROPDOWN = 7,
+            CBN_CLOSEUP = 8
+        }
+
+        public enum MouseKeyState : int
+        {
+            MK_LBUTTON = 0x0001,
+            MK_RBUTTON = 0x0002,
+            MK_SHIFT = 0x0004,
+            MK_CONTROL = 0x0008,
+            MK_MBUTTON = 0x0010,
+            MK_XBUTTON1 = 0x0020,
+            MK_XBUTTON2 = 0x0040
+
+        }
+
+        /// <summary>Options available when a form is tested for mose positions.</summary>
+        public enum WindowHitTestRegions
+        {
+            /// <summary>HTERROR: On the screen background or on a dividing line between windows 
+            /// (same as HTNOWHERE, except that the DefWindowProc function produces a system 
+            /// beep to indicate an error).</summary>
+            Error = -2,
+            /// <summary>HTTRANSPARENT: In a window currently covered by another window in the 
+            /// same thread (the message will be sent to underlying windows in the same thread 
+            /// until one of them returns a code that is not HTTRANSPARENT).</summary>
+            TransparentOrCovered = -1,
+            /// <summary>HTNOWHERE: On the screen background or on a dividing line between 
+            /// windows.</summary>
+            NoWhere = 0,
+            /// <summary>HTCLIENT: In a client area.</summary>
+            ClientArea = 1,
+            /// <summary>HTCAPTION: In a title bar.</summary>
+            TitleBar = 2,
+            /// <summary>HTSYSMENU: In a window menu or in a Close button in a child window.</summary>
+            SystemMenu = 3,
+            /// <summary>HTGROWBOX: In a size box (same as HTSIZE).</summary>
+            GrowBox = 4,
+            /// <summary>HTMENU: In a menu.</summary>
+            Menu = 5,
+            /// <summary>HTHSCROLL: In a horizontal scroll bar.</summary>
+            HorizontalScrollBar = 6,
+            /// <summary>HTVSCROLL: In the vertical scroll bar.</summary>
+            VerticalScrollBar = 7,
+            /// <summary>HTMINBUTTON: In a Minimize button. </summary>
+            MinimizeButton = 8,
+            /// <summary>HTMAXBUTTON: In a Maximize button.</summary>
+            MaximizeButton = 9,
+            /// <summary>HTLEFT: In the left border of a resizable window (the user can click 
+            /// the mouse to resize the window horizontally).</summary>
+            LeftSizeableBorder = 10,
+            /// <summary>HTRIGHT: In the right border of a resizable window (the user can click 
+            /// the mouse to resize the window horizontally).</summary>
+            RightSizeableBorder = 11,
+            /// <summary>HTTOP: In the upper-horizontal border of a window.</summary>
+            TopSizeableBorder = 12,
+            /// <summary>HTTOPLEFT: In the upper-left corner of a window border.</summary>
+            TopLeftSizeableCorner = 13,
+            /// <summary>HTTOPRIGHT: In the upper-right corner of a window border.</summary>
+            TopRightSizeableCorner = 14,
+            /// <summary>HTBOTTOM: In the lower-horizontal border of a resizable window (the 
+            /// user can click the mouse to resize the window vertically).</summary>
+            BottomSizeableBorder = 15,
+            /// <summary>HTBOTTOMLEFT: In the lower-left corner of a border of a resizable 
+            /// window (the user can click the mouse to resize the window diagonally).</summary>
+            BottomLeftSizeableCorner = 16,
+            /// <summary>HTBOTTOMRIGHT: In the lower-right corner of a border of a resizable 
+            /// window (the user can click the mouse to resize the window diagonally).</summary>
+            BottomRightSizeableCorner = 17,
+            /// <summary>HTBORDER: In the border of a window that does not have a sizing 
+            /// border.</summary>
+            NonSizableBorder = 18,
+            /// <summary>HTOBJECT: Unknown...No Documentation Found</summary>
+            Object = 19,
+            /// <summary>HTCLOSE: In a Close button.</summary>
+            CloseButton = 20,
+            /// <summary>HTHELP: In a Help button.</summary>
+            HelpButton = 21,
+            /// <summary>HTSIZE: In a size box (same as HTGROWBOX). (Same as GrowBox).</summary>
+            SizeBox = GrowBox,
+            /// <summary>HTREDUCE: In a Minimize button. (Same as MinimizeButton).</summary>
+            ReduceButton = MaximizeButton,
+            /// <summary>HTZOOM: In a Maximize button. (Same as MaximizeButton).</summary>
+            ZoomButton = MaximizeButton,
+        }
+
+        public enum GWL
+        {
+            GWL_WNDPROC = (-4),
+            GWL_HINSTANCE = (-6),
+            GWL_HWNDPARENT = (-8),
+            GWL_STYLE = (-16),
+            GWL_EXSTYLE = (-20),
+            GWL_USERDATA = (-21),
+            GWL_ID = (-12)
+        }
+
+        public enum RedrawWindowFlags : uint
+        {
+            RDW_INVALIDATE = 0x0001,
+            RDW_INTERNALPAINT = 0x0002,
+            RDW_ERASE = 0x0004,
+            RDW_VALIDATE = 0x0008,
+            RDW_NOINTERNALPAINT = 0x0010,
+            RDW_NOERASE = 0x0020,
+            RDW_NOCHILDREN = 0x0040,
+            RDW_ALLCHILDREN = 0x0080,
+            RDW_UPDATENOW = 0x0100,
+            RDW_ERASENOW = 0x0200,
+            RDW_FRAME = 0x0400,
+            RDW_NOFRAME = 0x0800
+        }
+        [Flags()]
+        public enum WindowStyles
+        {
+            WS_VISIBLE = 0x10000000,
+            WS_CAPTION = 0x00C00000,
+            WS_BORDER = 0x800000,
+            WS_DLGFRAME = 0x400000,
+            WS_THICKFRAME = 0x00040000
+        }
+        #endregion
+
+        #region Windows API
+        [DllImport("user32")]
+        public static extern IntPtr WindowFromPoint(POINT p);
+
+        [DllImport("user32.dll")]
+        public static extern bool EnableMenuItem(IntPtr hMenu, uint uIDEnableItem, uint uEnable);
+
+        [DllImport("user32.dll", CharSet = CharSet.Auto, ExactSpelling = true)]
+        public static extern short GetKeyState(int keyCode);
+
+        [DllImport("user32.dll")]
+        public static extern bool IsZoomed(IntPtr hWnd);
+        //[DllImport("user32.dll")]
+        //public static extern bool GetClientRect(IntPtr hWnd, out RECT lpRect);
+
+        [System.Runtime.InteropServices.DllImport("User32.dll", CharSet = System.Runtime.InteropServices.CharSet.Auto)]
+        public static extern IntPtr BeginPaint(IntPtr hWnd, ref PAINTSTRUCT ps);
+
+        [System.Runtime.InteropServices.DllImport("User32.dll", CharSet = System.Runtime.InteropServices.CharSet.Auto)]
+        public static extern bool EndPaint(IntPtr hWnd, ref PAINTSTRUCT ps);
+
+        [DllImport("gdi32.dll")]
+        public static extern int ExcludeClipRect(IntPtr hdc, int nLeftRect, int nTopRect, int nRightRect, int nBottomRect);
+
+        [DllImport("user32")]
+        public static extern int SendMessage(IntPtr hWnd, int Msg, IntPtr wParam, IntPtr lParam);
+
+        [DllImport("gdi32.dll", CharSet = CharSet.Auto)]
+        public static extern bool GetTextMetrics(HandleRef hdc, TEXTMETRIC tm);
+
+        [DllImport("user32.dll")]
+        public static extern bool SetMenu(IntPtr hWnd, IntPtr hMenu);
+
+        [DllImport("user32.dll")]
+        public static extern IntPtr GetMenu(IntPtr hWnd);
+
+        [DllImport("user32")]
+        public static extern bool RedrawWindow(IntPtr hWnd, [In] ref RECT lprcUpdate, IntPtr hrgnUpdate, RedrawWindowFlags flags);
+        [DllImport("user32")]
+        public static extern bool RedrawWindow(IntPtr hWnd, IntPtr lprcUpdate, IntPtr hrgnUpdate, RedrawWindowFlags flags);
+
+        [DllImport("user32")]
+        public static extern bool GetWindowRect(IntPtr hWnd, ref RECT r);
+
+        [DllImport("user32.dll", SetLastError = true, EntryPoint = "GetScrollBarInfo")]
+        public static extern int GetScrollBarInfo(IntPtr hWnd, uint idObject, ref SCROLLBARINFO psbi);
+
+        [DllImport("user32.dll")]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        public static extern bool GetScrollInfo(IntPtr hwnd, int fnBar, ref SCROLLINFO lpsi);
+
+        [DllImport("user32.dll", CharSet = CharSet.Auto, ExactSpelling = true)]
+        public static extern int SetScrollInfo(HandleRef hWnd, int fnBar, ref SCROLLINFO si, bool redraw);
+
+        [DllImport("user32.dll")]
+        public static extern IntPtr GetWindowDC(IntPtr hWnd);
+        [DllImport("user32.dll")]
+        public static extern int ReleaseDC(IntPtr hWnd, IntPtr hDC);
+
+        [DllImport("user32.dll")]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        public static extern bool SetForegroundWindow(IntPtr hWnd);
+
+        [DllImport("user32.dll")]
+        public static extern bool AdjustWindowRectEx(ref RECT lpRect, int dwStyle,
+           bool bMenu, int dwExStyle);
+
+        // This static method is required because legacy OSes do not support
+        // GetWindowLongPtr 
+        public static IntPtr GetWindowLongPtr(IntPtr hWnd, int nIndex)
+        {
+            if (IntPtr.Size == 8)
+                return GetWindowLongPtr64(hWnd, nIndex);
+            else
+                return new IntPtr(GetWindowLong32(hWnd, nIndex));
+        }
+
+        [DllImport("user32.dll", EntryPoint = "GetWindowLong")]
+        public static extern int GetWindowLong32(IntPtr hWnd, int nIndex);
+
+        [DllImport("user32.dll", EntryPoint = "GetWindowLongPtr")]
+        public static extern IntPtr GetWindowLongPtr64(IntPtr hWnd, int nIndex);
+
+        [DllImport("user32.dll")]
+        public static extern int SetWindowLong(IntPtr hWnd, int nIndex, int dwNewLong);
+
+        [DllImport("user32.dll", CharSet = CharSet.Auto, ExactSpelling = true)]
+        public static extern int MapWindowPoints(IntPtr hwndFrom, IntPtr hwndTo, ref POINT lpPoints, [MarshalAs(UnmanagedType.U4)] int cPoints);
+
+        [DllImport("user32")]
+        public static extern bool PostMessage(int hWnd, int Msg, int wParam, int lParam);
+        [DllImport("user32")]
+        public static extern bool PostMessage(IntPtr hWnd, int Msg, IntPtr wParam, IntPtr lParam);
+
+        [DllImport("gdi32.dll", CharSet = CharSet.Auto)]
+        public static extern bool DeleteDC(IntPtr hDC);
+
+        [DllImport("gdi32.dll", CharSet = CharSet.Auto)]
+        public static extern IntPtr SelectObject(IntPtr hDC, IntPtr hObject);
+
+        [DllImport("gdi32.dll", CharSet = CharSet.Auto)]
+        public static extern IntPtr CreateCompatibleDC(IntPtr hDC);
+
+        [DllImport("gdi32.dll", CharSet = CharSet.Auto)]
+        public static extern IntPtr CreateDIBSection(IntPtr hdc, BITMAPINFO pbmi, uint iUsage, int ppvBits, IntPtr hSection, uint dwOffset);
+
+        [DllImport("gdi32.dll", CharSet = CharSet.Auto)]
+        public static extern bool BitBlt(IntPtr hdc, int nXDest, int nYDest, int nWidth, int nHeight, IntPtr hdcSrc, int nXSrc, int nYSrc, uint dwRop);
+
+        [DllImport("gdi32")]
+        public static extern bool DeleteObject(IntPtr hObject);
+        [DllImport("gdi32")]
+        public static extern bool DeleteObject(int hObject);
+
+        public delegate void TimerDelegate(IntPtr hWnd, IntPtr uMsg, IntPtr idEvent, int dwTime);
+        [DllImport("user32.dll")]
+        public static extern UIntPtr SetTimer(IntPtr hWnd, UIntPtr nIDEvent, uint uElapse, TimerDelegate lpTimerFunc);
+        [DllImport("user32.dll")]
+        public static extern bool KillTimer(IntPtr hWnd, UIntPtr uIDEvent);
+
+        #endregion
+
+        #region Structures
+        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
+        public class TEXTMETRIC
+        {
+            public int tmHeight;
+            public int tmAscent;
+            public int tmDescent;
+            public int tmInternalLeading;
+            public int tmExternalLeading;
+            public int tmAveCharWidth;
+            public int tmMaxCharWidth;
+            public int tmWeight;
+            public int tmOverhang;
+            public int tmDigitizedAspectX;
+            public int tmDigitizedAspectY;
+            public char tmFirstChar;
+            public char tmLastChar;
+            public char tmDefaultChar;
+            public char tmBreakChar;
+            public byte tmItalic;
+            public byte tmUnderlined;
+            public byte tmStruckOut;
+            public byte tmPitchAndFamily;
+            public byte tmCharSet;
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        public struct SCROLLBARINFO
+        {
+            public int cbSize;
+            public RECT rcScrollBar;
+            public int dxyLineButton;
+            public int xyThumbTop;
+            public int xyThumbBottom;
+            public int reserved;
+            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 6)]
+            public int[] rgstate;
+        }
+
+        public enum eScrollBarDirection
+        {
+            SB_HORZ = 0,
+            SB_VERT = 1
+        }
+
+        public enum eScrollInfoMask
+        {
+            SIF_RANGE = 0x1,
+            SIF_PAGE = 0x2,
+            SIF_POS = 0x4,
+            SIF_DISABLENOSCROLL = 0x8,
+            SIF_TRACKPOS = 0x10,
+            SIF_ALL = SIF_RANGE + SIF_PAGE + SIF_POS + SIF_TRACKPOS
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        public struct SCROLLINFO
+        {
+            public int cbSize;
+            public int fMask;
+            public int nMin;
+            public int nMax;
+            public int nPage;
+            public int nPos;
+            public int nTrackPos;
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        public struct POINT
+        {
+            public int x;
+            public int y;
+
+            public POINT(System.Drawing.Point p)
+            {
+                this.x = p.X;
+                this.y = p.Y;
+            }
+            public POINT(int x, int y)
+            {
+                this.x = x;
+                this.y = y;
+            }
+
+            public override string ToString()
+            {
+                return string.Format("{0},{1}", x, y);
+            }
+        }
+        public enum ShowWindowCommands : int
+        {
+            /// <summary>
+            /// Hides the window and activates another window.
+            /// </summary>
+            Hide = 0,
+            /// <summary>
+            /// Activates and displays a window. If the window is minimized or
+            /// maximized, the system restores it to its original size and position.
+            /// An application should specify this flag when displaying the window
+            /// for the first time.
+            /// </summary>
+            Normal = 1,
+            /// <summary>
+            /// Activates the window and displays it as a minimized window.
+            /// </summary>
+            ShowMinimized = 2,
+            /// <summary>
+            /// Maximizes the specified window.
+            /// </summary>
+            Maximize = 3, // is this the right value?
+            /// <summary>
+            /// Activates the window and displays it as a maximized window.
+            /// </summary>      
+            ShowMaximized = 3,
+            /// <summary>
+            /// Displays a window in its most recent size and position. This value
+            /// is similar to <see cref="Win32.ShowWindowCommand.Normal"/>, except
+            /// the window is not actived.
+            /// </summary>
+            ShowNoActivate = 4,
+            /// <summary>
+            /// Activates the window and displays it in its current size and position.
+            /// </summary>
+            Show = 5,
+            /// <summary>
+            /// Minimizes the specified window and activates the next top-level
+            /// window in the Z order.
+            /// </summary>
+            Minimize = 6,
+            /// <summary>
+            /// Displays the window as a minimized window. This value is similar to
+            /// <see cref="Win32.ShowWindowCommand.ShowMinimized"/>, except the
+            /// window is not activated.
+            /// </summary>
+            ShowMinNoActive = 7,
+            /// <summary>
+            /// Displays the window in its current size and position. This value is
+            /// similar to <see cref="Win32.ShowWindowCommand.Show"/>, except the
+            /// window is not activated.
+            /// </summary>
+            ShowNA = 8,
+            /// <summary>
+            /// Activates and displays the window. If the window is minimized or
+            /// maximized, the system restores it to its original size and position.
+            /// An application should specify this flag when restoring a minimized window.
+            /// </summary>
+            Restore = 9,
+            /// <summary>
+            /// Sets the show state based on the SW_* value specified in the
+            /// STARTUPINFO structure passed to the CreateProcess function by the
+            /// program that started the application.
+            /// </summary>
+            ShowDefault = 10,
+            /// <summary>
+            ///  <b>Windows 2000/XP:</b> Minimizes a window, even if the thread
+            /// that owns the window is not responding. This flag should only be
+            /// used when minimizing windows from a different thread.
+            /// </summary>
+            ForceMinimize = 11
+        }
+
+        public struct WINDOWPLACEMENT
+        {
+            public int length;
+            public int flags;
+            public int showCmd;
+            public POINT ptMinPosition;
+            public POINT ptMaxPosition;
+            public RECT rcNormalPosition;
+        }
+        /// <summary>
+        /// Retrieves the show state and the restored, minimized, and maximized positions of the specified window.
+        /// </summary>
+        /// <param name="hWnd">
+        /// A handle to the window.
+        /// </param>
+        /// <param name="lpwndpl">
+        /// A pointer to the WINDOWPLACEMENT structure that receives the show state and position information.
+        /// <para>
+        /// Before calling GetWindowPlacement, set the length member to sizeof(WINDOWPLACEMENT). GetWindowPlacement fails if lpwndpl-> length is not set correctly.
+        /// </para>
+        /// </param>
+        /// <returns>
+        /// If the function succeeds, the return value is nonzero.
+        /// <para>
+        /// If the function fails, the return value is zero. To get extended error information, call GetLastError.
+        /// </para>
+        /// </returns>
+        [DllImport("user32.dll", SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        internal static extern bool GetWindowPlacement(IntPtr hWnd, out WINDOWPLACEMENT lpwndpl);
+
+        [StructLayout(LayoutKind.Sequential)]
+        public struct NCCALCSIZE_PARAMS
+        {
+            public RECT rgrc0, rgrc1, rgrc2;
+            public IntPtr lppos;
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        public struct WINDOWPOS
+        {
+            public IntPtr hwnd;
+            public IntPtr hwndInsertAfter;
+            public int x, y;
+            public int cx, cy;
+            public int flags;
+            public override string ToString()
+            {
+                return string.Format("x={0}, y={1}, right={2}, bottom={3}", x, y, cx, cy);
+            }
+        }
+
+        [Serializable, StructLayout(LayoutKind.Sequential)]
+        public struct RECT
+        {
+            public int Left;
+            public int Top;
+            public int Right;
+            public int Bottom;
+
+            public RECT(int left_, int top_, int right_, int bottom_)
+            {
+                Left = left_;
+                Top = top_;
+                Right = right_;
+                Bottom = bottom_;
+            }
+
+            public RECT(Rectangle r)
+            {
+                Left = r.Left;
+                Top = r.Top;
+                Right = r.Right;
+                Bottom = r.Bottom;
+            }
+
+            public int Height { get { return Bottom - Top; } }
+            public int Width { get { return Right - Left; } }
+            public Size Size { get { return new Size(Width, Height); } }
+
+            public Point Location { get { return new Point(Left, Top); } }
+
+            // Handy method for converting to a System.Drawing.Rectangle
+            public Rectangle ToRectangle()
+            { return Rectangle.FromLTRB(Left, Top, Right, Bottom); }
+
+            public static RECT FromRectangle(Rectangle rectangle)
+            {
+                return new RECT(rectangle.Left, rectangle.Top, rectangle.Right, rectangle.Bottom);
+            }
+
+            public override int GetHashCode()
+            {
+                return Left ^ ((Top << 13) | (Top >> 0x13))
+                  ^ ((Width << 0x1a) | (Width >> 6))
+                  ^ ((Height << 7) | (Height >> 0x19));
+            }
+
+            #region Operator overloads
+
+            public static implicit operator Rectangle(RECT rect)
+            {
+                return Rectangle.FromLTRB(rect.Left, rect.Top, rect.Right, rect.Bottom);
+            }
+
+            public static implicit operator RECT(Rectangle rect)
+            {
+                return new RECT(rect.Left, rect.Top, rect.Right, rect.Bottom);
+            }
+
+            public override string ToString()
+            {
+                return "Left=" + this.Left + ", Top=" + this.Top + ", Right=" + this.Right + ", Bottom=" + this.Bottom;
+            }
+            #endregion
+        }
+
+        [System.Runtime.InteropServices.StructLayout(System.Runtime.InteropServices.LayoutKind.Sequential)]
+        public struct PAINTSTRUCT
+        {
+            public IntPtr hdc;
+            public int fErase;
+            public WinApi.RECT rcPaint;
+            public int fRestore;
+            public int fIncUpdate;
+            public int Reserved1;
+            public int Reserved2;
+            public int Reserved3;
+            public int Reserved4;
+            public int Reserved5;
+            public int Reserved6;
+            public int Reserved7;
+            public int Reserved8;
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        public class BITMAPINFO
+        {
+            public int biSize = 0;
+            public int biWidth = 0;
+            public int biHeight = 0;
+            public short biPlanes = 0;
+            public short biBitCount = 0;
+            public int biCompression = 0;
+            public int biSizeImage = 0;
+            public int biXPelsPerMeter = 0;
+            public int biYPelsPerMeter = 0;
+            public int biClrUsed = 0;
+            public int biClrImportant = 0;
+            public byte bmiColors_rgbBlue = 0;
+            public byte bmiColors_rgbGreen = 0;
+            public byte bmiColors_rgbRed = 0;
+            public byte bmiColors_rgbReserved = 0;
+        }
+
+        public enum eObjectId : uint
+        {
+            OBJID_CLIENT = 0xFFFFFFFC,
+            OBJID_VSCROLL = 0xFFFFFFFB,
+            OBJID_HSCROLL = 0xFFFFFFFA
+        }
+
+        public enum eStateFlags
+        {
+            STATE_SYSTEM_INVISIBLE = 0x00008000,
+            STATE_SYSTEM_OFFSCREEN = 0x00010000,
+            STATE_SYSTEM_PRESSED = 0x00000008,
+            STATE_SYSTEM_UNAVAILABLE = 0x00000001
+        }
+        #endregion
+
+        #region Functions
+        public enum AppCommands
+        {
+            APPCOMMAND_BROWSER_BACKWARD = 1,
+            APPCOMMAND_BROWSER_FORWARD = 2
+        }
+        private static int FAPPCOMMAND_MASK = 0xF000;
+        public static int GetAppCommandLParam(IntPtr lParam)
+        {
+            return HIWORD(lParam) & ~FAPPCOMMAND_MASK;
+        }
+        public static int LOWORD(int n)
+        {
+            return (short)(n & 0xffff);
+        }
+        public static int HIWORD(int n)
+        {
+            return (int)((n >> 0x10) & 0xffff);
+        }
+        public static int LOWORD(IntPtr n)
+        {
+            return LOWORD((int)((long)n));
+        }
+        public static int HIWORD(IntPtr n)
+        {
+            return HIWORD((int)((long)n));
+        }
+
+        public static IntPtr CreateLParam(int loWord, int hiWord)
+        {
+            byte[] bx = BitConverter.GetBytes(loWord);
+            byte[] by = BitConverter.GetBytes(hiWord);
+            byte[] blp = new byte[] { bx[0], bx[1], by[0], by[1] };
+            return new IntPtr(BitConverter.ToInt32(blp, 0));
+        }
+        #endregion
+
+        #region DWM
+        [StructLayout(LayoutKind.Sequential)]
+        public struct MARGINS
+        {
+            public int cxLeftWidth;
+            public int cxRightWidth;
+            public int cyTopHeight;
+            public int cyBottomHeight;
+        }
+
+        [DllImport("dwmapi.dll")]
+        public static extern int DwmSetWindowAttribute(
+           IntPtr hWnd,
+           int dwAttribute,
+           ref int attributeValue,
+            int sizeOfValueRetrived
+        );
+        [DllImport("dwmapi.dll")]
+        public static extern int DwmGetWindowAttribute(
+            IntPtr hwnd,
+            int dwAttribute,
+            ref int pvAttribute,
+            int sizeOfValueRetrived);
+
+        [DllImport("dwmapi.dll", PreserveSig = false)]
+        static extern bool DwmIsCompositionEnabled();
+
+        [DllImport("dwmapi.dll")]
+        public static extern int DwmDefWindowProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, out IntPtr plResult);
+        [DllImport("user32.dll", CharSet = CharSet.Unicode, EntryPoint = "DefWindowProcW")]
+        public static extern IntPtr DefWindowProc(IntPtr hWnd, WindowsMessages Msg, IntPtr wParam, IntPtr lParam);
+        [DllImport("user32.dll", CharSet = CharSet.Unicode, EntryPoint = "DefWindowProcW")]
+        public static extern IntPtr DefWindowProc(IntPtr hWnd, int Msg, IntPtr wParam, IntPtr lParam);
+
+        [DllImport("dwmapi.dll")]
+        public static extern int DwmExtendFrameIntoClientArea(IntPtr hWnd, ref MARGINS pMargins);
+
+        public static void ExtendGlass(IntPtr handle, int glassHeight)
+        {
+            MARGINS margins = new MARGINS();
+            margins.cxLeftWidth = 0;
+            margins.cxRightWidth = 0;
+            margins.cyTopHeight = glassHeight;
+            margins.cyBottomHeight = 0;
+
+            int result = DwmExtendFrameIntoClientArea(handle, ref margins);
+
+        }
+
+        public static bool IsGlassEnabled
+        {
+            get
+            {
+                if (System.Environment.OSVersion.Version.Major < 6)
+                    return false;
+                return DwmIsCompositionEnabled();
+            }
+        }
+
+        public enum DWMWINDOWATTRIBUTE : int
+        {
+            DWMWA_NCRENDERING_ENABLED = 1,
+            DWMWA_NCRENDERING_POLICY = 2,
+            DWMWA_TRANSITIONS_FORCEDISABLED = 3,
+            DWMWA_ALLOW_NCPAINT = 4,
+            DWMWA_LAST = 5
+        }
+
+        public enum DWMNCRENDERINGPOLICY : int
+        {
+            DWMNCRP_USEWINDOWSTYLE = 0,
+            DWMNCRP_DISABLED = 1,
+            DWMNCRP_ENABLED = 2,
+            DWMNCRP_LAST = 3
+        }
+
+        public enum WVR
+        {
+            ALIGNTOP = 0x0010,
+            ALIGNLEFT = 0x0020,
+            ALIGNBOTTOM = 0x0040,
+            ALIGNRIGHT = 0x0080,
+            HREDRAW = 0x0100,
+            VREDRAW = 0x0200,
+            VALIDRECTS = 0x0400,
+            REDRAW = HREDRAW | VREDRAW,
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/YearView/ModelYearViewConnector.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/YearView/ModelYearViewConnector.cs
new file mode 100644
index 00000000..fa00571c
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/YearView/ModelYearViewConnector.cs	
@@ -0,0 +1,395 @@
+#if FRAMEWORK20
+using System;
+using DevComponents.Schedule.Model;
+using System.ComponentModel;
+using System.Collections.Generic;
+
+namespace DevComponents.DotNetBar.Schedule
+{
+    internal class ModelYearViewConnector : ModelViewConnector
+    {
+        #region Static data
+
+        static private List<Appointment> _lineAppts;
+
+        static private int _lineState;              // Refresh state
+        static private DateTime _lineStartTime;     // YearView start date
+        static private DateTime _lineEndTime;       // YearView end date
+
+        #endregion
+
+        #region Private variables
+
+        private CalendarModel _Model;       // The associated CalendarModel
+        private YearView _View;             // The associated YearView
+
+        private bool _IsConnected;          // Connection status
+        private int _ViewState;             // View refresh state
+
+        #endregion
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="model">Assoc CalendarModel</param>
+        /// <param name="yearView">Assoc YearView</param>
+        public ModelYearViewConnector(CalendarModel model, YearView yearView)
+        {
+            _Model = model;
+            _View = yearView;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the connection status
+        /// </summary>
+        public override bool IsConnected
+        {
+            get { return _IsConnected; }
+        }
+
+        #endregion
+
+        #region Internal properties
+
+        internal int ViewState
+        {
+            get { return (_ViewState); }
+        }
+
+        #endregion
+
+        #region Connect processing
+
+        /// <summary>
+        /// Performs Model connection processing
+        /// </summary>
+        public override void Connect()
+        {
+            // Load the connection data
+
+            if (_IsConnected)
+                Disconnect();
+
+            LoadData(_ViewState == _lineState);
+
+            // Get notification on Model property changes
+
+            _Model.PropertyChanged += ModelPropertyChanged;
+            _Model.SubPropertyChanged += ModelSubPropertyChanged;
+            _View.CalendarView.CustomItems.CollectionChanged += CustomItemsCollectionChanged;
+
+            _IsConnected = true;
+        }
+
+        #endregion
+
+        #region Disconnect processing
+
+        /// <summary>
+        /// Severs the Model/MonthView connection
+        /// </summary>
+        public override void Disconnect()
+        {
+            if (_IsConnected)
+            {
+                // Loop through each week, clearing each
+                // associated view connection
+
+                for (int i = 0; i < _View.YearMonths.Length; i++)
+                    _View.YearMonths[i].AppBits.SetAll(false);
+
+                // Stop notification on Model property changes
+
+                _Model.PropertyChanged -= ModelPropertyChanged;
+                _Model.SubPropertyChanged -= ModelSubPropertyChanged;
+                _View.CalendarView.CustomItems.CollectionChanged -= CustomItemsCollectionChanged;
+
+                _IsConnected = false;
+            }
+        }
+
+        #endregion
+
+        #region LoadData processing
+
+        /// <summary>
+        /// Loads Model/YearView connection data
+        /// </summary>
+        private void LoadData(bool reload)
+        {
+            if (reload == true ||
+                _lineStartTime != _View.StartDate || _lineEndTime != _View.EndDate)
+            {
+                _lineStartTime = _View.StartDate;
+                _lineEndTime = _View.EndDate;
+
+                _lineAppts = GetAppointmentList(_Model, _View.StartDate, _View.EndDate.AddDays(1));
+            }
+
+            if (reload == true)
+                _lineState = _lineState ^ 1;
+
+            _ViewState = _lineState;
+
+            foreach (YearMonth yearMonth in _View.YearMonths)
+                yearMonth.AppBits.SetAll(false);
+
+            int rootMonth = _View.StartDate.Year * 12 + _View.StartDate.Month;
+
+            for (int i = 0; i < _lineAppts.Count; i++)
+            {
+                Appointment app = _lineAppts[i];
+
+                if (IsAppointmentVisible(app) == true)
+                {
+                    int day = app.StartTime.Day - 1;
+                    int month = (app.StartTime.Year * 12 + app.StartTime.Month) - rootMonth;
+
+                    DateTime date = app.StartTime;
+
+                    if (month < 0)
+                    {
+                        day = 0;
+                        month = 0;
+
+                        if (_View.YearMonths.Length > 0)
+                            date = _View.YearMonths[0].StartDate;
+                    }
+
+                    if (month < _View.YearMonths.Length)
+                    {
+                        YearMonth ym = _View.YearMonths[month];
+
+                        while (date < app.EndTime || (date == app.EndTime && app.StartTime == app.EndTime))
+                        {
+                            if (day >= ym.DaysInMonth)
+                            {
+                                month++;
+
+                                if (month >= _View.YearMonths.Length)
+                                    break;
+
+                                ym = _View.YearMonths[month];
+                                day = 0;
+                            }
+
+                            ym.AppBits.Set(day++, true);
+
+                            date = date.AddDays(1);
+                        }
+                    }
+                }
+            }
+
+            foreach (YearMonth yearMonth in _View.YearMonths)
+                UpdateCustomItems(yearMonth);
+        }
+
+        #endregion
+
+        #region UpdateCustomItems
+
+        /// <summary>
+        /// UpdateCustomItems
+        /// </summary>
+        /// <param name="yearMonth"></param>
+        private void UpdateCustomItems(YearMonth yearMonth)
+        {
+            CustomCalendarItemCollection items = _View.CalendarView.CustomItems;
+
+            if (items != null && items.Count > 0)
+            {
+                for (int i = 0; i < items.Count; i++)
+                {
+                    CustomCalendarItem item = items[i];
+
+                    if (IsCustomItemVisible(item) == true &&
+                        (item.StartTime.Year == yearMonth.StartDate.Year && item.StartTime.Month == yearMonth.StartDate.Month))
+                    {
+                        yearMonth.AppBits.Set(item.StartTime.Day - 1, true);
+                        break;
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region CustomItems_CollectionChanged
+
+        /// <summary>
+        /// Handles CustomItemCollection change events
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void CustomItemsCollectionChanged(object sender, EventArgs e)
+        {
+            LoadData(_ViewState == _lineState);
+
+            _View.NeedRecalcLayout = true;
+            _View.NeedRecalcSize = true;
+        }
+
+        #endregion
+
+        #region GetFirstAppointment
+
+        /// <summary>
+        /// GetFirstAppointment
+        /// </summary>
+        /// <param name="date"></param>
+        /// <returns></returns>
+        internal Appointment GetFirstAppointment(DateTime date)
+        {
+            Appointment app = null;
+            AppointmentSubsetCollection asc = _Model.GetDay(date).Appointments;
+
+            if (asc.Count > 0)
+            {
+                for (int i = 0; i < asc.Count; i++)
+                {
+                    if (IsAppointmentVisible(asc[i]) == true)
+                    {
+                        if (app == null || asc[i].StartTime < app.StartTime)
+                            app = asc[i];
+                    }
+                }
+
+                return (app);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetFirstCustomItem
+
+        /// <summary>
+        /// GetFirstCustomItem
+        /// </summary>
+        /// <param name="date"></param>
+        /// <returns></returns>
+        internal CustomCalendarItem GetFirstCustomItem(DateTime date)
+        {
+            CustomCalendarItemCollection items = _View.CalendarView.CustomItems;
+
+            if (items != null && items.Count > 0)
+            {
+                for (int i = 0; i < items.Count; i++)
+                {
+                    CustomCalendarItem item = items[i];
+
+                    if (IsCustomItemVisible(item) == true &&
+                        (item.StartTime.Date == date.Date))
+                    {
+                        return (item);
+                    }
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetView
+
+        /// <summary>
+        /// Returns the Month view
+        /// </summary>
+        /// <returns></returns>
+        public override eCalendarView GetView()
+        {
+            return (eCalendarView.Year);
+        }
+
+        #endregion
+
+        #region ResetModelData
+
+        /// <summary>
+        /// ResetModelData
+        /// </summary>
+        static internal void ResetModelData()
+        {
+            _lineStartTime = DateTime.MinValue;
+        }
+
+        #endregion
+
+        #region ModelPropertyChanged
+
+        /// <summary>
+        /// Handles Model property change notifications
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ModelPropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            if (e.PropertyName == CalendarModel.AppointmentsPropertyName)
+            {
+                LoadData(_ViewState == _lineState);
+
+                _View.NeedRecalcSize = true;
+                _View.Refresh();
+            }
+        }
+
+        #endregion
+
+        #region ModelSubPropertyChanged
+
+        /// <summary>
+        /// Handles ModelSubProperty change notifications
+        /// </summary>
+        /// <param name="sender">object</param>
+        /// <param name="e">SubPropertyChangedEventArgs</param>
+        private void ModelSubPropertyChanged(object sender, SubPropertyChangedEventArgs e)
+        {
+            if (e.Source is Owner)
+            {
+                Owner owner = (Owner)e.Source;
+
+                if (_View.OwnerKey != null && _View.OwnerKey.Equals(owner.Key))
+                {
+                    if (e.PropertyChangedArgs.PropertyName == Owner.DisplayNamePropertyName)
+                        _View.DisplayName = owner.DisplayName;
+
+                    else if (e.PropertyChangedArgs.PropertyName.Equals("ColorScheme"))
+                        _View.CalendarColor = owner.ColorScheme;
+                }
+            }
+            else if (e.Source is Appointment)
+            {
+                Appointment app = e.Source as Appointment;
+
+                string name = e.PropertyChangedArgs.PropertyName;
+
+                if (name.Equals("OwnerKey"))
+                {
+                    if (_View.CalendarView.IsMultiCalendar == true)
+                    {
+                        if (_View.OwnerKey == app.OwnerKey)
+                        {
+                            LoadData(_ViewState == _lineState);
+
+                            _View.NeedRecalcSize = true;
+                            _View.Refresh();
+                        }
+                    }
+                }
+                else if (name.Equals("Visible"))
+                {
+                    LoadData(true);
+                }
+            }
+        }
+
+        #endregion
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/YearView/YearMonth.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/YearView/YearMonth.cs
new file mode 100644
index 00000000..fa4d3f57
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/YearView/YearMonth.cs	
@@ -0,0 +1,1119 @@
+#if FRAMEWORK20
+using System;
+using System.Collections;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Schedule
+{
+    public class YearMonth
+    {
+        #region Private constants
+
+        private const int MaxRows = 6;
+        private const int MaxCols = 7;
+        private const int MaxDays = (MaxRows * MaxCols);
+
+        private const int CellPadding = 4;
+
+        #endregion
+
+        #region Private variables
+
+        private YearView _YearView;
+
+        private DateTime _RootDate;
+        private DateTime _StartDate;
+        private DateTime _EndDate;
+
+        private Rectangle _Bounds;
+        private Rectangle _ContentBounds;
+        private Rectangle _MonthHeaderBounds;
+        private Rectangle _DayOfWeekHeaderBounds;
+
+        private int _DaysInMonth;
+        private int _DaysOffset;
+
+        private ItemRects _DayRects;
+
+        private BitArray _AppBits;
+        private bool _DaysSelected;
+
+        private DaysOfTheWeek.eDayType _DayType = DaysOfTheWeek.eDayType.None;
+
+        #endregion
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="yearView"></param>
+        /// <param name="date"></param>
+        public YearMonth(YearView yearView, DateTime date)
+        {
+            _YearView = yearView;
+
+            StartDate = date;
+
+            _DayRects = new ItemRects(yearView, MaxDays);
+            _AppBits = new BitArray(32);
+        }
+
+        #region Internal properties
+
+        #region AppBits
+
+        /// <summary>
+        /// Appointment (and CustomItem) bit array
+        /// </summary>
+        internal BitArray AppBits
+        {
+            get { return (_AppBits); }
+            set { _AppBits = value; }
+        }
+
+        #endregion
+
+        #region DayOfWeekHeaderHeight
+
+        /// <summary>
+        /// DayOfWeekHeaderHeight
+        /// </summary>
+        internal int DayOfWeekHeaderHeight
+        {
+            get { return (_YearView.Font.Height + 4); }
+        }
+
+        #endregion
+
+        #region DayRects
+
+        /// <summary>
+        /// Gets the day Rectangles
+        /// </summary>
+        internal ItemRects DayRects
+        {
+            get { return (_DayRects); }
+        }
+
+        #endregion
+
+        #region MonthHeaderHeight
+
+        /// <summary>
+        /// MonthHeaderHeight
+        /// </summary>
+        internal int MonthHeaderHeight
+        {
+            get { return (_YearView.Font.Height + 4); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Public properties
+
+        #region Bounds
+
+        /// <summary>
+        /// Gets and sets the week bounding Rectangle
+        /// </summary>
+        public Rectangle Bounds
+        {
+            get { return (_Bounds); }
+
+            internal set
+            {
+                if (_Bounds.Equals(value) == false)
+                {
+                    _Bounds = value;
+                    _DayType = DaysOfTheWeek.eDayType.None;
+
+                    CalcBoundingRects();
+                    CalcDayRects();
+                }
+            }
+        }
+
+        #endregion
+
+        #region DaysInMonth
+
+        /// <summary>
+        /// Gets the number of Days in the Month
+        /// </summary>
+        public int DaysInMonth
+        {
+            get { return (_DaysInMonth); }
+        }
+
+        #endregion
+
+        #region StartDate
+
+        /// <summary>
+        /// Gets or sets the month starting date
+        /// </summary>
+        public DateTime StartDate
+        {
+            get { return (_StartDate); }
+
+            internal set
+            {
+                value = value.Date.AddDays(-(value.Day - 1));
+
+                if (_StartDate.Equals(value) == false)
+                {
+                    _StartDate = value;
+
+                    _DaysInMonth = DateTime.DaysInMonth(_StartDate.Year, _StartDate.Month);
+                    _RootDate = DateHelper.GetDateForDayOfWeek(_StartDate, DateHelper.GetFirstDayOfWeek());
+                    _EndDate = _StartDate.AddDays(_DaysInMonth).AddDays(-1);
+
+                    _DaysOffset = (_StartDate.Date - _RootDate.Date).Days;
+                }
+            }
+        }
+
+        #endregion
+
+        #region EndDate
+
+        /// <summary>
+        /// Gets the month end date
+        /// </summary>
+        public DateTime EndDate
+        {
+            get { return (_EndDate); }
+        }
+
+        #endregion
+
+        #region YearView
+
+        /// <summary>
+        /// Gets the parent YearView
+        /// </summary>
+        public YearView YearView
+        {
+            get { return (_YearView); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region CalcBoundingRects
+
+        /// <summary>
+        /// Calculates the control's Bounding Rects
+        /// </summary>
+        private void CalcBoundingRects()
+        {
+            // Calculate main content bounding rects
+
+            _ContentBounds = _Bounds;
+            _ContentBounds.Y += (MonthHeaderHeight + DayOfWeekHeaderHeight);
+            _ContentBounds.Height -= (MonthHeaderHeight + DayOfWeekHeaderHeight);
+
+            _MonthHeaderBounds = _Bounds;
+            _MonthHeaderBounds.Height = MonthHeaderHeight;
+
+            _DayOfWeekHeaderBounds = _Bounds;
+            _DayOfWeekHeaderBounds.Y += MonthHeaderHeight;
+            _DayOfWeekHeaderBounds.Height = DayOfWeekHeaderHeight;
+        }
+
+        #endregion
+
+        #region CalcDayRects
+
+        /// <summary>
+        /// Calculates the day rectangles for the
+        /// current bounding rectangle
+        /// </summary>
+        private void CalcDayRects()
+        {
+            // Loop through each day in the week
+
+            Size cellSize = _YearView.CellSize;
+            Rectangle r = new Rectangle(_Bounds.Location, cellSize);
+
+            r.X += CellPadding;
+            r.Y += DayOfWeekHeaderHeight + MonthHeaderHeight + CellPadding;
+
+            int bWidth = _Bounds.Width - (CellPadding * 2);
+            int bHeight = _Bounds.Height - (DayOfWeekHeaderHeight + MonthHeaderHeight) - (CellPadding * 2);
+
+            int dx = (bWidth - (cellSize.Width * MaxCols)) / MaxCols;
+            int dy = (bHeight - (cellSize.Height * MaxRows)) / MaxRows;
+
+            int width = (dx + cellSize.Width) * MaxCols;
+            int colSpread = (width < bWidth) ? bWidth - width : 0;
+
+            int height = (dy + cellSize.Height) * MaxRows;
+            int rowSpread = (height < bHeight) ? bHeight - height : 0;
+
+            for (int i = 0; i < MaxRows; i++)
+            {
+                r.Height = cellSize.Height + dy;
+
+                if (i < rowSpread)
+                    r.Height++;
+
+                for (int j = 0; j < MaxCols; j++)
+                {
+                    r.Width = cellSize.Width + dx;
+
+                    if (j < colSpread)
+                        r.Width++;
+
+                    _DayRects[i * MaxCols + j].Bounds = r;
+
+                    r.X += r.Width;
+                }
+
+                r.X = _Bounds.X + CellPadding;
+                r.Y += r.Height;
+            }
+        }
+
+        #endregion
+
+        #region GetDateFromIndex
+
+        /// <summary>
+        /// Gets the month date from the given day index
+        /// </summary>
+        /// <param name="dayIndex"></param>
+        /// <returns></returns>
+        public DateTime GetDateFromIndex(int dayIndex)
+        {
+            if ((uint)dayIndex < MaxDays)
+                return (_RootDate.AddDays(dayIndex).Date);
+
+            return (_RootDate.Date);
+        }
+
+        #endregion
+
+        #region GetDateFromPoint
+
+        /// <summary>
+        /// Gets the month date from the given Point
+        /// </summary>
+        /// <param name="pt"></param>
+        /// <param name="date"></param>
+        /// <returns></returns>
+        public bool GetDateFromPoint(Point pt, ref DateTime date)
+        {
+            int dayIndex = GetDayIndexFromPoint(pt);
+
+            if (dayIndex >= _DaysOffset && dayIndex < _DaysOffset + _DaysInMonth)
+            {
+                date = _RootDate.AddDays(dayIndex);
+
+                return (true);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region GetViewAreaFromPoint
+
+        /// <summary>
+        /// Gets the month view area from the given Point
+        /// </summary>
+        /// <param name="pt"></param>
+        /// <returns></returns>
+        public eViewArea GetViewAreaFromPoint(Point pt)
+        {
+            if (_ContentBounds.Contains(pt))
+                return (eViewArea.InContent);
+
+            if (_MonthHeaderBounds.Contains(pt))
+                return (eViewArea.InMonthHeader);
+
+            if (_DayOfWeekHeaderBounds.Contains(pt))
+                return (eViewArea.InDayOfWeekHeader);
+
+            return (eViewArea.NotInView);
+        }
+
+        #endregion
+
+        #region GetNormalizedDayIndex
+
+        /// <summary>
+        /// Gets the normalized month date for the given dayIndex
+        /// </summary>
+        /// <param name="dayIndex"></param>
+        /// <returns></returns>
+        internal int GetNormalizedDayIndex(int dayIndex)
+        {
+            if (dayIndex < _DaysOffset)
+                dayIndex = _DaysOffset;
+
+            else if (dayIndex >= _DaysOffset + _DaysInMonth)
+                dayIndex = _DaysOffset + _DaysInMonth - 1;
+
+            return (dayIndex);
+        }
+
+        #endregion
+
+        #region GetDayIndexFromPoint
+
+        /// <summary>
+        /// Gets the month dayIndex from the given Point
+        /// </summary>
+        /// <param name="pt"></param>
+        /// <returns></returns>
+        internal int GetDayIndexFromPoint(Point pt)
+        {
+            for (int i = 0; i < MaxDays; i++)
+            {
+                if (_DayRects[i].Bounds.Contains(pt))
+                    return (i);
+            }
+
+            return (-1);
+        }
+
+        #endregion
+
+        #region GetDayIndexFromDate
+
+        /// <summary>
+        /// Gets the month dayIndex from the given date
+        /// </summary>
+        /// <param name="date"></param>
+        /// <returns></returns>
+        internal int GetDayIndexFromDate(DateTime date)
+        {
+            if (ContainsDate(date) == true)
+                return (date.Day - _StartDate.Day + _DaysOffset);
+
+            return (-1);
+        }
+
+        #endregion
+
+        #region ContainsDate
+
+        /// <summary>
+        /// Determines if the given date is contained in the month
+        /// </summary>
+        /// <param name="date"></param>
+        /// <returns></returns>
+        public bool ContainsDate(DateTime date)
+        {
+            return (date >= _StartDate && date <= _EndDate);
+        }
+
+        #endregion
+
+        #region DayHasAppointments
+
+        /// <summary>
+        /// Determines if the given day of the month has
+        /// Appointments or CustomItems associated with it
+        /// </summary>
+        /// <param name="day">Day of the month</param>
+        /// <returns>true, if there are Appointments associated with this day</returns>
+        public bool DayHasAppointments(int day)
+        {
+            return (DayIndexHasAppointments(day + _DaysOffset - 1));
+        }
+
+        /// <summary>
+        /// Determines if the given dayIndex has
+        /// Appointments or CustomItems associated with it
+        /// </summary>
+        /// <param name="dayIndex"></param>
+        /// <returns></returns>
+        internal bool DayIndexHasAppointments(int dayIndex)
+        {
+            dayIndex -= _DaysOffset;
+
+            return (_AppBits.Count > (uint)dayIndex && _AppBits[dayIndex] == true);
+
+        }
+
+        #endregion
+
+        #region DayIsSelected
+
+        /// <summary>
+        /// Determines if the given day of the month is selected
+        /// </summary>
+        /// <param name="day">Day of the month</param>
+        /// <returns>true if selected</returns>
+        public bool DayIsSelected(int day)
+        {
+            day += (_DaysOffset - 1);
+
+            return (_DayRects.Rects.Length > (uint)day && _DayRects[day].IsSelected == true);
+        }
+
+        #endregion
+
+        #region UpdateDateSelection
+
+        /// <summary>
+        /// Updates the date selection for the month
+        /// </summary>
+        internal void UpdateDateSelection()
+        {
+            if (_YearView.DateSelectionStart.HasValue == false ||
+                _YearView.DateSelectionEnd.HasValue == false)
+            {
+                ClearSelection();
+            }
+            else
+            {
+                DateTime selStart = _YearView.DateSelectionStart.Value;
+                DateTime selEnd = _YearView.DateSelectionEnd.Value;
+
+                if (_StartDate > selEnd || _EndDate < selStart)
+                {
+                    ClearSelection();
+                }
+                else
+                {
+                    _DaysSelected = false;
+
+                    DateTime startDate = _StartDate;
+
+                    for (int i = 0; i < _DaysInMonth; i++)
+                    {
+                        DateTime endDate = startDate.AddDays(1);
+
+                        bool selected = (endDate > selStart && startDate < selEnd);
+
+                        DayRects[i + _DaysOffset].IsSelected = selected;
+
+                        _DaysSelected |= selected;
+
+                        startDate = startDate.AddDays(1);
+                    }
+                }
+            }
+        }
+
+        #region ClearSelection
+
+        /// <summary>
+        /// ClearSelection
+        /// </summary>
+        private void ClearSelection()
+        {
+            if (_DaysSelected == true)
+            {
+                for (int i = 0; i < MaxDays; i++)
+                    _DayRects[i].IsSelected = false;
+
+                _DaysSelected = false;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetPreferredSize
+
+        /// <summary>
+        /// Gets the Preferred control size for the month
+        /// </summary>
+        /// <returns></returns>
+        internal Size GetPreferredSize()
+        {
+            Size size = _YearView.CellSize;
+
+            size.Width = (size.Width + CellPadding) * MaxCols;
+
+            size.Height = (size.Height + CellPadding) * MaxRows +
+                DayOfWeekHeaderHeight + MonthHeaderHeight;
+
+            return (size);
+        }
+
+        #endregion
+
+        #region Paint
+
+        /// <summary>
+        /// Paint
+        /// </summary>
+        /// <param name="e"></param>
+        /// <param name="isNow"></param>
+        internal void Paint(ItemPaintArgs e, bool isNow)
+        {
+            DrawContent(e);
+
+            DrawMonthHeader(e, isNow);
+            DrawDayOfWeekHeader(e, isNow);
+            DrawBorder(e, isNow);
+        }
+
+        #region DrawContent
+
+        /// <summary>
+        /// DrawContent
+        /// </summary>
+        /// <param name="e"></param>
+        private void DrawContent(ItemPaintArgs e)
+        {
+            DrawBackground(e);
+            DrawDayContent(e);
+            DrawGridLines(e);
+            DrawNowHighlight(e);
+        }
+
+        #region DrawBackground
+
+        /// <summary>
+        /// DrawBackground
+        /// </summary>
+        /// <param name="e"></param>
+        private void DrawBackground(ItemPaintArgs e)
+        {
+            Graphics g = e.Graphics;
+
+            using (Brush br = _YearView.ViewColor.BrushPart(
+                (int)eCalendarMonthPart.DayContentActiveBackground, _ContentBounds))
+            {
+                g.FillRectangle(br, _Bounds);
+            }
+        }
+
+        #endregion
+
+        #region DrawDayContent
+
+        /// <summary>
+        /// DrawDayContent
+        /// </summary>
+        /// <param name="e"></param>
+        private void DrawDayContent(ItemPaintArgs e)
+        {
+            Graphics g = e.Graphics;
+
+            Color color1 = _YearView.ViewColor.GetColor((int)eCalendarMonthPart.DayContactInactiveBackground);
+            Color color2 = _YearView.ViewColor.GetColor((int)eCalendarMonthPart.DayContentActiveBackground);
+
+            DateTime date = _StartDate;
+
+            for (int i = 0; i < _DaysInMonth; i++)
+            {
+                ItemRect ir = _DayRects[i + _DaysOffset];
+
+                DrawDayContentBackground(g, date, ir, color1, color2);
+                DrawDayContentText(g, date, ir);
+
+                date = date.AddDays(1);
+            }
+        }
+
+        #region DrawDayContentBackground
+
+        /// <summary>
+        /// DrawDayContentBackground
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="date"></param>
+        /// <param name="ir"></param>
+        /// <param name="color1"></param>
+        /// <param name="color2"></param>
+        private void DrawDayContentBackground(Graphics g,
+            DateTime date, ItemRect ir, Color color1, Color color2)
+        {
+            CalendarView cv = _YearView.CalendarView;
+
+            if (_YearView.AllowDateSelection == false || ir.IsSelected == false)
+            {
+                if (_AppBits.Get(date.Day - 1) == true)
+                {
+                    using (Brush br = _YearView.ViewColor.BrushPart(
+                        (int) eCalendarMonthPart.ContentLinkBackground, ir.Bounds))
+                    {
+                        g.FillRectangle(br, ir.Bounds);
+                    }
+                }
+            }
+
+            eYearViewLinkStyle linkStyle = cv.YearViewAppointmentLinkStyle;
+
+            if (cv.DoYearViewDrawDayBackground(
+                g, this, date, ir.Bounds, ref linkStyle) == false)
+            {
+                if (_YearView.AllowDateSelection == true && ir.IsSelected == true)
+                {
+                    using (Brush br = _YearView.ViewColor.BrushPart(
+                        (int) eCalendarMonthPart.DayContentSelectionBackground, ir.Bounds))
+                    {
+                        g.FillRectangle(br, ir.Bounds);
+                    }
+                }
+
+                if (_AppBits.Get(date.Day - 1) == true)
+                {
+                    if (ir.IsSelected == false)
+                        DrawDayHighLight(g, linkStyle, ir.Bounds, color1, color2);
+                }
+            }
+        }
+
+        #endregion
+
+        #region DrawDayContentText
+
+        /// <summary>
+        /// DrawDayContentText
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="date"></param>
+        /// <param name="ir"></param>
+        private void DrawDayContentText(
+            Graphics g, DateTime date, ItemRect ir)
+        {
+            if (_YearView.CalendarView.DoYearViewDrawDayText(g, this, date, ir.Bounds) == false)
+            {
+                Font font = _YearView.Font;
+                Color color = _YearView.ViewColor.GetColor((int)eCalendarMonthPart.DayHeaderForeground);
+
+                if (_AppBits.Get(date.Day - 1) == true)
+                {
+                    font = _YearView.BoldFont;
+                    color = _YearView.ViewColor.GetColor((int)eCalendarMonthPart.ContentLinkForeground);
+                }
+
+                TextDrawing.DrawString(g, date.Day.ToString(), font, color, ir.Bounds,
+                                       eTextFormat.VerticalCenter | eTextFormat.HorizontalCenter |
+                                       eTextFormat.NoPadding);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region DrawDayHighLight
+
+        /// <summary>
+        /// Draws the day highlight
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="style"></param>
+        /// <param name="r"></param>
+        /// <param name="color1"></param>
+        /// <param name="color2"></param>
+        private void DrawDayHighLight(Graphics g,
+            eYearViewLinkStyle style, Rectangle r, Color color1, Color color2)
+        {
+            switch (style)
+            {
+                case eYearViewLinkStyle.Style1:
+                    DrawDayHighLightStyle1(g, r, color1, color2);
+                    break;
+
+                case eYearViewLinkStyle.Style2:
+                    DrawDayHighLightStyle2(g, r, color1, color2);
+                    break;
+
+                case eYearViewLinkStyle.Style3:
+                    DrawDayHighLightStyle3(g, r, color1, color2);
+                    break;
+
+                case eYearViewLinkStyle.Style4:
+                    DrawDayHighLightStyle4(g, r, color1, color2);
+                    break;
+
+                case eYearViewLinkStyle.Style5:
+                    DrawDayHighLightStyle5(g, r, color1);
+                    break;
+            }
+        }
+
+        #region DrawDayHighLightStyle1
+
+        private void DrawDayHighLightStyle1(Graphics g, Rectangle r, Color color1, Color color2)
+        {
+            using (Brush br = new LinearGradientBrush(r, color2, color1, 45f))
+                g.FillRectangle(br, r);
+        }
+
+        #endregion
+
+        #region DrawDayHighLightStyle2
+
+        private void DrawDayHighLightStyle2(Graphics g, Rectangle r, Color color1, Color color2)
+        {
+            using (GraphicsPath path = new GraphicsPath())
+            {
+                Rectangle t = r;
+
+                if (t.Height > t.Width)
+                {
+                    t.Y += (t.Height - t.Width) / 2;
+                    t.Height = t.Width;
+                }
+                else if (t.Width > t.Height)
+                {
+                    t.X += (t.Width - t.Height) / 2;
+                    t.Width = t.Height;
+                }
+
+                t.Inflate(2, 2);
+
+                path.AddEllipse(t);
+
+                using (PathGradientBrush pbr = new PathGradientBrush(path))
+                {
+                    pbr.CenterPoint = new
+                        PointF(r.X + r.Width / 2, r.Y + r.Height / 2);
+
+                    pbr.CenterColor = color1;
+                    pbr.SurroundColors = new Color[] { color2 };
+
+                    g.FillPath(pbr, path);
+                }
+            }
+        }
+
+        #endregion
+
+        #region DrawDayHighLightStyle3
+
+        private void DrawDayHighLightStyle3(Graphics g, Rectangle r, Color color1, Color color2)
+        {
+            r.Height /= 2;
+
+            using (LinearGradientBrush br = new LinearGradientBrush(r, color1, color2, 90f))
+            {
+                r.Height *= 2;
+                br.WrapMode = WrapMode.TileFlipXY;
+
+                g.FillRectangle(br, r);
+            }
+        }
+
+        #endregion
+
+        #region DrawDayHighLightStyle4
+
+        private void DrawDayHighLightStyle4(Graphics g, Rectangle r, Color color1, Color color2)
+        {
+            r.Width /= 2;
+
+            using (LinearGradientBrush br = new LinearGradientBrush(r, color1, color2, 0f))
+            {
+                r.Width *= 2;
+                br.WrapMode = WrapMode.TileFlipXY;
+
+                g.FillRectangle(br, r);
+            }
+        }
+
+        #endregion
+
+        #region DrawDayHighLightStyle5
+
+        private void DrawDayHighLightStyle5(Graphics g, Rectangle r, Color color1)
+        {
+            using (Brush br = new SolidBrush(color1))
+                g.FillRectangle(br, r);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region DrawGridLines
+
+        /// <summary>
+        /// DrawGridLines
+        /// </summary>
+        /// <param name="e"></param>
+        private void DrawGridLines(ItemPaintArgs e)
+        {
+            if (_YearView.ShowGridLines == true)
+            {
+                Graphics g = e.Graphics;
+
+                using (Pen pen = new Pen(
+                    ControlPaint.Light(_YearView.ViewColor.GetColor((int)eCalendarMonthPart.DayContentBorder))))
+                {
+                    int right = DayRects[MaxCols - 1].Bounds.Right;
+
+                    for (int i = 1; i < MaxRows; i++)
+                    {
+                        Point pt1 = DayRects[i * MaxCols].Bounds.Location;
+                        Point pt2 = new Point(right, pt1.Y);
+
+                        g.DrawLine(pen, pt1, pt2);
+                    }
+
+                    int bottom = DayRects[(MaxRows - 1) * MaxCols].Bounds.Bottom;
+
+                    for (int i = 1; i < MaxCols; i++)
+                    {
+                        Point pt1 = DayRects[i].Bounds.Location;
+                        Point pt2 = new Point(pt1.X, bottom);
+
+                        g.DrawLine(pen, pt1, pt2);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region DrawNowHighlight
+
+        /// <summary>
+        /// DrawNowHighlight
+        /// </summary>
+        /// <param name="e"></param>
+        private void DrawNowHighlight(ItemPaintArgs e)
+        {
+            if (_YearView.CalendarView.HighlightCurrentDay)
+            {
+                Graphics g = e.Graphics;
+
+                int nowDay = GetDayIndexFromDate(DateTime.Now);
+
+                if (nowDay >= 0)
+                {
+                    Rectangle r = DayRects[nowDay].Bounds;
+
+                    using (Pen pen = new Pen(
+                        _YearView.ViewColor.GetColor((int)eCalendarMonthPart.NowDayHeaderBorder), 1))
+                    {
+                        r.Inflate(-1, -1);
+
+                        g.DrawRectangle(pen, r);
+                    }
+
+                    using (Pen pen = new Pen(
+                        _YearView.ViewColor.GetColor((int)eCalendarMonthPart.DayContentActiveBackground)))
+                    {
+                        r.Inflate(1, 1);
+
+                        g.DrawRectangle(pen, r);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region DrawMonthHeader
+
+        /// <summary>
+        /// DrawMonthHeader
+        /// </summary>
+        /// <param name="e"></param>
+        /// <param name="isNow"></param>
+        private void DrawMonthHeader(ItemPaintArgs e, bool isNow)
+        {
+            Graphics g = e.Graphics;
+
+            // Draw the header background
+
+            Rectangle r = _MonthHeaderBounds;
+
+            if (r.Width > 0 && r.Height > 0)
+            {
+                if (isNow == true)
+                {
+                    using (Brush br = _YearView.ViewColor.BrushPart(
+                        (int)eCalendarMonthPart.NowDayHeaderBackground, r))
+                    {
+                        g.FillRectangle(br, r);
+                    }
+                }
+                else
+                {
+                    using (Brush br = _YearView.ViewColor.BrushPart(
+                    (int) eCalendarMonthPart.DayHeaderBackground, r))
+                    {
+                        g.FillRectangle(br, r);
+                    }
+                }
+
+                // Draw the header content
+
+                string s = String.Format("{0:y}", _StartDate);
+
+                Color color = _YearView.ViewColor.GetColor(isNow == true
+                    ? (int)eCalendarMonthPart.NowDayHeaderForeground
+                    : (int)eCalendarMonthPart.DayHeaderForeground);
+
+                TextDrawing.DrawString(g, s, _YearView.Font, color, _MonthHeaderBounds,
+                                       eTextFormat.VerticalCenter | eTextFormat.HorizontalCenter | eTextFormat.NoPadding);
+            }
+        }
+
+        #endregion
+
+        #region DrawDayOfWeekHeader
+
+        /// <summary>
+        /// DrawDayOfWeekHeader
+        /// </summary>
+        /// <param name="e"></param>
+        /// <param name="isNow"></param>
+        private void DrawDayOfWeekHeader(ItemPaintArgs e, bool isNow)
+        {
+            Graphics g = e.Graphics;
+
+            // Draw the header background
+
+            Rectangle r = _DayOfWeekHeaderBounds;
+
+            if (r.Width > 0 && r.Height > 0)
+            {
+                if (isNow == true)
+                {
+                    using (Brush br = _YearView.ViewColor.BrushPart(
+                        (int)eCalendarMonthPart.NowDayHeaderBackground, r))
+                    {
+                        g.FillRectangle(br, r);
+                    }
+                }
+                else
+                {
+                    using (Brush br = _YearView.ViewColor.BrushPart(
+                        (int)eCalendarMonthPart.DayOfTheWeekHeaderBackground, r))
+                    {
+                        g.FillRectangle(br, r);
+                    }
+                }
+
+                // Establish our Days Of The Week text type
+
+                DaysOfTheWeek.eDayType type = GetDaysOfTheWeekType(e);
+
+                // Loop through each day, drawing the
+                // day of the week text in the header area
+
+                const eTextFormat tf = eTextFormat.VerticalCenter |
+                                       eTextFormat.HorizontalCenter | eTextFormat.NoPadding;
+
+                r = _DayOfWeekHeaderBounds;
+
+                int width = r.Width / MaxCols;
+                int spread = r.Width - (width * MaxCols);
+
+                Color color = _YearView.ViewColor.GetColor(isNow == true
+                    ? (int)eCalendarMonthPart.NowDayHeaderForeground
+                    : (int)eCalendarMonthPart.DayOfTheWeekHeaderForeground);
+
+                for (int i = 0; i < MaxCols; i++)
+                {
+                    r.Width = width;
+
+                    if (i < spread)
+                        r.Width++;
+
+                    TextDrawing.DrawString(g,
+                        _YearView.DaysOfTheWeek.DayText[(int)type][i], _YearView.Font, color, r, tf);
+
+                    r.X += r.Width;
+                }
+            }
+        }
+
+        #endregion
+
+        #region DrawBorder
+
+        /// <summary>
+        /// DrawBorder
+        /// </summary>
+        /// <param name="e"></param>
+        /// <param name="isNow"></param>
+        private void DrawBorder(ItemPaintArgs e, bool isNow)
+        {
+            Graphics g = e.Graphics;
+
+            if (isNow == true)
+            {
+                using (Pen pen = new Pen(_YearView.ViewColor.GetColor(
+                    (int)eCalendarMonthPart.NowDayHeaderBorder)))
+                {
+                    g.DrawRectangle(pen, _MonthHeaderBounds);
+                    g.DrawRectangle(pen, _DayOfWeekHeaderBounds);
+                    g.DrawRectangle(pen, _ContentBounds);
+                }
+            }
+            else
+            {
+                using (Pen pen = new Pen(
+                    _YearView.ViewColor.GetColor((int) eCalendarMonthPart.DayContentBorder)))
+                {
+                    g.DrawRectangle(pen, _MonthHeaderBounds);
+                    g.DrawRectangle(pen, _DayOfWeekHeaderBounds);
+                }
+
+                using (Pen pen = new Pen(
+                    _YearView.ViewColor.GetColor((int) eCalendarMonthPart.DayHeaderBorder)))
+                {
+                    g.DrawRectangle(pen, _ContentBounds);
+                }
+            }
+        }
+
+        #endregion
+
+        #region GetDaysOfTheWeekType
+
+        /// <summary>
+        /// GetDaysOfTheWeekType
+        /// </summary>
+        /// <param name="e"></param>
+        /// <returns></returns>
+        private DaysOfTheWeek.eDayType GetDaysOfTheWeekType(ItemPaintArgs e)
+        {
+            if (_DayType != DaysOfTheWeek.eDayType.None)
+                return (_DayType);
+            
+            Graphics g = e.Graphics;
+
+            _YearView.DaysOfTheWeek.MeasureText(g, _YearView.Font);
+
+            int width = _Bounds.Width/MaxCols;
+
+            for (int i = 0; i < MaxCols; i++)
+            {
+                if (_YearView.DaysOfTheWeek.DaySize[
+                    (int) DaysOfTheWeek.eDayType.Long][i].Width > width)
+                {
+                    if (_YearView.DaysOfTheWeek.DaySize[
+                        (int) DaysOfTheWeek.eDayType.Short][i].Width > width)
+                    {
+                        return (DaysOfTheWeek.eDayType.Single);
+                    }
+
+                    return (DaysOfTheWeek.eDayType.Short);
+                }
+            }
+
+            return (DaysOfTheWeek.eDayType.Long);
+        }
+
+        #endregion
+
+        #endregion
+
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/YearView/YearView.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/YearView/YearView.cs
new file mode 100644
index 00000000..0a1d2a90
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/YearView/YearView.cs	
@@ -0,0 +1,1678 @@
+#if FRAMEWORK20
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Windows.Forms;
+using DevComponents.Schedule.Model;
+
+namespace DevComponents.DotNetBar.Schedule
+{
+    public class YearView : BaseView
+    {
+        #region Constants
+
+        private const int MaxNumberOfMonths = 120;
+
+        #endregion
+
+        #region Private variables
+
+        private YearMonth[] _YearMonths;        // Array of YearMonths
+        private int _NumberOfMonths;            // Number of months in display
+        private int _NumberOfCols;
+        private int _NumberOfRows;
+
+        private CalendarMonthColor _ViewColor =
+            new CalendarMonthColor(eCalendarColor.Automatic);
+
+        private bool _RecalcInProgress;
+
+        private int _MouseDownMonthIndex = -1;
+        private int _MouseDownDayIndex = -1;
+        private int _LastMouseDownDayIndex = -1;
+        private DateTime _LastMouseUpTime = DateTime.MinValue;
+
+        private int _VScrollPos;
+
+        private Size _PreferredSize;
+        private Size _CellSize;
+
+        #endregion
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="calendarView">Parent CalendarView</param>
+        public YearView(CalendarView calendarView)
+            : base(calendarView, eCalendarView.Year)
+        {
+            // Set our non-client drawing info and our CalendarColor
+
+            NClientData = new NonClientData(
+                eTabOrientation.Horizontal,
+                (int)eCalendarMonthPart.OwnerTabBorder,
+                (int)eCalendarMonthPart.OwnerTabForeground,
+                (int)eCalendarMonthPart.OwnerTabBackground,
+                (int)eCalendarMonthPart.OwnerTabContentBackground,
+                (int)eCalendarMonthPart.OwnerTabSelectedForeground,
+                (int)eCalendarMonthPart.OwnerTabSelectedBackground);
+
+            CalendarColorTable = _ViewColor;
+
+            // Hook onto needed event
+
+            HookEvents(true);
+        }
+
+        #region Internal properties
+
+        #region AllowDateSelection
+
+        /// <summary>
+        /// Gets whether date selections are permitted
+        /// </summary>
+        internal bool AllowDateSelection
+        {
+            get { return (CalendarView.YearViewAllowDateSelection); }
+        }
+
+        #endregion
+
+        #region CellSize
+
+        /// <summary>
+        /// Gets the default day cell size
+        /// </summary>
+        internal Size CellSize
+        {
+            get
+            {
+                if (_CellSize.IsEmpty)
+                {
+                    Control container = GetContainerControl(true) as Control;
+
+                    if (container != null)
+                    {
+                        using (Graphics g = BarFunctions.CreateGraphics(container))
+                            _CellSize = g.MeasureString("00", Font).ToSize();
+                    }
+                }
+
+                return (_CellSize);
+            }
+        }
+
+        #endregion
+
+        #region ShowGridLines
+
+        /// <summary>
+        /// Gets whether Grid lines are to be displayed
+        /// </summary>
+        internal bool ShowGridLines
+        {
+            get { return (CalendarView.YearViewShowGridLines); }
+        }
+
+        #endregion
+
+        #region YearViewAppointmentLink
+
+        /// <summary>
+        /// Gets the Appointment Link click style
+        /// </summary>
+        internal eYearViewDayLink YearViewAppointmentLink
+        {
+            get { return (CalendarView.YearViewAppointmentLink); }
+        }
+
+        #endregion
+
+        #region YearViewNonAppointmentLink
+
+        /// <summary>
+        /// Gets the non-Appointment Link click style
+        /// </summary>
+        internal eYearViewDayLink YearViewNonAppointmentLink
+        {
+            get { return (CalendarView.YearViewNonAppointmentLink); }
+        }
+
+        #endregion
+
+        #region ViewColor
+
+        /// <summary>
+        /// Gets the Month Color table
+        /// </summary>
+        internal CalendarMonthColor ViewColor
+        {
+            get { return (_ViewColor); }
+        }
+
+        #endregion
+
+        #region VsPanel
+
+        /// <summary>
+        /// Gets the Year vertical scroll panel
+        /// </summary>
+        private VScrollPanel VsPanel
+        {
+            get { return (CalendarView.YearVScrollPanel); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Public properties
+
+        #region Font
+
+        /// <summary>
+        /// Gets or sets the display font
+        /// </summary>
+        [Category("Behavior")]
+        [Description("Indicates the display font.")]
+        public override Font Font
+        {
+            get { return (base.Font ?? CalendarView.Font); }
+
+            set
+            {
+                base.Font = value;
+
+                if (DaysOfTheWeek != null)
+                    DaysOfTheWeek.NeedsMeasured = true;
+
+                _CellSize = Size.Empty;
+                _PreferredSize = Size.Empty;
+            }
+        }
+
+        #endregion
+
+        #region YearMonths
+
+        /// <summary>
+        /// Gets the array of YearMonths
+        /// </summary>
+        public YearMonth[] YearMonths
+        {
+            get { return (_YearMonths); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region HookEvents
+
+        /// <summary>
+        /// Hooks (or unhooks) needed events
+        /// </summary>
+        /// <param name="hook">True to hook, false to unhook</param>
+        private void HookEvents(bool hook)
+        {
+            if (hook == true)
+            {
+                CalendarView.SelectedViewChanged += SelectedViewChanged;
+                CalendarView.YearViewStartDateChanged += YearViewStartDateChanged;
+                CalendarView.YearViewEndDateChanged += YearViewEndDateChanged;
+                CalendarView.YearViewShowGridLinesChanged += YearViewShowGridLinesChanged;
+                CalendarView.YearViewAllowDateSelectionChanged += YearViewAllowDateSelectionChanged;
+                CalendarView.YearVScrollPanel.ScrollBarChanged += VScrollPanelScrollBarChanged;
+            }
+            else
+            {
+                CalendarView.SelectedViewChanged -= SelectedViewChanged;
+                CalendarView.YearViewStartDateChanged -= YearViewStartDateChanged;
+                CalendarView.YearViewEndDateChanged -= YearViewEndDateChanged;
+                CalendarView.YearViewShowGridLinesChanged -= YearViewShowGridLinesChanged;
+                CalendarView.YearViewAllowDateSelectionChanged -= YearViewAllowDateSelectionChanged;
+                CalendarView.YearVScrollPanel.ScrollBarChanged -= VScrollPanelScrollBarChanged;
+            }
+        }
+
+        #endregion
+
+        #region Event handling
+
+        #region SelectedViewChanged
+
+        /// <summary>
+        /// Processes CalendarView SelectedViewChanged events
+        /// </summary>
+        /// <param name="sender">CalendarView</param>
+        /// <param name="e">SelectedViewEventArgs</param>
+        void SelectedViewChanged(object sender, SelectedViewEventArgs e)
+        {
+            IsViewSelected = (e.NewValue == eCalendarView.Year);
+
+            if (IsViewSelected == true && Displayed == true)
+            {
+                AutoSyncViewDate(e.OldValue);
+
+                UpdateView();
+                UpdateDateSelection();
+            }
+            else
+            {
+                ResetView();
+            }
+        }
+
+        #endregion
+
+        #region YearViewStartDateChanged
+
+        /// <summary>
+        /// Processes StartDate changes
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void YearViewStartDateChanged(object sender, DateChangeEventArgs e)
+        {
+            StartDate = e.NewValue;
+        }
+
+        #endregion
+
+        #region YearViewEndDateChanged
+
+        /// <summary>
+        /// Processes EndDate changes
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void YearViewEndDateChanged(object sender, DateChangeEventArgs e)
+        {
+            EndDate = e.NewValue;
+        }
+
+        #endregion
+
+        #region YearViewAllowDateSelectionChanged
+
+        /// <summary>
+        /// Handles YearViewAllowDateSelectionChanged events
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void YearViewAllowDateSelectionChanged(object sender, AllowDateSelectionChangedEventArgs e)
+        {
+            Refresh();
+        }
+
+        #endregion
+
+        #region YearViewShowGridLinesChanged
+
+        /// <summary>
+        /// Processes CalendarView YearViewShowGridLinesChanged events
+        /// </summary>
+        /// <param name="sender">CalendarView</param>
+        /// <param name="e">SelectedViewEventArgs</param>
+        void YearViewShowGridLinesChanged(object sender, ShowGridLinesChangedEventArgs e)
+        {
+            Refresh();
+        }
+
+        #endregion
+
+        #region VScrollPanel_ScrollBarChanged
+
+        /// <summary>
+        /// Handles ScrollBarChanged events
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void VScrollPanelScrollBarChanged(object sender, EventArgs e)
+        {
+            int vdelta = -VsPanel.ScrollBar.Value - _VScrollPos;
+
+            if (vdelta != 0)
+            {
+                _VScrollPos = -VsPanel.ScrollBar.Value;
+                
+                // Offset our DayColumn accordingly
+
+                for (int i = 0; i < _NumberOfMonths; i++)
+                {
+                    YearMonth ym = _YearMonths[i];
+
+                    Rectangle r = ym.Bounds;
+                    r.Y += vdelta;
+
+                    ym.Bounds = r;
+                }
+
+                // Redraw our view
+
+                InvalidateRect();
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetViewAreaFromPoint
+
+        /// <summary>
+        /// Gets the view area under the given mouse
+        /// point (tab, header, content, etc)
+        /// </summary>
+        /// <param name="pt">Point</param>
+        /// <returns>eViewArea</returns>
+        public override eViewArea GetViewAreaFromPoint(Point pt)
+        {
+            if (Bounds.Contains(pt) == true)
+            {
+                if (ClientRect.Contains(pt))
+                {
+                    for (int i = 0; i < _NumberOfMonths; i++)
+                    {
+                        eViewArea area = _YearMonths[i].GetViewAreaFromPoint(pt);
+
+                        if (area != eViewArea.NotInView)
+                            return (area);
+                    }
+
+                    return (eViewArea.NotInView);
+                }
+
+                return (base.GetViewAreaFromPoint(pt));
+            }
+
+            return (eViewArea.NotInView);
+        }
+
+        #endregion
+
+        #region GetDateSelectionFromPoint
+
+        /// <summary>
+        /// Gets the date selection from the given point.
+        /// </summary>
+        /// <param name="pt">Point in question</param>
+        /// <param name="startDate">out start date</param>
+        /// <param name="endDate">out end date</param>
+        /// <returns>True if a valid selection exists
+        /// at the given point</returns>
+        public override bool GetDateSelectionFromPoint(
+            Point pt, out DateTime startDate, out DateTime endDate)
+        {
+            base.GetDateSelectionFromPoint(pt, out startDate, out endDate);
+
+            int monthIndex = GetMonthIndexFromPoint(pt);
+
+            if (monthIndex >= 0)
+            {
+                if (_YearMonths[monthIndex].GetDateFromPoint(pt, ref startDate))
+                {
+                    endDate = startDate.AddDays(1);
+
+                    return (true);
+                }
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region UpdateDateSelection
+
+        /// <summary>
+        /// Updates each monthWeeks DayRects to reflect
+        /// the date selection start and end values
+        /// </summary>
+        protected override void UpdateDateSelection()
+        {
+            if (IsViewSelected == true)
+            {
+                // Loop through each month, setting
+                // the selection status according to the date
+                // selection range
+
+                for (int i = 0; i < _NumberOfMonths; i++)
+                    _YearMonths[i].UpdateDateSelection();
+            }
+        }
+
+        #endregion
+
+        #region RecalcSize routines
+
+        /// <summary>
+        /// Performs NeedRecalcSize requests
+        /// </summary>
+        public override void RecalcSize()
+        {
+            if (_RecalcInProgress == false)
+            {
+                try
+                {
+                    _RecalcInProgress = true;
+
+                    RecalcDisplaySize();
+                }
+                finally
+                {
+                    _RecalcInProgress = false;
+                }
+            }
+        }
+
+        #region RecalcDisplaySize
+
+        /// <summary>
+        /// Performs all necessary recalc operations
+        /// </summary>
+        private void RecalcDisplaySize()
+        {
+            base.RecalcSize();
+
+            if (IsViewSelected == true)
+            {
+                // Normalize our start and end dates
+
+                DateTime startDate;
+                DateTime endDate;
+
+                NormalizeDates(out startDate, out endDate);
+
+                // Calculate each months display info and then
+                // initiate a YearMonth layout 
+
+                CalcYearMonths(startDate, endDate);
+                LayoutYearMonths(startDate);
+
+                // Update our Model connection and views
+
+                UpdateView();
+                UpdateDateSelection();
+
+                NeedRecalcLayout = false;
+            }
+        }
+
+        #endregion
+
+        #region NormalizeDates
+
+        /// <summary>
+        /// Normalizes the user specified start and end dates
+        /// </summary>
+        /// <param name="startDate">[out] Normalized start date</param>
+        /// <param name="endDate">[out] Normalized end date</param>
+        private void NormalizeDates(out DateTime startDate, out DateTime endDate)
+        {
+            startDate = this.StartDate.Date;
+            endDate = this.EndDate.Date;
+
+            // If both values are unset, then set them to
+            // today's date / + 12 months
+
+            if (startDate == DateTime.MinValue && endDate == DateTime.MinValue)
+            {
+                startDate = DateTime.Today.AddDays(-(DateTime.Today.Day - 1));
+                endDate = startDate.AddMonths(12).AddDays(-1);
+            }
+
+            if (DaysOfTheWeek == null)
+                DaysOfTheWeek = new DaysOfTheWeek();
+        }
+
+        #endregion
+
+        #region Update View
+
+        /// <summary>
+        /// Updates our connection model view
+        /// </summary>
+        private void UpdateView()
+        {
+            // If we have had a date range change, just
+            // reset our entire view
+
+            if (DateRangeChanged == true)
+                ResetView();
+
+            // If we have no Model connection, attempt
+            // to reconnect if this view is selected
+
+            if (Connector == null)
+            {
+                if (CalendarModel != null)
+                {
+                    Connector = new ModelYearViewConnector(CalendarModel, this);
+
+                    CalendarView.DoViewLoadComplete(this);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ResetView
+
+        /// <summary>
+        /// Disconnects and resets the Model connection
+        /// </summary>
+        internal override void ResetView()
+        {
+            base.ResetView();
+
+            ModelYearViewConnector.ResetModelData();
+        }
+
+        #endregion
+
+        #region CalcYearMonths
+
+        /// <summary>
+        /// Calculates display info for the YearMonth data
+        /// </summary>
+        /// <param name="startDate">Start date</param>
+        /// <param name="endDate">End date</param>
+        private void CalcYearMonths(DateTime startDate, DateTime endDate)
+        {
+            // Get the number of months for the date range
+
+            _NumberOfMonths = (endDate.Year * 12 + endDate.Month) -
+                (startDate.Year * 12 + startDate.Month) + 1;
+
+            _NumberOfMonths = Math.Max(1, _NumberOfMonths);
+            _NumberOfMonths = Math.Min(_NumberOfMonths, MaxNumberOfMonths);
+
+            // Allocate our MonthWeeks array to
+            // hold our weeks info
+
+            if (_YearMonths == null || _YearMonths.Length != _NumberOfMonths)
+                _YearMonths = new YearMonth[_NumberOfMonths];
+        }
+
+        #endregion
+
+        #region LayoutYearMonths
+
+        /// <summary>
+        /// Performs size and positioning layout for the control
+        /// </summary>
+        /// <param name="startDate"></param>
+        private void LayoutYearMonths(DateTime startDate)
+        {
+            Size size = GetPreferredSize(startDate);
+
+            if (size.Width > 0 && size.Height > 0)
+            {
+                int maxCols = Math.Max(1, (ClientRect.Width - 1) / size.Width);
+                int maxRows = Math.Max(1, (ClientRect.Height - 1) / size.Height);
+
+                int targetCols = (int)Math.Ceiling(Math.Sqrt(_NumberOfMonths));
+
+                if (targetCols >= maxCols)
+                {
+                    targetCols = maxCols;
+                }
+                else
+                {
+                    while (targetCols < maxCols)
+                    {
+                        int targetRows =
+                            Math.Max(1, (_NumberOfMonths + targetCols - 1) / targetCols);
+
+                        if (targetRows <= maxRows)
+                            break;
+
+                        targetCols++;
+                    }
+                }
+
+                _NumberOfRows = Math.Max(1, (_NumberOfMonths + targetCols - 1) / targetCols);
+                _NumberOfCols = (_NumberOfMonths + _NumberOfRows - 1) / _NumberOfRows;
+
+                int monthHeight = (ClientRect.Height - 1) / _NumberOfRows;
+                int monthWidth = (ClientRect.Width - 1) / _NumberOfCols;
+
+                int rowSpread = 0;
+
+                if (monthHeight < size.Height)
+                    monthHeight = size.Height;
+                else
+                    rowSpread = ClientRect.Height - (_NumberOfRows * monthHeight) - 1;
+
+                int colSpread = 0;
+
+                if (monthWidth < size.Width)
+                    monthWidth = size.Width;
+                else
+                    colSpread = ClientRect.Width - (_NumberOfCols * monthWidth) - 1;
+
+                // Loop through each week
+
+                int n = 0;
+                DateTime date = startDate;
+
+                Rectangle r = new Rectangle(ClientRect.X, ClientRect.Y, monthWidth, monthHeight);
+                r.Y += _VScrollPos;
+
+                for (int i = 0; i < _NumberOfRows; i++)
+                {
+                    if (i < rowSpread)
+                        r.Height++;
+
+                    for (int j = 0; j < _NumberOfCols; j++)
+                    {
+                        if (n >= _NumberOfMonths)
+                            break;
+
+                        if (_YearMonths[n] == null)
+                            _YearMonths[n] = new YearMonth(this, date);
+                        else
+                            _YearMonths[n].StartDate = date;
+
+                        // Calculate the bounding rect limits
+
+                        r.Width = monthWidth;
+                        
+                        if (j < colSpread)
+                            r.Width++;
+
+                        // Set the bounding rect
+
+                        _YearMonths[n].Bounds = r;
+
+                        r.X += r.Width;
+                        n++;
+
+                        date = date.AddMonths(1);
+                    }
+
+                    r.X = ClientRect.X;
+                    r.Y += r.Height;
+                    r.Height = monthHeight;
+                }
+
+                CalendarView.YearViewMax = (r.Y - (ClientRect.Y + _VScrollPos));
+            }
+        }
+
+        #endregion
+
+        #region GetPreferredSize
+
+        /// <summary>
+        /// Gets the preferred size of the control
+        /// </summary>
+        /// <param name="startDate"></param>
+        /// <returns></returns>
+        private Size GetPreferredSize(DateTime startDate)
+        {
+            if (_PreferredSize.IsEmpty)
+            {
+                if (_YearMonths[0] == null)
+                    _YearMonths[0] = new YearMonth(this, startDate);
+
+                _PreferredSize = _YearMonths[0].GetPreferredSize();
+            }
+
+            return (_PreferredSize);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Paint processing
+
+        #region Root paint code
+
+        /// <summary>
+        /// Paint processing
+        /// </summary>
+        /// <param name="e">ItemPaintArgs</param>
+        public override void Paint(ItemPaintArgs e)
+        {
+            // Set our current color table
+
+            _ViewColor.SetColorTable();
+
+            // Only draw something if we have something to draw
+
+            if (_NumberOfMonths > 0)
+            {
+                // Calculate our drawing ranges
+
+                int colStart, colEnd;
+                int rowStart, rowEnd;
+
+                int colCount = GetColRange(e, out colStart, out colEnd);
+                int rowCount = GetRowRange(e, out rowStart, out rowEnd);
+
+                // Draw our calendar parts
+
+                if (colCount > 0 && rowCount > 0)
+                    DrawContent(e, rowStart, rowEnd, colStart, colEnd);
+            }
+
+            // Let the base painting take place
+
+            base.Paint(e);
+        }
+
+        #endregion
+
+        #region DrawContent
+
+        /// <summary>
+        /// Draws YearMonth header and content
+        /// </summary>
+        /// <param name="e">ItemPaintArgs</param>
+        /// <param name="rowStart">Row start index</param>
+        /// <param name="rowEnd">Row end index</param>
+        /// <param name="colStart">Col start index</param>
+        /// <param name="colEnd">Col end index</param>
+        private void DrawContent(ItemPaintArgs e,
+            int rowStart, int rowEnd, int colStart, int colEnd)
+        {
+            Graphics g = e.Graphics;
+
+            // Set our clipping region
+
+            Rectangle r = ClientRect;
+
+            r.X = ClientRect.X;
+            r.Width = ClientRect.Width;
+
+            Region regSave = g.Clip;
+            g.SetClip(r, CombineMode.Intersect);
+
+            // Loop through each day in each week, displaying
+            // the associated day content and header
+
+            DateTime date = DateTime.Now;
+
+            int nowMonth = -1;
+
+            for (int i = rowStart; i <= rowEnd; i++)
+            {
+                for (int j = colStart; j <= colEnd; j++)
+                {
+                    int n = (i * _NumberOfCols) + j;
+
+                    if (n < _NumberOfMonths)
+                    {
+                        YearMonth ym = _YearMonths[n];
+
+                        bool now = CalendarView.HighlightCurrentDay == true &&
+                            ym.StartDate.Month == date.Month && ym.StartDate.Year == date.Year;
+
+                        if (now == true)
+                            nowMonth = n;
+                        else
+                            ym.Paint(e, false);
+                    }
+                }
+            }
+
+            if (nowMonth >= 0)
+                _YearMonths[nowMonth].Paint(e, true);
+
+            // Restore our original clip region
+
+            g.Clip = regSave;
+        }
+
+        #endregion
+
+        #region GetRange
+
+        #region GetColRange
+
+        /// <summary>
+        /// Calculates the range of columns needed to be drawn
+        /// to satisfy the specified paint request
+        /// </summary>
+        /// <param name="e">ItemPaintArgs</param>
+        /// <param name="colStart">[out] Col start index</param>
+        /// <param name="colEnd">[out] COl end index</param>
+        /// <returns>Col range count (end - start)</returns>
+        private int GetColRange(ItemPaintArgs e, out int colStart, out int colEnd)
+        {
+            // Calc our starting index
+
+            int nCols = Math.Min(_NumberOfMonths, _NumberOfCols);
+            int start = 0;
+
+            while (start < nCols)
+            {
+                Rectangle dr1 = _YearMonths[start].Bounds;
+
+                if (dr1.Right > e.ClipRectangle.X)
+                    break;
+
+                start++;
+            }
+
+            // Calc our ending index
+
+            int end = start;
+
+            while (end < nCols)
+            {
+                Rectangle dr2 = _YearMonths[end].Bounds;
+
+                if (dr2.X >= e.ClipRectangle.Right)
+                    break;
+
+                end++;
+            }
+
+            // Set the user supplied 'out' values, and
+            // return the range count to the caller
+
+            if (end - start == 0)
+            {
+                colStart = 0;
+                colEnd = 0;
+
+                return (0);
+            }
+
+            colStart = start;
+            colEnd = end - 1;
+
+            return (end - start);
+        }
+
+        #endregion
+
+        #region GetRowRange
+
+        /// <summary>
+        /// Calculates the range of rows needed to be drawn
+        /// to satisfy the specified paint request
+        /// </summary>
+        /// <param name="e">ItemPaintArgs</param>
+        /// <param name="rowStart">[out] Row start index</param>
+        /// <param name="rowEnd">[out] Row end index</param>
+        /// <returns>Row range count (end - start)</returns>
+        private int GetRowRange(ItemPaintArgs e, out int rowStart, out int rowEnd)
+        {
+            // Calc our starting index
+
+            int start = 0;
+
+            while (start < _NumberOfRows)
+            {
+                if (_YearMonths[start * _NumberOfCols].Bounds.Bottom > e.ClipRectangle.Y)
+                    break;
+
+                start++;
+            }
+
+            // Calc our ending index
+
+            int end = start;
+
+            while (end < _NumberOfRows)
+            {
+                if (_YearMonths[end * _NumberOfCols].Bounds.Y >= e.ClipRectangle.Bottom)
+                    break;
+
+                end++;
+            }
+
+            // Set the user supplied 'out' values, and
+            // return the range count to the caller
+
+            if (end - start == 0)
+            {
+                rowStart = 0;
+                rowEnd = 0;
+
+                return (0);
+            }
+
+            rowStart = start;
+            rowEnd = end - 1;
+
+            return (end - start);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region MouseMove processing
+
+        /// <summary>
+        /// MouseMove event processing
+        /// </summary>
+        /// <param name="objArg">MouseEventArgs</param>
+        public override void InternalMouseMove(MouseEventArgs objArg)
+        {
+            // Forward on the event, but only if we are not in
+            // the middle of moving or resizing a CalendarItem
+
+            if (Control.MouseButtons == MouseButtons.None)
+                ClearMouseStates();
+
+            base.InternalMouseMove(objArg);
+
+            if (IsTabMoving == false)
+            {
+                // Locate where the event took place
+                // and process it accordingly
+
+                int monthIndex, dayIndex, ndayIndex;
+
+                if (GetPointItem(objArg.Location, out monthIndex, out dayIndex, out ndayIndex))
+                {
+                    if (objArg.Button == MouseButtons.Left)
+                        ProcessMouseMove(monthIndex, ndayIndex);
+                }
+
+                // Set the cursor
+
+                MyCursor = GetCursor(monthIndex, dayIndex, ndayIndex);
+            }
+        }
+
+        #region ProcessMouseMove
+
+        /// <summary>
+        /// Processes view mouseMove events
+        /// </summary>
+        /// <param name="monthIndex"></param>
+        /// <param name="dayIndex"></param>
+        private void ProcessMouseMove(int monthIndex, int dayIndex)
+        {
+            if (AllowDateSelection == true)
+            {
+                if (DateSelectionAnchor != null)
+                {
+                    DateTime date = _YearMonths[monthIndex].GetDateFromIndex(dayIndex);
+
+                    // Let the user select forwards or backwards
+
+                    if (date >= DateSelectionAnchor)
+                    {
+                        CalendarView.DateSelectionStart = DateSelectionAnchor.Value;
+                        CalendarView.DateSelectionEnd = date.AddDays(1);
+                    }
+                    else
+                    {
+                        CalendarView.DateSelectionStart = date;
+                        CalendarView.DateSelectionEnd = DateSelectionAnchor.Value.AddDays(1);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region MouseDown processing
+
+        #region InternalMouseDown
+
+        /// <summary>
+        /// MouseDown event processing
+        /// </summary>
+        /// <param name="objArg"></param>
+        public override void InternalMouseDown(MouseEventArgs objArg)
+        {
+            // Forward on the event
+
+            base.InternalMouseDown(objArg);
+
+            if (objArg.Button == MouseButtons.Left)
+            {
+                if (IsTabMoving == false)
+                {
+                    // Locate where the event took place
+
+                    int monthIndex, dayIndex, ndayIndex;
+
+                    if (GetPointItem(objArg.Location, out monthIndex, out dayIndex, out ndayIndex))
+                    {
+                        if (dayIndex == ndayIndex || 
+                            (Control.ModifierKeys & Keys.Shift) == Keys.Shift)
+                        {
+                            ProcessMouseDown(monthIndex, ndayIndex);
+                        }
+                        else
+                        {
+                            CalendarView.DateSelectionStart = null;
+                            CalendarView.DateSelectionEnd = null;
+                            DateSelectionAnchor = null; 
+                        }
+                    }
+
+                    MyCursor = GetCursor(monthIndex, dayIndex, ndayIndex);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ProcessMouseDown
+
+        /// <summary>
+        /// Handles MonthView left MouseDown events
+        /// </summary>
+        /// <param name="monthIndex">Month index</param>
+        /// <param name="dayIndex">Day index</param>
+        private void ProcessMouseDown(int monthIndex, int dayIndex)
+        {
+            if (AllowDateSelection == true)
+            {
+                DateTime startDate = _YearMonths[monthIndex].GetDateFromIndex(dayIndex);
+                DateTime endDate = startDate.AddDays(1);
+
+                ExtendSelection(ref startDate, ref endDate);
+
+                CalendarView.DateSelectionStart = startDate;
+                CalendarView.DateSelectionEnd = endDate;
+            }
+
+            _MouseDownMonthIndex = monthIndex;
+            _MouseDownDayIndex = dayIndex;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region MouseUp processing
+
+        #region InternalMouseUp
+
+        /// <summary>
+        /// Handles InternalMouseUp events
+        /// </summary>
+        /// <param name="objArg"></param>
+        public override void InternalMouseUp(MouseEventArgs objArg)
+        {
+            // Forward on the event
+
+            base.InternalMouseUp(objArg);
+
+            ClearMouseStates();
+
+            if (objArg.Button == MouseButtons.Left)
+            {
+                if (IsTabMoving == false)
+                {
+                    // Locate where the event took place
+
+                    int monthIndex, dayIndex, ndayIndex;
+
+                    if (GetPointItem(objArg.Location, out monthIndex, out dayIndex, out ndayIndex))
+                        ProcessMouseUp(monthIndex, ndayIndex);
+
+                    MyCursor = GetCursor(monthIndex, dayIndex, ndayIndex);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ProcessMouseUp
+
+        /// <summary>
+        /// Process mouse up events
+        /// </summary>
+        /// <param name="monthIndex"></param>
+        /// <param name="dayIndex"></param>
+        private void ProcessMouseUp(int monthIndex, int dayIndex)
+        {
+            // If the user is mousing-up on the same day that he
+            // moused-down on, then check to see if we need to navigate
+            // to a linked Calendar view
+
+            if (_MouseDownMonthIndex == monthIndex && _MouseDownDayIndex == dayIndex)
+            {
+                YearMonth ym = _YearMonths[monthIndex];
+                DateTime date = ym.GetDateFromIndex(dayIndex);
+
+                eYearViewDayLink dl = (ym.DayIndexHasAppointments(dayIndex) == true)
+                    ? YearViewAppointmentLink : YearViewNonAppointmentLink;
+
+                if (((dl & eYearViewDayLink.DoubleClick) != eYearViewDayLink.DoubleClick) || _LastMouseDownDayIndex != dayIndex ||
+                    _LastMouseUpTime == DateTime.MinValue ||
+                    DateTime.Now.Subtract(_LastMouseUpTime).TotalMilliseconds > SystemInformation.DoubleClickTime)
+                {
+                    _LastMouseUpTime = DateTime.Now;
+
+                    if ((dl & eYearViewDayLink.Click) == eYearViewDayLink.Click)
+                    {
+                        if ((Control.ModifierKeys & Keys.Control) != Keys.Control)
+                            PerformLinkSelect(date);
+                    }
+                    else if ((dl & eYearViewDayLink.CtrlClick) == eYearViewDayLink.CtrlClick)
+                    {
+                        if ((Control.ModifierKeys & Keys.Control) == Keys.Control)
+                            PerformLinkSelect(date);
+                    }
+                }
+                else
+                {
+                    _LastMouseUpTime = DateTime.MinValue;
+
+                    PerformLinkSelect(date);
+                }
+            }
+
+            _LastMouseDownDayIndex = _MouseDownDayIndex;
+
+            _MouseDownMonthIndex = -1;
+            _MouseDownDayIndex = -1;
+        }
+
+        #endregion
+
+        #region PerformLinkSelect
+
+        /// <summary>
+        /// Performs a day link selection
+        /// </summary>
+        /// <param name="date"></param>
+        private void PerformLinkSelect(DateTime date)
+        {
+            DateTime startDate = date;
+
+            if (CalendarView.YearViewLinkAction == eYearViewLinkAction.GoToFirstCalendarItem)
+            {
+                if (Connector != null)
+                {
+                    Appointment app = ((ModelYearViewConnector) Connector).GetFirstAppointment(date);
+
+                    if (app != null)
+                        startDate = date.Date.AddHours(app.StartTime.Hour).AddMinutes(app.StartTime.Minute);
+
+                    CustomCalendarItem cci = ((ModelYearViewConnector) Connector).GetFirstCustomItem(date);
+
+                    if (cci != null)
+                    {
+                        if (app == null || cci.StartTime < startDate)
+                            startDate = date.Date.AddHours(cci.StartTime.Hour).AddMinutes(cci.StartTime.Minute);
+                    }
+                }
+            }
+
+            DateTime endDate = startDate;
+            eCalendarView calendarView = CalendarView.YearViewLinkView;
+
+            if (CalendarView.DoYearViewLinkSelected(ref startDate, ref endDate, ref calendarView) == false)
+            {
+                if (CalendarView.YearViewLinkView != eCalendarView.None &&
+                    CalendarView.YearViewLinkView != eCalendarView.Year)
+                {
+                    CalendarView.DateSelectionStart = startDate;
+                    CalendarView.DateSelectionEnd = endDate;
+
+                    CalendarView.SelectedView = calendarView;
+                    CalendarView.EnsureVisible(startDate, endDate);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InternalKeyDown
+
+        #region InternalKeyDown
+
+        /// <summary>
+        /// Processes KeyDown events
+        /// </summary>
+        /// <param name="objArg"></param>
+        public override void InternalKeyDown(KeyEventArgs objArg)
+        {
+            switch (objArg.KeyData)
+            {
+                case Keys.Up:
+                case Keys.Up | Keys.Shift:
+                case Keys.Up | Keys.Control:
+                case Keys.Up | Keys.Control | Keys.Shift:
+                    ProcessUpDownKey(objArg, -7);
+                    break;
+
+                case Keys.Down:
+                case Keys.Down | Keys.Shift:
+                case Keys.Down | Keys.Control:
+                case Keys.Down | Keys.Control | Keys.Shift:
+                    ProcessUpDownKey(objArg, 7);
+                    break;
+
+                case Keys.Left:
+                case Keys.Left | Keys.Shift:
+                case Keys.Left | Keys.Control:
+                case Keys.Left | Keys.Control | Keys.Shift:
+                    ProcessLeftRightKey(objArg, -1);
+                    break;
+
+                case Keys.Right:
+                case Keys.Right | Keys.Shift:
+                case Keys.Right | Keys.Control:
+                case Keys.Right | Keys.Control | Keys.Shift:
+                    ProcessLeftRightKey(objArg, 1);
+                    break;
+
+                case Keys.Home:
+                case Keys.Home | Keys.Shift:
+                case Keys.Home | Keys.Control:
+                case Keys.Home | Keys.Control | Keys.Shift:
+                    ProcessHomeKey(objArg);
+                    break;
+
+                case Keys.End:
+                case Keys.End | Keys.Shift:
+                case Keys.End | Keys.Control:
+                case Keys.End | Keys.Control | Keys.Shift:
+                    ProcessEndKey(objArg);
+                    break;
+
+                case Keys.LButton | Keys.ShiftKey | Keys.Control:
+                    ProcessControlKey();
+                    break;
+
+                case Keys.Enter:
+                case Keys.Space:
+                    ProcessEnterKey();
+                    break;
+
+                case Keys.PageUp:
+                case Keys.PageUp | Keys.Shift:
+                case Keys.PageUp | Keys.Control:
+                case Keys.PageUp | Keys.Control | Keys.Shift:
+                    ProcessUpDownKey(objArg, -7);
+                    break;
+
+                case Keys.PageDown:
+                case Keys.PageDown | Keys.Shift:
+                case Keys.PageDown | Keys.Control:
+                case Keys.PageDown | Keys.Control | Keys.Shift:
+                    ProcessUpDownKey(objArg, 7);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region ProcessUpDownKey
+
+        /// <summary>
+        /// Processes Up and Down Key events
+        /// </summary>
+        /// <param name="objArg"></param>
+        /// <param name="dy"></param>
+        protected virtual void ProcessUpDownKey(KeyEventArgs objArg, int dy)
+        {
+            if (ValidDateSelection())
+            {
+                DateTime startDate = CalendarView.DateSelectionStart.Value;
+                DateTime endDate = CalendarView.DateSelectionEnd.Value;
+
+                if (DateSelectionAnchor != null)
+                {
+                    if (startDate.Equals(DateSelectionAnchor.Value) == true)
+                        startDate = endDate.AddDays(-1);
+                }
+
+                startDate = startDate.AddDays(dy);
+                endDate = startDate.AddDays(1);
+
+                ExtendSelection(ref startDate, ref endDate);
+
+                CalendarView.DateSelectionStart = startDate;
+                CalendarView.DateSelectionEnd = endDate;
+            }
+
+            objArg.Handled = true;
+        }
+
+        #endregion
+
+        #region ProcessLeftRightKey
+
+        /// <summary>
+        /// Processes Left and Right key events
+        /// </summary>
+        /// <param name="objArg"></param>
+        /// <param name="dx"></param>
+        protected virtual void ProcessLeftRightKey(KeyEventArgs objArg, int dx)
+        {
+            if (ValidDateSelection())
+            {
+                DateTime startDate = CalendarView.DateSelectionStart.Value;
+                DateTime endDate = CalendarView.DateSelectionEnd.Value;
+
+                if (DateSelectionAnchor != null)
+                {
+                    if (startDate.Equals(DateSelectionAnchor.Value) == true)
+                        startDate = endDate.AddDays(-1);
+                }
+
+                startDate = startDate.AddDays(dx);
+                endDate = startDate.AddDays(1);
+
+                ExtendSelection(ref startDate, ref endDate);
+
+                CalendarView.DateSelectionStart = startDate;
+                CalendarView.DateSelectionEnd = endDate;
+            }
+
+            objArg.Handled = true;
+        }
+
+        #endregion
+
+        #region ProcessHomeKey
+
+        /// <summary>
+        /// Processes Hoe key events
+        /// </summary>
+        /// <param name="objArg"></param>
+        protected virtual void ProcessHomeKey(KeyEventArgs objArg)
+        {
+            int monthIndex = ((objArg.Modifiers & Keys.Control) != Keys.Control)
+                                 ? GetHomeEndMonth()
+                                 : 0;
+
+            if (monthIndex >= 0)
+            {
+                DateTime startDate = _YearMonths[monthIndex].StartDate;
+                DateTime endDate = startDate.AddDays(1);
+
+                ExtendSelection(ref startDate, ref endDate);
+
+                CalendarView.DateSelectionStart = startDate;
+                CalendarView.DateSelectionEnd = endDate;
+
+                SelectedItem = null;
+            }
+
+            objArg.Handled = true;
+        }
+
+        #endregion
+
+        #region ProcessEndKey
+
+        /// <summary>
+        /// Processes End key events
+        /// </summary>
+        /// <param name="objArg"></param>
+        protected virtual void ProcessEndKey(KeyEventArgs objArg)
+        {
+            int monthIndex = ((objArg.Modifiers & Keys.Control) != Keys.Control)
+                                 ? GetHomeEndMonth()
+                                 : _NumberOfMonths - 1;
+
+            if (monthIndex >= 0)
+            {
+                DateTime startDate = _YearMonths[monthIndex].EndDate;
+                DateTime endDate = startDate.AddDays(1);
+
+                ExtendSelection(ref startDate, ref endDate);
+
+                CalendarView.DateSelectionStart = startDate;
+                CalendarView.DateSelectionEnd = endDate;
+
+                SelectedItem = null;
+            }
+
+            objArg.Handled = true;
+        }
+
+        #endregion
+
+        #region ProcessControlKey
+
+        private void ProcessControlKey()
+        {
+            Point pt = Control.MousePosition;
+
+            Control container = GetContainerControl(true) as Control;
+
+            if (container != null)
+            {
+                pt = container.PointToClient(pt);
+
+                CalendarView.CalendarPanel.InternalMouseMove(new
+                    MouseEventArgs(MouseButtons.None, 0, pt.X, pt.Y, 0));
+            }
+        }
+
+        #endregion
+
+        #region ProcessEnterKey
+
+        private void ProcessEnterKey()
+        {
+            if (ValidDateSelection())
+            {
+                TimeSpan ts = CalendarView.DateSelectionEnd.Value -
+                    CalendarView.DateSelectionStart.Value;
+
+                if (ts.Days == 1)
+                    PerformLinkSelect(CalendarView.DateSelectionStart.Value);
+            }
+        }
+
+        #endregion
+
+        #region GetMonthFromDate
+
+        /// <summary>
+        /// Gets the month containing the given date
+        /// </summary>
+        /// <param name="date"></param>
+        /// <returns>MonthIndex or -1</returns>
+        private int GetMonthFromDate(DateTime date)
+        {
+            for (int i = 0; i < _NumberOfMonths; i++)
+            {
+                YearMonth ym = _YearMonths[i];
+
+                if (ym.ContainsDate(date))
+                    return (i);
+            }
+
+            return (-1);
+        }
+
+        #endregion
+
+        #region GetHomeEndMonth
+
+        /// <summary>
+        /// Gets the Home and End month from the
+        /// current selection range
+        /// </summary>
+        /// <returns></returns>
+        private int GetHomeEndMonth()
+        {
+            if (ValidDateSelection() == true)
+            {
+                if (CalendarView.DateSelectionStart.Equals(DateSelectionAnchor.Value) == true)
+                    return (GetMonthFromDate(DateSelectionEnd.Value.AddDays(-1)));
+
+                return (GetMonthFromDate(DateSelectionStart.Value));
+            }
+
+            return (-1);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InternalKeyUp
+
+        /// <summary>
+        /// InternalKeyUp
+        /// </summary>
+        /// <param name="e"></param>
+        internal override void InternalKeyUp(KeyEventArgs e)
+        {
+            base.InternalKeyUp(e);
+
+            switch (e.KeyData)
+            {
+                case Keys.LButton | Keys.ShiftKey:
+                    ProcessControlKey();
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region GetCursor
+
+        /// <summary>
+        /// Gets the cursor
+        /// </summary>
+        /// <returns>Cursor</returns>
+        private Cursor GetCursor(int monthIndex, int dayIndex, int ndayIndex)
+        {
+            if (monthIndex >= 0 && dayIndex >= 0 && dayIndex == ndayIndex)
+            {
+                if (_MouseDownMonthIndex < 0 ||
+                    (_MouseDownMonthIndex == monthIndex && _MouseDownDayIndex == dayIndex))
+                {
+                    YearMonth ym = _YearMonths[monthIndex];
+
+                    eYearViewDayLink dl = (ym.DayIndexHasAppointments(dayIndex) == true)
+                                              ? YearViewAppointmentLink
+                                              : YearViewNonAppointmentLink;
+
+                    if ((dl & eYearViewDayLink.Click) == eYearViewDayLink.Click)
+                    {
+                        if ((Control.ModifierKeys & Keys.Control) != Keys.Control)
+                            return (Cursors.Hand);
+                    }
+                    else if ((dl & eYearViewDayLink.CtrlClick) == eYearViewDayLink.CtrlClick)
+                    {
+                        if ((Control.ModifierKeys & Keys.Control) == Keys.Control)
+                            return (Cursors.Hand);
+                    }
+                }
+            }
+
+            return (DefaultCursor);
+        }
+
+        #endregion
+
+        #region GetPointItem
+
+        /// <summary>
+        /// Gets the month and dey index for the given Point
+        /// </summary>
+        /// <param name="pt"></param>
+        /// <param name="monthIndex">Month index</param>
+        /// <param name="dayIndex">Day index</param>
+        /// <param name="ndayIndex">Normalized day index</param>
+        /// <returns></returns>
+        private bool GetPointItem(Point pt,
+            out int monthIndex, out int dayIndex, out int ndayIndex)
+        {
+            monthIndex = GetMonthIndexFromPoint(pt);
+
+            if (monthIndex >= 0)
+            {
+                YearMonth ym = _YearMonths[monthIndex];
+
+                dayIndex = ym.GetDayIndexFromPoint(pt);
+                ndayIndex = ym.GetNormalizedDayIndex(dayIndex);
+            }
+            else
+            {
+                dayIndex = -1;
+                ndayIndex = -1;
+            }
+
+            return (dayIndex >= 0);
+        }
+
+        #endregion
+
+        #region GetMonthIndexFromPoint
+
+        /// <summary>
+        /// Gets the month index from the given point
+        /// </summary>
+        /// <param name="pt">Point</param>
+        /// <returns>month index or -1</returns>
+        private int GetMonthIndexFromPoint(Point pt)
+        {
+            for (int i = 0; i < _NumberOfMonths; i++)
+            {
+                if (_YearMonths[i].Bounds.Contains(pt))
+                    return (i);
+            }
+
+            return (-1);
+        }
+
+        #endregion
+
+        #region IDisposable Members
+
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing == true && IsDisposed == false)
+            {
+                ResetView();
+                HookEvents(false);
+            }
+
+            base.Dispose(disposing);
+        }
+
+        #endregion
+
+        #region Copy object
+
+        /// <summary>
+        /// Returns copy of the item.
+        /// </summary>
+        public override BaseItem Copy()
+        {
+            YearView objCopy = new YearView(this.CalendarView);
+            CopyToItem(objCopy);
+
+            return (objCopy);
+        }
+
+        /// <summary>
+        /// Copies the YearView specific properties to new instance of the item.
+        /// </summary>
+        /// <param name="copy">New YearView instance</param>
+        protected override void CopyToItem(BaseItem copy)
+        {
+            YearView objCopy = copy as YearView;
+
+            if (objCopy != null)
+                base.CopyToItem(objCopy);
+        }
+
+        #endregion
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/YearView/YearViewVScrollPanel.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/YearView/YearViewVScrollPanel.cs
new file mode 100644
index 00000000..8a1ad579
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.Schedule/YearView/YearViewVScrollPanel.cs	
@@ -0,0 +1,27 @@
+#if FRAMEWORK20
+namespace DevComponents.DotNetBar.Schedule
+{
+    public class YearVScrollPanel : VScrollPanel
+    {
+        public YearVScrollPanel(CalendarView calendarView)
+            : base(calendarView)
+        {
+        }
+
+        #region Private properties
+
+        protected override int ScrollPanelSmallChange
+        {
+            get { return (10); }
+        }
+
+        protected override int ScrollPanelMaximum
+        {
+            get { return (CalendarView.YearViewMax); }
+        }
+
+        #endregion
+
+    }
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/ContentManager/BlockLayoutManager.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/ContentManager/BlockLayoutManager.cs
new file mode 100644
index 00000000..c92a50b3
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/ContentManager/BlockLayoutManager.cs	
@@ -0,0 +1,38 @@
+using System.Collections;
+using System.Drawing;
+
+namespace DevComponents.SuperGrid.TextMarkup
+{
+	/// <summary>
+	/// Represents block layout manager responsible for sizing the content blocks.
+	/// </summary>
+	public abstract class BlockLayoutManager
+	{
+		private Graphics _Graphics;
+
+	    /// <summary>
+		/// Resizes the content block and sets it's Bounds property to reflect new size.
+		/// </summary>
+		/// <param name="block">Content block to resize.</param>
+        /// <param name="availableSize">Content size available for the block in the given line.</param>
+		public abstract void Layout(IBlock block, Size availableSize);
+
+        /// <summary>
+        /// Performs layout finalization
+        /// </summary>
+        /// <param name="containerBounds"></param>
+        /// <param name="blocksBounds"></param>
+        /// <param name="lines"></param>
+        /// <returns></returns>
+        public abstract Rectangle FinalizeLayout(Rectangle containerBounds, Rectangle blocksBounds, ArrayList lines);
+
+		/// <summary>
+		/// Gets or sets the graphics object used by layout manager.
+		/// </summary>
+		public Graphics Graphics
+		{
+			get {return _Graphics;}
+			set {_Graphics = value;}
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/ContentManager/Enums.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/ContentManager/Enums.cs
new file mode 100644
index 00000000..b00b2a45
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/ContentManager/Enums.cs	
@@ -0,0 +1,55 @@
+namespace DevComponents.SuperGrid.TextMarkup
+{
+	/// <summary>
+	/// Specifies orientation of content.
+	/// </summary>
+	public enum eContentOrientation
+	{
+		/// <summary>
+		/// Indicates Horizontal orientation of the content.
+		/// </summary>
+		Horizontal,
+		/// <summary>
+		/// Indicates Vertical orientation of the content.
+		/// </summary>
+		Vertical
+	}
+
+	/// <summary>
+	/// Specifies content horizontal alignment.
+	/// </summary>
+	public enum eContentAlignment
+	{
+		/// <summary>
+		/// Content is left aligned.UI
+		/// </summary>
+		Left,
+		/// <summary>
+		/// Content is right aligned.
+		/// </summary>
+		Right,
+		/// <summary>
+		/// Content is centered.
+		/// </summary>
+		Center
+	}
+
+	/// <summary>
+	/// Specifies content vertical alignment.
+	/// </summary>
+	public enum eContentVerticalAlignment
+	{
+		/// <summary>
+		/// Content is top aligned.
+		/// </summary>
+		Top,
+		/// <summary>
+		/// Content is bottom aligned.
+		/// </summary>
+		Bottom,
+		/// <summary>
+		/// Content is in the middle.
+		/// </summary>
+		Middle
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/ContentManager/IBlock.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/ContentManager/IBlock.cs
new file mode 100644
index 00000000..535eb54e
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/ContentManager/IBlock.cs	
@@ -0,0 +1,20 @@
+using System.Drawing;
+
+namespace DevComponents.SuperGrid.TextMarkup
+{
+	/// <summary>
+	/// Represents a content block interface.
+	/// </summary>
+	public interface IBlock
+	{
+		/// <summary>
+		/// Gets or sets the bounds of the content block.
+		/// </summary>
+		Rectangle Bounds {get;set;}
+
+		/// <summary>
+		/// Gets or sets whether content block is visible.
+		/// </summary>
+		bool Visible {get;set;}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/ContentManager/IBlockExtended.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/ContentManager/IBlockExtended.cs
new file mode 100644
index 00000000..9a8cfaad
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/ContentManager/IBlockExtended.cs	
@@ -0,0 +1,23 @@
+namespace DevComponents.SuperGrid.TextMarkup
+{
+    /// <summary>
+    /// Represents a extended content block interface for advanced layout information.
+    /// </summary>
+    public interface IBlockExtended : IBlock
+    {
+        /// <summary>
+        /// Gets whether element is block level element.
+        /// </summary>
+        bool IsBlockElement { get;}
+
+        /// <summary>
+        /// Gets whether new line is required after the element.
+        /// </summary>
+        bool IsNewLineAfterElement { get;}
+
+        /// <summary>
+        /// Gets whether element can be on new line.
+        /// </summary>
+        bool CanStartNewLine { get; }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/ContentManager/IContentLayoutManager.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/ContentManager/IContentLayoutManager.cs
new file mode 100644
index 00000000..d6dbb317
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/ContentManager/IContentLayoutManager.cs	
@@ -0,0 +1,19 @@
+using System.Drawing;
+
+namespace DevComponents.SuperGrid.TextMarkup
+{
+	/// <summary>
+	/// Represents interface for block layout.
+	/// </summary>
+	public interface IContentLayout
+	{
+		/// <summary>
+		/// Performs layout of the content block.
+		/// </summary>
+		/// <param name="containerBounds">Container bounds to layout content blocks in.</param>
+		/// <param name="contentBlocks">Content blocks to layout.</param>
+		/// <param name="blockLayout">Block layout manager that resizes the content blocks.</param>
+		/// <returns>The bounds of the content blocks within the container bounds.</returns>
+		Rectangle Layout(Rectangle containerBounds, IBlock[] contentBlocks, BlockLayoutManager blockLayout);
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/ContentManager/SerialContentLayoutManager.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/ContentManager/SerialContentLayoutManager.cs
new file mode 100644
index 00000000..9acf97ba
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/ContentManager/SerialContentLayoutManager.cs	
@@ -0,0 +1,709 @@
+using System;
+using System.Collections;
+using System.Drawing;
+
+namespace DevComponents.SuperGrid.TextMarkup
+{
+	/// <summary>
+	/// Represents the serial content layout manager that arranges content blocks in series next to each other.
+	/// </summary>
+	public class SerialContentLayoutManager:IContentLayout
+    {
+        #region Events
+
+        /// <summary>
+        /// Occurs when X, Y position of next block is calcualted.
+        /// </summary>
+        public event LayoutManagerPositionEventHandler NextPosition;
+
+        /// <summary>
+        /// Occurs before new block is layed out.
+        /// </summary>
+        public event LayoutManagerLayoutEventHandler BeforeNewBlockLayout;
+
+        #endregion
+
+        #region Private Variables
+
+        private int _BlockSpacing;
+		private bool _FitContainerOversize;
+        private bool _FitContainer;
+        private bool _VerticalFitContainerWidth;
+        private bool _HorizontalFitContainerHeight;
+		private bool _EvenHeight;
+		private bool _MultiLine;
+        private bool _RightToLeft;
+        private bool _OversizeDistribute;
+
+		private eContentAlignment _ContentAlignment = eContentAlignment.Left;
+		private eContentOrientation _ContentOrientation = eContentOrientation.Horizontal;
+		private eContentVerticalAlignment _ContentVerticalAlignment = eContentVerticalAlignment.Middle;
+        private eContentVerticalAlignment _BlockLineAlignment = eContentVerticalAlignment.Middle;
+
+		#endregion
+
+	    #region IContentLayout Members
+
+		/// <summary>
+		/// Performs layout of the content block.
+		/// </summary>
+		/// <param name="containerBounds">Container bounds to layout content blocks in.</param>
+		/// <param name="contentBlocks">Content blocks to layout.</param>
+		/// <param name="blockLayout">Block layout manager that resizes the content blocks.</param>
+		/// <returns>The bounds of the content blocks within the container bounds.</returns>
+        public virtual Rectangle Layout(Rectangle containerBounds, IBlock[] contentBlocks, BlockLayoutManager blockLayout)
+		{
+		    Rectangle blocksBounds = Rectangle.Empty;
+		    Point position = containerBounds.Location;
+		    ArrayList lines = new ArrayList();
+		    lines.Add(new BlockLineInfo());
+		    BlockLineInfo currentLine = lines[0] as BlockLineInfo;
+		    bool switchToNewLine = false;
+		    int visibleIndex = 0;
+
+		    foreach (IBlock block in contentBlocks)
+		    {
+		        if (!block.Visible)
+		        {
+		            block.Bounds = Rectangle.Empty;
+		            continue;
+		        }
+
+		        if (BeforeNewBlockLayout != null)
+		        {
+		            LayoutManagerLayoutEventArgs e = new
+                        LayoutManagerLayoutEventArgs(block, position, visibleIndex);
+
+		            BeforeNewBlockLayout(this, e);
+
+		            position = e.CurrentPosition;
+
+		            if (e.CancelLayout)
+		                continue;
+		        }
+		        visibleIndex++;
+
+		        Size availableSize = containerBounds.Size;
+		        bool isBlockElement = false;
+		        bool isNewLineTriggger = false;
+		        bool canStartOnNewLine;
+
+		        if (block is IBlockExtended)
+		        {
+		            IBlockExtended ex = block as IBlockExtended;
+
+		            isBlockElement = ex.IsBlockElement;
+		            isNewLineTriggger = ex.IsNewLineAfterElement;
+		            canStartOnNewLine = ex.CanStartNewLine;
+		        }
+		        else
+		            canStartOnNewLine = true;
+
+		        if (!isBlockElement)
+		        {
+		            if (_ContentOrientation == eContentOrientation.Horizontal)
+		                availableSize.Width = (containerBounds.Right - position.X);
+		            else
+		                availableSize.Height = (containerBounds.Bottom - position.Y);
+		        }
+
+		        // Resize the content block
+
+		        blockLayout.Layout(block, availableSize);
+
+		        if (_MultiLine && currentLine.Blocks.Count > 0)
+		        {
+		            if (_ContentOrientation == eContentOrientation.Horizontal &&
+		                position.X + block.Bounds.Width > containerBounds.Right && canStartOnNewLine || isBlockElement ||
+		                switchToNewLine)
+		            {
+		                position.X = containerBounds.X;
+		                position.Y += (currentLine.LineSize.Height + _BlockSpacing);
+
+		                currentLine = new BlockLineInfo();
+
+		                currentLine.Line = lines.Count;
+
+		                lines.Add(currentLine);
+		            }
+		            else if (_ContentOrientation == eContentOrientation.Vertical &&
+		                     position.Y + block.Bounds.Height > containerBounds.Bottom && canStartOnNewLine || isBlockElement ||
+		                     switchToNewLine)
+		            {
+		                position.Y = containerBounds.Y;
+		                position.X += (currentLine.LineSize.Width + _BlockSpacing);
+
+		                currentLine = new BlockLineInfo();
+
+		                currentLine.Line = lines.Count;
+
+		                lines.Add(currentLine);
+		            }
+		        }
+
+		        if (_ContentOrientation == eContentOrientation.Horizontal)
+		        {
+		            if (block.Bounds.Height > currentLine.LineSize.Height)
+		                currentLine.LineSize.Height = block.Bounds.Height;
+
+		            currentLine.LineSize.Width = position.X + block.Bounds.Width - containerBounds.X;
+		        }
+		        else if (_ContentOrientation == eContentOrientation.Vertical)
+		        {
+		            if (block.Bounds.Width > currentLine.LineSize.Width)
+		                currentLine.LineSize.Width = block.Bounds.Width;
+
+		            currentLine.LineSize.Height = position.Y + block.Bounds.Height - containerBounds.Y;
+		        }
+
+		        currentLine.Blocks.Add(block);
+
+		        if (block.Visible)
+                    currentLine.VisibleItemsCount++;
+
+		        block.Bounds = new Rectangle(position, block.Bounds.Size);
+
+		        if (blocksBounds.IsEmpty)
+		            blocksBounds = block.Bounds;
+		        else
+		            blocksBounds = Rectangle.Union(blocksBounds, block.Bounds);
+
+		        switchToNewLine = isBlockElement | isNewLineTriggger;
+
+		        position = GetNextPosition(block, position);
+		    }
+
+		    blocksBounds = AlignResizeBlocks(containerBounds, blocksBounds, lines);
+
+		    if (_RightToLeft)
+		        blocksBounds = MirrorContent(containerBounds, blocksBounds, contentBlocks);
+
+		    blocksBounds = blockLayout.FinalizeLayout(containerBounds, blocksBounds, lines);
+
+		    return blocksBounds;
+		}
+
+	    #endregion
+
+		#region Internals
+
+        private struct SizeExtended
+        {
+            public int Width;
+            public int Height;
+            public float WidthReduction;
+            public float HeightReduction;
+            public bool UseAbsoluteWidth;
+        }
+
+		private Rectangle AlignResizeBlocks(Rectangle containerBounds,Rectangle blocksBounds,ArrayList lines)
+		{
+			Rectangle newBounds=Rectangle.Empty;
+
+			if(containerBounds.IsEmpty || blocksBounds.IsEmpty || ((BlockLineInfo)lines[0]).Blocks.Count==0)
+				return newBounds;
+
+            if (_ContentAlignment == eContentAlignment.Left && _ContentVerticalAlignment == eContentVerticalAlignment.Top &&
+                !_FitContainer && !_FitContainerOversize && !_EvenHeight && _BlockLineAlignment == eContentVerticalAlignment.Top)
+                return blocksBounds;
+
+			Point[] offset=new Point[lines.Count];
+            SizeExtended[] sizeOffset = new SizeExtended[lines.Count];
+			foreach(BlockLineInfo lineInfo in lines)
+			{
+                if (_ContentOrientation == eContentOrientation.Horizontal)
+                {
+                    if (_FitContainer && containerBounds.Width > lineInfo.LineSize.Width ||
+                        _FitContainerOversize && lineInfo.LineSize.Width > containerBounds.Width)
+                    {
+                        if (_OversizeDistribute && containerBounds.Width < lineInfo.LineSize.Width * .75)
+                        {
+                            sizeOffset[lineInfo.Line].Width = (int)Math.Floor((float)(containerBounds.Width - lineInfo.VisibleItemsCount * _BlockSpacing) / (float)lineInfo.VisibleItemsCount);
+                            sizeOffset[lineInfo.Line].UseAbsoluteWidth = true;
+                        }
+                        else
+                            sizeOffset[lineInfo.Line].Width = ((containerBounds.Width - lineInfo.VisibleItemsCount * _BlockSpacing) - lineInfo.LineSize.Width) / lineInfo.VisibleItemsCount;
+                        sizeOffset[lineInfo.Line].WidthReduction = (float)(containerBounds.Width - lineInfo.VisibleItemsCount * _BlockSpacing) / (float)lineInfo.LineSize.Width;
+                        blocksBounds.Width = containerBounds.Width;
+                    }
+
+                    if (_HorizontalFitContainerHeight && containerBounds.Height > blocksBounds.Height)
+                        sizeOffset[lineInfo.Line].Height = (containerBounds.Height - lineInfo.LineSize.Height) / lines.Count;
+                }
+                else
+                {
+                    if (_FitContainer && containerBounds.Height > lineInfo.LineSize.Height ||
+                        _FitContainerOversize && lineInfo.LineSize.Height > containerBounds.Height)
+                    {
+                        if (_OversizeDistribute && containerBounds.Width < lineInfo.LineSize.Width*.75)
+                        {
+                            sizeOffset[lineInfo.Line].Height = (int)
+                                Math.Floor((float) (containerBounds.Height - lineInfo.VisibleItemsCount*_BlockSpacing)/
+                                           (float) lineInfo.VisibleItemsCount);
+
+                            sizeOffset[lineInfo.Line].UseAbsoluteWidth = true;
+                        }
+                        else
+                            sizeOffset[lineInfo.Line].Height = ((containerBounds.Height -
+                                                                 lineInfo.VisibleItemsCount*_BlockSpacing) -
+                                                                lineInfo.LineSize.Height)/lineInfo.VisibleItemsCount;
+                        sizeOffset[lineInfo.Line].HeightReduction =
+                            (float) (containerBounds.Height - lineInfo.VisibleItemsCount*_BlockSpacing)/
+                            (float) lineInfo.LineSize.Height;
+                        blocksBounds.Height = containerBounds.Height;
+                    }
+
+                    if (_VerticalFitContainerWidth && containerBounds.Width > blocksBounds.Width)
+                        sizeOffset[lineInfo.Line].Width = (containerBounds.Width - lineInfo.LineSize.Width)/lines.Count;
+                }
+
+
+			    if (_ContentOrientation == eContentOrientation.Horizontal && !_FitContainer)
+                {
+                    if (containerBounds.Width > blocksBounds.Width && _FitContainerOversize || !_FitContainerOversize)
+                    {
+                        switch (_ContentAlignment)
+                        {
+                            case eContentAlignment.Right:
+                                if (containerBounds.Width > lineInfo.LineSize.Width)
+                                    offset[lineInfo.Line].X = containerBounds.Width - lineInfo.LineSize.Width;
+                                break;
+
+                            case eContentAlignment.Center:
+                                if (containerBounds.Width > lineInfo.LineSize.Width)
+                                    offset[lineInfo.Line].X = (containerBounds.Width - lineInfo.LineSize.Width)/2;
+                                break;
+                        }
+                    }
+                }
+
+			    if (_ContentOrientation == eContentOrientation.Vertical && !_FitContainer)
+                {
+                    if (containerBounds.Height > blocksBounds.Height && _FitContainerOversize || !_FitContainerOversize)
+                    {
+                        switch (_ContentVerticalAlignment)
+                        {
+                            case eContentVerticalAlignment.Bottom:
+                                if (containerBounds.Height > lineInfo.LineSize.Height)
+                                    offset[lineInfo.Line].Y = containerBounds.Height - lineInfo.LineSize.Height;
+                                break;
+
+                            case eContentVerticalAlignment.Middle:
+                                if (containerBounds.Height > lineInfo.LineSize.Height)
+                                    offset[lineInfo.Line].Y = (containerBounds.Height - lineInfo.LineSize.Height)/2;
+                                break;
+                        }
+                    }
+                }
+			}
+
+            if (_VerticalFitContainerWidth && containerBounds.Width > blocksBounds.Width && _ContentOrientation==eContentOrientation.Vertical)
+                blocksBounds.Width = containerBounds.Width;
+
+            else if(_HorizontalFitContainerHeight && containerBounds.Height>blocksBounds.Height && _ContentOrientation==eContentOrientation.Horizontal)
+                blocksBounds.Height = containerBounds.Height;
+
+			if(_ContentOrientation==eContentOrientation.Horizontal)
+			{
+				foreach(BlockLineInfo lineInfo in lines)
+				{
+                    foreach (IBlock block in lineInfo.Blocks)
+                    {
+                        if (!block.Visible)
+                            continue;
+
+                        Rectangle r = block.Bounds;
+
+                        if (_EvenHeight && lineInfo.LineSize.Height > 0)
+                            r.Height = lineInfo.LineSize.Height;
+
+                        r.Offset(offset[lineInfo.Line]);
+
+                        if (_ContentVerticalAlignment == eContentVerticalAlignment.Middle)
+                        {
+                            // Takes care of offset rounding error when both content is vertically centered and blocks in line are centered
+
+                            if (_BlockLineAlignment == eContentVerticalAlignment.Middle)
+                                r.Offset(0,
+                                         ((containerBounds.Height - blocksBounds.Height) +
+                                          (lineInfo.LineSize.Height - r.Height))/2);
+                            else
+                                r.Offset(0, (containerBounds.Height - blocksBounds.Height)/2);
+
+                            // Line alignment of the block
+
+                            if (_BlockLineAlignment == eContentVerticalAlignment.Bottom)
+                                r.Offset(0, lineInfo.LineSize.Height - r.Height);
+                        }
+                        else if (_ContentVerticalAlignment == eContentVerticalAlignment.Bottom)
+                            r.Offset(0, containerBounds.Height - blocksBounds.Height);
+
+                        // To avoid rounding offset errors when dividing this is split see upper part
+
+                        if (_ContentVerticalAlignment != eContentVerticalAlignment.Middle)
+                        {
+                            // Line alignment of the block
+
+                            if (_BlockLineAlignment == eContentVerticalAlignment.Middle)
+                                r.Offset(0, (lineInfo.LineSize.Height - r.Height)/2);
+
+                            else if (_BlockLineAlignment == eContentVerticalAlignment.Bottom)
+                                r.Offset(0, lineInfo.LineSize.Height - r.Height);
+                        }
+
+                        if (sizeOffset[lineInfo.Line].Width != 0)
+                        {
+                            if (_OversizeDistribute)
+                            {
+                                int nw = sizeOffset[lineInfo.Line].UseAbsoluteWidth
+                                             ? sizeOffset[lineInfo.Line].Width
+                                             : (int) Math.Floor(r.Width*sizeOffset[lineInfo.Line].WidthReduction);
+
+                                offset[lineInfo.Line].X += nw - r.Width;
+
+                                r.Width = nw;
+                            }
+                            else
+                            {
+                                r.Width += sizeOffset[lineInfo.Line].Width;
+                                offset[lineInfo.Line].X += sizeOffset[lineInfo.Line].Width;
+                            }
+                        }
+
+                        r.Height += sizeOffset[lineInfo.Line].Height;
+
+                        block.Bounds = r;
+
+                        if (newBounds.IsEmpty)
+                            newBounds = block.Bounds;
+                        else
+                            newBounds = Rectangle.Union(newBounds, block.Bounds);
+                    }
+
+				    // Adjust for left-over size adjustment for odd difference
+                    // between container width and the total block width
+
+                    if (!_OversizeDistribute && sizeOffset[lineInfo.Line].Width != 0 &&
+                        containerBounds.Width - (lineInfo.LineSize.Width + sizeOffset[lineInfo.Line].Width * lineInfo.Blocks.Count) != 0)
+                    {
+                        Rectangle r = ((IBlock) lineInfo.Blocks[lineInfo.Blocks.Count - 1]).Bounds;
+
+                        r.Width += containerBounds.Width -
+                                   (lineInfo.LineSize.Width + sizeOffset[lineInfo.Line].Width*lineInfo.Blocks.Count);
+
+                        ((IBlock) lineInfo.Blocks[lineInfo.Blocks.Count - 1]).Bounds = r;
+                    }
+				}
+			}
+			else
+			{
+				foreach(BlockLineInfo lineInfo in lines)
+				{
+					foreach(IBlock block in lineInfo.Blocks)
+					{
+						if(!block.Visible)
+							continue;
+
+						Rectangle r=block.Bounds;
+
+						if(_EvenHeight && lineInfo.LineSize.Width>0)
+							r.Width=lineInfo.LineSize.Width;
+
+						r.Offset(offset[lineInfo.Line]);
+
+						if(_ContentAlignment==eContentAlignment.Center)
+							r.Offset(((containerBounds.Width-blocksBounds.Width)+(lineInfo.LineSize.Width-r.Width))/2,0); //r.Offset((containerBounds.Width-blocksBounds.Width)/2+(lineInfo.LineSize.Width-r.Width)/2,0);
+						else if(_ContentAlignment==eContentAlignment.Right)
+
+							r.Offset((containerBounds.Width-blocksBounds.Width)+lineInfo.LineSize.Width-r.Width,0);
+						r.Width+=sizeOffset[lineInfo.Line].Width;
+
+						if(sizeOffset[lineInfo.Line].Height!=0)
+						{
+                            if (_OversizeDistribute)
+                            {
+                                int nw = sizeOffset[lineInfo.Line].UseAbsoluteWidth
+                                    ? sizeOffset[lineInfo.Line].Height : (int)Math.Floor(r.Height * sizeOffset[lineInfo.Line].HeightReduction);
+                                
+                                offset[lineInfo.Line].Y += nw - r.Height;
+                                r.Height = nw;
+                            }
+                            else
+                            {
+                                r.Height += sizeOffset[lineInfo.Line].Height;
+                                offset[lineInfo.Line].Y += sizeOffset[lineInfo.Line].Height;
+                            }
+						}
+
+						block.Bounds=r;
+
+						if(newBounds.IsEmpty)
+							newBounds=block.Bounds;
+						else
+							newBounds=Rectangle.Union(newBounds,block.Bounds);
+					}
+
+                    if (!_OversizeDistribute && sizeOffset[lineInfo.Line].Height != 0 && containerBounds.Height - (lineInfo.LineSize.Height + sizeOffset[lineInfo.Line].Height * lineInfo.Blocks.Count) != 0)
+					{
+						Rectangle r=((IBlock)lineInfo.Blocks[lineInfo.Blocks.Count-1]).Bounds;
+						r.Height+=containerBounds.Height-(lineInfo.LineSize.Height+sizeOffset[lineInfo.Line].Height*lineInfo.Blocks.Count);
+						((IBlock)lineInfo.Blocks[lineInfo.Blocks.Count-1]).Bounds=r;
+					}
+				}
+			}
+			return newBounds;
+		}
+
+		private Point GetNextPosition(IBlock block, Point position)
+		{
+            if (NextPosition != null)
+            {
+                LayoutManagerPositionEventArgs e = new LayoutManagerPositionEventArgs();
+
+                e.Block = block;
+                e.CurrentPosition = position;
+
+                NextPosition(this, e);
+
+                if (e.Cancel)
+                    return e.NextPosition;
+            }
+
+			if(_ContentOrientation==eContentOrientation.Horizontal)
+				position.X+=block.Bounds.Width+_BlockSpacing;
+			else
+				position.Y+=block.Bounds.Height+_BlockSpacing;
+
+			return position;
+		}
+
+		internal class BlockLineInfo
+		{
+		    public ArrayList Blocks=new ArrayList();
+			public Size LineSize = Size.Empty;
+			public int Line;
+            public int VisibleItemsCount;
+		}
+
+        private Rectangle MirrorContent(Rectangle containerBounds, Rectangle blockBounds, IBlock[] contentBlocks)
+        {
+            if (blockBounds.Width < containerBounds.Width)
+                blockBounds.X = containerBounds.Right - ((blockBounds.X - containerBounds.X) + blockBounds.Width);
+
+            else if (blockBounds.Width > containerBounds.Width)
+                containerBounds.Width = blockBounds.Width;
+
+            foreach (IBlock block in contentBlocks)
+            {
+                if (!block.Visible)
+                    continue;
+
+                Rectangle r = block.Bounds;
+
+                block.Bounds = new Rectangle(containerBounds.Right - 
+                    ((r.X - containerBounds.X) + r.Width), r.Y, r.Width, r.Height);
+            }
+
+            return blockBounds;
+        }
+		#endregion
+
+		#region Properties
+		/// <summary>
+		/// Gets or sets the spacing in pixels between content blocks. Default value is 0.
+		/// </summary>
+		public virtual int BlockSpacing
+		{
+			get {return _BlockSpacing;}
+			set {_BlockSpacing=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets whether content blocks are forced to fit the container bounds if they 
+		/// occupy more space than it is available by container. Default value is false.
+		/// </summary>
+		public virtual bool FitContainerOversize
+		{
+			get {return _FitContainerOversize;}
+			set {_FitContainerOversize=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets whether content blocks are resized to fit the container bound if they
+		/// occupy less space than it is available by container. Default value is false.
+		/// </summary>
+		public virtual bool FitContainer
+		{
+			get {return _FitContainer;}
+			set {_FitContainer=value;}
+		}
+
+        /// <summary>
+        /// Gets or sets whether content blocks are resized (Width) to fit container bounds if they
+        /// occupy less space than the actual container width. Applies to the Vertical orientation only. Default value is false.
+        /// </summary>
+        public virtual bool VerticalFitContainerWidth
+        {
+            get { return _VerticalFitContainerWidth; }
+            set { _VerticalFitContainerWidth = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether content blocks are resized (Height) to fit container bounds if they
+        /// occupy less space than the actual container height. Applies to the Horizontal orientation only. Default value is false.
+        /// </summary>
+        public virtual bool HorizontalFitContainerHeight
+        {
+            get { return _HorizontalFitContainerHeight; }
+            set { _HorizontalFitContainerHeight = value; }
+        }
+
+		/// <summary>
+		/// Gets or sets the content orientation. Default value is Horizontal.
+		/// </summary>
+		public virtual eContentOrientation ContentOrientation
+		{
+			get {return _ContentOrientation;}
+			set {_ContentOrientation=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets the content vertical alignment. Default value is Middle.
+		/// </summary>
+		public virtual eContentVerticalAlignment ContentVerticalAlignment
+		{
+			get {return _ContentVerticalAlignment;}
+			set {_ContentVerticalAlignment=value;}
+		}
+
+        /// <summary>
+        /// Gets or sets the block line vertical alignment. Default value is Middle.
+        /// </summary>
+        public virtual eContentVerticalAlignment BlockLineAlignment
+        {
+            get { return _BlockLineAlignment; }
+            set { _BlockLineAlignment = value; }
+        }
+
+		/// <summary>
+		/// Gets or sets the content horizontal alignment. Default value is Left.
+		/// </summary>
+		public virtual eContentAlignment ContentAlignment
+		{
+			get {return _ContentAlignment;}
+			set {_ContentAlignment=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets whether all content blocks are resized so they have same height which is height of the tallest content block. Default value is false.
+		/// </summary>
+		public virtual bool EvenHeight
+		{
+			get {return _EvenHeight;}
+			set {_EvenHeight=value;}
+		}
+
+        /// <summary>
+        /// Gets or sets whether oversized blocks are resized based on the percentage reduction instead of based on equal pixel distribution. Default value is false.
+        /// </summary>
+        public virtual bool OversizeDistribute
+        {
+            get { return _OversizeDistribute; }
+            set { _OversizeDistribute = value; }
+        }
+
+		/// <summary>
+		/// Gets or sets whether content is wrapped into new line if it exceeds the width of the container.
+		/// </summary>
+		public bool MultiLine
+		{
+			get {return _MultiLine;}
+			set {_MultiLine=value;}
+		}
+
+        /// <summary>
+        /// Gets or sets whether layout is right-to-left.
+        /// </summary>
+        public bool RightToLeft
+        {
+            get { return _RightToLeft; }
+            set { _RightToLeft = value; }
+        }
+
+		#endregion
+	}
+
+    /// <summary>
+    /// Represents event arguments for SerialContentLayoutManager.NextPosition event.
+    /// </summary>
+    public class LayoutManagerPositionEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets or sets the block that is layed out.
+        /// </summary>
+        public IBlock Block;
+
+        /// <summary>
+        /// Gets or sets the current block position.
+        /// </summary>
+        public Point CurrentPosition = Point.Empty;
+
+        /// <summary>
+        /// Gets or sets the calculated next block position.
+        /// </summary>
+        public Point NextPosition = Point.Empty;
+
+        /// <summary>
+        /// Cancels default position calculation.
+        /// </summary>
+        public bool Cancel;
+    }
+
+    /// <summary>
+    /// Represents event arguments for the SerialContentLayoutManager layout events.
+    /// </summary>
+    public class LayoutManagerLayoutEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets or sets the reference block object.
+        /// </summary>
+        public IBlock Block;
+
+        /// <summary>
+        /// Gets or sets the position block will assume.
+        /// </summary>
+        public Point CurrentPosition = Point.Empty;
+
+        /// <summary>
+        /// Cancel the layout of the block, applies only to BeforeXXX layout event.
+        /// </summary>
+        public bool CancelLayout;
+
+        /// <summary>
+        /// Gets or sets the visibility index of the block.
+        /// </summary>
+        public int BlockVisibleIndex;
+
+        /// <summary>
+        /// Creates new instance of the class and initializes it with default values.
+        /// </summary>
+        public LayoutManagerLayoutEventArgs(IBlock block, Point currentPosition, int visibleIndex)
+        {
+            this.Block = block;
+            this.CurrentPosition = currentPosition;
+            this.BlockVisibleIndex = visibleIndex;
+        }
+    }
+
+    /// <summary>
+    /// Delegate for SerialContentLayoutManager.NextPosition event.
+    /// </summary>
+    public delegate void LayoutManagerPositionEventHandler(object sender, LayoutManagerPositionEventArgs e);
+
+    /// <summary>
+    /// Delegate for the SerialContentLayoutManager layout events.
+    /// </summary>
+    public delegate void LayoutManagerLayoutEventHandler(object sender, LayoutManagerLayoutEventArgs e);
+    
+
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/Helpers/ColorHelpers.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/Helpers/ColorHelpers.cs
new file mode 100644
index 00000000..44a6b01f
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/Helpers/ColorHelpers.cs	
@@ -0,0 +1,59 @@
+using System;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    /// <summary>
+    /// Provides helpers when working with colors.
+    /// </summary>
+    internal static class ColorHelpers
+    {
+        /// <summary>
+        /// Converts hex string to Color type.
+        /// </summary>
+        /// <param name="rgbHex">Hexadecimal color representation.</param>
+        /// <returns>Reference to Color object.</returns>
+        public static Color GetColor(string rgbHex)
+        {
+            if (string.IsNullOrEmpty(rgbHex))
+                return Color.Empty;
+
+            if (rgbHex.Length == 8)
+                return Color.FromArgb(Convert.ToInt32(rgbHex.Substring(0, 2), 16),
+                                      Convert.ToInt32(rgbHex.Substring(2, 2), 16),
+                                      Convert.ToInt32(rgbHex.Substring(4, 2), 16),
+                                      Convert.ToInt32(rgbHex.Substring(6, 2), 16));
+
+            return Color.FromArgb(Convert.ToInt32(rgbHex.Substring(0, 2), 16),
+                                  Convert.ToInt32(rgbHex.Substring(2, 2), 16),
+                                  Convert.ToInt32(rgbHex.Substring(4, 2), 16));
+        }
+
+        /// <summary>
+        /// Converts hex string to Color type.
+        /// </summary>
+        /// <param name="rgb">Color representation as 32-bit RGB value.</param>
+        /// <returns>Reference to Color object.</returns>
+        public static Color GetColor(int rgb)
+        {
+            if (rgb == -1) 
+                return Color.Empty;
+
+            return Color.FromArgb((rgb & 0xFF0000) >> 16, (rgb & 0xFF00) >> 8, rgb & 0xFF);
+        }
+
+        /// <summary>
+        /// Converts hex string to Color type.
+        /// </summary>
+        /// <param name="alpha">Alpha component for color.</param>
+        /// <param name="rgb">Color representation as 32-bit RGB value.</param>
+        /// <returns>Reference to Color object.</returns>
+        public static Color GetColor(int alpha, int rgb)
+        {
+            if (rgb == -1) 
+                return Color.Empty;
+
+            return Color.FromArgb(alpha, (rgb & 0xFF0000) >> 16, (rgb & 0xFF00) >> 8, rgb & 0xFF);
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/Helpers/ConvertValue.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/Helpers/ConvertValue.cs
new file mode 100644
index 00000000..c9fa7299
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/Helpers/ConvertValue.cs	
@@ -0,0 +1,72 @@
+using System;
+
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    ///<summary>
+    /// ConvertValue
+    ///</summary>
+    static public class ConvertValue
+    {
+        ///<summary>
+        /// ConvertTo
+        ///</summary>
+        ///<param name="o"></param>
+        ///<param name="type"></param>
+        ///<returns></returns>
+        static public object ConvertTo(object o, Type type)
+        {
+            if (o == null || o is DBNull)
+                return (o);
+
+            if (o.GetType() == type)
+                return (o);
+
+            if (type == typeof (decimal))
+                return (Convert.ToDecimal(o));
+
+            if (type == typeof (double))
+                return (Convert.ToDouble(o));
+
+            if (type == typeof (Int16))
+                return (Convert.ToInt16(o));
+
+            if (type == typeof (Int32))
+                return (Convert.ToInt32(o));
+
+            if (type == typeof (Int64))
+                return (Convert.ToInt64(o));
+
+            if (type == typeof (Single))
+                return (Convert.ToSingle(o));
+
+            if (type == typeof (UInt16))
+                return (Convert.ToUInt16(o));
+
+            if (type == typeof (UInt32))
+                return (Convert.ToUInt32(o));
+
+            if (type == typeof (UInt64))
+                return (Convert.ToUInt64(o));
+
+            if (type == typeof(sbyte))
+                return (Convert.ToSByte(o));
+
+            if (type == typeof(byte))
+                return (Convert.ToByte(o));
+
+            if (type == typeof(bool))
+                return (Convert.ToBoolean(o));
+
+            if (type == typeof(char))
+                return (Convert.ToChar(o));
+
+            if (type == typeof(string))
+                return (Convert.ToString(o));
+
+            if (type == typeof(DateTime))
+                return (Convert.ToDateTime(o));
+
+            return (o);
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/Helpers/DragDrop.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/Helpers/DragDrop.cs
new file mode 100644
index 00000000..f5b9549d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/Helpers/DragDrop.cs	
@@ -0,0 +1,18 @@
+using System.Drawing;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    internal static class DragDrop
+    {
+        public static bool DragStarted(Point pt1, Point pt2)
+        {
+            Rectangle r = new Rectangle(pt1.X, pt1.Y, 0, 0);
+
+            r.Inflate(SystemInformation.DragSize.Width,
+                SystemInformation.DragSize.Height);
+
+            return (r.Contains(pt2.X, pt2.Y) == false);
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/Helpers/TextHelpers.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/Helpers/TextHelpers.cs
new file mode 100644
index 00000000..f1dfa2cb
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/Helpers/TextHelpers.cs	
@@ -0,0 +1,55 @@
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    /// <summary>
+    /// Provides helpers when working with text.
+    /// </summary>
+    internal static class TextHelper
+    {
+        private static int _textMarkupCultureSpecific = 3;
+
+        /// <summary>
+        /// Get or sets the text-markup padding for text
+        /// measurement when running on Japanese version of Windows.
+        /// </summary>
+        public static int TextMarkupCultureSpecificPadding
+        {
+            get { return _textMarkupCultureSpecific; }
+            set { _textMarkupCultureSpecific = value; }
+        }
+
+        /// <summary>
+        /// MeasureText always adds about 1/2 em width of white space on the right,
+        /// even when NoPadding is specified. It returns zero for an empty string.
+        /// To get the precise string width, measure the width of a string containing a
+        /// single period and subtract that from the width of our original string plus a period.
+        /// </summary>
+        public static Size MeasureText(Graphics g,
+            string s, Font font, Size csize, eTextFormat tf)
+        {
+            return (TextDrawing.MeasureString(g, s, font, csize, tf));
+
+            if (font.Italic == true)
+                return (TextDrawing.MeasureString(g, s, font, csize, tf));
+
+            Size sz1 = TextDrawing.MeasureString(g, ".", font, csize, tf);
+            Size sz2 = TextDrawing.MeasureString(g, s + ".", font, csize, tf);
+
+            return (new Size(sz2.Width - sz1.Width, sz2.Height));
+        }
+
+        public static Size MeasureText(Graphics g, string s, Font font)
+        {
+            return (TextDrawing.MeasureString(g, s, font));
+
+            if (font.Italic == true)
+                return (TextDrawing.MeasureString(g, s, font));
+
+            Size sz1 = TextDrawing.MeasureString(g, ".", font);
+            Size sz2 = TextDrawing.MeasureString(g, s + ".", font);
+
+            return (new Size(sz2.Width - sz1.Width, sz2.Height));
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/InfoImage.png b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/InfoImage.png
new file mode 100644
index 00000000..b72f802b
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/InfoImage.png differ
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/InfoImage16.png b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/InfoImage16.png
new file mode 100644
index 00000000..7a5b5c8b
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/InfoImage16.png differ
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/InfoImage20.png b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/InfoImage20.png
new file mode 100644
index 00000000..5f18420c
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/InfoImage20.png differ
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/InfoImage24.png b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/InfoImage24.png
new file mode 100644
index 00000000..c7d37863
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/InfoImage24.png differ
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/InfoImage32.png b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/InfoImage32.png
new file mode 100644
index 00000000..0ec0375b
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/InfoImage32.png differ
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/InsertRow.png b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/InsertRow.png
new file mode 100644
index 00000000..31d5206e
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/InsertRow.png differ
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/InsertRow16.png b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/InsertRow16.png
new file mode 100644
index 00000000..0a1b7d0c
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/InsertRow16.png differ
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/InsertRow20.png b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/InsertRow20.png
new file mode 100644
index 00000000..fb02a6b8
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/InsertRow20.png differ
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/InsertRow24.png b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/InsertRow24.png
new file mode 100644
index 00000000..dbd4345f
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/InsertRow24.png differ
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/InsertRow32.png b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/InsertRow32.png
new file mode 100644
index 00000000..c800304a
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/InsertRow32.png differ
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/Pencil16.png b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/Pencil16.png
new file mode 100644
index 00000000..33455005
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/Pencil16.png differ
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/Pencil20.png b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/Pencil20.png
new file mode 100644
index 00000000..6f21ca47
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/Pencil20.png differ
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/Pencil24.png b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/Pencil24.png
new file mode 100644
index 00000000..923cc2b6
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/Pencil24.png differ
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/Pencil3.png b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/Pencil3.png
new file mode 100644
index 00000000..fb9a6ec8
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/Pencil3.png differ
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/Pencil32.png b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/Pencil32.png
new file mode 100644
index 00000000..433ed042
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/Pencil32.png differ
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/Program.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/Program.cs
new file mode 100644
index 00000000..b5be5b4e
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/Program.cs	
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Windows.Forms;
+
+namespace SuperGrid
+{
+    static class Program
+    {
+        /// <summary>
+        /// The main entry point for the application.
+        /// </summary>
+        [STAThread]
+        static void Main()
+        {
+            Application.EnableVisualStyles();
+            Application.SetCompatibleTextRenderingDefault(false);
+            Application.Run(new Form1());
+        }
+    }
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/Properties/Resources.Designer.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/Properties/Resources.Designer.cs
new file mode 100644
index 00000000..e5ce2441
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/Properties/Resources.Designer.cs	
@@ -0,0 +1,63 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:2.0.50727.5448
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace DevComponents.DotNetBar.SuperGrid.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DevComponents.DotNetBar.SuperGrid.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/Properties/Resources.resx b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/Properties/Resources.resx
new file mode 100644
index 00000000..7080a7d1
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/Properties/Resources.resx	
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/Properties/Settings.Designer.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/Properties/Settings.Designer.cs
new file mode 100644
index 00000000..b78ae54e
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/Properties/Settings.Designer.cs	
@@ -0,0 +1,26 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:2.0.50727.5448
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace DevComponents.DotNetBar.SuperGrid.Properties {
+    
+    
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "8.0.0.0")]
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
+        
+        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
+        
+        public static Settings Default {
+            get {
+                return defaultInstance;
+            }
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/Properties/Settings.settings b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/Properties/Settings.settings
new file mode 100644
index 00000000..39645652
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/Properties/Settings.settings	
@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='utf-8'?>
+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)">
+  <Profiles>
+    <Profile Name="(Default)" />
+  </Profiles>
+  <Settings />
+</SettingsFile>
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SampleExpr.rtf b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SampleExpr.rtf
new file mode 100644
index 00000000..5ad2f179
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SampleExpr.rtf	
@@ -0,0 +1,392 @@
+{\rtf1\adeflang1025\ansi\ansicpg1252\uc1\adeff0\deff0\stshfdbch0\stshfloch31506\stshfhich31506\stshfbi31506\deflang1033\deflangfe1033\themelang1033\themelangfe0\themelangcs0{\fonttbl{\f0\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f34\fbidi \froman\fcharset0\fprq2{\*\panose 02040503050406030204}Cambria Math;}
+{\f36\fbidi \froman\fcharset0\fprq2{\*\panose 02040503050406030204}Cambria;}{\f37\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0502020204030204}Calibri;}{\f38\fbidi \fswiss\fcharset0\fprq2{\*\panose 020b0604030504040204}Tahoma;}
+{\f39\fbidi \fswiss\fcharset0\fprq2{\*\panose 020b0502040204020203}Segoe UI;}{\flomajor\f31500\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}
+{\fdbmajor\f31501\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\fhimajor\f31502\fbidi \froman\fcharset0\fprq2{\*\panose 02040503050406030204}Cambria;}
+{\fbimajor\f31503\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\flominor\f31504\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}
+{\fdbminor\f31505\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\fhiminor\f31506\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0502020204030204}Calibri;}
+{\fbiminor\f31507\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f40\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\f41\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}
+{\f43\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\f44\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\f45\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\f46\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}
+{\f47\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\f48\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\f380\fbidi \froman\fcharset238\fprq2 Cambria Math CE;}{\f381\fbidi \froman\fcharset204\fprq2 Cambria Math Cyr;}
+{\f383\fbidi \froman\fcharset161\fprq2 Cambria Math Greek;}{\f384\fbidi \froman\fcharset162\fprq2 Cambria Math Tur;}{\f387\fbidi \froman\fcharset186\fprq2 Cambria Math Baltic;}{\f388\fbidi \froman\fcharset163\fprq2 Cambria Math (Vietnamese);}
+{\f400\fbidi \froman\fcharset238\fprq2 Cambria CE;}{\f401\fbidi \froman\fcharset204\fprq2 Cambria Cyr;}{\f403\fbidi \froman\fcharset161\fprq2 Cambria Greek;}{\f404\fbidi \froman\fcharset162\fprq2 Cambria Tur;}
+{\f407\fbidi \froman\fcharset186\fprq2 Cambria Baltic;}{\f408\fbidi \froman\fcharset163\fprq2 Cambria (Vietnamese);}{\f410\fbidi \fswiss\fcharset238\fprq2 Calibri CE;}{\f411\fbidi \fswiss\fcharset204\fprq2 Calibri Cyr;}
+{\f413\fbidi \fswiss\fcharset161\fprq2 Calibri Greek;}{\f414\fbidi \fswiss\fcharset162\fprq2 Calibri Tur;}{\f417\fbidi \fswiss\fcharset186\fprq2 Calibri Baltic;}{\f418\fbidi \fswiss\fcharset163\fprq2 Calibri (Vietnamese);}
+{\f420\fbidi \fswiss\fcharset238\fprq2 Tahoma CE;}{\f421\fbidi \fswiss\fcharset204\fprq2 Tahoma Cyr;}{\f423\fbidi \fswiss\fcharset161\fprq2 Tahoma Greek;}{\f424\fbidi \fswiss\fcharset162\fprq2 Tahoma Tur;}
+{\f425\fbidi \fswiss\fcharset177\fprq2 Tahoma (Hebrew);}{\f426\fbidi \fswiss\fcharset178\fprq2 Tahoma (Arabic);}{\f427\fbidi \fswiss\fcharset186\fprq2 Tahoma Baltic;}{\f428\fbidi \fswiss\fcharset163\fprq2 Tahoma (Vietnamese);}
+{\f429\fbidi \fswiss\fcharset222\fprq2 Tahoma (Thai);}{\f430\fbidi \fswiss\fcharset238\fprq2 Segoe UI CE;}{\f431\fbidi \fswiss\fcharset204\fprq2 Segoe UI Cyr;}{\f433\fbidi \fswiss\fcharset161\fprq2 Segoe UI Greek;}
+{\f434\fbidi \fswiss\fcharset162\fprq2 Segoe UI Tur;}{\f436\fbidi \fswiss\fcharset178\fprq2 Segoe UI (Arabic);}{\f437\fbidi \fswiss\fcharset186\fprq2 Segoe UI Baltic;}{\f438\fbidi \fswiss\fcharset163\fprq2 Segoe UI (Vietnamese);}
+{\flomajor\f31508\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\flomajor\f31509\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\flomajor\f31511\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}
+{\flomajor\f31512\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\flomajor\f31513\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\flomajor\f31514\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}
+{\flomajor\f31515\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\flomajor\f31516\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fdbmajor\f31518\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}
+{\fdbmajor\f31519\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\fdbmajor\f31521\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fdbmajor\f31522\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}
+{\fdbmajor\f31523\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\fdbmajor\f31524\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fdbmajor\f31525\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}
+{\fdbmajor\f31526\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fhimajor\f31528\fbidi \froman\fcharset238\fprq2 Cambria CE;}{\fhimajor\f31529\fbidi \froman\fcharset204\fprq2 Cambria Cyr;}
+{\fhimajor\f31531\fbidi \froman\fcharset161\fprq2 Cambria Greek;}{\fhimajor\f31532\fbidi \froman\fcharset162\fprq2 Cambria Tur;}{\fhimajor\f31535\fbidi \froman\fcharset186\fprq2 Cambria Baltic;}
+{\fhimajor\f31536\fbidi \froman\fcharset163\fprq2 Cambria (Vietnamese);}{\fbimajor\f31538\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fbimajor\f31539\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}
+{\fbimajor\f31541\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fbimajor\f31542\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fbimajor\f31543\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}
+{\fbimajor\f31544\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fbimajor\f31545\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fbimajor\f31546\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}
+{\flominor\f31548\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\flominor\f31549\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\flominor\f31551\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}
+{\flominor\f31552\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\flominor\f31553\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\flominor\f31554\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}
+{\flominor\f31555\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\flominor\f31556\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fdbminor\f31558\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}
+{\fdbminor\f31559\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\fdbminor\f31561\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fdbminor\f31562\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}
+{\fdbminor\f31563\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\fdbminor\f31564\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fdbminor\f31565\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}
+{\fdbminor\f31566\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fhiminor\f31568\fbidi \fswiss\fcharset238\fprq2 Calibri CE;}{\fhiminor\f31569\fbidi \fswiss\fcharset204\fprq2 Calibri Cyr;}
+{\fhiminor\f31571\fbidi \fswiss\fcharset161\fprq2 Calibri Greek;}{\fhiminor\f31572\fbidi \fswiss\fcharset162\fprq2 Calibri Tur;}{\fhiminor\f31575\fbidi \fswiss\fcharset186\fprq2 Calibri Baltic;}
+{\fhiminor\f31576\fbidi \fswiss\fcharset163\fprq2 Calibri (Vietnamese);}{\fbiminor\f31578\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fbiminor\f31579\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}
+{\fbiminor\f31581\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fbiminor\f31582\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fbiminor\f31583\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}
+{\fbiminor\f31584\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fbiminor\f31585\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fbiminor\f31586\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}}
+{\colortbl;\red0\green0\blue0;\red0\green0\blue255;\red0\green255\blue255;\red0\green255\blue0;\red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0;\red255\green255\blue255;\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0;
+\red128\green0\blue128;\red128\green0\blue0;\red128\green128\blue0;\red128\green128\blue128;\red192\green192\blue192;\caccentone\ctint255\cshade191\red54\green95\blue145;\caccentone\ctint255\cshade255\red79\green129\blue189;\red220\green20\blue60;
+\red165\green42\blue42;\red139\green0\blue0;}{\*\defchp \f31506\fs22 }{\*\defpap \ql \li0\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 }\noqfpromote {\stylesheet{\ql \li0\ri0\sa200\sl276\slmult1
+\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af0\afs22\alang1025 \ltrch\fcs0 \f31506\fs22\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \snext0 \sqformat \spriority0 Normal;}{
+\s1\ql \li0\ri0\sb480\sl276\slmult1\keep\keepn\widctlpar\wrapdefault\aspalpha\aspnum\faauto\outlinelevel0\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \ab\af0\afs28\alang1025 \ltrch\fcs0 
+\b\fs28\cf17\lang1033\langfe1033\loch\f31502\hich\af31502\dbch\af31501\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext0 \slink15 \sqformat \spriority9 \styrsid5309040 heading 1;}{\s2\ql \li0\ri0\sb200\sl276\slmult1
+\keep\keepn\widctlpar\wrapdefault\aspalpha\aspnum\faauto\outlinelevel1\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \ab\af0\afs26\alang1025 \ltrch\fcs0 \b\fs26\cf18\lang1033\langfe1033\loch\f31502\hich\af31502\dbch\af31501\cgrid\langnp1033\langfenp1033 
+\sbasedon0 \snext0 \slink16 \sunhideused \sqformat \spriority9 \styrsid5577294 heading 2;}{\*\cs10 \additive \ssemihidden \sunhideused \spriority1 Default Paragraph Font;}{\*
+\ts11\tsrowd\trftsWidthB3\trpaddl108\trpaddr108\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\trcbpat1\trcfpat1\tblind0\tblindtype3\tsvertalt\tsbrdrt\tsbrdrl\tsbrdrb\tsbrdrr\tsbrdrdgl\tsbrdrdgr\tsbrdrh\tsbrdrv \ql \li0\ri0\sa200\sl276\slmult1
+\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af31506\afs22\alang1025 \ltrch\fcs0 \f31506\fs22\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \snext11 \ssemihidden \sunhideused Normal Table;}{\*\cs15 \additive 
+\rtlch\fcs1 \ab\af0\afs28 \ltrch\fcs0 \b\fs28\cf17\loch\f31502\hich\af31502\dbch\af31501 \sbasedon10 \slink1 \slocked \spriority9 \styrsid5309040 Heading 1 Char;}{\*\cs16 \additive \rtlch\fcs1 \ab\af0\afs26 \ltrch\fcs0 
+\b\fs26\cf18\loch\f31502\hich\af31502\dbch\af31501 \sbasedon10 \slink2 \slocked \spriority9 \styrsid5577294 Heading 2 Char;}{\*\ts17\tsrowd\trbrdrt\brdrs\brdrw10 \trbrdrl\brdrs\brdrw10 \trbrdrb\brdrs\brdrw10 \trbrdrr\brdrs\brdrw10 \trbrdrh\brdrs\brdrw10 
+\trbrdrv\brdrs\brdrw10 \trftsWidthB3\trpaddl108\trpaddr108\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\trcbpat1\trcfpat1\tblind0\tblindtype3\tsvertalt\tsbrdrt\tsbrdrl\tsbrdrb\tsbrdrr\tsbrdrdgl\tsbrdrdgr\tsbrdrh\tsbrdrv 
+\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af0\afs22\alang1025 \ltrch\fcs0 \f31506\fs22\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon11 \snext17 \spriority59 \styrsid5309040 
+Table Grid;}{\*\cs18 \additive \rtlch\fcs1 \ai\af0 \ltrch\fcs0 \i \sbasedon10 \sqformat \spriority20 \styrsid5309040 Emphasis;}}{\*\rsidtbl \rsid68473\rsid1339969\rsid1911172\rsid2585630\rsid2703695\rsid2703989\rsid5197621\rsid5309040\rsid5577294
+\rsid6763582\rsid7805558\rsid11556279\rsid12418639\rsid14490061\rsid14880401\rsid15015837\rsid15694138\rsid16671883}{\mmathPr\mmathFont34\mbrkBin0\mbrkBinSub0\msmallFrac0\mdispDef1\mlMargin0\mrMargin0\mdefJc1\mwrapIndent1440\mintLim0\mnaryLim1}{\info
+{\author Brianta}{\operator Brianta}{\creatim\yr2012\mo3\dy30\hr23\min33}{\revtim\yr2012\mo4\dy19\hr11\min37}{\version8}{\edmins170}{\nofpages3}{\nofwords360}{\nofchars2052}{\nofcharsws2408}{\vern49273}}{\*\xmlnstbl {\xmlns1 http://schemas.microsoft.com/o
+ffice/word/2003/wordml}}\paperw12240\paperh15840\margl1440\margr1440\margt630\margb1440\gutter0\ltrsect 
+\deftab2160\widowctrl\ftnbj\aenddoc\trackmoves0\trackformatting1\donotembedsysfont1\relyonvml0\donotembedlingdata0\grfdocevents0\validatexml1\showplaceholdtext0\ignoremixedcontent0\saveinvalidxml0\showxmlerrors1
+\noxlattoyen\expshrtn\noultrlspc\dntblnsbdb\nospaceforul\formshade\horzdoc\dgmargin\dghspace180\dgvspace180\dghorigin1440\dgvorigin630\dghshow1\dgvshow1
+\jexpand\viewkind1\viewscale100\pgbrdrhead\pgbrdrfoot\splytwnine\ftnlytwnine\htmautsp\nolnhtadjtbl\useltbaln\alntblind\lytcalctblwd\lyttblrtgr\lnbrkrule\nobrkwrptbl\snaptogridincell\allowfieldendsel\wrppunct
+\asianbrkrule\rsidroot2703695\newtblstyruls\nogrowautofit\usenormstyforlist\noindnmbrts\felnbrelev\nocxsptable\indrlsweleven\noafcnsttbl\afelev\utinl\hwelev\spltpgpar\notcvasp\notbrkcnstfrctbl\notvatxbx\krnprsnet\cachedcolbal \nouicompat \fet0
+{\*\wgrffmtfilter 2450}\nofeaturethrottle1\ilfomacatclnup0\ltrpar \sectd \ltrsect\linex0\endnhere\sectlinegrid360\sectdefaultcl\sectrsid2585630\sftnbj {\*\pnseclvl1\pnucrm\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl2
+\pnucltr\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl3\pndec\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl4\pnlcltr\pnstart1\pnindent720\pnhang {\pntxta )}}{\*\pnseclvl5\pndec\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl6
+\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl8\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl9\pnlcrm\pnstart1\pnindent720\pnhang 
+{\pntxtb (}{\pntxta )}}\pard\plain \ltrpar\s1\ql \li0\ri0\sl276\slmult1\keep\keepn\widctlpar\wrapdefault\aspalpha\aspnum\faauto\outlinelevel0\adjustright\rin0\lin0\itap0\pararsid16671883 \rtlch\fcs1 \ab\af0\afs28\alang1025 \ltrch\fcs0 
+\b\fs28\cf17\lang1033\langfe1033\loch\af31502\hich\af31502\dbch\af31501\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid2703695 \hich\af31502\dbch\af31501\loch\f31502 Operators:
+\par }\pard\plain \ltrpar\ql \li0\ri0\widctlpar\wrapdefault\faauto\rin0\lin0\itap0\pararsid16671883 \rtlch\fcs1 \af0\afs22\alang1025 \ltrch\fcs0 \f31506\fs22\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 
+\f39\fs18\insrsid5309040 
+\par }{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid16671883 + \tab }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid2703695 Add
+\par }{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid2703695\charrsid5309040 - \tab }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid2703695 Subtract}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid2703695\charrsid2703695 
+\par }{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid2703695\charrsid5309040 *\tab }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid2703695 Multiply}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid2703695\charrsid2703695 
+\par }{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid2703695\charrsid5309040 / \tab }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid2703695 Divide}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid2703695\charrsid2703695 
+\par 
+\par }{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid2703695\charrsid5309040 = \tab }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid2703695 Equal}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid2703695\charrsid2703695 
+\par }{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid14880401 !}{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid2703695\charrsid5309040 = \tab }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid2703695\charrsid2703695 Not}{\rtlch\fcs1 \af39\afs18 
+\ltrch\fcs0 \f39\fs18\insrsid2703695  Equal}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid5309040\charrsid2703695 
+\par }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid2703695\charrsid2703695 
+\par }{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid2703695\charrsid5309040 < \tab }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid2703695 Less Than}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid2703695\charrsid2703695 
+\par }{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid2703695\charrsid5309040 <= \tab }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid2703695\charrsid2703695 Less}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid2703695  }{\rtlch\fcs1 \af39\afs18 
+\ltrch\fcs0 \f39\fs18\insrsid2703695\charrsid2703695 Than}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid2703695  }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid15694138 o}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 
+\f39\fs18\insrsid2703695\charrsid2703695 r}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid2703695  Equal}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid2703695\charrsid2703695 
+\par }{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid2703695\charrsid5309040 > \tab }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid2703695 Greater Than}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid2703695\charrsid2703695 
+\par }{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid2703695\charrsid5309040 >=\tab }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid2703695 Gre}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid2703695\charrsid2703695 ater}{\rtlch\fcs1 \af39\afs18 
+\ltrch\fcs0 \f39\fs18\insrsid2703695  }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid2703695\charrsid2703695 Than}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid2703695  }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid15694138 o}{
+\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid2703695\charrsid2703695 r}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid2703695  Equal
+\par }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid2703695\charrsid2703695 
+\par }{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid2703695\charrsid5309040 (\tab }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid2703695\charrsid2703695 L}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid2703695 eft Parenthesis}{\rtlch\fcs1 
+\af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid2703695\charrsid2703695 
+\par }{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid2703695\charrsid5309040 )\tab }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid2703695\charrsid2703695 R}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid2703695 ight Parenthesis}{\rtlch\fcs1 
+\af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid2703695\charrsid2703695 
+\par 
+\par }{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid2703695\charrsid5309040 &&\tab }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid2703695\charrsid2703695 Conditional}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid2703695  And}{\rtlch\fcs1 
+\af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid2703695\charrsid2703695 
+\par }{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid2703695\charrsid5309040 AND\tab }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid2703695\charrsid2703695 Conditional}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid2703695  And}{\rtlch\fcs1 
+\af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid2703695\charrsid2703695 
+\par }{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid2703695\charrsid5309040 ||\tab }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid2703695\charrsid2703695 Conditional}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid2703695  Or}{\rtlch\fcs1 
+\af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid2703695\charrsid2703695 
+\par }{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid2703695\charrsid5309040 OR \tab }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid2703695\charrsid2703695 Conditional}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid2703695  Or
+\par }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid2703695\charrsid2703695 
+\par }{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid2703695\charrsid5309040 &\tab }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid2703695\charrsid2703695 Logical}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid2703695  And}{\rtlch\fcs1 
+\af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid2703695\charrsid2703695 
+\par }{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid2703695\charrsid5309040 |\tab }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid2703695\charrsid2703695 Logical}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid2703695  Or
+\par }{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid2703695\charrsid5309040 ^\tab }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid2703695\charrsid2703695 Logical}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid2703695  Xor
+\par }{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid5577294\charrsid5309040 XOR\tab }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid5577294\charrsid2703695 Logical}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid5577294  Xor}{\rtlch\fcs1 
+\af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid5577294\charrsid2703695 
+\par }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid2703695\charrsid2703695 
+\par }{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid2703695\charrsid5309040 %\tab }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid2703695 Mod}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid5309040 ulus}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 
+\f39\fs18\insrsid2703695 
+\par }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid2703695\charrsid2703695 
+\par }{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid2703695\charrsid5309040 <<\tab }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid2703695\charrsid2703695 S}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid2703695 hift Left}{\rtlch\fcs1 
+\af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid2703695\charrsid2703695 
+\par }{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid2703695\charrsid5309040 >>\tab }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid2703695 Shift Right
+\par 
+\par }{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid15694138 [IS] }{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid2703695\charrsid5309040 LIKE\tab }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid2703695 Like (matches only what is specified)}{
+\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid2703695\charrsid2703695 
+\par }{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid16671883 [IS] }{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid5577294\charrsid5309040 NOT\tab }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid5577294 Negate}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 
+\f39\fs18\insrsid2703695\charrsid2703695 
+\par }{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid15694138 [IS] }{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid5577294\charrsid5309040 BETWEEN}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid5577294 \tab Between (range comparison)}{\rtlch\fcs1 
+\af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid2703695\charrsid2703695 
+\par }\pard \ltrpar\ql \li0\ri0\widctlpar\brdrb\brdrs\brdrw15\brsp20 \wrapdefault\faauto\rin0\lin0\itap0\pararsid16671883 {\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid2703695 
+\par }\pard\plain \ltrpar\s1\ql \li0\ri0\sb240\sl276\slmult1\keep\keepn\widctlpar\wrapdefault\aspalpha\aspnum\faauto\outlinelevel0\adjustright\rin0\lin0\itap0\pararsid16671883 \rtlch\fcs1 \ab\af0\afs28\alang1025 \ltrch\fcs0 
+\b\fs28\cf17\lang1033\langfe1033\loch\af31502\hich\af31502\dbch\af31501\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid5577294 \hich\af31502\dbch\af31501\loch\f31502 Functions:
+\par }\pard\plain \ltrpar\ql \li0\ri0\widctlpar\wrapdefault\faauto\rin0\lin0\itap0\pararsid16671883 \rtlch\fcs1 \af0\afs22\alang1025 \ltrch\fcs0 \f31506\fs22\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 
+\f39\fs18\insrsid5577294 
+\par }{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid5309040\charrsid5197621 N}{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid5577294\charrsid5197621 ow}{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid16671883 \tab }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 
+\f39\fs18\insrsid5309040 Today\rquote s DateTime}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid5577294\charrsid5577294 
+\par }{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid5309040\charrsid5197621 D}{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid5577294\charrsid5197621 ate}{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid16671883 \tab }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 
+\f39\fs18\insrsid5309040 Date portion of DateTime}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid5577294\charrsid5577294 
+\par 
+\par }{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid5309040\charrsid5197621 T}{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid5577294\charrsid5197621 od}{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid16671883 \tab }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 
+\f39\fs18\insrsid5309040 Time of day}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid5577294\charrsid5577294 
+\par }{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid5309040\charrsid5197621 TimeOfD}{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid5577294\charrsid5197621 ay}{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid5309040\charrsid5197621 \tab }{\rtlch\fcs1 
+\af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid5309040 Time of day}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid5577294 
+\par }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid15694138\charrsid5577294 
+\par }{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid5309040\charrsid5197621 D}{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid5577294\charrsid5197621 ow}{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid16671883 \tab }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 
+\f39\fs18\insrsid15694138 Day of Week}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid5577294\charrsid5577294 
+\par }{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid5309040\charrsid5197621 DayOfW}{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid5577294\charrsid5197621 eek}{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid5309040\charrsid5197621 \tab }{\rtlch\fcs1 
+\af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid5309040 Day of Week}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid5577294\charrsid5577294 
+\par 
+\par }{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid5309040\charrsid5197621 D}{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid5577294\charrsid5197621 oy}{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid16671883 \tab }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 
+\f39\fs18\insrsid15694138 Day of Year}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid5577294\charrsid5577294 
+\par }{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid5309040\charrsid5197621 DayOfY}{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid5577294\charrsid5197621 ear}{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid5309040\charrsid5197621 \tab }{\rtlch\fcs1 
+\af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid5309040 Day of Year}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid5577294\charrsid5577294 
+\par }\pard \ltrpar\ql \li0\ri0\widctlpar\wrapdefault\faauto\rin0\lin0\itap0\pararsid12418639 {\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid12418639 FirstOfMonth}{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid12418639\charrsid5197621 \tab }{\rtlch\fcs1 
+\af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid12418639 First of month}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid7805558  (DateTime)}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid12418639\charrsid5577294 
+\par }{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid12418639 End}{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid12418639 OfMonth}{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid12418639\charrsid5197621 \tab }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 
+\f39\fs18\insrsid12418639 End}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid12418639  of month}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid7805558  (DateTime)}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid12418639 
+\par }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid12418639\charrsid5577294 
+\par }\pard \ltrpar\ql \li0\ri0\widctlpar\wrapdefault\faauto\rin0\lin0\itap0\pararsid16671883 {\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid5309040\charrsid5197621 Y}{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid5577294\charrsid5197621 ear}{\rtlch\fcs1 
+\ai\af0 \ltrch\fcs0 \cs18\i\insrsid16671883 \tab }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid15694138 Year}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid5577294\charrsid5577294 
+\par }{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid5309040\charrsid5197621 Y}{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid5577294\charrsid5197621 ears}{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid16671883 \tab }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 
+\f39\fs18\insrsid15694138 Year}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid5577294\charrsid5577294 
+\par }{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid5309040\charrsid5197621 M}{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid5577294\charrsid5197621 onth}{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid16671883 \tab }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 
+\f39\fs18\insrsid15694138 Month}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid5577294\charrsid5577294 
+\par }{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid5309040\charrsid5197621 M}{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid5577294\charrsid5197621 onths}{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid16671883 \tab }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 
+\f39\fs18\insrsid15694138 Months}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid5577294\charrsid5577294 
+\par }{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid5309040\charrsid5197621 Ho}{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid5577294\charrsid5197621 ur}{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid16671883 \tab }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 
+\f39\fs18\insrsid15694138 Hour}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid5577294\charrsid5577294 
+\par }{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid5309040\charrsid5197621 H}{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid5577294\charrsid5197621 ours}{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid16671883 \tab }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 
+\f39\fs18\insrsid15694138 Hours}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid5577294\charrsid5577294 
+\par }{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid5309040\charrsid5197621 M}{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid5577294\charrsid5197621 inute}{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid16671883 \tab }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 
+\f39\fs18\insrsid15694138 Minutes}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid5577294\charrsid5577294 
+\par }{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid5309040\charrsid5197621 M}{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid5577294\charrsid5197621 inutes}{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid15694138 \tab }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 
+\f39\fs18\insrsid15694138 Minutess}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid5577294\charrsid5577294 
+\par }{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid5309040\charrsid5197621 S}{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid5577294\charrsid5197621 econd}{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid16671883 \tab }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 
+\f39\fs18\insrsid15694138 Second}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid5577294\charrsid5577294 
+\par }{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid5309040\charrsid5197621 S}{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid5577294\charrsid5197621 econds}{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid15694138 \tab }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 
+\f39\fs18\insrsid15694138 Seconds}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid5577294\charrsid5577294 
+\par 
+\par }{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid5309040\charrsid5197621 TotalY}{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid5577294\charrsid5197621 ears }{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid15694138 \tab }{\rtlch\fcs1 \af39\afs18 
+\ltrch\fcs0 \f39\fs18\insrsid15694138 Total Years}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid5577294\charrsid5577294 
+\par }{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid5309040\charrsid5197621 TotalD}{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid5577294\charrsid5197621 ays}{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid15694138 \tab }{\rtlch\fcs1 \af39\afs18 
+\ltrch\fcs0 \f39\fs18\insrsid15694138 Total Days}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid5577294\charrsid5577294 
+\par }{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid5309040\charrsid5197621 TotalH}{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid5577294\charrsid5197621 ours }{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid15694138 \tab }{\rtlch\fcs1 \af39\afs18 
+\ltrch\fcs0 \f39\fs18\insrsid15694138 Total Hours}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid5577294\charrsid5577294 
+\par }{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid5309040\charrsid5197621 TotalM}{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid5577294\charrsid5197621 inutes}{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid15694138 \tab }{\rtlch\fcs1 \af39\afs18 
+\ltrch\fcs0 \f39\fs18\insrsid15694138 Total Minutes}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid5577294\charrsid5577294 
+\par }{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid5309040\charrsid5197621 TotalS}{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid5577294\charrsid5197621 econds}{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid15694138 \tab }{\rtlch\fcs1 \af39\afs18 
+\ltrch\fcs0 \f39\fs18\insrsid15694138 Total Seconds}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid5577294\charrsid5577294 
+\par 
+\par }{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid5309040\charrsid5197621 C}{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid5577294\charrsid5197621 eiling}{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid16671883 \tab }{\rtlch\fcs1 \af0 \ltrch\fcs0 
+\insrsid15694138 Smallest integral greater than or equal to the value}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid5577294\charrsid5577294 
+\par }{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid16671883 Floor\tab }{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid15694138 Largest integral greater than or equal to the value}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid15694138\charrsid5577294 
+\par }{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid15694138\charrsid5197621 Round}{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid16671883 \tab }{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid15694138 Rounds to a specified number of digits}{\rtlch\fcs1 \af39\afs18 
+\ltrch\fcs0 \f39\fs18\insrsid15694138\charrsid5577294 
+\par }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid15694138 \tab }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid5577294\charrsid5577294 
+\par }{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid5309040\charrsid5197621 L}{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid5577294\charrsid5197621 ength}{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid16671883 \tab }{\rtlch\fcs1 \af0 \ltrch\fcs0 
+\insrsid6763582 Length of string}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid5577294\charrsid5577294 
+\par 
+\par }{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid5309040\charrsid5197621 Ri}{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid5577294\charrsid5197621 ght}{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid16671883 \tab }{\rtlch\fcs1 \af0 \ltrch\fcs0 
+\insrsid6763582 Right part of a string with the specified number of characters}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid5577294\charrsid5577294 
+\par }{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid5309040\charrsid5197621 L}{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid5577294\charrsid5197621 eft}{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid16671883 \tab }{\rtlch\fcs1 \af0 \ltrch\fcs0 
+\insrsid6763582 Left part of a string with the specified number of characters}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid5577294\charrsid5577294 
+\par }{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid5309040\charrsid5197621 S}{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid5577294\charrsid5197621 ubstring}{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid6763582 \tab }{\rtlch\fcs1 \af0 \ltrch\fcs0 
+\insrsid6763582 Part of a string with the specified number of characters}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid5577294 
+\par }\pard \ltrpar\ql \li0\ri0\widctlpar\wrapdefault\faauto\rin0\lin0\itap0\pararsid12418639 {\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid12418639 IndexOf}{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid12418639 \tab }{\rtlch\fcs1 \af0 \ltrch\fcs0 
+\insrsid12418639 Gets the first occurrence of the specified string}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid12418639 
+\par }\pard \ltrpar\qc \li0\ri0\widctlpar\wrapdefault\faauto\rin0\lin0\itap0\pararsid12418639 {\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid5577294\charrsid5577294 
+\par }\pard \ltrpar\ql \li0\ri0\widctlpar\wrapdefault\faauto\rin0\lin0\itap0\pararsid16671883 {\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid5309040\charrsid5197621 T}{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid5577294\charrsid5197621 ostring}{
+\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid6763582 \tab }{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid6763582 String representation of the specified value}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid5577294\charrsid5577294 
+\par }{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid5309040\charrsid5197621 T}{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid5577294\charrsid5197621 olower}{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid6763582 \tab }{\rtlch\fcs1 \af0 \ltrch\fcs0 
+\insrsid6763582 Lowercase representation of the specified string}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid5577294\charrsid5577294 
+\par }{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid5309040\charrsid5197621 T}{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid5577294\charrsid5197621 oupper}{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid6763582 \tab }{\rtlch\fcs1 \af0 \ltrch\fcs0 
+\insrsid6763582 Uppercase representation of the specified string}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid5577294\charrsid5577294 
+\par 
+\par }{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid5309040\charrsid5197621 T}{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid5577294\charrsid5197621 rim}{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid16671883 \tab }{\rtlch\fcs1 \af0 \ltrch\fcs0 
+\insrsid6763582 Leading }{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid15015837 and trailing whitespace removed}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid5577294\charrsid5577294 
+\par }{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid5309040\charrsid5197621 LT}{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid5577294\charrsid5197621 rim}{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid16671883 \tab }{\rtlch\fcs1 \af0 \ltrch\fcs0 
+\insrsid6763582 Leading }{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid15015837 whitespace removed}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid5577294\charrsid5577294 
+\par }\pard \ltrpar\ql \li0\ri0\widctlpar\brdrb\brdrs\brdrw15\brsp20 \wrapdefault\faauto\rin0\lin0\itap0\pararsid16671883 {\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid5309040\charrsid5197621 RT}{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 
+\cs18\i\insrsid5577294\charrsid5197621 rim}{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid16671883 \tab }{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid6763582 Tr}{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid15015837 ailing whitespace removed}{\rtlch\fcs1 \af0 
+\ltrch\fcs0 \insrsid5577294 
+\par }{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid12418639 
+\par }{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid12418639\charrsid5197621 R}{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid12418639 aw}{\rtlch\fcs1 \ai\af0 \ltrch\fcs0 \cs18\i\insrsid12418639 \tab }{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid12418639 
+Unevaluated string contents
+\par }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid2585630 
+\par }\pard\plain \ltrpar\s1\ql \li0\ri0\sb240\sl276\slmult1\keep\keepn\widctlpar\wrapdefault\aspalpha\aspnum\faauto\outlinelevel0\adjustright\rin0\lin0\itap0\pararsid16671883 \rtlch\fcs1 \ab\af0\afs28\alang1025 \ltrch\fcs0 
+\b\fs28\cf17\lang1033\langfe1033\loch\af31502\hich\af31502\dbch\af31501\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid5577294 \hich\af31502\dbch\af31501\loch\f31502 Examples:
+\par }\pard\plain \ltrpar\ql \li0\ri0\widctlpar\wrapdefault\faauto\rin0\lin0\itap0\pararsid16671883 \rtlch\fcs1 \af0\afs22\alang1025 \ltrch\fcs0 \f31506\fs22\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 
+\f39\fs18\insrsid5577294 
+\par }\pard \ltrpar\ql \li0\ri0\sl360\slmult1\widctlpar\wrapdefault\faauto\rin0\lin0\itap0\pararsid16671883 {\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid6763582 (}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf11\insrsid6763582 LastName}{
+\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf1\insrsid6763582  }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf2\insrsid6763582 >=}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf1\insrsid6763582  }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 
+\f39\fs18\cf19\insrsid6763582 "T}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf19\insrsid1911172 olstoy}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf19\insrsid6763582 "}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf1\insrsid6763582 ) }{
+\rtlch\fcs1 \af39\afs14 \ltrch\fcs0 \f39\fs14\cf2\insrsid6763582 OR}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf1\insrsid6763582  ((}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf11\insrsid6763582 Age}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 
+\f39\fs18\cf1\insrsid6763582  }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf2\insrsid6763582 >}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf1\insrsid6763582  20) }{\rtlch\fcs1 \af39\afs14 \ltrch\fcs0 \f39\fs14\cf2\insrsid6763582 AND}{\rtlch\fcs1 
+\af39\afs18 \ltrch\fcs0 \f39\fs18\cf1\insrsid6763582  (}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf11\insrsid6763582 Age}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf1\insrsid6763582  }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 
+\f39\fs18\cf2\insrsid6763582 <}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf1\insrsid6763582  45))}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid6763582  
+\par (}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf11\insrsid6763582 FirstName}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf1\insrsid6763582  }{\rtlch\fcs1 \af39\afs14 \ltrch\fcs0 \f39\fs14\cf2\insrsid6763582 LIKE}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 
+\f39\fs18\cf1\insrsid6763582  }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf19\insrsid6763582 "Al"}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf1\insrsid6763582 ) }{\rtlch\fcs1 \af39\afs14 \ltrch\fcs0 \f39\fs14\cf2\insrsid6763582 AND}{\rtlch\fcs1 
+\af39\afs18 \ltrch\fcs0 \f39\fs18\cf1\insrsid6763582  (}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf19\insrsid6763582 "Count"}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf1\insrsid6763582  }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 
+\f39\fs18\cf2\insrsid6763582 =}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf1\insrsid6763582  (30 }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf2\insrsid6763582 /}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf1\insrsid6763582  }{\rtlch\fcs1 
+\af39\afs18 \ltrch\fcs0 \f39\fs18\cf11\insrsid6763582 Index}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf1\insrsid6763582 ))
+\par }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf20\insrsid2703989 ToString}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf1\insrsid2703989 (}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf11\insrsid2703989 HireDate}{\rtlch\fcs1 \af39\afs18 
+\ltrch\fcs0 \f39\fs18\cf1\insrsid2703989 ) }{\rtlch\fcs1 \af39\afs14 \ltrch\fcs0 \f39\fs14\cf2\insrsid2703989 LIKE}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf1\insrsid2703989  }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf19\insrsid2703989 
+"6/15"
+\par }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf11\insrsid2703989 HireDate}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf1\insrsid2703989  }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf2\insrsid2703989 = }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 
+\f39\fs18\insrsid2703695 #12/31/2010#}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid2703989  }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid2703695 
+\par }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf20\insrsid2703989 Date}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf1\insrsid2703989 (}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf11\insrsid2703989 HireDate}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 
+\f39\fs18\cf1\insrsid2703989 ) }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf2\insrsid2703989 =}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf1\insrsid2703989  }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf20\insrsid2703989 Date}{\rtlch\fcs1 
+\af39\afs18 \ltrch\fcs0 \f39\fs18\cf1\insrsid2703989 (}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf20\insrsid2703989 Now}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf1\insrsid2703989 ())
+\par }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf20\insrsid2703989 ToUpper}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf1\insrsid2703989 (}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf11\insrsid2703989 FirstName}{\rtlch\fcs1 \af39\afs18 
+\ltrch\fcs0 \f39\fs18\cf1\insrsid2703989 ) }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf2\insrsid2703989 =}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf1\insrsid2703989  }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf19\insrsid1911172 "SMY}{
+\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf19\insrsid2703989 TH}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf19\insrsid1911172 E}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf19\insrsid2703989 "
+\par }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid2703989 (}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf11\insrsid2703989 Age}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf1\insrsid2703989  }{\rtlch\fcs1 \af39\afs14 \ltrch\fcs0 
+\f39\fs14\cf2\insrsid2703989 IS BETWEEN}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf1\insrsid2703989  20 }{\rtlch\fcs1 \af39\afs14 \ltrch\fcs0 \f39\fs14\cf2\insrsid2703989 AND}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf1\insrsid2703989  30) }{
+\rtlch\fcs1 \af39\afs14 \ltrch\fcs0 \f39\fs14\cf2\insrsid2703989 AND}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf1\insrsid2703989  (}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf11\insrsid2703989 Age}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 
+\f39\fs18\cf1\insrsid2703989  }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf2\insrsid2703989 !=}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf1\insrsid2703989  25)
+\par }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid2703989 (}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf11\insrsid2703989 LastName}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf1\insrsid2703989  }{\rtlch\fcs1 \af39\afs14 \ltrch\fcs0 
+\f39\fs14\cf2\insrsid2703989 IS}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf1\insrsid2703989  }{\rtlch\fcs1 \af39\afs14 \ltrch\fcs0 \f39\fs14\cf2\insrsid14490061 NOT }{\rtlch\fcs1 \af39\afs14 \ltrch\fcs0 \f39\fs14\cf2\insrsid2703989 EMPTY}{
+\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf1\insrsid14490061 )}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf1\insrsid2703989  }{\rtlch\fcs1 \af39\afs14 \ltrch\fcs0 \f39\fs14\cf2\insrsid2703989 AND}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 
+\f39\fs18\cf1\insrsid2703989  (}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf11\insrsid2703989 Age}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf1\insrsid2703989  }{\rtlch\fcs1 \af39\afs14 \ltrch\fcs0 \f39\fs14\cf2\insrsid2703989 IS}{\rtlch\fcs1 
+\af39\afs18 \ltrch\fcs0 \f39\fs18\cf1\insrsid2703989  }{\rtlch\fcs1 \af39\afs14 \ltrch\fcs0 \f39\fs14\cf2\insrsid14490061 NOT}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf1\insrsid14490061  }{\rtlch\fcs1 \af39\afs14 \ltrch\fcs0 
+\f39\fs14\cf2\insrsid2703989 NULL}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf1\insrsid14490061 )
+\par }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf19\insrsid14490061 "Street"}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf1\insrsid14490061  }{\rtlch\fcs1 \af39\afs14 \ltrch\fcs0 \f39\fs14\cf2\insrsid14490061 IS}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 
+\f39\fs18\cf1\insrsid14490061  }{\rtlch\fcs1 \af39\afs14 \ltrch\fcs0 \f39\fs14\cf2\insrsid14490061 NOT LIKE}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf1\insrsid14490061  }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf19\insrsid14490061 "Los"}{
+\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf1\insrsid14490061 
+\par }\pard \ltrpar\ql \li0\ri0\sa200\sl360\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid16671883 {\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf20\insrsid14490061 Right}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 
+\f39\fs18\cf1\insrsid14490061 (}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf11\insrsid14490061 LastName}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf1\insrsid14490061 ,3) }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf2\insrsid14490061 !=}{
+\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf1\insrsid14490061  }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf19\insrsid14490061 "son"\line }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid14490061 (((}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 
+\f39\fs18\cf11\insrsid14490061 Age}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf1\insrsid14490061  }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf2\insrsid14490061 %}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf1\insrsid14490061  10) }{
+\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf2\insrsid14490061 =}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf1\insrsid14490061  0) }{\rtlch\fcs1 \af39\afs14 \ltrch\fcs0 \f39\fs14\cf2\insrsid14490061 AND}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 
+\f39\fs18\cf1\insrsid14490061  ((}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf19\insrsid14490061 "Circ"}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf1\insrsid14490061  }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf2\insrsid14490061 /}{
+\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf1\insrsid14490061  25) }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf2\insrsid14490061 >}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf1\insrsid14490061  250)) }{\rtlch\fcs1 \af39\afs14 \ltrch\fcs0 
+\f39\fs14\cf2\insrsid14490061 OR}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf1\insrsid14490061  ((}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf19\insrsid14490061 "Circ"}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf1\insrsid14490061  }{
+\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf2\insrsid14490061 <<}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf1\insrsid14490061  2) }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf2\insrsid14490061 >}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 
+\f39\fs18\cf1\insrsid14490061  100)\line }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\insrsid14490061 (}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf20\insrsid14490061 Length}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf1\insrsid14490061 (}{
+\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf11\insrsid14490061 LastName}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf1\insrsid14490061 ) }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf2\insrsid14490061 >}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 
+\f39\fs18\cf1\insrsid14490061  3) }{\rtlch\fcs1 \af39\afs14 \ltrch\fcs0 \f39\fs14\cf2\insrsid14490061 AND}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf1\insrsid14490061  (}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf20\insrsid14490061 Substring}{
+\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf1\insrsid14490061 (}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf11\insrsid14490061 LastName}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf1\insrsid14490061 ,2,1) }{\rtlch\fcs1 \af39\afs18 
+\ltrch\fcs0 \f39\fs18\cf2\insrsid14490061 =}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf1\insrsid14490061  }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf19\insrsid14490061 "c"}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf1\insrsid14490061 )
+\line }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf20\insrsid14490061 Year}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf1\insrsid14490061 (}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf11\insrsid14490061 HireDate}{\rtlch\fcs1 \af39\afs18 
+\ltrch\fcs0 \f39\fs18\cf1\insrsid14490061 ) }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf2\insrsid14490061 =}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf1\insrsid14490061  1996\line }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 
+\f39\fs18\cf20\insrsid14490061 Month}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf1\insrsid14490061 (}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf11\insrsid14490061 HireDate}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf1\insrsid14490061 ) }{
+\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf2\insrsid14490061 =}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf1\insrsid14490061  }{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf20\insrsid14490061 Month}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 
+\f39\fs18\cf1\insrsid14490061 (}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf20\insrsid14490061 Now}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf1\insrsid14490061 ())}{\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf1\insrsid1911172 \line }{
+\rtlch\fcs1 \af38\afs16 \ltrch\fcs0 \f38\fs16\cf21\insrsid11556279 IndexOf}{\rtlch\fcs1 \af38\afs16 \ltrch\fcs0 \f38\fs16\cf1\insrsid11556279 (}{\rtlch\fcs1 \af38\afs16 \ltrch\fcs0 \f38\fs16\cf21\insrsid11556279 Left}{\rtlch\fcs1 \af38\afs16 \ltrch\fcs0 
+\f38\fs16\cf1\insrsid11556279 (}{\rtlch\fcs1 \af38\afs16 \ltrch\fcs0 \f38\fs16\cf11\insrsid11556279 FirstName}{\rtlch\fcs1 \af38\afs16 \ltrch\fcs0 \f38\fs16\cf1\insrsid11556279 , 1), }{\rtlch\fcs1 \af38\afs16 \ltrch\fcs0 \f38\fs16\cf19\insrsid11556279 
+"AEIOUY"}{\rtlch\fcs1 \af38\afs16 \ltrch\fcs0 \f38\fs16\cf1\insrsid11556279 ) }{\rtlch\fcs1 \af38\afs16 \ltrch\fcs0 \f38\fs16\cf2\insrsid11556279 >=}{\rtlch\fcs1 \af38\afs16 \ltrch\fcs0 \f38\fs16\cf1\insrsid11556279  0}{\rtlch\fcs1 \af38\afs16 
+\ltrch\fcs0 \f38\fs16\cf1\insrsid11556279 \line }{\rtlch\fcs1 \af38\afs16 \ltrch\fcs0 \f38\fs16\cf21\insrsid11556279 Left}{\rtlch\fcs1 \af38\afs16 \ltrch\fcs0 \f38\fs16\cf1\insrsid11556279 (}{\rtlch\fcs1 \af38\afs16 \ltrch\fcs0 
+\f38\fs16\cf21\insrsid11556279 Raw}{\rtlch\fcs1 \af38\afs16 \ltrch\fcs0 \f38\fs16\cf1\insrsid11556279 (), 5) }{\rtlch\fcs1 \af38\afs16 \ltrch\fcs0 \f38\fs16\cf2\insrsid11556279 =}{\rtlch\fcs1 \af38\afs16 \ltrch\fcs0 \f38\fs16\cf1\insrsid11556279  }{
+\rtlch\fcs1 \af38\afs16 \ltrch\fcs0 \f38\fs16\cf19\insrsid11556279 "=sum("}{\rtlch\fcs1 \af38\afs16 \ltrch\fcs0 \f38\fs16\cf19\insrsid7805558 \line }{\rtlch\fcs1 \af38\afs16 \ltrch\fcs0 \f38\fs16\cf21\insrsid7805558 Day}{\rtlch\fcs1 \af38\afs16 
+\ltrch\fcs0 \f38\fs16\cf1\insrsid7805558 (}{\rtlch\fcs1 \af38\afs16 \ltrch\fcs0 \f38\fs16\cf21\insrsid7805558 EndOfMonth}{\rtlch\fcs1 \af38\afs16 \ltrch\fcs0 \f38\fs16\cf1\insrsid7805558 (}{\rtlch\fcs1 \af38\afs16 \ltrch\fcs0 
+\f38\fs16\cf11\insrsid7805558 HireDate}{\rtlch\fcs1 \af38\afs16 \ltrch\fcs0 \f38\fs16\cf1\insrsid7805558 )) }{\rtlch\fcs1 \af38\afs16 \ltrch\fcs0 \f38\fs16\cf2\insrsid7805558 =}{\rtlch\fcs1 \af38\afs16 \ltrch\fcs0 \f38\fs16\cf1\insrsid7805558  29}{
+\rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18\cf1\insrsid1911172\charrsid14490061 
+\par }{\*\themedata 504b030414000600080000002100e9de0fbfff0000001c020000130000005b436f6e74656e745f54797065735d2e786d6cac91cb4ec3301045f748fc83e52d4a
+9cb2400825e982c78ec7a27cc0c8992416c9d8b2a755fbf74cd25442a820166c2cd933f79e3be372bd1f07b5c3989ca74aaff2422b24eb1b475da5df374fd9ad
+5689811a183c61a50f98f4babebc2837878049899a52a57be670674cb23d8e90721f90a4d2fa3802cb35762680fd800ecd7551dc18eb899138e3c943d7e503b6
+b01d583deee5f99824e290b4ba3f364eac4a430883b3c092d4eca8f946c916422ecab927f52ea42b89a1cd59c254f919b0e85e6535d135a8de20f20b8c12c3b0
+0c895fcf6720192de6bf3b9e89ecdbd6596cbcdd8eb28e7c365ecc4ec1ff1460f53fe813d3cc7f5b7f020000ffff0300504b030414000600080000002100a5d6
+a7e7c0000000360100000b0000005f72656c732f2e72656c73848fcf6ac3300c87ef85bd83d17d51d2c31825762fa590432fa37d00e1287f68221bdb1bebdb4f
+c7060abb0884a4eff7a93dfeae8bf9e194e720169aaa06c3e2433fcb68e1763dbf7f82c985a4a725085b787086a37bdbb55fbc50d1a33ccd311ba548b6309512
+0f88d94fbc52ae4264d1c910d24a45db3462247fa791715fd71f989e19e0364cd3f51652d73760ae8fa8c9ffb3c330cc9e4fc17faf2ce545046e37944c69e462
+a1a82fe353bd90a865aad41ed0b5b8f9d6fd010000ffff0300504b0304140006000800000021006b799616830000008a0000001c0000007468656d652f746865
+6d652f7468656d654d616e616765722e786d6c0ccc4d0ac3201040e17da17790d93763bb284562b2cbaebbf600439c1a41c7a0d29fdbd7e5e38337cedf14d59b
+4b0d592c9c070d8a65cd2e88b7f07c2ca71ba8da481cc52c6ce1c715e6e97818c9b48d13df49c873517d23d59085adb5dd20d6b52bd521ef2cdd5eb9246a3d8b
+4757e8d3f729e245eb2b260a0238fd010000ffff0300504b03041400060008000000210030dd4329a8060000a41b0000160000007468656d652f7468656d652f
+7468656d65312e786d6cec594f6fdb3614bf0fd87720746f6327761a07758ad8b19b2d4d1bc46e871e698996d850a240d2497d1bdae38001c3ba618715d86d87
+615b8116d8a5fb34d93a6c1dd0afb0475292c5585e9236d88aad3e2412f9e3fbff1e1fa9abd7eec70c1d1221294fda5efd72cd4324f1794093b0eddd1ef62fad
+79482a9c0498f184b4bd2991deb58df7dfbb8ad755446282607d22d771db8b944ad79796a40fc3585ee62949606ecc458c15bc8a702910f808e8c66c69b9565b
+5d8a314d3c94e018c8de1a8fa94fd05093f43672e23d06af89927ac06762a049136785c10607758d9053d965021d62d6f6804fc08f86e4bef210c352c144dbab
+999fb7b4717509af678b985ab0b6b4ae6f7ed9ba6c4170b06c788a705430adf71bad2b5b057d03606a1ed7ebf5babd7a41cf00b0ef83a6569632cd467faddec9
+699640f6719e76b7d6ac355c7c89feca9cccad4ea7d36c65b258a206641f1b73f8b5da6a6373d9c11b90c537e7f08dce66b7bbeae00dc8e257e7f0fd2badd586
+8b37a088d1e4600ead1ddaef67d40bc898b3ed4af81ac0d76a197c86826828a24bb318f3442d8ab518dfe3a20f000d6458d104a9694ac6d88728eee2782428d6
+0cf03ac1a5193be4cbb921cd0b495fd054b5bd0f530c1931a3f7eaf9f7af9e3f45c70f9e1d3ff8e9f8e1c3e3073f5a42ceaa6d9c84e5552fbffdeccfc71fa33f
+9e7ef3f2d117d57859c6fffac327bffcfc793510d26726ce8b2f9ffcf6ecc98baf3efdfdbb4715f04d814765f890c644a29be408edf3181433567125272371be
+15c308d3f28acd249438c19a4b05fd9e8a1cf4cd296699771c393ac4b5e01d01e5a30a787d72cf1178108989a2159c77a2d801ee72ce3a5c545a6147f32a9979
+3849c26ae66252c6ed637c58c5bb8b13c7bfbd490a75330f4b47f16e441c31f7184e140e494214d273fc80900aedee52ead87597fa824b3e56e82e451d4c2b4d
+32a423279a668bb6690c7e9956e90cfe766cb37b077538abd27a8b1cba48c80acc2a841f12e698f13a9e281c57911ce298950d7e03aba84ac8c154f8655c4f2a
+f074481847bd804859b5e696007d4b4edfc150b12addbecba6b18b148a1e54d1bc81392f23b7f84137c2715a851dd0242a633f900710a218ed715505dfe56e86
+e877f0034e16bafb0e258ebb4faf06b769e888340b103d331115bebc4eb813bf83291b63624a0d1475a756c734f9bbc2cd28546ecbe1e20a3794ca175f3fae90
+fb6d2dd99bb07b55e5ccf68942bd0877b23c77b908e8db5f9db7f024d9239010f35bd4bbe2fcae387bfff9e2bc289f2fbe24cfaa301468dd8bd846dbb4ddf1c2
+ae7b4c191ba8292337a469bc25ec3d411f06f53a73e224c5292c8de0516732307070a1c0660d125c7d44553488700a4d7bddd3444299910e254ab984c3a219ae
+a4adf1d0f82b7bd46cea4388ad1c12ab5d1ed8e1153d9c9f350a3246aad01c6873462b9ac05999ad5cc988826eafc3acae853a33b7ba11cd1445875ba1b236b1
+399483c90bd560b0b0263435085a21b0f22a9cf9356b38ec6046026d77eba3dc2dc60b17e92219e180643ed27acffba86e9c94c7ca9c225a0f1b0cfae0788ad5
+4adc5a9aec1b703b8b93caec1a0bd8e5de7b132fe5113cf312503b998e2c2927274bd051db6b35979b1ef271daf6c6704e86c73805af4bdd476216c26593af84
+0dfb5393d964f9cc9bad5c313709ea70f561ed3ea7b053075221d51696910d0d339585004b34272bff7213cc7a510a5454a3b349b1b206c1f0af490176745d4b
+c663e2abb2b34b23da76f6352ba57ca2881844c1111ab189d8c7e07e1daaa04f40255c77988aa05fe06e4e5bdb4cb9c5394bbaf28d98c1d971ccd20867e556a7
+689ec9166e0a522183792b8907ba55ca6e943bbf2a26e52f48957218ffcf54d1fb09dc3eac04da033e5c0d0b8c74a6b43d2e54c4a10aa511f5fb021a07533b20
+5ae07e17a621a8e082dafc17e450ffb739676998b48643a4daa7211214f623150942f6a02c99e83b85583ddbbb2c4996113211551257a656ec1139246ca86be0
+aadedb3d1441a89b6a929501833b197fee7b9641a3503739e57c732a59b1f7da1cf8a73b1f9bcca0945b874d4393dbbf10b1680f66bbaa5d6f96e77b6f59113d
+316bb31a795600b3d256d0cad2fe354538e7566b2bd69cc6cbcd5c38f0e2bcc63058344429dc2121fd07f63f2a7c66bf76e80d75c8f7a1b622f878a18941d840
+545fb28d07d205d20e8ea071b283369834296bdaac75d256cb37eb0bee740bbe278cad253b8bbfcf69eca23973d939b97891c6ce2cecd8da8e2d343578f6648a
+c2d0383fc818c798cf64e52f597c740f1cbd05df0c264c49134cf09d4a60e8a107260f20f92d47b374e32f000000ffff0300504b030414000600080000002100
+0dd1909fb60000001b010000270000007468656d652f7468656d652f5f72656c732f7468656d654d616e616765722e786d6c2e72656c73848f4d0ac2301484f7
+8277086f6fd3ba109126dd88d0add40384e4350d363f2451eced0dae2c082e8761be9969bb979dc9136332de3168aa1a083ae995719ac16db8ec8e4052164e89
+d93b64b060828e6f37ed1567914b284d262452282e3198720e274a939cd08a54f980ae38a38f56e422a3a641c8bbd048f7757da0f19b017cc524bd62107bd500
+1996509affb3fd381a89672f1f165dfe514173d9850528a2c6cce0239baa4c04ca5bbabac4df000000ffff0300504b01022d0014000600080000002100e9de0f
+bfff0000001c0200001300000000000000000000000000000000005b436f6e74656e745f54797065735d2e786d6c504b01022d0014000600080000002100a5d6
+a7e7c0000000360100000b00000000000000000000000000300100005f72656c732f2e72656c73504b01022d00140006000800000021006b799616830000008a
+0000001c00000000000000000000000000190200007468656d652f7468656d652f7468656d654d616e616765722e786d6c504b01022d00140006000800000021
+0030dd4329a8060000a41b00001600000000000000000000000000d60200007468656d652f7468656d652f7468656d65312e786d6c504b01022d001400060008
+00000021000dd1909fb60000001b0100002700000000000000000000000000b20900007468656d652f7468656d652f5f72656c732f7468656d654d616e616765722e786d6c2e72656c73504b050600000000050005005d010000ad0a00000000}
+{\*\colorschememapping 3c3f786d6c2076657273696f6e3d22312e302220656e636f64696e673d225554462d3822207374616e64616c6f6e653d22796573223f3e0d0a3c613a636c724d
+617020786d6c6e733a613d22687474703a2f2f736368656d61732e6f70656e786d6c666f726d6174732e6f72672f64726177696e676d6c2f323030362f6d6169
+6e22206267313d226c743122207478313d22646b3122206267323d226c743222207478323d22646b322220616363656e74313d22616363656e74312220616363
+656e74323d22616363656e74322220616363656e74333d22616363656e74332220616363656e74343d22616363656e74342220616363656e74353d22616363656e74352220616363656e74363d22616363656e74362220686c696e6b3d22686c696e6b2220666f6c486c696e6b3d22666f6c486c696e6b222f3e}
+{\*\latentstyles\lsdstimax267\lsdlockeddef0\lsdsemihiddendef1\lsdunhideuseddef1\lsdqformatdef0\lsdprioritydef99{\lsdlockedexcept \lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority0 \lsdlocked0 Normal;
+\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 1;\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 2;\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 3;\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 4;
+\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 5;\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 6;\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 7;\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 8;\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 9;
+\lsdpriority39 \lsdlocked0 toc 1;\lsdpriority39 \lsdlocked0 toc 2;\lsdpriority39 \lsdlocked0 toc 3;\lsdpriority39 \lsdlocked0 toc 4;\lsdpriority39 \lsdlocked0 toc 5;\lsdpriority39 \lsdlocked0 toc 6;\lsdpriority39 \lsdlocked0 toc 7;
+\lsdpriority39 \lsdlocked0 toc 8;\lsdpriority39 \lsdlocked0 toc 9;\lsdqformat1 \lsdpriority35 \lsdlocked0 caption;\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority10 \lsdlocked0 Title;\lsdpriority1 \lsdlocked0 Default Paragraph Font;
+\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority11 \lsdlocked0 Subtitle;\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority22 \lsdlocked0 Strong;\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority20 \lsdlocked0 Emphasis;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority59 \lsdlocked0 Table Grid;\lsdunhideused0 \lsdlocked0 Placeholder Text;\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority1 \lsdlocked0 No Spacing;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority60 \lsdlocked0 Light Shading;\lsdsemihidden0 \lsdunhideused0 \lsdpriority61 \lsdlocked0 Light List;\lsdsemihidden0 \lsdunhideused0 \lsdpriority62 \lsdlocked0 Light Grid;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority63 \lsdlocked0 Medium Shading 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority64 \lsdlocked0 Medium Shading 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority65 \lsdlocked0 Medium List 1;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority66 \lsdlocked0 Medium List 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority67 \lsdlocked0 Medium Grid 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority68 \lsdlocked0 Medium Grid 2;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority69 \lsdlocked0 Medium Grid 3;\lsdsemihidden0 \lsdunhideused0 \lsdpriority70 \lsdlocked0 Dark List;\lsdsemihidden0 \lsdunhideused0 \lsdpriority71 \lsdlocked0 Colorful Shading;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority72 \lsdlocked0 Colorful List;\lsdsemihidden0 \lsdunhideused0 \lsdpriority73 \lsdlocked0 Colorful Grid;\lsdsemihidden0 \lsdunhideused0 \lsdpriority60 \lsdlocked0 Light Shading Accent 1;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority61 \lsdlocked0 Light List Accent 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority62 \lsdlocked0 Light Grid Accent 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 1;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority65 \lsdlocked0 Medium List 1 Accent 1;\lsdunhideused0 \lsdlocked0 Revision;
+\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority34 \lsdlocked0 List Paragraph;\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority29 \lsdlocked0 Quote;\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority30 \lsdlocked0 Intense Quote;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority66 \lsdlocked0 Medium List 2 Accent 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 1;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority70 \lsdlocked0 Dark List Accent 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority71 \lsdlocked0 Colorful Shading Accent 1;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority72 \lsdlocked0 Colorful List Accent 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority73 \lsdlocked0 Colorful Grid Accent 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority60 \lsdlocked0 Light Shading Accent 2;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority61 \lsdlocked0 Light List Accent 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority62 \lsdlocked0 Light Grid Accent 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 2;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority65 \lsdlocked0 Medium List 1 Accent 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority66 \lsdlocked0 Medium List 2 Accent 2;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 2;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority70 \lsdlocked0 Dark List Accent 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority71 \lsdlocked0 Colorful Shading Accent 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority72 \lsdlocked0 Colorful List Accent 2;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority73 \lsdlocked0 Colorful Grid Accent 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority60 \lsdlocked0 Light Shading Accent 3;\lsdsemihidden0 \lsdunhideused0 \lsdpriority61 \lsdlocked0 Light List Accent 3;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority62 \lsdlocked0 Light Grid Accent 3;\lsdsemihidden0 \lsdunhideused0 \lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 3;\lsdsemihidden0 \lsdunhideused0 \lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 3;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority65 \lsdlocked0 Medium List 1 Accent 3;\lsdsemihidden0 \lsdunhideused0 \lsdpriority66 \lsdlocked0 Medium List 2 Accent 3;\lsdsemihidden0 \lsdunhideused0 \lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 3;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 3;\lsdsemihidden0 \lsdunhideused0 \lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 3;\lsdsemihidden0 \lsdunhideused0 \lsdpriority70 \lsdlocked0 Dark List Accent 3;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority71 \lsdlocked0 Colorful Shading Accent 3;\lsdsemihidden0 \lsdunhideused0 \lsdpriority72 \lsdlocked0 Colorful List Accent 3;\lsdsemihidden0 \lsdunhideused0 \lsdpriority73 \lsdlocked0 Colorful Grid Accent 3;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority60 \lsdlocked0 Light Shading Accent 4;\lsdsemihidden0 \lsdunhideused0 \lsdpriority61 \lsdlocked0 Light List Accent 4;\lsdsemihidden0 \lsdunhideused0 \lsdpriority62 \lsdlocked0 Light Grid Accent 4;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 4;\lsdsemihidden0 \lsdunhideused0 \lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 4;\lsdsemihidden0 \lsdunhideused0 \lsdpriority65 \lsdlocked0 Medium List 1 Accent 4;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority66 \lsdlocked0 Medium List 2 Accent 4;\lsdsemihidden0 \lsdunhideused0 \lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 4;\lsdsemihidden0 \lsdunhideused0 \lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 4;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 4;\lsdsemihidden0 \lsdunhideused0 \lsdpriority70 \lsdlocked0 Dark List Accent 4;\lsdsemihidden0 \lsdunhideused0 \lsdpriority71 \lsdlocked0 Colorful Shading Accent 4;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority72 \lsdlocked0 Colorful List Accent 4;\lsdsemihidden0 \lsdunhideused0 \lsdpriority73 \lsdlocked0 Colorful Grid Accent 4;\lsdsemihidden0 \lsdunhideused0 \lsdpriority60 \lsdlocked0 Light Shading Accent 5;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority61 \lsdlocked0 Light List Accent 5;\lsdsemihidden0 \lsdunhideused0 \lsdpriority62 \lsdlocked0 Light Grid Accent 5;\lsdsemihidden0 \lsdunhideused0 \lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 5;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 5;\lsdsemihidden0 \lsdunhideused0 \lsdpriority65 \lsdlocked0 Medium List 1 Accent 5;\lsdsemihidden0 \lsdunhideused0 \lsdpriority66 \lsdlocked0 Medium List 2 Accent 5;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 5;\lsdsemihidden0 \lsdunhideused0 \lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 5;\lsdsemihidden0 \lsdunhideused0 \lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 5;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority70 \lsdlocked0 Dark List Accent 5;\lsdsemihidden0 \lsdunhideused0 \lsdpriority71 \lsdlocked0 Colorful Shading Accent 5;\lsdsemihidden0 \lsdunhideused0 \lsdpriority72 \lsdlocked0 Colorful List Accent 5;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority73 \lsdlocked0 Colorful Grid Accent 5;\lsdsemihidden0 \lsdunhideused0 \lsdpriority60 \lsdlocked0 Light Shading Accent 6;\lsdsemihidden0 \lsdunhideused0 \lsdpriority61 \lsdlocked0 Light List Accent 6;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority62 \lsdlocked0 Light Grid Accent 6;\lsdsemihidden0 \lsdunhideused0 \lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 6;\lsdsemihidden0 \lsdunhideused0 \lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 6;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority65 \lsdlocked0 Medium List 1 Accent 6;\lsdsemihidden0 \lsdunhideused0 \lsdpriority66 \lsdlocked0 Medium List 2 Accent 6;\lsdsemihidden0 \lsdunhideused0 \lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 6;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 6;\lsdsemihidden0 \lsdunhideused0 \lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 6;\lsdsemihidden0 \lsdunhideused0 \lsdpriority70 \lsdlocked0 Dark List Accent 6;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority71 \lsdlocked0 Colorful Shading Accent 6;\lsdsemihidden0 \lsdunhideused0 \lsdpriority72 \lsdlocked0 Colorful List Accent 6;\lsdsemihidden0 \lsdunhideused0 \lsdpriority73 \lsdlocked0 Colorful Grid Accent 6;
+\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority19 \lsdlocked0 Subtle Emphasis;\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority21 \lsdlocked0 Intense Emphasis;
+\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority31 \lsdlocked0 Subtle Reference;\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority32 \lsdlocked0 Intense Reference;
+\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority33 \lsdlocked0 Book Title;\lsdpriority37 \lsdlocked0 Bibliography;\lsdqformat1 \lsdpriority39 \lsdlocked0 TOC Heading;}}{\*\datastore 010500000200000018000000
+4d73786d6c322e534158584d4c5265616465722e362e3000000000000000000000060000
+d0cf11e0a1b11ae1000000000000000000000000000000003e000300feff090006000000000000000000000001000000010000000000000000100000feffffff00000000feffffff0000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+fffffffffffffffffdfffffffeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+ffffffffffffffffffffffffffffffff52006f006f007400200045006e00740072007900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016000500ffffffffffffffffffffffff0c6ad98892f1d411a65f0040963251e50000000000000000000000008062
+b5795b1ecd01feffffff00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff00000000000000000000000000000000000000000000000000000000
+00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff0000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000105000000000000}}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid.csproj b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid.csproj
new file mode 100644
index 00000000..8ef843d3
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid.csproj	
@@ -0,0 +1,489 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{A344305F-D2E2-4350-B61E-D7277959A5B4}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>DevComponents.DotNetBar.SuperGrid</RootNamespace>
+    <AssemblyName>DevComponents.DotNetBar.SuperGrid</AssemblyName>
+    <StartupObject>
+    </StartupObject>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>SuperGrid.snk</AssemblyOriginatorKeyFile>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <OldToolsVersion>2.0</OldToolsVersion>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;SUPERGRID</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <DocumentationFile>bin\Debug\DevComponents.DotNetBar.SuperGrid.XML</DocumentationFile>
+    <PlatformTarget>x86</PlatformTarget>
+    <NoWarn>
+    </NoWarn>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE;SUPERGRID</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <DocumentationFile>bin\Release\DevComponents.DotNetBar.SuperGrid.XML</DocumentationFile>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseTrialSG|AnyCPU' ">
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>SUPERGRID;TRIAL</DefineConstants>
+    <DocumentationFile>bin\Release\DevComponents.DotNetBar.SuperGrid.XML</DocumentationFile>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseTrial|AnyCPU' ">
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE;SUPERGRID;TRIAL</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <DocumentationFile>bin\Release\DevComponents.DotNetBar.SuperGrid.XML</DocumentationFile>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Deployment" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="ContentManager\BlockLayoutManager.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ContentManager\Enums.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ContentManager\IBlock.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ContentManager\IBlockExtended.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ContentManager\IContentLayoutManager.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ContentManager\SerialContentLayoutManager.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Helpers\ColorHelpers.cs" />
+    <Compile Include="Helpers\ConvertValue.cs" />
+    <Compile Include="Helpers\DragDrop.cs" />
+    <Compile Include="Helpers\TextHelpers.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="SuperGrid\FloatWindow.resx">
+      <SubType>Designer</SubType>
+      <DependentUpon>FloatWindow.cs</DependentUpon>
+    </EmbeddedResource>
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+      <DesignTime>True</DesignTime>
+    </Compile>
+    <None Include="Properties\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
+    <EmbeddedResource Include="SampleExpr.rtf" />
+    <None Include="SuperGrid.snk" />
+    <Compile Include="Properties\Settings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
+    <Compile Include="SuperGrid\CellEditors\GridColorPickerEditControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SuperGrid\CellEditors\GridComboTreeEditControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SuperGrid\CellEditors\GridRadialMenuEditControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SuperGrid\CellEditors\GridRatingStarEditControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SuperGrid\CellEditors\GridImageEditControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SuperGrid\CellEditors\GridComboBoxExEditControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SuperGrid\CellEditors\GridBubbleBarEditControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SuperGrid\CellEditors\GridTextBoxDropDownEditControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SuperGrid\CellEditors\GridMaskedTextBoxEditControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SuperGrid\CellEditors\GridIpAddressInputEditControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SuperGrid\CellEditors\GridLabelXEditControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SuperGrid\CellEditors\GridProgressBarXEditControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SuperGrid\CellEditors\GridCheckBoxEditControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SuperGrid\CellEditors\GridTrackBarEditControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SuperGrid\CellEditors\GridNumericUpDownEditControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SuperGrid\CellEditors\GridLabelEditControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SuperGrid\CellEditors\GridDateTimePickerEditControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SuperGrid\CellEditors\GridSwitchButtonEditControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SuperGrid\CellEditors\GridGaugeEditControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SuperGrid\CellEditors\GridButtonXEditControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SuperGrid\CellEditors\GridButtonEditControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SuperGrid\CellEditors\GridMicroChartEditControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SuperGrid\CellEditors\IGridCellEditControl.cs" />
+    <Compile Include="SuperGrid\CellEditors\GridDateTimeInputEditControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SuperGrid\CellEditors\GridSliderEditControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SuperGrid\CellEditors\GridDoubleInputEditControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SuperGrid\CellEditors\GridIntegerInputEditControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SuperGrid\CellEditors\GridCheckBoxXEditControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SuperGrid\CellEditors\GridTextBoxXEditControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SuperGrid\CellEditors\EditorPanel.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SuperGrid\CellInfoWindow.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="SuperGrid\CellInfoWindow.Designer.cs">
+      <DependentUpon>CellInfoWindow.cs</DependentUpon>
+    </Compile>
+    <Compile Include="SuperGrid\Primitives\SymbolDef.cs" />
+    <Compile Include="SuperGrid\SortableBindingList.cs" />
+    <Compile Include="SuperGrid\DataBinder.cs" />
+    <Compile Include="SuperGrid\EEval.cs" />
+    <Compile Include="SuperGrid\FloatWindow.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="SuperGrid\FloatWindow.Designer.cs">
+      <DependentUpon>FloatWindow.cs</DependentUpon>
+    </Compile>
+    <Compile Include="SuperGrid\GridCaption.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SuperGrid\GridColumn.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SuperGrid\GridColumnCollection.cs" />
+    <Compile Include="SuperGrid\GridColumnGroupHeader.cs" />
+    <Compile Include="SuperGrid\GridColumnHeader.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SuperGrid\GridFilter\CustomFilter.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="SuperGrid\GridFilter\CustomFilter.Designer.cs">
+      <DependentUpon>CustomFilter.cs</DependentUpon>
+    </Compile>
+    <Compile Include="SuperGrid\GridFilter\CustomFilterEx.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="SuperGrid\GridFilter\CustomFilterEx.Designer.cs">
+      <DependentUpon>CustomFilterEx.cs</DependentUpon>
+    </Compile>
+    <Compile Include="SuperGrid\GridFilter\DataFilter.cs" />
+    <Compile Include="SuperGrid\GridFilter\FilterDateTimePicker.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="SuperGrid\GridFilter\FilterDateTimePicker.Designer.cs">
+      <DependentUpon>FilterDateTimePicker.cs</DependentUpon>
+    </Compile>
+    <Compile Include="SuperGrid\GridFilter\FilterEval.cs" />
+    <Compile Include="SuperGrid\GridFilter\FilterExprEdit.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="SuperGrid\GridFilter\FilterExprEdit.Designer.cs">
+      <DependentUpon>FilterExprEdit.cs</DependentUpon>
+    </Compile>
+    <Compile Include="SuperGrid\GridFilter\FilterPanel.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SuperGrid\GridFilter\FilterPopup.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SuperGrid\GridFilter\FilterScan.cs" />
+    <Compile Include="SuperGrid\GridFilter\FilterUserData.cs" />
+    <Compile Include="SuperGrid\GridFilter\GridFilter.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SuperGrid\GridFilter\PopupControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SuperGrid\GridFilter\Rtf.cs" />
+    <Compile Include="SuperGrid\GridFilter\SampleExpr.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="SuperGrid\GridFilter\SampleExpr.Designer.cs">
+      <DependentUpon>SampleExpr.cs</DependentUpon>
+    </Compile>
+    <Compile Include="SuperGrid\GridFooter.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SuperGrid\GridGroupBy.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SuperGrid\GridHeader.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SuperGrid\GridMerge\CellRange.cs" />
+    <Compile Include="SuperGrid\GridMerge\MergeScan.cs" />
+    <Compile Include="SuperGrid\GridTextRow.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SuperGrid\GridTitle.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SuperGrid\Licensing.cs" />
+    <Compile Include="SuperGrid\SelectedElementCollection.cs" />
+    <Compile Include="SuperGrid\SelectedElements.cs" />
+    <Compile Include="SuperGrid\Style\BackColorBlend.cs" />
+    <Compile Include="SuperGrid\Style\BaseRowHeaderVisualStyle.cs" />
+    <Compile Include="SuperGrid\Style\BaseVisualStyle.cs" />
+    <Compile Include="SuperGrid\Style\BorderPattern.cs" />
+    <Compile Include="SuperGrid\Style\ColumnHeaderRowStyle.cs" />
+    <Compile Include="SuperGrid\Style\ColumnHeaderVisualStyle.cs" />
+    <Compile Include="SuperGrid\Style\FilterColumnHeaderVisualStyle.cs" />
+    <Compile Include="SuperGrid\Style\FilterRowVisualStyles.cs" />
+    <Compile Include="SuperGrid\Style\GroupByVisualStyles.cs" />
+    <Compile Include="SuperGrid\Style\GroupHeaderVisualStyle.cs" />
+    <Compile Include="SuperGrid\Style\GridPanelVisualStyle.cs" />
+    <Compile Include="SuperGrid\Style\RowHeaderVisualStyle.cs" />
+    <Compile Include="SuperGrid\Style\RowVisualStyle.cs" />
+    <Compile Include="SuperGrid\Style\TextRowVisualStyle.cs" />
+    <Compile Include="SuperGrid\Style\TreeButtonVisualStyle.cs" />
+    <Compile Include="SuperGrid\Style\VisualStyle.cs" />
+    <Compile Include="SuperGrid\Style\VisualStyles.cs" />
+    <Compile Include="SuperGrid\Style\DefaultVisualStyles.cs" />
+    <Compile Include="SuperGrid\GridCell.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SuperGrid\GridCellCollection.cs" />
+    <Compile Include="SuperGrid\GridContainer.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SuperGrid\GridGroup.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SuperGrid\GridLayoutInfo.cs" />
+    <Compile Include="SuperGrid\GridPanel.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SuperGrid\GridRenderInfo.cs" />
+    <Compile Include="SuperGrid\GridRow.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SuperGrid\GridVirtualRowCollection.cs" />
+    <Compile Include="SuperGrid\Primitives\CustomCollection.cs" />
+    <Compile Include="SuperGrid\Style\Background.cs" />
+    <Compile Include="SuperGrid\Style\BorderColor.cs" />
+    <Compile Include="SuperGrid\CheckDisplay.cs" />
+    <Compile Include="SuperGrid\ExpandDisplay.cs" />
+    <Compile Include="SuperGrid\Style\Padding.cs" />
+    <Compile Include="SuperGrid\Style\CellVisualStyle.cs" />
+    <Compile Include="SuperGrid\Style\Thickness.cs" />
+    <Compile Include="SuperGrid\SuperGridControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SuperGrid\GridElement.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SuperGrid\GridItemsCollection.cs" />
+    <Compile Include="SuperGrid\TextDrawing.cs" />
+    <Compile Include="SuperGrid\TreeDisplay.cs" />
+    <Compile Include="TextMarkup\BodyElement.cs" />
+    <Compile Include="TextMarkup\ContainerElement.cs" />
+    <Compile Include="TextMarkup\Div.cs" />
+    <Compile Include="TextMarkup\EndMarkupElement.cs" />
+    <Compile Include="TextMarkup\ExpandElement.cs" />
+    <Compile Include="TextMarkup\FontChangeElement.cs" />
+    <Compile Include="TextMarkup\FontElement.cs" />
+    <Compile Include="TextMarkup\Heading.cs" />
+    <Compile Include="TextMarkup\HyperLink.cs" />
+    <Compile Include="TextMarkup\IActiveMarkupElement.cs" />
+    <Compile Include="TextMarkup\ImageElement.cs" />
+    <Compile Include="TextMarkup\Italic.cs" />
+    <Compile Include="TextMarkup\MarkupDrawContext.cs" />
+    <Compile Include="TextMarkup\MarkupElement.cs" />
+    <Compile Include="TextMarkup\MarkupElementCollection.cs" />
+    <Compile Include="TextMarkup\MarkupLayoutManager.cs" />
+    <Compile Include="TextMarkup\MarkupParser.cs" />
+    <Compile Include="TextMarkup\MarkupSettings.cs" />
+    <Compile Include="TextMarkup\NewLine.cs" />
+    <Compile Include="TextMarkup\Paragraph.cs" />
+    <Compile Include="TextMarkup\Span.cs" />
+    <Compile Include="TextMarkup\Strike.cs" />
+    <Compile Include="TextMarkup\Strong.cs" />
+    <Compile Include="TextMarkup\TextElement.cs" />
+    <Compile Include="TextMarkup\Underline.cs" />
+    <Compile Include="VisualStyles\MetroStyleFactory.cs" />
+    <Compile Include="VisualStyles\Office2010BlackStyleFactory.cs" />
+    <Compile Include="VisualStyles\Office2010BlueStyleFactory.cs" />
+    <Compile Include="VisualStyles\Office2010SilverStyleFactory.cs" />
+    <Compile Include="VisualStyles\VisualStyleFactory.cs" />
+    <Compile Include="VisualStyles\VisualStylesTable.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Pencil3.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="InsertRow.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="InfoImage.png" />
+    <EmbeddedResource Include="SuperGrid\CellInfoWindow.resx">
+      <SubType>Designer</SubType>
+      <DependentUpon>CellInfoWindow.cs</DependentUpon>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="SuperGridControl.png" />
+    <EmbeddedResource Include="SuperGrid\GridFilter\CustomFilter.resx">
+      <DependentUpon>CustomFilter.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="SuperGrid\GridFilter\CustomFilterEx.resx">
+      <DependentUpon>CustomFilterEx.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="SuperGrid\GridFilter\FilterDateTimePicker.resx">
+      <DependentUpon>FilterDateTimePicker.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="SuperGrid\GridFilter\FilterExprEdit.resx">
+      <DependentUpon>FilterExprEdit.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="SuperGrid\GridFilter\SampleExpr.resx">
+      <DependentUpon>SampleExpr.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\DotNetBar.csproj">
+      <Project>{36546CE3-335C-4AB6-A2F3-40F8C818BC66}</Project>
+      <Name>DotNetBar</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\InstrumentationControls\DevComponents.Instrumentation.csproj">
+      <Project>{3084E369-3D7B-4918-958F-2776DA03E6BC}</Project>
+      <Name>DevComponents.Instrumentation</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+      <Visible>False</Visible>
+      <ProductName>Windows Installer 3.1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="InfoImage16.png" />
+    <EmbeddedResource Include="InfoImage20.png" />
+    <EmbeddedResource Include="InfoImage24.png" />
+    <EmbeddedResource Include="InfoImage32.png" />
+    <EmbeddedResource Include="InsertRow16.png" />
+    <EmbeddedResource Include="InsertRow20.png" />
+    <EmbeddedResource Include="InsertRow24.png" />
+    <EmbeddedResource Include="InsertRow32.png" />
+    <EmbeddedResource Include="Pencil16.png" />
+    <EmbeddedResource Include="Pencil20.png" />
+    <EmbeddedResource Include="Pencil24.png" />
+    <EmbeddedResource Include="Pencil32.png" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid.snk b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid.snk
new file mode 100644
index 00000000..644c4bc8
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid.snk differ
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/EditorPanel.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/EditorPanel.cs
new file mode 100644
index 00000000..70c56cd6
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/EditorPanel.cs	
@@ -0,0 +1,105 @@
+using System.ComponentModel;
+using System.Drawing;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.SuperGrid.Style;
+
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    ///<summary>
+    /// EditorPanel
+    ///</summary>
+    [ToolboxItem(false)]
+    public class EditorPanel : Control
+    {
+        #region Private variables
+
+        private Size _SizeEx;
+        private Point _OffsetEx;
+        private GridCell _GridCell;
+
+        #endregion
+
+        ///<summary>
+        /// Constructor
+        ///</summary>
+        public EditorPanel()
+        {
+            SetStyle(ControlStyles.OptimizedDoubleBuffer, true);
+        }
+
+        #region Public properties
+
+        #region GridCell
+
+        ///<summary>
+        /// GridCell
+        ///</summary>
+        public GridCell GridCell
+        {
+            get { return (_GridCell); }
+            internal set { _GridCell = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region OffsetEx
+
+        internal Point OffsetEx
+        {
+            get { return (_OffsetEx); }
+            set { _OffsetEx = value; }
+        }
+
+        #endregion
+
+        #region SizeEx
+
+        internal Size SizeEx
+        {
+            get { return (_SizeEx); }
+            set { _SizeEx = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region OnPaintBackground
+
+        /// <summary>
+        /// Background painting
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnPaintBackground(PaintEventArgs e)
+        {
+            Graphics g = e.Graphics;
+
+            if (_GridCell != null && _GridCell.GridColumn != null)
+            {
+                Rectangle r = new Rectangle(_OffsetEx, _SizeEx);
+                VisualStyle style = _GridCell.GetEffectiveStyle();
+
+                if (r.IsEmpty == false)
+                {
+                    if (_GridCell.SuperGrid.DoPreRenderCellEvent(g, _GridCell, RenderParts.Background, r) == false)
+                    {
+                        using (Brush br = style.Background.GetBrush(r))
+                            g.FillRectangle(br, r);
+
+                        _GridCell.SuperGrid.DoPostRenderCellEvent(g, _GridCell, RenderParts.Background, r);
+                    }
+                }
+            }
+            else
+            {
+                base.OnPaintBackground(e);
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/GridBubbleBarEditControl.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/GridBubbleBarEditControl.cs
new file mode 100644
index 00000000..ff9e6966
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/GridBubbleBarEditControl.cs	
@@ -0,0 +1,517 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.SuperGrid.Style;
+
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    ///<summary>
+    /// GridCheckBoxEditControl
+    ///</summary>
+    [ToolboxItem(false)]
+    public class GridBubbleBarEditControl : BubbleBar, IGridCellEditControl
+    {
+        #region Private variables
+
+        private GridCell _Cell;
+        private EditorPanel _EditorPanel;
+        private Bitmap _EditorCellBitmap;
+
+        private bool _ValueChanged;
+        private bool _SuspendUpdate;
+
+        private StretchBehavior _StretchBehavior = StretchBehavior.Both;
+
+        #endregion
+
+        ///<summary>
+        /// GridBubbleBarEditControl
+        ///</summary>
+        public GridBubbleBarEditControl()
+        {
+            ShowTooltips = false;
+
+            ButtonClick += EditControlButtonClick;
+
+#if !TRIAL
+            LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F";
+#endif
+        }
+
+        #region Hidden properties
+
+        ///<summary>
+        /// ShowTooltips
+        ///</summary>
+        [Browsable(false)]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public new bool ShowTooltips
+        {
+            get { return (base.ShowTooltips); }
+            set { base.ShowTooltips = value; }
+        }
+
+        #endregion
+
+        #region EditControlButtonClick
+
+        private void EditControlButtonClick(object sender, ClickEventArgs e)
+        {
+            if (_SuspendUpdate == false)
+            {
+                if (_Cell != null)
+                {
+                    _Cell.Value = SelectedTab.Buttons.IndexOf((BubbleButton) sender);
+                    _Cell.EditorValueChanged(this);
+
+                    _Cell.EndEdit();
+                }
+            }
+        }
+
+        #endregion
+
+        #region OnInvalidated
+
+        /// <summary>
+        /// OnInvalidated
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnInvalidated(InvalidateEventArgs e)
+        {
+            base.OnInvalidated(e);
+
+            if (_Cell != null && _SuspendUpdate == false)
+                _Cell.InvalidateRender();
+        }
+
+        #endregion
+
+        #region OnPaint
+
+        /// <summary>
+        /// OnPaint
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            _Cell.PaintEditorBackground(e, this);
+
+            PaintControl(e);
+        }
+
+        #endregion
+
+        #region IGridCellEditControl Members
+
+        #region Public properties
+
+        #region CanInterrupt
+
+        /// <summary>
+        /// CanInterrupt
+        /// </summary>
+        public virtual bool CanInterrupt
+        {
+            get { return (true); }
+        }
+
+        #endregion
+
+        #region CellEditMode
+
+        /// <summary>
+        /// CellEditMode
+        /// </summary>
+        public CellEditMode CellEditMode
+        {
+            get { return (CellEditMode.Modal); }
+        }
+
+        #endregion
+
+        #region EditorCell
+
+        /// <summary>
+        /// EditorCell
+        /// </summary>
+        public GridCell EditorCell
+        {
+            get { return (_Cell); }
+            set { _Cell = value; }
+        }
+
+        #endregion
+
+        #region EditorCellBitmap
+
+        ///<summary>
+        /// EditorCellBitmap
+        ///</summary>
+        public Bitmap EditorCellBitmap
+        {
+            get { return (_EditorCellBitmap); }
+
+            set
+            {
+                if (_EditorCellBitmap != null)
+                    _EditorCellBitmap.Dispose();
+
+                _EditorCellBitmap = value;
+            }
+        }
+
+        #endregion
+
+        #region EditorFormattedValue
+
+        ///<summary>
+        /// EditorFormattedValue
+        ///</summary>
+        public virtual string EditorFormattedValue
+        {
+            get { return (Text); }
+        }
+
+        #endregion
+
+        #region EditorPanel
+
+        /// <summary>
+        /// EditorPanel
+        /// </summary>
+        public EditorPanel EditorPanel
+        {
+            get { return (_EditorPanel); }
+
+            set
+            {
+                if (_EditorPanel != null)
+                    _EditorPanel.VisibleChanged -= EditorPanelVisibleChanged;
+
+                _EditorPanel = value;
+
+                if (_EditorPanel != null)
+                    _EditorPanel.VisibleChanged += EditorPanelVisibleChanged;
+            }
+        }
+
+        void EditorPanelVisibleChanged(object sender, EventArgs e)
+        {
+            if (_EditorPanel.Visible == false)
+                StopBubbleEffect();
+        }
+
+        #endregion
+
+        #region EditorValue
+
+        /// <summary>
+        /// EditorValue
+        /// </summary>
+        public virtual object EditorValue
+        {
+            get { return (_Cell.Value); }
+            set { }
+        }
+
+        #endregion
+
+        #region EditorValueChanged
+
+        /// <summary>
+        /// EditorValueChanged
+        /// </summary>
+        public virtual bool EditorValueChanged
+        {
+            get { return (_ValueChanged); }
+
+            set
+            {
+                if (_ValueChanged != value)
+                {
+                    _ValueChanged = value;
+
+                    if (value == true)
+                        _Cell.SetEditorDirty(this);
+                }
+            }
+        }
+
+        #endregion
+
+        #region EditorValueType
+
+        ///<summary>
+        /// EditorValueType
+        ///</summary>
+        public virtual Type EditorValueType
+        {
+            get { return (typeof(string)); }
+        }
+
+        #endregion
+
+        #region StretchBehavior
+
+        /// <summary>
+        /// StretchBehavior
+        /// </summary>
+        public virtual StretchBehavior StretchBehavior
+        {
+            get { return (_StretchBehavior); }
+            set { _StretchBehavior = value; }
+        }
+
+        #endregion
+
+        #region SuspendUpdate
+
+        /// <summary>
+        /// SuspendUpdate
+        /// </summary>
+        public virtual bool SuspendUpdate
+        {
+            get { return (_SuspendUpdate); }
+            set { _SuspendUpdate = value; }
+        }
+
+        #endregion
+
+        #region ValueChangeBehavior
+
+        /// <summary>
+        /// ValueChangeBehavior
+        /// </summary>
+        public virtual ValueChangeBehavior ValueChangeBehavior
+        {
+            get { return (ValueChangeBehavior.None); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetProposedSize
+
+        ///<summary>
+        /// GetProposedSize
+        ///</summary>
+        ///<param name="g"></param>
+        ///<param name="cell"></param>
+        ///<param name="style"></param>
+        ///<param name="constraintSize"></param>
+        ///<returns></returns>
+        public virtual Size GetProposedSize(Graphics g,
+            GridCell cell, CellVisualStyle style, Size constraintSize)
+        {
+            Size size = GetPreferredSize(constraintSize);
+
+            if (constraintSize.Height == 0)
+                size.Height = Dpi.Height50;
+
+            return (size);
+        }
+
+        #endregion
+
+        #region InitializeContext
+
+        ///<summary>
+        /// InitializeContext
+        ///</summary>
+        ///<param name="cell"></param>
+        ///<param name="style"></param>
+        public virtual void InitializeContext(GridCell cell, CellVisualStyle style)
+        {
+            _Cell = cell;
+
+            if (style != null)
+            {
+                Enabled = (_Cell.IsReadOnly == false);
+
+                Font = style.Font;
+                ForeColor = style.TextColor;
+            }
+
+            _ValueChanged = false;
+        }
+
+        #endregion
+
+        #region Edit support
+
+        #region BeginEdit
+
+        /// <summary>
+        /// BeginEdit
+        /// </summary>
+        /// <param name="selectAll"></param>
+        /// <returns>false</returns>
+        public virtual bool BeginEdit(bool selectAll)
+        {
+            return (false);
+        }
+
+        #endregion
+
+        #region EndEdit
+
+        /// <summary>
+        /// EndEdit
+        /// </summary>
+        /// <returns></returns>
+        public virtual bool EndEdit()
+        {
+            return (false);
+        }
+
+        #endregion
+
+        #region CancelEdit
+
+        /// <summary>
+        /// CancelEdit
+        /// </summary>
+        /// <returns>false</returns>
+        public virtual bool CancelEdit()
+        {
+            return (false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region CellRender
+
+        /// <summary>
+        /// CellRender
+        /// </summary>
+        /// <param name="g"></param>
+        public virtual void CellRender(Graphics g)
+        {
+            _Cell.CellRender(this, g);
+        }
+
+        #endregion
+
+        #region Keyboard support
+
+        #region CellKeyDown
+
+        ///<summary>
+        /// CellKeyDown
+        ///</summary>
+        public virtual void CellKeyDown(KeyEventArgs e)
+        {
+            Focus();
+
+            switch (e.KeyData)
+            {
+                default:
+                    OnKeyDown(e);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region WantsInputKey
+
+        /// <summary>
+        /// WantsInputKey
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="gridWantsKey"></param>
+        /// <returns></returns>
+        public virtual bool WantsInputKey(Keys key, bool gridWantsKey)
+        {
+            switch (key & Keys.KeyCode)
+            {
+                case Keys.Space:
+                    return (true);
+
+                default:
+                    return (gridWantsKey == false);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Mouse support
+
+        #region OnCellMouseMove
+
+        ///<summary>
+        /// OnCellMouseMove
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseMove(MouseEventArgs e)
+        {
+            OnMouseMove(e);
+        }
+
+        #endregion
+
+        #region OnCellMouseEnter
+
+        ///<summary>
+        /// OnCellMouseEnter
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseEnter(EventArgs e)
+        {
+            OnMouseEnter(e);
+        }
+
+        #endregion
+
+        #region OnCellMouseLeave
+
+        ///<summary>
+        /// OnCellMouseLeave
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseLeave(EventArgs e)
+        {
+            OnMouseLeave(e);
+        }
+
+        #endregion
+
+        #region OnCellMouseUp
+
+        ///<summary>
+        /// OnCellMouseUp
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseUp(MouseEventArgs e)
+        {
+            OnMouseUp(e);
+        }
+
+        #endregion
+
+        #region OnCellMouseDown
+
+        ///<summary>
+        /// OnCellMouseDown
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseDown(MouseEventArgs e)
+        {
+            OnMouseDown(e);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/GridButtonEditControl.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/GridButtonEditControl.cs
new file mode 100644
index 00000000..a52dd70c
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/GridButtonEditControl.cs	
@@ -0,0 +1,501 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.SuperGrid.Style;
+
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    ///<summary>
+    /// GridButtonXEditControl
+    ///</summary>
+    [ToolboxItem(false)]
+    public class GridButtonEditControl : Button, IGridCellEditControl
+    {
+        #region Private variables
+
+        private GridCell _Cell;
+        private EditorPanel _EditorPanel;
+        private Bitmap _EditorCellBitmap;
+
+        private bool _ValueChanged;
+        private bool _SuspendUpdate;
+        private bool _UseCellValueAsButtonText = true;
+
+        private StretchBehavior _StretchBehavior = StretchBehavior.Both;
+
+        #endregion
+
+        ///<summary>
+        /// GridButtonEditControl
+        ///</summary>
+        public GridButtonEditControl()
+        {
+            AccessibleRole = AccessibleRole.PushButton;
+
+            Click += ButtonClick;
+        }
+
+        #region Public properties
+
+        #region UseCellValueAsButtonText
+
+        ///<summary>
+        /// UseCellValueAsButtonText
+        ///</summary>
+        public bool UseCellValueAsButtonText
+        {
+            get { return (_UseCellValueAsButtonText); }
+            set { _UseCellValueAsButtonText = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ButtonClick
+
+        private void ButtonClick(object sender, EventArgs e)
+        {
+            EditorValueChanged = true;
+        }
+
+        #endregion
+
+        #region OnInvalidated
+
+        /// <summary>
+        /// OnInvalidated
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnInvalidated(InvalidateEventArgs e)
+        {
+            base.OnInvalidated(e);
+
+            if (_Cell != null && _SuspendUpdate == false)
+                _Cell.InvalidateRender();
+        }
+
+        #endregion
+
+        #region GetValue
+
+        ///<summary>
+        /// GetValue
+        ///</summary>
+        ///<param name="value"></param>
+        ///<returns></returns>
+        public virtual string GetValue(object value)
+        {
+            if (_UseCellValueAsButtonText == false)
+                return (Text);
+
+            GridPanel panel = _Cell.GridPanel;
+
+            if (value == null ||
+                (panel.NullValue == NullValue.DBNull && value == DBNull.Value))
+            {
+                return (_Cell.NullString);
+            }
+
+            if (_Cell.IsValueExpression == true)
+                value = _Cell.GetExpValue((string)value);
+
+            return (value.ToString());
+        }
+
+        #endregion
+
+        #region IGridCellEditControl Members
+
+        #region Public properties
+
+        #region CanInterrupt
+
+        /// <summary>
+        /// CanInterrupt
+        /// </summary>
+        public bool CanInterrupt
+        {
+            get { return (true); }
+        }
+
+        #endregion
+
+        #region CellEditMode
+
+        /// <summary>
+        /// CellEditMode
+        /// </summary>
+        public CellEditMode CellEditMode
+        {
+            get { return (CellEditMode.InPlace); }
+        }
+
+        #endregion
+
+        #region EditorCell
+
+        /// <summary>
+        /// EditorCell
+        /// </summary>
+        public GridCell EditorCell
+        {
+            get { return (_Cell); }
+            set { _Cell = value; }
+        }
+
+        #endregion
+
+        #region EditorCellBitmap
+
+        ///<summary>
+        /// EditorCellBitmap
+        ///</summary>
+        public Bitmap EditorCellBitmap
+        {
+            get { return (_EditorCellBitmap); }
+
+            set
+            {
+                if (_EditorCellBitmap != null)
+                    _EditorCellBitmap.Dispose();
+
+                _EditorCellBitmap = value;
+            }
+        }
+
+        #endregion
+
+        #region EditorFormattedValue
+
+        ///<summary>
+        /// EditorFormattedValue
+        ///</summary>
+        public virtual string EditorFormattedValue
+        {
+            get { return (Text); }
+        }
+
+        #endregion
+
+        #region EditorPanel
+
+        /// <summary>
+        /// EditorPanel
+        /// </summary>
+        public EditorPanel EditorPanel
+        {
+            get { return (_EditorPanel); }
+            set { _EditorPanel = value; }
+        }
+
+        #endregion
+
+        #region EditorValue
+
+        /// <summary>
+        /// EditorValue
+        /// </summary>
+        public virtual object EditorValue
+        {
+            get { return (Text); }
+            set { Text = GetValue(value); }
+        }
+
+        #endregion
+
+        #region EditorValueChanged
+
+        /// <summary>
+        /// EditorValueChanged
+        /// </summary>
+        public virtual bool EditorValueChanged
+        {
+            get { return (_ValueChanged); }
+
+            set
+            {
+                if (_ValueChanged != value)
+                {
+                    _ValueChanged = value;
+
+                    if (value == true)
+                        _Cell.SetEditorDirty(this);
+                }
+            }
+        }
+
+        #endregion
+
+        #region EditorValueType
+
+        ///<summary>
+        /// EditorValueType
+        ///</summary>
+        public virtual Type EditorValueType
+        {
+            get { return (typeof(string)); }
+        }
+
+        #endregion
+
+        #region StretchBehavior
+
+        /// <summary>
+        /// StretchBehavior
+        /// </summary>
+        public virtual StretchBehavior StretchBehavior
+        {
+            get { return (_StretchBehavior); }
+            set { _StretchBehavior = value; }
+        }
+
+        #endregion
+
+        #region SuspendUpdate
+
+        /// <summary>
+        /// SuspendUpdate
+        /// </summary>
+        public virtual bool SuspendUpdate
+        {
+            get { return (_SuspendUpdate); }
+            set { _SuspendUpdate = value; }
+        }
+
+        #endregion
+
+        #region ValueChangeBehavior
+
+        /// <summary>
+        /// ValueChangeBehavior
+        /// </summary>
+        public virtual ValueChangeBehavior ValueChangeBehavior
+        {
+            get { return (ValueChangeBehavior.InvalidateRender); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InitializeContext
+
+        ///<summary>
+        /// InitializeContext
+        ///</summary>
+        ///<param name="cell"></param>
+        ///<param name="style"></param>
+        public virtual void InitializeContext(GridCell cell, CellVisualStyle style)
+        {
+            _Cell = cell;
+
+            if (style != null)
+            {
+                Enabled = (_Cell.IsReadOnly == false);
+
+                Font = style.Font;
+                ForeColor = style.TextColor;
+            }
+
+            Text = GetValue(_Cell.Value);
+
+            _ValueChanged = false;
+        }
+
+        #endregion
+
+        #region GetProposedSize
+
+        ///<summary>
+        /// GetProposedSize
+        ///</summary>
+        ///<param name="g"></param>
+        ///<param name="cell"></param>
+        ///<param name="style"></param>
+        ///<param name="constraintSize"></param>
+        ///<returns></returns>
+        public virtual Size GetProposedSize(Graphics g,
+            GridCell cell, CellVisualStyle style, Size constraintSize)
+        {
+            Size size = GetPreferredSize(constraintSize);
+
+            if (constraintSize.Height == 0)
+                size.Height = Dpi.Height23;
+
+            return (size);
+        }
+
+        #endregion
+
+        #region Edit support
+
+        #region BeginEdit
+
+        /// <summary>
+        /// BeginEdit
+        /// </summary>
+        /// <param name="selectAll"></param>
+        /// <returns></returns>
+        public virtual bool BeginEdit(bool selectAll)
+        {
+            return (false);
+        }
+
+        #endregion
+
+        #region EndEdit
+
+        /// <summary>
+        /// EndEdit
+        /// </summary>
+        /// <returns></returns>
+        public virtual bool EndEdit()
+        {
+            return (false);
+        }
+
+        #endregion
+
+        #region CancelEdit
+
+        /// <summary>
+        /// CancelEdit
+        /// </summary>
+        /// <returns></returns>
+        public virtual bool CancelEdit()
+        {
+            return (false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region CellRender
+
+        /// <summary>
+        /// CellRender
+        /// </summary>
+        /// <param name="g"></param>
+        public virtual void CellRender(Graphics g)
+        {
+            _Cell.CellRender(this, g);
+        }
+
+        #endregion
+
+        #region Keyboard support
+
+        #region CellKeyDown
+
+        ///<summary>
+        /// CellKeyDown
+        ///</summary>
+        public virtual void CellKeyDown(KeyEventArgs e)
+        {
+            OnKeyDown(e);
+        }
+
+        #endregion
+
+        #region WantsInputKey
+
+        /// <summary>
+        /// WantsInputKey
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="gridWantsKey"></param>
+        /// <returns></returns>
+        public virtual bool WantsInputKey(Keys key, bool gridWantsKey)
+        {
+            switch (key & Keys.KeyCode)
+            {
+                case Keys.Space:
+                    return (true);
+
+                default:
+                    return (gridWantsKey == false);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Mouse support
+
+        #region OnCellMouseMove
+
+        ///<summary>
+        /// OnCellMouseMove
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseMove(MouseEventArgs e)
+        {
+            OnMouseMove(e);
+        }
+
+        #endregion
+
+        #region OnCellMouseEnter
+
+        ///<summary>
+        /// OnCellMouseEnter
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseEnter(EventArgs e)
+        {
+            OnMouseEnter(e);
+        }
+
+        #endregion
+
+        #region OnCellMouseLeave
+
+        ///<summary>
+        /// OnCellMouseLeave
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseLeave(EventArgs e)
+        {
+            OnMouseLeave(e);
+        }
+
+        #endregion
+
+        #region OnCellMouseUp
+
+        ///<summary>
+        /// OnCellMouseUp
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseUp(MouseEventArgs e)
+        {
+            OnMouseUp(e);
+
+            if (Bounds.Contains(e.Location) == true)
+                OnClick(EventArgs.Empty);
+        }
+
+        #endregion
+
+        #region OnCellMouseDown
+
+        ///<summary>
+        /// OnCellMouseDown
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseDown(MouseEventArgs e)
+        {
+            OnMouseDown(e);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion  
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/GridButtonXEditControl.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/GridButtonXEditControl.cs
new file mode 100644
index 00000000..aaa5ef53
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/GridButtonXEditControl.cs	
@@ -0,0 +1,610 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.SuperGrid.Style;
+
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    ///<summary>
+    /// GridButtonXEditControl
+    ///</summary>
+    [ToolboxItem(false)]
+    public class GridButtonXEditControl : ButtonX, IGridCellEditControl
+    {
+        #region Private variables
+
+        private GridCell _Cell;
+        private EditorPanel _EditorPanel;
+        private Bitmap _EditorCellBitmap;
+
+        private bool _ValueChanged;
+        private bool _SuspendUpdate;
+        private bool _UseCellValueAsButtonText = true;
+
+        private StretchBehavior _StretchBehavior = StretchBehavior.Both;
+
+        #endregion
+
+        ///<summary>
+        /// GridButtXEditControl
+        ///</summary>
+        public GridButtonXEditControl()
+        {
+            AutoCheckOnClick = false;
+            AutoExpandOnClick = false;
+            AutoSizeMode = AutoSizeMode.GrowAndShrink;
+
+            ColorTable = eButtonColor.OrangeWithBackground;
+            Style = eDotNetBarStyle.StyleManagerControlled;
+
+            Click += ButtonXClick;
+            ButtonItem.ExpandChange += ButtonXExpandChanged;
+        }
+
+        #region Hidden properties
+
+        ///<summary>
+        /// AutoCheckOnClick
+        ///</summary>
+        [Browsable(false)]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public new bool AutoCheckOnClick
+        {
+            get { return (base.AutoCheckOnClick); }
+            set { base.AutoCheckOnClick = value; }
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region FocusCuesEnabled
+
+        /// <summary>
+        /// FocusCuesEnabled
+        /// </summary>
+        public override bool FocusCuesEnabled
+        {
+            get { return (false); }
+            set { base.FocusCuesEnabled = value; }
+        }
+
+        #endregion
+
+        #region UseCellValueAsButtonText
+
+        ///<summary>
+        /// UseCellValueAsButtonText
+        ///</summary>
+        public bool UseCellValueAsButtonText
+        {
+            get { return (_UseCellValueAsButtonText); }
+            set { _UseCellValueAsButtonText = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ButtonXExpandChanged
+
+        private void ButtonXExpandChanged(object sender, EventArgs e)
+        {
+            if (Expanded == false)
+            {
+                _Cell.SuperGrid.PostInternalMouseMove();
+                _Cell.SuperGrid.Focus();
+            }
+        }
+
+        #endregion
+
+        #region ButtonXClick
+
+        private void ButtonXClick(object sender, EventArgs e)
+        {
+            EditorValueChanged = true;
+        }
+
+        #endregion
+
+        #region OnInvalidated
+
+        /// <summary>
+        /// OnInvalidated
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnInvalidated(InvalidateEventArgs e)
+        {
+            base.OnInvalidated(e);
+
+            if (_Cell != null && _SuspendUpdate == false)
+                _Cell.InvalidateRender();
+        }
+
+        #endregion
+
+        #region GetValue
+
+        ///<summary>
+        /// GetValue
+        ///</summary>
+        ///<param name="value"></param>
+        ///<returns></returns>
+        public virtual string GetValue(object value)
+        {
+            if (_UseCellValueAsButtonText == false)
+                return (Text);
+
+            GridPanel panel = _Cell.GridPanel;
+
+            if (value == null ||
+                (panel.NullValue == NullValue.DBNull && value == DBNull.Value))
+            {
+                return (_Cell.NullString);
+            }
+
+            if (_Cell.IsValueExpression == true)
+                value = _Cell.GetExpValue((string)value);
+
+            return (value.ToString());
+        }
+
+        #endregion
+
+        #region IGridCellEditControl Members
+
+        #region Public properties
+
+        #region CanInterrupt
+
+        /// <summary>
+        /// CanInterrupt
+        /// </summary>
+        public bool CanInterrupt
+        {
+            get { return (Expanded == false && IsMouseDown == false); }
+        }
+
+        #endregion
+
+        #region CellEditMode
+
+        /// <summary>
+        /// CellEditMode
+        /// </summary>
+        public CellEditMode CellEditMode
+        {
+            get { return (CellEditMode.NonModal); }
+        }
+
+        #endregion
+
+        #region EditorCell
+
+        /// <summary>
+        /// EditorCell
+        /// </summary>
+        public GridCell EditorCell
+        {
+            get { return (_Cell); }
+            set { _Cell = value; }
+        }
+
+        #endregion
+
+        #region EditorCellBitmap
+
+        ///<summary>
+        /// EditorCellBitmap
+        ///</summary>
+        public Bitmap EditorCellBitmap
+        {
+            get { return (_EditorCellBitmap); }
+
+            set
+            {
+                if (_EditorCellBitmap != null)
+                    _EditorCellBitmap.Dispose();
+
+                _EditorCellBitmap = value;
+            }
+        }
+
+        #endregion
+
+        #region EditorFormattedValue
+
+        ///<summary>
+        /// EditorFormattedValue
+        ///</summary>
+        public virtual string EditorFormattedValue
+        {
+            get { return (Text); }
+        }
+
+        #endregion
+
+        #region EditorPanel
+
+        /// <summary>
+        /// EditorPanel
+        /// </summary>
+        public EditorPanel EditorPanel
+        {
+            get { return (_EditorPanel); }
+            set { _EditorPanel = value; }
+        }
+
+        #endregion
+
+        #region EditorValue
+
+        /// <summary>
+        /// EditorValue
+        /// </summary>
+        public virtual object EditorValue
+        {
+            get { return (Text); }
+            set { Text = GetValue(value); }
+        }
+
+        #endregion
+
+        #region EditorValueChanged
+
+        /// <summary>
+        /// EditorValueChanged
+        /// </summary>
+        public virtual bool EditorValueChanged
+        {
+            get { return (_ValueChanged); }
+
+            set
+            {
+                if (_ValueChanged != value)
+                {
+                    _ValueChanged = value;
+
+                    if (value == true)
+                        _Cell.SetEditorDirty(this);
+                }
+            }
+        }
+
+        #endregion
+
+        #region EditorValueType
+
+        ///<summary>
+        /// EditorValueType
+        ///</summary>
+        public virtual Type EditorValueType
+        {
+            get { return (typeof(string)); }
+        }
+
+        #endregion
+
+        #region StretchBehavior
+
+        /// <summary>
+        /// StretchBehavior
+        /// </summary>
+        public virtual StretchBehavior StretchBehavior
+        {
+            get { return (_StretchBehavior); }
+            set { _StretchBehavior = value; }
+        }
+
+        #endregion
+
+        #region SuspendUpdate
+
+        /// <summary>
+        /// SuspendUpdate
+        /// </summary>
+        public virtual bool SuspendUpdate
+        {
+            get { return (_SuspendUpdate); }
+            set { _SuspendUpdate = value; }
+        }
+
+        #endregion
+
+        #region ValueChangeBehavior
+
+        /// <summary>
+        /// ValueChangeBehavior
+        /// </summary>
+        public virtual ValueChangeBehavior ValueChangeBehavior
+        {
+            get { return (ValueChangeBehavior.InvalidateRender); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InitializeContext
+
+        ///<summary>
+        /// InitializeContext
+        ///</summary>
+        ///<param name="cell"></param>
+        ///<param name="style"></param>
+        public virtual void InitializeContext(GridCell cell, CellVisualStyle style)
+        {
+            _Cell = cell;
+
+            if (style != null)
+            {
+                Enabled = (_Cell.IsReadOnly == false);
+
+                Font = style.Font;
+                ForeColor = style.TextColor;
+            }
+
+            Text = GetValue(_Cell.Value);
+
+            _ValueChanged = false;
+        }
+
+        #endregion
+
+        #region GetProposedSize
+
+        ///<summary>
+        /// GetProposedSize
+        ///</summary>
+        ///<param name="g"></param>
+        ///<param name="cell"></param>
+        ///<param name="style"></param>
+        ///<param name="constraintSize"></param>
+        ///<returns></returns>
+        public virtual Size GetProposedSize(Graphics g,
+            GridCell cell, CellVisualStyle style, Size constraintSize)
+        {
+            // Perform a little kludge work here, since getting the base.PreferredSize
+            // on a button with empty text seems to add height to the size of the 
+            // button each time it is called.
+
+            string oldText = Text;
+
+            if (string.IsNullOrEmpty(Text))
+                Text = " ";
+
+            Size size = GetPreferredSize(constraintSize);
+
+            if (constraintSize.Width > 0)
+            {
+                ButtonItem.RecalcSize();
+
+                if (String.IsNullOrEmpty(ButtonItem.Text) == false)
+                {
+                    size = ButtonItem.TextDrawRect.Size;
+                    size.Height += Dpi.Height8;
+                }
+            }
+            else
+            {
+                size.Width += Dpi.Width1;
+            }
+
+            if (string.IsNullOrEmpty(oldText))
+                Text = oldText;
+
+            return (size);
+        }
+
+        #endregion
+
+        #region Edit support
+
+        #region BeginEdit
+
+        /// <summary>
+        /// BeginEdit
+        /// </summary>
+        /// <param name="selectAll"></param>
+        /// <returns></returns>
+        public virtual bool BeginEdit(bool selectAll)
+        {
+            return (false);
+        }
+
+        #endregion
+
+        #region EndEdit
+
+        /// <summary>
+        /// EndEdit
+        /// </summary>
+        /// <returns></returns>
+        public virtual bool EndEdit()
+        {
+            Expanded = false;
+
+            return (false);
+        }
+
+        #endregion
+
+        #region CancelEdit
+
+        /// <summary>
+        /// CancelEdit
+        /// </summary>
+        /// <returns></returns>
+        public virtual bool CancelEdit()
+        {
+            Expanded = false;
+
+            return (false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region CellRender
+
+        /// <summary>
+        /// CellRender
+        /// </summary>
+        /// <param name="g"></param>
+        public virtual void CellRender(Graphics g)
+        {
+            _Cell.CellRender(this, g);
+        }
+
+        #endregion
+
+        #region Keyboard support
+
+        #region CellKeyDown
+
+        ///<summary>
+        /// CellKeyDown
+        ///</summary>
+        public virtual void CellKeyDown(KeyEventArgs e)
+        {
+            OnKeyDown(e);
+            OnKeyUp(e);
+
+            Checked = false;
+        }
+
+        #endregion
+
+        #region WantsInputKey
+
+        /// <summary>
+        /// WantsInputKey
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="gridWantsKey"></param>
+        /// <returns></returns>
+        public virtual bool WantsInputKey(Keys key, bool gridWantsKey)
+        {
+            switch (key & Keys.KeyCode)
+            {
+                case Keys.Space:
+                    return (true);
+
+                default:
+                    return (gridWantsKey == false);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Mouse support
+
+        #region OnCellMouseMove
+
+        ///<summary>
+        /// OnCellMouseMove
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseMove(MouseEventArgs e)
+        {
+            OnMouseMove(e);
+        }
+
+        #endregion
+
+        #region OnCellMouseEnter
+
+        ///<summary>
+        /// OnCellMouseEnter
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseEnter(EventArgs e)
+        {
+            Point pt = _Cell.SuperGrid.PointToClient(MousePosition);
+
+            if (_Cell.Bounds.Contains(pt) == false)
+                StopFade();
+
+            OnMouseEnter(e);
+        }
+
+        #endregion
+
+        #region OnCellMouseLeave
+
+        ///<summary>
+        /// OnCellMouseLeave
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseLeave(EventArgs e)
+        {
+            if (_Cell != null)
+            {
+                Point pt = _Cell.SuperGrid.PointToClient(MousePosition);
+
+                if (_Cell.Bounds.Contains(pt) == false)
+                    StopFade();
+
+                OnMouseLeave(e);
+
+                _Cell.GridRow.EditorDirty = false;
+
+                Refresh();
+            }
+        }
+
+        #endregion
+
+        #region OnCellMouseUp
+
+        ///<summary>
+        /// OnCellMouseUp
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseUp(MouseEventArgs e)
+        {
+            OnMouseUp(e);
+        }
+
+        #endregion
+
+        #region OnCellMouseDown
+
+        ///<summary>
+        /// OnCellMouseDown
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseDown(MouseEventArgs e)
+        {
+            OnMouseDown(e);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion  
+
+        #region Dispose
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        /// <param name="disposing"></param>
+        protected override void Dispose(bool disposing)
+        {
+            Click -= ButtonXClick;
+            ButtonItem.ExpandChange -= ButtonXExpandChanged;
+
+            base.Dispose(disposing);
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/GridCheckBoxEditControl.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/GridCheckBoxEditControl.cs
new file mode 100644
index 00000000..75d936c2
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/GridCheckBoxEditControl.cs	
@@ -0,0 +1,612 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.SuperGrid.Style;
+
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    ///<summary>
+    /// GridCheckBoxEditControl
+    ///</summary>
+    [ToolboxItem(false)]
+    public class GridCheckBoxEditControl : CheckBox, IGridCellEditControl
+    {
+        #region Private variables
+
+        private GridCell _Cell;
+        private EditorPanel _EditorPanel;
+        private Bitmap _EditorCellBitmap;
+
+        private bool _ValueChanged;
+        private bool _SuspendUpdate;
+
+        private object _CheckValueChecked;
+        private object _CheckValueUnchecked;
+
+        private StretchBehavior _StretchBehavior = StretchBehavior.None;
+
+        #endregion
+
+        ///<summary>
+        /// GridCheckBoxEditControl
+        ///</summary>
+        public GridCheckBoxEditControl()
+        {
+            BackColor = Color.Transparent;
+
+            CheckedChanged += ControlCheckedChanged;
+        }
+
+        #region Public properties
+
+        #region CheckValueChecked
+
+        ///<summary>
+        /// CheckValueChecked
+        ///</summary>
+        public object CheckValueChecked
+        {
+            get { return (_CheckValueChecked); }
+            set { _CheckValueChecked = value; }
+        }
+
+        #endregion
+
+        #region CheckValueUnchecked
+
+        ///<summary>
+        /// CheckValueUnchecked
+        ///</summary>
+        public object CheckValueUnchecked
+        {
+            get { return (_CheckValueUnchecked); }
+            set { _CheckValueUnchecked = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ControlCheckedChanged
+
+        private void ControlCheckedChanged(object sender, EventArgs e)
+        {
+            if (_SuspendUpdate == false)
+            {
+                if (Checked == true)
+                    _Cell.Value = _CheckValueChecked ?? true;
+                else
+                    _Cell.Value = _CheckValueUnchecked ?? false;
+
+                _Cell.EditorValueChanged(this);
+            }
+        }
+
+        #endregion
+
+        #region OnInvalidated
+
+        /// <summary>
+        /// OnInvalidated
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnInvalidated(InvalidateEventArgs e)
+        {
+            base.OnInvalidated(e);
+
+            if (_Cell != null && _SuspendUpdate == false)
+                _Cell.InvalidateRender();
+        }
+
+        #endregion
+
+        #region GetValue
+
+        ///<summary>
+        /// GetValue
+        ///</summary>
+        ///<param name="value"></param>
+        ///<returns></returns>
+        ///<exception cref="Exception"></exception>
+        public virtual bool GetValue(object value)
+        {
+            GridPanel panel = _Cell.GridPanel;
+
+            if (value == null ||
+                (panel.NullValue == NullValue.DBNull && value == DBNull.Value))
+            {
+                return (false);
+            }
+
+            Type type = value.GetType();
+
+            if (CheckValueChecked != null)
+            {
+                if (value.Equals(CheckValueChecked))
+                    return (true);
+            }
+            else
+            {
+                if (type == typeof(bool))
+                    return ((bool)value);
+
+                if (type == typeof(string))
+                {
+                    string s = (string)value;
+
+                    if (_Cell.IsValueExpression == true)
+                        s = _Cell.GetExpValue(s);
+
+                    switch (s.ToLower())
+                    {
+                        case "y":
+                        case "yes":
+                        case "t":
+                        case "true":
+                        case "1":
+                            return (true);
+                    }
+                }
+                else
+                {
+                    int n = Convert.ToInt32(value);
+
+                    if (n == 1)
+                        return (true);
+                }
+            }
+
+            if (CheckValueUnchecked != null)
+            {
+                if (value.Equals(CheckValueUnchecked))
+                    return (true);
+            }
+            else
+            {
+                if (type == typeof(bool))
+                    return ((bool)value);
+
+                if (type == typeof(string))
+                {
+                    string s = (string)value;
+
+                    if (_Cell.IsValueExpression == true)
+                        s = _Cell.GetExpValue(s);
+
+                    switch (s.ToLower())
+                    {
+                        case "n":
+                        case "no":
+                        case "f":
+                        case "false":
+                        case "0":
+                            return (false);
+                    }
+                }
+                else
+                {
+                    int n = Convert.ToInt32(value);
+
+                    if (n == 0)
+                        return (false);
+                }
+            }
+
+            throw new Exception("Invalid checkBox cell value (" + value + ").");
+        }
+
+        #endregion
+
+        #region IGridCellEditControl Members
+
+        #region Public properties
+
+        #region CanInterrupt
+
+        /// <summary>
+        /// CanInterrupt
+        /// </summary>
+        public bool CanInterrupt
+        {
+            get { return (true); }
+        }
+
+        #endregion
+
+        #region CellEditMode
+
+        /// <summary>
+        /// CellEditMode
+        /// </summary>
+        public CellEditMode CellEditMode
+        {
+            get { return (CellEditMode.NonModal); }
+        }
+
+        #endregion
+
+        #region EditorCell
+
+        /// <summary>
+        /// EditorCell
+        /// </summary>
+        public GridCell EditorCell
+        {
+            get { return (_Cell); }
+            set { _Cell = value; }
+        }
+
+        #endregion
+
+        #region EditorCellBitmap
+
+        ///<summary>
+        /// EditorCellBitmap
+        ///</summary>
+        public Bitmap EditorCellBitmap
+        {
+            get { return (_EditorCellBitmap); }
+
+            set
+            {
+                if (_EditorCellBitmap != null)
+                    _EditorCellBitmap.Dispose();
+
+                _EditorCellBitmap = value;
+            }
+        }
+
+        #endregion
+
+        #region EditorFormattedValue
+
+        ///<summary>
+        /// EditorFormattedValue
+        ///</summary>
+        public virtual string EditorFormattedValue
+        {
+            get
+            {
+                if (_Cell != null && _Cell.IsValueNull == true)
+                    return (_Cell.NullString);
+                
+                return (Text);
+            }
+        }
+
+        #endregion
+
+        #region EditorPanel
+
+        /// <summary>
+        /// EditorPanel
+        /// </summary>
+        public EditorPanel EditorPanel
+        {
+            get { return (_EditorPanel); }
+            set { _EditorPanel = value; }
+        }
+
+        #endregion
+
+        #region EditorValue
+
+        /// <summary>
+        /// EditorValue
+        /// </summary>
+        public virtual object EditorValue
+        {
+            get { return (Checked); }
+            set { Checked = GetValue(value); }
+        }
+
+        #endregion
+
+        #region EditorValueChanged
+
+        /// <summary>
+        /// EditorValueChanged
+        /// </summary>
+        public virtual bool EditorValueChanged
+        {
+            get { return (_ValueChanged); }
+
+            set
+            {
+                if (_ValueChanged != value)
+                {
+                    _ValueChanged = value;
+
+                    if (value == true)
+                        _Cell.SetEditorDirty(this);
+                }
+            }
+        }
+
+        #endregion
+
+        #region EditorValueType
+
+        ///<summary>
+        /// EditorValueType
+        ///</summary>
+        public virtual Type EditorValueType
+        {
+            get { return (typeof(string)); }
+        }
+
+        #endregion
+
+        #region StretchBehavior
+
+        /// <summary>
+        /// StretchBehavior
+        /// </summary>
+        public virtual StretchBehavior StretchBehavior
+        {
+            get { return (_StretchBehavior); }
+            set { _StretchBehavior = value; }
+        }
+
+        #endregion
+
+        #region SuspendUpdate
+
+        /// <summary>
+        /// SuspendUpdate
+        /// </summary>
+        public bool SuspendUpdate
+        {
+            get { return (_SuspendUpdate); }
+            set { _SuspendUpdate = value; }
+        }
+
+        #endregion
+
+        #region ValueChangeBehavior
+
+        /// <summary>
+        /// ValueChangeBehavior
+        /// </summary>
+        public virtual ValueChangeBehavior ValueChangeBehavior
+        {
+            get { return (ValueChangeBehavior.InvalidateRender); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InitializeContext
+
+        ///<summary>
+        /// InitializeContext
+        ///</summary>
+        ///<param name="cell"></param>
+        ///<param name="style"></param>
+        public virtual void InitializeContext(GridCell cell, CellVisualStyle style)
+        {
+            _Cell = cell;
+
+            if (style != null)
+            {
+                Enabled = (_Cell.IsReadOnly == false);
+
+                Font = style.Font;
+                ForeColor = style.TextColor;
+            }
+
+            Checked = GetValue(_Cell.Value);
+
+            _ValueChanged = false;
+        }
+
+        #endregion
+
+        #region GetProposedSize
+
+        ///<summary>
+        /// GetProposedSize
+        ///</summary>
+        ///<param name="g"></param>
+        ///<param name="cell"></param>
+        ///<param name="style"></param>
+        ///<param name="constraintSize"></param>
+        ///<returns></returns>
+        public virtual Size GetProposedSize(Graphics g,
+            GridCell cell, CellVisualStyle style, Size constraintSize)
+        {
+            Size size = GetPreferredSize(constraintSize);
+
+            return (size);
+        }
+
+        #endregion
+
+        #region Edit support
+
+        #region BeginEdit
+
+        /// <summary>
+        /// BeginEdit
+        /// </summary>
+        /// <param name="selectAll"></param>
+        /// <returns></returns>
+        public virtual bool BeginEdit(bool selectAll)
+        {
+            return (false);
+        }
+
+        #endregion
+
+        #region EndEdit
+
+        /// <summary>
+        /// EndEdit
+        /// </summary>
+        /// <returns></returns>
+        public virtual bool EndEdit()
+        {
+            return (false);
+        }
+
+        #endregion
+
+        #region CancelEdit
+
+        /// <summary>
+        /// CancelEdit
+        /// </summary>
+        /// <returns></returns>
+        public virtual bool CancelEdit()
+        {
+            return (false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region CellRender
+
+        /// <summary>
+        /// CellRender
+        /// </summary>
+        /// <param name="g"></param>
+        public virtual void CellRender(Graphics g)
+        {
+            _Cell.CellRender(this, g);
+        }
+
+        #endregion
+
+        #region Keyboard support
+
+        #region CellKeyDown
+
+        ///<summary>
+        /// CellKeyDown
+        ///</summary>
+        public virtual void CellKeyDown(KeyEventArgs e)
+        {
+            Focus();
+
+            switch (e.KeyData)
+            {
+                case Keys.T:
+                    if (Checked == false)
+                        Checked = true;
+                    break;
+
+                case Keys.F:
+                    if (Checked == true)
+                        Checked = false;
+                    break;
+
+                default:
+                    OnKeyDown(e);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region WantsInputKey
+
+        /// <summary>
+        /// WantsInputKey
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="gridWantsKey"></param>
+        /// <returns></returns>
+        public virtual bool WantsInputKey(Keys key, bool gridWantsKey)
+        {
+            switch (key & Keys.KeyCode)
+            {
+                case Keys.T:
+                case Keys.F:
+                case Keys.Space:
+                    return (true);
+
+                default:
+                    return (gridWantsKey == false);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Mouse support
+
+        #region OnCellMouseMove
+
+        ///<summary>
+        /// OnCellMouseMove
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseMove(MouseEventArgs e)
+        {
+            OnMouseMove(e);
+        }
+
+        #endregion
+
+        #region OnCellMouseEnter
+
+        ///<summary>
+        /// OnCellMouseEnter
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseEnter(EventArgs e)
+        {
+            OnMouseEnter(e);
+        }
+
+        #endregion
+
+        #region OnCellMouseLeave
+
+        ///<summary>
+        /// OnCellMouseLeave
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseLeave(EventArgs e)
+        {
+            OnMouseLeave(e);
+        }
+
+        #endregion
+
+        #region OnCellMouseUp
+
+        ///<summary>
+        /// OnCellMouseUp
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseUp(MouseEventArgs e)
+        {
+            OnMouseUp(e);
+        }
+
+        #endregion
+
+        #region OnCellMouseDown
+
+        ///<summary>
+        /// OnCellMouseDown
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseDown(MouseEventArgs e)
+        {
+            OnMouseDown(e);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/GridCheckBoxXEditControl.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/GridCheckBoxXEditControl.cs
new file mode 100644
index 00000000..96bf965a
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/GridCheckBoxXEditControl.cs	
@@ -0,0 +1,676 @@
+using System;
+using System.ComponentModel;
+using System.Data.SqlTypes;
+using System.Drawing;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.Controls;
+using DevComponents.DotNetBar.SuperGrid.Style;
+
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    ///<summary>
+    /// GridCheckBoxEditControl
+    ///</summary>
+    [ToolboxItem(false)]
+    public class GridCheckBoxXEditControl : CheckBoxX, IGridCellEditControl
+    {
+        #region Private variables
+
+        private GridCell _Cell;
+        private EditorPanel _EditorPanel;
+        private Bitmap _EditorCellBitmap;
+
+        private bool _ValueChanged;
+        private bool _SuspendUpdate;
+
+        private StretchBehavior _StretchBehavior = StretchBehavior.None;
+
+        #endregion
+
+        ///<summary>
+        /// GridCheckBoxXEditControl
+        ///</summary>
+        public GridCheckBoxXEditControl()
+        {
+            CheckValueChecked = null;
+            CheckValueUnchecked = null;
+
+            Text = "";
+
+            CheckedChanged += ControlCheckedChanged;
+        }
+
+        #region ControlCheckedChanged
+
+        private void ControlCheckedChanged(object sender, EventArgs e)
+        {
+            if (_SuspendUpdate == false)
+            {
+                if (CheckState == CheckState.Checked)
+                {
+                    _Cell.Value = (CheckValueChecked ?? true);
+                }
+                else if (CheckState == CheckState.Unchecked)
+                {
+                    _Cell.Value = (CheckValueUnchecked ?? false);
+                }
+                else
+                {
+                    _Cell.Value = CheckValueIndeterminate;
+                }
+
+                _Cell.EditorValueChanged(this);
+            }
+        }
+
+        #endregion
+
+        #region OnInvalidated
+
+        /// <summary>
+        /// OnInvalidated
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnInvalidated(InvalidateEventArgs e)
+        {
+            base.OnInvalidated(e);
+
+            if (_Cell != null && _SuspendUpdate == false)
+                _Cell.InvalidateRender();
+        }
+
+        #endregion
+
+        #region OnPaint
+
+        /// <summary>
+        /// OnPaint
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            _Cell.PaintEditorBackground(e, this);
+
+            PaintControl(e);
+        }
+
+        #endregion
+
+        #region Text
+
+        /// <summary>
+        /// Text
+        /// </summary>
+        public override string Text
+        {
+            get { return (base.Text); }
+
+            set
+            {
+                if (string.IsNullOrEmpty(value))
+                {
+                    value = "";
+
+                    TextVisible = false;
+                }
+                else
+                {
+                    TextVisible = true;
+                }
+
+                base.Text = value;
+            }
+        }
+
+        #endregion
+
+        #region GetValue
+
+        ///<summary>
+        /// GetValue
+        ///</summary>
+        ///<param name="value"></param>
+        ///<returns></returns>
+        ///<exception cref="Exception"></exception>
+        public virtual CheckState GetValue(object value)
+        {
+            GridPanel panel = _Cell.GridPanel;
+
+            if (value == null ||
+                (panel.NullValue == NullValue.DBNull && value == DBNull.Value))
+            {
+                return (ThreeState ? CheckState.Indeterminate : CheckState.Unchecked);
+            }
+
+            Type type = value.GetType();
+
+            if (CheckValueChecked != null)
+            {
+                if (value.Equals(CheckValueChecked))
+                    return (CheckState.Checked);
+            }
+
+            if (CheckValueUnchecked != null)
+            {
+                if (value.Equals(CheckValueUnchecked))
+                    return (CheckState.Unchecked);
+            }
+
+            if (type == typeof (bool))
+                return ((bool) value ? CheckState.Checked : CheckState.Unchecked);
+
+            if (type == typeof (string))
+            {
+                string s = (string) value;
+
+                if (_Cell.IsValueExpression == true)
+                    s = _Cell.GetExpValue(s);
+
+                switch (s.ToLower())
+                {
+                    case "y":
+                    case "yes":
+                    case "t":
+                    case "true":
+                    case "1":
+                        return (CheckState.Checked);
+
+                    case "":
+                    case "0":
+                    case "n":
+                    case "no":
+                    case "f":
+                    case "false":
+                        return (CheckState.Unchecked);
+                }
+            }
+            else if (type == typeof (SqlBoolean))
+            {
+                SqlBoolean sb = (SqlBoolean) value;
+
+                if (sb.IsNull == true)
+                    return (ThreeState ? CheckState.Indeterminate : CheckState.Unchecked);
+
+                return (sb.IsTrue ? CheckState.Checked : CheckState.Unchecked);
+            }
+            else if (type == typeof(char))
+            {
+                char c = (char)value;
+
+                switch (Char.ToLower(c))
+                {
+                    case 't':
+                    case 'y':
+                    case '1':
+                        return (CheckState.Checked);
+
+                    case 'f':
+                    case 'n':
+                    case '0':
+                        return (CheckState.Unchecked);
+                }
+            }
+            else
+            {
+                int n = Convert.ToInt32(value);
+
+                return (n == 0 ? CheckState.Unchecked : CheckState.Checked);
+            }
+
+            throw new Exception("Invalid checkBox cell value (" + value + ").");
+        }
+
+        #endregion
+
+        #region IGridCellEditControl Members
+
+        #region Public properties
+
+        #region CanInterrupt
+
+        /// <summary>
+        /// CanInterrupt
+        /// </summary>
+        public bool CanInterrupt
+        {
+            get { return (true); }
+        }
+
+        #endregion
+
+        #region CellEditMode
+
+        /// <summary>
+        /// CellEditMode
+        /// </summary>
+        public CellEditMode CellEditMode
+        {
+            get { return (CellEditMode.InPlace); }
+        }
+
+        #endregion
+
+        #region EditorCell
+
+        /// <summary>
+        /// EditorCell
+        /// </summary>
+        public GridCell EditorCell
+        {
+            get { return (_Cell); }
+            set { _Cell = value; }
+        }
+
+        #endregion
+
+        #region EditorCellBitmap
+
+        ///<summary>
+        /// EditorCellBitmap
+        ///</summary>
+        public Bitmap EditorCellBitmap
+        {
+            get { return (_EditorCellBitmap); }
+
+            set
+            {
+                if (_EditorCellBitmap != null)
+                    _EditorCellBitmap.Dispose();
+
+                _EditorCellBitmap = value;
+            }
+        }
+
+        #endregion
+
+        #region EditorFormattedValue
+
+        ///<summary>
+        /// EditorFormattedValue
+        ///</summary>
+        public virtual string EditorFormattedValue
+        {
+            get
+            {
+                if (_Cell != null && _Cell.IsValueNull == true)
+                    return (_Cell.NullString);
+
+                return (EditorValue.ToString());
+            }
+        }
+
+        #endregion
+
+        #region EditorPanel
+
+        /// <summary>
+        /// EditorPanel
+        /// </summary>
+        public EditorPanel EditorPanel
+        {
+            get { return (_EditorPanel); }
+            set { _EditorPanel = value; }
+        }
+
+        #endregion
+
+        #region EditorValue
+
+        /// <summary>
+        /// EditorValue
+        /// </summary>
+        public virtual object EditorValue
+        {
+            get { return (CheckState); }
+            set { CheckState = GetValue(value); }
+        }
+
+        #endregion
+
+        #region EditorValueChanged
+
+        /// <summary>
+        /// EditorValueChanged
+        /// </summary>
+        public virtual bool EditorValueChanged
+        {
+            get { return (_ValueChanged); }
+
+            set
+            {
+                if (_ValueChanged != value)
+                {
+                    _ValueChanged = value;
+
+                    if (value == true)
+                        _Cell.SetEditorDirty(this);
+                }
+            }
+        }
+
+        #endregion
+
+        #region EditorValueType
+
+        ///<summary>
+        /// EditorValueType
+        ///</summary>
+        public virtual Type EditorValueType
+        {
+            get { return (typeof(bool)); }
+        }
+
+        #endregion
+
+        #region StretchBehavior
+
+        /// <summary>
+        /// StretchBehavior
+        /// </summary>
+        public virtual StretchBehavior StretchBehavior
+        {
+            get { return (_StretchBehavior); }
+            set { _StretchBehavior = value; }
+        }
+
+        #endregion
+
+        #region SuspendUpdate
+
+        /// <summary>
+        /// SuspendUpdate
+        /// </summary>
+        public bool SuspendUpdate
+        {
+            get { return (_SuspendUpdate); }
+            set { _SuspendUpdate = value; }
+        }
+
+        #endregion
+
+        #region ValueChangeBehavior
+
+        /// <summary>
+        /// ValueChangeBehavior
+        /// </summary>
+        public virtual ValueChangeBehavior ValueChangeBehavior
+        {
+            get { return (ValueChangeBehavior.InvalidateRender); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InitializeContext
+
+        ///<summary>
+        /// InitializeContext
+        ///</summary>
+        ///<param name="cell"></param>
+        ///<param name="style"></param>
+        public virtual void InitializeContext(GridCell cell, CellVisualStyle style)
+        {
+            _Cell = cell;
+
+            if (style != null)
+            {
+                Enabled = (_Cell.IsReadOnly == false);
+
+                Font = style.Font;
+                ForeColor = style.TextColor;
+            }
+
+            CheckState = GetValue(_Cell.Value);
+
+            _ValueChanged = false;
+        }
+
+        #endregion
+
+        #region GetProposedSize
+
+        ///<summary>
+        /// GetProposedSize
+        ///</summary>
+        ///<param name="g"></param>
+        ///<param name="cell"></param>
+        ///<param name="style"></param>
+        ///<param name="constraintSize"></param>
+        ///<returns></returns>
+        public virtual Size GetProposedSize(Graphics g,
+            GridCell cell, CellVisualStyle style, Size constraintSize)
+        {
+            HostItem.RecalcSize();
+            Size size = HostItem.Size;
+
+            if (TextVisible == false)
+            {
+                // RadioButtons are not actually 13 - they are 14, even
+                // though the system thinks they are 13.
+
+                if (CheckBoxStyle == eCheckBoxStyle.RadioButton)
+                    size.Height += Dpi.Height1;
+
+                if (size.Width < size.Height)
+                    size.Width = size.Height;
+            }
+
+            return (size);
+        }
+
+        #endregion
+
+        #region Edit support
+
+        #region BeginEdit
+
+        /// <summary>
+        /// BeginEdit
+        /// </summary>
+        /// <param name="selectAll"></param>
+        /// <returns></returns>
+        public virtual bool BeginEdit(bool selectAll)
+        {
+            return (false);
+        }
+
+        #endregion
+
+        #region EndEdit
+
+        /// <summary>
+        /// EndEdit
+        /// </summary>
+        /// <returns></returns>
+        public virtual bool EndEdit()
+        {
+            return (false);
+        }
+
+        #endregion
+
+        #region CancelEdit
+
+        /// <summary>
+        /// CancelEdit
+        /// </summary>
+        /// <returns></returns>
+        public virtual bool CancelEdit()
+        {
+            return (false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region CellRender
+
+        /// <summary>
+        /// CellRender
+        /// </summary>
+        /// <param name="g"></param>
+        public virtual void CellRender(Graphics g)
+        {
+            _Cell.CellRender(this, g);
+        }
+
+        #endregion
+
+        #region Keyboard support
+
+        #region CellKeyDown
+
+        ///<summary>
+        /// CellKeyDown
+        ///</summary>
+        public virtual void CellKeyDown(KeyEventArgs e)
+        {
+            switch (e.KeyData)
+            {
+                case Keys.T:
+                case Keys.Y:
+                    if (Checked == false)
+                        Checked = true;
+                    break;
+
+                case Keys.F:
+                case Keys.N:
+                    if (Checked == true)
+                        Checked = false;
+                    break;
+
+                default:
+                    OnKeyDown(e);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region WantsInputKey
+
+        /// <summary>
+        /// WantsInputKey
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="gridWantsKey"></param>
+        /// <returns></returns>
+        public virtual bool WantsInputKey(Keys key, bool gridWantsKey)
+        {
+            switch (key & Keys.KeyCode)
+            {
+                case Keys.T:
+                case Keys.F:
+                case Keys.Y:
+                case Keys.N:
+                case Keys.Space:
+                    return (true);
+
+                default:
+                    return (gridWantsKey == false);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Mouse support
+
+        #region OnCellMouseMove
+
+        ///<summary>
+        /// OnCellMouseMove
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseMove(MouseEventArgs e)
+        {
+            OnMouseMove(e);
+        }
+
+        #endregion
+
+        #region OnCellMouseEnter
+
+        ///<summary>
+        /// OnCellMouseEnter
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseEnter(EventArgs e)
+        {
+            OnMouseEnter(e);
+        }
+
+        #endregion
+
+        #region OnCellMouseLeave
+
+        ///<summary>
+        /// OnCellMouseLeave
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseLeave(EventArgs e)
+        {
+            OnMouseLeave(e);
+        }
+
+        #endregion
+
+        #region OnCellMouseUp
+
+        ///<summary>
+        /// OnCellMouseUp
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseUp(MouseEventArgs e)
+        {
+            eCheckBoxStyle style = CheckBoxStyle;
+            CheckBoxStyle = eCheckBoxStyle.CheckBox;
+
+            try
+            {
+                OnMouseUp(e);
+            }
+            finally
+            {
+                CheckBoxStyle = style;
+            }
+        }
+
+        #endregion
+
+        #region OnCellMouseDown
+
+        ///<summary>
+        /// OnCellMouseDown
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseDown(MouseEventArgs e)
+        {
+            OnMouseDown(e);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region Dispose
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        /// <param name="disposing"></param>
+        protected override void Dispose(bool disposing)
+        {
+            CheckedChanged -= ControlCheckedChanged;
+
+            base.Dispose(disposing);
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/GridColorPickerEditControl.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/GridColorPickerEditControl.cs
new file mode 100644
index 00000000..69529d13
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/GridColorPickerEditControl.cs	
@@ -0,0 +1,602 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Globalization;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.SuperGrid.Style;
+
+namespace DevComponents.DotNetBar.SuperGrid
+{
+	///<summary>
+	/// GridColorPickerEditControl
+	///</summary>
+	[ToolboxItem(false)]
+	public class GridColorPickerEditControl : ColorPickerButton, IGridCellEditControl
+	{
+		#region Private variables
+
+		private GridCell _Cell;
+		private EditorPanel _EditorPanel;
+		private Bitmap _EditorCellBitmap;
+
+		private bool _ValueChanged;
+		private bool _SuspendUpdate;
+
+		private StretchBehavior _StretchBehavior = StretchBehavior.None;
+
+		#endregion
+
+		///<summary>
+		/// GridColorPickerEditControl
+		///</summary>
+		public GridColorPickerEditControl()
+		{
+			AccessibleRole = AccessibleRole.PushButton;
+			AutoSizeMode = AutoSizeMode.GrowAndShrink;
+			ColorTable = eButtonColor.Flat;
+
+			InternalAutoExpandOnClick = true;
+			InternalFocusCuesEnabled = false;
+			InternalStyle = eDotNetBarStyle.StyleManagerControlled;
+
+            SetSelectedColorImageEx();
+
+			SelectedColorChanged += ControlSelectedColorChanged;
+		}
+
+		#region SetSelectedColorImage
+
+        /// <summary>
+        /// Creates and sets the Image and SelectedColorImageRectangle.
+        /// </summary>
+		protected virtual void SetSelectedColorImage()
+		{
+            SetSelectedColorImageEx();
+		}
+
+        private void SetSelectedColorImageEx()
+        {
+            Rectangle r = new Rectangle(0, 0, 16, 16);
+
+            Bitmap image = new Bitmap(r.Width, r.Height);
+
+            using (Graphics g = Graphics.FromImage(image))
+                g.FillRectangle(Brushes.Black, r);
+
+            r.Inflate(-1, -1);
+
+            Image = image;
+            SelectedColorImageRectangle = r;
+        }
+
+	    #endregion
+
+		#region ControlSelectedColorChanged
+
+		private void ControlSelectedColorChanged(object sender, EventArgs e)
+		{
+			if (_SuspendUpdate == false)
+			{
+			    Type dataType = _Cell.GridColumn.DataType;
+
+				if (dataType == null && _Cell.Value != null)
+					dataType = _Cell.Value.GetType();
+
+				if (dataType == typeof(Color))
+				{
+					_Cell.Value = SelectedColor;
+				}
+				else if (dataType == typeof(string))
+				{
+					if (SelectedColor.IsKnownColor)
+						_Cell.Value = SelectedColor.Name;
+					else
+						_Cell.Value = SelectedColor.ToArgb().ToString();
+				}
+				else
+				{
+					_Cell.Value = SelectedColor.ToArgb();
+				}
+
+				_Cell.EditorValueChanged(this);
+			}
+		}
+
+		#endregion
+
+		#region OnInvalidated
+
+        /// <summary>
+        /// OnInvalidated processing.
+        /// </summary>
+        /// <param name="e"></param>
+		protected override void OnInvalidated(InvalidateEventArgs e)
+		{
+			base.OnInvalidated(e);
+
+			if (_Cell != null && _SuspendUpdate == false)
+				_Cell.InvalidateRender();
+		}
+
+		#endregion
+
+		#region GetValue
+
+		///<summary>
+		/// GetValue
+		///</summary>
+		///<param name="value"></param>
+		///<returns></returns>
+		public virtual int GetValue(object value)
+		{
+			GridPanel panel = _Cell.GridPanel;
+
+			if (value == null || 
+				(panel.NullValue == NullValue.DBNull && value == DBNull.Value))
+			{
+				return (0);
+			}
+
+			if (value.GetType() == typeof(int))
+				return ((int)value);
+
+			if (value.GetType() == typeof(Color))
+				return (((Color)value).ToArgb());
+
+			if (value is string)
+			{
+				Color color = Color.FromName((string)value);
+
+				if (color.IsKnownColor == true)
+					return (color.ToArgb());
+
+				int x;
+				if (int.TryParse((string)value, out x) == true)
+					return (x);
+
+				if (int.TryParse((string)value,
+					NumberStyles.HexNumber, CultureInfo.InvariantCulture, out x) == true)
+					return (x);
+			}
+
+			throw new Exception("Invalid cell value (" + value + ").");
+		}
+
+		#endregion
+
+		#region IGridCellEditControl Members
+
+		#region Public properties
+
+		#region CanInterrupt
+
+        /// <summary>
+        /// CanInterrupt
+        /// </summary>
+		public bool CanInterrupt
+		{
+			get { return (Expanded == false && IsMouseDown == false); }
+		}
+
+		#endregion
+
+		#region CellEditMode
+
+        /// <summary>
+        /// CellEditMode
+        /// </summary>
+		public CellEditMode CellEditMode
+		{
+			get { return (CellEditMode.NonModal); }
+		}
+
+		#endregion
+
+		#region EditorCell
+
+        /// <summary>
+        /// EditorCell
+        /// </summary>
+		public GridCell EditorCell
+		{
+			get { return (_Cell); }
+			set { _Cell = value; }
+		}
+
+		#endregion
+
+		#region EditorCellBitmap
+
+		///<summary>
+		/// EditorCellBitmap
+		///</summary>
+		public Bitmap EditorCellBitmap
+		{
+			get { return (_EditorCellBitmap); }
+
+			set
+			{
+				if (_EditorCellBitmap != null)
+					_EditorCellBitmap.Dispose();
+
+				_EditorCellBitmap = value;
+			}
+		}
+
+		#endregion
+
+		#region EditorFormattedValue
+
+		///<summary>
+		/// EditorFormattedValue
+		///</summary>
+		public virtual string EditorFormattedValue
+		{
+			get 
+			{
+				if (_Cell != null && _Cell.IsValueNull == true)
+					return (_Cell.NullString);
+
+				return String.IsNullOrEmpty(SelectedColor.Name) ? "" : SelectedColor.Name; 
+			}
+		}
+
+		#endregion
+
+		#region EditorPanel
+
+        /// <summary>
+        /// EditorPanel
+        /// </summary>
+		public EditorPanel EditorPanel
+		{
+			get { return (_EditorPanel); }
+			set { _EditorPanel = value; }
+		}
+
+		#endregion
+
+		#region EditorValue
+
+        /// <summary>
+        /// EditorValue
+        /// </summary>
+		public virtual object EditorValue
+		{
+			get { return (SelectedColor.ToArgb()); }
+
+			set
+            {
+                Color color = Color.FromArgb(GetValue(value));
+
+                if (SelectedColor != color)
+                    SelectedColor = color;
+            }
+		}
+
+		#endregion
+
+		#region EditorValueChanged
+
+        /// <summary>
+        /// EditorValueChanged
+        /// </summary>
+		public virtual bool EditorValueChanged
+		{
+			get { return (_ValueChanged); }
+
+			set
+			{
+				if (_ValueChanged != value)
+				{
+					_ValueChanged = value;
+
+					if (value == true)
+						_Cell.SetEditorDirty(this);
+				}
+			}
+		}
+
+		#endregion
+
+		#region EditorValueType
+
+		///<summary>
+		/// EditorValueType
+		///</summary>
+		public virtual Type EditorValueType
+		{
+			get { return (typeof(int)); }
+		}
+
+		#endregion
+
+		#region StretchBehavior
+
+        /// <summary>
+        /// StretchBehavior
+        /// </summary>
+		public virtual StretchBehavior StretchBehavior
+		{
+			get { return (_StretchBehavior); }
+			set { _StretchBehavior = value; }
+		}
+
+		#endregion
+
+		#region SuspendUpdate
+
+        /// <summary>
+        /// SuspendUpdate
+        /// </summary>
+		public virtual bool SuspendUpdate
+		{
+			get { return (_SuspendUpdate); }
+			set { _SuspendUpdate = value; }
+		}
+
+		#endregion
+
+		#region ValueChangeBehavior
+
+        /// <summary>
+        /// ValueChangeBehavior
+        /// </summary>
+		public virtual ValueChangeBehavior ValueChangeBehavior
+		{
+			get { return (ValueChangeBehavior.InvalidateRender); }
+		}
+
+		#endregion
+
+		#endregion
+
+		#region InitializeContext
+
+		///<summary>
+		/// InitializeContext
+		///</summary>
+		///<param name="cell"></param>
+		///<param name="style"></param>
+		public virtual void InitializeContext(GridCell cell, CellVisualStyle style)
+		{
+			_Cell = cell;
+
+			if (style != null)
+			{
+				Enabled = (_Cell.IsReadOnly == false);
+
+				Font = style.Font;
+				ForeColor = style.TextColor;
+                BackColor = Color.Transparent;
+			}
+
+			int value = GetValue(_Cell.Value);
+
+			if (value != 0)
+				SelectedColor = Color.FromArgb(value);
+			else
+				SelectedColor = Color.Empty;
+
+			_ValueChanged = false;
+		}
+
+		#endregion
+
+		#region GetProposedSize
+
+		///<summary>
+		/// GetProposedSize
+		///</summary>
+		///<param name="g"></param>
+		///<param name="cell"></param>
+		///<param name="style"></param>
+		///<param name="constraintSize"></param>
+		///<returns></returns>
+		public virtual Size GetProposedSize(Graphics g,
+				GridCell cell, CellVisualStyle style, Size constraintSize)
+		{
+			Size size = GetPreferredSize(constraintSize);
+
+			return (size);
+		}
+
+		#endregion
+
+		#region Edit support
+
+		#region BeginEdit
+
+        /// <summary>
+        /// BeginEdit
+        /// </summary>
+        /// <param name="selectAll"></param>
+        /// <returns></returns>
+		public virtual bool BeginEdit(bool selectAll)
+		{
+			return (false);
+		}
+
+		#endregion
+
+		#region EndEdit
+
+        /// <summary>
+        /// EndEdit
+        /// </summary>
+        /// <returns></returns>
+		public virtual bool EndEdit()
+		{
+			return (false);
+		}
+
+		#endregion
+
+		#region CancelEdit
+
+        /// <summary>
+        /// CancelEdit
+        /// </summary>
+        /// <returns></returns>
+		public virtual bool CancelEdit()
+		{
+			return (false);
+		}
+
+		#endregion
+
+		#endregion
+
+		#region CellRender
+
+        /// <summary>
+        /// CellRender
+        /// </summary>
+        /// <param name="g"></param>
+		public virtual void CellRender(Graphics g)
+		{
+			_Cell.CellRender(this, g);
+		}
+
+		#endregion
+
+		#region Keyboard support
+
+		#region CellKeyDown
+
+		///<summary>
+		/// CellKeyDown
+		///</summary>
+		public virtual void CellKeyDown(KeyEventArgs e)
+		{
+			OnKeyDown(e);
+			OnKeyUp(e);
+
+			Checked = false;
+		}
+
+		#endregion
+
+		#region WantsInputKey
+
+        /// <summary>
+        /// WantsInputKey
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="gridWantsKey"></param>
+        /// <returns></returns>
+		public virtual bool WantsInputKey(Keys key, bool gridWantsKey)
+		{
+			switch (key & Keys.KeyCode)
+			{
+				case Keys.Space:
+					return (true);
+
+				default:
+					return (gridWantsKey == false);
+			}
+		}
+
+		#endregion
+
+		#endregion
+
+		#region Mouse support
+
+		#region OnCellMouseMove
+
+		///<summary>
+		/// OnCellMouseMove
+		///</summary>
+		///<param name="e"></param>
+		public virtual void OnCellMouseMove(MouseEventArgs e)
+		{
+			OnMouseMove(e);
+			Refresh();
+		}
+
+		#endregion
+
+		#region OnCellMouseEnter
+
+		///<summary>
+		/// OnCellMouseEnter
+		///</summary>
+		///<param name="e"></param>
+		public virtual void OnCellMouseEnter(EventArgs e)
+		{
+			OnMouseEnter(e);
+		}
+
+		#endregion
+
+		#region OnCellMouseLeave
+
+		///<summary>
+		/// OnCellMouseLeave
+		///</summary>
+		///<param name="e"></param>
+		public virtual void OnCellMouseLeave(EventArgs e)
+		{
+            if (_Cell != null)
+            {
+                Refresh();
+                OnMouseLeave(e);
+            }
+		}
+
+		#endregion
+
+		#region OnCellMouseUp
+
+		///<summary>
+		/// OnCellMouseUp
+		///</summary>
+		///<param name="e"></param>
+		public virtual void OnCellMouseUp(MouseEventArgs e)
+		{
+			OnMouseUp(e);
+		}
+
+		#endregion
+
+		#region OnCellMouseDown
+
+		///<summary>
+		/// OnCellMouseDown
+		///</summary>
+		///<param name="e"></param>
+		public virtual void OnCellMouseDown(MouseEventArgs e)
+		{
+			OnMouseDown(e);
+		}
+
+		#endregion
+
+		#endregion
+
+		#endregion
+
+		#region Dispose
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        /// <param name="disposing"></param>
+		protected override void Dispose(bool disposing)
+		{
+			Image image = Image;
+
+			if (image != null)
+			{
+				Image = null;
+
+				image.Dispose();
+			}
+
+			base.Dispose(disposing);
+		}
+
+		#endregion
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/GridComboBoxExEditControl.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/GridComboBoxExEditControl.cs
new file mode 100644
index 00000000..6e7dd078
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/GridComboBoxExEditControl.cs	
@@ -0,0 +1,871 @@
+using System;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.Controls;
+using DevComponents.DotNetBar.SuperGrid.Style;
+
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    ///<summary>
+    /// GridComboBoxExEditControl
+    ///</summary>
+    [ToolboxItem(false)]
+    public class GridComboBoxExEditControl : ComboBoxEx, IGridCellEditControl
+    {
+        #region DllImports
+
+        [DllImport("kernel32.dll")]
+        private static extern int GetCurrentThreadId();
+
+        [DllImport("user32.dll")]
+        private static extern bool IsWindowVisible(IntPtr hWnd);
+
+        [DllImport("user32.dll")]
+        private static extern void GetClassName(IntPtr hWnd, StringBuilder lpClassName, int nMaxCount);
+
+        [DllImport("user32.dll")]
+        private static extern bool EnumThreadWindows(int dwThreadId, EnumThreadDelegate lpfn, IntPtr lParam);
+
+        private delegate bool EnumThreadDelegate(IntPtr hWnd, IntPtr lParam);
+
+        #endregion
+
+        #region Static data
+
+        static bool _StaticIsOpen;
+
+        #endregion
+
+        #region Private variables
+
+        private GridCell _Cell;
+        private EditorPanel _EditorPanel;
+        private Bitmap _EditorCellBitmap;
+
+        private bool _ValueChanged;
+        private bool _SuspendUpdate;
+        private bool _PanelShown;
+        private bool _CacheDisplayMembers = true;
+
+        private int _ValueIndex;
+        private string _ValueText;
+
+        private int[] _ValueIndicees;
+        private object[] _ValueMembers;
+
+        private CurrencyManager _CurrentDataManager;
+
+        private StretchBehavior _StretchBehavior = StretchBehavior.None;
+
+        #endregion
+
+        ///<summary>
+        /// GridComboBoxExEditControl
+        ///</summary>
+        public GridComboBoxExEditControl()
+        {
+            DrawMode = DrawMode.OwnerDrawFixed;
+            DisconnectedPopupDataSource = true;
+
+            BindingContext = new BindingContext();
+        }
+
+        #region OnDataSourceChanged
+
+        /// <summary>
+        /// OnDataSourceChanged
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnDataSourceChanged(EventArgs e)
+        {
+            if (_CurrentDataManager != null)
+                _CurrentDataManager.ListChanged -= DataManagerListChanged;
+
+            base.OnDataSourceChanged(e);
+
+            _ValueMembers = null;
+            _ValueIndicees = null;
+
+            _CurrentDataManager = DataManager;
+
+            if (_CurrentDataManager != null)
+                _CurrentDataManager.ListChanged += DataManagerListChanged;
+
+            if (IsDisposed == false)
+            {
+                if (_Cell != null && _Cell.GridPanel != null)
+                    InitializeContext(_Cell, null);
+            }
+        }
+
+        #endregion
+
+        #region DataManagerListChanged
+
+        /// <summary>
+        /// DataManager_ListChanged
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void DataManagerListChanged(object sender, ListChangedEventArgs e)
+        {
+            _ValueMembers = null;
+            _ValueIndicees = null;
+        }
+
+        #endregion
+
+        #region OnTextChanged
+
+        /// <summary>
+        /// OnTextChanged
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnTextChanged(EventArgs e)
+        {
+            if (IsDisposed == false)
+            {
+                if (_Cell != null && _SuspendUpdate == false)
+                {
+                    _Cell.EditorValueChanged(this);
+
+                    _ValueIndex = -1;
+                }
+            }
+
+            base.OnTextChanged(e);
+        }
+
+        #endregion
+
+        #region OnSelectedIndexChanged
+
+        /// <summary>
+        /// OnSelectedIndexChanged
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnSelectedIndexChanged(EventArgs e)
+        {
+            if (IsDisposed == false)
+            {
+                if (_Cell != null && _SuspendUpdate == false)
+                {
+                    _ValueIndex = SelectedIndex;
+
+                    _Cell.EditorValueChanged(this);
+
+                    EditorValueChanged = true;
+                }
+            }
+
+            base.OnSelectedIndexChanged(e);
+        }
+
+        #endregion
+
+        #region OnInvalidated
+
+        /// <summary>
+        /// OnInvalidated
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnInvalidated(InvalidateEventArgs e)
+        {
+            base.OnInvalidated(e);
+
+            if (_Cell != null && _SuspendUpdate == false)
+                _Cell.InvalidateRender();
+        }
+
+        #endregion
+
+        #region GetValue
+
+        /// <summary>
+        /// GetValue
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public virtual object GetValue(object value)
+        {
+            GridPanel panel = _Cell.GridPanel;
+
+            if (value == null ||
+                (panel.NullValue == NullValue.DBNull && value == DBNull.Value))
+            {
+                return ("");
+            }
+
+            if (_Cell.IsValueExpression == true)
+                value = _Cell.GetExpValue((string)value);
+
+            return (value);
+        }
+
+        #endregion
+
+        #region SetValue
+
+        private void SetValue(object o, bool initEdit)
+        {
+            _ValueText = "";
+            _ValueIndex = -1;
+
+            bool oldSuspend = SuspendUpdate;
+            SuspendUpdate = true;
+
+            SelectedIndex = -1;
+
+            SuspendUpdate = oldSuspend;
+
+            if (o != null)
+            {
+                _ValueText = o.ToString();
+
+                if (string.IsNullOrEmpty(_ValueText) == false &&
+                    string.IsNullOrEmpty(ValueMember) == false &&
+                    string.IsNullOrEmpty(DisplayMember) == false)
+                {
+                    if (Items.Count > 0)
+                    {
+                        if (Items[0] is DataRowView &&
+                            initEdit == false && _CacheDisplayMembers == true)
+                        {
+                            SetSelectedDrvValue(o);
+                        }
+                        else
+                        {
+                            SetSelectedValue(o);
+                        }
+                    }
+                }
+                else
+                {
+                    Text = _ValueText;
+                    _ValueIndex = SelectedIndex;
+                }
+            }
+        }
+
+        #region SetSelectedDrvValue
+
+        private void SetSelectedDrvValue(object o)
+        {
+            if (_ValueMembers == null)
+            {
+                SuspendUpdate = true;
+
+                _ValueMembers = new object[Items.Count];
+                _ValueIndicees = new int[Items.Count];
+
+                for (int i = 0; i < Items.Count; i++)
+                {
+                    DataRowView drv = (DataRowView)Items[i];
+
+                    _ValueMembers[i] = drv.Row[ValueMember];
+                    _ValueIndicees[i] = i;
+                }
+
+                Array.Sort(_ValueMembers, _ValueIndicees);
+
+                SuspendUpdate = false;
+            }
+
+            int n = -1;
+
+            try
+            {
+                n = Array.BinarySearch(_ValueMembers, o);
+            }
+            catch { }
+
+            if (n >= 0)
+            {
+                _ValueIndex = _ValueIndicees[n];
+                _ValueText = GetItemText(Items[_ValueIndex]);
+            }
+            else
+            {
+                Text = _ValueText;
+            }
+        }
+
+        #endregion
+
+        #region SetSelectedValue
+
+        private void SetSelectedValue(object o)
+        {
+            try
+            {
+                SelectedValue = o;
+                _ValueIndex = SelectedIndex;
+
+                if (SelectedValue != null)
+                    _ValueText = Text;
+            }
+            catch
+            {
+                Text = _ValueText;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IGridCellEditControl Members
+
+        #region Public properties
+
+        #region CacheDisplayMembers
+
+        /// <summary>
+        /// Informs the control to cache DataRowView 
+        /// ValueMember/DisplayMember information (default is true).
+        /// </summary>
+        public bool CacheDisplayMembers
+        {
+            get { return (_CacheDisplayMembers); }
+
+            set
+            {
+                _CacheDisplayMembers = value;
+
+                if (value == false)
+                {
+                    _ValueMembers = null;
+                    _ValueIndicees = null;
+                }
+            }
+        }
+
+        #endregion
+
+        #region CanInterrupt
+
+        /// <summary>
+        /// CanInterrupt
+        /// </summary>
+        public virtual bool CanInterrupt
+        {
+            get { return (true); }
+        }
+
+        #endregion
+
+        #region CellEditMode
+
+        CellEditMode _CellEditMode = CellEditMode.Modal;
+
+        /// <summary>
+        /// CellEditMode
+        /// </summary>
+        public virtual CellEditMode CellEditMode
+        {
+            get { return (_CellEditMode); }
+        }
+
+        #endregion
+
+        #region EditorCell
+
+        /// <summary>
+        /// EditorCell
+        /// </summary>
+        public GridCell EditorCell
+        {
+            get { return (_Cell); }
+            set { _Cell = value; }
+        }
+
+        #endregion
+
+        #region EditorCellBitmap
+
+        ///<summary>
+        /// EditorCellBitmap
+        ///</summary>
+        public Bitmap EditorCellBitmap
+        {
+            get { return (_EditorCellBitmap); }
+
+            set
+            {
+                if (_EditorCellBitmap != null)
+                    _EditorCellBitmap.Dispose();
+
+                _EditorCellBitmap = value;
+            }
+        }
+
+        #endregion
+
+        #region EditorFormattedValue
+
+        ///<summary>
+        /// EditorFormattedValue
+        ///</summary>
+        public virtual string EditorFormattedValue
+        {
+            get
+            {
+                if (_Cell != null && _Cell.IsValueNull == true)
+                    return (_Cell.NullString);
+
+                return (_ValueText);
+            }
+        }
+
+        #endregion
+
+        #region EditorPanel
+
+        /// <summary>
+        /// EditorPanel
+        /// </summary>
+        public EditorPanel EditorPanel
+        {
+            get { return (_EditorPanel); }
+            set { _EditorPanel = value; }
+        }
+
+        #endregion
+
+        #region EditorValue
+
+        /// <summary>
+        /// EditorValue
+        /// </summary>
+        public virtual object EditorValue
+        {
+            get
+            {
+                if (_ValueIndex >= 0)
+                    SelectedIndex = _ValueIndex;
+
+                if (string.IsNullOrEmpty(ValueMember) == false)
+                    return (SelectedValue ?? Text);
+               
+                if (string.IsNullOrEmpty(DisplayMember) == false)
+                    return (Text);
+
+                return (this.SelectedValue ?? this.SelectedItem ?? Text);
+            }
+
+            set { SetValue(GetValue(value), true); }
+        }
+
+        #endregion
+
+        #region EditorValueChanged
+
+        /// <summary>
+        /// EditorValueChanged
+        /// </summary>
+        public virtual bool EditorValueChanged
+        {
+            get { return (_ValueChanged); }
+
+            set
+            {
+                if (_ValueChanged != value)
+                {
+                    _ValueChanged = value;
+
+                    if (value == true)
+                        _Cell.SetEditorDirty(this);
+                }
+            }
+        }
+
+        #endregion
+
+        #region EditorValueType
+
+        ///<summary>
+        /// EditorValueType
+        ///</summary>
+        public virtual Type EditorValueType
+        {
+            get { return (typeof(string)); }
+        }
+
+        #endregion
+
+        #region StretchBehavior
+
+        /// <summary>
+        /// StretchBehavior
+        /// </summary>
+        public virtual StretchBehavior StretchBehavior
+        {
+            get { return (_StretchBehavior); }
+            set { _StretchBehavior = value; }
+        }
+
+        #endregion
+
+        #region SuspendUpdate
+
+        /// <summary>
+        /// SuspendUpdate
+        /// </summary>
+        public bool SuspendUpdate
+        {
+            get { return (_SuspendUpdate); }
+            set { _SuspendUpdate = value; }
+        }
+
+        #endregion
+
+        #region ValueChangeBehavior
+
+        /// <summary>
+        /// ValueChangeBehavior
+        /// </summary>
+        public virtual ValueChangeBehavior ValueChangeBehavior
+        {
+            get { return (ValueChangeBehavior.InvalidateRender); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InitializeContext
+
+        ///<summary>
+        /// InitializeContext
+        ///</summary>
+        ///<param name="cell"></param>
+        ///<param name="style"></param>
+        public virtual void InitializeContext(GridCell cell, CellVisualStyle style)
+        {
+            _Cell = cell;
+
+            if (style != null)
+            {
+                Enabled = (_Cell.ReadOnly == false);
+                Font = style.Font;
+                ForeColor = style.TextColor;
+            }
+
+            SetValue(GetValue(_Cell.Value), false);
+
+            _ValueChanged = false;
+        }
+
+        #endregion
+
+        #region GetProposedSize
+
+        ///<summary>
+        /// GetProposedSize
+        ///</summary>
+        ///<param name="g"></param>
+        ///<param name="cell"></param>
+        ///<param name="style"></param>
+        ///<param name="constraintSize"></param>
+        ///<returns></returns>
+        public virtual Size GetProposedSize(Graphics g,
+            GridCell cell, CellVisualStyle style, Size constraintSize)
+        {
+            eTextFormat tf = eTextFormat.NoClipping |
+                eTextFormat.WordEllipsis | eTextFormat.NoPrefix;
+
+            if (style.AllowWrap == Tbool.True)
+                tf |= eTextFormat.WordBreak;
+
+            string s = EditorFormattedValue;
+
+            if (String.IsNullOrEmpty(s) == true)
+                s = " ";
+
+            Size size = (constraintSize.IsEmpty == true)
+                            ? TextHelper.MeasureText(g, s, style.Font)
+                            : TextHelper.MeasureText(g, s, style.Font, constraintSize, tf);
+
+            if (ItemHeight > size.Height)
+                size.Height = ItemHeight;
+
+            size.Height += Dpi.Height(DefaultMargin.Vertical);
+
+            return (size);
+        }
+
+        #endregion
+
+        #region Edit support
+
+        #region BeginEdit
+
+        /// <summary>
+        /// BeginEdit
+        /// </summary>
+        /// <param name="selectAll"></param>
+        /// <returns></returns>
+        public virtual bool BeginEdit(bool selectAll)
+        {
+            // If we are caching Display/Value member info, then
+            // force the ComboBox to now set the correct SelectedValue.
+
+            if (CacheDisplayMembers == true)
+            {
+                object o = EditorValue;
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region EndEdit
+
+        /// <summary>
+        /// EndEdit
+        /// </summary>
+        /// <returns></returns>
+        public virtual bool EndEdit()
+        {
+            if (IsPopupOpen == true)
+                IsPopupOpen = false;
+
+            return (false);
+        }
+
+        #endregion
+
+        #region CancelEdit
+
+        /// <summary>
+        /// CancelEdit
+        /// </summary>
+        /// <returns></returns>
+        public virtual bool CancelEdit()
+        {
+            if (IsPopupOpen == true)
+                IsPopupOpen = false;
+
+            return (false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region CellRender
+
+        /// <summary>
+        /// CellRender
+        /// </summary>
+        /// <param name="g"></param>
+        public virtual void CellRender(Graphics g)
+        {
+            if (_PanelShown == false)
+            {
+                _EditorPanel.Show();
+                _EditorPanel.Hide();
+
+                _PanelShown = true;
+            }
+
+            _Cell.CellRender(this, g);
+        }
+
+        #endregion
+
+        #region Keyboard support
+
+        #region CellKeyDown
+
+        ///<summary>
+        /// CellKeyDown
+        ///</summary>
+        public virtual void CellKeyDown(KeyEventArgs e)
+        {
+            Focus();
+
+            switch (e.KeyData)
+            {
+                default:
+                    OnKeyDown(e);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region WantsInputKey
+
+        /// <summary>
+        /// WantsInputKey
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="gridWantsKey"></param>
+        /// <returns></returns>
+        public virtual bool WantsInputKey(Keys key, bool gridWantsKey)
+        {
+            switch (key & Keys.KeyCode)
+            {
+                case Keys.Space:
+                case Keys.Up:
+                case Keys.Down:
+                    return (true);
+
+                case Keys.Enter:
+                    if (DroppedDown == true || IsPopupOpen == true)
+                        return (true);
+
+                    if (AutoCompleteMode != AutoCompleteMode.None)
+                    {
+                        if (string.IsNullOrEmpty(DropDownColumns) == true)
+                        {
+                            if (IsAutoSuggestOpen() == true)
+                                return (true);
+                        }
+                    }
+                    break;
+            }
+
+            return (gridWantsKey == false);
+        }
+
+        #region IsAutoSuggestOpen
+
+        private bool IsAutoSuggestOpen()
+        {
+            _StaticIsOpen = false;
+
+            EnumThreadWindows(GetCurrentThreadId(), EnumThreadWindowCallback, IntPtr.Zero);
+
+            return (_StaticIsOpen);
+        }
+
+        #region EnumThreadWindowCallback
+
+        private static bool EnumThreadWindowCallback(IntPtr hWnd, IntPtr lParam)
+        {
+            if (IsWindowVisible(hWnd) == true)
+            {
+                if ((GetClassName(hWnd) == "Auto-Suggest Dropdown"))
+                {
+                    _StaticIsOpen = true;
+
+                    return (false);
+                }
+            }
+
+            return true;
+        }
+
+        #region GetClassName
+
+        private static string GetClassName(IntPtr hRef)
+        {
+            StringBuilder lpClassName = new StringBuilder(256);
+
+            GetClassName(hRef, lpClassName, 256);
+
+            return (lpClassName.ToString());
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region Mouse support
+
+        #region OnCellMouseMove
+
+        ///<summary>
+        /// OnCellMouseMove
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseMove(MouseEventArgs e)
+        {
+        }
+
+        #endregion
+
+        #region OnCellMouseEnter
+
+        ///<summary>
+        /// OnCellMouseEnter
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseEnter(EventArgs e)
+        {
+        }
+
+        #endregion
+
+        #region OnCellMouseLeave
+
+        ///<summary>
+        /// OnCellMouseLeave
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseLeave(EventArgs e)
+        {
+        }
+
+        #endregion
+
+        #region OnCellMouseUp
+
+        ///<summary>
+        /// OnCellMouseUp
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseUp(MouseEventArgs e)
+        {
+        }
+
+        #endregion
+
+        #region OnCellMouseDown
+
+        ///<summary>
+        /// OnCellMouseDown
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseDown(MouseEventArgs e)
+        {
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region Dispose
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        /// <param name="disposing"></param>
+        protected override void Dispose(bool disposing)
+        {
+            if (_CurrentDataManager != null)
+                _CurrentDataManager.ListChanged -= DataManagerListChanged;
+
+            BindingContext = null;
+
+            base.Dispose(disposing);
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/GridComboTreeEditControl.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/GridComboTreeEditControl.cs
new file mode 100644
index 00000000..b3dc50a2
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/GridComboTreeEditControl.cs	
@@ -0,0 +1,622 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+using DevComponents.AdvTree;
+using DevComponents.DotNetBar.SuperGrid.Style;
+using DevComponents.DotNetBar.Controls;
+
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    ///<summary>
+    /// GridComboTreeEditControl
+    ///</summary>
+    [ToolboxItem(false)]
+    public class GridComboTreeEditControl : ComboTree, IGridCellEditControl
+    {
+        #region Private variables
+
+        private GridCell _Cell;
+        private EditorPanel _EditorPanel;
+        private Bitmap _EditorCellBitmap;
+
+        private bool _ValueChanged;
+        private bool _SuspendUpdate;
+        private bool _PanelShown;
+
+        private string _ValueText;
+
+        private StretchBehavior _StretchBehavior = StretchBehavior.None;
+
+        #endregion
+
+        ///<summary>
+        /// GridComboTreeEditControl
+        ///</summary>
+        public GridComboTreeEditControl()
+        {
+            BindingContext = new BindingContext();
+
+            ButtonDropDown.Visible = true;
+        }
+
+        #region Dispose
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        /// <param name="disposing"></param>
+        protected override void Dispose(bool disposing)
+        {
+            BindingContext = null;
+
+            base.Dispose(disposing);
+        }
+
+        #endregion
+
+        #region OnTextChanged
+
+        /// <summary>
+        /// OnTextChanged
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnTextChanged(EventArgs e)
+        {
+            if (IsDisposed == false)
+            {
+                if (_Cell != null && _SuspendUpdate == false)
+                    _Cell.EditorValueChanged(this);
+            }
+
+            base.OnTextChanged(e);
+        }
+
+        #endregion
+
+        #region OnSelectedIndexChanged
+
+        /// <summary>
+        /// OnSelectedIndexChanged
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnSelectedIndexChanged(EventArgs e)
+        {
+            if (IsDisposed == false)
+            {
+                if (_Cell != null && _SuspendUpdate == false)
+                {
+                    _Cell.EditorValueChanged(this);
+
+                    EditorValueChanged = true;
+                }
+            }
+
+            base.OnSelectedIndexChanged(e);
+        }
+
+        #endregion
+
+        #region OnInvalidated
+
+        /// <summary>
+        /// OnInvalidated
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnInvalidated(InvalidateEventArgs e)
+        {
+            base.OnInvalidated(e);
+
+            if (_Cell != null && _SuspendUpdate == false)
+                _Cell.InvalidateRender();
+        }
+
+        #endregion
+
+        #region GetValue
+
+        /// <summary>
+        /// GetValue
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public virtual object GetValue(object value)
+        {
+            GridPanel panel = _Cell.GridPanel;
+
+            if (value == null ||
+                (panel.NullValue == NullValue.DBNull && value == DBNull.Value))
+            {
+                return ("");
+            }
+
+            if (_Cell.IsValueExpression == true)
+                value = _Cell.GetExpValue((string)value);
+
+            return (value);
+        }
+
+        #endregion
+
+        #region SetValue
+
+        private void SetValue(object o)
+        {
+            if (o == null)
+            {
+                _ValueText = "";
+                SelectedIndex = -1;
+            }
+            else
+            {
+                _ValueText = o.ToString();
+
+                if (string.IsNullOrEmpty(ValueMember) == false)
+                {
+                    try
+                    {
+                        SelectedValue = o;
+
+                        if (SelectedValue != null)
+                            _ValueText = Text;
+                    }
+                    catch
+                    {
+                        Text = "";
+                    }
+                }
+                else
+                {
+                    SelectedIndex = -1;
+
+                    string s = o.ToString();
+
+                    if (string.IsNullOrEmpty(s) == false)
+                    {
+                        Node node = AdvTree.FindNodeByCellText(s);
+
+                        if (node != null)
+                        {
+                            SelectedNode = node;
+
+                            if (string.IsNullOrEmpty(SelectedDisplayMember) == false)
+                                _ValueText = GetSelectedDisplayMemberText(node);
+                        }
+                        else
+                        {
+                            Text = s;
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region IGridCellEditControl Members
+
+        #region Public properties
+
+        #region CanInterrupt
+
+        /// <summary>
+        /// CanInterrupt
+        /// </summary>
+        public bool CanInterrupt
+        {
+            get { return (true); }
+        }
+
+        #endregion
+
+        #region CellEditMode
+
+        /// <summary>
+        /// CellEditMode
+        /// </summary>
+        public CellEditMode CellEditMode
+        {
+            get { return (CellEditMode.Modal); }
+        }
+
+        #endregion
+
+        #region EditorCell
+
+        /// <summary>
+        /// EditorCell
+        /// </summary>
+        public GridCell EditorCell
+        {
+            get { return (_Cell); }
+            set { _Cell = value; }
+        }
+
+        #endregion
+
+        #region EditorCellBitmap
+
+        ///<summary>
+        /// EditorCellBitmap
+        ///</summary>
+        public Bitmap EditorCellBitmap
+        {
+            get { return (_EditorCellBitmap); }
+
+            set
+            {
+                if (_EditorCellBitmap != null)
+                    _EditorCellBitmap.Dispose();
+
+                _EditorCellBitmap = value;
+            }
+        }
+
+        #endregion
+
+        #region EditorFormattedValue
+
+        ///<summary>
+        /// EditorFormattedValue
+        ///</summary>
+        public virtual string EditorFormattedValue
+        {
+            get
+            {
+                if (_Cell != null && _Cell.IsValueNull == true)
+                    return (_Cell.NullString);
+
+                return (_ValueText);
+            }
+        }
+
+        #endregion
+
+        #region EditorPanel
+
+        /// <summary>
+        /// EditorPanel
+        /// </summary>
+        public EditorPanel EditorPanel
+        {
+            get { return (_EditorPanel); }
+            set { _EditorPanel = value; }
+        }
+
+        #endregion
+
+        #region EditorValue
+
+        /// <summary>
+        /// EditorValue
+        /// </summary>
+        public virtual object EditorValue
+        {
+            get
+            {
+                if (string.IsNullOrEmpty(ValueMember) == false)
+                    return (SelectedValue);
+
+                return (Text);
+            }
+
+            set { SetValue(GetValue(value)); }
+        }
+
+        #endregion
+
+        #region EditorValueChanged
+
+        /// <summary>
+        /// EditorValueChanged
+        /// </summary>
+        public virtual bool EditorValueChanged
+        {
+            get { return (_ValueChanged); }
+
+            set
+            {
+                if (_ValueChanged != value)
+                {
+                    _ValueChanged = value;
+
+                    if (value == true)
+                        _Cell.SetEditorDirty(this);
+                }
+            }
+        }
+
+        #endregion
+
+        #region EditorValueType
+
+        ///<summary>
+        /// EditorValueType
+        ///</summary>
+        public virtual Type EditorValueType
+        {
+            get { return (typeof(string)); }
+        }
+
+        #endregion
+
+        #region StretchBehavior
+
+        /// <summary>
+        /// StretchBehavior
+        /// </summary>
+        public virtual StretchBehavior StretchBehavior
+        {
+            get { return (_StretchBehavior); }
+            set { _StretchBehavior = value; }
+        }
+
+        #endregion
+
+        #region SuspendUpdate
+
+        /// <summary>
+        /// SuspendUpdate
+        /// </summary>
+        public bool SuspendUpdate
+        {
+            get { return (_SuspendUpdate); }
+            set { _SuspendUpdate = value; }
+        }
+
+        #endregion
+
+        #region ValueChangeBehavior
+
+        /// <summary>
+        /// ValueChangeBehavior
+        /// </summary>
+        public virtual ValueChangeBehavior ValueChangeBehavior
+        {
+            get { return (ValueChangeBehavior.InvalidateRender); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InitializeContext
+
+        ///<summary>
+        /// InitializeContext
+        ///</summary>
+        ///<param name="cell"></param>
+        ///<param name="style"></param>
+        public virtual void InitializeContext(GridCell cell, CellVisualStyle style)
+        {
+            _Cell = cell;
+
+            if (style != null)
+            {
+                Enabled = (_Cell.ReadOnly == false);
+                Font = style.Font;
+                ForeColor = style.TextColor;
+            }
+
+            SetValue(GetValue(_Cell.Value));
+
+            _ValueChanged = false;
+        }
+
+        #endregion
+
+        #region GetProposedSize
+
+        ///<summary>
+        /// GetProposedSize
+        ///</summary>
+        ///<param name="g"></param>
+        ///<param name="cell"></param>
+        ///<param name="style"></param>
+        ///<param name="constraintSize"></param>
+        ///<returns></returns>
+        public virtual Size GetProposedSize(Graphics g,
+            GridCell cell, CellVisualStyle style, Size constraintSize)
+        {            
+            eTextFormat tf = eTextFormat.NoPadding | eTextFormat.NoClipping |
+                             eTextFormat.WordEllipsis | eTextFormat.NoPrefix;
+
+            if (style.AllowWrap == Tbool.True)
+                tf |= eTextFormat.WordBreak;
+
+            string s = String.IsNullOrEmpty(Text) ? " " : Text;
+
+            Size size = (constraintSize.IsEmpty == true)
+                       ? TextHelper.MeasureText(g, s, style.Font, new Size(10000, 0), tf)
+                       : TextHelper.MeasureText(g, s, style.Font, constraintSize, tf);
+
+            if (size.Height < Dpi.Height22)
+                size.Height = Dpi.Height22;
+
+            return (size);
+        }
+
+        #endregion
+
+        #region Edit support
+
+        #region BeginEdit
+
+        /// <summary>
+        /// BeginEdit
+        /// </summary>
+        /// <param name="selectAll"></param>
+        /// <returns></returns>
+        public virtual bool BeginEdit(bool selectAll)
+        {
+            UpdateTreeSize();
+
+            return (false);
+        }
+
+        #endregion
+
+        #region EndEdit
+
+        /// <summary>
+        /// EndEdit
+        /// </summary>
+        /// <returns></returns>
+        public virtual bool EndEdit()
+        {
+            return (false);
+        }
+
+        #endregion
+
+        #region CancelEdit
+
+        /// <summary>
+        /// CancelEdit
+        /// </summary>
+        /// <returns></returns>
+        public virtual bool CancelEdit()
+        {
+            return (false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region CellRender
+
+        /// <summary>
+        /// CellRender
+        /// </summary>
+        /// <param name="g"></param>
+        public virtual void CellRender(Graphics g)
+        {
+            if (_PanelShown == false)
+            {
+                _EditorPanel.Show();
+                _EditorPanel.Hide();
+
+                _PanelShown = true;
+            }
+
+            _Cell.CellRender(this, g);
+        }
+
+        #endregion
+
+        #region Keyboard support
+
+        #region CellKeyDown
+
+        ///<summary>
+        /// CellKeyDown
+        ///</summary>
+        public virtual void CellKeyDown(KeyEventArgs e)
+        {
+            Focus();
+
+            switch (e.KeyData)
+            {
+                default:
+                    OnKeyDown(e);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region WantsInputKey
+
+        /// <summary>
+        /// WantsInputKey
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="gridWantsKey"></param>
+        /// <returns></returns>
+        public virtual bool WantsInputKey(Keys key, bool gridWantsKey)
+        {
+            switch (key & Keys.KeyCode)
+            {
+                case Keys.Space:
+                case Keys.Up:
+                case Keys.Down:
+                    return (true);
+
+                default:
+                    return (gridWantsKey == false);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Mouse support
+
+        #region OnCellMouseMove
+
+        ///<summary>
+        /// OnCellMouseMove
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseMove(MouseEventArgs e)
+        {
+        }
+
+        #endregion
+
+        #region OnCellMouseEnter
+
+        ///<summary>
+        /// OnCellMouseEnter
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseEnter(EventArgs e)
+        {
+        }
+
+        #endregion
+
+        #region OnCellMouseLeave
+
+        ///<summary>
+        /// OnCellMouseLeave
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseLeave(EventArgs e)
+        {
+        }
+
+        #endregion
+
+        #region OnCellMouseUp
+
+        ///<summary>
+        /// OnCellMouseUp
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseUp(MouseEventArgs e)
+        {
+        }
+
+        #endregion
+
+        #region OnCellMouseDown
+
+        ///<summary>
+        /// OnCellMouseDown
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseDown(MouseEventArgs e)
+        {
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/GridDateTimeInputEditControl.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/GridDateTimeInputEditControl.cs
new file mode 100644
index 00000000..929a18ac
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/GridDateTimeInputEditControl.cs	
@@ -0,0 +1,506 @@
+using System;
+using System.ComponentModel;
+using System.Data;
+using System.Data.SqlTypes;
+using System.Drawing;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.SuperGrid.Style;
+using DevComponents.Editors.DateTimeAdv;
+
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    ///<summary>
+    /// GridTextBoxEditControl
+    ///</summary>
+    [ToolboxItem(false)]
+    public class GridDateTimeInputEditControl : DateTimeInput, IGridCellEditControl
+    {
+        #region Private variables
+
+        private GridCell _Cell;
+        private EditorPanel _EditorPanel;
+        private Bitmap _EditorCellBitmap;
+
+        private bool _ValueChanged;
+        private bool _SuspendUpdate;
+
+        private DateTime _OrigValue;
+
+        private StretchBehavior _StretchBehavior = StretchBehavior.None;
+
+        #endregion
+
+        ///<summary>
+        /// GridDateTimeInputEditControl
+        ///</summary>
+        public GridDateTimeInputEditControl()
+        {
+            ShowUpDown = true;
+        }
+
+        #region OnValueChanged
+
+        /// <summary>
+        /// OnValueChanged
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnValueChanged(EventArgs e)
+        {
+            if (_Cell != null && _SuspendUpdate == false)
+            {
+                if (_OrigValue.Year != Value.Year || _OrigValue.Month != Value.Month ||
+                    _OrigValue.Day != Value.Day || _OrigValue.Hour != Value.Hour ||
+                    _OrigValue.Minute != Value.Minute || _OrigValue.Second != Value.Second)
+                {
+                    _Cell.EditorValueChanged(this);
+                }
+            }
+
+            base.OnValueChanged(e);
+        }
+
+        #endregion
+
+        #region GetValue
+
+        /// <summary>
+        /// GetValue
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public virtual DateTime GetValue(object value)
+        {
+            if (value == null || value == Convert.DBNull ||
+                (value is string && String.IsNullOrEmpty((string)value) == true))
+            {
+                return (DateTime.MinValue);
+            }
+
+            if (value is DateTime)
+                return (Convert.ToDateTime(value));
+
+            if (value is SqlDateTime)
+            {
+                SqlDateTime sdt = (SqlDateTime)value;
+
+                if (sdt.IsNull == true)
+                    return (DateTime.MinValue);
+
+                return (sdt.Value);
+            }
+
+            if (_Cell.IsValueExpression == true)
+                value = _Cell.GetExpValue((string)value);
+
+            if (value is string && CurrentCulture != null)
+            {
+                DateTime d;
+
+                if (DateTime.TryParse(value.ToString(), GetActiveCulture().DateTimeFormat,
+                                      System.Globalization.DateTimeStyles.None, out d))
+                {
+                    return (d);
+                }
+            }
+
+            return (Convert.ToDateTime(value));
+        }
+
+        #endregion
+
+        #region IGridCellEditControl Members
+
+        #region Public properties
+
+        #region CanInterrupt
+
+        /// <summary>
+        /// CanInterrupt
+        /// </summary>
+        public bool CanInterrupt
+        {
+            get { return (true); }
+        }
+
+        #endregion
+
+        #region CellEditMode
+
+        /// <summary>
+        /// CellEditMode
+        /// </summary>
+        public CellEditMode CellEditMode
+        {
+            get { return (CellEditMode.Modal); }
+        }
+
+        #endregion
+
+        #region EditorCell
+
+        /// <summary>
+        /// EditorCell
+        /// </summary>
+        public GridCell EditorCell
+        {
+            get { return (_Cell); }
+            set { _Cell = value; }
+        }
+
+        #endregion
+
+        #region EditorCellBitmap
+
+        ///<summary>
+        /// EditorCellBitmap
+        ///</summary>
+        public Bitmap EditorCellBitmap
+        {
+            get { return (_EditorCellBitmap); }
+
+            set
+            {
+                if (_EditorCellBitmap != null)
+                    _EditorCellBitmap.Dispose();
+
+                _EditorCellBitmap = value;
+            }
+        }
+
+        #endregion
+
+        #region EditorPanel
+
+        /// <summary>
+        /// EditorPanel
+        /// </summary>
+        public EditorPanel EditorPanel
+        {
+            get { return (_EditorPanel); }
+            set { _EditorPanel = value; }
+        }
+
+        #endregion
+
+        #region EditorFormattedValue
+
+        ///<summary>
+        /// EditorFormattedValue
+        ///</summary>
+        public virtual string EditorFormattedValue
+        {
+            get 
+            {
+                if (_Cell != null && _Cell.IsValueNull == true)
+                    return (_Cell.NullString);
+
+                return (Text);
+            }
+        }
+
+        #endregion
+
+        #region EditorValue
+
+        /// <summary>
+        /// EditorValue
+        /// </summary>
+        public virtual object EditorValue
+        {
+            get { return (Value); }
+            set { Value = GetValue(value); }
+        }
+
+        #endregion
+
+        #region EditorValueChanged
+
+        /// <summary>
+        /// EditorValueChanged
+        /// </summary>
+        public virtual bool EditorValueChanged
+        {
+            get { return (_ValueChanged); }
+
+            set
+            {
+                if (_ValueChanged != value)
+                {
+                    _ValueChanged = value;
+
+                    if (value == true)
+                        _Cell.SetEditorDirty(this);
+                }
+            }
+        }
+
+        #endregion
+
+        #region EditorValueType
+
+        ///<summary>
+        /// EditorValueType
+        ///</summary>
+        public virtual Type EditorValueType
+        {
+            get { return (typeof(DateTime)); }
+        }
+
+        #endregion
+
+        #region StretchBehavior
+
+        /// <summary>
+        /// StretchBehavior
+        /// </summary>
+        public virtual StretchBehavior StretchBehavior
+        {
+            get { return (_StretchBehavior); }
+            set { _StretchBehavior = value; }
+        }
+
+        #endregion
+
+        #region SuspendUpdate
+
+        /// <summary>
+        /// SuspendUpdate
+        /// </summary>
+        public bool SuspendUpdate
+        {
+            get { return (_SuspendUpdate); }
+            set { _SuspendUpdate = value; }
+        }
+
+        #endregion
+
+        #region ValueChangeBehavior
+
+        /// <summary>
+        /// ValueChangeBehavior
+        /// </summary>
+        public virtual ValueChangeBehavior ValueChangeBehavior
+        {
+            get { return (ValueChangeBehavior.InvalidateRender); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InitializeContext
+
+        ///<summary>
+        /// InitializeContext
+        ///</summary>
+        ///<param name="cell"></param>
+        ///<param name="style"></param>
+        public virtual void InitializeContext(GridCell cell, CellVisualStyle style)
+        {
+            _Cell = cell;
+
+            if (style != null)
+            {
+                Enabled = (_Cell.ReadOnly == false);
+                ForeColor = style.TextColor;
+                Font = style.Font;
+            }
+
+            _OrigValue = GetValue(cell.Value);
+
+            Value = _OrigValue;
+
+            _ValueChanged = false;
+        }
+
+        #endregion
+
+        #region GetProposedSize
+
+        ///<summary>
+        /// GetProposedSize
+        ///</summary>
+        ///<param name="g"></param>
+        ///<param name="cell"></param>
+        ///<param name="style"></param>
+        ///<param name="constraintSize"></param>
+        ///<returns></returns>
+        public virtual Size GetProposedSize(Graphics g,
+            GridCell cell, CellVisualStyle style, Size constraintSize)
+        {
+            Size size = GetPreferredSize(constraintSize);
+
+            return (size);
+        }
+
+        #endregion
+
+        #region Edit support
+
+        #region BeginEdit
+
+        /// <summary>
+        /// BeginEdit
+        /// </summary>
+        /// <param name="selectAll"></param>
+        /// <returns></returns>
+        public virtual bool BeginEdit(bool selectAll)
+        {
+            Show();
+            Focus();
+
+            return (false);
+        }
+
+        #endregion
+
+        #region EndEdit
+
+        /// <summary>
+        /// EndEdit
+        /// </summary>
+        /// <returns></returns>
+        public virtual bool EndEdit()
+        {
+            return (false);
+        }
+
+        #endregion
+
+        #region CancelEdit
+
+        /// <summary>
+        /// CancelEdit
+        /// </summary>
+        /// <returns></returns>
+        public virtual bool CancelEdit()
+        {
+            return (false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region CellRender
+
+        /// <summary>
+        /// CellRender
+        /// </summary>
+        /// <param name="g"></param>
+        public virtual void CellRender(Graphics g)
+        {
+            _Cell.CellRender(this, g);
+        }
+
+        #endregion
+
+        #region Keyboard support
+
+        #region CellKeyDown
+
+        ///<summary>
+        /// CellKeyDown
+        ///</summary>
+        public virtual void CellKeyDown(KeyEventArgs e)
+        {
+        }
+
+        #endregion
+
+        #region WantsInputKey
+
+        /// <summary>
+        /// WantsInputKey
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="gridWantsKey"></param>
+        /// <returns></returns>
+        public virtual bool WantsInputKey(Keys key, bool gridWantsKey)
+        {
+            switch (key & Keys.KeyCode)
+            {
+                case Keys.Left:
+                case Keys.Right:
+                case Keys.Home:
+                case Keys.End:
+                case Keys.Up:
+                case Keys.Down:
+                    return (true);
+
+                default:
+                    return (gridWantsKey == false);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Mouse support
+
+        #region OnCellMouseMove
+
+        ///<summary>
+        /// OnCellMouseMove
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseMove(MouseEventArgs e)
+        {
+        }
+
+        #endregion
+
+        #region OnCellMouseEnter
+
+        ///<summary>
+        /// OnCellMouseEnter
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseEnter(EventArgs e)
+        {
+        }
+
+        #endregion
+
+        #region OnCellMouseLeave
+
+        ///<summary>
+        /// OnCellMouseLeave
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseLeave(EventArgs e)
+        {
+        }
+
+        #endregion
+
+        #region OnCellMouseUp
+
+        ///<summary>
+        /// OnCellMouseUp
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseUp(MouseEventArgs e)
+        {
+        }
+
+        #endregion
+
+        #region OnCellMouseDown
+
+        ///<summary>
+        /// OnCellMouseDown
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseDown(MouseEventArgs e)
+        {
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/GridDateTimePickerEditControl.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/GridDateTimePickerEditControl.cs
new file mode 100644
index 00000000..ebf04b51
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/GridDateTimePickerEditControl.cs	
@@ -0,0 +1,490 @@
+using System;
+using System.ComponentModel;
+using System.Data.SqlTypes;
+using System.Drawing;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.SuperGrid.Style;
+
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    ///<summary>
+    /// GridDateTimePickerEditControl
+    ///</summary>
+    [ToolboxItem(false)]
+    public class GridDateTimePickerEditControl : DateTimePicker, IGridCellEditControl
+    {
+        #region Private variables
+
+        private GridCell _Cell;
+        private EditorPanel _EditorPanel;
+        private Bitmap _EditorCellBitmap;
+
+        private bool _ValueChanged;
+        private bool _SuspendUpdate;
+
+        private StretchBehavior _StretchBehavior = StretchBehavior.None;
+
+        #endregion
+
+        ///<summary>
+        ///GridDateTimePickerEditControl
+        ///</summary>
+        public GridDateTimePickerEditControl()
+        {
+            Format = DateTimePickerFormat.Short;
+        }
+
+        #region OnValueChanged
+
+        /// <summary>
+        /// OnValueChanged
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnValueChanged(EventArgs e)
+        {
+            if (_Cell != null && _SuspendUpdate == false)
+                _Cell.EditorValueChanged(this);
+
+            base.OnValueChanged(e);
+        }
+
+        #endregion
+
+        #region GetValue
+
+        /// <summary>
+        /// GetValue
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public virtual DateTime GetValue(object value)
+        {
+            if (value == null || value == Convert.DBNull ||
+                (value is string && String.IsNullOrEmpty((string)value) == true))
+            {
+                return (MinDate);
+            }
+
+            if (value is DateTime)
+                return ((DateTime)value);
+
+            if (value is SqlDateTime)
+            {
+                SqlDateTime sdt = (SqlDateTime)value;
+
+                if (sdt.IsNull == true)
+                    return (DateTime.MinValue);
+
+                return (sdt.Value);
+            }
+
+            if (_Cell.IsValueExpression == true)
+                value = _Cell.GetExpValue((string)value);
+
+            return (Convert.ToDateTime(value));
+        }
+
+        #endregion
+
+        #region IGridCellEditControl Members
+
+        #region Public properties
+
+        #region CanInterrupt
+
+        /// <summary>
+        /// CanInterrupt
+        /// </summary>
+        public bool CanInterrupt
+        {
+            get { return (true); }
+        }
+
+        #endregion
+
+        #region CellEditMode
+
+        /// <summary>
+        /// CellEditMode
+        /// </summary>
+        public CellEditMode CellEditMode
+        {
+            get { return (CellEditMode.Modal); }
+        }
+
+        #endregion
+
+        #region EditorCell
+
+        /// <summary>
+        /// EditorCell
+        /// </summary>
+        public GridCell EditorCell
+        {
+            get { return (_Cell); }
+            set { _Cell = value; }
+        }
+
+        #endregion
+
+        #region EditorCellBitmap
+
+        ///<summary>
+        /// EditorCellBitmap
+        ///</summary>
+        public Bitmap EditorCellBitmap
+        {
+            get { return (_EditorCellBitmap); }
+
+            set
+            {
+                if (_EditorCellBitmap != null)
+                    _EditorCellBitmap.Dispose();
+
+                _EditorCellBitmap = value;
+            }
+        }
+
+        #endregion
+
+        #region EditorFormattedValue
+
+        ///<summary>
+        /// EditorFormattedValue
+        ///</summary>
+        public virtual string EditorFormattedValue
+        {
+            get
+            {
+                if (_Cell != null && _Cell.IsValueNull == true)
+                    return (_Cell.NullString);
+
+                return (Text);
+            }
+        }
+
+        #endregion
+
+        #region EditorPanel
+
+        /// <summary>
+        /// EditorPanel
+        /// </summary>
+        public EditorPanel EditorPanel
+        {
+            get { return (_EditorPanel); }
+            set { _EditorPanel = value; }
+        }
+
+        #endregion
+
+        #region EditorValue
+
+        /// <summary>
+        /// EditorValue
+        /// </summary>
+        public virtual object EditorValue
+        {
+            get { return (Value); }
+            set { Value = GetValue(value); }
+        }
+
+        #endregion
+
+        #region EditorValueChanged
+
+        /// <summary>
+        /// EditorValueChanged
+        /// </summary>
+        public virtual bool EditorValueChanged
+        {
+            get { return (_ValueChanged); }
+
+            set
+            {
+                if (_ValueChanged != value)
+                {
+                    _ValueChanged = value;
+
+                    if (value == true)
+                        _Cell.SetEditorDirty(this);
+                }
+            }
+        }
+
+        #endregion
+
+        #region EditorValueType
+
+        ///<summary>
+        /// EditorValueType
+        ///</summary>
+        public virtual Type EditorValueType
+        {
+            get { return (typeof(DateTime)); }
+        }
+
+        #endregion
+
+        #region StretchBehavior
+
+        /// <summary>
+        /// StretchBehavior
+        /// </summary>
+        public virtual StretchBehavior StretchBehavior
+        {
+            get { return (_StretchBehavior); }
+            set { _StretchBehavior = value; }
+        }
+
+        #endregion
+
+        #region SuspendUpdate
+
+        /// <summary>
+        /// SuspendUpdate
+        /// </summary>
+        public bool SuspendUpdate
+        {
+            get { return (_SuspendUpdate); }
+            set { _SuspendUpdate = value; }
+        }
+
+        #endregion
+
+        #region ValueChangeBehavior
+
+        /// <summary>
+        /// ValueChangeBehavior
+        /// </summary>
+        public virtual ValueChangeBehavior ValueChangeBehavior
+        {
+            get { return (ValueChangeBehavior.InvalidateRender); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InitializeContext
+
+        ///<summary>
+        /// InitializeContext
+        ///</summary>
+        ///<param name="cell"></param>
+        ///<param name="style"></param>
+        public virtual void InitializeContext(GridCell cell, CellVisualStyle style)
+        {
+            _Cell = cell;
+
+            if (style != null)
+            {
+                // Control colors are tied to Windows System Colors
+                // therefore there is not an easy way to pass along color settings.
+
+                Enabled = (_Cell.ReadOnly == false);
+                Font = style.Font;
+            }
+
+            Value = GetValue(cell.Value);
+
+            _ValueChanged = false;
+        }
+
+        #endregion
+
+        #region GetProposedSize
+
+        ///<summary>
+        /// GetProposedSize
+        ///</summary>
+        ///<param name="g"></param>
+        ///<param name="cell"></param>
+        ///<param name="style"></param>
+        ///<param name="constraintSize"></param>
+        ///<returns></returns>
+        public virtual Size GetProposedSize(Graphics g,
+            GridCell cell, CellVisualStyle style, Size constraintSize)
+        {
+            Size size = GetPreferredSize(constraintSize);
+
+            return (size);
+        }
+
+        #endregion
+
+        #region Edit support
+
+        #region BeginEdit
+
+        /// <summary>
+        /// BeginEdit
+        /// </summary>
+        /// <param name="selectAll"></param>
+        /// <returns></returns>
+        public virtual bool BeginEdit(bool selectAll)
+        {
+            // We seem to have to recreate the control to override it's
+            // internal client area offsetting when previously sized too
+            // small for the given constraintSize
+
+            //RecreateHandle();
+
+            Show();
+            Focus();
+
+            return (false);
+        }
+
+        #endregion
+
+        #region EndEdit
+
+        /// <summary>
+        /// EndEdit
+        /// </summary>
+        /// <returns></returns>
+        public virtual bool EndEdit()
+        {
+            return (false);
+        }
+
+        #endregion
+
+        #region CancelEdit
+
+        /// <summary>
+        /// CancelEdit
+        /// </summary>
+        /// <returns></returns>
+        public virtual bool CancelEdit()
+        {
+            return (false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region CellRender
+
+        /// <summary>
+        /// CellRender
+        /// </summary>
+        /// <param name="g"></param>
+        public virtual void CellRender(Graphics g)
+        {
+            _Cell.CellRender(this, g);
+        }
+
+        #endregion
+
+        #region Keyboard support
+
+        #region CellKeyDown
+
+        ///<summary>
+        /// CellKeyDown
+        ///</summary>
+        public virtual void CellKeyDown(KeyEventArgs e)
+        {
+        }
+
+        #endregion
+
+        #region WantsInputKey
+
+        /// <summary>
+        /// WantsInputKey
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="gridWantsKey"></param>
+        /// <returns></returns>
+        public virtual bool WantsInputKey(Keys key, bool gridWantsKey)
+        {
+            switch (key & Keys.KeyCode)
+            {
+                case Keys.Left:
+                case Keys.Right:
+                case Keys.Home:
+                case Keys.End:
+                case Keys.Up:
+                case Keys.Down:
+                    return (true);
+
+                default:
+                    return (gridWantsKey == false);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Mouse support
+
+        #region OnCellMouseMove
+
+        ///<summary>
+        /// OnCellMouseMove
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseMove(MouseEventArgs e)
+        {
+        }
+
+        #endregion
+
+        #region OnCellMouseEnter
+
+        ///<summary>
+        /// OnCellMouseEnter
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseEnter(EventArgs e)
+        {
+        }
+
+        #endregion
+
+        #region OnCellMouseLeave
+
+        ///<summary>
+        /// OnCellMouseLeave
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseLeave(EventArgs e)
+        {
+        }
+
+        #endregion
+
+        #region OnCellMouseUp
+
+        ///<summary>
+        /// OnCellMouseUp
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseUp(MouseEventArgs e)
+        {
+        }
+
+        #endregion
+
+        #region OnCellMouseDown
+
+        ///<summary>
+        /// OnCellMouseDown
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseDown(MouseEventArgs e)
+        {
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/GridDoubleInputEditControl.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/GridDoubleInputEditControl.cs
new file mode 100644
index 00000000..378824bb
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/GridDoubleInputEditControl.cs	
@@ -0,0 +1,621 @@
+using System;
+using System.ComponentModel;
+using System.Data.SqlTypes;
+using System.Drawing;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.SuperGrid.Style;
+using DevComponents.Editors;
+
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    ///<summary>
+    /// GridDoubleInputEditControl
+    ///</summary>
+    [ToolboxItem(false)]
+    public class GridDoubleInputEditControl : DoubleInput, IGridCellEditControl, IGridCellEditorFocus
+    {
+        #region Private variables
+
+        private GridCell _Cell;
+        private EditorPanel _EditorPanel;
+        private Bitmap _EditorCellBitmap;
+
+        private bool _ValueChanged;
+        private bool _SuspendUpdate;
+
+        private StretchBehavior _StretchBehavior = StretchBehavior.None;
+
+        #endregion
+
+        ///<summary>
+        /// GridIntegerInputEditControl
+        ///</summary>
+        public GridDoubleInputEditControl()
+        {
+            InitInputControl(false);
+        }
+
+        #region InitInputControl
+
+        /// <summary>
+        /// InitInputControl
+        /// </summary>
+        /// <param name="isIntegral"></param>
+        protected void InitInputControl(bool isIntegral)
+        {
+            ShowUpDown = true;
+
+            if (isIntegral == true)
+                DisplayFormat = "G";
+        }
+
+        #endregion
+
+        #region OnValueChanged
+
+        /// <summary>
+        /// OnValueChanged
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnValueChanged(EventArgs e)
+        {
+            if (_Cell != null && _SuspendUpdate == false)
+                _Cell.EditorValueChanged(this);
+
+            base.OnValueChanged(e);
+        }
+
+        #endregion
+
+        #region GetValue
+
+        ///<summary>
+        /// GetValue
+        ///</summary>
+        ///<param name="value"></param>
+        ///<returns></returns>
+        public virtual double GetValue(object value)
+        {
+            GridPanel panel = _Cell.GridPanel;
+
+            if (value == null ||
+                (panel.NullValue == NullValue.DBNull && value == DBNull.Value))
+            {
+                return (0);
+            }
+
+            if (value is SqlSingle)
+            {
+                SqlSingle sdt = (SqlSingle)value;
+
+                if (sdt.IsNull == true)
+                    return (0);
+
+                return (sdt.Value);
+            }
+
+            if (value is SqlDouble)
+            {
+                SqlDouble sdt = (SqlDouble)value;
+
+                if (sdt.IsNull == true)
+                    return (0);
+
+                return (sdt.Value);
+            }
+
+            if (value is SqlDecimal)
+            {
+                SqlDecimal sdt = (SqlDecimal)value;
+
+                if (sdt.IsNull == true)
+                    return (0);
+
+                return (Convert.ToDouble(sdt.Value));
+            }
+
+            if (value is SqlInt64)
+            {
+                SqlDecimal sdt = (SqlInt64)value;
+
+                if (sdt.IsNull == true)
+                    return (0);
+
+                return (Convert.ToDouble(sdt.Value));
+            }
+
+            if (_Cell.IsValueExpression == true)
+                value = _Cell.GetExpValue((string)value);
+
+            return (Convert.ToDouble(value));
+        }
+
+        #endregion
+
+        #region IGridCellEditControl Members
+
+        #region Public properties
+
+        #region CanInterrupt
+
+        /// <summary>
+        /// CanInterrupt
+        /// </summary>
+        public bool CanInterrupt
+        {
+            get { return (true); }
+        }
+
+        #endregion
+
+        #region CellEditMode
+
+        /// <summary>
+        /// CellEditMode
+        /// </summary>
+        public CellEditMode CellEditMode
+        {
+            get { return (CellEditMode.Modal); }
+        }
+
+        #endregion
+
+        #region EditorCell
+
+        /// <summary>
+        /// EditorCell
+        /// </summary>
+        public GridCell EditorCell
+        {
+            get { return (_Cell); }
+            set { _Cell = value; }
+        }
+
+        #endregion
+
+        #region EditorCellBitmap
+
+        ///<summary>
+        /// EditorCellBitmap
+        ///</summary>
+        public Bitmap EditorCellBitmap
+        {
+            get { return (_EditorCellBitmap); }
+
+            set
+            {
+                if (_EditorCellBitmap != null)
+                    _EditorCellBitmap.Dispose();
+
+                _EditorCellBitmap = value;
+            }
+        }
+
+        #endregion
+
+        #region EditorFormattedValue
+
+        ///<summary>
+        /// EditorFormattedValue
+        ///</summary>
+        public virtual string EditorFormattedValue
+        {
+            get
+            {
+                if (_Cell != null && _Cell.IsValueNull == true)
+                    return (_Cell.NullString);
+
+                return (Text);
+            }
+        }
+
+        #endregion
+
+        #region EditorPanel
+
+        /// <summary>
+        /// EditorPanel
+        /// </summary>
+        public EditorPanel EditorPanel
+        {
+            get { return (_EditorPanel); }
+            set { _EditorPanel = value; }
+        }
+
+        #endregion
+
+        #region EditorValue
+
+        /// <summary>
+        /// EditorValue
+        /// </summary>
+        public virtual object EditorValue
+        {
+            get { return (Value); }
+            set { Value = GetValue(value); }
+        }
+
+        #endregion
+
+        #region EditorValueChanged
+
+        /// <summary>
+        /// EditorValueChanged
+        /// </summary>
+        public virtual bool EditorValueChanged
+        {
+            get { return (_ValueChanged); }
+
+            set
+            {
+                if (_ValueChanged != value)
+                {
+                    _ValueChanged = value;
+
+                    if (value == true)
+                        _Cell.SetEditorDirty(this);
+                }
+            }
+        }
+
+        #endregion
+
+        #region EditorValueType
+
+        ///<summary>
+        /// EditorValueType
+        ///</summary>
+        public virtual Type EditorValueType
+        {
+            get { return (typeof(double)); }
+        }
+
+        #endregion
+
+        #region StretchBehavior
+
+        /// <summary>
+        /// StretchBehavior
+        /// </summary>
+        public virtual StretchBehavior StretchBehavior
+        {
+            get { return (_StretchBehavior); }
+            set { _StretchBehavior = value; }
+        }
+
+        #endregion
+
+        #region SuspendUpdate
+
+        /// <summary>
+        /// SuspendUpdate
+        /// </summary>
+        public bool SuspendUpdate
+        {
+            get { return (_SuspendUpdate); }
+            set { _SuspendUpdate = value; }
+        }
+
+        #endregion
+
+        #region ValueChangeBehavior
+
+        /// <summary>
+        /// ValueChangeBehavior
+        /// </summary>
+        public virtual ValueChangeBehavior ValueChangeBehavior
+        {
+            get { return (ValueChangeBehavior.InvalidateRender); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InitializeContext
+
+        ///<summary>
+        /// InitializeContext
+        ///</summary>
+        ///<param name="cell"></param>
+        ///<param name="style"></param>
+        public virtual void InitializeContext(GridCell cell, CellVisualStyle style)
+        {
+            _Cell = cell;
+
+            if (style != null)
+            {
+                Enabled = (_Cell.ReadOnly == false);
+                Font = style.Font;
+                ForeColor = style.TextColor;
+            }
+
+            Value = GetValue(cell.Value);
+
+            _ValueChanged = false;
+        }
+
+        #endregion
+
+        #region GetProposedSize
+
+        ///<summary>
+        /// GetProposedSize
+        ///</summary>
+        ///<param name="g"></param>
+        ///<param name="cell"></param>
+        ///<param name="style"></param>
+        ///<param name="constraintSize"></param>
+        ///<returns></returns>
+        public virtual Size GetProposedSize(Graphics g,
+            GridCell cell, CellVisualStyle style, Size constraintSize)
+        {
+            Size size = GetPreferredSize(constraintSize);
+
+            return (size);
+        }
+
+        #endregion
+
+        #region Edit support
+
+        #region BeginEdit
+
+        /// <summary>
+        /// BeginEdit
+        /// </summary>
+        /// <param name="selectAll"></param>
+        /// <returns></returns>
+        public virtual bool BeginEdit(bool selectAll)
+        {
+            if (FreeTextEntryMode == true)
+            {
+                TextBox box = GetFreeTextBox() as TextBox;
+
+                if (box != null)
+                {
+                    if (selectAll == true)
+                        box.SelectAll();
+                }
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region EndEdit
+
+        /// <summary>
+        /// EndEdit
+        /// </summary>
+        /// <returns></returns>
+        public virtual bool EndEdit()
+        {
+            CloseDropDown();
+
+            return (false);
+        }
+
+        #endregion
+
+        #region CancelEdit
+
+        /// <summary>
+        /// CancelEdit
+        /// </summary>
+        /// <returns></returns>
+        public virtual bool CancelEdit()
+        {
+            CloseDropDown();
+
+            return (false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region CellRender
+
+        /// <summary>
+        /// CellRender
+        /// </summary>
+        /// <param name="g"></param>
+        public virtual void CellRender(Graphics g)
+        {
+            _Cell.CellRender(this, g);
+        }
+
+        #endregion
+
+        #region Keyboard support
+
+        #region CellKeyDown
+
+        ///<summary>
+        /// CellKeyDown
+        ///</summary>
+        public virtual void CellKeyDown(KeyEventArgs e)
+        {
+        }
+
+        #endregion
+
+        #region WantsInputKey
+
+        /// <summary>
+        /// WantsInputKey
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="gridWantsKey"></param>
+        /// <returns></returns>
+        public virtual bool WantsInputKey(Keys key, bool gridWantsKey)
+        {
+            if ((key & Keys.KeyCode) == Keys.Tab)
+            {
+                ApplyFreeTextValue();
+
+                return (false);
+            }
+
+            if (IsCalculatorDisplayed == true)
+                return (true);
+
+            switch (key & Keys.KeyCode)
+            {
+                case Keys.Left:
+                case Keys.Right:
+                case Keys.Home:
+                case Keys.End:
+                case Keys.Up:
+                case Keys.Down:
+                    return (true);
+
+                case Keys.Enter:
+                    ApplyFreeTextValue();
+                    return (gridWantsKey == false);
+
+                default:
+                    return (gridWantsKey == false);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Mouse support
+
+        #region OnCellMouseMove
+
+        ///<summary>
+        /// OnCellMouseMove
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseMove(MouseEventArgs e)
+        {
+        }
+
+        #endregion
+
+        #region OnCellMouseEnter
+
+        ///<summary>
+        /// OnCellMouseEnter
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseEnter(EventArgs e)
+        {
+        }
+
+        #endregion
+
+        #region OnCellMouseLeave
+
+        ///<summary>
+        /// OnCellMouseLeave
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseLeave(EventArgs e)
+        {
+        }
+
+        #endregion
+
+        #region OnCellMouseUp
+
+        ///<summary>
+        /// OnCellMouseUp
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseUp(MouseEventArgs e)
+        {
+        }
+
+        #endregion
+
+        #region OnCellMouseDown
+
+        ///<summary>
+        /// OnCellMouseDown
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseDown(MouseEventArgs e)
+        {
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region IGridCellEditorFocus members
+
+        #region FocusEditor
+
+        /// <summary>
+        /// Gives focus to the editor
+        /// </summary>
+        public void FocusEditor()
+        {
+            if (IsEditorFocused == false)
+            {
+                if (FreeTextEntryMode == true)
+                {
+                    TextBox box = GetFreeTextBox() as TextBox;
+
+                    if (box != null)
+                        box.Focus();
+                }
+                else
+                {
+                    Focus();
+                }
+            }
+        }
+
+        #endregion
+
+        #region IsEditorFocused
+
+        /// <summary>
+        /// Gets whether editor has the focus
+        /// </summary>
+        public bool IsEditorFocused
+        {
+            get
+            {
+                if (FreeTextEntryMode == true)
+                {
+                    TextBox box = GetFreeTextBox() as TextBox;
+
+                    if (box != null)
+                        return (box.Focused);
+                }
+
+                return (Focused);
+            }
+        }
+
+        #endregion
+
+        #endregion
+    }
+
+    ///<summary>
+    /// GridDoubleIntInputEditControl
+    ///</summary>
+    [ToolboxItem(false)]
+    public class GridDoubleIntInputEditControl : GridDoubleInputEditControl
+    {
+        ///<summary>
+        /// GridDoubleIntInputEditControl
+        ///</summary>
+        public GridDoubleIntInputEditControl()
+        {
+            InitInputControl(true);
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/GridGaugeEditControl.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/GridGaugeEditControl.cs
new file mode 100644
index 00000000..9210f6d6
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/GridGaugeEditControl.cs	
@@ -0,0 +1,548 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.SuperGrid.Style;
+using DevComponents.Instrumentation;
+
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    ///<summary>
+    /// GridGaugeEditControl
+    ///</summary>
+    [ToolboxItem(false)]
+    public class GridGaugeEditControl : GaugeControl, IGridCellEditControl
+    {
+        #region Private variables
+
+        private GridCell _Cell;
+        private EditorPanel _EditorPanel;
+        private Bitmap _EditorCellBitmap;
+
+        private bool _ValueChanged;
+        private bool _SuspendUpdate;
+
+        private string _PointerName = "Pointer1";
+
+        private StretchBehavior _StretchBehavior = StretchBehavior.Both;
+
+        #endregion
+
+        ///<summary>
+        /// GridGaugeEditControl
+        ///</summary>
+        public GridGaugeEditControl()
+        {
+            PointerValueChanged += OnValueChanged;
+#if !TRIAL
+            LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F";
+#endif
+        }
+
+        #region Public properties
+
+        ///<summary>
+        /// PointerName
+        ///</summary>
+        public string PointerName
+        {
+            get { return (_PointerName); }
+            set { _PointerName = value; }
+        }
+
+        #endregion
+
+        #region OnValueChanged
+
+        /// <summary>
+        /// Pointer Value changed
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected virtual void OnValueChanged(object sender, PointerChangedEventArgs e)
+        {
+            if (_Cell != null && _SuspendUpdate == false)
+            {
+                _Cell.Value = e.NewValue;
+                _Cell.EditorValueChanged(this);
+            }
+        }
+
+        #endregion
+
+        #region OnInvalidated
+
+        /// <summary>
+        /// OnInvalidated
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnInvalidated(InvalidateEventArgs e)
+        {
+            base.OnInvalidated(e);
+
+            if (_Cell != null && _SuspendUpdate == false)
+                _Cell.InvalidateRender();
+        }
+
+        #endregion
+
+        #region OnPaintBackground
+
+        /// <summary>
+        /// OnPaintBackground
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnPaintBackground(PaintEventArgs e)
+        {
+            _Cell.PaintEditorBackground(e, this);
+        }
+
+        #endregion
+
+        #region GetValue
+
+        ///<summary>
+        /// GetValue
+        ///</summary>
+        ///<param name="value"></param>
+        ///<returns></returns>
+        public virtual double GetValue(object value)
+        {
+            GridPanel panel = _Cell.GridPanel;
+
+            if (value == null ||
+                (panel.NullValue == NullValue.DBNull && value == DBNull.Value))
+            {
+                return (0);
+            }
+
+            if (_Cell.IsValueExpression == true)
+                value = _Cell.GetExpValue((string)value);
+
+            return (Convert.ToDouble(value));
+        }
+
+        #endregion
+
+        #region IGridCellEditControl Members
+
+        #region Public properties
+
+        #region CanInterrupt
+
+        /// <summary>
+        /// CanInterrupt
+        /// </summary>
+        public bool CanInterrupt
+        {
+            get { return (true); }
+        }
+
+        #endregion
+
+        #region CellEditMode
+
+        /// <summary>
+        /// CellEditMode
+        /// </summary>
+        public CellEditMode CellEditMode
+        {
+            get { return (CellEditMode.InPlace); }
+        }
+
+        #endregion
+
+        #region EditorCell
+
+        /// <summary>
+        /// EditorCell
+        /// </summary>
+        public GridCell EditorCell
+        {
+            get { return (_Cell); }
+            set { _Cell = value; }
+        }
+
+        #endregion
+
+        #region EditorCellBitmap
+
+        ///<summary>
+        /// EditorCellBitmap
+        ///</summary>
+        public Bitmap EditorCellBitmap
+        {
+            get { return (_EditorCellBitmap); }
+
+            set
+            {
+                if (_EditorCellBitmap != null)
+                    _EditorCellBitmap.Dispose();
+
+                _EditorCellBitmap = value;
+            }
+        }
+
+        #endregion
+
+        #region EditorFormattedValue
+
+        ///<summary>
+        /// EditorFormattedValue
+        ///</summary>
+        public virtual string EditorFormattedValue
+        {
+            get { return (Text); }
+        }
+
+        #endregion
+
+        #region EditorPanel
+
+        /// <summary>
+        /// EditorPanel
+        /// </summary>
+        public EditorPanel EditorPanel
+        {
+            get { return (_EditorPanel); }
+            set { _EditorPanel = value; }
+        }
+
+        #endregion
+
+        #region EditorValue
+
+        /// <summary>
+        /// EditorValue
+        /// </summary>
+        public virtual object EditorValue
+        {
+            get { return (GetPointerValue(_PointerName)); }
+            set { SetPointerValue(_PointerName, GetValue(value), false); }
+        }
+
+        #endregion
+
+        #region EditorValueChanged
+
+        /// <summary>
+        /// EditorValueChanged
+        /// </summary>
+        public virtual bool EditorValueChanged
+        {
+            get { return (_ValueChanged); }
+
+            set
+            {
+                if (_ValueChanged != value)
+                {
+                    _ValueChanged = value;
+
+                    if (value == true)
+                        _Cell.SetEditorDirty(this);
+                }
+            }
+        }
+
+        #endregion
+
+        #region EditorValueType
+
+        ///<summary>
+        /// EditorValueType
+        ///</summary>
+        public virtual Type EditorValueType
+        {
+            get { return (typeof(string)); }
+        }
+
+        #endregion
+
+        #region StretchBehavior
+
+        /// <summary>
+        /// StretchBehavior
+        /// </summary>
+        public virtual StretchBehavior StretchBehavior
+        {
+            get { return (_StretchBehavior); }
+            set { _StretchBehavior = value; }
+        }
+
+        #endregion
+
+        #region SuspendUpdate
+
+        /// <summary>
+        /// SuspendUpdate
+        /// </summary>
+        public bool SuspendUpdate
+        {
+            get { return (_SuspendUpdate); }
+            set { _SuspendUpdate = value; }
+        }
+
+        #endregion
+
+        #region ValueChangeBehavior
+
+        /// <summary>
+        /// ValueChangeBehavior
+        /// </summary>
+        public virtual ValueChangeBehavior ValueChangeBehavior
+        {
+            get { return (ValueChangeBehavior.InvalidateRender); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InitializeContext
+
+        ///<summary>
+        /// InitializeContext
+        ///</summary>
+        ///<param name="cell"></param>
+        ///<param name="style"></param>
+        public virtual void InitializeContext(GridCell cell, CellVisualStyle style)
+        {
+            _Cell = cell;
+
+            if (style != null)
+            {
+                Enabled = (_Cell.ReadOnly == false);
+                Font = style.Font;
+                ForeColor = style.TextColor;
+            }
+
+            SetPointerValue(_PointerName, GetValue(_Cell.Value), false);
+
+            _ValueChanged = false;
+        }
+
+        #endregion
+
+        #region GetProposedSize
+
+        ///<summary>
+        /// GetProposedSize
+        ///</summary>
+        ///<param name="g"></param>
+        ///<param name="cell"></param>
+        ///<param name="style"></param>
+        ///<param name="constraintSize"></param>
+        ///<returns></returns>
+        public virtual Size GetProposedSize(Graphics g,
+            GridCell cell, CellVisualStyle style, Size constraintSize)
+        {
+            Size size = constraintSize;
+            size.Height = size.Width;
+
+            if (size.Width == 0)
+                size.Width = cell.Size.Width - Dpi.Width2;
+
+            size.Height = Dpi.Height50;
+
+            return (size);
+        }
+
+        #endregion
+
+        #region Edit support
+
+        #region BeginEdit
+
+        /// <summary>
+        /// BeginEdit
+        /// </summary>
+        /// <param name="selectAll"></param>
+        /// <returns></returns>
+        public virtual bool BeginEdit(bool selectAll)
+        {
+            return (false);
+        }
+
+        #endregion
+
+        #region EndEdit
+
+        /// <summary>
+        /// EndEdit
+        /// </summary>
+        /// <returns></returns>
+        public virtual bool EndEdit()
+        {
+            return (false);
+        }
+
+        #endregion
+
+        #region CancelEdit
+
+        /// <summary>
+        /// CancelEdit
+        /// </summary>
+        /// <returns></returns>
+        public virtual bool CancelEdit()
+        {
+            return (false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region CellRender
+
+        /// <summary>
+        /// CellRender
+        /// </summary>
+        /// <param name="g"></param>
+        public virtual void CellRender(Graphics g)
+        {
+            _Cell.CellRender(this, g);
+        }
+
+        #endregion
+
+        #region Keyboard support
+
+        #region CellKeyDown
+
+        ///<summary>
+        /// CellKeyDown
+        ///</summary>
+        public virtual void CellKeyDown(KeyEventArgs e)
+        {
+            switch (e.KeyData)
+            {
+                case Keys.T:
+                    break;
+
+                case Keys.F:
+                    break;
+
+                default:
+                    OnKeyDown(e);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region WantsInputKey
+
+        /// <summary>
+        /// WantsInputKey
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="gridWantsKey"></param>
+        /// <returns></returns>
+        public virtual bool WantsInputKey(Keys key, bool gridWantsKey)
+        {
+            switch (key & Keys.KeyCode)
+            {
+                case Keys.T:
+                case Keys.F:
+                case Keys.Space:
+                    return (true);
+
+                default:
+                    return (gridWantsKey == false);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Mouse support
+
+        #region OnCellMouseMove
+
+        ///<summary>
+        /// OnCellMouseMove
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseMove(MouseEventArgs e)
+        {
+            OnMouseMove(e);
+
+            _Cell.SuperGrid.GridCursor = Cursor;
+        }
+
+        #endregion
+
+        #region OnCellMouseEnter
+
+        ///<summary>
+        /// OnCellMouseEnter
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseEnter(EventArgs e)
+        {
+            OnMouseEnter(e);
+        }
+
+        #endregion
+
+        #region OnCellMouseLeave
+
+        ///<summary>
+        /// OnCellMouseLeave
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseLeave(EventArgs e)
+        {
+            OnMouseLeave(e);
+        }
+
+        #endregion
+
+        #region OnCellMouseUp
+
+        ///<summary>
+        /// OnCellMouseUp
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseUp(MouseEventArgs e)
+        {
+            OnMouseUp(e);
+        }
+
+        #endregion
+
+        #region OnCellMouseDown
+
+        ///<summary>
+        /// OnCellMouseDown
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseDown(MouseEventArgs e)
+        {
+            OnMouseDown(e);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion  
+
+        #region Dispose
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        /// <param name="disposing"></param>
+        protected override void Dispose(bool disposing)
+        {
+            PointerValueChanged -= OnValueChanged;
+
+            base.Dispose(disposing);
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/GridImageEditControl.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/GridImageEditControl.cs
new file mode 100644
index 00000000..d21d0553
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/GridImageEditControl.cs	
@@ -0,0 +1,900 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.IO;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.SuperGrid.Style;
+
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    ///<summary>
+    /// GridImageEditControl
+    ///</summary>
+    [ToolboxItem(false)]
+    public class GridImageEditControl : Control, IGridCellEditControl
+    {
+        #region Private variables
+
+        private GridCell _Cell;
+        private EditorPanel _EditorPanel;
+        private Bitmap _EditorCellBitmap;
+
+        private bool _ValueChanged;
+        private bool _SuspendUpdate;
+
+        private int _ImageIndex = -1;
+        private ImageList _ImageList;
+        private string _ImageKey;
+
+        private Image _Image;
+        private string _ImageLocation;
+        private Image _LocationImage;
+        private ImageSizeMode _ImageSizeMode = ImageSizeMode.Normal;
+
+        private Image _StreamImage;
+        private MemoryStream _ImageMemoryStream;
+        private byte[] _ImageData;
+
+        private StretchBehavior _StretchBehavior = StretchBehavior.Both;
+
+        #endregion
+
+        #region Public properties
+
+        #region Image
+
+        ///<summary>
+        /// Image
+        ///</summary>
+        public Image Image
+        {
+            get { return (_Image); }
+            set { _Image = value; }
+        }
+
+        #endregion
+
+        #region ImageData
+
+        ///<summary>
+        /// ImageData
+        ///</summary>
+        public byte[] ImageData
+        {
+            get { return (_ImageData); }
+
+            set
+            {
+                _ImageData = value;
+
+                StreamImage = null;
+            }
+        }
+
+        #endregion
+
+        #region ImageIndex
+
+        ///<summary>
+        /// ImageKey
+        ///</summary>
+        public int ImageIndex
+        {
+            get { return (_ImageIndex); }
+            set { _ImageIndex = value; }
+        }
+
+        #endregion
+
+        #region ImageKey
+
+        ///<summary>
+        /// ImageKey
+        ///</summary>
+        public string ImageKey
+        {
+            get { return (_ImageKey); }
+            set { _ImageKey = value; }
+        }
+
+        #endregion
+
+        #region ImageList
+
+        ///<summary>
+        /// ImageList
+        ///</summary>
+        public ImageList ImageList
+        {
+            get { return (_ImageList); }
+            set { _ImageList = value; }
+        }
+
+        #endregion
+
+        #region ImageLocation
+
+        ///<summary>
+        /// ImageLocation
+        ///</summary>
+        public string ImageLocation
+        {
+            get { return (_ImageLocation); }
+
+            set
+            {
+                _ImageLocation = value;
+
+                LocationImage = null;
+            }
+        }
+
+        #endregion
+
+        #region ImageSizeMode
+
+        ///<summary>
+        /// ImageSizeMode
+        ///</summary>
+        public ImageSizeMode ImageSizeMode
+        {
+            get { return (_ImageSizeMode); }
+            set { _ImageSizeMode = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Private properties
+
+        #region EffectiveImage
+
+        private Image EffectiveImage
+        {
+            get
+            {
+                if (_Image != null)
+                    return (_Image);
+
+                if (StreamImage != null)
+                    return (StreamImage);
+
+                if (_ImageList != null)
+                {
+                    _ImageList.TransparentColor = Color.Magenta;
+
+                    if ((uint)_ImageIndex < _ImageList.Images.Count)
+                        return (_ImageList.Images[_ImageIndex]);
+
+                    if (_ImageKey != null)
+                        return (_ImageList.Images[_ImageKey]);
+                }
+
+                return (LocationImage);
+            }
+        }
+
+        #endregion
+
+        #region ImageMemoryStream
+
+        private MemoryStream ImageMemoryStream
+        {
+            get
+            {
+                if (_ImageMemoryStream == null)
+                    _ImageMemoryStream = new MemoryStream();
+
+                return (_ImageMemoryStream);
+            }
+
+            set
+            {
+                if (_ImageMemoryStream != null)
+                    _ImageMemoryStream.Dispose();
+
+                _ImageMemoryStream = value;
+            }
+        }
+
+        #endregion
+
+        #region LocationImage
+
+        private Image LocationImage
+        {
+            get { return (_LocationImage); }
+
+            set
+            {
+                if (_LocationImage != null)
+                    _LocationImage.Dispose();
+                    
+                _LocationImage = value;
+
+                if (string.IsNullOrEmpty(_ImageLocation) == false)
+                {
+                    using (FileStream fs = new FileStream(_ImageLocation, FileMode.Open))
+                        _LocationImage = Image.FromStream(fs);
+                }
+            }
+        }
+
+        #endregion
+
+        #region StreamImage
+
+        private Image StreamImage
+        {
+            get
+            {
+                if (_StreamImage == null)
+                {
+                    if (_ImageData != null)
+                    {
+                        MemoryStream ms = ImageMemoryStream;
+
+                        if (ms != null)
+                        {
+                            ms.SetLength(0);
+                            ms.Write(_ImageData, 0, _ImageData.Length);
+
+                            StreamImage = Image.FromStream(ms);
+                        }
+                    }
+                }
+
+                return (_StreamImage);
+            }
+
+            set
+            {
+                if (_StreamImage != null)
+                    _StreamImage.Dispose();
+
+                _StreamImage = value;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region OnInvalidated
+
+        /// <summary>
+        /// OnInvalidated
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnInvalidated(InvalidateEventArgs e)
+        {
+            base.OnInvalidated(e);
+
+            if (_Cell != null && _SuspendUpdate == false)
+                _Cell.InvalidateRender();
+        }
+
+        #endregion
+
+        #region OnPaintBackground
+
+        /// <summary>
+        /// OnPaintBackground
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnPaintBackground(PaintEventArgs e)
+        {
+            _Cell.PaintEditorBackground(e, this);
+        }
+
+        #endregion
+
+        #region Dispose
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        /// <param name="disposing"></param>
+        protected override void Dispose(bool disposing)
+        {
+            ResetImageInfo();
+
+            ImageMemoryStream = null;
+
+            base.Dispose(disposing);
+        }
+
+        #endregion
+
+        #region SetValue
+
+        ///<summary>
+        /// SetValue
+        ///</summary>
+        ///<param name="value"></param>
+        public virtual void SetValue(object value)
+        {
+            GridPanel panel = _Cell.GridPanel;
+
+            if (panel.IsDesignerHosted == false)
+            {
+                ResetImageInfo();
+
+                if (value == null ||
+                    (panel.NullValue == NullValue.DBNull && value == DBNull.Value))
+                {
+                }
+                else if (value is Image)
+                {
+                    Image = (Image)value;
+                }
+                else if (value is string)
+                {
+                    if (_Cell.IsValueExpression == true)
+                        value = _Cell.GetExpValue((string)value);
+
+                    if (SetImageKey((string)value) == false)
+                    {
+                        int index;
+
+                        if (int.TryParse((string)value, out index) == true)
+                            SetImageIndex(index);
+                        else
+                            ImageLocation = (string)value;
+                    }
+                }
+                else if (value is byte[])
+                {
+                    ImageData = (byte[])value;
+                }
+                else
+                {
+                    int index = Convert.ToInt32(value);
+
+                    SetImageIndex(index);
+                }
+            }
+        }
+
+        #region ResetImageInfo
+
+        private void ResetImageInfo()
+        {
+            Image = null;
+            ImageKey = null;
+            ImageIndex = -1;
+            ImageLocation = null;
+            ImageData = null;
+        }
+
+        #endregion
+
+        #region SetImageKey
+
+        private bool SetImageKey(string key)
+        {
+            if (_ImageList != null)
+            {
+                if (_ImageList.Images.ContainsKey(key))
+                {
+                    _ImageKey = key;
+
+                    return (true);
+                }
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region SetImageIndex
+
+        private void SetImageIndex(int index)
+        {
+            if (_ImageList != null && index < _ImageList.Images.Count)
+                ImageIndex = index;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IGridCellEditControl Members
+
+        #region Public properties
+
+        #region CanInterrupt
+
+        /// <summary>
+        /// CanInterrupt
+        /// </summary>
+        public bool CanInterrupt
+        {
+            get { return (true); }
+        }
+
+        #endregion
+
+        #region CellEditMode
+
+        /// <summary>
+        /// CellEditMode
+        /// </summary>
+        public CellEditMode CellEditMode
+        {
+            get { return (CellEditMode.InPlace); }
+        }
+
+        #endregion
+
+        #region EditorCell
+
+        /// <summary>
+        /// EditorCell
+        /// </summary>
+        public GridCell EditorCell
+        {
+            get { return (_Cell); }
+            set { _Cell = value; }
+        }
+
+        #endregion
+
+        #region EditorCellBitmap
+
+        ///<summary>
+        /// EditorCellBitmap
+        ///</summary>
+        public Bitmap EditorCellBitmap
+        {
+            get { return (_EditorCellBitmap); }
+
+            set
+            {
+                if (_EditorCellBitmap != null)
+                    _EditorCellBitmap.Dispose();
+
+                _EditorCellBitmap = value;
+            }
+        }
+
+        #endregion
+
+        #region EditorFormattedValue
+
+        ///<summary>
+        /// EditorFormattedValue
+        ///</summary>
+        public virtual string EditorFormattedValue
+        {
+            get
+            {
+                if (_Cell != null && _Cell.Value != null)
+                    return (_Cell.Value.ToString());
+                
+                return (Text);
+            }
+        }
+
+        #endregion
+
+        #region EditorPanel
+
+        /// <summary>
+        /// EditorPanel
+        /// </summary>
+        public EditorPanel EditorPanel
+        {
+            get { return (_EditorPanel); }
+            set { _EditorPanel = value; }
+        }
+
+        #endregion
+
+        #region EditorValue
+
+        /// <summary>
+        /// EditorValue
+        /// </summary>
+        public virtual object EditorValue
+        {
+            get
+            {
+                if (String.IsNullOrEmpty(ImageLocation) == false)
+                    return (ImageLocation);
+
+                if (String.IsNullOrEmpty(_ImageKey) == false)
+                    return (_ImageKey);
+
+                return (_ImageIndex);
+            }
+
+            set { SetValue(value); }
+        }
+
+        #endregion
+
+        #region EditorValueChanged
+
+        /// <summary>
+        /// EditorValueChanged
+        /// </summary>
+        public virtual bool EditorValueChanged
+        {
+            get { return (_ValueChanged); }
+
+            set
+            {
+                if (_ValueChanged != value)
+                {
+                    _ValueChanged = value;
+
+                    if (value == true)
+                        _Cell.SetEditorDirty(this);
+                }
+            }
+        }
+
+        #endregion
+
+        #region EditorValueType
+
+        ///<summary>
+        /// EditorValueType
+        ///</summary>
+        public virtual Type EditorValueType
+        {
+            get { return (typeof(string)); }
+        }
+
+        #endregion
+
+        #region StretchBehavior
+
+        /// <summary>
+        /// StretchBehavior
+        /// </summary>
+        public virtual StretchBehavior StretchBehavior
+        {
+            get { return (_StretchBehavior); }
+            set { _StretchBehavior = value; }
+        }
+
+        #endregion
+
+        #region SuspendUpdate
+
+        /// <summary>
+        /// SuspendUpdate
+        /// </summary>
+        public bool SuspendUpdate
+        {
+            get { return (_SuspendUpdate); }
+            set { _SuspendUpdate = value; }
+        }
+
+        #endregion
+
+        #region ValueChangeBehavior
+
+        /// <summary>
+        /// ValueChangeBehavior
+        /// </summary>
+        public virtual ValueChangeBehavior ValueChangeBehavior
+        {
+            get { return (ValueChangeBehavior.InvalidateRender); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InitializeContext
+
+        ///<summary>
+        /// InitializeContext
+        ///</summary>
+        ///<param name="cell"></param>
+        ///<param name="style"></param>
+        public virtual void InitializeContext(GridCell cell, CellVisualStyle style)
+        {
+            _Cell = cell;
+
+            if (style != null)
+                Enabled = (_Cell.IsReadOnly == false);
+
+            SetValue(_Cell.Value);
+
+            _ValueChanged = false;
+        }
+
+        #endregion
+
+        #region GetProposedSize
+
+        ///<summary>
+        /// GetProposedSize
+        ///</summary>
+        ///<param name="g"></param>
+        ///<param name="cell"></param>
+        ///<param name="style"></param>
+        ///<param name="constraintSize"></param>
+        ///<returns></returns>
+        public virtual Size GetProposedSize(Graphics g,
+            GridCell cell, CellVisualStyle style, Size constraintSize)
+        {
+            Image image = EffectiveImage;
+
+            Size size = (image != null)
+                ? image.Size : Dpi.Size(20, 20);
+
+            return (size);
+        }
+
+        #endregion
+
+        #region Edit support
+
+        #region BeginEdit
+
+        /// <summary>
+        /// BeginEdit
+        /// </summary>
+        /// <param name="selectAll"></param>
+        /// <returns></returns>
+        public virtual bool BeginEdit(bool selectAll)
+        {
+            return (false);
+        }
+
+        #endregion
+
+        #region EndEdit
+
+        /// <summary>
+        /// EndEdit
+        /// </summary>
+        /// <returns></returns>
+        public virtual bool EndEdit()
+        {
+            return (false);
+        }
+
+        #endregion
+
+        #region CancelEdit
+
+        /// <summary>
+        /// CancelEdit
+        /// </summary>
+        /// <returns></returns>
+        public virtual bool CancelEdit()
+        {
+            return (false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region CellRender
+
+        /// <summary>
+        /// CellRender
+        /// </summary>
+        /// <param name="g"></param>
+        public virtual void CellRender(Graphics g)
+        {
+            Image image = EffectiveImage;
+
+            if (image != null)
+            {
+                Rectangle r = _Cell.GetCellEditBounds(this);
+
+                switch (_ImageSizeMode)
+                {
+                    case ImageSizeMode.Normal:
+                        Rectangle sr = r;
+                        sr.Location = Point.Empty;
+
+                        g.DrawImage(image, r, sr, GraphicsUnit.Pixel);
+                        break;
+
+                    case ImageSizeMode.CenterImage:
+                        RenderImageCentered(g, image, r);
+                        break;
+
+                    case ImageSizeMode.StretchImage:
+                        g.DrawImage(image, r);
+                        break;
+
+                    case ImageSizeMode.Zoom:
+                        RenderImageScaled(g, image, r);
+                        break;
+                }
+            }
+        }
+
+        #region RenderImageCentered
+
+        private void RenderImageCentered(Graphics g, Image image, Rectangle r)
+        {
+            Rectangle sr = r;
+            sr.Location = Point.Empty;
+
+            if (image.Width > r.Width)
+                sr.X += (image.Width - r.Width) / 2;
+            else
+                r.X += (r.Width - image.Width) / 2;
+
+            if (image.Height > r.Height)
+                sr.Y += (image.Height - r.Height) / 2;
+            else
+                r.Y += (r.Height - image.Height) / 2;
+
+            g.DrawImage(image, r, sr, GraphicsUnit.Pixel);
+        }
+
+        #endregion
+
+        #region RenderImageScaled
+
+        private void RenderImageScaled(Graphics g, Image image, Rectangle r)
+        {
+            SizeF size = new SizeF(image.Width / image.HorizontalResolution,
+                image.Height / image.VerticalResolution);
+
+            float scale = Math.Min(r.Width / size.Width, r.Height / size.Height);
+
+            size.Width *= scale;
+            size.Height *= scale;
+
+            g.DrawImage(image, r.X + (r.Width - size.Width) / 2,
+                r.Y + (r.Height - size.Height) / 2,
+                size.Width, size.Height);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Keyboard support
+
+        #region CellKeyDown
+
+        ///<summary>
+        /// CellKeyDown
+        ///</summary>
+        public virtual void CellKeyDown(KeyEventArgs e)
+        {
+            OnKeyDown(e);
+        }
+
+        #endregion
+
+        #region WantsInputKey
+
+        /// <summary>
+        /// WantsInputKey
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="gridWantsKey"></param>
+        /// <returns></returns>
+        public virtual bool WantsInputKey(Keys key, bool gridWantsKey)
+        {
+            return (gridWantsKey == false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Mouse support
+
+        #region OnCellMouseMove
+
+        ///<summary>
+        /// OnCellMouseMove
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseMove(MouseEventArgs e)
+        {
+            OnMouseMove(e);
+        }
+
+        #endregion
+
+        #region OnCellMouseEnter
+
+        ///<summary>
+        /// OnCellMouseEnter
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseEnter(EventArgs e)
+        {
+            OnMouseEnter(e);
+        }
+
+        #endregion
+
+        #region OnCellMouseLeave
+
+        ///<summary>
+        /// OnCellMouseLeave
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseLeave(EventArgs e)
+        {
+            OnMouseLeave(e);
+        }
+
+        #endregion
+
+        #region OnCellMouseUp
+
+        ///<summary>
+        /// OnCellMouseUp
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseUp(MouseEventArgs e)
+        {
+            OnMouseUp(e);
+        }
+
+        #endregion
+
+        #region OnCellMouseDown
+
+        ///<summary>
+        /// OnCellMouseDown
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseDown(MouseEventArgs e)
+        {
+            OnMouseDown(e);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion  
+    }
+
+    #region ImageSizeMode
+
+    ///<summary>
+    /// ImageSizeMode
+    ///</summary>
+    public enum ImageSizeMode
+    {
+        ///<summary>
+        /// The image is placed in the upper-left
+        /// corner of the cell and is clipped if needed to fit.
+        ///</summary>
+        Normal,
+
+        ///<summary>
+        /// The image is stretched or shrunk to fit the cell.
+        ///</summary>
+        StretchImage,
+
+        ///<summary>
+        /// The image is displayed in the center of the cell if
+        /// the cell is larger than the image. If the image is larger
+        /// than the cell, the image is placed in the center of the 
+        /// cell and the outside edges are clipped.
+        ///</summary>
+        CenterImage,
+
+        ///<summary>
+        /// The size of the image is increased or decreased to fit the
+        /// cell, maintaining the size ratio.
+        ///</summary>
+        Zoom
+    }
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/GridIntegerInputEditControl.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/GridIntegerInputEditControl.cs
new file mode 100644
index 00000000..319e72d5
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/GridIntegerInputEditControl.cs	
@@ -0,0 +1,570 @@
+using System;
+using System.ComponentModel;
+using System.Data.SqlTypes;
+using System.Drawing;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.SuperGrid.Style;
+using DevComponents.Editors;
+
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    ///<summary>
+    /// GridIntegerInputEditControl
+    ///</summary>
+    [ToolboxItem(false)]
+    public class GridIntegerInputEditControl : IntegerInput, IGridCellEditControl
+    {
+        #region Private variables
+
+        private GridCell _Cell;
+        private EditorPanel _EditorPanel;
+        private Bitmap _EditorCellBitmap;
+
+        private bool _ValueChanged;
+        private bool _SuspendUpdate;
+
+        private StretchBehavior _StretchBehavior = StretchBehavior.None;
+
+        #endregion
+
+        ///<summary>
+        /// GridIntegerInputEditControl
+        ///</summary>
+        public GridIntegerInputEditControl()
+        {
+            ShowUpDown = true;
+        }
+
+        #region OnValueChanged
+
+        /// <summary>
+        /// OnValueChanged
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnValueChanged(EventArgs e)
+        {
+            if (_Cell != null && _SuspendUpdate == false)
+                _Cell.EditorValueChanged(this);
+
+            base.OnValueChanged(e);
+        }
+
+        #endregion
+
+        #region GetValue
+
+        ///<summary>
+        /// GetValue
+        ///</summary>
+        ///<param name="value"></param>
+        ///<returns></returns>
+        public virtual int GetValue(object value)
+        {
+            GridPanel panel = _Cell.GridPanel;
+
+            if (value == null ||
+                (panel.NullValue == NullValue.DBNull && value == DBNull.Value))
+            {
+                return (0);
+            }
+
+            if (value is SqlInt16)
+            {
+                SqlInt16 sdt = (SqlInt16) value;
+
+                if (sdt.IsNull == true)
+                    return (0);
+
+                return (sdt.Value);
+            }
+
+            if (value is SqlInt32)
+            {
+                SqlInt32 sdt = (SqlInt32)value;
+
+                if (sdt.IsNull == true)
+                    return (0);
+
+                return (sdt.Value);
+            }
+            
+            if (_Cell.IsValueExpression == true)
+                value = _Cell.GetExpValue((string)value);
+
+            return (Convert.ToInt32(value));
+        }
+
+        #endregion
+
+        #region IGridCellEditControl Members
+
+        #region Public properties
+
+        #region CanInterrupt
+
+        /// <summary>
+        /// CanInterrupt
+        /// </summary>
+        public bool CanInterrupt
+        {
+            get { return (true); }
+        }
+
+        #endregion
+
+        #region CellEditMode
+
+        /// <summary>
+        /// CellEditMode
+        /// </summary>
+        public CellEditMode CellEditMode
+        {
+            get { return (CellEditMode.Modal); }
+        }
+
+        #endregion
+
+        #region EditorCell
+
+        /// <summary>
+        /// EditorCell
+        /// </summary>
+        public GridCell EditorCell
+        {
+            get { return (_Cell); }
+            set { _Cell = value; }
+        }
+
+        #endregion
+
+        #region EditorCellBitmap
+
+        ///<summary>
+        /// EditorCellBitmap
+        ///</summary>
+        public Bitmap EditorCellBitmap
+        {
+            get { return (_EditorCellBitmap); }
+
+            set
+            {
+                if (_EditorCellBitmap != null)
+                    _EditorCellBitmap.Dispose();
+
+                _EditorCellBitmap = value;
+            }
+        }
+
+        #endregion
+
+        #region EditorFormattedValue
+
+        ///<summary>
+        /// EditorFormattedValue
+        ///</summary>
+        public virtual string EditorFormattedValue
+        {
+            get
+            {
+                if (_Cell != null && _Cell.IsValueNull == true)
+                    return (_Cell.NullString);
+
+                return (Text);
+            }
+        }
+
+        #endregion
+
+        #region EditorPanel
+
+        /// <summary>
+        /// EditorPanel
+        /// </summary>
+        public EditorPanel EditorPanel
+        {
+            get { return (_EditorPanel); }
+            set { _EditorPanel = value; }
+        }
+
+        #endregion
+
+        #region EditorValue
+
+        /// <summary>
+        /// EditorValue
+        /// </summary>
+        public virtual object EditorValue
+        {
+            get { return (Value); }
+            set { Value = GetValue(value); }
+        }
+
+        #endregion
+
+        #region EditorValueChanged
+
+        /// <summary>
+        /// EditorValueChanged
+        /// </summary>
+        public virtual bool EditorValueChanged
+        {
+            get { return (_ValueChanged); }
+
+            set
+            {
+                if (_ValueChanged != value)
+                {
+                    _ValueChanged = value;
+
+                    if (value == true)
+                        _Cell.SetEditorDirty(this);
+                }
+            }
+        }
+
+        #endregion
+
+        #region EditorValueType
+
+        ///<summary>
+        /// EditorValueType
+        ///</summary>
+        public virtual Type EditorValueType
+        {
+            get { return (typeof(int)); }
+        }
+
+        #endregion
+
+        #region StretchBehavior
+
+        /// <summary>
+        /// StretchBehavior
+        /// </summary>
+        public virtual StretchBehavior StretchBehavior
+        {
+            get { return (_StretchBehavior); }
+            set { _StretchBehavior = value; }
+        }
+
+        #endregion
+
+        #region SuspendUpdate
+
+        /// <summary>
+        /// SuspendUpdate
+        /// </summary>
+        public bool SuspendUpdate
+        {
+            get { return (_SuspendUpdate); }
+            set { _SuspendUpdate = value; }
+        }
+
+        #endregion
+
+        #region ValueChangeBehavior
+
+        /// <summary>
+        /// ValueChangeBehavior
+        /// </summary>
+        public virtual ValueChangeBehavior ValueChangeBehavior
+        {
+            get { return (ValueChangeBehavior.InvalidateRender); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InitializeContext
+
+        ///<summary>
+        /// InitializeContext
+        ///</summary>
+        ///<param name="cell"></param>
+        ///<param name="style"></param>
+        public virtual void InitializeContext(GridCell cell, CellVisualStyle style)
+        {
+            _Cell = cell;
+
+            if (style != null)
+            {
+                Enabled = (_Cell.ReadOnly == false);
+                Font = style.Font;
+                ForeColor = style.TextColor;
+            }
+
+            Value = GetValue(cell.Value);
+
+            _ValueChanged = false;
+        }
+
+        #endregion
+
+        #region GetProposedSize
+
+        ///<summary>
+        /// GetProposedSize
+        ///</summary>
+        ///<param name="g"></param>
+        ///<param name="cell"></param>
+        ///<param name="style"></param>
+        ///<param name="constraintSize"></param>
+        ///<returns></returns>
+        public virtual Size GetProposedSize(Graphics g,
+            GridCell cell, CellVisualStyle style, Size constraintSize)
+        {
+            Size size = GetPreferredSize(constraintSize);
+
+            return (size);
+        }
+
+        #endregion
+
+        #region Edit support
+
+        #region BeginEdit
+
+        /// <summary>
+        /// BeginEdit
+        /// </summary>
+        /// <param name="selectAll"></param>
+        /// <returns></returns>
+        public virtual bool BeginEdit(bool selectAll)
+        {
+            if (FreeTextEntryMode == true)
+            {
+                TextBox box = GetFreeTextBox() as TextBox;
+
+                if (box != null)
+                {
+                    if (selectAll == true)
+                        box.SelectAll();
+                }
+            }
+            
+            return (false);
+        }
+
+        #endregion
+
+        #region EndEdit
+
+        /// <summary>
+        /// EndEdit
+        /// </summary>
+        /// <returns></returns>
+        public virtual bool EndEdit()
+        {
+            CloseDropDown();
+
+            return (false);
+        }
+
+        #endregion
+
+        #region CancelEdit
+
+        /// <summary>
+        /// CancelEdit
+        /// </summary>
+        /// <returns></returns>
+        public virtual bool CancelEdit()
+        {
+            CloseDropDown();
+
+            return (false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region CellRender
+
+        /// <summary>
+        /// CellRender
+        /// </summary>
+        /// <param name="g"></param>
+        public virtual void CellRender(Graphics g)
+        {
+            _Cell.CellRender(this, g);
+        }
+
+        #endregion
+
+        #region Keyboard support
+
+        #region CellKeyDown
+
+        ///<summary>
+        /// CellKeyDown
+        ///</summary>
+        public virtual void CellKeyDown(KeyEventArgs e)
+        {
+        }
+
+        #endregion
+
+        #region WantsInputKey
+
+        /// <summary>
+        /// WantsInputKey
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="gridWantsKey"></param>
+        /// <returns></returns>
+        public virtual bool WantsInputKey(Keys key, bool gridWantsKey)
+        {
+            if ((key & Keys.KeyCode) == Keys.Tab)
+            {
+                ApplyFreeTextValue();
+
+                return (false);
+            }
+
+            if (IsCalculatorDisplayed == true)
+                return (true);
+
+            switch (key & Keys.KeyCode)
+            {
+                case Keys.Left:
+                case Keys.Right:
+                case Keys.Home:
+                case Keys.End:
+                case Keys.Up:
+                case Keys.Down:
+                    return (true);
+
+                case Keys.Enter:
+                    ApplyFreeTextValue();
+                    return (gridWantsKey == false);
+
+                default:
+                    return (gridWantsKey == false);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Mouse support
+
+        #region OnCellMouseMove
+
+        ///<summary>
+        /// OnCellMouseMove
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseMove(MouseEventArgs e)
+        {
+        }
+
+        #endregion
+
+        #region OnCellMouseEnter
+
+        ///<summary>
+        /// OnCellMouseEnter
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseEnter(EventArgs e)
+        {
+        }
+
+        #endregion
+
+        #region OnCellMouseLeave
+
+        ///<summary>
+        /// OnCellMouseLeave
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseLeave(EventArgs e)
+        {
+        }
+
+        #endregion
+
+        #region OnCellMouseUp
+
+        ///<summary>
+        /// OnCellMouseUp
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseUp(MouseEventArgs e)
+        {
+        }
+
+        #endregion
+
+        #region OnCellMouseDown
+
+        ///<summary>
+        /// OnCellMouseDown
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseDown(MouseEventArgs e)
+        {
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region IGridCellEditorFocus members
+
+        #region FocusEditor
+
+        /// <summary>
+        /// Gives focus to the editor
+        /// </summary>
+        public void FocusEditor()
+        {
+            if (IsEditorFocused == false)
+            {
+                if (FreeTextEntryMode == true)
+                {
+                    TextBox box = GetFreeTextBox() as TextBox;
+
+                    if (box != null)
+                        box.Focus();
+                }
+                else
+                {
+                    Focus();
+                }
+            }
+        }
+
+        #endregion
+
+        #region IsEditorFocused
+
+        /// <summary>
+        /// Gets whether editor has the focus
+        /// </summary>
+        public bool IsEditorFocused
+        {
+            get
+            {
+                if (FreeTextEntryMode == true)
+                {
+                    TextBox box = GetFreeTextBox() as TextBox;
+
+                    if (box != null)
+                        return (box.Focused);
+                }
+
+                return (Focused);
+            }
+        }
+
+        #endregion
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/GridIpAddressInputEditControl.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/GridIpAddressInputEditControl.cs
new file mode 100644
index 00000000..be95cef4
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/GridIpAddressInputEditControl.cs	
@@ -0,0 +1,463 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.SuperGrid.Style;
+using DevComponents.Editors;
+
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    ///<summary>
+    /// GridIpAddressInputEditControl
+    ///</summary>
+    [ToolboxItem(false)]
+    public class GridIpAddressInputEditControl : IpAddressInput, IGridCellEditControl
+    {
+        #region Private variables
+
+        private GridCell _Cell;
+        private EditorPanel _EditorPanel;
+        private Bitmap _EditorCellBitmap;
+
+        private bool _ValueChanged;
+        private bool _SuspendUpdate;
+
+        private StretchBehavior _StretchBehavior = StretchBehavior.None;
+
+        #endregion
+
+        #region OnValueChanged
+
+        /// <summary>
+        /// OnValueChanged
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnValueChanged(EventArgs e)
+        {
+            if (_SuspendUpdate == false)
+                _Cell.EditorValueChanged(this);
+
+            base.OnValueChanged(e);
+        }
+
+        #endregion
+
+        #region GetValue
+
+        ///<summary>
+        /// GetValue
+        ///</summary>
+        ///<param name="value"></param>
+        ///<returns></returns>
+        public virtual string GetValue(object value)
+        {
+            GridPanel panel = _Cell.GridPanel;
+
+            if (value == null ||
+                (panel.NullValue == NullValue.DBNull && value == DBNull.Value))
+            {
+                return ("");
+            }
+
+            if (_Cell.IsValueExpression == true)
+                value = _Cell.GetExpValue((string)value);
+
+            return (Convert.ToString(value));
+        }
+
+        #endregion
+
+        #region IGridCellEditControl Members
+
+        #region Public properties
+
+        #region CanInterrupt
+
+        /// <summary>
+        /// CanInterrupt
+        /// </summary>
+        public bool CanInterrupt
+        {
+            get { return (true); }
+        }
+
+        #endregion
+
+        #region CellEditMode
+
+        /// <summary>
+        /// CellEditMode
+        /// </summary>
+        public CellEditMode CellEditMode
+        {
+            get { return (CellEditMode.Modal); }
+        }
+
+        #endregion
+
+        #region EditorCell
+
+        /// <summary>
+        /// EditorCell
+        /// </summary>
+        public GridCell EditorCell
+        {
+            get { return (_Cell); }
+            set { _Cell = value; }
+        }
+
+        #endregion
+
+        #region EditorCellBitmap
+
+        ///<summary>
+        /// EditorCellBitmap
+        ///</summary>
+        public Bitmap EditorCellBitmap
+        {
+            get { return (_EditorCellBitmap); }
+
+            set
+            {
+                if (_EditorCellBitmap != null)
+                    _EditorCellBitmap.Dispose();
+
+                _EditorCellBitmap = value;
+            }
+        }
+
+        #endregion
+
+        #region EditorFormattedValue
+
+        ///<summary>
+        /// EditorFormattedValue
+        ///</summary>
+        public virtual string EditorFormattedValue
+        {
+            get
+            {
+                if (_Cell != null && _Cell.IsValueNull == true)
+                    return (_Cell.NullString);
+                
+                return (Text);
+            }
+        }
+
+        #endregion
+
+        #region EditorPanel
+
+        /// <summary>
+        /// EditorPanel
+        /// </summary>
+        public EditorPanel EditorPanel
+        {
+            get { return (_EditorPanel); }
+            set { _EditorPanel = value; }
+        }
+
+        #endregion
+
+        #region EditorValue
+
+        /// <summary>
+        /// EditorValue
+        /// </summary>
+        public virtual object EditorValue
+        {
+            get { return (Value); }
+            set { Value = GetValue(value); }
+        }
+
+        #endregion
+
+        #region EditorValueChanged
+
+        /// <summary>
+        /// EditorValueChanged
+        /// </summary>
+        public virtual bool EditorValueChanged
+        {
+            get { return (_ValueChanged); }
+
+            set
+            {
+                if (_ValueChanged != value)
+                {
+                    _ValueChanged = value;
+
+                    if (value == true)
+                        _Cell.SetEditorDirty(this);
+                }
+            }
+        }
+
+        #endregion
+
+        #region EditorValueType
+
+        ///<summary>
+        /// EditorValueType
+        ///</summary>
+        public virtual Type EditorValueType
+        {
+            get { return (typeof(int)); }
+        }
+
+        #endregion
+
+        #region StretchBehavior
+
+        /// <summary>
+        /// StretchBehavior
+        /// </summary>
+        public virtual StretchBehavior StretchBehavior
+        {
+            get { return (_StretchBehavior); }
+            set { _StretchBehavior = value; }
+        }
+
+        #endregion
+
+        #region SuspendUpdate
+
+        /// <summary>
+        /// SuspendUpdate
+        /// </summary>
+        public bool SuspendUpdate
+        {
+            get { return (_SuspendUpdate); }
+            set { _SuspendUpdate = value; }
+        }
+
+        #endregion
+
+        #region ValueChangeBehavior
+
+        /// <summary>
+        /// ValueChangeBehavior
+        /// </summary>
+        public virtual ValueChangeBehavior ValueChangeBehavior
+        {
+            get { return (ValueChangeBehavior.InvalidateRender); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InitializeContext
+
+        ///<summary>
+        /// InitializeContext
+        ///</summary>
+        ///<param name="cell"></param>
+        ///<param name="style"></param>
+        public virtual void InitializeContext(GridCell cell, CellVisualStyle style)
+        {
+            _Cell = cell;
+
+            if (style != null)
+            {
+                Enabled = (_Cell.ReadOnly == false);
+                Font = style.Font;
+                ForeColor = style.TextColor;
+            }
+
+            Value = GetValue(cell.Value);
+
+            _ValueChanged = false;
+        }
+
+        #endregion
+
+        #region GetProposedSize
+
+        ///<summary>
+        /// GetProposedSize
+        ///</summary>
+        ///<param name="g"></param>
+        ///<param name="cell"></param>
+        ///<param name="style"></param>
+        ///<param name="constraintSize"></param>
+        ///<returns></returns>
+        public virtual Size GetProposedSize(Graphics g,
+            GridCell cell, CellVisualStyle style, Size constraintSize)
+        {
+            Size size = GetPreferredSize(constraintSize);
+
+            return (size);
+        }
+
+        #endregion
+
+        #region Edit support
+
+        #region BeginEdit
+
+        /// <summary>
+        /// BeginEdit
+        /// </summary>
+        /// <param name="selectAll"></param>
+        /// <returns></returns>
+        public virtual bool BeginEdit(bool selectAll)
+        {
+            Show();
+            Focus();
+            
+            return (false);
+        }
+
+        #endregion
+
+        #region EndEdit
+
+        /// <summary>
+        /// EndEdit
+        /// </summary>
+        /// <returns></returns>
+        public virtual bool EndEdit()
+        {
+            return (false);
+        }
+
+        #endregion
+
+        #region CancelEdit
+
+        /// <summary>
+        /// CancelEdit
+        /// </summary>
+        /// <returns></returns>
+        public virtual bool CancelEdit()
+        {
+            return (false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region CellRender
+
+        /// <summary>
+        /// CellRender
+        /// </summary>
+        /// <param name="g"></param>
+        public virtual void CellRender(Graphics g)
+        {
+            _Cell.CellRender(this, g);
+        }
+
+        #endregion
+
+        #region Keyboard support
+
+        #region CellKeyDown
+
+        ///<summary>
+        /// CellKeyDown
+        ///</summary>
+        public virtual void CellKeyDown(KeyEventArgs e)
+        {
+        }
+
+        #endregion
+
+        #region WantsInputKey
+
+        /// <summary>
+        /// WantsInputKey
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="gridWantsKey"></param>
+        /// <returns></returns>
+        public virtual bool WantsInputKey(Keys key, bool gridWantsKey)
+        {
+            switch (key & Keys.KeyCode)
+            {
+                case Keys.Left:
+                case Keys.Right:
+                case Keys.Home:
+                case Keys.End:
+                case Keys.Up:
+                case Keys.Down:
+                    return (true);
+
+                default:
+                    return (gridWantsKey == false);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Mouse support
+
+        #region OnCellMouseMove
+
+        ///<summary>
+        /// OnCellMouseMove
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseMove(MouseEventArgs e)
+        {
+        }
+
+        #endregion
+
+        #region OnCellMouseEnter
+
+        ///<summary>
+        /// OnCellMouseEnter
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseEnter(EventArgs e)
+        {
+        }
+
+        #endregion
+
+        #region OnCellMouseLeave
+
+        ///<summary>
+        /// OnCellMouseLeave
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseLeave(EventArgs e)
+        {
+        }
+
+        #endregion
+
+        #region OnCellMouseUp
+
+        ///<summary>
+        /// OnCellMouseUp
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseUp(MouseEventArgs e)
+        {
+        }
+
+        #endregion
+
+        #region OnCellMouseDown
+
+        ///<summary>
+        /// OnCellMouseDown
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseDown(MouseEventArgs e)
+        {
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/GridLabelEditControl.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/GridLabelEditControl.cs
new file mode 100644
index 00000000..0b3aff19
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/GridLabelEditControl.cs	
@@ -0,0 +1,513 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.SuperGrid.Style;
+
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    ///<summary>
+    /// GridLabelEditControl
+    ///</summary>
+    [ToolboxItem(false)]
+    public class GridLabelEditControl : Label, IGridCellEditControl
+    {
+        #region Private variables
+
+        private GridCell _Cell;
+        private EditorPanel _EditorPanel;
+        private Bitmap _EditorCellBitmap;
+
+        private bool _ValueChanged;
+        private bool _SuspendUpdate;
+
+        private StretchBehavior _StretchBehavior = StretchBehavior.None;
+
+        #endregion
+
+        #region OnInvalidated
+
+        /// <summary>
+        /// OnInvalidated
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnInvalidated(InvalidateEventArgs e)
+        {
+            base.OnInvalidated(e);
+
+            if (_Cell != null && _SuspendUpdate == false)
+                _Cell.InvalidateRender();
+        }
+
+        #endregion
+
+        #region OnPaintBackground
+
+        /// <summary>
+        /// OnPaintBackground
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnPaintBackground(PaintEventArgs e)
+        {
+            _Cell.PaintEditorBackground(e, this);
+        }
+
+        #endregion
+
+        #region GetValue
+
+        ///<summary>
+        /// GetValue
+        ///</summary>
+        ///<param name="value"></param>
+        ///<returns></returns>
+        public virtual string GetValue(object value)
+        {
+            GridPanel panel = _Cell.GridPanel;
+
+            if (value == null ||
+                (panel.NullValue == NullValue.DBNull && value == DBNull.Value))
+            {
+                return ("");
+            }
+
+            if (_Cell.IsValueExpression == true)
+                value = _Cell.GetExpValue((string)value);
+
+            return (Convert.ToString(value));
+        }
+
+        #endregion
+
+        #region IGridCellEditControl Members
+
+        #region Public properties
+
+        #region CanInterrupt
+
+        /// <summary>
+        /// CanInterrupt
+        /// </summary>
+        public bool CanInterrupt
+        {
+            get { return (true); }
+        }
+
+        #endregion
+
+        #region CellEditMode
+
+        /// <summary>
+        /// CellEditMode
+        /// </summary>
+        public CellEditMode CellEditMode
+        {
+            get { return (CellEditMode.InPlace); }
+        }
+
+        #endregion
+
+        #region EditorCell
+
+        /// <summary>
+        /// EditorCell
+        /// </summary>
+        public GridCell EditorCell
+        {
+            get { return (_Cell); }
+            set { _Cell = value; }
+        }
+
+        #endregion
+
+        #region EditorCellBitmap
+
+        ///<summary>
+        /// EditorCellBitmap
+        ///</summary>
+        public Bitmap EditorCellBitmap
+        {
+            get { return (_EditorCellBitmap); }
+
+            set
+            {
+                if (_EditorCellBitmap != null)
+                    _EditorCellBitmap.Dispose();
+
+                _EditorCellBitmap = value;
+            }
+        }
+
+        #endregion
+
+        #region EditorFormattedValue
+
+        ///<summary>
+        /// EditorFormattedValue
+        ///</summary>
+        public virtual string EditorFormattedValue
+        {
+            get
+            {
+                if (_Cell != null && _Cell.IsValueNull == true)
+                    return (_Cell.NullString);
+                
+                return (Text);
+            }
+        }
+
+        #endregion
+
+        #region EditorPanel
+
+        /// <summary>
+        /// EditorPanel
+        /// </summary>
+        public EditorPanel EditorPanel
+        {
+            get { return (_EditorPanel); }
+            set { _EditorPanel = value; }
+        }
+
+        #endregion
+
+        #region EditorValue
+
+        /// <summary>
+        /// EditorValue
+        /// </summary>
+        public virtual object EditorValue
+        {
+            get { return (Text); }
+            set { Text = GetValue(value); }
+        }
+
+        #endregion
+
+        #region EditorValueChanged
+
+        /// <summary>
+        /// EditorValueChanged
+        /// </summary>
+        public virtual bool EditorValueChanged
+        {
+            get { return (_ValueChanged); }
+
+            set
+            {
+                if (_ValueChanged != value)
+                {
+                    _ValueChanged = value;
+
+                    if (value == true)
+                        _Cell.SetEditorDirty(this);
+                }
+            }
+        }
+
+        #endregion
+
+        #region EditorValueType
+
+        ///<summary>
+        /// EditorValueType
+        ///</summary>
+        public virtual Type EditorValueType
+        {
+            get { return (typeof(string)); }
+        }
+
+        #endregion
+
+        #region StretchBehavior
+
+        /// <summary>
+        /// StretchBehavior
+        /// </summary>
+        public virtual StretchBehavior StretchBehavior
+        {
+            get { return (_StretchBehavior); }
+            set { _StretchBehavior = value; }
+        }
+
+        #endregion
+
+        #region SuspendUpdate
+
+        /// <summary>
+        /// SuspendUpdate
+        /// </summary>
+        public bool SuspendUpdate
+        {
+            get { return (_SuspendUpdate); }
+            set { _SuspendUpdate = value; }
+        }
+
+        #endregion
+
+        #region ValueChangeBehavior
+
+        /// <summary>
+        /// ValueChangeBehavior
+        /// </summary>
+        public virtual ValueChangeBehavior ValueChangeBehavior
+        {
+            get { return (ValueChangeBehavior.InvalidateRender); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InitializeContext
+
+        ///<summary>
+        /// InitializeContext
+        ///</summary>
+        ///<param name="cell"></param>
+        ///<param name="style"></param>
+        public virtual void InitializeContext(GridCell cell, CellVisualStyle style)
+        {
+            _Cell = cell;
+
+            if (style != null)
+            {
+                Enabled = (_Cell.IsReadOnly == false);
+                Font = style.Font;
+                ForeColor = style.TextColor;
+
+                SetTextAlign(style);
+            }
+
+            Text = GetValue(_Cell.Value);
+
+            _ValueChanged = false;
+        }
+
+        #region SetTextAlign
+
+        private void SetTextAlign(CellVisualStyle style)
+        {
+            switch (style.Alignment)
+            {
+                case Alignment.TopLeft:
+                    TextAlign = ContentAlignment.TopLeft;
+                    break;
+
+                case Alignment.TopCenter:
+                    TextAlign = ContentAlignment.TopCenter;
+                    break;
+
+                case Alignment.TopRight:
+                    TextAlign = ContentAlignment.TopRight;
+                    break;
+
+                case Alignment.MiddleLeft:
+                    TextAlign = ContentAlignment.MiddleLeft;
+                    break;
+
+                case Alignment.MiddleCenter:
+                    TextAlign = ContentAlignment.MiddleCenter;
+                    break;
+
+                case Alignment.MiddleRight:
+                    TextAlign = ContentAlignment.MiddleRight;
+                    break;
+
+                case Alignment.BottomLeft:
+                    TextAlign = ContentAlignment.BottomLeft;
+                    break;
+
+                case Alignment.BottomCenter:
+                    TextAlign = ContentAlignment.BottomCenter;
+                    break;
+
+                case Alignment.BottomRight:
+                    TextAlign = ContentAlignment.BottomRight;
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetProposedSize
+
+        ///<summary>
+        /// GetProposedSize
+        ///</summary>
+        ///<param name="g"></param>
+        ///<param name="cell"></param>
+        ///<param name="style"></param>
+        ///<param name="constraintSize"></param>
+        ///<returns></returns>
+        public virtual Size GetProposedSize(Graphics g,
+            GridCell cell, CellVisualStyle style, Size constraintSize)
+        {
+            Size size = GetPreferredSize(constraintSize);
+
+            return (size);
+        }
+
+        #endregion
+
+        #region Edit support
+
+        #region BeginEdit
+
+        /// <summary>
+        /// BeginEdit
+        /// </summary>
+        /// <param name="selectAll"></param>
+        /// <returns></returns>
+        public virtual bool BeginEdit(bool selectAll)
+        {
+            return (false);
+        }
+
+        #endregion
+
+        #region EndEdit
+
+        /// <summary>
+        /// EndEdit
+        /// </summary>
+        /// <returns></returns>
+        public virtual bool EndEdit()
+        {
+            return (false);
+        }
+
+        #endregion
+
+        #region CancelEdit
+
+        /// <summary>
+        /// CancelEdit
+        /// </summary>
+        /// <returns></returns>
+        public virtual bool CancelEdit()
+        {
+            return (false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region CellRender
+
+        /// <summary>
+        /// CellRender
+        /// </summary>
+        /// <param name="g"></param>
+        public virtual void CellRender(Graphics g)
+        {
+            _Cell.CellRender(this, g);
+        }
+
+        #endregion
+
+        #region Keyboard support
+
+        #region CellKeyDown
+
+        ///<summary>
+        /// CellKeyDown
+        ///</summary>
+        public virtual void CellKeyDown(KeyEventArgs e)
+        {
+        }
+
+        #endregion
+
+        #region WantsInputKey
+
+        /// <summary>
+        /// WantsInputKey
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="gridWantsKey"></param>
+        /// <returns></returns>
+        public virtual bool WantsInputKey(Keys key, bool gridWantsKey)
+        {
+            return (gridWantsKey == false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Mouse support
+
+        #region OnCellMouseMove
+
+        ///<summary>
+        /// OnCellMouseMove
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseMove(MouseEventArgs e)
+        {
+            OnMouseMove(e);
+        }
+
+        #endregion
+
+        #region OnCellMouseEnter
+
+        ///<summary>
+        /// OnCellMouseEnter
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseEnter(EventArgs e)
+        {
+            OnMouseEnter(e);
+        }
+
+        #endregion
+
+        #region OnCellMouseLeave
+
+        ///<summary>
+        /// OnCellMouseLeave
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseLeave(EventArgs e)
+        {
+            OnMouseLeave(e);
+        }
+
+        #endregion
+
+        #region OnCellMouseUp
+
+        ///<summary>
+        /// OnCellMouseUp
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseUp(MouseEventArgs e)
+        {
+            OnMouseUp(e);
+        }
+
+        #endregion
+
+        #region OnCellMouseDown
+
+        ///<summary>
+        /// OnCellMouseDown
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseDown(MouseEventArgs e)
+        {
+            OnMouseDown(e);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion  
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/GridLabelXEditControl.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/GridLabelXEditControl.cs
new file mode 100644
index 00000000..6cd83b85
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/GridLabelXEditControl.cs	
@@ -0,0 +1,555 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.SuperGrid.Style;
+
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    ///<summary>
+    /// GridLabelEditControl
+    ///</summary>
+    [ToolboxItem(false)]
+    public class GridLabelXEditControl : LabelX, IGridCellEditControl
+    {
+        #region Private variables
+
+        private GridCell _Cell;
+        private EditorPanel _EditorPanel;
+        private Bitmap _EditorCellBitmap;
+
+        private bool _ValueChanged;
+        private bool _SuspendUpdate;
+
+        private StretchBehavior _StretchBehavior = StretchBehavior.None;
+
+        #endregion
+
+        #region OnInvalidated
+
+        /// <summary>
+        /// OnInvalidated
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnInvalidated(InvalidateEventArgs e)
+        {
+            base.OnInvalidated(e);
+
+            if (_Cell != null && _SuspendUpdate == false)
+                _Cell.InvalidateRender();
+        }
+
+        #endregion
+
+        #region OnPaint
+
+        /// <summary>
+        /// OnPaint
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            _Cell.PaintEditorBackground(e, this);
+
+            PaintControl(e);
+        }
+
+        #endregion
+
+        #region GetValue
+
+        ///<summary>
+        /// GetValue
+        ///</summary>
+        ///<param name="value"></param>
+        ///<returns></returns>
+        public virtual string GetValue(object value)
+        {
+            GridPanel panel = _Cell.GridPanel;
+
+            if (value == null ||
+                (panel.NullValue == NullValue.DBNull && value == DBNull.Value))
+            {
+                return (" ");
+            }
+
+            if (_Cell.IsValueExpression == true)
+                value = _Cell.GetExpValue((string)value);
+
+            string s = Convert.ToString(value);
+
+            if (string.IsNullOrEmpty(s) == true)
+                s = " ";
+
+            return (s);
+        }
+
+        #endregion
+
+        #region IGridCellEditControl Members
+
+        #region Public properties
+
+        #region CanInterrupt
+
+        /// <summary>
+        /// CanInterrupt
+        /// </summary>
+        public bool CanInterrupt
+        {
+            get { return (true); }
+        }
+
+        #endregion
+
+        #region CellEditMode
+
+        /// <summary>
+        /// CellEditMode
+        /// </summary>
+        public CellEditMode CellEditMode
+        {
+            get { return (CellEditMode.InPlace); }
+        }
+
+        #endregion
+
+        #region EditorCell
+
+        /// <summary>
+        /// EditorCell
+        /// </summary>
+        public GridCell EditorCell
+        {
+            get { return (_Cell); }
+            set { _Cell = value; }
+        }
+
+        #endregion
+
+        #region EditorCellBitmap
+
+        ///<summary>
+        /// EditorCellBitmap
+        ///</summary>
+        public Bitmap EditorCellBitmap
+        {
+            get { return (_EditorCellBitmap); }
+
+            set
+            {
+                if (_EditorCellBitmap != null)
+                    _EditorCellBitmap.Dispose();
+
+                _EditorCellBitmap = value;
+            }
+        }
+
+        #endregion
+
+        #region EditorFormattedValue
+
+        ///<summary>
+        /// EditorFormattedValue
+        ///</summary>
+        public virtual string EditorFormattedValue
+        {
+            get
+            {
+                if (_Cell != null && _Cell.IsValueNull == true)
+                    return (_Cell.NullString);
+
+                return (PlainText);
+            }
+        }
+
+        #endregion
+
+        #region EditorPanel
+
+        /// <summary>
+        /// EditorPanel
+        /// </summary>
+        public EditorPanel EditorPanel
+        {
+            get { return (_EditorPanel); }
+            set { _EditorPanel = value; }
+        }
+
+        #endregion
+
+        #region EditorValue
+
+        /// <summary>
+        /// EditorValue
+        /// </summary>
+        public virtual object EditorValue
+        {
+            get { return (Text); }
+            set { Text = GetValue(value); }
+        }
+
+        #endregion
+
+        #region EditorValueChanged
+
+        /// <summary>
+        /// EditorValueChanged
+        /// </summary>
+        public virtual bool EditorValueChanged
+        {
+            get { return (_ValueChanged); }
+
+            set
+            {
+                if (_ValueChanged != value)
+                {
+                    _ValueChanged = value;
+
+                    if (value == true)
+                        _Cell.SetEditorDirty(this);
+                }
+            }
+        }
+
+        #endregion
+
+        #region EditorValueType
+
+        ///<summary>
+        /// EditorValueType
+        ///</summary>
+        public virtual Type EditorValueType
+        {
+            get { return (typeof(string)); }
+        }
+
+        #endregion
+
+        #region StretchBehavior
+
+        /// <summary>
+        /// StretchBehavior
+        /// </summary>
+        public virtual StretchBehavior StretchBehavior
+        {
+            get { return (_StretchBehavior); }
+            set { _StretchBehavior = value; }
+        }
+
+        #endregion
+
+        #region SuspendUpdate
+
+        /// <summary>
+        /// SuspendUpdate
+        /// </summary>
+        public bool SuspendUpdate
+        {
+            get { return (_SuspendUpdate); }
+            set { _SuspendUpdate = value; }
+        }
+
+        #endregion
+
+        #region ValueChangeBehavior
+
+        /// <summary>
+        /// ValueChangeBehavior
+        /// </summary>
+        public virtual ValueChangeBehavior ValueChangeBehavior
+        {
+            get { return (ValueChangeBehavior.InvalidateLayout); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InitializeContext
+
+        ///<summary>
+        /// InitializeContext
+        ///</summary>
+        ///<param name="cell"></param>
+        ///<param name="style"></param>
+        public virtual void InitializeContext(GridCell cell, CellVisualStyle style)
+        {
+            _Cell = cell;
+
+            if (style != null)
+            {
+                Font = style.Font;
+                WordWrap = (style.AllowWrap == Tbool.True);
+                Enabled = (_Cell.IsReadOnly == false);
+
+                SetTextAlign(style);
+
+                ForeColor = style.TextColor;
+                BackColor = Color.Transparent;
+            }
+
+            EnableMarkup = !EnableMarkup;
+            EnableMarkup = !EnableMarkup;
+
+            Text = GetValue(_Cell.Value);
+
+            _ValueChanged = false;
+        }
+
+        #region SetTextAlign
+
+        private void SetTextAlign(CellVisualStyle style)
+        {
+            switch (style.Alignment)
+            {
+                case Alignment.TopLeft:
+                    TextLineAlignment = StringAlignment.Near;
+                    TextAlignment = StringAlignment.Near;
+                    break;
+
+                case Alignment.TopCenter:
+                    TextLineAlignment = StringAlignment.Near;
+                    TextAlignment = StringAlignment.Center;
+                    break;
+
+                case Alignment.TopRight:
+                    TextLineAlignment = StringAlignment.Near;
+                    TextAlignment = StringAlignment.Far;
+                    break;
+
+                case Alignment.MiddleLeft:
+                    TextLineAlignment = StringAlignment.Center;
+                    TextAlignment = StringAlignment.Near;
+                    break;
+
+                case Alignment.MiddleCenter:
+                    TextLineAlignment = StringAlignment.Center;
+                    TextAlignment = StringAlignment.Center;
+                    break;
+
+                case Alignment.MiddleRight:
+                    TextLineAlignment = StringAlignment.Center;
+                    TextAlignment = StringAlignment.Far;
+                    break;
+
+                case Alignment.BottomLeft:
+                    TextLineAlignment = StringAlignment.Far;
+                    TextAlignment = StringAlignment.Near;
+                    break;
+
+                case Alignment.BottomCenter:
+                    TextLineAlignment = StringAlignment.Far;
+                    TextAlignment = StringAlignment.Center;
+                    break;
+
+                case Alignment.BottomRight:
+                    TextLineAlignment = StringAlignment.Far;
+                    TextAlignment = StringAlignment.Far;
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetProposedSize
+
+        ///<summary>
+        /// GetProposedSize
+        ///</summary>
+        ///<param name="g"></param>
+        ///<param name="cell"></param>
+        ///<param name="style"></param>
+        ///<param name="constraintSize"></param>
+        ///<returns></returns>
+        public virtual Size GetProposedSize(Graphics g,
+            GridCell cell, CellVisualStyle style, Size constraintSize)
+        {
+            Size maxSize = MaximumSize;
+            MaximumSize = constraintSize;
+
+            InvalidateAutoSize();
+
+            Size size = GetPreferredSize(constraintSize);
+
+            MaximumSize = maxSize;
+
+            if (constraintSize.Width > 0 && EnableMarkup == true)
+                size.Width = constraintSize.Width;
+
+            return (size);
+        }
+
+        #endregion
+
+        #region Edit support
+
+        #region BeginEdit
+
+        /// <summary>
+        /// BeginEdit
+        /// </summary>
+        /// <param name="selectAll"></param>
+        /// <returns></returns>
+        public virtual bool BeginEdit(bool selectAll)
+        {
+            return (false);
+        }
+
+        #endregion
+
+        #region EndEdit
+
+        /// <summary>
+        /// EndEdit
+        /// </summary>
+        /// <returns></returns>
+        public virtual bool EndEdit()
+        {
+            return (false);
+        }
+
+        #endregion
+
+        #region CancelEdit
+
+        /// <summary>
+        /// CancelEdit
+        /// </summary>
+        /// <returns></returns>
+        public virtual bool CancelEdit()
+        {
+            return (false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region CellRender
+
+        /// <summary>
+        /// CellRender
+        /// </summary>
+        /// <param name="g"></param>
+        public virtual void CellRender(Graphics g)
+        {
+            // Force a resize (LabelX seems to need this)
+
+            Bounds = new Rectangle();
+
+            _Cell.CellRender(this, g);
+        }
+
+        #endregion
+
+        #region Keyboard support
+
+        #region CellKeyDown
+
+        ///<summary>
+        /// CellKeyDown
+        ///</summary>
+        public virtual void CellKeyDown(KeyEventArgs e)
+        {
+        }
+
+        #endregion
+
+        #region WantsInputKey
+
+        /// <summary>
+        /// WantsInputKey
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="gridWantsKey"></param>
+        /// <returns></returns>
+        public virtual bool WantsInputKey(Keys key, bool gridWantsKey)
+        {
+            return (gridWantsKey == false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Mouse support
+
+        #region OnCellMouseMove
+
+        ///<summary>
+        /// OnCellMouseMove
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseMove(MouseEventArgs e)
+        {
+            OnMouseMove(e);
+
+            _Cell.SuperGrid.GridCursor = Cursor;
+        }
+
+        #endregion
+
+        #region OnCellMouseEnter
+
+        ///<summary>
+        /// OnCellMouseEnter
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseEnter(EventArgs e)
+        {
+            OnMouseEnter(e);
+        }
+
+        #endregion
+
+        #region OnCellMouseLeave
+
+        ///<summary>
+        /// OnCellMouseLeave
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseLeave(EventArgs e)
+        {
+            OnMouseLeave(e);
+        }
+
+        #endregion
+
+        #region OnCellMouseUp
+
+        ///<summary>
+        /// OnCellMouseUp
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseUp(MouseEventArgs e)
+        {
+            OnMouseUp(e);
+
+            OnClick(EventArgs.Empty);
+
+            Cursor = Cursors.Default;
+        }
+
+        #endregion
+
+        #region OnCellMouseDown
+
+        ///<summary>
+        /// OnCellMouseDown
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseDown(MouseEventArgs e)
+        {
+            OnMouseDown(e);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion  
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/GridMaskedTextBoxEditControl.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/GridMaskedTextBoxEditControl.cs
new file mode 100644
index 00000000..f855b489
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/GridMaskedTextBoxEditControl.cs	
@@ -0,0 +1,526 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.SuperGrid.Style;
+
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    ///<summary>
+    /// GridMaskedTextBoxEditControl
+    ///</summary>
+    [ToolboxItem(false)]
+    public class GridMaskedTextBoxEditControl : MaskedTextBox, IGridCellEditControl
+    {
+        #region Private variables
+
+        private GridCell _Cell;
+        private EditorPanel _EditorPanel;
+        private Bitmap _EditorCellBitmap;
+
+        private bool _ValueChanged;
+        private bool _SuspendUpdate;
+
+        private StretchBehavior _StretchBehavior = StretchBehavior.None;
+
+        #endregion
+
+        #region OnTextChanged
+
+        /// <summary>
+        /// OnTextChanged
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnTextChanged(EventArgs e)
+        {
+            if (_Cell != null && _SuspendUpdate == false)
+                _Cell.EditorValueChanged(this);
+
+            base.OnTextChanged(e);
+        }
+
+        #endregion
+
+        #region GetValue
+
+        ///<summary>
+        /// GetValue
+        ///</summary>
+        ///<param name="value"></param>
+        ///<returns></returns>
+        public virtual string GetValue(object value)
+        {
+            GridPanel panel = _Cell.GridPanel;
+
+            if (value == null ||
+                (panel.NullValue == NullValue.DBNull && value == DBNull.Value))
+            {
+                return ("");
+            }
+
+            if (_Cell.IsValueExpression == true)
+                value = _Cell.GetExpValue((string)value);
+
+            return (Convert.ToString(value));
+        }
+
+        #endregion
+
+        #region IGridCellEditControl Members
+
+        #region Public properties
+
+        #region CanInterrupt
+
+        /// <summary>
+        /// CanInterrupt
+        /// </summary>
+        public bool CanInterrupt
+        {
+            get { return (true); }
+        }
+
+        #endregion
+
+        #region CellEditMode
+
+        /// <summary>
+        /// CellEditMode
+        /// </summary>
+        public CellEditMode CellEditMode
+        {
+            get { return (CellEditMode.Modal); }
+        }
+
+        #endregion
+
+        #region EditorCell
+
+        /// <summary>
+        /// EditorCell
+        /// </summary>
+        public GridCell EditorCell
+        {
+            get { return (_Cell); }
+            set { _Cell = value; }
+        }
+
+        #endregion
+
+        #region EditorCellBitmap
+
+        ///<summary>
+        /// EditorCellBitmap
+        ///</summary>
+        public Bitmap EditorCellBitmap
+        {
+            get { return (_EditorCellBitmap); }
+
+            set
+            {
+                if (_EditorCellBitmap != null)
+                    _EditorCellBitmap.Dispose();
+
+                _EditorCellBitmap = value;
+            }
+        }
+
+        #endregion
+
+        #region EditorFormattedValue
+
+        ///<summary>
+        /// EditorFormattedValue
+        ///</summary>
+        public virtual string EditorFormattedValue
+        {
+            get
+            {
+                if (_Cell != null && _Cell.IsValueNull == true)
+                    return (_Cell.NullString);
+
+                return ((PasswordChar == '\0')
+                    ? Text : PasswordText());
+            }
+        }
+
+        #region PasswordText
+
+        private string PasswordText()
+        {
+            if (string.IsNullOrEmpty(Mask))
+                return (new string(PasswordChar, TextLength));
+
+            string text = Mask;
+
+            char[] c = new char[text.Length];
+
+            int n = 0;
+
+            for (int i = 0; i < text.Length; i++)
+            {
+                if ("09#L?&CAa".IndexOf(text[i]) >= 0)
+                    c[n++] = PasswordChar;
+
+                else if ("<>|".IndexOf(text[i]) < 0)
+                    c[n++] = text[i];
+            }
+
+            return (new string(c));
+        }
+
+        #endregion
+
+        #endregion
+
+        #region EditorPanel
+
+        /// <summary>
+        /// EditorPanel
+        /// </summary>
+        public EditorPanel EditorPanel
+        {
+            get { return (_EditorPanel); }
+            set { _EditorPanel = value; }
+        }
+
+        #endregion
+
+        #region EditorValue
+
+        /// <summary>
+        /// EditorValue
+        /// </summary>
+        public virtual object EditorValue
+        {
+            get { return (Text); }
+            set { Text = GetValue(value); }
+        }
+
+        #endregion
+
+        #region EditorValueChanged
+
+        /// <summary>
+        /// EditorValueChanged
+        /// </summary>
+        public virtual bool EditorValueChanged
+        {
+            get { return (_ValueChanged); }
+
+            set
+            {
+                if (_ValueChanged != value)
+                {
+                    _ValueChanged = value;
+
+                    if (value == true)
+                        _Cell.SetEditorDirty(this);
+                }
+            }
+        }
+
+        #endregion
+
+        #region EditorValueType
+
+        ///<summary>
+        /// EditorValueType
+        ///</summary>
+        public virtual Type EditorValueType
+        {
+            get { return (typeof(string)); }
+        }
+
+        #endregion
+
+        #region StretchBehavior
+
+        /// <summary>
+        /// StretchBehavior
+        /// </summary>
+        public virtual StretchBehavior StretchBehavior
+        {
+            get { return (_StretchBehavior); }
+            set { _StretchBehavior = value; }
+        }
+
+        #endregion
+
+        #region SuspendUpdate
+
+        /// <summary>
+        /// SuspendUpdate
+        /// </summary>
+        public bool SuspendUpdate
+        {
+            get { return (_SuspendUpdate); }
+            set { _SuspendUpdate = value; }
+        }
+
+        #endregion
+
+        #region ValueChangeBehavior
+
+        /// <summary>
+        /// ValueChangeBehavior
+        /// </summary>
+        public virtual ValueChangeBehavior ValueChangeBehavior
+        {
+            get { return (ValueChangeBehavior.InvalidateRender); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InitializeContext
+
+        ///<summary>
+        /// InitializeContext
+        ///</summary>
+        ///<param name="cell"></param>
+        ///<param name="style"></param>
+        public virtual void InitializeContext(GridCell cell, CellVisualStyle style)
+        {
+            _Cell = cell;
+
+            if (style != null)
+            {
+                Enabled = (_Cell.ReadOnly == false);
+                ForeColor = style.TextColor;
+                Font = style.Font;
+
+                SetTextAlign(style);
+            }
+
+            Text = GetValue(_Cell.Value);
+
+            _ValueChanged = false;
+        }
+
+        #region SetTextAlign
+
+        private void SetTextAlign(CellVisualStyle style)
+        {
+            switch (style.Alignment)
+            {
+                case Alignment.TopLeft:
+                case Alignment.MiddleLeft:
+                case Alignment.BottomLeft:
+                    TextAlign = HorizontalAlignment.Left;
+                    break;
+
+                case Alignment.TopCenter:
+                case Alignment.MiddleCenter:
+                case Alignment.BottomCenter:
+                    TextAlign = HorizontalAlignment.Center;
+                    break;
+
+                case Alignment.TopRight:
+                case Alignment.MiddleRight:
+                case Alignment.BottomRight:
+                    TextAlign = HorizontalAlignment.Right;
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetProposedSize
+
+        ///<summary>
+        /// GetProposedSize
+        ///</summary>
+        ///<param name="g"></param>
+        ///<param name="cell"></param>
+        ///<param name="style"></param>
+        ///<param name="constraintSize"></param>
+        ///<returns></returns>
+        public virtual Size GetProposedSize(Graphics g,
+            GridCell cell, CellVisualStyle style, Size constraintSize)
+        {
+            Size size = GetPreferredSize(constraintSize);
+
+            return (size);
+        }
+
+        #endregion
+
+        #region Edit support
+
+        #region BeginEdit
+
+        /// <summary>
+        /// BeginEdit
+        /// </summary>
+        /// <param name="selectAll"></param>
+        /// <returns></returns>
+        public virtual bool BeginEdit(bool selectAll)
+        {
+            Show();
+            Focus();
+            
+            if (selectAll == true)
+                SelectAll();
+            else
+                Select(Text.Length, 1);
+
+            return (false);
+        }
+
+        #endregion
+
+        #region EndEdit
+
+        /// <summary>
+        /// EndEdit
+        /// </summary>
+        /// <returns></returns>
+        public virtual bool EndEdit()
+        {
+            return (false);
+        }
+
+        #endregion
+
+        #region CancelEdit
+
+        /// <summary>
+        /// CancelEdit
+        /// </summary>
+        /// <returns></returns>
+        public virtual bool CancelEdit()
+        {
+            return (false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region CellRender
+
+        /// <summary>
+        /// CellRender
+        /// </summary>
+        /// <param name="g"></param>
+        public virtual void CellRender(Graphics g)
+        {
+            _Cell.CellRender(this, g);
+        }
+
+        #endregion
+
+        #region Keyboard support
+
+        #region CellKeyDown
+
+        ///<summary>
+        /// CellKeyDown
+        ///</summary>
+        public virtual void CellKeyDown(KeyEventArgs e)
+        {
+        }
+
+        #endregion
+
+        #region WantsInputKey
+
+        /// <summary>
+        /// WantsInputKey
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="gridWantsKey"></param>
+        /// <returns></returns>
+        public virtual bool WantsInputKey(Keys key, bool gridWantsKey)
+        {
+            // Let the TextBox handle the following keys
+
+            switch (key & Keys.KeyCode)
+            {
+                case Keys.Left:
+                case Keys.Right:
+                case Keys.Home:
+                case Keys.End:
+                    return (true);
+
+                default:
+                    return (gridWantsKey == false);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Mouse support
+
+        #region OnCellMouseMove
+
+        ///<summary>
+        /// OnCellMouseMove
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseMove(MouseEventArgs e)
+        {
+        }
+
+        #endregion
+
+        #region OnCellMouseEnter
+
+        ///<summary>
+        /// OnCellMouseEnter
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseEnter(EventArgs e)
+        {
+        }
+
+        #endregion
+
+        #region OnCellMouseLeave
+
+        ///<summary>
+        /// OnCellMouseLeave
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseLeave(EventArgs e)
+        {
+        }
+
+        #endregion
+
+        #region OnCellMouseUp
+
+        ///<summary>
+        /// OnCellMouseUp
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseUp(MouseEventArgs e)
+        {
+        }
+
+        #endregion
+
+        #region OnCellMouseDown
+
+        ///<summary>
+        /// OnCellMouseDown
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseDown(MouseEventArgs e)
+        {
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/GridMicroChartEditControl.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/GridMicroChartEditControl.cs
new file mode 100644
index 00000000..8e411101
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/GridMicroChartEditControl.cs	
@@ -0,0 +1,488 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.SuperGrid.Style;
+
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    ///<summary>
+    /// GridMicroChartEditControl
+    ///</summary>
+    [ToolboxItem(false)]
+    public class GridMicroChartEditControl : MicroChart, IGridCellEditControl
+    {
+        #region Private variables
+
+        private GridCell _Cell;
+        private EditorPanel _EditorPanel;
+        private Bitmap _EditorCellBitmap;
+
+        private bool _ValueChanged;
+        private bool _SuspendUpdate;
+
+        private StretchBehavior _StretchBehavior = StretchBehavior.Both;
+
+        #endregion
+
+        ///<summary>
+        /// GridMicroChartEditControl
+        ///</summary>
+        public GridMicroChartEditControl()
+        {
+            FocusCuesEnabled = false;
+            AnimationEnabled = false;
+        }
+
+        #region OnInvalidated
+
+        /// <summary>
+        /// OnInvalidated
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnInvalidated(InvalidateEventArgs e)
+        {
+            base.OnInvalidated(e);
+
+            if (_Cell != null && _SuspendUpdate == false)
+                _Cell.InvalidateRender();
+        }
+
+        #endregion
+
+        #region OnPaint
+
+        /// <summary>
+        /// OnPaint
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            _Cell.PaintEditorBackground(e, this);
+
+            PaintControl(e);
+        }
+
+        #endregion
+
+        #region GetValue
+
+        ///<summary>
+        /// GetValue
+        ///</summary>
+        ///<param name="value"></param>
+        ///<returns></returns>
+        public virtual List<double> GetValue(object value)
+        {
+            List<double> dps = new List<double>();
+
+            if (_Cell.IsValueExpression == true)
+                value = _Cell.GetExpValue((string)value);
+
+            string s = value as string;
+
+            if (s != null)
+            {
+                string[] values = s.Split(new char[] { ',', ' ', '\t', '|' });
+
+                foreach (string t in values)
+                {
+                    double d;
+
+                    if (double.TryParse(t, out d) == true)
+                        dps.Add(d);
+                }
+            }
+
+            return (dps);
+        }
+
+        #endregion
+
+        #region IGridCellEditControl Members
+
+        #region Public properties
+
+        #region CanInterrupt
+
+        /// <summary>
+        /// CanInterrupt
+        /// </summary>
+        public bool CanInterrupt
+        {
+            get { return (true); }
+        }
+
+        #endregion
+
+        #region CellEditMode
+
+        /// <summary>
+        /// CellEditMode
+        /// </summary>
+        public CellEditMode CellEditMode
+        {
+            get { return (CellEditMode.InPlace); }
+        }
+
+        #endregion
+
+        #region EditorCell
+
+        /// <summary>
+        /// EditorCell
+        /// </summary>
+        public GridCell EditorCell
+        {
+            get { return (_Cell); }
+            set { _Cell = value; }
+        }
+
+        #endregion
+
+        #region EditorCellBitmap
+
+        ///<summary>
+        /// EditorCellBitmap
+        ///</summary>
+        public Bitmap EditorCellBitmap
+        {
+            get { return (_EditorCellBitmap); }
+
+            set
+            {
+                if (_EditorCellBitmap != null)
+                    _EditorCellBitmap.Dispose();
+
+                _EditorCellBitmap = value;
+            }
+        }
+
+        #endregion
+
+        #region EditorFormattedValue
+
+        ///<summary>
+        /// EditorFormattedValue
+        ///</summary>
+        public virtual string EditorFormattedValue
+        {
+            get
+            {
+                if (_Cell != null && _Cell.Value == null)
+                    return (_Cell.NullString);
+
+                return (Text);
+            }
+        }
+
+        #endregion
+
+        #region EditorPanel
+
+        /// <summary>
+        /// EditorPanel
+        /// </summary>
+        public EditorPanel EditorPanel
+        {
+            get { return (_EditorPanel); }
+            set { _EditorPanel = value; }
+        }
+
+        #endregion
+
+        #region EditorValue
+
+        /// <summary>
+        /// EditorValue
+        /// </summary>
+        public virtual object EditorValue
+        {
+            get { return (null); }
+            set { DataPoints = GetValue(value); }
+        }
+
+        #endregion
+
+        #region EditorValueChanged
+
+        /// <summary>
+        /// EditorValueChanged
+        /// </summary>
+        public virtual bool EditorValueChanged
+        {
+            get { return (_ValueChanged); }
+
+            set
+            {
+                if (_ValueChanged != value)
+                {
+                    _ValueChanged = value;
+
+                    if (value == true)
+                        _Cell.SetEditorDirty(this);
+                }
+            }
+        }
+
+        #endregion
+
+        #region EditorValueType
+
+        ///<summary>
+        /// EditorValueType
+        ///</summary>
+        public virtual Type EditorValueType
+        {
+            get { return (typeof(string)); }
+        }
+
+        #endregion
+
+        #region StretchBehavior
+
+        /// <summary>
+        /// StretchBehavior
+        /// </summary>
+        public virtual StretchBehavior StretchBehavior
+        {
+            get { return (_StretchBehavior); }
+            set { _StretchBehavior = value; }
+        }
+
+        #endregion
+
+        #region SuspendUpdate
+
+        /// <summary>
+        /// SuspendUpdate
+        /// </summary>
+        public bool SuspendUpdate
+        {
+            get { return (_SuspendUpdate); }
+            set { _SuspendUpdate = value; }
+        }
+
+        #endregion
+
+        #region ValueChangeBehavior
+
+        /// <summary>
+        /// ValueChangeBehavior
+        /// </summary>
+        public virtual ValueChangeBehavior ValueChangeBehavior
+        {
+            get { return (ValueChangeBehavior.InvalidateRender); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InitializeContext
+
+        ///<summary>
+        /// InitializeContext
+        ///</summary>
+        ///<param name="cell"></param>
+        ///<param name="style"></param>
+        public virtual void InitializeContext(GridCell cell, CellVisualStyle style)
+        {
+            _Cell = cell;
+
+            if (style != null)
+                Enabled = (_Cell.IsReadOnly == false);
+
+            DataPoints = GetValue(_Cell.Value);
+
+            _ValueChanged = false;
+        }
+
+        #endregion
+
+        #region GetProposedSize
+
+        ///<summary>
+        /// GetProposedSize
+        ///</summary>
+        ///<param name="g"></param>
+        ///<param name="cell"></param>
+        ///<param name="style"></param>
+        ///<param name="constraintSize"></param>
+        ///<returns></returns>
+        public virtual Size GetProposedSize(Graphics g,
+            GridCell cell, CellVisualStyle style, Size constraintSize)
+        {
+            Size size = GetPreferredSize(constraintSize);
+
+            size.Width += Dpi.Width1;
+
+            if (constraintSize.Height == 0)
+                size.Height = Dpi.Height24;
+
+            return (size);
+        }
+
+        #endregion
+
+        #region Edit support
+
+        #region BeginEdit
+
+        /// <summary>
+        /// BeginEdit
+        /// </summary>
+        /// <param name="selectAll"></param>
+        /// <returns></returns>
+        public virtual bool BeginEdit(bool selectAll)
+        {
+            return (false);
+        }
+
+        #endregion
+
+        #region EndEdit
+
+        /// <summary>
+        /// EndEdit
+        /// </summary>
+        /// <returns></returns>
+        public virtual bool EndEdit()
+        {
+            return (false);
+        }
+
+        #endregion
+
+        #region CancelEdit
+
+        /// <summary>
+        /// CancelEdit
+        /// </summary>
+        /// <returns></returns>
+        public virtual bool CancelEdit()
+        {
+            return (false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region CellRender
+
+        /// <summary>
+        /// CellRender
+        /// </summary>
+        /// <param name="g"></param>
+        public virtual void CellRender(Graphics g)
+        {
+            _Cell.CellRender(this, g);
+        }
+
+        #endregion
+
+        #region Keyboard support
+
+        #region CellKeyDown
+
+        ///<summary>
+        /// CellKeyDown
+        ///</summary>
+        public virtual void CellKeyDown(KeyEventArgs e)
+        {
+            OnKeyDown(e);
+        }
+
+        #endregion
+
+        #region WantsInputKey
+
+        /// <summary>
+        /// WantsInputKey
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="gridWantsKey"></param>
+        /// <returns></returns>
+        public virtual bool WantsInputKey(Keys key, bool gridWantsKey)
+        {
+            return (gridWantsKey == false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Mouse support
+
+        #region OnCellMouseMove
+
+        ///<summary>
+        /// OnCellMouseMove
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseMove(MouseEventArgs e)
+        {
+            OnMouseMove(e);
+        }
+
+        #endregion
+
+        #region OnCellMouseEnter
+
+        ///<summary>
+        /// OnCellMouseEnter
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseEnter(EventArgs e)
+        {
+            OnMouseEnter(e);
+        }
+
+        #endregion
+
+        #region OnCellMouseLeave
+
+        ///<summary>
+        /// OnCellMouseLeave
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseLeave(EventArgs e)
+        {
+            OnMouseLeave(e);
+        }
+
+        #endregion
+
+        #region OnCellMouseUp
+
+        ///<summary>
+        /// OnCellMouseUp
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseUp(MouseEventArgs e)
+        {
+            OnMouseUp(e);
+        }
+
+        #endregion
+
+        #region OnCellMouseDown
+
+        ///<summary>
+        /// OnCellMouseDown
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseDown(MouseEventArgs e)
+        {
+            OnMouseDown(e);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion  
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/GridNumericUpDownEditControl.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/GridNumericUpDownEditControl.cs
new file mode 100644
index 00000000..89531c1c
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/GridNumericUpDownEditControl.cs	
@@ -0,0 +1,549 @@
+using System;
+using System.ComponentModel;
+using System.Data.SqlTypes;
+using System.Drawing;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.SuperGrid.Style;
+
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    ///<summary>
+    /// GridNumericUpDownEditControl
+    ///</summary>
+    [ToolboxItem(false)]
+    public class GridNumericUpDownEditControl : NumericUpDown, IGridCellEditControl
+    {
+        #region Private variables
+
+        private GridCell _Cell;
+        private EditorPanel _EditorPanel;
+        private Bitmap _EditorCellBitmap;
+
+        private bool _ValueChanged;
+        private bool _SuspendUpdate;
+
+        private StretchBehavior _StretchBehavior = StretchBehavior.None;
+
+        #endregion
+
+        ///<summary>
+        /// GridNumericUpDownEditControl
+        ///</summary>
+        public GridNumericUpDownEditControl()
+        {
+            DecimalPlaces = 4;
+        }
+
+        #region OnTextChanged
+
+        /// <summary>
+        /// OnTextChanged
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnTextChanged(EventArgs e)
+        {
+            if (_Cell != null && _SuspendUpdate == false)
+                _Cell.EditorValueChanged(this);
+
+            base.OnTextChanged(e);
+        }
+
+        #endregion
+
+        #region GetValue
+
+        ///<summary>
+        /// GetValue
+        ///</summary>
+        ///<param name="value"></param>
+        ///<returns></returns>
+        public virtual decimal GetValue(object value)
+        {
+            GridPanel panel = _Cell.GridPanel;
+
+            if (value == null ||
+                (panel.NullValue == NullValue.DBNull && value == DBNull.Value))
+            {
+                return (0);
+            }
+
+            if (value is SqlDecimal)
+            {
+                SqlDecimal sdt = (SqlDecimal)value;
+
+                if (sdt.IsNull == true)
+                    return (0);
+
+                return (sdt.Value);
+            }
+
+            if (value is SqlSingle)
+            {
+                SqlSingle sdt = (SqlSingle)value;
+
+                if (sdt.IsNull == true)
+                    return (0);
+
+                return (Convert.ToDecimal(sdt.Value));
+            }
+
+            if (value is SqlDouble)
+            {
+                SqlDouble sdt = (SqlDouble)value;
+
+                if (sdt.IsNull == true)
+                    return (0);
+
+                return (Convert.ToDecimal(sdt.Value));
+            }
+
+            if (_Cell.IsValueExpression == true)
+                value = _Cell.GetExpValue((string)value);
+
+            return (Convert.ToDecimal(value));
+        }
+
+        #endregion
+
+        #region IGridCellEditControl Members
+
+        #region Public properties
+
+        #region CanInterrupt
+
+        /// <summary>
+        /// CanInterrupt
+        /// </summary>
+        public bool CanInterrupt
+        {
+            get { return (true); }
+        }
+
+        #endregion
+
+        #region CellEditMode
+
+        /// <summary>
+        /// CellEditMode
+        /// </summary>
+        public CellEditMode CellEditMode
+        {
+            get { return (CellEditMode.Modal); }
+        }
+
+        #endregion
+
+        #region EditorCell
+
+        /// <summary>
+        /// EditorCell
+        /// </summary>
+        public GridCell EditorCell
+        {
+            get { return (_Cell); }
+            set { _Cell = value; }
+        }
+
+        #endregion
+
+        #region EditorCellBitmap
+
+        ///<summary>
+        /// EditorCellBitmap
+        ///</summary>
+        public Bitmap EditorCellBitmap
+        {
+            get { return (_EditorCellBitmap); }
+
+            set
+            {
+                if (_EditorCellBitmap != null)
+                    _EditorCellBitmap.Dispose();
+
+                _EditorCellBitmap = value;
+            }
+        }
+
+        #endregion
+
+        #region EditorFormattedValue
+
+        ///<summary>
+        /// EditorFormattedValue
+        ///</summary>
+        public virtual string EditorFormattedValue
+        {
+            get
+            {
+                if (_Cell != null && _Cell.IsValueNull == true)
+                    return (_Cell.NullString);
+
+                return (Value.ToString());
+            }
+        }
+
+        #endregion
+
+        #region EditorPanel
+
+        /// <summary>
+        /// EditorPanel
+        /// </summary>
+        public EditorPanel EditorPanel
+        {
+            get { return (_EditorPanel); }
+            set { _EditorPanel = value; }
+        }
+
+        #endregion
+
+        #region EditorValue
+
+        /// <summary>
+        /// EditorValue
+        /// </summary>
+        public virtual object EditorValue
+        {
+            get
+            {
+                if (string.IsNullOrEmpty(Text) == true)
+                    return (0);
+
+                return (Value);
+            }
+
+            set { Value = GetValue(value); }
+        }
+
+        #endregion
+
+        #region EditorValueChanged
+
+        /// <summary>
+        /// EditorValueChanged
+        /// </summary>
+        public virtual bool EditorValueChanged
+        {
+            get { return (_ValueChanged); }
+
+            set
+            {
+                if (_ValueChanged != value)
+                {
+                    _ValueChanged = value;
+
+                    if (value == true)
+                        _Cell.SetEditorDirty(this);
+                }
+            }
+        }
+
+        #endregion
+
+        #region EditorValueType
+
+        ///<summary>
+        /// EditorValueType
+        ///</summary>
+        public virtual Type EditorValueType
+        {
+            get { return (typeof(decimal)); }
+        }
+
+        #endregion
+
+        #region StretchBehavior
+
+        /// <summary>
+        /// StretchBehavior
+        /// </summary>
+        public virtual StretchBehavior StretchBehavior
+        {
+            get { return (_StretchBehavior); }
+            set { _StretchBehavior = value; }
+        }
+
+        #endregion
+
+        #region SuspendUpdate
+
+        /// <summary>
+        /// SuspendUpdate
+        /// </summary>
+        public bool SuspendUpdate
+        {
+            get { return (_SuspendUpdate); }
+            set { _SuspendUpdate = value; }
+        }
+
+        #endregion
+
+        #region ValueChangeBehavior
+
+        /// <summary>
+        /// ValueChangeBehavior
+        /// </summary>
+        public virtual ValueChangeBehavior ValueChangeBehavior
+        {
+            get { return (ValueChangeBehavior.InvalidateRender); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InitializeContext
+
+        ///<summary>
+        /// InitializeContext
+        ///</summary>
+        ///<param name="cell"></param>
+        ///<param name="style"></param>
+        public virtual void InitializeContext(GridCell cell, CellVisualStyle style)
+        {
+            _Cell = cell;
+
+            if (style != null)
+            {
+                Enabled = (_Cell.ReadOnly == false);
+                ForeColor = style.TextColor;
+                Font = style.Font;
+
+                SetTextAlign(style);
+            }
+
+            Value = GetValue(cell.Value);
+            Text = Value.ToString();
+
+            _ValueChanged = false;
+        }
+
+        #region SetTextAlign
+
+        private void SetTextAlign(CellVisualStyle style)
+        {
+            switch (style.Alignment)
+            {
+                case Alignment.TopLeft:
+                case Alignment.MiddleLeft:
+                case Alignment.BottomLeft:
+                    TextAlign = HorizontalAlignment.Left;
+                    break;
+
+                case Alignment.TopCenter:
+                case Alignment.MiddleCenter:
+                case Alignment.BottomCenter:
+                    TextAlign = HorizontalAlignment.Center;
+                    break;
+
+                case Alignment.TopRight:
+                case Alignment.MiddleRight:
+                case Alignment.BottomRight:
+                    TextAlign = HorizontalAlignment.Right;
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetProposedSize
+
+        ///<summary>
+        /// GetProposedSize
+        ///</summary>
+        ///<param name="g"></param>
+        ///<param name="cell"></param>
+        ///<param name="style"></param>
+        ///<param name="constraintSize"></param>
+        ///<returns></returns>
+        public virtual Size GetProposedSize(Graphics g,
+            GridCell cell, CellVisualStyle style, Size constraintSize)
+        {
+            AutoSize = true;
+            Size size = GetPreferredSize(constraintSize);
+            AutoSize = false;
+
+            if (constraintSize.Width > 0)
+                size.Width = constraintSize.Width;
+
+            return (size);
+        }
+
+        #endregion
+
+        #region Edit support
+
+        #region BeginEdit
+
+        /// <summary>
+        /// BeginEdit
+        /// </summary>
+        /// <param name="selectAll"></param>
+        /// <returns></returns>
+        public virtual bool BeginEdit(bool selectAll)
+        {
+            if (selectAll == true)
+                Select(0, 100);
+            else
+                Select(Text.Length, 1);
+
+            Show();
+            Focus();
+
+            return (false);
+        }
+
+        #endregion
+
+        #region EndEdit
+
+        /// <summary>
+        /// EndEdit
+        /// </summary>
+        /// <returns></returns>
+        public virtual bool EndEdit()
+        {
+            return (false);
+        }
+
+        #endregion
+
+        #region CancelEdit
+
+        /// <summary>
+        /// CancelEdit
+        /// </summary>
+        /// <returns></returns>
+        public virtual bool CancelEdit()
+        {
+            return (false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region CellRender
+
+        /// <summary>
+        /// CellRender
+        /// </summary>
+        /// <param name="g"></param>
+        public virtual void CellRender(Graphics g)
+        {
+            _Cell.CellRender(this, g);
+        }
+
+        #endregion
+
+        #region Keyboard support
+
+        #region CellKeyDown
+
+        ///<summary>
+        /// CellKeyDown
+        ///</summary>
+        public virtual void CellKeyDown(KeyEventArgs e)
+        {
+        }
+
+        #endregion
+
+        #region WantsInputKey
+
+        /// <summary>
+        /// WantsInputKey
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="gridWantsKey"></param>
+        /// <returns></returns>
+        public virtual bool WantsInputKey(Keys key, bool gridWantsKey)
+        {
+            switch (key & Keys.KeyCode)
+            {
+                case Keys.Left:
+                case Keys.Right:
+                case Keys.Home:
+                case Keys.End:
+                case Keys.Up:
+                case Keys.Down:
+                    return (true);
+
+                default:
+                    return (gridWantsKey == false);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Mouse support
+
+        #region OnCellMouseMove
+
+        ///<summary>
+        /// OnCellMouseMove
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseMove(MouseEventArgs e)
+        {
+        }
+
+        #endregion
+
+        #region OnCellMouseEnter
+
+        ///<summary>
+        /// OnCellMouseEnter
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseEnter(EventArgs e)
+        {
+        }
+
+        #endregion
+
+        #region OnCellMouseLeave
+
+        ///<summary>
+        /// OnCellMouseLeave
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseLeave(EventArgs e)
+        {
+        }
+
+        #endregion
+
+        #region OnCellMouseUp
+
+        ///<summary>
+        /// OnCellMouseUp
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseUp(MouseEventArgs e)
+        {
+        }
+
+        #endregion
+
+        #region OnCellMouseDown
+
+        ///<summary>
+        /// OnCellMouseDown
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseDown(MouseEventArgs e)
+        {
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/GridProgressBarXEditControl.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/GridProgressBarXEditControl.cs
new file mode 100644
index 00000000..56ed9312
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/GridProgressBarXEditControl.cs	
@@ -0,0 +1,481 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.SuperGrid.Style;
+using DevComponents.DotNetBar.Controls;
+
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    ///<summary>
+    /// GridProgressBarXEditControl
+    ///</summary>
+    [ToolboxItem(false)]
+    public class GridProgressBarXEditControl : ProgressBarX, IGridCellEditControl
+    {
+        #region Private variables
+
+        private GridCell _Cell;
+        private EditorPanel _EditorPanel;
+        private Bitmap _EditorCellBitmap;
+
+        private bool _ValueChanged;
+        private bool _SuspendUpdate;
+
+        private StretchBehavior _StretchBehavior = StretchBehavior.Both;
+
+        #endregion
+
+        #region OnInvalidated
+
+        /// <summary>
+        /// OnInvalidated
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnInvalidated(InvalidateEventArgs e)
+        {
+            base.OnInvalidated(e);
+
+            if (_Cell != null && _SuspendUpdate == false)
+                _Cell.InvalidateRender();
+        }
+
+        #endregion
+
+        #region OnPaint
+
+        /// <summary>
+        /// OnPaint
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            _Cell.PaintEditorBackground(e, this);
+
+            PaintControl(e);
+        }
+
+        #endregion
+
+        #region GetValue
+
+        ///<summary>
+        /// GetValue
+        ///</summary>
+        ///<param name="value"></param>
+        ///<returns></returns>
+        public virtual int GetValue(object value)
+        {
+            GridPanel panel = _Cell.GridPanel;
+
+            if (value == null ||
+                (panel.NullValue == NullValue.DBNull && value == DBNull.Value))
+            {
+                return (0);
+            }
+
+            if (_Cell.IsValueExpression == true)
+                value = _Cell.GetExpValue((string)value);
+
+            return (Convert.ToInt32(value));
+        }
+
+        #endregion
+
+        #region IGridCellEditControl Members
+
+        #region Public properties
+
+        #region CanInterrupt
+
+        /// <summary>
+        /// CanInterrupt
+        /// </summary>
+        public bool CanInterrupt
+        {
+            get { return (true); }
+        }
+
+        #endregion
+
+        #region CellEditMode
+
+        /// <summary>
+        /// CellEditMode
+        /// </summary>
+        public CellEditMode CellEditMode
+        {
+            get { return (CellEditMode.InPlace); }
+        }
+
+        #endregion
+
+        #region EditorCell
+
+        /// <summary>
+        /// EditorCell
+        /// </summary>
+        public GridCell EditorCell
+        {
+            get { return (_Cell); }
+            set { _Cell = value; }
+        }
+
+        #endregion
+
+        #region EditorCellBitmap
+
+        ///<summary>
+        /// EditorCellBitmap
+        ///</summary>
+        public Bitmap EditorCellBitmap
+        {
+            get { return (_EditorCellBitmap); }
+
+            set
+            {
+                if (_EditorCellBitmap != null)
+                    _EditorCellBitmap.Dispose();
+
+                _EditorCellBitmap = value;
+            }
+        }
+
+        #endregion
+
+        #region EditorFormattedValue
+
+        ///<summary>
+        /// EditorFormattedValue
+        ///</summary>
+        public virtual string EditorFormattedValue
+        {
+            get { return (Text); }
+        }
+
+        #endregion
+
+        #region EditorPanel
+
+        /// <summary>
+        /// EditorPanel
+        /// </summary>
+        public EditorPanel EditorPanel
+        {
+            get { return (_EditorPanel); }
+            set { _EditorPanel = value; }
+        }
+
+        #endregion
+
+        #region EditorValue
+
+        /// <summary>
+        /// EditorValue
+        /// </summary>
+        public virtual object EditorValue
+        {
+            get { return (Value); }
+            set { Value = GetValue(value); }
+        }
+
+        #endregion
+
+        #region EditorValueChanged
+
+        /// <summary>
+        /// EditorValueChanged
+        /// </summary>
+        public virtual bool EditorValueChanged
+        {
+            get { return (_ValueChanged); }
+
+            set
+            {
+                if (_ValueChanged != value)
+                {
+                    _ValueChanged = value;
+
+                    if (value == true)
+                        _Cell.SetEditorDirty(this);
+                }
+            }
+        }
+
+        #endregion
+
+        #region EditorValueType
+
+        ///<summary>
+        /// EditorValueType
+        ///</summary>
+        public virtual Type EditorValueType
+        {
+            get { return (typeof(string)); }
+        }
+
+        #endregion
+
+        #region StretchBehavior
+
+        /// <summary>
+        /// StretchBehavior
+        /// </summary>
+        public virtual StretchBehavior StretchBehavior
+        {
+            get { return (_StretchBehavior); }
+            set { _StretchBehavior = value; }
+        }
+
+        #endregion
+
+        #region SuspendUpdate
+
+        /// <summary>
+        /// SuspendUpdate
+        /// </summary>
+        public bool SuspendUpdate
+        {
+            get { return (_SuspendUpdate); }
+            set { _SuspendUpdate = value; }
+        }
+
+        #endregion
+
+        #region ValueChangeBehavior
+
+        /// <summary>
+        /// ValueChangeBehavior
+        /// </summary>
+        public virtual ValueChangeBehavior ValueChangeBehavior
+        {
+            get { return (ValueChangeBehavior.InvalidateRender); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InitializeContext
+
+        ///<summary>
+        /// InitializeContext
+        ///</summary>
+        ///<param name="cell"></param>
+        ///<param name="style"></param>
+        public virtual void InitializeContext(GridCell cell, CellVisualStyle style)
+        {
+            _Cell = cell;
+
+            Value = GetValue(_Cell.Value);
+
+            _ValueChanged = false;
+        }
+
+        #endregion
+
+        #region GetProposedSize
+
+        ///<summary>
+        /// GetProposedSize
+        ///</summary>
+        ///<param name="g"></param>
+        ///<param name="cell"></param>
+        ///<param name="style"></param>
+        ///<param name="constraintSize"></param>
+        ///<returns></returns>
+        public virtual Size GetProposedSize(Graphics g,
+            GridCell cell, CellVisualStyle style, Size constraintSize)
+        {
+            Size size = GetPreferredSize(constraintSize);
+
+            if (constraintSize.Height == 0)
+                size.Height = Dpi.Height23;
+
+            return (size);
+        }
+
+        #endregion
+
+        #region Edit support
+
+        #region BeginEdit
+
+        /// <summary>
+        /// BeginEdit
+        /// </summary>
+        /// <param name="selectAll"></param>
+        /// <returns></returns>
+        public virtual bool BeginEdit(bool selectAll)
+        {
+            return (false);
+        }
+
+        #endregion
+
+        #region EndEdit
+
+        /// <summary>
+        /// EndEdit
+        /// </summary>
+        /// <returns></returns>
+        public virtual bool EndEdit()
+        {
+            return (false);
+        }
+
+        #endregion
+
+        #region CancelEdit
+
+        /// <summary>
+        /// CancelEdit
+        /// </summary>
+        /// <returns></returns>
+        public virtual bool CancelEdit()
+        {
+            return (false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region CellRender
+
+        /// <summary>
+        /// CellRender
+        /// </summary>
+        /// <param name="g"></param>
+        public virtual void CellRender(Graphics g)
+        {
+            _Cell.CellRender(this, g);
+        }
+
+        #endregion
+
+        #region Keyboard support
+
+        #region CellKeyDown
+
+        ///<summary>
+        /// CellKeyDown
+        ///</summary>
+        public virtual void CellKeyDown(KeyEventArgs e)
+        {
+            switch (e.KeyCode)
+            {
+                case Keys.Add:
+                    Value += Step;
+                    break;
+
+                case Keys.Subtract:
+                    Value -= Step;
+                    break;
+
+                default:
+                    OnKeyDown(e);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region WantsInputKey
+
+        /// <summary>
+        /// WantsInputKey
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="gridWantsKey"></param>
+        /// <returns></returns>
+        public virtual bool WantsInputKey(Keys key, bool gridWantsKey)
+        {
+            switch (key & Keys.KeyCode)
+            {
+                case Keys.Add:
+                case Keys.Subtract:
+                case Keys.Space:
+                    return (true);
+
+                default:
+                    return (gridWantsKey == false);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Mouse support
+
+        #region OnCellMouseMove
+
+        ///<summary>
+        /// OnCellMouseMove
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseMove(MouseEventArgs e)
+        {
+            OnMouseMove(e);
+        }
+
+        #endregion
+
+        #region OnCellMouseEnter
+
+        ///<summary>
+        /// OnCellMouseEnter
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseEnter(EventArgs e)
+        {
+            OnMouseEnter(e);
+        }
+
+        #endregion
+
+        #region OnCellMouseLeave
+
+        ///<summary>
+        /// OnCellMouseLeave
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseLeave(EventArgs e)
+        {
+            OnMouseLeave(e);
+        }
+
+        #endregion
+
+        #region OnCellMouseUp
+
+        ///<summary>
+        /// OnCellMouseUp
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseUp(MouseEventArgs e)
+        {
+            OnMouseUp(e);
+        }
+
+        #endregion
+
+        #region OnCellMouseDown
+
+        ///<summary>
+        /// OnCellMouseDown
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseDown(MouseEventArgs e)
+        {
+            OnMouseDown(e);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion  
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/GridRadialMenuEditControl.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/GridRadialMenuEditControl.cs
new file mode 100644
index 00000000..706fbe27
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/GridRadialMenuEditControl.cs	
@@ -0,0 +1,575 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.SuperGrid.Style;
+
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    ///<summary>
+    /// GridButtonXEditControl
+    ///</summary>
+    [ToolboxItem(false)]
+    public class GridRadialMenuEditControl : RadialMenu, IGridCellEditControl
+    {
+        #region Private variables
+
+        private GridCell _Cell;
+        private EditorPanel _EditorPanel;
+        private Bitmap _EditorCellBitmap;
+
+        private bool _ValueChanged;
+        private bool _SuspendUpdate;
+
+        private StretchBehavior _StretchBehavior = StretchBehavior.None;
+
+        #endregion
+
+        ///<summary>
+        /// GridRadialMenuEditControl
+        ///</summary>
+        public GridRadialMenuEditControl()
+        {
+            this.SetStyle(
+                ControlStyles.UserPaint |
+                ControlStyles.AllPaintingInWmPaint |
+                ControlStyles.Opaque |
+                ControlStyles.ResizeRedraw |
+                DisplayHelp.DoubleBufferFlag |
+                ControlStyles.SupportsTransparentBackColor, true);
+
+            BackColor = Color.Transparent;
+            Colors.RadialMenuButtonBackground = Color.Transparent;
+
+            ItemClick += GridRadialMenuEditControl_ItemClick;
+        }
+
+        #region GridRadialMenuEditControl_ItemClick
+
+        /// <summary>
+        /// RadialMenu item click handler
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void GridRadialMenuEditControl_ItemClick(object sender, EventArgs e)
+        {
+            if (_SuspendUpdate == false)
+            {
+                RadialMenuItem item = sender as RadialMenuItem;
+
+                if (item != null)
+                    OnGridRadialMenuEditControl_ItemClick(item);
+            }
+        }
+
+        #region OnGridRadialMenuEditControl_ItemClick
+
+        /// <summary>
+        /// RadialMenu item click handler
+        /// </summary>
+        /// <param name="item"></param>
+        public virtual void OnGridRadialMenuEditControl_ItemClick(RadialMenuItem item)
+        {
+            if ((item.Text != null && item.Text.Equals(_Cell.Value) == false) ||
+            (item.Text == null && _Cell.Value != null))
+            {
+                _Cell.Value = item.Text;
+
+                _Cell.EditorValueChanged(this);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region OnInvalidated
+
+        /// <summary>
+        /// OnInvalidated
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnInvalidated(InvalidateEventArgs e)
+        {
+            base.OnInvalidated(e);
+
+            if (_Cell != null && _SuspendUpdate == false)
+                _Cell.InvalidateRender();
+        }
+
+        #endregion
+
+        #region GetValue
+
+        ///<summary>
+        /// GetValue
+        ///</summary>
+        ///<param name="value"></param>
+        ///<returns></returns>
+        public virtual string GetValue(object value)
+        {
+            GridPanel panel = _Cell.GridPanel;
+
+            if (value == null ||
+                (panel.NullValue == NullValue.DBNull && value == DBNull.Value))
+            {
+                return (_Cell.NullString);
+            }
+
+            if (_Cell.IsValueExpression == true)
+                value = _Cell.GetExpValue((string)value);
+
+            return (value.ToString());
+        }
+
+        #endregion
+
+        #region FindItemByText
+
+        /// <summary>
+        /// Finds the RadialMenuItem based upon the given item Text.
+        /// </summary>
+        /// <param name="items"></param>
+        /// <param name="text"></param>
+        /// <returns>RadialMenuItem or null</returns>
+        public RadialMenuItem FindItemByText(SubItemsCollection items, string text)
+        {
+            if (string.IsNullOrEmpty(text))
+                return (null);
+
+            foreach (RadialMenuItem item in items)
+            {
+                if (item.Text.Equals(text))
+                    return (item);
+
+                if (item.SubItems.Count > 0)
+                {
+                    RadialMenuItem item2 = FindItemByText(item.SubItems, text);
+
+                    if (item2 != null)
+                        return (item2);
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region IGridCellEditControl Members
+
+        #region Public properties
+
+        #region CanInterrupt
+
+        /// <summary>
+        /// CanInterrupt
+        /// </summary>
+        public bool CanInterrupt
+        {
+            get { return (true); }
+        }
+
+        #endregion
+
+        #region CellEditMode
+
+        /// <summary>
+        /// CellEditMode
+        /// </summary>
+        public CellEditMode CellEditMode
+        {
+            get { return (CellEditMode.NonModal); }
+        }
+
+        #endregion
+
+        #region EditorCell
+
+        /// <summary>
+        /// EditorCell
+        /// </summary>
+        public GridCell EditorCell
+        {
+            get { return (_Cell); }
+            set { _Cell = value; }
+        }
+
+        #endregion
+
+        #region EditorCellBitmap
+
+        ///<summary>
+        /// EditorCellBitmap
+        ///</summary>
+        public Bitmap EditorCellBitmap
+        {
+            get { return (_EditorCellBitmap); }
+
+            set
+            {
+                if (_EditorCellBitmap != null)
+                    _EditorCellBitmap.Dispose();
+
+                _EditorCellBitmap = value;
+            }
+        }
+
+        #endregion
+
+        #region EditorFormattedValue
+
+        ///<summary>
+        /// EditorFormattedValue
+        ///</summary>
+        public virtual string EditorFormattedValue
+        {
+            get { return (Text); }
+        }
+
+        #endregion
+
+        #region EditorPanel
+
+        /// <summary>
+        /// EditorPanel
+        /// </summary>
+        public EditorPanel EditorPanel
+        {
+            get { return (_EditorPanel); }
+            set { _EditorPanel = value; }
+        }
+
+        #endregion
+
+        #region EditorValue
+
+        /// <summary>
+        /// EditorValue
+        /// </summary>
+        public virtual object EditorValue
+        {
+            get { return (Text); }
+            set { Text = GetValue(value); }
+        }
+
+        #endregion
+
+        #region EditorValueChanged
+
+        /// <summary>
+        /// EditorValueChanged
+        /// </summary>
+        public virtual bool EditorValueChanged
+        {
+            get { return (_ValueChanged); }
+
+            set
+            {
+                if (_ValueChanged != value)
+                {
+                    _ValueChanged = value;
+
+                    if (value == true)
+                        _Cell.SetEditorDirty(this);
+                }
+            }
+        }
+
+        #endregion
+
+        #region EditorValueType
+
+        ///<summary>
+        /// EditorValueType
+        ///</summary>
+        public virtual Type EditorValueType
+        {
+            get { return (typeof(string)); }
+        }
+
+        #endregion
+
+        #region StretchBehavior
+
+        /// <summary>
+        /// StretchBehavior
+        /// </summary>
+        public virtual StretchBehavior StretchBehavior
+        {
+            get { return (_StretchBehavior); }
+            set { _StretchBehavior = value; }
+        }
+
+        #endregion
+
+        #region SuspendUpdate
+
+        /// <summary>
+        /// SuspendUpdate
+        /// </summary>
+        public virtual bool SuspendUpdate
+        {
+            get { return (_SuspendUpdate); }
+            set { _SuspendUpdate = value; }
+        }
+
+        #endregion
+
+        #region ValueChangeBehavior
+
+        /// <summary>
+        /// ValueChangeBehavior
+        /// </summary>
+        public virtual ValueChangeBehavior ValueChangeBehavior
+        {
+            get { return (ValueChangeBehavior.InvalidateRender); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InitializeContext
+
+        ///<summary>
+        /// InitializeContext
+        ///</summary>
+        ///<param name="cell"></param>
+        ///<param name="style"></param>
+        public virtual void InitializeContext(GridCell cell, CellVisualStyle style)
+        {
+            _Cell = cell;
+
+            if (style != null)
+            {
+                Enabled = (_Cell.IsReadOnly == false);
+
+                Font = style.Font;
+                ForeColor = style.TextColor;
+            }
+
+            Text = GetValue(_Cell.Value);
+
+            _ValueChanged = false;
+        }
+
+        #endregion
+
+        #region GetProposedSize
+
+        ///<summary>
+        /// GetProposedSize
+        ///</summary>
+        ///<param name="g"></param>
+        ///<param name="cell"></param>
+        ///<param name="style"></param>
+        ///<param name="constraintSize"></param>
+        ///<returns></returns>
+        public virtual Size GetProposedSize(Graphics g,
+            GridCell cell, CellVisualStyle style, Size constraintSize)
+        {
+            Size size = GetPreferredSize(Size.Empty);
+
+            int n = Dpi.Width(CenterButtonDiameter);
+
+            if (n > size.Width)
+                size.Width = n;
+
+            n = Dpi.Height(CenterButtonDiameter);
+
+            if (n > size.Height)
+                size.Height = n;
+
+            return (size);
+        }
+
+        #endregion
+
+        #region Edit support
+
+        #region BeginEdit
+
+        /// <summary>
+        /// BeginEdit
+        /// </summary>
+        /// <param name="selectAll"></param>
+        /// <returns></returns>
+        public virtual bool BeginEdit(bool selectAll)
+        {
+            return (false);
+        }
+
+        #endregion
+
+        #region EndEdit
+
+        /// <summary>
+        /// EndEdit
+        /// </summary>
+        /// <returns></returns>
+        public virtual bool EndEdit()
+        {
+            return (false);
+        }
+
+        #endregion
+
+        #region CancelEdit
+
+        /// <summary>
+        /// CancelEdit
+        /// </summary>
+        /// <returns></returns>
+        public virtual bool CancelEdit()
+        {
+            return (false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region CellRender
+
+        /// <summary>
+        /// CellRender
+        /// </summary>
+        /// <param name="g"></param>
+        public virtual void CellRender(Graphics g)
+        {
+            _Cell.CellRender(this, g);
+        }
+
+        #endregion
+
+        #region Keyboard support
+
+        #region CellKeyDown
+
+        ///<summary>
+        /// CellKeyDown
+        ///</summary>
+        public virtual void CellKeyDown(KeyEventArgs e)
+        {
+            OnKeyDown(e);
+            OnKeyUp(e);
+        }
+
+        #endregion
+
+        #region WantsInputKey
+
+        /// <summary>
+        /// WantsInputKey
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="gridWantsKey"></param>
+        /// <returns></returns>
+        public virtual bool WantsInputKey(Keys key, bool gridWantsKey)
+        {
+            switch (key & Keys.KeyCode)
+            {
+                case Keys.Space:
+                    return (true);
+
+                default:
+                    return (gridWantsKey == false);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Mouse support
+
+        #region OnCellMouseMove
+
+        ///<summary>
+        /// OnCellMouseMove
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseMove(MouseEventArgs e)
+        {
+            OnMouseMove(e);
+        }
+
+        #endregion
+
+        #region OnCellMouseEnter
+
+        ///<summary>
+        /// OnCellMouseEnter
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseEnter(EventArgs e)
+        {
+            Point pt = _Cell.SuperGrid.PointToClient(MousePosition);
+
+            OnMouseEnter(e);
+        }
+
+        #endregion
+
+        #region OnCellMouseLeave
+
+        ///<summary>
+        /// OnCellMouseLeave
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseLeave(EventArgs e)
+        {
+            if (_Cell != null)
+            {
+                Refresh();
+                OnMouseLeave(e);
+            }
+        }
+
+        #endregion
+
+        #region OnCellMouseUp
+
+        ///<summary>
+        /// OnCellMouseUp
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseUp(MouseEventArgs e)
+        {
+            OnMouseUp(e);
+        }
+
+        #endregion
+
+        #region OnCellMouseDown
+
+        ///<summary>
+        /// OnCellMouseDown
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseDown(MouseEventArgs e)
+        {
+            OnMouseDown(e);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion  
+
+        #region Dispose
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        /// <param name="disposing"></param>
+        protected override void Dispose(bool disposing)
+        {
+            base.Dispose(disposing);
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/GridRatingStarEditControl.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/GridRatingStarEditControl.cs
new file mode 100644
index 00000000..a4125a86
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/GridRatingStarEditControl.cs	
@@ -0,0 +1,506 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.SuperGrid.Style;
+using DevComponents.DotNetBar.Controls;
+
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    ///<summary>
+    /// GridRatingStarEditControl
+    ///</summary>
+    [ToolboxItem(false)]
+    public class GridRatingStarEditControl : RatingStar, IGridCellEditControl
+    {
+        #region Private variables
+
+        private GridCell _Cell;
+        private EditorPanel _EditorPanel;
+        private Bitmap _EditorCellBitmap;
+
+        private bool _ValueChanged;
+        private bool _SuspendUpdate;
+
+        private StretchBehavior _StretchBehavior = StretchBehavior.None;
+
+        #endregion
+
+        #region OnRatingChanged
+
+        /// <summary>
+        /// OnRatingChanged
+        /// </summary>
+        /// <param name="eventArgs"></param>
+        protected override void OnRatingChanged(EventArgs eventArgs)
+        {
+            if (_SuspendUpdate == false)
+            {
+                _Cell.Value = Rating;
+                _Cell.EditorValueChanged(this);
+            }
+
+            base.OnRatingChanged(eventArgs);
+        }
+
+        #endregion
+
+        #region OnInvalidated
+
+        /// <summary>
+        /// OnInvalidated
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnInvalidated(InvalidateEventArgs e)
+        {
+            base.OnInvalidated(e);
+
+            if (_Cell != null && _SuspendUpdate == false)
+                _Cell.InvalidateRender();
+        }
+
+        #endregion
+
+        #region OnPaint
+
+        /// <summary>
+        /// OnPaint
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            _Cell.PaintEditorBackground(e, this);
+
+            PaintControl(e);
+        }
+
+        #endregion
+
+        #region GetValue
+
+        ///<summary>
+        /// GetValue
+        ///</summary>
+        ///<param name="value"></param>
+        ///<returns></returns>
+        public virtual int GetValue(object value)
+        {
+            GridPanel panel = _Cell.GridPanel;
+
+            if (value == null ||
+                (panel.NullValue == NullValue.DBNull && value == DBNull.Value))
+            {
+                return (0);
+            }
+
+            if (_Cell.IsValueExpression == true)
+                value = _Cell.GetExpValue((string)value);
+
+            return (Convert.ToInt32(value));
+        }
+
+        #endregion
+
+        #region IGridCellEditControl Members
+
+        #region Public properties
+
+        #region CanInterrupt
+
+        /// <summary>
+        /// CanInterrupt
+        /// </summary>
+        public bool CanInterrupt
+        {
+            get { return (true); }
+        }
+
+        #endregion
+
+        #region CellEditMode
+
+        /// <summary>
+        /// CellEditMode
+        /// </summary>
+        public CellEditMode CellEditMode
+        {
+            get { return (CellEditMode.InPlace); }
+        }
+
+        #endregion
+
+        #region EditorCell
+
+        /// <summary>
+        /// EditorCell
+        /// </summary>
+        public GridCell EditorCell
+        {
+            get { return (_Cell); }
+            set { _Cell = value; }
+        }
+
+        #endregion
+
+        #region EditorCellBitmap
+
+        ///<summary>
+        /// EditorCellBitmap
+        ///</summary>
+        public Bitmap EditorCellBitmap
+        {
+            get { return (_EditorCellBitmap); }
+
+            set
+            {
+                if (_EditorCellBitmap != null)
+                    _EditorCellBitmap.Dispose();
+
+                _EditorCellBitmap = value;
+            }
+        }
+
+        #endregion
+
+        #region EditorFormattedValue
+
+        ///<summary>
+        /// EditorFormattedValue
+        ///</summary>
+        public virtual string EditorFormattedValue
+        {
+            get { return (Text); }
+        }
+
+        #endregion
+
+        #region EditorPanel
+
+        /// <summary>
+        /// EditorPanel
+        /// </summary>
+        public EditorPanel EditorPanel
+        {
+            get { return (_EditorPanel); }
+            set { _EditorPanel = value; }
+        }
+
+        #endregion
+
+        #region EditorValue
+
+        /// <summary>
+        /// EditorValue
+        /// </summary>
+        public virtual object EditorValue
+        {
+            get { return (Rating); }
+            set { Rating = GetValue(value); }
+        }
+
+        #endregion
+
+        #region EditorValueChanged
+
+        /// <summary>
+        /// EditorValueChanged
+        /// </summary>
+        public virtual bool EditorValueChanged
+        {
+            get { return (_ValueChanged); }
+
+            set
+            {
+                if (_ValueChanged != value)
+                {
+                    _ValueChanged = value;
+
+                    if (value == true)
+                        _Cell.SetEditorDirty(this);
+                }
+            }
+        }
+
+        #endregion
+
+        #region EditorValueType
+
+        ///<summary>
+        /// EditorValueType
+        ///</summary>
+        public virtual Type EditorValueType
+        {
+            get { return (typeof(string)); }
+        }
+
+        #endregion
+
+        #region StretchBehavior
+
+        /// <summary>
+        /// StretchBehavior
+        /// </summary>
+        public virtual StretchBehavior StretchBehavior
+        {
+            get { return (_StretchBehavior); }
+            set { _StretchBehavior = value; }
+        }
+
+        #endregion
+
+        #region SuspendUpdate
+
+        /// <summary>
+        /// SuspendUpdate
+        /// </summary>
+        public bool SuspendUpdate
+        {
+            get { return (_SuspendUpdate); }
+            set { _SuspendUpdate = value; }
+        }
+
+        #endregion
+
+        #region ValueChangeBehavior
+
+        /// <summary>
+        /// ValueChangeBehavior
+        /// </summary>
+        public virtual ValueChangeBehavior ValueChangeBehavior
+        {
+            get { return (ValueChangeBehavior.InvalidateRender); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InitializeContext
+
+        ///<summary>
+        /// InitializeContext
+        ///</summary>
+        ///<param name="cell"></param>
+        ///<param name="style"></param>
+        public virtual void InitializeContext(GridCell cell, CellVisualStyle style)
+        {
+            _Cell = cell;
+
+            if (style != null)
+            {
+                Enabled = (_Cell.IsReadOnly == false);
+                Font = style.Font;
+                ForeColor = style.TextColor;
+            }
+
+            Rating = GetValue(_Cell.Value);
+
+            _ValueChanged = false;
+        }
+
+        #endregion
+
+        #region GetProposedSize
+
+        ///<summary>
+        /// GetProposedSize
+        ///</summary>
+        ///<param name="g"></param>
+        ///<param name="cell"></param>
+        ///<param name="style"></param>
+        ///<param name="constraintSize"></param>
+        ///<returns></returns>
+        public virtual Size GetProposedSize(Graphics g,
+            GridCell cell, CellVisualStyle style, Size constraintSize)
+        {
+            GetPreferredSize(constraintSize);
+
+            return (CalcSize);
+        }
+
+        #endregion
+
+        #region Edit support
+
+        #region BeginEdit
+
+        /// <summary>
+        /// BeginEdit
+        /// </summary>
+        /// <param name="selectAll"></param>
+        /// <returns></returns>
+        public virtual bool BeginEdit(bool selectAll)
+        {
+            return (false);
+        }
+
+        #endregion
+
+        #region EndEdit
+
+        /// <summary>
+        /// EndEdit
+        /// </summary>
+        /// <returns></returns>
+        public virtual bool EndEdit()
+        {
+            return (false);
+        }
+
+        #endregion
+
+        #region CancelEdit
+
+        /// <summary>
+        /// CancelEdit
+        /// </summary>
+        /// <returns></returns>
+        public virtual bool CancelEdit()
+        {
+            return (false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region CellRender
+
+        /// <summary>
+        /// CellRender
+        /// </summary>
+        /// <param name="g"></param>
+        public virtual void CellRender(Graphics g)
+        {
+            _Cell.CellRender(this, g);
+        }
+
+        #endregion
+
+        #region Keyboard support
+
+        #region CellKeyDown
+
+        ///<summary>
+        /// CellKeyDown
+        ///</summary>
+        public virtual void CellKeyDown(KeyEventArgs e)
+        {
+            switch (e.KeyCode)
+            {
+                case Keys.Add:
+                    Rating += 1;
+                    break;
+
+                case Keys.Subtract:
+                    Rating -= 1;
+                    break;
+
+                default:
+                    OnKeyDown(e);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region WantsInputKey
+
+        /// <summary>
+        /// WantsInputKey
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="gridWantsKey"></param>
+        /// <returns></returns>
+        public virtual bool WantsInputKey(Keys key, bool gridWantsKey)
+        {
+            switch (key & Keys.KeyCode)
+            {
+                case Keys.Add:
+                case Keys.Subtract:
+                case Keys.Space:
+                    return (true);
+
+                default:
+                    return (gridWantsKey == false);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Mouse support
+
+        #region OnCellMouseMove
+
+        ///<summary>
+        /// OnCellMouseMove
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseMove(MouseEventArgs e)
+        {
+            OnMouseMove(e);
+        }
+
+        #endregion
+
+        #region OnCellMouseEnter
+
+        ///<summary>
+        /// OnCellMouseEnter
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseEnter(EventArgs e)
+        {
+            OnMouseEnter(e);
+        }
+
+        #endregion
+
+        #region OnCellMouseLeave
+
+        ///<summary>
+        /// OnCellMouseLeave
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseLeave(EventArgs e)
+        {
+            OnMouseLeave(e);
+        }
+
+        #endregion
+
+        #region OnCellMouseUp
+
+        ///<summary>
+        /// OnCellMouseUp
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseUp(MouseEventArgs e)
+        {
+            OnMouseUp(e);
+
+            OnClick(EventArgs.Empty);
+        }
+
+        #endregion
+
+        #region OnCellMouseDown
+
+        ///<summary>
+        /// OnCellMouseDown
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseDown(MouseEventArgs e)
+        {
+            OnMouseDown(e);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion  
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/GridSliderEditControl.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/GridSliderEditControl.cs
new file mode 100644
index 00000000..f1eeec4b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/GridSliderEditControl.cs	
@@ -0,0 +1,510 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.SuperGrid.Style;
+using DevComponents.DotNetBar.Controls;
+
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    ///<summary>
+    /// GridSliderEditControl
+    ///</summary>
+    [ToolboxItem(false)]
+    public class GridSliderEditControl : Slider, IGridCellEditControl
+    {
+        #region Private variables
+
+        private GridCell _Cell;
+        private EditorPanel _EditorPanel;
+        private Bitmap _EditorCellBitmap;
+
+        private bool _ValueChanged;
+        private bool _SuspendUpdate;
+
+        private StretchBehavior _StretchBehavior = StretchBehavior.HorizontalOnly;
+
+        #endregion
+
+        #region OnValueChanged
+
+        /// <summary>
+        /// OnValueChanged
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnValueChanged(EventArgs e)
+        {
+            if (_SuspendUpdate == false)
+            {
+                _Cell.Value = Value;
+                _Cell.EditorValueChanged(this);
+            }
+
+            base.OnValueChanged(e);
+        }
+
+        #endregion
+
+        #region OnInvalidated
+
+        /// <summary>
+        /// OnInvalidated
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnInvalidated(InvalidateEventArgs e)
+        {
+            base.OnInvalidated(e);
+
+            if (_Cell != null && _SuspendUpdate == false)
+                _Cell.InvalidateRender();
+        }
+
+        #endregion
+
+        #region OnPaint
+
+        /// <summary>
+        /// OnPaint
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            _Cell.PaintEditorBackground(e, this);
+
+            PaintControl(e);
+        }
+
+        #endregion
+
+        #region GetValue
+
+        ///<summary>
+        /// GetValue
+        ///</summary>
+        ///<param name="value"></param>
+        ///<returns></returns>
+        public virtual int GetValue(object value)
+        {
+            GridPanel panel = _Cell.GridPanel;
+
+            if (value == null ||
+                (panel.NullValue == NullValue.DBNull && value == DBNull.Value))
+            {
+                return (0);
+            }
+
+            if (_Cell.IsValueExpression == true)
+                value = _Cell.GetExpValue((string)value);
+
+            return (Convert.ToInt32(value));
+        }
+
+        #endregion
+
+        #region IGridCellEditControl Members
+
+        #region Public properties
+
+        #region CanInterrupt
+
+        /// <summary>
+        /// CanInterrupt
+        /// </summary>
+        public bool CanInterrupt
+        {
+            get { return (true); }
+        }
+
+        #endregion
+
+        #region CellEditMode
+
+        /// <summary>
+        /// CellEditMode
+        /// </summary>
+        public CellEditMode CellEditMode
+        {
+            get { return (CellEditMode.InPlace); }
+        }
+
+        #endregion
+
+        #region EditorCell
+
+        /// <summary>
+        /// EditorCell
+        /// </summary>
+        public GridCell EditorCell
+        {
+            get { return (_Cell); }
+            set { _Cell = value; }
+        }
+
+        #endregion
+
+        #region EditorCellBitmap
+
+        ///<summary>
+        /// EditorCellBitmap
+        ///</summary>
+        public Bitmap EditorCellBitmap
+        {
+            get { return (_EditorCellBitmap); }
+
+            set
+            {
+                if (_EditorCellBitmap != null)
+                    _EditorCellBitmap.Dispose();
+
+                _EditorCellBitmap = value;
+            }
+        }
+
+        #endregion
+
+        #region EditorFormattedValue
+
+        ///<summary>
+        /// EditorFormattedValue
+        ///</summary>
+        public virtual string EditorFormattedValue
+        {
+            get { return (Text); }
+        }
+
+        #endregion
+
+        #region EditorPanel
+
+        /// <summary>
+        /// EditorPanel
+        /// </summary>
+        public EditorPanel EditorPanel
+        {
+            get { return (_EditorPanel); }
+            set { _EditorPanel = value; }
+        }
+
+        #endregion
+
+        #region EditorValue
+
+        /// <summary>
+        /// EditorValue
+        /// </summary>
+        public virtual object EditorValue
+        {
+            get { return (Value); }
+            set { Value = GetValue(value); }
+        }
+
+        #endregion
+
+        #region EditorValueChanged
+
+        /// <summary>
+        /// EditorValueChanged
+        /// </summary>
+        public virtual bool EditorValueChanged
+        {
+            get { return (_ValueChanged); }
+
+            set
+            {
+                if (_ValueChanged != value)
+                {
+                    _ValueChanged = value;
+
+                    if (value == true)
+                        _Cell.SetEditorDirty(this);
+                }
+            }
+        }
+
+        #endregion
+
+        #region EditorValueType
+
+        ///<summary>
+        /// EditorValueType
+        ///</summary>
+        public virtual Type EditorValueType
+        {
+            get { return (typeof(string)); }
+        }
+
+        #endregion
+
+        #region StretchBehavior
+
+        /// <summary>
+        /// StretchBehavior
+        /// </summary>
+        public virtual StretchBehavior StretchBehavior
+        {
+            get { return (_StretchBehavior); }
+            set { _StretchBehavior = value; }
+        }
+
+        #endregion
+
+        #region SuspendUpdate
+
+        /// <summary>
+        /// SuspendUpdate
+        /// </summary>
+        public bool SuspendUpdate
+        {
+            get { return (_SuspendUpdate); }
+            set { _SuspendUpdate = value; }
+        }
+
+        #endregion
+
+        #region ValueChangeBehavior
+
+        /// <summary>
+        /// ValueChangeBehavior
+        /// </summary>
+        public virtual ValueChangeBehavior ValueChangeBehavior
+        {
+            get { return (ValueChangeBehavior.InvalidateRender); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InitializeContext
+
+        ///<summary>
+        /// InitializeContext
+        ///</summary>
+        ///<param name="cell"></param>
+        ///<param name="style"></param>
+        public virtual void InitializeContext(GridCell cell, CellVisualStyle style)
+        {
+            _Cell = cell;
+
+            if (style != null)
+            {
+                Enabled = (_Cell.IsReadOnly == false);
+                Font = style.Font;
+                ForeColor = style.TextColor;
+            }
+
+            Value = GetValue(_Cell.Value);
+
+            _ValueChanged = false;
+        }
+
+        #endregion
+
+        #region GetProposedSize
+
+        ///<summary>
+        /// GetProposedSize
+        ///</summary>
+        ///<param name="g"></param>
+        ///<param name="cell"></param>
+        ///<param name="style"></param>
+        ///<param name="constraintSize"></param>
+        ///<returns></returns>
+        public virtual Size GetProposedSize(Graphics g,
+            GridCell cell, CellVisualStyle style, Size constraintSize)
+        {
+            Size size = GetPreferredSize(constraintSize);
+
+            if (constraintSize.Width == 0)
+                size.Width = Dpi.Width80;
+
+            if (constraintSize.Height == 0)
+                size.Height = Dpi.Height20;
+
+            return (size);
+        }
+
+        #endregion
+
+        #region Edit support
+
+        #region BeginEdit
+
+        /// <summary>
+        /// BeginEdit
+        /// </summary>
+        /// <param name="selectAll"></param>
+        /// <returns></returns>
+        public virtual bool BeginEdit(bool selectAll)
+        {
+            return (false);
+        }
+
+        #endregion
+
+        #region EndEdit
+
+        /// <summary>
+        /// EndEdit
+        /// </summary>
+        /// <returns></returns>
+        public virtual bool EndEdit()
+        {
+            return (false);
+        }
+
+        #endregion
+
+        #region CancelEdit
+
+        /// <summary>
+        /// CancelEdit
+        /// </summary>
+        /// <returns></returns>
+        public virtual bool CancelEdit()
+        {
+            return (false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region CellRender
+
+        /// <summary>
+        /// CellRender
+        /// </summary>
+        /// <param name="g"></param>
+        public virtual void CellRender(Graphics g)
+        {
+            _Cell.CellRender(this, g);
+        }
+
+        #endregion
+
+        #region Keyboard support
+
+        #region CellKeyDown
+
+        ///<summary>
+        /// CellKeyDown
+        ///</summary>
+        public virtual void CellKeyDown(KeyEventArgs e)
+        {
+            switch (e.KeyCode)
+            {
+                case Keys.Add:
+                    Value += Step;
+                    break;
+
+                case Keys.Subtract:
+                    Value -= Step;
+                    break;
+
+                default:
+                    OnKeyDown(e);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region WantsInputKey
+
+        /// <summary>
+        /// WantsInputKey
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="gridWantsKey"></param>
+        /// <returns></returns>
+        public virtual bool WantsInputKey(Keys key, bool gridWantsKey)
+        {
+            switch (key & Keys.KeyCode)
+            {
+                case Keys.Add:
+                case Keys.Subtract:
+                case Keys.Space:
+                    return (true);
+
+                default:
+                    return (gridWantsKey == false);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Mouse support
+
+        #region OnCellMouseMove
+
+        ///<summary>
+        /// OnCellMouseMove
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseMove(MouseEventArgs e)
+        {
+            OnMouseMove(e);
+        }
+
+        #endregion
+
+        #region OnCellMouseEnter
+
+        ///<summary>
+        /// OnCellMouseEnter
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseEnter(EventArgs e)
+        {
+            OnMouseEnter(e);
+        }
+
+        #endregion
+
+        #region OnCellMouseLeave
+
+        ///<summary>
+        /// OnCellMouseLeave
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseLeave(EventArgs e)
+        {
+            OnMouseLeave(e);
+        }
+
+        #endregion
+
+        #region OnCellMouseUp
+
+        ///<summary>
+        /// OnCellMouseUp
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseUp(MouseEventArgs e)
+        {
+            OnMouseUp(e);
+        }
+
+        #endregion
+
+        #region OnCellMouseDown
+
+        ///<summary>
+        /// OnCellMouseDown
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseDown(MouseEventArgs e)
+        {
+            OnMouseDown(e);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion  
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/GridSwitchButtonEditControl.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/GridSwitchButtonEditControl.cs
new file mode 100644
index 00000000..dfbb1c9b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/GridSwitchButtonEditControl.cs	
@@ -0,0 +1,593 @@
+using System;
+using System.ComponentModel;
+using System.Data.SqlTypes;
+using System.Drawing;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.SuperGrid.Style;
+using DevComponents.DotNetBar.Controls;
+
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    ///<summary>
+    /// GridSwitchButtonEditControl
+    ///</summary>
+    [ToolboxItem(false)]
+    public class GridSwitchButtonEditControl : SwitchButton, IGridCellEditControl
+    {
+        #region Private variables
+
+        private GridCell _Cell;
+        private EditorPanel _EditorPanel;
+        private Bitmap _EditorCellBitmap;
+
+        private bool _ValueChanged;
+        private bool _SuspendUpdate;
+
+        private object _OnValue;
+        private object _OffValue;
+
+        private StretchBehavior _StretchBehavior = StretchBehavior.Both;
+
+        #endregion
+
+        ///<summary>
+        /// GridSwitchButtonEditControl
+        ///</summary>
+        public GridSwitchButtonEditControl()
+        {
+            FocusCuesEnabled = false;
+            Style = eDotNetBarStyle.StyleManagerControlled;
+        }
+
+        #region Public properties
+
+        #region OnValue
+
+        ///<summary>
+        /// OnValue
+        ///</summary>
+        public object OnValue
+        {
+            get { return (_OnValue); }
+            set { _OnValue = value; }
+        }
+
+        #endregion
+
+        #region OffValue
+
+        ///<summary>
+        /// OffValue
+        ///</summary>
+        public object OffValue
+        {
+            get { return (_OffValue); }
+            set { _OffValue = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region OnValueChanged
+
+        /// <summary>
+        /// OnValueChanged
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnValueChanged(EventArgs e)
+        {
+            if (_SuspendUpdate == false)
+            {
+                _Cell.UpdateCellValue(this);
+                _Cell.EditorValueChanged(this);
+            }
+
+            base.OnValueChanged(e);
+        }
+
+        #endregion
+
+        #region OnInvalidated
+
+        /// <summary>
+        /// OnInvalidated
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnInvalidated(InvalidateEventArgs e)
+        {
+            base.OnInvalidated(e);
+
+            if (_Cell != null && _SuspendUpdate == false)
+                _Cell.InvalidateRender();
+        }
+
+        #endregion
+
+        #region GetValue
+
+        ///<summary>
+        /// GetValue
+        ///</summary>
+        ///<param name="value"></param>
+        ///<returns></returns>
+        ///<exception cref="Exception"></exception>
+        public virtual bool GetValue(object value)
+        {
+            GridPanel panel = _Cell.GridPanel;
+
+            if (value == null ||
+                (panel.NullValue == NullValue.DBNull && value == DBNull.Value))
+            {
+                return (false);
+            }
+
+            if (_Cell.IsValueExpression == true)
+                value = _Cell.GetExpValue((string)value);
+
+            Type type = value.GetType();
+
+            if (_OnValue != null)
+            {
+                if (value.Equals(_OnValue))
+                    return (true);
+            }
+
+            if (_OffValue != null)
+            {
+                if (value.Equals(_OffValue))
+                    return (false);
+            }
+
+            if (type == typeof(bool))
+                return ((bool)value);
+
+            if (type == typeof(string))
+            {
+                string s = ((string)value).ToLower();
+
+                if (s.Equals("true") || s.Equals("yes") || s.Equals("1"))
+                    return (true);
+
+                if (s.Equals("false") || s.Equals("no") || s.Equals("0"))
+                    return (false);
+            }
+            else if (type == typeof(SqlBoolean))
+            {
+                SqlBoolean sb = (SqlBoolean)value;
+
+                if (sb.IsNull == true)
+                    return (false);
+
+                return (sb.IsTrue);
+            }
+            else if (type == typeof(char))
+            {
+                char c = (char)value;
+
+                switch (Char.ToLower(c))
+                {
+                    case 't':
+                    case 'y':
+                    case '1':
+                        return (true);
+
+                    case 'f':
+                    case 'n':
+                    case '0':
+                        return (false);
+                }
+            }
+            else
+            {
+                int n = Convert.ToInt32(value);
+
+                return (n == 0 ? false : true);
+            }
+
+            throw new Exception("Invalid checkBox cell value (" + value + ").");
+        }
+
+        #endregion
+
+        #region IGridCellEditControl Members
+
+        #region Public properties
+
+        #region CanInterrupt
+
+        /// <summary>
+        /// CanInterrupt
+        /// </summary>
+        public bool CanInterrupt
+        {
+            get { return (true); }
+        }
+
+        #endregion
+
+        #region CellEditMode
+
+        /// <summary>
+        /// CellEditMode
+        /// </summary>
+        public CellEditMode CellEditMode
+        {
+            get { return (CellEditMode.InPlace); }
+        }
+
+        #endregion
+
+        #region EditorCell
+
+        /// <summary>
+        /// EditorCell
+        /// </summary>
+        public GridCell EditorCell
+        {
+            get { return (_Cell); }
+            set { _Cell = value; }
+        }
+
+        #endregion
+
+        #region EditorCellBitmap
+
+        ///<summary>
+        /// EditorCellBitmap
+        ///</summary>
+        public Bitmap EditorCellBitmap
+        {
+            get { return (_EditorCellBitmap); }
+
+            set
+            {
+                if (_EditorCellBitmap != null)
+                    _EditorCellBitmap.Dispose();
+
+                _EditorCellBitmap = value;
+            }
+        }
+
+        #endregion
+
+        #region EditorFormattedValue
+
+        ///<summary>
+        /// EditorFormattedValue
+        ///</summary>
+        public virtual string EditorFormattedValue
+        {
+            get
+            {
+                if (_Cell != null)
+                {
+                    if (_Cell.Value == null || _Cell.IsValueNull == true)
+                        return (_Cell.NullString);
+
+                    return (_Cell.Value.ToString());
+                }
+
+                return (Text);
+            }
+        }
+
+        #endregion
+
+        #region EditorPanel
+
+        /// <summary>
+        /// EditorPanel
+        /// </summary>
+        public EditorPanel EditorPanel
+        {
+            get { return (_EditorPanel); }
+            set { _EditorPanel = value; }
+        }
+
+        #endregion
+
+        #region EditorValue
+
+        /// <summary>
+        /// EditorValue
+        /// </summary>
+        public virtual object EditorValue
+        {
+            get { return (Value); }
+            set { Value = GetValue(value); }
+        }
+
+        #endregion
+
+        #region EditorValueChanged
+
+        /// <summary>
+        /// EditorValueChanged
+        /// </summary>
+        public virtual bool EditorValueChanged
+        {
+            get { return (_ValueChanged); }
+
+            set
+            {
+                if (_ValueChanged != value)
+                {
+                    _ValueChanged = value;
+
+                    if (value == true)
+                        _Cell.SetEditorDirty(this);
+                }
+            }
+        }
+
+        #endregion
+
+        #region EditorValueType
+
+        ///<summary>
+        /// EditorValueType
+        ///</summary>
+        public virtual Type EditorValueType
+        {
+            get { return (typeof(bool)); }
+        }
+
+        #endregion
+
+        #region StretchBehavior
+
+        /// <summary>
+        /// StretchBehavior
+        /// </summary>
+        public virtual StretchBehavior StretchBehavior
+        {
+            get { return (_StretchBehavior); }
+            set { _StretchBehavior = value; }
+        }
+
+        #endregion
+
+        #region SuspendUpdate
+
+        /// <summary>
+        /// SuspendUpdate
+        /// </summary>
+        public bool SuspendUpdate
+        {
+            get { return (_SuspendUpdate); }
+            set { _SuspendUpdate = value; }
+        }
+
+        #endregion
+
+        #region ValueChangeBehavior
+
+        /// <summary>
+        /// ValueChangeBehavior
+        /// </summary>
+        public virtual ValueChangeBehavior ValueChangeBehavior
+        {
+            get { return (ValueChangeBehavior.InvalidateRender); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InitializeContext
+
+        ///<summary>
+        /// InitializeContext
+        ///</summary>
+        ///<param name="cell"></param>
+        ///<param name="style"></param>
+        public virtual void InitializeContext(GridCell cell, CellVisualStyle style)
+        {
+            _Cell = cell;
+
+            if (style != null)
+            {
+                Enabled = (_Cell.IsReadOnly == false);
+                Font = style.Font;
+                ForeColor = style.TextColor;
+            }
+
+            Value = GetValue(_Cell.Value);
+
+            _ValueChanged = false;
+        }
+
+        #endregion
+
+        #region GetProposedSize
+
+        ///<summary>
+        /// GetProposedSize
+        ///</summary>
+        ///<param name="g"></param>
+        ///<param name="cell"></param>
+        ///<param name="style"></param>
+        ///<param name="constraintSize"></param>
+        ///<returns></returns>
+        public virtual Size GetProposedSize(Graphics g,
+            GridCell cell, CellVisualStyle style, Size constraintSize)
+        {
+            Size size = GetPreferredSize(constraintSize);
+
+            size.Width += Dpi.Width4;
+
+            return (size);
+        }
+
+        #endregion
+
+        #region Edit support
+
+        #region BeginEdit
+
+        /// <summary>
+        /// BeginEdit
+        /// </summary>
+        /// <param name="selectAll"></param>
+        /// <returns></returns>
+        public virtual bool BeginEdit(bool selectAll)
+        {
+            return (false);
+        }
+
+        #endregion
+
+        #region EndEdit
+
+        /// <summary>
+        /// EndEdit
+        /// </summary>
+        /// <returns></returns>
+        public virtual bool EndEdit()
+        {
+            return (false);
+        }
+
+        #endregion
+
+        #region CancelEdit
+
+        /// <summary>
+        /// CancelEdit
+        /// </summary>
+        /// <returns></returns>
+        public virtual bool CancelEdit()
+        {
+            return (false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region CellRender
+
+        /// <summary>
+        /// CellRender
+        /// </summary>
+        /// <param name="g"></param>
+        public virtual void CellRender(Graphics g)
+        {
+            _Cell.CellRender(this, g);
+        }
+
+        #endregion
+
+        #region Keyboard support
+
+        #region CellKeyDown
+
+        ///<summary>
+        /// CellKeyDown
+        ///</summary>
+        public virtual void CellKeyDown(KeyEventArgs e)
+        {
+            OnKeyDown(e);
+        }
+
+        #endregion
+
+        #region WantsInputKey
+
+        /// <summary>
+        /// WantsInputKey
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="gridWantsKey"></param>
+        /// <returns></returns>
+        public virtual bool WantsInputKey(Keys key, bool gridWantsKey)
+        {
+            switch (key & Keys.KeyCode)
+            {
+                case Keys.Space:
+                    return (true);
+
+                default:
+                    return (gridWantsKey == false);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Mouse support
+
+        #region OnCellMouseMove
+
+        ///<summary>
+        /// OnCellMouseMove
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseMove(MouseEventArgs e)
+        {
+            OnMouseMove(e);
+        }
+
+        #endregion
+
+        #region OnCellMouseEnter
+
+        ///<summary>
+        /// OnCellMouseEnter
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseEnter(EventArgs e)
+        {
+            OnMouseEnter(e);
+        }
+
+        #endregion
+
+        #region OnCellMouseLeave
+
+        ///<summary>
+        /// OnCellMouseLeave
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseLeave(EventArgs e)
+        {
+            OnMouseLeave(e);
+
+            CancelAnimation();
+        }
+
+        #endregion
+
+        #region OnCellMouseUp
+
+        ///<summary>
+        /// OnCellMouseUp
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseUp(MouseEventArgs e)
+        {
+            OnMouseUp(e);
+        }
+
+        #endregion
+
+        #region OnCellMouseDown
+
+        ///<summary>
+        /// OnCellMouseDown
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseDown(MouseEventArgs e)
+        {
+            OnMouseDown(e);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/GridTextBoxDropDownEditControl.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/GridTextBoxDropDownEditControl.cs
new file mode 100644
index 00000000..29df828e
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/GridTextBoxDropDownEditControl.cs	
@@ -0,0 +1,577 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.SuperGrid.Style;
+using DevComponents.DotNetBar.Controls;
+
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    ///<summary>
+    /// GridTextBoxDropDownControl
+    ///</summary>
+    [ToolboxItem(false)]
+    public class GridTextBoxDropDownEditControl : TextBoxDropDown, IGridCellEditControl
+    {
+        #region DllImports / delegates
+
+        private delegate bool EnumThreadWndProc(IntPtr hWnd, IntPtr lp);
+
+        [DllImport("user32.dll")]
+        private static extern bool IsWindowVisible(IntPtr hWnd);
+
+        [DllImport("user32.dll")]
+        private static extern bool EnumThreadWindows(int tid, EnumThreadWndProc callback, IntPtr lp);
+
+        [DllImport("user32.dll")]
+        private static extern int GetClassName(IntPtr hWnd, StringBuilder buffer, int buflen);
+
+        [DllImport("kernel32.dll")]
+        private static extern int GetCurrentThreadId();
+
+        #endregion
+
+        #region Private variables
+
+        private GridCell _Cell;
+        private EditorPanel _EditorPanel;
+        private Bitmap _EditorCellBitmap;
+
+        private bool _ValueChanged;
+        private bool _SuspendUpdate;
+
+        private StretchBehavior _StretchBehavior = StretchBehavior.None;
+
+        private bool _AutoSuggestDropdownOpen;
+
+        #endregion
+
+        ///<summary>
+        /// GridTextBoxDropDownEditControl
+        ///</summary>
+        public GridTextBoxDropDownEditControl()
+        {
+            BackgroundStyle.Class = "TextBoxBorder";
+            Style = eDotNetBarStyle.StyleManagerControlled;
+        }
+
+        #region OnTextChanged
+
+        /// <summary>
+        /// OnTextChanged
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnTextChanged(EventArgs e)
+        {
+            if (_SuspendUpdate == false)
+                _Cell.EditorValueChanged(this);
+
+            base.OnTextChanged(e);
+        }
+
+        #endregion
+
+        #region GetValue
+
+        ///<summary>
+        /// GetValue
+        ///</summary>
+        ///<param name="value"></param>
+        ///<returns></returns>
+        public virtual string GetValue(object value)
+        {
+            GridPanel panel = _Cell.GridPanel;
+
+            if (value == null ||
+                (panel.NullValue == NullValue.DBNull && value == DBNull.Value))
+            {
+                return ("");
+            }
+
+            if (_Cell.IsValueExpression == true)
+                value = _Cell.GetExpValue((string)value);
+
+            return (Convert.ToString(value));
+        }
+
+        #endregion
+
+        #region IGridCellEditControl Members
+
+        #region Public properties
+
+        #region CanInterrupt
+
+        /// <summary>
+        /// CanInterrupt
+        /// </summary>
+        public bool CanInterrupt
+        {
+            get { return (true); }
+        }
+
+        #endregion
+
+        #region CellEditMode
+
+        /// <summary>
+        /// CellEditMode
+        /// </summary>
+        public CellEditMode CellEditMode
+        {
+            get { return (CellEditMode.Modal); }
+        }
+
+        #endregion
+
+        #region EditorCell
+
+        /// <summary>
+        /// EditorCell
+        /// </summary>
+        public GridCell EditorCell
+        {
+            get { return (_Cell); }
+            set { _Cell = value; }
+        }
+
+        #endregion
+
+        #region EditorCellBitmap
+
+        ///<summary>
+        /// EditorCellBitmap
+        ///</summary>
+        public Bitmap EditorCellBitmap
+        {
+            get { return (_EditorCellBitmap); }
+
+            set
+            {
+                if (_EditorCellBitmap != null)
+                    _EditorCellBitmap.Dispose();
+
+                _EditorCellBitmap = value;
+            }
+        }
+
+        #endregion
+
+        #region EditorFormattedValue
+
+        ///<summary>
+        /// EditorFormattedValue
+        ///</summary>
+        public virtual string EditorFormattedValue
+        {
+            get
+            {
+                if (_Cell != null && _Cell.IsValueNull == true)
+                    return (_Cell.NullString);
+
+                return (Text);
+            }
+        }
+
+        #endregion
+
+        #region EditorPanel
+
+        /// <summary>
+        /// EditorPanel
+        /// </summary>
+        public EditorPanel EditorPanel
+        {
+            get { return (_EditorPanel); }
+            set { _EditorPanel = value; }
+        }
+
+        #endregion
+
+        #region EditorValue
+
+        /// <summary>
+        /// EditorValue
+        /// </summary>
+        public virtual object EditorValue
+        {
+            get { return (Text); }
+            set { Text = GetValue(value); }
+        }
+
+        #endregion
+
+        #region EditorValueChanged
+
+        /// <summary>
+        /// EditorValueChanged
+        /// </summary>
+        public virtual bool EditorValueChanged
+        {
+            get { return (_ValueChanged); }
+
+            set
+            {
+                if (_ValueChanged != value)
+                {
+                    _ValueChanged = value;
+
+                    if (value == true)
+                        _Cell.SetEditorDirty(this);
+                }
+            }
+        }
+
+        #endregion
+
+        #region EditorValueType
+
+        ///<summary>
+        /// EditorValueType
+        ///</summary>
+        public virtual Type EditorValueType
+        {
+            get { return (typeof(string)); }
+        }
+
+        #endregion
+
+        #region StretchBehavior
+
+        /// <summary>
+        /// StretchBehavior
+        /// </summary>
+        public virtual StretchBehavior StretchBehavior
+        {
+            get { return (_StretchBehavior); }
+            set { _StretchBehavior = value; }
+        }
+
+        #endregion
+
+        #region SuspendUpdate
+
+        /// <summary>
+        /// SuspendUpdate
+        /// </summary>
+        public bool SuspendUpdate
+        {
+            get { return (_SuspendUpdate); }
+            set { _SuspendUpdate = value; }
+        }
+
+        #endregion
+
+        #region ValueChangeBehavior
+
+        /// <summary>
+        /// ValueChangeBehavior
+        /// </summary>
+        public virtual ValueChangeBehavior ValueChangeBehavior
+        {
+            get { return (ValueChangeBehavior.InvalidateRender); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InitializeContext
+
+        ///<summary>
+        /// InitializeContext
+        ///</summary>
+        ///<param name="cell"></param>
+        ///<param name="style"></param>
+        public virtual void InitializeContext(GridCell cell, CellVisualStyle style)
+        {
+            _Cell = cell;
+
+            if (style != null)
+            {
+                Enabled = (_Cell.ReadOnly == false);
+                ForeColor = style.TextColor;
+                Font = style.Font;
+
+                SetTextAlign(style);
+            }
+
+            Text = GetValue(_Cell.Value);
+
+            _ValueChanged = false;
+        }
+
+        #region SetTextAlign
+
+        private void SetTextAlign(CellVisualStyle style)
+        {
+            switch (style.Alignment)
+            {
+                case Alignment.TopLeft:
+                case Alignment.MiddleLeft:
+                case Alignment.BottomLeft:
+                    TextAlign = HorizontalAlignment.Left;
+                    break;
+
+                case Alignment.TopCenter:
+                case Alignment.MiddleCenter:
+                case Alignment.BottomCenter:
+                    TextAlign = HorizontalAlignment.Center;
+                    break;
+
+                case Alignment.TopRight:
+                case Alignment.MiddleRight:
+                case Alignment.BottomRight:
+                    TextAlign = HorizontalAlignment.Right;
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetProposedSize
+
+        ///<summary>
+        /// GetProposedSize
+        ///</summary>
+        ///<param name="g"></param>
+        ///<param name="cell"></param>
+        ///<param name="style"></param>
+        ///<param name="constraintSize"></param>
+        ///<returns></returns>
+        public virtual Size GetProposedSize(Graphics g,
+            GridCell cell, CellVisualStyle style, Size constraintSize)
+        {
+            Size size = GetPreferredSize(constraintSize);
+
+            return (size);
+        }
+
+        #endregion
+
+        #region Edit support
+
+        #region BeginEdit
+
+        /// <summary>
+        /// BeginEdit
+        /// </summary>
+        /// <param name="selectAll"></param>
+        /// <returns></returns>
+        public virtual bool BeginEdit(bool selectAll)
+        {
+            Show();
+            Focus();
+            
+            if (selectAll == true)
+                SelectAll();
+            else
+                Select(Text.Length, 1);
+
+            return (false);
+        }
+
+        #endregion
+
+        #region EndEdit
+
+        /// <summary>
+        /// EndEdit
+        /// </summary>
+        /// <returns></returns>
+        public virtual bool EndEdit()
+        {
+            CloseDropDown();
+
+            return (false);
+        }
+
+        #endregion
+
+        #region CancelEdit
+
+        /// <summary>
+        /// CancelEdit
+        /// </summary>
+        /// <returns></returns>
+        public virtual bool CancelEdit()
+        {
+            CloseDropDown();
+
+            return (false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region CellRender
+
+        /// <summary>
+        /// CellRender
+        /// </summary>
+        /// <param name="g"></param>
+        public virtual void CellRender(Graphics g)
+        {
+            _Cell.CellRender(this, g);
+        }
+
+        #endregion
+
+        #region Keyboard support
+
+        #region CellKeyDown
+
+        ///<summary>
+        /// CellKeyDown
+        ///</summary>
+        public virtual void CellKeyDown(KeyEventArgs e)
+        {
+        }
+
+        #endregion
+
+        #region WantsInputKey
+
+        /// <summary>
+        /// WantsInputKey
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="gridWantsKey"></param>
+        /// <returns></returns>
+        public virtual bool WantsInputKey(Keys key, bool gridWantsKey)
+        {
+            // Let the TextBox handle the following keys
+
+            switch (key & Keys.KeyCode)
+            {
+                case Keys.Left:
+                case Keys.Right:
+                case Keys.Home:
+                case Keys.End:
+                    return (true);
+
+                case Keys.Down:
+                case Keys.Up:
+                    if (IsAutoSuggestDropdownOpen())
+                        return (true);
+
+                    return (gridWantsKey == false);
+
+                default:
+                    return (gridWantsKey == false);
+            }
+        }
+
+        #region IsAutoSuggestDropdownOpen
+
+        private bool IsAutoSuggestDropdownOpen()
+        {
+            _AutoSuggestDropdownOpen = false;
+
+            if (AutoCompleteMode == AutoCompleteMode.Suggest ||
+                AutoCompleteMode == AutoCompleteMode.SuggestAppend)
+            {
+                EnumThreadWndProc callback = CheckWindow;
+                EnumThreadWindows(GetCurrentThreadId(), callback, IntPtr.Zero);
+            }
+
+            return (_AutoSuggestDropdownOpen);
+        }
+
+        #region CheckWindow
+
+        private bool CheckWindow(IntPtr hWnd, IntPtr lp)
+        {
+            StringBuilder sb = new StringBuilder(260);
+            GetClassName(hWnd, sb, sb.Capacity);
+
+            if (sb.ToString() == "Auto-Suggest Dropdown")
+            {
+                _AutoSuggestDropdownOpen = IsWindowVisible(hWnd);
+
+                return (false);
+            }
+
+            return (true);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region Mouse support
+
+        #region OnCellMouseMove
+
+        ///<summary>
+        /// OnCellMouseMove
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseMove(MouseEventArgs e)
+        {
+        }
+
+        #endregion
+
+        #region OnCellMouseEnter
+
+        ///<summary>
+        /// OnCellMouseEnter
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseEnter(EventArgs e)
+        {
+        }
+
+        #endregion
+
+        #region OnCellMouseLeave
+
+        ///<summary>
+        /// OnCellMouseLeave
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseLeave(EventArgs e)
+        {
+        }
+
+        #endregion
+
+        #region OnCellMouseUp
+
+        ///<summary>
+        /// OnCellMouseUp
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseUp(MouseEventArgs e)
+        {
+        }
+
+        #endregion
+
+        #region OnCellMouseDown
+
+        ///<summary>
+        /// OnCellMouseDown
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseDown(MouseEventArgs e)
+        {
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/GridTextBoxXEditControl.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/GridTextBoxXEditControl.cs
new file mode 100644
index 00000000..2cf15763
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/GridTextBoxXEditControl.cs	
@@ -0,0 +1,587 @@
+using System;
+using System.ComponentModel;
+using System.Data.SqlTypes;
+using System.Drawing;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.Controls;
+using DevComponents.DotNetBar.SuperGrid.Style;
+
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    ///<summary>
+    /// GridTextBoxEditControl
+    ///</summary>
+    [ToolboxItem(false)]
+    public class GridTextBoxXEditControl : TextBoxX, IGridCellEditControl
+    {
+        ///<summary>
+        /// GridTextBoxXEditControl
+        ///</summary>
+        public GridTextBoxXEditControl()
+        {
+            Multiline = true;
+        }
+
+        #region Private variables
+
+        private GridCell _Cell;
+        private EditorPanel _EditorPanel;
+        private Bitmap _EditorCellBitmap;
+
+        private bool _ValueChanged;
+        private bool _SuspendUpdate;
+
+        private StretchBehavior _StretchBehavior = StretchBehavior.None;
+
+        #endregion
+
+        #region OnTextChanged
+
+        /// <summary>
+        /// OnTextChanged
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnTextChanged(EventArgs e)
+        {
+            if (_SuspendUpdate == false)
+                _Cell.EditorValueChanged(this);
+
+            base.OnTextChanged(e);
+        }
+
+        #endregion
+
+        #region OnPaintBackground
+
+        /// <summary>
+        /// OnPaintBackground
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnPaintBackground(PaintEventArgs e)
+        {
+            _Cell.PaintEditorBackground(e, this);
+        }
+
+        #endregion
+
+        #region GetValue
+
+        ///<summary>
+        /// GetValue
+        ///</summary>
+        ///<param name="value"></param>
+        ///<returns></returns>
+        public virtual string GetValue(object value)
+        {
+            GridPanel panel = _Cell.GridPanel;
+
+            if (value == null ||
+                (panel.NullValue == NullValue.DBNull && value == DBNull.Value))
+            {
+                return ("");
+            }
+
+            if (value is SqlString)
+            {
+                SqlString sdt = (SqlString) value;
+
+                if (sdt.IsNull == true)
+                    return ("");
+
+                return (sdt.Value);
+            }
+
+            return (Convert.ToString(value));
+        }
+
+        #endregion
+
+        #region IGridCellEditControl Members
+
+        #region Public properties
+
+        #region CanInterrupt
+
+        /// <summary>
+        /// CanInterrupt
+        /// </summary>
+        public bool CanInterrupt
+        {
+            get { return (true); }
+        }
+
+        #endregion
+
+        #region CellEditMode
+
+        /// <summary>
+        /// CellEditMode
+        /// </summary>
+        public CellEditMode CellEditMode
+        {
+            get { return (CellEditMode.Modal); }
+        }
+
+        #endregion
+
+        #region EditorCell
+
+        /// <summary>
+        /// EditorCell
+        /// </summary>
+        public GridCell EditorCell
+        {
+            get { return (_Cell); }
+            set { _Cell = value; }
+        }
+
+        #endregion
+
+        #region EditorCellBitmap
+
+        ///<summary>
+        /// EditorCellBitmap
+        ///</summary>
+        public Bitmap EditorCellBitmap
+        {
+            get { return (_EditorCellBitmap); }
+
+            set
+            {
+                if (_EditorCellBitmap != null)
+                    _EditorCellBitmap.Dispose();
+
+                _EditorCellBitmap = value;
+            }
+        }
+
+        #endregion
+
+        #region EditorFormattedValue
+
+        ///<summary>
+        /// EditorFormattedValue
+        ///</summary>
+        public virtual string EditorFormattedValue
+        {
+            get
+            {
+                if (_Cell != null && _Cell.IsValueNull == true)
+                    return (_Cell.NullString);
+
+                return ((PasswordChar == '\0')
+                    ? Text : new string(PasswordChar, TextLength));
+            }
+        }
+
+        #endregion
+
+        #region EditorPanel
+
+        /// <summary>
+        /// EditorPanel
+        /// </summary>
+        public EditorPanel EditorPanel
+        {
+            get { return (_EditorPanel); }
+            set { _EditorPanel = value; }
+        }
+
+        #endregion
+
+        #region EditorValue
+
+        /// <summary>
+        /// EditorValue
+        /// </summary>
+        public virtual object EditorValue
+        {
+            get { return (Text); }
+            set { Text = GetValue(value); }
+        }
+
+        #endregion
+
+        #region EditorValueChanged
+
+        /// <summary>
+        /// EditorValueChanged
+        /// </summary>
+        public virtual bool EditorValueChanged
+        {
+            get { return (_ValueChanged); }
+
+            set
+            {
+                if (_ValueChanged != value)
+                {
+                    _ValueChanged = value;
+
+                    if (value == true)
+                        _Cell.SetEditorDirty(this);
+                }
+            }
+        }
+
+        #endregion
+
+        #region EditorValueType
+
+        ///<summary>
+        /// EditorValueType
+        ///</summary>
+        public virtual Type EditorValueType
+        {
+            get { return (typeof(string)); }
+        }
+
+        #endregion
+
+        #region StretchBehavior
+
+        /// <summary>
+        /// StretchBehavior
+        /// </summary>
+        public virtual StretchBehavior StretchBehavior
+        {
+            get
+            {
+                return ((Multiline == true)
+                    ? StretchBehavior.VerticalOnly : StretchBehavior.None );
+            }
+
+            set { _StretchBehavior = value; }
+        }
+
+        #endregion
+
+        #region SuspendUpdate
+
+        /// <summary>
+        /// SuspendUpdate
+        /// </summary>
+        public bool SuspendUpdate
+        {
+            get { return (_SuspendUpdate); }
+            set { _SuspendUpdate = value; }
+        }
+
+        #endregion
+
+        #region ValueChangeBehavior
+
+        /// <summary>
+        /// ValueChangeBehavior
+        /// </summary>
+        public virtual ValueChangeBehavior ValueChangeBehavior
+        {
+            get { return (ValueChangeBehavior.InvalidateLayout); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InitializeContext
+
+        ///<summary>
+        /// InitializeContext
+        ///</summary>
+        ///<param name="cell"></param>
+        ///<param name="style"></param>
+        public virtual void InitializeContext(GridCell cell, CellVisualStyle style)
+        {
+            _Cell = cell;
+
+            if (style != null)
+            {
+                Enabled = (_Cell.ReadOnly == false);
+                WordWrap = (style.AllowWrap == Tbool.True);
+                ForeColor = style.TextColor;
+                Font = style.Font;
+                Multiline = WordWrap;
+            }
+
+            Text = GetValue(_Cell.Value);
+
+            _ValueChanged = false;
+        }
+
+        #region SetTextAlign
+
+        private void SetTextAlign(CellVisualStyle style)
+        {
+            switch (style.Alignment)
+            {
+                case Alignment.TopLeft:
+                case Alignment.MiddleLeft:
+                case Alignment.BottomLeft:
+                    TextAlign = HorizontalAlignment.Left;
+                    break;
+
+                case Alignment.TopCenter:
+                case Alignment.MiddleCenter:
+                case Alignment.BottomCenter:
+                    TextAlign = HorizontalAlignment.Center;
+                    break;
+
+                case Alignment.TopRight:
+                case Alignment.MiddleRight:
+                case Alignment.BottomRight:
+                    TextAlign = HorizontalAlignment.Right;
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetProposedSize
+
+        ///<summary>
+        /// GetProposedSize
+        ///</summary>
+        ///<param name="g"></param>
+        ///<param name="cell"></param>
+        ///<param name="style"></param>
+        ///<param name="constraintSize"></param>
+        ///<returns></returns>
+        public virtual Size GetProposedSize(Graphics g,
+            GridCell cell, CellVisualStyle style, Size constraintSize)
+        {
+            eTextFormat tf = style.GetTextFormatFlags();
+
+            string s = String.IsNullOrEmpty(Text) ? " " : Text;
+
+            SetTextAlign(style);
+
+            Size size = (constraintSize.IsEmpty == true)
+                ? TextHelper.MeasureText(g, s, style.Font, new Size(10000, 0), tf)
+                : TextHelper.MeasureText(g, s, style.Font, constraintSize, tf);
+
+            return (size);
+        }
+
+        #endregion
+
+        #region Edit support
+
+        #region BeginEdit
+
+        /// <summary>
+        /// BeginEdit
+        /// </summary>
+        /// <param name="selectAll"></param>
+        /// <returns></returns>
+        public virtual bool BeginEdit(bool selectAll)
+        {
+            if (selectAll == true)
+                SelectAll();
+            else
+                Select(Text.Length, 1);
+
+            Show();
+            Focus();
+
+            return (false);
+        }
+
+        #endregion
+
+        #region EndEdit
+
+        /// <summary>
+        /// EndEdit
+        /// </summary>
+        /// <returns></returns>
+        public virtual bool EndEdit()
+        {
+            return (false);
+        }
+
+        #endregion
+
+        #region CancelEdit
+
+        /// <summary>
+        /// CancelEdit
+        /// </summary>
+        /// <returns></returns>
+        public virtual bool CancelEdit()
+        {
+            return (false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region CellRender
+
+        /// <summary>
+        /// CellRender
+        /// </summary>
+        /// <param name="g"></param>
+        public virtual void CellRender(Graphics g)
+        {
+            _Cell.CellRender(this, g);
+        }
+
+        #endregion
+
+        #region Keyboard support
+
+        #region CellKeyDown
+
+        ///<summary>
+        /// CellKeyDown
+        ///</summary>
+        public virtual void CellKeyDown(KeyEventArgs e)
+        {
+        }
+
+        #endregion
+
+        #region WantsInputKey
+
+        /// <summary>
+        /// WantsInputKey
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="gridWantsKey"></param>
+        /// <returns></returns>
+        public virtual bool WantsInputKey(Keys key, bool gridWantsKey)
+        {
+            // Let the TextBox handle the following keys
+
+            if (Multiline == true)
+            {
+                switch (key & Keys.KeyCode)
+                {
+                    case Keys.Up:
+                        if (GetLineFromCharIndex(SelectionStart) != 0)
+                            return (true);
+                        break;
+
+                    case Keys.Down:
+                        int lastLine = GetLineFromCharIndex(int.MaxValue);
+
+                        if (GetLineFromCharIndex(SelectionStart) < lastLine)
+                            return (true);
+                        break;
+
+                    case Keys.Enter:
+                        if (AcceptsReturn == true)
+                            return (true);
+                        break;
+                }
+            }
+
+            switch (key & Keys.KeyCode)
+            {
+                case Keys.Left:
+                case Keys.Right:
+                case Keys.Home:
+                case Keys.End:
+                    return (true);
+
+                case Keys.Tab:
+                    if (AcceptsTab == true)
+                        return (true);
+                    break;
+            }
+
+            return (gridWantsKey == false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Mouse support
+
+        #region OnCellMouseMove
+
+        ///<summary>
+        /// OnCellMouseMove
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseMove(MouseEventArgs e)
+        {
+        }
+
+        #endregion
+
+        #region OnCellMouseEnter
+
+        ///<summary>
+        /// OnCellMouseEnter
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseEnter(EventArgs e)
+        {
+        }
+
+        #endregion
+
+        #region OnCellMouseLeave
+
+        ///<summary>
+        /// OnCellMouseLeave
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseLeave(EventArgs e)
+        {
+        }
+
+        #endregion
+
+        #region OnCellMouseUp
+
+        ///<summary>
+        /// OnCellMouseUp
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseUp(MouseEventArgs e)
+        {
+        }
+
+        #endregion
+
+        #region OnCellMouseDown
+
+        ///<summary>
+        /// OnCellMouseDown
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseDown(MouseEventArgs e)
+        {
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region Dispose
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        /// <param name="disposing"></param>
+        protected override void Dispose(bool disposing)
+        {
+            try
+            {
+                base.Dispose(disposing);
+            }
+            catch
+            {
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/GridTrackBarEditControl.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/GridTrackBarEditControl.cs
new file mode 100644
index 00000000..219397cd
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/GridTrackBarEditControl.cs	
@@ -0,0 +1,500 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.SuperGrid.Style;
+
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    ///<summary>
+    /// GridButtXEditControl
+    ///</summary>
+    [ToolboxItem(false)]
+    public class GridTrackBarEditControl : TrackBar, IGridCellEditControl
+    {
+        #region Private variables
+
+        private GridCell _Cell;
+        private EditorPanel _EditorPanel;
+        private Bitmap _EditorCellBitmap;
+
+        private bool _ValueChanged;
+        private bool _SuspendUpdate;
+
+        private StretchBehavior _StretchBehavior = StretchBehavior.Both;
+
+        #endregion
+
+        ///<summary>
+        /// GridTrackBarEditControl
+        ///</summary>
+        public GridTrackBarEditControl()
+        {
+            AutoSize = false;
+            Maximum = 100;
+            TickFrequency = 10;
+        }
+
+        #region OnValueChanged
+
+        /// <summary>
+        /// OnValueChanged
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnValueChanged(EventArgs e)
+        {
+            if (_Cell != null && _SuspendUpdate == false)
+            {
+                _Cell.Value = Value;
+                _Cell.EditorValueChanged(this);
+            }
+
+            base.OnValueChanged(e);
+        }
+
+        #endregion
+
+        #region OnInvalidated
+
+        /// <summary>
+        /// OnInvalidated
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnInvalidated(InvalidateEventArgs e)
+        {
+            base.OnInvalidated(e);
+
+            if (_SuspendUpdate == false)
+                _Cell.InvalidateRender();
+        }
+
+        #endregion
+
+        #region GetValue
+
+        ///<summary>
+        /// GetValue
+        ///</summary>
+        ///<param name="value"></param>
+        ///<returns></returns>
+        public virtual int GetValue(object value)
+        {
+            GridPanel panel = _Cell.GridPanel;
+
+            if (value == null ||
+                (panel.NullValue == NullValue.DBNull && value == DBNull.Value))
+            {
+                return (0);
+            }
+
+            return (Convert.ToInt32(value));
+        }
+
+        #endregion
+
+        #region IGridCellEditControl Members
+
+        #region Public properties
+
+        #region CanInterrupt
+
+        /// <summary>
+        /// CanInterrupt
+        /// </summary>
+        public bool CanInterrupt
+        {
+            get { return (true); }
+        }
+
+        #endregion
+
+        #region CellEditMode
+
+        /// <summary>
+        /// CellEditMode
+        /// </summary>
+        public CellEditMode CellEditMode
+        {
+            get { return (CellEditMode.NonModal); }
+        }
+
+        #endregion
+
+        #region EditorCell
+
+        /// <summary>
+        /// EditorCell
+        /// </summary>
+        public GridCell EditorCell
+        {
+            get { return (_Cell); }
+            set { _Cell = value; }
+        }
+
+        #endregion
+
+        #region EditorCellBitmap
+
+        ///<summary>
+        /// EditorCellBitmap
+        ///</summary>
+        public Bitmap EditorCellBitmap
+        {
+            get { return (_EditorCellBitmap); }
+
+            set
+            {
+                if (_EditorCellBitmap != null)
+                    _EditorCellBitmap.Dispose();
+
+                _EditorCellBitmap = value;
+            }
+        }
+
+        #endregion
+
+        #region EditorFormattedValue
+
+        ///<summary>
+        /// EditorFormattedValue
+        ///</summary>
+        public virtual string EditorFormattedValue
+        {
+            get { return (Text); }
+        }
+
+        #endregion
+
+        #region EditorPanel
+
+        /// <summary>
+        /// EditorPanel
+        /// </summary>
+        public EditorPanel EditorPanel
+        {
+            get { return (_EditorPanel); }
+            set { _EditorPanel = value; }
+        }
+
+        #endregion
+
+        #region EditorValue
+
+        /// <summary>
+        /// EditorValue
+        /// </summary>
+        public virtual object EditorValue
+        {
+            get { return (_Cell.Value); }
+            set { Value = GetValue(value); }
+        }
+
+        #endregion
+
+        #region EditorValueChanged
+
+        /// <summary>
+        /// EditorValueChanged
+        /// </summary>
+        public virtual bool EditorValueChanged
+        {
+            get { return (_ValueChanged); }
+
+            set
+            {
+                if (_ValueChanged != value)
+                {
+                    _ValueChanged = value;
+
+                    if (value == true)
+                        _Cell.SetEditorDirty(this);
+                }
+            }
+        }
+
+        #endregion
+
+        #region EditorValueType
+
+        ///<summary>
+        /// EditorValueType
+        ///</summary>
+        public virtual Type EditorValueType
+        {
+            get { return (typeof(string)); }
+        }
+
+        #endregion
+
+        #region StretchBehavior
+
+        /// <summary>
+        /// StretchBehavior
+        /// </summary>
+        public virtual StretchBehavior StretchBehavior
+        {
+            get { return (_StretchBehavior); }
+            set { _StretchBehavior = value; }
+        }
+
+        #endregion
+
+        #region SuspendUpdate
+
+        /// <summary>
+        /// SuspendUpdate
+        /// </summary>
+        public bool SuspendUpdate
+        {
+            get { return (_SuspendUpdate); }
+            set { _SuspendUpdate = value; }
+        }
+
+        #endregion
+
+        #region ValueChangeBehavior
+
+        /// <summary>
+        /// ValueChangeBehavior
+        /// </summary>
+        public virtual ValueChangeBehavior ValueChangeBehavior
+        {
+            get { return (ValueChangeBehavior.InvalidateRender); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InitializeContext
+
+        ///<summary>
+        /// InitializeContext
+        ///</summary>
+        ///<param name="cell"></param>
+        ///<param name="style"></param>
+        public virtual void InitializeContext(GridCell cell, CellVisualStyle style)
+        {
+            _Cell = cell;
+
+            if (style != null)
+                Enabled = (_Cell.IsReadOnly == false);
+
+            Value = GetValue(_Cell.Value);
+
+            _ValueChanged = false;
+        }
+
+        #endregion
+
+        #region GetProposedSize
+
+        ///<summary>
+        /// GetProposedSize
+        ///</summary>
+        ///<param name="g"></param>
+        ///<param name="cell"></param>
+        ///<param name="style"></param>
+        ///<param name="constraintSize"></param>
+        ///<returns></returns>
+        public virtual Size GetProposedSize(Graphics g,
+            GridCell cell, CellVisualStyle style, Size constraintSize)
+        {
+            _SuspendUpdate = true;
+
+            Rectangle r = Bounds;
+
+            AutoSize = true;
+            Size size = GetPreferredSize(constraintSize);
+            AutoSize = false;
+
+            Bounds = r;
+
+            _SuspendUpdate = false;
+
+            return (size);
+        }
+
+        #endregion
+
+        #region Edit support
+
+        #region BeginEdit
+
+        /// <summary>
+        /// BeginEdit
+        /// </summary>
+        /// <param name="selectAll"></param>
+        /// <returns></returns>
+        public virtual bool BeginEdit(bool selectAll)
+        {
+            return (false);
+        }
+
+        #endregion
+
+        #region EndEdit
+
+        /// <summary>
+        /// EndEdit
+        /// </summary>
+        /// <returns></returns>
+        public virtual bool EndEdit()
+        {
+            return (false);
+        }
+
+        #endregion
+
+        #region CancelEdit
+
+        /// <summary>
+        /// CancelEdit
+        /// </summary>
+        /// <returns></returns>
+        public virtual bool CancelEdit()
+        {
+            return (false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region CellRender
+
+        /// <summary>
+        /// CellRender
+        /// </summary>
+        /// <param name="g"></param>
+        public virtual void CellRender(Graphics g)
+        {
+            _Cell.CellRender(this, g);
+        }
+
+        #endregion
+
+        #region Keyboard support
+
+        #region CellKeyDown
+
+        ///<summary>
+        /// CellKeyDown
+        ///</summary>
+        public virtual void CellKeyDown(KeyEventArgs e)
+        {
+            switch (e.KeyCode)
+            {
+                case Keys.Add:
+                    Value += SmallChange;
+                    break;
+
+                case Keys.Subtract:
+                    Value -= SmallChange;
+                    break;
+
+                default:
+                    OnKeyDown(e);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region WantsInputKey
+
+        /// <summary>
+        /// WantsInputKey
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="gridWantsKey"></param>
+        /// <returns></returns>
+        public virtual bool WantsInputKey(Keys key, bool gridWantsKey)
+        {
+            switch (key & Keys.KeyCode)
+            {
+                case Keys.Add:
+                case Keys.Subtract:
+                case Keys.Space:
+                    return (true);
+
+                default:
+                    return (gridWantsKey == false);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Mouse support
+
+        #region OnCellMouseMove
+
+        ///<summary>
+        /// OnCellMouseMove
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseMove(MouseEventArgs e)
+        {
+            OnMouseMove(e);
+        }
+
+        #endregion
+
+        #region OnCellMouseEnter
+
+        ///<summary>
+        /// OnCellMouseEnter
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseEnter(EventArgs e)
+        {
+        }
+
+        #endregion
+
+        #region OnCellMouseLeave
+
+        ///<summary>
+        /// OnCellMouseLeave
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseLeave(EventArgs e)
+        {
+            OnMouseLeave(e);
+        }
+
+        #endregion
+
+        #region OnCellMouseUp
+
+        ///<summary>
+        /// OnCellMouseUp
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseUp(MouseEventArgs e)
+        {
+            OnMouseUp(e);
+        }
+
+        #endregion
+
+        #region OnCellMouseDown
+
+        ///<summary>
+        /// OnCellMouseDown
+        ///</summary>
+        ///<param name="e"></param>
+        public virtual void OnCellMouseDown(MouseEventArgs e)
+        {
+            OnMouseDown(e);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion  
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/IGridCellEditControl.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/IGridCellEditControl.cs
new file mode 100644
index 00000000..e0818ff7
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellEditors/IGridCellEditControl.cs	
@@ -0,0 +1,466 @@
+using System;
+using System.Drawing;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.SuperGrid.Style;
+
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    ///<summary>
+    /// IGridCellEditControl
+    ///</summary>
+    public interface IGridCellEditControl
+    {
+        #region Properties
+
+        #region CanInterrupt
+
+        ///<summary>
+        /// Specifies whether the Grid can automatically interrupt the
+        /// current NonModal cell edit operation when the mouse leaves the cell.
+        /// 
+        /// This is utilized in cases, such as the ButtonX editor, where multilevel
+        /// controls may be involved. In the ButtonX case this specifically enables
+        /// the mouse to to leave the main cell window and not be interrupted by the
+        /// grid until the current operation is complete by the editor itself.
+        /// 
+        ///</summary>
+        bool CanInterrupt { get; }
+
+        #endregion
+
+        #region CellEditMode
+
+        ///<summary>
+        /// Specifies the cell editor activation mode. There are three modes
+        /// available for choice, and their usage depends upon the desired
+        /// editor presentation, as well as how well the given underlying
+        /// control interacts with the grid control.
+        /// 
+        /// The modes are as follows:
+        /// 
+        /// InPlace:
+        /// Edit operations occur 'in place', always live, always
+        /// in a state of interaction with the user. The CheckBoxEx,
+        /// and ButtonX editors are examples of this.
+        /// 
+        /// Modal:
+        /// Edit operations will be performed as a modal, widowed edit 
+        /// controlled via calls to BeginEdit, EndEdit, and CancelEdit.
+        /// The TextBoxEx and IntegerInput editors are examples of this.
+        /// 
+        /// NonModal:
+        /// Edit operation will be performed as a nonNodal, windowed edit
+        /// automatically invoked upon entry to the cell. The ButtonEx,
+        /// BubbleBar, and TrackBar are examples of this. 
+        /// 
+        ///</summary>
+        CellEditMode CellEditMode { get; }
+
+        #endregion
+
+        #region EditorCell
+
+        ///<summary>
+        /// Specifies the editor's current associated grid cell
+        ///</summary>
+        GridCell EditorCell { get; set; }
+
+        #endregion
+
+        #region EditorCellBitmap
+
+        ///<summary>
+        /// Called to get or set the editor's
+        /// associated cell bitmap (internal use only)
+        ///</summary>
+        Bitmap EditorCellBitmap { get; set; }
+
+        #endregion
+
+        #region EditorFormattedValue
+
+        ///<summary>
+        /// Called to get the formatted editor value
+        ///</summary>
+        string EditorFormattedValue { get; }
+
+        #endregion
+
+        #region EditorPanel
+
+        ///<summary>
+        /// Called to get or set the editor's
+        /// associated cell panel (internal use only)
+        ///</summary>
+        EditorPanel EditorPanel { get; set; }
+
+        #endregion
+
+        #region EditorValue
+
+        ///<summary>
+        /// Called to get or set the editor value
+        ///</summary>
+        object EditorValue { get; set;}
+
+        #endregion
+
+        #region EditorValueChanged
+
+        ///<summary>
+        /// Called to get or set whether the editor value has changed
+        ///</summary>
+        bool EditorValueChanged { get; set;}
+
+        #endregion
+
+        #region EditorValueType
+
+        ///<summary>
+        /// Called to get the editor's default value data type
+        ///</summary>
+        Type EditorValueType { get; }
+
+        #endregion
+
+        #region StretchBehavior
+
+        ///<summary>
+        /// Called to get the editor's desired 'stretch' behavior.
+        /// 
+        /// The StretchBehavior defines whether the editor wants to
+        /// automatically have it's size stretched to fill the given cell.
+        /// 
+        /// Editors, such as ButtonX, want to fill the cell horizontally and
+        /// vertically, whereas other editors, such as the Slider, may only
+        /// want to stretch horizontally (or potentially not at all).
+        ///</summary>
+        StretchBehavior StretchBehavior { get; }
+
+        #endregion
+
+        #region SuspendUpdate
+
+        ///<summary>
+        /// Called to get or set whether updates to the grid
+        /// state is suspended
+        ///</summary>
+        bool SuspendUpdate { get; set; }
+
+        #endregion
+
+        #region ValueChangeBehavior
+
+        ///<summary>
+        /// Called to get the behavior
+        /// needed when a value changes in the editor.
+        /// 
+        /// For instance, CheckBoxEx value changes result in only requiring
+        /// the cell to be redisplayed with the new state, whereas editors such
+        /// as the TextBoxEx editor, may result in a new layout when the text changes.
+        /// 
+        ///</summary>
+        ValueChangeBehavior ValueChangeBehavior { get; }
+
+        #endregion
+
+        #endregion
+
+        #region CellRender
+
+        ///<summary>
+        ///  Called to initiate the actual rendering of the editor
+        /// value into the grid cell.  In most cases this can be (and is)
+        /// handled by a simple call to EditorCell.CellRender(this, graphics).
+        /// If additional rendering is required by the editor, then the editor
+        /// can completely render the cell contents itself (and never even call
+        /// Editor.CellRender) or optionally perform additional rendering before
+        /// or after the default cell rendering.
+        ///</summary>
+        ///<param name="g"></param>
+        void CellRender(Graphics g);
+
+        #endregion
+
+        #region CellKeyDown
+
+        ///<summary>
+        /// Called when a KeyDown occurs and the
+        /// CellEditMode is InPlace (otherwise the key event is
+        /// automatically directed straight to the editor control).
+        /// 
+        ///</summary>
+        void CellKeyDown(KeyEventArgs e);
+
+        #endregion
+
+        #region Edit support
+
+        #region BeginEdit
+
+        ///<summary>
+        /// Called when a Modal cell edit is about to be initiated.
+        ///</summary>
+        ///<param name="selectAll">Signifies whether to select all editable content</param>
+        ///<returns>true to cancel the edit operation</returns>
+        bool BeginEdit(bool selectAll);
+
+        #endregion
+
+        #region EndEdit
+
+        ///<summary>
+        /// Called when the edit operation is about to end. 
+        ///</summary>
+        ///<returns>true to cancel the operation.</returns>
+        bool EndEdit();
+
+        #endregion
+
+        #region CancelEdit
+
+        ///<summary>
+        /// Called when the edit operation is being cancelled.
+        ///</summary>
+        ///<returns>true to cancel the operation.</returns>
+        bool CancelEdit();
+
+        #endregion
+
+        #endregion
+
+        #region GetProposedSize
+
+        ///<summary>
+        /// Called to retrieve the editors proposed size
+        /// for the given cell, using the provided effective
+        /// style and size constraint.
+        ///</summary>
+        ///<param name="g">Graphics object</param>
+        ///<param name="cell">Associated grid cell</param>
+        ///<param name="style">Cell's effective style</param>
+        ///<param name="constraintSize">The constraining cell size</param>
+        ///<returns></returns>
+        Size GetProposedSize(Graphics g, GridCell cell, CellVisualStyle style, Size constraintSize);
+
+        #endregion
+
+        #region InitializeContext
+
+        ///<summary>
+        /// Called to initialize the editor's context
+        /// environment (value, properties, style, etc)
+        ///</summary>
+        ///<param name="cell"></param>
+        ///<param name="style"></param>
+        void InitializeContext(GridCell cell, CellVisualStyle style);
+
+        #endregion
+
+        #region Mouse support
+
+        #region OnCellMouseMove
+
+        ///<summary>
+        /// Called when a MouseMove event occurs and the
+        /// CellEditMode is InPlace (otherwise the event is
+        /// automatically directed straight to the editor control).
+        ///</summary>
+        ///<param name="e"></param>
+        void OnCellMouseMove(MouseEventArgs e);
+
+        #endregion
+
+        #region OnCellMouseEnter
+
+        /// <summary>
+        /// Called when a MouseEnter event occurs and the
+        /// CellEditMode is InPlace (otherwise the event is
+        /// automatically directed straight to the editor control).
+        /// </summary>
+        /// <param name="e"></param>
+        void OnCellMouseEnter(EventArgs e);
+
+        #endregion
+
+        #region OnCellMouseLeave
+
+        ///<summary>
+        /// Called when a MouseLeave event occurs and the
+        /// CellEditMode is InPlace (otherwise the event is
+        /// automatically directed straight to the editor control).
+        ///</summary>
+        ///<param name="e"></param>
+        void OnCellMouseLeave(EventArgs e);
+
+        #endregion
+
+        #region OnCellMouseUp
+
+        /// <summary>
+        /// Called when a MouseUp event occurs and the
+        /// CellEditMode is InPlace (otherwise the event is
+        /// automatically directed straight to the editor control).
+        /// </summary>
+        /// <param name="e"></param>
+        void OnCellMouseUp(MouseEventArgs e);
+
+        #endregion
+
+        #region OnCellMouseDown
+
+        /// <summary>
+        /// Called when a MouseDown event occurs and the
+        /// CellEditMode is InPlace (otherwise the event is
+        /// automatically directed straight to the editor control).
+        /// </summary>
+        /// <param name="e"></param>
+        void OnCellMouseDown(MouseEventArgs e);
+
+        #endregion
+
+        #endregion
+
+        #region WantsInputKey
+
+        ///<summary>
+        /// Called to determine if the editor wants to process and
+        /// handle the given key
+        ///</summary>
+        ///<param name="key">Key in question</param>
+        ///<param name="gridWantsKey">Whether the grid, by default, wants the key</param>
+        ///<returns>true is the control wants the key</returns>
+        bool WantsInputKey(Keys key, bool gridWantsKey);
+
+        #endregion
+    }
+
+    #region IGridCellConvertTo
+
+    ///<summary>
+    ///IGridCellConvertTo
+    ///</summary>
+    public interface IGridCellConvertTo
+    {
+        ///<summary>
+        ///TryConvertTo
+        ///</summary>
+        ///<param name="value">Value to convert</param>
+        ///<param name="dataType">Data type to convert to</param>
+        ///<param name="result">Converted value</param>
+        ///<returns></returns>
+        bool TryConvertTo(object value, Type dataType, out object result);
+    }
+
+    #endregion
+
+    #region IGridCellEditorFocus
+
+    ///<summary>
+    ///IGridCellEditorFocus
+    ///</summary>
+    public interface IGridCellEditorFocus
+    {
+        ///<summary>
+        ///Indicates whether the editor has the input focus
+        ///</summary>
+        ///<returns></returns>
+        bool IsEditorFocused { get; }
+
+        ///<summary>
+        ///Gives the editor the input focus
+        ///</summary>
+        void FocusEditor();
+    }
+
+    #endregion
+
+    #region enums
+
+    #region CellEditMode
+
+    ///<summary>
+    /// Specifies the mode of cell editor activation
+    ///</summary>
+    public enum CellEditMode
+    {
+        ///<summary>
+        /// Edit operation will be performed as a modal, widowed
+        /// edit controlled via BeginEdit, EndEdit, and CancelEdit.
+        ///</summary>
+        Modal,
+
+        ///<summary>
+        /// Edit operation will be performed as a nonNodal, windowed
+        /// edit automatically invoked upon entry to the cell.
+        ///</summary>
+        NonModal,
+
+        ///<summary>
+        /// Edit operation will be performed in-place, as a non-windowed
+        /// edit automatically invoked upon entry to the cell.
+        ///</summary>
+        InPlace,
+    }
+
+    #endregion
+
+    #region StretchBehavior
+
+    /// <summary>
+    /// Defines how the editor is stretched to
+    /// have it's size fill the given cell.
+    /// </summary>
+    public enum StretchBehavior
+    {
+        ///<summary>
+        /// No stretching to fill the cell
+        ///</summary>
+        None,
+
+        ///<summary>
+        /// Auto stretch horizontally only
+        ///</summary>
+        HorizontalOnly,
+
+        ///<summary>
+        /// Auto stretch vertically only
+        ///</summary>
+        VerticalOnly,
+
+        ///<summary>
+        /// Auto stretch both horizontally and vertically
+        ///</summary>
+        Both,
+    }
+
+    #endregion
+
+    #region ValueChangeBehavior
+
+    /// <summary>
+    /// Defines how the grid should respond to
+    /// editor content / value changes
+    /// </summary>
+    public enum ValueChangeBehavior
+    {
+        ///<summary>
+        /// No action needed
+        ///</summary>
+        None,
+
+        ///<summary>
+        /// Grid layout needs invalidated
+        ///</summary>
+        InvalidateLayout,
+
+        ///<summary>
+        /// Cell needs rendered
+        ///</summary>
+        InvalidateRender,
+    }
+
+    #endregion
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellInfoWindow.Designer.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellInfoWindow.Designer.cs
new file mode 100644
index 00000000..95e409c5
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellInfoWindow.Designer.cs	
@@ -0,0 +1,43 @@
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    partial class CellInfoWindow
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form 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.SuspendLayout();
+            // 
+            // CellInfoWindow
+            // 
+            this.ClientSize = new System.Drawing.Size(16, 16);
+            this.Name = "CellInfoWindow";
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellInfoWindow.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellInfoWindow.cs
new file mode 100644
index 00000000..119ee7e3
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellInfoWindow.cs	
@@ -0,0 +1,154 @@
+using System;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    public partial class CellInfoWindow : FloatWindow
+    {
+        #region Private variables
+
+        private SuperGridControl _SuperGrid;
+        private GridCell _Cell;
+
+        private System.Windows.Forms.ToolTip _ToolTip;
+
+        #endregion
+
+        public CellInfoWindow(SuperGridControl superGrid, GridCell cell)
+        {
+            InitializeComponent();
+
+            Image image = cell.GetInfoImage();
+
+            if (image != null)
+                Size = image.Size;
+
+            TopLevel = false;
+
+            _SuperGrid = superGrid;
+            _Cell = cell;
+
+            _ToolTip = new System.Windows.Forms.ToolTip();
+
+            using (GraphicsPath path = GetImageGraphicsPath())
+                Region = new Region(path);
+
+            Paint += CellInfoWindowPaint;
+            MouseClick += CellInfoWindowMouseClick;
+            MouseDoubleClick += CellInfoWindowMouseDoubleClick;
+
+            MouseEnter += CellInfoWindowMouseEnter;
+            MouseLeave += CellInfoWindowMouseLeave;
+        }
+
+        #region Public properties
+
+        #region ToolTip
+
+        public System.Windows.Forms.ToolTip ToolTip
+        {
+            get { return (_ToolTip); }
+            internal set { _ToolTip = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region CellInfoWindowMouseEnter
+
+        void CellInfoWindowMouseEnter(object sender, EventArgs e)
+        {
+            if (_SuperGrid.DoCellInfoEnterEvent(_Cell, this, _ToolTip, MousePosition) == false)
+                _ToolTip.SetToolTip(this, _Cell.InfoText);
+            else 
+                _ToolTip.SetToolTip(this, "");
+        }
+
+        #endregion
+
+        #region CellInfoWindowMouseLeave
+
+        void CellInfoWindowMouseLeave(object sender, EventArgs e)
+        {
+            _SuperGrid.DoCellInfoLeaveEvent(_Cell, this, _ToolTip);
+        }
+
+        #endregion
+
+        #region GetImageGraphicsPath
+
+        private GraphicsPath GetImageGraphicsPath()
+        {
+            Bitmap bitmap = new Bitmap(_Cell.GetInfoImage());
+            GraphicsPath graphicsPath = new GraphicsPath();
+
+            Color colorTransparent = bitmap.GetPixel(0, 0);
+
+            for (int row = 0; row < bitmap.Height; row++)
+            {
+                for (int col = 0; col < bitmap.Width; col++)
+                {
+                    if (bitmap.GetPixel(col, row) != colorTransparent)
+                    {
+                        int colOpaquePixel = col;
+                        int colNext;
+
+                        for (colNext = colOpaquePixel; colNext < bitmap.Width; colNext++)
+                        {
+                            if (bitmap.GetPixel(colNext, row) == colorTransparent)
+                                break;
+                        }
+
+                        graphicsPath.AddRectangle(new Rectangle(colOpaquePixel,
+                                                   row, colNext - colOpaquePixel, 1));
+
+                        col = colNext;
+                    }
+                }
+            }
+
+            return (graphicsPath);
+        }
+
+        #endregion
+
+        #region CellInfoWindowPaint
+
+        void CellInfoWindowPaint(object sender, PaintEventArgs e)
+        {
+            Image image = _Cell.GetInfoImage();
+
+            if (image != null)
+            {
+                Rectangle r = Bounds;
+                r.Location = Point.Empty;
+
+                e.Graphics.DrawImageUnscaledAndClipped(image, r);
+            }
+        }
+
+        #endregion
+
+        #region CellInfoWindowMouseClick
+
+        void CellInfoWindowMouseClick(object sender, MouseEventArgs e)
+        {
+            _SuperGrid.DoCellInfoClickEvent(_Cell, e);
+        }
+
+        #endregion
+
+        #region CellInfoWindowMouseDoubleClick
+
+        void CellInfoWindowMouseDoubleClick(object sender, MouseEventArgs e)
+        {
+            _SuperGrid.DoCellInfoDoubleClickEvent(_Cell, e);
+        }
+
+        #endregion
+    }
+}
+
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellInfoWindow.resx b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellInfoWindow.resx
new file mode 100644
index 00000000..19dc0dd8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CellInfoWindow.resx	
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CheckDisplay.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CheckDisplay.cs
new file mode 100644
index 00000000..474b7030
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/CheckDisplay.cs	
@@ -0,0 +1,37 @@
+using System.Drawing;
+using System.Windows.Forms;
+using System.Windows.Forms.VisualStyles;
+
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    ///<summary>
+    /// CheckDisplay
+    ///</summary>
+    static public class CheckDisplay
+    {
+        ///<summary>
+        /// RenderCheckbox
+        ///</summary>
+        ///<param name="g"></param>
+        ///<param name="bounds"></param>
+        ///<param name="cstate"></param>
+        ///<param name="bstate"></param>
+        static public void RenderCheckbox(
+            Graphics g, Rectangle bounds, CheckBoxState cstate, ButtonState bstate)
+        {
+            Size csize = CheckBoxRenderer.GetGlyphSize(g, cstate);
+
+            if (Application.RenderWithVisualStyles == true)
+            {
+                Point pt = bounds.Location;
+                pt.Y += (bounds.Height - csize.Height) / 2;
+
+                CheckBoxRenderer.DrawCheckBox(g, pt, cstate);
+            }
+            else
+            {
+                ControlPaint.DrawCheckBox(g, bounds, bstate);
+            }
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/DataBinder.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/DataBinder.cs
new file mode 100644
index 00000000..fc1a1c1c
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/DataBinder.cs	
@@ -0,0 +1,3203 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Data.SqlTypes;
+using System.Reflection;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    ///<summary>
+    /// DataBinding helper class
+    ///</summary>
+    public class DataBinder : IDisposable
+    {
+        #region Private variables
+
+        private readonly GridPanel _Panel;
+
+        private CurrencyManager _CurrencyManager;
+        private PropertyDescriptorCollection _Pdc;
+        private DataView _DataView;
+        private DataRow _TempDataRow;
+
+        private BindingSource _BindingSource;
+        private BindingSource _BaseBindingSource;
+        private object _BaseDataSource;
+        private string _BaseDataMember;
+
+        private bool _ConnectionInProgress;
+        private bool _NotificationInProgress;
+        private bool _UpdateInProgress;
+        private bool _UpdatePosInProgress;
+
+        private ushort _DataResetCount;
+        private ushort _BeginUpdateCount;
+
+        private object _LastDataItemAdded;
+
+        #endregion
+
+        ///<summary>
+        /// DataBinding
+        ///</summary>
+        ///<param name="panel"></param>
+        internal DataBinder(GridPanel panel)
+        {
+            _Panel = panel;
+        }
+
+        #region Internal properties
+
+        #region BaseDataMember
+
+        internal string BaseDataMember
+        {
+            get { return (_BaseDataMember); }
+            set { _BaseDataMember = value; }
+        }
+
+        #endregion
+
+        #region BaseDataSource
+
+        internal object BaseDataSource
+        {
+            get { return (_BaseDataSource); }
+            set { _BaseDataSource = value; }
+        }
+
+        #endregion
+
+        #region CanDeleteRow
+
+        internal bool CanDeleteRow
+        {
+            get
+            {
+                if (CurrencyManager != null)
+                {
+                    if (_DataView != null)
+                        return (_DataView.AllowDelete);
+                }
+
+                return (true);
+            }
+        }
+
+        #endregion
+
+        #region CanInsertRow
+
+        internal bool CanInsertRow
+        {
+            get
+            {
+                if (CurrencyManager != null)
+                {
+                    if (_DataView != null)
+                        return (_DataView.AllowNew);
+                }
+
+                return (true);
+            }
+        }
+
+        #endregion
+
+        #region ConnectionInProgress
+
+        internal bool ConnectionInProgress
+        {
+            get { return (_ConnectionInProgress); }
+            set { _ConnectionInProgress = value; }
+        }
+
+        #endregion
+
+        #region CurrencyManager
+
+        internal CurrencyManager CurrencyManager
+        {
+            get { return (_CurrencyManager); }
+
+            set
+            {
+                if (_CurrencyManager != value)
+                {
+                    if (_CurrencyManager != null)
+                    {
+                        _CurrencyManager.ListChanged -= CurrencyManagerListChanged;
+                        _CurrencyManager.PositionChanged -= CmPositionChanged;
+                        _CurrencyManager.MetaDataChanged -= CurrencyManagerMetaDataChanged;
+
+                        _Panel.SuperGrid.LoadVirtualRow -= SuperGridLoadVirtualRow;
+                    }
+
+                    _CurrencyManager = value;
+
+                    if (_BaseBindingSource != null)
+                        _BaseBindingSource.PositionChanged -= BsPositionChanged;
+
+                    _BaseBindingSource = null;
+
+                    if (_CurrencyManager != null)
+                    {
+                        _Pdc = CurrencyManager.GetItemProperties();
+
+                        if (_Panel.IsSubPanel == false)
+                            _CurrencyManager.PositionChanged += CmPositionChanged;
+
+                        _BaseBindingSource = _Panel.DataSource as BindingSource;
+
+                        if (_BaseBindingSource != null)
+                            _BaseBindingSource.PositionChanged += BsPositionChanged;
+
+                        _CurrencyManager.MetaDataChanged += CurrencyManagerMetaDataChanged;
+
+                        if (_Panel.VirtualMode == true)
+                        {
+                            _Panel.VirtualRowCount = _CurrencyManager.Count;
+
+                            _Panel.SuperGrid.LoadVirtualRow += SuperGridLoadVirtualRow;
+                        }
+                    }
+                    else
+                    {
+                        _Pdc = null;
+                    }
+                }
+            }
+        }
+
+        #region CurrencyManagerMetaDataChanged
+
+        void CurrencyManagerMetaDataChanged(object sender, EventArgs e)
+        {
+            if (CurrencyManager != null)
+            {
+                _Pdc = CurrencyManager.GetItemProperties();
+
+                _Panel.InvalidateMerge();
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region DataResetCount
+
+        internal ushort DataResetCount
+        {
+            get { return (_DataResetCount); }
+
+            set
+            {
+                _DataResetCount = value;
+
+                if (_Panel.VirtualMode == true)
+                    _Panel.VirtualRows.Clear();
+
+                if (_UpdatingFilter == true)
+                {
+                    _Panel.NeedToUpdateBoundData = true;
+                }
+                else
+                {
+                    _Panel.NeedToUpdateBindings = true;
+                    _Panel.NeedToUpdateDataFilter = true;
+                }
+
+                _Panel.UnDeleteAll();
+                _Panel.InvalidateMerge();
+            }
+        }
+
+        #endregion
+
+        #region DataView
+
+        internal DataView DataView
+        {
+            get { return (_DataView); }
+            set { _DataView = value; }
+        }
+
+        #endregion
+
+        #region GetValue
+
+        internal object GetValue(GridCell cell, object value)
+        {
+            if (cell.GridRow.IsTempInsertRow == false)
+            {
+                if (CurrencyManager != null && _Pdc != null)
+                {
+                    if ((uint)cell.GridRow.DataItemIndex < CurrencyManager.List.Count)
+                    {
+                        int index = cell.GridRow.DataItemIndex;
+
+                        if (_Panel.VirtualMode == true && _Panel.VirtualTempInsertRow != null)
+                        {
+                            if (index > _Panel.VirtualTempInsertRow.RowIndex)
+                                index--;
+                        }
+
+                        object dataItem = CurrencyManager.List[index];
+                        PropertyDescriptorCollection pdc = GetPdc(dataItem);
+
+                        GridColumn col = _Panel.Columns[cell.ColumnIndex];
+                        PropertyDescriptor pd = FindPropertyDescriptor(pdc, col);
+
+                        if (pd != null)
+                            return (pd.GetValue(dataItem));
+                    }
+                }
+            }
+
+            return (value);
+        }
+
+        #endregion
+
+        #region IsSortable
+
+        internal bool IsSortable
+        {
+            get
+            {
+                if (_BaseDataSource is DataSet)
+                    return (true);
+
+                if (_BaseDataSource is IBindingList)
+                {
+                    IBindingList list = (IBindingList)_BaseDataSource;
+
+                    return (list.SupportsSorting);
+                }
+                
+                if (_BaseDataSource is IListSource)
+                {
+                    IList list2 = ((IListSource)_BaseDataSource).GetList();
+
+                    if (list2 is IBindingList)
+                        return (((IBindingList)list2).SupportsSorting);
+                }
+
+                return (false);
+            }
+        }
+
+        #endregion
+
+        #region IsUpdateSuspended
+
+        internal bool IsUpdateSuspended
+        {
+            get { return (_BeginUpdateCount > 0); }
+        }
+
+        #endregion
+
+        #region NotificationInProgress
+
+        internal bool NotificationInProgress
+        {
+            get { return (_NotificationInProgress); }
+            set { _NotificationInProgress = value; }
+        }
+
+        #endregion
+
+        #region Pdc
+
+        internal PropertyDescriptorCollection Pdc
+        {
+            get { return (_Pdc); }
+            set { _Pdc = value; }
+        }
+
+        #endregion
+
+        #region RowCount
+
+        internal int RowCount
+        {
+            get
+            {
+                if (CurrencyManager != null)
+                    return (CurrencyManager.Count);
+
+                return (0);
+            }
+        }
+
+        #endregion
+
+        #region SetValue
+
+        internal void SetValue(GridCell cell, object value)
+        {
+            if (cell.GridRow.IsTempInsertRow == false)
+            {
+                if (CurrencyManager != null && _Pdc != null)
+                {
+                    GridRow row = (GridRow)cell.GridRow;
+
+                    if ((uint)row.DataItemIndex < CurrencyManager.List.Count)
+                    {
+                        object dataItem = CurrencyManager.List[row.DataItemIndex];
+
+                        PropertyDescriptorCollection pdc = GetPdc(dataItem);
+
+                        GridColumn col = _Panel.Columns[cell.ColumnIndex];
+                        PropertyDescriptor pd = FindPropertyDescriptor(pdc, col);
+
+                        if (pd != null)
+                        {
+                            if (pd.IsReadOnly == false)
+                            {
+                                object cvalue = value;
+
+                                if ((value != null && Convert.IsDBNull(value) == false) &&
+                                    value.GetType() != pd.PropertyType && (value is IConvertible))
+                                {
+                                    cvalue = Convert.ChangeType(value, Nullable.GetUnderlyingType(pd.PropertyType) ?? pd.PropertyType);
+                                }
+
+                                pd.SetValue(dataItem, cvalue);
+
+                                UpdatePosInProgress = true;
+                                CurrencyManager.EndCurrentEdit();
+                                UpdatePosInProgress = false;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region UpdateInProgress
+
+        internal bool UpdateInProgress
+        {
+            get { return (_UpdateInProgress); }
+            set { _UpdateInProgress = value; }
+        }
+
+        #endregion
+
+        #region UpdatePosInProgress
+
+        internal bool UpdatePosInProgress
+        {
+            get { return (_UpdatePosInProgress); }
+            set { _UpdatePosInProgress = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Clear
+
+        internal void Clear()
+        {
+            if (_Panel.SuperGrid != null)
+                _Panel.SuperGrid.BeforeExpand -= SuperGridBeforeExpand;
+
+            CurrencyManager = null;
+
+            _BaseDataSource = null;
+            _BaseDataMember = null;
+
+            _DataView = null;
+            _BindingSource = null;
+
+            _Panel.ActiveRow = null;
+            _Panel.MergeScan = null;
+            _Panel.DataRelation = null;
+
+            if (_Panel.VirtualMode == true)
+            {
+                _Panel.VirtualTempInsertRow = null;
+                _Panel.VirtualRows.Clear();
+            }
+
+            _TempDataRow = null;
+            _LastDataItemAdded = null;
+        }
+
+        #endregion
+
+        #region DataConnect
+
+        internal void DataConnect()
+        {
+            _BaseDataSource = _Panel.DataSource;
+            _BaseDataMember = _Panel.DataMember;
+
+            if (_BaseDataSource != null)
+            {
+                _BindingSource = _BaseDataSource as BindingSource;
+
+                if (_BindingSource != null)
+                {
+                    BindingSource bs = _BindingSource.DataSource as BindingSource;
+
+                    if (bs != null)
+                    {
+                        if (string.IsNullOrEmpty(_BindingSource.DataMember) == false)
+                            _BaseDataMember = _BindingSource.DataMember;
+                        else
+                            _BindingSource = null;
+
+                        while (bs.DataSource is BindingSource)
+                            bs = (BindingSource)bs.DataSource;
+
+                        DataSet dss = bs.DataSource as DataSet;
+
+                        if (dss != null)
+                        {
+                            DataRelation dsr = dss.Relations[_BaseDataMember];
+
+                            if (dsr != null)
+                            {
+                                _BaseDataSource = dss;
+                                _BaseDataMember = dsr.ChildTable.TableName;
+                            }
+                        }
+                    }
+                    else
+                    {
+                        _BaseDataSource = _BindingSource.DataSource;
+                        _BaseDataMember = _BindingSource.DataMember;
+                    }
+                }
+
+                DataView = null;
+
+                if (_BaseDataSource is DataSet)
+                    AddDataSetTable((DataSet)_BaseDataSource, _BaseDataMember);
+
+                //else if (_BaseDataSource is DataTable)
+                //    AddDataTable((DataTable)_BaseDataSource);
+
+                else if (_BaseDataSource is IBindingList)
+                    AddIList((IBindingList)_BaseDataSource);
+
+                else if (_BaseDataSource is IList)
+                    AddIList((IList)_BaseDataSource);
+
+                else if (_BaseDataSource is IListSource)
+                {
+                    DataTable dt = _BaseDataSource as DataTable;
+
+                    if (dt != null)
+                        DataView = dt.DefaultView;
+
+                    AddIList(((IListSource)_BaseDataSource).GetList());
+                }
+                else
+                    AddDefaultObject(_BaseDataSource);
+            }
+        }
+
+        #endregion
+
+        #region SetDataConnection
+
+        private bool SetDataConnection(object dataSource)
+        {
+            if (ConnectionInProgress == false)
+            {
+                ClearDataNotification(dataSource);
+
+                if (_BindingSource != null || _Panel.SuperGrid.BindingContext != null)
+                {
+                    ConnectionInProgress = true;
+
+                    try
+                    {
+                        SetDataNotification(dataSource);
+                    }
+                    finally
+                    {
+                        ConnectionInProgress = false;
+                    }
+                }
+            }
+
+            return (NotificationInProgress == false);
+        }
+
+        #endregion
+
+        #region SetDataNotification
+
+        private void SetDataNotification(object dataSource)
+        {
+            ISupportInitializeNotification notification =
+                dataSource as ISupportInitializeNotification;
+
+            if (notification == null || notification.IsInitialized == true)
+            {
+                CurrencyManager = (_BindingSource != null)
+                    ? _BindingSource.CurrencyManager
+                    : _Panel.SuperGrid.BindingContext[DataView ?? dataSource] as CurrencyManager;
+            }
+            else
+            {
+                CurrencyManager = null;
+
+                if (NotificationInProgress == false)
+                {
+                    notification.Initialized += DataSourceInitialized;
+                    NotificationInProgress = true;
+                }
+            }
+        }
+
+        #endregion
+
+        #region ClearDataNotification
+
+        private void ClearDataNotification(object dataSource)
+        {
+            ISupportInitializeNotification notification =
+                dataSource as ISupportInitializeNotification;
+
+            if (notification != null && NotificationInProgress == true)
+            {
+                notification.Initialized -= DataSourceInitialized;
+
+                NotificationInProgress = false;
+            }
+        }
+
+        #endregion
+
+        #region DataSourceInitialized
+
+        private void DataSourceInitialized(object sender, EventArgs e)
+        {
+            ISupportInitializeNotification dataSource =
+                _Panel.DataSource as ISupportInitializeNotification;
+
+            if (dataSource != null)
+            {
+                NotificationInProgress = false;
+
+                dataSource.Initialized -= DataSourceInitialized;
+
+                CurrencyManager =
+                    _Panel.SuperGrid.BindingContext[dataSource] as CurrencyManager;
+            }
+        }
+
+        #endregion
+
+        #region CmPositionChanged
+
+        void CmPositionChanged(object sender, EventArgs e)
+        {
+            if (IsUpdateSuspended == false && UpdatePosInProgress == false)
+            {
+                CurrencyManager cm = sender as CurrencyManager;
+
+                if (cm != null && cm == _CurrencyManager)
+                    UpdatePosition(cm.Position);
+            }
+        }
+
+        #region BsPositionChanged
+
+        void BsPositionChanged(object sender, EventArgs e)
+        {
+            if (_UpdatePosInProgress == false)
+            {
+                BindingSource bs = sender as BindingSource;
+
+                if (bs != null)
+                    UpdatePosition(bs.Position);
+            }
+        }
+
+        #endregion
+
+        #region UpdatePosition
+
+        private void UpdatePosition(int position)
+        {
+            if (_Panel.IsSubPanel == false)
+            {
+                GridRow row = FindDataGridRowIndex(position);
+
+                if (row != null && _Panel.ActiveRow != row)
+                {
+                    try
+                    {
+                        _UpdatePosInProgress = true;
+
+                        if (row.Visible == false)
+                            row.Visible = true;
+
+                        if (_Panel.AutoSelectNewBoundRows == true)
+                        {
+                            _Panel.ClearAll();
+
+                            _Panel.SetActiveRow(row, true);
+                            _Panel.SetSelectedRows(row.GridIndex, 1, true);
+
+                            bool skey = (_Panel.MultiSelect == true) ?
+                                ((Control.ModifierKeys & Keys.Shift) == Keys.Shift) : false;
+
+                            if (skey == false || _Panel.SelectionRowAnchor == null) 
+                                _Panel.SelectionRowAnchor = row;
+
+                            row.EnsureVisible();
+                        }
+                    }
+                    finally
+                    {
+                        _UpdatePosInProgress = false;
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region SetPosition
+
+        internal bool SetPosition(GridRow row)
+        {
+            if (_UpdatePosInProgress == false)
+            {
+                if (row != null && row.IsTempInsertRow == false)
+                {
+                    if (CurrencyManager != null)
+                    {
+                        if (SetCmPosition(row) == false)
+                            return (false);
+
+                        _Panel.ActiveRow = row;
+
+                        if (_Panel.IsSubPanel == false)
+                        {
+                            if (_BaseBindingSource != null)
+                                _BaseBindingSource.Position = CurrencyManager.Position;
+                        }
+                    }
+                }
+            }
+
+            return (true);
+        }
+
+        #region SetCmPosition
+
+        private bool SetCmPosition(GridRow row)
+        {
+            if (CurrencyManager == null)
+                return (false);
+
+            while (true)
+            {
+                _UpdatePosInProgress = true;
+
+                try
+                {
+                    CurrencyManager.Position = row.DataItemIndex;
+                    break;
+                }
+                catch (Exception exp)
+                {
+                    GridRow crow = null;
+
+                    if ((uint)CurrencyManager.Position < _Panel.Rows.Count)
+                    {
+                        crow = _Panel.Rows[CurrencyManager.Position] as GridRow;
+
+                        if (crow != null)
+                            ReloadRow(crow);
+                    }
+
+                    bool retry = false;
+                    bool throwException = false;
+
+                    if (_Panel.SuperGrid.HasDataErrorHandler == true)
+                    {
+                        object value = crow;
+
+                        if (_Panel.SuperGrid.DoDataErrorEvent(_Panel, null, exp,
+                            DataContext.SetRowPosition, ref value, ref throwException, ref retry) == true)
+                        {
+                            return (false);
+                        }
+                    }
+
+                    if (throwException == true)
+                        throw;
+
+                    if (retry == false)
+                        return (false);
+                }
+                finally
+                {
+                    _UpdatePosInProgress = false;
+                }
+            }
+
+            return (true);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region AddIList
+
+        internal void AddIList(IList list)
+        {
+            bool autogen = _Panel.AutoGenerateColumns;
+            ProcessChildRelations crVisibility = _Panel.ProcessChildRelations;
+
+            if (_Panel.SuperGrid.DoDataBindingStartEvent(
+                _Panel, null, null, ref autogen, ref crVisibility) == false)
+            {
+                AddIList(list, autogen, crVisibility);
+            }
+        }
+
+        #region AddIList
+
+        internal void AddIList(IList list, bool autogen, ProcessChildRelations crProcess)
+        {
+            if (SetDataConnection(list) == true)
+            {
+                if (_Pdc != null)
+                {
+                    if (autogen == true && _Panel.IsDesignerHosted == false)
+                        AutoGenerateListColumns(null);
+
+                    if (_Panel.VirtualMode == false)
+                    {
+                        if (crProcess != ProcessChildRelations.Never)
+                        {
+                            bool rowsUnresolved = false;
+
+                            for (int i = 0; i < list.Count; i++)
+                            {
+                                object o = list[i];
+
+                                if (o != null)
+                                {
+                                    GridRow row = GetNewRow(o);
+
+                                    row.DataItem = o;
+                                    row.DataItemIndex = i;
+
+                                    Type type = o.GetType();
+
+                                    if (type != null)
+                                    {
+                                        if (CheckNestedFields(row, type, crProcess) == false)
+                                            CheckNestedProperties(row, type, crProcess);
+                                    }
+
+                                    rowsUnresolved |= row.RowsUnresolved;
+
+                                    _Panel.Rows.Add(row);
+                                }
+                            }
+
+                            if (rowsUnresolved == true)
+                            {
+                                _Panel.ShowTreeButtons = true;
+                                _Panel.ShowTreeLines = true;
+
+                                _Panel.SuperGrid.BeforeExpand -= SuperGridBeforeExpand;
+                                _Panel.SuperGrid.BeforeExpand += SuperGridBeforeExpand;
+                            }
+                        }
+                    }
+
+                    UpdateSuperGridSort(false);
+                }
+
+                if (CurrencyManager != null)
+                {
+                    CurrencyManager.ListChanged -= CurrencyManagerListChanged;
+                    CurrencyManager.ListChanged += CurrencyManagerListChanged;
+                }
+
+                _Panel.SuperGrid.DoDataBindingCompleteEvent(_Panel);
+
+                if (_Panel.ShowInsertRow == true)
+                {
+                    _Panel.ShowInsertRow = false;
+                    _Panel.ShowInsertRow = true;
+                }
+            }
+        }
+
+        #region CheckNestedFields
+
+        private bool CheckNestedFields(GridRow row, Type type, ProcessChildRelations crProcess)
+        {
+            if ((_Panel.NestedListScanTypes & NestedListScanTypes.Fields) == NestedListScanTypes.Fields)
+            {
+                FieldInfo[] fia = type.GetFields();
+
+                foreach (FieldInfo fi in fia)
+                {
+                    if (IsNestedList(fi.FieldType.Name) == true)
+                    {
+                        if (IsVisibleItem(type, fi) == true)
+                        {
+                            if (crProcess == ProcessChildRelations.Always || fia.Length > 0)
+                            {
+                                row.RowsUnresolved = true;
+
+                                return (true);
+                            }
+                        }
+                    }
+                }
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region CheckNestedProperties
+
+        private bool CheckNestedProperties(GridRow row, Type type, ProcessChildRelations crProcess)
+        {
+            if ((_Panel.NestedListScanTypes & NestedListScanTypes.Properties) == NestedListScanTypes.Properties)
+            {
+                PropertyInfo[] pia = type.GetProperties();
+
+                foreach (PropertyInfo pi in pia)
+                {
+                    if (IsNestedList(pi.PropertyType.Name) == true)
+                    {
+                        if (IsVisibleItem(type, pi) == true)
+                        {
+                            if (crProcess == ProcessChildRelations.Always || pia.Length > 0)
+                                row.RowsUnresolved = true;
+
+                            return (true);
+                        }
+                    }
+                }
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region IsNestedList
+
+        private bool IsNestedList(string name)
+        {
+            return (name.Equals("List`1") || name.Equals("BindingList`1"));
+        }
+
+        #endregion
+
+        #endregion
+
+        #region AutoGenerateListColumns
+
+        private void AutoGenerateListColumns(GetNewGridColumn callBack)
+        {
+            if (_Pdc != null)
+            {
+                foreach (PropertyDescriptor pd in _Pdc)
+                {
+                    if (pd.PropertyType.IsInterface == false)
+                    {
+                        if (IsNestedList(pd.PropertyType.Name) == false && IsVisibleItem(pd) == true)
+                        {
+                            if (FindGridColumn(_Panel, pd.Name) == null)
+                            {
+                                GridColumn gcol = (callBack != null) ? callBack() : new GridColumn();
+
+                                if (gcol != null)
+                                {
+                                    gcol.DataPropertyName = pd.Name;
+                                    gcol.Name = pd.DisplayName;
+                                    gcol.Width = 100;
+
+                                    SetColumnEditor(pd.PropertyType, gcol);
+
+                                    _Panel.Columns.Add(gcol);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        
+        #endregion
+
+        #region IsVisibleItem
+
+        private bool IsVisibleItem(Type type, FieldInfo fi)
+        {
+            foreach (Attribute attr in fi.GetCustomAttributes(true))
+            {
+                IsVisibleToSuperGrid dattr = attr as IsVisibleToSuperGrid;
+
+                if (dattr != null)
+                    return (dattr.Visible);
+            }
+
+            return (true);
+        }
+
+        private bool IsVisibleItem(Type type, PropertyInfo pi)
+        {
+            foreach (Attribute attr in pi.GetCustomAttributes(true))
+            {
+                IsVisibleToSuperGrid dattr = attr as IsVisibleToSuperGrid;
+
+                if (dattr != null)
+                    return (dattr.Visible);
+            }
+
+            return (true);
+        }
+
+        private bool IsVisibleItem(PropertyDescriptor pd)
+        {
+            foreach (Attribute attr in pd.Attributes)
+            {
+                IsVisibleToSuperGrid dattr = attr as IsVisibleToSuperGrid;
+
+                if (dattr != null)
+                    return (dattr.Visible);
+            }
+
+            return (true);
+        }
+
+        #endregion
+
+        #region GetNewRow
+
+        private GridRow GetNewRow(object o)
+        {
+            GridRow row = new GridRow();
+            PropertyDescriptorCollection pdc = GetPdc(o);
+
+            foreach (GridColumn col in _Panel.Columns)
+            {
+                PropertyDescriptor pd = FindPropertyDescriptor(pdc, col);
+
+                object value = (pd != null)
+                    ? pd.GetValue(o) : null;
+
+                row.Cells.Add(new GridCell(value));
+            }
+
+            return (row);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region AddDataSetTable
+
+        internal void AddDataSetTable(DataSet dataSet, string dataMember)
+        {
+            if (string.IsNullOrEmpty(dataMember) && dataSet.Tables.Count > 0)
+                dataMember = dataSet.Tables[0].TableName;
+
+            if (string.IsNullOrEmpty(dataMember) == false)
+                AddDataTable(dataSet.Tables[dataMember]);
+        }
+
+        #endregion
+
+        #region AddDataTable
+
+        internal void AddDataTable(DataTable dt)
+        {
+            bool autogen = _Panel.AutoGenerateColumns;
+            ProcessChildRelations crVisibility = _Panel.ProcessChildRelations;
+
+            if (_Panel.SuperGrid.DoDataBindingStartEvent(
+                _Panel, null, dt.TableName, ref autogen, ref crVisibility) == false)
+            {
+                AddDataTable(dt, autogen, crVisibility);
+            }
+        }
+
+        internal void AddDataTable(
+            DataTable dt, bool autogen, ProcessChildRelations crProcess)
+        {
+            if (SetDataConnection(dt) == true)
+            {
+                if (CurrencyManager != null)
+                {
+                    CurrencyManager.ListChanged -= CurrencyManagerListChanged;
+                    CurrencyManager.ListChanged += CurrencyManagerListChanged;
+
+                    if (autogen == true && _Panel.IsDesignerHosted == false)
+                        AutoGenerateDataTableColumns(dt, null);
+
+                    if (_Panel.VirtualMode == false)
+                    {
+                        int pindex = (crProcess != ProcessChildRelations.Never) ? GetPrimaryColumnIndex(dt) : -1;
+
+                        bool rowsUnresolved = (pindex >= 0 && dt.ChildRelations.Count > 0);
+
+                        for (int i = 0; i < CurrencyManager.Count; i++)
+                        {
+                            DataRowView view = CurrencyManager.List[i] as DataRowView;
+
+                            if (view != null)
+                            {
+                                GridRow row = GetNewRow(dt, view);
+                                row.DataItem = view;
+                                row.DataItemIndex = i;
+
+                                row.RowsUnresolved = rowsUnresolved;
+
+                                _Panel.Rows.Add(row);
+                            }
+                        }
+
+                        if (rowsUnresolved == true)
+                        {
+                            _Panel.PrimaryColumnIndex = pindex;
+
+                            _Panel.ShowTreeButtons = true;
+                            _Panel.ShowTreeLines = true;
+
+                            _Panel.SuperGrid.BeforeExpand -= SuperGridBeforeExpand;
+                            _Panel.SuperGrid.BeforeExpand += SuperGridBeforeExpand;
+                        }
+                    }
+                    else
+                    {
+                        if (_Panel.IsFiltered == true)
+                            dt.DefaultView.RowFilter = "";
+                    }
+
+                    DataView = dt.DefaultView;
+
+                    UpdateSuperGridSort(false);
+
+                    _Panel.SuperGrid.DoDataBindingCompleteEvent(_Panel);
+                }
+            }
+        }
+
+        #endregion
+
+        #region AddDefaultObject
+
+        private void AddDefaultObject(object source)
+        {
+            if (SetDataConnection(source) == true)
+            {
+                if (_Pdc != null)
+                {
+                    if (_Panel.AutoGenerateColumns == true && _Panel.IsDesignerHosted == false)
+                        AutoGenerateListColumns(null);
+
+                    IList list = CurrencyManager.List;
+
+                    for (int i = 0; i < list.Count; i++)
+                    {
+                        object o = list[i];
+
+                        if (o != null)
+                        {
+                            GridRow row = GetNewRow(o);
+
+                            row.DataItem = o;
+                            row.DataItemIndex = i;
+
+                            _Panel.Rows.Add(row);
+                        }
+                    }
+
+                    _Panel.SuperGrid.DoDataBindingCompleteEvent(_Panel);
+                }
+
+                if (CurrencyManager != null)
+                {
+                    CurrencyManager.ListChanged -= CurrencyManagerListChanged;
+                    CurrencyManager.ListChanged += CurrencyManagerListChanged;
+                }
+            }
+        }
+
+        #endregion
+
+        #region GetPrimaryColumnIndex
+
+        private int GetPrimaryColumnIndex(DataTable dt)
+        {
+            if (dt.ChildRelations.Count > 0)
+            {
+                DataRelation dr = dt.ChildRelations[0];
+
+                if (dr.ParentColumns.Length > 0)
+                {
+                    GridColumn col =
+                        FindGridColumn(_Panel, dr.ParentColumns[0].ColumnName);
+
+                    if (col != null)
+                        return (col.ColumnIndex);
+                }
+            }
+
+            return (-1);
+        }
+
+        #endregion
+
+        #region AutoGenerateDataTableColumns
+
+        private void AutoGenerateDataTableColumns(DataTable dt, GetNewGridColumn callBack)
+        {
+            foreach (DataColumn dtColumn in dt.Columns)
+            {
+                if ((dtColumn.ColumnMapping & MappingType.Hidden) != MappingType.Hidden)
+                {
+                    if (FindGridColumn(_Panel, dtColumn.ColumnName) == null)
+                    {
+                        GridColumn gcol = (callBack != null) ? callBack() : new GridColumn();
+
+                        if (gcol != null)
+                        {
+                            gcol.DataPropertyName = dtColumn.ColumnName;
+                            gcol.Name = dtColumn.ColumnName;
+                            gcol.Width = 100;
+
+                            gcol.DefaultNewRowCellValue = dtColumn.DefaultValue;
+                            gcol.ReadOnly = dtColumn.ReadOnly;
+
+                            if (String.IsNullOrEmpty(dtColumn.Caption) == false)
+                                gcol.HeaderText = dtColumn.Caption;
+
+                            SetColumnEditor(dtColumn.DataType, gcol);
+
+                            _Panel.Columns.Add(gcol);
+                        }
+                    }
+                }
+            }
+        }
+
+        #region SetColumnEditor
+
+        private void SetColumnEditor(Type type, GridColumn col)
+        {
+            col.DataType = type;
+
+            if (type != null)
+            {
+                if (type.IsGenericType && type.GetGenericTypeDefinition() == typeof(Nullable<>))
+                {
+                    Type type2 = Nullable.GetUnderlyingType(type);
+
+                    if (type2 != null)
+                        type = type2;
+                }
+
+                if (type == typeof(String) || type == typeof(SqlString))
+                {
+                    col.EditorType = typeof(GridTextBoxXEditControl);
+                }
+                else if (type == typeof(Boolean) || type == typeof(SqlBoolean))
+                {
+                    col.EditorType = typeof(GridCheckBoxXEditControl);
+                }
+                else if (type == typeof(DateTime) || type == typeof(SqlDateTime)
+                    || type == typeof(TimeSpan))
+                {
+                    col.EditorType = typeof(GridDateTimeInputEditControl);
+                }
+                else if (type == typeof(Decimal) || type == typeof(SqlDecimal) ||
+                    type == typeof(Double) || type == typeof(SqlDouble) ||
+                    type == typeof(Single) || type == typeof(SqlSingle))
+                {
+                    col.EditorType = typeof(GridDoubleInputEditControl);
+                }
+                else if (type == typeof(Int64) || type == typeof(SqlInt64))
+                {
+                    col.EditorType = typeof(GridDoubleIntInputEditControl);
+                }
+                else if (type == typeof(Int16) || (type == typeof(SqlInt16) ||
+                    type == typeof(Int32) || type == typeof(SqlInt32)))
+                {
+                    col.EditorType = typeof(GridIntegerInputEditControl);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region AutoGenerateColumns
+
+        internal void AutoGenerateColumns(GetNewGridColumn callBack)
+        {
+            if (CurrencyManager != null)
+            {
+                DataSet dataSet = _BaseDataSource as DataSet;
+
+                if (dataSet != null)
+                {
+                    string dataMember = _BaseDataMember;
+
+                    if (string.IsNullOrEmpty(dataMember) && dataSet.Tables.Count > 0)
+                        dataMember = dataSet.Tables[0].TableName;
+
+                    if (string.IsNullOrEmpty(dataMember) == false)
+                        AutoGenerateDataTableColumns(dataSet.Tables[dataMember], callBack);
+                }
+                else
+                {
+                    AutoGenerateListColumns(callBack);
+                }
+            }
+        }
+
+        #endregion
+
+        #region GetNewRow
+
+        private GridRow GetNewRow(DataTable dt, DataRowView view)
+        {
+            GridRow row = new GridRow();
+
+            for (int i = 0; i < _Panel.Columns.Count; i++)
+            {
+                GridColumn col = _Panel.Columns[i];
+                DataColumn dtColumn = FindDataColumn(dt, col);
+
+                object o = (dtColumn != null)
+                    ? view.Row.ItemArray[dtColumn.Ordinal] : null;
+
+                row.Cells.Add(new GridCell(o));
+            }
+
+            return (row);
+        }
+
+        #endregion
+
+        #region IsColumnDataBound
+
+        internal bool IsColumnDataBound(GridColumn col)
+        {
+            if (_Pdc != null)
+            {
+                PropertyDescriptor pd = FindPropertyDescriptor(_Pdc, col);
+
+                return (pd != null);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region GetPdc
+
+        private PropertyDescriptorCollection GetPdc(object dataItem)
+        {
+            if (_Panel.EnableDiscreteBoundRows == true)
+            {
+                if (dataItem != null)
+                    return (TypeDescriptor.GetProperties(dataItem.GetType()));
+            }
+
+            return (_Pdc);
+        }
+
+        #endregion
+
+        #region FindPropertyDescriptor
+
+        private PropertyDescriptor FindPropertyDescriptor(PropertyDescriptorCollection pdc, GridColumn col)
+        {
+            if (pdc != null)
+            {
+                foreach (PropertyDescriptor pd in pdc)
+                {
+                    if (string.IsNullOrEmpty(col.DataPropertyName) == true)
+                    {
+                        if (pd.Name.Equals(col.Name) == true)
+                            return (pd);
+                    }
+                    else
+                    {
+                        if (pd.Name.Equals(col.DataPropertyName) == true)
+                            return (pd);
+                    }
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region FindDataColumn
+
+        private DataColumn FindDataColumn(DataTable dt, GridColumn col)
+        {
+            foreach (DataColumn dtColumn in dt.Columns)
+            {
+                if (string.IsNullOrEmpty(col.DataPropertyName) == true)
+                {
+                    if (dtColumn.ColumnName.Equals(col.Name) == true)
+                        return (dtColumn);
+                }
+                else
+                {
+                    if (dtColumn.ColumnName.Equals(col.DataPropertyName) == true)
+                        return (dtColumn);
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region FindGridColumn
+
+        private GridColumn FindGridColumn(GridPanel panel, string name)
+        {
+            foreach (GridColumn col in panel.Columns)
+            {
+                if (string.IsNullOrEmpty(col.DataPropertyName) == true)
+                {
+                    if (name.Equals(col.Name) == true)
+                        return (col);
+                }
+                else
+                {
+                    if (name.Equals(col.DataPropertyName) == true)
+                        return (col);
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region SuperGridBeforeExpand
+
+        void SuperGridBeforeExpand(object sender, GridBeforeExpandEventArgs e)
+        {
+            if (e.GridPanel == _Panel)
+                ResolveRow(e.GridContainer);
+        }
+
+        #endregion
+
+        #region ResolveRow
+
+        internal void ResolveRow(GridContainer crow)
+        {
+            if (crow.RowsUnresolved == true)
+            {
+                crow.RowsUnresolved = false;
+
+                GridRow row = crow as GridRow;
+
+                if (row != null)
+                {
+                    DataRowView view = row.DataItem as DataRowView;
+
+                    if (view != null)
+                    {
+                        DataTable dt = view.DataView.Table;
+
+                        StringBuilder sb = new StringBuilder();
+
+                        foreach (DataRelation dr in dt.ChildRelations)
+                            CreateNestedTablePanel(_Panel, row, dr, sb);
+                    }
+                    else if (_BaseDataSource is IList)
+                    {
+                        object o = row.DataItem;
+
+                        Type type = o.GetType();
+
+                        if (type != null)
+                        {
+                            FieldInfo[] fia = type.GetFields();
+
+                            foreach (FieldInfo fi in fia)
+                                CreateNestedListFieldPanel(_Panel, row, type, fi);
+
+                            PropertyInfo[] pia = type.GetProperties();
+
+                            foreach (PropertyInfo pi in pia)
+                                CreateNestedListPropertyPanel(_Panel, row, type, pi);
+
+                        }
+                    }
+                }
+            }
+        }
+
+        #region CreateNestedTablePanel
+
+        private void CreateNestedTablePanel(GridPanel panel,
+            GridRow row, DataRelation dr, StringBuilder sb)
+        {
+            DataTable ct = dr.ChildTable;
+
+            bool autogen = true;
+            ProcessChildRelations crProcess = _Panel.ProcessChildRelations;
+
+            if (_Panel.SuperGrid.DoDataBindingStartEvent(
+                _Panel, row, ct.TableName, ref autogen, ref crProcess) == false)
+            {
+                if (crProcess != ProcessChildRelations.Never)
+                {
+                    sb.Length = 0;
+
+                    for (int i = 0; i < dr.ParentColumns.Length; i++)
+                    {
+                        DataColumn col = dr.ParentColumns[i];
+                        GridColumn gc = FindGridColumn(panel, col.ColumnName);
+
+                        if (gc != null)
+                        {
+                            object val = row.Cells[gc.ColumnIndex].Value;
+
+                            if (val != null)
+                            {
+                                string sval = val.ToString();
+
+                                if (sval.Length > 0)
+                                {
+                                    if (sb.Length > 0)
+                                        sb.Append(" AND ");
+
+                                    sb.Append("[" + dr.ChildColumns[i] + "]=");
+
+                                    if (sval.Contains("'") == true)
+                                        sval = sval.Replace("'", "''");
+
+                                    sb.Append("'" + sval + "'");
+                                }
+                            }
+                        }
+                    }
+
+                    string t = sb.ToString();
+
+                    DataView view = new
+                        DataView(ct, t, "", DataViewRowState.CurrentRows);
+
+                    if (view.Count > 0 || crProcess == ProcessChildRelations.Always)
+                    {
+                        GridPanel ipanel = new GridPanel();
+
+                        ipanel.Name = ct.TableName;
+                        ipanel.AutoGenerateColumns = autogen;
+                        ipanel.ProcessChildRelations = crProcess;
+
+                        ipanel.SetDataSource(panel.DataSource);
+                        ipanel.SetDataMember(ct.TableName);
+
+                        ipanel.DataRelation = dr;
+
+                        ipanel.DataBinder.DataView = view;
+                        ipanel.DataBinder.BaseDataSource = ipanel.DataSource;
+                        ipanel.DataBinder.BaseDataMember = ipanel.DataMember;
+
+                        row.Rows.Add(ipanel);
+
+                        ipanel.DataBinder.AddDataTable(ct, autogen, crProcess);
+                    }
+                    else
+                    {
+                        view.Dispose();
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region CreateNestedListFieldPanel
+
+        private void CreateNestedListFieldPanel(GridPanel _Panel, 
+            GridRow row, Type type, FieldInfo fi)
+        {
+            bool autogen = true;
+            ProcessChildRelations crProcess = _Panel.ProcessChildRelations;
+
+            if (IsNestedList(fi.FieldType.Name) == true)
+            {
+                if (IsVisibleItem(type, fi) == true)
+                {
+                    IList list = fi.GetValue(row.DataItem) as IList;
+
+                    if (list != null)
+                    {
+                        GridPanel ipanel = new GridPanel();
+
+                        ipanel.Name = fi.Name;
+                        ipanel.AutoGenerateColumns = autogen;
+                        ipanel.ProcessChildRelations = crProcess;
+
+                        ipanel.NestedListScanTypes = _Panel.NestedListScanTypes;
+
+                        if (_Panel.SuperGrid.DoDataBindingStartEvent(
+                            _Panel, row, null, ref autogen, ref crProcess) == false)
+                        {
+                            if (crProcess != ProcessChildRelations.Never)
+                            {
+                                if (list.Count > 0 || crProcess == ProcessChildRelations.Always)
+                                {
+                                    ipanel.SetDataSource(list);
+                                    ipanel.DataBinder.BaseDataSource = ipanel.DataSource;
+
+                                    row.Rows.Add(ipanel);
+
+                                    ipanel.DataBinder.AddIList((IList)ipanel.DataSource, autogen, crProcess);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region CreateNestedListPropertyPanel
+
+        private void CreateNestedListPropertyPanel(GridPanel _Panel,
+            GridRow row, Type type, PropertyInfo pi)
+        {
+            bool autogen = true;
+            ProcessChildRelations crProcess = _Panel.ProcessChildRelations;
+
+            if (IsNestedList(pi.PropertyType.Name) == true)
+            {
+                if (IsVisibleItem(type, pi) == true)
+                {
+                    IList list = pi.GetValue(row.DataItem, null) as IList;
+
+                    if (list != null)
+                    {
+                        GridPanel ipanel = new GridPanel();
+
+                        ipanel.Name = pi.Name;
+                        ipanel.AutoGenerateColumns = autogen;
+                        ipanel.ProcessChildRelations = crProcess;
+
+                        ipanel.NestedListScanTypes = _Panel.NestedListScanTypes;
+                        
+                        if (_Panel.SuperGrid.DoDataBindingStartEvent(
+                            ipanel, row, null, ref autogen, ref crProcess) == false)
+                        {
+                            if (crProcess != ProcessChildRelations.Never)
+                            {
+                                if (list.Count > 0 || crProcess == ProcessChildRelations.Always)
+                                {
+                                    ipanel.SetDataSource(list);
+                                    ipanel.DataBinder.BaseDataSource = ipanel.DataSource;
+
+                                    row.Rows.Add(ipanel);
+
+                                    ipanel.DataBinder.AddIList((IList)ipanel.DataSource, autogen, crProcess);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region CurrencyManagerListChanged
+
+        void CurrencyManagerListChanged(object sender, ListChangedEventArgs e)
+        {
+            if (_Panel.SuperGrid.InvokeRequired)
+            {
+                _Panel.SuperGrid.BeginInvoke(
+                    new MethodInvoker(delegate { CurrencyManagerListChangedUIThread(sender, e); }));
+            }
+            else
+            {
+                CurrencyManagerListChangedUIThread(sender, e);
+            }
+        }
+
+        void CurrencyManagerListChangedUIThread(object sender, ListChangedEventArgs e)
+        {
+            if (IsUpdateSuspended == false && UpdateInProgress == false)
+            {
+                GridRow row = null;
+
+                try
+                {
+                    UpdateInProgress = true;
+
+                    CurrencyManager cm = sender as CurrencyManager;
+
+                    if (cm != null && cm == _CurrencyManager)
+                    {
+                        IList list = cm.List;
+
+                        bool updateGrouping = true;
+
+                        if (e.ListChangedType == ListChangedType.ItemAdded)
+                        {
+                            if ((uint)e.NewIndex < CurrencyManager.Count)
+                            {
+                                row = AddDataGridRow(list, e.NewIndex);
+
+                                if (row != null)
+                                    _Panel.SuperGrid.DoRowLoadedEvent(_Panel, row);
+                            }
+                        }
+                        else
+                        {
+                            switch (e.ListChangedType)
+                            {
+                                case ListChangedType.ItemChanged:
+                                    UpdateDataGridRow(list, e.NewIndex);
+                                    updateGrouping = false;
+                                    break;
+
+                                case ListChangedType.ItemDeleted:
+                                    DeleteDataGridRow(e.NewIndex);
+                                    break;
+
+                                case ListChangedType.ItemMoved:
+                                    MoveDataGridRow(e.OldIndex, e.NewIndex);
+                                    break;
+
+                                case ListChangedType.Reset:
+                                    _Panel.FlushActiveRow();
+
+                                    DataResetCount++;
+
+                                    if (_Panel.VirtualMode == false)
+                                    {
+                                        _Panel.Rows.Clear();
+
+                                        if (_Panel.ShowInsertRow == true)
+                                            _Panel.LoadInsertRow = true;
+                                    }
+                                    else
+                                    {
+                                        _Panel.VirtualRows.Clear();
+
+                                        Refresh();
+                                    }
+
+                                    UpdateSuperGridSort(true);
+                                    break;
+                            }
+
+                            _LastDataItemAdded = null;
+                        }
+
+                        if (updateGrouping == true)
+                            UpdateGrouping();
+                    }
+                }
+                finally
+                {
+                    UpdateInProgress = false;
+                }
+            }
+        }
+
+        #region AddDataGridRow
+
+        private GridRow AddDataGridRow(IList list, int index)
+        {
+            GridElement selItem = _Panel.SuperGrid.ActiveElement;
+
+            if (_Panel.VirtualMode == true)
+            {
+                _Panel.VirtualRows.MaxRowIndex = index - 1;
+                _Panel.VirtualRowCount = CurrencyManager.Count;
+
+                _Panel.InvalidateRender();
+
+                if (_Panel.AutoSelectNewBoundRows == false)
+                {
+                    if (_Panel.ActiveRow != null)
+                        index = _Panel.ActiveRow.RowIndex;
+                    else
+                        index = -1;
+                }
+
+                if (index > _Panel.VirtualRowCount)
+                    index = _Panel.VirtualRowCount - 1;
+
+                if (index >= 0)
+                    SelectRow(_Panel, index);
+
+                return (null);
+            }
+            else
+            {
+                GridRow row = null;
+
+                object o = list[index];
+
+                if (o != _LastDataItemAdded)
+                {
+                    row = GetNewRow(o);
+
+                    row.DataItem = o;
+                    row.DataItemIndex = index;
+
+                    AddNestedLink(list, row);
+
+                    UpdateRowsDataIndex(index, 1);
+
+                    if (_Panel.IsGrouped == true)
+                    {
+                        _Panel.Rows.Insert(0, row);
+                    }
+                    else
+                    {
+                        _Panel.Rows.Insert(index, row);
+                        _Panel.UpdateRowPosition(row);
+
+                        index = row.RowIndex;
+                    }
+
+                    if (_Panel.AutoSelectNewBoundRows == true)
+                    {
+                        SelectRow(_Panel, index);
+                    }
+                    else
+                    {
+                        int selCount = _Panel.SelectedRowCount;
+                        ushort selUpdateCount = _Panel.SelectionUpdateCount;
+
+                        _Panel.ClearAll();
+
+                        SelectLastElement(selItem);
+
+                        if (selCount == 1)
+                            _Panel.SelectionUpdateCount = selUpdateCount;
+                    }
+                }
+                else
+                {
+                    row = UpdateDataGridRow(list, index);
+                }
+
+                _LastDataItemAdded = o;
+
+                return (row);
+            }
+        }
+
+        #region AddNestedLink
+
+        private void AddNestedLink(IList list, GridRow row)
+        {
+            if (_BaseDataSource is DataSet)
+                AddDataSetLink(row);
+
+            else if (_BaseDataSource is IBindingList)
+                AddIListLink(row);
+
+            else if (_BaseDataSource is IList)
+                AddIListLink(row);
+
+            else if (_BaseDataSource is IListSource)
+                AddIListLink(row);
+        }
+
+        #region AddDataSetLink
+
+        private void AddDataSetLink(GridRow row)
+        {
+            DataRowView view = row.DataItem as DataRowView;
+
+            if (view != null)
+            {
+                DataTable dt = view.DataView.Table;
+
+                if (dt != null)
+                {
+                    bool autogen = _Panel.AutoGenerateColumns;
+                    ProcessChildRelations crVisibility = _Panel.ProcessChildRelations;
+
+                    if (_Panel.SuperGrid.DoDataBindingStartEvent(
+                        _Panel, null, dt.TableName, ref autogen, ref crVisibility) == false)
+                    {
+                        AddDataTableLink(row, dt, autogen, crVisibility);
+                    }
+                }
+            }
+        }
+
+        #region AddDataTableLink
+
+        private void AddDataTableLink(GridRow row,
+            DataTable dt, bool autogen, ProcessChildRelations crProcess)
+        {
+            int pindex = (crProcess != ProcessChildRelations.Never) ? GetPrimaryColumnIndex(dt) : -1;
+
+            row.RowsUnresolved = (pindex >= 0 && dt.ChildRelations.Count > 0);
+
+            if (row.RowsUnresolved == true)
+            {
+                _Panel.ShowTreeButtons = true;
+                _Panel.ShowTreeLines = true;
+
+                _Panel.SuperGrid.BeforeExpand -= SuperGridBeforeExpand;
+                _Panel.SuperGrid.BeforeExpand += SuperGridBeforeExpand;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region AddIListLink
+
+        private void AddIListLink(GridRow row)
+        {
+            bool autogen = _Panel.AutoGenerateColumns;
+            ProcessChildRelations crVisibility = _Panel.ProcessChildRelations;
+
+            if (_Panel.SuperGrid.DoDataBindingStartEvent(
+                _Panel, null, null, ref autogen, ref crVisibility) == false)
+            {
+                AddIListLink(row, autogen, crVisibility);
+            }
+        }
+
+        #region AddIListLink
+
+        private void AddIListLink(GridRow row, bool autogen, ProcessChildRelations crProcess)
+        {
+            if (crProcess != ProcessChildRelations.Never)
+            {
+                bool rowsUnresolved = false;
+
+                if (row.DataItem != null)
+                {
+                    Type type = row.DataItem.GetType();
+
+                    if (type != null)
+                    {
+                        if (CheckNestedFields(row, type, crProcess) == false)
+                            CheckNestedProperties(row, type, crProcess);
+                    }
+
+                    rowsUnresolved |= row.RowsUnresolved;
+                }
+
+                if (rowsUnresolved == true)
+                {
+                    _Panel.ShowTreeButtons = true;
+                    _Panel.ShowTreeLines = true;
+
+                    _Panel.SuperGrid.BeforeExpand -= SuperGridBeforeExpand;
+                    _Panel.SuperGrid.BeforeExpand += SuperGridBeforeExpand;
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region DeleteDataGridRow
+
+        private void DeleteDataGridRow(int dataItemIndex)
+        {
+            GridRow row = FindDataGridRowIndex(dataItemIndex);
+
+            if (row != null)
+            {
+                if (row.DataItem != null)
+                {
+                    GridElement selItem = _Panel.SuperGrid.ActiveElement;
+
+                    UpdateRowsDataIndex(row.DataItemIndex, -1);
+
+                    row.DataItem = null;
+                    row.DataItemIndex = -1;
+
+                    int index = row.RowIndex;
+
+                    if (_Panel.VirtualMode == true)
+                    {
+                        _Panel.VirtualRows.MaxRowIndex = index - 1;
+                        _Panel.VirtualRowCount--;
+
+                        _Panel.InvalidateRender();
+
+                        if (_Panel.AutoSelectDeleteBoundRows == false)
+                        {
+                            if (_Panel.ActiveRow != null)
+                                index = _Panel.ActiveRow.RowIndex;
+                            else
+                                index = -1;
+                        }
+
+                        if (index > _Panel.VirtualRowCount)
+                            index = _Panel.VirtualRowCount - 1;
+
+                        if (index >= 0)
+                            SelectRow(_Panel, index);
+                    }
+                    else
+                    {
+                        GridContainer cont = (GridContainer) row.Parent;
+                        cont.Rows.RemoveAt(index);
+
+                        if (_Panel.AutoSelectDeleteBoundRows == true)
+                        {
+                            if (index >= cont.Rows.Count)
+                                index--;
+
+                            if ((uint)index < cont.Rows.Count)
+                            {
+                                SelectRow(cont, index);
+
+                                row = cont.Rows[index] as GridRow;
+
+                                if (row != null)
+                                    CurrencyManager.Position = row.DataItemIndex;
+                            }
+                        }
+                        else
+                        {
+                            SelectLastElement(selItem);
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region SelectLastElement
+
+        private void SelectLastElement(GridElement selItem)
+        {
+            _Panel.SuperGrid.NeedToUpdateIndicees = true;
+            _Panel.UpdateIndicees(_Panel, _Panel.Rows, true);
+
+            if (selItem is GridCell)
+                _Panel.SetSelected((GridCell)selItem, true);
+
+            else if (selItem is GridRow)
+                _Panel.SetSelected((GridRow)selItem, true);
+        }
+
+        #endregion
+
+        #region MoveDataGridRow
+
+        private void MoveDataGridRow(int oldDataIndex, int newDataIndex)
+        {
+            if (_Panel.VirtualMode == true)
+            {
+                _Panel.VirtualRows.Clear();
+            }
+            else
+            {
+                GridRow oldRow = FindDataGridRowIndex(oldDataIndex);
+                GridRow newRow = FindDataGridRowIndex(newDataIndex);
+
+                if (oldRow != null && newRow != null)
+                {
+                    GridContainer cont = (GridContainer) oldRow.Parent;
+
+                    int newIndex = newRow.RowIndex;
+
+                    if (oldRow.RowIndex < newRow.RowIndex)
+                    {
+                        for (int i = oldRow.RowIndex; i < newRow.RowIndex; i++)
+                        {
+                            cont.Rows[i] = cont.Rows[i + 1];
+
+                            ((GridRow) cont.Rows[i]).DataItemIndex--;
+                            ((GridRow) cont.Rows[i]).RowIndex--;
+                        }
+                    }
+                    else
+                    {
+                        for (int i = oldRow.RowIndex; i > newRow.RowIndex; i--)
+                        {
+                            cont.Rows[i] = cont.Rows[i - 1];
+
+                            ((GridRow) cont.Rows[i]).DataItemIndex++;
+                            ((GridRow) cont.Rows[i]).RowIndex++;
+                        }
+                    }
+
+                    cont.Rows[newIndex] = oldRow;
+
+                    newRow.RowIndex = newIndex;
+                    newRow.DataItemIndex = newDataIndex;
+                }
+            }
+        }
+
+        #endregion
+
+        #region UpdateDataGridRow
+
+        private GridRow UpdateDataGridRow(IList list, int dataIndex)
+        {
+            GridRow row = FindDataGridRowIndex(dataIndex);
+
+            if (row != null)
+                UpdateListRow(row, list[dataIndex]);
+
+            return (row);
+        }
+
+        #endregion
+
+        #region UpdateListRow
+
+        private void UpdateListRow(GridRow row, object o)
+        {
+            PropertyDescriptorCollection pdc = GetPdc(o);
+
+            foreach (GridColumn col in _Panel.Columns)
+            {
+                if (col.ColumnIndex < row.Cells.Count)
+                {
+                    PropertyDescriptor pd = FindPropertyDescriptor(pdc, col);
+
+                    if (pd != null)
+                    {
+                        object value = pd.GetValue(o);
+                        object value2 = row.Cells[col.ColumnIndex].ValueEx;
+
+                        row.Cells[col.ColumnIndex].ValueEx = value;
+
+                        if (col.Visible == true)
+                            row.Cells[col.ColumnIndex].InvalidateRender();
+
+                        int cval = -2;
+
+                        if (_Panel.GroupColumns.Contains(col) == true)
+                        {
+                            if ((cval = CompareVal.CompareTo(value, value2)) != 0)
+                                _Panel.NeedsGrouped = true;
+                        }
+
+                        if (_Panel.KeepRowsSorted == true)
+                        {
+                            if (col.IsSortColumn == true)
+                            {
+                                if (cval == -2)
+                                    cval = CompareVal.CompareTo(value, value2);
+
+                                if (cval != 0)
+                                {
+                                    if (row == _Panel.ActiveRow)
+                                        row.RowNeedsSorted = true;
+                                    else
+                                        _Panel.NeedsSorted = true;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
+            row.DataItem = o;
+
+            DataRowView drv = o as DataRowView;
+
+            if (drv != null)
+            {
+                if (drv.Row.RowState == DataRowState.Unchanged)
+                    row.RowDirty = false;
+            }
+
+            _Panel.NeedsFilterScan = true;
+        }
+
+        #endregion
+
+        #region UpdateGrouping
+
+        private void UpdateGrouping()
+        {
+            if (_Panel.GroupColumns.Count > 0)
+            {
+                _Panel.NeedsGrouped = true;
+
+                _Panel.InvalidateLayout();
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region FindDataGridRowIndex
+
+        private GridRow FindDataGridRowIndex(int dataItemIndex)
+        {
+            if (_Panel.ActiveRow != null)
+            {
+                GridRow row = _Panel.ActiveRow as GridRow;
+
+                if (row != null &&
+                    row.IsTempInsertRow == false && row.IsInsertRow == false)
+                {
+                    if (row.DataItemIndex == dataItemIndex)
+                        return (row);
+                }
+            }
+
+            if (_Panel.VirtualMode == true)
+                return (FindDataGridVirtualRowIndex(dataItemIndex));
+
+            return (FindDataGridRealRowIndex(_Panel.Rows, dataItemIndex));
+        }
+
+        private GridRow FindDataGridVirtualRowIndex(int dataItemIndex)
+        {
+            if ((uint)dataItemIndex < _Panel.VirtualRowCount)
+                return (_Panel.VirtualRows[dataItemIndex]);
+
+            return (null);
+        }
+
+        private GridRow FindDataGridRealRowIndex(
+            IEnumerable<GridElement> items, int dataItemIndex)
+        {
+            foreach (GridElement item in items)
+            {
+                if (item is GridRow)
+                {
+                    GridRow row = item as GridRow;
+
+                    if (row.IsTempInsertRow == false && row.IsInsertRow == false)
+                    {
+                        if (row.DataItemIndex == dataItemIndex)
+                            return (row);
+                    }
+                }
+                else if (item is GridGroup)
+                {
+                    GridRow row = FindDataGridRealRowIndex(((GridGroup)item).Rows, dataItemIndex);
+
+                    if (row != null)
+                        return (row);
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region FindDataGridRow
+
+        private GridRow FindDataGridRow(int dataItemIndex)
+        {
+            if (_Panel.ActiveRow != null)
+            {
+                GridRow row = _Panel.ActiveRow as GridRow;
+
+                if (row != null &&
+                    row.IsTempInsertRow == false && row.IsInsertRow == false)
+                {
+                    if (row.DataItem == CurrencyManager.List[dataItemIndex])
+                        return (row);
+                }
+            }
+
+            if (_Panel.VirtualMode == true)
+                return (FindDataGridVirtualRowIndex(dataItemIndex));
+
+            return (FindDataGridRealRow(_Panel.Rows, dataItemIndex));
+        }
+
+        #region FindDataGridRealRow
+
+        private GridRow FindDataGridRealRow(IEnumerable<GridElement> items, int dataItemIndex)
+        {
+            foreach (GridElement item in items)
+            {
+                if (item is GridRow)
+                {
+                    GridRow row = item as GridRow;
+
+                    if (row.IsTempInsertRow == false && row.IsInsertRow == false)
+                    {
+                        if (row.DataItem == CurrencyManager.List[dataItemIndex])
+                            return (row);
+                    }
+                }
+                else if (item is GridGroup)
+                {
+                    GridRow row = FindDataGridRealRowIndex(((GridGroup)item).Rows, dataItemIndex);
+
+                    if (row != null)
+                        return (row);
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region SelectRow
+
+        private void SelectRow(GridContainer cont, int index)
+        {
+            _Panel.LatentActiveContainer = cont;
+            _Panel.LatentActiveRowIndex = index;
+        }
+
+        #endregion
+
+        #region UpdateRowsDataIndex
+
+        private void UpdateRowsDataIndex(int index, int n)
+        {
+            if (_Panel.VirtualMode == false)
+                UpdateRowsDataIndexEx(_Panel.Rows, index, n);
+        }
+
+        private void UpdateRowsDataIndexEx(
+            IEnumerable<GridElement> items, int index, int n)
+        {
+            foreach (GridContainer item in items)
+            {
+                GridRow row = item as GridRow;
+
+                if (row != null)
+                {
+                    if (row.DataItemIndex >= index)
+                        row.DataItemIndex += n;
+                }
+
+                if (item.Rows.Count > 0)
+                    UpdateRowsDataIndexEx(item.Rows, index, n);
+            }
+        }
+
+        #endregion
+
+        #region RemoveRow
+
+        internal void RemoveRow(GridRow row)
+        {
+            if (CurrencyManager != null)
+            {
+                UpdateInProgress = true;
+                UpdatePosInProgress = true;
+
+                try
+                {
+                    int index = row.DataItemIndex;
+
+                    CurrencyManager.RemoveAt(index);
+                }
+                finally
+                {
+                    UpdateInProgress = false;
+                    UpdatePosInProgress = false;
+
+                    _Panel.UpdateRowCount();
+                }
+
+                if (row.DataItem != null)
+                    UpdateRowsDataIndex(row.DataItemIndex, -1);
+            }
+        }
+
+        #endregion
+
+        #region InsertRow
+
+        internal void InsertRow(int index, GridRow row)
+        {
+            if (CurrencyManager != null && _Pdc != null)
+            {
+                if (index > CurrencyManager.Count)
+                    index = CurrencyManager.Count;
+
+                UpdateInProgress = true;
+                UpdatePosInProgress = true;
+
+                object dataSource = _Panel.DataSource;
+                string dataMember = _Panel.DataMember;
+
+                try
+                {
+                    while (dataSource is BindingSource)
+                    {
+                        BindingSource bs = (BindingSource)dataSource;
+ 
+                        dataSource = bs.DataSource;
+
+                        if (dataMember == null)
+                            dataMember = bs.DataMember;
+                    }
+
+                    if (dataSource is DataSet)
+                        InsertDataSetRow((DataSet)dataSource, dataMember, index, row);
+
+                    else if (dataSource is DataTable)
+                        InsertDataTableRow((DataTable)dataSource, index, row);
+
+                    else
+                        InsertListRow(index, row);
+                }
+                finally
+                {
+                    UpdateInProgress = false;
+                    UpdatePosInProgress = false;
+                }
+            }
+        }
+
+        #region InsertDataSetRow
+
+        private void InsertDataSetRow(DataSet dataSet,
+            string dataMember, int index, GridRow row)
+        {
+            DataTable table = GetDataTable(dataSet, dataMember);
+
+            if (table != null)
+                InsertDataTableRow(table, index, row);
+        }
+
+        #endregion
+
+        #region InsertDataTableRow
+
+        private void InsertDataTableRow(DataTable table, int index, GridRow row)
+        {
+            DataRow drow = _TempDataRow ?? table.NewRow();
+
+            _TempDataRow = null;
+
+            for (int i = 0; i < Pdc.Count; i++)
+            {
+                PropertyDescriptor pd = Pdc[i];
+
+                GridColumn col = FindGridColumn(_Panel, pd.Name);
+
+                if (col != null)
+                {
+                    object value = (col.ColumnIndex < row.Cells.Count) ?
+                        row.Cells[col.ColumnIndex].ValueEx ?? DBNull.Value : DBNull.Value;
+
+                    drow[i] = value;
+                }
+            }
+
+            UpdateRowsDataIndex(index, 1);
+
+            row.DataItem = drow;
+            row.DataItemIndex = index;
+
+            if (index < CurrencyManager.Count)
+            {
+                DataRowView drv = CurrencyManager.List[index] as DataRowView;
+
+                if (drv != null)
+                {
+                    int idx = table.Rows.IndexOf(drv.Row);
+
+                    if (idx >= 0)
+                        index = idx;
+                }
+
+                table.Rows.InsertAt(drow, index);
+            }
+            else
+            {
+                table.Rows.Add(drow);
+            }
+        }
+
+        #endregion
+
+        #region InsertListRow
+
+        private void InsertListRow(int index, GridRow row)
+        {
+            if (Pdc.Count > 0)
+            {
+                Type type = Pdc[0].ComponentType;
+
+                object item;
+
+                if (type == typeof(DataRowView))
+                    item = ((DataView)_BaseDataSource).AddNew();
+                else
+                    item = Activator.CreateInstance(type);
+
+                for (int i = 0; i < Pdc.Count; i++)
+                {
+                    PropertyDescriptor pd = Pdc[i];
+
+                    GridColumn col = FindGridColumn(_Panel, pd.Name);
+
+                    if (col != null)
+                    {
+                        object o = row.Cells[col.ColumnIndex].ValueEx;
+
+                        if (o != null && o is DBNull == false)
+                            pd.SetValue(item, o);
+                    }
+                }
+
+                UpdateRowsDataIndex(index, 1);
+
+                row.DataItem = item;
+                row.DataItemIndex = index;
+
+                _UpdatePosInProgress = true;
+
+                if (type != typeof(DataRowView))
+                {
+                    if (CurrencyManager != null)
+                        CurrencyManager.List.Insert(index, item);
+                }
+                else
+                {
+                    DataRowView dv = (DataRowView)item;
+
+                    dv.EndEdit();
+                }
+
+                _UpdatePosInProgress = false;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetDefaultValues
+
+        internal void GetDefaultValues(GridRow row)
+        {
+            if (CurrencyManager != null)
+            {
+                object dataSource = _Panel.DataSource;
+                string dataMember = _Panel.DataMember;
+
+                while (dataSource is BindingSource)
+                {
+                    BindingSource bs = (BindingSource) dataSource;
+
+                    dataSource = bs.DataSource;
+
+                    if (dataMember == null)
+                        dataMember = bs.DataMember;
+                }
+
+                if (dataSource is DataSet)
+                    GetDataSetDefaultValues((DataSet) dataSource, dataMember, row);
+
+                else if (dataSource is DataTable)
+                    GetTableDefaultValues((DataTable)dataSource, row);
+            }
+
+            GridColumnCollection columns = _Panel.Columns;
+
+            for (int i = 0; i < columns.Count; i++)
+            {
+                if (columns[i].DefaultNewRowCellValue != null)
+                    row.Cells[i].ValueEx = columns[i].DefaultNewRowCellValue;
+            }
+
+            if (_Panel.SuperGrid != null)
+                _Panel.SuperGrid.DoRowSetDefaultValuesEvent(_Panel, row, NewRowContext.RowInit);
+        }
+
+        #region GetDataSetDefaultValues
+
+        private void GetDataSetDefaultValues
+            (DataSet dataSet, string dataMember, GridRow row)
+        {
+            DataTable table = GetDataTable(dataSet, dataMember);
+
+            if (table != null)
+                GetTableDefaultValues(table, row);
+        }
+
+        #endregion
+
+        #region GetTableDefaultValues
+
+        private void GetTableDefaultValues(DataTable table, GridRow row)
+        {
+            _TempDataRow = table.NewRow();
+
+            UpdateForeignKey(table, _TempDataRow);
+
+            for (int i = 0; i < Pdc.Count; i++)
+            {
+                GridColumn col = FindGridColumn(_Panel, Pdc[i].Name);
+
+                if (col != null)
+                {
+                    if (col.ColumnIndex < row.Cells.Count)
+                        row.Cells[col.ColumnIndex].ValueEx = _TempDataRow[i];
+                }
+            }
+        }
+
+        #region UpdateForeignKey
+
+        private void UpdateForeignKey(DataTable table, DataRow drow)
+        {
+            DataRelation dataRel = _Panel.DataRelation;
+
+            if (dataRel != null && 
+                dataRel.ParentColumns != null && dataRel.ChildColumns != null)
+            {
+                BindingSource bs = _Panel.DataSource as BindingSource;
+
+                if (bs != null)
+                {
+                    bs = bs.DataSource as BindingSource;
+
+                    if (bs != null && bs.Current != null)
+                        UpdateDataRowForeignKey(dataRel, drow, bs.Current);
+                }
+				else
+                {
+                    GridRow row = _Panel.Parent as GridRow;
+
+                    if (row != null)
+                        UpdateDataRowForeignKey(dataRel, drow, row.DataItem);
+                }
+            }
+        }
+
+        #region UpdateDataRowForeignKey
+
+        private void UpdateDataRowForeignKey(
+            DataRelation dataRel, DataRow drow, object item)
+        {
+            DataRowView drv = item as DataRowView;
+
+            if (drv != null)
+            {
+                for (int i = 0; i < dataRel.ParentColumns.Length; i++)
+                {
+                    if (i < dataRel.ChildColumns.Length)
+                    {
+                        drow[dataRel.ChildColumns[i].ColumnName] =
+                            drv[dataRel.ParentColumns[i].ColumnName];
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region GetDataTable
+
+        private DataTable GetDataTable(DataSet dataSet, string dataMember)
+        {
+            if (string.IsNullOrEmpty(dataMember) && dataSet.Tables.Count > 0)
+                dataMember = dataSet.Tables[0].TableName;
+
+            if (_Panel.DataRelation == null)
+                _Panel.DataRelation = dataSet.Relations[dataMember];
+
+            DataTable table = (_Panel.DataRelation != null)
+                ? _Panel.DataRelation.ChildTable : dataSet.Tables[dataMember];
+
+            return (table);
+        }
+
+        #endregion
+
+        #region ReloadRow
+
+        internal void ReloadRow(GridRow row)
+        {
+            if (CurrencyManager != null && _Pdc != null)
+            {
+                if ((uint)row.RowIndex < CurrencyManager.List.Count)
+                {
+                    PropertyDescriptorCollection pdc = GetPdc(row.DataItem);
+
+                    foreach (GridCell cell in row.Cells)
+                    {
+                        GridColumn col = _Panel.Columns[cell.ColumnIndex];
+                        PropertyDescriptor pd = FindPropertyDescriptor(pdc, col);
+
+                        if (pd != null)
+                            cell.ValueEx = pd.GetValue(row.DataItem);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region UpdateSuperGridSort
+
+        private void UpdateSuperGridSort(bool reset)
+        {
+            if (reset == true ||
+                (_Panel.SortColumns == null || _Panel.SortColumns.Count == 0))
+            {
+                if (CurrencyManager != null)
+                {
+                    if (_BaseDataSource is DataView)
+                    {
+                        SetSuperGridDataSetSort(((DataView)_BaseDataSource).Sort);
+                    }
+                    else if (_BaseDataSource is IBindingList)
+                    {
+                        SetSuperGridListSort((IBindingList)_BaseDataSource);
+                    }
+                    else if (_BaseDataSource is IListSource)
+                    {
+                        IList list = ((IListSource)_BaseDataSource).GetList();
+
+                        if (list is IBindingList)
+                            SetSuperGridListSort((IBindingList)list);
+                    }
+                }
+            }
+        }
+
+        #region SetSuperGridDataSetSort
+
+        private void SetSuperGridDataSetSort(string sort)
+        {
+            _Panel.ClearSort();
+
+            if (string.IsNullOrEmpty(sort) == false)
+            {
+                const string cref = @"((\[(?<name>\w+)\])|(?<name>\w+))\s*(?<order>ASC|DESC)*";
+
+                Regex p = new Regex(cref);
+                MatchCollection mc = p.Matches(sort);
+
+                foreach (Match ma in mc)
+                {
+                    GridColumn col = FindGridColumn(_Panel, ma.Groups["name"].Value);
+
+                    if (col != null)
+                    {
+                        SortDirection dir = SortDirection.Ascending;
+
+                        Group grp = ma.Groups["order"];
+
+                        if (grp != null)
+                        {
+                            dir = grp.Value.Equals("DESC")
+                                ? SortDirection.Descending : SortDirection.Ascending;
+                        }
+
+                        _Panel.AddSort(col, dir);
+                    }
+                }
+
+                _Panel.SuperGrid.DoRowsSortedEvent(_Panel);
+            }
+
+            _Panel.NeedsSorted = false;
+        }
+
+        #endregion
+
+        #region SetSuperGridListSort
+
+        private void SetSuperGridListSort(IBindingList list)
+        {
+            _Panel.ClearSort();
+
+            if (list.SupportsSorting == true && list.IsSorted == true)
+            {
+                if (list.SortProperty != null)
+                {
+                    string name = list.SortProperty.Name;
+
+                    GridColumn col = FindGridColumn(_Panel, name);
+
+                    if (col != null)
+                    {
+                        SortDirection dir = (list.SortDirection == ListSortDirection.Ascending)
+                                                ? SortDirection.Ascending
+                                                : SortDirection.Descending;
+
+                        _Panel.AddSort(col, dir);
+                    }
+
+                    _Panel.SuperGrid.DoRowsSortedEvent(_Panel);
+                }
+            }
+
+            _Panel.NeedsSorted = false;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region UpdateDataSourceSort
+
+        internal void UpdateDataSourceSort()
+        {
+            if (CurrencyManager != null)
+            {
+                if (CurrencyManager.List.Count > 0)
+                {
+                    DataRowView drv = CurrencyManager.List[0] as DataRowView;
+
+                    if (drv != null)
+                    {
+                        string sort = GetSortString(drv);
+
+                        drv.DataView.Sort = sort;
+                    }
+                    else if (_BaseDataSource is IBindingList)
+                        UpdateListSort((IBindingList)_BaseDataSource);
+
+                    else if (_BaseDataSource is IListSource)
+                    {
+                        IList list = ((IListSource)_BaseDataSource).GetList();
+
+                        if (list is IBindingList)
+                            UpdateListSort((IBindingList)list);
+                    }
+                }
+
+                if (_Panel.VirtualMode == true)
+                    _Panel.VirtualRows.Clear();
+            }
+        }
+
+        #endregion
+
+        #region UpdateListSort
+
+        private void UpdateListSort(IBindingList iBindingList)
+        {
+            if (iBindingList.SupportsSorting == true)
+            {
+                List<GridColumn> sortColumns = _Panel.SortColumns;
+
+                if (sortColumns != null && sortColumns.Count > 0)
+                {
+                    IBindingListView blv = iBindingList as IBindingListView;
+
+                    if (blv != null && blv.SupportsAdvancedSorting == true)
+                    {
+                        PropertyDescriptorCollection pdc = GetPdc(null);
+
+                        ListSortDescription[] lsd = new ListSortDescription[sortColumns.Count];
+
+                        for (int i = 0; i < sortColumns.Count; i++)
+                        {
+                            GridColumn col = sortColumns[i];
+
+                            PropertyDescriptor pd = FindPropertyDescriptor(pdc, col);
+
+                            ListSortDirection dir = (col.SortDirection == SortDirection.Ascending)
+                                                        ? ListSortDirection.Ascending
+                                                        : ListSortDirection.Descending;
+
+                            lsd[i] = new ListSortDescription(pd, dir);
+                        }
+
+                        blv.ApplySort(new ListSortDescriptionCollection(lsd));
+                    }
+                    else
+                    {
+                        GridColumn col = sortColumns[0];
+
+                        PropertyDescriptorCollection pdc = GetPdc(null);
+                        PropertyDescriptor pd = FindPropertyDescriptor(pdc, col);
+
+                        if (pd != null)
+                        {
+                            ListSortDirection dir = (col.SortDirection == SortDirection.Ascending)
+                                                        ? ListSortDirection.Ascending
+                                                        : ListSortDirection.Descending;
+
+                            iBindingList.ApplySort(pd, dir);
+                        }
+                    }
+                }
+                else if (iBindingList.IsSorted == true)
+                {
+                    iBindingList.RemoveSort();
+                }
+            }
+        }
+
+        #endregion
+
+        #region GetSortString
+
+        private string GetSortString(DataRowView drv)
+        {
+            List<GridColumn> sortColumns = _Panel.SortColumns;
+
+            if (sortColumns != null && sortColumns.Count > 0)
+            {
+                StringBuilder sb = new StringBuilder();
+
+                foreach (GridColumn column in sortColumns)
+                    GetColumnSort(drv, column, sb);
+
+                if (sb.Length > 0)
+                    sb.Length--;
+
+                return (sb.ToString());
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetColumnSort
+
+        private void GetColumnSort(
+            DataRowView drv, GridColumn column, StringBuilder sb)
+        {
+            DataColumn dc = FindDataColumn(drv.DataView.Table, column);
+
+            if (dc != null)
+            {
+                sb.Append("[");
+                sb.Append(dc.ColumnName);
+                sb.Append("]");
+                sb.Append(column.SortDirection == SortDirection.Ascending ? " ASC," : " DESC,");
+            }
+        }
+
+        #endregion
+
+        #region FlushRow
+
+        internal bool FlushRow()
+        {
+            if (CurrencyManager != null)
+            {
+                while (true)
+                {
+                    _UpdateInProgress = true;
+                    _UpdatePosInProgress = true;
+
+                    try
+                    {
+                        CurrencyManager.EndCurrentEdit();
+                        break;
+                    }
+                    catch (Exception exp)
+                    {
+                        GridRow crow = null;
+
+                        if ((uint) CurrencyManager.Position < _Panel.Rows.Count)
+                        {
+                            crow = _Panel.Rows[CurrencyManager.Position] as GridRow;
+
+                            if (crow != null)
+                                ReloadRow(crow);
+                        }
+
+                        bool retry = false;
+                        bool throwException = false;
+
+                        if (_Panel.SuperGrid.HasDataErrorHandler == true)
+                        {
+                            object value = crow;
+
+                            if (_Panel.SuperGrid.DoDataErrorEvent(_Panel, null, exp,
+                                DataContext.RowFlush, ref value,
+                                ref throwException, ref retry) == true)
+                            {
+                                return (false);
+                            }
+                        }
+
+                        if (throwException == true)
+                            throw;
+
+                        if (retry == false)
+                            return (false);
+                    }
+                    finally
+                    {
+                        _UpdateInProgress = false;
+                        _UpdatePosInProgress = false;
+                    }
+                }
+            }
+
+            return (true);
+        }
+
+        #endregion
+
+        #region SuperGridLoadVirtualRow
+
+        void SuperGridLoadVirtualRow(object sender, GridVirtualRowEventArgs e)
+        {
+            if (CurrencyManager != null && _Pdc != null)
+            {
+                GridRow row = e.GridRow;
+                GridRow vrow = _Panel.VirtualTempInsertRow;
+
+                int index = e.Index;
+
+                if (vrow != null)
+                {
+                    if (index == vrow.RowIndex)
+                    {
+                        for (int i = 0; i < _Panel.Columns.Count; i++)
+                            row.Cells[i].ValueEx = vrow.Cells[i].Value;
+
+                        row.RowNeedsSorted = true;
+                        row.RowNeedsStored = true;
+                        row.IsTempInsertRow = vrow.IsTempInsertRow;
+
+                        return;
+                    }
+
+                    if (index > vrow.RowIndex)
+                        index--;
+                }
+
+                if (index == _Panel.VirtualRowCount)
+                {
+                    if (_Panel.ShowInsertRow == true)
+                    {
+                        vrow = _Panel.VirtualInsertRow;
+
+                        if (vrow != null)
+                        {
+                            for (int i = 0; i < _Panel.Columns.Count; i++)
+                                row.Cells[i].ValueEx = vrow.Cells[i].Value;
+
+                            row.RowNeedsSorted = true;
+                            row.RowNeedsStored = true;
+                            row.IsTempInsertRow = vrow.IsTempInsertRow;
+
+                            return;
+                        }
+                    }
+                }
+
+                if ((uint)index < CurrencyManager.List.Count)
+                {
+                    row.DataItem = CurrencyManager.List[index];
+                    row.DataItemIndex = index;
+
+                    PropertyDescriptorCollection pdc = GetPdc(row.DataItem);
+
+                    foreach (GridColumn col in _Panel.Columns)
+                    {
+                        PropertyDescriptor pd = FindPropertyDescriptor(pdc, col);
+
+                        if (pd != null)
+                            row.Cells[col.ColumnIndex].ValueEx = pd.GetValue(row.DataItem);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region Filter management
+
+        #region UpdateFilter
+
+        private bool _UpdatingFilter;
+
+        internal void UpdateFilter()
+        {
+            if (CurrencyManager != null)
+            {
+                DataTable dt = null;
+
+                if (_BaseDataSource is DataSet)
+                {
+                    DataSet dataSet = _BaseDataSource as DataSet;
+                    string dataMember = _BaseDataMember;
+
+                    if (string.IsNullOrEmpty(dataMember) && dataSet.Tables.Count > 0)
+                        dataMember = dataSet.Tables[0].TableName;
+
+                    if (string.IsNullOrEmpty(dataMember) == false)
+                        dt = dataSet.Tables[dataMember];
+                }
+                else if (_BaseDataSource is DataTable)
+                {
+                    dt = _BaseDataSource as DataTable;
+                }
+
+                if (dt != null)
+                {
+                    _UpdatingFilter = true;
+
+                    try
+                    {
+                        dt.DefaultView.RowFilter = GetDataViewRowFilter();
+                    }
+                    catch (Exception exp)
+                    {
+                        MessageBoxEx.Show(exp.Message);
+                    }
+                    finally
+                    {
+                        Refresh();
+
+                        _UpdatingFilter = false;
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region GetDataViewRowFilter
+
+        private string GetDataViewRowFilter()
+        {
+            StringBuilder sb = new StringBuilder();
+
+            if (String.IsNullOrEmpty(_Panel.FilterExpr) == false)
+            {
+                sb.Append("(");
+                sb.Append(_Panel.FilterExpr);
+                sb.Append(") && ");
+            }
+
+            foreach (GridColumn col in _Panel.Columns)
+            {
+                if (String.IsNullOrEmpty(col.FilterExpr) == false)
+                {
+                    sb.Append("(");
+                    sb.Append(col.FilterExpr);
+                    sb.Append(") and ");
+                }
+            }
+
+            if (sb.Length > 0)
+                sb.Length -= 4;
+
+            string s = sb.ToString();
+
+            return (s);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Begin/EndUpdate
+
+        internal void BeginUpdate()
+        {
+            _BeginUpdateCount++;
+        }
+
+        internal void EndUpdate()
+        {
+            if (_BeginUpdateCount > 0)
+            {
+                --_BeginUpdateCount;
+
+                if (_BeginUpdateCount == 0)
+                    Refresh();
+            }
+        }
+
+        #endregion
+
+        #region Refresh
+
+        private void Refresh()
+        {
+            if (CurrencyManager != null)
+            {
+                CurrencyManager.Refresh();
+
+                if (_Panel.VirtualMode == true)
+                    _Panel.VirtualRowCount = _CurrencyManager.Count;
+            }
+
+            _Panel.UpdateRowCount();
+        }
+
+        #endregion
+
+        #region Dispose
+
+        /// <summary>
+        /// Data Binder Dispose
+        /// </summary>
+        public void Dispose()
+        {
+            Clear();
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/EEval.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/EEval.cs
new file mode 100644
index 00000000..7bb3247e
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/EEval.cs	
@@ -0,0 +1,1374 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Text.RegularExpressions;
+
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    /// <summary>
+    /// Expression evaluator
+    /// </summary>
+    public class EEval
+    {
+        #region Private data
+
+        private int _TCount;
+        private int _PCount;
+        private ETokens[] _PTokens = new ETokens[10];
+        private List<ETokens> _PfTokens = new List<ETokens>();
+
+        private GridCell _Cell;
+        private GridPanel _GridPanel;
+        private List<GridCell> _UsedCells;
+
+        private string _Source;
+        private List<string> _StringPool = new List<string>();
+
+        private object _Tag;
+
+        #endregion
+
+        ///<summary>
+        /// Expression evaluator constructor
+        ///</summary>
+        ///<param name="gridPanel">Associated GridPanel</param>
+        ///<param name="source">'Excel-like' expression (eg. =d4+d5)</param>
+        public EEval(GridPanel gridPanel, string source)
+            : this(null, source, new List<GridCell>())
+        {
+            _GridPanel = gridPanel;
+        }
+
+        internal EEval(GridCell cell, string source)
+            : this(cell, source, new List<GridCell>())
+        {
+        }
+
+        private EEval(GridCell cell, string source, List<GridCell> usedCells)
+        {
+            _Cell = cell;
+            _UsedCells = usedCells;
+
+            if (_Cell != null)
+                _GridPanel = cell.GridPanel;
+
+            Source = source;
+        }
+
+        #region Public properties
+
+        #region Cell
+
+        ///<summary>
+        /// Gets the associated Grid Cell, if any
+        ///</summary>
+        public GridCell Cell
+        {
+            get { return (_Cell); }
+        }
+
+        #endregion
+
+        #region GridPanel
+
+        ///<summary>
+        /// Gets the associated Grid Panel
+        ///</summary>
+        public GridPanel GridPanel
+        {
+            get { return (_GridPanel); }
+        }
+
+        #endregion
+
+        #region Source
+
+        ///<summary>
+        /// Gets or sets the expression source
+        ///</summary>
+        public string Source
+        {
+            get { return (_Source); }
+
+            set
+            {
+                _Source = value;
+
+                Tokenize(value);
+            }
+        }
+
+        #endregion
+
+        #region Tag
+
+        ///<summary>
+        /// Gets or sets user-defined data associated with the object
+        ///</summary>
+        public object Tag
+        {
+            get { return (_Tag); }
+            set { _Tag = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Tokenize code
+
+        private void Tokenize(string source)
+        {
+            const string sref = @"([\.]|[a-zA-Z_]+|""[^""]+"")\s*([\.]|\d+)";
+
+            Regex p = new Regex(
+                "(" + sref + "\\s*:\\s*" + sref + ")|(" + sref + ")|" +
+                "([a-zA-Z0-9.]+)|" +
+                "\"([^\"]+)\"|" +
+                "([()+\\-*/%,|&\\^])|(<<)|(>>)");
+
+            MatchCollection mc = p.Matches(source);
+
+            Expr(mc);
+
+            ETokens t = GetToken(mc);
+
+            if (t != ETokens.BadToken)
+                throw new Exception("Expression error.");
+        }
+
+        #region Expr
+
+        /// <summary>
+        /// Main expression entry routine
+        /// </summary>
+        private void Expr(MatchCollection mc)
+        {
+            Term1(mc);
+
+            ETokens t = GetToken(mc);
+
+            while (t == ETokens.BitwiseOr)
+            {
+                Term1(mc);
+
+                _PfTokens.Add(t);
+
+                t = GetToken(mc);
+            }
+
+            PutToken(t);
+        }
+
+        #endregion
+
+        #region Term1
+
+        /// <summary>
+        /// Handles the ^ operator
+        /// </summary>
+        private void Term1(MatchCollection mc)
+        {
+            Term2(mc);
+
+            ETokens t = GetToken(mc);
+
+            while (t == ETokens.BitwiseXor)
+            {
+                Term2(mc);
+
+                _PfTokens.Add(t);
+
+                t = GetToken(mc);
+            }
+
+            PutToken(t);
+        }
+
+        #endregion
+
+        #region Term2
+
+        /// <summary>
+        /// Handles the Ampersand operator
+        /// </summary>
+        private void Term2(MatchCollection mc)
+        {
+            Term3(mc);
+
+            ETokens t = GetToken(mc);
+
+            while (t == ETokens.BitwiseAnd)
+            {
+                Term3(mc);
+
+                _PfTokens.Add(t);
+
+                t = GetToken(mc);
+            }
+
+            PutToken(t);
+        }
+
+        #endregion
+
+        #region Term3
+
+        /// <summary>
+        /// Handles the shift left and right operators
+        /// </summary>
+        private void Term3(MatchCollection mc)
+        {
+            Term4(mc);
+
+            ETokens t = GetToken(mc);
+
+            while (t == ETokens.ShiftLeft || t == ETokens.ShiftRight)
+            {
+                Term4(mc);
+
+                _PfTokens.Add(t);
+
+                t = GetToken(mc);
+            }
+
+            PutToken(t);
+        }
+
+        #endregion
+
+        #region Term4
+
+        /// <summary>
+        /// Handles %, *, and / operators
+        /// </summary>
+        private void Term4(MatchCollection mc)
+        {
+            Term5(mc);
+
+            ETokens t = GetToken(mc);
+
+            while (t == ETokens.Add || t == ETokens.Subtract)
+            {
+                Term5(mc);
+
+                _PfTokens.Add(t);
+
+                t = GetToken(mc);
+            }
+
+            PutToken(t);
+        }
+
+        #endregion
+
+        #region Term5
+
+        /// <summary>
+        /// Handles %, *, and / operators
+        /// </summary>
+        private void Term5(MatchCollection mc)
+        {
+            Factor(mc);
+
+            ETokens t = GetToken(mc);
+
+            while (t == ETokens.Mod ||
+                t == ETokens.Multiply || t == ETokens.Divide)
+            {
+                Factor(mc);
+
+                _PfTokens.Add(t);
+
+                t = GetToken(mc);
+            }
+
+            PutToken(t);
+        }
+
+        #endregion
+
+        #region Factor
+
+        /// <summary>
+        /// Handles factor processing
+        /// </summary>
+        private void Factor(MatchCollection mc)
+        {
+            ETokens t = GetToken(mc);
+
+            int n = 0;
+
+            // Unary operators
+
+            while (t == ETokens.Add || t == ETokens.Subtract)
+            {
+                if (t == ETokens.Subtract)
+                    n++;
+
+                t = GetToken(mc);
+            }
+
+            // Operand processing
+
+            if (t < ETokens.Operator)
+            {
+                if (Function(mc, t) == false)
+                    _PfTokens.Add(t);
+            }
+            else if (t == ETokens.LParen)
+            {
+                Expr(mc);
+
+                t = GetToken(mc);
+
+                if (t != ETokens.RParen)
+                    throw new Exception("Expecting right parenthesis.");
+            }
+            else
+            {
+                PutToken(t);
+            }
+
+            if (n % 2 == 1)
+            {
+                if (_PfTokens.Count == 0)
+                    throw new Exception("Invalid expression.");
+
+                _PfTokens.Add(ETokens.Negate);
+            }
+        }
+
+        #endregion
+
+        #region Function
+
+        /// <summary>
+        /// Handles function parsing
+        /// </summary>
+        /// <param name="mc"></param>
+        /// <param name="e"></param>
+        /// <returns></returns>
+        private bool Function(MatchCollection mc, ETokens e)
+        {
+            string s = _StringPool[(int)e].ToUpper();
+
+            ETokens t = GetFunction(mc, s);
+
+            if (t != ETokens.BadToken)
+            {
+                _PfTokens.Add(t);
+
+                t = GetToken(mc);
+
+                if (t != ETokens.LParen)
+                    throw new Exception("Expecting left parenthesis.");
+
+                ParameterList(mc, e);
+
+                t = GetToken(mc);
+
+                if (t != ETokens.RParen)
+                    throw new Exception("Expecting right parenthesis.");
+
+                return (true);
+            }
+
+            return (false);
+        }
+
+        #region GetFunction
+
+        /// <summary>
+        /// Determines whether the parsed string
+        /// is a one of our function keywords
+        /// </summary>
+        /// <param name="mc"></param>
+        /// <param name="s"></param>
+        /// <returns></returns>
+        private ETokens GetFunction(MatchCollection mc, string s)
+        {
+            ETokens t = GetToken(mc);
+
+            if (t == ETokens.LParen)
+            {
+                PutToken(t);
+
+                switch (s)
+                {
+                    case "AVG":
+                        return (ETokens.Avg);
+
+                    case "CEILING":
+                        return (ETokens.Ceiling);
+
+                    case "FLOOR":
+                        return (ETokens.Floor);
+
+                    case "MIN":
+                        return (ETokens.Min);
+
+                    case "MAX":
+                        return (ETokens.Max);
+
+                    case "ROUND":
+                        return (ETokens.Round);
+
+                    case "SUM":
+                        return (ETokens.Sum);
+
+                    default:
+                        return (ETokens.User);
+                }
+            }
+
+            PutToken(t);
+
+            return (ETokens.BadToken);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ParameterList
+
+        /// <summary>
+        /// Handles function parameters
+        /// </summary>
+        private void ParameterList(MatchCollection mc, ETokens e)
+        {
+            int n = 0;
+
+            if (_PfTokens[_PfTokens.Count - 1] == ETokens.User)
+            {
+                _PfTokens.Add(e);
+                n++;
+            }
+
+            ETokens t = GetToken(mc);
+
+            while (t != ETokens.RParen && t != ETokens.BadToken)
+            {
+                PutToken(t);
+
+                int count = _PfTokens.Count;
+
+                Expr(mc);
+
+                if (_PfTokens.Count > count)
+                    n++;
+
+                t = GetToken(mc);
+
+                if (t != ETokens.Comma)
+                    break;
+
+                t = GetToken(mc);
+            }
+
+            PutToken(t);
+
+            _PfTokens.Add(ETokens.Function);
+            _PfTokens.Add((ETokens) n);
+        }
+
+        #endregion
+
+        #region GetToken
+
+        /// <summary>
+        /// Gets the next parsed token
+        /// </summary>
+        /// <returns></returns>
+        private ETokens GetToken(MatchCollection mc)
+        {
+            ETokens t = ETokens.BadToken;
+
+            if (_PCount > 0)
+            {
+                t = _PTokens[--_PCount];
+            }
+            else
+            {
+                if (_TCount < mc.Count)
+                {
+                    string s = mc[_TCount].Value;
+
+                    switch (s)
+                    {
+                        case "|":
+                            t = ETokens.BitwiseOr;
+                            break;
+
+                        case "^":
+                            t = ETokens.BitwiseXor;
+                            break;
+
+                        case "&":
+                            t = ETokens.BitwiseAnd;
+                            break;
+
+                        case "<<":
+                            t = ETokens.ShiftLeft;
+                            break;
+
+                        case ">>":
+                            t = ETokens.ShiftRight;
+                            break;
+
+                        case "+":
+                            t = ETokens.Add;
+                            break;
+
+                        case "-":
+                            t = ETokens.Subtract;
+                            break;
+
+                        case "*":
+                            t = ETokens.Multiply;
+                            break;
+
+                        case "/":
+                            t = ETokens.Divide;
+                            break;
+
+                        case "%":
+                            t = ETokens.Mod;
+                            break;
+
+                        case "(":
+                            t = ETokens.LParen;
+                            break;
+
+                        case ")":
+                            t = ETokens.RParen;
+                            break;
+
+                        case ",":
+                            t = ETokens.Comma;
+                            break;
+
+                        default:
+                            int index = _StringPool.IndexOf(s);
+
+                            if (index < 0)
+                            {
+                                _StringPool.Add(s);
+
+                                index = _StringPool.Count - 1;
+                            }
+
+                            t = (ETokens)(index);
+                            break;
+                    }
+
+                    _TCount++;
+                }
+            }
+
+            return (t);
+        }
+
+        #endregion
+
+        #region PutToken
+
+        /// <summary>
+        /// Saves the given token for future use
+        /// </summary>
+        /// <param name="t"></param>
+        private void PutToken(ETokens t)
+        {
+            _PTokens[_PCount++] = t;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Evaluate
+
+        /// <summary>
+        /// Evaluates the previously tokenized code
+        /// </summary>
+        /// <returns></returns>
+        public object Evaluate()
+        {
+            _UsedCells.Clear();
+
+            if (_Cell != null)
+                _UsedCells.Add(_Cell);
+
+            return (EvaluateEx());
+        }
+
+        internal object EvaluateEx()
+        {
+            Stack myStack = new Stack();
+
+            for (int i = 0; i < _PfTokens.Count; i++)
+            {
+                if (_PfTokens[i] < ETokens.Operator)
+                {
+                    myStack.Push(_StringPool[(int)_PfTokens[i]]);
+                }
+                else if (_PfTokens[i] > ETokens.Functions)
+                {
+                    myStack.Push(_PfTokens[i]);
+                }
+                else
+                {
+                    if (_PfTokens[i] == ETokens.Negate)
+                    {
+                        object value = ProcessValue(myStack.Pop());
+
+                        if (value is double == false)
+                            throw new Exception("Invalid negation value");
+
+                        myStack.Push(-(double)value);
+                    }
+                    else if (_PfTokens[i] == ETokens.Function)
+                    {
+                        if (++i == _PfTokens.Count)
+                            throw new Exception("Expecting function parameter count");
+
+                        EvalFunction(myStack, (int)_PfTokens[i]);
+                    }
+                    else
+                    {
+                        object value1 = ProcessValue(myStack.Pop());
+                        object value2 = ProcessValue(myStack.Pop());
+
+                        if (value1 == null || value2 == null)
+                        {
+                            if (value1 == null && value2 == null)
+                                value1 = value2 = 0d;
+
+                            else if (value1 == null)
+                            {
+                                if (value2 is string)
+                                    value1 = "";
+                                else
+                                    value1 = 0d;
+                            }
+                            else
+                            {
+                                if (value1 is string)
+                                    value2 = "";
+                                else
+                                    value2 = 0d;
+                            }
+                        }
+
+                        if (value1 is string || value2 is string)
+                            OpStringValue(myStack, _PfTokens[i], value1.ToString(), value2.ToString());
+                        else
+                            OpDoubleValue(myStack, _PfTokens[i], (double)value1, (double)value2);
+                    }
+                }
+            }
+
+            if (myStack.Count > 0)
+                return (ProcessValue(myStack.Pop()));
+
+            return (0);
+        }
+
+        #region OpStringValue
+
+        private void OpStringValue(Stack myStack, ETokens op, string s1, string s2)
+        {
+            switch (op)
+            {
+                case ETokens.Add:
+                    myStack.Push(s2 + s1);
+                    break;
+
+                default:
+                    throw new Exception("Invalid string operation.");
+            }
+        }
+
+        #endregion
+
+        #region OpDoubleValue
+
+        private void OpDoubleValue(
+            Stack myStack, ETokens op, double d1, double d2)
+        {
+            switch (op)
+            {
+                case ETokens.BitwiseAnd:
+                    myStack.Push((double)((int)d2 & (int)d1));
+                    break;
+
+                case ETokens.BitwiseOr:
+                    myStack.Push((double)((int)d2 | (int)d1));
+                    break;
+
+                case ETokens.BitwiseXor:
+                    myStack.Push((double)((int)d2 ^ (int)d1));
+                    break;
+
+                case ETokens.Add:
+                    myStack.Push(d2 + d1);
+                    break;
+
+                case ETokens.Subtract:
+                    myStack.Push(d2 - d1);
+                    break;
+
+                case ETokens.Multiply:
+                    myStack.Push(d2 * d1);
+                    break;
+
+                case ETokens.Divide:
+                    myStack.Push(d2 / d1);
+                    break;
+
+                case ETokens.Mod:
+                    myStack.Push(d2 % d1);
+                    break;
+
+                case ETokens.ShiftLeft:
+                    myStack.Push((double)((int)d2 << (int)d1));
+                    break;
+
+                case ETokens.ShiftRight:
+                    myStack.Push((double)((int)d2 >> (int)d1));
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region EvalFunction
+
+        /// <summary>
+        /// Evaluates the current function
+        /// </summary>
+        /// <param name="myStack"></param>
+        /// <param name="count"></param>
+        private void EvalFunction(Stack myStack, int count)
+        {
+            object[] args = new object[count];
+
+            for (int i = count - 1; i >= 0; i--)
+                args[i] = myStack.Pop();
+
+            switch ((ETokens)myStack.Pop())
+            {
+                case ETokens.Avg:
+                    myStack.Push(Avg(args));
+                    break;
+
+                case ETokens.Ceiling:
+                    myStack.Push(Ceiling(args));
+                    break;
+
+                case ETokens.Floor:
+                    myStack.Push(Floor(args));
+                    break;
+
+                case ETokens.Min:
+                    myStack.Push(Min(args));
+                    break;
+
+                case ETokens.Max:
+                    myStack.Push(Max(args));
+                    break;
+
+                case ETokens.Round:
+                    myStack.Push(Round(args));
+                    break;
+
+                case ETokens.Sum:
+                    myStack.Push(Sum(args));
+                    break;
+
+                case ETokens.User:
+                    myStack.Push(User(args));
+                    break;
+            }
+        }
+
+        #region Average
+
+        /// <summary>
+        /// Calculates the average of the given set of values
+        /// </summary>
+        /// <param name="args"></param>
+        /// <returns></returns>
+        private double Avg(IEnumerable<object> args)
+        {
+            double d = 0;
+            int count = 1;
+
+            foreach (object o in args)
+            {
+                object value = ProcessValue(o, ref count);
+
+                if (value is double)
+                    d += (double) value;
+                else
+                    throw new Exception("Can't AVERAGE non-numeric data.");
+            }
+
+            return (d / count);
+        }
+
+        #endregion
+
+        #region Ceiling
+
+        /// <summary>
+        /// Returns the smallest whole value
+        /// greater than or equal to the given value.
+        /// </summary>
+        /// <param name="args"></param>
+        /// <returns></returns>
+        private double Ceiling(object[] args)
+        {
+            if (args.Length != 1)
+                throw new Exception("Ceiling(): Invalid number of arguments.");
+
+            object value = ProcessValue(args[0]);
+
+            if (value is double == false)
+                throw new Exception("Ceiling(): Invalid data type.");
+
+            return (Math.Ceiling((double)value));
+        }
+
+        #endregion
+
+        #region Floor
+
+        /// <summary>
+        /// Returns the largest whole value
+        /// less than or equal to the given value.
+        /// </summary>
+        /// <param name="args"></param>
+        /// <returns></returns>
+        private double Floor(object[] args)
+        {
+            if (args.Length != 1)
+                throw new Exception("Floor(): Invalid number of arguments.");
+
+            object value = ProcessValue(args[0]);
+
+            if (value is double == false)
+                throw new Exception("Floor(): Invalid data type.");
+
+            return (Math.Floor((double)value));
+        }
+
+        #endregion
+
+        #region Minimum
+
+        /// <summary>
+        /// Calculates the minimum from the given set of values
+        /// </summary>
+        /// <param name="args"></param>
+        /// <returns></returns>
+        private double Min(ICollection<object> args)
+        {
+            if (args.Count == 0)
+                return (0);
+
+            double d = double.PositiveInfinity;
+
+            foreach (object o in args)
+            {
+                double n = ProcessMinMaxValue(o, true);
+
+                if (n < d)
+                    d = n;
+            }
+
+            return (d);
+        }
+
+        #endregion
+
+        #region Maximum
+
+        /// <summary>
+        /// Calculates the maximum from the given set of values
+        /// </summary>
+        /// <param name="args"></param>
+        /// <returns></returns>
+        private double Max(ICollection<object> args)
+        {
+            if (args.Count == 0)
+                return (0);
+
+            double d = double.NegativeInfinity;
+
+            foreach (object o in args)
+            {
+                double n = ProcessMinMaxValue(o, false);
+
+                if (n > d)
+                    d = n;
+            }
+
+            return (d);
+        }
+
+        #endregion
+
+        #region Round
+
+        /// <summary>
+        /// Returns the largest whole value
+        /// less than or equal to the given value.
+        /// </summary>
+        /// <param name="args"></param>
+        /// <returns></returns>
+        private double Round(object[] args)
+        {
+            if (args.Length != 1 && args.Length != 2)
+                throw new Exception("Round(): Invalid number of arguments.");
+
+            object value = ProcessValue(args[0]);
+            object decimals = args.Length == 2 ? ProcessValue(args[1]) : 0d;
+
+            if (value is double == false)
+                throw new Exception("Round(): Invalid value type.");
+
+            if (decimals is double == false)
+                throw new Exception("Round(): Invalid decimals type.");
+
+            return (Math.Round((double)value, Convert.ToInt32(decimals)));
+        }
+
+        #endregion
+
+        #region Sum
+
+        /// <summary>
+        /// Calculates the sum of the given set of values
+        /// </summary>
+        /// <param name="args"></param>
+        /// <returns></returns>
+        private double Sum(IEnumerable<object> args)
+        {
+            double d = 0;
+            int count = 0;
+
+            foreach (object o in args)
+            {
+                object value = ProcessValue(o, ref count);
+
+                if (value is double)
+                    d += (double)value;
+                else
+                    throw new Exception("Can't SUM non-numeric data.");
+            }
+
+            return (d);
+        }
+
+        #endregion
+
+        #region User
+
+        /// <summary>
+        /// Calculates the sum of the given set of values
+        /// </summary>
+        /// <param name="args"></param>
+        /// <returns></returns>
+        private object User(object[] args)
+        {
+            object d = null;
+            int count = 0;
+
+            object[] uargs = new object[args.Length];
+
+            for (int i = 0; i < args.Length; i++)
+                uargs[i] = ProcessValue(args[i], ref count);
+
+            _GridPanel.SuperGrid.DoCellUserFunctionEvent(_Cell, uargs, ref d);
+
+            return (d);
+        }
+
+        #endregion
+
+        #region ProcessValue
+
+        /// <summary>
+        /// Process the given object value
+        /// </summary>
+        /// <param name="o"></param>
+        /// <returns></returns>
+        private object ProcessValue(object o)
+        {
+            int count = 0;
+
+            return (ProcessValue(o, ref count));
+        }
+
+        private object ProcessValue(object o, ref int count)
+        {
+            count = 1;
+
+            if (o is double)
+                return (double)o;
+
+            if (o is string)
+            {
+                string s = (string)o;
+
+                if (s.Length > 0)
+                {
+                    if (s[0] == '.' || s[0] == '"' || char.IsLetter(s[0]) == true)
+                    {
+                        object d = null;
+
+                        List<GridCell> cells = GetCellReferences(s);
+
+                        if (cells != null && cells.Count > 0)
+                        {
+                            foreach (GridCell cell in cells)
+                            {
+                                object n;
+
+                                if (ProcessCellValue(cell, out n) == true)
+                                {
+                                    if (d == null)
+                                    {
+                                        d = n;
+                                    }
+                                    else
+                                    {
+                                        if (n is string || d is string)
+                                            d = d + n.ToString();
+                                        else
+                                            d = (double)d + (double)n;
+                                    }
+
+                                    count++;
+                                }
+                            }
+                        }
+                        else
+                        {
+                            return (s);
+                        }
+
+                        return (d);
+                    }
+
+                    return (GetValue(s));
+                }
+            }
+
+            return (0d);
+        }
+
+        #endregion
+
+        #region ProcessMinMaxValue
+
+        /// <summary>
+        /// Processes the given MinMax object value
+        /// </summary>
+        /// <param name="o"></param>
+        /// <param name="min"></param>
+        /// <returns></returns>
+        private double ProcessMinMaxValue(object o, bool min)
+        {
+            if (o is double)
+                return (double) o;
+
+            if (o is string)
+            {
+                string s = (string)o;
+
+                if (s.Length > 0)
+                {
+                    if (s[0] == '.' || s[0] == '"' || char.IsLetter(s[0]) == true)
+                    {
+                        double d = 0;
+
+                        IEnumerable<GridCell> cells = GetCellReferences(s);
+
+                        bool valueSet = false;
+
+                        foreach (GridCell cell in cells)
+                        {
+                            object value;
+
+                            if (ProcessCellValue(cell, out value) == true)
+                            {
+                                if (value is double == false)
+                                    throw new Exception("Cannot Min/Max non-numeric values.");
+
+                                double n = (double)value;
+
+                                if (valueSet == false || (min ? n < d : n > d))
+                                {
+                                    d = n;
+
+                                    valueSet = true;
+                                }
+                            }
+                        }
+
+                        return (d);
+                    }
+                    
+                    return ((double)GetValue(s));
+                }
+            }
+
+            return (0);
+        }
+
+        #endregion
+
+        #region ProcessCellValue
+
+        /// <summary>
+        /// Processes the given cell reference value
+        /// </summary>
+        /// <param name="cell"></param>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        private bool ProcessCellValue(GridCell cell, out object value)
+        {
+            value = cell.Value ?? "";
+
+            string s = value.ToString();
+
+            if (string.IsNullOrEmpty(s) == false)
+            {
+                if (s[0] == '=')
+                {
+                    if (_UsedCells.Contains(cell) == true)
+                        throw new Exception("Recursive cell reference");
+
+                    _UsedCells.Add(cell);
+
+                    EEval eval = new EEval(cell, s, _UsedCells);
+
+                    value = eval.EvaluateEx();
+
+                    _UsedCells.Remove(cell);
+
+                    return (true);
+                }
+
+                value = GetValue(s);
+
+                return (true);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetValue
+
+        /// <summary>
+        /// Gets the double value from the given string
+        /// </summary>
+        /// <param name="s"></param>
+        /// <returns></returns>
+        private object GetValue(string s)
+        {
+            double d;
+
+            if (double.TryParse(s, out d) == true)
+                return (d);
+
+            return (s);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetCellReferences
+
+        internal List<GridCell> GetCellReferences()
+        {
+            return (GetCellReferences(_Source));
+        }
+
+        private List<GridCell> GetCellReferences(string item)
+        {
+            const string sref1 = @"(?<col1>[\.]|[a-zA-Z_]+|""[^""]+"")\s*(?<row1>[\.]|\d+)";
+            const string sref2 = @"(?<col2>[\.]|[a-zA-Z_]+|""[^""]+"")\s*(?<row2>[\.]|\d+)";
+
+            Regex reg = new Regex(
+                "(" + sref1 + ":" + sref2 + ")|" +
+                "(" + sref1 + ")");
+
+            MatchCollection mc = reg.Matches(item);
+
+            if (mc.Count > 0)
+            {
+                List<GridCell> cells = new List<GridCell>();
+
+                for (int i = 0; i < mc.Count; i++)
+                    AddCellRange(_GridPanel, cells, mc[i].Groups);
+
+                return (cells);
+            }
+
+            return (null);
+        }
+
+        #region AddCellRange
+
+        private void AddCellRange(
+            GridPanel panel, List<GridCell> cells, GroupCollection groups)
+        {
+            int row1;
+            int col1 = GetRowCol(panel, groups["col1"].Value,
+                groups["row1"].Value, out row1);
+
+            int row2 = row1;
+            int col2 = col1;
+
+            if (groups["col2"].Success == true)
+            {
+                col2 = GetRowCol(panel, groups["col2"].Value,
+                    groups["row2"].Value, out row2);
+            }
+
+            if (col1 >= 0 && col2 >= 0)
+                ProcessRange(panel, cells, col1, row1, col2, row2);
+        }
+
+        #region GetRowCol
+
+        private int GetRowCol(GridPanel panel,
+            string scol, string srow, out int row)
+        {
+            scol = scol.Replace("\"", "");
+
+            if (_Cell != null)
+            {
+                if (srow.Equals(".") == true)
+                    row = _Cell.GridRow.RowIndex;
+                else
+                    int.TryParse(srow, out row);
+
+                if (scol.Equals(".") == true)
+                    return (_Cell.ColumnIndex);
+            }
+            else
+            {
+                int.TryParse(srow, out row);
+            }
+
+            int col;
+            if (int.TryParse(scol, out col) == true)
+                return (col);
+
+            GridColumn column = panel.Columns[scol];
+
+            if (column != null)
+                return (column.ColumnIndex);
+
+            return (-1);
+        }
+
+        #endregion
+
+        #region ProcessRange
+
+        private void ProcessRange(GridPanel panel,
+            ICollection<GridCell> cells, int col1,
+            int row1, int col2, int row2)
+        {
+            GridContainer cont = _Cell.GridRow.Parent as GridContainer;
+
+            if (cont != null)
+            {
+                for (int i = row1; i <= row2; i++)
+                {
+                    for (int j = col1; j <= col2; j++)
+                    {
+                        GridCell cell = cont.GetCell(i, j);
+
+                        if (cell != null)
+                            cells.Add(cell);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+    }
+
+    #region enums
+
+    #region ETokens
+
+    ///<summary>
+    /// ETokens
+    ///</summary>
+    internal enum ETokens
+    {
+        // Anything before this, is an operand
+
+        Operator = 512,
+
+        // Normal operators
+
+        Negate,
+
+        LParen,
+        RParen,
+
+        Multiply,
+        Divide,
+        Mod,
+
+        Add,
+        Subtract,
+
+        ShiftLeft,
+        ShiftRight,
+
+        BitwiseAnd,
+        BitwiseOr,
+        BitwiseXor,
+
+        Function,
+        Comma,
+
+        BadToken,
+
+        // Anything after this is a function
+
+        Functions,
+
+        Avg,
+        Ceiling,
+        Floor,
+        Max,
+        Min,
+        Round,
+        Sum,
+        User,
+    };
+
+    #endregion
+
+    #endregion
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/ExpandDisplay.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/ExpandDisplay.cs
new file mode 100644
index 00000000..75baf5a6
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/ExpandDisplay.cs	
@@ -0,0 +1,54 @@
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    ///<summary>
+    /// CheckDisplay
+    ///</summary>
+    static public class ExpandDisplay
+    {
+        #region RenderButton
+
+        ///<summary>
+        /// RenderButton
+        ///</summary>
+        ///<param name="g"></param>
+        ///<param name="image"></param>
+        ///<param name="buttonBounds"></param>
+        ///<param name="clipBounds"></param>
+        static public Size RenderButton(Graphics g,
+            Image image, Rectangle buttonBounds, Rectangle clipBounds)
+        {
+            if (image != null && buttonBounds.IsEmpty == false)
+            {
+                Rectangle r = buttonBounds;
+                r.Width++;
+                r.Height++;
+
+                Size isize = Dpi.Size(image.Size);
+
+                if (r.Width > isize.Width)
+                {
+                    r.X += (r.Width - isize.Width) / 2;
+                    r.Width = isize.Width;
+                }
+
+                if (r.Height > isize.Height)
+                {
+                    r.Y += (r.Height - isize.Height) / 2;
+                    r.Height = isize.Height;
+                }
+
+                r.Intersect(clipBounds);
+
+                g.DrawImageUnscaledAndClipped(image, r);
+
+                return (r.Size);
+            }
+
+            return (Size.Empty);
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/FloatWindow.Designer.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/FloatWindow.Designer.cs
new file mode 100644
index 00000000..193d8bcb
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/FloatWindow.Designer.cs	
@@ -0,0 +1,51 @@
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    partial class FloatWindow
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form 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.SuspendLayout();
+            // 
+            // FloatWindow
+            // 
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
+            this.CausesValidation = false;
+            this.ClientSize = new System.Drawing.Size(90, 23);
+            this.ControlBox = false;
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.Name = "FloatWindow";
+            this.ShowIcon = false;
+            this.ShowInTaskbar = false;
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/FloatWindow.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/FloatWindow.cs
new file mode 100644
index 00000000..a6b8e2de
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/FloatWindow.cs	
@@ -0,0 +1,48 @@
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    ///<summary>
+    /// FloatWindow
+    ///</summary>
+    public partial class FloatWindow : Form
+    {
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        public FloatWindow()
+        {
+            InitializeComponent();
+
+            SetStyle(ControlStyles.UserPaint, true);
+            SetStyle(ControlStyles.AllPaintingInWmPaint, true);
+            SetStyle(ControlStyles.OptimizedDoubleBuffer, true);
+            SetStyle(ControlStyles.Selectable, false);
+        }
+
+        const int WS_EX_NOACTIVATE = 0x08000000;
+
+        /// <summary>
+        /// CreateParams
+        /// </summary>
+        protected override CreateParams CreateParams
+        {
+            get
+            {
+                CreateParams cp = base.CreateParams;
+
+                cp.ExStyle |= WS_EX_NOACTIVATE;
+
+                return (cp);
+            }
+        }
+
+        /// <summary>
+        /// ShowWithoutActivation
+        /// </summary>
+        protected override bool ShowWithoutActivation
+        {
+            get { return true; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/FloatWindow.resx b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/FloatWindow.resx
new file mode 100644
index 00000000..19dc0dd8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/FloatWindow.resx	
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridCaption.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridCaption.cs
new file mode 100644
index 00000000..847a0f8b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridCaption.cs	
@@ -0,0 +1,106 @@
+using System.ComponentModel;
+using System.Drawing;
+using DevComponents.DotNetBar.SuperGrid.Style;
+
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    ///<summary>
+    /// GridCaption
+    ///</summary>
+    public class GridCaption : GridTextRow
+    {
+        #region Constructors
+
+        ///<summary>
+        /// GridCaption
+        ///</summary>
+        public GridCaption()
+            : this(null)
+        {
+        }
+
+        ///<summary>
+        /// GridCaption
+        ///</summary>
+        ///<param name="text"></param>
+        public GridCaption(string text)
+            : base(text)
+        {
+        }
+
+        #endregion
+
+        #region Hidden properties
+
+        #region RowHeaderVisibility
+
+        /// <summary>
+        /// RowHeaderVisibility
+        /// </summary>
+        [Browsable(false)]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public new RowHeaderVisibility RowHeaderVisibility
+        {
+            get { return (base.RowHeaderVisibility); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderBorder
+
+        /// <summary>
+        /// RenderBorder
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="panel"></param>
+        /// <param name="pstyle"></param>
+        /// <param name="r"></param>
+        protected override void RenderBorder(Graphics g,
+            GridPanel panel, GridPanelVisualStyle pstyle, Rectangle r)
+        {
+            using (Pen pen = new Pen(pstyle.HeaderLineColor))
+            {
+                r.Height--;
+                g.DrawLine(pen, r.X, r.Bottom, r.Right - 1, r.Bottom);
+            }
+        }
+
+        #endregion
+
+        #region CanShowRowHeader
+
+        /// <summary>
+        /// CanShowRowHeader
+        /// </summary>
+        /// <param name="panel"></param>
+        /// <returns></returns>
+        protected override bool CanShowRowHeader(GridPanel panel)
+        {
+            return (false);
+        }
+
+        #endregion
+
+        #region Style support
+
+        /// <summary>
+        /// ApplyStyleEx
+        /// </summary>
+        /// <param name="style"></param>
+        /// <param name="css"></param>
+        protected override void ApplyStyleEx(TextRowVisualStyle style, StyleType[] css)
+        {
+            foreach (StyleType cs in css)
+            {
+                style.ApplyStyle(SuperGrid.BaseVisualStyles.CaptionStyles[cs]);
+                style.ApplyStyle(SuperGrid.DefaultVisualStyles.CaptionStyles[cs]);
+                style.ApplyStyle(GridPanel.DefaultVisualStyles.CaptionStyles[cs]);
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridCell.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridCell.cs
new file mode 100644
index 00000000..fc3b32ec
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridCell.cs	
@@ -0,0 +1,8014 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data.SqlTypes;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Drawing.Drawing2D;
+using System.Drawing.Imaging;
+using System.Globalization;
+using System.Media;
+using System.Reflection;
+using System.Windows.Forms;
+using System.Windows.Forms.VisualStyles;
+using DevComponents.DotNetBar.SuperGrid.Primitives;
+using DevComponents.DotNetBar.SuperGrid.Style;
+using DevComponents.SuperGrid.TextMarkup;
+
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    /// <summary>
+    /// Represents grid cell.
+    /// </summary>
+    public class GridCell : GridElement, IComparable<GridCell>, IDisposable
+    {
+        #region Constants
+
+        private const int CheckBoxSpacing = 3;
+
+        #endregion
+
+        #region Static variables
+
+        private static CellInfoWindow _cellInfoWindow;
+
+        private static CellArea _hitArea;
+        private static CellArea _lastHitArea;
+        private static GridCell _hitCell;
+
+        private static CellArea _mouseDownHitArea;
+        private static GridCell _mouseDownHitCell;
+        private static Point _mouseDownPoint;
+        private static IGridCellEditControl _mouseRenderer;
+
+        private static bool _mouseInItem;
+        private static bool _mouseDownInItem;
+        private static bool _needsMouseEnter;
+        private static bool _dragSelection;
+        private static bool _dragStarted;
+
+        private static int _anchorRowIndex;
+        private static int _anchorColumnIndex;
+
+        private static string _toolTipText;
+
+        #endregion
+
+        #region Private variables
+
+        private int _ColumnIndex;
+        private int _IndentLevel;
+
+        private Size _CellSize;
+        private Size _ContentSize;
+        private Size _MeasuredSize;
+
+        private Rectangle _Bounds;
+        private Rectangle _BackBounds;
+
+        private string _InfoText;
+        private Image _InfoImage;
+
+        private Cs _States;
+        private EditorInfo _EditorInfo;
+
+        private ushort _BoundsUpdateCount;
+        private ushort _ColumnMeasureCount;
+        private ushort _DataResetCount;
+        private ushort _MergeUpdateCount;
+        private ushort _RowMeasureCount;
+        private ushort _SelectionClearCount;
+        private ushort _SelectionUpdateCount;
+        private ushort _StyleUpdateCount;
+
+        private object _Value;
+        private object _ExpValue;
+
+        private CellVisualStyles _Styles;
+        private CellVisualStyles _EffectiveStyles;
+
+        #endregion
+
+        #region Constructors
+
+        ///<summary>
+        /// GridCell
+        ///</summary>
+        public GridCell()
+        {
+            SetState(Cs.AllowEdit, true);
+        }
+
+        ///<summary>
+        /// GridCell
+        ///</summary>
+        ///<param name="value"></param>
+        public GridCell(object value)
+            : this()
+        {
+            _Value = value;
+        }
+
+        #endregion
+
+        #region Internal properties
+
+        #region AllowNullMerge
+
+        internal bool AllowNullMerge
+        {
+            get
+            {
+                Tbool ns = GridColumn.AllowNullCellMerge;
+
+                if (ns != Tbool.NotSet)
+                    return (ns == Tbool.True ? true : false);
+
+                return (GridPanel.AllowNullCellMerge);
+            }
+        }
+
+        #endregion
+
+        #region CanModify
+
+        internal bool CanModify
+        {
+            get
+            {
+                GridColumn col = GridColumn;
+
+                if (col == null || (col.AllowEdit == false || col.AllowSelection == false))
+                    return (false);
+
+                GridRow row = GridRow;
+
+                if (row == null || (row.AllowEdit == false || row.AllowSelection == false || row.IsDeleted == true))
+                    return (false);
+
+                GridPanel panel = GridPanel;
+                
+                if (panel == null || (panel.AllowEdit == false || panel.AllowSelection == false))
+                    return (false);
+
+                if (Visible == false || AllowEdit == false ||
+                    AllowSelection == false || IsEmptyCell == true || IsReadOnly == true)
+                {
+                    return (false);
+                }
+
+                return (true);
+            }
+        }
+
+        #endregion
+
+        #region CanModifyMerge
+
+        internal bool CanModifyMerge
+        {
+            get
+            {
+                if (CanModify == false)
+                    return (false);
+
+                return (Merged == false || MergeSuspended == true);
+            }
+        }
+
+        #endregion
+
+        #region AnySelected
+
+        internal bool AnySelected
+        {
+            get { return (TestState(Cs.AnySelected)); }
+            set { SetState(Cs.AnySelected, value); }
+        }
+
+        #endregion
+
+        #region CellSize
+
+        internal Size CellSize
+        {
+            get { return (_CellSize); }
+            set { _CellSize = value; }
+        }
+
+        #endregion
+
+        #region CellEditMode
+
+        internal CellEditMode CellEditMode
+        {
+            get
+            {
+                IGridCellEditControl editor = (EditControl ?? (GridColumn != null ? GridColumn.EditControl : null));
+
+                if (editor == null)
+                    editor = GetInternalEditControl();
+
+                if (editor != null)
+                    return (editor.CellEditMode);
+
+                return (CellEditMode.InPlace);
+            }
+        }
+
+        #endregion
+
+        #region CheckBoxBounds
+
+        internal Rectangle CheckBoxBounds
+        {
+            get { return (GridRow.CheckBoxBounds); }
+        }
+
+        #endregion
+
+        #region ContentSize
+
+        internal Size ContentSize
+        {
+            get { return(_ContentSize); }
+        }
+
+        #endregion
+
+        #region RowContainer
+
+        internal GridContainer RowContainer
+        {
+            get
+            {
+                GridRow row = GridRow;
+
+                if (row != null)
+                    return (row.Parent as GridContainer);
+
+                return (null);
+            }
+        }
+
+        #endregion
+
+        #region HitArea
+
+        internal CellArea HitArea
+        {
+            get { return (_hitArea); }
+            set { _hitArea = value; }
+        }
+
+        #endregion
+
+        #region IndentLevel
+
+        internal int IndentLevel
+        {
+            get { return (_IndentLevel); }
+            set { _IndentLevel = value; }
+        }
+
+        #endregion
+
+        #region IsDragSelection
+
+        internal bool IsDragSelection
+        {
+            get { return (_dragSelection); }
+            set { _dragSelection = value; }
+        }
+
+        #endregion
+
+        #region IsDragStarted
+
+        internal bool IsDragStarted
+        {
+            get { return (_dragStarted); }
+            set { _dragStarted = value; }
+        }
+
+        #endregion
+
+        #region MergeUpdateCount
+
+        internal ushort MergeUpdateCount
+        {
+            get { return (_MergeUpdateCount); }
+            set { _MergeUpdateCount = value; }
+        }
+
+        #endregion
+
+        #region MeasuredSize
+
+        internal Size MeasuredSize
+        {
+            get { return (_MeasuredSize); }
+        }
+
+        #endregion
+
+        #region Modified
+
+        internal bool Modified
+        {
+            get { return (TestState(Cs.Modified)); }
+            set { SetState(Cs.Modified, value); }
+        }
+
+        #endregion
+
+        #region MouseRenderer
+
+        internal IGridCellEditControl MouseRenderer
+        {
+            get { return (_mouseRenderer); }
+            set { _mouseRenderer = value; }
+        }
+
+        #endregion
+
+        #region NeedsMeasured
+
+        internal override bool NeedsMeasured
+        {
+            get
+            {
+                if (_ColumnMeasureCount != GridColumn.MeasureCount)
+                    return (true);
+
+                if (_RowMeasureCount != GridRow.MeasureCount)
+                    return (true);
+
+                return (base.NeedsMeasured);
+            }
+
+            set
+            {
+                if (value == false)
+                {
+                    _ColumnMeasureCount = GridColumn.MeasureCount;
+                    _RowMeasureCount = GridRow.MeasureCount;
+                }
+
+                base.NeedsMeasured = value;
+            }
+        }
+
+        #endregion
+
+        #region Selected
+
+        internal bool Selected
+        {
+            get
+            {
+                if (AllowSelection == false)
+                    return (false);
+
+                GridPanel panel = GridPanel;
+
+                if (panel != null)
+                {
+                    if (_SelectionClearCount != panel.SelectionClearCount)
+                    {
+                        _SelectionClearCount = panel.SelectionClearCount;
+
+                        Selected = false;
+
+                        if (GridRow.ExpandedVisible(panel) == true)
+                            panel.SetSelectedEx(this, false);
+
+                        InvalidateRender();
+                    }
+                }
+
+                return (TestState(Cs.Selected));
+            }
+
+            set
+            {
+                SetState(Cs.Selected, value);
+
+                GridPanel panel = GridPanel;
+
+                if (panel != null)
+                    _SelectionClearCount = panel.SelectionClearCount;
+            }
+        }
+
+        #endregion
+
+        #region SelectionUpdateCount
+
+        internal ushort SelectionUpdateCount
+        {
+            get { return (_SelectionUpdateCount); }
+            set { _SelectionUpdateCount = value; }
+        }
+
+        #endregion
+
+        #region ValueEx
+
+        internal object ValueEx
+        {
+            get { return (_Value); }
+
+            set
+            {
+                if ((value != null && value.Equals(_Value) == false) ||
+                    (value == null && _Value != null))
+                {
+                    object oldValue = _Value;
+                    _Value = value;
+
+                     OnValueChanged(oldValue, value, DataContext.CellValueLoad);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ValueExx
+
+        internal object ValueExx
+        {
+            get { return (_Value); }
+            set { _Value = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Public properties
+
+        #region AllowEdit
+
+        /// <summary>
+        /// Gets or sets whether the cell can be edited by the user. 
+        /// </summary>
+        [DefaultValue(true), Category("Behavior")]
+        [Description("Indicates whether the cell can be edited by the user.")]
+        public bool AllowEdit
+        {
+            get { return (TestState(Cs.AllowEdit)); }
+
+            set
+            {
+                if (value != AllowEdit)
+                {
+                    SetState(Cs.AllowEdit, value);
+
+                    OnPropertyChanged("AllowEdit");
+                }
+            }
+        }
+
+        #endregion
+
+        #region BackBounds
+
+        ///<summary>
+        /// Gets the scroll adjusted background bounds of the cell
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public Rectangle BackBounds
+        {
+            get
+            {
+                if (_BoundsUpdateCount != SuperGrid.BoundsUpdateCount)
+                    UpdateBoundingRects();
+
+                return (_BackBounds);
+            }
+        }
+
+        #endregion
+
+        #region Bounds
+
+        ///<summary>
+        /// Gets the scroll adjusted bounds of the cell
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override Rectangle Bounds
+        {
+            get
+            {
+                if (_BoundsUpdateCount != SuperGrid.BoundsUpdateCount)
+                    UpdateBoundingRects();
+
+                GridPanel panel = GridPanel;
+
+                if (panel != null)
+                {
+                    CellRange cr = GetStateCellRange();
+
+                    if (cr != null)
+                        return (GetBounds(panel, cr.BackBounds));
+                }
+
+                return (_Bounds);
+            }
+        }
+
+        #endregion
+
+        #region BoundsRelative
+
+        /// <summary>
+        /// Gets or sets the relative bounds of the cell
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override Rectangle BoundsRelative
+        {
+            get { return (base.BoundsRelative); }
+
+            internal set
+            {
+                base.BoundsRelative = value;
+
+                _BoundsUpdateCount = 0;
+            }
+        }
+
+        #endregion
+
+        #region CellBounds
+
+        ///<summary>
+        /// Gets the clipped, scroll adjusted, bounding rectangle of the cell 
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public Rectangle CellBounds
+        {
+            get
+            {
+                if (_BoundsUpdateCount != SuperGrid.BoundsUpdateCount)
+                    UpdateBoundingRects();
+
+                GridPanel panel = GridPanel;
+
+                if (panel != null)
+                    return (GetCellBounds(panel));
+
+                return (Bounds);
+            }
+        }
+
+        #endregion
+
+        #region CellStyles
+
+        /// <summary>
+        /// Gets or sets the visual styles assigned to the cell
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates the visual styles assigned to the cell.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public CellVisualStyles CellStyles
+        {
+            get
+            {
+                if (_Styles == null)
+                {
+                    _Styles = new CellVisualStyles();
+
+                    StyleVisualChangeHandler(null, _Styles);
+                }
+
+                return (_Styles);
+            }
+
+            set
+            {
+                if (_Styles != value)
+                {
+                    CellVisualStyles oldValue = _Styles;
+
+                    _Styles = value;
+
+                    OnCellStyleChanged("CellVisualStyles", oldValue, value);
+
+                    if (oldValue != null)
+                        oldValue.Dispose();
+                }
+            }
+        }
+
+        private void OnCellStyleChanged(string property,
+            CellVisualStyles oldValue, CellVisualStyles newValue)
+        {
+            StyleVisualChangeHandler(oldValue, newValue);
+
+            OnPropertyChanged(property);
+        }
+
+        #endregion
+
+        #region ColumnIndex
+
+        /// <summary>
+        /// Gets the associated Column index for the cell
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public int ColumnIndex
+        {
+            get { return (_ColumnIndex); }
+            internal set { _ColumnIndex = value; }
+        }
+
+        #endregion
+
+        #region ContentBounds
+
+        ///<summary>
+        /// Gets the scroll adjusted, content only, bounding rectangle of the cell 
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public Rectangle ContentBounds
+        {
+            get
+            {
+                GridPanel panel = GridPanel;
+
+                if (panel != null)
+                    return (GetContentBounds(panel));
+
+                return (Rectangle.Empty);
+            }
+        }
+
+        #endregion
+
+        #region EditBounds
+
+        ///<summary>
+        /// Gets the clipped, scroll adjusted, edit bounding rectangle of the cell 
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public Rectangle EditBounds
+        {
+            get
+            {
+                GridPanel panel = GridPanel;
+
+                if (panel != null)
+                    return (GetEditBounds(panel));
+
+                return (Rectangle.Empty);
+            }
+        }
+
+        #endregion
+
+        #region EditControl
+
+        ///<summary>
+        /// Gets the Edit Control used for the cell. The cell level
+        /// edit control is a non-shared control, created and based
+        /// upon the cell level EditorType and EditorParams properties.
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public IGridCellEditControl EditControl
+        {
+            get
+            {
+                if (_EditorInfo == null || _EditorInfo.EditorType == null)
+                    return (null);
+
+                if (_EditorInfo.EditControl == null)
+                    EditControl = GetEditControl(_EditorInfo.EditorType, _EditorInfo.EditorParams);
+
+                return (_EditorInfo.EditControl);
+            }
+
+            internal set
+            {
+                if (_EditorInfo == null)
+                    _EditorInfo = new EditorInfo();
+
+                if (_EditorInfo.EditControl != value)
+                {
+                    if (_EditorInfo.EditControl != null)
+                    {
+                        if (_EditorInfo.EditControl.EditorPanel.Parent != null)
+                            SuperGrid.Controls.Remove(_EditorInfo.EditControl.EditorPanel);
+
+                        _EditorInfo.EditControl.EditorCellBitmap = null;
+
+                        if (_EditorInfo.EditorType != null)
+                            ((Control)_EditorInfo.EditControl).Dispose();
+                    }
+
+                    _EditorInfo.EditControl = value;
+
+                    if (_EditorInfo.EditControl != null)
+                    {
+                        if (_EditorInfo.EditControl.EditorPanel.Parent == null)
+                            SuperGrid.Controls.Add(_EditorInfo.EditControl.EditorPanel);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region EditorDirty
+
+        ///<summary>
+        /// Gets or sets whether the value
+        /// being edited has been changed in the editor 
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool EditorDirty
+        {
+            get { return (GridRow.EditorDirty); }
+
+            set
+            {
+                GridRow.EditorDirty = value;
+
+                // If it is a non-modal edit event then we want the
+                // editor's dirty state to be cleared immediately.
+
+                if (SuperGrid.EditorActive == false)
+                    GridRow.EditorDirty = false;
+            }
+        }
+
+        #endregion
+
+        #region EditorParams
+
+        /// <summary>
+        /// Gets or sets an array of arguments that match in number,
+        /// order, and type the parameters of the EditControl constructor
+        /// to invoke. If empty or null, the default constructor is invoked.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public object[] EditorParams
+        {
+            get
+            {
+                if (_EditorInfo == null)
+                    return (null);
+
+                return (_EditorInfo.EditorParams);
+            }
+
+            set
+            {
+                if (_EditorInfo == null)
+                    _EditorInfo = new EditorInfo();
+
+                if (IsSameParams(_EditorInfo.EditorParams, value) == false)
+                {
+                    _EditorInfo.EditorParams = value;
+
+                    EditControl = null;
+                    RenderControl = null;
+
+                    NeedsMeasured = true;
+
+                    OnPropertyChangedEx("EditorParams", VisualChangeType.Layout);
+                }
+                                    
+                if (_EditorInfo.IsEmpty == true)
+                    _EditorInfo = null;
+            }
+        }
+
+        #region IsSameParams
+
+        private bool IsSameParams(object[] p1, object[] p2)
+        {
+            if (p1 == null || p2 == null)
+                return (p1 == p2);
+
+            if (p1.Length != p2.Length)
+                return (false);
+
+            for (int i = 0; i < p1.Length; i++)
+            {
+                if (p1[i] != p2[i])
+                    return (false);
+            }
+
+            return (true);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region EditorType
+
+        ///<summary>
+        /// Indicates the cell editor type. This is the control type
+        /// used to perform the actual modification of the cell value
+        ///</summary>
+        [DefaultValue(null), Category("Data")]
+        [Description("Indicates the cell editor type. This is the control type used to perform the actual modification of the cell value.")]
+        [TypeConverter(typeof(EditTypeConverter))]
+        [Editor("DevComponents.SuperGrid.Design.EditTypeEditor, DevComponents.SuperGrid.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=26d81176cfa2b486", typeof(UITypeEditor))]
+        public Type EditorType
+        {
+            get
+            {
+                if (_EditorInfo == null)
+                    return (null);
+
+                return (_EditorInfo.EditorType);
+            }
+
+            set
+            {
+                if (value != null || _EditorInfo != null)
+                {
+                    if (_EditorInfo == null)
+                        _EditorInfo = new EditorInfo();
+
+                    if (_EditorInfo.EditorType != value)
+                    {
+                        _EditorInfo.EditorType = value;
+                        _EditorInfo.EditControl = null;
+                        _EditorInfo.RenderControl = null;
+
+                        NeedsMeasured = true;
+
+                        OnPropertyChangedEx("EditorType", VisualChangeType.Layout);
+                    }
+
+                    if (_EditorInfo.IsEmpty == true)
+                        _EditorInfo = null;
+                }
+            }
+        }
+
+        #endregion
+
+        #region ExpValue
+
+        ///<summary>
+        /// Gets the last evaluated expression value for the cell.
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public object ExpValue
+        {
+            get { return (_ExpValue); }
+        }
+
+        #endregion
+
+        #region FormattedValue
+
+        /// <summary>
+        /// Gets the associated Formatted Value for the cell
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public string FormattedValue
+        {
+            get { return (GetFormattedValue()); }
+        }
+
+        #endregion
+
+        #region GridColumn
+
+        /// <summary>
+        /// Gets the GridColumn associated with the cell
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public GridColumn GridColumn
+        {
+            get
+            {
+                GridPanel panel = GridPanel;
+
+                if (panel == null && GridRow != null)
+                    panel = GridRow.AllocPanel;
+
+                if (panel != null)
+                {
+                    if (_ColumnIndex < panel.Columns.Count)
+                        return (panel.Columns[_ColumnIndex]);
+                }
+
+                return (null);
+            }
+        }
+
+        #endregion
+
+        #region GridRow
+
+        ///<summary>
+        /// Gets the GridRow associated with the cell.
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public GridRow GridRow
+        {
+            get { return (Parent as GridRow); }
+        }
+
+        #endregion
+
+        #region HighLightBounds
+
+        ///<summary>
+        /// Gets the scroll adjusted, bounding rectangle used
+        /// to highlight the cell contents when selected.
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public Rectangle HighLightBounds
+        {
+            get
+            {
+                Rectangle r = Rectangle.Empty;
+                GridPanel panel = GridPanel;
+
+                if (panel != null)
+                {
+                    switch (GetCellHighlightMode(panel))
+                    {
+                        case CellHighlightMode.Content:
+                            IGridCellEditControl editor = GetInternalRenderControl();
+
+                            r = GetAdjustedBounds(ContentBounds);
+                            r = GetEditPanelBounds(editor, r);
+
+                            r.Inflate(1, 1);
+                            break;
+
+                        case CellHighlightMode.Partial:
+                            r = GetAdjustedBounds(ContentBounds);
+                            r.Inflate(1, 1);
+                            break;
+
+                        case CellHighlightMode.Full:
+                            r = GetAdjustedBounds();
+
+                            Rectangle t = SViewRect;
+
+                            if (t.X == 0 && r.X == 0)
+                            {
+                                r.X += Dpi.Width1;
+                                r.Width -= Dpi.Width1;
+                            }
+                            break;
+                    }
+                }
+
+                return (r);
+            }
+        }
+
+        #endregion
+
+        #region InfoImage
+
+        /// <summary>
+        /// Gets or sets the cell informational Image (the image
+        /// to display when InfoText is non-empty)
+        /// </summary>
+        [DefaultValue(null), Category("Appearance")]
+        [Description("Indicates the cell informational Image (the image to display when InfoText is non-empty).")]
+        public Image InfoImage
+        {
+            get { return (_InfoImage); }
+
+            set
+            {
+                if (_InfoImage != value)
+                {
+                    _InfoImage = value;
+
+                    OnPropertyChangedEx("InfoImage", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #region GetInfoImage
+
+        internal Image GetInfoImage()
+        {
+            return (_InfoImage ?? GridColumn.GetInfoImage());
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InfoImageBounds
+
+        ///<summary>
+        /// Gets the scroll adjusted, bounding
+        /// rectangle for the current set info image
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public Rectangle InfoImageBounds
+        {
+            get
+            {
+                GridPanel panel = GridPanel;
+
+                if (panel != null)
+                {
+                    Image image = GetInfoImage();
+
+                    if (image != null)
+                    {
+                        if (ShowInfoCellImage(panel) == true)
+                        {
+                            Rectangle r = GetAdjustedBounds(ContentBounds);
+                            r.Inflate(-2, -1);
+
+                            Rectangle t = r;
+
+                            switch (GridColumn.InfoImageAlignment)
+                            {
+                                case Alignment.TopCenter:
+                                    r.X += (r.Width - image.Width) / 2;
+                                    break;
+
+                                case Alignment.TopRight:
+                                    r.X = (r.Right - image.Width);
+                                    break;
+
+                                case Alignment.MiddleLeft:
+                                    if (GridColumn.InfoImageOverlay == false)
+                                        r.X -= (image.Width + 4);
+
+                                    r.Y += (r.Height - image.Height) / 2;
+                                    break;
+
+                                case Alignment.MiddleCenter:
+                                    r.X += (r.Width - image.Width) / 2;
+                                    r.Y += (r.Height - image.Height) / 2;
+                                    break;
+
+                                case Alignment.MiddleRight:
+                                    r.X = (GridColumn.InfoImageOverlay == true)
+                                        ? (r.Right - image.Width) : (r.Right + 4);
+
+                                    r.Y += (r.Height - image.Height) / 2;
+                                    break;
+
+                                case Alignment.BottomLeft:
+                                    r.Y = (r.Bottom - image.Height);
+                                    break;
+
+                                case Alignment.BottomCenter:
+                                    r.X += (r.Width - image.Width) / 2;
+                                    r.Y = (r.Bottom - image.Height);
+                                    break;
+
+                                case Alignment.BottomRight:
+                                    r.X = (r.Right - image.Width);
+                                    r.Y = (r.Bottom - image.Height);
+                                    break;
+                            }
+
+                            if (r.Y < t.Y)
+                                r.Y = t.Y;
+
+                            r.Width = image.Width;
+                            r.Height = image.Height;
+
+                            return (r);
+                        }
+                    }
+                }
+
+                return (Rectangle.Empty);
+            }
+        }
+
+        #endregion
+
+        #region InfoText
+
+        ///<summary>
+        /// Gets or sets the informational text associated with
+        /// the cell.  If the InfoText is non-null, then the cells
+        /// associated InfoImage is displayed in the cell, with the
+        /// InfoText being displayed as the ToolTip for the InfoImage.
+        ///</summary>
+        [DefaultValue(null), Category("Appearance")]
+        [Description("Indicates the informational text associated with the cell. If the InfoText is non-null, then the cells associated InfoImage is displayed in the cell, with the InfoText being displayed as the ToolTip for the InfoImage.")]
+        public string InfoText
+        {
+            get { return (_InfoText); }
+
+            set
+            {
+                if (_InfoText != value)
+                {
+                    _InfoText = value;
+
+                    UpdateInfoWindow();
+
+                    OnPropertyChangedEx("InfoText", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region IsActiveCell
+
+        ///<summary>
+        /// Gets whether the cell is the Active cell.
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsActiveCell
+        {
+            get
+            {
+                if (SuperGrid != null)
+                    return (SuperGrid.ActiveCell == this);
+
+                return(false);
+            }
+        }
+
+        #endregion
+
+        #region IsCellVisible
+
+        ///<summary>
+        /// Gets whether the cell is visible (taking row visibility,
+        /// column visibility, and expanded row state into account).
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsCellVisible
+        {
+            get
+            {
+                if (BoundsRelative.Width > 0)
+                {
+                    GridRow row = GridRow;
+
+                    if (row != null)
+                    {
+                        if (GridColumn.Visible == false)
+                            return (false);
+
+                        return (row.IsExpandedVisible);
+                    }
+                }
+
+                return (false);
+            }
+        }
+
+        #endregion
+
+        #region IsDataError
+
+        ///<summary>
+        /// Gets whether setting the cell Value has caused a Data Error
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsDataError
+        {
+            get { return (TestState(Cs.DataError)); }
+            internal set { SetState(Cs.DataError, value); }
+        }
+
+        #endregion
+
+        #region IsEditorCell
+
+        ///<summary>
+        /// Gets whether the cell is the cell being edited.
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsEditorCell
+        {
+            get
+            {
+                if (SuperGrid != null)
+                    return (SuperGrid.EditorCell == this);
+
+                return (false);
+            }
+        }
+
+        #endregion
+
+        #region IsEmptyCell
+
+        ///<summary>
+        /// Gets whether the cell is an Empty cell.
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsEmptyCell
+        {
+            get { return (TestState(Cs.EmptyCell)); }
+            internal set { SetState(Cs.EmptyCell, value); }
+        }
+
+        #endregion
+
+        #region IsHFrozen
+
+        ///<summary>
+        /// Gets whether the cell is horizontally frozen
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsHFrozen
+        {
+            get
+            {
+                GridColumn column = GridColumn;
+
+                if (column != null)
+                    return (column.IsHFrozen);
+
+                return (false);
+            }
+        }
+
+        #endregion
+
+        #region IsPrimaryCell
+
+        ///<summary>
+        /// Gets whether the cell is the defined PrimaryCell
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsPrimaryCell
+        {
+            get
+            {
+                GridPanel panel = GridPanel;
+
+                if (panel != null)
+                    return (panel.PrimaryColumnIndex == _ColumnIndex);
+
+                return (false);
+            }
+        }
+
+        #endregion
+
+        #region IsReadOnly
+
+        ///<summary>
+        /// Gets whether the cell is ReadOnly due to 
+        /// row, column, or cell ReadOnly property status.
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsReadOnly
+        {
+            get
+            {
+                GridPanel panel = GridPanel;
+
+                if (panel != null)
+                {
+                    if (panel.ReadOnly || GridColumn.ReadOnly || GridRow.ReadOnly)
+                        return (true);
+                }
+
+                return (TestState(Cs.ReadOnly));
+            }
+        }
+
+        #endregion
+
+        #region IsSelectable
+
+        ///<summary>
+        /// Gets whether the cell is selectable due to
+        /// row, column, or cell AllowSelection property status.
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsSelectable
+        {
+            get
+            {
+                return (AllowSelection == true &&
+                    GridRow.AllowSelection == true &&
+                    GridColumn.AllowSelection == true);
+            }
+        }
+
+        #endregion
+
+        #region IsSelected
+
+        ///<summary>
+        /// Gets or sets whether the cell is selected.
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsSelected
+        {
+            get
+            {
+                GridPanel panel = GridPanel;
+
+                if (panel != null)
+                {
+                    if (AllowSelection == true && panel.AllowSelection == true)
+                    {
+                        if (_SelectionUpdateCount != panel.SelectionUpdateCount)
+                        {
+                            _SelectionUpdateCount = panel.SelectionUpdateCount;
+
+                            AnySelected = false;
+
+                            if (GridRow != null && GridColumn != null)
+                            {
+                                if (GridRow.IsSelected == true || GridColumn.IsSelected == true)
+                                {
+                                    AnySelected = true;
+                                }
+                                else
+                                {
+                                    CellRange cr = GetCellRange();
+
+                                    if (cr != null && cr.Suspended == false)
+                                    {
+                                        AnySelected = cr.IsSelected(panel, RowContainer);
+                                    }
+                                    else
+                                    {
+                                        if (GridRow.ExpandedVisible(panel) == true)
+                                            Selected = panel.IsItemSelectedEx(this);
+
+                                        AnySelected = Selected;
+                                    }
+                                }
+                            }
+                        }
+
+                        return (AnySelected);
+                    }
+                }
+
+                return (false);
+            }
+
+            set
+            {
+                GridPanel panel = GridPanel;
+
+                if (panel != null)
+                {
+                    if (Selected != value)
+                    {
+                        Selected = value;
+
+                        if (GridRow != null)
+                        {
+                            if (GridRow.ExpandedVisible(panel) == true)
+                                panel.SetSelectedEx(this, value);
+
+                            if (value == true)
+                            {
+                                AnySelected = true;
+
+                                _SelectionUpdateCount = panel.SelectionUpdateCount;
+                            }
+
+                            InvalidateRender();
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region IsValueExpression
+
+        ///<summary>
+        /// Gets whether the cell Value is an expression.
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsValueExpression
+        {
+            get { return (TestState(Cs.ValueExpression)); }
+            internal set { SetState(Cs.ValueExpression, value); }
+        }
+
+        #endregion
+
+        #region IsValueNull
+
+        ///<summary>
+        /// Gets whether the cell Value is null.
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsValueNull
+        {
+            get
+            {
+                object value = Value;
+
+                return (((GridPanel != null && GridPanel.NullValue == NullValue.DBNull)
+                    ? DBNull.Value : null) == value);
+            }
+        }
+
+        #endregion
+
+        #region Merged
+
+        ///<summary>
+        ///Gets whether the cell is merged
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool Merged
+        {
+            get { return (TestState(Cs.Merged)); }
+
+            internal set
+            {
+                if (value != Merged)
+                {
+                    SetState(Cs.Merged, value);
+
+                    ClearEffectiveStyles();
+
+                    if (value == true && _mouseDownHitCell == this)
+                        DoRendererMouseLeave(EventArgs.Empty);
+                }
+            }
+        }
+
+        #endregion
+
+        #region MergedBottom
+
+        ///<summary>
+        ///Gets or sets whether the cell is Merged at the Bottom
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool MergedBottom
+        {
+            get { return (TestState(Cs.MergedBottom)); }
+            set { SetState(Cs.MergedBottom, value); }
+        }
+
+        #endregion
+
+        #region MergedLeft
+
+        ///<summary>
+        ///Gets or sets whether the cell is Merged to the Left
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool MergedLeft
+        {
+            get { return (TestState(Cs.MergedLeft)); }
+            set { SetState(Cs.MergedLeft, value); }
+        }
+
+        #endregion
+
+        #region MergedRight
+
+        ///<summary>
+        ///Gets or sets whether the cell is Merged to the Right
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool MergedRight
+        {
+            get { return (TestState(Cs.MergedRight)); }
+            set { SetState(Cs.MergedRight, value); }
+        }
+
+        #endregion
+
+        #region MergedTop
+
+        ///<summary>
+        ///Gets or sets whether the cell is Merged at the Top
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool MergedTop
+        {
+            get { return (TestState(Cs.MergedTop)); }
+            set { SetState(Cs.MergedTop, value); }
+        }
+
+        #endregion
+
+        #region MergeSuspended
+
+        ///<summary>
+        ///Gets whether the cell is merged and suspended.
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool MergeSuspended
+        {
+            get
+            {
+                CellRange cr = GetCellRange();
+
+                return (cr != null && cr.Suspended == true);
+            }
+        }
+
+        #endregion
+
+        #region NullString
+
+        /// <summary>
+        /// Gets how null values are displayed 
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public string NullString
+        {
+            get
+            {
+                GridPanel panel = GridPanel;
+
+                if (panel != null)
+                    return (GridColumn.NullString ?? panel.NullString);
+
+                return (String.Empty);
+            }
+        }
+
+        #endregion
+
+        #region ReadOnly
+
+        /// <summary>
+        /// Gets or sets whether the user can change cell contents
+        /// </summary>
+        [DefaultValue(false), Category("Behavior")]
+        [Description("Indicates whether the user can change cell contents.")]
+        public bool ReadOnly
+        {
+            get { return (TestState(Cs.ReadOnly)); }
+
+            set
+            {
+                if (value != ReadOnly)
+                {
+                    SetState(Cs.ReadOnly, value);
+
+                    OnPropertyChangedEx("ReadOnly", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region RenderControl
+
+        ///<summary>
+        /// Gets the current set Render Control for the cell
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public IGridCellEditControl RenderControl
+        {
+            get
+            {                    
+                if (_EditorInfo == null ||
+                    (_EditorInfo.RenderType == null && _EditorInfo.EditorType == null))
+                {
+                    return (null);
+                }
+
+                if (_EditorInfo.RenderControl == null)
+                {
+                    RenderControl = (_EditorInfo.RenderType != null)
+                                        ? GetEditControl(_EditorInfo.RenderType, _EditorInfo.RenderParams)
+                                        : GetEditControl(_EditorInfo.EditorType, _EditorInfo.EditorParams);
+                }
+
+                return (_EditorInfo.RenderControl);
+            }
+
+            internal set
+            {
+                if (_EditorInfo == null)
+                    _EditorInfo = new EditorInfo();
+
+                if (_EditorInfo.RenderControl != value)
+                {
+                    if (_EditorInfo.RenderControl != null)
+                    {
+                        if (_EditorInfo.RenderControl.EditorPanel.Parent != null)
+                            SuperGrid.Controls.Remove(_EditorInfo.RenderControl.EditorPanel);
+
+                        _EditorInfo.RenderControl.EditorCellBitmap = null;
+
+                        if (_EditorInfo.RenderType != null || _EditorInfo.EditorType != null)
+                            ((Control)_EditorInfo.RenderControl).Dispose();
+                    }
+
+                    _EditorInfo.RenderControl = value;
+
+                    if (_EditorInfo.RenderControl != null)
+                    {
+                        if (_EditorInfo.RenderControl.EditorPanel.Parent == null)
+                            SuperGrid.Controls.Add(_EditorInfo.RenderControl.EditorPanel);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region RenderParams
+
+        /// <summary>
+        /// Gets or sets an array of arguments that match in number,
+        /// order, and type the parameters of the RenderControl constructor
+        /// to invoke. If empty or null, the default constructor is invoked.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public object[] RenderParams
+        {
+            get
+            {
+                if (_EditorInfo == null)
+                    return (null);
+
+                return (_EditorInfo.RenderParams);
+            }
+
+            set
+            {
+                if (_EditorInfo == null)
+                    _EditorInfo = new EditorInfo();
+
+                if (IsSameParams(_EditorInfo.RenderParams, value) == false)
+                {
+                    _EditorInfo.RenderParams = value;
+
+                    RenderControl = null;
+
+                    NeedsMeasured = true;
+
+                    OnPropertyChangedEx("RenderParams", VisualChangeType.Layout);
+                }
+
+                if (_EditorInfo.IsEmpty == true)
+                    _EditorInfo = null;
+            }
+        }
+
+        #endregion
+
+        #region RenderType
+
+        ///<summary>
+        /// Gets or sets the cell render type. This is the control
+        /// type used to perform the default rendering of the cell value
+        ///</summary>
+        [DefaultValue(null), Category("Data")]
+        [Description("Indicates the cell render type. This is the control type used to perform the default rendering of the cell value.")]
+        [TypeConverter(typeof(EditTypeConverter))]
+        [Editor("DevComponents.SuperGrid.Design.EditTypeEditor, DevComponents.SuperGrid.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=26d81176cfa2b486", typeof(UITypeEditor))]
+        public Type RenderType
+        {
+            get
+            {
+                if (_EditorInfo == null)
+                    return (null);
+
+                return (_EditorInfo.RenderType);
+            }
+
+            set
+            {
+                if (value != null || _EditorInfo != null)
+                {
+                    if (_EditorInfo == null)
+                        _EditorInfo = new EditorInfo();
+
+                    if (_EditorInfo.RenderType != value)
+                    {
+                        _EditorInfo.RenderType = value;
+                        _EditorInfo.RenderControl = null;
+
+                        NeedsMeasured = true;
+
+                        OnPropertyChangedEx("RenderType", VisualChangeType.Layout);
+                    }
+
+                    if (_EditorInfo.IsEmpty == true)
+                        _EditorInfo = null;
+                }
+            }
+        }
+
+        #endregion
+
+        #region RowIndex
+
+        /// <summary>
+        /// Gets the associated Row index for the cell
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public int RowIndex
+        {
+            get
+            {
+                GridRow row = GridRow;
+
+                return (row != null ? row.RowIndex : -1);
+            }
+        }
+
+        #endregion
+
+        #region UnMergedBounds
+
+        ///<summary>
+        /// Gets the scroll adjusted un-merged bounds of the cell
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public Rectangle UnMergedBounds
+        {
+            get
+            {
+                if (_BoundsUpdateCount != SuperGrid.BoundsUpdateCount)
+                    UpdateBoundingRects();
+
+                return (_Bounds);
+            }
+        }
+
+        #endregion
+
+        #region Value
+
+        /// <summary>
+        /// Gets or sets the cell value
+        /// </summary>
+        [DefaultValue(null), Category("Data")]
+        [Description("Indicates the cell value.")]
+        [TypeConverter(typeof(ValueTypeConverter))]
+        [Editor("DevComponents.SuperGrid.Design.ValueTypeEditor, DevComponents.SuperGrid.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=26d81176cfa2b486", typeof(UITypeEditor))]
+        public object Value
+        {
+            get
+            {
+                GridPanel panel = GridPanel;
+
+                if (panel != null)
+                {
+                    object o = GetValue(panel);
+
+                    if (SuperGrid != null)
+                        SuperGrid.DoGetCellValueEvent(this, ref o);
+
+                    return (o);
+                }
+
+                return (_Value);
+            }
+
+            set
+            {
+                if ((value != null && value.Equals(_Value) == false) ||
+                    (value == null && _Value != null))
+                {
+                    object oldValue = _Value;
+
+                    SetValue(value);
+
+                    GridRow row = GridRow;
+
+                    if (row != null && row.Loading == false)
+                        OnValueChanged(oldValue, value, DataContext.CellEdit);
+                }
+            }
+        }
+
+        #region GetValue
+
+        /// <summary>
+        /// GetValue
+        /// </summary>
+        /// <param name="panel"></param>
+        /// <returns></returns>
+        protected virtual object GetValue(GridPanel panel)
+        {
+            if (panel.DataSource != null)
+            {
+                if (ActiveIList(panel) == true ||
+                    _DataResetCount != panel.DataBinder.DataResetCount)
+                {
+                    _DataResetCount = panel.DataBinder.DataResetCount;
+
+                    object o = panel.DataBinder.GetValue(this, _Value);
+
+                    if ((o == null && o != _Value) ||
+                        (o != null && o.Equals(_Value) == false))
+                    {
+                        _Value = o;
+
+                        GridColumn.NeedsFilterScan = true;
+
+                        InvalidateRender();
+
+                        return (o);
+                    }
+                }
+            }
+
+            return (_Value);
+        }
+
+        #region ActiveIList
+
+        private bool ActiveIList(GridPanel panel)
+        {
+            if (panel.DataSource is IList &&
+                (panel.DataSource is IListSource == false &&
+                 panel.DataSource is IBindingList == false))
+            {
+                GridRow row = GridRow;
+
+                if (row != null)
+                {
+                    if (panel.LatentActiveRowIndex < 0 && row.IsTempInsertRow == false)
+                        return (true);
+                }
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region SetValue
+
+        /// <summary>
+        /// SetValue
+        /// </summary>
+        /// <param name="value"></param>
+        protected virtual void SetValue(object value)
+        {
+            _Value = value;
+
+            GridPanel panel = GridPanel;
+
+            if (panel != null)
+            {
+                GridRow row = GridRow;
+
+                if (row.Loading == false && IsLoading() == false)
+                {
+                    GridColumn column = GridColumn;
+
+                    panel.DataBinder.SetValue(this, value);
+
+                    row.RowNeedsStored = true;
+                    column.NeedsFilterScan = true;
+
+                    if (column.IsGroupColumn == true)
+                    {
+                        if (row == panel.ActiveRow)
+                            row.RowNeedsGrouped = true;
+                        else
+                            panel.NeedsGrouped = true;
+                    }
+
+                    if (panel.KeepRowsSorted == true)
+                    {
+                        if (column.IsSortColumn == true)
+                        {
+                            if (row.IsTempInsertRow == false)
+                            {
+                                if (row == panel.ActiveRow)
+                                    row.RowNeedsSorted = true;
+                                else
+                                    panel.NeedsSorted = true;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        private bool IsLoading()
+        {
+            SuperGridControl sg = SuperGrid;
+
+            return (sg == null || sg.Parent == null);
+        }
+
+        #endregion
+
+        #region OnValueChanged
+
+        private void OnValueChanged(object oldValue, object newValue, DataContext context)
+        {
+            NeedsMeasured = true;
+
+            IsDataError = false;
+
+            ClearEffectiveStyles();
+
+            if (GridRow.Loading == false)
+                RefreshCellEditor();
+
+            OnPropertyChanged("Value");
+
+            GridPanel panel = GridPanel;
+
+            if (panel != null)
+            {
+                SuperGrid.DoCellValueChangedEvent(this, oldValue, newValue, context);
+
+                if (panel.EnableCellExpressions == true)
+                {
+                    if (GridRow.Loading == false)
+                        UpdateCellExp(panel, oldValue, newValue);
+                }
+
+                UpdateMerge(panel);
+            }
+        }
+
+        #region RefreshCellEditor
+
+        private void RefreshCellEditor()
+        {
+            if (SuperGrid != null)
+            {
+                IGridCellEditControl editor = GetInternalEditControl(true);
+
+                if (editor != null)
+                {
+                    if (SuperGrid.NonModalEditorCell == this)
+                        RefreshNonModalEditor();
+
+                    else if (SuperGrid.EditorCell == this)
+                        RefreshEditor(editor);
+
+                    switch (editor.ValueChangeBehavior)
+                    {
+                        case ValueChangeBehavior.InvalidateLayout:
+                            GridColumn.NeedsResized = true;
+                            GridRow.NeedsMeasured = true;
+
+                            InvalidateLayout();
+                            break;
+
+                        default:
+                            InvalidateRender();
+                            break;
+                    }
+                }
+            }
+        }
+
+        #region RefreshEditor
+
+        private void RefreshEditor(IGridCellEditControl editor)
+        {
+            editor.SuspendUpdate = true;
+
+            try
+            {
+                CellVisualStyle style = GetEffectiveStyle();
+
+                editor.InitializeContext(this, style);
+            }
+            finally
+            {
+                editor.SuspendUpdate = false;
+            }
+        }
+
+        #endregion
+
+        #region RefreshNonModalEditor
+
+        private void RefreshNonModalEditor()
+        {
+            if (SuperGrid.ActiveNonModalEditor != null)
+            {
+                SuperGrid.ActiveNonModalEditor.EditorValue = _Value;
+
+                CellVisualStyle style = GetEffectiveStyle();
+
+                InitializeContext(DataContext.CellValueLoad,
+                    SuperGrid.ActiveNonModalEditor, style);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region UpdateMerge
+
+        private void UpdateMerge(GridPanel panel)
+        {
+            CellRange cr = GetCellRange();
+
+            if (cr != null && cr.Suspended == true)
+            {
+                Modified = true;
+                cr.Modified = true;
+            }
+            else
+            {
+                if (CellCanMerge(panel) == true)
+                {
+                    MergeUpdateCount--;
+
+                    if (RowContainer.IsMergeSuspended == true)
+                        RowContainer.MergeUpdateCount++;
+
+                    RowContainer.NeedMergeLayout = true;
+
+                    RowContainer.InvalidateLayout();
+                }
+            }
+        }
+
+        #region CellCanMerge
+
+        private bool CellCanMerge(GridPanel panel)
+        {
+            if (panel != null && panel.EnableCellMerging == true)
+            {
+                CellMergeMode cMode = GridColumn.CellMergeMode;
+
+                if (cMode == CellMergeMode.NotSet)
+                    cMode = panel.CellMergeMode;
+
+                return (cMode != CellMergeMode.None);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region UpdateCellExp
+
+        internal void UpdateCellExp(
+            GridPanel panel, object oldValue, object value)
+        {
+            string oldExp = oldValue as string;
+            string newExp = value as string;
+
+            if (oldExp != null)
+            {
+                oldExp = oldExp.Trim();
+
+                if (oldExp.StartsWith("="))
+                {
+                    panel.ExpDictionary.Remove(this);
+
+                    InfoText = null;
+                }
+            }
+
+            IsValueExpression = false;
+
+            if (newExp != null)
+            {
+                newExp = newExp.Trim();
+
+                if (newExp.StartsWith("="))
+                    SetCellExp(panel, newExp);
+            }
+
+            RefreshExpressions(panel, this, new List<GridCell>());
+        }
+
+        #region RefreshExpressions
+
+        private void RefreshExpressions(
+            GridPanel panel, GridCell gridCell, List<GridCell> usedCells)
+        {
+            foreach (KeyValuePair<GridCell, EEval> item in panel.ExpDictionary)
+            {
+                List<GridCell> cells = item.Value.GetCellReferences();
+
+                if (cells != null)
+                {
+                    if (cells.Contains(gridCell) == true)
+                    {
+                        item.Key.InvalidateRender();
+
+                        if (usedCells.Contains(item.Key) == false)
+                        {
+                            usedCells.Add(item.Key);
+
+                            RefreshExpressions(panel, item.Key, usedCells);
+
+                            usedCells.Remove(item.Key);
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region SetCellExp
+
+        internal void SetCellExp(GridPanel panel, string newExp)
+        {
+            if (panel.EnableCellExpressions == true)
+            {
+                IsValueExpression = false;
+
+                while (true)
+                {
+                    try
+                    {
+                        EEval eval = new EEval(this, newExp);
+
+                        panel.ExpDictionary[this] = eval;
+
+                        InfoText = null;
+                        IsValueExpression = true;
+
+                        break;
+                    }
+                    catch (Exception exp)
+                    {
+                        bool retry = false;
+                        bool throwException = false;
+
+                        if (SuperGrid.HasDataErrorHandler == true)
+                        {
+                            object value = newExp;
+
+                            if (SuperGrid.DoDataErrorEvent(GridPanel, this, exp,
+                                DataContext.CellExpressionParse, ref value, ref throwException, ref retry) == true)
+                            {
+                                return;
+                            }
+                        }
+
+                        if (throwException == true)
+                            throw;
+
+                        InfoText = exp.Message;
+
+                        if (retry == false)
+                            break;
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region TestState
+
+        private bool TestState(Cs state)
+        {
+            return ((_States & state) == state);
+        }
+
+        #endregion
+
+        #region SetState
+
+        private void SetState(Cs state, bool value)
+        {
+            if (value == true)
+                _States |= state;
+            else
+                _States &= ~state;
+        }
+
+        #endregion
+
+        #region MeasureOverride
+
+        //private int _MeasureCount;
+
+        /// <summary>
+        /// Performs the layout of the item and sets
+        /// the Size property to size that item will take.
+        /// </summary>
+        /// <param name="layoutInfo">Layout information.</param>
+        /// <param name="stateInfo"></param>
+        /// <param name="constraintSize"></param>
+        protected override void MeasureOverride(
+            GridLayoutInfo layoutInfo, GridLayoutStateInfo stateInfo, Size constraintSize)
+        {
+           //_MeasureCount++;
+
+            MeasureCell(layoutInfo.Graphics,
+                stateInfo.GridPanel, stateInfo.IndentLevel, constraintSize);
+        }
+
+        #region MeasureCell
+
+        private void MeasureCell(Graphics g,
+            GridPanel panel, int indentLevel, Size constraintSize)
+        {
+            Size sizeNeeded = Size.Empty;
+
+            if (ColumnIndex < panel.Columns.Count)
+            {
+                CellVisualStyle style = GetSizingStyle(panel);
+                Size imageSize = style.GetFigureSize(panel);
+
+                Alignment imageAlignment = style.ImageAlignment;
+
+                if (style.IsOverlayImage == true)
+                    imageAlignment = Alignment.MiddleCenter;
+
+                int width = constraintSize.Width;
+
+                Size borderSize = style.GetBorderSize(true);
+
+                int bwidth = borderSize.Width + Dpi.Width2;
+                int bheight = borderSize.Height + Dpi.Height2;
+
+                if (constraintSize.Width > 1)
+                {
+                    switch (imageAlignment)
+                    {
+                        case Alignment.TopCenter:
+                        case Alignment.MiddleCenter:
+                        case Alignment.BottomCenter:
+                            break;
+
+                        default:
+                            width -= imageSize.Width;
+                            break;
+                    }
+
+                    width -= bwidth;
+
+                    if (BoundsRelative.X == GridPanel.Bounds.X)
+                        width -= Dpi.Width1;
+                }
+
+                _ContentSize =
+                    GetProposedSize(g, style, new Size(width, 0));
+
+                switch (imageAlignment)
+                {
+                    case Alignment.MiddleCenter:
+                        sizeNeeded.Height = Math.Max(imageSize.Height, _ContentSize.Height) + bheight;
+                        sizeNeeded.Width = Math.Max(_ContentSize.Width, imageSize.Width) + bwidth;
+                        break;
+
+                    case Alignment.TopCenter:
+                    case Alignment.BottomCenter:
+                        sizeNeeded.Width = Math.Max(_ContentSize.Width, imageSize.Width) + bwidth;
+                        sizeNeeded.Height = _ContentSize.Height + imageSize.Height + bheight;
+                        break;
+
+                    default:
+                        sizeNeeded.Width = _ContentSize.Width + imageSize.Width + bwidth;
+                        sizeNeeded.Height = Math.Max(imageSize.Height, _ContentSize.Height) + bheight;
+                        break;
+                }
+
+                if (panel.GroupColumns.Count > 0)
+                {
+                    if (panel.Columns.FirstVisibleColumn == GridColumn)
+                        sizeNeeded.Width += Dpi.Width(panel.LevelIndentSize.Width * (indentLevel + 1));
+                }
+
+                if (GridRow != null &&
+                    (GridRow.Rows.Count > 0 || GridRow.RowsUnresolved == true))
+                {
+                    if (panel.ExpandImage != null)
+                    {
+                        sizeNeeded.Height = Math.Max(sizeNeeded.Height,
+                            Dpi.Height(panel.ExpandImage.Height + 4));
+                    }
+
+                    if (panel.CollapseImage != null)
+                    {
+                        sizeNeeded.Height = Math.Max(sizeNeeded.Height,
+                            Dpi.Height(panel.CollapseImage.Height + 4));
+                    }
+                }
+
+                if (panel.CheckBoxes == true)
+                {
+                    sizeNeeded.Height = Math.Max(sizeNeeded.Height,
+                        Dpi.Height(panel.CheckBoxSize.Height));
+
+                    sizeNeeded.Width += Dpi.Width(CheckBoxSpacing * 2);
+                }
+            }
+
+            sizeNeeded.Width += Dpi.Width3;
+            sizeNeeded.Height += Dpi.Width3;
+
+            if (constraintSize.Width > 0)
+                sizeNeeded.Width = constraintSize.Width;
+
+            _MeasuredSize = sizeNeeded;
+
+            Size = sizeNeeded;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ArrangeOverride
+
+        /// <summary>
+        /// Performs the arrange pass layout of the item
+        /// when final position and size of the item has been set.
+        /// </summary>
+        /// <param name="layoutInfo">Layout information.</param>
+        /// <param name="stateInfo"></param>
+        /// <param name="layoutBounds"></param>
+        protected override void ArrangeOverride(GridLayoutInfo layoutInfo,
+            GridLayoutStateInfo stateInfo, Rectangle layoutBounds)
+        {
+            GridPanel panel = stateInfo.GridPanel;
+            Rectangle r = layoutBounds;
+
+            r.X += _IndentLevel * Dpi.Width(panel.LevelIndentSize.Width);
+            r.Width = panel.TreeButtonIndent;
+
+            ArrangeExpandButton(panel, ref r);
+            ArrangeCheckBox(panel, r);
+
+            _toolTipText = null;
+        }
+
+        #region ArrangeExpandButton
+
+        private void ArrangeExpandButton(GridPanel panel, ref Rectangle r)
+        {
+            if (IsPrimaryCell == true)
+            {
+                Rectangle t = Rectangle.Empty;
+
+                if (panel.ShowTreeButtons == true)
+                {
+                    if (NeedsExpandButton() == true)
+                    {
+                        t = r;
+
+                        Size size = panel.GetTreeButtonSize();
+
+                        t.X += (r.Width - size.Width) / 2;
+                        t.Y += (r.Height - size.Height) / 2 - 1;
+
+                        t.Size = size;
+                    }
+
+                    int tbi = panel.TreeButtonIndent;
+
+                    r.X += tbi;
+                    r.Width -= tbi;
+                }
+                else
+                {
+                    if (panel.CheckBoxes == true)
+                    {
+                        int cbs = Dpi.Width(CheckBoxSpacing);
+
+                        r.X += cbs;
+                        r.Width -= cbs;
+                    }
+                }
+
+                GridRow.ExpandButtonBounds = t;
+            }
+        }
+
+        #region NeedsExpandButton
+
+        private bool NeedsExpandButton()
+        {
+            GridRow row = GridRow;
+
+            if (row != null)
+            {
+                if (row.ShowTreeButton == true)
+                {
+                    if (row.RowsUnresolved || row.HasVisibleItems)
+                        return (true);
+                }
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ArrangeCheckBox
+
+        private void ArrangeCheckBox(GridPanel panel, Rectangle r)
+        {
+            if (IsPrimaryCell == true)
+            {
+                if (GridRow.HasCheckBox == true)
+                {
+                    Size cbSize = Dpi.Size(panel.CheckBoxSize);
+
+                    int n = Math.Max(cbSize.Width, cbSize.Height);
+
+                    r.Y += (r.Height - n) / 2;
+
+                    r.Width = n;
+                    r.Height = n;
+
+                    GridRow.CheckBoxBounds = r;
+                }
+                else
+                {
+                    GridRow.CheckBoxBounds = Rectangle.Empty;
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderOverride
+
+        /// <summary>
+        /// Performs drawing of the item and its children.
+        /// </summary>
+        /// <param name="renderInfo">Holds contextual rendering information.</param>
+        protected override void RenderOverride(GridRenderInfo renderInfo)
+        {
+            GridPanel panel = GridPanel;
+
+            if (panel != null)
+            {
+                Graphics g = renderInfo.Graphics;
+
+                CheckMeasure(panel, g);
+
+                CellRange cr = GetStateCellRange();
+
+                bool rendered = (cr != null && (cr.RenderCount == panel.RenderCount));
+
+                Rectangle backBounds = (cr != null) ? cr.BackBounds : BackBounds;
+                Rectangle bounds = GetBounds(panel, backBounds);
+
+                if (backBounds.IntersectsWith(SuperGrid.ViewRectEx) == true)
+                {
+                    if (rendered == false)
+                    {
+                        CellHighlightMode mode = GetCellHighlightMode(panel);
+                        CellVisualStyle style = GetEffectiveStyle();
+
+                        RenderCellBackground(g, panel, backBounds, mode);
+                        RenderGridBorder(g, panel, backBounds);
+
+                        int n = RenderLevelData(g, panel);
+
+                        Rectangle r = bounds;
+                        r.X += n;
+                        r.Width -= n;
+
+                        RenderCellBorder(g, panel, r, style);
+                        RenderImageAndValue(g, panel, bounds, mode, style);
+
+                        if (this.IsDataError == true)
+                            RenderDataError(g);
+
+                        else if (GridRow.IsDeleted == true)
+                            RenderDeleted(g);
+
+                        RenderFocusRect(g, panel, cr, backBounds);
+
+                        if (cr != null)
+                            cr.RenderCount = panel.RenderCount;
+                    }
+                    else
+                    {
+                        RenderLevelData(g, panel);
+                    }
+                }
+            }
+        }
+
+        #region CheckMeasure
+
+        private void CheckMeasure(GridPanel panel, Graphics g)
+        {
+            if (NeedsMeasured == true)
+            {
+                NeedsMeasured = false;
+
+                Size size = new Size(GridColumn.Size.Width, GridRow.Size.Height);
+
+                if (panel.VirtualMode == false)
+                    MeasureCell(g, panel, IndentLevel, size);
+
+                size.Height = GridRow.FixedRowHeight;
+                Size = size;
+
+                UpdateBoundingRects();
+            }
+        }
+
+        #endregion
+
+        #region RenderCellBackground
+
+        private void RenderCellBackground(Graphics g,
+            GridPanel panel, Rectangle r, CellHighlightMode mode)
+        {
+            if (SuperGrid.DoPreRenderCellEvent(g, this, RenderParts.Background, r) == false)
+            {
+                RenderCellBackgroundEx(panel, g, r, mode);
+                SuperGrid.DoPostRenderCellEvent(g, this, RenderParts.Background, r);
+            }
+        }
+
+        #region RenderCellBackgroundEx
+
+        private void RenderCellBackgroundEx(GridPanel panel,
+            Graphics g, Rectangle r, CellHighlightMode type)
+        {
+            if (SuperGrid.EditorCell == this)
+            {
+                TextBox tb = GetInternalEditControl() as TextBox;
+
+                if (tb != null)
+                {
+                    using (Brush br = new SolidBrush(tb.BackColor))
+                        RenderBackground(g, r, type, br);
+
+                    return;
+                }
+            }
+
+            using (Brush br = GetContentBrush(panel, r, type))
+                RenderBackground(g, r, type, br);
+        }
+
+        #region RenderBackground
+
+        private void RenderBackground(
+            Graphics g, Rectangle r, CellHighlightMode type, Brush br)
+        {
+            if (type == CellHighlightMode.Partial ||
+                type == CellHighlightMode.Content)
+            {
+                r = RenderPartialBackground(g, r, type);
+            }
+
+            if (r.Width > 0 && r.Height > 0)
+                g.FillRectangle(br, r);
+        }
+
+        #endregion
+
+        #region RenderPartialBackground
+
+        private Rectangle RenderPartialBackground(
+            Graphics g, Rectangle r, CellHighlightMode type)
+        {
+            CellVisualStyle defaultStyle =
+                GetEffectiveStyle(StyleType.Default);
+
+            using (Brush br = defaultStyle.Background.GetBrush(r))
+                g.FillRectangle(br, r);
+
+            r = GetAdjustedBounds(ContentBounds);
+
+            if (type == CellHighlightMode.Content)
+            {
+                IGridCellEditControl editor = GetInternalRenderControl();
+
+                r = GetEditPanelBounds(editor, r);
+            }
+
+            r.Inflate(1, 1);
+
+            return (r);
+        }
+
+        #endregion
+
+        #region GetContentBrush
+
+        private Brush GetContentBrush(
+            GridPanel panel, Rectangle r, CellHighlightMode type)
+        {
+            if (IsEmptyCell == true && panel.AllowEmptyCellSelection == false)
+            {
+                CellVisualStyle style =
+                    GetEffectiveStyle(StyleType.Empty);
+
+                return (style.Background.GetBrush(r));
+            }
+
+            if (IsSelectable == false)
+            {
+                CellVisualStyle style =
+                    GetEffectiveStyle(StyleType.NotSelectable);
+
+                return (style.Background.GetBrush(r));
+            }
+
+            if (type == CellHighlightMode.None)
+            {
+                CellVisualStyle style =
+                    GetEffectiveStyle(false);
+
+                return (style.Background.GetBrush(r));
+            }
+
+            CellVisualStyle contentStyle = GetContentStyle(panel);
+
+            return (contentStyle.Background.GetBrush(r));
+        }
+
+        #endregion
+
+        #region GetContentStyle
+
+        private CellVisualStyle GetContentStyle(GridPanel panel)
+        {
+            if (panel.SelectionGranularity == SelectionGranularity.Row)
+            {
+                StyleState cellState = StyleState.Default;
+
+                if (IsReadOnly == true)
+                    cellState |= StyleState.ReadOnly;
+
+                Rectangle t = ViewRect;
+                Rectangle r = GridRow.Bounds;
+
+                CellRange cr = GetCellRange();
+
+                if (cr != null)
+                    r = Rectangle.Union(r, cr.BackBounds);
+
+                r.Intersect(t);
+
+                if (SuperGrid.ScrollBarScrolling == false)
+                {
+                    if (panel.RowHighlightType == RowHighlightType.Full)
+                    {
+                        if (GridRow.IsMouseOver == true)
+                            cellState |= StyleState.MouseOver;
+                    }
+                    else
+                    {
+                        if (r.Contains(SuperGrid.PointToClient(Control.MousePosition)))
+                            cellState |= StyleState.MouseOver;
+                    }
+                }
+
+                if (IsSelected == true)
+                    cellState |= StyleState.Selected;
+
+                return (GetEffectiveStyle(cellState));
+            }
+
+            return (GetEffectiveStyle());
+        }
+
+        #endregion
+
+        #region GetCellHighlightMode
+
+        private CellHighlightMode GetCellHighlightMode(GridPanel panel)
+        {
+            if (panel.SelectionGranularity != SelectionGranularity.Cell)
+            {
+                switch (panel.RowHighlightType)
+                {
+                    case RowHighlightType.None:
+                        return (CellHighlightMode.None);
+
+                    case RowHighlightType.PrimaryColumnOnly:
+                        return (IsPrimaryCell == true
+                            ? CellHighlightMode.Full : CellHighlightMode.None);
+
+                    default:
+                        return (CellHighlightMode.Full);
+                }
+            }
+
+            if (GridRow.IsSelected == true)
+                return (CellHighlightMode.Full);
+
+            return (GridColumn.CellHighlightMode);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region RenderGridBorder
+
+        private void RenderGridBorder(
+            Graphics g, GridPanel panel, Rectangle r)
+        {
+            if (SuperGrid.DoPreRenderCellEvent(g, this, RenderParts.Border, r) == false)
+            {
+                RenderGridBorderEx(g, panel, r);
+                SuperGrid.DoPostRenderCellEvent(g, this, RenderParts.Border, r);
+            }
+        }
+
+        private void RenderGridBorderEx(
+            Graphics g, GridPanel panel, Rectangle r)
+        {
+            if (panel.GridLines != GridLines.None)
+            {
+                GridPanelVisualStyle pstyle = panel.GetEffectiveStyle();
+
+                if (panel.GridLines == GridLines.Both)
+                    RenderBothGridBorders(g, pstyle, r);
+
+                else if (panel.GridLines == GridLines.Vertical)
+                    RenderVGridBorder(g, pstyle, r);
+
+                else if (panel.GridLines == GridLines.Horizontal)
+                    RenderHGridBorder(g, pstyle, r);
+            }
+        }
+
+        #region RenderBothGridBorders
+
+        private void RenderBothGridBorders(
+            Graphics g, GridPanelVisualStyle pstyle, Rectangle r)
+        {
+            RenderHGridBorder(g, pstyle, r);
+            RenderVGridBorder(g, pstyle, r);
+        }
+
+        #endregion
+
+        #region RenderHGridBorder
+
+        private void RenderHGridBorder(Graphics g, GridPanelVisualStyle pstyle, Rectangle r)
+        {
+            if (pstyle.HorizontalLinePattern != LinePattern.None &&
+                pstyle.HorizontalLinePattern != LinePattern.NotSet)
+            {
+                using (Pen pen = new Pen(pstyle.HorizontalLineColor, Dpi.Height1))
+                {
+                    pen.DashStyle = (DashStyle)pstyle.HorizontalLinePattern;
+                    pen.DashOffset = r.X % 2;
+
+                    g.DrawLine(pen, r.X, r.Top - 1, r.Right - 1, r.Top - 1);
+                    g.DrawLine(pen, r.X, r.Bottom - 1, r.Right - 1, r.Bottom - 1);
+                }
+            }
+        }
+
+        #endregion
+
+        #region RenderVGridBorder
+
+        private void RenderVGridBorder(Graphics g, GridPanelVisualStyle pstyle, Rectangle r)
+        {
+            if (pstyle.VerticalLinePattern != LinePattern.None &&
+                pstyle.VerticalLinePattern != LinePattern.NotSet)
+            {
+                using (Pen pen = new Pen(pstyle.VerticalLineColor, Dpi.Width1))
+                {
+                    pen.DashStyle = (DashStyle)pstyle.VerticalLinePattern;
+                    pen.DashOffset = r.Top % 2;
+
+                    g.DrawLine(pen, r.Right - 1, r.Top, r.Right - 1, r.Bottom);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderLevelData
+
+        private int RenderLevelData(Graphics g, GridPanel panel)
+        {
+            int n = 0;
+
+            if (IsPrimaryCell == true)
+            {
+                Rectangle r = BackBounds;
+
+                int x = r.X;
+
+                RenderCellTreeData(g, panel, ref r);
+                RenderCellCheckBox(g, panel, ref r);
+
+                n = r.X - x;
+            }
+            else
+            {
+                if (panel.GroupColumns.Count > 0)
+                {
+                    if (panel.Columns.FirstVisibleColumn == GridColumn)
+                        n = Dpi.Width(panel.LevelIndentSize.Width * _IndentLevel);
+                }
+            }
+
+            return (n);
+        }
+
+        #region RenderCellTreeData
+
+        private void RenderCellTreeData(
+            Graphics g, GridPanel panel, ref Rectangle r)
+        {
+            int liw = Dpi.Width(panel.LevelIndentSize.Width);
+
+            if (panel.ShowTreeButtons == true || panel.ShowTreeLines == true)
+            {
+                GridRow row = GridRow;
+                Rectangle t = row.ExpandButtonBounds;
+
+                if (row.IsVFrozen == false)
+                    t.Y -= VScrollOffset;
+
+                if (panel.IsSubPanel == true || GridColumn.IsHFrozen == false)
+                    t.X -= HScrollOffset;
+
+                bool hasExpandButton = (panel.ShowTreeButtons == true &&
+                    row.ExpandButtonBounds.IsEmpty == false);
+
+                int tbi = panel.TreeButtonIndent;
+
+                if (panel.ShowTreeLines == true)
+                {
+                    Rectangle p = r;
+
+                    p.Y--;
+                    p.Height++;
+
+                    TreeDisplay.RenderLines(g, 
+                        panel, p, row, _IndentLevel, liw, tbi, hasExpandButton);
+                }
+
+                if (hasExpandButton == true)
+                {
+                    Point pt = Control.MousePosition;
+                    pt = SuperGrid.PointToClient(pt);
+
+                    bool hot = t.Contains(pt);
+
+                    Image image = (row.Expanded == true)
+                        ? panel.GetCollapseButton(g, hot) : panel.GetExpandButton(g, hot);
+
+                    ExpandDisplay.RenderButton(g, image, t, r);
+                }
+
+                r.X += tbi;
+                r.Width -= tbi;
+            }
+
+            int n = liw * _IndentLevel;
+
+            r.X += n;
+            r.Width -= n;
+        }
+
+        #endregion
+
+        #region RenderCellCheckBox
+
+        private void RenderCellCheckBox(
+            Graphics g, GridPanel panel, ref Rectangle r)
+        {
+            if (GridRow.HasCheckBox == true)
+            {
+                Rectangle t = CheckBoxBounds;
+
+                if (GridRow.IsVFrozen == false)
+                    t.Y -= VScrollOffset;
+
+                if (panel.IsSubPanel == true || GridColumn.IsHFrozen == false)
+                    t.X -= HScrollOffset;
+
+                Region clip = null;
+
+                if (t.Right >= r.Right || t.Height >= r.Height)
+                {
+                    Rectangle z = r;
+                    z.Width--;
+                    z.Height--;
+
+                    clip = g.Clip;
+                    g.SetClip(z, CombineMode.Intersect);
+                }
+
+                if (GridRow.Checked == true)
+                {
+                    CheckDisplay.RenderCheckbox(g, t,
+                        CheckBoxState.CheckedNormal, ButtonState.Checked);
+                }
+                else
+                {
+                    CheckDisplay.RenderCheckbox(g, t,
+                        CheckBoxState.UncheckedNormal, ButtonState.Normal);
+                }
+
+                if (clip != null)
+                    g.Clip = clip;
+
+                r.X += panel.CheckBoxSize.Width + (CheckBoxSpacing * 2);
+                r.Width -= (panel.CheckBoxSize.Width + (CheckBoxSpacing * 2));
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderCellBorder
+
+        private void RenderCellBorder(Graphics g,
+            GridPanel panel, Rectangle r, CellVisualStyle style)
+        {
+            if (SuperGrid.DoPreRenderCellEvent(g, this, RenderParts.Border, r) == false)
+            {
+                RenderCellBorderEx(g, panel, r, style);
+                SuperGrid.DoPostRenderCellEvent(g, this, RenderParts.Border, r);
+            }
+        }
+
+        #region RenderCellBorderEx
+
+        private void RenderCellBorderEx(
+            Graphics g, GridPanel panel, Rectangle r, CellVisualStyle style)
+        {
+            Rectangle t = GetBorderRect(panel, r, style);
+
+            style.RenderBorder(g, t);
+        }
+
+        #region GetBorderRect
+
+        private Rectangle GetBorderRect(
+            GridPanel panel, Rectangle r, CellVisualStyle style)
+        {
+            r.X += Dpi.Width(style.Margin.Left);
+            r.Width -= Dpi.Width(style.Margin.Horizontal);
+
+            r.Y += Dpi.Height(style.Margin.Top);
+            r.Height -= Dpi.Height(style.Margin.Vertical);
+
+            if (panel.GridLines == GridLines.Horizontal || panel.GridLines == GridLines.Both)
+                r.Height -= Dpi.Height1;
+
+            if (panel.GridLines == GridLines.Vertical || panel.GridLines == GridLines.Both)
+                r.Width -= Dpi.Width1;
+
+            return (r);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region RenderImageAndValue
+
+        private void RenderImageAndValue(Graphics g,
+            GridPanel panel, Rectangle bounds, CellHighlightMode mode, CellVisualStyle style)
+        {
+            Rectangle r = GetAdjustedBounds(GetContentBounds(panel, bounds));
+
+            if (style.ImageOverlay != ImageOverlay.Top)
+                RenderCellImage(g, panel, style, bounds, r, mode);
+
+            if (CanRenderCellValue() == true)
+            {
+                if (SuperGrid.DoPreRenderCellEvent(g, this, RenderParts.Content, r) == false)
+                {
+                    RenderCellValue(g, style, r);
+                    SuperGrid.DoPostRenderCellEvent(g, this, RenderParts.Content, r);
+                }
+            }
+            else
+            {
+                if (SuperGrid.EditorCell == this && Visible == true && IsEmptyCell == false)
+                    RenderCellInfo(g, panel);
+            }
+
+            if (style.ImageOverlay == ImageOverlay.Top)
+                RenderCellImage(g, panel, style, bounds, r, mode);
+        }
+
+        #region RenderCellImage
+
+        private void RenderCellImage(Graphics g, GridPanel panel,
+            CellVisualStyle style, Rectangle bounds, Rectangle r, CellHighlightMode type)
+        {
+            object figure = style.GetFigure(panel);
+
+            if (figure != null)
+            {
+                r = style.GetFigureBounds(panel, r);
+                r.Intersect(bounds);
+
+                if (r.Width > 0 && r.Height > 0)
+                {
+                    if (figure is Image)
+                    {
+                        if (CanHighlightCell(style, type) == true)
+                            DrawHighlightImage(g, (Image)figure, style, r);
+                        else
+                            g.DrawImageUnscaledAndClipped((Image)figure, r);
+                    }
+                    else
+                    {
+                        SymbolDef sd = (SymbolDef)figure;
+
+                        using (Brush br = new SolidBrush(sd.SymbolColor))
+                            g.DrawString(sd.SymbolRealized, sd.SymbolFont, br, r);
+                    }
+                }
+            }
+        }
+
+        #region CanHighlightCell
+
+        private bool CanHighlightCell(
+            CellVisualStyle style, CellHighlightMode type)
+        {
+            switch (style.ImageHighlightMode)
+            {
+                case ImageHighlightMode.Always:
+                    return (true);
+
+                case ImageHighlightMode.Never:
+                    return (false);
+
+                default:
+                    if (IsSelected == false)
+                        return (false);
+
+                    return (type == CellHighlightMode.Content ||
+                            type == CellHighlightMode.Partial);
+            }
+        }
+
+        #endregion
+
+        #region DrawHighlightImage
+
+        private void DrawHighlightImage(Graphics g,
+            Image image, CellVisualStyle style, Rectangle r)
+        {
+            Color color = GetSimpleColor(style);
+
+            float[][] ptsArray =
+            {
+                new float[] {(float)color.R / 255, 0, 0, 0, 0},
+                new float[] {0, (float)color.G / 255, 0, 0, 0},
+                new float[] {0, 0, (float)color.B / 255, 0, 0},
+                new float[] {0f, 0, 0, 1, 0},
+                new float[] {.15f, .15f, .15f, 0, 1}
+            };
+
+            ColorMatrix clrMatrix = new ColorMatrix(ptsArray);
+            ImageAttributes imgAttribs = new ImageAttributes();
+
+            imgAttribs.SetColorMatrix(clrMatrix,
+                ColorMatrixFlag.Default, ColorAdjustType.Default);
+
+            g.DrawImage(image, r,
+                0, 0, style.Image.Width, image.Height,
+                GraphicsUnit.Pixel, imgAttribs);
+        }
+
+        #endregion
+
+        #region GetSimpleColor
+
+        private Color GetSimpleColor(CellVisualStyle style)
+        {
+            Color color1;
+            Color color2;
+
+            if (style.Background.BackColorBlend.Colors != null &&
+                style.Background.BackColorBlend.Colors.Length > 0)
+            {
+                Color[] colors = style.Background.BackColorBlend.Colors;
+
+                color1 = colors[0];
+                color2 = colors[colors.Length - 1];
+            }
+            else
+            {
+                color1 = style.Background.Color1;
+                color2 = style.Background.Color2;
+            }
+
+            if (color2.IsEmpty == true)
+                return (color1);
+
+            switch (style.Alignment)
+            {
+                case Alignment.TopLeft:
+                case Alignment.TopCenter:
+                case Alignment.TopRight:
+                    return (color1);
+
+                case Alignment.MiddleLeft:
+                case Alignment.MiddleCenter:
+                case Alignment.MiddleRight:
+                    return (Color.FromArgb((color1.R + color2.R) / 2, (color1.G + color2.G) / 2, (color1.B + color2.B) / 2));
+
+                default:
+                    return (color2);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region CanRenderCellValue
+
+        private bool CanRenderCellValue()
+        {
+            if (Visible == false || IsEmptyCell == true || SuperGrid.EditorCell == this)
+                return (false);
+
+            if (SuperGrid.NonModalEditorCell == this)
+                return (false);
+
+            return (true);
+        }
+
+        #endregion
+
+        #region RenderCellValue
+
+        //private int _RenderCount;
+
+        private void RenderCellValue(
+            Graphics g, CellVisualStyle style, Rectangle r)
+        {
+            if (r.Width > 0)
+            {
+                GridColumn column = GridColumn;
+
+                if (column != null)
+                {
+                    IGridCellEditControl renderer;
+
+                    if (SuperGrid.ActiveEditor != null ||
+                        (MouseRenderer == null || MouseRenderer.EditorCell != this))
+                    {
+                        renderer = GetInternalRenderControl();
+                    }
+                    else
+                    {
+                        renderer = MouseRenderer;
+                    }
+
+                    if (renderer != null && ((Control)renderer).IsDisposed == false)
+                    {
+                        CellRender(g, style, renderer);
+
+                        //using (StringFormat sf = new StringFormat())
+                        //{
+                        //    sf.Alignment = StringAlignment.Far;
+                        //    sf.LineAlignment = StringAlignment.Far;
+                        //    sf.Trimming = StringTrimming.EllipsisCharacter;
+
+                        //    g.DrawString((++_RenderCount).ToString(),
+                        //                 SystemFonts.DefaultFont, Brushes.Red, r, sf);
+
+                        //    //sf.LineAlignment = StringAlignment.Near;
+
+                        //    //g.DrawString((_MeasureCount).ToString(),
+                        //    //             SystemFonts.DefaultFont, Brushes.Blue, r, sf);
+                        //}
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderDataError
+
+        private void RenderDataError(Graphics g)
+        {
+            Rectangle r = Bounds;
+
+            int w = Dpi.Width5;
+            int h = Dpi.Width5;
+
+            if (r.Width > w && r.Height > h)
+                r.Inflate(-w, -h);
+
+            using (SolidBrush br = new SolidBrush(Color.FromArgb(64, Color.Crimson)))
+                g.FillRectangle(br, r);
+        }
+
+        #endregion
+
+        #region RenderDeleted
+
+        private void RenderDeleted(Graphics g)
+        {
+            using (SolidBrush br = new SolidBrush(Color.FromArgb(128, Color.LightGray)))
+                g.FillRectangle(br, Bounds);
+        }
+
+        #endregion
+
+        #region RenderFocusRect
+
+        private void RenderFocusRect(Graphics g,
+            GridPanel panel, CellRange cr, Rectangle backBounds)
+        {
+            if (panel.FocusCuesEnabled == true)
+            {
+                if (IsFocused() == true)
+                {
+                    if (panel.EnableCellMerging == true && IsFocusedRow(cr) == true)
+                        RenderRowFocusRect(g, panel, backBounds, cr);
+
+                    else if (IsFocusedCell(cr) == true)
+                    {
+                        Rectangle r;
+
+                        if (cr != null)
+                        {
+                            r = backBounds;
+
+                            if (r.X <= 0)
+                            {
+                                r.X++;
+                                r.Width--;
+                            }
+
+                            r.Width -= Dpi.Width1;
+                            r.Height -= Dpi.Height1;
+                        }
+                        else
+                        {
+                            r = HighLightBounds;
+                        }
+
+                        RenderCellFocusRect(g, r);
+                    }
+                }
+            }
+        }
+
+        #region IsFocused
+
+        private bool IsFocused()
+        {
+            if (IsDesignerHosted == true)
+                return (false);
+
+            return (SuperGrid.ContainsFocus == true);
+        }
+
+        #endregion
+
+        #region IsFocusedRow
+
+        private bool IsFocusedRow(CellRange cr)
+        {
+            if (SuperGrid.ActiveElement is GridRow)
+            {
+                GridRow arow = SuperGrid.ActiveElement as GridRow;
+
+                if (cr == null)
+                    return (arow == GridRow);
+
+                if (arow.Parent == GridRow.Parent)
+                    return (arow.RowIndex >= cr.RowStart && arow.RowIndex < cr.RowEnd);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region IsFocusedCell
+
+        private bool IsFocusedCell(CellRange cr)
+        {
+            GridCell acell = SuperGrid.ActiveElement as GridCell;
+
+            if (acell == null)
+                return (false);
+
+            if (cr != null)
+                return (cr == acell.GetCellRange());
+
+            return (IsSameCell(acell));
+        }
+
+        #region IsSameCell
+
+        internal bool IsSameCell(GridCell cell)
+        {
+            if (cell != null)
+            {
+                return (ColumnIndex == cell.ColumnIndex &&
+                    GridRow == cell.GridRow);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderRowFocusRect
+
+        private void RenderRowFocusRect(
+            Graphics g, GridPanel panel, Rectangle r, CellRange cr)
+        {
+            if (IsEmptyCell == false)
+            {
+                SmoothingMode sm = g.SmoothingMode;
+                g.SmoothingMode = SmoothingMode.None;
+
+                Rectangle t = (IsVFrozen == true ? r : SViewRect);
+
+                Rectangle lc = GetLeftCell(panel, t, cr);
+                Rectangle rc = GetRightCell(panel, t, cr);
+
+                if (lc.IsEmpty == true && rc.IsEmpty == true)
+                {
+                    RenderCellFocusRect(g, r);
+                }
+                else
+                {
+                    using (Pen pen = new Pen(Color.Black, 1))
+                    {
+                        pen.DashStyle = DashStyle.Dot;
+
+                        r.Width -= Dpi.Width1 + 1;
+                        r.Height -= Dpi.Height1 + 1;
+
+                        r.Intersect(t);
+
+                        RenderVertFocus(g, r, lc, rc, pen);
+                        RenderHorzFocus(g, r, lc, rc, pen);
+                    }
+                }
+
+                g.SmoothingMode = sm;
+            }
+        }
+
+        #region RenderVertFocus
+
+        private void RenderVertFocus(Graphics g,
+            Rectangle r, Rectangle lc, Rectangle rc, Pen pen)
+        {
+            pen.DashOffset = (r.X % 2);
+
+            if (lc.IsEmpty == false)
+            {
+                if (r.Width > 1)
+                {
+                    if (r.Y < lc.Y - pen.DashOffset)
+                        g.DrawLine(pen, r.X, r.Y, r.X, lc.Y);
+
+                    if (lc.Bottom < r.Bottom - pen.DashOffset)
+                        g.DrawLine(pen, r.X, lc.Bottom, r.X, r.Bottom);
+                }
+            }
+            else
+            {
+                if (r.Height > 1)
+                    g.DrawLine(pen, r.X, r.Y, r.X, r.Bottom);
+            }
+
+            if (rc.IsEmpty == false)
+            {
+                if (r.Width > 1)
+                {
+                    if (r.Y < rc.Y - pen.DashOffset)
+                        g.DrawLine(pen, r.Right, rc.Y, r.Right, r.Y);
+
+                    if (rc.Bottom < r.Bottom - pen.DashOffset)
+                        g.DrawLine(pen, r.Right, rc.Bottom, r.Right, r.Bottom);
+                }
+            }
+            else
+            {
+                if (r.Height > 1)
+                    g.DrawLine(pen, r.Right, r.Y, r.Right, r.Bottom);
+            }
+        }
+
+        #endregion
+
+        #region RenderHorzFocus
+
+        private void RenderHorzFocus(Graphics g,
+            Rectangle r, Rectangle lc, Rectangle rc, Pen pen)
+        {
+            if (r.Width > 1)
+            {
+                int x1 = 0;
+                int x2 = 0;
+
+                if (lc.IsEmpty == false)
+                {
+                    if (lc.Y <= r.Y)
+                        x1 = r.X - lc.Right;
+                }
+
+                if (rc.IsEmpty == false)
+                {
+                    if (rc.Y <= r.Y)
+                    {
+                        if (rc.X > r.Right)
+                            x2 = rc.X - r.Right + 1;
+                    }
+                }
+
+                pen.DashOffset = ((r.X - x1) % 2);
+
+                if (r.Right + x2 - (r.X - x1) >  pen.DashOffset)
+                    g.DrawLine(pen, r.X - x1, r.Y, r.Right + x2, r.Y);
+
+                x1 = 0;
+                x2 = 0;
+
+                if (lc.IsEmpty == false)
+                {
+                    if (lc.Bottom >= r.Bottom)
+                    {
+                        x1 = r.X - lc.Right;
+                        x2 = x1 - 1;
+                    }
+                }
+
+                if (rc.IsEmpty == false)
+                {
+                    if (rc.Bottom >= r.Bottom)
+                    {
+                        if (rc.X > r.Right)
+                            x2 = rc.X - r.Right + 1;
+                    }
+                }
+
+                pen.DashOffset = ((r.X - x1) % 2);
+
+                if (r.Right + x2 - (r.X - x1) > pen.DashOffset)
+                    g.DrawLine(pen, r.X - x1, r.Bottom, r.Right + x2, r.Bottom);
+            }
+        }
+
+        #endregion
+
+        #region GetLeftCell
+
+        private Rectangle GetLeftCell(GridPanel panel, Rectangle t, CellRange cr)
+        {
+            GridColumnCollection columns = panel.Columns;
+
+            GridColumn col = (cr != null)
+                ? columns.GetPrevVisibleColumn(columns.ColumnAtDisplayIndex(cr.ColumnStart))
+                : columns.GetPrevVisibleColumn(GridColumn);
+
+            Rectangle r = GetCellRect(col);
+
+            r.Width -= Dpi.Width1 + 1;
+            r.Height -= Dpi.Height1 + 1;
+
+            t.Intersect(r);
+
+            return (t);
+        }
+
+        #endregion
+
+        #region GetRightCell
+
+        private Rectangle GetRightCell(GridPanel panel, Rectangle t, CellRange cr)
+        {
+            GridColumnCollection columns = panel.Columns;
+
+            GridColumn col = (cr != null)
+                ? columns.GetNextVisibleColumn(columns.ColumnAtDisplayIndex(cr.ColumnEnd - 1))
+                : columns.GetNextVisibleColumn(GridColumn);
+
+            while (col != null)
+            {
+                if (col.IsOnScreen == true)
+                    break;
+
+                col = columns.GetNextVisibleColumn(col);
+            }
+
+            Rectangle r = GetCellRect(col);
+
+            r.Width -= Dpi.Width1 + 1;
+            r.Height -= Dpi.Height1 + 1;
+
+            t.Intersect(r);
+
+            return (t);
+        }
+
+        #endregion
+
+        #region GetCellRect
+
+        private Rectangle GetCellRect(GridColumn col)
+        {
+            if (col != null)
+            {
+                GridRow arow = SuperGrid.ActiveElement as GridRow;
+
+                if (arow != null)
+                {
+                    GridCell cell = arow.GetCell(col.ColumnIndex);
+
+                    if (cell != null)
+                    {
+                        CellRange cr2 = cell.GetStateCellRange();
+
+                        if (cr2 != null)
+                            return (cr2.BackBounds);
+
+                        return (cell.Bounds);
+                    }
+                }
+            }
+
+            return (Rectangle.Empty);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderCellFocusRect
+
+        private void RenderCellFocusRect(Graphics g, Rectangle bounds)
+        {
+            SmoothingMode sm = g.SmoothingMode;
+            g.SmoothingMode = SmoothingMode.None;
+
+            ControlPaint.DrawFocusRectangle(g, bounds);
+
+            g.SmoothingMode = sm;
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region GetCellRange
+
+        ///<summary>
+        ///Gets the CellRange, if any, that the cell is a member of.
+        ///</summary>
+        ///<returns>CellRange or null.</returns>
+        public CellRange GetCellRange()
+        {
+            GridContainer cont = RowContainer;
+
+            if (cont != null)
+                return (cont.GetCellRange(this));
+
+            return (null);
+        }
+
+        internal CellRange GetStateCellRange()
+        {
+            CellRange cr = GetCellRange();
+
+            if (cr != null)
+            {
+                if (cr.Suspended == true)
+                    cr = null;
+            }
+
+            Merged = (cr != null);
+
+            return (cr);
+        }
+
+        #endregion
+
+        #region SuspendMerge
+
+        ///<summary>
+        ///If the cell is currently participating in a merged range of
+        ///cells, then the merge will be suspended until the user clicks
+        ///away from the merged range (or ResumeMerge is called for the cell).
+        ///</summary>
+        ///<param name="activate">If true, cell will be made the active cell.</param>
+        public bool SuspendMerge(bool activate)
+        {
+            CellRange cr = GetStateCellRange();
+
+            if (cr != null)
+                SuspendMerge(cr);
+
+            if (cr == null || cr.Suspended == true)
+            {
+                if (activate == true)
+                {
+                    if (CanSetActiveCell(GridPanel) == true)
+                    {
+                        _needsMouseEnter = true;
+
+                        SetActive(true);
+                    }
+                }
+
+                return (true);
+            }
+
+            return (false);
+        }
+
+        internal void SuspendMerge(CellRange cr)
+        {
+            GridContainer cont = RowContainer;
+
+            if (cont != null)
+                cont.SuspendMerge(cr);
+        }
+
+        #endregion
+
+        #region ResumeMerge
+
+        ///<summary>
+        ///Resumes the suspended merge where the cell is a participant
+        ///</summary>
+        public void ResumeMerge(GridCell aCell)
+        {
+            GridContainer cont = RowContainer;
+
+            if (cont != null)
+            {
+                if (ShouldResumeMerge(cont, aCell) == true)
+                    RowContainer.ResumeMerge();
+            }
+        }
+
+        private bool ShouldResumeMerge(GridContainer cont, GridCell aCell)
+        {
+            if (aCell == null)
+                return (true);
+
+            GridContainer aCont = aCell.RowContainer;
+
+            if (aCont != cont)
+                return (true);
+            
+            CellRange cr = cont.SuspendedRange;
+
+            if (cr != null)
+            {
+                if (cr.Equals(aCont.GetCellRange(aCell)) == true)
+                    return (false);
+            }
+
+            return (true);
+        }
+
+        #endregion
+
+        #region GetProposedSize
+
+        private Size GetProposedSize(Graphics g, CellVisualStyle style, Size constraintSize)
+        {
+            return (GetProposedSize(g, style, constraintSize, null, CellSizingSource.ActualAndFormattedValues));
+        }
+
+        private Size GetProposedSize(Graphics g,
+            CellVisualStyle style, Size constraintSize, IGridCellEditControl editor, CellSizingSource sizingSource)
+        {
+            Size size = Size.Empty;
+
+            if (IsValueExpression == true && ExpValue != null)
+            {
+                size = GetModalSize(g, ExpValue.ToString(), style, constraintSize);
+            }
+            else
+            {
+                if (editor == null)
+                {
+                    if (CellEditMode != CellEditMode.Modal)
+                    {
+                        if (MouseRenderer == null || MouseRenderer.EditorCell == this)
+                            editor = GetInternalEditControl();
+
+                        if (editor != null && editor.EditorCell != this)
+                        {
+                            if (SuperGrid.ActiveNonModalEditor == editor)
+                                editor = null;
+                        }
+
+                        if (editor == null)
+                            editor = GetInternalRenderControl();
+                    }
+                    else
+                    {
+                        editor = SuperGrid.EditorCell == this
+                            ? GetInternalEditControl() : GetInternalRenderControl();
+                    }
+                }
+
+                if (editor != null)
+                {
+                    bool suspended = editor.SuspendUpdate;
+
+                    try
+                    {
+                        editor.SuspendUpdate = true;
+
+                        if (SuperGrid.EditorCell != this)
+                            InitializeContext(DataContext.CellProposedSize, editor, style);
+
+                        if (editor.CellEditMode == CellEditMode.Modal)
+                        {
+                            Size sizeActual = Size.Empty;
+                            Size sizeFormatted = Size.Empty;
+
+                            string s = editor.EditorFormattedValue;
+
+                            SuperGrid.DoGetCellFormattedValueEvent(this, ref s, ref sizingSource);
+
+                            if ((sizingSource & CellSizingSource.ActualValue) == CellSizingSource.ActualValue)
+                                sizeActual = editor.GetProposedSize(g, this, style, constraintSize);
+
+                            if ((sizingSource & CellSizingSource.FormattedValue) == CellSizingSource.FormattedValue)
+                                sizeFormatted = GetModalSize(g, s, style, constraintSize);
+
+                            size.Height = Math.Max(sizeActual.Height, sizeFormatted.Height);
+                            size.Width = Math.Max(sizeActual.Width, sizeFormatted.Width);
+                        }
+                        else
+                        {
+                            size = editor.GetProposedSize(g, this, style, constraintSize);
+                        }
+                    }
+                    finally
+                    {
+                        editor.SuspendUpdate = suspended;
+                    }
+                }
+            }
+
+            return (size);
+        }
+
+        #region GetModalSize
+
+        private Size GetModalSize(Graphics g,
+            string text, CellVisualStyle style, Size constraintSize)
+        {
+            eTextFormat tf = style.GetTextFormatFlags();
+
+            string s = String.IsNullOrEmpty(text) ? " " : text;
+
+            Size size = (constraintSize.IsEmpty == true)
+                            ? TextHelper.MeasureText(g, s, style.Font)
+                            : TextHelper.MeasureText(g, s, style.Font, constraintSize, tf);
+
+            return (size);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Mouse support
+
+        #region InternalMouseEnter
+
+        internal override void InternalMouseEnter(EventArgs e)
+        {
+            base.InternalMouseEnter(e);
+
+            if (GridColumn != null)
+            {
+                GridColumn.IsMouseOver = true;
+
+                DoRendererMouseEnter();
+
+                SuperGrid.ToolTipText = "";
+                _toolTipText = null;
+
+                if (GridPanel.SelectionGranularity != SelectionGranularity.Cell)
+                    GridRow.InvalidateRender(GridRow.Bounds);
+
+                SuperGrid.DoCellMouseEnterEvent(this);
+            }
+        }
+
+        #region DoRendererMouseEnter
+
+        private void DoRendererMouseEnter()
+        {
+            if (CellEditMode != DotNetBar.SuperGrid.CellEditMode.Modal)
+            {
+                CellRange cr = GetStateCellRange();
+
+                if (cr != null && cr.Suspended == false)
+                    return;
+            }
+
+            _needsMouseEnter = true;
+
+            if (SuperGrid.ActiveEditor == null)
+            {
+                _needsMouseEnter = false;
+
+                if (IsEmptyCell == false)
+                {
+                    CellVisualStyle style = GetEffectiveStyle();
+
+                    MouseRenderer = null;
+
+                    if (CellEditMode != CellEditMode.Modal)
+                        MouseRenderer = GetInternalEditControl();
+
+                    if (MouseRenderer == null)
+                        MouseRenderer = GetInternalRenderControl();
+
+                    if (MouseRenderer != null)
+                    {
+                        switch (CellEditMode)
+                        {
+                            case CellEditMode.InPlace:
+                                InitializeContext(DataContext.CellMouseEvent, MouseRenderer, style);
+                                GetCurrentContentSize(style, MouseRenderer);
+                                break;
+
+                            case CellEditMode.NonModal:
+                                if (CanModifyMerge == true)
+                                {
+                                    if (SuperGrid.ActiveNonModalEditor == null ||
+                                        SuperGrid.ActiveNonModalEditor.CanInterrupt == true)
+                                    {
+                                        if (SuperGrid.ActiveNonModalEditor != null)
+                                        {
+                                            SuperGrid.DeactivateNonModalEditor();
+
+                                            if (MouseRenderer == null)
+                                                _needsMouseEnter = true;
+                                        }
+
+                                        if (MouseRenderer != null)
+                                        {
+                                            InitializeContext(DataContext.CellMouseEvent, MouseRenderer, style);
+
+                                            PositionEditControl(MouseRenderer);
+
+                                            MouseRenderer.BeginEdit(false);
+                                            MouseRenderer.OnCellMouseEnter(EventArgs.Empty);
+
+                                            SuperGrid.ActivateNonModalEditor(MouseRenderer, this);
+                                        }
+                                    }
+                                    else
+                                    {
+                                        MouseRenderer = null;
+                                        _needsMouseEnter = true;
+                                    }
+                                }
+                                break;
+                        }
+
+                        if (MouseRenderer != null)
+                            InvalidateRender();
+                    }
+                }
+                else
+                {
+                    InvalidateRender();
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InternalMouseLeave
+
+        internal override void InternalMouseLeave(EventArgs e)
+        {
+            if (GridColumn != null)
+            {
+                DoRendererMouseLeave(e);
+
+                GridColumn.IsMouseOver = false;
+
+                if (_lastHitArea == CellArea.InCellInfo)
+                    ProcessCellInfoLeave();
+
+                if (GridPanel != null)
+                {
+                    if (GridPanel.SelectionGranularity != SelectionGranularity.Cell)
+                        GridRow.InvalidateRender(GridRow.Bounds);
+                    else
+                        InvalidateRender();
+                }
+
+                SuperGrid.DoCellMouseLeaveEvent(this);
+
+                SuperGrid.ToolTipText = "";
+                _toolTipText = null;
+
+                _lastHitArea = CellArea.NoWhere;
+            }
+                
+            base.InternalMouseLeave(e);
+        }
+
+        #region DoRendererMouseLeave
+
+        internal void DoRendererMouseLeave(EventArgs e)
+        {
+            if (MouseRenderer != null &&
+                ((Control) MouseRenderer).IsDisposed == false)
+            {
+                if (CellEditMode != CellEditMode.InPlace || _mouseInItem == true)
+                    MouseRenderer.OnCellMouseLeave(e);
+            }
+                
+            _mouseInItem = false;
+            MouseRenderer = null;
+            _needsMouseEnter = false;
+
+            InvalidateRender();
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InternalMouseMove
+
+        internal override void InternalMouseMove(MouseEventArgs e)
+        {
+            GridPanel panel = GridPanel;
+
+            if (panel != null)
+            {
+                if (CapturedItem != null && e.Button != MouseButtons.None)
+                    ProcessMouseDownMove(e, panel);
+
+                ProcessMouseMove(e);
+
+                base.InternalMouseMove(e);
+
+                DoRendererMouseMove(e);
+
+                SuperGrid.DoCellMouseMoveEvent(this, e);
+            }
+        }
+
+        #region DoRendererMouseMove
+
+        private void DoRendererMouseMove(MouseEventArgs e)
+        {
+            if (_needsMouseEnter == true)
+                DoRendererMouseEnter();
+
+            if (MouseRenderer != null &&
+                ((Control)MouseRenderer).IsDisposed == false)
+            {
+                if (CellEditMode == CellEditMode.InPlace)
+                {
+                    DoInPlaceMouseMove(e);
+                }
+                else
+                {
+                    if (CanModify == true)
+                    {
+                        Rectangle r = GetAdjustedBounds(EditBounds);
+                        Point pt = SuperGrid.PointToClient(Control.MousePosition);
+
+                        if (r.Contains(pt) == true)
+                            MouseRenderer.OnCellMouseMove(GetControlMouseArgs(e));
+                    }
+                }
+            }
+        }
+
+        #region DoInPlaceMouseMove
+
+        private void DoInPlaceMouseMove(MouseEventArgs e)
+        {
+            if (IsMouseDown == false || _mouseDownInItem == true)
+            {
+                if (MouseRenderer != null)
+                {
+                    if (MouseRenderer.EditorCell != this)
+                        InitializeContext(DataContext.CellMouseEvent, MouseRenderer, null);
+
+                    Rectangle r = GetAdjustedBounds(ContentBounds);
+                    r = GetEditPanelBounds(MouseRenderer, r);
+
+                    bool inItem = r.Contains(e.Location);
+
+                    if (_mouseInItem != inItem)
+                    {
+                        if (inItem == true)
+                            MouseRenderer.OnCellMouseEnter(EventArgs.Empty);
+                        else
+                            MouseRenderer.OnCellMouseLeave(EventArgs.Empty);
+
+                        _mouseInItem = inItem;
+                    }
+
+                    if (_mouseInItem == true)
+                        MouseRenderer.OnCellMouseMove(GetControlMouseArgs(e, r));
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ProcessMouseDownMove
+
+        private void ProcessMouseDownMove(MouseEventArgs e, GridPanel panel)
+        {
+            if (_mouseDownHitCell != null)
+            {
+                if (_mouseDownHitArea == CellArea.InContent)
+                {
+                    Rectangle r = ViewRect;
+
+                    if (MouseDownPoint.Y < r.Y)
+                    {
+                        int n = SuperGrid.PrimaryGrid.FixedRowHeight -
+                                SuperGrid.PrimaryGrid.FixedHeaderHeight;
+
+                        r.Y -= n;
+                        r.Height += n;
+                    }
+
+                    if ((e.Y >= r.Y && e.Y < r.Bottom) && (e.X >= r.X && e.X < r.Right))
+                    {
+                        SuperGrid.DisableAutoScrolling();
+
+                        ProcessInContent(panel, e);
+                    }
+                    else
+                    {
+                        SuperGrid.EnableAutoScrolling(
+                            AutoScrollEnable.Horizontal | AutoScrollEnable.Vertical, r);
+                    }
+                }
+            }
+        }
+
+        #region ProcessInContent
+
+        private void ProcessInContent(GridPanel panel, MouseEventArgs e)
+        {
+            Point pt = e.Location;
+
+            Rectangle t = SViewRect;
+            pt.X = Math.Min(t.Right - 1, pt.X);
+            pt.X = Math.Max(t.X, pt.X);
+
+            Rectangle v = panel.BoundsRelative;
+            v.Location = panel.PointToScroll(v.Location);
+            pt.X = Math.Min(v.Right - 1, pt.X);
+            pt.X = Math.Max(v.X, pt.X);
+
+            GridCell lastCell = _hitCell;
+
+            _hitCell = GetCellAt(panel, pt);
+
+            if (DragStarted(panel, pt, e) == false)
+            {
+                if (_hitCell != null && _hitArea == CellArea.InContent)
+                {
+                    if (panel.MultiSelect == true)
+                    {
+                        if (lastCell != null)
+                            lastCell.IsMouseOver = false;
+
+                        _hitCell.IsMouseOver = true;
+
+                        if (panel.CellDragBehavior == CellDragBehavior.ExtendSelection)
+                        {
+                            if (panel.LastProcessedItem is GridCell &&
+                                _hitCell != panel.LastProcessedItem)
+                            {
+                                if (SuperGrid.ActiveEditor == null)
+                                    ProcessExtendSelection(panel, true);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        #region DragStarted
+
+        private bool DragStarted(GridPanel panel, Point pt, MouseEventArgs e)
+        {
+            if (IsDragSelection == true)
+            {
+                if (IsDragStarted == false)
+                {
+                    if (DragDrop.DragStarted(_mouseDownPoint, pt) == true)
+                    {
+                        IsDragStarted = true;
+
+                        if (SuperGrid.DoItemDragEvent(this, e) == true)
+                        {
+                            IsDragSelection = false;
+
+                            ExtendSelection(panel);
+                        }
+                    }
+                }
+
+                return (true);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region GetCellAt
+
+        private GridCell GetCellAt(GridPanel panel, Point pt)
+        {
+            Rectangle t = ViewRect;
+            pt.X = Math.Min(t.Right - 1, pt.X);
+            pt.X = Math.Max(t.X, pt.X);
+
+            Rectangle v = panel.BoundsRelative;
+            v.Location = panel.PointToScroll(v.Location);
+            pt.X = Math.Min(v.Right - 1, pt.X);
+            pt.X = Math.Max(v.X, pt.X);
+
+            GridRow row = panel.InternalGetElementAt(pt.X, pt.Y) as GridRow;
+
+            while (row != null)
+            {
+                GridElement item = row.InternalGetElementAt(pt.X, pt.Y);
+
+                if (item is GridCell)
+                    return (item as GridCell);
+
+                row = item as GridRow;
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region ProcessMouseMove
+
+        private void ProcessMouseMove(MouseEventArgs e)
+        {
+            _hitArea = GetCellAreaAt(e);
+            _hitCell = this;
+
+            if (_hitArea == CellArea.InContent)
+                SuperGrid.GridCursor = Cursors.Default;
+
+            if (_hitArea != _lastHitArea)
+            {
+                ProcessToolTipText(e);
+
+                _lastHitArea = _hitArea;
+
+                InvalidateRender();
+            }
+
+            base.InternalMouseMove(e);
+        }
+
+        #region ProcessToolTipText
+
+        private void ProcessToolTipText(MouseEventArgs e)
+        {
+            if (_hitArea == CellArea.InContent)
+                ProcessCellToolTip();
+            
+            else if (_hitArea == CellArea.InCellInfo)
+                ProcessCellInfoEnter(e);
+
+            if (_lastHitArea == CellArea.InCellInfo)
+                ProcessCellInfoLeave();
+        }
+
+        #region ProcessCellToolTip
+
+        private void ProcessCellToolTip()
+        {
+            SetToolTip(GridPanel.ShowToolTips ? GetToolTipText() : string.Empty);
+        }
+
+        #region GetToolTipText
+
+        private string GetToolTipText()
+        {
+            if (_toolTipText == null)
+            {
+                CellRange cr = GetStateCellRange();
+
+                if (cr != null)
+                {
+                    _toolTipText = cr.ToolTip ?? "";
+                }
+                else
+                {
+                    string s = "";
+
+                    if (SuperGrid.DoGetCellToolTipEvent(GridPanel, this, ref s) == false)
+                    {
+                        _toolTipText = "";
+
+                        if (IsEmptyCell == false)
+                        {
+                            CellVisualStyle style = GetEffectiveStyle();
+
+                            Rectangle r = GetAdjustedBounds(ContentBounds);
+
+                            if (MouseRenderer != null &&
+                                ((Control)MouseRenderer).IsDisposed == false)
+                            {
+                                Size size = new
+                                    Size(style.AllowWrap == Tbool.True ? r.Width : 0, 0);
+
+                                using (Graphics g = SuperGrid.CreateGraphics())
+                                    size = GetProposedSize(g, style, size, MouseRenderer, CellSizingSource.FormattedValue);
+
+                                if (size.Width > r.Width || size.Height > r.Height)
+                                    _toolTipText = String.IsNullOrEmpty(s) ? GetFormattedValue(MouseRenderer) : s;
+                            }
+                        }
+                    }
+                    else
+                    {
+                        _toolTipText = s;
+                    }
+                }
+            }
+
+            return (_toolTipText);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ProcessCellInfoEnter
+
+        private void ProcessCellInfoEnter(MouseEventArgs e)
+        {
+            SetToolTip(SuperGrid.DoCellInfoEnterEvent(this,
+                SuperGrid, SuperGrid.ToolTip, e.Location) ? "" : InfoText);
+        }
+
+        #endregion
+
+        #region ProcessCellInfoLeave
+
+        private void ProcessCellInfoLeave()
+        {
+            SuperGrid.DoCellInfoLeaveEvent(this, SuperGrid, SuperGrid.ToolTip);
+        }
+
+        #endregion
+
+        #region SetToolTip
+
+        private void SetToolTip(string toolTipText)
+        {
+            if (SuperGrid.ToolTipText != _toolTipText)
+                SuperGrid.ToolTip.Hide(SuperGrid);
+
+            SuperGrid.ToolTipText = toolTipText;
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region InternalMouseDown
+
+        internal override void InternalMouseDown(MouseEventArgs e)
+        {
+            GridPanel panel = GridPanel;
+
+            if (panel != null)
+            {
+                SuperGrid.DoCellMouseDownEvent(this, e);
+
+                _mouseDownPoint = e.Location;
+
+                IsDragSelection = false;
+                IsDragStarted = false;
+
+                if (_hitArea == CellArea.InContent || _hitArea == CellArea.InCellInfo)
+                {
+                    _mouseDownHitArea = CellArea.NoWhere;
+
+                    if (_hitCell != null && 
+                        _hitCell.CanSetActiveCell(panel) == true)
+                    {
+                        _mouseDownHitArea = _hitArea;
+                        _mouseDownHitCell = _hitCell;
+
+                        if (panel.SelectionGranularity == SelectionGranularity.Cell)
+                        {
+                            panel.LastProcessedItem = _hitCell;
+
+                            InitSelectOrDrag(panel);
+                        }
+
+                        DoRendererMouseDown(e);
+                    }
+                }
+            }
+
+            base.InternalMouseDown(e);
+        }
+
+        #region DoRendererMouseDown
+
+        private void DoRendererMouseDown(MouseEventArgs e)
+        {
+            if (CanModifyMerge == true)
+            {
+                if (_needsMouseEnter == true)
+                    DoRendererMouseEnter();
+
+                if (MouseRenderer != null)
+                {
+                    if (_mouseInItem == true)
+                    {
+                        _mouseDownInItem = true;
+
+                        if (MouseRenderer.EditorCell != this)
+                            InitializeContext(DataContext.CellMouseEvent, MouseRenderer, null);
+
+                        MouseRenderer.OnCellMouseDown(GetControlMouseArgs(e));
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region CanSetActiveCell
+
+        internal bool CanSetActiveCell(GridPanel panel)
+        {
+            GridCell acell = SuperGrid.ActiveCell;
+
+            if (acell != this)
+            {
+                if (IsSelectable == false ||
+                    (IsEmptyCell == true && panel.AllowEmptyCellSelection == false))
+                {
+                    if (SuperGrid.DoPlayingSoundEvent(panel, this, PlaySoundContext.CellActivate) == false)
+                        SystemSounds.Beep.Play();
+
+                    return (false);
+                }
+
+                GridCell ecell = SuperGrid.EditorCell;
+
+                if (ecell != null)
+                {
+                    if (ecell.EndEdit() == false)
+                        return (false);
+                }
+
+                if (acell != null)
+                    acell.ResumeMerge(this);
+
+                if (GridRow.IsActive == false)
+                {
+                    if (GridRow.CanSetActiveRow(false) == false)
+                        return (false);
+
+                    if (panel.SetActiveRow(GridRow, true) == false)
+                        return (false);
+                }
+
+                if (panel.SelectionGranularity != SelectionGranularity.Row)
+                {
+                    if (SuperGrid.DoCellActivatingEvent(panel, acell, this) == true)
+                        return (false);
+
+                    SuperGrid.ActiveCell = this;
+
+                    if (panel.SelectionGranularity == SelectionGranularity.Cell)
+                    {
+                        SuperGrid.ActiveElement = this;
+
+                        panel.LastProcessedItem = this;
+                    }
+                }
+            }
+
+            return (true);
+        }
+
+        #endregion
+
+        #region ProcessExtendSelection
+
+        private void ProcessExtendSelection(GridPanel panel, bool extend)
+        {
+            bool ckey = (panel.MultiSelect == true) ?
+                ((Control.ModifierKeys & Keys.Control) == Keys.Control) : false;
+
+            if (ckey == true)
+                ProcessControlExtend(panel, extend);
+            else
+                ProcessNonControlExtend(panel, extend);
+
+            panel.LastProcessedItem = _hitCell;
+        }
+
+        #region ProcessControlExtend
+
+        private void ProcessControlExtend(GridPanel panel, bool extend)
+        {
+            GridCell cell = panel.LastProcessedItem as GridCell;
+
+            if (cell != null)
+            {
+                int startRowIndex = cell.GridRow.GridIndex;
+                int startColumnIndex = panel.Columns.GetDisplayIndex(cell.GridColumn);
+
+                int[] map = panel.Columns.DisplayIndexMap;
+
+                if (extend == false)
+                {
+                    int columnIndex = map[startColumnIndex];
+
+                    SetSelectedMerge(panel, startRowIndex,
+                        startColumnIndex, startRowIndex, startColumnIndex, 0);
+
+                    panel.SetSelectedCells(startRowIndex, columnIndex,
+                        1, 1, !panel.IsCellSelected(startRowIndex, columnIndex));
+
+                    cell.InvalidateRender();
+
+                    panel.ColumnHeader.InvalidateRowHeader();
+                }
+                else
+                {
+                    int endRowIndex = _hitCell.GridRow.GridIndex;
+                    int endColumnIndex = panel.Columns.GetDisplayIndex(_hitCell.GridColumn);
+
+                    if (endColumnIndex - startColumnIndex != 0)
+                    {
+                        SelectControlColumn(panel, map,
+                            startColumnIndex, endColumnIndex, startRowIndex);
+                    }
+
+                    if (endRowIndex - startRowIndex != 0)
+                    {
+                        SelectControlRow(panel, map,
+                            startRowIndex, endRowIndex, endColumnIndex);
+                    }
+                }
+            }
+        }
+
+        #region SelectControlColumn
+
+        private void SelectControlColumn(GridPanel panel, int[] map,
+            int startColumnIndex, int endColumnIndex, int startRowIndex)
+        {
+            int endRowIndex = startRowIndex;
+
+            panel.NormalizeIndices(true,
+                _anchorColumnIndex, ref startColumnIndex, ref endColumnIndex);
+
+            panel.NormalizeIndices(false,
+                _anchorRowIndex, ref startRowIndex, ref endRowIndex);
+
+            if (endRowIndex > _anchorRowIndex)
+                startRowIndex = _anchorRowIndex;
+
+            else if (startRowIndex < _anchorRowIndex)
+                endRowIndex = _anchorRowIndex;
+
+            for (int i = startRowIndex; i <= endRowIndex; i++)
+            {
+                for (int j = startColumnIndex; j <= endColumnIndex; j++)
+                {
+                    if (j != _anchorColumnIndex)
+                    {
+                        int columnIndex = map[j];
+
+                        panel.SetSelectedCells(i, columnIndex, 1, 1,
+                            !panel.IsCellSelected(i, columnIndex));
+                    }
+                }
+            }
+
+            panel.InvalidateCells(startRowIndex,
+                endRowIndex, startColumnIndex, endColumnIndex);
+        }
+
+        #endregion
+
+        #region SelectControlRow
+
+        private void SelectControlRow(GridPanel panel, int[] map,
+            int startRowIndex, int endRowIndex, int endColumnIndex)
+        {
+            int startColumnIndex = endColumnIndex;
+
+            panel.NormalizeIndices(false,
+                _anchorColumnIndex, ref startColumnIndex, ref endColumnIndex);
+
+            panel.NormalizeIndices(true,
+                _anchorRowIndex, ref startRowIndex, ref endRowIndex);
+
+            if (endColumnIndex > _anchorColumnIndex)
+                startColumnIndex = _anchorColumnIndex;
+
+            else if (startColumnIndex < _anchorColumnIndex)
+                endColumnIndex = _anchorColumnIndex;
+
+            for (int i = startRowIndex; i <= endRowIndex; i++)
+            {
+                for (int j = startColumnIndex; j <= endColumnIndex; j++)
+                {
+                    if (i != _anchorRowIndex)
+                    {
+                        int columnIndex = map[j];
+
+                        panel.SetSelectedCells(i, columnIndex, 1, 1,
+                            !panel.IsCellSelected(i, columnIndex));
+                    }
+                }
+            }
+
+            panel.InvalidateCells(startRowIndex,
+                endRowIndex, startColumnIndex, endColumnIndex);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ProcessNonControlExtend
+
+        private void ProcessNonControlExtend(GridPanel panel, bool extend)
+        {
+            bool skey = (panel.MultiSelect == true) ?
+                ((Control.ModifierKeys & Keys.Shift) == Keys.Shift) : false;
+
+            if (skey == false ||
+                panel.SelectionRowAnchor == null ||
+                panel.SelectionColumnAnchor == null)
+            {
+                panel.SelectionRowAnchor = _mouseDownHitCell.GridRow;
+                panel.SelectionColumnAnchor = _mouseDownHitCell.GridColumn;
+            }
+
+            ExtendSelection(panel, _hitCell, extend);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InitSelectOrDrag
+
+        private void InitSelectOrDrag(GridPanel panel)
+        {
+            if (panel.SuperGrid.HasItemDragHandler == false || panel.IsItemSelected(this) == false ||
+                ((Control.ModifierKeys & (Keys.Control | Keys.Shift)) != Keys.None))
+            {
+                ExtendSelection(panel);
+            }
+            else if (IsMouseDown == true)
+            {
+                IsDragSelection = true;
+
+                Capture = true;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InternalMouseUp
+
+        internal override void InternalMouseUp(MouseEventArgs e)
+        {
+            if (GridColumn != null)
+            {
+                if (CanModifyMerge == true)
+                    DoRendererMouseUp(e);
+
+                _mouseDownInItem = false;
+
+                SuperGrid.DoCellMouseUpEvent(this, e);
+
+                if (InfoImageBounds.Contains(e.X, e.Y) == true)
+                {
+                    SuperGrid.DoCellInfoClickEvent(this, e);
+                }
+                else
+                {
+                    if (_mouseDownHitCell == this && IsMouseOver == true)
+                    {
+                        if (SuperGrid.DoCellClickEvent(this, e) == false)
+                        {
+                            GridPanel panel = GridPanel;
+
+                            if (panel != null)
+                            {
+                                if ((e.Button & MouseButtons.Left) == MouseButtons.Left)
+                                {
+                                    if (IsDragSelection == true)
+                                        ExtendSelectionEx(panel);
+
+                                    if (_hitArea == CellArea.InContent)
+                                    {
+                                        if (panel.MouseEditMode == MouseEditMode.SingleClick)
+                                        {
+                                            //if (Bounds.Contains(e.X, e.Y) == true)
+                                            {
+                                                if (CanSetActiveCell(GridPanel) == true)
+                                                    BeginEdit(true);
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
+            IsDragSelection = false;
+
+            base.InternalMouseUp(e);
+        }
+
+        #region DoRendererMouseUp
+
+        private void DoRendererMouseUp(MouseEventArgs e)
+        {
+            if (MouseRenderer != null)
+            {
+                if (_mouseDownInItem == true)
+                {
+                    if (MouseRenderer.EditorCell != this)
+                        InitializeContext(DataContext.CellMouseEvent, MouseRenderer, null);
+
+                    MouseRenderer.OnCellMouseUp(GetControlMouseArgs(e));
+
+                    SuperGrid.Focus();
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InternalMouseDoubleClick
+
+        internal override void InternalMouseDoubleClick(MouseEventArgs e)
+        {
+            GridPanel panel = GridPanel;
+
+            if (InfoImageBounds.Contains(e.X, e.Y) == true)
+            {
+                SuperGrid.DoCellInfoDoubleClickEvent(this, e);
+            }
+            else
+            {
+                if (SuperGrid.DoCellDoubleClickEvent(this, e) == false)
+                {
+                    if (_hitArea == CellArea.InContent &&
+                        panel.MouseEditMode == MouseEditMode.DoubleClick)
+                    {
+                        if (CanSetActiveCell(panel) == true)
+                        {
+                            CellRange cr = GetStateCellRange();
+
+                            if (cr != null && cr.Suspended == false)
+                            {
+                                if (cr.AllowSuspend == true)
+                                {
+                                    SuspendMerge(cr);
+
+                                    if (_mouseDownHitCell != null)
+                                    {
+                                        _needsMouseEnter = true;
+                                        _mouseDownHitCell.SetActive(true);
+                                    }
+                                }
+                                else
+                                {
+                                    if (SuperGrid.DoPlayingSoundEvent(panel, cr, PlaySoundContext.CellActivate) == false)
+                                        SystemSounds.Beep.Play();
+                                }
+                            }
+                            else
+                            {
+                                BeginEdit(true);
+                            }
+                        }
+                    }
+
+                    _mouseDownHitCell = null;
+                }
+            }
+        }
+
+        #region DoRendererMouseDoubleClick
+
+        private void DoRendererMouseDoubleClick(MouseEventArgs e)
+        {
+            if (CanModify == true)
+            {
+                if (MouseRenderer != null)
+                {
+                    if (_mouseDownInItem == true)
+                    {
+                        if (MouseRenderer.EditorCell != this)
+                            InitializeContext(DataContext.CellMouseEvent, MouseRenderer, null);
+
+                        MouseRenderer.OnCellMouseDown(GetControlMouseArgs(e));
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region GetControlMouseArgs
+
+        private MouseEventArgs GetControlMouseArgs(MouseEventArgs e)
+        {
+            Rectangle r = GetAdjustedBounds(ContentBounds);
+            r = GetEditPanelBounds(MouseRenderer, r);
+
+            return (GetControlMouseArgs(e, r)); 
+        }
+
+        private MouseEventArgs
+            GetControlMouseArgs(MouseEventArgs e, Rectangle r)
+        {
+            int x = e.X - r.X;
+            int y = e.Y - r.Y;
+
+            MouseEventArgs args = new
+                MouseEventArgs(e.Button, e.Clicks, x, y, e.Delta);
+
+            return (args);
+        }
+
+        #endregion
+
+        #region ExtendSelection
+
+        internal void ExtendSelection(GridPanel panel, GridCell endCell, bool extend)
+        {
+            if (panel.SelectionColumnAnchor is GridColumn)
+            {
+                int startRowIndex = panel.SelectionRowAnchor.GridIndex;
+                int startColumnIndex = panel.Columns.GetDisplayIndex((GridColumn)(panel.SelectionColumnAnchor));
+
+                int endRowIndex = endCell.GridRow.GridIndex;
+                int endColumnIndex = panel.Columns.GetDisplayIndex(endCell.GridColumn);
+
+                if (startRowIndex < 0)
+                    startRowIndex = endRowIndex;
+
+                panel.NormalizeIndices(false, 0, ref startRowIndex, ref endRowIndex);
+                panel.NormalizeIndices(false, 0, ref startColumnIndex, ref endColumnIndex);
+
+                if (startColumnIndex < 0)
+                    startColumnIndex = 0;
+
+                if (endColumnIndex < 0)
+                    endColumnIndex = 0;
+
+                if (panel.OnlyCellsSelected(
+                    startRowIndex, startColumnIndex, endRowIndex, endColumnIndex) == false)
+                {
+                    ClearSelected(panel, extend);
+
+                    if (startRowIndex >= 0 && endRowIndex >= 0)
+                    {
+                        SetSelected(panel, startRowIndex,
+                            startColumnIndex, endRowIndex, endColumnIndex);
+
+                        InvalidateSelected(panel, startRowIndex,
+                            startColumnIndex, endRowIndex, endColumnIndex);
+                    }
+                }
+            }
+        }
+
+        #region InvalidateSelected
+
+        private void InvalidateSelected(GridPanel panel,
+            int startRowIndex, int startColumnIndex, int endRowIndex, int endColumnIndex)
+        {
+            GridCell lastCell = (Control.MouseButtons == MouseButtons.None)
+                ? SuperGrid.LastActiveCell : panel.LastProcessedItem as GridCell;
+
+            if (lastCell != null)
+            {
+                int lastIndex = panel.Columns.GetDisplayIndex(lastCell.ColumnIndex);
+
+                if (lastIndex < startColumnIndex)
+                    startColumnIndex = lastIndex;
+
+                else if (lastIndex > endColumnIndex)
+                    endColumnIndex =lastIndex;
+
+                if (lastCell.GridRow.GridIndex < startRowIndex)
+                    startRowIndex = lastCell.GridRow.GridIndex;
+
+                else if (lastCell.GridRow.GridIndex > endRowIndex)
+                    endRowIndex = lastCell.GridRow.GridIndex;
+            }
+
+            panel.InvalidateCells(startRowIndex,
+                endRowIndex, startColumnIndex, endColumnIndex);
+        }
+
+        #endregion
+
+        #region SetSelected
+
+        private void SetSelected(GridPanel panel,
+            int startRowIndex, int startColumnIndex, int endRowIndex, int endColumnIndex)
+        {
+            SetSelectedMerge(panel, startRowIndex,
+                startColumnIndex, endRowIndex, endColumnIndex, 1);
+
+            int[] map = panel.Columns.DisplayIndexMap;
+
+            for (int i = startColumnIndex; i <= endColumnIndex; i++)
+            {
+                panel.SetSelectedCells(startRowIndex, map[i],
+                    endRowIndex - startRowIndex + 1, 1, true);
+            }
+        }
+
+        #region SetSelectedMerge
+
+        private void SetSelectedMerge(GridPanel panel, int startRowIndex,
+            int startColumnIndex, int endRowIndex, int endColumnIndex, int selected)
+        {
+            if (panel.EnableCellMerging == true)
+            {
+                GridContainer cont = RowContainer;
+
+                if (cont != null)
+                {
+                    GridContainer srow = panel.GetRowFromIndex(startRowIndex);
+                    GridContainer erow = panel.GetRowFromIndex(endRowIndex);
+
+                    if (srow != null && erow != null)
+                    {
+                        int sRowIndex = panel.GetRowFromIndex(startRowIndex).RowIndex;
+                        int eRowIndex = panel.GetRowFromIndex(endRowIndex).RowIndex;
+
+                        cont.SetMergeSelection(sRowIndex,
+                            eRowIndex, startColumnIndex, endColumnIndex, selected);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ClearSelected
+
+        private void ClearSelected(GridPanel panel, bool extend)
+        {
+            if (panel.IsGrouped == false &&
+                (panel.SelectedCellCount < 50 && panel.SelectedRowCount < 10 && panel.SelectedColumnCount < 10))
+            {
+                foreach (GridCell cell in panel.SelectedCells)
+                    cell.IsSelected = false;
+
+                foreach (GridColumn col in panel.SelectedColumns)
+                    col.IsSelected = false;
+
+                foreach (GridContainer row in panel.SelectedRows)
+                {
+                    if (row != null)
+                        row.IsSelected = false;
+                }
+
+                RowContainer.ClearAllMergeSelected();
+            }
+            else
+            {
+                panel.ClearAll(extend == false);
+            }
+
+            panel.SelectionClearCount++;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetNextCell
+
+        internal GridCell GetNextCell(bool canSelect)
+        {
+            return (GetNextCell(canSelect, true));
+        }
+
+        internal GridCell GetNextCell(bool canSelect, bool multiRow)
+        {
+            GridPanel panel = GridPanel;
+
+            if (panel != null)
+            {
+                int[] map = panel.Columns.DisplayIndexMap;
+                int index = panel.Columns.GetDisplayIndex(GridColumn);
+
+                int anchor = index;
+
+                GridRow row = GridRow;
+
+                while (row != null)
+                {
+                    if (row.AllowSelection == true)
+                    {
+                        while (++index < map.Length)
+                        {
+                            if (multiRow == false && index == anchor)
+                                return (null);
+
+                            GridColumn column = panel.Columns[map[index]];
+
+                            if (column.Visible == true &&
+                                (canSelect == false || column.AllowSelection == true))
+                            {
+                                GridCell cell = row.GetCell(
+                                    column.ColumnIndex, panel.AllowEmptyCellSelection);
+
+                                if (cell != null)
+                                {
+                                    if (canSelect == false || cell.AllowSelection == true)
+                                        return (cell);
+                                }
+                            }
+                        }
+                    }
+
+                    if (multiRow == true)
+                        row = row.NextVisibleRow as GridRow;
+                    else
+                        break;
+
+                    index = -1;
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetPreviousCell
+
+        internal GridCell GetPreviousCell(bool canSelect)
+        {
+            return (GetPreviousCell(canSelect, true));
+        }
+
+        internal GridCell GetPreviousCell(bool canSelect, bool multiRow)
+        {
+            GridPanel panel = GridPanel;
+
+            if (panel != null)
+            {
+                int[] map = panel.Columns.DisplayIndexMap;
+                int index = panel.Columns.GetDisplayIndex(GridColumn);
+
+                int anchor = index;
+
+                GridRow row = GridRow;
+
+                while (row != null)
+                {
+                    if (row.AllowSelection == true)
+                    {
+                        while (--index >= 0)
+                        {
+                            if (multiRow == false && index == anchor)
+                                return (null);
+
+                            GridColumn column = panel.Columns[map[index]];
+
+                            if (column.Visible == true &&
+                                (canSelect == false || column.AllowSelection == true))
+                            {
+                                GridCell cell = row.GetCell(
+                                    column.ColumnIndex, panel.AllowEmptyCellSelection);
+
+                                if (cell != null)
+                                {
+                                    if (canSelect == false || cell.AllowSelection == true)
+                                        return (cell);
+                                }
+                            }
+                        }
+                    }
+
+                    if (multiRow == true)
+                        row = row.PrevVisibleRow as GridRow;
+                    else
+                        break;
+
+                    index = map.Length;
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetCellAreaAt
+
+        /// <summary>
+        /// Returns element at specified mouse coordinates
+        /// </summary>
+        /// <param name="e">Mouse event arguments</param>
+        /// <returns>Reference to child Cell element or null
+        /// if no element at specified coordinates</returns>
+        protected virtual CellArea GetCellAreaAt(MouseEventArgs e)
+        {
+            return GetCellAreaAt(e.X, e.Y);
+        }
+
+        /// <summary>
+        /// Returns element at specified mouse coordinates
+        /// </summary>
+        /// <param name="x">Horizontal position</param>
+        /// <param name="y">Vertical position</param>
+        /// <returns>Reference to child element or null
+        /// if no element at specified coordinates</returns>
+        protected virtual CellArea GetCellAreaAt(int x, int y)
+        {
+            GridPanel panel = GridPanel;
+
+            if (panel != null)
+            {
+                if (InfoImageBounds.Contains(x, y) == true)
+                    return (CellArea.InCellInfo);
+
+                if (IsPrimaryCell == true)
+                {
+                    GridRow cellRow = GridRow;
+
+                    if (cellRow != null)
+                    {
+                        Rectangle r = cellRow.ExpandButtonBounds;
+
+                        if (cellRow.IsVFrozen == false)
+                            r.Y -= VScrollOffset;
+
+                        if (panel.IsSubPanel == true || GridColumn.IsHFrozen == false)
+                            r.X -= HScrollOffset;
+
+                        if (r.Contains(x, y) == true)
+                            return (CellArea.InExpandButton);
+
+                        r = cellRow.CheckBoxBounds;
+
+                        if (cellRow.IsVFrozen == false)
+                            r.Y -= VScrollOffset;
+
+                        if (panel.IsSubPanel == true || GridColumn.IsHFrozen == false)
+                            r.X -= HScrollOffset;
+
+                        if (r.Contains(x, y) == true)
+                            return (CellArea.InCheckBox);
+                    }
+                }
+            }
+
+            return (CellArea.InContent);
+        }
+
+        #endregion
+
+        #region EnsureVisible
+
+        ///<summary>
+        /// Ensures that the given cell is visibly centered
+        /// (as much as possible) in the grid display.
+        ///</summary>
+        ///<param name="center"></param>
+        public override void EnsureVisible(bool center)
+        {
+            if (GridRow.Visible == true && GridColumn.Visible == true)
+            {
+                if (IsVFrozen == false)
+                    GridRow.EnsureVisible(center);
+
+                GridColumn column = GridColumn;
+
+                if (column != null && column.IsHFrozen == false)
+                    column.EnsureVisible(center);
+            }
+        }
+
+        #endregion
+
+        #region SetActive
+
+        ///<summary>
+        /// Sets the given cell as Active
+        ///</summary>
+        ///<returns>true - if successful</returns>
+        public bool SetActive()
+        {
+            return (SetActive(false));
+        }
+
+        ///<summary>
+        /// Makes the given cell active and
+        /// optionally selects the given cell
+        ///</summary>
+        ///<returns>true, if successful</returns>
+        public bool SetActive(bool select)
+        {
+            GridPanel panel = GridPanel;
+
+            if (panel != null)
+            {
+                if (panel.SetActiveCell(this) == true)
+                {
+                    if (select == true)
+                    {
+                        panel.ClearAll();
+
+                        IsSelected = true;
+                    }
+
+                    return (true);
+                }
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region Editor support
+
+        #region GetEditControl
+
+        internal IGridCellEditControl GetEditControl(Type type, object[] args)
+        {
+            if (type != null)
+            {
+                IGridCellEditControl editor =
+                    Activator.CreateInstance(type, args) as IGridCellEditControl;
+
+                if (editor is Control == false)
+                    throw new Exception("Edit/Render Type must be based on 'Control'.");
+
+                editor.EditorPanel = new EditorPanel();
+                editor.EditorPanel.Visible = false;
+                editor.EditorPanel.Controls.Add((Control) editor);
+
+                return (editor);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetInternalEditControl
+
+        internal IGridCellEditControl GetInternalEditControl()
+        {
+            return (GetInternalEditControl(CanModify));
+        }
+
+        internal IGridCellEditControl GetInternalEditControl(bool canModify)
+        {
+            if (canModify == true)
+            {
+                if (SuperGrid.EditorCell != this)
+                {
+                    Type editorType = _EditorInfo != null ? _EditorInfo.EditorType : null;
+                    object[] editorParams = _EditorInfo != null ? _EditorInfo.EditorParams : null;
+
+                    SuperGrid.DoGetEditorEvent(GridPanel, this, ref editorType, ref editorParams);
+
+                    EditorType = editorType;
+                    EditorParams = editorParams;
+                }
+
+                return (EditControl ?? (GridColumn != null ? GridColumn.EditControl : null));
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetInternalRenderControl
+
+        private IGridCellEditControl GetInternalRenderControl()
+        {
+            GridPanel panel = GridPanel;
+
+            if (panel != null)
+            {
+                Type renderType = _EditorInfo != null ? _EditorInfo.RenderType : null;
+                object[] renderParams = _EditorInfo != null ? _EditorInfo.RenderParams : null;
+
+                SuperGrid.DoGetRendererEvent(panel, this, ref renderType, ref renderParams);
+
+                RenderType = renderType;
+                RenderParams = renderParams;
+                
+                return (RenderControl ?? (GridColumn != null ? GridColumn.RenderControl : null));
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region BeginEdit
+
+        ///<summary>
+        /// Begins a Modal cell edit operation using
+        /// the defined column or cell Modal EditControl.
+        ///</summary>
+        ///<param name="selectAll"></param>
+        ///<returns></returns>
+        public IGridCellEditControl BeginEdit(bool selectAll)
+        {
+            return (BeginEdit(selectAll, null));
+        }
+
+        ///<summary>
+        /// Begins a Modal cell edit operation using the defined column
+        /// or cell Modal EditControl.  If a KeyEvent is provided then
+        /// the event will be presented to the editor control. 
+        ///</summary>
+        ///<returns>Cell edit control</returns>
+        public IGridCellEditControl BeginEdit(bool selectAll, KeyEventArgs e)
+        {
+            GridCell ecell = SuperGrid.EditorCell;
+
+            if (ecell == this)
+                return (GetInternalEditControl());
+
+            if (ecell != null)
+                throw new Exception("Modal Cell edit is already in process.");
+
+            if (Visible == true && CanModify == true)
+            {
+                GridPanel.FlushSelected();
+
+                IGridCellEditControl editor = GetInternalEditControl();
+
+                if (editor != null && editor.CellEditMode == CellEditMode.Modal)
+                {
+                    if (SuspendMerge(false) == true)
+                    {
+                        CellVisualStyle style = GetEffectiveStyle(StyleState.Default);
+
+                        SuperGrid.DeactivateNonModalEditor();
+
+                        DoRendererMouseLeave(EventArgs.Empty);
+                        EnsureVisible();
+
+                        GetCurrentContentSize(style, editor);
+
+                        InitializeContext(DataContext.CellEdit, editor, style);
+
+                        if (SuperGrid.DoBeginEditEvent(GridPanel, this, editor) == false)
+                        {
+                            SuperGrid.ActiveEditor = editor;
+                            SuperGrid.EditorCell = this;
+
+                            PositionEditPanel(editor);
+
+                            editor.EditorPanel.Show();
+                            editor.EditorPanel.BringToFront();
+
+                            if (editor.BeginEdit(selectAll) == false)
+                            {
+                                UpdateInfoWindow();
+
+                                FocusEditor(editor);
+
+                                if (e != null)
+                                    SuperGrid.PressKeyDown((ushort) e.KeyCode);
+
+                                return (editor);
+                            }
+
+                            CloseEdit(editor);
+                        }
+                    }
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region EndEdit
+
+        ///<summary>
+        /// This routine ends an in-progress Modal cell edit operation.
+        ///</summary>
+        ///<returns>true if ended</returns>
+        public bool EndEdit()
+        {
+            IGridCellEditControl editor = SuperGrid.ActiveEditor;
+
+            if (editor != null && CellEditMode == CellEditMode.Modal)
+            {
+                if (editor.EditorCell == this)
+                {
+                    if (GridRow.EditorDirty == true)
+                    {
+                        if (ValidateCellEdit(editor) == false)
+                            return (false);
+
+                        GridRow.EditorDirty = false;
+
+                        object value = Value;
+
+                        if (UpdateCellValue(editor) == true)
+                            Value = value;
+                    }
+
+                    if (SuperGrid.DoEndEditEvent(GridPanel, this, editor) == false)
+                    {
+                        if (editor.EndEdit() == false)
+                        {
+                            CloseEdit(editor);
+
+                            return (true);
+                        }
+                    }
+
+                    return (false);
+                }
+            }
+
+            return (true);
+        }
+
+        #region UpdateCellValue
+
+        /// <summary>
+        /// Used by IGridCellEditControl editors to update the
+        /// cell Value from the EditorValue, performing any needed
+        /// data conversions for proper data typing.
+        /// </summary>
+        /// <param name="editor"></param>
+        /// <returns></returns>
+        public bool UpdateCellValue(IGridCellEditControl editor)
+        {
+            object value = editor.EditorValue;
+
+            while (true)
+            {
+                try
+                {
+                    ConvertValueToType(editor, value);
+
+                    return (false);
+                }
+                catch (Exception exp)
+                {
+                    bool throwException = true;
+                    bool retry = false;
+
+                    if (SuperGrid.HasDataErrorHandler == true)
+                    {
+                        if (SuperGrid.DoDataErrorEvent(GridPanel, this, exp,
+                            DataContext.CellValueStore, ref value, ref throwException, ref retry) == true)
+                        {
+                            return (true);
+                        }
+                    }
+
+                    if (throwException == true)
+                    {
+                        MessageBoxEx.Show(exp.ToString());
+                        throw;
+                    }
+
+                    if (retry == false)
+                        break;
+                }
+            }
+
+            return (true);
+        }
+
+        #region ConvertValueToType
+
+        private void ConvertValueToType(IGridCellEditControl editor, object value)
+        {
+            Type dataType = GridColumn.DataType;
+
+            if (editor is IGridCellConvertTo)
+            {
+                IGridCellConvertTo cvtEditor = (IGridCellConvertTo)editor;
+
+                object result;
+                if (cvtEditor.TryConvertTo(value, dataType, out result) == true)
+                {
+                    Value = result;
+
+                    return;
+                }
+            }
+
+            if (dataType == null && Value != null)
+                dataType = Value.GetType();
+
+            if (dataType == typeof (SqlDateTime))
+                Value = SetSqlDateTime(value);
+
+            else if (dataType == typeof (SqlBoolean))
+                Value = SetSqlBoolean(value);
+
+            else if (dataType == typeof (SqlString))
+                Value = SetSqlString(value);
+
+            else if (dataType == typeof (SqlSingle))
+                Value = SetSqlSingle(value);
+
+            else if (dataType == typeof (SqlDouble))
+                Value = SetSqlDouble(value);
+
+            else if (dataType == typeof(SqlDecimal))
+                Value = SetSqlDecimal(value);
+
+            else if (dataType == typeof (SqlInt16))
+                Value = SetSqlInt16(value);
+
+            else if (dataType == typeof (SqlInt32))
+                Value = SetSqlInt32(value);
+
+            else if (dataType == typeof (SqlInt64))
+                Value = SetSqlInt64(value);
+
+            else if (dataType != null)
+                Value = ConvertValue.ConvertTo(value, dataType);
+
+            else
+                Value = value;
+        }
+
+        #region SetSqlDateTime
+
+        private object SetSqlDateTime(object value)
+        {
+            if (value == null)
+                return (new SqlDateTime());
+
+            if (value is DateTime)
+                return (new SqlDateTime((DateTime)value));
+
+            return (new SqlDateTime(Convert.ToDateTime(value)));
+        }
+
+        #endregion
+
+        #region SetSqlBoolean
+
+        private object SetSqlBoolean(object value)
+        {
+            if (value == null)
+                return (new SqlBoolean());
+
+            if (value is CheckState)
+            {
+                CheckState cs = (CheckState)value;
+
+                if (cs == CheckState.Checked)
+                    return (new SqlBoolean(true));
+
+                if (cs == CheckState.Unchecked)
+                    return (new SqlBoolean(false));
+
+                return (new SqlBoolean());
+            }
+
+            return (new SqlBoolean(Convert.ToBoolean(value)));
+        }
+
+        #endregion
+
+        #region SetSqlBoolean
+
+        private object SetSqlString(object value)
+        {
+            if (value == null)
+                return (new SqlString());
+
+            return (new SqlString(Convert.ToString(value)));
+        }
+
+        #endregion
+
+        #region SetSqlSingle
+
+        private object SetSqlSingle(object value)
+        {
+            if (value == null)
+                return (new SqlSingle());
+
+            return (new SqlSingle(Convert.ToSingle(value)));
+        }
+
+        #endregion
+
+        #region SetSqlDouble
+
+        private object SetSqlDouble(object value)
+        {
+            if (value == null)
+                return (new SqlDouble());
+
+            return (new SqlSingle(Convert.ToDouble(value)));
+        }
+
+        #endregion
+
+        #region SetSqlDecimal
+
+        private object SetSqlDecimal(object value)
+        {
+            if (value == null)
+                return (new SqlDecimal());
+
+            return (new SqlDecimal(Convert.ToDecimal(value)));
+        }
+
+        #endregion
+
+        #region SetSqlInt16
+
+        private object SetSqlInt16(object value)
+        {
+            if (value == null)
+                return (new SqlInt16());
+
+            return (new SqlInt16(Convert.ToInt16(value)));
+        }
+
+        #endregion
+
+        #region SetSqlInt32
+
+        private object SetSqlInt32(object value)
+        {
+            if (value == null)
+                return (new SqlInt32());
+
+            return (new SqlInt32(Convert.ToInt32(value)));
+        }
+
+        #endregion
+
+        #region SetSqlInt64
+
+        private object SetSqlInt64(object value)
+        {
+            if (value == null)
+                return (new SqlInt64());
+
+            return (new SqlInt64(Convert.ToInt64(value)));
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region ValidateCellEdit
+
+        private bool ValidateCellEdit(IGridCellEditControl editor)
+        {
+            try
+            {
+                object value = editor.EditorValue;
+                object formattedValue = GetFormattedValue(editor);
+
+                if (SuperGrid.DoCellValidatingEvent(this, ref value, formattedValue) == true)
+                {
+                    if (SuperGrid.DoPlayingSoundEvent(GridPanel, this, PlaySoundContext.CellValidate) == false)
+                        SystemSounds.Beep.Play();
+
+                    return (false);
+                }
+
+                editor.EditorValue = value;
+
+                SuperGrid.DoCellValidatedEvent(this);
+            }
+            catch
+            {
+                if (SuperGrid.DoPlayingSoundEvent(GridPanel, this, PlaySoundContext.CellValidate) == false)
+                    SystemSounds.Beep.Play();
+
+                return (false);
+            }
+
+            return (true);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region CancelEdit
+
+        ///<summary>
+        /// Cancels the current in-progress Modal cell edit operation.
+        ///</summary>
+        ///<returns>true if canceled</returns>
+        public bool CancelEdit()
+        {
+            IGridCellEditControl editor = SuperGrid.ActiveEditor;
+
+            if (editor == null || CellEditMode != CellEditMode.Modal)
+                throw new Exception("Bad CancelEdit - Modal edit not in progress.");
+
+            if (SuperGrid.DoCancelEditEvent(GridPanel, this, editor) == false)
+            {
+                if (editor.CancelEdit() == false)
+                {
+                    bool rowDirty = GridRow.RowDirty;
+                    bool needsStored = GridRow.RowNeedsStored;
+
+                    CloseEdit(editor);
+
+                    GridRow.RowDirty = rowDirty;
+                    GridRow.RowNeedsStored = needsStored;
+
+                    return (true);
+                }
+            }
+
+            return (true);
+        }
+
+        #endregion
+
+        #region CloseEdit
+
+        private void CloseEdit(IGridCellEditControl editor)
+        {
+            CloseCellInfoWindow();
+
+            IsMouseOver = false;
+
+            bool wasFocused = ((Control)editor).ContainsFocus;
+
+            editor.EditorPanel.Hide();
+            editor.EditorPanel.GridCell = null;
+
+            GridRow.EditorDirty = false;
+
+            SuperGrid.ActiveEditor = null;
+            SuperGrid.EditorCell = null;
+
+            if (wasFocused == true)
+                SuperGrid.Focus();
+
+            SuperGrid.DoCloseEditEvent(GridPanel, this);
+
+            if (GridPanel == null || GridPanel.NeedToUpdateDataFilter == true)
+                InvalidateLayout();
+            else
+                InvalidateRender();
+
+            SuperGrid.Update();
+        }
+
+        #endregion
+
+        #region PositionEditPanel
+
+        internal void PositionEditPanel(IGridCellEditControl editor)
+        {
+            PositionEditControl(editor);
+
+            UpdateCellInfoWindowPos();
+
+            ((Control)editor).Update();
+            editor.EditorPanel.Update();
+        }
+
+        #endregion
+
+        #region PostCellKeyDown
+
+        ///<summary>
+        /// PostCellKeyDown
+        ///</summary>
+        ///<returns></returns>
+        internal void PostCellKeyDown(Keys keyData)
+        {
+            if (CanModifyMerge == true)
+            {
+                SuperGrid.DeactivateNonModalEditor();
+
+                IGridCellEditControl editor = GetInternalEditControl();
+
+                if (editor != null)
+                {
+                    KeyEventArgs e = new KeyEventArgs(keyData);
+
+                    CellVisualStyle style = GetEffectiveStyle();
+
+                    InitializeContext(DataContext.CellKeyEvent, editor, style);
+
+                    editor.CellKeyDown(e);
+                }
+
+                PostInternalMouseMove();
+            }
+        }
+
+        #endregion
+
+        #region PositionEditControl
+
+        ///<summary>
+        /// PositionEditControl
+        ///</summary>
+        ///<param name="editor"></param>
+        private void PositionEditControl(IGridCellEditControl editor)
+        {
+            if (GridColumn != null)
+            {
+                GridPanel panel = GridPanel;
+
+                if (panel != null)
+                {
+                    Control c = (Control) editor;
+
+                    Rectangle r = GetAdjustedBounds(ContentBounds);
+                    Rectangle e = GetEditPanelBounds(editor, r);
+                    e = GetClippedBounds(panel, e);
+
+                    switch (editor.CellEditMode)
+                    {
+                        case CellEditMode.Modal:
+                        case CellEditMode.NonModal:
+                            if (GetCellHighlightMode(panel) == CellHighlightMode.Content)
+                            {
+                                r = GetEditPanelBounds(editor, r);
+                                e = GetClippedBounds(panel, r);
+                            }
+
+                            editor.EditorPanel.Bounds = e;
+
+                            c.Bounds = GetEditorBounds(editor, r, e);
+
+                            editor.EditorPanel.SizeEx = Bounds.Size;
+                            editor.EditorPanel.OffsetEx = new Point(Bounds.X - e.X, Bounds.Y - e.Y);
+
+                            if (editor.CellEditMode == CellEditMode.NonModal)
+                            {
+                                editor.EditorPanel.BringToFront();
+                                editor.EditorPanel.Show();
+                            }
+                            break;
+
+                        case CellEditMode.InPlace:
+                            r.Intersect(SuperGrid.SViewRect);
+                            r.Location = Point.Empty;
+
+                            c.Bounds = r;
+                            break;
+                    }
+                }
+            }
+        }
+
+        #region GetEditPanelBounds
+
+        private Rectangle GetEditPanelBounds(IGridCellEditControl editor, Rectangle r)
+        {
+            CellVisualStyle style = GetEffectiveStyle();
+
+            int n = r.Right;
+
+            if (SuperGrid.EditorCell != this)
+            {
+                AlignHorizontally(editor, style, ref r);
+            }
+            else
+            {
+                if (GetCellHighlightMode(GridPanel) == CellHighlightMode.Content)
+                    n -= 2;
+            }
+
+            if (r.Right > n)
+                r.Width -= (r.Right - n);
+
+            n = r.Bottom - 1;
+
+            AlignVertically(editor, style, ref r);
+
+            if (r.Bottom > n)
+                r.Height -= (r.Bottom - n);
+
+            return (r);
+        }
+
+        #endregion
+
+        #region AlignHorizontally
+
+        private void AlignHorizontally(
+            IGridCellEditControl editor, CellVisualStyle style, ref Rectangle r)
+        {
+            Size size = _ContentSize;
+
+            switch (editor.StretchBehavior)
+            {
+                case StretchBehavior.Both:
+                case StretchBehavior.HorizontalOnly:
+                    size.Width = r.Width;
+                    break;
+
+                default:
+                    if (size.Width <= 0)
+                    {
+                        GetCurrentContentSize(style, editor);
+
+                        size = _ContentSize;
+                    }
+
+                    if (size.Width <= 0)
+                    {
+                        size.Width = r.Width;
+                    }
+                    else if (r.Width > size.Width)
+                    {
+                        switch (style.Alignment)
+                        {
+                            case Alignment.TopCenter:
+                            case Alignment.MiddleCenter:
+                            case Alignment.BottomCenter:
+                                r.X += ((r.Width - size.Width) / 2);
+                                break;
+
+                            case Alignment.TopRight:
+                            case Alignment.MiddleRight:
+                            case Alignment.BottomRight:
+                                r.X += (r.Width - size.Width - 1);
+                                break;
+                        }
+                    }
+                    break;
+            }
+
+            r.Width = size.Width;
+        }
+
+        #endregion
+
+        #region AlignVertically
+
+        private void AlignVertically(
+            IGridCellEditControl editor, CellVisualStyle style, ref Rectangle r)
+        {
+            Size size = _ContentSize;
+
+            switch (editor.StretchBehavior)
+            {
+                case StretchBehavior.Both:
+                case StretchBehavior.VerticalOnly:
+                    size.Height = r.Height;
+                    break;
+
+                default:
+                    if (size.Height <= 0)
+                    {
+                        size.Height = r.Height;
+                    }
+                    else if (r.Height > size.Height)
+                    {
+                        switch (style.Alignment)
+                        {
+                            case Alignment.MiddleLeft:
+                            case Alignment.MiddleCenter:
+                            case Alignment.MiddleRight:
+                                r.Y += ((r.Height - size.Height)/2);
+                                break;
+
+                            case Alignment.BottomLeft:
+                            case Alignment.BottomCenter:
+                            case Alignment.BottomRight:
+                                r.Y += r.Height - size.Height;
+                                break;
+                        }
+                    }
+                    break;
+            }
+
+            r.Height = size.Height;
+        }
+
+        #endregion
+
+        #region GetEditorBounds
+
+        private Rectangle GetEditorBounds(
+            IGridCellEditControl editor, Rectangle r, Rectangle e)
+        {
+            if (GetCellHighlightMode(GridPanel) == CellHighlightMode.Content)
+            {
+                r.X = 0;
+                r.Y = 0;
+            }
+            else
+            {
+                r.X = (r.X - e.X);
+                r.Y = (r.Y - e.Y);
+
+                r = GetEditPanelBounds(editor, r);
+            }
+
+            return (r);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region FocusEditor
+
+        internal void FocusEditor(IGridCellEditControl editor)
+        {
+            if (((Control)editor).Focused == false)
+                ((Control)editor).Focus();
+
+            if (editor is IGridCellEditorFocus)
+                ((IGridCellEditorFocus)editor).FocusEditor();
+        }
+
+        #endregion
+
+        #region CellRender
+
+        ///<summary>
+        /// This routine can be called by a cell editor / renderer to
+        /// perform default cell rendering provided by the grid.
+        ///</summary>
+        ///<param name="editor"></param>
+        ///<param name="g"></param>
+        public void CellRender(IGridCellEditControl editor, Graphics g)
+        {
+            GridPanel panel = GridPanel;
+
+            if (panel != null)
+            {
+                CellVisualStyle style = GetEffectiveStyle();
+
+                CellRange cr = GetStateCellRange();
+
+                Rectangle bounds = (cr != null) ? GetBounds(panel, cr.BackBounds) : Bounds;
+                Rectangle rc = GetAdjustedBounds(GetContentBounds(panel, bounds));
+
+                if (rc.Height > 0 && rc.Width > 0)
+                {
+                    RenderContent(g, panel, editor, style, rc, cr);
+                    RenderCellInfo(g, panel);
+                }
+            }
+        }
+
+        #region RenderContent
+
+        private void RenderContent(Graphics g, GridPanel panel,
+            IGridCellEditControl editor, CellVisualStyle style, Rectangle rc, CellRange cr)
+        {
+            if (cr != null &&
+                (editor.CellEditMode == CellEditMode.Modal || cr.AlwaysDisplayFormattedValue == true))
+                RenderRangeContent(g, panel, style, rc, cr);
+            else
+                RenderCellContent(g, editor, style, rc);
+        }
+
+        #region RenderRangeContent
+
+        private void RenderRangeContent(Graphics g,
+            GridPanel panel, CellVisualStyle style, Rectangle rc, CellRange cr)
+        {
+            string s = cr.FormattedValue;
+
+            if (string.IsNullOrEmpty(s) == false)
+            {
+                if (panel.EnableCellRangeMarkup == true)
+                {
+                    if (MarkupParser.IsMarkup(s) == true)
+                    {
+                        BodyElement markup = MarkupParser.Parse(s);
+
+                        RenderTextMarkup(g, markup, style, rc);
+                    }
+                }
+                else
+                {
+                    eTextFormat tf = style.GetTextFormatFlags();
+
+                    TextDrawing.DrawString(g, s, style.Font, style.TextColor, rc, tf);
+                }
+            }
+        }
+
+        #region RenderTextMarkup
+
+        private void RenderTextMarkup(Graphics g,
+            BodyElement textMarkup, CellVisualStyle style, Rectangle r)
+        {
+            MarkupDrawContext d =
+                new MarkupDrawContext(g, style.Font, style.TextColor, false);
+
+            textMarkup.Arrange(new Rectangle(r.Location, r.Size), d);
+
+            Size size = textMarkup.Bounds.Size;
+
+            switch (style.Alignment)
+            {
+                case Alignment.MiddleLeft:
+                case Alignment.MiddleCenter:
+                case Alignment.MiddleRight:
+                    if (r.Height > size.Height)
+                        r.Y += (r.Height - size.Height) / 2;
+                    break;
+
+                default:
+                    if (r.Height > size.Height)
+                        r.Y = r.Bottom - size.Height;
+                    break;
+            }
+
+            textMarkup.Bounds = new Rectangle(r.Location, size);
+
+            Region oldClip = g.Clip;
+
+            try
+            {
+                g.SetClip(r, CombineMode.Intersect);
+
+                textMarkup.Render(d);
+            }
+            finally
+            {
+                g.Clip = oldClip;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderCellContent
+
+        private void RenderCellContent(Graphics g,
+            IGridCellEditControl editor, CellVisualStyle style, Rectangle rc)
+        {
+            switch (editor.CellEditMode)
+            {
+                case CellEditMode.Modal:
+                    string s = GetFormattedValueEx(editor);
+                    eTextFormat tf = style.GetTextFormatFlags();
+
+                    if (string.IsNullOrEmpty(s) == false)
+                        TextDrawing.DrawString(g, s, style.Font, style.TextColor, rc, tf);
+                    break;
+
+                case CellEditMode.NonModal:
+                case CellEditMode.InPlace:
+                    Rectangle re = GetEditPanelBounds(editor, rc);
+
+                    if (re.Width > 0 && re.Height > 0)
+                    {
+                        Bitmap bm = GetCellBitmap(editor, rc);
+
+                        if (bm != null)
+                        {
+                            PaintButtonContent(editor, bm, rc, re);
+
+                            g.DrawImageUnscaledAndClipped(bm, re);
+                        }
+                    }
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderCellInfo
+
+        private void RenderCellInfo(Graphics g, GridPanel panel)
+        {
+            if (ShowInfoCellImage(panel) == true)
+            { 
+                Image image = GetInfoImage();
+
+                if (image != null)
+                {
+                    Rectangle rc = InfoImageBounds;
+
+                    if (rc.Width > 0 && rc.Height > 0)
+                        g.DrawImageUnscaledAndClipped(image, rc);
+                }
+            }
+        }
+
+        #region ShowInfoCellImage
+
+        private bool ShowInfoCellImage(GridPanel panel)
+        {
+            if (panel.ShowCellInfo == false || _InfoText == null)
+                return (false);
+
+            if (_InfoText.Equals("") == false)
+                return (true);
+
+            return (panel.ShowCellInfoDisplayMode == ShowCellInfoDisplayMode.ShowWithEmptyText);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetExpValue
+
+        ///<summary>
+        /// Gets the resultant value of the evaluated Cell Expression, if
+        /// applicable. Otherwise returns the given value.
+        ///</summary>
+        ///<param name="source"></param>
+        ///<returns></returns>
+        public string GetExpValue(string source)
+        {
+            GridPanel panel = GridPanel;
+
+            if (IsValueExpression == true &&
+                panel.EnableCellExpressions == true)
+            {
+                EEval eval = panel.ExpDictionary[this];
+
+                if (eval != null)
+                {
+                    while (true)
+                    {
+                        try
+                        {
+                            _ExpValue = eval.Evaluate();
+
+                            string s = (_ExpValue != null)
+                                           ? _ExpValue.ToString()
+                                           : "";
+
+                            InfoText = null;
+
+                            return (s);
+                        }
+                        catch (Exception exp)
+                        {
+                            bool retry = false;
+                            bool throwException = false;
+
+                            if (SuperGrid.HasDataErrorHandler == true)
+                            {
+                                object value = _Value;
+
+                                if (SuperGrid.DoDataErrorEvent(panel, this, exp,
+                                   DataContext.CellExpressionEval, ref value, ref throwException, ref retry) == true)
+                                {
+                                    return (source);
+                                }
+                            }
+
+                            if (throwException == true)
+                                throw;
+
+                            InfoText = exp.Message;
+
+                            if (retry == false)
+                                return ("####!");
+                        }
+                    }
+                }
+            }
+
+            return (source);
+        }
+
+        #endregion
+
+        #region GetCellBitmap
+
+        /// <summary>
+        /// Gets the cell paint bitmap
+        /// </summary>
+        /// <param name="editor"></param>
+        /// <param name="r"></param>
+        /// <returns></returns>
+        private Bitmap GetCellBitmap(IGridCellEditControl editor, Rectangle r)
+        {
+            Bitmap bm = editor.EditorCellBitmap;
+
+            if (bm == null || bm.Size != r.Size)
+            {
+                if (bm != null)
+                    bm.Dispose();
+
+                bm = new Bitmap(r.Width, r.Height);
+
+                editor.EditorCellBitmap = bm;
+            }
+
+            return (bm);
+        }
+
+        #endregion
+
+        #region PaintButtonContent
+
+        /// <summary>
+        /// Paints the button background and content
+        /// </summary>
+        private void PaintButtonContent(IGridCellEditControl editor,
+            Bitmap bm, Rectangle rc, Rectangle re)
+        {
+            Control c = (Control)editor;
+
+            // SizeEx is the size of the Adjusted Content size of the cell
+            // OffsetEx is the offset from the Editor panel to the cell ContentBounds.
+
+            editor.EditorPanel.Size = re.Size;
+            editor.EditorPanel.SizeEx = rc.Size;
+            editor.EditorPanel.OffsetEx = new Point(rc.X - re.X, rc.Y - re.Y);
+
+            // Set the control bounds and initiate the
+            // transfer of the control image to our bitmap.
+
+            re.Location = Point.Empty;
+
+            editor.SuspendUpdate = true;
+
+            if (editor.EditorPanel.IsHandleCreated == false)
+            {
+                editor.EditorPanel.Show();
+                editor.EditorPanel.BringToFront();
+                editor.EditorPanel.Hide();
+            }
+
+            c.Bounds = re;
+            c.DrawToBitmap(bm, re);
+
+            editor.SuspendUpdate = false;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region PaintEditorBackground
+
+        ///<summary>
+        /// Performs default cell background painting for the cell.
+        ///</summary>
+        ///<param name="e"></param>
+        ///<param name="editor"></param>
+        public void PaintEditorBackground(PaintEventArgs e, IGridCellEditControl editor)
+        {
+            Rectangle r = new Rectangle();
+
+            r.Size = editor.EditorPanel.SizeEx;
+            r.Location = Point.Empty;
+
+            if (r.Width > 0 && r.Height > 0)
+            {
+                Graphics g = e.Graphics;
+
+                if (SuperGrid.DoPreRenderCellEvent(g, this, RenderParts.Background, r) == false)
+                {
+                    GridPanel panel = GridPanel;
+                    CellHighlightMode mode = GetCellHighlightMode(panel);
+
+                    using (Brush br = GetContentBrush(panel, r, mode))
+                        g.FillRectangle(br, r);
+
+                    SuperGrid.DoPostRenderCellEvent(g, this, RenderParts.Background, r);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ExtendSelection
+
+        ///<summary>
+        /// ExtendSelection
+        ///</summary>
+        internal void ExtendSelection(GridPanel panel)
+        {
+            if (IsMouseSelectable() == true)
+            {
+                Capture = true;
+
+                ExtendSelectionEx(panel);
+            }
+        }
+
+        private void ExtendSelectionEx(GridPanel panel)
+        {
+            _mouseDownHitCell = this;
+            _mouseDownHitArea = CellArea.InContent;
+
+            if (panel.SelectionRowAnchor == null)
+                panel.SelectionRowAnchor = GridRow;
+
+            if (_hitCell != null)
+            {
+                _anchorRowIndex = _hitCell.GridRow.GridIndex;
+                _anchorColumnIndex = panel.Columns.GetDisplayIndex(GridColumn);
+
+                ProcessExtendSelection(panel, false);
+
+                if (panel.LastProcessedItem != _hitCell)
+                    GridRow.EditorDirty = false;
+
+                if (SuperGrid.ActiveNonModalEditor != null)
+                {
+                    SuperGrid.Update();
+
+                    if (SuperGrid.ActiveNonModalEditor != null)
+                        SuperGrid.ActiveNonModalEditor.EditorPanel.Invalidate(true);
+                }
+            }
+        }
+
+        #region IsMouseSelectable
+
+        private bool IsMouseSelectable()
+        {
+            if ((Control.MouseButtons & MouseButtons.Left) == MouseButtons.Left)
+                return (true);
+
+            return (IsSelected == false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InitializeContext
+
+        private void InitializeContext(DataContext dataContext,
+            IGridCellEditControl editor, CellVisualStyle style)
+        {
+            if (((Control) editor).Handle != null)
+            {
+                object value = Value;
+
+                if (InitializeContextEx(dataContext, editor, style) == true)
+                    Value = value;
+            }
+        }
+
+        private bool InitializeContextEx(DataContext dataContext,
+            IGridCellEditControl editor, CellVisualStyle style)
+        {
+            object value = Value;
+
+            while (true)
+            {
+                bool suspended = editor.SuspendUpdate;
+
+                try
+                {
+                    IsDataError = false;
+
+                    editor.SuspendUpdate = true;
+                    editor.EditorPanel.GridCell = this;
+
+                    editor.InitializeContext(this, style);
+
+                    SuperGrid.DoInitEditContextEvent(this, editor);
+
+                    return (false);
+                }
+                catch (Exception exp)
+                {
+                    bool retry = false;
+                    bool throwException = false;
+
+                    if (SuperGrid.HasDataErrorHandler == true)
+                    {
+                        if (SuperGrid.DoDataErrorEvent(GridPanel, this, exp,
+                            dataContext, ref value, ref throwException, ref retry) == true)
+                        {
+                            return (true);
+                        }
+                    }
+                    else
+                    {
+                        IsDataError = true;
+
+                        return (false);
+                    }
+
+                    if (throwException == true)
+                        throw;
+
+                    if (retry == false)
+                        break;
+
+                    Value = value;
+                }
+                finally
+                {
+                    editor.SuspendUpdate = suspended;
+                }
+            }
+
+            return (true);
+        }
+
+        #endregion
+
+        #region CellRender
+
+        private void CellRender(Graphics g,
+            CellVisualStyle style, IGridCellEditControl renderer)
+        {
+            if (renderer.CellEditMode != CellEditMode.Modal)
+            {
+                try
+                {
+                    renderer.SuspendUpdate = true;
+
+                    InitializeContext(DataContext.CellRender, renderer, style);
+                    renderer.CellRender(g);
+                }
+                finally
+                {
+                    renderer.SuspendUpdate = false;
+                }
+            }
+            else
+            {
+                InitializeContext(DataContext.CellRender, renderer, style);
+                renderer.CellRender(g);
+            }
+        }
+
+        #endregion
+
+        #region SetEditorDirty
+
+        ///<summary>
+        /// Called by the cell editor to conditionally set
+        /// the cells row level EditorDirty state.
+        ///</summary>
+        ///<param name="editor"></param>
+        public void SetEditorDirty(IGridCellEditControl editor)
+        {
+            if (GridColumn.MarkRowDirtyOnCellValueChange == true)
+            {
+                if (SuperGrid.DoRowMarkedDirtyEvent(this, editor) == false)
+                    EditorDirty = true;
+            }
+        }
+
+        #endregion
+
+        #region EditorValueChanged
+
+        ///<summary>
+        /// This routine is called by cell editors to signal to the grid
+        /// that the editor has changed the cell Value.
+        ///</summary>
+        ///<param name="editor"></param>
+        public void EditorValueChanged(IGridCellEditControl editor)
+        {
+            if (editor.SuspendUpdate == false)
+            {
+                SuperGrid.DoEditorValueChangedEvent(this, editor);
+
+                editor.EditorValueChanged = true;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region UpdateBoundingRects
+
+        private void UpdateBoundingRects()
+        {
+            GridPanel panel = GridPanel;
+
+            if (panel != null)
+            {
+                _BoundsUpdateCount = SuperGrid.BoundsUpdateCount;
+
+                _BackBounds = GetBackBounds(panel);
+                _Bounds = GetBounds(panel);
+            }
+        }
+
+        #region GetBackBounds
+
+        /// <summary>
+        /// Gets the scroll adjusted background bounding rectangle
+        /// </summary>
+        /// <param name="panel"></param>
+        /// <returns></returns>
+        internal Rectangle GetBackBounds(GridPanel panel)
+        {
+            Rectangle r = BoundsRelative;
+
+            if (panel.IsSubPanel == false)
+            {
+                GridColumn column = GridColumn;
+
+                if (column != null)
+                {
+                    if (column.IsHFrozen == false)
+                        r.X -= HScrollOffset;
+                }
+            }
+            else
+            {
+                r.X -= HScrollOffset;
+            }
+
+            if (GridRow.IsVFrozen == false)
+                r.Y -= VScrollOffset;
+
+            return (r);
+        }
+
+        #endregion
+
+        #region GetBounds
+
+        internal Rectangle GetBounds(GridPanel panel)
+        {
+            return (GetBounds(panel, BackBounds));
+        }
+
+        /// <summary>
+        /// Gets the scroll adjusted bounding rectangle
+        /// </summary>
+        /// <param name="panel"></param>
+        /// <param name="backBounds"></param>
+        /// <returns></returns>
+        internal Rectangle GetBounds(GridPanel panel, Rectangle backBounds)
+        {
+            Rectangle r = backBounds;
+
+            r.Y += GridRow.EffectivePreDetailRowHeight;
+            r.Height -= (GridRow.EffectivePreDetailRowHeight + GridRow.EffectivePostDetailRowHeight);
+
+            return (r);
+        }
+
+        #endregion
+
+        #region GetCellBounds
+
+        /// <summary>
+        /// Gets the SViewRect clipped Bounds
+        /// </summary>
+        /// <param name="panel"></param>
+        /// <returns></returns>
+        private Rectangle GetCellBounds(GridPanel panel)
+        {
+            return (GetClippedBounds(panel, Bounds));
+        }
+
+        #endregion
+
+        #region GetContentBounds
+
+        internal Rectangle GetContentBounds(GridPanel panel)
+        {
+            return (GetContentBounds(panel, Bounds));
+        }
+
+        /// <summary>
+        /// Gets the cell content (excludes image) bounding rectangle
+        /// </summary>
+        /// <param name="panel"></param>
+        /// <param name="bounds"></param>
+        /// <returns></returns>
+        internal Rectangle GetContentBounds(GridPanel panel, Rectangle bounds)
+        {
+            Rectangle r = bounds;
+
+            int n = Dpi.Width(panel.LevelIndentSize.Width * _IndentLevel);
+
+            CellRange cr = GetStateCellRange();
+
+            if (HasPrimaryCell(panel, cr) == true)
+            {
+                if (panel.ShowTreeButtons == true || panel.ShowTreeLines == true)
+                    n += panel.TreeButtonIndent;
+
+                if (panel.CheckBoxes == true)
+                    n += Dpi.Width(panel.CheckBoxSize.Width + (CheckBoxSpacing * 2));
+
+                if (Merged == true)
+                {
+                    GridColumn col = panel.Columns.ColumnAtDisplayIndex(cr.ColumnStart);
+
+                    n = Math.Max(n - (r.X - col.Bounds.X), 0);
+                }
+
+                r.X += n;
+                r.Width -= n;
+            }
+            else if (panel.GroupColumns.Count > 0)
+            {
+                if (panel.Columns.FirstVisibleColumn == GridColumn)
+                {
+                    r.X += n;
+                    r.Width -= n;
+                }
+            }
+
+            CellVisualStyle style = GetEffectiveStyle();
+
+            object figure = style.GetFigure(panel);
+
+            if (figure != null)
+                r = style.GetNonFigureBounds(panel, r);
+
+            if (GridColumn.InfoImageOverlay == false)
+            {
+                if (string.IsNullOrEmpty(InfoText) == false)
+                {
+                    Image image = GetInfoImage();
+
+                    if (image != null)
+                    {
+                        switch (GridColumn.InfoImageAlignment)
+                        {
+                            case Alignment.MiddleLeft:
+                                r.X += (image.Size.Width + 4);
+                                r.Width -= (image.Size.Width + 4);
+                                break;
+
+                            case Alignment.MiddleRight:
+                                r.Width -= (image.Size.Width + 4);
+                                break;
+                        }
+                    }
+                }
+            }
+
+            r.Inflate(-1, -1);
+
+            return (r);
+        }
+
+        #region IsPrimaryCell
+
+        private bool HasPrimaryCell(GridPanel panel, CellRange cr)
+        {
+            if (cr != null)
+                return (cr.ColumnStart == panel.Columns.GetDisplayIndex(panel.PrimaryColumn));
+
+            return (panel.PrimaryColumnIndex == _ColumnIndex);
+
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetEditBounds
+
+        /// <summary>
+        /// Gets 
+        /// </summary>
+        /// <param name="panel"></param>
+        /// <returns></returns>
+        private Rectangle GetEditBounds(GridPanel panel)
+        {
+            Rectangle r = GetClippedBounds(panel, ContentBounds);
+
+            r.Inflate(-1, -1);
+
+            return (r);
+        }
+
+        #endregion
+
+        #region GetClippedBounds
+
+        private Rectangle GetClippedBounds(GridPanel panel, Rectangle r)
+        {
+            Rectangle v = SViewRect;
+
+            if (IsVFrozen == true)
+            {
+                int n = panel.FixedRowHeight - panel.FixedHeaderHeight;
+
+                v.Y -= n;
+                v.Height += n;
+            }
+
+            if (GridColumn.IsHFrozen == false)
+            {
+                GridColumn pcol = panel.Columns.GetLastVisibleFrozenColumn();
+
+                if (pcol != null)
+                {
+                    int n = Dpi.Width(pcol.BoundsRelative.Right - v.X);
+
+                    v.X += n;
+                    v.Width -= n;
+                }
+            }
+
+            r.Intersect(v);
+
+            return (r);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetAdjustedBounds
+
+        #region GetAdjustedBounds()
+
+        private Rectangle GetAdjustedBounds()
+        {
+            Rectangle r = Bounds;
+
+            switch (GridPanel.GridLines)
+            {
+                case GridLines.Both:
+                    r.Width -= Dpi.Width1;
+                    r.Height -= Dpi.Height1;
+                    break;
+
+                case GridLines.Vertical:
+                    r.Width -= Dpi.Width1;
+                    break;
+
+                case GridLines.Horizontal:
+                    r.Height -= Dpi.Height1;
+                    break;
+            }
+
+            return (r);
+        }
+
+        #endregion
+
+        #region GetAdjustedBounds(r)
+
+        private Rectangle GetAdjustedBounds(Rectangle r)
+        {
+            CellVisualStyle style = GetEffectiveStyle();
+
+            r.X += Dpi.Width(style.BorderThickness.Left + style.Margin.Left + style.Padding.Left);
+            r.Width -= Dpi.Width(style.BorderThickness.Horizontal + style.Margin.Horizontal + style.Padding.Horizontal);
+
+            r.Y += Dpi.Height(style.BorderThickness.Top + style.Margin.Top + style.Padding.Top);
+            r.Height -= Dpi.Height(style.BorderThickness.Vertical + style.Margin.Vertical + style.Padding.Vertical);
+
+            r.Width--;
+
+            return (r);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetCurrentContentSize
+
+        private void GetCurrentContentSize(
+            CellVisualStyle style, IGridCellEditControl editor)
+        {
+            GridPanel panel = GridPanel;
+
+            if (panel != null)
+            {
+                Size oldSize = _ContentSize;
+                int width = Bounds.Size.Width;
+
+                object figure = style.GetFigure(panel);
+
+                if (figure != null)
+                {
+                    Alignment alignment = style.ImageAlignment;
+
+                    if (style.IsOverlayImage == true)
+                        alignment = Alignment.MiddleCenter;
+
+                    switch (alignment)
+                    {
+                        case Alignment.TopLeft:
+                        case Alignment.TopRight:
+                        case Alignment.MiddleLeft:
+                        case Alignment.MiddleRight:
+                        case Alignment.BottomLeft:
+                        case Alignment.BottomRight:
+                            width -= style.GetFigureSize(panel).Width;
+                            break;
+                    }
+                }
+
+                width -= (style.GetBorderSize(true).Width + 2);
+
+                Size constraintSize = new Size(width, 0);
+
+                using (Graphics g = SuperGrid.CreateGraphics())
+                    _ContentSize = GetProposedSize(g, style, constraintSize, editor, CellSizingSource.ActualAndFormattedValues);
+
+                if (_ContentSize != oldSize)
+                    _BoundsUpdateCount = (ushort)(SuperGrid.BoundsUpdateCount - 1);
+            }
+        }
+
+        #endregion
+
+        #region GetCellEditBounds
+
+        ///<summary>
+        /// Get the CellEditBounds for the cell.
+        ///</summary>
+        ///<param name="editor"></param>
+        ///<returns></returns>
+        public Rectangle GetCellEditBounds(IGridCellEditControl editor)
+        {
+            Rectangle r = GetAdjustedBounds(ContentBounds);
+
+            r = GetEditPanelBounds(editor, r);
+
+            return (r);
+        }
+
+        #endregion
+
+        #region GetFormattedValue
+
+        internal string GetFormattedValue()
+        {
+            IGridCellEditControl editor = SuperGrid.EditorCell == this
+                ? GetInternalEditControl() : GetInternalRenderControl();
+
+            return (GetFormattedValue(editor));
+        }
+
+        internal string GetFormattedValue(IGridCellEditControl editor)
+        {
+            string s = null;
+
+            if (editor == null || IsDataError == true)
+            {
+                if (_Value != null)
+                    s = _Value.ToString();
+            }
+            else
+            {
+                bool suspended = editor.SuspendUpdate;
+
+                try
+                {
+                    editor.SuspendUpdate = true;
+
+                    if (SuperGrid.EditorCell != this)
+                        InitializeContext(DataContext.CellGetFormattedValue, editor, null);
+
+                    s = editor.EditorFormattedValue;
+                }
+                finally
+                {
+                    editor.SuspendUpdate = suspended;
+                }
+
+                if (s != null && s.TrimStart().StartsWith("=") == true)
+                    s = GetExpValue(s);
+            }
+
+            CellSizingSource sizingSource = CellSizingSource.ActualAndFormattedValues;
+
+            SuperGrid.DoGetCellFormattedValueEvent(this, ref s, ref sizingSource);
+
+            return (s ?? "");
+        }
+
+        internal string GetFormattedValueEx(IGridCellEditControl editor)
+        {
+            string s = null;
+
+            if (editor == null || IsDataError == true)
+            {
+                if (_Value != null)
+                    s = _Value.ToString();
+            }
+            else
+            {
+                s = editor.EditorFormattedValue;
+
+                if (s != null && s.TrimStart().StartsWith("=") == true)
+                    s = GetExpValue(s);
+            }
+
+            CellSizingSource sizingSource = CellSizingSource.ActualAndFormattedValues;
+
+            SuperGrid.DoGetCellFormattedValueEvent(this, ref s, ref sizingSource);
+
+            return (s ?? "");
+        }
+
+        #endregion
+
+        #region CellInfoWindow support
+
+        #region UpdateInfoWindow
+
+        private void UpdateInfoWindow()
+        {
+            GridPanel panel = GridPanel;
+
+            if (panel != null)
+            {
+                if (SuperGrid.EditorCell != this)
+                {
+                    CloseCellInfoWindow();
+                }
+                else
+                {
+                    if (GridColumn.InfoImageOverlay == false)
+                    {
+                        if (SuperGrid.ActiveEditor != null)
+                            PositionEditPanel(SuperGrid.ActiveEditor);
+                    }
+                    else
+                    {
+                        if (CanShowCellInfo(panel) == true)
+                        {
+                            if (_cellInfoWindow == null)
+                                OpenCellInfoWindow();
+
+                            UpdateCellInfoWindowPos();
+
+                            _cellInfoWindow.Show();
+                            _cellInfoWindow.BringToFront();
+                        }
+                        else
+                        {
+                            CloseCellInfoWindow();
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region CanShowCellInfo
+
+        private bool CanShowCellInfo(GridPanel panel)
+        {
+            if (ShowInfoCellImage(panel) == true)
+                return (GetInfoImage() != null);
+                
+            return (false);
+        }
+
+        #endregion
+
+        #region UpdateCellInfoWindowPos
+
+        private void UpdateCellInfoWindowPos()
+        {
+            if (_cellInfoWindow != null)
+            {
+                if (_cellInfoWindow != null)
+                {
+                    Point pt = InfoImageBounds.Location;
+
+                    pt = SuperGrid.PointToScreen(pt);
+
+                    if (SuperGrid.ActiveEditor != null)
+                        pt = SuperGrid.ActiveEditor.EditorPanel.PointToClient(pt);
+
+                    else if (SuperGrid.ActiveNonModalEditor != null)
+                        pt = SuperGrid.ActiveNonModalEditor.EditorPanel.PointToClient(pt);
+
+                    _cellInfoWindow.Location = pt;
+                }
+            }
+        }
+
+        #endregion
+
+        #region OpenCellInfoWindow
+
+        private void OpenCellInfoWindow()
+        {
+            _cellInfoWindow = new CellInfoWindow(SuperGrid, this);
+            _cellInfoWindow.Parent = SuperGrid.ActiveEditor.EditorPanel;
+
+            SuperGrid.ActiveEditor.EditorPanel.Controls.Add(_cellInfoWindow);
+        }
+
+        #endregion
+
+        #region CloseCellInfoWindow
+
+        private void CloseCellInfoWindow()
+        {
+            if (_cellInfoWindow != null)
+            {
+                SuperGrid.ToolTipText = "";
+
+                _cellInfoWindow.Dispose();
+                _cellInfoWindow = null;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Style support
+
+        #region GetEffectiveStyle
+
+        ///<summary>
+        /// Gets the EffectiveStyle for the cell. The effective
+        /// style is the cached, composite style definition for the
+        /// given cell, composed from panel, row, column, and cell styles.
+        ///</summary>
+        ///<returns></returns>
+        public CellVisualStyle GetEffectiveStyle()
+        {
+            bool selected = IsSelected;
+
+            StyleState cellState = GetCellState(selected);
+            CellVisualStyle style = GetEffectiveStyle(cellState);
+
+            return (style);
+        }
+
+        ///<summary>
+        /// Gets the EffectiveStyle for the cell- for the given StyleType.
+        /// The effective style is the cached, composite style definition for the
+        /// given cell, composed from panel, row, column, and cell styles.
+        ///</summary>
+        ///<param name="type"></param>
+        ///<returns></returns>
+        public CellVisualStyle GetEffectiveStyle(StyleType type)
+        {
+            ValidateStyle();
+
+            return (GetStyle(type));
+        }
+
+        internal CellVisualStyle GetEffectiveStyle(bool selected)
+        {
+            StyleState cellState = GetCellState(selected);
+
+            return (GetEffectiveStyle(cellState));
+        }
+
+        private CellVisualStyle GetEffectiveStyle(StyleState cellState)
+        {
+            ValidateStyle();
+
+            if (IsDesignerHosted == true)
+                cellState &= ~(StyleState.MouseOver | StyleState.Selected);
+
+            CellRange cr = GetStateCellRange();
+
+            if (cr != null)
+                return (cr.GetEffectiveStyle(RowContainer, cellState));
+
+            if (IsEmptyCell == true &&
+                (GridPanel.AllowEmptyCellSelection == false || cellState == StyleState.Default))
+            {
+                return (GetStyle(StyleType.Empty));
+            }
+
+            if (IsSelectable == false)
+                return (GetStyle(StyleType.NotSelectable));
+
+            switch (cellState)
+            {
+                case StyleState.MouseOver:
+                    return (GetStyle(StyleType.MouseOver));
+
+                case StyleState.Selected:
+                    return (GetStyle(StyleType.Selected));
+
+                case StyleState.Selected | StyleState.MouseOver:
+                    return (GetStyle(StyleType.SelectedMouseOver));
+
+                case StyleState.ReadOnly:
+                    return (GetStyle(StyleType.ReadOnly));
+
+                case StyleState.ReadOnly | StyleState.MouseOver:
+                    return (GetStyle(StyleType.ReadOnlyMouseOver));
+
+                case StyleState.ReadOnly | StyleState.Selected:
+                    return (GetStyle(StyleType.ReadOnlySelected));
+
+                case StyleState.ReadOnly | StyleState.MouseOver | StyleState.Selected:
+                    return (GetStyle(StyleType.ReadOnlySelectedMouseOver));
+
+                default:
+                    return (GetStyle(StyleType.Default));
+            }
+        }
+
+        #endregion
+
+        #region GetCellState
+
+        private StyleState GetCellState(bool selected)
+        {
+            StyleState cellState = StyleState.Default;
+
+            if (IsReadOnly == true)
+                cellState |= StyleState.ReadOnly;
+
+            if (SuperGrid.EditorCell != null || SuperGrid.NonModalEditorCell != null)
+            {
+                if (SuperGrid.EditorCell == this || SuperGrid.NonModalEditorCell == this)
+                    cellState |= StyleState.MouseOver;
+            }
+            else
+            {
+                if (CapturedItem == null || CapturedItem is GridCell)
+                {
+                    Point pt = SuperGrid.PointToClient(Control.MousePosition);
+                    Rectangle r = Bounds;
+
+                    GridPanel panel = GridPanel;
+
+                    if (Merged == true)
+                    {
+                        CellRange cr = GetStateCellRange();
+
+                        if (cr != null)
+                            r = GetBounds(panel, cr.BackBounds);
+                    }
+
+                    Rectangle t = ViewRect;
+
+                    r.Intersect(t);
+
+                    if (r.Contains(pt) == true)
+                        cellState |= StyleState.MouseOver;
+                }
+            }
+
+            if (selected == true)
+                cellState |= StyleState.Selected;
+
+            return (cellState);
+        }
+
+        #endregion
+
+        #region GetStyle
+
+        private CellVisualStyle GetStyle(StyleType e)
+        {
+            CellVisualStyles cvs = _EffectiveStyles;
+
+            if (cvs == null)
+                cvs = new CellVisualStyles();
+
+            if (cvs.IsValid(e) == false)
+            {
+                CellVisualStyle style = new CellVisualStyle();
+
+                StyleType[] css = style.GetApplyStyleTypes(e);
+
+                if (css != null)
+                {
+                    foreach (StyleType cs in css)
+                    {
+                        GridColumn.ApplyCellStyle(style, cs);
+                        GridRow.ApplyCellStyle(style, cs);
+
+                        style.ApplyStyle(CellStyles[cs]);
+                    }
+                }
+
+                SuperGrid.DoGetCellStyleEvent(this, e, ref style);
+
+                if (style.Background == null || style.Background.IsEmpty == true)
+                    style.Background = new Background(Color.White);
+
+                if (style.Font == null)
+                    style.Font = SystemFonts.DefaultFont;
+
+                style.ApplyDefaults();
+
+                cvs[e] = style;
+
+                _EffectiveStyles = cvs;
+            }
+
+            return (cvs[e]);
+        }
+
+        #endregion
+
+        #region GetSizingStyle
+
+        private CellVisualStyle GetSizingStyle(GridPanel panel)
+        {
+            StyleType style = panel.GetSizingStyle();
+
+            if (style == StyleType.NotSet)
+            {
+                style = (IsReadOnly == true)
+                    ? StyleType.ReadOnly : StyleType.Default;
+            }
+
+            return (GetEffectiveStyle(style));
+        }
+
+        #endregion
+
+        #region StyleVisualChangeHandler
+
+        private void StyleVisualChangeHandler(
+            INotifyPropertyChanged oldValue, INotifyPropertyChanged newValue)
+        {
+            //NeedsMeasured = true;
+
+            if (oldValue != null)
+                oldValue.PropertyChanged -= StyleChanged;
+
+            if (newValue != null)
+                newValue.PropertyChanged += StyleChanged;
+        }
+
+        #endregion
+
+        #region StyleChanged
+
+        /// <summary>
+        /// Occurs when one of element visual styles has property changes.
+        /// Default implementation invalidates visual appearance of element.
+        /// </summary>
+        /// <param name="sender">VisualStyle that changed.</param>
+        /// <param name="e">Event arguments.</param>
+        protected virtual void StyleChanged(object sender, PropertyChangedEventArgs e)
+        {
+            ClearEffectiveStyles();
+
+            VisualChangeType changeType = ((VisualPropertyChangedEventArgs)e).ChangeType;
+
+            if (changeType == VisualChangeType.Layout)
+            {
+                NeedsMeasured = true;
+
+                if (GridColumn != null)
+                    GridColumn.NeedsMeasured = true;
+
+                InvalidateLayout();
+            }
+            else
+            {
+                InvalidateRender();
+            }
+        }
+
+        #endregion
+
+        #region ValidateStyle
+
+        private void ValidateStyle()
+        {
+            if (_StyleUpdateCount != SuperGrid.StyleUpdateCount)
+            {
+                ClearEffectiveStyles();
+
+                _StyleUpdateCount = SuperGrid.StyleUpdateCount;
+            }
+        }
+
+        #endregion
+
+        #region InvalidateStyle
+
+        ///<summary>
+        ///Invalidates the cached Style
+        ///definition for all defined StyleTypes
+        ///</summary>
+        public void InvalidateStyle()
+        {
+            ClearEffectiveStyles();
+
+            InvalidateLayout();
+        }
+
+        ///<summary>
+        ///Invalidate the cached Style
+        ///definition for the given StyleType
+        ///</summary>
+        ///<param name="type"></param>
+        public void InvalidateStyle(StyleType type)
+        {
+            if (_EffectiveStyles != null)
+            {
+                if (_EffectiveStyles[type] != null)
+                {
+                    _EffectiveStyles[type].Dispose();
+                    _EffectiveStyles[type] = null;
+
+                    InvalidateLayout();
+                }
+            }
+        }
+
+        #endregion
+
+        #region ClearEffectiveStyles
+
+        internal void ClearEffectiveStyles()
+        {
+            if (_EffectiveStyles != null)
+            {
+                _EffectiveStyles.Dispose();
+                _EffectiveStyles = null;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InvalidateRender
+
+        /// <summary>
+        /// InvalidateRender
+        /// </summary>
+        public override void InvalidateRender()
+        {
+            if (SuperGrid != null && GridColumn != null)
+            {
+                if (Merged == true)
+                {
+                    CellRange cr = GetStateCellRange();
+
+                    if (cr != null)
+                        InvalidateRender(cr.BackBounds);
+                }
+                else
+                {
+                    base.InvalidateRender(BackBounds);
+                }
+            }
+        }
+
+        #endregion
+
+        #region IComparable<GridCell> Members
+
+        /// <summary>
+        /// CompareTo
+        /// </summary>
+        /// <param name="other"></param>
+        /// <returns></returns>
+        public int CompareTo(GridCell other)
+        {
+            int sval = 0;
+            if (SuperGrid.DoCompareElementsEvent(GridPanel, this, other, ref sval) == true)
+                return (sval);
+
+            if (GridPanel.SortUsingHiddenColumns == false)
+            {
+                if (Visible == false)
+                    return (other.Visible == false ? 0 : -1);
+
+                if (other.Visible == false)
+                    return (1);
+            }
+
+            object val1 = IsValueExpression ? ExpValue : Value;
+            object val2 = other.IsValueExpression ? other.ExpValue : other.Value;
+
+            return (CompareVal.CompareTo(val1, val2));
+        }
+
+        #endregion
+
+        #region ToString
+
+        /// <summary>
+        /// ToString
+        /// </summary>
+        /// <returns></returns>
+        public override string ToString()
+        {
+            string s = "GridCell " + ColumnIndex +
+                ": {" + (Value ?? "<null>") + "}";
+
+            return (s);
+        }
+
+        #endregion
+
+        #region Dispose
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        public void Dispose()
+        {
+            MouseRenderer = null;
+
+            EditControl = null;
+            RenderControl = null;
+
+            CellStyles = null;
+
+            ClearEffectiveStyles();
+
+            if (SuperGrid != null)
+            {
+                if (SuperGrid.ActiveElement == this)
+                    SuperGrid.ActiveElement = null;
+            }
+        }
+
+        #endregion
+
+        #region EditorInfo
+
+        private class EditorInfo
+        {
+            #region Public variables
+
+            public Type EditorType;
+            public Type RenderType;
+
+            public IGridCellEditControl EditControl;
+            public IGridCellEditControl RenderControl;
+
+            public object[] EditorParams;
+            public object[] RenderParams;
+
+            #endregion
+
+            #region Public properties
+
+            public bool IsEmpty
+            {
+                get
+                {
+                    return (EditorType == null && RenderType == null &&
+                            (EditorParams == null && RenderParams == null));
+                }
+            }
+
+            #endregion
+        }
+
+        #endregion
+
+        #region CellStates
+
+        [Flags]
+        private enum Cs
+        {
+            AllowEdit = (1 << 0),
+            DataError = (1 << 1),
+            EmptyCell = (1 << 2),
+            ReadOnly = (1 << 3),
+            Selected = (1 << 4),
+            AnySelected = (1 << 5),
+            ValueExpression = (1 << 6),
+
+            MergedTop = (1 << 7),
+            MergedLeft = (1 << 8),
+            MergedBottom = (1 << 9),
+            MergedRight = (1 << 10),
+            Merged = (1 << 11),
+
+            Modified = (1 << 12),
+        }
+
+        #endregion
+    }
+
+    #region CompareVal
+
+    internal class CompareVal
+    {
+        public static int CompareTo(object val1, object val2)
+        {
+            if (val1 != null && val1 != DBNull.Value)
+            {
+                if (val2 != null && val2 != DBNull.Value)
+                {
+                    if (val1.GetType() == val2.GetType())
+                    {
+                        IComparable icompa = val1 as IComparable;
+
+                        if (icompa != null)
+                            return (icompa.CompareTo(val2));
+                    }
+
+                    return (-1);
+                }
+
+                return (1);
+            }
+
+            if (val2 != null && val2 != DBNull.Value)
+                return (-1);
+
+            return (0);
+        }
+    }
+
+    #endregion
+
+    #region enums
+
+    #region CellArea
+
+    ///<summary>
+    /// CellArea
+    ///</summary>
+    public enum CellArea
+    {
+        ///<summary>
+        /// NoWhere
+        ///</summary>
+        NoWhere,
+
+        ///<summary>
+        /// InContent
+        ///</summary>
+        InContent,
+
+        ///<summary>
+        /// InExpandButton
+        ///</summary>
+        InExpandButton,
+
+        ///<summary>
+        /// InCheckBox
+        ///</summary>
+        InCheckBox,
+
+        ///<summary>
+        /// InCellInfo
+        ///</summary>
+        InCellInfo,
+    }
+
+    #endregion
+
+    #region CellMergeMode
+
+    ///<summary>
+    /// Specifies the type of merging that is permitted
+    /// for cells in the given row or column
+    ///</summary>
+    [Flags]
+    public enum CellMergeMode
+    {
+        ///<summary>
+        /// Not set
+        ///</summary>
+        NotSet = (0 << 0),
+
+        ///<summary>
+        /// No merging
+        ///</summary>
+        None = (1 << 0),
+
+        ///<summary>
+        /// Cells can merge horizontally Left
+        ///</summary>
+        HorizontalLeft = (1 << 1),
+
+        ///<summary>
+        /// Cells can merge horizontally Right
+        ///</summary>
+        HorizontalRight = (1 << 2),
+
+        ///<summary>
+        /// Cells can merge horizontally (both left and right)
+        ///</summary>
+        Horizontal = (HorizontalLeft | HorizontalRight),
+
+        ///<summary>
+        /// Cells can merge vertically
+        ///</summary>
+        Vertical = (1 << 3),
+
+        ///<summary>
+        /// Cells can merge both horizontally and vertically
+        ///</summary>
+        HorizontalAndVertical = (Horizontal | Vertical),
+    }
+
+    ///<summary>
+    /// Specifies the type of merging that is permitted
+    /// for cells in the given row or column
+    ///</summary>
+    public enum CellMergeOrder
+    {
+        ///<summary>
+        /// Cells can merge horizontally, then vertically
+        ///</summary>
+        HorizontalThenVertical,
+
+        ///<summary>
+        /// Cells can merge vertically, then horizontally (this is the default
+        /// if CellMergeMode enables both vertical and horizontal merging)
+        ///</summary>
+        VerticalThenHorizontal,
+    }
+
+    #endregion
+
+    #region CellSizingSource
+
+    /// <summary>
+    /// Specifies the cell value source for the cell
+    /// sizing operation (either the actual value, formatted value,
+    /// or both)
+    /// </summary>
+    public enum CellSizingSource
+    {
+        ActualValue = (1 << 0),      // The actual, unformatted cell value
+        FormattedValue = (1 << 1),   // The formatted cell value
+
+        ActualAndFormattedValues = (ActualValue | FormattedValue),  // The actual and formatted cell values
+                                                                    // (the maximum width/height of the two is used).
+    }
+
+    #endregion
+
+    #endregion
+
+    #region ValueTypeConverter
+
+    ///<summary>
+    /// ValueTypeConverter
+    ///</summary>
+    public class ValueTypeConverter : TypeConverter
+    {
+        #region CanConvertTo
+
+        /// <summary>
+        /// CanConvertTo
+        /// </summary>
+        /// <param name="context"></param>
+        /// <param name="destinationType"></param>
+        /// <returns></returns>
+        public override bool CanConvertTo(
+            ITypeDescriptorContext context, Type destinationType)
+        {
+            if (destinationType == typeof(string))
+                return (true);
+
+            return (base.CanConvertTo(context, destinationType));
+        }
+
+        #endregion
+
+        #region ConvertTo
+
+        /// <summary>
+        /// ConvertTo
+        /// </summary>
+        /// <param name="context"></param>
+        /// <param name="culture"></param>
+        /// <param name="value"></param>
+        /// <param name="destinationType"></param>
+        /// <returns></returns>
+        public override object ConvertTo(
+            ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+        {
+            if (destinationType == typeof(string))
+            {
+                string s = value as string;
+
+                if (s != null)
+                    return (s);
+            }
+
+            return (base.ConvertTo(context, culture, value, destinationType));
+        }
+
+        #endregion
+
+        #region CanConvertFrom
+
+        /// <summary>
+        /// CanConvertFrom
+        /// </summary>
+        /// <param name="context"></param>
+        /// <param name="sourceType"></param>
+        /// <returns></returns>
+        public override bool CanConvertFrom(
+            ITypeDescriptorContext context, Type sourceType)
+        {
+            if (sourceType == typeof(string))
+                return (true);
+
+            return (base.CanConvertFrom(context, sourceType));
+        }
+
+        #endregion
+
+        #region ConvertFrom
+
+        /// <summary>
+        /// ConvertFrom
+        /// </summary>
+        /// <param name="context"></param>
+        /// <param name="culture"></param>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public override object ConvertFrom(
+            ITypeDescriptorContext context, CultureInfo culture, object value)
+        {
+            if (value is string)
+            {
+                GridCell cell = context.Instance as GridCell;
+
+                if (cell != null)
+                {
+                    Type type = GetEditType(cell);
+
+                    if (type == typeof (GridDoubleInputEditControl))
+                        return (ConvertFromToDouble((string)value));
+
+                    if (type == typeof (GridIntegerInputEditControl) ||
+                        type == typeof (GridProgressBarXEditControl) ||
+                        type == typeof (GridSliderEditControl) ||
+                        type == typeof (GridTrackBarEditControl))
+                    {
+                        return (ConvertFromToInteger((string) value));
+                    }
+
+                    if (type == typeof (GridNumericUpDownEditControl))
+                        return (ConvertFromToDecimal((string)value));
+
+                    if (type == typeof (GridCheckBoxXEditControl) ||
+                        type == typeof (GridCheckBoxEditControl) ||
+                        type == typeof(GridSwitchButtonEditControl))
+                    {
+                        return (ConvertFromToBool((string) value));
+                    }
+                }
+
+                return (value);
+            }
+
+            return base.ConvertFrom(context, culture, value);
+        }
+
+        #region ConvertFromToDouble
+
+        private double ConvertFromToDouble(string value)
+        {
+            try
+            {
+                return (double.Parse(value));
+            }
+            catch (Exception)
+            {
+                throw new ArgumentException("Invalid value to convert to 'double'.");
+            }
+        }
+
+        #endregion
+
+        #region ConvertFromToInteger
+
+        private int ConvertFromToInteger(string value)
+        {
+            try
+            {
+                return (int.Parse(value));
+            }
+            catch (Exception)
+            {
+                throw new ArgumentException("Invalid value to convert to 'int'.");
+            }
+        }
+
+        #endregion
+
+        #region ConvertFromToDecimal
+
+        private decimal ConvertFromToDecimal(string value)
+        {
+            try
+            {
+                return (decimal.Parse(value));
+            }
+            catch (Exception)
+            {
+                throw new ArgumentException("Invalid value to convert to 'decimal'.");
+            }
+        }
+
+        #endregion
+
+        #region ConvertFromToBool
+
+        private bool ConvertFromToBool(string value)
+        {
+            switch (value.ToLower())
+            {
+                case "y":
+                case "yes":
+                case "t":
+                case "true":
+                case "1":
+                    return (true);
+
+                case "":
+                case "0":
+                case "n":
+                case "no":
+                case "f":
+                case "false":
+                case null:
+                    return (false);
+
+                default:
+                    throw new ArgumentException("Invalid value to convert to 'bool'.");
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetEditType
+
+        private Type GetEditType(GridCell cell)
+        {
+            if (cell.EditorType != null)
+                return (cell.EditorType);
+
+            if (cell.GridColumn != null)
+                return (cell.GridColumn.EditorType);
+
+            return (null);
+        }
+
+        #endregion
+    }
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridCellCollection.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridCellCollection.cs
new file mode 100644
index 00000000..ff5aad4c
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridCellCollection.cs	
@@ -0,0 +1,82 @@
+using System;
+using System.ComponentModel;
+using System.Drawing.Design;
+using DevComponents.DotNetBar.SuperGrid.Primitives;
+
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    /// <summary>
+    /// Represents the collection of grid cells.
+    /// </summary>
+    [Editor("DevComponents.SuperGrid.Design.GridCellCollectionEditor, DevComponents.SuperGrid.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=26d81176cfa2b486", typeof(UITypeEditor))]
+    public class GridCellCollection : CustomCollection<GridCell>
+    {
+        #region Indexer (string)
+
+        /// <summary>
+        /// Gets or sets item at ColumnName index
+        /// </summary>
+        /// <param name="columnName">Name of Column containing the cell</param>
+        public GridCell this[string columnName]
+        {
+            get
+            {
+                GridCell cell = FindCellItem(columnName);
+
+                if (cell != null)
+                    return (Items[cell.ColumnIndex]);
+
+                return (null);
+            }
+
+            set
+            {
+                GridCell cell = FindCellItem(columnName);
+
+                if (cell == null)
+                    throw new Exception("Column \"" + columnName + "\" not found.");
+
+                Items[cell.ColumnIndex] = value;
+            }
+        }
+
+        #endregion
+
+        #region Indexer (Column)
+
+        /// <summary>
+        /// Gets or sets item at Column index
+        /// </summary>
+        /// <param name="column">Column containing the cell</param>
+        public GridCell this[GridColumn column]
+        {
+            get { return (Items[column.ColumnIndex]); }
+            set { Items[column.ColumnIndex] = value; }
+        }
+
+        #endregion
+
+        #region FindCellItem
+
+        private GridCell FindCellItem(string columnName)
+        {
+            if (string.IsNullOrEmpty(columnName) == true)
+                throw new Exception("Invalid Column Name.");
+
+            foreach (GridCell cell in Items)
+            {
+                GridColumn col = cell.GridColumn;
+
+                if (col == null)
+                    break;
+
+                if (columnName.Equals(col.Name) == true)
+                    return (cell);
+            }
+
+            return (null);
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridColumn.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridColumn.cs
new file mode 100644
index 00000000..ff79d9ad
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridColumn.cs	
@@ -0,0 +1,3910 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Drawing.Drawing2D;
+using System.Globalization;
+using System.IO;
+using System.Reflection;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.SuperGrid.Style;
+using DevComponents.SuperGrid.TextMarkup;
+
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    /// <summary>
+    /// Defines the grid column header
+    /// </summary>
+    public class GridColumn : GridElement, IDisposable
+    {
+        #region Events
+
+        /// <summary>
+        /// Occurs after column header DisplayIndex has changed.
+        /// </summary>
+        public event EventHandler DisplayIndexChanged;
+
+        #endregion
+
+        #region Static variables
+
+        static Image _InfoImageCache;
+
+        #endregion
+
+        #region Private variables
+
+        private ColumnAutoSizeMode _AutoSizeMode = ColumnAutoSizeMode.NotSet;
+        private ColumnSortMode _ColumnSortMode = ColumnSortMode.Single;
+        private ColumnResizeMode _ResizeMode = ColumnResizeMode.MoveFollowingElements;
+
+        private CellHighlightMode _CellHighlightMode = CellHighlightMode.Full;
+        private CellMergeMode _CellMergeMode = CellMergeMode.NotSet;
+
+        private SortDirection _SortDirection = SortDirection.None;
+        private SortDirection _GroupDirection = SortDirection.None;
+        private SortIndicator _SortIndicator = SortIndicator.Auto;
+        private SortCycle _SortCycle = SortCycle.NotSet;
+
+        private int _ColumnIndex;
+        private int _DisplayIndex = -1;
+
+        private int _MinimumWidth = 5;
+        private int _FillWeight = 100;
+
+        private string _NullString;
+        private string _HeaderText;
+
+        private Size _HeaderSize;
+        private Size _HeaderTextSize;
+
+        private Cs _States;
+
+        private BodyElement _HeaderTextMarkup;
+
+        private string _Name;
+        private int _Width = 100;
+
+        private ushort _SelectionUpdateCount;
+        private SelectedElements _SelectedCells;
+
+        private Type _EditorType = typeof(GridTextBoxXEditControl);
+        private Type _RenderType;
+
+        private IGridCellEditControl _EditControl;
+        private IGridCellEditControl _RenderControl;
+
+        private object[] _EditorParams;
+        private object[] _RenderParams;
+
+        private ushort _MeasureCount;
+
+        private Image _InfoImage;
+        private Alignment _InfoImageAlignment = Alignment.MiddleRight;
+
+        private string _DataPropertyName;
+        private object _DefaultNewRowCellValue;
+        private Type _DataType;
+
+        private CellVisualStyles _CellStyles;
+        private ColumnHeaderVisualStyles _HeaderStyles;
+        private FilterColumnHeaderVisualStyles _FilterRowStyles;
+
+        private ColumnHeaderVisualStyles _EffectiveStyles;
+        private FilterColumnHeaderVisualStyles _EffectiveFilterStyles;
+        private CellVisualStyles _EffectiveCellStyles;
+
+        private StyleState _LastStyleState;
+        private int _StyleUpdateCount;
+
+        private Rectangle _SortImageBounds;
+
+        private string _FilterExpr;
+        private FilterEval _FilterEval;
+
+        private object _FilterValue;
+        private object _FilterDisplayValue;
+
+        private Tbool _EnableFiltering = Tbool.NotSet;
+        private Tbool _ShowPanelFilterExpr = Tbool.NotSet;
+        private Tbool _AllowNullCellMerge = Tbool.NotSet;
+
+        private Rectangle _FilterImageBounds;
+        private Size _FilterPopupSize = Size.Empty;
+        private int _FilterPopupMaxItems = 100;
+        private FilterScan _FilterScan;
+
+        private FilterEditType _FilterEditType = FilterEditType.Auto;
+        private FilterMatchType _FilterMatchType = FilterMatchType.NotSet;
+        private GroupBoxEffects _GroupBoxEffects = GroupBoxEffects.NotSet;
+
+        private string _ToolTip;
+
+        #endregion
+
+        #region Constructors
+
+        ///<summary>
+        /// GridColumn
+        ///</summary>
+        public GridColumn()
+        {
+            SetState(Cs.AllowEdit, true);
+            SetState(Cs.InfoImageOverlay, true);
+            SetState(Cs.MarkRowDirtyOnCellValueChange, true);
+
+            _SelectedCells = new SelectedElements(SelectedElementType.SelectedCells);
+        }
+
+        ///<summary>
+        /// GridColumn
+        ///</summary>
+        public GridColumn(string name)
+            : this()
+        {
+            Name = name;
+        }
+
+        #endregion
+
+        #region Internal properties
+
+        #region CanResize
+
+        internal bool CanResize
+        {
+            get
+            {
+                ColumnAutoSizeMode mode = GetAutoSizeMode();
+
+                switch (mode)
+                {
+                    case ColumnAutoSizeMode.None:
+                    case ColumnAutoSizeMode.Fill:
+                        return (true);
+
+                    default:
+                        return (false);
+                }
+            }
+        }
+
+        #endregion
+
+        #region CanShowFilterExpr
+
+        internal bool CanShowFilterExpr
+        {
+            get
+            {
+                if (_ShowPanelFilterExpr != Tbool.NotSet)
+                    return (_ShowPanelFilterExpr == Tbool.True);
+
+                if (GridPanel != null)
+                    return (GridPanel.Filter.ShowPanelFilterExpr);
+
+                return (false);
+            }
+        }
+
+        #endregion
+
+        #region EffectiveCellStyles
+
+        internal CellVisualStyles EffectiveCellStyles
+        {
+            get { return (_EffectiveCellStyles); }
+            set { _EffectiveCellStyles = value; }
+        }
+
+        #endregion
+
+        #region EffectiveFilterStyles
+
+        internal FilterColumnHeaderVisualStyles EffectiveFilterStyles
+        {
+            get { return (_EffectiveFilterStyles); }
+            set { _EffectiveFilterStyles = value; }
+        }
+
+        #endregion
+
+        #region EffectiveStyles
+
+        internal ColumnHeaderVisualStyles EffectiveStyles
+        {
+            get { return (_EffectiveStyles); }
+            set { _EffectiveStyles = value; }
+        }
+
+        #endregion
+
+        #region FilterError
+
+        internal bool FilterError
+        {
+            get { return (TestState(Cs.FilterError)); }
+            set { SetState(Cs.FilterError, value); }
+        }
+
+        #endregion
+
+        #region FilterExprUsesName
+
+        internal bool FilterExprUsesName
+        {
+            get { return (TestState(Cs.FilterExprUsesName)); }
+            set { SetState(Cs.FilterExprUsesName, value); }
+        }
+
+        #endregion
+
+        #region FilterEval
+
+        internal FilterEval FilterEval
+        {
+            get { return (_FilterEval); }
+            set { _FilterEval = value; }
+        }
+
+        #endregion
+
+        #region FilterImageBounds
+
+        internal Rectangle FilterImageBounds
+        {
+            get { return (_FilterImageBounds); }
+            set { _FilterImageBounds = value; }
+        }
+
+        #endregion
+
+        #region FilterScan
+
+        internal FilterScan FilterScan
+        {
+            get
+            {
+                if (_FilterScan == null)
+                    FilterScan = new FilterScan(this);
+
+                return (_FilterScan);
+            }
+
+            set
+            {
+                if (_FilterScan != value)
+                {
+                    if (_FilterScan != null)
+                        _FilterScan.EndScan();
+
+                    _FilterScan = value;
+                }
+            }
+        }
+
+        #endregion
+
+        #region GroupBoxEffectsEx
+
+        internal GroupBoxEffects GroupBoxEffectsEx
+        {
+            get
+            {
+                if (_GroupBoxEffects != GroupBoxEffects.NotSet)
+                    return (_GroupBoxEffects);
+                
+                GridPanel panel = GridPanel;
+
+                if (panel != null && panel.GroupByRow != null)
+                {
+                    if (panel.GroupByRow.GroupBoxEffects != GroupBoxEffects.NotSet)
+                        return (panel.GroupByRow.GroupBoxEffects);
+                }
+
+                return (GroupBoxEffects.Move);
+            }
+        }
+
+        #endregion
+
+        #region HeaderSize
+
+        internal Size HeaderSize
+        {
+            get { return (_HeaderSize); }
+            set { _HeaderSize = value; }
+        }
+
+        #endregion
+
+        #region HeaderTextMarkup
+
+        internal BodyElement HeaderTextMarkup
+        {
+            get { return (_HeaderTextMarkup); }
+        }
+
+        #endregion
+
+        #region HeaderTextSize
+
+        internal Size HeaderTextSize
+        {
+            get { return (_HeaderTextSize); }
+            set { _HeaderTextSize = value; }
+        }
+
+        #endregion
+
+        #region IsFiltered
+
+        internal bool IsFiltered
+        {
+            get { return (IsFilteringEnabled == true &&
+                String.IsNullOrEmpty(FilterExpr) == false); }
+        }
+
+        #endregion
+
+        #region IsHFrozenEx
+
+        internal bool IsHFrozenEx
+        {
+            get
+            {
+                GridPanel panel = Parent as GridPanel;
+
+                if (panel != null && panel.IsSubPanel == false)
+                {
+                    if (panel.FrozenColumnCount > 0)
+                    {
+                        int n = panel.Columns.GetDisplayIndex(this);
+
+                        if (n < panel.FrozenColumnCount)
+                            return (true);
+                    }
+                }
+
+                return (false);
+            }
+        }
+
+        #endregion
+
+        #region IsReadOnly
+
+        internal bool IsReadOnly
+        {
+            get
+            {
+                GridPanel panel = GridPanel;
+
+                if (panel != null)
+                {
+                    if (panel.ReadOnly || ReadOnly)
+                        return (true);
+                }
+
+                return (TestState(Cs.ReadOnly));
+            }
+        }
+
+        #endregion
+
+        #region LastStyleState
+
+        internal StyleState LastStyleState
+        {
+            get { return (_LastStyleState); }
+            set { _LastStyleState = value; }
+        }
+
+        #endregion
+
+        #region MeasureCount
+
+        internal ushort MeasureCount
+        {
+            get { return (_MeasureCount); }
+        }
+
+        #endregion
+
+        #region NeedsFilterScan
+
+        internal bool NeedsFilterScan
+        {
+            get { return (TestState(Cs.NeedsFilterScan)); }
+            set { SetState(Cs.NeedsFilterScan, value); }
+        }
+
+        #endregion
+
+        #region NeedsMeasured
+
+        internal override bool NeedsMeasured
+        {
+            get { return (base.NeedsMeasured); }
+
+            set
+            {
+                if (value == true)
+                    _MeasureCount++;
+
+                base.NeedsMeasured = value;
+            }
+        }
+
+        #endregion
+
+        #region NeedsResized
+
+        internal bool NeedsResized
+        {
+            get { return (TestState(Cs.NeedsResized)); }
+            set { SetState(Cs.NeedsResized, value); }
+        }
+
+        #endregion
+
+        #region Processed
+
+        internal bool Processed
+        {
+            get { return (TestState(Cs.Processed)); }
+            set { SetState(Cs.Processed, value); }
+        }
+
+        #endregion
+
+        #region ScanItems
+
+        internal List<object> ScanItems
+        {
+            get
+            {
+                if (_FilterScan != null)
+                    return (_FilterScan.ScanItems);
+
+                return (null);
+            }
+        }
+
+        #endregion
+
+        #region SelectedCells
+
+        internal SelectedElements SelectedCells
+        {
+            get { return (_SelectedCells); }
+            set { _SelectedCells = value; }
+        }
+
+        #endregion
+
+        #region SortImageBounds
+
+        internal Rectangle SortImageBounds
+        {
+            get { return (_SortImageBounds); }
+            set { _SortImageBounds = value; }
+        }
+
+        #endregion
+
+        #region StyleUpdateCount
+
+        internal int StyleUpdateCount
+        {
+            get { return (_StyleUpdateCount); }
+            set { _StyleUpdateCount = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Public properties
+
+        #region AdjustSortImagePositionByMargin
+
+        ///<summary>
+        /// Gets or sets whether the Column Header sort image
+        /// position is adjusted by the header margin
+        ///</summary>
+        [DefaultValue(false), Category("Appearance")]
+        [Description("Indicates whether the Column Header sort image position is adjusted by the header margin.")]
+        public bool AdjustSortImagePositionByMargin
+        {
+            get { return (TestState(Cs.AdjustSortImagePositionByMargin)); }
+
+            set
+            {
+                if (AdjustSortImagePositionByMargin != value)
+                {
+                    SetState(Cs.AdjustSortImagePositionByMargin, value);
+
+                    OnPropertyChangedEx("AdjustSortImagePositionByMargin", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region AllowEdit
+
+        /// <summary>
+        /// Gets or sets whether column cells can be edited by the user. 
+        /// </summary>
+        [DefaultValue(true), Category("Behavior")]
+        [Description("Indicates whether column cells can be edited by the user.")]
+        public bool AllowEdit
+        {
+            get { return (TestState(Cs.AllowEdit)); }
+
+            set
+            {
+                if (value != AllowEdit)
+                {
+                    SetState(Cs.AllowEdit, value);
+
+                    OnPropertyChanged("AllowEdit");
+                }
+            }
+        }
+
+        #endregion
+
+        #region AllowNullCellMerge
+
+        /// <summary>
+        /// Gets or sets whether cells with null/empty values are allowed to be merged. 
+        /// </summary>
+        [DefaultValue(Tbool.NotSet), Category("Behavior")]
+        [Description("Indicates whether cells with null/empty values are allowed to be merged.")]
+        public Tbool AllowNullCellMerge
+        {
+            get { return (_AllowNullCellMerge); }
+
+            set
+            {
+                if (value != _AllowNullCellMerge)
+                {
+                    _AllowNullCellMerge = value;
+
+                    OnPropertyChangedEx("AllowNullCellMerge", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region AutoSizeMode
+
+        /// <summary>
+        /// Gets or sets how column auto-sizing is performed
+        /// </summary>
+        [DefaultValue(ColumnAutoSizeMode.NotSet), Category("Sizing")]
+        [Description("Indicates how column auto-sizing is performed.")]
+        public ColumnAutoSizeMode AutoSizeMode
+        {
+            get { return (_AutoSizeMode); }
+
+            set
+            {
+                if (value != _AutoSizeMode)
+                {
+                    _AutoSizeMode = value;
+
+                    NeedsMeasured = true;
+
+                    OnPropertyChangedEx("AutoSizeMode", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region Bounds
+
+        ///<summary>
+        /// Gets the scroll adjusted bounds of the Column
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override Rectangle Bounds
+        {
+            get
+            {
+                GridPanel panel = GridPanel;
+
+                if (panel != null)
+                {
+                    Rectangle r = BoundsRelative;
+
+                    if (IsHFrozen == false)
+                        r.X -= HScrollOffset;
+
+                    if (panel.IsSubPanel == true)
+                        r.Y -= VScrollOffset;
+
+                    return (r);
+                }
+
+                return (Rectangle.Empty);
+            }
+        }
+
+        #endregion
+
+        #region CellHighlightMode
+
+        /// <summary>
+        /// Gets or sets the type of highlighting
+        /// to perform when a cell is selected
+        /// </summary>
+        [DefaultValue(CellHighlightMode.Full), Category("Behavior")]
+        [Description("Indicates the type of highlighting to perform when a cell is selected.")]
+        public CellHighlightMode CellHighlightMode
+        {
+            get { return (_CellHighlightMode); }
+
+            set
+            {
+                if (value != _CellHighlightMode)
+                {
+                    _CellHighlightMode = value;
+
+                    OnPropertyChanged("CellHighlightType");
+                }
+            }
+        }
+
+        #endregion
+
+        #region CellMergeMode
+
+        /// <summary>
+        /// Gets or sets the type of cell merging
+        /// that is supported by each cell in the column
+        /// </summary>
+        [DefaultValue(CellMergeMode.NotSet), Category("Behavior")]
+        [Description("Indicates the type of cell merging supported by each cell in the column.")]
+        public CellMergeMode CellMergeMode
+        {
+            get { return (_CellMergeMode); }
+
+            set
+            {
+                if (value != _CellMergeMode)
+                {
+                    _CellMergeMode = value;
+
+                    GridPanel panel = GridPanel;
+
+                    if (panel != null)
+                        panel.InvalidateMerge();
+
+                    OnPropertyChangedEx("CellMergeMode", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region CellStyles
+
+        /// <summary>
+        /// Gets or sets the default visual styles assigned to the column cells
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates default visual style assigned to the column cells.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public CellVisualStyles CellStyles
+        {
+            get
+            {
+                if (_CellStyles == null)
+                {
+                    _CellStyles = new CellVisualStyles();
+
+                    StyleVisualChangeHandler(null, _CellStyles);
+                }
+
+                return (_CellStyles);
+            }
+
+            set
+            {
+                if (_CellStyles != value)
+                {
+                    StyleVisualChangeHandler(_CellStyles, value);
+
+                    _CellStyles = value;
+
+                    OnPropertyChangedEx("CellStyles", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ColumnIndex
+
+        /// <summary>
+        /// Gets the panel level, Columns collection index of the column
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public int ColumnIndex
+        {
+            get { return (_ColumnIndex); }
+            internal set { _ColumnIndex = value; }
+        }
+
+        #endregion
+
+        #region ColumnSortMode
+
+        /// <summary>
+        /// Gets or sets how column sorting is performed
+        /// </summary>
+        [DefaultValue(ColumnSortMode.Single), Category("Sorting")]
+        [Description("Indicates how column sorting is performed.")]
+        public ColumnSortMode ColumnSortMode
+        {
+            get { return (_ColumnSortMode); }
+
+            set
+            {
+                if (value != _ColumnSortMode)
+                {
+                    _ColumnSortMode = value;
+
+                    OnPropertyChanged("ColumnSortMode");
+                }
+            }
+        }
+
+        #endregion
+
+        #region DataPropertyName
+
+        ///<summary>
+        /// Gets or sets the name of the data source property
+        /// or database column to which the column is bound
+        ///</summary>
+        [DefaultValue(null), Category("Data")]
+        [Description("Indicates the name of the data source property or database column to which the column is bound.")]
+        public string DataPropertyName
+        {
+            get { return (_DataPropertyName); }
+
+            set
+            {
+                if (value != _DataPropertyName)
+                {
+                    _DataPropertyName = value;
+
+                    if (GridPanel != null)
+                        GridPanel.NeedToUpdateBindings = true;
+
+                    OnPropertyChangedEx("DataPropertyName", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region DataType
+
+        ///<summary>
+        ///Gets or sets the underlying data type
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public Type DataType
+        {
+            get { return (_DataType); }
+            set { _DataType = value; }
+        }
+
+        #endregion
+
+        #region DefaultNewRowCellValue
+
+        /// <summary>
+        /// Gets or sets the default cell value used when a new row is added
+        /// </summary>
+        [DefaultValue(null), Category("Data")]
+        [Description("Indicates the default cell value used when a new row is added.")]
+        [TypeConverter(typeof(ValueTypeConverter))]
+        [Editor("DevComponents.SuperGrid.Design.ValueTypeEditor, DevComponents.SuperGrid.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=26d81176cfa2b486", typeof(UITypeEditor))]
+        public object DefaultNewRowCellValue
+        {
+            get 
+            {
+                if (_DefaultNewRowCellValue is DBNull)
+                    return null;
+
+                return (_DefaultNewRowCellValue); 
+            }
+
+            set
+            {
+                if (value != _DefaultNewRowCellValue)
+                {
+                    _DefaultNewRowCellValue = value;
+
+                    OnPropertyChanged("DefaultNewRowCellValue");
+                }
+            }
+        }
+
+        #endregion
+
+        #region DisplayIndex
+
+        /// <summary>
+        /// Gets or sets display index of the column.
+        /// </summary>
+        /// <remarks>
+        /// A lower display index means a column will appear first (to the left) of columns with a higher display index. 
+        /// Allowable values are from 0 to num columns - 1. (-1 is legal only as the default value). SuperGrid enforces
+        /// that no two columns have the same display index, ie. changing the display index of a column will cause the index
+        /// of other columns to adjust as well.
+        /// </remarks>
+        [DefaultValue(-1), Category("Appearance")]
+        [Description("Indicates the display index of the column. -1 indicates default value.")]
+        public int DisplayIndex
+        {
+            get { return (_DisplayIndex); }
+
+            set
+            {
+                if (value != _DisplayIndex)
+                {
+                    _DisplayIndex = value;
+
+                    OnPropertyChangedEx("DisplayIndex", VisualChangeType.Layout);
+                    OnDisplayIndexChanged(EventArgs.Empty);
+                }
+            }
+        }
+
+        #endregion
+
+        #region EditControl
+
+        ///<summary>
+        /// Gets the default Edit Control used for each cell in the column.
+        /// The column level edit control is a shared control, created and
+        /// based upon the column level EditorType and EditorParams properties.
+        /// Each cell in the column, that does not define its own EditorType,
+        /// will utilize the column level EditorControl.
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public IGridCellEditControl EditControl
+        {
+            get
+            {
+                if (_EditControl == null)
+                    EditControl = GetEditControl(_EditorType, _EditorParams);
+
+                if (_EditControl != null)
+                {
+                    if (_EditControl.EditorPanel.Parent == null && SuperGrid != null)
+                        SuperGrid.Controls.Add(_EditControl.EditorPanel);
+                }
+
+                return (_EditControl);
+            }
+
+            internal set
+            {
+                if (_EditControl != value)
+                {
+                    if (_EditControl != null)
+                    {
+                        if (_EditControl.EditorPanel != null)
+                        {
+                            if (_EditControl.EditorPanel.Parent != null)
+                                SuperGrid.Controls.Remove(_EditControl.EditorPanel);
+
+                            _EditControl.EditorPanel.Visible = false;
+
+                            if (_EditControl.EditorPanel.Controls.Count > 0)
+                                _EditControl.EditorPanel.Controls[0].Visible = false;
+
+                            _EditControl.EditorPanel.Dispose();
+                        }
+
+                        _EditControl.EditorCellBitmap = null;
+
+                        ((Control)_EditControl).Dispose();
+
+                        InvalidateLayout();
+                    }
+
+                    _EditControl = value;
+                }
+            }
+        }
+
+        #endregion
+
+        #region EditorParams
+
+        /// <summary>
+        /// Gets or sets an array of arguments that match in number,
+        /// order, and type the parameters of the EditControl constructor
+        /// to invoke. If empty or null, the default constructor is invoked.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public object[] EditorParams
+        {
+            get { return (_EditorParams); }
+
+            set
+            {
+                if (_EditorParams != value)
+                {
+                    _EditorParams = value;
+
+                    EditControl = null;
+                    RenderControl = null;
+
+                    NeedsMeasured = true;
+
+                    OnPropertyChangedEx("EditorParams", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region EditorType
+
+        ///<summary>
+        /// Gets or sets the default cell editor type. This is the default
+        /// control type used to perform the actual modification of the cell value
+        ///</summary>
+        [DefaultValue(typeof(GridTextBoxXEditControl)), Category("Data")]
+        [Description("Indicates the default cell editor type. This is the default control type used to perform the actual modification of the cell value.")]
+        [TypeConverter(typeof(EditTypeConverter))]
+        [Editor("DevComponents.SuperGrid.Design.EditTypeEditor, DevComponents.SuperGrid.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=26d81176cfa2b486", typeof(UITypeEditor))]
+        public Type EditorType
+        {
+            get { return (_EditorType); }
+
+            set
+            {
+                if (value != _EditorType)
+                {
+                    _EditorType = value;
+
+                    EditControl = null;
+                    RenderControl = null;
+
+                    NeedsMeasured = true;
+
+                    OnPropertyChangedEx("EditorType", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region EffectiveCellMergeMode
+
+        ///<summary>
+        ///Gets the "effective" CellMergeMode for the column (ie. returns
+        ///the GridPanel CellMergeMode if column CellMergeMode is NotSet)
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public CellMergeMode EffectiveCellMergeMode
+        {
+            get
+            {
+                if (_CellMergeMode != CellMergeMode.NotSet)
+                    return (_CellMergeMode);
+
+                GridPanel panel = GridPanel;
+
+                return ((panel != null) ? panel.CellMergeMode : CellMergeMode.None);
+            }
+        }
+
+        #endregion
+
+        #region EnableFiltering
+
+        /// <summary>
+        /// Gets or sets whether filtering is enabled for the column
+        /// </summary>
+        [DefaultValue(Tbool.NotSet), Category("Filtering")]
+        [Description("Indicates whether filtering is enabled for the column.")]
+        public Tbool EnableFiltering
+        {
+            get { return (_EnableFiltering); }
+
+            set
+            {
+                if (_EnableFiltering != value)
+                {
+                    _EnableFiltering = value;
+
+                    OnPropertyChangedEx("EnableFiltering", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region EnableGroupHeaderMarkup
+
+        /// <summary>
+        /// Gets or sets whether text-markup support is enabled for the Group Header Text
+        /// </summary>
+        [DefaultValue(false), Category("Grouping")]
+        [Description("Indicates whether text-markup support is enabled for the Group Header Text.")]
+        public bool EnableGroupHeaderMarkup
+        {
+            get { return (TestState(Cs.EnableGroupHeaderMarkup)); }
+
+            set
+            {
+                if (EnableGroupHeaderMarkup != value)
+                {
+                    SetState(Cs.EnableGroupHeaderMarkup, value);
+
+                    if (GridPanel != null)
+                        GridPanel.NeedsGrouped = true;
+
+                    OnPropertyChangedEx("EnableGroupHeaderMarkup", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region EnableHeaderMarkup
+
+        /// <summary>
+        /// Gets or sets whether text-markup support is enabled for the HeaderText
+        /// </summary>
+        [DefaultValue(false), Category("Appearance")]
+        [Description("Indicates whether text-markup support is enabled for the HeaderText.")]
+        public bool EnableHeaderMarkup
+        {
+            get { return (TestState(Cs.EnableHeaderMarkup)); }
+
+            set
+            {
+                if (EnableHeaderMarkup != value)
+                {
+                    SetState(Cs.EnableHeaderMarkup, value);
+
+                    MarkupHeaderTextChanged();
+
+                    OnPropertyChangedEx("EnableHeaderMarkup", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region FilterAutoScan
+
+        /// <summary>
+        /// Gets or sets whether the column's FilterPopup
+        /// is filled by auto-scanning the column contents.
+        /// </summary>
+        [DefaultValue(false), Category("Filtering")]
+        [Description("Indicates whether the column's FilterPopup is filled by auto-scanning the column contents.")]
+        public bool FilterAutoScan
+        {
+            get { return (TestState(Cs.FilterAutoScan)); }
+
+            set
+            {
+                if (FilterAutoScan != value)
+                {
+                    SetState(Cs.FilterAutoScan, value);
+                    SetState(Cs.NeedsFilterScan, true);
+
+                    if (value == false)
+                        FilterScan = null;
+
+                    OnPropertyChangedEx("FilterAutoScan", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region FilterDisplayValue
+
+        /// <summary>
+        /// Gets or sets the value used to filter grid rows.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public object FilterDisplayValue
+        {
+            get { return (_FilterDisplayValue); }
+
+            set
+            {
+                if (_FilterDisplayValue != value)
+                {
+                    _FilterDisplayValue = value;
+
+                    OnPropertyChanged("FilterDisplayValue");
+
+                    if (GridPanel != null)
+                    {
+                        if (GridPanel.ColumnHeader.Visible == true)
+                            GridPanel.ColumnHeader.InvalidateRender();
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region FilterEditType
+
+        /// <summary>
+        /// Gets or sets the filter edit type
+        /// </summary>
+        [DefaultValue(FilterEditType.Auto), Category("Filtering")]
+        [Description("Indicates the filter edit type).")]
+        public FilterEditType FilterEditType
+        {
+            get { return (_FilterEditType); }
+
+            set
+            {
+                if (_FilterEditType != value)
+                {
+                    _FilterEditType = value;
+
+                    OnPropertyChangedEx("FilterEditType", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region FilterExpr
+
+        /// <summary>
+        /// Gets or sets the value used to filter grid rows.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public string FilterExpr
+        {
+            get { return (_FilterExpr); }
+
+            set
+            {
+                if ("".Equals(value))
+                    value = null;
+
+                if ((_FilterExpr == null && _FilterExpr != value) ||
+                    (_FilterExpr != null && _FilterExpr.Equals(value) == false))
+                {
+                    _FilterExpr = value;
+
+                    _FilterEval = null;
+
+                    if (_FilterExpr == null)
+                    {
+                        _FilterValue = null;
+                        _FilterDisplayValue = null;
+                    }
+
+                    if (GridPanel != null)
+                    {
+                        GridPanel.NeedToUpdateDataFilter = true;
+                        GridPanel.NeedsGrouped = true;
+                    }
+
+                    OnPropertyChangedEx("FilterExpr", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region FilterMatchType
+
+        /// <summary>
+        /// Gets or sets the filter data match type (how data elements are matched)
+        /// </summary>
+        [DefaultValue(FilterMatchType.NotSet), Category("Filtering")]
+        [Description("Indicates the filter data match style (how data elements are matched).")]
+        public FilterMatchType FilterMatchType
+        {
+            get { return (_FilterMatchType); }
+
+            set
+            {
+                if (_FilterMatchType != value)
+                {
+                    _FilterMatchType = value;
+
+                    FilterEval = null;
+
+                    if (GridPanel != null)
+                        GridPanel.NeedToUpdateDataFilter = true;
+
+                    OnPropertyChangedEx("FilterMatchType", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #region GetFilterMatchType
+
+        internal FilterMatchType GetFilterMatchType()
+        {
+            if (_FilterMatchType != FilterMatchType.NotSet)
+                return (_FilterMatchType);
+
+            if (GridPanel != null)
+                return (GridPanel.GetFilterMatchType());
+
+            return (FilterMatchType.None);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region FilterPopupMaxItems
+
+        /// <summary>
+        /// Gets or sets the filter popup maximum number of drop-down items
+        /// </summary>
+        [DefaultValue(100), Category("Filtering")]
+        [Description("Indicates the filter popup maximum number of drop-down items.")]
+        public int FilterPopupMaxItems
+        {
+            get { return (_FilterPopupMaxItems); }
+            set { _FilterPopupMaxItems = value; }
+        }
+
+        #endregion
+
+        #region FilterPopupSize
+
+        /// <summary>
+        /// Gets or sets the filter popup size
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public Size FilterPopupSize
+        {
+            get { return (_FilterPopupSize); }
+            set { _FilterPopupSize = value; }
+        }
+
+        #endregion
+
+        #region FilterRowStyles
+
+        /// <summary>
+        /// Gets or sets the visual styles assigned to the Filter Row
+        /// </summary>
+        [DefaultValue(null), Category("Style")]
+        [Description("Indicates visual style assigned to the Filter Row.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public FilterColumnHeaderVisualStyles FilterRowStyles
+        {
+            get
+            {
+                if (_FilterRowStyles == null)
+                {
+                    _FilterRowStyles = new FilterColumnHeaderVisualStyles();
+
+                    StyleVisualChangeHandler(null, _FilterRowStyles);
+                }
+
+                return (_FilterRowStyles);
+            }
+
+            set
+            {
+                if (_FilterRowStyles != value)
+                {
+                    StyleVisualChangeHandler(_FilterRowStyles, value);
+
+                    _FilterRowStyles = value;
+
+                    OnPropertyChangedEx("FilterRowStyles", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region FilterValue
+
+        /// <summary>
+        /// Gets or sets the current filter value (the value that is
+        /// loaded into, or retrieved from, the editing filter control
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public object FilterValue
+        {
+            get { return (_FilterValue); }
+            set { _FilterValue = value; }
+        }
+
+        #endregion
+
+        #region FillWeight
+
+        /// <summary>
+        /// Gets or sets a value which, when AutoSizeMode is Fill,
+        /// represents the width of the column relative to the widths
+        /// of other fill-mode columns (default value is 100).
+        /// </summary>
+        [DefaultValue(100), Category("Sizing")]
+        [Description("Indicates a value which, when AutoSizeMode is Fill, represents the width of the column relative to the widths of other fill-mode columns (default value is 100).")]
+        public int FillWeight
+        {
+            get { return (_FillWeight); }
+
+            set
+            {
+                if (value != _FillWeight)
+                {
+                    _FillWeight = value;
+
+                    GridPanel panel = GridPanel;
+
+                    if (panel != null)
+                        panel.NeedsMeasured = true;
+
+                    OnPropertyChangedEx("FillWeight", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region GroupBoxEffects
+
+        /// <summary>
+        /// Gets or sets how the column interacts with the GroupBox
+        /// </summary>
+        [DefaultValue(GroupBoxEffects.NotSet), Category("Grouping")]
+        [Description("Indicates how the column interacts with the GroupBox.")]
+        public GroupBoxEffects GroupBoxEffects
+        {
+            get { return (_GroupBoxEffects); }
+
+            set
+            {
+                if (_GroupBoxEffects != value)
+                {
+                    _GroupBoxEffects = value;
+
+                    OnPropertyChanged("GroupBoxEffects");
+                }
+            }
+        }
+
+        #endregion
+
+        #region GroupDirection
+
+        /// <summary>
+        /// Gets or sets the grouping sort direction (ie. ascending or descending).
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public SortDirection GroupDirection
+        {
+            get { return (_GroupDirection); }
+
+            set
+            {
+                if (_GroupDirection != value)
+                {
+                    _GroupDirection = value;
+
+                    OnGroupDirectionChanged();
+                }
+            }
+        }
+
+        #region OnGroupDirectionChanged
+
+        private void OnGroupDirectionChanged()
+        {
+            GridPanel panel = GridPanel;
+
+            if (panel != null)
+            {
+                panel.NeedsGroupSorted = true;
+
+                if (panel.VirtualMode == true)
+                    panel.VirtualRows.Clear();
+
+                OnPropertyChangedEx("GroupDirection", VisualChangeType.Layout);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region HeaderText
+
+        /// <summary>
+        /// Gets or sets the column header text. If the HeaderText is null
+        /// then the Name of the columns is used in its place.
+        /// </summary>
+        [Localizable(true), DefaultValue(null), Category("Appearance")]
+        [Description("Indicates the column header text. If the HeaderText is null then the Name of the columns is used in its place.")]
+        public string HeaderText
+        {
+            get { return (_HeaderText); }
+
+            set
+            {
+                if (_HeaderText != value)
+                {
+                    _HeaderText = value;
+
+                    MarkupHeaderTextChanged();
+
+                    NeedsMeasured = true;
+
+                    OnPropertyChangedEx("HeaderText", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region HeaderStyles
+
+        /// <summary>
+        /// Gets or sets the visual styles assigned to the Column Header
+        /// </summary>
+        [DefaultValue(null), Category("Style")]
+        [Description("Indicates visual style assigned to the Column Header.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ColumnHeaderVisualStyles HeaderStyles
+        {
+            get
+            {
+                if (_HeaderStyles == null)
+                {
+                    _HeaderStyles = new ColumnHeaderVisualStyles();
+
+                    StyleVisualChangeHandler(null, _HeaderStyles);
+                }
+
+                return (_HeaderStyles);
+            }
+
+            set
+            {
+                if (_HeaderStyles != value)
+                {
+                    StyleVisualChangeHandler(_HeaderStyles, value);
+
+                    _HeaderStyles = value;
+
+                    OnPropertyChangedEx("HeaderStyles", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region InfoImage
+
+        /// <summary>
+        /// Gets or sets the default cell informational Image
+        /// (the image to display when InfoText is non-empty).
+        /// </summary>
+        [DefaultValue(null), Category("Appearance")]
+        [Description("Indicates the default cell informational Image (the image to display when InfoText is non-empty).")]
+        public Image InfoImage
+        {
+            get { return (_InfoImage); }
+
+            set
+            {
+                if (_InfoImage != value)
+                {
+                    if (_InfoImageCache != null)
+                    {
+                        _InfoImageCache.Dispose();
+                        _InfoImageCache = null;
+                    }
+
+                    _InfoImage = value;
+
+                    OnPropertyChangedEx("InfoImage", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #region GetInfoImage
+
+        internal Image GetInfoImage()
+        {
+            if (_InfoImage != null)
+                return (_InfoImage);
+
+            if (_InfoImageCache == null)
+                _InfoImageCache = GridPanel.GetResourceImage("InfoImage");
+
+            return (_InfoImageCache);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InfoImageAlignment
+
+        ///<summary>
+        /// Gets or sets how the InfoImage is aligned within the cell
+        ///</summary>
+        [DefaultValue(Alignment.MiddleRight), Category("Appearance")]
+        [Description("Indicates how the InfoImage is aligned within the cell.")]
+        public Alignment InfoImageAlignment
+        {
+            get { return (_InfoImageAlignment); }
+
+            set
+            {
+                if (_InfoImageAlignment != value)
+                {
+                    _InfoImageAlignment = value;
+
+                    OnPropertyChanged("InfoImageAlignment");
+                }
+            }
+        }
+
+        #endregion
+
+        #region InfoImageOverlay
+
+        ///<summary>
+        /// Gets or sets how the InfoImage is overlayed with respect to the cell edit control.
+        ///</summary>
+        [DefaultValue(true), Category("Appearance")]
+        [Description("Indicates how the InfoImage is overlayed with respect to the cell edit control.")]
+        public bool InfoImageOverlay
+        {
+            get { return (TestState(Cs.InfoImageOverlay)); }
+
+            set
+            {
+                if (value != InfoImageOverlay)
+                {
+                    SetState(Cs.InfoImageOverlay, value);
+
+                    OnPropertyChanged("InfoImageOverlay");
+                }
+            }
+        }
+
+        #endregion
+
+        #region IsDataBound
+
+        ///<summary>
+        /// Gets whether the column is data bound.
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsDataBound
+        {
+            get
+            {
+                GridPanel panel = GridPanel;
+
+                if (panel != null)
+                    return (panel.DataBinder.IsColumnDataBound(this));
+
+                return (false); 
+            }
+        }
+
+        #endregion
+
+        #region IsFilteringEnabled
+
+        ///<summary>
+        /// Gets whether filtering is enabled for the column
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsFilteringEnabled
+        {
+            get
+            {
+                GridPanel panel = GridPanel;
+
+                if (panel != null)
+                {
+                    if (panel.EnableFiltering == false)
+                        return (false);
+
+                    if (_EnableFiltering != Tbool.NotSet)
+                        return (_EnableFiltering == Tbool.True);
+
+                    return (panel.EnableColumnFiltering == true);
+                }
+
+                return (false);
+            }
+        }
+
+        #endregion
+
+        #region IsGroupColumn
+
+        ///<summary>
+        /// Gets whether the column is a Grouping column
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsGroupColumn
+        {
+            get
+            {
+                GridPanel panel = GridPanel;
+
+                if (panel != null)
+                    return (panel.GroupColumns.Contains(this));
+
+                return (false);
+            }
+        }
+
+        #endregion
+
+        #region IsHFrozen
+
+        ///<summary>
+        /// Gets whether the column is horizontally frozen
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsHFrozen
+        {
+            get
+            {
+                GridPanel panel = Parent as GridPanel;
+
+                if (panel != null && panel.IsSubPanel == false)
+                {
+                    if (panel.FrozenColumnCount > 0)
+                    {
+                        int n = panel.Columns.GetDisplayIndex(this);
+
+                        if (n < panel.FrozenColumnCount)
+                            return (true);
+
+                        ColumnGroupHeader cgh = panel.ColumnHeader.GetColumnGroupHeader(n);
+
+                        if (cgh != null)
+                            return (panel.ColumnHeader.IsGroupHeaderHFrozen(panel, cgh));
+                    }
+                }
+
+                return (false);
+            }
+        }
+
+        #endregion
+
+        #region IsOnScreen
+
+        ///<summary>
+        /// Gets whether the column is visibly on screen.
+        ///</summary>
+        [Browsable (false)]
+        [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
+        public bool IsOnScreen
+        {
+            get
+            {
+                if (Visible == true)
+                {
+                    GridPanel panel = Parent as GridPanel;
+
+                    if (panel != null)
+                    {
+                        Rectangle t = SViewRect;
+                        Rectangle bounds = BoundsRelative;
+
+                        if (IsHFrozen == false)
+                        {
+                            bounds.X -= HScrollOffset;
+
+                            GridColumn fcol = panel.Columns.GetLastVisibleFrozenColumn();
+
+                            if (fcol != null)
+                            {
+                                int n = fcol.BoundsRelative.Right - t.X;
+
+                                t.X = fcol.BoundsRelative.Right;
+                                t.Width -= n;
+                            }
+                        }
+
+                        if (panel.IsVFrozen == false)
+                            bounds.Y -= VScrollOffset;
+
+                        return (t.IntersectsWith(bounds));
+                    }
+                }
+
+                return (false);
+            }
+        }
+
+        #endregion
+
+        #region IsPrimaryColumn
+
+        ///<summary>
+        /// Gets whether the column is the Primary column
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsPrimaryColumn
+        {
+            get
+            {
+                GridPanel panel = Parent as GridPanel;
+
+                if (panel != null)
+                    return (panel.PrimaryColumn == this);
+
+                return (false);
+            }
+        }
+
+        #endregion
+
+        #region IsSelectable
+
+        ///<summary>
+        /// Gets whether the column can be selected.
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsSelectable
+        {
+            get { return (AllowSelection == true); }
+        }
+
+        #endregion
+
+        #region IsSelected
+
+        ///<summary>
+        /// Gets or sets whether the column is selected
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsSelected
+        {
+            get
+            {
+                GridPanel panel = GridPanel;
+
+                if (panel != null)
+                {
+                    if (_SelectionUpdateCount != panel.SelectionUpdateCount)
+                    {
+                        SetState(Cs.Selected, panel.IsItemSelected(this));
+                        _SelectionUpdateCount = panel.SelectionUpdateCount;
+                    }
+
+                    return (TestState(Cs.Selected));
+                }
+
+                return (false);
+            }
+
+            set
+            {
+                GridPanel panel = GridPanel;
+
+                if (panel != null)
+                {
+                    if (panel.SetSelected(this, value) == true)
+                    {
+                        SetState(Cs.Selected, value);
+                        _SelectionUpdateCount = panel.SelectionUpdateCount;
+
+                        InvalidateRender();
+
+                        panel.ColumnHeader.InvalidateRender();
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region IsSortColumn
+
+        ///<summary>
+        /// Gets whether the column is a Sort column
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsSortColumn
+        {
+            get
+            {
+                GridPanel panel = GridPanel;
+
+                if (panel != null)
+                    return (panel.SortColumns.Contains(this));
+
+                return (false);
+            }
+        }
+
+        #endregion
+
+        #region MarkRowDirtyOnCellValueChange
+
+        /// <summary>
+        /// Gets or sets whether cell Value changes within this column
+        /// will result in the associated Row being marked as 'dirty'
+        /// </summary>
+        [DefaultValue(true), Category("Data")]
+        [Description("Indicates whether cell Value changes within this column will result in the associated Row being marked as 'dirty'.")]
+        public bool MarkRowDirtyOnCellValueChange
+        {
+            get { return (TestState(Cs.MarkRowDirtyOnCellValueChange)); }
+
+            set
+            {
+                if (value != MarkRowDirtyOnCellValueChange)
+                {
+                    SetState(Cs.MarkRowDirtyOnCellValueChange, value);
+
+                    OnPropertyChanged("MarkRowDirtyOnCellValueChange");
+                }
+            }
+        }
+
+        #endregion
+
+        #region MinimumWidth
+
+        /// <summary>
+        /// Gets or sets the minimum column width (default value is 5)
+        /// </summary>
+        [DefaultValue(5), Category("Sizing")]
+        [Description("Indicates the minimum column width (default value is 5).")]
+        public int MinimumWidth
+        {
+            get { return _MinimumWidth; }
+
+            set
+            {
+                if (_MinimumWidth != value)
+                {
+                    if (value < 0)
+                        throw new ArgumentException("Value must be 0 or greater.");
+ 
+                    _MinimumWidth = value;
+
+                    NeedsMeasured = true;
+
+                    OnPropertyChangedEx("MinimumWidth", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region Name
+
+        /// <summary>
+        /// Gets or sets the Column name.
+        /// </summary>
+        [DefaultValue(null)]
+        [Description("Indicates the Column name.")]
+        public string Name
+        {
+            get { return (_Name); }
+
+            set
+            {
+                if (_Name != value)
+                {
+                    _Name = value;
+
+                    if (String.IsNullOrEmpty(_HeaderText) == true)
+                        OnPropertyChangedEx("Name", VisualChangeType.Layout);
+                    else
+                        OnPropertyChanged("Name");
+                }
+            }
+        }
+
+        #endregion
+
+        #region NextVisibleColumn
+
+        ///<summary>
+        /// Gets the next visible column
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public GridColumn NextVisibleColumn
+        {
+            get
+            {
+                GridPanel panel = GridPanel;
+
+                if (panel != null)
+                    return (panel.Columns.GetNextVisibleColumn(this));
+
+                return (null);
+            }
+        }
+
+        #endregion
+
+        #region NullString
+
+        /// <summary>
+        /// Gets or sets the default text to display for null values. 
+        /// </summary>
+        [DefaultValue(null), Category("Data")]
+        [Description("Indicates the default text to display for null values.")]
+        public string NullString
+        {
+            get { return (_NullString); }
+
+            set
+            {
+                if (_NullString != value)
+                {
+                    _NullString = value;
+
+                    NeedsMeasured = true;
+
+                    OnPropertyChangedEx("NullString", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region PrevVisibleColumn
+
+        ///<summary>
+        /// Gets the previous visible column
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public GridColumn PrevVisibleColumn
+        {
+            get
+            {
+                GridPanel panel = GridPanel;
+
+                if (panel != null)
+                    return (panel.Columns.GetPrevVisibleColumn(this));
+
+                return (null);
+            }
+        }
+
+        #endregion
+
+        #region ReadOnly
+
+        /// <summary>
+        /// Gets or sets whether the user can change column cell contents
+        /// </summary>
+        [DefaultValue(false), Category("Behavior")]
+        [Description("Indicates whether the user can change column cell contents.")]
+        public bool ReadOnly
+        {
+            get { return (TestState(Cs.ReadOnly)); }
+
+            set
+            {
+                if (ReadOnly != value)
+                {
+                    SetState(Cs.ReadOnly, value);
+
+                    NeedsMeasured = true;
+
+                    OnPropertyChangedEx("ReadOnly", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region RenderControl
+
+        ///<summary>
+        /// Gets the default render control for the column cells
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public IGridCellEditControl RenderControl
+        {
+            get
+            {
+                if (_RenderControl == null)
+                {
+                    RenderControl = (_RenderType != null)
+                                        ? GetEditControl(_RenderType, _RenderParams)
+                                        : GetEditControl(_EditorType, _EditorParams);
+
+                    if (_RenderControl != null)
+                    {
+                        if (_RenderControl.EditorPanel.Parent == null && SuperGrid != null)
+                            SuperGrid.Controls.Add(_RenderControl.EditorPanel);
+                    }
+                }
+
+                return (_RenderControl);
+            }
+
+            internal set
+            {
+                if (_RenderControl != value)
+                {
+                    if (_RenderControl != null)
+                    {
+                        if (_RenderControl.EditorPanel.Parent != null)
+                        {
+                            SuperGrid.Controls.Remove(_RenderControl.EditorPanel);
+
+                            _RenderControl.EditorPanel.Visible = false;
+
+                            if (_RenderControl.EditorPanel.Controls.Count > 0)
+                                _RenderControl.EditorPanel.Controls[0].Visible = false;
+
+                            _RenderControl.EditorPanel.Dispose();
+                        }
+
+                        _RenderControl.EditorCellBitmap = null;
+
+                        ((Control)_RenderControl).Dispose();
+
+                        InvalidateLayout();
+                    }
+
+                    _RenderControl = value;
+                }
+            }
+        }
+
+        #endregion
+
+        #region RenderParams
+
+        /// <summary>
+        /// Gets or sets an array of arguments that match in number,
+        /// order, and type the parameters of the RenderControl constructor
+        /// to invoke. If empty or null, the default constructor is invoked.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public object[] RenderParams
+        {
+            get { return (_RenderParams); }
+
+            set
+            {
+                if (_RenderParams != value)
+                {
+                    _RenderParams = value;
+
+                    RenderControl = null;
+
+                    NeedsMeasured = true;
+
+                    OnPropertyChangedEx("RenderParams", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region RenderType
+
+        ///<summary>
+        /// Gets or sets the cell render control type (defaults to EditorType, when not set)
+        ///</summary>
+        [DefaultValue(null), Category("Data")]
+        [Description("Indicates cell render control type (defaults to EditorType, when not set)")]
+        [TypeConverter(typeof(EditTypeConverter))]
+        [Editor("DevComponents.SuperGrid.Design.EditTypeEditor, DevComponents.SuperGrid.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=26d81176cfa2b486", typeof(UITypeEditor))]
+        public Type RenderType
+        {
+            get { return (_RenderType); }
+
+            set
+            {
+                if (value != _RenderType)
+                {
+                    _RenderType = value;
+
+                    RenderControl = null;
+                    NeedsMeasured = true;
+
+                    OnPropertyChangedEx("RenderType", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ResizeMode
+
+        /// <summary>
+        /// Gets or sets how the column is resized by the user
+        /// </summary>
+        [DefaultValue(ColumnResizeMode.MoveFollowingElements), Category("Sizing")]
+        [Description("Indicates how the column is resized by the user.")]
+        public ColumnResizeMode ResizeMode
+        {
+            get { return (_ResizeMode); }
+
+            set
+            {
+                if (_ResizeMode != value)
+                {
+                    _ResizeMode = value;
+
+                    OnPropertyChanged("ResizeMode");
+                }
+            }
+        }
+
+        #endregion
+
+        #region SelectedCellCount
+
+        ///<summary>
+        /// Gets the current count of selected cells in the column.
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public int SelectedCellCount
+        {
+            get
+            {
+                int n = 0;
+
+                GridPanel panel = GridPanel;
+
+                if (panel != null)
+                {
+                    if (panel.VirtualMode == true)
+                    {
+                        foreach (SelectedRange range in _SelectedCells.Ranges)
+                            n += range.Count;
+                    }
+                    else
+                    {
+                        foreach (SelectedRange range in _SelectedCells.Ranges)
+                        {
+                            for (int i = range.StartIndex; i <= range.EndIndex; i++)
+                            {
+                                GridRow row = panel.GetRowFromIndex(i) as GridRow;
+
+                                if (row != null)
+                                {
+                                    if (row.Cells.Count > _ColumnIndex)
+                                    {
+                                        if (row.Cells[_ColumnIndex].AllowSelection == true)
+                                            n++;
+                                    }
+                                    else
+                                    {
+                                        n++;
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+
+                return (n);
+            }
+        }
+
+        #endregion
+
+        #region ShowCustomFilterExpr
+
+        ///<summary>
+        /// Gets or sets whether the filter expression is displayed in the panel area
+        ///</summary>
+        [DefaultValue(Tbool.NotSet), Category("Filtering")]
+        [Description("Indicates whether the filter expression is displayed in the panel area.")]
+        public Tbool ShowPanelFilterExpr
+        {
+            get { return (_ShowPanelFilterExpr); }
+
+            set
+            {
+                if (_ShowPanelFilterExpr != value)
+                {
+                    _ShowPanelFilterExpr = value;
+
+                    OnPropertyChangedEx("ShowPanelFilterExpr", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region SortCycle
+
+        /// <summary>
+        /// Gets or sets how the sort direction cycles
+        /// when the column header is clicked to sort.
+        /// </summary>
+        [Browsable(true)]
+        [DefaultValue(SortCycle.NotSet), Category("Sorting")]
+        [Description("Indicates how the sort direction cycles when the column header is clicked to sort.")]
+        public SortCycle SortCycle
+        {
+            get { return (_SortCycle); }
+
+            set
+            {
+                if (_SortCycle != value)
+                {
+                    _SortCycle = value;
+
+                    OnPropertyChanged("SortCycle");
+                }
+            }
+        }
+
+        #endregion
+
+        #region SortDirection
+
+        /// <summary>
+        /// Gets or sets the Sorting direction (ascending or descending)
+        /// </summary>
+        [Browsable(false)]
+        [DefaultValue(SortDirection.None), Category("Sorting")]
+        [Description("Indicates the Sorting direction (ascending or descending).")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public SortDirection SortDirection
+        {
+            get { return (_SortDirection); }
+
+            set
+            {
+                if (_SortDirection != value)
+                {
+                    _SortDirection = value;
+
+                    OnSortDirectionChanged();
+                    OnPropertyChangedEx("SortDirection", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #region OnSortDirectionChanged
+
+        private void OnSortDirectionChanged()
+        {
+            GridPanel panel = GridPanel;
+
+            if (panel != null)
+            {
+                panel.NeedsSorted = true;
+                panel.ColumnHeader.InvalidateHeader(panel, this);
+
+                if (panel.VirtualMode == true)
+                    panel.VirtualRows.Clear();
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region SortIndicator
+
+        /// <summary>
+        /// Gets or sets the sort indicator
+        /// </summary>
+        [DefaultValue(SortIndicator.Auto), Category("Sorting")]
+        [Description("Indicates the Sorting indicator.")]
+        public SortIndicator SortIndicator
+        {
+            get { return (_SortIndicator); }
+
+            set
+            {
+                if (_SortIndicator != value)
+                {
+                    _SortIndicator = value;
+
+                    NeedsMeasured = true;
+
+                    OnSortIndicatorChanged();
+                }
+            }
+        }
+
+        #region OnSortIndicatorChanged
+
+        private void OnSortIndicatorChanged()
+        {
+            GridPanel panel = GridPanel;
+
+            if (panel != null)
+                panel.ColumnHeader.InvalidateRender();
+
+            OnPropertyChanged("SortIndicator");
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ToolTip
+
+        ///<summary>
+        /// Gets or sets the ToolTip text for the column header.
+        ///</summary>
+        [Localizable(true), DefaultValue(null), Category("Appearance")]
+        [Description("Indicates ththe ToolTip text for the column header.")]
+        public string ToolTip
+        {
+            get { return (_ToolTip); }
+
+            set
+            {
+                if (_ToolTip != value)
+                {
+                    _ToolTip = value;
+
+                    OnPropertyChanged("ToolTip");
+                }
+            }
+        }
+
+        #endregion
+
+        #region Width
+
+        /// <summary>
+        /// Gets or sets the column width.
+        /// </summary>
+        [DefaultValue(100), Category("Sizing")]
+        [Description("Indicates the column width.")]
+        public int Width
+        {
+            get { return _Width; }
+
+            set
+            {
+                if (_Width != value)
+                {
+                    _Width = value;
+
+                    OnWidthChanged();
+                }
+            }
+        }
+
+        #region OnWidthChanged
+
+        private void OnWidthChanged()
+        {
+            GridPanel panel = GridPanel;
+
+            if (panel != null)
+                SuperGrid.DoColumnResizedEvent(panel, this);
+
+            NeedsMeasured = true;
+
+            OnPropertyChangedEx("Width", VisualChangeType.Layout);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region TestState
+
+        private bool TestState(Cs state)
+        {
+            return ((_States & state) == state);
+        }
+
+        #endregion
+
+        #region SetState
+
+        private void SetState(Cs state, bool value)
+        {
+            if (value == true)
+                _States |= state;
+            else
+                _States &= ~state;
+        }
+
+        #endregion
+
+        #region OnEvent processing
+
+        #region OnDisplayIndexChanged
+
+        /// <summary>
+        /// Raises DisplayIndexChanged event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnDisplayIndexChanged(EventArgs e)
+        {
+            EventHandler handler = DisplayIndexChanged;
+
+            if (handler != null)
+                handler(this, e);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region MeasureOverride
+
+        /// <summary>
+        /// Performs the layout of the item and sets the Size property to size that item will take.
+        /// </summary>
+        /// <param name="layoutInfo">Layout information.</param>
+        /// <param name="stateInfo"></param>
+        /// <param name="constraintSize"></param>
+        protected override void MeasureOverride(
+            GridLayoutInfo layoutInfo, GridLayoutStateInfo stateInfo, Size constraintSize)
+        {
+            if (NeedsResized == true || NeedsMeasured == true || stateInfo.GridPanel.NeedsMeasured == true)
+            {
+                Size sizeNeeded = Size.Empty;
+
+                ColumnAutoSizeMode autoSizeMode = GetAutoSizeMode();
+
+                int baseWidth = Dpi.Width(MinimumWidth);
+
+                switch (autoSizeMode)
+                {
+                    case ColumnAutoSizeMode.AllCells:
+                    case ColumnAutoSizeMode.DisplayedCells:
+                    case ColumnAutoSizeMode.ColumnHeader:
+                        baseWidth = Math.Max(baseWidth, _HeaderSize.Width);
+                        break;
+                }
+
+                int height = 0;
+
+                switch (autoSizeMode)
+                {
+                    case ColumnAutoSizeMode.None:
+                        sizeNeeded.Width = Math.Max(baseWidth, Dpi.Width(Width));
+                        break;
+
+                    case ColumnAutoSizeMode.AllCells:
+                    case ColumnAutoSizeMode.AllCellsExceptHeader:
+                        sizeNeeded.Width = GetColumnWidth(layoutInfo, stateInfo,
+                            autoSizeMode, stateInfo.GridPanel.Rows, baseWidth, 0, ref height);
+                        break;
+
+                    case ColumnAutoSizeMode.ColumnHeader:
+                        sizeNeeded = new Size(baseWidth, 0);
+                        MarkRowsToMeasure(stateInfo.GridPanel.Rows);
+                        break;
+
+                    default:
+                        sizeNeeded.Width = GetColumnWidth(layoutInfo, stateInfo, autoSizeMode,
+                            stateInfo.GridPanel.Rows, baseWidth, layoutInfo.ClientBounds.Height, ref height);
+                        break;
+                }
+
+                Size = sizeNeeded;
+
+                NeedsResized = false;
+            }
+        }
+
+        #region GetColumnWidth
+
+        private int GetColumnWidth(GridLayoutInfo layoutInfo,
+            GridLayoutStateInfo stateInfo, ColumnAutoSizeMode autoSizeMode,
+            IEnumerable<GridElement> items, int width, int maxHeight, ref int height)
+        {
+            GridPanel panel = GridPanel;
+
+            if (panel != null)
+            {
+                if (panel.VirtualMode == true)
+                {
+                    if (panel.VirtualRowCount > 0)
+                    {
+                        //panel.VirtualRows.Clear();
+
+                        int n = GetVirtualColumnWidthEx(layoutInfo,
+                            stateInfo, autoSizeMode, ref height);
+
+                        width = Math.Max(width, n);
+                    }
+                }
+                else
+                {
+                    int n = GetColumnWidthEx(layoutInfo,
+                            stateInfo, autoSizeMode, items, maxHeight, ref height);
+
+                    width = Math.Max(width, n);
+                }
+            }
+
+            return (width);
+        }
+
+        #region GetVirtualColumnWidthEx
+
+        private int GetVirtualColumnWidthEx(GridLayoutInfo layoutInfo,
+            GridLayoutStateInfo stateInfo, ColumnAutoSizeMode autoSizeMode, ref int height)
+        {
+            GridPanel panel = GridPanel;
+
+            int start = panel.FirstOnScreenRowIndex;
+            int end = panel.LastOnScreenRowIndex;
+
+            int width = 0;
+
+            for (int i = start; i <= end; i++)
+            {
+                GridRow row = panel.VirtualRows[i];
+
+                if (ColumnIndex < row.GridPanel.Columns.Count)
+                {
+                    if (ColumnIndex < row.Cells.Count)
+                    {
+                        GridCell cell = row.Cells[ColumnIndex];
+
+                        MeasureCell(layoutInfo, stateInfo, autoSizeMode, row, cell);
+
+                        width = Math.Max(width, cell.CellSize.Width);
+                        height += cell.Size.Height;
+                    }
+                    else
+                    {
+                        width = Math.Max(width, Width);
+                    }
+                }
+            }
+
+            return (width);
+        }
+
+        #endregion
+
+        #region GetColumnWidthEx
+
+        private int GetColumnWidthEx(GridLayoutInfo layoutInfo,
+            GridLayoutStateInfo stateInfo, ColumnAutoSizeMode autoSizeMode,
+            IEnumerable<GridElement> items, int maxHeight, ref int height)
+        {
+            int width = 0;
+
+            foreach (GridElement item in items)
+            {
+                GridRow row = item as GridRow;
+
+                if (row != null && row.Visible == true)
+                {
+                    if (ColumnIndex < row.GridPanel.Columns.Count)
+                    {
+                        if (ColumnIndex < row.Cells.Count)
+                        {
+                            GridCell cell = row.Cells[ColumnIndex];
+
+                            if (maxHeight <= 0 || height < maxHeight)
+                            {
+                                MeasureCell(layoutInfo, stateInfo, autoSizeMode, row, cell);
+
+                                width = Math.Max(width, cell.CellSize.Width);
+                                height += cell.Size.Height;
+                            }
+                            else
+                            {
+                                cell.NeedsMeasured = true;
+                            }
+                        }
+                        else
+                        {
+                            width = Math.Max(width, Width);
+                        }
+                    }
+
+                    if (row.Rows != null && row.Expanded == true)
+                    {
+                        GridLayoutStateInfo itemStateInfo = new
+                            GridLayoutStateInfo(stateInfo.GridPanel, stateInfo.IndentLevel + 1);
+
+                        width = GetColumnWidth(layoutInfo, itemStateInfo,
+                            autoSizeMode, row.Rows, width, maxHeight, ref height);
+                    }
+                }
+                else
+                {
+                    GridGroup group = item as GridGroup;
+
+                    if (group != null)
+                    {
+                        GridPanel panel = group.GridPanel;
+
+                        int n = GetColumnWidthEx(layoutInfo,
+                            stateInfo, autoSizeMode, group.Rows, maxHeight, ref height);
+
+                        n += panel.TreeButtonIndent + 
+                            Dpi.Width(stateInfo.IndentLevel * panel.LevelIndentSize.Width);
+
+                        width = Math.Max(width, n);
+                    }
+                }
+            }
+
+            return (width);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region MeasureCell
+
+        private void MeasureCell(GridLayoutInfo layoutInfo, GridLayoutStateInfo stateInfo,
+            ColumnAutoSizeMode autoSizeMode, GridRow row, GridCell cell)
+        {
+            if (cell.NeedsMeasured || NeedsMeasured || 
+                row.NeedsMeasured || stateInfo.GridPanel.NeedsMeasured)
+            {
+                int rowHeight = row.GetRowHeight();
+
+                if (rowHeight > 0)
+                {
+                    Size size = new Size(Width, rowHeight);
+
+                    if (autoSizeMode != ColumnAutoSizeMode.None)
+                    {
+                        cell.Measure(layoutInfo, stateInfo, Size.Empty);
+
+                        size.Width = cell.Size.Width;
+                        size.Width += GetColumnIndent(stateInfo.IndentLevel);
+                    }
+                    else
+                    {
+                        cell.Measure(layoutInfo, stateInfo, size);
+                    }
+
+                    cell.Size = size;
+                }
+                else
+                {
+                    Size size = Size.Empty;
+
+                    if (autoSizeMode == ColumnAutoSizeMode.None)
+                    {
+                        size.Width = Width;
+                        size.Width -= GetColumnIndent(stateInfo.IndentLevel);
+                        size.Width = Math.Max(1, size.Width);
+                    }
+
+                    cell.Measure(layoutInfo, stateInfo, new Size(size.Width, 0));
+
+                    if (autoSizeMode != ColumnAutoSizeMode.None)
+                    {
+                        size = cell.Size;
+                        size.Width += GetColumnIndent(stateInfo.IndentLevel);
+                        cell.Size = size;
+                    }
+                    else
+                    {
+                        size = cell.Size;
+                        size.Width = Width;
+                        cell.Size = size;
+                    }
+                }
+
+                cell.CellSize = cell.Size;
+            }
+        }
+
+        #endregion
+
+        #region MarkRowsToMeasure
+
+        private void MarkRowsToMeasure(IEnumerable<GridElement> items)
+        {
+            foreach (GridElement item in items)
+            {
+                GridRow row = item as GridRow;
+
+                if (row != null && row.Visible == true)
+                {
+                    if (row.GetRowHeight() <= 0)
+                        row.NeedsMeasured = true;
+
+                    if (row.Rows != null && row.Expanded == true)
+                        MarkRowsToMeasure(row.Rows);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ArrangeOverride
+
+        /// <summary>
+        /// Performs the arrange pass layout of the item when final position and size of the item has been set.
+        /// </summary>
+        /// <param name="layoutInfo">Layout information.</param>
+        /// <param name="stateInfo"></param>
+        /// <param name="layoutBounds">Layout bounds</param>
+        protected override void ArrangeOverride(GridLayoutInfo layoutInfo,
+            GridLayoutStateInfo stateInfo, Rectangle layoutBounds)
+        {
+            GridPanel panel = stateInfo.GridPanel;
+
+            if (NeedsFilterScan == true || panel.NeedsFilterScan == true)
+            {
+                if (FilterAutoScan == true && 
+                    (panel.Filter.Visible == true || panel.ColumnHeader.FilterImageVisibility != ImageVisibility.Never))
+                {
+                    NeedsFilterScan = false;
+
+                    FilterScan.BeginScan();
+                }
+            }
+        }
+
+        #endregion
+
+        #region RenderOverride
+
+        /// <summary>
+        /// Performs drawing of the item and its children.
+        /// </summary>
+        /// <param name="renderInfo">Holds contextual rendering information.</param>
+        protected override void RenderOverride(GridRenderInfo renderInfo)
+        {
+            RenderDesignerElement(renderInfo, Bounds);
+        }
+
+        #region RenderDesignerElement
+
+        private void RenderDesignerElement(
+            GridRenderInfo renderInfo, Rectangle r)
+        {
+            if (SuperGrid.DesignerElement == this)
+            {
+                int n = r.Y - (GridPanel.ColumnHeader.Bounds.Y + 4);
+
+                r.X += Dpi.Width2;
+                r.Y = GridPanel.ColumnHeader.Bounds.Y - Dpi.Width4;
+                r.Width -= Dpi.Width6;
+                r.Height += n + Dpi.Width4;
+
+                if (r.Width > 0 && r.Height > 0)
+                {
+                    using (Pen pen = new Pen(Color.Purple, Dpi.Width1))
+                    {
+                        pen.DashStyle = DashStyle.Dash;
+
+                        renderInfo.Graphics.DrawRectangle(pen, r);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetHeaderText
+
+        internal string GetHeaderText()
+        {
+            return (_HeaderText ?? _Name);
+        }
+
+        #endregion
+
+        #region GetColumnIndent
+
+        internal int GetColumnIndent(int indentLevel)
+        {
+            int n = 0;
+
+            GridPanel panel = GridPanel;
+
+            if (panel != null)
+            {
+                if (panel.PrimaryColumn == this)
+                {
+                    if (panel.ShowTreeButtons == true || panel.ShowTreeLines == true)
+                        n += panel.TreeButtonIndent;
+
+                    if (panel.CheckBoxes == true)
+                    {
+                        if (panel.ShowTreeButtons == true || panel.ShowTreeLines == true)
+                            n += Dpi.Width3;
+
+                        n += Dpi.Width(panel.CheckBoxSize.Width + 2);
+                    }
+
+                    n += Dpi.Width(panel.LevelIndentSize.Width * indentLevel);
+                }
+            }
+
+            return (n);
+        }
+
+        #endregion
+
+        #region GetAutoSizeMode
+
+        internal ColumnAutoSizeMode GetAutoSizeMode()
+        {
+            GridPanel panel = Parent as GridPanel;
+
+            if (panel != null)
+            {
+                ColumnAutoSizeMode mode = AutoSizeMode;
+
+                if (mode == ColumnAutoSizeMode.NotSet)
+                {
+                    mode = panel.ColumnAutoSizeMode;
+
+                    if (mode != ColumnAutoSizeMode.NotSet)
+                        return (mode);
+                }
+
+                return (mode);
+            }
+
+            return (ColumnAutoSizeMode.None);
+        }
+
+        #endregion
+
+        #region GetMaximumCellSize
+
+        ///<summary>
+        /// This routine calculates and returns the maximum cell
+        /// size from each cell in the column, as limited by the
+        /// given row scope ('AllRows' or 'OnScreenRows').
+        /// If 'includeHeader' is true, then the width of the header
+        /// is included in the max calculation.
+        ///</summary>
+        ///<returns>Maximum cell size.</returns>
+        public Size GetMaximumCellSize(RowScope scope, bool includeHeader)
+        {
+            Size size = Size.Empty;
+            GridPanel panel = GridPanel;
+
+            if (panel != null)
+            {
+                using (Graphics g = SuperGrid.CreateGraphics())
+                {
+                    GridLayoutInfo layoutInfo = new GridLayoutInfo(g, panel.BoundsRelative);
+                    GridLayoutStateInfo layoutState = new GridLayoutStateInfo(panel, 0);
+
+                    if (includeHeader == true)
+                    {
+                        Size oldSize = panel.ColumnHeader.Size;
+
+                        panel.ColumnHeader.MeasureHeader(layoutInfo, Size.Empty, panel, this);
+
+                        size.Width = _HeaderSize.Width;
+
+                        panel.ColumnHeader.Size = oldSize;
+                    }
+
+                    if (panel.VirtualMode == true)
+                    {
+                        int firstRow = 0;
+                        int lastRow = panel.VirtualRowCountEx;
+
+                        if (scope == RowScope.OnScreenRows)
+                        {
+                            firstRow = panel.FirstOnScreenRowIndex;
+                            lastRow = panel.LastOnScreenRowIndex + 1;
+                        }
+
+                        for (int i = firstRow; i < lastRow; i++)
+                        {
+                            GridRow row = panel.VirtualRows[i];
+                            GridCell cell = row.Cells[ColumnIndex];
+
+                            Size oldSize = cell.Size;
+
+                            cell.Measure(layoutInfo, layoutState, Size.Empty);
+
+                            int n = GetColumnIndent(cell.IndentLevel);
+
+                            size.Width = Math.Max(size.Width, cell.Size.Width + n);
+                            size.Height = Math.Max(size.Height, cell.Size.Height);
+
+                            cell.Size = oldSize;
+                        }
+                    }
+                    else
+                    {
+                        if (panel.Rows.Count > 0)
+                        {
+                            int firstRow = 0;
+                            int lastRow = panel.Rows.Count;
+
+                            if (scope == RowScope.OnScreenRows)
+                            {
+                                firstRow = panel.FirstOnScreenRowIndex;
+                                lastRow = firstRow + 100;
+                            }
+
+                            Size cellSize = GetMaximumCellSize(
+                                panel.Rows, firstRow, lastRow, layoutInfo, layoutState);
+
+                            size.Width = Math.Max(size.Width, cellSize.Width);
+                            size.Height = Math.Max(size.Height, cellSize.Height);
+                        }
+                    }
+                }
+            }
+
+            return (size);
+        }
+
+        private Size GetMaximumCellSize(GridItemsCollection rows,
+            int firstRow, int lastRow, GridLayoutInfo layoutInfo, GridLayoutStateInfo layoutState)
+        {
+            Size size = Size.Empty;
+
+            for (int i = firstRow; i < lastRow; i++)
+            {
+                if (i >= rows.Count)
+                    break;
+
+                GridContainer item = rows[i] as GridContainer;
+
+                if (item != null)
+                {
+                    Size cellSize = Size.Empty;
+
+                    if (item is GridRow)
+                    {
+                        cellSize = GetMaxRowCellSize(
+                            (GridRow) item, layoutInfo, layoutState);
+                    }
+                    else if (item is GridGroup)
+                    {
+                        cellSize = GetMaximumCellSize(
+                            item.Rows, 0, lastRow - i, layoutInfo, layoutState);
+                    }
+
+                    size.Width = Math.Max(size.Width, cellSize.Width);
+                    size.Height = Math.Max(size.Height, cellSize.Height);
+                }
+            }
+
+            return (size);
+        }
+
+        #region GetMaxRowCellSize
+
+        private Size GetMaxRowCellSize(GridRow row,
+            GridLayoutInfo layoutInfo, GridLayoutStateInfo layoutState)
+        {
+            if (row.Cells.Count <= ColumnIndex)
+                return (Size.Empty);
+
+            GridCell cell = row.Cells[ColumnIndex];
+
+            Size oldSize = cell.Size;
+
+            cell.Measure(layoutInfo, layoutState, Size.Empty);
+
+            Size size = cell.Size;
+            size.Width += GetColumnIndent(cell.IndentLevel);
+
+            cell.Size = oldSize;
+
+            if (row.Rows.Count > 0 && row.Expanded == true)
+            {
+                layoutState.IndentLevel++;
+
+                foreach (GridContainer item in row.Rows)
+                {
+                    if (item is GridRow)
+                    {
+                        Size cellSize =
+                            GetMaxRowCellSize((GridRow)item, layoutInfo, layoutState);
+
+                        size.Width = Math.Max(size.Width, cellSize.Width);
+                        size.Height = Math.Max(size.Height, cellSize.Height);
+                    }
+                }
+
+                layoutState.IndentLevel--;
+            }
+
+            return (size);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetSelectedCells
+
+        ///<summary>
+        /// GetSelectedCells
+        ///</summary>
+        public SelectedElementCollection GetSelectedCells()
+        {
+            GridPanel panel = GridPanel;
+
+            if (panel != null)
+            {
+                SelectedElementCollection cells = new
+                    SelectedElementCollection(SelectedCells.Count);
+
+                panel.GetSelectedCells(cells, this);
+
+                return (cells);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region EnsureVisible
+
+        ///<summary>
+        /// EnsureVisible
+        ///</summary>
+        ///<param name="center"></param>
+        public override void EnsureVisible(bool center)
+        {
+            if (Visible == true)
+            {
+                GridPanel panel = GridPanel;
+
+                if (panel != null)
+                {
+                    if (IsHFrozen == false)
+                    {
+                        Rectangle t = SViewRect;
+
+                        GridColumn pcol = panel.Columns.GetLastVisibleFrozenColumn();
+
+                        if (pcol != null)
+                        {
+                            t.Width -= (pcol.BoundsRelative.Right - t.X);
+                            t.X = pcol.BoundsRelative.Right;
+                        }
+
+                        Rectangle bounds = BoundsRelative;
+
+                        if (bounds.Width >= t.Width || bounds.X - HScrollOffset < t.X)
+                        {
+                            int n = bounds.X - t.X;
+
+                            if (center == false || bounds.Width >= t.Width)
+                                SuperGrid.SetHScrollValue(n - 1);
+                            else
+                                SuperGrid.SetHScrollValue(n - (t.Width - bounds.Width)/2);
+                        }
+                        else if (bounds.X - HScrollOffset > t.Right - bounds.Width)
+                        {
+                            int n = bounds.X - (t.Right - bounds.Width);
+
+                            if (center == false)
+                                SuperGrid.SetHScrollValue(n + 1);
+                            else
+                                SuperGrid.SetHScrollValue(n + (t.Width - bounds.Width)/2);
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region ToggleSort
+
+        ///<summary>
+        /// ToggleSort
+        ///</summary>
+        public void ToggleSort()
+        {
+            GridPanel panel = GridPanel;
+
+            if (panel != null)
+            {
+                SortDirection sortDirection;
+
+                switch (_SortDirection)
+                {
+                    case SortDirection.None:
+                    case SortDirection.Descending:
+                        sortDirection = SortDirection.Ascending;
+                        break;
+
+                    default:
+                        sortDirection = SortDirection.Descending;
+                        break;
+                }
+
+                panel.AddSort(this, sortDirection);
+
+                SuperGrid.DoSortChangedEvent(panel);
+            }
+        }
+
+        #endregion
+
+        #region Edit support
+
+        #region GetEditControl
+
+        internal IGridCellEditControl GetEditControl(Type type, object[] args)
+        {
+            if (type != null)
+            {
+                IGridCellEditControl editor =
+                    Activator.CreateInstance(type, args) as IGridCellEditControl;
+
+                if (editor != null)
+                {
+                    if (editor is Control == false)
+                        throw new Exception("Edit/Render Type must be based on 'Control'.");
+
+                    editor.EditorPanel = new EditorPanel();
+                    editor.EditorPanel.Visible = false;
+                    editor.EditorPanel.Controls.Add((Control) editor);
+                }
+
+                return (editor);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Style support routines
+
+        #region StyleVisualChangeHandler
+
+        private void StyleVisualChangeHandler(
+            INotifyPropertyChanged oldValue, INotifyPropertyChanged newValue)
+        {
+            NeedsMeasured = true;
+
+            if (oldValue != null)
+                oldValue.PropertyChanged -= StyleChanged;
+
+            if (newValue != null)
+                newValue.PropertyChanged += StyleChanged;
+        }
+
+        #endregion
+
+        #region StyleChanged
+
+        /// <summary>
+        /// Occurs when one of element visual styles has property changes.
+        /// Default implementation invalidates visual appearance of element.
+        /// </summary>
+        /// <param name="sender">VisualStyle that changed.</param>
+        /// <param name="e">Event arguments.</param>
+        protected virtual void StyleChanged(object sender, PropertyChangedEventArgs e)
+        {
+            if (SuperGrid != null)
+            {
+                SuperGrid.UpdateStyleCount();
+
+                VisualChangeType changeType = ((VisualPropertyChangedEventArgs) e).ChangeType;
+
+                if (changeType == VisualChangeType.Layout)
+                {
+                    NeedsMeasured = true;
+
+                    InvalidateLayout();
+                }
+                else
+                {
+                    GridPanel.InvalidateRender();
+                }
+            }
+        }
+
+        #endregion
+
+        #region GetFilterStyle
+
+        internal FilterColumnHeaderVisualStyle GetFilterStyle(StyleType e)
+        {
+            ValidateStyle();
+
+            if (EffectiveFilterStyles == null)
+                EffectiveFilterStyles = new FilterColumnHeaderVisualStyles();
+
+            if (EffectiveFilterStyles.IsValid(e) == false)
+            {
+                FilterColumnHeaderVisualStyle style = new FilterColumnHeaderVisualStyle();
+
+                StyleType[] css = style.GetApplyStyleTypes(e);
+
+                if (css != null)
+                {
+                    foreach (StyleType cs in css)
+                    {
+                        style.ApplyStyle(SuperGrid.BaseVisualStyles.FilterColumnHeaderStyles[cs]);
+                        style.ApplyStyle(SuperGrid.DefaultVisualStyles.FilterColumnHeaderStyles[cs]);
+                        style.ApplyStyle(GridPanel.DefaultVisualStyles.FilterColumnHeaderStyles[cs]);
+                        style.ApplyStyle(FilterRowStyles[cs]);
+                    }
+                }
+
+                SuperGrid.DoGetFilterColumnHeaderStyleEvent(this, e, ref style);
+
+                if (style.Background == null || style.Background.IsEmpty == true)
+                    style.Background = new Background(Color.White);
+
+                if (style.Font == null)
+                {
+                    Font font = SystemFonts.DefaultFont;
+                    style.Font = font;
+                }
+
+                EffectiveFilterStyles[e] = style;
+            }
+
+            return (EffectiveFilterStyles[e]);
+        }
+
+        #endregion
+
+        #region GetHeaderStyle
+
+        ///<summary>
+        ///Gets the effective header style for the given StyleType.
+        ///</summary>
+        ///<param name="e">StyleType</param>
+        ///<returns></returns>
+        public ColumnHeaderVisualStyle GetHeaderStyle(StyleType e)
+        {
+            ValidateStyle();
+
+            if (EffectiveStyles == null)
+                EffectiveStyles = new ColumnHeaderVisualStyles();
+
+            if (EffectiveStyles.IsValid(e) == false)
+            {
+                ColumnHeaderVisualStyle style = new ColumnHeaderVisualStyle();
+
+                StyleType[] css = style.GetApplyStyleTypes(e);
+
+                if (css != null)
+                {
+                    GridColumnHeader colHeader = GridPanel.ColumnHeader;
+
+                    ColumnGroupHeader cgh = colHeader.GetParentHeader(this) as ColumnGroupHeader;
+
+                    if (cgh != null) 
+                    {
+                        if (colHeader.GetAutoApplyGroupColor(cgh) != true)
+                            cgh = null;
+                    }
+
+                    foreach (StyleType cs in css)
+                    {
+                        style.ApplyStyle(SuperGrid.BaseVisualStyles.ColumnHeaderStyles[cs]);
+                        style.ApplyStyle(SuperGrid.DefaultVisualStyles.ColumnHeaderStyles[cs]);
+                        style.ApplyStyle(GridPanel.DefaultVisualStyles.ColumnHeaderStyles[cs]);
+
+                        style.ApplyStyle(HeaderStyles[cs]);
+
+                        if (cgh != null)
+                        {
+                            ColumnHeaderVisualStyle gstyle = colHeader.GetEffectiveStyle(cgh, cs);
+
+                            if (gstyle.Background != null)
+                            {
+                                if (HeaderStyles[cs].Background == null || HeaderStyles[cs].Background.IsEmpty)
+                                    style.Background = gstyle.Background.Copy();
+                            }
+
+                            if (gstyle.TextColor.IsEmpty == false)
+                            {
+                                if (HeaderStyles[cs].TextColor.IsEmpty)
+                                    style.TextColor = gstyle.TextColor;
+                            }
+                        }
+                    }
+
+                    style.ApplyDefaults();
+                }
+
+                SuperGrid.DoGetColumnHeaderStyleEvent(this, e, ref style);
+
+                if (style.Background == null || style.Background.IsEmpty == true)
+                    style.Background = new Background(Color.White);
+
+                if (style.Font == null)
+                    style.Font = SystemFonts.DefaultFont;
+
+                EffectiveStyles[e] = style;
+            }
+
+            return (EffectiveStyles[e]);
+        }
+
+        #endregion
+
+        #region ApplyCellStyle
+
+        internal void ApplyCellStyle(CellVisualStyle style, StyleType cs)
+        {
+            CellVisualStyle cstyle = GetEffectiveCellStyle(cs);
+
+            style.ApplyStyle(cstyle);
+        }
+
+        #endregion
+
+        #region GetEffectiveCellStyle
+
+        ///<summary>
+        ///Get the default Effective CellStyle for the given StyleType.
+        ///</summary>
+        ///<param name="type"></param>
+        ///<returns></returns>
+        public CellVisualStyle GetEffectiveCellStyle(StyleType type)
+        {
+            ValidateStyle();
+
+            if (_EffectiveCellStyles == null)
+                _EffectiveCellStyles = new CellVisualStyles();
+
+            if (_EffectiveCellStyles.IsValid(type) == false)
+            {
+                GridPanel panel = GridPanel;
+
+                int colIndex = panel.UseAlternateColumnStyle
+                    ? panel.Columns.GetDisplayIndex(this) : -1;
+
+                CellVisualStyle cstyle = new CellVisualStyle();
+
+                panel.ApplyCellStyle(cstyle, type);
+
+                if ((colIndex % 2) > 0)
+                {
+                    cstyle.ApplyStyle(SuperGrid.BaseVisualStyles.AlternateColumnCellStyles[type]);
+                    cstyle.ApplyStyle(SuperGrid.DefaultVisualStyles.AlternateColumnCellStyles[type]);
+                    cstyle.ApplyStyle(GridPanel.DefaultVisualStyles.AlternateColumnCellStyles[type]);
+                }
+
+                cstyle.ApplyStyle(CellStyles[type]);
+
+                _EffectiveCellStyles[type] = cstyle;
+            }
+
+            return (_EffectiveCellStyles[type]);
+        }
+
+        #endregion
+
+        #region InvalidateStyle
+
+        ///<summary>
+        ///Invalidates the cached Style
+        ///definition for all defined StyleTypes
+        ///</summary>
+        public void InvalidateStyle()
+        {
+            if (EffectiveStyles != null)
+            {
+                EffectiveStyles.Dispose();
+                EffectiveStyles = null;
+            }
+
+            if (EffectiveFilterStyles != null)
+            {
+                EffectiveFilterStyles.Dispose();
+                EffectiveFilterStyles = null;
+            }
+
+            InvalidateLayout();
+        }
+
+        ///<summary>
+        ///Invalidate the cached Style
+        ///definition for the given StyleType
+        ///</summary>
+        ///<param name="type"></param>
+        public void InvalidateStyle(StyleType type)
+        {
+            if (_EffectiveStyles != null)
+            {
+                _EffectiveStyles[type] = null;
+                _EffectiveFilterStyles[type] = null;
+
+                InvalidateLayout();
+            }
+        }
+
+        #endregion
+
+        #region ValidateStyle
+
+        private void ValidateStyle()
+        {
+            if (_StyleUpdateCount != SuperGrid.StyleUpdateCount)
+            {
+                ClearEffectiveStyles();
+
+                _StyleUpdateCount = SuperGrid.StyleUpdateCount;
+            }
+        }
+
+        #endregion
+
+        #region ClearEffectiveStyles
+
+        internal void ClearEffectiveStyles()
+        {
+            if (_EffectiveStyles != null)
+            {
+                _EffectiveStyles.Dispose();
+                _EffectiveStyles = null;
+            }
+
+            if (_EffectiveFilterStyles != null)
+            {
+                _EffectiveFilterStyles.Dispose();
+                _EffectiveFilterStyles = null;
+            }
+
+            if (_EffectiveCellStyles != null)
+            {
+                _EffectiveCellStyles.Dispose();
+                _EffectiveCellStyles = null;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetFilterPanelType
+
+        internal FilterEditType GetFilterPanelType()
+        {
+            FilterEditType filterType = FilterEditType;
+            
+            if (filterType == FilterEditType.Auto)
+            {
+                IGridCellEditControl editor = EditControl;
+
+                if (editor != null)
+                {
+                    if (editor is ComboBox)
+                    {
+                        filterType = FilterEditType.ComboBox;
+                    }
+                    else
+                    {
+                        if (editor.EditorValueType == typeof(bool))
+                            filterType = FilterEditType.CheckBox;
+
+                        else if (editor.EditorValueType == typeof(DateTime))
+                            filterType = FilterEditType.DateTime;
+
+                        else
+                            filterType = FilterEditType.TextBox;
+                    }
+                }
+                else
+                {
+                    filterType = FilterEditType.TextBox;
+                }
+            }
+
+            SuperGrid.DoGetFilterEditTypeEvent(this, ref filterType);
+
+            return (filterType);
+        }
+
+        #endregion
+
+        #region Markup support
+
+        private void MarkupHeaderTextChanged()
+        {
+            if (_HeaderTextMarkup != null)
+                _HeaderTextMarkup.HyperLinkClick -= HeaderTextMarkupLinkClick;
+
+            _HeaderTextMarkup = null;
+
+            if (EnableHeaderMarkup == true)
+            {
+                if (MarkupParser.IsMarkup(_HeaderText) == true)
+                {
+                    _HeaderTextMarkup = MarkupParser.Parse(_HeaderText);
+
+                    if (_HeaderTextMarkup != null)
+                        _HeaderTextMarkup.HyperLinkClick += HeaderTextMarkupLinkClick;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Occurs when a header text markup link is clicked
+        /// </summary>
+        protected virtual void HeaderTextMarkupLinkClick(object sender, EventArgs e)
+        {
+            HyperLink link = sender as HyperLink;
+
+            SuperGrid.DoColumnHeaderMarkupLinkClickEvent(this, link);
+
+            GridPanel.ColumnHeader.InvalidateHeader(GridPanel, this);
+        }
+
+        /// <summary>
+        /// Gets plain Header text without text-markup (if text-markup is used in Text)
+        /// </summary>
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public string PlainHeaderText
+        {
+            get { return (_HeaderTextMarkup != null ? _HeaderTextMarkup.PlainText : _HeaderText); }
+        }
+
+        #endregion
+
+        #region ActivateFilterPopup
+
+        ///<summary>
+        ///Activates the column's FilterPopup
+        ///</summary>
+        public void ActivateFilterPopup()
+        {
+            GridPanel panel = GridPanel;
+
+            if (panel != null)
+                panel.ColumnHeader.ActivateFilterPopup(panel, this);
+        }
+
+        #endregion
+
+        #region DeactivateFilterPopup
+
+        ///<summary>
+        ///Deactivates the column's FilterPopup
+        ///</summary>
+        public void DeactivateFilterPopup()
+        {
+            GridPanel panel = GridPanel;
+
+            if (panel != null)
+                panel.ColumnHeader.DeactivateFilterPopup(panel, this);
+        }
+
+        #endregion
+
+        #region ToString
+
+        /// <summary>
+        /// ToString
+        /// </summary>
+        /// <returns></returns>
+        public override string ToString()
+        {
+            string s = base.ToString();
+
+            string t = GetHeaderText();
+
+            if (String.IsNullOrEmpty(t) == false)
+                s += ": (\"" + t + "\")";
+
+            return (s);
+        }
+
+        #endregion
+
+        #region ColumnStates
+
+        [Flags]
+        private enum Cs
+        {
+            AdjustSortImagePositionByMargin = (1 << 0),
+            AllowEdit = (1 << 1),
+
+            EnableGroupHeaderMarkup = (1 << 2),
+            EnableHeaderMarkup = (1 << 3),
+
+            FilterAutoScan = (1 << 4),
+            FilterError = (1 << 5),
+            FilterExprUsesName = (1 << 6),
+
+            MarkRowDirtyOnCellValueChange = (1 << 7),
+
+            NeedsFilterScan = (1 << 8),
+            NeedsResized = (1 << 9),
+
+            Processed = (1 << 10),
+
+            ReadOnly = (1 << 11),
+            Selected = (1 << 12),
+
+            InfoImageOverlay = (1 << 13),
+        }
+
+        #endregion
+
+        #region IDisposable
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        public void Dispose()
+        {
+            CellStyles = null;
+            HeaderStyles = null;
+            FilterRowStyles = null;
+
+            if (_HeaderTextMarkup != null)
+                _HeaderTextMarkup.HyperLinkClick -= HeaderTextMarkupLinkClick;
+
+            ClearEffectiveStyles();
+        }
+
+        #endregion
+    }
+
+    #region enums
+
+    #region ColumnAutoSizeMode
+
+    /// <summary>
+    /// Defines columns auto-sizing mode.
+    /// </summary>
+    public enum ColumnAutoSizeMode
+    {
+        /// <summary>
+        /// The sizing behavior of the column is inherited
+        /// from the GridPanel.AutoSizeColumnsMode property.
+        /// </summary>
+        NotSet,
+
+        /// <summary>
+        /// Auto-sizing does not take place.
+        /// </summary>
+        None,
+
+        /// <summary>
+        /// The column width adjusts so that the widths of all columns
+        /// exactly fills the display area of the control, requiring
+        /// horizontal scrolling only to keep column widths above the
+        /// ColumnHeader.MinimumWidth property values. Relative column widths
+        /// are determined by the relative Column.FillWeight property values.
+        /// </summary>
+        Fill,
+
+        /// <summary>
+        /// The column width adjusts to fit the contents of all cells in the column
+        /// that are in rows currently displayed on screen, excluding the header cell. 
+        /// </summary>
+        DisplayedCellsExceptHeader,
+
+        /// <summary>
+        /// The column width adjusts to fit the contents of all cells in the column
+        /// that are in rows currently displayed on screen, including the header cell. 
+        /// </summary>
+        DisplayedCells,
+
+        /// <summary>
+        /// The column width adjusts to fit the contents of the column header cell. 
+        /// </summary>
+        ColumnHeader,
+
+        /// <summary>
+        /// The column width adjusts to fit the contents of all
+        /// cells in the column, excluding the header cell. 
+        /// </summary>
+        AllCellsExceptHeader,
+
+        /// <summary>
+        /// The column width adjusts to fit the contents of all
+        /// cells in the column, including the header cell. 
+        /// </summary>
+        AllCells
+    }
+
+    #endregion
+
+    #region ColumnAutoMode
+
+    ///<summary>
+    /// Indicates the column sorting mode
+    ///</summary>
+    public enum ColumnSortMode
+    {
+        ///<summary>
+        /// No sorting permitted
+        ///</summary>
+        None,
+
+        ///<summary>
+        /// Can participate in Single column sorts only
+        ///</summary>
+        Single,
+
+        ///<summary>
+        /// Can participate in Single and Multiple column sorts
+        ///</summary>
+        Multiple,
+    }
+
+    #endregion
+
+    #region ColumnResizeMode
+
+    ///<summary>
+    /// ColumnResizeMode
+    ///</summary>
+    public enum ColumnResizeMode
+    {
+        ///<summary>
+        /// The element cannot be resized by the user
+        ///</summary>
+        None,
+
+        ///<summary>
+        /// The size of the element plus that of its adjacent element
+        /// is changed so that the total size of the elements is maintained
+        ///</summary>
+        MaintainTotalWidth,
+
+        ///<summary>
+        /// When the element size is changed, all following
+        /// elements are offset accordingly
+        ///</summary>
+        MoveFollowingElements,
+    }
+
+    #endregion
+
+    #region SortIndicator
+
+    ///<summary>
+    /// SortIndicator
+    ///</summary>
+    public enum SortIndicator
+    {
+        ///<summary>
+        /// No indicator is displayed
+        ///</summary>
+        None,
+
+        ///<summary>
+        /// Ascending indicator is displayed
+        ///</summary>
+        Ascending,
+
+        ///<summary>
+        /// Descending indicator is displayed
+        ///</summary>
+        Descending,
+
+        ///<summary>
+        /// Set automatically based on current
+        /// column sort criteria
+        ///</summary>
+        Auto,
+    }
+
+    #endregion
+
+    #region RowScope
+
+    ///<summary>
+    /// RowScope
+    ///</summary>
+    public enum RowScope
+    {
+        ///<summary>
+        /// All Rows
+        ///</summary>
+        AllRows,
+
+        ///<summary>
+        /// Only On Screen rows
+        ///</summary>
+        OnScreenRows,
+    }
+
+    #endregion
+
+    #endregion
+
+    #region EditTypeConverter
+
+    ///<summary>
+    /// EditTypeConverter
+    ///</summary>
+    public class EditTypeConverter : TypeConverter
+    {
+        ///<summary>
+        /// ConvertTo
+        ///</summary>
+        ///<param name="context"></param>
+        ///<param name="culture"></param>
+        ///<param name="value"></param>
+        ///<param name="destinationType"></param>
+        ///<returns></returns>
+        public override object ConvertTo(
+            ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+        {
+            if (destinationType == typeof(string))
+            {
+                Type type = value as Type;
+
+                if (type != null)
+                    return (type.Name);
+            }
+
+            return (base.ConvertTo(context, culture, value, destinationType));
+        }
+    }
+
+    #endregion
+
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridColumnCollection.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridColumnCollection.cs
new file mode 100644
index 00000000..9078ab00
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridColumnCollection.cs	
@@ -0,0 +1,787 @@
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.Drawing.Design;
+
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    /// <summary>
+    /// Defines the collection of grid columns
+    /// </summary>
+    [Editor("DevComponents.SuperGrid.Design.GridColumnCollectionEditor, DevComponents.SuperGrid.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=26d81176cfa2b486", typeof(UITypeEditor))]
+    public class GridColumnCollection : CollectionBase
+    {
+        #region Events
+
+        /// <summary>
+        /// Occurs when the collection has changed
+        /// </summary>
+        [Description("Occurs when collection has changed.")]
+        public CollectionChangeEventHandler CollectionChanged;
+
+        #endregion
+
+        #region Private Variables
+
+        private GridElement _ParentItem;
+        private int[] _DisplayIndexMap;
+        private bool _IsDisplayIndexValid;
+
+        #endregion
+
+        #region Public properties
+
+        #region FirstSelectableColumn
+
+        /// <summary>
+        /// Gets reference to first selectable column
+        /// or null if there is no first selectable column.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public GridColumn FirstSelectableColumn
+        {
+            get
+            {
+                int[] displayMap = DisplayIndexMap;
+
+                for (int i = 0; i < displayMap.Length; i++)
+                {
+                    GridColumn column = this[displayMap[i]];
+
+                    if (column.Visible == true && column.AllowSelection == true)
+                        return (column);
+                }
+
+                return (null);
+            }
+        }
+
+        #endregion
+
+        #region FirstVisibleColumn
+
+        /// <summary>
+        /// Gets reference to first visible column
+        /// or null if there is no first visible column.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public GridColumn FirstVisibleColumn
+        {
+            get
+            {
+                int[] displayMap = DisplayIndexMap;
+
+                for (int i = 0; i < displayMap.Length; i++)
+                {
+                    if (this[displayMap[i]].Visible)
+                        return (this[displayMap[i]]);
+                }
+
+                return (null);
+            }
+        }
+
+        #endregion
+
+        #region Index indexer
+
+        /// <summary>
+        /// Returns reference to the object in collection based on it's index.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public GridColumn this[int index]
+        {
+            get { return (GridColumn)(List[index]); }
+            set { List[index] = value; }
+        }
+
+        #endregion
+
+        #region Name indexer
+
+        ///<summary>
+        /// Name indexer
+        ///</summary>
+        ///<param name="name"></param>
+        ///<exception cref="Exception"></exception>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public GridColumn this[string name]
+        {
+            get
+            {
+                int index = FindIndexByName(name);
+
+                return (index >= 0 ? this[index] : null);
+            }
+
+            set
+            {
+                int index = FindIndexByName(name);
+
+                if (index < 0)
+                    throw new Exception("Column Name not defined (" + name + ").");
+
+                List[index] = value;
+            }
+        }
+
+        #region FindIndexByName
+
+        private int FindIndexByName(string name)
+        {
+            for (int i=0; i<List.Count; i++)
+            {
+                GridColumn item = (GridColumn)List[i];
+
+                if (name != null)
+                    name = name.ToUpper();
+
+                if (item.Name != null && item.Name.ToUpper().Equals(name))
+                    return (i);
+            }
+
+            return (-1);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region LastSelectableColumn
+
+        /// <summary>
+        /// Gets reference to last selectable column
+        /// or null if there is no last selectable column.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public GridColumn LastSelectableColumn
+        {
+            get
+            {
+                int[] displayMap = DisplayIndexMap;
+
+                for (int i = displayMap.Length - 1; i >= 0; i--)
+                {
+                    GridColumn column = this[displayMap[i]];
+
+                    if (column.Visible == true && column.AllowSelection == true)
+                        return (column);
+                }
+
+                return (null);
+            }
+        }
+
+        #endregion
+
+        #region LastVisibleColumn
+
+        /// <summary>
+        /// Gets reference to last visible column
+        /// or null if there is no last visible column.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public GridColumn LastVisibleColumn
+        {
+            get
+            {
+                int[] displayMap = DisplayIndexMap;
+
+                for (int i = displayMap.Length - 1; i >= 0; i--)
+                {
+                    if (this[displayMap[i]].Visible)
+                        return (this[displayMap[i]]);
+                }
+
+                return (null);
+            }
+        }
+
+        #endregion
+
+        #region ParentItem
+
+        /// <summary>
+        /// Gets or sets the node this collection is associated with.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public GridElement ParentItem
+        {
+            get { return _ParentItem; }
+
+            internal set
+            {
+            	 _ParentItem = value;
+
+                 OnParentItemChanged();
+            }
+        }
+
+        private void OnParentItemChanged()
+        {
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Add
+
+        /// <summary>
+        /// Adds new object to the collection.
+        /// </summary>
+        /// <param name="value">Object to add.</param>
+        /// <returns>Index of newly added object.</returns>
+        public int Add(GridColumn value)
+        {
+            value.ColumnIndex = List.Add(value);
+
+            return (value.ColumnIndex);
+        }
+
+        #endregion
+
+        #region Insert
+
+        /// <summary>
+        /// Inserts new object into the collection.
+        /// </summary>
+        /// <param name="index">Position of the object.</param>
+        /// <param name="value">Object to insert.</param>
+        public void Insert(int index, GridColumn value)
+        {
+            List.Insert(index, value);
+
+            for (int i = 0; i < Count; i++)
+                ((GridColumn)List[i]).ColumnIndex = i;
+        }
+
+        #endregion
+
+        #region IndexOf
+
+        /// <summary>
+        /// Returns index of the object inside of the collection.
+        /// </summary>
+        /// <param name="value">Reference to the object.</param>
+        /// <returns>Index of the object.</returns>
+        public int IndexOf(GridColumn value)
+        {
+            return (List.IndexOf(value));
+        }
+
+        #endregion
+
+        #region Contains
+
+        /// <summary>
+        /// Returns whether collection contains specified object.
+        /// </summary>
+        /// <param name="value">Object to look for.</param>
+        /// <returns>true if object is part of the collection, otherwise false.</returns>
+        public bool Contains(GridColumn value)
+        {
+            return (List.Contains(value));
+        }
+
+        /// <summary>
+        /// Returns whether collection contains specified object.
+        /// </summary>
+        /// <param name="name">Name of the object to look for.</param>
+        /// <returns>true if object is part of the collection, otherwise false.</returns>
+        public bool Contains(string name)
+        {
+            foreach (GridColumn column in List)
+            {
+                if (column.Name.Equals(name) == true)
+                    return (true);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region Remove
+
+        /// <summary>
+        /// Removes specified object from the collection.
+        /// </summary>
+        /// <param name="value"></param>
+        public void Remove(GridColumn value)
+        {
+            List.Remove(value);
+
+            for (int i = 0; i < Count; i++)
+                ((GridColumn)List[i]).ColumnIndex = i;
+        }
+
+        #endregion
+
+        #region OnRemoveComplete
+
+        /// <summary>
+        /// Called when remove of an item is completed.
+        /// </summary>
+        /// <param name="index">Index of removed item</param>
+        /// <param name="value">Removed item.</param>
+        protected override void OnRemoveComplete(int index, object value)
+        {
+            if (value is GridColumn)
+            {
+                GridColumn column = (GridColumn)value;
+                GridPanel panel = column.GridPanel;
+
+                ResetColumn(panel, column);
+            }
+
+            OnCollectionChanged(CollectionChangeAction.Remove, value);
+
+            base.OnRemoveComplete(index, value);
+        }
+
+        #endregion
+
+        #region Clear
+
+        /// <summary>
+        /// Clears all objects from the collection.
+        /// </summary>
+        public new void Clear()
+        {
+            foreach (GridColumn column in this)
+                ResetColumn(column.GridPanel, column);
+
+            List.Clear();
+        }
+
+        #endregion
+
+        #region OnClearComplete
+
+        /// <summary>
+        /// OnClearComplete
+        /// </summary>
+        protected override void OnClearComplete()
+        {
+            InvalidateDisplayIndexes();
+            InvalidateLayout();
+
+            base.OnClearComplete();
+        }
+
+        #endregion
+
+        #region ResetColumn
+
+        private void ResetColumn(GridPanel panel, GridColumn column)
+        {
+            column.DisplayIndexChanged -= ColumnDisplayIndexChanged;
+
+            if (panel.DataSource != null)
+                panel.DataBinder.DataResetCount++;
+
+            GridCell cell = column.SuperGrid.ActiveElement as GridCell;
+
+            if (cell != null)
+            {
+                if (cell.ColumnIndex == column.ColumnIndex)
+                    column.SuperGrid.ActiveElement = null;
+            }
+
+            if (panel.SortColumns.Contains(column))
+                panel.SortColumns.Remove(column);
+
+            if (panel.GroupColumns.Contains(column))
+                panel.GroupColumns.Remove(column);
+
+            FilterPanel fp = column.SuperGrid.ActiveFilterPanel;
+
+            if (fp != null && fp.GridColumn == column)
+                fp.EndEdit();
+        }
+
+        #endregion
+
+        #region OnInsertComplete
+
+        /// <summary>
+        /// Called when insertion of an item is completed.
+        /// </summary>
+        /// <param name="index">Insert index.</param>
+        /// <param name="value">Inserted item.</param>
+        protected override void OnInsertComplete(int index, object value)
+        {
+            if (value is GridColumn)
+            {
+                GridColumn column = (GridColumn)value;
+
+                if (column.Parent != null && column.Parent != _ParentItem)
+                    throw new Exception("Column is already a member of another Column collection.");
+
+                column.DisplayIndexChanged += ColumnDisplayIndexChanged;
+
+                column.Parent = _ParentItem;
+            }
+
+            OnCollectionChanged(CollectionChangeAction.Add, value);
+
+            base.OnInsertComplete(index, value);
+        }
+
+        #endregion
+
+        #region OnCollectionChanged
+
+        private void OnCollectionChanged(
+            CollectionChangeAction action, object value)
+        {
+            for (int i = 0; i < Count; i++)
+                ((GridColumn)List[i]).ColumnIndex = i;
+
+            if (action == CollectionChangeAction.Remove)
+            {
+                GridColumn rcol = (GridColumn)value;
+                GridPanel panel = rcol.GridPanel;
+
+                if (rcol.DisplayIndex >= 0)
+                {
+                    foreach (GridColumn col in panel.Columns)
+                    {
+                        if (col.DisplayIndex > rcol.DisplayIndex)
+                            col.DisplayIndex--;
+                    }
+                }
+            }
+
+            InvalidateDisplayIndexes();
+            InvalidateLayout();
+
+            if (CollectionChanged != null)
+            {
+                CollectionChangeEventArgs e = new
+                    CollectionChangeEventArgs(action, value);
+
+                CollectionChanged(this, e);
+            }
+        }
+
+        #endregion
+
+        #region ColumnDisplayIndexChanged
+
+        private void ColumnDisplayIndexChanged(object sender, EventArgs e)
+        {
+            InvalidateDisplayIndexes();
+            InvalidateLayout();
+        }
+
+        #endregion
+
+        #region InvalidateDisplayIndexes
+
+        /// <summary>
+        /// Invalidates the display indexes and
+        /// causes them to be re-evaluated on next layout.
+        /// </summary>
+        public void InvalidateDisplayIndexes()
+        {
+            _IsDisplayIndexValid = false;
+        }
+
+        #endregion
+
+        #region InvalidateLayout
+
+        private void InvalidateLayout()
+        {
+            if (_ParentItem != null)
+            {
+                _ParentItem.InvalidateLayout();
+
+                if (_ParentItem.SuperGrid != null)
+                {
+                    _ParentItem.SuperGrid.NeedMergeLayout = true;
+                    _ParentItem.SuperGrid.DisplayedMergeLayoutCount++;
+                }
+            }
+        }
+
+        #endregion
+
+        #region CopyTo
+
+        /// <summary>
+        /// Copies collection into the specified array.
+        /// </summary>
+        /// <param name="array">Array to copy collection to.</param>
+        /// <param name="index">Starting index.</param>
+        public void CopyTo(GridColumn[] array, int index)
+        {
+            List.CopyTo(array, index);
+        }
+
+        /// <summary>
+        /// Copies contained items to the ColumnHeader array.
+        /// </summary>
+        /// <param name="array">Array to copy to.</param>
+        internal void CopyTo(GridColumn[] array)
+        {
+            List.CopyTo(array, 0);
+        }
+
+        #endregion
+
+        #region OnClear
+
+        /// <summary>
+        /// Called when collection is cleared.
+        /// </summary>
+        protected override void OnClear()
+        {
+            if (Count > 0)
+            {
+                GridPanel panel = this[0].Parent as GridPanel;
+
+                if (panel != null)
+                {
+                    panel.SuperGrid.ActiveElement = null;
+
+                    foreach (GridElement item in panel.Rows)
+                    {
+                        GridRow row = item as GridRow;
+
+                        if (row != null)
+                        {
+                            foreach (GridCell cell in row.Cells)
+                            {
+                                cell.EditControl = null;
+                                cell.RenderControl = null;
+                            }
+                        }
+                    }
+                }
+            }
+
+            foreach (GridColumn item in this)
+            {
+                item.EditControl = null;
+                item.RenderControl = null;
+            }
+
+            base.OnClear();
+        }
+
+        #endregion
+
+        #region DisplayIndexMap
+
+        /// <summary>
+        /// A map of display index (key) to index in the column collection
+        /// (value). Used to quickly find a column from its display index.
+        /// </summary>
+        internal int[] DisplayIndexMap
+        {
+            get
+            {
+                if (!_IsDisplayIndexValid)
+                    UpdateDisplayIndexMap();
+
+                return (_DisplayIndexMap);
+            }
+        }
+
+        #endregion
+
+        #region GetDisplayIndex
+
+        /// <summary>
+        /// Gets the display index for specified column.
+        /// </summary>
+        /// <param name="column">Column that is part of ColumnHeaderCollection</param>
+        /// <returns>Display index or -1 column is not part of this collection.</returns>
+        public int GetDisplayIndex(GridColumn column)
+        {
+            return (GetDisplayIndex(IndexOf(column)));
+        }
+
+        ///<summary>
+        /// Gets the display index for specified column.
+        ///</summary>
+        ///<param name="index">Column index</param>
+        ///<returns>Display index or -1 column is not part of this collection.</returns>
+        public int GetDisplayIndex(int index)
+        {
+            UpdateDisplayIndexMap();
+
+            for (int i = 0; i < _DisplayIndexMap.Length; i++)
+            {
+                if (_DisplayIndexMap[i] == index)
+                    return (i);
+            }
+
+            return (-1);
+        }
+
+        #endregion
+
+        #region ColumnAtDisplayIndex
+
+        /// <summary>
+        /// Returns the column that is displayed at specified display index.
+        /// </summary>
+        /// <param name="displayIndex">0 based display index.</param>
+        /// <returns>ColumnHeader</returns>
+        public GridColumn ColumnAtDisplayIndex(int displayIndex)
+        {
+            UpdateDisplayIndexMap();
+
+            return (this[_DisplayIndexMap[displayIndex]]);
+        }
+
+        #endregion
+
+        #region UpdateDisplayIndexMap
+
+        private void UpdateDisplayIndexMap()
+        {
+            if (_IsDisplayIndexValid == false)
+            {
+                _IsDisplayIndexValid = true;
+
+                _DisplayIndexMap = new int[Count];
+
+                for (int i = 0; i < Count; i++)
+                    _DisplayIndexMap[i] = -1;
+
+                for (int i = 0; i < Count; i++)
+                {
+                    int di = this[i].DisplayIndex;
+
+                    if (di != -1)
+                        AddIndexToMap(i, di);
+                }
+
+                int n = 0;
+
+                for (int i = 0; i < Count; i++)
+                {
+                    int di = this[i].DisplayIndex;
+
+                    if (di == -1)
+                        AddIndexToMap(i, n++);
+                }
+            }
+        }
+
+        private void AddIndexToMap(int i, int di)
+        {
+            for (int j = 0; j < Count; j++)
+            {
+                int n = (di + j) % Count;
+
+                if (_DisplayIndexMap[n] == -1)
+                {
+                    _DisplayIndexMap[n] = i;
+                    break;
+                }
+            }
+        }
+
+        #endregion
+
+        #region GetNextVisibleColumn
+
+        /// <summary>
+        /// Gets reference to next visible column
+        /// or null if there is no next visible column
+        /// </summary>
+        public GridColumn GetNextVisibleColumn(GridColumn column)
+        {
+            return (GetNextVisibleColumn(GetDisplayIndex(column)));
+        }
+
+        internal GridColumn GetNextVisibleColumn(int displayIndex)
+        {
+            int[] displayMap = DisplayIndexMap;
+
+            while (++displayIndex < Count)
+            {
+                if (this[displayMap[displayIndex]].Visible)
+                    return (this[displayMap[displayIndex]]);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetPrevVisibleColumn
+
+        /// <summary>
+        /// Gets reference to previous visible column
+        /// or null if there is no last visible previous column
+        /// </summary>
+        public GridColumn GetPrevVisibleColumn(GridColumn column)
+        {
+            return (GetPrevVisibleColumn(GetDisplayIndex(column)));
+        }
+
+        internal GridColumn GetPrevVisibleColumn(int displayIndex)
+        {
+            int[] displayMap = DisplayIndexMap;
+
+            while (--displayIndex >= 0)
+            {
+                if (this[displayMap[displayIndex]].Visible)
+                    return (this[displayMap[displayIndex]]);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetLastVisibleFrozenColumn
+
+        /// <summary>
+        /// Gets reference to the last visible frozen column
+        /// or null if there is none
+        /// </summary>
+        public GridColumn GetLastVisibleFrozenColumn()
+        {
+            int[] displayMap = DisplayIndexMap;
+
+            if (displayMap.Length > 0)
+            {
+                GridPanel panel = this[displayMap[0]].GridPanel;
+
+                if (panel != null &&
+                    panel.FrozenColumnCount > 0 && panel.IsSubPanel == false)
+                {
+                    for (int i = displayMap.Length - 1; i >= 0; i--)
+                    {
+                        GridColumn column = this[displayMap[i]];
+
+                        if (column.Visible == true)
+                        {
+                            if (column.IsHFrozen == true)
+                                return (column);
+                        }
+                    }
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridColumnGroupHeader.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridColumnGroupHeader.cs
new file mode 100644
index 00000000..34fd8148
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridColumnGroupHeader.cs	
@@ -0,0 +1,1121 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using DevComponents.DotNetBar.SuperGrid.Primitives;
+using DevComponents.DotNetBar.SuperGrid.Style;
+using DevComponents.SuperGrid.TextMarkup;
+
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    ///<summary>
+    ///ColumnGroupHeaderCollection
+    ///</summary>
+    [Editor("DevComponents.SuperGrid.Design.ColumnGroupHeaderCollectionEditor, DevComponents.SuperGrid.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=26d81176cfa2b486", typeof(UITypeEditor))]
+    public class ColumnGroupHeaderCollection : CustomCollection<ColumnGroupHeader>
+    {
+        #region Events
+
+        #region HeaderMarkupLinkClick
+
+        internal event EventHandler<GroupHeaderMarkupLinkClickEventArgs> GroupHeaderMarkupLinkClick;
+
+        #endregion
+
+        #endregion
+
+        #region Private variables
+
+        private object _Parent;
+
+        #endregion
+
+        #region Public properties
+
+        #region Name indexer
+
+        ///<summary>
+        /// Name indexer
+        ///</summary>
+        ///<param name="name"></param>
+        ///<exception cref="Exception"></exception>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public ColumnGroupHeader this[string name]
+        {
+            get
+            {
+                int index = FindIndexByName(name);
+
+                return (index >= 0 ? this[index] : null);
+            }
+
+            set
+            {
+                int index = FindIndexByName(name);
+
+                if (index < 0)
+                    throw new Exception("Column Name not defined (" + name + ").");
+
+                Items[index] = value;
+            }
+        }
+
+        #region FindIndexByName
+
+        private int FindIndexByName(string name)
+        {
+            for (int i = 0; i < Items.Count; i++)
+            {
+                ColumnGroupHeader item = Items[i];
+
+                if (name != null)
+                    name = name.ToUpper();
+
+                if (item.Name != null && item.Name.ToUpper().Equals(name))
+                    return (i);
+            }
+
+            return (-1);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Parent
+
+        ///<summary>
+        /// Parent
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public object Parent
+        {
+            get { return (_Parent); }
+            internal set { _Parent = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region OnCollectionChanged
+
+        /// <summary>
+        /// Handles CollectionChange notifications
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnCollectionChanged(NotifyCollectionChangedEventArgs e)
+        {
+            switch (e.Action)
+            {
+                case NotifyCollectionChangedAction.Add:
+                    foreach (INotifyPropertyChanged newValue in e.NewItems)
+                    {
+                        ItemChangeHandler(null, newValue);
+                        PropertyChangeHandler(null, newValue);
+                    }
+                    break;
+
+                case NotifyCollectionChangedAction.Remove:
+                    foreach (INotifyPropertyChanged oldValue in e.OldItems)
+                    {
+                        ItemChangeHandler(null, oldValue);
+                        PropertyChangeHandler(null, oldValue);
+                    }
+                    break;
+
+                case NotifyCollectionChangedAction.Replace:
+                    for (int i = 0; i < e.OldItems.Count; i++)
+                    {
+                        ItemChangeHandler(e.OldItems[i], e.NewItems[i]);
+
+                        PropertyChangeHandler((INotifyPropertyChanged)e.OldItems[i],
+                                              (INotifyPropertyChanged)e.NewItems[i]);
+                    }
+                    break;
+
+                case NotifyCollectionChangedAction.Reset:
+                    for (int i = 0; i < Items.Count; i++)
+                    {
+                        ItemChangeHandler(Items[i], null);
+                        PropertyChangeHandler(Items[i], null);
+                    }
+                    break;
+            }
+
+            base.OnCollectionChanged(e);
+        }
+
+        #endregion
+
+        #region ItemChangeHandler
+
+        private void ItemChangeHandler(object oldValue, object newValue)
+        {
+            ColumnGroupHeader cgh = oldValue as ColumnGroupHeader;
+
+            if (cgh != null)
+            {
+                cgh.Collection = null;
+                cgh.GroupHeaderMarkupLinkClick -= CGroupHeaderMarkupLinkClick;
+            }
+
+            cgh = newValue as ColumnGroupHeader;
+
+            if (cgh != null)
+            {
+                cgh.Collection = this;
+                cgh.GroupHeaderMarkupLinkClick += CGroupHeaderMarkupLinkClick;
+            }
+        }
+
+        #endregion
+
+        #region CGroupHeaderMarkupLinkClick
+
+        void CGroupHeaderMarkupLinkClick(object sender, GroupHeaderMarkupLinkClickEventArgs e)
+        {
+            if (GroupHeaderMarkupLinkClick != null)
+                GroupHeaderMarkupLinkClick(sender, e);
+        }
+
+        #endregion
+
+        #region PropertyChangeHandler
+
+        private void PropertyChangeHandler(
+            INotifyPropertyChanged oldValue, INotifyPropertyChanged newValue)
+        {
+            if (oldValue != null)
+                oldValue.PropertyChanged -= PropertyValueChanged;
+
+            if (newValue != null)
+                newValue.PropertyChanged += PropertyValueChanged;
+        }
+
+        #endregion
+
+        #region PropertyValueChanged
+
+        /// <summary>
+        /// Occurs when one of element visual styles has property changes.
+        /// Default implementation invalidates visual appearance of element.
+        /// </summary>
+        /// <param name="sender">VisualStyle that changed.</param>
+        /// <param name="e">Event arguments.</param>
+        protected virtual void PropertyValueChanged(object sender, PropertyChangedEventArgs e)
+        {
+            OnPropertyChanged(e);
+        }
+
+        #endregion
+
+        #region INotifyPropertyChanged Members
+
+        /// <summary>
+        /// Default PropertyChanged processing
+        /// </summary>
+        /// <param name="s"></param>
+        /// <param name="changeType">invalidate</param>
+        protected void OnPropertyChangedEx(string s, VisualChangeType changeType)
+        {
+            OnPropertyChanged(new VisualPropertyChangedEventArgs(s, changeType));
+        }
+
+        #endregion
+    }
+
+    ///<summary>
+    ///Column GroupHeader
+    ///</summary>
+    public class ColumnGroupHeader : INotifyPropertyChanged, IDisposable
+    {
+        #region Events
+
+        #region HeaderMarkupLinkClick
+
+        internal event EventHandler<GroupHeaderMarkupLinkClickEventArgs> GroupHeaderMarkupLinkClick;
+
+        #endregion
+
+        #endregion
+
+        #region Private variables
+
+        private int _StartDisplayIndex = -1;
+        private int _EndDisplayIndex = -1;
+
+        private int _RowHeight;
+        private int _MinRowHeight;
+
+        private int _StyleUpdateCount;
+
+        private ColumnHeaderVisualStyles _HeaderStyles;
+        private ColumnHeaderVisualStyles _EffectiveStyles;
+
+        private ColumnGroupHeaderCollection _Collection;
+        private ColumnGroupHeaderCollection _GroupHeaders;
+
+        private string _Name;
+        private string _ToolTip;
+        private string _HeaderText;
+
+        private BodyElement _HeaderTextMarkup;
+
+        private Size _Size;
+        private Size _ContentSize;
+        private Size _HeaderTextSize;
+        private Rectangle _BoundsRelative;
+
+        private Shs _States;
+        private Tbool _ShowColumnHeaders = Tbool.NotSet;
+        private Tbool _AutoApplyGroupColors = Tbool.NotSet;
+
+        #endregion
+
+        ///<summary>
+        ///ColumnGroupHeader
+        ///</summary>
+        public ColumnGroupHeader()
+        {
+            AllowSelection = true;
+            Visible = true;
+        }
+
+        #region Public properties
+
+        #region AllowSelection
+
+        /// <summary>
+        /// Gets or sets whether the element can be selected
+        /// </summary>
+        [DefaultValue(true), Category("Behavior")]
+        [Description("Indicates whether the element can be selected")]
+        public bool AllowSelection
+        {
+            get { return (TestState(Shs.AllowSelection)); }
+
+            set
+            {
+                if (AllowSelection != value)
+                {
+                    SetState(Shs.AllowSelection, value);
+
+                    OnPropertyChangedEx("AllowSelection", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region AutoApplyGroupColors
+
+        ///<summary>
+        /// Gets or sets whether Group Header color properties
+        /// (ie. Background and TextColor) are automatically
+        /// applied to group Column Headers
+        ///</summary>
+        [DefaultValue(Tbool.NotSet), Category("Appearance")]
+        [Description("Indicates whether Group Header color properties (ie. Background and TextColor) are automatically applied to group Column Headers.")]
+        public Tbool AutoApplyGroupColors
+        {
+            get { return (_AutoApplyGroupColors); }
+
+            set
+            {
+                if (_AutoApplyGroupColors != value)
+                {
+                    _AutoApplyGroupColors = value;
+
+                    OnPropertyChangedEx("AutoApplyGroupColors", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region Collection
+
+        ///<summary>
+        ///The collection the item is contained within
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public ColumnGroupHeaderCollection Collection
+        {
+            get { return (_Collection); }
+            internal set { _Collection = value; }
+        }
+
+        #endregion
+
+        #region DisplayCount
+
+        ///<summary>
+        /// Gets the count of displayed columns
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public int DisplayCount
+        {
+            get { return (_EndDisplayIndex - _StartDisplayIndex + 1); }
+        }
+
+        #endregion
+
+        #region EnableHeaderMarkup
+
+        /// <summary>
+        /// Gets or sets whether text-markup support is enabled for the HeaderText
+        /// </summary>
+        [DefaultValue(false), Category("Appearance")]
+        [Description("Indicates whether text-markup support is enabled for the HeaderText.")]
+        public bool EnableHeaderMarkup
+        {
+            get { return (TestState(Shs.EnableHeaderMarkup)); }
+
+            set
+            {
+                if (EnableHeaderMarkup != value)
+                {
+                    SetState(Shs.EnableHeaderMarkup, value);
+
+                    MarkupHeaderTextChanged();
+
+                    OnPropertyChangedEx("EnableHeaderMarkup", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region EndDisplayIndex
+
+        ///<summary>
+        /// Gets or sets the end column display index
+        ///</summary>
+        [DefaultValue(0), Category("Appearance")]
+        [Description("Indicates the end column display index (inclusive)")]
+        public int EndDisplayIndex
+        {
+            get { return ((_EndDisplayIndex < 0) ? 0 : _EndDisplayIndex); }
+
+            set
+            {
+                if (_EndDisplayIndex != value)
+                {
+                    _EndDisplayIndex = value;
+
+                    OnPropertyChangedEx("EndDisplayIndex", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region GroupHeaders
+
+        ///<summary>
+        ///Gets or sets the GroupHeaders contained under the given header
+        ///</summary>
+        [DefaultValue(null), Category("Appearance")]
+        [Description("Indicates the GroupHeaders contained under the given header.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ColumnGroupHeaderCollection GroupHeaders
+        {
+            get
+            {
+                if (_GroupHeaders == null)
+                {
+                    _GroupHeaders = new ColumnGroupHeaderCollection();
+                    _GroupHeaders.Parent = this;
+
+                    PropertyChangeHandler(null, _GroupHeaders);
+                    GroupCollectionChangeHandler(null, _GroupHeaders);
+                }
+
+                return (_GroupHeaders);
+            }
+
+            set
+            {
+                if (_GroupHeaders != value)
+                {
+                    PropertyChangeHandler(_GroupHeaders, value);
+                    GroupCollectionChangeHandler(_GroupHeaders, value);
+
+                    _GroupHeaders = value;
+
+                    OnPropertyChangedEx("GroupHeaders", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #region _GroupHeaders
+
+        void GroupHeadersCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            ColumnGroupHeaderCollection cgc = sender as ColumnGroupHeaderCollection;
+
+            if (cgc != null)
+            {
+                if (e.Action == NotifyCollectionChangedAction.Add)
+                {
+                    ColumnGroupHeader parent = cgc.Parent as ColumnGroupHeader;
+
+                    if (parent != null)
+                    {
+                        foreach (ColumnGroupHeader cgh in e.NewItems)
+                        {
+                            if (parent._StartDisplayIndex < 0 || cgh.StartDisplayIndex < parent.StartDisplayIndex)
+                                parent.StartDisplayIndex = cgh.StartDisplayIndex;
+
+                            if (parent._EndDisplayIndex < 0 || cgh.EndDisplayIndex > parent.EndDisplayIndex)
+                                parent.EndDisplayIndex = cgh.EndDisplayIndex;
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region HeaderStyles
+
+        /// <summary>
+        /// Gets or sets the visual styles assigned to the Column Header
+        /// </summary>
+        [DefaultValue(null), Category("Appearance")]
+        [Description("Indicates visual style assigned to the Column Header.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ColumnHeaderVisualStyles HeaderStyles
+        {
+            get
+            {
+                if (_HeaderStyles == null)
+                {
+                    _HeaderStyles = new ColumnHeaderVisualStyles();
+
+                    PropertyChangeHandler(null, _HeaderStyles);
+                }
+
+                return (_HeaderStyles);
+            }
+
+            set
+            {
+                if (_HeaderStyles != value)
+                {
+                    PropertyChangeHandler(_HeaderStyles, value);
+
+                    _HeaderStyles = value;
+
+                    OnPropertyChangedEx("HeaderStyles", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region HeaderText
+
+        ///<summary>
+        /// Gets or sets the Header Text
+        ///</summary>
+        [DefaultValue(null), Category("Appearance")]
+        [Description("Indicates the Header Text")]
+        public string HeaderText
+        {
+            get { return (_HeaderText); }
+
+            set
+            {
+                if (_HeaderText != value)
+                {
+                    _HeaderText = value;
+
+                    MarkupHeaderTextChanged();
+
+                    OnPropertyChangedEx("HeaderText", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region IsReadOnly
+
+        ///<summary>
+        ///Returns whether the given GroupHeader is ReadOnly (ie. all
+        ///visible columns/headers it encompasses must be ReadOnly)
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsReadOnly
+        {
+            get
+            {
+                GridColumnHeader gch = GetColumnHeader();
+
+                if (gch != null)
+                    return (gch.IsGroupHeaderReadOnly(this));
+
+                return (false);
+            }
+        }
+
+        #endregion
+
+        #region IsSelected
+
+        ///<summary>
+        ///Returns whether the given GroupHeader is selected (ie. all
+        ///visible columns/headers it encompasses must be selected)
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsSelected
+        {
+            get
+            {
+                GridColumnHeader gch = GetColumnHeader();
+
+                if (gch != null)
+                    return (gch.IsGroupHeaderSelected(this));
+
+                return (false);
+            }
+        }
+
+        #endregion
+
+        #region MinRowHeight
+
+        ///<summary>
+        /// Gets or sets the minimum height of the Header row
+        ///</summary>
+        [DefaultValue(0), Category("Style")]
+        [Description("Indicates the minimum height of the ColumnHeader row")]
+        public int MinRowHeight
+        {
+            get { return (_MinRowHeight); }
+
+            set
+            {
+                if (_MinRowHeight != value)
+                {
+                    if (value < 0)
+                        throw new Exception("MinRowHeight cannot be negative");
+
+                    _MinRowHeight = value;
+
+                    OnPropertyChangedEx("MinRowHeight", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region Name
+
+        ///<summary>
+        /// Gets or sets the GroupHeader Name
+        ///</summary>
+        [DefaultValue(null)]
+        [Description("Indicates the GroupHeader Name")]
+        public string Name
+        {
+            get { return (_Name); }
+            set { _Name = value; }
+        }
+
+        #endregion
+
+        #region Parent
+
+        ///<summary>
+        ///The Parent the item
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public object Parent
+        {
+            get
+            {
+                if (_Collection != null)
+                    return (_Collection.Parent);
+
+                return (null);
+            }
+        }
+
+        #endregion
+
+        #region RowHeight
+
+        ///<summary>
+        /// Gets or sets the fixed height of the header
+        ///</summary>
+        [DefaultValue(0), Category("Appearance")]
+        [Description("Indicates the fixed height of the header")]
+        public int RowHeight
+        {
+            get { return (_RowHeight); }
+
+            set
+            {
+                if (_RowHeight != value)
+                {
+                    _RowHeight = value;
+
+                    OnPropertyChangedEx("RowHeight", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowColumnHeaders
+
+        ///<summary>
+        /// Gets or sets whether the column headers are shown
+        ///</summary>
+        [DefaultValue(Tbool.NotSet), Category("Appearance")]
+        [Description("Indicates whether the root column headers are shown.")]
+        public Tbool ShowColumnHeaders
+        {
+            get { return (_ShowColumnHeaders); }
+
+            set
+            {
+                if (_ShowColumnHeaders != value)
+                {
+                    _ShowColumnHeaders = value;
+
+                    OnPropertyChangedEx("ShowColumnHeaders", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region StartDisplayIndex
+
+        ///<summary>
+        /// Gets or sets the start column display index
+        ///</summary>
+        [DefaultValue(-1), Category("Appearance")]
+        [Description("Indicates the start column index")]
+        public int StartDisplayIndex
+        {
+            get { return ((_StartDisplayIndex < 0) ? 0 : _StartDisplayIndex); }
+
+            set
+            {
+                if (_StartDisplayIndex != value)
+                {
+                    _StartDisplayIndex = value;
+
+                    OnPropertyChangedEx("StartDisplayIndex", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ToolTip
+
+        ///<summary>
+        /// Gets or sets the ToolTip text for the sub header.
+        ///</summary>
+        [DefaultValue(null), Category("Appearance")]
+        [Description("Indicates ththe ToolTip text for the sub header.")]
+        public string ToolTip
+        {
+            get { return (_ToolTip); }
+
+            set
+            {
+                if (_ToolTip != value)
+                {
+                    _ToolTip = value;
+
+                    OnPropertyChanged("ToolTip");
+                }
+            }
+        }
+
+        #endregion
+
+        #region Visible
+
+        /// <summary>
+        /// Get or sets whether the item is visible
+        /// </summary>
+        [DefaultValue(true), Category("Appearance")]
+        [Description("Indicates whether item is visible")]
+        public bool Visible
+        {
+            get { return (TestState(Shs.Visible)); }
+
+            set
+            {
+                if (Visible != value)
+                {
+                    SetState(Shs.Visible, value);
+
+                    OnPropertyChangedEx("Visible", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region BoundsRelative
+
+        // Does not include sub headers
+
+        internal Rectangle BoundsRelative
+        {
+            get { return (_BoundsRelative); }
+            set { _BoundsRelative = value; }
+        }
+
+        #endregion
+
+        #region ContentSize
+
+        internal Size ContentSize
+        {
+            get { return (_ContentSize); }
+            set { _ContentSize = value; }
+        }
+
+        #endregion
+
+        #region EffectiveStyles
+
+        internal ColumnHeaderVisualStyles EffectiveStyles
+        {
+            get { return (_EffectiveStyles); }
+            set { _EffectiveStyles = value; }
+        }
+
+        #endregion
+
+        #region HeaderTextMarkup
+
+        internal BodyElement HeaderTextMarkup
+        {
+            get { return (_HeaderTextMarkup); }
+        }
+
+        #endregion
+
+        #region HeaderTextSize
+
+        internal Size HeaderTextSize
+        {
+            get { return (_HeaderTextSize); }
+            set { _HeaderTextSize = value; }
+        }
+
+        #endregion
+
+        #region Size
+
+        // Includes sub headers
+
+        internal Size Size
+        {
+            get { return (_Size); }
+            set { _Size = value; }
+        }
+
+        #endregion
+
+        #region StyleUpdateCount
+
+        internal int StyleUpdateCount
+        {
+            get { return (_StyleUpdateCount); }
+            set { _StyleUpdateCount = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region TestState
+
+        private bool TestState(Shs state)
+        {
+            return ((_States & state) == state);
+        }
+
+        #endregion
+
+        #region SetState
+
+        private void SetState(Shs state, bool value)
+        {
+            if (value == true)
+                _States |= state;
+            else
+                _States &= ~state;
+        }
+
+        #endregion
+
+        #region Contains
+
+        internal bool Contains(int index)
+        {
+            return (index >= StartDisplayIndex && index <= EndDisplayIndex);
+        }
+
+        #endregion
+
+        #region GetColumnHeader
+
+        private GridColumnHeader GetColumnHeader()
+        {
+            object parent = Collection.Parent;
+
+            while (parent.GetType() == typeof(ColumnGroupHeader))
+                parent = ((ColumnGroupHeader)parent).Collection.Parent;
+
+            return (parent as GridColumnHeader);
+        }
+
+        #endregion
+
+        #region Markup support
+
+        private void MarkupHeaderTextChanged()
+        {
+            if (_HeaderTextMarkup != null)
+                _HeaderTextMarkup.HyperLinkClick -= HeaderTextMarkupLinkClick;
+
+            _HeaderTextMarkup = null;
+
+            if (EnableHeaderMarkup == true)
+            {
+                if (MarkupParser.IsMarkup(_HeaderText) == true)
+                {
+                    _HeaderTextMarkup = MarkupParser.Parse(_HeaderText);
+
+                    if (_HeaderTextMarkup != null)
+                        _HeaderTextMarkup.HyperLinkClick += HeaderTextMarkupLinkClick;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Occurs when a header text markup link is clicked
+        /// </summary>
+        protected virtual void HeaderTextMarkupLinkClick(object sender, EventArgs e)
+        {
+            if (GroupHeaderMarkupLinkClick != null)
+            {
+                HyperLink link = (HyperLink)sender;
+
+                GroupHeaderMarkupLinkClickEventArgs ev =
+                    new GroupHeaderMarkupLinkClickEventArgs(this, link);
+
+                GroupHeaderMarkupLinkClick(this, ev);
+            }
+        }
+
+        /// <summary>
+        /// Gets plain Header text without text-markup (if text-markup is used in Text)
+        /// </summary>
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public string PlainHeaderText
+        {
+            get { return (_HeaderTextMarkup != null ? _HeaderTextMarkup.PlainText : _HeaderText); }
+        }
+
+        #endregion
+
+        #region GroupCollectionChangeHandler
+
+        private void GroupCollectionChangeHandler(
+            ColumnGroupHeaderCollection oldValue, ColumnGroupHeaderCollection newValue)
+        {
+            if (oldValue != null)
+            {
+                oldValue.Parent = null;
+                oldValue.CollectionChanged -= GroupHeadersCollectionChanged;
+            }
+
+            if (newValue != null)
+            {
+                newValue.Parent = this;
+                newValue.CollectionChanged += GroupHeadersCollectionChanged;
+            }
+        }
+
+        #endregion
+
+        #region PropertyChangeHandler
+
+        private void PropertyChangeHandler(
+            INotifyPropertyChanged oldValue, INotifyPropertyChanged newValue)
+        {
+            if (oldValue != null)
+                oldValue.PropertyChanged -= PropertyValueChanged;
+
+            if (newValue != null)
+                newValue.PropertyChanged += PropertyValueChanged;
+        }
+
+        #endregion
+
+        #region PropertyValueChanged
+
+        /// <summary>
+        /// Occurs when one of element visual styles has property changes.
+        /// Default implementation invalidates visual appearance of element.
+        /// </summary>
+        /// <param name="sender">VisualStyle that changed.</param>
+        /// <param name="e">Event arguments.</param>
+        protected virtual void PropertyValueChanged(object sender, PropertyChangedEventArgs e)
+        {
+            OnPropertyChanged(e);
+        }
+
+        #endregion
+
+        #region INotifyPropertyChanged Members
+
+        /// <summary>
+        /// Occurs when property value has changed.
+        /// </summary>
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        /// <summary>
+        /// Raises the PropertyChanged event.
+        /// </summary>
+        /// <param name="e">Event arguments</param>
+        protected virtual void OnPropertyChanged(PropertyChangedEventArgs e)
+        {
+            PropertyChangedEventHandler eh = PropertyChanged;
+
+            if (eh != null)
+                eh(this, e);
+        }
+
+        /// <summary>
+        /// Default PropertyChanged processing
+        /// </summary>
+        /// <param name="s"></param>
+        protected void OnPropertyChanged(string s)
+        {
+            if (PropertyChanged != null)
+                OnPropertyChanged(new VisualPropertyChangedEventArgs(s));
+        }
+
+        /// <summary>
+        /// Default PropertyChanged processing
+        /// </summary>
+        /// <param name="s"></param>
+        /// <param name="changeType">invalidate</param>
+        protected void OnPropertyChangedEx(string s, VisualChangeType changeType)
+        {
+            if (PropertyChanged != null)
+                OnPropertyChanged(new VisualPropertyChangedEventArgs(s, changeType));
+        }
+
+        #endregion
+
+        #region GroupHeaderStates
+
+        [Flags]
+        private enum Shs
+        {
+            AllowSelection = (1 << 0),
+            EnableHeaderMarkup = (1 << 1),
+            Visible = (1 << 2),
+        }
+
+        #endregion
+
+        #region Dispose
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        public void Dispose()
+        {
+            if (_HeaderTextMarkup != null)
+            {
+                _HeaderTextMarkup.HyperLinkClick -= HeaderTextMarkupLinkClick;
+
+                _HeaderTextMarkup = null;
+            }
+        }
+
+        #endregion
+    }
+
+    #region EventArgs
+
+    #region GroupHeaderMarkupLinkClickEventArgs
+
+    /// <summary>
+    /// GroupHeaderMarkupLinkClickEventArgs
+    /// </summary>
+    internal class GroupHeaderMarkupLinkClickEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private ColumnGroupHeader _GroupHeader;
+        private HyperLink _HyperLink;
+
+        #endregion
+
+        ///<summary>
+        /// GroupHeaderMarkupLinkClickEventArgs
+        ///</summary>
+        ///<param name="groupHeader"></param>
+        ///<param name="hyperLink"></param>
+        public GroupHeaderMarkupLinkClickEventArgs(ColumnGroupHeader groupHeader, HyperLink hyperLink)
+        {
+            _GroupHeader = groupHeader;
+            _HyperLink = hyperLink;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated GroupHeader
+        /// </summary>
+        public ColumnGroupHeader GroupHeader
+        {
+            get { return (_GroupHeader); }
+        }
+
+        /// <summary>
+        /// Gets the associated HyperLink
+        /// </summary>
+        public HyperLink HyperLink
+        {
+            get { return (_HyperLink); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridColumnHeader.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridColumnHeader.cs
new file mode 100644
index 00000000..0bb5d967
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridColumnHeader.cs	
@@ -0,0 +1,6532 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Drawing.Drawing2D;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.SuperGrid.Primitives;
+using DevComponents.DotNetBar.SuperGrid.Style;
+using DevComponents.SuperGrid.TextMarkup;
+
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    /// <summary>
+    /// Represents a layout of column headers
+    /// </summary>
+    [TypeConverter(typeof(BlankExpandableObjectConverter))]
+    public class GridColumnHeader : GridElement
+    {
+        #region Constants
+
+        private const int SeparatorWidth = 2;
+        private const int ImageCacheSize = 8;
+
+        #endregion
+
+        #region Static data
+
+        private static object _lastSelectedItem;
+
+        #endregion
+
+        #region Private variables
+
+        private GridColumnCollection _Columns;
+        private ColumnGroupHeaderCollection _GroupHeaders;
+
+        private HeaderArea _HitArea;
+        private object _HitItem;
+
+        private HeaderArea _LastHitArea;
+        private object _LastHitItem;
+
+        private GridColumn _ResizeColumn;
+
+        private int _MouseDownDelta;
+        private HeaderArea _MouseDownHitArea;
+        private object _MouseDownHitItem;
+
+        private Point _MouseDownPoint;
+        private MouseButtons _MouseDownButtons;
+
+        private bool _DragSelection;
+        private bool _DragStarted;
+
+        private bool _Reordering;
+        private bool _Resizing;
+        private int _ResizeWidth;
+
+        private int _MinRowHeight;
+        private int _RowHeight;
+
+        private GridColumn _SeparatorColumn;
+        private bool _SeparatorIsRight;
+
+        private FloatWindow _HeaderFw;
+        private FloatWindow _SeparatorFw;
+
+        private int _OrderTextOffset;
+        private int _SelectAllCount;
+
+        private ColumnHeaderRowVisualStyles _EffectiveRowHeaderStyles;
+        private int _StyleUpdateCount;
+
+        private bool _ShowHeaderImages = true;
+
+        private Image _AscendingSortImage;
+        private int _AscendingSortImageIndex = -1;
+        private Image[] _AscendingSortCacheImages = new Image[ImageCacheSize];
+
+        private Image _DescendingSortImage;
+        private int _DescendingSortImageIndex = -1;
+        private Image[] _DescendingSortCacheImages = new Image[ImageCacheSize];
+
+        private Alignment _SortImageAlignment = Alignment.NotSet;
+
+        private Image _FilterImage;
+        private int _FilterImageIndex = -1;
+        private Image[] _FilterCacheImages = new Image[ImageCacheSize * 2];
+
+        private ImageVisibility _FilterImageVisibility = ImageVisibility.Auto;
+        private Alignment _FilterImageAlignment = Alignment.NotSet;
+
+        private FilterPopup _FilterMenu;
+
+        private bool _LockedColumn;
+        private bool _ShowFilterToolTips = true;
+        private bool _ShowToolTips = true;
+        private bool _ShowGroupColumnHeaders = true;
+        private bool _AutoApplyGroupColors = true;
+
+        private string _RowHeaderText;
+
+        #endregion
+
+        #region Internal properties
+
+        #region Columns
+
+        internal GridColumnCollection Columns
+        {
+            get { return (_Columns); }
+            set { _Columns = value; }
+        }
+
+        #endregion
+
+        #region RowHeaderBounds
+
+        internal Rectangle RowHeaderBounds
+        {
+            get
+            {
+                GridPanel panel = GridPanel;
+
+                if (panel != null)
+                {
+                    Rectangle r = Bounds;
+                    r.Width = panel.RowHeaderWidthEx;
+
+                    return (r);
+                }
+
+                return (Rectangle.Empty);
+            }
+        }
+
+        #endregion
+
+        #region SelectAllCount
+
+        internal int SelectAllCount
+        {
+            get { return (_SelectAllCount); }
+            set { _SelectAllCount = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Public properties
+
+        #region AscendingSortImage
+
+        /// <summary>
+        /// Gets or sets the Ascending sort image
+        /// </summary>
+        [DefaultValue(null), Category("Appearance")]
+        [Description("Indicates the Ascending sort image.")]
+        public Image AscendingSortImage
+        {
+            get { return (_AscendingSortImage); }
+
+            set
+            {
+                if (_AscendingSortImage != value)
+                {
+                    _AscendingSortImage = value;
+
+                    OnPropertyChangedEx("AscendingSortImage", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #region GetAscendingSortImage
+
+        internal Image GetAscendingSortImage(GridColumn column)
+        {
+            if (_AscendingSortImage != null)
+                return (_AscendingSortImage);
+
+            if (_AscendingSortImageIndex >= 0)
+            {
+                ImageList imageList = GridPanel.ImageList;
+
+                if (imageList != null && _AscendingSortImageIndex < imageList.Images.Count)
+                    return (imageList.Images[_AscendingSortImageIndex]);
+            }
+
+            return (GetAscendingSortImageEx(column));
+        }
+
+        #region GetAscendingSortImageEx
+
+        internal Image GetAscendingSortImageEx(GridColumn column)
+        {
+            StyleState state = GetStyleState(column, column.IsSelected);
+
+            Image cacheImage = _AscendingSortCacheImages[(int)state];
+
+            if (cacheImage == null)
+            {
+                int width = Dpi.Width5;
+                int height = Dpi.Height3;
+
+                if ((width % 2) == 0)
+                    width++;
+
+                Rectangle r = new Rectangle(0, 0, width, height);
+                Image image = new Bitmap(width, height);
+
+                using (Graphics g = Graphics.FromImage(image))
+                {
+                    g.SmoothingMode = SmoothingMode.AntiAlias;
+
+                    using (GraphicsPath path = new GraphicsPath())
+                    {
+                        Point pt = new Point(r.X + r.Width / 2, r.Top);
+
+                        Point[] pts =
+                        {
+                            pt,
+                            new Point(r.Right - 1, r.Bottom - 1),
+                            new Point(r.Left, r.Bottom - 1),
+                            pt
+                        };
+
+                        path.AddLines(pts);
+
+                        ColumnHeaderRowVisualStyle style = GetEffectiveRowHeaderStyleEx(state);
+
+                        Color color = style.SortIndicatorColor;
+
+                        if (color.IsEmpty)
+                            color = Color.Black;
+
+                        using (Brush br = new SolidBrush(color))
+                            g.FillPath(br, path);
+
+                        using (Pen pen = new Pen(color))
+                            g.DrawPath(pen, path);
+                    }
+                }
+
+                _AscendingSortCacheImages[(int)state] = image;
+
+                cacheImage = image;
+            }
+
+            return (cacheImage);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region AscendingSortImageIndex
+
+        /// <summary>
+        /// Gets or sets the Ascending Sort Image index
+        /// </summary>
+        [Browsable(true), DefaultValue(-1)]
+        [Category("Appearance"), Description("Indicates the Ascending Sort Image index.")]
+        [Editor("DevComponents.SuperGrid.Design.ImageIndexEditor, DevComponents.SuperGrid.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=26d81176cfa2b486", typeof(UITypeEditor))]
+        [TypeConverter(typeof(ImageIndexConverter))]
+        public int AscendingSortImageIndex
+        {
+            get { return (_AscendingSortImageIndex); }
+
+            set
+            {
+                if (_AscendingSortImageIndex != value)
+                {
+                    _AscendingSortImageIndex = value;
+
+                    OnPropertyChangedEx("AscendingSortImageIndex", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        [Browsable(false)]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetAscendingSortImageIndex()
+        {
+            _AscendingSortImageIndex = -1;
+        }
+
+        #endregion
+
+        #region AutoApplyGroupColors
+
+        /// <summary>
+        /// Gets or sets whether Group Header color properties
+        /// (ie. Background and TextColor) are automatically
+        /// applied to group Column Headers.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance")]
+        [Description("Indicates whether Group Header color properties (ie. Background and TextColor) are automatically applied to group Column Headers.")]
+        public bool AutoApplyGroupColors
+        {
+            get { return (_AutoApplyGroupColors); }
+
+            set
+            {
+                if (_AutoApplyGroupColors != value)
+                {
+                    _AutoApplyGroupColors = value;
+
+                    OnPropertyChangedEx("AutoApplyGroupColors", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region Bounds
+
+        ///<summary>
+        /// Gets the scroll adjusted bounds
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override Rectangle Bounds
+        {
+            get
+            {
+                GridPanel panel = GridPanel;
+
+                if (panel != null)
+                {
+                    Rectangle r = BoundsRelative;
+
+                    if (panel.IsSubPanel == true)
+                    {
+                        r.X -= HScrollOffset;
+
+                        if (IsVFrozen == false)
+                            r.Y -= VScrollOffset;
+                    }
+
+                    return (r);
+                }
+
+                return (Rectangle.Empty);
+            }
+        }
+
+        #endregion
+
+        #region DescendingSortImage
+
+        /// <summary>
+        /// Gets or sets the Descending sort image
+        /// </summary>
+        [DefaultValue(null), Category("Appearance")]
+        [Description("Indicates the Descending sort image.")]
+        public Image DescendingSortImage
+        {
+            get { return (_DescendingSortImage); }
+
+            set
+            {
+                if (_DescendingSortImage != value)
+                {
+                    _DescendingSortImage = value;
+
+                    OnPropertyChangedEx("DescendingSortImage", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #region GetDescendingSortImage
+
+        internal Image GetDescendingSortImage(GridColumn column)
+        {
+            if (_DescendingSortImage != null)
+                return (_DescendingSortImage);
+
+            if (_DescendingSortImageIndex >= 0)
+            {
+                ImageList imageList = GridPanel.ImageList;
+
+                if (imageList != null && _DescendingSortImageIndex < imageList.Images.Count)
+                    return (imageList.Images[_DescendingSortImageIndex]);
+            }
+
+            return (GetDescendingSortImageEx(column));
+        }
+
+        #region GetDescendingSortImageEx
+
+        internal Image GetDescendingSortImageEx(GridColumn column)
+        {
+            StyleState state = GetStyleState(column, column.IsSelected);
+
+            Image cacheImage = _DescendingSortCacheImages[(int)state];
+
+            if (cacheImage == null)
+            {
+                int width = Dpi.Width5;
+                int height = Dpi.Height3;
+
+                if ((width % 2) == 0)
+                    width++;
+
+                Rectangle r = new Rectangle(0, 0, width, height);
+                Image image = new Bitmap(width, height);
+
+                using (Graphics g = Graphics.FromImage(image))
+                {
+                    g.SmoothingMode = SmoothingMode.AntiAlias;
+
+                    using (GraphicsPath path = new GraphicsPath())
+                    {
+                        Point pt = new Point(r.X + width / 2, r.Bottom - 1);
+
+                        Point[] pts =
+                        {
+                            pt,
+                            new Point(r.Right - 1, r.Top),
+                            new Point(r.Left, r.Top),
+                            pt
+                        };
+
+                        path.AddLines(pts);
+
+                        ColumnHeaderRowVisualStyle style = GetEffectiveRowHeaderStyleEx(state);
+
+                        Color color = style.SortIndicatorColor;
+
+                        if (color.IsEmpty)
+                            color = Color.Black;
+
+                        using (Brush br = new SolidBrush(color))
+                            g.FillPath(br, path);
+
+                        using (Pen pen = new Pen(color))
+                            g.DrawPath(pen, path);
+                    }
+                }
+
+                _DescendingSortCacheImages[(int)state] = image;
+
+                cacheImage = image;
+            }
+
+            return (cacheImage);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region DescendingSortImageIndex
+
+        /// <summary>
+        /// Gets or sets the Descending Sort Image index
+        /// </summary>
+        [Browsable(true), DefaultValue(-1)]
+        [Category("Appearance"), Description("Indicates the Descending Sort Image index.")]
+        [Editor("DevComponents.SuperGrid.Design.ImageIndexEditor, DevComponents.SuperGrid.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=26d81176cfa2b486", typeof(UITypeEditor))]
+        [TypeConverter(typeof(ImageIndexConverter))]
+        public int DescendingSortImageIndex
+        {
+            get { return (_DescendingSortImageIndex); }
+
+            set
+            {
+                if (_DescendingSortImageIndex != value)
+                {
+                    _DescendingSortImageIndex = value;
+
+                    OnPropertyChangedEx("DescendingSortImageIndex", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        [Browsable(false)]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetDescendingSortImageIndex()
+        {
+            _DescendingSortImageIndex = -1;
+        }
+
+        #endregion
+
+        #region FilterImage
+
+        /// <summary>
+        /// Gets or sets the default
+        /// image to display in the column header.
+        /// </summary>
+        [DefaultValue(null), Category("Filtering")]
+        [Description("Indicates the default image to display in the column header.")]
+        public Image FilterImage
+        {
+            get { return (_FilterImage); }
+
+            set
+            {
+                if (_FilterImage != value)
+                {
+                    _FilterImage = value;
+
+                    NeedsMeasured = true;
+
+                    OnPropertyChangedEx("FilterImage", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #region GetFilterImage
+
+        internal Image GetFilterImage(GridColumn column)
+        {
+            bool inFilter;
+            StyleState state = GetFilterImageState(column, out inFilter);
+
+            return (GetFilterImage(column, state, inFilter));
+        }
+
+        internal Image GetFilterImage(
+            GridColumn column, StyleState state, bool inFilter)
+        {
+            if (_FilterImage != null)
+                return (_FilterImage);
+
+            if (_FilterImageIndex >= 0)
+            {
+                ImageList imageList = GridPanel.ImageList;
+
+                if (imageList != null && _FilterImageIndex < imageList.Images.Count)
+                    return (imageList.Images[_FilterImageIndex]);
+            }
+
+            return (GetFilterImageEx(state, inFilter));
+        }
+
+        #region GetFilterImageEx
+
+        private Image GetFilterImageEx(StyleState state, bool inFilter)
+        {
+            int n = (int)state;
+
+            if (inFilter == true)
+                n += ImageCacheSize;
+
+            Image cacheImage = _FilterCacheImages[n];
+
+            if (cacheImage == null)
+            {
+                Image image = new Bitmap(Dpi.Width8, Dpi.Height8);
+
+                using (Graphics g = Graphics.FromImage(image))
+                {
+                    g.SmoothingMode = SmoothingMode.AntiAlias;
+
+                    using (GraphicsPath path = new GraphicsPath())
+                    {
+                        Point[] pts =
+                        {
+                            new Point(0, 0),
+                            new Point(Dpi.Width7, 0),
+                            new Point(Dpi.Width7, Dpi.Height1),
+                            new Point(Dpi.Width4, Dpi.Height4),
+                            new Point(Dpi.Width4, Dpi.Height7),
+                            new Point(Dpi.Width3, Dpi.Height6),
+                            new Point(Dpi.Width3, Dpi.Height4),
+                            new Point(0, Dpi.Height1),
+                            new Point(0, 0),
+                        };
+
+                        path.AddLines(pts);
+
+                        Rectangle r = new Rectangle(Dpi.Width1, Dpi.Height1, Dpi.Width6, Dpi.Height3);
+
+                        ColumnHeaderRowVisualStyle style = GetEffectiveRowHeaderStyleEx(state);
+
+                        Color color = style.FilterBorderColor;
+
+                        if (color.IsEmpty)
+                            color = Color.DimGray;
+
+                        if (inFilter == false)
+                            style = GetEffectiveRowHeaderStyleEx(state & ~StyleState.MouseOver);
+
+                        Background back = (style.FilterBackground != null && style.FilterBackground.IsEmpty == false)
+                            ? style.FilterBackground : new Background(Color.White);
+
+                        using (Brush br = back.GetBrush(r))
+                            g.FillPath(br, path);
+
+                        using (Pen pen = new Pen(color))
+                            g.DrawPath(pen, path);
+                    }
+                }
+
+                _FilterCacheImages[n] = image;
+
+                cacheImage = image;
+            }
+
+            return (cacheImage);
+        }
+
+        #region GetFilterImageState
+
+        private StyleState GetFilterImageState(GridColumn column, out bool inFilter)
+        {
+            inFilter = false;
+
+            StyleState state = GetRowHeaderState();
+
+            state &= ~(StyleState.MouseOver | StyleState.Selected);
+
+            GridColumn hitColumn = _HitItem as GridColumn;
+
+            if (column == hitColumn)
+            {
+                state |= StyleState.MouseOver;
+
+                if (_HitArea == HeaderArea.InFilterMenu)
+                    inFilter = true;
+            }
+
+            if (column != null && string.IsNullOrEmpty(column.FilterExpr) == false)
+                state |= StyleState.Selected;
+
+            return (state);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region FilterImageAlignment
+
+        /// <summary>
+        /// Gets or sets the alignment of the filter Image
+        /// </summary>
+        [DefaultValue(Alignment.NotSet), Category("Appearance")]
+        [Description("Indicates the alignment of the filter Image.")]
+        public Alignment FilterImageAlignment
+        {
+            get { return (_FilterImageAlignment); }
+
+            set
+            {
+                if (_FilterImageAlignment != value)
+                {
+                    _FilterImageAlignment = value;
+
+                    OnPropertyChangedEx("FilterImageAlignment", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region FilterImageIndex
+
+        /// <summary>
+        /// Gets or sets the Filter image index
+        /// </summary>
+        [Browsable(true), DefaultValue(-1)]
+        [Category("Appearance"), Description("Indicates the Filter Row image index.")]
+        [Editor("DevComponents.SuperGrid.Design.ImageIndexEditor, DevComponents.SuperGrid.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=26d81176cfa2b486", typeof(UITypeEditor))]
+        [TypeConverter(typeof(ImageIndexConverter))]
+        public int FilterImageIndex
+        {
+            get { return (_FilterImageIndex); }
+
+            set
+            {
+                if (_FilterImageIndex != value)
+                {
+                    _FilterImageIndex = value;
+
+                    OnPropertyChangedEx("FilterImageIndex", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        [Browsable(false)]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetFilterImageIndex()
+        {
+            _FilterImageIndex = -1;
+        }
+
+        #endregion
+
+        #region FilterImageVisibility
+
+        /// <summary>
+        /// Gets or sets the visibility of the header filter image
+        /// </summary>
+        [DefaultValue(ImageVisibility.Auto), Category("Filtering")]
+        [Description("Indicates the visibility of the header filter image.")]
+        public ImageVisibility FilterImageVisibility
+        {
+            get { return (_FilterImageVisibility); }
+
+            set
+            {
+                if (_FilterImageVisibility != value)
+                {
+                    _FilterImageVisibility = value;
+
+                    OnPropertyChangedEx("FilterImageVisibility", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region GroupHeaders
+
+        /// <summary>
+        /// Gets a reference to the collection of grid columns
+        /// </summary>
+        [Category("Appearance")]
+        [Description("Indicates the collection of grid columns.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ColumnGroupHeaderCollection GroupHeaders
+        {
+            get
+            {
+                if (_GroupHeaders == null)
+                {
+                    _GroupHeaders = new ColumnGroupHeaderCollection();
+
+                    _GroupHeaders.Parent = this;
+
+                    _GroupHeaders.CollectionChanged += GroupHeadersCollectionChanged;
+                    _GroupHeaders.PropertyChanged += GroupHeadersPropertyChanged;
+                    _GroupHeaders.GroupHeaderMarkupLinkClick += GroupHeaderMarkupLinkClick;
+                }
+
+                return (_GroupHeaders);
+            }
+        }
+
+        #region GroupHeadersCollectionChanged
+
+        void GroupHeadersCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            NeedsMeasured = true;
+            SuperGrid.StyleUpdateCount++;
+
+            InvalidateLayout();
+        }
+
+        #endregion
+
+        #region GroupHeadersPropertyChanged
+
+        void GroupHeadersPropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            NeedsMeasured = true;
+
+            InvalidateStyle();
+            InvalidateLayout();
+        }
+
+        #endregion
+
+        #region GroupHeadersMarkupLinkClick
+
+        void GroupHeaderMarkupLinkClick(object sender, GroupHeaderMarkupLinkClickEventArgs e)
+        {
+            SuperGrid.DoColumnGroupHeaderMarkupLinkClickEvent(
+                GridPanel, this, e.GroupHeader, e.HyperLink);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region MinRowHeight
+
+        ///<summary>
+        /// Gets or sets the minimum height of the ColumnHeader row
+        ///</summary>
+        [DefaultValue(0), Category("Style")]
+        [Description("Indicates the minimum height of the ColumnHeader row")]
+        public int MinRowHeight
+        {
+            get { return (_MinRowHeight); }
+
+            set
+            {
+                if (_MinRowHeight != value)
+                {
+                    if (value < 0)
+                        throw new Exception("MinRowHeight cannot be negative");
+
+                    _MinRowHeight = value;
+
+                    NeedsMeasured = true;
+
+                    OnPropertyChangedEx("MinRowHeight", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region RowHeaderText
+
+        ///<summary>
+        /// Gets or sets the associated row header text (only
+        /// displayed if TopLeftHeaderSelectBehavior is set to NoSelection).
+        ///</summary>
+        [DefaultValue(null), Category("Appearance")]
+        [Description("Indicates the associated row header text (only displayed if TopLeftHeaderSelectBehavior is set to NoSelection).")]
+        public string RowHeaderText
+        {
+            get { return (_RowHeaderText); }
+
+            set
+            {
+                if (_RowHeaderText != value)
+                {
+                    _RowHeaderText = value;
+
+                    NeedsMeasured = true;
+
+                    OnPropertyChangedEx("RowHeaderText", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region RowHeight
+
+        ///<summary>
+        /// Gets or sets the height of the ColumnHeader row
+        ///</summary>
+        [DefaultValue(0), Category("Style")]
+        [Description("Indicates the height of the ColumnHeader row")]
+        public int RowHeight
+        {
+            get { return (_RowHeight); }
+
+            set
+            {
+                if (_RowHeight != value)
+                {
+                    if (value < 0)
+                        throw new Exception("RowHeight cannot be negative");
+
+                    _RowHeight = value;
+
+                    NeedsMeasured = true;
+
+                    OnPropertyChangedEx("RowHeight", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowFilterToolTips
+
+        /// <summary>
+        /// Gets or sets whether tooltips are shown when over the filter image
+        /// </summary>
+        [DefaultValue(true), Category("Filtering")]
+        [Description("Indicates whether tooltips are shown when over the filter image.")]
+        public bool ShowFilterToolTips
+        {
+            get { return (_ShowFilterToolTips); }
+
+            set
+            {
+                if (value != _ShowFilterToolTips)
+                {
+                    _ShowFilterToolTips = value;
+
+                    OnPropertyChanged("ShowFilterToolTips");
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowHeaderImages
+
+        /// <summary>
+        /// Gets or sets whether Column Header images are displayed
+        /// </summary>
+        [DefaultValue(true), Category("Appearance")]
+        [Description("Indicates whether Column Header images are displayed.")]
+        public bool ShowHeaderImages
+        {
+            get { return (_ShowHeaderImages); }
+
+            set
+            {
+                if (_ShowHeaderImages != value)
+                {
+                    _ShowHeaderImages = value;
+
+                    NeedsMeasured = true;
+
+                    OnPropertyChangedEx("ShowHeaderImages", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowGroupColumnHeaders
+
+        ///<summary>
+        /// Gets or sets whether column headers are shown
+        /// by default when the columns are within a grouped header
+        ///</summary>
+        [DefaultValue(true), Category("Appearance")]
+        [Description("Indicates whether column headers are shown by default when the columns are within a grouped header.")]
+        public bool ShowGroupColumnHeaders
+        {
+            get { return (_ShowGroupColumnHeaders); }
+
+            set
+            {
+                if (_ShowGroupColumnHeaders != value)
+                {
+                    _ShowGroupColumnHeaders = value;
+
+                    OnPropertyChangedEx("ShowGroupColumnHeaders", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowToolTips
+
+        /// <summary>
+        /// Gets or sets whether tooltips are shown for the column header
+        /// </summary>
+        [DefaultValue(true), Category("Filtering")]
+        [Description("Indicates whether tooltips are shown for the column header.")]
+        public bool ShowToolTips
+        {
+            get { return (_ShowToolTips); }
+
+            set
+            {
+                if (value != _ShowToolTips)
+                {
+                    _ShowToolTips = value;
+
+                    OnPropertyChanged("ShowToolTips");
+                }
+            }
+        }
+
+        #endregion
+
+        #region SortImageAlignment
+
+        /// <summary>
+        /// Gets or sets the alignment of the Sort Images
+        /// </summary>
+        [DefaultValue(Alignment.NotSet), Category("Appearance")]
+        [Description("Indicates the alignment of the Sort Images.")]
+        public Alignment SortImageAlignment
+        {
+            get { return (_SortImageAlignment); }
+
+            set
+            {
+                if (_SortImageAlignment != value)
+                {
+                    _SortImageAlignment = value;
+
+                    OnPropertyChangedEx("SortImageAlignment", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region MeasureOverride
+
+        /// <summary>
+        /// Performs the layout of the item and sets
+        /// the Size property to size that item will take.
+        /// </summary>
+        /// <param name="layoutInfo">Layout information.</param>
+        /// <param name="stateInfo"></param>
+        /// <param name="constraintSize"></param>
+        protected override void MeasureOverride(
+            GridLayoutInfo layoutInfo, GridLayoutStateInfo stateInfo, Size constraintSize)
+        {
+            GridPanel panel = stateInfo.GridPanel;
+
+            ResetProcessStates(panel);
+
+            Size sizeNeeded = MeasureGroupHeaders(layoutInfo, constraintSize, panel);
+            MeasureColumnHeaders(layoutInfo, constraintSize, panel, ref sizeNeeded);
+
+            if (panel.ShowRowHeaders == true)
+                sizeNeeded.Width += panel.RowHeaderWidthEx;
+
+            Size = sizeNeeded;
+        }
+
+        #region MeasureGroupHeaders
+
+        private Size MeasureGroupHeaders(
+            GridLayoutInfo layoutInfo, Size constraintSize, GridPanel panel)
+        {
+            Size sizeNeeded = Size.Empty;
+
+            if (_GroupHeaders != null)
+            {
+                foreach (ColumnGroupHeader cgh in _GroupHeaders)
+                {
+                    if (cgh.Visible == true)
+                    {
+                        Size size = MeasureGroupHeader(layoutInfo, constraintSize, panel, cgh);
+
+                        sizeNeeded.Width += size.Width;
+                        sizeNeeded.Height = Math.Max(size.Height, sizeNeeded.Height);
+                    }
+                }
+            }
+
+            return (sizeNeeded);
+        }
+
+        #region MeasureGroupHeader
+
+        private Size MeasureGroupHeader(GridLayoutInfo layoutInfo,
+            Size constraintSize, GridPanel panel, ColumnGroupHeader cgh)
+        {
+            Size sizeNeeded = MeasureGroupHeaderColumn(layoutInfo, constraintSize, panel, cgh);
+
+            if (cgh.RowHeight > 0)
+            {
+                sizeNeeded.Height = Dpi.Height(cgh.RowHeight);
+            }
+            else
+            {
+                int mrh = Dpi.Height(cgh.MinRowHeight);
+
+                if (sizeNeeded.Height < mrh)
+                    sizeNeeded.Height = mrh;
+            }
+
+            cgh.ContentSize = sizeNeeded;
+
+            if (cgh.GroupHeaders.Count > 0)
+            {
+                Size subSize = Size.Empty;
+
+                foreach (ColumnGroupHeader gh in cgh.GroupHeaders)
+                {
+                    Size size = MeasureGroupHeader(layoutInfo, constraintSize, panel, gh);
+
+                    subSize.Height = Math.Max(subSize.Height, size.Height);
+                    subSize.Width += size.Width;
+                }
+
+                sizeNeeded.Height += subSize.Height;
+                sizeNeeded.Width = Math.Max(sizeNeeded.Width, subSize.Width);
+            }
+            else
+            {
+                Size baseSize = Size.Empty;
+                GridColumnCollection columns = _Columns;
+
+                bool showColumnHeaders = GetShowRootColumnHeaders(cgh);
+
+                int[] map = columns.DisplayIndexMap;
+
+                for (int i = cgh.StartDisplayIndex; i <= cgh.EndDisplayIndex; i++)
+                {
+                    if ((uint)i >= map.Length)
+                        break;
+
+                    int index = map[i];
+
+                    GridColumn column = columns[index];
+
+                    if (column.Visible == true)
+                    {
+                        if (showColumnHeaders == true)
+                        {
+                            Size size = MeasureHeader(layoutInfo, constraintSize, panel, column);
+
+                            baseSize.Width += size.Width;
+                            baseSize.Height = Math.Max(baseSize.Height, size.Height);
+                        }
+                    }
+                }
+
+                sizeNeeded.Height += baseSize.Height;
+
+                if (constraintSize.Width > 0)
+                    sizeNeeded.Width = baseSize.Width;
+                else
+                    sizeNeeded.Width = Math.Max(sizeNeeded.Width, baseSize.Width);
+            }
+
+            cgh.Size = sizeNeeded;
+
+            return (sizeNeeded);
+        }
+
+        #region MeasureGroupHeaderColumn
+
+        private Size MeasureGroupHeaderColumn(GridLayoutInfo layoutInfo,
+            Size constraintSize, GridPanel panel, ColumnGroupHeader cgh)
+        {
+            ColumnHeaderVisualStyle style = GetSizingStyle(panel, cgh);
+
+            Size sizeNeeded = MeasureGroupHeaderTextAndImage(layoutInfo, constraintSize, panel, cgh, style);
+
+            sizeNeeded.Width += Dpi.Width8;
+            sizeNeeded.Height += Dpi.Height4;
+
+            return (sizeNeeded);
+        }
+
+        #region MeasureGroupHeaderTextAndImage
+
+        private Size MeasureGroupHeaderTextAndImage(GridLayoutInfo layoutInfo, Size constraintSize,
+            GridPanel panel, ColumnGroupHeader cgh, ColumnHeaderVisualStyle style)
+        {
+            Size sizeNeeded = Size.Empty;
+
+            object figure = (_ShowHeaderImages == true) ? style.GetFigure(panel) : null;
+            Size figureSize = style.GetFigureSize(panel);
+
+            Alignment imageAlignment = style.ImageAlignment;
+
+            if (style.IsOverlayImage == true)
+                imageAlignment = Alignment.MiddleCenter;
+
+            Size borderSize = style.GetBorderSize(true);
+
+            int bwidth = (borderSize.Width * 2);
+            int bheight = (borderSize.Height * 2);
+
+            int width = constraintSize.Width > 0 ? GetDefaultGroupHeaderWidth(panel, cgh) : 0;
+
+            if (width > 0)
+            {
+                width -= bwidth;
+
+                switch (imageAlignment)
+                {
+                    case Alignment.TopCenter:
+                    case Alignment.MiddleCenter:
+                    case Alignment.BottomCenter:
+                        break;
+
+                    default:
+                        width -= figureSize.Width;
+                        break;
+                }
+            }
+
+            Size contentSize =
+                MeasureGroupHeaderText(layoutInfo.Graphics, cgh, style, new Size(width, 0));
+
+            switch (imageAlignment)
+            {
+                case Alignment.MiddleCenter:
+                    sizeNeeded.Height = Math.Max(figureSize.Height, contentSize.Height) + bheight;
+                    sizeNeeded.Width = Math.Max(figureSize.Width, contentSize.Width) + bwidth;
+                    break;
+
+                case Alignment.TopCenter:
+                case Alignment.BottomCenter:
+                    sizeNeeded.Width = Math.Max(figureSize.Width, contentSize.Width) + bwidth;
+                    sizeNeeded.Height = contentSize.Height + figureSize.Height + bheight;
+                    break;
+
+                default:
+                    sizeNeeded.Width = contentSize.Width + figureSize.Width + bwidth;
+                    sizeNeeded.Height = Math.Max(figureSize.Height, contentSize.Height) + bheight;
+                    break;
+            }
+
+            return (sizeNeeded);
+        }
+
+        #region GetDefaultGroupHeaderWidth
+
+        private int GetDefaultGroupHeaderWidth(
+            GridPanel panel, ColumnGroupHeader cgh)
+        {
+            int width = 0;
+
+            GridColumnCollection columns = panel.Columns;
+            int[] map = columns.DisplayIndexMap;
+
+            for (int i = cgh.StartDisplayIndex; i <= cgh.EndDisplayIndex; i++)
+            {
+                if ((uint)i >= map.Length)
+                    break;
+
+                int index = map[i];
+
+                GridColumn column = columns[index];
+
+                if (column.Visible == true)
+                    width += column.Size.Width;
+            }
+
+            return (width);
+        }
+
+        #endregion
+
+        #region MeasureGroupHeaderText
+
+        private Size MeasureGroupHeaderText(Graphics g,
+            ColumnGroupHeader cgh, CellVisualStyle style, Size constraintSize)
+        {
+            Size size = Size.Empty;
+
+            string s = GetHeaderText(cgh);
+
+            if (string.IsNullOrEmpty(s) == false)
+            {
+                if (cgh.HeaderTextMarkup != null)
+                {
+                    size = GetMarkupTextSize(g,
+                        cgh.HeaderTextMarkup, style, constraintSize.Width);
+
+                    cgh.HeaderTextSize = size;
+                }
+                else
+                {
+                    eTextFormat tf = style.GetTextFormatFlags();
+
+                    size = (constraintSize.IsEmpty == true)
+                               ? TextHelper.MeasureText(g, s, style.Font)
+                               : TextHelper.MeasureText(g, s, style.Font, constraintSize, tf);
+                }
+            }
+
+            return (size);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region MeasureColumnHeaders
+
+        private void MeasureColumnHeaders(
+            GridLayoutInfo layoutInfo, Size constraintSize, GridPanel panel, ref Size sizeNeeded)
+        {
+            GridColumnCollection columns = _Columns;
+
+            for (int i = 0; i < columns.Count; i++)
+            {
+                GridColumn column = columns[i];
+
+                if (column.Processed == false)
+                {
+                    Size size = MeasureHeader(layoutInfo, constraintSize, panel, column);
+
+                    sizeNeeded.Width += size.Width;
+                    sizeNeeded.Height = Math.Max(size.Height, sizeNeeded.Height);
+                }
+            }
+        }
+
+        #endregion
+
+        #region MeasureHeader
+
+        internal Size MeasureHeader(GridLayoutInfo layoutInfo,
+            Size constraintSize, GridPanel panel, GridColumn column)
+        {
+            Size sizeNeeded = Size.Empty;
+
+            ColumnHeaderVisualStyle style = GetSizingStyle(panel, column);
+
+            MeasureTextAndImage(layoutInfo, constraintSize, panel, column, style, ref sizeNeeded);
+            MeasureSortAndFilter(panel, column, style, ref sizeNeeded);
+
+            sizeNeeded.Width += Dpi.Width8;
+            sizeNeeded.Height += Dpi.Height4;
+
+            if (Dpi.Height(_RowHeight) > 0)
+                sizeNeeded.Height = Dpi.Height(_RowHeight);
+
+            else if (sizeNeeded.Height < Dpi.Height(_MinRowHeight))
+                sizeNeeded.Height = Dpi.Height(_MinRowHeight);
+
+            column.HeaderSize = sizeNeeded;
+
+            column.Processed = true;
+
+            return (sizeNeeded);
+        }
+
+        #region MeasureTextAndImage
+
+        private void MeasureTextAndImage(GridLayoutInfo layoutInfo, Size constraintSize,
+            GridPanel panel, GridColumn column, ColumnHeaderVisualStyle style, ref Size sizeNeeded)
+        {
+            Size figureSize = (_ShowHeaderImages == true)
+                ? style.GetFigureSize(panel) : Size.Empty;
+
+            Alignment imageAlignment = style.ImageAlignment;
+
+            if (style.IsOverlayImage == true)
+                imageAlignment = Alignment.MiddleCenter;
+
+            Size borderSize = style.GetBorderSize(true);
+
+            int bwidth = (borderSize.Width * 2);
+            int bheight = (borderSize.Height * 2);
+
+            int width = constraintSize.Width > 0 ? column.Size.Width : 0;
+
+            if (width > 0)
+            {
+                width -= bwidth;
+
+                switch (imageAlignment)
+                {
+                    case Alignment.TopCenter:
+                    case Alignment.MiddleCenter:
+                    case Alignment.BottomCenter:
+                        break;
+
+                    default:
+                        width -= figureSize.Width;
+                        break;
+                }
+            }
+
+            Size contentSize =
+                MeasureHeaderText(layoutInfo.Graphics, column, style, new Size(width, 0));
+
+            if (width == 0)
+                column.HeaderTextSize = contentSize;
+
+            switch (imageAlignment)
+            {
+                case Alignment.MiddleCenter:
+                    sizeNeeded.Height = Math.Max(figureSize.Height, contentSize.Height) + bheight;
+                    sizeNeeded.Width = Math.Max(figureSize.Width, contentSize.Width) + bwidth;
+                    break;
+
+                case Alignment.TopCenter:
+                case Alignment.BottomCenter:
+                    sizeNeeded.Width = Math.Max(figureSize.Width, contentSize.Width) + bwidth;
+                    sizeNeeded.Height = contentSize.Height + figureSize.Height + bheight;
+                    break;
+
+                default:
+                    sizeNeeded.Width = contentSize.Width + figureSize.Width + bwidth;
+                    sizeNeeded.Height = Math.Max(figureSize.Height, contentSize.Height) + bheight;
+                    break;
+            }
+        }
+
+        #region MeasureHeaderText
+
+        private Size MeasureHeaderText(Graphics g,
+            GridColumn column, CellVisualStyle style, Size constraintSize)
+        {
+            Size size = Size.Empty;
+
+            string s = column.GetHeaderText();
+
+            if (string.IsNullOrEmpty(s) == false)
+            {
+                if (column.HeaderTextMarkup != null)
+                {
+                    size = GetMarkupTextSize(g,
+                        column.HeaderTextMarkup, style, constraintSize.Width > 0 ? constraintSize.Width : 10000);
+
+                    column.HeaderTextSize = size;
+                }
+                else
+                {
+                    eTextFormat tf = style.GetTextFormatFlags();
+
+                    size = (constraintSize.IsEmpty == true)
+                               ? TextHelper.MeasureText(g, s, style.Font)
+                               : TextHelper.MeasureText(g, s, style.Font, constraintSize, tf);
+                }
+            }
+
+            return (size);
+        }
+
+        #region GetMarkupTextSize
+
+        private Size GetMarkupTextSize(Graphics g,
+            BodyElement textMarkup, CellVisualStyle style, int width)
+        {
+            MarkupDrawContext d =
+                new MarkupDrawContext(g, style.Font, style.TextColor, false);
+
+            textMarkup.InvalidateElementsSize();
+            textMarkup.Measure(new Size(width, 0), d);
+
+            return (textMarkup.Bounds.Size);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region MeasureSortAndFilter
+
+        private void MeasureSortAndFilter(GridPanel panel,
+            GridColumn column, ColumnHeaderVisualStyle style, ref Size sizeNeeded)
+        {
+            Alignment sortAlignment = (_SortImageAlignment == Alignment.NotSet)
+                ? Alignment.TopCenter : _SortImageAlignment;
+
+            Alignment filterAlignment = (_FilterImageAlignment == Alignment.NotSet)
+                ? Alignment.MiddleLeft : _FilterImageAlignment;
+
+            int imsHeight = 0;
+
+            if (panel.SortLevel != SortLevel.None)
+            {
+                imsHeight = GetPartSizeNeeded(
+                    GetAscendingSortImage(column), style, sortAlignment, ref sizeNeeded);
+            }
+
+            int imfHeight = 0;
+
+            if (FilterCanBeVisible(panel) == true)
+            {
+                imfHeight = GetPartSizeNeeded(
+                    GetFilterImage(column), style, filterAlignment, ref sizeNeeded);
+            }
+
+            if (imsHeight > 0 && imfHeight > 0)
+            {
+                if (VAlignment(sortAlignment) == VAlignment(filterAlignment))
+                {
+                    int n = Math.Max(imsHeight, imfHeight);
+
+                    sizeNeeded.Height += n;
+
+                    if (VAlignment(style.Alignment) == 1)
+                        sizeNeeded.Height += n;
+                }
+                else
+                    sizeNeeded.Height += (imsHeight + imfHeight);
+            }
+            else
+            {
+                int n = imsHeight + imfHeight;
+
+                sizeNeeded.Height += n;
+
+                if (VAlignment(style.Alignment) == 1)
+                    sizeNeeded.Height += n;
+            }
+        }
+
+        #region GetPartSizeNeeded
+
+        private int GetPartSizeNeeded(Image image,
+            ColumnHeaderVisualStyle style, Alignment alignment, ref Size sizeNeeded)
+        {
+            int height = 0;
+
+            if (image != null)
+            {
+                if (alignment != Alignment.TopCenter &&
+                    alignment != Alignment.MiddleCenter &&
+                    alignment != Alignment.BottomCenter)
+                {
+                    sizeNeeded.Width += (image.Width + 4);
+                }
+
+                if (alignment == Alignment.MiddleLeft ||
+                    alignment == Alignment.MiddleCenter ||
+                    alignment == Alignment.MiddleRight ||
+                    VAlignment(alignment) == VAlignment(style.Alignment))
+                {
+                    sizeNeeded.Height = Math.Max(sizeNeeded.Height, image.Height);
+                }
+                else
+                {
+                    height = (image.Height + 2);
+                }
+            }
+
+            return (height);
+        }
+
+        #endregion
+
+        #region FilterCanBeVisible
+
+        private bool FilterCanBeVisible(GridPanel panel)
+        {
+            if (panel.EnableFiltering == true && panel.EnableColumnFiltering == true)
+            {
+                if (FilterImageVisibility != ImageVisibility.Never)
+                    return (true);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region ArrangeOverride
+
+        /// <summary>
+        /// Performs the arrange pass layout of the item
+        /// when final position and size of the item has been set.
+        /// </summary>
+        /// <param name="layoutInfo">Layout information.</param>
+        /// <param name="stateInfo"></param>
+        /// <param name="layoutBounds">Layout bounds</param>
+        protected override void ArrangeOverride(GridLayoutInfo layoutInfo,
+            GridLayoutStateInfo stateInfo, Rectangle layoutBounds)
+        {
+            GridPanel panel = Parent as GridPanel;
+
+            if (panel != null)
+            {
+                ArrangeGroupHeader(panel, GroupHeaders, 0);
+
+                foreach (GridColumn col in panel.Columns)
+                {
+                    if (col.Visible == true)
+                        UpdateImageBounds(panel, col);
+                }
+            }
+        }
+
+        #region ArrangeGroupHeader
+
+        private void ArrangeGroupHeader(
+            GridPanel panel, IEnumerable<ColumnGroupHeader> csc, int dy)
+        {
+            if (csc != null)
+            {
+                foreach (ColumnGroupHeader cgh in csc)
+                {
+                    if (cgh.Visible == true)
+                    {
+                        Size oldSize = cgh.BoundsRelative.Size;
+
+                        cgh.BoundsRelative = GetGroupHeaderBounds(panel, cgh, dy);
+                        cgh.Size = new Size(cgh.Size.Width, Bounds.Height - dy);
+
+                        ArrangeGroupHeader(panel, cgh.GroupHeaders, dy + cgh.BoundsRelative.Height);
+
+                        if (oldSize != cgh.BoundsRelative.Size)
+                            SuperGrid.DoColumnGroupHeaderResizedEvent(panel, cgh, oldSize);
+                    }
+                }
+            }
+        }
+
+        #region GetGroupHeaderBounds
+
+        private Rectangle GetGroupHeaderBounds(
+            GridPanel panel, ColumnGroupHeader cgh, int dy)
+        {
+            GridColumnCollection columns = panel.Columns;
+
+            Rectangle r = Rectangle.Empty;
+            int[] map = columns.DisplayIndexMap;
+
+            bool showColHeaders = GetShowRootColumnHeaders(cgh) && cgh.GroupHeaders.Count == 0;
+
+            for (int i = cgh.StartDisplayIndex; i <= cgh.EndDisplayIndex; i++)
+            {
+                if ((uint)i < columns.Count)
+                {
+                    GridColumn column = columns[map[i]];
+
+                    if (column.Visible == true)
+                    {
+                        Rectangle q = GetRelativeBounds(panel, column);
+
+                        r = (r.IsEmpty == true) ? q : Rectangle.Union(r, q);
+
+                        r.Height = (showColHeaders == true) ? column.HeaderSize.Height : 0;
+                    }
+                }
+            }
+
+            r.Y += dy;
+
+            if (cgh.GroupHeaders.Count > 0)
+            {
+                r.Height = cgh.ContentSize.Height;
+            }
+            else
+            {
+                if (showColHeaders == true && cgh.RowHeight > 0)
+                    r.Height = Dpi.Height(cgh.RowHeight);
+                else
+                    r.Height = (Bounds.Bottom - r.Bottom);
+            }
+
+            return (r);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region RenderOverride
+
+        /// <summary>
+        /// Performs drawing of the item and its children.
+        /// </summary>
+        /// <param name="renderInfo">Holds contextual rendering information.</param>
+        protected override void RenderOverride(GridRenderInfo renderInfo)
+        {
+            GridPanel panel = Parent as GridPanel;
+
+            if (panel != null)
+            {
+                ResetProcessStates(panel);
+
+                Graphics g = renderInfo.Graphics;
+                Rectangle bounds = Bounds;
+
+                ColumnHeaderRowVisualStyle style = GetEffectiveRowHeaderStyle();
+                GridPanelVisualStyle pstyle = panel.GetEffectiveStyle();
+
+                if (SuperGrid.DoPreRenderColumnHeaderEvent(g,
+                    this, null, RenderParts.Background, bounds) == false)
+                {
+                    RenderRowBackground(g, style, bounds);
+
+                    SuperGrid.DoPostRenderColumnHeaderEvent(g,
+                        this, null, RenderParts.Background, bounds);
+                }
+
+                RenderColumnBorder(g, panel, bounds);
+
+                if (HScrollOffset == 0 || panel.IsSubPanel || panel.FrozenColumnCount <= 0)
+                {
+                    RenderHeaders(panel, renderInfo, false, false);
+                }
+                else
+                {
+                    RenderHeaders(panel, renderInfo, true, false);
+                    RenderHeaders(panel, renderInfo, true, true);
+                }
+
+                if (panel.FrozenColumnCount > 0)
+                    RenderFrozenColumnMarker(g, panel, pstyle);
+
+                RenderRowHeader(g, panel, style, pstyle);
+            }
+        }
+
+        #region RenderRowBackground
+
+        private void RenderRowBackground(
+            Graphics g, ColumnHeaderRowVisualStyle style, Rectangle bounds)
+        {
+            using (Brush br = style.WhiteSpaceBackground.GetBrush(bounds))
+                g.FillRectangle(br, bounds);
+        }
+
+        #endregion
+
+        #region RenderColumnBorder
+
+        private void RenderColumnBorder(
+            Graphics g, GridPanel panel, Rectangle bounds)
+        {
+            Rectangle r = bounds;
+
+            SmoothingMode sm = g.SmoothingMode;
+            g.SmoothingMode = SmoothingMode.None;
+
+            GridPanelVisualStyle pstyle = panel.GetEffectiveStyle();
+
+            if (pstyle.HeaderHLinePattern != LinePattern.None &&
+                pstyle.HeaderHLinePattern != LinePattern.NotSet)
+            {
+                using (Pen pen = new Pen(pstyle.HeaderLineColor, Dpi.Height1))
+                {
+                    pen.DashStyle = (DashStyle)pstyle.HeaderHLinePattern;
+
+                    g.DrawLine(pen, r.X, r.Bottom - 1, r.Right - 1, r.Bottom - 1);
+                    g.DrawLine(pen, r.X, r.Top - 1, r.Right - 1, r.Top - 1);
+                }
+            }
+
+            if (pstyle.HeaderVLinePattern != LinePattern.None &&
+                pstyle.HeaderVLinePattern != LinePattern.NotSet)
+            {
+                using (Pen pen = new Pen(pstyle.HeaderLineColor, Dpi.Width1))
+                {
+                    pen.DashStyle = (DashStyle)pstyle.HeaderVLinePattern;
+
+                    g.DrawLine(pen, r.Right - 1, r.Top - 1, r.Right - 1, r.Bottom - 1);
+                }
+            }
+
+            g.SmoothingMode = sm;
+        }
+
+        #endregion
+
+        #region RenderHeaders
+
+        private void RenderHeaders(GridPanel panel,
+            GridRenderInfo renderInfo, bool chkFrozen, bool frozen)
+        {
+            Graphics g = renderInfo.Graphics;
+            Rectangle clip = renderInfo.ClipRectangle;
+
+            RenderGroupHeaders(g, panel, clip, GroupHeaders, chkFrozen, frozen);
+            RenderColumnHeaders(g, panel, clip, chkFrozen, frozen);
+        }
+
+        #region RenderGroupHeaders
+
+        private void RenderGroupHeaders(Graphics g, GridPanel panel,
+            Rectangle clip, IEnumerable<ColumnGroupHeader> csc, bool chkFrozen, bool frozen)
+        {
+            if (csc != null)
+            {
+                foreach (ColumnGroupHeader cgh in csc)
+                {
+                    if (cgh.Visible == true)
+                    {
+                        if (chkFrozen == false || (IsGroupHeaderHFrozen(panel, cgh) == frozen))
+                        {
+                            Rectangle r = GetSubContScrollBounds(panel, cgh);
+
+                            if (clip.IsEmpty == true || r.IntersectsWith(clip) == true)
+                            {
+                                Rectangle bounds = GetSubScrollBounds(panel, cgh);
+
+                                RenderGroupHeader(g, panel, cgh, bounds);
+
+                                if (cgh.GroupHeaders.Count > 0)
+                                    RenderGroupHeaders(g, panel, Rectangle.Empty, cgh.GroupHeaders, chkFrozen, frozen);
+
+                                RenderBaseHeaders(g, panel, cgh);
+                            }
+                            else
+                            {
+                                if (cgh.GroupHeaders.Count > 0)
+                                    RenderGroupHeaders(g, panel, Rectangle.Empty, cgh.GroupHeaders, chkFrozen, frozen);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        #region RenderGroupHeader
+
+        private void RenderGroupHeader(
+            Graphics g, GridPanel panel, ColumnGroupHeader cgh, Rectangle bounds)
+        {
+            if (bounds.IsEmpty == false)
+            {
+                ColumnHeaderVisualStyle style = GetEffectiveStyle(cgh);
+
+                if (bounds.Width > 0 && bounds.Height > 0)
+                {
+                    if (SuperGrid.DoPreRenderColumnGroupHeaderEvent(g,
+                        this, cgh, RenderParts.Background, bounds) == false)
+                    {
+                        RenderBackground(g, style, bounds);
+
+                        SuperGrid.DoPostRenderColumnGroupHeaderEvent(g,
+                            this, cgh, RenderParts.Background, bounds);
+                    }
+
+                    RenderColumnBorder(g, panel, bounds);
+
+                    Rectangle r = bounds;
+                    Rectangle t = GetContentBounds(panel, style, r);
+
+                    t = GetAdjustedBounds(style, t);
+
+                    if (style.ImageOverlay == ImageOverlay.None ||
+                        style.ImageOverlay == ImageOverlay.Bottom)
+                    {
+                        RenderHeaderImage(g, panel, style, bounds, t);
+                    }
+
+                    if (SuperGrid.DoPreRenderColumnGroupHeaderEvent(g,
+                        this, cgh, RenderParts.Content, t) == false)
+                    {
+                        RenderGroupHeaderText(g, style, cgh, t);
+
+                        SuperGrid.DoPostRenderColumnGroupHeaderEvent(g,
+                            this, cgh, RenderParts.Content, t);
+                    }
+
+                    if (style.ImageOverlay == ImageOverlay.Top)
+                        RenderHeaderImage(g, panel, style, bounds, t);
+
+                    r = GetBorderRect(style, r);
+
+                    if (SuperGrid.DoPreRenderColumnGroupHeaderEvent(g,
+                        this, cgh, RenderParts.Border, r) == false)
+                    {
+                        if (r.Width > 0 && r.Height > 0)
+                            style.RenderBorder(g, r);
+
+                        SuperGrid.DoPostRenderColumnGroupHeaderEvent(g,
+                            this, cgh, RenderParts.Border, r);
+                    }
+                }
+            }
+        }
+
+        #region RenderGroupHeaderText
+
+        private void RenderGroupHeaderText(Graphics g,
+            ColumnHeaderVisualStyle style, ColumnGroupHeader cgh, Rectangle r)
+        {
+            if (_MouseDownButtons == MouseButtons.Left)
+                r = AdjustTextHeaderBounds(cgh, r, GridPanel.ColumnGroupHeaderClickBehavior);
+
+            if (cgh.HeaderTextMarkup != null)
+            {
+                RenderTextMarkup(g, cgh.HeaderTextMarkup, style, r);
+            }
+            else
+            {
+                string s = GetHeaderText(cgh);
+
+                if (string.IsNullOrEmpty(s) == false)
+                {
+                    TextDrawing.DrawString(g, s,
+                        style.Font, style.TextColor, r, style.GetTextFormatFlags());
+                }
+            }
+        }
+
+        #region GetHeaderText
+
+        private string GetHeaderText(ColumnGroupHeader cgh)
+        {
+            return (cgh.HeaderText ?? cgh.Name);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region RenderBaseHeaders
+
+        private void RenderBaseHeaders(Graphics g, GridPanel panel, ColumnGroupHeader cgh)
+        {
+            int[] map = panel.Columns.DisplayIndexMap;
+
+            for (int i = cgh.StartDisplayIndex; i <= cgh.EndDisplayIndex; i++)
+            {
+                if ((uint)i >= map.Length)
+                    break;
+
+                RenderBaseHeader(g, panel, cgh, map[i]);
+            }
+        }
+
+        #region RenderBaseHeader
+
+        private void RenderBaseHeader(Graphics g,
+            GridPanel panel, ColumnGroupHeader cgh, int i)
+        {
+            GridColumn col = panel.Columns[i];
+
+            if (col.Visible == true && col.Processed == false)
+            {
+                Rectangle r = GetBounds(panel, col);
+
+                int n = cgh.Size.Height - cgh.BoundsRelative.Height;
+
+                r.Y = r.Bottom - n;
+                r.Height = n;
+
+                if (GetShowRootColumnHeaders(cgh) == true || cgh.GroupHeaders.Count > 0)
+                {
+                    RenderColumnHeader(g, panel, col, r, true);
+                }
+                else
+                {
+                    RenderColumnBorder(g, panel, r);
+                    col.Processed = true;
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region RenderColumnHeaders
+
+        private void RenderColumnHeaders(Graphics g,
+            GridPanel panel, Rectangle clip, bool chkFrozen, bool frozen)
+        {
+            GridColumnCollection columns = _Columns;
+
+            int[] map = columns.DisplayIndexMap;
+
+            for (int i = 0; i < map.Length; i++)
+            {
+                int index = map[i];
+
+                GridColumn column = columns[index];
+
+                if (column.Visible == true && column.Processed == false)
+                {
+                    if ((chkFrozen == false) || (frozen == column.IsHFrozen))
+                    {
+                        Rectangle r = GetBounds(panel, column);
+
+                        if (r.IntersectsWith(clip) == true)
+                            RenderColumnHeader(g, panel, column, r, true);
+                    }
+                }
+            }
+        }
+
+        #region RenderColumnHeader
+
+        private void RenderColumnHeader(Graphics g,
+            GridPanel panel, GridColumn column, Rectangle bounds, bool fullRender)
+        {
+            ColumnHeaderVisualStyle style = GetEffectiveStyle(column);
+
+            if (bounds.Width > 0 && bounds.Height > 0)
+            {
+                if (SuperGrid.DoPreRenderColumnHeaderEvent(g,
+                    this, column, RenderParts.Background, bounds) == false)
+                {
+                    RenderBackground(g, style, bounds);
+
+                    SuperGrid.DoPostRenderColumnHeaderEvent(g,
+                        this, column, RenderParts.Background, bounds);
+                }
+
+                RenderColumnBorder(g, panel, bounds);
+
+                Rectangle r = bounds;
+                Rectangle t = GetContentBounds(panel, style, r);
+
+                t = GetAdjustedBounds(style, t);
+
+                if (style.ImageOverlay == ImageOverlay.None ||
+                    style.ImageOverlay == ImageOverlay.Bottom)
+                {
+                    RenderHeaderImage(g, panel, style, bounds, t);
+                }
+
+                if (fullRender == true)
+                    t = RenderSortAndFilterImage(g, column, style, t);
+
+                if (SuperGrid.DoPreRenderColumnHeaderEvent(g,
+                    this, column, RenderParts.Content, t) == false)
+                {
+                    RenderText(g, panel, column, style, t);
+
+                    SuperGrid.DoPostRenderColumnHeaderEvent(g,
+                        this, column, RenderParts.Content, t);
+                }
+
+                if (style.ImageOverlay == ImageOverlay.Top)
+                    RenderHeaderImage(g, panel, style, bounds, t);
+
+                r = GetBorderRect(style, r);
+
+                if (SuperGrid.DoPreRenderColumnHeaderEvent(g,
+                    this, column, RenderParts.Border, r) == false)
+                {
+                    if (r.Width > 0 && r.Height > 0)
+                        style.RenderBorder(g, r);
+
+                    SuperGrid.DoPostRenderColumnHeaderEvent(g,
+                        this, column, RenderParts.Border, r);
+                }
+
+                column.Processed = true;
+            }
+        }
+
+        #region GetBorderRect
+
+        private Rectangle GetBorderRect(
+            ColumnHeaderVisualStyle style, Rectangle r)
+        {
+            r.X += style.Margin.Left;
+            r.Width -= style.Margin.Horizontal;
+
+            r.Y += style.Margin.Top;
+            r.Height -= style.Margin.Vertical;
+
+            return (r);
+        }
+
+        #endregion
+
+        #region RenderBackground
+
+        private void RenderBackground(Graphics g,
+            VisualStyle style, Rectangle r)
+        {
+            using (Brush br = style.Background.GetBrush(r))
+                g.FillRectangle(br, r);
+        }
+
+        #endregion
+
+        #region RenderSortAndFilterImage
+
+        private Rectangle RenderSortAndFilterImage(
+            Graphics g, GridColumn column, ColumnHeaderVisualStyle style, Rectangle t)
+        {
+            GridPanel panel = column.Parent as GridPanel;
+
+            if (panel != null)
+            {
+                Alignment falign = (_FilterImageAlignment == Alignment.NotSet)
+                    ? Alignment.MiddleLeft : _FilterImageAlignment;
+
+                Alignment salign = (_SortImageAlignment == Alignment.NotSet)
+                    ? Alignment.TopCenter : _SortImageAlignment;
+
+                Rectangle rf = GetFilterImageBounds(panel, column);
+
+                if (rf.IsEmpty == false)
+                {
+                    Image filterImage = GetColumnFilterImage(column);
+
+                    if (filterImage != null)
+                        g.DrawImageUnscaledAndClipped(filterImage, rf);
+                }
+
+                Rectangle rs = GetSortImageBounds(panel, column, salign, falign, rf);
+
+                if (rs.IsEmpty == false)
+                {
+                    Image sortImage = GetColumnSortImage(panel, column);
+
+                    if (sortImage != null)
+                        g.DrawImageUnscaledAndClipped(sortImage, rs);
+                }
+
+                if (rf.IsEmpty == false)
+                    t = UpdateContentRect(rf, t, falign, style, column);
+
+                if (rs.IsEmpty == false)
+                    t = UpdateContentRect(rs, t, salign, style, column);
+            }
+
+            t.X += 2;
+            t.Width -= 4;
+
+            return (t);
+        }
+
+        #region GetFilterImageBounds
+
+        private Rectangle GetFilterImageBounds(GridPanel panel, GridColumn column)
+        {
+            if (column != null)
+            {
+                GridColumn hitColumn = _HitItem as GridColumn;
+
+                if (_FilterImageVisibility == ImageVisibility.Always ||
+                    (column == hitColumn) || (string.IsNullOrEmpty(column.FilterExpr) == false))
+                {
+                    return (GetScrollBounds(panel, column, column.FilterImageBounds));
+                }
+            }
+
+            return (Rectangle.Empty);
+        }
+
+        #endregion
+
+        #region GetSortImageBounds
+
+        private Rectangle GetSortImageBounds(GridPanel panel,
+            GridColumn column, Alignment salign, Alignment falign, Rectangle rf)
+        {
+            Rectangle r = GetScrollBounds(panel, column, column.SortImageBounds);
+
+            if (r.IsEmpty == false)
+            {
+                if (falign == salign && r.IsEmpty == false)
+                {
+                    if (salign == Alignment.TopCenter ||
+                        salign == Alignment.MiddleCenter ||
+                        salign == Alignment.BottomCenter)
+                    {
+                        r.X = rf.X - (r.Width + 1);
+                    }
+                }
+            }
+
+            return (r);
+        }
+
+        #endregion
+
+        #region UpdateContentRect
+
+        private Rectangle UpdateContentRect(Rectangle r,
+            Rectangle t, Alignment alignment, ColumnHeaderVisualStyle style, GridColumn column)
+        {
+            switch (GetStringAlignment(alignment))
+            {
+                case StringAlignment.Near:
+                    int n1 = r.Right - t.Left;
+
+                    switch (GetStringAlignment(style.Alignment))
+                    {
+                        case StringAlignment.Center:
+                            if (n1 + 3 > (t.Width - column.HeaderTextSize.Width) / 2)
+                            {
+                                t.X = r.Right;
+                                t.Width -= n1;
+                            }
+                            break;
+
+                        default:
+                            t.X = r.Right;
+                            t.Width -= n1;
+                            break;
+                    }
+                    break;
+
+                case StringAlignment.Far:
+                    int n2 = t.Right - r.Left;
+
+                    switch (GetStringAlignment(style.Alignment))
+                    {
+                        case StringAlignment.Center:
+                            if (n2 + 3 > (t.Width - column.HeaderTextSize.Width) / 2)
+                                t.Width -= n2;
+                            break;
+
+                        default:
+                            t.Width -= n2;
+                            break;
+                    }
+                    break;
+            }
+
+            return (t);
+        }
+
+        #region GetStringAlignment
+
+        private StringAlignment GetStringAlignment(Alignment alignment)
+        {
+            switch (alignment)
+            {
+                case Alignment.TopLeft:
+                case Alignment.MiddleLeft:
+                case Alignment.BottomLeft:
+                    return (StringAlignment.Near);
+
+                case Alignment.TopCenter:
+                case Alignment.MiddleCenter:
+                case Alignment.BottomCenter:
+                    return (StringAlignment.Center);
+
+                default:
+                    return (StringAlignment.Far);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region RenderText
+
+        private void RenderText(Graphics g, GridPanel panel,
+            GridColumn column, CellVisualStyle style, Rectangle r)
+        {
+            string s = column.GetHeaderText();
+
+            if (s != null)
+            {
+                if (_MouseDownButtons == MouseButtons.Left)
+                    r = AdjustTextHeaderBounds(column, r, panel.ColumnHeaderClickBehavior);
+
+                if (column.HeaderTextMarkup != null)
+                {
+                    RenderTextMarkup(g, column.HeaderTextMarkup, style, r);
+                }
+                else
+                {
+                    TextDrawing.DrawString(g, s,
+                        style.Font, style.TextColor, r, style.GetTextFormatFlags());
+                }
+            }
+        }
+
+        #region RenderTextMarkup
+
+        private void RenderTextMarkup(Graphics g,
+            BodyElement textMarkup, CellVisualStyle style, Rectangle r)
+        {
+            MarkupDrawContext d =
+                new MarkupDrawContext(g, style.Font, style.TextColor, false);
+
+            textMarkup.Arrange(new Rectangle(r.Location, r.Size), d);
+
+            Size size = textMarkup.Bounds.Size;
+
+            switch (style.Alignment)
+            {
+                case Alignment.MiddleLeft:
+                case Alignment.MiddleCenter:
+                case Alignment.MiddleRight:
+                    if (r.Height > size.Height)
+                        r.Y += (r.Height - size.Height) / 2;
+                    break;
+
+                default:
+                    if (r.Height > size.Height)
+                        r.Y = r.Bottom - size.Height;
+                    break;
+            }
+
+            textMarkup.Bounds = new Rectangle(r.Location, size);
+
+            Region oldClip = g.Clip;
+
+            try
+            {
+                g.SetClip(r, CombineMode.Intersect);
+
+                textMarkup.Render(d);
+            }
+            finally
+            {
+                g.Clip = oldClip;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region VAlignment
+
+        private int VAlignment(Alignment alignment)
+        {
+            switch (alignment)
+            {
+                case Alignment.TopLeft:
+                case Alignment.TopCenter:
+                case Alignment.TopRight:
+                    return (0);
+
+                case Alignment.MiddleLeft:
+                case Alignment.MiddleCenter:
+                case Alignment.MiddleRight:
+                    return (1);
+
+                default:
+                    return (2);
+            }
+        }
+
+        #endregion
+
+        #region GetColumnSortImage
+
+        internal Image GetColumnSortImage(GridPanel panel, GridColumn column)
+        {
+            SortDirection sortDirection = SortDirection.None;
+
+            if (panel.GroupColumns != null &&
+                panel.GroupColumns.Contains(column) == true)
+            {
+                sortDirection = column.GroupDirection;
+            }
+            else if (panel.SortLevel != SortLevel.None)
+            {
+                sortDirection = column.SortDirection;
+
+                switch (column.SortIndicator)
+                {
+                    case SortIndicator.None:
+                        sortDirection = SortDirection.None;
+                        break;
+
+                    case SortIndicator.Ascending:
+                        sortDirection = SortDirection.Ascending;
+                        break;
+
+                    case SortIndicator.Descending:
+                        sortDirection = SortDirection.Descending;
+                        break;
+                }
+            }
+
+            switch (sortDirection)
+            {
+                case SortDirection.Ascending:
+                    return (GetAscendingSortImage(column));
+
+                case SortDirection.Descending:
+                    return (GetDescendingSortImage(column));
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetFilterImage
+
+        internal Image GetColumnFilterImage(GridColumn column)
+        {
+            if (column.IsFilteringEnabled == true)
+            {
+                if (_FilterImageVisibility != ImageVisibility.Never)
+                    return (GetFilterImage(column));
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetImageBounds
+
+        private Rectangle GetImageBounds(
+            Image image1, Alignment alignment, ref Rectangle r)
+        {
+            Rectangle u = r;
+            Rectangle t = r;
+            t.Size = image1.Size;
+
+            switch (alignment)
+            {
+                case Alignment.TopLeft:
+                    r.X += t.Width + 2;
+                    r.Width -= (t.Width + 2);
+                    break;
+
+                case Alignment.NotSet:
+                case Alignment.TopCenter:
+                    t.X += (r.Width - t.Width) / 2;
+                    break;
+
+                case Alignment.TopRight:
+                    t.X = r.Right - t.Width;
+                    r.Width -= (t.Width + 2);
+                    break;
+
+                case Alignment.MiddleLeft:
+                    t.Y += (r.Height - t.Height) / 2;
+
+                    r.X += t.Width + 2;
+                    r.Width -= (t.Width + 2);
+                    break;
+
+                case Alignment.MiddleCenter:
+                    t.X += (r.Width - t.Width) / 2;
+                    t.Y += (r.Height - t.Height) / 2;
+                    break;
+
+                case Alignment.MiddleRight:
+                    t.X = r.Right - t.Width;
+                    t.Y += (r.Height - t.Height) / 2;
+
+                    r.Width -= (t.Width + 2);
+                    break;
+
+                case Alignment.BottomLeft:
+                    r.X += t.Width + 2;
+                    r.Width -= (t.Width + 2);
+                    t.Y = r.Bottom - t.Height;
+                    break;
+
+                case Alignment.BottomCenter:
+                    t.X += (r.Width - t.Width) / 2;
+                    t.Y = r.Bottom - t.Height;
+                    break;
+
+                case Alignment.BottomRight:
+                    t.X = r.Right - t.Width;
+                    t.Y = r.Bottom - t.Height;
+
+                    r.Width -= (t.Width + 2);
+                    break;
+            }
+
+            t.Intersect(u);
+
+            return (t);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region AdjustTextHeaderBounds
+
+        private Rectangle AdjustTextHeaderBounds(
+            object item, Rectangle r, ColumnHeaderClickBehavior cmode)
+        {
+            if (_Reordering == false && item == _MouseDownHitItem)
+            {
+                if (_MouseDownHitArea == HeaderArea.InMarkup ||
+                    (_MouseDownHitArea == HeaderArea.InContent && cmode == ColumnHeaderClickBehavior.SortAndReorder))
+                {
+                    r.X++;
+
+                    r.Y += 2;
+                    r.Height -= 2;
+                }
+            }
+
+            return (r);
+        }
+
+        #endregion
+
+        #region RenderHeaderImage
+
+        private void RenderHeaderImage(Graphics g, GridPanel panel,
+            ColumnHeaderVisualStyle style, Rectangle bounds, Rectangle r)
+        {
+            if (_ShowHeaderImages == true)
+            {
+                object figure = style.GetFigure(panel);
+
+                if (figure != null)
+                {
+                    Rectangle t = style.GetFigureBounds(panel, r);
+
+                    bounds.Inflate(-1, -1);
+                    t.Intersect(bounds);
+
+                    style.RenderFigure(g, panel, t);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderFrozenColumnMarker
+
+        private void RenderFrozenColumnMarker(
+            Graphics g, GridPanel panel, GridPanelVisualStyle pstyle)
+        {
+            GridColumn col = panel.Columns.GetLastVisibleFrozenColumn();
+
+            if (col != null)
+            {
+                Rectangle bounds = GetBounds(panel, col);
+
+                bounds.Y = Bounds.Y;
+                bounds.Height = Bounds.Height;
+
+                Rectangle r = col.BoundsRelative;
+
+                r.Y = bounds.Y + Dpi.Width3;
+                r.Height = bounds.Height - Dpi.Width5;
+
+                if (panel.IsSubPanel == true)
+                    r.X -= HScrollOffset;
+
+                if (r.Height > 0 && r.Width > 0)
+                {
+                    using (Pen pen = new Pen(pstyle.HeaderLineColor, Dpi.Width1))
+                    {
+                        g.DrawLine(pen, r.Right - Dpi.Width3,
+                            r.Top - 1, r.Right - Dpi.Width3, r.Bottom - 1);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region RenderRowHeader
+
+        private void RenderRowHeader(Graphics g,
+            GridPanel panel, ColumnHeaderRowVisualStyle style, GridPanelVisualStyle pstyle)
+        {
+            Rectangle r = GetRowHeaderBounds(panel);
+
+            if (r.Width > 0 && r.Height > 0)
+            {
+                if (SuperGrid.DoPreRenderColumnHeaderEvent(g,
+                    this, null, RenderParts.RowHeader, r) == false)
+                {
+                    SmoothingMode sm = g.SmoothingMode;
+                    g.SmoothingMode = SmoothingMode.None;
+
+                    using (Brush br = style.RowHeader.Background.GetBrush(r))
+                        g.FillRectangle(br, r);
+
+                    using (Pen pen = new Pen(style.RowHeader.BorderHighlightColor, Dpi.Height1))
+                        g.DrawLine(pen, r.X, r.Top, r.Right - 1, r.Top);
+
+                    using (Pen pen = new Pen(style.RowHeader.BorderHighlightColor, Dpi.Height1))
+                        g.DrawLine(pen, r.X + 1, r.Top, r.X + 1, r.Bottom - 1);
+
+                    using (Pen pen = new Pen(pstyle.HeaderLineColor, Dpi.Height1))
+                    {
+                        g.DrawLine(pen, r.X, r.Top - 1, r.Right - 1, r.Top - 1);
+                        g.DrawLine(pen, r.X, r.Bottom - 1, r.Right - 1, r.Bottom - 1);
+                    }
+
+                    using (Pen pen = new Pen(pstyle.HeaderLineColor, Dpi.Width1))
+                        g.DrawLine(pen, r.Right - 1, r.Top, r.Right - 1, r.Bottom - 1);
+
+                    if (panel.TopLeftHeaderSelectBehavior != TopLeftHeaderSelectBehavior.NoSelection)
+                    {
+                        RenderRowHeaderIndicator(g, panel, style, r);
+                    }
+                    else
+                    {
+                        if (string.IsNullOrEmpty(_RowHeaderText) == false)
+                            RenderRowHeaderText(g, _RowHeaderText, style, r);
+                    }
+
+                    SuperGrid.DoPostRenderColumnHeaderEvent(g,
+                        this, null, RenderParts.RowHeader, r);
+
+                    g.SmoothingMode = sm;
+                }
+            }
+        }
+
+        #region RenderRowHeaderIndicator
+
+        private void RenderRowHeaderIndicator(Graphics g,
+            GridPanel panel, ColumnHeaderRowVisualStyle style, Rectangle r)
+        {
+            r.Inflate(-Dpi.Width3, -Dpi.Height3);
+
+            if (r.Width > 0 && r.Height > 0)
+            {
+                using (GraphicsPath path = new GraphicsPath())
+                {
+                    int n = Math.Min(r.Width, r.Height);
+
+                    if (n > Dpi.Width10)
+                        n = Dpi.Width10;
+
+                    Point[] pts = new Point[3];
+
+                    if (_SelectAllCount != panel.SelectionUpdateCount)
+                    {
+                        r.X--;
+                        r.Y--;
+
+                        pts[0] = new Point(r.Right, r.Bottom - n);
+                        pts[1] = new Point(r.Right, r.Bottom);
+                        pts[2] = new Point(r.Right - n, r.Bottom);
+                    }
+                    else
+                    {
+                        pts[0] = new Point(r.X, r.Y);
+                        pts[1] = new Point(r.X + n, r.Y);
+                        pts[2] = new Point(r.X, r.Y + n);
+
+                        r.X++;
+                        r.Y++;
+                    }
+
+                    path.AddPolygon(pts);
+                    path.CloseFigure();
+
+                    if (style.IndicatorBackground.GradientAngle % 45 == 0)
+                        n /= 2;
+
+                    r.Width = n - 1;
+                    r.Height = n - 1;
+
+                    if (n > 0)
+                    {
+                        g.SmoothingMode = SmoothingMode.AntiAlias;
+
+                        using (Brush br = style.IndicatorBackground.GetBrush(r))
+                        {
+                            if (br is LinearGradientBrush)
+                                ((LinearGradientBrush)br).WrapMode = WrapMode.Tile;
+
+                            g.FillPath(br, path);
+                        }
+
+                        using (Pen pen = new Pen(style.IndicatorBorderColor))
+                            g.DrawPath(pen, path);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region RenderRowHeaderText
+
+        private void RenderRowHeaderText(Graphics g,
+            string text, ColumnHeaderRowVisualStyle style, Rectangle r)
+        {
+            Font font = style.RowHeader.Font ?? SystemFonts.DefaultFont;
+
+            Size tSize = TextHelper.MeasureText(g, text, font);
+
+            r.Inflate(-Dpi.Width2, -Dpi.Height2);
+
+            eTextFormat tf = ((r.Width <= tSize.Width)
+                  ? eTextFormat.Left
+                  : eTextFormat.HorizontalCenter) | eTextFormat.NoPadding;
+
+            tf |= eTextFormat.WordBreak | eTextFormat.VerticalCenter;
+
+            TextDrawing.DrawString(g, text,
+                font, style.RowHeader.TextColor, r, tf);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region ResetProcessStates
+
+        private void ResetProcessStates(GridPanel panel)
+        {
+            for (int i = 0; i < panel.Columns.Count; i++)
+                panel.Columns[i].Processed = false;
+        }
+
+        #endregion
+
+        #region Mouse support
+
+        #region InternalMouseEnter
+
+        internal override void InternalMouseEnter(EventArgs e)
+        {
+            SuperGrid.ToolTipText = "";
+
+            SuperGrid.DoColumnHeaderMouseEnterEvent(this);
+
+            base.InternalMouseEnter(e);
+        }
+
+        #endregion
+
+        #region InternalMouseLeave
+
+        internal override void InternalMouseLeave(EventArgs e)
+        {
+            if (_LockedColumn == false)
+            {
+                ResetColumnState();
+
+                _HitArea = HeaderArea.NoWhere;
+                _HitItem = null;
+            }
+
+            SuperGrid.ToolTipText = "";
+
+            SuperGrid.DoColumnHeaderMouseLeaveEvent(this);
+
+            base.InternalMouseLeave(e);
+        }
+
+        #region ResetColumnState
+
+        internal void ResetColumnState()
+        {
+            GridPanel panel = GridPanel;
+
+            if (panel != null)
+            {
+                if (_MouseDownHitItem != null)
+                    InvalidateItem(panel, _MouseDownHitItem);
+
+                if (_HitItem != null && (_MouseDownHitItem != _HitItem))
+                    InvalidateItem(panel, _HitItem);
+
+                if (_HitArea == HeaderArea.InRowHeader)
+                    InvalidateRowHeader();
+
+                if (_HitArea == HeaderArea.InWhitespace)
+                    InvalidateWhitespace();
+
+                _MouseDownHitItem = null;
+            }
+
+            _LockedColumn = false;
+        }
+
+        internal void ResetColumnStateEx()
+        {
+            ResetColumnState();
+
+            _HitItem = null;
+            _HitArea = HeaderArea.NoWhere;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InternalMouseMove
+
+        internal override void InternalMouseMove(MouseEventArgs e)
+        {
+            GridPanel panel = Parent as GridPanel;
+
+            if (panel != null)
+            {
+                if (AllowSelection == true)
+                {
+                    if (_Resizing == false)
+                    {
+                        _LastHitArea = _HitArea;
+                        _LastHitItem = _HitItem;
+
+                        _HitArea = GetHitArea(e.Location, ref _HitItem, IsMouseDown);
+
+                        if (_Reordering == false)
+                        {
+                            if (_HitItem is GridColumn)
+                                ProcessColumnMouseMove(e, panel);
+
+                            else if (_HitItem is ColumnGroupHeader)
+                                ProcessGroupHeaderMouseMove(e, panel);
+
+                            else
+                                ProcessRowHeaderMouseMove(panel);
+
+                            if (_HitArea != _LastHitArea || _LastHitItem != _HitItem)
+                            {
+                                if (_LastHitItem != null)
+                                    InvalidateItem(panel, _LastHitItem);
+
+                                if (_HitItem != null)
+                                    InvalidateItem(panel, _HitItem);
+
+                                if (_HitArea == HeaderArea.InRowHeader || _LastHitArea == HeaderArea.InRowHeader)
+                                    InvalidateRowHeader();
+
+                                if (_HitArea == HeaderArea.InWhitespace || _LastHitArea == HeaderArea.InWhitespace)
+                                    InvalidateWhitespace();
+
+                            }
+                        }
+                    }
+
+                    if (IsMouseDown == true)
+                    {
+                        if (ProcessMouseDownMove(e) == false)
+                        {
+                            if (_MouseDownHitItem != null)
+                            {
+                                SuperGrid.EnableAutoScrolling(AutoScrollEnable.Horizontal, ViewRect);
+
+                                StopResize();
+                                StopReorder();
+                            }
+                        }
+                    }
+                }
+
+                SuperGrid.DoColumnHeaderMouseMoveEvent(this, e);
+
+                base.InternalMouseMove(e);
+            }
+        }
+
+        #region ProcessColumnMouseMove
+
+        private void ProcessColumnMouseMove(MouseEventArgs e, GridPanel panel)
+        {
+            GridColumn hitColumn = (GridColumn) _HitItem;
+
+            switch (_HitArea)
+            {
+                case HeaderArea.InContent:
+                    SuperGrid.GridCursor = Cursors.Default;
+
+                    if (hitColumn.HeaderTextMarkup != null)
+                    {
+                        hitColumn.HeaderTextMarkup.MouseMove(SuperGrid, e);
+
+                        if (hitColumn.HeaderTextMarkup.MouseOverElement != null)
+                            _HitArea = HeaderArea.InMarkup;
+                    }
+
+                    if (_ShowToolTips == true)
+                        UpdateToolTip(panel, hitColumn.ToolTip);
+                    break;
+
+                case HeaderArea.InResize:
+                    SuperGrid.GridCursor = Cursors.VSplit;
+                    SuperGrid.ToolTipText = "";
+                    break;
+
+                case HeaderArea.InFilterMenu:
+                    SuperGrid.GridCursor = Cursors.Hand;
+
+                    if (_ShowFilterToolTips == true && hitColumn.IsFilteringEnabled == true)
+                        UpdateToolTip(panel, hitColumn.FilterExpr);
+                    break;
+
+                default:
+                    SuperGrid.GridCursor = Cursors.Default;
+                    SuperGrid.ToolTipText = "";
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region ProcessGroupHeaderMouseMove
+
+        private void ProcessGroupHeaderMouseMove(MouseEventArgs e, GridPanel panel)
+        {
+            switch (_HitArea)
+            {
+                case HeaderArea.InContent:
+                    SuperGrid.GridCursor = Cursors.Default;
+
+                    ColumnGroupHeader cgh = (ColumnGroupHeader)_HitItem;
+
+                    if (cgh.HeaderTextMarkup != null)
+                    {
+                        cgh.HeaderTextMarkup.MouseMove(SuperGrid, e);
+
+                        if (cgh.HeaderTextMarkup.MouseOverElement != null)
+                            _HitArea = HeaderArea.InMarkup;
+                    }
+
+                    if (_ShowToolTips == true)
+                        UpdateToolTip(panel, cgh.ToolTip);
+                    break;
+
+                case HeaderArea.InResize:
+                    SuperGrid.GridCursor = Cursors.VSplit;
+                    SuperGrid.ToolTipText = "";
+                    break;
+
+                default:
+                    SuperGrid.GridCursor = Cursors.Default;
+                    SuperGrid.ToolTipText = "";
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region ProcessRowHeaderMouseMove
+
+        private void ProcessRowHeaderMouseMove(GridPanel panel)
+        {
+            switch (_HitArea)
+            {
+                case HeaderArea.InRowHeaderResize:
+                    SuperGrid.GridCursor = Cursors.VSplit;
+                    SuperGrid.ToolTipText = "";
+                    break;
+
+                case HeaderArea.InRowHeader:
+                    SuperGrid.GridCursor =
+                        (panel.TopLeftHeaderSelectBehavior != TopLeftHeaderSelectBehavior.NoSelection)
+                            ? Cursors.Hand
+                            : Cursors.Default;
+
+                    UpdateToolTip(panel, "");
+                    break;
+
+                default:
+                    SuperGrid.GridCursor = Cursors.Default;
+                    SuperGrid.ToolTipText = "";
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region UpdateToolTip
+
+        private void UpdateToolTip(GridPanel panel, string toolTip)
+        {
+            if (_HitArea != _LastHitArea || _LastHitItem != _HitItem)
+                panel.SetHeaderTooltip(this, _HitItem, _HitArea, toolTip);
+        }
+
+        #endregion
+
+        #region ProcessMouseDownMove
+
+        private bool ProcessMouseDownMove(MouseEventArgs e)
+        {
+            GridPanel panel = Parent as GridPanel;
+
+            if (panel != null)
+            {
+                if (_MouseDownHitArea == HeaderArea.InRowHeaderResize)
+                    return (InRowHeaderResize(e.Location, e));
+
+                if (_MouseDownHitItem is GridColumn)
+                    return (ColumnMouseDownMove(e, panel));
+
+                if (_MouseDownHitItem is ColumnGroupHeader)
+                    return (GroupHeaderMouseDownMove(e, panel));
+            }
+
+            return (false);
+        }
+
+        #region InRowHeaderResize
+
+        private bool InRowHeaderResize(Point pt, MouseEventArgs e)
+        {
+            if (e.Button == MouseButtons.Left)
+            {
+                GridPanel panel = Parent as GridPanel;
+
+                if (panel != null)
+                {
+                    if (_Resizing == false)
+                    {
+                        _Resizing = true;
+                        _ResizeWidth = panel.RowHeaderWidthEx;
+
+                        if (panel.ImmediateResize == false)
+                        {
+                            _SeparatorFw = new FloatWindow();
+                            _SeparatorFw.Opacity = .5;
+                            _SeparatorFw.BackColor = Color.Black;
+                            _SeparatorFw.Owner = SuperGrid.FindForm();
+                        }
+                    }
+                    else
+                    {
+                        if (panel.ImmediateResize == false)
+                            ContinueRowHeaderResize(panel, pt);
+                        else
+                            ResizeRowHeader(panel, pt.X - MouseDownPoint.X);
+                    }
+                }
+
+                return (true);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region ColumnMouseDownMove
+
+        private bool ColumnMouseDownMove(MouseEventArgs e, GridPanel panel)
+        {
+            GridColumn hitColumn = (GridColumn)_MouseDownHitItem;
+            Rectangle r = ViewRect;
+
+            if ((_MouseDownHitArea == HeaderArea.InResize) ||
+                (_MouseDownHitArea == HeaderArea.InRowHeaderResize) ||
+                (e.X >= r.X && e.X < r.Right) ||
+                (hitColumn.IsHFrozen == true && panel.IsSubPanel == false))
+            {
+                SuperGrid.DisableAutoScrolling();
+
+                switch (_MouseDownHitArea)
+                {
+                    case HeaderArea.InContent:
+                        hitColumn = _MouseDownHitItem as GridColumn;
+
+                        if (hitColumn != null)
+                        {
+                            if (_HitArea == HeaderArea.InGroupBox &&
+                                hitColumn.GroupBoxEffectsEx != GroupBoxEffects.None)
+                            {
+                                if (ColumnInGroupBox(panel, e, hitColumn) == true)
+                                    return (true);
+                            }
+                        }
+
+                        if (_HitItem == null)
+                            return (false);
+
+                        ColumnInContent(e);
+                        break;
+
+                    case HeaderArea.InResize:
+                        ColumnInResize(e.Location, e);
+                        break;
+                }
+
+                return (true);
+            }
+
+            return (false);
+        }
+
+        #region ColumnInGroupBox
+
+        private bool ColumnInGroupBox(
+            GridPanel panel, MouseEventArgs e, GridColumn hitColumn)
+        {
+            if (e.Button == MouseButtons.Left)
+            {
+                if (hitColumn != null)
+                {
+                    if (panel.VisibleColumnCount > 1)
+                    {
+                        if (panel.GroupByRow.DragStart(hitColumn) == true)
+                        {
+                            ResetColumnState();
+                            StopReorder();
+
+                            _MouseDownHitItem = null;
+                            _HitArea = HeaderArea.NoWhere;
+                            _HitItem = null;
+
+                            return (true);
+                        }
+                    }
+                }
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region ColumnInContent
+
+        private void ColumnInContent(MouseEventArgs e)
+        {
+            if (IsDesignerHosted == false)
+            {
+                if (e.Button == MouseButtons.Left)
+                {
+                    GridPanel panel = Parent as GridPanel;
+
+                    if (panel != null)
+                    {
+                        if (DragStarted(panel, e) == false)
+                        {
+                            if (panel.ColumnDragBehavior == ColumnDragBehavior.ExtendClickBehavior)
+                            {
+                                switch (panel.ColumnHeaderClickBehavior)
+                                {
+                                    case ColumnHeaderClickBehavior.SortAndReorder:
+                                        ProcessMove(e.Location);
+                                        break;
+
+                                    case ColumnHeaderClickBehavior.Select:
+                                        if (_HitItem != _LastHitItem)
+                                            ProcessExtendSelection(panel, true);
+                                        break;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        #region DragStarted
+
+        private bool DragStarted(GridPanel panel, MouseEventArgs e)
+        {
+            if (_HitItem is GridColumn)
+            {
+                if (_DragSelection == true)
+                {
+                    if (_DragStarted == false)
+                    {
+                        if (DragDrop.DragStarted(_MouseDownPoint, e.Location) == true)
+                        {
+                            _DragStarted = true;
+
+                            if (SuperGrid.DoItemDragEvent((GridColumn)_HitItem, e) == true)
+                            {
+                                _DragSelection = false;
+
+                                ExtendSelection(panel, true);
+                            }
+                        }
+                    }
+
+                    return (true);
+                }
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region ProcessMove
+
+        private void ProcessMove(Point pt)
+        {
+            if (_Reordering == false)
+                StartReorder(pt);
+            else
+                ContinueReorder(pt);
+        }
+
+        #endregion
+
+        #region ProcessExtendSelection
+
+        private void ProcessExtendSelection(GridPanel panel, bool extend)
+        {
+            bool ckey = (panel.MultiSelect == true) ?
+                ((Control.ModifierKeys & Keys.Control) == Keys.Control) : false;
+
+            if (ckey == true)
+                ProcessControlExtend(panel);
+            else
+                ProcessNonControlExtend(panel, extend);
+
+            _lastSelectedItem = _HitItem;
+        }
+
+        #region ProcessControlExtend
+
+        private void ProcessControlExtend(GridPanel panel)
+        {
+            int startIndex = 0;
+            int endIndex = 0;
+
+            if (GetSelectionIndicees(panel,
+                _lastSelectedItem, _HitItem, ref startIndex, ref endIndex, false) == true)
+            {
+                int mdStart = 0;
+                int mdEnd = 0;
+
+                GetSelectionIndicees(panel,
+                    _MouseDownHitItem, _MouseDownHitItem, ref mdStart, ref mdEnd, true);
+
+                panel.NormalizeIndices(true, mdStart, ref startIndex, ref endIndex);
+
+                int[] map = panel.Columns.DisplayIndexMap;
+
+                for (int j = startIndex; j <= endIndex; j++)
+                {
+                    GridColumn column = panel.Columns[map[j]];
+
+                    if (j < mdStart || j > mdEnd)
+                        column.IsSelected = !column.IsSelected;
+                }
+            }
+        }
+
+        #endregion
+
+        #region ProcessNonControlExtend
+
+        private void ProcessNonControlExtend(GridPanel panel, bool extend)
+        {
+            int startIndex = 0;
+            int endIndex = 0;
+
+            if (GetSelectionIndicees(panel,
+                panel.SelectionColumnAnchor, _HitItem, ref startIndex, ref endIndex, true) == true)
+            {
+                int[] map = panel.Columns.DisplayIndexMap;
+
+                if (panel.OnlyColumnsSelected(startIndex, endIndex) == false)
+                {
+                    if (extend == false)
+                        panel.ClearAll();
+                    
+                    for (int i = 0; i < map.Length; i++)
+                    {
+                        int index = map[i];
+
+                        GridColumn column = panel.Columns[index];
+
+                        if (column.Visible == true)
+                            column.IsSelected = (i >= startIndex && i <= endIndex);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region GetSelectionIndicees
+
+        private bool GetSelectionIndicees(GridPanel panel,
+            object start, object end, ref int startIndex, ref int endIndex, bool reorder)
+        {
+            if (GetSelectionStartIndex(panel, start, ref startIndex) == false)
+                return (false);
+
+            if (GetSelectionEndIndex(panel, end, ref endIndex) == false)
+                return (false);
+
+            if (startIndex > endIndex)
+            {
+                if (start is ColumnGroupHeader)
+                    startIndex = ((ColumnGroupHeader)start).EndDisplayIndex;
+
+                if (end is ColumnGroupHeader)
+                    endIndex = ((ColumnGroupHeader)end).StartDisplayIndex;
+
+                if (reorder == true)
+                {
+                    int tempIndex = startIndex;
+                    startIndex = endIndex;
+                    endIndex = tempIndex;
+                }
+            }
+
+            return (true);
+        }
+
+        #endregion
+
+        #region GetSelectionStartIndex
+
+        private bool GetSelectionStartIndex(GridPanel panel, object item, ref int startIndex)
+        {
+            startIndex = -1;
+
+            if (item is ColumnGroupHeader)
+                startIndex = ((ColumnGroupHeader) item).StartDisplayIndex;
+
+            else if (item is GridColumn)
+                startIndex = panel.Columns.GetDisplayIndex(((GridColumn) item).ColumnIndex);
+
+            return (startIndex >= 0);
+        }
+
+        #endregion
+
+        #region GetSelectionEndIndex
+
+        private bool GetSelectionEndIndex(GridPanel panel, object item, ref int endIndex)
+        {
+            endIndex = -1;
+
+            if (item is ColumnGroupHeader)
+                endIndex = ((ColumnGroupHeader)item).EndDisplayIndex;
+
+            else if (item is GridColumn)
+                endIndex = panel.Columns.GetDisplayIndex(((GridColumn) item).ColumnIndex);
+
+            return (endIndex >= 0);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region ColumnInResize
+
+        private void ColumnInResize(Point pt, MouseEventArgs e)
+        {
+            if (e.Button == MouseButtons.Left)
+            {
+                if (_Resizing == false)
+                {
+                    StartResize();
+                }
+                else
+                {
+                    GridPanel panel = Parent as GridPanel;
+
+                    if (panel != null)
+                    {
+                        if (panel.ImmediateResize == false)
+                            ContinueResize(panel, pt);
+                        else
+                            ResizeColumn(panel, pt.X - MouseDownPoint.X);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GroupHeaderMouseDownMove
+
+        private bool GroupHeaderMouseDownMove(MouseEventArgs e, GridPanel panel)
+        {
+            ColumnGroupHeader cgh = (ColumnGroupHeader)_MouseDownHitItem;
+
+            Rectangle r = ViewRect;
+
+            if ((_MouseDownHitArea == HeaderArea.InResize) ||
+                (_MouseDownHitArea == HeaderArea.InRowHeaderResize) || (e.X >= r.X && e.X < r.Right) ||
+                (panel.IsSubPanel == false && IsGroupHeaderHFrozen(panel, cgh) == true))
+            {
+                SuperGrid.DisableAutoScrolling();
+
+                switch (_MouseDownHitArea)
+                {
+                    case HeaderArea.InContent:
+                        GroupHeaderInContent(e);
+                        break;
+                }
+
+                return (true);
+            }
+
+            return (false);
+        }
+
+        #region GroupHeaderInContent
+
+        private void GroupHeaderInContent(MouseEventArgs e)
+        {
+            if (IsDesignerHosted == false)
+            {
+                if (e.Button == MouseButtons.Left)
+                {
+                    GridPanel panel = Parent as GridPanel;
+
+                    if (panel != null)
+                    {
+                        if (DragStarted(panel, e) == false)
+                        {
+                            if (panel.ColumnDragBehavior == ColumnDragBehavior.ExtendClickBehavior)
+                            {
+                                switch (panel.ColumnGroupHeaderClickBehavior)
+                                {
+                                    case ColumnHeaderClickBehavior.SortAndReorder:
+                                        ProcessMove(e.Location);
+                                        break;
+
+                                    case ColumnHeaderClickBehavior.Select:
+                                        if (_HitItem != _LastHitItem)
+                                            ProcessExtendSelection(panel, true);
+                                        break;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region InternalMouseDown
+
+        internal override void InternalMouseDown(MouseEventArgs e)
+        {
+            GridPanel panel = Parent as GridPanel;
+
+            if (panel != null)
+            {
+                if (EndCurrentOp() == true)
+                {
+                    _MouseDownPoint = e.Location;
+                    _MouseDownButtons = e.Button;
+
+                    _MouseDownHitItem = _HitItem;
+                    _MouseDownHitArea = _HitArea;
+
+                    _DragSelection = false;
+                    _DragStarted = false;
+
+                    if (_HitItem is GridColumn)
+                        ColumnMouseDown(e, panel);
+
+                    else if (_HitItem is ColumnGroupHeader)
+                        GroupHeaderMouseDown(e, panel);
+
+                    else
+                        RowHeaderMouseDown(e, panel);
+
+                    _lastSelectedItem = _HitItem;
+                }
+
+                SuperGrid.DoColumnHeaderMouseDownEvent(this, e);
+
+                base.InternalMouseDown(e);
+            }
+        }
+
+        #region EndCurrentOp
+
+        private bool EndCurrentOp()
+        {
+            GridCell ecell = SuperGrid.EditorCell;
+
+            if (ecell != null)
+            {
+                if (ecell.EndEdit() == false)
+                {
+                    _MouseDownHitArea = HeaderArea.NoWhere;
+
+                    return (false);
+                }
+            }
+
+            if (_Reordering == true || _Resizing == true)
+            {
+                StopResize();
+                StopReorder();
+
+                InvalidateRender();
+            }
+
+            return (true);
+        }
+
+        #endregion
+
+        #region ColumnMouseDown
+
+        private void ColumnMouseDown(MouseEventArgs e, GridPanel panel)
+        {
+            GridColumn hitColumn = (GridColumn)_HitItem;
+
+            if (_HitArea == HeaderArea.InContent)
+            {
+                Capture = true;
+
+                ColumnInContentMouseDown(e, panel, hitColumn);
+            }
+            else if (_HitArea == HeaderArea.InMarkup)
+            {
+                InvalidateHeader(panel, hitColumn);
+            }
+            else
+            {
+                if (e.Button == MouseButtons.Left)
+                {
+                    Capture = true;
+
+                    switch (_HitArea)
+                    {
+                        case HeaderArea.InResize:
+                            ColumnInResizeMouseDown(e, panel);
+                            break;
+
+                        case HeaderArea.InFilterMenu:
+                            ColumnInFilterMouseDown(panel, hitColumn);
+                            break;
+                    }
+                }
+            }
+        }
+
+        #region ColumnInContentMouseDown
+
+        private void ColumnInContentMouseDown(
+            MouseEventArgs e, GridPanel panel, GridColumn hitColumn)
+        {
+            _MouseDownDelta = e.X - hitColumn.BoundsRelative.X;
+
+            if (panel.IsSubPanel == true || hitColumn.IsHFrozen == false)
+                _MouseDownDelta += HScrollOffset;
+
+            if (hitColumn.AllowSelection == true)
+            {
+                _LastHitItem = null;
+                _Reordering = false;
+
+                if (panel.ColumnHeaderClickBehavior == ColumnHeaderClickBehavior.Select)
+                {
+                    if (hitColumn.IsSelected == false ||
+                        ((Control.ModifierKeys & (Keys.Control | Keys.Shift)) != Keys.None))
+                    {
+                        ExtendSelection(panel, true);
+                    }
+                    else
+                    {
+                        _DragSelection = true;
+                    }
+                }
+                else
+                {
+                    InvalidateItem(panel, _MouseDownHitItem);
+                }
+            }
+        }
+
+        #region ExtendSelection
+
+        private void ExtendSelection(GridPanel panel, bool capture)
+        {
+            if (capture == true)
+                Capture = true;
+
+            if (panel.SelectionColumnAnchor == null ||
+                (Control.ModifierKeys & Keys.Shift) != Keys.Shift)
+            {
+                panel.SelectionColumnAnchor = _MouseDownHitItem;
+            }
+
+            if ((Control.ModifierKeys & Keys.Control) == Keys.Control)
+            {
+                int startIndex = 0;
+                int endIndex = 0;
+
+                if (GetSelectionIndicees(panel, _MouseDownHitItem,
+                    _MouseDownHitItem, ref startIndex, ref endIndex, true) == true)
+                {
+                    int[] map = panel.Columns.DisplayIndexMap;
+
+                    for (int i = startIndex; i <= endIndex; i++)
+                    {
+                        GridColumn column = panel.Columns[map[i]];
+
+                        column.IsSelected = !column.IsSelected;
+                    }
+                }
+            }
+            else
+            {
+                ProcessNonControlExtend(panel, false);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ColumnInResizeMouseDown
+
+        private void ColumnInResizeMouseDown(MouseEventArgs e, GridPanel panel)
+        {
+            GridColumn hitColumn = _HitItem as GridColumn;
+
+            if (hitColumn != null)
+            {
+                Capture = true;
+
+                _MouseDownDelta = e.X - hitColumn.BoundsRelative.X;
+
+                if (panel.IsSubPanel == true || hitColumn.IsHFrozen == false)
+                    _MouseDownDelta += HScrollOffset;
+
+                _Resizing = false;
+                _LastHitItem = null;
+            }
+        }
+
+        #endregion
+
+        #region ColumnInFilterMouseDown
+
+        private void ColumnInFilterMouseDown(GridPanel panel, GridColumn column)
+        {
+            ActivateFilterPopup(panel, column);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GroupHeaderMouseDown
+
+        private void GroupHeaderMouseDown(MouseEventArgs e, GridPanel panel)
+        {
+            ColumnGroupHeader cgh = (ColumnGroupHeader)_HitItem;
+
+            if (_HitArea == HeaderArea.InContent)
+            {
+                Capture = true;
+
+                GroupHeaderInContentMouseDown(e, panel, cgh);
+            }
+            else if (_HitArea == HeaderArea.InMarkup)
+            {
+                InvalidateHeader(panel, cgh);
+            }
+            else
+            {
+                if (e.Button == MouseButtons.Left)
+                {
+                    Capture = true;
+
+                    switch (_HitArea)
+                    {
+                        case HeaderArea.InResize:
+                            ColumnInResizeMouseDown(e, panel);
+                            break;
+                    }
+                }
+            }
+        }
+
+        #region GroupHeaderInContentMouseDown
+
+        private void GroupHeaderInContentMouseDown(
+            MouseEventArgs e, GridPanel panel, ColumnGroupHeader cgh)
+        {
+            _MouseDownDelta = e.X - cgh.BoundsRelative.X;
+
+            if (panel.IsSubPanel == true || IsGroupHeaderHFrozen(panel, cgh) == false)
+                _MouseDownDelta += HScrollOffset;
+
+            if (cgh.AllowSelection == true)
+            {
+                _LastHitItem = null;
+                _Reordering = false;
+
+                if (panel.ColumnGroupHeaderClickBehavior == ColumnHeaderClickBehavior.Select)
+                {
+                    if (IsGroupHeaderSelected(cgh) == false ||
+                        ((Control.ModifierKeys & (Keys.Control | Keys.Shift)) != Keys.None))
+                    {
+                        ExtendSelection(panel, true);
+                    }
+                    else
+                    {
+                        _DragSelection = true;
+                    }
+                }
+                else
+                {
+                    InvalidateItem(panel, _MouseDownHitItem);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RowHeaderMouseDown
+
+        private void RowHeaderMouseDown(MouseEventArgs e, GridPanel panel)
+        {
+            if (e.Button == MouseButtons.Left)
+            {
+                Capture = true;
+
+                switch (_HitArea)
+                {
+                    case HeaderArea.InRowHeader:
+                        InRowHeaderMouseDown(panel);
+                        break;
+
+                    case HeaderArea.InRowHeaderResize:
+                        InRowHeaderResizeMouseDown();
+                        break;
+                }
+            }
+        }
+
+        #region InRowHeaderMouseDown
+
+        private void InRowHeaderMouseDown(GridPanel panel)
+        {
+            if (panel.TopLeftHeaderSelectBehavior != TopLeftHeaderSelectBehavior.NoSelection)
+            {
+                bool select = (_SelectAllCount != panel.SelectionUpdateCount);
+
+                if (select == true)
+                {
+                    if (panel.MultiSelect == true)
+                    {
+                        panel.SelectAll();
+                    }
+                    else if (panel.ActiveRow != null)
+                    {
+                        panel.ClearAll();
+                        panel.ActiveRow.IsSelected = true;
+                    }
+                }
+                else
+                {
+                    panel.ClearAll();
+                }
+            }
+        }
+
+        #endregion
+
+        #region InRowHeaderResizeMouseDown
+
+        private void InRowHeaderResizeMouseDown()
+        {
+            Capture = true;
+
+            _Resizing = false;
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region InternalMouseUp
+
+        internal override void InternalMouseUp(MouseEventArgs e)
+        {
+            SuperGrid.DisableAutoScrolling();
+
+            GridPanel panel = Parent as GridPanel;
+
+            if (panel != null)
+            {
+                if (_Reordering == true)
+                {
+                    StopReorder();
+
+                    if (_SeparatorColumn != null && _HitItem != _MouseDownHitItem)
+                        ReorderItem(panel);
+                }
+                else if (_Resizing == true && _ResizeColumn != null)
+                {
+                    StopResize();
+
+                    if (panel.ImmediateResize == false)
+                        ResizeColumn(panel, e.Location.X - MouseDownPoint.X);
+                }
+                else
+                {
+                    if (_HitItem is GridColumn)
+                        ColumnMouseUp(e, panel);
+
+                    else if (_HitItem is ColumnGroupHeader)
+                        GroupHeaderMouseUp(e, panel);
+
+                    else
+                        RowHeaderMouseUp(e, panel);
+                }
+            }
+
+            _MouseDownHitItem = null;
+
+            SuperGrid.DoColumnHeaderMouseUpEvent(this, e);
+
+            base.InternalMouseUp(e);
+        }
+
+        #region ColumnMouseUp
+
+        private void ColumnMouseUp(MouseEventArgs e, GridPanel panel)
+        {
+            GridColumn hitColumn = (GridColumn)_HitItem;
+
+            switch (_MouseDownHitArea)
+            {
+                case HeaderArea.InContent:
+                case HeaderArea.InMarkup:
+                    if (hitColumn != null && hitColumn == _MouseDownHitItem)
+                    {
+                        if (SuperGrid.DoColumnHeaderClickEvent(panel, hitColumn, e) == false)
+                        {
+                            if (e.Button == MouseButtons.Left)
+                            {
+                                DoHeaderMouseUp(panel, panel.ColumnHeaderClickBehavior,
+                                                hitColumn.HeaderTextMarkup, hitColumn);
+
+                                InvalidateHeader(panel, hitColumn);
+                            }
+                        }
+                    }
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region GroupHeaderMouseUp
+
+        private void GroupHeaderMouseUp(MouseEventArgs e, GridPanel panel)
+        {
+            ColumnGroupHeader cgh = (ColumnGroupHeader)_HitItem;
+
+            switch (_MouseDownHitArea)
+            {
+                case HeaderArea.InContent:
+                case HeaderArea.InMarkup:
+                    if (_HitItem == _MouseDownHitItem)
+                    {
+                        if (SuperGrid.DoColumnGroupHeaderClickEvent(panel, this, cgh, e) == false)
+                        {
+                            if (e.Button == MouseButtons.Left)
+                            {
+                                DoHeaderMouseUp(panel, panel.ColumnGroupHeaderClickBehavior,
+                                                cgh.HeaderTextMarkup,
+                                                panel.Columns.ColumnAtDisplayIndex(cgh.StartDisplayIndex));
+
+                                InvalidateHeader(panel, cgh);
+                            }
+                        }
+                    }
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region DoHeaderMouseUp
+
+        private void DoHeaderMouseUp(GridPanel panel,
+            ColumnHeaderClickBehavior cmode, BodyElement bodyElement, GridColumn hitColumn)
+        {
+            if (panel.FlushActiveRow() == true)
+            {
+                if (DoMarkupClick(bodyElement) == false)
+                {
+                    if (_DragSelection == true)
+                        ExtendSelection(panel, false);
+
+                    if (cmode == ColumnHeaderClickBehavior.SortAndReorder && panel.IsSortable == true)
+                        SortColumn(panel, hitColumn);
+                }
+            }
+        }
+
+        #region DoMarkupClick
+
+        private bool DoMarkupClick(BodyElement bodyElement)
+        {
+            if (bodyElement != null)
+            {
+                if (bodyElement.MouseOverElement != null)
+                {
+                    bodyElement.Click(SuperGrid);
+
+                    SuperGrid.Cursor = Cursors.Default;
+
+                    return (true);
+                }
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RowHeaderMouseUp
+
+        private void RowHeaderMouseUp(MouseEventArgs e, GridPanel panel)
+        {
+            switch (_MouseDownHitArea)
+            {
+                case HeaderArea.InRowHeader:
+                    SuperGrid.DoColumnRowHeaderClickEvent(panel);
+                    break;
+
+                case HeaderArea.InRowHeaderResize:
+                    if (_Resizing == true)
+                    {
+                        StopResize();
+
+                        if (panel.ImmediateResize == false)
+                            ResizeRowHeader(panel, e.Location.X - MouseDownPoint.X);
+                    }
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InternalMouseDoubleClick
+
+        internal override void InternalMouseDoubleClick(MouseEventArgs e)
+        {
+            GridColumn hitColumn = _HitItem as GridColumn;
+
+            if (hitColumn != null)
+            {
+                if (SuperGrid.DoColumnHeaderDoubleClickEvent(hitColumn, e) == false)
+                {
+                    switch (_HitArea)
+                    {
+                        case HeaderArea.InResize:
+                            if (hitColumn.GetAutoSizeMode() == ColumnAutoSizeMode.None)
+                            {
+                                RowScope scope = (GridPanel.VirtualMode == true || hitColumn.GridPanel.Rows.Count > 1000)
+                                                     ? RowScope.OnScreenRows
+                                                     : RowScope.AllRows;
+
+                                hitColumn.Width = Dpi.DescaleWidth(hitColumn.GetMaximumCellSize(scope, true).Width);
+                            }
+                            break;
+                    }
+                }
+            }
+            else
+            {
+                if (_HitArea == HeaderArea.InRowHeader)
+                    SuperGrid.DoColumnRowHeaderDoubleClickEvent(GridPanel);
+            }
+
+            base.InternalMouseDoubleClick(e);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Column Reorder
+
+        #region StartReorder
+
+        private void StartReorder(Point pt)
+        {
+            if (_MouseDownHitItem != null && Math.Abs(MouseDownPoint.X - pt.X) > 5)
+            {
+                Capture = true;
+
+                _Reordering = true;
+                _SeparatorColumn = null;
+
+                _HeaderFw = new FloatWindow();
+                _HeaderFw.Opacity = .3;
+                _HeaderFw.Owner = SuperGrid.FindForm();
+                _HeaderFw.Paint += ColumnHeaderFwPaint;
+
+                _SeparatorFw = new FloatWindow();
+                _SeparatorFw.Opacity = .5;
+                _SeparatorFw.BackColor = Color.Black;
+                _SeparatorFw.Owner = SuperGrid.FindForm();
+            }
+        }
+
+        #endregion
+
+        #region StopReorder
+
+        private void StopReorder()
+        {
+            _Reordering = false;
+
+            if (_HeaderFw != null)
+            {
+                _HeaderFw.Close();
+                _HeaderFw.Paint -= ColumnHeaderFwPaint;
+                _HeaderFw.Dispose();
+
+                _HeaderFw = null;
+            }
+
+            if (_SeparatorFw != null)
+            {
+                HideSeparator();
+
+                _SeparatorFw.Close();
+                _SeparatorFw.Dispose();
+
+                _SeparatorFw = null;
+            }
+
+            if (_MouseDownHitItem != null)
+                InvalidateItem(GridPanel, _MouseDownHitItem);
+
+            if (_HitItem != null)
+                InvalidateItem(GridPanel, _HitItem);
+        }
+
+        #endregion
+
+        #region ContinueReorder
+
+        private void ContinueReorder(Point pt)
+        {
+            GridPanel panel = Parent as GridPanel;
+
+            if (panel != null)
+            {
+                if (_HitItem != null && _MouseDownHitItem != null)
+                {
+                    ReorderHeader(pt);
+
+                    if (ValidReorder() == true)
+                    {
+                        ReorderSeparator(pt);
+                    }
+                    else if (_SeparatorFw != null)
+                    {
+                        HideSeparator();
+
+                        _SeparatorColumn = null;
+                    }
+                }
+            }
+        }
+
+        #region ValidReorder
+
+        private bool ValidReorder()
+        {
+            if (IsItemHFrozen(_HitItem) == IsItemHFrozen(_MouseDownHitItem))
+            {
+                object o1 = GetParent(_HitItem);
+                object o2 = GetParent(_MouseDownHitItem);
+
+                if (o1 is GridColumnHeader)
+                    o1 = null;
+
+                if (o2 is GridColumnHeader)
+                    o2 = null;
+
+                return (o1 == o2);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region ReorderHeader
+
+        private void ReorderHeader(Point pt)
+        {
+            GridPanel panel = Parent as GridPanel;
+
+            if (panel != null)
+            {
+                Rectangle r = GetReorderWindowBounds(panel, pt);
+
+                if (r.Width <= 0 || r.Height <= 0)
+                {
+                    _HeaderFw.Hide();
+                }
+                else
+                {
+                    r.Location = SuperGrid.PointToScreen(r.Location);
+
+                    Size size = _HeaderFw.Size;
+
+                    _HeaderFw.Bounds = r;
+
+                    if (_HeaderFw.Visible == false)
+                        _HeaderFw.Show();
+
+                    else if (r.Size.Equals(size) == false)
+                        _HeaderFw.Refresh();
+                }
+            }
+        }
+
+        #region GetReorderWindowBounds
+
+        private Rectangle GetReorderWindowBounds(GridPanel panel, Point pt)
+        {
+            Rectangle r = GetReorderBounds(panel, _MouseDownHitItem);
+            Rectangle t = SViewRect;
+
+            r.X = (pt.X - _MouseDownDelta);
+
+            int x = Math.Max(r.X, t.X);
+
+            if (r.X < x)
+            {
+                _OrderTextOffset = r.X - x;
+
+                r.X = x;
+                r.Width += _OrderTextOffset;
+            }
+            else
+            {
+                _OrderTextOffset = 0;
+            }
+
+            int n = r.Right;
+
+            x = Math.Min(n, t.Right);
+
+            if (r.Right > x)
+                r.Width -= (r.Right - x);
+
+            if (r.Bottom > t.Bottom)
+                r.Height -= (r.Bottom - t.Bottom);
+
+            return (r);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ReorderSeparator
+
+        private void ReorderSeparator(Point pt)
+        {
+            GridPanel panel = GridPanel;
+            Rectangle r = GetReorderBounds(panel, _HitItem);
+
+            Rectangle t = SViewRect;
+
+            if (r.Right > t.Right)
+                r.Width = t.Right - r.X;
+
+            bool isRight = (pt.X > r.X + r.Width / 2);
+            GridColumn column = GetSeparatorColumn(panel, isRight);
+
+            if (_SeparatorColumn != column || _SeparatorIsRight != isRight)
+            {
+                _SeparatorColumn = column;
+                _SeparatorIsRight = isRight;
+
+                if (column != null)
+                {
+                    r = GetReorderSeparatorBounds(panel, r, isRight);
+                    r.Location = SuperGrid.PointToScreen(r.Location);
+
+                    _SeparatorFw.Show();
+
+                    _SeparatorFw.Bounds = r;
+                    _SeparatorFw.Size = r.Size;
+                }
+                else
+                {
+                    HideSeparator();
+                }
+            }
+            else
+            {
+                if (_SeparatorColumn!= null)
+                    _SeparatorFw.Show();
+            }
+        }
+
+        #region HideSeparator
+
+        private void HideSeparator()
+        {
+            if (_SeparatorFw != null)
+                _SeparatorFw.Hide();
+        }
+
+        #endregion
+
+        #region GetSeparatorColumn
+
+        private GridColumn GetSeparatorColumn(GridPanel panel, bool isRight)
+        {
+            if (_HitItem is GridColumn)
+                return ((GridColumn) _HitItem);
+
+            ColumnGroupHeader cgh = (ColumnGroupHeader)_HitItem;
+
+            if (cgh != null)
+            {
+                GridColumnCollection columns = panel.Columns;
+
+                int index = (isRight == true)
+                    ? cgh.EndDisplayIndex : cgh.StartDisplayIndex;
+
+                return (columns[columns.DisplayIndexMap[index]]);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetReorderSeparatorBounds
+
+        private Rectangle GetReorderSeparatorBounds(
+            GridPanel panel, Rectangle r, bool isRight)
+        {
+            if (isRight == true)
+                r.X = r.Right - (SeparatorWidth >> 1);
+            else
+                r.X -= (SeparatorWidth >> 1);
+
+            r.Width = SeparatorWidth;
+
+            if (r.X >= panel.BoundsRelative.Right - 2)
+                r.X = panel.BoundsRelative.Right - 3;
+
+            Rectangle t = SViewRect;
+
+            if (r.Bottom > t.Bottom)
+                r.Height -= (r.Bottom - t.Bottom);
+
+            if (r.X < t.X)
+                r.X = t.X;
+
+            else if (r.Right > t.Right)
+                r.X = t.Right - SeparatorWidth;
+
+            return (r);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region GetReorderBounds
+
+        private Rectangle GetReorderBounds(GridPanel panel, object item)
+        {
+            Rectangle r = BoundsRelative;
+
+            if (item is GridColumn)
+            {
+                GridColumn column = (GridColumn)item;
+                int index = panel.Columns.GetDisplayIndex(column);
+
+                ColumnGroupHeader cgh = GetParentHeader(index);
+
+                if (cgh != null)
+                    r.Y = r.Bottom - (cgh.Size.Height - cgh.BoundsRelative.Height);
+
+                r.Height = (panel.BoundsRelative.Height - (r.Y - panel.BoundsRelative.Y));
+
+                r.X = column.BoundsRelative.X;
+                r.Width = column.BoundsRelative.Width;
+
+                if (panel.IsSubPanel == true || column.IsHFrozen == false)
+                    r.X -= HScrollOffset;
+
+                if (IsVFrozen == false)
+                    r.Y -= VScrollOffset;
+
+                return (r);
+            }
+
+            if (item is ColumnGroupHeader)
+            {
+                ColumnGroupHeader cgh = (ColumnGroupHeader)item;
+
+                r.Y = r.Bottom - cgh.Size.Height;
+                r.Height = (panel.BoundsRelative.Height - (r.Y - panel.BoundsRelative.Y));
+
+                r.X = cgh.BoundsRelative.X;
+                r.Width = cgh.BoundsRelative.Width;
+
+                if (panel.IsSubPanel == true || IsGroupHeaderHFrozen(panel, cgh) == false)
+                    r.X -= HScrollOffset;
+
+                if (IsVFrozen == false)
+                    r.Y -= VScrollOffset;
+            }
+
+            return (r);
+        }
+
+        #endregion
+
+        #region ReorderItem
+
+        private void ReorderItem(GridPanel panel)
+        {
+            if (_MouseDownHitItem is GridColumn)
+                ReorderColumn(panel);
+
+            if (_MouseDownHitItem is ColumnGroupHeader)
+                ReorderGroupHeader(panel);
+        }
+
+        #region ReorderColumn
+
+        private void ReorderColumn(GridPanel panel)
+        {
+            GridColumn hitColumn = (GridColumn)_MouseDownHitItem;
+            GridColumnCollection columns = _Columns;
+
+            int[] map = columns.DisplayIndexMap;
+
+            int curIndex = columns.GetDisplayIndex(hitColumn);
+            int sepIndex = columns.GetDisplayIndex(_SeparatorColumn);
+
+            if (curIndex > sepIndex && _SeparatorIsRight == true && sepIndex < map.Length - 1)
+                sepIndex++;
+
+            else if (curIndex < sepIndex && _SeparatorIsRight == false && sepIndex > 0)
+                sepIndex--;
+
+            if (sepIndex != curIndex)
+            {
+                ColumnGroupHeader parent = GetParent(hitColumn) as ColumnGroupHeader;
+
+                int[] dmap = new int[map.Length];
+
+                if (sepIndex < curIndex)
+                {
+                    for (int i = curIndex; i > sepIndex; i--)
+                    {
+                        map[i] = map[i - 1];
+                        dmap[i - 1] = 1;
+                    }
+                }
+                else
+                {
+                    for (int i = curIndex; i < sepIndex; i++)
+                    {
+                        map[i] = map[i + 1];
+                        dmap[i + 1] = -1;
+                    }
+                }
+
+                map[sepIndex] = hitColumn.ColumnIndex;
+                dmap[curIndex] = sepIndex - curIndex;
+
+                for (int i = 0; i < map.Length; i++)
+                    columns[map[i]].DisplayIndex = i;
+
+                UpdateGroupHeaderRanges(parent != null ? parent.GroupHeaders : GroupHeaders, dmap);
+
+                SuperGrid.UpdateStyleCount();
+                SuperGrid.PrimaryGrid.InvalidateRender();
+
+                SuperGrid.DoColumnMovedEvent(panel, hitColumn);
+            }
+        }
+
+        #endregion
+
+        #region ReorderGroupHeader
+
+        private void ReorderGroupHeader(GridPanel panel)
+        {
+            ColumnGroupHeader cgh = (ColumnGroupHeader)_MouseDownHitItem;
+            GridColumnCollection columns = _Columns;
+
+            int[] map = columns.DisplayIndexMap;
+
+            int curStartIndex = cgh.StartDisplayIndex;
+            int curEndIndex = cgh.EndDisplayIndex;
+
+            int sepIndex = columns.GetDisplayIndex(_SeparatorColumn);
+
+            if (curStartIndex > sepIndex && _SeparatorIsRight == true && sepIndex < map.Length - 1)
+                sepIndex++;
+
+            else if (curEndIndex < sepIndex && _SeparatorIsRight == false && sepIndex > 0)
+                sepIndex--;
+
+            if (sepIndex != curStartIndex && sepIndex != curEndIndex)
+            {
+                ColumnGroupHeader parent = GetParent(cgh) as ColumnGroupHeader;
+
+                int n = curEndIndex - curStartIndex + 1;
+
+                int[] temp = new int[n];
+                int[] dmap = new int[map.Length];
+
+                for (int i = 0; i < n; i++)
+                    temp[i] = map[curStartIndex + i];
+
+                for (int i = 0; i < dmap.Length; i++)
+                    dmap[i] = 0;
+
+                if (sepIndex < curStartIndex)
+                {
+                    for (int i = curStartIndex - 1; i >= sepIndex; i--)
+                    {
+                        map[i + n] = map[i];
+                        dmap[i] = n;
+                    }
+
+                    for (int i = 0; i < n; i++)
+                        map[sepIndex + i] = temp[i];
+
+                    for (int i = curStartIndex; i <= curEndIndex; i++)
+                        dmap[i] = sepIndex - curStartIndex;
+                }
+                else
+                {
+                    for (int i = curEndIndex + 1; i <= sepIndex; i++)
+                    {
+                        map[i - n] = map[i];
+                        dmap[i] = -n;
+                    }
+
+                    for (int i = 0; i < n; i++)
+                        map[sepIndex - n + i + 1] = temp[i];
+
+                    for (int i = curStartIndex; i <= curEndIndex; i++)
+                        dmap[i] = sepIndex - curEndIndex;
+                }
+
+                for (int i = 0; i < map.Length; i++)
+                    columns[map[i]].DisplayIndex = i;
+
+                UpdateGroupHeaderRanges(parent != null ? parent.GroupHeaders : cgh.Collection, dmap);
+
+                SuperGrid.UpdateStyleCount();
+                SuperGrid.PrimaryGrid.InvalidateRender();
+
+                for (int i = curStartIndex; i <= curEndIndex; i++)
+                    SuperGrid.DoColumnMovedEvent(panel, columns[map[i]]);
+            }
+        }
+
+        #endregion
+
+        #region UpdateGroupHeaderRanges
+
+        private void UpdateGroupHeaderRanges(ColumnGroupHeaderCollection csc, int[] dmap)
+        {
+            foreach (ColumnGroupHeader cgh in csc)
+            {
+                if (cgh.Visible == true)
+                {
+                    UpdateGroupHeaderRanges(cgh.GroupHeaders, dmap);
+
+                    cgh.StartDisplayIndex += dmap[cgh.StartDisplayIndex];
+                    cgh.EndDisplayIndex += dmap[cgh.EndDisplayIndex];
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ColumnHeaderFwPaint
+
+        void ColumnHeaderFwPaint(object sender, PaintEventArgs e)
+        {
+            GridPanel panel = GridPanel;
+
+            if (_MouseDownHitItem is GridColumn)
+            {
+                GridColumn mouseDownHitColumn = (GridColumn)_MouseDownHitItem;
+                Rectangle r = mouseDownHitColumn.BoundsRelative;
+
+                r.Y = 0;
+                r.X = _OrderTextOffset;
+                r.Height = e.ClipRectangle.Height;
+
+                RenderColumnHeader(e.Graphics, panel, mouseDownHitColumn, r, false);
+
+                r.Width--;
+                r.Height--;
+                e.Graphics.DrawRectangle(Pens.DimGray, r);
+            }
+            else if (_MouseDownHitItem is ColumnGroupHeader)
+            {
+                ColumnGroupHeader cgh = (ColumnGroupHeader)_MouseDownHitItem;
+                Rectangle r = cgh.BoundsRelative;
+
+                r.Y = 0;
+                r.X = _OrderTextOffset;
+                r.Height = e.ClipRectangle.Height;
+
+                RenderGroupHeader(e.Graphics, panel, cgh, r);
+
+                r.Width--;
+                r.Height--;
+                e.Graphics.DrawRectangle(Pens.DimGray, r);
+            }
+        }
+
+        #endregion
+
+        #region SortColumn
+
+        internal void SortColumn(GridPanel panel, GridColumn column)
+        {
+            if (panel.IsSortable == true)
+            {
+                if (column.IsGroupColumn == true)
+                {
+                    column.GroupDirection =
+                        ToggleSortDirection(panel, column.GroupDirection, column.SortCycle);
+
+                    SuperGrid.DoSortChangedEvent(panel);
+                }
+                else if (column.ColumnSortMode != ColumnSortMode.None)
+                {
+                    SortDirection sortDirection =
+                        ToggleSortDirection(panel, column.SortDirection, column.SortCycle);
+
+                    if (column.ColumnSortMode == ColumnSortMode.Multiple &&
+                         ((Control.ModifierKeys & Keys.Shift) == Keys.Shift))
+                    {
+                        panel.AddSort(column, sortDirection);
+                    }
+                    else
+                    {
+                        if (panel.SortColumns.Count > 1)
+                            sortDirection = SortDirection.Ascending;
+
+                        panel.SetSort(column, sortDirection);
+                    }
+
+                    SuperGrid.DoSortChangedEvent(panel);
+                }
+                else
+                {
+                    InvalidateHeader(panel, column);
+                }
+            }
+            else
+            {
+                InvalidateHeader(panel, column);
+            }
+        }
+
+        #region ToggleSortDirection
+
+        private SortDirection ToggleSortDirection(
+            GridPanel panel, SortDirection dir, SortCycle sortCycle)
+        {
+            if (dir == SortDirection.Ascending)
+                return (SortDirection.Descending);
+
+            if (dir == SortDirection.None)
+                return (SortDirection.Ascending);
+
+            if (sortCycle == SortCycle.NotSet)
+            {
+                sortCycle = panel.SortCycle;
+
+                if (sortCycle == SortCycle.NotSet)
+                    sortCycle = SortCycle.AscDesc;
+            }
+
+            return (sortCycle == SortCycle.AscDescNone ? SortDirection.None : SortDirection.Ascending);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region Column Resize
+
+        #region StartResize
+
+        private void StartResize()
+        {
+            GridPanel panel = Parent as GridPanel;
+
+            if (panel != null)
+            {
+                _ResizeColumn = _MouseDownHitItem as GridColumn;
+
+                if (_ResizeColumn != null)
+                {
+                    _Resizing = true;
+                    _ResizeWidth = _ResizeColumn.Size.Width;
+
+                    _HitItem = _ResizeColumn;
+                    _HitArea = HeaderArea.InResize;
+
+                    if (panel.ImmediateResize == false)
+                    {
+                        _SeparatorFw = new FloatWindow();
+                        _SeparatorFw.Opacity = .5;
+                        _SeparatorFw.BackColor = Color.Black;
+                        _SeparatorFw.Owner = SuperGrid.FindForm();
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region StopResize
+
+        private void StopResize()
+        {
+            _Resizing = false;
+
+            if (_SeparatorFw != null)
+            {
+                HideSeparator();
+
+                _SeparatorFw.Close();
+                _SeparatorFw.Dispose();
+
+                _SeparatorFw = null;
+            }
+        }
+
+        #endregion
+
+        #region ContinueResize
+
+        private void ContinueResize(GridPanel panel, Point pt)
+        {
+            Rectangle r = panel.BoundsRelative;
+            r.Y = BoundsRelative.Y;
+
+            if (panel.IsSubPanel == true)
+                r.Y -= VScrollOffset;
+
+            r.X -= HScrollOffset;
+
+            if (pt.X > r.X)
+            {
+                Rectangle t = _ResizeColumn.BoundsRelative;
+                t.X -= HScrollOffset;
+
+                int width = pt.X - t.X;
+
+                int n = Dpi.Width(_ResizeColumn.MinimumWidth);
+
+                if (width < n)
+                    pt.X = t.X + n;
+
+                if (pt.X >= SuperGrid.PrimaryGrid.BoundsRelative.Right - Dpi.Width2)
+                {
+                    HideSeparator();
+                }
+                else
+                {
+                    if (pt.X == panel.BoundsRelative.Right - 1)
+                        pt.X -= 1;
+
+                    r.X = pt.X;
+
+                    r.Width = Dpi.Width(SeparatorWidth);
+                    r.Height -= (BoundsRelative.Y - panel.BoundsRelative.Y);
+
+                    t = SViewRect;
+
+                    if (r.Bottom > t.Bottom)
+                        r.Height -= (r.Bottom - t.Bottom);
+
+                    r.Location = SuperGrid.PointToScreen(r.Location);
+
+                    _SeparatorFw.Show();
+
+                    _SeparatorFw.Bounds = r;
+                    _SeparatorFw.Size = r.Size;
+                }
+            }
+        }
+
+        #endregion
+
+        #region ResizeColumn
+
+        #region ResizeColumn
+
+        private void ResizeColumn(GridPanel panel, int width)
+        {
+            ColumnAutoSizeMode autoSizeMode = _ResizeColumn.GetAutoSizeMode();
+
+            if (autoSizeMode == ColumnAutoSizeMode.None)
+                ResizeNoneColumn(panel, width);
+
+            else if (autoSizeMode == ColumnAutoSizeMode.Fill)
+                ResizeFillColumn(panel, width);
+
+        }
+
+        #endregion
+
+        #region ResizeNoneColumn
+
+        private void ResizeNoneColumn(GridPanel panel, int width)
+        {
+            int newWidth = _ResizeWidth + width;
+
+            int n = Dpi.Width(_ResizeColumn.MinimumWidth);
+
+            if (newWidth < n)
+                newWidth = n;
+
+            if (_ResizeColumn.ResizeMode == ColumnResizeMode.MoveFollowingElements)
+            {
+                _ResizeColumn.Width = Dpi.DescaleWidth(newWidth);
+            }
+            else if (_ResizeColumn.ResizeMode == ColumnResizeMode.MaintainTotalWidth)
+            {
+                GridColumn ncolumn = panel.Columns.GetNextVisibleColumn(_ResizeColumn);
+
+                if ((ncolumn == null) || (ncolumn.GetAutoSizeMode() != ColumnAutoSizeMode.None))
+                {
+                    _ResizeColumn.Width = Dpi.DescaleWidth(newWidth);
+                }
+                else
+                {
+                    int twidth = _ResizeColumn.Size.Width + ncolumn.Size.Width;
+                    int nwidth = twidth - newWidth;
+
+                    int n2 = Dpi.Width(ncolumn.MinimumWidth);
+
+                    if (nwidth < n2)
+                        nwidth = n2;
+
+                    newWidth = twidth - nwidth;
+
+                    _ResizeColumn.Width = Dpi.DescaleWidth(newWidth);
+                    ncolumn.Width = Dpi.DescaleWidth(nwidth);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ResizeFillColumn
+
+        private void ResizeFillColumn(GridPanel panel, int width)
+        {
+            int fillWeight = 0;
+            int fillWidth = 0;
+
+            GridColumnCollection columns = _Columns;
+
+            int colDisplayIndex = columns.GetDisplayIndex(_ResizeColumn);
+
+            int[] map = columns.DisplayIndexMap;
+            for (int i = 0; i < map.Length; i++)
+            {
+                int index = map[i];
+
+                GridColumn column = columns[index];
+
+                if (column.Visible == true)
+                {
+                    if (column.GetAutoSizeMode() == ColumnAutoSizeMode.Fill)
+                    {
+                        fillWidth += column.Size.Width;
+
+                        if (i != colDisplayIndex)
+                            fillWeight += column.FillWeight;
+                    }
+                }
+            }
+
+            if (fillWidth > 0 && fillWeight > 0)
+            {
+                int nw = _ResizeWidth + width;
+                int newFillWidth = fillWidth - nw;
+
+                for (int i = 0; i < map.Length; i++)
+                {
+                    int index = map[i];
+
+                    GridColumn column = columns[index];
+
+                    if (column.Visible == true)
+                    {
+                        if (column.GetAutoSizeMode() == ColumnAutoSizeMode.Fill)
+                        {
+                            float colWidth;
+
+                            if (i != colDisplayIndex)
+                                colWidth = (int)(newFillWidth * (float)column.FillWeight / fillWeight);
+                            else
+                                colWidth = nw;
+
+                            int n = Dpi.Width(column.MinimumWidth);
+
+                            if (colWidth < n)
+                                colWidth = n;
+
+                            column.FillWeight = (int)((colWidth * 1000) / fillWidth);
+                        }
+                    }
+                }
+
+                panel.SuperGrid.Invalidate();
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region RowHeader Resize
+
+        #region ContinueRowHeaderResize
+
+        private void ContinueRowHeaderResize(GridPanel panel, Point pt)
+        {
+            Rectangle r = panel.BoundsRelative;
+            r.Y = BoundsRelative.Y;
+
+            if (panel.IsSubPanel == true)
+                r.Y -= VScrollOffset;
+
+            r.X -= HScrollOffset;
+
+            if (pt.X > r.X)
+            {
+                int width = pt.X - r.X;
+
+                if (width < 5)
+                    pt.X = r.X + 5;
+
+                if (pt.X >= SuperGrid.PrimaryGrid.BoundsRelative.Right - 2)
+                {
+                    HideSeparator();
+                }
+                else
+                {
+                    if (pt.X == panel.BoundsRelative.Right - 1)
+                        pt.X--;
+
+                    r.X = pt.X;
+
+                    r.Width = SeparatorWidth;
+                    r.Height -= (BoundsRelative.Y - panel.BoundsRelative.Y);
+
+                    Rectangle t = SViewRect;
+
+                    if (r.Bottom > t.Bottom)
+                        r.Height -= (r.Bottom - t.Bottom);
+
+                    r.Location = SuperGrid.PointToScreen(r.Location);
+
+                    _SeparatorFw.Show();
+
+                    _SeparatorFw.Bounds = r;
+                    _SeparatorFw.Size = r.Size;
+                }
+            }
+        }
+
+        #endregion
+
+        #region ResizeRowHeader
+
+        private void ResizeRowHeader(GridPanel panel, int width)
+        {
+            Rectangle t = panel.ViewRect;
+
+            int n = Math.Max(5, _ResizeWidth + width);
+
+            if (t.Right - 10 < n)
+                n = t.Right - 10;
+
+            n = Dpi.DescaleWidth(n);
+
+            if (panel.RowHeaderWidth != n)
+            {
+                panel.RowHeaderWidth = n;
+
+                panel.SuperGrid.Invalidate();
+
+                SuperGrid.DoRowHeaderResizedEvent(panel);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ActivateFilterPopup
+
+        internal void ActivateFilterPopup(GridPanel panel, GridColumn column)
+        {
+            if (_FilterMenu != null)
+                _FilterMenu.Dispose();
+
+            _FilterMenu = new FilterPopup(panel);
+
+            _LockedColumn = true;
+            _HitArea = HeaderArea.NoWhere;
+
+            _FilterMenu.ActivatePopup(column, ResetColumnState);
+        }
+
+        #endregion
+
+        #region DeactivateFilterPopup
+
+        internal void DeactivateFilterPopup(GridPanel panel, GridColumn column)
+        {
+            FilterPopup fm = _FilterMenu;
+
+            if (fm != null)
+                fm.DeactivatePopup();
+
+        }
+
+        #endregion
+
+        #region GetHitArea
+
+        ///<summary>
+        /// Returns the ColumnHeader hit area
+        /// and column for the given Point
+        ///</summary>
+        ///<param name="pt"></param>
+        ///<param name="column"></param>
+        ///<returns>HeaderArea</returns>
+        public HeaderArea GetHitArea(Point pt, ref GridColumn column)
+        {
+            object hitItem = null;
+
+            HeaderArea area = GetHitArea(pt, ref hitItem, false);
+
+            column = hitItem as GridColumn;
+
+            return (area);
+        }
+
+        ///<summary>
+        /// Returns the ColumnHeader hit area
+        /// and hit object for the given Point
+        ///</summary>
+        ///<param name="pt"></param>
+        ///<param name="hitItem"></param>
+        ///<returns></returns>
+        public HeaderArea GetHitArea(Point pt, ref object hitItem)
+        {
+            return (GetHitArea(pt, ref hitItem, false));
+        }
+
+        private HeaderArea GetHitArea(
+            Point pt, ref object hitItem, bool isMouseDown)
+        {
+            GridPanel panel = Parent as GridPanel;
+
+            if (panel != null)
+            {
+                GridElement hitObject = GetHitObject(panel, pt, isMouseDown);
+
+                if (hitObject == this)
+                    return (GetHeaderHitArea(panel, pt, ref hitItem, isMouseDown));
+
+                if (hitObject == panel.GroupByRow)
+                    return (HeaderArea.InGroupBox);
+            }
+
+            return (HeaderArea.NoWhere);
+        }
+
+        #region GetHitObject
+
+        private GridElement GetHitObject(
+            GridPanel panel, Point pt, bool isMouseDown)
+        {
+            if (isMouseDown == true && panel.GroupByRow.Visible == true)
+            {
+                if (panel.GroupByRow.Bounds.Contains(pt) == true)
+                    return (panel.GroupByRow);
+            }
+
+            if (Capture == true || Bounds.Contains(pt) == true)
+                return (this);
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetHeaderHitArea
+
+        private HeaderArea GetHeaderHitArea(GridPanel panel,
+            Point pt, ref object hitItem, bool isMouseDown)
+        {
+            hitItem = null;
+
+            HeaderArea area = GetRowHeaderArea(panel, pt);
+
+            if (area != HeaderArea.NoWhere)
+                return (area);
+
+            area = GetGroupHeaderArea(panel, pt, ref hitItem);
+
+            if (area != HeaderArea.NoWhere)
+                return (area);
+
+            GridColumn column = GetHitColumn(panel, pt, isMouseDown, false);
+
+            area = GetHeaderArea(panel, pt, ref column);
+
+            hitItem = column;
+
+            return (area);
+        }
+
+        #region GetGroupHeaderArea
+
+        private HeaderArea GetGroupHeaderArea(GridPanel panel, Point pt, ref object hitItem)
+        {
+            ColumnGroupHeader cgh = GetHitGroupHeader(panel, pt, _GroupHeaders);
+
+            if (cgh != null)
+            {
+                if (GetShowRootColumnHeaders(cgh) == false)
+                {
+                    GridColumn coll = GetHitColumn(panel, pt, false, true);
+
+                    if (coll != null)
+                    {
+                        HeaderArea area = GetHeaderArea(panel, pt, ref coll);
+
+                        if (area == HeaderArea.InResize)
+                        {
+                            hitItem = coll;
+
+                            return (area);
+                        }
+                    }
+                }
+
+                hitItem = cgh;
+
+                if (IsMouseDown == false)
+                {
+                    int[] map = panel.Columns.DisplayIndexMap;
+
+                    Rectangle r = GetSubScrollBounds(panel, cgh);
+
+                    if (pt.X < r.Left + 3 && pt.X >= r.Left)
+                    {
+                        if ((uint)cgh.StartDisplayIndex < map.Length)
+                        {
+                            GridColumn column = panel.Columns[map[cgh.StartDisplayIndex]];
+
+                            if (InLeftResizeArea(ref column, panel) == true)
+                            {
+                                hitItem = column;
+
+                                return (HeaderArea.InResize);
+                            }
+                        }
+                    }
+
+                    if ((pt.X > r.Right - 5) && (pt.X < r.Right + 3))
+                    {
+                        if ((uint)cgh.EndDisplayIndex < map.Length)
+                        {
+                            GridColumn column = panel.Columns[map[cgh.EndDisplayIndex]];
+
+                            if (InRightResizeArea(ref column, panel) == true)
+                            {
+                                hitItem = column;
+
+                                return (HeaderArea.InResize);
+                            }
+                        }
+                    }
+                }
+
+                if (cgh.AllowSelection == true)
+                    return (HeaderArea.InContent);
+
+                return (HeaderArea.NoWhere);
+            }
+
+            return (HeaderArea.NoWhere);
+        }
+
+        #endregion
+
+        #region GetHitGroupHeader
+
+        private ColumnGroupHeader GetHitGroupHeader(
+            GridPanel panel, Point pt, ColumnGroupHeaderCollection csc)
+        {
+            if (csc != null)
+            {
+                foreach (ColumnGroupHeader cgh in csc)
+                {
+                    if (cgh.Visible == true)
+                    {
+                        Rectangle r = GetSubScrollBounds(panel, cgh);
+
+                        if (r.Contains(pt) == true)
+                            return (cgh);
+
+                        ColumnGroupHeader csh2 = GetHitGroupHeader(panel, pt, cgh.GroupHeaders);
+
+                        if (csh2 != null)
+                            return (csh2);
+                    }
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetRowHeaderArea
+
+        private HeaderArea GetRowHeaderArea(GridPanel panel, Point pt)
+        {
+            Rectangle r = GetRowHeaderBounds(panel);
+
+            r.Width += Dpi.Width2;
+
+            if (r.Contains(pt) == true)
+            {
+                if (Capture == true)
+                    return (_HitArea);
+
+                r.Width -= Dpi.Width2;
+
+                if (panel.AllowRowHeaderResize == true)
+                {
+                    if (pt.X >= r.Right - Dpi.Width5)
+                        return (HeaderArea.InRowHeaderResize);
+                }
+
+                return (HeaderArea.InRowHeader);
+            }
+
+            return (HeaderArea.NoWhere);
+        }
+
+        #endregion
+
+        #region GetHitColumn
+
+        ///<summary>
+        /// Gets the associated column at the given location
+        ///</summary>
+        ///<param name="x"></param>
+        ///<param name="y"></param>
+        ///<returns></returns>
+        public GridColumn GetHitColumn(int x, int y)
+        {
+            return (GetHitColumn(new Point(x, y)));
+        }
+
+        ///<summary>
+        /// Gets the associated column at the given point
+        ///</summary>
+        ///<param name="pt"></param>
+        ///<returns></returns>
+        public GridColumn GetHitColumn(Point pt)
+        {
+            GridPanel panel = GridPanel;
+
+            if (panel != null)
+                return (GetHitColumn(panel, pt, false, false));
+
+            return (null);
+        }
+
+        private GridColumn GetHitColumn(
+            GridPanel panel, Point pt, bool isMouseDown, bool limit)
+        {
+            int dy = (isMouseDown == true) ? 50 : 0;
+
+            GridColumnCollection columns = _Columns;
+            foreach (GridColumn column in columns)
+            {
+                if (column.Visible == true)
+                {
+                    Rectangle r = GetBounds(panel, column);
+
+                    if (pt.X >= r.Left && pt.X < r.Right)
+                    {
+                        int top = limit ? r.Bottom - 10 : r.Top;
+
+                        if (pt.Y >= top && pt.Y < r.Bottom + dy)
+                            return (column);
+                    }
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetHeaderArea
+
+        private HeaderArea GetHeaderArea(GridPanel panel, Point pt, ref GridColumn column)
+        {
+            GridColumn hcolumn = column;
+
+            if (column == null)
+                column = panel.Columns.LastVisibleColumn;
+
+            if (column != null)
+            {
+                Rectangle r = column.BoundsRelative;
+
+                if (IsVFrozen == false)
+                    r.Y -= VScrollOffset;
+
+                if (panel.IsSubPanel == true || column.IsHFrozen == false)
+                    r.X -= HScrollOffset;
+
+                if (pt.X < r.Left + 3 && pt.X >= r.Left)
+                {
+                    if (InLeftResizeArea(ref column, panel) == true)
+                        return (HeaderArea.InResize);
+                }
+
+                if ((pt.X > r.Right - 5) && (pt.X < r.Right + 3))
+                {
+                    if (InRightResizeArea(ref column, panel) == true)
+                        return (HeaderArea.InResize);
+                }
+
+                if (column.FilterImageBounds.IsEmpty == false)
+                {
+                    Rectangle t = GetScrollBounds(
+                        panel, column, column.FilterImageBounds);
+
+                    t.Inflate(2, 2);
+
+                    if (t.Contains(pt) == true)
+                        return (HeaderArea.InFilterMenu);
+                }
+
+                column = hcolumn;
+
+                if (hcolumn != null)
+                {
+                    if (column.AllowSelection == true)
+                        return (HeaderArea.InContent);
+
+                    return (HeaderArea.NoWhere);
+                }
+            }
+
+            return (HeaderArea.InWhitespace);
+        }
+
+        #region InLeftResizeArea
+
+        private bool InLeftResizeArea(ref GridColumn column, GridPanel panel)
+        {
+            GridColumn pcolumn =
+                panel.Columns.GetPrevVisibleColumn(column);
+
+            if (pcolumn != null)
+            {
+                if (pcolumn.CanResize == true && pcolumn.ResizeMode != ColumnResizeMode.None)
+                {
+                    column = pcolumn;
+
+                    return (true);
+                }
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region InRightResizeArea
+
+        private bool InRightResizeArea(ref GridColumn column, GridPanel panel)
+        {
+            GridColumn nColumn =
+                panel.Columns.GetNextVisibleColumn(column);
+
+            if (nColumn != null && nColumn.Size.Width < 5)
+            {
+                if (nColumn.CanResize == true && nColumn.ResizeMode != ColumnResizeMode.None)
+                    column = nColumn;
+            }
+
+            if (column.CanResize == true && column.ResizeMode != ColumnResizeMode.None)
+                return (true);
+
+            return (false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region GetParent
+
+        ///<summary>
+        ///Gets the object that is the "parent" of the given item
+        ///(either a GridColumn or ColumnGroupHeader).
+        ///</summary>
+        ///<param name="item"></param>
+        ///<returns>Parent or null</returns>
+        public object GetParent(object item)
+        {
+            if (item is GridColumn)
+                return (GetParentHeader((GridColumn) item));
+
+            ColumnGroupHeader cgh = item as ColumnGroupHeader;
+
+            if (cgh != null)
+                return (cgh.Collection.Parent);
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetParentHeader
+
+        ///<summary>
+        ///Gets the object that is the "parent" of the given column.
+        ///</summary>
+        ///<param name="column"></param>
+        ///<returns>parent or null</returns>
+        public object GetParentHeader(GridColumn column)
+        {
+            int index = GridPanel.Columns.GetDisplayIndex(column);
+
+            return (GetParentHeader(index));
+        }
+
+        ///<summary>
+        ///Gets the ColumnGroupHeader that is the "parent" of the column at
+        ///the given DISPLAY index.
+        ///</summary>
+        ///<param name="displayIndex">DISPLAY INDEX</param>
+        ///<returns>parent object or null</returns>
+        public ColumnGroupHeader GetParentHeader(int displayIndex)
+        {
+            ColumnGroupHeader tcsh = GetColumnGroupHeader(GroupHeaders, displayIndex);
+
+            if (tcsh != null)
+            {
+                while (tcsh.GroupHeaders != null)
+                {
+                    ColumnGroupHeader fcsh = GetColumnGroupHeader(tcsh.GroupHeaders, displayIndex);
+
+                    if (fcsh == null || fcsh.Visible == false)
+                        break;
+
+                    tcsh = fcsh;
+                }
+            }
+
+            return (tcsh);
+        }
+
+        #endregion
+
+        #region GetColumnGroupHeader
+
+        internal ColumnGroupHeader GetColumnGroupHeader(int index)
+        {
+            return (GetColumnGroupHeader(GroupHeaders, index));
+        }
+
+        private ColumnGroupHeader GetColumnGroupHeader(IEnumerable<ColumnGroupHeader> csc, int index)
+        {
+            if (csc != null)
+            {
+                foreach (ColumnGroupHeader cgh in csc)
+                {
+                    if (cgh.Contains(index))
+                        return (cgh.Visible == true ? cgh : null);
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region UpdateImageBounds
+
+        internal void UpdateImageBounds(GridPanel panel, GridColumn column)
+        {
+            Rectangle r = GetColumnHeaderBounds(panel, column);
+
+            if (column.AdjustSortImagePositionByMargin == true)
+            {
+                VisualStyle style = GetEffectiveStyle(column);
+
+                r.X += (style.BorderThickness.Left + style.Margin.Left);
+                r.Width -= (style.BorderThickness.Horizontal + style.Margin.Horizontal);
+
+                r.Y += (style.BorderThickness.Top + style.Margin.Top);
+                r.Height -= (style.BorderThickness.Vertical + style.Margin.Vertical);
+            }
+
+            r.Inflate(-3, -3);
+            r.Width--;
+
+            Alignment sortAlignment = (_SortImageAlignment == Alignment.NotSet)
+                ? Alignment.TopCenter : _SortImageAlignment;
+
+            Alignment filterAlignment = (_FilterImageAlignment == Alignment.NotSet)
+                ? Alignment.MiddleLeft : _FilterImageAlignment;
+
+            Rectangle rt = r;
+
+            column.SortImageBounds = Rectangle.Empty;
+            column.FilterImageBounds = Rectangle.Empty;
+
+            Image sortImage = GetColumnSortImage(panel, column);
+
+            if (sortImage != null)
+            {
+                Rectangle t = GetImageBounds(sortImage, sortAlignment, ref r);
+
+                column.SortImageBounds = t;
+            }
+
+            Image filterImage = GetColumnFilterImage(column);
+
+            if (filterImage != null)
+            {
+                Rectangle t;
+
+                if (sortImage != null && filterAlignment == sortAlignment)
+                {
+                    t = GetImageBounds(filterImage, filterAlignment, ref r);
+
+                    switch (filterAlignment)
+                    {
+                        case Alignment.TopCenter:
+                        case Alignment.MiddleCenter:
+                        case Alignment.BottomCenter:
+                            t.X = rt.X + (r.Width - (sortImage.Width +
+                                filterImage.Width)) / 2 + sortImage.Width;
+                            break;
+
+                        case Alignment.TopLeft:
+                        case Alignment.MiddleLeft:
+                        case Alignment.BottomLeft:
+                            break;
+                    }
+                }
+                else
+                {
+                    t = GetImageBounds(filterImage, filterAlignment, ref rt);
+
+                    r.Intersect(rt);
+                }
+
+                column.FilterImageBounds = t;
+            }
+        }
+
+        #endregion
+
+        #region GetColumnHeaderBounds
+
+        private Rectangle GetColumnHeaderBounds(GridPanel panel, GridColumn column)
+        {
+            Rectangle r = GetRelativeBounds(panel, column);
+
+            r.X = column.BoundsRelative.X;
+            r.Width = column.BoundsRelative.Width;
+
+            ColumnGroupHeader cgh = GetParentHeader(panel.Columns.GetDisplayIndex(column.ColumnIndex));
+
+            if (cgh != null)
+            {
+                int n = cgh.Size.Height - cgh.BoundsRelative.Height;
+
+                r.Y = r.Bottom - n;
+                r.Height = n;
+            }
+
+            return (r);
+        }
+
+        #endregion
+
+        #region GetRelativeSubSize
+
+        internal int GetRelativeSubSize(ColumnGroupHeader cgh, int index)
+        {
+            int n = cgh.BoundsRelative.Height;
+
+            foreach (ColumnGroupHeader sub in cgh.GroupHeaders)
+            {
+                if (sub.Contains(index) == true)
+                    n += GetRelativeSubSize(sub, index);
+            }
+
+            return (n);
+        }
+
+        #endregion
+
+        #region GetRowHeaderBounds
+
+        private Rectangle GetRowHeaderBounds(GridPanel panel)
+        {
+            if (panel.ShowRowHeaders == true)
+            {
+                Rectangle r = Bounds;
+                r.Width = panel.RowHeaderWidthEx;
+
+                Rectangle p = panel.PanelBounds;
+
+                if (r.Y < p.Y)
+                {
+                    r.Height -= (p.Y - r.Y + 1);
+                    r.Y = p.Y + 1;
+                }
+
+                return (r);
+            }
+
+            return (Rectangle.Empty);
+        }
+
+        #endregion
+
+        #region Style support
+
+        #region GroupHeader Style support
+
+        #region InvalidateStyle
+
+        ///<summary>
+        ///Invalidates the cached Style
+        ///definition for all defined StyleTypes
+        ///</summary>
+        public void InvalidateStyle()
+        {
+            GridColumnCollection columns = GridPanel.Columns;
+
+            foreach (GridColumn column in columns)
+                column.InvalidateStyle();
+
+            InvalidateStyle(GroupHeaders);
+        }
+
+        ///<summary>
+        ///Invalidates the cached Style
+        ///definition for all GroupHeader defined StyleTypes
+        ///</summary>
+        ///<param name="cgh"></param>
+        public void InvalidateStyle(ColumnGroupHeader cgh)
+        {
+            if (cgh.EffectiveStyles != null)
+            {
+                cgh.EffectiveStyles.Dispose();
+                cgh.EffectiveStyles = null;
+            }
+
+            InvalidateStyle(cgh.GroupHeaders);
+        }
+
+        private void InvalidateStyle(IEnumerable<ColumnGroupHeader> groups)
+        {
+            foreach (ColumnGroupHeader cgh in groups)
+                InvalidateStyle(cgh);
+        }
+
+        ///<summary>
+        ///Invalidate the cached Style
+        ///definition for the given StyleType
+        ///</summary>
+        ///<param name="type"></param>
+        public void InvalidateStyle(StyleType type)
+        {
+            GridColumnCollection columns = GridPanel.Columns;
+
+            foreach (GridColumn column in columns)
+                column.InvalidateStyle(type);
+
+            InvalidateStyle(GroupHeaders, type);
+        }
+
+        ///<summary>
+        ///Invalidate the cached Style
+        ///definition for the given GroupHeader StyleType
+        ///</summary>
+        ///<param name="cgh"></param>
+        ///<param name="type"></param>
+        public void InvalidateStyle(ColumnGroupHeader cgh, StyleType type)
+        {
+            if (cgh.EffectiveStyles != null)
+            {
+                cgh.EffectiveStyles[type].Dispose();
+                cgh.EffectiveStyles[type] = null;
+            }
+
+            InvalidateStyle(cgh.GroupHeaders, type);
+        }
+
+        private void InvalidateStyle(IEnumerable<ColumnGroupHeader> groups, StyleType type)
+        {
+            foreach (ColumnGroupHeader cgh in groups)
+                InvalidateStyle(cgh, type);
+        }
+
+        #endregion
+
+        #region GetSizingStyle
+
+        private ColumnHeaderVisualStyle GetSizingStyle(GridPanel panel, ColumnGroupHeader cgh)
+        {
+            StyleType style = panel.GetSizingStyle();
+
+            if (style == StyleType.NotSet)
+                style = StyleType.Default;
+
+            return (GetEffectiveStyle(cgh, style));
+        }
+
+        #endregion
+
+        #region GetGroupHeaderStyleState
+
+        private StyleState GetGroupHeaderStyleState(ColumnGroupHeader cgh)
+        {
+            StyleState state = StyleState.Default;
+
+            if (_Reordering == true)
+            {
+                if (cgh == _MouseDownHitItem)
+                    state |= StyleState.MouseOver;
+            }
+            else if (_HitItem == cgh)
+            {
+                state |= StyleState.MouseOver;
+            }
+
+            if (IsGroupHeaderSelected(cgh) == true)
+                state |= StyleState.Selected;
+
+            if (IsGroupHeaderReadOnly(cgh) == true)
+                state |= StyleState.ReadOnly;
+
+            return (state);
+        }
+
+        #endregion
+
+        #region GetEffectiveStyle
+
+        ///<summary>
+        /// GetEffectiveStyle
+        ///</summary>
+        ///<param name="cgh"></param>
+        ///<returns></returns>
+        public ColumnHeaderVisualStyle GetEffectiveStyle(ColumnGroupHeader cgh)
+        {
+            StyleState styleState = GetGroupHeaderStyleState(cgh);
+            ColumnHeaderVisualStyle style = GetEffectiveStyle(cgh, styleState);
+
+            return (style);
+        }
+
+        ///<summary>
+        ///Gets the EffectiveStyle for the given StyleState
+        ///</summary>
+        ///<param name="cgh"></param>
+        ///<param name="cellState"></param>
+        ///<returns></returns>
+        public ColumnHeaderVisualStyle
+            GetEffectiveStyle(ColumnGroupHeader cgh, StyleState cellState)
+        {
+            StyleType type = GetStyleType(cellState);
+
+            return (GetEffectiveStyle(cgh, type));
+        }
+
+        internal ColumnHeaderVisualStyle
+            GetEffectiveStyle(ColumnGroupHeader cgh, StyleType sizingStyle)
+        {
+            return (GetGroupHeaderStyle(cgh, sizingStyle));
+        }
+
+        #region GetGroupHeaderStyle
+
+        internal ColumnHeaderVisualStyle GetGroupHeaderStyle(ColumnGroupHeader cgh, StyleType e)
+        {
+            ValidateGroupHeaderStyle(cgh);
+
+            if (cgh.EffectiveStyles == null)
+                cgh.EffectiveStyles = new ColumnHeaderVisualStyles();
+
+            if (cgh.EffectiveStyles.IsValid(e) == false)
+            {
+                GridPanel panel = GridPanel;
+                ColumnHeaderVisualStyle style = new ColumnHeaderVisualStyle();
+
+                StyleType[] css = style.GetApplyStyleTypes(e);
+
+                if (css != null)
+                {
+                    ColumnGroupHeader pcgh = GetParent(cgh) as ColumnGroupHeader;
+
+                    if (pcgh != null)
+                    {
+                        if (GetAutoApplyGroupColor(cgh) != true)
+                            pcgh = null;
+                    }
+
+                    foreach (StyleType cs in css)
+                    {
+                        style.ApplyStyle(SuperGrid.BaseVisualStyles.ColumnHeaderStyles[cs]);
+                        style.ApplyStyle(SuperGrid.DefaultVisualStyles.ColumnHeaderStyles[cs]);
+                        style.ApplyStyle(GridPanel.DefaultVisualStyles.ColumnHeaderStyles[cs]);
+
+                        style.ApplyStyle(cgh.HeaderStyles[cs]);
+
+                        if (pcgh != null)
+                        {
+                            ColumnHeaderVisualStyle gstyle = GetEffectiveStyle(pcgh, cs);
+
+                            if (gstyle.Background != null)
+                            {
+                                if (cgh.HeaderStyles[cs].Background == null || cgh.HeaderStyles[cs].Background.IsEmpty)
+                                    style.Background = gstyle.Background.Copy();
+                            }
+
+                            if (gstyle.TextColor.IsEmpty == false)
+                            {
+                                if (cgh.HeaderStyles[cs].TextColor.IsEmpty)
+                                    style.TextColor = gstyle.TextColor;
+                            }
+                        }
+                    }
+                }
+
+                SuperGrid.DoGetColumnGroupHeaderStyleEvent(panel, cgh, e, ref style);
+
+                if (style.Background == null || style.Background.IsEmpty == true)
+                    style.Background = new Background(Color.White);
+
+                if (style.Font == null)
+                    style.Font = SystemFonts.DefaultFont;
+
+                cgh.EffectiveStyles[e] = style;
+            }
+
+            return (cgh.EffectiveStyles[e]);
+        }
+
+        #region ValidateGroupHeaderStyle
+
+        private void ValidateGroupHeaderStyle(ColumnGroupHeader cgh)
+        {
+            if (cgh.StyleUpdateCount != SuperGrid.StyleUpdateCount)
+            {
+                if (cgh.EffectiveStyles != null)
+                {
+                    cgh.EffectiveStyles.Dispose();
+                    cgh.EffectiveStyles = null;
+                }
+
+                cgh.StyleUpdateCount = SuperGrid.StyleUpdateCount;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region ColumnHeader Style support
+
+        #region GetSizingStyle
+
+        private ColumnHeaderVisualStyle GetSizingStyle(GridPanel panel, GridColumn column)
+        {
+            StyleType style = panel.GetSizingStyle();
+
+            if (style == StyleType.NotSet)
+                style = StyleType.Default;
+
+            return (GetEffectiveStyle(column, style));
+        }
+
+        #endregion
+
+        #region GetStyleState
+
+        private StyleState GetStyleState(GridColumn column, bool selected)
+        {
+            StyleState state = StyleState.Default;
+
+            if (_Reordering == true)
+            {
+                if (column == _MouseDownHitItem)
+                    state |= StyleState.MouseOver;
+            }
+            else if (_HitItem == column)
+            {
+                state |= StyleState.MouseOver;
+            }
+
+            if (selected == true)
+                state |= StyleState.Selected;
+
+            if (column.IsReadOnly == true)
+                state |= StyleState.ReadOnly;
+
+            return (state);
+        }
+
+        #endregion
+
+        #region GetStyleType
+
+        private StyleType GetStyleType(StyleState state)
+        {
+            switch (state)
+            {
+                case StyleState.MouseOver:
+                    return (StyleType.MouseOver);
+
+                case StyleState.Selected:
+                    return (StyleType.Selected);
+
+                case StyleState.Selected | StyleState.MouseOver:
+                    return (StyleType.SelectedMouseOver);
+
+                case StyleState.ReadOnly:
+                    return (StyleType.ReadOnly);
+
+                case StyleState.ReadOnly | StyleState.MouseOver:
+                    return (StyleType.ReadOnlyMouseOver);
+
+                case StyleState.ReadOnly | StyleState.Selected:
+                    return (StyleType.ReadOnlySelected);
+
+                case StyleState.ReadOnly | StyleState.MouseOver | StyleState.Selected:
+                    return (StyleType.ReadOnlySelectedMouseOver);
+
+                default:
+                    return (StyleType.Default);
+            }
+        }
+
+        #endregion
+
+        #region GetEffectiveStyle
+
+        ///<summary>
+        /// GetEffectiveStyle
+        ///</summary>
+        ///<param name="column"></param>
+        ///<returns></returns>
+        public ColumnHeaderVisualStyle GetEffectiveStyle(GridColumn column)
+        {
+            StyleState styleState = GetStyleState(column, column.IsSelected);
+            ColumnHeaderVisualStyle style = GetEffectiveStyle(column, styleState);
+
+            return (style);
+        }
+
+        ///<summary>
+        ///Gets the EffectiveStyle for the given StyleState
+        ///</summary>
+        ///<param name="column"></param>
+        ///<param name="cellState"></param>
+        ///<returns></returns>
+        public ColumnHeaderVisualStyle
+            GetEffectiveStyle(GridColumn column, StyleState cellState)
+        {
+            StyleType type = GetStyleType(cellState);
+
+            return (GetEffectiveStyle(column, type));
+        }
+
+        internal ColumnHeaderVisualStyle
+            GetEffectiveStyle(GridColumn column, StyleType type)
+        {
+            return (column.GetHeaderStyle(type));
+        }
+
+        #endregion
+
+        #region GetEffectiveRowHeaderStyle
+
+        internal ColumnHeaderRowVisualStyle GetEffectiveRowHeaderStyle()
+        {
+            return (GetEffectiveRowHeaderStyleEx(GetRowHeaderState()));
+        }
+
+        internal ColumnHeaderRowVisualStyle
+            GetEffectiveRowHeaderStyleEx(StyleState rowState)
+        {
+            ValidateRowHeaderStyle();
+
+            StyleType type = GetStyleType(rowState);
+
+            return (GetRowHeaderStyle(type));
+        }
+
+        #region ValidateRowHeaderStyle
+
+        private void ValidateRowHeaderStyle()
+        {
+            if (_StyleUpdateCount != SuperGrid.StyleUpdateCount)
+            {
+                _EffectiveRowHeaderStyles = null;
+
+                _StyleUpdateCount = SuperGrid.StyleUpdateCount;
+            }
+        }
+
+        #endregion
+
+        #region GetRowHeaderState
+
+        private StyleState GetRowHeaderState()
+        {
+            StyleState rowState = StyleState.Default;
+
+            if (_HitArea == HeaderArea.InRowHeader || _HitArea == HeaderArea.InWhitespace)
+                rowState |= StyleState.MouseOver;
+
+            GridPanel panel = GridPanel;
+
+            if (panel != null)
+            {
+                if (panel.ReadOnly == true)
+                    rowState |= StyleState.ReadOnly;
+
+                if (panel == SuperGrid.ActiveGrid)
+                    rowState |= StyleState.Selected;
+            }
+
+            return (rowState);
+        }
+
+        #endregion
+
+        #region GetRowHeaderStyle
+
+        private ColumnHeaderRowVisualStyle GetRowHeaderStyle(StyleType e)
+        {
+            if (_EffectiveRowHeaderStyles == null)
+                _EffectiveRowHeaderStyles = new ColumnHeaderRowVisualStyles();
+
+            if (_EffectiveRowHeaderStyles.IsValid(e) == false)
+            {
+                ColumnHeaderRowVisualStyle style = new ColumnHeaderRowVisualStyle();
+
+                StyleType[] css = style.GetApplyStyleTypes(e);
+
+                if (css != null)
+                {
+                    foreach (StyleType cs in css)
+                    {
+                        style.ApplyStyle(SuperGrid.BaseVisualStyles.ColumnHeaderRowStyles[cs]);
+                        style.ApplyStyle(SuperGrid.DefaultVisualStyles.ColumnHeaderRowStyles[cs]);
+                        style.ApplyStyle(GridPanel.DefaultVisualStyles.ColumnHeaderRowStyles[cs]);
+                    }
+                }
+
+                SuperGrid.DoGetColumnHeaderRowHeaderStyleEvent(this, e, ref style);
+
+                if (style.RowHeader.Background == null || style.RowHeader.Background.IsEmpty == true)
+                    style.RowHeader.Background = new Background(Color.WhiteSmoke);
+
+                _EffectiveRowHeaderStyles[e] = style;
+            }
+
+            return (_EffectiveRowHeaderStyles[e]);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region GetShowRootColumnHeaders
+
+        private bool GetShowRootColumnHeaders(ColumnGroupHeader cgh)
+        {
+            while (cgh != null)
+            {
+                if (cgh.ShowColumnHeaders != Tbool.NotSet)
+                    return (cgh.ShowColumnHeaders == Tbool.True);
+
+                cgh = cgh.Collection.Parent as ColumnGroupHeader;
+            }
+
+            return (_ShowGroupColumnHeaders);
+        }
+
+        #endregion
+
+        #region GetAutoApplyGroupColor
+
+        internal bool GetAutoApplyGroupColor(ColumnGroupHeader cgh)
+        {
+            if (cgh.AutoApplyGroupColors != Tbool.NotSet)
+                return (cgh.AutoApplyGroupColors == Tbool.True);
+
+            return (AutoApplyGroupColors);
+        }
+
+        #endregion
+
+        #region IsGroupHeaderSelected
+
+        ///<summary>
+        ///Returns whether the given GroupHeader is selected (ie. all
+        ///visible columns/headers it encompasses must be selected)
+        ///</summary>
+        ///<param name="cgh">GroupHeader</param>
+        ///<returns>true, if all selected</returns>
+        public bool IsGroupHeaderSelected(ColumnGroupHeader cgh)
+        {
+            GridPanel panel = GridPanel;
+            GridColumnCollection columns = panel.Columns;
+
+            int[] map = columns.DisplayIndexMap;
+
+            bool selected = false;
+
+            for (int i = cgh.StartDisplayIndex; i <= cgh.EndDisplayIndex; i++)
+            {
+                if ((uint) i < map.Length)
+                {
+                    GridColumn column = columns[map[i]];
+
+                    if (column.Visible == true)
+                    {
+                        if (column.IsSelected == false)
+                            return (false);
+
+                        selected = true;
+                    }
+                }
+            }
+
+            return (selected);
+        }
+
+        #endregion
+
+        #region IsGroupHeaderReadOnly
+
+        /// <summary>
+        ///Returns whether the given GroupHeader is ReadOnly (ie. all
+        ///visible columns/headers it encompasses must be ReadOnly)
+        /// </summary>
+        /// <param name="cgh"></param>
+        /// <returns></returns>
+        public bool IsGroupHeaderReadOnly(ColumnGroupHeader cgh)
+        {
+            GridPanel panel = GridPanel;
+            GridColumnCollection columns = panel.Columns;
+
+            int[] map = columns.DisplayIndexMap;
+
+            bool readOnly = false;
+
+            for (int i = cgh.StartDisplayIndex; i <= cgh.EndDisplayIndex; i++)
+            {
+                if ((uint)i >= map.Length)
+                    break;
+
+                GridColumn column = columns[map[i]];
+
+                if (column.Visible == true)
+                {
+                    if (column.IsReadOnly == false)
+                        return (false);
+
+                    readOnly = true;
+                }
+            }
+
+            return (readOnly);
+        }
+
+        #endregion
+
+        #region IsItemHFrozen
+
+        internal bool IsItemHFrozen(object item)
+        {
+            if (item is GridColumn)
+                return ((GridColumn)item).IsHFrozenEx;
+
+            if (item is ColumnGroupHeader)
+                return (IsGroupHeaderHFrozen(GridPanel, (ColumnGroupHeader)item));
+
+            return (false);
+        }
+
+        #endregion
+
+        #region IsGroupHeaderHFrozen
+
+        internal bool IsGroupHeaderHFrozen(GridPanel panel, ColumnGroupHeader cgh)
+        {
+            if (panel.IsSubPanel == false)
+            {
+                if (cgh != null)
+                    return (cgh.StartDisplayIndex < panel.FrozenColumnCount);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region GetBounds
+
+        internal Rectangle GetBounds(GridPanel panel, GridColumn column)
+        {
+            Rectangle r = GetRelativeBounds(panel, column);
+
+            return (GetScrollBounds(panel, column, r));
+        }
+
+        #endregion
+
+        #region GetRelativeBounds
+
+        internal Rectangle GetRelativeBounds(GridPanel panel, GridColumn column)
+        {
+            Rectangle r = BoundsRelative;
+
+            r.X = column.BoundsRelative.X;
+            r.Width = column.BoundsRelative.Width;
+
+            return (r);
+        }
+
+        #endregion
+
+        #region GetScrollBounds
+
+        internal Rectangle GetScrollBounds(
+            GridPanel panel, GridColumn column, Rectangle r)
+        {
+            if (r.IsEmpty == false)
+            {
+                if (IsVFrozen == false)
+                    r.Y -= VScrollOffset;
+
+                if (panel.IsSubPanel == true || column.IsHFrozen == false)
+                    r.X -= HScrollOffset;
+            }
+
+            return (r);
+        }
+
+        #endregion
+
+        #region GetSubScrollBounds
+
+        internal Rectangle GetSubScrollBounds(GridPanel panel, ColumnGroupHeader cgh)
+        {
+            Rectangle r = cgh.BoundsRelative;
+
+            if (r.IsEmpty == false)
+            {
+                if (IsVFrozen == false)
+                    r.Y -= VScrollOffset;
+
+                if (panel.IsSubPanel == true || IsGroupHeaderHFrozen(panel, cgh) == false)
+                    r.X -= HScrollOffset;
+            }
+
+            return (r);
+        }
+
+        #endregion
+
+        #region GetSubContScrollBounds
+
+        internal Rectangle GetSubContScrollBounds(GridPanel panel, ColumnGroupHeader cgh)
+        {
+            Rectangle r = cgh.BoundsRelative;
+            r.Height = cgh.Size.Height;
+
+            if (r.IsEmpty == false)
+            {
+                if (IsVFrozen == false)
+                    r.Y -= VScrollOffset;
+
+                if (panel.IsSubPanel == true || IsGroupHeaderHFrozen(panel, cgh) == false)
+                    r.X -= HScrollOffset;
+            }
+
+            return (r);
+        }
+
+        #endregion
+
+        #region GetContentBounds
+
+        internal Rectangle GetContentBounds(GridPanel panel, ColumnHeaderVisualStyle style, Rectangle r)
+        {
+            if (_ShowHeaderImages == true)
+            {
+                object figure = style.GetFigure(panel);
+
+                if (figure != null)
+                {
+                    Size size = style.GetFigureSize(panel);
+
+                    if (style.IsOverlayImage != true)
+                    {
+                        switch (style.ImageAlignment)
+                        {
+                            case Alignment.TopCenter:
+                                r.Y += size.Height;
+                                r.Height -= size.Height;
+                                break;
+
+                            case Alignment.MiddleCenter:
+                                break;
+
+                            case Alignment.BottomCenter:
+                                r.Height -= size.Height;
+                                break;
+
+                            case Alignment.TopRight:
+                            case Alignment.MiddleRight:
+                            case Alignment.BottomRight:
+                                r.Width -= size.Width;
+                                break;
+
+                            default:
+                                r.X += size.Width;
+                                r.Width -= size.Width;
+                                break;
+                        }
+                    }
+                }
+            }
+
+            return (r);
+        }
+
+        #endregion
+
+        #region GetAdjustedBounds
+
+        private Rectangle GetAdjustedBounds(VisualStyle style, Rectangle r)
+        {
+            r.X += Dpi.Width(style.BorderThickness.Left + style.Margin.Left + style.Padding.Left);
+            r.Width -= Dpi.Width(style.BorderThickness.Horizontal + style.Margin.Horizontal + style.Padding.Horizontal);
+
+            r.Y += Dpi.Height(style.BorderThickness.Top + style.Margin.Top + style.Padding.Top);
+            r.Height -= Dpi.Height(style.BorderThickness.Vertical + style.Margin.Vertical + style.Padding.Vertical);
+
+            return (r);
+        }
+
+        #endregion
+
+        #region GetImageBounds
+
+        /// <summary>
+        /// Gets the bounding rectangle for the
+        /// given column header image
+        /// </summary>
+        /// <param name="column"></param>
+        /// <returns>Bounding rectangle</returns>
+        public Rectangle GetImageBounds(GridColumn column)
+        {
+            if (_ShowHeaderImages == true)
+            {
+                GridPanel panel = GridPanel;
+
+                if (panel != null)
+                {
+                    SuperGridControl sg = panel.SuperGrid;
+
+                    if (sg != null)
+                    {
+                        ColumnHeaderVisualStyle style = GetEffectiveStyle(column);
+
+                        object figure = style.GetFigure(panel);
+
+                        if (figure != null)
+                        {
+                            Rectangle bounds = GetBounds(panel, column);
+
+                            using (Graphics g = sg.CreateGraphics())
+                            {
+                                Rectangle t = GetAdjustedBounds(style,
+                                    GetContentBounds(panel, style, bounds));
+
+                                return (style.GetFigureBounds(panel, t));
+                            }
+                        }
+                    }
+                }
+            }
+
+            return (Rectangle.Empty);
+        }
+
+        #endregion
+
+        #region InvalidateHeader
+
+        internal void InvalidateHeader(GridPanel panel, GridColumn column)
+        {
+            Rectangle bounds = BoundsRelative;
+
+            if (panel.IsVFrozen == false)
+                bounds.Y -= VScrollOffset;
+
+            bounds.X = column.BoundsRelative.X;
+            bounds.Width = column.BoundsRelative.Width;
+
+            if (panel.IsSubPanel == true || column.IsHFrozen == false)
+                bounds.X -= HScrollOffset;
+
+            InvalidateRender(bounds);
+        }
+
+        private void InvalidateHeader(GridPanel panel, ColumnGroupHeader cgh)
+        {
+            Rectangle r = GetSubScrollBounds(panel, cgh);
+
+            InvalidateRender(r);
+        }
+
+        #endregion
+
+        #region InvalidateRowHeader
+
+        internal void InvalidateRowHeader()
+        {
+            InvalidateRender(RowHeaderBounds);
+        }
+
+        #endregion
+
+        #region InvalidateWhitespace
+
+        internal void InvalidateWhitespace()
+        {
+            Rectangle bounds = Bounds;
+
+            GridColumn col = GridPanel.Columns.LastVisibleColumn;
+
+            if (col != null)
+            {
+                if (col.Bounds.Right < bounds.Right)
+                {
+                    int n = bounds.Right - col.Bounds.Right;
+
+                    bounds.X = col.Bounds.Right;
+                    bounds.Width = n;
+                }
+
+                InvalidateRender(bounds);
+            }
+        }
+
+        #endregion
+
+        #region InvalidateItem
+
+        private void InvalidateItem(GridPanel panel, object item)
+        {
+            if (item is GridColumn)
+                InvalidateHeader(panel, (GridColumn)item);
+
+            else if (item is ColumnGroupHeader)
+                InvalidateHeader(panel, (ColumnGroupHeader)item);
+        }
+
+        #endregion
+
+        #region CancelCapture
+
+        /// <summary>
+        /// Cancels any in progress operations (resize, reorder)
+        /// that may have the mouse captured.
+        /// </summary>
+        public override void CancelCapture()
+        {
+            StopReorder();
+            StopResize();
+
+            _MouseDownHitItem = null;
+
+            base.CancelCapture();
+        }
+
+        #endregion
+    }
+
+    #region enums
+
+    #region HeaderArea
+
+    ///<summary>
+    /// HeaderArea
+    ///</summary>
+    public enum HeaderArea
+    {
+        ///<summary>
+        /// NoWhere
+        ///</summary>
+        NoWhere,
+
+        ///<summary>
+        /// InContent
+        ///</summary>
+        InContent,
+
+        ///<summary>
+        /// InResize
+        ///</summary>
+        InResize,
+
+        ///<summary>
+        /// InRowHeader
+        ///</summary>
+        InRowHeader,
+
+        ///<summary>
+        /// InRowHeaderResize
+        ///</summary>
+        InRowHeaderResize,
+
+        ///<summary>
+        /// InWhitespace
+        ///</summary>
+        InWhitespace,
+
+        ///<summary>
+        /// InMarkup
+        ///</summary>
+        InMarkup,
+
+        ///<summary>
+        /// InFilterMenu
+        ///</summary>
+        InFilterMenu,
+
+        ///<summary>
+        /// InGroupBox
+        ///</summary>
+        InGroupBox,
+    }
+
+    #endregion
+
+    #region ImageVisibility
+
+    ///<summary>
+    /// ImageVisibility
+    ///</summary>
+    public enum ImageVisibility
+    {
+        ///<summary>
+        /// NotSet
+        ///</summary>
+        NotSet = -1,
+
+        ///<summary>
+        /// Auto
+        ///</summary>
+        Auto,
+
+        ///<summary>
+        /// Always
+        ///</summary>
+        Always,
+
+        ///<summary>
+        /// Never
+        ///</summary>
+        Never,
+    }
+
+    #endregion
+
+    #endregion
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridContainer.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridContainer.cs
new file mode 100644
index 00000000..e87c5d74
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridContainer.cs	
@@ -0,0 +1,4018 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Media;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.SuperGrid.Style;
+
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    /// <summary>
+    /// Defines Grid element with Items collection
+    /// </summary>
+    public abstract class GridContainer : GridElement, IDisposable
+    {
+        #region Private variables
+
+        private GridItemsCollection _Rows;
+
+        private Cs _States;
+
+        private int _Index;
+        private int _FullIndex;
+        private int _RowIndex;
+        private int _GridIndex;
+        private int _IndentLevel;
+
+        private Rectangle _CheckBoxBounds;
+        private Rectangle _ContainerBounds;
+
+        private GridElement _MouseOverElement;
+
+        private int _FixedRowHeight;
+        private int _FixedHeaderHeight;
+        private int _FirstOnScreenRowIndex;
+
+        private ushort _DeleteUpdateCount;
+        private ushort _ExpandedUpdateCount;
+        private ushort _SelectionUpdateCount;
+        private ushort _SelectionClearCount;
+        private ushort _StyleUpdateCount;
+        private ushort _MergeUpdateCount = 1;
+
+        private RowVisualStyles _RowStyles;
+        private RowVisualStyles _EffectiveRowStyles;
+        private CellVisualStyles _CellVisualStyles;
+
+        private string _RowHeaderText = "";
+
+        private List<CellRange> _DisplayedCellRanges;
+        private CellRange _LastCellRange;
+        private int _DisplayedMergeLayoutCount;
+
+        private bool _NeedMergeLayout;
+        private MergeScan _MergeScan;
+
+        private CellRange _SuspendedRange;
+
+        #endregion
+
+        #region Abstract methods
+
+        /// <summary>
+        /// Creates the GridItemsCollection that hosts the items.
+        /// </summary>
+        /// <returns>New instance of GridItemsCollection.</returns>
+        protected abstract GridItemsCollection CreateItemsCollection();
+
+        /// <summary>
+        /// Disposes of the GridItemsCollection that hosts the items.
+        /// </summary>
+        protected abstract void DisposeItemsCollection(GridItemsCollection items);
+
+        #endregion
+
+        #region Public properties
+
+        #region Bounds
+
+        ///<summary>
+        /// Gets the scroll adjusted bounds
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override Rectangle Bounds
+        {
+            get
+            {
+                Rectangle r = BoundsRelative;
+
+                r.X -= HScrollOffset;
+
+                if (IsVFrozen == false)
+                    r.Y -= VScrollOffset;
+
+                return (r);
+            }
+        }
+
+        #endregion
+
+        #region CellStyles
+
+        /// <summary>
+        /// Gets or sets the default Cell visual styles
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates the default Cell visual styles.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public CellVisualStyles CellStyles
+        {
+            get
+            {
+                if (_CellVisualStyles == null)
+                {
+                    _CellVisualStyles = new CellVisualStyles();
+
+                    UpdateChangeHandler(null, _CellVisualStyles);
+                }
+
+                return (_CellVisualStyles);
+            }
+
+            set
+            {
+                if (_CellVisualStyles != value)
+                {
+                    CellVisualStyles oldValue = _CellVisualStyles;
+                    _CellVisualStyles = value;
+
+                    OnStyleChanged("CellVisualStyles", oldValue, value);
+
+                    if (oldValue != null)
+                        oldValue.Dispose();
+                }
+            }
+        }
+
+        #endregion
+
+        #region Checked
+
+        ///<summary>
+        /// Gets or sets the row CheckBox checked state
+        ///</summary>
+        [DefaultValue(false), Category("Appearance")]
+        [Description("Indicates the row CheckBox checked state.")]
+        public virtual bool Checked
+        {
+            get { return (TestState(Cs.Checked)); }
+
+            set
+            {
+                if (Checked != value)
+                {
+                    SetState(Cs.Checked, value);
+
+                    OnCheckedChanged();
+                }
+            }
+        }
+
+        #region OnCheckedChanged
+
+        private void OnCheckedChanged()
+        {
+            GridPanel panel = GridPanel;
+
+            if (panel != null)
+            {
+                if (HasCheckBox == true)
+                {
+                    Rectangle r = _CheckBoxBounds;
+
+                    if (panel.IsSubPanel == true ||
+                        (panel.PrimaryColumn != null && panel.PrimaryColumn.IsHFrozen == false))
+                    {
+                        r.X -= HScrollOffset;
+                    }
+
+                    if (IsVFrozen == false)
+                        r.Y -= VScrollOffset;
+
+                    InvalidateRender(r);
+                }
+
+                OnPropertyChanged("Checked");
+
+                SuperGrid.DoAfterCheckEvent(panel, this);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region DisplayedRowCount
+
+        ///<summary>
+        /// Gets the count of visible rows on screen
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public int DisplayedRowCount 
+        {
+            get
+            {
+                GridPanel panel = GridPanel;
+
+                if (panel != null)
+                {
+                    GridContainer frow = FirstOnScreenRow;
+                    GridContainer lrow = LastOnScreenRow;
+
+                    if (frow != null && lrow != null)
+                        return (lrow.GridIndex - frow.GridIndex + 1);
+                }
+
+                return (0);
+            }
+        }
+
+        #endregion
+
+        #region Expanded
+
+        ///<summary>
+        /// Gets or sets whether the row is
+        /// expanded, permitting its child rows to be visible
+        ///</summary>
+        [DefaultValue(false), Category("Appearance")]
+        [Description("Indicates whether the row is expanded, permitting its child rows to be visible.")]
+        public bool Expanded
+        {
+            get { return (TestState(Cs.Expanded)); }
+
+            set
+            {
+                if (Expanded != value)
+                {
+                    SetExpanded(value, ExpandSource.Expand);
+
+                    OnPropertyChangedEx("Expanded", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region FirstOnScreenRow
+
+        ///<summary>
+        /// Gets the first visible row on screen
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public GridContainer FirstOnScreenRow
+        {
+            get
+            {
+                GridPanel panel = GridPanel;
+
+                if (panel != null)
+                {
+                    int index = FirstOnScreenRowIndex;
+
+                    if (panel.VirtualMode == true)
+                    {
+                        if (index < panel.VirtualRowCountEx)
+                            return (panel.VirtualRows[index]);
+                    }
+                    else
+                    {
+                        if ((uint)index < Rows.Count)
+                        {
+                            GridContainer row = panel.Rows[index] as GridContainer;
+
+                            if (row != null && row.Visible == true)
+                            {
+                                if (row.Expanded == true && row.Rows.Count > 0)
+                                {
+                                    GridContainer roe =
+                                        GetFirstOnScreenRow(row.Rows, SuperGrid.ViewRect);
+
+                                    if (roe != null)
+                                        return (roe);
+                                }
+
+                                return (row);
+                            }
+                        }
+                    }
+                }
+
+                return (null);
+            }
+
+            set
+            {
+                if (value != null)
+                    value.ScrollToTop();
+            }
+        }
+
+        #endregion
+
+        #region FirstOnScreenRowIndex
+
+        ///<summary>
+        /// Gets the first visible on screen row index
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public int FirstOnScreenRowIndex
+        {
+            get
+            {
+                GridPanel panel = GridPanel;
+
+                if (panel != null)
+                {
+                    if ((VScrollOffset == 0 && panel.IsFiltered == false && panel.DeletedRowCount == 0) || 
+                        (Parent != null && IsVFrozen == true))
+                    {
+                        _FirstOnScreenRowIndex = 0;
+                    }
+                    else
+                    {
+                        Rectangle r = SuperGrid.ViewRect;
+
+                        _FirstOnScreenRowIndex = (panel.VirtualMode == true)
+                             ? GetFirstOnScreenVirtualRowIndex(panel)
+                             : GetFirstOnScreenRealRowIndex(r);
+                    }
+                }
+
+                if (panel.VirtualMode == true)
+                {
+                    if (_FirstOnScreenRowIndex >= panel.VirtualRowCount)
+                        _FirstOnScreenRowIndex = 0;
+                }
+                else
+                {
+                    if (_FirstOnScreenRowIndex >= Rows.Count)
+                        _FirstOnScreenRowIndex = 0;
+                }
+
+                return (_FirstOnScreenRowIndex);
+            }
+
+            set
+            {
+                GridPanel panel = GridPanel;
+
+                if (panel.VirtualMode == true)
+                {
+                    if ((uint)value < panel.VirtualRowCount)
+                        FirstOnScreenRow = panel.VirtualRows[value];
+                }
+                else
+                {
+                    if ((uint)value < Rows.Count)
+                        FirstOnScreenRow = Rows[value] as GridContainer;
+                }
+            }
+        }
+
+        #region GetFirstOnScreenVirtualRow
+
+        private int GetFirstOnScreenVirtualRowIndex(GridPanel panel)
+        {
+            Rectangle r = BoundsRelative;
+
+            int vrh = Dpi.Height(panel.VirtualRowHeight);
+
+            r.Y += (FixedRowHeight - panel.FrozenRowCount * vrh);
+
+            int y = VScrollOffset;
+
+            if (Parent == null)
+                y += (panel.FrozenRowCount * vrh);
+            else
+                y = (y - r.Y) + SuperGrid.PrimaryGrid.FixedRowHeight;
+
+            int n = y / vrh - 0;
+
+            return (n > 0 ? n : 0);
+        }
+
+        #endregion
+
+        #region GetFirstOnScreenRealRowIndex
+
+        private int GetFirstOnScreenRealRowIndex(Rectangle r)
+        {
+            int lo = 0;
+            int hi = Rows.Count - 1;
+
+            while (lo < hi)
+            {
+                int mid = (lo + hi) / 2;
+
+                GridElement item = Rows[mid];
+                Rectangle t = item is GridPanel ? ((GridPanel)item).ContainerBounds : item.BoundsRelative;
+
+                if (item.IsVFrozen == false)
+                    t.Y -= VScrollOffset;
+
+                if (t.Bottom > r.Y)
+                {
+                    if (t.Y <= r.Y)
+                    {
+                        if (item.Visible == true)
+                            return (mid);
+                    }
+
+                    hi = mid - 1;
+                }
+                else
+                {
+                    lo = mid + 1;
+                }
+            }
+
+            while (lo < Rows.Count)
+            {
+                if (Rows[lo].Visible == true)
+                    break;
+
+                lo++;
+            }
+
+            return (lo);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetFirstOnScreenRow
+
+        private GridContainer
+            GetFirstOnScreenRow(GridItemsCollection items, Rectangle t)
+        {
+            for (int i = 0; i < items.Count; i++)
+            {
+                GridContainer item = items[i] as GridContainer;
+
+                if (item != null)
+                {
+                    Rectangle r = item.BoundsRelative;
+
+                    if (item.IsVFrozen == false)
+                        r.Y -= VScrollOffset;
+
+                    if (r.Bottom > t.Top)
+                    {
+                        if (item.Expanded == true && item.Rows.Count > 0)
+                        {
+                            GridContainer row = GetFirstOnScreenRow(item.Rows, t);
+
+                            return (row ?? item);
+                        }
+
+                        return (item);
+                    }
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region FirstSelectableRow
+
+        ///<summary>
+        /// Gets the first selectable row
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public GridContainer FirstSelectableRow
+        {
+            get
+            {
+                GridPanel panel = GridPanel;
+
+                if (panel != null)
+                {
+                    if (panel.VirtualMode == true)
+                    {
+                        if (panel.VirtualRowCountEx > 0)
+                            return (panel.VirtualRows[0]);
+                    }
+                    else
+                    {
+                        foreach (GridContainer row in panel.Rows)
+                        {
+                            if (row.Visible == true && row.AllowSelection == true)
+                                return (row);
+                        }
+                    }
+                }
+
+                return (null);
+            }
+        }
+
+        #endregion
+
+        #region FirstVisibleRow
+
+        ///<summary>
+        /// Gets the first visible row
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public GridContainer FirstVisibleRow
+        {
+            get
+            {
+                GridPanel panel = GridPanel;
+
+                if (panel != null)
+                {
+                    if (panel.VirtualMode == true)
+                    {
+                        if (panel.VirtualRowCountEx > 0)
+                            return (panel.VirtualRows[0]);
+                    }
+                    else
+                    {
+                        foreach (GridContainer row in panel.Rows)
+                        {
+                            if (row.Visible == true)
+                                return (row);
+                        }
+                    }
+                }
+
+                return (null);
+            }
+        }
+
+        #endregion
+
+        #region FullIndex
+
+        ///<summary>
+        /// Gets the sequential index for the row
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public int FullIndex
+        {
+            get
+            {
+                CheckIndicees();
+
+                return (_FullIndex);
+            }
+
+            internal set { _FullIndex = value; }
+        }
+
+        #endregion
+
+        #region GridIndex
+
+        ///<summary>
+        /// Gets the sequential index for the visible, expanded row
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public int GridIndex
+        {
+            get
+            {
+                CheckIndicees();
+
+                return (_GridIndex); 
+            }
+
+            internal set { _GridIndex = value; }
+        }
+
+        #endregion
+
+        #region Index
+
+        ///<summary>
+        /// Gets the sequential, visible, local container index for the item
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public int Index
+        {
+            get
+            {
+                CheckIndicees();
+                
+                return (_Index);
+            }
+
+            internal set { _Index = value; }
+        }
+
+        #endregion
+
+        #region IsActive
+
+        ///<summary>
+        /// Gets whether the item is Active
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsActive
+        {
+            get { return (this == SuperGrid.ActiveRow); }
+        }
+
+        #endregion
+
+        #region IsDeleted
+
+        ///<summary>
+        /// Gets whether the item is deleted
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public virtual bool IsDeleted
+        {
+            get
+            {
+                GridPanel panel = GetParentPanel();
+
+                if (panel != null)
+                {
+                    if (_DeleteUpdateCount != panel.DeleteUpdateCount)
+                    {
+                        SetState(Cs.Deleted, panel.IsRowDeleted(this));
+                        _DeleteUpdateCount = panel.DeleteUpdateCount;
+                    }
+                }
+                    
+                return (TestState(Cs.Deleted));
+            }
+
+            set
+            {
+                SetState(Cs.Deleted, value);
+
+                GridPanel panel = GetParentPanel();
+
+                if (panel != null)
+                {
+                    if (panel.SetDeleted(this, value) == true)
+                        _DeleteUpdateCount = panel.DeleteUpdateCount;
+                }
+            }
+        }
+
+        #endregion
+
+        #region IsExpandedVisible
+
+        ///<summary>
+        /// Gets whether the item is visible
+        /// and its parental hierarchy is expanded
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsExpandedVisible
+        {
+            get
+            {
+                if (Visible == false)
+                    return (false);
+
+                GridContainer row = Parent as GridContainer;
+
+                while (row != null)
+                {
+                    if (row.Visible == false)
+                        return (false);
+
+                    if (row is GridPanel == false)
+                    {
+                        if (row.Expanded == false)
+                            return (false);
+                    }
+
+                    row = row.Parent as GridContainer;
+                }
+
+                return (true);
+            }
+        }
+
+        #endregion
+
+        #region IsOnScreen
+
+        ///<summary>
+        /// Gets whether the item is visible on screen
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsOnScreen
+        {
+            get
+            {
+                if (Visible == true)
+                {
+                    GridPanel panel = GridPanel;
+
+                    if (panel != null)
+                    {
+                        Rectangle t = SViewRect;
+                        Rectangle bounds = Bounds;
+
+                        bounds.Width = panel.ColumnHeader.BoundsRelative.Width;
+
+                        return (t.IntersectsWith(bounds));
+                    }
+                }
+
+                return (false);
+            }
+        }
+
+        #endregion
+
+        #region IsSelectable
+
+        ///<summary>
+        /// Gets whether the row can be selected by the user.
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsSelectable
+        {
+            get { return (AllowSelection == true); }
+        }
+
+        #endregion
+
+        #region IsSelected
+
+        ///<summary>
+        /// Gets or sets whether the item is selected
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsSelected
+        {
+            get
+            {
+                if (AllowSelection == true)
+                {
+                    GridPanel panel = GetParentPanel();
+
+                    if (panel != null)
+                    {
+                        if ((_SelectionUpdateCount != panel.SelectionUpdateCount) ||
+                            (_ExpandedUpdateCount != panel.ExpandedUpdateCount))
+                        {
+                            if (ExpandedVisible(panel) == true)
+                                Selected = panel.IsItemSelectedEx(this);
+
+                            _SelectionUpdateCount = panel.SelectionUpdateCount;
+                        }
+
+                        return (Selected);
+                    }
+                }
+
+                return (false);
+            }
+
+            set
+            {
+                GridPanel panel = GetParentPanel();
+
+                if (panel != null)
+                {
+                    if (Selected != value)
+                    {
+                        Selected = value;
+
+                        if (ExpandedVisible(panel) == true)
+                            panel.SetSelectedEx(this, value);
+
+                        _SelectionUpdateCount = panel.SelectionUpdateCount;
+
+                        Rectangle r = ContainerBounds;
+                        r.X -= HScrollOffset;
+
+                        if (IsVFrozen == false)
+                            r.Y -= VScrollOffset;
+
+                        InvalidateRender(r);
+                    }
+                }
+            }
+        }
+
+        #region ExpandedVisible
+
+        internal bool ExpandedVisible(GridPanel panel)
+        {
+            if (_ExpandedUpdateCount != panel.ExpandedUpdateCount)
+            {
+                _ExpandedUpdateCount = panel.ExpandedUpdateCount;
+
+                SetState(Cs.ExpandedVisible, IsExpandedVisible);
+            }
+
+            return (TestState(Cs.ExpandedVisible));
+        }
+
+        #endregion
+
+        #endregion
+
+        #region LastOnScreenRow
+
+        ///<summary>
+        /// Gets the last visible on screen row
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public GridContainer LastOnScreenRow
+        {
+            get
+            {
+                GridPanel panel = GridPanel;
+
+                if (panel != null)
+                {
+                    if (panel.VirtualMode == true)
+                    {
+                        int index = LastOnScreenRowIndex;
+
+                        if (index < panel.VirtualRowCountEx)
+                            return (panel.VirtualRows[index]);
+                    }
+                    else
+                    {
+                        if (IsExpandedVisible == true)
+                            return (GetLastOnScreenRow(panel.Rows, SuperGrid.ViewRect));
+                    }
+                }
+
+                return (null);
+            }
+
+            set
+            {
+                if (value != null)
+                    value.ScrollToBottom();
+            }
+        }
+
+        #region GetLastOnScreenRow
+
+        private GridContainer
+            GetLastOnScreenRow(GridItemsCollection items, Rectangle t)
+        {
+            GridContainer lrow = null;
+
+            for (int i = 0; i < items.Count; i++)
+            {
+                GridContainer item = items[i] as GridContainer;
+
+                if (item != null && item.Visible == true)
+                {
+                    lrow = item;
+
+                    Rectangle r = item.BoundsRelative;
+
+                    if (item.IsVFrozen == false)
+                        r.Y -= VScrollOffset;
+
+                    if (r.Bottom >= t.Bottom || i == items.Count - 1)
+                    {
+                        if (item.Expanded == true && item.Rows.Count > 0)
+                        {
+                            GridContainer row = GetLastOnScreenRow(item.Rows, t);
+
+                            return (row ?? item);
+                        }
+
+                        return (item);
+                    }
+                }
+            }
+
+            return (lrow);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region LastOnScreenRowIndex
+
+        ///<summary>
+        /// Gets the last visible on screen row index
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public int LastOnScreenRowIndex
+        {
+            get
+            {
+                if (IsExpandedVisible == true)
+                {
+                    GridPanel panel = GridPanel;
+
+                    if (panel != null)
+                    {
+                        Rectangle t = SuperGrid.ViewRect;
+
+                        return (panel.VirtualMode == true)
+                                   ? (GetLastOnScreenVirtualRowIndex(panel, t))
+                                   : (GetLastOnScreenRealRowIndex(panel, t));
+                    }
+                }
+
+                return (0);
+            }
+
+            set
+            {
+                GridPanel panel = GridPanel;
+
+                if (panel.VirtualMode == true)
+                {
+                    if ((uint)value < panel.VirtualRowCount)
+                        LastOnScreenRow = panel.VirtualRows[value];
+                }
+                else
+                {
+                    if ((uint)value < Rows.Count)
+                        LastOnScreenRow = Rows[value] as GridContainer;
+                }
+            }
+        }
+
+        #region GetLastOnScreenVirtualRowIndex
+
+        private int GetLastOnScreenVirtualRowIndex(
+            GridPanel panel, Rectangle t)
+        {
+            int index = FirstOnScreenRowIndex;
+            GridRow row = panel.VirtualRows[index];
+
+            int vrh = Dpi.Height(panel.VirtualRowHeight);
+
+            Rectangle r = row.BoundsRelative;
+            r.Y -= VScrollOffset;
+
+            int n = (t.Bottom - r.Top + vrh - 1) / vrh;
+
+            return (Math.Min(panel.VisibleRowCount - 1, index + n - 1));
+        }
+
+        #endregion
+
+        #region GetLastOnScreenRealRowIndex
+
+        private int GetLastOnScreenRealRowIndex(GridPanel panel, Rectangle t)
+        {
+            int index = FirstOnScreenRowIndex;
+
+            while (index + 1 < Rows.Count)
+            {
+                index++;
+
+                GridContainer item = (GridContainer)panel.Rows[index];
+                Rectangle r = item.BoundsRelative;
+
+                if (item.IsVFrozen == false)
+                    r.Y -= VScrollOffset;
+
+                if (r.Bottom >= t.Bottom)
+                    return (index);
+            }
+
+            return (index);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region LastSelectableRow
+
+        ///<summary>
+        /// Gets the last user selectable row
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public GridContainer LastSelectableRow
+        {
+            get
+            {
+                GridPanel panel = GridPanel;
+
+                if (panel != null)
+                {
+                    if (panel.VirtualMode == true)
+                    {
+                        if (panel.VirtualRowCountEx > 0)
+                            return (panel.VirtualRows[panel.VirtualRowCountEx - 1]);
+                    }
+                    else
+                    {
+                        return (GetLastSelectableRow(panel.Rows));
+                    }
+                }
+
+                return (null);
+            }
+        }
+
+        #region GetLastSelectableRow
+
+        private GridContainer GetLastSelectableRow(GridItemsCollection rows)
+        {
+            for (int i = rows.Count - 1; i >= 0; i--)
+            {
+                GridContainer row = rows[i] as GridContainer;
+
+                if (row != null)
+                {
+                    if (row.Visible == true && row.AllowSelection == true)
+                    {
+                        if (row.Rows.Count > 0 && row.Expanded == true)
+                        {
+                            GridContainer srow = GetLastSelectableRow(row.Rows);
+
+                            if (srow != null)
+                                row = srow;
+                        }
+
+                        return (row);
+                    }
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region LastVisibleRow
+
+        ///<summary>
+        /// Gets the last visible row
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public GridContainer LastVisibleRow
+        {
+            get
+            {
+                GridPanel panel = GridPanel;
+
+                if (panel != null)
+                {
+                    if (panel.VirtualMode == true)
+                    {
+                        if (panel.VirtualRowCountEx > 0)
+                            return (panel.VirtualRows[panel.VirtualRowCountEx - 1]);
+                    }
+                    else
+                    {
+                        for (int i = panel.Rows.Count - 1; i >= 0;  i--)
+                        {
+                            GridContainer row = panel.Rows[i] as GridContainer;
+
+                            if (row != null)
+                            {
+                                if (row.Visible == true)
+                                    return (row);
+                            }
+                        }
+                    }
+                }
+
+                return (null);
+            }
+        }
+
+        #endregion
+
+        #region NextVisibleRow
+
+        ///<summary>
+        /// Gets the next visible row, or null if no
+        /// subsequent rows are defined
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public GridContainer NextVisibleRow
+        {
+            get
+            {
+                GridPanel panel = GetParentPanel();
+
+                if (panel != null)
+                {
+                    int index = GridIndex + 1;
+
+                    GridElement item = panel.GetRowFromIndex(index);
+
+                    while (item != null)
+                    {
+                        if (ItemIsSelectable(panel, item) == true)
+                            return ((GridContainer) item);
+
+                        item = panel.GetRowFromIndex(++index);
+                    }
+                }
+
+                return (null);
+            }
+        }
+
+        private bool ItemIsSelectable(GridPanel panel, GridElement item)
+        {
+            if (item.Visible == false)
+                return (false);
+            
+            if (item is GridGroup && panel.GroupHeaderKeyBehavior != GroupHeaderKeyBehavior.Select)
+                return (false);
+
+            return (item is GridContainer);
+        }
+
+        #endregion
+
+        #region PrevVisibleRow
+
+        ///<summary>
+        /// Gets the previous visible row, or null if
+        /// no previous rows are defined
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public GridContainer PrevVisibleRow
+        {
+            get
+            {
+                GridPanel panel = GetParentPanel();
+
+                if (panel != null)
+                {
+                    int index = GridIndex;
+
+                    while (--index >= 0)
+                    {
+                        GridElement item = panel.GetRowFromIndex(index);
+
+                        if (item == null)
+                            break;
+
+                        if (ItemIsSelectable(panel, item) == true)
+                            return ((GridContainer)item);
+                    }
+                }
+
+                return (null);
+            }
+        }
+
+        #endregion
+
+        #region ReadOnly
+
+        /// <summary>
+        /// Gets or sets whether the user can change the row contents
+        /// </summary>
+        [DefaultValue(false), Category("Behavior")]
+        [Description("Indicates whether the user can change the row contents.")]
+        public bool ReadOnly
+        {
+            get { return (TestState(Cs.ReadOnly)); }
+
+            set
+            {
+                if (value != ReadOnly)
+                {
+                    SetState(Cs.ReadOnly, value);
+
+                    OnPropertyChangedEx("ReadOnly", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region RowHeaderText
+
+        ///<summary>
+        /// Gets or sets the associated row header text.
+        ///</summary>
+        [DefaultValue(""), Category("Appearance")]
+        [Description("Indicates the associated row header text.).")]
+        public string RowHeaderText
+        {
+            get { return (_RowHeaderText); }
+
+            set
+            {
+                if (_RowHeaderText != value)
+                {
+                    _RowHeaderText = value;
+
+                    NeedsMeasured = true;
+
+                    OnPropertyChangedEx("RowHeaderText", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region RowIndex
+
+        ///<summary>
+        /// Gets the sequential, parental index of the item
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public int RowIndex
+        {
+            get
+            {
+                CheckIndicees();
+
+                return (_RowIndex);
+            }
+
+            internal set { _RowIndex = value; }
+        }
+
+        #region CheckIndicees
+
+        private void CheckIndicees()
+        {
+            GridPanel panel = GridPanel;
+
+            if (panel != null)
+                panel.UpdateIndicees(panel, panel.Rows, true);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Rows
+
+        /// <summary>
+        /// Gets the reference to the Rows collection
+        /// </summary>
+        [DefaultValue(null), Category("Data")]
+        [Description("Indicates the reference to the Rows collection.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public virtual GridItemsCollection Rows
+        {
+            get
+            {
+                if (_Rows == null)
+                    _Rows = CreateItemsCollection();
+
+                return (_Rows);
+            }
+
+            set
+            {
+                if (_Rows != null)
+                    DisposeItemsCollection(_Rows);
+
+                _Rows = value;
+            }
+        }
+
+        #endregion
+
+        #region RowsUnresolved
+
+        ///<summary>
+        /// Gets or sets whether the rows collection is unknown and has not
+        /// been resolved (presumes there are rows until set to false)
+        ///</summary>
+        [DefaultValue(false), Category("Data")]
+        [Description("Indicates whether the rows collection is unresolved (presumes there are rows until set to false).")]
+        public bool RowsUnresolved
+        {
+            get { return (TestState(Cs.RowsUnresolved)); }
+
+            set
+            {
+                if (RowsUnresolved != value)
+                {
+                    SetState(Cs.RowsUnresolved, value);
+
+                    OnPropertyChangedEx("RowsUnresolved", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region RowStyles
+
+        /// <summary>
+        /// Gets or sets the visual styles assigned to the row elements
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates visual style assigned to the row elements")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public RowVisualStyles RowStyles
+        {
+            get
+            {
+                if (_RowStyles == null)
+                {
+                    _RowStyles = new RowVisualStyles();
+
+                    UpdateChangeHandler(null, _RowStyles);
+                }
+
+                return (_RowStyles);
+            }
+
+            set
+            {
+                if (_RowStyles != value)
+                {
+                    RowVisualStyles oldValue = _RowStyles;
+                    _RowStyles = value;
+
+                    OnStyleChanged("RowStyles", oldValue, value);
+
+                    if (oldValue != null)
+                        oldValue.Dispose();
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowCheckBox
+
+        /// <summary>
+        /// Get or sets whether the row CheckBox is shown (Panel.CheckBoxes must also be true)
+        /// </summary>
+        [DefaultValue(true), Category("Appearance")]
+        [Description("Indicates whether the row CheckBox is shown (Panel.CheckBoxes must also be true).")]
+        public bool ShowCheckBox
+        {
+            get { return (TestState(Cs.ShowCheckBox)); }
+
+            set
+            {
+                if (ShowCheckBox != value)
+                {
+                    SetState(Cs.ShowCheckBox, value);
+
+                    NeedsMeasured = true;
+
+                    OnPropertyChangedEx("ShowCheckBox", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowTreeButton
+
+        /// <summary>
+        /// Gets or sets whether expand / collapse
+        /// buttons are shown if the row contains nested items 
+        /// </summary>
+        [DefaultValue(true), Category("Appearance")]
+        [Description("Indicates whether Tree expand / collapse buttons are shown if the row contains nested items.")]
+        public bool ShowTreeButton
+        {
+            get { return (TestState(Cs.ShowTreeButton)); }
+
+            set
+            {
+                if (ShowTreeButton != value)
+                {
+                    SetState(Cs.ShowTreeButton, value);
+
+                    OnPropertyChangedEx("ShowTreeButton", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Constructors
+
+        /// <summary>
+        /// GridContainer
+        /// </summary>
+        protected GridContainer()
+        {
+            SetState(Cs.ShowCheckBox, true);
+            SetState(Cs.ShowTreeButton, true);
+        }
+
+        #endregion
+
+        #region Internal properties
+
+        #region CanModify
+
+        internal virtual bool CanModify
+        {
+            get
+            {
+                GridPanel panel = GridPanel;
+
+                if (panel != null)
+                {
+                    if (panel.ReadOnly == true)
+                        return (false);
+                }
+
+                return (ReadOnly == false && IsDeleted == false);
+            }
+        }
+
+        #endregion
+
+        #region CheckBoxBounds
+
+        internal Rectangle CheckBoxBounds
+        {
+            get { return (_CheckBoxBounds); }
+            set { _CheckBoxBounds = value; }
+        }
+
+        #endregion
+
+        #region ContainerBounds
+
+        internal Rectangle ContainerBounds
+        {
+            get { return (_ContainerBounds); }
+            set { _ContainerBounds = value; }
+        }
+
+        #endregion
+
+        #region DisplayedCellRanges
+
+        internal List<CellRange> DisplayedCellRanges
+        {
+            get { return (_DisplayedCellRanges); }
+            set { _DisplayedCellRanges = value; }
+        }
+
+        #endregion
+
+        #region DisplayedMergeLayoutCount
+
+        internal int DisplayedMergeLayoutCount
+        {
+            get { return (_DisplayedMergeLayoutCount); }
+            set { _DisplayedMergeLayoutCount = value; }
+        }
+
+        #endregion
+
+        #region FixedHeaderHeight
+
+        /// <summary>
+        /// Get or sets the FixedHeaderHeight
+        /// </summary>
+        internal int FixedHeaderHeight
+        {
+            get { return (_FixedHeaderHeight); }
+            set { _FixedHeaderHeight = value; }
+        }
+
+        #endregion
+
+        #region FixedRowHeight
+
+        /// <summary>
+        /// Get or sets the FixedRowHeight
+        /// </summary>
+        internal int FixedRowHeight
+        {
+            get { return (_FixedRowHeight); }
+            set { _FixedRowHeight = value; }
+        }
+
+        #endregion
+
+        #region HasCheckBox
+
+        internal bool HasCheckBox
+        {
+            get
+            {
+                GridPanel ppanel = GetParentPanel();
+
+                if (ppanel != null)
+                {
+                    if (ppanel.CheckBoxes != true)
+                        return (false);
+                }
+
+                return (ShowCheckBox);
+            }
+        }
+
+        #endregion
+
+        #region HasVisibleItems
+
+        internal bool HasVisibleItems
+        {
+            get { return (TestState(Cs.HasVisibleItems)); }
+            set { SetState(Cs.HasVisibleItems, value); }
+        }
+
+        #endregion
+
+        #region IndentLevel
+
+        /// <summary>
+        /// Get or sets the panel indent level
+        /// </summary>
+        internal int IndentLevel
+        {
+            get { return (_IndentLevel); }
+            set { _IndentLevel = value; }
+        }
+
+        #endregion
+
+        #region IsActiveRow
+
+        internal bool IsActiveRow
+        {
+            get
+            {
+                GridPanel panel = GridPanel;
+
+                return (panel.ActiveRow != null &&
+                    panel.ActiveRow.GridIndex == GridIndex);
+            }
+        }
+
+        #endregion
+
+        #region IsDeletedEx
+
+        internal bool IsDeletedEx
+        {
+            get { return (TestState(Cs.Deleted)); }
+            set { IsDeleted = value; }
+        }
+
+        #endregion
+
+        #region IsMergeSuspended
+
+        internal bool IsMergeSuspended
+        {
+            get { return (_SuspendedRange != null); }
+        }
+
+        #endregion
+
+        #region MaxRowIndex
+
+        internal int MaxRowIndex
+        {
+            get
+            {
+                GridPanel panel = this as GridPanel;
+
+                if (panel != null && panel.VirtualMode == true)
+                    return (panel.VirtualRowCountEx - 1);
+
+                return (Rows.Count - 1);
+            }
+        }
+
+        #endregion
+
+        #region MergeUpdateCount
+
+        internal ushort MergeUpdateCount
+        {
+            get { return (_MergeUpdateCount); }
+            set { _MergeUpdateCount = value; }
+        }
+
+        #endregion
+
+        #region MergeScan
+
+        internal MergeScan MergeScan
+        {
+            get
+            {
+                if (_MergeScan == null)
+                    _MergeScan = new MergeScan(this);
+
+                return (_MergeScan);
+            }
+
+            set { _MergeScan = value; }
+        }
+
+        #endregion
+
+        #region MouseOverElement
+
+        internal GridElement MouseOverElement
+        {
+            get { return (_MouseOverElement); }
+        }
+
+        #endregion
+
+        #region NeedMergeLayout
+
+        internal bool NeedMergeLayout
+        {
+            get { return (_NeedMergeLayout); }
+            set { _NeedMergeLayout = value; }
+        }
+
+        #endregion
+
+        #region Selected
+
+        internal bool Selected
+        {
+            get
+            {
+                if (AllowSelection == false)
+                    return (false);
+
+                GridPanel panel = GetParentPanel();
+
+                if (panel != null)
+                {
+                    if (_SelectionClearCount != panel.SelectionClearCount)
+                    {
+                        _SelectionClearCount = panel.SelectionClearCount;
+
+                        Selected = false;
+
+                        if (ExpandedVisible(panel) == true)
+                            panel.SetSelectedEx(this, false);
+
+                        InvalidateRender();
+                    }
+                }
+
+                return (TestState(Cs.Selected));
+            }
+
+            set
+            {
+                SetState(Cs.Selected, value);
+
+                GridPanel panel = GetParentPanel();
+
+                if (panel != null)
+                    _SelectionClearCount = panel.SelectionClearCount;
+            }
+        }
+
+        #endregion
+
+        #region SelectionClearCount
+
+        internal ushort SelectionClearCount
+        {
+            get { return (_SelectionClearCount); }
+            set { _SelectionClearCount = value; }
+        }
+
+        #endregion
+
+        #region SuspendedRange
+
+        /// <summary>
+        /// Get or sets the current suspended range
+        /// </summary>
+        internal CellRange SuspendedRange
+        {
+            get { return (_SuspendedRange); }
+            set { _SuspendedRange = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region TestState
+
+        private bool TestState(Cs state)
+        {
+            return ((_States & state) == state);
+        }
+
+        #endregion
+
+        #region SetState
+
+        private void SetState(Cs state, bool value)
+        {
+            if (value == true)
+                _States |= state;
+            else
+                _States &= ~state;
+        }
+
+        #endregion
+
+        #region GetVisibleItemCount
+
+        internal int GetVisibleItemCount()
+        {
+            int n = 0;
+
+            if (Expanded == true)
+            {
+                foreach (GridElement item in Rows)
+                {
+                    if (item.Visible == true)
+                    {
+                        n++;
+
+                        GridContainer row = item as GridContainer;
+
+                        if (row != null)
+                        {
+                            if (row.Rows.Count > 0 && row.Expanded == true)
+                                n += row.GetVisibleItemCount();
+                        }
+                    }
+                }
+            }
+
+            return (n);
+        }
+
+        #endregion
+
+        #region GetNextItem
+
+        internal GridContainer GetNextItem()
+        {
+            GridContainer container = Parent as GridContainer;
+
+            if (container != null)
+            {
+                GridPanel panel = container as GridPanel;
+
+                if (panel != null && panel.VirtualMode == true)
+                {
+                    GridRow row = this as GridRow;
+
+                    if (row != null)
+                    {
+                        int n = row.GridIndex + 1;
+
+                        if (n < panel.VirtualRowCountEx)
+                            return (panel.VirtualRows[n]);
+                    }
+                }
+                else
+                {
+                    int index = RowIndex;
+
+                    if (index >= 0)
+                    {
+                        for (int i = index + 1; i < container.Rows.Count; i++)
+                        {
+                            GridContainer item = container.Rows[i] as GridContainer;
+
+                            if (item != null && item.Visible == true)
+                                return (item);
+                        }
+                    }
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetPrevItem
+
+        internal GridContainer GetPrevItem()
+        {
+            GridContainer container = Parent as GridContainer;
+
+            if (container != null)
+            {
+                GridPanel panel = container as GridPanel;
+
+                if (panel != null && panel.VirtualMode == true)
+                {
+                    GridRow row = this as GridRow;
+                    if (row != null)
+                    {
+                        int n = row.GridIndex - 1;
+
+                        if (n >= 0)
+                            return (panel.VirtualRows[n]);
+                    }
+                }
+                else
+                {
+                    for (int i = Index - 1; i >= 0; i--)
+                    {
+                        GridContainer item = container.Rows[i] as GridContainer;
+
+                        if (item != null && item.Visible == true)
+                            return (item);
+                    }
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region FindGridPanel
+
+        ///<summary>
+        /// Finds the GridPanel with the given Name.
+        /// Only the root Rows collection is searched.
+        ///</summary>
+        ///<returns>GridPanel, or null if not found.</returns>
+        public GridPanel FindGridPanel(string name)
+        {
+            return (FindGridPanel(name, false));
+        }
+
+        ///<summary>
+        /// Finds the GridPanel with the given Name.
+        /// Nested Rows are searched if 'includeNested' is true.
+        ///</summary>
+        ///<param name="name">Name to search</param>
+        ///<param name="includeNested">Whether to include nested rows in the search.</param>
+        ///<returns>GridPanel, or null if not found.</returns>
+        public GridPanel FindGridPanel(string name, bool includeNested)
+        {
+            GridItemsCollection items = Rows;
+
+            foreach (GridElement item in items)
+            {
+                GridPanel panel = item as GridPanel;
+
+                if (panel != null)
+                {
+                    if (panel.Name != null && panel.Name.Equals(name))
+                        return (panel);
+                }
+            }
+
+            if (includeNested == true)
+            {
+                foreach (GridElement item in items)
+                {
+                    GridContainer container = item as GridContainer;
+
+                    if (container != null)
+                    {
+                        GridPanel panel = container.FindGridPanel(name, true);
+
+                        if (panel != null)
+                            return (panel);
+                    }
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region SetExpanded
+
+        private void SetExpanded(bool value, ExpandSource source)
+        {
+            GridPanel panel = GridPanel;
+
+            if (panel != null)
+            {
+                panel.FlushActiveRow();
+
+                if (Expanded == false)
+                {
+                    bool dynanic = RowsUnresolved;
+
+                    if (SuperGrid == null ||
+                        SuperGrid.DoBeforeExpandEvent(panel, this, source) == false)
+                    {
+                        ProcessExpandChange(panel, value);
+
+                        if (dynanic == true && RowsUnresolved == false)
+                        {
+                            if (panel.SortColumns.Count > 0)
+                                panel.NeedsSorted = true;
+                        }
+
+                        if (SuperGrid != null)
+                            SuperGrid.DoAfterExpandEvent(panel, this, source);
+                    }
+                }
+                else
+                {
+                    if (SuperGrid == null ||
+                        SuperGrid.DoBeforeCollapseEvent(panel, this, source) == false)
+                    {
+                        ProcessExpandChange(panel, value);
+
+                        if (SuperGrid != null)
+                            SuperGrid.DoAfterCollapseEvent(panel, this, source);
+                    }
+                }
+            }
+            else
+            {
+                SetState(Cs.Expanded, value);
+            }
+        }
+
+        #region ProcessExpandChange
+
+        private void ProcessExpandChange(GridPanel panel, bool value)
+        {
+            if (value == true)
+                SetState(Cs.Expanded, true);
+
+            //if (SuperGrid.IsUpdateSuspended == false)
+            {
+                int index = GridIndex;
+                int count = GetVisibleItemCount();
+
+                panel.ExpandSelectedAtIndex(index + 1, count, value);
+
+                if (value == false)
+                    SetState(Cs.Expanded, false);
+
+                if (Parent is GridContainer)
+                    ((GridContainer)Parent).InvalidateMerge();
+            }
+            //else
+            //{
+            //    if (value == false)
+            //        SetState(Cs.Expanded, false);
+            //}
+
+            panel.ExpandedUpdateCount++;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ExpandItemTree
+
+        /// <summary>
+        /// Expands the entire tree, as necessary, to display the given row.
+        /// </summary>
+        /// <returns>'true' if any expanding was actually performed</returns>
+        public bool ExpandItemTree()
+        {
+            GridContainer row = Parent as GridContainer;
+
+            bool expandChanged = false;
+
+            while (row != null)
+            {
+                if (row is GridRow || row is GridGroup)
+                {
+                    if (row.Expanded == false)
+                    {
+                        if (row.Rows.Count > 0 || row.RowsUnresolved == true)
+                        {
+                            row.Expanded = true;
+
+                            expandChanged = true;
+                        }
+                    }
+                }
+
+                row = row.Parent as GridContainer;
+            }
+
+            return (expandChanged);
+        }
+
+        #endregion
+
+        #region ExpandAll
+
+        ///<summary>
+        /// Expands all rows in the Rows collection.
+        ///</summary>
+        public void ExpandAll()
+        {
+            ExpandAll(-1, true);
+        }
+
+        ///<summary>
+        /// Expands all rows in the Rows collection to the provided depth.
+        /// 
+        /// If a depth is provided, then rows will be expanded only to the given depth.
+        /// In other words, to expand only the first level of rows in the container, you would
+        /// call ExpandAll(0). To expand the first level � as well as 2 levels under it,
+        /// you would call ExpandAll(2).
+        ///</summary>
+        public void ExpandAll(int depth)
+        {
+            ExpandAll(depth, true);
+        }
+
+        private void ExpandAll(int depth, bool expand)
+        {
+            if (Rows.Count > 0)
+            {
+                SuperGrid.BeginUpdate();
+
+                foreach (GridElement item in Rows)
+                {
+                    GridContainer row = item as GridContainer;
+
+                    if (row != null)
+                    {
+                        if (row.Expanded != expand)
+                            row.SetExpanded(expand, ExpandSource.ExpandAll);
+
+                        if (depth != 0)
+                            row.ExpandAll(depth - 1, expand);
+                    }
+                }
+
+                SuperGrid.EndUpdate();
+
+                InvalidateLayout();
+                GridPanel.InvalidateMerge();
+            }
+        }
+
+        #endregion
+
+        #region CollapseAll
+
+        ///<summary>
+        /// Collapses all expanded rows.
+        ///</summary>
+        public void CollapseAll()
+        {
+            ExpandAll(-1, false);
+        }
+
+        ///<summary>
+        /// Collapses all rows in the Rows collection to the provided depth.
+        /// 
+        /// If a depth is provided, then rows will be collapsed only to the given depth.
+        /// In other words, to collapse only the first level of rows in the container, you would
+        /// call CollapseAll(0). To collapse the first level � as well as 2 levels under it,
+        /// you would call CollapseAll(2).
+        ///</summary>
+        public void CollapseAll(int depth)
+        {
+            ExpandAll(depth, false);
+        }
+
+        #endregion
+
+        #region SetActive
+
+        ///<summary>
+        /// Makes the given row active
+        ///</summary>
+        ///<returns>true, if successful</returns>
+        public bool SetActive()
+        {
+            return (SetActive(false));
+        }
+
+        ///<summary>
+        /// Makes the given row active and
+        /// optionally selects the given row
+        ///</summary>
+        ///<returns>true, if successful</returns>
+        public bool SetActive(bool select)
+        {
+            GridPanel panel = GridPanel;
+
+            if (panel != null)
+            {
+                if (panel.SetActiveRow(this) == true)
+                {
+                    if (select == true)
+                    {
+                        GridPanel.ClearAll();
+
+                        IsSelected = true;
+
+                        if (panel.SelectionRowAnchor == null)
+                            panel.SelectionRowAnchor = this;
+                    }
+
+                    return (true);
+                }
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region EnsureVisible
+
+        ///<summary>
+        /// This routine will ensure that the row is visible on
+        /// the screen.  If the row is not visible on screen, the
+        /// view window will be scrolled to make it visible.  
+        ///</summary>
+        ///<param name="center">If 'true', the row will be centered on screen</param>
+        public override void EnsureVisible(bool center)
+        {
+            if (Visible == true)
+            {
+                GridPanel panel = GridPanel;
+
+                if (ExpandItemTree() == true || FixedRowHeight <= 0 || panel.IsLayoutValid == false)
+                    SuperGrid.ArrangeGrid();
+
+                Rectangle t = SViewRect;
+                Rectangle bounds = BoundsRelative;
+
+                int fixedHeight = FixedRowHeight;
+
+                if (panel.VirtualMode == true)
+                {
+                    int vrh = Dpi.Height(panel.VirtualRowHeight);
+
+                    bounds = panel.BoundsRelative;
+
+                    bounds.Y += (panel.FixedRowHeight - (panel.FrozenRowCount * vrh));
+                    bounds.Y += (GridIndex * vrh);
+
+                    fixedHeight = (this is GridRow) ? vrh : 0;
+                }
+
+                if (fixedHeight >= t.Height || bounds.Y - VScrollOffset < t.Y)
+                {
+                    int n = bounds.Y - t.Y;
+
+                    if (center == false || fixedHeight >= t.Height)
+                        SuperGrid.SetVScrollValue(n);
+                    else
+                        SuperGrid.SetVScrollValue(n - (t.Height - fixedHeight) / 2);
+                }
+                else if (bounds.Y - VScrollOffset > t.Bottom - fixedHeight)
+                {
+                    int n = bounds.Y - (t.Bottom - fixedHeight);
+
+                    if (center == false)
+                        SuperGrid.SetVScrollValue(n);
+                    else
+                        SuperGrid.SetVScrollValue(n + (t.Height - fixedHeight) / 2);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ScrollToTop
+
+        /// <summary>
+        /// Scrolls the row to the 'logical' top of the grid display.
+        /// </summary>
+        public void ScrollToTop()
+        {
+            if (Visible == true)
+            {
+                if (IsVFrozen == false)
+                {
+                    if (ExpandItemTree() == true)
+                        SuperGrid.ArrangeGrid();
+
+                    Rectangle t = SViewRect;
+                    Rectangle bounds = BoundsRelative;
+
+                    GridPanel panel = GridPanel;
+
+                    if (panel.VirtualMode == true)
+                    {
+                        int vrh = Dpi.Height(panel.VirtualRowHeight);
+
+                        bounds = panel.BoundsRelative;
+
+                        bounds.Y += (panel.FixedRowHeight - (panel.FrozenRowCount * vrh));
+                        bounds.Y += (GridIndex * vrh);
+                    }
+
+                    int n = bounds.Y - t.Y;
+
+                    SuperGrid.SetVScrollValue(n);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ScrollToBottom
+
+        /// <summary>
+        /// Scrolls the row to the 'logical' bottom of the grid display.
+        /// </summary>
+        public void ScrollToBottom()
+        {
+            if (Visible == true)
+            {
+                if (IsVFrozen == false)
+                {
+                    ExpandItemTree();
+                    SuperGrid.ArrangeGrid();
+
+                    Rectangle t = SViewRect;
+                    Rectangle bounds = BoundsRelative;
+
+                    GridPanel panel = GridPanel;
+
+                    if (panel.VirtualMode == true)
+                    {
+                        int vrh = Dpi.Height(panel.VirtualRowHeight);
+
+                        bounds = panel.BoundsRelative;
+
+                        bounds.Y += (panel.FixedRowHeight - (panel.FrozenRowCount * vrh));
+                        bounds.Y += (GridIndex * vrh);
+                    }
+
+                    int n = bounds.Y - (t.Bottom) + FixedRowHeight;
+
+                    SuperGrid.SetVScrollValue(n);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ExtendSelection
+
+        internal void ExtendSelection(
+            GridPanel panel, GridContainer endItem, bool extend)
+        {
+            if (panel.SelectionRowAnchor != null)
+            {
+                int startIndex = panel.SelectionRowAnchor.GridIndex;
+                int endIndex = endItem.GridIndex;
+
+                panel.NormalizeIndices(false, 0, ref startIndex, ref endIndex);
+
+                if (panel.OnlyRowsSelected(startIndex, endIndex) == false)
+                {
+                    if (extend == false)
+                        panel.ClearAllSelected();
+                    else
+                        panel.ClearAll(false);
+
+                    panel.SetSelectedRows(startIndex, endIndex - startIndex + 1, true);
+
+                    GridContainer row = GetLastProcessedRow(panel);
+
+                    if (extend == true && row != null)
+                    {
+                        if (panel.SelectionRowAnchor.GridIndex < endItem.GridIndex)
+                            startIndex = row.GridIndex;
+                        else
+                            endIndex = row.GridIndex;
+                    }
+
+                    InvalidateRows(panel, startIndex, endIndex, extend);
+                }
+            }
+        }
+
+        #region GetLastProcessedRow
+
+        private GridContainer GetLastProcessedRow(GridPanel panel)
+        {
+            if (panel.LastProcessedItem is GridContainer)
+                return ((GridContainer)panel.LastProcessedItem);
+
+            if (panel.LastProcessedItem is GridCell)
+                return (((GridCell)panel.LastProcessedItem).GridRow);
+
+            return (null);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InvalidateRows
+
+        internal void InvalidateRows(GridPanel panel, int start, int end, bool extend)
+        {
+            if (start > end)
+            {
+                int temp = start;
+                start = end;
+                end = temp;
+            }
+
+            start = Math.Max(0, start);
+
+            if (extend == false && panel.FrozenRowCount > 0)
+                InvalidateRowRange(panel, 0, panel.FirstOnScreenRowIndex);
+
+            InvalidateRowRange(panel, start, end);
+        }
+
+        #region InvalidateRowRange
+
+        private void InvalidateRowRange(GridPanel panel, int start, int end)
+        {
+            Rectangle t = SuperGrid.ClientRectangle;
+
+            GridContainer rs = panel.GetRowFromIndex(start);
+            GridContainer re = panel.GetRowFromIndex(end);
+
+            if (rs != null && re != null)
+            {
+                Rectangle rsRect = rs.Bounds;
+                Rectangle reRect = re.Bounds;
+
+                if (rs is GridPanel)
+                    rsRect = GetScrollBounds(rs.ContainerBounds);
+
+                if (re is GridPanel)
+                    reRect = GetScrollBounds(re.ContainerBounds);
+
+                Rectangle r = new Rectangle(rsRect.X, rsRect.Y,
+                                            reRect.Width, reRect.Bottom - rsRect.Y);
+
+                if (r.IntersectsWith(t) == true)
+                    panel.InvalidateRender(r);
+
+                if (rs is GridRow)
+                    rs.InvalidateRender();
+
+                if (re != rs && re is GridRow)
+                    re.InvalidateRender();
+            }
+        }
+
+        #region GetScrollBounds
+
+        private Rectangle GetScrollBounds(Rectangle r)
+        {
+            r.X -= HScrollOffset;
+
+            if (IsVFrozen == false)
+                r.Y -= VScrollOffset;
+
+            return (r);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region MeasureSubItems
+
+        /// <summary>
+        /// MeasureSubItems
+        /// </summary>
+        /// <param name="layoutInfo"></param>
+        /// <param name="stateInfo"></param>
+        /// <param name="constraintSize"></param>
+        /// <returns></returns>
+        protected Size MeasureSubItems(
+            GridLayoutInfo layoutInfo, GridLayoutStateInfo stateInfo, Size constraintSize)
+        {
+            Size sizeNeeded = Size.Empty;
+            GridPanel panel = stateInfo.GridPanel;
+
+            HasVisibleItems = false;
+
+            GridItemsCollection items = Rows;
+            foreach (GridElement item in items)
+            {
+                if (item.Visible == true)
+                {
+                    Size size;
+                    GridPanel ipanel = item as GridPanel;
+
+                    if (ipanel != null)
+                    {
+                        int n = GetRowIndent(panel, ipanel);
+
+                        Rectangle r = layoutInfo.ClientBounds;
+                        r.Inflate((panel.ShowDropShadow ? -5 : 0) - n, 0);
+
+                        GridLayoutInfo itemLayoutInfo = new GridLayoutInfo(layoutInfo.Graphics, r);
+                        GridLayoutStateInfo itemStateInfo = new GridLayoutStateInfo(ipanel, 0);
+
+                        item.Measure(itemLayoutInfo, itemStateInfo, Size.Empty);
+                        size = item.Size;
+
+                        size.Width += n;
+                        size.Height += Dpi.Height(panel.LevelIndentSize.Height * 2);
+                    }
+                    else
+                    {
+                        item.Measure(layoutInfo, stateInfo, constraintSize);
+                        size = item.Size;
+                    }
+
+                    sizeNeeded.Width = Math.Max(sizeNeeded.Width, size.Width);
+                    sizeNeeded.Height += size.Height;
+
+                    HasVisibleItems = true;
+                }
+            }
+
+            return (sizeNeeded);
+        }
+
+        #endregion
+
+        #region ArrangeSubItems
+
+        /// <summary>
+        /// ArrangeSubItems
+        /// </summary>
+        /// <param name="layoutInfo"></param>
+        /// <param name="stateInfo"></param>
+        /// <param name="layoutBounds"></param>
+        protected void ArrangeSubItems(GridLayoutInfo layoutInfo,
+            GridLayoutStateInfo stateInfo, Rectangle layoutBounds)
+        {
+            Rectangle bounds = layoutBounds;
+
+            GridPanel panel = stateInfo.GridPanel;
+            int indentLevel = stateInfo.IndentLevel;
+
+            GridItemsCollection items = Rows;
+            foreach (GridElement item in items)
+            {
+                if (item.Visible == true)
+                {
+                    bounds.Height = item.Size.Height;
+
+                    GridPanel ipanel = item as GridPanel;
+
+                    if (ipanel != null)
+                    {
+                        ipanel.IndentLevel = indentLevel;
+
+                        Rectangle r = layoutBounds;
+                        r.Y = bounds.Y;
+                        r.Height = bounds.Height + Dpi.Height(panel.LevelIndentSize.Height * 2);
+
+                        ipanel.ContainerBounds = r;
+
+                        int n = GetRowIndent(panel, ipanel);
+
+                        r.X = layoutBounds.X + n;
+                        r.Y += Dpi.Height(panel.LevelIndentSize.Height);
+
+                        if (ipanel.ShowDropShadow == true)
+                            r.Y--;
+
+                        r.Width = ipanel.BoundsRelative.Width;
+                        r.Height -= Dpi.Height(panel.LevelIndentSize.Height * 2);
+
+                        ArrangeCheckBox(panel, ipanel, r);
+
+                        stateInfo.GridPanel = ipanel;
+                        stateInfo.IndentLevel = 0;
+
+                        item.Arrange(layoutInfo, stateInfo, r);
+
+                        bounds.Y += Dpi.Height(panel.LevelIndentSize.Height * 2);
+                    }
+                    else
+                    {
+                        stateInfo.GridPanel = panel;
+                        stateInfo.IndentLevel = indentLevel;
+
+                        item.Arrange(layoutInfo, stateInfo, bounds);
+                    }
+
+                    bounds.Y += item.Size.Height;
+                }
+                else
+                {
+                    item.BoundsRelative = bounds;
+                }
+            }
+        }
+
+        #region ArrangeCheckBox
+
+        private void ArrangeCheckBox(
+            GridPanel panel, GridPanel ipanel, Rectangle r)
+        {
+            if (ipanel.HasCheckBox == true)
+            {
+                int k = Math.Max(
+                    Dpi.Width(panel.CheckBoxSize.Width + 3),
+                    Dpi.Height(panel.CheckBoxSize.Height+ 3));
+
+                r.X -= k;
+                r.Width = Dpi.Width(panel.CheckBoxSize.Width);
+
+                r.Y += (r.Height - Dpi.Height(panel.CheckBoxSize.Height)) / 2;
+                r.Height = Dpi.Height(panel.CheckBoxSize.Height);
+
+                ipanel.CheckBoxBounds = r;
+            }
+            else
+            {
+                ipanel.CheckBoxBounds = Rectangle.Empty;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetRowIndent
+
+        /// <summary>
+        /// GetRowIndent
+        /// </summary>
+        /// <param name="panel"></param>
+        /// <param name="ipanel"></param>
+        /// <returns></returns>
+        protected int GetRowIndent(GridPanel panel, GridPanel ipanel)
+        {
+            int indentLevel = 0;
+
+            GridContainer container = ipanel.Parent as GridContainer;
+
+            if (container != null)
+                indentLevel = container.IndentLevel + 1;
+
+            int n = 0;
+
+            if (panel.ShowRowHeaders == true)
+                n += panel.RowHeaderWidthEx;
+
+            if (panel.CheckBoxes == true)
+            {
+                n += Math.Max(
+                    Dpi.Width(ipanel.CheckBoxSize.Width + 3),
+                    Dpi.Height(ipanel.CheckBoxSize.Height + 3));
+            }
+
+            if (panel.PrimaryColumn != null &&
+                panel.PrimaryColumn.Visible == true)
+            {
+                if (panel.ShowTreeButtons == true || panel.ShowTreeLines == true)
+                    n += panel.TreeButtonIndent;
+
+                n += Dpi.Width(panel.LevelIndentSize.Width * indentLevel);
+
+                GridColumnCollection columns = panel.Columns;
+
+                int[] map = columns.DisplayIndexMap;
+                for (int i = 0; i < map.Length; i++)
+                {
+                    int index = map[i];
+
+                    GridColumn column = columns[index];
+
+                    if (index == panel.PrimaryColumnIndex)
+                        break;
+
+                    if (column.Visible == true)
+                        n += column.Size.Width;
+                }
+            }
+            else
+            {
+                n += 3;
+            }
+
+            return (n);
+        }
+
+        #endregion
+
+        #region GetParentPanel
+
+        ///<summary>
+        /// Gets the Parent GridPanel for the item.
+        ///</summary>
+        ///<returns>GridPanel or null</returns>
+        public GridPanel GetParentPanel()
+        {
+            GridElement parent = Parent;
+
+            while (parent != null)
+            {
+                if (parent is GridPanel)
+                    return ((GridPanel)parent);
+
+                parent = parent.Parent;
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region InvalidateRowHeader
+
+        internal void InvalidateRowHeader()
+        {
+            InvalidateRowHeader(this);
+        }
+
+        internal void InvalidateRowHeader(GridContainer row)
+        {
+            if (row != null)
+            {
+                GridPanel panel = row.GetParentPanel();
+
+                if (panel != null)
+                {
+                    if (panel.ShowRowHeaders == true)
+                    {
+                        Rectangle bounds = panel.BoundsRelative;
+
+                        if (panel.IsSubPanel == true)
+                            bounds.X -= HScrollOffset;
+
+                        bounds.Y = row.ContainerBounds.Y;
+
+                        if (row.IsVFrozen == false)
+                            bounds.Y -= VScrollOffset;
+
+                        bounds.Width = panel.RowHeaderWidthEx;
+                        bounds.Height = row.ContainerBounds.Height;
+
+                        InvalidateRender(bounds);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region InvalidateMerge
+
+        /// <summary>
+        /// Invalidates the merge state of the container.
+        /// </summary>
+        public void InvalidateMerge()
+        {
+            MergeUpdateCount++;
+            NeedMergeLayout = true;
+
+            ResumeMerge();
+
+            InvalidateLayout();
+        }
+
+        #endregion
+
+        #region Mouse Handling
+
+        #region InternalMouseLeave
+
+        /// <summary>
+        /// Called by top-level control to pass message into the grid
+        /// element. To handle it override corresponding On - virtual method.
+        /// </summary>
+        /// <param name="e"></param>
+        internal override void InternalMouseLeave(EventArgs e)
+        {
+            GridElement mouseOverElement = _MouseOverElement;
+
+            if (mouseOverElement != null)
+            {
+                mouseOverElement.InternalMouseLeave(e);
+                _MouseOverElement = null;
+            }
+
+            base.InternalMouseLeave(e);
+        }
+
+        #endregion
+
+        #region InternalMouseMove
+
+        /// <summary>
+        /// Called by top-level control to pass message into the grid
+        /// element. To handle it override corresponding On - virtual method.
+        /// </summary>
+        /// <param name="e"></param>
+        internal override void InternalMouseMove(MouseEventArgs e)
+        {
+            GridElement element = GetElementAt(e);
+
+            if (element != _MouseOverElement)
+            {
+                GridElement mouseOverElement = _MouseOverElement;
+
+                if (mouseOverElement != null)
+                    mouseOverElement.InternalMouseLeave(e);
+
+                if (element != null)
+                    element.InternalMouseEnter(e);
+
+                _MouseOverElement = element;
+            }
+
+            if (element != null)
+                element.InternalMouseMove(e);
+
+            base.InternalMouseMove(e);
+        }
+
+        #endregion
+
+        #region InternalMouseHover
+
+        /// <summary>
+        /// Called by top-level control to pass message into the grid
+        /// element. To handle it override corresponding On - virtual method.
+        /// </summary>
+        /// <param name="e"></param>
+        internal override void InternalMouseHover(EventArgs e)
+        {
+            GridElement mouseOverElement = _MouseOverElement;
+            
+            if (mouseOverElement != null)
+                mouseOverElement.InternalMouseHover(e);
+
+            base.InternalMouseHover(e);
+        }
+
+        #endregion
+
+        #region InternalMouseClick
+
+        /// <summary>
+        /// Called by top-level control to pass message into the grid
+        /// element. To handle it override corresponding On - virtual method.
+        /// </summary>
+        /// <param name="e"></param>
+        internal override void InternalMouseClick(MouseEventArgs e)
+        {
+            GridElement mouseOverElement = _MouseOverElement;
+
+            if (mouseOverElement == null)
+                InternalMouseMove(e);
+
+            mouseOverElement = _MouseOverElement;
+
+            if (mouseOverElement != null)
+                mouseOverElement.InternalMouseClick(e);
+
+            base.InternalMouseClick(e);
+        }
+
+        #endregion
+
+        #region InternalMouseDoubleClick
+
+        /// <summary>
+        /// Called by top-level control to pass message into the grid
+        /// element. To handle it override corresponding On - virtual method.
+        /// </summary>
+        /// <param name="e"></param>
+        internal override void InternalMouseDoubleClick(MouseEventArgs e)
+        {
+            GridElement mouseOverElement = _MouseOverElement;
+
+            if (mouseOverElement != null)
+                mouseOverElement.InternalMouseDoubleClick(e);
+
+            base.InternalMouseDoubleClick(e);
+        }
+
+        #endregion
+
+        #region InternalMouseDown
+
+        /// <summary>
+        /// Called by top-level control to pass message into the grid
+        /// element. To handle it override corresponding On - virtual method.
+        /// </summary>
+        /// <param name="e"></param>
+        internal override void InternalMouseDown(MouseEventArgs e)
+        {
+            GridElement mouseOverElement = _MouseOverElement;
+
+            if (mouseOverElement == null)
+            {
+                MouseEventArgs e2 = new
+                    MouseEventArgs(MouseButtons.None, 0, e.X, e.Y, e.Delta);
+
+                InternalMouseMove(e2);
+
+                mouseOverElement = _MouseOverElement;
+            }
+
+            if (mouseOverElement != null)
+                mouseOverElement.InternalMouseDown(e);
+
+            base.InternalMouseDown(e);
+        }
+
+        #endregion
+
+        #region InternalMouseUp
+
+        /// <summary>
+        /// Called by top-level control to pass message into the grid
+        /// element. To handle it override corresponding On - virtual method.
+        /// </summary>
+        /// <param name="e"></param>
+        internal override void InternalMouseUp(MouseEventArgs e)
+        {
+            GridElement mouseOverElement = _MouseOverElement;
+
+            if (mouseOverElement != null)
+                mouseOverElement.InternalMouseUp(e);
+
+            base.InternalMouseUp(e);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetElementAt
+
+        /// <summary>
+        /// Returns element at specified mouse coordinates.
+        /// </summary>
+        /// <param name="e">Mouse event arguments</param>
+        /// <returns>Reference to child element or null if no element at specified coordinates</returns>
+        public virtual GridElement GetElementAt(MouseEventArgs e)
+        {
+            return GetElementAt(e.X, e.Y);
+        }
+
+        /// <summary>
+        /// Returns element at specified mouse coordinates.
+        /// </summary>
+        /// <param name="x">Horizontal position</param>
+        /// <param name="y">Vertical position</param>
+        /// <returns>Reference to child element or null if no element at specified coordinates</returns>
+        public virtual GridElement GetElementAt(int x, int y)
+        {
+            GridPanel panel = GridPanel;
+
+            if (panel != null)
+            {
+                Rectangle t = CViewRect;
+                Rectangle bounds = Rectangle.Empty;
+
+                if (t.Contains(x, y) == true)
+                {
+                    if (this is GridPanel || Expanded == true)
+                    {
+                        GridItemsCollection items = Rows;
+                        for (int i = 0; i < items.Count; i++)
+                        {
+                            GridElement item = items[i];
+
+                            if (item.IsVFrozen == false)
+                                break;
+
+                            if (IsElementAt(item, x, y, ref bounds) == true)
+                                return (item);
+
+                            if (bounds.Y > t.Bottom)
+                                break;
+                        }
+
+                        for (int i = FirstOnScreenRowIndex; i < items.Count; i++)
+                        {
+                            GridElement item = items[i];
+
+                            if (IsElementAt(item, x, y, ref bounds) == true)
+                            {
+                                GridGroup grp = item as GridGroup;
+
+                                if (grp != null)
+                                {
+                                    item = grp.GetElementAt(x, y);
+
+                                    if (item == null)
+                                        return (grp);
+                                }
+
+                                return (item);
+                            }
+
+                            if (bounds.Y > y)
+                                break;
+                        }
+                    }
+                }
+            }
+
+            return (null);
+        }
+
+        private bool IsElementAt(
+            GridElement item, int x, int y, ref Rectangle bounds)
+        {
+            if (item.Visible == true)
+            {
+                bounds = item.BoundsRelative;
+
+                if (item.Visible == true)
+                {
+                    if (item is GridPanel)
+                        bounds = ((GridPanel)item).ContainerBounds;
+
+                    bounds.X -= HScrollOffset;
+
+                    if (item.IsVFrozen == false)
+                        bounds.Y -= VScrollOffset;
+
+                    if (bounds.Contains(x, y))
+                        return (true);
+                }
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region InternalGetElementAt
+
+        internal GridElement InternalGetElementAt(MouseEventArgs e)
+        {
+            return (GetElementAt(e.X, e.Y));
+        }
+
+        internal GridElement InternalGetElementAt(int x, int y)
+        {
+            return (GetElementAt(x, y));
+        }
+
+        #endregion
+
+        #region CanSetActiveRow
+
+        internal bool CanSetActiveRow(bool beep)
+        {
+            return (CanSetActiveRow(GridPanel, this, beep));
+        }
+
+        internal bool CanSetActiveRow(
+            GridPanel panel, GridContainer row, bool beep)
+        {
+            if (row == null || row.AllowSelection == false)
+            {
+                if (beep == true)
+                {
+                    if (SuperGrid.DoPlayingSoundEvent(panel, row, PlaySoundContext.RowActivate) == false)
+                        SystemSounds.Beep.Play();
+                }
+
+                return (false);
+            }
+
+            if (row.IsActive == false)
+            {
+                GridContainer parent = row.Parent as GridContainer;
+
+                if (parent != null)
+                {
+                    if ((uint)row.RowIndex > parent.MaxRowIndex)
+                        return (false);
+
+                    if (panel.SelectionGranularity != SelectionGranularity.Cell)
+                    {
+                        GridContainer cont = Parent as GridContainer;
+
+                        if (cont != null)
+                        {
+                            CellRange cr = cont.SuspendedRange;
+
+                            if (cr != null && (RowIndex < cr.RowStart || RowIndex > cr.RowEnd))
+                                cont.ResumeMerge();
+                        }
+                    }
+
+                    return (SuperGrid.DoRowActivatingEvent(panel, SuperGrid.ActiveRow, row) != true);
+                }
+            }
+
+            return (row.IsActive);
+        }
+
+        #endregion
+
+        #region FlushRow
+
+        internal virtual void FlushRow()
+        {
+        }
+
+        #endregion
+
+        #region PurgeDeletedRows
+
+        ///<summary>
+        /// Purges all rows marked as 'deleted'. Once rows are purged
+        /// they cannot be restored.
+        ///</summary>
+        public void PurgeDeletedRows()
+        {
+            PurgeDeletedRows(true);
+        }
+
+        ///<summary>
+        /// Purges all rows marked as 'deleted'. Once rows are purged
+        /// they cannot be restored.
+        ///</summary>
+        ///<param name="includeNestedRows">Determines whether nested rows are also purged.</param>
+        public void PurgeDeletedRows(bool includeNestedRows)
+        {
+            GridPanel panel = GridPanel;
+
+            PurgeDeletedRowsEx(includeNestedRows, panel.IsDeleted);
+        }
+
+        private void PurgeDeletedRowsEx(bool includeNestedRows, bool isDeleted)
+        {
+            GridPanel panel = GridPanel;
+
+            if (SuperGrid.DoRowsPurgingEvent(this, ref includeNestedRows) == false)
+            {
+                if (panel.DeletedRowCount > 0)
+                {
+                    if (panel.ActiveRow != null)
+                        panel.SelectActiveRow = true;
+                }
+
+                if (panel.VirtualMode == true)
+                    PurgeVirtualDeletedRows(panel);
+                else
+                    PurgeRealDeletedRows(panel, includeNestedRows, isDeleted);
+
+                SuperGrid.DoRowsPurgedEvent(this);
+            }
+        }
+
+
+        #region PurgeVirtualDeletedRows
+
+        private void PurgeVirtualDeletedRows(GridPanel panel)
+        {
+            SelectedElements sec = panel.InternalDeletedRows;
+
+            if (sec != null && sec.Count > 0)
+            {
+                int offset = 0;
+                int topIndex = 0;
+
+                int activeIndex =
+                    (panel.ActiveRow != null) ? panel.ActiveRow.RowIndex : -1;
+
+                int count = sec.Count;
+                int index = sec.LastIndex + 1;
+
+                try
+                {
+                    while (sec.GetPrevIndex(ref index) == true)
+                    {
+                        GridRow row = panel.VirtualRows[index];
+
+                        topIndex = row.RowIndex - 1;
+
+                        if (row.RowIndex < activeIndex)
+                            offset++;
+
+                        panel.DataBinder.RemoveRow(row);
+                    }
+
+                    sec.Clear();
+                }
+                finally
+                {
+                    panel.VirtualRowCount -= count;
+                    panel.VirtualRows.MaxRowIndex = topIndex;
+                }
+
+                if (offset > 0)
+                {
+                    panel.LatentActiveRowIndex = activeIndex - offset;
+                    panel.LatentActiveContainer = this;
+                }
+            }
+        }
+
+        #endregion
+
+        #region PurgeRealDeletedRows
+
+        private void PurgeRealDeletedRows(
+            GridPanel panel, bool includeNestedRows, bool isDeleted)
+        {
+            if (panel.ActiveRow != null)
+            {
+                if (panel.ActiveRow.IsDeleted == true)
+                {
+                    if (panel.VirtualMode == false)
+                    {
+                        GridContainer cont = panel.ActiveRow.Parent as GridContainer;
+
+                        if (cont != null)
+                        {
+                            panel.ActiveRow = cont.GetNextLocalItem(panel.ActiveRow.RowIndex);
+
+                            panel.SuperGrid.ActiveElement = panel.ActiveRow;
+                        }
+                    }
+                }
+            }
+
+            PurgeRealDeletedRowsEx(panel.Rows, includeNestedRows, isDeleted);
+        }
+
+        #region PurgeRealDeletedRowsEx
+
+        private void PurgeRealDeletedRowsEx(
+            GridItemsCollection rows, bool includeNestedRows, bool isDeleted)
+        {
+            for (int i = rows.Count - 1; i >= 0; i--)
+            {
+                GridContainer row = rows[i] as GridContainer;
+
+                if (row != null)
+                {
+                    bool rowDeleted = (isDeleted | row.IsDeleted);
+
+                    if (includeNestedRows == true)
+                    {
+                        if (row.Rows.Count > 0)
+                        {
+                            if (row is GridPanel)
+                                row.PurgeDeletedRowsEx(true, rowDeleted);
+                            else
+                                row.PurgeRealDeletedRowsEx(row.Rows, true, rowDeleted);
+                        }
+                    }
+
+                    if (rowDeleted == true)
+                    {
+                        row.IsDeleted = false;
+
+                        rows.RemoveAt(i);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetNextLocalItem
+
+        internal GridContainer GetNextLocalItem(int index)
+        {
+            GridPanel panel = GridPanel;
+
+            index = GetNextLocalItemIndex(index);
+
+            if (panel.VirtualMode == true)
+            {
+                if ((uint)index < panel.VirtualRowCount)
+                    return (panel.VirtualRows[index]);
+            }
+            else
+            {
+                if ((uint) index < Rows.Count)
+                    return (Rows[index] as GridContainer);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetNextLocalItemIndex
+
+        private int GetNextLocalItemIndex(int index)
+        {
+            if (GridPanel.VirtualMode == true)
+                return (GetNextLocalVirtualItemIndex(index));
+
+            return (GetNextLocalRealItemIndex(index));
+        }
+
+        #region GetNextLocalRealItemIndex
+
+        internal int GetNextLocalRealItemIndex(int index)
+        {
+            if (Rows.Count > 0 && index >= 0)
+            {
+                if (index >= Rows.Count)
+                    index = Rows.Count - 1;
+
+                for (int i = index + 1; i < Rows.Count; i++)
+                {
+                    GridContainer item = Rows[i] as GridContainer;
+
+                    if (item != null && item.Visible == true && item.IsDeleted == false)
+                        return (i);
+                }
+
+                for (int i = index - 1; i >= 0; i--)
+                {
+                    GridContainer item = Rows[i] as GridContainer;
+
+                    if (item != null && item.Visible == true && item.IsDeleted == false)
+                        return (i);
+                }
+            }
+
+            return (-1);
+        }
+
+        #endregion
+
+        #region GetNextLocalVirtualItemIndex
+
+        internal int GetNextLocalVirtualItemIndex(int index)
+        {
+            GridPanel panel = GridPanel;
+
+            if (panel.VirtualRowCount > 0 && index >= 0)
+            {
+                if (index >= panel.VirtualRowCount)
+                    index = panel.VirtualRowCount - 1;
+
+                for (int i = index + 1; i < panel.VirtualRowCount; i++)
+                {
+                    GridContainer item = panel.VirtualRows[i];
+
+                    if (item != null && item.IsDeleted == false)
+                        return (i);
+                }
+
+                for (int i = index - 1; i >= 0; i--)
+                {
+                    GridContainer item = panel.VirtualRows[i];
+
+                    if (item != null && item.IsDeleted == false)
+                        return (i);
+                }
+            }
+
+            return (-1);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region DetachNestedRows
+
+        internal void DetachNestedRows(bool dispose)
+        {
+            DetachNestedRows(this, dispose);
+        }
+
+        private void DetachNestedRows(GridContainer cont, bool dispose)
+        {
+            cont.MergeScan = null;
+
+            if (dispose == true)
+            {
+                if (cont is GridPanel)
+                {
+                    ((GridPanel)cont).DataBinder.Dispose();
+                    ((GridPanel)cont).DataBinder = null;
+                }
+            }
+
+            if (cont is GridRow)
+                DetachGridRow((GridRow)cont);
+
+            if (cont.Rows.Count > 0)
+            {
+                foreach (GridContainer row in cont.Rows)
+                {
+                    if (row != null)
+                        DetachNestedRows(row, dispose);
+                }
+            }
+
+            if (SuperGrid != null)
+            {
+                if (SuperGrid.ActiveRow == cont)
+                    SuperGrid.ActiveRow = null;
+            }
+
+            if (cont.GridPanel != null)
+            {
+                if (cont.GridPanel.ActiveRow == cont)
+                    cont.GridPanel.ActiveRow = null;
+            }
+        }
+
+        private void DetachGridRow(GridRow row)
+        {
+            foreach (GridCell cell in row.Cells)
+            {
+                cell.EditControl = null;
+                cell.RenderControl = null;
+            }
+
+            //row.DataItem = null;
+            //row.DataItemIndex = -1;
+        }
+
+        #endregion
+
+        #region UpdateMergeFlags
+
+        internal void UpdateMergeFlags()
+        {
+            GridPanel panel = GridPanel;
+
+            if (panel.EnableCellMerging == true)
+                DisplayedCellRanges = MergeScan.GetScanItems();
+            else
+                DisplayedCellRanges = null;
+
+            _LastCellRange = null;
+        }
+
+        #endregion
+
+        #region GetCellRange
+
+        internal CellRange GetCellRange(GridCell cell)
+        {
+            if (DisplayedCellRanges != null)
+            {
+                int index = cell.GridPanel.Columns.GetDisplayIndex(cell.GridColumn);
+
+                if (_LastCellRange != null)
+                {
+                    if (_LastCellRange.Contains(cell.RowIndex, index))
+                        return (_LastCellRange);
+                }
+
+                foreach (CellRange cr in DisplayedCellRanges)
+                {
+                    if (cr.Contains(cell.RowIndex, index))
+                    {
+                        _LastCellRange = cr;
+
+                        return (cr);
+                    }
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region SuspendMerge
+
+        ///<summary>
+        ///Temporarily suspends the merged display of the
+        ///cells in the given CellRange.
+        ///</summary>
+        ///<param name="cr">CellRange to temporarily suspend</param>
+        public void SuspendMerge(CellRange cr)
+        {
+            if (cr != null && cr.Suspended == false)
+            {
+                ResumeMerge();
+
+                if (cr.AllowSuspend == true)
+                {
+                    cr.Suspended = true;
+
+                    InvalidateRender(cr.BackBounds);
+                }
+            }
+
+            _SuspendedRange = cr;
+        }
+
+        #endregion
+
+        #region ResumeMerge
+
+        ///<summary>
+        ///Resumes merged display of any current, temporarily
+        ///suspended CellRange.
+        ///</summary>
+        public void ResumeMerge()
+        {
+            CellRange cr = _SuspendedRange;
+            _SuspendedRange = null;
+
+            if (cr != null && cr.Suspended == true)
+            {
+                cr.Suspended = false;
+
+                if (cr.Modified == true)
+                {
+                    UpdateCellResumeState(cr);
+
+                    cr.Modified = false;
+
+                    NeedMergeLayout = true;
+
+                    InvalidateLayout();
+                }
+
+                GridPanel.SelectionUpdateCount++;
+
+                InvalidateRender(cr.BackBounds);
+            }
+        }
+
+        #region UpdateCellResumeState
+
+        private void UpdateCellResumeState(CellRange cr)
+        {
+            ushort n = MergeUpdateCount;
+
+            GridPanel panel = GridPanel;
+            GridColumnCollection columns = panel.Columns;
+
+            int[] map = columns.DisplayIndexMap;
+
+            for (int i = cr.RowStart; i < cr.RowEnd; i++)
+            {
+                for (int j = cr.ColumnStart; j < cr.ColumnEnd; j++)
+                {
+                    GridCell cell = GetCell(i, map[j]);
+
+                    if (cell != null && cell.Modified == true)
+                    {
+                        cell.MergeUpdateCount = --n;
+                        cell.Modified = false;
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region SetMergeSelection
+
+        internal void SetMergeSelection(int startRowIndex,
+            int endRowIndex, int startColumnIndex, int endColumnIndex, int selected)
+        {
+            List<CellRange> cellRanges = DisplayedCellRanges;
+
+            if (cellRanges != null)
+            {
+                GridPanel panel = GridPanel;
+
+                foreach (CellRange cr in cellRanges)
+                {
+                    if (cr.RowStart <= endRowIndex && cr.RowEnd > startRowIndex &&
+                        cr.ColumnStart <= endColumnIndex && cr.ColumnEnd > startColumnIndex)
+                    {
+                        cr.SelectionUpdateCount = panel.SelectionUpdateCount - 1;
+
+                        InvalidateRender(cr.BackBounds);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region ClearAllMergeSelected
+
+        internal virtual void ClearAllMergeSelected()
+        {
+            GridPanel panel = GridPanel;
+            List<CellRange> ranges = DisplayedCellRanges;
+
+            if (ranges != null)
+            {
+                foreach (CellRange range in ranges)
+                    range.SelectionUpdateCount = panel.SelectionUpdateCount - 1;
+            }
+
+            foreach (GridContainer row in Rows)
+            {
+                if (row != null)
+                    row.ClearAllMergeSelected();
+            }
+        }
+
+        #endregion
+
+        #region ResolveRows
+
+        /// <summary>
+        /// Resolves the row if marked as RowsUnresolved.
+        /// </summary>
+        public void ResolveRow()
+        {
+            ResolveRow(GridPanel, false);
+        }
+
+        /// <summary>
+        /// Resolves the row if marked as RowsUnresolved.  If includeNested
+        /// is true, then all RowsUnresolved sub-Rows are also resolved.
+        /// </summary>
+        /// <param name="includeNested"></param>
+        public void ResolveRow(bool includeNested)
+        {
+            ResolveRow(GridPanel, includeNested);
+        }
+
+        internal void ResolveRow(GridPanel panel, bool includeNested)
+        {
+            panel.DataBinder.ResolveRow(this);
+
+            if (includeNested == true)
+                ResolveRows(true);
+        }
+
+        /// <summary>
+        /// Resolves all rows marked as RowsUnresolved.
+        /// </summary>
+        /// <param name="includeNested"></param>
+        public void ResolveRows(bool includeNested)
+        {
+            if (Rows.Count > 0)
+            {
+                GridPanel panel = GridPanel;
+
+                foreach (GridContainer row in Rows)
+                {
+                    if (row != null)
+                        row.ResolveRow(panel, includeNested);
+                }
+            }
+        }
+
+        #endregion
+
+        #region Style support routines
+
+        #region OnStyleChanged
+
+        private void OnStyleChanged(string property,
+            INotifyPropertyChanged oldValue, INotifyPropertyChanged newValue)
+        {
+            UpdateChangeHandler(oldValue, newValue);
+
+            OnPropertyChanged(property);
+        }
+
+        #endregion
+
+        #region UpdateChangeHandler
+
+        private void UpdateChangeHandler(
+            INotifyPropertyChanged oldValue, INotifyPropertyChanged newValue)
+        {
+            NeedsMeasured = true;
+
+            if (oldValue != null)
+                oldValue.PropertyChanged -= StyleChanged;
+
+            if (newValue != null)
+                newValue.PropertyChanged += StyleChanged;
+        }
+
+        #endregion
+
+        #region StyleChanged
+
+        /// <summary>
+        /// StyleChanged
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected virtual void StyleChanged(object sender, PropertyChangedEventArgs e)
+        {
+            if (SuperGrid != null)
+                SuperGrid.UpdateStyleCount();
+
+            VisualChangeType changeType = ((VisualPropertyChangedEventArgs)e).ChangeType;
+
+            if (changeType == VisualChangeType.Layout)
+            {
+                NeedsMeasured = true;
+
+                InvalidateLayout();
+            }
+            else
+            {
+                if (SuperGrid != null)
+                    InvalidateRender();
+            }
+        }
+
+        #endregion
+
+        #region GetEffectiveRowStyle
+
+        ///<summary>
+        /// Gets the 'Effective' row style for the row. The
+        /// 'Effective' Style is the cached summation of SuperGrid,
+        /// Panel, Row, and Alternate Row styles.  It is the Style
+        /// that is used to render each row element for the row.
+        ///</summary>
+        ///<returns>RowVisualStyle</returns>
+        public RowVisualStyle GetEffectiveRowStyle()
+        {
+            return (GetEffectiveRowStyle(this));
+        }
+
+        internal RowVisualStyle GetEffectiveRowStyle(GridContainer item)
+        {
+            StyleState rowState = GetRowState(item);
+
+            return (GetEffectiveRowStyle(item, rowState));
+        }
+
+        internal RowVisualStyle GetEffectiveRowStyle(
+            GridContainer item, StyleState rowState)
+        {
+            return (GetRowStateStyle(item, rowState));
+        }
+
+        #region GetRowState
+
+        internal StyleState GetRowState(GridContainer item)
+        {
+            StyleState rowState = StyleState.Default;
+
+            if (IsMouseOver == true)
+            {
+                Point pt = SuperGrid.PointToClient(Control.MousePosition);
+
+                Rectangle r = (item is GridPanel)
+                                  ? item.ContainerBounds
+                                  : item.BoundsRelative;
+
+                r.X -= HScrollOffset;
+
+                if (item.IsVFrozen == false)
+                    r.Y -= VScrollOffset;
+
+                Rectangle t = ViewRect;
+
+                r.Intersect(t);
+
+                if (r.Contains(pt) == true)
+                    rowState |= StyleState.MouseOver;
+            }
+
+            if (item.IsSelected == true)
+                rowState |= StyleState.Selected;
+
+            return (rowState);
+        }
+
+        #endregion
+
+        #region GetRowStateStyle
+
+        private RowVisualStyle GetRowStateStyle(GridContainer item, StyleState rowState)
+        {
+            ValidateRowStyle();
+
+            switch (rowState)
+            {
+                case StyleState.MouseOver:
+                    return (GetRowStyle(item, StyleType.MouseOver));
+
+                case StyleState.Selected:
+                    return (GetRowStyle(item, StyleType.Selected));
+
+                case StyleState.Selected | StyleState.MouseOver:
+                    return (GetRowStyle(item, StyleType.SelectedMouseOver));
+
+                case StyleState.ReadOnly:
+                    return (GetRowStyle(item, StyleType.ReadOnly));
+
+                case StyleState.ReadOnly | StyleState.MouseOver:
+                    return (GetRowStyle(item, StyleType.ReadOnlyMouseOver));
+
+                case StyleState.ReadOnly | StyleState.Selected:
+                    return (GetRowStyle(item, StyleType.ReadOnlySelected));
+
+                case StyleState.ReadOnly | StyleState.MouseOver | StyleState.Selected:
+                    return (GetRowStyle(item, StyleType.ReadOnlySelectedMouseOver));
+
+                default:
+                    return (GetRowStyle(item, StyleType.Default));
+            }
+        }
+
+        #endregion
+
+        #region GetRowStyle
+
+        private RowVisualStyle GetRowStyle(GridContainer item, StyleType e)
+        {
+            if (_EffectiveRowStyles.IsValid(e) == false)
+            {
+                RowVisualStyle style = new RowVisualStyle();
+
+                StyleType[] css = style.GetApplyStyleTypes(e);
+
+                if (css != null)
+                {
+                    GridPanel panel = GridPanel;
+
+                    foreach (StyleType cs in css)
+                    {
+                        style.ApplyStyle(SuperGrid.BaseVisualStyles.RowStyles[cs]);
+                        style.ApplyStyle(SuperGrid.DefaultVisualStyles.RowStyles[cs]);
+                        style.ApplyStyle(GridPanel.DefaultVisualStyles.RowStyles[cs]);
+                        style.ApplyStyle(item.RowStyles[cs]);
+
+                        if (panel != null && panel.UseAlternateRowStyle == true)
+                        {
+                            if ((GridIndex % 2) > 0)
+                            {
+                                style.ApplyStyle(SuperGrid.BaseVisualStyles.AlternateRowCellStyles[cs]);
+                                style.ApplyStyle(SuperGrid.DefaultVisualStyles.AlternateRowCellStyles[cs]);
+                                style.ApplyStyle(GridPanel.DefaultVisualStyles.AlternateRowCellStyles[cs]);
+                            }
+                        }
+
+                        style.ApplyStyle(item.CellStyles[cs]);
+                        style.ApplyStyle(item.CellStyles[cs]);
+                    }
+                }
+
+                SuperGrid.DoGetRowStyleEvent(this, e, ref style);
+
+                RowHeaderVisualStyle style2 = style.RowHeaderStyle;
+                SuperGrid.DoGetRowHeaderStyleEvent(this, e, ref style2);
+
+                if (style.Background == null || style.Background.IsEmpty == true)
+                    style.Background = new Background(Color.White);
+
+                _EffectiveRowStyles[e] = style;
+            }
+
+            return (_EffectiveRowStyles[e]);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ValidateRowStyle
+
+        private void ValidateRowStyle()
+        {
+            if (_EffectiveRowStyles == null ||
+                (_StyleUpdateCount != SuperGrid.StyleUpdateCount))
+            {
+                if (_EffectiveRowStyles != null)
+                    _EffectiveRowStyles.Dispose();
+
+                _EffectiveRowStyles = new RowVisualStyles();
+
+                _StyleUpdateCount = SuperGrid.StyleUpdateCount;
+            }
+        }
+
+        #endregion
+
+        #region InvalidateStyle
+
+        ///<summary>
+        ///Invalidates the cached Style
+        ///definition for all defined StyleTypes
+        ///</summary>
+        public virtual void InvalidateStyle()
+        {
+            if (_EffectiveRowStyles != null)
+            {
+                _EffectiveRowStyles.Dispose();
+                _EffectiveRowStyles = null;
+            }
+
+            InvalidateLayout();
+        }
+
+        ///<summary>
+        ///Invalidate the cached Style
+        ///definition for the given StyleType
+        ///</summary>
+        ///<param name="type"></param>
+        public void InvalidateStyle(StyleType type)
+        {
+            if (_EffectiveRowStyles != null)
+            {
+                if (_EffectiveRowStyles[type] != null)
+                {
+                    _EffectiveRowStyles[type].Dispose();
+                    _EffectiveRowStyles[type] = null;
+
+                    InvalidateLayout();
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IsParentOf
+
+        ///<summary>
+        /// Determines whether the row is
+        /// a parent row of the given container row.
+        ///</summary>
+        ///<param name="row"></param>
+        ///<returns>true if the row is a parent of the given row.</returns>
+        public bool IsParentOf(GridContainer row)
+        {
+            if (row != null)
+                return (row.IsChildOf(this));
+
+            return (false);
+        }
+
+        #endregion
+
+        #region IsChildOf
+
+        ///<summary>
+        /// Determines whether the row is
+        /// a child row of the given container row.
+        ///</summary>
+        ///<param name="row"></param>
+        ///<returns>true if the row is a child of the given row.</returns>
+        public bool IsChildOf(GridContainer row)
+        {
+            if (row != null)
+            {
+                GridContainer parent = Parent as GridContainer;
+
+                while (parent != null)
+                {
+                    if (parent == row)
+                        return (true);
+
+                    parent = parent.Parent as GridContainer;
+                }
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region GetCell
+
+        ///<summary>
+        /// Gets the GridCell for the given row and column index
+        ///</summary>
+        ///<param name="rowIndex"></param>
+        ///<param name="columnIndex"></param>
+        ///<returns>GridCell, or null if not a valid cell</returns>
+        public GridCell GetCell(int rowIndex, int columnIndex)
+        {
+            GridPanel panel = GridPanel;
+
+            if (panel != null)
+            {
+                GridRow row = null;
+
+                if (panel.VirtualMode == true)
+                {
+                    if ((uint)rowIndex < panel.VirtualRowCount)
+                        row = panel.VirtualRows[rowIndex];
+                }
+                else
+                {
+                    if ((uint) rowIndex < Rows.Count)
+                        row = Rows[rowIndex] as GridRow;
+                }
+
+                if (row != null && columnIndex < row.Cells.Count)
+                    return (row.Cells[columnIndex]);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region Dispose
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        public virtual void Dispose()
+        {
+            if (_EffectiveRowStyles != null)
+            {
+                _EffectiveRowStyles.Dispose();
+                _EffectiveRowStyles = null;
+            }
+
+            CellStyles = null;
+            RowStyles = null;
+
+            if (Rows != null && Rows.Count > 0)
+            {
+                foreach (GridElement item in Rows)
+                {
+                    GridContainer row = item as GridContainer;
+
+                    if (row != null)
+                        row.Dispose();
+                }
+            }
+        }
+
+        #endregion
+
+        #region ContainerStates
+
+        [Flags]
+        private enum Cs
+        {
+            Checked = (1 << 0),
+            Deleted = (1 << 1),
+            Expanded = (1 << 2),
+            HasVisibleItems = (1 << 3),
+            ReadOnly = (1 << 4),
+            RowsUnresolved = (1 << 5),
+            Selected = (1 << 6),
+            ShowCheckBox = (1 << 7),
+            ShowTreeButton = (1 << 8),
+            ExpandedVisible = (1 << 9),
+        }
+
+        #endregion
+    }
+
+    #region enums
+
+    #region ExpandSource
+
+    ///<summary>
+    /// Operation source resulting in the Expand call
+    ///</summary>
+    public enum ExpandSource
+    {
+        ///<summary>
+        /// Expand operation
+        ///</summary>
+        Expand,
+
+        ///<summary>
+        /// ExpandAll operation
+        ///</summary>
+        ExpandAll,
+    }
+
+    #endregion
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridElement.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridElement.cs
new file mode 100644
index 00000000..e341daba
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridElement.cs	
@@ -0,0 +1,1126 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.SuperGrid.Style;
+
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    /// <summary>
+    /// Represents the base grid item.
+    /// </summary>
+    [DesignTimeVisible(false), ToolboxItem(false)]
+    public abstract class GridElement : Component, INotifyPropertyChanged
+    {
+        #region Events
+
+        /// <summary>
+        /// Occurs when display/rendering of the item is invalidated.
+        /// </summary>
+        public event EventHandler RenderInvalid;
+
+        /// <summary>
+        /// Occurs when layout of the item is invalidated.
+        /// </summary>
+        public event EventHandler LayoutInvalid;
+
+        /// <summary>
+        /// Occurs when parent of the item has changed.
+        /// </summary>
+        public event EventHandler ParentChanged;
+
+        #endregion
+
+        #region Static variables
+
+        static Point _mouseDownPoint;
+
+        #endregion
+
+        #region Private variables
+
+        private Es _States;
+        private Rectangle _BoundsRelative = Rectangle.Empty;
+
+        private GridElement _Parent;
+        private SuperGridControl _SuperGrid;
+        private GridPanel _GridPanel;
+
+        private object _Tag;
+
+        #endregion
+
+        #region Constructor
+
+        /// <summary>
+        /// GridElement
+        /// </summary>
+        protected GridElement()
+        {
+            SetState(Es.AllowSelection, true);
+            SetState(Es.NeedsMeasured, true);
+            SetState(Es.Visible, true);
+        }
+
+        #endregion
+
+        #region Abstract methods
+
+        /// <summary>
+        /// Performs the arrange pass layout of the item when
+        /// the final position and size of the item has been set.
+        /// </summary>
+        /// <param name="layoutInfo">Layout information.</param>
+        /// <param name="stateInfo"></param>
+        /// <param name="layoutBounds"></param>
+        protected abstract void ArrangeOverride(
+            GridLayoutInfo layoutInfo, GridLayoutStateInfo stateInfo, Rectangle layoutBounds);
+
+        /// <summary>
+        /// Performs the layout of the item
+        /// and sets the Size property to size that item will take.
+        /// </summary>
+        /// <param name="layoutInfo">Layout information.</param>
+        /// <param name="stateInfo"></param>
+        /// <param name="constraintSize"></param>
+        protected abstract void MeasureOverride(
+            GridLayoutInfo layoutInfo, GridLayoutStateInfo stateInfo, Size constraintSize);
+
+        /// <summary>
+        /// Performs drawing of the item and its children.
+        /// </summary>
+        /// <param name="renderInfo">Holds contextual rendering information.</param>
+        protected abstract void RenderOverride(GridRenderInfo renderInfo);
+
+        #endregion
+
+        #region Internal properties
+
+        #region Capture
+
+        internal virtual bool Capture
+        {
+            get { return (CapturedItem != null); }
+
+            set
+            {
+                if (SuperGrid != null)
+                    CapturedItem = (value == true) ? this : null;
+            }
+        }
+
+        #endregion
+
+        #region CapturedItem
+
+        internal GridElement CapturedItem
+        {
+            get
+            {
+                if (SuperGrid != null)
+                    return (SuperGrid.CapturedItem);
+
+                return (null);
+            }
+
+            set
+            {
+                if (SuperGrid != null)
+                    SuperGrid.CapturedItem = value;
+            }
+        }
+
+        #endregion
+
+        #region CViewRect
+
+        /// <summary>
+        /// Client View Rectangle
+        /// </summary>
+        internal Rectangle CViewRect
+        {
+            get
+            {
+                if (SuperGrid != null)
+                    return (SuperGrid.CViewRect);
+
+                return (Rectangle.Empty);
+            }
+        }
+
+        #endregion
+
+        #region HScrollBounds
+
+        /// <summary>
+        /// Horizontal Scroll Bounds
+        /// </summary>
+        internal Rectangle HScrollBounds
+        {
+            get
+            {
+                Rectangle r = BoundsRelative;
+                r.X -= HScrollOffset;
+
+                return (r);
+            }
+        }
+
+        #endregion
+
+        #region HScrollOffset
+
+        internal int HScrollOffset
+        {
+            get
+            {
+                SuperGridControl sgc = SuperGrid;
+
+                return (sgc != null)
+                    ? sgc.HScrollOffset : 0;
+            }
+        }
+
+        #endregion
+
+        #region IsMouseDown
+
+        /// <summary>
+        /// Gets whether mouse is down
+        /// </summary>
+        internal virtual bool IsMouseDown
+        {
+            get { return (Control.MouseButtons != MouseButtons.None); }
+        }
+
+        #endregion
+
+        #region IsVFrozen
+
+        ///<summary>
+        /// IsFrozen
+        ///</summary>
+        internal bool IsVFrozen
+        {
+            get
+            {
+                if (SuperGrid != null)
+                {
+                    GridPanel panel = SuperGrid.PrimaryGrid;
+
+                    return (BoundsRelative.Y < panel.FixedRowHeight);
+                }
+
+                return (false);
+            }
+        }
+
+        #endregion
+
+        #region MouseDownPoint
+
+        /// <summary>
+        /// Gets the mouse down Point
+        /// </summary>
+        internal virtual Point MouseDownPoint
+        {
+            get { return (_mouseDownPoint); }
+            set { _mouseDownPoint = value; }
+        }
+
+        #endregion
+
+        #region NeedsMeasured
+
+        /// <summary>
+        /// Get or sets whether item needs measured
+        /// </summary>
+        internal virtual bool NeedsMeasured
+        {
+            get { return (TestState(Es.NeedsMeasured)); }
+            set { SetState(Es.NeedsMeasured, value); }
+        }
+
+        #endregion
+
+        #region ScrollBounds
+
+        /// <summary>
+        /// Horizontal and Vertical Scroll Bounds
+        /// </summary>
+        internal Rectangle ScrollBounds
+        {
+            get
+            {
+                Rectangle r = BoundsRelative;
+                r.X -= HScrollOffset;
+                r.Y -= VScrollOffset;
+
+                return (r);
+            }
+        }
+
+        #endregion
+
+        #region SViewRect
+
+        /// <summary>
+        /// Scrollable View Rectangle
+        /// </summary>
+        internal Rectangle SViewRect
+        {
+            get
+            {
+                if (SuperGrid != null)
+                    return (SuperGrid.SViewRect);
+
+                return (Rectangle.Empty);
+            }
+        }
+
+        #endregion
+
+        #region ViewRect
+
+        /// <summary>
+        /// View Rectangle
+        /// </summary>
+        internal Rectangle ViewRect
+        {
+            get
+            {
+                if (SuperGrid != null)
+                    return (SuperGrid.ViewRect);
+
+                return (Rectangle.Empty);
+            }
+        }
+
+        #endregion
+
+        #region VScrollBounds
+
+        /// <summary>
+        /// Vertical Scroll Bounds
+        /// </summary>
+        internal Rectangle VScrollBounds
+        {
+            get
+            {
+                Rectangle r = BoundsRelative;
+                r.Y -= VScrollOffset;
+
+                return (r);
+            }
+        }
+
+        #endregion
+
+        #region VScrollOffset
+
+        internal int VScrollOffset
+        {
+            get
+            {
+                SuperGridControl cgc = SuperGrid;
+
+                return (cgc != null)
+                    ? cgc.VScrollOffset : 0;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Public properties
+
+        #region AllowSelection
+
+        /// <summary>
+        /// Gets or sets whether the element can be selected
+        /// </summary>
+        [DefaultValue(true), Category("Behavior")]
+        [Description("Indicates whether the element can be selected")]
+        public virtual bool AllowSelection
+        {
+            get { return (TestState(Es.AllowSelection)); }
+
+            set
+            {
+                if (AllowSelection != value)
+                {
+                    SetState(Es.AllowSelection, value);
+
+                    OnPropertyChangedEx("AllowSelection", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region Bounds
+
+        ///<summary>
+        /// Gets the scroll adjusted bounds
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public virtual Rectangle Bounds
+        {
+            get { return (BoundsRelative); }
+        }
+
+        #endregion
+
+        #region BoundsRelative
+
+        /// <summary>
+        /// Gets or sets the relative bounds of the item.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public virtual Rectangle BoundsRelative
+        {
+            get { return (_BoundsRelative); }
+            internal set { _BoundsRelative = value; }
+        }
+
+        #endregion
+
+        #region GridPanel
+
+        /// <summary>
+        /// Gets the parent GridPanel
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public GridPanel GridPanel
+        {
+            get { return (GetParentGridPanel()); }
+            internal set { _GridPanel = value; }
+        }
+
+        #region GetParentGridPanel
+
+        private GridPanel GetParentGridPanel()
+        {
+            if (_GridPanel != null)
+                return (_GridPanel);
+
+            GridElement parent = this;
+
+            while (parent != null)
+            {
+                if (parent is GridPanel)
+                    return ((GridPanel)parent);
+
+                parent = parent.Parent;
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IsLayoutValid
+
+        /// <summary>
+        /// Gets whether layout for the item is valid.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public virtual bool IsLayoutValid
+        {
+            get { return (TestState(Es.LayoutValid)); }
+            internal set { SetState(Es.LayoutValid, value); }
+        }
+
+        #endregion
+
+        #region IsMouseOver
+
+        /// <summary>
+        /// Gets whether mouse is over the element.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public virtual bool IsMouseOver
+        {
+            get { return (TestState(Es.MouseOver)); }
+            internal set { SetState(Es.MouseOver, value); }
+        }
+
+        #endregion
+
+        #region LocationRelative
+
+        /// <summary>
+        /// Gets or sets the relative location of the item.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public Point LocationRelative
+        {
+            get { return _BoundsRelative.Location; }
+            internal set { _BoundsRelative.Location = value; }
+        }
+
+        #endregion
+
+        #region Parent
+
+        /// <summary>
+        /// Gets or sets the parent of the item.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public virtual GridElement Parent
+        {
+            get { return (_Parent); }
+
+            internal set
+            {
+                if (_Parent != value)
+                {
+                    GridElement oldParent = value;
+                    _Parent = value;
+
+                    if (value == null)
+                    {
+                        if (SuperGrid != null)
+                        {
+                            if (SuperGrid.ActiveElement == this)
+                                SuperGrid.ActiveElement = null;
+                        }
+                    }                        
+
+                    OnParentChanged(oldParent, value);
+                }
+            }
+        }
+
+        #endregion
+
+        #region Size
+
+        /// <summary>
+        /// Gets or sets the Size of the item.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public Size Size
+        {
+            get { return (_BoundsRelative.Size); }
+            internal set { _BoundsRelative.Size = value; }
+        }
+
+        #endregion
+
+        #region SuperGrid
+
+        /// <summary>
+        /// Gets the parent super grid control.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public SuperGridControl SuperGrid
+        {
+            get { return GetParentSuperGrid(); }
+            internal set { _SuperGrid = value; }
+        }
+
+        #region GetParentSuperGrid
+
+        private SuperGridControl GetParentSuperGrid()
+        {
+            if (_SuperGrid != null)
+                return (_SuperGrid);
+
+            GridElement parent = _Parent;
+
+            while (parent != null)
+            {
+                if (parent.SuperGrid != null)
+                    return (_SuperGrid = parent.SuperGrid);
+
+                parent = parent.Parent;
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Tag
+
+        ///<summary>
+        /// Gets or sets user-defined data associated with the object
+        ///</summary>
+        [DefaultValue(null)]
+        [Description("User-defined data associated with the object")]
+        [TypeConverter(typeof(StringConverter))]
+        public object Tag
+        {
+            get { return (_Tag); }
+            set { _Tag = value; }
+        }
+
+        #endregion
+
+        #region Visible
+
+        /// <summary>
+        /// Get or sets whether the item is visible
+        /// </summary>
+        [DefaultValue(true), Category("Appearance")]
+        [Description("Indicates whether item is visible")]
+        public virtual bool Visible
+        {
+            get { return (TestState(Es.Visible)); }
+
+            set
+            {
+                if (Visible != value)
+                {
+                    SetState(Es.Visible, value);
+
+                    OnPropertyChangedEx("Visible", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region TestState
+
+        private bool TestState(Es state)
+        {
+            return ((_States & state) == state);
+        }
+
+        #endregion
+
+        #region SetState
+
+        private void SetState(Es state, bool value)
+        {
+            if (value == true)
+                _States |= state;
+            else
+                _States &= ~state;
+        }
+
+        #endregion
+
+        #region OnEvent processing
+
+        #region OnLayoutInvalid
+
+        /// <summary>
+        /// Raises LayoutInvalid event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnLayoutInvalid(EventArgs e)
+        {
+            EventHandler handler = LayoutInvalid;
+
+            if (handler != null)
+                handler(this, e);
+        }
+
+        #endregion
+
+        #region OnParentChanged
+
+        /// <summary>
+        /// Called after parent of the item has changed.
+        /// </summary>
+        /// <param name="oldParent">Reference to old parent.</param>
+        /// <param name="newParent">Reference to new parent.</param>
+        protected virtual void OnParentChanged(GridElement oldParent, GridElement newParent)
+        {
+            OnParentChanged(EventArgs.Empty);
+        }
+
+        /// <summary>
+        /// Raises ParentChanged event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnParentChanged(EventArgs e)
+        {
+            EventHandler handler = ParentChanged;
+
+            if (handler != null)
+                handler(this, e);
+        }
+
+        #endregion
+
+        #region OnRenderInvalid
+
+        /// <summary>
+        /// Raises RenderInvalid event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnRenderInvalid(EventArgs e)
+        {
+            EventHandler handler = RenderInvalid;
+
+            if (handler != null)
+                handler(this, e);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Measure
+
+        /// <summary>
+        /// This method is used by the items internally to invoke the measure pass to
+        /// get item size. Override MeasureOverride method to perform actual measuring.
+        /// </summary>
+        /// <param name="layoutInfo">Holds contextual layout information.</param>
+        /// <param name="stateInfo"></param>
+        /// <param name="constraintSize"></param>
+        internal void Measure(
+            GridLayoutInfo layoutInfo, GridLayoutStateInfo stateInfo, Size constraintSize)
+        {
+            MeasureOverride(layoutInfo, stateInfo, constraintSize);
+
+            NeedsMeasured = false;
+        }
+
+        #endregion
+
+        #region Arrange
+
+        /// <summary>
+        /// This method is used by the items internally to invoke the arrange pass after
+        /// location and size of the item has been set. Override ArrangeOverride method
+        /// to perform internal arranging.
+        /// </summary>
+        /// <param name="layoutInfo"></param>
+        /// <param name="stateInfo"></param>
+        /// <param name="layoutBounds"></param>
+        internal void Arrange(
+            GridLayoutInfo layoutInfo, GridLayoutStateInfo stateInfo, Rectangle layoutBounds)
+        {
+            IsLayoutValid = true;
+
+            _BoundsRelative = layoutBounds;
+
+            ArrangeOverride(layoutInfo, stateInfo, layoutBounds);
+        }
+
+        #endregion
+
+        #region Render
+
+        /// <summary>
+        /// This method is used by the items internally to invoke the rendering
+        /// for the item. Override RenderOverride method to perform actual rendering.
+        /// </summary>
+        /// <param name="renderInfo">Holds contextual rendering information.</param>
+        internal void Render(GridRenderInfo renderInfo)
+        {
+            RenderOverride(renderInfo);
+        }
+
+        #endregion
+
+        #region InvalidateLayout
+
+        /// <summary>
+        /// Invalidates the layout for the item.
+        /// </summary>
+        public virtual void InvalidateLayout()
+        {
+            IsLayoutValid = false;
+
+            if (_Parent != null)
+            {
+                _Parent.InvalidateLayout();
+            }
+            else
+            {
+                if (SuperGrid != null)
+                    SuperGrid.Invalidate();
+            }
+
+            OnLayoutInvalid(EventArgs.Empty);
+        }
+
+        #endregion
+
+        #region InvalidateRender
+
+        /// <summary>
+        /// Invalidates the display state of the item
+        /// </summary>
+        public virtual void InvalidateRender()
+        {
+            SuperGridControl grid = SuperGrid;
+
+            if (grid != null)
+            {
+                if (grid.InvokeRequired)
+                    grid.BeginInvoke(new MethodInvoker(delegate { grid.InvalidateRender(this); }));
+                else
+                    grid.InvalidateRender(this);
+            }
+            
+            OnRenderInvalid(EventArgs.Empty);
+        }
+
+        /// <summary>
+        /// Invalidates the display state of the item
+        /// </summary>
+        public virtual void InvalidateRender(Rectangle bounds)
+        {
+            SuperGridControl grid = SuperGrid;
+
+            if (grid != null)
+                grid.InvalidateRender(bounds);
+
+            OnRenderInvalid(EventArgs.Empty);
+        }
+
+        #endregion
+
+        #region Mouse Handling
+
+        #region OnMouseEnter
+
+        /// <summary>
+        /// Called by top-level control to pass message into the grid
+        /// element. To handle it override corresponding On - virtual method.
+        /// </summary>
+        /// <param name="e"></param>
+        internal virtual void InternalMouseEnter(EventArgs e)
+        {
+            IsMouseOver = true;
+
+            OnMouseEnter(e);
+        }
+
+        /// <summary>
+        /// Called when mouse enter the element.
+        /// </summary>
+        /// <param name="e"></param>
+        protected virtual void OnMouseEnter(EventArgs e)
+        {
+        }
+
+        #endregion
+
+        #region OnMouseLeave
+
+        /// <summary>
+        /// Called by top-level control to pass message into the grid
+        /// element. To handle it override corresponding On - virtual method.
+        /// </summary>
+        /// <param name="e"></param>
+        internal virtual void InternalMouseLeave(EventArgs e)
+        {
+            IsMouseOver = false;
+
+            OnMouseLeave(e);
+        }
+
+        /// <summary>
+        /// Called when mouse leaves the element.
+        /// </summary>
+        /// <param name="e"></param>
+        protected virtual void OnMouseLeave(EventArgs e)
+        {
+        }
+
+        #endregion
+
+        #region OnMouseHover
+
+        /// <summary>
+        /// Called by top-level control to pass message into the grid
+        /// element. To handle it override corresponding On - virtual method.
+        /// </summary>
+        /// <param name="e"></param>
+        internal virtual void InternalMouseHover(EventArgs e)
+        {
+            OnMouseHover(e);
+        }
+
+        /// <summary>
+        /// Called when mouse hovers over the element.
+        /// </summary>
+        /// <param name="e"></param>
+        protected virtual void OnMouseHover(EventArgs e)
+        {
+        }
+
+        #endregion
+
+        #region OnMouseDown
+
+        /// <summary>
+        /// Called by top-level control to pass message into the grid
+        /// element. To handle it override corresponding On - virtual method.
+        /// </summary>
+        /// <param name="e"></param>
+        internal virtual void InternalMouseDown(MouseEventArgs e)
+        {
+            MouseDownPoint = e.Location;
+
+            OnMouseDown(e);
+        }
+
+        /// <summary>
+        /// Called when mouse button is pressed over the element.
+        /// </summary>
+        /// <param name="e"></param>
+        protected virtual void OnMouseDown(MouseEventArgs e)
+        {
+        }
+
+        #endregion
+
+        #region OnMouseUp
+
+        /// <summary>
+        /// Called by top-level control to pass message into the grid
+        /// element. To handle it override corresponding On - virtual method.
+        /// </summary>
+        /// <param name="e"></param>
+        internal virtual void InternalMouseUp(MouseEventArgs e)
+        {
+            Capture = false;
+
+            OnMouseUp(e);
+        }
+
+        /// <summary>
+        /// Called when mouse button is released over the element.
+        /// </summary>
+        /// <param name="e"></param>
+        protected virtual void OnMouseUp(MouseEventArgs e)
+        {
+        }
+
+        #endregion
+
+        #region OnMouseMove
+
+        /// <summary>
+        /// Called by top-level control to pass message into the grid
+        /// element. To handle it override corresponding On - virtual method.
+        /// </summary>
+        /// <param name="e"></param>
+        internal virtual void InternalMouseMove(MouseEventArgs e)
+        {
+            OnMouseMove(e);
+        }
+
+        /// <summary>
+        /// Called when mouse is moved over the element.
+        /// </summary>
+        /// <param name="e"></param>
+        protected virtual void OnMouseMove(MouseEventArgs e)
+        {
+        }
+
+        #endregion
+
+        #region OnMouseClick
+
+        /// <summary>
+        /// Called by top-level control to pass message into the grid
+        /// element. To handle it override corresponding On - virtual method.
+        /// </summary>
+        /// <param name="e"></param>
+        internal virtual void InternalMouseClick(MouseEventArgs e)
+        {
+            OnMouseClick(e);
+        }
+        /// <summary>
+        /// Called when mouse is clicked on the element.
+        /// </summary>
+        /// <param name="e"></param>
+        protected virtual void OnMouseClick(MouseEventArgs e)
+        {
+        }
+
+        #endregion
+
+        #region OnMouseDoubleClick
+
+        /// <summary>
+        /// Called by top-level control to pass message into the grid
+        /// element. To handle it override corresponding On - virtual method.
+        /// </summary>
+        /// <param name="e"></param>
+        internal virtual void InternalMouseDoubleClick(MouseEventArgs e)
+        {
+            OnMouseDoubleClick(e);
+        }
+
+        /// <summary>
+        /// Called when mouse is double clicked on the element.
+        /// </summary>
+        /// <param name="e"></param>
+        protected virtual void OnMouseDoubleClick(MouseEventArgs e)
+        {
+        }
+
+        #endregion
+
+        #region PostInternalMouseMove
+
+        internal void PostInternalMouseMove()
+        {
+            SuperGrid.PostInternalMouseMove();
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Keyboard handling
+
+        /// <summary>
+        /// Called by top-level control to pass message into the grid
+        /// element. To handle it override corresponding On - virtual method.
+        /// </summary>
+        /// <param name="keyData"></param>
+        internal virtual void InternalKeyDown(Keys keyData)
+        {
+            OnKeyDown(keyData);
+        }
+
+        /// <summary>
+        /// Called when mouse button is pressed over the element.
+        /// </summary>
+        /// <param name="keyData"></param>
+        protected virtual void OnKeyDown(Keys keyData)
+        {
+        }
+
+        #endregion
+
+        #region EnsureVisible
+
+        ///<summary>
+        /// EnsureVisible
+        ///</summary>
+        public void EnsureVisible()
+        {
+            EnsureVisible(false);
+        }
+
+        ///<summary>
+        /// EnsureVisible
+        ///</summary>
+        ///<param name="center"></param>
+        public virtual void EnsureVisible(bool center)
+        {
+        }
+
+        #endregion
+
+        #region CancelCapture
+
+        ///<summary>
+        /// Cancels any inprogress operations that may
+        /// have the mouse captured (resize, reorder).
+        ///</summary>
+        public virtual void CancelCapture()
+        {
+            if (CapturedItem == this)
+                Capture = false;
+        }
+
+        #endregion
+
+        #region IsDesignerHosted
+
+        internal bool IsDesignerHosted
+        {
+            get
+            {
+                if (SuperGrid != null)
+                    return (SuperGrid.IsDesignerHosted);
+
+                return (false);
+            }
+        }
+
+        #endregion
+
+        #region INotifyPropertyChanged Members
+
+        /// <summary>
+        /// Occurs when property value has changed.
+        /// </summary>
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        /// <summary>
+        /// Raises the PropertyChanged event.
+        /// </summary>
+        /// <param name="e">Event arguments</param>
+        protected virtual void OnPropertyChanged(PropertyChangedEventArgs e)
+        {
+            PropertyChangedEventHandler eh = PropertyChanged;
+
+            if (eh != null)
+                eh(this, e);
+        }
+
+        /// <summary>
+        /// Default PropertyChanged processing
+        /// </summary>
+        /// <param name="s"></param>
+        protected void OnPropertyChanged(string s)
+        {
+            if (PropertyChanged != null)
+                OnPropertyChanged(new PropertyChangedEventArgs(s));
+        }
+
+        /// <summary>
+        /// Default PropertyChanged processing
+        /// </summary>
+        /// <param name="s"></param>
+        /// <param name="changeType">invalidate</param>
+        protected void OnPropertyChangedEx(string s, VisualChangeType changeType)
+        {
+            OnPropertyChanged(s);
+
+            if (changeType == VisualChangeType.Layout)
+                InvalidateLayout();
+            else
+                InvalidateRender();
+        }
+
+        #endregion
+
+        #region ElementStates
+
+        [Flags]
+        private enum Es
+        {
+            AllowSelection = (1 << 0),
+            LayoutValid = (1 << 1),
+            MouseOver = (1 << 2),
+            NeedsMeasured = (1 << 3),
+            Visible = (1 << 4),
+        }
+
+        #endregion
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridFilter/CustomFilter.Designer.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridFilter/CustomFilter.Designer.cs
new file mode 100644
index 00000000..be852187
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridFilter/CustomFilter.Designer.cs	
@@ -0,0 +1,128 @@
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    partial class CustomFilter
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form 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()
+        {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(CustomFilter));
+            this.btnCancel = new DevComponents.DotNetBar.ButtonX();
+            this.btnOk = new DevComponents.DotNetBar.ButtonX();
+            this.btnApply = new DevComponents.DotNetBar.ButtonX();
+            this.btnClear = new DevComponents.DotNetBar.ButtonX();
+            this.lblEnterText = new DevComponents.DotNetBar.LabelX();
+            this.filterExprEdit1 = new DevComponents.DotNetBar.SuperGrid.FilterExprEdit();
+            this.SuspendLayout();
+            // 
+            // btnCancel
+            // 
+            this.btnCancel.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+            resources.ApplyResources(this.btnCancel, "btnCancel");
+            this.btnCancel.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+            this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+            this.btnCancel.Name = "btnCancel";
+            this.btnCancel.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.btnCancel.Click += new System.EventHandler(this.BtnCancelClick);
+            // 
+            // btnOk
+            // 
+            this.btnOk.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+            resources.ApplyResources(this.btnOk, "btnOk");
+            this.btnOk.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+            this.btnOk.DialogResult = System.Windows.Forms.DialogResult.OK;
+            this.btnOk.Name = "btnOk";
+            this.btnOk.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.btnOk.Click += new System.EventHandler(this.BtnOkClick);
+            // 
+            // btnApply
+            // 
+            this.btnApply.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+            resources.ApplyResources(this.btnApply, "btnApply");
+            this.btnApply.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+            this.btnApply.Name = "btnApply";
+            this.btnApply.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.btnApply.Click += new System.EventHandler(this.BtnApplyClick);
+            // 
+            // btnClear
+            // 
+            this.btnClear.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+            resources.ApplyResources(this.btnClear, "btnClear");
+            this.btnClear.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+            this.btnClear.Name = "btnClear";
+            this.btnClear.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.btnClear.Click += new System.EventHandler(this.BtnClearClick);
+            // 
+            // lblEnterText
+            // 
+            resources.ApplyResources(this.lblEnterText, "lblEnterText");
+            // 
+            // 
+            // 
+            this.lblEnterText.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.lblEnterText.Name = "lblEnterText";
+            // 
+            // filterExprEdit1
+            // 
+            resources.ApplyResources(this.filterExprEdit1, "filterExprEdit1");
+            this.filterExprEdit1.Name = "filterExprEdit1";
+            // 
+            // CustomFilter
+            // 
+            this.AcceptButton = this.btnApply;
+            resources.ApplyResources(this, "$this");
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+            this.CancelButton = this.btnCancel;
+            this.Controls.Add(this.filterExprEdit1);
+            this.Controls.Add(this.lblEnterText);
+            this.Controls.Add(this.btnClear);
+            this.Controls.Add(this.btnApply);
+            this.Controls.Add(this.btnOk);
+            this.Controls.Add(this.btnCancel);
+            this.DoubleBuffered = true;
+            this.EnableGlass = false;
+            this.HelpButton = true;
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.Name = "CustomFilter";
+            this.ShowIcon = false;
+            this.ShowInTaskbar = false;
+            this.TitleText = "Custom Filter";
+            this.HelpButtonClicked += new System.ComponentModel.CancelEventHandler(this.CustomFilterHelpButtonClicked);
+            this.Shown += new System.EventHandler(this.CustomFilterShown);
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private DevComponents.DotNetBar.ButtonX btnCancel;
+        private DevComponents.DotNetBar.ButtonX btnOk;
+        private ButtonX btnApply;
+        private ButtonX btnClear;
+        private LabelX lblEnterText;
+        private FilterExprEdit filterExprEdit1;
+    }
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridFilter/CustomFilter.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridFilter/CustomFilter.cs
new file mode 100644
index 00000000..5aea2d40
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridFilter/CustomFilter.cs	
@@ -0,0 +1,393 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    ///<summary>
+    /// CustomFilter
+    ///</summary>
+    public partial class CustomFilter : Office2007Form
+    {
+        #region Static data
+
+        private static bool _localizedStringsLoaded;
+
+        private static string _filterClearString = "Clear";
+        private static string _filterCustomFilterString = "Custom Filter";
+        private static string _filterEnterExprString = "Enter custom filter expression";
+        private static string _filterHelpString = "Click the Title Bar help button for syntax help";
+        private static string _filterHelpTitle = "SampleExpr";
+
+        private static Point _offset = Point.Empty;
+        private static Size _size = Size.Empty;
+
+        #endregion
+
+        #region Private variables
+
+        private GridPanel _GridPanel;
+        private GridColumn _GridColumn;
+
+        private string _FilterExpr;
+        private object _FilterValue;
+        private object _FilterDisplayValue;
+
+        private bool _LockedResize = true;
+
+        #endregion
+
+        ///<summary>
+        /// CustomFilter
+        ///</summary>
+        public CustomFilter(GridPanel gridPanel, GridColumn gridColumn)
+            : this(gridPanel, gridColumn, gridColumn != null ? gridColumn.FilterExpr : gridPanel.FilterExpr)
+        {
+        }
+
+        ///<summary>
+        /// CustomFilter
+        ///</summary>
+        public CustomFilter(GridPanel gridPanel, GridColumn gridColumn, string filterText)
+        {
+            _GridPanel = gridPanel;
+            _GridColumn = gridColumn;
+
+            InitializeComponent();
+            InitializeText();
+            InitializeFilter(filterText);
+
+            PositionWindow(_GridPanel.SuperGrid);
+
+            StyleManager.UpdateAmbientColors(filterExprEdit1);
+
+            filterExprEdit1.RtbOutput.BackColorRichTextBox = Color.White;
+        }
+
+        #region Public properties
+
+        #region FilterExpr
+
+        /// <summary>
+        /// FilterExpr
+        /// </summary>
+        public string FilterExpr
+        {
+            get { return (filterExprEdit1.InputText); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Initialization
+
+        #region InitializeText
+
+        private void InitializeText()
+        {
+            SuperGridControl superGrid = _GridPanel.SuperGrid;
+
+            LoadLocalizedStrings(superGrid);
+
+            TitleText = _filterCustomFilterString;
+
+            lblEnterText.Text = _filterEnterExprString;
+
+            btnClear.Text = _filterClearString;
+            btnApply.Text = superGrid.FilterApplyString;
+            btnOk.Text = superGrid.FilterOkString;
+            btnCancel.Text = superGrid.FilterCancelString;
+
+            if (superGrid.ShowCustomFilterHelp == true)
+                filterExprEdit1.WaterMarkText = _filterHelpString;
+            else
+                HelpButton = false;
+        }
+
+        #endregion
+
+        #region InitializeFilter
+
+        private void InitializeFilter(string filterText)
+        {
+            if (_GridColumn != null)
+            {
+                _FilterExpr = _GridColumn.FilterExpr;
+                _FilterValue = _GridColumn.FilterValue;
+                _FilterDisplayValue = _GridColumn.FilterDisplayValue;
+            }
+            else
+            {
+                _FilterExpr = _GridPanel.FilterExpr;
+                _FilterValue = null;
+                _FilterDisplayValue = null;
+            }
+
+            filterExprEdit1.GridPanel = _GridPanel;
+            filterExprEdit1.GridColumn = _GridColumn;
+            filterExprEdit1.InputText = filterText;
+        }
+
+        #endregion
+
+        #region PositionWindow
+
+        private void PositionWindow(SuperGridControl superGrid)
+        {
+            if (_size != Size.Empty)
+                Size = _size;
+
+            Form form = superGrid.FindForm();
+
+            if (form != null)
+            {
+                Point pt = form.Location;
+
+                if (_offset != Point.Empty)
+                {
+                    pt.Offset(_offset);
+
+                    Location = pt;
+                }
+                else
+                {
+                    Screen screen = Screen.FromControl(form);
+
+                    int boundWidth = screen.Bounds.Width;
+                    int boundHeight = screen.Bounds.Height;
+
+                    int x = boundWidth - Width;
+                    int y = boundHeight - Height;
+
+                    Location = new Point(screen.Bounds.X + x / 2, screen.Bounds.Y + y / 2);
+                }
+            }
+
+            _LockedResize = false;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Event processong
+
+        #region CustomFilterShown
+
+        private void CustomFilterShown(object sender, EventArgs e)
+        {
+            filterExprEdit1.SetFocus();
+        }
+
+        #endregion
+
+        #region OnResize
+
+        /// <summary>
+        /// Handles filter resize
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnResize(EventArgs e)
+        {
+            base.OnResize(e);
+
+            if (_LockedResize == false)
+                _size = Size;
+        }
+
+        #endregion
+
+        #region OnLocationChanged
+
+        /// <summary>
+        /// LocationChanged processing
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnLocationChanged(EventArgs e)
+        {
+            base.OnLocationChanged(e);
+
+            if (_LockedResize == false)
+            {
+                Form form = _GridPanel.SuperGrid.FindForm();
+
+                if (form != null)
+                {
+                    Point pt = Location;
+
+                    pt.Offset(-form.Location.X, -form.Location.Y);
+
+                    _offset = pt;
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Button processing
+
+        #region BtnApplyClick
+
+        private void BtnApplyClick(object sender, EventArgs e)
+        {
+            ApplyFilter();
+        }
+
+        #region ApplyFilter
+
+        private void ApplyFilter()
+        {
+            string text = filterExprEdit1.InputText;
+
+            object filterValue = null;
+            object filterDisplayValue = text;
+            string filterExpr = text;
+
+            if (_GridColumn != null)
+            {
+                if (_GridColumn.SuperGrid.DoFilterEditValueChangedEvent(_GridPanel, _GridColumn, null,
+                    _GridColumn.FilterValue, ref filterValue, ref filterDisplayValue, ref filterExpr) == false)
+                {
+                    _GridColumn.FilterExpr = text;
+                    _GridColumn.FilterValue = null;
+                    _GridColumn.FilterDisplayValue = text;
+                }
+            }
+            else
+            {
+                if (_GridPanel.SuperGrid.DoFilterEditValueChangedEvent(_GridPanel, null, null,
+                    _GridPanel.FilterExpr, ref filterValue, ref filterDisplayValue, ref filterExpr) == false)
+                {
+                    _GridPanel.FilterExpr = text;
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region BtnOkClick
+
+        private void BtnOkClick(object sender, EventArgs e)
+        {
+            ApplyFilter();
+        }
+
+        #endregion
+
+        #region BtnCancelClick
+
+        private void BtnCancelClick(object sender, EventArgs e)
+        {
+            CancelFilter();
+        }
+
+        private void CancelFilter()
+        {
+            if (_GridColumn != null)
+            {
+                _GridColumn.FilterExpr = _FilterExpr;
+                _GridColumn.FilterValue = _FilterValue;
+                _GridColumn.FilterDisplayValue = _FilterDisplayValue;
+            }
+            else
+            {
+                _GridPanel.FilterExpr = _FilterExpr;
+            }
+        }
+
+        #endregion
+
+        #region BtnClearClick
+
+        private void BtnClearClick(object sender, EventArgs e)
+        {
+            filterExprEdit1.InputText = "";
+        }
+
+        #endregion
+
+        #region CustomFilterHelpButtonClicked
+
+        /// <summary>
+        /// Sample Expr variable
+        /// </summary>
+        static protected SampleExpr Se;
+
+        private void CustomFilterHelpButtonClicked(object sender, CancelEventArgs e)
+        {
+            if (Se == null)
+            {
+                Se = new SampleExpr(_GridPanel.SuperGrid);
+                Se.TitleText = _filterHelpTitle;
+
+                Se.FormClosed += SeFormClosed;
+            }
+
+            if (_GridPanel.SuperGrid.DoFilterHelpOpeningEvent(_GridPanel, _GridColumn, Se) == true)
+            {
+                Se.Close();
+            }
+            else
+            {
+                Se.Show();
+
+                if (Se.WindowState == FormWindowState.Minimized)
+                    Se.WindowState = FormWindowState.Normal;
+
+                Se.BringToFront();
+            }
+
+            e.Cancel = true;
+        }
+
+        void SeFormClosed(object sender, FormClosedEventArgs e)
+        {
+            _GridPanel.SuperGrid.DoFilterHelpClosingEvent(_GridPanel, _GridColumn, Se);
+
+            Se.FormClosed -= SeFormClosed;
+            Se = null;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region LoadLocalizedStrings
+
+        private void LoadLocalizedStrings(SuperGridControl sg)
+        {
+            if (_localizedStringsLoaded == false)
+            {
+                using (LocalizationManager lm = new LocalizationManager(sg))
+                {
+                    string s;
+
+                    if ((s = lm.GetLocalizedString(LocalizationKeys.SuperGridFilterCustomHelp)) != "")
+                        _filterHelpString = s;
+
+                    if ((s = lm.GetLocalizedString(LocalizationKeys.SuperGridFilterEnterExpr)) != "")
+                        _filterEnterExprString = s;
+
+                    if ((s = lm.GetLocalizedString(LocalizationKeys.SuperGridFilterClear)) != "")
+                        _filterClearString = s;
+
+                    if ((s = lm.GetLocalizedString(LocalizationKeys.SuperGridFilterCustomFilter)) != "")
+                        _filterCustomFilterString = s;
+
+                    if ((s = lm.GetLocalizedString(LocalizationKeys.SuperGridFilterHelpTitle)) != "")
+                        _filterHelpTitle = s;
+                }
+
+                _localizedStringsLoaded = true;
+            }
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridFilter/CustomFilter.resx b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridFilter/CustomFilter.resx
new file mode 100644
index 00000000..f9cbf957
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridFilter/CustomFilter.resx	
@@ -0,0 +1,303 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="btnCancel.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Bottom, Right</value>
+  </data>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="btnCancel.Location" type="System.Drawing.Point, System.Drawing">
+    <value>315, 157</value>
+  </data>
+  <data name="btnCancel.Size" type="System.Drawing.Size, System.Drawing">
+    <value>65, 23</value>
+  </data>
+  <assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="btnCancel.TabIndex" type="System.Int32, mscorlib">
+    <value>4</value>
+  </data>
+  <data name="btnCancel.Text" xml:space="preserve">
+    <value>Cancel</value>
+  </data>
+  <data name="&gt;&gt;btnCancel.Name" xml:space="preserve">
+    <value>btnCancel</value>
+  </data>
+  <data name="&gt;&gt;btnCancel.Type" xml:space="preserve">
+    <value>DevComponents.DotNetBar.ButtonX, DevComponents.DotNetBar2, Version=1.0.0.0, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04</value>
+  </data>
+  <data name="&gt;&gt;btnCancel.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;btnCancel.ZOrder" xml:space="preserve">
+    <value>5</value>
+  </data>
+  <data name="btnOk.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Bottom, Right</value>
+  </data>
+  <data name="btnOk.Location" type="System.Drawing.Point, System.Drawing">
+    <value>244, 157</value>
+  </data>
+  <data name="btnOk.Size" type="System.Drawing.Size, System.Drawing">
+    <value>65, 23</value>
+  </data>
+  <data name="btnOk.TabIndex" type="System.Int32, mscorlib">
+    <value>3</value>
+  </data>
+  <data name="btnOk.Text" xml:space="preserve">
+    <value>OK</value>
+  </data>
+  <data name="&gt;&gt;btnOk.Name" xml:space="preserve">
+    <value>btnOk</value>
+  </data>
+  <data name="&gt;&gt;btnOk.Type" xml:space="preserve">
+    <value>DevComponents.DotNetBar.ButtonX, DevComponents.DotNetBar2, Version=1.0.0.0, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04</value>
+  </data>
+  <data name="&gt;&gt;btnOk.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;btnOk.ZOrder" xml:space="preserve">
+    <value>4</value>
+  </data>
+  <data name="btnApply.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Bottom, Right</value>
+  </data>
+  <data name="btnApply.Location" type="System.Drawing.Point, System.Drawing">
+    <value>164, 157</value>
+  </data>
+  <data name="btnApply.Size" type="System.Drawing.Size, System.Drawing">
+    <value>65, 23</value>
+  </data>
+  <data name="btnApply.TabIndex" type="System.Int32, mscorlib">
+    <value>2</value>
+  </data>
+  <data name="btnApply.Text" xml:space="preserve">
+    <value>Apply</value>
+  </data>
+  <data name="&gt;&gt;btnApply.Name" xml:space="preserve">
+    <value>btnApply</value>
+  </data>
+  <data name="&gt;&gt;btnApply.Type" xml:space="preserve">
+    <value>DevComponents.DotNetBar.ButtonX, DevComponents.DotNetBar2, Version=1.0.0.0, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04</value>
+  </data>
+  <data name="&gt;&gt;btnApply.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;btnApply.ZOrder" xml:space="preserve">
+    <value>3</value>
+  </data>
+  <data name="btnClear.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Bottom, Left</value>
+  </data>
+  <data name="btnClear.Location" type="System.Drawing.Point, System.Drawing">
+    <value>12, 157</value>
+  </data>
+  <data name="btnClear.Size" type="System.Drawing.Size, System.Drawing">
+    <value>65, 23</value>
+  </data>
+  <data name="btnClear.TabIndex" type="System.Int32, mscorlib">
+    <value>9</value>
+  </data>
+  <data name="btnClear.Text" xml:space="preserve">
+    <value>Clear</value>
+  </data>
+  <data name="&gt;&gt;btnClear.Name" xml:space="preserve">
+    <value>btnClear</value>
+  </data>
+  <data name="&gt;&gt;btnClear.Type" xml:space="preserve">
+    <value>DevComponents.DotNetBar.ButtonX, DevComponents.DotNetBar2, Version=1.0.0.0, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04</value>
+  </data>
+  <data name="&gt;&gt;btnClear.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;btnClear.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
+  <data name="lblEnterText.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Left, Right</value>
+  </data>
+  <data name="lblEnterText.Location" type="System.Drawing.Point, System.Drawing">
+    <value>10, 4</value>
+  </data>
+  <data name="lblEnterText.Size" type="System.Drawing.Size, System.Drawing">
+    <value>370, 26</value>
+  </data>
+  <data name="lblEnterText.TabIndex" type="System.Int32, mscorlib">
+    <value>10</value>
+  </data>
+  <data name="lblEnterText.Text" xml:space="preserve">
+    <value>labelX1</value>
+  </data>
+  <data name="&gt;&gt;lblEnterText.Name" xml:space="preserve">
+    <value>lblEnterText</value>
+  </data>
+  <data name="&gt;&gt;lblEnterText.Type" xml:space="preserve">
+    <value>DevComponents.DotNetBar.LabelX, DevComponents.DotNetBar2, Version=1.0.0.0, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04</value>
+  </data>
+  <data name="&gt;&gt;lblEnterText.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;lblEnterText.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="filterExprEdit1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Bottom, Left, Right</value>
+  </data>
+  <data name="filterExprEdit1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>12, 34</value>
+  </data>
+  <data name="filterExprEdit1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>370, 112</value>
+  </data>
+  <data name="filterExprEdit1.TabIndex" type="System.Int32, mscorlib">
+    <value>11</value>
+  </data>
+  <data name="&gt;&gt;filterExprEdit1.Name" xml:space="preserve">
+    <value>filterExprEdit1</value>
+  </data>
+  <data name="&gt;&gt;filterExprEdit1.Type" xml:space="preserve">
+    <value>DevComponents.DotNetBar.SuperGrid.FilterExprEdit, DevComponents.DotNetBar.SuperGrid, Version=2.0.0.0, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04</value>
+  </data>
+  <data name="&gt;&gt;filterExprEdit1.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;filterExprEdit1.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
+    <value>96, 96</value>
+  </data>
+  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
+    <value>394, 192</value>
+  </data>
+  <data name="$this.MinimumSize" type="System.Drawing.Size, System.Drawing">
+    <value>410, 230</value>
+  </data>
+  <data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
+    <value>Manual</value>
+  </data>
+  <data name="&gt;&gt;$this.Name" xml:space="preserve">
+    <value>CustomFilter</value>
+  </data>
+  <data name="&gt;&gt;$this.Type" xml:space="preserve">
+    <value>DevComponents.DotNetBar.Office2007Form, DevComponents.DotNetBar2, Version=1.0.0.0, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridFilter/CustomFilterEx.Designer.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridFilter/CustomFilterEx.Designer.cs
new file mode 100644
index 00000000..8ee61060
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridFilter/CustomFilterEx.Designer.cs	
@@ -0,0 +1,231 @@
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    partial class CustomFilterEx
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form 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()
+        {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(CustomFilterEx));
+            this.btnCancel = new DevComponents.DotNetBar.ButtonX();
+            this.btnOk = new DevComponents.DotNetBar.ButtonX();
+            this.btnApply = new DevComponents.DotNetBar.ButtonX();
+            this.btnReset = new DevComponents.DotNetBar.ButtonX();
+            this.lblFilterName = new DevComponents.DotNetBar.LabelX();
+            this.tbxDesc = new DevComponents.DotNetBar.Controls.TextBoxX();
+            this.lblDesc = new DevComponents.DotNetBar.LabelX();
+            this.cbFilterName = new DevComponents.DotNetBar.Controls.ComboBoxEx();
+            this.btnNewFilter = new DevComponents.DotNetBar.ButtonX();
+            this.btnDeleteFilter = new DevComponents.DotNetBar.ButtonX();
+            this.lblEnterText = new DevComponents.DotNetBar.LabelX();
+            this.cbxShowInPopup = new DevComponents.DotNetBar.Controls.CheckBoxX();
+            this.btnClear = new DevComponents.DotNetBar.ButtonX();
+            this.filterExprEdit1 = new DevComponents.DotNetBar.SuperGrid.FilterExprEdit();
+            this.SuspendLayout();
+            // 
+            // btnCancel
+            // 
+            this.btnCancel.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+            resources.ApplyResources(this.btnCancel, "btnCancel");
+            this.btnCancel.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+            this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+            this.btnCancel.Name = "btnCancel";
+            this.btnCancel.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.btnCancel.Click += new System.EventHandler(this.BtnCancelClick);
+            // 
+            // btnOk
+            // 
+            this.btnOk.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+            resources.ApplyResources(this.btnOk, "btnOk");
+            this.btnOk.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+            this.btnOk.DialogResult = System.Windows.Forms.DialogResult.OK;
+            this.btnOk.Name = "btnOk";
+            this.btnOk.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.btnOk.Click += new System.EventHandler(this.BtnOkClick);
+            // 
+            // btnApply
+            // 
+            this.btnApply.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+            resources.ApplyResources(this.btnApply, "btnApply");
+            this.btnApply.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+            this.btnApply.Name = "btnApply";
+            this.btnApply.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.btnApply.Click += new System.EventHandler(this.BtnApplyClick);
+            // 
+            // btnReset
+            // 
+            this.btnReset.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+            resources.ApplyResources(this.btnReset, "btnReset");
+            this.btnReset.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+            this.btnReset.Name = "btnReset";
+            this.btnReset.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.btnReset.Click += new System.EventHandler(this.BtnResetClick);
+            // 
+            // lblFilterName
+            // 
+            // 
+            // 
+            // 
+            this.lblFilterName.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            resources.ApplyResources(this.lblFilterName, "lblFilterName");
+            this.lblFilterName.Name = "lblFilterName";
+            // 
+            // tbxDesc
+            // 
+            resources.ApplyResources(this.tbxDesc, "tbxDesc");
+            // 
+            // 
+            // 
+            this.tbxDesc.Border.Class = "TextBoxBorder";
+            this.tbxDesc.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.tbxDesc.Name = "tbxDesc";
+            this.tbxDesc.TextChanged += new System.EventHandler(this.TbxDescTextChanged);
+            // 
+            // lblDesc
+            // 
+            resources.ApplyResources(this.lblDesc, "lblDesc");
+            // 
+            // 
+            // 
+            this.lblDesc.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.lblDesc.Name = "lblDesc";
+            // 
+            // cbFilterName
+            // 
+            resources.ApplyResources(this.cbFilterName, "cbFilterName");
+            this.cbFilterName.DisplayMember = "Text";
+            this.cbFilterName.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed;
+            this.cbFilterName.FormattingEnabled = true;
+            this.cbFilterName.Name = "cbFilterName";
+            this.cbFilterName.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.cbFilterName.DropDown += new System.EventHandler(this.CbFilterNameDropDown);
+            this.cbFilterName.SelectedIndexChanged += new System.EventHandler(this.CbFilterNameSelectedIndexChanged);
+            this.cbFilterName.TextUpdate += new System.EventHandler(this.CbFilterNameTextUpdate);
+            // 
+            // btnNewFilter
+            // 
+            this.btnNewFilter.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+            resources.ApplyResources(this.btnNewFilter, "btnNewFilter");
+            this.btnNewFilter.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+            this.btnNewFilter.Name = "btnNewFilter";
+            this.btnNewFilter.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.btnNewFilter.Click += new System.EventHandler(this.BtnNewFilterClick);
+            // 
+            // btnDeleteFilter
+            // 
+            this.btnDeleteFilter.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+            resources.ApplyResources(this.btnDeleteFilter, "btnDeleteFilter");
+            this.btnDeleteFilter.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+            this.btnDeleteFilter.Name = "btnDeleteFilter";
+            this.btnDeleteFilter.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.btnDeleteFilter.Click += new System.EventHandler(this.BtnDeleteFilterClick);
+            // 
+            // lblEnterText
+            // 
+            resources.ApplyResources(this.lblEnterText, "lblEnterText");
+            // 
+            // 
+            // 
+            this.lblEnterText.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.lblEnterText.Name = "lblEnterText";
+            // 
+            // cbxShowInPopup
+            // 
+            resources.ApplyResources(this.cbxShowInPopup, "cbxShowInPopup");
+            // 
+            // 
+            // 
+            this.cbxShowInPopup.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.cbxShowInPopup.Name = "cbxShowInPopup";
+            this.cbxShowInPopup.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.cbxShowInPopup.CheckedChanged += new System.EventHandler(this.CbxShowInPopupCheckedChanged);
+            // 
+            // btnClear
+            // 
+            this.btnClear.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+            resources.ApplyResources(this.btnClear, "btnClear");
+            this.btnClear.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+            this.btnClear.Name = "btnClear";
+            this.btnClear.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.btnClear.Click += new System.EventHandler(this.BtnClearClick);
+            // 
+            // filterExprEdit1
+            // 
+            resources.ApplyResources(this.filterExprEdit1, "filterExprEdit1");
+            this.filterExprEdit1.Name = "filterExprEdit1";
+            // 
+            // CustomFilterEx
+            // 
+            this.AcceptButton = this.btnApply;
+            resources.ApplyResources(this, "$this");
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+            this.CancelButton = this.btnCancel;
+            this.Controls.Add(this.btnClear);
+            this.Controls.Add(this.filterExprEdit1);
+            this.Controls.Add(this.tbxDesc);
+            this.Controls.Add(this.lblEnterText);
+            this.Controls.Add(this.btnCancel);
+            this.Controls.Add(this.cbxShowInPopup);
+            this.Controls.Add(this.btnOk);
+            this.Controls.Add(this.btnNewFilter);
+            this.Controls.Add(this.btnReset);
+            this.Controls.Add(this.lblFilterName);
+            this.Controls.Add(this.btnApply);
+            this.Controls.Add(this.cbFilterName);
+            this.Controls.Add(this.lblDesc);
+            this.Controls.Add(this.btnDeleteFilter);
+            this.DoubleBuffered = true;
+            this.EnableGlass = false;
+            this.HelpButton = true;
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.Name = "CustomFilterEx";
+            this.ShowIcon = false;
+            this.ShowInTaskbar = false;
+            this.TitleText = "Custom Filter";
+            this.HelpButtonClicked += new System.ComponentModel.CancelEventHandler(this.CustomFilterHelpButtonClicked);
+            this.Shown += new System.EventHandler(this.CustomFilterShown);
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private DevComponents.DotNetBar.ButtonX btnCancel;
+        private DevComponents.DotNetBar.ButtonX btnOk;
+        private ButtonX btnApply;
+        private ButtonX btnReset;
+        private LabelX lblFilterName;
+        private DevComponents.DotNetBar.Controls.TextBoxX tbxDesc;
+        private LabelX lblDesc;
+        private DevComponents.DotNetBar.Controls.ComboBoxEx cbFilterName;
+        private ButtonX btnNewFilter;
+        private ButtonX btnDeleteFilter;
+        private LabelX lblEnterText;
+        private DevComponents.DotNetBar.Controls.CheckBoxX cbxShowInPopup;
+        private FilterExprEdit filterExprEdit1;
+        private ButtonX btnClear;
+    }
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridFilter/CustomFilterEx.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridFilter/CustomFilterEx.cs
new file mode 100644
index 00000000..fb8c6211
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridFilter/CustomFilterEx.cs	
@@ -0,0 +1,700 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    ///<summary>
+    /// CustomFilter
+    ///</summary>
+    internal partial class CustomFilterEx : Office2007Form
+    {
+        #region Static data
+
+        private static bool _localizedStringsLoaded;
+
+        private static string _filterClearString = "Clear";
+        private static string _filterResetString = "Reset";
+        private static string _filterCustomFilterString = "Custom Filter";
+        private static string _filterEnterExprString = "Enter custom filter expression";
+        private static string _filterHelpString = "Click the Title Bar help button for syntax help";
+        private static string _newFilterExprString = "NewFilter";
+        private static string _filterDescriptionString = "Description";
+        private static string _filterNameString = "Filter Name:";
+        private static string _showInFilterPopupString = "Show in FilterPopup";
+        private static string _newFilterString = "New";
+        private static string _deleteFilterString = "Delete";
+        private static string _filterHelpTitle = "SampleExpr";
+
+        private static Point _offset = Point.Empty;
+        private static Size _size = Size.Empty;
+
+        #endregion
+
+        #region Private variables
+
+        private GridPanel _GridPanel;
+        private GridColumn _GridColumn;
+
+        private string _FilterExpr;
+        private object _FilterValue;
+        private object _FilterDisplayValue;
+
+        private List<UserFilterData> _FilterData;
+        private UserFilterData _CurrentFilter;
+
+        private bool _CancelFilterEdits;
+        private bool _LockedResize = true;
+
+        #endregion
+
+        ///<summary>
+        /// CustomFilter
+        ///</summary>
+        public CustomFilterEx(GridPanel gridPanel, GridColumn gridColumn)
+            : this(gridPanel, gridColumn, gridColumn != null ? gridColumn.FilterExpr : gridPanel.FilterExpr)
+        {
+        }
+
+        ///<summary>
+        /// CustomFilter
+        ///</summary>
+        public CustomFilterEx(GridPanel gridPanel,
+            GridColumn gridColumn, string filterText)
+        {
+            _GridPanel = gridPanel;
+            _GridColumn = gridColumn;
+
+            InitializeComponent();
+            InitializeText();
+            InitializeFilter(filterText);
+
+            PositionWindow(_GridPanel.SuperGrid);
+
+            FormClosing += CustomFilterExFormClosing;
+
+            filterExprEdit1.InputTextChanged += FilterExprEdit1InputTextChanged;
+
+            StyleManager.UpdateAmbientColors(filterExprEdit1);
+
+            filterExprEdit1.RtbOutput.BackColorRichTextBox = Color.White;
+        }
+
+        #region Public properties
+
+        #region CurrentFilter
+
+        /// <summary>
+        /// Gets or sets the current UserFilterData filter
+        /// </summary>
+        public UserFilterData CurrentFilter
+        {
+            get { return (_CurrentFilter); }
+
+            set
+            {
+                if (_CurrentFilter != value)
+                {
+                    _CurrentFilter = value;
+
+                    UpdateDisplay();
+                }
+            }
+        }
+
+        #endregion
+
+        #region FilterData
+
+        /// <summary>
+        /// Gets or sets the list of UserFilterData
+        /// </summary>
+        public List<UserFilterData> FilterData
+        {
+            get { return (_FilterData); }
+            set { _FilterData = value; }
+        }
+
+        #endregion
+
+        #region FilterExpr
+
+        /// <summary>
+        /// FilterExpr
+        /// </summary>
+        public string FilterExpr
+        {
+            get { return (filterExprEdit1.InputText); }
+        }
+
+        #endregion
+
+        #region ShowInPopupVisible
+
+        /// <summary>
+        /// ShowInPopupVisible
+        /// </summary>
+        public bool ShowInPopupVisible
+        {
+            get { return (cbxShowInPopup.Visible); }
+            set { cbxShowInPopup.Visible = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Initialization
+
+        #region InitializeText
+
+        private void InitializeText()
+        {
+            SuperGridControl superGrid = _GridPanel.SuperGrid;
+
+            LoadLocalizedStrings(superGrid);
+
+            TitleText = _filterCustomFilterString;
+
+            lblEnterText.Text = _filterEnterExprString;
+            lblDesc.Text = _filterDescriptionString;
+            lblFilterName.Text = _filterNameString;
+
+            btnNewFilter.Text = _newFilterString;
+            btnDeleteFilter.Text = _deleteFilterString;
+            btnReset.Text = _filterResetString;
+            btnClear.Text = _filterClearString;
+
+            btnApply.Text = superGrid.FilterApplyString;
+            btnOk.Text = superGrid.FilterOkString;
+            btnCancel.Text = superGrid.FilterCancelString;
+
+            cbxShowInPopup.Text = _showInFilterPopupString;
+
+            if (superGrid.ShowCustomFilterHelp == true)
+                filterExprEdit1.WaterMarkText = _filterHelpString;
+            else
+                HelpButton = false;
+        }
+
+        #endregion
+
+        #region InitializeFilter
+
+        private void InitializeFilter(string filterText)
+        {
+            if (_GridColumn != null)
+            {
+                _FilterExpr = _GridColumn.FilterExpr;
+                _FilterValue = _GridColumn.FilterValue;
+                _FilterDisplayValue = _GridColumn.FilterDisplayValue;
+            }
+            else
+            {
+                _FilterExpr = _GridPanel.FilterExpr;
+                _FilterValue = null;
+                _FilterDisplayValue = null;
+
+                cbxShowInPopup.Visible = false;
+            }
+
+            filterExprEdit1.GridPanel = _GridPanel;
+            filterExprEdit1.GridColumn = _GridColumn;
+            filterExprEdit1.InputText = filterText;
+
+            CurrentFilter = GetCurrentFilter();
+        }
+
+        #region GetCurrentFilter
+
+        private UserFilterData GetCurrentFilter()
+        {
+            _FilterData = FilterUserData.LoadFilterData(_GridPanel);
+
+            foreach (UserFilterData fd in _FilterData)
+            {
+                if (string.IsNullOrEmpty(fd.Expression) == false)
+                {
+                    if (fd.Expression.Equals(filterExprEdit1.InputText) == true)
+                        return (fd);
+                }
+            }
+
+            UserFilterData nfd = GetNewFilter();
+
+            nfd.Expression = filterExprEdit1.InputText;
+
+            return (nfd);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region PositionWindow
+
+        private void PositionWindow(SuperGridControl superGrid)
+        {
+            if (_size != Size.Empty)
+                Size = _size;
+
+            Form form = superGrid.FindForm();
+
+            if (form != null)
+            {
+                Point pt = form.Location;
+
+                if (_offset != Point.Empty)
+                {
+                    pt.Offset(_offset);
+
+                    Location = pt;
+                }
+                else
+                {
+                    Screen screen = Screen.FromControl(form);
+
+                    int boundWidth = screen.Bounds.Width;
+                    int boundHeight = screen.Bounds.Height;
+
+                    int x = boundWidth - Width;
+                    int y = boundHeight - Height;
+
+                    Location = new Point(screen.Bounds.X + x / 2, screen.Bounds.Y + y / 2);
+                }
+            }
+
+            _LockedResize = false;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Event processong
+
+        #region CustomFilterExFormClosing
+
+        void CustomFilterExFormClosing(object sender, FormClosingEventArgs e)
+        {
+            if (_CancelFilterEdits == false)
+                FilterUserData.StoreFilterData(_GridPanel, _FilterData);
+        }
+
+        #endregion
+
+        #region CustomFilterShown
+
+        private void CustomFilterShown(object sender, EventArgs e)
+        {
+            filterExprEdit1.SetFocus();
+        }
+
+        #endregion
+
+        #region FilterExprEdit1InputTextChanged
+
+        void FilterExprEdit1InputTextChanged(object sender, EventArgs e)
+        {
+            CurrentFilter.Expression = filterExprEdit1.InputText;
+        }
+
+        #endregion
+
+        #region OnLocationChanged
+
+        protected override void OnLocationChanged(EventArgs e)
+        {
+            base.OnLocationChanged(e);
+
+            if (_LockedResize == false)
+            {
+                Form form = _GridPanel.SuperGrid.FindForm();
+
+                if (form != null)
+                {
+                    Point pt = Location;
+
+                    pt.Offset(-form.Location.X, -form.Location.Y);
+
+                    _offset = pt;
+                }
+            }
+        }
+
+        #endregion
+
+        #region OnResize
+
+        protected override void OnResize(EventArgs e)
+        {
+            base.OnResize(e);
+
+            if (_LockedResize == false)
+                _size = Size;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region UpdateDisplay
+
+        private void UpdateDisplay()
+        {
+            cbFilterName.Text = CurrentFilter.Name;
+            tbxDesc.Text = CurrentFilter.Description;
+
+            if (_GridColumn != null)
+                cbxShowInPopup.Checked = CurrentFilter.ReferNames.Contains(_GridColumn.Name);
+
+            filterExprEdit1.InputText = CurrentFilter.Expression;
+        }
+
+        #endregion
+
+        #region Button processing
+
+        #region BtnApplyClick
+
+        private void BtnApplyClick(object sender, EventArgs e)
+        {
+            ApplyFilter(filterExprEdit1.InputText);
+        }
+
+        #endregion
+
+        #region BtnResetClick
+
+        private void BtnResetClick(object sender, EventArgs e)
+        {
+            ApplyFilter(null);
+
+            Close();
+        }
+
+        #endregion
+
+        #region BtnDeleteFilterClick
+
+        private void BtnDeleteFilterClick(object sender, EventArgs e)
+        {
+            if (CurrentFilter != null)
+            {
+                _FilterData.Remove(CurrentFilter);
+
+                UpdateFilterNameCombo();
+
+                CurrentFilter = (_FilterData.Count > 0)
+                    ? _FilterData[0] : GetNewFilter();
+            }
+        }
+
+        #endregion
+
+        #region BtnCancelClick
+
+        private void BtnCancelClick(object sender, EventArgs e)
+        {
+            if (_GridColumn != null)
+            {
+                _GridColumn.FilterExpr = _FilterExpr;
+                _GridColumn.FilterValue = _FilterValue;
+                _GridColumn.FilterDisplayValue = _FilterDisplayValue;
+            }
+            else
+            {
+                _GridPanel.FilterExpr = _FilterExpr;
+            }
+
+            _CancelFilterEdits = true;
+        }
+
+        #endregion
+
+        #region BtnClearClick
+
+        private void BtnClearClick(object sender, EventArgs e)
+        {
+            filterExprEdit1.InputText = "";
+        }
+
+        #endregion
+
+        #region BtnNewFilterClick
+
+        private void BtnNewFilterClick(object sender, EventArgs e)
+        {
+            CurrentFilter = GetNewFilter();
+        }
+
+        #region GetNewFilter
+
+        private UserFilterData GetNewFilter()
+        {
+            UserFilterData fd = new UserFilterData();
+
+            fd.Name = GetNewFilterName();
+            fd.Description = "";
+
+            _FilterData.Add(fd);
+
+            return (fd);
+        }
+
+        #region GetNewFilterName
+
+        private string GetNewFilterName()
+        {
+            for (int i = 1; i < 100; i++)
+            {
+                string s = _newFilterExprString + i;
+
+                if (FindFilterName(s) < 0)
+                    return(s);
+            }
+
+            return (_newFilterExprString);
+        }
+
+        #region FindFilterName
+
+        private int FindFilterName(string s)
+        {
+            for (int i = 0; i < _FilterData.Count; i++)
+            {
+                if (s.Equals(_FilterData[i].Name) == true)
+                    return (i);
+            }
+
+            return (-1);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region BtnOkClick
+
+        private void BtnOkClick(object sender, EventArgs e)
+        {
+            ApplyFilter(filterExprEdit1.InputText);
+        }
+
+        #endregion
+
+        #region CustomFilterHelpButtonClicked
+
+        static protected SampleExpr Se;
+
+        private void CustomFilterHelpButtonClicked(object sender, CancelEventArgs e)
+        {
+            if (Se == null)
+            {
+                Se = new SampleExpr(_GridPanel.SuperGrid);
+                Se.TitleText = _filterHelpTitle;
+
+                Se.FormClosed += SeFormClosed;
+            }
+
+            if (_GridPanel.SuperGrid.DoFilterHelpOpeningEvent(_GridPanel, _GridColumn, Se) == true)
+            {
+                Se.Close();
+            }
+            else
+            {
+                Se.Show();
+
+                if (Se.WindowState == FormWindowState.Minimized)
+                    Se.WindowState = FormWindowState.Normal;
+
+                Se.BringToFront();
+            }
+
+            e.Cancel = true;
+        }
+
+        void SeFormClosed(object sender, FormClosedEventArgs e)
+        {
+            _GridPanel.SuperGrid.DoFilterHelpClosingEvent(_GridPanel, _GridColumn, Se);
+
+            Se.FormClosed -= SeFormClosed;
+            Se = null;
+        }
+
+        #endregion
+
+        #region ApplyFilter
+
+        private void ApplyFilter(string text)
+        {
+            object filterValue = null;
+            object filterDisplayValue = text;
+            string filterExpr = text;
+
+            if (_GridColumn != null)
+            {
+                if (_GridColumn.SuperGrid.DoFilterEditValueChangedEvent(_GridPanel, _GridColumn, null,
+                    _GridColumn.FilterValue, ref filterValue, ref filterDisplayValue, ref filterExpr) == false)
+                {
+                    _GridColumn.FilterExpr = text;
+                    _GridColumn.FilterValue = null;
+                    _GridColumn.FilterDisplayValue = text;
+                }
+            }
+            else
+            {
+                if (_GridPanel.SuperGrid.DoFilterEditValueChangedEvent(_GridPanel, null, null,
+                    _GridPanel.FilterExpr, ref filterValue, ref filterDisplayValue, ref filterExpr) == false)
+                {
+                    _GridPanel.FilterExpr = text;
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Checkbox processing
+
+        #region CbxShowInPopupCheckedChanged
+
+        private void CbxShowInPopupCheckedChanged(object sender, EventArgs e)
+        {
+            if (_GridColumn != null)
+            {
+                if (cbxShowInPopup.Checked == true)
+                {
+                    if (CurrentFilter.ReferNames.Contains(_GridColumn.Name) == false)
+                        CurrentFilter.ReferNames.Add(_GridColumn.Name);
+                }
+                else
+                {
+                    if (CurrentFilter.ReferNames.Contains(_GridColumn.Name) == true)
+                        CurrentFilter.ReferNames.Remove(_GridColumn.Name);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Combobox processing
+
+        #region CbFilterNameDropDown
+
+        private void CbFilterNameDropDown(object sender, EventArgs e)
+        {
+            UpdateFilterNameCombo();
+        }
+
+        #region UpdateFilterNameCombo
+
+        private void UpdateFilterNameCombo()
+        {
+            cbFilterName.Items.Clear();
+
+            foreach (UserFilterData fd in _FilterData)
+                cbFilterName.Items.Add(fd.Name);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region CbFilterNameSelectedIndexChanged
+
+        private void CbFilterNameSelectedIndexChanged(object sender, EventArgs e)
+        {
+            if (cbFilterName.SelectedIndex >= 0)
+                CurrentFilter = _FilterData[cbFilterName.SelectedIndex];
+        }
+
+        #endregion
+
+        #region CbFilterNameTextUpdate
+
+        private void CbFilterNameTextUpdate(object sender, EventArgs e)
+        {
+            CurrentFilter.Name = cbFilterName.Text;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region TextBox processing
+
+        #region TbxDescTextChanged
+
+        private void TbxDescTextChanged(object sender, EventArgs e)
+        {
+            CurrentFilter.Description = tbxDesc.Text;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region LoadLocalizedStrings
+
+        private void LoadLocalizedStrings(SuperGridControl sg)
+        {
+            if (_localizedStringsLoaded == false)
+            {
+                using (LocalizationManager lm = new LocalizationManager(sg))
+                {
+                    string s;
+
+                    if ((s = lm.GetLocalizedString(LocalizationKeys.SuperGridFilterCustomHelp)) != "")
+                        _filterHelpString = s;
+
+                    if ((s = lm.GetLocalizedString(LocalizationKeys.SuperGridFilterEnterExpr)) != "")
+                        _filterEnterExprString = s;
+
+                    if ((s = lm.GetLocalizedString(LocalizationKeys.SuperGridFilterClear)) != "")
+                        _filterClearString = s;
+
+                    if ((s = lm.GetLocalizedString(LocalizationKeys.SuperGridFilterReset)) != "")
+                        _filterResetString = s;
+
+                    if ((s = lm.GetLocalizedString(LocalizationKeys.SuperGridFilterCustomFilter)) != "")
+                        _filterCustomFilterString = s;
+
+                    if ((s = lm.GetLocalizedString(LocalizationKeys.SuperGridNewFilterExpr)) != "")
+                        _newFilterExprString = s;
+
+                    if ((s = lm.GetLocalizedString(LocalizationKeys.SuperGridNewFilter)) != "")
+                        _newFilterString = s;
+
+                    if ((s = lm.GetLocalizedString(LocalizationKeys.SuperGridDeleteFilter)) != "")
+                        _deleteFilterString = s;
+
+                    if ((s = lm.GetLocalizedString(LocalizationKeys.SuperGridFilterName)) != "")
+                        _filterNameString = s;
+
+                    if ((s = lm.GetLocalizedString(LocalizationKeys.SuperGridFilterDescription)) != "")
+                        _filterDescriptionString = s;
+
+                    if ((s = lm.GetLocalizedString(LocalizationKeys.SuperGridShowInFilterPopup)) != "")
+                        _showInFilterPopupString = s;
+
+                    if ((s = lm.GetLocalizedString(LocalizationKeys.SuperGridFilterHelpTitle)) != "")
+                        _filterHelpTitle = s;
+                }
+
+                _localizedStringsLoaded = true;
+            }
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridFilter/CustomFilterEx.resx b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridFilter/CustomFilterEx.resx
new file mode 100644
index 00000000..d4e5784b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridFilter/CustomFilterEx.resx	
@@ -0,0 +1,516 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="btnCancel.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Bottom, Right</value>
+  </data>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="btnCancel.Location" type="System.Drawing.Point, System.Drawing">
+    <value>256, 261</value>
+  </data>
+  <data name="btnCancel.Size" type="System.Drawing.Size, System.Drawing">
+    <value>65, 23</value>
+  </data>
+  <assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="btnCancel.TabIndex" type="System.Int32, mscorlib">
+    <value>9</value>
+  </data>
+  <data name="btnCancel.Text" xml:space="preserve">
+    <value>Cancel</value>
+  </data>
+  <data name="&gt;&gt;btnCancel.Name" xml:space="preserve">
+    <value>btnCancel</value>
+  </data>
+  <data name="&gt;&gt;btnCancel.Type" xml:space="preserve">
+    <value>DevComponents.DotNetBar.ButtonX, DevComponents.DotNetBar2, Version=1.0.0.0, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04</value>
+  </data>
+  <data name="&gt;&gt;btnCancel.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;btnCancel.ZOrder" xml:space="preserve">
+    <value>4</value>
+  </data>
+  <data name="btnOk.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Bottom, Right</value>
+  </data>
+  <data name="btnOk.Location" type="System.Drawing.Point, System.Drawing">
+    <value>327, 261</value>
+  </data>
+  <data name="btnOk.Size" type="System.Drawing.Size, System.Drawing">
+    <value>65, 23</value>
+  </data>
+  <data name="btnOk.TabIndex" type="System.Int32, mscorlib">
+    <value>10</value>
+  </data>
+  <data name="btnOk.Text" xml:space="preserve">
+    <value>OK</value>
+  </data>
+  <data name="&gt;&gt;btnOk.Name" xml:space="preserve">
+    <value>btnOk</value>
+  </data>
+  <data name="&gt;&gt;btnOk.Type" xml:space="preserve">
+    <value>DevComponents.DotNetBar.ButtonX, DevComponents.DotNetBar2, Version=1.0.0.0, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04</value>
+  </data>
+  <data name="&gt;&gt;btnOk.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;btnOk.ZOrder" xml:space="preserve">
+    <value>6</value>
+  </data>
+  <data name="btnApply.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Bottom, Left</value>
+  </data>
+  <data name="btnApply.Location" type="System.Drawing.Point, System.Drawing">
+    <value>86, 261</value>
+  </data>
+  <data name="btnApply.Size" type="System.Drawing.Size, System.Drawing">
+    <value>65, 23</value>
+  </data>
+  <data name="btnApply.TabIndex" type="System.Int32, mscorlib">
+    <value>8</value>
+  </data>
+  <data name="btnApply.Text" xml:space="preserve">
+    <value>Apply</value>
+  </data>
+  <data name="&gt;&gt;btnApply.Name" xml:space="preserve">
+    <value>btnApply</value>
+  </data>
+  <data name="&gt;&gt;btnApply.Type" xml:space="preserve">
+    <value>DevComponents.DotNetBar.ButtonX, DevComponents.DotNetBar2, Version=1.0.0.0, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04</value>
+  </data>
+  <data name="&gt;&gt;btnApply.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;btnApply.ZOrder" xml:space="preserve">
+    <value>10</value>
+  </data>
+  <data name="btnReset.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Bottom, Right</value>
+  </data>
+  <data name="btnReset.Location" type="System.Drawing.Point, System.Drawing">
+    <value>185, 261</value>
+  </data>
+  <data name="btnReset.Size" type="System.Drawing.Size, System.Drawing">
+    <value>65, 23</value>
+  </data>
+  <data name="btnReset.TabIndex" type="System.Int32, mscorlib">
+    <value>7</value>
+  </data>
+  <data name="btnReset.Text" xml:space="preserve">
+    <value>Reset</value>
+  </data>
+  <data name="&gt;&gt;btnReset.Name" xml:space="preserve">
+    <value>btnReset</value>
+  </data>
+  <data name="&gt;&gt;btnReset.Type" xml:space="preserve">
+    <value>DevComponents.DotNetBar.ButtonX, DevComponents.DotNetBar2, Version=1.0.0.0, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04</value>
+  </data>
+  <data name="&gt;&gt;btnReset.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;btnReset.ZOrder" xml:space="preserve">
+    <value>8</value>
+  </data>
+  <data name="lblFilterName.Location" type="System.Drawing.Point, System.Drawing">
+    <value>12, 10</value>
+  </data>
+  <data name="lblFilterName.Size" type="System.Drawing.Size, System.Drawing">
+    <value>65, 23</value>
+  </data>
+  <data name="lblFilterName.TabIndex" type="System.Int32, mscorlib">
+    <value>10</value>
+  </data>
+  <data name="lblFilterName.Text" xml:space="preserve">
+    <value>Filter Name:</value>
+  </data>
+  <data name="&gt;&gt;lblFilterName.Name" xml:space="preserve">
+    <value>lblFilterName</value>
+  </data>
+  <data name="&gt;&gt;lblFilterName.Type" xml:space="preserve">
+    <value>DevComponents.DotNetBar.LabelX, DevComponents.DotNetBar2, Version=1.0.0.0, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04</value>
+  </data>
+  <data name="&gt;&gt;lblFilterName.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;lblFilterName.ZOrder" xml:space="preserve">
+    <value>9</value>
+  </data>
+  <data name="tbxDesc.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Left, Right</value>
+  </data>
+  <data name="tbxDesc.Location" type="System.Drawing.Point, System.Drawing">
+    <value>12, 65</value>
+  </data>
+  <data name="tbxDesc.Multiline" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="tbxDesc.Size" type="System.Drawing.Size, System.Drawing">
+    <value>232, 40</value>
+  </data>
+  <data name="tbxDesc.TabIndex" type="System.Int32, mscorlib">
+    <value>2</value>
+  </data>
+  <data name="&gt;&gt;tbxDesc.Name" xml:space="preserve">
+    <value>tbxDesc</value>
+  </data>
+  <data name="&gt;&gt;tbxDesc.Type" xml:space="preserve">
+    <value>DevComponents.DotNetBar.Controls.TextBoxX, DevComponents.DotNetBar2, Version=1.0.0.0, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04</value>
+  </data>
+  <data name="&gt;&gt;tbxDesc.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;tbxDesc.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
+  <data name="lblDesc.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Left, Right</value>
+  </data>
+  <data name="lblDesc.Location" type="System.Drawing.Point, System.Drawing">
+    <value>12, 41</value>
+  </data>
+  <data name="lblDesc.Size" type="System.Drawing.Size, System.Drawing">
+    <value>232, 22</value>
+  </data>
+  <data name="lblDesc.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name="lblDesc.Text" xml:space="preserve">
+    <value>Description</value>
+  </data>
+  <data name="&gt;&gt;lblDesc.Name" xml:space="preserve">
+    <value>lblDesc</value>
+  </data>
+  <data name="&gt;&gt;lblDesc.Type" xml:space="preserve">
+    <value>DevComponents.DotNetBar.LabelX, DevComponents.DotNetBar2, Version=1.0.0.0, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04</value>
+  </data>
+  <data name="&gt;&gt;lblDesc.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;lblDesc.ZOrder" xml:space="preserve">
+    <value>12</value>
+  </data>
+  <data name="cbFilterName.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Left, Right</value>
+  </data>
+  <data name="cbFilterName.ItemHeight" type="System.Int32, mscorlib">
+    <value>15</value>
+  </data>
+  <data name="cbFilterName.Location" type="System.Drawing.Point, System.Drawing">
+    <value>83, 12</value>
+  </data>
+  <data name="cbFilterName.Size" type="System.Drawing.Size, System.Drawing">
+    <value>161, 21</value>
+  </data>
+  <data name="cbFilterName.TabIndex" type="System.Int32, mscorlib">
+    <value>1</value>
+  </data>
+  <data name="&gt;&gt;cbFilterName.Name" xml:space="preserve">
+    <value>cbFilterName</value>
+  </data>
+  <data name="&gt;&gt;cbFilterName.Type" xml:space="preserve">
+    <value>DevComponents.DotNetBar.Controls.ComboBoxEx, DevComponents.DotNetBar2, Version=1.0.0.0, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04</value>
+  </data>
+  <data name="&gt;&gt;cbFilterName.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;cbFilterName.ZOrder" xml:space="preserve">
+    <value>11</value>
+  </data>
+  <data name="btnNewFilter.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Right</value>
+  </data>
+  <data name="btnNewFilter.Location" type="System.Drawing.Point, System.Drawing">
+    <value>256, 82</value>
+  </data>
+  <data name="btnNewFilter.Size" type="System.Drawing.Size, System.Drawing">
+    <value>65, 23</value>
+  </data>
+  <data name="btnNewFilter.TabIndex" type="System.Int32, mscorlib">
+    <value>3</value>
+  </data>
+  <data name="btnNewFilter.Text" xml:space="preserve">
+    <value>New</value>
+  </data>
+  <data name="&gt;&gt;btnNewFilter.Name" xml:space="preserve">
+    <value>btnNewFilter</value>
+  </data>
+  <data name="&gt;&gt;btnNewFilter.Type" xml:space="preserve">
+    <value>DevComponents.DotNetBar.ButtonX, DevComponents.DotNetBar2, Version=1.0.0.0, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04</value>
+  </data>
+  <data name="&gt;&gt;btnNewFilter.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;btnNewFilter.ZOrder" xml:space="preserve">
+    <value>7</value>
+  </data>
+  <data name="btnDeleteFilter.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Right</value>
+  </data>
+  <data name="btnDeleteFilter.Location" type="System.Drawing.Point, System.Drawing">
+    <value>327, 82</value>
+  </data>
+  <data name="btnDeleteFilter.Size" type="System.Drawing.Size, System.Drawing">
+    <value>65, 23</value>
+  </data>
+  <data name="btnDeleteFilter.TabIndex" type="System.Int32, mscorlib">
+    <value>4</value>
+  </data>
+  <data name="btnDeleteFilter.Text" xml:space="preserve">
+    <value>Delete</value>
+  </data>
+  <data name="&gt;&gt;btnDeleteFilter.Name" xml:space="preserve">
+    <value>btnDeleteFilter</value>
+  </data>
+  <data name="&gt;&gt;btnDeleteFilter.Type" xml:space="preserve">
+    <value>DevComponents.DotNetBar.ButtonX, DevComponents.DotNetBar2, Version=1.0.0.0, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04</value>
+  </data>
+  <data name="&gt;&gt;btnDeleteFilter.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;btnDeleteFilter.ZOrder" xml:space="preserve">
+    <value>13</value>
+  </data>
+  <data name="lblEnterText.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Left, Right</value>
+  </data>
+  <data name="lblEnterText.Location" type="System.Drawing.Point, System.Drawing">
+    <value>12, 115</value>
+  </data>
+  <data name="lblEnterText.Size" type="System.Drawing.Size, System.Drawing">
+    <value>377, 23</value>
+  </data>
+  <data name="lblEnterText.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name="lblEnterText.Text" xml:space="preserve">
+    <value>Enter Custom Expression:</value>
+  </data>
+  <data name="&gt;&gt;lblEnterText.Name" xml:space="preserve">
+    <value>lblEnterText</value>
+  </data>
+  <data name="&gt;&gt;lblEnterText.Type" xml:space="preserve">
+    <value>DevComponents.DotNetBar.LabelX, DevComponents.DotNetBar2, Version=1.0.0.0, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04</value>
+  </data>
+  <data name="&gt;&gt;lblEnterText.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;lblEnterText.ZOrder" xml:space="preserve">
+    <value>3</value>
+  </data>
+  <data name="cbxShowInPopup.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Right</value>
+  </data>
+  <data name="cbxShowInPopup.Location" type="System.Drawing.Point, System.Drawing">
+    <value>259, 12</value>
+  </data>
+  <data name="cbxShowInPopup.Size" type="System.Drawing.Size, System.Drawing">
+    <value>133, 23</value>
+  </data>
+  <data name="cbxShowInPopup.TabIndex" type="System.Int32, mscorlib">
+    <value>5</value>
+  </data>
+  <data name="cbxShowInPopup.Text" xml:space="preserve">
+    <value>Show in FilterPopup</value>
+  </data>
+  <data name="&gt;&gt;cbxShowInPopup.Name" xml:space="preserve">
+    <value>cbxShowInPopup</value>
+  </data>
+  <data name="&gt;&gt;cbxShowInPopup.Type" xml:space="preserve">
+    <value>DevComponents.DotNetBar.Controls.CheckBoxX, DevComponents.DotNetBar2, Version=1.0.0.0, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04</value>
+  </data>
+  <data name="&gt;&gt;cbxShowInPopup.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;cbxShowInPopup.ZOrder" xml:space="preserve">
+    <value>5</value>
+  </data>
+  <data name="btnClear.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Bottom, Left</value>
+  </data>
+  <data name="btnClear.Location" type="System.Drawing.Point, System.Drawing">
+    <value>15, 261</value>
+  </data>
+  <data name="btnClear.Size" type="System.Drawing.Size, System.Drawing">
+    <value>65, 23</value>
+  </data>
+  <data name="btnClear.TabIndex" type="System.Int32, mscorlib">
+    <value>11</value>
+  </data>
+  <data name="btnClear.Text" xml:space="preserve">
+    <value>Clear</value>
+  </data>
+  <data name="&gt;&gt;btnClear.Name" xml:space="preserve">
+    <value>btnClear</value>
+  </data>
+  <data name="&gt;&gt;btnClear.Type" xml:space="preserve">
+    <value>DevComponents.DotNetBar.ButtonX, DevComponents.DotNetBar2, Version=1.0.0.0, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04</value>
+  </data>
+  <data name="&gt;&gt;btnClear.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;btnClear.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="filterExprEdit1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Bottom, Left, Right</value>
+  </data>
+  <data name="filterExprEdit1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>10, 136</value>
+  </data>
+  <data name="filterExprEdit1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>383, 114</value>
+  </data>
+  <data name="filterExprEdit1.TabIndex" type="System.Int32, mscorlib">
+    <value>6</value>
+  </data>
+  <data name="&gt;&gt;filterExprEdit1.Name" xml:space="preserve">
+    <value>filterExprEdit1</value>
+  </data>
+  <data name="&gt;&gt;filterExprEdit1.Type" xml:space="preserve">
+    <value>DevComponents.DotNetBar.SuperGrid.FilterExprEdit, DevComponents.DotNetBar.SuperGrid, Version=2.0.0.0, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04</value>
+  </data>
+  <data name="&gt;&gt;filterExprEdit1.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;filterExprEdit1.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
+    <value>96, 96</value>
+  </data>
+  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
+    <value>401, 292</value>
+  </data>
+  <data name="$this.MinimumSize" type="System.Drawing.Size, System.Drawing">
+    <value>410, 330</value>
+  </data>
+  <data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
+    <value>Manual</value>
+  </data>
+  <data name="&gt;&gt;$this.Name" xml:space="preserve">
+    <value>CustomFilterEx</value>
+  </data>
+  <data name="&gt;&gt;$this.Type" xml:space="preserve">
+    <value>DevComponents.DotNetBar.Office2007Form, DevComponents.DotNetBar2, Version=1.0.0.0, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridFilter/DataFilter.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridFilter/DataFilter.cs
new file mode 100644
index 00000000..e380f7db
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridFilter/DataFilter.cs	
@@ -0,0 +1,416 @@
+using System;
+
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    ///<summary>
+    /// DataBinding helper class
+    ///</summary>
+    internal static class DataFilter
+    {
+        #region Static data
+
+        private static bool _lockFilter;
+
+        #endregion
+
+        ///<summary>
+        /// FilterData
+        ///</summary>
+        ///<param name="panel"></param>
+        internal static void FilterData(GridPanel panel)
+        {
+            if (_lockFilter == true)
+                return;
+
+            if (panel.SuperGrid.DoDataFilteringStartEvent(panel) == false)
+            {
+                _lockFilter = true;
+
+                try
+                {
+                    if (panel.EnableFiltering == true &&
+                        panel.FilterLevel != FilterLevel.None)
+                    {
+                        bool rowFiltered = IsRowFiltered(panel);
+                        bool colFiltered = IsColumnFiltered(panel);
+
+                        if (rowFiltered == true || colFiltered == true)
+                        {
+                            if (rowFiltered == true)
+                                rowFiltered = UpdateRowFilter(panel);
+
+                            if (colFiltered == true)
+                                UpdateColumnFilter(panel);
+
+                            UpdateFilterState(panel, rowFiltered, colFiltered);
+
+                            return;
+                        }
+                    }
+
+                    UpdateFilterState(panel, false, false);
+                }
+                finally
+                {
+                    _lockFilter = false;
+
+                    panel.UpdateVisibleRowCount();
+                    panel.SuperGrid.DoDataFilteringCompleteEvent(panel);
+                }
+            }
+            else
+            {
+                panel.UpdateVisibleRowCount();
+            }
+        }
+
+        #region UpdateRowFilter
+
+        private static bool UpdateRowFilter(GridPanel panel)
+        {
+            if (panel.FilterEval == null)
+            {
+                try
+                {
+                    panel.FilterEval = new FilterEval(
+                        panel, null, panel.GetFilterMatchType(), panel.FilterExpr);
+                }
+                catch
+                {
+                    return (false);
+                }
+            }
+
+            return (true);
+        }
+
+        #endregion
+
+        #region UpdateColumnFilter
+
+        private static void UpdateColumnFilter(GridPanel panel)
+        {
+            foreach (GridColumn col in panel.Columns)
+            {
+                if (col.IsFiltered == true)
+                {
+                    col.FilterError = false;
+
+                    if (col.FilterEval == null)
+                    {
+                        try
+                        {
+                            col.FilterEval = new FilterEval(
+                                panel, col, col.GetFilterMatchType(), col.FilterExpr);
+                        }
+                        catch
+                        {
+                            col.FilterError = true;
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region UpdateFilterState
+
+        private static void UpdateFilterState(
+            GridPanel panel, bool rowFiltered, bool colFiltered)
+        {
+            if (IsFilteringEnabled(panel) == true)
+            {
+                if (panel.VirtualMode == true)
+                {
+                    if (panel.SuperGrid.DoRefreshFilter(panel) == false)
+                    {
+                        panel.VirtualRows.Clear();
+
+                        panel.DataBinder.UpdateFilter();
+                    }
+                }
+                else
+                {
+                    int count = panel.Rows.Count;
+
+                    if (panel.ShowInsertRow == true)
+                        count--;
+
+                    bool root = (panel.FilterLevel &
+                        (FilterLevel.Root | FilterLevel.RootConditional)) != 0;
+
+                    UpdateFilterStateEx(panel, root,
+                        panel.Rows, count, rowFiltered, colFiltered);
+                }
+            }
+        }
+
+        #region UpdateFilterStateEx
+
+        private static void UpdateFilterStateEx(GridPanel panel, bool filter,
+            GridItemsCollection items, int count, bool rowFiltered, bool colFiltered)
+        {
+            for (int i = 0; i < count; i++)
+            {
+                GridRow row = items[i] as GridRow;
+
+                if (row != null)
+                {
+                    if (row.IsTempInsertRow == true)
+                    {
+                        row.IsRowFilteredOut = false;
+                    }
+                    else
+                    {
+                        bool expanded = (panel.FilterLevel & FilterLevel.Expanded) != 0;
+
+                        if (row.Rows.Count > 0)
+                        {
+                            UpdateFilterStateEx(panel, expanded,
+                                row.Rows, row.Rows.Count, rowFiltered, colFiltered);
+                        }
+
+                        bool filteredOut = false;
+
+                        if (filter == true)
+                        {
+                            if ((panel.FilterLevel & FilterLevel.RootConditional) != FilterLevel.RootConditional ||
+                                row.AnyVisibleItems() == false)
+                            {
+                                if (rowFiltered == true)
+                                {
+                                    if (EvalRowFilterState(panel, row, ref filteredOut) == true)
+                                        break;
+                                }
+
+                                if (filteredOut == false && colFiltered == true)
+                                    EvalColumnFilterState(panel, row, ref filteredOut);
+                            }
+                        }
+
+                        row.RowFilteredOut = filteredOut;
+                    }
+                }
+                else
+                {
+                    GridContainer cont = items[i] as GridGroup;
+
+                    if (cont != null)
+                    {
+                        UpdateFilterStateEx(panel,
+                            true, cont.Rows, cont.Rows.Count, rowFiltered, colFiltered);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region EvalRowFilterState
+
+        private static bool EvalRowFilterState(
+            GridPanel panel, GridRow row, ref bool filteredOut)
+        {
+            try
+            {
+                filteredOut = (panel.FilterEval.Evaluate(row) == false);
+            }
+            catch (Exception exp)
+            {
+                filteredOut = false;
+
+                bool throwException = false;
+                bool postError = true;
+
+                if (panel.SuperGrid.DoFilterRowErrorEvent(panel,
+                    row, exp, ref filteredOut, ref throwException, ref postError) == true)
+                {
+                    return (true);
+                }
+
+                if (throwException == true)
+                    throw;
+
+                if (postError == true)
+                    MessageBoxEx.Show(exp.Message);
+
+                return (true);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region EvalColumnFilterState
+
+        private static bool EvalColumnFilterState(
+            GridPanel panel, GridRow row, ref bool filteredOut)
+        {
+            foreach (GridColumn col in panel.Columns)
+            {
+                if (col.IsFiltered == true)
+                {
+                    if (col.FilterError == false)
+                    {
+                        try
+                        {
+                            filteredOut = (col.FilterEval.Evaluate(row) == false);
+                        }
+                        catch (Exception exp)
+                        {
+                            col.FilterError = true;
+
+                            filteredOut = false;
+
+                            bool throwException = false;
+                            bool postError = col.FilterEval.PostError;
+
+                            if (panel.SuperGrid.DoFilterColumnErrorEvent(panel,
+                                row, col, exp, ref filteredOut, ref throwException, ref postError) == true)
+                            {
+                                return (true);
+                            }
+
+                            if (throwException == true)
+                                throw;
+
+                            if (postError == true)
+                                MessageBoxEx.Show((col.Name ?? "[" + col.ColumnIndex + "]") + ":\n" + exp.Message);
+
+                            return (true);
+                        }
+                    }
+                }
+
+                if (filteredOut == true)
+                    break;
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region UpdateRowFilterState
+
+        internal static void UpdateRowFilterState(GridPanel panel, GridRow row)
+        {
+            bool isPrimary = (row.Parent is GridPanel);
+
+            bool root = (panel.FilterLevel &
+                (FilterLevel.Root | FilterLevel.RootConditional)) != 0;
+
+            bool expanded = (panel.FilterLevel & FilterLevel.Expanded) != 0;
+
+            if ((isPrimary == true && root == true) ||
+                (isPrimary == false && expanded == true))
+            {
+                bool filteredOut = false;
+
+                bool rowFiltered = IsRowFiltered(panel);
+                bool colFiltered = IsColumnFiltered(panel);
+
+                if (rowFiltered == true || colFiltered == true)
+                {
+                    if (rowFiltered == true)
+                        rowFiltered = UpdateRowFilter(panel);
+
+                    if (colFiltered == true)
+                        UpdateColumnFilter(panel);
+
+                    if (rowFiltered == true)
+                    {
+                        if (EvalRowFilterState(panel, row, ref filteredOut) == true)
+                            return;
+                    }
+
+                    if (filteredOut == false && colFiltered == true)
+                    {
+                        if (EvalColumnFilterState(panel, row, ref filteredOut) == true)
+                            return;
+                    }
+                }
+
+                if (row.RowFilteredOut != filteredOut)
+                {
+                    row.RowFilteredOut = filteredOut;
+
+                    panel.SuperGrid.NeedToUpdateIndicees = true;
+                }
+            }
+        }
+
+        #endregion
+
+        #region IsFiltered
+
+        internal static bool IsFiltered(GridPanel panel)
+        {
+            return (IsRowFiltered(panel) || IsColumnFiltered(panel));
+        }
+
+        #endregion
+
+        #region IsRowFiltered
+
+        internal static bool IsRowFiltered(GridPanel panel)
+        {
+            return (IsRowFilteringEnabled(panel) &&
+                String.IsNullOrEmpty(panel.FilterExpr) == false);
+        }
+
+        #endregion
+
+        #region IsColumnFiltered
+
+        internal static bool IsColumnFiltered(GridPanel panel)
+        {
+            if (IsColumnFilteringEnabled(panel))
+            {
+                foreach (GridColumn col in panel.Columns)
+                {
+                    if (col.IsFiltered == true)
+                        return (true);
+                }
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region IsFilteringEnabled
+
+        internal static bool IsFilteringEnabled(GridPanel panel)
+        {
+            return (IsRowFilteringEnabled(panel) || IsColumnFilteringEnabled(panel));
+        }
+
+        #endregion
+
+        #region IsRowFilteringEnabled
+
+        internal static bool IsRowFilteringEnabled(GridPanel panel)
+        {
+            return (panel.EnableFiltering == true &&
+                panel.EnableRowFiltering == true);
+        }
+
+        #endregion
+
+        #region IsColumnFilteringEnabled
+
+        internal static bool IsColumnFilteringEnabled(GridPanel panel)
+        {
+            return (panel.EnableFiltering == true &&
+                panel.EnableColumnFiltering == true);
+        }
+
+        #endregion
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridFilter/FilterDateTimePicker.Designer.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridFilter/FilterDateTimePicker.Designer.cs
new file mode 100644
index 00000000..cb0288df
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridFilter/FilterDateTimePicker.Designer.cs	
@@ -0,0 +1,366 @@
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    partial class FilterDateTimePicker
+    {
+        /// <summary> 
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #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()
+        {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FilterDateTimePicker));
+            this.cboDateRelative = new DevComponents.DotNetBar.Controls.ComboBoxEx();
+            this.btnApply = new DevComponents.DotNetBar.ButtonX();
+            this.btnCustom = new DevComponents.DotNetBar.ButtonX();
+            this.cbxDateRelative = new DevComponents.DotNetBar.Controls.CheckBoxX();
+            this.cbxDateRange = new DevComponents.DotNetBar.Controls.CheckBoxX();
+            this.cbxShowAll = new DevComponents.DotNetBar.Controls.CheckBoxX();
+            this.cbxShowNull = new DevComponents.DotNetBar.Controls.CheckBoxX();
+            this.cbxShowNotNull = new DevComponents.DotNetBar.Controls.CheckBoxX();
+            this.btnOk = new DevComponents.DotNetBar.ButtonX();
+            this.btnCancel = new DevComponents.DotNetBar.ButtonX();
+            this.dtiFromDate = new DevComponents.Editors.DateTimeAdv.DateTimeInput();
+            this.dtiToDate = new DevComponents.Editors.DateTimeAdv.DateTimeInput();
+            this.cbxDateSpecific = new DevComponents.DotNetBar.Controls.CheckBoxX();
+            this.dtiSpecificDate = new DevComponents.Editors.DateTimeAdv.DateTimeInput();
+            this.cbxCustom = new DevComponents.DotNetBar.Controls.CheckBoxX();
+            ((System.ComponentModel.ISupportInitialize)(this.dtiFromDate)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dtiToDate)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dtiSpecificDate)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // cboDateRelative
+            // 
+            resources.ApplyResources(this.cboDateRelative, "cboDateRelative");
+            this.cboDateRelative.DisplayMember = "Text";
+            this.cboDateRelative.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed;
+            this.cboDateRelative.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cboDateRelative.FormattingEnabled = true;
+            this.cboDateRelative.Name = "cboDateRelative";
+            this.cboDateRelative.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.cboDateRelative.MouseDown += new System.Windows.Forms.MouseEventHandler(this.CboDateRelativeMouseDown);
+            // 
+            // btnApply
+            // 
+            this.btnApply.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+            resources.ApplyResources(this.btnApply, "btnApply");
+            this.btnApply.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+            this.btnApply.Name = "btnApply";
+            this.btnApply.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.btnApply.Click += new System.EventHandler(this.BtnApplyClick);
+            // 
+            // btnCustom
+            // 
+            this.btnCustom.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+            resources.ApplyResources(this.btnCustom, "btnCustom");
+            this.btnCustom.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+            this.btnCustom.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+            this.btnCustom.Name = "btnCustom";
+            this.btnCustom.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.btnCustom.Click += new System.EventHandler(this.BtnCustomClick);
+            // 
+            // cbxDateRelative
+            // 
+            resources.ApplyResources(this.cbxDateRelative, "cbxDateRelative");
+            // 
+            // 
+            // 
+            this.cbxDateRelative.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.cbxDateRelative.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton;
+            this.cbxDateRelative.Name = "cbxDateRelative";
+            this.cbxDateRelative.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            // 
+            // cbxDateRange
+            // 
+            resources.ApplyResources(this.cbxDateRange, "cbxDateRange");
+            // 
+            // 
+            // 
+            this.cbxDateRange.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.cbxDateRange.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton;
+            this.cbxDateRange.Name = "cbxDateRange";
+            this.cbxDateRange.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            // 
+            // cbxShowAll
+            // 
+            // 
+            // 
+            // 
+            this.cbxShowAll.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.cbxShowAll.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton;
+            this.cbxShowAll.Checked = true;
+            this.cbxShowAll.CheckState = System.Windows.Forms.CheckState.Checked;
+            this.cbxShowAll.CheckValue = "Y";
+            resources.ApplyResources(this.cbxShowAll, "cbxShowAll");
+            this.cbxShowAll.Name = "cbxShowAll";
+            this.cbxShowAll.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            // 
+            // cbxShowNull
+            // 
+            resources.ApplyResources(this.cbxShowNull, "cbxShowNull");
+            // 
+            // 
+            // 
+            this.cbxShowNull.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.cbxShowNull.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton;
+            this.cbxShowNull.Name = "cbxShowNull";
+            this.cbxShowNull.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            // 
+            // cbxShowNotNull
+            // 
+            resources.ApplyResources(this.cbxShowNotNull, "cbxShowNotNull");
+            // 
+            // 
+            // 
+            this.cbxShowNotNull.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.cbxShowNotNull.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton;
+            this.cbxShowNotNull.Name = "cbxShowNotNull";
+            this.cbxShowNotNull.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            // 
+            // btnOk
+            // 
+            this.btnOk.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+            resources.ApplyResources(this.btnOk, "btnOk");
+            this.btnOk.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+            this.btnOk.Name = "btnOk";
+            this.btnOk.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.btnOk.Click += new System.EventHandler(this.BtnOkClick);
+            // 
+            // btnCancel
+            // 
+            this.btnCancel.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+            resources.ApplyResources(this.btnCancel, "btnCancel");
+            this.btnCancel.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+            this.btnCancel.Name = "btnCancel";
+            this.btnCancel.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.btnCancel.Click += new System.EventHandler(this.BtnCancelClick);
+            // 
+            // dtiFromDate
+            // 
+            this.dtiFromDate.AllowEmptyState = false;
+            resources.ApplyResources(this.dtiFromDate, "dtiFromDate");
+            // 
+            // 
+            // 
+            this.dtiFromDate.BackgroundStyle.Class = "DateTimeInputBackground";
+            this.dtiFromDate.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.dtiFromDate.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown;
+            this.dtiFromDate.ButtonDropDown.Visible = true;
+            this.dtiFromDate.Format = DevComponents.Editors.eDateTimePickerFormat.Long;
+            this.dtiFromDate.IsPopupCalendarOpen = false;
+            // 
+            // 
+            // 
+            // 
+            // 
+            // 
+            this.dtiFromDate.MonthCalendar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.dtiFromDate.MonthCalendar.CalendarDimensions = new System.Drawing.Size(1, 1);
+            this.dtiFromDate.MonthCalendar.ClearButtonVisible = true;
+            // 
+            // 
+            // 
+            this.dtiFromDate.MonthCalendar.CommandsBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground2;
+            this.dtiFromDate.MonthCalendar.CommandsBackgroundStyle.BackColorGradientAngle = 90;
+            this.dtiFromDate.MonthCalendar.CommandsBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground;
+            this.dtiFromDate.MonthCalendar.CommandsBackgroundStyle.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            this.dtiFromDate.MonthCalendar.CommandsBackgroundStyle.BorderTopColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder;
+            this.dtiFromDate.MonthCalendar.CommandsBackgroundStyle.BorderTopWidth = 1;
+            this.dtiFromDate.MonthCalendar.CommandsBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.dtiFromDate.MonthCalendar.DisplayMonth = new System.DateTime(2012, 5, 1, 0, 0, 0, 0);
+            // 
+            // 
+            // 
+            this.dtiFromDate.MonthCalendar.NavigationBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
+            this.dtiFromDate.MonthCalendar.NavigationBackgroundStyle.BackColorGradientAngle = 90;
+            this.dtiFromDate.MonthCalendar.NavigationBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
+            this.dtiFromDate.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.dtiFromDate.MonthCalendar.TodayButtonVisible = true;
+            this.dtiFromDate.Name = "dtiFromDate";
+            this.dtiFromDate.ShowUpDown = true;
+            this.dtiFromDate.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.dtiFromDate.MouseDown += new System.Windows.Forms.MouseEventHandler(this.DtiDateRangeMouseDown);
+            // 
+            // dtiToDate
+            // 
+            this.dtiToDate.AllowEmptyState = false;
+            resources.ApplyResources(this.dtiToDate, "dtiToDate");
+            // 
+            // 
+            // 
+            this.dtiToDate.BackgroundStyle.Class = "DateTimeInputBackground";
+            this.dtiToDate.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.dtiToDate.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown;
+            this.dtiToDate.ButtonDropDown.Visible = true;
+            this.dtiToDate.Format = DevComponents.Editors.eDateTimePickerFormat.Long;
+            this.dtiToDate.IsPopupCalendarOpen = false;
+            // 
+            // 
+            // 
+            // 
+            // 
+            // 
+            this.dtiToDate.MonthCalendar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.dtiToDate.MonthCalendar.CalendarDimensions = new System.Drawing.Size(1, 1);
+            this.dtiToDate.MonthCalendar.ClearButtonVisible = true;
+            // 
+            // 
+            // 
+            this.dtiToDate.MonthCalendar.CommandsBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground2;
+            this.dtiToDate.MonthCalendar.CommandsBackgroundStyle.BackColorGradientAngle = 90;
+            this.dtiToDate.MonthCalendar.CommandsBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground;
+            this.dtiToDate.MonthCalendar.CommandsBackgroundStyle.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            this.dtiToDate.MonthCalendar.CommandsBackgroundStyle.BorderTopColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder;
+            this.dtiToDate.MonthCalendar.CommandsBackgroundStyle.BorderTopWidth = 1;
+            this.dtiToDate.MonthCalendar.CommandsBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.dtiToDate.MonthCalendar.DisplayMonth = new System.DateTime(2012, 5, 1, 0, 0, 0, 0);
+            // 
+            // 
+            // 
+            this.dtiToDate.MonthCalendar.NavigationBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
+            this.dtiToDate.MonthCalendar.NavigationBackgroundStyle.BackColorGradientAngle = 90;
+            this.dtiToDate.MonthCalendar.NavigationBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
+            this.dtiToDate.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.dtiToDate.MonthCalendar.TodayButtonVisible = true;
+            this.dtiToDate.Name = "dtiToDate";
+            this.dtiToDate.ShowUpDown = true;
+            this.dtiToDate.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.dtiToDate.MouseDown += new System.Windows.Forms.MouseEventHandler(this.DtiDateRangeMouseDown);
+            // 
+            // cbxDateSpecific
+            // 
+            resources.ApplyResources(this.cbxDateSpecific, "cbxDateSpecific");
+            // 
+            // 
+            // 
+            this.cbxDateSpecific.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.cbxDateSpecific.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton;
+            this.cbxDateSpecific.Name = "cbxDateSpecific";
+            this.cbxDateSpecific.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            // 
+            // dtiSpecificDate
+            // 
+            this.dtiSpecificDate.AllowEmptyState = false;
+            resources.ApplyResources(this.dtiSpecificDate, "dtiSpecificDate");
+            this.dtiSpecificDate.AutoSelectDate = true;
+            // 
+            // 
+            // 
+            this.dtiSpecificDate.BackgroundStyle.Class = "DateTimeInputBackground";
+            this.dtiSpecificDate.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.dtiSpecificDate.ButtonDropDown.Shortcut = DevComponents.DotNetBar.eShortcut.AltDown;
+            this.dtiSpecificDate.ButtonDropDown.Visible = true;
+            this.dtiSpecificDate.Format = DevComponents.Editors.eDateTimePickerFormat.Long;
+            this.dtiSpecificDate.IsPopupCalendarOpen = false;
+            // 
+            // 
+            // 
+            // 
+            // 
+            // 
+            this.dtiSpecificDate.MonthCalendar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.dtiSpecificDate.MonthCalendar.CalendarDimensions = new System.Drawing.Size(1, 1);
+            this.dtiSpecificDate.MonthCalendar.ClearButtonVisible = true;
+            // 
+            // 
+            // 
+            this.dtiSpecificDate.MonthCalendar.CommandsBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground2;
+            this.dtiSpecificDate.MonthCalendar.CommandsBackgroundStyle.BackColorGradientAngle = 90;
+            this.dtiSpecificDate.MonthCalendar.CommandsBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground;
+            this.dtiSpecificDate.MonthCalendar.CommandsBackgroundStyle.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            this.dtiSpecificDate.MonthCalendar.CommandsBackgroundStyle.BorderTopColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder;
+            this.dtiSpecificDate.MonthCalendar.CommandsBackgroundStyle.BorderTopWidth = 1;
+            this.dtiSpecificDate.MonthCalendar.CommandsBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.dtiSpecificDate.MonthCalendar.DisplayMonth = new System.DateTime(2012, 5, 1, 0, 0, 0, 0);
+            // 
+            // 
+            // 
+            this.dtiSpecificDate.MonthCalendar.NavigationBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
+            this.dtiSpecificDate.MonthCalendar.NavigationBackgroundStyle.BackColorGradientAngle = 90;
+            this.dtiSpecificDate.MonthCalendar.NavigationBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
+            this.dtiSpecificDate.MonthCalendar.NavigationBackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.dtiSpecificDate.MonthCalendar.TodayButtonVisible = true;
+            this.dtiSpecificDate.Name = "dtiSpecificDate";
+            this.dtiSpecificDate.ShowUpDown = true;
+            this.dtiSpecificDate.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.dtiSpecificDate.MouseDown += new System.Windows.Forms.MouseEventHandler(this.DtiSpecificDateMouseDown);
+            // 
+            // cbxCustom
+            // 
+            resources.ApplyResources(this.cbxCustom, "cbxCustom");
+            // 
+            // 
+            // 
+            this.cbxCustom.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.cbxCustom.CheckBoxStyle = DevComponents.DotNetBar.eCheckBoxStyle.RadioButton;
+            this.cbxCustom.Name = "cbxCustom";
+            this.cbxCustom.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            // 
+            // FilterDateTimePicker
+            // 
+            resources.ApplyResources(this, "$this");
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+            this.Controls.Add(this.dtiToDate);
+            this.Controls.Add(this.dtiFromDate);
+            this.Controls.Add(this.dtiSpecificDate);
+            this.Controls.Add(this.btnCancel);
+            this.Controls.Add(this.btnOk);
+            this.Controls.Add(this.cbxShowNotNull);
+            this.Controls.Add(this.cbxShowNull);
+            this.Controls.Add(this.cboDateRelative);
+            this.Controls.Add(this.btnApply);
+            this.Controls.Add(this.btnCustom);
+            this.Controls.Add(this.cbxCustom);
+            this.Controls.Add(this.cbxDateSpecific);
+            this.Controls.Add(this.cbxDateRelative);
+            this.Controls.Add(this.cbxDateRange);
+            this.Controls.Add(this.cbxShowAll);
+            this.DoubleBuffered = true;
+            this.MinimumSize = new System.Drawing.Size(258, 340);
+            this.Name = "FilterDateTimePicker";
+            ((System.ComponentModel.ISupportInitialize)(this.dtiFromDate)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dtiToDate)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dtiSpecificDate)).EndInit();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private DevComponents.DotNetBar.Controls.CheckBoxX cbxShowAll;
+        private DevComponents.DotNetBar.Controls.CheckBoxX cbxDateRange;
+        private DevComponents.DotNetBar.Controls.CheckBoxX cbxDateRelative;
+        private ButtonX btnCustom;
+        private DevComponents.DotNetBar.Controls.ComboBoxEx cboDateRelative;
+        private DevComponents.DotNetBar.Controls.CheckBoxX cbxShowNull;
+        private DevComponents.DotNetBar.Controls.CheckBoxX cbxShowNotNull;
+        private ButtonX btnOk;
+        private ButtonX btnCancel;
+        internal ButtonX btnApply;
+        private DevComponents.Editors.DateTimeAdv.DateTimeInput dtiFromDate;
+        private DevComponents.Editors.DateTimeAdv.DateTimeInput dtiToDate;
+        private DevComponents.DotNetBar.Controls.CheckBoxX cbxDateSpecific;
+        private DevComponents.Editors.DateTimeAdv.DateTimeInput dtiSpecificDate;
+        private DevComponents.DotNetBar.Controls.CheckBoxX cbxCustom;
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridFilter/FilterDateTimePicker.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridFilter/FilterDateTimePicker.cs
new file mode 100644
index 00000000..073ca1b4
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridFilter/FilterDateTimePicker.cs	
@@ -0,0 +1,769 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.SuperGrid.Style;
+
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    ///<summary>
+    /// FilterDateTimePicker
+    ///</summary>
+    [ToolboxItem(false)]
+    public partial class FilterDateTimePicker : UserControl
+    {
+        #region Events
+
+        #region ValueChanged
+
+        /// <summary>
+        /// Occurs when the DateTimePicker value has changed
+        /// </summary>
+        [Description("Occurs when the DateTimePicker value has changed.")]
+        public event EventHandler<EventArgs> ValueChanged;
+
+        #endregion
+
+        #endregion
+
+        #region Static data
+
+        private static bool _localizedStringsLoaded;
+
+        private static string _filterByRelativeDateString = "Filter by relative date";
+        private static string _filterBySpecificDateString = "Filter by specific date";
+        private static string _filterByDateRangeString = "Filter by date range";
+
+        private static string _currentMonth = "Current month";
+        private static string _currentYear = "Current year";
+
+        private static string _lastMonthPeriod = "Last month period";
+        private static string _last3MonthPeriod = "Last 3 month period";
+        private static string _last6MonthPeriod = "Last 6 month period";
+        private static string _last9MonthPeriod = "Last 9 month period";
+
+        private static string _lastYear = "Last Year";
+        private static string _last5YearPeriod = "Last 5 year period";
+        private static string _last10YearPeriod = "Last 10 year period";
+
+        #endregion
+
+        #region Private variables
+
+        private GridColumn _GridColumn;
+        private string _CustomExpr;
+        private bool _Cancel;
+
+        #endregion
+
+        /// <summary>
+        /// FilterDateTimePicker
+        /// </summary>
+        /// <param name="gridColumn"></param>
+        public FilterDateTimePicker(GridColumn gridColumn)
+        {
+            InitializeComponent();
+
+            SuperGridControl sg = gridColumn.SuperGrid;
+
+            LoadLocalizedStrings(sg);
+
+            cbxShowAll.Text = sg.FilterShowAllString;
+            cbxShowNull.Text = sg.FilterShowNullString;
+            cbxShowNotNull.Text = sg.FilterShowNotNullString;
+
+            if (string.IsNullOrEmpty(cbxShowNull.Text) == true)
+                cbxShowNull.Visible = false;
+
+            if (string.IsNullOrEmpty(cbxShowNotNull.Text) == true)
+                cbxShowNotNull.Visible = false;
+
+            if (cbxShowNull.Visible == false || cbxShowNotNull.Visible == false)
+            {
+                int y = (cbxDateRelative.Location.Y - cbxShowAll.Size.Height) / 2;
+
+                cbxShowAll.Location = new Point(cbxShowAll.Location.X, y);
+
+                if (cbxShowNull.Visible == true)
+                    cbxShowNull.Location = new Point(cbxShowNull.Location.X, y);
+
+                if (cbxShowNotNull.Visible == true)
+                    cbxShowNotNull.Location = new Point(cbxShowNotNull.Location.X, y);
+            }
+
+            btnApply.Text = sg.FilterApplyString;
+
+            if (sg.FilterCustomString != null)
+            {
+                cbxCustom.Text = sg.FilterCustomString;
+                btnCustom.Text = sg.FilterCustomString + "...";
+            }
+            else
+            {
+                cbxCustom.Visible = false;
+                btnCustom.Visible = false;
+            }
+
+            cbxDateRelative.Text = _filterByRelativeDateString;
+            cbxDateSpecific.Text = _filterBySpecificDateString;
+            cbxDateRange.Text = _filterByDateRangeString;
+
+            cboDateRelative.Items.Add(CurrentMonth);
+            cboDateRelative.Items.Add(CurrentYear);
+            cboDateRelative.Items.Add(LastMonthPeriod);
+            cboDateRelative.Items.Add(Last3MonthPeriod);
+            cboDateRelative.Items.Add(Last6MonthPeriod);
+            cboDateRelative.Items.Add(Last9MonthPeriod);
+            cboDateRelative.Items.Add(LastYear);
+            cboDateRelative.Items.Add(Last5YearPeriod);
+            cboDateRelative.Items.Add(Last10YearPeriod);
+
+            cboDateRelative.SelectedIndex = 0;
+
+            _GridColumn = gridColumn;
+
+            FilterColumnHeaderVisualStyle style = _GridColumn.GetFilterStyle(StyleType.Default);
+
+            Font = style.Font;
+            BackColor = style.Background.Color1;
+
+            Cancel = false;
+        }
+
+        #region Public properties
+
+        #region AcceptButton
+
+        ///<summary>
+        /// AcceptButton
+        ///</summary>
+        public IButtonControl AcceptButton
+        {
+            get { return (btnApply); }
+        }
+
+        #endregion
+
+        #region Cancel
+
+        ///<summary>
+        /// Cancel
+        ///</summary>
+        public bool Cancel
+        {
+            get { return (_Cancel); }
+            set { _Cancel = value; }
+        }
+
+        #endregion
+
+        #region CurrentMonth
+
+        ///<summary>
+        /// CurrentMonth
+        ///</summary>
+        [Localizable(true)]
+        public string CurrentMonth
+        {
+            get { return (_currentMonth); }
+            set { _currentMonth = value; }
+        }
+
+        #endregion
+
+        #region CurrentYear
+
+        ///<summary>
+        /// CurrentYear
+        ///</summary>
+        [Localizable(true)]
+        public string CurrentYear
+        {
+            get { return (_currentYear); }
+            set { _currentYear = value; }
+        }
+
+        #endregion
+
+        #region CustomFilter
+
+        ///<summary>
+        /// CustomFilter
+        ///</summary>
+        [Localizable(true)]
+        public string CustomFilter
+        {
+            get { return ("Custom Filter"); }
+        }
+
+        #endregion
+
+        #region LastMonthPeriod
+
+        ///<summary>
+        /// LastMonthPeriod
+        ///</summary>
+        [Localizable(true)]
+        public string LastMonthPeriod
+        {
+            get { return (_lastMonthPeriod); }
+            set { _lastMonthPeriod = value; }
+        }
+
+        #endregion
+
+        #region Last3MonthPeriod
+
+        ///<summary>
+        /// Last3MonthPeriod
+        ///</summary>
+        [Localizable(true)]
+        public string Last3MonthPeriod
+        {
+            get { return (_last3MonthPeriod); }
+            set { _last3MonthPeriod = value; }
+        }
+
+        #endregion
+
+        #region Last6MonthPeriod
+
+        ///<summary>
+        /// Last6MonthPeriod
+        ///</summary>
+        [Localizable(true)]
+        public string Last6MonthPeriod
+        {
+            get { return (_last6MonthPeriod); }
+            set { _last6MonthPeriod = value; }
+        }
+
+        #endregion
+
+        #region Last9MonthPeriod
+
+        ///<summary>
+        /// Last9MonthPeriod
+        ///</summary>
+        [Localizable(true)]
+        public string Last9MonthPeriod
+        {
+            get { return (_last9MonthPeriod); }
+            set { _last9MonthPeriod = value; }
+        }
+
+        #endregion
+
+        #region LastYear
+
+        ///<summary>
+        /// LastYear
+        ///</summary>
+        [Localizable(true)]
+        public string LastYear
+        {
+            get { return (_lastYear); }
+            set { _lastYear = value; }
+        }
+
+        #endregion
+
+        #region Last5YearPeriod
+
+        ///<summary>
+        /// Last5YearPeriod
+        ///</summary>
+        [Localizable(true)]
+        public string Last5YearPeriod
+        {
+            get { return (_last5YearPeriod); }
+            set { _last5YearPeriod = value; }
+        }
+
+        #endregion
+
+        #region Last10YearPeriod
+
+        ///<summary>
+        /// Last10YearPeriod
+        ///</summary>
+        [Localizable(true)]
+        public string Last10YearPeriod
+        {
+            get { return (_last10YearPeriod); }
+            set { _last10YearPeriod = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetFilterExpr
+
+        /// <summary>
+        /// GetFilterExpr
+        /// </summary>
+        /// <returns></returns>
+        public string GetFilterExpr()
+        {
+            if (cbxCustom.Checked == true)
+                return (_CustomExpr);
+
+            if (cbxDateSpecific.Checked == true)
+                return (DateSpecificExpr);
+
+            if (cbxDateRange.Checked == true)
+                return (DateRangeExpr);
+
+            if (cbxDateRelative.Checked == true)
+                return (DateRelativeExpr);
+
+            if (cbxShowNull.Checked == true)
+                return (ShowNullExpr);
+
+            if (cbxShowNotNull.Checked == true)
+                return (ShowNotNullExpr);
+
+            return (null);
+        }
+
+        #region ShowNullExpr
+
+        private string ShowNullExpr
+        {
+            get { return ("[" + _GridColumn.Name + "] = null"); }
+        }
+
+        #endregion
+
+        #region ShowNotNullExpr
+
+        private string ShowNotNullExpr
+        {
+            get { return ("[" + _GridColumn.Name + "] != null"); }
+        }
+
+        #endregion
+
+        #region DateSpecificExpr
+
+        private string DateSpecificExpr
+        {
+            get { return ("Date([" + _GridColumn.Name +"]) = Date(#" +
+                dtiSpecificDate.Value.Date.ToShortDateString() + "#)"); }
+            }
+
+        #endregion
+
+        #region DateRangeExpr
+
+        private string DateRangeExpr
+        {
+            get
+            {
+                return ("Date([" +
+                    _GridColumn.Name + "]) >= #" + dtiFromDate.Value.ToShortDateString() + "# And Date([" +
+                    _GridColumn.Name + "]) <= #" + dtiToDate.Value.ToShortDateString() + "#");
+            }
+        }
+
+        #endregion
+
+        #region DateRelativeExpr
+
+        private string DateRelativeExpr
+        {
+            get
+            {
+                string cname = "[" + _GridColumn.Name + "]";
+
+                switch (cboDateRelative.SelectedIndex)
+                {
+                    case (int)RelativeFilter.CurrentMonth:
+                        return (CurrentMonthExpr(cname));
+
+                    case (int)RelativeFilter.CurrentYear:
+                        return (CurrentYearExpr(cname));
+
+                    case (int)RelativeFilter.LastMonthPeriod:
+                        return (LastMonthExpr(cname, 1));
+
+                    case (int)RelativeFilter.Last3MonthPeriod:
+                        return (LastMonthExpr(cname, 3));
+
+                    case (int)RelativeFilter.Last6MonthPeriod:
+                        return (LastMonthExpr(cname, 6));
+
+                    case (int)RelativeFilter.Last9MonthPeriod:
+                        return (LastMonthExpr(cname, 9));
+
+                    case (int) RelativeFilter.LastYear:
+                        return (LastYearExpr(cname, 1));
+
+                    case (int)RelativeFilter.Last5YearPeriod:
+                        return (LastYearExpr(cname, 5));
+
+                    case (int)RelativeFilter.Last10YearPeriod:
+                        return (LastYearExpr(cname, 10));
+                }
+
+                return (null);
+            }
+        }
+
+        #region CurrentMonthExpr
+
+        private string CurrentMonthExpr(string cname)
+        {
+            string s = String.Format(
+                "Year({0}) = Year() And Month({0}) = Month()", cname);
+
+           return (s);
+       }
+
+        #endregion
+
+        #region LastMonthExpr
+
+        private string LastMonthExpr(string cname, int span)
+        {
+            string s = String.Format(
+                "Date({0}) Is Between " +
+                "FirstOfMonth(AddMonths(Date(), {1})) And " +
+                "EndOfMonth(Date())", cname, -span);
+
+            return (s);
+        }
+
+       #endregion
+
+        #region CurrentYearExpr
+
+        private string CurrentYearExpr(string cname)
+        {
+            string s = String.Format(
+                "Year({0}) = Year()", cname);
+
+            return (s);
+        }
+
+        #endregion
+
+        #region LastYearExpr
+
+        private string LastYearExpr(string cname, int span)
+        {
+            string s = String.Format(
+                "Year({0}) Is Between " +
+                "Year(AddYears(Date(), {1})) And " +
+                "Year()", cname, -span);
+
+            return (s);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region ProcessTabKey
+
+        /// <summary>
+        /// ProcessTabKey
+        /// </summary>
+        /// <param name="forward"></param>
+        /// <returns></returns>
+        protected override bool ProcessTabKey(bool forward)
+        {
+            return (SelectNextControl(ActiveControl, forward, false, false, true));
+        }
+
+        #endregion
+
+        #region ProcessDialogKey
+
+        /// <summary>
+        /// ProcessDialogKey
+        /// </summary>
+        /// <param name="keyData"></param>
+        /// <returns></returns>
+        protected override bool ProcessDialogKey(Keys keyData)
+        {
+            if (keyData == Keys.Escape)
+                Cancel = true;
+
+            else if (keyData == Keys.Enter)
+                OnValueChanged();
+
+            return base.ProcessDialogKey(keyData);
+        }
+
+        #endregion
+
+        #region BtnCustomClick
+
+        private void BtnCustomClick(object sender, EventArgs e)
+        {
+            cbxCustom.Checked = true;
+
+            bool ok = LaunchCustomDialog(_CustomExpr);
+
+            _GridColumn.SuperGrid.Focus();
+
+            if (ok == true)
+                OnValueChanged();
+        }
+
+        #region LaunchCustomDialog
+
+        private bool LaunchCustomDialog(string filterExpr)
+        {
+            GridPanel panel = _GridColumn.GridPanel;
+
+            if (panel.SuperGrid.FilterUseExtendedCustomDialog == true)
+            {
+                CustomFilterEx cf = new CustomFilterEx(panel, _GridColumn, filterExpr);
+
+                cf.Text = "'" + _GridColumn.Name + "'" + CustomFilter;
+                cf.ShowInPopupVisible = false;
+
+                DialogResult dr = cf.ShowDialog();
+
+                if (dr == DialogResult.OK)
+                {
+                    _CustomExpr = cf.FilterExpr;
+
+                    return (true);
+                }
+            }
+            else
+            {
+                CustomFilter cf = new CustomFilter(panel, _GridColumn, filterExpr);
+
+                cf.Text = "'" + _GridColumn.Name + "'" + CustomFilter;
+
+                DialogResult dr = cf.ShowDialog();
+
+                if (dr == DialogResult.OK)
+                {
+                    _CustomExpr = cf.FilterExpr;
+
+                    return (true);
+                }
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region BtnApplyClick
+
+        private void BtnApplyClick(object sender, EventArgs e)
+        {
+            OnValueChanged();
+        }
+
+        #endregion
+
+        #region BtnOkClick
+
+        private void BtnOkClick(object sender, EventArgs e)
+        {
+            OnClose();
+        }
+
+        #endregion
+
+        #region BtnCancelClick
+
+        private void BtnCancelClick(object sender, EventArgs e)
+        {
+            OnCancel();
+        }
+
+        #endregion
+
+        #region OnValueChanged
+
+        private void OnValueChanged()
+        {
+            Parent.Invalidate();
+
+            if (ValueChanged != null)
+                ValueChanged(this, EventArgs.Empty);
+        }
+
+        #endregion
+
+        #region OnClose
+
+        private void OnClose()
+        {
+            OnValueChanged();
+
+            PopupDropDown pdd = Parent as PopupDropDown;
+
+            if (pdd != null)
+                pdd.Hide();
+        }
+
+        #endregion
+
+        #region OnCancel
+
+        private void OnCancel()
+        {
+            _Cancel = true;
+
+            PopupDropDown pdd = Parent as PopupDropDown;
+
+            if (pdd != null)
+                pdd.Hide();
+        }
+
+        #endregion
+
+        #region DtiSpecificDateMouseDown
+
+        private void DtiSpecificDateMouseDown(object sender, MouseEventArgs e)
+        {
+            cbxDateSpecific.Checked = true;
+        }
+
+        #endregion
+
+        #region DtiDateRangeMouseDown
+
+        private void DtiDateRangeMouseDown(object sender, MouseEventArgs e)
+        {
+            cbxDateRange.Checked = true;
+        }
+
+        #endregion
+
+        #region CboDateRelativeMouseDown
+
+        private void CboDateRelativeMouseDown(object sender, MouseEventArgs e)
+        {
+            cbxDateRelative.Checked = true;
+        }
+
+        #endregion
+
+        #region LoadLocalizedStrings
+
+        private void LoadLocalizedStrings(SuperGridControl sg)
+        {
+            if (_localizedStringsLoaded == false)
+            {
+                using (LocalizationManager lm = new LocalizationManager(sg))
+                {
+                    string s;
+
+                    if ((s = lm.GetLocalizedString(LocalizationKeys.SuperGridFilterByRelativeDate)) != "")
+                        _filterByRelativeDateString = s;
+
+                    if ((s = lm.GetLocalizedString(LocalizationKeys.SuperGridFilterBySpecificDate)) != "")
+                        _filterBySpecificDateString = s;
+
+                    if ((s = lm.GetLocalizedString(LocalizationKeys.SuperGridFilterByDateRange)) != "")
+                        _filterByDateRangeString = s;
+
+                    if ((s = lm.GetLocalizedString(LocalizationKeys.SuperGridFilterCurrentMonth)) != "")
+                        _currentMonth = s;
+
+                    if ((s = lm.GetLocalizedString(LocalizationKeys.SuperGridFilterCurrentYear)) != "")
+                        _currentYear = s;
+
+                    if ((s = lm.GetLocalizedString(LocalizationKeys.SuperGridFilterLastMonthPeriod)) != "")
+                        _lastMonthPeriod = s;
+
+                    if ((s = lm.GetLocalizedString(LocalizationKeys.SuperGridFilterLast3MonthPeriod)) != "")
+                        _last3MonthPeriod = s;
+
+                    if ((s = lm.GetLocalizedString(LocalizationKeys.SuperGridFilterLast6MonthPeriod)) != "")
+                        _last6MonthPeriod = s;
+
+                    if ((s = lm.GetLocalizedString(LocalizationKeys.SuperGridFilterLast9MonthPeriod)) != "")
+                        _last9MonthPeriod = s;
+
+                    if ((s = lm.GetLocalizedString(LocalizationKeys.SuperGridFilterLastYear)) != "")
+                        _lastYear = s;
+
+                    if ((s = lm.GetLocalizedString(LocalizationKeys.SuperGridFilterLast5YearPeriod)) != "")
+                        _last5YearPeriod = s;
+
+                    if ((s = lm.GetLocalizedString(LocalizationKeys.SuperGridFilterLast10YearPeriod)) != "")
+                        _last10YearPeriod = s;
+                }
+
+                _localizedStringsLoaded = true;
+            }
+        }
+
+        #endregion
+    }
+
+    #region enums
+
+    #region RelativeFilter
+
+    /// <summary>
+    /// RelativeFilter
+    /// </summary>
+    public enum RelativeFilter
+    {
+        /// <summary>
+        /// CurrentMonth
+        /// </summary>
+        CurrentMonth,
+
+        /// <summary>
+        /// CurrentYear
+        /// </summary>
+        CurrentYear,
+
+        /// <summary>
+        /// LastMonthPeriod
+        /// </summary>
+        LastMonthPeriod,
+
+        /// <summary>
+        /// Last3MonthPeriod
+        /// </summary>
+        Last3MonthPeriod,
+
+        /// <summary>
+        /// Last6MonthPeriod
+        /// </summary>
+        Last6MonthPeriod,
+
+        /// <summary>
+        /// Last9MonthPeriod
+        /// </summary>
+        Last9MonthPeriod,
+
+        /// <summary>
+        /// LastYear,
+        /// </summary>
+        LastYear,
+
+        /// <summary>
+        /// Last5YearPeriod
+        /// </summary>
+        Last5YearPeriod,
+
+        /// <summary>
+        /// Last10YearPeriod
+        /// </summary>
+        Last10YearPeriod,
+    }
+
+    #endregion
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridFilter/FilterDateTimePicker.resx b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridFilter/FilterDateTimePicker.resx
new file mode 100644
index 00000000..e101bb32
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridFilter/FilterDateTimePicker.resx	
@@ -0,0 +1,531 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="cboDateRelative.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Left, Right</value>
+  </data>
+  <assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="cboDateRelative.ItemHeight" type="System.Int32, mscorlib">
+    <value>15</value>
+  </data>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="cboDateRelative.Location" type="System.Drawing.Point, System.Drawing">
+    <value>25, 77</value>
+  </data>
+  <data name="cboDateRelative.Size" type="System.Drawing.Size, System.Drawing">
+    <value>219, 21</value>
+  </data>
+  <data name="cboDateRelative.TabIndex" type="System.Int32, mscorlib">
+    <value>4</value>
+  </data>
+  <data name="&gt;&gt;cboDateRelative.Name" xml:space="preserve">
+    <value>cboDateRelative</value>
+  </data>
+  <data name="&gt;&gt;cboDateRelative.Type" xml:space="preserve">
+    <value>DevComponents.DotNetBar.Controls.ComboBoxEx, DevComponents.DotNetBar2, Version=1.0.0.0, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04</value>
+  </data>
+  <data name="&gt;&gt;cboDateRelative.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;cboDateRelative.ZOrder" xml:space="preserve">
+    <value>7</value>
+  </data>
+  <data name="btnApply.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Bottom, Left</value>
+  </data>
+  <data name="btnApply.Location" type="System.Drawing.Point, System.Drawing">
+    <value>9, 307</value>
+  </data>
+  <data name="btnApply.Size" type="System.Drawing.Size, System.Drawing">
+    <value>69, 21</value>
+  </data>
+  <data name="btnApply.TabIndex" type="System.Int32, mscorlib">
+    <value>12</value>
+  </data>
+  <data name="btnApply.Text" xml:space="preserve">
+    <value>Apply</value>
+  </data>
+  <data name="&gt;&gt;btnApply.Name" xml:space="preserve">
+    <value>btnApply</value>
+  </data>
+  <data name="&gt;&gt;btnApply.Type" xml:space="preserve">
+    <value>DevComponents.DotNetBar.ButtonX, DevComponents.DotNetBar2, Version=1.0.0.0, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04</value>
+  </data>
+  <data name="&gt;&gt;btnApply.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;btnApply.ZOrder" xml:space="preserve">
+    <value>8</value>
+  </data>
+  <data name="btnCustom.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Right</value>
+  </data>
+  <data name="btnCustom.Location" type="System.Drawing.Point, System.Drawing">
+    <value>176, 264</value>
+  </data>
+  <data name="btnCustom.Size" type="System.Drawing.Size, System.Drawing">
+    <value>69, 21</value>
+  </data>
+  <data name="btnCustom.TabIndex" type="System.Int32, mscorlib">
+    <value>11</value>
+  </data>
+  <data name="btnCustom.Text" xml:space="preserve">
+    <value>Custom...</value>
+  </data>
+  <data name="&gt;&gt;btnCustom.Name" xml:space="preserve">
+    <value>btnCustom</value>
+  </data>
+  <data name="&gt;&gt;btnCustom.Type" xml:space="preserve">
+    <value>DevComponents.DotNetBar.ButtonX, DevComponents.DotNetBar2, Version=1.0.0.0, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04</value>
+  </data>
+  <data name="&gt;&gt;btnCustom.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;btnCustom.ZOrder" xml:space="preserve">
+    <value>9</value>
+  </data>
+  <data name="cbxDateRelative.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Left, Right</value>
+  </data>
+  <data name="cbxDateRelative.Location" type="System.Drawing.Point, System.Drawing">
+    <value>3, 52</value>
+  </data>
+  <data name="cbxDateRelative.Size" type="System.Drawing.Size, System.Drawing">
+    <value>241, 20</value>
+  </data>
+  <data name="cbxDateRelative.TabIndex" type="System.Int32, mscorlib">
+    <value>3</value>
+  </data>
+  <data name="cbxDateRelative.Text" xml:space="preserve">
+    <value>Filter by relative date:</value>
+  </data>
+  <data name="&gt;&gt;cbxDateRelative.Name" xml:space="preserve">
+    <value>cbxDateRelative</value>
+  </data>
+  <data name="&gt;&gt;cbxDateRelative.Type" xml:space="preserve">
+    <value>DevComponents.DotNetBar.Controls.CheckBoxX, DevComponents.DotNetBar2, Version=1.0.0.0, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04</value>
+  </data>
+  <data name="&gt;&gt;cbxDateRelative.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;cbxDateRelative.ZOrder" xml:space="preserve">
+    <value>12</value>
+  </data>
+  <data name="cbxDateRange.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Left, Right</value>
+  </data>
+  <data name="cbxDateRange.Location" type="System.Drawing.Point, System.Drawing">
+    <value>2, 175</value>
+  </data>
+  <data name="cbxDateRange.Size" type="System.Drawing.Size, System.Drawing">
+    <value>243, 20</value>
+  </data>
+  <data name="cbxDateRange.TabIndex" type="System.Int32, mscorlib">
+    <value>7</value>
+  </data>
+  <data name="cbxDateRange.Text" xml:space="preserve">
+    <value>Filter by date range:</value>
+  </data>
+  <data name="&gt;&gt;cbxDateRange.Name" xml:space="preserve">
+    <value>cbxDateRange</value>
+  </data>
+  <data name="&gt;&gt;cbxDateRange.Type" xml:space="preserve">
+    <value>DevComponents.DotNetBar.Controls.CheckBoxX, DevComponents.DotNetBar2, Version=1.0.0.0, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04</value>
+  </data>
+  <data name="&gt;&gt;cbxDateRange.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;cbxDateRange.ZOrder" xml:space="preserve">
+    <value>13</value>
+  </data>
+  <data name="cbxShowAll.Location" type="System.Drawing.Point, System.Drawing">
+    <value>4, 7</value>
+  </data>
+  <data name="cbxShowAll.Size" type="System.Drawing.Size, System.Drawing">
+    <value>97, 20</value>
+  </data>
+  <data name="cbxShowAll.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name="cbxShowAll.Text" xml:space="preserve">
+    <value>Show all</value>
+  </data>
+  <data name="&gt;&gt;cbxShowAll.Name" xml:space="preserve">
+    <value>cbxShowAll</value>
+  </data>
+  <data name="&gt;&gt;cbxShowAll.Type" xml:space="preserve">
+    <value>DevComponents.DotNetBar.Controls.CheckBoxX, DevComponents.DotNetBar2, Version=1.0.0.0, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04</value>
+  </data>
+  <data name="&gt;&gt;cbxShowAll.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;cbxShowAll.ZOrder" xml:space="preserve">
+    <value>14</value>
+  </data>
+  <data name="cbxShowNull.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Left, Right</value>
+  </data>
+  <data name="cbxShowNull.Location" type="System.Drawing.Point, System.Drawing">
+    <value>107, 7</value>
+  </data>
+  <data name="cbxShowNull.Size" type="System.Drawing.Size, System.Drawing">
+    <value>138, 20</value>
+  </data>
+  <data name="cbxShowNull.TabIndex" type="System.Int32, mscorlib">
+    <value>1</value>
+  </data>
+  <data name="cbxShowNull.Text" xml:space="preserve">
+    <value>Show null</value>
+  </data>
+  <data name="&gt;&gt;cbxShowNull.Name" xml:space="preserve">
+    <value>cbxShowNull</value>
+  </data>
+  <data name="&gt;&gt;cbxShowNull.Type" xml:space="preserve">
+    <value>DevComponents.DotNetBar.Controls.CheckBoxX, DevComponents.DotNetBar2, Version=1.0.0.0, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04</value>
+  </data>
+  <data name="&gt;&gt;cbxShowNull.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;cbxShowNull.ZOrder" xml:space="preserve">
+    <value>6</value>
+  </data>
+  <data name="cbxShowNotNull.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Left, Right</value>
+  </data>
+  <data name="cbxShowNotNull.Location" type="System.Drawing.Point, System.Drawing">
+    <value>107, 28</value>
+  </data>
+  <data name="cbxShowNotNull.Size" type="System.Drawing.Size, System.Drawing">
+    <value>138, 20</value>
+  </data>
+  <data name="cbxShowNotNull.TabIndex" type="System.Int32, mscorlib">
+    <value>2</value>
+  </data>
+  <data name="cbxShowNotNull.Text" xml:space="preserve">
+    <value>Show not null</value>
+  </data>
+  <data name="&gt;&gt;cbxShowNotNull.Name" xml:space="preserve">
+    <value>cbxShowNotNull</value>
+  </data>
+  <data name="&gt;&gt;cbxShowNotNull.Type" xml:space="preserve">
+    <value>DevComponents.DotNetBar.Controls.CheckBoxX, DevComponents.DotNetBar2, Version=1.0.0.0, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04</value>
+  </data>
+  <data name="&gt;&gt;cbxShowNotNull.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;cbxShowNotNull.ZOrder" xml:space="preserve">
+    <value>5</value>
+  </data>
+  <data name="btnOk.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Bottom, Right</value>
+  </data>
+  <data name="btnOk.Location" type="System.Drawing.Point, System.Drawing">
+    <value>103, 307</value>
+  </data>
+  <data name="btnOk.Size" type="System.Drawing.Size, System.Drawing">
+    <value>69, 21</value>
+  </data>
+  <data name="btnOk.TabIndex" type="System.Int32, mscorlib">
+    <value>106</value>
+  </data>
+  <data name="btnOk.Text" xml:space="preserve">
+    <value>Ok</value>
+  </data>
+  <data name="&gt;&gt;btnOk.Name" xml:space="preserve">
+    <value>btnOk</value>
+  </data>
+  <data name="&gt;&gt;btnOk.Type" xml:space="preserve">
+    <value>DevComponents.DotNetBar.ButtonX, DevComponents.DotNetBar2, Version=1.0.0.0, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04</value>
+  </data>
+  <data name="&gt;&gt;btnOk.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;btnOk.ZOrder" xml:space="preserve">
+    <value>4</value>
+  </data>
+  <data name="btnCancel.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Bottom, Right</value>
+  </data>
+  <data name="btnCancel.Location" type="System.Drawing.Point, System.Drawing">
+    <value>178, 307</value>
+  </data>
+  <data name="btnCancel.Size" type="System.Drawing.Size, System.Drawing">
+    <value>69, 21</value>
+  </data>
+  <data name="btnCancel.TabIndex" type="System.Int32, mscorlib">
+    <value>107</value>
+  </data>
+  <data name="btnCancel.Text" xml:space="preserve">
+    <value>Cancel</value>
+  </data>
+  <data name="&gt;&gt;btnCancel.Name" xml:space="preserve">
+    <value>btnCancel</value>
+  </data>
+  <data name="&gt;&gt;btnCancel.Type" xml:space="preserve">
+    <value>DevComponents.DotNetBar.ButtonX, DevComponents.DotNetBar2, Version=1.0.0.0, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04</value>
+  </data>
+  <data name="&gt;&gt;btnCancel.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;btnCancel.ZOrder" xml:space="preserve">
+    <value>3</value>
+  </data>
+  <data name="dtiFromDate.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Left, Right</value>
+  </data>
+  <data name="dtiFromDate.Location" type="System.Drawing.Point, System.Drawing">
+    <value>22, 201</value>
+  </data>
+  <data name="dtiFromDate.Size" type="System.Drawing.Size, System.Drawing">
+    <value>222, 20</value>
+  </data>
+  <data name="dtiFromDate.TabIndex" type="System.Int32, mscorlib">
+    <value>110</value>
+  </data>
+  <data name="&gt;&gt;dtiFromDate.Name" xml:space="preserve">
+    <value>dtiFromDate</value>
+  </data>
+  <data name="&gt;&gt;dtiFromDate.Type" xml:space="preserve">
+    <value>DevComponents.Editors.DateTimeAdv.DateTimeInput, DevComponents.DotNetBar2, Version=1.0.0.0, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04</value>
+  </data>
+  <data name="&gt;&gt;dtiFromDate.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;dtiFromDate.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="dtiToDate.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Left, Right</value>
+  </data>
+  <data name="dtiToDate.Location" type="System.Drawing.Point, System.Drawing">
+    <value>22, 227</value>
+  </data>
+  <data name="dtiToDate.Size" type="System.Drawing.Size, System.Drawing">
+    <value>222, 20</value>
+  </data>
+  <data name="dtiToDate.TabIndex" type="System.Int32, mscorlib">
+    <value>111</value>
+  </data>
+  <data name="&gt;&gt;dtiToDate.Name" xml:space="preserve">
+    <value>dtiToDate</value>
+  </data>
+  <data name="&gt;&gt;dtiToDate.Type" xml:space="preserve">
+    <value>DevComponents.Editors.DateTimeAdv.DateTimeInput, DevComponents.DotNetBar2, Version=1.0.0.0, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04</value>
+  </data>
+  <data name="&gt;&gt;dtiToDate.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;dtiToDate.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="cbxDateSpecific.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Left, Right</value>
+  </data>
+  <data name="cbxDateSpecific.Location" type="System.Drawing.Point, System.Drawing">
+    <value>2, 113</value>
+  </data>
+  <data name="cbxDateSpecific.Size" type="System.Drawing.Size, System.Drawing">
+    <value>243, 20</value>
+  </data>
+  <data name="cbxDateSpecific.TabIndex" type="System.Int32, mscorlib">
+    <value>5</value>
+  </data>
+  <data name="cbxDateSpecific.Text" xml:space="preserve">
+    <value>Filter by specific date:</value>
+  </data>
+  <data name="&gt;&gt;cbxDateSpecific.Name" xml:space="preserve">
+    <value>cbxDateSpecific</value>
+  </data>
+  <data name="&gt;&gt;cbxDateSpecific.Type" xml:space="preserve">
+    <value>DevComponents.DotNetBar.Controls.CheckBoxX, DevComponents.DotNetBar2, Version=1.0.0.0, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04</value>
+  </data>
+  <data name="&gt;&gt;cbxDateSpecific.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;cbxDateSpecific.ZOrder" xml:space="preserve">
+    <value>11</value>
+  </data>
+  <data name="dtiSpecificDate.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Left, Right</value>
+  </data>
+  <data name="dtiSpecificDate.Location" type="System.Drawing.Point, System.Drawing">
+    <value>23, 139</value>
+  </data>
+  <data name="dtiSpecificDate.Size" type="System.Drawing.Size, System.Drawing">
+    <value>221, 20</value>
+  </data>
+  <data name="dtiSpecificDate.TabIndex" type="System.Int32, mscorlib">
+    <value>109</value>
+  </data>
+  <data name="&gt;&gt;dtiSpecificDate.Name" xml:space="preserve">
+    <value>dtiSpecificDate</value>
+  </data>
+  <data name="&gt;&gt;dtiSpecificDate.Type" xml:space="preserve">
+    <value>DevComponents.Editors.DateTimeAdv.DateTimeInput, DevComponents.DotNetBar2, Version=1.0.0.0, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04</value>
+  </data>
+  <data name="&gt;&gt;dtiSpecificDate.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;dtiSpecificDate.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
+  <data name="cbxCustom.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Left, Right</value>
+  </data>
+  <data name="cbxCustom.Location" type="System.Drawing.Point, System.Drawing">
+    <value>2, 264</value>
+  </data>
+  <data name="cbxCustom.Size" type="System.Drawing.Size, System.Drawing">
+    <value>170, 20</value>
+  </data>
+  <data name="cbxCustom.TabIndex" type="System.Int32, mscorlib">
+    <value>10</value>
+  </data>
+  <data name="cbxCustom.Text" xml:space="preserve">
+    <value>Custom</value>
+  </data>
+  <data name="&gt;&gt;cbxCustom.Name" xml:space="preserve">
+    <value>cbxCustom</value>
+  </data>
+  <data name="&gt;&gt;cbxCustom.Type" xml:space="preserve">
+    <value>DevComponents.DotNetBar.Controls.CheckBoxX, DevComponents.DotNetBar2, Version=1.0.0.0, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04</value>
+  </data>
+  <data name="&gt;&gt;cbxCustom.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;cbxCustom.ZOrder" xml:space="preserve">
+    <value>10</value>
+  </data>
+  <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
+    <value>96, 96</value>
+  </data>
+  <data name="$this.Size" type="System.Drawing.Size, System.Drawing">
+    <value>260, 340</value>
+  </data>
+  <data name="&gt;&gt;$this.Name" xml:space="preserve">
+    <value>FilterDateTimePicker</value>
+  </data>
+  <data name="&gt;&gt;$this.Type" xml:space="preserve">
+    <value>System.Windows.Forms.UserControl, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridFilter/FilterEval.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridFilter/FilterEval.cs
new file mode 100644
index 00000000..7f899abb
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridFilter/FilterEval.cs	
@@ -0,0 +1,4106 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Drawing;
+using System.Globalization;
+using System.Text;
+using System.Text.RegularExpressions;
+
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    /// <summary>
+    /// Filter Expression evaluator
+    /// </summary>
+    public class FilterEval
+    {
+        #region Static data
+
+        static readonly EmptyFilterOp EmptyOp = new EmptyFilterOp();
+
+        static bool _localizedStringsLoaded;
+
+        static private string _exprErrorString = "Expression error";
+        static private string _missingParenString = "Missing parenthesis";
+        static private string _missingQuoteString = "Missing quote";
+        static private string _invalidArgCountString = "Invalid number of arguments";
+        static private string _invalidArgString = "Invalid argument";
+        static private string _invalidEmptyOpString = "Invalid 'empty' operation";
+        static private string _invalidDateTimeOpString = "Invalid DateTime operation";
+        static private string _invalidStringOpString = "Invalid string operation";
+        static private string _invalidBoolOpString = "Invalid bool operation";
+        static private string _invalidNumericOpString = "Invalid numeric operation";
+        static private string _invalidEvalString = "Invalid logical evaluation";
+        static private string _undefinedFunctionString = "Undefined function";
+
+        static private string dsep = Regex.Escape(NumberFormatInfo.CurrentInfo.CurrencyDecimalSeparator);
+        static private string digit = "\\d+(" + dsep + "\\d+)*";
+
+        static private string Cref = "((\\[[^\\]]*\\])|(" + digit + "))";
+
+        static private string Dref =
+            "(([\\w.]+)|" +
+            "(\"[^\"\\\\]*(?:\\\\.[^\"\\\\]*)*\")|" +
+            "(\'(.*)\')|" +
+            "(#([^#]*)#))";
+
+        static private string Bop = "(([()+\\-*/%,\"\\^])|(<=)|(>=)|(<>)|(=)|(<<)|(>>)|(<)|(>)|(!=)|(\\|\\|)|(&&)|(&)|(\\|))";
+
+        static private string Regs = Cref + "|" + Dref + "|" + Bop;
+
+        #endregion
+
+        #region Private data
+
+        private int _TCount;
+        private int _PCount;
+        private FToken[] _PTokens = new FToken[10];
+        private List<FToken> _PfTokens;
+
+        private GridPanel _GridPanel;
+        private GridColumn _GridColumn;
+        private GridRow _GridRow;
+
+        private string _Source;
+        private List<object> _OperandPool;
+
+        private Regex _Regex = new Regex(Regs);
+        private MatchCollection _Mc;
+
+        private object _Tag;
+        private FilterMatchType _MatchType;
+
+        private bool _Colorize;
+        private bool _PostError;
+
+        #endregion
+
+        ///<summary>
+        /// Expression evaluator constructor
+        ///</summary>
+        ///<param name="gridPanel">Associated GridPanel</param>
+        ///<param name="gridColumn"></param>
+        ///<param name="matchType"></param>
+        ///<param name="source"></param>
+        public FilterEval(GridPanel gridPanel,
+            GridColumn gridColumn, FilterMatchType matchType, string source)
+        {
+            _GridPanel = gridPanel;
+            _GridColumn = gridColumn;
+            _MatchType = matchType;
+
+            LoadLocalizedStrings();
+
+            Source = source;
+        }
+
+        #region Public properties
+
+        #region GridColumn
+
+        ///<summary>
+        /// Gets the associated Grid GridColumn, if any
+        ///</summary>
+        public GridColumn GridColumn
+        {
+            get { return (_GridColumn); }
+        }
+
+        #endregion
+
+        #region GridPanel
+
+        ///<summary>
+        /// Gets the associated Grid Panel
+        ///</summary>
+        public GridPanel GridPanel
+        {
+            get { return (_GridPanel); }
+        }
+
+        #endregion
+
+        #region Source
+
+        ///<summary>
+        /// Gets or sets the expression source
+        ///</summary>
+        public string Source
+        {
+            get { return (_Source); }
+
+            set
+            {
+                _Source = value;
+
+                Tokenize();
+            }
+        }
+
+        #endregion
+
+        #region Tag
+
+        ///<summary>
+        /// Gets or sets user-defined data associated with the object
+        ///</summary>
+        public object Tag
+        {
+            get { return (_Tag); }
+            set { _Tag = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region internal Properties
+
+        internal bool PostError
+        {
+            get { return (_PostError); }
+        }
+
+        #endregion
+
+        #region Tokenize code
+
+        private void Tokenize()
+        {
+            if (string.IsNullOrEmpty(_Source) == false)
+            {
+                _TCount = 0;
+
+                _Mc = _Regex.Matches(_Source);
+
+                _PfTokens = new List<FToken>(_Mc.Count);
+                _OperandPool = new List<object>(_Mc.Count);
+
+                Expr();
+
+                FToken t = GetToken();
+
+                if (t != FToken.BadToken)
+                    throw new Exception(_exprErrorString);
+
+                foreach (FToken token in _PfTokens)
+                {
+                    if (token > FToken.Operator)
+                        return;
+                }
+
+                throw new Exception(_exprErrorString);
+            }
+            
+            if (_PfTokens != null)
+                _PfTokens.Clear();
+        }
+
+        #region Expr
+
+        /// <summary>
+        /// Handles conditional Or operator
+        /// </summary>
+        private void Expr()
+        {
+            Term0();
+
+            FToken t = GetToken();
+
+            while (t == FToken.ConditionalOr)
+            {
+                List<FToken> pfTokens = _PfTokens;
+                _PfTokens = new List<FToken>(_Mc.Count - _TCount);
+
+                Term0();
+
+                pfTokens.Add(FToken.ConditionalOrRpn);
+                pfTokens.Add(ProcessObject(_PfTokens));
+                pfTokens.Add(t);
+
+                _PfTokens = pfTokens;
+
+                t = GetToken();
+            }
+
+            PutToken(t);
+        }
+
+        #endregion
+
+        #region Term0
+
+        /// <summary>
+        /// Handles Conditional And operator
+        /// </summary>
+        private void Term0()
+        {
+            Term1();
+
+            FToken t = GetToken();
+
+            while (t == FToken.ConditionalAnd)
+            {
+                List<FToken> pfTokens = _PfTokens;
+                _PfTokens = new List<FToken>(_Mc.Count - _TCount);
+
+                Term1();
+
+                pfTokens.Add(FToken.ConditionalAndRpn);
+                pfTokens.Add(ProcessObject(_PfTokens));
+                pfTokens.Add(t);
+
+                _PfTokens = pfTokens;
+
+                t = GetToken();
+            }
+
+            PutToken(t);
+        }
+
+        #endregion
+
+        #region Term1
+
+        /// <summary>
+        /// Handles the Logical Or operator
+        /// </summary>
+        private void Term1()
+        {
+            Term2();
+
+            FToken t = GetToken();
+
+            while (t == FToken.LogicalOr)
+            {
+                Term2();
+
+                _PfTokens.Add(t);
+
+                t = GetToken();
+            }
+
+            PutToken(t);
+        }
+
+        #endregion
+
+        #region Term2
+
+        /// <summary>
+        /// Handles Logical Xor operator
+        /// </summary>
+        private void Term2()
+        {
+            Term3();
+
+            FToken t = GetToken();
+
+            while (t == FToken.LogicalXor)
+            {
+                Term3();
+
+                _PfTokens.Add(t);
+
+                t = GetToken();
+            }
+
+            PutToken(t);
+        }
+
+        #endregion
+
+        #region Term3
+
+        /// <summary>
+        /// Handles the Logical And operator
+        /// </summary>
+        private void Term3()
+        {
+            Term4();
+
+            FToken t = GetToken();
+
+            while (t == FToken.LogicalAnd)
+            {
+                Term4();
+
+                _PfTokens.Add(t);
+
+                t = GetToken();
+            }
+
+            PutToken(t);
+        }
+
+        #endregion
+
+        #region Term4
+
+        /// <summary>
+        /// Handles the Comparison operators
+        /// </summary>
+        private void Term4()
+        {
+            int n = GetNegate();
+
+            Term5();
+
+            n += GetNegate();
+
+            FToken t = GetToken();
+
+            while (t == FToken.Equal || t == FToken.NotEqual || t == FToken.NotEqual2 ||
+                t == FToken.GreaterThan || t == FToken.GreaterThanOrEqual ||
+                t == FToken.LessThan || t == FToken.LessThanOrEqual)
+            {
+                n += GetNegate();
+
+                Term5();
+
+                if (t == FToken.Equal || t == FToken.NotEqual || t == FToken.NotEqual2)
+                    SetMatchString();
+
+                _PfTokens.Add(t);
+
+                t = GetToken();
+            }
+                
+            PutToken(t);
+
+            if (n % 2 == 1)
+                _PfTokens.Add(FToken.Negate);
+        }
+
+        #endregion
+
+        #region Term5
+
+        /// <summary>
+        /// Handles Like, Is, and Between operators
+        /// </summary>
+        private void Term5()
+        {
+            Term6();
+
+            int n = GetNegate();
+
+            FToken t = GetToken();
+
+            while (t == FToken.Like || t == FToken.Is || t == FToken.Between)
+            {
+                if (t == FToken.Is)
+                {
+                    n += GetNegate();
+
+                    FToken t2 = GetToken();
+
+                    if (t2 == FToken.Like || t2 == FToken.Between)
+                        t = t2;
+                    else
+                        PutToken(t2);
+                }
+
+                Term6();
+
+                if (t == FToken.Like)
+                {
+                    SetMatchString();
+                }
+                else if (t == FToken.Between)
+                {
+                    FToken t2 = GetToken();
+
+                    if (t2 != FToken.ConditionalAnd && t2 != FToken.Comma)
+                        PutToken(t2);
+
+                    Term6();
+                }
+
+                _PfTokens.Add(t);
+
+                t = GetToken();
+            }
+
+            PutToken(t);
+
+            if (n % 2 == 1)
+                PutToken(FToken.Negate);
+        }
+
+        #region SetMatchString
+
+        private void SetMatchString()
+        {
+            if (_MatchType != FilterMatchType.None)
+            {
+                FToken lt = _PfTokens[_PfTokens.Count - 1];
+
+                if (lt < FToken.Operator)
+                {
+                    string s = _OperandPool[(int)lt] as string;
+
+                    if (s != null)
+                    {
+                        if (_PfTokens.Count <= 2 || _PfTokens[_PfTokens.Count - 2] != FToken.Function)
+                        {
+                            s = GetMatchString(s);
+
+                            _OperandPool.Add(s);
+
+                            _PfTokens[_PfTokens.Count - 1] =
+                                (FToken)(_OperandPool.Count - 1);
+                        }
+                    }
+                }
+            }
+        }
+
+        #region GetMatchString
+
+        private string GetMatchString(string text)
+        {
+            string s = text;
+
+            switch (GridPanel.FilterMatchType)
+            {
+                case FilterMatchType.None:
+                    if (GridPanel.FilterIgnoreMatchCase == true)
+                        s = s.ToLower();
+                    break;
+
+                case FilterMatchType.RegularExpressions:
+                    //Regex.Match("", s);
+                    break;
+
+                case FilterMatchType.Wildcards:
+                    s = Wildcard.WildcardToRegex(text);
+                    Regex.Match("", s);
+                    break;
+            }
+
+            return (s);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region Term6
+
+        /// <summary>
+        /// Handles the Shift Left and Right operators
+        /// </summary>
+        private void Term6()
+        {
+            Term7();
+
+            FToken t = GetToken();
+
+            while (t == FToken.ShiftLeft || t == FToken.ShiftRight)
+            {
+                Term7();
+
+                if (ReduceTerm(t) == false)
+                    _PfTokens.Add(t);
+
+                t = GetToken();
+            }
+
+            PutToken(t);
+        }
+
+        #endregion
+
+        #region Term7
+
+        /// <summary>
+        /// Handles +, - operators
+        /// </summary>
+        private void Term7()
+        {
+            Term8();
+
+            FToken t = GetToken();
+
+            while (t == FToken.Add || t == FToken.Subtract)
+            {
+                Term8();
+
+                if (ReduceTerm(t) == false)
+                    _PfTokens.Add(t);
+
+                t = GetToken();
+            }
+
+            PutToken(t);
+        }
+
+        #endregion
+
+        #region Term8
+
+        /// <summary>
+        /// Handles %, *, and / operators
+        /// </summary>
+        private void Term8()
+        {
+            Factor();
+
+            FToken t = GetToken();
+
+            while (t == FToken.Mod ||
+                t == FToken.Multiply || t == FToken.Divide)
+            {
+                Factor();
+
+                if (ReduceTerm(t) == false)
+                    _PfTokens.Add(t);
+
+                t = GetToken();
+            }
+
+            PutToken(t);
+        }
+
+        #endregion
+
+        #region Factor
+
+        /// <summary>
+        /// Handles factor processing
+        /// </summary>
+        private void Factor()
+        {
+            FToken t = GetToken();
+
+            int n = 0;
+
+            // Unary operators
+
+            while (t == FToken.Add || t == FToken.Subtract)
+            {
+                if (t == FToken.Subtract)
+                    n++;
+
+                t = GetToken();
+            }
+
+            // Operand processing
+
+            if (t == FToken.LParen)
+            {
+                Expr();
+
+                t = GetToken();
+
+                if (t != FToken.RParen)
+                    throw new Exception(_missingParenString);
+            }
+            else if (t < FToken.Operator)
+            {
+                if (Function(t) == false)
+                    _PfTokens.Add(t);
+            }
+            else
+            {
+                if (_GridColumn != null)
+                {
+                    FToken t2 = ProcessObject(_GridColumn);
+
+                    _PfTokens.Add(t2);
+                }
+
+                PutToken(t);
+            }
+
+            if (n % 2 == 1)
+            {
+                if (_PfTokens.Count == 0)
+                    throw new Exception(_exprErrorString);
+
+                _PfTokens.Add(FToken.Negate);
+            }
+        }
+
+        #endregion
+
+        #region Function
+
+        /// <summary>
+        /// Handles function parsing
+        /// </summary>
+        /// <param name="e"></param>
+        /// <returns></returns>
+        private bool Function(FToken e)
+        {
+            string s = _OperandPool[(int)e] as string;
+
+            if (s == null)
+            {
+                GridColumn col = _OperandPool[(int)e] as GridColumn;
+
+                if (col != null)
+                    s = col.Name ?? col.HeaderText;
+            }
+
+            if (s != null)
+            {
+                s = s.ToLower();
+
+                FToken t = GetFunction(s);
+
+                if (t != FToken.BadToken)
+                {
+                    _PfTokens.Add(t);
+
+                    t = GetToken();
+
+                    if (t != FToken.LParen)
+                        throw new Exception(_missingParenString);
+
+                    ParameterList(e);
+
+                    t = GetToken();
+
+                    if (t != FToken.RParen)
+                        throw new Exception(_missingParenString);
+
+                    return (true);
+                }
+            }
+
+            return (false);
+        }
+
+        #region GetFunction
+
+        /// <summary>
+        /// Determines whether the parsed string
+        /// is a one of our function keywords
+        /// </summary>
+        /// <param name="s"></param>
+        /// <returns></returns>
+        private FToken GetFunction(string s)
+        {
+            FToken t = GetToken();
+
+            if (t == FToken.LParen)
+            {
+                PutToken(t);
+
+                t = FTokenList.GetStringToken(s, FTokenList.TokenListC);
+
+                return ((t != FToken.BadToken) ? t : FToken.User);
+            }
+
+            PutToken(t);
+
+            return (FToken.BadToken);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ParameterList
+
+        /// <summary>
+        /// Handles function parameters
+        /// </summary>
+        private void ParameterList(FToken e)
+        {
+            int n = 0;
+
+            if (_PfTokens[_PfTokens.Count - 1] == FToken.User)
+            {
+                _PfTokens.Add(e);
+                n++;
+            }
+
+            FToken t = GetToken();
+
+            while (t != FToken.RParen && t != FToken.BadToken)
+            {
+                PutToken(t);
+
+                int count = _PfTokens.Count;
+
+                Expr();
+
+                if (_PfTokens.Count > count)
+                    n++;
+
+                t = GetToken();
+
+                if (t != FToken.Comma)
+                    break;
+
+                t = GetToken();
+            }
+
+            PutToken(t);
+
+            _PfTokens.Add(FToken.Function);
+            _PfTokens.Add((FToken)n);
+        }
+
+        #endregion
+
+        #region GetToken
+
+        /// <summary>
+        /// Gets the next parsed token
+        /// </summary>
+        /// <returns></returns>
+        private FToken GetToken()
+        {
+            FToken t = FToken.BadToken;
+
+            if (_PCount > 0)
+            {
+                t = _PTokens[--_PCount];
+            }
+            else
+            {
+                if (_TCount < _Mc.Count)
+                {
+                    string s = _Mc[_TCount].Value;
+
+                    t = FTokenList.GetToken(s);
+
+                    if (t == FToken.BadToken)
+                        t = ProcessOperand(s);
+
+                    _TCount++;
+                }
+            }
+
+            return (t);
+        }
+
+        #endregion
+
+        #region ProcessOperand
+
+        private FToken ProcessOperand(string s)
+        {
+            object o = GetValue(s);
+
+            return (ProcessObject(o));
+        }
+
+        #endregion
+
+        #region ProcessObject
+
+        private FToken ProcessObject(object o)
+        {
+            int index = _OperandPool.IndexOf(o);
+
+            if (index < 0)
+            {
+                _OperandPool.Add(o);
+
+                index = _OperandPool.Count - 1;
+            }
+
+            return ((FToken)(index));
+        }
+
+        #endregion
+
+        #region GetValue
+
+        /// <summary>
+        /// Gets the 'value' from the given string
+        /// </summary>
+        /// <param name="s"></param>
+        /// <returns></returns>
+        private object GetValue(string s)
+        {
+            s = s.Trim();
+
+            if (s.Length >= 2)
+            {
+                if (IsValueMarker('"', '"', ref s, false) == true)
+                    return (s);
+
+                if (IsValueMarker('\'', '\'', ref s, false) == true)
+                    return (s);
+
+                if (IsValueMarker('#', '#', ref s, true) == true)
+                    return (GetDateValue(s));
+
+                if (IsValueMarker('[', ']', ref s, true) == true)
+                    return (GetColumnValue(s));
+            }
+
+            if (s.Length > 0)
+            {
+                if (s.Equals("\"") == true)
+                    throw new Exception(_missingQuoteString);
+
+                GridColumn col = GetColumn(s);
+
+                if (col != null)
+                    return (col);
+
+                string l = s.ToLower();
+
+                if (l.Equals("true") == true)
+                    return (true);
+
+                if (l.Equals("false") == true)
+                    return (false);
+
+                if (l.Equals("null") == true)
+                    return (null);
+        
+                if (l.Equals("empty") == true)
+                    return (EmptyOp);
+
+                double d;
+
+                if (double.TryParse(s, out d) == true)
+                    return (d);
+            }
+
+            return (s);
+        }
+
+        #region GetColumn
+
+        private GridColumn GetColumn(string s)
+        {
+            s = s.ToUpper();
+
+            foreach (GridColumn column in _GridPanel.Columns)
+            {
+                if (column.Name != null && column.Name.ToUpper().Equals(s))
+                {
+                    column.FilterExprUsesName = true;
+
+                    return (column);
+                }
+
+                if (column.HeaderText != null && column.HeaderText.ToUpper().Equals(s))
+                {
+                    column.FilterExprUsesName = false;
+
+                    return (column);
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetColumnValue
+
+        private GridColumn GetColumnValue(string s)
+        {
+            if (s.Length <= 0 && _GridColumn != null)
+                return (_GridColumn);
+
+            int index;
+            if (int.TryParse(s, out index) == true)
+            {
+                if ((uint)index < _GridPanel.Columns.Count)
+                    return (_GridPanel.Columns[index]);
+            }
+
+            return (GetColumn(s));
+        }
+
+        #endregion
+
+        #region GetDateValue
+
+        private object GetDateValue(string s)
+        {
+            if (s.Length > 0)
+            {
+                if (Char.IsDigit(s[0]) == true)
+                    return (DateTime.Parse(s));
+
+                return ((int)Enum.Parse(typeof(DayOfWeek), s));
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region IsValueMarker
+
+        private bool IsValueMarker(
+            char c1, char c2, ref string s, bool trim)
+        {
+            if (s[0] == c1 && s[s.Length - 1] == c2)
+            {
+                s = s.Substring(1, s.Length - 2);
+
+                if (trim == true)
+                    s = s.Trim();
+
+                return (true);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region PutToken
+
+        /// <summary>
+        /// Saves the given token for future use
+        /// </summary>
+        /// <param name="t"></param>
+        private void PutToken(FToken t)
+        {
+            _PTokens[_PCount++] = t;
+        }
+
+        #endregion
+
+        #region GetNegate
+
+        private int GetNegate()
+        {
+            FToken t = GetToken();
+
+            int n = 0;
+
+            while (t == FToken.Negate)
+            {
+                if (t == FToken.Negate)
+                    n++;
+
+                t = GetToken();
+            }
+
+            PutToken(t);
+
+            return (n);
+        }
+
+        #endregion
+
+        #region ReduceTerm
+
+        private bool ReduceTerm(FToken t)
+        {
+            if (_PfTokens.Count >= 2)
+            {
+                FToken t1 = _PfTokens[_PfTokens.Count - 1];
+                FToken t2 = _PfTokens[_PfTokens.Count - 2];
+
+                if (t1 < FToken.Operator && t2 < FToken.Operator)
+                {
+                    object o1 = _OperandPool[(int) t1];
+                    object o2 = _OperandPool[(int) t2];
+
+                    if (o1 != null && o2 != null && o1.GetType() == o2.GetType())
+                    {
+                        if (o1 is string)
+                        {
+                            switch (t)
+                            {
+                                case FToken.Add:
+                                    string s = (string) o2 + (string) o1;
+
+                                    _PfTokens.RemoveAt(_PfTokens.Count - 1);
+                                    _PfTokens[_PfTokens.Count - 1] = ProcessObject(s);
+
+                                    return (true);
+
+                                default:
+                                    return (false);
+                            }
+                        }
+
+                        if (o1 is int)
+                        {
+                            double d1 = Convert.ToDouble(o1);
+                            double d2 = Convert.ToDouble(o2);
+
+                            double d3;
+
+                            if (ReduceNumeric(t, d1, d2, out d3) == false)
+                                return (false);
+
+                            int n = (int) d3;
+
+                            _PfTokens.RemoveAt(_PfTokens.Count - 1);
+                            _PfTokens[_PfTokens.Count - 1] = ProcessObject(n);
+
+                            return (true);
+                        }
+
+                        if (o1 is double)
+                        {
+                            double d3;
+
+                            if (ReduceNumeric(t, (double) o1, (double) o2, out d3) == false)
+                                return (false);
+
+                            _PfTokens.RemoveAt(_PfTokens.Count - 1);
+                            _PfTokens[_PfTokens.Count - 1] = ProcessObject(d3);
+
+                            return (true);
+                        }
+                    }
+                }
+            }
+
+            return (false);
+        }
+
+        #region ReduceNumeric
+
+        private bool ReduceNumeric(
+            FToken t, double d1, double d2, out double d3)
+        {
+            d3 = 0;
+
+            switch (t)
+            {
+                case FToken.Add:
+                    d3 = d2 + d1;
+                    break;
+
+                case FToken.Subtract:
+                    d3 = d2 - d1;
+                    break;
+
+                case FToken.Divide:
+                    d3 = d2 / d1;
+                    break;
+
+                case FToken.Multiply:
+                    d3 = d2 * d1;
+                    break;
+
+                case FToken.ShiftLeft:
+                    d3 = (int)d2 << (int)d1;
+                    break;
+
+                case FToken.ShiftRight:
+                    d3 = (int)d2 >> (int)d1;
+                    break;
+
+                case FToken.Mod:
+                    d3 = d2 % d1;
+                    break;
+
+                default:
+                    return (false);
+            }
+
+            return (true);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region Evaluate
+
+        /// <summary>
+        /// Evaluates the previously tokenized code
+        /// </summary>
+        /// <returns></returns>
+        public bool Evaluate(GridRow row)
+        {
+            _GridRow = row;
+
+            return (EvaluateEx(_PfTokens));
+        }
+
+        private bool EvaluateEx(List<FToken> pfTokens)
+        {
+            Stack myStack = new Stack();
+
+            for (int i = 0; i < pfTokens.Count; i++)
+            {
+                if (pfTokens[i] < FToken.Operator)
+                    myStack.Push(_OperandPool[(int) pfTokens[i]]);
+
+                else if (pfTokens[i] > FToken.Functions)
+                    myStack.Push(pfTokens[i]);
+
+                else if (pfTokens[i] == FToken.Negate)
+                    EvalNegate(myStack);
+
+                else if (pfTokens[i] == FToken.ConditionalAndRpn)
+                    EvalShortCircuit(myStack, pfTokens[++i], true);
+
+                else if (pfTokens[i] == FToken.ConditionalOrRpn)
+                    EvalShortCircuit(myStack, pfTokens[++i], false);
+
+                else if (pfTokens[i] == FToken.Function)
+                    EvalFunction(myStack, (int) pfTokens[++i]);
+
+                else
+                    EvalOperator(myStack, pfTokens[i]);
+            }
+
+            return (EvalResult(myStack));
+        }
+
+        #region EvalNegate
+
+        private void EvalNegate(Stack myStack)
+        {
+            if (myStack.Count < 1)
+                throw new Exception(_exprErrorString);
+
+            object value = ProcessValue(myStack.Pop());
+
+            if (value is double)
+                myStack.Push(-(double)value);
+
+            else if (value is int)
+                myStack.Push(-(int)value);
+
+            else if (value is bool)
+                myStack.Push(!(bool)value);
+
+            else if (value == null)
+                myStack.Push(0);
+
+            else
+                myStack.Push(0);
+        }
+
+        #endregion
+
+        #region EvalShortCircuit
+
+        private void EvalShortCircuit(
+            Stack myStack, FToken token, bool evres)
+        {
+            bool res = (bool)myStack.Peek();
+
+            if (res == evres)
+            {
+                res = EvaluateEx(
+                    (List<FToken>)_OperandPool[(int)token]);
+            }
+
+            myStack.Push(res);
+        }
+
+        #endregion
+
+        #region EvalFunction
+
+        /// <summary>
+        /// Evaluates the current function
+        /// </summary>
+        /// <param name="myStack"></param>
+        /// <param name="count"></param>
+        private void EvalFunction(Stack myStack, int count)
+        {
+            object[] args = new object[count];
+
+            for (int i = count - 1; i >= 0; i--)
+                args[i] = myStack.Pop();
+
+            switch ((FToken)myStack.Pop())
+            {
+                case FToken.AddDays:    myStack.Push(AddDays(args));    break;
+                case FToken.AddHours:   myStack.Push(AddHours(args));   break;
+                case FToken.AddMinutes: myStack.Push(AddMinutes(args)); break;
+                case FToken.AddMonths:  myStack.Push(AddMonths(args));  break;
+                case FToken.AddSeconds: myStack.Push(AddSeconds(args)); break;
+                case FToken.AddYears:   myStack.Push(AddYears(args));   break;
+                case FToken.Ceiling:    myStack.Push(Ceiling(args));    break;
+                case FToken.Convert:    myStack.Push(ConvertTo(args));  break;
+                case FToken.Date:       myStack.Push(Date(args));       break;
+                case FToken.Day:        myStack.Push(Day(args));        break;
+                case FToken.DayOfWeek:  myStack.Push(Dow(args));        break;
+                case FToken.DayOfYear:  myStack.Push(Doy(args));        break;
+                case FToken.EndOfMonth: myStack.Push(EndOfMonth(args)); break;
+                case FToken.FirstOfMonth: myStack.Push(FirstOfMonth(args)); break;
+                case FToken.Floor:      myStack.Push(Floor(args));      break;
+                case FToken.Hour:       myStack.Push(Hour(args));       break;
+                case FToken.IndexOf:    myStack.Push(IndexOf(args));    break;
+                case FToken.Left:       myStack.Push(Left(args));       break;
+                case FToken.Length:     myStack.Push(Length(args));     break;
+                case FToken.LTrim:      myStack.Push(LTrim(args));      break;
+                case FToken.Minute:     myStack.Push(Minute(args));     break;
+                case FToken.Month:      myStack.Push(Month(args));      break;
+                case FToken.Now:        myStack.Push(Now(args));        break;
+                case FToken.Raw:        myStack.Push(Raw(args));        break;
+                case FToken.Right:      myStack.Push(Right(args));      break;
+                case FToken.Round:      myStack.Push(Round(args));      break;
+                case FToken.RTrim:      myStack.Push(RTrim(args));      break;
+                case FToken.Second:     myStack.Push(Second(args));     break;
+                case FToken.Substring:  myStack.Push(Substring(args));  break;
+                case FToken.TimeOfDay:  myStack.Push(TimeOfDay(args));  break;
+                case FToken.ToLower:    myStack.Push(ToLower(args));    break;
+                case FToken.ToString:   myStack.Push(ToString(args));   break;
+                case FToken.TotalDays:  myStack.Push(TotalDays(args));  break;
+                case FToken.TotalHours: myStack.Push(TotalHours(args)); break;
+                case FToken.TotalMinutes: myStack.Push(TotalMinutes(args)); break;
+                case FToken.TotalSeconds: myStack.Push(TotalSeconds(args)); break;
+                case FToken.TotalYears: myStack.Push(TotalYears(args)); break;
+                case FToken.ToUpper:    myStack.Push(ToUpper(args));    break;
+                case FToken.Trim:       myStack.Push(Trim(args));       break;
+                case FToken.User:       myStack.Push(User(args));       break;
+                case FToken.Year:       myStack.Push(Year(args));       break;
+            }
+        }
+
+        #region ConvertTo
+
+        /// <summary>
+        /// Converts the given arg to the
+        /// specified .Net System data type.
+        /// </summary>
+        /// <param name="args"></param>
+        /// <returns></returns>
+        private object ConvertTo(object[] args)
+        {
+            if (args.Length < 1)
+                throw new ExceptionArgCount();
+
+            object value = ProcessValue(args.Length == 1 ? _GridColumn : args[0]);
+
+            string s = args[args.Length - 1] as string;
+
+            if (s == null)
+                throw new ExceptionArg();
+
+            if (value == null || value == EmptyOp)
+                return (String.Empty);
+
+            switch (s)
+            {
+                case "System.Boolean":
+                    return (System.Convert.ToBoolean(value));
+
+                case "System.Byte":
+                    return (System.Convert.ToByte(value));
+
+                case "System.Char":
+                    return (System.Convert.ToChar(value));
+
+                case "System.DateTime":
+                    return (System.Convert.ToDateTime(value));
+
+                case "System.Decimal":
+                    return (System.Convert.ToDecimal(value));
+
+                case "System.Double":
+                    return (System.Convert.ToDouble(value));
+
+                case "System.Int16":
+                    return (System.Convert.ToInt16(value));
+
+                case "System.Int32":
+                    return (System.Convert.ToInt32(value));
+
+                case "System.Int64":
+                    return (System.Convert.ToInt64(value));
+
+                case "System.SByte":
+                    return (System.Convert.ToSByte(value));
+
+                case "System.Single":
+                    return (System.Convert.ToSingle(value));
+
+                case "System.String":
+                    return (System.Convert.ToString(value));
+
+                case "System.UInt16":
+                    return (System.Convert.ToUInt16(value));
+
+                case "System.UInt32":
+                    return (System.Convert.ToUInt32(value));
+
+                case "System.UInt64":
+                    return (System.Convert.ToUInt64(value));
+
+                default:
+                    throw new ExceptionArg();
+            }
+        }
+
+        #endregion
+
+        #region DateTime Functions
+
+        #region AddMonths
+
+        /// <summary>
+        /// Adds Months to the given DateTime.
+        /// </summary>
+        /// <param name="args"></param>
+        /// <returns></returns>
+        private object AddMonths(object[] args)
+        {
+            if (args.Length != 2)
+                throw new ExceptionArgCount();
+
+            object value1 = ProcessValue(args[0]);
+            object value2 = ProcessValue(args[1]);
+
+            if (value1 is DateTime)
+            {
+                if (value2 is int)
+                    return (((DateTime)value1).AddMonths((int)value2));
+
+                if (value2 is double)
+                    return (((DateTime)value1).AddMonths(Convert.ToInt32(value2)));
+            }
+
+            if (value1 == null || value1 == EmptyOp)
+                return (value1);
+
+            throw new ExceptionArg();
+        }
+
+        #endregion
+
+        #region AddDays
+
+        /// <summary>
+        /// Adds Days to the given DateTime.
+        /// </summary>
+        /// <param name="args"></param>
+        /// <returns></returns>
+        private object AddDays(object[] args)
+        {
+            if (args.Length != 2)
+                throw new ExceptionArgCount();
+
+            object value1 = ProcessValue(args[0]);
+            object value2 = ProcessValue(args[1]);
+
+            if (value1 is DateTime)
+            {
+                if (value2 is int)
+                    return (((DateTime)value1).AddDays((int)value2));
+
+                if (value2 is double)
+                    return (((DateTime)value1).AddDays(Convert.ToInt32(value2)));
+            }
+
+            if (value1 == null || value1 == EmptyOp)
+                return (value1);
+
+            throw new ExceptionArg();
+        }
+
+        #endregion
+
+        #region AddHours
+
+        /// <summary>
+        /// Adds Days to the given DateTime.
+        /// </summary>
+        /// <param name="args"></param>
+        /// <returns></returns>
+        private object AddHours(object[] args)
+        {
+            if (args.Length != 2)
+                throw new ExceptionArgCount();
+
+            object value1 = ProcessValue(args[0]);
+            object value2 = ProcessValue(args[1]);
+
+            if (value1 is DateTime)
+            {
+                if (value2 is int)
+                    return (((DateTime)value1).AddHours((int)value2));
+
+                if (value2 is double)
+                    return (((DateTime)value1).AddHours(Convert.ToInt32(value2)));
+            }
+
+            if (value1 == null || value1 == EmptyOp)
+                return (value1);
+
+            throw new ExceptionArg();
+        }
+
+        #endregion
+
+        #region AddMinutes
+
+        /// <summary>
+        /// Adds Minutes to the given DateTime.
+        /// </summary>
+        /// <param name="args"></param>
+        /// <returns></returns>
+        private object AddMinutes(object[] args)
+        {
+            if (args.Length != 2)
+                throw new ExceptionArgCount();
+
+            object value1 = ProcessValue(args[0]);
+            object value2 = ProcessValue(args[1]);
+
+            if (value1 is DateTime)
+            {
+                if (value2 is int)
+                    return (((DateTime)value1).AddMinutes((int)value2));
+
+                if (value2 is double)
+                    return (((DateTime)value1).AddMinutes(Convert.ToInt32(value2)));
+            }
+
+            if (value1 == null || value1 == EmptyOp)
+                return (value1);
+
+            throw new ExceptionArg();
+        }
+
+        #endregion
+
+        #region AddYears
+
+        /// <summary>
+        /// Adds Years to the given DateTime.
+        /// </summary>
+        /// <param name="args"></param>
+        /// <returns></returns>
+        private object AddYears(object[] args)
+        {
+            if (args.Length != 2)
+                throw new ExceptionArgCount();
+
+            object value1 = ProcessValue(args[0]);
+            object value2 = ProcessValue(args[1]);
+
+            if (value1 is DateTime)
+            {
+                if (value2 is int)
+                    return (((DateTime)value1).AddYears((int)value2));
+
+                if (value2 is double)
+                    return (((DateTime)value1).AddYears(Convert.ToInt32(value2)));
+            }
+            
+            if (value1 == null || value1 == EmptyOp)
+                return (value1);
+
+            throw new ExceptionArg();
+        }
+
+        #endregion
+
+        #region AddSeconds
+
+        /// <summary>
+        /// Adds Seconds to the given DateTime.
+        /// </summary>
+        /// <param name="args"></param>
+        /// <returns></returns>
+        private object AddSeconds(object[] args)
+        {
+            if (args.Length != 2)
+                throw new ExceptionArgCount();
+
+            object value1 = ProcessValue(args[0]);
+            object value2 = ProcessValue(args[1]);
+
+            if (value1 is DateTime)
+            {
+                if (value2 is int)
+                    return (((DateTime)value1).AddSeconds((int)value2));
+
+                if (value2 is double)
+                    return (((DateTime)value1).AddSeconds(Convert.ToInt32(value2)));
+            }
+            if (value1 == null || value1 == EmptyOp)
+                return (value1);
+
+            throw new ExceptionArg();
+        }
+
+        #endregion
+
+        #region Date
+
+        /// <summary>
+        /// Returns the Date portion of the given DateTime.
+        /// </summary>
+        /// <param name="args"></param>
+        /// <returns></returns>
+        private object Date(object[] args)
+        {
+            if (args.Length != 0 && args.Length != 1)
+                throw new ExceptionArgCount();
+
+            object value = (args.Length == 1)
+                ? ProcessValue(args[0]) : DateTime.Now;
+
+            if (value is DateTime)
+                return (((DateTime)value).Date);
+
+            if (value == null || value == EmptyOp)
+                return (value);
+
+            throw new ExceptionArg();
+        }
+
+        #endregion
+
+        #region Day
+
+        /// <summary>
+        /// Returns the Day of the given DateTime.
+        /// </summary>
+        /// <param name="args"></param>
+        /// <returns></returns>
+        private object Day(object[] args)
+        {
+            if (args.Length != 0 && args.Length != 1)
+                throw new ExceptionArgCount();
+
+            object value = (args.Length == 1)
+                ? ProcessValue(args[0]) : DateTime.Now;
+
+            if (value is DateTime)
+                return (((DateTime)value).Day);
+
+            if (value == null || value == EmptyOp)
+                return (value);
+
+            throw new ExceptionArg();
+        }
+
+        #endregion
+
+        #region Dow
+
+        /// <summary>
+        /// Returns the DayOfWeek of the given DateTime.
+        /// </summary>
+        /// <param name="args"></param>
+        /// <returns></returns>
+        private object Dow(object[] args)
+        {
+            if (args.Length != 0 && args.Length != 1)
+                throw new ExceptionArgCount();
+
+            object value = (args.Length == 1)
+                ? ProcessValue(args[0]) : DateTime.Now;
+
+            if (value is DateTime)
+                return ((int)((DateTime)value).DayOfWeek + 1);
+
+            if (value is string)
+            {
+                string s = (string)value;
+
+                if (s.Length > 1)
+                {
+                    s = s.Substring(0, 1).ToUpper() + s.Substring(1).ToLower();
+
+                    if (Enum.IsDefined(typeof(DayOfWeek), s))
+                        return ((int)Enum.Parse(typeof(DayOfWeek), s) + 1);
+                }
+
+                return (null);
+            }
+
+            if (value is int || value is double)
+                return (Enum.GetName(typeof(DayOfWeek), (double) value - 1));
+
+            if (value == null || value == EmptyOp)
+                return (value);
+
+            throw new ExceptionArg();
+        }
+
+        #endregion
+
+        #region Doy
+
+        /// <summary>
+        /// Returns the DayOfYear of the given DateTime.
+        /// </summary>
+        /// <param name="args"></param>
+        /// <returns></returns>
+        private object Doy(object[] args)
+        {
+            if (args.Length != 0 && args.Length != 1)
+                throw new ExceptionArgCount();
+
+            object value = (args.Length == 1)
+                ? ProcessValue(args[0]) : DateTime.Now;
+
+            if (value is DateTime)
+                return (((DateTime)value).DayOfYear);
+
+            if (value == null || value == EmptyOp)
+                return (value);
+
+            throw new ExceptionArg();
+        }
+
+        #endregion
+
+        #region EndOfMonth
+
+        /// <summary>
+        /// Returns the EndOfMonth of the given DateTime.
+        /// </summary>
+        /// <param name="args"></param>
+        /// <returns></returns>
+        private object EndOfMonth(object[] args)
+        {
+            if (args.Length != 0 && args.Length != 1)
+                throw new ExceptionArgCount();
+
+            object value = (args.Length == 1)
+                ? ProcessValue(args[0]) : DateTime.Now;
+
+            if (value is DateTime)
+            {
+                DateTime dt = (DateTime)value;
+
+                dt = new DateTime(dt.Year, dt.Month, 1);
+
+                return (dt.AddMonths(1).AddDays(-dt.Day));
+            }
+
+            if (value == null || value == EmptyOp)
+                return (value);
+
+            throw new ExceptionArg();
+        }
+
+        #endregion
+
+        #region FirstOfMonth
+
+        /// <summary>
+        /// Returns the FirstOfMonth of the given DateTime.
+        /// </summary>
+        /// <param name="args"></param>
+        /// <returns></returns>
+        private object FirstOfMonth(object[] args)
+        {
+            if (args.Length != 0 && args.Length != 1)
+                throw new ExceptionArgCount();
+
+            object value = (args.Length == 1)
+                ? ProcessValue(args[0]) : DateTime.Now;
+
+            if (value is DateTime)
+            {
+                DateTime dt = (DateTime) value;
+
+                return (dt.AddDays(1 - dt.Day));
+            }
+
+            if (value == null || value == EmptyOp)
+                return (value);
+
+            throw new ExceptionArg();
+        }
+
+        #endregion
+
+        #region Hour
+
+        /// <summary>
+        /// Returns the Hour of the given DateTime.
+        /// </summary>
+        /// <param name="args"></param>
+        /// <returns></returns>
+        private object Hour(object[] args)
+        {
+            if (args.Length != 0 && args.Length != 1)
+                throw new ExceptionArgCount();
+
+            object value = (args.Length == 1)
+                ? ProcessValue(args[0]) : DateTime.Now;
+
+            if (value is DateTime)
+                return (((DateTime)value).Hour);
+
+            if (value == null || value == EmptyOp)
+                return (value);
+
+            throw new ExceptionArg();
+        }
+
+        #endregion
+
+        #region Minute
+
+        /// <summary>
+        /// Returns the Minute of the given DateTime.
+        /// </summary>
+        /// <param name="args"></param>
+        /// <returns></returns>
+        private object Minute(object[] args)
+        {
+            if (args.Length != 0 && args.Length != 1)
+                throw new ExceptionArgCount();
+
+            object value = (args.Length == 1)
+                ? ProcessValue(args[0]) : DateTime.Now;
+
+            if (value is DateTime)
+                return (((DateTime)value).Minute);
+
+            if (value == null || value == EmptyOp)
+                return (value);
+
+            throw new ExceptionArg();
+        }
+
+        #endregion
+
+        #region Month
+
+        /// <summary>
+        /// Returns the Month of the given DateTime.
+        /// </summary>
+        /// <param name="args"></param>
+        /// <returns></returns>
+        private object Month(object[] args)
+        {
+            if (args.Length != 0 && args.Length != 1)
+                throw new ExceptionArgCount();
+
+            object value = (args.Length == 1)
+                ? ProcessValue(args[0]) : DateTime.Now;
+
+            if (value is DateTime)
+                return (((DateTime)value).Month);
+
+            if (value == null || value == EmptyOp)
+                return (value);
+
+            throw new ExceptionArg();
+        }
+
+        #endregion
+
+        #region Now
+
+        /// <summary>
+        /// Returns the current DateTime
+        /// </summary>
+        /// <param name="args"></param>
+        /// <returns></returns>
+        static private object Now(object[] args)
+        {
+            if (args.Length != 0)
+                throw new ExceptionArgCount();
+
+            return (DateTime.Now);
+        }
+
+        #endregion
+
+        #region Year
+
+        /// <summary>
+        /// Returns the Year of the given DateTime.
+        /// </summary>
+        /// <param name="args"></param>
+        /// <returns></returns>
+        private object Year(object[] args)
+        {
+            if (args.Length != 0 && args.Length != 1)
+                throw new ExceptionArgCount();
+
+            object value = (args.Length == 1)
+                ? ProcessValue(args[0]) : DateTime.Now;
+
+            if (value is DateTime)
+                return (((DateTime)value).Year);
+
+            if (value == null || value == EmptyOp)
+                return (value);
+
+            throw new ExceptionArg();
+        }
+
+        #endregion
+
+        #region Second
+
+        /// <summary>
+        /// Returns the Minute of the given DateTime.
+        /// </summary>
+        /// <param name="args"></param>
+        /// <returns></returns>
+        private object Second(object[] args)
+        {
+            if (args.Length != 0 && args.Length != 1)
+                throw new ExceptionArgCount();
+
+            object value = (args.Length == 1)
+                ? ProcessValue(args[0]) : DateTime.Now;
+
+            if (value is DateTime)
+                return (((DateTime)value).Second);
+
+            if (value == null || value == EmptyOp)
+                return (value);
+
+            throw new ExceptionArg();
+        }
+
+        #endregion
+
+        #region TimeOfDay
+
+        /// <summary>
+        /// Returns the TimeOfDay of the given DateTime.
+        /// </summary>
+        /// <param name="args"></param>
+        /// <returns></returns>
+        private object TimeOfDay(object[] args)
+        {
+            if (args.Length != 0 && args.Length != 1)
+                throw new ExceptionArgCount();
+
+            object value = (args.Length == 1)
+                ? ProcessValue(args[0]) : DateTime.Now;
+
+            if (value is DateTime)
+                return (((DateTime)value).TimeOfDay);
+
+            if (value == null || value == EmptyOp)
+                return (value);
+
+            throw new ExceptionArg();
+        }
+
+        #endregion
+
+        #region TotalDays
+
+        /// <summary>
+        /// Returns the TotalDays of the given TimeSpan.
+        /// </summary>
+        /// <param name="args"></param>
+        /// <returns></returns>
+        private object TotalDays(object[] args)
+        {
+            if (args.Length != 1)
+                throw new ExceptionArgCount();
+
+            object value = ProcessValue(args[0]);
+
+            if (value is TimeSpan)
+                return ((TimeSpan)value).TotalDays;
+
+            if (value == null || value == EmptyOp)
+                return (value);
+
+            throw new ExceptionArg();
+        }
+
+        #endregion
+
+        #region TotalHours
+
+        /// <summary>
+        /// Returns the TotalHours of the given TimeSpan.
+        /// </summary>
+        /// <param name="args"></param>
+        /// <returns></returns>
+        private object TotalHours(object[] args)
+        {
+            if (args.Length != 1)
+                throw new ExceptionArgCount();
+
+            object value = ProcessValue(args[0]);
+
+            if (value is TimeSpan)
+                return ((TimeSpan)value).TotalHours;
+
+            if (value == null || value == EmptyOp)
+                return (value);
+
+            throw new ExceptionArg();
+        }
+
+        #endregion
+
+        #region TotalMinutes
+
+        /// <summary>
+        /// Returns the TotalMinutes of the given TimeSpan.
+        /// </summary>
+        /// <param name="args"></param>
+        /// <returns></returns>
+        private object TotalMinutes(object[] args)
+        {
+            if (args.Length != 1)
+                throw new ExceptionArgCount();
+
+            object value = ProcessValue(args[0]);
+
+            if (value is TimeSpan)
+                return ((TimeSpan)value).TotalMinutes;
+
+            if (value == null || value == EmptyOp)
+                return (value);
+
+            throw new ExceptionArg();
+        }
+
+        #endregion
+
+        #region TotalSeconds
+
+        /// <summary>
+        /// Returns the TotalSeconds of the given TimeSpan.
+        /// </summary>
+        /// <param name="args"></param>
+        /// <returns></returns>
+        private object TotalSeconds(object[] args)
+        {
+            if (args.Length != 1)
+                throw new ExceptionArgCount();
+
+            object value = ProcessValue(args[0]);
+
+            if (value is TimeSpan)
+                return ((TimeSpan)value).TotalSeconds;
+
+            if (value == null || value == EmptyOp)
+                return (value);
+
+            throw new ExceptionArg();
+        }
+
+        #endregion
+
+        #region TotalYears
+
+        /// <summary>
+        /// Returns the TotalDays of the given TimeSpan.
+        /// </summary>
+        /// <param name="args"></param>
+        /// <returns></returns>
+        private object TotalYears(object[] args)
+        {
+            if (args.Length != 1)
+                throw new ExceptionArgCount();
+
+            object value = ProcessValue(args[0]);
+
+            if (value is TimeSpan)
+                return ((TimeSpan)value).TotalDays / 365;
+
+            if (value == null || value == EmptyOp)
+                return (value);
+
+            throw new ExceptionArg();
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Numeric Functions
+
+        #region Ceiling
+
+        /// <summary>
+        /// Returns the smallest whole value
+        /// greater than or equal to the given value.
+        /// </summary>
+        /// <param name="args"></param>
+        /// <returns></returns>
+        private object Ceiling(object[] args)
+        {
+            if (args.Length > 1)
+                throw new ExceptionArgCount();
+
+            object value = ProcessValue(args.Length == 0 ? _GridColumn : args[0]);
+
+            if (value is double)
+                return (Math.Ceiling((double)value));
+
+            if (value == null || value == EmptyOp)
+                return (value);
+
+            throw new ExceptionArg();
+        }
+
+        #endregion
+
+        #region Floor
+
+        /// <summary>
+        /// Returns the largest whole value
+        /// less than or equal to the given value.
+        /// </summary>
+        /// <param name="args"></param>
+        /// <returns></returns>
+        private object Floor(object[] args)
+        {
+            if (args.Length > 1)
+                throw new ExceptionArgCount();
+
+            object value = ProcessValue(args.Length == 0 ? _GridColumn : args[0]);
+
+            if (value is double)
+                return (Math.Floor((double)value));
+
+            if (value == null || value == EmptyOp)
+                return (value);
+
+            throw new ExceptionArg();
+        }
+
+        #endregion
+
+        #region Round
+
+        /// <summary>
+        /// Returns the largest whole value
+        /// less than or equal to the given value.
+        /// </summary>
+        /// <param name="args"></param>
+        /// <returns></returns>
+        private object Round(object[] args)
+        {
+            if (args.Length > 2)
+                throw new ExceptionArgCount();
+
+            object value = ProcessValue(args.Length == 0 ? _GridColumn : args[0]);
+            object decimals = args.Length > 1 ? ProcessValue(args[args.Length - 1]) : 0d;
+
+            if (value is double && decimals is double)
+                return (Math.Round((double)value, Convert.ToInt32(decimals)));
+
+            if (value == null || value == EmptyOp)
+                return (value);
+
+            throw new ExceptionArg();
+        }
+
+        #endregion
+
+        #endregion
+
+        #region String Functions
+
+        #region IndexOf
+
+        /// <summary>
+        /// Returns the index of the given
+        /// string within the alternate specified string.
+        /// </summary>
+        /// <param name="args"></param>
+        /// <returns>-1 if not found</returns>
+        private object IndexOf(object[] args)
+        {
+            if (args.Length < 2 || args.Length > 4)
+                throw new ExceptionArgCount();
+
+            object o1 = ProcessValue(args[0]);
+            object o2 = ProcessValue(args[1]);
+
+            if (o1 is string && o2 is string)
+            {
+                string text = (string)o1;
+                string subText = (string)o2;
+
+                int start = 0;
+                int len = text.Length;
+
+                if (args.Length > 2)
+                {
+                    object o3 = ProcessValue(args[2]);
+
+                    if (o3 is double == false && o3 is int == false)
+                        throw new ExceptionArg();
+
+                    start = Convert.ToInt32(o3);
+
+                    if (args.Length > 3)
+                    {
+                        object o4 = ProcessValue(args[2]);
+
+                        if (o4 is double == false && o4 is int == false)
+                            throw new ExceptionArg();
+
+                        len = Math.Min(len, Convert.ToInt32(o4));
+                    }
+                }
+
+                return (text.IndexOf(subText, start, len));
+            }
+
+            if (o1 == null || o1 == EmptyOp)
+                return (-1);
+
+            if (o2 == null || o2 == EmptyOp)
+                return (-1);
+
+            throw new ExceptionArg();
+        }
+
+        #endregion
+
+        #region Left
+
+        /// <summary>
+        /// Returns the left part of the given character
+        /// string with the specified number of characters.
+        /// </summary>
+        /// <param name="args"></param>
+        /// <returns></returns>
+        private object Left(object[] args)
+        {
+            if (args.Length != 2)
+                throw new ExceptionArgCount();
+
+            object text = ProcessValue(args[0]);
+
+            if (text is string)
+            {
+                string s = (string)text;
+
+                object len = ProcessValue(args[1]);
+
+                if (len is double == false && len is int == false)
+                    throw new ExceptionArg();
+
+                int n = Convert.ToInt32(len);
+
+                if (n > s.Length)
+                    n = s.Length;
+
+                return (s.Substring(0, n));
+            }
+
+            if (text == null || text == EmptyOp)
+                return (text);
+
+            throw new ExceptionArg();
+        }
+
+        #endregion
+
+        #region Length
+
+        /// <summary>
+        /// Returns the length the given string.
+        /// </summary>
+        /// <param name="args"></param>
+        /// <returns></returns>
+        private object Length(object[] args)
+        {
+            if (args.Length > 1)
+                throw new ExceptionArgCount();
+
+            object value = ProcessValue(args.Length == 0 ? _GridColumn : args[0]);
+
+            if (value is string)
+                return ((string)value).Length;
+
+            if (value == null || value == EmptyOp)
+                return (value);
+
+            throw new ExceptionArg();
+        }
+
+        #endregion
+
+        #region LTrim
+
+        /// <summary>
+        /// Removes all leading
+        /// whitespace characters from the given string.
+        /// </summary>
+        /// <param name="args"></param>
+        /// <returns></returns>
+        private object LTrim(object[] args)
+        {
+            if (args.Length > 1)
+                throw new ExceptionArgCount();
+
+            object value = ProcessValue(args.Length == 0 ? _GridColumn : args[0]);
+
+            if (value is string)
+                return ((string)value).TrimStart();
+
+            if (value == null || value == EmptyOp)
+                return (value);
+
+            throw new ExceptionArg();
+        }
+
+        #endregion
+
+        #region Raw
+
+        /// <summary>
+        /// Returns the raw unevaluated cell text (if the cell
+        /// contains an expression '=123', it is not evaluated as such).
+        /// </summary>
+        /// <param name="args"></param>
+        /// <returns></returns>
+        private object Raw(object[] args)
+        {
+            if (args.Length > 1)
+                throw new ExceptionArgCount();
+
+            return (args.Length == 0 ? _GridColumn : ProcessRawValue(args[0]));
+        }
+
+        #endregion
+
+        #region Right
+
+        /// <summary>
+        /// Returns the right part of the given character
+        /// string with the specified number of characters.
+        /// </summary>
+        /// <param name="args"></param>
+        /// <returns></returns>
+        private object Right(object[] args)
+        {
+            if (args.Length != 2)
+                throw new ExceptionArgCount();
+
+            object text = ProcessValue(args[0]);
+
+            if (text is string)
+            {
+                string s = (string)text;
+
+                object len = ProcessValue(args[1]);
+
+                if (len is double == false && len is int == false)
+                    throw new ExceptionArg();
+
+                int n = Convert.ToInt32(len);
+
+                if (n > s.Length)
+                    n = s.Length;
+
+                return (s.Substring(s.Length - n, n));
+            }
+
+            if (text == null || text == EmptyOp)
+                return (text);
+
+            throw new ExceptionArg();
+        }
+
+        #endregion
+
+        #region RTrim
+
+        /// <summary>
+        /// Removes all trailing
+        /// whitespace characters from the given string.
+        /// </summary>
+        /// <param name="args"></param>
+        /// <returns></returns>
+        private object RTrim(object[] args)
+        {
+            if (args.Length > 1)
+                throw new ExceptionArgCount();
+
+            object value = ProcessValue(args.Length == 0 ? _GridColumn : args[0]);
+
+            if (value is string)
+                return ((string)value).TrimEnd();
+
+            if (value == null || value == EmptyOp)
+                return (value);
+
+            throw new ExceptionArg();
+        }
+
+        #endregion
+
+        #region Substring
+
+        /// <summary>
+        /// Returns a substring of the given string.
+        /// </summary>
+        /// <param name="args"></param>
+        /// <returns></returns>
+        private object Substring(object[] args)
+        {
+            if (args.Length != 2 && args.Length != 3)
+                throw new ExceptionArgCount();
+
+            object text = ProcessValue(args[0]);
+
+            if (text is string)
+            {
+                string s = (string)text;
+
+                object index = ProcessValue(args[1]);
+
+                if (index is double == false)
+                    throw new ExceptionArg();
+
+                int n = Convert.ToInt32(index);
+
+                if (args.Length == 3)
+                {
+                    object length = ProcessValue(args[2]);
+
+                    if (length is double == false)
+                        throw new ExceptionArg();
+
+                    return (s.Substring(n, Convert.ToInt32(length)));
+                }
+
+                return (s.Substring(n));
+            }
+
+            if (text == null || text == EmptyOp)
+                return (text);
+
+            throw new ExceptionArg();
+        }
+
+        #endregion
+
+        #region ToLower
+
+        /// <summary>
+        /// Returns a lower cased copy of the given string
+        /// </summary>
+        /// <param name="args"></param>
+        /// <returns></returns>
+        private object ToLower(object[] args)
+        {
+            if (args.Length > 1)
+                throw new ExceptionArgCount();
+
+            object value = ProcessValue(args.Length == 0 ? _GridColumn : args[0]);
+
+            if (value is string)
+                return ((string)value).ToLower();
+
+            if (value == null || value == EmptyOp)
+                return (value);
+
+            throw new ExceptionArg();
+        }
+
+        #endregion
+
+        #region ToString
+
+        /// <summary>
+        /// Returns the ToString of the given object.
+        /// </summary>
+        /// <param name="args"></param>
+        /// <returns></returns>
+        private object ToString(object[] args)
+        {
+            if (args.Length > 1)
+                throw new ExceptionArgCount();
+
+            object value = ProcessValue(args.Length == 0 ? _GridColumn : args[0]);
+
+            if (value == null || value == EmptyOp)
+                return (value);
+
+            return (value.ToString());
+        }
+
+        #endregion
+
+        #region ToUpper
+
+        /// <summary>
+        /// Returns an upper cased copy of the given string
+        /// </summary>
+        /// <param name="args"></param>
+        /// <returns></returns>
+        private object ToUpper(object[] args)
+        {
+            if (args.Length > 1)
+                throw new ExceptionArgCount();
+
+            object value = ProcessValue(args.Length == 0 ? _GridColumn : args[0]);
+
+            if (value is string)
+                return ((string)value).ToUpper();
+
+            if (value == null || value == EmptyOp)
+                return (value);
+
+            throw new ExceptionArg();
+        }
+
+        #endregion
+
+        #region Trim
+
+        /// <summary>
+        /// Removes all leading and trailing
+        /// whitespace characters from the given string.
+        /// </summary>
+        /// <param name="args"></param>
+        /// <returns></returns>
+        private object Trim(object[] args)
+        {
+            if (args.Length > 1)
+                throw new ExceptionArgCount();
+
+            object value = ProcessValue(args.Length == 0 ? _GridColumn : args[0]);
+
+            if (value is string)
+                return ((string)value).Trim();
+
+            if (value == null || value == EmptyOp)
+                return (value);
+
+            throw new ExceptionArg();
+        }
+
+        #endregion
+
+        #endregion
+
+        #region User
+
+        /// <summary>
+        /// Calculates the sum of the given set of values
+        /// </summary>
+        /// <param name="args"></param>
+        /// <returns></returns>
+        private object User(object[] args)
+        {
+            object o = null;
+
+            object[] uargs = new object[args.Length];
+
+            for (int i = 0; i < args.Length; i++)
+                uargs[i] = ProcessValue(args[i]);
+
+            if (_GridPanel.SuperGrid.DoFilterUserFunctionEvent(
+                _GridRow, uargs, ref o) == false)
+            {
+                string s = uargs[0] + " - " + _undefinedFunctionString;
+
+                throw new Exception(s);
+            }
+
+            return (o);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region EvalOperator
+
+        private void EvalOperator(Stack myStack, FToken token)
+        {
+            if (myStack.Count < 2)
+                throw new Exception(_exprErrorString);
+
+            _PostError = true;
+
+            object value1 = ProcessValue(myStack.Pop());
+            object value2 = ProcessValue(myStack.Pop());
+
+            if (value1 == EmptyOp || value2 == EmptyOp)
+                OpEmptyValue(myStack, token, value1, value2);
+
+            else if (value1 is string || value2 is string)
+                OpStringValue(myStack, token, value1, value2);
+
+            else if (value1 is bool || value2 is bool)
+                OpBoolValue(myStack, token, value1, value2);
+
+            else if (value1 is DateTime || value2 is DateTime)
+                OpDateTimeValue(myStack, token, value1, value2);
+
+            else
+                OpDoubleValue(myStack, token, value1, value2);
+        }
+
+        #region ProcessValue
+
+        /// <summary>
+        /// Process the given object value
+        /// </summary>
+        /// <param name="o"></param>
+        /// <returns></returns>
+        private object ProcessValue(object o)
+        {
+            GridColumn col = o as GridColumn;
+
+            if (col != null)
+            {
+                if (col.ColumnIndex < _GridRow.Cells.Count)
+                {
+                    object value = _GridRow.Cells[col.ColumnIndex].Value;
+
+                    if (_GridRow.Cells[col.ColumnIndex].IsValueExpression == true)
+                        value = _GridRow.Cells[col.ColumnIndex].GetExpValue((string)value);
+
+                    return (value is DBNull ? null : value);
+                }
+
+                return (EmptyOp);
+            }
+
+            return (o);
+        }
+
+        #endregion
+
+        #region ProcessRawValue
+
+        /// <summary>
+        /// Process the given object value
+        /// </summary>
+        /// <param name="o"></param>
+        /// <returns></returns>
+        private object ProcessRawValue(object o)
+        {
+            GridColumn col = o as GridColumn;
+
+            if (col != null)
+            {
+                if (col.ColumnIndex < _GridRow.Cells.Count)
+                {
+                    object value = _GridRow.Cells[col.ColumnIndex].Value;
+
+                    return (value is DBNull ? null : value);
+                }
+
+                return (EmptyOp);
+            }
+
+            return (o);
+        }
+
+        #endregion
+
+        #region OpEmptyValue
+
+        private void OpEmptyValue(
+            Stack myStack, FToken op, object o1, object o2)
+        {
+            switch (op)
+            {
+                case FToken.Is:
+                case FToken.Like:
+                case FToken.Equal:
+                case FToken.LessThanOrEqual:
+                case FToken.GreaterThanOrEqual:
+                    myStack.Push((o2 == EmptyOp && o1 == EmptyOp));
+                    break;
+
+                case FToken.NotEqual:
+                case FToken.NotEqual2:
+                    myStack.Push(o2 != o1);
+                    break;
+
+                case FToken.LessThan:
+                    myStack.Push(o2 == o1 ? false : o2 == EmptyOp);
+                    break;
+                
+                case FToken.GreaterThan:
+                    myStack.Push(o2 == o1 ? false : o2 != EmptyOp);
+                    break;
+
+                case FToken.LogicalAnd:
+                case FToken.LogicalXor:
+                case FToken.Add:
+                case FToken.Subtract:
+                case FToken.Multiply:
+                case FToken.Divide:
+                case FToken.Mod:
+                case FToken.ShiftLeft:
+                case FToken.ShiftRight:
+                    myStack.Push(EmptyOp);
+                    break;
+
+                default:
+                    throw new Exception(_invalidEmptyOpString);
+            }
+        }
+
+        #endregion
+
+        #region OpDateTimeValue
+
+        private void OpDateTimeValue(
+            Stack myStack, FToken op, object o1, object o2)
+        {
+            if (op == FToken.Add)
+            {
+                OpDateTimeValueAdd(myStack, o1, o2);
+            }
+            else if (op == FToken.Subtract)
+            {
+                OpDateTimeValueSubtract(myStack, o1, o2);
+            }
+            else if ((o1 is DateTime || o1 == null) && (o2 is DateTime || o2 == null))
+            {
+                DateTime d1 = (DateTime)(o1 ?? DateTime.MinValue);
+                DateTime d2 = (DateTime)(o2 ?? DateTime.MinValue);
+
+                switch (op)
+                {
+                    case FToken.Is:
+                    case FToken.Equal:
+                        myStack.Push(d2.Equals(d1));
+                        break;
+
+                    case FToken.NotEqual:
+                    case FToken.NotEqual2:
+                        myStack.Push(d2.Equals(d1) == false);
+                        break;
+
+                    case FToken.LessThan:
+                        myStack.Push(d2.CompareTo(d1) < 0);
+                        break;
+
+                    case FToken.LessThanOrEqual:
+                        myStack.Push(d2.CompareTo(d1) <= 0);
+                        break;
+
+                    case FToken.GreaterThan:
+                        myStack.Push(d2.CompareTo(d1) > 0);
+                        break;
+
+                    case FToken.GreaterThanOrEqual:
+                        myStack.Push(d2.CompareTo(d1) >= 0);
+                        break;
+
+                    case FToken.Between:
+                        object value = ProcessValue(myStack.Pop());
+
+                        if (value == null || value == EmptyOp)
+                        {
+                            myStack.Push(false);
+                        }
+                        else
+                        {
+                            if (value is DateTime == false)
+                                throw new Exception(_invalidDateTimeOpString);
+
+                            DateTime d3 = (DateTime)value;
+
+                            myStack.Push(d3 >= d2 && d3 <= d1);
+                        }
+                        break;
+
+                    default:
+                        throw new Exception(_invalidDateTimeOpString);
+                }
+            }
+            else
+            {
+                throw new Exception(_invalidDateTimeOpString);
+            }
+        }
+
+        #region OpDateTimeValueAdd
+
+        private void OpDateTimeValueAdd(Stack myStack, object o1, object o2)
+        {
+            if (o2 is DateTime)
+            {
+                DateTime d2 = (DateTime)o2;
+
+                if (o1 is TimeSpan)
+                    myStack.Push(d2.Add((TimeSpan)o1));
+
+                else if (o1 is double)
+                    myStack.Push(d2.AddDays((double)o1));
+
+                else if (o1 == null)
+                    myStack.Push(d2);
+
+                else
+                    throw new Exception(_invalidDateTimeOpString);
+            }
+            else
+            {
+                throw new Exception(_invalidDateTimeOpString);
+            }
+        }
+
+        #endregion
+
+        #region OpDateTimeValueSubtract
+
+        private void OpDateTimeValueSubtract(Stack myStack, object o1, object o2)
+        {
+            if (o2 is DateTime)
+            {
+                DateTime d2 = (DateTime)o2;
+
+                if (o1 is TimeSpan)
+                    myStack.Push(d2.Add(-(TimeSpan)o1));
+
+                else if (o1 is DateTime)
+                    myStack.Push(d2 - (DateTime)o1);
+
+                else if (o1 is double)
+                    myStack.Push(d2.AddDays(-(double)o1));
+
+                else if (o1 == null)
+                    myStack.Push(new TimeSpan(0));
+
+                else
+                    throw new Exception(_invalidDateTimeOpString);
+            }
+            else
+            {
+                throw new Exception(_invalidDateTimeOpString);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region OpStringValue
+
+        private void OpStringValue(
+            Stack myStack, FToken op, object o1, object o2)
+        {
+            string s1 = (o1 != null ? o1.ToString() : "");
+            string s2 = (o2 != null ? o2.ToString() : "");
+
+            switch (op)
+            {
+                case FToken.Add:
+                    myStack.Push(s2 + s1);
+                    break;
+
+                case FToken.Is:
+                case FToken.Equal:
+                    if (_MatchType == FilterMatchType.None)
+                    {
+                        if (GridPanel.FilterIgnoreMatchCase == true)
+                        {
+                            s1 = s1.ToLower();
+                            s2 = s2.ToLower();
+                        }
+
+                        myStack.Push(s2.Equals(s1));
+                    }
+                    else
+                    {
+                        if (o1 == null || o2 == null)
+                        {
+                            myStack.Push(false);
+                        }
+                        else
+                        {
+                            _PostError = false;
+
+                            myStack.Push(Regex.IsMatch(s2, s1,
+                                 GridPanel.FilterIgnoreMatchCase ? RegexOptions.IgnoreCase : RegexOptions.None));
+                        }
+                    }
+                    break;
+
+                case FToken.NotEqual:
+                case FToken.NotEqual2:
+                    if (_MatchType == FilterMatchType.None)
+                    {
+                        if (GridPanel.FilterIgnoreMatchCase == true)
+                        {
+                            s1 = s1.ToLower();
+                            s2 = s2.ToLower();
+                        }
+
+                        myStack.Push(s2.Equals(s1) == false);
+                    }
+                    else
+                    {
+                        if (o1 == null || o2 == null)
+                        {
+                            myStack.Push(true);
+                        }
+                        else
+                        {
+                            _PostError = false;
+
+                            myStack.Push(Regex.IsMatch(s2, s1,
+                                GridPanel.FilterIgnoreMatchCase ? RegexOptions.IgnoreCase : RegexOptions.None) == false);
+                        }
+                    }
+                    break;
+
+                case FToken.LessThan:
+                    myStack.Push(s2.CompareTo(s1) < 0);
+                    break;
+
+                case FToken.LessThanOrEqual:
+                    myStack.Push(s2.CompareTo(s1) <= 0);
+                    break;
+
+                case FToken.GreaterThan:
+                    myStack.Push(s2.CompareTo(s1) > 0);
+                    break;
+
+                case FToken.GreaterThanOrEqual:
+                    myStack.Push(s2.CompareTo(s1) >= 0);
+                    break;
+
+                case FToken.Like:
+                    if (_MatchType == FilterMatchType.None)
+                    {
+                        if (GridPanel.FilterIgnoreMatchCase == true)
+                        {
+                            s1 = s1.ToLower();
+                            s2 = s2.ToLower();
+                        }
+
+                        myStack.Push(s2.StartsWith(s1));
+                    }
+                    else
+                    {
+                        _PostError = false;
+
+                        bool match = Regex.IsMatch(s2, s1,
+                            GridPanel.FilterIgnoreMatchCase ? RegexOptions.IgnoreCase : RegexOptions.None);
+
+                        myStack.Push(match);
+                    }
+                    break;
+
+                case FToken.Between:
+                    object value = ProcessValue(myStack.Pop());
+
+                    if (value == null || value == EmptyOp)
+                    {
+                        myStack.Push(false);
+                    }
+                    else
+                    {
+                        string s3 = (string)(value);
+
+                        myStack.Push(s3.CompareTo(s2) >= 0 && s3.CompareTo(s1) <= 0);
+                    }
+                    break;
+
+                default:
+                    throw new Exception(_invalidStringOpString);
+            }
+        }
+
+        #endregion
+
+        #region OpBoolValue
+
+        private void OpBoolValue(
+            Stack myStack, FToken op, object o1, object o2)
+        {
+            int b1 = GetBoolInt(o1);
+            int b2 = GetBoolInt(o2);
+
+            switch (op)
+            {
+                case FToken.LogicalAnd:
+                    myStack.Push((b2 == 1) && (b1 == 1));
+                    break;
+
+                case FToken.LogicalOr:
+                    myStack.Push((b2 == 1) || (b1 == 1));
+                    break;
+
+                case FToken.ConditionalAnd:
+                    myStack.Push((b2 == 1) && (b1 == 1));
+                    break;
+
+                case FToken.ConditionalOr:
+                    myStack.Push((b2 == 1) || (b1 == 1));
+                    break;
+
+                case FToken.LogicalXor:
+                    myStack.Push((b2 == 1) ^ (b1 == 1));
+                    break;
+
+                case FToken.Is:
+                case FToken.Equal:
+                case FToken.Like:
+                    myStack.Push(b2 == b1);
+                    break;
+
+                case FToken.NotEqual:
+                case FToken.NotEqual2:
+                    myStack.Push(b2 != b1);
+                    break;
+
+                default:
+                    throw new Exception(_invalidBoolOpString);
+            }
+        }
+
+        #region GetBoolInt
+
+        private int GetBoolInt(object o)
+        {
+            if (o == null)
+                return (-1);
+
+            string s = o as string;
+
+            if (s != null)
+            {
+                s = s.ToLower().Trim();
+
+                switch (s)
+                {
+                    case "y":
+                    case "yes":
+                    case "t":
+                    case "true":
+                    case "on":
+                    case "1":
+                        return (1);
+
+                    case "n":
+                    case "no":
+                    case "f":
+                    case "false":
+                    case "off":
+                    case "0":
+                        return (0);
+
+                    case "":
+                    case "null":
+                        return (-1);
+                }
+            }
+
+            return (Convert.ToBoolean(o) ? 1 : 0);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region OpDoubleValue
+
+        private void OpDoubleValue(
+            Stack myStack, FToken op, object o1, object o2)
+        {
+            if (o1 == null && o2 == null)
+            {
+                switch (op)
+                {
+                    case FToken.LogicalAnd:
+                    case FToken.LogicalXor:
+                    case FToken.Add:
+                    case FToken.Subtract:
+                    case FToken.Multiply:
+                    case FToken.Divide:
+                    case FToken.Mod:
+                    case FToken.ShiftLeft:
+                    case FToken.ShiftRight:
+                        myStack.Push(0d);
+                        break;
+
+                    case FToken.Is:
+                    case FToken.Equal:
+                    case FToken.LessThanOrEqual:
+                    case FToken.GreaterThanOrEqual:
+                    case FToken.Like:
+                        myStack.Push(true);
+                        break;
+
+                    case FToken.NotEqual:
+                    case FToken.NotEqual2:
+                    case FToken.LessThan:
+                    case FToken.GreaterThan:
+                    case FToken.ConditionalAnd:
+                    case FToken.ConditionalOr:
+                        myStack.Push(false);
+                        break;
+
+                    default:
+                        throw new Exception(_invalidNumericOpString);
+                }
+            }
+            else
+            {
+                double d1 = Convert.ToDouble(o1);
+                double d2 = Convert.ToDouble(o2);
+
+                switch (op)
+                {
+                    case FToken.LogicalAnd:
+                        myStack.Push((double)((int)d2 & (int)d1));
+                        break;
+
+                    case FToken.LogicalOr:
+                        myStack.Push((double)((int)d2 | (int)d1));
+                        break;
+
+                    case FToken.LogicalXor:
+                        myStack.Push((double)((int)d2 ^ (int)d1));
+                        break;
+
+                    case FToken.Add:
+                        myStack.Push(d2 + d1);
+                        break;
+
+                    case FToken.Subtract:
+                        myStack.Push(d2 - d1);
+                        break;
+
+                    case FToken.Multiply:
+                        myStack.Push(d2 * d1);
+                        break;
+
+                    case FToken.Divide:
+                        myStack.Push(d2 / d1);
+                        break;
+
+                    case FToken.Mod:
+                        myStack.Push(d2 % d1);
+                        break;
+
+                    case FToken.ShiftLeft:
+                        myStack.Push((double)((int)d2 << (int)d1));
+                        break;
+
+                    case FToken.ShiftRight:
+                        myStack.Push((double)((int)d2 >> (int)d1));
+                        break;
+
+                    case FToken.Equal:
+                        myStack.Push(o1 == null | o2 == null ? false : d1 == d2);
+                        break;
+
+                    case FToken.Is:
+                    case FToken.Like:
+                        myStack.Push(d2 == d1);
+                        break;
+
+                    case FToken.NotEqual:
+                    case FToken.NotEqual2:
+                        myStack.Push(o1 == null | o2 == null ? true : d1 != d2);
+                        break;
+
+                    case FToken.LessThan:
+                        myStack.Push(d2 < d1);
+                        break;
+
+                    case FToken.LessThanOrEqual:
+                        myStack.Push(d2 <= d1);
+                        break;
+                    case FToken.GreaterThan:
+                        myStack.Push(d2 > d1);
+                        break;
+
+                    case FToken.GreaterThanOrEqual:
+                        myStack.Push(d2 >= d1);
+                        break;
+
+                    case FToken.Between:
+                        object value = ProcessValue(myStack.Pop());
+
+                        if (value == null || value == EmptyOp)
+                        {
+                            myStack.Push(false);
+                        }
+                        else
+                        {
+                            double d3 = Convert.ToDouble(value);
+
+                            myStack.Push(d3 >= d2 && d3 <= d1);
+                        }
+                        break;
+
+                    default:
+                        throw new Exception(_invalidNumericOpString);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region EvalResult
+
+        private bool EvalResult(Stack myStack)
+        {
+            if (myStack.Count > 0)
+            {
+                object o = ProcessValue(myStack.Pop());
+
+                if (o is bool)
+                    return ((bool)o);
+
+                throw new Exception(_invalidEvalString);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetInfix code
+
+        /// <summary>
+        /// GetInfix
+        /// </summary>
+        /// <returns></returns>
+        public string GetInfix(bool colorize)
+        {
+            if (_PfTokens != null)
+            {
+                _Colorize = colorize;
+
+                string s = GetInfixEx(_PfTokens);
+
+                if (s.Length > 2)
+                {
+                    IsValueMarker('(', ')', ref s, false);
+
+                    return (s);
+                }
+            }
+
+            return ("");
+        }
+
+        private string GetInfixEx(List<FToken> pfTokens)
+        {
+            if (pfTokens.Count > 0)
+            {
+                Stack myStack = new Stack();
+
+                for (int i = 0; i < pfTokens.Count; i++)
+                {
+                    if (pfTokens[i] < FToken.Operator)
+                    {
+                        object o = _OperandPool[(int)pfTokens[i]];
+
+                        myStack.Push((o is string) ? "\"" + o + "\"" : o);
+                    }
+                    else if (pfTokens[i] > FToken.Functions)
+                        myStack.Push(pfTokens[i]);
+
+                    else if (pfTokens[i] == FToken.Negate)
+                        InfixNegate(myStack);
+
+                    else if (pfTokens[i] == FToken.ConditionalAndRpn)
+                        InfixShortCircuit(myStack, pfTokens[++i]);
+
+                    else if (pfTokens[i] == FToken.ConditionalOrRpn)
+                        InfixShortCircuit(myStack, pfTokens[++i]);
+
+                    else if (pfTokens[i] == FToken.Function)
+                        InfixFunction(myStack, (int)pfTokens[++i]);
+
+                    else
+                        InfixOperator(myStack, pfTokens[i]);
+                }
+
+                return (InfixValue(myStack.Pop()));
+            }
+
+            return ("");
+        }
+
+        #region InfixNegate
+
+        private void InfixNegate(Stack myStack)
+        {
+            if (myStack.Count < 1)
+                throw new Exception(_exprErrorString);
+
+            object o = myStack.Pop();
+
+            if (o is int || o is double)
+            {
+                myStack.Push("-" + InfixValue(o));
+            }
+            else
+            {
+                myStack.Push(o);
+
+                myStack.Push("(" +
+                     ColorPart("not ", ExprColorPart.Operator) +
+                     InfixValue(myStack.Pop()) + ")");
+            }
+        }
+
+        #endregion
+
+        #region InfixShortCircuit
+
+        private void InfixShortCircuit(
+            Stack myStack, FToken token)
+        {
+            string s = GetInfixEx((List<FToken>)_OperandPool[(int)token]);
+
+            myStack.Push(s);
+        }
+
+        #endregion
+
+        #region InfixFunction
+
+        /// <summary>
+        /// Evaluates the current function
+        /// </summary>
+        /// <param name="myStack"></param>
+        /// <param name="count"></param>
+        private void InfixFunction(Stack myStack, int count)
+        {
+            object[] args = new object[count];
+
+            for (int i = count - 1; i >= 0; i--)
+                args[i] = myStack.Pop();
+
+            FToken t = (FToken)myStack.Pop();
+
+            string func;
+            int index = 0;
+
+            if (t == FToken.User)
+            {
+                func = args[index++].ToString();
+
+                IsValueMarker('"', '"', ref func, false);
+                func = ColorPart(func, ExprColorPart.UserFunction);
+            }
+            else
+            {
+                func = Enum.GetName(typeof(FToken), t);
+                func = ColorPart(func, ExprColorPart.SysFunction);
+            }
+
+            StringBuilder sb = new StringBuilder();
+
+            for (int i=index; i<args.Length; i++)
+            {
+                object o = args[i];
+
+                sb.Append(InfixValue(o));
+                sb.Append(", ");
+            }
+
+            if (sb.Length > 0)
+                sb.Length -= 2;
+
+            sb.Insert(0, func + "(");
+            sb.Append(")");
+
+            myStack.Push(sb.ToString());
+        }
+
+        #endregion
+
+        #region InfixOperator
+
+        private void InfixOperator(Stack myStack, FToken token)
+        {
+            if (myStack.Count < 2)
+                throw new Exception(_exprErrorString);
+
+            string o1 = InfixValue(myStack.Pop());
+            string o2 = InfixValue(myStack.Pop());
+
+            string op = FTokenList.GetOpTokenText(token);
+
+            string s;
+
+            if (token == FToken.Between)
+            {
+                string o3 = InfixValue(myStack.Pop());
+
+                s = o3 + ColorPart(" is between ", ExprColorPart.Operator) +
+                    o2 + ColorPart(" and ", ExprColorPart.Operator) + o1;
+            }
+            else if (token == FToken.Like)
+            {
+                s = o2 + ColorPart(" is " + op + " ", ExprColorPart.Operator) + o1;
+            }
+            else
+            {
+                s = o2 + " " + ColorPart(op, ExprColorPart.Operator) + " " + o1;
+            }
+
+            myStack.Push("(" + s + ")");
+        }
+
+        #region InfixValue
+
+        /// <summary>
+        /// Process the given object value
+        /// </summary>
+        /// <param name="o"></param>
+        /// <returns></returns>
+        private string InfixValue(object o)
+        {
+            GridColumn col = o as GridColumn;
+
+            if (col != null)
+                return (ColorPart(GetFilterColumnName(col), ExprColorPart.Column));
+
+            if (o is EmptyFilterOp)
+                return (ColorPart("empty", ExprColorPart.Operator));
+
+            if (o == null)
+                return (ColorPart("null", ExprColorPart.Operator));
+
+            string s = o.ToString();
+
+            if (s.StartsWith("\"") && s.EndsWith("\""))
+                return (ColorPart(s, ExprColorPart.String));
+
+            return (s);
+        }
+
+        #region GetFilterColumnName
+
+        private string GetFilterColumnName(GridColumn gridColumn)
+        {
+            if (gridColumn.FilterExprUsesName == false &&
+                string.IsNullOrEmpty(gridColumn.HeaderText) == false)
+            {
+                return (gridColumn.HeaderText);
+            }
+            
+            return (gridColumn.Name);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region ColorPart
+
+        private string ColorPart(string s, ExprColorPart part)
+        {
+            if (_Colorize == true)
+                s = "#@@#" + (int)part + s + "#@@#0";
+
+            return (s);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region LoadLocalizedStrings
+
+        private void LoadLocalizedStrings()
+        {
+            if (_localizedStringsLoaded == false)
+            {
+                using (LocalizationManager lm = new LocalizationManager(_GridPanel.SuperGrid))
+                {
+                    string s;
+
+                    if ((s = lm.GetLocalizedString(LocalizationKeys.SuperGridFilterExprError)) != "")
+                        _exprErrorString = s;
+
+                    if ((s = lm.GetLocalizedString(LocalizationKeys.SuperGridFilterMissingParen)) != "")
+                        _missingParenString = s;
+
+                    if ((s = lm.GetLocalizedString(LocalizationKeys.SuperGridFilterMissingQuote)) != "")
+                        _missingQuoteString = s;
+
+                    if ((s = lm.GetLocalizedString(LocalizationKeys.SuperGridFilterInvalidArgCount)) != "")
+                        _invalidArgCountString = s;
+
+                    if ((s = lm.GetLocalizedString(LocalizationKeys.SuperGridFilterInvalidArg)) != "")
+                        _invalidArgString = s;
+
+                    if ((s = lm.GetLocalizedString(LocalizationKeys.SuperGridFilterInvalidEmptyOp)) != "")
+                        _invalidEmptyOpString = s;
+
+                    if ((s = lm.GetLocalizedString(LocalizationKeys.SuperGridFilterInvalidDateTimeOp)) != "")
+                        _invalidDateTimeOpString = s;
+
+                    if ((s = lm.GetLocalizedString(LocalizationKeys.SuperGridFilterInvalidStringOp)) != "")
+                        _invalidStringOpString = s;
+
+                    if ((s = lm.GetLocalizedString(LocalizationKeys.SuperGridFilterInvalidBoolOp)) != "")
+                        _invalidBoolOpString = s;
+
+                    if ((s = lm.GetLocalizedString(LocalizationKeys.SuperGridFilterInvalidNumericOp)) != "")
+                        _invalidNumericOpString = s;
+
+                    if ((s = lm.GetLocalizedString(LocalizationKeys.SuperGridFilterInvalidEval)) != "")
+                        _invalidEvalString = s;
+
+                    if ((s = lm.GetLocalizedString(LocalizationKeys.SuperGridFilterUndefinedFunction)) != "")
+                        _undefinedFunctionString = s;
+                }
+
+                _localizedStringsLoaded = true;
+            }
+        }
+
+        #endregion
+
+        #region FTokenList
+
+        internal class FTokenList
+        {
+            #region Static data
+
+            internal static TokenPair[] TokenListA = {
+                new TokenPair("+", FToken.Add),
+                new TokenPair("-", FToken.Subtract),
+                new TokenPair("*", FToken.Multiply),
+                new TokenPair("/", FToken.Divide),
+
+                new TokenPair("=", FToken.Equal),
+                new TokenPair("!=", FToken.NotEqual),
+                new TokenPair("<>", FToken.NotEqual2),
+                new TokenPair("<", FToken.LessThan),
+                new TokenPair("<=", FToken.LessThanOrEqual),
+                new TokenPair(">", FToken.GreaterThan),
+                new TokenPair(">=", FToken.GreaterThanOrEqual),
+                new TokenPair("(", FToken.LParen),
+                new TokenPair(")", FToken.RParen),
+
+                new TokenPair("&&", FToken.ConditionalAnd),
+                new TokenPair("||", FToken.ConditionalOr),
+
+                new TokenPair("&", FToken.LogicalAnd),
+                new TokenPair("|", FToken.LogicalOr),
+                new TokenPair("^", FToken.LogicalXor),
+                new TokenPair("%", FToken.Mod),
+                new TokenPair("<<", FToken.ShiftLeft),
+                new TokenPair(">>", FToken.ShiftRight),
+                new TokenPair(",", FToken.Comma),
+            };
+
+            internal static TokenPair[] TokenListB = {
+                new TokenPair("and", FToken.ConditionalAnd),
+                new TokenPair("or", FToken.ConditionalOr),
+                new TokenPair("like", FToken.Like),
+                new TokenPair("is", FToken.Is),
+                new TokenPair("not", FToken.Negate),
+                new TokenPair("between", FToken.Between),
+                new TokenPair("xor", FToken.LogicalXor),
+            };
+
+            internal static TokenPair[] TokenListC = {
+                new TokenPair("now", FToken.Now),
+                new TokenPair("date", FToken.Date),
+
+                new TokenPair("tod", FToken.TimeOfDay),
+                new TokenPair("timeofday", FToken.TimeOfDay),
+
+                new TokenPair("dow", FToken.DayOfWeek),
+                new TokenPair("dayofweek", FToken.DayOfWeek),
+
+                new TokenPair("doy", FToken.DayOfYear),
+                new TokenPair("dayofyear", FToken.DayOfYear),
+
+                new TokenPair("firstofmonth", FToken.FirstOfMonth),
+                new TokenPair("endofmonth", FToken.EndOfMonth),
+
+                new TokenPair("year", FToken.Year),
+                new TokenPair("years", FToken.Year),
+                new TokenPair("month", FToken.Month),
+                new TokenPair("months", FToken.Month),
+                new TokenPair("day", FToken.Day),
+                new TokenPair("days", FToken.Day),
+                new TokenPair("hour", FToken.Hour),
+                new TokenPair("hours", FToken.Hour),
+                new TokenPair("minute", FToken.Minute),
+                new TokenPair("minutes", FToken.Minute),
+                new TokenPair("second", FToken.Second),
+                new TokenPair("seconds", FToken.Second),
+
+                new TokenPair("addyears", FToken.AddYears),
+                new TokenPair("addmonths", FToken.AddMonths),
+                new TokenPair("adddays", FToken.AddDays),
+                new TokenPair("addhours", FToken.AddHours),
+                new TokenPair("addminutes", FToken.AddMinutes),
+                new TokenPair("addseconds", FToken.AddSeconds),
+
+                new TokenPair("totalyears", FToken.TotalYears),
+                new TokenPair("totaldays", FToken.TotalDays),
+                new TokenPair("totalhours", FToken.TotalHours),
+                new TokenPair("totalminutes", FToken.TotalMinutes),
+                new TokenPair("totalseconds", FToken.TotalSeconds),
+
+                new TokenPair("ceiling", FToken.Ceiling),
+                new TokenPair("floor", FToken.Floor),
+                new TokenPair("round", FToken.Round),
+
+                new TokenPair("length", FToken.Length),
+
+                new TokenPair("raw", FToken.Raw),
+                new TokenPair("right", FToken.Right),
+                new TokenPair("left", FToken.Left),
+                new TokenPair("substring", FToken.Substring),
+                new TokenPair("indexof", FToken.IndexOf),
+
+                new TokenPair("convert", FToken.Convert),
+                new TokenPair("tostring", FToken.ToString),
+                new TokenPair("tolower", FToken.ToLower),
+                new TokenPair("toupper", FToken.ToUpper),
+
+                new TokenPair("trim", FToken.Trim),
+                new TokenPair("ltrim", FToken.LTrim),
+                new TokenPair("rtrim", FToken.RTrim),
+            };
+
+            #endregion
+
+            #region GetToken
+
+            public static FToken GetToken(string text)
+            {
+                foreach (TokenPair tp in TokenListA)
+                {
+                    if (tp.Text.Equals(text) == true)
+                        return (tp.Token);
+                }
+
+                return (GetStringToken(text, TokenListB));
+            }
+
+            #endregion
+
+            #region GetStringToken
+
+            public static FToken
+                GetStringToken(string text, TokenPair[] tokenList)
+            {
+                string s = text.ToLower();
+
+                foreach (TokenPair tp in tokenList)
+                {
+                    if (tp.Text.Equals(s) == true)
+                        return (tp.Token);
+                }
+
+                return (FToken.BadToken);
+            }
+
+            #endregion
+
+            #region GetOpTokenText
+
+            public static string GetOpTokenText(FToken token)
+            {
+                foreach (TokenPair tp in TokenListB)
+                {
+                    if (tp.Token == token)
+                        return (tp.Text);
+                }
+
+                foreach (TokenPair tp in TokenListA)
+                {
+                    if (tp.Token == token)
+                        return (tp.Text);
+                }
+
+                return ("****");
+            }
+
+            #endregion
+
+            #region TokenPair
+
+            internal class TokenPair
+            {
+                #region Private data
+
+                public readonly string Text;
+                public readonly FToken Token;
+
+                #endregion
+
+                public TokenPair(string text, FToken token)
+                {
+                    Text = text;
+                    Token = token;
+                }
+            }
+
+            #endregion
+        }
+
+        #endregion
+
+        #region ExceptionArg/Count
+
+        private class ExceptionArgCount : Exception
+        {
+            public ExceptionArgCount()
+                : base(Name + "(): " + _invalidArgCountString)
+            {
+            }
+
+            private static string Name
+            {
+                get { return (new StackTrace().GetFrame(2).GetMethod().Name); }
+            }
+        }
+
+        private class ExceptionArg : Exception
+        {
+            public ExceptionArg()
+                : base(Name + "(): " + _invalidArgString)
+            {
+            }
+
+            private static string Name
+            {
+                get { return (new StackTrace().GetFrame(2).GetMethod().Name); }
+            }
+
+        }
+
+        #endregion
+    }
+
+    #region FToken
+
+    ///<summary>
+    /// Filter Tokens
+    ///</summary>
+    internal enum FToken
+    {
+        // Anything before this, is an operand
+
+        Operator = 512,
+
+        // Normal operators
+
+        Negate,
+
+        LParen,
+        RParen,
+
+        Multiply,
+        Divide,
+        Mod,
+
+        Add,
+        Subtract,
+
+        ShiftLeft,
+        ShiftRight,
+
+        LogicalOr,
+        LogicalAnd,
+        LogicalXor,
+
+        Function,
+        Comma,
+
+        ConditionalOr,
+        ConditionalAnd,
+
+        ConditionalOrRpn,
+        ConditionalAndRpn,
+
+        Equal,
+        GreaterThan,
+        GreaterThanOrEqual,
+        LessThan,
+        LessThanOrEqual,
+        NotEqual,
+        NotEqual2,
+
+        Like,
+        Is,
+        Between,
+
+        BadToken,
+
+        // Anything after this is a function
+
+        Functions,
+
+        User,
+
+        Ceiling,
+        Floor,
+        Round,
+
+        Length,
+
+        Substring,
+        IndexOf,
+        Left,
+        Right,
+        Raw,
+
+        Convert,
+        ToString,
+        ToLower,
+        ToUpper,
+
+        Trim,
+        LTrim,
+        RTrim,
+
+        Now,
+        Date,
+
+        TimeOfDay,
+        DayOfWeek,
+        DayOfYear,
+
+        FirstOfMonth,
+        EndOfMonth,
+
+        Year,
+        Month,
+        Day,
+        Hour,
+        Minute,
+        Second,
+
+        AddYears,
+        AddMonths,
+        AddDays,
+        AddHours,
+        AddMinutes,
+        AddSeconds,
+
+        TotalYears,
+        TotalDays,
+        TotalHours,
+        TotalMinutes,
+        TotalSeconds,
+    };
+
+    #endregion
+
+    #region EmptyFilterOp
+
+    ///<summary>
+    /// Empty Filter Operand
+    ///</summary>
+    public class EmptyFilterOp
+    {
+    }
+
+    #endregion
+
+    #region Wildcard
+
+    internal class Wildcard : Regex
+    {
+        public Wildcard(string pattern)
+            : base(WildcardToRegex(pattern))
+        {
+        }
+
+        public Wildcard(string pattern, RegexOptions options)
+            : base(WildcardToRegex(pattern), options)
+        {
+        }
+
+        public static string WildcardToRegex(string pattern)
+        {
+            //return "^" + Regex.Escape(pattern).
+            //    Replace("\\*", "[\\S\\s]*").
+            //    Replace("\\?", "[\\S\\s]") + "$";
+
+            StringBuilder sb = new StringBuilder();
+
+            char lastChar = '\0';
+
+            sb.Append("^");
+
+            for (int i = 0; i < pattern.Length; i++)
+            {
+                char c = pattern[i];
+
+                if (lastChar != '\\')
+                {
+                    switch (c)
+                    {
+                        case '.':
+                        case '$':
+                        case '&':
+                        case '^':
+                        case '(':
+                        case ')':
+                        case '{':
+                        case '}':
+                        case '[':
+                        case ']':
+                        case '<':
+                        case '>':
+                        case '+':
+                        case '|':
+                        case '-':
+                            sb.Append("\\");
+                            sb.Append(c);
+                            break;
+
+                        case '*':
+                            sb.Append("[\\S\\s]*");
+                            break;
+
+                        case '?':
+                            sb.Append("[\\S\\s]");
+                            break;
+
+                        default:
+                            sb.Append(c);
+                            break;
+                    }
+
+                    lastChar = c;
+                }
+                else
+                {
+                    sb.Append(c);
+
+                    lastChar = '\0';
+                }
+            }
+
+            sb.Append("$");
+
+            return (sb.ToString());
+        }
+    }
+
+    #endregion
+
+    #region ExprColorPart
+
+    internal enum ExprColorPart
+    {
+        Default,
+        Dim,
+
+        Column,
+        Operator,
+        String,
+        SysFunction,
+        UserFunction,
+        Error,
+
+        LastEntry
+    }
+
+    #endregion
+
+    #region ExpressionColors
+
+    ///<summary>
+    /// Expression syntax Colors
+    ///</summary>
+    [TypeConverter(typeof(ExpressionColorsConverter))]
+    public class ExpressionColors
+    {
+        #region Private variables
+
+        private Color[] _Colors;
+
+        #endregion
+
+        ///<summary>
+        /// Expression syntax Colors
+        ///</summary>
+        public ExpressionColors()
+        {
+            _Colors = new Color[(int)ExprColorPart.LastEntry];
+
+            _Colors[(int)ExprColorPart.Default] = Color.Black;
+            _Colors[(int)ExprColorPart.Dim] = Color.DimGray;
+            _Colors[(int)ExprColorPart.Column] = Color.Green;
+            _Colors[(int)ExprColorPart.Operator] = Color.Blue;
+            _Colors[(int)ExprColorPart.String] = Color.Crimson;
+            _Colors[(int)ExprColorPart.SysFunction] = Color.DarkRed;
+            _Colors[(int)ExprColorPart.UserFunction] = Color.Teal;
+            _Colors[(int)ExprColorPart.Error] = Color.Crimson;
+        }
+
+        #region Public properties
+
+        #region Default
+
+        ///<summary>
+        /// Default text color
+        ///</summary>
+        [DefaultValue(typeof(Color), "Black")]
+        public Color Default
+        {
+            get { return (_Colors[(int)ExprColorPart.Default]); }
+            set { _Colors[(int)ExprColorPart.Default] = value; }
+        }
+
+        #endregion
+
+        #region Dim
+
+        ///<summary>
+        /// Dim text color
+        ///</summary>
+        [DefaultValue(typeof(Color), "DimGray")]
+        public Color Dim
+        {
+            get { return (_Colors[(int)ExprColorPart.Dim]); }
+            set { _Colors[(int)ExprColorPart.Dim] = value; }
+        }
+
+        #endregion
+
+        #region Column
+
+        ///<summary>
+        /// Column Name text color
+        ///</summary>
+        [DefaultValue(typeof(Color), "Green")]
+        public Color Column
+        {
+            get { return (_Colors[(int)ExprColorPart.Column]); }
+            set { _Colors[(int)ExprColorPart.Column] = value; }
+        }
+
+        #endregion
+
+        #region Operator
+
+        ///<summary>
+        /// Operator text color
+        ///</summary>
+        [DefaultValue(typeof(Color), "Blue")]
+        public Color Operator
+        {
+            get { return (_Colors[(int)ExprColorPart.Operator]); }
+            set { _Colors[(int)ExprColorPart.Operator] = value; }
+        }
+
+        #endregion
+
+        #region String
+
+        ///<summary>
+        /// String text color
+        ///</summary>
+        [DefaultValue(typeof(Color), "Crimson")]
+        public Color String
+        {
+            get { return (_Colors[(int)ExprColorPart.String]); }
+            set { _Colors[(int)ExprColorPart.String] = value; }
+        }
+
+        #endregion
+
+        #region SysFunction
+
+        ///<summary>
+        /// System Function text color
+        ///</summary>
+        [DefaultValue(typeof(Color), "SaddleBrown")]
+        public Color SysFunction
+        {
+            get { return (_Colors[(int)ExprColorPart.SysFunction]); }
+            set { _Colors[(int)ExprColorPart.SysFunction] = value; }
+        }
+
+        #endregion
+
+        #region UserFunction
+
+        ///<summary>
+        /// User Function text color
+        ///</summary>
+        [DefaultValue(typeof(Color), "Teal")]
+        public Color UserFunction
+        {
+            get { return (_Colors[(int)ExprColorPart.UserFunction]); }
+            set { _Colors[(int)ExprColorPart.UserFunction] = value; }
+        }
+
+        #endregion
+
+        #region Error
+
+        ///<summary>
+        /// Error text color
+        ///</summary>
+        [DefaultValue(typeof(Color), "Crimson")]
+        public Color Error
+        {
+            get { return (_Colors[(int)ExprColorPart.Error]); }
+            set { _Colors[(int)ExprColorPart.Error] = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region Colors
+
+        internal Color[] Colors
+        {
+            get { return (_Colors); }
+        }
+
+        #endregion
+
+        #endregion
+    }
+
+    #region ExpressionColorsConverter
+
+    ///<summary>
+    /// ExpressionColorsConverter
+    ///</summary>
+    public class ExpressionColorsConverter : ExpandableObjectConverter
+    {
+        /// <summary>
+        /// ConvertTo
+        /// </summary>
+        /// <param name="context"></param>
+        /// <param name="culture"></param>
+        /// <param name="value"></param>
+        /// <param name="destinationType"></param>
+        /// <returns></returns>
+        public override object ConvertTo(
+            ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+        {
+            if (destinationType == typeof(string))
+                return (" ");
+
+            return (base.ConvertTo(context, culture, value, destinationType));
+        }
+    }
+
+    #endregion
+
+    #endregion
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridFilter/FilterExprEdit.Designer.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridFilter/FilterExprEdit.Designer.cs
new file mode 100644
index 00000000..38e61f6f
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridFilter/FilterExprEdit.Designer.cs	
@@ -0,0 +1,112 @@
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    partial class FilterExprEdit
+    {
+        /// <summary> 
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #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.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
+            this.rtbOutput = new DevComponents.DotNetBar.Controls.RichTextBoxEx();
+            this.rtbInput = new DevComponents.DotNetBar.Controls.RichTextBoxEx();
+            this.tableLayoutPanel1.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // tableLayoutPanel1
+            // 
+            this.tableLayoutPanel1.BackColor = System.Drawing.Color.White;
+            this.tableLayoutPanel1.ColumnCount = 1;
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
+            this.tableLayoutPanel1.Controls.Add(this.rtbOutput, 0, 1);
+            this.tableLayoutPanel1.Controls.Add(this.rtbInput, 0, 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 = 2;
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
+            this.tableLayoutPanel1.Size = new System.Drawing.Size(398, 92);
+            this.tableLayoutPanel1.TabIndex = 2;
+            // 
+            // rtbOutput
+            // 
+            // 
+            // 
+            // 
+            this.rtbOutput.BackgroundStyle.BackColor = System.Drawing.SystemColors.Control;
+            this.rtbOutput.BackgroundStyle.Class = "RichTextBoxBorder";
+            this.rtbOutput.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.rtbOutput.BackgroundStyle.PaddingBottom = 4;
+            this.rtbOutput.BackgroundStyle.PaddingLeft = 4;
+            this.rtbOutput.BackgroundStyle.PaddingRight = 4;
+            this.rtbOutput.BackgroundStyle.PaddingTop = 4;
+            this.rtbOutput.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.rtbOutput.Location = new System.Drawing.Point(3, 49);
+            this.rtbOutput.Name = "rtbOutput";
+            this.rtbOutput.ReadOnly = true;
+            this.rtbOutput.Rtf = "{\\rtf1\\ansi\\ansicpg1252\\deff0\\deflang1033{\\fonttbl{\\f0\\fnil\\fcharset0 Microsoft S" +
+    "ans Serif;}}\r\n\\viewkind4\\uc1\\pard\\f0\\fs17\\par\r\n}\r\n";
+            this.rtbOutput.Size = new System.Drawing.Size(392, 40);
+            this.rtbOutput.TabIndex = 2;
+            // 
+            // rtbInput
+            // 
+            // 
+            // 
+            // 
+            this.rtbInput.BackgroundStyle.Class = "RichTextBoxBorder";
+            this.rtbInput.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.rtbInput.BackgroundStyle.PaddingBottom = 4;
+            this.rtbInput.BackgroundStyle.PaddingLeft = 4;
+            this.rtbInput.BackgroundStyle.PaddingRight = 4;
+            this.rtbInput.BackgroundStyle.PaddingTop = 4;
+            this.rtbInput.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.rtbInput.Location = new System.Drawing.Point(3, 3);
+            this.rtbInput.Name = "rtbInput";
+            this.rtbInput.Rtf = "{\\rtf1\\ansi\\ansicpg1252\\deff0\\deflang1033{\\fonttbl{\\f0\\fnil\\fcharset0 Microsoft S" +
+    "ans Serif;}}\r\n\\viewkind4\\uc1\\pard\\f0\\fs17\\par\r\n}\r\n";
+            this.rtbInput.Size = new System.Drawing.Size(392, 40);
+            this.rtbInput.TabIndex = 1;
+            this.rtbInput.TextChanged += new System.EventHandler(this.RichTextBoxEx1TextChanged);
+            // 
+            // FilterExprEdit
+            // 
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
+            this.Controls.Add(this.tableLayoutPanel1);
+            this.Name = "FilterExprEdit";
+            this.Size = new System.Drawing.Size(398, 92);
+            this.tableLayoutPanel1.ResumeLayout(false);
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
+        private DevComponents.DotNetBar.Controls.RichTextBoxEx rtbOutput;
+        private DevComponents.DotNetBar.Controls.RichTextBoxEx rtbInput;
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridFilter/FilterExprEdit.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridFilter/FilterExprEdit.cs
new file mode 100644
index 00000000..87d09cdf
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridFilter/FilterExprEdit.cs	
@@ -0,0 +1,285 @@
+using System;
+using System.Drawing;
+using System.Text.RegularExpressions;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.Controls;
+using DevComponents.DotNetBar.SuperGrid.SuperGrid;
+
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    ///<summary>
+    /// FilterExprEdit
+    ///</summary>
+    internal partial class FilterExprEdit : UserControl
+    {
+        #region InputTextChanged
+
+        public event EventHandler<EventArgs> InputTextChanged;
+
+        #endregion
+
+        #region Private variables
+
+        private GridPanel _GridPanel;
+        private GridColumn _GridColumn;
+
+        private string[] _Fonts;
+        private int _FontSize;
+
+        private string _WaterMarkText;
+
+        #endregion
+
+        ///<summary>
+        /// FilterExprEdit
+        ///</summary>
+        public FilterExprEdit()
+        {
+            InitializeComponent();
+
+            rtbInput.Font = SystemFonts.DialogFont;
+
+            _FontSize = (int)rtbInput.Font.SizeInPoints;
+            _Fonts = new string[] { rtbInput.Font.Name };
+        }
+
+        #region Public properties
+
+        #region GridColumn
+
+        internal GridColumn GridColumn
+        {
+            get { return (_GridColumn); }
+            set { _GridColumn = value; }
+        }
+
+        #endregion
+
+        #region GridPanel
+
+        internal GridPanel GridPanel
+        {
+            get { return (_GridPanel); }
+            set { _GridPanel = value; }
+        }
+
+        #endregion
+
+        #region InputText
+
+        internal string InputText
+        {
+            get { return (rtbInput.Text); }
+
+            set
+            {
+                rtbInput.Text = value;
+
+                UpdateOutput();
+            }
+        }
+
+        #endregion
+
+        #region RtbOutput
+
+        internal RichTextBoxEx RtbOutput
+        {
+            get { return (rtbOutput); }
+        }
+
+        #endregion
+
+        #region WaterMarkText
+
+        internal string WaterMarkText
+        {
+            get { return (_WaterMarkText); }
+
+            set
+            {
+                _WaterMarkText = value;
+
+                UpdateOutput();
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region SetFocus
+
+        public void SetFocus()
+        {
+            rtbInput.Focus();
+        }
+
+        #endregion
+
+        #region RichTextBoxEx1TextChanged
+
+        private void RichTextBoxEx1TextChanged(object sender, EventArgs e)
+        {
+            if (InputTextChanged != null)
+                InputTextChanged(this, EventArgs.Empty);
+
+            UpdateOutput();
+        }
+
+        #endregion
+
+        #region UpdateOutput
+
+        private void UpdateOutput()
+        {
+            if (string.IsNullOrEmpty(rtbInput.Text) == true)
+            {
+                OutPutWaterMarkText(rtbOutput);
+            }
+            else
+            {
+                try
+                {
+                    FilterMatchType mtype = (_GridColumn != null)
+                        ? _GridColumn.GetFilterMatchType()
+                        : _GridPanel.GetFilterMatchType();
+
+                    FilterEval eval = new FilterEval(
+                        _GridPanel, _GridColumn, mtype, rtbInput.Text);
+
+                    OutputRtf(rtbOutput,
+                        eval.GetInfix(_GridPanel.SuperGrid.FilterColorizeCustomExpr));
+                }
+                catch (Exception exp)
+                {
+                    OutputRtfError(rtbOutput, rtbInput.Text, exp.Message);
+                }
+            }
+        }
+
+        #region OutPutWaterMarkText
+
+        private void OutPutWaterMarkText(RichTextBoxEx rtbOut)
+        {
+            if (_GridPanel != null &&
+                string.IsNullOrEmpty(_WaterMarkText) == false)
+            {
+                Rtf myRtf = new Rtf(_Fonts,
+                    _GridPanel.SuperGrid.FilterExprColors.Colors);
+
+                myRtf.BeginGroup(true);
+
+                myRtf.Font = 0;
+                myRtf.FontSize = _FontSize;
+                myRtf.CenterAlignText();
+
+                myRtf.ForeColor = (int)ExprColorPart.Dim;
+
+                myRtf.WriteLine();
+                myRtf.WriteText(_WaterMarkText);
+
+                myRtf.EndGroup();
+                myRtf.Close();
+
+                rtbOut.Rtf = myRtf.RtfText;
+            }
+            else
+            {
+                rtbOut.Clear();
+            }
+        }
+
+        #endregion
+
+        #region OutputRtf
+
+        private void OutputRtf(RichTextBoxEx rtb, string s)
+        {
+            s = s.Trim();
+
+            if (string.IsNullOrEmpty(s) == false)
+            {
+                Rtf myRtf = new Rtf(_Fonts,
+                    _GridPanel.SuperGrid.FilterExprColors.Colors);
+
+                myRtf.BeginGroup(true);
+
+                myRtf.Font = 0;
+                myRtf.FontSize = _FontSize;
+                myRtf.ForeColor = (int)ExprColorPart.Default;
+
+                Regex r = new Regex("(#@@#\\d)");
+                MatchCollection mc = r.Matches(s);
+
+                if (mc.Count > 0)
+                {
+                    int index = 0;
+
+                    for (int i = 0; i < mc.Count; i++)
+                    {
+                        Match ma = mc[i];
+
+                        if (ma.Index > index)
+                            myRtf.WriteText(s.Substring(index, ma.Index - index));
+
+                        index = ma.Index + ma.Length;
+
+                        myRtf.ForeColor = s[index - 1] - '0';
+                    }
+
+                    if (s.Length > index)
+                        myRtf.WriteText(s.Substring(index, s.Length - index));
+                }
+                else
+                {
+                    myRtf.WriteText(s);
+                }
+
+                myRtf.EndGroup();
+                myRtf.Close();
+
+                rtb.Rtf = myRtf.RtfText;
+            }
+            else
+            {
+                rtb.Text = "";
+            }
+        }
+
+        #endregion
+
+        #region OutputRtfError
+
+        private void OutputRtfError(
+            RichTextBoxEx rtbOut, string text, string error)
+        {
+            Rtf myRtf = new Rtf(_Fonts,
+                _GridPanel.SuperGrid.FilterExprColors.Colors);
+
+            myRtf.BeginGroup(true);
+
+            myRtf.Font = 0;
+            myRtf.FontSize = _FontSize;
+            myRtf.ForeColor = (int)ExprColorPart.Default;
+
+            myRtf.WriteText(text);
+            myRtf.WriteText("  ");
+
+            myRtf.ForeColor = (int)ExprColorPart.Error;
+
+            myRtf.WriteLine();
+            myRtf.WriteLine();
+            myRtf.WriteText("(" + error + ")");
+
+            myRtf.EndGroup();
+            myRtf.Close();
+
+            rtbOut.Rtf = myRtf.RtfText;
+        }
+
+        #endregion
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridFilter/FilterExprEdit.resx b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridFilter/FilterExprEdit.resx
new file mode 100644
index 00000000..19dc0dd8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridFilter/FilterExprEdit.resx	
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridFilter/FilterPanel.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridFilter/FilterPanel.cs
new file mode 100644
index 00000000..b740d533
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridFilter/FilterPanel.cs	
@@ -0,0 +1,1403 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.Controls;
+using DevComponents.DotNetBar.SuperGrid.Style;
+
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    ///<summary>
+    /// FilterPanel
+    ///</summary>
+    [ToolboxItem(false)]
+    public class FilterPanel : Control
+    {
+        #region Static variables
+
+        static FilterPanel _textBoxPanel;
+        static FilterPanel _checkBoxPanel;
+        static FilterPanel _comboBoxPanel;
+
+        #endregion
+
+        #region Private variables
+
+        private FilterEditType _FilterType;
+
+        private string _FilterExpr;
+        private object _FilterValue;
+        private object _FilterDisplayValue;
+
+        private Size _SizeEx;
+        private Point _OffsetEx;
+
+        private GridColumn _GridColumn;
+        private GridFilter _GridFilter;
+        private Control _Control;
+
+        private FilterColumnHeaderVisualStyle _Style;
+
+        private bool _LockedSelection;
+
+        #endregion
+
+        ///<summary>
+        /// Constructor
+        ///</summary>
+        public FilterPanel()
+        {
+            SetStyle(ControlStyles.OptimizedDoubleBuffer, true);
+            SetStyle(ControlStyles.Selectable, false);
+        }
+
+        #region Public properties
+
+        #region Control
+
+        ///<summary>
+        /// Control
+        ///</summary>
+        public Control Control
+        {
+            get { return (_Control); }
+
+            internal set
+            {
+                if (_Control != value)
+                {
+                    if (_Control is MyCheckBoxX)
+                        FilterCheckBox = null;
+
+                    else if (_Control is ComboBoxEx)
+                        FilterComboBox = null;
+
+                    else if (_Control is TextBoxX)
+                        FilterTextBox = null;
+                }
+
+                if (value != null)
+                {
+                    Controls.Clear();
+                    Controls.Add(value);
+                }
+
+                _Control = value;
+            }
+        }
+
+        #endregion
+
+        #region GridColumn
+
+        ///<summary>
+        /// GridColumn
+        ///</summary>
+        public GridColumn GridColumn
+        {
+            get { return (_GridColumn); }
+            set { _GridColumn = value; }
+        }
+
+        #endregion
+
+        #region GridFilter
+
+        ///<summary>
+        /// GridFilter
+        ///</summary>
+        public GridFilter GridFilter
+        {
+            get { return (_GridFilter); }
+            set { _GridFilter = value; }
+        }
+
+        #endregion
+
+        #region Style
+
+        ///<summary>
+        /// Style
+        ///</summary>
+        public FilterColumnHeaderVisualStyle Style
+        {
+            get { return (_Style); }
+            set { _Style = (value != null) ? value.Copy() : null; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region FilterCheckBox
+
+        internal MyCheckBoxX FilterCheckBox
+        {
+            get
+            {
+                MyCheckBoxX mcb = Control as MyCheckBoxX;
+
+                if (mcb == null)
+                {
+                    mcb = new MyCheckBoxX();
+
+                    mcb.ThreeState = true;
+                    mcb.FocusCuesEnabled = false;
+
+                    mcb.CheckedChanged += FilterValueChanged;
+                    mcb.LostFocus += ControlLostFocus;
+                }
+
+                return (mcb);
+            }
+
+            set
+            {
+                MyCheckBoxX mcb = Control as MyCheckBoxX;
+
+                if (mcb != null)
+                {
+                    mcb.CheckedChanged -= FilterValueChanged;
+                    mcb.LostFocus -= ControlLostFocus;
+                }
+            }
+        }
+
+        #endregion
+
+        #region FilterComboBox
+
+        internal ComboBoxEx FilterComboBox
+        {
+            get
+            {
+                ComboBoxEx cb = Control as ComboBoxEx;
+
+                if (cb == null)
+                {
+                    cb = new ComboBoxEx();
+
+                    cb.DrawMode = DrawMode.OwnerDrawFixed;
+                    cb.DropDownStyle = ComboBoxStyle.DropDownList;
+
+                    cb.SelectedValueChanged += FilterValueChanged;
+                    cb.LostFocus += ControlLostFocus;
+                }
+
+                return (cb);
+            }
+
+            set
+            {
+                ComboBoxEx cb = Control as ComboBoxEx;
+
+                if (cb != null)
+                {
+                    cb.SelectedValueChanged -= FilterValueChanged;
+                    cb.LostFocus -= ControlLostFocus;
+                }
+            }
+        }
+
+        #endregion
+
+        #region FilterTextBox
+
+        internal TextBoxX FilterTextBox
+        {
+            get
+            {
+                TextBoxX tb = Control as TextBoxX;
+
+                if (tb == null)
+                {
+                    tb = new TextBoxX();
+
+                    tb.BorderStyle = BorderStyle.None;
+
+                    tb.TextChanged += FilterValueChanged;
+                    tb.LostFocus += ControlLostFocus;
+
+                }
+
+                return (tb);
+            }
+
+            set
+            {
+                TextBoxX tb = Control as TextBoxX;
+
+                if (tb != null)
+                {
+                    tb.TextChanged -= FilterValueChanged;
+                    tb.LostFocus -= ControlLostFocus;
+                }
+            }
+        }
+
+        #endregion
+
+        #region FilterType
+
+        internal FilterEditType FilterType
+        {
+            get { return (_FilterType); }
+            set { _FilterType = value; }
+        }
+
+        #endregion
+
+        #region OffsetEx
+
+        internal Point OffsetEx
+        {
+            get { return (_OffsetEx); }
+            set { _OffsetEx = value; }
+        }
+
+        #endregion
+
+        #region SizeEx
+
+        internal Size SizeEx
+        {
+            get { return (_SizeEx); }
+            set { _SizeEx = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region OnPaintBackground
+
+        /// <summary>
+        /// OnPaintBackground
+        /// </summary>
+        /// <param name="e">PaintEventArgs</param>
+        protected override void OnPaintBackground(PaintEventArgs e)
+        {
+            Graphics g = e.Graphics;
+
+            if (_Style != null && _GridColumn != null)
+            {
+                Rectangle r = ClientRectangle;
+
+                if (r.IsEmpty == false)
+                {
+                    using (Brush br = _Style.Background.GetBrush(r))
+                        g.FillRectangle(br, r);
+                }
+            }
+            else
+            {
+                base.OnPaintBackground(e);
+            }
+        }
+
+        #endregion
+
+        #region GetPreferredSize
+
+        static TextBoxX _sizeTextBox;
+        static ComboBoxEx _sizeComboBox;
+        static MyCheckBoxX _sizeCheckBox;
+
+        static internal Size GetPreferredSize(
+            GridFilter gridFilter, GridColumn gridColumn)
+        {
+            Size size = Size.Empty;
+
+            FilterEditType type = gridColumn.GetFilterPanelType();
+
+            switch (type)
+            {
+                case FilterEditType.ComboBox:
+                    if (_sizeComboBox == null)
+                        _sizeComboBox = new ComboBoxEx();
+
+                    _sizeComboBox.Font = gridFilter.GetEffectiveStyle(gridColumn).Font;
+
+                    size = _sizeComboBox.GetPreferredSize(Size.Empty);
+
+                    size.Height++;
+                    size.Width++;
+                    break;
+
+                case FilterEditType.TextBox:
+                case FilterEditType.DateTime:
+                    if (_sizeTextBox == null)
+                        _sizeTextBox = new TextBoxX();
+
+                    _sizeTextBox.BorderStyle = BorderStyle.None;
+                    _sizeTextBox.Font = gridFilter.GetEffectiveStyle(gridColumn).Font;
+
+                    size = _sizeTextBox.GetPreferredSize(Size.Empty);
+                    break;
+
+                case FilterEditType.CheckBox:
+                    if (_sizeCheckBox == null)
+                        _sizeCheckBox = new MyCheckBoxX();
+
+                    size = Dpi.Size(13, 13);
+                    break;
+            }
+
+            return (size);
+        }
+
+        #endregion
+
+        #region RenderCheckBox
+
+        static internal void RenderCheckBox(
+            Graphics g, GridFilter gf, GridColumn column, Rectangle bounds)
+        {
+            object value = column.FilterValue;
+
+            if (_sizeCheckBox == null)
+            {
+                _sizeCheckBox = new MyCheckBoxX();
+
+                _sizeCheckBox.Text = "";
+                _sizeCheckBox.BackColor = Color.Transparent;
+            }
+
+            int width = Dpi.Width13;
+            int height = Dpi.Height13;
+
+            _sizeCheckBox.Enabled = false;
+            _sizeCheckBox.Size = new Size(width, height);
+            _sizeCheckBox.BackColor = GetSimpleColor(gf.GetEffectiveStyle(column));
+
+            if (value is CheckState)
+                _sizeCheckBox.CheckState = (CheckState)value;
+            else
+                _sizeCheckBox.CheckState = CheckState.Indeterminate;
+
+            Rectangle r = new Rectangle(0, 0, width, height);
+
+            using (Bitmap bm = new Bitmap(width, height))
+            {
+                _sizeCheckBox.DrawToBitmap(bm, r);
+
+                Rectangle t = bounds;
+
+                if (bounds.Width > r.Width)
+                {
+                    t.X += (t.Width - r.Width - 1) / 2;
+                    t.Width = r.Width;
+                }
+
+                if (bounds.Height > r.Height)
+                {
+                    t.Y += (t.Height - r.Height) / 2;
+                    t.Height = r.Height;
+                }
+
+                g.DrawImage(bm, t);
+            }
+        }
+
+        #endregion
+
+        #region GetFilterPanel
+
+        static internal FilterPanel GetFilterPanel(GridColumn gridColumn)
+        {
+            FilterEditType type = gridColumn.GetFilterPanelType();
+
+            if (type != FilterEditType.None)
+            {
+                GridFilter gridFilter = gridColumn.GridPanel.Filter;
+
+                FilterPanel fp = GetFilterPanel(gridFilter, type);
+
+                fp.GridFilter = gridFilter;
+                fp.GridColumn = gridColumn;
+
+                StyleState styleState = gridFilter.GetStyleState(gridColumn, true);
+                fp.Style = gridFilter.GetEffectiveStyle(gridColumn, styleState);
+
+                fp.InitEditControl(type);
+
+                return (fp);
+            }
+
+            return (null);
+        }
+
+        #region InitEditControl
+
+        private void InitEditControl(FilterEditType type)
+        {
+            FilterType = type;
+
+            switch (type)
+            {
+                case FilterEditType.CheckBox:
+                    InitCheckBoxEdit();
+                    break;
+
+                case FilterEditType.ComboBox:
+                    InitComboBoxEdit();
+                    break;
+
+                case FilterEditType.DateTime:
+                case FilterEditType.TextBox:
+                    InitTextBoxEdit();
+                    break;
+            }
+        }
+
+        #region InitCheckBoxEdit
+
+        private void InitCheckBoxEdit()
+        {
+            MyCheckBoxX cb = FilterCheckBox;
+
+            cb.Text = "";
+            cb.Enabled = true;
+
+            cb.BackColor = GetSimpleColor(Style);
+
+            Control = cb;
+        }
+
+        #endregion
+
+        #region InitComboBoxEdit
+
+        private void InitComboBoxEdit()
+        {
+            ComboBoxEx cb = FilterComboBox;
+
+            cb.Items.Clear();
+
+            cb.BackColor = GetSimpleColor(Style);
+            cb.Font = Style.Font;
+            cb.FocusCuesEnabled = false;
+
+            Control = cb;
+        }
+
+        #endregion
+
+        #region InitTextBoxEdit
+
+        private void InitTextBoxEdit()
+        {
+            TextBoxX tb = FilterTextBox;
+
+            tb.BackColor = GetSimpleColor(Style);
+            tb.ForeColor = Style.TextColor;
+            tb.Font = Style.Font;
+
+            switch (Style.Alignment)
+            {
+                case Alignment.TopRight:
+                case Alignment.MiddleRight:
+                case Alignment.BottomRight:
+                    tb.TextAlign = HorizontalAlignment.Right;
+                    break;
+
+                case Alignment.TopCenter:
+                case Alignment.MiddleCenter:
+                case Alignment.BottomCenter:
+                    tb.TextAlign = HorizontalAlignment.Center;
+                    break;
+
+                default:
+                    tb.TextAlign = HorizontalAlignment.Left;
+                    break;
+            }
+
+            Control = tb;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetFilterPanel
+
+        static private FilterPanel GetFilterPanel(
+            GridFilter gridFilter, FilterEditType type)
+        {
+            switch (type)
+            {
+                case FilterEditType.CheckBox:
+                    if (_checkBoxPanel == null || _checkBoxPanel.Parent != gridFilter.SuperGrid)
+                        _checkBoxPanel = GetNewFilterPanel(gridFilter);
+
+                    return (_checkBoxPanel);
+
+                case FilterEditType.ComboBox:
+                    if (_comboBoxPanel == null || _comboBoxPanel.Parent != gridFilter.SuperGrid)
+                        _comboBoxPanel = GetNewFilterPanel(gridFilter);
+
+                    return (_comboBoxPanel);
+
+                case FilterEditType.DateTime:
+                case FilterEditType.TextBox:
+                    if (_textBoxPanel == null || _textBoxPanel.Parent != gridFilter.SuperGrid)
+                        _textBoxPanel = GetNewFilterPanel(gridFilter);
+
+                    return (_textBoxPanel);
+            }
+
+            return (null);
+        }
+
+        #region GetNewFilterPanel
+
+        private static FilterPanel GetNewFilterPanel(GridFilter gridFilter)
+        {
+            FilterPanel fp = new FilterPanel();
+            fp.Visible = false;
+
+            gridFilter.SuperGrid.Controls.Add(fp);
+
+            return (fp);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetFilterType
+
+        private static Type GetFilterType(FilterPanel fp)
+        {
+            IGridCellEditControl editor = fp.GridColumn.EditControl;
+
+            if (editor != null)
+                return (editor.EditorValueType);
+
+            return (typeof(string));
+        }
+
+        #endregion
+
+        #region GetSimpleColor
+
+        static internal Color GetSimpleColor(FilterColumnHeaderVisualStyle style)
+        {
+            Color color1;
+            Color color2;
+
+            if (style.Background.BackColorBlend != null &&
+                style.Background.BackColorBlend.IsEmpty == false)
+            {
+                IList<Color> colors = style.Background.BackColorBlend.Colors;
+
+                color1 = colors[0];
+                color2 = colors[colors.Count - 1];
+            }
+            else
+            {
+                color1 = style.Background.Color1;
+                color2 = style.Background.Color2;
+            }
+
+            if (color2.IsEmpty == true)
+                return (color1);
+
+            return (Color.FromArgb((color1.R + color2.R) / 2,
+                (color1.G + color2.G) / 2, (color1.B + color2.B) / 2));
+        }
+
+        #endregion
+
+        #endregion
+
+        #region FilterValueChanged
+
+        void FilterValueChanged(object sender, EventArgs e)
+        {
+            if (_LockedSelection == false)
+            {
+                Control c = (Control) sender;
+
+                FilterPanel fp = c.Parent as FilterPanel;
+
+                if (fp != null)
+                {
+                    object filterValue;
+                    object filterDisplayValue;
+                    string filterExpr;
+
+                    switch (fp.FilterType)
+                    {
+                        case FilterEditType.CheckBox:
+                            filterExpr = GetCheckBoxFilterExpr(
+                                c, fp, out filterValue, out filterDisplayValue);
+                            break;
+
+                        case FilterEditType.ComboBox:
+                            filterExpr = GetComboBoxFilterExpr(
+                                c, fp, out filterValue, out filterDisplayValue);
+                            break;
+
+                        default:
+                            filterExpr = GetTextBoxFilterExpr(
+                               c, fp, out filterValue, out filterDisplayValue);
+                            break;
+                    }
+
+                    GridColumn column = fp.GridColumn;
+
+                    if (column.SuperGrid.DoFilterEditValueChangedEvent(column.GridPanel, column, fp,
+                        column.FilterValue, ref filterValue, ref filterDisplayValue, ref filterExpr) == false)
+                    {
+                        column.FilterValue = filterValue;
+                        column.FilterDisplayValue = filterDisplayValue;
+                        column.FilterExpr = filterExpr;
+                    }
+                }
+            }
+        }
+
+        #region GetCheckBoxFilterExpr
+
+        private string GetCheckBoxFilterExpr(Control c,
+            FilterPanel fp, out object filterValue, out object filterDisplayValue)
+        {
+            filterValue = CheckState.Indeterminate;
+            filterDisplayValue = CheckState.Indeterminate;
+
+            MyCheckBoxX mcb = c as MyCheckBoxX;
+
+            if (mcb != null)
+            {
+                CheckState cs = mcb.CheckState;
+
+                filterValue = cs;
+                filterDisplayValue = cs;
+
+                if (cs != CheckState.Indeterminate)
+                {
+                    return ("[" + fp.GridColumn.Name + "] = " +
+                            (cs == CheckState.Checked ? "true" : "false"));
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetComboBoxFilterExpr
+
+        private string GetComboBoxFilterExpr(Control c,
+            FilterPanel fp, out object filterValue, out object filterDisplayValue)
+        {
+            filterValue = null;
+            filterDisplayValue = null;
+
+            ComboBoxEx cb = c as ComboBoxEx;
+
+            if (cb != null)
+            {
+                string s1 = c.Text;
+
+                MyComboItem mci = cb.SelectedItem as MyComboItem;
+
+                if (fp.GridColumn.FilterAutoScan == false)
+                {
+                    if (mci != null)
+                    {
+                        ComboBox cbx = fp.GridColumn.EditControl as ComboBox;
+
+                        if (cbx != null)
+                        {
+                            cbx.SelectedIndex = (int) mci.Value;
+
+                            s1 = cbx.Text;
+
+                            if (cbx.DataSource != null)
+                            {
+                                if (string.IsNullOrEmpty(cbx.ValueMember) == false &&
+                                    string.IsNullOrEmpty(cbx.DisplayMember) == false)
+                                {
+                                    s1 = cbx.SelectedValue.ToString();
+                                }
+                            }
+                        }
+                    }
+                }
+                else
+                {
+                    if (mci != null)
+                    {
+                        if (mci.Value is DateTime)
+                        {
+                            filterValue = s1;
+                            filterDisplayValue = c.Text;
+
+                            return ("[" + fp.GridColumn.Name + "] = #" + s1 + "#");
+                        }
+                    }
+                }
+
+                if (string.IsNullOrEmpty(s1) == false)
+                {
+                    filterValue = s1;
+                    filterDisplayValue = c.Text;
+                    
+                    return ("[" + fp.GridColumn.Name + "] = '" + s1 + "'");
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetTextBoxFilterExpr
+
+        private string GetTextBoxFilterExpr(Control c,
+            FilterPanel fp, out object filterValue, out object filterDisplayValue)
+        {
+            filterValue = null;
+            filterDisplayValue = null;
+
+            object bds = fp.GridColumn.GridPanel.DataBinder.BaseDataSource;
+
+            bool dsFilter = (fp.GridColumn.GridPanel.VirtualMode == true &&
+                (bds is DataSet || bds is DataTable));
+
+            string s = (c.Text ?? "").Trim();
+
+            if (string.IsNullOrEmpty(s) == false)
+            {
+                filterValue = c.Text;
+                filterDisplayValue = c.Text;
+
+                if (dsFilter == true)
+                {
+                    s = "\'*" + s + "*\'";
+
+                    return ("Convert([" + fp.GridColumn.Name + "],System.String) Like " + s);
+                }
+
+                s = "\'" + s + "\'";
+
+                if (GetFilterType(fp) == typeof(string))
+                    return ("[" + fp.GridColumn.Name + "] Like " + s);
+
+                return ("ToString([" + fp.GridColumn.Name + "]) Like " + s);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ControlLostFocus
+
+        static void ControlLostFocus(object sender, EventArgs e)
+        {
+            Control c = sender as Control;
+
+            if (c != null)
+            {
+                FilterPanel fp = c.Parent as FilterPanel;
+
+                if (fp != null)
+                    fp.EndEdit();
+            }
+        }
+
+        #endregion
+
+        #region BeginEdit
+
+        internal bool BeginEdit()
+        {
+            GridPanel panel = GridColumn.GridPanel;
+
+            if (panel.SuperGrid.DoFilterBeginEditEvent(panel, GridColumn, this) == false)
+            {
+                panel.ClearAll();
+
+                GridColumn.EnsureVisible();
+                PositionEditPanel();
+
+                GridColumn.SuperGrid.ActiveFilterPanel = this;
+
+                _FilterExpr = GridColumn.FilterExpr;
+                _FilterValue = GridColumn.FilterValue;
+                _FilterDisplayValue = GridColumn.FilterDisplayValue;
+
+                _LockedSelection = true;
+
+                switch (FilterType)
+                {
+                    case FilterEditType.CheckBox:
+                        BeginCheckBoxEdit();
+                        break;
+
+                    case FilterEditType.ComboBox:
+                        BeginComboBoxEdit();
+                        break;
+
+                    default:
+                        BeginTextBoxEdit();
+                        break;
+                }
+
+                Show();
+                BringToFront();
+                Control.Focus();
+
+                _LockedSelection = false;
+
+                InvalidateFilterCell();
+
+                Control.MouseLeave -= Control_MouseLeave;
+                Control.MouseLeave += Control_MouseLeave;
+
+                return (false);
+            }
+
+            return (true);
+        }
+
+        #region Control_MouseLeave
+
+        void Control_MouseLeave(object sender, EventArgs e)
+        {
+            if (GridFilter != null && GridColumn != null)
+            {
+                Rectangle r = GridFilter.Bounds;
+                r.X = GridColumn.Bounds.X;
+                r.Width = GridColumn.Bounds.Width;
+
+                GridColumn.SuperGrid.InvalidateRender(r);
+            }
+        }
+
+        #endregion
+
+        #region BeginCheckBoxEdit
+
+        private void BeginCheckBoxEdit()
+        {
+            MyCheckBoxX mcbx = Control as MyCheckBoxX;
+
+            if (mcbx != null)
+            {
+                CheckState cs = CheckState.Indeterminate;
+
+                if (_FilterValue != null)
+                    cs = (CheckState)_FilterValue;
+
+                mcbx.CheckState = cs;
+            }
+        }
+
+        #endregion
+
+        #region BeginComboBoxEdit
+
+        private void BeginComboBoxEdit()
+        {
+            ComboBoxEx cb = Control as ComboBoxEx;
+
+            if (cb != null)
+            {
+                if (_GridColumn.SuperGrid.DoFilterLoadItemsEvent(_GridColumn, cb) == false)
+                {
+                    if (_GridColumn.FilterAutoScan == true)
+                        LoadScanItems(cb);
+                    else
+                        LoadComboItems(cb);
+
+                    cb.Text = (_FilterValue != null) ? _FilterValue.ToString() : "";
+
+                    int m = _GridColumn.SuperGrid.FilterMaxDropDownHeight;
+
+                    cb.MaxDropDownItems = m / cb.ItemHeight;
+                    cb.IntegralHeight = false;
+
+                    _GridColumn.SuperGrid.DoFilterItemsLoadedEvent(_GridColumn, cb);
+                }
+            }
+        }
+
+        #region LoadScanItems
+
+        private void LoadScanItems(ComboBoxEx cb)
+        {
+            List<object> list = _GridColumn.ScanItems;
+
+            int n = Math.Min(list.Count, _GridColumn.FilterPopupMaxItems);
+
+            MyComboItem[] items = new MyComboItem[n];
+
+            bool blankSeen = false;
+
+            for (int i = 0; i < n; i++)
+            {
+                object o = list[i];
+
+                MyComboItem bi;
+
+                if (o is DateTime)
+                {
+                    DateTime dt = (DateTime)o;
+                    dt = dt.Date;
+
+                    string s = dt.ToShortDateString();
+
+                    bi = new MyComboItem("ScanDateEntry", s, dt);
+                }
+                else
+                {
+                    string s = o.ToString();
+
+                    bi = new MyComboItem("ScanTextEntry", s, i);
+
+                    if (blankSeen == false && string.IsNullOrEmpty(bi.Text) == true)
+                        blankSeen = true;
+                }
+
+                items[i] = bi;
+            }
+
+            if (blankSeen == false)
+                cb.Items.Add("");
+
+            cb.Items.AddRange(items);
+        }
+
+        #endregion
+
+        #region LoadComboItems
+
+        private void LoadComboItems(ComboBoxEx cb)
+        {
+            bool blankSeen = false;
+
+            ComboBox cbx = GridColumn.EditControl as ComboBox;
+
+            if (cbx != null && cbx.Items.Count > 0)
+            {
+                MyComboItem[] items = new MyComboItem[cbx.Items.Count];
+
+                for (int i = 0; i < cbx.Items.Count; i++)
+                {
+                    MyComboItem bi = new
+                        MyComboItem("CbxEntry", cbx.GetItemText(cbx.Items[i]), i);
+
+                    if (blankSeen == false && string.IsNullOrEmpty(bi.Text) == true)
+                        blankSeen = true;
+
+                    items[i] = bi;
+                }
+
+                if (blankSeen == false)
+                    cb.Items.Add("");
+
+                cb.Items.AddRange(items);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region BeginTextBoxEdit
+
+        private void BeginTextBoxEdit()
+        {
+            TextBoxX tbx = Control as TextBoxX;
+
+            if (tbx != null)
+            {
+                if (_FilterValue is DateTime)
+                {
+                    tbx.Text = ((DateTime)_FilterValue).ToString("d");
+                }
+                else
+                {
+                    tbx.Text = (_FilterValue != null)
+                        ? _FilterValue.ToString() : "";
+                }
+
+                tbx.SelectAll();
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region CancelEdit
+
+        internal void CancelEdit()
+        {
+            GridColumn.FilterValue = _FilterValue;
+            GridColumn.FilterDisplayValue = _FilterDisplayValue;
+            GridColumn.FilterExpr = _FilterExpr;
+
+            GridColumn.SuperGrid.DoFilterCancelEditEvent(GridColumn, this);
+
+            CloseEdit();
+        }
+
+        #endregion
+
+        #region EndEdit
+
+        internal void EndEdit()
+        {
+            GridColumn.SuperGrid.DoFilterEndEditEvent(GridColumn, this);
+
+            CloseEdit();
+        }
+
+        #endregion
+
+        #region CloseEdit
+
+        internal void CloseEdit()
+        {
+            bool wasFocused = GridColumn.SuperGrid.ContainsFocus;
+
+            Hide();
+
+            GridColumn.SuperGrid.ActiveFilterPanel = null;
+
+            Control.MouseLeave -= Control_MouseLeave;
+            Control = null;
+
+            InvalidateFilterCell();
+
+            if (wasFocused == true)
+                GridColumn.SuperGrid.Focus();
+        }
+
+        #endregion
+
+        #region InvalidateFilterCell
+
+        private void InvalidateFilterCell()
+        {
+            Rectangle r = GridFilter.GetBounds(GridColumn.GridPanel, GridColumn);
+
+            GridColumn.SuperGrid.Invalidate(r);
+        }
+
+        #endregion
+
+        #region PositionEditPanel
+
+        internal void PositionEditPanel()
+        {
+            Rectangle r = GridFilter.GetBounds(GridColumn.GridPanel, GridColumn);
+
+            r.X += Dpi.Width1;
+            r.Y += Dpi.Height1 + 0;
+
+            r.Width -= Dpi.Width2 + 2;
+            r.Height -= Dpi.Height2 + 2;
+
+            r.X += Dpi.Width(Style.Margin.Left);
+            r.Y += Dpi.Height(Style.Margin.Top);
+
+            r.Width -= Dpi.Width(Style.Margin.Horizontal);
+            r.Height -= Dpi.Height(Style.Margin.Vertical);
+
+            Rectangle e = GetClippedBounds(r);
+
+            int xoff = 0;
+            int yoff = 0;
+
+            if (r.X < e.X)
+                xoff = r.X - e.X;
+
+            if (r.Y < e.Y)
+                yoff = r.Y - e.Y;
+
+            Size size = Control.GetPreferredSize(Size.Empty);
+
+            if (Control is MyCheckBoxX == false)
+                size.Width = Math.Max(Dpi.Width13, r.Width);
+
+            if (size.Height == 0)
+                size.Height = Dpi.Height13;
+
+            if (size.Width == 0)
+                size.Width = Dpi.Width13;
+
+            Rectangle t = new Rectangle(xoff, yoff, size.Width, size.Height);
+
+            if (t.Height < e.Height)
+                t.Y += (e.Height - t.Height) / 2;
+
+            if (t.Width < e.Width)
+                t.X += (e.Width - t.Width) / 2;
+
+            Bounds = e;
+            Control.Bounds = t;
+        }
+
+        #endregion
+
+        #region GetClippedBounds
+
+        private Rectangle GetClippedBounds(Rectangle r)
+        {
+            Rectangle v = GridColumn.SViewRect;
+
+            if (GridColumn.GridPanel.IsVFrozen == false)
+            {
+                int n = GridColumn.GridPanel.FixedRowHeight -
+                    (GridColumn.GridPanel.FixedHeaderHeight);
+
+                v.Y -= n;
+                v.Height += n;
+            }
+            else
+            {
+                if (r.Y < v.Y)
+                {
+                    v.Height += (v.Y - r.Y);
+                    v.Y = r.Y;
+                }
+            }
+
+            if (GridColumn.IsHFrozen == false)
+            {
+                GridColumn pcol = GridColumn.GridPanel.Columns.GetLastVisibleFrozenColumn();
+
+                if (pcol != null)
+                {
+                    int n = pcol.BoundsRelative.Right - v.X;
+
+                    v.X += n;
+                    v.Width -= n;
+                }
+            }
+
+            //r.Width += 1;
+            //r.Height += 1;
+
+            r.Intersect(v);
+
+            return (r);
+        }
+
+        #endregion
+
+        #region WantsInputKey
+
+        ///<summary>
+        ///</summary>
+        ///<param name="key"></param>
+        ///<param name="gridWantsKey"></param>
+        ///<returns></returns>
+        public bool WantsInputKey(Keys key, bool gridWantsKey)
+        {
+            switch (key)
+            {
+                case Keys.Down | Keys.Control:
+                    return (false);
+            }
+
+            switch (FilterType)
+            {
+                case FilterEditType.ComboBox:
+                    switch (key)
+                    {
+                        case Keys.Space:
+                        case Keys.Up:
+                        case Keys.Down:
+                            return (true);
+                    }
+                    break;
+
+                case FilterEditType.CheckBox:
+                    switch (key)
+                    {
+                        case Keys.Space:
+                            return (true);
+                    }
+                    break;
+
+                case FilterEditType.DateTime:
+                case FilterEditType.TextBox:
+                    TextBoxX tb = Control as TextBoxX;
+
+                    if (tb != null)
+                    {
+                        switch (key)
+                        {
+                            case Keys.Left:
+                                return (tb.SelectionStart > 0);
+
+                            case Keys.Right:
+                                return (tb.SelectionStart < tb.TextLength);
+                        }
+                    }
+                    break;
+            }
+
+            return (gridWantsKey == false);
+        }
+
+        #endregion
+
+        #region Select
+
+        ///<summary>
+        /// Activates the control
+        ///</summary>
+        public new void Select()
+        {
+            base.Select();
+
+            if (Control != null)
+                Control.Select();
+        }
+
+        #endregion
+    }
+
+    #region MyCheckBoxX
+
+    internal class MyCheckBoxX : CheckBoxX
+    {
+        protected override void OnKeyDown(KeyEventArgs e)
+        {
+            switch (e.KeyData)
+            {
+                case Keys.Space:
+                    e.Handled = true;
+
+                    switch (CheckState)
+                    {
+                        case CheckState.Unchecked:
+                            CheckState = CheckState.Checked;
+                            break;
+
+                        case CheckState.Checked:
+                            CheckState = CheckState.Indeterminate;
+                            break;
+
+                        default:
+                            CheckState = CheckState.Unchecked;
+                            break;
+                    }
+                    break;
+
+                default:
+                    base.OnKeyDown(e);
+                    break;
+            }
+        }
+    }
+
+    #endregion
+
+    #region MyComboItem
+
+    internal class MyComboItem
+    {
+        private string _Name;
+        private string _Text;
+
+        private object _Value;
+
+        public MyComboItem(string name)
+            : this(name, null, -1)
+        {
+        }
+
+        public MyComboItem(string name, string text)
+            : this(name, text, -1)
+        {
+        }
+
+        public MyComboItem(string name, string text, object value)
+        {
+            _Name = name;
+            _Text = text;
+
+            _Value = value;
+        }
+
+        public object Value
+        {
+            get { return (_Value); }
+            set { _Value = value; }
+        }
+
+        public string Name
+        {
+            get { return (_Name); }
+            set { _Name = value; }
+        }
+
+        public string Text
+        {
+            get { return (_Text); }
+            set { _Text = value; }
+        }
+
+        public override string ToString()
+        {
+            return (_Text);
+        }
+    }
+
+    #endregion
+
+    #region enums
+
+    /// <summary>
+    /// FilterEditType
+    /// </summary>
+    public enum FilterEditType
+    {
+        /// <summary>
+        /// Auto
+        /// </summary>
+        Auto,
+
+        ///<summary>
+        /// None
+        ///</summary>
+        None,
+
+        ///<summary>
+        /// CheckBox
+        ///</summary>
+        CheckBox,
+
+        ///<summary>
+        /// ComboBox
+        ///</summary>
+        ComboBox,
+
+        ///<summary>
+        /// DateTime
+        ///</summary>
+        DateTime,
+
+        ///<summary>
+        /// TextBox
+        ///</summary>
+        TextBox,
+    }
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridFilter/FilterPopup.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridFilter/FilterPopup.cs
new file mode 100644
index 00000000..805aeadd
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridFilter/FilterPopup.cs	
@@ -0,0 +1,1207 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Reflection;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.Controls;
+using DevComponents.DotNetBar.SuperGrid.Style;
+
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    ///<summary>
+    /// Constructor
+    ///</summary>
+    public class FilterPopup : IDisposable
+    {
+        #region Delegates
+
+        ///<summary>
+        /// PfnReset
+        ///</summary>
+        public delegate void PfnReset();
+
+        #endregion
+
+        #region Constants
+
+        private readonly Size _DefaultGripSize = new Size(14, 14);
+
+        private readonly System.Windows.Forms.Padding _DefaultPadding = System.Windows.Forms.Padding.Empty;
+        private readonly System.Windows.Forms.Padding _DefaultMargin = new System.Windows.Forms.Padding(1);
+
+        #endregion
+
+        #region Private variables
+
+        private GridPanel _Panel;
+        private GridColumn _GridColumn;
+
+        private PopupControl _PopupControl;
+
+        private ItemPanel _ItemPanel;
+        private ButtonItem _VisButtonItem;
+
+        private FilterDateTimePicker _FilterDateTimePicker;
+
+        private Control _Control;
+
+        private string _FilterExpr;
+        private object _FilterValue;
+        private object _FilterDisplayValue;
+
+        private IButtonControl _SaveButton;
+        private PfnReset _PfnReset;
+
+        #endregion
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        public FilterPopup(GridPanel panel)
+        {
+            _Panel = panel;
+
+            _PopupControl = new PopupControl();
+
+            _PopupControl.Opened += PopupControlOpened;
+            _PopupControl.Closed += PopupControlClosed;
+
+            _PopupControl.UserResize += PopupControlUserResize;
+
+            _PopupControl.PreRenderGripBar += PopupControlPreRenderGripBar;
+            _PopupControl.PostRenderGripBar += PopupControlPostRenderGripBar;
+        }
+
+        #region Private properties
+
+        #region FilterDateTimePicker
+
+        private FilterDateTimePicker FilterDateTimePicker
+        {
+            get
+            {
+                if (_FilterDateTimePicker == null)
+                    FilterDateTimePicker = new FilterDateTimePicker(_GridColumn);
+
+                return (_FilterDateTimePicker);
+            }
+
+            set
+            {
+                if (_FilterDateTimePicker != value)
+                {
+                    if (_FilterDateTimePicker != null)
+                        _FilterDateTimePicker.ValueChanged -= FilterDateTimePickerValueChanged;
+
+                    _FilterDateTimePicker = value;
+
+                    if (_FilterDateTimePicker != null)
+                        _FilterDateTimePicker.ValueChanged += FilterDateTimePickerValueChanged;
+                }
+            }
+        }
+
+        #endregion
+
+        #region ItemPanel
+
+        private ItemPanel ItemPanel
+        {
+            get
+            {
+                if (_ItemPanel == null)
+                {
+                    ItemPanel ip = new ItemPanel();
+#if !TRIAL
+                    ip.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F";
+#endif
+                    ip.AutoScroll = true;
+                    ip.FadeEffect = false;
+                    ip.LayoutOrientation = eOrientation.Vertical;
+                    ip.Style = eDotNetBarStyle.StyleManagerControlled;
+
+                    ip.MinimumSize = new Size(80, 70);
+                    ip.MaximumSize = new Size(1000, 1000);
+
+                    ItemPanel = ip;
+                }
+
+                return (_ItemPanel);
+            }
+
+            set
+            {
+                if (_ItemPanel != value)
+                {
+                    if (_ItemPanel != null)
+                        _ItemPanel.ItemClick -= ItemPanelClick;
+
+                    _ItemPanel = value;
+
+                    if (_ItemPanel != null)
+                        _ItemPanel.ItemClick += ItemPanelClick;
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Public properties
+
+        #region Control
+
+        /// <summary>
+        /// Control
+        /// </summary>
+        public Control Control
+        {
+            get { return (_Control); }
+            set { _Control = value; }
+        }
+
+        #endregion
+
+        #region GripSize
+
+        /// <summary>
+        /// GripSize
+        /// </summary>
+        public Size GripSize
+        {
+            get { return (_PopupControl.GripSize); }
+            set { _PopupControl.GripSize = value; }
+        }
+
+        #endregion
+
+        #region Margin
+
+        /// <summary>
+        /// Margin
+        /// </summary>
+        public System.Windows.Forms.Padding Margin
+        {
+            get { return (_PopupControl.Margin); }
+            set { _PopupControl.Margin = value; }
+        }
+
+        #endregion
+
+        #region Padding
+
+        /// <summary>
+        /// Padding
+        /// </summary>
+        public System.Windows.Forms.Padding Padding
+        {
+            get { return (_PopupControl.Padding); }
+            set { _PopupControl.Padding = value; }
+        }
+
+        #endregion
+
+        #region PopupControl
+
+        /// <summary>
+        /// Gets the PopupControl
+        /// </summary>
+        public PopupControl PopupControl
+        {
+            get { return (_PopupControl); }
+        }
+
+        #endregion
+
+        #region ResizeMode
+
+        /// <summary>
+        /// Type of resize mode
+        /// </summary>
+        public PopupResizeMode ResizeMode
+        {
+            get { return (_PopupControl.ResizeMode); }
+            set { _PopupControl.ResizeMode = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Popup event processing
+
+        #region PopupControlOpened
+
+        private void PopupControlOpened(object sender, EventArgs e)
+        {
+            _Panel.SuperGrid.PopupControl = _PopupControl;
+
+            if (Control == _ItemPanel)
+            {
+                if (_VisButtonItem != null)
+                    _ItemPanel.EnsureVisible(_VisButtonItem);
+            }
+            else
+            {
+                IButtonControl acceptButton = GetAcceptButton(Control);
+
+                if (acceptButton != null)
+                {
+                    Form form1 = _Panel.SuperGrid.FindForm();
+
+                    if (form1 != null)
+                    {
+                        _SaveButton = form1.AcceptButton;
+
+                        form1.AcceptButton = acceptButton;
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region PopupControlClosed
+
+        void PopupControlClosed(object sender, ToolStripDropDownClosedEventArgs e)
+        {
+            FilterDateTimePicker ftp = Control as FilterDateTimePicker;
+
+            if (ftp != null)
+            {
+                if (ftp.Cancel == true)
+                {
+                    _GridColumn.FilterExpr = _FilterExpr;
+                    _GridColumn.FilterValue = _FilterValue;
+                    _GridColumn.FilterDisplayValue = _FilterDisplayValue;
+                }
+            }
+
+            if (_SaveButton != null)
+            {
+                Form form = _GridColumn.SuperGrid.FindForm();
+
+                if (form != null)
+                    form.AcceptButton = _SaveButton;
+
+                _SaveButton = null;
+            }
+
+            _Panel.SuperGrid.PopupControl = null;
+            _Panel.SuperGrid.GridCursor = Cursors.Default;
+
+            if (_PfnReset != null)
+                _PfnReset();
+
+            _Panel.SuperGrid.PostInternalMouseMove();
+            _Panel.SuperGrid.DoFilterPopupClosingEvent(_GridColumn, this);
+        }
+
+        #endregion
+
+        #region PopupControlUserResize
+
+        void PopupControlUserResize(object sender, EventArgs e)
+        {
+            _GridColumn.FilterPopupSize = Control.Size;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetAcceptButton
+
+        private IButtonControl GetAcceptButton(object control)
+        {
+            Type controlType = control.GetType();
+
+            PropertyInfo property = controlType.GetProperty(
+                "AcceptButton", BindingFlags.Instance | BindingFlags.Public);
+
+            if (property != null)
+            {
+                if (property.PropertyType == typeof (IButtonControl))
+                    return (IButtonControl) property.GetValue(control, null);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region PopupControlPreRenderGripBar
+
+        private void PopupControlPreRenderGripBar(object sender, PreRenderGripBarEventArgs e)
+        {
+            e.Cancel = _GridColumn.SuperGrid.DoPreRenderFilterPopupGripBarEvent
+                (e.Graphics, this, _GridColumn, e.Bounds);
+        }
+
+        #endregion
+
+        #region PopupControlPostRenderGripBar
+
+        private void PopupControlPostRenderGripBar(object sender, PostRenderGripBarEventArgs e)
+        {
+            _GridColumn.SuperGrid.DoPostRenderFilterPopupGripBarEvent
+                (e.Graphics, this, _GridColumn, e.Bounds);
+        }
+
+        #endregion
+
+        #region ActivatePopup
+
+        internal void ActivatePopup(GridColumn column, PfnReset pfnReset)
+        {
+            Rectangle r = _Panel.ColumnHeader.GetScrollBounds(
+                _Panel, column, column.FilterImageBounds);
+
+            ActivatePopup(column, r, pfnReset);
+        }
+
+        internal void ActivatePopup(
+            GridColumn column, Rectangle fiBounds, PfnReset pfnReset)
+        {
+            _GridColumn = column;
+            _PfnReset = pfnReset;
+
+            PopupAnchor anchor;
+            Point pt = GetPopupPoint(fiBounds, out anchor);
+
+            _PopupControl.ResizeMode = anchor == PopupAnchor.Left
+                ? PopupResizeMode.BottomRight : PopupResizeMode.BottomLeft;
+
+            if (LoadFilterMenu() == false)
+            {
+                _FilterExpr = _GridColumn.FilterExpr;
+                _FilterValue = _GridColumn.FilterValue;
+                _FilterDisplayValue = _GridColumn.FilterDisplayValue;
+
+                if (column.FilterPopupSize.IsEmpty == false)
+                {
+                    Control.Size = column.FilterPopupSize;
+                }
+                else
+                {
+                    if (Control.Size.IsEmpty == true)
+                        Control.Size = Control.MinimumSize;
+                }
+
+                _Panel.SuperGrid.Cursor = Cursors.Default;
+
+                FilterColumnHeaderVisualStyle style = _GridColumn.GetFilterStyle(StyleType.Default);
+
+                _PopupControl.Background = style.GripBarBackground;
+
+                _PopupControl.Show(Control, pt, anchor, _Panel.SuperGrid.FindForm());
+
+                return;
+            }
+            
+            if (_PfnReset != null)
+                _PfnReset();
+
+            _Panel.SuperGrid.PostInternalMouseMove();
+            _Panel.SuperGrid.DoFilterPopupClosingEvent(_GridColumn, this);
+        }
+
+        #region LoadFilterMenu
+
+        private bool LoadFilterMenu()
+        {
+            Control = null;
+
+            Margin = _DefaultMargin;
+            Padding = _DefaultPadding;
+            GripSize = _DefaultGripSize;
+
+            if (_Panel.SuperGrid.DoFilterPopupOpeningEvent(_GridColumn, this) == false)
+            {
+                if (Control == null)
+                {
+                    if (_Panel.SuperGrid.DoFilterPopupLoadEvent(_GridColumn, this) == false)
+                    {
+                        FilterEditType type = _GridColumn.GetFilterPanelType();
+
+                        switch (type)
+                        {
+                            case FilterEditType.CheckBox:
+                                LoadCheckBoxItems();
+                                break;
+
+                            case FilterEditType.ComboBox:
+                                if (_GridColumn.FilterAutoScan == true)
+                                    LoadDefaultItems();
+                                else
+                                    LoadComboItems();
+                                break;
+
+                            case FilterEditType.DateTime:
+                                LoadDateTimeItems();
+                                break;
+
+                            default:
+                                LoadDefaultItems();
+                                break;
+                        }
+
+                        _Panel.SuperGrid.DoFilterPopupLoadedEvent(_GridColumn, this);
+                    }
+
+                    ItemPanel itemPanel = Control as ItemPanel;
+
+                    if (itemPanel != null)
+                        AdjustItemPanelSize(itemPanel);
+                }
+
+                return (false);
+            }
+
+            return (true);
+        }
+
+        #region LoadCustomFilterItems
+
+        private void LoadCustomFilterItems(ItemPanel itemPanel)
+        {
+            bool firstItem = true;
+
+            if (_GridColumn.SuperGrid.FilterUseExtendedCustomDialog == true)
+            {
+                List<UserFilterData> filterData =
+                    FilterUserData.GetFilterData(_GridColumn.GridPanel);
+
+                foreach (UserFilterData fd in filterData)
+                {
+                    if (fd.ReferNames.Contains(_GridColumn.Name) == true)
+                    {
+                        FilterPopupItem fpi = new
+                            FilterPopupItem(fd.Name, fd.Name, FilterItemType.UserEntry, fd.Expression);
+
+                        if (string.IsNullOrEmpty(fd.Description) == false)
+                            fpi.Tooltip = fd.Description;
+
+                        if (firstItem == true)
+                        {
+                            firstItem = false;
+
+                            AddBaseItem(itemPanel, "Custom",
+                                _GridColumn.SuperGrid.FilterCustomString, FilterItemType.Custom, "...");
+
+                            int n = itemPanel.Items.Count - 1;
+
+                            if (n > 0)
+                                itemPanel.Items[n].BeginGroup = true;
+                        }
+
+                        if (fd.Expression.Equals(_GridColumn.FilterDisplayValue) == true)
+                            fpi.FontBold = true;
+
+                        itemPanel.Items.Add(fpi);
+                    }
+                }
+            }
+
+            if (firstItem == true)
+            {
+                AddBaseItem(itemPanel, "Custom",
+                    _GridColumn.SuperGrid.FilterCustomString, FilterItemType.Custom, "...");
+            }
+        }
+
+        #endregion
+
+        #region LoadCheckBoxItems
+
+        private void LoadCheckBoxItems()
+        {
+            FilterPopupItem[] items = null;
+
+            CheckBoxX cb = _GridColumn.EditControl as CheckBoxX;
+
+            if (cb != null)
+            {
+                items = new FilterPopupItem[(cb.ThreeState == true) ? 3 : 2];
+
+                items[0] = new FilterPopupItem("CbEntry", "Checked",
+                    FilterItemType.CheckBoxEntry, CheckState.Checked);
+
+                items[1] = new FilterPopupItem("CbEntry", "Unchecked",
+                    FilterItemType.CheckBoxEntry, CheckState.Unchecked);
+
+                if (cb.ThreeState == true)
+                {
+                    items[2] = new FilterPopupItem("CbEntry", "Indeterminate",
+                        FilterItemType.CheckBoxEntry, CheckState.Indeterminate);
+                }
+            }
+            else if (_GridColumn.EditControl is GridSwitchButtonEditControl)
+            {
+                GridSwitchButtonEditControl sw =
+                    (GridSwitchButtonEditControl)_GridColumn.EditControl;
+
+                items = new FilterPopupItem[2];
+
+                items[0] = new FilterPopupItem("SwEntry", sw.OnText,
+                    FilterItemType.CheckBoxEntry, CheckState.Checked);
+
+                items[1] = new FilterPopupItem("SwEntry", sw.OffText,
+                    FilterItemType.CheckBoxEntry, CheckState.Unchecked);
+            }
+
+            ItemPanel itemPanel = GetBaseItemPanel();
+
+            LoadCustomFilterItems(itemPanel);
+
+            if (items != null)
+            {
+                if (itemPanel.Items.Count > 0)
+                    items[0].BeginGroup = true;
+
+                itemPanel.Items.AddRange(items);
+            }
+
+            Control = itemPanel;
+        }
+
+        #endregion
+
+        #region LoadComboItems
+
+        private void LoadComboItems()
+        {
+            ItemPanel itemPanel = GetBaseItemPanel();
+
+            _VisButtonItem = null;
+
+            ComboBox cbx = _GridColumn.EditControl as ComboBox;
+
+            if (cbx != null && cbx.Items.Count > 0)
+            {
+                FilterPopupItem[] items = new FilterPopupItem[cbx.Items.Count];
+
+                for (int i = 0; i < cbx.Items.Count; i++)
+                {
+                    FilterPopupItem bi = new FilterPopupItem("CbxEntry",
+                        cbx.GetItemText(cbx.Items[i]), FilterItemType.ComboBoxEntry,i);
+
+                    items[i] = bi;
+
+                    if (bi.Text.Equals(_GridColumn.FilterDisplayValue) == true)
+                    {
+                        _VisButtonItem = bi;
+
+                        bi.FontBold = true;
+                    }
+                }
+
+                LoadCustomFilterItems(itemPanel);
+
+                if (itemPanel.Items.Count > 0)
+                {
+                    items[0].BeginGroup = true;
+
+                    itemPanel.Items.AddRange(items);
+                }
+
+            }
+
+            Control = itemPanel;
+       }
+
+        #endregion
+
+        #region LoadDateTimeItems
+
+        private void LoadDateTimeItems()
+        {
+            IGridCellEditControl editor = _GridColumn.EditControl;
+
+            if (editor != null)
+            {
+                FilterDateTimePicker fdt = FilterDateTimePicker;
+
+                fdt.Cancel = false;
+
+                Control = fdt;
+            }
+        }
+
+        #endregion
+
+        #region LoadDefaultItems
+
+        private void LoadDefaultItems()
+        {
+            _VisButtonItem = null;
+
+            ItemPanel itemPanel = GetBaseItemPanel();
+
+            LoadCustomFilterItems(itemPanel);
+
+            if (_GridColumn.FilterAutoScan == true)
+            {
+                List<object> list = _GridColumn.ScanItems;
+
+                if (list != null)
+                {
+                    int n = Math.Min(list.Count, _GridColumn.FilterPopupMaxItems);
+
+                    for (int i = 0; i < n; i++)
+                    {
+                        object o = list[i];
+
+                        FilterPopupItem fpi;
+
+                        if (o is DateTime)
+                        {
+                            DateTime dt = (DateTime)o;
+                            dt = dt.Date;
+
+                            string s = dt.Date.ToShortDateString();
+
+                            fpi = new FilterPopupItem(s, s, FilterItemType.ScanDateEntry, dt);
+                        }
+                        else
+                        {
+                            string s = o.ToString();
+
+                            fpi = new FilterPopupItem(s, s, FilterItemType.ScanTextEntry, o);
+                        }
+
+                        if (i == 0)
+                            fpi.BeginGroup = true;
+
+                        if (fpi.Text.Equals(_GridColumn.FilterDisplayValue) == true)
+                        {
+                            fpi.FontBold = true;
+
+                            _VisButtonItem = fpi;
+                        }
+
+                        itemPanel.Items.Add(fpi);
+                    }
+                }
+            }
+
+            Control = itemPanel;
+        }
+
+        #endregion
+
+        #region GetBaseItemPanel
+
+        private ItemPanel GetBaseItemPanel()
+        {
+            ItemPanel itemPanel = ItemPanel;
+
+            FilterColumnHeaderVisualStyle style = _GridColumn.GetFilterStyle(StyleType.Default);
+
+            itemPanel.Font = style.Font;
+            itemPanel.BackColor = style.Background.Color1;
+
+            itemPanel.Items.Clear();
+
+            AddBaseItem(itemPanel, "ShowAll",
+                _GridColumn.SuperGrid.FilterShowAllString, FilterItemType.All, "");
+
+            AddBaseItem(itemPanel, "ShowNull",
+                _GridColumn.SuperGrid.FilterShowNullString, FilterItemType.Null, "");
+
+            AddBaseItem(itemPanel, "ShowNotNull",
+                _GridColumn.SuperGrid.FilterShowNotNullString, FilterItemType.NotNull, "");
+
+            return (itemPanel);
+        }
+
+        #region AddBaseItem
+
+        private void AddBaseItem(ItemPanel itemPanel,
+            string name, string text, FilterItemType type, string ellipse)
+        {
+            if (string.IsNullOrEmpty(text) == false)
+                itemPanel.Items.Add(new FilterPopupItem(name, text + ellipse, type));
+        }
+
+        #endregion
+
+        #endregion
+
+        #region AdjustItemPanelSize
+
+        private void AdjustItemPanelSize(ItemPanel itemPanel)
+        {
+            if (_GridColumn.FilterPopupSize.IsEmpty == true)
+            {
+                int width = 0;
+                int height = 0;
+
+                if (itemPanel.Items.Count > 0)
+                {
+                    int w = 0;
+
+                    foreach (BaseItem bi in itemPanel.Items)
+                    {
+                        bi.RecalcSize();
+
+                        if (bi.WidthInternal > w)
+                            w = bi.WidthInternal;
+                    }
+
+                    width = Math.Max(w + 
+                        SystemInformation.VerticalScrollBarWidth * 2, _GridColumn.Size.Width);
+
+                    height = itemPanel.Items.Count *
+                        (itemPanel.Items[0].HeightInternal + itemPanel.ItemSpacing);
+                }
+
+                width = Math.Max(width, 90);
+                height = Math.Max(Math.Min(height, _GridColumn.SuperGrid.FilterMaxDropDownHeight), 80);
+
+                itemPanel.Size = new Size(width, height);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetPopupPoint
+
+        private Point GetPopupPoint(Rectangle r, out PopupAnchor anchor)
+        {
+            Point pt;
+
+            switch (_Panel.ColumnHeader.FilterImageAlignment)
+            {
+                case Alignment.TopRight:
+                case Alignment.MiddleRight:
+                case Alignment.BottomRight:
+                    anchor = PopupAnchor.Right;
+                    pt = new Point(r.Right + 2, r.Bottom + 4);
+                    break;
+
+                default:
+                    anchor = PopupAnchor.Left;
+                    pt = new Point(r.X - 2, r.Bottom + 4);
+                    break;
+            }
+
+            pt = _Panel.SuperGrid.PointToScreen(pt);
+
+            return (pt);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region DeactivatePopup
+
+        internal void DeactivatePopup()
+        {
+            if (_PopupControl != null)
+                _PopupControl.Hide();
+        }
+
+        #endregion
+
+        #region ItemPanelClick
+
+        void ItemPanelClick(object sender, EventArgs e)
+        {
+            FilterPopupItem item = sender as FilterPopupItem;
+
+            if (item != null)
+            {
+                object filterValue = null;
+                object filterDisplayValue = null;
+                string filterExpr = null;
+
+                switch (item.FilterItemType)
+                {
+                    case FilterItemType.Null:
+                        filterDisplayValue = item.Text;
+                        filterExpr = "[" + _GridColumn.Name + "] = null";
+                        break;
+
+                    case FilterItemType.NotNull:
+                        filterDisplayValue = item.Text;
+                        filterExpr = "[" + _GridColumn.Name + "] != null";
+                        break;
+
+                    case FilterItemType.ComboBoxEntry:
+                        filterExpr = ComboItemClick(item, ref filterValue, ref filterDisplayValue);
+                        break;
+
+                    case FilterItemType.CheckBoxEntry:
+                        filterExpr = CheckBoxItemClick(item, ref filterValue, ref filterDisplayValue);
+                        break;
+
+                    case FilterItemType.Custom:
+                        filterValue = _GridColumn.FilterValue;
+                        filterDisplayValue = _GridColumn.FilterDisplayValue;
+                        filterExpr = _GridColumn.FilterExpr;
+                        break;
+
+                    case FilterItemType.ScanTextEntry:
+                        filterValue = item.Value;
+                        filterDisplayValue = item.Value;
+                        filterExpr = "= \"" + item.Value + "\"";
+                        break;
+
+                    case FilterItemType.ScanDateEntry:
+                        filterValue = item.Value;
+                        filterDisplayValue = ((DateTime)(item.Value)).ToShortDateString();
+                        filterExpr = "Date([]) = #" + filterDisplayValue + "#";
+                        break;
+
+                    case FilterItemType.UserEntry:
+                        filterDisplayValue = item.Value;
+                        filterExpr = item.Value.ToString();
+                        break;
+                }
+
+                if (_GridColumn.SuperGrid.DoFilterPopupValueChangedEvent(_GridColumn,
+                    item.FilterItemType, ref filterValue, ref filterDisplayValue, ref filterExpr) == false)
+                {
+                    if (item.FilterItemType == FilterItemType.Custom)
+                    {
+                        LaunchCustomDialog(filterExpr);
+                    }
+                    else
+                    {
+                        _GridColumn.FilterExpr = filterExpr;
+                        _GridColumn.FilterValue = filterValue;
+                        _GridColumn.FilterDisplayValue = filterDisplayValue;
+                    }
+                }
+            }
+
+            _PopupControl.Hide();
+        }
+
+        #region ComboItemClick
+
+        private string ComboItemClick(FilterPopupItem item,
+            ref object filterValue, ref object filterDisplayValue)
+        {
+            ComboBox cbx = _GridColumn.EditControl as ComboBox;
+
+            if (cbx != null)
+            {
+                cbx.SelectedIndex = (int)item.Value;
+
+                string s1 = cbx.Text;
+
+                if (cbx.DataSource != null)
+                {
+                    if (string.IsNullOrEmpty(cbx.ValueMember) == false &&
+                        string.IsNullOrEmpty(cbx.DisplayMember) == false)
+                    {
+                        s1 = cbx.SelectedValue.ToString();
+                    }
+                }
+
+                if (string.IsNullOrEmpty(s1) == false)
+                {
+                    filterValue = s1;
+                    filterDisplayValue = item.Text;
+
+                    return ("[" + _GridColumn.Name + "] = \"" + s1 + "\"");
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region CheckBoxItemClick
+
+        private string CheckBoxItemClick(FilterPopupItem item,
+            ref object filterValue, ref object filterDisplayValue)
+        {
+            CheckBoxX cb = _GridColumn.EditControl as CheckBoxX;
+
+            if (cb != null)
+            {
+                string s1;
+
+                switch ((CheckState)item.Value)
+                {
+                    case CheckState.Checked:
+                        s1 = cb.CheckValueChecked != null
+                            ? cb.CheckValueChecked.ToString() : "true";
+                        break;
+
+                    case CheckState.Unchecked:
+                        s1 = cb.CheckValueUnchecked != null
+                            ? cb.CheckValueUnchecked.ToString() : "false";
+                        break;
+
+                    default:
+                        s1 = cb.CheckValueIndeterminate != null
+                            ? cb.CheckValueIndeterminate.ToString() : "";
+                        break;
+                }
+
+                filterValue = item.Value;
+                filterDisplayValue = item.Text;
+
+                return ("[" + _GridColumn.Name + "] = " + s1);
+            }
+            
+            if (_GridColumn.EditControl is GridSwitchButtonEditControl)
+            {
+                GridSwitchButtonEditControl sw =
+                    (GridSwitchButtonEditControl)_GridColumn.EditControl;
+
+                filterValue = item.Value;
+                filterDisplayValue = item.Text;
+
+                string s1;
+
+                if ((CheckState)item.Value == CheckState.Checked)
+                    s1 = sw.OnValue != null ? sw.OnValue.ToString() : "true";
+                else
+                    s1 = sw.OffValue != null ? sw.OffValue.ToString() : "false";
+
+                return ("[" + _GridColumn.Name + "] = \"" + s1 + "\"");
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region LaunchCustomDialog
+
+        private void LaunchCustomDialog(string filterExpr)
+        {
+            Form form = _Panel.SuperGrid.FindForm();
+
+            if (_Panel.SuperGrid.FilterUseExtendedCustomDialog == true)
+            {
+                CustomFilterEx cf = new CustomFilterEx(_Panel, _GridColumn, filterExpr);
+
+                cf.Text = _GridColumn.Name;
+
+                DialogResult dr = cf.ShowDialog(form);
+
+                if (dr == DialogResult.OK)
+                {
+                    _GridColumn.FilterExpr = cf.FilterExpr;
+                    _GridColumn.FilterValue = null;
+                    _GridColumn.FilterDisplayValue = cf.FilterExpr;
+                }
+            }
+            else
+            {
+                CustomFilter cf = new CustomFilter(_Panel, _GridColumn, filterExpr);
+
+                cf.Text = _GridColumn.Name;
+
+                DialogResult dr = cf.ShowDialog(form);
+
+                if (dr == DialogResult.OK)
+                {
+                    _GridColumn.FilterExpr = cf.FilterExpr;
+                    _GridColumn.FilterValue = null;
+                    _GridColumn.FilterDisplayValue = cf.FilterExpr;
+                }
+            }
+
+            _Panel.ColumnHeader.ResetColumnStateEx();
+
+            _Panel.SuperGrid.Focus();
+        }
+
+        #endregion
+
+        #endregion
+
+        #region FilterDateTimePickerValueChanged
+
+        void FilterDateTimePickerValueChanged(object sender, EventArgs e)
+        {
+            FilterDateTimePicker ftp = sender as FilterDateTimePicker;
+
+            if (ftp != null)
+            {
+                string expr = ftp.GetFilterExpr();
+
+                string filterExpr = expr;
+                object filterValue = null;
+                object filterDisplayValue = expr;
+
+                if (_GridColumn.SuperGrid.DoFilterPopupValueChangedEvent(_GridColumn,
+                    FilterItemType.DateTimeEntry, ref filterValue, ref filterDisplayValue, ref filterExpr) == false)
+                {
+                    _GridColumn.FilterExpr = filterExpr;
+                    _GridColumn.FilterValue = filterValue;
+                    _GridColumn.FilterDisplayValue = filterDisplayValue;
+                }
+            }
+        }
+
+        #endregion
+
+        #region IDisposable Members
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        public void Dispose()
+        {
+            if (_PopupControl != null)
+            {
+                Control = null;
+                ItemPanel = null;
+
+                _PopupControl.Opened -= PopupControlOpened;
+                _PopupControl.Closed -= PopupControlClosed;
+
+                _PopupControl.UserResize -= PopupControlUserResize;
+
+                _PopupControl.PreRenderGripBar -= PopupControlPreRenderGripBar;
+                _PopupControl.PostRenderGripBar -= PopupControlPostRenderGripBar;
+
+                _PopupControl.Reset();
+            }
+        }
+
+        #endregion
+    }
+
+    #region FilterPopupItem
+
+    ///<summary>
+    /// FilterPopupItem
+    ///</summary>
+    public class FilterPopupItem : ButtonItem
+    {
+        #region Private variables
+
+        private object _Value;
+        private FilterItemType _FilterItemType;
+
+        #endregion
+
+        #region Constructors
+
+        ///<summary>
+        /// FilterPopupItem
+        ///</summary>
+        ///<param name="name"></param>
+        ///<param name="text"></param>
+        ///<param name="filterItemType"></param>
+        public FilterPopupItem(string name, string text, FilterItemType filterItemType)
+            : this(name, text, filterItemType, null)
+        {
+        }
+
+        ///<summary>
+        /// FilterPopupItem
+        ///</summary>
+        ///<param name="name"></param>
+        ///<param name="text"></param>
+        ///<param name="filterItemType"></param>
+        ///<param name="value"></param>
+        public FilterPopupItem(string name,
+            string text, FilterItemType filterItemType, object value)
+            : base(name, text)
+        {
+            _Value = value;
+            _FilterItemType = filterItemType;
+        }
+
+        #endregion
+
+        #region Public properties
+
+        ///<summary>
+        /// Associated Value
+        ///</summary>
+        public object Value
+        {
+            get { return (_Value); }
+            set { _Value = value; }
+        }
+
+        ///<summary>
+        /// Associated FilterItem type
+        ///</summary>
+        public FilterItemType FilterItemType
+        {
+            get { return (_FilterItemType); }
+            set { _FilterItemType = value; }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region Enums
+
+    ///<summary>
+    /// FilterItemType
+    ///</summary>
+    public enum FilterItemType
+    {
+        /// <summary>
+        /// All
+        /// </summary>
+        All,
+
+        ///<summary>
+        /// Null
+        ///</summary>
+        Null,
+
+        ///<summary>
+        /// NotNull
+        ///</summary>
+        NotNull,
+
+        ///<summary>
+        /// Custom
+        ///</summary>
+        Custom,
+
+        ///<summary>
+        /// ComboBoxEntry
+        ///</summary>
+        ComboBoxEntry,
+
+        ///<summary>
+        /// ComboBoxEntry
+        ///</summary>
+        CheckBoxEntry,
+
+        ///<summary>
+        /// ScanTextEntry
+        ///</summary>
+        ScanTextEntry,
+
+        ///<summary>
+        /// ScanDateEntry
+        ///</summary>
+        ScanDateEntry,
+
+        ///<summary>
+        /// UserEntry
+        ///</summary>
+        UserEntry,
+
+        /// <summary>
+        /// DateTimeEntry
+        /// </summary>
+        DateTimeEntry,
+    }
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridFilter/FilterScan.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridFilter/FilterScan.cs
new file mode 100644
index 00000000..8ae3a12a
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridFilter/FilterScan.cs	
@@ -0,0 +1,276 @@
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    ///<summary>
+    /// FilterScan
+    ///</summary>
+    public class FilterScan
+    {
+        #region Events
+
+        ///<summary>
+        /// ScanComplete
+        ///</summary>
+        public event EventHandler ScanComplete;
+
+        private delegate void ScanListDelegate(List<object> items);
+
+        #endregion
+
+        #region Private variables
+
+        private GridColumn _GridColumn;
+
+        private bool _Scanning;
+        private Thread _ScanThread;
+        private EventHandler _OnScanComplete;
+        private ScanListDelegate _ScanListDelegate;
+        private List<object> _ScanItems;
+
+        #endregion
+
+        #region Public properties
+
+        ///<summary>
+        /// ScanItems
+        ///</summary>
+        public List<object> ScanItems
+        {
+            get { return (GetScanItems()); }
+        }
+
+        #endregion
+
+        ///<summary>
+        /// FilterScan
+        ///</summary>
+        ///<param name="gridColumn"></param>
+        public FilterScan(GridColumn gridColumn)
+        {
+            _GridColumn = gridColumn;
+
+            _OnScanComplete = new EventHandler(OnScanComplete);
+            _ScanListDelegate = new ScanListDelegate(AddScanItems);
+        }
+
+        #region BeginScan
+
+        ///<summary>
+        /// BeginScan
+        ///</summary>
+        public void BeginScan()
+        {
+            if (_Scanning == false)
+            {
+                _Scanning = true;
+                _ScanItems = null;
+
+                _ScanThread = new Thread(ScanThread);
+                _ScanThread.Start();
+            }
+        }
+
+        #endregion
+
+        #region EndScan
+
+        ///<summary>
+        /// BeginScan
+        ///</summary>
+        public void EndScan()
+        {
+            if (_Scanning == true)
+            {
+                if (_ScanThread.IsAlive)
+                {
+                    _ScanThread.Abort();
+                    _ScanThread.Join();
+                }
+
+                _ScanThread = null;
+                _ScanItems = null;
+
+                _Scanning = false;
+            }
+        }
+
+        #endregion
+
+        #region ScanThread
+
+        private void ScanThread()
+        {
+            GridColumn gridColumn = _GridColumn;
+            GridPanel panel = gridColumn.GridPanel;
+
+            List<object> scanItems = new List<object>();
+
+            try
+            {
+                if (panel != null)
+                {
+                    ScanColumn(panel.Rows, gridColumn, scanItems);
+
+                    RemoveDuplicates(scanItems);
+                }
+            }
+            catch
+            {
+            }
+            finally
+            {
+                _Scanning = false;
+
+                gridColumn.SuperGrid.BeginInvoke(
+                    _ScanListDelegate, new object[] { scanItems });
+
+                gridColumn.SuperGrid.BeginInvoke(
+                    _OnScanComplete, new object[] { this, EventArgs.Empty });
+            }
+        }
+
+        #region ScanColumn
+
+        private void ScanColumn(
+            GridItemsCollection rows, GridColumn gridColumn, List<object> scanItems)
+        {
+            if (rows != null && rows.Count > 0)
+            {
+                for (int i = 0; i < rows.Count; i++)
+                {
+                    GridContainer cont = rows[i] as GridContainer;
+
+                    if (cont != null)
+                    {
+                        GridRow row = cont as GridRow;
+
+                        if (row != null)
+                        {
+                            GridCell cell = row.GetCell(gridColumn.ColumnIndex);
+
+                            if (cell != null)
+                            {
+                                object value = cell.ValueEx;
+
+                                if (value != null && value != DBNull.Value)
+                                {
+                                    if (value is DateTime)
+                                        value = ((DateTime)value).Date;
+
+                                    scanItems.Add(value);
+                                }
+                            }
+                        }
+
+                        if (cont is GridGroup ||
+                            (gridColumn.GridPanel.FilterLevel != FilterLevel.Root && cont is GridPanel == false))
+                        {
+                            ScanColumn(cont.Rows, gridColumn, scanItems);
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region RemoveDuplicates
+
+        private void RemoveDuplicates(List<object> scanItems)
+        {
+            GridColumn gridColumn = _GridColumn;
+
+            if (gridColumn.DataType != null)
+            {
+                for (int i = scanItems.Count - 1; i >= 0; --i)
+                {
+                    if (scanItems[i].GetType() != gridColumn.DataType)
+                        scanItems.RemoveAt(i);
+                }
+            }
+
+            scanItems.Sort(new ScanComparer());
+
+            object o = null;
+
+            for (int i = scanItems.Count - 1; i >= 0; --i)
+            {
+                if (scanItems[i].Equals(o) == true)
+                    scanItems.RemoveAt(i);
+                else
+                    o = scanItems[i];
+            }
+        }
+
+        private class ScanComparer : IComparer<object>
+        {
+            public int Compare(object val1, object val2)
+            {
+                return (CompareVal.CompareTo(val1, val2));
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region AddScanItems
+
+        private void AddScanItems(List<object> items)
+        {
+            _ScanItems = items;
+        }
+
+        #endregion
+
+        #region OnScanComplete
+
+        private void OnScanComplete(object sender, EventArgs e)
+        {
+            if (ScanComplete != null)
+                ScanComplete(sender, e);
+        }
+
+        #endregion
+
+        #region GetScanItems
+
+        internal List<object> GetScanItems()
+        {
+            List<object> list = null;
+
+            if (_GridColumn.NeedsFilterScan == true)
+            {
+                _GridColumn.SuperGrid.Cursor = Cursors.AppStarting;
+
+                _GridColumn.NeedsFilterScan = false;
+                _GridColumn.FilterScan.BeginScan();
+
+                for (int i = 0; i < 500; i++)
+                {
+                    Application.DoEvents();
+                    System.Threading.Thread.Sleep(20);
+
+                    list = _ScanItems;
+
+                    if (list != null)
+                        break;
+                }
+
+                _GridColumn.SuperGrid.Cursor = Cursors.Default;
+            }
+            else
+            {
+                list = _ScanItems;
+            }
+
+            return (list);
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridFilter/FilterUserData.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridFilter/FilterUserData.cs
new file mode 100644
index 00000000..3c971f1c
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridFilter/FilterUserData.cs	
@@ -0,0 +1,299 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using System.Xml;
+
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    ///<summary>
+    /// FilterUserData
+    ///</summary>
+    static public class FilterUserData
+    {
+        #region Static data
+
+        private static string _filterPath;
+        private static List<UserFilterData> _filterData;
+
+        #endregion
+
+        static FilterUserData()
+        {
+            _filterPath = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) +
+                          "\\DotNetBar\\UserFilterData.xml";
+        }
+
+        #region GetFilterData
+
+        ///<summary>
+        /// GetFilterData
+        ///</summary>
+        ///<returns></returns>
+        static public List<UserFilterData> GetFilterData(GridPanel gridPanel)
+        {
+            if (_filterData != null)
+                return (_filterData);
+
+            return (LoadFilterData(gridPanel));
+        }
+
+        #endregion
+
+        #region LoadFilterData
+
+        ///<summary>
+        /// LoadFilterData
+        ///</summary>
+        ///<returns></returns>
+        static public List<UserFilterData> LoadFilterData(GridPanel gridPanel)
+        {
+            _filterData = new List<UserFilterData>();
+
+            string path = _filterPath;
+
+            if (gridPanel.SuperGrid.DoFilterLoadUserDataEvent(
+                gridPanel, ref path, ref _filterData) == false)
+            {
+                if (File.Exists(path) == true)
+                {
+                    using (XmlReader reader = XmlReader.Create(path))
+                    {
+                        UserFilterData fd = null;
+
+                        while (reader.Read())
+                        {
+                            if (reader.IsStartElement())
+                            {
+                                switch (reader.Name)
+                                {
+                                    case "Filter":
+                                        fd = new UserFilterData();
+                                        _filterData.Add(fd);
+                                        break;
+
+                                    case "Name":
+                                        if (reader.Read())
+                                        {
+                                            if (fd != null)
+                                                fd.Name = reader.Value.Trim();
+                                        }
+                                        break;
+
+                                    case "Description":
+                                        if (reader.Read())
+                                        {
+                                            if (fd != null)
+                                                fd.Description = reader.Value.Trim();
+                                        }
+                                        break;
+
+                                    case "Expression":
+                                        if (reader.Read())
+                                        {
+                                            if (fd != null)
+                                                fd.Expression = reader.Value.Trim();
+                                        }
+                                        break;
+
+                                    case "ReferNames":
+                                        if (reader.Read())
+                                        {
+                                            if (fd != null)
+                                                fd.ReferNamesString = reader.Value.Trim();
+                                        }
+                                        break;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
+            return (_filterData);
+        }
+
+        #endregion
+
+        #region StoreFilterData
+
+        ///<summary>
+        /// StoreFilterData
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="filterData"></param>
+        static public void StoreFilterData(GridPanel gridPanel, List<UserFilterData> filterData)
+        {
+            for (int i = filterData.Count - 1; i >= 0; --i)
+            {
+                UserFilterData fd = filterData[i];
+
+                if (fd.Expression != null)
+                {
+                    string expr = fd.Expression.Trim();
+
+                    if (expr.Length <= 0)
+                        filterData.RemoveAt(i);
+                }
+            }
+
+            string path = _filterPath;
+
+            if (gridPanel.SuperGrid.DoFilterStoreUserDataEvent(
+                gridPanel, ref path, ref _filterData) == false)
+            {
+                string dir = Path.GetDirectoryName(path);
+
+                if (dir != null)
+                {
+                    if (Directory.Exists(dir) == false)
+                        Directory.CreateDirectory(dir);
+
+                    using (XmlWriter writer = XmlWriter.Create(path))
+                    {
+                        writer.WriteStartDocument();
+                        writer.WriteStartElement("FilterData");
+
+                        foreach (UserFilterData fd in filterData)
+                        {
+                            if (String.IsNullOrEmpty(fd.Expression) == false)
+                            {
+                                if (String.IsNullOrEmpty(fd.Name) == false)
+                                {
+                                    writer.WriteStartElement("Filter");
+                                    writer.WriteElementString("Name", fd.Name);
+
+                                    if (String.IsNullOrEmpty(fd.Description) == false)
+                                        writer.WriteElementString("Description", fd.Description);
+
+                                    writer.WriteElementString("Expression", fd.Expression);
+
+                                    if (String.IsNullOrEmpty(fd.ReferNamesString) == false)
+                                        writer.WriteElementString("ReferNames", fd.ReferNamesString);
+
+                                    writer.WriteEndElement();
+                                }
+                            }
+                        }
+
+                        writer.WriteEndElement();
+                        writer.WriteEndDocument();
+                    }
+                }
+            }
+        }
+
+        #endregion
+    }
+
+    ///<summary>
+    /// User Filter expression data
+    ///</summary>
+    public class UserFilterData
+    {
+        #region Private variables
+
+        private string _Name;
+        private string _Description;
+        private string _Expression;
+
+        private List<string> _ReferNames = new List<string>();
+
+        #endregion
+
+        #region Public properties
+
+        #region Description
+
+        ///<summary>
+        /// Description
+        ///</summary>
+        public string Description
+        {
+            get { return (_Description); }
+            set { _Description = value; }
+        }
+
+        #endregion
+
+        #region Expression
+
+        ///<summary>
+        /// Expression
+        ///</summary>
+        public string Expression
+        {
+            get { return (_Expression); }
+            set { _Expression = value; }
+        }
+
+        #endregion
+
+        #region Name
+
+        ///<summary>
+        /// Name
+        ///</summary>
+        public string Name
+        {
+            get { return (_Name); }
+            set { _Name = value; }
+        }
+
+        #endregion
+
+        #region ReferNames
+
+        ///<summary>
+        /// ReferNames
+        ///</summary>
+        public List<string> ReferNames
+        {
+            get { return (_ReferNames); }
+        }
+
+        #endregion
+
+        #region ReferNamesString
+
+        ///<summary>
+        /// ReferNamesString
+        ///</summary>
+        public string ReferNamesString
+        {
+            get
+            {
+                StringBuilder sb = new StringBuilder();
+
+                foreach (string s in _ReferNames)
+                {
+                    sb.Append(s);
+                    sb.Append(",");
+                }
+
+                if (sb.Length > 0)
+                    sb.Length--;
+
+                return (sb.ToString());
+            }
+
+            set
+            {
+                _ReferNames.Clear();
+
+                if (value != null)
+                {
+                    string[] names = value.Split(',');
+
+                    foreach (string s in names)
+                        _ReferNames.Add(s);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+    }
+}
+
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridFilter/GridFilter.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridFilter/GridFilter.cs
new file mode 100644
index 00000000..453d76e7
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridFilter/GridFilter.cs	
@@ -0,0 +1,1564 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Drawing.Drawing2D;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.SuperGrid.Style;
+
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    /// <summary>
+    /// Represents a Grid Filter row
+    /// </summary>
+    [TypeConverter(typeof(BlankExpandableObjectConverter))]
+    public class GridFilter : GridElement
+    {
+        #region Constants
+
+        private const int ImageCacheSize = 8;
+
+        #endregion
+
+        #region Private variables
+
+        private int _RowHeight;
+
+        private FilterRowVisualStyles _EffectiveRowHeaderStyles;
+        private int _StyleUpdateCount;
+
+        private HeaderArea _HitArea;
+        private GridColumn _HitColumn;
+
+        private HeaderArea _MouseDownHitArea;
+        private GridColumn _MouseDownHitColumn;
+
+        private Image _FilterImage;
+        private int _FilterImageIndex = -1;
+        private Image[] _FilterCacheImages = new Image[ImageCacheSize];
+
+        private bool _Visible;
+        private bool _ShowPanelFilterExpr;
+        private bool _ShowToolTips = true;
+        private bool _FocusCuesEnabled = true;
+
+        #endregion
+
+        #region Internal properties
+
+        #region RowHeaderBounds
+
+        internal Rectangle RowHeaderBounds
+        {
+            get
+            {
+                GridPanel panel = GridPanel;
+
+                if (panel != null)
+                {
+                    Rectangle r = Bounds;
+                    r.Width = panel.RowHeaderWidthEx;
+
+                    return (r);
+                }
+
+                return (Rectangle.Empty);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Public properties
+
+        #region Bounds
+
+        ///<summary>
+        /// Gets the scroll adjusted bounds
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override Rectangle Bounds
+        {
+            get
+            {
+                GridPanel panel = GridPanel;
+
+                if (panel != null)
+                {
+                    Rectangle r = BoundsRelative;
+
+                    if (panel.IsSubPanel == true)
+                    {
+                        r.X -= HScrollOffset;
+
+                        if (IsVFrozen == false)
+                            r.Y -= VScrollOffset;
+                    }
+
+                    return (r);
+                }
+
+                return (Rectangle.Empty);
+            }
+        }
+
+        #endregion
+
+        #region FilterImage
+
+        /// <summary>
+        /// Gets or sets the default image to display
+        /// in the filter row header.
+        /// </summary>
+        [DefaultValue(null), Category("Filtering")]
+        [Description("Indicates the default image to display in the filter row header.")]
+        public Image FilterImage
+        {
+            get { return (_FilterImage); }
+
+            set
+            {
+                if (_FilterImage != value)
+                {
+                    _FilterImage = value;
+
+                    NeedsMeasured = true;
+
+                    OnPropertyChangedEx("FilterImage", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #region GetFilterImage
+
+        internal Image GetFilterImage(GridPanel panel)
+        {
+            if (_FilterImage != null)
+                return (_FilterImage);
+
+            if (_FilterImageIndex >= 0)
+            {
+                ImageList imageList = GridPanel.ImageList;
+
+                if (imageList != null && _FilterImageIndex < imageList.Images.Count)
+                    return (imageList.Images[_FilterImageIndex]);
+            }
+
+            return (GetFilterImageEx(panel));
+        }
+
+        #region GetFilterImageEx
+
+        private Image GetFilterImageEx(GridPanel panel)
+        {
+            StyleState state = GetFilterImageState(panel);
+
+            Image cacheImage = _FilterCacheImages[(int)state];
+
+            if (cacheImage == null)
+            {
+                Image image = new Bitmap(Dpi.Width13, Dpi.Height12);
+
+                using (Graphics g = Graphics.FromImage(image))
+                {
+                    g.SmoothingMode = SmoothingMode.AntiAlias;
+
+                    using (GraphicsPath path = new GraphicsPath())
+                    {
+                        Point[] pts =
+                        {
+                            new Point(0, 0),
+                            new Point(Dpi.Width12, 0),
+                            new Point(Dpi.Width12, Dpi.Height1),
+                            new Point(Dpi.Width7, Dpi.Height6),
+                            new Point(Dpi.Width7, Dpi.Height11),
+                            new Point(Dpi.Width5, Dpi.Height9),
+                            new Point(Dpi.Width5, Dpi.Height6),
+                            new Point(0, Dpi.Height1),
+                            new Point(0, 0),
+                        };
+
+                        path.AddLines(pts);
+
+                        FilterRowVisualStyle style = GetEffectiveRowStyle(state);
+
+                        Rectangle r = new 
+                            Rectangle(Dpi.Width1, Dpi.Height1, Dpi.Width11, Dpi.Height10);
+
+                        Background back = (style.FilterBackground != null && style.FilterBackground.IsEmpty == false)
+                            ? style.FilterBackground : new Background(Color.White);
+
+                        using (Brush br = back.GetBrush(r))
+                        {
+                            g.FillPath(br, path);
+                        }
+
+                        Color color = style.FilterBorderColor;
+
+                        if (color.IsEmpty)
+                            color = Color.DimGray;
+
+                        using (Pen pen = new Pen(color))
+                            g.DrawPath(pen, path);
+                    }
+                }
+
+                _FilterCacheImages[(int)state] = image;
+
+                cacheImage = image;
+            }
+
+            return (cacheImage);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region FilterImageIndex
+
+        /// <summary>
+        /// Gets or sets the Filter image index
+        /// </summary>
+        [Browsable(true), DefaultValue(-1)]
+        [Category("Appearance"), Description("Indicates the Filter Row image index.")]
+        [Editor("DevComponents.SuperGrid.Design.ImageIndexEditor, DevComponents.SuperGrid.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=26d81176cfa2b486", typeof(UITypeEditor))]
+        [TypeConverter(typeof(ImageIndexConverter))]
+        public int FilterImageIndex
+        {
+            get { return (_FilterImageIndex); }
+
+            set
+            {
+                if (_FilterImageIndex != value)
+                {
+                    _FilterImageIndex = value;
+
+                    OnPropertyChangedEx("FilterImageIndex", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        [Browsable(false)]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetFilterImageIndex()
+        {
+            _FilterImageIndex = -1;
+        }
+
+        #endregion
+
+        #region FocusCuesEnabled
+
+        /// <summary>
+        /// Gets or sets whether focus cues are displayed on the focused element
+        /// </summary>
+        [DefaultValue(true), Category("Appearance")]
+        [Description("Indicates whether focus cues are displayed on the focused element.")]
+        public bool FocusCuesEnabled
+        {
+            get { return (_FocusCuesEnabled); }
+
+            set
+            {
+                if (_FocusCuesEnabled != value)
+                {
+                    _FocusCuesEnabled = value;
+
+                    OnPropertyChangedEx("FocusCuesEnabled", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowPanelFilterExpr
+
+        ///<summary>
+        /// Gets or sets whether filter
+        /// expressions are displayed in the panel area
+        ///</summary>
+        [DefaultValue(false), Category("Appearance")]
+        [Description("Indicates whether filter expressions are displayed in the panel area.")]
+        public bool ShowPanelFilterExpr
+        {
+            get { return (_ShowPanelFilterExpr); }
+
+            set
+            {
+                if (_ShowPanelFilterExpr != value)
+                {
+                    _ShowPanelFilterExpr = value;
+
+                    OnPropertyChangedEx("ShowPanelFilterExpr", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region RowHeight
+
+        ///<summary>
+        /// Gets or sets the height of the ColumnHeader row
+        ///</summary>
+        [DefaultValue(0), Category("Style")]
+        [Description("Indicates the height of the ColumnHeader row")]
+        public int RowHeight
+        {
+            get { return (_RowHeight); }
+
+            set
+            {
+                if (_RowHeight != value)
+                {
+                    if (value < 0)
+                        throw new Exception("RowHeight cannot be negative");
+
+                    _RowHeight = value;
+
+                    NeedsMeasured = true;
+
+                    OnPropertyChangedEx("RowHeight", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowToolTips
+
+        /// <summary>
+        /// Gets or sets whether tooltips are shown for FilterPanel expressions
+        /// </summary>
+        [DefaultValue(true), Category("Appearance")]
+        [Description("Indicates whether tooltips are shown for FilterPanel expressions.")]
+        public bool ShowToolTips
+        {
+            get { return (_ShowToolTips); }
+
+            set
+            {
+                if (value != _ShowToolTips)
+                {
+                    _ShowToolTips = value;
+
+                    OnPropertyChanged("ShowToolTips");
+                }
+            }
+        }
+
+        #endregion
+
+        #region Visible
+
+        /// <summary>
+        /// Visible
+        /// </summary>
+        [DefaultValue(false), Category("Appearance")]
+        [Description("Indicates whether the item is visible")]
+        public override bool Visible
+        {
+            get { return (_Visible); }
+
+            set
+            {
+                if (_Visible != value)
+                {
+                    _Visible = value;
+
+                    if (_Visible == false)
+                    {
+                        if (SuperGrid.ActiveFilterPanel != null)
+                            SuperGrid.ActiveFilterPanel.EndEdit();
+                    }
+
+                    OnPropertyChangedEx("Visible", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region MeasureOverride
+
+        /// <summary>
+        /// Performs the layout of the item and sets
+        /// the Size property to size that item will take.
+        /// </summary>
+        /// <param name="layoutInfo">Layout information.</param>
+        /// <param name="stateInfo"></param>
+        /// <param name="constraintSize"></param>
+        protected override void MeasureOverride(
+            GridLayoutInfo layoutInfo, GridLayoutStateInfo stateInfo, Size constraintSize)
+        {
+            Size sizeNeeded = Size.Empty;
+
+            GridPanel panel = stateInfo.GridPanel;
+
+            sizeNeeded.Width = panel.ColumnHeader.Size.Width;
+
+            sizeNeeded.Height = (_RowHeight > 0)
+                ? _RowHeight : MeasureHeaderHeight(panel);
+
+            Size = sizeNeeded;
+        }
+
+        #region MeasureHeader
+
+        private int MeasureHeaderHeight(GridPanel panel)
+        {
+            int maxHeight = 0;
+
+            foreach (GridColumn col in panel.Columns)
+            {
+                if (col.Visible == true)
+                {
+                    Size size = FilterPanel.GetPreferredSize(this, col);
+
+                    FilterColumnHeaderVisualStyle style = GetEffectiveStyle(col);
+
+                    int n = size.Height + style.Margin.Vertical;
+
+                    if (n > maxHeight)
+                        maxHeight = n;
+                }
+            }
+
+            if (maxHeight > 0)
+                maxHeight += 4;
+
+            return (maxHeight);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ArrangeOverride
+
+        /// <summary>
+        /// Performs the arrange pass layout of the item
+        /// when final position and size of the item has been set.
+        /// </summary>
+        /// <param name="layoutInfo">Layout information.</param>
+        /// <param name="stateInfo"></param>
+        /// <param name="layoutBounds">Layout bounds</param>
+        protected override void ArrangeOverride(GridLayoutInfo layoutInfo,
+            GridLayoutStateInfo stateInfo, Rectangle layoutBounds)
+        {
+        }
+
+        #endregion
+
+        #region RenderOverride
+
+        /// <summary>
+        /// Performs drawing of the item and its children.
+        /// </summary>
+        /// <param name="renderInfo">Holds contextual rendering information.</param>
+        protected override void RenderOverride(GridRenderInfo renderInfo)
+        {
+            GridPanel panel = Parent as GridPanel;
+
+            if (panel != null)
+            {
+                Graphics g = renderInfo.Graphics;
+                Rectangle bounds = Bounds;
+
+                FilterRowVisualStyle style = GetEffectiveRowStyle();
+                GridPanelVisualStyle pstyle = panel.GetEffectiveStyle();
+
+                if (SuperGrid.DoPreRenderFilterRowEvent(g,
+                    this, null, RenderParts.Background, bounds) == false)
+                {
+                    RenderRowBackground(g, style, bounds);
+
+                    SuperGrid.DoPostRenderFilterRowEvent(g,
+                        this, null, RenderParts.Background, bounds);
+                }
+
+                RenderColumnBorder(g, panel, bounds);
+
+                if (panel.IsSubPanel == true ||
+                    panel.FrozenColumnCount <= 0)
+                {
+                    RenderAllColumns(renderInfo, panel);
+                }
+                else
+                {
+                    RenderScrollableColumns(renderInfo, panel);
+                    RenderFrozenColumns(renderInfo, panel);
+                }
+
+                RenderRowHeader(g, panel, style, pstyle);
+            }
+        }
+
+        #region RenderRowBackground
+
+        private void RenderRowBackground(
+            Graphics g, FilterRowVisualStyle style, Rectangle bounds)
+        {
+            using (Brush br = style.WhiteSpaceBackground.GetBrush(bounds))
+                g.FillRectangle(br, bounds);
+        }
+
+        #endregion
+
+        #region RenderAllColumns
+
+        private void RenderAllColumns(
+            GridRenderInfo renderInfo, GridPanel panel)
+        {
+            Graphics g = renderInfo.Graphics;
+            GridColumnCollection columns = panel.Columns;
+
+            if (columns != null)
+            {
+                int[] map = columns.DisplayIndexMap;
+                for (int i = 0; i < map.Length; i++)
+                {
+                    int index = map[i];
+
+                    GridColumn column = columns[index];
+
+                    if (column.Visible == true)
+                    {
+                        Rectangle r = GetBounds(panel, column);
+
+                        if (r.IntersectsWith(renderInfo.ClipRectangle) == true)
+                            RenderColumnHeader(g, panel, column, r);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region RenderScrollableColumns
+
+        private void RenderScrollableColumns(
+            GridRenderInfo renderInfo, GridPanel panel)
+        {
+            Graphics g = renderInfo.Graphics;
+            GridColumnCollection columns = panel.Columns;
+
+            int[] map = columns.DisplayIndexMap;
+            for (int i = 0; i < map.Length; i++)
+            {
+                int index = map[i];
+
+                GridColumn column = columns[index];
+
+                if (column.Visible == true && column.IsHFrozen == false)
+                {
+                    Rectangle r = GetBounds(panel, column);
+
+                    if (r.IntersectsWith(renderInfo.ClipRectangle) == true)
+                        RenderColumnHeader(g, panel, column, r);
+                }
+            }
+        }
+
+        #endregion
+
+        #region RenderFrozenColumns
+
+        private void RenderFrozenColumns(
+            GridRenderInfo renderInfo, GridPanel panel)
+        {
+            Graphics g = renderInfo.Graphics;
+            GridColumnCollection columns = panel.Columns;
+
+            int[] map = columns.DisplayIndexMap;
+            for (int i = 0; i < map.Length; i++)
+            {
+                int index = map[i];
+
+                GridColumn column = columns[index];
+
+                if (column.Visible == true)
+                {
+                    if (column.IsHFrozen == false)
+                        break;
+                
+                    Rectangle r = GetBounds(panel, column);
+
+                    if (r.IntersectsWith(renderInfo.ClipRectangle) == true)
+                        RenderColumnHeader(g, panel, column, r);
+                }
+            }
+        }
+
+        #endregion
+
+        #region RenderRowHeader
+
+        private void RenderRowHeader(Graphics g,
+            GridPanel panel, FilterRowVisualStyle style, GridPanelVisualStyle pstyle)
+        {
+            Rectangle r = GetRowHeaderBounds(panel);
+
+            if (r.Width > 0 && r.Height > 0)
+            {
+                if (SuperGrid.DoPreRenderFilterRowEvent(g,
+                    this, null, RenderParts.RowHeader, r) == false)
+                {
+                    using (Brush br = style.RowHeader.Background.GetBrush(r))
+                        g.FillRectangle(br, r);
+
+                    using (Pen pen = new Pen(style.RowHeader.BorderHighlightColor, Dpi.Width1))
+                        g.DrawLine(pen, r.X + 1, r.Top, r.X + 1, r.Bottom - 1);
+
+                    using (Pen pen = new Pen(pstyle.HeaderLineColor, Dpi.Width1))
+                        g.DrawLine(pen, r.Right - 1, r.Top, r.Right - 1, r.Bottom - 1);
+
+                    using (Pen pen = new Pen(style.RowHeader.BorderHighlightColor, Dpi.Height1))
+                        g.DrawLine(pen, r.X, r.Top, r.Right - 2, r.Top);
+
+                    using (Pen pen = new Pen(pstyle.HeaderLineColor, Dpi.Height1))
+                    {
+                        g.DrawLine(pen, r.X, r.Top - 1, r.Right - 2, r.Top - 1);
+                        g.DrawLine(pen, r.X, r.Bottom - 1, r.Right - 2, r.Bottom - 1);
+                    }
+
+                    RenderFilterIndicator(g, panel, r);
+
+                    SuperGrid.DoPostRenderFilterRowEvent(g,
+                        this, null, RenderParts.RowHeader, r);
+                }
+            }
+        }
+
+        #region RenderFilterIndicator
+
+        private void RenderFilterIndicator(Graphics g, GridPanel panel, Rectangle r)
+        {
+            Image image = GetFilterImage(panel);
+
+            if (image != null)
+            {
+                Rectangle u = r;
+                u.Size = image.Size;
+
+                if (r.Width > u.Width)
+                    u.X = r.X + (r.Width - u.Width) / 2;
+
+                if (r.Height > u.Height)
+                    u.Y += (r.Height - u.Height) / 2;
+
+                u.Intersect(r);
+
+                g.DrawImageUnscaledAndClipped(image, u);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderColumnHeader
+
+        private void RenderColumnHeader(Graphics g,
+            GridPanel panel, GridColumn column, Rectangle bounds)
+        {
+            FilterColumnHeaderVisualStyle style = GetEffectiveStyle(column);
+
+            if (bounds.Width > 0 && bounds.Height > 0)
+            {
+                if (SuperGrid.DoPreRenderFilterRowEvent(g,
+                    this, column, RenderParts.Background, bounds) == false)
+                {
+                    RenderBackground(g, column, style, bounds);
+
+                    SuperGrid.DoPostRenderFilterRowEvent(g,
+                        this, column, RenderParts.Background, bounds);
+                }
+
+                if (SuperGrid.DoPreRenderFilterRowEvent(g,
+                    this, column, RenderParts.Border, bounds) == false)
+                {
+                    RenderColumnBorder(g, panel, bounds);
+
+                    SuperGrid.DoPostRenderFilterRowEvent(g,
+                        this, column, RenderParts.Border, bounds);
+                }
+
+                Rectangle r = bounds;
+
+                r.X += (style.Margin.Left + 1);
+                r.Width -= (style.Margin.Horizontal + 2);
+
+                r.Y += style.Margin.Top;
+                r.Height -= style.Margin.Vertical;
+
+                if (r.Width > 0 && r.Height > 0)
+                {
+                    if (SuperGrid.ActiveFilterPanel == null ||
+                        SuperGrid.ActiveFilterPanel.GridColumn != column)
+                    {
+                        if (SuperGrid.DoPreRenderFilterRowEvent(g,
+                            this, column, RenderParts.Content, r) == false)
+                        {
+                            RenderFilterContent(g, column, style, r);
+
+                            SuperGrid.DoPostRenderFilterRowEvent(g,
+                                this, column, RenderParts.Content, r);
+                        }
+                    }
+                }
+
+                RenderFocusRect(g, column, bounds);
+            }
+        }
+
+        #region RenderBackground
+
+        internal void RenderBackground(Graphics g,
+            GridColumn column, FilterColumnHeaderVisualStyle style, Rectangle r)
+        {
+            if (style == null)
+                style = GetEffectiveStyle(column);
+
+            if (column.FilterError == false || style.ErrorBackground == null)
+            {
+                using (Brush br = style.Background.GetBrush(r))
+                    g.FillRectangle(br, r);
+            }
+            else
+            {
+                using (Brush br = style.ErrorBackground.GetBrush(r))
+                    g.FillRectangle(br, r);
+            }
+        }
+
+        #endregion
+
+        #region RenderColumnBorder
+
+        private void RenderColumnBorder(
+            Graphics g, GridPanel panel, Rectangle bounds)
+        {
+            Rectangle r = bounds;
+            Rectangle p = panel.PanelBounds;
+
+            GridPanelVisualStyle pstyle = panel.GetEffectiveStyle();
+
+            if (r.Y > 0 && r.Y <= p.Y)
+            {
+                r.Height -= (p.Y - r.Y + 1);
+                r.Y = p.Y + 1;
+            }
+
+            using (Pen pen = new Pen(pstyle.HeaderLineColor, Dpi.Width1))
+            {
+                g.DrawLine(pen, r.X - 1, r.Top - 1, r.X - 1, r.Bottom - 1);
+                g.DrawLine(pen, r.Right - 1, r.Top - 1, r.Right - 1, r.Bottom - 1);
+            }
+
+            using (Pen pen = new Pen(pstyle.HeaderLineColor, Dpi.Height1))
+            {
+                g.DrawLine(pen, r.X - 1, r.Top - 1, r.Right - 1, r.Top - 1);
+                g.DrawLine(pen, r.X - 1, r.Bottom - 1, r.Right - 1, r.Bottom - 1);
+            }
+        }
+
+        #endregion
+
+        #region RenderFilterContent
+
+        private void RenderFilterContent(Graphics g,
+            GridColumn column, FilterColumnHeaderVisualStyle style, Rectangle bounds)
+        {
+            switch (column.GetFilterPanelType())
+            {
+                case FilterEditType.CheckBox:
+                    FilterPanel.RenderCheckBox(g, this, column, bounds);
+                    break;
+
+                default:
+                    if (column.FilterValue != null || column.CanShowFilterExpr == true)
+                    {
+                        object value = column.FilterDisplayValue;
+
+                        if (value != null)
+                        {
+                            string s = value is DateTime
+                                           ? ((DateTime)value).ToString("d")
+                                           : value.ToString();
+
+                            RenderContent(g, column, s, style, bounds);
+                        }
+                    }
+                    else if (column.FilterExpr != null)
+                    {
+                        string s = column.SuperGrid.FilterCustomString;
+
+                        RenderContent(g, column, s, style, bounds);
+                    }
+                    break;
+            }
+        }
+
+        #region RenderContent
+
+        private void RenderContent(Graphics g, GridColumn column,
+            string s, FilterColumnHeaderVisualStyle style, Rectangle bounds)
+        {
+            eTextFormat tf = style.GetTextFormatFlags();
+
+            if (string.IsNullOrEmpty(s) == false)
+            {
+                Rectangle r = bounds;
+                r.Width--;
+                r.Height -= 2;
+
+                Color color = column.FilterError == false
+                                  ? style.TextColor
+                                  : style.ErrorTextColor;
+
+                TextDrawing.DrawString(g, s, style.Font, color, r, tf);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderFocusRect
+
+        private void RenderFocusRect(Graphics g, GridColumn column, Rectangle r)
+        {
+            if (_FocusCuesEnabled == true)
+            {
+                if (SuperGrid.ActiveFilterPanel != null)
+                {
+                    if (SuperGrid.ActiveFilterPanel.GridColumn == column)
+                    {
+                        r.Width -= Dpi.Width1;
+                        r.Height -= Dpi.Height1;
+
+                        ControlPaint.DrawFocusRectangle(g, r);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region GetRowHeaderBounds
+
+        private Rectangle GetRowHeaderBounds(GridPanel panel)
+        {
+            if (panel.ShowRowHeaders == true)
+            {
+                Rectangle r = Bounds;
+                r.Width = panel.RowHeaderWidthEx;
+
+                Rectangle p = panel.PanelBounds;
+
+                if (r.Y <= p.Y)
+                {
+                    r.Height -= (p.Y - r.Y + 1);
+                    r.Y = p.Y + 1;
+                }
+
+                return (r);
+            }
+
+            return (Rectangle.Empty);
+        }
+
+        #endregion
+
+        #region Mouse support
+
+        #region InternalMouseEnter
+
+        internal override void InternalMouseEnter(EventArgs e)
+        {
+            SuperGrid.ToolTipText = "";
+
+            base.InternalMouseEnter(e);
+        }
+
+        #endregion
+
+        #region InternalMouseLeave
+
+        internal override void InternalMouseLeave(EventArgs e)
+        {
+            GridPanel panel = GridPanel;
+
+            if (panel != null)
+            {
+                if (_HitArea == HeaderArea.InContent || _HitArea == HeaderArea.NoWhere)
+                    InvalidateRender();
+
+                else if (_HitArea == HeaderArea.InRowHeader || _HitArea == HeaderArea.InFilterMenu)
+                    InvalidateRowHeader();
+            
+                _HitArea = HeaderArea.NoWhere;
+                _HitColumn = null;
+
+                SuperGrid.ToolTipText = "";
+            }
+
+            base.InternalMouseLeave(e);
+        }
+
+        #endregion
+
+        #region InternalMouseMove
+
+        private HeaderArea _LastHitArea;
+        private GridColumn _LastHitColumn;
+
+        internal override void InternalMouseMove(MouseEventArgs e)
+        {
+            GridPanel panel = Parent as GridPanel;
+
+            if (panel != null)
+            {
+                _LastHitArea = _HitArea;
+                _LastHitColumn = _HitColumn;
+
+                _HitArea = GetHitArea(e.Location, ref _HitColumn, false);
+
+                switch (_HitArea)
+                {
+                    case HeaderArea.InFilterMenu:
+                        SuperGrid.GridCursor = Cursors.Hand;
+                        UpdateToolTip(panel, panel.FilterExpr);
+                        break;
+
+                    case HeaderArea.InContent:
+                        SuperGrid.GridCursor = Cursors.Default;
+
+                        if (_HitColumn != null)
+                        {
+                            if (_HitColumn.IsFilteringEnabled == true)
+                                UpdateToolTip(panel, _HitColumn.FilterExpr);
+                        }
+                        break;
+
+                    default:
+                        SuperGrid.GridCursor = Cursors.Default;
+                        SuperGrid.ToolTipText = "";
+                        break;
+                }
+
+                if (_LastHitArea != _HitArea || _LastHitColumn != _HitColumn)
+                {
+                    InvalidateRender();
+                    InvalidateRowHeader();
+                }
+
+                base.InternalMouseMove(e);
+            }
+        }
+
+        #region UpdateToolTip
+
+        private void UpdateToolTip(GridPanel panel, string toolTip)
+        {
+            if (_ShowToolTips == true)
+            {
+                if (_HitArea != _LastHitArea || _HitColumn != _LastHitColumn)
+                    panel.SetHeaderTooltip(this, _HitColumn, _HitArea, toolTip);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InternalMouseDown
+
+        internal override void InternalMouseDown(MouseEventArgs e)
+        {
+            base.OnMouseDown(e);
+
+            GridPanel panel = GridPanel;
+
+            if (panel != null)
+            {
+                _MouseDownHitArea = _HitArea;
+                _MouseDownHitColumn = _HitColumn;
+
+                switch (_HitArea)
+                {
+                    case HeaderArea.InContent:
+                        GridColumn column = _HitColumn;
+
+                        if (column != null)
+                        {
+                            if (_HitColumn.IsFilteringEnabled == true)
+                            {
+                                if (panel.SetActiveRow(null, false) == true)
+                                {
+                                    FilterPanel fp = FilterPanel.GetFilterPanel(column);
+
+                                    if (fp != null)
+                                        fp.BeginEdit();
+                                }
+                            }
+                        }
+                        break;
+
+                    case HeaderArea.InFilterMenu:
+                        if (panel.SuperGrid.DoFilterBeginEditEvent(panel, null, null) == false)
+                            LaunchCustomDialog(panel, panel.FilterExpr);
+                        break;
+                }
+            }
+        }
+
+        #region LaunchCustomDialog
+
+        private void LaunchCustomDialog(GridPanel panel, string filterExpr)
+        {
+            Form form = panel.SuperGrid.FindForm();
+
+            if (panel.SuperGrid.FilterUseExtendedCustomDialog == true)
+            {
+                CustomFilterEx cf = new CustomFilterEx(panel, null, filterExpr);
+
+                cf.Text = panel.Name;
+
+                DialogResult dr = cf.ShowDialog(form);
+
+                if (dr == DialogResult.OK)
+                    panel.FilterExpr = cf.FilterExpr;
+            }
+            else
+            {
+                CustomFilter cf = new CustomFilter(panel, null, filterExpr);
+
+                cf.Text = panel.Name;
+
+                DialogResult dr = cf.ShowDialog(form);
+
+                if (dr == DialogResult.OK)
+                    panel.FilterExpr = cf.FilterExpr;
+            }
+
+            SuperGrid.Focus();
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InternalMouseUp
+
+        internal override void InternalMouseUp(MouseEventArgs e)
+        {
+            GridPanel panel = GridPanel;
+
+            if (panel != null && _HitArea == _MouseDownHitArea)
+            {
+                switch (_HitArea)
+                {
+                    case HeaderArea.InContent:
+                        if (_HitColumn != null && _MouseDownHitColumn == _HitColumn)
+                            SuperGrid.DoFilterHeaderClickEvent(panel, _HitColumn, e);
+                        break;
+
+                    case HeaderArea.InRowHeader:
+                        SuperGrid.DoFilterRowHeaderClickEvent(panel);
+                        break;
+
+                    case HeaderArea.InFilterMenu:
+                        SuperGrid.DoFilterRowHeaderClickEvent(panel);
+                        break;
+                }
+            }
+
+            base.InternalMouseUp(e);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetHitArea
+
+        HeaderArea GetHitArea(Point pt, ref GridColumn column, bool isMouseDown)
+        {
+            column = null;
+
+            if (AllowSelection == false)
+                return (HeaderArea.NoWhere);
+
+            GridPanel panel = Parent as GridPanel;
+
+            if (panel != null)
+            {
+                Rectangle r = GetRowHeaderBounds(panel);
+
+                r.Width += 2;
+
+                if (r.Contains(pt) == true)
+                {
+                    if (panel.EnableFiltering == true && panel.EnableRowFiltering == true)
+                        return (HeaderArea.InFilterMenu);
+
+                    return (HeaderArea.InRowHeader);
+                }
+
+                column = GetHitColumn(panel, pt, isMouseDown);
+            }
+
+            return ((column != null) ?
+                HeaderArea.InContent : HeaderArea.NoWhere);
+        }
+
+        #endregion
+
+        #region GetHitColumn
+
+        ///<summary>
+        /// Gets the associated column at the given location
+        ///</summary>
+        ///<param name="x"></param>
+        ///<param name="y"></param>
+        ///<returns></returns>
+        public GridColumn GetHitColumn(int x, int y)
+        {
+            return (GetHitColumn(new Point(x, y)));
+        }
+
+        ///<summary>
+        /// Gets the associated column at the given point
+        ///</summary>
+        ///<param name="pt"></param>
+        ///<returns></returns>
+        public GridColumn GetHitColumn(Point pt)
+        {
+            GridPanel panel = GridPanel;
+
+            if (panel != null)
+                return (GetHitColumn(panel, pt, false));
+
+            return (null);
+        }
+
+        private GridColumn GetHitColumn(
+            GridPanel panel, Point pt, bool isMouseDown)
+        {
+            int dy = (isMouseDown == true) ? 50 : 0;
+
+            GridColumnCollection columns = panel.Columns;
+            foreach (GridColumn column in columns)
+            {
+                if (column.Visible == true)
+                {
+                    Rectangle r = GetBounds(panel, column);
+
+                    if (pt.X >= r.Left && pt.X < r.Right)
+                    {
+                        if (pt.Y >= r.Top - dy && pt.Y < r.Bottom + dy)
+                            return (column);
+                    }
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region Style support routines
+
+        #region GetStyleState
+
+        internal StyleState GetStyleState(GridColumn column, bool selected)
+        {
+            StyleState state = StyleState.Default;
+
+            if (selected == true)
+                state |= StyleState.Selected;
+
+            Point pt = SuperGrid.PointToClient(Control.MousePosition);
+
+            Rectangle r = Bounds;
+            r.X = column.Bounds.X;
+            r.Width = column.Bounds.Width;
+
+            if (r.Contains(pt) == true)
+                state |= StyleState.MouseOver;
+
+            if (column.IsReadOnly == true)
+                state |= StyleState.ReadOnly;
+
+            return (state);
+        }
+
+        #endregion
+
+        #region GetEffectiveStyle
+
+        ///<summary>
+        /// GetEffectiveStyle
+        ///</summary>
+        ///<param name="column"></param>
+        ///<returns></returns>
+        public FilterColumnHeaderVisualStyle GetEffectiveStyle(GridColumn column)
+        {
+            bool selected = false;
+
+            if (column.SuperGrid.ActiveFilterPanel != null)
+            {
+                if (column.SuperGrid.ActiveFilterPanel.GridColumn == column)
+                    selected = true;
+            }
+
+            StyleState styleState = GetStyleState(column, selected);
+            FilterColumnHeaderVisualStyle style = GetEffectiveStyle(column, styleState);
+
+            return (style);
+        }
+
+        internal FilterColumnHeaderVisualStyle
+            GetEffectiveStyle(GridColumn column, StyleType sizingStyle)
+        {
+            ValidateStyle(column);
+
+            return (GetStyle(column, sizingStyle));
+        }
+
+        internal FilterColumnHeaderVisualStyle
+            GetEffectiveStyle(GridColumn column, StyleState cellState)
+        {
+            ValidateStyle(column);
+
+            switch (cellState)
+            {
+                case StyleState.MouseOver:
+                    return (GetStyle(column, StyleType.MouseOver));
+
+                case StyleState.Selected:
+                    return (GetStyle(column, StyleType.Selected));
+
+                case StyleState.Selected | StyleState.MouseOver:
+                    return (GetStyle(column, StyleType.SelectedMouseOver));
+
+                case StyleState.ReadOnly:
+                    return (GetStyle(column, StyleType.ReadOnly));
+
+                case StyleState.ReadOnly | StyleState.MouseOver:
+                    return (GetStyle(column, StyleType.ReadOnlyMouseOver));
+
+                case StyleState.ReadOnly | StyleState.Selected:
+                    return (GetStyle(column, StyleType.ReadOnlySelected));
+
+                case StyleState.ReadOnly | StyleState.MouseOver | StyleState.Selected:
+                    return (GetStyle(column, StyleType.ReadOnlySelectedMouseOver));
+
+                default:
+                    return (GetStyle(column, StyleType.Default));
+            }
+        }
+
+        #region ValidateStyle
+
+        private void ValidateStyle(GridColumn column)
+        {
+            if (column.StyleUpdateCount != SuperGrid.StyleUpdateCount)
+            {
+                ClearEffectiveStyles(column);
+
+                column.StyleUpdateCount = SuperGrid.StyleUpdateCount;
+            }
+        }
+
+        #endregion
+
+        #region ClearEffectiveStyles
+
+        private void ClearEffectiveStyles(GridColumn column)
+        {
+            column.EffectiveFilterStyles = new FilterColumnHeaderVisualStyles();
+
+            _EffectiveRowHeaderStyles = new FilterRowVisualStyles();
+        }
+
+        #endregion
+
+        #region GetStyle
+
+        private FilterColumnHeaderVisualStyle GetStyle(GridColumn column, StyleType e)
+        {
+            if (column.EffectiveFilterStyles == null)
+                column.EffectiveFilterStyles = new FilterColumnHeaderVisualStyles();
+
+            if (column.EffectiveFilterStyles.IsValid(e) == false)
+            {
+                FilterColumnHeaderVisualStyle style = new FilterColumnHeaderVisualStyle();
+
+                StyleType[] css = style.GetApplyStyleTypes(e);
+
+                if (css != null)
+                {
+                    foreach (StyleType cs in css)
+                    {
+                        style.ApplyStyle(SuperGrid.BaseVisualStyles.FilterColumnHeaderStyles[cs]);
+                        style.ApplyStyle(SuperGrid.DefaultVisualStyles.FilterColumnHeaderStyles[cs]);
+                        style.ApplyStyle(GridPanel.DefaultVisualStyles.FilterColumnHeaderStyles[cs]);
+                        style.ApplyStyle(column.FilterRowStyles[cs]);
+                    }
+                }
+
+                SuperGrid.DoGetFilterColumnHeaderStyleEvent(column, e, ref style);
+
+                if (style.Background == null || style.Background.IsEmpty == true)
+                    style.Background = new Background(Color.White);
+
+                if (style.Font == null)
+                {
+                    Font font = SystemFonts.DefaultFont;
+                    style.Font = font;
+                }
+
+                column.EffectiveFilterStyles[e] = style;
+            }
+
+            return (column.EffectiveFilterStyles[e]);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetEffectiveRowStyle
+
+        internal FilterRowVisualStyle GetEffectiveRowStyle()
+        {
+            StyleState rowState = GetRowHeaderState();
+
+            return (GetEffectiveRowStyle(rowState));
+        }
+
+        internal FilterRowVisualStyle GetEffectiveRowStyle(StyleState rowState)
+        {
+            ValidateRowHeaderStyle();
+
+            switch (rowState)
+            {
+                case StyleState.MouseOver:
+                    return (GetRowHeaderStyle(StyleType.MouseOver));
+
+                case StyleState.Selected:
+                    return (GetRowHeaderStyle(StyleType.Selected));
+
+                case StyleState.Selected | StyleState.MouseOver:
+                    return (GetRowHeaderStyle(StyleType.SelectedMouseOver));
+
+                case StyleState.ReadOnly:
+                    return (GetRowHeaderStyle(StyleType.ReadOnly));
+
+                case StyleState.ReadOnly | StyleState.MouseOver:
+                    return (GetRowHeaderStyle(StyleType.ReadOnlyMouseOver));
+
+                case StyleState.ReadOnly | StyleState.Selected:
+                    return (GetRowHeaderStyle(StyleType.ReadOnlySelected));
+
+                case StyleState.ReadOnly | StyleState.MouseOver | StyleState.Selected:
+                    return (GetRowHeaderStyle(StyleType.ReadOnlySelectedMouseOver));
+
+                default:
+                    return (GetRowHeaderStyle(StyleType.Default));
+            }
+        }
+
+        #region ValidateRowHeaderStyle
+
+        private void ValidateRowHeaderStyle()
+        {
+            if (_EffectiveRowHeaderStyles == null ||
+                (_StyleUpdateCount != SuperGrid.StyleUpdateCount))
+            {
+                _EffectiveRowHeaderStyles = new FilterRowVisualStyles();
+
+                _StyleUpdateCount = SuperGrid.StyleUpdateCount;
+            }
+        }
+
+        #endregion
+
+        #region GetRowHeaderState
+
+        private StyleState GetRowHeaderState()
+        {
+            StyleState rowState = StyleState.Default;
+
+            GridPanel panel = GridPanel;
+
+            if (panel != null)
+            {
+                if (panel.ReadOnly == true)
+                    rowState |= StyleState.ReadOnly;
+
+                if (panel == SuperGrid.ActiveGrid)
+                    rowState |= StyleState.Selected;
+
+                Rectangle r = GetRowHeaderBounds(panel);
+
+                if (r.Contains(Control.MousePosition) == true)
+                    rowState |= StyleState.MouseOver;
+            }
+
+            return (rowState);
+        }
+
+        #endregion
+
+        #region GetRowHeaderStyle
+
+        private FilterRowVisualStyle GetRowHeaderStyle(StyleType e)
+        {
+            if (_EffectiveRowHeaderStyles.IsValid(e) == false)
+            {
+                FilterRowVisualStyle style = new FilterRowVisualStyle();
+
+                StyleType[] css = style.GetApplyStyleTypes(e);
+
+                if (css != null)
+                {
+                    foreach (StyleType cs in css)
+                    {
+                        style.ApplyStyle(SuperGrid.BaseVisualStyles.FilterRowStyles[cs]);
+                        style.ApplyStyle(SuperGrid.DefaultVisualStyles.FilterRowStyles[cs]);
+                        style.ApplyStyle(GridPanel.DefaultVisualStyles.FilterRowStyles[cs]);
+                    }
+                }
+
+                SuperGrid.DoGetFilterRowStyleEvent(this, e, ref style);
+
+                if (style.RowHeader.Background == null || style.RowHeader.Background.IsEmpty == true)
+                    style.RowHeader.Background = new Background(Color.WhiteSmoke);
+
+                _EffectiveRowHeaderStyles[e] = style;
+            }
+
+            return (_EffectiveRowHeaderStyles[e]);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetFilterImageState
+
+        private StyleState GetFilterImageState(GridPanel panel)
+        {
+            StyleState state = GetRowHeaderState();
+
+            state &= ~(StyleState.MouseOver | StyleState.Selected);
+
+            if (_HitArea == HeaderArea.InFilterMenu)
+                state |= StyleState.MouseOver;
+
+            if (string.IsNullOrEmpty(panel.FilterExpr) == false)
+                state |= StyleState.Selected;
+
+            return (state);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetBounds
+
+        internal Rectangle GetBounds(GridPanel panel, GridColumn column)
+        {
+            Rectangle r = BoundsRelative;
+
+            r.X = column.BoundsRelative.X;
+            r.Width = column.BoundsRelative.Width;
+
+            if (r.X == 0)
+            {
+                r.X++;
+                r.Width--;
+            }
+
+            if (IsVFrozen == false)
+                r.Y -= VScrollOffset;
+
+            if (panel.IsSubPanel == true || column.IsHFrozen == false)
+                r.X -= HScrollOffset;
+
+            return (r);
+        }
+
+        #endregion
+
+        #region InvalidateRowHeader
+
+        internal void InvalidateRowHeader()
+        {
+            GridPanel panel = Parent as GridPanel;
+
+            if (panel != null)
+            {
+                if (panel.ShowRowHeaders == true)
+                    InvalidateRender(RowHeaderBounds);
+            }
+        }
+
+        #endregion
+
+        #region ActivateFilterEdit
+
+        ///<summary>
+        ///Activates the filter edit control for the given column
+        ///</summary>
+        ///<param name="column"></param>
+        public void ActivateFilterEdit(GridColumn column)
+        {
+            GridPanel panel = GridPanel;
+
+            if (panel.SetActiveRow(null, false) == true)
+            {
+                FilterPanel fp = FilterPanel.GetFilterPanel(column);
+
+                if (fp != null)
+                    fp.BeginEdit();
+            }
+        }
+
+        #endregion
+
+        #region DeactivateFilterEdit
+
+        ///<summary>
+        ///Deactivates the current active filter edit
+        ///</summary>
+        public void DeactivateFilterEdit()
+        {
+            if (SuperGrid != null)
+            {
+                FilterPanel fp = SuperGrid.ActiveFilterPanel;
+
+                if (fp != null)
+                    fp.EndEdit();
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridFilter/PopupControl.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridFilter/PopupControl.cs
new file mode 100644
index 00000000..f4605d2e
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridFilter/PopupControl.cs	
@@ -0,0 +1,1488 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Runtime.InteropServices;
+using System.Security.Permissions;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.SuperGrid.Style;
+
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    ///<summary>
+    /// PopupControl
+    ///</summary>
+    public class PopupControl
+    {
+        #region Events
+
+        #region Closed
+
+        /// <summary>
+        /// Closed event handler
+        /// </summary>
+        public event ToolStripDropDownClosedEventHandler Closed
+        {
+            add { _DropDown.Closed += value; }
+            remove { _DropDown.Closed -= value; }
+        }
+
+        #endregion
+
+        #region Closing
+
+        /// <summary>
+        /// Closing event handler
+        /// </summary>
+        public event ToolStripDropDownClosingEventHandler Closing
+        {
+            add { _DropDown.Closing += value; }
+            remove { _DropDown.Closing -= value; }
+        }
+
+        #endregion
+
+        #region Opened
+
+        /// <summary>
+        /// Opened event handler
+        /// </summary>
+        public event EventHandler Opened
+        {
+            add { _DropDown.Opened += value; }
+            remove { _DropDown.Opened -= value; }
+        }
+
+        #endregion
+
+        #region Opening
+
+        /// <summary>
+        /// Opening event handler
+        /// </summary>
+        public event CancelEventHandler Opening
+        {
+            add { _DropDown.Opening += value; }
+            remove { _DropDown.Opening -= value; }
+        }
+
+        #endregion
+
+        #region PostRenderGripBar
+
+        /// <summary>
+        /// Opening event handler
+        /// </summary>
+        public event EventHandler<PostRenderGripBarEventArgs> PostRenderGripBar
+        {
+            add { _DropDown.PostRenderGripBar += value; }
+            remove { _DropDown.PostRenderGripBar -= value; }
+        }
+
+        #endregion
+
+        #region PreRenderGripBar
+
+        /// <summary>
+        /// Opening event handler
+        /// </summary>
+        public event EventHandler<PreRenderGripBarEventArgs>PreRenderGripBar
+        {
+            add { _DropDown.PreRenderGripBar += value; }
+            remove { _DropDown.PreRenderGripBar -= value; }
+        }
+
+        #endregion
+
+        #region UserResize
+
+        /// <summary>
+        /// UserResize event handler
+        /// </summary>
+        public event EventHandler<EventArgs> UserResize
+        {
+            add { _DropDown.UserResize += value; }
+            remove { _DropDown.UserResize -= value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Private variables
+
+        private ToolStripControlHost _Host;
+        private PopupDropDown _DropDown;
+
+        private PopupResizeMode _ResizeMode = PopupResizeMode.All;
+
+        private Size _GripSize = new Size(14, 14);
+        private System.Windows.Forms.Padding _Padding = System.Windows.Forms.Padding.Empty;
+        private System.Windows.Forms.Padding _Margin = new System.Windows.Forms.Padding(1);
+
+        private bool _AutoReset;
+
+        private Background _Background;
+
+        #endregion
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        public PopupControl()
+        {
+            InitializeDropDown();
+        }
+
+        #region InitializeDropDown
+
+        /// <summary>
+        /// InitializeDropDown
+        /// </summary>
+        protected void InitializeDropDown()
+        {
+            if (_DropDown == null)
+            {
+                _DropDown = new PopupDropDown(false);
+
+                _DropDown.Closed += DropDownClosed;
+            }
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region AutoResetWhenClosed
+
+        /// <summary>
+        /// AutoResetWhenClosed
+        /// </summary>
+        public bool AutoResetWhenClosed
+        {
+            get { return (_AutoReset); }
+            set { _AutoReset = value; }
+        }
+
+        #endregion
+
+        #region Background
+
+        ///<summary>
+        ///Background
+        ///</summary>
+        public Background Background
+        {
+            get { return (_Background); }
+            set { _Background = value; }
+        }
+
+        #endregion
+
+        #region Control
+
+        /// <summary>
+        /// Associated drop down Control
+        /// </summary>
+        public Control Control
+        {
+            get { return (_Host != null) ? _Host.Control : null; }
+        }
+
+        #endregion
+
+        #region GripSize
+
+        /// <summary>
+        /// GripSize
+        /// </summary>
+        public Size GripSize
+        {
+            get { return (_GripSize); }
+            set { _GripSize = value; }
+        }
+
+        #endregion
+
+        #region Margin
+
+        /// <summary>
+        /// Margin
+        /// </summary>
+        public System.Windows.Forms.Padding Margin
+        {
+            get { return (_Margin); }
+            set { _Margin = value; }
+        }
+
+        #endregion
+
+        #region Padding
+
+        /// <summary>
+        /// Padding
+        /// </summary>
+        public System.Windows.Forms.Padding Padding
+        {
+            get { return (_Padding); }
+            set { _Padding = value; }
+        }
+
+        #endregion
+
+        #region ResizeMode
+
+        /// <summary>
+        /// Type of resize mode
+        /// </summary>
+        public PopupResizeMode ResizeMode
+        {
+            get { return (_ResizeMode); }
+            set { _ResizeMode = value; }
+        }
+
+        #endregion
+
+        #region Visible
+
+        /// <summary>
+        /// Visible
+        /// </summary>
+        public bool Visible
+        {
+            get { return (_DropDown != null && _DropDown.Visible) ? true : false; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Show
+
+        /// <summary>
+        /// Shows the PopupControl
+        /// </summary>
+        /// <param name="control"></param>
+        /// <param name="pt"></param>
+        /// <param name="anchor"></param>
+        /// <param name="form"></param>
+        public void Show(Control control, Point pt, PopupAnchor anchor, Form form)
+        {
+            Office2007RibbonForm parentForm = form as Office2007RibbonForm;
+
+            if (parentForm != null) parentForm.NonClientPaintEnabled = false;
+
+            InitializeHost(control);
+
+            _DropDown.ResizeMode = _ResizeMode;
+            _DropDown.PopupAnchor = anchor;
+            _DropDown.Background = _Background;
+
+            _DropDown.Show(pt);
+
+            control.Focus();
+
+            if (parentForm != null) { parentForm.NonClientPaintEnabled = true; parentForm.RedrawNonClient(); }
+        }
+
+        #region InitializeHost
+
+        /// <summary>
+        /// InitializeHost
+        /// </summary>
+        /// <param name="control"></param>
+        protected void InitializeHost(Control control)
+        {
+            InitializeDropDown();
+
+            if (control != Control)
+                DisposeHost();
+
+            if (_Host == null)
+            {
+                _Host = new ToolStripControlHost(control);
+
+                _Host.AutoSize = false;
+                _Host.Padding = Padding;
+                _Host.Margin = Margin;
+            }
+
+            _DropDown.Items.Clear();
+
+            _DropDown.AutoSize = false;
+
+            _DropDown.GripSize = _GripSize;
+
+            _DropDown.Margin = System.Windows.Forms.Padding.Empty;
+            _DropDown.Padding = System.Windows.Forms.Padding.Empty;
+
+            _DropDown.Items.Add(_Host);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Hide
+
+        /// <summary>
+        /// Hides / closes the PopupControl
+        /// </summary>
+        public void Hide()
+        {
+            if (_DropDown != null && _DropDown.Visible == true)
+                _DropDown.Hide();
+        }
+
+        #endregion
+
+        #region Reset
+
+        /// <summary>
+        /// Resets / disposes of the Host control
+        /// </summary>
+        public void Reset()
+        {
+            DisposeHost();
+        }
+
+        #endregion
+
+        #region Event processing
+
+        #region DropDownClosed
+
+        private void DropDownClosed(object sender, ToolStripDropDownClosedEventArgs e)
+        {
+            if (AutoResetWhenClosed == true)
+                DisposeHost();
+        }
+
+        #endregion
+
+        #endregion
+
+        #region DisposeHost
+
+        /// <summary>
+        /// DisposeHost
+        /// </summary>
+        protected void DisposeHost()
+        {
+            if (_Host != null)
+            {
+                //Type t = _Host.GetType();
+                //FieldInfo fi = t.GetField("control", BindingFlags.NonPublic | BindingFlags.Instance);
+                //if (fi != null)
+                //{
+                //    fi.SetValue(_Host, null);
+                //    _Host.Dispose();
+                //}
+
+                _Host.Dispose();
+
+                _Host = null;
+            }
+        }
+
+        #endregion
+    }
+
+    #region PopupDropDown
+
+    /// <summary>
+    /// PopupDropDown
+    /// </summary>
+    [ToolboxItem(false)]
+    public class PopupDropDown : ToolStripDropDown
+    {
+        #region Events
+
+        #region PostRenderGripBar
+
+        /// <summary>
+        /// Occurs when the popup grip bar has been rendered
+        /// </summary>
+        [Description("Occurs when the popup grip bar has been rendered.")]
+        public event EventHandler<PostRenderGripBarEventArgs> PostRenderGripBar;
+
+        #endregion
+
+        #region PreRenderGripBar
+
+        /// <summary>
+        /// Occurs when the popup grip bar is about to be rendered
+        /// </summary>
+        [Description("Occurs when the popup grip bar is about to be rendered.")]
+        public event EventHandler<PreRenderGripBarEventArgs> PreRenderGripBar;
+
+        #endregion
+
+        #region UserResize
+
+        /// <summary>
+        /// Occurs when the user has resized the control
+        /// </summary>
+        [Description("Occurs when the user has resized the control.")]
+        public event EventHandler<EventArgs> UserResize;
+
+        #endregion
+
+        #endregion
+
+        #region Private variables
+
+        private GripAlignMode _GripAlignMode;
+        private PopupAnchor _PopupAnchor = PopupAnchor.Left;
+        private PopupResizeMode _ResizeMode = PopupResizeMode.All;
+
+        private Size _GripSize;
+        private Rectangle _GripBounds;
+
+        private bool _LockedHostedControlSize;
+        private bool _LockedThisSize;
+        private bool _ForceClose;
+
+        private Background _Background;
+
+        #endregion
+
+        /// <summary>
+        /// PopupDropDown
+        /// </summary>
+        /// <param name="autoSize"></param>
+        public PopupDropDown(bool autoSize)
+        {
+            AutoSize = autoSize;
+            Padding = System.Windows.Forms.Padding.Empty;
+            Margin = System.Windows.Forms.Padding.Empty;
+        }
+
+        #region Public properties
+
+        #region Background
+
+        ///<summary>
+        ///Background
+        ///</summary>
+        public Background Background
+        {
+            get { return (_Background); }
+            set { _Background = value; }
+        }
+
+        #endregion
+
+        #region GripAlignMode
+
+        /// <summary>
+        /// Grip align mode
+        /// </summary>
+        public GripAlignMode GripAlignMode
+        {
+            get { return (_GripAlignMode); }
+            set { _GripAlignMode = value; }
+        }
+
+        #endregion
+
+        #region GripSize
+
+        /// <summary>
+        /// Size of the grip box
+        /// </summary>
+        public Size GripSize
+        {
+            get { return (_GripSize); }
+            set { _GripSize = value; }
+        }
+
+        #endregion
+
+        #region PopupAnchor
+
+        /// <summary>
+        /// PopupAnchor
+        /// </summary>
+        public PopupAnchor PopupAnchor
+        {
+            get { return (_PopupAnchor); }
+            set { _PopupAnchor = value; }
+        }
+
+        #endregion
+
+        #region ResizeMode
+
+        /// <summary>
+        /// Type of resize mode
+        /// </summary>
+        public PopupResizeMode ResizeMode
+        {
+            get { return (_ResizeMode); }
+            set { _ResizeMode = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Protected properties
+
+        #region GripBounds
+
+        /// <summary>
+        /// Bounds of active grip box position
+        /// </summary>
+        protected Rectangle GripBounds
+        {
+            get { return (_GripBounds); }
+            set { _GripBounds = value; }
+        }
+
+        #endregion
+
+        #region IsGripShown
+
+        /// <summary>
+        /// Indicates when a grip box is shown.
+        /// </summary>
+        protected bool IsGripShown
+        {
+            get { return (GripAlignMode != GripAlignMode.None &&
+                GripSize.Width > 0 && GripSize.Height > 0); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Show
+
+        /// <summary>
+        /// Shows the popup drop down
+        /// </summary>
+        /// <param name="pt"></param>
+        public new void Show(Point pt)
+        {
+            Show(pt.X, pt.Y);
+        }
+
+        /// <summary>
+        /// Shows the popup drop down
+        /// </summary>
+        /// <param name="x"></param>
+        /// <param name="y"></param>
+        public new void Show(int x, int y)
+        {
+            Control hostedControl = GetHostedControl();
+
+            if (hostedControl != null)
+            {
+                _ForceClose = false;
+
+                _LockedHostedControlSize = true;
+                _LockedThisSize = true;
+
+                // Display actual popup and occupy just 1x1 pixel to avoid automatic reposition
+
+                Size = new Size(1, 1);
+
+                base.Show(x, y);
+
+                _LockedHostedControlSize = false;
+                _LockedThisSize = false;
+
+                ResizeFromContent();
+
+                // If popup is overlapping the initial position then move above
+
+                if (y > Top && y <= Bottom)
+                {
+                    Top = y - Height;
+
+                    GripAlignMode previous = GripAlignMode;
+
+                    switch (GripAlignMode)
+                    {
+                        case GripAlignMode.BottomLeft:
+                            GripAlignMode = GripAlignMode.TopLeft;
+
+                            if (CompareResizeMode(PopupResizeMode.BottomLeft))
+                                ResizeMode = PopupResizeMode.TopLeft;
+                            break;
+
+                        case GripAlignMode.BottomRight:
+                            GripAlignMode = GripAlignMode.TopRight;
+
+                            if (CompareResizeMode(PopupResizeMode.BottomRight))
+                                ResizeMode = PopupResizeMode.TopRight;
+                            break;
+                    }
+
+                    if (GripAlignMode != previous)
+                        RecalculateHostedControlLayout();
+                }
+
+                hostedControl.SizeChanged += HostedControlSizeChanged;
+            }
+        }
+
+        #endregion
+
+        #region Hide
+
+        /// <summary>
+        /// Hide
+        /// </summary>
+        public new void Hide()
+        {
+            _ForceClose = true;
+
+            base.Hide();
+        }
+
+        #endregion
+
+        #region ResizeFromContent
+
+        /// <summary>
+        /// ResizeFromContent
+        /// </summary>
+        protected void ResizeFromContent()
+        {
+            if (_LockedThisSize == false)
+            {
+                _LockedHostedControlSize = true;
+
+                Rectangle bounds = Bounds;
+                bounds.Size = SizeFromContent();
+
+                if (PopupAnchor == PopupAnchor.Right)
+                    bounds.X -= bounds.Width;
+
+                Bounds = bounds;
+
+                _LockedHostedControlSize = false;
+            }
+        }
+
+        #region SizeFromContent
+
+        /// <summary>
+        /// SizeFromContent
+        /// </summary>
+        /// <returns></returns>
+        protected Size SizeFromContent()
+        {
+            Size contentSize = Size.Empty;
+
+            Control hostedControl = GetHostedControl();
+
+            if (hostedControl != null)
+            {
+                hostedControl.Location = new Point(1, 1);
+
+                contentSize = SizeFromClientSize(hostedControl.Size);
+            }
+
+            SetGripAlignMode();
+
+            if (IsGripShown == true)
+                contentSize.Height += GripSize.Height + 2;
+
+            contentSize.Width += 2;
+            contentSize.Height += 2;
+
+            return (contentSize);
+        }
+
+        #region SetGripAlignMode
+
+        private void SetGripAlignMode()
+        {
+            if (CompareResizeMode(PopupResizeMode.BottomRight))
+                GripAlignMode = GripAlignMode.BottomRight;
+
+            else if (CompareResizeMode(PopupResizeMode.TopLeft))
+                GripAlignMode = GripAlignMode.TopLeft;
+
+            else if (CompareResizeMode(PopupResizeMode.TopRight))
+                GripAlignMode = GripAlignMode.TopRight;
+
+            else if (CompareResizeMode(PopupResizeMode.BottomLeft))
+                GripAlignMode = GripAlignMode.BottomLeft;
+
+            else
+                GripAlignMode = GripAlignMode.None;
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region RecalculateHostedControlLayout
+
+        /// <summary>
+        /// RecalculateHostedControlLayout
+        /// </summary>
+        protected void RecalculateHostedControlLayout()
+        {
+            if (_LockedHostedControlSize == false)
+            {
+                _LockedThisSize = true;
+
+                Control hostedControl = GetHostedControl();
+
+                if (hostedControl != null)
+                {
+                    Rectangle bounds = new
+                        Rectangle(0, 0, ClientRectangle.Width, ClientRectangle.Height);
+
+                    if (GripAlignMode == GripAlignMode.TopLeft || GripAlignMode == GripAlignMode.TopRight)
+                        bounds.Y = GripSize.Height + 2;
+
+                    bounds.Inflate(-1, -1);
+
+                    if (IsGripShown == true)
+                        bounds.Height -= (GripSize.Height + 2);
+
+                    if (bounds.Size != hostedControl.Size)
+                        hostedControl.Size = bounds.Size;
+
+                    if (bounds.Location != hostedControl.Location)
+                        hostedControl.Location = bounds.Location;
+                }
+
+                _LockedThisSize = false;
+            }
+        }
+
+        #endregion
+
+        #region GetHostedControl
+
+        /// <summary>
+        /// Gets the hosted control
+        /// </summary>
+        /// <returns></returns>
+        public Control GetHostedControl()
+        {
+            if (Items.Count > 0)
+            {
+                ToolStripControlHost host = Items[0] as ToolStripControlHost;
+
+                if (host != null)
+                    return (host.Control);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region CompareResizeMode
+
+        /// <summary>
+        /// CompareResizeMode
+        /// </summary>
+        /// <param name="resizeMode"></param>
+        /// <returns></returns>
+        public bool CompareResizeMode(PopupResizeMode resizeMode)
+        {
+            return (ResizeMode & resizeMode) == resizeMode;
+        }
+
+        #endregion
+
+        #region ToolStripDropDown overrides
+
+        #region OnClosing
+
+        /// <summary>
+        /// OnClosing
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnClosing(ToolStripDropDownClosingEventArgs e)
+        {
+            if (_ForceClose == false && ContainsFocus == true)
+            {
+                e.Cancel = true;
+            }
+            else
+            {
+                Control hostedControl = GetHostedControl();
+
+                if (hostedControl != null)
+                    hostedControl.SizeChanged -= HostedControlSizeChanged;
+
+                base.OnClosing(e);
+            }
+        }
+
+        #endregion
+
+        #region OnPaint
+
+        /// <summary>
+        /// OnPaint
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            Graphics g = e.Graphics;
+
+            base.OnPaint(e);
+
+            GripBounds = Rectangle.Empty;
+
+            if (IsGripShown == true)
+            {
+                int x = Width - (GripSize.Width + 2);
+                int y = Height - (_GripSize.Height + 1);
+
+                int width = GripSize.Width;
+                int height = GripSize.Height;
+
+                Rectangle r = new Rectangle(1, 1, Width - 2, height + 1);
+
+                switch (_GripAlignMode)
+                {
+                    case GripAlignMode.TopLeft:
+                        GripBounds = new Rectangle(2, 1, width, height);
+                        r.Y = 1;
+                        break;
+
+                    case GripAlignMode.TopRight:
+                        r.Y = 1;
+                        GripBounds = new Rectangle(x, 1, width, height);
+                        break;
+
+                    case GripAlignMode.BottomLeft:
+                        GripBounds = new Rectangle(2, y, width, height);
+                        r.Y = GripBounds.Y - 1;
+                        break;
+
+                    case GripAlignMode.BottomRight:
+                        GripBounds = new Rectangle(x, y, width, height);
+                        r.Y = GripBounds.Y - 1;
+                        break;
+                }
+
+                if (_Background.IsEmpty == false)
+                {
+                    using (Brush br = _Background.GetBrush(r))
+                        g.FillRectangle(br, r);
+                }
+
+                if (DoPreRenderGripBar(g, r) == false)
+                {
+                    GripRenderer.Render(g,
+                        GripBounds.Location, GripSize, _GripAlignMode);
+
+                    DoPostRenderGripBar(g, r);
+                }
+            }
+        }
+
+        #region DoPreRenderGripBar
+
+        private bool DoPreRenderGripBar(Graphics g, Rectangle r)
+        {
+            if (PreRenderGripBar != null)
+            {
+                PreRenderGripBarEventArgs args = new PreRenderGripBarEventArgs(g, r);
+
+                PreRenderGripBar(this, args);
+
+                return (args.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region DoPostRenderGripBar
+
+        private void DoPostRenderGripBar(Graphics g, Rectangle r)
+        {
+            if (PostRenderGripBar != null)
+            {
+                PostRenderGripBar(this,
+                    new PostRenderGripBarEventArgs(g, r));
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region OnSizeChanged
+
+        /// <summary>
+        /// OnSizeChanged
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnSizeChanged(EventArgs e)
+        {
+            base.OnSizeChanged(e);
+
+            if (_LockedThisSize == false)
+                RecalculateHostedControlLayout();
+        }
+
+        #endregion
+
+        #region ProcessDialogKey
+
+        /// <summary>
+        /// ProcessDialogKey
+        /// </summary>
+        /// <param name="keyData"></param>
+        /// <returns></returns>
+        protected override bool ProcessDialogKey(Keys keyData)
+        {
+            if (keyData == Keys.Escape || (keyData & Keys.Alt) == Keys.Alt ||
+                (keyData & Keys.LWin) == Keys.LWin || (keyData & Keys.RWin) == Keys.RWin)
+            {
+                _ForceClose = true;
+            }
+
+            return (base.ProcessDialogKey(keyData));
+        }
+
+        #endregion
+
+        #region HostedControlSizeChanged
+
+        /// <summary>
+        /// HostedControlSizeChanged
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void HostedControlSizeChanged(object sender, EventArgs e)
+        {
+            if (_LockedHostedControlSize == false)
+                ResizeFromContent();
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Win32 processing
+
+        #region Win32 defines
+
+        // ReSharper disable InconsistentNaming
+
+        const int WM_GETMINMAXINFO = 0x0024;
+        const int WM_NCHITTEST = 0x0084;
+        const int WM_EXITSIZEMOVE = 0x0232;
+
+        const int HTTRANSPARENT = -1;
+        const int HTLEFT = 10;
+        const int HTRIGHT = 11;
+        const int HTTOP = 12;
+        const int HTTOPLEFT = 13;
+        const int HTTOPRIGHT = 14;
+        const int HTBOTTOM = 15;
+        const int HTBOTTOMLEFT = 16;
+        const int HTBOTTOMRIGHT = 17;
+
+        [StructLayout(LayoutKind.Sequential)]
+        internal struct MINMAXINFO
+        {
+            public Point reserved;
+            public Size maxSize;
+            public Point maxPosition;
+            public Size minTrackSize;
+            public Size maxTrackSize;
+        }
+
+        static int HIWORD(int n)
+        {
+            return ((n >> 16) & 0xffff);
+        }
+
+        static int HIWORD(IntPtr n)
+        {
+            return (HIWORD(unchecked((int)(long)n)));
+        }
+
+        static int LOWORD(int n)
+        {
+            return (n & 0xffff);
+        }
+
+        static int LOWORD(IntPtr n)
+        {
+            return (LOWORD(unchecked((int)(long)n)));
+        }
+
+        // ReSharper restore InconsistentNaming
+
+        #endregion
+
+        #region WndProc
+
+        /// <summary>
+        /// WndProc
+        /// </summary>
+        /// <param name="m"></param>
+        [SecurityPermission(SecurityAction.LinkDemand, Flags = SecurityPermissionFlag.UnmanagedCode)]
+        protected override void WndProc(ref Message m)
+        {
+            switch (m.Msg)
+            {
+                case WM_NCHITTEST:
+                    if (OnNcHitTest(ref m) == true)
+                        return;
+                    break;
+
+                case WM_GETMINMAXINFO:
+                    OnGetMinMaxInfo(ref m);
+                    return;
+
+                case WM_EXITSIZEMOVE:
+                    if (UserResize != null)
+                        UserResize(this, EventArgs.Empty);
+                    break;
+            }
+
+            base.WndProc(ref m);
+        }
+
+        #endregion
+
+        #region OnNcHitTest
+
+        private bool OnNcHitTest(ref Message m)
+        {
+            Point pt = PointToClient(new Point(LOWORD(m.LParam), HIWORD(m.LParam)));
+
+            if (IsGripShown == true)
+            {
+                if (GripBounds.Contains(pt))
+                {
+                    switch (_GripAlignMode)
+                    {
+                        case GripAlignMode.TopLeft:
+                            m.Result = (IntPtr)HTTOPLEFT;
+                            break;
+
+                        case GripAlignMode.TopRight:
+                            m.Result = (IntPtr)HTTOPRIGHT;
+                            break;
+
+                        case GripAlignMode.BottomLeft:
+                            m.Result = (IntPtr) HTBOTTOMLEFT;
+                            break;
+
+                        case GripAlignMode.BottomRight:
+                            m.Result = (IntPtr) HTBOTTOMRIGHT;
+                            break;
+                    }
+
+                    return (true);
+                }
+            }
+
+            if (ResizeMode != PopupResizeMode.None)
+            {
+                Rectangle rectClient = ClientRectangle;
+
+                if (pt.X > rectClient.Right - 3 && pt.X <= rectClient.Right)
+                {
+                    if (CompareResizeMode(PopupResizeMode.Right) == true)
+                    {
+                        m.Result = (IntPtr) HTRIGHT;
+                        return (true);
+                    }
+                }
+                else if (pt.Y > rectClient.Bottom - 3 && pt.Y <= rectClient.Bottom)
+                {
+                    if (CompareResizeMode(PopupResizeMode.Bottom) == true)
+                    {
+                        m.Result = (IntPtr) HTBOTTOM;
+                        return (true);
+                    }
+                }
+                else if (pt.X > -1 && pt.X < 3)
+                {
+                    if (CompareResizeMode(PopupResizeMode.Left) == true)
+                    {
+                        m.Result = (IntPtr) HTLEFT;
+                        return (true);
+                    }
+                }
+                else if (pt.Y > -1 && pt.Y < 3)
+                {
+                    if (CompareResizeMode(PopupResizeMode.Top) == true)
+                    {
+                        m.Result = (IntPtr) HTTOP;
+                        return (true);
+                    }
+                }
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region OnGetMinMaxInfo
+
+        [SecurityPermission(SecurityAction.LinkDemand, Flags = SecurityPermissionFlag.UnmanagedCode)]
+        private void OnGetMinMaxInfo(ref Message m)
+        {
+            Control hostedControl = GetHostedControl();
+
+            if (hostedControl != null)
+            {
+                MINMAXINFO minmax = (MINMAXINFO)Marshal.PtrToStructure(m.LParam, typeof(MINMAXINFO));
+
+                if (hostedControl.MaximumSize.Width != 0)
+                    minmax.maxTrackSize.Width = hostedControl.MaximumSize.Width;
+
+                if (hostedControl.MaximumSize.Height != 0)
+                    minmax.maxTrackSize.Height = hostedControl.MaximumSize.Height;
+
+                minmax.minTrackSize = new Size(32, 32);
+
+                if (hostedControl.MinimumSize.Width > minmax.minTrackSize.Width)
+                    minmax.minTrackSize.Width = hostedControl.MinimumSize.Width;
+
+                if (hostedControl.MinimumSize.Height > minmax.minTrackSize.Height)
+                    minmax.minTrackSize.Height = hostedControl.MinimumSize.Height;
+
+                if (IsGripShown == true)
+                    minmax.minTrackSize.Height += GripSize.Height + 4;
+
+                minmax.minTrackSize.Width += 4;
+
+                Marshal.StructureToPtr(minmax, m.LParam, false);
+            }
+        }
+
+        #endregion
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GripRenderer
+
+    /// <summary>
+    /// Grip Renderer
+    /// </summary>
+    public static class GripRenderer
+    {
+        #region Private variables
+
+        private static Bitmap _gripBitmap;
+
+        #endregion
+
+        #region RefreshGrip
+
+        /// <summary>
+        /// Refreshes the Grip
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="size"></param>
+        public static void RefreshGrip(Graphics g, Size size)
+        {
+            InitializeGripBitmap(g, size, true);
+        }
+
+        #endregion
+
+        #region InitializeGripBitmap
+
+        private static void InitializeGripBitmap(Graphics g, Size size, bool refresh)
+        {
+            if (_gripBitmap == null || refresh == true || _gripBitmap.Size != size)
+            {
+                _gripBitmap = new Bitmap(size.Width, size.Height, g);
+
+                using (Graphics gripG = Graphics.FromImage(_gripBitmap))
+                    ControlPaint.DrawSizeGrip(gripG, SystemColors.ButtonFace, 0, 0, size.Width, size.Height);
+            }
+        }
+
+        #endregion
+
+        #region Render
+
+        /// <summary>
+        /// Grip renderer
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="location"></param>
+        /// <param name="mode"></param>
+        public static void Render(
+            Graphics g, Point location, GripAlignMode mode)
+        {
+            Render(g, location, new Size(14, 14), mode);
+        }
+
+        /// <summary>
+        /// Grip renderer
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="location"></param>
+        /// <param name="size"></param>
+        /// <param name="mode"></param>
+        public static void Render(Graphics g,
+            Point location, Size size, GripAlignMode mode)
+        {
+            InitializeGripBitmap(g, size, false);
+
+            switch (mode)
+            {
+                case GripAlignMode.TopLeft:
+                    size.Height = -size.Height;
+                    size.Width = -size.Width;
+                    break;
+
+                case GripAlignMode.TopRight:
+                    size.Height = -size.Height;
+                    break;
+
+                case GripAlignMode.BottomLeft:
+                    size.Width = -size.Width;
+                    break;
+            }
+
+            // Reverse size grip for left-aligned
+
+            if (size.Width < 0)
+                location.X -= size.Width;
+
+            if (size.Height < 0)
+                location.Y -= size.Height;
+
+            g.DrawImage(_gripBitmap, location.X, location.Y, size.Width, size.Height);
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region Enums
+
+    #region GripAlignMode
+
+    /// <summary>
+    /// GripAlignMode
+    /// </summary>
+    public enum GripAlignMode
+    {
+        /// <summary>
+        /// None
+        /// </summary>
+        None,
+
+        /// <summary>
+        /// TopLeft
+        /// </summary>
+        TopLeft,
+
+        /// <summary>
+        /// TopRight
+        /// </summary>
+        TopRight,
+
+        /// <summary>
+        /// BottomLeft
+        /// </summary>
+        BottomLeft,
+
+        /// <summary>
+        /// BottomRight
+        /// </summary>
+        BottomRight,
+    }
+
+    #endregion
+
+    #region PopupAnchor
+
+    ///<summary>
+    /// PopupAnchor
+    ///</summary>
+    public enum PopupAnchor
+    {
+        ///<summary>
+        /// Left
+        ///</summary>
+        Left,
+
+        ///<summary>
+        /// Right
+        ///</summary>
+        Right
+    }
+
+    #endregion
+
+    #region PopupResizeMode
+
+    ///<summary>
+    /// PopupResizeMode
+    ///</summary>
+    [Flags]
+    public enum PopupResizeMode
+    {
+        ///<summary>
+        /// None
+        ///</summary>
+        None = 0,
+
+        /// <summary>
+        /// Left
+        /// </summary>
+        Left = 1,
+
+        /// <summary>
+        /// Top
+        /// </summary>
+        Top = 2,
+
+        /// <summary>
+        /// Right
+        /// </summary>
+        Right = 4,
+
+        /// <summary>
+        /// Bottom
+        /// </summary>
+        Bottom = 8,
+
+        /// <summary>
+        /// All
+        /// </summary>
+        All = (Top | Left | Bottom | Right),
+
+        /// <summary>
+        /// TopLeft
+        /// </summary>
+        TopLeft = (Top | Left),
+
+        /// <summary>
+        /// TopRight
+        /// </summary>
+        TopRight = (Top | Right),
+
+        /// <summary>
+        /// BottomLeft
+        /// </summary>
+        BottomLeft = (Bottom | Left),
+
+        /// <summary>
+        /// BottomRight
+        /// </summary>
+        BottomRight = (Bottom | Right),
+    }
+
+    #endregion
+
+    #endregion
+
+    #region EventArgs
+
+    #region PostRenderGripBarEventArgs
+
+    /// <summary>
+    /// PostRenderGripBarEventArgs
+    /// </summary>
+    public class PostRenderGripBarEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private Graphics _Graphics;
+        private Rectangle _Bounds;
+
+        #endregion
+
+        ///<summary>
+        /// PostRenderGripBarEventArgs
+        ///</summary>
+        ///<param name="graphics"></param>
+        ///<param name="bounds"></param>
+        public PostRenderGripBarEventArgs(Graphics graphics, Rectangle bounds)
+        {
+            _Graphics = graphics;
+            _Bounds = bounds;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the bounding rectangle
+        /// </summary>
+        public Rectangle Bounds
+        {
+            get { return (_Bounds); }
+        }
+
+        /// <summary>
+        /// Gets the Graphics object
+        /// </summary>
+        public Graphics Graphics
+        {
+            get { return (_Graphics); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region PreRenderGripBarEventArgs
+
+    /// <summary>
+    /// PreRenderGripBarEventArgs
+    /// </summary>
+    public class PreRenderGripBarEventArgs : PostRenderGripBarEventArgs
+    {
+        #region Private variables
+
+        private bool _Cancel;
+
+        #endregion
+
+        ///<summary>
+        /// PreRenderGripBarEventArgs
+        ///</summary>
+        ///<param name="graphics"></param>
+        ///<param name="bounds"></param>
+        public PreRenderGripBarEventArgs(Graphics graphics, Rectangle bounds)
+            : base(graphics, bounds)
+        {
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets or sets whether the operation is canceled
+        /// </summary>
+        public bool Cancel
+        {
+            get { return (_Cancel); }
+            set { _Cancel = value; }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #endregion
+
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridFilter/Rtf.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridFilter/Rtf.cs
new file mode 100644
index 00000000..3ac36607
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridFilter/Rtf.cs	
@@ -0,0 +1,800 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Text;
+
+namespace DevComponents.DotNetBar.SuperGrid.SuperGrid
+{
+    ///<summary>
+    /// Constructor
+    ///</summary>
+    public class Rtf
+    {
+        #region Private data
+
+        private StringBuilder _SbRtf;   // Running Rtf text buffer
+        private StringBuilder _SbText;  // Running plain text buffer
+
+        private int _TextLength;        // Running text length
+        private int _ProLength;         // Prolog length (used for Clear())
+
+        private Group _Group;           // RTF Group
+        private Stack<Group> _GStack;   // Group Stack
+
+        private bool _Finalized;        // RTF has been finalized
+        private bool _KeepText;         // Keep plain text
+
+        #endregion
+
+        #region Class definitions
+
+        private class Group : ICloneable
+        {
+            public int Font;            // Current font index
+            public int FontSize;        // Current font size
+            public int ForeColor;       // Current ForeColor index
+            public int BackColor;       // Current BackColor index
+
+            public int LeftMargin;      // Left margin
+            public int FirstIndent;     // First line indent
+            public int LeftIndent;      // Left indent
+
+            public bool Bold;           // Bold
+            public bool Italicize;      // Italicize
+            public bool SmallCaps;      // Small Caps
+            public bool Strikeout;      // Strikeout
+            public bool SuperScript;    // Superscript
+            public bool Underline;      // Underline
+
+            public bool Paragraph;      // Paragraph
+
+            #region ICloneable Members
+
+            // Routine to support the IClonable Interface
+
+            public object Clone()
+            {
+                Group gp = new Group();
+
+                gp.Font = Font;
+                gp.FontSize = FontSize;
+                gp.ForeColor = ForeColor;
+                gp.BackColor = BackColor;
+
+                gp.LeftMargin = LeftMargin;
+                gp.FirstIndent = FirstIndent;
+                gp.LeftIndent = LeftIndent;
+
+                gp.Bold = Bold;
+                gp.Italicize = Italicize;
+                gp.SmallCaps = SmallCaps;
+                gp.Strikeout = Strikeout;
+                gp.SuperScript = SuperScript;
+                gp.Underline = Underline;
+
+                gp.Paragraph = Paragraph;
+
+                return (gp);
+            }
+
+            #endregion
+        }
+
+        #endregion
+
+        /// <summary>
+        /// This constructor accepts the Rtf font and
+        /// color arrays, and initializes the Rtf buffer
+        /// </summary>
+        /// <param name="sFonts"></param>
+        /// <param name="cColors"></param>
+        public Rtf(string[] sFonts, Color[] cColors)
+        {
+            _Group = new Group();
+            _GStack = new Stack<Group>();
+            _SbRtf = new StringBuilder();
+
+            InitRtf(sFonts, cColors);
+        }
+
+        #region InitRtf
+
+        /// <summary>
+        /// Initializes our Rtf engine
+        /// </summary>
+        /// <param name="sFonts"></param>
+        /// <param name="cColors"></param>
+        private void InitRtf(string[] sFonts, Color[] cColors)
+        {
+            // Add the RTF prolog, font table, and
+            // color table
+
+            _SbRtf.Append("{\\rtf1\\ansi\\deff0{\\fonttbl");
+
+            for (int i = 0; i < sFonts.Length; i++)
+                _SbRtf.AppendFormat("{0}\\f{1} {2};{3}", '{', i, sFonts[i], '}');
+
+            _SbRtf.Append("}{\\colortbl;");
+
+            for (int i = 0; i < cColors.Length; i++)
+            {
+                _SbRtf.AppendFormat("\\red{0}\\green{1}\\blue{2};",
+                                    cColors[i].R, cColors[i].G, cColors[i].B);
+            }
+
+            _SbRtf.Append("}");
+
+            _ProLength = _SbRtf.Length;
+        }
+
+        #endregion
+
+        #region Close
+
+        /// <summary>
+        /// Closes and finalizes the Rtf document
+        /// </summary>
+        public void Close()
+        {
+            if (_Finalized == false)
+            {
+                // Everything should be popped off the
+                // stack by now
+
+                if (_GStack.Count > 0)
+                    throw new Exception();
+
+                _SbRtf.Append("}");
+
+                _Finalized = true;
+            }
+        }
+
+        #endregion
+
+        #region Group support code
+
+        #region BeginGroup
+
+        /// <summary>
+        /// This routine begins a new RTF group
+        /// </summary>
+        /// <param name="fParagraph"></param>
+        /// <returns></returns>
+        public int BeginGroup(bool fParagraph)
+        {
+            PushGroup();
+
+            // The paragraph flag is used when we close
+            // the group, so save if for later inspection
+
+            _Group.Paragraph = fParagraph;
+
+            _SbRtf.Append("{");
+
+            return (_GStack.Count);
+        }
+
+        #endregion
+
+        #region EndGroup
+
+        /// <summary>
+        /// This routine ends the current open group
+        /// </summary>
+        /// <returns></returns>
+        public int EndGroup()
+        {
+            if (_Group.Paragraph == true)
+                _SbRtf.Append("\\par");
+
+            _SbRtf.Append("}");
+
+            PopGroup();
+
+            return (_GStack.Count);
+        }
+
+        #endregion
+
+        #region PushGroup
+
+        /// <summary>
+        /// This routine saves all the current group settings
+        /// </summary>
+        private void PushGroup()
+        {
+            Group gp = (Group)_Group.Clone();
+
+            _GStack.Push(gp);
+        }
+
+        #endregion
+
+        #region PopGroup
+
+        /// <summary>
+        /// This routine restores all the current
+        /// group settings
+        /// </summary>
+        private void PopGroup()
+        {
+            if (_GStack.Count <= 0)
+                throw new Exception();
+
+            _Group = _GStack.Pop();
+        }
+
+        #endregion
+
+        #region GroupCount
+
+        /// <summary>
+        /// Stack group count
+        /// </summary>
+        public int GroupCount
+        {
+            get { return (_GStack.Count); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Font support
+
+        #region FontSize
+
+        /// <summary>
+        /// This routine gets or sets the current
+        /// group level font size
+        /// </summary>
+        public int FontSize
+        {
+            get { return (_Group.FontSize); }
+
+            set
+            {
+                if (_Group.FontSize != value)
+                {
+                    // The fontsize setting for an RTF document
+                    // is doubled (eg. if you want a 12 point font, then
+                    // you must specify it as size 24)
+
+                    _SbRtf.AppendFormat("\\fs{0} ", value * 2);
+
+                    _Group.FontSize = value;
+                }
+            }
+        }
+
+        #endregion
+
+        #region Font
+
+        /// <summary>
+        /// This routine gets or sets the current
+        /// group level font setting
+        /// </summary>
+        public int Font
+        {
+            get { return (_Group.Font); }
+
+            set
+            {
+                if (_Group.Font != value)
+                {
+                    _SbRtf.AppendFormat("\\f{0} ", value);
+
+                    _Group.Font = value;
+                }
+            }
+        }
+
+        #endregion
+
+        #region SuperScript
+
+        /// <summary>
+        /// This routine gets or sets the current
+        /// group level superscript setting
+        /// </summary>
+        public bool SuperScript
+        {
+            get { return (_Group.SuperScript); }
+
+            set
+            {
+                if (_Group.SuperScript != value)
+                {
+                    _SbRtf.Append(value == true ? "\\super " : "\\super0 ");
+                    _Group.SuperScript = value;
+                }
+            }
+        }
+
+        #endregion
+
+        #region SmallCaps
+
+        private int _ScapsFontSize;
+
+        /// <summary>
+        /// This routine gets or sets the current
+        /// group level smallCaps setting
+        /// </summary>
+        public bool SmallCaps
+        {
+            get { return (_Group.SmallCaps); }
+
+            set
+            {
+                if (_Group.SmallCaps != value)
+                {
+                    // 'scaps' does not appear to work in the system RichTextBox
+                    // so we must simulate it via altering the fontsize a percentage
+                    // of the current size
+
+                    if (value == true)
+                    {
+                        _ScapsFontSize = FontSize;
+
+                        FontSize = (FontSize * 7) / 8;
+                    }
+                    else
+                    {
+                        FontSize = _ScapsFontSize;
+                    }
+
+                    _Group.SmallCaps = value;
+                }
+            }
+        }
+
+        #endregion
+
+        #region Bold
+
+        /// <summary>
+        /// This routine gets or sets the current
+        /// group level font Bold setting
+        /// </summary>
+        public bool Bold
+        {
+            get { return (_Group.Bold); }
+
+            set
+            {
+                if (_Group.Bold != value)
+                {
+                    _SbRtf.Append(value == true ? "\\b " : "\\b0 ");
+                    _Group.Bold = value;
+                }
+            }
+        }
+
+        #endregion
+
+        #region Italicize
+
+        /// <summary>
+        /// This routine gets or sets the current
+        /// group level font Italics setting
+        /// </summary>
+        public bool Italicize
+        {
+            get { return (_Group.Italicize); }
+
+            set
+            {
+                if (_Group.Italicize != value)
+                {
+                    _SbRtf.Append(value == true ? "\\i " : "\\i0 ");
+                    _Group.Italicize = value;
+                }
+            }
+        }
+
+        #endregion
+
+        #region Strikeout
+
+        /// <summary>
+        /// This routine gets or sets the current
+        /// group level font Strikeout setting
+        /// </summary>
+        public bool Strikeout
+        {
+            get { return (_Group.Strikeout); }
+
+            set
+            {
+                if (_Group.Strikeout != value)
+                {
+                    _SbRtf.Append(value == true ? "\\strike " : "\\strike0 ");
+                    _Group.Strikeout = value;
+                }
+            }
+        }
+
+        #endregion
+
+        #region Underline
+
+        /// <summary>
+        /// This routine gets or sets the current
+        /// group level font Underline setting
+        /// </summary>
+        public bool Underline
+        {
+            get { return (_Group.Underline); }
+
+            set
+            {
+                if (_Group.Underline != value)
+                {
+                    _SbRtf.Append(value == true ? "\\ul " : "\\ul0 ");
+
+                    _Group.Underline = value;
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Color support
+
+        #region ForeColor
+
+        /// <summary>
+        /// This routine gets or sets the current
+        /// group level foreColor value
+        /// </summary>
+        public int ForeColor
+        {
+            get { return (_Group.ForeColor); }
+
+            set
+            {
+                if (_Group.ForeColor != value)
+                {
+                    _SbRtf.AppendFormat("\\cf{0} ", value + 1);
+
+                    _Group.ForeColor = value;
+                }
+            }
+        }
+
+        #endregion
+
+        #region BackColor
+
+        /// <summary>
+        /// This routine gets or sets the current
+        /// group level backColor setting
+        /// </summary>
+        public int BackColor
+        {
+            get { return (_Group.BackColor); }
+
+            set
+            {
+                if (_Group.BackColor != value)
+                {
+                    // "\\cb " does not appear to work, so we work
+                    // around this via using the highlight tag
+
+                    _SbRtf.AppendFormat("\\highlight{0} ", value + 1);
+
+                    _Group.BackColor = value;
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Margin / indent support
+
+        #region LeftMargin
+
+        /// <summary>
+        /// This routine gets or sets the current
+        /// group level left margin setting
+        /// </summary>
+        public int LeftMargin
+        {
+            get { return (_Group.LeftMargin); }
+            set { _Group.LeftMargin = value; }
+        }
+
+        #endregion
+
+        #region FirstIndent
+
+        /// <summary>
+        /// This routine gets or sets the current
+        /// group level first indent setting
+        /// </summary>
+        public int FirstIndent
+        {
+            get { return (_Group.FirstIndent); }
+
+            set
+            {
+                if (_Group.FirstIndent != value)
+                {
+                    // Set the indent value, taking the current
+                    // left margin into account
+
+                    _SbRtf.AppendFormat("\\fi{0} ", _Group.LeftMargin + value);
+
+                    _Group.FirstIndent = value;
+                }
+            }
+        }
+
+        #endregion
+
+        #region LeftIndent
+
+        /// <summary>
+        /// This routine gets or sets the current
+        /// group level left indent setting
+        /// </summary>
+        public int LeftIndent
+        {
+            get { return (_Group.LeftIndent); }
+
+            set
+            {
+                if (_Group.LeftIndent != value)
+                {
+                    // Set the indent value, taking the current
+                    // left margin into account
+
+                    _SbRtf.AppendFormat("\\li{0} ", _Group.LeftMargin + value);
+
+                    _Group.LeftIndent = value;
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Text output support
+
+        #region KeepText
+
+        /// <summary>
+        /// This property tells the rtf code whether to
+        /// keep a running accumulation of plain text
+        /// </summary>
+        public bool KeepText
+        {
+            get { return (_KeepText); }
+
+            set
+            {
+                if (_KeepText != value)
+                {
+                    _SbText = (value == true) ?
+                        new StringBuilder() : null;
+
+                    _KeepText = value;
+                }
+            }
+        }
+
+        #endregion
+
+        #region Text
+
+        /// <summary>
+        /// This read-only property returns the current plain
+        /// text - if the 'KeepText' property was set to true
+        /// </summary>
+        public string Text
+        {
+            get
+            {
+                //if (_GStack.Count != 0 || fFinalized == false)
+                //    throw new Exception();
+
+                //if (sbText == null)
+                //    throw new Exception();
+
+                return (_SbText.ToString());
+            }
+        }
+
+        #endregion
+
+        #region RtfText
+
+        /// <summary>
+        /// This read-only property returns the current
+        /// rtf accumulated control text
+        /// </summary>
+        public string RtfText
+        {
+            get
+            {
+                if (_GStack.Count != 0 || _Finalized == false)
+                    throw new Exception();
+
+                return (_SbRtf.ToString());
+            }
+        }
+
+        #endregion
+
+        #region TextLength
+
+        /// <summary>
+        /// This property get/sets the current
+        /// rtf plain text length
+        /// </summary>
+        public int TextLength
+        {
+            get { return (_TextLength); }
+            set { _TextLength = value; }
+        }
+
+        #endregion
+
+        #region Clear
+
+        /// <summary>
+        /// This routine clears the accumulated text
+        /// </summary>
+        public void Clear()
+        {
+            _SbRtf.Length = _ProLength;
+
+            if (_SbText != null)
+                _SbText.Length = 0;
+
+            _TextLength = 0;
+        }
+
+        #endregion
+
+        #region WriteText (char)
+
+        /// <summary>
+        /// This routine writes a given char to the rtf buffer
+        /// </summary>
+        /// <param name="c"></param>
+        public void WriteText(char c)
+        {
+            _SbRtf.Append(c);
+
+            if (_SbText != null)
+                _SbText.Append(c);
+
+            _TextLength++;
+        }
+
+        #endregion
+
+        #region WriteText (string)
+
+        /// <summary>
+        /// This routine writes a given string to the rtf buffer
+        /// </summary>
+        /// <param name="s"></param>
+        public void WriteText(string s)
+        {
+            if (s.Length > 0)
+            {
+                _SbRtf.Append(s);
+
+                if (_SbText != null)
+                    _SbText.Append(s);
+
+                _TextLength += s.Length;
+            }
+        }
+
+        #endregion
+
+        #region WriteLine
+
+        /// <summary>
+        /// This routine writes a new line to the rtf buffer
+        /// </summary>
+        public void WriteLine()
+        {
+            _SbRtf.Append("\\line ");
+
+            if (_SbText != null)
+                _SbText.Append('\n');
+
+            _TextLength++;
+        }
+
+        #endregion
+
+        #region WriteLine (string)
+
+        /// <summary>
+        /// This routine writes a given string followed
+        /// by a new line to the rtf buffer
+        /// </summary>
+        /// <param name="s"></param>
+        public void WriteLine(string s)
+        {
+            WriteText(s);
+            WriteLine();
+        }
+
+        #endregion
+
+        #region WriteTab
+
+        /// <summary>
+        /// This routine writes a tab to the rtf buffer
+        /// </summary>
+        public void WriteTab()
+        {
+            _SbRtf.Append("\\tab ");
+
+            if (_SbText != null)
+                _SbText.Append('\t');
+
+            _TextLength++;
+        }
+
+        #endregion
+
+        #region WriteHex
+
+        /// <summary>
+        /// This routine writes hex chars to the rtf buffer
+        /// </summary>
+        /// <param name="x"></param>
+        public void WriteHex(uint x)
+        {
+            string hex =
+                String.Format("{0:x2}", x);
+
+            _SbRtf.AppendFormat("\\'{0}", hex);
+
+            _TextLength++;
+        }
+
+        #endregion
+
+        #region CenterAlignText
+
+        /// <summary>
+        /// This routine causes the test to be center aligned
+        /// </summary>
+        public void CenterAlignText()
+        {
+            _SbRtf.Append("\\qc ");
+        }
+
+        #endregion
+
+        #region LeftAlignText
+
+        /// <summary>
+        /// This routine causes the test to be left aligned
+        /// </summary>
+        public void LeftAlignText()
+        {
+            _SbRtf.Append("\\ql ");
+        }
+
+        #endregion
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridFilter/SampleExpr.Designer.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridFilter/SampleExpr.Designer.cs
new file mode 100644
index 00000000..55975217
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridFilter/SampleExpr.Designer.cs	
@@ -0,0 +1,79 @@
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    partial class SampleExpr
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form 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()
+        {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SampleExpr));
+            this.btnClose = new DevComponents.DotNetBar.ButtonX();
+            this.richTextBoxEx1 = new DevComponents.DotNetBar.Controls.RichTextBoxEx();
+            this.SuspendLayout();
+            // 
+            // btnClose
+            // 
+            this.btnClose.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+            resources.ApplyResources(this.btnClose, "btnClose");
+            this.btnClose.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+            this.btnClose.DialogResult = System.Windows.Forms.DialogResult.OK;
+            this.btnClose.Name = "btnClose";
+            this.btnClose.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.btnClose.Click += new System.EventHandler(this.BtnCloseClick);
+            // 
+            // richTextBoxEx1
+            // 
+            // 
+            // 
+            // 
+            this.richTextBoxEx1.BackgroundStyle.Class = "RichTextBoxBorder";
+            this.richTextBoxEx1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.richTextBoxEx1.BackgroundStyle.PaddingLeft = 5;
+            resources.ApplyResources(this.richTextBoxEx1, "richTextBoxEx1");
+            this.richTextBoxEx1.Name = "richTextBoxEx1";
+            this.richTextBoxEx1.Rtf = "{\\rtf1\\ansi\\ansicpg1252\\deff0\\deflang1033{\\fonttbl{\\f0\\fnil\\fcharset0 Microsoft S" +
+    "ans Serif;}}\r\n\\viewkind4\\uc1\\pard\\f0\\fs17\\par\r\n}\r\n";
+            // 
+            // SampleExpr
+            // 
+            this.AcceptButton = this.btnClose;
+            resources.ApplyResources(this, "$this");
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+            this.BackColor = System.Drawing.Color.White;
+            this.Controls.Add(this.btnClose);
+            this.Controls.Add(this.richTextBoxEx1);
+            this.DoubleBuffered = true;
+            this.EnableGlass = false;
+            this.Name = "SampleExpr";
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private ButtonX btnClose;
+        private DevComponents.DotNetBar.Controls.RichTextBoxEx richTextBoxEx1;
+    }
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridFilter/SampleExpr.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridFilter/SampleExpr.cs
new file mode 100644
index 00000000..c8120e8b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridFilter/SampleExpr.cs	
@@ -0,0 +1,81 @@
+using System;
+using System.IO;
+using DevComponents.DotNetBar.Controls;
+
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    /// <summary>
+    /// SampleExpr
+    /// </summary>
+    public partial class SampleExpr : Office2007Form
+    {
+        ///<summary>
+        /// SampleExpr
+        ///</summary>
+        public SampleExpr(SuperGridControl superGrid)
+        {
+            InitializeComponent();
+
+            btnClose.Text = superGrid.FilterCloseString;
+
+            string s = GetRtbText(superGrid);
+
+            try
+            {
+                richTextBoxEx1.Rtf = s;
+            }
+            catch
+            {
+                richTextBoxEx1.Text = s;
+            }
+        }
+
+        #region Public properties
+
+        ///<summary>
+        ///The associated help RichTextBoxEx
+        ///</summary>
+        public RichTextBoxEx RichTextBoxEx
+        {
+            get { return (richTextBoxEx1); }
+        }
+
+        #endregion
+
+        #region GetRtbText
+
+        internal string GetRtbText(SuperGridControl superGrid)
+        {
+            using (LocalizationManager lm = new LocalizationManager(superGrid))
+            {
+                string s = lm.GetLocalizedString(LocalizationKeys.SuperGridFilterSampleExpr);
+
+                if (s == "")
+                {
+                    using (Stream stream = typeof(SampleExpr).Assembly.GetManifestResourceStream(
+                        "DevComponents.DotNetBar.SuperGrid.SampleExpr.rtf"))
+                    {
+                        if (stream != null)
+                        {
+                            using (StreamReader reader = new StreamReader(stream))
+                                s = reader.ReadToEnd();
+                        }
+                    }
+                }
+
+                return (s);
+            }
+        }
+
+        #endregion
+
+        #region BtnCloseClick
+
+        private void BtnCloseClick(object sender, System.EventArgs e)
+        {
+            Close();
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridFilter/SampleExpr.resx b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridFilter/SampleExpr.resx
new file mode 100644
index 00000000..725bebbb
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridFilter/SampleExpr.resx	
@@ -0,0 +1,195 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="btnClose.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Bottom, Right</value>
+  </data>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="btnClose.Location" type="System.Drawing.Point, System.Drawing">
+    <value>491, 216</value>
+  </data>
+  <data name="btnClose.Size" type="System.Drawing.Size, System.Drawing">
+    <value>82, 23</value>
+  </data>
+  <assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="btnClose.TabIndex" type="System.Int32, mscorlib">
+    <value>6</value>
+  </data>
+  <data name="btnClose.Text" xml:space="preserve">
+    <value>Close</value>
+  </data>
+  <data name="&gt;&gt;btnClose.Name" xml:space="preserve">
+    <value>btnClose</value>
+  </data>
+  <data name="&gt;&gt;btnClose.Type" xml:space="preserve">
+    <value>DevComponents.DotNetBar.ButtonX, DevComponents.DotNetBar2, Version=1.0.0.0, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04</value>
+  </data>
+  <data name="&gt;&gt;btnClose.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;btnClose.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="richTextBoxEx1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
+  </data>
+  <data name="richTextBoxEx1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 0</value>
+  </data>
+  <data name="richTextBoxEx1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>605, 251</value>
+  </data>
+  <data name="richTextBoxEx1.TabIndex" type="System.Int32, mscorlib">
+    <value>7</value>
+  </data>
+  <data name="&gt;&gt;richTextBoxEx1.Name" xml:space="preserve">
+    <value>richTextBoxEx1</value>
+  </data>
+  <data name="&gt;&gt;richTextBoxEx1.Type" xml:space="preserve">
+    <value>DevComponents.DotNetBar.Controls.RichTextBoxEx, DevComponents.DotNetBar2, Version=1.0.0.0, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04</value>
+  </data>
+  <data name="&gt;&gt;richTextBoxEx1.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;richTextBoxEx1.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
+    <value>96, 96</value>
+  </data>
+  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
+    <value>605, 251</value>
+  </data>
+  <data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
+    <value>CenterScreen</value>
+  </data>
+  <data name="$this.Text" xml:space="preserve">
+    <value>SampleExpr</value>
+  </data>
+  <data name="&gt;&gt;$this.Name" xml:space="preserve">
+    <value>SampleExpr</value>
+  </data>
+  <data name="&gt;&gt;$this.Type" xml:space="preserve">
+    <value>DevComponents.DotNetBar.Office2007Form, DevComponents.DotNetBar2, Version=1.0.0.0, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridFooter.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridFooter.cs
new file mode 100644
index 00000000..91b75623
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridFooter.cs	
@@ -0,0 +1,50 @@
+using DevComponents.DotNetBar.SuperGrid.Style;
+
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    ///<summary>
+    /// GridFooter
+    ///</summary>
+    public class GridFooter : GridTextRow
+    {
+        #region Constructors
+
+        ///<summary>
+        /// GridFooter
+        ///</summary>
+        public GridFooter()
+            : this(null)
+        {
+        }
+
+        ///<summary>
+        /// GridFooter
+        ///</summary>
+        ///<param name="text"></param>
+        public GridFooter(string text)
+            : base(text)
+        {
+        }
+
+        #endregion
+
+        #region Style support
+
+        /// <summary>
+        /// ApplyStyleEx
+        /// </summary>
+        /// <param name="style"></param>
+        /// <param name="css"></param>
+        protected override void ApplyStyleEx(TextRowVisualStyle style, StyleType[] css)
+        {
+            foreach (StyleType cs in css)
+            {
+                style.ApplyStyle(SuperGrid.BaseVisualStyles.FooterStyles[cs]);
+                style.ApplyStyle(SuperGrid.DefaultVisualStyles.FooterStyles[cs]);
+                style.ApplyStyle(GridPanel.DefaultVisualStyles.FooterStyles[cs]);
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridGroup.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridGroup.cs
new file mode 100644
index 00000000..3ef540b7
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridGroup.cs	
@@ -0,0 +1,1731 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.SuperGrid.Primitives;
+using DevComponents.DotNetBar.SuperGrid.Style;
+using DevComponents.SuperGrid.TextMarkup;
+
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    ///<summary>
+    /// GridGroup
+    ///</summary>
+    public class GridGroup : GridContainer
+    {
+        #region Static data
+
+        private static bool _dragSelection;
+        private static bool _dragStarted;
+
+        #endregion
+
+        #region Private variables
+
+        private GridCell _Cell;
+
+        private string _Text;
+        private Size _TextSize;
+
+        private Rectangle _ExpandButtonBounds;
+
+        private int _AnchorIndex;
+
+        private GroupArea _HitArea;
+        private GridContainer _HitItem;
+        private GroupArea _LastHitArea;
+
+        private GroupArea _MouseDownHitArea;
+        private Point _MouseDownPoint;
+        private GridContainer _MouseDownHitRow;
+
+        private GroupHeaderVisualStyles _GroupHeaderVisualStyles;
+        private GroupHeaderVisualStyles _EffectiveVisualStyles;
+
+        private int _StyleUpdateCount;
+
+        private BodyElement _GroupTextMarkup;
+
+        private object _GroupId;
+
+        #endregion
+
+        #region Public properties
+
+        #region Bounds
+
+        ///<summary>
+        /// Bounds
+        ///</summary>
+        public override Rectangle Bounds
+        {
+            get
+            {
+                GridPanel panel = GridPanel;
+
+                if (panel != null)
+                {
+                    Rectangle r = BoundsRelative;
+
+                    if (IsVFrozen == false)
+                        r.Y -= VScrollOffset;
+
+                    if (panel.IsSubPanel == true)
+                        r.X -= HScrollOffset;
+
+                    r.Height = FixedRowHeight;
+
+                    Rectangle t = ViewRect;
+
+                    if (r.Right > t.Right)
+                        r.Width -= (r.Right - t.Right);
+
+                    return (r);
+                }
+
+                return (Rectangle.Empty);
+            }
+        }
+
+        #endregion
+
+        #region Cell
+
+        ///<summary>
+        /// Gets the Group's associated grid cell.
+        ///</summary>
+        public GridCell Cell
+        {
+            get { return (_Cell); }
+            internal set { _Cell = value; }
+        }
+
+        #endregion
+
+        #region Column
+
+        ///<summary>
+        /// Gets the Group's associated grid Column.
+        ///</summary>
+        public GridColumn Column
+        {
+            get { return (_Cell != null ? _Cell.GridColumn : null); }
+        }
+
+        #endregion
+
+        #region GroupHeaderVisualStyles
+
+        /// <summary>
+        /// Gets or sets the visual styles
+        /// assigned to the element. Default value is null.
+        /// </summary>
+        [DefaultValue(null), Category("Style")]
+        [Description("Indicates visual style assigned to the element")]
+        public GroupHeaderVisualStyles GroupHeaderVisualStyles
+        {
+            get
+            {
+                if (_GroupHeaderVisualStyles == null)
+                {
+                    _GroupHeaderVisualStyles = new GroupHeaderVisualStyles();
+
+                    GroupHeaderStyleChangeHandler(null, _GroupHeaderVisualStyles);
+                }
+
+                return (_GroupHeaderVisualStyles);
+            }
+
+            set
+            {
+                if (_GroupHeaderVisualStyles != value)
+                {
+                    GroupHeaderVisualStyles oldValue = _GroupHeaderVisualStyles;
+                    _GroupHeaderVisualStyles = value;
+
+                    OnCellStyleChanged("GroupHeaderVisualStyle", oldValue, value);
+                }
+            }
+        }
+
+        private void OnCellStyleChanged(string property,
+            GroupHeaderVisualStyles oldValue, GroupHeaderVisualStyles newValue)
+        {
+            GroupHeaderStyleChangeHandler(oldValue, newValue);
+
+            OnPropertyChanged(property);
+        }
+
+        #endregion
+
+        #region GroupValue
+
+        ///<summary>
+        /// GroupValue
+        ///</summary>
+        public object GroupValue
+        {
+            get { return (_Cell != null ? _Cell.Value : 0); }
+        }
+
+        #endregion
+
+        #region PlainText
+
+        ///<summary>
+        /// Gets the "Plain" header Text (MiniMarkup stripped)
+        ///</summary>
+        public string PlainText
+        {
+            get
+            {
+                if (_GroupTextMarkup != null)
+                    return (_GroupTextMarkup.PlainText);
+
+                return (_Text);
+            }
+        }
+
+        #endregion
+
+        #region Text
+
+        ///<summary>
+        /// Text
+        ///</summary>
+        public string Text
+        {
+            get { return (_Text); }
+
+            set
+            {
+                if (_Text != value)
+                {
+                    _Text = value;
+
+                    MarkupGroupTextChanged();
+
+                    OnPropertyChangedEx("Text", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region GroupId
+
+        internal object GroupId
+        {
+            get { return (_GroupId); }
+            set { _GroupId = value; }
+        }
+
+        #endregion
+
+        #region GroupTextMarkup
+
+        internal BodyElement GroupTextMarkup
+        {
+            get { return (_GroupTextMarkup); }
+            set { _GroupTextMarkup = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region MeasureOverride
+
+        #region MeasureOverride
+
+        /// <summary>
+        /// MeasureOverride
+        /// </summary>
+        /// <param name="layoutInfo"></param>
+        /// <param name="stateInfo"></param>
+        /// <param name="constraintSize"></param>
+        protected override void MeasureOverride(
+            GridLayoutInfo layoutInfo, GridLayoutStateInfo stateInfo, Size constraintSize)
+        {
+            Size sizeNeeded = Size.Empty;
+            GridPanel panel = stateInfo.GridPanel;
+            Graphics g = layoutInfo.Graphics;
+
+            if (CanShowRowHeader(panel) == true)
+                sizeNeeded.Width += panel.RowHeaderWidthEx;
+
+            GroupHeaderVisualStyle style = GetSizingStyle(panel);
+
+            Size size = MeasureGroupText(g, style, constraintSize);
+
+            if (size.Height > 0)
+            {
+                size.Height += Dpi.Height8;
+
+                size.Width += Dpi.Width(style.Padding.Horizontal);
+                size.Height += Dpi.Height(style.Padding.Vertical);
+            }
+
+            size.Height = Math.Max(size.Height, Dpi.Height(panel.GroupHeaderHeight));
+
+            sizeNeeded.Width += size.Width;
+            sizeNeeded.Height = Math.Max(size.Height, sizeNeeded.Height);
+
+            if (panel.ShowGroupUnderline == true && size.Height > 0)
+                sizeNeeded.Height += Dpi.Height4;
+
+            FixedRowHeight = sizeNeeded.Height;
+
+            if (Rows != null && Expanded == true)
+            {
+                if (panel.IndentGroups == true)
+                {
+                    GridLayoutStateInfo itemStateInfo = new
+                        GridLayoutStateInfo(panel, stateInfo.IndentLevel + 1);
+
+                    size = MeasureSubItems(layoutInfo, itemStateInfo, constraintSize);
+                }
+                else
+                {
+                    size = MeasureSubItems(layoutInfo, stateInfo, constraintSize);
+                }
+
+                sizeNeeded.Width = Math.Max(size.Width, sizeNeeded.Width);
+                sizeNeeded.Height += size.Height;
+            }
+
+            Size = sizeNeeded;
+        }
+
+        #endregion
+
+        #region MeasureGroupText
+
+        private Size MeasureGroupText(Graphics g,
+            GroupHeaderVisualStyle style, Size constraintSize)
+        {
+            _TextSize = Size.Empty;
+
+            if (String.IsNullOrEmpty(Text) == false)
+            {
+                GridPanel panel = GridPanel;
+
+                if (panel.IsSubPanel == false)
+                {
+                    if (panel.ShowGroupExpand == true)
+                    {
+                        constraintSize.Width = SViewRect.Width;
+
+                        int n = panel.TreeButtonIndent +
+                                Dpi.Width(panel.LevelIndentSize.Width * IndentLevel);
+
+                        constraintSize.Width -= n;
+                    }
+                }
+
+                _TextSize = MeasureHeaderText(g, style, constraintSize);
+            }
+
+            return (_TextSize);
+        }
+
+        #region MeasureHeaderText
+
+        private Size MeasureHeaderText(Graphics g,
+            GroupHeaderVisualStyle style, Size constraintSize)
+        {
+            Size size = Size.Empty;
+
+            string s = Text;
+
+            if (string.IsNullOrEmpty(s) == false)
+            {
+                if (_GroupTextMarkup != null)
+                {
+                    size = GetMarkupTextSize(g,
+                        _GroupTextMarkup, style, constraintSize.Width);
+                }
+                else
+                {
+                    eTextFormat tf = style.GetTextFormatFlags();
+
+                    size = (constraintSize.IsEmpty == true)
+                               ? TextHelper.MeasureText(g, s, style.Font)
+                               : TextHelper.MeasureText(g, s, style.Font, constraintSize, tf);
+                }
+            }
+
+            return (size);
+        }
+
+        #region GetMarkupTextSize
+
+        private Size GetMarkupTextSize(Graphics g,
+            BodyElement textMarkup, GroupHeaderVisualStyle style, int width)
+        {
+            MarkupDrawContext d =
+                new MarkupDrawContext(g, style.Font, style.TextColor, false);
+
+            textMarkup.InvalidateElementsSize();
+            textMarkup.Measure(new Size(width, 0), d);
+
+            return (textMarkup.Bounds.Size);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region ArrangeOverride
+
+        /// <summary>
+        /// ArrangeOverride
+        /// </summary>
+        /// <param name="layoutInfo"></param>
+        /// <param name="stateInfo"></param>
+        /// <param name="layoutBounds"></param>
+        protected override void ArrangeOverride(GridLayoutInfo layoutInfo,
+            GridLayoutStateInfo stateInfo, Rectangle layoutBounds)
+        {
+            Rectangle bounds = layoutBounds;
+            bounds.Height = FixedRowHeight;
+
+            GridPanel panel = stateInfo.GridPanel;
+            IndentLevel = stateInfo.IndentLevel;
+
+            if (panel.ShowGroupExpand == true)
+            {
+                GroupHeaderVisualStyle style = GetSizingStyle(panel);
+
+                Rectangle r = bounds;
+
+                r.Width = Dpi.Width(panel.LevelIndentSize.Width);
+                r.Height -= Dpi.Height(style.Padding.Vertical);
+
+                int n = Dpi.Height(panel.GroupHeaderHeight);
+
+                if (r.Height < n)
+                    r.Height = n;
+
+                if (CanShowRowHeader(panel) == true)
+                    r.X += panel.RowHeaderWidthEx;
+
+                n = panel.TreeButtonIndent +
+                    Dpi.Width((panel.LevelIndentSize.Width * IndentLevel) - panel.LevelIndentSize.Width);
+
+                r.X += n;
+
+                if (r.Right > BoundsRelative.Right)
+                    r.Width -= r.Right - BoundsRelative.Right;
+
+                r.X += Dpi.Width(style.Padding.Left);
+                r.Y += Dpi.Height(style.Padding.Top);
+
+                Size size = panel.GetTreeButtonSize();
+
+                r.X += (r.Width - size.Width) / 2;
+                r.Y += (r.Height - size.Height) / 2 - 1;
+
+                r.Size = size;
+
+                _ExpandButtonBounds = r;
+            }
+            else
+            {
+                _ExpandButtonBounds = Rectangle.Empty;
+            }
+
+            if (Rows != null && Expanded == true)
+            {
+                bounds = layoutBounds;
+
+                bounds.Y += FixedRowHeight;
+                bounds.Height -= FixedRowHeight;
+
+                if (panel.IndentGroups == true)
+                {
+                    GridLayoutStateInfo itemStateInfo =
+                        new GridLayoutStateInfo(panel, stateInfo.IndentLevel + 1);
+
+                    ArrangeSubItems(layoutInfo, itemStateInfo, bounds);
+                }
+                else
+                {
+                    ArrangeSubItems(layoutInfo, stateInfo, bounds);
+                }
+            }
+        }
+
+        #endregion
+
+        #region RenderOverride
+
+        /// <summary>
+        /// RenderOverride
+        /// </summary>
+        /// <param name="renderInfo"></param>
+        protected override void RenderOverride(GridRenderInfo renderInfo)
+        {
+            GridPanel panel = GridPanel;
+
+            if (panel != null)
+            {
+                Rectangle r = Bounds;
+
+                if (r.IntersectsWith(renderInfo.ClipRectangle))
+                {
+                    Graphics g = renderInfo.Graphics;
+                    GroupHeaderVisualStyle style = GetEffectiveStyle();
+
+                    if (SuperGrid.DoPreRenderGroupHeaderEvent(g,
+                        this, RenderParts.Background | RenderParts.RowHeader, r) == false)
+                    {
+                        RenderGroupBackground(g, style, r);
+                        RenderRowHeader(g, panel, style, r);
+
+                        SuperGrid.DoPostRenderGroupHeaderEvent(g,
+                            this, RenderParts.Background | RenderParts.RowHeader, r);
+                    }
+
+                    if (CanShowRowHeader(panel) == true)
+                    {
+                        r.X += panel.RowHeaderWidthEx;
+                        r.Width -= panel.RowHeaderWidthEx;
+                    }
+                    
+                    RenderHeaderExpand(g, panel, ref r);
+
+                    r = GetAdjustedBounds(style, r);
+
+                    int n = Dpi.Width(panel.GroupHeaderHeight);
+
+                    if (r.Height < n)
+                        r.Height = n;
+
+                    if (SuperGrid.DoPreRenderGroupHeaderEvent(g,
+                        this, RenderParts.Content, r) == false)
+                    {
+                        RenderHeaderText(g, style, r);
+                        RenderHeaderUnderline(g, panel, style, r);
+
+                        SuperGrid.DoPostRenderGroupHeaderEvent(g,
+                            this, RenderParts.Content, r);
+                    }
+                }
+
+                if (Rows != null && Expanded == true)
+                {
+                    UpdateMergeFlags();
+
+                    foreach (GridElement item in Rows)
+                    {
+                        if (item.Visible == true)
+                            item.Render(renderInfo);
+                    }
+                }
+            }
+        }
+
+        #region GetAdjustedBounds
+
+        private Rectangle GetAdjustedBounds(GroupHeaderVisualStyle style, Rectangle r)
+        {
+            r.X += Dpi.Width(style.Padding.Left);
+            r.Width -= Dpi.Width(style.Padding.Horizontal);
+
+            r.Y += Dpi.Height(style.Padding.Top + 2);
+            r.Height -= Dpi.Height(style.Padding.Vertical + 2);
+
+            return (r);
+        }
+
+        #endregion
+
+        #region RenderRowHeader
+
+        private void RenderRowHeader(Graphics g,
+            GridPanel panel, GroupHeaderVisualStyle style, Rectangle r)
+        {
+            if (CanShowRowHeader(panel) == true)
+            {
+                r.Width = panel.RowHeaderWidthEx;
+
+                using (Brush br = style.RowHeaderStyle.Background.GetBrush(r))
+                    g.FillRectangle(br, r);
+
+                GridPanelVisualStyle pstyle = panel.GetEffectiveStyle();
+
+                if (Dpi.Height1 == Dpi.Width1)
+                {
+                    using (Pen pen = new Pen(style.RowHeaderStyle.BorderHighlightColor, Dpi.Height1))
+                    {
+                        g.DrawLine(pen, r.X + 1, r.Top, r.Right - 2, r.Top);
+                        g.DrawLine(pen, r.X + 1, r.Top, r.X + 1, r.Bottom - 1);
+                    }
+
+                    using (Pen pen = new Pen(pstyle.HeaderLineColor, Dpi.Height1))
+                    {
+                        g.DrawLine(pen, r.X, r.Top - 1, r.Right - 1, r.Top - 1);
+                        g.DrawLine(pen, r.X, r.Bottom - 1, r.Right - 2, r.Bottom - 1);
+
+                        g.DrawLine(pen, r.Right - 1, r.Top, r.Right - 1, r.Bottom - 1);
+                    }
+                }
+                else
+                {
+                    using (Pen pen = new Pen(style.RowHeaderStyle.BorderHighlightColor, Dpi.Height1))
+                        g.DrawLine(pen, r.X + 1, r.Top, r.Right - 2, r.Top);
+
+                    using (Pen pen = new Pen(style.RowHeaderStyle.BorderHighlightColor, Dpi.Width1))
+                        g.DrawLine(pen, r.X + 1, r.Top, r.X + 1, r.Bottom - 1);
+
+                    using (Pen pen = new Pen(pstyle.HeaderLineColor, Dpi.Height1))
+                    {
+                        g.DrawLine(pen, r.X, r.Top - 1, r.Right - 1, r.Top - 1);
+                        g.DrawLine(pen, r.X, r.Bottom - 1, r.Right - 2, r.Bottom - 1);
+                    }
+
+                    using (Pen pen = new Pen(pstyle.HeaderLineColor, Dpi.Width1))
+                        g.DrawLine(pen, r.Right - 1, r.Top, r.Right - 1, r.Bottom - 1);
+                }
+
+                r.X += Dpi.Width4;
+                r.Width -= Dpi.Width4;
+
+                int n = RenderIndicatorImage(g, panel, this, r);
+
+                r.X += n;
+                r.Width -= n;
+
+                if (panel.ShowRowGridIndex == true)
+                    RenderGridIndex(g, this, style.RowHeaderStyle, r);
+            }
+        }
+
+        #region RenderIndicatorImage
+
+        private int RenderIndicatorImage(Graphics g,
+            GridPanel panel, GridContainer row, Rectangle r)
+        {
+            RowHeaderVisualStyle style = GetEffectiveRowStyle().RowHeaderStyle;
+
+            Image image = style.GetActiveRowImage(panel);
+
+            if (image != null)
+            {
+                if (panel.ActiveRow == row)
+                {
+                    if (panel.ActiveRowIndicatorStyle == ActiveRowIndicatorStyle.Image ||
+                        panel.ActiveRowIndicatorStyle == ActiveRowIndicatorStyle.Both)
+                    {
+                        Rectangle u = r;
+                        u.Size = image.Size;
+
+                        if (r.Height > u.Height)
+                            u.Y += (r.Height - u.Height) / 2;
+
+                        u.Intersect(r);
+
+                        g.DrawImageUnscaledAndClipped(image, u);
+                    }
+                }
+
+                return (image.Width);
+            }
+
+            return (0);
+        }
+
+        #endregion
+
+        #region RenderGridIndex
+
+        private void RenderGridIndex(Graphics g,
+            GridContainer row, RowHeaderVisualStyle style, Rectangle r)
+        {
+            string text = (row.GridIndex + row.GridPanel.RowHeaderIndexOffset).ToString();
+
+            Font font = style.Font ?? SystemFonts.DefaultFont;
+
+            r.Inflate(-2, 0);
+
+            TextDrawing.DrawString(g, text,
+                font, style.TextColor, r, style.GetTextFormatFlags());
+
+            return;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region CanShowRowHeader
+
+        /// <summary>
+        /// CanShowRowHeader
+        /// </summary>
+        /// <param name="panel"></param>
+        /// <returns></returns>
+        protected virtual bool CanShowRowHeader(GridPanel panel)
+        {
+            switch (panel.GroupRowHeaderVisibility)
+            {
+                case RowHeaderVisibility.Always:
+                    return (true);
+
+                case RowHeaderVisibility.PanelControlled:
+                    return (panel.ShowRowHeaders);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region RenderGroupBackground
+
+        private void RenderGroupBackground(
+            Graphics g, GroupHeaderVisualStyle style, Rectangle r)
+        {
+            if (style.Background != null && style.Background.IsEmpty == false)
+            {
+                using (Brush br = style.Background.GetBrush(r))
+                    g.FillRectangle(br, r);
+            }
+        }
+
+        #endregion
+
+        #region RenderHeaderExpand
+
+        private void RenderHeaderExpand(
+            Graphics g, GridPanel panel, ref Rectangle r)
+        {
+            if (panel.ShowGroupExpand == true)
+            {
+                Rectangle bounds = _ExpandButtonBounds;
+
+                if (IsVFrozen == false)
+                    bounds.Y -= VScrollOffset;
+
+                if (panel.IsSubPanel == true)
+                    bounds.X -= HScrollOffset;
+
+                bool hot = (_HitArea == GroupArea.ExpandButton);
+
+                Image image = (Expanded == true)
+                    ? panel.GetCollapseButton(g, hot) : panel.GetExpandButton(g, hot);
+
+                ExpandDisplay.RenderButton(g, image, bounds, r);
+
+                int n = panel.TreeButtonIndent +
+                    Dpi.Width(panel.LevelIndentSize.Width * IndentLevel);
+
+                r.X += n;
+                r.Width -= n;
+            }
+            else
+            {
+                r.X += Dpi.Width3;
+                r.Width -= Dpi.Width3;
+            }
+        }
+
+        #endregion
+
+        #region RenderHeaderText
+
+        private void RenderHeaderText(Graphics g,
+            GroupHeaderVisualStyle style, Rectangle r)
+        {
+            eTextFormat tf = style.GetTextFormatFlags();
+
+            if (style.Alignment == Alignment.BottomLeft ||
+                style.Alignment == Alignment.BottomCenter ||
+                style.Alignment == Alignment.BottomRight)
+            {
+                r.Height -= Dpi.Height4;
+            }
+
+            if (r.Width > 0 && r.Height > 0)
+            {
+                if (_GroupTextMarkup != null)
+                    RenderTextMarkup(g, _GroupTextMarkup, style, r);
+                else
+                    TextDrawing.DrawString(g, Text, style.Font, style.TextColor, r, tf);
+            }
+        }
+
+        #region RenderTextMarkup
+
+        private void RenderTextMarkup(Graphics g,
+            BodyElement textMarkup, GroupHeaderVisualStyle style, Rectangle r)
+        {
+            MarkupDrawContext d =
+                new MarkupDrawContext(g, style.Font, style.TextColor, false);
+
+            textMarkup.Arrange(new Rectangle(r.Location, r.Size), d);
+
+            Size size = textMarkup.Bounds.Size;
+
+            switch (style.Alignment)
+            {
+                case Alignment.MiddleLeft:
+                case Alignment.MiddleCenter:
+                case Alignment.MiddleRight:
+                    if (r.Height > size.Height)
+                        r.Y += (r.Height - size.Height) / 2;
+                    break;
+
+                default:
+                    if (r.Height > size.Height)
+                        r.Y = r.Bottom - size.Height;
+                    break;
+            }
+
+            textMarkup.Bounds = new Rectangle(r.Location, size);
+
+            Region oldClip = g.Clip;
+
+            try
+            {
+                g.SetClip(r, CombineMode.Intersect);
+
+                textMarkup.Render(d);
+            }
+            finally
+            {
+                g.Clip = oldClip;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderHeaderUnderline
+
+        private void RenderHeaderUnderline(Graphics g,
+            GridPanel panel, GroupHeaderVisualStyle style, Rectangle r)
+        {
+            if (panel.ShowGroupUnderline == true && style.UnderlineColor.IsEmpty == false)
+            {
+                switch (style.Alignment)
+                {
+                    case Alignment.MiddleLeft:
+                    case Alignment.MiddleCenter:
+                    case Alignment.MiddleRight:
+                        r.Y += (r.Height + _TextSize.Height) / 2 + Dpi.Height4;
+                        break;
+
+                    case Alignment.TopLeft:
+                    case Alignment.TopCenter:
+                    case Alignment.TopRight:
+                        r.Y += _TextSize.Height + Dpi.Height6;
+                        break;
+
+                    default:
+                        r.Y = r.Bottom - _TextSize.Height / 2;
+                        break;
+                }
+
+                if (r.Width > SViewRect.Width)
+                    r.Width = SViewRect.Width;
+
+                int n = r.Width;
+
+                r.Height = Dpi.Height1;
+                r.Width = (int)(r.Width * .75);
+
+                Rectangle t = r;
+
+                Color color1 = style.UnderlineColor;
+                Color color2 = Color.Transparent;
+
+                switch (style.Alignment)
+                {
+                    case Alignment.TopCenter:
+                    case Alignment.MiddleCenter:
+                    case Alignment.BottomCenter:
+                        r.X += (n - r.Width) / 2;
+                        r.Width /= 2;
+
+                        color1 = Color.Transparent;
+                        color2 = style.UnderlineColor;
+                        break;
+
+                    case Alignment.TopRight:
+                    case Alignment.MiddleRight:
+                    case Alignment.BottomRight:
+                        r.X += n - r.Width;
+
+                        color1 = Color.Transparent;
+                        color2 = style.UnderlineColor;
+                        break;
+                }
+
+                t.X = r.X;
+
+                if ((r.Width > 0 && r.Height > 0) && (t.Width > 0 && t.Height > 0))
+                {
+                    using (LinearGradientBrush br = new
+                        LinearGradientBrush(r, color1, color2, 0f))
+                    {
+                        br.WrapMode = WrapMode.TileFlipXY;
+
+                        g.FillRectangle(br, t);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Mouse support
+
+        #region InternalMouseEnter
+
+        internal override void InternalMouseEnter(EventArgs e)
+        {
+            base.InternalMouseEnter(e);
+
+            InvalidateRender();
+        }
+
+        #endregion
+
+        #region InternalMouseLeave
+
+        internal override void InternalMouseLeave(EventArgs e)
+        {
+            base.InternalMouseLeave(e);
+
+            InvalidateRender();
+        }
+
+        #endregion
+
+        #region InternalMouseMove
+
+        internal override void InternalMouseMove(MouseEventArgs e)
+        {
+            GridPanel panel = GridPanel;
+
+            if (panel != null)
+            {
+                if (IsMouseDown == true)
+                    ProcessMouseDownMove(e, panel);
+
+                ProcessMouseMove(e, panel);
+            }
+
+            if (Capture == false)
+                base.InternalMouseMove(e);
+        }
+
+        #region ProcessMouseDownMove
+
+        private void ProcessMouseDownMove(MouseEventArgs e, GridPanel panel)
+        {
+            Rectangle r = ViewRect;
+
+            if (MouseDownPoint.Y < r.Y)
+            {
+                int n = SuperGrid.PrimaryGrid.FixedRowHeight -
+                        SuperGrid.PrimaryGrid.FixedHeaderHeight;
+
+                r.Y -= n;
+                r.Height += n;
+            }
+
+            VScrollBarAdv vsb = SuperGrid.VScrollBar;
+
+            if ((e.Y >= r.Y) && 
+                (e.Y < r.Bottom || (vsb.Value >= vsb.Maximum - vsb.LargeChange)))
+            {
+                SuperGrid.DisableAutoScrolling();
+
+                switch (_MouseDownHitArea)
+                {
+                    case GroupArea.Content:
+                    case GroupArea.RowHeader:
+                        _HitItem = GetRowAt(panel, e.Location);
+
+                        if (_HitItem != null)
+                        {
+                            if (DragStarted(panel, e) == false)
+                            {
+                                if (panel.MultiSelect == true)
+                                {
+                                    if (_HitItem != panel.LastProcessedItem)
+                                        ProcessExtendSelection(panel, true);
+                                }
+                            }
+                        }
+                        break;
+                }
+            }
+            else
+            {
+                SuperGrid.EnableAutoScrolling(AutoScrollEnable.Vertical, r);
+            }
+        }
+
+        #endregion
+
+        #region ProcessMouseMove
+
+        internal void ProcessMouseMove(MouseEventArgs e, GridPanel panel)
+        {
+            _HitArea = GetGroupAreaAt(e);
+
+            switch (_HitArea)
+            {
+                case GroupArea.ExpandButton:
+                    SuperGrid.GridCursor = Cursors.Hand;
+                    break;
+
+                default:
+                    SuperGrid.GridCursor = Cursors.Default;
+                    break;
+            }
+
+            if (_LastHitArea != _HitArea)
+            {
+                _LastHitArea = _HitArea;
+
+                InvalidateRender();
+            }
+        }
+
+        #endregion
+
+        #region DragStarted
+
+        private bool DragStarted(GridPanel panel, MouseEventArgs e)
+        {
+            if (_dragSelection == true && Capture == true)
+            {
+                if (_dragStarted == false)
+                {
+                    if (DragDrop.DragStarted(_MouseDownPoint, e.Location) == true)
+                    {
+                        _dragStarted = true;
+
+                        if (SuperGrid.DoItemDragEvent(this, e) == true)
+                        {
+                            _dragSelection = false;
+
+                            Capture = true;
+
+                            InitExtendSelection(panel);
+                        }
+                    }
+                }
+
+                return (true);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InternalMouseDown
+
+        internal override void InternalMouseDown(MouseEventArgs e)
+        {
+            _MouseDownHitArea = _HitArea;
+            _MouseDownHitRow = _HitItem;
+            _MouseDownPoint = e.Location;
+
+            GridPanel panel = GridPanel;
+
+            if (panel != null)
+            {
+                GridCell ecell = SuperGrid.EditorCell;
+
+                if (ecell != null)
+                {
+                    if (ecell.EndEdit() == false)
+                        return;
+                }
+
+                _dragSelection = false;
+                _dragStarted = false;
+
+                if (_MouseDownHitArea != GroupArea.NoWhere)
+                {
+                    if (_MouseDownHitArea == GroupArea.ExpandButton || 
+                        panel.GroupHeaderClickBehavior == GroupHeaderClickBehavior.ExpandCollapse)
+                    {
+                            Expanded = !Expanded;
+                    }
+                    else
+                    {
+                        if (ShouldExtendSelection(panel) == true)
+                        {
+                            InitExtendSelection(panel);
+                        }
+                        else
+                        {
+                            if (IsMouseDown == true)
+                            {
+                                Capture = true;
+
+                                _dragSelection = true;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        #region ShouldExtendSelection
+
+        private bool ShouldExtendSelection(GridPanel panel)
+        {
+            return (panel.SuperGrid.HasItemDragHandler == false || IsSelected == false ||
+                ((Control.ModifierKeys & (Keys.Control | Keys.Shift)) != Keys.None));
+        }
+
+        #endregion
+
+        #region InitExtendSelection
+
+        private void InitExtendSelection(GridPanel panel)
+        {
+            if (IsMouseSelectable() == true)
+            {
+                Capture = true;
+
+                ExtendSelectionEx(panel);
+            }
+        }
+
+        #region IsMouseSelectable
+
+        private bool IsMouseSelectable()
+        {
+            return (IsMouseSelectableEx(Control.MouseButtons));
+        }
+
+        private bool IsMouseSelectableEx(MouseButtons mb)
+        {
+            if ((mb & MouseButtons.Left) == MouseButtons.Left)
+                return (true);
+
+            return (IsSelected == false);
+        }
+
+        #endregion
+
+        #region ExtendSelectionEx
+
+        private void ExtendSelectionEx(GridPanel panel)
+        {
+            if (_MouseDownHitRow != null && _HitItem != null)
+            {
+                _AnchorIndex = _MouseDownHitRow.GridIndex;
+
+                if (panel.LastProcessedItem != this && panel.LastProcessedItem != null)
+                    panel.LastProcessedItem.InvalidateRender();
+
+                bool ckey = panel.MultiSelect == true
+                                ? ((Control.ModifierKeys & Keys.Control) == Keys.Control)
+                                : false;
+
+                panel.LastProcessedItem = (ckey == true) ? _HitItem : this;
+
+                ProcessExtendSelection(panel, false);
+            }
+        }
+
+        #region ProcessExtendSelection
+
+        internal void ProcessExtendSelection(GridPanel panel, bool extend)
+        {
+            bool ckey = panel.MultiSelect == true
+                            ? ((Control.ModifierKeys & Keys.Control) == Keys.Control)
+                            : false;
+
+            if (ckey == true)
+                ProcessControlExtend(panel, extend);
+            else
+                ProcessNonControlExtend(panel, extend);
+
+            panel.LastProcessedItem = _HitItem;
+        }
+
+        #region ProcessControlExtend
+
+        private void ProcessControlExtend(GridPanel panel, bool extend)
+        {
+            if (panel.LastProcessedItem == null)
+                panel.LastProcessedItem = _MouseDownHitRow;
+
+            GridContainer lastRow = panel.LastProcessedItem as GridContainer;
+
+            if (lastRow != null)
+            {
+                int startIndex = lastRow.GridIndex;
+                int endIndex = _HitItem.GridIndex;
+
+                panel.NormalizeIndices(extend,
+                    _AnchorIndex, ref startIndex, ref endIndex);
+
+                for (int i = startIndex; i <= endIndex; i++)
+                {
+                    if (extend == false || i != _AnchorIndex)
+                        panel.SetSelectedRows(i, 1, !panel.IsRowSelected(i));
+                }
+
+                InvalidateRows(panel, startIndex, endIndex, true);
+            }
+        }
+
+        #endregion
+
+        #region ProcessNonControlExtend
+
+        private void ProcessNonControlExtend(GridPanel panel, bool extend)
+        {
+            bool skey = (panel.MultiSelect == true) ?
+                ((Control.ModifierKeys & Keys.Shift) == Keys.Shift) : false;
+
+            if (skey == false || panel.SelectionRowAnchor == null)
+                panel.SelectionRowAnchor = _MouseDownHitRow;
+
+            ExtendSelection(panel, _HitItem, extend);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region InternalMouseUp
+
+        /// <summary>
+        /// InternalMouseUp
+        /// </summary>
+        /// <param name="e"></param>
+        internal override void InternalMouseUp(MouseEventArgs e)
+        {
+            SuperGrid.DisableAutoScrolling();
+
+            if (ExtendDragSelection(GridPanel, e) == false)
+            {
+                if (_MouseDownHitArea == _HitArea)
+                {
+                    if (_MouseDownHitArea == GroupArea.Content || _MouseDownHitArea == GroupArea.RowHeader)
+                    {
+                        GridPanel panel = GridPanel;
+
+                        if (GridPanel.GroupHeaderClickBehavior == GroupHeaderClickBehavior.SelectAll)
+                        {
+                            bool ckey = panel.MultiSelect == true
+                                ? ((Control.ModifierKeys & Keys.Control) == Keys.Control)
+                                : false;
+
+                            ProcessSelectAll(panel, this, ckey);
+                        }
+                    }
+
+                    SuperGrid.DoGroupHeaderClickEvent(this, _MouseDownHitArea, e);
+                }
+            }
+        }
+
+        #region ExtendDragSelection
+
+        private bool ExtendDragSelection(GridPanel panel, MouseEventArgs e)
+        {
+            if (_dragSelection == true && Capture == true)
+            {
+                if (IsMouseSelectableEx(e.Button) == true)
+                {
+                    if (_MouseDownHitRow == _HitItem)
+                    {
+                        ExtendSelectionEx(panel);
+
+                        return (true);
+                    }
+                }
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region ProcessSelectAll
+
+        private void ProcessSelectAll(GridPanel panel,
+            GridContainer item, bool ckey)
+        {
+            if (item.Rows != null && item.Rows.Count > 0)
+            {
+                item.Expanded = true;
+
+                foreach (GridContainer row in item.Rows)
+                {
+                    if (row is GridGroup)
+                    {
+                        ProcessSelectAll(panel, row, ckey);
+                    }
+                    else
+                    {
+                        int startIndex = ((GridContainer)item.Rows[0]).GridIndex;
+                        int endIndex = ((GridContainer)item.Rows[item.Rows.Count - 1]).GridIndex;
+
+                        if (ckey == true)
+                        {
+                            for (int i = startIndex; i <= endIndex; i++)
+                                panel.SetSelectedRows(i, 1, !panel.IsRowSelected(i));
+                        }
+                        else
+                        {
+                            panel.SetSelectedRows(startIndex, endIndex - startIndex + 1, true);
+                        }
+                        break;
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InternalMouseDoubleClick
+
+        internal override void InternalMouseDoubleClick(MouseEventArgs e)
+        {
+            if (_HitArea == _MouseDownHitArea)
+                SuperGrid.DoGroupHeaderDoubleClickEvent(this, _MouseDownHitArea, e);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetGroupAreaAt
+
+        /// <summary>
+        /// Returns element at specified mouse coordinates
+        /// </summary>
+        /// <param name="e">Mouse event arguments</param>
+        /// <returns>Reference to child Group element or null
+        /// if no element at specified coordinates</returns>
+        protected virtual GroupArea GetGroupAreaAt(MouseEventArgs e)
+        {
+            return GetGroupAreaAt(e.X, e.Y);
+        }
+
+        /// <summary>
+        /// Returns element at specified mouse coordinates
+        /// </summary>
+        /// <param name="x">Horizontal position</param>
+        /// <param name="y">Vertical position</param>
+        /// <returns>Reference to child element or null
+        /// if no element at specified coordinates</returns>
+        protected virtual GroupArea GetGroupAreaAt(int x, int y)
+        {
+            GridPanel panel = GridPanel;
+
+            _HitItem = GetRowAt(panel, new Point(x, y));
+
+            Rectangle r = BoundsRelative;
+            r.Height = FixedRowHeight;
+
+            if (IsVFrozen == false)
+                r.Y -= VScrollOffset;
+
+            if (panel.IsSubPanel == true)
+                r.X -= HScrollOffset;
+
+            if (r.Contains(x, y) == true)
+            {
+                if (panel.ShowRowHeaders == true)
+                {
+                    if (x >= r.X && x < r.X + panel.RowHeaderWidthEx)
+                        return (GroupArea.RowHeader);
+                }
+
+                r = _ExpandButtonBounds;
+
+                if (IsVFrozen == false)
+                    r.Y -= VScrollOffset;
+
+                if (GridPanel.IsSubPanel == true)
+                    r.X -= HScrollOffset;
+
+                if (r.Contains(x, y) == true)
+                    return (GroupArea.ExpandButton);
+
+                return (GroupArea.Content);
+            }
+
+            return (GroupArea.NoWhere);
+        }
+
+        #endregion
+
+        #region GetRowAt
+
+        private GridContainer GetRowAt(GridPanel panel, Point pt)
+        {
+            Rectangle r = panel.ContainerBounds;
+            r.X -= HScrollOffset;
+
+            if (pt.X < r.X)
+                pt.X = r.X;
+
+            GridContainer row = panel;
+            GridElement item = row.InternalGetElementAt(pt.X, pt.Y);
+
+            while (item != null)
+            {
+                row = item as GridContainer;
+
+                if (row == null)
+                    break;
+
+                if (row is GridRow)
+                    item = ((GridRow)row).GetRowElementAt(pt.X, pt.Y, false);
+                else
+                    item = row.GetElementAt(pt.X, pt.Y);
+
+                if (item is GridContainer == false)
+                    return (row);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region InvalidateRender
+
+        /// <summary>
+        /// InvalidateRender
+        /// </summary>
+        public override void InvalidateRender()
+        {
+            Rectangle bounds = BoundsRelative;
+
+            if (IsVFrozen == false)
+                bounds.Y -= VScrollOffset;
+
+            SuperGridControl grid = SuperGrid;
+
+            if (grid != null)
+                grid.InvalidateRender(bounds);
+
+            OnRenderInvalid(EventArgs.Empty);
+        }
+
+        #endregion
+
+        #region Style support routines
+
+        #region GroupHeaderStyleChangeHandler
+
+        private void GroupHeaderStyleChangeHandler(
+            GroupHeaderVisualStyles oldValue, GroupHeaderVisualStyles newValue)
+        {
+            if (oldValue != null)
+                oldValue.PropertyChanged -= StyleChanged;
+
+            if (newValue != null)
+                newValue.PropertyChanged += StyleChanged;
+        }
+
+        #endregion
+
+        #region GetEffectiveStyle
+
+        ///<summary>
+        /// GetEffectiveStyle
+        ///</summary>
+        ///<returns></returns>
+        public GroupHeaderVisualStyle GetEffectiveStyle()
+        {
+            StyleState state = GetState();
+
+            return (GetEffectiveStyle(state));
+        }
+
+        internal GroupHeaderVisualStyle GetEffectiveStyle(StyleType styleType)
+        {
+            ValidateStyle();
+
+            return (GetStyle(styleType));
+        }
+
+        internal GroupHeaderVisualStyle GetEffectiveStyle(StyleState state)
+        {
+            ValidateStyle();
+
+            switch (state)
+            {
+                case StyleState.MouseOver:
+                    return (GetStyle(StyleType.MouseOver));
+
+                case StyleState.Selected:
+                    return (GetStyle(StyleType.Selected));
+
+                case StyleState.Selected | StyleState.MouseOver:
+                    return (GetStyle(StyleType.SelectedMouseOver));
+
+                case StyleState.ReadOnly:
+                    return (GetStyle(StyleType.ReadOnly));
+
+                case StyleState.ReadOnly | StyleState.MouseOver:
+                    return (GetStyle(StyleType.ReadOnlyMouseOver));
+
+                case StyleState.ReadOnly | StyleState.Selected:
+                    return (GetStyle(StyleType.ReadOnlySelected));
+
+                case StyleState.ReadOnly | StyleState.MouseOver | StyleState.Selected:
+                    return (GetStyle(StyleType.ReadOnlySelectedMouseOver));
+
+                default:
+                    return (GetStyle(StyleType.Default));
+            }
+        }
+
+        #endregion
+
+        #region GetStyle
+
+        private GroupHeaderVisualStyle GetStyle(StyleType e)
+        {
+            if (_EffectiveVisualStyles.IsValid(e) == false)
+            {
+                GroupHeaderVisualStyle style = new GroupHeaderVisualStyle();
+
+                StyleType[] css = style.GetApplyStyleTypes(e);
+
+                if (css != null)
+                {
+                    foreach (StyleType cs in css)
+                    {
+                        style.ApplyStyle(SuperGrid.BaseVisualStyles.GroupHeaderStyles[cs]);
+                        style.ApplyStyle(SuperGrid.DefaultVisualStyles.GroupHeaderStyles[cs]);
+                        style.ApplyStyle(GridPanel.DefaultVisualStyles.GroupHeaderStyles[cs]);
+
+                        style.ApplyStyle(GroupHeaderVisualStyles[cs]);
+                    }
+                }
+
+                SuperGrid.DoGetGroupHeaderStyleEvent(this, e, ref style);
+
+                if (style.Background == null || style.Background.IsEmpty == true)
+                    style.Background = new Background(Color.White);
+
+                if (style.Font == null)
+                    style.Font = SystemFonts.DefaultFont;
+
+                if (style.TextColor.IsEmpty)
+                    style.TextColor = Color.Black;
+
+                _EffectiveVisualStyles[e] = style;
+            }
+
+            return (_EffectiveVisualStyles[e]);
+        }
+
+        #endregion
+
+        #region ValidateStyle
+
+        private void ValidateStyle()
+        {
+            if (_EffectiveVisualStyles == null ||
+                (_StyleUpdateCount != SuperGrid.StyleUpdateCount))
+            {
+                _EffectiveVisualStyles = new GroupHeaderVisualStyles();
+
+                _StyleUpdateCount = SuperGrid.StyleUpdateCount;
+            }
+        }
+
+        #endregion
+
+        #region GetState
+
+        internal StyleState GetState()
+        {
+            StyleState rowState = StyleState.Default;
+
+            if (IsMouseOver == true)
+            {
+                Point pt = SuperGrid.PointToClient(Control.MousePosition);
+
+                if (Bounds.Contains(pt) == true)
+                    rowState |= StyleState.MouseOver;
+            }
+
+            if (IsSelected == true)
+                rowState |= StyleState.Selected;
+
+            return (rowState);
+        }
+
+        #endregion
+
+        #region GetSizingStyle
+
+        private GroupHeaderVisualStyle GetSizingStyle(GridPanel panel)
+        {
+            StyleType styleType = panel.GetSizingStyle();
+
+            if (styleType == StyleType.NotSet)
+                styleType = StyleType.Default;
+
+            return (GetEffectiveStyle(styleType));
+        }
+
+        #endregion
+
+        #endregion
+
+        #region CreateItemsCollection
+
+        /// <summary>
+        /// Creates the GridItemsCollection that hosts the items.
+        /// </summary>
+        /// <returns>New instance of GridItemsCollection.</returns>
+        protected override GridItemsCollection CreateItemsCollection()
+        {
+            GridItemsCollection items = new GridItemsCollection();
+
+            items.CollectionChanged += ItemsCollectionChanged;
+
+            return (items);
+        }
+
+        #endregion
+
+        #region DisposeItemsCollection
+
+        /// <summary>
+        /// DisposeItemsCollection
+        /// </summary>
+        /// <param name="items"></param>
+        protected override void DisposeItemsCollection(GridItemsCollection items)
+        {
+            items.CollectionChanged -= ItemsCollectionChanged;
+        }
+
+        #endregion
+
+        #region ItemsCollectionChanged
+
+        void ItemsCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            switch (e.Action)
+            {
+                case NotifyCollectionChangedAction.Add:
+                case NotifyCollectionChangedAction.Replace:
+
+                    foreach (GridElement item in e.NewItems)
+                        item.Parent = this;
+                    break;
+            }
+
+            GridPanel panel = GridPanel;
+
+            if (panel != null)
+                panel.RowCollectionChanged(e);
+        }
+
+        #endregion
+
+        #region Markup support
+
+        private void MarkupGroupTextChanged()
+        {
+            _GroupTextMarkup = null;
+
+            if (Column != null && Column.EnableGroupHeaderMarkup == true)
+            {
+                if (MarkupParser.IsMarkup(_Text) == true)
+                    _GroupTextMarkup = MarkupParser.Parse(_Text);
+            }
+        }
+
+        #endregion
+
+        #region IDisposable
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        public override void Dispose()
+        {
+            GroupHeaderVisualStyles = null;
+
+            Rows = null;
+
+            base.Dispose();
+        }
+
+        #endregion
+    }
+
+    #region enums
+
+    #region GroupArea
+
+    ///<summary>
+    /// GroupArea
+    ///</summary>
+    public enum GroupArea
+    {
+        ///<summary>
+        /// Content
+        ///</summary>
+        Content,
+
+        ///<summary>
+        /// ExpandButton
+        ///</summary>
+        ExpandButton,
+
+        /// <summary>
+        /// Row Header
+        /// </summary>
+        RowHeader,
+
+        ///<summary>
+        /// NoWhere
+        ///</summary>
+        NoWhere,
+    }
+
+    #endregion
+
+    #endregion
+
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridGroupBy.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridGroupBy.cs
new file mode 100644
index 00000000..f568c13f
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridGroupBy.cs	
@@ -0,0 +1,2430 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.SuperGrid.Style;
+using DevComponents.SuperGrid.TextMarkup;
+
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    /// <summary>
+    /// Defines the grid GridGroupBy Row
+    /// </summary>
+    public class GridGroupByRow : GridTextRow
+    {
+        #region Constants
+
+        const int MarkerWidth = 13;
+        const int MarkerHeight = 7;
+
+        const int MarkerHPad = 10;
+        const int MarkerVPad = 12;
+
+        const int TextPad = 3;
+        const int TextHPad = 6;
+        const int TextVPad = 6;
+
+        const int BoxSpacing = 8;
+        const int DefaultMinRowHeight = 35;
+
+        #endregion
+
+        #region Private variables
+
+        private bool _Visible;
+        private bool _UseColumnHeaderColors = true;
+        private bool _AllowUserSort = true;
+        private bool _RemoveGroupOnDoubleClick = true;
+
+        private GroupBoxLayout _GroupBoxLayout = GroupBoxLayout.Hierarchical;
+        private GroupBoxStyle _GroupBoxStyle = GroupBoxStyle.Rectangular;
+
+        private List<GridGroupBox> _GroupBoxes;
+        private GroupBoxEffects _GroupBoxEffects = GroupBoxEffects.NotSet;
+
+        private bool _Dragging;
+        private Image _InsertMarker;
+
+        private GridGroupBox _HitGroupBox;
+        private GridGroupBox _LastHitGroupBox;
+        private GridGroupBox _MouseDownHitBox;
+
+        private HeaderArea _HitArea;
+        private HeaderArea _LastHitArea;
+        private GridColumn _HitColumn;
+
+        private FloatWindow _GroupBoxWindow;
+        private GridGroupBox _AfterGroupBox;
+        private Rectangle _InsertRect;
+
+        private FilterPopup _FilterMenu;
+        private ImageVisibility _FilterImageVisibility = ImageVisibility.NotSet;
+
+        private string _WatermarkText;
+
+        private int _MaxGroupBoxWidth = 200;
+        private int _CornerRadius = 5;
+
+        #endregion
+
+        #region Constructors
+
+        ///<summary>
+        /// GridHeader
+        ///</summary>
+        public GridGroupByRow()
+            : this(null)
+        {
+        }
+
+        ///<summary>
+        /// GridHeader
+        ///</summary>
+        ///<param name="text"></param>
+        public GridGroupByRow(string text)
+            : base(text)
+        {
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region AllowUserSort
+
+        ///<summary>
+        /// Gets or sets whether the user can change the group
+        /// sort direction by clicking on the associated GroupBox
+        ///</summary>
+        [DefaultValue(true), Category("Behavior")]
+        [Description("Indicates whether the user can change the group sort direction by clicking on the associated GroupBox.")]
+        public bool AllowUserSort
+        {
+            get { return (_AllowUserSort); }
+
+            set
+            {
+                if (_AllowUserSort != value)
+                {
+                    _AllowUserSort = value;
+
+                    OnPropertyChanged("AllowUserSort");
+                }
+            }
+        }
+
+        #endregion
+
+        #region CornerRadius
+
+        ///<summary>
+        /// Gets or sets the corner radius to
+        /// use when GroupBoxStyle is RoundedRectangular
+        ///</summary>
+        [DefaultValue(5), Category("Behavior")]
+        [Description("Indicates the corner radius to use when GroupBoxStyle is RoundedRectangular.")]
+        public int CornerRadius
+        {
+            get { return (_CornerRadius); }
+
+            set
+            {
+                if (_CornerRadius != value)
+                {
+                    _CornerRadius = value;
+
+                    OnPropertyChangedEx("CornerRadius", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region FilterImageVisibility
+
+        /// <summary>
+        /// Gets or sets the visibility of the header filter image
+        /// </summary>
+        [DefaultValue(ImageVisibility.NotSet), Category("Appearance")]
+        [Description("Indicates the visibility of the filter image.")]
+        public ImageVisibility FilterImageVisibility
+        {
+            get { return (_FilterImageVisibility); }
+
+            set
+            {
+                if (_FilterImageVisibility != value)
+                {
+                    _FilterImageVisibility = value;
+
+                    OnPropertyChangedEx("FilterImageVisibility", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region GroupBoxEffects
+
+        /// <summary>
+        /// Gets or sets the default for how columns interact with the GroupBox
+        /// </summary>
+        [DefaultValue(GroupBoxEffects.NotSet), Category("Grouping")]
+        [Description("Indicates the default for how columns interact with the GroupBox.")]
+        public GroupBoxEffects GroupBoxEffects
+        {
+            get { return (_GroupBoxEffects); }
+
+            set
+            {
+                if (_GroupBoxEffects != value)
+                {
+                    _GroupBoxEffects = value;
+
+                    OnPropertyChanged("GroupBoxEffects");
+                }
+            }
+        }
+
+        #endregion
+
+        #region GroupBoxLayout
+
+        /// <summary>
+        /// Gets or sets the group box layout (Flat, Hierarchical) 
+        /// </summary>
+        [DefaultValue(GroupBoxLayout.Hierarchical), Category("Appearance")]
+        [Description("Indicates the group box layout (Flat, Hierarchical)")]
+        public GroupBoxLayout GroupBoxLayout
+        {
+            get { return (_GroupBoxLayout); }
+
+            set
+            {
+                if (_GroupBoxLayout != value)
+                {
+                    _GroupBoxLayout = value;
+
+                    OnPropertyChangedEx("GroupBoxLayout", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region GroupBoxStyle
+
+        /// <summary>
+        /// Gets or sets the group box Style (Rectangular, RoundedRect) 
+        /// </summary>
+        [DefaultValue(GroupBoxStyle.Rectangular), Category("Appearance")]
+        [Description("Indicates the group box Style (Rectangular, RoundedRect)")]
+        public GroupBoxStyle GroupBoxStyle
+        {
+            get { return (_GroupBoxStyle); }
+
+            set
+            {
+                if (_GroupBoxStyle != value)
+                {
+                    _GroupBoxStyle = value;
+
+                    OnPropertyChangedEx("GroupBoxStyle", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region IsEmpty
+
+        /// <summary>
+        /// Gets whether the item is empty
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override bool IsEmpty
+        {
+            get { return (false); }
+        }
+
+        #endregion
+
+        #region MaxGroupBoxWidth
+
+        /// <summary>
+        /// Gets or sets the maximum GroupBox width, in pixels 
+        /// </summary>
+        [DefaultValue(200), Category("Appearance")]
+        [Description("Indicates the maximum GroupBox width, in pixels.")]
+        public int MaxGroupBoxWidth
+        {
+            get { return (_MaxGroupBoxWidth); }
+
+            set
+            {
+                if (_MaxGroupBoxWidth != value)
+                {
+                    _MaxGroupBoxWidth = value;
+
+                    OnPropertyChangedEx("MaxGroupBoxWidth", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region RemoveGroupOnDoubleClick
+
+        ///<summary>
+        /// Gets or sets whether the grouping column is removed
+        /// when the user double clicks on the associated GroupBox
+        ///</summary>
+        [DefaultValue(true), Category("Behavior")]
+        [Description("Indicates whether the grouping column is removed when the user double clicks on the associated GroupBox.")]
+        public bool RemoveGroupOnDoubleClick
+        {
+            get { return (_RemoveGroupOnDoubleClick); }
+
+            set
+            {
+                if (_RemoveGroupOnDoubleClick != value)
+                {
+                    _RemoveGroupOnDoubleClick = value;
+
+                    OnPropertyChanged("RemoveGroupOnDoubleClick");
+                }
+            }
+        }
+
+        #endregion
+
+        #region Visible
+
+        /// <summary>
+        /// Visible
+        /// </summary>
+        [DefaultValue(false), Category("Appearance")]
+        [Description("Indicates whether the item is visible")]
+        public override bool Visible
+        {
+            get { return (_Visible); }
+
+            set
+            {
+                if (_Visible != value)
+                {
+                    _Visible = value;
+
+                    OnPropertyChangedEx("Visible", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region UseColumnHeaderColors
+
+        ///<summary>
+        /// Gets or sets whether Column Header color definitions are used
+        ///</summary>
+        [DefaultValue(true), Category("Appearance")]
+        [Description("Indicates whether Column Header color definitions are used")]
+        public bool UseColumnHeaderColors
+        {
+            get { return (_UseColumnHeaderColors); }
+
+            set
+            {
+                if (_UseColumnHeaderColors != value)
+                {
+                    _UseColumnHeaderColors = value;
+
+                    OnPropertyChangedEx("UseColumnHeaderColors", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region WatermarkText
+
+        /// <summary>
+        /// Gets or sets the Watermark text to use when no Grouping is active 
+        /// </summary>
+        [DefaultValue(null), Category("Appearance")]
+        [Description("Indicates the Watermark text to use when no Grouping is active")]
+        public string WatermarkText
+        {
+            get { return (_WatermarkText); }
+
+            set
+            {
+                if (_WatermarkText != value)
+                {
+                    _WatermarkText = value;
+
+                    OnPropertyChangedEx("WatermarkText", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #region GetWatermarkText
+
+        private string GetWatermarkText()
+        {
+            return (_WatermarkText ?? SuperGrid.GroupByWaterMarkText);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region Private properties
+
+        #region InsertMarker
+
+        private Image InsertMarker
+        {
+            get
+            {
+                if (_InsertMarker == null)
+                    _InsertMarker = CreateInsertMarker();
+
+                return (_InsertMarker);
+            }
+
+            set
+            {
+                if (_InsertMarker != null)
+                    _InsertMarker.Dispose();
+
+                _InsertMarker = value;
+            }
+        }
+
+        #region CreateInsertMarker
+
+        private Image CreateInsertMarker()
+        {
+            GroupByVisualStyle style = (GroupByVisualStyle)GetEffectiveStyle();
+
+            Image image = new Bitmap(MarkerWidth, MarkerHeight);
+
+            using (Graphics g = Graphics.FromImage(image))
+            {
+                Point[] pts =
+                    {
+                        new Point(0, 0),
+                        new Point(MarkerWidth - 1, 0),
+                        new Point(MarkerHeight - 1, MarkerHeight - 1),
+                        new Point(0, 0),
+                    };
+
+                using (GraphicsPath path = new GraphicsPath())
+                {
+                    path.AddLines(pts);
+
+                    Rectangle r = new Rectangle(0, 0, MarkerWidth, MarkerHeight);
+
+                    using (Brush br = style.InsertMarkerBackground.GetBrush(r))
+                        g.FillPath(br, path);
+
+                    using (Pen pen = new Pen(style.InsertMarkerBorderColor))
+                        g.DrawPath(pen, path);
+                }
+            }
+
+            return (image);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region MeasureRow
+
+        /// <summary>
+        /// MeasureRow
+        /// </summary>
+        /// <param name="layoutInfo"></param>
+        /// <param name="stateInfo"></param>
+        /// <param name="constraintSize"></param>
+        /// <returns></returns>
+        protected override Size MeasureRow(
+            GridLayoutInfo layoutInfo, GridLayoutStateInfo stateInfo, Size constraintSize)
+        {
+            Size sizeNeeded = base.MeasureRow(layoutInfo, stateInfo, constraintSize);
+
+            GridPanel panel = stateInfo.GridPanel;
+
+            int height = GetGroupByHeight(panel);
+
+            if (RowHeight == 0)
+            {
+                int n = Dpi.Height(DefaultMinRowHeight);
+
+                if (height < n)
+                    height = n;
+            }
+
+            if (height > sizeNeeded.Height)
+                sizeNeeded.Height = height;
+
+            return (sizeNeeded);
+        }
+
+        #region GetGroupByHeight
+
+        private int GetGroupByHeight(GridPanel panel)
+        {
+            if (_GroupBoxes == null)
+                _GroupBoxes = new List<GridGroupBox>();
+            else
+                _GroupBoxes.Clear();
+
+            GridGroupBox box = new GridGroupBox(this, null);
+            _GroupBoxes.Add(box);
+
+            int rowHeight = (GroupBoxLayout == GroupBoxLayout.Hierarchical)
+                                ? GetHierarchicalHeight(panel)
+                                : GetFlatHeight(panel);
+
+            rowHeight += Dpi.Height(MarkerVPad * 2);
+
+            TextRowVisualStyle tstyle = GetEffectiveStyle();
+
+            rowHeight += Dpi.Height(tstyle.BorderThickness.Vertical +
+                tstyle.Padding.Vertical + tstyle.Margin.Vertical);
+
+            return (rowHeight);
+        }
+
+        #region GetHierarchicalHeight
+
+        private int GetHierarchicalHeight(GridPanel panel)
+        {
+            int rowHeight = 0;
+            int lastHeight = 0;
+
+            foreach (GridColumn column in panel.GroupColumns)
+            {
+                GridGroupBox box = new GridGroupBox(this, column);
+
+                box.GroupBoxStyle = GroupBoxStyle;
+                box.CornerRadius = CornerRadius;
+
+                _GroupBoxes.Add(box);
+
+                Size size = GetGroupBoxSize(box);
+
+                if (rowHeight == 0)
+                {
+                    rowHeight = size.Height;
+                }
+                else
+                {
+                    if (size.Height > lastHeight)
+                        rowHeight += (size.Height - lastHeight / 2);
+                    else
+                        rowHeight += (size.Height / 2);
+                }
+
+                lastHeight = size.Height;
+            }
+
+            return (rowHeight);
+        }
+
+        #endregion
+
+        #region GetFlatHeight
+
+        private int GetFlatHeight(GridPanel panel)
+        {
+            int rowHeight = 0;
+
+            foreach (GridColumn column in panel.GroupColumns)
+            {
+                GridGroupBox box = new GridGroupBox(this, column);
+
+                box.GroupBoxStyle = GroupBoxStyle;
+                box.CornerRadius = CornerRadius;
+
+                _GroupBoxes.Add(box);
+
+                Size size = GetGroupBoxSize(box);
+
+                if (size.Height > rowHeight)
+                    rowHeight = size.Height;
+            }
+
+            return (rowHeight);
+        }
+
+        #endregion
+
+        #region GetGroupBoxSize
+
+        private Size GetGroupBoxSize(GridGroupBox box)
+        {
+            Size size = new Size();
+
+            size.Width = box.Column.HeaderTextSize.Width + Dpi.Width(TextHPad);
+            size.Height = box.Column.HeaderTextSize.Height + Dpi.Height(TextVPad);
+
+            box.ContentSize = size;
+
+            SuperGrid.DoConfigureGroupBoxEvent(this, box);
+
+            size = box.ContentSize;
+
+            size.Width += Dpi.Width(box.Padding.Horizontal);
+            size.Height += Dpi.Height(box.Padding.Vertical);
+
+            int n = Dpi.Width(_MaxGroupBoxWidth);
+
+            if (size.Width > n)
+                size.Width = n;
+
+            size.Width += Dpi.Width(MarkerHPad + TextHPad);
+
+            if (size.Width < Dpi.Width20)
+                size.Width = Dpi.Width20;
+
+            if (size.Height < Dpi.Height15)
+                size.Height = Dpi.Height15;
+
+            box.RelativeBounds = new Rectangle(Point.Empty, size);
+
+            return (size);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region ArrangeRow
+
+        /// <summary>
+        /// ArrangeRow
+        /// </summary>
+        /// <param name="layoutInfo"></param>
+        /// <param name="stateInfo"></param>
+        /// <param name="layoutBounds"></param>
+        /// <returns></returns>
+        protected override Size ArrangeRow(GridLayoutInfo layoutInfo,
+            GridLayoutStateInfo stateInfo, Rectangle layoutBounds)
+        {
+            UpdateGroupBoxes(stateInfo.GridPanel, layoutBounds);
+
+            return (base.ArrangeRow(layoutInfo, stateInfo, layoutBounds));
+        }
+
+        #region UpdateGroupBoxes
+
+        private void UpdateGroupBoxes(GridPanel panel, Rectangle r)
+        {
+            TextRowVisualStyle tstyle = GetEffectiveStyle();
+
+            r = GetAdjustedBounds(tstyle, r);
+            r.Size = Size.Empty;
+
+            if (CanShowRowHeader(panel) == true)
+                r.X += panel.RowHeaderWidthEx;
+
+            r.X += Dpi.Width(MarkerWidth - MarkerHPad);
+            r.Y += Dpi.Height(MarkerVPad - MarkerHeight + TextPad);
+
+            GridGroupBox box = _GroupBoxes[0];
+            box.RelativeBounds = r;
+
+            int lastHeight = Dpi.Width(MarkerHeight);
+            int midline = Bounds.Y + Bounds.Height / 2 - 1;
+
+            for (int i = 1; i < _GroupBoxes.Count; i++)
+            {
+                box = _GroupBoxes[i];
+
+                r.X += (r.Width + Dpi.Width(BoxSpacing));
+                r.Size = box.RelativeBounds.Size;
+
+                if (GroupBoxLayout == GroupBoxLayout.Hierarchical)
+                {
+                    r.Y += (r.Height > lastHeight)
+                        ? lastHeight / 2 : lastHeight - r.Height / 2;
+                }
+                else
+                {
+                    r.Y = midline - (r.Height / 2);
+                }
+
+                UpdateGroupBoxRects(panel, box, ref r);
+
+                lastHeight = r.Height;
+            }
+
+            _AfterGroupBox = null;
+        }
+
+        #region UpdateGroupBoxRects
+
+        private void UpdateGroupBoxRects(
+            GridPanel panel, GridGroupBox box, ref Rectangle r)
+        {
+            Rectangle t = r;
+
+            Rectangle ts = GetSortImageBounds(panel, box.Column, t);
+            Rectangle tf = GetFilterImageBounds(panel, box.Column, t);
+
+            if (ts.Width > 0)
+                r.Width += (ts.Width + TextPad);
+
+            if (tf.Width > 0)
+                r.Width += (tf.Width + TextPad);
+
+            r.Width += 3;
+
+            box.RelativeBounds = r;
+
+            if (tf.IsEmpty == false && ts.IsEmpty == false)
+            {
+                if (ts.X == tf.X)
+                {
+                    if (tf.X < r.X + r.Width / 2)
+                        tf.X += ts.Width + TextPad;
+                    else
+                        ts.X += tf.Width + TextPad;
+                }
+                else
+                {
+                    if (tf.X < r.X + r.Width / 2)
+                        ts.X = r.Right - (ts.Width + TextPad);
+                    else
+                        tf.X = r.Right - (tf.Width + TextPad);
+                }
+            }
+            else
+            {
+                if (ts.Width > 0 && ts.X > r.X + r.Width / 2)
+                    ts.X = r.Right - (ts.Width + TextPad);
+
+                if (tf.Width > 0 && tf.X > r.X + r.Width / 2)
+                    tf.X = r.Right - (tf.Width + TextPad);
+            }
+
+            box.FilterImageRelBounds = tf;
+            box.SortImageRelBounds = ts;
+        }
+
+        #region GetSortImageBounds
+
+        private Rectangle GetSortImageBounds(
+            GridPanel panel, GridColumn column, Rectangle r)
+        {
+            if (AllowUserSort == true)
+            {
+                Image sortImage = panel.ColumnHeader.GetColumnSortImage(panel, column);
+
+                if (sortImage != null)
+                {
+                    Alignment alignment = (panel.ColumnHeader.SortImageAlignment == Alignment.NotSet)
+                        ? Alignment.MiddleLeft : panel.ColumnHeader.SortImageAlignment;
+
+                    return (GetImageBoundsEx(sortImage, alignment, r));
+                }
+            }
+
+            return (Rectangle.Empty);
+        }
+
+        #endregion
+
+        #region GetFilterImageBounds
+
+        private Rectangle GetFilterImageBounds(
+            GridPanel panel, GridColumn column, Rectangle r)
+        {
+            Image filterImage = null;
+
+            switch (_FilterImageVisibility)
+            {
+                case ImageVisibility.Auto:
+                case ImageVisibility.Always:
+                    if (column.IsFilteringEnabled == true)
+                        filterImage = panel.ColumnHeader.GetFilterImage(column);
+                    break;
+
+                case ImageVisibility.NotSet:
+                    filterImage = panel.ColumnHeader.GetColumnFilterImage(column);
+                    break;
+            }
+
+            if (filterImage != null)
+            {
+                Alignment alignment = panel.ColumnHeader.FilterImageAlignment;
+
+                if (alignment == Alignment.NotSet)
+                    alignment = Alignment.MiddleLeft;
+
+                return (GetImageBoundsEx(filterImage, alignment, r));
+            }
+
+            return (Rectangle.Empty);
+        }
+
+        #endregion
+
+        #region GetImageBoundsEx
+
+        private Rectangle GetImageBoundsEx(
+            Image image, Alignment alignment, Rectangle r)
+        {
+            Rectangle t = r;
+            t.Size = image.Size;
+
+            t.X += Dpi.Width6;
+            t.Y += (r.Height - t.Height) / 2;
+
+            switch (alignment)
+            {
+                case Alignment.TopLeft:
+                case Alignment.MiddleLeft:
+                case Alignment.BottomLeft:
+                    break;
+
+                default:
+                    t.X = r.Right + Dpi.Width3;
+                    break;
+            }
+
+            return (t);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region RenderRow
+
+        /// <summary>
+        /// RenderRow
+        /// </summary>
+        /// <param name="renderInfo"></param>
+        /// <param name="panel"></param>
+        /// <param name="r"></param>
+        protected override void RenderRow(
+            GridRenderInfo renderInfo, GridPanel panel, Rectangle r)
+        {
+            base.RenderRow(renderInfo, panel, r);
+
+            Graphics g = renderInfo.Graphics;
+
+            if (CanShowRowHeader(panel) == true)
+            {
+                r.X += panel.RowHeaderWidthEx;
+                r.Width -= panel.RowHeaderWidthEx;
+            }
+
+            Region oldClip = g.Clip;
+
+            try
+            {
+                g.SetClip(r, CombineMode.Intersect);
+
+                if (_GroupBoxes.Count > 1)
+                {
+                    GridPanelVisualStyle pstyle = panel.GetEffectiveStyle();
+                    GridGroupBox lastBox = null;
+
+                    foreach (GridGroupBox box in _GroupBoxes)
+                    {
+                        if (box.Column != null)
+                        {
+                            RenderGroupBox(panel, box, lastBox, g, pstyle);
+                            lastBox = box;
+                        }
+                    }
+                }
+                else
+                {
+                    RenderWaterMarkText(panel, g);
+                }
+            }
+            finally
+            {
+                g.Clip = oldClip;
+            }
+
+            if (_InsertRect.IsEmpty == false)
+                g.DrawImageUnscaled(InsertMarker, _InsertRect);
+        }
+
+        #region RenderGroupBox
+
+        private void RenderGroupBox(GridPanel panel,
+            GridGroupBox box, GridGroupBox lastBox, Graphics g, GridPanelVisualStyle pstyle)
+        {
+            StyleType type = GetGroupByStyleType(box);
+
+            ColumnHeaderVisualStyle cstyle = panel.ColumnHeader.GetEffectiveStyle(box.Column, type);
+            GroupByVisualStyle style = GetGroupByEffectiveStyle(box);
+
+            Rectangle r = box.Bounds;
+
+            if (r.Width > 0 && r.Height > 0)
+            {
+                if (SuperGrid.DoPreRenderGroupBoxEvent(g,
+                    this, box, RenderParts.Background, r) == false)
+                {
+                    int radius = GetCornerRadius(box);
+
+                    if (radius > 0 && box.GroupBoxStyle == GroupBoxStyle.RoundedRectangular)
+                        RenderRoundedBox(g, style, cstyle, pstyle, lastBox, box, radius);
+                    else
+                        RenderRectBox(g, style, cstyle, pstyle, lastBox, box);
+
+                    SuperGrid.DoPostRenderGroupBoxEvent(g,
+                        this, box, RenderParts.Background, r);
+                }
+
+                Rectangle t = r;
+
+                RenderSortImage(g, panel, box, ref t);
+                RenderFilterImage(g, panel, box, ref t);
+
+                int n = box.Padding.Left + TextHPad;
+
+                t.X += n;
+                t.Width -= n;
+
+                if (t.Width - box.ContentSize.Width > 0)
+                    t.Width = box.ContentSize.Width;
+
+                if (SuperGrid.DoPreRenderGroupBoxEvent(g,
+                    this, box, RenderParts.Content, t) == false)
+                {
+                    Rectangle t2 = t;
+
+                    t.Y += box.Padding.Top;
+                    t.Height = box.Column.HeaderTextSize.Height + 6;
+
+                    RenderText(g, box.Column, style, cstyle, t);
+
+                    SuperGrid.DoPostRenderGroupBoxEvent(g,
+                        this, box, RenderParts.Content, t2);
+                }
+            }
+        }
+
+        #region GetCornerRadius
+
+        internal int GetCornerRadius(GridGroupBox box)
+        {
+            int maxRadius = Math.Min(
+                box.RelativeBounds.Width, box.RelativeBounds.Height) / 2;
+
+            int radius = Math.Min(box.CornerRadius, maxRadius);
+
+            return (radius > 0 ? radius : 0);
+        }
+
+        #endregion
+
+        #region RenderRoundedBox
+
+        private void RenderRoundedBox(Graphics g, GroupByVisualStyle style,
+            ColumnHeaderVisualStyle cstyle, GridPanelVisualStyle pstyle,
+            GridGroupBox leftBox, GridGroupBox box, int radius)
+        {
+            Rectangle r = box.Bounds;
+
+            using (GraphicsPath path = GetRoundedPath(r, radius))
+            {
+                SmoothingMode sm = g.SmoothingMode;
+                g.SmoothingMode = SmoothingMode.AntiAlias;
+
+                if (_UseColumnHeaderColors == true)
+                {
+                    using (Brush br = cstyle.Background.GetBrush(r))
+                        g.FillPath(br, path);
+
+                    using (Pen pen = new Pen(pstyle.HeaderLineColor))
+                        g.DrawPath(pen, path);
+                }
+                else
+                {
+                    using (Brush br = style.GroupBoxBackground.GetBrush(r))
+                        g.FillPath(br, path);
+
+                    using (Pen pen = new Pen(style.GroupBoxBorderColor))
+                        g.DrawPath(pen, path);
+                }
+
+                if (leftBox != null)
+                {
+                    Region oldClip = g.Clip;
+                    Region newClip = new Region(Bounds);
+
+                    newClip.Exclude(path);
+
+                    g.SetClip(newClip, CombineMode.Intersect);
+
+                    try
+                    {
+                        if (SuperGrid.DoPreRenderGroupBoxConnectorEvent(g, this, leftBox, box) == false)
+                        {
+                            RenderBoxConnector(g, style, leftBox.Bounds, box.Bounds, true);
+
+                            SuperGrid.DoPostRenderGroupBoxConnectorEvent(g, this, leftBox, box);
+                        }
+                    }
+                    finally
+                    {
+                        g.Clip = oldClip;
+                    }
+                }
+
+                g.SmoothingMode = sm;
+            }
+        }
+
+        #region GetRoundedPath
+
+        private GraphicsPath GetRoundedPath(Rectangle r, int radius)
+        {
+            int diameter = radius << 1;
+
+            Rectangle t = r;
+            t.Size = new Size(diameter, diameter);
+
+            GraphicsPath path = new GraphicsPath();
+            path.AddArc(t, 180, 90);
+
+            t.X = r.Right - diameter;
+            path.AddArc(t, 270, 90);
+
+            t.Y = r.Bottom - diameter;
+            path.AddArc(t, 0, 90);
+
+            t.X = r.X;
+            path.AddArc(t, 90, 90);
+
+            path.CloseAllFigures();
+
+            return (path);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderRectBox
+
+        private void RenderRectBox(Graphics g, GroupByVisualStyle style,
+            ColumnHeaderVisualStyle cstyle, GridPanelVisualStyle pstyle,
+            GridGroupBox leftBox, GridGroupBox box)
+        {
+            Rectangle r = box.Bounds;
+
+            if (_UseColumnHeaderColors == true)
+            {
+                using (Brush br = cstyle.Background.GetBrush(r))
+                    g.FillRectangle(br, r);
+
+                using (Pen pen = new Pen(pstyle.HeaderLineColor))
+                    g.DrawRectangle(pen, r);
+            }
+            else
+            {
+                using (Brush br = style.GroupBoxBackground.GetBrush(r))
+                    g.FillRectangle(br, r);
+
+                using (Pen pen = new Pen(style.GroupBoxBorderColor))
+                    g.DrawRectangle(pen, r);
+            }
+
+            if (leftBox != null)
+            {
+                if (SuperGrid.DoPreRenderGroupBoxConnectorEvent(g, this, leftBox, box) == false)
+                {
+                    RenderBoxConnector(g, style, leftBox.Bounds, r, false);
+
+                    SuperGrid.DoPostRenderGroupBoxConnectorEvent(g, this, leftBox, box);
+                }
+            }
+        }
+
+        #endregion
+
+        #region RenderBoxConnector
+
+        private void RenderBoxConnector(Graphics g,
+            GroupByVisualStyle style, Rectangle l, Rectangle r, bool extend)
+        {
+            using (Pen pen = new Pen(style.GroupBoxConnectorColor))
+            {
+                if (GroupBoxLayout == GroupBoxLayout.Hierarchical)
+                {
+                    Point pt1 = new Point(l.X + l.Width / 2, l.Bottom + 1);
+                    Point pt2 = new Point(pt1.X, l.Bottom + (r.Bottom - l.Bottom) / 2);
+                    Point pt3 = new Point(r.X + (extend ? 10 : -1), pt2.Y);
+
+                    g.DrawLines(pen, new Point[] { pt1, pt2, pt3 });
+                }
+                else
+                {
+                    Point pt1 = new Point(l.Right + 1, l.Y + l.Height / 2 + 1);
+                    Point pt2 = new Point(r.X - 1, pt1.Y);
+
+                    g.DrawLine(pen, pt1, pt2);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Render Filter/Sort Image
+
+        #region RenderSortImage
+
+        private void RenderSortImage(
+            Graphics g, GridPanel panel, GridGroupBox box, ref Rectangle t)
+        {
+            GridColumn column = box.Column;
+            Rectangle bounds = box.SortImageBounds;
+
+            if (bounds.IsEmpty == false)
+            {                
+                Image sortImage =
+                    panel.ColumnHeader.GetColumnSortImage(panel, column);
+
+                RenderImage(g, sortImage, bounds, ref t);
+            }
+        }
+
+        #endregion
+
+        #region RenderFilterImage
+
+        private void RenderFilterImage(
+            Graphics g, GridPanel panel, GridGroupBox box, ref Rectangle t)
+        {
+            GridColumn column = box.Column;
+            Rectangle bounds = box.FilterImageBounds;
+
+            if (bounds.IsEmpty == false)
+            {
+                if (CanShowFilterImage(panel, box) == true)
+                {
+                    bool inFilter;
+                    StyleState state = GetFilterImageState(box, out inFilter);
+
+                    Image filterImage =
+                        panel.ColumnHeader.GetFilterImage(column, state, inFilter);
+
+                    RenderImage(g, filterImage, bounds, ref t);
+                }
+            }
+        }
+
+        #region CanShowFilterImage
+
+        private bool CanShowFilterImage(GridPanel panel, GridGroupBox box)
+        {
+            switch (_FilterImageVisibility)
+            {
+                case ImageVisibility.Auto:
+                    if (box.Column.IsFilteringEnabled == true)
+                    {
+                        if (string.IsNullOrEmpty(box.Column.FilterExpr) == false)
+                            return (true);
+
+                        return (_Dragging == false && box.IsEqualTo(_HitGroupBox) == true);
+                    }
+                    break;
+
+                case ImageVisibility.Always:
+                    if (box.Column.IsFilteringEnabled == true)
+                        return (true);
+                    break;
+
+                case ImageVisibility.NotSet:
+
+                    switch (panel.ColumnHeader.FilterImageVisibility)
+                    {
+                        case ImageVisibility.Always:
+                            return (true);
+
+                        case ImageVisibility.Never:
+                            return (false);
+
+                        case ImageVisibility.Auto:
+                            if (string.IsNullOrEmpty(box.Column.FilterExpr) == false)
+                                return (true);
+
+                            return (_Dragging == false && box.IsEqualTo(_HitGroupBox) == true);
+                    }
+                    break;
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region GetFilterImageState
+
+        private StyleState GetFilterImageState(GridGroupBox box, out bool inFilter)
+        {
+            inFilter = false;
+
+            StyleState state = StyleState.Default;
+
+            if (box.IsEqualTo(_HitGroupBox) == true)
+            {
+                state = StyleState.MouseOver;
+
+                if (_HitArea == HeaderArea.InFilterMenu)
+                    inFilter = true;
+            }
+
+            if (string.IsNullOrEmpty(box.Column.FilterExpr) == false)
+                state |= StyleState.Selected;
+
+            return (state);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderImage
+
+        private void RenderImage(Graphics g,
+            Image image, Rectangle r, ref Rectangle t)
+        {
+            if (image != null)
+            {
+                g.DrawImageUnscaledAndClipped(image, r);
+
+                if (r.X < t.X + t.Width / 2)
+                {
+                    int n = t.Right - r.Right;
+
+                    t.X = r.Right;
+                    t.Width = n;
+                }
+                else
+                {
+                    int n = t.Right - r.Left;
+
+                    t.Width -= n;
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderText
+
+        private void RenderText(Graphics g, GridColumn column,
+            GroupByVisualStyle style, ColumnHeaderVisualStyle cstyle, Rectangle bounds)
+        {
+            string s = column.GetHeaderText();
+
+            if (s != null)
+            {
+                if (column.HeaderTextMarkup != null)
+                {
+                    RenderTextMarkup(g, column.HeaderTextMarkup, cstyle, bounds);
+                }
+                else
+                {
+                    if (_UseColumnHeaderColors == true)
+                    {
+                        eTextFormat tf = cstyle.GetTextFormatFlags();
+
+                        TextDrawing.DrawString(g, s,
+                            cstyle.Font, cstyle.TextColor, bounds, tf);
+                    }
+                    else
+                    {
+                        eTextFormat tf = style.GetTextFormatFlags();
+
+                        TextDrawing.DrawString(g, s,
+                            cstyle.Font, style.GroupBoxTextColor, bounds, tf);
+                    }
+                }
+            }
+        }
+
+        #region RenderTextMarkup
+
+        private void RenderTextMarkup(Graphics g,
+            BodyElement textMarkup, CellVisualStyle style, Rectangle r)
+        {
+            MarkupDrawContext d =
+                new MarkupDrawContext(g, style.Font, style.TextColor, false);
+
+            textMarkup.Arrange(new Rectangle(r.Location, r.Size), d);
+
+            Size size = textMarkup.Bounds.Size;
+
+            switch (style.Alignment)
+            {
+                case Alignment.MiddleLeft:
+                case Alignment.MiddleCenter:
+                case Alignment.MiddleRight:
+                    if (r.Height > size.Height)
+                        r.Y += (r.Height - size.Height) / 2;
+                    break;
+
+                default:
+                    if (r.Height > size.Height)
+                        r.Y = r.Bottom - size.Height;
+                    break;
+            }
+
+            textMarkup.Bounds = new Rectangle(r.Location, size);
+
+            Region oldClip = g.Clip;
+
+            try
+            {
+                g.SetClip(r, CombineMode.Intersect);
+
+                textMarkup.Render(d);
+            }
+            finally
+            {
+                g.Clip = oldClip;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderWaterMarkText
+
+        private void RenderWaterMarkText(GridPanel panel, Graphics g)
+        {
+            if (AllowSelection == true)
+            {
+                string s = GetWatermarkText();
+
+                if (string.IsNullOrEmpty(s) == false)
+                {
+                    GroupByVisualStyle style = (GroupByVisualStyle)GetEffectiveStyle();
+                    Rectangle t = GetAdjustedBounds(style, Bounds);
+
+                    if (CanShowRowHeader(panel) == true)
+                    {
+                        t.X += panel.RowHeaderWidthEx;
+                        t.Width -= panel.RowHeaderWidthEx;
+                    }
+
+                    TextDrawing.DrawString(g, s, style.WatermarkFont, style.WatermarkTextColor,
+                        t, eTextFormat.VerticalCenter | eTextFormat.Left);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GroupBoxWindowPaint
+
+        void GroupBoxWindowPaint(object sender, PaintEventArgs e)
+        {
+            GridPanel panel = GridPanel;
+            GridPanelVisualStyle pstyle = panel.GetEffectiveStyle();
+
+            RenderGroupBox(panel,
+                (GridGroupBox)_GroupBoxWindow.Tag, null, e.Graphics, pstyle);
+        }
+
+        #endregion
+
+        #region Mouse support
+
+        #region InternalMouseLeave
+
+        internal override void InternalMouseLeave(EventArgs e)
+        {
+            base.InternalMouseLeave(e);
+
+            if (_LockedColumn == false)
+                _HitGroupBox = null;
+        }
+
+        #endregion
+
+        #region InternalMouseMove
+
+        internal override void InternalMouseMove(MouseEventArgs e)
+        {
+            base.InternalMouseMove(e);
+
+            SuperGrid.GridCursor = Cursors.Default;
+
+            if (AllowSelection == true)
+            {
+                Point pt = e.Location;
+
+                _LastHitArea = _HitArea;
+                _LastHitGroupBox = _HitGroupBox;
+
+                _HitGroupBox = GetGroupBoxAt(pt);
+                _HitArea = GetHitArea(pt);
+
+                if (IsMouseDown == true)
+                {
+                    if (_Dragging == true)
+                    {
+                        DragContinue(pt);
+                    }
+                    else if (_MouseDownHitBox != null)
+                    {
+                        if (Math.Abs(MouseDownPoint.X - pt.X) > 5 ||
+                            Math.Abs(MouseDownPoint.Y - pt.Y) > 5)
+                        {
+                            DragStart(_MouseDownHitBox.Column);
+                        }
+                    }
+                }
+                else
+                {
+                    switch (_HitArea)
+                    {
+                        case HeaderArea.InFilterMenu:
+                            SuperGrid.GridCursor = Cursors.Hand;
+                            break;
+
+                        default:
+                            SuperGrid.GridCursor = Cursors.Default;
+                            break;
+                    }
+                }
+
+                if (_HitArea != _LastHitArea || _LastHitGroupBox != _HitGroupBox)
+                {
+                    if (_LastHitGroupBox != null)
+                        InvalidateRender(_LastHitGroupBox.Bounds);
+
+                    if (_HitGroupBox != null)
+                    {
+                        if ((_LastHitGroupBox != _HitGroupBox) ||
+                            (_HitArea == HeaderArea.InFilterMenu || _LastHitArea == HeaderArea.InFilterMenu))
+                        {
+                            InvalidateRender(_HitGroupBox.Bounds);
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region InternalMouseDown
+
+        internal override void InternalMouseDown(MouseEventArgs e)
+        {
+            base.InternalMouseDown(e);
+
+            if (e.Button == MouseButtons.Left)
+            {
+                _MouseDownHitBox = _HitGroupBox;
+
+                if (_MouseDownHitBox != null)
+                {
+                    Capture = true;
+
+                    if (_HitGroupBox.FilterImageRelBounds.Contains(e.Location) == true)
+                        ProcessFilterHit(_MouseDownHitBox);
+                    else
+                        ProcessContentHit();
+
+                    InvalidateRender(_MouseDownHitBox.Bounds);
+                }
+            }
+        }
+
+        #region ProcessContentHit
+
+        private void ProcessContentHit()
+        {
+            _Dragging = false;
+        }
+
+        #endregion
+
+        #region ProcessFilterHit
+
+        private bool _LockedColumn = true;
+
+        private void ProcessFilterHit(GridGroupBox box)
+        {
+            if (_FilterMenu != null)
+                _FilterMenu.Dispose();
+
+            _LockedColumn = true;
+
+            _FilterMenu = new FilterPopup(GridPanel);
+
+            _FilterMenu.ActivatePopup(box.Column, box.FilterImageRelBounds, ResetState);
+        }
+
+        #endregion
+
+        #region ResetState
+
+        internal void ResetState()
+        {
+            _HitGroupBox = null;
+            _LockedColumn = false;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InternalMouseUp
+
+        internal override void InternalMouseUp(MouseEventArgs e)
+        {
+            base.InternalMouseUp(e);
+
+            GridPanel panel = GridPanel;
+
+            if (_GroupBoxWindow != null)
+            {
+                GridGroupBox box = (GridGroupBox)_GroupBoxWindow.Tag;
+
+                if (_AfterGroupBox != null)
+                {
+                    int index = _GroupBoxes.IndexOf(_AfterGroupBox);
+
+                    if (box.Column.GroupBoxEffectsEx == GroupBoxEffects.Move)
+                        box.Column.Visible = false;
+
+                    panel.InsertGroup(box.Column, index);
+                }
+                else if (box.Column.GroupBoxEffectsEx != GroupBoxEffects.None)
+                {
+                    if (_HitColumn != null)
+                    {
+                        box.Column.Visible = true;
+
+                        if (_HitColumn != box.Column)
+                            ReorderColumn(panel, box.Column);
+
+                        panel.RemoveGroup(box.Column);
+
+                        panel.NeedsSorted = true;
+                    }
+                }
+
+                DragEnd();
+            }
+            else
+            {
+                if (_HitGroupBox != null && _HitGroupBox == _MouseDownHitBox)
+                {
+                    if (_HitArea == HeaderArea.InContent)
+                    {
+                        if (panel.IsSortable == true && _AllowUserSort == true)
+                        {
+                            if ((Control.ModifierKeys & Keys.Control) != Keys.Control)
+                            {
+                                panel.ColumnHeader.SortColumn(panel, _HitGroupBox.Column);
+
+                                SuperGrid.PostInternalMouseMove();
+                            }
+                        }
+                    }
+                }
+            }
+
+            if (_MouseDownHitBox != null)
+            {
+                InvalidateRender(_MouseDownHitBox.Bounds);
+
+                _MouseDownHitBox = null;
+            }
+        }
+
+        #region ReorderColumn
+
+        private void ReorderColumn(GridPanel panel, GridColumn column)
+        {
+            GridColumnCollection columns = panel.Columns;
+
+            int[] map = columns.DisplayIndexMap;
+
+            int curIndex = columns.GetDisplayIndex(column);
+            int sepIndex = columns.GetDisplayIndex(_HitColumn);
+
+            bool isRight = (_InsertRect.X >
+                _HitColumn.Bounds.X + _HitColumn.Bounds.Width / 2);
+
+            if (curIndex > sepIndex && isRight == true && sepIndex < map.Length - 1)
+                sepIndex++;
+
+            else if (curIndex < sepIndex && isRight == false && sepIndex > 0)
+                sepIndex--;
+
+            if (sepIndex != curIndex)
+            {
+                if (sepIndex < curIndex)
+                {
+                    for (int i = curIndex; i > sepIndex; i--)
+                        map[i] = map[i - 1];
+                }
+                else
+                {
+                    for (int i = curIndex; i < sepIndex; i++)
+                        map[i] = map[i + 1];
+                }
+
+                map[sepIndex] = column.ColumnIndex;
+
+                for (int i = 0; i < map.Length; i++)
+                    columns[map[i]].DisplayIndex = i;
+
+                SuperGrid.UpdateStyleCount();
+                SuperGrid.PrimaryGrid.InvalidateRender();
+
+                SuperGrid.DoColumnMovedEvent(panel, column);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InternalMouseDoubleClick
+
+        internal override void InternalMouseDoubleClick(MouseEventArgs e)
+        {
+            base.InternalMouseDoubleClick(e);
+
+            if (_RemoveGroupOnDoubleClick == true)
+            {
+                GridGroupBox box = _HitGroupBox;
+
+                if (box != null && box == _MouseDownHitBox)
+                {
+                    GridPanel panel = GridPanel;
+
+                    if (panel.IsSortable == false || _AllowUserSort == false ||
+                        (Control.ModifierKeys & Keys.Control) == Keys.Control)
+                    {
+                        panel.RemoveGroup(box.Column);
+
+                        panel.NeedsSorted = true;
+
+                        box.Column.Visible = true;
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetHitArea
+
+        /// <summary>
+        /// GetHitArea
+        /// </summary>
+        /// <param name="pt"></param>
+        /// <returns></returns>
+        public override HeaderArea GetHitArea(Point pt)
+        {
+            if (_HitGroupBox != null)
+            {
+                if (_HitGroupBox.FilterImageRelBounds.Contains(pt))
+                    return (HeaderArea.InFilterMenu);
+
+                return (HeaderArea.InContent);
+            }
+
+            HeaderArea area = base.GetHitArea(pt);
+
+            if (area != HeaderArea.InContent)
+                return (area);
+
+            return (HeaderArea.InWhitespace);
+        }
+
+        #endregion
+
+        #region GetAdjustedBounds
+
+        private Rectangle GetAdjustedBounds(TextRowVisualStyle style, Rectangle r)
+        {
+            r.X += (style.BorderThickness.Left + style.Margin.Left + style.Padding.Left);
+            r.Width -= (style.BorderThickness.Horizontal + style.Margin.Horizontal + style.Padding.Horizontal);
+
+            r.Y += (style.BorderThickness.Top + style.Margin.Top + style.Padding.Top);
+            r.Height -= (style.BorderThickness.Vertical + style.Margin.Vertical + style.Padding.Vertical);
+
+            return (r);
+        }
+
+        #endregion
+
+        #region GetScrollBounds
+
+        internal Rectangle GetScrollBounds(Rectangle r)
+        {
+            if (IsVFrozen == false)
+                r.Y -= VScrollOffset;
+
+            r.X -= HScrollOffset;
+
+            return (r);
+        }
+
+        #endregion
+
+        #region GetGroupBoxAt
+
+        ///<summary>
+        /// Gets the GroupBox containing the given point
+        ///</summary>
+        ///<param name="pt"></param>
+        ///<returns>GroupBox, or null</returns>
+        public GridGroupBox GetGroupBoxAt(Point pt)
+        {
+            foreach (GridGroupBox box in _GroupBoxes)
+            {
+                if (box.Bounds.Contains(pt) == true)
+                    return (box);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region FindGroupPartition
+
+        private GridGroupBox FindGroupPartition(Point pt)
+        {
+            for (int i = _GroupBoxes.Count - 1; i >= 0; i--)
+            {
+                GridGroupBox box = _GroupBoxes[i];
+
+                if (pt.X > box.Bounds.X + box.Bounds.Width / 2)
+                    return (box);
+            }
+
+            return (_GroupBoxes[0]);
+        }
+
+        #endregion
+
+        #region Drag support
+
+        #region DragStart
+
+        internal bool DragStart(GridColumn column)
+        {
+            GridPanel panel = GridPanel;
+
+            if (panel.VirtualMode == true)
+                return (false);
+
+            if (AllowSelection == true && panel.ColumnHeader.Visible == true &&
+                column.GroupBoxEffectsEx != GroupBoxEffects.None)
+            {
+                Capture = true;
+
+                _Dragging = true;
+
+                _GroupBoxWindow = new FloatWindow();
+                _GroupBoxWindow.Opacity = .5;
+                _GroupBoxWindow.Owner = SuperGrid.FindForm();
+                _GroupBoxWindow.Paint += GroupBoxWindowPaint;
+
+                GridGroupBox box = new GridGroupBox(this, column);
+
+                box.GroupBoxStyle = GroupBoxStyle;
+                box.CornerRadius = CornerRadius;
+
+                Size size = GetGroupBoxSize(box);
+                Rectangle r = new Rectangle(Point.Empty, size);
+
+                UpdateGroupBoxRects(GridPanel, box, ref r);
+
+                box.RelativeBounds = r;
+                box.IsDragBox = true;
+
+                _GroupBoxWindow.Size = r.Size;
+
+                int radius = GetCornerRadius(box);
+
+                if (radius > 0 && box.GroupBoxStyle == GroupBoxStyle.RoundedRectangular)
+                {
+                    using (GraphicsPath path = GetRoundedPath(r, radius))
+                    {
+                        GraphicsPath cpath = (GraphicsPath)path.Clone();
+
+                        using (Pen pen = new Pen(Color.Black, 2))
+                            cpath.Widen(pen);
+
+                        Region rgn = new Region(path);
+                        rgn.Union(cpath);
+
+                        _GroupBoxWindow.Region = rgn;
+                    }
+                }
+
+                _GroupBoxWindow.Tag = box;
+
+                return (true);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region DragContinue
+
+        private void DragContinue(Point pt)
+        {
+            GridGroupBox box = _GroupBoxWindow.Tag as GridGroupBox;
+
+            if (box != null)
+            {
+                Point ptStart = pt;
+
+                Size size = box.RelativeBounds.Size;
+                size.Width++;
+                size.Height++;
+
+                pt.X -= (size.Width / 2);
+                pt.Y -= (size.Height / 2);
+
+                pt = SuperGrid.PointToScreen(pt);
+
+                Rectangle r = new Rectangle(pt, size);
+
+                _GroupBoxWindow.Bounds = r;
+
+                if (_GroupBoxWindow.Visible == false)
+                    _GroupBoxWindow.Show();
+
+                Rectangle t = GetInsertRect(ptStart);
+
+                if (t.Equals(_InsertRect) == false)
+                {
+                    InvalidateRender(_InsertRect);
+
+                    _InsertRect = t;
+
+                    InvalidateRender(_InsertRect);
+                }
+            }
+        }
+
+        #region GetInsertRect
+
+        private Rectangle GetInsertRect(Point pt)
+        {
+            _HitColumn = null;
+            _AfterGroupBox = null;
+
+            if (Bounds.Contains(pt) == true)
+                return (GetGroupBoxInsertRect(pt));
+
+            return (GetColumnInsertRect(pt));
+        }
+
+        #region GetColumnInsertRect
+
+        private Rectangle GetColumnInsertRect(Point pt)
+        {
+            GridPanel panel = GridPanel;
+
+            if (panel.Bounds.Contains(pt) == true)
+            {
+                if (pt.Y >= Bounds.Bottom && pt.Y < Bounds.Bottom + 50)
+                {
+                    _HitColumn = GetHitColumn(panel, pt);
+
+                    if (_HitColumn == null)
+                        _HitColumn = panel.Columns[0];
+
+                    Rectangle t = Bounds;
+                    Rectangle s = SViewRect;
+
+                    if (panel.ShowRowHeaders == true &&
+                        RowHeaderVisibility != RowHeaderVisibility.Never)
+                    {
+                        t.X += panel.RowHeaderWidthEx;
+                    }
+
+                    t.X += Dpi.Width2;
+                    t.Width = s.Right - t.X - Dpi.Width2;
+
+                    Rectangle r = _HitColumn.Bounds;
+
+                    if (pt.X > r.X + r.Width / 2)
+                        r.X = r.Right;
+
+                    r.X -= (MarkerWidth / 2 + 1);
+                    r.Y = t.Bottom - MarkerHeight - 2;
+
+                    r.Width = MarkerWidth;
+                    r.Height = MarkerHeight;
+
+                    if (r.X < t.X)
+                        r.X = t.X;
+
+                    if (r.X > t.Right - MarkerWidth)
+                        r.X = t.Right - MarkerWidth;
+
+                    return (r);
+                }
+            }
+
+            return (Rectangle.Empty);
+        }
+
+        #region GetHitColumn
+
+        private GridColumn GetHitColumn(GridPanel panel, Point pt)
+        {
+            if (panel.Bounds.Contains(pt) == true)
+            {
+                if (pt.Y >= Bounds.Bottom && pt.Y < Bounds.Bottom + 50)
+                {
+                    if (panel.FirstVisibleColumn != null && pt.X < panel.FirstVisibleColumn.Bounds.X)
+                        return (panel.FirstVisibleColumn);
+
+                    foreach (GridColumn col in panel.Columns)
+                    {
+                        if (col.Visible == true)
+                        {
+                            if (pt.X >= col.Bounds.X && pt.X <= col.Bounds.Right)
+                                return (col);
+                        }
+                    }
+
+                    return (panel.LastVisibleColumn);
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetGroupBoxInsertRect
+
+        private Rectangle GetGroupBoxInsertRect(Point pt)
+        {
+            Rectangle t = Bounds;
+
+            _AfterGroupBox = FindGroupPartition(pt);
+
+            pt = new Point(_AfterGroupBox.Bounds.Right, _AfterGroupBox.Bounds.Y);
+
+            if (GroupBoxLayout == GroupBoxLayout.Flat)
+            {
+                int index = _GroupBoxes.IndexOf(_AfterGroupBox);
+
+                if (index + 1 < _GroupBoxes.Count)
+                {
+                    GridGroupBox beforeBox = _GroupBoxes[index + 1];
+
+                    if (index == 0 || beforeBox.Bounds.Y < pt.Y)
+                        pt.Y = beforeBox.Bounds.Y;
+                }
+
+                pt.X -= 2;
+                pt.Y -= 9;
+
+                if (pt.Y < t.Y + 6)
+                    pt.Y = t.Y + 6;
+            }
+            else
+            {
+                pt.X += 2;
+                pt.Y -= 6;
+
+                if (pt.Y < t.Y + 2)
+                    pt.Y = t.Y + 2;
+            }
+
+            pt.X = Math.Max(pt.X, t.X + 2);
+
+            if (pt.X + MarkerWidth + 2 > ViewRect.Right)
+                pt.X = ViewRect.Right - MarkerWidth - 2;
+
+            return (new Rectangle(pt.X, pt.Y, MarkerWidth, MarkerHeight));
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region DragEnd
+
+        private void DragEnd()
+        {
+            _Dragging = false;
+
+            if (_GroupBoxWindow != null)
+            {
+                _GroupBoxWindow.Close();
+
+                _GroupBoxWindow = null;
+                _MouseDownHitBox = null;
+
+                InvalidateRender(_InsertRect);
+                _InsertRect = Rectangle.Empty;
+
+                SuperGrid.PostInternalMouseMove();
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region CancelCapture
+
+        /// <summary>
+        /// CancelCapture
+        /// </summary>
+        public override void CancelCapture()
+        {
+            if (CapturedItem == this)
+            {
+                Capture = false;
+
+                DragEnd();
+            }
+        }
+
+        #endregion
+
+        #region Style support
+
+        #region GetNewVisualStyle
+
+        /// <summary>
+        /// GetNewVisualStyle
+        /// </summary>
+        /// <returns></returns>
+        protected override TextRowVisualStyle GetNewVisualStyle()
+        {
+            return (new GroupByVisualStyle());
+        }
+
+        #endregion
+
+        #region ApplyStyleEx
+
+        /// <summary>
+        /// ApplyStyleEx
+        /// </summary>
+        /// <param name="style"></param>
+        /// <param name="css"></param>
+        protected override void ApplyStyleEx(TextRowVisualStyle style, StyleType[] css)
+        {
+            GroupByVisualStyle gstyle = style as GroupByVisualStyle;
+
+            if (gstyle != null)
+            {
+                foreach (StyleType cs in css)
+                {
+                    gstyle.ApplyStyle(SuperGrid.BaseVisualStyles.GroupByStyles[cs]);
+                    gstyle.ApplyStyle(SuperGrid.DefaultVisualStyles.GroupByStyles[cs]);
+                    gstyle.ApplyStyle(GridPanel.DefaultVisualStyles.GroupByStyles[cs]);
+                }
+
+                if (gstyle.GroupBoxBorderColor == Color.Empty)
+                    gstyle.GroupBoxBorderColor = Color.Blue;
+
+                if (gstyle.WatermarkTextColor == Color.Empty)
+                    gstyle.WatermarkTextColor = Color.Gray;
+
+                if (gstyle.WatermarkFont == null)
+                    gstyle.WatermarkFont = SystemFonts.DefaultFont;
+            }
+
+            InsertMarker = null;
+        }
+
+        #endregion
+
+        #region GetGroupByEffectiveStyle
+
+        private GroupByVisualStyle GetGroupByEffectiveStyle(GridGroupBox box)
+        {
+            return ((GroupByVisualStyle)
+                GetEffectiveStyle(GetGroupByStyleType(box)));
+        }
+
+        #endregion
+
+        #region GetGroupByStyleType
+
+        private StyleType GetGroupByStyleType(GridGroupBox box)
+        {
+            if (IsMouseDown == true)
+            {
+                Point pt = Control.MousePosition;
+                pt = SuperGrid.PointToClient(pt);
+
+                if (box.FilterImageBounds.Contains(pt) == false)
+                {
+                    if (box.IsDragBox == true || box.IsEqualTo(_MouseDownHitBox))
+                    {
+                        if (box.IsEqualTo(_HitGroupBox) == true)
+                            return (StyleType.SelectedMouseOver);
+
+                        return (StyleType.Selected);
+                    }
+
+                    return (StyleType.Default);
+                }
+            }
+
+            if (box.IsEqualTo(_HitGroupBox) == true)
+                return (StyleType.MouseOver);
+
+            return (StyleType.Default);
+        }
+
+        #endregion
+
+        #endregion
+    }
+
+    #region GridGroupBox
+
+    ///<summary>
+    /// GroupBox definition
+    ///</summary>
+    public class GridGroupBox
+    {
+        #region Private properties
+
+        private GridGroupByRow _GridGroupBy;
+        private GridColumn _Column;
+
+        private Rectangle _RelativeBounds;
+        private Rectangle _SortImageRelBounds;
+        private Rectangle _FilterImageRelBounds;
+
+        private Padding _Padding = new Padding(0);
+        private GroupBoxStyle _GroupBoxStyle = GroupBoxStyle.Rectangular;
+
+        private bool _IsDragBox;
+
+        private Size _ContentSize;
+        private int _CornerRadius;
+
+        #endregion
+
+        #region Public properties
+
+        #region Bounds
+
+        ///<summary>
+        /// Gets the associated Bounds
+        ///</summary>
+        public Rectangle Bounds
+        {
+            get
+            {
+                if (_IsDragBox == true)
+                    return (_RelativeBounds);
+
+                return (_GridGroupBy.GetScrollBounds(_RelativeBounds));
+            }
+        }
+
+        #endregion
+
+        #region Column
+
+        ///<summary>
+        /// Gets the associated GridColumn
+        ///</summary>
+        public GridColumn Column
+        {
+            get { return (_Column); }
+            internal set { _Column = value; }
+        }
+
+        #endregion
+
+        #region ContentSize
+
+        ///<summary>
+        /// Gets the associated Content Size
+        ///</summary>
+        public Size ContentSize
+        {
+            get { return (_ContentSize); }
+            set { _ContentSize = value; }
+        }
+
+        #endregion
+
+        #region CornerRadius
+
+        ///<summary>
+        /// Gets or sets the corner radius to
+        /// use when GroupBoxStyle is RoundedRectangular
+        ///</summary>
+        public int CornerRadius
+        {
+            get { return (_CornerRadius); }
+            set { _CornerRadius = value; }
+        }
+
+            #endregion
+
+        #region GridGroupBy
+
+        ///<summary>
+        /// Gets the associated GridGroupBy object
+        ///</summary>
+        public GridGroupByRow GridGroupBy
+        {
+            get { return (_GridGroupBy); }
+            internal set { _GridGroupBy = value; }
+        }
+
+        #endregion
+
+        #region GroupBoxStyle
+
+        ///<summary>
+        /// GroupBox Style
+        ///</summary>
+        public GroupBoxStyle GroupBoxStyle
+        {
+            get { return (_GroupBoxStyle); }
+            set { _GroupBoxStyle = value; }
+        }
+
+        #endregion
+
+        #region Padding
+
+        ///<summary>
+        /// Content padding
+        ///</summary>
+        public Padding Padding
+        {
+            get { return (_Padding); }
+            set { _Padding = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region FilterImageBounds
+
+        internal Rectangle FilterImageBounds
+        {
+            get
+            {
+                if (_IsDragBox == true || _FilterImageRelBounds.IsEmpty)
+                    return (_FilterImageRelBounds);
+
+                return (_GridGroupBy.GetScrollBounds(_FilterImageRelBounds));
+            }
+        }
+
+        #endregion
+
+        #region FilterImageRelBounds
+
+        internal Rectangle FilterImageRelBounds
+        {
+            get { return (_FilterImageRelBounds); }
+            set { _FilterImageRelBounds = value; }
+        }
+
+        #endregion
+
+        #region IsDragBox
+
+        internal bool IsDragBox
+        {
+            get { return (_IsDragBox); }
+            set { _IsDragBox = value; }
+        }
+
+        #endregion
+
+        #region RelativeBounds
+
+        internal Rectangle RelativeBounds
+        {
+            get { return (_RelativeBounds); }
+            set { _RelativeBounds = value; }
+        }
+
+        #endregion
+
+        #region SortImageBounds
+
+        internal Rectangle SortImageBounds
+        {
+            get
+            {
+                if (_IsDragBox == true || _SortImageRelBounds.IsEmpty)
+                    return (_SortImageRelBounds);
+
+                return (_GridGroupBy.GetScrollBounds(_SortImageRelBounds));
+            }
+        }
+
+        #endregion
+
+        #region SortImageRelBounds
+
+        internal Rectangle SortImageRelBounds
+        {
+            get { return (_SortImageRelBounds); }
+            set { _SortImageRelBounds = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        internal GridGroupBox(GridGroupByRow groupBy, GridColumn column)
+        {
+            _GridGroupBy = groupBy;
+            _Column = column;
+
+            _GroupBoxStyle = groupBy.GroupBoxStyle;
+        }
+
+        #region IsEqualTo
+
+        internal bool IsEqualTo(GridGroupBox box)
+        {
+            return (box != null && box.Column == Column);
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region enums
+
+    #region GroupBoxEffects
+
+    ///<summary>
+    /// GroupBoxEffects
+    ///</summary>
+    public enum GroupBoxEffects
+    {
+        ///<summary>
+        /// Not set.
+        ///</summary>
+        NotSet = -1,
+
+        ///<summary>
+        /// The Column will not interact with the GroupBox.
+        ///</summary>
+        None,
+
+        ///<summary>
+        /// The Column presentation will be copied to and
+        /// from the grid and associated GroupBox.
+        ///</summary>
+        Copy,
+
+        ///<summary>
+        /// The Column presentation will be moved to and
+        /// from the grid and associated GroupBox.
+        ///</summary>
+        Move,
+    }
+
+    #endregion
+
+    #region GroupBoxLayout
+
+    ///<summary>
+    /// GroupBox Layout
+    ///</summary>
+    public enum GroupBoxLayout
+    {
+        ///<summary>
+        /// Group boxes are Flat, all on the same layout row
+        ///</summary>
+        Flat,
+
+        ///<summary>
+        /// Group boxes are oriented Hierarchically
+        ///</summary>
+        Hierarchical,
+    }
+
+    #endregion
+
+    #region GroupBoxStyle
+
+    ///<summary>
+    /// GroupBox Style
+    ///</summary>
+    public enum GroupBoxStyle
+    {
+        ///<summary>
+        /// Group boxes are drawn Rectangular
+        ///</summary>
+        Rectangular,
+
+        ///<summary>
+        /// Group boxes are drawn Rounded Rectangular
+        ///</summary>
+        RoundedRectangular,
+    }
+
+    #endregion
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridHeader.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridHeader.cs
new file mode 100644
index 00000000..cc978fa2
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridHeader.cs	
@@ -0,0 +1,50 @@
+using DevComponents.DotNetBar.SuperGrid.Style;
+
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    /// <summary>
+    /// Defines the grid header
+    /// </summary>
+    public class GridHeader : GridTextRow
+    {
+        #region Constructors
+
+        ///<summary>
+        /// GridHeader
+        ///</summary>
+        public GridHeader()
+            : this(null)
+        {
+        }
+
+        ///<summary>
+        /// GridHeader
+        ///</summary>
+        ///<param name="text"></param>
+        public GridHeader(string text)
+            : base(text)
+        {
+        }
+
+        #endregion
+
+        #region Style support
+
+        /// <summary>
+        /// ApplyStyleEx
+        /// </summary>
+        /// <param name="style"></param>
+        /// <param name="css"></param>
+        protected override void ApplyStyleEx(TextRowVisualStyle style, StyleType[] css)
+        {
+            foreach (StyleType cs in css)
+            {
+                style.ApplyStyle(SuperGrid.BaseVisualStyles.HeaderStyles[cs]);
+                style.ApplyStyle(SuperGrid.DefaultVisualStyles.HeaderStyles[cs]);
+                style.ApplyStyle(GridPanel.DefaultVisualStyles.HeaderStyles[cs]);
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridItemsCollection.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridItemsCollection.cs
new file mode 100644
index 00000000..f84c6103
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridItemsCollection.cs	
@@ -0,0 +1,85 @@
+using System.ComponentModel;
+using System.Drawing.Design;
+using DevComponents.DotNetBar.SuperGrid.Primitives;
+
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    /// <summary>
+    /// Represents the collection of grid items.
+    /// </summary>
+    [Editor("DevComponents.SuperGrid.Design.GridRowCollectionEditor, DevComponents.SuperGrid.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=26d81176cfa2b486", typeof(UITypeEditor))]
+    public class GridItemsCollection : CustomCollection<GridElement>
+    {
+        #region ClearItems
+
+        /// <summary>
+        /// ClearItems
+        /// </summary>
+        protected override void ClearItems()
+        {
+            int n = Items.Count;
+
+            for (int i = 0; i < n; i++)
+            {
+                GridContainer item = Items[i] as GridContainer;
+
+                if (item != null)
+                {
+                    GridContainer parent = item.Parent as GridContainer;
+
+                    if (parent != null)
+                        parent.MergeScan = null;
+
+                    break;
+                }
+            }
+
+
+            if (FloatLastItem == true)
+                n--;
+
+            for (int i = 0; i < n; i++)
+                DetachItem(Items[i] as GridContainer, true);
+
+            base.ClearItems();
+        }
+
+        #endregion
+
+        #region RemoveItem
+
+        /// <summary>
+        /// RemoveItem
+        /// </summary>
+        /// <param name="index"></param>
+        protected override void RemoveItem(int index)
+        {
+            DetachItem(Items[index] as GridContainer, false);
+
+            base.RemoveItem(index);
+        }
+
+        #endregion
+
+        #region DetachItem
+
+        private void DetachItem(GridContainer item, bool clear)
+        {
+            if (item != null)
+            {
+                item.DetachNestedRows(false);
+
+                if (clear == false)
+                    item.Parent = null;
+
+                GridPanel panel = item as GridPanel;
+
+                if (panel != null)
+                    panel.DataBinder.Clear();
+                
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridLayoutInfo.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridLayoutInfo.cs
new file mode 100644
index 00000000..fa17a4bc
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridLayoutInfo.cs	
@@ -0,0 +1,77 @@
+using System.Drawing;
+using DevComponents.DotNetBar.SuperGrid.Style;
+
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    /// <summary>
+    /// Provides the layout information for grid layout pass
+    /// </summary>
+    public class GridLayoutInfo
+    {
+        #region Public variables
+
+        /// <summary>
+        /// Gets or sets the Graphics object of the control.
+        /// </summary>
+        public Graphics Graphics;
+
+        /// <summary>
+        /// Gets or sets whether right-to-left layout is in effect.
+        /// </summary>
+        public bool RightToLeft;
+
+        /// <summary>
+        /// Gets the client bounds for the layout i.e. client bounds of SuperGridControl.
+        /// </summary>
+        public Rectangle ClientBounds;
+
+        /// <summary>
+        /// Gets the default visual styles for grid elements.
+        /// </summary>
+        public DefaultVisualStyles DefaultVisualStyles;
+
+        #endregion
+
+        /// <summary>
+        /// Initializes a new instance of the GridLayoutInfo class.
+        /// </summary>
+        /// <param name="graphics"></param>
+        /// <param name="clientBounds"></param>
+        public GridLayoutInfo(Graphics graphics, Rectangle clientBounds)
+        {
+            Graphics = graphics;
+            ClientBounds = clientBounds;
+        }
+    }
+
+    /// <summary>
+    /// Provides the layout state information for grid layout pass
+    /// </summary>
+    public class GridLayoutStateInfo
+    {
+        #region Public variables
+
+        /// <summary>
+        /// Gets or sets the layout GridPanel
+        /// </summary>
+        public GridPanel GridPanel;
+
+        /// <summary>
+        /// Gets or sets the IndentLevel
+        /// </summary>
+        public int IndentLevel;
+
+        #endregion
+
+        internal int PassCount;
+
+        /// <summary>
+        /// Initializes a new instance of the GridLayoutStateInfo class
+        /// </summary>
+        public GridLayoutStateInfo(GridPanel gridPanel, int indentLevel)
+        {
+            GridPanel = gridPanel;
+            IndentLevel = indentLevel;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridMerge/CellRange.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridMerge/CellRange.cs
new file mode 100644
index 00000000..75fbabe8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridMerge/CellRange.cs	
@@ -0,0 +1,858 @@
+using System;
+using System.Drawing;
+using DevComponents.DotNetBar.SuperGrid.Style;
+
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    ///<summary>
+    /// Defines a merged cell range, comprised
+    /// of a starting and ending row,column index pair.
+    ///</summary>
+    public class CellRange : DisplayRange
+    {
+        #region Private variables
+
+        private Cs _States;
+        private CellRangeData _CellRangeData;
+        private object _Tag;
+        private string _ToolTip;
+        private ushort _StyleUpdateCount;
+
+        #endregion
+
+        #region Constructors
+
+        ///<summary>
+        /// Defines a merged cell range, comprised
+        /// of a starting and ending row,column index pair.
+        ///</summary>
+        public CellRange()
+        {
+            AllowSuspend = true;
+            AllowSelection = true;
+        }
+
+        ///<summary>
+        /// Defines a merged cell range, comprised
+        /// of a starting and ending row,column index pair.
+        ///</summary>
+        ///<param name="rowIndex">Initial start and end row index</param>
+        ///<param name="columnIndex">Initial start and end column index</param>
+        public CellRange(int rowIndex, int columnIndex)
+            : this()
+        {
+            RowStart = rowIndex;
+            ColumnStart = columnIndex;
+
+            RowCount = 1;
+            ColumnCount = 1;
+        }
+
+        ///<summary>
+        /// Defines a merged cell range, comprised
+        /// of a starting and ending row,column index pair.
+        ///</summary>
+        ///<param name="startRowIndex">Starting row index</param>
+        ///<param name="startColumnIndex">Starting column index</param>
+        ///<param name="rowCount">Row count</param>
+        ///<param name="columnCount">Column count</param>
+        public CellRange(int startRowIndex, int startColumnIndex, int rowCount, int columnCount)
+            : this()
+        {
+            RowStart = startRowIndex;
+            ColumnStart = startColumnIndex;
+
+            RowCount = rowCount;
+            ColumnCount = columnCount;
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region AllowSelection
+
+        ///<summary>
+        /// Gets or sets whether the range can be selected
+        ///</summary>
+        public bool AllowSelection
+        {
+            get { return (TestState(Cs.AllowSelection)); }
+            set { SetState(Cs.AllowSelection, value); }
+        }
+
+        #endregion
+
+        #region AllowSuspend
+
+        ///<summary>
+        /// Gets or sets whether the merged cell range can be temporarily
+        /// suspended when either the user double clicks the displayed range
+        /// or the application initiates a cell.SuspendMerge().
+        ///</summary>
+        public bool AllowSuspend
+        {
+            get { return (TestState(Cs.AllowSuspend)); }
+            set { SetState(Cs.AllowSuspend, value); }
+        }
+
+        #endregion
+
+        #region AlwaysDisplayFormattedValue
+
+        ///<summary>
+        /// Gets or sets whether the 'FormattedValue' value will be
+        /// displayed for all cell types when merged, or only for Modal Cells.
+        ///</summary>
+        public bool AlwaysDisplayFormattedValue
+        {
+            get { return (TestState(Cs.AlwaysDisplayFormattedValue)); }
+            set { SetState(Cs.AlwaysDisplayFormattedValue, value); }
+        }
+
+        #endregion
+
+        #region BackBounds
+
+        ///<summary>
+        /// Gets the range display bounds
+        ///</summary>
+        public Rectangle BackBounds
+        {
+            get { return (RangeData.BackBounds); }
+            internal set { RangeData.BackBounds = value; }
+        }
+
+        #endregion
+
+        #region CellStyles
+
+        /// <summary>
+        /// Gets or sets the visual styles assigned to the cell
+        /// </summary>
+        public CellVisualStyles CellStyles
+        {
+            get
+            {
+                if (RangeData.CellStyles == null)
+                    RangeData.CellStyles = new CellVisualStyles();
+
+                return (RangeData.CellStyles);
+            }
+
+            set { RangeData.CellStyles = value; }
+        }
+
+        #endregion
+
+        #region FormattedValue
+
+        ///<summary>
+        /// Gets or sets the formatted value for the range display.  This value will
+        /// be displayed by default for all Modal Cells - all other cells will
+        /// have their default cell rendering displayed when merged 
+        /// (unless 'AlwaysDisplayFormattedValue' is set to true).
+        ///</summary>
+        public string FormattedValue
+        {
+            get { return (RangeData.FormattedValue); }
+            set { RangeData.FormattedValue = value; }
+        }
+
+        #endregion
+
+        #region Tag
+
+        ///<summary>
+        /// Gets or sets user-defined data associated with the object
+        ///</summary>
+        public object Tag
+        {
+            get { return (_Tag); }
+            set { _Tag = value; }
+        }
+
+        #endregion
+
+        #region ToolTip
+
+        ///<summary>
+        /// Gets or sets the ToolTip text for the cell range.
+        ///</summary>
+        public string ToolTip
+        {
+            get { return (_ToolTip); }
+            set { _ToolTip = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region Modified
+
+        internal bool Modified
+        {
+            get { return (TestState(Cs.Modified)); }
+            set { SetState(Cs.Modified, value); }
+        }
+
+        #endregion
+
+        #region RenderCount
+
+        internal int RenderCount
+        {
+            get { return (RangeData.RenderCount); }
+            set { RangeData.RenderCount = value; }
+        }
+
+        #endregion
+
+        #region SelectionUpdateCount
+
+        internal int SelectionUpdateCount
+        {
+            get { return (RangeData.SelectionUpdateCount); }
+            set { RangeData.SelectionUpdateCount = value; }
+        }
+
+        #endregion
+
+        #region Suspended
+
+        internal bool Suspended
+        {
+            get { return (TestState(Cs.Suspended)); }
+            set { SetState(Cs.Suspended, value); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Private properties
+
+        #region EffectiveStyles
+
+        /// <summary>
+        /// Gets or sets the 'effective' visual styles assigned to the range
+        /// </summary>
+        private CellVisualStyles EffectiveStyles
+        {
+            get { return (RangeData.EffectiveStyles); }
+            set { RangeData.EffectiveStyles = value; }
+        }
+
+        #endregion
+
+        #region RangeData
+
+        private CellRangeData RangeData
+        {
+            get
+            {
+                if (_CellRangeData == null)
+                    _CellRangeData = new CellRangeData();
+
+                return (_CellRangeData);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region TestState
+
+        private bool TestState(Cs state)
+        {
+            return ((_States & state) == state);
+        }
+
+        #endregion
+
+        #region SetState
+
+        private void SetState(Cs state, bool value)
+        {
+            if (value == true)
+                _States |= state;
+            else
+                _States &= ~state;
+        }
+
+        #endregion
+
+        #region GetEffectiveStyle
+
+        internal CellVisualStyle GetEffectiveStyle(GridContainer cont, StyleState cellState)
+        {
+            switch (cellState)
+            {
+                case StyleState.MouseOver:
+                    return (GetStyle(cont, StyleType.MouseOver));
+
+                case StyleState.Selected:
+                    return (GetStyle(cont, StyleType.Selected));
+
+                case StyleState.Selected | StyleState.MouseOver:
+                    return (GetStyle(cont, StyleType.SelectedMouseOver));
+
+                case StyleState.ReadOnly:
+                    return (GetStyle(cont, StyleType.ReadOnly));
+
+                case StyleState.ReadOnly | StyleState.MouseOver:
+                    return (GetStyle(cont, StyleType.ReadOnlyMouseOver));
+
+                case StyleState.ReadOnly | StyleState.Selected:
+                    return (GetStyle(cont, StyleType.ReadOnlySelected));
+
+                case StyleState.ReadOnly | StyleState.MouseOver | StyleState.Selected:
+                    return (GetStyle(cont, StyleType.ReadOnlySelectedMouseOver));
+
+                default:
+                    return (GetStyle(cont, StyleType.Default));
+            }
+        }
+
+        #region GetStyle
+
+        private CellVisualStyle GetStyle(GridContainer cont, StyleType e)
+        {
+            GridPanel panel = cont.GridPanel;
+
+            ValidateStyle(panel);
+
+            CellVisualStyles cvs = EffectiveStyles ?? new CellVisualStyles();
+
+            if (cvs.IsValid(e) == false)
+            {
+                CellVisualStyle style = new CellVisualStyle();
+
+                StyleType[] css = style.GetApplyStyleTypes(e);
+
+                if (css != null)
+                {
+                    int cindex = panel.Columns.DisplayIndexMap[ColumnStart];
+
+                    GridRow row = null;
+                    GridColumn column = panel.Columns.ColumnAtDisplayIndex(ColumnStart);
+
+                    if (RowCount == 1)
+                    {
+                        GridCell cell = cont.GetCell(RowStart, cindex);
+
+                        if (cell != null)
+                            row = cell.GridRow;
+                    }
+
+                    foreach (StyleType cs in css)
+                    {
+                        if (column != null)
+                            column.ApplyCellStyle(style, cs);
+
+                        if (row != null)
+                            row.ApplyCellStyle(style, cs);
+
+                        panel.ApplyMergedCellStyle(style, cs);
+
+                        if (RangeData.CellStyles != null)
+                            style.ApplyStyle(RangeData.CellStyles[cs]);
+                    }
+                }
+
+                panel.SuperGrid.DoGetMergedCellStyleEvent(panel, this, e, ref style);
+
+                if (style.Background == null || style.Background.IsEmpty == true)
+                    style.Background = new Background(Color.White);
+
+                if (style.Font == null)
+                    style.Font = SystemFonts.DefaultFont;
+
+                cvs[e] = style;
+            }
+
+            EffectiveStyles = cvs;
+
+            return (EffectiveStyles[e]);
+        }
+
+        #endregion
+
+        #region ValidateStyle
+
+        private void ValidateStyle(GridPanel panel)
+        {
+            if (_StyleUpdateCount != panel.SuperGrid.StyleUpdateCount)
+                ClearEffectiveStyles();
+
+            _StyleUpdateCount = panel.SuperGrid.StyleUpdateCount;
+        }
+
+        #endregion
+
+        #region InvalidateStyle
+
+        ///<summary>
+        ///Invalidates the cached Style
+        ///definition for all defined StyleTypes
+        ///</summary>
+        public void InvalidateStyle()
+        {
+            ClearEffectiveStyles();
+        }
+
+        ///<summary>
+        ///Invalidate the cached Style
+        ///definition for the given StyleType
+        ///</summary>
+        ///<param name="type"></param>
+        public void InvalidateStyle(StyleType type)
+        {
+            if (EffectiveStyles != null)
+                EffectiveStyles[type] = null;
+        }
+
+        #endregion
+
+        #region ClearEffectiveStyles
+
+        internal void ClearEffectiveStyles()
+        {
+            if (EffectiveStyles != null)
+            {
+                EffectiveStyles.Dispose();
+                EffectiveStyles = null;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IsSelected
+
+        internal bool IsSelected(GridPanel panel, GridContainer cont)
+        {
+            if (AllowSelection == true)
+            {
+                if (panel.AllowSelection == true)
+                {
+                    if (RangeData.SelectionUpdateCount != panel.SelectionUpdateCount)
+                    {
+                        RangeData.SelectionUpdateCount = panel.SelectionUpdateCount;
+
+                        SetState(Cs.Selected, IsMergeSelected(panel, cont));
+                    }
+
+                    return (TestState(Cs.Selected));
+                }
+            }
+
+            return (false);
+        }
+
+        #region IsMergeSelected
+
+        private bool IsMergeSelected(GridPanel panel, GridContainer cont)
+        {
+            int rowCount = GetRowCount(panel, cont);
+
+            if (RowIsSelected(panel, cont, rowCount))
+                return (true);
+
+            if (ColumnIsSelected(panel))
+                return (true);
+
+            return (CellIsSelected(panel, cont, rowCount));
+        }
+
+        #region RowIsSelected
+
+        private bool RowIsSelected(GridPanel panel, GridContainer cont, int rowCount)
+        {
+            for (int i = RowStart; i < RowEnd; i++)
+            {
+                if (i < rowCount)
+                {
+                    GridContainer row = GetRow(panel, cont, i);
+
+                    if (row != null)
+                    {
+                        if (row.IsSelected == true)
+                            return (true);
+                    }
+                }
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region ColumnIsSelected
+
+        private bool ColumnIsSelected(GridPanel panel)
+        {
+            int[] map = panel.Columns.DisplayIndexMap;
+
+            for (int i = ColumnStart; i < ColumnEnd; i++)
+            {
+                if (i < panel.Columns.Count)
+                {
+                    if (panel.Columns[map[i]].IsSelected == true)
+                        return (true);
+                }
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region CellIsSelected
+
+        private bool CellIsSelected(GridPanel panel, GridContainer cont, int rowCount)
+        {
+            int[] map = panel.Columns.DisplayIndexMap;
+
+            for (int i = RowStart; i < RowEnd; i++)
+            {
+                if (i < rowCount)
+                {
+                    GridRow row = GetRow(panel, cont, i) as GridRow;
+
+                    if (row != null)
+                    {
+                        for (int j = ColumnStart; j < ColumnEnd; j++)
+                        {
+                            if (j < panel.Columns.Count)
+                            {
+                                GridCell cell = row.GetCell(map[j]);
+
+                                if (cell != null)
+                                {
+                                    if (panel.IsItemSelectedEx(cell) == true)
+                                        return (true);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region GetRowCount
+
+        private int GetRowCount(GridPanel panel, GridContainer cont)
+        {
+            if (panel.VirtualMode == true)
+                return (panel.VirtualRowCount);
+
+            return (cont.Rows.Count);
+        }
+
+        #endregion
+
+        #region GetRow
+
+        private GridContainer GetRow(GridPanel panel, GridContainer cont, int index)
+        {
+            return (panel.VirtualMode == true)
+                       ? panel.VirtualRows[index]
+                       : cont.Rows[index] as GridContainer;
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region CellStates
+
+        [Flags]
+        private enum Cs
+        {
+            AllowSelection = (1 << 0),
+            AllowSuspend = (1 << 1),
+            AlwaysDisplayFormattedValue = (1 << 2),
+            Modified = (1 << 3),
+            Selected = (1 << 4),
+            Suspended = (1 << 5),
+        }
+
+        #endregion
+
+        #region CellRangeData
+
+        private class CellRangeData
+        {
+            #region Private data
+
+            private int _RenderCount;
+            private int _SelectionUpdateCount;
+
+            private Rectangle _BackBounds;
+
+            private string _FormattedValue;
+
+            private CellVisualStyles _CellStyles;
+            private CellVisualStyles _EffectiveStyles;
+
+            #endregion
+
+            #region public properties
+
+            #region BackBounds
+
+            public Rectangle BackBounds
+            {
+                get { return (_BackBounds); }
+                set { _BackBounds = value; }
+            }
+
+            #endregion
+
+            #region CellStyles
+
+            public CellVisualStyles CellStyles
+            {
+                get { return (_CellStyles); }
+                set { _CellStyles = value; }
+            }
+
+            #endregion
+
+            #region EffectiveStyles
+
+            public CellVisualStyles EffectiveStyles
+            {
+                get { return (_EffectiveStyles); }
+                set { _EffectiveStyles = value; }
+            }
+
+            #endregion
+
+            #region FormattedValue
+
+            public string FormattedValue
+            {
+                get { return (_FormattedValue); }
+                set { _FormattedValue = value; }
+            }
+
+            #endregion
+
+            #region RenderCount
+
+            public int RenderCount
+            {
+                get { return (_RenderCount); }
+                set { _RenderCount = value; }
+            }
+
+            #endregion
+
+            #region SelectionUpdateCount
+
+            public int SelectionUpdateCount
+            {
+                get { return (_SelectionUpdateCount); }
+                set { _SelectionUpdateCount = value; }
+            }
+
+            #endregion
+
+            #endregion
+        }
+
+        #endregion
+    }
+
+    #region DisplayRange
+
+    ///<summary>
+    ///Row/Column display index range
+    ///</summary>
+    public class DisplayRange
+    {
+        #region Private variables
+
+        private int _RowStart;
+        private int _RowCount;
+
+        private int _ColumnStart;
+        private int _ColumnCount;
+
+        #endregion
+
+        #region Public properties
+
+        #region ColumnCount
+
+        ///<summary>
+        ///Number of columns
+        ///</summary>
+        public int ColumnCount
+        {
+            get { return (_ColumnCount); }
+
+            set
+            {
+                if (value < 0)
+                    throw new ArgumentException(@"ColumnCount cannot be negative", "value");
+                
+                _ColumnCount = value;
+            }
+        }
+
+        #endregion
+
+        #region ColumnEnd
+
+        ///<summary>
+        ///Ending column display index (exclusive)
+        ///</summary>
+        public int ColumnEnd
+        {
+            get { return (_ColumnStart + _ColumnCount); }
+
+            set
+            {
+                int count = value - _ColumnStart;
+
+                if (count < 0)
+                    throw new ArgumentException(@"ColumnEnd cannot be less than ColumnStart", "value");
+
+                ColumnCount = count;
+            }
+        }
+
+        #endregion
+
+        #region ColumnStart
+
+        ///<summary>
+        ///Starting column display index
+        ///</summary>
+        public int ColumnStart
+        {
+            get { return (_ColumnStart); }
+            set { _ColumnStart = value; }
+        }
+
+        #endregion
+
+        #region Contains
+
+        internal bool Contains(int rowIndex, int columnIndex)
+        {
+            return ((rowIndex >= _RowStart && rowIndex < RowEnd) &&
+                    (columnIndex >= _ColumnStart && columnIndex < ColumnEnd));
+        }
+
+        #endregion
+
+        #region RowCount
+
+        ///<summary>
+        ///Number of rows
+        ///</summary>
+        public int RowCount
+        {
+            get { return (_RowCount); }
+
+            set
+            {
+                if (value < 0)
+                    throw new ArgumentException(@"RowCount cannot be negative", "value");
+
+                _RowCount = value;
+            }
+        }
+
+        #endregion
+
+        #region RowEnd
+
+        ///<summary>
+        ///Ending row index (exclusive)
+        ///</summary>
+        public int RowEnd
+        {
+            get { return (_RowStart + _RowCount); }
+
+            set
+            {
+                int count = value - _RowStart;
+
+                if (count < 0)
+                    throw new ArgumentException(@"RowEnd cannot be less than RowStart", "value");
+
+                RowCount = count;
+            }
+        }
+
+        #endregion
+
+        #region RowStart
+
+        ///<summary>
+        ///Starting row index
+        ///</summary>
+        public int RowStart
+        {
+            get { return (_RowStart); }
+            set { _RowStart = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IsRangeEqualTo
+
+        ///<summary>
+        ///Returns whether the display range is
+        ///logically equal to the given item's display range.
+        ///</summary>
+        ///<param name="dr"></param>
+        ///<returns></returns>
+        public bool IsRangeEqualTo(DisplayRange dr)
+        {
+            if (dr != null)
+            {
+                return (dr.RowStart == _RowStart && dr.ColumnStart == _ColumnStart &&
+                        dr.RowCount == _RowCount && dr.ColumnCount == _ColumnCount);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region ToString
+
+        /// <summary>
+        /// ToString
+        /// </summary>
+        /// <returns></returns>
+        public override string ToString()
+        {
+            return ("RowStart = " + RowStart + ", RowEnd = " + RowEnd +
+                " ColStart = " + ColumnStart + " ColEnd = " + ColumnEnd);
+        }
+
+        #endregion
+    }
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridMerge/MergeScan.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridMerge/MergeScan.cs
new file mode 100644
index 00000000..43174ec5
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridMerge/MergeScan.cs	
@@ -0,0 +1,1041 @@
+using System.Collections.Generic;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    internal class MergeScan
+    {
+        #region Private variables
+
+        private GridContainer _GridContainer;
+        private GridPanel _GridPanel;
+
+        private List<CellRange> _ScanItems;
+        private List<DisplayRange> _LastDrs;
+
+        #endregion
+
+        #region Public properties
+
+        #region ScanItems
+
+        ///<summary>
+        /// ScanItems
+        ///</summary>
+        public List<CellRange> ScanItems
+        {
+            get { return (GetScanItems()); }
+        }
+
+        #endregion
+
+        #endregion
+
+        ///<summary>
+        /// MergeScan
+        ///</summary>
+        ///<param name="gridContainer"></param>
+        public MergeScan(GridContainer gridContainer)
+        {
+            _GridContainer = gridContainer;
+            _GridPanel = _GridContainer.GridPanel;
+        }
+
+        #region GetScanItems
+
+        internal List<CellRange> GetScanItems()
+        {
+            if (_GridContainer != null && _GridPanel != null)
+            {
+                int rowCount = GetRowCount();
+
+                if (rowCount > 0)
+                {
+                    SuperGridControl sg = _GridPanel.SuperGrid;
+
+                    if (sg.NeedMergeLayout == true)
+                        _GridContainer.NeedMergeLayout = true;
+
+                    if (_GridContainer.NeedMergeLayout == true ||
+                        _GridContainer.DisplayedMergeLayoutCount != sg.DisplayedMergeLayoutCount)
+                    {
+                        _ScanItems = GetDisplayedScanItems();
+
+                        _GridContainer.NeedMergeLayout = false;
+                        _GridContainer.DisplayedMergeLayoutCount = sg.DisplayedMergeLayoutCount;
+
+                        sg.PostInternalMouseMove();
+                        sg.DeactivateNonModalEditor();
+                    }
+
+                    return (_ScanItems);
+                }
+            }
+
+            return (null);
+        }
+
+        #region GetRowCount
+
+        private int GetRowCount()
+        {
+            if (_GridPanel.VirtualMode == true)
+                return (_GridPanel.VirtualRowCount);
+
+            return (_GridContainer.Rows.Count);
+        }
+
+        #endregion
+
+        #region GetDisplayedScanItems
+
+        private List<CellRange> GetDisplayedScanItems()
+        {
+            List<DisplayRange> drs = GetDisplayRanges();
+
+            if (drs != null)
+            {
+                _GridPanel.SuperGrid.DoGetDisplayRangesEvent(_GridContainer, ref drs);
+
+                if (drs != null && drs.Count > 0)
+                    return (GetCellRanges(drs));
+            }
+
+            return (null);
+        }
+
+        #region GetDisplayRanges
+
+        private List<DisplayRange> GetDisplayRanges()
+        {
+            GridPanel panel = _GridContainer as GridPanel;
+
+            int frCount = 0;
+            int fcCount = 0;
+
+            if (panel != null)
+            {
+                frCount = panel.FrozenRowCount;
+
+                GridColumn lastColumn = panel.Columns.GetLastVisibleFrozenColumn();
+
+                if (lastColumn != null)
+                    fcCount = panel.Columns.GetDisplayIndex(lastColumn) + 1;
+            }
+
+            DisplayRange dr = new DisplayRange();
+
+            if (GetRowRange(dr) > 1 | GetColumnRange(dr) > 1)
+            {
+                List<DisplayRange> drs;
+
+                if (frCount == 0 && fcCount == 0)
+                {
+                    drs = new List<DisplayRange>();
+                    drs.Add(dr);
+                }
+                else if (frCount != 0 && fcCount != 0)
+                {
+                    drs = new List<DisplayRange>(4);
+
+                    drs.Add(GetNewRange(dr, 0, frCount, 0, fcCount));
+                    drs.Add(GetNewRange(dr, 0, frCount, fcCount, dr.ColumnCount));
+                    drs.Add(GetNewRange(dr, frCount, dr.RowCount, 0, fcCount));
+                    drs.Add(GetNewRange(dr, frCount, dr.RowEnd, fcCount, dr.ColumnCount));
+                }
+                else
+                {
+                    drs = new List<DisplayRange>(2);
+
+                    if (frCount != 0)
+                    {
+                        int n = (dr.RowStart < frCount ? frCount : dr.RowStart);
+
+                        drs.Add(GetNewRange(dr, 0, frCount, dr.ColumnStart, dr.ColumnCount));
+                        drs.Add(GetNewRange(dr, n, dr.RowCount, dr.ColumnStart, dr.ColumnCount));
+                    }
+                    else
+                    {
+                        int n = (dr.ColumnStart < fcCount ? fcCount : dr.ColumnStart);
+
+                        drs.Add(GetNewRange(dr, dr.RowStart, dr.RowCount, 0, fcCount));
+                        drs.Add(GetNewRange(dr, dr.RowStart, dr.RowCount, n, dr.ColumnCount));
+                    }
+                }
+
+                return (drs);
+            }
+
+            return (null);
+        }
+
+        #region GetRowRange
+
+        private int GetRowRange(DisplayRange dr)
+        {
+            int rowCount = GetRowCount();
+
+            if (rowCount < 50)
+            {
+                dr.RowStart = 0;
+                dr.RowEnd = rowCount;
+            }
+            else
+            {
+                Rectangle t = _GridContainer.SuperGrid.ViewRect;
+
+                dr.RowEnd = _GridContainer.FirstOnScreenRowIndex;
+                dr.RowStart = GetPreviousRowIndex(dr.RowEnd);
+
+                bool fpass = false;
+
+                for (int i = dr.RowStart; i < rowCount; i++)
+                {
+                    GridContainer item = GetRow(i);
+
+                    if (item != null && item.Visible == true)
+                    {
+                        Rectangle r = item.BoundsRelative;
+
+                        if (item.IsVFrozen == false)
+                            r.Y -= _GridContainer.VScrollOffset;
+
+                        if (r.Y > t.Bottom)
+                        {
+                            if (fpass == true)
+                                break;
+
+                            fpass = true;
+                        }
+                    }
+
+                    dr.RowEnd = i;
+                }
+
+                dr.RowEnd = GetNextRowIndex(dr.RowEnd) + 1;
+            }
+
+            return (dr.RowCount);
+        }
+
+        #region GetPreviousRowIndex
+
+        private int GetPreviousRowIndex(int index)
+        {
+            if ((uint)index < GetRowCount())
+            {
+                for (int i = index - 1; i >= 0; i--)
+                {
+                    GridContainer row = GetRow(i);
+
+                    if (row != null && row.Visible == true)
+                        return (i);
+                }
+            }
+
+            return (index);
+        }
+
+        #endregion
+
+        #region GetNextRowIndex
+
+        private int GetNextRowIndex(int index)
+        {
+            int rowCount = GetRowCount();
+
+            if ((uint)index < rowCount)
+            {
+                for (int i = index + 1; i < rowCount; i++)
+                {
+                    GridContainer row = GetRow(i);
+
+                    if (row != null && row.Visible == true)
+                        return (i);
+                }
+            }
+
+            return (index);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetColumnRange
+
+        private int GetColumnRange(DisplayRange dr)
+        {
+            GridColumnCollection columns = _GridPanel.Columns;
+            int colCount = columns.Count;
+
+            dr.ColumnStart = 0;
+            dr.ColumnCount = colCount;
+
+            if (colCount > 10)
+            {
+                int[] map = columns.DisplayIndexMap;
+
+                for (int i = 0; i < map.Length; i++)
+                {
+                    int index = map[i];
+                    GridColumn column = columns[index];
+
+                    if (column.Visible == true)
+                    {
+                        if (column.IsOnScreen == true && column.IsHFrozen == false)
+                            break;
+
+                        dr.ColumnStart = i;
+                    }
+                }
+
+                dr.ColumnEnd = dr.ColumnStart;
+
+                for (int i = dr.ColumnStart + 1; i < map.Length; i++)
+                {
+                    int index = map[i];
+                    GridColumn column = columns[index];
+
+                    if (column.Visible == true)
+                    {
+                        dr.ColumnEnd = i;
+
+                        if (column.IsOnScreen == false)
+                            break;
+                    }
+                }
+
+                dr.ColumnEnd++;
+            }
+
+            return (dr.ColumnCount);
+        }
+
+        #endregion
+
+        #region GetNewRange
+
+        private DisplayRange GetNewRange(DisplayRange dr,
+            int rowStart, int rowCount, int columnStart, int columnCount)
+        {
+            DisplayRange ndr = new DisplayRange();
+
+            ndr.RowStart = rowStart;
+            ndr.RowCount = rowCount;
+
+            if (ndr.RowEnd > dr.RowEnd)
+                ndr.RowEnd = dr.RowEnd;
+
+            ndr.ColumnStart = columnStart;
+            ndr.ColumnCount = columnCount;
+
+            if (ndr.ColumnEnd > dr.ColumnEnd)
+                ndr.ColumnEnd = dr.ColumnEnd;
+
+            return (ndr);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetCellRanges
+
+        private List<CellRange> GetCellRanges(List<DisplayRange> drs)
+        {
+            List<CellRange> cellRanges = null;
+
+            if (_GridPanel.SuperGrid.EditorActive == true || LastScanIsValid(drs) == true)
+            {
+                cellRanges = _ScanItems;
+            }
+            else
+            {
+                foreach (DisplayRange dr in drs)
+                {
+                    List<CellRange> crs = UpdateMergeRange(dr);
+
+                    if (crs != null)
+                    {
+                        if (cellRanges != null)
+                            cellRanges.InsertRange(0, crs);
+                        else
+                            cellRanges = crs;
+                    }
+                }
+
+                _LastDrs = drs;
+            }
+            
+            if (cellRanges != null)
+            {
+                _GridContainer.SuperGrid.BoundsUpdateCount++;
+
+                foreach (CellRange cr in cellRanges)
+                    cr.BackBounds = GetDisplayBounds(cr);
+
+                _GridContainer.GridPanel.UpdateSelectionCount();
+            }
+
+            return (cellRanges);
+        }
+
+        #region LastScanIsValid
+
+        private bool LastScanIsValid(List<DisplayRange> drs)
+        {
+            if (_GridContainer.NeedMergeLayout == false)
+            {
+                if (_LastDrs != null)
+                {
+                    if (drs.Count == _LastDrs.Count)
+                    {
+                        for (int i = 0; i < drs.Count; i++)
+                        {
+                            if (drs[i].IsRangeEqualTo(_LastDrs[i]) == false)
+                                return (false);
+                        }
+
+                        return (true);
+                    }
+                }
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region UpdateMergeRange
+
+        private List<CellRange> UpdateMergeRange(DisplayRange dr)
+        {
+            UpdateMergeFlags(dr);
+            UpdateMergeCount(dr);
+
+            List<CellRange> cellRanges = null;
+
+            if (_GridContainer.SuperGrid.DoGetCellRangesEvent(_GridContainer, dr, ref cellRanges) == false)
+                cellRanges = GetCellMergeRanges(dr);
+
+            if (cellRanges != null)
+                PostProcessCellRanges(cellRanges);
+
+            _GridContainer.SuperGrid.DoUpdateCellDisplayRangesEvent(_GridContainer, dr, ref cellRanges);
+
+            return (cellRanges);
+        }
+
+        #endregion
+
+        #region UpdateMergeFlags
+
+        private void UpdateMergeFlags(DisplayRange dr)
+        {
+            GridRow lastRow = null;
+
+            for (int i = dr.RowStart; i < dr.RowEnd; i++)
+            {
+                GridContainer item = GetRow(i);
+
+                if (item != null && item.Visible == true)
+                {
+                    GridRow row = item as GridRow;
+
+                    if (row != null)
+                    {
+                        SetHMergeFlags(row, dr);
+                        SetVMergeFlags(row, lastRow, dr);
+                    }
+
+                    lastRow = row;
+                }
+            }
+        }
+
+        #region SetHMergeFlags
+
+        private void SetHMergeFlags(GridRow row, DisplayRange dr)
+        {
+            GridPanel panel = _GridContainer.GridPanel;
+            GridColumnCollection columns = panel.Columns;
+
+            int[] map = columns.DisplayIndexMap;
+
+            GridCell lastCell = null;
+
+            for (int i = dr.ColumnStart; i < dr.ColumnEnd; i++)
+            {
+                int index = map[i];
+
+                GridColumn column = columns[index];
+
+                if (column.Visible == true)
+                {
+                    GridCell cell = row[index];
+
+                    if (cell != null)
+                    {
+                        if (lastCell != null)
+                        {
+                            if (_GridContainer.SuperGrid.NeedMergeLayout == true ||
+                                cell.MergeUpdateCount != _GridContainer.MergeUpdateCount ||
+                                lastCell.MergeUpdateCount != _GridContainer.MergeUpdateCount)
+                            {
+                                bool merged = false;
+
+                                if (CanHMergeCells(panel, column, lastCell.GridColumn))
+                                    merged = CanMergeValues(cell, lastCell);
+
+                                cell.MergedLeft = merged;
+                                lastCell.MergedRight = merged;
+                            }
+                        }
+                        else
+                        {
+                            cell.MergedLeft = false;
+                        }
+                    }
+
+                    lastCell = cell;
+                }
+            }
+        }
+
+        #region CanHMergeCells
+
+        private bool CanHMergeCells(
+            GridPanel panel, GridColumn column1, GridColumn column2)
+        {
+            return (IsHCellMerge(panel, column1.CellMergeMode, CellMergeMode.HorizontalLeft) &&
+                    IsHCellMerge(panel, column2.CellMergeMode, CellMergeMode.HorizontalRight));
+        }
+
+        #region IsHCellMerge
+
+        private bool IsHCellMerge(GridPanel panel, CellMergeMode cMode, CellMergeMode tMode)
+        {
+            if (cMode == CellMergeMode.NotSet)
+                cMode = panel.CellMergeMode;
+
+            return ((cMode & tMode) == tMode);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region CanVMergeCells
+
+        private bool CanVMergeCells(GridPanel panel, GridColumn column)
+        {
+            return (IsVCellMerge(panel, column.CellMergeMode));
+        }
+
+        #region IsVCellMerge
+
+        private bool IsVCellMerge(GridPanel panel, CellMergeMode mode)
+        {
+            if (mode == CellMergeMode.NotSet)
+                mode = panel.CellMergeMode;
+
+            return ((mode & CellMergeMode.Vertical) == CellMergeMode.Vertical);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region SetVMergeFlags
+
+        private void SetVMergeFlags(GridRow row, GridRow lastRow, DisplayRange dr)
+        {
+            GridPanel panel = _GridContainer.GridPanel;
+            GridColumnCollection columns = panel.Columns;
+
+            int[] map = columns.DisplayIndexMap;
+
+            for (int i = dr.ColumnStart; i < dr.ColumnEnd; i++)
+            {
+                int index = map[i];
+
+                GridColumn column = columns[index];
+
+                if (column.Visible == true)
+                {
+                    GridCell cell = row[index];
+
+                    if (cell != null)
+                    {
+                        if (lastRow != null)
+                        {
+                            GridCell lastCell = lastRow[index];
+
+                            if (lastRow.Rows.Count <= 0 || lastRow.Expanded == false)
+                            {
+                                if (lastCell != null)
+                                {
+                                    if (_GridContainer.SuperGrid.NeedMergeLayout == true ||
+                                        cell.MergeUpdateCount != _GridContainer.MergeUpdateCount ||
+                                        cell.MergeUpdateCount != row.MergeUpdateCount ||
+                                        lastCell.MergeUpdateCount != _GridContainer.MergeUpdateCount ||
+                                        lastCell.MergeUpdateCount != lastRow.MergeUpdateCount)
+                                    {
+                                        bool merged = false;
+
+                                        if (CanVMergeCells(panel, column) == true)
+                                            merged = CanMergeValues(cell, lastCell);
+
+                                        cell.MergedTop = merged;
+                                        lastCell.MergedBottom = merged;
+                                    }
+                                }
+                                else
+                                {
+                                    cell.MergedTop = false;
+                                }
+                            }
+                            else
+                            {
+                                if (lastCell != null)
+                                    lastCell.MergedBottom = false;
+
+                                cell.MergedTop = false;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region CanMergeValues
+
+        private bool CanMergeValues(GridCell cell1, GridCell cell2)
+        {
+            if (cell1.IsValueNull || cell2.IsValueNull)
+            {
+                if (cell1.Value == cell2.Value)
+                    return (cell1.AllowNullMerge & cell2.AllowNullMerge);
+
+                return (false);
+            }
+
+            string s1 = cell1.FormattedValue;
+            string s2 = cell2.FormattedValue;
+
+            return (s1.Equals(s2));
+        }
+
+        #endregion
+
+        #endregion
+
+        #region UpdateMergeCount
+
+        private void UpdateMergeCount(DisplayRange dr)
+        {
+            GridPanel panel = _GridContainer.GridPanel;
+            GridColumnCollection columns = panel.Columns;
+
+            int[] map = columns.DisplayIndexMap;
+
+            for (int i = dr.RowStart; i < dr.RowEnd; i++)
+            {
+                GridContainer item = GetRow(i);
+
+                if (item != null && item.Visible == true)
+                {
+                    GridRow row = item as GridRow;
+
+                    if (row != null)
+                    {
+                        row.MergeUpdateCount = _GridContainer.MergeUpdateCount;
+
+                        for (int j = dr.ColumnStart; j < dr.ColumnEnd; j++)
+                        {
+                            int index = map[j];
+
+                            GridCell cell = row[index];
+
+                            if (cell != null)
+                                cell.MergeUpdateCount = _GridContainer.MergeUpdateCount;
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region GetCellMergeRanges
+
+        private List<CellRange> GetCellMergeRanges(DisplayRange dr)
+        {
+            switch (_GridPanel.CellMergeOrder)
+            {
+                case CellMergeOrder.HorizontalThenVertical:
+                    return (MergeHCells(dr));
+
+                default:
+                    return (MergeVCells(dr));
+            }
+        }
+
+        #region MergeVCells
+
+        private List<CellRange> MergeVCells(DisplayRange dr)
+        {
+            List<CellRange> cellRanges = new List<CellRange>();
+
+            GridColumnCollection columns = _GridContainer.GridPanel.Columns;
+            int[] map = columns.DisplayIndexMap;
+
+            for (int i = dr.ColumnStart; i < dr.ColumnEnd; i++)
+            {
+                int index = map[i];
+                GridColumn column = columns[index];
+
+                if (column.Visible == true)
+                {
+                    CellRange cr = null;
+
+                    for (int j = dr.RowStart; j < dr.RowEnd; j++)
+                    {
+                        GridRow row = GetRow(j);
+
+                        if (row != null && row.Visible == true && row.IsTempInsertRow == false)
+                        {
+                            GridCell cell = row.GetCell(index);
+
+                            if (cell != null)
+                            {
+                                if (cell.MergedTop == true)
+                                {
+                                    if (cr == null)
+                                        cr = new CellRange(j, i);
+                                    else
+                                        cr.RowEnd = j + 1;
+                                }
+                                else
+                                {
+                                    OutputVCellRange(cellRanges, cr, map);
+
+                                    cr = new CellRange(j, i);
+                                }
+                            }
+                        }
+                    }
+
+                    OutputVCellRange(cellRanges, cr, map);
+                }
+            }
+
+            return (cellRanges);
+        }
+
+        #region OutputVCellRange
+
+        private void OutputVCellRange(
+            List<CellRange> cellRanges, CellRange cr, int[] map)
+        {
+            if (cr != null)
+            {
+                for (int i = 0; i < cellRanges.Count; i++)
+                {
+                    CellRange crn = cellRanges[i];
+
+                    if (crn.ColumnEnd == cr.ColumnStart)
+                    {
+                        if (crn.RowStart == cr.RowStart && crn.RowEnd == cr.RowEnd)
+                        {
+                            GridRow row = GetRow(cr.RowStart);
+
+                            if (row != null)
+                            {
+                                if (row[map[crn.ColumnEnd - 1]].MergedRight == true)
+                                {
+                                    crn.ColumnEnd = cr.ColumnEnd;
+                                    cr = null;
+                                }
+                                else
+                                {
+                                    if (crn.RowStart == crn.RowEnd && crn.ColumnStart == crn.ColumnEnd)
+                                        cellRanges.RemoveAt(i);
+                                }
+                            }
+                            break;
+                        }
+                    }
+                }
+
+                if (cr != null)
+                    cellRanges.Add(cr);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region MergeHCells
+
+        private List<CellRange> MergeHCells(DisplayRange dr)
+        {
+            List<CellRange> cellRanges = new List<CellRange>();
+
+            GridColumnCollection columns = _GridPanel.Columns;
+            int[] map = columns.DisplayIndexMap;
+
+            for (int j = dr.RowStart; j < dr.RowEnd; j++)
+            {
+                GridRow row = GetRow(j);
+
+                if (row != null && row.Visible == true && row.IsTempInsertRow == false)
+                {
+                    CellRange cr = null;
+
+                    for (int i = dr.ColumnStart; i < dr.ColumnEnd; i++)
+                    {
+                        int index = map[i];
+
+                        GridColumn column = columns[index];
+
+                        if (column.Visible == true)
+                        {
+                            GridCell cell = row[index];
+
+                            if (cell != null)
+                            {
+                                if (cell.MergedLeft == true)
+                                {
+                                    if (cr == null)
+                                        cr = new CellRange(j, i);
+                                    else
+                                        cr.ColumnEnd = i + 1;
+                                }
+                                else
+                                {
+                                    OutputHCellRange(cellRanges, cr, map);
+
+                                    cr = new CellRange(j, i);
+                                }
+                            }
+                        }
+                    }
+
+                    OutputHCellRange(cellRanges, cr, map);
+                }
+            }
+
+            return (cellRanges);
+        }
+
+        #region OutputHCellRange
+
+        private void OutputHCellRange(
+            List<CellRange> cellRanges, CellRange cr, int[] map)
+        {
+            if (cr != null)
+            {
+                for (int i = 0; i < cellRanges.Count; i++)
+                {
+                    CellRange crn = cellRanges[i];
+
+                    if (crn.RowEnd == cr.RowStart)
+                    {
+                        if (crn.ColumnStart == cr.ColumnStart && crn.ColumnEnd == cr.ColumnEnd)
+                        {
+                            GridRow row = GetRow(crn.RowEnd - 1);
+
+                            if (row != null)
+                            {
+                                if (row[map[crn.ColumnEnd - 1]].MergedBottom == true)
+                                {
+                                    crn.RowEnd = cr.RowEnd;
+                                    cr = null;
+                                }
+                                else
+                                {
+                                    if (crn.RowStart == crn.RowEnd && crn.ColumnStart == crn.ColumnEnd)
+                                        cellRanges.RemoveAt(i);
+                                }
+                            }
+                            break;
+                        }
+                    }
+                }
+
+                if (cr != null)
+                    cellRanges.Add(cr);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region PostProcessCellRanges
+
+        private void PostProcessCellRanges(List<CellRange> cellRanges)
+        {
+            if (cellRanges != null)
+            {
+                for (int i = cellRanges.Count - 1; i >= 0; i--)
+                {
+                    CellRange cr = cellRanges[i];
+
+                    if (cr.ColumnCount <= 1 && cr.RowCount <= 1)
+                    {
+                        cellRanges.RemoveAt(i);
+                    }
+                    else
+                    {
+                        if (cr.FormattedValue == null)
+                        {
+                            GridCell cell = GetRow(cr.RowStart)[_GridPanel.Columns.DisplayIndexMap[cr.ColumnStart]];
+
+                            if (cell != null)
+                            {
+                                string s = cell.FormattedValue;
+
+                                cell.SuperGrid.DoGetCellRangeFormattedValueEvent((GridContainer)cell.GridRow.Parent, cr, ref s);
+
+                                cr.FormattedValue = s;
+                            }
+                            else
+                            {
+                                cr.FormattedValue = "";
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region GetDisplayBounds
+
+        private Rectangle GetDisplayBounds(CellRange cr)
+        {
+            Rectangle r = Rectangle.Empty;
+
+            if (cr != null)
+            {
+                GridPanel panel = _GridContainer.GridPanel;
+                int[] map = panel.Columns.DisplayIndexMap;
+
+                int rowHeight = 200;
+
+                for (int ri = cr.RowStart; ri < cr.RowEnd; ri++)
+                {
+                    GridRow row = GetRow(ri);
+
+                    if (row.Visible == true)
+                    {
+                        for (int ci = cr.ColumnStart; ci < cr.ColumnEnd; ci++)
+                        {
+                            int index = map[ci];
+
+                            GridCell cell = row.GetCell(index);
+
+                            if (cell != null)
+                            {
+                                r = (r.IsEmpty == true)
+                                        ? cell.BackBounds
+                                        : Rectangle.Union(r, cell.BackBounds);
+                            }
+                        }
+
+                        if (rowHeight > row.FixedRowHeight)
+                            rowHeight = row.FixedRowHeight;
+                    }
+                }
+
+                if (r.IsEmpty == false)
+                    r = AdjustMergeRect(panel, map, r, cr, rowHeight);
+            }
+
+            return (r);
+        }
+
+        #region AdjustMergeRect
+
+        private Rectangle AdjustMergeRect(GridPanel panel,
+            int[] map, Rectangle r, CellRange cr, int rowHeight)
+        {
+            Rectangle r2 = r;
+            Rectangle t = _GridContainer.SViewRect;
+
+            if (r.IntersectsWith(t))
+                r.Intersect(t);
+
+            if (r.Width > 0 && r.Height > 0)
+            {
+                if (r2.Y < t.Y)
+                {
+                    if (r.Height < rowHeight)
+                    {
+                        r.Y = r.Bottom - rowHeight;
+                        r.Height = rowHeight;
+                    }
+                }
+                else if (r2.Bottom > t.Bottom)
+                {
+                    if (r.Height < rowHeight)
+                        r.Height = rowHeight;
+                }
+
+                GridColumn cols = panel.Columns[map[cr.ColumnStart]];
+                GridColumn cole = panel.Columns[map[cr.ColumnEnd - 1]];
+
+                if (r2.X < t.X && cole.Bounds.X < t.X)
+                {
+                    if (r.Width < cole.BoundsRelative.Width)
+                    {
+                        r.X = r2.Right - cole.BoundsRelative.Width;
+                        r.Width = cole.BoundsRelative.Width;
+                    }
+                }
+                else if (r2.Right > t.Right && cols.Bounds.Right > r.Right)
+                {
+                    if (r.Width < cols.BoundsRelative.Width)
+                    {
+                        r.X = r2.X;
+                        r.Width = cols.BoundsRelative.Width;
+                    }
+                }
+            }
+
+            return (r);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region GetRow
+
+        private GridRow GetRow(int index)
+        {
+            return (_GridPanel.VirtualMode == true)
+                       ? _GridPanel.VirtualRows[index]
+                       : _GridContainer.Rows[index] as GridRow;
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridPanel.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridPanel.cs
new file mode 100644
index 00000000..108d4d3b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridPanel.cs	
@@ -0,0 +1,14939 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Drawing.Drawing2D;
+using System.Globalization;
+using System.IO;
+using System.Media;
+using System.Reflection;
+using System.Text;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.SuperGrid.Primitives;
+using DevComponents.DotNetBar.SuperGrid.Style;
+using DevComponents.SuperGrid.TextMarkup;
+
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    /// <summary>
+    /// Represents a grid panel which lays out the grid rows.
+    /// </summary>
+    [TypeConverter(typeof(BlankExpandableObjectConverter))]
+    public class GridPanel : GridContainer
+    {
+        #region Private variables
+
+        private string _Name = "";
+
+        private Psp0 _Psp0;
+        private Psp1 _Psp1;
+        private Psi _Psi;
+
+        private GridCaption _Caption;
+        private GridColumnHeader _ColumnHeader;
+
+        private GridHeader _Header;
+        private GridFooter _Footer;
+        private GridTitle _Title;
+        private GridFilter _Filter;
+        private GridGroupByRow _GroupByRow;
+
+        private string _NoRowsText;
+
+        private Size _LevelIndentSize = new Size(20, 10);
+        private int _FrozenColumnCount;
+        private int _FrozenRowCount;
+
+        private int _PrimaryColumnIndex;
+        private GridColumnCollection _Columns;
+        private List<GridColumn> _GroupColumns;
+
+        private List<GridColumn> _SortColumns;
+        private SortLevel _SortLevel = SortLevel.Root;
+        private SortCycle _SortCycle = SortCycle.NotSet;
+
+        private Image _ExpandImage;
+        private Image _CollapseImage;
+        private ImageList _ImageList;
+
+        private Size _CheckBoxSize = new Size(13, 13);
+        private GridLines _GridLines = GridLines.Both;
+
+        private ColumnAutoSizeMode _ColumnAutoSizeMode;
+        private CellMergeMode _CellMergeMode = CellMergeMode.HorizontalAndVertical;
+        private CellMergeOrder _CellMergeOrder = CellMergeOrder.VerticalThenHorizontal;
+
+        private KeyboardEditMode _KeyboardEditMode = KeyboardEditMode.EditOnKeystrokeOrF2;
+        private MouseEditMode _MouseEditMode = MouseEditMode.DoubleClick;
+        private RowEditMode _RowEditMode = RowEditMode.ClickedCell;
+        private RowFocusMode _RowFocusMode = RowFocusMode.FullRow;
+        private RowDoubleClickBehavior _RowDoubleClickBehavior = RowDoubleClickBehavior.Activate;
+
+        private SelectionGranularity _SelectionGranularity = SelectionGranularity.Cell;
+        private ColumnDragBehavior _ColumnDragBehavior = ColumnDragBehavior.ExtendClickBehavior;
+        private RowDragBehavior _RowDragBehavior = RowDragBehavior.ExtendSelection;
+        private CellDragBehavior _CellDragBehavior = CellDragBehavior.ExtendSelection;
+
+        private RowWhitespaceClickBehavior _RowWhitespaceClickBehavior = RowWhitespaceClickBehavior.ClearSelection;
+        private TopLeftHeaderSelectBehavior _TopLeftHeaderSelectBehavior = TopLeftHeaderSelectBehavior.Deterministic;
+
+        private ColumnHeaderClickBehavior _ColumnHeaderClickBehavior = ColumnHeaderClickBehavior.SortAndReorder;
+        private ColumnHeaderClickBehavior _ColumnGroupHeaderClickBehavior = ColumnHeaderClickBehavior.SortAndReorder;
+
+        private GroupHeaderKeyBehavior _GroupHeaderKeyBehavior = GroupHeaderKeyBehavior.Skip;
+        private GroupHeaderClickBehavior _GroupHeaderClickBehavior = GroupHeaderClickBehavior.None;
+        private WhitespaceClickBehavior _WhitespaceClickBehavior = WhitespaceClickBehavior.ClearSelection;
+
+        private RowHighlightType _RowHighlightType = RowHighlightType.Full;
+        private ActiveRowIndicatorStyle _ActiveRowIndicatorStyle = ActiveRowIndicatorStyle.Image;
+
+        private RowHeaderVisibility _GroupRowHeaderVisibility = RowHeaderVisibility.PanelControlled;
+
+        private int _RowHeaderWidth = 35;
+        private int _RowHeaderWidthEx;
+
+        private int _GroupHeaderHeight = 30;
+
+        private int _MaxRowHeight = 500;
+        private int _MinRowHeight = 5;
+        private int _DefaultRowHeight = 22;
+        private int _DefaultPreDetailRowHeight;
+        private int _DefaultPostDetailRowHeight;
+        private Size _RowHeaderSize;
+        private Size _SizeNeeded;
+
+        private int _VirtualRowCount;
+        private int _VirtualRowHeight = 22;
+        private GridVirtualRows _VirtualRows;
+        private GridRow _VirtualInsertRow;
+        private GridRow _VirtualTempInsertRow;
+
+        private Rectangle _WhiteSpaceRect;
+        private GridContainer _HotItem;
+
+        private ushort _SelectionClearCount = 1;
+        private ushort _SelectionUpdateCount = 1;
+        private ushort _LastSelectionUpdateCount = 1;
+        private ushort _DeleteUpdateCount = 1;
+        private ushort _ExpandedUpdateCount = 1;
+
+        private SelectedElements _SelectedRows;
+        private SelectedElements _SelectedColumns;
+
+        private GridContainer _SelectionRowAnchor;
+        private object _SelectionColumnAnchor;
+        private GridElement _LastProcessedItem;
+
+        private SelectedElements _DeletedRows;
+
+        private object _DataSource;
+        private string _DataMember;
+        private DataBinder _DataBinder;
+
+        private NullValue _NullValue = NullValue.DBNull;
+        private string _NullString = String.Empty;
+
+        private GridContainer _ActiveRow;
+        private GridContainer _LatentActiveContainer;
+        private int _LatentActiveRowIndex = -1;
+        private int _LatentActiveCellIndex = -1;
+
+        private Image _InsertRowImage;
+        private Image _InsertRowImageCache;
+        private int _InsertRowImageIndex = -1;
+
+        private Image _InsertTempRowImage;
+        private Image _InsertTempRowImageCache;
+        private int _InsertTempRowImageIndex = -1;
+
+        private RelativeRow _InitialActiveRow = RelativeRow.FirstRow;
+        private RelativeSelection _InitialSelection = RelativeSelection.FirstCell;
+
+        private StyleType _SizingStyle = StyleType.NotSet;
+        private DefaultVisualStyles _DefaultVisualStyles;
+        private GridPanelVisualStyle _EffectiveStyle;
+        private CellVisualStyles _EffectiveCellStyles;
+        private CellVisualStyles _EffectiveMergedCellStyles;
+        private ushort _StyleUpdateCount;
+
+        private BodyElement _NoRowsMarkup;
+
+        private string _FilterExpr;
+        private FilterEval _FilterEval;
+        private FilterMatchType _FilterMatchType = FilterMatchType.NotSet;
+        private FilterLevel _FilterLevel = FilterLevel.Root;
+
+        private int _NewIndex;
+        private int _NewFullIndex;
+        private int _NewGridIndex;
+
+        private ushort _IndiceesUpdateCount;
+        private ushort _RenderCount;
+
+        private GridContainer[] _GridIndexArray;
+        private Dictionary<GridCell, EEval> _ExpDictionary;
+
+        private int _VisibleRowCount;
+        private int _FilteredRowCount;
+        private int _RowHeaderIndexOffset;
+
+        private ExpandButtonType _ExpandButtonType = ExpandButtonType.NotSet;
+        private Image _ExpandButtonImage;
+        private Image _ExpandButtonHotImage;
+        private Image _CollapseButtonImage;
+        private Image _CollapseButtonHotImage;
+
+        private ProcessChildRelations _ProcessChildRelations = ProcessChildRelations.Always;
+        private NestedListScanTypes _NestedListScanTypes = NestedListScanTypes.Fields;
+        private DataRelation _DataRelation;
+
+        private GroupSortElement _GroupSortElement = GroupSortElement.GroupId;
+
+        private ShowRowInfoDisplayMode _ShowRowInfoDisplayMode = ShowRowInfoDisplayMode.ShowWithNonEmptyText;
+        private ShowCellInfoDisplayMode _ShowCellInfoDisplayMode = ShowCellInfoDisplayMode.ShowWithNonEmptyText;
+
+        #endregion
+
+        /// <summary>
+        /// GridPanel
+        /// </summary>
+        public GridPanel()
+        {
+            InitDefaultStates();
+
+            _ColumnAutoSizeMode = ColumnAutoSizeMode.None;
+
+            _Columns = new GridColumnCollection();
+            _Columns.ParentItem = this;
+
+            _Columns.CollectionChanged += ColumnsCollectionChanged;
+
+            _SortColumns = new List<GridColumn>();
+            _GroupColumns = new List<GridColumn>();
+
+            _ColumnHeader = new GridColumnHeader();
+            _ColumnHeader.Parent = this;
+            _ColumnHeader.Columns = _Columns;
+
+            _SelectedRows = new SelectedElements(SelectedElementType.SelectedRows);
+            _SelectedColumns = new SelectedElements(SelectedElementType.SelectedColumns);
+            _DeletedRows = new SelectedElements(SelectedElementType.DeletedRows);
+
+            _GridIndexArray = new GridContainer[64];
+            _ExpDictionary = new Dictionary<GridCell, EEval>();
+        }
+
+        #region InitDefaultStates
+
+        private void InitDefaultStates()
+        {
+            SetState(Psp0.AllowEdit, true);
+            SetState(Psp0.AllowNullCellMerge, true);
+
+            SetState(Psp0.AutoGenerateColumns, true);
+            SetState(Psp0.AutoHideDeletedRows, true);
+            SetState(Psp0.AutoSelectDeleteBoundRows, true);
+            SetState(Psp0.AutoSelectNewBoundRows, true);
+
+            SetState(Psp0.EnableSelectionBuffering, true);
+            SetState(Psp1.EnterKeySelectsNextRow, true);
+            SetState(Psp1.FilterIgnoreMatchCase, true);
+            SetState(Psp1.FocusCuesEnabled, true);
+            SetState(Psp1.IndentGroups, true);
+            SetState(Psp1.KeepRowsSorted, true);
+            SetState(Psp1.MultiSelect, true);
+
+            SetState(Psp1.ShowCellInfo, true);
+            SetState(Psp1.ShowDropShadow, true);
+            SetState(Psp1.ShowEditingImage, true);
+            SetState(Psp1.ShowGroupExpand, true);
+            SetState(Psp1.ShowGroupUnderline, true);
+            SetState(Psp1.ShowInsertRowImage, true);
+            SetState(Psp1.ShowRowInfo, true);
+            SetState(Psp1.ShowRowHeaders, true);
+            SetState(Psp1.ShowRowDirtyMarker, true);
+            SetState(Psp1.ShowToolTips, true);
+            SetState(Psp1.ShowWhitespaceRowLines, true);
+        }
+
+        #endregion
+
+        #region Hidden properties
+
+        #region Expanded
+
+        /// <summary>
+        /// Expanded
+        /// </summary>
+        [Browsable(false)]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public new bool Expanded
+        {
+            get { return (base.Expanded); }
+        }
+
+        #endregion
+
+        #region Style
+
+        /// <summary>
+        /// Style
+        /// </summary>
+        [Browsable(false)]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public new CellVisualStyles CellStyles
+        {
+            get { return (base.CellStyles); }
+        }
+
+        #endregion
+
+        #region Style
+
+        /// <summary>
+        /// Style
+        /// </summary>
+        [Browsable(false)]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public new string RowHeaderText
+        {
+            get { return (base.RowHeaderText); }
+        }
+
+        #endregion
+
+        #region RowStyles
+
+        /// <summary>
+        /// RowVisualStyles
+        /// </summary>
+        [Browsable(false)]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public new RowVisualStyles RowStyles
+        {
+            get { return (base.RowStyles); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Public properties
+
+        #region ActiveCell
+
+        /// <summary>
+        /// Gets the current Active Cell (or null)
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public GridCell ActiveCell
+        {
+            get
+            {
+                if (SuperGrid != null)
+                {
+                    GridCell cell = SuperGrid.ActiveCell;
+
+                    if (cell != null && cell.GridPanel == this)
+                        return (cell);
+                }
+
+                return (null);
+            }
+        }
+
+        #endregion
+
+        #region ActiveRow
+
+        /// <summary>
+        /// Gets the current Active Row. This row will have the
+        /// "Active Row" image presented in the row header (if
+        /// ActiveRowImage is non-null).
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public GridContainer ActiveRow
+        {
+            get { return (_ActiveRow); }
+
+            internal set
+            {
+                if (value != _ActiveRow)
+                {
+                    GridContainer oldActive = _ActiveRow;
+                    _ActiveRow = value;
+
+                    if (ActiveRowIndicatorStyle != ActiveRowIndicatorStyle.None)
+                    {
+                        if (oldActive != null)
+                            InvalidateRowHeader(oldActive);
+
+                        InvalidateRowHeader(_ActiveRow);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region ActiveRowIndicatorStyle
+
+        ///<summary>
+        /// Gets or sets how the Active Row
+        /// is visually indicated in the RowHeader.
+        ///</summary>
+        [DefaultValue(ActiveRowIndicatorStyle.Image), Category("Rows")]
+        [Description("Indicates how the Active Row is visually indicated in the RowHeader.")]
+        public ActiveRowIndicatorStyle ActiveRowIndicatorStyle
+        {
+            get { return (_ActiveRowIndicatorStyle); }
+
+            set
+            {
+                if (_ActiveRowIndicatorStyle != value)
+                {
+                    _ActiveRowIndicatorStyle = value;
+
+                    NeedsMeasured = true;
+
+                    OnPropertyChangedEx("ActiveRowIndicatorStyle", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region AllowEdit
+
+        /// <summary>
+        /// Gets or sets whether grid cells can be edited by the user. 
+        /// </summary>
+        [DefaultValue(true), Category("Behavior")]
+        [Description("Indicates whether grid cells can be edited by the user.")]
+        public bool AllowEdit
+        {
+            get { return (TestState(Psp0.AllowEdit)); }
+
+            set
+            {
+                if (value != AllowEdit)
+                {
+                    SetState(Psp0.AllowEdit, value);
+
+                    OnPropertyChanged("AllowEdit");
+                }
+            }
+        }
+
+        #endregion
+
+        #region AllowEmptyCellSelection
+
+        /// <summary>
+        /// Gets or sets whether empty cells can be
+        /// selected and interacted with by the user
+        /// </summary>
+        [DefaultValue(false), Category("Behavior")]
+        [Description("Indicates whether empty cells can be selected and interacted with by the user.")]
+        public bool AllowEmptyCellSelection
+        {
+            get { return (TestState(Psp0.AllowEmptyCellSelection)); }
+
+            set
+            {
+                if (value != AllowEmptyCellSelection)
+                {
+                    SetState(Psp0.AllowEmptyCellSelection, value);
+
+                    OnPropertyChanged("AllowEmptyCellSelection");
+                }
+            }
+        }
+
+        #endregion
+
+        #region AllowNullCellMerge
+
+        /// <summary>
+        /// Gets or sets whether cells with null/empty values
+        /// are allowed to be merged.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior")]
+        [Description("Indicates whether cells with null/empty values are allowed to be merged.")]
+        public bool AllowNullCellMerge
+        {
+            get { return (TestState(Psp0.AllowNullCellMerge)); }
+
+            set
+            {
+                if (value != AllowNullCellMerge)
+                {
+                    SetState(Psp0.AllowNullCellMerge, value);
+
+                    OnPropertyChanged("AllowNullCellMerge");
+                }
+            }
+        }
+
+        #endregion
+
+        #region AllowRowDelete
+
+        /// <summary>
+        /// Gets or sets whether grid rows can be deleted by the user. 
+        /// Selected rows are deleted by pressing the 'delete' key, and can
+        /// be restored by pressing the 'shift-delete' key.
+        /// </summary>
+        [DefaultValue(false), Category("Behavior")]
+        [Description("Indicates whether grid rows can be deleted by the user. Selected rows are deleted by pressing the 'delete' key, and can be restored by pressing the 'shift-delete' key.")]
+        public bool AllowRowDelete
+        {
+            get { return (TestState(Psp0.AllowRowDelete)); }
+
+            set
+            {
+                if (value != AllowRowDelete)
+                {
+                    SetState(Psp0.AllowRowDelete, value);
+
+                    OnPropertyChanged("AllowRowDelete");
+                }
+            }
+        }
+
+        #endregion
+
+        #region AllowRowHeaderResize
+
+        /// <summary>
+        /// Gets or sets whether grid row headers can be resized by the user.
+        /// </summary>
+        [DefaultValue(false), Category("Behavior")]
+        [Description("Indicates whether grid row headers can be resized by the user.")]
+        public bool AllowRowHeaderResize
+        {
+            get { return (TestState(Psp0.AllowRowHeaderResize)); }
+
+            set
+            {
+                if (value != AllowRowHeaderResize)
+                {
+                    SetState(Psp0.AllowRowHeaderResize, value);
+
+                    OnPropertyChanged("AllowRowHeaderResize");
+                }
+            }
+        }
+
+        #endregion
+
+        #region AllowRowInsert
+
+        /// <summary>
+        /// Gets or sets whether grid rows can be inserted
+        /// by the user. Rows can be inserted by selecting
+        /// a row and pressing the 'insert' key.
+        /// </summary>
+        [DefaultValue(false), Category("Behavior")]
+        [Description("Indicates whether grid rows can be inserted by the user. Rows can be inserted by selecting a row and pressing the 'insert' key.")]
+        public bool AllowRowInsert
+        {
+            get { return (TestState(Psp0.AllowRowInsert)); }
+
+            set
+            {
+                if (value != AllowRowInsert)
+                {
+                    SetState(Psp0.AllowRowInsert, value);
+
+                    OnPropertyChanged("AllowRowInsert");
+                }
+            }
+        }
+
+        #endregion
+
+        #region AllowRowResize
+
+        /// <summary>
+        /// Gets or sets whether grid rows can be resized by the user
+        /// </summary>
+        [DefaultValue(false), Category("Behavior")]
+        [Description("Indicates whether grid rows can be resized by the user.")]
+        public bool AllowRowResize
+        {
+            get { return (TestState(Psp0.AllowRowResize)); }
+
+            set
+            {
+                if (value != AllowRowResize)
+                {
+                    SetState(Psp0.AllowRowResize, value);
+
+                    OnPropertyChanged("AllowRowResize");
+                }
+            }
+        }
+
+        #endregion
+
+        #region AutoExpandSetGroup
+
+        ///<summary>
+        /// Gets or sets whether new SetGroups are automatically Expanded
+        ///</summary>
+        [DefaultValue(false), Category("Group")]
+        [Description("Indicates whether new SetGroups are automatically Expanded)")]
+        public bool AutoExpandSetGroup
+        {
+            get { return (TestState(Psp0.AutoExpandSetGroup)); }
+
+            set
+            {
+                if (AutoExpandSetGroup != value)
+                {
+                    SetState(Psp0.AutoExpandSetGroup, value);
+
+                    OnPropertyChanged("AutoExpandSetGroup");
+                }
+            }
+        }
+
+        #endregion
+
+        #region AutoGenerateColumns
+
+        /// <summary>
+        /// Gets or sets a whether columns are created automatically
+        /// at run-time when the DataSource property is set
+        /// </summary>
+        [DefaultValue(true), Category("Data")]
+        [Description("Indicates whether columns are created automatically at run-time when the DataSource property is set.")]
+        public bool AutoGenerateColumns
+        {
+            get { return (TestState(Psp0.AutoGenerateColumns)); }
+
+            set
+            {
+                if (AutoGenerateColumns != value)
+                {
+                    SetState(Psp0.AutoGenerateColumns, value);
+
+                    if (value == true)
+                        NeedToUpdateBindings = true;
+
+                    OnPropertyChangedEx("AutoGenerateColumns", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region AutoHideDeletedRows
+
+        /// <summary>
+        /// Gets or sets whether newly deleted rows are automatically hidden.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior")]
+        [Description("Indicates whether newly deleted rows are automatically hidden.")]
+        public bool AutoHideDeletedRows
+        {
+            get { return (TestState(Psp0.AutoHideDeletedRows)); }
+
+            set
+            {
+                if (AutoHideDeletedRows != value)
+                {
+                    SetState(Psp0.AutoHideDeletedRows, value);
+
+                    OnPropertyChanged("AutoHideDeletedRows");
+                }
+            }
+        }
+
+        #endregion
+
+        #region AutoSelectDeleteBoundRows
+
+        /// <summary>
+        /// Gets or sets whether the grid will automatically select the
+        /// next positionally available row following a bound data row deletion.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior")]
+        [Description("Indicates whether the grid will automatically select the next positionally available row following a bound data row deletion.")]
+        public bool AutoSelectDeleteBoundRows
+        {
+            get { return (TestState(Psp0.AutoSelectDeleteBoundRows)); }
+
+            set
+            {
+                if (AutoSelectDeleteBoundRows != value)
+                {
+                    SetState(Psp0.AutoSelectDeleteBoundRows, value);
+
+                    OnPropertyChanged("AutoSelectDeleteBoundRows");
+                }
+            }
+        }
+
+        #endregion
+
+        #region AutoSelectNewBoundRows
+
+        /// <summary>
+        /// Gets or sets whether newly added rows
+        /// (when bound to a data source) are automatically selected.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior")]
+        [Description("Indicates whether newly added rows (when bound to a data source) are automatically selected.")]
+        public bool AutoSelectNewBoundRows
+        {
+            get { return (TestState(Psp0.AutoSelectNewBoundRows)); }
+
+            set
+            {
+                if (AutoSelectNewBoundRows != value)
+                {
+                    SetState(Psp0.AutoSelectNewBoundRows, value);
+
+                    OnPropertyChanged("AutoSelectNewBoundRows");
+                }
+            }
+        }
+
+        #endregion
+
+        #region Bounds
+
+        ///<summary>
+        /// Gets the scroll adjusted bounds of the Grid Panel
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override Rectangle Bounds
+        {
+            get
+            {
+                Rectangle r = BoundsRelative;
+
+                if (IsVFrozen == false)
+                {
+                    if (IsSubPanel == true)
+                        r.X -= HScrollOffset;
+
+                    r.Y -= VScrollOffset;
+                }
+
+                return (r);
+            }
+        }
+
+        #endregion
+
+        #region CanDeleteRow
+
+        ///<summary>
+        /// Gets whether row deletes are permitted
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool CanDeleteRow
+        {
+            get
+            {
+                if (AllowRowDelete == false)
+                    return (false);
+
+                //if (GroupColumns != null && GroupColumns.Count > 0)
+                //    return (false);
+
+                return (DataBinder.CanDeleteRow);
+            }
+        }
+
+        #endregion
+
+        #region CanInsertRow
+
+        ///<summary>
+        /// Gets whether row inserts are permitted
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool CanInsertRow
+        {
+            get
+            {
+                if (AllowRowInsert == false)
+                    return (false);
+
+                if (GroupColumns != null && GroupColumns.Count > 0)
+                    return (false);
+
+                return (DataBinder.CanInsertRow);
+            }
+        }
+
+        #endregion
+
+        #region CanMoveRow
+
+        ///<summary>
+        /// Gets whether row moves are permitted
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool CanMoveRow
+        {
+            get
+            {
+                if (VirtualMode == false ||
+                    (RowDragBehavior != RowDragBehavior.Move && RowDragBehavior != RowDragBehavior.GroupMove))
+                {
+                    return (false);
+                }
+
+                return (DataBinder.CurrencyManager == null);
+            }
+        }
+        #endregion
+
+        #region Caption
+
+        ///<summary>
+        /// Gets or sets the Caption, which is displayed at the
+        /// very top of the panel.  The Caption is fixed
+        /// and it does not move as grid rows are scrolled.
+        ///</summary>
+        ///<exception cref="ArgumentException"></exception>
+        [Category("Header,Footer...")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        [Description("Indicates the Caption item, which is displayed at the very top of the panel. The Caption is fixed and it does not move as grid rows are scrolled.")]
+        public GridCaption Caption
+        {
+            get
+            {
+                if (_Caption == null)
+                    Caption = new GridCaption();
+
+                return (_Caption);
+            }
+
+            set
+            {
+                if (_Caption != value)
+                {
+                    if (value != null)
+                    {
+                        if (value.Parent != null)
+                            throw new ArgumentException("Item assigned as Caption already has a parent.");
+
+                    }
+
+                    _Caption = value;
+
+                    if (_Caption != null)
+                        _Caption.Parent = this;
+
+                    NeedsMeasured = true;
+
+                    OnPropertyChangedEx("Caption", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region CellDragBehavior
+
+        /// <summary>
+        /// Gets or sets the behavior when a cell is clicked and dragged
+        /// </summary>
+        [DefaultValue(CellDragBehavior.ExtendSelection), Category("Behavior")]
+        [Description("Indicates the behavior when a cell is clicked and dragged.")]
+        public CellDragBehavior CellDragBehavior
+        {
+            get { return (_CellDragBehavior); }
+
+            set
+            {
+                if (value != _CellDragBehavior)
+                {
+                    _CellDragBehavior = value;
+
+                    OnPropertyChanged("CellDragBehavior");
+                }
+            }
+        }
+
+        #endregion
+
+        #region CellMergeMode
+
+        /// <summary>
+        /// Gets or sets the default type of cell
+        /// merging that is supported by each cell in the panel
+        /// </summary>
+        [DefaultValue(CellMergeMode.HorizontalAndVertical), Category("Behavior")]
+        [Description("Indicates the default type of cell merging that is supported by each cell in the panel.")]
+        public CellMergeMode CellMergeMode
+        {
+            get { return (_CellMergeMode); }
+
+            set
+            {
+                if (value != _CellMergeMode)
+                {
+                    _CellMergeMode = value;
+
+                    InvalidateMerge();
+
+                    OnPropertyChangedEx("CellMergeMode", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region CellMergeOrder
+
+        /// <summary>
+        /// Gets or sets the default cell merging order that is supported by each
+        /// cell in the panel (i.e. horizontal then vertical or vertical then horizontal)
+        /// </summary>
+        [DefaultValue(CellMergeOrder.VerticalThenHorizontal), Category("Behavior")]
+        [Description("Indicates the default cell merging order that is supported by each cell in the panel (i.e. horizontal then vertical or vertical then horizontal.")]
+        public CellMergeOrder CellMergeOrder
+        {
+            get { return (_CellMergeOrder); }
+
+            set
+            {
+                if (value != _CellMergeOrder)
+                {
+                    _CellMergeOrder = value;
+
+                    InvalidateMerge();
+
+                    OnPropertyChangedEx("CellMergeOrder", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region CheckBoxes
+
+        /// <summary>
+        /// Get or sets whether CheckBoxes are present in the grid rows.
+        /// </summary>
+        [DefaultValue(false), Category("Appearance")]
+        [Description("Indicates whether CheckBoxes are present in the grid rows.")]
+        public bool CheckBoxes
+        {
+            get { return (TestState(Psp0.CheckBoxes)); }
+
+            set
+            {
+                if (CheckBoxes != value)
+                {
+                    SetState(Psp0.CheckBoxes, value);
+
+                    NeedsMeasured = true;
+
+                    OnPropertyChangedEx("CheckBoxes", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region CheckBoxSize
+
+        ///<summary>
+        /// Gets or sets the CheckBox size
+        ///</summary>
+        [Category("Appearance")]
+        [Description("Indicates the CheckBox size.")]
+        public Size CheckBoxSize
+        {
+            get { return (_CheckBoxSize); }
+
+            set
+            {
+                if (value != _CheckBoxSize)
+                {
+                    _CheckBoxSize = value;
+
+                    NeedsMeasured = true;
+
+                    OnPropertyChangedEx("CheckBoxSize", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        internal bool ShouldSerializeCheckBoxSize()
+        {
+            return (_CheckBoxSize.Height != 13 || _CheckBoxSize.Width != 13);
+        }
+
+        /// <summary>
+        /// Resets property to its default value
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        internal void ResetCheckBoxSize()
+        {
+            CheckBoxSize = new Size(13, 13);
+        }
+
+        #endregion
+
+        #region CollapseImage
+
+        /// <summary>
+        /// Gets or sets the default TreeButton collapse image
+        /// </summary>
+        [DefaultValue(null), Category("Appearance")]
+        [Description("Indicates the default TreeButton collapse image.")]
+        public Image CollapseImage
+        {
+            get { return (_CollapseImage); }
+
+            set
+            {
+                if (value != _CollapseImage)
+                {
+                    _CollapseImage = value;
+
+                    CollapseButtonImage = null;
+                    CollapseButtonHotImage = null;
+
+                    NeedsMeasured = true;
+
+                    OnPropertyChangedEx("CollapseImage", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ColumnAutoSizeMode
+
+        /// <summary>
+        /// Gets or sets a value indicating the default mode for determining column widths
+        /// </summary>
+        [DefaultValue(ColumnAutoSizeMode.None), Category("Columns")]
+        [Description("Indicates the default mode for determining column widths.")]
+        public ColumnAutoSizeMode ColumnAutoSizeMode
+        {
+            get { return (_ColumnAutoSizeMode); }
+
+            set
+            {
+                if (value != _ColumnAutoSizeMode)
+                {
+                    _ColumnAutoSizeMode = value;
+
+                    NeedsMeasured = true;
+
+                    OnPropertyChangedEx("ColumnAutoSizeMode", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ColumnHeader
+
+        /// <summary>
+        /// Gets the column header for the grid. The Column Header
+        /// is the container object responsible for the definition
+        /// and control of the Column Header row (container each
+        /// column header text, etc).
+        /// </summary>
+        [Category("Columns")]
+        [Description("Indicates the column header for the grid")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public GridColumnHeader ColumnHeader
+        {
+            get { return (_ColumnHeader); }
+        }
+
+        #endregion
+
+        #region ColumnHeaderClickBehavior
+
+        /// <summary>
+        /// Gets or sets the behavior when a column header is clicked.
+        /// </summary>
+        [Category("Columns")]
+        [DefaultValue(ColumnHeaderClickBehavior.SortAndReorder)]
+        [Description("Indicates the behavior when a column header is clicked.")]
+        public ColumnHeaderClickBehavior ColumnHeaderClickBehavior
+        {
+            get { return (_ColumnHeaderClickBehavior); }
+
+            set
+            {
+                if (value != _ColumnHeaderClickBehavior)
+                {
+                    _ColumnHeaderClickBehavior = value;
+
+                    OnPropertyChanged("ColumnHeaderClickBehavior");
+                }
+            }
+        }
+
+        #endregion
+
+        #region ColumnDragBehavior
+
+        /// <summary>
+        /// Gets or sets the behavior when a column header is dragged
+        /// </summary>
+        [DefaultValue(ColumnDragBehavior.ExtendClickBehavior), Category("Columns")]
+        [Description("Indicates the behavior when a column header is dragged.")]
+        public ColumnDragBehavior ColumnDragBehavior
+        {
+            get { return (_ColumnDragBehavior); }
+
+            set
+            {
+                if (value != _ColumnDragBehavior)
+                {
+                    _ColumnDragBehavior = value;
+
+                    OnPropertyChanged("ColumnDragBehavior");
+                }
+            }
+        }
+
+        #endregion
+
+        #region Columns
+
+        /// <summary>
+        /// Gets a reference to the collection of grid columns
+        /// </summary>
+        [Category("Columns")]
+        [Description("Indicates the collection of grid columns.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public GridColumnCollection Columns
+        {
+            get { return (_Columns); }
+        }
+
+        #endregion
+
+        #region ColumnGroupHeaderClickBehavior
+
+        /// <summary>
+        /// Gets or sets the behavior when a column GroupHeader is clicked.
+        /// </summary>
+        [Category("Columns")]
+        [DefaultValue(ColumnHeaderClickBehavior.SortAndReorder)]
+        [Description("Indicates the behavior when a column header is clicked.")]
+        public ColumnHeaderClickBehavior ColumnGroupHeaderClickBehavior
+        {
+            get { return (_ColumnGroupHeaderClickBehavior); }
+
+            set
+            {
+                if (value != _ColumnGroupHeaderClickBehavior)
+                {
+                    _ColumnGroupHeaderClickBehavior = value;
+
+                    OnPropertyChanged("ColumnGroupHeaderClickBehavior");
+                }
+            }
+        }
+
+        #endregion
+
+        #region DataMember
+
+        ///<summary>
+        /// Gets or sets the name of the list or table
+        /// in the data source that the grid is bound to.
+        ///</summary>
+        [DefaultValue(null), Category("Data")]
+        [Description("Indicates the name of the list or table in the data source that the grid is bound to.")]
+        public string DataMember
+        {
+            get { return (_DataMember); }
+
+            set
+            {
+                if (_DataBinder != null)
+                {
+                    _DataBinder.Clear();
+
+                    if (VirtualMode == false)
+                        Rows.Clear();
+                }
+
+                if (_DataMember != value)
+                {
+                    ClearSort();
+                    ClearGroup();
+                }
+
+                _DataMember = value;
+
+                NeedToUpdateBindings = true;
+                NeedToUpdateDataFilter = true;
+
+                NeedsMeasured = true;
+
+                OnPropertyChangedEx("DataMember", VisualChangeType.Layout);
+            }
+        }
+
+        #region SetDataMember
+
+        internal void SetDataMember(string dataMember)
+        {
+            _DataMember = dataMember;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region DataSource
+
+        ///<summary>
+        /// Gets or sets the data source that the grid is bound to
+        ///</summary>
+        [DefaultValue(null), AttributeProvider(typeof(IListSource)), Category("Data")]
+        [Description("Indicates the data source that the grid is bound to.")]
+        public object DataSource
+        {
+            get { return (_DataSource); }
+
+            set
+            {
+                if (_DataBinder != null)
+                    _DataBinder.Clear();
+
+                LoadInsertRow = true;
+
+                if (AutoGenerateColumns == true)
+                {
+                    ClearSort();
+                    ClearGroup();
+                }
+
+                _DataSource = value;
+
+                NeedToUpdateBindings = true;
+                NeedToUpdateDataFilter = true;
+
+                NeedsSorted = true;
+                NeedsMeasured = true;
+
+                OnPropertyChangedEx("DataSource", VisualChangeType.Layout);
+            }
+        }
+
+        #region SetDataSource
+
+        internal void SetDataSource(object dataSource)
+        {
+            _DataSource = dataSource;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region DefaultPostDetailRowHeight
+
+        ///<summary>
+        /// Gets or sets the default post-detail row height (default is 0)
+        ///</summary>
+        [DefaultValue(0), Category("Rows")]
+        [Description("Indicates the default post-detail row height (default is 0)")]
+        public int DefaultPostDetailRowHeight
+        {
+            get { return (_DefaultPostDetailRowHeight); }
+
+            set
+            {
+                if (_DefaultPostDetailRowHeight != value)
+                {
+                    if (value < 0)
+                        throw new ArgumentException("Value must be 0 or greater.");
+
+                    _DefaultPostDetailRowHeight = value;
+
+                    NeedsMeasured = true;
+
+                    OnPropertyChangedEx("DefaultPostDetailRowHeight", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region DefaultPreDetailRowHeight
+
+        ///<summary>
+        /// Gets or sets the default pre-detail row height (default is 0)
+        ///</summary>
+        [DefaultValue(0), Category("Rows")]
+        [Description("Indicates the default pre-detail row height (default is 0)")]
+        public int DefaultPreDetailRowHeight
+        {
+            get { return (_DefaultPreDetailRowHeight); }
+
+            set
+            {
+                if (_DefaultPreDetailRowHeight != value)
+                {
+                    if (value < 0)
+                        throw new ArgumentException("Value must be 0 or greater.");
+
+                    _DefaultPreDetailRowHeight = value;
+
+                    NeedsMeasured = true;
+
+                    OnPropertyChangedEx("DefaultPreDetailRowHeight", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region DefaultRowHeight
+
+        ///<summary>
+        /// Gets or sets the default row height (default is 20, 0 to autoSize)
+        ///</summary>
+        [DefaultValue(22), Category("Rows")]
+        [Description("Indicates the default row height (default is 20, 0 for autoSize)")]
+        public int DefaultRowHeight
+        {
+            get { return (_DefaultRowHeight); }
+
+            set
+            {
+                if (_DefaultRowHeight != value)
+                {
+                    if (value < 0)
+                        throw new ArgumentException("Value must be 0 or greater.");
+
+                    _DefaultRowHeight = value;
+
+                    NeedsMeasured = true;
+
+                    OnPropertyChangedEx("DefaultRowHeight", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region DefaultVisualStyles
+
+        ///<summary>
+        /// Gets or sets the Default Visual Styles for each grid element
+        ///</summary>
+        [Browsable(true), Category("Style")]
+        [Description("Gets or sets the Default Visual Styles for the each grid element.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public DefaultVisualStyles DefaultVisualStyles
+        {
+            get
+            {
+                if (_DefaultVisualStyles == null)
+                {
+                    _DefaultVisualStyles = new DefaultVisualStyles();
+
+                    DefaultVisualChangeHandler(null, _DefaultVisualStyles);
+                }
+
+                return (_DefaultVisualStyles);
+            }
+
+            set
+            {
+                if (_DefaultVisualStyles != value)
+                {
+                    DefaultVisualStyles oldValue = _DefaultVisualStyles;
+                    _DefaultVisualStyles = value;
+
+                    OnDefaultVisualStyleChanged(oldValue, value);
+                }
+            }
+        }
+
+        #region OnDefaultVisualStyleChanged
+
+        private void OnDefaultVisualStyleChanged(
+            DefaultVisualStyles oldValue, DefaultVisualStyles newValue)
+        {
+            DefaultVisualChangeHandler(oldValue, newValue);
+
+            OnPropertyChanged("DefaultVisualStyles");
+        }
+
+        #endregion
+
+        #region DefaultVisualChangeHandler
+
+        private void DefaultVisualChangeHandler(
+            DefaultVisualStyles oldValue, DefaultVisualStyles newValue)
+        {
+            NeedsMeasured = true;
+
+            if (oldValue != null)
+                oldValue.PropertyChanged -= DefaultVisualStylesPropertyChanged;
+
+            if (newValue != null)
+                newValue.PropertyChanged += DefaultVisualStylesPropertyChanged;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region DeletedRowCount
+
+        ///<summary>
+        /// Gets the current number of deleted rows.
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public int DeletedRowCount
+        {
+            get { return (_DeletedRows.Count); }
+        }
+
+        #endregion
+
+        #region DeletedRows
+
+        ///<summary>
+        /// IEnumerable that can be used to enumerate through
+        /// all root level deleted rows
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public IEnumerable DeletedRows
+        {
+            get { return (new SelectedRowsEnumeration(this, _DeletedRows)); }
+        }
+
+        #endregion
+
+        #region EnableCellExpressions
+
+        /// <summary>
+        /// Gets or sets whether cell expression evaluation is enabled.
+        /// </summary>
+        [DefaultValue(false), Category("Behavior")]
+        [Description("Indicates whether cell expression evaluation is enabled. Cell expressions begin with an equals sign '='.")]
+        public bool EnableCellExpressions
+        {
+            get { return (TestState(Psp0.EnableCellExpressions)); }
+
+            set
+            {
+                if (EnableCellExpressions != value)
+                {
+                    SetState(Psp0.EnableCellExpressions, value);
+
+                    OnPropertyChangedEx("EnableCellExpressions", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region EnableCellMerging
+
+        /// <summary>
+        /// Gets or sets whether cell merging is enabled.
+        /// </summary>
+        [DefaultValue(false), Category("Behavior")]
+        [Description("Indicates whether cell merging is enabled.")]
+        public bool EnableCellMerging
+        {
+            get { return (TestState(Psp0.EnableCellMerging)); }
+
+            set
+            {
+                if (EnableCellMerging != value)
+                {
+                    SetState(Psp0.EnableCellMerging, value);
+
+                    InvalidateMerge();
+
+                    OnPropertyChangedEx("EnableCellMerging", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region EnableCellRangeMarkup
+
+        /// <summary>
+        /// Gets or sets whether text-markup support is enabled for
+        /// merged cell text display (CellRange FormattedValue text).
+        /// </summary>
+        [DefaultValue(false), Category("Appearance")]
+        [Description("Indicates whether text-markup support is enabled for merged cell text display (CellRange FormattedValue text).")]
+        public bool EnableCellRangeMarkup
+        {
+            get { return (TestState(Psp0.EnableCellRangeMarkup)); }
+
+            set
+            {
+                if (EnableCellRangeMarkup != value)
+                {
+                    SetState(Psp0.EnableCellRangeMarkup, value);
+
+                    OnPropertyChangedEx("EnableCellRangeMarkup", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region EnableColumnFiltering
+
+        /// <summary>
+        /// Gets or sets whether column level filtering is enabled.
+        /// </summary>
+        [DefaultValue(false), Category("Filtering")]
+        [Description("Indicates whether column level filtering is enabled.")]
+        public bool EnableColumnFiltering
+        {
+            get { return (TestState(Psp0.EnableColumnFiltering)); }
+
+            set
+            {
+                if (EnableColumnFiltering != value)
+                {
+                    SetState(Psp0.EnableColumnFiltering, value);
+
+                    NeedToUpdateDataFilter = true;
+
+                    OnPropertyChangedEx("EnableColumnFiltering", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region EnableDiscreteBoundRows
+
+        /// <summary>
+        /// Gets or sets whether discrete bound row suport is enabled.
+        /// This property permits each bound row to be a separate object type.
+        /// </summary>
+        [DefaultValue(false), Category("Filtering")]
+        [Description("Indicates whether discrete bound row suport is enabled. This property permits each bound row to be a separate object type.")]
+        public bool EnableDiscreteBoundRows
+        {
+            get { return (TestState(Psp0.EnableDiscreteBoundRows)); }
+
+            set
+            {
+                if (EnableDiscreteBoundRows != value)
+                {
+                    SetState(Psp0.EnableDiscreteBoundRows, value);
+
+                    NeedToUpdateBindings = true;
+                    NeedToUpdateDataFilter = true;
+
+                    OnPropertyChangedEx("EnableDiscreteBoundRows", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region EnableFiltering
+
+        /// <summary>
+        /// Gets or sets whether filtering in general is enabled.
+        /// </summary>
+        [DefaultValue(false), Category("Filtering")]
+        [Description("Indicates whether filtering in general is enabled.")]
+        public bool EnableFiltering
+        {
+            get { return (TestState(Psp0.EnableFiltering)); }
+
+            set
+            {
+                if (EnableFiltering != value)
+                {
+                    SetState(Psp0.EnableFiltering, value);
+
+                    NeedToUpdateDataFilter = true;
+
+                    OnPropertyChangedEx("EnableFiltering", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region EnableNoRowsMarkup
+
+        /// <summary>
+        /// Gets or sets whether text-markup support is enabled for the NoRowsText
+        /// </summary>
+        [DefaultValue(false), Category("Appearance")]
+        [Description("Indicates whether text-markup support is enabled for the NoRowsText.")]
+        public bool EnableNoRowsMarkup
+        {
+            get { return (TestState(Psp0.EnableNoRowsMarkup)); }
+
+            set
+            {
+                if (EnableNoRowsMarkup != value)
+                {
+                    SetState(Psp0.EnableNoRowsMarkup, value);
+
+                    NoRowsMarkupTextChanged();
+
+                    OnPropertyChangedEx("EnableNoRowsMarkup", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region EnableRowFiltering
+
+        /// <summary>
+        /// Gets or sets whether row level filtering is enabled.
+        /// </summary>
+        [DefaultValue(false), Category("Filtering")]
+        [Description("Indicates whether row level filtering is enabled.")]
+        public bool EnableRowFiltering
+        {
+            get { return (TestState(Psp0.EnableRowFiltering)); }
+
+            set
+            {
+                if (EnableRowFiltering != value)
+                {
+                    SetState(Psp0.EnableRowFiltering, value);
+
+                    NeedToUpdateDataFilter = true;
+
+                    OnPropertyChangedEx("EnableRowFiltering", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region EnableSelectionBuffering
+
+        /// <summary>
+        /// Gets or sets whether selection buffering is enabled, such
+        /// that only one SelectionChange event is raised per output refresh.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior")]
+        [Description("Indicates whether selection buffering is enabled, such that only one SelectionChange event is raised per output refresh..")]
+        public bool EnableSelectionBuffering
+        {
+            get { return (TestState(Psp0.EnableSelectionBuffering)); }
+
+            set
+            {
+                if (EnableSelectionBuffering != value)
+                {
+                    SetState(Psp0.EnableSelectionBuffering, value);
+
+                    OnPropertyChanged("EnableSelectionBuffering");
+                }
+            }
+        }
+
+        #endregion
+
+        #region EnsureVisibleAfterGrouping
+
+        /// <summary>
+        /// Gets or sets whether EnsureVisible will be called
+        /// for the current ActiveRow following a grouping operation.
+        /// </summary>
+        [DefaultValue(false), Category("Behavior")]
+        [Description("Indicates whether EnsureVisible will be called for the current ActiveRow following a grouping operation.")]
+        public bool EnsureVisibleAfterGrouping
+        {
+            get { return (TestState(Psp1.EnsureVisibleAfterGrouping)); }
+
+            set
+            {
+                if (value != EnsureVisibleAfterGrouping)
+                {
+                    SetState(Psp1.EnsureVisibleAfterGrouping, value);
+
+                    OnPropertyChanged("EnsureVisibleAfterGrouping");
+                }
+            }
+        }
+
+        #endregion
+
+        #region EnsureVisibleAfterSort
+
+        /// <summary>
+        /// Gets or sets whether EnsureVisible will be called
+        /// for the current ActiveRow following a sort operation.
+        /// </summary>
+        [DefaultValue(false), Category("Behavior")]
+        [Description("Indicates whether EnsureVisible will be called for the current ActiveRow following a sort operation.")]
+        public bool EnsureVisibleAfterSort
+        {
+            get { return (TestState(Psp1.EnsureVisibleAfterSort)); }
+
+            set
+            {
+                if (value != EnsureVisibleAfterSort)
+                {
+                    SetState(Psp1.EnsureVisibleAfterSort, value);
+
+                    OnPropertyChanged("EnsureVisibleAfterSort");
+                }
+            }
+        }
+
+        #endregion
+
+        #region EnterKeySelectsNextRow
+
+        /// <summary>
+        /// Gets or sets whether the EnterKey selects the
+        /// next available row, or stays on the current row
+        /// </summary>
+        [DefaultValue(true), Category("Behavior")]
+        [Description("Indicates whether the EnterKey selects the next available row, or stays on the current row.")]
+        public bool EnterKeySelectsNextRow
+        {
+            get { return (TestState(Psp1.EnterKeySelectsNextRow)); }
+
+            set
+            {
+                if (EnterKeySelectsNextRow != value)
+                {
+                    SetState(Psp1.EnterKeySelectsNextRow, value);
+
+                    OnPropertyChanged("EnterKeySelectsNextRow");
+                }
+            }
+        }
+
+        #endregion
+
+        #region ExpandButtonType
+
+        /// <summary>
+        /// Gets or sets the ExpandButton Type
+        /// </summary>
+        [DefaultValue(ExpandButtonType.NotSet), Category("Appearance")]
+        [Description("Indicates the ExpandButton Type.")]
+        public ExpandButtonType ExpandButtonType
+        {
+            get { return (_ExpandButtonType); }
+
+            set
+            {
+                if (_ExpandButtonType != value)
+                {
+                    _ExpandButtonType = value;
+
+                    ExpandButtonImage = null;
+                    ExpandButtonHotImage = null;
+                    CollapseButtonImage = null;
+                    CollapseButtonHotImage = null;
+
+                    OnPropertyChangedEx("ExpandButtonType", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #region GetExpandButtonType
+
+        internal ExpandButtonType GetExpandButtonType()
+        {
+            ExpandButtonType type = _ExpandButtonType;
+
+            if (type == ExpandButtonType.NotSet)
+                type = SuperGrid.ExpandButtonType;
+
+            return (type != ExpandButtonType.NotSet ? type : ExpandButtonType.Square);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ExpandImage
+
+        /// <summary>
+        /// Gets or sets the default TreeButton expand image
+        /// </summary>
+        [DefaultValue(null), Category("Appearance")]
+        [Description("Indicates the default TreeButton expand image.")]
+        public Image ExpandImage
+        {
+            get { return (_ExpandImage); }
+
+            set
+            {
+                if (value != _ExpandImage)
+                {
+                    _ExpandImage = value;
+
+                    ExpandButtonImage = null;
+                    ExpandButtonHotImage = null;
+
+                    NeedsMeasured = true;
+
+                    OnPropertyChangedEx("ExpandImage", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region FilteredRowCount
+
+        ///<summary>
+        /// Gets the current count of rows that have been filtered out.
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public int FilteredRowCount
+        {
+            get { return (_FilteredRowCount); }
+        }
+
+        #endregion
+
+        #region Filter
+
+        /// <summary>
+        /// Gets or sets the Filter item which is displayed just below
+        /// the Column Header. The Filter area is fixed and it does
+        /// not move as grid rows are scrolled.
+        /// </summary>
+        [Category("Filtering")]
+        [Description("Indicates the Filter item, which is displayed just below the Column Header. The Filter area is fixed and it does not move as grid rows are scrolled.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public GridFilter Filter
+        {
+            get
+            {
+                if (_Filter == null)
+                    Filter = new GridFilter();
+
+                return (_Filter);
+            }
+
+            set
+            {
+                if (_Filter != value)
+                {
+                    if (value != null)
+                    {
+                        if (value.Parent != null)
+                            throw new ArgumentException("Item assigned as Filter already has a parent.");
+                    }
+
+                    _Filter = value;
+
+                    if (_Filter != null)
+                        _Filter.Parent = this;
+
+                    NeedsMeasured = true;
+
+                    OnPropertyChangedEx("Filter", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region FilterExpr
+
+        /// <summary>
+        /// Gets or sets the Filter expression.
+        /// </summary>
+        [DefaultValue(null), Category("Filtering")]
+        [Description("Indicates the Filter expression.")]
+        public string FilterExpr
+        {
+            get
+            {
+                return (_FilterExpr);
+            }
+
+            set
+            {
+                if (_FilterExpr != value)
+                {
+                    _FilterExpr = value;
+                    _FilterEval = null;
+
+                    NeedToUpdateDataFilter = true;
+
+                    OnPropertyChangedEx("FilterExpr", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region FilterIgnoreMatchCase
+
+        /// <summary>
+        /// Gets or sets the filter data match ignores string case
+        /// </summary>
+        [DefaultValue(true), Category("Filtering")]
+        [Description("Indicates the filter data match ignores string case).")]
+        public bool FilterIgnoreMatchCase
+        {
+            get { return (TestState(Psp1.FilterIgnoreMatchCase)); }
+
+            set
+            {
+                if (FilterIgnoreMatchCase != value)
+                {
+                    SetState(Psp1.FilterIgnoreMatchCase, value);
+
+                    _FilterEval = null;
+                    ClearColumnFilterEvals();
+
+                    NeedToUpdateDataFilter = true;
+
+                    OnPropertyChangedEx("FilterIgnoreCase", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region FilterLevel
+
+        /// <summary>
+        /// Gets or sets the column Filtering level. 
+        /// </summary>
+        [DefaultValue(FilterLevel.Root), Category("Filtering")]
+        [Description("Indicates the column filtering level.")]
+        public FilterLevel FilterLevel
+        {
+            get { return (_FilterLevel); }
+
+            set
+            {
+                if (_FilterLevel != value)
+                {
+                    _FilterLevel = value;
+
+                    NeedsFilterScan = true;
+                    NeedToUpdateDataFilter = true;
+
+                    OnPropertyChangedEx("FilterLevel", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region FilterMatchType
+
+        /// <summary>
+        /// Gets or sets the filter data match type (how data elements are matched)
+        /// </summary>
+        [DefaultValue(FilterMatchType.NotSet), Category("Filtering")]
+        [Description("Indicates the filter data match style (how data elements are matched).")]
+        public FilterMatchType FilterMatchType
+        {
+            get { return (_FilterMatchType); }
+
+            set
+            {
+                if (_FilterMatchType != value)
+                {
+                    _FilterMatchType = value;
+
+                    FilterEval = null;
+
+                    ClearColumnFilterEvals();
+
+                    NeedToUpdateDataFilter = true;
+
+                    OnPropertyChangedEx("FilterMatchType", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #region GetFilterMatchType
+
+        internal FilterMatchType GetFilterMatchType()
+        {
+            if (_FilterMatchType != FilterMatchType.NotSet)
+                return (_FilterMatchType);
+
+            return (FilterMatchType.None);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region FirstFrozenColumn
+
+        /// <summary>
+        /// Gets a reference to the first Frozen column
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public GridColumn FirstFrozenColumn
+        {
+            get
+            {
+                int[] displayMap = Columns.DisplayIndexMap;
+
+                for (int i = 0; i < displayMap.Length; i++)
+                {
+                    GridColumn column = Columns[displayMap[i]];
+
+                    if (column.Visible == true && column.IsHFrozen == true)
+                        return (column);
+                }
+
+                return (null);
+            }
+        }
+
+        #endregion
+
+        #region FirstOnScreenColumn
+
+        /// <summary>
+        /// Gets a reference to the first on-screen column
+        /// (after frozen columns)
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public GridColumn FirstOnScreenColumn
+        {
+            get
+            {
+                int[] displayMap = Columns.DisplayIndexMap;
+
+                for (int i = 0; i < displayMap.Length; i++)
+                {
+                    GridColumn column = Columns[displayMap[i]];
+
+                    if (column.IsHFrozen == false && column.IsOnScreen == true)
+                        return (column);
+                }
+
+                return (null);
+            }
+        }
+
+        #endregion
+
+        #region FirstVisibleColumn
+
+        /// <summary>
+        /// Gets a reference to the first visible column
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public GridColumn FirstVisibleColumn
+        {
+            get { return (_Columns.FirstVisibleColumn); }
+        }
+
+        #endregion
+
+        #region FlatCheckedRows
+
+        ///<summary>
+        /// IEnumerable that can be used to enumerate through
+        /// all levels of checked rows as though they were at
+        /// the root level
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public IEnumerable FlatCheckedRows
+        {
+            get { return (new FlatCheckedRowsEnumeration(this, false)); }
+        }
+
+        #endregion
+
+        #region FlatCheckedExpandedRows
+
+        ///<summary>
+        /// IEnumerable that can be used to enumerate through
+        /// all levels of checked, expanded rows as though they
+        /// were at the root level
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public IEnumerable FlatCheckedExpandedRows
+        {
+            get { return (new FlatCheckedRowsEnumeration(this, true)); }
+        }
+
+        #endregion
+
+        #region FlatDeletedRows
+
+        ///<summary>
+        /// IEnumerable that can be used to enumerate through
+        /// all levels of deleted rows as though they were at
+        /// the root level
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public IEnumerable FlatDeletedRows
+        {
+            get { return (new FlatDeletedRowsEnumeration(this)); }
+        }
+
+        #endregion
+
+        #region FlatDirtyRows
+
+        ///<summary>
+        /// IEnumerable that can be used to enumerate through
+        /// all levels of dirty rows as though they were at
+        /// the root level
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public IEnumerable FlatDirtyRows
+        {
+            get { return (new FlatDirtyRowsEnumeration(this, false)); }
+        }
+
+        #endregion
+
+        #region FlatDirtyExpandedRows
+
+        ///<summary>
+        /// IEnumerable that can be used to enumerate through
+        /// all levels of dirty, expanded rows as though they were at
+        /// the root level
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public IEnumerable FlatDirtyExpandedRows
+        {
+            get { return (new FlatDirtyRowsEnumeration(this, true)); }
+        }
+
+        #endregion
+
+        #region FlatExpandedRows
+
+        ///<summary>
+        /// IEnumerable that can be used to enumerate through
+        /// all levels of expanded rows as though they were at
+        /// the root level
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public IEnumerable FlatExpandedRows
+        {
+            get { return (new FlatRowsEnumeration(this, true, false)); }
+        }
+
+        #endregion
+
+        #region FlatRows
+
+        ///<summary>
+        /// IEnumerable that can be used to enumerate through
+        /// all levels of rows as though they were at the root level
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public IEnumerable FlatRows
+        {
+            get { return (new FlatRowsEnumeration(this, false, false)); }
+        }
+
+        #endregion
+
+        #region FlatSelectedRows
+
+        ///<summary>
+        /// IEnumerable that can be used to enumerate through
+        /// all levels of selected rows as though they were at
+        /// the root level
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public IEnumerable FlatSelectedRows
+        {
+            get { return (new FlatSelectedRowsEnumeration(this, false)); }
+        }
+
+        #endregion
+
+        #region FlatSelectedExpandedRows
+
+        ///<summary>
+        /// IEnumerable that can be used to enumerate through
+        /// all levels of selected, expanded rows as though they
+        /// were at the root level
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public IEnumerable FlatSelectedExpandedRows
+        {
+            get { return (new FlatSelectedRowsEnumeration(this, true)); }
+        }
+
+        #endregion
+
+        #region FlatVisibleExpandedRows
+
+        ///<summary>
+        /// IEnumerable that can be used to enumerate through
+        /// all levels of visible, expanded rows as though they
+        /// were at the root level
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public IEnumerable FlatVisibleExpandedRows
+        {
+            get { return (new FlatRowsEnumeration(this, true, true)); }
+        }
+
+        #endregion
+
+        #region FlatVisibleRows
+
+        ///<summary>
+        /// IEnumerable that can be used to enumerate through
+        /// all levels of visible rows as though they
+        /// were at the root level
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public IEnumerable FlatVisibleRows
+        {
+            get { return (new FlatRowsEnumeration(this, false, true)); }
+        }
+
+        #endregion
+
+        #region FocusCuesEnabled
+
+        /// <summary>
+        /// Gets or sets whether focus cues are displayed on the focused element
+        /// </summary>
+        [DefaultValue(true), Category("Appearance")]
+        [Description("Indicates whether focus cues are displayed on the focused element.")]
+        public bool FocusCuesEnabled
+        {
+            get { return (TestState(Psp1.FocusCuesEnabled)); }
+
+            set
+            {
+                if (FocusCuesEnabled != value)
+                {
+                    SetState(Psp1.FocusCuesEnabled, value);
+
+                    OnPropertyChangedEx("FocusCuesEnabled", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region Footer
+
+        /// <summary>
+        /// Gets or sets the Footer, which is displayed at the
+        /// very bottom of the panel.  The Footer is fixed
+        /// and it does not move as grid rows are scrolled.
+        /// </summary>
+        [Category("Header,Footer...")]
+        [Description("Indicates the Footer item, which is displayed at the very bottom of the panel. The Footer is fixed and does not move as grid rows are scrolled.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public GridFooter Footer
+        {
+            get
+            {
+                if (_Footer == null)
+                    Footer = new GridFooter();
+
+                return (_Footer);
+            }
+
+            set
+            {
+                if (_Footer != value)
+                {
+                    if (value != null)
+                    {
+                        if (value.Parent != null)
+                            throw new ArgumentException("Item assigned as Footer already has a parent.");
+                    }
+
+                    _Footer = value;
+
+                    NeedsMeasured = true;
+
+                    if (_Footer != null)
+                        _Footer.Parent = this;
+
+                    OnPropertyChangedEx("Footer", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region FrozenColumnCount
+
+        /// <summary>
+        /// Gets or sets the number of columns that are frozen, counted
+        /// from the left. Frozen columns are always visible regardless
+        /// of the horizontal scroll position.
+        /// </summary>
+        [DefaultValue(0), Category("Columns")]
+        [Description("Indicates the number of columns that are frozen, counted from the left. Frozen columns are always visible regardless of the horizontal scroll position.")]
+        public int FrozenColumnCount
+        {
+            get { return (_FrozenColumnCount); }
+
+            set
+            {
+                if (value != _FrozenColumnCount)
+                {
+                    _FrozenColumnCount = value;
+
+                    OnPropertyChangedEx("FrozenColumnCount", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region FrozenRowCount
+
+        /// <summary>
+        /// Gets or sets the number of rows that are frozen, counted
+        /// from the top. Frozen rows are always visible regardless
+        /// of the vertical scroll position.
+        /// </summary>
+        [DefaultValue(0), Category("Rows")]
+        [Description("Indicates the number of rows that are frozen, counted from the top. Frozen rows are always visible regardless of the vertical scroll position.")]
+        public int FrozenRowCount
+        {
+            get { return (_FrozenRowCount); }
+
+            set
+            {
+                if (value != _FrozenRowCount)
+                {
+                    _FrozenRowCount = value;
+
+                    OnPropertyChangedEx("FrozenRowCount", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region GridLines
+
+        /// <summary>
+        /// Gets or sets which grid lines (horizontal and vertical) are displayed in the grid
+        /// </summary>
+        [DefaultValue(GridLines.Both), Category("Appearance")]
+        [Description("Indicates which grid lines (horizontal and vertical) are displayed in the grid.")]
+        public GridLines GridLines
+        {
+            get { return (_GridLines); }
+
+            set
+            {
+                if (_GridLines != value)
+                {
+                    _GridLines = value;
+
+                    OnPropertyChangedEx("GridLines", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region GroupBy
+
+        /// <summary>
+        /// Gets or sets the row which is displayed just above
+        /// the Column Header, and is used to permit display and user control
+        /// of column grouping. The GroupByRow is fixed and it does
+        /// not move as grid rows are scrolled.
+        /// </summary>
+        [Category("Header,Footer...")]
+        [Description("Indicates the row, which is displayed just above the Column Header, and is used to display and permit user control of column grouping. The GroupByRow is fixed and it does not move as grid rows are scrolled.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public GridGroupByRow GroupByRow
+        {
+            get
+            {
+                if (_GroupByRow == null)
+                    GroupByRow = new GridGroupByRow();
+
+                return (_GroupByRow);
+            }
+
+            set
+            {
+                if (_GroupByRow != value)
+                {
+                    if (value != null)
+                    {
+                        if (value.Parent != null)
+                            throw new ArgumentException("Item assigned as GroupByRow already has a parent.");
+                    }
+
+                    _GroupByRow = value;
+
+                    if (_GroupByRow != null)
+                        _GroupByRow.Parent = this;
+
+                    NeedsMeasured = true;
+
+                    OnPropertyChangedEx("GroupByRow", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region GroupColumns
+
+        /// <summary>
+        /// Gets or sets the panel Group columns
+        /// </summary>
+        public List<GridColumn> GroupColumns
+        {
+            get { return (_GroupColumns); }
+        }
+
+        #endregion
+
+        #region GroupHeaderClickBehavior
+
+        /// <summary>
+        /// Gets or sets the behavior when a Group header is clicked
+        /// </summary>
+        [DefaultValue(GroupHeaderClickBehavior.None), Category("Group")]
+        [Description("Indicates the behavior when a Group header is clicked.")]
+        public GroupHeaderClickBehavior GroupHeaderClickBehavior
+        {
+            get { return (_GroupHeaderClickBehavior); }
+
+            set
+            {
+                if (_GroupHeaderClickBehavior != value)
+                {
+                    _GroupHeaderClickBehavior = value;
+
+                    OnPropertyChanged("GroupHeaderClickBehavior");
+                }
+            }
+        }
+
+        #endregion
+
+        #region GroupHeaderKeyBehavior
+
+        /// <summary>
+        /// Gets or sets the behavior when a Group header
+        /// is encountered during keyboard navigation
+        /// </summary>
+        [DefaultValue(GroupHeaderKeyBehavior.Skip), Category("Group")]
+        [Description("Indicates the behavior when a Group header is encountered during keyboard navigation.")]
+        public GroupHeaderKeyBehavior GroupHeaderKeyBehavior
+        {
+            get { return (_GroupHeaderKeyBehavior); }
+
+            set
+            {
+                if (_GroupHeaderKeyBehavior != value)
+                {
+                    _GroupHeaderKeyBehavior = value;
+
+                    OnPropertyChanged("GroupHeaderKeyBehavior");
+                }
+            }
+        }
+
+        #endregion
+
+        #region GroupHeaderHeight
+
+        /// <summary>
+        /// Gets or sets the height of the Group header 
+        /// </summary>
+        [DefaultValue(30), Category("Group")]
+        [Description("Indicates the height of the Group header.")]
+        public int GroupHeaderHeight
+        {
+            get { return (_GroupHeaderHeight); }
+
+            set
+            {
+                if (_GroupHeaderHeight != value)
+                {
+                    _GroupHeaderHeight = value;
+
+                    OnPropertyChangedEx("GroupHeaderHeight", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region GroupRowHeaderVisibility
+
+        /// <summary>
+        /// Gets or sets whether the Group RowHeader is displayed
+        /// </summary>
+        [DefaultValue(RowHeaderVisibility.PanelControlled), Category("Group")]
+        [Description("Indicates whether the Group RowHeader is displayed.")]
+        public virtual RowHeaderVisibility GroupRowHeaderVisibility
+        {
+            get { return (_GroupRowHeaderVisibility); }
+
+            set
+            {
+                if (value != _GroupRowHeaderVisibility)
+                {
+                    _GroupRowHeaderVisibility = value;
+
+                    OnPropertyChangedEx("GroupRowHeaderVisibility", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region GroupSortElement
+
+        /// <summary>
+        /// Gets or sets the group element used to sort panel groups. 
+        /// </summary>
+        [DefaultValue(GroupSortElement.GroupId), Category("Group")]
+        [Description("Indicates the group element used to sort panel groups.")]
+        public GroupSortElement GroupSortElement
+        {
+            get { return (_GroupSortElement); }
+
+            set
+            {
+                if (_GroupSortElement != value)
+                {
+                    _GroupSortElement = value;
+
+                    OnPropertyChangedEx("GroupSortElement", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region Header
+
+        /// <summary>
+        /// Gets or sets the Header item, which is displayed 
+        /// just below the column header. The Header item is fixed
+        /// and does not move as grid rows are scrolled.
+        /// </summary>
+        [Category("Header,Footer...")]
+        [Description("Indicates the Header item, which is displayed just below the column header. The Header is fixed and does not move as grid rows are scrolled.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public GridHeader Header
+        {
+            get
+            {
+                if (_Header == null)
+                    Header = new GridHeader();
+
+                return (_Header);
+            }
+
+            set
+            {
+                if (_Header != value)
+                {
+                    if (value != null)
+                    {
+                        if (value.Parent != null)
+                            throw new ArgumentException("Item assigned as Header already has a parent.");
+                    }
+
+                    _Header = value;
+
+                    NeedsMeasured = true;
+
+                    if (_Header != null)
+                        _Header.Parent = this;
+
+                    OnPropertyChangedEx("Header", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ImageList
+
+        /// <summary>
+        /// Gets or sets the ImageList used by the Grid elements
+        /// </summary>
+        [Browsable(true), Category("Appearance"), DefaultValue(null)]
+        [Description("Indicates the ImageList used by the Grid elements.")]
+        public ImageList ImageList
+        {
+            get { return (_ImageList); }
+
+            set
+            {
+                if (_ImageList != value)
+                {
+                    _ImageList = value;
+
+                    NeedsMeasured = true;
+
+                    OnPropertyChangedEx("ImageList", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ImmediateResize
+
+        ///<summary>
+        /// Gets or sets whether resizing panel columns
+        /// and rows occurs immediately
+        ///</summary>
+        [DefaultValue(false), Category("Behavior")]
+        [Description("Indicates whether resizing panel columns and rows occurs immediately.")]
+        public bool ImmediateResize
+        {
+            get { return (TestState(Psp1.ImmediateResize)); }
+
+            set
+            {
+                if (ImmediateResize != value)
+                {
+                    SetState(Psp1.ImmediateResize, value);
+
+                    OnPropertyChanged("ImmediateResize");
+                }
+            }
+        }
+
+        #endregion
+
+        #region IndentGroups
+
+        /// <summary>
+        /// Gets or sets whether Nested Groups are indented
+        /// </summary>
+        [DefaultValue(true), Category("Group")]
+        [Description("Indicates whether Nested Groups are indented.")]
+        public bool IndentGroups
+        {
+            get { return (TestState(Psp1.IndentGroups)); }
+
+            set
+            {
+                if (value != IndentGroups)
+                {
+                    SetState(Psp1.IndentGroups, value);
+
+                    NeedsMeasured = true;
+
+                    OnPropertyChangedEx("IndentGroups", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region InitialActiveRow
+
+        /// <summary>
+        /// Gets or sets the initial Active Row
+        /// </summary>
+        [DefaultValue(RelativeRow.FirstRow), Category("Selection")]
+        [Description("Indicates the initial Active Row")]
+        public RelativeRow InitialActiveRow
+        {
+            get { return (_InitialActiveRow); }
+
+            set
+            {
+                if (value != _InitialActiveRow)
+                {
+                    _InitialActiveRow = value;
+
+                    OnPropertyChanged("InitialActiveRow");
+                }
+            }
+        }
+
+        #endregion
+
+        #region InitialSelection
+
+        /// <summary>
+        /// Gets or sets the initial relative row / cell selection
+        /// </summary>
+        [DefaultValue(RelativeSelection.FirstCell), Category("Selection")]
+        [Description("Indicates the initial relative row / cell selection.")]
+        public RelativeSelection InitialSelection
+        {
+            get { return (_InitialSelection); }
+
+            set
+            {
+                if (value != _InitialSelection)
+                {
+                    _InitialSelection = value;
+
+                    OnPropertyChanged("InitialSelection");
+                }
+            }
+        }
+
+        #endregion
+
+        #region InsertRowImage
+
+        /// <summary>
+        /// Gets or sets the default image to display
+        /// in the row header to denote the Insertion Row.
+        /// </summary>
+        [DefaultValue(null), Category("Rows")]
+        [Description("Indicates the image to display in the row header to denote the Insertion Row.")]
+        public Image InsertRowImage
+        {
+            get { return (_InsertRowImage); }
+
+            set
+            {
+                if (_InsertRowImage != value)
+                {
+                    if (_InsertRowImageCache != null)
+                    {
+                        _InsertRowImageCache.Dispose();
+                        _InsertRowImageCache = null;
+                    }
+
+                    _InsertRowImage = value;
+
+                    NeedsMeasured = true;
+
+                    OnPropertyChangedEx("InsertRowImage", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #region GetInsertRowImage
+
+        internal Image GetInsertRowImage()
+        {
+            if (_InsertRowImage != null)
+                return (_InsertRowImage);
+
+            if (_InsertRowImageIndex >= 0)
+            {
+                ImageList imageList = _ImageList;
+
+                if (imageList != null && _InsertRowImageIndex < imageList.Images.Count)
+                    return (imageList.Images[_InsertRowImageIndex]);
+            }
+
+            if (_InsertRowImageCache == null)
+                _InsertRowImageCache = GetResourceImage("InsertRow");
+
+            return (_InsertRowImageCache);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InsertRowImageIndex
+
+        /// <summary>
+        /// Gets or sets the Insert Row image index
+        /// </summary>
+        [Browsable(true), DefaultValue(-1)]
+        [Category("Appearance"), Description("Indicates the Insert Row image index.")]
+        [Editor("DevComponents.SuperGrid.Design.ImageIndexEditor, DevComponents.SuperGrid.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=26d81176cfa2b486", typeof(UITypeEditor))]
+        [TypeConverter(typeof(ImageIndexConverter))]
+        public int InsertRowImageIndex
+        {
+            get { return (_InsertRowImageIndex); }
+
+            set
+            {
+                if (_InsertRowImageIndex != value)
+                {
+                    _InsertRowImageIndex = value;
+
+                    OnPropertyChangedEx("InsertRowImageIndex", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        [Browsable(false)]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetInsertRowImageIndex()
+        {
+            _InsertRowImageIndex = -1;
+        }
+
+        #endregion
+
+        #region InsertTempRowImage
+
+        /// <summary>
+        /// Gets or sets the default image to display
+        /// in the row header to denote a temporary insert Row.
+        /// </summary>
+        [DefaultValue(null), Category("Rows")]
+        [Description("Indicates the image to display in the row header to denote a temporary Insertion Row.")]
+        public Image InsertTempRowImage
+        {
+            get { return (_InsertTempRowImage); }
+
+            set
+            {
+                if (_InsertTempRowImage != value)
+                {
+                    if (_InsertTempRowImageCache != null)
+                    {
+                        _InsertTempRowImageCache.Dispose();
+                        _InsertTempRowImageCache = null;
+                    }
+
+                    _InsertTempRowImage = value;
+
+                    NeedsMeasured = true;
+
+                    OnPropertyChangedEx("InsertTempRowImage", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #region GetInsertTempRowImage
+
+        internal Image GetInsertTempRowImage()
+        {
+            if (_InsertTempRowImage != null)
+                return (_InsertTempRowImage);
+
+            if (_InsertTempRowImageIndex >= 0)
+            {
+                ImageList imageList = _ImageList;
+
+                if (imageList != null && _InsertTempRowImageIndex < imageList.Images.Count)
+                    return (imageList.Images[_InsertTempRowImageIndex]);
+            }
+
+            return (GetInsertTempRowImageEx());
+        }
+
+        #region GetInsertTempRowImageEx
+
+        private Image GetInsertTempRowImageEx()
+        {
+            if (_InsertTempRowImageCache == null)
+            {
+                RowVisualStyle style = GetEffectiveRowStyle();
+
+                Rectangle r = new Rectangle(0, 0, Dpi.Width4, Dpi.Height7);
+                Image image = new Bitmap(Dpi.Width4, Dpi.Height7);
+
+                using (Graphics g = Graphics.FromImage(image))
+                {
+                    Point pt = new Point(r.X, r.Y + r.Height / 2);
+
+                    Point[] pts =
+                            {
+                                pt,
+                                new Point(pt.X + Dpi.Width4, pt.Y + Dpi.Height4),
+                                new Point(pt.X + Dpi.Width4, pt.Y - Dpi.Height4),
+                                pt
+                            };
+
+                    using (GraphicsPath path = new GraphicsPath())
+                    {
+                        path.AddLines(pts);
+
+                        Color color = style.RowHeaderStyle.ActiveRowIndicatorColor;
+
+                        if (color.IsEmpty)
+                            color = Color.Black;
+
+                        using (Brush br = new SolidBrush(color))
+                            g.FillPath(br, path);
+                    }
+                }
+
+                _InsertTempRowImageCache = image;
+            }
+
+            return (_InsertTempRowImageCache);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region InsertTempRowImageIndex
+
+        /// <summary>
+        /// Gets or sets the Insert Temp Row image index
+        /// </summary>
+        [Browsable(true), DefaultValue(-1)]
+        [Category("Appearance"), Description("Indicates the Insert Temp Row image index.")]
+        [Editor("DevComponents.SuperGrid.Design.ImageIndexEditor, DevComponents.SuperGrid.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=26d81176cfa2b486", typeof(UITypeEditor))]
+        [TypeConverter(typeof(ImageIndexConverter))]
+        public int InsertTempRowImageIndex
+        {
+            get { return (_InsertTempRowImageIndex); }
+
+            set
+            {
+                if (_InsertTempRowImageIndex != value)
+                {
+                    _InsertTempRowImageIndex = value;
+
+                    OnPropertyChangedEx("InsertTempRowImageIndex", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        [Browsable(false)]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetInsertTempRowImageIndex()
+        {
+            _InsertTempRowImageIndex = -1;
+        }
+
+        #endregion
+
+        #region IsColumnFiltered
+
+        /// <summary>
+        /// Gets whether the GridPanel has column-level filtering
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsColumnFiltered
+        {
+            get { return (DataFilter.IsColumnFiltered(this)); }
+        }
+
+        #endregion
+
+        #region IsFiltered
+
+        /// <summary>
+        /// Gets whether the GridPanel is being filtered
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsFiltered
+        {
+            get { return (DataFilter.IsFiltered(this)); }
+        }
+
+        #endregion
+
+        #region IsGrouped
+
+        /// <summary>
+        /// Gets whether the GridPanel is currently Grouped
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsGrouped
+        {
+            get { return (_GroupColumns != null && _GroupColumns.Count > 0); }
+        }
+
+        #endregion
+
+        #region IsRowFiltered
+
+        /// <summary>
+        /// Gets whether the GridPanel has row-level filtering
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsRowFiltered
+        {
+            get { return (DataFilter.IsRowFiltered(this)); }
+        }
+
+        #endregion
+
+        #region IsSortable
+
+        /// <summary>
+        /// Gets whether the GridPanel is able to be sorted
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsSortable
+        {
+            get
+            {
+                if (VirtualMode == true)
+                {
+                    if (DataBinder.CurrencyManager == null ||
+                        DataBinder.CurrencyManager.List.Count <= 0)
+                    {
+                        return (true);
+                    }
+
+                    return (DataBinder.IsSortable);
+                }
+
+                return (true);
+            }
+        }
+
+        #endregion
+
+        #region IsSubPanel
+
+        /// <summary>
+        /// Gets whether the GridPanel is a subordinate / nested grid.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsSubPanel
+        {
+            get { return (Parent != null); }
+        }
+
+        #endregion
+
+        #region KeepRowsSorted
+
+        /// <summary>
+        /// Gets or sets whether grid rows are kept sorted
+        /// on row deactivation, following a cell's Value change
+        /// </summary>
+        [DefaultValue(true), Category("Behavior")]
+        [Description("Indicates whether grid rows are kept sorted on row deactivation, following a cell's Value change.")]
+        public bool KeepRowsSorted
+        {
+            get { return (TestState(Psp1.KeepRowsSorted)); }
+
+            set
+            {
+                if (value != KeepRowsSorted)
+                {
+                    SetState(Psp1.KeepRowsSorted, value);
+
+                    OnPropertyChanged("KeepRowsSorted");
+                }
+            }
+        }
+
+        #endregion
+
+        #region KeyboardEditMode
+
+        /// <summary>
+        /// Gets or sets how cell editing is initiated by the keyboard
+        /// </summary>
+        [DefaultValue(KeyboardEditMode.EditOnKeystrokeOrF2), Category("Behavior")]
+        [Description("Indicates how cell editing is initiated by the keyboard.")]
+        public KeyboardEditMode KeyboardEditMode
+        {
+            get { return (_KeyboardEditMode); }
+
+            set
+            {
+                if (value != _KeyboardEditMode)
+                {
+                    _KeyboardEditMode = value;
+
+                    OnPropertyChanged("KeyboardEditMode");
+                }
+            }
+        }
+
+        #endregion
+
+        #region LastFrozenColumn
+
+        /// <summary>
+        /// Gets a reference to the last Frozen column
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public GridColumn LastFrozenColumn
+        {
+            get
+            {
+                int[] displayMap = Columns.DisplayIndexMap;
+
+                for (int i = displayMap.Length - 1; i >= 0; i--)
+                {
+                    GridColumn column = Columns[displayMap[i]];
+
+                    if (column.Visible == true && column.IsHFrozen == true)
+                        return (column);
+                }
+
+                return (null);
+            }
+        }
+
+        #endregion
+
+        #region LastOnScreenColumn
+
+        /// <summary>
+        /// Gets a reference to the last on-screen column
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public GridColumn LastOnScreenColumn
+        {
+            get
+            {
+                int[] displayMap = Columns.DisplayIndexMap;
+
+                for (int i = displayMap.Length - 1; i >= 0; i--)
+                {
+                    GridColumn column = Columns[displayMap[i]];
+
+                    if (column.IsOnScreen == true)
+                        return (column);
+                }
+
+                return (null);
+            }
+        }
+
+        #endregion
+
+        #region LastVisibleColumn
+
+        /// <summary>
+        /// Gets a reference to the last visible column
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public GridColumn LastVisibleColumn
+        {
+            get { return (Columns.LastVisibleColumn); }
+        }
+
+        #endregion
+
+        #region LevelIndentSize
+
+        /// <summary>
+        /// Gets or sets the amount to indent the grid data when
+        /// a new grid level is encountered
+        /// </summary>
+        [Category("Appearance")]
+        [Description("Indicates the amount to indent the grid data when a new grid level is encountered.")]
+        public Size LevelIndentSize
+        {
+            get { return (_LevelIndentSize); }
+
+            set
+            {
+                if (_LevelIndentSize != value)
+                {
+                    _LevelIndentSize = value;
+
+                    NeedsMeasured = true;
+
+                    OnPropertyChangedEx("LevelIndentSize", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        internal bool ShouldSerializeLevelIndentSize()
+        {
+            return (_LevelIndentSize.Height != 10 || _LevelIndentSize.Width != 20);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        internal void ResetLevelIndentSize()
+        {
+            LevelIndentSize = new Size(20, 10);
+        }
+
+        #endregion
+
+        #region MaxRowHeight
+
+        /// <summary>
+        /// Gets or sets the maximum row height
+        /// </summary>
+        [DefaultValue(500), Category("Rows")]
+        [Description("Indicates the maximum row height.")]
+        public int MaxRowHeight
+        {
+            get { return (_MaxRowHeight); }
+
+            set
+            {
+                if (value != _MaxRowHeight)
+                {
+                    if (value < 0)
+                        throw new ArgumentException("Value must be 0 or greater.");
+
+                    _MaxRowHeight = value;
+
+                    NeedsMeasured = true;
+
+                    OnPropertyChangedEx("MaxRowHeight", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region MinRowHeight
+
+        /// <summary>
+        /// Gets or sets the minimum row height
+        /// </summary>
+        [DefaultValue(5), Category("Rows")]
+        [Description("Indicates the minimum row height.")]
+        public int MinRowHeight
+        {
+            get { return (_MinRowHeight); }
+
+            set
+            {
+                if (value != _MinRowHeight)
+                {
+                    if (value < 0)
+                        throw new ArgumentException("Value must be 0 or greater.");
+
+                    _MinRowHeight = value;
+
+                    NeedsMeasured = true;
+
+                    OnPropertyChangedEx("MinRowHeight", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region MouseEditMode
+
+        /// <summary>
+        /// Gets or sets how cell editing is initiated by the mouse
+        /// </summary>
+        [DefaultValue(MouseEditMode.DoubleClick), Category("Behavior")]
+        [Description("Indicates how cell editing is initiated by the mouse.")]
+        public MouseEditMode MouseEditMode
+        {
+            get { return (_MouseEditMode); }
+
+            set
+            {
+                if (value != _MouseEditMode)
+                {
+                    _MouseEditMode = value;
+
+                    OnPropertyChanged("MinRowHeight");
+                }
+            }
+        }
+
+        #endregion
+
+        #region MultiSelect
+
+        ///<summary>
+        /// Gets or sets whether multiple items can be selected by the user
+        ///</summary>
+        [DefaultValue(true), Category("Selection")]
+        [Description("Indicates whether multiple items can be selected by the user.")]
+        public bool MultiSelect
+        {
+            get { return (TestState(Psp1.MultiSelect)); }
+
+            set
+            {
+                if (value != MultiSelect)
+                {
+                    SetState(Psp1.MultiSelect, value);
+
+                    OnPropertyChanged("MultiSelect");
+                }
+            }
+        }
+
+        #endregion
+
+        #region Name
+
+        /// <summary>
+        /// Gets or sets the Grid Panel name
+        /// </summary>
+        [DefaultValue("")]
+        [Description("Indicates the Grid Panel name.")]
+        public string Name
+        {
+            get { return (_Name); }
+
+            set
+            {
+                if (_Name != value)
+                {
+                    _Name = value;
+
+                    OnPropertyChanged("Name");
+                }
+            }
+        }
+
+        #endregion
+
+        #region NestedListScanTypes
+
+        /// <summary>
+        /// Gets or sets what IList "types" are scanned by the SuperGrid 
+        /// when looking for possible "child" sub-panels in a bound IList data source.
+        /// </summary>
+        [DefaultValue(NestedListScanTypes.Fields), Category("Data")]
+        [Description("Indicates what IList 'types' are scanned by the SuperGrid when looking for possible 'child' sub-panels in a bound IList data source.")]
+        public NestedListScanTypes NestedListScanTypes
+        {
+            get { return (_NestedListScanTypes); }
+
+            set
+            {
+                if (_NestedListScanTypes != value)
+                {
+                    _NestedListScanTypes = value;
+
+                    OnPropertyChangedEx("NestedListScanTypes", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region NoRowsText
+
+        /// <summary>
+        /// Gets or sets the text to show when there are no visible data Rows in the grid
+        /// </summary>
+        [Localizable(true), DefaultValue(null), Category("Appearance")]
+        [Description("Indicates the text to show when there are no visible data Rows in the grid.")]
+        public string NoRowsText
+        {
+            get { return (_NoRowsText); }
+
+            set
+            {
+                if (_NoRowsText != value)
+                {
+                    _NoRowsText = value;
+
+                    NoRowsMarkupTextChanged();
+
+                    OnPropertyChangedEx("NoRowsText", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region NullString
+
+        /// <summary>
+        /// Gets or sets how null values are displayed 
+        /// </summary>
+        [Localizable(true), DefaultValue(""), Category("Data")]
+        [Description("Indicates how null values are displayed.")]
+        public string NullString
+        {
+            get { return (_NullString); }
+
+            set
+            {
+                if (_NullString != value)
+                {
+                    _NullString = value;
+
+                    NeedsMeasured = true;
+
+                    OnPropertyChangedEx("NullString", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region NullValue
+
+        /// <summary>
+        /// Gets or sets how null values are interpreted 
+        /// </summary>
+        [DefaultValue(NullValue.DBNull), Category("Data")]
+        [Description("Indicates how null values are interpreted.")]
+        public NullValue NullValue
+        {
+            get { return (_NullValue); }
+
+            set
+            {
+                if (_NullValue != value)
+                {
+                    _NullValue = value;
+
+                    OnPropertyChangedEx("NullValue", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region OnlySendFinalRowActivatedEvents
+
+        /// <summary>
+        /// Gets or sets whether RowActivated events are sent for all rows
+        /// in the given parent chain, or only for the final active row.
+        /// </summary>
+        [DefaultValue(false), Category("Behavior")]
+        [Description("Indicates whether RowActivated events are sent for all rows in the given parent chain, or only for the final active row.")]
+        public bool OnlySendFinalRowActivatedEvents
+        {
+            get { return (TestState(Psp1.OnlySendFinalRowActivatedEvents)); }
+
+            set
+            {
+                if (value != OnlySendFinalRowActivatedEvents)
+                {
+                    SetState(Psp1.OnlySendFinalRowActivatedEvents, value);
+
+                    OnPropertyChanged("OnlySendFinalRowActivatedEvents");
+                }
+            }
+        }
+
+        #endregion
+
+        #region OnScreenColumns
+
+        ///<summary>
+        /// IEnumerable that can be used to enumerate through
+        /// the current on-screen columns
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public IEnumerable OnScreenColumns
+        {
+            get { return (new OnScreenColumnsEnumeration(this)); }
+        }
+
+        #endregion
+
+        #region OnScreenRows
+
+        ///<summary>
+        /// IEnumerable that can be used to enumerate through
+        /// the current on-screen rows
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public IEnumerable OnScreenRows
+        {
+            get { return (new OnScreenRowsEnumeration(this)); }
+        }
+
+        #endregion
+
+        #region PrimaryColumn
+
+        /// <summary>
+        /// Gets the primary column. The Primary Columns will
+        /// contain (if enabled) the row checkbox and Tree lines
+        /// and expand / collapse button.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public GridColumn PrimaryColumn
+        {
+            get
+            {
+                if ((uint)_PrimaryColumnIndex < _Columns.Count)
+                    return (_Columns[_PrimaryColumnIndex]);
+
+                return (null);
+            }
+        }
+
+        #endregion
+
+        #region PrimaryColumnIndex
+
+        /// <summary>
+        /// Gets or sets the index of the primary column
+        /// </summary>
+        [DefaultValue(0), Category("Columns")]
+        [Description("Indicates the index of the primary column.")]
+        [Editor("DevComponents.SuperGrid.Design.ColumnListTypeEditor, DevComponents.SuperGrid.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=26d81176cfa2b486", typeof(UITypeEditor))]
+        public int PrimaryColumnIndex
+        {
+            get { return (_PrimaryColumnIndex); }
+
+            set
+            {
+                if (_PrimaryColumnIndex != value)
+                {
+                    _PrimaryColumnIndex = value;
+
+                    NeedsMeasured = true;
+
+                    OnPropertyChangedEx("PrimaryColumnIndex", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ProcessChildRelations
+
+        /// <summary>
+        /// Gets or sets how the SuperGrid processes child relations
+        /// </summary>
+        [DefaultValue(ProcessChildRelations.Always), Category("Data")]
+        [Description("Indicates how the SuperGrid processes child relations.")]
+        public ProcessChildRelations ProcessChildRelations
+        {
+            get { return (_ProcessChildRelations); }
+
+            set
+            {
+                if (_ProcessChildRelations != value)
+                {
+                    _ProcessChildRelations = value;
+
+                    OnPropertyChangedEx("ProcessChildRelations", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region RowDoubleClickBehavior
+
+        /// <summary>
+        /// Gets or sets the behavior when a row is double clicked
+        /// </summary>
+        [DefaultValue(RowDoubleClickBehavior.Activate), Category("Behavior")]
+        [Description("Indicates the behavior when a row is double clicked.")]
+        public RowDoubleClickBehavior RowDoubleClickBehavior
+        {
+            get { return (_RowDoubleClickBehavior); }
+
+            set
+            {
+                if (_RowDoubleClickBehavior != value)
+                {
+                    _RowDoubleClickBehavior = value;
+
+                    OnPropertyChanged("RowDoubleClickBehavior");
+                }
+            }
+        }
+
+        #endregion
+
+        #region RowDragBehavior
+
+        /// <summary>
+        /// Gets or sets the behavior when a row header is clicked and dragged
+        /// </summary>
+        [DefaultValue(RowDragBehavior.ExtendSelection), Category("Behavior")]
+        [Description("Indicates the behavior when a row header is clicked and dragged.")]
+        public RowDragBehavior RowDragBehavior
+        {
+            get { return (_RowDragBehavior); }
+
+            set
+            {
+                if (value != _RowDragBehavior)
+                {
+                    _RowDragBehavior = value;
+
+                    OnPropertyChanged("RowDragBehavior");
+                }
+            }
+        }
+
+        #endregion
+
+        #region RowEditMode
+
+        /// <summary>
+        /// Gets or sets whether editing is initiated on the primary cell
+        /// or the cell under the mouse when row level editing is enabled.
+        /// </summary>
+        [DefaultValue(RowEditMode.ClickedCell), Category("Behavior")]
+        [Description("Indicates whether editing is initiated on the primary cell or the cell under the mouse when row level editing is enabled")]
+        public RowEditMode RowEditMode
+        {
+            get { return (_RowEditMode); }
+
+            set
+            {
+                if (value != _RowEditMode)
+                {
+                    _RowEditMode = value;
+
+                    OnPropertyChanged("RowEditMode");
+                }
+            }
+        }
+
+        #endregion
+
+        #region RowFocusMode
+
+        /// <summary>
+        /// Gets or sets what portion of the row is "focused" when active.
+        /// </summary>
+        [DefaultValue(RowFocusMode.FullRow), Category("Appearance")]
+        [Description("Indicates what portion of the row is 'focused' when active")]
+        public RowFocusMode RowFocusMode
+        {
+            get { return (_RowFocusMode); }
+
+            set
+            {
+                if (value != _RowFocusMode)
+                {
+                    _RowFocusMode = value;
+
+                    OnPropertyChanged("RowFocusMode");
+                }
+            }
+        }
+
+        #endregion
+
+        #region RowHeaderIndexOffset
+
+        /// <summary>
+        /// Gets or sets the offset value used
+        /// to adjust the Index displayed in the row header.
+        /// </summary>
+        [DefaultValue(0), Category("Appearance")]
+        [Description("Indicates the offset value used to adjust the Index displayed in the row header")]
+        public int RowHeaderIndexOffset
+        {
+            get { return (_RowHeaderIndexOffset); }
+
+            set
+            {
+                if (_RowHeaderIndexOffset != value)
+                {
+                    _RowHeaderIndexOffset = value;
+
+                    OnPropertyChangedEx("RowHeaderIndexOffset", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region RowHeaderWidth
+
+        /// <summary>
+        /// Gets or sets the width of the row header
+        /// </summary>
+        [DefaultValue(35), Category("Rows")]
+        [Description("Indicates the width of the row header.")]
+        public int RowHeaderWidth
+        {
+            get { return (_RowHeaderWidth); }
+
+            set
+            {
+                if (_RowHeaderWidth != value)
+                {
+                    _RowHeaderWidth = value;
+
+                    NeedsMeasured = true;
+
+                    OnPropertyChangedEx("RowHeaderWidth", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region RowHighlightType
+
+        /// <summary>
+        /// Gets or sets the type of highlighting
+        /// to use  when a row is selected
+        /// </summary>
+        [DefaultValue(RowHighlightType.Full), Category("Selection")]
+        [Description("Indicates the type of highlighting to use  when a row is selected.")]
+        public RowHighlightType RowHighlightType
+        {
+            get { return (_RowHighlightType); }
+
+            set
+            {
+                if (value != _RowHighlightType)
+                {
+                    _RowHighlightType = value;
+
+                    OnPropertyChanged("RowHeaderWidth");
+                }
+            }
+        }
+
+        #endregion
+
+        #region RowWhitespaceClickBehavior
+
+        /// <summary>
+        /// Gets or sets the behavior when the user
+        /// clicks the mouse in the row whitespace
+        /// </summary>
+        [DefaultValue(RowWhitespaceClickBehavior.ClearSelection), Category("Rows")]
+        [Description("Indicates the behavior when the user clicks the mouse in the row whitespace.")]
+        public RowWhitespaceClickBehavior RowWhitespaceClickBehavior
+        {
+            get { return (_RowWhitespaceClickBehavior); }
+
+            set
+            {
+                if (value != _RowWhitespaceClickBehavior)
+                {
+                    _RowWhitespaceClickBehavior = value;
+
+                    OnPropertyChanged("RowWhitespaceClickBehavior");
+                }
+            }
+        }
+
+        #endregion
+
+        #region SelectedCellCount
+
+        ///<summary>
+        /// Gets the current selected cell count
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public int SelectedCellCount
+        {
+            get
+            {
+                int n = 0;
+
+                foreach (GridColumn column in Columns)
+                    n += column.SelectedCellCount;
+
+                return (n);
+            }
+        }
+
+        #endregion
+
+        #region SelectedCells
+
+        ///<summary>
+        /// IEnumerable that can be used
+        /// to enumerate through all currently selected cells
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public IEnumerable SelectedCells
+        {
+            get { return (new SelectedCellsEnumeration(this)); }
+        }
+
+        #endregion
+
+        #region SelectedColumnCount
+
+        ///<summary>
+        /// Gets the current selected column count
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public int SelectedColumnCount
+        {
+            get { return (_SelectedColumns.Count); }
+        }
+
+        #endregion
+
+        #region SelectedColumns
+
+        ///<summary>
+        /// IEnumerable that can be used
+        /// to enumerate through all currently selected columns
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public IEnumerable SelectedColumns
+        {
+            get { return (new SelectedColumnsEnumeration(this, _SelectedColumns)); }
+        }
+
+        #endregion
+
+        #region SelectedRowCount
+
+        ///<summary>
+        /// Gets the current selected row count
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public int SelectedRowCount
+        {
+            get { return (_SelectedRows.Count); }
+        }
+
+        #endregion
+
+        #region SelectedRows
+
+        ///<summary>
+        /// IEnumerable that can be used
+        /// to enumerate through all currently selected rows
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public IEnumerable SelectedRows
+        {
+            get { return (new SelectedRowsEnumeration(this, _SelectedRows)); }
+        }
+
+        #endregion
+
+        #region SelectionGranularity
+
+        /// <summary>
+        /// Gets or sets whether element selection
+        /// is at the row or cell level
+        /// </summary>
+        [DefaultValue(SelectionGranularity.Cell), Category("Selection")]
+        [Description("Indicates whether element selection is at the row or cell level.")]
+        public SelectionGranularity SelectionGranularity
+        {
+            get { return (_SelectionGranularity); }
+
+            set
+            {
+                if (value != _SelectionGranularity)
+                {
+                    _SelectionGranularity = value;
+
+                    if (SuperGrid != null)
+                        SuperGrid.UpdateStyleCount();
+
+                    OnPropertyChanged("SelectionGranularity");
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowCellInfo
+
+        /// <summary>
+        /// Gets or sets whether to show  Cell Info Image and Text (if defined).
+        /// </summary>
+        [DefaultValue(true), Category("Appearance")]
+        [Description("Indicates whether to show Cell Info Image and Text (if defined).")]
+        public bool ShowCellInfo
+        {
+            get { return (TestState(Psp1.ShowCellInfo)); }
+
+            set
+            {
+                if (ShowCellInfo != value)
+                {
+                    SetState(Psp1.ShowCellInfo, value);
+
+                    OnPropertyChangedEx("ShowCellInfo", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowCellInfoDisplayMode
+
+        /// <summary>
+        /// Gets or sets when the CellInfoImage is displayed (either when the
+        /// associated InfoText is empty or not).
+        /// </summary>
+        [DefaultValue(ShowCellInfoDisplayMode.ShowWithNonEmptyText), Category("Appearance")]
+        [Description("Indicates when the CellInfoImage is displayed (either when the associated InfoText is empty or not).")]
+        public ShowCellInfoDisplayMode ShowCellInfoDisplayMode
+        {
+            get { return (_ShowCellInfoDisplayMode); }
+
+            set
+            {
+                if (value != _ShowCellInfoDisplayMode)
+                {
+                    _ShowCellInfoDisplayMode = value;
+
+                    OnPropertyChangedEx("ShowCellInfoDisplayMode", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowColumnHeader
+
+        /// <summary>
+        /// Gets or sets whether the Column Header is displayed
+        /// </summary>
+        [DefaultValue(true), Category("Appearance")]
+        [Description("Indicates whether the Column Header is displayed.")]
+        public bool ShowColumnHeader
+        {
+            get { return (_ColumnHeader.Visible); }
+
+            set
+            {
+                if (value != _ColumnHeader.Visible)
+                {
+                    _ColumnHeader.Visible = value;
+
+                    OnPropertyChangedEx("ShowColumnHeader", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowDropShadow
+
+        /// <summary>
+        /// Gets or sets whether nested Grid Panels display a drop shadow
+        /// </summary>
+        [DefaultValue(true), Category("Appearance")]
+        [Description("Indicates whether nested Grid Panels display a drop shadow.")]
+        public bool ShowDropShadow
+        {
+            get { return (TestState(Psp1.ShowDropShadow)); }
+
+            set
+            {
+                if (value != ShowDropShadow)
+                {
+                    SetState(Psp1.ShowDropShadow, value);
+
+                    OnPropertyChangedEx("ShowDropShadow", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowEditingImage
+
+        /// <summary>
+        /// Gets or sets whether the EditingRowImage is
+        /// displayed in the row header of the cell being edited. 
+        /// </summary>
+        [DefaultValue(true), Category("Appearance")]
+        [Description("Indicates whether the EditingRowImage is displayed in the row header of the cell being edited.")]
+        public bool ShowEditingImage
+        {
+            get { return (TestState(Psp1.ShowEditingImage)); }
+
+            set
+            {
+                if (value != ShowEditingImage)
+                {
+                    SetState(Psp1.ShowEditingImage, value);
+
+                    OnPropertyChanged("ShowEditingImage");
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowGroupExpand
+
+        /// <summary>
+        /// Gets or sets whether the expand button is shown in group headers 
+        /// </summary>
+        [DefaultValue(true), Category("Group")]
+        [Description("Indicates whether the expand button is shown in group headers.")]
+        public bool ShowGroupExpand
+        {
+            get { return (TestState(Psp1.ShowGroupExpand)); }
+
+            set
+            {
+                if (value != ShowGroupExpand)
+                {
+                    SetState(Psp1.ShowGroupExpand, value);
+
+                    OnPropertyChangedEx("ShowGroupExpand", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowGroupUnderline
+
+        /// <summary>
+        /// Gets or sets whether the Group header text is underlined 
+        /// </summary>
+        [DefaultValue(true), Category("Group")]
+        [Description("Indicates whether the Group header text is underlined.")]
+        public bool ShowGroupUnderline
+        {
+            get { return (TestState(Psp1.ShowGroupUnderline)); }
+
+            set
+            {
+                if (value != ShowGroupUnderline)
+                {
+                    SetState(Psp1.ShowGroupUnderline, value);
+
+                    OnPropertyChangedEx("ShowGroupUnderline", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowInsertRow
+
+        /// <summary>
+        /// Gets or sets whether the insert row is displayed
+        /// at the bottom of the panel for users to add new rows
+        /// </summary>
+        [DefaultValue(false), Category("Appearance")]
+        [Description("Indicates whether the insert row is displayed at the bottom of the panel for users to add new rows.")]
+        public bool ShowInsertRow
+        {
+            get { return (TestState(Psp1.ShowInsertRow)); }
+
+            set
+            {
+                if (value != ShowInsertRow)
+                {
+                    SetState(Psp1.ShowInsertRow, value);
+
+                    if (IsDesignerHosted == false)
+                    {
+                        if (value == true)
+                        {
+                            AddNewInsertRow();
+
+                            LoadInsertRow = true;
+                        }
+                        else
+                        {
+                            RemoveNewInsertRow();
+                        }
+                    }
+
+                    OnPropertyChangedEx("ShowInsertionRow", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowInsertRowImage
+
+        /// <summary>
+        /// Gets or sets whether the InsertRowImage is
+        /// displayed in the row header of the Insert Row. 
+        /// </summary>
+        [DefaultValue(true), Category("Appearance")]
+        [Description("Indicates whether the InsertRowImage is displayed in the row header of the Insert Row.")]
+        public bool ShowInsertRowImage
+        {
+            get { return (TestState(Psp1.ShowInsertRowImage)); }
+
+            set
+            {
+                if (value != ShowInsertRowImage)
+                {
+                    SetState(Psp1.ShowInsertRowImage, value);
+
+                    OnPropertyChanged("ShowInsertRowImage");
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowRowInfo
+
+        /// <summary>
+        /// Gets or sets whether to show Row Info Image and Text (if defined)
+        /// </summary>
+        [DefaultValue(true), Category("Appearance")]
+        [Description("Indicates whether to show Row Info Image and Text (if defined).")]
+        public bool ShowRowInfo
+        {
+            get { return (TestState(Psp1.ShowRowInfo)); }
+
+            set
+            {
+                if (ShowRowInfo != value)
+                {
+                    SetState(Psp1.ShowRowInfo, value);
+
+                    OnPropertyChangedEx("ShowRowInfo", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowRowInfoDisplayMode
+
+        /// <summary>
+        /// Gets or sets when the RowInfoImage is displayed (either when the
+        /// associated InfoText is empty or not).
+        /// </summary>
+        [DefaultValue(ShowRowInfoDisplayMode.ShowWithNonEmptyText), Category("Appearance")]
+        [Description("Indicates when the RowInfoImage is displayed (either when the associated InfoText is empty or not).")]
+        public ShowRowInfoDisplayMode ShowRowInfoDisplayMode
+        {
+            get { return (_ShowRowInfoDisplayMode); }
+
+            set
+            {
+                if (value != _ShowRowInfoDisplayMode)
+                {
+                    _ShowRowInfoDisplayMode = value;
+
+                    OnPropertyChangedEx("ShowRowInfoDisplayMode", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowRowHeaders
+
+        /// <summary>
+        /// Gets or sets whether row headers are displayed
+        /// </summary>
+        [DefaultValue(true), Category("Appearance")]
+        [Description("Indicates whether row headers are displayed.")]
+        public bool ShowRowHeaders
+        {
+            get { return (TestState(Psp1.ShowRowHeaders)); }
+
+            set
+            {
+                if (value != ShowRowHeaders)
+                {
+                    SetState(Psp1.ShowRowHeaders, value);
+
+                    OnPropertyChangedEx("ShowRowHeaders", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowRowGridIndex
+
+        /// <summary>
+        /// Gets or sets whether row
+        /// GridIndex values are displayed in the row headers.
+        /// </summary>
+        [DefaultValue(false), Category("Appearance")]
+        [Description("Indicates whether row GridIndex values are displayed in the row headers. A GridIndex is the 'logical' index for the current visible row.")]
+        public bool ShowRowGridIndex
+        {
+            get { return (TestState(Psp1.ShowRowGridIndex)); }
+
+            set
+            {
+                if (ShowRowGridIndex != value)
+                {
+                    SetState(Psp1.ShowRowGridIndex, value);
+
+                    OnPropertyChanged("ShowRowGridIndex");
+
+                    if (ShowRowHeaders == true)
+                        InvalidateRender();
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowRowDirtyMarker
+
+        /// <summary>
+        /// Gets or sets whether the DirtyRow marker is displayed,
+        /// signifying that the row data has been changed by the user
+        /// </summary>
+        [DefaultValue(true), Category("Appearance")]
+        [Description("Indicates whether the DirtyRow marker is displayed, signifying that the row data has been changed by the user.")]
+        public bool ShowRowDirtyMarker
+        {
+            get { return (TestState(Psp1.ShowRowDirtyMarker)); }
+
+            set
+            {
+                if (ShowRowDirtyMarker != value)
+                {
+                    SetState(Psp1.ShowRowDirtyMarker, value);
+
+                    OnPropertyChangedEx("ShowRowDirtyMarker", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowToolTips
+
+        /// <summary>
+        /// Gets or sets whether tooltips are shown
+        /// for cell data that is truncated by the display
+        /// </summary>
+        [DefaultValue(true), Category("Appearance")]
+        [Description("Indicates whether tooltips are shown for cell data that is truncated by the display.")]
+        public bool ShowToolTips
+        {
+            get { return (TestState(Psp1.ShowToolTips)); }
+
+            set
+            {
+                if (value != ShowToolTips)
+                {
+                    SetState(Psp1.ShowToolTips, value);
+
+                    OnPropertyChanged("ShowToolTips");
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowTreeButtons
+
+        /// <summary>
+        /// Gets or sets whether expand / collapse
+        /// buttons are shown for rows containing nested rows 
+        /// </summary>
+        [DefaultValue(false), Category("Appearance")]
+        [Description("Indicates whether Tree expand / collapse buttons are shown for rows containing nested rows.")]
+        public bool ShowTreeButtons
+        {
+            get { return (TestState(Psp1.ShowTreeButtons)); }
+
+            set
+            {
+                if (ShowTreeButtons != value)
+                {
+                    SetState(Psp1.ShowTreeButtons, value);
+
+                    OnPropertyChangedEx("ShowTreeButtons", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowTreeLines
+
+        /// <summary>
+        /// Gets or sets whether hierarchical tree-lines
+        /// are shown connecting grid rows 
+        /// </summary>
+        [DefaultValue(false), Category("Appearance")]
+        [Description("Indicates whether hierarchical tree-lines are shown connecting grid rows.")]
+        public bool ShowTreeLines
+        {
+            get { return (TestState(Psp1.ShowTreeLines)); }
+
+            set
+            {
+                if (ShowTreeLines != value)
+                {
+                    SetState(Psp1.ShowTreeLines, value);
+
+                    OnPropertyChangedEx("ShowTreeLines", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowWhitespaceRowLines
+
+        /// <summary>
+        /// Gets or sets whether the row lines are displayed in the Whitespace
+        /// area following the last visible column in the grid
+        /// </summary>
+        [DefaultValue(true), Category("Appearance")]
+        [Description("Indicates whether the row lines are displayed in the Whitespace area following the last visible column in the grid.")]
+        public bool ShowWhitespaceRowLines
+        {
+            get { return (TestState(Psp1.ShowWhitespaceRowLines)); }
+
+            set
+            {
+                if (value != ShowWhitespaceRowLines)
+                {
+                    SetState(Psp1.ShowWhitespaceRowLines, value);
+
+                    OnPropertyChangedEx("ShowWhitespaceRowLines", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region SizingStyle
+
+        /// <summary>
+        /// Gets or sets which Visual Display Style to use for element sizing
+        /// </summary>
+        [DefaultValue(StyleType.NotSet), Category("Style")]
+        [Description("Indicates which Visual Display Style to use for element sizing.")]
+        public StyleType SizingStyle
+        {
+            get { return (_SizingStyle); }
+
+            set
+            {
+                if (_SizingStyle != value)
+                {
+                    _SizingStyle = value;
+
+                    OnPropertyChangedEx("SizingStyle", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region SortCycle
+
+        /// <summary>
+        /// Gets or sets how each column sort direction cycles
+        /// when the column header is clicked to sort.
+        /// </summary>
+        [Browsable(true)]
+        [DefaultValue(SortCycle.NotSet), Category("Sorting")]
+        [Description("Indicates how each column sort direction cycles when the column header is clicked to sort.")]
+        public SortCycle SortCycle
+        {
+            get { return (_SortCycle); }
+
+            set
+            {
+                if (_SortCycle != value)
+                {
+                    _SortCycle = value;
+
+                    OnPropertyChanged("SortCycle");
+                }
+            }
+        }
+
+        #endregion
+
+        #region SortColumns
+
+        /// <summary>
+        /// Gets a reference to the list of columns to use for sorting the grid data.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public List<GridColumn> SortColumns
+        {
+            get { return (_SortColumns); }
+        }
+
+        #endregion
+
+        #region SortLevel
+
+        /// <summary>
+        /// Gets or sets the column sorting level. 
+        /// </summary>
+        [DefaultValue(SortLevel.Root), Category("Appearance")]
+        [Description("Indicates the column sorting level.")]
+        public SortLevel SortLevel
+        {
+            get { return (_SortLevel); }
+
+            set
+            {
+                if (value != _SortLevel)
+                {
+                    _SortLevel = value;
+
+                    OnPropertyChangedEx("SortLevel", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region SortUsingHiddenColumns
+
+        ///<summary>
+        /// Gets or sets whether hidden Columns
+        /// are used when sorting the grid data
+        ///</summary>
+        [DefaultValue(false), Category("Behavior")]
+        [Description("Indicates whether hidden Columns are used when sorting the grid data.")]
+        public bool SortUsingHiddenColumns
+        {
+            get { return (TestState(Psp1.SortUsingHiddenColumns)); }
+
+            set
+            {
+                if (SortUsingHiddenColumns != value)
+                {
+                    SetState(Psp1.SortUsingHiddenColumns, value);
+
+                    if (SortColumns != null && SortColumns.Count > 0)
+                        NeedsSorted = true;
+
+                    OnPropertyChangedEx("SortUsingHiddenColumns", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region Title
+
+        /// <summary>
+        /// Gets or sets the item which is displayed just above
+        /// the Column Header. The Title area is fixed and it does
+        /// not move as grid rows are scrolled.
+        /// </summary>
+        [Category("Header,Footer...")]
+        [Description("Indicates the Title item, which is displayed just above the Column Header. The Title area is fixed and it does not move as grid rows are scrolled.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public GridTitle Title
+        {
+            get
+            {
+                if (_Title == null)
+                    Title = new GridTitle();
+
+                return (_Title);
+            }
+
+            set
+            {
+                if (_Title != value)
+                {
+                    if (value != null)
+                    {
+                        if (value.Parent != null)
+                            throw new ArgumentException("Item assigned as Title already has a parent.");
+                    }
+
+                    _Title = value;
+
+                    if (_Title != null)
+                        _Title.Parent = this;
+
+                    NeedsMeasured = true;
+
+                    OnPropertyChangedEx("Title", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region TopLeftHeaderSelectBehavior
+
+        /// <summary>
+        /// Gets or sets the behavior that occurs when
+        /// the top left header is selected by the user
+        /// </summary>
+        [DefaultValue(TopLeftHeaderSelectBehavior.Deterministic), Category("Behavior")]
+        [Description("Indicates the behavior that occurs when the top left header is selected by the user.")]
+        public TopLeftHeaderSelectBehavior TopLeftHeaderSelectBehavior
+        {
+            get { return (_TopLeftHeaderSelectBehavior); }
+
+            set
+            {
+                if (value != _TopLeftHeaderSelectBehavior)
+                {
+                    _TopLeftHeaderSelectBehavior = value;
+
+                    OnPropertyChangedEx("TopLeftHeaderSelectBehavior", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region UseAlternateColumnStyle
+
+        /// <summary>
+        /// Gets or sets whether the AlternateColumn Style is used
+        /// </summary>
+        [DefaultValue(false), Category("Style")]
+        [Description("Indicates whether the AlternateColumn Style is used.")]
+        public bool UseAlternateColumnStyle
+        {
+            get { return (TestState(Psp0.UseAlternateColumnStyle)); }
+
+            set
+            {
+                if (value != UseAlternateColumnStyle)
+                {
+                    SetState(Psp0.UseAlternateColumnStyle, value);
+
+                    if (SuperGrid != null)
+                        SuperGrid.UpdateStyleCount();
+
+                    OnPropertyChangedEx("UseAlternateColumnStyle", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region UseAlternateRowStyle
+
+        /// <summary>
+        /// Gets or sets whether the AlternateRow Style is used
+        /// </summary>
+        [DefaultValue(false), Category("Style")]
+        [Description("Indicates whether the AlternateRow Style is used")]
+        public bool UseAlternateRowStyle
+        {
+            get { return (TestState(Psp0.UseAlternateRowStyle)); }
+
+            set
+            {
+                if (value != UseAlternateRowStyle)
+                {
+                    SetState(Psp0.UseAlternateRowStyle, value);
+
+                    if (SuperGrid != null)
+                        SuperGrid.UpdateStyleCount();
+
+                    OnPropertyChangedEx("UseAlternateRowStyle", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region VirtualMode
+
+        ///<summary>
+        /// Gets or sets whether the grid data is virtualized (i.e. external to the grid)
+        ///</summary>
+        [DefaultValue(false), Category("Virtual Mode")]
+        [Description("Indicates whether the grid data is virtualized (ie. external to the grid).")]
+        public bool VirtualMode
+        {
+            get { return (TestState(Psp1.VirtualMode)); }
+
+            set
+            {
+                if (VirtualMode != value)
+                {
+                    SetState(Psp1.VirtualMode, value);
+
+                    _VirtualRowCount = DataBinder.RowCount;
+
+                    NeedToUpdateBindings = true;
+                    NeedsSorted = true;
+
+                    if (value == true)
+                    {
+                        _VirtualRows = new GridVirtualRows(this);
+
+                        if (ShowInsertRow == true)
+                        {
+                            Rows.FloatLastItem = false;
+
+                            AddNewInsertRow();
+                        }
+
+                        Rows.Clear();
+                    }
+                    else
+                    {
+                        _VirtualRowCount = 0;
+
+                        _VirtualRows.Clear();
+                        _VirtualRows = null;
+
+                        if (ShowInsertRow == true)
+                            AddNewInsertRow();
+                    }
+
+                    UpdateVisibleRowCount();
+
+                    OnPropertyChangedEx("VirtualMode", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region VirtualRowCount
+
+        ///<summary>
+        /// Gets or sets the number of virtual grid rows
+        ///</summary>
+        [DefaultValue(0), Category("Virtual Mode")]
+        [Description("Indicates the number of virtual grid rows.")]
+        public int VirtualRowCount
+        {
+            get
+            {
+                if (VirtualMode == true && ShowInsertRow == true)
+                    return (_VirtualRowCount - 1);
+
+                return (_VirtualRowCount);
+            }
+
+            set
+            {
+                if (VirtualMode == true)
+                {
+                    if (value < 0)
+                        value = 0;
+
+                    int n = (ShowInsertRow == true) ? 1 : 0;
+
+                    if (_VirtualRowCount != value + n)
+                    {
+                        if (SuperGrid != null)
+                        {
+                            if (SuperGrid.ActiveRow != null)
+                                SuperGrid.ActiveRow.FlushRow();
+                        }
+
+                        if (ShowInsertRow == true)
+                            RemoveNewInsertRow();
+
+                        if (value == 0)
+                        {
+                            _VirtualRows.Clear();
+
+                            ClearAll();
+                        }
+                        else
+                        {
+                            int count = _VirtualRowCount - value;
+
+                            if (count > 0)
+                            {
+                                SetSelectedCells(value, 0, count, Columns.Count, false);
+                                SetSelectedRows(value, count, false);
+                            }
+
+                            _VirtualRows.MaxRowIndex = value;
+                        }
+
+                        _VirtualRowCount = value;
+
+                        if (ShowInsertRow == true)
+                            AddNewInsertRow();
+
+                        _VisibleRowCount = _VirtualRowCount;
+
+                        if (ActiveRow != null && ActiveRow.RowIndex >= _VirtualRowCount)
+                            ActiveRow = null;
+
+                        OnPropertyChangedEx("VirtualRowCount", VisualChangeType.Layout);
+                    }
+                }
+                else
+                {
+                    if (_VirtualRowCount != value)
+                    {
+                        _VirtualRowCount = value;
+
+                        OnPropertyChangedEx("VirtualRowCount", VisualChangeType.Layout);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region VirtualRowHeight
+
+        ///<summary>
+        /// Gets or sets the height of every virtual row
+        ///</summary>
+        [DefaultValue(22), Category("Virtual Mode")]
+        [Description("Indicates the height of every virtual row.")]
+        public int VirtualRowHeight
+        {
+            get { return (_VirtualRowHeight); }
+
+            set
+            {
+                if (_VirtualRowHeight != value)
+                {
+                    if (value < 0)
+                        throw new Exception("Row height must be non-negative");
+
+                    _VirtualRowHeight = value;
+
+                    OnPropertyChangedEx("VirtualRowHeight", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region VirtualRows
+
+        ///<summary>
+        /// Gets the Virtual Mode rows collection object
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public GridVirtualRows VirtualRows
+        {
+            get { return (_VirtualRows); }
+        }
+
+        #endregion
+
+        #region VisibleColumnCount
+
+        ///<summary>
+        /// Gets the current visible column count
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public int VisibleColumnCount
+        {
+            get
+            {
+                int count = 0;
+
+                GridColumnCollection columns = Columns;
+                foreach (GridColumn column in columns)
+                {
+                    if (column.Visible == true)
+                        count++;
+                }
+
+                return (count);
+            }
+        }
+
+        #endregion
+
+        #region VisibleRowCount
+
+        ///<summary>
+        /// Gets the current visible row count
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public int VisibleRowCount
+        {
+            get
+            {
+                if (SuperGrid != null)
+                {
+                    if (IsLayoutValid == false)
+                        SuperGrid.ArrangeGrid();
+                }
+
+                return (_VisibleRowCount);
+            }
+        }
+
+        #endregion
+
+        #region WhitespaceClickBehavior
+
+        /// <summary>
+        /// Gets or sets the behavior when the user
+        /// clicks the mouse in the grid panel whitespace
+        /// </summary>
+        [DefaultValue(WhitespaceClickBehavior.ClearSelection), Category("Behavior")]
+        [Description("Indicates the behavior when the user clicks the mouse in the grid panel whitespace.")]
+        public WhitespaceClickBehavior WhitespaceClickBehavior
+        {
+            get { return (_WhitespaceClickBehavior); }
+
+            set
+            {
+                if (value != _WhitespaceClickBehavior)
+                {
+                    _WhitespaceClickBehavior = value;
+
+                    OnPropertyChanged("WhitespaceClickBehavior");
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region CollapseButtonHotImage
+
+        internal Image CollapseButtonHotImage
+        {
+            get { return (_CollapseButtonHotImage); }
+
+            set
+            {
+                if (_CollapseButtonHotImage != null)
+                    _CollapseButtonHotImage.Dispose();
+
+                _CollapseButtonHotImage = value;
+            }
+        }
+
+        #endregion
+
+        #region CollapseButtonImage
+
+        internal Image CollapseButtonImage
+        {
+            get { return (_CollapseButtonImage); }
+
+            set
+            {
+                if (_CollapseButtonImage != null)
+                    _CollapseButtonImage.Dispose();
+
+                _CollapseButtonImage = value;
+            }
+        }
+
+        #endregion
+
+        #region DataBinder
+
+        internal DataBinder DataBinder
+        {
+            get
+            {
+                if (_DataBinder == null)
+                    _DataBinder = new DataBinder(this);
+
+                return (_DataBinder);
+            }
+
+            set
+            {
+                if (_DataBinder != null)
+                    _DataBinder.Clear();
+
+                _DataBinder = value;
+            }
+        }
+
+        #endregion
+
+        #region DataRelation
+
+        internal DataRelation DataRelation
+        {
+            get { return (_DataRelation); }
+            set { _DataRelation = value; }
+        }
+
+        #endregion
+
+        #region DeleteUpdateCount
+
+        internal ushort DeleteUpdateCount
+        {
+            get { return (_DeleteUpdateCount); }
+            set { _DeleteUpdateCount = value; }
+        }
+
+        #endregion
+
+        #region EnsureRowVisible
+
+        internal bool EnsureRowVisible
+        {
+            get { return (TestState(Psi.EnsureRowVisible)); }
+            set { SetState(Psi.EnsureRowVisible, value); }
+        }
+
+        #endregion
+
+        #region ExpandButtonHotImage
+
+        internal Image ExpandButtonHotImage
+        {
+            get { return (_ExpandButtonHotImage); }
+
+            set
+            {
+                if (_ExpandButtonHotImage != null)
+                    _ExpandButtonHotImage.Dispose();
+
+                _ExpandButtonHotImage = value;
+            }
+        }
+
+        #endregion
+
+        #region ExpandButtonImage
+
+        internal Image ExpandButtonImage
+        {
+            get { return (_ExpandButtonImage); }
+
+            set
+            {
+                if (_ExpandButtonImage != null)
+                    _ExpandButtonImage.Dispose();
+
+                _ExpandButtonImage = value;
+            }
+        }
+
+        #endregion
+
+        #region ExpandedUpdateCount
+
+        internal ushort ExpandedUpdateCount
+        {
+            get { return (_ExpandedUpdateCount); }
+            set { _ExpandedUpdateCount = value; }
+        }
+
+        #endregion
+
+        #region ExpDictionary
+
+        internal Dictionary<GridCell, EEval> ExpDictionary
+        {
+            get { return (_ExpDictionary); }
+        }
+
+        #endregion
+
+        #region FilterEval
+
+        internal FilterEval FilterEval
+        {
+            get { return (_FilterEval); }
+            set { _FilterEval = value; }
+        }
+
+        #endregion
+
+        #region HasDeletedRows
+
+        internal bool HasDeletedRows
+        {
+            get { return (_DeletedRows.FirstIndex >= 0); }
+        }
+
+        #endregion
+
+        #region HotItem
+
+        internal GridContainer HotItem
+        {
+            get { return (_HotItem); }
+
+            set
+            {
+                if (_HotItem != value)
+                {
+                    GridContainer oldValue = _HotItem;
+                    _HotItem = value;
+
+                    if (ShowRowHeaders == true)
+                    {
+                        if (oldValue != null)
+                            InvalidateRowHeader(oldValue);
+
+                        if (_HotItem != null)
+                            InvalidateRowHeader(_HotItem);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region InRangeAdd
+
+        internal bool InRangeAdd
+        {
+            get { return (TestState(Psi.InRangeAdd)); }
+            set { SetState(Psi.InRangeAdd, value); }
+        }
+
+        #endregion
+
+        #region InternalDeletedRows
+
+        ///<summary>
+        /// InternalDeletedRows
+        ///</summary>
+        internal SelectedElements InternalDeletedRows
+        {
+            get { return (_DeletedRows); }
+        }
+
+        #endregion
+
+        #region InternalSelectedRows
+
+        internal SelectedElements InternalSelectedRows
+        {
+            get { return (_SelectedRows); }
+        }
+
+        #endregion
+
+        #region IsRowMoving
+
+        internal bool IsRowMoving
+        {
+            get { return (TestState(Psi.IsRowMoving)); }
+            set { SetState(Psi.IsRowMoving, value); }
+        }
+
+        #endregion
+
+        #region IsSorting
+
+        internal bool IsSorting
+        {
+            get { return (TestState(Psi.IsSorting)); }
+            set { SetState(Psi.IsSorting, value); }
+        }
+
+        #endregion
+
+        #region LastProcessedItem
+
+        internal GridElement LastProcessedItem
+        {
+            get { return (_LastProcessedItem); }
+
+            set
+            {
+                _LastProcessedItem = value;
+
+                SuperGrid.ActiveElement = value;
+            }
+        }
+
+        #endregion
+
+        #region LatentActiveCellIndex
+
+        internal int LatentActiveCellIndex
+        {
+            get { return (_LatentActiveCellIndex); }
+            set { _LatentActiveCellIndex = value; }
+        }
+
+        #endregion
+
+        #region LatentActiveContainer
+
+        internal GridContainer LatentActiveContainer
+        {
+            get { return (_LatentActiveContainer); }
+            set { _LatentActiveContainer = value; }
+        }
+
+        #endregion
+
+        #region LatentActiveRowIndex
+
+        internal int LatentActiveRowIndex
+        {
+            get { return (_LatentActiveRowIndex); }
+            set { _LatentActiveRowIndex = value; }
+        }
+
+        #endregion
+
+        #region LoadInsertRow
+
+        internal bool LoadInsertRow
+        {
+            get { return (TestState(Psi.LoadInsertRow)); }
+            set { SetState(Psi.LoadInsertRow, value); }
+        }
+
+        #endregion
+
+        #region NeedsFilterScan
+
+        internal bool NeedsFilterScan
+        {
+            get { return (TestState(Psi.NeedsFilterScan)); }
+            set { SetState(Psi.NeedsFilterScan, value); }
+        }
+
+        #endregion
+
+        #region NeedsGrouped
+
+        internal bool NeedsGrouped
+        {
+            get { return (TestState(Psi.NeedsGrouped)); }
+            set { SetState(Psi.NeedsGrouped, value); }
+        }
+
+        #endregion
+
+        #region NeedsGroupSorted
+
+        internal bool NeedsGroupSorted
+        {
+            get { return (TestState(Psi.NeedsGroupSorted)); }
+            set { SetState(Psi.NeedsGroupSorted, value); }
+        }
+
+        #endregion
+
+        #region NeedsSorted
+
+        internal bool NeedsSorted
+        {
+            get { return (TestState(Psi.NeedsSorted)); }
+            set { SetState(Psi.NeedsSorted, value); }
+        }
+
+        #endregion
+
+        #region NeedToUpdateBindings
+
+        internal bool NeedToUpdateBindings
+        {
+            get { return (TestState(Psi.NeedToUpdateBindings)); }
+
+            set
+            {
+                SetState(Psi.NeedToUpdateBindings, value);
+
+                if (value == true)
+                    NeedToUpdateBoundData = true;
+            }
+        }
+
+        #endregion
+
+        #region NeedToUpdateBoundData
+
+        internal bool NeedToUpdateBoundData
+        {
+            get { return (TestState(Psi.NeedToUpdateBoundData)); }
+            set { SetState(Psi.NeedToUpdateBoundData, value); }
+        }
+
+        #endregion
+
+        #region NeedToUpdateDataFilter
+
+        internal bool NeedToUpdateDataFilter
+        {
+            get { return (TestState(Psi.NeedToUpdateDataFilter)); }
+
+            set
+            {
+                if (NeedToUpdateDataFilter != value)
+                {
+                    SetState(Psi.NeedToUpdateDataFilter, value);
+
+                    if (value == true)
+                    {
+                        if (SuperGrid != null)
+                            SuperGrid.UpdateStyleCount();
+
+                        InvalidateMerge();
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region NeedToUpdateIndicees
+
+        internal bool NeedToUpdateIndicees
+        {
+            get
+            {
+                if (SuperGrid != null)
+                    return (SuperGrid.IndiceesUpdateCount != _IndiceesUpdateCount);
+
+                return (false);
+            }
+
+            set
+            {
+                if (SuperGrid != null)
+                {
+                    if (value == true)
+                        _IndiceesUpdateCount = (ushort)(SuperGrid.IndiceesUpdateCount - 1);
+                    else
+                        _IndiceesUpdateCount = SuperGrid.IndiceesUpdateCount;
+                }
+            }
+        }
+
+        #endregion
+
+        #region NewFullIndex
+
+        internal int NewFullIndex
+        {
+            get { return (_NewFullIndex); }
+            set { _NewFullIndex = value; }
+        }
+
+        #endregion
+
+        #region NewIndex
+
+        internal int NewIndex
+        {
+            get { return (_NewIndex); }
+            set { _NewIndex = value; }
+        }
+
+        #endregion
+
+        #region PanelBounds
+
+        internal Rectangle PanelBounds
+        {
+            get
+            {
+                Rectangle r = BoundsRelative;
+
+                if (IsVFrozen == false)
+                {
+                    if (IsSubPanel == true)
+                        r.X -= HScrollOffset;
+
+                    r.Y -= VScrollOffset;
+                }
+
+                if (_Caption != null && _Caption.Visible == true)
+                {
+                    r.Y += _Caption.Size.Height;
+                    r.Height -= _Caption.Size.Height;
+                }
+
+                if (IsSubPanel == true)
+                {
+                    r.Y--;
+                    r.Height++;
+                }
+
+                return (r);
+            }
+        }
+
+        #endregion
+
+        #region PreActiveRowDirty
+
+        internal bool PreActiveRowDirty
+        {
+            get { return (TestState(Psi.PreActiveRowDirty)); }
+            set { SetState(Psi.PreActiveRowDirty, value); }
+        }
+
+        #endregion
+
+        #region RenderCount
+
+        internal ushort RenderCount
+        {
+            get { return (_RenderCount); }
+            set { _RenderCount = value; }
+        }
+
+        #endregion
+
+        #region ReselectActiveItem
+
+        internal bool ReselectActiveItem
+        {
+            get { return (TestState(Psi.ReselectActiveItem)); }
+            set { SetState(Psi.ReselectActiveItem, value); }
+        }
+
+        #endregion
+
+        #region RowHeaderWidthEx
+
+        internal int RowHeaderWidthEx
+        {
+            get { return (_RowHeaderWidthEx); }
+        }
+
+        #endregion
+
+        #region RowHeaderSize
+
+        internal Size RowHeaderSize
+        {
+            get { return (_RowHeaderSize); }
+            set { _RowHeaderSize = value; }
+        }
+
+        #endregion
+
+        #region SelectActiveRow
+
+        internal bool SelectActiveRow
+        {
+            get { return (TestState(Psi.SelectActiveRow)); }
+            set { SetState(Psi.SelectActiveRow, value); }
+        }
+
+        #endregion
+
+        #region SelectionClearCount
+
+        internal ushort SelectionClearCount
+        {
+            get { return (_SelectionClearCount); }
+            set { _SelectionClearCount = value; }
+        }
+
+        #endregion
+
+        #region SelectionColumnAnchor
+
+        internal object SelectionColumnAnchor
+        {
+            get { return (_SelectionColumnAnchor); }
+            set { _SelectionColumnAnchor = value; }
+        }
+
+        #endregion
+
+        #region SelectionRowAnchor
+
+        internal GridContainer SelectionRowAnchor
+        {
+            get { return (_SelectionRowAnchor); }
+            set { _SelectionRowAnchor = value; }
+        }
+
+        #endregion
+
+        #region SelectionUpdateCount
+
+        internal ushort SelectionUpdateCount
+        {
+            get { return (_SelectionUpdateCount); }
+            set { _SelectionUpdateCount = value; }
+        }
+
+        #endregion
+
+        #region SizeNeeded
+
+        internal Size SizeNeeded
+        {
+            get { return (_SizeNeeded); }
+            set { _SizeNeeded = value; }
+        }
+
+        #endregion
+
+        #region TreeButtonIndent
+
+        internal int TreeButtonIndent
+        {
+            get
+            {
+                int n = 20;
+
+                if (_ExpandImage != null)
+                    n = Math.Max(n, _ExpandImage.Width + 4);
+
+                if (_CollapseImage != null)
+                    n = Math.Max(n, _CollapseImage.Width + 4);
+
+                return (Dpi.Width(n));
+            }
+        }
+
+        #endregion
+
+        #region VirtualInsertRow
+
+        internal GridRow VirtualInsertRow
+        {
+            get { return (_VirtualInsertRow); }
+            set { _VirtualInsertRow = value; }
+        }
+
+        #endregion
+
+        #region VirtualTempInsertRow
+
+        internal GridRow VirtualTempInsertRow
+        {
+            get { return (_VirtualTempInsertRow); }
+            set { _VirtualTempInsertRow = value; }
+        }
+
+        #endregion
+
+        #region VirtualRowCountEx
+
+        internal int VirtualRowCountEx
+        {
+            get { return (_VirtualRowCount); }
+            set { _VirtualRowCount = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region TestState
+
+        private bool TestState(Psp0 state)
+        {
+            return ((_Psp0 & state) == state);
+        }
+
+        private bool TestState(Psp1 state)
+        {
+            return ((_Psp1 & state) == state);
+        }
+
+        private bool TestState(Psi state)
+        {
+            return ((_Psi & state) == state);
+        }
+
+        #endregion
+
+        #region SetState
+
+        private void SetState(Psp0 state, bool value)
+        {
+            if (value == true)
+                _Psp0 |= state;
+            else
+                _Psp0 &= ~state;
+        }
+
+        private void SetState(Psp1 state, bool value)
+        {
+            if (value == true)
+                _Psp1 |= state;
+            else
+                _Psp1 &= ~state;
+        }
+
+        private void SetState(Psi state, bool value)
+        {
+            if (value == true)
+                _Psi |= state;
+            else
+                _Psi &= ~state;
+        }
+
+        #endregion
+
+        #region MeasureOverride
+
+        /// <summary>
+        /// Performs the layout of the item and sets
+        /// the Size property to size that item will take.
+        /// </summary>
+        /// <param name="layoutInfo">Layout information.</param>
+        /// <param name="stateInfo"></param>
+        /// <param name="constraintSize"></param>
+        protected override void MeasureOverride(
+            GridLayoutInfo layoutInfo, GridLayoutStateInfo stateInfo, Size constraintSize)
+        {
+            Size sizeNeeded = new Size();
+
+            if (NeedToUpdateBindings == true)
+            {
+                if (_LatentActiveRowIndex < 0 && _ActiveRow != null)
+                {
+                    _LatentActiveCellIndex = -1;
+                    _LatentActiveRowIndex = _ActiveRow.RowIndex;
+                    _LatentActiveContainer = _ActiveRow.Parent as GridContainer;
+
+                    if (_LastProcessedItem is GridCell)
+                        _LatentActiveCellIndex = ((GridCell)_LastProcessedItem).ColumnIndex;
+                }
+            }
+
+            if (stateInfo.PassCount == 0)
+            {
+                _RowHeaderWidthEx = Dpi.Width(_RowHeaderWidth);
+
+                UpdateDataBindings();
+
+                if (VirtualMode == true)
+                    UpdateOrderLayout();
+
+                UpdateDataFiltering();
+
+                if (VirtualMode == false)
+                    UpdateOrderLayout();
+
+                LoadLatentInsertRow();
+            }
+
+            GridPanel panel = stateInfo.GridPanel;
+
+            if (panel.VirtualMode == false)
+                UpdateIndicees(panel, panel.Rows, true);
+
+            if (ReselectActiveItem == true)
+            {
+                ReselectActiveItem = false;
+
+                if (SuperGrid.ActiveElement != null)
+                {
+                    if (SuperGrid.ActiveElement is GridCell)
+                        ((GridCell)SuperGrid.ActiveElement).IsSelected = true;
+
+                    else if (SuperGrid.ActiveElement is GridContainer)
+                        ((GridContainer)SuperGrid.ActiveElement).IsSelected = true;
+                }
+            }
+
+            MeasureColumnHeader(layoutInfo, stateInfo, constraintSize);
+            MeasureColumns(layoutInfo, stateInfo, ref sizeNeeded);
+            MeasureColumnHeader(layoutInfo, stateInfo, ref sizeNeeded);
+            MeasureRows(layoutInfo, stateInfo, constraintSize, ref sizeNeeded);
+
+            SizeColumns(ref sizeNeeded);
+            SizeColumnHeader(layoutInfo, ref sizeNeeded);
+
+            MeasureElement(_Caption, layoutInfo, stateInfo, ref sizeNeeded);
+            MeasureElement(_Title, layoutInfo, stateInfo, ref sizeNeeded);
+            MeasureElement(_Filter, layoutInfo, stateInfo, ref sizeNeeded);
+            MeasureElement(_Header, layoutInfo, stateInfo, ref sizeNeeded);
+            MeasureElement(_GroupByRow, layoutInfo, stateInfo, ref sizeNeeded);
+            MeasureElement(_Footer, layoutInfo, stateInfo, ref sizeNeeded);
+
+            if (Parent != null)
+                sizeNeeded.Width += 5;
+
+            Size = sizeNeeded;
+            SizeNeeded = sizeNeeded;
+        }
+
+        #region LoadLatentInsertRow
+
+        private void LoadLatentInsertRow()
+        {
+            if (LoadInsertRow == true)
+            {
+                LoadInsertRow = false;
+
+                if (VirtualMode == false && Rows.FloatLastItem == true)
+                {
+                    GridRow row = Rows[Rows.Count - 1] as GridRow;
+
+                    if (row != null)
+                    {
+                        row.RowIndex = Rows.Count - 1;
+
+                        for (int i = row.Cells.Count; i < _Columns.Count; i++)
+                            row.Cells.Add(new GridCell());
+
+                        // Make sure we reset any previous set default value,
+                        // and then get any newly set default values.
+
+                        for (int i = 0; i < _Columns.Count; i++)
+                        {
+                            if (row.Cells[i] != null)
+                                row.Cells[i].ValueExx = null;
+                        }
+
+                        DataBinder.GetDefaultValues(row);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region UpdateOrderLayout
+
+        internal void UpdateOrderLayout()
+        {
+            if (VirtualMode == false)
+                UpdateRealOrderLayout();
+            else
+                UpdateVirtualOrderLayout();
+        }
+
+        #region UpdateRealOrderLayout
+
+        private void UpdateRealOrderLayout()
+        {
+            if (NeedsGrouped || NeedsGroupSorted || NeedsSorted)
+            {
+                if (SuperGrid.DoLayoutOrderUpdatingEvent(this) == false)
+                {
+                    if (CanReselectActiveItem() == true)
+                        ReselectActiveItem = true;
+
+                    if (_ActiveRow != null)
+                        _ActiveRow.FlushRow();
+
+                    ClearAll(false);
+
+                    bool hasDeleted = HasDeletedRows;
+
+                    PushDeletedRows(Rows);
+
+                    if (NeedsGrouped || NeedsGroupSorted)
+                    {
+                        bool groupChanged = false;
+
+                        if (NeedsGrouped == true)
+                            groupChanged |= GroupItems();
+
+                        if (NeedsGroupSorted == true)
+                            groupChanged |= GroupSort();
+
+                        if (groupChanged == true)
+                        {
+                            if (EnsureVisibleAfterGrouping == true && ActiveRow != null)
+                                EnsureRowVisible = true;
+
+                            if (AutoExpandSetGroup == true)
+                                ExpandAll();
+                        }
+                    }
+
+                    if (NeedsSorted == true)
+                    {
+                        if (EnsureVisibleAfterSort == true && ActiveRow != null)
+                            EnsureRowVisible = true;
+
+                        SortItems();
+                    }
+
+                    if (hasDeleted == true)
+                    {
+                        UnDeleteAll();
+
+                        UpdateRowDelete(Rows);
+                    }
+
+                    SuperGrid.DoLayoutOrderUpdatedEvent(this);
+                }
+                else
+                {
+                    NeedsSorted = NeedsGrouped = NeedsGroupSorted = false;
+                }
+            }
+        }
+
+        #region PushDeletedRows
+
+        private void PushDeletedRows(GridItemsCollection rows)
+        {
+            foreach (GridContainer row in rows)
+            {
+                if (row.IsDeleted == true)
+                    row.IsDeletedEx = true;
+
+                if (row.Rows != null && row.Rows.Count > 0)
+                    PushDeletedRows(row.Rows);
+            }
+        }
+
+        #endregion
+
+        #region UpdateRowDelete
+
+        private void UpdateRowDelete(GridItemsCollection rows)
+        {
+            foreach (GridContainer row in rows)
+            {
+                row.IsDeleted = row.IsDeletedEx;
+
+                if (row.Rows != null && row.Rows.Count > 0)
+                    UpdateRowDelete(row.Rows);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region UpdateVirtualOrderLayout
+
+        private void UpdateVirtualOrderLayout()
+        {
+            if (NeedsSorted == true)
+            {
+                NeedsSorted = false;
+
+                if (SuperGrid.DoLayoutOrderUpdatingEvent(this) == false)
+                {
+                    DataBinder.UpdateDataSourceSort();
+
+                    ClearAll(false);
+
+                    InvalidateMerge();
+
+                    SuperGrid.DoLayoutOrderUpdatedEvent(this);
+                }
+            }
+        }
+
+        #endregion
+
+        #region CanReselectActiveItem
+
+        private bool CanReselectActiveItem()
+        {
+            if (LatentActiveRowIndex < 0)
+            {
+                GridElement item = SuperGrid.ActiveElement;
+
+                if (item != null)
+                {
+                    if (item is GridCell)
+                        return ((GridCell)item).IsSelected;
+
+                    else if (item is GridContainer)
+                        return ((GridContainer)item).IsSelected;
+                }
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region UpdateIndicees
+
+        internal void UpdateIndicees(
+            GridPanel panel, GridItemsCollection items, bool vis)
+        {
+            if (NeedToUpdateIndicees == true)
+            {
+                NeedToUpdateIndicees = false;
+
+                _NewFullIndex = 0;
+                _NewGridIndex = 0;
+
+                UpdateIndiceesEx(panel, items, vis);
+
+                panel.TruncateGridIndexArray();
+                panel.UpdateVisibleRowCount();
+            }
+        }
+
+        private void UpdateIndiceesEx(
+            GridPanel panel, GridItemsCollection items, bool vis)
+        {
+            int index = 0;
+
+            for (int i = 0; i < items.Count; i++)
+            {
+                GridContainer row = items[i] as GridContainer;
+
+                if (row != null)
+                {
+                    row.RowIndex = i;
+                    row.FullIndex = _NewFullIndex++;
+
+                    bool rowVisible = (vis == true && row.Visible);
+
+                    if (rowVisible == true)
+                    {
+                        row.Index = index++;
+                        row.GridIndex = panel.GetNewGridIndex(row);
+                    }
+
+                    if (row is GridPanel == false)
+                        UpdateIndiceesEx(panel, row.Rows, rowVisible && row.Expanded);
+                }
+            }
+        }
+
+        #endregion
+
+        #region MeasureColumnHeader
+
+        private void MeasureColumnHeader(
+            GridLayoutInfo layoutInfo, GridLayoutStateInfo stateInfo, Size constraintSize)
+        {
+            GridColumnHeader columnHeader = _ColumnHeader;
+
+            if (columnHeader != null)
+                columnHeader.Measure(layoutInfo, stateInfo, constraintSize);
+        }
+
+        private void MeasureColumnHeader(GridLayoutInfo layoutInfo,
+            GridLayoutStateInfo stateInfo, ref Size sizeNeeded)
+        {
+            GridColumnHeader columnHeader = _ColumnHeader;
+
+            if (columnHeader != null)
+            {
+                columnHeader.Measure(layoutInfo, stateInfo, new Size(1, 0));
+
+                if (columnHeader.Visible == true)
+                    sizeNeeded.Height += columnHeader.Size.Height;
+                else
+                    sizeNeeded.Height++;
+            }
+        }
+
+        #endregion
+
+        #region MeasureColumns
+
+        private void MeasureColumns(GridLayoutInfo layoutInfo,
+            GridLayoutStateInfo stateInfo, ref Size sizeNeeded)
+        {
+            int fillBase;
+            int noFillWidth;
+
+            CalculateFillData(layoutInfo,
+                stateInfo, out fillBase, out noFillWidth);
+
+            int width = CalculateColumnWidths(
+                layoutInfo, fillBase, noFillWidth);
+
+            if (ShowRowHeaders == true)
+                width += RowHeaderWidthEx;
+
+            sizeNeeded.Width = Math.Max(width, sizeNeeded.Width);
+        }
+
+        #region CalculateFillData
+
+        private void CalculateFillData(GridLayoutInfo layoutInfo,
+            GridLayoutStateInfo stateInfo, out int fillBase, out int noFillWidth)
+        {
+            fillBase = 0;
+            noFillWidth = 0;
+
+            if (ShowRowHeaders == true)
+                noFillWidth += RowHeaderWidthEx;
+
+            GridColumnCollection columns = _Columns;
+            foreach (GridColumn column in columns)
+            {
+                if (column.Visible == true)
+                {
+                    if (VirtualMode == true)
+                    {
+                        switch (GetAutoSizeMode(column))
+                        {
+                            case ColumnAutoSizeMode.None:
+                            case ColumnAutoSizeMode.ColumnHeader:
+                                break;
+
+                            default:
+                                column.NeedsMeasured = true;
+                                break;
+                        }
+                    }
+
+                    column.Measure(layoutInfo, stateInfo, Size.Empty);
+
+                    if (GetAutoSizeMode(column) == ColumnAutoSizeMode.Fill)
+                        fillBase += column.FillWeight;
+                    else
+                        noFillWidth += column.Size.Width;
+                }
+            }
+        }
+
+        #endregion
+
+        #region CalculateColumnWidths
+
+        private int CalculateColumnWidths(
+            GridLayoutInfo layoutInfo, int fillBase, int noFillWidth)
+        {
+            int width = 0;
+            int n = layoutInfo.ClientBounds.Width - noFillWidth;
+
+            GridColumn lastColumn = _Columns.LastVisibleColumn;
+
+            GridColumnCollection columns = _Columns;
+
+            int[] map = columns.DisplayIndexMap;
+            for (int i = 0; i < map.Length; i++)
+            {
+                int index = map[i];
+
+                GridColumn column = columns[index];
+
+                if (column.Visible == true)
+                {
+                    Size size = column.Size;
+                    ColumnAutoSizeMode autoSizeMode = GetAutoSizeMode(column);
+
+                    if (fillBase > 0 && autoSizeMode == ColumnAutoSizeMode.Fill)
+                    {
+                        if (column.FillWeight == 0)
+                        {
+                            size.Width = Dpi.Width(column.MinimumWidth);
+                        }
+                        else
+                        {
+                            if (column == lastColumn)
+                            {
+                                size.Width = layoutInfo.ClientBounds.Right - width;
+
+                                if (IsSubPanel == false)
+                                {
+                                    if (SuperGrid.VScrollBarVisible && (Size.Height - _WhiteSpaceRect.Height >= layoutInfo.ClientBounds.Height))
+                                        size.Width--;
+                                }
+
+                                if (ShowRowHeaders == true)
+                                    size.Width -= RowHeaderWidthEx;
+                            }
+                            else
+                            {
+                                size.Width = (int)(n * (float)column.FillWeight / fillBase);
+                            }
+                        }
+                    }
+                    else if (autoSizeMode == ColumnAutoSizeMode.None)
+                    {
+                        size.Width = Dpi.Width(column.Width);
+                    }
+
+                    size.Width = Math.Max(size.Width, column.MinimumWidth);
+
+                    if (column.Size.Width != size.Width)
+                    {
+                        column.Size = size;
+
+                        SuperGrid.DoColumnResizedEvent(this, column);
+                    }
+
+                    width += size.Width;
+                }
+            }
+
+            return (width);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region MeasureRows
+
+        private void MeasureRows(GridLayoutInfo layoutInfo,
+            GridLayoutStateInfo stateInfo, Size constraintSize, ref Size sizeNeeded)
+        {
+            if (VirtualMode == true)
+                MeasureVirtualRows(layoutInfo, stateInfo, constraintSize, ref sizeNeeded);
+            else
+                MeasureRealRows(layoutInfo, stateInfo, constraintSize, ref sizeNeeded);
+        }
+
+        #region MeasureVirtualRows
+
+        private void MeasureVirtualRows(GridLayoutInfo layoutInfo,
+            GridLayoutStateInfo stateInfo, Size constraintSize, ref Size sizeNeeded)
+        {
+            if (VirtualRowCountEx > 0)
+            {
+                int vrh = Dpi.Height(stateInfo.GridPanel.VirtualRowHeight);
+
+                try
+                {
+                    sizeNeeded.Height =
+                        checked(sizeNeeded.Height + vrh * VirtualRowCountEx);
+                }
+                catch (System.OverflowException e)
+                {
+                    sizeNeeded.Height = int.MaxValue - 100;
+                }
+            }
+            else
+            {
+                Size size = MeasureWhiteSpaceText(layoutInfo, constraintSize);
+
+                sizeNeeded.Height += size.Height;
+            }
+        }
+
+        #endregion
+
+        #region MeasureRealRows
+
+        private void MeasureRealRows(GridLayoutInfo layoutInfo,
+            GridLayoutStateInfo stateInfo, Size constraintSize, ref Size sizeNeeded)
+        {
+            RowHeaderSize = Size.Empty;
+            Rectangle r = Rectangle.Empty;
+
+            constraintSize.Width = sizeNeeded.Width;
+
+            GridItemsCollection items = Rows;
+            foreach (GridElement item in items)
+            {
+                if (item is GridTextRow == false)
+                {
+                    if (item.Visible == true)
+                    {
+                        item.Measure(layoutInfo, stateInfo, constraintSize);
+
+                        r.Y += item.Size.Height;
+
+                        sizeNeeded.Height += item.Size.Height;
+                        sizeNeeded.Width = Math.Max(item.Size.Width, sizeNeeded.Width);
+                    }
+                    else
+                    {
+                        item.BoundsRelative = r;
+                    }
+                }
+            }
+
+            if (_VisibleRowCount == 0)
+            {
+                Size size = MeasureWhiteSpaceText(layoutInfo, constraintSize);
+
+                sizeNeeded.Height += size.Height;
+            }
+        }
+
+        #region MeasureWhiteSpaceText
+
+        private Size MeasureWhiteSpaceText(
+            GridLayoutInfo layoutInfo, Size constraintSize)
+        {
+            Size size = Size.Empty;
+
+            if (String.IsNullOrEmpty(_NoRowsText) == false)
+            {
+                GridPanelVisualStyle style = GetEffectiveStyle();
+
+                constraintSize.Width = BoundsRelative.Width - Dpi.Width13;
+
+                if (_NoRowsMarkup != null)
+                {
+                    size = GetMarkupTextSize(layoutInfo, style, constraintSize.Width);
+                }
+                else
+                {
+                    eTextFormat tf = style.GetTextFormatFlags();
+
+                    size = TextHelper.MeasureText(
+                        layoutInfo.Graphics, _NoRowsText, style.Font, constraintSize, tf);
+                }
+
+                size.Height += Dpi.Height10;
+            }
+
+            return (size);
+        }
+
+        #region GetMarkupTextSize
+
+        private Size GetMarkupTextSize(
+            GridLayoutInfo layoutInfo, GridPanelVisualStyle style, int width)
+        {
+            Graphics g = layoutInfo.Graphics;
+
+            MarkupDrawContext d =
+                new MarkupDrawContext(g, style.Font, style.TextColor, false);
+
+            _NoRowsMarkup.InvalidateElementsSize();
+            _NoRowsMarkup.Measure(new Size(width, 0), d);
+
+            return (_NoRowsMarkup.Bounds.Size);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region SizeColumns
+
+        private void SizeColumns(ref Size sizeNeeded)
+        {
+            GridColumnCollection columns = _Columns;
+            foreach (GridColumn column in columns)
+            {
+                if (column.Visible == true)
+                {
+                    Size size = column.Size;
+                    size.Height = sizeNeeded.Height;
+
+                    if (ColumnHeader.Visible == true)
+                        size.Height -= ColumnHeader.Size.Height;
+
+                    column.Size = size;
+                }
+            }
+        }
+
+        #endregion
+
+        #region SizeColumnHeader
+
+        private void SizeColumnHeader(
+            GridLayoutInfo layoutInfo, ref Size sizeNeeded)
+        {
+            GridColumnHeader columnHeader = _ColumnHeader;
+
+            if (columnHeader != null)
+            {
+                Size size = columnHeader.Size;
+
+                size.Width = (Parent == null)
+                     ? Math.Max(sizeNeeded.Width, layoutInfo.ClientBounds.Width)
+                     : sizeNeeded.Width;
+
+                columnHeader.Size = size;
+            }
+        }
+
+        #endregion
+
+        #region MeasureElement
+
+        private void MeasureElement(GridElement item,
+            GridLayoutInfo layoutInfo, GridLayoutStateInfo stateInfo, ref Size sizeNeeded)
+        {
+            if (item != null && item.Visible == true)
+            {
+                item.Measure(layoutInfo, stateInfo, new Size(sizeNeeded.Width, 0));
+
+                sizeNeeded.Height += item.Size.Height;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region ArrangeOverride
+
+        /// <summary>
+        /// Performs the arrange pass layout of the item when
+        /// final position and size of the item has been set.
+        /// </summary>
+        /// <param name="layoutInfo">Layout information.</param>
+        /// <param name="stateInfo"></param>
+        /// <param name="layoutBounds"></param>
+        protected override void ArrangeOverride(
+            GridLayoutInfo layoutInfo, GridLayoutStateInfo stateInfo, Rectangle layoutBounds)
+        {
+            Rectangle bounds = layoutBounds;
+
+            ArrangeCaption(layoutInfo, stateInfo, ref bounds);
+            ArrangeTitle(layoutInfo, stateInfo, ref bounds);
+            ArrangeGroupBox(layoutInfo, stateInfo, ref bounds);
+
+            Rectangle cbounds = bounds;
+            ArrangeColumnHeader1(ref bounds);
+
+            ArrangeFilter(layoutInfo, stateInfo, ref bounds);
+            ArrangeHeader(layoutInfo, stateInfo, ref bounds);
+            ArrangeFooter(layoutInfo, stateInfo, ref bounds);
+
+            FixedRowHeight = bounds.Y - layoutBounds.Y;
+            FixedHeaderHeight = FixedRowHeight;
+
+            ArrangeColumns(layoutInfo, stateInfo, bounds);
+            ArrangeColumnHeader2(layoutInfo, stateInfo, cbounds);
+
+            ArrangeRows(layoutInfo, stateInfo, bounds);
+
+            NeedsFilterScan = false;
+
+            UpdateActivateRow();
+        }
+
+        #region ArrangeCaption
+
+        private void ArrangeCaption(GridLayoutInfo layoutInfo,
+            GridLayoutStateInfo stateInfo, ref Rectangle bounds)
+        {
+            GridElement caption = _Caption;
+
+            if (caption != null && caption.Visible == true)
+            {
+                caption.Arrange(layoutInfo, stateInfo,
+                    new Rectangle(bounds.Location, caption.Size));
+
+                bounds.Y += caption.Size.Height;
+                bounds.Height -= caption.Size.Height;
+            }
+        }
+
+        #endregion
+
+        #region ArrangeTitle
+
+        private void ArrangeTitle(GridLayoutInfo layoutInfo,
+            GridLayoutStateInfo stateInfo, ref Rectangle bounds)
+        {
+            GridElement title = _Title;
+
+            if (title != null && title.Visible == true)
+            {
+                title.Arrange(layoutInfo, stateInfo,
+                    new Rectangle(bounds.Location, title.Size));
+
+                bounds.Y += title.Size.Height;
+                bounds.Height -= title.Size.Height;
+            }
+        }
+
+        #endregion
+
+        #region ArrangeColumnHeader
+
+        private void ArrangeColumnHeader1(ref Rectangle bounds)
+        {
+            GridElement columnHeader = _ColumnHeader;
+
+            if (columnHeader.Visible == true)
+            {
+                bounds.Y += columnHeader.Size.Height;
+                bounds.Height -= columnHeader.Size.Height;
+            }
+        }
+
+        private void ArrangeColumnHeader2(GridLayoutInfo layoutInfo,
+            GridLayoutStateInfo stateInfo, Rectangle bounds)
+        {
+            GridElement columnHeader = _ColumnHeader;
+
+            if (columnHeader.Visible == true)
+            {
+                columnHeader.Arrange(layoutInfo, stateInfo,
+                    new Rectangle(bounds.Location, columnHeader.Size));
+            }
+        }
+
+
+        #endregion
+
+        #region ArrangeHeader
+
+        private void ArrangeHeader(GridLayoutInfo layoutInfo,
+            GridLayoutStateInfo stateInfo, ref Rectangle bounds)
+        {
+            GridElement header = _Header;
+
+            if (header != null && header.Visible == true)
+            {
+                header.Arrange(layoutInfo, stateInfo,
+                    new Rectangle(bounds.Location, header.Size));
+
+                bounds.Y += header.Size.Height;
+                bounds.Height -= header.Size.Height;
+            }
+        }
+
+        #endregion
+
+        #region ArrangeFilter
+
+        private void ArrangeFilter(GridLayoutInfo layoutInfo,
+            GridLayoutStateInfo stateInfo, ref Rectangle bounds)
+        {
+            GridElement filter = _Filter;
+
+            if (filter != null && filter.Visible == true)
+            {
+                filter.Arrange(layoutInfo, stateInfo,
+                    new Rectangle(bounds.Location, filter.Size));
+
+                bounds.Y += filter.Size.Height;
+                bounds.Height -= filter.Size.Height;
+            }
+        }
+
+        #endregion
+
+        #region ArrangeGroupBox
+
+        private void ArrangeGroupBox(GridLayoutInfo layoutInfo,
+            GridLayoutStateInfo stateInfo, ref Rectangle bounds)
+        {
+            GridElement groupBox = _GroupByRow;
+
+            if (groupBox != null && groupBox.Visible == true)
+            {
+                groupBox.Arrange(layoutInfo, stateInfo,
+                    new Rectangle(bounds.Location, groupBox.Size));
+
+                bounds.Y += groupBox.Size.Height;
+                bounds.Height -= groupBox.Size.Height;
+            }
+        }
+
+        #endregion
+
+        #region ArrangeFooter
+
+        private void ArrangeFooter(GridLayoutInfo layoutInfo,
+            GridLayoutStateInfo stateInfo, ref Rectangle bounds)
+        {
+            GridElement footer = _Footer;
+
+            if (footer != null && footer.Visible == true)
+            {
+                Rectangle itemBounds =
+                    new Rectangle(bounds.X, bounds.Bottom - footer.Size.Height,
+                                  footer.Size.Width, footer.Size.Height);
+
+                footer.Arrange(layoutInfo, stateInfo, itemBounds);
+                bounds.Height -= itemBounds.Height;
+            }
+        }
+
+        #endregion
+
+        #region ArrangeColumns
+
+        private void ArrangeColumns(GridLayoutInfo layoutInfo,
+            GridLayoutStateInfo stateInfo, Rectangle bounds)
+        {
+            if (ShowRowHeaders == true)
+            {
+                bounds.X += RowHeaderWidthEx;
+                bounds.Width -= RowHeaderWidthEx;
+            }
+
+            GridColumnCollection columns = _Columns;
+
+            int[] map = columns.DisplayIndexMap;
+            for (int i = 0; i < map.Length; i++)
+            {
+                int index = map[i];
+
+                GridColumn column = columns[index];
+
+                if (column.Visible == true)
+                {
+                    Size size = column.Size;
+
+                    column.Arrange(layoutInfo, stateInfo,
+                        new Rectangle(bounds.Location, size));
+
+                    bounds.X += size.Width;
+                    bounds.Width -= size.Width;
+                }
+            }
+        }
+
+        #endregion
+
+        #region ArrangeRows
+
+        private void ArrangeRows(GridLayoutInfo layoutInfo,
+            GridLayoutStateInfo stateInfo, Rectangle bounds)
+        {
+            if (VirtualMode == true)
+                ArrangeVirtualRows(layoutInfo, stateInfo, bounds);
+            else
+                ArrangeRealRows(layoutInfo, stateInfo, bounds);
+        }
+
+        #region ArrangeVirtualRows
+
+        private void ArrangeVirtualRows(
+            GridLayoutInfo layoutInfo, GridLayoutStateInfo stateInfo, Rectangle bounds)
+        {
+            GridPanel panel = stateInfo.GridPanel;
+
+            _VisibleRowCount = VirtualRowCountEx;
+
+            int vrh = Dpi.Height(panel.VirtualRowHeight);
+
+            FixedRowHeight += (vrh * panel.FrozenRowCount);
+
+            Point currentLocation = bounds.Location;
+
+            if (panel.VirtualRowCount > 0)
+            {
+                int start = panel.FirstOnScreenRowIndex;
+                int end = panel.LastOnScreenRowIndex;
+
+                currentLocation.Y += (start * vrh);
+
+                for (int i = start; i <= end; i++)
+                {
+                    GridRow row = panel.VirtualRows[i];
+
+                    Size size = new Size(_ColumnHeader.Size.Width, row.Size.Height);
+                    Rectangle itemBounds = new Rectangle(currentLocation, size);
+
+                    row.Arrange(layoutInfo, stateInfo, itemBounds);
+
+                    currentLocation.Y += itemBounds.Height;
+                }
+
+                _WhiteSpaceRect = bounds;
+
+                _WhiteSpaceRect.Y += (panel.VisibleRowCount * vrh) - 1;
+                _WhiteSpaceRect.Height = bounds.Bottom - _WhiteSpaceRect.Y;
+            }
+            else
+            {
+                _WhiteSpaceRect = bounds;
+            }
+        }
+
+        #endregion
+
+        #region ArrangeRealRows
+
+        private void ArrangeRealRows(GridLayoutInfo layoutInfo,
+            GridLayoutStateInfo stateInfo, Rectangle bounds)
+        {
+            Point currentLocation = bounds.Location;
+            Rectangle r = Rectangle.Empty;
+            r.Location = currentLocation;
+
+            int n = 0;
+
+            GridItemsCollection items = Rows;
+            foreach (GridElement item in items)
+            {
+                if (item.Visible == true)
+                {
+                    Size size = new Size(_ColumnHeader.Size.Width, item.Size.Height);
+                    Rectangle itemBounds = new Rectangle(currentLocation, size);
+
+                    item.Arrange(layoutInfo, stateInfo, itemBounds);
+
+                    if (n++ < FrozenRowCount)
+                        FixedRowHeight += itemBounds.Height;
+
+                    currentLocation.Y += itemBounds.Height;
+                }
+                else
+                {
+                    r.Y = currentLocation.Y;
+                    item.BoundsRelative = r;
+                }
+            }
+
+            _WhiteSpaceRect = bounds;
+
+            _WhiteSpaceRect.Y = currentLocation.Y - 1;
+            _WhiteSpaceRect.Height = bounds.Bottom - _WhiteSpaceRect.Y;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region UpdateActivateRow
+
+        private void UpdateActivateRow()
+        {
+            GridContainer row = null;
+
+            if (VirtualMode == true)
+            {
+                if (LatentActiveRowIndex >= 0 && LatentActiveRowIndex < VirtualRowCountEx)
+                    row = VirtualRows[LatentActiveRowIndex];
+                else
+                    SetInitialVirtualSelection();
+            }
+            else
+            {
+                if (LatentActiveRowIndex >= 0 &&
+                    (LatentActiveContainer != null && LatentActiveRowIndex < LatentActiveContainer.Rows.Count))
+                {
+                    row = LatentActiveContainer.Rows[LatentActiveRowIndex] as GridContainer;
+                }
+                else
+                {
+                    SetInitialRealSelection();
+                }
+            }
+
+            LatentActiveRowIndex = -1;
+            LatentActiveContainer = null;
+
+            if (row != null)
+            {
+                ClearAll();
+
+                SetActiveRow(row, true);
+
+                if (_LatentActiveCellIndex >= 0)
+                {
+                    GridCell cell = GetCell(row.RowIndex, _LatentActiveCellIndex);
+
+                    if (cell != null)
+                    {
+                        SetActiveCell(cell);
+                        SelectCell(cell);
+                    }
+                }
+                else
+                {
+                    row.IsSelected = true;
+                    SelectionRowAnchor = row;
+                }
+
+                EnsureRowVisible = true;
+            }
+
+            _LatentActiveCellIndex = -1;
+
+            if (EnsureRowVisible == true)
+            {
+                EnsureRowVisible = false;
+
+                if (ActiveRow != null)
+                    ActiveRow.EnsureVisible(false);
+            }
+
+            if (SelectActiveRow == true)
+            {
+                SelectActiveRow = false;
+
+                ClearAll();
+
+                if (ActiveRow != null)
+                    ActiveRow.IsSelected = true;
+
+                SuperGrid.UpdateInternalMouseMove();
+            }
+        }
+
+        #region SetInitialVirtualSelection
+
+        private void SetInitialVirtualSelection()
+        {
+            if (ActiveRow == null && VirtualRowCountEx > 0)
+            {
+                int n = 0;
+
+                switch (_InitialActiveRow)
+                {
+                    case RelativeRow.InsertionRow:
+                        n = VirtualRowCountEx - 1;
+                        break;
+
+                    case RelativeRow.LastRow:
+                        n = VirtualRowCountEx - 1;
+
+                        if (ShowInsertRow == true && n > 0)
+                            n--;
+                        break;
+
+                    case RelativeRow.None:
+                        return;
+                }
+
+                SetInitialSelection(VirtualRows[n]);
+            }
+        }
+
+        #endregion
+
+        #region SetInitialRealSelection
+
+        private void SetInitialRealSelection()
+        {
+            if (ActiveRow == null && Rows.Count > 0)
+            {
+                int n = 0;
+
+                switch (_InitialActiveRow)
+                {
+                    case RelativeRow.InsertionRow:
+                        n = Rows.Count - 1;
+                        break;
+
+                    case RelativeRow.LastRow:
+                        n = Rows.Count - 1;
+
+                        if (ShowInsertRow == true && n > 0)
+                            n--;
+                        break;
+
+                    case RelativeRow.None:
+                        return;
+                }
+
+                if (Rows[n] is GridRow)
+                    SetInitialSelection((GridRow)Rows[n]);
+            }
+        }
+
+        #endregion
+
+        #region SetInitialSelection
+
+        private void SetInitialSelection(GridRow row)
+        {
+            if (_InitialActiveRow != RelativeRow.None)
+                SetActiveRow(row, true);
+
+            switch (_InitialSelection)
+            {
+                case RelativeSelection.FirstCell:
+                    SetFirstAvailableCell(Columns.FirstVisibleColumn);
+                    break;
+
+                case RelativeSelection.LastCell:
+                    SetLastAvailableCell(Columns.LastVisibleColumn);
+                    break;
+
+                case RelativeSelection.PrimaryCell:
+                    SetFirstAvailableCell(PrimaryColumn);
+                    break;
+
+                case RelativeSelection.Row:
+                    SuperGrid.KeySelectRow(this, row, true, false);
+                    break;
+
+                default:
+                    if (row != null)
+                        row.EnsureVisible();
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region SetFirstAvailableCell
+
+        private void SetFirstAvailableCell(GridColumn column)
+        {
+            if (column != null)
+            {
+                GridRow row = _ActiveRow as GridRow;
+
+                if (row != null)
+                {
+                    GridCell ecell = row.GetCell(
+                        column.ColumnIndex, AllowEmptyCellSelection);
+
+                    while (ecell != null && ecell.AllowSelection == false)
+                        ecell = ecell.GetNextCell(true, false);
+
+                    if (ecell != null)
+                        SelectCell(ecell);
+                }
+            }
+        }
+
+        #endregion
+
+        #region SetLastAvailableCell
+
+        private void SetLastAvailableCell(GridColumn column)
+        {
+            if (column != null)
+            {
+                GridRow row = _ActiveRow as GridRow;
+
+                if (row != null)
+                {
+                    GridCell ecell = row.GetCell(
+                        column.ColumnIndex, AllowEmptyCellSelection);
+
+                    while (ecell != null && ecell.AllowSelection == false)
+                        ecell = ecell.GetPreviousCell(true, false);
+
+                    if (ecell != null)
+                        SelectCell(ecell);
+                }
+            }
+        }
+
+        #endregion
+
+        #region SelectCell
+
+        private void SelectCell(GridCell cell)
+        {
+            if (cell != null)
+            {
+                if (SetActiveRow(cell.GridRow, true) == true)
+                {
+                    SelectionRowAnchor = cell.GridRow;
+                    SelectionColumnAnchor = cell.GridColumn;
+                }
+
+                cell.ExtendSelection(this, cell, false);
+
+                LastProcessedItem = cell;
+
+                if (IsSubPanel == false)
+                    cell.EnsureVisible();
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region RenderOverride
+
+        /// <summary>
+        /// Performs drawing of the item and its children.
+        /// </summary>
+        /// <param name="renderInfo">Holds contextual rendering information.</param>
+        protected override void RenderOverride(GridRenderInfo renderInfo)
+        {
+            Rectangle r = (Parent == null)
+                ? SuperGrid.ClientRectangle : BoundsRelative;
+
+            if (BoundsRelative.IntersectsWith(r))
+            {
+                RenderRows(renderInfo);
+                RenderFooter(renderInfo);
+                RenderColumnHeader(renderInfo);
+                RenderGroupBox(renderInfo);
+                RenderFilter(renderInfo);
+                RenderHeader(renderInfo);
+                RenderTitle(renderInfo);
+                RenderCaption(renderInfo);
+                RenderWhitespace(renderInfo);
+                RenderBorder(renderInfo);
+
+                if (DisplayedCellRanges != null)
+                {
+                    if ((CellMergeMode & CellMergeMode.Vertical) == CellMergeMode.Vertical)
+                        SuperGrid.CanScrollEx = false;
+                }
+
+                if (IsDesignerHosted == true)
+                {
+                    foreach (GridColumn column in _Columns)
+                        column.Render(renderInfo);
+
+                    RenderDesignerElement(renderInfo, Bounds);
+                }
+            }
+
+            FlushSelected();
+        }
+
+        #region RenderRows
+
+        private void RenderRows(GridRenderInfo renderInfo)
+        {
+            Graphics g = renderInfo.Graphics;
+            Rectangle t = SuperGrid.ViewRect;
+            Rectangle k = SuperGrid.ViewRectEx;
+
+            GridRenderInfo renderInfo2 = renderInfo;
+
+            Region save = g.Clip;
+            g.SetClip(k, CombineMode.Intersect);
+
+            if (renderInfo.ClipRectangle.Y < t.Y)
+            {
+                Rectangle r = renderInfo.ClipRectangle;
+
+                if (IsVFrozen == false)
+                {
+                    r.Y = t.Y;
+                    r.Height -= (t.Y - r.Y);
+                }
+
+                renderInfo2 = new GridRenderInfo(g, r);
+            }
+
+            RenderCount++;
+            UpdateMergeFlags();
+
+            if (VirtualMode == true)
+            {
+                RenderVirtualRows(renderInfo2);
+                RenderFrozenVirtualRows(renderInfo);
+            }
+            else
+            {
+                RenderRealRows(renderInfo2);
+                RenderFrozenRealRows(renderInfo);
+            }
+
+            g.Clip = save;
+        }
+
+        #region RenderVirtualRows
+
+        private void RenderVirtualRows(GridRenderInfo renderInfo)
+        {
+            Rectangle r = BoundsRelative;
+
+            r.Size = new Size(_ColumnHeader.Size.Width, Dpi.Height(VirtualRowHeight));
+
+            int frow = FirstOnScreenRowIndex;
+
+            GridVirtualRows vrows = VirtualRows;
+            for (int i = frow; i < VirtualRowCountEx; i++)
+            {
+                GridRow row = vrows[i];
+
+                Rectangle bounds = row.VScrollBounds;
+
+                if (bounds.Size != r.Size)
+                {
+                    row.FlushRow();
+                    vrows.FreeRow(i);
+
+                    row = vrows[i];
+
+                    bounds = row.VScrollBounds;
+                }
+
+                if (IsSubPanel == true)
+                    bounds.X -= HScrollOffset;
+
+                if (bounds.Y > renderInfo.ClipRectangle.Bottom)
+                    break;
+
+                if (bounds.IntersectsWith(renderInfo.ClipRectangle))
+                    row.Render(renderInfo);
+            }
+        }
+
+        #endregion
+
+        #region RenderFrozenVirtualRows
+
+        private void RenderFrozenVirtualRows(GridRenderInfo renderInfo)
+        {
+            if (FrozenRowCount > 0 && IsSubPanel == false)
+            {
+                int vrh = Dpi.Height(VirtualRowHeight);
+
+                Rectangle r = BoundsRelative;
+                r.Y += (FixedRowHeight - (FrozenRowCount * vrh));
+                r.Size = new Size(_ColumnHeader.Size.Width, vrh);
+
+                int n = Math.Min(FrozenRowCount, VirtualRowCountEx);
+
+                GridVirtualRows vrows = VirtualRows;
+                for (int i = 0; i < n; i++)
+                {
+                    GridRow row = vrows[i];
+
+                    r.Y += vrh;
+
+                    Rectangle bounds = row.BoundsRelative;
+
+                    if (IsSubPanel == true)
+                        bounds.X -= HScrollOffset;
+
+                    if (bounds.IntersectsWith(renderInfo.ClipRectangle))
+                        row.Render(renderInfo);
+
+                    if (i + 1 == FrozenRowCount)
+                    {
+                        bounds.X -= 3;
+                        bounds.Width += 3;
+
+                        AddDropShadow(renderInfo, bounds, true, false);
+                        break;
+                    }
+
+                    if (bounds.Y > renderInfo.ClipRectangle.Bottom)
+                        break;
+                }
+            }
+        }
+
+        #endregion
+
+        #region RenderRealRows
+
+        private void RenderRealRows(GridRenderInfo renderInfo)
+        {
+            GridItemsCollection items = Rows;
+
+            for (int i = FirstOnScreenRowIndex; i < items.Count; i++)
+            {
+                GridElement item = items[i];
+
+                if (item.Visible == true)
+                {
+                    Rectangle r = item.BoundsRelative;
+
+                    if (IsSubPanel == true)
+                    {
+                        r.X -= HScrollOffset;
+
+                        SuperGrid.CanScrollEx = false;
+                    }
+
+                    if (item.IsVFrozen == false)
+                        r.Y -= VScrollOffset;
+
+                    if (r.Y > renderInfo.ClipRectangle.Bottom)
+                        break;
+
+                    if (r.IntersectsWith(renderInfo.ClipRectangle))
+                        item.Render(renderInfo);
+                }
+            }
+        }
+
+        #endregion
+
+        #region RenderFrozenRealRows
+
+        private void RenderFrozenRealRows(GridRenderInfo renderInfo)
+        {
+            if (FrozenRowCount > 0 && IsSubPanel == false)
+            {
+                int n = 0;
+
+                GridItemsCollection items = Rows;
+                foreach (GridElement item in items)
+                {
+                    if (item.Visible == true)
+                    {
+                        Rectangle r = item.BoundsRelative;
+
+                        if (IsSubPanel == true)
+                            r.X -= HScrollOffset;
+
+                        if (r.IntersectsWith(renderInfo.ClipRectangle))
+                            item.Render(renderInfo);
+
+                        if (++n >= FrozenRowCount)
+                        {
+                            r.X -= 3;
+                            r.Width += 3;
+
+                            AddDropShadow(renderInfo, r, true, false);
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderFooter
+
+        private void RenderFooter(GridRenderInfo renderInfo)
+        {
+            GridElement footer = _Footer;
+
+            if (footer != null && footer.Visible == true)
+                footer.Render(renderInfo);
+        }
+
+        #endregion
+
+        #region RenderColumnHeader
+
+        private void RenderColumnHeader(GridRenderInfo renderInfo)
+        {
+            GridElement columnHeader = _ColumnHeader;
+
+            if (columnHeader.Visible == true)
+            {
+                Rectangle bounds = columnHeader.BoundsRelative;
+
+                if (IsSubPanel == true)
+                    bounds.X -= HScrollOffset;
+
+                if (IsVFrozen == false)
+                    bounds.Y -= VScrollOffset;
+
+                if (bounds.IntersectsWith(renderInfo.ClipRectangle))
+                    columnHeader.Render(renderInfo);
+            }
+        }
+
+        #endregion
+
+        #region RenderGroupBox
+
+        private void RenderGroupBox(GridRenderInfo renderInfo)
+        {
+            GridElement groupBox = _GroupByRow;
+
+            if (groupBox != null && groupBox.Visible == true)
+                groupBox.Render(renderInfo);
+        }
+
+        #endregion
+
+        #region RenderFilter
+
+        private void RenderFilter(GridRenderInfo renderInfo)
+        {
+            GridElement filter = _Filter;
+
+            if (filter != null && filter.Visible == true)
+                filter.Render(renderInfo);
+        }
+
+        #endregion
+
+        #region RenderHeader
+
+        private void RenderHeader(GridRenderInfo renderInfo)
+        {
+            GridElement header = _Header;
+
+            if (header != null && header.Visible == true)
+                header.Render(renderInfo);
+        }
+
+        #endregion
+
+        #region RenderTitle
+
+        private void RenderTitle(GridRenderInfo renderInfo)
+        {
+            GridElement title = _Title;
+
+            if (title != null && title.Visible == true)
+                title.Render(renderInfo);
+        }
+
+        #endregion
+
+        #region RenderCaption
+
+        private void RenderCaption(GridRenderInfo renderInfo)
+        {
+            GridElement caption = _Caption;
+
+            if (caption != null && caption.Visible == true)
+                caption.Render(renderInfo);
+        }
+
+        #endregion
+
+        #region RenderBorder
+
+        private void RenderBorder(GridRenderInfo renderInfo)
+        {
+            Graphics g = renderInfo.Graphics;
+
+            Rectangle t = ViewRect;
+            Rectangle r = PanelBounds;
+
+            if (Parent != null)
+            {
+                r.Width = BoundsRelative.Width - 5;
+
+                if (IsVFrozen == false)
+                {
+                    r.Intersect(t);
+
+                    if (r.Y < t.Y)
+                    {
+                        r.Height -= (t.Y - r.Y);
+                        r.Y = t.Y;
+                    }
+                }
+
+                if (ShowDropShadow == true)
+                    AddDropShadow(renderInfo, r, true, true);
+
+                t.Inflate(4, 4);
+
+                if (r.Bottom > t.Bottom)
+                    r.Height -= (r.Bottom - t.Bottom);
+            }
+            else
+            {
+                r = SuperGrid.ClientRectangle;
+            }
+
+            if (r.Width > 0 && r.Height > 0)
+            {
+                GridPanelVisualStyle style = GetEffectiveStyle();
+
+                style.RenderBorder(g, r);
+            }
+        }
+
+        #region AddDropShadow
+
+        internal void AddDropShadow(
+            GridRenderInfo renderInfo, Rectangle r, bool drawBot, bool drawRight)
+        {
+            Graphics g = renderInfo.Graphics;
+            Color color = Color.Black;
+
+            using (Pen pen1 = new Pen(Color.FromArgb(80, color)))
+            {
+                using (Pen pen2 = new Pen(Color.FromArgb(48, color)))
+                {
+                    using (Pen pen3 = new Pen(Color.FromArgb(16, color)))
+                    {
+                        Point pt1 = new Point(r.X + 3, r.Bottom);
+                        Point pt2 = new Point(r.Right - 1, r.Bottom);
+                        Point pt3 = new Point(r.Right, r.Y + 3);
+                        Point pt4 = new Point(r.Right, r.Bottom - 1);
+
+                        pt3.Y = Math.Max(pt3.Y, renderInfo.ClipRectangle.Y);
+                        pt4.Y = Math.Min(pt4.Y, renderInfo.ClipRectangle.Bottom);
+
+                        if (drawBot == true)
+                        {
+                            g.DrawLine(pen1, pt1, pt2);
+
+                            pt1.X++; pt1.Y++;
+                            pt2.X--; pt2.Y++;
+
+                            g.DrawLine(pen2, pt1, pt2);
+
+                            pt1.X++; pt1.Y++;
+                            pt2.X--; pt2.Y++;
+
+                            g.DrawLine(pen3, pt1, pt2);
+                        }
+
+                        if (drawRight == true)
+                        {
+                            g.DrawLine(pen1, pt3, pt4);
+
+                            pt3.X++; pt3.Y++;
+                            pt4.X++; pt4.Y--;
+
+                            g.DrawLine(pen2, pt3, pt4);
+
+                            pt3.X++; pt3.Y++;
+                            pt4.X++; pt4.Y -= 2;
+
+                            g.DrawLine(pen3, pt3, pt4);
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderWhitespace
+
+        private void RenderWhitespace(GridRenderInfo renderInfo)
+        {
+            Rectangle r = _WhiteSpaceRect;
+
+            if (IsSubPanel == true)
+                r.X -= HScrollOffset;
+
+            if (IsVFrozen == false)
+                r.Y -= VScrollOffset;
+
+            r.Inflate(-1, -1);
+
+            if (r.Width > 0 && r.Height > 0)
+            {
+                Graphics g = renderInfo.Graphics;
+
+                if (r.IntersectsWith(renderInfo.ClipRectangle) == true)
+                {
+                    GridPanelVisualStyle pstyle = GetEffectiveStyle();
+
+                    using (Brush br = pstyle.Background.GetBrush(r))
+                        g.FillRectangle(br, r);
+
+                    if (GridLines == GridLines.Vertical)
+                    {
+                        if (Rows.Count > 0 ||
+                            (VirtualMode == true && VirtualRowCount > 0))
+                        {
+                            using (Pen pen = new Pen(pstyle.HorizontalLineColor))
+                            {
+                                pen.DashStyle = (DashStyle)pstyle.HorizontalLinePattern;
+
+                                g.DrawLine(pen, r.X, r.Y, r.Right, r.Y);
+                                g.DrawLine(pen, r.X, r.Bottom, r.Right, r.Bottom);
+                            }
+                        }
+                    }
+
+                    if (VisibleRowCount == 0)
+                    {
+                        r.Inflate(-2, -2);
+
+                        if (r.Width > 0 && r.Height > 0)
+                        {
+                            if (String.IsNullOrEmpty(_NoRowsText) == false)
+                            {
+                                GridPanelVisualStyle style = GetEffectiveStyle();
+
+                                if (_NoRowsMarkup != null)
+                                {
+                                    RenderTextMarkup(g, style, r);
+                                }
+                                else
+                                {
+                                    eTextFormat tf = style.GetTextFormatFlags();
+
+                                    TextDrawing.DrawString(g,
+                                        _NoRowsText, style.Font, style.TextColor, r, tf);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        #region RenderTextMarkup
+
+        private void RenderTextMarkup(
+            Graphics g, GridPanelVisualStyle style, Rectangle r)
+        {
+            MarkupDrawContext d =
+                new MarkupDrawContext(g, style.Font, style.TextColor, false);
+
+            _NoRowsMarkup.Arrange(new Rectangle(Point.Empty, r.Size), d);
+
+            Size size = _NoRowsMarkup.Bounds.Size;
+
+            switch (style.Alignment)
+            {
+                case Alignment.NotSet:
+                case Alignment.MiddleLeft:
+                case Alignment.MiddleCenter:
+                case Alignment.MiddleRight:
+                    if (r.Height > size.Height)
+                        r.Y += (r.Height - size.Height) / 2;
+                    break;
+
+                case Alignment.BottomLeft:
+                case Alignment.BottomCenter:
+                case Alignment.BottomRight:
+                    if (r.Height > size.Height)
+                        r.Y = r.Bottom - size.Height;
+                    break;
+            }
+
+            _NoRowsMarkup.Bounds = new Rectangle(r.Location, size);
+
+            Region oldClip = g.Clip;
+
+            try
+            {
+                g.SetClip(r, CombineMode.Intersect);
+
+                _NoRowsMarkup.Render(d);
+            }
+            finally
+            {
+                g.Clip = oldClip;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderDesignerElement
+
+        private void RenderDesignerElement(
+            GridRenderInfo renderInfo, Rectangle r)
+        {
+            if (IsDesignerHosted == true)
+            {
+                if (SuperGrid.DesignerElement == this)
+                {
+                    r.X -= 2;
+                    r.Y -= 3;
+                    r.Height += 3;
+                    r.Width += 3;
+
+                    if (ShowDropShadow == true)
+                    {
+                        r.Width += 2;
+                        r.Height += 2;
+                    }
+
+                    if (r.Width > 0 && r.Height > 0)
+                    {
+                        using (Pen pen = new Pen(Color.Purple))
+                        {
+                            pen.DashStyle = DashStyle.Dash;
+
+                            renderInfo.Graphics.DrawRectangle(pen, r);
+
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region GetTreeButtonSize
+
+        internal Size GetTreeButtonSize()
+        {
+            Size size = (ExpandImage != null)
+                ? ExpandImage.Size : TreeButtonSize;
+
+            Size cSize = (CollapseImage != null)
+                ? CollapseImage.Size : TreeButtonSize;
+
+            size.Width = Math.Max(size.Width, cSize.Width);
+            size.Height = Math.Max(size.Height, cSize.Height);
+
+            return (Dpi.Size(size));
+        }
+
+        #region TreeButtonSize
+
+        private Size TreeButtonSize
+        {
+            get
+            {
+                switch (GetExpandButtonType())
+                {
+                    case ExpandButtonType.Circle:
+                        return (new Size(12, 12));
+
+                    case ExpandButtonType.Square:
+                        return (new Size(12, 12));
+
+                    case ExpandButtonType.Triangle:
+                        return (new Size(16, 16));
+                }
+
+                return (Size.Empty);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetExpandButton
+
+        internal Image GetExpandButton(Graphics g, bool hot)
+        {
+            if (_ExpandImage != null)
+                return (_ExpandImage);
+
+            if (hot == true)
+            {
+                if (_ExpandButtonHotImage == null)
+                {
+                    switch (GetExpandButtonType())
+                    {
+                        case ExpandButtonType.Circle:
+
+                            ExpandButtonHotImage = GetCircleExpandButton(g, true);
+                            break;
+
+                        case ExpandButtonType.Square:
+                            ExpandButtonHotImage = GetSquareExpandButton(g, true);
+                            break;
+
+                        case ExpandButtonType.Triangle:
+                            ExpandButtonHotImage = GetTriangleExpandButton(g, true);
+                            break;
+                    }
+                }
+
+                return (_ExpandButtonHotImage);
+            }
+
+            if (_ExpandButtonImage == null)
+            {
+                switch (GetExpandButtonType())
+                {
+                    case ExpandButtonType.Circle:
+                        ExpandButtonImage = GetCircleExpandButton(g, false);
+                        break;
+
+                    case ExpandButtonType.Square:
+                        ExpandButtonImage = GetSquareExpandButton(g, false);
+                        break;
+
+                    case ExpandButtonType.Triangle:
+                        ExpandButtonImage = GetTriangleExpandButton(g, false);
+                        break;
+                }
+            }
+
+            return (_ExpandButtonImage);
+
+        }
+
+        #endregion
+
+        #region GetCollapseButton
+
+        internal Image GetCollapseButton(Graphics g, bool hot)
+        {
+            if (_CollapseImage != null)
+                return (_CollapseImage);
+
+            if (hot == true)
+            {
+                if (_CollapseButtonHotImage == null)
+                {
+                    switch (GetExpandButtonType())
+                    {
+                        case ExpandButtonType.Circle:
+                            CollapseButtonHotImage = GetCircleCollapseButton(g, true);
+                            break;
+
+                        case ExpandButtonType.Square:
+                            CollapseButtonHotImage = GetSquareCollapseButton(g, true);
+                            break;
+
+                        case ExpandButtonType.Triangle:
+                            CollapseButtonHotImage = GetTriangleCollapseButton(g, true);
+                            break;
+                    }
+                }
+
+                return (_CollapseButtonHotImage);
+            }
+
+            if (_CollapseButtonImage == null)
+            {
+                switch (GetExpandButtonType())
+                {
+                    case ExpandButtonType.Circle:
+                        CollapseButtonImage = GetCircleCollapseButton(g, false);
+                        break;
+
+                    case ExpandButtonType.Square:
+                        CollapseButtonImage = GetSquareCollapseButton(g, false);
+                        break;
+
+                    case ExpandButtonType.Triangle:
+                        CollapseButtonImage = GetTriangleCollapseButton(g, false);
+                        break;
+                }
+            }
+
+            return (_CollapseButtonImage);
+
+        }
+
+        #endregion
+
+        #region Circle button support
+
+        #region GetCircleExpandButton
+
+        private Bitmap GetCircleExpandButton(Graphics g, bool hot)
+        {
+            Bitmap bmp = new Bitmap(Dpi.Width13, Dpi.Height13, g);
+            Rectangle r = new Rectangle(0, 0, Dpi.Width12, Dpi.Height12);
+
+            r.Inflate(-Dpi.Width2, -Dpi.Height2);
+
+            GridPanelVisualStyle style = GetEffectiveStyle();
+
+            Color borderColor = (hot == true)
+                ? style.CircleTreeButtonStyle.ExpandButton.HotBorderColor
+                : style.CircleTreeButtonStyle.ExpandButton.BorderColor;
+
+            Color lineColor = (hot == true)
+                ? style.CircleTreeButtonStyle.ExpandButton.HotLineColor
+                : style.CircleTreeButtonStyle.ExpandButton.LineColor;
+
+            Background background = (hot == true)
+                ? style.CircleTreeButtonStyle.ExpandButton.HotBackground
+                : style.CircleTreeButtonStyle.ExpandButton.Background;
+
+            using (Graphics gBmp = Graphics.FromImage(bmp))
+            {
+                gBmp.CompositingQuality = CompositingQuality.HighQuality;
+                gBmp.SmoothingMode = SmoothingMode.AntiAlias;
+
+                using (Pen pen = new Pen(lineColor))
+                {
+                    DrawCircleButtonBase(gBmp, pen, borderColor, background, r);
+
+                    int x = r.X + r.Width / 2;
+
+                    gBmp.DrawLine(pen, x, r.Y + Dpi.Height2,
+                        x, r.Bottom - Dpi.Height2);
+                }
+            }
+
+            return (bmp);
+        }
+
+        #endregion
+
+        #region GetCircleCollapseButton
+
+        private Bitmap GetCircleCollapseButton(Graphics g, bool hot)
+        {
+            Bitmap bmp = new Bitmap(Dpi.Width13, Dpi.Height13, g);
+            Rectangle r = new Rectangle(0, 0, Dpi.Width12, Dpi.Height12);
+
+            r.Inflate(-Dpi.Width2, -Dpi.Height2);
+
+            GridPanelVisualStyle style = GetEffectiveStyle();
+
+            Color borderColor = (hot == true)
+                ? style.CircleTreeButtonStyle.CollapseButton.HotBorderColor
+                : style.CircleTreeButtonStyle.CollapseButton.BorderColor;
+
+            Color lineColor = (hot == true)
+                ? style.CircleTreeButtonStyle.CollapseButton.HotLineColor
+                : style.CircleTreeButtonStyle.CollapseButton.LineColor;
+
+            Background background = (hot == true)
+                ? style.CircleTreeButtonStyle.CollapseButton.HotBackground
+                : style.CircleTreeButtonStyle.CollapseButton.Background;
+
+            using (Graphics gBmp = Graphics.FromImage(bmp))
+            {
+                gBmp.CompositingQuality = CompositingQuality.HighQuality;
+                gBmp.SmoothingMode = SmoothingMode.AntiAlias;
+
+                using (Pen pen = new Pen(lineColor))
+                    DrawCircleButtonBase(gBmp, pen, borderColor, background, r);
+            }
+
+            return (bmp);
+        }
+
+        #endregion
+
+        #region DrawCircleButtonBase
+
+        private void DrawCircleButtonBase(Graphics g,
+            Pen pen, Color borderColor, Background background, Rectangle r)
+        {
+            Rectangle t = r;
+            t.X++;
+            t.Y++;
+            t.Width--;
+            t.Height--;
+
+            using (Brush br = background.GetBrush(r))
+                g.FillRectangle(br, t);
+
+            using (Pen penBorder = new Pen(borderColor))
+                g.DrawEllipse(penBorder, r);
+
+            int y = r.Y + r.Height / 2;
+
+            g.DrawLine(pen, r.X + Dpi.Width2, y, r.Right - Dpi.Width2, y);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Square button support
+
+        #region GetSquareExpandButton
+
+        private Bitmap GetSquareExpandButton(Graphics g, bool hot)
+        {
+            Bitmap bmp = new Bitmap(Dpi.Width13, Dpi.Height13, g);
+            Rectangle r = new Rectangle(0, 0, Dpi.Width12, Dpi.Height12);
+
+            r.Inflate(-Dpi.Width2, -Dpi.Height2);
+
+            GridPanelVisualStyle style = GetEffectiveStyle();
+
+            Color borderColor = (hot == true)
+                ? style.SquareTreeButtonStyle.ExpandButton.HotBorderColor
+                : style.SquareTreeButtonStyle.ExpandButton.BorderColor;
+
+            Color lineColor = (hot == true)
+                ? style.SquareTreeButtonStyle.ExpandButton.HotLineColor
+                : style.SquareTreeButtonStyle.ExpandButton.LineColor;
+
+            Background background = (hot == true)
+                ? style.SquareTreeButtonStyle.ExpandButton.HotBackground
+                : style.SquareTreeButtonStyle.ExpandButton.Background;
+
+            using (Graphics gBmp = Graphics.FromImage(bmp))
+            {
+                int n = Math.Max(Dpi.Width1, Dpi.Height1);
+
+                using (Pen pen = new Pen(lineColor, n))
+                {
+                    DrawSquareButtonBase(gBmp, pen, borderColor, background, r);
+
+                    int x = r.X + r.Width / 2;
+
+                    gBmp.DrawLine(pen,
+                        x, r.Y + Dpi.Height2, x, r.Bottom - Dpi.Height2 - 1);
+                }
+            }
+
+            return (bmp);
+        }
+
+        #endregion
+
+        #region GetSquareCollapseButton
+
+        private Bitmap GetSquareCollapseButton(Graphics g, bool hot)
+        {
+            Bitmap bmp = new Bitmap(Dpi.Width13, Dpi.Height13, g);
+            Rectangle r = new Rectangle(0, 0, Dpi.Width12, Dpi.Height12);
+
+            r.Inflate(-Dpi.Width2, -Dpi.Height2);
+
+            GridPanelVisualStyle style = GetEffectiveStyle();
+
+            Color borderColor = (hot == true)
+                ? style.SquareTreeButtonStyle.CollapseButton.HotBorderColor
+                : style.SquareTreeButtonStyle.CollapseButton.BorderColor;
+
+            Color lineColor = (hot == true)
+                ? style.SquareTreeButtonStyle.CollapseButton.HotLineColor
+                : style.SquareTreeButtonStyle.CollapseButton.LineColor;
+
+            Background background = (hot == true)
+                ? style.SquareTreeButtonStyle.CollapseButton.HotBackground
+                : style.SquareTreeButtonStyle.CollapseButton.Background;
+
+            using (Graphics gBmp = Graphics.FromImage(bmp))
+            {
+                int n = Math.Max(Dpi.Width1, Dpi.Height1);
+
+                using (Pen pen = new Pen(lineColor, n))
+                    DrawSquareButtonBase(gBmp, pen, borderColor, background, r);
+            }
+
+            return (bmp);
+        }
+
+        #endregion
+
+        #region DrawSquareButtonBase
+
+        private void DrawSquareButtonBase(Graphics g,
+            Pen pen, Color borderColor, Background background, Rectangle r)
+        {
+            Rectangle t = r;
+            t.X++;
+            t.Y++;
+            t.Width--;
+            t.Height--;
+
+            using (Brush br = background.GetBrush(r))
+                g.FillRectangle(br, t);
+
+            int n = Math.Max(Dpi.Width1, Dpi.Height1);
+
+            Color foo = Color.FromArgb(140, borderColor);
+
+            using (Pen cpen = new Pen(foo, n))
+                g.DrawRectangle(cpen, r);
+
+            using (Pen borderPen = new Pen(borderColor, n))
+            {
+                g.DrawLine(borderPen, r.X + n, r.Y, r.Right - n, r.Y);
+                g.DrawLine(borderPen, r.Right, r.Y + n, r.Right, r.Bottom - n);
+                g.DrawLine(borderPen, r.X + n, r.Bottom, r.Right - n, r.Bottom);
+                g.DrawLine(borderPen, r.X, r.Y + n, r.X, r.Bottom - n);
+            }
+
+            int y = r.Y + r.Height / 2;
+
+            g.DrawLine(pen, r.X + Dpi.Width2, y, r.Right - Dpi.Width2, y);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Triangle button support
+
+        #region GetTriangleExpandButton
+
+        private Image GetTriangleExpandButton(Graphics g, bool hot)
+        {
+            Bitmap bmp = new Bitmap(Dpi.Width11, Dpi.Height15, g);
+            Rectangle r = new Rectangle(0, 0, Dpi.Width11, Dpi.Height15);
+
+            GridPanelVisualStyle style = GetEffectiveStyle();
+
+            Color borderColor = (hot == true)
+                ? style.TriangleTreeButtonStyle.ExpandButton.HotBorderColor
+                : style.TriangleTreeButtonStyle.ExpandButton.BorderColor;
+
+            Background background = (hot == true)
+                ? style.TriangleTreeButtonStyle.ExpandButton.HotBackground
+                : style.TriangleTreeButtonStyle.ExpandButton.Background;
+
+            using (Graphics gBmp = Graphics.FromImage(bmp))
+            {
+                gBmp.CompositingQuality = CompositingQuality.HighQuality;
+                gBmp.SmoothingMode = SmoothingMode.AntiAlias;
+
+                using (GraphicsPath path = new GraphicsPath())
+                {
+                    path.AddLines(new Point[]
+                    {
+                        new Point(Dpi.Width3, Dpi.Height3),
+                        new Point(Dpi.Width7, Dpi.Height7),
+                        new Point(Dpi.Width3, Dpi.Height11),
+                    });
+
+                    path.CloseAllFigures();
+
+                    using (Brush br = background.GetBrush(r))
+                        gBmp.FillPath(br, path);
+
+                    using (Pen pen = new Pen(borderColor))
+                    {
+                        gBmp.DrawPath(pen, path);
+                        gBmp.DrawPath(pen, path);
+                    }
+                }
+            }
+
+            return (bmp);
+        }
+
+        #endregion
+
+        #region GetTriangleCollapseButton
+
+        private Bitmap GetTriangleCollapseButton(Graphics g, bool hot)
+        {
+            Bitmap bmp = new Bitmap(Dpi.Width12, Dpi.Height12, g);
+            Rectangle r = new Rectangle(0, 0, Dpi.Width12, Dpi.Height12);
+
+            GridPanelVisualStyle style = GetEffectiveStyle();
+
+            Color borderColor = (hot == true)
+                ? style.TriangleTreeButtonStyle.CollapseButton.HotBorderColor
+                : style.TriangleTreeButtonStyle.CollapseButton.BorderColor;
+
+            Background background = (hot == true)
+                ? style.TriangleTreeButtonStyle.CollapseButton.HotBackground
+                : style.TriangleTreeButtonStyle.CollapseButton.Background;
+
+            using (Graphics gBmp = Graphics.FromImage(bmp))
+            {
+                gBmp.CompositingQuality = CompositingQuality.HighQuality;
+                gBmp.SmoothingMode = SmoothingMode.AntiAlias;
+
+                using (GraphicsPath path = new GraphicsPath())
+                {
+                    path.AddLines(new Point[]
+                    {
+                        new Point(Dpi.Width8, Dpi.Height3),
+                        new Point(Dpi.Width8, Dpi.Height8),
+                        new Point(Dpi.Width3, Dpi.Height8),
+                   });
+
+                    path.CloseAllFigures();
+
+                    using (Brush br = background.GetBrush(r))
+                        gBmp.FillPath(br, path);
+
+                    using (Pen pen = new Pen(borderColor))
+                    {
+                        gBmp.DrawPath(pen, path);
+                        gBmp.DrawPath(pen, path);
+                    }
+                }
+            }
+
+            return (bmp);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region Mouse handling
+
+        #region InternalMouseEnter
+
+        internal override void InternalMouseEnter(EventArgs e)
+        {
+            base.InternalMouseEnter(e);
+
+            StyleState rowState = GetRowState(this);
+            RowVisualStyle style = GetEffectiveRowStyle(this, rowState);
+
+            rowState &= ~StyleState.MouseOver;
+
+            if (GetEffectiveRowStyle(this, rowState).Background != style.Background)
+                RefreshContainer();
+        }
+
+        #endregion
+
+        #region InternalMouseLeave
+
+        internal override void InternalMouseLeave(EventArgs e)
+        {
+            HotItem = null;
+
+            base.InternalMouseLeave(e);
+
+            StyleState rowState = GetRowState(this);
+            RowVisualStyle style = GetEffectiveRowStyle(this, rowState);
+
+            rowState |= StyleState.MouseOver;
+
+            if (GetEffectiveRowStyle(this, rowState).Background != style.Background)
+                RefreshContainer();
+        }
+
+        #endregion
+
+        #region InternalMouseMove
+
+        /// <summary>
+        /// InternalMouseMove
+        /// </summary>
+        /// <param name="e"></param>
+        internal override void InternalMouseMove(MouseEventArgs e)
+        {
+            if (_WhiteSpaceRect.Contains(e.Location) == true)
+            {
+                SuperGrid.GridCursor = Cursors.Default;
+
+                if (_NoRowsMarkup != null)
+                    _NoRowsMarkup.MouseMove(SuperGrid, e);
+            }
+
+            base.InternalMouseMove(e);
+        }
+
+        #endregion
+
+        #region InternalMouseDown
+
+        private bool _DownInWhitespace;
+
+        internal override void InternalMouseDown(MouseEventArgs e)
+        {
+            if (_WhitespaceClickBehavior == WhitespaceClickBehavior.ClearSelection)
+            {
+                _DownInWhitespace = _WhiteSpaceRect.Contains(e.Location);
+
+                if (_DownInWhitespace == true)
+                {
+                    GridCell ecell = SuperGrid.EditorCell;
+
+                    if ((ecell == null) || ecell.EndEdit())
+                        ClearAll();
+                }
+            }
+
+            base.InternalMouseDown(e);
+        }
+
+        #endregion
+
+        #region InternalMouseUp
+
+        internal override void InternalMouseUp(MouseEventArgs e)
+        {
+            if (_WhiteSpaceRect.Contains(e.Location) == true)
+            {
+                if (_DownInWhitespace == true)
+                {
+                    if (_NoRowsMarkup != null)
+                        _NoRowsMarkup.Click(SuperGrid);
+                }
+            }
+
+            base.InternalMouseUp(e);
+        }
+
+        #endregion
+
+        #region RefreshContainer
+
+        private void RefreshContainer()
+        {
+            if (Parent != null)
+            {
+                Rectangle r = ContainerBounds;
+
+                if (IsSubPanel == true)
+                    r.X -= HScrollOffset;
+
+                if (IsVFrozen == false)
+                    r.Y -= VScrollOffset;
+
+                Parent.InvalidateRender(r);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetElementAt
+
+        /// <summary>
+        /// Gets the current panel element at the given location.
+        /// </summary>
+        /// <param name="e"></param>
+        /// <returns></returns>
+        public override GridElement GetElementAt(MouseEventArgs e)
+        {
+            return (GetElementAt(e.X, e.Y));
+        }
+
+        /// <summary>
+        /// Gets the current panel element at the given location.
+        /// </summary>
+        /// <param name="x"></param>
+        /// <param name="y"></param>
+        /// <returns></returns>
+        public override GridElement GetElementAt(int x, int y)
+        {
+            if (SubElementAt(_ColumnHeader, x, y) == true)
+                return (_ColumnHeader);
+
+            if (SubElementAt(_Caption, x, y) == true)
+                return (_Caption);
+
+            if (SubElementAt(_GroupByRow, x, y) == true)
+                return (_GroupByRow);
+
+            if (SubElementAt(_Title, x, y) == true)
+                return (_Title);
+
+            if (SubElementAt(_Header, x, y) == true)
+                return (_Header);
+
+            if (SubElementAt(_Filter, x, y) == true)
+                return (_Filter);
+
+            if (_Footer != null && _Footer.Visible == true)
+            {
+                Rectangle r = _Footer.BoundsRelative;
+                r.X -= HScrollOffset;
+
+                if (r.Contains(x, y) == true)
+                    return (_Footer);
+            }
+
+            if (VirtualMode == true)
+                return (GetVirtualElementAt(x, y));
+
+            return (base.GetElementAt(x, y));
+        }
+
+        #region SubElementAt
+
+        private bool SubElementAt(GridElement item, int x, int y)
+        {
+            if (item != null && item.Visible == true)
+            {
+                Rectangle r = item.BoundsRelative;
+                r.X -= HScrollOffset;
+
+                if (IsVFrozen == false)
+                    r.Y -= VScrollOffset;
+
+                return (r.Contains(x, y));
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetVirtualElementAt
+
+        private GridElement GetVirtualElementAt(int x, int y)
+        {
+            GridPanel panel = GridPanel;
+            if (panel != null && panel.IsSubPanel == false)
+            {
+                if (panel.FrozenRowCount > 0)
+                {
+                    int n = Math.Min(panel.FrozenRowCount, VirtualRowCountEx);
+
+                    for (int i = 0; i < n; i++)
+                    {
+                        GridElement item = VirtualRows[i];
+
+                        if (item != null)
+                        {
+                            Rectangle bounds = item.BoundsRelative;
+                            bounds.X -= HScrollOffset;
+
+                            if (bounds.Height <= 0 ||
+                                bounds.Y > item.SuperGrid.ClientRectangle.Bottom)
+                                break;
+
+                            if (bounds.Contains(x, y))
+                                return (item);
+                        }
+                    }
+                }
+            }
+
+            for (int i = FirstOnScreenRowIndex; i < VirtualRowCountEx; i++)
+            {
+                GridElement item = VirtualRows[i];
+
+                if (item != null)
+                {
+                    Rectangle bounds = item.BoundsRelative;
+                    bounds.X -= HScrollOffset;
+
+                    if (item.IsVFrozen == false)
+                        bounds.Y -= VScrollOffset;
+
+                    if (bounds.Height <= 0 ||
+                        bounds.Y > item.SuperGrid.ClientRectangle.Bottom)
+                        break;
+
+                    if (bounds.Contains(x, y))
+                        return (item);
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetColumnAt
+
+        ///<summary>
+        /// Gets the GridColumn containing the specified location.
+        ///</summary>
+        ///<param name="pt">Point to test</param>
+        ///<returns>Column or null</returns>
+        public GridColumn GetColumnAt(Point pt)
+        {
+            Rectangle t = SuperGrid.SViewRect;
+
+            foreach (GridColumn column in _Columns)
+            {
+                Rectangle r = column.BoundsRelative;
+
+                if (IsSubPanel == true || column.IsHFrozen == false)
+                    r.X -= HScrollOffset;
+
+                r.Y -= VScrollOffset;
+
+                r.Intersect(t);
+
+                if (r.Contains(pt) == true)
+                    return (column);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetNewGridIndex
+
+        internal int GetNewGridIndex(GridContainer item)
+        {
+            int gridIndex = _NewGridIndex++;
+
+            if (gridIndex >= _GridIndexArray.Length)
+            {
+                int n = _GridIndexArray.Length;
+                n = Math.Min(n * 2, n + 2048);
+
+                GridContainer[] array = new GridContainer[n];
+
+                _GridIndexArray.CopyTo(array, 0);
+                _GridIndexArray = array;
+            }
+
+            _GridIndexArray[gridIndex] = item;
+
+            return (gridIndex);
+        }
+
+        #endregion
+
+        #region TruncateGridIndexArray
+
+        internal void TruncateGridIndexArray()
+        {
+            if (_GridIndexArray != null)
+            {
+                for (int i = _NewGridIndex; i < _GridIndexArray.Length; i++)
+                    _GridIndexArray[i] = null;
+            }
+        }
+
+        #endregion
+
+        #region InvalidateRender
+
+        /// <summary>
+        /// Invalidates the display state of the panel.
+        /// </summary>
+        public override void InvalidateRender()
+        {
+            if (ShowDropShadow == true && IsSubPanel == true)
+            {
+                Rectangle r = BoundsRelative;
+
+                r.X -= HScrollOffset;
+
+                if (IsVFrozen == false)
+                    r.Y -= VScrollOffset;
+
+                r.Width += 3;
+                r.Height += 3;
+
+                InvalidateRender(r);
+            }
+            else
+            {
+                base.InvalidateRender();
+            }
+        }
+
+        #endregion
+
+        #region SetActiveRow
+
+        ///<summary>
+        /// Sets the current Active Row
+        ///</summary>
+        ///<param name="row">Row to make active.</param>
+        ///<returns>true is successful</returns>
+        public bool SetActiveRow(GridContainer row)
+        {
+            if (row != null)
+            {
+                if (row.GridPanel != this)
+                    throw new Exception("GridPanel does not contain the given row!");
+            }
+
+            return (SetActiveRow(row, true));
+        }
+
+        internal bool SetActiveRow(GridContainer ncont, bool activate)
+        {
+            if (SuperGrid == null)
+                return (false);
+
+            GridContainer ocont = SuperGrid.ActiveRow;
+
+            if (ocont != ncont || _LastProcessedItem != ncont)
+            {
+                if (DeactivateEdit() == false)
+                    return (false);
+
+                if (ncont is GridPanel == false)
+                {
+                    if (ocont != ncont)
+                    {
+                        if (DeactivateRow(ocont, ncont) == false)
+                            return (false);
+                    }
+
+                    if (ActivateRow(ocont, ncont, activate) == false)
+                        return (false);
+                }
+            }
+
+            if (ocont != ncont && ncont != null)
+                LastProcessedItem = ncont;
+
+            return (true);
+        }
+
+        #region DeactivateEdit
+
+        internal bool DeactivateEdit()
+        {
+            GridCell ecell = SuperGrid.EditorCell;
+
+            if (ecell != null)
+            {
+                if (ecell.EndEdit() == false)
+                    return (false);
+            }
+
+            return (true);
+        }
+
+        #endregion
+
+        #region DeactivateRow
+
+        private bool DeactivateRow(GridContainer ocont, GridContainer ncont)
+        {
+            GridRow orow = ocont as GridRow;
+
+            if (orow != null)
+            {
+                if (orow.RowNeedsStored == true || orow.RowCheckChanged == true)
+                {
+                    if (SuperGrid.DoRowValidatingEvent(orow) == true)
+                    {
+                        if (ncont is GridRow || ncont == null)
+                        {
+                            if (SuperGrid.DoPlayingSoundEvent(GridPanel, orow, PlaySoundContext.RowValidate) == false)
+                                SystemSounds.Beep.Play();
+                        }
+
+                        return (false);
+                    }
+
+                    orow.RowCheckChanged = false;
+
+                    if (orow.RowNeedsStored == true)
+                    {
+                        if (EnableFiltering == true && FilterLevel != FilterLevel.None)
+                        {
+                            bool rowFiltered = DataFilter.IsRowFiltered(this);
+                            bool colFiltered = DataFilter.IsColumnFiltered(this);
+
+                            if (rowFiltered == true || colFiltered == true)
+                                NeedToUpdateDataFilter = true;
+                        }
+                    }
+
+                    SuperGrid.DoRowValidatedEvent(orow);
+
+                    orow.EditorDirty = false;
+
+                    if (orow.IsTempInsertRow == true && orow.IsInsertRow == false)
+                    {
+                        orow.IsTempInsertRow = false;
+
+                        if (orow.GridPanel.InsertNewRow(orow, orow.RowIndex) == false)
+                            return (false);
+
+                        orow.RowNeedsStored = true;
+                        orow.RowNeedsSorted = true;
+
+                        if (VirtualMode == true)
+                        {
+                            VirtualTempInsertRow = null;
+                            VirtualRows.MaxRowIndex = orow.RowIndex;
+                        }
+
+                        InvalidateMerge();
+                    }
+
+                    orow.IsTempInsertRow = false;
+
+                    if (orow.RowNeedsStored == true)
+                        orow.FlushRow();
+
+                    if (orow.RowNeedsSorted == true)
+                    {
+                        orow.RowNeedsSorted = false;
+
+                        if (VirtualMode == false)
+                            UpdateRowPosition(orow);
+                        else
+                        {
+                            VirtualRows.Clear();
+
+                            InvalidateMerge();
+                        }
+                    }
+
+                    if (orow.RowNeedsGrouped == true)
+                    {
+                        orow.RowNeedsGrouped = false;
+
+                        if (VirtualMode == false)
+                        {
+                            NeedsGrouped = true;
+
+                            if (ncont != null)
+                            {
+                                LatentActiveRowIndex = ncont.RowIndex;
+                                LatentActiveContainer = (GridContainer)ncont.Parent;
+                            }
+
+                            InvalidateMerge();
+                        }
+                    }
+                }
+
+                if (orow.IsInsertRow == true)
+                    SuperGrid.DoRowSetDefaultValuesEvent(this, orow, NewRowContext.RowDeactivate);
+            }
+
+            return (true);
+        }
+
+        #endregion
+
+        #region ActivateRow
+
+        private bool ActivateRow(
+            GridContainer ocont, GridContainer ncont, bool activate)
+        {
+            if (ncont != null)
+            {
+                GridRow nrow = ncont as GridRow;
+
+                if (nrow != null)
+                {
+                    ActiveRow = ncont;
+
+                    if (DataBinder.SetPosition(nrow) == false)
+                    {
+                        if (ocont is GridRow)
+                            ((GridRow)ocont).RowDirty = PreActiveRowDirty;
+
+                        ActiveRow = ocont;
+
+                        return (false);
+                    }
+
+                    PreActiveRowDirty = nrow.RowDirty;
+                }
+
+                ActiveRow = ncont;
+
+                if (activate == true || SuperGrid.ActiveRow != ncont)
+                {
+                    SuperGrid.ActiveRow = ncont;
+                    SuperGrid.ActiveElement = ncont;
+
+                    if (nrow != null && nrow.IsInsertRow == true)
+                    {
+                        for (int i = nrow.Cells.Count; i < _Columns.Count; i++)
+                            nrow.Cells.Add(new GridCell(_Columns[i].DefaultNewRowCellValue));
+
+                        SuperGrid.DoRowSetDefaultValuesEvent(this, nrow, NewRowContext.RowActivate);
+                    }
+                }
+            }
+            else
+            {
+                if (activate == true)
+                {
+                    ActiveRow = ncont;
+                    SuperGrid.ActiveRow = ncont;
+                }
+            }
+
+            return (true);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region FlushActiveRow
+
+        ///<summary>
+        ///Should be called when bound rows have been inserted, to make sure
+        ///they have been flushed to the data source prior to issuing an Update
+        ///</summary>
+        ///<returns>true if successful</returns>
+        public bool FlushActiveRow()
+        {
+            if (ActiveRow != null)
+            {
+                if (DeactivateEdit() == true)
+                    return (DeactivateRow(ActiveRow, null));
+            }
+
+            return (true);
+        }
+
+        #endregion
+
+        #region SetActiveCell
+
+        ///<summary>
+        /// Sets the given cell as Active
+        ///</summary>
+        ///<param name="cell">Cell to make active</param>
+        ///<returns>true - if successful</returns>
+        public bool SetActiveCell(GridCell cell)
+        {
+            if (cell != null)
+            {
+                if (cell.GridPanel != this)
+                    throw new Exception("GridPanel does not contain the given cell!");
+
+                return (SuperGrid.KeySelectCell(this, cell, false, false));
+            }
+
+            GridCell ecell = SuperGrid.EditorCell;
+
+            if (ecell != null)
+            {
+                if (ecell.EndEdit() == false)
+                    return (false);
+            }
+
+            if (SelectionGranularity != SelectionGranularity.Row)
+            {
+                if (SuperGrid.DoCellActivatingEvent(this, SuperGrid.ActiveCell, null) == true)
+                    return (false);
+
+                SuperGrid.ActiveCell = null;
+
+                if (SelectionGranularity == SelectionGranularity.Cell)
+                    SuperGrid.ActiveElement = null;
+
+                LastProcessedItem = null;
+            }
+
+            return (true);
+        }
+
+        #endregion
+
+        #region ActivateFilterPopup
+
+        ///<summary>
+        ///Activates the given column's FilterPopup
+        ///</summary>
+        ///<param name="column"></param>
+        public void ActivateFilterPopup(GridColumn column)
+        {
+            if (column != null)
+                column.ActivateFilterPopup();
+        }
+
+        #endregion
+
+        #region DeactivateFilterPopup
+
+        ///<summary>
+        ///Deactivates the the current FilterPopup
+        ///</summary>
+        public void DeactivateFilterPopup()
+        {
+            PopupControl pc = SuperGrid.PopupControl;
+
+            if (pc != null)
+                pc.Hide();
+        }
+
+        #endregion
+
+        #region ClearDirtyRowMarkers
+
+        ///<summary>
+        /// Clears all dirty row markers.
+        ///</summary>
+        public void ClearDirtyRowMarkers()
+        {
+            if (VirtualMode == true)
+            {
+                VirtualRows.Clear();
+
+                InvalidateRender();
+            }
+            else
+            {
+                ClearDirtyRowMarkersEx(Rows);
+            }
+        }
+
+        #region ClearDirtyRowMarkersEx
+
+        private void ClearDirtyRowMarkersEx(GridItemsCollection items)
+        {
+            if (items != null && items.Count > 0)
+            {
+                foreach (GridContainer item in items)
+                {
+                    GridRow row = item as GridRow;
+
+                    if (row != null)
+                        row.RowDirty = false;
+
+                    ClearDirtyRowMarkersEx(item.Rows);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Sort support
+
+        #region AddSort
+
+        #region AddSort(col)
+
+        ///<summary>
+        /// This routine is used to add a single column to the
+        /// list of columns used to sort grid data rows.
+        ///</summary>
+        public void AddSort(GridColumn column)
+        {
+            AddSort(column, SortDirection.Ascending);
+        }
+
+        #endregion
+
+        #region AddSort(col, dir)
+
+        ///<summary>
+        /// This routine is used to add a single column, and
+        /// its associated sorting direction, to the list of
+        /// columns used to sort grid data rows.
+        ///</summary>
+        public void AddSort(GridColumn column, SortDirection sortDirection)
+        {
+            column.SortDirection = sortDirection;
+
+            AddSortToList(column);
+        }
+
+        #endregion
+
+        #region AddSort(col[])
+
+        ///<summary>
+        /// This routine is used to add an array of column to the
+        /// list of columns used to sort grid data rows.
+        ///</summary>
+        public void AddSort(GridColumn[] columns)
+        {
+            AddSort(columns, SortDirection.Ascending);
+        }
+
+        #endregion
+
+        #region AddSort(col[], dir)
+
+        ///<summary>
+        /// This routine is used to add an array of columns and
+        /// a specified sort direction to the list of columns
+        /// used to sort grid data rows.
+        ///</summary>
+        public void AddSort(GridColumn[] columns, SortDirection sortDirection)
+        {
+            try
+            {
+                InRangeAdd = true;
+
+                foreach (GridColumn column in columns)
+                    AddSort(column, sortDirection);
+            }
+            finally
+            {
+                InRangeAdd = false;
+            }
+
+            InvalidateMerge();
+        }
+
+        #endregion
+
+        #region AddSort(col[], dir[])
+
+        ///<summary>
+        /// This routine is used to add an array of columns, and
+        /// their respective sort directions, to the list of columns
+        /// used to sort grid data rows.
+        ///</summary>
+        public void AddSort(
+            GridColumn[] columns, SortDirection[] sortDirection)
+        {
+            try
+            {
+                InRangeAdd = true;
+
+                for (int i = 0; i < columns.Length; i++)
+                    AddSort(columns[i], sortDirection[i]);
+            }
+            finally
+            {
+                InRangeAdd = false;
+            }
+
+            InvalidateMerge();
+        }
+
+        #endregion
+
+        #region AddSortToList
+
+        private void AddSortToList(GridColumn column)
+        {
+            NeedsSorted = true;
+
+            if (column.SortDirection != SortDirection.None)
+            {
+                if (_SortColumns.Contains(column) == false)
+                    _SortColumns.Add(column);
+            }
+            else
+            {
+                if (_SortColumns.Contains(column) == true)
+                    _SortColumns.Remove(column);
+            }
+
+            if (InRangeAdd == false)
+                InvalidateLayout();
+        }
+
+        #endregion
+
+        #endregion
+
+        #region SetSort
+
+        #region SetSort()
+
+        ///<summary>
+        /// Sets the current list of sorting columns to empty.
+        ///</summary>
+        public void SetSort()
+        {
+            if (IsCurrentSort(null, SortDirection.Ascending) == false)
+                ClearSort();
+        }
+
+        #endregion
+
+        #region SetSort(col)
+
+        ///<summary>
+        /// Sets a single column to use for sorting the grid data.
+        ///</summary>
+        public void SetSort(GridColumn column)
+        {
+            if (IsCurrentSort(column, SortDirection.Ascending) == false)
+            {
+                ClearSort(false);
+
+                AddSort(column);
+            }
+        }
+
+        #endregion
+
+        #region SetSort(col, dir)
+
+        ///<summary>
+        /// Sets a single column, and its associated sort
+        /// direction (ascending or descending) to use for sorting the grid data.
+        ///</summary>
+        public void SetSort(GridColumn column, SortDirection sortDirection)
+        {
+            if (IsCurrentSort(column, sortDirection) == false)
+            {
+                ClearSort(false);
+
+                AddSort(column, sortDirection);
+            }
+        }
+
+        #endregion
+
+        #region IsCurrentSort
+
+        private bool IsCurrentSort(GridColumn column, SortDirection sortDirection)
+        {
+            if (column == null)
+                return (_SortColumns.Count == 0);
+
+            if (_SortColumns.Count == 1 && _SortColumns.Contains(column) == true)
+                return (column.SortDirection == sortDirection);
+
+            return (false);
+        }
+
+        #endregion
+
+        #region SetSort(col[])
+
+        ///<summary>
+        /// Sets an array of columns to use for sorting the grid data.
+        ///</summary>
+        public void SetSort(GridColumn[] columns)
+        {
+            ClearSort(false);
+
+            AddSort(columns);
+        }
+
+        #endregion
+
+        #region SetSort(col[], dir)
+
+        ///<summary>
+        /// Sets an array of columns, and an associated sort
+        /// direction (ascending or descending) to use for sorting the grid data.
+        ///</summary>
+        public void SetSort(GridColumn[] columns, SortDirection sortDirection)
+        {
+            ClearSort(false);
+
+            AddSort(columns, sortDirection);
+        }
+
+        #endregion
+
+        #region SetSort(col[], dir[])
+
+        ///<summary>
+        /// Sets an array of columns, and their respective sort
+        /// direction (ascending or descending) to use for sorting the grid data.
+        ///</summary>
+        public void SetSort(GridColumn[] columns, SortDirection[] sortDirection)
+        {
+            ClearSort(false);
+
+            AddSort(columns, sortDirection);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ClearSort
+
+        ///<summary>
+        /// Clears the currently set column sorting list.
+        ///</summary>
+        public void ClearSort()
+        {
+            ClearSort(true);
+        }
+
+        internal void ClearSort(bool doSort)
+        {
+            GridColumnCollection columns = _Columns;
+
+            foreach (GridColumn column in columns)
+                column.SortDirection = SortDirection.None;
+
+            _SortColumns.Clear();
+
+            InvalidateRender();
+
+            if (doSort == true)
+                InvalidateMerge();
+        }
+
+        #endregion
+
+        #region SortItems
+
+        internal bool SortItems()
+        {
+            bool changed = false;
+
+            NeedsSorted = false;
+
+            if (_SortColumns != null && _SortColumns.Count > 0 && Rows.Count > 0)
+            {
+                if (SuperGrid.DoRowsSortingEvent(this) == false)
+                {
+                    try
+                    {
+                        IsSorting = true;
+
+                        changed = SortItems(this, _SortLevel);
+
+                    }
+                    finally
+                    {
+                        IsSorting = false;
+                    }
+
+                    if (changed == true)
+                    {
+                        NeedToUpdateIndicees = true;
+
+                        if (UseAlternateRowStyle == true)
+                            SuperGrid.UpdateStyleCount();
+
+                        SuperGrid.DoRowsSortedEvent(this);
+
+                        NeedsSorted = false;
+                    }
+                }
+            }
+
+            return (changed);
+        }
+
+        internal bool SortItems(GridContainer container, SortLevel sortLevel)
+        {
+            bool changed = false;
+
+            GridItemsCollection items = container.Rows;
+
+            bool isGroup = (items[0] is GridGroup);
+
+            if (items.Count > 0)
+            {
+                if (isGroup == true ||
+                    (sortLevel & SortLevel.Expanded) == SortLevel.Expanded)
+                {
+                    for (int i = 0; i < items.Count; i++)
+                    {
+                        if (items[i] is GridRow || items[i] is GridGroup)
+                        {
+                            GridContainer row = items[i] as GridContainer;
+
+                            if (row != null && row.Rows.Count > 0)
+                                changed |= SortItems(row, (isGroup ? sortLevel : sortLevel | SortLevel.Root));
+                        }
+                    }
+                }
+
+                if (isGroup == false)
+                {
+                    if ((sortLevel & SortLevel.Root) == SortLevel.Root)
+                    {
+                        int n = GetGroupSortCount(items);
+
+                        if (ShowInsertRow == true)
+                            n--;
+
+                        if (n > 1)
+                        {
+                            GridElement[] array = new GridElement[n];
+
+                            for (int i = 0; i < n; i++)
+                                array[i] = items[i];
+
+                            Array.Sort(array, 0, n, new RowComparer(_SortColumns));
+
+                            for (int i = 0; i < n; i++)
+                                items[i] = array[i];
+
+                            changed = true;
+                        }
+                    }
+                }
+            }
+
+            container.InvalidateMerge();
+
+            return (changed);
+        }
+
+        #region RowComparer
+
+        private class RowComparer : IComparer<GridElement>
+        {
+            private List<GridColumn> _SortColumns;
+
+            public RowComparer(List<GridColumn> sortColumns)
+            {
+                _SortColumns = sortColumns;
+            }
+
+            public int Compare(GridElement x, GridElement y)
+            {
+                GridRow rowx = x as GridRow;
+                GridRow rowy = y as GridRow;
+
+                if (rowx == null || rowy == null)
+                {
+                    if (x is GridTextRow && y is GridTextRow)
+                        return ((GridTextRow)x).Text.CompareTo(((GridTextRow)y).Text);
+
+                    if (x is GridTextRow || x is GridGroup)
+                        return (1);
+
+                    return (0);
+                }
+
+                foreach (GridColumn column in _SortColumns)
+                {
+                    int index = column.ColumnIndex;
+
+                    int sval;
+
+                    if (index >= rowx.Cells.Count)
+                        sval = (index >= rowy.Cells.Count ? 0 : -1);
+
+                    else if (index >= rowy.Cells.Count)
+                        sval = 1;
+
+                    else
+                        sval = rowx.Cells[index].CompareTo(rowy.Cells[index]);
+
+                    if (sval != 0)
+                    {
+                        return (column.SortDirection ==
+                                SortDirection.Ascending) ? sval : -sval;
+                    }
+                }
+
+                return (0);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ToggleMultiColumnSort
+
+        ///<summary>
+        /// This routine toggles the current sort direction for the current
+        /// list of sort columns. 
+        ///</summary>
+        public void ToggleMultiColumnSort()
+        {
+            if (_SortColumns.Count > 0)
+            {
+                foreach (GridColumn column in _SortColumns)
+                {
+                    SortDirection sortDirection;
+
+                    switch (column.SortDirection)
+                    {
+                        case SortDirection.None:
+                        case SortDirection.Descending:
+                            sortDirection = SortDirection.Ascending;
+                            break;
+
+                        default:
+                            sortDirection = SortDirection.Descending;
+                            break;
+                    }
+
+                    AddSort(column, sortDirection);
+                }
+
+                SuperGrid.DoSortChangedEvent(this);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Group support
+
+        #region AddGroup
+
+        #region AddGroup(col)
+
+        ///<summary>
+        /// This routine is used to add a single column to the
+        /// list of columns used to group grid data rows together.
+        ///</summary>
+        public void AddGroup(GridColumn column)
+        {
+            AddGroup(column, SortDirection.Ascending);
+        }
+
+        #endregion
+
+        #region AddGroup(col, dir)
+
+        ///<summary>
+        /// This routine is used to add a single column, and
+        /// its associated sorting direction, to the list of
+        /// columns used to group grid data rows together.
+        ///</summary>
+        public void AddGroup(GridColumn column, SortDirection groupDirection)
+        {
+            column.GroupDirection = groupDirection;
+
+            AddGroupToList(column);
+        }
+
+        #endregion
+
+        #region AddGroup(col[])
+
+        ///<summary>
+        /// This routine is used to add an array of column to the
+        /// list of columns used to group grid data rows together.
+        ///</summary>
+        public void AddGroup(GridColumn[] columns)
+        {
+            AddGroup(columns, SortDirection.Ascending);
+        }
+
+        #endregion
+
+        #region AddGroup(col[], dir)
+
+        ///<summary>
+        /// This routine is used to add an array of columns and
+        /// a specified sort direction to the list of columns
+        /// used to group grid data rows together.
+        ///</summary>
+        public void AddGroup(
+            GridColumn[] columns, SortDirection groupDirection)
+        {
+            try
+            {
+                InRangeAdd = true;
+
+                foreach (GridColumn column in columns)
+                    AddGroup(column, groupDirection);
+            }
+            finally
+            {
+                InRangeAdd = false;
+            }
+
+            InvalidateMerge();
+        }
+
+        #endregion
+
+        #region AddGroup(col[], dir[])
+
+        ///<summary>
+        /// This routine is used to add an array of columns, and
+        /// their respective sort directions, to the list of columns
+        /// used to group grid data rows together.
+        ///</summary>
+        public void AddGroup(
+            GridColumn[] columns, SortDirection[] groupDirection)
+        {
+            try
+            {
+                InRangeAdd = true;
+
+                for (int i = 0; i < columns.Length; i++)
+                    AddGroup(columns[i], groupDirection[i]);
+            }
+            finally
+            {
+                InRangeAdd = false;
+            }
+
+            InvalidateLayout();
+        }
+
+        #endregion
+
+        #region AddGroupToList
+
+        private void AddGroupToList(GridColumn column)
+        {
+            NeedsGrouped = true;
+
+            if (_GroupColumns.Contains(column) == false)
+            {
+                _GroupColumns.Add(column);
+
+                SuperGrid.DoGroupChangedEvent(this, GroupChangedAction.Add, column);
+            }
+
+            if (InRangeAdd == false)
+                InvalidateMerge();
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InsertGroup(col)
+
+        ///<summary>
+        /// This routine is used to insert a single column to the
+        /// list of columns used to group grid data rows together.
+        ///</summary>
+        public void InsertGroup(GridColumn column, int index)
+        {
+            InsertGroup(column, index, SortDirection.Ascending);
+        }
+
+        #endregion
+
+        #region InsertGroup(col, dir)
+
+        ///<summary>
+        /// This routine is used to insert a single column, and
+        /// its associated sorting direction, to the list of
+        /// columns used to group grid data rows together.
+        ///</summary>
+        public void InsertGroup(
+            GridColumn column, int index, SortDirection groupDirection)
+        {
+            column.GroupDirection = groupDirection;
+
+            InsertGroupToList(column, index);
+        }
+
+        #endregion
+
+        #region InsertGroupToList
+
+        private void InsertGroupToList(GridColumn column, int index)
+        {
+            NeedsGrouped = true;
+
+            int n = _GroupColumns.IndexOf(column);
+
+            if (n == index)
+                return;
+
+            if (n >= 0)
+            {
+                _GroupColumns.RemoveAt(n);
+
+                if (n < index)
+                    index--;
+            }
+
+            _GroupColumns.Insert(index, column);
+
+            SuperGrid.DoGroupChangedEvent(this, GroupChangedAction.Add, column);
+
+            InvalidateMerge();
+        }
+
+        #endregion
+
+        #region SetGroup
+
+        #region SetGroup()
+
+        ///<summary>
+        /// Resets the Group list to its default empty state.
+        ///</summary>
+        public void SetGroup()
+        {
+            ClearGroup();
+        }
+
+        #endregion
+
+        #region SetGroup(col)
+
+        ///<summary>
+        /// Sets the Group list to the given Column.
+        ///</summary>
+        public void SetGroup(GridColumn column)
+        {
+            ClearGroup();
+
+            AddGroup(column, SortDirection.Ascending);
+        }
+
+        #endregion
+
+        #region SetGroup(col, dir)
+
+        ///<summary>
+        /// Sets the Group list to the given Column and sort direction.
+        ///</summary>
+        public void SetGroup(
+            GridColumn column, SortDirection groupDirection)
+        {
+            ClearGroup();
+
+            AddGroup(column, groupDirection);
+        }
+
+        #endregion
+
+        #region SetGroup(col[])
+
+        ///<summary>
+        /// Sets the Group list to the given Column list.
+        ///</summary>
+        public void SetGroup(GridColumn[] columns)
+        {
+            ClearGroup();
+
+            AddGroup(columns);
+        }
+
+        #endregion
+
+        #region SetGroup(col[], dir)
+
+        ///<summary>
+        /// Sets the Group list to the
+        /// given Column list and sort direction.
+        ///</summary>
+        public void SetGroup(
+            GridColumn[] columns, SortDirection groupDirection)
+        {
+            ClearGroup();
+
+            AddGroup(columns, groupDirection);
+        }
+
+        #endregion
+
+        #region SetGroup(col[], dir[])
+
+        ///<summary>
+        /// Sets the Group list to the
+        /// given Column list and sort direction.
+        ///</summary>
+        public void SetGroup(
+            GridColumn[] columns, SortDirection[] groupDirection)
+        {
+            ClearSort(false);
+
+            AddGroup(columns, groupDirection);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ClearGroup
+
+        ///<summary>
+        /// Clears all currently set Column Groups.
+        ///</summary>
+        public void ClearGroup()
+        {
+            if (GroupColumns.Count > 0)
+            {
+                NeedsGrouped = true;
+
+                GridColumnCollection columns = _Columns;
+
+                foreach (GridColumn column in columns)
+                    column.GroupDirection = SortDirection.None;
+
+                _GroupColumns.Clear();
+
+                SuperGrid.DoGroupChangedEvent(this, GroupChangedAction.Reset, null);
+
+                InvalidateMerge();
+            }
+        }
+
+        #endregion
+
+        #region RemoveGroup
+
+        ///<summary>
+        /// Removes an individual set Column Group.
+        ///</summary>
+        public void RemoveGroup(GridColumn column)
+        {
+            if (_GroupColumns.Contains(column) == true)
+            {
+                NeedsGrouped = true;
+
+                column.GroupDirection = SortDirection.None;
+
+                _GroupColumns.Remove(column);
+
+                SuperGrid.DoGroupChangedEvent(this, GroupChangedAction.Remove, column);
+
+                InvalidateMerge();
+            }
+        }
+
+        #endregion
+
+        #region GroupItems
+
+        #region GroupItems (main)
+
+        private bool GroupItems()
+        {
+            bool changed = false;
+
+            NeedsGrouped = false;
+
+            if (SuperGrid.DoRowsGroupingEvent(this) == false)
+            {
+                IsSorting = true;
+
+                try
+                {
+                    GridContainer arow = ActiveRow;
+
+                    changed = RemoveGroupRows();
+                    changed |= AddGroupRows();
+
+                    if (arow != null && arow.Parent != null)
+                        ActiveRow = arow;
+                }
+                finally
+                {
+                    IsSorting = false;
+                }
+
+                if (changed == true)
+                {
+                    NeedToUpdateIndicees = true;
+                    NeedsMeasured = true;
+
+                    ExpandedUpdateCount++;
+
+                    SuperGrid.DoRowsGroupedEvent(this);
+
+                    NeedsGrouped = false;
+                }
+            }
+
+            return (changed);
+        }
+
+        #region AddGroupRows
+
+        private bool AddGroupRows()
+        {
+            if (_GroupColumns != null && _GroupColumns.Count > 0)
+            {
+                ShowInsertRow = false;
+
+                GroupItems(Rows, 0);
+
+                NeedsGroupSorted = true;
+
+                return (true);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region RemoveGroupRows
+
+        private bool RemoveGroupRows()
+        {
+            if (Rows.Count > 0 && Rows[0] is GridGroup)
+            {
+                List<GridElement> list = new List<GridElement>();
+
+                RemoveGroups(Rows, list);
+                Rows.Clear();
+
+                foreach (GridElement item in list)
+                {
+                    GridRow row = item as GridRow;
+
+                    if (row != null)
+                    {
+                        if (row.IsDetailRow == true || row.IsTempInsertRow == true)
+                            continue;
+                    }
+
+                    item.Parent = null;
+
+                    Rows.Add(item);
+                }
+
+                return (true);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GroupItems (sub)
+
+        private void GroupItems(ICollection<GridElement> items, int index)
+        {
+            if (index < _GroupColumns.Count)
+            {
+                Hashtable groupTable = new Hashtable();
+                List<GridGroup> groupOrder = new List<GridGroup>();
+
+                ProcessGroup(items, _GroupColumns[index], groupTable, groupOrder);
+
+                IGridCellEditControl editor = _GroupColumns[index].RenderControl;
+
+                if (editor != null)
+                {
+                    ComboBox cbx = editor as ComboBox;
+
+                    if (cbx == null || string.IsNullOrEmpty(cbx.DisplayMember))
+                        editor = null;
+                }
+
+                try
+                {
+                    if (editor != null)
+                        editor.SuspendUpdate = true;
+
+                    foreach (GridGroup group in groupOrder)
+                    {
+                        if (editor != null)
+                        {
+                            editor.InitializeContext(group.Cell, null);
+
+                            group.Text = editor.EditorFormattedValue;
+                        }
+
+                        SuperGrid.DoColumnGroupedEvent(this, _GroupColumns[index], group);
+
+                        GroupItems(group.Rows, index + 1);
+
+                        GetGroupDetailRows(index, group);
+                    }
+                }
+                finally
+                {
+                    if (editor != null)
+                        editor.SuspendUpdate = false;
+                }
+            }
+        }
+
+        #region GetGroupDetailRows
+
+        private void GetGroupDetailRows(int index, GridGroup group)
+        {
+            List<GridRow> preRows;
+            List<GridRow> postRows;
+
+            if (SuperGrid.DoGetGroupedDetailRowsEvent(this,
+                _GroupColumns[index], group, out preRows, out postRows) == true)
+            {
+                if (preRows != null)
+                {
+                    for (int i = preRows.Count - 1; i >= 0; i--)
+                    {
+                        preRows[i].IsDetailRow = true;
+
+                        group.Rows.Insert(0, preRows[i]);
+                    }
+                }
+
+                if (postRows != null)
+                {
+                    for (int i = 0; i < postRows.Count; i++)
+                    {
+                        postRows[i].IsDetailRow = true;
+
+                        group.Rows.Add(postRows[i]);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GroupSort
+
+        internal bool GroupSort()
+        {
+            bool changed = false;
+
+            NeedsGroupSorted = false;
+
+            if (SuperGrid.DoGroupSortingEvent(this) == false)
+            {
+                try
+                {
+                    IsSorting = true;
+
+                    changed = GroupSort(this);
+                }
+                finally
+                {
+                    IsSorting = false;
+                }
+
+                if (changed == true)
+                {
+                    NeedToUpdateIndicees = true;
+                    NeedsMeasured = true;
+
+                    SuperGrid.DoGroupSortedEvent(this);
+
+                    NeedsGroupSorted = false;
+                }
+            }
+
+            return (changed);
+        }
+
+        internal bool GroupSort(GridContainer container)
+        {
+            bool changed = false;
+
+            GridItemsCollection items = container.Rows;
+
+            if (items.Count > 0)
+            {
+                int groupRowIndex = -1;
+
+                for (int i = 0; i < items.Count; i++)
+                {
+                    if (items[i] is GridGroup)
+                    {
+                        groupRowIndex = i;
+
+                        GridContainer row = items[i] as GridContainer;
+
+                        if (row != null && row.Rows.Count > 0)
+                            changed |= GroupSort(row);
+                    }
+                }
+
+                if (groupRowIndex >= 0)
+                {
+                    if (items.Count > 1)
+                    {
+                        GridGroup group = (GridGroup)items[groupRowIndex];
+                        GridColumn column = group.Cell.GridColumn;
+
+                        if (column != null &&
+                            column.GroupDirection != SortDirection.None)
+                        {
+                            int n = GetGroupSortCount(items);
+
+                            if (n > 1)
+                            {
+                                GridElement[] array = new GridElement[items.Count];
+
+                                items.CopyTo(array, 0);
+                                Array.Sort(array, 0, n, new GroupComparer(column.GroupDirection));
+
+                                for (int i = 0; i < n; i++)
+                                    items[i] = array[i];
+
+                                changed = true;
+                            }
+                        }
+                    }
+                }
+            }
+
+            return (changed);
+        }
+
+        #region GetGroupSortCount
+
+        private int GetGroupSortCount(GridItemsCollection items)
+        {
+            for (int i = 0; i < items.Count; i++)
+            {
+                GridRow row = items[i] as GridRow;
+
+                if (row != null && row.IsDetailRow == true)
+                    return (i);
+            }
+
+            return (items.Count);
+        }
+
+        #endregion
+
+        #region GroupComparer
+
+        private class GroupComparer : IComparer<GridElement>
+        {
+            #region Private variables
+
+            private SortDirection _GroupDirection;
+
+            #endregion
+
+            public GroupComparer(SortDirection groupDirection)
+            {
+                _GroupDirection = groupDirection;
+            }
+
+            #region Compare
+
+            public int Compare(GridElement x, GridElement y)
+            {
+                GridGroup rowx = x as GridGroup;
+                GridGroup rowy = y as GridGroup;
+
+                if (rowx == null || rowy == null)
+                    return (-1);
+
+                int sval = 0;
+
+                switch (rowx.GridPanel.GroupSortElement)
+                {
+                    case GroupSortElement.GroupId:
+                        sval = CompareVal.CompareTo(rowx.GroupId, rowy.GroupId);
+                        break;
+
+                    case GroupSortElement.GroupText:
+                        sval = CompareVal.CompareTo(rowx.Text, rowy.Text);
+                        break;
+
+                    default:
+                        sval = rowx.Cell.CompareTo(rowy.Cell);
+                        break;
+                }
+
+                return (_GroupDirection ==
+                    SortDirection.Ascending) ? sval : -sval;
+            }
+
+            #endregion
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ProcessGroup
+
+        private void ProcessGroup(ICollection<GridElement> items,
+            GridColumn gridColumn, Hashtable groupTable, List<GridGroup> groupOrder)
+        {
+            GridCell cell = null;
+
+            foreach (GridElement item in items)
+            {
+                GridRow row = item as GridRow;
+
+                if (row != null)
+                {
+                    if (gridColumn.ColumnIndex < row.Cells.Count)
+                    {
+                        cell = row.Cells[gridColumn.ColumnIndex];
+
+                        AddItemToGroup(groupTable, groupOrder, cell, row);
+                    }
+                }
+                else
+                {
+                    GridGroup group = item as GridGroup;
+
+                    if (group != null)
+                        ProcessGroup(group.Rows, gridColumn, groupTable, groupOrder);
+                    else
+                        AddItemToGroup(groupTable, groupOrder, cell, item);
+                }
+            }
+
+            items.Clear();
+
+            foreach (GridGroup group in groupOrder)
+            {
+                group.Parent = null;
+
+                items.Add(group);
+
+                bool hasVis = false;
+
+                foreach (GridElement item in group.Rows)
+                {
+                    if (item.Visible == true)
+                    {
+                        hasVis = true;
+                        break;
+                    }
+                }
+
+                if (hasVis == false)
+                    group.Visible = false;
+            }
+        }
+
+        #endregion
+
+        #region AddItemToGroup
+
+        private void AddItemToGroup(IDictionary groupTable,
+            List<GridGroup> groupOrder, GridCell cell, GridElement row)
+        {
+            object groupId = cell.Value ?? "<null>";
+
+            SuperGrid.DoGetGroupIdEvent(row, cell.GridColumn, ref groupId);
+
+            GridGroup group = groupTable[groupId] as GridGroup;
+
+            if (group == null)
+            {
+                group = new GridGroup();
+
+                group.Cell = cell;
+                group.GroupId = groupId;
+                group.Text = (groupId == cell.Value) ? cell.FormattedValue : groupId.ToString();
+
+                groupTable[groupId] = group;
+                groupOrder.Add(group);
+            }
+
+            group.Rows.Add(row);
+        }
+
+        #endregion
+
+        #region RemoveGroups
+
+        private void RemoveGroups(
+            IEnumerable<GridElement> items, ICollection<GridElement> list)
+        {
+            foreach (GridElement item in items)
+            {
+                GridGroup group = item as GridGroup;
+
+                if (group != null)
+                    RemoveGroups(group.Rows, list);
+                else
+                    list.Add(item);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region Selection Support
+
+        #region GetSelected
+
+        #region GetSelectedElements
+
+        ///<summary>
+        /// Gets a SelectedElementCollection containing
+        /// a list of currently selected rows, columns, and cells.
+        ///</summary>
+        public SelectedElementCollection GetSelectedElements()
+        {
+            SelectedElementCollection items =
+                new SelectedElementCollection();
+
+            GetSelectedElements(items);
+
+            return (items);
+        }
+
+        internal void GetSelectedElements(SelectedElementCollection items)
+        {
+            GetSelectedRows(_SelectedRows, items);
+            GetSelectedColumns(items);
+            GetSelectedCells(items);
+        }
+
+        #endregion
+
+        #region GetSelectedRows
+
+        ///<summary>
+        /// Gets a SelectedElementCollection
+        /// containing a list of currently selected rows.
+        ///</summary>
+        public SelectedElementCollection GetSelectedRows()
+        {
+            SelectedElementCollection items =
+                new SelectedElementCollection(SelectedRowCount);
+
+            GetSelectedRows(_SelectedRows, items);
+
+            return (items);
+        }
+
+        internal void GetSelectedRows(ICollection<GridElement> items)
+        {
+            GetSelectedRows(_SelectedRows, items);
+        }
+
+        internal void GetSelectedRows(SelectedElements se, ICollection<GridElement> items)
+        {
+            foreach (SelectedRange range in se.Ranges)
+            {
+                for (int i = range.StartIndex; i <= range.EndIndex; i++)
+                {
+                    GridContainer item = GetRowFromIndex(i);
+
+                    if (item != null)
+                        items.Add(item);
+                }
+            }
+        }
+
+        #endregion
+
+        #region GetSelectedColumns
+
+        ///<summary>
+        /// Gets a SelectedElementCollection
+        /// containing a list of currently selected columns.
+        ///</summary>
+        public SelectedElementCollection GetSelectedColumns()
+        {
+            SelectedElementCollection items =
+                new SelectedElementCollection(SelectedColumnCount);
+
+            GetSelectedColumns(items);
+
+            return (items);
+        }
+
+        internal void GetSelectedColumns(ICollection<GridElement> items)
+        {
+            foreach (SelectedRange range in _SelectedColumns.Ranges)
+            {
+                for (int i = range.StartIndex; i <= range.EndIndex; i++)
+                    items.Add(Columns[i]);
+            }
+        }
+
+        #endregion
+
+        #region GetSelectedCells
+
+        ///<summary>
+        /// Gets a SelectedElementCollection
+        /// containing a list of currently selected cells.
+        ///</summary>
+        public SelectedElementCollection GetSelectedCells()
+        {
+            SelectedElementCollection items =
+                new SelectedElementCollection(SelectedCellCount);
+
+            GetSelectedCells(items);
+
+            return (items);
+        }
+
+        internal void GetSelectedCells(SelectedElementCollection items)
+        {
+            foreach (GridColumn column in Columns)
+                GetSelectedCells(items, column);
+        }
+
+        internal void GetSelectedCells(
+            SelectedElementCollection items, GridColumn column)
+        {
+            foreach (SelectedRange range in column.SelectedCells.Ranges)
+            {
+                for (int i = range.StartIndex; i <= range.EndIndex; i++)
+                {
+                    GridRow row = GetRowFromIndex(i) as GridRow;
+
+                    if (row != null)
+                    {
+                        GridCell cell = row.GetCell(column.ColumnIndex,
+                            AllowEmptyCellSelection);
+
+                        if (cell != null && cell.AllowSelection == true)
+                            items.Add(cell);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Select
+
+        ///<summary>
+        /// Selects the given Row.
+        ///</summary>
+        ///<param name="row"></param>
+        public void Select(GridContainer row)
+        {
+            if (row != null)
+                row.IsSelected = true;
+        }
+
+        ///<summary>
+        /// Selects the given Column.
+        ///</summary>
+        ///<param name="column"></param>
+        public void Select(GridColumn column)
+        {
+            if (column != null)
+                column.IsSelected = true;
+        }
+
+        ///<summary>
+        /// Selects the given Cell.
+        ///</summary>
+        ///<param name="cell"></param>
+        public void Select(GridCell cell)
+        {
+            if (cell != null)
+                cell.IsSelected = true;
+        }
+
+        #endregion
+
+        #region SelectAll
+
+        ///<summary>
+        /// Selects all cells, columns, or rows based upon
+        /// the current TopLeftHeaderSelectBehavior property setting.
+        ///</summary>
+        public void SelectAll()
+        {
+            int count = (VirtualMode == true)
+                ? VirtualRowCountEx : _NewGridIndex;
+
+            if (count > 0)
+            {
+                TopLeftHeaderSelectBehavior tsb = _TopLeftHeaderSelectBehavior;
+
+                if (_TopLeftHeaderSelectBehavior == TopLeftHeaderSelectBehavior.Deterministic)
+                {
+                    tsb = (_SelectionGranularity == SelectionGranularity.Cell)
+                              ? TopLeftHeaderSelectBehavior.SelectAllCells
+                              : TopLeftHeaderSelectBehavior.SelectAllRows;
+                }
+
+                ClearAll();
+
+                switch (tsb)
+                {
+                    case TopLeftHeaderSelectBehavior.SelectAllCells:
+                        SetSelectedCells(0, 0, count, Columns.Count, true);
+                        break;
+
+                    case TopLeftHeaderSelectBehavior.SelectAllColumns:
+                        SetSelectedColumns(0, Columns.Count, true);
+                        break;
+
+                    case TopLeftHeaderSelectBehavior.SelectAllRows:
+                        SetSelectedRows(0, count, true);
+                        break;
+                }
+
+                ColumnHeader.SelectAllCount = SelectionUpdateCount;
+            }
+            else
+            {
+                ColumnHeader.InvalidateRowHeader();
+            }
+        }
+
+        #endregion
+
+        #region SetSelected
+
+        #region SetSelected (row)
+
+        ///<summary>
+        /// This routine is used to set an individual row as either
+        /// selected or unselected, based upon the provided 'selected' value.
+        ///</summary>
+        ///<param name="row"></param>
+        ///<param name="selected"></param>
+        ///<returns></returns>
+        public bool SetSelected(GridContainer row, bool selected)
+        {
+            if (row != null)
+            {
+                if (row.IsSelected != selected)
+                {
+                    row.IsSelected = selected;
+
+                    return (row.Selected = selected);
+                }
+            }
+
+            return (false);
+        }
+
+        internal bool SetSelectedEx(GridContainer row, bool selected)
+        {
+            int index = row.GridIndex;
+
+            return (SetSelected(_SelectedRows,
+                index, selected, ref _SelectionUpdateCount));
+        }
+
+        ///<summary>
+        /// This routine is used to set a range of rows as either
+        /// selected or unselected, based upon the provided 'selected' value.
+        ///</summary>
+        ///<param name="row"></param>
+        ///<param name="count"></param>
+        ///<param name="selected"></param>
+        public void SetSelected(GridContainer row, int count, bool selected)
+        {
+            int index = row.GridIndex;
+
+            SetSelected(_SelectedRows,
+                index, count, selected, ref _SelectionUpdateCount);
+        }
+
+        ///<summary>
+        /// This routine is used to set a range of rows as either
+        /// selected or unselected, based upon the provided 'selected' value.
+        ///</summary>
+        ///<param name="startIndex"></param>
+        ///<param name="count"></param>
+        ///<param name="selected"></param>
+        public void SetSelectedRows(int startIndex, int count, bool selected)
+        {
+            if (count > 0)
+            {
+                SetSelected(_SelectedRows,
+                    startIndex, count, selected, ref _SelectionUpdateCount);
+
+                InvalidateRows(this, startIndex, startIndex + count - 1, false);
+            }
+        }
+
+        #endregion
+
+        #region SetSelected (column)
+
+        ///<summary>
+        /// This routine is used to set an individual column as either
+        /// selected or unselected, based upon the provided 'selected' value.
+        ///</summary>
+        ///<param name="column"></param>
+        ///<param name="selected"></param>
+        ///<returns></returns>
+        public bool SetSelected(GridColumn column, bool selected)
+        {
+            int index = column.ColumnIndex;
+
+            return (SetSelected(_SelectedColumns,
+                index, selected, ref _SelectionUpdateCount));
+        }
+
+        ///<summary>
+        /// This routine is used to set a range of columns as either
+        /// selected or unselected, based upon the provided 'selected' value.
+        ///</summary>
+        ///<param name="column"></param>
+        ///<param name="count"></param>
+        ///<param name="selected"></param>
+        public void SetSelected(GridColumn column, int count, bool selected)
+        {
+            int index = column.ColumnIndex;
+
+            SetSelected(_SelectedColumns,
+                index, count, selected, ref _SelectionUpdateCount);
+        }
+
+        ///<summary>
+        /// This routine sets a range of columns as selected
+        /// or unselected, based upon the provided 'selected' value.
+        ///</summary>
+        ///<param name="startIndex"></param>
+        ///<param name="count"></param>
+        ///<param name="selected"></param>
+        public void SetSelectedColumns(int startIndex, int count, bool selected)
+        {
+            if (count > 0 && Columns.Count > 0)
+            {
+                SetSelected(_SelectedColumns,
+                    startIndex, count, selected, ref _SelectionUpdateCount);
+
+                InvalidateColumns(startIndex, startIndex + count - 1);
+            }
+        }
+
+        #region InvalidateColumns
+
+        internal void InvalidateColumns(int start, int end)
+        {
+            if (start > end)
+            {
+                int temp = start;
+                start = end;
+                end = temp;
+            }
+
+            if (FrozenColumnCount > 0)
+                InvalidateColumnRange(0, FirstFrozenColumn.ColumnIndex);
+
+            InvalidateColumnRange(start, end);
+        }
+
+        #region InvalidateColumnRange
+
+        private void InvalidateColumnRange(int start, int end)
+        {
+            Rectangle t = SuperGrid.ClientRectangle;
+
+            start = Math.Max(0, start);
+            end = Math.Min(start + Columns.Count - 1, end);
+
+            GridColumn rs = Columns[start];
+            GridColumn re = Columns[end];
+
+            Rectangle rsRect = rs.Bounds;
+            Rectangle reRect = re.Bounds;
+
+            Rectangle r = new Rectangle(rsRect.X, rsRect.Y,
+                                        reRect.Right - rsRect.X, reRect.Bottom - rsRect.Y);
+
+            r.IntersectsWith(t);
+
+            InvalidateRender(r);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region SetSelected (cell)
+
+        /// <summary>
+        /// This routine is used to set an individual cell as either
+        /// selected or unselected, based upon the provided 'selected' value.
+        /// </summary>
+        /// <param name="cell"></param>
+        /// <param name="selected"></param>
+        /// <returns></returns>
+        public bool SetSelected(GridCell cell, bool selected)
+        {
+            if (cell != null)
+            {
+                if (cell.Selected != selected)
+                {
+                    cell.Selected = selected;
+
+                    return (cell.Selected == selected);
+                }
+            }
+
+            return (false);
+        }
+
+        internal bool SetSelectedEx(GridCell cell, bool selected)
+        {
+            GridColumn column = cell.GridColumn;
+
+            if (column != null)
+            {
+                int index = cell.GridRow.GridIndex;
+
+                return (SetSelected(column.SelectedCells,
+                    index, selected, ref _SelectionUpdateCount));
+            }
+
+            return (false);
+        }
+
+        ///<summary>
+        /// This routine is used to set a range of cells as either
+        /// selected or unselected, based upon the provided 'selected' value.
+        ///</summary>
+        ///<param name="startRowIndex"></param>
+        ///<param name="startColumnName"></param>
+        ///<param name="rowCount"></param>
+        ///<param name="columnCount"></param>
+        ///<param name="selected"></param>
+        public void SetSelectedCells(int startRowIndex, string startColumnName,
+            int rowCount, int columnCount, bool selected)
+        {
+            SetSelectedCells(startRowIndex,
+                Columns[startColumnName].ColumnIndex, rowCount, columnCount, selected);
+        }
+
+        ///<summary>
+        /// This routine is used to set a range of cells as either
+        /// selected or unselected, based upon the provided 'selected' value.
+        ///</summary>
+        ///<param name="startRowIndex"></param>
+        ///<param name="startColumnIndex"></param>
+        ///<param name="rowCount"></param>
+        ///<param name="columnCount"></param>
+        ///<param name="selected"></param>
+        public void SetSelectedCells(int startRowIndex, int startColumnIndex,
+            int rowCount, int columnCount, bool selected)
+        {
+            if (rowCount > 0 && columnCount > 0)
+            {
+                for (int i = 0; i < columnCount; i++)
+                {
+                    SetSelected(Columns[startColumnIndex + i].SelectedCells,
+                        startRowIndex, rowCount, selected, ref _SelectionUpdateCount);
+                }
+
+                InvalidateCells(startRowIndex, startRowIndex + rowCount - 1,
+                    startColumnIndex, startColumnIndex + columnCount - 1);
+            }
+        }
+
+        #region InvalidateCells
+
+        internal void InvalidateCells(int startRowIndex,
+            int endRowIndex, int startColumnIndex, int endColumnIndex)
+        {
+            Rectangle r = Rectangle.Empty;
+
+            int n = Columns.Count;
+
+            int[] map = Columns.DisplayIndexMap;
+
+            if ((uint)startColumnIndex < n && (uint)endColumnIndex < n)
+            {
+                if (EnableCellMerging == true)
+                {
+                    if (endRowIndex - startRowIndex > 100)
+                    {
+                        InvalidateRender();
+                    }
+                    else
+                    {
+                        for (int i = startRowIndex; i <= endRowIndex; i++)
+                        {
+                            GridRow row = GetRowFromIndex(i) as GridRow;
+
+                            if (row != null)
+                            {
+                                for (int j = startColumnIndex; j <= endColumnIndex; j++)
+                                {
+                                    GridCell cell = row.GetCell(map[j], true);
+
+                                    if (cell != null)
+                                        cell.InvalidateRender();
+                                }
+                            }
+                        }
+                    }
+                }
+                else
+                {
+                    int sci = map[startColumnIndex];
+                    int eci = map[endColumnIndex];
+
+                    Rectangle u = Columns[sci].BoundsRelative;
+                    Rectangle u2 = Columns[eci].BoundsRelative;
+
+                    if (Parent == null || Columns[sci].IsHFrozenEx == false)
+                        u.X -= HScrollOffset;
+
+                    if (Parent != null || Columns[eci].IsHFrozenEx == false)
+                        u2.X -= HScrollOffset;
+
+                    u = Rectangle.Union(u, u2);
+
+                    if (startColumnIndex <= endColumnIndex)
+                        InvalidateCellArea(startRowIndex, endRowIndex, u, ref r);
+
+                    if (startRowIndex != endRowIndex)
+                    {
+                        int start = startRowIndex;
+                        int end = endRowIndex;
+
+                        if (start > end)
+                        {
+                            int temp = start;
+                            start = end;
+                            end = temp;
+                        }
+
+                        InvalidateCellArea(start, end, u, ref r);
+                    }
+
+                    InvalidateRender(r);
+                }
+            }
+        }
+
+        #region InvalidateCellArea
+
+        private void InvalidateCellArea(int sri, int eri, Rectangle u, ref Rectangle r)
+        {
+            GridElement start = GetRowFromIndex(sri);
+            GridElement end = GetRowFromIndex(eri);
+
+            if (start != null && end != null)
+            {
+                GridContainer gcr = GetRowFromIndex(sri);
+                GridContainer gce = GetRowFromIndex(eri);
+
+                Rectangle t = (gcr != null) ? gcr.BoundsRelative : Rectangle.Empty;
+                Rectangle t2 = (gce != null) ? gce.BoundsRelative : Rectangle.Empty;
+
+                if (t.IsEmpty == false)
+                {
+                    if (Parent != null || gcr.BoundsRelative.Y > FixedRowHeight)
+                        t.Y -= VScrollOffset;
+                }
+
+                if (t2.IsEmpty == false)
+                {
+                    if (Parent != null || gce.BoundsRelative.Y > FixedRowHeight)
+                        t2.Y -= VScrollOffset;
+                }
+
+                t.Height = t2.Bottom - t.Top;
+
+                t.X = u.X;
+                t.Width = u.Width;
+
+                r = (r.IsEmpty == true) ? t : Rectangle.Union(r, t);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region SetSelected (single)
+
+        internal bool SetSelected(
+            SelectedElements selectedElements, int index, bool selected, ref ushort uCount)
+        {
+            SelectedRange range;
+            bool found = selectedElements.FindRange(index, out range);
+
+            if (selected == true)
+            {
+                if (found == false)
+                {
+                    if (SuperGrid.DoSelectionChangingEvent(this, ref selectedElements, index, 1, selected) == false)
+                    {
+                        uCount++;
+                        selectedElements.AddItem(index);
+
+                        if (EnableSelectionBuffering == false)
+                            FlushSelected();
+
+                        return (selectedElements.FindRange(index, out range));
+                    }
+                }
+            }
+            else
+            {
+                if (found == true)
+                {
+                    if (SuperGrid.DoSelectionChangingEvent(this, ref selectedElements, index, 1, selected) == false)
+                    {
+                        uCount++;
+                        selectedElements.RemoveItem(index, range);
+
+                        if (EnableSelectionBuffering == false)
+                            FlushSelected();
+
+                        return (selectedElements.FindRange(index, out range) == false);
+                    }
+                }
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region SetSelected (multiple)
+
+        internal void SetSelected(SelectedElements selectedElements,
+            int index, int count, bool selected, ref ushort uCount)
+        {
+            if (count > 0)
+            {
+                if (NeedToSelect(selectedElements, index, count, selected) == true)
+                {
+                    if (SuperGrid.DoSelectionChangingEvent(this, ref selectedElements, index, count, selected) == false)
+                    {
+                        uCount++;
+
+                        if (selected == true)
+                            selectedElements.AddRange(index, index + count - 1);
+                        else
+                            selectedElements.RemoveRange(index, index + count - 1);
+                    }
+                }
+            }
+        }
+
+        #region NeedToSelect
+
+        private bool NeedToSelect(
+            SelectedElements selectedElements, int startIndex, int count, bool selected)
+        {
+            int endIndex = startIndex + count - 1;
+
+            if (selected == true)
+            {
+                foreach (SelectedRange range in selectedElements.Ranges)
+                {
+                    if (range.StartIndex > endIndex)
+                        return (true);
+
+                    if (range.StartIndex <= startIndex && range.EndIndex >= endIndex)
+                        return (false);
+                }
+
+                return (true);
+            }
+            else
+            {
+                foreach (SelectedRange range in selectedElements.Ranges)
+                {
+                    if (range.StartIndex > endIndex)
+                        return (false);
+
+                    if (range.StartIndex <= endIndex && range.EndIndex >= startIndex)
+                        return (true);
+                }
+
+                return (false);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region IsItemSelected
+
+        internal bool IsItemSelected(
+            SelectedElements selectedElements, int index)
+        {
+            SelectedRange range;
+
+            return (selectedElements.FindRange(index, out range));
+        }
+
+        ///<summary>
+        /// Retrieves whether the given item is selected.
+        ///</summary>
+        ///<param name="row"></param>
+        ///<returns></returns>
+        public bool IsItemSelected(GridContainer row)
+        {
+            return (row != null ? row.Selected : false);
+        }
+
+        internal bool IsItemSelectedEx(GridContainer row)
+        {
+            return (IsItemSelected(_SelectedRows, row.GridIndex));
+        }
+
+        ///<summary>
+        /// Retrieves whether the given item is selected.
+        ///</summary>
+        ///<param name="column"></param>
+        ///<returns></returns>
+        public bool IsItemSelected(GridColumn column)
+        {
+            if (column != null)
+            {
+                int index = column.ColumnIndex;
+
+                return (IsItemSelected(_SelectedColumns, index));
+            }
+
+            return (false);
+        }
+
+        ///<summary>
+        /// Retrieves whether the given item is selected.
+        ///</summary>
+        ///<param name="cell"></param>
+        ///<returns></returns>
+        public bool IsItemSelected(GridCell cell)
+        {
+            return (cell != null ? cell.Selected : false);
+        }
+
+        internal bool IsItemSelectedEx(GridCell cell)
+        {
+            GridColumn column = cell.GridColumn;
+
+            if (column != null)
+            {
+                if (cell.GridRow != null)
+                {
+                    int index = cell.GridRow.GridIndex;
+
+                    return (IsItemSelected(column.SelectedCells, index));
+                }
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region Is(Row/Column/Cell)Selected
+
+        ///<summary>
+        /// IsRowSelected
+        ///</summary>
+        ///<param name="rowIndex"></param>
+        ///<returns></returns>
+        public bool IsRowSelected(int rowIndex)
+        {
+            return (IsItemSelected(_SelectedRows, rowIndex));
+        }
+
+        ///<summary>
+        /// Retrieves whether the given column (as
+        /// specified by the given column index) is selected.
+        ///</summary>
+        ///<param name="colIndex"></param>
+        ///<returns></returns>
+        public bool IsColumnSelected(int colIndex)
+        {
+            return (IsItemSelected(_SelectedColumns, colIndex));
+        }
+
+        ///<summary>
+        /// Retrieves whether the given cell (as specified by the
+        /// given row and column index) is selected.
+        ///</summary>
+        ///<param name="rowIndex"></param>
+        ///<param name="colIndex"></param>
+        ///<returns></returns>
+        public bool IsCellSelected(int rowIndex, int colIndex)
+        {
+            SelectedElements selectedElements =
+                Columns[colIndex].SelectedCells;
+
+            return (IsItemSelected(selectedElements, rowIndex));
+        }
+
+        #endregion
+
+        #region OnlyRowsSelected
+
+        internal bool OnlyRowsSelected(int startIndex, int endIndex)
+        {
+            if (_SelectedRows.Ranges.Count != 1)
+                return (false);
+
+            if (_SelectedRows.Ranges[0].StartIndex != startIndex ||
+                _SelectedRows.Ranges[0].EndIndex != endIndex)
+            {
+                return (false);
+            }
+
+            if (_SelectedColumns.Count > 0)
+                return (false);
+
+            foreach (GridColumn column in Columns)
+            {
+                if (column.SelectedCells.Count > 0)
+                    return (false);
+            }
+
+            return (true);
+        }
+
+        #endregion
+
+        #region OnlyColumnsSelected
+
+        internal bool OnlyColumnsSelected(int startIndex, int endIndex)
+        {
+            if (_SelectedColumns.Ranges.Count != 1)
+                return (false);
+
+            if (_SelectedColumns.Ranges[0].StartIndex != Columns.DisplayIndexMap[startIndex] ||
+                _SelectedColumns.Ranges[0].EndIndex != Columns.DisplayIndexMap[endIndex])
+            {
+                return (false);
+            }
+
+            if (_SelectedRows.Count > 0)
+                return (false);
+
+            foreach (GridColumn column in Columns)
+            {
+                if (column.SelectedCells.Count > 0)
+                    return (false);
+            }
+
+            return (true);
+        }
+
+        #endregion
+
+        #region OnlyCellsSelected
+
+        internal bool OnlyCellsSelected(int startRowIndex,
+            int startColIndex, int endRowIndex, int endColIndex)
+        {
+            if (_SelectedRows.Ranges.Count > 0)
+                return (false);
+
+            if (_SelectedColumns.Ranges.Count > 0)
+                return (false);
+
+            foreach (GridColumn column in Columns)
+            {
+                int index = Columns.GetDisplayIndex(column);
+
+                if (index >= startColIndex && index <= endColIndex)
+                {
+                    if (column.SelectedCells.Ranges.Count != 1)
+                        return (false);
+
+                    if (column.SelectedCells.Ranges[0].StartIndex != startRowIndex ||
+                        column.SelectedCells.Ranges[0].EndIndex != endRowIndex)
+                    {
+                        return (false);
+                    }
+                }
+                else
+                {
+                    if (column.SelectedCells.Ranges.Count > 0)
+                        return (false);
+                }
+            }
+
+            return (true);
+        }
+
+        #endregion
+
+        #region ClearAll
+
+        ///<summary>
+        /// Clears all cells, rows, and columns
+        /// from their associated selection lists.
+        ///</summary>
+        public void ClearAll()
+        {
+            ClearAll(true);
+        }
+
+        internal void ClearAll(bool invalidate)
+        {
+            ClearSelected(_SelectedRows);
+            ClearSelected(_SelectedColumns);
+
+            foreach (GridColumn column in Columns)
+                ClearSelected(column.SelectedCells);
+
+            ClearAllMergeSelected();
+
+            if (SuperGrid != null)
+            {
+                SuperGrid.LastActiveCell = null;
+
+                if (invalidate == true)
+                    InvalidateRender();
+            }
+        }
+
+        #endregion
+
+        #region ClearAllSelected
+
+        internal void ClearAllSelected()
+        {
+            Rectangle t = CViewRect;
+
+            int[] map = Columns.DisplayIndexMap;
+
+            for (int i = 0; i < map.Length; i++)
+            {
+                GridColumn col = Columns[map[i]];
+
+                if (col.Visible && col.Bounds.IntersectsWith(t))
+                {
+                    if (col.IsSelected == true)
+                    {
+                        col.InvalidateRender();
+                        ColumnHeader.InvalidateHeader(this, col);
+                    }
+                    else if (col.SelectedCells.Ranges.Count > 0)
+                    {
+                        col.InvalidateRender();
+                    }
+                }
+            }
+
+            int first = GetFirstOnScreenGridIndex();
+            int last = GetLastOnScreenGridIndex(first);
+
+            InvalidateSelectedRows(first, last, t);
+
+            ClearAll(false);
+        }
+
+        #region InvalidateSelectedRows
+
+        private void InvalidateSelectedRows(int startRow, int endRow, Rectangle t)
+        {
+            for (int i = startRow; i <= endRow; i++)
+            {
+                GridContainer row = GetRowFromIndex(i);
+
+                if (row != null)
+                {
+                    if (row.Bounds.Y > t.Bottom)
+                        break;
+
+                    Rectangle r = row.ContainerBounds;
+
+                    r.Y -= SuperGrid.VScrollOffset;
+                    r.X -= SuperGrid.HScrollOffset;
+
+                    if (r.IntersectsWith(t))
+                    {
+                        if (row.IsSelected == true)
+                        {
+                            if (row is GridPanel)
+                                row.InvalidateRender(r);
+                            else
+                                row.InvalidateRender();
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region GetFirstOnScreenGridIndex
+
+        private int GetFirstOnScreenGridIndex()
+        {
+            if ((VScrollOffset == 0 && IsFiltered == false) ||
+                (Parent != null && IsVFrozen == true) ||
+                (VirtualMode == false && IsSubPanel == false && FrozenRowCount > 0))
+            {
+                return (0);
+            }
+
+            if (VirtualMode == true)
+                return (GetFirstVirtualOnScreenGridIndex());
+
+            return (GetFirstRealOnScreenGridIndex());
+        }
+
+        #region GetFirstVirtualOnScreenGridIndex
+
+        private int GetFirstVirtualOnScreenGridIndex()
+        {
+            Rectangle r = BoundsRelative;
+
+            int vrh = Dpi.Height(VirtualRowHeight);
+
+            r.Y += (FixedRowHeight - FrozenRowCount * vrh);
+
+            int y = VScrollOffset;
+
+            if (Parent == null)
+                y += (FrozenRowCount * vrh);
+            else
+                y = (y - r.Y) + SuperGrid.PrimaryGrid.FixedRowHeight;
+
+            int n = y / vrh;
+
+            return (n > 0 ? n : 0);
+        }
+
+        #endregion
+
+        #region GetFirstRealOnScreenGridIndex
+
+        private int GetFirstRealOnScreenGridIndex()
+        {
+            if (_NewGridIndex <= 0)
+                return (-1);
+
+            int lo = 0;
+            int hi = _NewGridIndex - 1;
+
+            Rectangle r = SuperGrid.ViewRect;
+
+            while (lo < hi)
+            {
+                int mid = (lo + hi) / 2;
+
+                GridElement item = _GridIndexArray[mid];
+                Rectangle t = item is GridPanel ? ((GridPanel)item).ContainerBounds : item.BoundsRelative;
+
+                if (item.IsVFrozen == false)
+                    t.Y -= VScrollOffset;
+
+                if (t.Bottom > r.Y)
+                {
+                    if (t.Y <= r.Y)
+                    {
+                        if (item.Visible == true)
+                            return (mid);
+                    }
+
+                    hi = mid - 1;
+                }
+                else
+                {
+                    lo = mid + 1;
+                }
+            }
+
+            return (lo);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetLastOnScreenGridndex
+
+        private int GetLastOnScreenGridIndex(int index)
+        {
+            if (VirtualMode == true)
+                return (GetLastVirtualOnScreenGridIndex());
+
+            return (GetLastRealOnScreenGridIndex(index));
+        }
+
+        #region GetLastVirtualOnScreenGridIndex
+
+        private int GetLastVirtualOnScreenGridIndex()
+        {
+            Rectangle r = BoundsRelative;
+
+            int vrh = Dpi.Height(VirtualRowHeight);
+
+            int h = FixedRowHeight - (FrozenRowCount * vrh);
+            r.Y += h;
+            r.Height -= h;
+
+            int y = VScrollOffset;
+
+            if (Parent == null)
+            {
+                y += (FrozenRowCount * vrh);
+                r.Height -= FrozenRowCount * vrh;
+            }
+            else
+            {
+                y = (y - r.Y) + SuperGrid.PrimaryGrid.FixedRowHeight;
+            }
+
+            int n = (y + r.Height) / vrh;
+
+            return (n > 0 ? n : 0);
+        }
+
+        #endregion
+
+        #region GetLastRealOnScreenGridIndex
+
+        private int GetLastRealOnScreenGridIndex(int index)
+        {
+            Rectangle r = SuperGrid.ViewRect;
+
+            while (index + 1 < _NewGridIndex)
+            {
+                index++;
+
+                GridContainer item = _GridIndexArray[index];
+                Rectangle t = item.Bounds;
+
+                if (t.Bottom >= r.Bottom)
+                    return (index);
+            }
+
+            return (index);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region ClearSelected(rows/columns/cells)
+
+        ///<summary>
+        /// Clears all currently selected Rows.
+        ///</summary>
+        public void ClearSelectedRows()
+        {
+            ClearSelected(_SelectedRows);
+
+            InvalidateRender();
+        }
+
+        ///<summary>
+        /// Clears all currently selected Columns.
+        ///</summary>
+        public void ClearSelectedColumns()
+        {
+            ClearSelected(_SelectedColumns);
+
+            InvalidateRender();
+        }
+
+        ///<summary>
+        /// Clears all currently selected Cells.
+        ///</summary>
+        public void ClearSelectedCells()
+        {
+            foreach (GridColumn column in Columns)
+                ClearSelected(column.SelectedCells);
+
+            InvalidateRender();
+        }
+
+        private void ClearSelected(SelectedElements selectedElements)
+        {
+            if (selectedElements.Count > 0)
+            {
+                if (SuperGrid.DoSelectionChangingEvent(this,
+                    ref selectedElements, 0, selectedElements.Count, false) == false)
+                {
+                    UpdateSelectionCount();
+                    selectedElements.Clear();
+
+                }
+            }
+
+            SelectionClearCount++;
+        }
+
+        #endregion
+
+        #region ExpandSelectedAtIndex
+
+        internal void ExpandSelectedAtIndex(
+            int index, int count, bool expand)
+        {
+            if (expand == false)
+            {
+                SetSelectedRows(index, count, false);
+                SetSelectedCells(index, 0, count, Columns.Count, false);
+
+                count = -count;
+            }
+
+            _SelectedRows.OffsetIndices(index, count);
+
+            foreach (GridColumn column in Columns)
+                column.SelectedCells.OffsetIndices(index, count);
+
+            UpdateRowCountEx();
+
+            if (expand == true)
+            {
+                UpdateIndicees(this, Rows, true);
+
+                for (int i = 0; i < count; i++)
+                {
+                    GridContainer row = GetRowFromIndex(index + i);
+
+                    if (row != null)
+                    {
+                        if (row.Selected == true)
+                            SetSelectedRows(index + i, 1, true);
+
+                        GridRow roe = row as GridRow;
+
+                        if (roe != null)
+                        {
+                            foreach (GridCell cell in roe.Cells)
+                            {
+                                if (cell.Selected == true)
+                                    SetSelectedCells(index + i, cell.ColumnIndex, 1, 1, true);
+                            }
+                        }
+                    }
+                }
+
+                UpdateSelectionCount();
+            }
+        }
+
+        #endregion
+
+        #region UpdateSelectionCount
+
+        internal void UpdateSelectionCount()
+        {
+            _SelectionUpdateCount++;
+
+            if (EnableSelectionBuffering == false)
+                FlushSelected();
+        }
+
+        #endregion
+
+        #region OnSelectionChanged
+
+        internal void OnSelectionChanged()
+        {
+            _LastSelectionUpdateCount = _SelectionUpdateCount;
+
+            SuperGrid.DoSelectionChangedEvent(this);
+        }
+
+        #endregion
+
+        #region NormalizeIndices
+
+        internal void NormalizeIndices(
+            bool extend, int anchor, ref int startIndex, ref int endIndex)
+        {
+            if (startIndex > endIndex)
+            {
+                int tempIndex = startIndex;
+                startIndex = endIndex;
+                endIndex = tempIndex;
+
+                if (extend == true)
+                {
+                    if (startIndex > anchor)
+                        startIndex++;
+
+                    else if (endIndex < anchor)
+                        endIndex--;
+                }
+            }
+            else
+            {
+                if (extend == true)
+                {
+                    if (endIndex < anchor)
+                        endIndex--;
+
+                    else if (startIndex > anchor)
+                        startIndex++;
+                }
+            }
+        }
+
+        #endregion
+
+        #region FlushSelected
+
+        ///<summary>
+        /// Flushes any pending Selections (raises the SelectionChanged event
+        /// if selections have changed and the event has not been previously raised).
+        ///</summary>
+        ///<returns>true, if event raised.</returns>
+        public bool FlushSelected()
+        {
+            if (_SelectionUpdateCount != _LastSelectionUpdateCount)
+            {
+                OnSelectionChanged();
+
+                return (true);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region NewRow support
+
+        #region NewRow
+
+        /// <summary>
+        /// Creates a new GridRow, allocating all associated cells
+        /// and initializing them to their column's default value.
+        /// The row is not added to the GridPanel.
+        /// </summary>
+        /// <returns>New GridRow</returns>
+        public GridRow NewRow()
+        {
+            return (GetNewRow());
+        }
+
+        /// <summary>
+        /// Creates and optionally appends a new GridRow, allocating all
+        /// associated cells and initializing them to their column's default value.
+        /// </summary>
+        /// <returns>New GridRow</returns>
+        public GridRow NewRow(bool append)
+        {
+            GridRow row = GetNewRow();
+
+            if (append == true)
+                Rows.Add(row);
+
+            return (row);
+        }
+
+        /// <summary>
+        /// Creates and insert a new GridRow at the given index, allocating all
+        /// associated cells and initializing them to their column's default value.
+        /// </summary>
+        /// <param name="index"></param>
+        /// <returns>New GridRow</returns>
+        public GridRow NewRow(int index)
+        {
+            GridRow row = GetNewRow();
+
+            Rows.Insert(index, row);
+
+            return (row);
+        }
+
+        #endregion
+
+        #region GetNewRow
+
+        private GridRow GetNewRow()
+        {
+            GridRow row = new GridRow();
+
+            row.AllocPanel = this;
+
+            for (int i = 0; i < Columns.Count; i++)
+            {
+                GridCell cell = new
+                    GridCell(Columns[i].DefaultNewRowCellValue);
+
+                row.Cells.Add(cell);
+            }
+
+            SuperGrid.DoRowSetDefaultValuesEvent(this, row, NewRowContext.RowInit);
+
+            return (row);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Delete row support
+
+        #region GetDeletedRows
+
+        ///<summary>
+        /// Gets a SelectedElementCollection of the
+        /// current list of Deleted Rows.
+        ///</summary>
+        public SelectedElementCollection GetDeletedRows()
+        {
+            SelectedElementCollection items =
+                new SelectedElementCollection(DeletedRowCount);
+
+            SelectedElements sec = InternalDeletedRows;
+
+            int index = -1;
+
+            while (sec.GetNextIndex(ref index) == true)
+            {
+                GridRow row = (VirtualMode == true)
+                    ? VirtualRows[index] : (GridRow)Rows[index];
+
+                if (row.IsDeleted == true)
+                    items.Add(row);
+            }
+
+            return (items);
+        }
+
+        #endregion
+
+        #region DeleteAll
+
+        ///<summary>
+        /// This routine marks each data rows as Deleted.
+        ///</summary>
+        public void DeleteAll()
+        {
+            DeleteAllEx(false, false);
+        }
+
+        /// <summary>
+        /// This routine marks each data rows as Deleted - and sets
+        /// the Visible state for each deleted row.
+        /// </summary>
+        /// <param name="visible">Visible row state after deletion</param>
+        public void DeleteAll(bool visible)
+        {
+            DeleteAllEx(true, visible);
+        }
+
+        private void DeleteAllEx(bool useVisible, bool visible)
+        {
+            if (VirtualMode == true)
+            {
+                if (VirtualRowCountEx > 0)
+                {
+                    ClearSelected(_DeletedRows);
+
+                    SetSelected(_DeletedRows, 0,
+                        VirtualRowCountEx, true, ref _DeleteUpdateCount);
+                }
+            }
+            else
+            {
+                if (Rows.Count > 0)
+                {
+                    int count = Rows.Count;
+
+                    ClearSelected(_DeletedRows);
+
+                    if (useVisible == true)
+                        SetDeletedRows(0, count, true, visible);
+                    else
+                        SetDeletedRows(0, count, true);
+                }
+            }
+        }
+
+
+        #endregion
+
+        #region UnDeleteAll
+
+        ///<summary>
+        /// Undeletes (or restores) all previously deleted grid rows.
+        ///</summary>
+        public void UnDeleteAll()
+        {
+            UnDeleteAll(false);
+        }
+
+        ///<summary>
+        /// Undeletes (or restores) all previously deleted grid rows.
+        ///</summary>
+        public void UnDeleteAll(bool visible)
+        {
+            if (visible == true)
+            {
+                if (_DeletedRows.Count > 0)
+                {
+                    SelectedElementCollection sec = GetDeletedRows();
+
+                    foreach (GridContainer row in sec)
+                        row.Visible = true;
+                }
+
+                InvalidateRender();
+            }
+
+            ClearSelected(_DeletedRows);
+
+            UpdateDeleteCount();
+        }
+
+        #endregion
+
+        #region SetDeleted
+
+        /// <summary>
+        /// Sets the deleted state for the given row.
+        /// </summary>
+        /// <param name="row"></param>
+        ///<param name="deleted">Signifies whether to mark the row as deleted or not</param>
+        /// <returns></returns>
+        public bool SetDeleted(GridContainer row, bool deleted)
+        {
+            bool visible = row.Visible;
+
+            if (deleted == true && AutoHideDeletedRows == true)
+                visible = false;
+
+            return (SetDeleted(row, deleted, visible));
+        }
+
+        ///<summary>
+        /// Sets the deleted and visible state for the given row.
+        ///</summary>
+        ///<param name="row"></param>
+        ///<param name="deleted">Signifies whether to mark the row as deleted or not</param>
+        ///<param name="visible">Signifies whether to mark the row as visible or not</param>
+        ///<returns></returns>
+        public bool SetDeleted(GridContainer row, bool deleted, bool visible)
+        {
+            bool state = SetSelected(
+                _DeletedRows, row.FullIndex, deleted, ref _DeleteUpdateCount);
+
+            if (VirtualMode == false)
+                UpdateDeletedRow(row, visible);
+            else
+                InvalidateRender();
+
+            return (state);
+        }
+
+        ///<summary>
+        /// Sets the deleted state, beginning at the given row, and
+        /// continuing for the specified count.
+        ///</summary>
+        ///<param name="row">Row</param>
+        ///<param name="count">Count of rows</param>
+        ///<param name="deleted">Signifies whether to mark each row as deleted or not</param>
+        public void SetDeleted(GridContainer row, int count, bool deleted)
+        {
+            SetDeletedRows(row.FullIndex, count, deleted);
+        }
+
+        /// <summary>
+        /// Sets the deleted state, beginning at the given row, and
+        /// continuing for the specified count.
+        /// </summary>
+        /// <param name="row"></param>
+        /// <param name="count"></param>
+        ///<param name="deleted">Signifies whether to mark each row as deleted or not</param>
+        ///<param name="visible">Signifies whether to mark each row as visible or not</param>
+        public void SetDeleted(GridContainer row, int count, bool deleted, bool visible)
+        {
+            SetDeletedRows(row.FullIndex, count, deleted, visible);
+        }
+
+        #endregion
+
+        #region SetDeletedRows
+
+        ///<summary>
+        /// Sets the deleted state, beginning at the given row
+        /// index, and continuing for the specified count.
+        ///</summary>
+        ///<param name="startIndex"></param>
+        ///<param name="count"></param>
+        ///<param name="deleted"></param>
+        public void SetDeletedRows(int startIndex, int count, bool deleted)
+        {
+            if (count > 0)
+            {
+                SetSelected(_DeletedRows,
+                    startIndex, count, deleted, ref _DeleteUpdateCount);
+
+                if (VirtualMode == false)
+                {
+                    bool autoHide = false;
+
+                    if (deleted == true && AutoHideDeletedRows == true)
+                        autoHide = true;
+
+                    for (int i = 0; i < count; i++)
+                    {
+                        GridContainer row =
+                            Rows[startIndex + i] as GridContainer;
+
+                        UpdateDeletedRow(row, autoHide ? false : row.Visible);
+                    }
+                }
+                else
+                {
+                    InvalidateRender();
+                }
+            }
+        }
+
+        ///<summary>
+        /// Sets the deleted state, beginning at the given row
+        /// index, and continuing for the specified count.
+        ///</summary>
+        ///<param name="startIndex">Start index</param>
+        ///<param name="count">Count of row to effect</param>
+        ///<param name="deleted">Signifies whether to mark each row as deleted or not</param>
+        ///<param name="visible">Signifies whether to mark each row as visible or not</param>
+        public void SetDeletedRows(int startIndex, int count, bool deleted, bool visible)
+        {
+            if (count > 0)
+            {
+                SetSelected(_DeletedRows,
+                    startIndex, count, deleted, ref _DeleteUpdateCount);
+
+                if (VirtualMode == false)
+                {
+                    for (int i = 0; i < count; i++)
+                    {
+                        GridContainer row =
+                            Rows[startIndex + i] as GridContainer;
+
+                        UpdateDeletedRow(row, visible);
+                    }
+                }
+                else
+                {
+                    InvalidateRender();
+                }
+            }
+        }
+
+        #endregion
+
+        #region UpdateDeletedRow
+
+        private void UpdateDeletedRow(GridContainer row, bool visible)
+        {
+            if (row != null)
+            {
+                if (row.Visible != visible)
+                {
+                    if (visible == false && row.IsActive == true)
+                    {
+                        SuperGrid.DeactivateNonModalEditor();
+                        SuperGrid.PostInternalMouseMove();
+
+                        SelectActiveRow = true;
+                    }
+
+                    row.Visible = visible;
+                }
+                else
+                {
+                    row.InvalidateRender();
+                }
+            }
+        }
+
+        #endregion
+
+        #region IsRowDeleted
+
+        ///<summary>
+        /// IsRowDeleted
+        ///</summary>
+        ///<param name="row"></param>
+        ///<returns></returns>
+        public bool IsRowDeleted(GridContainer row)
+        {
+            int index = row.FullIndex;
+
+            return (IsRowDeleted(index));
+        }
+
+        ///<summary>
+        /// IsRowDeleted
+        ///</summary>
+        ///<param name="index"></param>
+        ///<returns></returns>
+        public bool IsRowDeleted(int index)
+        {
+            return (IsItemSelected(_DeletedRows, index));
+        }
+
+        #endregion
+
+        #region UpdateDeleteCount
+
+        internal void UpdateDeleteCount()
+        {
+            _DeleteUpdateCount++;
+        }
+
+        #endregion
+
+        #region ExpandDeletedAtIndex
+
+        internal void ExpandDeletedAtIndex(int index, int count)
+        {
+            _DeletedRows.OffsetIndices(index, count);
+
+            UpdateRowCountEx();
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InsertRow
+
+        ///<summary>
+        /// Inserts a new row at the given index.
+        ///</summary>
+        ///<param name="index"></param>
+        ///<exception cref="Exception"></exception>
+        public GridRow InsertRow(int index)
+        {
+            if (DeactivateEdit() == false)
+                return (null);
+
+            if (DeactivateRow(SuperGrid.ActiveRow, null) == false)
+                return (null);
+
+            if (SuperGrid.DoRowAddingEvent(this, ref index) == false)
+            {
+                GridRow row = GetNewRow();
+
+                DataBinder.GetDefaultValues(row);
+
+                if (VirtualMode == true)
+                    InsertVirtualTempRow(row, index);
+                else
+                    InsertRealTempRow(row, index);
+
+                return (row);
+            }
+
+            return (null);
+        }
+
+        #region InsertVirtualTempRow
+
+        private void InsertVirtualTempRow(GridRow row, int index)
+        {
+            if ((uint)index > VirtualRowCount)
+                throw new Exception("Invalid VirtualRow collection index");
+
+            row.RowIndex = index;
+
+            row.IsTempInsertRow = true;
+            row.RowNeedsStored = true;
+
+            VirtualRows.MaxRowIndex = index - 1;
+            VirtualRowCount++;
+
+            _VirtualTempInsertRow = row;
+
+            LatentActiveRowIndex = index;
+            LatentActiveContainer = this;
+
+            EnsureRowVisible = true;
+
+            HotItem = null;
+            ExpandDeletedAtIndex(row.FullIndex + 1, 1);
+            PostInternalMouseMove();
+
+            SuperGrid.DoRowSetDefaultValuesEvent(this, row, NewRowContext.RowInit);
+            SuperGrid.DoRowAddedEvent(this, index);
+
+            InvalidateMerge();
+        }
+
+        #endregion
+
+        #region InsertRealTempRow
+
+        private void InsertRealTempRow(GridRow row, int index)
+        {
+            if ((uint)index > Rows.Count)
+                throw new Exception("Invalid Rows collection index");
+
+            if (index == Rows.Count && ShowInsertRow == true)
+                index--;
+
+            row.IsTempInsertRow = true;
+            row.RowNeedsStored = true;
+
+            Rows.Insert(index, row);
+            UpdateIndicees(this, Rows, true);
+
+            LatentActiveRowIndex = index;
+            LatentActiveContainer = this;
+
+            EnsureRowVisible = true;
+
+            HotItem = null;
+            ExpandDeletedAtIndex(row.FullIndex + 1, 1);
+            PostInternalMouseMove();
+
+            SuperGrid.DoRowSetDefaultValuesEvent(this, row, NewRowContext.RowInit);
+            SuperGrid.DoRowAddedEvent(this, index);
+
+            InvalidateMerge();
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InsertNewRow
+
+        private bool InsertNewRow(GridRow row, int index)
+        {
+            while (true)
+            {
+                try
+                {
+                    DataBinder.UpdatePosInProgress = true;
+
+                    DataBinder.InsertRow(index, row);
+                    break;
+                }
+                catch (Exception exp)
+                {
+                    bool retry = false;
+                    bool throwException = false;
+
+                    if (SuperGrid.HasDataErrorHandler == true)
+                    {
+                        object value = row;
+
+                        if (SuperGrid.DoDataErrorEvent(this, null, exp,
+                            DataContext.InsertRow, ref value, ref throwException, ref retry) == true)
+                        {
+                            return (false);
+                        }
+                    }
+
+                    if (throwException == true)
+                        throw;
+
+                    if (retry == false)
+                        return (false);
+                }
+                finally
+                {
+                    DataBinder.UpdatePosInProgress = false;
+                }
+            }
+
+            return (true);
+        }
+
+        #endregion
+
+        #region GetRowFromIndex
+
+        ///<summary>
+        /// Gets the Row from the given GridIndex
+        ///</summary>
+        ///<param name="gridIndex"></param>
+        ///<returns></returns>
+        public GridContainer GetRowFromIndex(int gridIndex)
+        {
+            if (gridIndex >= 0)
+            {
+                if (VirtualMode == true)
+                {
+                    if (gridIndex >= VirtualRowCountEx)
+                        return (null);
+
+                    return (VirtualRows[gridIndex]);
+                }
+
+                if (gridIndex < _NewGridIndex && gridIndex < _GridIndexArray.Length)
+                    return (_GridIndexArray[gridIndex]);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region UpdateRowCount
+
+        internal void UpdateRowCount()
+        {
+            if (DataBinder.IsUpdateSuspended == false)
+            {
+                if (EnableFiltering == true && FilterLevel != FilterLevel.None)
+                {
+                    bool rowFiltered = DataFilter.IsRowFiltered(this);
+                    bool colFiltered = DataFilter.IsColumnFiltered(this);
+
+                    if (rowFiltered == true || colFiltered == true)
+                        NeedToUpdateDataFilter = true;
+                }
+
+                UpdateRowCountEx();
+            }
+        }
+
+        #endregion
+
+        #region UpdateRowCountEx
+
+        internal void UpdateRowCountEx()
+        {
+            if (SuperGrid != null)
+            {
+                SuperGrid.NeedToUpdateIndicees = true;
+                SuperGrid.UpdateStyleCount();
+            }
+        }
+
+        #endregion
+
+        #region CreateItemsCollection
+
+        /// <summary>
+        /// Creates the GridItemsCollection that hosts the items.
+        /// </summary>
+        /// <returns>New instance of GridItemsCollection.</returns>
+        protected override GridItemsCollection CreateItemsCollection()
+        {
+            GridItemsCollection items = new GridItemsCollection();
+
+            items.CollectionChanged += ItemsCollectionChanged;
+
+            return (items);
+        }
+
+        #endregion
+
+        #region DisposeItemsCollection
+
+        /// <summary>
+        /// DisposeItemsCollection
+        /// </summary>
+        /// <param name="items"></param>
+        protected override void DisposeItemsCollection(GridItemsCollection items)
+        {
+            items.CollectionChanged -= ItemsCollectionChanged;
+        }
+
+        #endregion
+
+        #region ItemsCollectionChanged
+
+        void ItemsCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            if (IsRowMoving == false)
+            {
+                switch (e.Action)
+                {
+                    case NotifyCollectionChangedAction.Add:
+                    case NotifyCollectionChangedAction.Replace:
+                        foreach (GridElement item in e.NewItems)
+                        {
+                            if (item is GridPanel)
+                                throw new Exception("GridPanels can not be nested.");
+
+                            if (VirtualMode == true)
+                                throw new Exception("Virtual Panels can not have nested rows.");
+
+                            if (item.Parent != null && item.Parent != this)
+                                throw new Exception("Row is already a member of another Rows collection.");
+
+                            item.Parent = this;
+                        }
+                        break;
+                }
+
+                RowCollectionChanged(e);
+            }
+        }
+
+        #endregion
+
+        #region RowCollectionChanged
+
+        internal void RowCollectionChanged(NotifyCollectionChangedEventArgs e)
+        {
+            if (IsRowMoving == false)
+            {
+                switch (e.Action)
+                {
+                    case NotifyCollectionChangedAction.Add:
+                    case NotifyCollectionChangedAction.Replace:
+                        int n = 0;
+
+                        foreach (GridElement item in e.NewItems)
+                        {
+                            GridContainer row = item as GridContainer;
+                            GridRow roe = row as GridRow;
+
+                            if (SortColumns != null && SortColumns.Count > 0)
+                            {
+                                if (IsSorting == false)
+                                {
+                                    item.NeedsMeasured = true;
+
+                                    if (roe != null && roe.IsTempInsertRow == false)
+                                        NeedsSorted = true;
+                                }
+                            }
+
+                            if (row != null)
+                            {
+                                row.RowIndex = e.NewStartingIndex + n;
+
+                                if (roe != null)
+                                {
+                                    if (e.Action == NotifyCollectionChangedAction.Replace)
+                                        RemoveFromExpDictionary(roe);
+
+                                    AddToExpDictionary(roe);
+
+                                    if (roe.IsTempInsertRow == false && roe.DataItem == null)
+                                    {
+                                        if (ShowInsertRow == true)
+                                            RemoveNewInsertRow();
+
+                                        DataBinder.InsertRow(roe.RowIndex, roe);
+
+                                        if (ShowInsertRow == true)
+                                            AddNewInsertRow();
+                                    }
+                                }
+                            }
+
+                            n++;
+                        }
+                        break;
+
+                    case NotifyCollectionChangedAction.Reset:
+                        ClearAll();
+                        UnDeleteAll();
+
+                        SetActiveRow(null);
+                        DetachNestedRows(false);
+
+                        if (IsSorting == false)
+                            _ExpDictionary.Clear();
+                        break;
+
+                    case NotifyCollectionChangedAction.Remove:
+                        ClearAll();
+
+                        if (_ExpDictionary.Count > 0)
+                        {
+                            foreach (GridContainer item in e.OldItems)
+                                RemoveFromExpDictionary(item as GridRow);
+                        }
+
+                        foreach (GridContainer item in e.OldItems)
+                        {
+                            GridRow row = item as GridRow;
+
+                            if (row != null)
+                            {
+                                if (row.DataItem != null)
+                                {
+                                    if (row.IsTempInsertRow == false)
+                                        DataBinder.RemoveRow(row);
+
+                                    row.DataItem = null;
+                                }
+
+                                if (row.IsReordering == false)
+                                {
+                                    if (row == ActiveRow)
+                                        ActiveRow = null;
+                                }
+                            }
+                        }
+                        break;
+                }
+
+                if (IsSorting == false)
+                {
+                    NeedsMeasured = true;
+                    NeedsFilterScan = true;
+
+                    if (GroupColumns.Count > 0)
+                    {
+                        if (e.Action != NotifyCollectionChangedAction.Remove)
+                            NeedsGrouped = true;
+                    }
+
+                    if (SuperGrid != null && SuperGrid.IsUpdateSuspended == false)
+                    {
+                        UpdateRowCount();
+
+                        InvalidateMerge();
+
+                        if (SuperGrid.NonModalEditorCell != null)
+                        {
+                            SuperGrid.DeactivateNonModalEditor();
+                            SuperGrid.PostInternalMouseMove();
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region ColumnsCollectionChanged
+
+        private void ColumnsCollectionChanged(object sender, CollectionChangeEventArgs e)
+        {
+            if (ShowInsertRow == true)
+                LoadInsertRow = true;
+
+            InvalidateMerge();
+        }
+
+        #endregion
+
+        #region AddToExpDictionary
+
+        internal void AddToExpDictionary(GridContainer cont)
+        {
+            if (EnableCellExpressions == true)
+            {
+                GridRow row = cont as GridRow;
+
+                if (row != null)
+                {
+                    foreach (GridCell cell in row.Cells)
+                    {
+                        string newExp = cell.Value as string;
+
+                        if (newExp != null)
+                        {
+                            newExp = newExp.Trim();
+
+                            if (newExp.StartsWith("="))
+                                cell.SetCellExp(this, newExp);
+                        }
+                    }
+                }
+
+                if (cont.Rows != null)
+                {
+                    foreach (GridContainer item in cont.Rows)
+                        AddToExpDictionary(item);
+                }
+            }
+        }
+
+        #endregion
+
+        #region RemoveFromExpDictionary
+
+        internal void RemoveFromExpDictionary(GridContainer cont)
+        {
+            if (EnableCellExpressions == true)
+            {
+                GridRow row = cont as GridRow;
+
+                if (row != null)
+                {
+                    foreach (GridCell cell in row.Cells)
+                    {
+                        if (cell.IsValueExpression == true)
+                            _ExpDictionary.Remove(cell);
+                    }
+                }
+
+                if (cont.Rows != null)
+                {
+                    foreach (GridContainer item in cont.Rows)
+                        RemoveFromExpDictionary(item);
+                }
+            }
+        }
+
+        #endregion
+
+        #region AddNewInsertRow
+
+        internal void AddNewInsertRow()
+        {
+            if (VirtualMode == true)
+            {
+                if (_VirtualRowCount > 0)
+                {
+                    _VirtualInsertRow = VirtualRows[_VirtualRowCount];
+
+                    _VirtualInsertRow.IsTempInsertRow = true;
+
+                    DataBinder.GetDefaultValues(_VirtualInsertRow);
+                }
+
+                _VirtualRowCount++;
+            }
+            else
+            {
+                GridItemsCollection items = Rows;
+
+                GridRow row = new GridRow();
+
+                for (int i = 0; i < _Columns.Count; i++)
+                    row.Cells.Add(new GridCell());
+
+                row.Parent = this;
+                row.IsTempInsertRow = true;
+
+                DataBinder.GetDefaultValues(row);
+
+                items.FloatLastItem = false;
+                items.Add(row);
+                items.FloatLastItem = true;
+
+                if (SuperGrid == null)
+                    LoadInsertRow = true;
+            }
+        }
+
+        #endregion
+
+        #region RemoveNewInsertRow
+
+        internal void RemoveNewInsertRow()
+        {
+            if (VirtualMode == true)
+            {
+                _VirtualRowCount--;
+
+                _VirtualInsertRow = null;
+
+                VirtualRows.FreeRow(_VirtualRowCount);
+            }
+            else
+            {
+                GridItemsCollection items = Rows;
+
+                if (items.Count == 0 || items.FloatLastItem == false)
+                    throw new Exception();
+
+                GridRow row = items[items.Count - 1] as GridRow;
+
+                if (row == null)
+                    throw new Exception();
+
+                if (_ActiveRow == row)
+                    SetActiveRow(row.PrevVisibleRow, true);
+
+                items.Remove(row);
+
+                items.FloatLastItem = false;
+            }
+        }
+
+        #endregion
+
+        #region GetAutoSizeMode
+
+        private ColumnAutoSizeMode GetAutoSizeMode(GridColumn column)
+        {
+            return (column.AutoSizeMode == ColumnAutoSizeMode.NotSet)
+                ? _ColumnAutoSizeMode : column.AutoSizeMode;
+        }
+
+        #endregion
+
+        #region GetResourceImage
+
+        internal Image GetResourceImage(string resource)
+        {
+            string res = GetDpiImageString(resource);
+
+            Assembly myAssembly = Assembly.GetExecutingAssembly();
+
+            using (Stream myStream =
+                myAssembly.GetManifestResourceStream(res))
+            {
+                if (myStream != null)
+                    return (new Bitmap(myStream));
+            }
+
+            return (null);
+        }
+
+        #region GetDpiImageString
+
+        private string GetDpiImageString(string s)
+        {
+            SizeF sizef = Dpi.Factor;
+            float scale = Math.Max(sizef.Width, sizef.Height);
+
+            string t =
+                (scale >= 2) ? "32" :
+                (scale >= 1.5) ? "24" :
+                (scale >= 1.25) ? "20" : "16";
+
+            return ("DevComponents.DotNetBar.SuperGrid." + s + t + ".png");
+        }
+
+        #endregion
+
+        #endregion
+
+        #region PointToScroll
+
+        internal Point PointToScroll(Point pt)
+        {
+            if (IsSubPanel == true)
+                pt.X -= HScrollOffset;
+
+            if (IsVFrozen == false)
+                pt.Y -= VScrollOffset;
+
+            return (pt);
+        }
+
+        #endregion
+
+        #region PointToGrid
+
+        ///<summary>
+        /// Converts the given Point
+        /// into a Grid relative Point.
+        ///</summary>
+        public Point PointToGrid(Point pt)
+        {
+            if (IsSubPanel == true)
+            {
+                pt.X += HScrollOffset;
+                pt.Y += VScrollOffset;
+            }
+            else
+            {
+                if (FrozenColumnCount == 0)
+                {
+                    Rectangle t = SuperGrid.SViewRect;
+
+                    if (t.Contains(pt) == true)
+                    {
+                        pt.X += HScrollOffset;
+                        pt.Y += VScrollOffset;
+                    }
+                }
+                else
+                {
+                    GridElement item = GetElementAt(pt.X, pt.Y);
+
+                    if (item is GridColumnHeader)
+                        pt = PointByColumn(pt);
+
+                    else if (item is GridFooter)
+                        pt.Y += VScrollOffset;
+
+                    else if (item is GridRow)
+                    {
+                        GridElement sub = ((GridRow)item).GetElementAt(pt.X, pt.Y);
+
+                        if (item.IsVFrozen == false)
+                            pt.Y += VScrollOffset;
+
+                        if (sub is GridPanel == false)
+                            pt = PointByColumn(pt);
+                        else
+                            pt.X += HScrollOffset;
+                    }
+                }
+            }
+
+            return (pt);
+        }
+
+        #endregion
+
+        #region PointByColumn
+
+        private Point PointByColumn(Point pt)
+        {
+            int[] map = Columns.DisplayIndexMap;
+
+            foreach (int index in map)
+            {
+                GridColumn column = _Columns[index];
+
+                if (column.Visible == true)
+                {
+                    int x = column.BoundsRelative.X;
+
+                    if (column.IsHFrozen == false && pt.X > x)
+                    {
+                        pt.X += HScrollOffset;
+                        break;
+                    }
+                }
+            }
+
+            return (pt);
+        }
+
+        #endregion
+
+        #region CopySelectedCellsToClipboard
+
+        ///<summary>
+        /// Copies the currently selected list of tab delimited cells to the system
+        /// ClipBoard.  This routine takes all cell, column, and row selections into
+        /// account when determining what cell data to write to the clipboard. 
+        ///</summary>
+        public void CopySelectedCellsToClipboard()
+        {
+            CopySelectedCellsToClipboard(false, false, '\t', true, false);
+        }
+
+        ///<summary>
+        /// Copies the currently selected list of tab delimited cells to the system
+        /// ClipBoard.  This routine takes all cell, column, and row selections into
+        /// account when determining what cell data to write to the clipboard. 
+        ///</summary>
+        ///<param name="formatValue">Whether to copy cell FormattedValue instead of cell Value</param>
+        public void CopySelectedCellsToClipboard(bool formatValue)
+        {
+            CopySelectedCellsToClipboard(false, false, '\t', true, formatValue);
+        }
+
+        ///<summary>
+        /// Copies the currently selected list of tab delimited cells to the
+        /// system ClipBoard.  This routine takes all cell, column, and row
+        /// selections into account when determining what cell data to write
+        /// to the clipboard. 
+        ///</summary>
+        ///<param name="includeColumnHeaders">If true, the column header text is written.</param>
+        ///<param name="includeGridIndex">If true, the row GridIndex is written.</param>
+        public void CopySelectedCellsToClipboard(bool includeColumnHeaders, bool includeGridIndex)
+        {
+            CopySelectedCellsToClipboard(
+                includeColumnHeaders, includeGridIndex, '\t', true, false);
+        }
+
+        ///<summary>
+        /// Copies the currently selected list of tab delimited cells to the system
+        /// ClipBoard.  This routine takes all cell, column, and row selections into
+        /// account when determining what cell data to write to the clipboard. 
+        ///</summary>
+        ///<param name="includeColumnHeaders">If true, the column header text is written.</param>
+        ///<param name="includeGridIndex">If true, the row GridIndex is written.</param>
+        ///<param name="formatValue">Whether to copy cell FormattedValue instead of cell Value</param>
+        public void CopySelectedCellsToClipboard(
+            bool includeColumnHeaders, bool includeGridIndex, bool formatValue)
+        {
+            CopySelectedCellsToClipboard(
+                includeColumnHeaders, includeGridIndex, '\t', true, formatValue);
+        }
+
+        ///<summary>
+        /// Copies the currently selected list of tab delimited cells to the system
+        /// ClipBoard.  This routine takes all cell, column, and row selections into
+        /// account when determining what cell data to write to the clipboard. 
+        ///</summary>
+        ///<param name="includeColumnHeaders">If true, the column header text is written.</param>
+        ///<param name="includeGridIndex">If true, the row GridIndex is written.</param>
+        ///<param name="delimiter">Field delimiter</param>
+        public void CopySelectedCellsToClipboard(
+            bool includeColumnHeaders, bool includeGridIndex, char delimiter)
+        {
+            CopySelectedCellsToClipboard(
+                includeColumnHeaders, includeGridIndex, delimiter, true, false);
+        }
+
+        ///<summary>
+        /// Copies the currently selected list of tab delimited cells to the system
+        /// ClipBoard.  This routine takes all cell, column, and row selections into
+        /// account when determining what cell data to write to the clipboard. 
+        ///</summary>
+        ///<param name="includeColumnHeaders">If true, the column header text is written.</param>
+        ///<param name="includeGridIndex">If true, the row GridIndex is written.</param>
+        ///<param name="delimiter">Field delimiter</param>
+        ///<param name="fullCopy">Whether to copy all leading columns</param>
+        public void CopySelectedCellsToClipboard(
+            bool includeColumnHeaders, bool includeGridIndex, char delimiter, bool fullCopy)
+        {
+            CopySelectedCellsToClipboard(
+                includeColumnHeaders, includeGridIndex, delimiter, fullCopy, false);
+        }
+
+        ///<summary>
+        /// Copies the currently selected list of tab delimited cells to the system
+        /// ClipBoard.  This routine takes all cell, column, and row selections into
+        /// account when determining what cell data to write to the clipboard. 
+        ///</summary>
+        ///<param name="includeColumnHeaders">If true, the column header text is written.</param>
+        ///<param name="includeGridIndex">If true, the row GridIndex is written.</param>
+        ///<param name="delimiter">Field delimiter</param>
+        ///<param name="fullCopy">Whether to copy all leading columns</param>
+        ///<param name="formatValue">Whether to copy cell FormattedValue instead of cell Value</param>
+        public void CopySelectedCellsToClipboard(
+            bool includeColumnHeaders, bool includeGridIndex, char delimiter, bool fullCopy, bool formatValue)
+        {
+            SelectedElementCollection items = GetSelectedElements();
+            List<GridCell> cells = items.GetCells();
+
+            if (cells.Count > 0)
+            {
+                cells.Sort(new CellComparer());
+
+                BitArray usedColumns = GetUsedColumns(cells);
+
+                if (usedColumns.Count > 0)
+                {
+                    int fIndex = (fullCopy == true)
+                        ? 0 : GetFirstCellIndex(usedColumns);
+
+                    StringBuilder sb = new StringBuilder();
+
+                    if (includeColumnHeaders == true)
+                    {
+                        foreach (GridColumn column in _Columns)
+                        {
+                            if (fullCopy == true || usedColumns[column.ColumnIndex] == true)
+                            {
+                                if (column.ColumnIndex >= fIndex)
+                                {
+                                    sb.Append(column.GetHeaderText());
+                                    sb.Append(delimiter);
+                                }
+                            }
+                        }
+
+                        if (sb.Length > 0)
+                        {
+                            sb.Length--;
+                            sb.AppendLine();
+                        }
+                    }
+
+                    int cIndex = 0;
+                    int rIndex = -1;
+
+                    foreach (GridCell cell in cells)
+                    {
+                        if (fullCopy == true || usedColumns[cell.ColumnIndex] == true)
+                        {
+                            int rowIndex = cell.GridRow.GridIndex;
+
+                            if (rowIndex != rIndex)
+                            {
+                                if (rIndex >= 0)
+                                    sb.AppendLine();
+
+                                rIndex = rowIndex;
+                                cIndex = fIndex;
+
+                                if (includeGridIndex == true)
+                                {
+                                    sb.Append(rowIndex);
+                                    sb.Append(delimiter);
+                                }
+                            }
+
+                            while (cIndex < cell.ColumnIndex)
+                            {
+                                cIndex++;
+
+                                if (fullCopy == true || usedColumns[cIndex] == true)
+                                    sb.Append(delimiter);
+                            }
+
+                            sb.Append((formatValue ? cell.FormattedValue : cell.Value) ?? NullString ?? "<null>");
+                        }
+                        else
+                        {
+                            cIndex = cell.ColumnIndex;
+                        }
+                    }
+
+                    sb.AppendLine();
+
+                    DataObject mData = new DataObject();
+                    mData.SetData(DataFormats.Text, true, sb.ToString());
+
+                    Clipboard.SetDataObject(mData, true);
+                }
+            }
+        }
+
+        #region CellComparer
+
+        private class CellComparer : IComparer<GridCell>
+        {
+            public int Compare(GridCell x, GridCell y)
+            {
+                int xcol = x.ColumnIndex;
+                int xrow = x.GridRow.GridIndex;
+
+                int ycol = y.ColumnIndex;
+                int yrow = y.GridRow.GridIndex;
+
+                if (xrow < yrow)
+                    return (-1);
+
+                if (xrow > yrow)
+                    return (1);
+
+                if (xcol < ycol)
+                    return (-1);
+
+                if (xcol > ycol)
+                    return (1);
+
+                return (0);
+            }
+        }
+
+        #endregion
+
+        #region GetUsedColumns
+
+        private BitArray GetUsedColumns(IEnumerable<GridCell> cells)
+        {
+            int visColumns = 0;
+
+            foreach (GridColumn column in Columns)
+            {
+                if (column.Visible == true)
+                    visColumns++;
+            }
+
+            BitArray usedCells = new BitArray(Columns.Count);
+
+            if (visColumns > 0)
+            {
+                foreach (GridCell cell in cells)
+                {
+                    if (cell.GridColumn.Visible == true)
+                    {
+                        usedCells[cell.ColumnIndex] = true;
+
+                        if (--visColumns <= 0)
+                            break;
+                    }
+                }
+            }
+
+            return (usedCells);
+        }
+
+        #endregion
+
+        #region GetFirstCellIndex
+
+        private int GetFirstCellIndex(BitArray usedColumns)
+        {
+            for (int i = 0; i < usedColumns.Count; i++)
+            {
+                if (usedColumns[i] == true)
+                    return (i);
+            }
+
+            return (0);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region DataUpdate support
+
+        ///<summary>
+        /// Calling the BeginDataUpdate routine informs the grid
+        /// that an extended data update phase has begun. The SuperGrid
+        /// will suspend all data notification and updates
+        /// until the corresponding EndDataUpdate routine is called.
+        /// 
+        /// BeginDataUpdate / EndDataUpdate can be nested and must be
+        /// called in pairs � every BeginDataUpdate must have a
+        /// matching EndDataUpdate call.
+        ///</summary>
+        public void BeginDataUpdate()
+        {
+            DataBinder.BeginUpdate();
+        }
+
+        ///<summary>
+        /// Calling the EndDataUpdate routine informs the grid
+        /// that an extended data update phase has ended.
+        /// 
+        /// BeginDataUpdate / EndDataUpdate can be nested and must be
+        /// called in pairs � every BeginDataUpdate must have a
+        /// matching EndDataUpdate call.
+        ///</summary>
+        public void EndDataUpdate()
+        {
+            DataBinder.EndUpdate();
+        }
+
+        #endregion
+
+        #region UpdateDataBindings
+
+        private void UpdateDataBindings()
+        {
+            if (DataBinder.ConnectionInProgress == false)
+            {
+                if (NeedToUpdateBoundData == true)
+                {
+                    NeedToUpdateBoundData = false;
+
+                    if (VirtualMode == false)
+                        Rows.Clear();
+
+                    else if (DataSource != null)
+                        VirtualRows.MaxRowIndex = 0;
+
+                    ClearAll();
+                    UnDeleteAll();
+                }
+
+                if (NeedToUpdateBindings == true)
+                {
+                    NeedToUpdateBindings = false;
+
+                    DataBinder.Clear();
+
+                    if (DataSource != null)
+                    {
+                        DataBinder.DataConnect();
+
+                        _FilterEval = null;
+
+                        if (DataBinder.CurrencyManager == null)
+                            NeedToUpdateBindings = true;
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region UpdateDataFiltering
+
+        internal void UpdateDataFiltering()
+        {
+            if (NeedToUpdateDataFilter == true)
+            {
+                GridRow arow = SuperGrid.ActiveRow as GridRow;
+
+                if (arow == null || arow.IsTempInsertRow == false)
+                {
+                    if (DeactivateEdit() == true)
+                    {
+                        NeedToUpdateDataFilter = false;
+
+                        if (arow != null && arow.RowNeedsGrouped == true)
+                            NeedsGrouped = true;
+
+                        ClearAll();
+
+                        DataFilter.FilterData(this);
+
+                        SuperGrid.NeedToUpdateIndicees = true;
+
+                        foreach (GridColumn col in Columns)
+                        {
+                            switch (col.GetAutoSizeMode())
+                            {
+                                case ColumnAutoSizeMode.AllCells:
+                                case ColumnAutoSizeMode.AllCellsExceptHeader:
+                                case ColumnAutoSizeMode.DisplayedCells:
+                                case ColumnAutoSizeMode.DisplayedCellsExceptHeader:
+                                    col.NeedsResized = true;
+                                    break;
+                            }
+                        }
+                    }
+                    SuperGrid.NeedToUpdateIndicees = true;
+                }
+            }
+        }
+
+        #endregion
+
+        #region UpdateVisibleRowCount
+
+        internal void UpdateVisibleRowCount()
+        {
+            if (VirtualMode == true)
+            {
+                _VisibleRowCount = _VirtualRowCount;
+                _FilteredRowCount = 0;
+            }
+            else
+            {
+                _VisibleRowCount = 0;
+
+                for (int i = 0; i < Rows.Count; i++)
+                {
+                    if (Rows[i].Visible == true)
+                        _VisibleRowCount++;
+                }
+
+                _FilteredRowCount = 0;
+
+                if (IsFiltered == true)
+                {
+                    for (int i = 0; i < Rows.Count; i++)
+                    {
+                        GridRow row = Rows[i] as GridRow;
+
+                        if (row != null)
+                        {
+                            if (row.RowFilteredOut == true)
+                                _FilteredRowCount++;
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region ClearAllFilters
+
+        ///<summary>
+        /// Clears all panel and column level filters
+        ///</summary>
+        public void ClearAllFilters()
+        {
+            ClearAllFilters(true, true);
+        }
+
+        ///<summary>
+        /// Clears all panel and column level filters, as specified.
+        ///</summary>
+        public void ClearAllFilters(
+            bool clearPanelFilter, bool clearColumnFilters)
+        {
+            if (clearPanelFilter == true)
+                FilterExpr = null;
+
+            if (clearColumnFilters == true)
+            {
+                if (Columns != null)
+                {
+                    foreach (GridColumn col in Columns)
+                        col.FilterExpr = null;
+                }
+            }
+        }
+
+        #endregion
+
+        #region ClearColumnFilterEvals
+
+        internal void ClearColumnFilterEvals()
+        {
+            _FilterEval = null;
+
+            if (_Columns != null)
+            {
+                foreach (GridColumn col in _Columns)
+                    col.FilterEval = null;
+            }
+        }
+
+        #endregion
+
+        #region DetachDataSource
+
+        ///<summary>
+        /// Detaches the grid from the bound DataSource.
+        /// If 'keepData' is true, then the data is kept (but no longer bound) 
+        ///</summary>
+        ///<param name="keepData"></param>
+        public void DetachDataSource(bool keepData)
+        {
+            if (DataSource != null)
+            {
+                if (keepData == true)
+                {
+                    if (IsLayoutValid == false)
+                        SuperGrid.ArrangeGrid();
+
+                    if (VirtualMode == true)
+                    {
+                        VirtualRowCount = 0;
+                    }
+                    else
+                    {
+                        foreach (GridElement item in Rows)
+                        {
+                            GridRow row = item as GridRow;
+
+                            if (row != null)
+                            {
+                                foreach (GridCell cell in row.Cells)
+                                    cell.ValueExx = DataBinder.GetValue(cell, cell.ValueEx);
+                            }
+                        }
+                    }
+                }
+
+                DataSource = null;
+
+                if (keepData == true)
+                {
+                    NeedToUpdateBindings = false;
+                }
+                else
+                {
+                    UpdateDataBindings();
+
+                    if (VirtualMode == false)
+                        Rows.Clear();
+                }
+            }
+        }
+
+        #endregion
+
+        #region UpdateRowPosition
+
+        internal void UpdateRowPosition(GridRow row)
+        {
+            if (KeepRowsSorted == true)
+            {
+                if (_SortColumns != null && _SortColumns.Count > 0)
+                {
+                    RowComparer rc = new RowComparer(_SortColumns);
+
+                    GridContainer cont = (GridContainer)row.Parent;
+
+                    if (RowPositionOk(cont, row, rc) == false)
+                        SortRow(cont, row, rc);
+                }
+            }
+        }
+
+        #region RowPositionOk
+
+        private bool RowPositionOk(
+            GridContainer cont, GridRow row, RowComparer rc)
+        {
+            if (cont.Rows.Count > 1)
+            {
+                GridRow prow = null;
+
+                for (int i = row.RowIndex - 1; i >= 0; --i)
+                {
+                    prow = cont.Rows[i] as GridRow;
+
+                    if (prow != null)
+                        break;
+                }
+
+                if (prow != null)
+                {
+                    if (rc.Compare(prow, row) > 0)
+                        return (false);
+                }
+
+                GridRow nrow = null;
+
+                for (int i = row.RowIndex + 1; i < cont.Rows.Count; i++)
+                {
+                    nrow = cont.Rows[i] as GridRow;
+
+                    if (nrow != null)
+                        break;
+                }
+
+                if (nrow != null)
+                {
+                    if (rc.Compare(nrow, row) < 0)
+                        return (false);
+                }
+            }
+
+            return (true);
+        }
+
+        #endregion
+
+        #region SortRow
+
+        private void SortRow(
+            GridContainer cont, GridRow row, RowComparer rc)
+        {
+            int rowIndex = row.RowIndex;
+
+            try
+            {
+                IsRowMoving = true;
+
+                cont.Rows.RemoveAt(rowIndex);
+
+                row.Parent = cont;
+
+                int newRowIndex = GetRowPosition(cont, row, rc);
+
+                cont.Rows.Insert(newRowIndex, row);
+
+                if (newRowIndex < rowIndex)
+                {
+                    int n = rowIndex;
+                    rowIndex = newRowIndex;
+                    newRowIndex = n;
+                }
+
+                for (int i = rowIndex; i <= newRowIndex; i++)
+                    ((GridContainer)cont.Rows[i]).RowIndex = i;
+
+                if (UseAlternateRowStyle == true)
+                    SuperGrid.UpdateStyleCount();
+            }
+            finally
+            {
+                IsRowMoving = false;
+
+                SuperGrid.NeedToUpdateIndicees = true;
+                ClearAll();
+
+                InvalidateMerge();
+            }
+        }
+
+        #endregion
+
+        #region GetRowPosition
+
+        private int GetRowPosition(
+            GridContainer cont, GridRow row, RowComparer rc)
+        {
+            int lo = 0;
+            int hi = cont.Rows.Count - 1;
+
+            while (lo < hi)
+            {
+                int mid = (lo + hi) / 2;
+
+                GridRow roe = cont.Rows[mid] as GridRow;
+
+                if (roe != null)
+                {
+                    int n = rc.Compare(row, roe);
+
+                    if (n == 0)
+                        return (mid);
+
+                    if (n < 0)
+                        hi = mid - 1;
+                    else
+                        lo = mid + 1;
+                }
+            }
+
+            if ((uint)lo < cont.Rows.Count)
+            {
+                GridRow roe2 = cont.Rows[lo] as GridRow;
+
+                if (roe2 != null)
+                {
+                    if (rc.Compare(row, roe2) > 0)
+                        lo++;
+                }
+            }
+
+            return (lo);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Style support
+
+        #region GetSizingStyle
+
+        internal StyleType GetSizingStyle()
+        {
+            return ((_SizingStyle == StyleType.NotSet)
+                ? SuperGrid.SizingStyle : _SizingStyle);
+        }
+
+        #endregion
+
+        #region DefaultVisualStylesPropertyChanged
+
+        void DefaultVisualStylesPropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            if (SuperGrid != null)
+                SuperGrid.UpdateStyleCount();
+
+            VisualChangeType changeType = ((VisualPropertyChangedEventArgs)e).ChangeType;
+
+            if (changeType == VisualChangeType.Layout)
+            {
+                NeedsMeasured = true;
+
+                InvalidateMerge();
+            }
+            else
+            {
+                InvalidateRender();
+            }
+        }
+
+        #endregion
+
+        #region GetEffectiveStyle
+
+        /// <summary>
+        /// Gets the Effective style used for the panel.
+        /// </summary>
+        /// <returns></returns>
+        public GridPanelVisualStyle GetEffectiveStyle()
+        {
+            ValidateStyle();
+
+            if (_EffectiveStyle == null)
+            {
+                GridPanelVisualStyle style = new GridPanelVisualStyle();
+
+                style.ApplyStyle(SuperGrid.BaseVisualStyles.GridPanelStyle);
+                style.ApplyStyle(SuperGrid.DefaultVisualStyles.GridPanelStyle);
+                style.ApplyStyle(DefaultVisualStyles.GridPanelStyle);
+
+                SuperGrid.DoGetPanelStyleEvent(this, ref style);
+
+                if (style.Background == null || style.Background.IsEmpty == true)
+                    style.Background = new Background(Color.White);
+
+                if (style.Font == null)
+                    style.Font = SystemFonts.DefaultFont;
+
+                _EffectiveStyle = style;
+            }
+
+            return (_EffectiveStyle);
+        }
+
+        #endregion
+
+        #region ApplyCellStyle
+
+        internal void ApplyCellStyle(CellVisualStyle style, StyleType cs)
+        {
+            ValidateStyle();
+
+            if (_EffectiveCellStyles == null)
+                _EffectiveCellStyles = new CellVisualStyles();
+
+            if (_EffectiveCellStyles.IsValid(cs) == false)
+            {
+                CellVisualStyle cstyle = new CellVisualStyle();
+
+                cstyle.ApplyStyle(SuperGrid.BaseVisualStyles.CellStyles[cs]);
+                cstyle.ApplyStyle(SuperGrid.DefaultVisualStyles.CellStyles[cs]);
+                cstyle.ApplyStyle(GridPanel.DefaultVisualStyles.CellStyles[cs]);
+
+                _EffectiveCellStyles[cs] = cstyle;
+            }
+
+            style.ApplyStyle(_EffectiveCellStyles[cs]);
+        }
+
+        #endregion
+
+        #region ApplyMergedCellStyle
+
+        internal void ApplyMergedCellStyle(CellVisualStyle style, StyleType cs)
+        {
+            ValidateStyle();
+
+            if (_EffectiveMergedCellStyles == null)
+                _EffectiveMergedCellStyles = new CellVisualStyles();
+
+            if (_EffectiveMergedCellStyles.IsValid(cs) == false)
+            {
+                CellVisualStyle cstyle = new CellVisualStyle();
+
+                cstyle.ApplyStyle(SuperGrid.BaseVisualStyles.MergedCellStyles[cs]);
+                cstyle.ApplyStyle(SuperGrid.DefaultVisualStyles.MergedCellStyles[cs]);
+                cstyle.ApplyStyle(DefaultVisualStyles.MergedCellStyles[cs]);
+
+                _EffectiveMergedCellStyles[cs] = cstyle;
+            }
+
+            style.ApplyStyle(_EffectiveMergedCellStyles[cs]);
+        }
+
+        #endregion
+
+        #region ValidateStyle
+
+        private void ValidateStyle()
+        {
+            if (_StyleUpdateCount != SuperGrid.StyleUpdateCount)
+            {
+                _EffectiveStyle = null;
+                _EffectiveCellStyles = null;
+                _EffectiveMergedCellStyles = null;
+
+                ExpandButtonImage = null;
+                ExpandButtonHotImage = null;
+                CollapseButtonImage = null;
+                CollapseButtonHotImage = null;
+
+                _StyleUpdateCount = SuperGrid.StyleUpdateCount;
+            }
+        }
+
+        #endregion
+
+        #region InvalidateStyle
+
+        ///<summary>
+        ///Invalidates the cached Style definition
+        ///</summary>
+        public override void InvalidateStyle()
+        {
+            if (SuperGrid != null)
+                _StyleUpdateCount = (ushort)(SuperGrid.StyleUpdateCount - 1);
+
+            base.InvalidateStyle();
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Markup support
+
+        private void NoRowsMarkupTextChanged()
+        {
+            _NoRowsMarkup = null;
+
+            if (EnableNoRowsMarkup == true)
+            {
+                if (MarkupParser.IsMarkup(_NoRowsText) == true)
+                {
+                    _NoRowsMarkup = MarkupParser.Parse(_NoRowsText);
+
+                    if (_NoRowsMarkup != null)
+                        _NoRowsMarkup.HyperLinkClick += NoRowsMarkupLinkClick;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Occurs when a text markup link is clicked
+        /// </summary>
+        protected virtual void NoRowsMarkupLinkClick(object sender, EventArgs e)
+        {
+            HyperLink link = sender as HyperLink;
+
+            SuperGrid.DoNoRowsMarkupLinkClickEvent(this, link);
+        }
+
+        /// <summary>
+        /// Gets plain text without text-markup (if text-markup is used in NoRowsText)
+        /// </summary>
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public string NoRowsPlainText
+        {
+            get { return (_NoRowsMarkup != null ? _NoRowsMarkup.PlainText : _NoRowsText); }
+        }
+
+        #endregion
+
+        #region SetHeaderTooltip
+
+        internal void SetHeaderTooltip(GridElement item,
+            object header, HeaderArea hitArea, string toolTip)
+        {
+            bool cancel = true;
+
+            if (header is GridColumn)
+                cancel = SuperGrid.DoGetColumnHeaderToolTipEvent(this, (GridColumn)header, hitArea, ref toolTip);
+
+            else if (header is ColumnGroupHeader)
+                cancel = SuperGrid.DoGetColumnGroupHeaderToolTipEvent(this, (ColumnGroupHeader)header, hitArea, ref toolTip);
+
+            if (cancel == false)
+            {
+                if (SuperGrid.ToolTipText != toolTip)
+                    SuperGrid.ToolTip.Hide(SuperGrid);
+
+                SuperGrid.ToolTipText = toolTip;
+            }
+            else
+            {
+                SuperGrid.ToolTipText = "";
+            }
+        }
+
+        #endregion
+
+        #region GenerateColumns
+
+        /// <summary>
+        /// Generates base column definitions from the associated DataSource.
+        /// Note that all previous column definitions are left unaltered.
+        /// </summary>
+        public void GenerateColumns()
+        {
+            GenerateColumns(null);
+        }
+
+        /// <summary>
+        /// Generates column definitions from the associated DataSource, utilizing
+        /// the provided callback to perform the actual creation of the associated GridColumn.
+        /// </summary>
+        public void GenerateColumns(GetNewGridColumn callBack)
+        {
+            DataBinder.AutoGenerateColumns(callBack);
+        }
+
+        #endregion
+
+        #region ToString
+
+        /// <summary>
+        /// ToString
+        /// </summary>
+        /// <returns></returns>
+        public override string ToString()
+        {
+            string s = base.ToString();
+
+            if (String.IsNullOrEmpty(_Name) == false)
+                s += ": (\"" + _Name + "\")";
+
+            return (s);
+        }
+
+        #endregion
+
+        #region PanelStates
+
+        #region Psi (Panel States - Property 0)
+
+        [Flags]
+        private enum Psp0 : uint
+        {
+            AllowEdit = (1U << 0),
+            AllowEmptyCellSelection = (1U << 1),
+            AllowNullCellMerge = (1U << 2),
+
+            AllowRowDelete = (1U << 3),
+            AllowRowHeaderResize = (1U << 4),
+            AllowRowInsert = (1U << 5),
+            AllowRowResize = (1U << 6),
+
+            AutoExpandSetGroup = (1U << 7),
+            AutoGenerateColumns = (1U << 8),
+            AutoHideDeletedRows = (1U << 9),
+            AutoSelectDeleteBoundRows = (1U << 10),
+            AutoSelectNewBoundRows = (1U << 11),
+
+            CheckBoxes = (1U << 12),
+
+            EnableCellExpressions = (1U << 13),
+            EnableCellMerging = (1U << 14),
+            EnableCellRangeMarkup = (1U << 15),
+            EnableColumnFiltering = (1U << 16),
+            EnableDiscreteBoundRows = (1U << 17),
+            EnableFiltering = (1U << 18),
+            EnableNoRowsMarkup = (1U << 19),
+            EnableRowFiltering = (1U << 20),
+            EnableSelectionBuffering = (1U << 21),
+
+            UseAlternateColumnStyle = (1U << 22),
+            UseAlternateRowStyle = (1U << 23),
+        }
+
+        #endregion
+
+        #region Psi (Panel States - Property 1)
+
+        [Flags]
+        private enum Psp1 : uint
+        {
+            EnsureVisibleAfterSort = (1U << 0),
+            EnsureVisibleAfterGrouping = (1U << 1),
+
+            EnterKeySelectsNextRow = (1U << 2),
+            FilterIgnoreMatchCase = (1U << 3),
+            FocusCuesEnabled = (1U << 4),
+            ImmediateResize = (1U << 5),
+            IndentGroups = (1U << 6),
+            KeepRowsSorted = (1U << 7),
+            MultiSelect = (1U << 8),
+            OnlySendFinalRowActivatedEvents = (1U << 9),
+
+            ShowCellInfo = (1U << 10),
+            ShowDropShadow = (1U << 11),
+            ShowEditingImage = (1U << 12),
+            ShowGroupExpand = (1U << 13),
+            ShowGroupUnderline = (1U << 14),
+            ShowInsertRowImage = (1U << 15),
+            ShowRowHeaders = (1U << 16),
+            ShowRowInfo = (1U << 17),
+            ShowRowGridIndex = (1U << 18),
+            ShowRowDirtyMarker = (1U << 19),
+            ShowInsertRow = (1U << 20),
+            ShowToolTips = (1U << 21),
+            ShowTreeButtons = (1U << 22),
+            ShowTreeLines = (1U << 23),
+            ShowWhitespaceRowLines = (1U << 24),
+
+            SortUsingHiddenColumns = (1U << 25),
+            VirtualMode = (1U << 26),
+        }
+
+        #endregion
+
+        #region Psi (Panel States - Internal)
+
+        [Flags]
+        private enum Psi : uint
+        {
+            EnsureRowVisible = (1 << 0),
+
+            InRangeAdd = (1 << 1),
+            IsRowMoving = (1 << 2),
+            IsSorting = (1 << 3),
+
+            LoadInsertRow = (1 << 4),
+
+            NeedsFilterScan = (1 << 5),
+            NeedsGrouped = (1 << 6),
+            NeedsGroupSorted = (1 << 7),
+            NeedsSorted = (1 << 8),
+
+            NeedToUpdateBindings = (1 << 9),
+            NeedToUpdateDataFilter = (1 << 10),
+
+            PreActiveRowDirty = (1 << 11),
+            ReselectActiveItem = (1 << 12),
+            SelectActiveRow = (1 << 13),
+
+            NeedToUpdateBoundData = (1 << 14),
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IDispose
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        public override void Dispose()
+        {
+            DataBinder = null;
+
+            ExpandButtonImage = null;
+            ExpandButtonHotImage = null;
+            CollapseButtonImage = null;
+            CollapseButtonHotImage = null;
+
+            Rows = null;
+
+            if (_Columns != null)
+                _Columns.CollectionChanged -= ColumnsCollectionChanged;
+
+            base.Dispose();
+        }
+
+        #endregion
+    }
+
+    #region Attributes
+
+    /// <summary>
+    /// Attribute to control the visibility of individual fields
+    /// or properties in an IList data source to the SuperGrid.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Field | AttributeTargets.Property)]
+    public class IsVisibleToSuperGrid : Attribute
+    {
+        private bool _Visible;
+
+        /// <summary>
+        /// IsVisibleToSuperGrid
+        /// </summary>
+        /// <param name="visible"></param>
+        public IsVisibleToSuperGrid(bool visible)
+        {
+            _Visible = visible;
+        }
+
+        /// <summary>
+        /// Visible
+        /// </summary>
+        public bool Visible
+        {
+            get { return (_Visible); }
+            set { _Visible = value; }
+        }
+    }
+
+    #endregion
+
+    #region Delegates
+
+    public delegate GridColumn GetNewGridColumn();
+
+    #endregion
+
+    #region enums
+
+    #region ActiveRowIndicatorStyle
+
+    ///<summary>
+    /// ActiveRowIndicatorStyle
+    ///</summary>
+    public enum ActiveRowIndicatorStyle
+    {
+        ///<summary>
+        /// No indicator will be displayed.
+        ///</summary>
+        None,
+
+        ///<summary>
+        /// An image will be displayed.
+        ///</summary>
+        Image,
+
+        ///<summary>
+        /// The Row Header will be highlighted.
+        ///</summary>
+        Highlight,
+
+        ///<summary>
+        /// An image will be displayed and the
+        /// Row Header will be highlighted.
+        ///</summary>
+        Both,
+    }
+
+    #endregion
+
+    #region CellDragBehavior
+
+    ///<summary>
+    /// Specifies the resultant behavior
+    /// of clicking and dragging on a grid cell
+    ///</summary>
+    public enum CellDragBehavior
+    {
+        ///<summary>
+        /// Dragging will have no effect
+        ///</summary>
+        None,
+
+        ///<summary>
+        /// Dragging will extend the selection
+        ///</summary>
+        ExtendSelection,
+    }
+
+    #endregion
+
+    #region ColumnHeaderClickBehavior
+
+    ///<summary>
+    /// Specifies the resultant behavior
+    /// of clicking on a column header
+    ///</summary>
+    public enum ColumnHeaderClickBehavior
+    {
+        ///<summary>
+        /// Clicking on a column header will have no effect
+        ///</summary>
+        None,
+
+        ///<summary>
+        /// Clicking on a column header will select the
+        /// column, and dragging will extend the selection
+        /// if ColumnDragBehavior is set to ExtendClickBehavior
+        ///</summary>
+        Select,
+
+        ///<summary>
+        /// Clicking on a column header will sort the grid using
+        /// that column, or will reorder the column if ColumnDragBehavior
+        /// is set to ExtendClickBehavior
+        ///</summary>
+        SortAndReorder,
+    }
+
+    #endregion
+
+    #region ColumnDragBehavior
+
+    ///<summary>
+    /// Specifies the resultant behavior
+    /// of dragging a column header
+    ///</summary>
+    public enum ColumnDragBehavior
+    {
+        ///<summary>
+        /// Dragging on a column header will have no effect
+        ///</summary>
+        None,
+
+        ///<summary>
+        /// Dragging a column header will
+        /// extend the set ColumnHeaderClickBehavior
+        ///</summary>
+        ExtendClickBehavior,
+    }
+
+    #endregion
+
+    #region FilterLevel
+
+    /// <summary>
+    /// FilterLevel
+    /// </summary>
+    [Flags]
+    public enum FilterLevel
+    {
+        /// <summary>
+        /// No data filtered
+        /// </summary>
+        None = 0,
+
+        /// <summary>
+        /// Root level data filtered
+        /// </summary>
+        Root = (1 << 0),
+
+        /// <summary>
+        /// Root level data filtered
+        /// conditional upon Rows collection being empty
+        /// </summary>
+        RootConditional = (1 << 1),
+
+        /// <summary>
+        /// Expanded level data filtered
+        /// </summary>
+        Expanded = (1 << 2),
+
+        /// <summary>
+        /// All data filtered
+        /// </summary>
+        All = (Root | Expanded),
+
+        /// <summary>
+        /// All data filtered, Root Level data filtered
+        /// conditional upon Rows collection being empty
+        /// </summary>
+        AllConditional = (RootConditional | Expanded),
+    }
+
+    #endregion
+
+    #region FilterMatchType
+
+    ///<summary>
+    /// Specifies what match style to use when filtering data elements
+    ///</summary>
+    public enum FilterMatchType
+    {
+        ///<summary>
+        /// Not set
+        ///</summary>
+        NotSet,
+
+        ///<summary>
+        /// No special matching
+        ///</summary>
+        None,
+
+        ///<summary>
+        /// Regular Expression matching
+        ///</summary>
+        RegularExpressions,
+
+        ///<summary>
+        /// Wildcard matching
+        ///</summary>
+        Wildcards,
+    }
+
+    #endregion
+
+    #region GridLines
+
+    ///<summary>
+    /// Specifies which grid lines are displayed
+    ///</summary>
+    public enum GridLines
+    {
+        ///<summary>
+        /// No grid lines are displayed
+        ///</summary>
+        None,
+
+        ///<summary>
+        /// Only horizontal grid lines are displayed
+        ///</summary>
+        Horizontal,
+
+        ///<summary>
+        /// Only vertical grid lines are displayed
+        ///</summary>
+        Vertical,
+
+        ///<summary>
+        /// Both horizontal and vertical grid lines are displayed
+        ///</summary>
+        Both,
+    }
+
+    #endregion
+
+    #region GroupChangedAction
+
+    ///<summary>
+    /// Specifies how the panel grouping has changed
+    ///</summary>
+    public enum GroupChangedAction
+    {
+        ///<summary>
+        /// Group added
+        ///</summary>
+        Add,
+
+        ///<summary>
+        /// Group removed
+        ///</summary>
+        Remove,
+
+        ///<summary>
+        /// Reset - all items cleared
+        ///</summary>
+        Reset,
+    }
+
+    #endregion
+
+    #region GroupHeaderClickBehavior
+
+    ///<summary>
+    /// Specifies the behavior when a user
+    /// clicks on a group header
+    ///</summary>
+    public enum GroupHeaderClickBehavior
+    {
+        ///<summary>
+        /// Clicking on a group header will have no effect
+        ///</summary>
+        None,
+
+        ///<summary>
+        /// Clicking on a header will
+        /// expand or collapse the group
+        ///</summary>
+        ExpandCollapse,
+
+        ///<summary>
+        /// Clicking on a group heading will select the header
+        ///</summary>
+        Select,
+
+        ///<summary>
+        /// Clicking on a group heading will
+        /// select all the first-level rows contained in the group
+        ///</summary>
+        SelectAll,
+    }
+
+    #endregion
+
+    #region GroupHeaderKeyBehavior
+
+    ///<summary>
+    /// Specifies the behavior when a user
+    /// moves via the keyboard onto a group header
+    ///</summary>
+    public enum GroupHeaderKeyBehavior
+    {
+        ///<summary>
+        /// Header will be skipped
+        ///</summary>
+        Skip,
+
+        ///<summary>
+        /// Header will be selected
+        ///</summary>
+        Select,
+    }
+
+    #endregion
+
+    #region GroupSortElement
+
+    ///<summary>
+    /// Specifies the group element used to sort panel groups.
+    ///</summary>
+    public enum GroupSortElement
+    {
+        ///<summary>
+        /// Sort by Group Id
+        GroupId,
+
+        ///<summary>
+        /// Sort by Group Text
+        ///</summary>
+        GroupText,
+
+        ///<summary>
+        /// Sort by associated cell Value
+        ///</summary>
+        CellValue,
+    }
+
+    #endregion
+
+    #region KeyboardEditMode
+
+    ///<summary>
+    /// Which keyboard actions will start a cell edit operation
+    ///</summary>
+    public enum KeyboardEditMode
+    {
+        ///<summary>
+        /// No keyboard action will initiate an edit
+        ///</summary>
+        None,
+
+        ///<summary>
+        /// Edit initiated when any alphanumeric key
+        /// is pressed while the cell has focus
+        ///</summary>
+        EditOnKeystroke,
+
+        ///<summary>
+        /// Edit initiated when F2 is pressed while the cell
+        /// has focus. This mode places the selection point at
+        /// the end of the cell contents
+        ///</summary>
+        EditOnF2,
+
+        ///<summary>
+        /// Editing begins when any alphanumeric key
+        /// or F2 is pressed while the cell has focus
+        ///</summary>
+        EditOnKeystrokeOrF2,
+
+        ///<summary>
+        /// Editing begins on entry to a cell
+        ///</summary>
+        EditOnEntry
+    }
+
+    #endregion
+
+    #region MouseEditMode
+
+    ///<summary>
+    /// Which mouse actions will start a cell edit operation
+    ///</summary>
+    public enum MouseEditMode
+    {
+        ///<summary>
+        /// No mouse action will initiate an edit
+        ///</summary>
+        None,
+
+        ///<summary>
+        /// Single clicking a cell will initiate an edit
+        ///</summary>
+        SingleClick,
+
+        ///<summary>
+        /// Double clicking a cell will initiate an edit
+        ///</summary>
+        DoubleClick,
+    }
+
+    #endregion
+
+    #region NestedListScanTypes
+
+    ///<summary>
+    /// Specifies what IList "types" are scanned when looking
+    /// for possible "child" sub-panel IList entries.
+    ///</summary>
+    [Flags]
+    public enum NestedListScanTypes
+    {
+        ///<summary>
+        /// No IList "types" are scanned
+        ///</summary>
+        None = 0,
+
+        ///<summary>
+        /// IList "Fields" are scanned
+        ///</summary>
+        Fields = (1 << 0),
+
+        ///<summary>
+        /// IList "Properties" are scanned
+        ///</summary>
+        Properties = (1 << 1),
+
+        ///<summary>
+        /// Both IList "Fields" and "Properties" are scanned
+        ///</summary>
+        FieldsAndProperties = (Fields | Properties),
+    }
+
+    #endregion
+
+    #region NullValue
+
+    ///<summary>
+    /// Specifies how null values are interpreted 
+    ///</summary>
+    public enum NullValue
+    {
+        ///<summary>
+        /// A null is interpreted to be a null object reference
+        ///</summary>
+        NullReference,
+
+        ///<summary>
+        /// A null is interpreted to be an instance of DBNull.Value
+        ///</summary>
+        DBNull,
+    }
+
+    #endregion
+
+    #region PanelArea
+
+    ///<summary>
+    /// PanelArea
+    ///</summary>
+    public enum PanelArea
+    {
+        ///<summary>
+        /// In Content
+        ///</summary>
+        InContent,
+
+        ///<summary>
+        /// In WhiteSpace
+        ///</summary>
+        InWhiteSpace,
+    }
+
+    #endregion
+
+    #region ProcessChildRelations
+
+    ///<summary>
+    /// Specifies the conditions under which
+    /// encountered child relations will be processed 
+    ///</summary>
+    public enum ProcessChildRelations
+    {
+        ///<summary>
+        /// Always
+        ///</summary>
+        Always,
+
+        ///<summary>
+        /// Never
+        ///</summary>
+        Never,
+
+        ///<summary>
+        /// Only when data present
+        ///</summary>
+        WhenDataPresent,
+    }
+
+    #endregion
+
+    #region RelativeRow
+
+    ///<summary>
+    /// Relative row (cardinality)
+    ///</summary>
+    public enum RelativeRow
+    {
+        ///<summary>
+        /// No Row
+        ///</summary>
+        None,
+
+        ///<summary>
+        /// First Row
+        ///</summary>
+        FirstRow,
+
+        ///<summary>
+        /// Insertion Row
+        ///</summary>
+        InsertionRow,
+
+        ///<summary>
+        /// Last Row
+        ///</summary>
+        LastRow,
+    }
+
+    #endregion
+
+    #region RelativeSelection
+
+    ///<summary>
+    /// RelativeSelection
+    ///</summary>
+    public enum RelativeSelection
+    {
+        ///<summary>
+        /// None
+        ///</summary>
+        None,
+
+        ///<summary>
+        /// FirstCell
+        ///</summary>
+        FirstCell,
+
+        ///<summary>
+        /// LastCell
+        ///</summary>
+        LastCell,
+
+        ///<summary>
+        /// PrimaryCell
+        ///</summary>
+        PrimaryCell,
+
+        ///<summary>
+        /// Row
+        ///</summary>
+        Row,
+    }
+
+    #endregion
+
+    #region RowDragBehavior
+
+    ///<summary>
+    /// Specifies the resultant behavior
+    /// of clicking and dragging on a row header
+    ///</summary>
+    public enum RowDragBehavior
+    {
+        ///<summary>
+        /// Dragging on a row header will have no effect
+        ///</summary>
+        None,
+
+        ///<summary>
+        /// Dragging a row header will extend the selection
+        ///</summary>
+        ExtendSelection,
+
+        ///<summary>
+        /// Dragging a row header will initiate a row move that
+        /// will be constrained to stay within the current group.
+        ///</summary>
+        Move,
+
+        ///<summary>
+        /// Dragging a row header will initiate a row move that
+        /// can cross group row boundaries
+        ///</summary>
+        GroupMove,
+    }
+
+    #endregion
+
+    #region RowEditMode
+
+    ///<summary>
+    /// Defines whether editing is initiated on the primary cell
+    /// or the cell under the mouse when row level editing is enabled
+    ///</summary>
+    public enum RowEditMode
+    {
+        ///<summary>
+        /// Initiate edit on PrimaryCell
+        ///</summary>
+        PrimaryCell,
+
+        ///<summary>
+        /// Initiate edit on clicked cell
+        ///</summary>
+        ClickedCell,
+    }
+
+    #endregion
+
+    #region RowFocusMode
+
+    ///<summary>
+    /// Defines what portion of the row is "focused".
+    /// Default is "FullRow"
+    /// 
+    ///</summary>
+    public enum RowFocusMode
+    {
+        ///<summary>
+        /// Full row will be focused
+        ///</summary>
+        FullRow,
+
+        ///<summary>
+        /// Only cells will be focused
+        ///</summary>
+        CellsOnly,
+    }
+
+    #endregion
+
+    #region RowHighlightType
+
+    ///<summary>
+    /// Specifies the type of highlighting
+    /// to employ when a grid row is selected
+    ///</summary>
+    public enum RowHighlightType
+    {
+        ///<summary>
+        /// No highlighting
+        ///</summary>
+        None,
+
+        ///<summary>
+        /// Entire row will be Highlighted
+        ///</summary>
+        Full,
+
+        ///<summary>
+        /// Only the PrimaryColumn
+        /// cell contents will be Highlighted
+        ///</summary>
+        PrimaryColumnOnly,
+    }
+
+    #endregion
+
+    #region RowWhitespaceClickBehavior
+
+    ///<summary>
+    /// Specifies the resultant behavior
+    /// of clicking in the row whitespace area
+    ///</summary>
+    public enum RowWhitespaceClickBehavior
+    {
+        ///<summary>
+        /// No effect
+        ///</summary>
+        None,
+
+        ///<summary>
+        /// Current selection is cleared
+        ///</summary>
+        ClearSelection,
+
+        ///<summary>
+        /// Extends the row selection
+        ///</summary>
+        ExtendSelection,
+    }
+
+    #endregion
+
+    #region SelectionGranularity
+
+    ///<summary>
+    /// Determines whether row or cell selection is permitted with in the grid
+    ///</summary>
+    public enum SelectionGranularity
+    {
+        ///<summary>
+        /// Individual cells may be selected
+        ///</summary>
+        Cell,
+
+        ///<summary>
+        /// Only entire rows may be selected
+        ///</summary>
+        Row,
+
+        ///<summary>
+        /// Only entire rows may be selected, but individual
+        /// cells will be highlighted when mouse is over cell.
+        ///</summary>
+        RowWithCellHighlight
+    }
+
+    #endregion
+
+    #region ShowCellInfoDisplayMode
+
+    ///<summary>
+    /// ShowCellInfoDisplayMode
+    ///</summary>
+    public enum ShowCellInfoDisplayMode
+    {
+        ///<summary>
+        /// Info Image will only be shown when the associated
+        /// InfoText value is non-empty (null or zero length).
+        ///</summary>
+        ShowWithNonEmptyText,
+
+        ///<summary>
+        /// Info Image will be shown when the associated
+        /// InfoText value is any value (empty or not).
+        ///</summary>
+        ShowWithEmptyText,
+    }
+
+    #endregion
+
+    #region ShowRowInfoDisplayMode
+
+    ///<summary>
+    /// ShowRowInfoDisplayMode
+    ///</summary>
+    public enum ShowRowInfoDisplayMode
+    {
+        ///<summary>
+        /// Info Image will only be shown when the associated
+        /// InfoText value is non-empty (null or zero length).
+        ///</summary>
+        ShowWithNonEmptyText,
+
+        ///<summary>
+        /// Info Image will be shown when the associated
+        /// InfoText value is any value (empty or not).
+        ///</summary>
+        ShowWithEmptyText,
+    }
+
+    #endregion
+
+    #region SortCycle
+
+    /// <summary>
+    /// SortCycle
+    /// </summary>
+    public enum SortCycle
+    {
+        /// <summary>
+        /// Not Set (default is AscDesc)
+        /// </summary>
+        NotSet,
+
+        /// <summary>
+        /// Cycles between Ascending and Descending
+        /// </summary>
+        AscDesc,
+
+        /// <summary>
+        /// Cycles between Ascending, Descending, and None
+        /// </summary>
+        AscDescNone,
+
+    }
+
+    #endregion
+
+    #region SortDirection
+
+    /// <summary>
+    /// SortDirection
+    /// </summary>
+    public enum SortDirection
+    {
+        /// <summary>
+        /// No sorting
+        /// </summary>
+        None,
+
+        /// <summary>
+        /// Ascending
+        /// </summary>
+        Ascending,
+
+        /// <summary>
+        /// Descending
+        /// </summary>
+        Descending
+    }
+
+    #endregion
+
+    #region SortLevel
+
+    /// <summary>
+    /// SortLevel
+    /// </summary>
+    [Flags]
+    public enum SortLevel
+    {
+        /// <summary>
+        /// No data sorting
+        /// </summary>
+        None = 0,
+
+        /// <summary>
+        /// Root level data
+        /// </summary>
+        Root = (1 << 0),
+
+        /// <summary>
+        /// Expanded level data
+        /// </summary>
+        Expanded = (1 << 1),
+
+        /// <summary>
+        /// All data
+        /// </summary>
+        All = (Root | Expanded),
+    }
+
+    #endregion
+
+    #region TopLeftHeaderSelectBehavior
+
+    ///<summary>
+    /// TopLeftHeaderSelectBehavior
+    ///</summary>
+    public enum TopLeftHeaderSelectBehavior
+    {
+        ///<summary>
+        /// No selection
+        ///</summary>
+        NoSelection,
+
+        ///<summary>
+        /// No selection
+        ///</summary>
+        SelectAllCells,
+
+        ///<summary>
+        /// All columns will be selected
+        ///</summary>
+        SelectAllColumns,
+
+        ///<summary>
+        /// All rows will be selected
+        ///</summary>
+        SelectAllRows,
+
+        ///<summary>
+        /// Element selection will be determined by
+        /// the current set SelectionGranularity
+        ///</summary>
+        Deterministic,
+    }
+
+    #endregion
+
+    #region WhitespaceClickBehavior
+
+    ///<summary>
+    /// Specifies the resultant behavior
+    /// of clicking in the grid panel whitespace area
+    ///</summary>
+    public enum WhitespaceClickBehavior
+    {
+        ///<summary>
+        /// No effect
+        ///</summary>
+        None,
+
+        ///<summary>
+        /// Current selection is cleared
+        ///</summary>
+        ClearSelection,
+    }
+
+    #endregion
+
+    #endregion
+
+    #region IEnumeration
+
+    #region FlatEnumeration
+
+    internal class FlatEnumeration : IEnumerator, IEnumerable
+    {
+        #region Private variables
+
+        private GridPanel _Panel;
+
+        private int _CurIndex;
+        private GridContainer _CurItem;
+        private GridContainer _CurContainer;
+
+        private Stack<int> _IndexStack;
+        private Stack<GridContainer> _ContStack;
+
+        #endregion
+
+        public FlatEnumeration(GridPanel panel)
+        {
+            _Panel = panel;
+
+            Reset();
+        }
+
+        #region Protected properties
+
+        protected GridContainer CurItem
+        {
+            get { return (_CurItem); }
+        }
+
+        #endregion
+
+        #region IEnumerable support
+
+        #region MoveNext
+
+        public bool MoveNext()
+        {
+            PushCurItem();
+
+            while (GetNextItem() == false)
+            {
+                if (_ContStack.Count <= 0)
+                    return (false);
+
+                PopCurItem();
+            }
+
+            return (true);
+        }
+
+        #region GetNextItem
+
+        private bool GetNextItem()
+        {
+            if (_Panel.VirtualMode == true)
+            {
+                while (++_CurIndex < _Panel.VirtualRowCount)
+                {
+                    _CurItem = _Panel.VirtualRows[_CurIndex] as GridContainer;
+
+                    if (_CurItem != null)
+                    {
+                        if (MatchedItem() == true)
+                            return (true);
+
+                        PushCurItem();
+                    }
+                }
+            }
+            else
+            {
+                while (++_CurIndex < _CurContainer.Rows.Count)
+                {
+                    _CurItem = _CurContainer.Rows[_CurIndex] as GridContainer;
+
+                    if (_CurItem != null)
+                    {
+                        if (MatchedItem() == true)
+                            return (true);
+
+                        PushCurItem();
+                    }
+                }
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region MatchedItem
+
+        public virtual bool MatchedItem()
+        {
+            return (true);
+        }
+
+        #endregion
+
+        #region CheckNested
+
+        public virtual bool CheckNested()
+        {
+            return (true);
+        }
+
+        #endregion
+
+        #region PushCurItem
+
+        private void PushCurItem()
+        {
+            if (_CurItem != null)
+            {
+                if (_Panel.VirtualMode == false && _CurItem.Rows.Count > 0)
+                {
+                    if (CurItem.RowsUnresolved == false && CheckNested() == true)
+                    {
+                        _ContStack.Push(_CurContainer);
+                        _IndexStack.Push(_CurIndex);
+
+                        _CurIndex = -1;
+                        _CurContainer = _CurItem;
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region PopCurItem
+
+        private void PopCurItem()
+        {
+            _CurContainer = _ContStack.Pop();
+            _CurIndex = _IndexStack.Pop();
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Reset
+
+        public void Reset()
+        {
+            _CurIndex = -1;
+            _CurItem = null;
+            _CurContainer = _Panel;
+
+            _IndexStack = new Stack<int>();
+            _ContStack = new Stack<GridContainer>();
+        }
+
+        #endregion
+
+        #region Current
+
+        public object Current
+        {
+            get { return (_CurItem); }
+        }
+
+        #endregion
+
+        #region GetEnumerator
+
+        public IEnumerator GetEnumerator()
+        {
+            return (this);
+        }
+
+        #endregion
+
+        #endregion
+    }
+
+    #endregion
+
+    #region FlatCheckedRowsEnumeration
+
+    class FlatCheckedRowsEnumeration : FlatEnumeration
+    {
+        #region Private variables
+
+        private bool _InclExpanded;
+
+        #endregion
+
+        public FlatCheckedRowsEnumeration(GridPanel panel, bool inclExpanded)
+            : base(panel)
+        {
+            _InclExpanded = inclExpanded;
+        }
+
+        #region MatchedItem
+
+        public override bool MatchedItem()
+        {
+            return (CurItem.Checked == true && CurItem.IsDeleted == false);
+        }
+
+        #endregion
+
+        #region CheckNested
+
+        public override bool CheckNested()
+        {
+            return (_InclExpanded == true && CurItem.IsDeleted == false);
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region FlatDeletedRowsEnumeration
+
+    class FlatDeletedRowsEnumeration : FlatEnumeration
+    {
+        public FlatDeletedRowsEnumeration(GridPanel panel)
+            : base(panel)
+        {
+        }
+
+        #region MatchedItem
+
+        public override bool MatchedItem()
+        {
+            return (CurItem.IsDeleted);
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region FlatDirtyRowsEnumeration
+
+    class FlatDirtyRowsEnumeration : FlatEnumeration
+    {
+        #region Private variables
+
+        private bool _InclExpanded;
+
+        #endregion
+
+        public FlatDirtyRowsEnumeration(GridPanel panel, bool inclExpanded)
+            : base(panel)
+        {
+            _InclExpanded = inclExpanded;
+        }
+
+        #region MatchedItem
+
+        public override bool MatchedItem()
+        {
+            if (CurItem.IsDeleted == true)
+                return (false);
+
+            if (CurItem is GridRow)
+                return (((GridRow)CurItem).RowDirty);
+
+            return (false);
+        }
+
+        #endregion
+
+        #region CheckNested
+
+        public override bool CheckNested()
+        {
+            return (_InclExpanded == true && CurItem.IsDeleted == false);
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region FlatSelectedRowsEnumeration
+
+    class FlatSelectedRowsEnumeration : FlatEnumeration
+    {
+        #region Private variables
+
+        private bool _InclExpanded;
+
+        #endregion
+
+        public FlatSelectedRowsEnumeration(GridPanel panel, bool inclExpanded)
+            : base(panel)
+        {
+            _InclExpanded = inclExpanded;
+        }
+
+        #region MatchedItem
+
+        public override bool MatchedItem()
+        {
+            return (CurItem.IsSelected == true && CurItem.IsDeleted == false);
+        }
+
+        #endregion
+
+        #region CheckNested
+
+        public override bool CheckNested()
+        {
+            return (_InclExpanded == true && CurItem.IsDeleted == false);
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region FlatRowsEnumeration
+
+    class FlatRowsEnumeration : FlatEnumeration
+    {
+        #region Private variables
+
+        private bool _OnlyExpanded;
+        private bool _OnlyVisible;
+
+        #endregion
+
+        public FlatRowsEnumeration(GridPanel panel, bool onlyExpanded, bool onlyVisible)
+            : base(panel)
+        {
+            _OnlyExpanded = onlyExpanded;
+            _OnlyVisible = onlyVisible;
+        }
+
+        #region MatchedItem
+
+        public override bool MatchedItem()
+        {
+            if (CurItem.IsDeleted == false)
+            {
+                if (_OnlyVisible == false || CurItem.Visible == true)
+                    return (true);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region CheckNested
+
+        public override bool CheckNested()
+        {
+            if (CurItem.IsDeleted == true)
+                return (false);
+
+            return (_OnlyExpanded == false || CurItem.Expanded == true);
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region OnScreenColumnsEnumeration
+
+    class OnScreenColumnsEnumeration : IEnumerator, IEnumerable
+    {
+        #region Private variables
+
+        private GridPanel _Panel;
+
+        private int _CurIndex;
+        private GridColumn _CurItem;
+
+        #endregion
+
+        public OnScreenColumnsEnumeration(GridPanel panel)
+        {
+            _Panel = panel;
+
+            Reset();
+        }
+
+        #region IEnumerable support
+
+        public bool MoveNext()
+        {
+            int[] map = _Panel.Columns.DisplayIndexMap;
+
+            while (++_CurIndex < map.Length)
+            {
+                _CurItem = _Panel.Columns[map[_CurIndex]];
+
+                if (_CurItem.IsOnScreen == true)
+                    return (true);
+            }
+
+            return (false);
+        }
+
+        public void Reset()
+        {
+            _CurIndex = -1;
+        }
+
+        public object Current
+        {
+            get { return (_CurItem); }
+        }
+
+        public IEnumerator GetEnumerator()
+        {
+            return (this);
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region OnScreenRowsEnumeration
+
+    class OnScreenRowsEnumeration : IEnumerator, IEnumerable
+    {
+        #region Private variables
+
+        private GridPanel _Panel;
+
+        private int _CurIndex;
+        private GridContainer _CurItem;
+
+        private int _FirstVisibleRow;
+        private int _LastVisibleRow;
+
+        #endregion
+
+        public OnScreenRowsEnumeration(GridPanel panel)
+        {
+            _Panel = panel;
+
+            _FirstVisibleRow = panel.FirstOnScreenRowIndex;
+            _LastVisibleRow = panel.LastOnScreenRowIndex;
+
+            Reset();
+        }
+
+        #region IEnumerable support
+
+        public bool MoveNext()
+        {
+            _CurIndex = (_CurIndex == -1) ?
+                _FirstVisibleRow : _CurIndex + 1;
+
+            if (_CurIndex <= _LastVisibleRow)
+            {
+                if (_Panel.VirtualMode == true)
+                    _CurItem = _Panel.VirtualRows[_CurIndex];
+                else
+                    _CurItem = (GridContainer)_Panel.Rows[_CurIndex];
+
+                return (true);
+            }
+
+            return (false);
+        }
+
+        public void Reset()
+        {
+            _CurIndex = -1;
+        }
+
+        public object Current
+        {
+            get { return (_CurItem); }
+        }
+
+        public IEnumerator GetEnumerator()
+        {
+            return (this);
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region SelectedEnumeration
+
+    class SelectedEnumeration : IEnumerator, IEnumerable
+    {
+        #region Private variables
+
+        private GridPanel _Panel;
+        private SelectedElements _SelectedElements;
+
+        private int _CurIndex;
+
+        #endregion
+
+        protected SelectedEnumeration(
+            GridPanel panel, SelectedElements selectedElements)
+        {
+            _Panel = panel;
+            _SelectedElements = selectedElements;
+
+            Reset();
+        }
+
+        #region Protected properties
+
+        protected GridPanel Panel
+        {
+            get { return (_Panel); }
+        }
+
+        protected int CurIndex
+        {
+            get { return (_CurIndex); }
+        }
+
+        #endregion
+
+        #region IEnumerable support
+
+        public bool MoveNext()
+        {
+            return (_SelectedElements.GetNextIndex(ref _CurIndex));
+        }
+
+        public void Reset()
+        {
+            _CurIndex = -1;
+        }
+
+        public object Current
+        {
+            get { return (GetCurrent); }
+        }
+
+        protected virtual object GetCurrent
+        {
+            get { return (null); }
+        }
+
+        public IEnumerator GetEnumerator()
+        {
+            return (this);
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region SelectedRowsEnumeration
+
+    class SelectedRowsEnumeration : SelectedEnumeration
+    {
+        public SelectedRowsEnumeration(GridPanel panel, SelectedElements selectedElements)
+            : base(panel, selectedElements)
+        {
+        }
+
+        protected override object GetCurrent
+        {
+            get { return (Panel.GetRowFromIndex(CurIndex)); }
+        }
+    }
+
+    #endregion
+
+    #region SelectedColumnsEnumeration
+
+    class SelectedColumnsEnumeration : SelectedEnumeration
+    {
+        public SelectedColumnsEnumeration(GridPanel panel, SelectedElements selectedElements)
+            : base(panel, selectedElements)
+        {
+        }
+
+        protected override object GetCurrent
+        {
+            get { return (Panel.Columns[CurIndex]); }
+        }
+    }
+
+    #endregion
+
+    #region SelectedCellsEnumeration
+
+    class SelectedCellsEnumeration : IEnumerator, IEnumerable
+    {
+        #region Private variables
+
+        private GridPanel _Panel;
+
+        private int _CurIndex;
+        private int _CurColumnIndex;
+
+        private GridCell _CurGridCell;
+        private GridCell _EmptyCell;
+
+        #endregion
+
+        public SelectedCellsEnumeration(GridPanel panel)
+        {
+            _Panel = panel;
+
+            Reset();
+        }
+
+        #region IEnumerable support
+
+        public bool MoveNext()
+        {
+            if (_CurColumnIndex == -1)
+            {
+                _CurColumnIndex++;
+                _CurIndex = -1;
+            }
+
+            while (_CurColumnIndex < _Panel.Columns.Count)
+            {
+                GridColumn column = _Panel.Columns[_CurColumnIndex];
+
+                while (column.SelectedCells.GetNextIndex(ref _CurIndex) == true)
+                {
+                    GridRow row = _Panel.GetRowFromIndex(_CurIndex) as GridRow;
+
+                    if (row != null)
+                    {
+                        _CurGridCell = row.GetCell(_CurColumnIndex);
+
+                        if (_CurGridCell == null)
+                        {
+                            _EmptyCell = row.GetEmptyCell(_EmptyCell, _CurColumnIndex);
+
+                            if (_EmptyCell != null)
+                            {
+                                _CurGridCell = _EmptyCell;
+
+                                return (true);
+                            }
+                        }
+                        else
+                        {
+                            if (_CurGridCell.AllowSelection == true)
+                                return (true);
+                        }
+                    }
+                }
+
+                _CurColumnIndex++;
+                _CurIndex = -1;
+            }
+
+            return (false);
+        }
+
+        public void Reset()
+        {
+            _CurIndex = -1;
+            _CurColumnIndex = -1;
+        }
+
+        public object Current
+        {
+            get { return (_CurGridCell); }
+        }
+
+        public IEnumerator GetEnumerator()
+        {
+            return (this);
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #endregion
+
+    #region BlankExpandableObjectConverter
+
+    ///<summary>
+    /// BlankExpandableObjectConverter
+    ///</summary>
+    public class BlankExpandableObjectConverter : ExpandableObjectConverter
+    {
+        ///<summary>
+        /// ConvertTo
+        ///</summary>
+        ///<param name="context"></param>
+        ///<param name="culture"></param>
+        ///<param name="value"></param>
+        ///<param name="destinationType"></param>
+        ///<returns></returns>
+        public override object ConvertTo(
+            ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+        {
+            if (destinationType == typeof(string))
+                return (" ");
+
+            return (base.ConvertTo(context, culture, value, destinationType));
+        }
+    }
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridRenderInfo.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridRenderInfo.cs
new file mode 100644
index 00000000..28bf49b7
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridRenderInfo.cs	
@@ -0,0 +1,40 @@
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    /// <summary>
+    /// Provides the rendering information for grid render pass.
+    /// </summary>
+    public class GridRenderInfo
+    {
+        #region Public properties
+
+        /// <summary>
+        /// Gets or sets the reference to Graphics object used for rendering.
+        /// </summary>
+        public readonly Graphics Graphics;
+
+        /// <summary>
+        /// Gets or sets the clip rectangle.
+        /// </summary>
+        public readonly Rectangle ClipRectangle;
+
+        /// <summary>
+        /// Gets or sets whether right-to-left layout is in effect.
+        /// </summary>
+        public bool RightToLeft;
+
+        #endregion
+
+        /// <summary>
+        /// Initializes a new instance of the GridRenderInfo class.
+        /// </summary>
+        /// <param name="graphics">Graphics object</param>
+        /// <param name="clipRectangle">Control clip rectangle</param>
+        public GridRenderInfo(Graphics graphics, Rectangle clipRectangle)
+        {
+            Graphics = graphics;
+            ClipRectangle = clipRectangle;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridRow.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridRow.cs
new file mode 100644
index 00000000..84f3fb16
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridRow.cs	
@@ -0,0 +1,5469 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Text;
+using System.Windows.Forms;
+using System.Windows.Forms.VisualStyles;
+using DevComponents.DotNetBar.SuperGrid.Primitives;
+using DevComponents.DotNetBar.SuperGrid.Style;
+
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    /// <summary>
+    /// Represents a grid row consisting of one or more grid cells.
+    /// </summary>
+    public class GridRow : GridContainer
+    {
+        #region Constants
+
+        private const int SeparatorHeight = 2;
+
+        #endregion
+
+        #region Static data
+
+        private static bool _dragSelection;
+        private static bool _dragStarted;
+
+        private static FloatWindow _separatorFw;
+        private static FloatWindow _headerFw;
+
+        #endregion
+
+        #region Private variables
+
+        private readonly GridCellCollection _Cells;
+
+        private int _AnchorIndex;
+        private int _RowHeight = -1;
+        private int _PreDetailRowHeight = -1;
+        private int _PostDetailRowHeight = -1;
+        private int _EffectivePreDetailRowHeight;
+        private int _EffectivePostDetailRowHeight;
+
+        private Rs _States;
+
+        private RowArea _HitArea;
+        private GridContainer _HitItem;
+        private RowArea _LastArea;
+
+        private RowArea _MouseDownHitArea;
+        private GridContainer _MouseDownHitRow;
+        private Point _MouseDownPoint;
+        private int _MouseDownDelta;
+
+        private GridContainer _SeparatorRow;
+
+        private string _InfoText;
+        private Rectangle _InfoImageBounds;
+        private Rectangle _ExpandButtonBounds;
+
+        private object _DataItem;
+        private int _DataItemIndex = -1;
+
+        private GridCell _EmptyRenderCell;
+        private GridCell _EmptySelectionCell;
+
+        private ushort _ArrangeLayoutCount;
+        private ushort _MeasureCount;
+        private Size _RowHeaderSize;
+
+        private ushort _StyleUpdateCount;
+        private CellVisualStyles _EffectiveCellStyles;
+
+        private CellMergeMode _CellMergeMode = CellMergeMode.NotSet;
+        private GridPanel _AllocPanel;
+
+        #endregion
+
+        #region Constructors
+
+        /// <summary>
+        /// Creates a new GridRow
+        /// </summary>
+        public GridRow()
+        {
+            SetState(Rs.AllowEdit, true);
+            SetState(Rs.Visible, true);
+
+            _Cells = new GridCellCollection();
+            _Cells.CollectionChanged += CellsCollectionChanged;
+        }
+
+        /// <summary>
+        /// Creates a new GridRow
+        /// </summary>
+        /// <param name="text"></param>
+        public GridRow(string text)
+            : this()
+        {
+            GridCell cell = new GridCell();
+            cell.Value = text;
+
+            _Cells.Add(cell);
+        }
+
+        /// <summary>
+        /// Creates a new GridRow
+        /// </summary>
+        /// <param name="cells"></param>
+        public GridRow(IEnumerable<GridCell> cells)
+            : this()
+        {
+            foreach (GridCell cell in cells)
+                _Cells.Add(cell);
+        }
+
+        /// <summary>
+        /// Creates a new GridRow
+        /// </summary>
+        /// <param name="values"></param>
+        public GridRow(IEnumerable<object> values)
+            : this()
+        {
+            foreach (object o in values)
+                _Cells.Add(new GridCell(o));
+        }
+
+        /// <summary>
+        /// Creates a new GridRow
+        /// </summary>
+        /// <param name="values"></param>
+        public GridRow(params object[] values)
+            : this()
+        {
+            foreach (object o in values)
+                _Cells.Add(new GridCell(o));
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region AllowEdit
+
+        /// <summary>
+        /// Gets or sets whether the row cells can be edited by the user. 
+        /// </summary>
+        [DefaultValue(true), Category("Behavior")]
+        [Description("Indicates whether the row cells can be edited by the user.")]
+        public bool AllowEdit
+        {
+            get { return (TestState(Rs.AllowEdit)); }
+
+            set
+            {
+                if (value != AllowEdit)
+                {
+                    SetState(Rs.AllowEdit, value);
+
+                    OnPropertyChanged("AllowEdit");
+                }
+            }
+        }
+
+        #endregion
+
+        #region Bounds
+
+        ///<summary>
+        /// Gets the scroll adjusted bounds of the row
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override Rectangle Bounds
+        {
+            get
+            {
+                GridPanel panel = GridPanel;
+
+                if (panel != null)
+                {
+                    Rectangle r = BoundsRelative;
+
+                    if (panel.IsSubPanel == true)
+                        r.X -= HScrollOffset;
+
+                    if (IsVFrozen == false)
+                        r.Y -= VScrollOffset;
+
+                    r.Height = FixedRowHeight;
+
+                    return (r);
+                }
+
+                return (Rectangle.Empty);
+            }
+        }
+
+        #endregion
+
+        #region Checked
+
+        ///<summary>
+        /// Gets or sets the row CheckBox checked state
+        ///</summary>
+        [DefaultValue(false), Category("Appearance")]
+        [Description("Indicates the row CheckBox checked state.")]
+        public override bool Checked
+        {
+            get { return (base.Checked); }
+
+            set
+            {
+                if (Checked != value)
+                {
+                    base.Checked = value;
+
+                    RowCheckChanged = true;
+                }
+            }
+        }
+
+        #endregion
+
+        #region Cells
+
+        /// <summary>
+        /// Gets a reference to the Cells collection. Cells in the
+        /// Cells member are not allocated by default, but are only
+        /// done so if the cell Values are provided to the GridRow
+        /// constructor at row allocation time. Row cells can be allocated
+        /// later, and assigned (or added) to the current Cells collection.
+        /// Cells are sequentially allocated, thus you can not allocate and
+        /// assign Cell 10 without also having allocated and assigned cells 0 - 9.
+        /// </summary>
+        [DefaultValue(null), Category("Data")]
+        [Description("Indicates a reference to the Cells collection.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public GridCellCollection Cells
+        {
+            get { return (_Cells); }
+        }
+
+        #endregion
+
+        #region DataItem
+
+        ///<summary>
+        /// Gets the object to which the row is bound.
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public object DataItem
+        {
+            get { return (_DataItem); }
+            internal set { _DataItem = value; }
+        }
+
+        #endregion
+
+        #region EditorDirty
+
+        ///<summary>
+        /// Gets or sets whether the value being edited has changed.
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool EditorDirty
+        {
+            get { return (TestState(Rs.EditorDirty)); }
+
+            set
+            {
+                if (EditorDirty != value)
+                {
+                    SetState(Rs.EditorDirty, value);
+
+                    GridPanel panel = GridPanel;
+
+                    if (panel != null)
+                    {
+                        if (value == false)
+                        {
+                            SetState(Rs.RowDirty, true);
+                            SetState(Rs.RowNeedsStored, true);
+                        }
+                        else
+                        {
+                            ProcessNewRowChange(panel);
+                        }
+
+                        InvalidateRowHeader();
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region EffectivePreDetailRowHeight
+
+        ///<summary>
+        /// Gets the effective height of the "pre detail" portion of the
+        /// row (the area at the bottom of the row).
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public int EffectivePreDetailRowHeight
+        {
+            get { return (_EffectivePreDetailRowHeight); }
+        }
+
+        #endregion
+
+        #region EffectivePostDetailRowHeight
+
+        ///<summary>
+        /// Gets the effective height of the "post detail" portion of the
+        /// row (the area at the bottom of the row).
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public int EffectivePostDetailRowHeight
+        {
+            get { return (_EffectivePostDetailRowHeight); }
+        }
+
+        #endregion
+
+        #region FirstFrozenCell
+
+        /// <summary>
+        /// Gets a reference to the first Frozen cell
+        /// or null if there is none.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public GridCell FirstFrozenCell
+        {
+            get
+            {
+                GridPanel panel = GridPanel;
+
+                if (panel != null)
+                {
+                    GridColumn column = panel.FirstFrozenColumn;
+
+                    if (column != null)
+                    {
+                        int index = column.ColumnIndex;
+
+                        if (index < _Cells.Count)
+                            return (_Cells[index]);
+                    }
+                }
+
+                return (null);
+            }
+        }
+
+        #endregion
+
+        #region FirstOnScreenCell
+
+        /// <summary>
+        /// Gets a reference to the first on-screen cell
+        /// (after frozen columns) or null if there is none.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public GridCell FirstOnScreenCell
+        {
+            get
+            {
+                GridPanel panel = GridPanel;
+
+                if (panel != null)
+                {
+                    GridColumn column = panel.FirstOnScreenColumn;
+
+                    if (column != null)
+                    {
+                        int index = column.ColumnIndex;
+
+                        if (index < _Cells.Count)
+                            return (_Cells[index]);
+                    }
+                }
+
+                return (null);
+            }
+        }
+
+        #endregion
+
+        #region FirstSelectableCell
+
+        /// <summary>
+        /// Gets a reference to the first selectable cell
+        /// or null if there is none defined.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public GridCell FirstSelectableCell
+        {
+            get
+            {
+                GridPanel panel = GridPanel;
+
+                if (panel != null)
+                {
+                    for (int i = 0; i < panel.Columns.Count; i++)
+                    {
+                        GridColumn column = panel.Columns[i];
+
+                        if (column.Visible == true && column.AllowSelection == true)
+                        {
+                            GridCell cell =
+                                GetCell(i, panel.AllowEmptyCellSelection);
+
+                            if (cell != null)
+                            {
+                                if (cell.AllowSelection == true)
+                                    return (cell);
+                            }
+                        }
+                    }
+                }
+
+                return (null);
+            }
+        }
+
+        #endregion
+
+        #region FirstVisibleCell
+
+        /// <summary>
+        /// Gets a reference to the first visible cell
+        /// or null if there is none defined.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public GridCell FirstVisibleCell
+        {
+            get
+            {
+                GridPanel panel = GridPanel;
+
+                if (panel != null)
+                {
+                    GridColumn column = panel.Columns.FirstVisibleColumn;
+
+                    if (column != null)
+                    {
+                        int index = column.ColumnIndex;
+
+                        GridCell cell =
+                            GetCell(index, panel.AllowEmptyCellSelection);
+
+                        if (cell != null)
+                            return (cell);
+                    }
+                }
+
+                return (null);
+            }
+        }
+
+        #endregion
+
+        #region Indexer (Column)
+
+        /// <summary>
+        /// Gets or sets Cell item at the given Column
+        /// </summary>
+        /// <param name="column">Column containing the cell</param>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public GridCell this[GridColumn column]
+        {
+            get { return (this[column.ColumnIndex]); }
+        }
+
+        #endregion
+
+        #region Indexer (int)
+
+        /// <summary>
+        /// Gets or sets Cell item at the given Column
+        /// </summary>
+        /// <param name="columnIndex">Column containing the cell</param>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public GridCell this[int columnIndex]
+        {
+            get
+            {
+                if (columnIndex < Cells.Count)
+                    return (Cells[columnIndex]);
+
+                return (null);
+            }
+        }
+
+        #endregion
+
+        #region Indexer (string)
+
+        /// <summary>
+        /// Gets or sets Cell item at ColumnName index
+        /// </summary>
+        /// <param name="columnName">Name of Column containing the cell</param>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public GridCell this[string columnName]
+        {
+            get { return (FindCell(columnName)); }
+        }
+
+        #endregion
+
+        #region InfoImageBounds
+
+        ///<summary>
+        /// Gets the bounds of the InfoImage
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public Rectangle InfoImageBounds
+        {
+            get { return (_InfoImageBounds); }
+            internal set { _InfoImageBounds = value; }
+        }
+
+        #endregion
+
+        #region InfoText
+
+        ///<summary>
+        /// Gets or sets the informational text associated with
+        /// the row. If the InfoText is non-null, then the rows
+        /// associated InfoImage is displayed in the RowHeader, with
+        /// the InfoText being displayed as the ToolTip for the InfoImage.
+        ///</summary>
+        [DefaultValue(null), Category("Appearance")]
+        [Description("Gets or sets the informational text associated with the row. If the InfoText is non-null, then the rows associated InfoImage is displayed in the RowHeader, with the InfoText being displayed as the ToolTip for the InfoImage.")]
+        public string InfoText
+        {
+            get { return (_InfoText); }
+
+            set
+            {
+                if (_InfoText != value)
+                {
+                    _InfoText = value;
+
+                    OnPropertyChangedEx("InfoText", VisualChangeType.Render);
+
+                    InvalidateRowHeader();
+                }
+            }
+        }
+
+        #endregion
+
+        #region IsDeleted
+
+        ///<summary>
+        /// Gets or sets whether the row has been marked as deleted.
+        ///</summary>
+        [DefaultValue(false), Category("Appearance")]
+        [Description("Indicates whether the row has been marked as deleted.")]
+        public override bool IsDeleted
+        {
+            get { return (base.IsDeleted); }
+
+            set
+            {
+                if (base.IsDeleted != value)
+                {
+                    SetState(Rs.RowDirty, true);
+                    SetState(Rs.RowNeedsStored, true);
+
+                    base.IsDeleted = value;
+                }
+            }
+        }
+
+        #endregion
+
+        #region IsDetailRow
+
+        ///<summary>
+        /// Gets whether the row is marked as a Group Detail row.
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsDetailRow
+        {
+            get { return (TestState(Rs.DetailRow)); }
+            internal set { SetState(Rs.DetailRow, value); }
+        }
+
+        #endregion
+
+        #region IsInsertRow
+
+        ///<summary>
+        /// Gets whether the row is the Insert Row.
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsInsertRow
+        {
+            get
+            {
+                GridPanel panel = GridPanel;
+
+                if (panel != null)
+                {
+                    if (IsDesignerHosted == true)
+                        return (false);
+
+                    if (panel.ShowInsertRow == true)
+                    {
+                        if (panel.VirtualMode == true)
+                        {
+                            if (GridIndex == panel.VirtualRowCountEx - 1)
+                                return (true);
+                        }
+                        else
+                        {
+                            if (RowIndex == panel.Rows.Count - 1)
+                                return (true);
+                        }
+                    }
+                }
+
+                return (false);
+            }
+        }
+
+        #endregion
+
+        #region IsTempInsertRow
+
+        ///<summary>
+        /// Gets whether the row is a temporary insert Row (created via editing the Insert Row)
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsTempInsertRow
+        {
+            get { return (TestState(Rs.TempInsertRow)); }
+            internal set { SetState(Rs.TempInsertRow, value); }
+        }
+
+        #endregion
+
+        #region LastFrozenCell
+
+        /// <summary>
+        /// Gets a reference to the last Frozen cell
+        /// or null if there is none.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public GridCell LastFrozenCell
+        {
+            get
+            {
+                GridPanel panel = GridPanel;
+
+                if (panel != null)
+                {
+                    GridColumn column = panel.LastFrozenColumn;
+
+                    if (column != null)
+                    {
+                        int index = column.ColumnIndex;
+
+                        if (index < _Cells.Count)
+                            return (_Cells[index]);
+                    }
+                }
+
+                return (null);
+            }
+        }
+
+        #endregion
+
+        #region LastOnScreenCell
+
+        /// <summary>
+        /// Gets a reference to the last on-screen cell
+        /// or null if there is none.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public GridCell LastOnScreenCell
+        {
+            get
+            {
+                GridPanel panel = GridPanel;
+
+                if (panel != null)
+                {
+                    GridColumn column = panel.LastOnScreenColumn;
+                    
+                    if (column != null)
+                    {
+                        int index = column.ColumnIndex;
+
+                        if (index < _Cells.Count)
+                            return (_Cells[index]);
+                    }
+                }
+
+                return (null);
+            }
+        }
+
+        #endregion
+
+        #region LastSelectableCell
+
+        /// <summary>
+        /// Gets a reference to the last selectable cell
+        /// or null if there is none defined.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public GridCell LastSelectableCell
+        {
+            get
+            {
+                GridPanel panel = GridPanel;
+
+                if (panel != null)
+                {
+                    for (int i = panel.Columns.Count - 1; i >= 0; i--)
+                    {
+                        GridColumn column = panel.Columns[i];
+
+                        if (column.Visible == true && column.AllowSelection == true)
+                        {
+                            GridCell cell = GetCell(i, panel.AllowEmptyCellSelection);
+
+                            if (cell != null)
+                            {
+                                if (cell.AllowSelection == true)
+                                    return (cell);
+                            }
+                        }
+                    }
+                }
+
+                return (null);
+            }
+        }
+
+        #endregion
+
+        #region LastVisibleCell
+
+        /// <summary>
+        /// Gets a reference to the last visible cell
+        /// or null if there is none defined.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public GridCell LastVisibleCell
+        {
+            get
+            {
+                GridPanel panel = GridPanel;
+
+                if (panel != null)
+                {
+                    GridColumn column = panel.Columns.LastVisibleColumn;
+
+                    if (column != null)
+                    {
+                        int index = column.ColumnIndex;
+
+                        if (index < _Cells.Count)
+                            return (_Cells[index]);
+                    }
+                }
+
+                return (null);
+            }
+        }
+
+        #endregion
+
+        #region RowDirty
+
+        ///<summary>
+        /// Gets or sets whether the row state has changed.
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool RowDirty
+        {
+            get { return (TestState(Rs.RowDirty)); }
+
+            set
+            {
+                if (RowDirty != value)
+                {
+                    SetState(Rs.RowDirty, value); 
+
+                    InvalidateRowHeader();
+                }
+            }
+        }
+
+        #endregion
+
+        #region IsRowFilteredOut
+
+        ///<summary>
+        /// Gets whether the row has been filtered out.
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsRowFilteredOut
+        {
+            get
+            {
+                GridPanel panel = GridPanel;
+
+                if (panel != null)
+                {
+                    panel.UpdateDataFiltering();
+
+                    return (panel.IsFiltered == true &&
+                        RowFilteredOut == true);
+                }
+
+                return (false);
+            }
+
+            set
+            {
+                RowFilteredOut = value;
+            }
+        }
+
+        #endregion
+
+        #region RowHeight
+
+        ///<summary>
+        /// Gets or sets the height of the row (0 denotes AutoSize, -1 denotes NotSet).
+        ///</summary>
+        [DefaultValue(-1), Category("Sizing")]
+        [Description("Indicates the height of the row (0 denotes AutoSize, -1 denotes NotSet).")]
+        public int RowHeight
+        {
+            get { return (_RowHeight); }
+
+            set
+            {
+                if (_RowHeight != value)
+                {
+                    _RowHeight = (value < 0) ? -1 : value;
+
+                    NeedsMeasured = true;
+
+                    OnPropertyChangedEx("RowHeight", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region PostDetailRowHeight
+
+        ///<summary>
+        /// Gets or sets the height of the "post detail" portion of the
+        /// row (the area at the bottom of the row). -1 denotes NotSet.
+        ///</summary>
+        [DefaultValue(-1), Category("Sizing")]
+        [Description("Indicates the height of the 'post detail' portion of the row (the area at the bottom of the row). -1 denotes NotSet.")]
+        public int PostDetailRowHeight
+        {
+            get { return (_PostDetailRowHeight); }
+
+            set
+            {
+                if (_PostDetailRowHeight != value)
+                {
+                    _PostDetailRowHeight = (value < 0) ? -1 : value;
+
+                    NeedsMeasured = true;
+
+                    OnPropertyChangedEx("PostDetailRowHeight", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region RowPreDetailHeight
+
+        ///<summary>
+        /// Gets or sets the height of the "pre detail" portion of the
+        /// row (the area at the bottom of the row). -1 denotes NotSet.
+        ///</summary>
+        [DefaultValue(-1), Category("Sizing")]
+        [Description("Indicates the height of the 'pre detail' portion of the row (the area at the bottom of the row). -1 denotes NotSet.")]
+        public int RowPreDetailHeight
+        {
+            get { return (_PreDetailRowHeight); }
+
+            set
+            {
+                if (_PreDetailRowHeight != value)
+                {
+                    _PreDetailRowHeight = (value < 0) ? -1 : value;
+
+                    NeedsMeasured = true;
+
+                    OnPropertyChangedEx("RowPreDetailHeight", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region SelectedCells
+
+        ///<summary>
+        /// Gets an array of the currently Selected Cells.
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public GridCell[] SelectedCells
+        {
+            get
+            {
+                GridPanel panel = GridPanel;
+
+                if (panel != null)
+                {
+                    if (IsSelected == true)
+                    {
+                        GridCell[] cells = new GridCell[Cells.Count];
+
+                        for (int i = 0; i < Cells.Count; i++)
+                        {
+                            if (Cells[i].AllowSelection == true)
+                                cells[i] = Cells[i];
+                        }
+
+                        return (cells);
+                    }
+                }
+
+                return (null);
+            }
+        }
+
+        #endregion
+
+        #region Visible
+
+        /// <summary>
+        /// Gets or sets whether the row is visible.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance")]
+        [Description("Indicates whether the row is visible.")]
+        public override bool Visible
+        {
+            get { return (base.Visible); }
+
+            set
+            {
+                SetState(Rs.Visible, value);
+
+                if (RowFilteredOut == true)
+                    value = false;
+
+                if (base.Visible != value)
+                {
+                    base.Visible = value;
+
+                    GridPanel panel = GridPanel;
+
+                    if (panel != null)
+                    {
+                        int index = GridIndex;
+
+                        if (index < panel.Rows.Count)
+                        {
+                            int count = GetVisibleItemCount() + 1;
+
+                            panel.ExpandSelectedAtIndex(index, count, value);
+                        }
+
+                        if (value == false)
+                        {
+                            if (panel.ActiveRow == this)
+                            {
+                                GridContainer row = GetNextActiveRow(panel, GridIndex);
+
+                                panel.SetActiveRow(row, true);
+                                panel.LastProcessedItem = row;
+                            }
+                        }
+
+                        panel.UpdateRowCountEx();
+                    }
+                }
+            }
+        }
+
+        private GridContainer GetNextActiveRow(GridPanel panel, int index)
+        {
+            GridContainer row = panel.GetRowFromIndex(index);
+
+            while (row != null)
+            {
+                if (panel.CanSetActiveRow(panel, row, false) == true)
+                    return (row);
+
+                row = row.NextVisibleRow;
+            }
+
+            row = panel.GetRowFromIndex(index - 1);
+
+            while (row != null)
+            {
+                if (panel.CanSetActiveRow(false) == true)
+                    return (row);
+
+                row = row.PrevVisibleRow;
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region WhiteSpaceBounds
+
+        ///<summary>
+        /// Gets the row WhiteSpace Bounds (the area
+        /// past the end of the last defined column).
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public Rectangle WhiteSpaceBounds
+        {
+            get
+            {
+                GridPanel panel = GridPanel;
+
+                if (panel != null)
+                {
+                    GridColumn lastcol = panel.Columns.LastVisibleColumn;
+
+                    if (lastcol != null)
+                    {
+                        Rectangle colBounds = lastcol.Bounds;
+                        Rectangle panelBounds = panel.Bounds;
+
+                        if (panel.IsSubPanel == true)
+                            panelBounds.Width -= 5;
+
+                        if (colBounds.Right < panelBounds.Right)
+                        {
+                            int left = colBounds.Right;
+                            int right = panelBounds.Right;
+
+                            if (left < right)
+                            {
+                                Rectangle rowBounds = Bounds;
+
+                                rowBounds.X = left;
+                                rowBounds.Width = right - left;
+
+                                return (rowBounds);
+                            }
+                        }
+                    }
+                }
+
+                return (Rectangle.Empty);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region AllocPanel
+
+        internal GridPanel AllocPanel
+        {
+            get { return (_AllocPanel); }
+            set { _AllocPanel = value; }
+        }
+
+        #endregion
+
+        #region ArrangeLayoutCount
+
+        internal ushort ArrangeLayoutCount
+        {
+            get { return (_ArrangeLayoutCount); }
+            set { _ArrangeLayoutCount = value; }
+        }
+
+        #endregion
+
+        #region CanModify
+
+        internal override bool CanModify
+        {
+            get
+            {
+                if (AllowEdit == false)
+                    return (false);
+
+                return (base.CanModify);
+            }
+        }
+
+        #endregion
+
+        #region DataItemIndex
+
+        internal int DataItemIndex
+        {
+            get
+            {
+                GridPanel panel = GridPanel;
+
+                if (panel != null)
+                {
+                    if (panel.VirtualMode == true)
+                        return (RowIndex);
+                }
+
+                return (_DataItemIndex);
+            }
+
+            set { _DataItemIndex = value; }
+        }
+
+        #endregion
+
+        #region DragSelection
+
+        internal bool DragSelection
+        {
+            get { return (_dragSelection); }
+            set { _dragSelection = value; }
+        }
+
+        #endregion
+
+        #region ExpandButtonBounds
+
+        internal Rectangle ExpandButtonBounds
+        {
+            get { return (_ExpandButtonBounds); }
+            set { _ExpandButtonBounds = value; }
+        }
+
+        #endregion
+
+        #region IsReordering
+
+        internal bool IsReordering
+        {
+            get { return (TestState(Rs.Reordering)); }
+            set { SetState(Rs.Reordering, value); }
+        }
+
+        #endregion
+
+        #region IsResizing
+
+        internal bool IsResizing
+        {
+            get { return (TestState(Rs.Resizing)); }
+            set { SetState(Rs.Resizing, value); }
+        }
+
+        #endregion
+
+        #region IsControlDown
+
+        internal bool IsControlDown
+        {
+            get { return (TestState(Rs.ControlDown)); }
+            set { SetState(Rs.ControlDown, value); }
+        }
+
+        #endregion
+
+        #region Loading
+
+        internal bool Loading
+        {
+            get { return (TestState(Rs.Loading)); }
+            set { SetState(Rs.Loading, value); }
+        }
+
+        #endregion
+
+        #region MeasureCount
+
+        internal ushort MeasureCount
+        {
+            get { return (_MeasureCount); }
+        }
+
+        #endregion
+
+        #region NeedsMeasured
+
+        internal override bool NeedsMeasured
+        {
+            get { return (base.NeedsMeasured); }
+
+            set
+            {
+                if (value == true)
+                    _MeasureCount++;
+
+                base.NeedsMeasured = value;
+            }
+        }
+
+        #endregion
+
+        #region RowCheckChanged
+
+        ///<summary>
+        /// RowCheckChanged
+        ///</summary>
+        internal bool RowCheckChanged
+        {
+            get { return (TestState(Rs.RowCheckChanged)); }
+            set { SetState(Rs.RowCheckChanged, value); }
+        }
+
+        #endregion
+
+        #region RowFilteredOut
+
+        internal bool RowFilteredOut
+        {
+            get { return (TestState(Rs.RowFilteredOut)); }
+
+            set
+            {
+                SetState(Rs.RowFilteredOut, value);
+
+                base.Visible = (value != true) && TestState(Rs.Visible);
+
+                InvalidateMerge();
+            }
+        }
+
+        #endregion
+
+        #region RowNeedsGrouped
+
+        ///<summary>
+        /// RowNeedsGrouped
+        ///</summary>
+        internal bool RowNeedsGrouped
+        {
+            get { return (TestState(Rs.RowNeedsGrouped)); }
+            set { SetState(Rs.RowNeedsGrouped, value); }
+        }
+
+        #endregion
+
+        #region RowNeedsSorted
+
+        ///<summary>
+        /// RowNeedsSorted
+        ///</summary>
+        internal bool RowNeedsSorted
+        {
+            get { return (TestState(Rs.RowNeedsSorted)); }
+            set { SetState(Rs.RowNeedsSorted, value); }
+        }
+
+        #endregion
+
+        #region RowNeedsStored
+
+        ///<summary>
+        /// RowNeedsStored
+        ///</summary>
+        internal bool RowNeedsStored
+        {
+            get { return (TestState(Rs.RowNeedsStored)); }
+            set { SetState(Rs.RowNeedsStored, value); }
+        }
+
+        #endregion
+
+        #region IsSeparatorAtBottom
+
+        internal bool IsSeparatorAtBottom
+        {
+            get { return (TestState(Rs.SeparatorAtBottom)); }
+            set { SetState(Rs.SeparatorAtBottom, value); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region TestState
+
+        private bool TestState(Rs state)
+        {
+            return ((_States & state) == state);
+        }
+
+        #endregion
+
+        #region SetState
+
+        private void SetState(Rs state, bool value)
+        {
+            if (value == true)
+                _States |= state;
+            else
+                _States &= ~state;
+        }
+
+        #endregion
+
+        #region MeasureOverride
+
+        #region MeasureOverride
+
+        /// <summary>
+        /// Performs the layout of the item
+        /// and sets the Size property to size that item will take.
+        /// </summary>
+        /// <param name="layoutInfo">Layout information.</param>
+        /// <param name="stateInfo"></param>
+        /// <param name="constraintSize"></param>
+        protected override void MeasureOverride(
+            GridLayoutInfo layoutInfo, GridLayoutStateInfo stateInfo, Size constraintSize)
+        {
+            GridPanel panel = stateInfo.GridPanel;
+
+            Size sizeNeeded = Size.Empty;
+
+            if (panel.ShowRowHeaders == true)
+                sizeNeeded = MeasureRowHeader(panel);
+
+            Size size = Size.Empty;
+
+            if (panel.VirtualMode == true)
+            {
+                size.Width = GetColumnsWidth(stateInfo);
+                size.Height = Dpi.Height(panel.VirtualRowHeight);
+            }
+            else
+            {
+                int rowHeight = GetRowHeight();
+
+                if (rowHeight == 0)
+                {
+                    size = MeasureCells(layoutInfo, stateInfo);
+                }
+                else
+                {
+                    size.Width = GetColumnsWidth(stateInfo);
+                    size.Height = rowHeight;
+                }
+            }
+
+            sizeNeeded.Width += size.Width;
+            sizeNeeded.Height = Math.Max(size.Height, sizeNeeded.Height);
+            sizeNeeded.Height = Math.Max(sizeNeeded.Height, Dpi.Height(panel.MinRowHeight));
+            sizeNeeded.Height = Math.Min(sizeNeeded.Height, Dpi.Height(panel.MaxRowHeight));
+
+            _EffectivePreDetailRowHeight = GetRowPreDetailHeight();
+            _EffectivePostDetailRowHeight = GetRowPostDetailHeight();
+
+            SuperGrid.DoRowGetDetailHeightEvent(this, layoutInfo,
+                sizeNeeded, ref _EffectivePreDetailRowHeight, ref _EffectivePostDetailRowHeight);
+
+            _EffectivePreDetailRowHeight = Dpi.Height(_EffectivePreDetailRowHeight);
+            _EffectivePostDetailRowHeight = Dpi.Height(_EffectivePostDetailRowHeight);
+
+            sizeNeeded.Height += (_EffectivePreDetailRowHeight + _EffectivePostDetailRowHeight);
+
+            FixedRowHeight = sizeNeeded.Height;
+
+            HasVisibleItems = false;
+
+            if (Rows != null && Rows.Count > 0)
+            {
+                if (Expanded == true)
+                {
+                    GridLayoutStateInfo itemStateInfo = new
+                        GridLayoutStateInfo(panel, stateInfo.IndentLevel + 1);
+
+                    size = MeasureSubItems(layoutInfo, itemStateInfo, constraintSize);
+
+                    sizeNeeded.Width = Math.Max(size.Width, sizeNeeded.Width);
+                    sizeNeeded.Height += size.Height;
+                }
+                else
+                {
+                    HasVisibleItems = AnyVisibleItems();
+                }
+            }
+
+            Size = sizeNeeded;
+        }
+
+        #region GetColumnsWidth
+
+        private int GetColumnsWidth(GridLayoutStateInfo stateInfo)
+        {
+            int width = 0;
+
+            GridColumnCollection columns = stateInfo.GridPanel.Columns;
+            foreach (GridColumn column in columns)
+            {
+                if (column.Visible == true)
+                    width += column.Size.Width;
+            }
+
+            return (width);
+        }
+
+        #endregion
+
+        #region MeasureRowHeader
+
+        private Size MeasureRowHeader(GridPanel panel)
+        {
+            Size size = Dpi.Size(panel.RowHeaderSize);
+
+            if (size.IsEmpty == true)
+            {
+                if (NeedsMeasured == true)
+                {
+                    size.Width = panel.RowHeaderWidthEx;
+
+                    if (GetRowHeight() == 0)
+                    {
+                        RowHeaderVisualStyle style = GetEffectiveRowStyle().RowHeaderStyle;
+
+                        if (panel.ActiveRowIndicatorStyle == ActiveRowIndicatorStyle.Image ||
+                            panel.ActiveRowIndicatorStyle == ActiveRowIndicatorStyle.Both)
+                        {
+                            MaxImageHeight(style.GetActiveRowImage(panel), ref size);
+                        }
+
+                        if (panel.ShowEditingImage == true)
+                            MaxImageHeight(style.GetEditingRowImage(panel), ref size);
+
+                        if (panel.ShowInsertRow == true)
+                            MaxImageHeight(panel.GetInsertRowImage(), ref size);
+                    }
+
+                    _RowHeaderSize = size;
+                }
+
+                size = _RowHeaderSize;
+            }
+
+            return (size);
+        }
+
+        private void MaxImageHeight(Image image, ref Size size)
+        {
+            if (image != null)
+                size.Height = Math.Max(size.Height, image.Height + 6);
+        }
+
+        #endregion
+
+        #region AnyVisibleItems
+
+        internal bool AnyVisibleItems()
+        {
+            GridItemsCollection items = Rows;
+            foreach (GridElement item in items)
+            {
+                if (item.Visible == true)
+                    return (true);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region MeasureCells
+
+        private Size MeasureCells(GridLayoutInfo layoutInfo,
+            GridLayoutStateInfo stateInfo)
+        {
+            GridPanel panel = stateInfo.GridPanel;
+            Size sizeNeeded = Size.Empty;
+
+            int rowHeight = GetRowHeight();
+
+            GridCellCollection cells = _Cells;
+            foreach (GridCell cell in cells)
+            {
+                if (cell.ColumnIndex < panel.Columns.Count)
+                {
+                    GridColumn column = panel.Columns[cell.ColumnIndex];
+
+                    if (column.Visible == true)
+                    {
+                        ColumnAutoSizeMode mode = column.GetAutoSizeMode();
+                        Size size = column.BoundsRelative.Size;
+
+                        if (column.IsPrimaryColumn == true)
+                        {
+                            size.Width -= stateInfo.IndentLevel * Dpi.Width(panel.LevelIndentSize.Width);
+
+                            if (panel.ShowTreeButtons == true || panel.ShowTreeLines == true)
+                                size.Width -= panel.TreeButtonIndent;
+
+                            if (panel.CheckBoxes == true)
+                                size.Width -= Dpi.Width(panel.CheckBoxSize.Width + 6);
+                        }
+
+                        if ((rowHeight == 0 && mode == ColumnAutoSizeMode.Fill) ||
+                            cell.NeedsMeasured == true || column.NeedsMeasured == true ||
+                            NeedsMeasured == true || panel.NeedsMeasured == true)
+                        {
+                            cell.Measure(layoutInfo, stateInfo, size);
+                        }
+
+                        size.Height = cell.MeasuredSize.Height;
+
+                        if (mode != ColumnAutoSizeMode.None)                 // Was Fill
+                            size.Width = cell.MeasuredSize.Width;
+
+                        if (rowHeight != 0)
+                            size.Height = rowHeight;
+
+                        cell.Size = size;
+
+                        sizeNeeded.Width += cell.Size.Width;
+                        sizeNeeded.Height = Math.Max(cell.Size.Height, sizeNeeded.Height);
+                    }
+                }
+            }
+
+            if (sizeNeeded.IsEmpty == true)
+                sizeNeeded = new Size(Dpi.Width100, rowHeight);
+
+            return (sizeNeeded);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ArrangeOverride
+
+        #region ArrangeOverride
+
+        /// <summary>
+        /// Performs the arrange pass layout of the
+        /// item when final position and size of the item has been set.
+        /// </summary>
+        /// <param name="layoutInfo">Layout information.</param>
+        /// <param name="stateInfo"></param>
+        /// <param name="layoutBounds">Layout bounds</param>
+        protected override void ArrangeOverride(
+            GridLayoutInfo layoutInfo, GridLayoutStateInfo stateInfo, Rectangle layoutBounds)
+        {
+            ContainerBounds = layoutBounds;
+
+            Rectangle bounds = layoutBounds;
+            bounds.Height = FixedRowHeight;
+
+            GridPanel panel = stateInfo.GridPanel;
+            IndentLevel = stateInfo.IndentLevel;
+
+            if (panel.ShowRowHeaders == true)
+                bounds.X += panel.RowHeaderWidthEx;
+
+            ArrangeCells(layoutInfo, stateInfo, bounds);
+
+            if (Rows != null && Expanded == true)
+            {
+                bounds = layoutBounds;
+
+                int n = FixedRowHeight;
+
+                bounds.Y += n;
+                bounds.Height -= n;
+
+                GridLayoutStateInfo itemStateInfo =
+                    new GridLayoutStateInfo(panel, IndentLevel + 1);
+
+                ArrangeSubItems(layoutInfo, itemStateInfo, bounds);
+            }
+
+            ArrangeLayoutCount = SuperGrid.ArrangeLayoutCount;
+        }
+
+        #endregion
+
+        #region ArrangeCells
+
+        private void ArrangeCells(GridLayoutInfo layoutInfo,
+            GridLayoutStateInfo stateInfo, Rectangle bounds)
+        {
+            GridPanel panel = stateInfo.GridPanel;
+
+            if (panel.Columns.Count > 0)
+            {
+                int indentLevel = stateInfo.IndentLevel;
+
+                GridCellCollection cells = _Cells;
+                GridColumnCollection columns = panel.Columns;
+
+                int j = 0;
+
+                int[] map = columns.DisplayIndexMap;
+                for (int i = 0; i < map.Length; i++)
+                {
+                    int index = map[i];
+
+                    GridColumn column = columns[index];
+
+                    if (column.Visible == true)
+                    {
+                        if (index < cells.Count)
+                        {
+                            GridCell cell = cells[index];
+
+                            if (panel.GroupColumns.Count > 0)
+                            {
+                                cell.IndentLevel = (j == 0 ? indentLevel : 0);
+                            }
+                            else
+                            {
+                                cell.IndentLevel =
+                                    (panel.PrimaryColumnIndex == index) ? indentLevel : 0;
+                            }
+
+                            bounds.Width = column.Size.Width;
+
+                            cell.Arrange(layoutInfo, stateInfo, bounds);
+                        }
+
+                        j++;
+
+                        bounds.X += column.Size.Width;
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderOverride
+
+        /// <summary>
+        /// Performs drawing of the item and its children
+        /// </summary>
+        /// <param name="renderInfo">Holds contextual rendering information.</param>
+        protected override void RenderOverride(GridRenderInfo renderInfo)
+        {
+            GridPanel panel = GridPanel;
+
+            if (panel != null)
+            {
+                Rectangle bounds = Bounds;
+                GridPanelVisualStyle pstyle = panel.GetEffectiveStyle();
+
+                if (bounds.IntersectsWith(renderInfo.ClipRectangle))
+                    RenderRow(renderInfo, panel, pstyle, bounds);
+
+                if (Rows != null && Rows.Count > 0 && Expanded == true)
+                {
+                    UpdateMergeFlags();
+
+                    RenderSubItems(renderInfo, panel, pstyle, panel.IsSubPanel, IsVFrozen);
+                }
+
+                RenderDesignerElement(renderInfo, bounds);
+            }
+        }
+
+        #region RenderRow
+
+        private void RenderRow(GridRenderInfo renderInfo,
+            GridPanel panel, GridPanelVisualStyle pstyle, Rectangle r)
+        {
+            Graphics g = renderInfo.Graphics;
+
+            bool cancelled = SuperGrid.DoPreRenderRowEvent(g, this, RenderParts.Background, r);
+
+            if (HScrollOffset == 0 || panel.Parent != null || panel.FrozenColumnCount <= 0)
+                RenderAllColumns(renderInfo, panel);
+            else
+                RenderScrollableColumns(renderInfo, panel);
+
+            if (cancelled == false)
+                SuperGrid.DoPostRenderRowEvent(g, this, RenderParts.Background, r);
+
+            if (panel.ShowRowHeaders == true)
+                RenderRowHeader(renderInfo, panel, this, pstyle, r);
+            
+            Rectangle w = WhiteSpaceBounds;
+
+            if (w.Width > 0 && w.Height > 0)
+                RenderRowWhitespace(renderInfo, panel, pstyle, w);
+
+            if (panel.FocusCuesEnabled == true && SuperGrid.ActiveElement == this)
+            {
+                if (panel.EnableCellMerging == false)
+                    RenderFocusRect(g, r);
+            }
+        }
+
+        #region RenderAllColumns
+
+        private void RenderAllColumns(
+            GridRenderInfo renderInfo, GridPanel panel)
+        {
+            GridCellCollection cells = _Cells;
+            GridColumnCollection columns = panel.Columns;
+
+            bool isVFrozen = IsVFrozen;
+
+            int[] map = columns.DisplayIndexMap;
+            for (int i = 0; i < map.Length; i++)
+            {
+                int index = map[i];
+
+                GridColumn column = columns[index];
+
+                if (column.Visible == true)
+                {
+                    if (column.Bounds.IntersectsWith(renderInfo.ClipRectangle))
+                    {
+                        if (index < cells.Count)
+                        {
+                            if (RenderCell(renderInfo, cells[index], false, isVFrozen) == false)
+                                break;
+                        }
+                        else
+                        {
+                            RenderEmptyCell(renderInfo, column, false, isVFrozen);
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region RenderScrollableColumns
+
+        private void RenderScrollableColumns(
+            GridRenderInfo renderInfo, GridPanel panel)
+        {
+            Graphics g = renderInfo.Graphics;
+            GridCellCollection cells = _Cells;
+            GridColumnCollection columns = panel.Columns;
+
+            Region saveClip = null;
+
+            bool isVFrozen = IsVFrozen;
+            int[] map = columns.DisplayIndexMap;
+
+            GridColumn lastCol = null;
+
+            for (int i = 0; i < map.Length; i++)
+            {
+                int index = map[i];
+                GridColumn column = columns[index];
+
+                if (column.Visible == true)
+                {
+                    bool isHFrozen = column.IsHFrozen;
+
+                    if (saveClip == null && isHFrozen == false)
+                        saveClip = SetScrollableClip(g, lastCol);
+
+                    if (index < cells.Count)
+                    {
+                        if (RenderCell(renderInfo, cells[index], isHFrozen, isVFrozen) == false)
+                            break;
+                    }
+                    else
+                    {
+                        if (RenderEmptyCell(renderInfo, column, isHFrozen, isVFrozen) == false)
+                            break;
+                    }
+
+                    lastCol = column;
+                }
+            }
+
+            if (saveClip != null)
+                g.Clip = saveClip;
+        }
+
+        #region SetScrollableClip
+
+        private Region SetScrollableClip(Graphics g, GridColumn column)
+        {
+            Region clip = g.Clip;
+
+            if (column != null)
+            {
+                Rectangle r = SuperGrid.ViewRectEx;
+                r.X = column.Bounds.Right;
+                g.SetClip(r);
+            }
+
+            return (clip);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderCell
+
+        private bool RenderCell(GridRenderInfo renderInfo,
+            GridCell cell, bool isHFrozen, bool isVFrozen)
+        {
+            Rectangle bounds = cell.BoundsRelative;
+
+            if (isHFrozen == false)
+                bounds.X -= HScrollOffset;
+
+            if (isVFrozen == false)
+                bounds.Y -= VScrollOffset;
+
+            if (bounds.X > renderInfo.ClipRectangle.Right)
+                return (false);
+
+            cell.Render(renderInfo);
+
+            return (true);
+        }
+
+        #endregion
+
+        #region RenderEmptyCell
+
+        private bool RenderEmptyCell(GridRenderInfo renderInfo,
+            GridColumn column, bool isHFrozen, bool isVFrozen)
+        {
+            Rectangle r = column.BoundsRelative;
+            r.Y = BoundsRelative.Y;
+            r.Height = FixedRowHeight;
+
+            Rectangle bounds = r;
+
+            if (isHFrozen == false)
+                bounds.X -= HScrollOffset;
+
+            if (isVFrozen == false)
+            {
+                bounds.Y -= VScrollOffset;
+                bounds.Intersect(SViewRect);
+            }
+
+            if (bounds.X > renderInfo.ClipRectangle.Right)
+                return (false);
+
+            GridCell cell = GetEmptyRenderCell(column);
+
+            cell.IsMouseOver =
+                bounds.Contains(SuperGrid.PointToClient(Control.MousePosition));
+
+            cell.Render(renderInfo);
+
+            return (true);
+        }
+
+        #region GetEmptyRenderCell
+
+        private GridCell GetEmptyRenderCell(GridColumn column)
+        {
+            if (_EmptyRenderCell == null)
+                _EmptyRenderCell = new GridCell();
+
+            int oldIndex = _EmptyRenderCell.ColumnIndex;
+
+            _EmptyRenderCell = GetEmptyCell(_EmptyRenderCell, column.ColumnIndex);
+
+            if (_EmptyRenderCell.ColumnIndex != oldIndex)
+                _EmptyRenderCell.ClearEffectiveStyles();
+
+            return (_EmptyRenderCell);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderFocusRect
+
+        private void RenderFocusRect(Graphics g, Rectangle r)
+        {
+            if (SuperGrid.Focused == true && IsDesignerHosted == false)
+            {
+                GridCell cell = FirstVisibleCell;
+
+                if (cell != null)
+                {
+                    Rectangle v = cell.HighLightBounds;
+
+                    r.X = v.X;
+
+                    if (r.X < 0)
+                    {
+                        r.X = -(r.X % 2);
+                        r.Width -= (r.X - v.X);
+                    }
+                }
+
+                r.Height = FixedRowHeight;
+
+                switch (GridPanel.GridLines)
+                {
+                    case GridLines.Both:
+                        r.Width -= Dpi.Width1;
+                        r.Height -= Dpi.Height1;
+                        break;
+
+                    case GridLines.Vertical:
+                        r.Width -= Dpi.Width1;
+                        break;
+
+                    case GridLines.Horizontal:
+                        r.Height -= Dpi.Height1;
+                        break;
+                }
+
+                Region clip = null;
+
+                if (IsVFrozen == false)
+                {
+                    Rectangle t = SViewRect;
+
+                    GridPanel panel = GridPanel;
+                    GridColumn col = panel.Columns.LastVisibleColumn;
+
+                    if (col != null)
+                    {
+                        switch (panel.RowFocusMode)
+                        {
+                            case RowFocusMode.FullRow:
+                                Rectangle w = panel.Bounds;
+
+                                if (r.Right > w.Right)
+                                {
+                                    r.Width -= (r.Right - w.Right + 1);
+
+                                    if (panel.IsSubPanel == true && panel.ShowDropShadow == true)
+                                        r.Width -= Dpi.Width5;
+                                }
+
+                                if (r.Right < col.Bounds.Right)
+                                    r.Width += (col.Bounds.Right - r.Right - 1);
+                                break;
+
+                            default:
+                                if (r.Right > col.Bounds.Right)
+                                    r.Width -= (r.Right - col.Bounds.Right + 1);
+                                break;
+                        }
+                    }
+
+                    clip = g.Clip;
+                    g.SetClip(t);
+                }
+
+                ControlPaint.DrawFocusRectangle(g, r);
+
+                if (clip != null)
+                    g.Clip = clip;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderRowHeader
+
+        /// <summary>
+        /// RenderRowHeader
+        /// </summary>
+        /// <param name="renderInfo"></param>
+        /// <param name="panel"></param>
+        /// <param name="item"></param>
+        /// <param name="pstyle"></param>
+        /// <param name="r"></param>
+        protected void RenderRowHeader(GridRenderInfo renderInfo,
+            GridPanel panel, GridContainer item, GridPanelVisualStyle pstyle, Rectangle r)
+        {
+            Graphics g = renderInfo.Graphics;
+
+            r.Width = panel.RowHeaderWidthEx;
+
+            if (r.IntersectsWith(renderInfo.ClipRectangle))
+            {
+                if (r.Height > 100)
+                    r = GetCenterBounds(r);
+
+                RenderRowHeader(g, panel, item, pstyle, r, true);
+            }
+        }
+
+        #region RenderRowHeader
+
+        private void RenderRowHeader(Graphics g, GridPanel panel,
+            GridContainer item, GridPanelVisualStyle pstyle, Rectangle r, bool highlight)
+        {
+            r.Width--;
+            r.Height--;
+
+            if (r.Width > 0 && r.Height > 0)
+            {
+                StyleState rowState = GetRowHeaderState(item, r);
+                RowVisualStyle style = GetEffectiveRowStyle(item, rowState);
+
+                if (SuperGrid.DoPreRenderRowEvent(g, this, RenderParts.RowHeader, r) == false)
+                {
+                    if (item.IsActiveRow == true &&
+                        (panel.ActiveRowIndicatorStyle == ActiveRowIndicatorStyle.Highlight ||
+                         panel.ActiveRowIndicatorStyle == ActiveRowIndicatorStyle.Both))
+                    {
+                        using (Brush br = style.RowHeaderStyle.ActiveRowBackground.GetBrush(r))
+                            g.FillRectangle(br, r);
+                    }
+                    else
+                    {
+                        using (Brush br = style.RowHeaderStyle.Background.GetBrush(r))
+                            g.FillRectangle(br, r);
+                    }
+
+                    if (highlight == true)
+                    {
+                        using (Pen pen = new Pen(style.RowHeaderStyle.BorderHighlightColor, Dpi.Height1))
+                            g.DrawLine(pen, r.X, r.Top, r.Right, r.Top);
+
+                        using (Pen pen = new Pen(style.RowHeaderStyle.BorderHighlightColor, Dpi.Width1))
+                            g.DrawLine(pen, r.X + 1, r.Top, r.X + 1, r.Bottom);
+
+                        using (Pen pen = new Pen(pstyle.HeaderLineColor, Dpi.Height1))
+                        {
+                            g.DrawLine(pen, r.X, r.Top - 1, r.Right, r.Top - 1);
+                            g.DrawLine(pen, r.X, r.Bottom, r.Right, r.Bottom);
+                        }
+
+                        using (Pen pen = new Pen(pstyle.HeaderLineColor, Dpi.Width1))
+                            g.DrawLine(pen, r.Right, r.Top, r.Right, r.Bottom);
+                    }
+
+                    if (item is GridRow)
+                    {
+                        if (RowDirty == true && panel.ShowRowDirtyMarker == true)
+                        {
+                            Rectangle t = r;
+
+                            t.X++;
+                            t.Width = Dpi.Width3;
+
+                            using (Brush br = style.RowHeaderStyle.DirtyMarkerBackground.GetBrush(t))
+                                g.FillRectangle(br, t);
+                        }
+                    }
+
+                    r.Width = panel.RowHeaderWidthEx;
+
+                    RenderHeaderInfo(g, panel, item, style, r);
+
+                    SuperGrid.DoPostRenderRowEvent(g, this, RenderParts.RowHeader, r);
+                }
+            }
+        }
+
+        #region GetRowHeaderState
+
+        private StyleState GetRowHeaderState(
+            GridContainer item, Rectangle r)
+        {
+            StyleState rowState = StyleState.Default;
+
+            if (IsMouseOver == true)
+            {
+                r.Height++;
+
+                if (IsResizing == true ||
+                    r.Contains(SuperGrid.PointToClient(Control.MousePosition)) == true)
+                {
+                    rowState |= StyleState.MouseOver;
+                }
+            }
+
+            if (item.IsSelected == true)
+                rowState |= StyleState.Selected;
+
+            return (rowState);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderHeaderInfo
+
+        private void RenderHeaderInfo(Graphics g,
+            GridPanel panel, GridContainer item, RowVisualStyle style, Rectangle r)
+        {
+            r.X += Dpi.Width4;
+            r.Width -= Dpi.Width4;
+
+            GridRow row = item as GridRow;
+
+            int m = RenderInfoImage(g, panel, item, r);
+
+            if (row != null && row.IsInsertRow == true)
+            {
+                RenderInsertIndicator(g, panel, r);
+                RenderIndicatorImage(g, panel, item, r);
+            }
+            else
+            {
+                if (panel.ShowEditingImage == true &&
+                    (row != null && row.EditorDirty == true))
+                {
+                    RenderEditingImage(g, panel, r);
+                }
+                else
+                {
+                    int n = RenderIndicatorImage(g, panel, item, r);
+
+                    r.X += n;
+                    r.Width -= n;
+
+                    string text = item.RowHeaderText;
+
+                    if (string.IsNullOrEmpty(text) == true)
+                    {
+                        text = (panel.ShowRowGridIndex == true)
+                           ? (item.GridIndex + panel.RowHeaderIndexOffset).ToString() : "";
+                    }
+
+                    SuperGrid.DoGetRowHeaderTextEvent(item, ref text);
+
+                    if (string.IsNullOrEmpty(text) == false)
+                        RenderGridIndex(g, text, style, r, m);
+                }
+            }
+        }
+
+        #region RenderInfoImage
+
+        private int RenderInfoImage(
+            Graphics g, GridPanel panel, GridContainer item, Rectangle r)
+        {
+            GridRow row = item as GridRow;
+
+            if (row != null)
+            {
+                row.InfoImageBounds = Rectangle.Empty;
+
+                if (ShowInfoRowImage(panel, row) == true)
+                {
+                    StyleState rowState = GetRowHeaderState(this, r);
+                    RowHeaderVisualStyle style = GetEffectiveRowStyle(this, rowState).RowHeaderStyle;
+
+                    Image image = style.GetInfoRowImage(panel);
+
+                    if (image != null)
+                    {
+                        Rectangle u = r;
+
+                        Size size = image.Size;
+
+                        u.Size = size;
+
+                        u.X = r.Right - u.Width - 4;
+                        u.X = Math.Max(r.X, u.X);
+
+                        if (r.Height > u.Height)
+                            u.Y += (r.Height - u.Height)/2;
+
+                        u.Intersect(r);
+
+                        row.InfoImageBounds = u;
+
+                        g.DrawImageUnscaledAndClipped(image, u);
+
+                        return (size.Width);
+                    }
+                }
+            }
+
+            return (0);
+        }
+
+        #region ShowInfoRowImage
+
+        private bool ShowInfoRowImage(GridPanel panel, GridRow row)
+        {
+            if (panel.ShowRowInfo == false || row.InfoText == null)
+                return (false);
+
+            if (row.InfoText.Equals("") == false)
+                return (true);
+
+            return (panel.ShowRowInfoDisplayMode == ShowRowInfoDisplayMode.ShowWithEmptyText);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderEditingImage
+
+        private void RenderEditingImage(
+            Graphics g, GridPanel panel, Rectangle r)
+        {
+            StyleState rowState = GetRowHeaderState(this, r);
+            RowHeaderVisualStyle style = GetEffectiveRowStyle(this, rowState).RowHeaderStyle;
+
+            Image image = style.GetEditingRowImage(panel);
+
+            if (image != null)
+            {
+                Rectangle u = r;
+                u.Size = image.Size;
+
+                if (r.Width > u.Width)
+                    u.X += (r.Width - u.Width) / 2;
+
+                if (r.Height > u.Height)
+                    u.Y += (r.Height - u.Height) / 2;
+
+                u.Intersect(r);
+
+                g.DrawImageUnscaledAndClipped(image, u);
+            }
+        }
+
+        #endregion
+
+        #region RenderInsertIndicator
+
+        private void RenderInsertIndicator(
+            Graphics g, GridPanel panel, Rectangle r)
+        {
+            if (panel.ShowInsertRowImage == true)
+            {
+                Image image = panel.GetInsertRowImage();
+
+                if (image != null)
+                {
+                    Rectangle u = r;
+                    u.Size = image.Size;
+
+                    if (r.Width > u.Width)
+                        u.X = r.X + (r.Width - u.Width) / 2;
+
+                    if (r.Height > u.Height)
+                        u.Y += (r.Height - u.Height) / 2;
+
+                    u.Intersect(r);
+
+                    g.DrawImageUnscaledAndClipped(image, u);
+                }
+            }
+        }
+
+        #endregion
+
+        #region RenderIndicatorImage
+
+        private int RenderIndicatorImage(Graphics g,
+            GridPanel panel, GridContainer row, Rectangle r)
+        {
+            StyleState rowState = GetRowHeaderState(this, r);
+            RowHeaderVisualStyle style = GetEffectiveRowStyle(this, rowState).RowHeaderStyle;
+
+            Image image = null;
+            
+            GridRow grow = row as GridRow;
+            
+            if (grow != null)
+            {
+                if (grow.IsTempInsertRow == true && grow.IsInsertRow == false)
+                    image = panel.GetInsertTempRowImage();
+                else
+                    image = style.GetActiveRowImage(panel);
+            }
+
+            if (image != null)
+            {
+                Size size = image.Size;
+
+                int n = size.Width;
+
+                if (row.IsActiveRow == true)
+                {
+                    if (panel.ActiveRowIndicatorStyle == ActiveRowIndicatorStyle.Image ||
+                        panel.ActiveRowIndicatorStyle == ActiveRowIndicatorStyle.Both)
+                    {
+                        Rectangle u = r;
+                        u.Size = size;
+
+                        if (r.Height > u.Height)
+                            u.Y += (r.Height - u.Height) / 2;
+
+                        u.Intersect(r);
+
+                        g.DrawImageUnscaledAndClipped(image, u);
+                    }
+                }
+
+                return (n);
+            }
+
+            return (0);
+        }
+
+        #endregion
+
+        #region RenderGridIndex
+
+        private void RenderGridIndex(Graphics g,
+            string text, RowVisualStyle style, Rectangle r, int m)
+        {
+            Font font = style.RowHeaderStyle.Font ?? SystemFonts.DefaultFont;
+
+            r.Inflate(-Dpi.Width2, 0);
+            r.Width -= m;
+
+            eTextFormat tf = style.RowHeaderStyle.GetTextFormatFlags();
+
+            TextDrawing.DrawString(g, text,
+                font, style.RowHeaderStyle.TextColor, r, tf);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region RenderRowWhitespace
+
+        private void RenderRowWhitespace(GridRenderInfo renderInfo,
+            GridPanel panel, GridPanelVisualStyle pstyle, Rectangle r)
+        {
+            Graphics g = renderInfo.Graphics;
+
+            if (SuperGrid.DoPreRenderRowEvent(g, this, RenderParts.Whitespace, r) == false)
+            {
+                StyleState state = GetWhiteSpaceState(panel);
+                RowVisualStyle style = GetEffectiveRowStyle(this, state);
+
+                using (Brush br = style.Background.GetBrush(r))
+                    g.FillRectangle(br, r);
+
+                if (panel.ShowWhitespaceRowLines == true)
+                {
+                    switch (panel.GridLines)
+                    {
+                        case GridLines.Both:
+                        case GridLines.Horizontal:
+                            if (pstyle.HorizontalLinePattern != LinePattern.None &&
+                                pstyle.HorizontalLinePattern != LinePattern.NotSet)
+                            {
+                                using (Pen pen = new Pen(pstyle.HorizontalLineColor, Dpi.Height1))
+                                {
+                                    pen.DashStyle = (DashStyle)pstyle.HorizontalLinePattern;
+
+                                    g.DrawLine(pen, r.Left, r.Bottom - 1, r.Right - 1, r.Bottom - 1);
+                                    g.DrawLine(pen, r.Left, r.Top - 1, r.Right - 1, r.Top - 1);
+                                }
+                            }
+                            break;
+                    }
+                }
+
+                SuperGrid.DoPostRenderRowEvent(g, this, RenderParts.Whitespace, r);
+            }
+        }
+
+        #region GetWhiteSpaceState
+
+        private StyleState GetWhiteSpaceState(GridPanel panel)
+        {
+            StyleState rowState = StyleState.Default;
+
+            if (IsMouseOver == true && _HitArea == RowArea.InWhiteSpace)
+                rowState |= StyleState.MouseOver;
+
+            if (IsSelected == true && panel.RowHighlightType != RowHighlightType.None)
+                rowState |= StyleState.Selected;
+
+            if (panel.SelectionGranularity != SelectionGranularity.Cell &&
+                panel.RowHighlightType == RowHighlightType.Full)
+            {
+                if (Bounds.Contains(SuperGrid.PointToClient(Control.MousePosition)))
+                    rowState |= StyleState.MouseOver;
+            }
+
+            if (SuperGrid.ScrollBarScrolling == true)
+                rowState &= ~StyleState.MouseOver;
+
+            return (rowState);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderSubItems
+
+        /// <summary>
+        /// RenderSubItems
+        /// </summary>
+        /// <param name="renderInfo"></param>
+        /// <param name="panel"></param>
+        /// <param name="pstyle"></param>
+        /// <param name="isSubPanel"></param>
+        /// <param name="isFrozen"></param>
+        protected void RenderSubItems(GridRenderInfo renderInfo,
+            GridPanel panel, GridPanelVisualStyle pstyle, bool isSubPanel, bool isFrozen)
+        {
+            Rectangle t = SViewRect;
+
+            GridItemsCollection items = Rows;
+            for (int i = FirstOnScreenRowIndex; i < items.Count; i++)
+            {
+                GridElement item = items[i];
+
+                if (item.Visible == true)
+                {
+                    GridPanel ipanel = item as GridPanel;
+
+                    if (ipanel != null)
+                    {
+                        Graphics g = renderInfo.Graphics;
+                        Rectangle r = ipanel.ContainerBounds;
+
+                        if (isFrozen == false)
+                            r.Y -= VScrollOffset;
+
+                        if (isSubPanel == true)
+                            r.X -= HScrollOffset;
+
+                        if (r.Y > t.Bottom)
+                            break;
+
+                        if (r.IntersectsWith(renderInfo.ClipRectangle))
+                        {
+                            Rectangle r2 = r;
+
+                            if (panel.ShowRowHeaders == true)
+                            {
+                                r2.X += panel.RowHeaderWidthEx;
+                                r2.Width -= panel.RowHeaderWidthEx;
+                            }
+
+                            if (SuperGrid.DoPreRenderPanelRowEvent(g,
+                                ipanel, RenderParts.Background | RenderParts.Border, r2) == false)
+                            {
+                                RenderRowBackground(g, ipanel, r2);
+                                RenderRowBorder(g, panel, r2);
+
+                                SuperGrid.DoPostRenderPanelRowEvent(g,
+                                    ipanel, RenderParts.Background | RenderParts.Border, r2);
+                            }
+
+                            RenderTreeLines(g, panel, ipanel, r, isSubPanel);
+                            RenderRowCheckBox(g, panel, ipanel);
+
+                            item.Render(renderInfo);
+
+                            if (panel.ShowRowHeaders == true)
+                            {
+                                r2 = r;
+                                r2.Width = panel.RowHeaderWidthEx;
+
+                                if (SuperGrid.DoPreRenderPanelRowEvent(g,
+                                    ipanel, RenderParts.RowHeader, r2) == false)
+                                {
+                                    RenderRowHeader(renderInfo, panel, ipanel, pstyle, r2);
+
+                                    SuperGrid.DoPostRenderPanelRowEvent(g,
+                                        ipanel, RenderParts.RowHeader, r2);
+                                }
+                            }
+                        }
+                    }
+                    else
+                    {
+                        Rectangle r = item.BoundsRelative;
+
+                        if (isFrozen == false)
+                            r.Y -= VScrollOffset;
+
+                        if (isSubPanel == true)
+                            r.X -= HScrollOffset;
+
+                        if (r.Y > t.Bottom)
+                            break;
+
+                        if (r.IntersectsWith(renderInfo.ClipRectangle))
+                            item.Render(renderInfo);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region RenderTreeLines
+
+        private void RenderTreeLines(Graphics g,
+            GridPanel panel, GridPanel ipanel, Rectangle r, bool isSubPanel)
+        {
+            if (panel.ShowTreeButtons == true && panel.ShowTreeLines == true)
+            {
+                if (panel.PrimaryColumn != null &&
+                    panel.PrimaryColumn.Visible == true)
+                {
+                    int n = panel.PrimaryColumn.BoundsRelative.X -
+                            panel.BoundsRelative.X;
+
+                    r.X += n;
+                    r.Width -= n;
+
+                    r = GetCenterBounds(r);
+
+                    if (panel.PrimaryColumn.IsHFrozen == false)
+                    {
+                        if (isSubPanel == false)
+                            r.X -= HScrollOffset;
+                    }
+
+                    TreeDisplay.RenderLines(g, panel, r, ipanel, ipanel.IndentLevel,
+                        Dpi.Width(panel.LevelIndentSize.Width), panel.TreeButtonIndent, false);
+                }
+            }
+        }
+
+        #endregion
+
+        #region RenderRowBackground
+
+        /// <summary>
+        /// RenderRowBackground
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="item"></param>
+        /// <param name="r"></param>
+        protected void RenderRowBackground(
+            Graphics g, GridContainer item, Rectangle r)
+        {
+            if (item is GridPanel)
+            {
+                RowVisualStyle style = GetEffectiveRowStyle(item);
+
+                if (style.Background != null && style.Background.IsEmpty == false)
+                {
+                    Rectangle t = item.ContainerBounds;
+
+                    t.X -= HScrollOffset;
+
+                    if (IsVFrozen == false)
+                    {
+                        t.Y -= VScrollOffset;
+
+                        r.Intersect(SViewRect);
+                        t.Intersect(SViewRect);
+                        t.Y = r.Y;
+                    }
+
+                    using (Brush br = style.Background.GetBrush(t))
+                        g.FillRectangle(br, r);
+                }
+            }
+        }
+
+        #endregion
+
+        #region RenderRowCheckBox
+
+        /// <summary>
+        /// RenderRowCheckBox
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="panel"></param>
+        /// <param name="ipanel"></param>
+        protected void RenderRowCheckBox(Graphics g,
+            GridPanel panel, GridPanel ipanel)
+        {
+            if (ipanel.HasCheckBox == true)
+            {
+                Rectangle r = GetRowCheckBoxBounds(panel, ipanel);
+
+                if (ipanel.Checked == true)
+                {
+                    CheckDisplay.RenderCheckbox(g, r,
+                        CheckBoxState.CheckedNormal, ButtonState.Checked);
+                }
+                else
+                {
+                    CheckDisplay.RenderCheckbox(g, r,
+                        CheckBoxState.UncheckedNormal, ButtonState.Normal);
+                }
+            }
+        }
+
+        #endregion
+
+        #region GetRowCheckBoxBounds
+
+        private Rectangle GetRowCheckBoxBounds(GridPanel panel, GridPanel ipanel)
+        {
+            Rectangle r = ipanel.CheckBoxBounds;
+
+            if (ipanel.HasCheckBox == true)
+            {
+                Rectangle bounds = ipanel.ContainerBounds;
+                bounds.Location = PointToScroll(ipanel, bounds.Location);
+
+                Rectangle t = GetCenterBounds(bounds);
+
+                r.Y = t.Y + (t.Height - Dpi.Height(panel.CheckBoxSize.Height)) / 2;
+                r.X -= HScrollOffset;
+
+                if (r.Bottom > bounds.Bottom)
+                    r.Y -= (r.Bottom - bounds.Bottom);
+
+                if (r.Y < bounds.Y)
+                    r.Y = bounds.Y;
+
+                t = r;
+                t.X += HScrollOffset;
+
+                if (ipanel.IsVFrozen == false)
+                    t.Y += VScrollOffset;
+
+                ipanel.CheckBoxBounds = t;
+            }
+            else
+            {
+                r = Rectangle.Empty;
+                ipanel.CheckBoxBounds = r;
+            }
+
+            return (r);
+        }
+
+        #endregion
+
+        #region RenderRowBorder
+
+        /// <summary>
+        /// RenderRowBorder
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="panel"></param>
+        /// <param name="r"></param>
+        protected void RenderRowBorder(
+            Graphics g, GridPanel panel, Rectangle r)
+        {
+            if (panel.GridLines == GridLines.Horizontal || panel.GridLines == GridLines.Both)
+            {
+                if (panel.ShowWhitespaceRowLines == true)
+                {
+                    GridPanelVisualStyle pstyle = panel.GetEffectiveStyle();
+
+                    using (Pen pen = new Pen(pstyle.HorizontalLineColor, Dpi.Height1))
+                    {
+                        pen.DashStyle = (DashStyle)pstyle.HorizontalLinePattern;
+                        pen.DashOffset = r.X % 2;
+
+                        g.DrawLine(pen, r.X, r.Top - 1, r.Right - 1, r.Top - 1);
+                        g.DrawLine(pen, r.X, r.Bottom - 1, r.Right - 1, r.Bottom - 1);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region RenderDesignerElement
+
+        private void RenderDesignerElement(
+            GridRenderInfo renderInfo, Rectangle r)
+        {
+            if (SuperGrid.DesignerElement == this)
+            {
+                r.X -= Dpi.Width2;
+                r.Y += Dpi.Height1;
+
+                r.Height -= Dpi.Height4;
+                r.Width += Dpi.Width5;
+
+                if (r.Width > 0 && r.Height > 0)
+                {
+                    using (Pen pen = new Pen(Color.Purple, Dpi.Width1))
+                    {
+                        pen.DashStyle = DashStyle.Dash;
+
+                        renderInfo.Graphics.DrawRectangle(pen, r);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetCenterBounds
+
+        private Rectangle GetCenterBounds(Rectangle bounds)
+        {
+            Rectangle r = SuperGrid.ClientRectangle;
+
+            int m = r.Y;
+
+            if (IsVFrozen == false)
+                m += SuperGrid.PrimaryGrid.FixedRowHeight;
+
+            if (bounds.Y < m)
+            {
+                int n = m - bounds.Y;
+
+                bounds.Y = m;
+                bounds.Height -= n;
+            }
+
+            m = r.Bottom;
+
+            if (SuperGrid.IsHScrollBarVisible == true)
+                m -= SuperGrid.HScrollBarHeight;
+
+            if (SuperGrid.PrimaryGrid.Footer != null &&
+                SuperGrid.PrimaryGrid.Footer.Visible == true)
+            {
+                m -= SuperGrid.PrimaryGrid.Footer.Size.Height;
+            }
+
+            if (bounds.Bottom > m)
+                bounds.Height -= (bounds.Bottom - m) - 1;
+
+            return (bounds);
+        }
+
+        #endregion
+
+        #region FindCell
+
+        private GridCell FindCell(string columnName)
+        {
+            if (string.IsNullOrEmpty(columnName) == true)
+                throw new Exception("Invalid Column Name.");
+
+            foreach (GridCell cell in Cells)
+            {
+                GridColumn col = cell.GridColumn;
+
+                if (col == null)
+                    break;
+
+                if (columnName.Equals(col.Name) == true)
+                    return (cell);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetCell
+
+        ///<summary>
+        /// Gets the Row Cell for the given column index. If
+        /// the cell does not exist,then null will be returned.
+        ///</summary>
+        ///<param name="columnIndex"></param>
+        ///<returns></returns>
+        public GridCell GetCell(int columnIndex)
+        {
+            return (GetCell(columnIndex, false));
+        }
+
+        ///<summary>
+        /// Gets the Row Cell for the given column name. If
+        /// the cell does not exist, null will be returned.
+        ///</summary>
+        ///<param name="name"></param>
+        ///<returns></returns>
+        public GridCell GetCell(string name)
+        {
+            return (FindCell(name));
+        }
+
+        ///<summary>
+        /// Gets the Row Cell for the given column index. If
+        /// "includeEmpty" is true, and the cell does not exist
+        /// (i.e. is empty) then a dummy empty cell will be created
+        /// and returned.
+        ///</summary>
+        ///<param name="columnIndex"></param>
+        ///<param name="includeEmpty"></param>
+        ///<returns></returns>
+        public GridCell GetCell(int columnIndex, bool includeEmpty)
+        {
+            if (columnIndex < _Cells.Count)
+                return (_Cells[columnIndex]);
+
+            if (includeEmpty == true)
+                return (GetEmptyCell(null, columnIndex));
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetEmptyCell
+
+        internal GridCell GetEmptyCell(GridCell cell, int columnIndex)
+        {
+            GridPanel panel = GridPanel;
+
+            if (panel != null)
+            {
+                if (columnIndex < panel.Columns.Count)
+                {
+                    GridColumn column = panel.Columns[columnIndex];
+
+                    if (cell == null)
+                        cell = new GridCell();
+
+                    Rectangle r = column.BoundsRelative;
+                    r.Y = BoundsRelative.Y;
+                    r.Height = FixedRowHeight;
+
+                    cell.BoundsRelative = r;
+
+                    cell.Parent = this;
+                    cell.IsEmptyCell = true;
+                    cell.ColumnIndex = columnIndex;
+                    cell.SelectionUpdateCount = (ushort)(GridPanel.SelectionUpdateCount - 1);
+                    cell.Selected = ExpandedVisible(panel) == true ? panel.IsItemSelectedEx(cell) : false;
+
+                    return (cell);
+                }
+            }
+
+            return (cell);
+        }
+
+        #endregion
+
+        #region Mouse Handling
+
+        #region InternalMouseEnter
+
+        /// <summary>
+        /// InternalMouseEnter
+        /// </summary>
+        /// <param name="e"></param>
+        internal override void InternalMouseEnter(EventArgs e)
+        {
+            IsMouseOver = true;
+
+            if (GridPanel.RowHighlightType == RowHighlightType.Full)
+                InvalidateRender();
+
+            SuperGrid.DoRowMouseEnterEvent(this);
+
+            base.InternalMouseEnter(e);
+        }
+
+        #region InvalidateWhitespace
+
+        private void InvalidateWhitespace()
+        {
+            Rectangle r = WhiteSpaceBounds;
+
+            if (r.IsEmpty == false)
+                InvalidateRender(r);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InternalMouseLeave
+
+        /// <summary>
+        /// InternalMouseLeave
+        /// </summary>
+        /// <param name="e"></param>
+        internal override void InternalMouseLeave(EventArgs e)
+        {
+            GridPanel panel = GridPanel;
+
+            if (panel != null)
+            {
+                IsMouseOver = false;
+
+                if (GridPanel.RowHighlightType == RowHighlightType.Full)
+                    InvalidateRender(Bounds);
+
+                if (panel.ShowRowHeaders == true)
+                {
+                    panel.HotItem = null;
+
+                    _HitArea = RowArea.NoWhere;
+                    _HitItem = null;
+                }
+
+                SuperGrid.ToolTip.Hide(SuperGrid);
+
+                if (_LastArea == RowArea.InRowInfo)
+                    ProcessRowInfoLeave();
+            }
+
+            CancelCapture();
+
+            base.InternalMouseLeave(e);
+
+            SuperGrid.DoRowMouseLeaveEvent(this);
+        }
+
+        #endregion
+
+        #region InternalMouseMove
+
+        /// <summary>
+        /// InternalMouseMove
+        /// </summary>
+        /// <param name="e"></param>
+        internal override void InternalMouseMove(MouseEventArgs e)
+        {
+            GridPanel panel = GridPanel;
+
+            if (panel != null)
+            {
+                if (IsMouseDown == true && _MouseDownHitRow != null)
+                    ProcessMouseDownMove(e, panel);
+
+                ProcessMouseMove(e, panel);
+            }
+
+            SuperGrid.DoRowMouseMoveEvent(this, e, _HitArea);
+
+            if (Capture == false)
+                base.InternalMouseMove(e);
+        }
+
+        #region ProcessMouseDownMove
+
+        private void ProcessMouseDownMove(MouseEventArgs e, GridPanel panel)
+        {
+            if (_MouseDownHitRow != null)
+            {
+                Rectangle r = ViewRect;
+
+                if (MouseDownPoint.Y < r.Y)
+                {
+                    int n = SuperGrid.PrimaryGrid.FixedRowHeight -
+                            SuperGrid.PrimaryGrid.FixedHeaderHeight;
+
+                    r.Y -= n;
+                    r.Height += n;
+                }
+
+                VScrollBarAdv vsb = SuperGrid.VScrollBar;
+
+                if ((e.Y >= r.Y) && 
+                    (e.Y < r.Bottom || (vsb.Value >= vsb.Maximum - vsb.LargeChange)))
+                {
+                    SuperGrid.DisableAutoScrolling();
+
+                    switch (_MouseDownHitArea)
+                    {
+                        case RowArea.InRowHeader:
+                            panel.HotItem = _HitItem;
+                            ProcessInRowHeader(panel, e);
+                            break;
+
+                        case RowArea.InRowResize:
+                            ProcessInRowResize(panel, e.Location);
+                            break;
+
+                        case RowArea.InContent:
+                        case RowArea.InWhiteSpace:
+                            ProcessInContent(panel, e.Location, e);
+                            break;
+                    }
+                }
+                else
+                {
+                    SuperGrid.EnableAutoScrolling(AutoScrollEnable.Vertical, r);
+
+                    StopResize();
+                    StopReorder();
+                }
+            }
+        }
+
+        #region ProcessInContent
+
+        private void ProcessInContent(
+            GridPanel panel, Point pt, MouseEventArgs e)
+        {
+            GridContainer container = _MouseDownHitRow.Parent as GridContainer;
+
+            if (container != null)
+            {
+                if (panel.SelectionGranularity != SelectionGranularity.Cell)
+                {
+                    _HitItem = GetRowAt(panel, pt);
+
+                    if (_HitItem != null)
+                    {
+                        if (DragStarted(panel, e) == false)
+                        {
+                            if (panel.CellDragBehavior == CellDragBehavior.ExtendSelection)
+                            {
+                                if (panel.MultiSelect == true)
+                                {
+                                    if (_HitItem != panel.LastProcessedItem)
+                                        ProcessExtendSelection(panel, true);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ProcessMouseMove
+
+        private void ProcessMouseMove(MouseEventArgs e, GridPanel panel)
+        {
+            _HitArea = GetHitArea(e.Location);
+            
+            if (IsMouseDown == false)
+            {
+                switch (_HitArea)
+                {
+                    case RowArea.InRowHeader:
+                        panel.HotItem = _HitItem;
+                        SuperGrid.GridCursor = Cursors.Default;
+                        break;
+
+                    case RowArea.InRowCheckBox:
+                    case RowArea.InCellCheckBox:
+                    case RowArea.InCellExpand:
+                        panel.HotItem = null;
+                        SuperGrid.GridCursor = Cursors.Hand;
+                        break;
+
+                    case RowArea.InRowResize:
+                        panel.HotItem = _HitItem;
+                        SuperGrid.GridCursor = Cursors.HSplit;
+                        break;
+
+                    default:
+                        panel.HotItem = null;
+                        SuperGrid.GridCursor = Cursors.Default;
+                        break;
+                }
+            }
+            else
+            {
+                if ((Control.MouseButtons & MouseButtons.Left) != MouseButtons.Left)
+                    SuperGrid.GridCursor = Cursors.Default;
+            }
+
+            if (_HitArea != _LastArea)
+            {
+                if (_HitArea == RowArea.InRowInfo)
+                    ProcessRowInfoEnter(e);
+
+                else if (_LastArea == RowArea.InRowInfo)
+                    ProcessRowInfoLeave();
+
+                if (_HitArea == RowArea.InWhiteSpace || _LastArea == RowArea.InWhiteSpace)
+                {
+                    if (panel.RowHighlightType == RowHighlightType.Full)
+                        InvalidateRender(Bounds);
+                    else
+                        InvalidateWhitespace();
+                }
+
+                _LastArea = _HitArea;
+            }
+        }
+
+        #region ProcessRowInfoEnter
+
+        private void ProcessRowInfoEnter(MouseEventArgs e)
+        {
+            if (SuperGrid.DoRowInfoEnterEvent(this, e.Location) == false)
+                SuperGrid.ToolTipText = InfoText;
+        }
+
+        #endregion
+
+        #region ProcessRowInfoLeave
+
+        private void ProcessRowInfoLeave()
+        {
+            SuperGrid.ToolTipText = "";
+            SuperGrid.DoRowInfoLeaveEvent(this);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region InternalMouseDown
+
+        /// <summary>
+        /// InternalMouseDown
+        /// </summary>
+        /// <param name="e"></param>
+        internal override void InternalMouseDown(MouseEventArgs e)
+        {
+            GridPanel panel = GridPanel;
+
+            RowArea hitArea = _HitArea;
+            GridContainer hitItem = _HitItem;
+
+            if (panel != null && hitItem != null)
+            {
+                SuperGrid.DoRowMouseDownEvent(this, e, hitArea);
+
+                if (_HitArea == RowArea.InRowResize)
+                {
+                    _MouseDownHitArea = _HitArea;
+                    _MouseDownHitRow = _HitItem;
+                    _MouseDownPoint = e.Location;
+
+                    InitRowResize(e);
+                    return;
+                }
+
+                if (CanSetActiveRow(panel, hitItem, true) == true)
+                {
+                    _HitItem = hitItem;
+                    _HitArea = hitArea;
+
+                    int rowIndex = RowIndex;
+
+                    if (panel.OnlySendFinalRowActivatedEvents == false || hitArea != RowArea.InSubItem)
+                    {
+                        if (panel.SetActiveRow(_HitItem, true) == true)
+                        {
+                            if (_HitArea != RowArea.InContent)
+                                panel.DeactivateEdit();
+
+                            if (rowIndex > RowIndex)
+                            {
+                                SuperGrid.ArrangeGrid();
+
+                                GridContainer row = panel.GetElementAt(e) as GridContainer;
+
+                                if (row != null)
+                                {
+                                    row.InternalMouseMove(e);
+                                    row.InternalMouseDown(e);
+                                    return;
+                                }
+                            }
+
+                            _MouseDownHitArea = _HitArea;
+                            _MouseDownHitRow = _HitItem;
+                            _MouseDownPoint = e.Location;
+
+                            _dragSelection = false;
+                            _dragStarted = false;
+
+                            switch (_HitArea)
+                            {
+                                case RowArea.InRowHeader:
+                                    panel.LastProcessedItem = _HitItem;
+
+                                    switch (panel.RowDragBehavior)
+                                    {
+                                        case RowDragBehavior.Move:
+                                        case RowDragBehavior.GroupMove:
+                                            InitExtendSelection(panel);
+
+                                            if ((Control.ModifierKeys & (Keys.Control | Keys.Shift)) == 0)
+                                                InitRowMove(panel);
+                                            break;
+
+                                        case RowDragBehavior.ExtendSelection:
+                                            InitSelectOrDrag(panel);
+                                            break;
+                                    }
+                                    return;
+
+                                case RowArea.InContent:
+                                    if (_HitItem is GridPanel ||
+                                        panel.SelectionGranularity != SelectionGranularity.Cell)
+                                    {
+                                        InitSelectOrDrag(panel);
+                                    }
+                                    break;
+
+                                case RowArea.InWhiteSpace:
+                                    panel.LastProcessedItem = _HitItem;
+
+                                    GridCell acell = SuperGrid.ActiveCell;
+
+                                    if (acell != null)
+                                        acell.ResumeMerge(null);
+
+                                    switch (panel.RowWhitespaceClickBehavior)
+                                    {
+                                        case RowWhitespaceClickBehavior.ClearSelection:
+                                            panel.ClearAll();
+                                            break;
+
+                                        case RowWhitespaceClickBehavior.ExtendSelection:
+                                            InitExtendSelection(panel);
+                                            break;
+                                    }
+                                    return;
+
+                                case RowArea.InCellExpand:
+                                    panel.LastProcessedItem = _HitItem;
+
+                                    ProcessInExpandButton(e);
+
+                                    if (panel.SelectionGranularity != SelectionGranularity.Cell)
+                                        return;
+                                    break;
+                            }
+
+                            base.InternalMouseDown(e);
+                        }
+                        else
+                        {
+                            _MouseDownHitArea = RowArea.NoWhere;
+                            _MouseDownHitRow = null;
+                        }
+                    }
+                    else
+                    {
+                        _MouseDownHitArea = _HitArea;
+                        _MouseDownHitRow = _HitItem;
+                        _MouseDownPoint = e.Location;
+
+                        base.InternalMouseDown(e);
+                    }
+                }
+            }
+        }
+
+        #region InitSelectOrDrag
+
+        private void InitSelectOrDrag(GridPanel panel)
+        {
+            if (panel.SuperGrid.HasItemDragHandler == false || IsSelected == false ||
+                ((Control.ModifierKeys & (Keys.Control | Keys.Shift)) != Keys.None))
+            {
+                InitExtendSelection(panel);
+            }
+            else if (IsMouseDown == true)
+            {
+                Capture = true;
+
+                _dragSelection = true;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InternalMouseUp
+
+        /// <summary>
+        /// InternalMouseUp
+        /// </summary>
+        /// <param name="e"></param>
+        internal override void InternalMouseUp(MouseEventArgs e)
+        {
+            GridPanel panel = GridPanel;
+
+            if (panel != null)
+            {
+                SuperGrid.DisableAutoScrolling();
+                
+                if (SuperGrid.DoRowClickEvent(this, _MouseDownHitArea, e) == false)
+                {
+                    switch (_MouseDownHitArea)
+                    {
+                        case RowArea.InRowInfo:
+                            SuperGrid.DoRowInfoClickEvent(this, e);
+                            break;
+
+                        case RowArea.InRowCheckBox:
+                            ProcessInCheckBox(panel, _HitItem, e);
+                            break;
+
+                        case RowArea.InRowResize:
+                            if (IsResizing == true)
+                            {
+                                StopResize();
+
+                                if (panel.ImmediateResize == false)
+                                {
+                                    ResizeRow(panel, e.Location.Y);
+                                    PostInternalMouseMove();
+                                }
+                            }
+                            break;
+
+                        case RowArea.InRowHeader:
+                            if (IsReordering == true)
+                            {
+                                ReorderRow(panel);
+
+                                StopReorder();
+                                PostInternalMouseMove();
+                            }
+                            else
+                            {
+                                ExtendDragSelection(panel, e);
+
+                                panel.ColumnHeader.InvalidateRowHeader();
+                            }
+
+                            SuperGrid.DoRowHeaderClickEvent(panel, this, e);
+                            break;
+
+                        case RowArea.InCellCheckBox:
+                            ProcessInCheckBox(panel, this, e);
+                            break;
+
+                        case RowArea.InContent:
+                            ExtendDragSelection(panel, e);
+                            break;
+                    }
+                }
+
+                base.InternalMouseUp(e);
+
+                SuperGrid.DoRowMouseUpEvent(this, e, _MouseDownHitArea);
+            }
+
+            _MouseDownHitRow = null;
+        }
+
+        #region ExtendDragSelection
+
+        private void ExtendDragSelection(GridPanel panel, MouseEventArgs e)
+        {
+            if (_dragSelection == true && Capture == true)
+            {
+                if (IsMouseSelectableEx(e.Button) == true)
+                    ExtendSelectionEx(panel);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InternalMouseDoubleClick
+
+        internal override void InternalMouseDoubleClick(MouseEventArgs e)
+        {
+            if (SuperGrid.EditorCell == null)
+            {
+                GridPanel panel = GridPanel;
+
+                if (panel != null)
+                {
+                    if (SuperGrid.DoRowDoubleClickEvent(this, _MouseDownHitArea, e) == false)
+                    {
+                        switch (_MouseDownHitArea)
+                        {
+                            case RowArea.InRowHeader:
+                                SuperGrid.DoRowHeaderDoubleClickEvent(this, e);
+                                break;
+
+                            case RowArea.InRowInfo:
+                                SuperGrid.DoRowInfoDoubleClickEvent(this, e);
+                                break;
+
+                            case RowArea.InRowResize:
+                                int n = Dpi.DescaleHeight(GetMaximumRowHeight());
+
+                                if (panel.VirtualMode == true)
+                                    panel.VirtualRowHeight = n;
+                                else
+                                    RowHeight = n;
+
+                                StopResize();
+                                break;
+
+                            case RowArea.InContent:
+                                if (panel.RowDoubleClickBehavior == RowDoubleClickBehavior.Activate)
+                                {
+                                    if (MouseActivateCell(e, panel) == true)
+                                        return;
+                                }
+                                else
+                                {
+                                    Expanded = !Expanded;
+                                }
+                                break;
+                        }
+
+                        base.InternalMouseDoubleClick(e);
+                    }
+                }
+            }
+        }
+
+        #region MouseActivateCell
+
+        private bool MouseActivateCell(MouseEventArgs e, GridPanel panel)
+        {
+            if (panel.MouseEditMode == MouseEditMode.DoubleClick)
+            {
+                GridCell cell = null;
+
+                if (panel.SelectionGranularity != SelectionGranularity.Cell)
+                {
+                    if (_HitArea == RowArea.InContent)
+                    {
+                        switch (panel.RowEditMode)
+                        {
+                            case RowEditMode.PrimaryCell:
+                                if (panel.PrimaryColumn != null &&
+                                    panel.PrimaryColumn.Visible == true)
+                                {
+                                    cell = _Cells[panel.PrimaryColumnIndex];
+                                }
+                                else
+                                {
+                                    cell = FirstVisibleCell;
+                                }
+                                break;
+
+                            default:
+                                cell = GetCellAt(panel, e.X, e.Y);
+                                break;
+                        }
+                    }
+                }
+                else
+                {
+                    cell = GetCellAt(panel, e.X, e.Y);
+                }
+
+                if (cell != null)
+                {
+                    cell.InternalMouseDoubleClick(e);
+
+                    return (true);
+                }
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ProcessInExpandButton
+
+        private void ProcessInExpandButton(MouseEventArgs e)
+        {
+            if ((e.Button & MouseButtons.Left) == MouseButtons.Left)
+                Expanded = !Expanded;
+        }
+
+        #endregion
+
+        #region ProcessInCheckBox
+
+        internal void ProcessInCheckBox(
+            GridPanel panel, GridContainer item, MouseEventArgs e)
+        {
+            if ((e.Button & MouseButtons.Left) == MouseButtons.Left)
+            {
+                if (item != null && item.CanModify == true)
+                {
+                    ProcessNewRowChange(panel);
+
+                    if (SuperGrid.DoBeforeCheckEvent(panel, item) == false)
+                        item.Checked = !item.Checked;
+                }
+            }
+        }
+
+        #endregion
+
+        #region ProcessInRowHeader
+
+        private void ProcessInRowHeader(GridPanel panel, MouseEventArgs e)
+        {
+            GridContainer container = _MouseDownHitRow.Parent as GridContainer;
+
+            if (container != null)
+            {
+                Point pt = e.Location;
+
+                _HitItem = GetRowAt(panel, pt);
+
+                if (_HitItem != null)
+                {
+                    switch (panel.RowDragBehavior)
+                    {
+                        case RowDragBehavior.Move:
+                        case RowDragBehavior.GroupMove:
+                            if (IsInsertRow == false &&
+                                panel.VirtualMode == false)
+                            {
+                                if (IsReordering == false)
+                                    StartReorder(pt);
+                                else
+                                    ContinueReorder(panel, pt);
+                            }
+                            break;
+
+                        case RowDragBehavior.ExtendSelection:
+                            if (DragStarted(panel, e) == false)
+                            {
+                                if (panel.MultiSelect == true)
+                                {
+                                    if (_HitItem != panel.LastProcessedItem)
+                                        ProcessExtendSelection(panel, true);
+                                }
+                            }
+                            break;
+                    }
+                }
+            }
+        }
+
+        #region DragStarted
+
+        private bool DragStarted(GridPanel panel, MouseEventArgs e)
+        {
+            if (_dragSelection == true && Capture == true)
+            {
+                if (_dragStarted == false)
+                {
+                    if (DragDrop.DragStarted(_MouseDownPoint, e.Location) == true)
+                    {
+                        _dragStarted = true;
+
+                        if (SuperGrid.DoItemDragEvent(this, e) == true)
+                        {
+                            _dragSelection = false;
+
+                            InitExtendSelection(panel);
+                        }
+                    }
+                }
+
+                return (true);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InitExtendSelection
+
+        private void InitExtendSelection(GridPanel panel)
+        {
+            if (IsMouseSelectable() == true)
+            {
+                Capture = true;
+
+                ExtendSelectionEx(panel);
+            }
+        }
+
+        #region ExtendSelectionEx
+
+        private void ExtendSelectionEx(GridPanel panel)
+        {
+            if (_MouseDownHitRow != null && _HitItem != null)
+            {
+                _AnchorIndex = _MouseDownHitRow.GridIndex;
+
+                if (panel.LastProcessedItem != this && panel.LastProcessedItem != null)
+                    panel.LastProcessedItem.InvalidateRender();
+
+                bool ckey = panel.MultiSelect == true
+                                ? ((Control.ModifierKeys & Keys.Control) == Keys.Control)
+                                : false;
+
+                panel.LastProcessedItem = (ckey == true) ? _HitItem : this;
+
+                ProcessExtendSelection(panel, false);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ProcessExtendSelection
+
+        internal void ProcessExtendSelection(GridPanel panel, bool extend)
+        {
+            bool ckey = panel.MultiSelect == true
+                            ? ((Control.ModifierKeys & Keys.Control) == Keys.Control)
+                            : false;
+
+            if (ckey == true)
+                ProcessControlExtend(panel, extend);
+            else
+                ProcessNonControlExtend(panel, extend);
+
+            panel.LastProcessedItem = _HitItem;
+        }
+
+        #region IsMouseSelectable
+
+        private bool IsMouseSelectable()
+        {
+            return (IsMouseSelectableEx(Control.MouseButtons));
+        }
+
+        private bool IsMouseSelectableEx(MouseButtons mb)
+        {
+            if ((mb & MouseButtons.Left) == MouseButtons.Left)
+                return (true);
+
+            return (IsSelected == false);
+        }
+
+        #endregion
+
+        #region ProcessControlExtend
+
+        private void ProcessControlExtend(GridPanel panel, bool extend)
+        {
+            if (panel.LastProcessedItem == null)
+                panel.LastProcessedItem = _MouseDownHitRow;
+
+            GridContainer lastRow = panel.LastProcessedItem as GridContainer;
+
+            if (lastRow != null)
+            {
+                int startIndex = lastRow.GridIndex;
+                int endIndex = _HitItem.GridIndex;
+
+                panel.NormalizeIndices(extend,
+                    _AnchorIndex, ref startIndex, ref endIndex);
+
+                for (int i = startIndex; i <= endIndex; i++)
+                {
+                    if (extend == false || i != _AnchorIndex)
+                        panel.SetSelectedRows(i, 1, !panel.IsRowSelected(i));
+                }
+
+                InvalidateRows(panel, startIndex, endIndex, true);
+            }
+        }
+
+        #endregion
+
+        #region ProcessNonControlExtend
+
+        private void ProcessNonControlExtend(GridPanel panel, bool extend)
+        {
+            bool skey = (panel.MultiSelect == true) ?
+                ((Control.ModifierKeys & Keys.Shift) == Keys.Shift) : false;
+
+            if (skey == false || panel.SelectionRowAnchor == null)
+                panel.SelectionRowAnchor = _MouseDownHitRow;
+
+            ExtendSelection(panel, _HitItem, extend);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ResizeRow
+
+        #region InitRowResize
+
+        private void InitRowResize(MouseEventArgs e)
+        {
+            if ((Control.MouseButtons & MouseButtons.Left) == MouseButtons.Left)
+            {
+                Capture = true;
+
+                _MouseDownDelta = e.Y - _MouseDownHitRow.BoundsRelative.Bottom;
+
+                if (IsVFrozen == false)
+                    _MouseDownDelta += VScrollOffset;
+
+                IsResizing = false;
+            }
+            else
+            {
+                _MouseDownHitArea = RowArea.NoWhere;
+            }
+        }
+
+        #endregion
+
+        #region ProcessInRowResize
+
+        private void ProcessInRowResize(GridPanel panel, Point pt)
+        {
+            if (IsResizing == false)
+            {
+                StartResize();
+            }
+            else
+            {
+                if (panel.ImmediateResize == false)
+                    ContinueResize(panel, pt);
+                else
+                    ResizeRow(panel, pt.Y);
+            }
+        }
+
+        #endregion
+
+        #region StartResize
+
+        private void StartResize()
+        {
+            GridPanel panel = GridPanel;
+
+            if (panel != null)
+            {
+                IsResizing = true;
+
+                if (panel.ImmediateResize == false)
+                {
+                    _separatorFw = new FloatWindow();
+                    _separatorFw.Opacity = .5;
+                    _separatorFw.BackColor = Color.Black;
+                    _separatorFw.Owner = SuperGrid.FindForm();
+                }
+            }
+        }
+
+        #endregion
+
+        #region StopResize
+
+        private void StopResize()
+        {
+            IsResizing = false;
+
+            if (_separatorFw != null)
+            {
+                _separatorFw.Close();
+                _separatorFw.Dispose();
+
+                _separatorFw = null;
+            }
+        }
+
+        #endregion
+
+        #region ContinueResize
+
+        private void ContinueResize(GridPanel panel, Point pt)
+        {
+            Rectangle r = panel.BoundsRelative;
+
+            if (panel.Parent != null)
+                r.Y -= VScrollOffset;
+
+            r.X -= HScrollOffset;
+
+            if (pt.X > r.X)
+            {
+                Rectangle t = _MouseDownHitRow.BoundsRelative;
+
+                if (panel.IsSubPanel == true)
+                    t.X -= HScrollOffset;
+
+                if (IsVFrozen == false)
+                    t.Y -= VScrollOffset;
+
+                int height = pt.Y - t.Y;
+
+                if (height < Dpi.Height(panel.MinRowHeight))
+                    pt.Y = t.Y +  Dpi.Height(panel.MinRowHeight);
+
+                if (pt.Y >= SuperGrid.PrimaryGrid.BoundsRelative.Bottom -  Dpi.Height2)
+                {
+                    _separatorFw.Hide();
+                }
+                else
+                {
+                    if (pt.Y == panel.BoundsRelative.Bottom - 1)
+                        pt.Y--;
+
+                    r.Height = SeparatorHeight;
+                    r.Y = pt.Y;
+
+                    r.X = t.X;
+                    r.Width = t.Width;
+
+                    Rectangle v = SViewRect;
+
+                    if (r.X < v.X)
+                    {
+                        r.Width -= (v.X - r.X);
+                        r.X = v.X;
+                    }
+
+                    if (r.Right > v.Right)
+                        r.Width -= (r.Right - v.Right);
+
+                    r.Location = SuperGrid.PointToScreen(r.Location);
+
+                    _separatorFw.Show();
+
+                    _separatorFw.Bounds = r;
+                    _separatorFw.Size = r.Size;
+                }
+            }
+        }
+
+        #endregion
+
+        #region ResizeRow
+
+        private void ResizeRow(GridPanel panel, int y)
+        {
+            int ry = _MouseDownHitRow.BoundsRelative.Bottom;
+            y -= _MouseDownDelta;
+
+            if (IsVFrozen == false)
+                y += VScrollOffset;
+
+            int dy = y - ry;
+
+            if (dy != 0)
+            {
+                int n = Dpi.DescaleHeight(Size.Height + dy + _MouseDownDelta);
+
+                n = Math.Max(n, panel.MinRowHeight);
+                n = Math.Min(n, panel.MaxRowHeight);
+
+                if (panel.VirtualMode == true)
+                {
+                    panel.VirtualRowHeight = n;
+                }
+                else
+                {
+                    if (_MouseDownHitRow is GridRow)
+                        ((GridRow)_MouseDownHitRow).RowHeight = n;
+                }
+
+                SuperGrid.DoRowResizedEvent(panel, _MouseDownHitRow);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ReorderRow
+
+        #region InitRowMove
+
+        private void InitRowMove(GridPanel panel)
+        {
+            if (panel.CanMoveRow == true)
+            {
+                Capture = true;
+
+                panel.ClearAll();
+                IsSelected = true;
+
+                IsReordering = false;
+
+                panel.SelectionRowAnchor = _MouseDownHitRow;
+            }
+        }
+
+        #endregion
+
+        #region StartReorder
+
+        private void StartReorder(Point pt)
+        {
+            if (Math.Abs(MouseDownPoint.Y - pt.Y) > 5)
+            {
+                IsReordering = true;
+                _SeparatorRow = null;
+
+                _headerFw = new FloatWindow();
+                _headerFw.Opacity = .3;
+                _headerFw.Owner = SuperGrid.FindForm();
+                _headerFw.Paint += RowHeaderFwPaint;
+
+                _separatorFw = new FloatWindow();
+                _separatorFw.BackColor = Color.Black;
+                _separatorFw.Owner = SuperGrid.FindForm();
+
+                using (GraphicsPath path = new GraphicsPath())
+                {
+                    path.AddLines(new Point[]
+                    {
+                        new Point(Dpi.Width3, Dpi.Height3),
+                        new Point(0, Dpi.Height6),
+                        new Point(0, 0),
+                        new Point(Dpi.Width3, Dpi.Height3),
+                    });
+
+                    path.CloseFigure();
+
+                    path.AddLines(new Point[]
+                    {
+                        new Point(Dpi.Width4, Dpi.Height3),
+                        new Point(10000, Dpi.Height3),
+                        new Point(10000, Dpi.Height4),
+                        new Point(Dpi.Width4, Dpi.Height4),
+                        new Point(Dpi.Width4, Dpi.Height3),
+                    });
+
+                    path.CloseFigure();
+
+                    Region rgn = new Region(path);
+
+                    _separatorFw.Region = rgn;
+                }
+
+            }
+        }
+
+        #endregion
+
+        #region StopReorder
+
+        private void StopReorder()
+        {
+            IsReordering = false;
+
+            if (_headerFw != null)
+            {
+                _headerFw.Close();
+                _headerFw.Paint -= RowHeaderFwPaint;
+                _headerFw.Dispose();
+
+                _headerFw = null;
+            }
+
+            if (_separatorFw != null)
+            {
+                _separatorFw.Close();
+                _separatorFw.Dispose();
+
+                _separatorFw = null;
+            }
+        }
+
+        #endregion
+
+        #region ContinueReorder
+
+        private void ContinueReorder(GridPanel panel, Point pt)
+        {
+            GridContainer row = _HitItem;
+
+            if (row != null)
+            {
+                ReorderHeader(pt);
+
+                GridContainer mcont =
+                    _MouseDownHitRow.Parent as GridContainer;
+
+                GridContainer ncont =
+                    row.Parent as GridContainer;
+
+                if (mcont != null && ncont != null)
+                {
+                    if (mcont == ncont ||
+                        (panel.RowDragBehavior == RowDragBehavior.GroupMove))
+                    {
+                        int n = ncont.Rows.IndexOf(row);
+                        int m = mcont.Rows.IndexOf(_MouseDownHitRow);
+
+                        if (m >= 0 && n >= 0)
+                        {
+                            if (_MouseDownHitRow.IsVFrozen == row.IsVFrozen)
+                                ReorderSeparator(panel, pt);
+                        }
+                    }
+                }
+            }
+        }
+
+        #region ReorderHeader
+
+        private void ReorderHeader(Point pt)
+        {
+            GridPanel panel = GridPanel;
+
+            if (panel != null)
+            {
+                Rectangle r = BoundsRelative;
+                r.Location = PointToScroll(panel, r.Location);
+
+                if (r.Height <= 0)
+                {
+                    _headerFw.Hide();
+                }
+                else
+                {
+                    Size size = _headerFw.Size;
+                    Rectangle t = panel.IsSubPanel ? SViewRect : ViewRect;
+
+                    if (r.X < t.X)
+                        r.X = t.X;
+
+                    if (r.Right > t.Right)
+                        r.Width -= (r.Right - t.Right);
+
+                    r.Height = _MouseDownHitRow.ContainerBounds.Height;
+                    r.Height = Math.Min(r.Height, panel.MaxRowHeight);
+
+                    r.Y = pt.Y - (r.Height / 2);
+
+                    r.Location = SuperGrid.PointToScreen(r.Location);
+
+                    _headerFw.Bounds = r;
+
+                    if (_headerFw.Visible == false)
+                        _headerFw.Show();
+
+                    else if (r.Size.Equals(size) == false)
+                        _headerFw.Refresh();
+
+                }
+            }
+        }
+
+        #endregion
+
+        #region ReorderSeparator
+
+        private void ReorderSeparator(GridPanel panel, Point pt)
+        {
+            GridContainer row = _HitItem;
+
+            if (row != null && 
+                (row.IsChildOf(_MouseDownHitRow) == false))
+            {
+                Rectangle bounds = row.ContainerBounds;
+                bounds.Location = PointToScroll(panel, bounds.Location);
+
+                bool isBottom = (pt.Y > bounds.Y + bounds.Height / 2);
+                bool isControlDown = (Control.ModifierKeys & Keys.Control) == Keys.Control;
+
+                if (IsControlDown != isControlDown ||
+                    _SeparatorRow != row || IsSeparatorAtBottom != isBottom)
+                {
+                    if (isBottom == false || panel.ShowInsertRow == false)
+                    {
+                        _SeparatorRow = row;
+                        IsSeparatorAtBottom = isBottom;
+
+                        IsControlDown = isControlDown;
+
+                        Rectangle r = bounds;
+                        r.Y += isBottom ? row.FixedRowHeight - Dpi.Width4 : -Dpi.Width4;
+
+                        Rectangle t = SViewRect;
+
+                        if (r.X < t.X)
+                            r.X = t.X;
+
+                        int level = row.IndentLevel;
+
+                        if (IsSeparatorAtBottom == true && isControlDown == true)
+                            level++;
+
+                        int n = Dpi.Width(level * panel.LevelIndentSize.Width + 1);
+
+                        r.X += n;
+                        r.Width -= n;
+
+                        if (r.Right > t.Right)
+                            r.Width -= (r.Right - t.Right);
+
+                        if (IsVFrozen == true || (r.Y + 4 >= t.Y && r.Y < t.Bottom))
+                        {
+                            r.Location = SuperGrid.PointToScreen(r.Location);
+
+                            _separatorFw.Show();
+
+                            _separatorFw.Location = r.Location;
+                            _separatorFw.Width = r.Width;
+                        }
+                    }
+                }
+            }
+            else
+            {
+                _SeparatorRow = null;
+
+                if (_separatorFw != null)
+                    _separatorFw.Hide();
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ReorderRow
+
+        private void ReorderRow(GridPanel panel)
+        {
+            if ((_MouseDownHitRow != _SeparatorRow) &&
+                (_MouseDownHitRow != null && _SeparatorRow != null))
+            {
+                if (_SeparatorRow.IsChildOf(_MouseDownHitRow) == false)
+                {
+                    GridContainer mcont = _MouseDownHitRow.Parent as GridContainer;
+                    GridContainer ncont = _SeparatorRow.Parent as GridContainer;
+
+                    if (mcont != null && ncont != null)
+                    {
+                        int n = ncont.Rows.IndexOf(_SeparatorRow);
+                        int m = mcont.Rows.IndexOf(_MouseDownHitRow);
+
+                        if (panel.RowDragBehavior == RowDragBehavior.GroupMove)
+                        {
+                            if (IsSeparatorAtBottom == true &&
+                                ((Control.ModifierKeys & Keys.Control) == Keys.Control))
+                            {
+                                n = 0;
+                                ncont = _SeparatorRow;
+
+                                IsSeparatorAtBottom = false;
+                            }
+                        }
+
+                        if (m >= 0 && n >= 0)
+                        {
+                            if (ncont == mcont)
+                            {
+                                if (n > m && IsSeparatorAtBottom == false)
+                                    n--;
+
+                                else if (m > n && IsSeparatorAtBottom == true)
+                                    n++;
+
+                                if (m == n)
+                                    return;
+                            }
+                            else
+                            {
+                                if (IsSeparatorAtBottom == true)
+                                    n++;
+                            }
+
+                            if (SuperGrid.DoRowMovingEvent(this, mcont, m, ref ncont, ref n) == false)
+                            {
+                                _MouseDownHitRow.IsSelected = false;
+
+                                mcont.Rows.RemoveAt(m);
+                                ncont.Rows.Insert(n, _MouseDownHitRow);
+
+                                panel.UpdateIndicees(panel, panel.Rows, true);
+
+                                if (_MouseDownHitRow.IsExpandedVisible == true)
+                                    _MouseDownHitRow.SetActive(true);
+
+                                ncont.InvalidateRender();
+
+                                SuperGrid.DoRowMovedEvent(
+                                    mcont.GridPanel, mcont, _MouseDownHitRow);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RowHeaderFwPaint
+
+        void RowHeaderFwPaint(object sender, PaintEventArgs e)
+        {
+            Rectangle r = _headerFw.ClientRectangle;
+
+            if (_MouseDownHitRow != null)
+            {
+                GridPanel panel = GridPanel;
+
+                if (panel != null)
+                {
+                    GridPanelVisualStyle pstyle = panel.GetEffectiveStyle();
+
+                    RenderRowHeader(e.Graphics, panel, _MouseDownHitRow, pstyle, r, false);
+                }
+            }
+
+            r.Width--;
+            r.Height--;
+            e.Graphics.DrawRectangle(Pens.DimGray, r);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ExtendSelection
+
+        internal void ExtendSelection(GridPanel panel)
+        {
+            _HitItem = this;
+
+            _MouseDownHitRow = _HitItem;
+            _MouseDownHitArea = RowArea.InContent;
+
+            InvalidateRowHeader(_MouseDownHitRow);
+
+            ProcessExtendSelection(panel, false);
+        }
+
+        #endregion
+
+        #region GetHitArea
+
+        ///<summary>
+        /// This routine gets the RowArea 'HitArea' containing the
+        /// given point (e.g. InCellCheckBox, InCellExpand, InRowHeader, etc).
+        ///</summary>
+        ///<param name="pt"></param>
+        ///<returns></returns>
+        public RowArea GetHitArea(Point pt)
+        {
+            GridPanel panel = GridPanel;
+
+            if (panel != null)
+            {
+                _HitItem = this;
+
+                Rectangle r = BoundsRelative;
+                r.Height = FixedRowHeight;
+
+                if (panel.IsSubPanel == true)
+                    r.X -= HScrollOffset;
+
+                if (IsVFrozen == false)
+                    r.Y -= VScrollOffset;
+
+                if (r.Contains(pt))
+                    return (GetRowHitArea(pt, panel, r));
+
+                return (GetItemHitArea(pt, panel));
+            }
+
+            return (RowArea.NoWhere);
+        }
+
+        #region GetRowHitArea
+
+        private RowArea GetRowHitArea(
+            Point pt, GridPanel panel, Rectangle r)
+        {
+            if (panel.ShowRowHeaders == true)
+            {
+                if (pt.X >= r.X && pt.X < r.X + panel.RowHeaderWidthEx)
+                    return (GetRowHeaderArea(pt, panel, r));
+            }
+
+            GridColumn column = panel.PrimaryColumn;
+
+            if (column != null && column.Visible == true)
+            {
+                Rectangle t = _ExpandButtonBounds;
+
+                if (IsVFrozen == false)
+                    t.Y -= VScrollOffset;
+
+                if (panel.IsSubPanel == true || column.IsHFrozen == false)
+                    t.X -= HScrollOffset;
+
+                if (t.Contains(pt) == true)
+                    return (RowArea.InCellExpand);
+
+                if (CanModify == true)
+                {
+                    t = CheckBoxBounds;
+
+                    if (IsVFrozen == false)
+                        t.Y -= VScrollOffset;
+
+                    if (panel.IsSubPanel == true || column.IsHFrozen == false)
+                        t.X -= HScrollOffset;
+
+                    if (t.Contains(pt) == true)
+                        return (RowArea.InCellCheckBox);
+                }
+
+                column = panel.Columns.LastVisibleColumn;
+
+                t = column.BoundsRelative;
+                t.Location = PointToScroll(panel, t.Location);
+
+                if (pt.X > t.Right)
+                    return (RowArea.InWhiteSpace);
+            }
+
+            return (RowArea.InContent);
+        }
+
+        #endregion
+
+        #region GetRowHeaderArea
+
+        private RowArea GetRowHeaderArea(
+            Point pt, GridPanel panel, Rectangle r)
+        {
+            if (InfoImageBounds.Contains(pt) == true)
+                return (RowArea.InRowInfo);
+
+            if (panel.AllowRowResize == true)
+            {
+                if (pt.Y > r.Bottom - Dpi.Height6)
+                    return (RowArea.InRowResize);
+            }
+
+            return (RowArea.InRowHeader);
+        }
+
+        #endregion
+
+        #region GetItemHitArea
+
+        private RowArea GetItemHitArea(Point pt, GridPanel panel)
+        {
+            _HitItem = GetRowElementAt(pt.X, pt.Y, false) as GridContainer;
+
+            if (_HitItem != null)
+            {
+                Rectangle t = SViewRect;
+                GridPanel ipanel = _HitItem as GridPanel;
+
+                if (ipanel != null)
+                {
+                    Rectangle bounds = ipanel.BoundsRelative;
+                    bounds.X -= HScrollOffset;
+
+                    if (IsVFrozen == false)
+                        bounds.Y -= VScrollOffset;
+
+                    if (bounds.X < t.X)
+                    {
+                        bounds.Width -= (t.X - bounds.X);
+                        bounds.X = t.X;
+                    }
+
+                    if (bounds.Contains(pt))
+                        return (RowArea.InSubItem);
+
+                    if (panel.ShowRowHeaders == true)
+                    {
+                        Rectangle r = ipanel.ContainerBounds;
+                        r.Width = panel.RowHeaderWidthEx;
+
+                        if (panel.IsSubPanel == true)
+                            r.X -= HScrollOffset;
+
+                        if (IsVFrozen == false)
+                            r.Y -= VScrollOffset;
+
+                        if (r.Contains(pt))
+                            return (RowArea.InRowHeader);
+                    }
+
+                    if (ipanel.HasCheckBox == true && panel.ReadOnly == false)
+                    {
+                        Rectangle r = ipanel.CheckBoxBounds;
+                        r.Location = PointToScroll(ipanel, r.Location);
+
+                        if (r.Contains(pt) == true)
+                            return (RowArea.InRowCheckBox);
+                    }
+                }
+                else
+                {
+                    return (RowArea.InSubItem);
+                }
+            }
+
+            return (RowArea.InContent);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetElementAt
+
+        /// <summary>
+        /// Gets the row element containing the given coordinates.
+        /// </summary>
+        /// <param name="x"></param>
+        /// <param name="y"></param>
+        /// <returns>Element or null</returns>
+        public override GridElement GetElementAt(int x, int y)
+        {
+            return (GetRowElementAt(x, y, true));
+        }
+
+        #endregion
+
+        #region GetRowElementAt
+
+        internal GridElement GetRowElementAt(int x, int y, bool clip)
+        {
+            GridPanel panel = GridPanel;
+
+            if (panel != null)
+            {
+                Rectangle r = BoundsRelative;
+                r.Height = FixedRowHeight;
+
+                if (IsVFrozen == false)
+                    r.Y -= VScrollOffset;
+
+                if (panel.IsSubPanel == true)
+                    r.X -= HScrollOffset;
+
+                if (r.Contains(x, y))
+                {
+                    GridCell cell = GetCellAt(panel, x, y);
+
+                    if (cell != null)
+                        return (cell);
+                }
+                else
+                {
+                    return (base.GetElementAt(x, y));
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetCellAt
+
+        /// <summary>
+        /// Returns element at specified mouse coordinates
+        /// </summary>
+        /// <param name="panel"></param>
+        /// <param name="x">Horizontal position</param>
+        /// <param name="y">Vertical position</param>
+        /// <returns>Reference to child element or null
+        /// if no element at specified coordinates</returns>
+        protected virtual GridCell GetCellAt(GridPanel panel, int x, int y)
+        {
+            bool isFrozen = IsVFrozen;
+            Rectangle t = SViewRect;
+
+            int[] map = panel.Columns.DisplayIndexMap;
+            for (int i = 0; i < map.Length; i++)
+            {
+                int index = map[i];
+
+                GridColumn column = panel.Columns[index];
+
+                if (column.Visible == true)
+                {
+                    if (index < _Cells.Count)
+                    {
+                        Rectangle bounds = _Cells[index].BoundsRelative;
+
+                        if (panel.IsSubPanel == true || column.IsHFrozen == false)
+                            bounds.X -= HScrollOffset;
+
+                        if (isFrozen == false)
+                        {
+                            bounds.Y -= VScrollOffset;
+                            bounds.Intersect(t);
+                        }
+
+                        if (bounds.Contains(x, y))
+                            return (_Cells[index]);
+                    }
+                    else
+                    {
+                        Rectangle r = column.BoundsRelative;
+                        r.Y = BoundsRelative.Y;
+                        r.Height = BoundsRelative.Height;
+
+                        Rectangle bounds = r;
+
+                        if (panel.IsSubPanel == true || column.IsHFrozen == false)
+                            bounds.X -= HScrollOffset;
+
+                        if (isFrozen == false)
+                        {
+                            bounds.Y -= VScrollOffset;
+                            bounds.Intersect(t);
+                        }
+
+                        if (bounds.Contains(x, y))
+                            return (GetEmptySelectionCell(column));
+
+                    }
+                }
+            }
+
+            return (null);
+        }
+
+        #region GetEmptySelectionCell
+
+        private GridCell GetEmptySelectionCell(GridColumn column)
+        {
+            if (_EmptySelectionCell == null ||
+                _EmptySelectionCell.ColumnIndex != column.ColumnIndex)
+            {
+                _EmptySelectionCell = new GridCell();
+            }
+
+            _EmptySelectionCell = 
+                GetEmptyCell(_EmptySelectionCell, column.ColumnIndex);
+
+            return (_EmptySelectionCell);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetRowAt
+
+        private GridContainer GetRowAt(GridPanel panel, Point pt)
+        {
+            Rectangle r = panel.ContainerBounds;
+            r.X -= HScrollOffset;
+
+            if (pt.X < r.X)
+                pt.X = r.X;
+
+            GridContainer row = panel;
+            GridElement item = row.InternalGetElementAt(pt.X, pt.Y);
+
+            while (item != null)
+            {
+                row = item as GridContainer;
+
+                if (row == null)
+                    break;
+
+                if (row is GridRow)
+                    item = ((GridRow)row).GetRowElementAt(pt.X, pt.Y, false);
+                else
+                    item = row.GetElementAt(pt.X, pt.Y);
+
+                if (item is GridContainer == false)
+                    return (row);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region CreateItemsCollection
+
+        /// <summary>
+        /// Creates the GridItemsCollection that hosts the items.
+        /// </summary>
+        /// <returns>New instance of GridItemsCollection.</returns>
+        protected override GridItemsCollection CreateItemsCollection()
+        {
+            GridItemsCollection items = new GridItemsCollection();
+
+            items.CollectionChanged += ItemsCollectionChanged;
+
+            return (items);
+        }
+
+        #endregion
+
+        #region DisposeItemsCollection
+
+        /// <summary>
+        /// DisposeItemsCollection
+        /// </summary>
+        /// <param name="items"></param>
+        protected override void DisposeItemsCollection(GridItemsCollection items)
+        {
+            items.CollectionChanged -= ItemsCollectionChanged;
+        }
+
+        #endregion
+
+        #region ItemsCollectionChanged
+
+        void ItemsCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            GridPanel panel = GridPanel;
+
+            bool dataRowChange = false;
+
+            switch (e.Action)
+            {
+                case NotifyCollectionChangedAction.Replace:
+                case NotifyCollectionChangedAction.Add:
+
+                    foreach (GridElement item in e.NewItems)
+                    {
+                        if (panel != null && panel.VirtualMode == true)
+                            throw new Exception("Virtual Grid can not have nested items.");
+
+                        item.Parent = this;
+                        item.NeedsMeasured = true;
+
+                        if (panel != null)
+                        {
+                            GridRow row = item as GridRow;
+
+                            if (row != null)
+                            {
+                                dataRowChange = true;
+
+                                if (e.Action == NotifyCollectionChangedAction.Replace)
+                                    panel.RemoveFromExpDictionary(row);
+
+                                panel.AddToExpDictionary(row);
+                            }
+                            else
+                            {
+                                panel.NeedToUpdateIndicees = true;
+                            }
+
+                            if (SuperGrid.IsUpdateSuspended == false && panel.IsSorting == false)
+                                panel.ExpandDeletedAtIndex(FullIndex + 1, 1);
+
+                            panel.NeedToUpdateIndicees = true;
+                        }
+                    }
+
+                    if (dataRowChange == true && panel.GroupColumns.Count > 0)
+                        panel.NeedsGrouped = true;
+                    break;
+
+                case NotifyCollectionChangedAction.Reset:
+                    if (panel != null)
+                    {
+                        dataRowChange = true;
+
+                        panel.ClearAll();
+
+                        if (panel.IsSorting == false)
+                            panel.ExpDictionary.Clear();
+                    }
+                    break;
+
+                case NotifyCollectionChangedAction.Remove:
+                    if (panel != null)
+                    {
+                        dataRowChange = true;
+
+                        panel.ClearAll();
+
+                        if (panel.ExpDictionary.Count > 0)
+                        {
+                            foreach (GridContainer item in e.OldItems)
+                                panel.RemoveFromExpDictionary(item as GridRow);
+                        }
+                    }
+                    break;
+            }
+
+            InvalidateMerge();
+
+            if (dataRowChange == true)
+            {
+                panel.UpdateRowCount();
+
+                SuperGrid.Invalidate();
+            }
+        }
+
+        #endregion
+
+        #region CellsCollectionChanged
+
+        void CellsCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            GridPanel panel = GridPanel;
+
+            switch (e.Action)
+            {
+                case NotifyCollectionChangedAction.Replace:
+                case NotifyCollectionChangedAction.Add:
+                    if (e.Action == NotifyCollectionChangedAction.Replace)
+                    {
+                        for (int i = 0; i < e.OldItems.Count; i++)
+                        {
+                            GridCell cell = e.OldItems[i] as GridCell;
+
+                            if (cell != null)
+                            {
+                                if (panel.ExpDictionary.ContainsKey(cell))
+                                    panel.ExpDictionary.Remove(cell);
+                            }
+                        }
+                    }
+
+                    for (int i = 0; i < e.NewItems.Count; i++)
+                    {
+                        GridCell cell = e.NewItems[i] as GridCell;
+
+                        if (cell != null)
+                        {
+                            cell.Parent = this;
+                            cell.ColumnIndex = e.NewStartingIndex + i;
+
+                            if (panel != null)
+                            {
+                                string newExp = cell.Value as string;
+
+                                if (newExp != null)
+                                {
+                                    newExp = newExp.Trim();
+
+                                    if (newExp.StartsWith("="))
+                                        cell.SetCellExp(panel, newExp);
+                                }
+                            }
+                        }
+                    }
+                    break;
+
+                default:
+                    for (int i = 0; i < _Cells.Count; i++)
+                        _Cells[i].Parent = this;
+                    break;
+            }
+
+            for (int i = 0; i < _Cells.Count; i++)
+                _Cells[i].ColumnIndex = i;
+
+            if (SuperGrid != null)
+            {
+                GridCell cell = SuperGrid.ActiveElement as GridCell;
+
+                if (cell != null)
+                {
+                    if (cell.GridRow == this && cell.ColumnIndex < Cells.Count)
+                        SuperGrid.ActiveElement = Cells[cell.ColumnIndex];
+                }
+            }
+
+            NeedsMeasured = true;
+
+            if (panel != null && panel.VirtualMode == false)
+                InvalidateMerge();
+        }
+
+        #endregion
+
+        #region GetNextVisibleCell
+
+        ///<summary>
+        /// This routine returns the next visible cell in the
+        /// row, after the given cell.  If the given cell is null,
+        /// the first visible cell in the row will be returned.
+        ///</summary>
+        ///<param name="cell"></param>
+        ///<returns>Next cell, or null</returns>
+        ///<exception cref="Exception"></exception>
+        public GridCell GetNextVisibleCell(GridCell cell)
+        {
+            GridPanel panel = GridPanel;
+
+            if (panel != null)
+            {
+                GridColumn column;
+
+                if (cell != null)
+                {
+                    if (cell.Parent != this)
+                        throw new Exception("Cell is not a member of this row.");
+
+                    column = cell.GridColumn;
+
+                    if (column != null)
+                        column = panel.Columns.GetNextVisibleColumn(column);
+                }
+                else
+                {
+                    column = panel.FirstVisibleColumn;
+                }
+
+                if (column != null)
+                    return (GetCell(column.ColumnIndex, panel.AllowEmptyCellSelection));
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetPrevVisibleCell
+
+        ///<summary>
+        /// This routine returns the previous visible cell in the
+        /// row, prior to the given cell.  If the given cell is null,
+        /// the last visible cell in the row will be returned.
+        ///</summary>
+        ///<param name="cell"></param>
+        ///<returns>Previous cell, or null</returns>
+        ///<exception cref="Exception"></exception>
+        public GridCell GetPrevVisibleCell(GridCell cell)
+        {
+            GridPanel panel = GridPanel;
+
+            if (panel != null)
+            {
+                GridColumn column;
+
+                if (cell != null)
+                {
+                    if (cell.Parent != this)
+                        throw new Exception("Cell is not a member of this row.");
+
+                    column = cell.GridColumn;
+
+                    if (column != null)
+                        column = panel.Columns.GetPrevVisibleColumn(column);
+                }
+                else
+                {
+                    column = panel.LastVisibleColumn;
+                }
+
+                if (column != null)
+                    return (GetCell(column.ColumnIndex, panel.AllowEmptyCellSelection));
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetRowHeight
+
+        internal int GetRowHeight()
+        {
+            return (Dpi.Height(GetRowHeightEx()));
+        }
+
+        internal int GetRowHeightEx()
+        {
+            if (_RowHeight >= 0)
+                return (_RowHeight);
+
+            GridPanel panel = GridPanel;
+
+            if (panel != null)
+                return (panel.DefaultRowHeight);
+
+            return (20);
+        }
+
+        #endregion
+
+        #region GetRowPreDetailHeight
+
+        internal int GetRowPreDetailHeight()
+        {
+            if (_PreDetailRowHeight >= 0)
+                return (_PreDetailRowHeight);
+
+            GridPanel panel = GridPanel;
+
+            if (panel != null)
+                return (panel.DefaultPreDetailRowHeight);
+
+            return (0);
+        }
+
+        #endregion
+
+        #region GetRowPostDetailHeight
+
+        internal int GetRowPostDetailHeight()
+        {
+            if (_PostDetailRowHeight >= 0)
+                return (_PostDetailRowHeight);
+
+            GridPanel panel = GridPanel;
+
+            if (panel != null)
+                return (panel.DefaultPostDetailRowHeight);
+
+            return (0);
+        }
+
+        #endregion
+
+        #region GetMaximumRowHeight
+
+        ///<summary>
+        /// This routine calculates and returns the maximum
+        /// row height based upon the individual measured heights
+        /// of each visible cell in the row.
+        ///</summary>
+        ///<returns></returns>
+        public int GetMaximumRowHeight()
+        {
+            GridPanel panel = GridPanel;
+
+            if (panel != null)
+            {
+                GridColumn[] columns = new GridColumn[panel.Columns.Count];
+
+                int n = 0;
+                for (int i = 0; i < panel.Columns.Count; i++)
+                {
+                    if (panel.Columns[i].Visible == true)
+                        columns[n++] = panel.Columns[i];
+                }
+
+                return (GetMaximumRowHeight(columns));
+            }
+
+            return (GetRowHeight());
+        }
+
+        ///<summary>
+        /// This routine calculates and returns the maximum
+        /// row height based upon the individual measured heights
+        /// of each cell in the row, based upon the given array of
+        /// columns to included in the calculation process.
+        ///</summary>
+        ///<returns></returns>
+        public int GetMaximumRowHeight(GridColumn[] columns)
+        {
+            GridPanel panel = GridPanel;
+
+            if (panel != null)
+            {
+                int maxHeight = 0;
+
+                using (Graphics g = SuperGrid.CreateGraphics())
+                {
+                    GridLayoutInfo layoutInfo = new GridLayoutInfo(g, panel.BoundsRelative);
+                    GridLayoutStateInfo layoutState = new GridLayoutStateInfo(panel, 0);
+
+                    foreach (GridColumn column in columns)
+                    {
+                        if (column != null &&
+                            column.ColumnIndex < Cells.Count)
+                        {
+                            GridCell cell = Cells[column.ColumnIndex];
+
+                            if (cell != null)
+                            {
+                                Size oldSize = cell.Size;
+
+                                cell.Measure(layoutInfo, layoutState, new Size(column.Width, 0));
+
+                                if (cell.Size.Height > maxHeight)
+                                    maxHeight = cell.Size.Height;
+
+                                cell.Size = oldSize;
+                            }
+                        }
+                    }
+                }
+
+                if (maxHeight > 0)
+                    return (maxHeight);
+            }
+
+            return (GetRowHeight());
+        }
+
+        #endregion
+
+        #region PointToScroll
+
+        internal Point PointToScroll(GridPanel panel, Point pt)
+        {
+            pt.X -= HScrollOffset;
+
+            if (IsVFrozen == false)
+                pt.Y -= VScrollOffset;
+
+            return (pt);
+        }
+
+        #endregion
+
+        #region FlushRow
+
+        internal override void FlushRow()
+        {
+            GridPanel panel = GridPanel;
+
+            if (panel != null)
+            {
+                if (RowNeedsStored == true)
+                {
+                    RowNeedsStored = false;
+
+                    panel.DataBinder.FlushRow();
+
+                    if (panel.NeedToUpdateDataFilter == true)
+                        DataFilter.UpdateRowFilterState(panel, this);
+
+                    if (panel.VirtualMode == true)
+                        SuperGrid.DoStoreVirtualRowEvent(panel, this);
+
+                    if (RowNeedsSorted == true ||
+                        IsTempInsertRow == true || IsInsertRow == true)
+                    {
+                        RowNeedsSorted = false;
+
+                        if (panel.VirtualMode == true)
+                        {
+                            panel.VirtualRows.Clear();
+                            panel.InvalidateMerge();
+
+                            panel.DataBinder.UpdateDataSourceSort();
+                        }
+                        else
+                        {
+                            panel.UpdateRowPosition(this);
+                        }
+
+                        panel.DataBinder.SetPosition(this);
+                    }
+                }
+            }
+
+            base.FlushRow();
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Reloads the row with the current external DataSource data.
+        /// </summary>
+        public void ReloadRow()
+        {
+            GridPanel panel = GridPanel;
+
+            if (panel != null)
+                panel.DataBinder.ReloadRow(this);
+        }
+
+        #region ProcessNewRowChange
+
+        private void ProcessNewRowChange(GridPanel panel)
+        {
+            if (panel.ShowInsertRow == true)
+            {
+                if (IsInsertRow == true)
+                {
+                    panel.AddNewInsertRow();
+
+                    SuperGrid.DoRowAddedEvent(panel, panel.Rows.Count - 2);
+
+                    panel.InvalidateMerge();
+                }
+            }
+        }
+
+        #endregion
+
+        #region CancelCapture
+
+        /// <summary>
+        /// Cancels any inprogress operations (resize, reorder)
+        /// that may have the mouse captured.
+        /// </summary>
+        public override void CancelCapture()
+        {
+            StopReorder();
+            StopResize();
+
+            base.CancelCapture();
+        }
+
+        #endregion
+
+        #region Style support
+
+        internal void ApplyCellStyle(CellVisualStyle style, StyleType cs)
+        {
+            ValidateStyle();
+
+            if (_EffectiveCellStyles == null)
+                _EffectiveCellStyles = new CellVisualStyles();
+
+            if (_EffectiveCellStyles.IsValid(cs) == false)
+            {
+                GridPanel panel = GridPanel;
+
+                int rowIndex = panel.UseAlternateRowStyle ? GridIndex : -1;
+
+                if (rowIndex >= 0 && Parent is GridGroup)
+                    rowIndex -= ((GridGroup)Parent).GridIndex + 1;
+
+                CellVisualStyle cstyle = new CellVisualStyle();
+
+                if ((rowIndex % 2) > 0)
+                {
+                    cstyle.ApplyStyle(SuperGrid.BaseVisualStyles.AlternateRowCellStyles[cs]);
+                    cstyle.ApplyStyle(SuperGrid.DefaultVisualStyles.AlternateRowCellStyles[cs]);
+                    cstyle.ApplyStyle(GridPanel.DefaultVisualStyles.AlternateRowCellStyles[cs]);
+                }
+
+                cstyle.ApplyStyle(CellStyles[cs]);
+
+                SuperGrid.DoGetRowCellStyleEvent(this, cs, ref cstyle);
+
+                _EffectiveCellStyles[cs] = cstyle;
+            }
+
+            style.ApplyStyle(_EffectiveCellStyles[cs]);
+        }
+
+        #region ValidateStyle
+
+        private void ValidateStyle()
+        {
+            if (_StyleUpdateCount != SuperGrid.StyleUpdateCount)
+            {
+                if (_EffectiveCellStyles != null)
+                {
+                    _EffectiveCellStyles.Dispose();
+                    _EffectiveCellStyles = null;
+                }
+
+                _StyleUpdateCount = SuperGrid.StyleUpdateCount;
+            }
+        }
+
+        #endregion
+
+        #region InvalidateCellStyle
+
+        ///<summary>
+        ///Invalidates the cached Style
+        ///definition for all defined StyleTypes
+        ///</summary>
+        public void InvalidateCellStyle()
+        {
+            if (_EffectiveCellStyles != null)
+            {
+                _EffectiveCellStyles.Dispose();
+                _EffectiveCellStyles = null;
+            }
+
+            foreach (GridCell cell in Cells)
+                cell.InvalidateStyle();
+
+            InvalidateLayout();
+        }
+
+        ///<summary>
+        ///Invalidate the cached Style
+        ///definition for the given StyleType
+        ///</summary>
+        ///<param name="type"></param>
+        public void InvalidateCellStyle(StyleType type)
+        {
+            if (_EffectiveCellStyles != null)
+            {
+                if (_EffectiveCellStyles[type] != null)
+                {
+                    _EffectiveCellStyles[type].Dispose();
+                    _EffectiveCellStyles[type] = null;
+                }
+            }
+
+            foreach (GridCell cell in Cells)
+                cell.InvalidateStyle();
+
+            InvalidateLayout();
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InvalidateRender
+
+        /// <summary>
+        /// InvalidateRender
+        /// </summary>
+        public override void InvalidateRender()
+        {
+            base.InvalidateRender();
+
+            foreach (GridCell cell in Cells)
+                cell.InvalidateRender();
+        }
+
+        /// <summary>
+        /// InvalidateRender
+        /// </summary>
+        /// <param name="bounds"></param>
+        public override void InvalidateRender(Rectangle bounds)
+        {
+            base.InvalidateRender(bounds);
+
+            foreach (GridCell cell in Cells)
+                cell.InvalidateRender();
+        }
+
+        #endregion
+
+        #region ToString
+
+        /// <summary>
+        /// ToString
+        /// </summary>
+        /// <returns></returns>
+        public override string ToString()
+        {
+            StringBuilder sb = new StringBuilder();
+
+            GridPanel panel = GridPanel;
+
+            if (panel != null)
+            {
+                sb.Append("GridRow");
+
+                if (_Cells.Count > 0)
+                {
+                    sb.Append(" {");
+
+                    foreach (GridCell cell in _Cells)
+                    {
+                        sb.Append(cell.Value == null ? "<null>" : cell.Value.ToString());
+                        sb.Append(", ");
+                    }
+
+                    sb.Length -= 2;
+
+                    sb.Append("}");
+                }
+            }
+
+            return (sb.ToString());
+        }
+
+        #endregion
+
+        #region IDisposable Members
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        public override void Dispose()
+        {
+            if (_EffectiveCellStyles != null)
+            {
+                _EffectiveCellStyles.Dispose();
+                _EffectiveCellStyles = null;
+            }
+
+            if (_Cells != null)
+            {
+                foreach (GridCell cell in _Cells)
+                {
+                    if (cell != null)
+                        cell.Dispose();
+                }
+
+                _Cells.CollectionChanged -= CellsCollectionChanged;
+            }
+
+            DetachNestedRows(true);
+
+            Rows = null;
+
+            base.Dispose();
+        }
+
+        #endregion
+
+        #region RowStates
+
+        [Flags]
+        private enum Rs
+        {
+            AllowEdit = (1<<0),
+            EditorDirty = (1<<1),
+            ControlDown = (1<<2), 
+       
+            DetailRow = (1<<3),
+            TempInsertRow = (1<<4),
+
+            Loading = (1<<5),
+            Resizing = (1<<6),
+            Reordering = (1<<7),
+
+            RowDirty = (1<<8),
+            RowFilteredOut = (1<<9),
+
+            RowCheckChanged = (1 << 10),
+            RowNeedsGrouped = (1 << 11),
+            RowNeedsSorted = (1<<12),
+            RowNeedsStored = (1<<13),
+
+            SeparatorAtBottom = (1<<14),
+
+            Visible = (1<<15),
+        }
+
+        #endregion
+    }
+
+    #region enums
+
+    #region RowArea
+
+    ///<summary>
+    /// RowArea
+    ///</summary>
+    public enum RowArea
+    {
+        ///<summary>
+        /// NoWhere
+        ///</summary>
+        NoWhere,
+
+        ///<summary>
+        /// InCellCheckBox
+        ///</summary>
+        InCellCheckBox,
+
+        ///<summary>
+        /// InCellExpand
+        ///</summary>
+        InCellExpand,
+
+        ///<summary>
+        /// InRowCheckBox
+        ///</summary>
+        InRowCheckBox,
+
+        ///<summary>
+        /// InRowHeader
+        ///</summary>
+        InRowHeader,
+
+        ///<summary>
+        /// InRowInfo
+        ///</summary>
+        InRowInfo,
+
+        ///<summary>
+        /// InRowResize
+        ///</summary>
+        InRowResize,
+
+        ///<summary>
+        /// InContent
+        ///</summary>
+        InContent,
+
+        ///<summary>
+        /// InSubItem
+        ///</summary>
+        InSubItem,
+
+        ///<summary>
+        /// InWhiteSpace
+        ///</summary>
+        InWhiteSpace,
+    }
+
+    #endregion
+
+    #region RowDoubleClickBehavior
+
+    ///<summary>
+    /// Indicates what happens when a row is double clicked
+    ///</summary>
+    public enum RowDoubleClickBehavior
+    {
+        ///<summary>
+        /// The row is activated
+        ///</summary>
+        Activate,
+
+        ///<summary>
+        /// The row is expanded or collapsed
+        ///</summary>
+        ExpandCollapse,
+    }
+
+    #endregion
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridTextRow.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridTextRow.cs
new file mode 100644
index 00000000..d690c145
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridTextRow.cs	
@@ -0,0 +1,1549 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Drawing.Drawing2D;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.SuperGrid.Style;
+using DevComponents.SuperGrid.TextMarkup;
+
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    /// <summary>
+    /// Defines the grid column header
+    /// </summary>
+    [TypeConverter(typeof(BlankExpandableObjectConverter))]
+    public abstract class GridTextRow : GridElement
+    {
+        #region Private variables
+
+        private string _Text;
+        private bool _EnableMarkup = true;
+        private BodyElement _TextMarkup;
+
+        private int _RowHeight;
+
+        private HeaderArea _HitArea;
+        private HeaderArea _MouseDownHitArea;
+
+        private RowHeaderVisibility
+            _RowHeaderVisibility = RowHeaderVisibility.PanelControlled;
+
+        private TextRowVisualStyles _EffectiveRowStyles;
+        private int _StyleUpdateCount;
+
+        private Image _BackgroundImage;
+        private GridBackgroundImageLayout _BackgroundImageLayout = GridBackgroundImageLayout.Tile;
+
+        #endregion
+
+        #region Constructors
+
+        ///<summary>
+        /// GridHeader
+        ///</summary>
+        protected GridTextRow()
+        {
+        }
+
+        ///<summary>
+        /// GridHeader
+        ///</summary>
+        ///<param name="text"></param>
+        protected GridTextRow(string text)
+        {
+            _Text = text;
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region BackgroundImage
+
+        /// <summary>
+        /// Gets or sets the Background Image
+        /// </summary>
+        [DefaultValue(null), Category("Appearance")]
+        [Description("Indicates the Background Image")]
+        public Image BackgroundImage
+        {
+            get { return (_BackgroundImage); }
+
+            set
+            {
+                if (_BackgroundImage != value)
+                {
+                    _BackgroundImage = value;
+
+                    OnPropertyChangedEx("BackgroundImage", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region BackgroundImageLayout
+
+        /// <summary>
+        /// Gets or sets the layout of the Background Image
+        /// </summary>
+        [DefaultValue(GridBackgroundImageLayout.Tile), Category("Appearance")]
+        [Description("Indicates the layout of the Background Image")]
+        public GridBackgroundImageLayout BackgroundImageLayout
+        {
+            get { return (_BackgroundImageLayout); }
+
+            set
+            {
+                if (_BackgroundImageLayout != value)
+                {
+                    _BackgroundImageLayout = value;
+
+                    OnPropertyChangedEx("BackgroundImageLayout", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region Bounds
+
+        ///<summary>
+        /// Gets the scroll adjusted bounds
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override Rectangle Bounds
+        {
+            get
+            {
+                GridPanel panel = GridPanel;
+
+                if (panel != null)
+                {
+                    Rectangle r = BoundsRelative;
+
+                    if (panel.IsSubPanel == true)
+                    {
+                        r.X -= HScrollOffset;
+
+                        if (IsVFrozen == false)
+                            r.Y -= VScrollOffset;
+                    }
+
+                    return (r);
+                }
+
+                return (Rectangle.Empty);
+            }
+        }
+
+        #endregion
+
+        #region EnableMarkup
+
+        /// <summary>
+        /// Gets or sets whether text-markup support is enabled
+        /// </summary>
+        [DefaultValue(true), Category("Appearance")]
+        [Description("Indicates whether text-markup support is enabled.")]
+        public bool EnableMarkup
+        {
+            get { return (_EnableMarkup); }
+
+            set
+            {
+                if (_EnableMarkup != value)
+                {
+                    _EnableMarkup = value;
+
+                    MarkupTextChanged();
+
+                    OnPropertyChangedEx("EnableMarkup", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ImageBounds
+
+        /// <summary>
+        /// Gets whether the item is empty
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public Rectangle ImageBounds
+        {
+            get
+            {
+                GridPanel panel = GridPanel;
+
+                if (panel != null)
+                {
+                    TextRowVisualStyle style = GetEffectiveStyle();
+
+                    object figure = style.GetFigure(panel);
+
+                    if (figure != null)
+                    {
+                        Rectangle tb, ib;
+                        GetItemBounds(panel, style, Bounds, out tb, out ib);
+
+                        return (ib);
+                    }
+                }
+
+                return (Rectangle.Empty);
+            }
+        }
+
+        #endregion
+
+        #region IsEmpty
+
+        /// <summary>
+        /// Gets whether the item is empty
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public virtual bool IsEmpty
+        {
+            get { return (string.IsNullOrEmpty(_Text) == true); }
+        }
+
+        #endregion
+
+        #region RowHeight
+
+        /// <summary>
+        /// Gets or sets the row height (0 to auto-size)
+        /// </summary>
+        [DefaultValue(0), Category("Appearance")]
+        [Description("Indicates the row height (0 to auto-size)")]
+        public int RowHeight
+        {
+            get { return (_RowHeight); }
+
+            set
+            {
+                if (_RowHeight != value)
+                {
+                    _RowHeight = value;
+
+                    OnPropertyChangedEx("RowHeight", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region RowHeaderVisibility
+
+        /// <summary>
+        /// Gets or sets whether the RowHeader is displayed
+        /// </summary>
+        [DefaultValue(RowHeaderVisibility.PanelControlled), Category("Appearance")]
+        [Description("Indicates whether the RowHeader is displayed")]
+        public virtual RowHeaderVisibility RowHeaderVisibility
+        {
+            get { return (_RowHeaderVisibility); }
+
+            set
+            {
+                if (value != _RowHeaderVisibility)
+                {
+                    _RowHeaderVisibility = value;
+
+                    OnPropertyChangedEx("RowHeaderVisibility", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region Text
+
+        /// <summary>
+        /// Gets or sets the Text
+        /// </summary>
+        [Localizable(true), DefaultValue(null), Category("Appearance")]
+        [Description("Indicates the Text.")]
+        [Editor("DevComponents.DotNetBar.Design.TextMarkupUIEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(UITypeEditor))]
+        public string Text
+        {
+            get { return (_Text); }
+
+            set
+            {
+                if (_Text != value)
+                {
+                    _Text = value;
+
+                    MarkupTextChanged();
+
+                    OnPropertyChangedEx("Text", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region MeasureOverride
+
+        /// <summary>
+        /// Performs the layout of the item and sets the Size property to size that item will take.
+        /// </summary>
+        /// <param name="layoutInfo">Layout information.</param>
+        /// <param name="stateInfo"></param>
+        /// <param name="constraintSize"></param>
+        protected override void MeasureOverride(
+            GridLayoutInfo layoutInfo, GridLayoutStateInfo stateInfo, Size constraintSize)
+        {
+            Size sizeNeeded = MeasureRow(layoutInfo, stateInfo, constraintSize);
+
+            if (constraintSize.Width > 0)
+                sizeNeeded.Width = constraintSize.Width;
+
+            Size = sizeNeeded;
+        }
+
+        #region MeasureRow
+
+        /// <summary>
+        /// MeasureRow
+        /// </summary>
+        /// <param name="layoutInfo"></param>
+        /// <param name="stateInfo"></param>
+        /// <param name="constraintSize"></param>
+        /// <returns></returns>
+        protected virtual Size MeasureRow(
+            GridLayoutInfo layoutInfo, GridLayoutStateInfo stateInfo, Size constraintSize)
+        {
+            Size sizeNeeded = Size.Empty;
+
+            if (RowHeight > 0 || IsEmpty == false)
+            {
+                GridPanel panel = stateInfo.GridPanel;
+
+                TextRowVisualStyle style = GetSizingStyle(panel);
+                Size figureSize = style.GetFigureSize(panel);
+
+                Alignment imageAlignment = style.ImageAlignment;
+
+                if (style.IsOverlayImage == true)
+                    imageAlignment = Alignment.MiddleCenter;
+
+                int width = constraintSize.Width;
+
+                if (width > 0)
+                {
+                    if (panel.IsSubPanel == false)
+                        width = ViewRect.Width;
+
+                    if (CanShowRowHeader(panel) == true)
+                        width -= panel.RowHeaderWidthEx;
+
+                    switch (imageAlignment)
+                    {
+                        case Alignment.TopCenter:
+                        case Alignment.MiddleCenter:
+                        case Alignment.BottomCenter:
+                            break;
+
+                        default:
+                            width -= figureSize.Width;
+                            break;
+                    }
+                }
+
+                Size borderSize = style.GetBorderSize(true);
+
+                if (constraintSize.Width > 0)
+                    width -= borderSize.Width;
+
+                Size size = GetTextSize(layoutInfo, style, width);
+
+                switch (imageAlignment)
+                {
+                    case Alignment.MiddleCenter:
+                        sizeNeeded.Height = Math.Max(figureSize.Height, size.Height) + borderSize.Height;
+                        sizeNeeded.Width = Math.Max(size.Width, figureSize.Width) + borderSize.Width;
+                        break;
+
+                    case Alignment.TopCenter:
+                    case Alignment.BottomCenter:
+                        sizeNeeded.Width = Math.Max(size.Width, figureSize.Width) + borderSize.Width;
+                        sizeNeeded.Height = size.Height + figureSize.Height + borderSize.Height;
+                        break;
+
+                    default:
+                        sizeNeeded.Width = size.Width + figureSize.Width + borderSize.Width;
+                        sizeNeeded.Height = Math.Max(figureSize.Height, size.Height) + borderSize.Height;
+                        break;
+                }
+
+                if (RowHeight > 0)
+                    sizeNeeded.Height = Dpi.Width(RowHeight);
+                else
+                    sizeNeeded.Height += Dpi.Width1;
+            }
+
+            return (sizeNeeded);
+        }
+
+        #endregion
+
+        #region GetTextSize
+
+        private Size GetTextSize(
+            GridLayoutInfo layoutInfo, TextRowVisualStyle style, int width)
+        {
+            Size size = Size.Empty;
+
+            if (string.IsNullOrEmpty(_Text) == false)
+            {
+                if (_TextMarkup != null)
+                {
+                    size = GetMarkupTextSize(layoutInfo, style, width);
+                }
+                else
+                {
+                    eTextFormat tf = style.GetTextFormatFlags();
+
+                    if (width <= 0)
+                    {
+                        if (style.AllowWrap == Tbool.True)
+                            tf &= ~eTextFormat.WordBreak;
+                    }
+
+                    size = TextHelper.MeasureText(
+                        layoutInfo.Graphics, _Text, style.Font, new Size(width, 0), tf);
+                }
+            }
+
+            return (size);
+        }
+
+        #region GetMarkupTextSize
+
+        private Size GetMarkupTextSize(
+            GridLayoutInfo layoutInfo, TextRowVisualStyle style, int width)
+        {
+            Graphics g = layoutInfo.Graphics;
+
+            MarkupDrawContext d =
+                new MarkupDrawContext(g, style.Font, style.TextColor, false);
+
+            _TextMarkup.InvalidateElementsSize();
+            _TextMarkup.Measure(new Size(width, 0), d);
+
+            return (_TextMarkup.Bounds.Size);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region GetSizingStyle
+
+        /// <summary>
+        /// GetSizingStyle
+        /// </summary>
+        /// <param name="panel"></param>
+        /// <returns></returns>
+        protected TextRowVisualStyle GetSizingStyle(GridPanel panel)
+        {
+            StyleType style = panel.GetSizingStyle();
+
+            if (style == StyleType.NotSet)
+                style = StyleType.Default;
+
+            return (GetEffectiveStyle(style));
+        }
+
+        #endregion
+
+        #region ArrangeOverride
+
+        /// <summary>
+        /// Performs the arrange pass layout of the item
+        /// when final position and size of the item has been set
+        /// </summary>
+        /// <param name="layoutInfo">Layout information.</param>
+        /// <param name="stateInfo"></param>
+        /// <param name="layoutBounds">Layout bounds</param>
+        protected override void ArrangeOverride(GridLayoutInfo layoutInfo,
+            GridLayoutStateInfo stateInfo, Rectangle layoutBounds)
+        {
+            Size = ArrangeRow(layoutInfo, stateInfo, layoutBounds);
+        }
+
+        /// <summary>
+        /// ArrangeRow
+        /// </summary>
+        /// <param name="layoutInfo"></param>
+        /// <param name="stateInfo"></param>
+        /// <param name="layoutBounds"></param>
+        /// <returns></returns>
+        protected virtual Size ArrangeRow(GridLayoutInfo layoutInfo,
+            GridLayoutStateInfo stateInfo, Rectangle layoutBounds)
+        {
+            Size size = Size;
+
+            size.Width = stateInfo.GridPanel.ColumnHeader.BoundsRelative.Width;
+
+            return (size);
+        }
+
+        #endregion
+
+        #region RenderOverride
+
+        /// <summary>
+        /// Performs drawing of the item and its children.
+        /// </summary>
+        /// <param name="renderInfo">Holds contextual rendering information.</param>
+        protected override void RenderOverride(GridRenderInfo renderInfo)
+        {
+            GridPanel panel = GridPanel;
+
+            if (panel != null)
+            {
+                Rectangle bounds = Bounds;
+
+                if (bounds.Height > 0)
+                {
+                    Rectangle r = bounds;
+                    r.Inflate(2, 2);
+
+                    if (r.IntersectsWith(renderInfo.ClipRectangle))
+                        RenderRow(renderInfo, panel, bounds);
+                }
+            }
+        }
+
+        #region RenderRow
+
+        /// <summary>
+        /// RenderRow
+        /// </summary>
+        /// <param name="renderInfo"></param>
+        /// <param name="panel"></param>
+        /// <param name="r"></param>
+        protected virtual void RenderRow(
+            GridRenderInfo renderInfo, GridPanel panel, Rectangle r)
+        {
+            Graphics g = renderInfo.Graphics;
+
+            TextRowVisualStyle style = GetEffectiveStyle();
+            GridPanelVisualStyle pstyle = panel.GetEffectiveStyle();
+
+            object figure = style.GetFigure(panel);
+
+            Rectangle tb, ib;
+            r = GetItemBounds(panel, style, r, out tb, out ib);
+
+            if (r.Width > 1 && r.Height > 1)
+            {
+                if (SuperGrid.DoPreRenderTextRowEvent(g, this, RenderParts.Background, r) == false)
+                {
+                    RenderRowBackground(g, style, r);
+                    SuperGrid.DoPostRenderTextRowEvent(g, this, RenderParts.Background, r);
+                }
+
+                RenderBorder(g, panel, pstyle, r);
+
+                if (SuperGrid.DoPreRenderTextRowEvent(g, this, RenderParts.Border, r) == false)
+                {
+                    RenderRowBorder(g, style, r);
+                    SuperGrid.DoPostRenderTextRowEvent(g, this, RenderParts.Border, r);
+                }
+            }
+
+            if (style.ImageOverlay != ImageOverlay.Top)
+                style.RenderFigure(g, panel, ib);
+
+            if (tb.Width > 0 && tb.Height > 0)
+            {
+                if (SuperGrid.DoPreRenderTextRowEvent(g, this, RenderParts.Content, r) == false)
+                {
+                    RenderRowText(g, style, tb);
+                    SuperGrid.DoPostRenderTextRowEvent(g, this, RenderParts.Content, tb);
+                }
+            }
+
+            if (ib.Width > 0 && ib.Height > 0)
+            {
+                if (style.ImageOverlay == ImageOverlay.Top)
+                    style.RenderFigure(g, panel, ib);
+            }
+
+            if (SuperGrid.DoPreRenderTextRowEvent(g, this, RenderParts.RowHeader, r) == false)
+            {
+                RenderRowHeader(g, panel, pstyle, r);
+                SuperGrid.DoPostRenderTextRowEvent(g, this, RenderParts.RowHeader, r);
+            }
+        }
+
+        #region GetItemBounds
+
+        private Rectangle GetItemBounds(GridPanel panel,
+            TextRowVisualStyle style, Rectangle r, out Rectangle tb, out Rectangle ib)
+        {
+            Rectangle v = ViewRect;
+
+            if (panel.IsSubPanel == false)
+            {
+                r.X = Math.Max(r.X, v.X);
+                r.Width = v.Width;
+            }
+
+            if (CanShowRowHeader(panel) == true)
+            {
+                r.X += panel.RowHeaderWidthEx;
+                r.Width -= panel.RowHeaderWidthEx;
+            }
+
+            tb = GetAdjustedBounds(style, style.GetNonFigureBounds(panel, r));
+            ib = style.GetFigureBounds(panel, tb);
+
+            return (r);
+        }
+
+        #endregion
+
+        #region GetAdjustedBounds
+
+        private Rectangle GetAdjustedBounds(TextRowVisualStyle style, Rectangle r)
+        {
+            r.X += (style.BorderThickness.Left + style.Margin.Left + style.Padding.Left);
+            r.Width -= (style.BorderThickness.Horizontal + style.Margin.Horizontal + style.Padding.Horizontal + 1);
+
+            r.Y += (style.BorderThickness.Top + style.Margin.Top + style.Padding.Top);
+            r.Height -= (style.BorderThickness.Vertical + style.Margin.Vertical + style.Padding.Vertical + 1);
+
+            return (r);
+        }
+
+        #endregion
+
+        #region RenderRowBackground
+
+        /// <summary>
+        /// RenderRowBackground
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="style"></param>
+        /// <param name="r"></param>
+        protected void RenderRowBackground(
+            Graphics g, TextRowVisualStyle style, Rectangle r)
+        {
+            r.Width--;
+            r.Height--;
+
+            using (Brush br = style.Background.GetBrush(r))
+                g.FillRectangle(br, r);
+
+            if (_BackgroundImage != null)
+            {
+                Rectangle sr = r;
+                sr.Location = Point.Empty;
+
+                switch (_BackgroundImageLayout)
+                {
+                    case GridBackgroundImageLayout.TopRight:
+                        OffsetRight(ref sr, ref r);
+                        g.DrawImage(_BackgroundImage, r, sr, GraphicsUnit.Pixel);
+                        break;
+
+                    case GridBackgroundImageLayout.BottomLeft:
+                        OffsetBottom(ref sr, ref r);
+                        g.DrawImage(_BackgroundImage, r, sr, GraphicsUnit.Pixel);
+                        break;
+
+                    case GridBackgroundImageLayout.BottomRight:
+                        OffsetRight(ref sr, ref r);
+                        OffsetBottom(ref sr, ref r);
+                        g.DrawImage(_BackgroundImage, r, sr, GraphicsUnit.Pixel);
+                        break;
+
+                    case GridBackgroundImageLayout.Center:
+                        RenderImageCentered(g, _BackgroundImage, r);
+                        break;
+
+                    case GridBackgroundImageLayout.Stretch:
+                        g.DrawImage(_BackgroundImage, r);
+                        break;
+
+                    case GridBackgroundImageLayout.Zoom:
+                        RenderImageScaled(g, _BackgroundImage, r);
+                        break;
+
+                    case GridBackgroundImageLayout.Tile:
+                        using (TextureBrush tbr = new TextureBrush(_BackgroundImage))
+                        {
+                            tbr.TranslateTransform(r.X, r.Y);
+                            g.FillRectangle(tbr, r);
+                        }
+                        break;
+
+                    default:
+                        g.DrawImage(_BackgroundImage, r, sr, GraphicsUnit.Pixel);
+                        break;
+                }
+            }
+        }
+
+        #region OffsetRight
+
+        private void OffsetRight(ref Rectangle sr, ref Rectangle r)
+        {
+            if (_BackgroundImage.Width > r.Width)
+                sr.X += (_BackgroundImage.Width - r.Width);
+            else
+                r.X += (r.Width - _BackgroundImage.Width);
+        }
+
+        #endregion
+
+        #region OffsetBottom
+
+        private void OffsetBottom(ref Rectangle sr, ref Rectangle r)
+        {
+            if (_BackgroundImage.Height > r.Height)
+                sr.Y += (_BackgroundImage.Height - r.Height);
+            else
+                r.Y += (r.Height - _BackgroundImage.Height);
+        }
+
+        #endregion
+
+        #region RenderImageCentered
+
+        private void RenderImageCentered(Graphics g, Image image, Rectangle r)
+        {
+            Rectangle sr = r;
+            sr.Location = Point.Empty;
+
+            if (image.Width > r.Width)
+                sr.X += (image.Width - r.Width) / 2;
+            else
+                r.X += (r.Width - image.Width) / 2;
+
+            if (image.Height > r.Height)
+                sr.Y += (image.Height - r.Height) / 2;
+            else
+                r.Y += (r.Height - image.Height) / 2;
+
+            g.DrawImage(image, r, sr, GraphicsUnit.Pixel);
+        }
+
+        #endregion
+
+        #region RenderImageScaled
+
+        private void RenderImageScaled(Graphics g, Image image, Rectangle r)
+        {
+            SizeF size = new SizeF(image.Width / image.HorizontalResolution,
+                image.Height / image.VerticalResolution);
+
+            float scale = Math.Min(r.Width / size.Width, r.Height / size.Height);
+
+            size.Width *= scale;
+            size.Height *= scale;
+
+            g.DrawImage(image, r.X + (r.Width - size.Width) / 2,
+                r.Y + (r.Height - size.Height) / 2,
+                size.Width, size.Height);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderBorder
+
+        /// <summary>
+        /// RenderBorder
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="panel"></param>
+        /// <param name="pstyle"></param>
+        /// <param name="r"></param>
+        protected virtual void RenderBorder(Graphics g,
+            GridPanel panel, GridPanelVisualStyle pstyle, Rectangle r)
+        {
+            using (Pen pen = new Pen(pstyle.HeaderLineColor))
+            {
+                g.DrawLine(pen, r.X, r.Y - 1, r.Right - 1, r.Y - 1);
+                g.DrawLine(pen, r.X, r.Bottom - 1, r.Right - 1, r.Bottom - 1);
+            }
+        }
+
+        #endregion
+
+        #region RenderRowBorder
+
+        /// <summary>
+        /// RenderRowBorder
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="style"></param>
+        /// <param name="r"></param>
+        protected void RenderRowBorder(Graphics g, TextRowVisualStyle style, Rectangle r)
+        {
+            if (style.BorderPattern == null ||
+                style.BorderThickness == null || style.BorderColor == null)
+            {
+                return;
+            }
+
+            Rectangle t = r;
+            t.X += style.Margin.Left;
+            t.Width -= style.Margin.Horizontal;
+
+            t.Y += style.Margin.Top;
+            t.Height -= style.Margin.Vertical;
+
+            if (style.BorderColor.IsUniform == true &&
+                style.BorderThickness.IsUniform == true && style.BorderPattern.IsUniform == true)
+            {
+                if (style.BorderThickness.Top > 0 && style.BorderColor.Top.IsEmpty == false)
+                {
+                    t.Width -= style.BorderThickness.Top;
+                    t.Height -= style.BorderThickness.Top;
+
+                    using (Pen pen = new
+                        Pen(style.BorderColor.Top, style.BorderThickness.Top))
+                    {
+                        LinePattern pattern = (style.BorderPattern.Top == LinePattern.NotSet)
+                            ? LinePattern.Solid : style.BorderPattern.Top;
+
+                        pen.DashStyle = (DashStyle)pattern;
+
+                        g.DrawRectangle(pen, t);
+                    }
+                }
+            }
+            else
+            {
+                Pen[] pens = style.GetBorderPens();
+
+                if (pens[(int)BorderSide.Right] != null)
+                {
+                    int right = t.Right - (style.BorderThickness.Right / 2);
+
+                    g.DrawLine(pens[(int)BorderSide.Right], right, t.Top, right, t.Bottom);
+                }
+
+                if (pens[(int)BorderSide.Bottom] != null)
+                {
+                    int bottom = t.Bottom - ((style.BorderThickness.Bottom - 1) / 2);
+
+                    g.DrawLine(pens[(int)BorderSide.Bottom], t.X, bottom, t.Right, bottom);
+                }
+
+                if (pens[(int)BorderSide.Left] != null)
+                    g.DrawLine(pens[(int)BorderSide.Left], t.X, t.Top, t.X, t.Bottom);
+
+                if (pens[(int)BorderSide.Top] != null)
+                    g.DrawLine(pens[(int)BorderSide.Top], t.X, t.Top, t.Right, t.Top);
+
+                foreach (Pen pen in pens)
+                {
+                    if (pen != null)
+                        pen.Dispose();
+                }
+            }
+        }
+
+        #endregion
+
+        #region RenderRowText
+
+        /// <summary>
+        /// RenderRowText
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="style"></param>
+        /// <param name="r"></param>
+        protected void RenderRowText(Graphics g,
+            TextRowVisualStyle style, Rectangle r)
+        {
+            string s = _Text;
+
+            if (string.IsNullOrEmpty(s) == false)
+            {
+                if (r.Width > 0 && r.Height > 0)
+                {
+                    if (_TextMarkup != null)
+                    {
+                        RenderTextMarkup(g, style, r);
+                    }
+                    else
+                    {
+                        eTextFormat tf = style.GetTextFormatFlags();
+
+                        TextDrawing.DrawString(g, s, style.Font, style.TextColor, r, tf);
+                    }
+                }
+            }
+        }
+
+        #region RenderTextMarkup
+
+        private void RenderTextMarkup(
+            Graphics g, TextRowVisualStyle style, Rectangle r)
+        {
+            MarkupDrawContext d =
+                new MarkupDrawContext(g, style.Font, style.TextColor, false);
+
+            _TextMarkup.Arrange(new Rectangle(r.Location, r.Size), d);
+
+            Size size = _TextMarkup.Bounds.Size;
+
+            switch (style.Alignment)
+            {
+                case Alignment.MiddleLeft:
+                case Alignment.MiddleCenter:
+                case Alignment.MiddleRight:
+                    if (r.Height > size.Height)
+                        r.Y += (r.Height - size.Height)/2;
+                    break;
+
+                default:
+                    if (r.Height > size.Height)
+                        r.Y = r.Bottom - size.Height;
+                    break;
+            }
+
+            _TextMarkup.Bounds = new Rectangle(r.Location, size);
+
+            Region oldClip = g.Clip;
+
+            try
+            {
+                g.SetClip(r, CombineMode.Intersect);
+
+                _TextMarkup.Render(d);
+            }
+            finally
+            {
+                g.Clip = oldClip;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderRowHeader
+
+        /// <summary>
+        /// RenderRowHeader
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="panel"></param>
+        /// <param name="pstyle"></param>
+        /// <param name="r"></param>
+        protected virtual void RenderRowHeader(Graphics g,
+            GridPanel panel, GridPanelVisualStyle pstyle, Rectangle r)
+        {
+            if (CanShowRowHeader(panel) == true)
+            {
+                r.X -= panel.RowHeaderWidthEx;
+                r.Width = panel.RowHeaderWidthEx - 1;
+
+                if (r.Width > 0 && r.Height > 0)
+                {
+                    TextRowVisualStyle style = GetEffectiveRowHeaderStyle();
+
+                    using (Brush br = style.RowHeaderStyle.Background.GetBrush(r))
+                    {
+                        if (br != null)
+                            g.FillRectangle(br, r);
+                    }
+
+                    if (Dpi.Width1 == Dpi.Height1)
+                    {
+                        using (Pen pen = new Pen(style.RowHeaderStyle.BorderHighlightColor, Dpi.Height1))
+                        {
+                            g.DrawLine(pen, r.X, r.Y, r.Right, r.Y);
+
+                            g.DrawLine(pen, r.X, r.Y, r.X, r.Bottom);
+                        }
+
+                        using (Pen pen = new Pen(pstyle.HeaderLineColor, Dpi.Height1))
+                        {
+                            g.DrawLine(pen, r.X, r.Y - 1, r.Right, r.Y - 1);
+                            g.DrawLine(pen, r.X, r.Bottom - 1, r.Right, r.Bottom - 1);
+
+                            g.DrawLine(pen, r.Right, r.Y, r.Right, r.Bottom - 1);
+                        }
+                    }
+                    else
+                    {
+                        using (Pen pen = new Pen(style.RowHeaderStyle.BorderHighlightColor, Dpi.Height1))
+                            g.DrawLine(pen, r.X, r.Y, r.Right, r.Y);
+
+                        using (Pen pen = new Pen(style.RowHeaderStyle.BorderHighlightColor, Dpi.Width1))
+                            g.DrawLine(pen, r.X, r.Y, r.X, r.Bottom);
+
+                        using (Pen pen = new Pen(pstyle.HeaderLineColor, Dpi.Height1))
+                        {
+                            g.DrawLine(pen, r.X, r.Y - 1, r.Right, r.Y - 1);
+                            g.DrawLine(pen, r.X, r.Bottom - 1, r.Right, r.Bottom - 1);
+                        }
+
+                        using (Pen pen = new Pen(pstyle.HeaderLineColor, Dpi.Width1))
+                            g.DrawLine(pen, r.Right, r.Y, r.Right, r.Bottom - 1);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region Mouse events
+
+        #region InternalMouseEnter
+
+        internal override void InternalMouseEnter(EventArgs e)
+        {
+            base.InternalMouseEnter(e);
+
+            InvalidateRender();
+        }
+
+        #endregion
+
+        #region InternalMouseLeave
+
+        internal override void InternalMouseLeave(EventArgs e)
+        {
+            _HitArea = HeaderArea.NoWhere;
+
+            InvalidateRender();
+
+            base.InternalMouseLeave(e);
+        }
+
+        #endregion
+
+        #region InternalMouseMove
+
+        internal override void InternalMouseMove(MouseEventArgs e)
+        {
+            SuperGrid.GridCursor = Cursors.Default;
+
+            HeaderArea area = GetHitArea(e.Location);
+
+            if (_HitArea != area)
+            {
+                _HitArea = area;
+
+                InvalidateRender();
+            }
+
+            if (AllowSelection == true)
+            {
+                if (_TextMarkup != null)
+                    _TextMarkup.MouseMove(SuperGrid, e);
+            }
+
+            base.InternalMouseMove(e);
+        }
+
+        #endregion
+
+        #region InternalMouseDown
+
+        internal override void InternalMouseDown(MouseEventArgs e)
+        {
+            _MouseDownHitArea = _HitArea;
+
+            base.InternalMouseDown(e);
+        }
+
+        #endregion
+
+        #region InternalMouseUp
+
+        internal override void InternalMouseUp(MouseEventArgs e)
+        {
+            if (AllowSelection == true)
+            {
+                if (_HitArea == _MouseDownHitArea)
+                {
+                    switch (_HitArea)
+                    {
+                        case HeaderArea.InRowHeader:
+                            SuperGrid.DoTextRowHeaderClickEvent(this, e);
+                            break;
+
+                        case HeaderArea.InContent:
+                            SuperGrid.DoTextRowClickEvent(this, e);
+                            break;
+
+                        case HeaderArea.InMarkup:
+                            SuperGrid.DoTextRowClickEvent(this, e);
+
+                            if (_TextMarkup != null)
+                                _TextMarkup.Click(SuperGrid);
+
+                            break;
+                    }
+                }
+            }
+
+            base.InternalMouseUp(e);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region CanShowRowHeader
+
+        /// <summary>
+        /// CanShowRowHeader
+        /// </summary>
+        /// <param name="panel"></param>
+        /// <returns></returns>
+        protected virtual bool CanShowRowHeader(GridPanel panel)
+        {
+            switch (_RowHeaderVisibility)
+            {
+                case RowHeaderVisibility.Always:
+                    return (true);
+
+                case RowHeaderVisibility.PanelControlled:
+                    return (panel.ShowRowHeaders);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region GetHitArea
+
+        ///<summary>
+        /// GetHitArea
+        ///</summary>
+        ///<param name="pt"></param>
+        ///<returns></returns>
+        public virtual HeaderArea GetHitArea(Point pt)
+        {
+            GridPanel panel = GridPanel;
+
+            if (panel != null)
+            {
+                if (CanShowRowHeader(panel) == true)
+                {
+                    Rectangle r = GetRowHeaderBounds(panel);
+
+                    if (r.Contains(pt) == true)
+                        return (HeaderArea.InRowHeader);
+                }
+            }
+
+            if (_TextMarkup != null)
+            {
+                if (_TextMarkup.MouseOverElement != null)
+                    return (HeaderArea.InMarkup);
+            }
+
+            return (HeaderArea.InContent);
+        }
+
+        #endregion
+
+        #region GetRowHeaderBounds
+
+        private Rectangle GetRowHeaderBounds(GridPanel panel)
+        {
+            if (panel.ShowRowHeaders == true)
+            {
+                Rectangle r = BoundsRelative;
+
+                r.Location = panel.PointToScroll(r.Location);
+                r.Width = Dpi.Width(panel.RowHeaderWidthEx + 2);
+
+                return (r);
+            }
+
+            return (Rectangle.Empty);
+        }
+
+        #endregion
+
+        #region Style support routines
+
+        #region GetEffectiveStyle
+
+        internal TextRowVisualStyle GetEffectiveStyle()
+        {
+            ValidateRowStyle();
+
+            StyleState rowState = GetRowState();
+
+            switch (rowState)
+            {
+                case StyleState.MouseOver:
+                    return (GetStyleEx(StyleType.MouseOver));
+
+                case StyleState.Selected:
+                    return (GetStyleEx(StyleType.Selected));
+
+                case StyleState.Selected | StyleState.MouseOver:
+                    return (GetStyleEx(StyleType.SelectedMouseOver));
+
+                case StyleState.ReadOnly:
+                    return (GetStyleEx(StyleType.ReadOnly));
+
+                case StyleState.ReadOnly | StyleState.MouseOver:
+                    return (GetStyleEx(StyleType.ReadOnlyMouseOver));
+
+                case StyleState.ReadOnly | StyleState.Selected:
+                    return (GetStyleEx(StyleType.ReadOnlySelected));
+
+                case StyleState.ReadOnly | StyleState.MouseOver | StyleState.Selected:
+                    return (GetStyleEx(StyleType.ReadOnlySelectedMouseOver));
+
+                default:
+                    return (GetStyleEx(StyleType.Default));
+            }
+        }
+
+        internal TextRowVisualStyle GetEffectiveStyle(StyleType type)
+        {
+            ValidateRowStyle();
+
+            return (GetStyleEx(type));
+        }
+
+        #region GetRowState
+
+        private StyleState GetRowState()
+        {
+            StyleState rowState = StyleState.Default;
+
+            if (IsMouseOver == true)
+                rowState |= StyleState.MouseOver;
+
+            GridPanel panel = GridPanel;
+
+            if (panel != null)
+            {
+                if (panel == SuperGrid.ActiveGrid)
+                    rowState |= StyleState.Selected;
+
+                if (panel.ReadOnly == true)
+                    rowState |= StyleState.ReadOnly;
+            }
+
+            return (rowState);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetEffectiveRowHeaderStyle
+
+        internal TextRowVisualStyle GetEffectiveRowHeaderStyle()
+        {
+            ValidateRowStyle();
+
+            StyleState rowState = GetRowHeaderState();
+
+            switch (rowState)
+            {
+                case StyleState.MouseOver:
+                    return (GetStyleEx(StyleType.MouseOver));
+
+                case StyleState.Selected:
+                    return (GetStyleEx(StyleType.Selected));
+
+                case StyleState.Selected | StyleState.MouseOver:
+                    return (GetStyleEx(StyleType.SelectedMouseOver));
+
+                case StyleState.ReadOnly:
+                    return (GetStyleEx(StyleType.ReadOnly));
+
+                case StyleState.ReadOnly | StyleState.MouseOver:
+                    return (GetStyleEx(StyleType.ReadOnlyMouseOver));
+
+                case StyleState.ReadOnly | StyleState.Selected:
+                    return (GetStyleEx(StyleType.ReadOnlySelected));
+
+                case StyleState.ReadOnly | StyleState.MouseOver | StyleState.Selected:
+                    return (GetStyleEx(StyleType.ReadOnlySelectedMouseOver));
+
+                default:
+                    return (GetStyleEx(StyleType.Default));
+            }
+        }
+
+        #region GetRowHeaderState
+
+        private StyleState GetRowHeaderState()
+        {
+            StyleState rowState = StyleState.Default;
+
+            if (_HitArea == HeaderArea.InRowHeader)
+                rowState |= StyleState.MouseOver;
+
+            GridPanel panel = GridPanel;
+
+            if (panel != null)
+            {
+                if (panel.ReadOnly == true)
+                    rowState |= StyleState.ReadOnly;
+
+                if (panel == SuperGrid.ActiveGrid)
+                    rowState |= StyleState.Selected;
+            }
+
+            return (rowState);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetStyleEx
+
+        private TextRowVisualStyle GetStyleEx(StyleType e)
+        {
+            if (_EffectiveRowStyles.IsValid(e) == false)
+            {
+                TextRowVisualStyle style = GetNewVisualStyle();
+
+                StyleType[] css = style.GetApplyStyleTypes(e);
+
+                if (css != null)
+                    ApplyStyleEx(style, css);
+
+                SuperGrid.DoGetTextRowStyleEvent(this, e, ref style);
+
+                if (style.Background == null || style.Background.IsEmpty == true)
+                    style.Background = new Background(Color.White);
+
+                if (style.Font == null)
+                    style.Font = SystemFonts.CaptionFont;
+
+                style.ApplyDefaults();
+
+                _EffectiveRowStyles[e] = style;
+            }
+
+            return (_EffectiveRowStyles[e]);
+        }
+
+        #region GetNewVisualStyle
+
+        /// <summary>
+        /// GetNewVisualStyle
+        /// </summary>
+        /// <returns></returns>
+        protected virtual TextRowVisualStyle GetNewVisualStyle()
+        {
+            return (new TextRowVisualStyle());
+        }
+
+        #endregion
+
+        #region ApplyStyleEx
+
+        /// <summary>
+        /// ApplyStyleEx
+        /// </summary>
+        /// <param name="style"></param>
+        /// <param name="css"></param>
+        protected virtual void ApplyStyleEx(TextRowVisualStyle style, StyleType[] css)
+        {
+        }
+
+        #endregion
+
+        #region ValidateRowStyle
+
+        private void ValidateRowStyle()
+        {
+            if (_EffectiveRowStyles == null ||
+                (_StyleUpdateCount != SuperGrid.StyleUpdateCount))
+            {
+                _EffectiveRowStyles = new TextRowVisualStyles();
+
+                _StyleUpdateCount = SuperGrid.StyleUpdateCount;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region InvalidateRender
+
+        /// <summary>
+        /// InvalidateRender
+        /// </summary>
+        public override void InvalidateRender()
+        {
+            if (SuperGrid != null)
+                InvalidateRender(Bounds);
+        }
+
+        #endregion
+
+        #region ToString
+
+        /// <summary>
+        /// ToString
+        /// </summary>
+        /// <returns></returns>
+        public override string ToString()
+        {
+            string s = base.ToString();
+
+            if (String.IsNullOrEmpty(_Text) == false)
+                s += ": (\"" + _Text + "\")";
+
+            return (s);
+        }
+
+        #endregion
+
+        #region Markup support
+
+        private void MarkupTextChanged()
+        {
+            _TextMarkup = null;
+
+            if (_EnableMarkup == true)
+            {
+                if (MarkupParser.IsMarkup(_Text) == true)
+                {
+                    _TextMarkup = MarkupParser.Parse(_Text);
+
+                    if (_TextMarkup != null)
+                        _TextMarkup.HyperLinkClick += TextMarkupLinkClick;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Occurs when a text markup link is clicked
+        /// </summary>
+        protected virtual void TextMarkupLinkClick(object sender, EventArgs e)
+        {
+            HyperLink link = sender as HyperLink;
+
+            SuperGrid.DoTextRowMarkupLinkClickEvent(this, link);
+        }
+
+        /// <summary>
+        /// Gets plain text without text-markup (if text-markup is used in Text)
+        /// </summary>
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public string PlainText
+        {
+            get { return (_TextMarkup != null ? _TextMarkup.PlainText : Text); }
+        }
+
+        #endregion
+    }
+
+    #region enums
+
+    #region GridBackgroundImageLayout
+
+    ///<summary>
+    /// Background Image Layout
+    ///</summary>
+    public enum GridBackgroundImageLayout
+    {
+        ///<summary>
+        /// Image is Top Left aligned and unscaled
+        ///</summary>
+        TopLeft,
+
+        ///<summary>
+        /// Image is Top Right aligned and unscaled
+        ///</summary>
+        TopRight,
+
+        ///<summary>
+        /// Image is Bottom Left aligned and unscaled
+        ///</summary>
+        BottomLeft,
+
+        ///<summary>
+        /// Image is Bottom Right aligned and unscaled
+        ///</summary>
+        BottomRight,
+
+        ///<summary>
+        /// Image is Centered and unscaled
+        ///</summary>
+        Center,
+
+        ///<summary>
+        /// Image is Stretched to fill the area
+        ///</summary>
+        Stretch,
+
+        ///<summary>
+        /// Image is unscaled and tiled
+        ///</summary>
+        Tile,
+
+        ///<summary>
+        /// Image is proportionally scaled to fit
+        ///</summary>
+        Zoom,
+    }
+
+    #endregion
+
+    #region RowHeaderVisibility
+
+    ///<summary>
+    /// RowHeaderVisibility
+    ///</summary>
+    public enum RowHeaderVisibility
+    {
+        ///<summary>
+        /// Always visible
+        ///</summary>
+        Always,
+
+        ///<summary>
+        /// Never visible
+        ///</summary>
+        Never,
+
+        ///<summary>
+        /// Controlled via Panel.ShowRowHeaders
+        ///</summary>
+        PanelControlled,
+    }
+
+    #endregion
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridTitle.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridTitle.cs
new file mode 100644
index 00000000..0245fa92
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridTitle.cs	
@@ -0,0 +1,71 @@
+using System.ComponentModel;
+using DevComponents.DotNetBar.SuperGrid.Style;
+
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    /// <summary>
+    /// Defines the grid title
+    /// </summary>
+    public class GridTitle : GridTextRow
+    {
+        #region Constructors
+
+        ///<summary>
+        /// GridHeader
+        ///</summary>
+        public GridTitle()
+            : this(null)
+        {
+        }
+
+        ///<summary>
+        /// GridHeader
+        ///</summary>
+        ///<param name="text"></param>
+        public GridTitle(string text)
+            : base(text)
+        {
+            RowHeaderVisibility = RowHeaderVisibility.Never;
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region RowHeaderVisibility
+
+        /// <summary>
+        /// Gets or sets whether the RowHeader is displayed
+        /// </summary>
+        [DefaultValue(RowHeaderVisibility.Never), Category("Appearance")]
+        [Description("Indicates whether the RowHeader is displayed")]
+        public override RowHeaderVisibility RowHeaderVisibility
+        {
+            get { return (base.RowHeaderVisibility); }
+            set { base.RowHeaderVisibility = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Style support
+
+        /// <summary>
+        /// ApplyStyleEx
+        /// </summary>
+        /// <param name="style"></param>
+        /// <param name="css"></param>
+        protected override void ApplyStyleEx(TextRowVisualStyle style, StyleType[] css)
+        {
+            foreach (StyleType cs in css)
+            {
+                style.ApplyStyle(SuperGrid.BaseVisualStyles.TitleStyles[cs]);
+                style.ApplyStyle(SuperGrid.DefaultVisualStyles.TitleStyles[cs]);
+                style.ApplyStyle(GridPanel.DefaultVisualStyles.TitleStyles[cs]);
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridVirtualRowCollection.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridVirtualRowCollection.cs
new file mode 100644
index 00000000..b335d883
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/GridVirtualRowCollection.cs	
@@ -0,0 +1,533 @@
+using System;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    /// <summary>
+    /// Defines the collection of Virtual Rows
+    /// </summary>
+    public class GridVirtualRows
+    {
+        #region Private Variables
+
+        private GridContainer _Container;
+
+        private const int MaxRows = 50;
+        private const int MaxBuckets = 100;
+
+        private int _BucketHead;
+        private VPageBucket _LastAccessedBucket;
+        private VPageBucket[] _PageBuckets;
+
+        #endregion
+
+        ///<summary>
+        /// GridVirtualRowList
+        ///</summary>
+        ///<param name="container"></param>
+        public GridVirtualRows(GridContainer container)
+        {
+            _Container = container;
+
+            _PageBuckets = new VPageBucket[MaxBuckets];
+            _PageBuckets[0] = new VPageBucket(_Container, 0);
+        }
+
+        #region Public properties
+
+        #region MaxRowIndex
+
+        ///<summary>
+        /// MaxRowIndex
+        ///</summary>
+        ///<exception cref="Exception"></exception>
+        public int MaxRowIndex
+        {
+            get { return (GetMaxRowIndex()); }
+            set { TruncateRowIndex(value); }
+        }
+
+        #region TruncateRowIndex
+
+        private void TruncateRowIndex(int index)
+        {
+            _LastAccessedBucket = null;
+
+            for (int i = 0; i < MaxBuckets; i++)
+            {
+                int n = (_BucketHead + i) % MaxBuckets;
+
+                if (_PageBuckets[n] != null)
+                {
+                    if (_PageBuckets[n].StartIndex >= index)
+                        _PageBuckets[n] = null;
+
+                    else if (_PageBuckets[n].EndIndex > index)
+                    {
+                        for (int j = 0; j < MaxRows; j++)
+                        {
+                            if (_PageBuckets[n].StartIndex + j > index)
+                                _PageBuckets[n].Rows[j] = null;
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region GetMaxRowIndex
+
+        private int GetMaxRowIndex()
+        {
+            int maxIndex = 0;
+
+            for (int i = 0; i < MaxBuckets; i++)
+            {
+                int n = (_BucketHead + i) % MaxBuckets;
+
+                VPageBucket bucket = _PageBuckets[n];
+
+                if (bucket != null)
+                {
+                    int index = bucket.StartIndex;
+
+                    if (index >= maxIndex)
+                    {
+                        foreach (GridRow row in bucket.Rows)
+                        {
+                            if (row != null)
+                            {
+                                if (row.GridIndex > maxIndex)
+                                    maxIndex = row.GridIndex;
+                            }
+                        }
+                    }
+                }
+            }
+
+            return (maxIndex);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Row Indexer
+
+        ///<summary>
+        /// Row indexer
+        ///</summary>
+        ///<param name="index"></param>
+        public GridRow this[int index]
+        {
+            get { return (GetRow(index)); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region FindBucket
+
+        private VPageBucket FindBucket(int index)
+        {
+            if (_LastAccessedBucket != null)
+            {
+                if (_LastAccessedBucket.Contains(index))
+                    return (_LastAccessedBucket);
+            }
+
+            for (int i = 0; i < MaxBuckets; i++)
+            {
+                int n = (_BucketHead + i) % MaxBuckets;
+
+                if (_PageBuckets[n] != null)
+                {
+                    if (_PageBuckets[n].Contains(index))
+                        return (_PageBuckets[n]);
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region FreeRow
+
+        ///<summary>
+        /// FreeRow
+        ///</summary>
+        ///<param name="index"></param>
+        ///<returns></returns>
+        ///<exception cref="Exception"></exception>
+        public void FreeRow(int index)
+        {
+            VPageBucket bucket = FindBucket(index);
+
+            if (bucket != null)
+            {
+                GridRow[] rows = bucket.Rows;
+                GridRow row = rows[index - bucket.StartIndex];
+
+                if (row != null)
+                {
+                    row.Dispose();
+                    rows[index - bucket.StartIndex] = null;
+                }
+            }
+        }
+
+        #endregion
+
+        #region IsCachedRow
+
+        ///<summary>
+        /// Gets whether the row is currently cached
+        ///</summary>
+        public bool IsCachedRow(int index)
+        {
+            if (_LastAccessedBucket != null)
+            {
+                if (_LastAccessedBucket.Contains(index) == true)
+                    return (_LastAccessedBucket.IsCached(index));
+            }
+
+            for (int i = 0; i < MaxBuckets; i++)
+            {
+                int n = (_BucketHead + i) % MaxBuckets;
+
+                if (_PageBuckets[n] != null)
+                {
+                    if (_PageBuckets[n].Contains(index) == true)
+                        return (_PageBuckets[n].IsCached(index));
+                }
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region GetRow
+
+        private GridRow GetRow(int index)
+        {
+            if (_LastAccessedBucket != null)
+            {
+                if (_LastAccessedBucket.Contains(index))
+                    return (_LastAccessedBucket[index]);
+            }
+
+            for (int i = 0; i < MaxBuckets; i++)
+            {
+                int n = (_BucketHead + i) % MaxBuckets;
+
+                if (_PageBuckets[n] == null)
+                    return (NewBucketRow(n, index));
+
+                if (_PageBuckets[n].Contains(index))
+                {
+                    _LastAccessedBucket = _PageBuckets[n];
+
+                    return (_LastAccessedBucket[index]);
+                }
+            }
+
+            int bucket = _BucketHead;
+
+            GridPanel panel = _Container.GridPanel;
+
+            if (panel != null)
+            {
+                for (int i = 0; i < MaxBuckets; i++)
+                {
+                    bucket = (_BucketHead + i) % MaxBuckets;
+
+                    if (panel.FrozenRowCount > 0)
+                    {
+                        if (_PageBuckets[bucket].Contains(0))
+                            continue;
+                    }
+
+                    if (panel.ActiveRow != null)
+                    {
+                        if (_PageBuckets[bucket].Contains(panel.ActiveRow.Index))
+                            continue;
+                    }
+                    break;
+                }
+            }
+
+            _BucketHead = (bucket + 1) % MaxBuckets;
+
+            return (NewBucketRow(bucket, index));
+        }
+
+        #endregion
+
+        #region NewBucketRow
+
+        private GridRow NewBucketRow(int n, int index)
+        {
+            int startIndex = (index / MaxRows) * MaxRows;
+
+            if (_PageBuckets[n] != null)
+                _PageBuckets[n].Reset(_Container, startIndex);
+            else
+                _PageBuckets[n] = new VPageBucket(_Container, startIndex);
+
+            _LastAccessedBucket = _PageBuckets[n];
+
+            return (_LastAccessedBucket[index]);
+        }
+
+        #endregion
+
+        #region Clear
+
+        ///<summary>
+        /// Clear
+        ///</summary>
+        public void Clear()
+        {
+            for (int i = 0; i < MaxBuckets; i++)
+            {
+                if (_PageBuckets[i] != null)
+                    _PageBuckets[i].Reset(null, 0);
+
+                _PageBuckets[i] = null;
+            }
+
+            _BucketHead = 0;
+            _LastAccessedBucket = null;
+        }
+
+        #endregion
+
+        #region VPageBucket
+
+        private class VPageBucket
+        {
+            #region Static data
+
+            static private GridLayoutInfo _layoutInfo = new GridLayoutInfo(null, Rectangle.Empty);
+            static private GridLayoutStateInfo _stateInfo = new GridLayoutStateInfo(null, 0);
+
+            #endregion
+
+            #region Private variables
+
+            private GridContainer _Container;
+            private int _StartIndex;
+            private int _EndIndex;
+
+            private GridRow[] _Rows;
+
+            #endregion
+
+            public VPageBucket(GridContainer container, int startIndex)
+            {
+                _Container = container;
+                _StartIndex = startIndex;
+                _EndIndex = startIndex + MaxRows - 1;
+
+                _Rows = new GridRow[MaxRows];
+            }
+
+            #region Public properties
+
+            #region EndIndex
+
+            public int EndIndex
+            {
+                get { return (_EndIndex); }
+            }
+
+            #endregion
+
+            #region Row Indexer
+
+            ///<summary>
+            /// Row indexer
+            ///</summary>
+            ///<param name="index"></param>
+            public GridRow this[int index]
+            {
+                get { return (GetRow(index)); }
+            }
+
+            #endregion
+
+            #region Rows
+
+            public GridRow[] Rows
+            {
+                get { return (_Rows); }
+            }
+
+            #endregion
+
+            #region StartIndex
+
+            public int StartIndex
+            {
+                get { return (_StartIndex); }
+            }
+
+            #endregion
+
+            #endregion
+
+            #region Contains
+
+            public bool Contains(int index)
+            {
+                return (index >= _StartIndex && index <= _EndIndex);
+            }
+
+            #endregion
+
+            #region IsCached
+
+            public bool IsCached(int index)
+            {
+                if (Contains(index) == true)
+                    return (_Rows[index - _StartIndex] != null);
+
+                return (false);
+            }
+
+            #endregion
+
+            #region GetRow
+
+            private GridRow GetRow(int index)
+            {
+                int n = index - _StartIndex;
+
+                if (_Rows[n] == null)
+                    _Rows[n] = AllocNewGridRow(index);
+
+                GridRow row = _Rows[n];
+
+                if (row.ArrangeLayoutCount != row.SuperGrid.ArrangeLayoutCount)
+                    ArrangeRow(row.GridPanel, row);
+
+                return (row);
+            }
+
+            #endregion
+
+            #region Reset
+
+            public void Reset(GridContainer container, int startIndex)
+            {
+                for (int i = 0; i < MaxRows; i++)
+                {
+                    GridRow row = _Rows[i];
+
+                    if (row != null)
+                    {
+                        row.Dispose();
+
+                        _Rows[i] = null;
+                    }
+                }
+
+                _Container = container;
+                _StartIndex = startIndex;
+                _EndIndex = startIndex + MaxRows - 1;
+            }
+
+            #endregion
+
+            #region AllocNewGridRow
+
+            private GridRow AllocNewGridRow(int index)
+            {
+                GridPanel panel = _Container.GridPanel;
+
+                if (panel != null)
+                {
+                    GridRow row = new GridRow();
+
+                    row.Parent = _Container;
+
+                    row.GridIndex = index;
+                    row.Index = index;
+                    row.RowIndex = index;
+                    row.FullIndex = index;
+
+                    row.MergeUpdateCount = _Container.MergeUpdateCount;
+                    row.MergeUpdateCount--;
+
+                    row.Loading = true;
+
+                    try
+                    {
+                        GridColumnCollection columns = panel.Columns;
+
+                        if (columns.Count > 0)
+                        {
+                            for (int i = 0; i < columns.Count; i++)
+                            {
+                                GridColumn col = panel.Columns[i];
+
+                                GridCell cell = new GridCell(col.DefaultNewRowCellValue);
+
+                                cell.Parent = row;
+                                cell.ColumnIndex = i;
+
+                                row.Cells.Add(cell);
+                            }
+                        }
+
+                        ArrangeRow(panel, row);
+
+                        if (columns.Count > 0)
+                        {
+                            _Container.SuperGrid.DoLoadVirtualRowEvent(panel, row);
+                            _Container.SuperGrid.DoVirtualRowLoadedEvent(panel, row);
+                        }
+                    }
+                    finally
+                    {
+                        row.Loading = false;
+                    }
+
+                    return (row);
+                }
+
+                return (null);
+            }
+
+            #region ArrangeRow
+
+            private void ArrangeRow(GridPanel panel, GridRow row)
+            {
+                Rectangle r = panel.BoundsRelative;
+
+                int vrh = Dpi.Height(panel.VirtualRowHeight);
+
+                r.Y += (panel.FixedRowHeight - (panel.FrozenRowCount * vrh));
+                r.Y += (row.Index * vrh);
+
+                r.Size = new Size(panel.ColumnHeader.Size.Width, vrh);
+
+                _layoutInfo.ClientBounds = r;
+                _stateInfo.GridPanel = panel;
+
+                row.FixedRowHeight = r.Size.Height;
+                row.Arrange(_layoutInfo, _stateInfo, r);
+            }
+
+            #endregion
+
+            #endregion
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/Licensing.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/Licensing.cs
new file mode 100644
index 00000000..a731f1fb
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/Licensing.cs	
@@ -0,0 +1,150 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    internal class NativeFunctions
+    {
+        #region Licensing
+#if !TRIAL
+        internal static bool keyValidated = false;
+        internal static int keyValidated2 = 0;
+        internal static bool ValidateLicenseKey(string key)
+        {
+            bool ret = false;
+            string[] parts = key.Split('-');
+            int i = 10;
+            foreach (string s in parts)
+            {
+                if (s == "88405280")
+                    i++;
+                else if (s == "D06E")
+                    i += 10;
+                else if (s == "4617")
+                    i += 8;
+                else if (s == "8810")
+                    i += 12;
+                else if (s == "64462F60FA93")
+                    i += 3;
+            }
+            if (i == 29)
+                return true;
+            keyValidated = true;
+            return ret;
+        }
+        internal static bool CheckLicenseKey(string key)
+        {
+            // F962CEC7-CD8F-4911-A9E9-CAB39962FC1F, 189, 266
+            string[] parts = key.Split('-');
+            int test = 0;
+            for (int i = parts.Length - 1; i >= 0; i--)
+            {
+                if (parts[i] == "A9E9")
+                    test += 11;
+                else if (parts[i] == "F962CEC7")
+                    test += 12;
+                else if (parts[i] == "CAB39962FC1F")
+                    test += 2;
+                else if (parts[i] == "4911")
+                    test += 99;
+                else if (parts[i] == "CD8F")
+                    test += 65;
+            }
+
+            keyValidated2 = test + 77;
+
+            if (test == 23)
+                return false;
+
+            return true;
+        }
+#endif
+        #endregion
+
+#if TRIAL
+		private static Color m_ColorExpFlag=Color.Empty;
+        internal static bool CheckedThrough = false;
+		internal static bool ColorExpAlt()
+		{
+#if NOTIMELIMIT
+				return false;
+#else
+			Color clr=SystemColors.Control;
+			Color clr2;
+			Color clr3;
+			clr2=clr;
+			if(clr2.ToArgb()==clr.ToArgb())
+			{
+				clr3=clr2;
+			}
+			else
+			{
+				clr3=clr;
+			}
+
+			if(!m_ColorExpFlag.IsEmpty)
+			{
+				return (m_ColorExpFlag==Color.Black?false:true);
+			}
+			try
+			{
+				Microsoft.Win32.RegistryKey key=Microsoft.Win32.Registry.ClassesRoot;
+                try
+                {
+                    key = key.CreateSubKey("CLSID\\{AC49A37B-FD89-4763-AB1B-C6DF6709657F}\\InprocServer32");
+                }
+                catch (System.UnauthorizedAccessException)
+                {
+                    key = key.OpenSubKey("CLSID\\{AC49A37B-FD89-4763-AB1B-C6DF6709657F}\\InprocServer32");
+                }
+				try
+				{
+					if(key.GetValue("")==null || key.GetValue("").ToString()=="")
+					{
+						key.SetValue("",DateTime.Today.ToOADate().ToString());
+					}
+					else
+					{
+						if(key.GetValue("").ToString()=="windows3.dll")
+						{
+							m_ColorExpFlag=Color.White;
+							key.Close();
+							key=null;
+							return true;
+						}
+						DateTime date=DateTime.FromOADate(double.Parse(key.GetValue("").ToString()));
+						if(((TimeSpan)DateTime.Today.Subtract(date)).TotalDays>28)
+						{
+							m_ColorExpFlag=Color.White;
+							key.SetValue("","windows4.dll");
+							key.Close();
+							key=null;
+							return true;
+						}
+						if(((TimeSpan)DateTime.Today.Subtract(date)).TotalDays<0)
+						{
+							m_ColorExpFlag=Color.White;
+							key.SetValue("","windows3.dll");
+							key.Close();
+							key=null;
+							return true;
+						}
+					}
+				}
+				finally
+				{
+					if(key!=null)
+						key.Close();
+                    CheckedThrough = true;
+				}
+			}
+			catch{}
+			m_ColorExpFlag=Color.Black;
+			return false;
+#endif
+		}
+#endif
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/Primitives/CustomCollection.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/Primitives/CustomCollection.cs
new file mode 100644
index 00000000..374070f4
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/Primitives/CustomCollection.cs	
@@ -0,0 +1,1230 @@
+using System;
+using System.Collections.Generic;
+using System.Collections;
+using System.Diagnostics;
+using System.Runtime.InteropServices;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar.SuperGrid.Primitives
+{
+    /// <summary>
+    /// Represents custom collection with INotifyPropertyChanged and INotifyCollectionChanged interface support.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    [Serializable, DebuggerDisplay("Count = {Count}"), ComVisible(false)]
+    public class CustomCollection<T> : IList<T>, IList, INotifyPropertyChanged, INotifyCollectionChanged
+    {
+        #region Events
+        /// <summary>
+        /// Occurs when property value has changed.
+        /// </summary>
+        public event PropertyChangedEventHandler PropertyChanged;
+        #endregion
+
+        #region Private variables
+
+        private SimpleMonitor _monitor;
+        private object _SyncRoot;
+        private readonly IList<T> _Items;
+        private bool _FloatLastItem;
+
+        #endregion
+
+        #region Constructors
+
+        /// <summary>
+        /// Creates new instance of object.
+        /// </summary>
+        public CustomCollection()
+        {
+            _monitor = new SimpleMonitor();
+            _Items = new List<T>();
+        }
+
+        /// <summary>
+        /// Creates new instance of object.
+        /// </summary>
+        public CustomCollection(int capacity)
+        {
+            _monitor = new SimpleMonitor();
+            _Items = new List<T>(capacity);
+        }
+
+        /// <summary>
+        /// Creates new instance of object.
+        /// </summary>
+        /// <param name="list">List to initialize collection with.</param>
+        public CustomCollection(IList<T> list)
+        {
+            if (list == null)
+                throw new ArgumentNullException("list");
+
+            _monitor = new SimpleMonitor();
+            _Items = list;
+        }
+
+        #endregion
+
+        #region Add
+
+        /// <summary>
+        /// Add item to collection.
+        /// </summary>
+        /// <param name="item">Item to add.</param>
+        public void Add(T item)
+        {
+            if (_Items.IsReadOnly)
+                throw new NotSupportedException("collection is read-only");
+
+            InsertItem(_Items.Count, item);
+        }
+
+        #endregion
+
+        #region AddRange
+
+        /// <summary>
+        /// Add range of items to collection.
+        /// </summary>
+        /// <param name="collection"></param>
+        public void AddRange(IEnumerable<T> collection)
+        {
+            if (_Items.IsReadOnly)
+                throw new NotSupportedException("collection is read-only");
+
+            CheckReentrancy();
+
+            int index = _Items.Count;
+
+            if (_FloatLastItem == true)
+            {
+                if (_Items.Count > 0 && index == _Items.Count)
+                    index--;
+            }
+
+            foreach (T item in collection)
+                _Items.Insert(index++, item);
+
+            OnPropertyChanged(CountString);
+
+            List<T> list = new List<T>(collection);
+
+            NotifyCollectionChangedEventArgs e = new
+                NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Add, list);
+
+            OnCollectionChanged(e);
+        }
+
+        #endregion
+
+        #region Clear
+
+        /// <summary>
+        /// Remove all items from collection.
+        /// </summary>
+        public void Clear()
+        {
+            if (_Items.IsReadOnly)
+                throw new NotSupportedException("collection is read-only");
+
+            ClearItems();
+        }
+
+        /// <summary>
+        /// Remove all items from collection.
+        /// </summary>
+        protected virtual void ClearItems()
+        {
+            CheckReentrancy();
+
+            T item = default(T);
+
+            if (_FloatLastItem == true)
+            {
+                if (_Items.Count > 0)
+                    item = _Items[_Items.Count - 1];
+            }
+
+            _Items.Clear();
+
+            OnPropertyChanged(CountString);
+            OnPropertyChanged(ItemString);
+
+            OnCollectionReset();
+
+            if (_FloatLastItem == true)
+                _Items.Add(item);
+        }
+
+        #endregion
+
+        #region Contains
+
+        /// <summary>
+        /// Checks whether collection contains item.
+        /// </summary>
+        /// <param name="item">Item to look for.</param>
+        /// <returns>true if item is in collection.</returns>
+        public bool Contains(T item)
+        {
+            OnCollectionReadAccess();
+
+            return (_Items.Contains(item));
+        }
+
+        #endregion
+
+        #region CopyTo
+
+        /// <summary>
+        /// Copy collection to array.
+        /// </summary>
+        /// <param name="array">Array to copy to.</param>
+        /// <param name="index">Index to copy from.</param>
+        public void CopyTo(T[] array, int index)
+        {
+            OnCollectionReadAccess();
+
+            _Items.CopyTo(array, index);
+        }
+
+        #endregion
+
+        #region Count
+
+        /// <summary>
+        /// Returns number of items in collection.
+        /// </summary>
+        public int Count
+        {
+            get
+            {
+                OnCollectionReadAccess();
+
+                return (_Items.Count);
+            }
+        }
+
+        #endregion
+
+        #region CountString
+
+        private string CountString
+        {
+            get { return ("Count"); }
+        }
+
+        #endregion
+
+        #region FloatLastItem
+
+        internal bool FloatLastItem
+        {
+            get { return (_FloatLastItem); }
+            set { _FloatLastItem = value; }
+        }
+
+        #endregion
+
+        #region GetEnumerator
+
+        /// <summary>
+        /// Gets enumerator for collection.
+        /// </summary>
+        /// <returns>Enumerator.</returns>
+        public IEnumerator<T> GetEnumerator()
+        {
+            OnCollectionReadAccess();
+
+            return (_Items.GetEnumerator());
+        }
+
+        #endregion
+
+        #region Indexer[int]
+
+        /// <summary>
+        /// Returns item at index.
+        /// </summary>
+        /// <param name="index">Index of item.</param>
+        /// <returns>Item at index.</returns>
+        public T this[int index]
+        {
+            get
+            {
+                OnCollectionReadAccess();
+
+                return (_Items[index]);
+            }
+
+            set
+            {
+                if (_Items.IsReadOnly)
+                    throw new NotSupportedException("collection is read-only");
+
+                if ((index < 0) || (index >= _Items.Count))
+                    throw new ArgumentOutOfRangeException();
+
+                SetItem(index, value);
+            }
+        }
+
+        #endregion
+
+        #region IndexOf
+
+        /// <summary>
+        /// Returns index of an item.
+        /// </summary>
+        /// <param name="item">Reference to item.</param>
+        /// <returns>Index of item.</returns>
+        public int IndexOf(T item)
+        {
+            OnCollectionReadAccess();
+            return (_Items.IndexOf(item));
+        }
+
+        #endregion
+
+        #region Insert
+
+        /// <summary>
+        /// Insert item at specified location.
+        /// </summary>
+        /// <param name="index">Index to insert item in.</param>
+        /// <param name="item">Item to insert.</param>
+        public void Insert(int index, T item)
+        {
+            if ((index < 0) || (index > _Items.Count))
+                index = _Items.Count;
+
+            InsertItem(index, item);
+        }
+
+        #endregion
+
+        #region InsertItem
+
+        /// <summary>
+        /// Inserts item.
+        /// </summary>
+        /// <param name="index">Index to insert item at.</param>
+        /// <param name="item">Reference to item.</param>
+        protected virtual void InsertItem(int index, T item)
+        {
+            CheckReentrancy();
+
+            if (_FloatLastItem == true)
+            {
+                if (_Items.Count > 0 && index == _Items.Count)
+                    index--;
+            }
+
+            _Items.Insert(index, item);
+
+            OnPropertyChanged(CountString);
+            OnCollectionChanged(NotifyCollectionChangedAction.Add, item, index);
+        }
+
+        #endregion
+
+        #region IsCompatibleObject
+
+        private static bool IsCompatibleObject(object value)
+        {
+            return (value is T) || (value == null && !typeof (T).IsValueType);
+        }
+
+        #endregion
+
+        #region ItemString
+
+        private string ItemString
+        {
+            get { return ("Item[]"); }
+        }
+
+        #endregion
+
+        #region Remove
+
+        /// <summary>
+        /// Removes item from collection.
+        /// </summary>
+        /// <param name="item">Item to remove.</param>
+        /// <returns>true if item was removed.</returns>
+        public bool Remove(T item)
+        {
+            if (_Items.IsReadOnly)
+                throw new NotSupportedException("collection is read-only");
+
+            int index = _Items.IndexOf(item);
+
+            if (index < 0)
+                return (false);
+
+            RemoveItem(index);
+
+            return (true);
+        }
+
+        #endregion
+
+        #region RemoveAt
+
+        /// <summary>
+        /// Remove item at specified location.
+        /// </summary>
+        /// <param name="index">Index of item to remove.</param>
+        public void RemoveAt(int index)
+        {
+            if (_Items.IsReadOnly)
+                throw new NotSupportedException("collection is read-only");
+
+            if ((index < 0) || (index >= _Items.Count))
+                throw new ArgumentOutOfRangeException();
+
+            RemoveItem(index);
+        }
+
+        #endregion
+
+        #region RemoveItem
+
+        /// <summary>
+        /// Remove item at specified location.
+        /// </summary>
+        /// <param name="index">Index of item to remove.</param>
+        protected virtual void RemoveItem(int index)
+        {
+            CheckReentrancy();
+
+            object item = _Items[index];
+            _Items.RemoveAt(index);
+
+            OnPropertyChanged(CountString);
+            OnCollectionChanged(NotifyCollectionChangedAction.Remove, item, index);
+        }
+
+        #endregion
+
+        #region SetItem
+
+        /// <summary>
+        /// Set item on location.
+        /// </summary>
+        /// <param name="index">Index</param>
+        /// <param name="item">Item to assign.</param>
+        protected virtual void SetItem(int index, T item)
+        {
+            CheckReentrancy();
+
+            T oldItem = _Items[index];
+            _Items[index] = item;
+
+            OnPropertyChanged(CountString);
+            OnPropertyChanged(ItemString);
+
+            OnCollectionChanged(NotifyCollectionChangedAction.Replace, oldItem, item, index);
+        }
+
+        #endregion
+
+        #region IList support
+
+        #region Add
+
+        int IList.Add(object value)
+        {
+            if (_Items.IsReadOnly)
+                throw new NotSupportedException("collection is read-only");
+
+            VerifyValueType(value);
+
+            Add((T)value);
+
+            return (Count - 1);
+        }
+
+        #endregion
+
+        #region Contains
+
+        bool IList.Contains(object value)
+        {
+            return (IsCompatibleObject(value) && Contains((T)value));
+        }
+
+        #endregion
+
+        #region GetItemsDirect
+
+        /// <summary>
+        /// Returns items directly without checks.
+        /// </summary>
+        /// <returns>List of items.</returns>
+        protected IList<T> GetItemsDirect()
+        {
+            return (_Items);
+        }
+
+        #endregion
+
+        #region Indexer[int]
+
+        object IList.this[int index]
+        {
+            get
+            {
+                OnCollectionReadAccess();
+                return (_Items[index]);
+            }
+            set
+            {
+                VerifyValueType(value);
+                this[index] = (T)value;
+            }
+        }
+
+        #region IndexOf
+
+        int IList.IndexOf(object value)
+        {
+            OnCollectionReadAccess();
+
+            return (IsCompatibleObject(value) ? IndexOf((T) value) : -1);
+        }
+
+        #endregion
+
+        #region Insert
+
+        void IList.Insert(int index, object value)
+        {
+            if (_Items.IsReadOnly)
+                throw new NotSupportedException("collection is read-only");
+            
+            VerifyValueType(value);
+
+            Insert(index, (T)value);
+        }
+
+        #endregion
+
+        #region IsFixedSize
+
+        bool IList.IsFixedSize
+        {
+            get
+            {
+                IList items = _Items as IList;
+
+                return ((items != null) && items.IsFixedSize);
+            }
+        }
+
+        #endregion
+
+        #region IsReadOnly
+
+        bool IList.IsReadOnly
+        {
+            get { return (_Items.IsReadOnly); }
+        }
+
+        #endregion
+
+        #region Items
+
+        /// <summary>
+        /// Returns the IList interface for items in collection.
+        /// </summary>
+        protected IList<T> Items
+        {
+            get
+            {
+                OnCollectionReadAccess();
+
+                return (_Items);
+            }
+        }
+
+        #endregion
+
+        #region Remove
+
+        void IList.Remove(object value)
+        {
+            if (_Items.IsReadOnly)
+                throw new NotSupportedException("collection is read-only");
+
+            if (IsCompatibleObject(value))
+                Remove((T)value);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region VerifyValueType
+
+        private static void VerifyValueType(object value)
+        {
+            if (!IsCompatibleObject(value))
+                throw new ArgumentException("value is of wrong type");
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IEnumerable.GetEnumerator
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            OnCollectionReadAccess();
+
+            return (_Items.GetEnumerator());
+        }
+
+        #endregion
+
+        #region ICollection support
+
+        #region CopyTo
+
+        void ICollection.CopyTo(Array array, int index)
+        {
+            CheckReentrancy();
+            OnCollectionReadAccess();
+
+            if (array == null)
+                throw new ArgumentNullException("array");
+
+            if (array.Rank != 1)
+                throw new ArgumentException("Argument array.Rank multi-dimensional not supported");
+
+            if (array.GetLowerBound(0) != 0)
+                throw new ArgumentException("Argument array non zero lower bound not supported");
+
+            if (index < 0)
+                throw new ArgumentOutOfRangeException("index", "index must be non-negative number");
+
+            if ((array.Length - index) < Count)
+                throw new ArgumentException("array too small");
+
+            T[] localArray = array as T[];
+
+            if (localArray != null)
+            {
+                _Items.CopyTo(localArray, index);
+            }
+            else
+            {
+                Type elementType = array.GetType().GetElementType();
+                Type c = typeof(T);
+
+                if (elementType == null ||
+                    (!elementType.IsAssignableFrom(c) && !c.IsAssignableFrom(elementType)))
+                {
+                    throw new ArgumentException("Argument array of invalid type");
+                }
+
+                object[] objArray = array as object[];
+
+                if (objArray == null)
+                    throw new ArgumentException("Argument array invalid type");
+
+                int count = _Items.Count;
+
+                try
+                {
+                    for (int i = 0; i < count; i++)
+                        objArray[index++] = _Items[i];
+                }
+                catch (ArrayTypeMismatchException)
+                {
+                    throw new ArgumentException("Argument array invalid type");
+                }
+            }
+        }
+
+        #endregion
+
+        #region IsSynchronized
+
+        bool ICollection.IsSynchronized
+        {
+            get { return false; }
+        }
+
+        #endregion
+
+        #region IsReadOnly
+
+        bool ICollection<T>.IsReadOnly
+        {
+            get { return (_Items.IsReadOnly); }
+        }
+
+        #endregion
+
+        #region SyncRoot
+
+        object ICollection.SyncRoot
+        {
+            get
+            {
+                if (_SyncRoot == null)
+                {
+                    ICollection items = _Items as ICollection;
+
+                    if (items != null)
+                        _SyncRoot = items.SyncRoot;
+                    else
+                        System.Threading.Interlocked.CompareExchange(ref _SyncRoot, new object(), null);
+                }
+
+                return (_SyncRoot);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region OnCollectionReadAccess
+
+        /// <summary>
+        /// Occurs when collection is read.
+        /// </summary>
+        protected virtual void OnCollectionReadAccess()
+        {
+        }
+
+        #endregion
+
+        #region OnPropertyChanged
+
+        /// <summary>
+        /// Occurs when collection property has changed.
+        /// </summary>
+        /// <param name="e">Event arguments.</param>
+        protected virtual void OnPropertyChanged(PropertyChangedEventArgs e)
+        {
+            PropertyChangedEventHandler eh = PropertyChanged;
+
+            if (eh != null)
+                eh(this, e);
+        }
+
+        /// <summary>
+        /// Default PropertyChanged processing
+        /// </summary>
+        /// <param name="s"></param>
+        protected void OnPropertyChanged(string s)
+        {
+            if (PropertyChanged != null)
+                OnPropertyChanged(new PropertyChangedEventArgs(s));
+        }
+
+        #endregion
+
+        #region CheckReentrancy
+
+        /// <summary>
+        /// Checks whether call creates reentrancy.
+        /// </summary>
+        protected void CheckReentrancy()
+        {
+            if ((_monitor.Busy && (CollectionChanged != null)) &&
+                (CollectionChanged.GetInvocationList().Length > 1))
+            {
+                throw new InvalidOperationException("CustomCollectionReentrancyNotAllowed");
+            }
+        }
+
+        #endregion
+
+        #region SimpleMonitor
+
+        [Serializable]
+        private class SimpleMonitor 
+        {
+            // Fields
+            private int _BusyCount;
+
+            public void Enter()
+            {
+                _BusyCount++;
+            }
+
+            public void Leave()
+            {
+                _BusyCount--;
+            }
+
+            // Properties
+            public bool Busy
+            {
+                get { return (_BusyCount > 0); }
+            }
+        }
+        #endregion
+
+        #region INotifyCollectionChanged Members
+
+        /// <summary>
+        /// Occurs when collection has changed.
+        /// </summary>
+        public event NotifyCollectionChangedEventHandler CollectionChanged;
+
+        private void OnCollectionChanged(NotifyCollectionChangedAction action, object item, int index)
+        {
+            OnCollectionChanged(new NotifyCollectionChangedEventArgs(action, item, index));
+        }
+
+        private void OnCollectionChanged(NotifyCollectionChangedAction action, object oldItem, object newItem, int index)
+        {
+            OnCollectionChanged(new NotifyCollectionChangedEventArgs(action, newItem, oldItem, index));
+        }
+
+        private void OnCollectionReset()
+        {
+            OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset));
+        }
+
+        /// <summary>
+        /// Called when collection has changed.
+        /// </summary>
+        /// <param name="e">Event arguments.</param>
+        protected virtual void OnCollectionChanged(NotifyCollectionChangedEventArgs e)
+        {
+            if (CollectionChanged != null)
+            {
+                try
+                {
+                    _monitor.Enter();
+
+                    CollectionChanged(this, e);
+                }
+                finally
+                {
+                    _monitor.Leave();
+                }
+            }
+        }
+        #endregion
+    }
+
+    #region INotifyCollectionChanged
+    /// <summary>
+    /// Represents collection changed notification interface.
+    /// </summary>
+    public interface INotifyCollectionChanged
+    {
+        /// <summary>
+        /// Occurs when collection changed.
+        /// </summary>
+        event NotifyCollectionChangedEventHandler CollectionChanged;
+    }
+    /// <summary>
+    /// Defines change actions.
+    /// </summary>
+    public enum NotifyCollectionChangedAction
+    {
+        /// <summary>
+        /// Items were added.
+        /// </summary>
+        Add,
+        /// <summary>
+        /// Items were removed.
+        /// </summary>
+        Remove,
+        /// <summary>
+        /// Items were replaced.
+        /// </summary>
+        Replace,
+        /// <summary>
+        /// Items were moved.
+        /// </summary>
+        Move,
+        /// <summary>
+        /// Collection was reset.
+        /// </summary>
+        Reset
+    }
+    /// <summary>
+    /// Defines delegate for collection notification events.
+    /// </summary>
+    /// <param name="sender">Event sender.</param>
+    /// <param name="e">Event arguments.</param>
+    public delegate void NotifyCollectionChangedEventHandler(object sender, NotifyCollectionChangedEventArgs e);
+    /// <summary>
+    /// Defines collection change notification event arguments.
+    /// </summary>
+    public class NotifyCollectionChangedEventArgs : EventArgs
+    {
+        #region Private Vars
+
+        private NotifyCollectionChangedAction _Action;
+        private IList _NewItems;
+        private int _NewStartingIndex;
+        private IList _OldItems;
+        private int _OldStartingIndex;
+
+        #endregion
+
+        /// <summary>
+        /// Create new instance of object.
+        /// </summary>
+        /// <param name="action">Action</param>
+        public NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction action)
+        {
+            _NewStartingIndex = -1;
+            _OldStartingIndex = -1;
+            if (action != NotifyCollectionChangedAction.Reset)
+            {
+                throw new ArgumentException("WrongActionForCtor");
+            }
+            InitializeAdd(action, null, -1);
+        }
+        /// <summary>
+        /// Creates new instance of object.
+        /// </summary>
+        /// <param name="action">Specifies action.</param>
+        /// <param name="changedItems">List of changed items.</param>
+        public NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction action, IList changedItems)
+        {
+            _NewStartingIndex = -1;
+            _OldStartingIndex = -1;
+            if (((action != NotifyCollectionChangedAction.Add) && (action != NotifyCollectionChangedAction.Remove)) && (action != NotifyCollectionChangedAction.Reset))
+            {
+                throw new ArgumentException("MustBeResetAddOrRemoveActionForCtor");
+            }
+            if (action == NotifyCollectionChangedAction.Reset)
+            {
+                if (changedItems != null)
+                {
+                    throw new ArgumentException("ResetActionRequiresNullItem");
+                }
+                InitializeAdd(action, null, -1);
+            }
+            else
+            {
+                if (changedItems == null)
+                {
+                    throw new ArgumentNullException("changedItems");
+                }
+                InitializeAddOrRemove(action, changedItems, -1);
+            }
+        }
+        /// <summary>
+        /// Creates new instance of object.
+        /// </summary>
+        /// <param name="action">Specifies action.</param>
+        /// <param name="changedItem">Item that was changed.</param>
+        public NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction action, object changedItem)
+        {
+            _NewStartingIndex = -1;
+            _OldStartingIndex = -1;
+            if (((action != NotifyCollectionChangedAction.Add) && (action != NotifyCollectionChangedAction.Remove)) && (action != NotifyCollectionChangedAction.Reset))
+            {
+                throw new ArgumentException("MustBeResetAddOrRemoveActionForCtor");
+            }
+            if (action == NotifyCollectionChangedAction.Reset)
+            {
+                if (changedItem != null)
+                {
+                    throw new ArgumentException("ResetActionRequiresNullItem");
+                }
+                InitializeAdd(action, null, -1);
+            }
+            else
+            {
+                InitializeAddOrRemove(action, new object[] { changedItem }, -1);
+            }
+        }
+
+        /// <summary>
+        /// Creates new instance of object.
+        /// </summary>
+        /// <param name="action">Action.</param>
+        /// <param name="newItems">New items in collection.</param>
+        /// <param name="oldItems">Old items in collection.</param>
+        public NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction action, IList newItems, IList oldItems)
+        {
+            _NewStartingIndex = -1;
+            _OldStartingIndex = -1;
+            if (action != NotifyCollectionChangedAction.Replace)
+            {
+                throw new ArgumentException("WrongActionForCtor");
+            }
+            if (newItems == null)
+            {
+                throw new ArgumentNullException("newItems");
+            }
+            if (oldItems == null)
+            {
+                throw new ArgumentNullException("oldItems");
+            }
+            InitializeMoveOrReplace(action, newItems, oldItems, -1, -1);
+        }
+        /// <summary>
+        /// Creates new instance of object.
+        /// </summary>
+        /// <param name="action">Action.</param>
+        /// <param name="changedItems">List of changed items.</param>
+        /// <param name="startingIndex">Starting index of change.</param>
+        public NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction action, IList changedItems, int startingIndex)
+        {
+            _NewStartingIndex = -1;
+            _OldStartingIndex = -1;
+            if (((action != NotifyCollectionChangedAction.Add) && (action != NotifyCollectionChangedAction.Remove)) && (action != NotifyCollectionChangedAction.Reset))
+            {
+                throw new ArgumentException("MustBeResetAddOrRemoveActionForCtor");
+            }
+            if (action == NotifyCollectionChangedAction.Reset)
+            {
+                if (changedItems != null)
+                {
+                    throw new ArgumentException("ResetActionRequiresNullItem");
+                }
+                if (startingIndex != -1)
+                {
+                    throw new ArgumentException("ResetActionRequiresIndexMinus1");
+                }
+                InitializeAdd(action, null, -1);
+            }
+            else
+            {
+                if (changedItems == null)
+                {
+                    throw new ArgumentNullException("changedItems");
+                }
+                if (startingIndex < -1)
+                {
+                    throw new ArgumentException("IndexCannotBeNegative");
+                }
+                InitializeAddOrRemove(action, changedItems, startingIndex);
+            }
+        }
+        /// <summary>
+        /// Creates new instance of object.
+        /// </summary>
+        /// <param name="action">Action</param>
+        /// <param name="changedItem">Changed item</param>
+        /// <param name="index">Index of change</param>
+        public NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction action, object changedItem, int index)
+        {
+            _NewStartingIndex = -1;
+            _OldStartingIndex = -1;
+            if (((action != NotifyCollectionChangedAction.Add) && (action != NotifyCollectionChangedAction.Remove)) && (action != NotifyCollectionChangedAction.Reset))
+            {
+                throw new ArgumentException("MustBeResetAddOrRemoveActionForCtor");
+            }
+            if (action == NotifyCollectionChangedAction.Reset)
+            {
+                if (changedItem != null)
+                {
+                    throw new ArgumentException("ResetActionRequiresNullItem");
+                }
+                if (index != -1)
+                {
+                    throw new ArgumentException("ResetActionRequiresIndexMinus1");
+                }
+                InitializeAdd(action, null, -1);
+            }
+            else
+            {
+                InitializeAddOrRemove(action, new object[] { changedItem }, index);
+            }
+        }
+        /// <summary>
+        /// Creates new instance of object.
+        /// </summary>
+        /// <param name="action">Action</param>
+        /// <param name="newItem">New item</param>
+        /// <param name="oldItem">Old item</param>
+        public NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction action, object newItem, object oldItem)
+        {
+            _NewStartingIndex = -1;
+            _OldStartingIndex = -1;
+            if (action != NotifyCollectionChangedAction.Replace)
+            {
+                throw new ArgumentException("WrongActionForCtor");
+            }
+            InitializeMoveOrReplace(action, new object[] { newItem }, new object[] { oldItem }, -1, -1);
+        }
+        /// <summary>
+        /// Creates new instance of object.
+        /// </summary>
+        /// <param name="action">Action</param>
+        /// <param name="newItems">New items.</param>
+        /// <param name="oldItems">Removed items.</param>
+        /// <param name="startingIndex">Starting index of change.</param>
+        public NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction action, IList newItems, IList oldItems, int startingIndex)
+        {
+            _NewStartingIndex = -1;
+            _OldStartingIndex = -1;
+            if (action != NotifyCollectionChangedAction.Replace)
+            {
+                throw new ArgumentException("WrongActionForCtor");
+            }
+            if (newItems == null)
+            {
+                throw new ArgumentNullException("newItems");
+            }
+            if (oldItems == null)
+            {
+                throw new ArgumentNullException("oldItems");
+            }
+            InitializeMoveOrReplace(action, newItems, oldItems, startingIndex, startingIndex);
+        }
+        /// <summary>
+        /// Creates new instance of object.
+        /// </summary>
+        /// <param name="action">Action</param>
+        /// <param name="changedItems">Changed items</param>
+        /// <param name="index">New index</param>
+        /// <param name="oldIndex">Old index</param>
+        public NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction action, IList changedItems, int index, int oldIndex)
+        {
+            _NewStartingIndex = -1;
+            _OldStartingIndex = -1;
+            if (action != NotifyCollectionChangedAction.Move)
+            {
+                throw new ArgumentException("WrongActionForCtor");
+            }
+            if (index < 0)
+            {
+                throw new ArgumentException("IndexCannotBeNegative");
+            }
+            InitializeMoveOrReplace(action, changedItems, changedItems, index, oldIndex);
+        }
+        /// <summary>
+        /// Creates new instance of object.
+        /// </summary>
+        /// <param name="action">Action</param>
+        /// <param name="changedItem">Changed item</param>
+        /// <param name="index">New index</param>
+        /// <param name="oldIndex">Old index</param>
+        public NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction action, object changedItem, int index, int oldIndex)
+        {
+            _NewStartingIndex = -1;
+            _OldStartingIndex = -1;
+            if (action != NotifyCollectionChangedAction.Move)
+            {
+                throw new ArgumentException("WrongActionForCtor");
+            }
+            if (index < 0)
+            {
+                throw new ArgumentException("IndexCannotBeNegative");
+            }
+            object[] newItems = new object[] { changedItem };
+            InitializeMoveOrReplace(action, newItems, newItems, index, oldIndex);
+        }
+        /// <summary>
+        /// Creates new instance of object.
+        /// </summary>
+        /// <param name="action">Action.</param>
+        /// <param name="newItem">New item</param>
+        /// <param name="oldItem">Old item</param>
+        /// <param name="index">New index</param>
+        public NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction action, object newItem, object oldItem, int index)
+        {
+            _NewStartingIndex = -1;
+            _OldStartingIndex = -1;
+            if (action != NotifyCollectionChangedAction.Replace)
+            {
+                throw new ArgumentException("WrongActionForCtor");
+            }
+            InitializeMoveOrReplace(action, new object[] { newItem }, new object[] { oldItem }, index, index);
+        }
+
+        private void InitializeAdd(NotifyCollectionChangedAction action, IList newItems, int newStartingIndex)
+        {
+            _Action = action;
+            _NewItems = (newItems == null) ? null : ArrayList.ReadOnly(newItems);
+            _NewStartingIndex = newStartingIndex;
+        }
+
+        private void InitializeAddOrRemove(NotifyCollectionChangedAction action, IList changedItems, int startingIndex)
+        {
+            if (action == NotifyCollectionChangedAction.Add)
+            {
+                InitializeAdd(action, changedItems, startingIndex);
+            }
+            else if (action == NotifyCollectionChangedAction.Remove)
+            {
+                InitializeRemove(action, changedItems, startingIndex);
+            }
+        }
+
+        private void InitializeMoveOrReplace(NotifyCollectionChangedAction action, IList newItems, IList oldItems, int startingIndex, int oldStartingIndex)
+        {
+            InitializeAdd(action, newItems, startingIndex);
+            InitializeRemove(action, oldItems, oldStartingIndex);
+        }
+
+        private void InitializeRemove(NotifyCollectionChangedAction action, IList oldItems, int oldStartingIndex)
+        {
+            _Action = action;
+            _OldItems = (oldItems == null) ? null : ArrayList.ReadOnly(oldItems);
+            _OldStartingIndex = oldStartingIndex;
+        }
+
+        /// <summary>
+        /// Gets the type of the collection change action.
+        /// </summary>
+        public NotifyCollectionChangedAction Action
+        {
+            get
+            {
+                return _Action;
+            }
+        }
+        /// <summary>
+        /// Gets list of newly added items.
+        /// </summary>
+        public IList NewItems
+        {
+            get
+            {
+                return _NewItems;
+            }
+        }
+        /// <summary>
+        /// Gets new starting index.
+        /// </summary>
+        public int NewStartingIndex
+        {
+            get
+            {
+                return _NewStartingIndex;
+            }
+        }
+        /// <summary>
+        /// Gets list of removed items.
+        /// </summary>
+        public IList OldItems
+        {
+            get
+            {
+                return _OldItems;
+            }
+        }
+        /// <summary>
+        /// Old starting index.
+        /// </summary>
+        public int OldStartingIndex
+        {
+            get
+            {
+                return _OldStartingIndex;
+            }
+        }
+    }
+    #endregion
+
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/Primitives/SymbolDef.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/Primitives/SymbolDef.cs
new file mode 100644
index 00000000..92908cc2
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/Primitives/SymbolDef.cs	
@@ -0,0 +1,476 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Globalization;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.SuperGrid.Style;
+
+namespace DevComponents.DotNetBar.SuperGrid.Primitives
+{
+    [TypeConverter(typeof(SymbolDefConvertor))]
+    [Editor(typeof(SymbolDefEditor), typeof(UITypeEditor))]
+    public class SymbolDef : INotifyPropertyChanged, IDisposable
+    {
+        #region Private variables
+
+        private string _Symbol = "";
+        private string _SymbolRealized;
+
+        private float _SymbolSize;
+        private Color _SymbolColor = Color.Empty;
+        private eSymbolSet _SymbolSet = eSymbolSet.Awesome;
+
+        private Font _SymbolFont;
+        private Size _RealSymbolSize;
+
+        #endregion
+
+        #region Public properties
+
+        #region Symbol
+
+        /// <summary>
+        /// Indicates the displayed Symbol. Symbol setting takes precedence over Image setting.
+        /// </summary>
+        [DefaultValue(""), Category("Appearance"), Description("displayed Symbol. Symbol setting takes precedence over Image setting.")]
+        [Editor("DevComponents.DotNetBar.Design.SymbolTypeEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor))]
+        public string Symbol
+        {
+            get { return (_Symbol); }
+
+            set
+            {
+                if (value == null)
+                    value = "";
+
+                if (value != _Symbol)
+                {
+                    _Symbol = value;
+                    _SymbolRealized = null;
+
+                    OnPropertyChangedEx("Symbol");
+                }
+            }
+        }
+
+        #endregion
+
+        #region SymbolColor
+
+        /// <summary>
+        /// Gets or sets the color of the Symbol.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates color of the Symbol.")]
+        public Color SymbolColor
+        {
+            get { return (_SymbolColor); }
+
+            set
+            {
+                if (_SymbolColor != value)
+                {
+                    _SymbolColor = value;
+
+                    OnPropertyChangedEx("SymbolColor", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeSymbolColor()
+        {
+            return (_SymbolColor.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetSymbolColor()
+        {
+            SymbolColor = Color.Empty;
+        }
+
+        #endregion
+
+        #region SymbolRealized
+
+        /// <summary>
+        /// Gets the realized symbol string.
+        /// </summary>
+        [Browsable(false)]
+        public string SymbolRealized
+        {
+            get
+            {
+                if (_SymbolRealized == null)
+                {
+                    if (_Symbol != null)
+                        _SymbolRealized = Symbols.GetSymbol(_Symbol);
+                }
+
+                return (_SymbolRealized);
+            }
+        }
+
+        #endregion
+
+        #region SymbolSet
+
+        /// <summary>
+        /// Gets or sets the symbol set used to represent the Symbol.
+        /// </summary>
+        [DefaultValue(eSymbolSet.Awesome)]
+        public eSymbolSet SymbolSet
+        {
+            get { return (_SymbolSet); }
+
+            set
+            {
+                if (_SymbolSet != value)
+                {
+                    _SymbolSet = value;
+
+                    _SymbolRealized = null;
+                    _SymbolFont = null;
+                    _RealSymbolSize = Size.Empty;
+
+                    OnPropertyChangedEx("SymbolSet");
+                }
+            }
+        }
+
+        #endregion
+
+        #region SymbolSize
+
+        /// <summary>
+        /// Indicates the size of the symbol in points.
+        /// </summary>
+        [DefaultValue(0f), Category("Appearance")]
+        [Description("Indicates the size of the symbol in points.")]
+        public float SymbolSize
+        {
+            get { return (_SymbolSize); }
+
+            set
+            {
+                if (value != _SymbolSize)
+                {
+                    _SymbolSize = value;
+                    _SymbolFont = null;
+                    _RealSymbolSize = Size.Empty;
+
+                    OnPropertyChangedEx("SymbolSize");
+                }
+            }
+        }
+
+        #endregion
+
+        #region IsEmpty
+
+        /// <summary>
+        /// Gets whether SymbolDef is Empty.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsEmpty
+        {
+            get
+            {
+                return ((string.IsNullOrEmpty(_Symbol) == true) &&
+                    (_SymbolColor.IsEmpty == true) &&
+                    (_SymbolSize == 0f));
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region SymbolFont
+
+        internal Font SymbolFont
+        {
+            get
+            {
+                if (_SymbolFont == null)
+                    _SymbolFont = Symbols.GetFont(SymbolSize, SymbolSet);
+
+                return (_SymbolFont);
+            }
+
+            set
+            {
+                _SymbolFont = value;
+            }
+        }
+
+        #endregion
+
+        #region IsValidSymbol
+
+        internal bool IsValidSymbol
+        {
+            get { return (string.IsNullOrEmpty(SymbolRealized) == false); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetSymbolSize
+
+        internal Size GetSymbolSize(Control control)
+        {
+            if (_RealSymbolSize == Size.Empty)
+            {
+                if (control != null)
+                {
+                    Font font = SymbolFont;
+
+                    using (Graphics g = control.CreateGraphics())
+                    {
+                        Size size = g.MeasureString(SymbolRealized, font).ToSize();
+
+                        size.Width++;
+                        size.Height++;
+
+                        _RealSymbolSize = size;
+                    }
+                }
+            }
+
+            return (_RealSymbolSize);
+        }
+
+        #endregion
+
+        #region Copy
+
+        /// <summary>
+        /// Creates an exact copy of the SymbolDef.
+        /// </summary>
+        /// <returns>Copy of the SymbolDef.</returns>
+        public SymbolDef Copy()
+        {
+            SymbolDef style = new SymbolDef();
+
+            CopyTo(style);
+
+            return (style);
+        }
+
+        #endregion
+
+        #region CopyTo
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public void CopyTo(SymbolDef style)
+        {
+            style.Symbol = _Symbol;
+
+            style.SymbolColor = _SymbolColor;
+            style.SymbolSet = _SymbolSet;
+            style.SymbolSize = _SymbolSize;
+        }
+
+        #endregion
+
+        #region INotifyPropertyChanged Members
+
+        /// <summary>
+        /// Occurs when property value has changed.
+        /// </summary>
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        /// <summary>
+        /// Raises the PropertyChanged event.
+        /// </summary>
+        /// <param name="e">Event arguments</param>
+        protected virtual void OnPropertyChanged(VisualPropertyChangedEventArgs e)
+        {
+            PropertyChangedEventHandler eh = PropertyChanged;
+
+            if (eh != null)
+                eh(this, e);
+        }
+
+        /// <summary>
+        /// Raises the PropertyChanged event.
+        /// </summary>
+        /// <param name="s">Event arguments</param>
+        protected virtual void OnPropertyChangedEx(string s)
+        {
+            PropertyChangedEventHandler eh = PropertyChanged;
+
+            if (eh != null)
+            {
+                VisualPropertyChangedEventArgs e =
+                    new VisualPropertyChangedEventArgs(s);
+
+                eh(this, e);
+            }
+        }
+
+        /// <summary>
+        /// Raises the PropertyChanged event.
+        /// </summary>
+        /// <param name="s">Event arguments</param>
+        protected virtual void OnPropertyChangedEx(string s, VisualChangeType changeType)
+        {
+            PropertyChangedEventHandler eh = PropertyChanged;
+
+            if (eh != null)
+            {
+                VisualPropertyChangedEventArgs e =
+                    new VisualPropertyChangedEventArgs(s, changeType);
+
+                eh(this, e);
+            }
+        }
+
+        #endregion
+
+        #region UpdateChangeHandler
+
+        private void UpdateChangeHandler(
+            INotifyPropertyChanged oldValue, INotifyPropertyChanged newValue)
+        {
+            if (oldValue != null)
+                oldValue.PropertyChanged -= StyleChanged;
+
+            if (newValue != null)
+                newValue.PropertyChanged += StyleChanged;
+        }
+
+        #endregion
+
+        #region StyleChanged
+
+        /// <summary>
+        /// StyleChanged
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected virtual void StyleChanged(
+            object sender, PropertyChangedEventArgs e)
+        {
+            OnPropertyChanged((VisualPropertyChangedEventArgs)e);
+        }
+
+        #endregion
+
+        #region IDisposable
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        public void Dispose()
+        {
+            SymbolFont = null;
+        }
+ 
+        #endregion
+    }
+
+    #region SymbolDefConvertor
+
+    ///<summary>
+    /// SymbolDefConvertor
+    ///</summary>
+    public class SymbolDefConvertor : ExpandableObjectConverter
+    {
+        /// <summary>
+        /// ConvertTo
+        /// </summary>
+        /// <param name="context"></param>
+        /// <param name="culture"></param>
+        /// <param name="value"></param>
+        /// <param name="destinationType"></param>
+        /// <returns></returns>
+        public override object ConvertTo(
+            ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+        {
+            if (destinationType == typeof(string))
+            {
+                SymbolDef sd = value as SymbolDef;
+
+                if (sd != null)
+                    return (sd.SymbolSet.ToString());
+            }
+
+            return (base.ConvertTo(context, culture, value, destinationType));
+        }
+    }
+
+    #endregion
+
+    #region SymbolDefEditor
+
+    ///<summary>
+    /// SymbolDefEditor
+    ///</summary>
+    public class SymbolDefEditor : UITypeEditor
+    {
+        #region GetPaintValueSupported
+
+        /// <summary>
+        /// GetPaintValueSupported
+        /// </summary>
+        /// <param name="context"></param>
+        /// <returns></returns>
+        public override bool GetPaintValueSupported(ITypeDescriptorContext context)
+        {
+            return (true);
+        }
+
+        #endregion
+
+        #region PaintValue
+
+        /// <summary>
+        /// PaintValue
+        /// </summary>
+        /// <param name="e"></param>
+        public override void PaintValue(PaintValueEventArgs e)
+        {
+            SymbolDef sd = e.Value as SymbolDef;
+
+            if (sd != null)
+            {
+                Font font = Symbols.GetFont(10, sd.SymbolSet);
+
+                Color color = sd.SymbolColor;
+
+                if (sd.SymbolColor.IsEmpty || sd.SymbolColor == Color.White)
+                    color = Color.Brown;
+
+                using (Brush br = new SolidBrush(color))
+                {
+                    using (StringFormat sf = new StringFormat())
+                    {
+                        sf.Alignment = StringAlignment.Center;
+                        sf.LineAlignment = StringAlignment.Center;
+
+                        e.Graphics.DrawString(sd.SymbolRealized, font, br, e.Bounds, sf);
+                    }
+                }
+            }
+        }
+
+        #endregion
+    }
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/SelectedElementCollection.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/SelectedElementCollection.cs
new file mode 100644
index 00000000..3062c4e5
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/SelectedElementCollection.cs	
@@ -0,0 +1,241 @@
+using System.Collections.Generic;
+using DevComponents.DotNetBar.SuperGrid.Primitives;
+
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    ///<summary>
+    /// SelectedElementCollection
+    ///</summary>
+    public class SelectedElementCollection : CustomCollection<GridElement>
+    {
+        #region Constructors
+
+        ///<summary>
+        /// SelectedElementCollection
+        ///</summary>
+        public SelectedElementCollection()
+        {
+        }
+
+        ///<summary>
+        /// SelectedElementCollection
+        ///</summary>
+        ///<param name="capacity"></param>
+        public SelectedElementCollection(int capacity)
+            : base(capacity)
+        {
+        }
+
+        #endregion
+
+        #region GetCells
+
+        #region GetCells
+
+        ///<summary>
+        /// GetCells
+        ///</summary>
+        ///<returns></returns>
+        public List<GridCell> GetCells()
+        {
+            List<GridCell> cells = new List<GridCell>();
+
+            bool hasRows = AddRowCells(cells);
+            bool hasColumns = AddColumnCells(cells, hasRows);
+
+            AddCellCells(cells, hasRows | hasColumns);
+
+            return (cells);
+        }
+
+        #region AddRowCells
+
+        private bool AddRowCells(List<GridCell> cells)
+        {
+            bool hasRows = false;
+
+            foreach (GridElement item in Items)
+            {
+                GridRow row = item as GridRow;
+
+                if (row != null)
+                {
+                    GridPanel panel = row.GridPanel;
+
+                    for (int i = 0; i < panel.Columns.Count; i++)
+                    {
+                        GridCell cell =
+                            row.GetCell(i, panel.AllowEmptyCellSelection);
+
+                        if (cell != null)
+                        {
+                            if (cell.AllowSelection == true)
+                                cells.Add(cell);
+                        }
+                    }
+
+                    hasRows = true;
+                }
+            }
+
+            return (hasRows);
+        }
+
+        #endregion
+
+        #region AddColumnCells
+
+        private bool AddColumnCells(List<GridCell> cells, bool hasRows)
+        {
+            bool hasColumns = false;
+
+            foreach (GridElement item in Items)
+            {
+                GridColumn column = item as GridColumn;
+
+                if (column != null)
+                {
+                    GridContainer container = 
+                        column.Parent as GridContainer;
+
+                    if (container != null)
+                    {
+                        hasColumns = true;
+
+                        AddUniqueColumnCells(container,
+                            cells, column.ColumnIndex, hasRows);
+                    }
+                }
+            }
+
+            return (hasColumns);
+        }
+
+        #region AddUniqueColumnCells
+
+        private void AddUniqueColumnCells(GridContainer container,
+            ICollection<GridCell> cells, int columnIndex, bool hasRows)
+        {
+            if (container != null)
+            {
+                GridPanel panel = container.GridPanel;
+
+                if (panel != null)
+                {
+                    if (panel.VirtualMode == true)
+                    {
+                        for (int i = 0; i < panel.VirtualRowCountEx; i++)
+                        {
+                            GridRow row = panel.VirtualRows[i];
+
+                            if (hasRows == false || row.IsSelected == false)
+                            {
+                                if (row.Cells[columnIndex].AllowSelection == true)
+                                    cells.Add(row.Cells[columnIndex]);
+                            }
+                        }
+                    }
+                    else
+                    {
+                        foreach (GridContainer item in container.Rows)
+                        {
+                            GridRow row = item as GridRow;
+
+                            if (row != null)
+                            {
+                                if (hasRows == false || row.IsSelected == false)
+                                {
+                                    GridCell cell = row.GetCell(columnIndex,
+                                        panel.AllowEmptyCellSelection);
+
+                                    if (cell != null)
+                                    {
+                                        if (cell.AllowSelection == true)
+                                            cells.Add(cell);
+                                    }
+                                }
+
+                                if (row.Rows.Count > 0 && row.Expanded == true)
+                                    AddUniqueColumnCells(item, cells, columnIndex, hasRows);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region AddCellCells
+
+        private void AddCellCells(List<GridCell> cells, bool hasRowCol)
+        {
+            foreach (GridElement item in Items)
+            {
+                GridCell cell = item as GridCell;
+
+                if (cell != null)
+                {
+                    if (cell.AllowSelection == true)
+                    {
+                        if (hasRowCol == true)
+                            AddUniqueCells(cells, cell);
+                        else
+                            cells.Add(cell);
+                    }
+                }
+            }
+        }
+
+        #region AddUniqueCells
+
+        private void AddUniqueCells(
+            ICollection<GridCell> cells, GridCell cell)
+        {
+            GridPanel panel = cell.GridColumn.Parent as GridPanel;
+
+            if (panel != null)
+            {
+                if (cell.GridRow.IsSelected == false)
+                {
+                    if (cell.GridColumn.IsSelected == false)
+                        cells.Add(cell);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region Select
+
+        ///<summary>
+        ///</summary>
+        public void Select(bool value)
+        {
+            foreach (GridElement item in Items)
+            {
+                if (item is GridPanel)
+                    ((GridPanel)item).IsSelected = value;
+
+                else if (item is GridRow)
+                    ((GridRow)item).IsSelected = value;
+
+                else if (item is GridColumn)
+                    ((GridColumn)item).IsSelected = value;
+
+                else if (item is GridCell)
+                    ((GridCell)item).IsSelected = value;
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/SelectedElements.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/SelectedElements.cs
new file mode 100644
index 00000000..c66a85de
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/SelectedElements.cs	
@@ -0,0 +1,735 @@
+using System;
+using System.Collections.Generic;
+
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    ///<summary>
+    /// SelectedElements
+    ///</summary>
+    public class SelectedElements
+    {
+        #region Private variables
+
+        private List<SelectedRange> _Ranges;
+        private SelectedElementType _ElementType;
+
+        #endregion
+
+        ///<summary>
+        /// SelectedElements
+        ///</summary>
+        public SelectedElements()
+        {
+            _Ranges = new List<SelectedRange>();
+        }
+
+        ///<summary>
+        /// SelectedElements
+        ///</summary>
+        public SelectedElements(SelectedElementType elementType)
+            : this()
+        {
+            ElementType = elementType;
+        }
+
+        #region Public properties
+
+        #region Count
+
+        ///<summary>
+        /// Count
+        ///</summary>
+        public int Count
+        {
+            get
+            {
+                int count = 0;
+
+                if (_Ranges != null)
+                {
+                    foreach (SelectedRange range in _Ranges)
+                        count += range.Count;
+                }
+
+                return (count);
+            }
+        }
+
+        #endregion
+
+        #region ElementType
+
+        /// <summary>
+        /// Element Type
+        /// </summary>
+        public SelectedElementType ElementType
+        {
+            get { return (_ElementType); }
+            set { _ElementType = value; }
+        }
+
+        #endregion
+
+        #region FirstIndex
+
+        ///<summary>
+        /// FirstIndex
+        ///</summary>
+        public int FirstIndex
+        {
+            get
+            {
+                if (_Ranges.Count > 0)
+                    return (_Ranges[0].StartIndex);
+
+                return (-1);
+            }
+        }
+
+        #endregion
+
+        #region LastIndex
+
+        ///<summary>
+        /// LastIndex
+        ///</summary>
+        public int LastIndex
+        {
+            get
+            {
+                if (_Ranges.Count > 0)
+                    return (_Ranges[_Ranges.Count - 1].EndIndex);
+
+                return (-1);
+            }
+        }
+
+        #endregion
+
+        #region Ranges
+
+        ///<summary>
+        /// Items
+        ///</summary>
+        public List<SelectedRange> Ranges
+        {
+            get { return (_Ranges); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region FindRange
+
+        ///<summary>
+        /// FindRange
+        ///</summary>
+        ///<param name="index"></param>
+        ///<param name="selRange"></param>
+        ///<returns></returns>
+        public bool FindRange(int index, out SelectedRange selRange)
+        {
+            foreach (SelectedRange range in _Ranges)
+            {
+                if (range.Contains(index) == true)
+                {
+                    selRange = range;
+
+                    return (true);
+                }
+            }
+
+            selRange = null;
+
+            return (false);
+        }
+
+        #endregion
+
+        #region AddItem
+
+        ///<summary>
+        /// AddItem
+        ///</summary>
+        ///<param name="index"></param>
+        ///<returns></returns>
+        public void AddItem(int index)
+        {
+            for (int i = 0; i < _Ranges.Count; i++)
+            {
+                SelectedRange range = _Ranges[i];
+
+                if (index <= range.EndIndex + 1)
+                {
+                    AddItem(range, i, index);
+                    return;
+                }
+            }
+
+            _Ranges.Add(new SelectedRange(index, index));
+
+            ValidateRanges();
+        }
+
+        private void AddItem(SelectedRange range, int i, int index)
+        {
+            if (range.StartIndex - 1 == index)
+            {
+                range.StartIndex--;
+            }
+            else if (range.EndIndex + 1 == index)
+            {
+                range.EndIndex++;
+
+                if (i + 1 < _Ranges.Count)
+                {
+                    if (_Ranges[i + 1].StartIndex == index + 1)
+                    {
+                        _Ranges[i].EndIndex = _Ranges[i + 1].EndIndex;
+                        _Ranges.RemoveAt(i + 1);
+                    }
+                }
+            }
+            else if (range.Contains(index) == false)
+            {
+                SelectedRange selRange = new SelectedRange(index, index);
+
+                _Ranges.Insert(i, selRange);
+            }
+
+            ValidateRanges();
+        }
+
+        #endregion
+
+        #region AddRange
+
+        ///<summary>
+        ///</summary>
+        ///<param name="startIndex"></param>
+        ///<param name="endIndex"></param>
+        public void AddRange(int startIndex, int endIndex)
+        {
+            for (int i = 0; i < _Ranges.Count; i++)
+            {
+                SelectedRange range = _Ranges[i];
+
+                if (endIndex == range.StartIndex - 1)
+                {
+                    range.StartIndex = startIndex;
+
+                    if (i > 0)
+                    {
+                        if (_Ranges[i - 1].EndIndex + 1 == startIndex)
+                        {
+                            _Ranges[i - 1].EndIndex = range.EndIndex;
+                            _Ranges.RemoveAt(i);
+                        }
+                    }
+
+                    CoalesceRanges();
+                    ValidateRanges();
+                    return;
+                }
+
+                if (startIndex == range.EndIndex + 1)
+                {
+                    range.EndIndex = endIndex;
+
+                    if (i + 1 < _Ranges.Count)
+                    {
+                        if (_Ranges[i + 1].StartIndex - 1 == endIndex)
+                        {
+                            range.EndIndex = _Ranges[i + 1].EndIndex;
+                            _Ranges.RemoveAt(i + 1);
+                        }
+                    }
+
+                    CoalesceRanges();
+                    ValidateRanges();
+                    return;
+                }
+            }
+
+            SelectedRange selRange = null;
+
+            for (int i = 0; i < _Ranges.Count; i++)
+            {
+                SelectedRange range = _Ranges[i];
+
+                if (range.StartIndex > startIndex)
+                {
+                    selRange = new SelectedRange(startIndex, endIndex);
+                    _Ranges.Insert(i, selRange);
+                    break;
+                }
+            }
+
+            if (selRange == null)
+            {
+                selRange = new SelectedRange(startIndex, endIndex);
+                _Ranges.Add(selRange);
+            }
+
+            CoalesceRanges();
+        }
+
+        #region CoalesceRanges
+
+        private void CoalesceRanges()
+        {
+            SelectedRange xRange = _Ranges[0];
+
+            for (int i = 1; i < _Ranges.Count; i++)
+            {
+                SelectedRange range = _Ranges[i];
+
+                if (range.StartIndex - 1 <= xRange.EndIndex)
+                {
+                    if (range.EndIndex > xRange.EndIndex)
+                        xRange.EndIndex = range.EndIndex;
+
+                    if (range.StartIndex < xRange.StartIndex)
+                        xRange.StartIndex = range.StartIndex;
+
+                    range.StartIndex = -1;
+                }
+                else
+                {
+                    xRange = range;
+                }
+            }
+
+            for (int i = _Ranges.Count - 1; i > 0; i--)
+            {
+                SelectedRange range = _Ranges[i];
+
+                if (range.StartIndex == -1)
+                    _Ranges.RemoveAt(i);
+            }
+
+            ValidateRanges();
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RemoveItem
+
+        ///<summary>
+        /// RemoveItem
+        ///</summary>
+        ///<param name="index"></param>
+        public void RemoveItem(int index)
+        {
+            SelectedRange selRange;
+
+            if (FindRange(index, out selRange) == true)
+                RemoveItem(index, selRange);
+        }
+
+        ///<summary>
+        /// RemoveItem
+        ///</summary>
+        ///<param name="index"></param>
+        ///<param name="range"></param>
+        ///<returns></returns>
+        public void RemoveItem(int index, SelectedRange range)
+        {
+            if (range.StartIndex == index)
+            {
+                range.StartIndex++;
+
+                if (range.StartIndex > range.EndIndex)
+                    _Ranges.Remove(range);
+            }
+            else if (range.EndIndex == index)
+            {
+                range.EndIndex--;
+
+                if (range.StartIndex > range.EndIndex)
+                    _Ranges.Remove(range);
+            }
+            else if (range.Contains(index) == true)
+            {
+                int i = _Ranges.IndexOf(range);
+                int endIndex = range.EndIndex;
+
+                range.EndIndex = index - 1;
+
+                _Ranges.Insert(i + 1,
+                    new SelectedRange(index + 1, endIndex));
+            }
+
+            ValidateRanges();
+        }
+
+        #endregion
+
+        #region RemoveRange
+
+        ///<summary>
+        ///</summary>
+        ///<param name="startIndex"></param>
+        ///<param name="endIndex"></param>
+        public bool RemoveRange(int startIndex, int endIndex)
+        {
+            bool itemsRemoved = false;
+
+            for (int i = 0; i < _Ranges.Count; i++)
+            {
+                SelectedRange range = _Ranges[i];
+
+                if (range.EndIndex < startIndex)
+                    continue;
+
+                if (range.StartIndex > endIndex)
+                    break;
+
+                if (range.EndIndex >= startIndex && range.EndIndex <= endIndex)
+                {
+                    if (range.StartIndex < startIndex)
+                        range.EndIndex = startIndex - 1;
+                    else
+                        range.StartIndex = -1;
+
+                    itemsRemoved = true;
+                }
+                else if (range.StartIndex >= startIndex && range.StartIndex <= endIndex)
+                {
+                    if (range.EndIndex > endIndex)
+                        range.StartIndex = endIndex + 1;
+                    else
+                        range.StartIndex = -1;
+
+                    itemsRemoved = true;
+                }
+                else
+                {
+                    int index = range.EndIndex;
+                    range.EndIndex = startIndex - 1;
+
+                    _Ranges.Insert(i + 1,
+                        new SelectedRange(endIndex + 1, index));
+
+                    itemsRemoved = true;
+                    break;
+                }
+            }
+
+            for (int i = _Ranges.Count - 1; i >= 0; i--)
+            {
+                SelectedRange range = _Ranges[i];
+
+                if (range.StartIndex == -1)
+                    _Ranges.RemoveAt(i);
+            }
+
+            ValidateRanges();
+
+            return (itemsRemoved);
+        }
+
+        private void ValidateRanges()
+        {
+            int n = -2;
+
+            for (int i = 0; i < _Ranges.Count; i++)
+            {
+                SelectedRange range = _Ranges[i];
+
+                if (range.StartIndex - 1 <= n)
+                    throw new Exception("Invalid Range StartIndex!");
+
+                if (range.StartIndex > range.EndIndex)
+                    throw new Exception("Invalid Range EndIndex!");
+
+                n = range.EndIndex;
+            }
+        }
+
+        #endregion
+
+        #region Clear
+
+        ///<summary>
+        /// Clear
+        ///</summary>
+        public void Clear()
+        {
+            _Ranges.Clear();
+        }
+
+        #endregion
+
+        #region OffsetIndices
+
+        ///<summary>
+        /// OffsetIndices
+        ///</summary>
+        ///<param name="index"></param>
+        ///<param name="count"></param>
+        public void OffsetIndices(int index, int count)
+        {
+            for (int i=0; i<_Ranges.Count; i++)
+            {
+                SelectedRange range = _Ranges[i];
+
+                if (range.EndIndex >= index)
+                {
+                    if (range.StartIndex < index)
+                    {
+                        SelectedRange range2 = new SelectedRange(index, range.EndIndex);
+
+                        range.EndIndex = index - 1;
+
+                        _Ranges.Insert(++i, range2);
+                    }
+                                       
+                    OffsetRanges(i, count);
+                    CoalesceRanges();
+                    break;
+                }
+            }
+
+            ValidateRanges();
+        }
+
+        private void OffsetRanges(int n, int count)
+        {
+            for (int i = n; i < _Ranges.Count; i++)
+            {
+                SelectedRange range = _Ranges[i];
+
+                range.StartIndex += count;
+                range.EndIndex += count;
+            }
+        }
+
+        #endregion
+
+        #region GetNextIndex
+
+        ///<summary>
+        /// GetNextIndex
+        ///</summary>
+        ///<param name="index"></param>
+        ///<returns></returns>
+        public bool GetNextIndex(ref int index)
+        {
+            if (Count > 0)
+            {
+                if (index < LastIndex)
+                {
+                    index = (index < 0)
+                        ? FirstIndex : NextIndex(index);
+
+                    return (true);
+                }
+            }
+
+            return (false);
+        }
+
+        #region NextIndex
+
+        private int NextIndex(int index)
+        {
+            index++;
+
+            foreach (SelectedRange range in _Ranges)
+            {
+                if (range.StartIndex >= index)
+                    return (range.StartIndex);
+
+                if (range.EndIndex >= index)
+                    return (index);
+            }
+
+            return (LastIndex);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetPrevIndex
+
+        ///<summary>
+        /// GetPreviousIndex
+        ///</summary>
+        ///<param name="index"></param>
+        ///<returns></returns>
+        public bool GetPrevIndex(ref int index)
+        {
+            if (Count > 0)
+            {
+                if (index > 0)
+                {
+                    index = (index > LastIndex)
+                        ? LastIndex : PrevIndex(index);
+
+                    return (index >= 0);
+                }
+            }
+
+            return (false);
+        }
+
+        #region PrevIndex
+
+        private int PrevIndex(int index)
+        {
+            index--;
+
+            for (int i=_Ranges.Count - 1; i >= 0; --i)
+            {
+                SelectedRange range = _Ranges[i];
+
+                if (range.EndIndex <= index)
+                    return (range.EndIndex);
+
+                if (range.StartIndex <= index)
+                    return (index);
+            }
+
+            return (-1);
+        }
+
+        #endregion
+
+        #endregion
+
+
+        #region Copy
+
+        internal SelectedElements Copy()
+        {
+            SelectedElements copy = new SelectedElements(_ElementType);
+
+            foreach (SelectedRange range in _Ranges)
+                copy.AddRange(range.StartIndex, range.EndIndex);
+
+            return (copy);
+        }
+
+        #endregion
+    }
+
+    #region SelectedRange class
+
+    ///<summary>
+    /// SelectedRange
+    ///</summary>
+    public class SelectedRange
+    {
+        #region Private variables
+
+        private int _StartIndex;
+        private int _EndIndex;
+
+        #endregion
+
+        ///<summary>
+        ///</summary>
+        ///<param name="startIndex"></param>
+        ///<param name="endIndex"></param>
+        public SelectedRange(int startIndex, int endIndex)
+        {
+            _StartIndex = startIndex;
+            _EndIndex = endIndex;
+        }
+
+        #region Public properties
+
+        #region Count
+
+        ///<summary>
+        /// Count
+        ///</summary>
+        public int Count
+        {
+            get { return (_EndIndex - _StartIndex + 1); }
+        }
+
+        #endregion
+
+        #region EndIndex
+
+        ///<summary>
+        /// EndIndex
+        ///</summary>
+        public int EndIndex
+        {
+            get { return (_EndIndex); }
+            set { _EndIndex = value; }
+        }
+
+        #endregion
+
+        #region StartIndex
+
+        ///<summary>
+        /// StartIndex
+        ///</summary>
+        public int StartIndex
+        {
+            get { return (_StartIndex); }
+            set { _StartIndex = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Contains
+
+        ///<summary>
+        /// Contains
+        ///</summary>
+        ///<param name="index"></param>
+        ///<returns></returns>
+        public bool Contains(int index)
+        {
+            return (index >= _StartIndex && index <= _EndIndex);
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region enums
+
+    public enum SelectedElementType
+    {
+        /// <summary>
+        /// Unknown range type
+        /// </summary>
+        Unknown,
+
+        /// <summary>
+        /// Selected Cells
+        /// </summary>
+        SelectedCells,
+
+        /// <summary>
+        /// Selected Columns
+        /// </summary>
+        SelectedColumns,
+
+         /// <summary>
+        /// Selected Rows
+        /// </summary>
+        SelectedRows,
+
+       /// <summary>
+        /// Deleted Rows
+        /// </summary>
+        DeletedRows,
+    }
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/SortableBindingList.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/SortableBindingList.cs
new file mode 100644
index 00000000..a4cc0f11
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/SortableBindingList.cs	
@@ -0,0 +1,456 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Reflection;
+
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    ///<summary>
+    ///SortableBindingList
+    ///</summary>
+    ///<typeparam name="T"></typeparam>
+    public class SortableBindingList<T> : BindingList<T>
+    {
+        #region Private variables
+
+        private bool _IsSorted;
+
+        private ListSortDirection _ListSortDirection;
+        private PropertyDescriptor _PropertyDescriptor;
+
+        private readonly Dictionary<Type, PropertyComparer<T>> _Comparers;
+
+        #endregion
+
+        #region Constructors
+
+        ///<summary>
+        ///SortableBindingList
+        ///</summary>
+        public SortableBindingList()
+            : base(new List<T>())
+        {
+            _Comparers = new Dictionary<Type, PropertyComparer<T>>();
+        }
+
+        ///<summary>
+        ///SortableBindingList
+        ///</summary>
+        ///<param name="enumeration"></param>
+        public SortableBindingList(IEnumerable<T> enumeration)
+            : base(new List<T>(enumeration))
+        {
+            _Comparers = new Dictionary<Type, PropertyComparer<T>>();
+        }
+
+        #endregion
+
+        #region Protected properties
+
+        #region Comparers
+
+        /// <summary>
+        /// Comparers
+        /// </summary>
+        protected Dictionary<Type, PropertyComparer<T>> Comparers
+        {
+            get { return (_Comparers); }
+        }
+
+        #endregion
+
+        #region IsSorted
+
+        /// <summary>
+        /// IsSortedCore
+        /// </summary>
+        protected bool IsSorted
+        {
+            get { return (_IsSorted); }
+            set { _IsSorted = value; }
+        }
+
+        #endregion
+
+        #region IsSortedCore
+
+        /// <summary>
+        /// IsSortedCore
+        /// </summary>
+        protected override bool IsSortedCore
+        {
+            get { return (_IsSorted); }
+        }
+
+        #endregion
+
+        #region SortDirectionCore
+
+        /// <summary>
+        /// SortDirectionCore
+        /// </summary>
+        protected override ListSortDirection SortDirectionCore
+        {
+            get { return (_ListSortDirection); }
+        }
+
+        #endregion
+
+        #region SortPropertyCore
+
+        /// <summary>
+        /// SortPropertyCore
+        /// </summary>
+        protected override PropertyDescriptor SortPropertyCore
+        {
+            get { return (_PropertyDescriptor); }
+        }
+
+        #endregion
+
+        #region SupportsSearchingCore
+
+        /// <summary>
+        /// SupportsSearchingCore
+        /// </summary>
+        protected override bool SupportsSearchingCore
+        {
+            get { return (true); }
+        }
+
+        #endregion
+
+        #region SupportsSortingCore
+
+        /// <summary>
+        /// SupportsSortingCore
+        /// </summary>
+        protected override bool SupportsSortingCore
+        {
+            get { return (true); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ApplySortCore
+
+        /// <summary>
+        /// ApplySortCore
+        /// </summary>
+        /// <param name="property"></param>
+        /// <param name="direction"></param>
+        protected override void ApplySortCore(
+            PropertyDescriptor property, ListSortDirection direction)
+        {
+            List<T> itemsList = (List<T>) Items;
+
+            Type propertyType = property.PropertyType;
+
+            PropertyComparer<T> comparer;
+            if (_Comparers.TryGetValue(propertyType, out comparer) == false)
+            {
+                comparer = new PropertyComparer<T>(property, direction);
+                _Comparers.Add(propertyType, comparer);
+            }
+
+            comparer.SetPropertyAndDirection(property, direction);
+
+            itemsList.Sort(comparer);
+
+            _PropertyDescriptor = property;
+            _ListSortDirection = direction;
+            _IsSorted = true;
+
+            OnListChanged(new ListChangedEventArgs(ListChangedType.Reset, -1));
+        }
+
+        #endregion
+
+        #region RemoveSortCore
+
+        /// <summary>
+        /// RemoveSortCore
+        /// </summary>
+        protected override void RemoveSortCore()
+        {
+            _IsSorted = false;
+            _PropertyDescriptor = base.SortPropertyCore;
+            _ListSortDirection = base.SortDirectionCore;
+
+            OnListChanged(new ListChangedEventArgs(ListChangedType.Reset, -1));
+        }
+
+        #endregion
+
+        #region FindCore
+
+        /// <summary>
+        /// FindCore
+        /// </summary>
+        /// <param name="property"></param>
+        /// <param name="key"></param>
+        /// <returns></returns>
+        protected override int FindCore(PropertyDescriptor property, object key)
+        {
+            int count = Count;
+
+            for (int i = 0; i < count; ++i)
+            {
+                object o = property.GetValue(this[i]);
+
+                if (o != null && o.Equals(key))
+                    return (i);
+            }
+
+            return (-1);
+        }
+
+        #endregion
+
+        #region PropertyComparer
+
+        ///<summary>
+        ///PropertyComparer
+        ///</summary>
+        ///<typeparam name="T"></typeparam>
+        public class PropertyComparer<T> : IComparer<T>
+        {
+            #region Private variables
+
+            private ListSortDirection _SortDirection;
+            private PropertyDescriptor _PropertyDescriptor;
+            private IComparer _Comparer;
+
+            #endregion
+
+            ///<summary>
+            ///PropertyComparer
+            ///</summary>
+            ///<param name="property"></param>
+            ///<param name="direction"></param>
+            public PropertyComparer(PropertyDescriptor property, ListSortDirection direction)
+            {
+                _PropertyDescriptor = property;
+                _SortDirection = direction;
+
+                Type comparerForPropertyType = typeof(Comparer<>).MakeGenericType(property.PropertyType);
+
+                _Comparer = (IComparer)comparerForPropertyType.InvokeMember(
+                    "Default", BindingFlags.Static | BindingFlags.GetProperty | BindingFlags.Public, null, null, null);
+            }
+
+            #region IComparer<T> Members
+
+            /// <summary>
+            /// Compare
+            /// </summary>
+            /// <param name="x"></param>
+            /// <param name="y"></param>
+            /// <returns></returns>
+            public int Compare(T x, T y)
+            {
+                int result = _Comparer.Compare(_PropertyDescriptor.GetValue(x),
+                                               _PropertyDescriptor.GetValue(y));
+
+                if (_SortDirection == ListSortDirection.Descending)
+                    return (result * -1);
+
+                return (result);
+            }
+
+            #endregion
+
+            #region SetPropertyAndDirection
+
+            ///<summary>
+            ///SetPropertyAndDirection
+            ///</summary>
+            ///<param name="descriptor"></param>
+            ///<param name="direction"></param>
+            public void SetPropertyAndDirection(
+                PropertyDescriptor descriptor, ListSortDirection direction)
+            {
+                _PropertyDescriptor = descriptor;
+                _SortDirection = direction;
+            }
+
+            #endregion
+        }
+
+        #endregion
+    }
+
+    ///<summary>
+    ///MultipleSortableBindingList
+    ///</summary>
+    ///<typeparam name="T"></typeparam>
+    public class MultipleSortableBindingList<T> : SortableBindingList<T>, IBindingListView
+    {
+        #region Private variables
+
+        private ListSortDescriptionCollection _SortDescriptions;
+        private List<PropertyComparer<T>> _SortComparers;
+
+        const string FilteringNotSupported = "IBindingListView-implementation of filtering is not supported.";
+
+        #endregion
+
+        #region Constructors
+
+        ///<summary>
+        ///MultipleSortableBindingList
+        ///</summary>
+        public MultipleSortableBindingList()
+            : base(new List<T>())
+        {
+        }
+
+        ///<summary>
+        ///MultipleSortableBindingList
+        ///</summary>
+        ///<param name="enumeration"></param>
+        public MultipleSortableBindingList(IEnumerable<T> enumeration)
+            : base(new List<T>(enumeration))
+        {
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region Filter
+
+        /// <summary>
+        /// IsSortedCore
+        /// </summary>
+        public string Filter
+        {
+            get { throw new NotSupportedException(FilteringNotSupported); }
+            set { throw new NotSupportedException(FilteringNotSupported); }
+        }
+
+        #endregion
+
+        #region SortDescriptions
+
+        /// <summary>
+        /// SortDescriptions
+        /// </summary>
+        public ListSortDescriptionCollection SortDescriptions
+        {
+            get { return (_SortDescriptions); }
+        }
+
+        #endregion
+
+        #region SupportsAdvancedSorting
+
+        /// <summary>
+        /// SupportsAdvancedSorting
+        /// </summary>
+        public bool SupportsAdvancedSorting
+        {
+            get { return (true); }
+        }
+
+        #endregion
+
+        #region SupportsFiltering
+
+        /// <summary>
+        /// SupportsFiltering
+        /// </summary>
+        public bool SupportsFiltering
+        {
+            get { return (false); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ApplySort
+
+        /// <summary>
+        /// Sorts the list based on the given System.ComponentModel.ListSortDescriptionCollection.
+        /// </summary>
+        /// <param name="sorts">The System.ComponentModel.ListSortDescriptionCollection to sort by.</param>
+        public void ApplySort(ListSortDescriptionCollection sorts)
+        {
+            List<T> items = Items as List<T>;
+
+            if (items != null)
+            {
+                _SortDescriptions = sorts;
+                _SortComparers = new List<PropertyComparer<T>>();
+
+                foreach (ListSortDescription sort in sorts)
+                {
+                    if (sort != null)
+                    {
+                        Type propertyType = sort.PropertyDescriptor.PropertyType;
+                        PropertyComparer<T> comparer;
+
+                        if (Comparers.TryGetValue(propertyType, out comparer) == false)
+                        {
+                            comparer = new PropertyComparer<T>(sort.PropertyDescriptor, sort.SortDirection);
+                            Comparers.Add(propertyType, comparer);
+                        }
+
+                        _SortComparers.Add(comparer);
+                    }
+                }
+
+                items.Sort(CompareValuesByProperties);
+
+                IsSorted = true;
+            }
+            else
+            {
+                IsSorted = false;
+            }
+        }
+
+        #region CompareValuesByProperties
+
+        private int CompareValuesByProperties(T x, T y)
+        {
+            if (x == null)
+                return ((y == null) ? 0 : -1);
+
+            if (y == null)
+                return (1);
+
+            for (int i = 0; i < _SortComparers.Count; i++)
+            {
+                PropertyComparer<T> comparer = _SortComparers[i];
+                ListSortDescription sort = _SortDescriptions[i];
+
+                comparer.SetPropertyAndDirection(sort.PropertyDescriptor, sort.SortDirection);
+
+                int retval = comparer.Compare(x, y);
+
+                if (retval != 0)
+                    return (retval);
+            }
+
+            return (0);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RemoveFilter
+
+        public void RemoveFilter()
+        {
+            throw new NotSupportedException(FilteringNotSupported);
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/Style/BackColorBlend.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/Style/BackColorBlend.cs
new file mode 100644
index 00000000..44144db4
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/Style/BackColorBlend.cs	
@@ -0,0 +1,201 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Globalization;
+
+namespace DevComponents.DotNetBar.SuperGrid.Style
+{
+    ///<summary>
+    /// BackColorBlend
+    ///</summary>
+    [TypeConverter(typeof(BackColorBlendConvertor))]
+    public class BackColorBlend : INotifyPropertyChanged
+    {
+        #region Private variables
+
+        private Color[] _Colors;        // Color values
+        private float[] _Positions;     // Gradient color positions
+
+        #endregion
+
+        #region Public properties
+
+        #region Colors
+
+        /// <summary>
+        /// Gets or sets the ColorBlend Color array
+        /// </summary>
+        [Browsable(true), DefaultValue(null)]
+        [Description("Indicates the ColorBlend Color array")]
+        [TypeConverter(typeof(ArrayConverter))]
+        public Color[] Colors
+        {
+            get { return (_Colors); }
+
+            set
+            {
+                if (value != null && value.Length == 0)
+                    value = null;
+
+                _Colors = value;
+
+                OnPropertyChangedEx("Colors");
+            }
+        }
+
+        #endregion
+
+        #region Positions
+
+        /// <summary>
+        /// Gets or sets the ColorBlend Color Positions
+        /// </summary>
+        [Browsable(true), DefaultValue(null)]
+        [Description("Indicates the ColorBlend Color Positions")]
+        [TypeConverter(typeof(ArrayConverter))]
+        public float[] Positions
+        {
+            get { return (_Positions); }
+
+            set
+            {
+                if (value != null && value.Length == 0)
+                    value = null;
+                
+                _Positions = value;
+
+                OnPropertyChangedEx("Positions");
+            }
+        }
+
+        #endregion
+
+        #region IsEmpty
+
+        /// <summary>
+        /// IsEmpty
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsEmpty
+        {
+            get { return (_Colors == null || _Colors.Length == 1 && _Colors[0].IsEmpty); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Copy
+
+        /// <summary>
+        /// Creates an exact copy of the BackColorBlend.
+        /// </summary>
+        /// <returns>Copy of the BackColorBlend.</returns>
+        public BackColorBlend Copy()
+        {
+            BackColorBlend copy = new BackColorBlend();
+
+            if (_Colors != null)
+            {
+                copy.Colors = new Color[_Colors.Length];
+
+                _Colors.CopyTo(copy.Colors, 0);
+            }
+
+            if (_Positions != null)
+            {
+                copy.Positions = new float[_Positions.Length];
+
+                _Positions.CopyTo(copy.Positions, 0);
+            }
+
+            return (copy);
+        }
+
+        #endregion
+
+        #region INotifyPropertyChanged Members
+
+        /// <summary>
+        /// Occurs when property value has changed.
+        /// </summary>
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        /// <summary>
+        /// Raises the PropertyChanged event.
+        /// </summary>
+        /// <param name="e">Event arguments</param>
+        protected virtual void OnPropertyChanged(PropertyChangedEventArgs e)
+        {
+            PropertyChangedEventHandler eh = PropertyChanged;
+
+            if (eh != null)
+                eh(this, e);
+        }
+
+        /// <summary>
+        /// Raises the PropertyChanged event.
+        /// </summary>
+        /// <param name="s">Event arguments</param>
+        protected virtual void OnPropertyChangedEx(string s)
+        {
+            PropertyChangedEventHandler eh = PropertyChanged;
+
+            if (eh != null)
+            {
+                VisualPropertyChangedEventArgs e =
+                    new VisualPropertyChangedEventArgs(s);
+
+                eh(this, e);
+            }
+        }
+
+        #endregion
+    }
+
+    #region BackColorBlendConvertor
+
+        /// <summary>
+        /// BackColorBlendConvertor
+        /// </summary>
+        public class BackColorBlendConvertor : ExpandableObjectConverter
+        {
+            /// <summary>
+            /// ConvertTo
+            /// </summary>
+            /// <param name="context"></param>
+            /// <param name="culture"></param>
+            /// <param name="value"></param>
+            /// <param name="destinationType"></param>
+            /// <returns></returns>
+            public override object ConvertTo(
+                ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+            {
+                if (destinationType == typeof(string))
+                {
+                    BackColorBlend cb = value as BackColorBlend;
+
+                    if (cb != null)
+                    {
+                        ColorConverter cvt = new ColorConverter();
+
+                        if (cb.Colors != null)
+                        {
+                            if (cb.Colors[0] != Color.Empty)
+                                return (cvt.ConvertToString(cb.Colors[0]));
+
+                            if (cb.Colors.Length > 1 && cb.Colors[1] != Color.Empty)
+                                return (cvt.ConvertToString(cb.Colors[1]));
+                        }
+                    }
+
+                    return (String.Empty);
+                }
+
+                return (base.ConvertTo(context, culture, value, destinationType));
+            }
+        }
+
+        #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/Style/Background.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/Style/Background.cs
new file mode 100644
index 00000000..0f7cd1f6
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/Style/Background.cs	
@@ -0,0 +1,766 @@
+using System;
+using System.Drawing;
+using System.ComponentModel;
+using System.Drawing.Design;
+using System.Drawing.Drawing2D;
+using System.Globalization;
+using DevComponents.Instrumentation.Primitives;
+
+namespace DevComponents.DotNetBar.SuperGrid.Style
+{
+    /// <summary>
+    /// Represents background of visual style.
+    /// </summary>
+    [TypeConverter(typeof(BackgroundConvertor))]
+    [Editor(typeof(BackgroundEditor), typeof(UITypeEditor))]
+    public class Background : INotifyPropertyChanged, IDisposable
+    {
+        #region Static data
+
+        ///<summary>
+        /// Empty
+        ///</summary>
+        /// <summary>
+        /// Returns Empty instance of BorderPattern.
+        /// </summary>
+        public static Background Empty
+        {
+            get { return (new Background()); }
+        }
+
+        #endregion
+
+        #region Private variables
+
+        private Color _Color1 = Color.Empty;
+        private Color _Color2 = Color.Empty;
+
+        private int _GradientAngle = 90;
+
+        private BackFillType _BackFillType = BackFillType.Angle;
+        private BackColorBlend _BackColorBlend;
+
+        #endregion
+
+        #region Constructors
+
+        /// <summary>
+        /// Creates new instance of the object.
+        /// </summary>
+        public Background() { }
+
+        /// <summary>
+        /// Creates new instance of the object.
+        /// </summary>
+        /// <param name="color1">Start color.</param>
+        public Background(Color color1)
+        {
+            _Color1 = color1;
+        }
+
+        /// <summary>
+        /// Creates new instance of the object.
+        /// </summary>
+        /// <param name="color1">Start color.</param>
+        /// <param name="color2">End color.</param>
+        public Background(Color color1, Color color2)
+        {
+            _Color1 = color1;
+            _Color2 = color2;
+        }
+
+        /// <summary>
+        /// Creates new instance of the object.
+        /// </summary>
+        /// <param name="color1">Start color in hexadecimal representation like FFFFFF.</param>
+        /// <param name="color2">End color in hexadecimal representation like FFFFFF.</param>
+        public Background(string color1, string color2)
+        {
+            _Color1 = ColorFactory.GetColor(color1);
+            _Color2 = ColorFactory.GetColor(color2);
+        }
+
+        /// <summary>
+        /// Creates new instance of the object.
+        /// </summary>
+        /// <param name="color1">Start color in 32-bit RGB representation.</param>
+        /// <param name="color2">End color in 32-bit RGB representation.</param>
+        public Background(int color1, int color2)
+        {
+            _Color1 = ColorFactory.GetColor(color1);
+            _Color2 = ColorFactory.GetColor(color2);
+        }
+
+        /// <summary>
+        /// Creates new instance of the object.
+        /// </summary>
+        /// <param name="color1">Start color in 32-bit RGB representation.</param>
+        /// <param name="color2">End color in 32-bit RGB representation.</param>
+        /// <param name="gradientAngle">Gradient angle.</param>
+        public Background(int color1, int color2, int gradientAngle)
+        {
+            _Color1 = ColorFactory.GetColor(color1);
+            _Color2 = ColorFactory.GetColor(color2);
+
+            GradientAngle = gradientAngle;
+        }
+
+        /// <summary>
+        /// Creates new instance of the object.
+        /// </summary>
+        /// <param name="color1">Start color.</param>
+        /// <param name="color2">End color.</param>
+        /// <param name="gradientAngle">Gradient angle.</param>
+        public Background(Color color1, Color color2, int gradientAngle)
+        {
+            _Color1 = color1;
+            _Color2 = color2;
+
+            GradientAngle = gradientAngle;
+        }
+
+        /// <summary>
+        /// Creates new instance of the object.
+        /// </summary>
+        /// <param name="color1">Start color.</param>
+        /// <param name="color2">End color.</param>
+        /// <param name="fillType">Gradient angle.</param>
+        public Background(Color color1, Color color2, BackFillType fillType)
+        {
+            _Color1 = color1;
+            _Color2 = color2;
+
+            _BackFillType = fillType;
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region Color1
+
+        /// <summary>
+        /// Gets or sets the start color.
+        /// </summary>
+        [Description("Indicates the Starting Gradient Color.")]
+        public Color Color1
+        {
+            get { return (_Color1); }
+
+            set
+            {
+                if (_Color1 != value)
+                {
+                    _Color1 = value;
+
+                    OnPropertyChangedEx("Color1");
+                }
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        internal virtual bool ShouldSerializeColor1()
+        {
+            return (_Color1.IsEmpty == false);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        internal virtual void ResetColor1()
+        {
+            _Color1 = Color.Empty;
+        }
+
+        #endregion
+
+        #region Color2
+
+        /// <summary>
+        /// Gets or sets the Ending Gradient Color
+        /// </summary>
+        [Description("Indicates the Ending Gradient Color")]
+        public Color Color2
+        {
+            get { return (_Color2); }
+
+            set
+            {
+                if (_Color2 != value)
+                {
+                    _Color2 = value;
+
+                    OnPropertyChangedEx("Color2");
+                }
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        internal virtual bool ShouldSerializeColor2()
+        {
+            return (_Color2.IsEmpty == false);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        internal virtual void ResetColor2()
+        {
+            _Color2 = Color.Empty;
+        }
+
+        #endregion
+
+        #region BackColorBlend
+
+        /// <summary>
+        /// Gets or sets the BackColorBlend.
+        /// </summary>
+        [Description("Indicates the BackColorBlend.")]
+        public BackColorBlend BackColorBlend
+        {
+            get
+            {
+                if (_BackColorBlend == null)
+                {
+                    _BackColorBlend = new BackColorBlend();
+
+                    UpgateChangeHandler(null, _BackColorBlend);
+                }
+
+                return (_BackColorBlend);
+            }
+
+            set
+            {
+                if (_BackColorBlend != value)
+                {
+                    UpgateChangeHandler(_BackColorBlend, value);
+
+                    _BackColorBlend = value;
+
+                    OnPropertyChangedEx("BackColorBlend");
+                }
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        internal virtual bool ShouldSerializeBackColorBlend()
+        {
+            return (_BackColorBlend != null && _BackColorBlend.IsEmpty == false);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        internal virtual void ResetBackColorBlend()
+        {
+            BackColorBlend = null;
+        }
+
+        #endregion
+
+        #region GradientAngle
+
+        /// <summary>
+        /// Gets or sets the gradient angle (default is 90)
+        /// </summary>
+        [DefaultValue(90)]
+        [Description("Indicates the Gradient Angle default is 90)")]
+        public int GradientAngle
+        {
+            get { return (_GradientAngle); }
+
+            set
+            {
+                if (_GradientAngle != value)
+                {
+                    _GradientAngle = value;
+
+                    OnPropertyChangedEx("GradientAngle");
+                }
+            }
+        }
+
+        #endregion
+
+        #region BackFillType
+
+        /// <summary>
+        /// Gets or sets the Gradient BackFillType
+        /// </summary>
+        [DefaultValue(BackFillType.Angle)]
+        [Description("Indicates the Gradient BackFillType.")]
+        public BackFillType BackFillType
+        {
+            get { return (_BackFillType); }
+
+            set
+            {
+                if (_BackFillType != value)
+                {
+                    _BackFillType = value;
+
+                    OnPropertyChangedEx("BackFillType");
+                }
+            }
+        }
+
+        #endregion
+
+        #region IsEmpty
+
+        /// <summary>
+        /// Gets whether both colors assigned are empty.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsEmpty
+        {
+            get
+            {
+                return (_Color1.IsEmpty && _Color2.IsEmpty && 
+                    (_BackColorBlend == null || _BackColorBlend.IsEmpty));
+            }
+        }
+
+        #endregion
+
+        #region IsEqualTo
+
+        /// <summary>
+        /// Determines if the Background is equal to the given one
+        /// </summary>
+        /// <param name="background">Background to compare</param>
+        /// <returns>true if equal</returns>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsEqualTo(Background background)
+        {
+            return (_Color1 == background.Color1 &&
+                    _Color2 == background.Color2 &&
+                    _BackColorBlend.Equals(background._BackColorBlend) &&
+                    _GradientAngle == background.GradientAngle &&
+                    _BackFillType == background.BackFillType);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetBrush
+
+        ///<summary>
+        /// GetBrush
+        ///</summary>
+        ///<param name="r"></param>
+        ///<returns></returns>
+        public Brush GetBrush(Rectangle r)
+        {
+            if (_BackColorBlend != null && _BackColorBlend.IsEmpty == false)
+            {
+                if (_BackColorBlend.Colors.Length == 1)
+                    return (new SolidBrush(_BackColorBlend.Colors[0]));
+
+                Brush br = GetLinearBrush(r);
+
+                if (br is LinearGradientBrush)
+                {
+                    ColorBlend cb = GetColorBlend();
+
+                    if (cb != null)
+                        ((LinearGradientBrush) br).InterpolationColors = cb;
+                }
+
+                return (br);
+            }
+
+            if (_Color2.IsEmpty == true)
+                return (new SolidBrush(_Color1));
+
+            return (GetLinearBrush(r));
+        }
+
+        #region GetLinearBrush
+
+        private Brush GetLinearBrush(Rectangle r)
+        {
+            LinearGradientBrush lbr = null;
+
+            if (r.Width > 0 && r.Height > 0)
+            {
+                switch (_BackFillType)
+                {
+                    case BackFillType.Angle:
+                        lbr = new LinearGradientBrush(r, _Color1, _Color2, _GradientAngle);
+                        break;
+
+                    case BackFillType.HorizontalCenter:
+                        r.Width /= 2;
+                        r.Width = Math.Max(1, r.Width);
+
+                        lbr = new LinearGradientBrush(r, _Color1, _Color2, 0f);
+                        break;
+
+                    case BackFillType.VerticalCenter:
+                        r.Height /= 2;
+                        r.Height = Math.Max(1, r.Height);
+
+                        lbr = new LinearGradientBrush(r, _Color1, _Color2, 90f);
+                        break;
+
+                    case BackFillType.ForwardDiagonal:
+                        lbr = new LinearGradientBrush(r, _Color1, _Color2, LinearGradientMode.ForwardDiagonal);
+                        break;
+
+                    case BackFillType.BackwardDiagonal:
+                        lbr = new LinearGradientBrush(r, _Color1, _Color2, LinearGradientMode.BackwardDiagonal);
+                        break;
+
+                    case BackFillType.ForwardDiagonalCenter:
+                        r.Width /= 2;
+                        r.Height /= 2;
+                        lbr = new LinearGradientBrush(r, _Color1, _Color2, LinearGradientMode.ForwardDiagonal);
+                        break;
+
+                    case BackFillType.BackwardDiagonalCenter:
+                        r.Width /= 2;
+                        r.Height /= 2;
+                        r.X += r.Width;
+
+                        lbr = new LinearGradientBrush(r, _Color1, _Color2, LinearGradientMode.BackwardDiagonal);
+                        break;
+
+                    case BackFillType.Center:
+                        using (GraphicsPath path = new GraphicsPath())
+                        {
+                            path.AddRectangle(r);
+
+                            PathGradientBrush pbr = new PathGradientBrush(path);
+
+                            pbr.CenterColor = _Color1;
+                            pbr.SurroundColors = new Color[] {_Color2};
+
+                            ColorBlend cb = GetColorBlend();
+
+                            if (cb != null)
+                                pbr.InterpolationColors = cb;
+
+                            return (pbr);
+                        }
+
+                    case BackFillType.Radial:
+                        int n = (int) Math.Sqrt(r.Width*r.Width + r.Height*r.Height) + 4;
+
+                        using (GraphicsPath path = new GraphicsPath())
+                        {
+                            path.AddEllipse(r.X - (n - r.Width)/2, r.Y - (n - r.Height)/2, n, n);
+
+                            PathGradientBrush pbr = new PathGradientBrush(path);
+
+                            pbr.CenterColor = _Color1;
+                            pbr.SurroundColors = new Color[] {_Color2};
+
+                            ColorBlend cb = GetColorBlend();
+
+                            if (cb != null)
+                                pbr.InterpolationColors = cb;
+
+                            return (pbr);
+                        }
+                }
+
+                if (lbr != null)
+                    lbr.WrapMode = WrapMode.TileFlipXY;
+            }
+
+            return (lbr);
+        }
+
+        #endregion
+
+        #region GetColorBlend
+
+        private ColorBlend GetColorBlend()
+        {
+            if (_BackColorBlend != null && 
+                _BackColorBlend.Colors != null && _BackColorBlend.Colors.Length > 0)
+            {
+                ColorBlend cb = new ColorBlend(_BackColorBlend.Colors.Length);
+
+                cb.Colors = _BackColorBlend.Colors;
+                cb.Positions = GetPositions();
+
+                return (cb);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetPositions
+
+        private float[] GetPositions()
+        {
+            float[] cp = _BackColorBlend.Positions;
+
+            if (cp == null || cp.Length != _BackColorBlend.Colors.Length)
+            {
+                cp = new float[_BackColorBlend.Colors.Length];
+
+                float f = 1f / _BackColorBlend.Colors.Length;
+
+                for (int i = 0; i < cp.Length; i++)
+                    cp[i] = i * f;
+
+                cp[_BackColorBlend.Colors.Length - 1] = 1;
+            }
+
+            return (cp);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Copy
+
+        /// <summary>
+        /// Creates an exact copy of the background.
+        /// </summary>
+        /// <returns>Copy of the background.</returns>
+        public Background Copy()
+        {
+            Background copy = new Background();
+
+            copy.Color1 = _Color1;
+            copy.Color2 = _Color2;
+
+            copy.GradientAngle = _GradientAngle;
+            copy.BackFillType = _BackFillType;
+
+            if (_BackColorBlend != null)
+                copy.BackColorBlend = _BackColorBlend.Copy();
+
+            return (copy);
+        }
+
+        #endregion
+
+        #region INotifyPropertyChanged Members
+
+        /// <summary>
+        /// Occurs when property value has changed.
+        /// </summary>
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        /// <summary>
+        /// Raises the PropertyChanged event.
+        /// </summary>
+        /// <param name="e">Event arguments</param>
+        protected virtual void OnPropertyChanged(VisualPropertyChangedEventArgs e)
+        {
+            PropertyChangedEventHandler eh = PropertyChanged;
+
+            if (eh != null)
+                eh(this, e);
+        }
+
+        /// <summary>
+        /// Raises the PropertyChanged event.
+        /// </summary>
+        /// <param name="s">Event arguments</param>
+        protected virtual void OnPropertyChangedEx(string s)
+        {
+            PropertyChangedEventHandler eh = PropertyChanged;
+
+            if (eh != null)
+            {
+                VisualPropertyChangedEventArgs e =
+                    new VisualPropertyChangedEventArgs(s);
+
+                eh(this, e);
+            }
+        }
+
+        #endregion
+
+        #region UpgateChangeHandler
+
+        private void UpgateChangeHandler(
+            INotifyPropertyChanged oldValue, INotifyPropertyChanged newValue)
+        {
+            if (oldValue != null)
+                oldValue.PropertyChanged -= StyleChanged;
+
+            if (newValue != null)
+                newValue.PropertyChanged += StyleChanged;
+        }
+
+        #endregion
+
+        #region StyleChanged
+
+        /// <summary>
+        /// StyleChanged
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected virtual void StyleChanged(
+            object sender, PropertyChangedEventArgs e)
+        {
+            OnPropertyChanged((VisualPropertyChangedEventArgs)e);
+        }
+
+        #endregion
+
+        #region IDisposable
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        public void Dispose()
+        {
+            BackColorBlend = null;
+        }
+ 
+        #endregion
+    }
+
+    #region enums
+
+    ///<summary>
+    /// BackFillType
+    ///</summary>
+    public enum BackFillType
+    {
+        ///<summary>
+        /// Angle
+        ///</summary>
+        Angle,
+
+        ///<summary>
+        /// Center
+        ///</summary>
+        Center,
+
+        ///<summary>
+        /// HorizontalCenter
+        ///</summary>
+        HorizontalCenter,
+
+        ///<summary>
+        /// VerticalCenter
+        ///</summary>
+        VerticalCenter,
+
+        ///<summary>
+        /// ForwardDiagonal
+        ///</summary>
+        ForwardDiagonal,
+
+        ///<summary>
+        /// BackwardDiagonal
+        ///</summary>
+        BackwardDiagonal,
+
+        ///<summary>
+        /// ForwardDiagonalCenter
+        ///</summary>
+        ForwardDiagonalCenter,
+
+        ///<summary>
+        /// BackwardDiagonalCenter
+        ///</summary>
+        BackwardDiagonalCenter,
+
+        ///<summary>
+        /// Radial
+        ///</summary>
+        Radial,
+    }
+
+    #endregion
+
+    #region BackgroundConvertor
+
+    ///<summary>
+    /// BackgroundConvertor
+    ///</summary>
+    public class BackgroundConvertor : ExpandableObjectConverter
+    {
+        /// <summary>
+        /// ConvertTo
+        /// </summary>
+        /// <param name="context"></param>
+        /// <param name="culture"></param>
+        /// <param name="value"></param>
+        /// <param name="destinationType"></param>
+        /// <returns></returns>
+        public override object ConvertTo(
+            ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+        {
+            if (destinationType == typeof(string))
+            {
+                Background gc = value as Background;
+
+                if (gc != null)
+                {
+                    if (gc.BackColorBlend != null && gc.BackColorBlend.IsEmpty == false)
+                        return ("Blended");
+
+                    ColorConverter cvt = new ColorConverter();
+
+                    string s = gc.Color1.IsEmpty ? "(Empty)" : cvt.ConvertToString(gc.Color1);
+
+                    if (gc.Color2 != Color.Empty)
+                        s += ", " + cvt.ConvertToString(gc.Color2);
+
+                    return (s);
+                }
+            }
+
+            return (base.ConvertTo(context, culture, value, destinationType));
+        }
+    }
+
+    #endregion
+
+    #region BackgroundEditor
+
+    ///<summary>
+    /// BackgroundEditor
+    ///</summary>
+    public class BackgroundEditor : UITypeEditor
+    {
+        #region GetPaintValueSupported
+
+        /// <summary>
+        /// GetPaintValueSupported
+        /// </summary>
+        /// <param name="context"></param>
+        /// <returns></returns>
+        public override bool GetPaintValueSupported(ITypeDescriptorContext context)
+        {
+            return (true);
+        }
+
+        #endregion
+
+        #region PaintValue
+
+        /// <summary>
+        /// PaintValue
+        /// </summary>
+        /// <param name="e"></param>
+        public override void PaintValue(PaintValueEventArgs e)
+        {
+            Background b = e.Value as Background;
+
+            if (b != null)
+            {
+                using (Brush br = b.GetBrush(e.Bounds))
+                    e.Graphics.FillRectangle(br, e.Bounds);
+            }
+        }
+
+        #endregion
+    }
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/Style/BaseRowHeaderVisualStyle.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/Style/BaseRowHeaderVisualStyle.cs
new file mode 100644
index 00000000..db01b4e0
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/Style/BaseRowHeaderVisualStyle.cs	
@@ -0,0 +1,414 @@
+using System.ComponentModel;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.SuperGrid.Style
+{
+    /// <summary>
+    /// Represents the visual style of a Row.
+    /// </summary>
+    [ToolboxItem(false), DesignTimeVisible(false)]
+    [TypeConverter(typeof(BlankExpandableObjectConverter))]
+    public class BaseRowHeaderVisualStyle : BaseVisualStyle
+    {
+        #region Static data
+
+        ///<summary>
+        /// Empty
+        ///</summary>
+        public static BaseRowHeaderVisualStyle Empty
+        {
+            get { return (new BaseRowHeaderVisualStyle()); }
+        }
+
+        #endregion
+
+        #region Private variables
+
+        private Background _Background;
+        private Color _BorderHighlightColor = Color.Empty;
+
+        private Font _Font;
+        private Color _TextColor = Color.Empty;
+        private Tbool _AllowWrap = Tbool.NotSet;
+        private Alignment _TextAlignment = Alignment.NotSet;
+
+        #endregion
+
+        #region Public properties
+
+        #region AllowWrap
+
+        /// <summary>
+        /// Gets or sets whether text wrapping is permitted
+        /// </summary>
+        [DefaultValue(Tbool.NotSet), Category("Appearance")]
+        [Description("Indicates whether text wrapping is permitted.")]
+        public Tbool AllowWrap
+        {
+            get { return (_AllowWrap); }
+
+            set
+            {
+                if (_AllowWrap != value)
+                {
+                    _AllowWrap = value;
+
+                    OnPropertyChangedEx("AllowWrap", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region Background
+
+        /// <summary>
+        /// Gets or sets the style background.
+        /// </summary>
+        [Description("Indicates whether the style background")]
+        public Background Background
+        {
+            get
+            {
+                if (_Background == null)
+                {
+                    _Background = Background.Empty;
+
+                    UpdateChangeHandler(null, _Background);
+                }
+
+                return (_Background);
+            }
+
+            set
+            {
+                if (_Background != value)
+                {
+                    UpdateChangeHandler(_Background, value);
+
+                    _Background = value;
+
+                    OnPropertyChangedEx("Background", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeBackground()
+        {
+            return (_Background != null && _Background.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetBackground()
+        {
+            Background = null;
+        }
+
+        #endregion
+
+        #region BorderHighlightColor
+
+        /// <summary>
+        /// Gets or sets the border Highlight color.
+        /// </summary>
+        [Description("Indicates whether the border Highlight color")]
+        public Color BorderHighlightColor
+        {
+            get { return (_BorderHighlightColor); }
+
+            set
+            {
+                if (_BorderHighlightColor != value)
+                {
+                    _BorderHighlightColor = value;
+
+                    OnPropertyChangedEx("BorderHighlightColor", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeBorderHighlightColor()
+        {
+            return (_BorderHighlightColor.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetBorderHighlightColor()
+        {
+            _BorderHighlightColor = Color.Empty;
+        }
+
+        #endregion
+
+        #region Font
+
+        /// <summary>
+        /// Gets or sets the style Font.
+        /// </summary>
+        [DefaultValue(null)]
+        [Description("Indicates the RowHeader Font")]
+        public Font Font
+        {
+            get { return (_Font); }
+
+            set
+            {
+                if (_Font != value)
+                {
+                    _Font = value;
+
+                    OnPropertyChangedEx("Font", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region IsEmpty
+
+        ///<summary>
+        /// IsEmpty
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override bool IsEmpty
+        {
+            get
+            {
+                return ((_Background == null || _Background.IsEmpty) &&
+                        _BorderHighlightColor == Color.Empty &&
+                        _Font == null && TextColor == Color.Empty && base.IsEmpty);
+            }
+        }
+
+        #endregion
+
+        #region TextAlignment
+
+        /// <summary>
+        /// Gets or sets the alignment of the header text
+        /// </summary>
+        [DefaultValue(Alignment.NotSet), Category("Appearance")]
+        [Description("Indicates the alignment of the header text.")]
+        public Alignment TextAlignment
+        {
+            get { return (_TextAlignment); }
+
+            set
+            {
+                if (_TextAlignment != value)
+                {
+                    _TextAlignment = value;
+
+                    OnPropertyChangedEx("TextAlignment", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region TextColor
+
+        /// <summary>
+        /// Gets or sets the Text color
+        /// </summary>
+        [Description("Indicates the Text color")]
+        public Color TextColor
+        {
+            get { return (_TextColor); }
+
+            set
+            {
+                if (_TextColor != value)
+                {
+                    _TextColor = value;
+
+                    OnPropertyChangedEx("TextColor", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeTextColor()
+        {
+            return (_TextColor.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetTextColor()
+        {
+            _TextColor = Color.Empty;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetTextFormatFlags
+
+        internal eTextFormat GetTextFormatFlags()
+        {
+            eTextFormat tf = eTextFormat.WordEllipsis |
+                eTextFormat.NoPadding | eTextFormat.NoPrefix;
+
+            if (AllowWrap == Tbool.True)
+                tf |= eTextFormat.WordBreak;
+
+            switch (TextAlignment)
+            {
+                case Alignment.TopCenter:
+                    tf |= eTextFormat.HorizontalCenter;
+                    break;
+
+                case Alignment.TopRight:
+                    tf |= eTextFormat.Right;
+                    break;
+
+                case Alignment.MiddleLeft:
+                    tf |= eTextFormat.VerticalCenter;
+                    break;
+
+                case Alignment.NotSet:
+                case Alignment.MiddleCenter:
+                    tf |= eTextFormat.HorizontalCenter;
+                    tf |= eTextFormat.VerticalCenter;
+                    break;
+
+                case Alignment.MiddleRight:
+                    tf |= eTextFormat.Right;
+                    tf |= eTextFormat.VerticalCenter;
+                    break;
+
+                case Alignment.BottomLeft:
+                    tf |= eTextFormat.Bottom;
+                    break;
+
+                case Alignment.BottomCenter:
+                    tf |= eTextFormat.Bottom;
+                    tf |= eTextFormat.HorizontalCenter;
+                    break;
+
+                case Alignment.BottomRight:
+                    tf |= eTextFormat.Bottom;
+                    tf |= eTextFormat.Right;
+                    break;
+            }
+
+            return (tf);
+        }
+
+        #endregion
+
+        #region ApplyStyle
+
+        /// <summary>
+        /// Applies the style to instance of this style.
+        /// </summary>
+        /// <param name="style">Style to apply.</param>
+        public void ApplyStyle(BaseRowHeaderVisualStyle style)
+        {
+            if (style != null)
+            {
+                base.ApplyStyle(style);
+
+                if (style.Font != null)
+                    _Font = style.Font;
+
+                if (style.TextColor.IsEmpty == false)
+                    _TextColor = style._TextColor;
+
+                if (style.Background != null && style.Background.IsEmpty == false)
+                    Background = style.Background.Copy();
+
+                if (style.BorderHighlightColor.IsEmpty == false)
+                    BorderHighlightColor = style.BorderHighlightColor;
+
+                if (style.AllowWrap != Tbool.NotSet)
+                    _AllowWrap = style.AllowWrap;
+
+                if (style.TextAlignment != Alignment.NotSet)
+                    _TextAlignment = style.TextAlignment;
+            }
+        }
+
+        #endregion
+
+        #region Copy
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public new BaseRowHeaderVisualStyle Copy()
+        {
+            BaseRowHeaderVisualStyle style = new BaseRowHeaderVisualStyle();
+
+            CopyTo(style);
+
+            return (style);
+        }
+
+        #endregion
+
+        #region CopyTo
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public void CopyTo(BaseRowHeaderVisualStyle copy)
+        {
+            base.CopyTo(copy);
+
+            if (_Font != null)
+                copy.Font = (Font)_Font.Clone();
+
+            if (_TextColor.IsEmpty == false)
+                copy.TextColor = _TextColor;
+
+            copy.BorderHighlightColor = BorderHighlightColor;
+
+            if (_Background != null)
+                copy.Background = _Background.Copy();
+
+            copy.TextAlignment = _TextAlignment;
+            copy.AllowWrap = _AllowWrap;
+        }
+
+        #endregion
+
+        #region IDisposable
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        public override void Dispose()
+        {
+            Background = null;
+
+            base.Dispose();
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/Style/BaseVisualStyle.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/Style/BaseVisualStyle.cs
new file mode 100644
index 00000000..6326b2c8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/Style/BaseVisualStyle.cs	
@@ -0,0 +1,451 @@
+using System;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar.SuperGrid.Style
+{
+    /// <summary>
+    /// Represents the base visual style.
+    /// </summary>
+    [ToolboxItem(false), DesignTimeVisible(false)]
+    public class BaseVisualStyle : INotifyPropertyChanged, IDisposable
+    {
+        #region Private variables
+
+        private string _Class = "";
+        private object _Tag;
+
+        #endregion
+
+        #region Public properties
+
+        #region Class
+
+        /// <summary>
+        /// Gets or sets the class style belongs to. 
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public string Class
+        {
+            get { return (_Class); }
+
+            set
+            {
+                if (_Class != value)
+                {
+                    _Class = value;
+
+                    OnPropertyChangedEx("Class", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region IsEmpty
+
+        /// <summary>
+        /// Gets whether the style is logically Empty.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        [Description("Gets whether the style is logically Empty.")]
+        public virtual bool IsEmpty
+        {
+            get { return (_Tag == null); }
+        }
+
+        #endregion
+
+        #region Tag
+
+        /// <summary>
+        /// Gets or sets the user defined reference Tag.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        [Description("User defined reference Tag.")]
+        public object Tag
+        {
+            get { return (_Tag); }
+            set { _Tag = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ApplyStyle
+
+        /// <summary>
+        /// Applies the style to instance of this style.
+        /// </summary>
+        /// <param name="style">Style to apply.</param>
+        public void ApplyStyle(BaseVisualStyle style)
+        {
+        }
+
+        #endregion
+
+        #region GetApplyStyleTypes
+
+        internal StyleType[] GetApplyStyleTypes(StyleType e)
+        {
+            StyleType[] css = null;
+
+            switch (e)
+            {
+                case StyleType.Default:
+                    css = new StyleType[] { StyleType.Default};
+                    break;
+
+                case StyleType.Empty:
+                case StyleType.MouseOver:
+                case StyleType.ReadOnly:
+                case StyleType.Selected:
+                case StyleType.NotSelectable:
+                    css = new StyleType[] { StyleType.Default, e };
+                    break;
+
+                case StyleType.SelectedMouseOver:
+                    css = new StyleType[] { StyleType.Default, StyleType.Selected, e };
+                    break;
+
+                case StyleType.ReadOnlyMouseOver:
+                    css = new StyleType[] { StyleType.Default, StyleType.ReadOnly, e };
+                    break;
+
+                case StyleType.ReadOnlySelected:
+                    css = new StyleType[] { StyleType.Default, StyleType.Selected, StyleType.ReadOnly, e };
+                    break;
+
+                case StyleType.ReadOnlySelectedMouseOver:
+                    css = new StyleType[] { StyleType.Default, StyleType.Selected, StyleType.ReadOnly, StyleType.ReadOnlySelected, e };
+                    break;
+            }
+
+            return (css);
+        }
+
+        #endregion
+
+        #region Copy
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public BaseVisualStyle Copy()
+        {
+            BaseVisualStyle style = new BaseVisualStyle();
+
+            CopyTo(style);
+
+            return (style);
+        }
+
+        #endregion
+
+        #region CopyTo
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public void CopyTo(BaseVisualStyle copy)
+        {
+            copy.Class = _Class;
+            copy.Tag = _Tag;
+        }
+
+        #endregion
+
+        #region INotifyPropertyChanged Members
+
+        /// <summary>
+        /// Occurs when property value has changed.
+        /// </summary>
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        /// <summary>
+        /// Raises the PropertyChanged event.
+        /// </summary>
+        /// <param name="e">Event arguments</param>
+        protected virtual void OnPropertyChanged(PropertyChangedEventArgs e)
+        {
+            PropertyChangedEventHandler eh = PropertyChanged;
+
+            if (eh != null)
+                eh(this, e);
+        }
+
+        /// <summary>
+        /// Default PropertyChanged processing
+        /// </summary>
+        /// <param name="s"></param>
+        protected void OnPropertyChanged(string s)
+        {
+            if (PropertyChanged != null)
+                OnPropertyChanged(new VisualPropertyChangedEventArgs(s));
+        }
+
+        /// <summary>
+        /// Default PropertyChanged processing
+        /// </summary>
+        /// <param name="s"></param>
+        /// <param name="changeType">invalidate</param>
+        protected void OnPropertyChangedEx(string s, VisualChangeType changeType)
+        {
+            if (PropertyChanged != null)
+                OnPropertyChanged(new VisualPropertyChangedEventArgs(s, changeType));
+        }
+
+        #endregion
+
+        #region UpdateChangeHandler
+
+        /// <summary>
+        /// UpdateChangeHandler
+        /// </summary>
+        /// <param name="oldValue"></param>
+        /// <param name="newValue"></param>
+        protected void UpdateChangeHandler(
+            INotifyPropertyChanged oldValue, INotifyPropertyChanged newValue)
+        {
+            if (oldValue != null)
+                oldValue.PropertyChanged -= ValuePropertyChanged;
+
+            if (newValue != null)
+                newValue.PropertyChanged += ValuePropertyChanged;
+        }
+
+        void ValuePropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            OnPropertyChanged(e);
+        }
+
+        #endregion
+
+        #region IDisposable
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        public virtual void Dispose()
+        {
+        }
+
+        #endregion
+    }
+
+    #region enums
+
+    #region Alignment
+
+    ///<summary>
+    /// Alignment of the content
+    ///</summary>
+    public enum Alignment
+    {
+        ///<summary>
+        ///</summary>
+        NotSet = -1,
+
+        ///<summary>
+        /// TopLeft
+        ///</summary>
+        TopLeft,
+
+        ///<summary>
+        /// TopCenter
+        ///</summary>
+        TopCenter,
+
+        ///<summary>
+        /// TopRight
+        ///</summary>
+        TopRight,
+
+        ///<summary>
+        /// MiddleLeft
+        ///</summary>
+        MiddleLeft,
+
+        ///<summary>
+        /// MiddleCenter
+        ///</summary>
+        MiddleCenter,
+
+        /// <summary>
+        /// MiddleRight
+        /// </summary>
+        MiddleRight,
+
+        /// <summary>
+        /// BottomLeft
+        /// </summary>
+        BottomLeft,
+
+        /// <summary>
+        /// BottomCenter
+        /// </summary>
+        BottomCenter,
+
+        /// <summary>
+        /// BottomRight
+        /// </summary>
+        BottomRight,
+    }
+
+    #endregion
+
+    #region BorderSide
+
+    internal enum BorderSide
+    {
+        Top,
+        Left,
+        Bottom,
+        Right
+    }
+
+    #endregion
+
+    #region CellHighlightMode
+
+    ///<summary>
+    /// Specifies the mode of cell highlighting
+    /// to employ when a grid cell is selected
+    ///</summary>
+    public enum CellHighlightMode
+    {
+        ///<summary>
+        /// No highlighting
+        ///</summary>
+        None,
+
+        ///<summary>
+        /// Entire cell will be Highlighted
+        ///</summary>
+        Full,
+
+        ///<summary>
+        /// Partial cell will be Highlighted
+        ///</summary>
+        Partial,
+
+        ///<summary>
+        /// Cell content only will be Highlighted
+        ///</summary>
+        Content,
+    }
+
+    #endregion
+
+    #region ImageHighlightMode
+
+    ///<summary>
+    /// ImageHighlightMode
+    ///</summary>
+    public enum ImageHighlightMode
+    {
+        ///<summary>
+        /// NotSet
+        ///</summary>
+        NotSet = -1,
+
+        ///<summary>
+        /// Default
+        ///</summary>
+        Default,
+
+        ///<summary>
+        /// Always
+        ///</summary>
+        Always,
+
+        ///<summary>
+        /// Never
+        ///</summary>
+        Never,
+    }
+
+    #endregion
+
+    #region ImageOverlay
+
+    ///<summary>
+    /// How to Overlay the Image with
+    /// respect to the content
+    ///</summary>
+    public enum ImageOverlay
+    {
+        ///<summary>
+        ///</summary>
+        NotSet = -1,
+
+        ///<summary>
+        /// None
+        ///</summary>
+        None,
+
+        ///<summary>
+        /// Top
+        ///</summary>
+        Top,
+
+        ///<summary>
+        /// Bottom
+        ///</summary>
+        Bottom,
+    }
+
+    #endregion
+
+    #region Tbool
+
+    ///<summary>
+    /// TBool - Three state boolean
+    ///</summary>
+    public enum Tbool
+    {
+        ///<summary>
+        /// NotSet
+        ///</summary>
+        NotSet,
+
+        ///<summary>
+        /// True
+        ///</summary>
+        True,
+
+        ///<summary>
+        /// False
+        ///</summary>
+        False
+    }
+
+    #endregion
+
+    #region VisualChangeType
+
+    /// <summary>
+    /// Defines visual property change type.
+    /// </summary>
+    public enum VisualChangeType
+    {
+        /// <summary>
+        /// Visual style has changed so layout is impacted
+        /// </summary>
+        Layout,
+
+        /// <summary>
+        /// Visual style has changed so visuals are impacted, but not layout
+        /// </summary>
+        Render
+    }
+
+    #endregion
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/Style/BorderColor.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/Style/BorderColor.cs
new file mode 100644
index 00000000..01a94aea
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/Style/BorderColor.cs	
@@ -0,0 +1,460 @@
+using System;
+using System.Drawing;
+using System.ComponentModel;
+using System.Globalization;
+
+namespace DevComponents.DotNetBar.SuperGrid.Style
+{
+    /// <summary>
+    /// Represents style border color.
+    /// </summary>
+    [TypeConverter(typeof(BorderColorConverter))]
+    public class BorderColor : INotifyPropertyChanged
+    {
+        #region Static data
+
+        ///<summary>
+        /// Empty
+        ///</summary>
+        /// <summary>
+        /// Returns Empty instance of BorderColor.
+        /// </summary>
+        public static BorderColor Empty
+        {
+            get { return (new BorderColor()); }
+        }
+
+        #endregion
+
+        #region Private variables
+
+        private Color _Top = Color.Empty;
+        private Color _Left = Color.Empty;
+        private Color _Bottom = Color.Empty;
+        private Color _Right = Color.Empty;
+
+        #endregion
+
+        #region Constructors
+
+        /// <summary>
+        /// Initializes a new instance of the BorderColor object.
+        /// </summary>
+        /// <param name="left"></param>
+        /// <param name="top"></param>
+        /// <param name="right"></param>
+        /// <param name="bottom"></param>
+        public BorderColor(Color left, Color top, Color right, Color bottom)
+        {
+            _Top = top;
+            _Bottom = bottom;
+            _Left = left;
+            _Right = right;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the BorderColor object.
+        /// </summary>
+        public BorderColor(Color all)
+            : this(all, all, all, all)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the BorderColor object.
+        /// </summary>
+        public BorderColor()
+        {
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region All
+
+        /// <summary>
+        /// Gets or sets the color of all borders.
+        /// </summary>
+        //[Browsable(false)]
+        //[EditorBrowsable(EditorBrowsableState.Never)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public Color All
+        {
+            set { _Top = _Left = _Bottom = _Right = value; }
+        }
+
+        #endregion
+
+        #region Bottom
+
+        /// <summary>
+        /// Gets or sets the color of the bottom border
+        /// </summary>
+        [Category("Appearance")]
+        [Description("Indicates the color of the bottom border")]
+        public Color Bottom
+        {
+            get { return (_Bottom); }
+
+            set
+            {
+                if (_Bottom != value)
+                {
+                    _Bottom = value;
+
+                    OnVisualPropertyChanged("Bottom");
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeBottom()
+        {
+            return (_Bottom.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetBottom()
+        {
+            _Bottom = Color.Empty;
+        }
+
+        #endregion
+
+        #region Left
+
+        /// <summary>
+        /// Gets or sets the color of the left border
+        /// </summary>
+        [Category("Appearance")]
+        [Description("Indicates the color of the left border")]
+        public Color Left
+        {
+            get { return (_Left); }
+
+            set
+            {
+                if (_Left != value)
+                {
+                    _Left = value;
+
+                    OnVisualPropertyChanged("Left");
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeLeft()
+        {
+            return (_Left.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetLeft()
+        {
+            _Left = Color.Empty;
+        }
+
+        #endregion
+
+        #region Right
+
+        /// <summary>
+        /// Gets or sets the color of the right border
+        /// </summary>
+        [Category("Appearance")]
+        [Description("Indicates the color of the right border")]
+        public Color Right
+        {
+            get { return (_Right); }
+
+            set
+            {
+                if (_Right != value)
+                {
+                    _Right = value;
+
+                    OnVisualPropertyChanged("Right");
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeRight()
+        {
+            return (_Right.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetRight()
+        {
+            _Right = Color.Empty;
+        }
+
+        #endregion
+
+        #region Top
+
+        /// <summary>
+        /// Gets or sets the color of the top border
+        /// </summary>
+        [Category("Appearance")]
+        [Description("Indicates the color of the top border")]
+        public Color Top
+        {
+            get { return (_Top); }
+
+            set
+            {
+                if (_Top != value)
+                {
+                    _Top = value;
+
+                    OnVisualPropertyChanged("Top");
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeTop()
+        {
+            return (_Top.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetTop()
+        {
+            _Top = Color.Empty;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region IsEmpty
+
+        internal bool IsEmpty
+        {
+            get
+            {
+                return (_Left.IsEmpty && _Top.IsEmpty &&
+                        _Right.IsEmpty && _Bottom.IsEmpty);
+            }
+        }
+
+        #endregion
+
+        #region IsUniform
+
+        internal bool IsUniform
+        {
+            get
+            {
+                return (_Left == _Top &&
+                        _Left == _Right && _Left == _Bottom);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Operators
+
+        #region '==' operator
+
+        /// <summary>
+        /// Compares two instances.
+        /// </summary>
+        /// <param name="t1">Instance 1</param>
+        /// <param name="t2">Instance 2</param>
+        /// <returns>true if same</returns>
+        public static bool operator ==(BorderColor t1, BorderColor t2)
+        {
+            // If both are null, or both are same instance, return true.
+
+            if (ReferenceEquals(t1, t2))
+                return (true);
+
+            // If one is null, but not both, return false.
+
+            if (((object)t1 == null) || ((object)t2 == null))
+                return (false);
+
+            return (t1._Left == t2._Left && t1._Right == t2._Right &&
+                    t1._Top == t2._Top && t1._Bottom == t2._Bottom);
+        }
+
+        #endregion
+
+        #region "!=" operator
+
+        /// <summary>
+        /// Compares two instances.
+        /// </summary>
+        /// <param name="t1">Instance 1</param>
+        /// <param name="t2">Instance 2</param>
+        /// <returns>true if different.</returns>
+        public static bool operator !=(BorderColor t1, BorderColor t2)
+        {
+            return ((t1 == t2) == false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetHashCode
+
+        /// <summary>
+        /// Returns hash-code for object.
+        /// </summary>
+        /// <returns>Hash-code value.</returns>
+        public override int GetHashCode()
+        {
+            return (((_Left.GetHashCode() ^ _Top.GetHashCode()) ^
+                     _Right.GetHashCode()) ^ _Bottom.GetHashCode());
+        }
+
+        #endregion
+
+        #region Equals
+
+        /// <summary>
+        /// Compares object to this instance.
+        /// </summary>
+        /// <param name="obj">Object to compare.</param>
+        /// <returns>true if same.</returns>
+        public override bool Equals(object obj)
+        {
+            if (obj is BorderColor)
+                return ((BorderColor) obj == this);
+
+            return (false);
+        }
+
+        /// <summary>
+        /// Compares object to this instance.
+        /// </summary>
+        /// <param name="borderColor">Border color</param>
+        /// <returns>true if same</returns>
+        public bool Equals(BorderColor borderColor)
+        {
+            return (this == borderColor);
+        }
+
+        #endregion
+
+        #region Copy
+
+        /// <summary>
+        /// Creates an exact copy of the BorderColor.
+        /// </summary>
+        /// <returns>Copy of the BorderColor.</returns>
+        public BorderColor Copy()
+        {
+            BorderColor copy = new BorderColor(_Left, _Top, _Right, _Bottom);
+
+            return (copy);
+        }
+
+        #endregion
+
+        #region INotifyPropertyChanged Members
+
+        /// <summary>
+        /// Occurs when property value has changed.
+        /// </summary>
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        /// <summary>
+        /// Raises the PropertyChanged event.
+        /// </summary>
+        /// <param name="e">Event arguments</param>
+        protected virtual void OnPropertyChanged(PropertyChangedEventArgs e)
+        {
+            PropertyChangedEventHandler eh = PropertyChanged;
+
+            if (eh != null)
+                eh(this, e);
+        }
+
+        /// <summary>
+        /// Default PropertyChanged processing
+        /// </summary>
+        /// <param name="s"></param>
+        protected void OnPropertyChanged(string s)
+        {
+            if (PropertyChanged != null)
+                OnPropertyChanged(new PropertyChangedEventArgs(s));
+        }
+
+
+        /// <summary>
+        /// Default PropertyChanged processing
+        /// </summary>
+        /// <param name="s"></param>
+        protected void OnVisualPropertyChanged(string s)
+        {
+            if (PropertyChanged != null)
+                OnPropertyChanged(new VisualPropertyChangedEventArgs(s));
+        }
+
+        #endregion
+    }
+
+    #region BorderColorConverter
+
+    /// <summary>
+    /// BorderColorConverter
+    /// </summary>
+    public class BorderColorConverter : ExpandableObjectConverter
+    {
+        /// <summary>
+        /// ConvertTo
+        /// </summary>
+        /// <param name="context"></param>
+        /// <param name="culture"></param>
+        /// <param name="value"></param>
+        /// <param name="destinationType"></param>
+        /// <returns></returns>
+        public override object ConvertTo(
+            ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+        {
+            if (destinationType == typeof(string))
+                return (String.Empty);
+
+            return (base.ConvertTo(context, culture, value, destinationType));
+        }
+    }
+
+    #endregion
+
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/Style/BorderPattern.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/Style/BorderPattern.cs
new file mode 100644
index 00000000..2185d553
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/Style/BorderPattern.cs	
@@ -0,0 +1,418 @@
+using System;
+using System.ComponentModel;
+using System.Drawing.Drawing2D;
+
+namespace DevComponents.DotNetBar.SuperGrid.Style
+{
+    /// <summary>
+    /// Defines Thickness class.
+    /// </summary>
+    [TypeConverter(typeof(BlankExpandableObjectConverter))]
+    public class BorderPattern : IEquatable<BorderPattern>, INotifyPropertyChanged
+    {
+        #region Static data
+
+        /// <summary>
+        /// Returns Empty instance of BorderPattern.
+        /// </summary>
+        public static BorderPattern Empty
+        {
+            get { return (new BorderPattern()); }
+        }
+
+        #endregion
+
+        #region Private variables
+
+        private LinePattern _Bottom = LinePattern.NotSet;
+        private LinePattern _Left = LinePattern.NotSet;
+        private LinePattern _Right = LinePattern.NotSet;
+        private LinePattern _Top = LinePattern.NotSet;
+
+        #endregion
+
+        #region Constructors
+
+        /// <summary>
+        /// Creates new instance of the object.
+        /// </summary>
+        /// <param name="left">Left BorderPatternStyle.</param>
+        /// <param name="top">Top BorderPatternStyle.</param>
+        /// <param name="right">Right BorderPatternStyle.</param>
+        /// <param name="bottom">Bottom BorderPatternStyle.</param>
+        public BorderPattern(LinePattern left,
+            LinePattern top, LinePattern right, LinePattern bottom)
+        {
+            _Left = left;
+            _Top = top;
+            _Right = right;
+            _Bottom = bottom;
+
+            PropertyChanged = null;
+        }
+
+        /// <summary>
+        /// Creates new instance of the object.
+        /// </summary>
+        /// <param name="all">Specifies uniform Thickness.</param>
+        public BorderPattern(LinePattern all)
+            : this(all, all, all, all)
+        {
+        }
+
+        ///<summary>
+        /// Creates new instance of the object.
+        ///</summary>
+        public BorderPattern()
+        {
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region All
+
+        /// <summary>
+        /// Gets or sets the thickness of all sides.
+        /// </summary>
+        //[Browsable(false)]
+        //[EditorBrowsable(EditorBrowsableState.Never)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public LinePattern All
+        {
+            set { _Top = _Left = _Bottom = _Right = value; }
+        }
+
+        #endregion
+
+        #region Bottom
+
+        /// <summary>
+        /// Gets or sets the bottom Border Pattern
+        /// </summary>
+        [DefaultValue(LinePattern.NotSet)]
+        [Description("Indicates the bottom Border Pattern")]
+        public LinePattern Bottom
+        {
+            get { return (_Bottom); }
+
+            set
+            {
+                if (_Bottom != value)
+                {
+                    _Bottom = value;
+
+                    OnPropertyChanged(new VisualPropertyChangedEventArgs("Bottom"));
+                }
+            }
+        }
+
+        #endregion
+
+        #region Left
+
+        /// <summary>
+        /// Gets or sets the left Border Pattern
+        /// </summary>
+        [DefaultValue(LinePattern.NotSet)]
+        [Description("Indicates the left Border Pattern")]
+        public LinePattern Left
+        {
+            get { return (_Left); }
+
+            set
+            {
+                if (_Left != value)
+                {
+                    _Left = value;
+
+                    OnPropertyChanged(new VisualPropertyChangedEventArgs("Left"));
+                }
+            }
+        }
+
+        #endregion
+
+        #region Right
+
+        /// <summary>
+        /// Gets or sets the Right Border Pattern
+        /// </summary>
+        [DefaultValue(LinePattern.NotSet)]
+        [Description("Indicates the Right Border Pattern")]
+        public LinePattern Right
+        {
+            get { return (_Right); }
+
+            set
+            {
+                if (_Right != value)
+                {
+                    _Right = value;
+
+                    OnPropertyChanged(new VisualPropertyChangedEventArgs("Right"));
+                }
+            }
+        }
+
+        #endregion
+
+        #region Top
+
+        /// <summary>
+        /// Gets or sets the Top Border Pattern
+        /// </summary>
+        [Browsable(true), DefaultValue(LinePattern.NotSet)]
+        [Description("Indicates the Top Border Pattern")]
+        public LinePattern Top
+        {
+            get { return (_Top); }
+
+            set
+            {
+                if (_Top != value)
+                {
+                    _Top = value;
+
+                    OnPropertyChanged(new VisualPropertyChangedEventArgs("Top"));
+                }
+            }
+        }
+
+        #endregion
+
+        #region IsEmpty
+
+        /// <summary>
+        /// Gets whether the item is empty
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsEmpty
+        {
+            get
+            {
+                return (_Left == LinePattern.NotSet &&
+                        _Right == LinePattern.NotSet &&
+                        _Top == LinePattern.NotSet &&
+                        _Bottom == LinePattern.NotSet);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region IsUniform
+
+        internal bool IsUniform
+        {
+            get
+            {
+                return (_Left == _Top &&
+                        _Left == _Right && _Left == _Bottom);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Equals
+
+        /// <summary>
+        /// Gets whether two instances are equal.
+        /// </summary>
+        /// <param name="obj">Instance to compare to.</param>
+        /// <returns>true if equal otherwise false.</returns>
+        public override bool Equals(object obj)
+        {
+            if (obj is BorderPattern)
+                return (this == (BorderPattern)obj);
+
+            return (false);
+        }
+
+        /// <summary>
+        /// Gets whether two instances are equal.
+        /// </summary>
+        /// <param name="borderPattern">Instance to compare to</param>
+        /// <returns>true if equal otherwise false</returns>
+        public bool Equals(BorderPattern borderPattern)
+        {
+            return (this == borderPattern);
+        }
+
+        #endregion
+
+        #region GetHashCode
+
+        /// <summary>
+        /// Returns hash-code.
+        /// </summary>
+        /// <returns>hash-code</returns>
+        public override int GetHashCode()
+        {
+            return (((_Left.GetHashCode() ^ _Top.GetHashCode()) ^
+                     _Right.GetHashCode()) ^ _Bottom.GetHashCode());
+        }
+
+        #endregion
+
+        #region Operators
+
+        #region "==" operator
+
+        /// <summary>
+        /// Implements == operator.
+        /// </summary>
+        /// <param name="t1">Object 1</param>
+        /// <param name="t2">Object 2</param>
+        /// <returns>true if equals</returns>
+        public static bool operator ==(BorderPattern t1, BorderPattern t2)
+        {
+            if (ReferenceEquals(t1, t2))
+                return (true);
+
+            if (((object)t1 == null) || ((object)t2 == null))
+                return (false);
+
+            return (t1._Left == t2._Left && t1._Right == t2._Right &&
+                    t1._Top == t2._Top && t1._Bottom == t2._Bottom);
+        }
+
+        #endregion
+
+        #region "!=" operator
+
+        /// <summary>
+        /// Implements != operator
+        /// </summary>
+        /// <param name="t1">Object 1</param>
+        /// <param name="t2">Object 2</param>
+        /// <returns>true if different</returns>
+        public static bool operator !=(BorderPattern t1, BorderPattern t2)
+        {
+            return ((t1 == t2) == false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ApplyPattern
+
+        /// <summary>
+        /// Applies the pattern to instance of this pattern.
+        /// </summary>
+        /// <param name="pattern">Pattern to apply.</param>
+        public void ApplyPattern(BorderPattern pattern)
+        {
+            if (pattern != null)
+            {
+                if (pattern.Top != LinePattern.NotSet)
+                    _Top = pattern.Top;
+
+                if (pattern.Left != LinePattern.NotSet)
+                    _Left = pattern.Left;
+
+                if (pattern.Bottom != LinePattern.NotSet)
+                    _Bottom = pattern.Bottom;
+
+                if (pattern.Right != LinePattern.NotSet)
+                    _Right = pattern.Right;
+            }
+        }
+
+        #endregion
+
+        #region Copy
+
+        /// <summary>
+        /// Creates an exact copy of the BorderPattern.
+        /// </summary>
+        /// <returns>Copy of the BorderPattern.</returns>
+        public BorderPattern Copy()
+        {
+            BorderPattern copy = new BorderPattern(_Left, _Top, _Right, _Bottom);
+
+            return (copy);
+        }
+
+        #endregion
+
+        #region INotifyPropertyChanged Members
+
+        /// <summary>
+        /// Occurs when property value has changed.
+        /// </summary>
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        /// <summary>
+        /// Raises the PropertyChanged event.
+        /// </summary>
+        /// <param name="e">Event arguments</param>
+        void OnPropertyChanged(VisualPropertyChangedEventArgs e)
+        {
+            PropertyChangedEventHandler eh = PropertyChanged;
+
+            if (eh != null)
+                eh(this, e);
+        }
+
+        #endregion
+    }
+
+    #region enums
+
+    #region LinePattern
+
+    ///<summary>
+    /// LinePattern
+    ///</summary>
+    public enum LinePattern
+    {
+        ///<summary>
+        /// None
+        ///</summary>
+        None = -2,
+
+        ///<summary>
+        /// NotSet
+        ///</summary>
+        NotSet = -1,
+
+        ///<summary>
+        /// Solid
+        ///</summary>
+        Solid = DashStyle.Solid,
+
+        ///<summary>
+        /// Dash
+        ///</summary>
+        Dash = DashStyle.Dash,
+
+        ///<summary>
+        /// Dot
+        ///</summary>
+        Dot = DashStyle.Dot,
+
+        ///<summary>
+        /// DashDot
+        ///</summary>
+        DashDot = DashStyle.DashDot,
+
+        ///<summary>
+        /// DashDotDot
+        ///</summary>
+        DashDotDot = DashStyle.DashDotDot,
+    }
+
+    #endregion
+
+    #endregion
+
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/Style/CellVisualStyle.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/Style/CellVisualStyle.cs
new file mode 100644
index 00000000..3e0c0ac4
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/Style/CellVisualStyle.cs	
@@ -0,0 +1,898 @@
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.SuperGrid.Primitives;
+
+namespace DevComponents.DotNetBar.SuperGrid.Style
+{
+    ///<summary>
+    /// CellVisualStyles
+    ///</summary>
+    [TypeConverter(typeof(VisualStylesConverter))]
+    public class CellVisualStyles : VisualStyles<CellVisualStyle>
+    {
+    }
+
+    /// <summary>
+    /// Represents the visual style of an element.
+    /// </summary>
+    [TypeConverter(typeof(VisualStylesConverter))]
+    public class CellVisualStyle : VisualStyle
+    {
+        #region Private variables
+
+        private Tbool _AllowWrap = Tbool.NotSet;
+        private Tbool _AllowMultiLine = Tbool.NotSet;
+        private Alignment _Alignment = Alignment.NotSet;
+
+        private Image _Image;
+        private int _ImageIndex = -1;
+        private Padding _ImagePadding;
+        private Alignment _ImageAlignment = Alignment.NotSet;
+        private ImageHighlightMode _ImageHighlightMode = ImageHighlightMode.NotSet;
+        private ImageOverlay _ImageOverlay = ImageOverlay.NotSet;
+
+        private SymbolDef _SymbolDef;
+
+        #endregion
+
+        #region Public properties
+
+        #region Alignment
+
+        /// <summary>
+        /// Gets or sets the alignment of the content within the cell
+        /// </summary>
+        [DefaultValue(Alignment.NotSet), Category("Appearance")]
+        [Description("Indicates the alignment of the content within the cell.")]
+        public Alignment Alignment
+        {
+            get { return (_Alignment); }
+
+            set
+            {
+                if (_Alignment != value)
+                {
+                    _Alignment = value;
+
+                    OnPropertyChangedEx("Alignment", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region AllowMultiLine
+
+        /// <summary>
+        /// Gets or sets whether multiple text lines (via "\r\n" inclusion)
+        /// are displayed when text wrapping (AllowWrap) is disabled.
+        /// </summary>
+        [DefaultValue(Tbool.NotSet), Category("Appearance")]
+        [Description("Indicates whether multiple text lines (via '\r\n' inclusion) are displayed when text wrapping (AllowWrap) is disabled.")]
+        public Tbool AllowMultiLine
+        {
+            get { return (_AllowMultiLine); }
+
+            set
+            {
+                if (_AllowMultiLine != value)
+                {
+                    _AllowMultiLine = value;
+
+                    OnPropertyChangedEx("AllowMultiLine", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region AllowWrap
+
+        /// <summary>
+        /// Gets or sets whether text wrapping is permitted
+        /// </summary>
+        [DefaultValue(Tbool.NotSet), Category("Appearance")]
+        [Description("Indicates whether text wrapping is permitted.")]
+        public Tbool AllowWrap
+        {
+            get { return (_AllowWrap); }
+
+            set
+            {
+                if (_AllowWrap != value)
+                {
+                    _AllowWrap = value;
+
+                    OnPropertyChangedEx("AllowWrap", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region Image
+
+        /// <summary>
+        /// Gets or sets the element Image
+        /// </summary>
+        [DefaultValue(null), Category("Appearance")]
+        [Description("Indicates the element image")]
+        public Image Image
+        {
+            get { return (_Image); }
+
+            set
+            {
+                if (_Image != value)
+                {
+                    _Image = value;
+
+                    OnPropertyChangedEx("Image", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ImageAlignment
+
+        /// <summary>
+        /// Gets or sets the alignment of the Image within the cell
+        /// </summary>
+        [DefaultValue(Alignment.NotSet), Category("Appearance")]
+        [Description("Indicates the alignment of the Image within the cell.")]
+        public Alignment ImageAlignment
+        {
+            get { return (_ImageAlignment); }
+
+            set
+            {
+                if (_ImageAlignment != value)
+                {
+                    _ImageAlignment = value;
+
+                    OnPropertyChangedEx("ImageAlignment", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ImageHighlightMode
+
+        /// <summary>
+        /// Gets or sets how cell images are
+        /// highlighted when the cell is selected
+        /// </summary>
+        [DefaultValue(ImageHighlightMode.NotSet), Category("Style")]
+        [Description("Indicates how cell images are highlighted when the cell is selected")]
+        public ImageHighlightMode ImageHighlightMode
+        {
+            get { return (_ImageHighlightMode); }
+
+            set
+            {
+                if (value != _ImageHighlightMode)
+                {
+                    _ImageHighlightMode = value;
+
+                    OnPropertyChangedEx("ImageHighlightMode", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ImageIndex
+
+        /// <summary>
+        /// Gets or sets the image index
+        /// </summary>
+        [Browsable(true), DefaultValue(-1)]
+        [Category("Appearance"), Description("Indicates the image index")]
+        [Editor("DevComponents.SuperGrid.Design.ImageIndexEditor, DevComponents.SuperGrid.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=26d81176cfa2b486", typeof(UITypeEditor))]
+        [TypeConverter(typeof(ImageIndexConverter))]
+        public int ImageIndex
+        {
+            get { return (_ImageIndex); }
+
+            set
+            {
+                if (_ImageIndex != value)
+                {
+                    _ImageIndex = value;
+
+                    OnPropertyChangedEx("ImageIndex", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        [Browsable(false)]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetImageIndex()
+        {
+            ImageIndex = -1;
+        }
+
+        #endregion
+
+        #region ImageOverlay
+
+        /// <summary>
+        /// Gets or sets how to overlay the cell image with respect to cell content
+        /// </summary>
+        [DefaultValue(ImageOverlay.NotSet), Category("Appearance")]
+        [Description("Indicates how to overlay the cell image with respect to cell content.")]
+        public ImageOverlay ImageOverlay
+        {
+            get { return (_ImageOverlay); }
+
+            set
+            {
+                if (_ImageOverlay != value)
+                {
+                    _ImageOverlay = value;
+
+                    OnPropertyChangedEx("ImageOverlay", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ImagePadding
+
+        /// <summary>
+        /// Gets or sets the spacing between content and edges of the Image
+        /// </summary>
+        [Description("Indicates the spacing between content and edges of the Image")]
+        public Padding ImagePadding
+        {
+            get
+            {
+                if (_ImagePadding == null)
+                {
+                    _ImagePadding = Padding.Empty;
+
+                    UpdateChangeHandler(null, _ImagePadding);
+                }
+
+                return (_ImagePadding);
+            }
+
+            set
+            {
+                if (_ImagePadding != value)
+                {
+                    UpdateChangeHandler(_ImagePadding, value);
+
+                    _ImagePadding = value;
+
+                    OnPropertyChangedEx("ImagePadding", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeImagePadding()
+        {
+            return (_ImagePadding != null && _ImagePadding.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetImagePadding()
+        {
+            ImagePadding = null;
+        }
+
+        #endregion
+
+        #region SymbolDef
+
+        /// <summary>
+        /// Gets or sets the element Symbol Definition. Note that
+        /// Symbol definition takes precedence over Image definition.
+        /// </summary>
+        [DefaultValue(null), Category("Appearance")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        [Description("Indicates the element Symbol Definition. Note that Symbol definition takes precedence over Image definition.")]
+        public SymbolDef SymbolDef
+        {
+            get
+            {
+                if (_SymbolDef == null)
+                {
+                    _SymbolDef = new SymbolDef();
+
+                    UpdateChangeHandler(null, _SymbolDef);
+                }
+
+                return (_SymbolDef);
+            }
+
+            set
+            {
+                if (_SymbolDef != value)
+                {
+                    UpdateChangeHandler(_SymbolDef, value);
+
+                    _SymbolDef = value;
+
+                    OnPropertyChangedEx("SymbolDef", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeSymbolDef()
+        {
+            return (_SymbolDef != null && _SymbolDef.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetSymbolDef()
+        {
+            SymbolDef = null;
+        }
+
+        #endregion
+
+        #region IsEmpty
+
+        /// <summary>
+        /// Gets whether the style is logically Empty.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        [Description("Gets whether the style is logically Empty.")]
+        public override bool IsEmpty
+        {
+            get
+            {
+                return ((_Alignment == Alignment.NotSet) &&
+                    (_AllowWrap == Tbool.NotSet) &&
+                    (_Image == null) &&
+                    (_ImageAlignment == Alignment.NotSet) &&
+                    (_ImageHighlightMode == ImageHighlightMode.NotSet) &&
+                    (_ImageIndex == -1) &&
+                    (_ImageOverlay == ImageOverlay.NotSet) &&
+                    (_ImagePadding == null || _ImagePadding.IsEmpty == true) &&
+
+                    (base.IsEmpty == true));
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region IsOverlayImage
+
+        internal bool IsOverlayImage
+        {
+            get
+            {
+                return (_ImageOverlay == ImageOverlay.Top ||
+                    _ImageOverlay == ImageOverlay.Bottom);
+            }
+        }
+
+        #endregion
+
+        #region IsSymbolFigure
+
+        internal bool IsSymbolFigure
+        {
+            get { return (_SymbolDef != null && _SymbolDef.IsValidSymbol == true); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ApplyStyle
+
+        /// <summary>
+        /// Applies the style to instance of this style.
+        /// </summary>
+        /// <param name="style">Style to apply.</param>
+        public void ApplyStyle(CellVisualStyle style)
+        {
+            if (style != null)
+            {
+                base.ApplyStyle(style);
+
+                if (style.Alignment != Alignment.NotSet)
+                    _Alignment = style.Alignment;
+
+                if (style.AllowWrap != Tbool.NotSet)
+                    _AllowWrap = style.AllowWrap;
+
+                if (style.AllowMultiLine != Tbool.NotSet)
+                    _AllowMultiLine = style.AllowMultiLine;
+
+                if (style.ImageIndex >= 0)
+                {
+                    _Image = null;
+                    _ImageIndex = style.ImageIndex;
+                }
+
+                if (style.Image != null)
+                {
+                    _Image = style.Image;
+                    _ImageIndex = -1;
+                }
+
+                if (style.ImageAlignment != Alignment.NotSet)
+                    _ImageAlignment = style.ImageAlignment;
+
+                if (style.ImageHighlightMode != ImageHighlightMode.NotSet)
+                    _ImageHighlightMode = style.ImageHighlightMode;
+
+                if (style._ImagePadding != null && style._ImagePadding.IsEmpty == false)
+                    _ImagePadding = style._ImagePadding.Copy();
+
+                if (style.ImageOverlay != ImageOverlay.NotSet)
+                    _ImageOverlay = style.ImageOverlay;
+
+                if (style._SymbolDef != null && style._SymbolDef.IsEmpty == false)
+                    _SymbolDef = style._SymbolDef.Copy();
+            }
+        }
+
+        #endregion
+
+        #region ApplyDefaults
+
+        internal void ApplyDefaults()
+        {
+            if (_SymbolDef != null && _SymbolDef.IsValidSymbol == true)
+            {
+                if (_SymbolDef.SymbolSize == 0)
+                {
+                    if (Font != null)
+                        _SymbolDef.SymbolSize = Font.SizeInPoints;
+                }
+
+                if (_SymbolDef.SymbolColor.IsEmpty == true)
+                {
+                    _SymbolDef.SymbolColor =
+                        (TextColor.IsEmpty == false) ? TextColor : Color.Black;
+                }
+            }
+        }
+
+        #endregion
+
+        #region GetTextFormatFlags
+
+        internal virtual eTextFormat GetTextFormatFlags()
+        {
+            eTextFormat tf = eTextFormat.WordEllipsis |
+                eTextFormat.NoPadding | eTextFormat.NoPrefix;
+
+            if (AllowWrap == Tbool.True)
+            {
+                tf |= eTextFormat.WordBreak;
+            }
+            else
+            {
+                if (AllowMultiLine != Tbool.True)
+                    tf |= eTextFormat.SingleLine;
+            }
+
+            switch (Alignment)
+            {
+                case Alignment.TopCenter:
+                    tf |= eTextFormat.HorizontalCenter;
+                    break;
+
+                case Alignment.TopRight:
+                    tf |= eTextFormat.Right;
+                    break;
+
+                case Alignment.MiddleLeft:
+                    tf |= eTextFormat.VerticalCenter;
+                    break;
+
+                case Alignment.MiddleCenter:
+                    tf |= eTextFormat.HorizontalCenter;
+                    tf |= eTextFormat.VerticalCenter;
+                    break;
+
+                case Alignment.MiddleRight:
+                    tf |= eTextFormat.Right;
+                    tf |= eTextFormat.VerticalCenter;
+                    break;
+
+                case Alignment.BottomLeft:
+                    tf |= eTextFormat.Bottom;
+                    break;
+
+                case Alignment.BottomCenter:
+                    tf |= eTextFormat.Bottom;
+                    tf |= eTextFormat.HorizontalCenter;
+                    break;
+
+                case Alignment.BottomRight:
+                    tf |= eTextFormat.Bottom;
+                    tf |= eTextFormat.Right;
+                    break;
+            }
+
+            return (tf);
+        }
+
+        #endregion
+
+        #region IsValidFigure
+
+        internal bool IsValidFigure(GridPanel panel)
+        {
+            if (IsSymbolFigure == true)
+                return (true);
+
+            return (GetImage(panel) != null);
+        }
+
+        #endregion
+
+        #region GetFigure
+
+        internal object GetFigure(GridPanel panel)
+        {
+            if (_SymbolDef != null && _SymbolDef.IsEmpty == false)
+                return (_SymbolDef);
+
+            return (GetImage(panel));
+        }
+
+        #region GetImage
+
+        private Image GetImage(GridPanel panel)
+        {
+            if (_Image != null)
+                return (_Image);
+
+            if (_ImageIndex >= 0 && panel != null)
+            {
+                ImageList imageList = panel.ImageList;
+
+                if (imageList != null && _ImageIndex < imageList.Images.Count)
+                    return (imageList.Images[_ImageIndex]);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetSymbol
+
+        private string GetSymbol()
+        {
+            if (_SymbolDef != null && _SymbolDef.IsEmpty == false)
+                return (_SymbolDef.SymbolRealized);
+
+            return (null);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetFigureSize
+
+        internal Size GetFigureSize(GridPanel panel)
+        {
+            Size size = GetFigureSizeEx(panel);
+
+            if (size.IsEmpty == false)
+            {
+                size.Width += Dpi.Width(ImagePadding.Horizontal);
+                size.Height += Dpi.Height(ImagePadding.Vertical);
+            }
+
+            return (size);
+        }
+
+        internal Size GetFigureSizeEx(GridPanel panel)
+        {
+            Size size = Size.Empty;
+
+            if (IsSymbolFigure == true)
+            {
+                size = _SymbolDef.GetSymbolSize(panel.SuperGrid);
+            }
+            else
+            {
+                Image image = GetImage(panel);
+
+                if (image != null)
+                    size = Dpi.Size(image.Size);
+            }
+
+            return (size);
+        }
+
+        #endregion
+
+        #region GetFigureBounds
+
+        internal Rectangle GetFigureBounds(GridPanel panel, Rectangle r)
+        {
+            Size size = GetFigureSize(panel);
+
+            return (GetSizeBounds(panel, r, size));
+        }
+
+        #region GetSizeBounds
+
+        private Rectangle GetSizeBounds(GridPanel panel, Rectangle r, Size size)
+        {
+            bool overlay = IsOverlayImage;
+
+            switch (ImageAlignment)
+            {
+                case Alignment.TopLeft:
+                    if (overlay == false)
+                        r.X -= size.Width;
+                    break;
+
+                case Alignment.NotSet:
+                case Alignment.MiddleLeft:
+                    if (overlay == false)
+                        r.X -= size.Width;
+
+                    r.Y += (r.Height - size.Height) / 2;
+                    break;
+
+                case Alignment.BottomLeft:
+                    if (overlay == false)
+                        r.X -= size.Width;
+
+                    r.Y = r.Bottom - size.Height;
+                    break;
+
+                case Alignment.TopCenter:
+                    r.X += (r.Width - size.Width) / 2;
+
+                    if (overlay == false)
+                        r.Y -= size.Height;
+                    break;
+
+                case Alignment.MiddleCenter:
+                    r.X += (r.Width - size.Width) / 2;
+                    r.Y += (r.Height - size.Height) / 2;
+                    break;
+
+                case Alignment.BottomCenter:
+                    r.X += (r.Width - size.Width) / 2;
+                    r.Y = r.Bottom;
+
+                    if (overlay == true)
+                        r.Y -= size.Height;
+                    break;
+
+                case Alignment.TopRight:
+                    r.X = r.Right;
+
+                    if (overlay == true)
+                        r.X -= size.Width;
+                    break;
+
+                case Alignment.MiddleRight:
+                    r.X = r.Right;
+
+                    if (overlay == true)
+                        r.X -= size.Width;
+
+                    r.Y += (r.Height - size.Height) / 2;
+
+                    break;
+
+                case Alignment.BottomRight:
+                    r.X = r.Right;
+                    r.Y = r.Bottom - size.Height;
+
+                    if (overlay == true)
+                        r.X -= size.Width;
+                    break;
+            }
+
+            r.Size = GetFigureSizeEx(panel);
+
+            r.X += ImagePadding.Left;
+            r.Y += ImagePadding.Top;
+
+            return (r);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetNonFigureBounds
+
+        internal Rectangle GetNonFigureBounds(GridPanel panel, Rectangle r)
+        {
+            object figure = GetFigure(panel);
+
+            if (figure != null)
+            {
+                if (IsOverlayImage == false)
+                {
+                    Size size = GetFigureSize(panel);
+
+                    switch (ImageAlignment)
+                    {
+                        case Alignment.TopCenter:
+                            r.Y += size.Height;
+                            r.Height -= size.Height;
+                            break;
+
+                        case Alignment.MiddleCenter:
+                            break;
+
+                        case Alignment.BottomCenter:
+                            r.Height -= size.Height;
+                            break;
+
+                        case Alignment.TopRight:
+                        case Alignment.MiddleRight:
+                        case Alignment.BottomRight:
+                            r.Width -= size.Width;
+                            break;
+
+                        default:
+                            r.X += size.Width;
+                            r.Width -= size.Width;
+                            break;
+                    }
+                }
+            }
+
+            return (r);
+        }
+
+        #endregion
+
+        #region RenderFigure
+
+        internal void RenderFigure(Graphics g, GridPanel panel, Rectangle r)
+        {
+            RenderFigure(g, GetFigure(panel), r);
+        }
+
+        internal void RenderFigure(Graphics g, object figure, Rectangle r)
+        {
+            if (r.Width > 0 && r.Height > 0)
+            {
+                if (figure is Image)
+                {
+                    g.DrawImageUnscaledAndClipped((Image)figure, r);
+                }
+                else if (figure is SymbolDef)
+                {
+                    SymbolDef sd = (SymbolDef)figure;
+
+                    using (Brush br = new SolidBrush(sd.SymbolColor))
+                        g.DrawString(sd.SymbolRealized, sd.SymbolFont, br, r);
+                }
+            }
+        }
+
+        #endregion
+
+        #region Copy
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public new CellVisualStyle Copy()
+        {
+            CellVisualStyle style = new CellVisualStyle();
+
+            CopyTo(style);
+
+            return (style);
+        }
+
+        #endregion
+
+        #region CopyTo
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public void CopyTo(CellVisualStyle style)
+        {
+            base.CopyTo(style);
+
+            style.Alignment = _Alignment;
+            style.AllowWrap = _AllowWrap;
+            style.AllowMultiLine = _AllowMultiLine;
+
+            style.Image = _Image;
+            style.ImageAlignment = _ImageAlignment;
+            style.ImageHighlightMode = _ImageHighlightMode;
+            style.ImageIndex = _ImageIndex;
+            style.ImageOverlay = _ImageOverlay;
+            style.ImagePadding = (_ImagePadding != null) ? _ImagePadding.Copy() : null;
+
+            style.SymbolDef = (_SymbolDef != null) ? _SymbolDef.Copy() : null;
+        }
+
+        #endregion
+
+        #region IDisposable
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        public override void Dispose()
+        {
+            ImagePadding = null;
+            SymbolDef = null;
+
+            base.Dispose();
+        }
+
+        #endregion
+    }
+
+    #region VisualPropertyChangedEventArgs
+
+    /// <summary>
+    /// Represents visual property changed event arguments.
+    /// </summary>
+    public class VisualPropertyChangedEventArgs : PropertyChangedEventArgs
+    {
+        #region Public data
+
+        /// <summary>
+        /// Gets the change type.
+        /// </summary>
+        public readonly VisualChangeType ChangeType;
+
+        #endregion
+
+        /// <summary>
+        /// Initializes a new instance of the VisualPropertyChangedEventArgs class.
+        /// </summary>
+        public VisualPropertyChangedEventArgs(string propertyName)
+            : base(propertyName)
+        {
+            ChangeType = VisualChangeType.Layout;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the VisualPropertyChangedEventArgs class.
+        /// </summary>
+        public VisualPropertyChangedEventArgs(string propertyName, VisualChangeType changeType)
+            : base(propertyName)
+        {
+            ChangeType = changeType;
+        }
+    }
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/Style/ColumnHeaderRowStyle.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/Style/ColumnHeaderRowStyle.cs
new file mode 100644
index 00000000..b5593f3e
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/Style/ColumnHeaderRowStyle.cs	
@@ -0,0 +1,457 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.SuperGrid.Style
+{
+    ///<summary>
+    /// ColumnHeaderRowVisualStyles
+    ///</summary>
+    [TypeConverter(typeof(VisualStylesConverter))]
+    public class ColumnHeaderRowVisualStyles : VisualStyles<ColumnHeaderRowVisualStyle>
+    {
+    }
+
+    ///<summary>
+    /// ColumnHeaderRowVisualStyle
+    ///</summary>
+    [TypeConverter(typeof(VisualStylesConverter))]
+    public class ColumnHeaderRowVisualStyle : BaseVisualStyle
+    {
+        #region Private variables
+
+        private Color _FilterBorderColor = Color.Empty;
+        private Color _IndicatorBorderColor = Color.Empty;
+        private Color _SortIndicatorColor = Color.Empty;
+
+        private Background _FilterBackground;
+        private Background _IndicatorBackground;
+        private Background _WhiteSpaceBackground;
+
+        private BaseRowHeaderVisualStyle _RowHeaderStyle;
+
+        #endregion
+
+        #region Public properties
+
+        #region FilterBackground
+
+        /// <summary>
+        /// Gets or sets the filter indicator background
+        /// </summary>
+        [Description("Indicates the RowHeader indicator background.")]
+        public Background FilterBackground
+        {
+            get
+            {
+                if (_FilterBackground == null)
+                {
+                    _FilterBackground = Background.Empty;
+
+                    UpdateChangeHandler(null, _FilterBackground);
+                }
+
+                return (_FilterBackground);
+            }
+
+            set
+            {
+                if (_FilterBackground != value)
+                {
+                    UpdateChangeHandler(_FilterBackground, value);
+
+                    _FilterBackground = value;
+
+                    OnPropertyChangedEx("FilterBackground", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeFilterBackground()
+        {
+            return (_FilterBackground != null &&
+                _FilterBackground.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetFilterBackground()
+        {
+            FilterBackground = null;
+        }
+
+        #endregion
+
+        #region FilterBorderColor
+
+        /// <summary>
+        /// Gets or sets the Filter border color
+        /// </summary>
+        [Description("Indicates the Filter border color")]
+        public Color FilterBorderColor
+        {
+            get { return (_FilterBorderColor); }
+
+            set
+            {
+                if (_FilterBorderColor != value)
+                {
+                    _FilterBorderColor = value;
+
+                    OnPropertyChangedEx("FilterBorderColor", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeFilterBorderColor()
+        {
+            return (_FilterBorderColor.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetFilterBorderColor()
+        {
+            _FilterBorderColor = Color.Empty;
+        }
+
+        #endregion
+
+        #region IndicatorBackground
+
+        /// <summary>
+        /// Gets or sets the RowHeader indicator background
+        /// </summary>
+        [Description("Indicates the RowHeader indicator background.")]
+        public Background IndicatorBackground
+        {
+            get
+            {
+                if (_IndicatorBackground == null)
+                {
+                    _IndicatorBackground = Background.Empty;
+
+                    UpdateChangeHandler(null, _IndicatorBackground);
+                }
+
+                return (_IndicatorBackground);
+            }
+
+            set
+            {
+                if (_IndicatorBackground != value)
+                {
+                    UpdateChangeHandler(_IndicatorBackground, value);
+
+                    _IndicatorBackground = value;
+
+                    OnPropertyChangedEx("IndicatorBackground", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeIndicatorBackground()
+        {
+            return (_IndicatorBackground != null && 
+                _IndicatorBackground.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetIndicatorBackground()
+        {
+            IndicatorBackground = null;
+        }
+
+        #endregion
+
+        #region IndicatorBorderColor
+
+        /// <summary>
+        /// Gets or sets the RowHeader indicator border color
+        /// </summary>
+        [Description("Indicates the RowHeader indicator border color")]
+        public Color IndicatorBorderColor
+        {
+            get { return (_IndicatorBorderColor); }
+
+            set
+            {
+                if (_IndicatorBorderColor != value)
+                {
+                    _IndicatorBorderColor = value;
+
+                    OnPropertyChangedEx("IndicatorBorderColor", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeIndicatorBorderColor()
+        {
+            return (_IndicatorBorderColor.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetIndicatorBorderColor()
+        {
+            _IndicatorBorderColor = Color.Empty;
+        }
+
+        #endregion
+
+        #region RowHeader
+
+        /// <summary>
+        /// Gets or sets the visual style of the ColumnHeader RowHeader
+        /// </summary>
+        [Description("Indicates the visual style of the ColumnHeader RowHeader.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public BaseRowHeaderVisualStyle RowHeader
+        {
+            get
+            {
+                if (_RowHeaderStyle == null)
+                {
+                    _RowHeaderStyle = BaseRowHeaderVisualStyle.Empty;
+
+                    UpdateChangeHandler(null, _RowHeaderStyle);
+                }
+
+                return (_RowHeaderStyle);
+            }
+
+            set
+            {
+                if (_RowHeaderStyle != value)
+                {
+                    UpdateChangeHandler(_RowHeaderStyle, value);
+
+                    _RowHeaderStyle = value;
+
+                    OnPropertyChangedEx("RowHeader", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region SortIndicatorColor
+
+        /// <summary>
+        /// Gets or sets the Sort indicator color
+        /// </summary>
+        [Description("Indicates the Sort indicator color")]
+        public Color SortIndicatorColor
+        {
+            get { return (_SortIndicatorColor); }
+
+            set
+            {
+                if (_SortIndicatorColor != value)
+                {
+                    _SortIndicatorColor = value;
+
+                    OnPropertyChangedEx("SortIndicatorColor", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeSortIndicatorColor()
+        {
+            return (_SortIndicatorColor.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetSortIndicatorColor()
+        {
+            _SortIndicatorColor = Color.Empty;
+        }
+
+        #endregion
+
+        #region WhiteSpaceBackground
+
+        /// <summary>
+        /// Gets or sets the WhiteSpace Background
+        /// </summary>
+        [Description("Indicates the WhiteSpace Background")]
+        public Background WhiteSpaceBackground
+        {
+            get
+            {
+                if (_WhiteSpaceBackground == null)
+                {
+                    _WhiteSpaceBackground = Background.Empty;
+
+                    UpdateChangeHandler(null, _WhiteSpaceBackground);
+                }
+
+                return (_WhiteSpaceBackground);
+            }
+
+            set
+            {
+                if (_WhiteSpaceBackground != value)
+                {
+                    UpdateChangeHandler(_WhiteSpaceBackground, value);
+
+                    _WhiteSpaceBackground = value;
+
+                    OnPropertyChangedEx("WhiteSpaceBackground", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeWhiteSpaceBackground()
+        {
+            return (_WhiteSpaceBackground != null &&
+                _WhiteSpaceBackground.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetWhiteSpaceBackground()
+        {
+            WhiteSpaceBackground = null;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ApplyStyle
+
+        /// <summary>
+        /// Applies the style to instance of this style.
+        /// </summary>
+        /// <param name="style">Style to apply.</param>
+        public void ApplyStyle(ColumnHeaderRowVisualStyle style)
+        {
+            if (style != null)
+            {
+                RowHeader.ApplyStyle(style.RowHeader);
+
+                if (style._FilterBackground != null && style._FilterBackground.IsEmpty == false)
+                    FilterBackground = style._FilterBackground.Copy();
+
+                if (style._FilterBorderColor.IsEmpty == false)
+                    FilterBorderColor = style._FilterBorderColor;
+
+                if (style._IndicatorBackground != null && style.IndicatorBackground.IsEmpty == false)
+                    IndicatorBackground = style._IndicatorBackground.Copy();
+
+                if (style._IndicatorBorderColor.IsEmpty == false)
+                    IndicatorBorderColor = style._IndicatorBorderColor;
+
+                if (style._SortIndicatorColor.IsEmpty == false)
+                    SortIndicatorColor = style._SortIndicatorColor;
+
+                if (style._WhiteSpaceBackground != null && style._WhiteSpaceBackground.IsEmpty == false)
+                    WhiteSpaceBackground = style._WhiteSpaceBackground.Copy();
+            }
+        }
+
+        #endregion
+
+        #region Copy
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public new ColumnHeaderRowVisualStyle Copy()
+        {
+            ColumnHeaderRowVisualStyle copy = new ColumnHeaderRowVisualStyle();
+
+            CopyTo(copy);
+
+            return (copy);
+        }
+
+        #endregion
+
+        #region CopyTo
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public void CopyTo(ColumnHeaderRowVisualStyle copy)
+        {
+            base.CopyTo(copy);
+
+            if (_RowHeaderStyle != null)
+                copy.RowHeader = _RowHeaderStyle.Copy();
+
+            if (_FilterBackground != null)
+                copy.FilterBackground = _FilterBackground.Copy();
+
+            if (_IndicatorBackground != null)
+                copy.IndicatorBackground = _IndicatorBackground.Copy();
+
+            copy.FilterBorderColor = _FilterBorderColor;
+            copy.IndicatorBorderColor = _IndicatorBorderColor;
+            copy.SortIndicatorColor = _SortIndicatorColor;
+
+            if (_WhiteSpaceBackground != null)
+                copy.WhiteSpaceBackground = _WhiteSpaceBackground.Copy();
+        }
+
+        #endregion
+
+        #region IDisposable
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        public override void Dispose()
+        {
+            IndicatorBackground = null;
+            RowHeader = null;
+            WhiteSpaceBackground = null;
+            FilterBackground = null;
+
+            base.Dispose();
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/Style/ColumnHeaderVisualStyle.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/Style/ColumnHeaderVisualStyle.cs
new file mode 100644
index 00000000..f8116578
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/Style/ColumnHeaderVisualStyle.cs	
@@ -0,0 +1,81 @@
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar.SuperGrid.Style
+{
+    ///<summary>
+    /// ColumnHeaderVisualStyles
+    ///</summary>
+    public class ColumnHeaderVisualStyles : VisualStyles<ColumnHeaderVisualStyle>
+    {
+        #region Hidden properties
+
+        #region Empty
+
+        /// <summary>
+        /// Empty
+        /// </summary>
+        [Browsable(false)]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public new ColumnHeaderVisualStyle Empty
+        {
+            get { return (base.Empty); }
+        }
+
+        #endregion
+
+        #region NotSelectable
+
+        /// <summary>
+        /// NotSelectable
+        /// </summary>
+        [Browsable(false)]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public new ColumnHeaderVisualStyle NotSelectable
+        {
+            get { return (base.NotSelectable); }
+        }
+
+        #endregion
+
+        #endregion
+    }
+
+    ///<summary>
+    /// ColumnHeaderVisualStyle
+    ///</summary>
+    [TypeConverter(typeof(ExpandableObjectConverter))]
+    public class ColumnHeaderVisualStyle : CellVisualStyle
+    {
+        #region GetTextFormatFlags
+
+        internal override eTextFormat GetTextFormatFlags()
+        {
+            eTextFormat tf = base.GetTextFormatFlags();
+
+            tf &= ~eTextFormat.SingleLine;
+
+            return (tf);
+        }
+
+        #endregion
+
+        #region Copy
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public new ColumnHeaderVisualStyle Copy()
+        {
+            ColumnHeaderVisualStyle style = new ColumnHeaderVisualStyle();
+
+            CopyTo(style);
+
+            return (style);
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/Style/DefaultVisualStyles.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/Style/DefaultVisualStyles.cs
new file mode 100644
index 00000000..3603ac09
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/Style/DefaultVisualStyles.cs	
@@ -0,0 +1,696 @@
+using System;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar.SuperGrid.Style
+{
+    /// <summary>
+    /// Defines set of default visual styles that are defined on the container control.
+    /// </summary>
+    [TypeConverter(typeof(VisualStylesConverter))]
+    public class DefaultVisualStyles : INotifyPropertyChanged, IDisposable
+    {
+        #region Private variables
+
+        private CellVisualStyles _CellStyles;
+        private CellVisualStyles _MergedCellStyles;
+        private CellVisualStyles _AlternateRowCellStyles;
+        private CellVisualStyles _AlternateColumnCellStyles;
+
+        private ColumnHeaderVisualStyles _ColumnHeaderStyles;
+        private ColumnHeaderRowVisualStyles _ColumnHeaderRowStyles;
+
+        private RowVisualStyles _RowStyles;
+        private GroupHeaderVisualStyles _GroupHeaderStyles;
+
+        private TextRowVisualStyles _CaptionStyles;
+        private TextRowVisualStyles _TitleStyles;
+        private TextRowVisualStyles _HeaderStyles;
+        private TextRowVisualStyles _FooterStyles;
+        private GroupByVisualStyles _GroupByStyles;
+        private GridPanelVisualStyle _GridPanelStyle;
+
+        private FilterRowVisualStyles _FilterRowStyles;
+        private FilterColumnHeaderVisualStyles _FilterColumnHeaderStyles;
+
+        #endregion
+
+        #region Public properties
+
+        #region AlternateColumnCellStyles
+
+        /// <summary>
+        /// Gets or sets the visual styles to be used on
+        /// alternating columns (UseAlternateColumnStyle must be enabled)
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates the visual styles to be used on alternating columns (UseAlternateColumnStyle must be enabled)")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public CellVisualStyles AlternateColumnCellStyles
+        {
+            get
+            {
+                if (_AlternateColumnCellStyles == null)
+                {
+                    _AlternateColumnCellStyles = new CellVisualStyles();
+
+                    StyleChangeHandler(null, _AlternateColumnCellStyles);
+                }
+
+                return (_AlternateColumnCellStyles);
+            }
+
+            set
+            {
+                if (_AlternateColumnCellStyles != value)
+                {
+                    CellVisualStyles oldValue = _AlternateColumnCellStyles;
+                    _AlternateColumnCellStyles = value;
+
+                    OnStyleChanged("AlternateColumnCellStyles", oldValue, value);
+                }
+            }
+        }
+
+        #endregion
+
+        #region AlternateRowCellStyles
+
+        /// <summary>
+        /// Gets or sets the visual styles to be used on 
+        /// alternating rows (UseAlternateRowStyle must be enabled)
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates Gets or sets the visual styles to be used on alternating rows (UseAlternateRowStyle must be enabled)")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public CellVisualStyles AlternateRowCellStyles
+        {
+            get
+            {
+                if (_AlternateRowCellStyles == null)
+                {
+                    _AlternateRowCellStyles = new CellVisualStyles();
+
+                    StyleChangeHandler(null, _AlternateRowCellStyles);
+                }
+
+                return (_AlternateRowCellStyles);
+            }
+
+            set
+            {
+                if (_AlternateRowCellStyles != value)
+                {
+                    CellVisualStyles oldValue = _AlternateRowCellStyles;
+                    _AlternateRowCellStyles = value;
+
+                    OnStyleChanged("AltRowVisualStyles", oldValue, value);
+                }
+            }
+        }
+
+        #endregion
+
+        #region CaptionStyles
+
+        /// <summary>
+        /// Gets or sets the visual styles to be used for the grid Caption 
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates visual styles to be used for the grid Caption")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public TextRowVisualStyles CaptionStyles
+        {
+            get
+            {
+                if (_CaptionStyles == null)
+                {
+                    _CaptionStyles = new TextRowVisualStyles();
+
+                    StyleChangeHandler(null, _CaptionStyles);
+                }
+
+                return (_CaptionStyles);
+            }
+
+            set
+            {
+                if (_CaptionStyles != value)
+                {
+                    TextRowVisualStyles oldValue = _CaptionStyles;
+                    _CaptionStyles = value;
+
+                    OnStyleChanged("CaptionStyles", oldValue, value);
+                }
+            }
+        }
+
+        #endregion
+
+        #region CellStyles
+
+        /// <summary>
+        /// Gets or sets visual styles to be used for the grid Cells
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates visual styles to be used for the grid Cells")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public CellVisualStyles CellStyles
+        {
+            get
+            {
+                if (_CellStyles == null)
+                {
+                    _CellStyles = new CellVisualStyles();
+
+                    StyleChangeHandler(null, _CellStyles);
+                }
+
+                return (_CellStyles);
+            }
+
+            set
+            {
+                if (_CellStyles != value)
+                {
+                    CellVisualStyles oldValue = _CellStyles;
+                    _CellStyles = value;
+
+                    OnStyleChanged("CellStyles", oldValue, value);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ColumnHeaderStyles
+
+        /// <summary>
+        /// Gets or sets visual styles to be used for the grid ColumnHeader 
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates visual styles to be used for the grid ColumnHeader")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ColumnHeaderVisualStyles ColumnHeaderStyles
+        {
+            get
+            {
+                if (_ColumnHeaderStyles == null)
+                {
+                    _ColumnHeaderStyles = new ColumnHeaderVisualStyles();
+
+                    StyleChangeHandler(null, _ColumnHeaderStyles);
+                }
+
+                return (_ColumnHeaderStyles);
+            }
+
+            set
+            {
+                if (_ColumnHeaderStyles != value)
+                {
+                    ColumnHeaderVisualStyles oldValue = _ColumnHeaderStyles;
+                    _ColumnHeaderStyles = value;
+
+                    OnStyleChanged("ColumnHeaderStyles", oldValue, value);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ColumnHeaderRowStyles
+
+        /// <summary>
+        /// Gets or sets visual styles
+        /// to be used for the grid ColumnHeader Row 
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates visual styles to be used for the grid ColumnHeader Row")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ColumnHeaderRowVisualStyles ColumnHeaderRowStyles
+        {
+            get
+            {
+                if (_ColumnHeaderRowStyles == null)
+                {
+                    _ColumnHeaderRowStyles = new ColumnHeaderRowVisualStyles();
+
+                    StyleChangeHandler(null, _ColumnHeaderRowStyles);
+                }
+
+                return (_ColumnHeaderRowStyles);
+            }
+
+            set
+            {
+                if (_ColumnHeaderRowStyles != value)
+                {
+                    ColumnHeaderRowVisualStyles oldValue = _ColumnHeaderRowStyles;
+                    _ColumnHeaderRowStyles = value;
+
+                    OnStyleChanged("ColumnHeaderRowStyles", oldValue, value);
+                }
+            }
+        }
+
+        #endregion
+
+        #region FilterRowStyles
+
+        /// <summary>
+        /// Gets or sets visual styles to
+        /// be used for the grid Filter column headers 
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates visual styles to be used for the grid Filter column headers.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public FilterColumnHeaderVisualStyles FilterColumnHeaderStyles
+        {
+            get
+            {
+                if (_FilterColumnHeaderStyles == null)
+                {
+                    _FilterColumnHeaderStyles = new FilterColumnHeaderVisualStyles();
+
+                    StyleChangeHandler(null, _FilterColumnHeaderStyles);
+                }
+
+                return (_FilterColumnHeaderStyles);
+            }
+
+            set
+            {
+                if (_FilterColumnHeaderStyles != value)
+                {
+                    FilterColumnHeaderVisualStyles oldValue = _FilterColumnHeaderStyles;
+                    _FilterColumnHeaderStyles = value;
+
+                    OnStyleChanged("FilterColumnHeaderStyles", oldValue, value);
+                }
+            }
+        }
+
+        #endregion
+
+        #region FilterRowStyles
+
+        /// <summary>
+        /// Gets or sets visual styles to be used for the grid Filter Row 
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates visual styles to be used for the grid Filter Row")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public FilterRowVisualStyles FilterRowStyles
+        {
+            get
+            {
+                if (_FilterRowStyles == null)
+                {
+                    _FilterRowStyles = new FilterRowVisualStyles();
+
+                    StyleChangeHandler(null, _FilterRowStyles);
+                }
+
+                return (_FilterRowStyles);
+            }
+
+            set
+            {
+                if (_FilterRowStyles != value)
+                {
+                    FilterRowVisualStyles oldValue = _FilterRowStyles;
+                    _FilterRowStyles = value;
+
+                    OnStyleChanged("FilterRowStyles", oldValue, value);
+                }
+            }
+        }
+
+        #endregion
+
+        #region FooterStyles
+
+        /// <summary>
+        /// Gets or sets the visual styles to be used for the grid Footer 
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates visual styles to be used for the grid Footer")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public TextRowVisualStyles FooterStyles
+        {
+            get
+            {
+                if (_FooterStyles == null)
+                {
+                    _FooterStyles = new TextRowVisualStyles();
+
+                    StyleChangeHandler(null, _FooterStyles);
+                }
+
+                return (_FooterStyles);
+            }
+
+            set
+            {
+                if (_FooterStyles != value)
+                {
+                    TextRowVisualStyles oldValue = _FooterStyles;
+                    _FooterStyles = value;
+
+                    OnStyleChanged("FooterStyles", oldValue, value);
+                }
+            }
+        }
+
+        #endregion
+
+        #region GridPanelStyle
+
+        /// <summary>
+        /// Gets or sets the visual styles to be used for the main grid panel
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates visual styles to be used for the main grid panel")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public GridPanelVisualStyle GridPanelStyle
+        {
+            get
+            {
+                if (_GridPanelStyle == null)
+                {
+                    _GridPanelStyle = new GridPanelVisualStyle();
+
+                    StyleChangeHandler(null, _GridPanelStyle);
+                }
+
+                return (_GridPanelStyle);
+            }
+
+            set
+            {
+                if (_GridPanelStyle != value)
+                {
+                    GridPanelVisualStyle oldValue = _GridPanelStyle;
+                    _GridPanelStyle = value;
+
+                    OnStyleChanged("GridPanelStyle", oldValue, value);
+                }
+            }
+        }
+
+        #endregion
+
+        #region GroupByStyles
+
+        /// <summary>
+        /// Gets or sets the visual styles to be used for the grid GroupBy Row 
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates visual styles to be used for the grid GroupBy Row")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public GroupByVisualStyles GroupByStyles
+        {
+            get
+            {
+                if (_GroupByStyles == null)
+                {
+                    _GroupByStyles = new GroupByVisualStyles();
+
+                    StyleChangeHandler(null, _GroupByStyles);
+                }
+
+                return (_GroupByStyles);
+            }
+
+            set
+            {
+                if (_GroupByStyles != value)
+                {
+                    GroupByVisualStyles oldValue = _GroupByStyles;
+                    _GroupByStyles = value;
+
+                    OnStyleChanged("GroupByStyles", oldValue, value);
+                }
+            }
+        }
+
+        #endregion
+
+        #region GroupHeaderStyles
+
+        /// <summary>
+        /// Gets or sets the visual styles to be used for the Group Header
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates visual styles to be used for the Group Header")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public GroupHeaderVisualStyles GroupHeaderStyles
+        {
+            get
+            {
+                if (_GroupHeaderStyles == null)
+                {
+                    _GroupHeaderStyles = new GroupHeaderVisualStyles();
+
+                    StyleChangeHandler(null, _GroupHeaderStyles);
+                }
+
+                return (_GroupHeaderStyles);
+            }
+
+            set
+            {
+                if (_GroupHeaderStyles != value)
+                {
+                    GroupHeaderVisualStyles oldValue = _GroupHeaderStyles;
+                    _GroupHeaderStyles = value;
+
+                    OnStyleChanged("GroupHeaderStyles", oldValue, value);
+                }
+            }
+        }
+
+        #endregion
+
+        #region HeaderStyles
+
+        /// <summary>
+        /// Gets or sets the visual styles to be used for the grid Header 
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates visual styles to be used for the grid Header")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public TextRowVisualStyles HeaderStyles
+        {
+            get
+            {
+                if (_HeaderStyles == null)
+                {
+                    _HeaderStyles = new TextRowVisualStyles();
+
+                    StyleChangeHandler(null, _HeaderStyles);
+                }
+
+                return (_HeaderStyles);
+            }
+
+            set
+            {
+                if (_HeaderStyles != value)
+                {
+                    TextRowVisualStyles oldValue = _HeaderStyles;
+                    _HeaderStyles = value;
+
+                    OnStyleChanged("HeaderStyles", oldValue, value);
+                }
+            }
+        }
+
+        #endregion
+
+        #region MergedCellStyles
+
+        /// <summary>
+        /// Gets or sets visual styles to be used for merged grid Cells
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates visual styles to be used for merged grid Cells")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public CellVisualStyles MergedCellStyles
+        {
+            get
+            {
+                if (_MergedCellStyles == null)
+                {
+                    _MergedCellStyles = new CellVisualStyles();
+
+                    StyleChangeHandler(null, _MergedCellStyles);
+                }
+
+                return (_MergedCellStyles);
+            }
+
+            set
+            {
+                if (_MergedCellStyles != value)
+                {
+                    CellVisualStyles oldValue = _MergedCellStyles;
+                    _MergedCellStyles = value;
+
+                    OnStyleChanged("MergedCellStyles", oldValue, value);
+                }
+            }
+        }
+
+        #endregion
+
+        #region RowStyles
+
+        /// <summary>
+        /// Gets or sets the visual styles to be used for the grid rows
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates visual styles to be used for the grid rows")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public RowVisualStyles RowStyles
+        {
+            get
+            {
+                if (_RowStyles == null)
+                {
+                    _RowStyles = new RowVisualStyles();
+
+                    StyleChangeHandler(null, _RowStyles);
+                }
+
+                return (_RowStyles);
+            }
+
+            set
+            {
+                if (_RowStyles != value)
+                {
+                    RowVisualStyles oldValue = _RowStyles;
+                    _RowStyles = value;
+
+                    OnStyleChanged("RowStyles", oldValue, value);
+                }
+            }
+        }
+
+        #endregion
+
+        #region TitleStyles
+
+        /// <summary>
+        /// Gets or sets the visual styles to be used for the grid Title 
+        /// </summary>
+        [Category("Style")]
+        [Description("Indicates visual styles to be used for the grid Title")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public TextRowVisualStyles TitleStyles
+        {
+            get
+            {
+                if (_TitleStyles == null)
+                {
+                    _TitleStyles = new TextRowVisualStyles();
+
+                    StyleChangeHandler(null, _TitleStyles);
+                }
+
+                return (_TitleStyles);
+            }
+
+            set
+            {
+                if (_TitleStyles != value)
+                {
+                    TextRowVisualStyles oldValue = _TitleStyles;
+                    _TitleStyles = value;
+
+                    OnStyleChanged("TitleStyles", oldValue, value);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region OnStyleChanged
+
+        private void OnStyleChanged(string property,
+            INotifyPropertyChanged oldValue, INotifyPropertyChanged newValue)
+        {
+            StyleChangeHandler(oldValue, newValue);
+
+            OnPropertyChanged(new VisualPropertyChangedEventArgs(property));
+        }
+
+        #endregion
+
+        #region StyleChangeHandler
+
+        private void StyleChangeHandler(
+            INotifyPropertyChanged oldValue, INotifyPropertyChanged newValue)
+        {
+            if (oldValue != null)
+                oldValue.PropertyChanged -= StyleChanged;
+
+            if (newValue != null)
+                newValue.PropertyChanged += StyleChanged;
+        }
+
+        #endregion
+
+        #region StyleChanged
+
+        /// <summary>
+        /// Occurs when one of element visual styles has property changes.
+        /// Default implementation invalidates visual appearance of element.
+        /// </summary>
+        /// <param name="sender">VisualStyle that changed.</param>
+        /// <param name="e">Event arguments.</param>
+        protected virtual void StyleChanged(object sender, PropertyChangedEventArgs e)
+        {
+            OnPropertyChanged(e);
+        }
+
+        #endregion
+
+        #region INotifyPropertyChanged Members
+
+        /// <summary>
+        /// Occurs when property value has changed.
+        /// </summary>
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        /// <summary>
+        /// Raises the PropertyChanged event.
+        /// </summary>
+        /// <param name="e">Event arguments</param>
+        protected virtual void OnPropertyChanged(PropertyChangedEventArgs e)
+        {
+            PropertyChangedEventHandler eh = PropertyChanged;
+
+            if (eh != null)
+                eh(this, e);
+        }
+
+        #endregion
+
+        #region IDisposable
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        public void Dispose()
+        {
+            AlternateColumnCellStyles = null;
+            AlternateRowCellStyles = null;
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/Style/FilterColumnHeaderVisualStyle.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/Style/FilterColumnHeaderVisualStyle.cs
new file mode 100644
index 00000000..f0b8aa3d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/Style/FilterColumnHeaderVisualStyle.cs	
@@ -0,0 +1,572 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.SuperGrid.Style
+{
+    ///<summary>
+    /// FilterColumnHeaderVisualStyle
+    ///</summary>
+    public class FilterColumnHeaderVisualStyles : VisualStyles<FilterColumnHeaderVisualStyle>
+    {
+    }
+
+    ///<summary>
+    /// FilterRowVisualStyle
+    ///</summary>
+    [TypeConverter(typeof(ExpandableObjectConverter))]
+    public class FilterColumnHeaderVisualStyle : BaseVisualStyle
+    {
+        #region Private variables
+
+        private Tbool _AllowWrap = Tbool.NotSet;
+        private Alignment _Alignment = Alignment.NotSet;
+
+        private Background _Background;
+        private Background _ErrorBackground;
+        private Background _GripBarBackground;
+
+        private Color _TextColor = Color.Empty;
+        private Color _ErrorTextColor = Color.Empty;
+
+        private Font _Font;
+
+        private Padding _Margin;
+
+        #endregion
+
+        #region Public properties
+
+        #region Alignment
+
+        /// <summary>
+        /// Gets or sets the content alignment
+        /// </summary>
+        [DefaultValue(Alignment.NotSet), Category("Appearance")]
+        [Description("Indicates the content alignment.")]
+        public Alignment Alignment
+        {
+            get { return (_Alignment); }
+
+            set
+            {
+                if (_Alignment != value)
+                {
+                    _Alignment = value;
+
+                    OnPropertyChangedEx("Alignment", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region AllowWrap
+
+        /// <summary>
+        /// Gets or sets whether text wrapping is permitted
+        /// </summary>
+        [DefaultValue(Tbool.NotSet), Category("Appearance")]
+        [Description("Indicates whether text wrapping is permitted.")]
+        public Tbool AllowWrap
+        {
+            get { return (_AllowWrap); }
+
+            set
+            {
+                if (_AllowWrap != value)
+                {
+                    _AllowWrap = value;
+
+                    OnPropertyChangedEx("AllowWrap", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region Background
+
+        /// <summary>
+        /// Gets or sets the style background.
+        /// </summary>
+        [Description("Indicates the style background")]
+        public Background Background
+        {
+            get
+            {
+                if (_Background == null)
+                {
+                    _Background = Background.Empty;
+
+                    UpdateChangeHandler(null, _Background);
+                }
+
+                return (_Background);
+            }
+
+            set
+            {
+                if (_Background != value)
+                {
+                    UpdateChangeHandler(_Background, value);
+
+                    _Background = value;
+
+                    OnPropertyChangedEx("Background", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeBackground()
+        {
+            return (_Background != null && _Background.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetBackground()
+        {
+            Background = null;
+        }
+
+        #endregion
+
+        #region ErrorBackground
+
+        /// <summary>
+        /// Gets or sets the style error background.
+        /// </summary>
+        [Description("Indicates the style error background")]
+        public Background ErrorBackground
+        {
+            get
+            {
+                if (_Background == null)
+                {
+                    _ErrorBackground = Background.Empty;
+
+                    UpdateChangeHandler(null, _ErrorBackground);
+                }
+
+                return (_ErrorBackground);
+            }
+
+            set
+            {
+                if (_ErrorBackground != value)
+                {
+                    UpdateChangeHandler(_ErrorBackground, value);
+
+                    _ErrorBackground = value;
+
+                    OnPropertyChangedEx("ErrorBackground", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeErrorBackground()
+        {
+            return (_ErrorBackground != null && _ErrorBackground.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetErrorBackground()
+        {
+            ErrorBackground = null;
+        }
+
+        #endregion
+
+        #region ErrorTextColor
+
+        /// <summary>
+        /// Gets or sets the error Text color
+        /// </summary>
+        [Description("Indicates the error Text color")]
+        public Color ErrorTextColor
+        {
+            get { return (_ErrorTextColor); }
+
+            set
+            {
+                if (_ErrorTextColor != value)
+                {
+                    _ErrorTextColor = value;
+
+                    OnPropertyChangedEx("ErrorTextColor", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeErrorTextColor()
+        {
+            return (_ErrorTextColor.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetErrorTextColor()
+        {
+            _ErrorTextColor = Color.Empty;
+        }
+
+        #endregion
+
+        #region Font
+
+        /// <summary>
+        /// Gets or sets the style Font
+        /// </summary>
+        [DefaultValue(null)]
+        [Description("Indicates the style Font")]
+        public Font Font
+        {
+            get { return (_Font); }
+
+            set
+            {
+                if (_Font != value)
+                {
+                    _Font = value;
+
+                    OnPropertyChangedEx("Font", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region GripBarBackground
+
+        /// <summary>
+        /// Gets or sets the GripBar style background.
+        /// </summary>
+        [Description("Indicates the GripBar style background")]
+        public Background GripBarBackground
+        {
+            get
+            {
+                if (_GripBarBackground == null)
+                {
+                    _GripBarBackground = Background.Empty;
+
+                    UpdateChangeHandler(null, _GripBarBackground);
+                }
+
+                return (_GripBarBackground);
+            }
+
+            set
+            {
+                if (_GripBarBackground != value)
+                {
+                    UpdateChangeHandler(_GripBarBackground, value);
+
+                    _GripBarBackground = value;
+
+                    OnPropertyChangedEx("GripBarBackground", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeGripBarBackground()
+        {
+            return (_GripBarBackground != null && _GripBarBackground.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetGripBarBackground()
+        {
+            GripBarBackground = null;
+        }
+
+        #endregion
+
+        #region Margin
+
+        /// <summary>
+        /// Gets or sets the spacing between the border and outside content.
+        /// </summary>
+        [Description("Indicates the spacing between the border and outside content")]
+        public Padding Margin
+        {
+            get
+            {
+                if (_Margin == null)
+                {
+                    _Margin = Padding.Empty;
+
+                    UpdateChangeHandler(null, _Margin);
+                }
+
+                return (_Margin);
+            }
+
+            set
+            {
+                if (_Margin != value)
+                {
+                    UpdateChangeHandler(_Margin, value);
+
+                    _Margin = value;
+
+                    OnPropertyChangedEx("Margin", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeMargin()
+        {
+            return (_Margin != null && _Margin.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetMargin()
+        {
+            Margin = null;
+        }
+
+        #endregion
+
+        #region TextColor
+
+        /// <summary>
+        /// Gets or sets the Text color
+        /// </summary>
+        [Description("Indicates the Text color")]
+        public Color TextColor
+        {
+            get { return (_TextColor); }
+
+            set
+            {
+                if (_TextColor != value)
+                {
+                    _TextColor = value;
+
+                    OnPropertyChangedEx("TextColor", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeTextColor()
+        {
+            return (_TextColor.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetTextColor()
+        {
+            _TextColor = Color.Empty;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetTextFormatFlags
+
+        internal eTextFormat GetTextFormatFlags()
+        {
+            eTextFormat tf = eTextFormat.WordEllipsis |
+                eTextFormat.NoPadding | eTextFormat.NoPrefix;
+
+            if (AllowWrap == Tbool.True)
+                tf |= eTextFormat.WordBreak;
+
+            switch (Alignment)
+            {
+                case Alignment.TopCenter:
+                    tf |= eTextFormat.HorizontalCenter;
+                    break;
+
+                case Alignment.TopRight:
+                    tf |= eTextFormat.Right;
+                    break;
+
+                case Alignment.MiddleLeft:
+                    tf |= eTextFormat.VerticalCenter;
+                    break;
+
+                case Alignment.MiddleCenter:
+                    tf |= eTextFormat.HorizontalCenter;
+                    tf |= eTextFormat.VerticalCenter;
+                    break;
+
+                case Alignment.MiddleRight:
+                    tf |= eTextFormat.Right;
+                    tf |= eTextFormat.VerticalCenter;
+                    break;
+
+                case Alignment.BottomLeft:
+                    tf |= eTextFormat.Bottom;
+                    break;
+
+                case Alignment.BottomCenter:
+                    tf |= eTextFormat.Bottom;
+                    tf |= eTextFormat.HorizontalCenter;
+                    break;
+
+                case Alignment.BottomRight:
+                    tf |= eTextFormat.Bottom;
+                    tf |= eTextFormat.Right;
+                    break;
+            }
+
+            return (tf);
+        }
+
+        #endregion
+
+        #region ApplyStyle
+
+        /// <summary>
+        /// Applies the style to the instance of this style.
+        /// </summary>
+        /// <param name="style">Style to apply.</param>
+        public void ApplyStyle(FilterColumnHeaderVisualStyle style)
+        {
+            if (style != null)
+            {
+                base.ApplyStyle(style);
+
+                if (style.Alignment != Alignment.NotSet)
+                    Alignment = style.Alignment;
+
+                if (style.AllowWrap != Tbool.NotSet)
+                    AllowWrap = style.AllowWrap;
+
+                if (style.Background != null && style.Background.IsEmpty == false)
+                    Background = style.Background.Copy();
+
+                if (style.GripBarBackground != null && style.GripBarBackground.IsEmpty == false)
+                    GripBarBackground = style.GripBarBackground.Copy();
+
+                if (style.ErrorBackground != null && style.ErrorBackground.IsEmpty == false)
+                    ErrorBackground = style.ErrorBackground.Copy();
+
+                if (style.Font != null)
+                    Font = style.Font;
+
+                if (style.ErrorTextColor.IsEmpty == false)
+                    ErrorTextColor = style.ErrorTextColor;
+
+                if (style.TextColor.IsEmpty == false)
+                    TextColor = style.TextColor;
+
+                if (style.Margin != null && style.Margin.IsEmpty == false)
+                    Margin = style.Margin.Copy();
+            }
+        }
+
+        #endregion
+
+        #region Copy
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public new FilterColumnHeaderVisualStyle Copy()
+        {
+            FilterColumnHeaderVisualStyle style = new FilterColumnHeaderVisualStyle();
+
+            CopyTo(style);
+
+            return (style);
+        }
+
+        #endregion
+
+        #region CopyTo
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public void CopyTo(FilterColumnHeaderVisualStyle copy)
+        {
+            base.CopyTo(copy);
+
+            copy.Alignment = _Alignment;
+            copy.AllowWrap = _AllowWrap;
+            copy.ErrorTextColor = _ErrorTextColor;
+            copy.TextColor = _TextColor;
+
+            if (_Background != null)
+                copy.Background = _Background.Copy();
+
+            if (_ErrorBackground != null)
+                copy.ErrorBackground = _ErrorBackground.Copy();
+
+            if (_GripBarBackground != null)
+                copy.GripBarBackground = _GripBarBackground.Copy();
+
+            if (_Font != null)
+                copy.Font = _Font;
+
+            if (_Margin != null)
+                copy.Margin = _Margin.Copy();
+        }
+
+        #endregion
+
+        #region IDisposable
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        public override void Dispose()
+        {
+            Background = null;
+            ErrorBackground = null;
+            GripBarBackground = null;
+            Margin = null;
+
+            base.Dispose();
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/Style/FilterRowVisualStyles.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/Style/FilterRowVisualStyles.cs
new file mode 100644
index 00000000..9192df96
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/Style/FilterRowVisualStyles.cs	
@@ -0,0 +1,305 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.SuperGrid.Style
+{
+    ///<summary>
+    /// FilterRowVisualStyles
+    ///</summary>
+    [TypeConverter(typeof(VisualStylesConverter))]
+    public class FilterRowVisualStyles : VisualStyles<FilterRowVisualStyle>
+    {
+    }
+
+    ///<summary>
+    /// FilterRowVisualStyle
+    ///</summary>
+    [TypeConverter(typeof(VisualStylesConverter))]
+    public class FilterRowVisualStyle : BaseVisualStyle
+    {
+        #region Private variables
+
+        private Color _FilterBorderColor = Color.Empty;
+
+        private Background _FilterBackground;
+        private Background _WhiteSpaceBackground;
+
+        private BaseRowHeaderVisualStyle _RowHeaderStyle;
+
+        #endregion
+
+        #region Public properties
+
+        #region FilterBackground
+
+        /// <summary>
+        /// Gets or sets the filter indicator background
+        /// </summary>
+        [Description("Indicates the RowHeader indicator background.")]
+        public Background FilterBackground
+        {
+            get
+            {
+                if (_FilterBackground == null)
+                {
+                    _FilterBackground = Background.Empty;
+
+                    UpdateChangeHandler(null, _FilterBackground);
+                }
+
+                return (_FilterBackground);
+            }
+
+            set
+            {
+                if (_FilterBackground != value)
+                {
+                    UpdateChangeHandler(_FilterBackground, value);
+
+                    _FilterBackground = value;
+
+                    OnPropertyChangedEx("FilterBackground", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeFilterBackground()
+        {
+            return (_FilterBackground != null &&
+                _FilterBackground.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetFilterBackground()
+        {
+            FilterBackground = null;
+        }
+
+        #endregion
+
+        #region FilterBorderColor
+
+        /// <summary>
+        /// Gets or sets the Filter border color
+        /// </summary>
+        [Description("Indicates the Filter border color")]
+        public Color FilterBorderColor
+        {
+            get { return (_FilterBorderColor); }
+
+            set
+            {
+                if (_FilterBorderColor != value)
+                {
+                    _FilterBorderColor = value;
+
+                    OnPropertyChangedEx("FilterBorderColor", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeFilterBorderColor()
+        {
+            return (_FilterBorderColor.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetFilterBorderColor()
+        {
+            _FilterBorderColor = Color.Empty;
+        }
+
+        #endregion
+
+        #region RowHeader
+
+        /// <summary>
+        /// Gets or sets the visual style of the RowHeader
+        /// </summary>
+        [Description("Indicates the visual style of the RowHeader.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public BaseRowHeaderVisualStyle RowHeader
+        {
+            get
+            {
+                if (_RowHeaderStyle == null)
+                {
+                    _RowHeaderStyle = BaseRowHeaderVisualStyle.Empty;
+
+                    UpdateChangeHandler(null, _RowHeaderStyle);
+                }
+
+                return (_RowHeaderStyle);
+            }
+
+            set
+            {
+                if (_RowHeaderStyle != value)
+                {
+                    UpdateChangeHandler(_RowHeaderStyle, value);
+
+                    _RowHeaderStyle = value;
+
+                    OnPropertyChangedEx("RowHeader", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region WhiteSpaceBackground
+
+        /// <summary>
+        /// Gets or sets the WhiteSpace Background
+        /// </summary>
+        [Description("Indicates the WhiteSpace Background")]
+        public Background WhiteSpaceBackground
+        {
+            get
+            {
+                if (_WhiteSpaceBackground == null)
+                {
+                    _WhiteSpaceBackground = Background.Empty;
+
+                    UpdateChangeHandler(null, _WhiteSpaceBackground);
+                }
+
+                return (_WhiteSpaceBackground);
+            }
+
+            set
+            {
+                if (_WhiteSpaceBackground != value)
+                {
+                    UpdateChangeHandler(_WhiteSpaceBackground, value);
+
+                    _WhiteSpaceBackground = value;
+
+                    OnPropertyChangedEx("WhiteSpaceBackground", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeWhiteSpaceBackground()
+        {
+            return (_WhiteSpaceBackground != null &&
+                _WhiteSpaceBackground.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetWhiteSpaceBackground()
+        {
+            WhiteSpaceBackground = null;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ApplyStyle
+
+        /// <summary>
+        /// Applies the style to instance of this style.
+        /// </summary>
+        /// <param name="style">Style to apply.</param>
+        public void ApplyStyle(FilterRowVisualStyle style)
+        {
+            if (style != null)
+            {
+                base.ApplyStyle(style);
+
+                RowHeader.ApplyStyle(style.RowHeader);
+
+                if (style.FilterBackground != null && style.FilterBackground.IsEmpty == false)
+                    FilterBackground = style.FilterBackground.Copy();
+
+                if (style.FilterBorderColor.IsEmpty == false)
+                    FilterBorderColor = style.FilterBorderColor;
+
+                if (style.WhiteSpaceBackground != null && style.WhiteSpaceBackground.IsEmpty == false)
+                    WhiteSpaceBackground = style.WhiteSpaceBackground.Copy();
+            }
+        }
+
+        #endregion
+
+        #region Copy
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public new FilterRowVisualStyle Copy()
+        {
+            FilterRowVisualStyle copy = new FilterRowVisualStyle();
+
+            CopyTo(copy);
+
+            return (copy);
+        }
+
+        #endregion
+
+        #region CopyTo
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public void CopyTo(FilterRowVisualStyle copy)
+        {
+            base.CopyTo(copy);
+
+            if (_RowHeaderStyle != null)
+                copy.RowHeader = _RowHeaderStyle.Copy();
+
+            copy.FilterBorderColor = _FilterBorderColor;
+
+            if (_FilterBackground != null)
+                copy.FilterBackground = _FilterBackground.Copy();
+
+            if (_WhiteSpaceBackground != null)
+                copy.WhiteSpaceBackground = _WhiteSpaceBackground.Copy();
+        }
+
+        #endregion
+
+        #region IDisposable
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        public override void Dispose()
+        {
+            RowHeader = null;
+            WhiteSpaceBackground = null;
+            FilterBackground = null;
+
+            base.Dispose();
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/Style/GridPanelVisualStyle.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/Style/GridPanelVisualStyle.cs
new file mode 100644
index 00000000..d497d207
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/Style/GridPanelVisualStyle.cs	
@@ -0,0 +1,717 @@
+using System.ComponentModel;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.SuperGrid.Style
+{
+    ///<summary>
+    /// GridPanelVisualStyle
+    ///</summary>
+    [TypeConverter(typeof(VisualStylesConverter))]
+    public class GridPanelVisualStyle : VisualStyle
+    {
+        #region Private variables
+
+        private Tbool _AllowWrap = Tbool.NotSet;
+        private Alignment _Alignment = Alignment.NotSet;
+
+        private Color _HeaderLineColor = Color.Empty;
+        private Color _HorizontalLineColor = Color.Empty;
+        private Color _VerticalLineColor = Color.Empty;
+        private Color _TreeLineColor = Color.Empty;
+
+        private TreeButtonVisualStyle _CircleTreeButtonStyle;
+        private TreeButtonVisualStyle _SquareTreeButtonStyle;
+        private TreeButtonVisualStyle _TriangleTreeButtonStyle;
+
+        private LinePattern _HeaderHLinePattern = LinePattern.NotSet;
+        private LinePattern _HeaderVLinePattern = LinePattern.NotSet;
+        private LinePattern _HorizontalLinePattern = LinePattern.NotSet;
+        private LinePattern _VerticalLinePattern = LinePattern.NotSet;
+        private LinePattern _TreeLinePattern = LinePattern.NotSet;
+        
+        #endregion
+
+        #region Hidden properties
+
+        #region BorderThickness
+
+        ///<summary>
+        /// Margin
+        ///</summary>
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public new Thickness BorderThickness
+        {
+            get { return (base.BorderThickness); }
+            set { base.BorderThickness = value; }
+        }
+
+        #endregion
+
+        #region Margin
+
+        ///<summary>
+        /// Margin
+        ///</summary>
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public new Padding Margin
+        {
+            get { return (base.Margin); }
+            set { base.Margin = value; }
+        }
+
+        #endregion
+
+        #region Padding
+
+        ///<summary>
+        /// Padding
+        ///</summary>
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public new Padding Padding
+        {
+            get { return (base.Padding); }
+            set { base.Padding = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Public properties
+
+        #region Alignment
+
+        /// <summary>
+        /// Gets or sets the alignment of the NoRowText within the panel
+        /// </summary>
+        [DefaultValue(Alignment.NotSet), Category("Appearance")]
+        [Description("Indicates the alignment of the NoRowText within the panel.")]
+        public Alignment Alignment
+        {
+            get { return (_Alignment); }
+
+            set
+            {
+                if (_Alignment != value)
+                {
+                    _Alignment = value;
+
+                    OnPropertyChangedEx("Alignment", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region AllowWrap
+
+        /// <summary>
+        /// Gets or sets whether text wrapping is permitted
+        /// </summary>
+        [DefaultValue(Tbool.NotSet), Category("Appearance")]
+        [Description("Indicates whether text wrapping is permitted.")]
+        public Tbool AllowWrap
+        {
+            get { return (_AllowWrap); }
+
+            set
+            {
+                if (_AllowWrap != value)
+                {
+                    _AllowWrap = value;
+
+                    OnPropertyChangedEx("AllowWrap", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region CircleTreeButtonStyle
+
+        /// <summary>
+        /// Gets or sets the Circle TreeButton Style
+        /// </summary>
+        [Category("Appearance")]
+        [Description("Indicates the Circle TreeButton Style.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public TreeButtonVisualStyle CircleTreeButtonStyle
+        {
+            get
+            {
+                if (_CircleTreeButtonStyle == null)
+                {
+                    _CircleTreeButtonStyle = TreeButtonVisualStyle.Empty;
+
+                    UpdateChangeHandler(null, _CircleTreeButtonStyle);
+                }
+
+                return (_CircleTreeButtonStyle);
+            }
+
+            set
+            {
+                if (_CircleTreeButtonStyle != value)
+                {
+                    UpdateChangeHandler(_CircleTreeButtonStyle, value);
+
+                    _CircleTreeButtonStyle = value;
+
+                    OnPropertyChangedEx("CircleTreeButtonStyle", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region HeaderLineColor
+
+        /// <summary>
+        /// Gets or sets the Header Line Color
+        /// </summary>
+        [Category("Appearance")]
+        [Description("Indicates the Header Line Color.")]
+        public Color HeaderLineColor
+        {
+            get { return (_HeaderLineColor); }
+
+            set
+            {
+                if (_HeaderLineColor != value)
+                {
+                    _HeaderLineColor = value;
+
+                    OnPropertyChangedEx("HeaderLineColor", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeHeaderLineColor()
+        {
+            return (_HeaderLineColor.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetHeaderLineColor()
+        {
+            _HeaderLineColor = Color.Empty;
+        }
+
+        #endregion
+
+        #region HeaderHLinePattern
+
+        /// <summary>
+        /// Gets or sets the Header Horizontal Line pattern
+        /// </summary>
+        [Category("Appearance"), DefaultValue(LinePattern.NotSet)]
+        [Description("Indicates the Header Line pattern.")]
+        public LinePattern HeaderHLinePattern
+        {
+            get { return (_HeaderHLinePattern); }
+
+            set
+            {
+                if (_HeaderHLinePattern != value)
+                {
+                    _HeaderHLinePattern = value;
+
+                    OnPropertyChangedEx("HeaderHLinePattern", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region HeaderVLinePattern
+
+        /// <summary>
+        /// Gets or sets the Header Vertical Line pattern
+        /// </summary>
+        [Category("Appearance"), DefaultValue(LinePattern.NotSet)]
+        [Description("Indicates the Header Line pattern.")]
+        public LinePattern HeaderVLinePattern
+        {
+            get { return (_HeaderVLinePattern); }
+
+            set
+            {
+                if (_HeaderVLinePattern != value)
+                {
+                    _HeaderVLinePattern = value;
+
+                    OnPropertyChangedEx("HeaderVLinePattern", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region HorizontalLineColor
+
+        /// <summary>
+        /// Gets or sets the Horizontal Line Color
+        /// </summary>
+        [Category("Appearance")]
+        [Description("Indicates the Horizontal Line Color.")]
+        public Color HorizontalLineColor
+        {
+            get { return (_HorizontalLineColor); }
+
+            set
+            {
+                if (_HorizontalLineColor != value)
+                {
+                    _HorizontalLineColor = value;
+
+                    OnPropertyChangedEx("HorizontalLineColor", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeHorizontalLineColor()
+        {
+            return (_HorizontalLineColor.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetHorizontalLineColor()
+        {
+            _HorizontalLineColor = Color.Empty;
+        }
+
+        #endregion
+
+        #region HorizontalLinePattern
+
+        /// <summary>
+        /// Gets or sets the Horizontal Line pattern
+        /// </summary>
+        [Category("Appearance"), DefaultValue(LinePattern.NotSet)]
+        [Description("Indicates the Horizontal Line pattern.")]
+        public LinePattern HorizontalLinePattern
+        {
+            get { return (_HorizontalLinePattern); }
+
+            set
+            {
+                if (_HorizontalLinePattern != value)
+                {
+                    _HorizontalLinePattern = value;
+
+                    OnPropertyChangedEx("HorizontalLinePattern", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region SquareTreeButtonStyle
+
+        /// <summary>
+        /// Gets or sets the Square TreeButton Style
+        /// </summary>
+        [Category("Appearance")]
+        [Description("Indicates the Square TreeButton Style.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public TreeButtonVisualStyle SquareTreeButtonStyle
+        {
+            get
+            {
+                if (_SquareTreeButtonStyle == null)
+                {
+                    _SquareTreeButtonStyle = TreeButtonVisualStyle.Empty;
+
+                    UpdateChangeHandler(null, _SquareTreeButtonStyle);
+                }
+
+                return (_SquareTreeButtonStyle);
+            }
+
+            set
+            {
+                if (_SquareTreeButtonStyle != value)
+                {
+                    UpdateChangeHandler(_SquareTreeButtonStyle, value);
+
+                    _SquareTreeButtonStyle = value;
+
+                    OnPropertyChangedEx("SquareTreeButtonStyle", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region TreeLineColor
+
+        /// <summary>
+        /// Gets or sets the Tree Line Color
+        /// </summary>
+        [Category("Appearance")]
+        [Description("Indicates the Tree Line Color.")]
+        public Color TreeLineColor
+        {
+            get { return (_TreeLineColor); }
+
+            set
+            {
+                if (_TreeLineColor != value)
+                {
+                    _TreeLineColor = value;
+
+                    OnPropertyChangedEx("TreeLineColor", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeTreeLineColor()
+        {
+            return (_TreeLineColor.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetTreeLineColor()
+        {
+            _TreeLineColor = Color.Empty;
+        }
+
+        #endregion
+
+        #region TreeLinePattern
+
+        /// <summary>
+        /// Gets or sets the Tree Line pattern
+        /// </summary>
+        [Category("Appearance"), DefaultValue(LinePattern.NotSet)]
+        [Description("Indicates the Tree Line pattern.")]
+        public LinePattern TreeLinePattern
+        {
+            get { return (_TreeLinePattern); }
+
+            set
+            {
+                if (_TreeLinePattern != value)
+                {
+                    _TreeLinePattern = value;
+
+                    OnPropertyChangedEx("TreeLinePattern", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region TriangleTreeButtonStyle
+
+        /// <summary>
+        /// Gets or sets the Triangle TreeButton Style
+        /// </summary>
+        [Category("Appearance")]
+        [Description("Indicates the Triangle TreeButton Style.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public TreeButtonVisualStyle TriangleTreeButtonStyle
+        {
+            get
+            {
+                if (_TriangleTreeButtonStyle == null)
+                {
+                    _TriangleTreeButtonStyle = TreeButtonVisualStyle.Empty;
+
+                    UpdateChangeHandler(null, _TriangleTreeButtonStyle);
+                }
+
+                return (_TriangleTreeButtonStyle);
+            }
+
+            set
+            {
+                if (_TriangleTreeButtonStyle != value)
+                {
+                    UpdateChangeHandler(_TriangleTreeButtonStyle, value);
+
+                    _TriangleTreeButtonStyle = value;
+
+                    OnPropertyChangedEx("TriangleTreeButtonStyle", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region VerticalLineColor
+
+        /// <summary>
+        /// Gets or sets the Vertical Line color
+        /// </summary>
+        [Category("Appearance")]
+        [Description("Indicates the Vertical Line Color.")]
+        public Color VerticalLineColor
+        {
+            get { return (_VerticalLineColor); }
+
+            set
+            {
+                if (_VerticalLineColor != value)
+                {
+                    _VerticalLineColor = value;
+
+                    OnPropertyChangedEx("VerticalLineColor", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeVerticalLineColor()
+        {
+            return (_VerticalLineColor.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetVerticalLineColor()
+        {
+            _VerticalLineColor = Color.Empty;
+        }
+
+        #endregion
+
+        #region VerticalLinePattern
+
+        /// <summary>
+        /// Gets or sets the Vertical Line pattern
+        /// </summary>
+        [Category("Appearance"), DefaultValue(LinePattern.NotSet)]
+        [Description("Indicates the Vertical Line pattern.")]
+        public LinePattern VerticalLinePattern
+        {
+            get { return (_VerticalLinePattern); }
+
+            set
+            {
+                if (_VerticalLinePattern != value)
+                {
+                    _VerticalLinePattern = value;
+
+                    OnPropertyChangedEx("VerticalLinePattern", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ApplyStyle
+
+        /// <summary>
+        /// Applies the style to instance of this style.
+        /// </summary>
+        /// <param name="style">Style to apply.</param>
+        public void ApplyStyle(GridPanelVisualStyle style)
+        {
+            if (style != null)
+            {
+                base.ApplyStyle(style);
+
+                if (style.Alignment != Alignment.NotSet)
+                    _Alignment = style.Alignment;
+
+                if (style.AllowWrap != Tbool.NotSet)
+                    _AllowWrap = style.AllowWrap;
+
+                if (style._CircleTreeButtonStyle != null)
+                    CircleTreeButtonStyle.ApplyStyle(style._CircleTreeButtonStyle);
+
+                if (style.HeaderLineColor.IsEmpty == false)
+                    _HeaderLineColor = style.HeaderLineColor;
+
+                if (style.TreeLineColor.IsEmpty == false)
+                    _TreeLineColor = style.TreeLineColor;
+
+                if (style.HorizontalLineColor.IsEmpty == false)
+                    _HorizontalLineColor = style.HorizontalLineColor;
+
+                if (style.VerticalLineColor.IsEmpty == false)
+                    _VerticalLineColor = style.VerticalLineColor;
+
+                if (style.TreeLinePattern != LinePattern.NotSet)
+                    TreeLinePattern = style.TreeLinePattern;
+
+                if (style.HorizontalLinePattern != LinePattern.NotSet)
+                    HorizontalLinePattern = style.HorizontalLinePattern;
+
+                if (style._SquareTreeButtonStyle != null)
+                    SquareTreeButtonStyle.ApplyStyle(style._SquareTreeButtonStyle);
+
+                if (style._TriangleTreeButtonStyle != null)
+                    TriangleTreeButtonStyle.ApplyStyle(style._TriangleTreeButtonStyle);
+                
+                if (style.VerticalLinePattern != LinePattern.NotSet)
+                    VerticalLinePattern = style.VerticalLinePattern;
+
+                if (style.HeaderHLinePattern != LinePattern.NotSet)
+                    HeaderHLinePattern = style.HeaderHLinePattern;
+
+                if (style.HeaderVLinePattern != LinePattern.NotSet)
+                    HeaderVLinePattern = style.HeaderVLinePattern;
+            }
+        }
+
+        #endregion
+
+        #region GetTextFormatFlags
+
+        internal eTextFormat GetTextFormatFlags()
+        {
+            eTextFormat tf = eTextFormat.WordEllipsis |
+                eTextFormat.NoPadding | eTextFormat.NoPrefix;
+
+            if (AllowWrap == Tbool.True)
+                tf |= eTextFormat.WordBreak;
+
+            switch (Alignment)
+            {
+                case Alignment.TopCenter:
+                    tf |= eTextFormat.HorizontalCenter;
+                    break;
+
+                case Alignment.TopRight:
+                    tf |= eTextFormat.Right;
+                    break;
+
+                case Alignment.MiddleLeft:
+                    tf |= eTextFormat.VerticalCenter;
+                    break;
+
+                case Alignment.NotSet:
+                case Alignment.MiddleCenter:
+                    tf |= eTextFormat.HorizontalCenter;
+                    tf |= eTextFormat.VerticalCenter;
+                    break;
+
+                case Alignment.MiddleRight:
+                    tf |= eTextFormat.Right;
+                    tf |= eTextFormat.VerticalCenter;
+                    break;
+
+                case Alignment.BottomLeft:
+                    tf |= eTextFormat.Bottom;
+                    break;
+
+                case Alignment.BottomCenter:
+                    tf |= eTextFormat.Bottom;
+                    tf |= eTextFormat.HorizontalCenter;
+                    break;
+
+                case Alignment.BottomRight:
+                    tf |= eTextFormat.Bottom;
+                    tf |= eTextFormat.Right;
+                    break;
+            }
+
+            return (tf);
+        }
+
+        #endregion
+
+        #region Copy
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public new GridPanelVisualStyle Copy()
+        {
+            GridPanelVisualStyle style = new GridPanelVisualStyle();
+
+            CopyTo(style);
+
+            return (style);
+        }
+
+        #endregion
+
+        #region CopyTo
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public void CopyTo(GridPanelVisualStyle copy)
+        {
+            base.CopyTo(copy);
+
+            copy.Alignment = _Alignment;
+            copy.AllowWrap = _AllowWrap;
+
+            copy.HeaderLineColor = _HeaderLineColor;
+            copy.TreeLineColor = _TreeLineColor;
+            copy.HorizontalLineColor = _HorizontalLineColor;
+            copy.VerticalLineColor = _VerticalLineColor;
+
+            copy.TreeLinePattern = _TreeLinePattern;
+            copy.HorizontalLinePattern = _HorizontalLinePattern;
+            copy.VerticalLinePattern = _VerticalLinePattern;
+            copy.HeaderHLinePattern = _HeaderHLinePattern;
+            copy.HeaderVLinePattern = _HeaderVLinePattern;
+
+            if (_CircleTreeButtonStyle != null)
+                copy.CircleTreeButtonStyle = _CircleTreeButtonStyle.Copy();
+
+            if (_SquareTreeButtonStyle != null)
+                copy.SquareTreeButtonStyle = _SquareTreeButtonStyle.Copy();
+
+            if (_TriangleTreeButtonStyle != null)
+                copy.TriangleTreeButtonStyle = _TriangleTreeButtonStyle.Copy();
+        }
+
+        #endregion
+
+        #region IDisposable
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        public override void Dispose()
+        {
+            CircleTreeButtonStyle = null;
+            SquareTreeButtonStyle = null;
+            TriangleTreeButtonStyle = null;
+
+            base.Dispose();
+        }
+
+        #endregion
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/Style/GroupByVisualStyles.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/Style/GroupByVisualStyles.cs
new file mode 100644
index 00000000..91a0fb37
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/Style/GroupByVisualStyles.cs	
@@ -0,0 +1,478 @@
+using System.ComponentModel;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.SuperGrid.Style
+{
+    ///<summary>
+    /// FilterRowVisualStyles
+    ///</summary>
+    [TypeConverter(typeof(VisualStylesConverter))]
+    public class GroupByVisualStyles : VisualStyles<GroupByVisualStyle>
+    {
+    }
+
+    ///<summary>
+    /// FilterRowVisualStyle
+    ///</summary>
+    [TypeConverter(typeof(VisualStylesConverter))]
+    public class GroupByVisualStyle : TextRowVisualStyle
+    {
+        #region Private variables
+
+        private Color _GroupBoxBorderColor = Color.Empty;
+        private Color _GroupBoxConnectorColor = Color.Empty;
+        private Color _GroupBoxTextColor = Color.Empty;
+        private Background _GroupBoxBackground;
+
+        private Color _WatermarkTextColor = Color.Empty;
+        private Font _WatermarkFont;
+
+        private Background _InsertMarkerBackground;
+        private Color _InsertMarkerBorderColor = Color.Empty;
+
+        #endregion
+
+        #region Public properties
+
+        #region GroupBoxBorderColor
+
+        /// <summary>
+        /// Gets or sets the GroupBox border color
+        /// </summary>
+        [Description("Indicates the GroupBox border color")]
+        public Color GroupBoxBorderColor
+        {
+            get { return (_GroupBoxBorderColor); }
+
+            set
+            {
+                if (_GroupBoxBorderColor != value)
+                {
+                    _GroupBoxBorderColor = value;
+
+                    OnPropertyChangedEx("GroupBoxBorderColor", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeGroupBoxBorderColor()
+        {
+            return (_GroupBoxBorderColor.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetGroupBoxBorderColor()
+        {
+            _GroupBoxBorderColor = Color.Empty;
+        }
+
+        #endregion
+
+        #region GroupBoxConnectorColor
+
+        /// <summary>
+        /// Gets or sets the GroupBox connector color
+        /// </summary>
+        [Description("Indicates the GroupBox connector color")]
+        public Color GroupBoxConnectorColor
+        {
+            get { return (_GroupBoxConnectorColor); }
+
+            set
+            {
+                if (_GroupBoxConnectorColor != value)
+                {
+                    _GroupBoxConnectorColor = value;
+
+                    OnPropertyChangedEx("GroupBoxConnectorColor", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeGroupBoxConnectorColor()
+        {
+            return (_GroupBoxBorderColor.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetGroupBoxConnectorColor()
+        {
+            _GroupBoxBorderColor = Color.Empty;
+        }
+
+        #endregion
+
+        #region GroupBoxBackground
+
+        /// <summary>
+        /// Gets or sets the GroupBox indicator background
+        /// </summary>
+        [Description("Indicates the RowHeader indicator background.")]
+        public Background GroupBoxBackground
+        {
+            get
+            {
+                if (_GroupBoxBackground == null)
+                {
+                    _GroupBoxBackground = Background.Empty;
+
+                    UpdateChangeHandler(null, _GroupBoxBackground);
+                }
+
+                return (_GroupBoxBackground);
+            }
+
+            set
+            {
+                if (_GroupBoxBackground != value)
+                {
+                    UpdateChangeHandler(_GroupBoxBackground, value);
+
+                    _GroupBoxBackground = value;
+
+                    OnPropertyChangedEx("GroupBoxBackground", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeGroupBoxBackground()
+        {
+            return (_GroupBoxBackground != null &&
+                _GroupBoxBackground.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetGroupBoxBackground()
+        {
+            GroupBoxBackground = null;
+        }
+
+        #endregion
+
+        #region GroupBoxTextColor
+
+        /// <summary>
+        /// Gets or sets the GroupBox Text color
+        /// </summary>
+        [Description("Indicates the GroupBox Text color")]
+        public Color GroupBoxTextColor
+        {
+            get { return (_GroupBoxTextColor); }
+
+            set
+            {
+                if (_GroupBoxTextColor != value)
+                {
+                    _GroupBoxTextColor = value;
+
+                    OnPropertyChangedEx("GroupBoxTextColor", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeGroupBoxTextColor()
+        {
+            return (_GroupBoxTextColor.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetGroupBoxTextColor()
+        {
+            _GroupBoxTextColor = Color.Empty;
+        }
+
+        #endregion
+
+        #region InsertMarkerBackground
+
+        /// <summary>
+        /// Gets or sets the Insert Marker background color
+        /// </summary>
+        [Description("Indicates the Insert Marker background color")]
+        public Background InsertMarkerBackground
+        {
+            get
+            {
+                if (_InsertMarkerBackground == null)
+                {
+                    _InsertMarkerBackground = Background.Empty;
+
+                    UpdateChangeHandler(null, _InsertMarkerBackground);
+                }
+
+                return (_InsertMarkerBackground);
+            }
+
+            set
+            {
+                if (_InsertMarkerBackground != value)
+                {
+                    UpdateChangeHandler(_InsertMarkerBackground, value);
+
+                    _InsertMarkerBackground = value;
+
+                    OnPropertyChangedEx("InsertMarkerBackground", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeInsertMarkerBackground()
+        {
+            return (_InsertMarkerBackground != null &&
+                _InsertMarkerBackground.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetInsertMarkerBackground()
+        {
+            InsertMarkerBackground = null;
+        }
+
+        #endregion
+
+        #region InsertMarkerBorderColor
+
+        /// <summary>
+        /// Gets or sets the Insert Marker border color
+        /// </summary>
+        [Description("Indicates the Insert Marker border color")]
+        public Color InsertMarkerBorderColor
+        {
+            get { return (_InsertMarkerBorderColor); }
+
+            set
+            {
+                if (_InsertMarkerBorderColor != value)
+                {
+                    _InsertMarkerBorderColor = value;
+
+                    OnPropertyChangedEx("InsertMarkerBorderColor", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeInsertMarkerBorderColor()
+        {
+            return (_InsertMarkerBorderColor.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetInsertMarkerBorderColor()
+        {
+            _InsertMarkerBorderColor = Color.Empty;
+        }
+
+        #endregion
+
+        #region WatermarkFont
+
+        /// <summary>
+        /// Gets or sets the style Watermark Font
+        /// </summary>
+        [DefaultValue(null)]
+        [Description("Indicates the style Watermark Font")]
+        public Font WatermarkFont
+        {
+            get { return (_WatermarkFont); }
+
+            set
+            {
+                if (_WatermarkFont != value)
+                {
+                    _WatermarkFont = value;
+
+                    OnPropertyChangedEx("WatermarkFont", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region WatermarkTextColor
+
+        /// <summary>
+        /// Gets or sets the Watermark Text color
+        /// </summary>
+        [Description("Indicates the Watermark Text color")]
+        public Color WatermarkTextColor
+        {
+            get { return (_WatermarkTextColor); }
+
+            set
+            {
+                if (_WatermarkTextColor != value)
+                {
+                    _WatermarkTextColor = value;
+
+                    OnPropertyChangedEx("WatermarkTextColor", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeWatermarkTextColor()
+        {
+            return (_WatermarkTextColor.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetWatermarkTextColor()
+        {
+            _WatermarkTextColor = Color.Empty;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ApplyStyle
+
+        /// <summary>
+        /// Applies the style to instance of this style.
+        /// </summary>
+        /// <param name="style">Style to apply.</param>
+        public void ApplyStyle(GroupByVisualStyle style)
+        {
+            if (style != null)
+            {
+                base.ApplyStyle(style);
+
+                if (style.GroupBoxBorderColor.IsEmpty == false)
+                    GroupBoxBorderColor = style.GroupBoxBorderColor;
+
+                if (style.GroupBoxConnectorColor.IsEmpty == false)
+                    GroupBoxConnectorColor = style.GroupBoxConnectorColor;
+
+                if (style.GroupBoxTextColor.IsEmpty == false)
+                    GroupBoxTextColor = style.GroupBoxTextColor;
+
+                if (style.GroupBoxBackground != null && style.GroupBoxBackground.IsEmpty == false)
+                    GroupBoxBackground = style.GroupBoxBackground.Copy();
+
+                if (style.InsertMarkerBorderColor.IsEmpty == false)
+                    InsertMarkerBorderColor = style.InsertMarkerBorderColor;
+
+                if (style.InsertMarkerBackground != null && style.InsertMarkerBackground.IsEmpty == false)
+                    InsertMarkerBackground = style.InsertMarkerBackground.Copy();
+
+                if (style.WatermarkTextColor.IsEmpty == false)
+                    WatermarkTextColor = style.WatermarkTextColor;
+
+                if (style.WatermarkFont != null)
+                    WatermarkFont = style.WatermarkFont;
+            }
+        }
+
+        #endregion
+
+        #region Copy
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public new FilterRowVisualStyle Copy()
+        {
+            FilterRowVisualStyle copy = new FilterRowVisualStyle();
+
+            CopyTo(copy);
+
+            return (copy);
+        }
+
+        #endregion
+
+        #region CopyTo
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public void CopyTo(GroupByVisualStyle copy)
+        {
+            base.CopyTo(copy);
+
+            copy.GroupBoxBorderColor = _GroupBoxBorderColor;
+            copy.GroupBoxTextColor = _GroupBoxTextColor;
+            copy.GroupBoxConnectorColor = _GroupBoxConnectorColor;
+
+            if (_GroupBoxBackground != null)
+                copy.GroupBoxBackground = _GroupBoxBackground.Copy();
+
+            copy.InsertMarkerBorderColor = _InsertMarkerBorderColor;
+
+            if (_InsertMarkerBackground != null)
+                copy.InsertMarkerBackground = _InsertMarkerBackground.Copy();
+
+            copy.WatermarkTextColor = _WatermarkTextColor;
+
+            if (_WatermarkFont != null)
+                copy.Font = (Font)_WatermarkFont.Clone();
+        }
+
+        #endregion
+
+        #region IDisposable
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        public override void Dispose()
+        {
+            GroupBoxBackground = null;
+            InsertMarkerBackground = null;
+
+            base.Dispose();
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/Style/GroupHeaderVisualStyle.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/Style/GroupHeaderVisualStyle.cs
new file mode 100644
index 00000000..86328318
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/Style/GroupHeaderVisualStyle.cs	
@@ -0,0 +1,500 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.SuperGrid.Style
+{
+    ///<summary>
+    /// GroupHeaderVisualStyles
+    ///</summary>
+    public class GroupHeaderVisualStyles : VisualStyles<GroupHeaderVisualStyle>
+    {
+    }
+
+    ///<summary>
+    /// RowHeaderVisualStyle
+    ///</summary>
+    public class GroupHeaderVisualStyle : BaseVisualStyle
+    {
+        #region Static data
+
+        ///<summary>
+        /// Empty
+        ///</summary>
+        public static GroupHeaderVisualStyle Empty
+        {
+            get { return (new GroupHeaderVisualStyle()); }
+        }
+
+        #endregion
+
+        #region Private variables
+
+        private Font _Font;
+        private Alignment _Alignment = Alignment.NotSet;
+        private Tbool _AllowWrap = Tbool.NotSet;
+        private Color _TextColor = Color.Empty;
+        private Color _UnderlineColor = Color.Empty;
+        private Background _Background;
+        private Padding _Padding;
+
+        private RowHeaderVisualStyle _RowHeaderStyle;
+
+        #endregion
+
+        #region Public properties
+
+        #region Alignment
+
+        /// <summary>
+        /// Gets or sets the alignment of the content within the cell
+        /// </summary>
+        [DefaultValue(Alignment.NotSet), Category("Appearance")]
+        [Description("Indicates the alignment of the content.")]
+        public Alignment Alignment
+        {
+            get { return (_Alignment); }
+
+            set
+            {
+                if (_Alignment != value)
+                {
+                    _Alignment = value;
+
+                    OnPropertyChangedEx("Alignment", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region AllowWrap
+
+        /// <summary>
+        /// Gets or sets whether text wrapping is permitted
+        /// </summary>
+        [DefaultValue(Tbool.NotSet), Category("Appearance")]
+        [Description("Indicates whether text wrapping is permitted")]
+        public Tbool AllowWrap
+        {
+            get { return (_AllowWrap); }
+
+            set
+            {
+                if (_AllowWrap != value)
+                {
+                    _AllowWrap = value;
+
+                    OnPropertyChangedEx("AllowWrap", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region Background
+
+        /// <summary>
+        /// Gets or sets the style background.
+        /// </summary>
+        [Description("Indicates the style background")]
+        public Background Background
+        {
+            get
+            {
+                if (_Background == null)
+                {
+                    _Background = Background.Empty;
+
+                    UpdateChangeHandler(null, _Background);
+                }
+
+                return (_Background);
+            }
+
+            set
+            {
+                if (_Background != value)
+                {
+                    UpdateChangeHandler(_Background, value);
+
+                    _Background = value;
+
+                    OnPropertyChangedEx("Background", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeBackground()
+        {
+            return (_Background != null && _Background.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetBackground()
+        {
+            Background = null;
+        }
+
+        #endregion
+
+        #region Font
+
+        /// <summary>
+        /// Gets or sets the style Font.
+        /// </summary>
+        [DefaultValue(null)]
+        [Description("Indicates the style Font")]
+        public Font Font
+        {
+            get { return (_Font); }
+
+            set
+            {
+                if (_Font != value)
+                {
+                    _Font = value;
+
+                    OnPropertyChangedEx("Font", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region Padding
+
+        /// <summary>
+        /// Gets or sets the spacing between the content and edges of the element
+        /// </summary>
+        [Description("Indicates the spacing between the content and edges of the element")]
+        public Padding Padding
+        {
+            get
+            {
+                if (_Padding == null)
+                {
+                    _Padding = Padding.Empty;
+
+                    UpdateChangeHandler(null, _Padding);
+                }
+
+                return (_Padding);
+            }
+
+            set
+            {
+                if (_Padding != value)
+                {
+                    UpdateChangeHandler(_Padding, value);
+                    
+                    _Padding = value;
+
+                    OnPropertyChangedEx("Padding", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializePadding()
+        {
+            return (_Padding != null && _Padding.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetPadding()
+        {
+            Padding = null;
+        }
+        #endregion
+
+        #region RowHeaderStyle
+
+        /// <summary>
+        /// Gets or sets the GroupHeader RowHeader Style
+        /// </summary>
+        [Category("Appearance")]
+        [Description("Indicates the GroupHeader RowHeader Style")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public RowHeaderVisualStyle RowHeaderStyle
+        {
+            get
+            {
+                if (_RowHeaderStyle == null)
+                {
+                    _RowHeaderStyle = RowHeaderVisualStyle.Empty;
+
+                    UpdateChangeHandler(null, _RowHeaderStyle);
+                }
+
+                return (_RowHeaderStyle);
+            }
+
+            set
+            {
+                if (_RowHeaderStyle != value)
+                {
+                    UpdateChangeHandler(_RowHeaderStyle, value);
+
+                    _RowHeaderStyle = value;
+
+                    OnPropertyChangedEx("RowHeaderStyle", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #region TextColor
+
+        /// <summary>
+        /// Gets or sets the Text color
+        /// </summary>
+        [Category("Appearance"), Description("Indicates the Text color")]
+        public Color TextColor
+        {
+            get { return (_TextColor); }
+
+            set
+            {
+                if (_TextColor != value)
+                {
+                    _TextColor = value;
+
+                    OnPropertyChangedEx("TextColor", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeTextColor()
+        {
+            return (_TextColor.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetTextColor()
+        {
+            _TextColor = Color.Empty;
+        }
+
+        #endregion
+
+        #region UnderlineColor
+
+        /// <summary>
+        /// Gets or sets the text Underline Color
+        /// </summary>
+        [Description("Indicates the text Underline Color")]
+        public Color UnderlineColor
+        {
+            get { return (_UnderlineColor); }
+
+            set
+            {
+                if (_UnderlineColor != value)
+                {
+                    _UnderlineColor = value;
+
+                    OnPropertyChangedEx("UnderlineColor", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeUnderlineColor()
+        {
+            return (_UnderlineColor.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetUnderlineColor()
+        {
+            _UnderlineColor = Color.Empty;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ApplyStyle
+
+        /// <summary>
+        /// Applies the style to instance of this style.
+        /// </summary>
+        /// <param name="style">Style to apply.</param>
+        public void ApplyStyle(GroupHeaderVisualStyle style)
+        {
+            base.ApplyStyle(style);
+
+            if (style.Alignment != Alignment.NotSet)
+                Alignment = style.Alignment;
+
+            if (style.AllowWrap != Tbool.NotSet)
+                AllowWrap = style.AllowWrap;
+
+            if (style._Background != null && style._Background.IsEmpty == false)
+                Background = style._Background.Copy();
+
+            if (style.Font != null)
+                Font = style.Font;
+
+            if (style._Padding != null && style._Padding.IsEmpty == false)
+                Padding = style._Padding.Copy();
+
+            if (style.TextColor.IsEmpty == false)
+                TextColor = style.TextColor;
+
+            if (style.UnderlineColor.IsEmpty == false)
+                UnderlineColor = style.UnderlineColor;
+
+            if (style._RowHeaderStyle != null)
+                RowHeaderStyle.ApplyStyle(style._RowHeaderStyle);
+        }
+
+        #endregion
+
+        #region GetTextFormatFlags
+
+        internal eTextFormat GetTextFormatFlags()
+        {
+            eTextFormat tf = eTextFormat.WordEllipsis |
+                eTextFormat.NoPadding | eTextFormat.NoPrefix;
+
+            if (AllowWrap == Tbool.True)
+                tf |= eTextFormat.WordBreak;
+
+            switch (Alignment)
+            {
+                case Alignment.TopCenter:
+                    tf |= eTextFormat.HorizontalCenter;
+                    break;
+
+                case Alignment.TopRight:
+                    tf |= eTextFormat.Right;
+                    break;
+
+                case Alignment.MiddleLeft:
+                    tf |= eTextFormat.VerticalCenter;
+                    break;
+
+                case Alignment.MiddleCenter:
+                    tf |= eTextFormat.HorizontalCenter;
+                    tf |= eTextFormat.VerticalCenter;
+                    break;
+
+                case Alignment.MiddleRight:
+                    tf |= eTextFormat.Right;
+                    tf |= eTextFormat.VerticalCenter;
+                    break;
+
+                case Alignment.BottomLeft:
+                    tf |= eTextFormat.Bottom;
+                    break;
+
+                case Alignment.BottomCenter:
+                    tf |= eTextFormat.Bottom;
+                    tf |= eTextFormat.HorizontalCenter;
+                    break;
+
+                case Alignment.BottomRight:
+                    tf |= eTextFormat.Bottom;
+                    tf |= eTextFormat.Right;
+                    break;
+            }
+
+            return (tf);
+        }
+
+        #endregion
+
+        #region Copy
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public new GroupHeaderVisualStyle Copy()
+        {
+            GroupHeaderVisualStyle copy = new GroupHeaderVisualStyle();
+
+            CopyTo(copy);
+
+            return (copy);
+        }
+
+        #endregion
+
+        #region CopyTo
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public void CopyTo(GroupHeaderVisualStyle copy)
+        {
+            base.CopyTo(copy);
+
+            copy.Alignment = _Alignment;
+            copy.AllowWrap = _AllowWrap;
+
+            if (_Background != null)
+                copy.Background = _Background.Copy();
+
+            if (_Font != null)
+                copy.Font = (Font)_Font.Clone();
+
+            if (_Padding != null)
+                copy.Padding = _Padding.Copy();
+
+            copy.TextColor = _TextColor;
+            copy.UnderlineColor = _UnderlineColor;
+
+            if (_RowHeaderStyle != null)
+                copy.RowHeaderStyle = _RowHeaderStyle.Copy();
+        }
+
+        #endregion
+
+        #region IDisposable
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        public override void Dispose()
+        {
+            Background = null;
+            Padding = null;
+            RowHeaderStyle = null;
+
+            base.Dispose();
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/Style/Padding.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/Style/Padding.cs
new file mode 100644
index 00000000..362e1f4e
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/Style/Padding.cs	
@@ -0,0 +1,227 @@
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+
+namespace DevComponents.DotNetBar.SuperGrid.Style
+{
+    ///<summary>
+    /// Padding
+    ///</summary>
+    [TypeConverter(typeof(PaddingTypeConverter))]
+    public class Padding : Thickness
+    {
+        #region Static data
+
+        /// <summary>
+        /// Returns Empty instance of Thickness.
+        /// </summary>
+        public new static Padding Empty
+        {
+            get { return (new Padding()); }
+        }
+
+        #endregion
+
+        #region Constructors
+
+        /// <summary>
+        /// Creates new instance of the class and initializes it.
+        /// </summary>
+        /// <param name="left">Left padding</param>
+        /// <param name="right">Right padding</param>
+        /// <param name="top">Top padding</param>
+        /// <param name="bottom">Bottom padding</param>
+        public Padding(int left, int top, int right, int bottom)
+            : base(left, top, right, bottom)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the Padding class.
+        /// </summary>
+        /// <param name="all">Uniform padding.</param>
+        public Padding(int all)
+            : base(all)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the Padding class.
+        /// </summary>
+        public Padding()
+        {
+        }
+
+        #endregion
+
+        #region Copy
+
+        /// <summary>
+        /// Creates an exact copy of the Padding.
+        /// </summary>
+        /// <returns>Copy of the Padding.</returns>
+        public new Padding Copy()
+        {
+            Padding copy = new Padding(Left, Top, Right, Bottom);
+
+            return (copy);
+        }
+
+        #endregion
+    }
+
+    #region PaddingTypeConverter
+
+    ///<summary>
+    /// PaddingTypeConverter
+    ///</summary>
+    public class PaddingTypeConverter : ExpandableObjectConverter
+    {
+        #region CanConvertTo
+
+        /// <summary>
+        /// CanConvertTo
+        /// </summary>
+        /// <param name="context"></param>
+        /// <param name="destinationType"></param>
+        /// <returns></returns>
+        public override bool CanConvertTo(
+            ITypeDescriptorContext context, Type destinationType)
+        {
+            if (destinationType == typeof(string))
+                return (true);
+
+            return (base.CanConvertTo(context, destinationType));
+        }
+
+        #endregion
+
+        #region ConvertTo
+
+        /// <summary>
+        /// ConvertTo
+        /// </summary>
+        /// <param name="context"></param>
+        /// <param name="culture"></param>
+        /// <param name="value"></param>
+        /// <param name="destinationType"></param>
+        /// <returns></returns>
+        public override object ConvertTo(
+            ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+        {
+            if (destinationType == typeof(string))
+            {
+                Padding p = value as Padding;
+
+                if (p != null)
+                {
+                    if (p.IsUniform == true)
+                        return (p.Left.ToString());
+
+                    return (String.Format("{0:d}, {1:d}, {2:d}, {3:d}",
+                        p.Bottom, p.Left, p.Right, p.Top));
+                }
+            }
+
+            return (base.ConvertTo(context, culture, value, destinationType));
+        }
+
+        #endregion
+
+        #region CanConvertFrom
+
+        /// <summary>
+        /// CanConvertFrom
+        /// </summary>
+        /// <param name="context"></param>
+        /// <param name="sourceType"></param>
+        /// <returns></returns>
+        public override bool CanConvertFrom(
+            ITypeDescriptorContext context, Type sourceType)
+        {
+            if (sourceType == typeof(string))
+                return (true);
+
+            return (base.CanConvertFrom(context, sourceType));
+        }
+
+        #endregion
+
+        #region ConvertFrom
+
+        /// <summary>
+        /// ConvertFrom
+        /// </summary>
+        /// <param name="context"></param>
+        /// <param name="culture"></param>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public override object ConvertFrom(
+            ITypeDescriptorContext context, CultureInfo culture, object value)
+        {
+            if (value is string)
+            {
+                string[] values = ((string)value).Split(',');
+
+                if (values.Length != 1 && values.Length != 4)
+                    throw new ArgumentException("Invalid value to convert.");
+
+                try
+                {
+                    int[] v = new int[values.Length];
+
+                    for (int i = 0; i < values.Length; i++)
+                        v[i] = int.Parse(values[i]);
+
+                    Padding p = (values.Length == 1)
+                        ? new Padding(v[0])
+                        : new Padding(v[1], v[3], v[2], v[0]);
+
+                    return (p);
+                }
+                catch (Exception)
+                {
+                    throw new ArgumentException("Invalid value to convert.");
+                }
+            }
+
+            return base.ConvertFrom(context, culture, value);
+        }
+
+        #endregion
+
+        #region GetCreateInstanceSupported
+
+        /// <summary>
+        /// GetCreateInstanceSupported
+        /// </summary>
+        /// <param name="context"></param>
+        /// <returns></returns>
+        public override bool GetCreateInstanceSupported(ITypeDescriptorContext context)
+        {
+            return (true);
+        }
+
+        #endregion
+
+        #region CreateInstance
+
+        /// <summary>
+        /// CreateInstance
+        /// </summary>
+        /// <param name="context"></param>
+        /// <param name="propertyValues"></param>
+        /// <returns></returns>
+        public override object CreateInstance(
+            ITypeDescriptorContext context, IDictionary propertyValues)
+        {
+            return (new Padding((int)propertyValues["Left"], (int)propertyValues["Top"],
+                (int)propertyValues["Right"], (int)propertyValues["Bottom"]));
+        }
+
+        #endregion
+    }
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/Style/RowHeaderVisualStyle.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/Style/RowHeaderVisualStyle.cs
new file mode 100644
index 00000000..920ef83d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/Style/RowHeaderVisualStyle.cs	
@@ -0,0 +1,609 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Drawing.Drawing2D;
+using System.IO;
+using System.Reflection;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.SuperGrid.Style
+{
+    ///<summary>
+    /// RowHeaderVisualStyle
+    ///</summary>
+    public class RowHeaderVisualStyle : BaseRowHeaderVisualStyle
+    {
+        #region Static data
+
+        static Image _ActiveRowImageCache;
+        static Image _EditingRowImageCache;
+        static Image _InfoRowImageCache;
+
+        ///<summary>
+        /// Empty
+        ///</summary>
+        public new static RowHeaderVisualStyle Empty
+        {
+            get { return (new RowHeaderVisualStyle()); }
+        }
+
+        #endregion
+
+        #region Private variables
+
+        private Background _ActiveRowBackground;
+        private Background _DirtyMarkerBackground;
+
+        private Color _ActiveRowIndicatorColor = Color.Empty;
+
+        private Image _ActiveRowImage;
+        private int _ActiveRowImageIndex = -1;
+
+        private Image _EditingRowImage;
+        private int _EditingRowImageIndex = -1;
+
+        private Image _InfoRowImage;
+        private int _InfoRowImageIndex = -1;
+
+        #endregion
+
+        #region Public properties
+
+        #region ActiveRowBackground
+
+        /// <summary>
+        /// Gets or sets the ActiveRow background
+        /// </summary>
+        [Description("Indicates the ActiveRow background")]
+        public Background ActiveRowBackground
+        {
+            get
+            {
+                if (_ActiveRowBackground == null)
+                {
+                    _ActiveRowBackground = Background.Empty;
+
+                    UpdateChangeHandler(null, _ActiveRowBackground);
+                }
+
+                return (_ActiveRowBackground);
+            }
+
+            set
+            {
+                if (_ActiveRowBackground != value)
+                {
+                    UpdateChangeHandler(_ActiveRowBackground, value);
+
+                    _ActiveRowBackground = value;
+
+                    OnPropertyChangedEx("ActiveRowBackground", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeActiveRowBackground()
+        {
+            return (_ActiveRowBackground != null && _ActiveRowBackground.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetActiveRowBackground()
+        {
+            ActiveRowBackground = null;
+        }
+
+        #endregion
+
+        #region ActiveRowImage
+
+        /// <summary>
+        /// Gets or sets the Active Row Image
+        /// </summary>
+        [DefaultValue(null), Category("Appearance")]
+        [Description("Indicates the Active Row image")]
+        public Image ActiveRowImage
+        {
+            get { return (_ActiveRowImage); }
+
+            set
+            {
+                if (_ActiveRowImage != value)
+                {
+                    _ActiveRowImage = value;
+
+                    OnPropertyChangedEx("ActiveRowImage", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ActiveRowImageIndex
+
+        /// <summary>
+        /// Gets or sets the Active Row image index
+        /// </summary>
+        [Browsable(true), DefaultValue(-1)]
+        [Category("Appearance"), Description("Indicates the Active Row image index")]
+        [Editor("DevComponents.SuperGrid.Design.ImageIndexEditor, DevComponents.SuperGrid.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=26d81176cfa2b486", typeof(UITypeEditor))]
+        [TypeConverter(typeof(ImageIndexConverter))]
+        public int ActiveRowImageIndex
+        {
+            get { return (_ActiveRowImageIndex); }
+
+            set
+            {
+                if (_ActiveRowImageIndex != value)
+                {
+                    _ActiveRowImageIndex = value;
+
+                    OnPropertyChangedEx("ActiveRowImageIndex", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        [Browsable(false)]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetActiveRowImageIndex()
+        {
+            _ActiveRowImageIndex = -1;
+        }
+
+        #endregion
+
+        #region ActiveRowIndicatorColor
+
+        /// <summary>
+        /// Gets or sets the Active Row Indicator color
+        /// </summary>
+        [Description("Indicates the Active Row Indicator color")]
+        public Color ActiveRowIndicatorColor
+        {
+            get { return (_ActiveRowIndicatorColor); }
+
+            set
+            {
+                if (_ActiveRowIndicatorColor != value)
+                {
+                    _ActiveRowIndicatorColor = value;
+
+                    OnPropertyChangedEx("ActiveRowIndicatorColor", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeActiveRowIndicatorColor()
+        {
+            return (_ActiveRowIndicatorColor.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetActiveRowIndicatorColor()
+        {
+            _ActiveRowIndicatorColor = Color.Empty;
+        }
+
+        #endregion
+
+        #region DirtyMarkerBackground
+
+        /// <summary>
+        /// Gets or sets the DirtyRow marker background
+        /// </summary>
+        [Description("Indicates the DirtyRow marker background")]
+        public Background DirtyMarkerBackground
+        {
+            get
+            {
+                if (_DirtyMarkerBackground == null)
+                {
+                    _DirtyMarkerBackground = Background.Empty;
+
+                    UpdateChangeHandler(null, _DirtyMarkerBackground);
+                }
+
+                return (_DirtyMarkerBackground);
+            }
+
+            set
+            {
+                if (_DirtyMarkerBackground != value)
+                {
+                    UpdateChangeHandler(_DirtyMarkerBackground, value);
+
+                    _DirtyMarkerBackground = value;
+
+                    OnPropertyChangedEx("DirtyMarkerBackground", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeDirtyMarkerBackground()
+        {
+            return (_DirtyMarkerBackground != null && _DirtyMarkerBackground.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetDirtyMarkerBackground()
+        {
+            DirtyMarkerBackground = null;
+        }
+
+        #endregion
+
+        #region EditingRowImage
+
+        /// <summary>
+        /// Gets or sets the Editing Row Image
+        /// </summary>
+        [DefaultValue(null), Category("Appearance")]
+        [Description("Indicates the Editing Row image")]
+        public Image EditingRowImage
+        {
+            get { return (_EditingRowImage); }
+
+            set
+            {
+                if (_EditingRowImage != value)
+                {
+                    _EditingRowImage = value;
+
+                    OnPropertyChangedEx("EditingRowImage", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region EditingRowImageIndex
+
+        /// <summary>
+        /// Gets or sets the Editing Row image index
+        /// </summary>
+        [Browsable(true), DefaultValue(-1)]
+        [Category("Appearance"), Description("Indicates the Editing Row image index")]
+        [Editor("DevComponents.SuperGrid.Design.ImageIndexEditor, DevComponents.SuperGrid.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=26d81176cfa2b486", typeof(UITypeEditor))]
+        [TypeConverter(typeof(ImageIndexConverter))]
+        public int EditingRowImageIndex
+        {
+            get { return (_EditingRowImageIndex); }
+
+            set
+            {
+                if (_EditingRowImageIndex != value)
+                {
+                    _EditingRowImageIndex = value;
+
+                    OnPropertyChangedEx("EditingRowImageIndex", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        [Browsable(false)]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetEditingRowImageIndex()
+        {
+            _EditingRowImageIndex = -1;
+        }
+
+        #endregion
+
+        #region InfoRowImage
+
+        /// <summary>
+        /// Gets or sets the Info Row Image
+        /// </summary>
+        [DefaultValue(null), Category("Appearance")]
+        [Description("Indicates the Info Row image")]
+        public Image InfoRowImage
+        {
+            get { return (_InfoRowImage); }
+
+            set
+            {
+                if (_InfoRowImage != value)
+                {
+                    _InfoRowImage = value;
+
+                    OnPropertyChangedEx("InfoRowImage", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region InfoRowImageIndex
+
+        /// <summary>
+        /// Gets or sets the Info Row image index
+        /// </summary>
+        [Browsable(true), DefaultValue(-1)]
+        [Category("Appearance"), Description("Indicates the Info Row image index")]
+        [Editor("DevComponents.SuperGrid.Design.ImageIndexEditor, DevComponents.SuperGrid.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=26d81176cfa2b486", typeof(UITypeEditor))]
+        [TypeConverter(typeof(ImageIndexConverter))]
+        public int InfoRowImageIndex
+        {
+            get { return (_InfoRowImageIndex); }
+
+            set
+            {
+                if (_InfoRowImageIndex != value)
+                {
+                    _InfoRowImageIndex = value;
+
+                    OnPropertyChangedEx("InfoRowImageIndex", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        [Browsable(false)]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetInfoRowImageIndex()
+        {
+            _InfoRowImageIndex = -1;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetActiveRowImage
+
+        internal Image GetActiveRowImage(GridPanel panel)
+        {
+            if (_ActiveRowImage != null)
+                return (_ActiveRowImage);
+
+            if (_ActiveRowImageIndex >= 0 && panel != null)
+            {
+                ImageList imageList = panel.ImageList;
+
+                if (imageList != null && _ActiveRowImageIndex < imageList.Images.Count)
+                    return (imageList.Images[_ActiveRowImageIndex]);
+            }
+
+            return (GetActiveRowImage());
+        }
+
+        #region GetActiveRowImage
+
+        private Image GetActiveRowImage()
+        {
+            if (_ActiveRowImage != null)
+                return (_ActiveRowImage);
+
+            if (_ActiveRowImageCache == null)
+            {
+                Rectangle r = new Rectangle(0, 0, Dpi.Width4, Dpi.Height7);
+                Image image = new Bitmap(Dpi.Width4, Dpi.Height7);
+
+                using (Graphics g = Graphics.FromImage(image))
+                {
+                    using (GraphicsPath path = new GraphicsPath())
+                    {
+                        Point pt = new Point(r.Right, r.Y + r.Height / 2);
+
+                        Point[] pts =
+                            {
+                                pt,
+                                new Point(pt.X - Dpi.Width4, pt.Y + Dpi.Height4),
+                                new Point(pt.X - Dpi.Width4, pt.Y - Dpi.Height4),
+                                pt
+                            };
+
+                        path.AddLines(pts);
+
+                        Color color = ActiveRowIndicatorColor;
+
+                        if (color.IsEmpty)
+                            color = Color.Black;
+
+                        using (Brush br = new SolidBrush(color))
+                            g.FillPath(br, path);
+                    }
+                }
+
+                _ActiveRowImageCache = image;
+            }
+
+            return (_ActiveRowImageCache);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetEditingRowImage
+
+        internal Image GetEditingRowImage(GridPanel panel)
+        {
+            if (_EditingRowImage != null)
+                return (_EditingRowImage);
+
+            if (_EditingRowImageIndex >= 0 && panel != null)
+            {
+                ImageList imageList = panel.ImageList;
+
+                if (imageList != null && _EditingRowImageIndex < imageList.Images.Count)
+                    return (imageList.Images[_EditingRowImageIndex]);
+            }
+
+            if (_EditingRowImageCache == null)
+                _EditingRowImageCache = panel.GetResourceImage("Pencil");
+
+            return (_EditingRowImageCache);
+        }
+
+        #endregion
+
+        #region GetInfoRowImage
+
+        internal Image GetInfoRowImage(GridPanel panel)
+        {
+            if (_InfoRowImage != null)
+                return (_InfoRowImage);
+
+            if (_InfoRowImageIndex >= 0 && panel != null)
+            {
+                ImageList imageList = panel.ImageList;
+
+                if (imageList != null && _InfoRowImageIndex < imageList.Images.Count)
+                    return (imageList.Images[_InfoRowImageIndex]);
+            }
+
+            if (_InfoRowImageCache == null)
+                _InfoRowImageCache = panel.GetResourceImage("InfoImage");
+
+            return (_InfoRowImageCache);
+        }
+
+        #endregion
+
+        #region ApplyStyle
+
+        /// <summary>
+        /// Applies the style to instance of this style.
+        /// </summary>
+        /// <param name="style">Style to apply.</param>
+        public void ApplyStyle(RowHeaderVisualStyle style)
+        {
+            if (style != null)
+            {
+                base.ApplyStyle(style);
+
+                if (style._ActiveRowIndicatorColor.IsEmpty == false)
+                    _ActiveRowIndicatorColor = style._ActiveRowIndicatorColor;
+
+                if (style._ActiveRowBackground != null && style._ActiveRowBackground.IsEmpty == false)
+                    _ActiveRowBackground = style._ActiveRowBackground.Copy();
+
+                if (style._DirtyMarkerBackground != null && style._DirtyMarkerBackground.IsEmpty == false)
+                    _DirtyMarkerBackground = style._DirtyMarkerBackground.Copy();
+
+                if (style.ActiveRowImageIndex >= 0)
+                {
+                    _ActiveRowImage = null;
+                    _ActiveRowImageIndex = style.ActiveRowImageIndex;
+                }
+
+                if (style.ActiveRowImage != null)
+                {
+                    _ActiveRowImage = style.ActiveRowImage;
+                    _ActiveRowImageIndex = -1;
+                }
+
+                if (style.EditingRowImageIndex >= 0)
+                {
+                    _EditingRowImage = null;
+                    _EditingRowImageIndex = style.EditingRowImageIndex;
+                }
+
+                if (style.EditingRowImage != null)
+                {
+                    _EditingRowImage = style.EditingRowImage;
+                    _EditingRowImageIndex = -1;
+                }
+
+                if (style.InfoRowImageIndex >= 0)
+                {
+                    _InfoRowImage = null;
+                    _InfoRowImageIndex = style.InfoRowImageIndex;
+                }
+
+                if (style.InfoRowImage != null)
+                {
+                    _InfoRowImage = style.InfoRowImage;
+                    _InfoRowImageIndex = -1;
+                }
+            }
+        }
+
+        #endregion
+
+        #region Copy
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public new RowHeaderVisualStyle Copy()
+        {
+            RowHeaderVisualStyle copy = new RowHeaderVisualStyle();
+
+            CopyTo(copy);
+
+            return (copy);
+        }
+
+        #endregion
+
+        #region CopyTo
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public void CopyTo(RowHeaderVisualStyle copy)
+        {
+            base.CopyTo(copy);
+
+            if (_ActiveRowIndicatorColor.IsEmpty == false)
+                copy.ActiveRowIndicatorColor = _ActiveRowIndicatorColor;
+
+            if (_ActiveRowBackground != null)
+                copy.ActiveRowBackground = _ActiveRowBackground.Copy();
+
+            if (_DirtyMarkerBackground != null)
+                copy.DirtyMarkerBackground = _DirtyMarkerBackground.Copy();
+
+            copy.ActiveRowImage = _ActiveRowImage;
+            copy.ActiveRowImageIndex = _ActiveRowImageIndex;
+
+            copy.EditingRowImage = _EditingRowImage;
+            copy.EditingRowImageIndex = _EditingRowImageIndex;
+
+            copy.InfoRowImage = _InfoRowImage;
+            copy.InfoRowImageIndex = _InfoRowImageIndex;
+        }
+
+        #endregion
+
+        #region IDisposable
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        public override void Dispose()
+        {
+            DirtyMarkerBackground = null;
+            ActiveRowBackground = null;
+
+            base.Dispose();
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/Style/RowVisualStyle.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/Style/RowVisualStyle.cs
new file mode 100644
index 00000000..360ffc23
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/Style/RowVisualStyle.cs	
@@ -0,0 +1,192 @@
+using System;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar.SuperGrid.Style
+{
+    ///<summary>
+    /// RowVisualStyles
+    ///</summary>
+    public class RowVisualStyles : VisualStyles<RowVisualStyle>
+    {
+    }
+
+    ///<summary>
+    /// RowVisualStyle
+    ///</summary>
+    public class RowVisualStyle : BaseVisualStyle
+    {
+        #region Private variables
+
+        private Background _Background;
+        private RowHeaderVisualStyle _RowHeaderStyle;
+
+        #endregion
+
+        #region Public properties
+
+        #region Background
+
+        /// <summary>
+        /// Gets or sets the style background.
+        /// </summary>
+        [Description("Indicates the style background")]
+        public Background Background
+        {
+            get
+            {
+                if (_Background == null)
+                {
+                    _Background = Background.Empty;
+
+                    UpdateChangeHandler(null, _Background);
+                }
+
+                return (_Background);
+            }
+
+            set
+            {
+                if (_Background != value)
+                {
+                    UpdateChangeHandler(_Background, value);
+
+                    _Background = value;
+
+                    OnPropertyChangedEx("Background", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeBackground()
+        {
+            return (_Background != null && Background.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetBackground()
+        {
+            Background = null;
+        }
+
+        #endregion
+
+        #region RowHeaderStyle
+
+        /// <summary>
+        /// Gets or sets the RowHeader Style
+        /// </summary>
+        [Category("Appearance")]
+        [Description("Indicates the RowHeader Style.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public RowHeaderVisualStyle RowHeaderStyle
+        {
+            get
+            {
+                if (_RowHeaderStyle == null)
+                {
+                    _RowHeaderStyle = RowHeaderVisualStyle.Empty;
+
+                    UpdateChangeHandler(null, _RowHeaderStyle);
+                }
+
+                return (_RowHeaderStyle);
+            }
+
+            set
+            {
+                if (_RowHeaderStyle != value)
+                {
+                    UpdateChangeHandler(_RowHeaderStyle, value);
+
+                    _RowHeaderStyle = value;
+
+                    OnPropertyChangedEx("RowHeaderStyle", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ApplyStyle
+
+        /// <summary>
+        /// Applies the style to instance of this style.
+        /// </summary>
+        /// <param name="style">Style to apply.</param>
+        public void ApplyStyle(RowVisualStyle style)
+        {
+            if (style != null)
+            {
+                base.ApplyStyle(style);
+
+                if (style.Background != null && style.Background.IsEmpty == false)
+                    Background = style.Background.Copy();
+
+                if (style._RowHeaderStyle != null)
+                    RowHeaderStyle.ApplyStyle(style._RowHeaderStyle);
+            }
+        }
+
+        #endregion
+
+        #region Copy
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public new RowVisualStyle Copy()
+        {
+            RowVisualStyle style = new RowVisualStyle();
+
+            CopyTo(style);
+
+            return (style);
+        }
+
+        #endregion
+
+        #region CopyTo
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public void CopyTo(RowVisualStyle copy)
+        {
+            base.CopyTo(copy);
+
+            if (_Background != null)
+                copy.Background = _Background.Copy();
+
+            if (_RowHeaderStyle != null)
+                copy.RowHeaderStyle = _RowHeaderStyle.Copy();
+        }
+
+        #endregion
+
+        #region IDisposable
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        public override void Dispose()
+        {
+            Background = null;
+            RowHeaderStyle = null;
+
+            base.Dispose();
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/Style/TextRowVisualStyle.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/Style/TextRowVisualStyle.cs
new file mode 100644
index 00000000..8454d604
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/Style/TextRowVisualStyle.cs	
@@ -0,0 +1,163 @@
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar.SuperGrid.Style
+{
+    ///<summary>
+    /// TextRowVisualStyles
+    ///</summary>
+    public class TextRowVisualStyles : VisualStyles<TextRowVisualStyle>
+    {
+        #region Hidden properties
+
+        #region Empty
+
+        /// <summary>
+        /// Empty
+        /// </summary>
+        [Browsable(false)]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public new TextRowVisualStyle Empty
+        {
+            get { return (base.Empty); }
+        }
+
+        #endregion
+
+        #region NotSelectable
+
+        /// <summary>
+        /// NotSelectable
+        /// </summary>
+        [Browsable(false)]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public new TextRowVisualStyle NotSelectable
+        {
+            get { return (base.NotSelectable); }
+        }
+
+        #endregion
+
+        #endregion
+    }
+
+    ///<summary>
+    /// TextRowVisualStyle
+    ///</summary>
+    public class TextRowVisualStyle : CellVisualStyle
+    {
+        #region Private variables
+
+        private BaseRowHeaderVisualStyle _RowHeaderStyle;
+
+        #endregion
+
+        #region Public properties
+
+        #region RowHeaderStyle
+
+        /// <summary>
+        /// Gets or sets the RowHeader Style
+        /// </summary>
+        [Category("Appearance")]
+        [Description("Indicates the RowHeader Style")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public BaseRowHeaderVisualStyle RowHeaderStyle
+        {
+            get
+            {
+                if (_RowHeaderStyle == null)
+                {
+                    _RowHeaderStyle = BaseRowHeaderVisualStyle.Empty;
+
+                    UpdateChangeHandler(null, _RowHeaderStyle);
+                }
+
+                return (_RowHeaderStyle);
+            }
+
+            set
+            {
+                if (_RowHeaderStyle != value)
+                {
+                    UpdateChangeHandler(_RowHeaderStyle, value);
+
+                    _RowHeaderStyle = value;
+
+                    OnPropertyChangedEx("RowHeaderStyle", VisualChangeType.Render);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ApplyStyle
+
+        /// <summary>
+        /// Applies the style to instance of this style.
+        /// </summary>
+        /// <param name="style">Style to apply.</param>
+        public void ApplyStyle(TextRowVisualStyle style)
+        {
+            if (style != null)
+            {
+                base.ApplyStyle(style);
+
+                if (style._RowHeaderStyle != null)
+                    RowHeaderStyle.ApplyStyle(style._RowHeaderStyle);
+            }
+        }
+
+        #endregion
+
+        #region Copy
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public new TextRowVisualStyle Copy()
+        {
+            TextRowVisualStyle copy = new TextRowVisualStyle();
+
+            CopyTo(copy);
+
+            return (copy);
+        }
+
+        #endregion
+
+        #region CopyTo
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public void CopyTo(TextRowVisualStyle copy)
+        {
+            base.CopyTo(copy);
+
+            if (_RowHeaderStyle != null)
+                copy.RowHeaderStyle = _RowHeaderStyle.Copy();
+        }
+
+        #endregion
+
+        #region IDisposable
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        public override void Dispose()
+        {
+            RowHeaderStyle = null;
+
+            base.Dispose();
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/Style/Thickness.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/Style/Thickness.cs
new file mode 100644
index 00000000..f0de76cf
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/Style/Thickness.cs	
@@ -0,0 +1,543 @@
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.Drawing;
+using System.Globalization;
+
+namespace DevComponents.DotNetBar.SuperGrid.Style
+{
+    /// <summary>
+    /// Defines Thickness class.
+    /// </summary>
+    [TypeConverter(typeof(ThicknessTypeConverter))]
+    public class Thickness : IEquatable<Thickness>, INotifyPropertyChanged
+    {
+        #region Static data
+
+        /// <summary>
+        /// Returns Empty instance of Thickness.
+        /// </summary>
+        public static Thickness Empty
+        {
+            get { return (new Thickness(0)); }
+        }
+
+        #endregion
+
+        #region Private variables
+
+        private int _Bottom;
+        private int _Left;
+        private int _Right;
+        private int _Top;
+
+        #endregion
+
+        #region Constructors
+
+        /// <summary>
+        /// Creates new instance of the object.
+        /// </summary>
+        /// <param name="left">Left thickness in pixels.</param>
+        /// <param name="top">Top thickness in pixels.</param>
+        /// <param name="right">Right thickness in pixels.</param>
+        /// <param name="bottom">Bottom thickness in pixels.</param>
+        public Thickness(int left, int top, int right, int bottom)
+        {
+            _Left = left;
+            _Top = top;
+            _Right = right;
+            _Bottom = bottom;
+        }
+
+        /// <summary>
+        /// Creates new instance of the object.
+        /// </summary>
+        /// <param name="all">Specifies uniform Thickness.</param>
+        public Thickness(int all)
+            : this(all, all, all, all)
+        {
+        }
+
+        /// <summary>
+        /// Creates new instance of the object.
+        /// </summary>
+        public Thickness()
+        {
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region All
+
+        /// <summary>
+        /// Gets or sets the thickness of all sides
+        /// </summary>
+        //[Browsable(false)]
+        //[EditorBrowsable(EditorBrowsableState.Never)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public int All
+        {
+            set { _Top = _Left = _Bottom = _Right = value; }
+        }
+
+        #endregion
+
+        #region Bottom
+
+        /// <summary>
+        /// Gets or sets the Bottom thickness in pixels.
+        /// </summary>
+        [DefaultValue(0)]
+        [Description("Indicates the Bottom thickness in pixels.")]
+        public int Bottom
+        {
+            get { return (_Bottom); }
+
+            set
+            {
+                if (_Bottom != value)
+                {
+                    _Bottom = value;
+
+                    OnPropertyChanged(new VisualPropertyChangedEventArgs("Bottom"));
+                }
+            }
+        }
+
+        #endregion
+
+        #region Horizontal
+
+        /// <summary>
+        /// Gets horizontal thickness (Left + Right)
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public int Horizontal
+        {
+            get { return (_Left + _Right); }
+        }
+
+        #endregion
+
+        #region IsEmpty
+
+        /// <summary>
+        /// Gets whether the item is empty.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsEmpty
+        {
+            get
+            {
+                return (_Left == 0 && _Right == 0 &&
+                        _Top == 0 && _Bottom == 0);
+            }
+        }
+
+        #endregion
+
+        #region Left
+
+        /// <summary>
+        /// Gets or sets the left thickness in pixels
+        /// </summary>
+        [Browsable(true), DefaultValue(0)]
+        [Description("Indicates the left thickness in pixels")]
+        public int Left
+        {
+            get { return (_Left); }
+
+            set
+            {
+                if (_Left != value)
+                {
+                    _Left = value;
+
+                    OnPropertyChanged(new VisualPropertyChangedEventArgs("Left"));
+                }
+            }
+        }
+
+        #endregion
+
+        #region Right
+
+        /// <summary>
+        /// Gets or sets the Right thickness in pixels
+        /// </summary>
+        [Browsable(true), DefaultValue(0)]
+        [Description("Indicates the Right thickness in pixels")]
+        public int Right
+        {
+            get { return (_Right); }
+
+            set
+            {
+                if (_Right != value)
+                {
+                    _Right = value;
+
+                    OnPropertyChanged(new VisualPropertyChangedEventArgs("Right"));
+                }
+            }
+        }
+
+        #endregion
+
+        #region Top
+
+        /// <summary>
+        /// Gets or sets the Top thickness in pixels
+        /// </summary>
+        [Browsable(true), DefaultValue(0)]
+        [Description("Indicates the Top thickness in pixels")]
+        public int Top
+        {
+            get { return (_Top); }
+
+            set
+            {
+                if (_Top != value)
+                {
+                    _Top = value;
+
+                    OnPropertyChanged(new VisualPropertyChangedEventArgs("Top"));
+                }
+            }
+        }
+
+        #endregion
+
+        #region Vertical
+
+        /// <summary>
+        /// Gets vertical thickness (Top + Bottom)
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public int Vertical
+        {
+            get { return (_Top + _Bottom); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region IsUniform
+
+        internal bool IsUniform
+        {
+            get
+            {
+                return (Dpi.Factor.Height == Dpi.Factor.Width &&
+                    _Left == _Top && _Left == _Right && _Left == _Bottom);
+            }
+        }
+
+        #endregion
+
+        #region IsZero
+
+        internal bool IsZero
+        {
+            get
+            {
+                return (_Left == 0 && _Top == 0 &&
+                        _Right == 0 && _Bottom == 0);
+            }
+        }
+
+        #endregion
+
+        #region Size
+
+        internal Size Size
+        {
+            get { return (new Size(_Left + _Right, _Top + _Bottom)); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Equals
+
+        /// <summary>
+        /// Gets whether two instances are equal.
+        /// </summary>
+        /// <param name="obj">Instance to compare to.</param>
+        /// <returns>true if equal otherwise false.</returns>
+        public override bool Equals(object obj)
+        {
+            if (obj is Thickness)
+                return (this == (Thickness)obj);
+
+            return (false);
+        }
+
+        /// <summary>
+        /// Gets whether two instances are equal.
+        /// </summary>
+        /// <param name="thickness">Instance to compare to</param>
+        /// <returns>true if equal otherwise false</returns>
+        public bool Equals(Thickness thickness)
+        {
+            return (this == thickness);
+        }
+
+        #endregion
+
+        #region GetHashCode
+
+        /// <summary>
+        /// Returns hash-code.
+        /// </summary>
+        /// <returns>hash-code</returns>
+        public override int GetHashCode()
+        {
+            return (((_Left.GetHashCode() ^ _Top.GetHashCode()) ^
+                     _Right.GetHashCode()) ^ _Bottom.GetHashCode());
+        }
+
+        #endregion
+
+        #region Operators
+
+        #region "==" operator
+
+        /// <summary>
+        /// Implements == operator.
+        /// </summary>
+        /// <param name="t1">Object 1</param>
+        /// <param name="t2">Object 2</param>
+        /// <returns>true if equals</returns>
+        public static bool operator ==(Thickness t1, Thickness t2)
+        {
+            if (ReferenceEquals(t1, t2))
+                return (true);
+
+            if (((object)t1 == null) || ((object)t2 == null))
+                return (false);
+
+            return (t1._Left == t2._Left && t1._Right == t2._Right &&
+                    t1._Top == t2._Top && t1._Bottom == t2._Bottom);
+        }
+
+        #endregion
+
+        #region "!=" operator
+
+        /// <summary>
+        /// Implements != operator
+        /// </summary>
+        /// <param name="t1">Object 1</param>
+        /// <param name="t2">Object 2</param>
+        /// <returns>true if different</returns>
+        public static bool operator !=(Thickness t1, Thickness t2)
+        {
+            return ((t1 == t2) == false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Copy
+
+        /// <summary>
+        /// Creates an exact copy of the Thickness.
+        /// </summary>
+        /// <returns>Copy of the Thickness.</returns>
+        public Thickness Copy()
+        {
+            Thickness copy = new Thickness(_Left, _Top, _Right, _Bottom);
+
+            return (copy);
+        }
+
+        #endregion
+
+        #region INotifyPropertyChanged Members
+
+        /// <summary>
+        /// Occurs when property value has changed.
+        /// </summary>
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        /// <summary>
+        /// Raises the PropertyChanged event.
+        /// </summary>
+        /// <param name="e">Event arguments</param>
+        void OnPropertyChanged(VisualPropertyChangedEventArgs e)
+        {
+            PropertyChangedEventHandler eh = PropertyChanged;
+
+            if (eh != null)
+                eh(this, e);
+        }
+
+        #endregion
+    }
+
+    #region ThicknessTypeConverter
+
+    ///<summary>
+    /// ThicknessTypeConverter
+    ///</summary>
+    public class ThicknessTypeConverter : ExpandableObjectConverter
+    {
+        #region CanConvertTo
+
+        /// <summary>
+        /// CanConvertTo
+        /// </summary>
+        /// <param name="context"></param>
+        /// <param name="destinationType"></param>
+        /// <returns></returns>
+        public override bool CanConvertTo(
+            ITypeDescriptorContext context, Type destinationType)
+        {
+            if (destinationType == typeof(string))
+                return (true);
+
+            return (base.CanConvertTo(context, destinationType));
+        }
+
+        #endregion
+
+        #region ConvertTo
+
+        /// <summary>
+        /// ConvertTo
+        /// </summary>
+        /// <param name="context"></param>
+        /// <param name="culture"></param>
+        /// <param name="value"></param>
+        /// <param name="destinationType"></param>
+        /// <returns></returns>
+        public override object ConvertTo(
+            ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+        {
+            if (destinationType == typeof(string))
+            {
+                Thickness t = value as Thickness;
+
+                if (t != null)
+                {
+                    if (t.IsUniform == true)
+                        return (t.Left.ToString());
+
+                    return (String.Format("{0:d}, {1:d}, {2:d}, {3:d}",
+                        t.Bottom, t.Left, t.Right, t.Top));
+                }
+            }
+
+            return (base.ConvertTo(context, culture, value, destinationType));
+        }
+
+        #endregion
+
+        #region CanConvertFrom
+
+        /// <summary>
+        /// CanConvertFrom
+        /// </summary>
+        /// <param name="context"></param>
+        /// <param name="sourceType"></param>
+        /// <returns></returns>
+        public override bool CanConvertFrom(
+            ITypeDescriptorContext context, Type sourceType)
+        {
+            if (sourceType == typeof(string))
+                return (true);
+
+            return (base.CanConvertFrom(context, sourceType));
+        }
+
+        #endregion
+
+        #region ConvertFrom
+
+        /// <summary>
+        /// ConvertFrom
+        /// </summary>
+        /// <param name="context"></param>
+        /// <param name="culture"></param>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public override object ConvertFrom(
+            ITypeDescriptorContext context, CultureInfo culture, object value)
+        {
+            if (value is string)
+            {
+                string[] values = ((string)value).Split(',');
+
+                if (values.Length != 1 && values.Length != 4)
+                    throw new ArgumentException("Invalid value to convert.");
+
+                try
+                {
+                    int[] v = new int[values.Length];
+
+                    for (int i = 0; i < values.Length; i++)
+                        v[i] = int.Parse(values[i]);
+
+                    Thickness t = (values.Length == 1)
+                        ? new Thickness(v[0])
+                        : new Thickness(v[1], v[3], v[2], v[0]);
+
+                    return (t);
+                }
+                catch (Exception)
+                {
+                    throw new ArgumentException("Invalid value to convert.");
+                }
+            }
+
+            return base.ConvertFrom(context, culture, value);
+        }
+
+        #endregion
+
+        #region GetCreateInstanceSupported
+
+        /// <summary>
+        /// GetCreateInstanceSupported
+        /// </summary>
+        /// <param name="context"></param>
+        /// <returns></returns>
+        public override bool GetCreateInstanceSupported(ITypeDescriptorContext context)
+        {
+            return (true);
+        }
+
+        #endregion
+
+        #region CreateInstance
+
+        /// <summary>
+        /// CreateInstance
+        /// </summary>
+        /// <param name="context"></param>
+        /// <param name="propertyValues"></param>
+        /// <returns></returns>
+        public override object CreateInstance(
+            ITypeDescriptorContext context, IDictionary propertyValues)
+        {
+            return (new Thickness((int)propertyValues["Left"], (int)propertyValues["Top"],
+                (int)propertyValues["Right"], (int)propertyValues["Bottom"]));
+        }
+
+        #endregion
+    }
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/Style/TreeButtonVisualStyle.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/Style/TreeButtonVisualStyle.cs
new file mode 100644
index 00000000..aacd8999
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/Style/TreeButtonVisualStyle.cs	
@@ -0,0 +1,655 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.SuperGrid.Style
+{
+    /// <summary>
+    /// Represents the visual style of a Row.
+    /// </summary>
+    [ToolboxItem(false), DesignTimeVisible(false)]
+    [TypeConverter(typeof(BlankExpandableObjectConverter))]
+    public class BaseTreeButtonVisualStyle : BaseVisualStyle
+    {
+        #region Static data
+
+        ///<summary>
+        /// Empty
+        ///</summary>
+        public static BaseTreeButtonVisualStyle Empty
+        {
+            get { return (new BaseTreeButtonVisualStyle()); }
+        }
+
+        #endregion
+
+        #region Private variables
+
+        private Color _BorderColor = Color.Empty;
+        private Color _HotBorderColor = Color.Empty;
+        private Color _LineColor = Color.Empty;
+        private Color _HotLineColor = Color.Empty;
+
+        private Background _Background;
+        private Background _HotBackground;
+
+        #endregion
+
+        #region Public properties
+
+        #region Background
+
+        /// <summary>
+        /// Gets or sets the TreeButton background.
+        /// </summary>
+        [Description("Indicates the TreeButton background")]
+        public Background Background
+        {
+            get
+            {
+                if (_Background == null)
+                {
+                    _Background = Background.Empty;
+
+                    UpdateChangeHandler(null, _Background);
+                }
+
+                return (_Background);
+            }
+
+            set
+            {
+                if (_Background != value)
+                {
+                    UpdateChangeHandler(_Background, value);
+
+                    _Background = value;
+
+                    OnPropertyChangedEx("Background", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeBackground()
+        {
+            return (_Background != null && _Background.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetBackground()
+        {
+            _Background = null;
+        }
+
+        #endregion
+
+        #region HotBackground
+
+        /// <summary>
+        /// Gets or sets the  Hot background.
+        /// </summary>
+        [Description("Indicates the  Hot background")]
+        public Background HotBackground
+        {
+            get
+            {
+                if (_HotBackground == null)
+                {
+                    _HotBackground = Background.Empty;
+
+                    UpdateChangeHandler(null, _HotBackground);
+                }
+
+                return (_HotBackground);
+            }
+
+            set
+            {
+                if (_HotBackground != value)
+                {
+                    UpdateChangeHandler(_HotBackground, value);
+
+                    _HotBackground = value;
+
+                    OnPropertyChangedEx("HotBackground", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeHotBackground()
+        {
+            return (_HotBackground != null && _HotBackground.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetHotBackground()
+        {
+            HotBackground = null;
+        }
+
+        #endregion
+
+        #region BorderColor
+
+        /// <summary>
+        /// Gets or sets the border Color
+        /// </summary>
+        [Category("Appearance")]
+        [Description("Indicates the border Color.")]
+        public Color BorderColor
+        {
+            get { return (_BorderColor); }
+
+            set
+            {
+                if (_BorderColor != value)
+                {
+                    _BorderColor = value;
+
+                    OnPropertyChangedEx("BorderColor", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeBorderColor()
+        {
+            return (_BorderColor.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetBorderColor()
+        {
+            BorderColor = Color.Empty;
+        }
+
+        #endregion
+
+        #region HotBorderColor
+
+        /// <summary>
+        /// Gets or sets the Hot border Color
+        /// </summary>
+        [Category("Appearance")]
+        [Description("Indicates the Hot border Color.")]
+        public Color HotBorderColor
+        {
+            get { return (_HotBorderColor); }
+
+            set
+            {
+                if (_HotBorderColor != value)
+                {
+                    _HotBorderColor = value;
+
+                    OnPropertyChangedEx("HotBorderColor", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeHotBorderColor()
+        {
+            return (_HotBorderColor.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetHotBorderColor()
+        {
+            HotBorderColor = Color.Empty;
+        }
+
+        #endregion
+
+        #region LineColor
+
+        /// <summary>
+        /// Gets or sets the button interior line Color
+        /// </summary>
+        [Category("Appearance")]
+        [Description("Indicates the button interior line Color.")]
+        public Color LineColor
+        {
+            get { return (_LineColor); }
+
+            set
+            {
+                if (_LineColor != value)
+                {
+                    _LineColor = value;
+
+                    OnPropertyChangedEx("LineColor", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeLineColor()
+        {
+            return (_LineColor.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetLineColor()
+        {
+            LineColor = Color.Empty;
+        }
+
+        #endregion
+
+        #region HotLineColor
+
+        /// <summary>
+        /// Gets or sets the Hot button interior line Color
+        /// </summary>
+        [Category("Appearance")]
+        [Description("Indicates the Hot button interior line Color.")]
+        public Color HotLineColor
+        {
+            get { return (_HotLineColor); }
+
+            set
+            {
+                if (_HotLineColor != value)
+                {
+                    _HotLineColor = value;
+
+                    OnPropertyChangedEx("HotLineColor", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeHotLineColor()
+        {
+            return (_HotLineColor.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetHotLineColor()
+        {
+            HotLineColor = Color.Empty;
+        }
+
+        #endregion
+
+        #region IsEmpty
+
+        ///<summary>
+        /// IsEmpty
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override bool IsEmpty
+        {
+            get
+            {
+                return
+                   ((_Background == null || _Background.IsEmpty) &&
+                    (_HotBackground == null || _HotBackground.IsEmpty) &&
+                    (_BorderColor == Color.Empty && _HotBorderColor == Color.Empty && base.IsEmpty));
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ApplyStyle
+
+        /// <summary>
+        /// Applies the style to instance of this style.
+        /// </summary>
+        /// <param name="style">Style to apply.</param>
+        public void ApplyStyle(BaseTreeButtonVisualStyle style)
+        {
+            if (style != null)
+            {
+                base.ApplyStyle(style);
+
+                if (style.BorderColor.IsEmpty == false)
+                    BorderColor = style.BorderColor;
+
+                if (style.HotBorderColor.IsEmpty == false)
+                    HotBorderColor = style.HotBorderColor;
+
+                if (style.Background != null && style.Background.IsEmpty == false)
+                    Background = style.Background.Copy();
+
+                if (style.HotBackground != null && style.HotBackground.IsEmpty == false)
+                    HotBackground = style.HotBackground.Copy();
+
+                if (style.LineColor.IsEmpty == false)
+                    LineColor = style.LineColor;
+
+                if (style.HotLineColor.IsEmpty == false)
+                    HotLineColor = style.HotLineColor;
+            }
+        }
+
+        #endregion
+
+        #region Copy
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public new BaseTreeButtonVisualStyle Copy()
+        {
+            BaseTreeButtonVisualStyle style = new BaseTreeButtonVisualStyle();
+
+            CopyTo(style);
+
+            return (style);
+        }
+
+        #endregion
+
+        #region CopyTo
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public void CopyTo(BaseTreeButtonVisualStyle copy)
+        {
+            base.CopyTo(copy);
+
+            copy.BorderColor = _BorderColor;
+            copy.HotBorderColor = _HotBorderColor;
+            copy.LineColor = _LineColor;
+            copy.HotLineColor = _HotLineColor;
+
+            if (Background != null)
+                copy.Background = _Background.Copy();
+
+            if (HotBackground != null)
+                copy.HotBackground = _HotBackground.Copy();
+        }
+
+        #endregion
+
+        #region IDisposable
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        public override void Dispose()
+        {
+            Background = null;
+            HotBackground = null;
+
+            base.Dispose();
+        }
+
+        #endregion
+    }
+
+    /// <summary>
+    /// Represents the visual style of a Row.
+    /// </summary>
+    [ToolboxItem(false), DesignTimeVisible(false)]
+    [TypeConverter(typeof(BlankExpandableObjectConverter))]
+    public class TreeButtonVisualStyle : BaseVisualStyle
+    {
+        #region Static data
+
+        ///<summary>
+        /// Empty
+        ///</summary>
+        public static TreeButtonVisualStyle Empty
+        {
+            get { return (new TreeButtonVisualStyle()); }
+        }
+
+        #endregion
+
+        #region Private variables
+
+        private BaseTreeButtonVisualStyle _ExpandButton;
+        private BaseTreeButtonVisualStyle _CollapseButton;
+
+        #endregion
+
+        #region Public properties
+
+        #region CollapseButton
+
+        /// <summary>
+        /// Gets or sets the CollapseButton.
+        /// </summary>
+        [Description("Indicates the CollapseButton")]
+        public BaseTreeButtonVisualStyle CollapseButton
+        {
+            get
+            {
+                if (_CollapseButton == null)
+                {
+                    _CollapseButton = BaseTreeButtonVisualStyle.Empty;
+
+                    UpdateChangeHandler(null, _CollapseButton);
+                }
+
+                return (_CollapseButton);
+            }
+
+            set
+            {
+                if (_CollapseButton != value)
+                {
+                    UpdateChangeHandler(_CollapseButton, value);
+
+                    _CollapseButton = value;
+
+                    OnPropertyChangedEx("CollapseButton", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeCollapseButton()
+        {
+            return (_CollapseButton != null && _CollapseButton.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetCollapseButton()
+        {
+            CollapseButton = null;
+        }
+
+        #endregion
+
+        #region ExpandButton
+
+        /// <summary>
+        /// Gets or sets the ExpandButton.
+        /// </summary>
+        [Description("Indicates the ExpandButton")]
+        public BaseTreeButtonVisualStyle ExpandButton
+        {
+            get
+            {
+                if (_ExpandButton == null)
+                {
+                    _ExpandButton = BaseTreeButtonVisualStyle.Empty;
+
+                    UpdateChangeHandler(null, _ExpandButton);
+                }
+
+                return (_ExpandButton);
+            }
+
+            set
+            {
+                if (_ExpandButton != value)
+                {
+                    UpdateChangeHandler(_ExpandButton, value);
+
+                    _ExpandButton = value;
+
+                    OnPropertyChangedEx("ExpandButton", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeExpandButton()
+        {
+            return (_ExpandButton != null && _ExpandButton.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetExpandButton()
+        {
+            ExpandButton = null;
+        }
+
+        #endregion
+
+        #region IsEmpty
+
+        ///<summary>
+        /// IsEmpty
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override bool IsEmpty
+        {
+            get
+            {
+                return
+                   ((_CollapseButton == null || _CollapseButton.IsEmpty) &&
+                    (_ExpandButton == null || _ExpandButton.IsEmpty) && base.IsEmpty);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ApplyStyle
+
+        /// <summary>
+        /// Applies the style to instance of this style.
+        /// </summary>
+        /// <param name="style">Style to apply.</param>
+        public void ApplyStyle(TreeButtonVisualStyle style)
+        {
+            if (style != null)
+            {
+                base.ApplyStyle(style);
+
+                if (style._CollapseButton != null)
+                    CollapseButton.ApplyStyle(style._CollapseButton);
+
+                if (style._ExpandButton != null)
+                    ExpandButton.ApplyStyle(style._ExpandButton);
+            }
+        }
+
+        #endregion
+
+        #region Copy
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public new TreeButtonVisualStyle Copy()
+        {
+            TreeButtonVisualStyle style = new TreeButtonVisualStyle();
+
+            CopyTo(style);
+
+            return (style);
+        }
+
+        #endregion
+
+        #region CopyTo
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public void CopyTo(TreeButtonVisualStyle copy)
+        {
+            base.CopyTo(copy);
+
+            if (_CollapseButton != null)
+                copy.CollapseButton = _CollapseButton.Copy();
+
+            if (_ExpandButton != null)
+                copy.ExpandButton = _ExpandButton.Copy();
+        }
+
+        #endregion
+
+        #region IDisposable
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        public override void Dispose()
+        {
+            CollapseButton = null;
+            ExpandButton = null;
+
+            base.Dispose();
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/Style/VisualStyle.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/Style/VisualStyle.cs
new file mode 100644
index 00000000..22940409
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/Style/VisualStyle.cs	
@@ -0,0 +1,725 @@
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+
+namespace DevComponents.DotNetBar.SuperGrid.Style
+{
+    /// <summary>
+    /// Represents the visual style of a Row.
+    /// </summary>
+    [ToolboxItem(false), DesignTimeVisible(false)]
+    [TypeConverter(typeof(ExpandableObjectConverter))]
+    public class VisualStyle : BaseVisualStyle
+    {
+        #region Private variables
+
+        private Background _Background;
+        private BorderColor _BorderColor;
+        private BorderPattern _BorderPattern;
+        private Thickness _BorderThickness;
+
+        private Color _TextColor = Color.Empty;
+
+        private Padding _Margin;
+        private Padding _Padding;
+
+        private Font _Font;
+
+        #endregion
+
+        #region Public properties
+
+        #region Background
+
+        /// <summary>
+        /// Gets or sets the style background.
+        /// </summary>
+        [Description("Indicates the style background")]
+        public Background Background
+        {
+            get
+            {
+                if (_Background == null)
+                {
+                    _Background = Background.Empty;
+
+                    UpdateChangeHandler(null, _Background);
+                }
+
+                return (_Background);
+            }
+
+            set
+            {
+                if (_Background != value)
+                {
+                    UpdateChangeHandler(_Background, value);
+
+                    _Background = value;
+
+                    OnPropertyChangedEx("Background", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeBackground()
+        {
+            return (_Background != null && _Background.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetBackground()
+        {
+            Background = null;
+        }
+
+        #endregion
+
+        #region BorderColor
+
+        /// <summary>
+        /// Gets or sets the style border color.
+        /// </summary>
+        [Description("Indicates the style Border Color")]
+        public BorderColor BorderColor
+        {
+            get
+            {
+                if (_BorderColor == null)
+                {
+                    _BorderColor = BorderColor.Empty;
+
+                    UpdateChangeHandler(null, _BorderColor);
+                }
+
+                return (_BorderColor);
+            }
+
+            set
+            {
+                if (_BorderColor != value)
+                {
+                    UpdateChangeHandler(_BorderColor, value);
+
+                    _BorderColor = value;
+
+                    OnPropertyChangedEx("BorderColor", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeBorderColor()
+        {
+            return (_BorderColor != null && _BorderColor.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetBorderColor()
+        {
+            BorderColor = null;
+        }
+
+        #endregion
+
+        #region BorderPattern
+
+        /// <summary>
+        /// Gets or sets the style border pattern (Solid, Dash, ...)
+        /// </summary>
+        [Description("Indicates the style border pattern (Solid, Dash, ...)")]
+        public BorderPattern BorderPattern
+        {
+            get
+            {
+                if (_BorderPattern == null)
+                {
+                    _BorderPattern = BorderPattern.Empty;
+
+                    UpdateChangeHandler(null, _BorderPattern);
+                }
+
+                return (_BorderPattern);
+            }
+
+            set
+            {
+                if (_BorderPattern != value)
+                {
+                    UpdateChangeHandler(_BorderPattern, value);
+
+                    _BorderPattern = value;
+
+                    OnPropertyChangedEx("BorderPattern", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeBorderPattern()
+        {
+            return (_BorderPattern != null && _BorderPattern.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetBorderPattern()
+        {
+            BorderPattern = null;
+        }
+
+        #endregion
+
+        #region BorderThickness
+
+        /// <summary>
+        /// Gets or sets the style border thickness.
+        /// </summary>
+        [Description("Indicates the style border thickness")]
+        public Thickness BorderThickness
+        {
+            get
+            {
+                if (_BorderThickness == null)
+                {
+                    _BorderThickness = Thickness.Empty;
+
+                    UpdateChangeHandler(null, _BorderThickness);
+                }
+
+                return (_BorderThickness);
+            }
+
+            set
+            {
+                if (_BorderThickness != value)
+                {
+                    UpdateChangeHandler(_BorderThickness, value);
+                    
+                    _BorderThickness = value;
+
+                    OnPropertyChangedEx("BorderThickness", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeBorderThickness()
+        {
+            return (_BorderThickness != null && _BorderThickness.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetBorderThickness()
+        {
+            BorderThickness = null;
+        }
+
+        #endregion
+
+        #region Font
+
+        /// <summary>
+        /// Gets or sets the style Font
+        /// </summary>
+        [DefaultValue(null)]
+        [Description("Indicates the style Font")]
+        public Font Font
+        {
+            get { return (_Font); }
+
+            set
+            {
+                if (_Font != value)
+                {
+                    _Font = value;
+
+                    OnPropertyChangedEx("Font", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        #endregion
+
+        #region IsEmpty
+
+        /// <summary>
+        /// Gets whether the style is logically Empty.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        [Description("Gets whether the style is logically Empty.")]
+        public override bool IsEmpty
+        {
+            get
+            {
+                return ((_Background == null || _Background.IsEmpty == true) &&
+                        (_BorderColor == null || _BorderColor.IsEmpty == true) &&
+                        (_BorderPattern == null || _BorderPattern.IsEmpty == true) &&
+                        (_BorderThickness == null || _BorderThickness.IsEmpty == true) &&
+                        (_Margin == null || _Margin.IsEmpty == true) &&
+                        (_Padding == null || _Padding.IsEmpty == true) &&
+                        (_Font == null) &&
+                        (_TextColor.IsEmpty == true || _TextColor == Color.Black) &&
+
+                        (base.IsEmpty == true)); }
+        }
+
+        #endregion
+
+        #region Margin
+
+        /// <summary>
+        /// Gets or sets the spacing between the border and outside content.
+        /// </summary>
+        [Description("Indicates the spacing between the border and outside content")]
+        public Padding Margin
+        {
+            get
+            {
+                if (_Margin == null)
+                {
+                    _Margin = Padding.Empty;
+
+                    UpdateChangeHandler(null, _Margin);
+                }
+
+                return (_Margin);
+            }
+
+            set
+            {
+                if (_Margin != value)
+                {
+                    UpdateChangeHandler(_Margin, value);
+
+                    _Margin = value;
+
+                    OnPropertyChangedEx("Margin", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeMargin()
+        {
+            return (_Margin != null && _Margin.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetMargin()
+        {
+            Margin = null;
+        }
+
+        #endregion
+
+        #region Padding
+
+        /// <summary>
+        /// Gets or sets spacing between the content and edges of the element.
+        /// </summary>
+        [Description("Indicates the spacing between the content and edges of the element")]
+        public Padding Padding
+        {
+            get
+            {
+                if (_Padding == null)
+                {
+                    _Padding = Padding.Empty;
+
+                    UpdateChangeHandler(null, _Padding);
+                }
+
+                return (_Padding);
+            }
+
+            set
+            {
+                if (_Padding != value)
+                {
+                    UpdateChangeHandler(_Padding, value);
+
+                    _Padding = value;
+
+                    OnPropertyChangedEx("Padding", VisualChangeType.Layout);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializePadding()
+        {
+            return (_Padding != null && _Padding.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetPadding()
+        {
+            Padding = null;
+        }
+
+        #endregion
+
+        #region TextColor
+
+        /// <summary>
+        /// Gets or sets the Text color
+        /// </summary>
+        [Description("Indicates the Text color")]
+        public Color TextColor
+        {
+            get { return (_TextColor); }
+
+            set
+            {
+                if (_TextColor != value)
+                {
+                    _TextColor = value;
+
+                    OnPropertyChangedEx("TextColor", VisualChangeType.Render);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeTextColor()
+        {
+            return (_TextColor.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetTextColor()
+        {
+            _TextColor = Color.Empty;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ApplyStyle
+
+        /// <summary>
+        /// Applies the style to instance of this style.
+        /// </summary>
+        /// <param name="style">Style to apply.</param>
+        public void ApplyStyle(VisualStyle style)
+        {
+            if (style != null)
+            {
+                base.ApplyStyle(style);
+
+                if (style._Background != null && style._Background.IsEmpty == false)
+                    Background = style._Background.Copy();
+
+                if (style._BorderColor != null && style._BorderColor.IsEmpty == false)
+                    BorderColor = style._BorderColor.Copy();
+
+                if (style._BorderPattern != null && style._BorderPattern.IsEmpty == false)
+                    BorderPattern.ApplyPattern(style._BorderPattern);
+
+                if (style._BorderThickness != null && style._BorderThickness.IsZero == false)
+                    BorderThickness = style._BorderThickness.Copy();
+
+                if (style.Font != null)
+                    Font = style.Font;
+
+                if (style._Margin != null && style._Margin.IsEmpty == false)
+                    Margin = style.Margin.Copy();
+
+                if (style._Padding != null && style._Padding.IsEmpty == false)
+                    Padding = style.Padding.Copy();
+
+                if (style._TextColor.IsEmpty == false)
+                    TextColor = style._TextColor;
+            }
+        }
+
+        #endregion
+
+        #region RenderBorder
+
+        internal void RenderBorder(Graphics g, Rectangle r)
+        {
+            if (_BorderPattern == null || BorderThickness == null || BorderColor == null)
+                return;
+
+            SmoothingMode sm = g.SmoothingMode;
+            g.SmoothingMode = SmoothingMode.None;
+
+            if (BorderColor.IsUniform == true &&
+                BorderThickness.IsUniform == true && BorderPattern.IsUniform == true)
+            {
+                if (_BorderPattern.Top != LinePattern.None  &&
+                    (_BorderThickness.Top > 0 && _BorderColor.Top.IsEmpty == false))
+                {
+                    using (Pen pen = new 
+                        Pen(_BorderColor.Top, Dpi.Width(_BorderThickness.Top)))
+                    {
+                        LinePattern pattern = (_BorderPattern.Top == LinePattern.NotSet)
+                            ? LinePattern.Solid : _BorderPattern.Top;
+
+                        if (pen.Width == 1)
+                        {
+                            r.Width--;
+                            r.Height--;
+                        }
+                        else
+                        {
+                            pen.Alignment = PenAlignment.Inset;
+                        }
+
+                        pen.DashStyle = (DashStyle)pattern;
+
+                        g.DrawRectangle(pen, r);
+                    }
+                }
+            }
+            else
+            {
+                Pen[] pens = GetBorderPens();
+
+                if (pens[(int) BorderSide.Right] != null)
+                {
+                    int right = r.Right - 
+                        (Dpi.Width(_BorderThickness.Right) + 1) / 2;
+
+                    g.DrawLine(pens[(int)BorderSide.Right],
+                        right, r.Top, right, r.Bottom - 1);
+                }
+
+                if (pens[(int) BorderSide.Bottom] != null)
+                {
+                    int bottom = r.Bottom - 
+                        (Dpi.Height(_BorderThickness.Bottom) + 1) / 2;
+
+                    g.DrawLine(pens[(int)BorderSide.Bottom],
+                        r.X, bottom, r.Right - 1, bottom);
+                }
+
+                if (pens[(int)BorderSide.Left] != null)
+                {
+                    int left = r.Left + Dpi.Width(_BorderThickness.Left) / 2;
+
+                    g.DrawLine(pens[(int)BorderSide.Left],
+                        left, r.Top, left, r.Bottom - 1);
+                }
+
+                if (pens[(int)BorderSide.Top] != null)
+                {
+                    int top = r.Top + Dpi.Height(_BorderThickness.Top) / 2;
+
+                    g.DrawLine(pens[(int) BorderSide.Top],
+                        r.X, top, r.Right - 1, top);
+                }
+
+                foreach (Pen pen in pens)
+                {
+                    if (pen != null)
+                        pen.Dispose();
+                }
+            }
+
+            g.SmoothingMode = sm;
+        }
+
+        #endregion
+
+        #region GetBorderSize
+
+        internal Size GetBorderSize(bool inclPadding)
+        {
+            Size size = Size.Empty;
+
+            size.Width += (BorderThickness.Horizontal + Margin.Horizontal);
+            size.Height += (BorderThickness.Vertical + Margin.Vertical);
+
+            if (inclPadding == true)
+            {
+                size.Width += Padding.Horizontal;
+                size.Height += Padding.Vertical;
+            }
+
+            return (Dpi.Size(size));
+        }
+
+        #endregion
+
+        #region GetBorderPens
+
+        internal Pen[] GetBorderPens()
+        {
+            Pen[] pens = new Pen[4];
+
+            pens[(int)BorderSide.Top] = GetBorderPen(pens,
+                BorderColor.Top, Dpi.Height(BorderThickness.Top), BorderPattern.Top);
+
+            pens[(int)BorderSide.Left] = GetBorderPen(pens,
+                BorderColor.Left, Dpi.Width(BorderThickness.Left), BorderPattern.Left);
+
+            pens[(int)BorderSide.Bottom] = GetBorderPen(pens,
+                BorderColor.Bottom, Dpi.Height(BorderThickness.Bottom), BorderPattern.Bottom);
+
+            pens[(int)BorderSide.Right] = GetBorderPen(pens,
+                BorderColor.Right, Dpi.Width(BorderThickness.Right), BorderPattern.Right);
+
+            return (pens);
+        }
+
+        #endregion
+
+        #region GetBorderPen
+
+        private Pen GetBorderPen(IEnumerable<Pen> pens,
+            Color color, int width, LinePattern pattern)
+        {
+            if (color.IsEmpty == true ||
+                pattern == LinePattern.None || width <= 0)
+            {
+                return (null);
+            }
+
+            foreach (Pen pen in pens)
+            {
+                if (pen != null)
+                {
+                    if (pen.Color == color && pen.Width == width &&
+                        pen.DashStyle == (DashStyle)pattern)
+                    {
+                        return (pen);
+                    }
+                }
+            }
+
+            Pen npen = new Pen(color, width);
+
+            if (pattern == LinePattern.NotSet)
+                pattern = LinePattern.Solid;
+
+            npen.DashStyle = (DashStyle)pattern;
+
+            return (npen);
+        }
+
+        #endregion
+
+        #region Copy
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public new VisualStyle Copy()
+        {
+            VisualStyle style = new VisualStyle();
+
+            CopyTo(style);
+
+            return (style);
+        }
+
+        #endregion
+
+        #region CopyTo
+
+        /// <summary>
+        /// Returns the copy of the style.
+        /// </summary>
+        /// <returns>Copy of the style.</returns>
+        public void CopyTo(VisualStyle copy)
+        {
+            base.CopyTo(copy);
+
+            copy.TextColor = _TextColor;
+
+            if (_Background != null)
+                copy.Background = _Background.Copy();
+
+            if (_BorderColor != null)
+                copy.BorderColor = _BorderColor.Copy();
+
+            if (_BorderPattern != null)
+                copy.BorderPattern = _BorderPattern.Copy();
+
+            if (_BorderPattern != null)
+                copy.BorderPattern = _BorderPattern.Copy();
+
+            if (_BorderThickness != null)
+                copy.BorderThickness = _BorderThickness.Copy();
+
+            if (_Font != null)
+                copy.Font = (Font)_Font.Clone();
+
+            if (_Margin != null)
+                copy.Margin = _Margin.Copy();
+
+            if (_Padding != null)
+                copy.Padding = _Padding.Copy();
+        }
+
+        #endregion
+
+        #region IDisposable
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        public override void Dispose()
+        {
+            Background = null;
+            BorderColor = null;
+            BorderPattern = null;
+            BorderThickness = null;
+            Margin = null;
+            Padding = null;
+
+            base.Dispose();
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/Style/VisualStyles.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/Style/VisualStyles.cs
new file mode 100644
index 00000000..116157fd
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/Style/VisualStyles.cs	
@@ -0,0 +1,511 @@
+using System;
+using System.ComponentModel;
+using System.Globalization;
+
+namespace DevComponents.DotNetBar.SuperGrid.Style
+{
+    ///<summary>
+    /// VisualStyles
+    ///</summary>
+    [TypeConverter(typeof(VisualStylesConverter))]
+    public class VisualStyles<T> : IDisposable, INotifyPropertyChanged where T : BaseVisualStyle, new()
+    {
+        #region Private variables
+
+        private T[] _Styles;
+
+        #endregion
+
+        ///<summary>
+        /// Constructor
+        ///</summary>
+        public VisualStyles()
+        {
+            _Styles = new T[Enum.GetValues(typeof(StyleType)).Length - 1];
+        }
+
+        #region Public properties
+
+        #region Indexer
+
+        /// <summary>
+        /// Gets or sets the visual style
+        /// assigned to the element. Default value is null.
+        /// </summary>
+        [DefaultValue(null), Category("Style")]
+        [Description("Indicates visual style assigned to the element")]
+        public T this[StyleType e]
+        {
+            get
+            {
+                int n = ((IConvertible)e).ToInt32(null);
+
+                if (n < 0 || n > _Styles.Length)
+                    throw new Exception("Invalid Style indexer");
+
+                return (GetStyle(n));
+            }
+
+            set
+            {
+                int n = ((IConvertible)e).ToInt32(null);
+
+                if (n < 0 || n > _Styles.Length)
+                    throw new Exception("Invalid Style indexer");
+
+                SetStyle(n, value);
+            }
+        }
+
+        #endregion
+
+        #region Default
+
+        ///<summary>
+        /// The normal, default style
+        ///</summary>
+        [Description("Style to use for normal, default items")]
+        [TypeConverter(typeof(VisualStylesConverter))]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public T Default
+        {
+            get { return (GetStyle((int) StyleType.Default)); }
+            set { SetStyle((int) StyleType.Default, value); }
+        }
+
+        #endregion
+
+        #region Empty
+
+        ///<summary>
+        /// Style to use when a cell item is empty
+        ///</summary>
+        [Description("Style to use when a cell item is empty")]
+        [TypeConverter(typeof(VisualStylesConverter))]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public T Empty
+        {
+            get { return (GetStyle((int)StyleType.Empty)); }
+            set { SetStyle((int)StyleType.Empty, value); }
+        }
+
+        #endregion
+
+        #region MouseOver
+
+        ///<summary>
+        /// MouseOver
+        ///</summary>
+        [Description("Style to use when the Mouse is over an item")]
+        [TypeConverter(typeof(VisualStylesConverter))]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public T MouseOver
+        {
+            get { return (GetStyle((int)StyleType.MouseOver)); }
+            set { SetStyle((int)StyleType.MouseOver, value); }
+        }
+
+        #endregion
+
+        #region NotSelectable
+
+        ///<summary>
+        /// Style to use for non-selectable items
+        ///</summary>
+        [Description("Style to use for non-selectable items")]
+        [TypeConverter(typeof(VisualStylesConverter))]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public T NotSelectable
+        {
+            get { return (GetStyle((int)StyleType.NotSelectable)); }
+            set { SetStyle((int)StyleType.NotSelectable, value); }
+        }
+
+        #endregion
+
+        #region Selected
+
+        ///<summary>
+        /// Style to use for selected items.
+        ///</summary>
+        [Description("Style to use for selected items.")]
+        [TypeConverter(typeof(VisualStylesConverter))]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public T Selected
+        {
+            get { return (GetStyle((int)StyleType.Selected)); }
+            set { SetStyle((int)StyleType.Selected, value); }
+        }
+
+        #endregion
+
+        #region SelectedMouseOver
+
+        ///<summary>
+        /// Style to use for MouseOver selected items
+        ///</summary>
+        [Description("Style to use for MouseOver selected items")]
+        [TypeConverter(typeof(VisualStylesConverter))]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public T SelectedMouseOver
+        {
+            get { return (GetStyle((int)StyleType.SelectedMouseOver)); }
+            set { SetStyle((int)StyleType.SelectedMouseOver, value); }
+        }
+
+        #endregion
+
+        #region ReadOnly
+
+        ///<summary>
+        /// Style to use for ReadOnly items
+        ///</summary>
+        [Description("Style to use for ReadOnly items.")]
+        [TypeConverter(typeof(VisualStylesConverter))]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public T ReadOnly
+        {
+            get { return (GetStyle((int)StyleType.ReadOnly)); }
+            set { SetStyle((int)StyleType.ReadOnly, value); }
+        }
+
+        #endregion
+
+        #region ReadOnlyMouseOver
+
+        ///<summary>
+        /// Style to use for ReadOnly, MouseOver items
+        ///</summary>
+        [Description("Style to use for ReadOnly, MouseOver items.")]
+        [TypeConverter(typeof(VisualStylesConverter))]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public T ReadOnlyMouseOver
+        {
+            get { return (GetStyle((int)StyleType.ReadOnlyMouseOver)); }
+            set { SetStyle((int)StyleType.ReadOnlyMouseOver, value); }
+        }
+
+        #endregion
+
+        #region ReadOnlySelected
+
+        ///<summary>
+        /// ReadOnlySelected
+        ///</summary>
+        [Description("Style to use for ReadOnly, Selected items.")]
+        [TypeConverter(typeof(VisualStylesConverter))]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public T ReadOnlySelected
+        {
+            get { return (GetStyle((int)StyleType.ReadOnlySelected)); }
+            set { SetStyle((int)StyleType.ReadOnlySelected, value); }
+        }
+
+        #endregion
+
+        #region ReadOnlySelectedMouseOver
+
+        ///<summary>
+        /// Style to use for ReadOnly, Selected, MouseOver items
+        ///</summary>
+        [Description("Style to use for ReadOnly, Selected, MouseOver items.")]
+        [TypeConverter(typeof(VisualStylesConverter))]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public T ReadOnlySelectedMouseOver
+        {
+            get { return (GetStyle((int)StyleType.ReadOnlySelectedMouseOver)); }
+            set { SetStyle((int)StyleType.ReadOnlySelectedMouseOver, value); }
+        }
+
+        #endregion
+
+        #region Styles
+
+        ///<summary>
+        /// Styles array
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public T[] Styles
+        {
+            get { return (_Styles); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetStyle
+
+        private T GetStyle(int n)
+        {
+            if (_Styles[n] == null)
+            {
+                _Styles[n] = new T();
+
+                OnStyleChangeHandler(null, _Styles[n]);
+            }
+
+            return (_Styles[n]);
+        }
+
+        #endregion
+
+        #region SetStyle
+
+        private void SetStyle(int n, T value)
+        {
+            if (_Styles[n] != value)
+            {
+                T oldValue = _Styles[n];
+
+                _Styles[n] = value;
+
+                OnStyleChanged(Enum.GetName(typeof(StyleType), n), oldValue, value);
+            }
+        }
+
+        #endregion
+
+        #region OnStyleChanged
+
+        private void OnStyleChanged(
+            string property, T oldValue, T newValue)
+        {
+            OnStyleChangeHandler(oldValue, newValue);
+
+            OnPropertyChanged(new VisualPropertyChangedEventArgs(property));
+        }
+
+        #endregion
+
+        #region IsValid
+
+        internal bool IsValid(Enum e)
+        {
+            int n = ((IConvertible) e).ToInt32(null);
+
+            if (n < 0 || n > _Styles.Length)
+                throw new Exception("Invalid Style indexer");
+
+            return (_Styles[n] != null);
+        }
+
+        #endregion
+
+        #region Style support routines
+
+        #region StyleVisualChangeHandler
+
+        private void OnStyleChangeHandler(T oldValue, T newValue)
+        {
+            if (oldValue != null)
+                oldValue.PropertyChanged -= StyleChanged;
+
+            if (newValue != null)
+                newValue.PropertyChanged += StyleChanged;
+        }
+
+        #endregion
+
+        #region StyleChanged
+
+        /// <summary>
+        /// Occurs when one of element visual styles has property changes.
+        /// Default implementation invalidates visual appearance of element.
+        /// </summary>
+        /// <param name="sender">VisualStyle that changed.</param>
+        /// <param name="e">Event arguments.</param>
+        protected virtual void StyleChanged(object sender, PropertyChangedEventArgs e)
+        {
+            OnPropertyChanged(e);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region INotifyPropertyChanged Members
+
+        /// <summary>
+        /// Occurs when property value has changed.
+        /// </summary>
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        /// <summary>
+        /// Raises the PropertyChanged event.
+        /// </summary>
+        /// <param name="e">Event arguments</param>
+        protected virtual void OnPropertyChanged(PropertyChangedEventArgs e)
+        {
+            PropertyChangedEventHandler eh = PropertyChanged;
+
+            if (eh != null)
+                eh(this, e);
+        }
+
+        #endregion
+
+        #region IDisposable
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        public void Dispose()
+        {
+            for (int i = 0; i < _Styles.Length; i++)
+            {
+                T style = _Styles[i];
+
+                if (style != null)
+                {
+                    SetStyle(i, null);
+
+                    style.Dispose();
+                }
+            }
+
+            _Styles = null;
+        }
+
+        #endregion
+    }
+
+    #region enums
+
+    #region StyleType
+
+    ///<summary>
+    /// StyleType
+    ///</summary>
+    public enum StyleType
+    {
+        ///<summary>
+        /// CellStyle is Not Set
+        ///</summary>
+        NotSet = -1,
+
+        ///<summary>
+        /// Default
+        ///</summary>
+        Default = 0,
+
+        ///<summary>
+        /// MouseOver
+        ///</summary>
+        MouseOver,
+
+        ///<summary>
+        /// Selected
+        ///</summary>
+        Selected,
+
+        ///<summary>
+        /// SelectedMouseOver
+        ///</summary>
+        SelectedMouseOver,
+
+        ///<summary>
+        /// ReadOnly
+        ///</summary>
+        ReadOnly,
+
+        ///<summary>
+        /// ReadOnlyMouseOver
+        ///</summary>
+        ReadOnlyMouseOver,
+
+        ///<summary>
+        /// ReadOnlySelected
+        ///</summary>
+        ReadOnlySelected,
+
+        ///<summary>
+        /// ReadOnlySelectedMouseOver
+        ///</summary>
+        ReadOnlySelectedMouseOver,
+
+        ///<summary>
+        /// Empty, non-populated cell
+        ///</summary>
+        Empty,
+
+        ///<summary>
+        /// Empty, mouseOver non-populated cell
+        ///</summary>
+        EmptyMouseOver,
+
+        ///<summary>
+        /// Empty, MouseOver, Selected, non-populated cell
+        ///</summary>
+        EmptyMouseOverSelected,
+
+        ///<summary>
+        /// Not Selectable cell
+        ///</summary>
+        NotSelectable,
+    }
+
+    #endregion
+
+    #region StyleState
+
+    ///<summary>
+    /// StyleState
+    ///</summary>
+    [Flags]
+    public enum StyleState
+    {
+        ///<summary>
+        /// Default
+        ///</summary>
+        Default = 0,
+
+        ///<summary>
+        /// MouseOver
+        ///</summary>
+        MouseOver = (1 << 0),
+
+        ///<summary>
+        /// Selected
+        ///</summary>
+        Selected  = (1 << 1),
+
+        ///<summary>
+        /// ReadOnly
+        ///</summary>
+        ReadOnly  = (1 << 2),
+    }
+
+    #endregion
+
+    #endregion
+
+    #region VisualStylesConverter
+
+    ///<summary>
+    /// VisualStylesConverter
+    ///</summary>
+    public class VisualStylesConverter : ExpandableObjectConverter
+    {
+        /// <summary>
+        /// ConvertTo
+        /// </summary>
+        /// <param name="context"></param>
+        /// <param name="culture"></param>
+        /// <param name="value"></param>
+        /// <param name="destinationType"></param>
+        /// <returns></returns>
+        public override object ConvertTo(
+            ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+        {
+            if (destinationType == typeof(string))
+                return (" ");
+
+            return (base.ConvertTo(context, culture, value, destinationType));
+        }
+    }
+
+    #endregion
+
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/SuperGridControl.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/SuperGridControl.cs
new file mode 100644
index 00000000..561d3dbe
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/SuperGridControl.cs	
@@ -0,0 +1,20020 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Drawing.Text;
+using System.Media;
+using System.Runtime.InteropServices;
+using System.Threading;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.Controls;
+using DevComponents.DotNetBar.ScrollBar;
+using DevComponents.DotNetBar.SuperGrid.Style;
+using DevComponents.SuperGrid.TextMarkup;
+using Timer = System.Windows.Forms.Timer;
+
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    /// <summary>
+    /// Represents a Super Grid Control.
+    /// </summary>
+    [ToolboxItem(true), ToolboxBitmap(typeof(SuperGridControl), "SuperGridControl.png")]
+    [Designer("DevComponents.SuperGrid.Design.SuperGridDesigner, DevComponents.SuperGrid.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=26d81176cfa2b486")]
+    public class SuperGridControl : Control, INotifyPropertyChanged, IMessageFilter, IOwnerLocalize
+    {
+        #region Events
+
+        #region ActiveGridChanged
+
+        /// <summary>
+        /// Occurs when the active grid changes
+        /// </summary>
+        [Description("Occurs when the active grid changes.")]
+        public event EventHandler<GridActiveGridChangedEventArgs> ActiveGridChanged;
+
+        #endregion
+
+        #region CellActivated
+
+        /// <summary>
+        /// Occurs when a cell has been made the Active Cell
+        /// </summary>
+        [Description("Occurs when a cell has been made the Active Cell.")]
+        public event EventHandler<GridCellActivatedEventArgs> CellActivated;
+
+        #endregion
+
+        #region CellActivating
+
+        /// <summary>
+        /// Occurs when a cell is about to be made the Active Cell
+        /// </summary>
+        [Description("Occurs when a cell is about to be made the Active Cell.")]
+        public event EventHandler<GridCellActivatingEventArgs> CellActivating;
+
+        #endregion
+
+        #region CellClick
+
+        /// <summary>
+        /// Occurs when a cell has been clicked
+        /// </summary>
+        [Description("Occurs when a cell has been clicked.")]
+        public event EventHandler<GridCellClickEventArgs> CellClick;
+
+        #endregion
+
+        #region CellDoubleClick
+
+        /// <summary>
+        /// Occurs when a cell has been double clicked
+        /// </summary>
+        [Description("Occurs when a cell has been double clicked.")]
+        public event EventHandler<GridCellDoubleClickEventArgs> CellDoubleClick;
+
+        #endregion
+
+        #region CellInfoClick
+
+        /// <summary>
+        /// Occurs when a cell InfoImage has been clicked
+        /// </summary>
+        [Description("Occurs when a cell InfoImage has been clicked.")]
+        public event EventHandler<GridCellClickEventArgs> CellInfoClick;
+
+        #endregion
+
+        #region CellInfoDoubleClick
+
+        /// <summary>
+        /// Occurs when a cell InfoImage has been double clicked
+        /// </summary>
+        [Description("Occurs when a cell InfoImage has been double clicked.")]
+        public event EventHandler<GridCellDoubleClickEventArgs> CellInfoDoubleClick;
+
+        #endregion
+
+        #region CellInfoEnter
+
+        /// <summary>
+        /// Occurs when a Cell InfoImage has been entered via the mouse
+        /// </summary>
+        [Description("Occurs when a Cell InfoImage has been entered via the mouse.")]
+        public event EventHandler<GridCellInfoEnterEventArgs> CellInfoEnter;
+
+        #endregion
+
+        #region CellInfoLeave
+
+        /// <summary>
+        /// Occurs when a Cell InfoImage has been exited via the mouse
+        /// </summary>
+        [Description("Occurs when a Cell InfoImage has been exited via the mouse.")]
+        public event EventHandler<GridCellInfoLeaveEventArgs> CellInfoLeave;
+
+        #endregion
+
+        #region CellMouseDown
+
+        /// <summary>
+        /// Occurs when a mouse button is pressed
+        /// while the mouse pointer is within a cell
+        /// </summary>
+        [Description("Occurs when a mouse button is pressed while the mouse pointer is within a cell.")]
+        public event EventHandler<GridCellMouseEventArgs> CellMouseDown;
+
+        #endregion
+
+        #region CellMouseEnter
+
+        /// <summary>
+        /// Occurs when the mouse pointer enters a cell
+        /// </summary>
+        [Description("Occurs when the mouse pointer enters a cell.")]
+        public event EventHandler<GridCellEventArgs> CellMouseEnter;
+
+        #endregion
+
+        #region CellMouseLeave
+
+        /// <summary>
+        /// Occurs when the mouse pointer leaves a cell
+        /// </summary>
+        [Description("Occurs when the mouse pointer leaves a cell.")]
+        public event EventHandler<GridCellEventArgs> CellMouseLeave;
+
+        #endregion
+
+        #region CellMouseMove
+
+        /// <summary>
+        /// Occurs when the mouse pointer moves within a cell
+        /// </summary>
+        [Description("Occurs when the mouse pointer leaves a cell.")]
+        public event EventHandler<GridCellMouseEventArgs> CellMouseMove;
+
+        #endregion
+
+        #region CellMouseUp
+
+        /// <summary>
+        /// Occurs when a mouse button is released
+        /// while the mouse pointer is within a cell
+        /// </summary>
+        [Description("Occurs when a mouse button is released while the mouse pointer is within a cell.")]
+        public event EventHandler<GridCellMouseEventArgs> CellMouseUp;
+
+        #endregion
+
+        #region CellValidating
+
+        /// <summary>
+        /// Occurs when a cell needs validating
+        /// </summary>
+        [Description("Occurs when a cell needs validating.")]
+        public event EventHandler<GridCellValidatingEventArgs> CellValidating;
+
+        #endregion
+
+        #region CellValidated
+
+        /// <summary>
+        /// Occurs when a cell has finished validating
+        /// </summary>
+        [Description("Occurs when a cell has finished validating.")]
+        public event EventHandler<GridCellValidatedEventArgs> CellValidated;
+
+        #endregion
+
+        #region Check events
+
+        /// <summary>
+        /// Occurs when a row check state is about to change
+        /// </summary>
+        [Description("Occurs when a row check state is about to change.")]
+        public event EventHandler<GridBeforeCheckEventArgs> BeforeCheck;
+
+        /// <summary>
+        /// Occurs when a row check state has changed
+        /// </summary>
+        [Description("Occurs when a row check state has changed.")]
+        public event EventHandler<GridAfterCheckEventArgs> AfterCheck;
+
+        #endregion
+
+        #region Collapse events
+
+        /// <summary>
+        /// Occurs when a row is about to collapse
+        /// </summary>
+        [Description("Occurs when a row is about to collapse.")]
+        public event EventHandler<GridBeforeCollapseEventArgs> BeforeCollapse;
+
+        /// <summary>
+        /// Occurs when a row has just been collapsed
+        /// </summary>
+        [Description("Occurs when a row has just been collapsed.")]
+        public event EventHandler<GridAfterCollapseEventArgs> AfterCollapse;
+
+        #endregion
+
+        #region CellUserFunction
+
+        /// <summary>
+        /// Occurs when a cell User function needs evaluated
+        /// </summary>
+        [Description("Occurs when a cell User function needs evaluated.")]
+        public event EventHandler<GridCellUserFunctionEventArgs> CellUserFunction;
+
+        #endregion
+
+        #region CellValueChanged
+
+        /// <summary>
+        /// Occurs when any cell Value changes
+        /// </summary>
+        [Description("Occurs when any cell Value changes.")]
+        public event EventHandler<GridCellValueChangedEventArgs> CellValueChanged;
+
+        #endregion
+
+        #region ColumnGrouped
+
+        /// <summary>
+        /// Occurs when a column has been Grouped
+        /// </summary>
+        [Description("Occurs when a column has been Grouped.")]
+        public event EventHandler<GridColumnGroupedEventArgs> ColumnGrouped;
+
+        #endregion
+
+        #region ColumnHeaderClick
+
+        /// <summary>
+        /// Occurs when a column header has been clicked
+        /// </summary>
+        [Description("Occurs when a column header has been clicked.")]
+        public event EventHandler<GridColumnHeaderClickEventArgs> ColumnHeaderClick;
+
+        #endregion
+
+        #region ColumnHeaderDoubleClick
+
+        /// <summary>
+        /// Occurs when a column header has been double clicked
+        /// </summary>
+        [Description("Occurs when a column header has been double clicked.")]
+        public event EventHandler<GridColumnHeaderDoubleClickEventArgs> ColumnHeaderDoubleClick;
+
+        #endregion
+
+        #region ColumnHeaderMarkupLinkClick
+
+        /// <summary>
+        /// Occurs when a GridColumn Header has a MarkupLink that has been clicked
+        /// </summary>
+        [Description("Occurs when a GridColumn Header has a MarkupLink that has been clicked.")]
+        public event EventHandler<GridColumnHeaderMarkupLinkClickEventArgs> ColumnHeaderMarkupLinkClick;
+
+        #endregion
+
+        #region ColumnHeaderMouseDown
+
+        /// <summary>
+        /// Occurs when a mouse button is pressed
+        /// while the mouse pointer is within the Column Header
+        /// </summary>
+        [Description("Occurs when a mouse button is pressed while the mouse pointer is within the Column Header.")]
+        public event EventHandler<GridColumnHeaderMouseEventArgs> ColumnHeaderMouseDown;
+
+        #endregion
+
+        #region ColumnHeaderMouseEnter
+
+        /// <summary>
+        /// Occurs when the mouse pointer enters the Column Header
+        /// </summary>
+        [Description("Occurs when the mouse pointer enters the Column Header.")]
+        public event EventHandler<GridColumnHeaderEventArgs> ColumnHeaderMouseEnter;
+
+        #endregion
+
+        #region ColumnHeaderMouseLeave
+
+        /// <summary>
+        /// Occurs when the mouse pointer leaves the Column Header
+        /// </summary>
+        [Description("Occurs when the mouse pointer leaves the Column Header.")]
+        public event EventHandler<GridColumnHeaderEventArgs> ColumnHeaderMouseLeave;
+
+        #endregion
+
+        #region ColumnHeaderMouseMove
+
+        /// <summary>
+        /// Occurs when the mouse pointer moves within the Column Header
+        /// </summary>
+        [Description("Occurs when the mouse pointer leaves the Column Header.")]
+        public event EventHandler<GridColumnHeaderMouseEventArgs> ColumnHeaderMouseMove;
+
+        #endregion
+
+        #region ColumnHeaderMouseUp
+
+        /// <summary>
+        /// Occurs when a mouse button is released
+        /// while the mouse pointer is within the Column Header
+        /// </summary>
+        [Description("Occurs when a mouse button is released while the mouse pointer is within the Column Header.")]
+        public event EventHandler<GridColumnHeaderMouseEventArgs> ColumnHeaderMouseUp;
+
+        #endregion
+
+        #region ColumnGroupHeaderClick
+
+        /// <summary>
+        /// Occurs when a column GroupHeader has been clicked
+        /// </summary>
+        [Description("Occurs when a column GroupHeader has been clicked.")]
+        public event EventHandler<GridColumnGroupHeaderClickEventArgs> ColumnGroupHeaderClick;
+
+        #endregion
+
+        #region ColumnGroupHeaderDoubleClick
+
+        /// <summary>
+        /// Occurs when a column GroupHeader has been double clicked
+        /// </summary>
+        [Description("Occurs when a column GroupHeader has been double clicked.")]
+        public event EventHandler<GridColumnGroupHeaderDoubleClickEventArgs> ColumnGroupHeaderDoubleClick;
+
+        #endregion
+
+        #region ColumnGroupHeaderMarkupLinkClick
+
+        /// <summary>
+        /// Occurs when a GridColumn GroupHeader has a MarkupLink that has been clicked
+        /// </summary>
+        [Description("Occurs when a GridColumn GroupHeader has a MarkupLink that has been clicked.")]
+        public event EventHandler<GridColumnGroupHeaderMarkupLinkClickEventArgs> ColumnGroupHeaderMarkupLinkClick;
+
+        #endregion
+
+        #region ColumnResized
+
+        /// <summary>
+        /// Occurs when a column GroupHeader has been resized
+        /// </summary>
+        [Description("Occurs when a column GroupHeader has been resized.")]
+        public event EventHandler<GridColumnGroupHeaderResizedEventArgs> ColumnGroupHeaderResized;
+
+        #endregion
+
+        #region ColumnMoved
+
+        /// <summary>
+        /// Occurs when a column has been moved or reordered
+        /// </summary>
+        [Description("Occurs when a column has been moved or reordered.")]
+        public event EventHandler<GridColumnEventArgs> ColumnMoved;
+
+        #endregion
+
+        #region ColumnResized
+
+        /// <summary>
+        /// Occurs when a column has been resized
+        /// </summary>
+        [Description("Occurs when a column has been resized.")]
+        public event EventHandler<GridColumnEventArgs> ColumnResized;
+
+        #endregion
+
+        #region ColumnRowHeaderClick
+
+        /// <summary>
+        /// Occurs when a column RowHeader has been clicked
+        /// </summary>
+        [Description("Occurs when a column RowHeader has been clicked.")]
+        public event EventHandler<GridEventArgs> ColumnRowHeaderClick;
+
+        #endregion
+
+        #region ColumnRowHeaderDoubleClick
+
+        /// <summary>
+        /// Occurs when a column RowHeader has been double clicked
+        /// </summary>
+        [Description("Occurs when a column RowHeader has been double clicked.")]
+        public event EventHandler<GridEventArgs> ColumnRowHeaderDoubleClick;
+
+        #endregion
+
+        #region CompareElements
+
+        /// <summary>
+        /// Occurs when the grid needs to compare 1 element with another
+        /// </summary>
+        [Description("Occurs when the grid needs to compare 1 element with another.")]
+        public event EventHandler<GridCompareElementsEventArgs> CompareElements;
+
+        #endregion
+
+        #region DataBindingStart
+
+        /// <summary>
+        /// Occurs when the grid is about to start a nested binding operation
+        /// </summary>
+        [Description("Occurs when the grid is about to start a nested binding operation.")]
+        public event EventHandler<GridDataBindingStartEventArgs> DataBindingStart;
+
+        #endregion
+
+        #region DataBindingComplete
+
+        /// <summary>
+        /// Occurs when a grid's data binding is complete
+        /// </summary>
+        [Description("Occurs when a grid's data binding is complete.")]
+        public event EventHandler<GridDataBindingCompleteEventArgs> DataBindingComplete;
+
+        #endregion
+
+        #region DataError
+
+        /// <summary>
+        /// Occurs when an error is encountered while dealing with data
+        /// </summary>
+        [Description("Occurs when an error is encountered while dealing with data.")]
+        public event EventHandler<GridDataErrorEventArgs> DataError;
+
+        #endregion
+
+        #region DataFilteringStart
+
+        /// <summary>
+        /// Occurs when the grid is about to start a data filtering operation
+        /// </summary>
+        [Description("Occurs when the grid is about to start a data filtering operation.")]
+        public event EventHandler<GridDataFilteringStartEventArgs> DataFilteringStart;
+
+        #endregion
+
+        #region DataFilteringComplete
+
+        /// <summary>
+        /// Occurs when a grid's data Filtering is complete
+        /// </summary>
+        [Description("Occurs when a grid's data filtering is complete.")]
+        public event EventHandler<GridDataFilteringCompleteEventArgs> DataFilteringComplete;
+
+        #endregion
+
+        #region ItemDrag
+
+        /// <summary>
+        /// Occurs when a user begins dragging an item
+        /// </summary>
+        [Description("Occurs when a user begins dragging an item.")]
+        public event EventHandler<GridItemDragEventArgs> ItemDrag;
+
+        #endregion
+
+        #region Editor events
+
+        #region BeginEdit
+
+        /// <summary>
+        /// Occurs when a modal cell edit is about to begin
+        /// </summary>
+        [Description("Occurs when a modal cell edit is about to begin.")]
+        public event EventHandler<GridEditEventArgs> BeginEdit;
+
+        #endregion
+
+        #region CancelEdit
+
+        /// <summary>
+        /// Occurs when a modal cell edit has been canceled
+        /// </summary>
+        [Description("Occurs when a modal cell edit has been canceled.")]
+        public event EventHandler<GridEditEventArgs> CancelEdit;
+
+        #endregion
+
+        #region CloseEdit
+
+        /// <summary>
+        /// Occurs when a modal cell edit has closed
+        /// </summary>
+        [Description("Occurs when a modal cell edit has closed.")]
+        public event EventHandler<GridCloseEditEventArgs> CloseEdit;
+
+        #endregion
+
+        #region EditorValueChanged
+
+        /// <summary>
+        /// Occurs when a cell editor value has changed
+        /// </summary>
+        [Description("Occurs when a cell editor value has changed.")]
+        public event EventHandler<GridEditEventArgs> EditorValueChanged;
+
+        #endregion
+
+        #region EndEdit
+
+        /// <summary>
+        /// Occurs when a modal cell edit is ending
+        /// </summary>
+        [Description("Occurs when a modal cell edit is ending.")]
+        public event EventHandler<GridEditEventArgs> EndEdit;
+
+        #endregion
+
+        #region GetEditor
+
+        /// <summary>
+        /// Occurs when a cell editor is needed
+        /// </summary>
+        [Description("Occurs when a cell editor is needed.")]
+        public event EventHandler<GridGetEditorEventArgs> GetEditor;
+
+        #endregion
+
+        #region GetRenderer
+
+        /// <summary>
+        /// Occurs when a cell renderer is needed
+        /// </summary>
+        [Description("Occurs when a cell renderer is needed.")]
+        public event EventHandler<GridGetRendererEventArgs> GetRenderer;
+
+        #endregion
+
+        #region InitEditContext
+
+        /// <summary>
+        /// Occurs when a cell editor needs it's context initialized
+        /// </summary>
+        [Description("Occurs when a cell editor needs it's context initialized.")]
+        public event EventHandler<GridInitEditContextEventArgs> InitEditContext;
+
+        #endregion
+
+        #endregion
+
+        #region Expand events
+
+        /// <summary>
+        /// Occurs when a row is about to be expanded
+        /// </summary>
+        [Description("Occurs when a row is about to be expanded.")]
+        public event EventHandler<GridBeforeExpandEventArgs> BeforeExpand;
+
+        /// <summary>
+        /// Occurs when a row has just been expanded
+        /// </summary>
+        [Description("Occurs when a row has just been expanded.")]
+        public event EventHandler<GridAfterExpandEventArgs> AfterExpand;
+
+        #endregion
+
+        #region Filter events
+
+        #region FilterBeginEdit
+
+        /// <summary>
+        /// Occurs when a column filter edit is about to begin
+        /// </summary>
+        [Description("Occurs when a column filter edit is about to begin.")]
+        public event EventHandler<GridFilterBeginEditEventArgs> FilterBeginEdit;
+
+        #endregion
+
+        #region FilterCancelEdit
+
+        /// <summary>
+        /// Occurs when a column filter edit has been canceled
+        /// </summary>
+        [Description("Occurs when a column filter edit has been canceled.")]
+        public event EventHandler<GridFilterCancelEditEventArgs> FilterCancelEdit;
+
+        #endregion
+
+        #region FilterColumnError
+
+        /// <summary>
+        /// Occurs when a column filter error has occurred
+        /// </summary>
+        [Description("Occurs when a column filter error has ocurred.")]
+        public event EventHandler<GridFilterColumnErrorEventArgs> FilterColumnError;
+
+        #endregion
+
+        #region FilterEditValueChanged
+
+        /// <summary>
+        /// Occurs when a filter edit value has changed
+        /// </summary>
+        [Description("Occurs when a filter edit value has changed.")]
+        public event EventHandler<GridFilterEditValueChangedEventArgs> FilterEditValueChanged;
+
+        #endregion
+
+        #region FilterEndEdit
+
+        /// <summary>
+        /// Occurs when a column filter edit has ended
+        /// </summary>
+        [Description("Occurs when a column filter edit has ended.")]
+        public event EventHandler<GridFilterEndEditEventArgs> FilterEndEdit;
+
+        #endregion
+
+        #region FilterHeaderClick
+
+        /// <summary>
+        /// Occurs when a Filter header has been clicked
+        /// </summary>
+        [Description("Occurs when a Filter header has been clicked.")]
+        public event EventHandler<GridFilterHeaderClickEventArgs> FilterHeaderClick;
+
+        #endregion
+
+        #region FilterHelpClosing
+
+        /// <summary>
+        /// Occurs when a filter expression help window is about to close
+        /// </summary>
+        [Description("Occurs when a filter expression help window is about to close.")]
+        public event EventHandler<GridFilterHelpClosingEventArgs> FilterHelpClosing;
+
+        #endregion
+
+        #region FilterHelpOpening
+
+        /// <summary>
+        /// Occurs when a filter expression help window is about to open
+        /// </summary>
+        [Description("Occurs when a filter expression help window is about to open.")]
+        public event EventHandler<GridFilterHelpOpeningEventArgs> FilterHelpOpening;
+
+        #endregion
+
+        #region FilterItemsLoaded
+
+        /// <summary>
+        /// Occurs following the loading of the items in the
+        /// ComboBox, when a ComboBox filter edit is about to begin
+        /// </summary>
+        [Description("Occurs following the loading of the items in the ComboBox, when a ComboBox filter edit is about to begin.")]
+        public event EventHandler<GridFilterItemsLoadedEventArgs> FilterItemsLoaded;
+
+        #endregion
+
+        #region FilterLoadItems
+
+        /// <summary>
+        /// Occurs when a ComboBox filter edit is about to begin
+        /// and the items in the comboBox need to be loaded
+        /// </summary>
+        [Description("Occurs when a ComboBox filter edit is about to begin and the items in the comboBox need to be loaded.")]
+        public event EventHandler<GridFilterLoadItemsEventArgs> FilterLoadItems;
+
+        #endregion
+
+        #region FilterLoadUserData
+
+        /// <summary>
+        /// Occurs when user defined Filter data needs to be loaded
+        /// </summary>
+        [Description("Occurs when user defined Filter data needs to be loaded.")]
+        public event EventHandler<GridFilterLoadUserDataEventArgs> FilterLoadUserData;
+
+        #endregion
+
+        #region FilterPopupClosing
+
+        /// <summary>
+        /// Occurs when a column filter menu is closing
+        /// </summary>
+        [Description("Occurs when a column filter menu is closing.")]
+        public event EventHandler<GridFilterPopupClosingEventArgs> FilterPopupClosing;
+
+        #endregion
+
+        #region FilterPopupLoad
+
+        /// <summary>
+        /// Occurs when a column filter menu needs loaded
+        /// </summary>
+        [Description("Occurs when a column filter menu needs loaded.")]
+        public event EventHandler<GridFilterPopupLoadEventArgs> FilterPopupLoad;
+
+        #endregion
+
+        #region FilterPopupLoaded
+
+        /// <summary>
+        /// Occurs after a column filter menu has been loaded
+        /// </summary>
+        [Description("Occurs after a column filter menu has been loaded.")]
+        public event EventHandler<GridFilterPopupLoadedEventArgs> FilterPopupLoaded;
+
+        #endregion
+
+        #region FilterPopupOpening
+
+        /// <summary>
+        /// Occurs when a column filter menu is about to open
+        /// </summary>
+        [Description("Occurs when a column filter menu is about to open.")]
+        public event EventHandler<GridFilterPopupOpeningEventArgs> FilterPopupOpening;
+
+        #endregion
+
+        #region FilterPopupValueChanged
+
+        /// <summary>
+        /// Occurs when a filter popup value has changed
+        /// </summary>
+        [Description("Occurs when a filter popup value has changed.")]
+        public event EventHandler<GridFilterPopupValueChangedEventArgs> FilterPopupValueChanged;
+
+        #endregion
+
+        #region FilterRowError
+
+        /// <summary>
+        /// Occurs when a row filter error has occurred
+        /// </summary>
+        [Description("Occurs when a row filter error has occurred.")]
+        public event EventHandler<GridFilterRowErrorEventArgs> FilterRowError;
+
+        #endregion
+
+        #region FilterRowHeaderClick
+
+        /// <summary>
+        /// Occurs when a Filter RowHeader has been clicked
+        /// </summary>
+        [Description("Occurs when a Filter RowHeader has been clicked.")]
+        public event EventHandler<GridCancelEventArgs> FilterRowHeaderClick;
+
+        #endregion
+
+        #region FilterStoreUserData
+
+        /// <summary>
+        /// Occurs when user defined Filter data needs to be stored
+        /// </summary>
+        [Description("Occurs when user defined Filter data needs to be loaded.")]
+        public event EventHandler<GridFilterStoreUserDataEventArgs> FilterStoreUserData;
+
+        #endregion
+
+        #region FilterUserFunction
+
+        /// <summary>
+        /// Occurs when a Filter User function needs evaluated
+        /// </summary>
+        [Description("Occurs when a Filter User function needs evaluated.")]
+        public event EventHandler<GridFilterUserFunctionEventArgs> FilterUserFunction;
+
+        #endregion
+
+        #region GetFilterEditType
+
+        /// <summary>
+        /// Occurs when the column filter edit type is needed
+        /// </summary>
+        [Description("Occurs when the column filter edit type is needed.")]
+        public event EventHandler<GridGetFilterEditTypeEventArgs> GetFilterEditType;
+
+        #endregion
+
+        #endregion
+
+        #region GetCellRanges
+
+        /// <summary>
+        /// Occurs when the grid needs to get the current merged cell ranges
+        /// </summary>
+        [Description("Occurs when the grid needs to get the current merged cell ranges.")]
+        public event EventHandler<GridGetCellRangesEventArgs> GetCellRanges;
+
+        #endregion
+
+        #region GetCellFormattedValue
+
+        /// <summary>
+        /// Occurs when a Modal cell Value needs formatted
+        /// </summary>
+        [Description("Occurs when a Modal cell Value needs formatted.")]
+        public event EventHandler<GridGetCellFormattedValueEventArgs> GetCellFormattedValue;
+
+        #endregion
+
+        #region GetCellRangeFormattedValue
+
+        /// <summary>
+        /// Occurs when a CellRange Formatted Value is needed
+        /// </summary>
+        [Description("Occurs when a CellRange Formatted Value is needed.")]
+        public event EventHandler<GridGetCellRangeFormattedValueEventArgs> GetCellRangeFormattedValue;
+
+        #endregion
+
+        #region GetCellStyle
+
+        /// <summary>
+        /// Occurs when a Cell Style is needed
+        /// </summary>
+        [Description("Occurs when a Cell Style is needed.")]
+        public event EventHandler<GridGetCellStyleEventArgs> GetCellStyle;
+
+        #endregion
+
+        #region GetCellToolTip
+
+        /// <summary>
+        /// Occurs when a Cell ToolTip is needed
+        /// </summary>
+        [Description("Occurs when a Cell ToolTip is needed.")]
+        public event EventHandler<GridGetCellToolTipEventArgs> GetCellToolTip;
+
+        #endregion
+
+        #region GetCellValue
+
+        /// <summary>
+        /// Occurs when a Cell Value is needed
+        /// </summary>
+        [Description("Occurs when a Cell Value is needed.")]
+        public event EventHandler<GridGetCellValueEventArgs> GetCellValue;
+
+        #endregion
+
+        #region GetColumnGroupHeaderStyle
+
+        /// <summary>
+        /// Occurs when a ColumnGroupHeader style is needed
+        /// </summary>
+        [Description("Occurs when a ColumnGroupHeader style is needed.")]
+        public event EventHandler<GridGetColumnGroupHeaderStyleEventArgs> GetColumnGroupHeaderStyle;
+
+        #endregion
+
+        #region GetColumnHeaderRowHeaderStyle
+
+        /// <summary>
+        /// Occurs when a ColumnHeader RowHeader style is needed
+        /// </summary>
+        [Description("Occurs when a ColumnHeader RowHeader style is needed.")]
+        public event EventHandler<GridGetColumnHeaderRowHeaderStyleEventArgs> GetColumnHeaderRowHeaderStyle;
+
+        #endregion
+
+        #region GetColumnHeaderStyle
+
+        /// <summary>
+        /// Occurs when a ColumnHeader style is needed
+        /// </summary>
+        [Description("Occurs when a ColumnHeader style is needed.")]
+        public event EventHandler<GridGetColumnHeaderStyleEventArgs> GetColumnHeaderStyle;
+
+        #endregion
+
+        #region GetColumnHeaderToolTip
+
+        /// <summary>
+        /// Occurs when a ColumnHeader ToolTip is needed
+        /// </summary>
+        [Description("Occurs when a ColumnHeader ToolTip is needed.")]
+        public event EventHandler<GridGetColumnHeaderToolTipEventArgs> GetColumnHeaderToolTip;
+
+        #endregion
+
+        #region GetDisplayRanges
+
+        /// <summary>
+        /// Occurs when the grid needs to get the current display ranges
+        /// </summary>
+        [Description("Occurs when the grid needs to get the current display ranges.")]
+        public event EventHandler<GridGetDisplayRangesEventArgs> GetDisplayRanges;
+
+        #endregion
+
+        #region GetFilterRowStyle
+
+        /// <summary>
+        /// Occurs when a FilterRow style is needed
+        /// </summary>
+        [Description("Occurs when a FilterRow style is needed.")]
+        public event EventHandler<GridGetFilterRowStyleEventArgs> GetFilterRowStyle;
+
+        #endregion
+
+        #region GetFilterColumnHeaderStyle
+
+        /// <summary>
+        /// Occurs when a Filter ColumnHeader style is needed
+        /// </summary>
+        [Description("Occurs when a Filter ColumnHeader style is needed.")]
+        public event EventHandler<GridGetFilterColumnHeaderStyleEventArgs> GetFilterColumnHeaderStyle;
+
+        #endregion
+
+        #region ConfigureGroupBox
+
+        /// <summary>
+        /// Occurs when a GroupBox Size is needed
+        /// </summary>
+        [Description("Occurs when a GroupBox needs configured.")]
+        public event EventHandler<GridConfigureGroupBoxEventArgs> ConfigureGroupBox;
+
+        #endregion
+
+        #region GetGroupDetailRows
+
+        /// <summary>
+        /// Occurs when a list of group detail rows is needed
+        /// </summary>
+        [Description("Occurs when a list of group detail rows is needed.")]
+        public event EventHandler<GridGetGroupDetailRowsEventArgs> GetGroupDetailRows;
+
+        #endregion
+
+        #region GetGroupHeaderStyle
+
+        /// <summary>
+        /// Occurs when an GroupHeader style is needed
+        /// </summary>
+        [Description("Occurs when a GroupHeader style is needed.")]
+        public event EventHandler<GridGetGroupHeaderStyleEventArgs> GetGroupHeaderStyle;
+
+        #endregion
+
+        #region GetColumnGroupHeaderToolTip
+
+        /// <summary>
+        /// Occurs when a ColumnGroupHeader ToolTip is needed
+        /// </summary>
+        [Description("Occurs when a ColumnGroupHeader ToolTip is needed.")]
+        public event EventHandler<GridGetColumnGroupHeaderToolTipEventArgs> GetColumnGroupHeaderToolTip;
+
+        #endregion
+
+        #region GetMergedCellStyle
+
+        /// <summary>
+        /// Occurs when a Merged Cell Style is needed
+        /// </summary>
+        [Description("Occurs when a Merged Cell Style is needed.")]
+        public event EventHandler<GridGetMergedCellStyleEventArgs> GetMergedCellStyle;
+
+        #endregion
+
+        #region GetPanelStyle
+
+        /// <summary>
+        /// Occurs when a GridPanel style is needed
+        /// </summary>
+        [Description("Occurs when a GridPanel style is needed.")]
+        public event EventHandler<GridGetPanelStyleEventArgs> GetPanelStyle;
+
+        #endregion
+
+        #region GetGroupId
+
+        /// <summary>
+        /// Occurs when an element Group identifier is needed
+        /// </summary>
+        [Description("Occurs when an element Group identifier is needed.")]
+        public event EventHandler<GridGetGroupIdEventArgs> GetGroupId;
+
+        #endregion
+
+        #region GetRowCellStyle
+
+        /// <summary>
+        /// Occurs when a row CellStyle is needed
+        /// </summary>
+        [Description("Occurs when a row CellStyle is needed.")]
+        public event EventHandler<GridGetRowCellStyleEventArgs> GetRowCellStyle;
+
+        #endregion
+
+        #region GetRowHeaderStyle
+
+        /// <summary>
+        /// Occurs when a row RowHeader style is needed
+        /// </summary>
+        [Description("Occurs when a row RowHeader style is needed.")]
+        public event EventHandler<GridGetRowHeaderStyleEventArgs> GetRowHeaderStyle;
+
+        #endregion
+
+        #region GetRowHeaderText
+
+        /// <summary>
+        /// Occurs when a row's header text is needed
+        /// </summary>
+        [Description("Occurs when a row's header text is needed.")]
+        public event EventHandler<GridGetRowHeaderTextEventArgs> GetRowHeaderText;
+
+        #endregion
+
+        #region GetRowStyle
+
+        /// <summary>
+        /// Occurs when a row style is needed
+        /// </summary>
+        [Description("Occurs when a row style is needed.")]
+        public event EventHandler<GridGetRowStyleEventArgs> GetRowStyle;
+
+        #endregion
+
+        #region GroupSorting
+
+        /// <summary>
+        /// Occurs when a grid Group is about to be sorted
+        /// </summary>
+        [Description("Occurs when a grid Group are about to be sorted.")]
+        public event EventHandler<GridCancelEventArgs> GroupSorting;
+
+        #endregion
+
+        #region GroupSorted
+
+        /// <summary>
+        /// Occurs when a grid Group has been sorted
+        /// </summary>
+        [Description("Occurs when a grid Group has been sorted.")]
+        public event EventHandler<GridEventArgs> GroupSorted;
+
+        #endregion
+
+        #region GetTextRowStyle
+
+        /// <summary>
+        /// Occurs when a GridTextRow (Header, footer, etc) style is needed
+        /// </summary>
+        [Description("Occurs when a GridTextRow (Header, footer, etc) style is needed.")]
+        public event EventHandler<GridGetTextRowStyleEventArgs> GetTextRowStyle;
+
+        #endregion
+
+        #region GroupChanged
+
+        /// <summary>
+        /// Occurs when column Grouping has changed
+        /// </summary>
+        [Description("Occurs when column Grouping has changed.")]
+        public event EventHandler<GridGroupChangedEventArgs> GroupChanged;
+
+        #endregion
+
+        #region GroupHeaderClick
+
+        /// <summary>
+        /// Occurs when a Group Header has been clicked
+        /// </summary>
+        [Description("Occurs when a Group Header has been clicked.")]
+        public event EventHandler<GridGroupHeaderClickEventArgs> GroupHeaderClick;
+
+        #endregion
+
+        #region GroupHeaderDoubleClick
+
+        /// <summary>
+        /// Occurs when a Group Header has been double clicked
+        /// </summary>
+        [Description("Occurs when a Group Header has been double clicked.")]
+        public event EventHandler<GridGroupHeaderDoubleClickEventArgs> GroupHeaderDoubleClick;
+
+        #endregion
+
+        #region LayoutOrderUpdating
+
+        /// <summary>
+        /// Occurs when a grid panel's order layout is being updated
+        /// </summary>
+        [Description("Occurs when a grid panel's order layout is being updated.")]
+        public event EventHandler<GridCancelEventArgs> LayoutOrderUpdating;
+
+        #endregion
+
+        #region LayoutOrderUpdated
+
+        /// <summary>
+        /// Occurs when a grid panel's order layout has been updated
+        /// </summary>
+        [Description("Occurs when a grid panel's order layout has been updated.")]
+        public event EventHandler<GridEventArgs> LayoutOrderUpdated;
+
+        #endregion
+
+        #region LocalizeString
+
+        /// <summary>
+        /// Occurs when the SuperGrid is looking for translated text for one of the internal text that are
+        /// displayed on menus, toolbars and customize forms. You need to set Handled=true if you want
+        /// your custom text to be used instead of the built-in system value.
+        /// </summary>
+        public event DotNetBarManager.LocalizeStringEventHandler LocalizeString;
+
+        #endregion
+
+        #region NoRowsMarkupLinkClick
+
+        /// <summary>
+        /// Occurs when a GridPanel's NoRowsText has a MarkupLink that has been clicked
+        /// </summary>
+        [Description("Occurs when a GridPanel's NoRowsText has a MarkupLink that has been clicked.")]
+        public event EventHandler<GridNoRowsMarkupLinkClickEventArgs> NoRowsMarkupLinkClick;
+
+        #endregion
+
+        #region PlayingSound
+
+        /// <summary>
+        /// Occurs when the grid is about to play a system sound (beep).
+        /// </summary>
+        [Description("Occurs when the grid is about to play a system sound (beep)..")]
+        public event EventHandler<GridPlayingSoundEventArgs> PlayingSound;
+
+        #endregion
+
+        #region GridPreviewKeyDown
+
+        ///<summary>
+        /// GridPreviewKeyDown
+        ///</summary>
+        [Description("PreviewKeyDown event, with the ability to specify that the key has been handled.")]
+        public event EventHandler<GridPreviewKeyDownEventArgs> GridPreviewKeyDown;
+
+        #endregion
+
+        #region PreviewKeyDown
+
+        ///<summary>
+        /// PreviewKeyDown
+        ///</summary>
+        [Description("Occurs before the System.Windows.Forms.Control.KeyDown event when a key is pressed while focus is on this control.")]
+        public new event EventHandler<PreviewKeyDownEventArgs> PreviewKeyDown;
+
+        #endregion
+
+        #region RefreshFilter
+
+        /// <summary>
+        /// Occurs when the Virtual row filter needs refreshed
+        /// </summary>
+        [Description("Occurs when the Virtual row filter needs refreshed.")]
+        public event EventHandler<GridRefreshFilterEventArgs> RefreshFilter;
+
+        #endregion
+
+        #region Render events
+
+        #region PostRenderCell
+
+        /// <summary>
+        /// Occurs after a cell has been rendered
+        /// </summary>
+        [Description("Occurs after a cell has been rendered.")]
+        public event EventHandler<GridPostRenderCellEventArgs> PostRenderCell;
+
+        #endregion
+
+        #region PreRenderCell
+
+        /// <summary>
+        /// Occurs when a cell is about to be rendered
+        /// </summary>
+        [Description("Occurs when a cell is about to be rendered.")]
+        public event EventHandler<GridPreRenderCellEventArgs> PreRenderCell;
+
+        #endregion
+
+        #region PostRenderPanelRow
+
+        /// <summary>
+        /// Occurs when a nested Panel Row has been rendered
+        /// </summary>
+        [Description("Occurs when a nested Panel Row has been rendered.")]
+        public event EventHandler<GridPostRenderRowEventArgs> PostRenderPanelRow;
+
+        #endregion
+
+        #region PreRenderPanelRow
+
+        /// <summary>
+        /// Occurs when a nested Panel Row is about to be rendered
+        /// </summary>
+        [Description("Occurs when a nested Panel Row is about to be rendered.")]
+        public event EventHandler<GridPreRenderRowEventArgs> PreRenderPanelRow;
+
+        #endregion
+
+        #region PostRenderRow
+
+        /// <summary>
+        /// Occurs after a row has been rendered
+        /// </summary>
+        [Description("Occurs after a row has been rendered.")]
+        public event EventHandler<GridPostRenderRowEventArgs> PostRenderRow;
+
+        #endregion
+
+        #region PreRenderRow
+
+        /// <summary>
+        /// Occurs when a row is about to be rendered
+        /// </summary>
+        [Description("Occurs when a row is about to be rendered.")]
+        public event EventHandler<GridPreRenderRowEventArgs> PreRenderRow;
+
+        #endregion
+
+        #region PostRenderTextRow
+
+        /// <summary>
+        /// Occurs after a TextRow (Caption, Footer, etc) has been rendered
+        /// </summary>
+        [Description("Occurs after a TextRow has been rendered.")]
+        public event EventHandler<GridPostRenderTextRowEventArgs> PostRenderTextRow;
+
+        #endregion
+
+        #region PreRenderTextRow
+
+        /// <summary>
+        /// Occurs when a TextRow (Caption, Footer, etc) is about to be rendered
+        /// </summary>
+        [Description("Occurs when a TextRow is about to be rendered.")]
+        public event EventHandler<GridPreRenderTextRowEventArgs> PreRenderTextRow;
+
+        #endregion
+
+        #region PostRenderGroupHeader
+
+        /// <summary>
+        /// Occurs after a Group header has been rendered
+        /// </summary>
+        [Description("Occurs after a Group header has been rendered.")]
+        public event EventHandler<GridPostRenderRowEventArgs> PostRenderGroupHeader;
+
+        #endregion
+
+        #region PreRenderGroupHeader
+
+        /// <summary>
+        /// Occurs when a Group header is about to be rendered
+        /// </summary>
+        [Description("Occurs when a Group header is about to be rendered.")]
+        public event EventHandler<GridPreRenderRowEventArgs> PreRenderGroupHeader;
+
+        #endregion
+
+        #region PostRenderColumnHeader
+
+        /// <summary>
+        /// Occurs after a Column header has been rendered
+        /// </summary>
+        [Description("Occurs after a Column header has been rendered.")]
+        public event EventHandler<GridPostRenderColumnHeaderEventArgs> PostRenderColumnHeader;
+
+        #endregion
+
+        #region PreRenderColumnHeader
+
+        /// <summary>
+        /// Occurs when a Column header is about to be rendered
+        /// </summary>
+        [Description("Occurs when a Column header is about to be rendered.")]
+        public event EventHandler<GridPreRenderColumnHeaderEventArgs> PreRenderColumnHeader;
+
+        #endregion
+
+        #region PostRenderColumnGroupHeader
+
+        /// <summary>
+        /// Occurs after a Column GroupHeader has been rendered
+        /// </summary>
+        [Description("Occurs after a Column GroupHeader has been rendered.")]
+        public event EventHandler<GridPostRenderColumnGroupHeaderEventArgs> PostRenderColumnGroupHeader;
+
+        #endregion
+
+        #region PreRenderColumnGroupHeader
+
+        /// <summary>
+        /// Occurs when a Column GroupHeader is about to be rendered
+        /// </summary>
+        [Description("Occurs when a Column GroupHeader is about to be rendered.")]
+        public event EventHandler<GridPreRenderColumnGroupHeaderEventArgs> PreRenderColumnGroupHeader;
+
+        #endregion
+
+        #region PostRenderFilterPopupGripBar
+
+        /// <summary>
+        /// Occurs after a FilterPopup GripBar has been rendered
+        /// </summary>
+        [Description("Occurs after a FilterPopup GripBar has been rendered.")]
+        public event EventHandler<GridPostRenderFilterPopupGripBarEventArgs> PostRenderFilterPopupGripBar;
+
+        #endregion
+
+        #region PreRenderFilterPopupGripBar
+
+        /// <summary>
+        /// Occurs when a FilterPopup GripBar is about to be rendered
+        /// </summary>
+        [Description("Occurs when a FilterPopup GripBar is about to be rendered.")]
+        public event EventHandler<GridPreRenderFilterPopupGripBarEventArgs> PreRenderFilterPopupGripBar;
+
+        #endregion
+
+        #region PostRenderFilterRow
+
+        /// <summary>
+        /// Occurs after a Filter Row has been rendered
+        /// </summary>
+        [Description("Occurs after a Filter Row has been rendered.")]
+        public event EventHandler<GridPostRenderFilterRowEventArgs> PostRenderFilterRow;
+
+        #endregion
+
+        #region PreRenderFilterRow
+
+        /// <summary>
+        /// Occurs when a Filter Row is about to be rendered
+        /// </summary>
+        [Description("Occurs when a Filter Row is about to be rendered.")]
+        public event EventHandler<GridPreRenderFilterRowEventArgs> PreRenderFilterRow;
+
+        #endregion
+
+        #region PostRenderGroupBox
+
+        /// <summary>
+        /// Occurs after a GroupBox has been rendered
+        /// </summary>
+        [Description("Occurs after a GroupBox has been rendered.")]
+        public event EventHandler<GridPostRenderGroupBoxEventArgs> PostRenderGroupBox;
+
+        #endregion
+
+        #region PreRenderGroupBox
+
+        /// <summary>
+        /// Occurs when a GroupBox is about to be rendered
+        /// </summary>
+        [Description("Occurs when a GroupBox is about to be rendered.")]
+        public event EventHandler<GridPreRenderGroupBoxEventArgs> PreRenderGroupBox;
+
+        #endregion
+
+        #region PostRenderGroupBoxConnector
+
+        /// <summary>
+        /// Occurs after a GroupBox Connector been rendered
+        /// </summary>
+        [Description("Occurs after a GroupBox Connectorhas been rendered.")]
+        public event EventHandler<GridPostRenderGroupBoxConnectorEventArgs> PostRenderGroupBoxConnector;
+
+        #endregion
+
+        #region PreRenderGroupBoxConnector
+
+        /// <summary>
+        /// Occurs when a GroupBox Connector is about to be rendered
+        /// </summary>
+        [Description("Occurs when a GroupBox Connector is about to be rendered.")]
+        public event EventHandler<GridPreRenderGroupBoxConnectorEventArgs> PreRenderGroupBoxConnector;
+
+        #endregion
+
+        #endregion
+
+        #region Row events
+
+        #region LoadVirtualRow
+
+        /// <summary>
+        /// Occurs when a virtual row needs loaded
+        /// </summary>
+        [Description("Occurs when a virtual row needs loaded.")]
+        public event EventHandler<GridVirtualRowEventArgs> LoadVirtualRow;
+
+        #endregion
+
+        #region RowActivated
+
+        /// <summary>
+        /// Occurs when a row has been made the Active Row
+        /// </summary>
+        [Description("Occurs when a row has been made the Active Row.")]
+        public event EventHandler<GridRowActivatedEventArgs> RowActivated;
+
+        #endregion
+
+        #region RowActivating
+
+        /// <summary>
+        /// Occurs when a row is about to be made the Active Row
+        /// </summary>
+        [Description("Occurs when a row is about to be made the Active Row.")]
+        public event EventHandler<GridRowActivatingEventArgs> RowActivating;
+
+        #endregion
+
+        #region RowAdded
+
+        /// <summary>
+        /// Occurs when a row has been added
+        /// </summary>
+        [Description("Occurs when a row has been added.")]
+        public event EventHandler<GridRowAddedEventArgs> RowAdded;
+
+        #endregion
+
+        #region RowAdding
+
+        /// <summary>
+        /// Occurs when a row is about to be added
+        /// </summary>
+        [Description("Occurs when a row is about to be added.")]
+        public event EventHandler<GridRowAddingEventArgs> RowAdding;
+
+        #endregion
+
+        #region RowDeleted
+
+        /// <summary>
+        /// Occurs when a row has been deleted
+        /// </summary>
+        [Description("Occurs when a row has been deleted.")]
+        public event EventHandler<GridRowDeletedEventArgs> RowDeleted;
+
+        #endregion
+
+        #region RowDeleting
+
+        /// <summary>
+        /// Occurs when a row is about to be deleted
+        /// </summary>
+        [Description("Occurs when a row is about to be deleted.")]
+        public event EventHandler<GridRowDeletingEventArgs> RowDeleting;
+
+        #endregion
+
+        #region GetDetailRowHeight
+
+        /// <summary>
+        /// Occurs when a row's 'detail' height is needed
+        /// </summary>
+        [Description("Occurs when a row's 'detail' height is needed.")]
+        public event EventHandler<GridGetDetailRowHeightEventArgs> GetDetailRowHeight;
+
+        #endregion
+
+        #region RowClick
+
+        /// <summary>
+        /// Occurs when a row has been clicked
+        /// </summary>
+        [Description("Occurs when a row has been clicked.")]
+        public event EventHandler<GridRowClickEventArgs> RowClick;
+
+        #endregion
+
+        #region RowDoubleClick
+
+        /// <summary>
+        /// Occurs when a row has been double clicked
+        /// </summary>
+        [Description("Occurs when a row has been double clicked.")]
+        public event EventHandler<GridRowDoubleClickEventArgs> RowDoubleClick;
+
+        #endregion
+
+        #region RowHeaderClick
+
+        /// <summary>
+        /// Occurs when a row header has been clicked
+        /// </summary>
+        [Description("Occurs when a row header has been clicked.")]
+        public event EventHandler<GridRowHeaderClickEventArgs> RowHeaderClick;
+
+        #endregion
+
+        #region RowHeaderDoubleClick
+
+        /// <summary>
+        /// Occurs when a row header has been double clicked
+        /// </summary>
+        [Description("Occurs when a row header has been double clicked.")]
+        public event EventHandler<GridRowHeaderDoubleClickEventArgs> RowHeaderDoubleClick;
+
+        #endregion
+
+        #region RowHeaderResized
+
+        /// <summary>
+        /// Occurs when the grid Row Header has been resized
+        /// </summary>
+        [Description("Occurs when the grid Row Header has been resized.")]
+        public event EventHandler<GridEventArgs> RowHeaderResized;
+
+        #endregion
+
+        #region RowInfoClick
+
+        /// <summary>
+        /// Occurs when a row InfoImage has been clicked
+        /// </summary>
+        [Description("Occurs when a row InfoImage has been clicked.")]
+        public event EventHandler<GridRowClickEventArgs> RowInfoClick;
+
+        #endregion
+
+        #region RowInfoDoubleClick
+
+        /// <summary>
+        /// Occurs when a row InfoImage has been double clicked
+        /// </summary>
+        [Description("Occurs when a row InfoImage has been double clicked.")]
+        public event EventHandler<GridRowDoubleClickEventArgs> RowInfoDoubleClick;
+
+        #endregion
+
+        #region RowInfoEnter
+
+        /// <summary>
+        /// Occurs when a row InfoImage has been entered via the mouse
+        /// </summary>
+        [Description("Occurs when a row InfoImage has been entered via the mouse.")]
+        public event EventHandler<GridRowInfoEnterEventArgs> RowInfoEnter;
+
+        #endregion
+
+        #region RowInfoLeave
+
+        /// <summary>
+        /// Occurs when a row InfoImage has been exited via the mouse
+        /// </summary>
+        [Description("Occurs when a row InfoImage has been exited via the mouse.")]
+        public event EventHandler<GridRowInfoLeaveEventArgs> RowInfoLeave;
+
+        #endregion
+
+        #region RowLoaded
+
+        /// <summary>
+        /// Occurs when a 'bound' data row has been loaded
+        /// </summary>
+        [Description("Occurs when a 'bound' data row has been loaded.")]
+        public event EventHandler<GridRowLoadedEventArgs> RowLoaded;
+
+        #endregion
+
+        #region RowMarkedDirty
+
+        /// <summary>
+        /// Occurs when a cell editor marks a row as Dirty
+        /// </summary>
+        [Description("Occurs when a cell editor marks a row as Dirty.")]
+        public event EventHandler<GridEditEventArgs> RowMarkedDirty;
+
+        #endregion
+
+        #region RowMouseDown
+
+        /// <summary>
+        /// Occurs when a mouse button is pressed
+        /// while the mouse pointer is within a Row
+        /// </summary>
+        [Description("Occurs when a mouse button is pressed while the mouse pointer is within a Row.")]
+        public event EventHandler<GridRowMouseEventArgs> RowMouseDown;
+
+        #endregion
+
+        #region RowMouseEnter
+
+        /// <summary>
+        /// Occurs when the mouse pointer enters a Row
+        /// </summary>
+        [Description("Occurs when the mouse pointer enters a Row.")]
+        public event EventHandler<GridRowEventArgs> RowMouseEnter;
+
+        #endregion
+
+        #region RowMouseLeave
+
+        /// <summary>
+        /// Occurs when the mouse pointer leaves a Row
+        /// </summary>
+        [Description("Occurs when the mouse pointer leaves a Row.")]
+        public event EventHandler<GridRowEventArgs> RowMouseLeave;
+
+        #endregion
+
+        #region RowMouseMove
+
+        /// <summary>
+        /// Occurs when the mouse pointer moves within a Row
+        /// </summary>
+        [Description("Occurs when the mouse pointer leaves a Row.")]
+        public event EventHandler<GridRowMouseEventArgs> RowMouseMove;
+
+        #endregion
+
+        #region RowMouseUp
+
+        /// <summary>
+        /// Occurs when a mouse button is released
+        /// while the mouse pointer is within a Row
+        /// </summary>
+        [Description("Occurs when a mouse button is released while the mouse pointer is within a Row.")]
+        public event EventHandler<GridRowMouseEventArgs> RowMouseUp;
+
+        #endregion
+
+        #region RowMoved
+
+        /// <summary>
+        /// Occurs when a row has been moved or reordered
+        /// </summary>
+        [Description("Occurs when a row has been moved or reordered.")]
+        public event EventHandler<GridRowMovedEventArgs> RowMoved;
+
+        #endregion
+
+        #region RowMoving
+
+        /// <summary>
+        /// Occurs when a row is about to be moved or reordered
+        /// </summary>
+        [Description("Occurs when a row is about to be moved or reordered.")]
+        public event EventHandler<GridRowMovingEventArgs> RowMoving;
+
+        #endregion
+
+        #region RowResized
+
+        /// <summary>
+        /// Occurs when a row has been resized
+        /// </summary>
+        [Description("Occurs when a row has been resized.")]
+        public event EventHandler<GridRowEventArgs> RowResized;
+
+        #endregion
+
+        #region RowRestored
+
+        /// <summary>
+        /// Occurs when a deleted row has been restored (undeleted)
+        /// </summary>
+        [Description("Occurs when a deleted row has been restored (undeleted).")]
+        public event EventHandler<GridRowRestoredEventArgs> RowRestored;
+
+        #endregion
+
+        #region RowRestoring
+
+        /// <summary>
+        /// Occurs when a deleted row is about to be restored (undeleted)
+        /// </summary>
+        [Description("Occurs when a deleted row is about to be restored (undeleted).")]
+        public event EventHandler<GridRowRestoringEventArgs> RowRestoring;
+
+        #endregion
+
+        #region RowSetDefaultValues
+
+        /// <summary>
+        /// Occurs when a user enters the Insertion Row
+        /// or presses the 'insert' key to add a new row,
+        /// permitting default values to be set for each cell
+        /// </summary>
+        [Description("Occurs when a user enters the Insertion Row or presses the 'insert' key to add a new row, permitting default values to be set for each cell.")]
+        public event EventHandler<GridRowSetDefaultValuesEventArgs> RowSetDefaultValues;
+
+        #endregion
+
+        #region RowsGrouped
+
+        /// <summary>
+        /// Occurs when the grid Rows have been grouped (or ungrouped)
+        /// </summary>
+        [Description("Occurs when the grids Row have been grouped (or ungrouped).")]
+        public event EventHandler<GridEventArgs> RowsGrouped;
+
+        #endregion
+
+        #region RowsGrouping
+
+        /// <summary>
+        /// Occurs when the grid Rows are about to be grouped (or ungrouped)
+        /// </summary>
+        [Description("Occurs when the Rows are about to be grouped (or ungrouped).")]
+        public event EventHandler<GridCancelEventArgs> RowsGrouping;
+
+        #endregion
+
+        #region RowsPurged
+
+        /// <summary>
+        /// Occurs when grid rows have been purged
+        /// </summary>
+        [Description("Occurs when grid rows have been purged.")]
+        public event EventHandler<GridRowEventArgs> RowsPurged;
+
+        #endregion
+
+        #region RowsPurging
+
+        /// <summary>
+        /// Occurs when grid rows are about to be purged
+        /// </summary>
+        [Description("Occurs when grid rows are about to be purged.")]
+        public event EventHandler<GridRowsPurgingEventArgs> RowsPurging;
+
+        #endregion
+
+        #region RowsSorting
+
+        /// <summary>
+        /// Occurs when the grid Rows are about to be sorted
+        /// </summary>
+        [Description("Occurs when the grid Rows are about to be sorted.")]
+        public event EventHandler<GridCancelEventArgs> RowsSorting;
+
+        #endregion
+
+        #region RowsSorted
+
+        /// <summary>
+        /// Occurs when the grid Rows have been sorted
+        /// </summary>
+        [Description("Occurs when the grid Rows have been sorted.")]
+        public event EventHandler<GridEventArgs> RowsSorted;
+
+        #endregion
+
+        #region RowValidating
+
+        /// <summary>
+        /// Occurs when a row needs validating
+        /// </summary>
+        [Description("Occurs when a row needs validating.")]
+        public event EventHandler<GridRowValidatingEventArgs> RowValidating;
+
+        #endregion
+
+        #region RowValidated
+
+        /// <summary>
+        /// Occurs after a row has been validated
+        /// </summary>
+        [Description("Occurs after a row has been validated.")]
+        public event EventHandler<GridRowValidatedEventArgs> RowValidated;
+
+        #endregion
+
+        #region StoreVirtualRow
+
+        /// <summary>
+        /// Occurs when a virtual row has changed and
+        /// it's contents need stored
+        /// </summary>
+        [Description("Occurs when a virtual row has changed and it's contents need stored.")]
+        public event EventHandler<GridVirtualRowEventArgs> StoreVirtualRow;
+
+        #endregion
+
+        #region VirtualRowLoaded
+
+        /// <summary>
+        /// Occurs when after a virtual row has been loaded
+        /// </summary>
+        [Description("Occurs after a virtual row has been loaded.")]
+        public event EventHandler<GridVirtualRowEventArgs> VirtualRowLoaded;
+
+        #endregion
+
+        #endregion
+
+        #region Scroll
+
+        /// <summary>
+        /// Occurs when the Horizontal or Vertical scrollbar has been scrolled
+        /// </summary>
+        [Description("Occurs when the Horizontal or Vertical scrollbar has been scrolled.")]
+        public event EventHandler<GridScrollEventArgs> Scroll;
+
+        #endregion
+
+        #region ScrollMin
+
+        /// <summary>
+        /// Occurs when the Horizontal or Vertical
+        /// scrollbar has been scrolled to the Minimum and released
+        /// </summary>
+        [Description("Occurs when the Horizontal or Vertical scrollbar has been scrolled to the Minimum and released.")]
+        public event EventHandler<GridScrollEventArgs> ScrollMin;
+
+        #endregion
+
+        #region ScrollMax
+
+        /// <summary>
+        /// Occurs when the Horizontal or Vertical scrollbar has been scrolled to the Maximum and released
+        /// </summary>
+        [Description("Occurs when the Horizontal or Vertical scrollbar has been scrolled to the Maximum and released.")]
+        public event EventHandler<GridScrollEventArgs> ScrollMax;
+
+        #endregion
+
+        #region SelectionChanged
+
+        /// <summary>
+        /// Occurs when the selected items in the grid has changed
+        /// </summary>
+        [Description("Occurs when the selected items in the grid has changed.")]
+        public event EventHandler<GridEventArgs> SelectionChanged;
+
+        #endregion
+
+        #region SelectionChanging
+
+        /// <summary>
+        /// Occurs when the selected items in the grid is about to change
+        /// </summary>
+        [Description("Occurs when the selected items in the grid is about to change.")]
+        public event EventHandler<GridSelectionChangingEventArgs> SelectionChanging;
+
+        #endregion
+
+        #region SortChanged
+
+        /// <summary>
+        /// Occurs when the grid sort order has changed
+        /// </summary>
+        [Description("Occurs when the grid sort order has changed.")]
+        public event EventHandler<GridEventArgs> SortChanged;
+
+        #endregion
+
+        #region StyleManagerChanged
+
+        /// <summary>
+        /// Occurs when the StyleManager style has changed
+        /// </summary>
+        [Description("Occurs when the StyleManager style has changed.")]
+        public event EventHandler<EventArgs> StyleManagerChanged;
+
+        #endregion
+
+        #region TextRowClick
+
+        /// <summary>
+        /// Occurs when a GridTextRow (Title, footer, ...) has been clicked
+        /// </summary>
+        [Description("Occurs when a GridTextRow (Title, footer, ...) has been clicked.")]
+        public event EventHandler<GridTextRowEventArgs> TextRowClick;
+
+        #endregion
+
+        #region TextRowHeaderClick
+
+        /// <summary>
+        /// Occurs when a GridTextRow (Title, footer, ...) Row Header has been clicked
+        /// </summary>
+        [Description("Occurs when a GridTextRow (Title, footer, ...) Row Header has been clicked.")]
+        public event EventHandler<GridTextRowEventArgs> TextRowHeaderClick;
+
+        #endregion
+
+        #region TextRowMarkupLinkClick
+
+        /// <summary>
+        /// Occurs when a GridTextRow (Title, footer, ...) has a MarkupLink that has been clicked
+        /// </summary>
+        [Description("Occurs when a GridTextRow (Title, footer, ...) has a MarkupLink that has been clicked.")]
+        public event EventHandler<GridTextRowMarkupLinkClickEventArgs> TextRowMarkupLinkClick;
+
+        #endregion
+
+        #region UpdateCellDisplayRanges
+
+        /// <summary>
+        /// Occurs after the grid has created its CellDisplayRanges list
+        /// </summary>
+        [Description("Occurs after the grid has created its CellDisplayRanges list.")]
+        public event EventHandler<GridUpdateCellDisplayRangesEventArgs> UpdateCellDisplayRanges;
+
+        #endregion
+
+        #endregion
+
+        #region Constants
+
+        const int WmSetFocus = 0x7;
+
+        const int WmKeyDown = 0x100;
+        const int WmKeyUp = 0x101;
+
+        const int WmMouseMove = 0x200;
+        const int WmMouseDown = 0x201;
+        const int WmMouseLeave = 0x2a3;
+        const int WmMouseWheel = 0x20a;
+
+        const int InputKeyboard = 1;
+
+        #endregion
+
+        #region DllImports
+
+        #region SendInput
+
+        #region SendInput32
+
+        [StructLayout(LayoutKind.Explicit)]
+        struct Input32
+        {
+            [FieldOffset(0)]
+            public int type;
+
+            [FieldOffset(4)]
+            public MouseInput mi;
+
+            [FieldOffset(4)]
+            public KeyBoardInput ki;
+
+            [FieldOffset(4)]
+            public HardwareInput hi;
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        struct KeyBoardInput
+        {
+            private ushort vk;
+            private ushort scan;
+            private uint flags;
+            private uint time;
+            private IntPtr extraInfo;
+
+            public KeyBoardInput(ushort key)
+            {
+                vk = key;
+
+                scan = 0;
+                time = 0;
+                extraInfo = IntPtr.Zero;
+                flags = 0;
+            }
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        struct MouseInput
+        {
+            public int dx;
+            public int dy;
+            public uint mouseData;
+            public uint dwFlags;
+            public uint time;
+            public IntPtr dwExtraInfo;
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        struct HardwareInput
+        {
+            public uint uMsg;
+            public ushort wParamL;
+            public ushort wParamH;
+        }
+
+        [DllImport("user32.dll", SetLastError = true)]
+        private static extern uint SendInput(uint nInputs, Input32[] pInputs, int cbSize);
+
+        #endregion
+
+        #region SendInput64
+
+        [StructLayout(LayoutKind.Explicit, Pack = 1)]
+        internal struct Input64
+        {
+            [FieldOffset(0)]
+            public uint type;
+
+            [FieldOffset(8)]
+            public KeyboardInput64 ki;
+        }
+
+        [StructLayout(LayoutKind.Explicit, Pack = 1)]
+        internal struct KeyboardInput64
+        {
+            [FieldOffset(0)]
+            public ushort vk;
+
+            [FieldOffset(2)]
+            public ushort scan;
+
+            [FieldOffset(4)]
+            public uint flags;
+
+            [FieldOffset(12)]
+            public uint time;
+
+            [FieldOffset(20)]
+            public uint extraInfo1;
+
+            [FieldOffset(28)]
+            public uint extraInfo2;
+
+            public KeyboardInput64(ushort key)
+            {
+                vk = key;
+
+                scan = 0;
+                time = 0;
+                extraInfo1 = 0;
+                extraInfo2 = 0;
+                flags = 0;
+            }
+        } 
+
+        [DllImport("user32.dll", SetLastError = true)]
+        private static extern uint SendInput(uint nInputs, Input64[] pInputs, int cbSize);
+
+        #endregion
+
+        #endregion
+
+        #region ScrollWindowEx
+
+        #region RECT definition
+
+        [StructLayout(LayoutKind.Sequential)]
+        internal struct RECT
+        {
+            public int Left, Top, Right, Bottom;
+
+            public RECT(int left, int top, int right, int bottom)
+            {
+                Left = left;
+                Top = top;
+                Right = right;
+                Bottom = bottom;
+            }
+
+            public RECT(System.Drawing.Rectangle r) : this(r.Left, r.Top, r.Right, r.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 Height
+            {
+                get { return Bottom - Top; }
+                set { Bottom = value + Top; }
+            }
+
+            public int Width
+            {
+                get { return Right - Left; }
+                set { Right = value + Left; }
+            }
+
+            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 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)
+                    return Equals((RECT)obj);
+
+                else if (obj is Rectangle)
+                    return Equals(new RECT((Rectangle)obj));
+
+                return false;
+            }
+
+            public override int GetHashCode()
+            {
+                return ((Rectangle)this).GetHashCode();
+            }
+
+            public override string ToString()
+            {
+                return string.Format(System.Globalization.CultureInfo.CurrentCulture, "{{Left={0},Top={1},Right={2},Bottom={3}}}", Left, Top, Right, Bottom);
+            }
+        }
+
+        #endregion
+
+        const uint SW_ERASE = (1 << 1);
+        const uint SW_INVALIDATE = (1 << 2);
+
+        [DllImport("user32.dll")]
+        private static extern int ScrollWindowEx(IntPtr hWnd, int dx, int dy,
+            ref RECT scrollRect, ref RECT clipRect, IntPtr hrgn, ref RECT updateRect, uint flags);
+
+        #endregion
+
+        #region GetKeyState
+
+        #region Keyboard
+
+        internal abstract class Keyboard
+        {
+            [Flags]
+            private enum KeyStates
+            {
+                None = 0,
+                Down = 1,
+                Toggled = 2
+            }
+
+            [DllImport("user32.dll", CharSet = CharSet.Auto, ExactSpelling = true)]
+            private static extern short GetKeyState(int keyCode);
+
+            private static KeyStates GetKeyState(Keys key)
+            {
+                KeyStates state = KeyStates.None;
+
+                short retVal = GetKeyState((int)key);
+
+                // If the high-order bit is 1, the key is down
+
+                if ((retVal & 0x8000) == 0x8000)
+                    state |= KeyStates.Down;
+
+                // If the low-order bit is 1, the key is toggled
+
+                if ((retVal & 1) == 1)
+                    state |= KeyStates.Toggled;
+
+                return state;
+            }
+
+            public static bool IsKeyDown(Keys key)
+            {
+                return KeyStates.Down == (GetKeyState(key) & KeyStates.Down);
+            }
+
+            public static bool IsKeyToggled(Keys key)
+            {
+                return KeyStates.Toggled == (GetKeyState(key) & KeyStates.Toggled);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region Private variables
+
+        private readonly GridPanel _PrimaryGrid;
+
+        private HScrollBarAdv _HScrollBar;
+        private VScrollBarAdv _VScrollBar;
+
+        private int _HScrollOffset;
+        private int _VScrollOffset;
+
+        private bool _HScrollBarEnabled;
+        private bool _VScrollBarEnabled;
+        private bool _ScrollBarScrolling;
+
+        private Rectangle _ViewRect = Rectangle.Empty;
+        private Rectangle _CViewRect = Rectangle.Empty;
+
+        private GridElement _CapturedItem;
+
+        private Timer _AutoScrollTimer;
+        private AutoScrollEnable _AutoScrollEnable;
+        private Rectangle _ScrollRect;
+
+        private bool _PostMouseMove;
+        private ushort _BoundsUpdateCount;
+        private ushort _BeginUpdateCount;
+        private Cursor _GridCursor = Cursors.Default;
+
+        private GridCell _EditorCell;
+        private GridCell _NonModalEditorCell;
+        private IGridCellEditControl _ActiveEditor;
+        private IGridCellEditControl _ActiveNonModalEditor;
+        private FilterPanel _ActiveFilterPanel;
+
+        private GridPanel _ActiveGrid;
+        private GridContainer _ActiveRow;
+        private GridCell _ActiveCell;
+        private GridElement _LastProcessedItem;
+        private int _LastCellIndex = -1;
+        private GridCell _LastActiveCell;
+
+        private string _ToolTipText;
+        private System.Windows.Forms.ToolTip _ToolTip;
+
+        private StyleType _SizingStyle = StyleType.NotSet;
+        private DefaultVisualStyles _DefaultVisualStyles;
+        private DefaultVisualStyles _BaseVisualStyles;
+
+        private ushort _StyleUpdateCount = 1;
+        private ushort _StyleMouseOverUpdateCount = 1;
+        private ushort _StyleSelectedUpdateCount = 1;
+        private ushort _StyleSelectedMouseOverUpdateCount = 1;
+        private ushort _ArrangeLayoutCount = 1;
+        private ushort _DisplayedMergeLayoutCount = 1;
+
+        private bool _NeedToUpdateIndicees;
+        private ushort _IndiceesUpdateCount;
+
+        private GridElement _DesignerElement;
+
+        private Keys _LastKeyDown;
+        private Keys _LastModifierKeys;
+
+        private TabSelection _TabSelection = TabSelection.Cell;
+
+        private bool _KeyPressSent;
+        private bool _IsInputKey;
+
+        private string _FilterShowAllString = "Show all";
+        private string _FilterShowNullString = "Show null";
+        private string _FilterShowNotNullString = "Show not null";
+        private string _FilterCustomString = "Custom";
+
+        private string _FilterApplyString = "Apply";
+        private string _FilterOkString = "OK";
+        private string _FilterCancelString = "Cancel";
+        private string _FilterCloseString = "Close";
+        private string _GroupByWaterMarkText = "Drag a column header here to group by that column";
+
+        private bool _FilterColorizeCustomExpr = true;
+        private bool _ShowCustomFilterHelp = true;
+        private bool _FilterUseExtendedCustomDialog;
+
+        private int _FilterMaxDropDownHeight = 300;
+
+        private ExpressionColors _FilterExprColors = new ExpressionColors();
+        private PopupControl _PopupControl;
+
+        private bool _LocalizedStringsLoaded;
+
+        private ExpandButtonType _ExpandButtonType = ExpandButtonType.NotSet;
+
+        private Cursor _DefaultCursor = Cursors.Default;
+        private bool _SetGridCursor;
+
+        private bool _HScrollBarVisible = true;
+        private bool _VScrollBarVisible = true;
+
+        private bool _InArrangeGrid;
+        private bool _CanScrollEx;
+        private bool _EnableFastScrolling = true;
+
+        private int _MaxToolTipLength = 2000;
+
+        #endregion
+
+        /// <summary>
+        /// Initializes a new instance of the SuperGridControl class.
+        /// </summary>
+        public SuperGridControl()
+        {
+            SetStyle(ControlStyles.UserPaint | ControlStyles.AllPaintingInWmPaint |
+                ControlStyles.Opaque | ControlStyles.ResizeRedraw |
+                ControlStyles.OptimizedDoubleBuffer | ControlStyles.SupportsTransparentBackColor, true);
+
+            _PrimaryGrid = new GridPanel();
+
+            _PrimaryGrid.SuperGrid = this;
+            _PrimaryGrid.ContainerBounds = ClientRectangle;
+
+            SetupScrollBars();
+
+            if (DesignMode == false)
+            {
+                Application.AddMessageFilter(this);
+
+                base.PreviewKeyDown += SuperGridControlPreviewKeyDown;
+            }
+
+            UpdateGridStyle();
+
+            StyleManager.Register(this);
+
+            if (BarFunctions.IsWindows7 && Touch.TouchHandler.IsTouchEnabled)
+            {
+                _TouchHandler = new Touch.TouchHandler(this, Touch.eTouchHandlerType.Gesture);
+
+                _TouchHandler.PanBegin += TouchHandlerPanBegin;
+                _TouchHandler.Pan += TouchHandlerPan;
+                _TouchHandler.PanEnd += TouchHandlerPanEnd;
+            }
+        }
+
+        protected override void ScaleControl(SizeF factor, BoundsSpecified specified)
+        {
+            Dpi.SetScaling(factor);
+
+            base.ScaleControl(factor, specified);
+
+            SetupScrollBars();
+        }
+
+        #region OnEnabledChanged
+
+        /// <summary>
+        /// OnEnabledChanged
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnEnabledChanged(EventArgs e)
+        {
+            base.OnEnabledChanged(e);
+
+            Refresh();
+        }
+
+        #endregion
+
+        #region StyleManagerStyleChanged
+
+        /// <summary>
+        /// Called by StyleManager to notify control that style on
+        /// manager has changed and that control should refresh its
+        /// appearance if its style is controlled by StyleManager.
+        /// </summary>
+        /// <param name="newStyle">New active style.</param>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void StyleManagerStyleChanged(eDotNetBarStyle newStyle)
+        {
+            UpdateGridStyle();
+        }
+
+        private void UpdateGridStyle()
+        {
+            SuperGridStyle style = SuperGridStyle.Office2010Blue;
+
+            switch (StyleManager.Style)
+            {
+                case eStyle.Office2007VistaGlass:
+                case eStyle.VisualStudio2010Blue:
+                case eStyle.Windows7Blue:
+                case eStyle.Office2007Blue:
+                case eStyle.Office2010Blue:
+                    style = SuperGridStyle.Office2010Blue;
+                    break;
+
+                case eStyle.Office2007Black:
+                case eStyle.Office2010Black:
+                    style = SuperGridStyle.Office2010Black;
+                    break;
+
+                case eStyle.Office2007Silver:
+                case eStyle.Office2010Silver:
+                    style = SuperGridStyle.Office2010Silver;
+                    break;
+
+                case eStyle.Metro:
+                case eStyle.VisualStudio2012Dark:
+                case eStyle.VisualStudio2012Light:
+                case eStyle.Office2016:
+                case eStyle.OfficeMobile2014:
+                    style = SuperGridStyle.Metro;
+                    break;
+            }
+
+            _BaseVisualStyles = VisualStylesTable.GetStyle(style);
+
+            if (IsHandleCreated == true)
+            {
+                UpdateStyleCount();
+
+                Invalidate(true);
+
+                if (StyleManagerChanged != null)
+                    StyleManagerChanged(this, new EventArgs());
+            }
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region ActiveCell
+
+        ///<summary>
+        /// Gets the current active cell
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public GridCell ActiveCell
+        {
+            get { return (_ActiveCell); }
+
+            internal set
+            {
+                if (_ActiveCell != value)
+                {
+                    _LastActiveCell = _ActiveCell;
+
+                    if (_ActiveCell != null)
+                        _ActiveCell.EditorDirty = false;
+
+                    _ActiveCell = value;
+
+                    OnActiveCellChanged(_LastActiveCell, _ActiveCell);
+                }
+            }
+        }
+
+        private void OnActiveCellChanged(
+            GridCell oldValue, GridCell newValue)
+        {
+            GridPanel panel =
+                (oldValue != null) ? oldValue.GridPanel :
+                (newValue != null) ? newValue.GridPanel : null;
+
+            DoCellActivatedEvent(panel, oldValue, newValue);
+        }
+
+        #endregion
+
+        #region ActiveEditor
+
+        ///<summary>
+        /// Gets the currently active cell editor, or null if
+        /// no edit is in progress
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public IGridCellEditControl ActiveEditor
+        {
+            get { return (_ActiveEditor); }
+            internal set {_ActiveEditor = value; }
+        }
+
+        #endregion
+
+        #region ActiveElement
+
+        ///<summary>
+        /// Gets the current active grid element (Row/Cell), or null if
+        /// there is no current active element
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public GridElement ActiveElement
+        {
+            get { return (_LastProcessedItem); }
+            
+            internal set
+            {
+                if (_LastProcessedItem != value)
+                {
+                    if (_LastProcessedItem != null)
+                        _LastProcessedItem.InvalidateRender();
+
+                    _LastProcessedItem = value;
+
+                    if (_LastProcessedItem != null)
+                        _LastProcessedItem.InvalidateRender();
+                }
+            }
+        }
+
+        #endregion
+
+        #region ActiveFilterPanel
+
+        ///<summary>
+        /// Gets the currently active FilterPanel
+        /// editor, or null if no edit is in progress
+        ///</summary>
+        public FilterPanel ActiveFilterPanel
+        {
+            get { return (_ActiveFilterPanel); }
+            internal set { _ActiveFilterPanel = value; }
+        }
+
+        #endregion
+
+        #region ActiveGrid
+
+        ///<summary>
+        /// Gets the current active grid
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public GridPanel ActiveGrid
+        {
+            get { return (_ActiveGrid); }
+
+            internal set
+            {
+                if (_ActiveGrid != value)
+                {
+                    if (_ActiveGrid != null)
+                    {
+                        if (_ActiveGrid.ActiveRow is GridRow)
+                            ((GridRow)_ActiveGrid.ActiveRow).EditorDirty = false;
+                    }
+
+                    GridPanel oldValue = _ActiveGrid;
+                    _ActiveGrid = value;
+
+                    OnActiveGridChanged(oldValue);
+
+                    ActiveRow = (_ActiveGrid != null) ? _ActiveGrid.ActiveRow : null;
+                }
+            }
+        }
+
+        private void OnActiveGridChanged(GridPanel oldPanel)
+        {
+            DoActiveGridChangedEvent(oldPanel);
+        }
+
+        #endregion
+
+        #region ActiveRow
+
+        ///<summary>
+        /// Gets the current active row, or null if no row
+        /// is defined or active
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public GridContainer ActiveRow
+        {
+            get
+            {
+                if (_ActiveGrid != null)
+                    return (_ActiveGrid.ActiveRow);
+
+                return (null);
+            }
+
+            internal set
+            {
+                if (_ActiveRow != value)
+                {
+                    if (_ActiveRow != null)
+                        _ActiveRow.FlushRow();
+
+                    GridContainer oldValue = _ActiveRow;
+                    _ActiveRow = value;
+
+                    if (_ActiveRow != null)
+                        ActiveGrid = _ActiveRow.GridPanel;
+
+                    if (_ActiveGrid != null)
+                        _ActiveGrid.ActiveRow = value;
+
+                    OnActiveRowChanged(oldValue, _ActiveRow);
+                }
+            }
+        }
+
+        private void OnActiveRowChanged(
+            GridContainer oldValue, GridContainer newValue)
+        {
+            GridPanel panel =
+                (oldValue != null) ? oldValue.GridPanel :
+                (newValue != null) ? newValue.GridPanel : null;
+
+            DoRowActivatedEvent(panel, oldValue, newValue);
+        }
+
+        #endregion
+
+        #region BaseVisualStyles
+
+        ///<summary>
+        /// BaseVisualStyles - the SuperGrid starting base styles
+        ///</summary>
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public DefaultVisualStyles BaseVisualStyles
+        {
+            get { return (_BaseVisualStyles); }
+            internal set { _BaseVisualStyles = value; }
+        }
+
+        #endregion
+
+        #region DefaultVisualStyles
+
+        ///<summary>
+        /// Gets or sets the Default Visual Styles for each grid element
+        ///</summary>
+        [Browsable(true), Category("Appearance"), DefaultValue(null)]
+        [Description("Indicates the Default Visual Styles for each grid elements.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public DefaultVisualStyles DefaultVisualStyles
+        {
+            get
+            {
+                if (_DefaultVisualStyles == null)
+                {
+                    _DefaultVisualStyles = new DefaultVisualStyles();
+
+                    _DefaultVisualStyles.PropertyChanged += DefaultVisualStylesPropertyChanged;
+                }
+
+                return (_DefaultVisualStyles);
+            }
+
+            set
+            {
+                if (_DefaultVisualStyles != value)
+                {
+                    if (_DefaultVisualStyles != null)
+                        _DefaultVisualStyles.PropertyChanged -= DefaultVisualStylesPropertyChanged;
+
+                    _DefaultVisualStyles = value;
+
+                    if (_DefaultVisualStyles != null)
+                        _DefaultVisualStyles.PropertyChanged += DefaultVisualStylesPropertyChanged;
+                }
+            }
+        }
+
+        #region DefaultVisualStylesPropertyChanged
+
+        private void DefaultVisualStylesPropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            UpdateStyleCount();
+
+            VisualChangeType changeType = ((VisualPropertyChangedEventArgs)e).ChangeType;
+
+            switch (changeType)
+            {
+                case VisualChangeType.Layout:
+                    _PrimaryGrid.NeedsMeasured = true;
+                    _PrimaryGrid.InvalidateMerge();
+                    break;
+
+                case VisualChangeType.Render:
+                    Invalidate();
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region DesignerElement
+
+        ///<summary>
+        /// For internal use only
+        ///</summary>
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public GridElement DesignerElement
+        {
+            get { return (_DesignerElement); }
+
+            set
+            {
+                _DesignerElement = value;
+
+                if (value != null)
+                {
+                    if (value.NeedsMeasured == true)
+                        ArrangeGrid();
+
+                    value.EnsureVisible(true);
+                }
+
+                Refresh();
+            }
+        }
+
+        #endregion
+
+        #region EditorActive
+
+        ///<summary>
+        /// Gets whether a cell editor is currently active
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool EditorActive
+        {
+            get { return (_ActiveEditor != null); }
+        }
+
+        #endregion
+
+        #region EditorCell
+
+        ///<summary>
+        /// Gets the currently active editor cell, or null
+        /// if no cell is currently being edited
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public GridCell EditorCell
+        {
+            get { return (_EditorCell); }
+            internal set { _EditorCell = value; }
+        }
+
+        #endregion
+
+        #region EditorColumn
+
+        ///<summary>
+        /// Gets the column containing the current edit
+        /// cell, or null if no edit is in progress
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public GridColumn EditorColumn
+        {
+            get
+            {
+                if (_EditorCell != null)
+                    return (_EditorCell.GridColumn);
+
+                return (null);
+            }
+        }
+
+        #endregion
+
+        #region EditorGrid
+
+        ///<summary>
+        /// Gets the grid containing the cell currently
+        /// being edited, or null if no edit is in progress
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public GridPanel EditorGrid
+        {
+            get
+            {
+                if (_EditorCell != null)
+                    return (_EditorCell.GridPanel);
+
+                return (null);
+            }
+        }
+
+        #endregion
+
+        #region EditorRow
+
+        ///<summary>
+        /// Gets the row containing the cell currently
+        /// being edited, or null if no edit is in progress
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public GridRow EditorRow
+        {
+            get
+            {
+                if (_EditorCell != null)
+                    return (_EditorCell.GridRow);
+
+                return (null);
+            }
+        }
+
+        #endregion
+
+        #region EnableFastScrolling
+
+        /// <summary>
+        /// Gets or sets whether Fast Scrolling is enabled. Default is true.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior")]
+        [Description("Indicates whether Fast Scrolling is enabled.")]
+        public bool EnableFastScrolling
+        {
+            get { return (_EnableFastScrolling); }
+
+            set
+            {
+                if (_EnableFastScrolling != value)
+                {
+                    _EnableFastScrolling = value;
+                    
+                    OnPropertyChanged("EnableFastScrolling");
+                }
+            }
+        }
+
+        #endregion
+
+        #region ExpandButtonType
+
+        /// <summary>
+        /// Gets or sets the ExpandButton Type
+        /// </summary>
+        [DefaultValue(ExpandButtonType.NotSet), Category("Appearance")]
+        [Description("Indicates the ExpandButton Type.")]
+        public ExpandButtonType ExpandButtonType
+        {
+            get { return (_ExpandButtonType); }
+
+            set
+            {
+                if (_ExpandButtonType != value)
+                {
+                    _ExpandButtonType = value;
+
+                    UpdateStyleCount();
+
+                    OnPropertyChanged("ExpandButtonType");
+                }
+            }
+        }
+
+        #endregion
+
+        #region FilterColorizeCustomExpr
+
+        /// <summary>
+        /// Gets or sets whether the Custom Expression
+        /// dialog colorizes the output expression
+        /// </summary>
+        [DefaultValue(true), Category("Filtering")]
+        [Description("Indicates whether the Custom Expression dialog colorizes the output expression.")]
+        public bool FilterColorizeCustomExpr
+        {
+            get { return (_FilterColorizeCustomExpr); }
+
+            set
+            {
+                if (_FilterColorizeCustomExpr != value)
+                {
+                    _FilterColorizeCustomExpr = value;
+
+                    OnPropertyChanged("FilterColorizeCustomExpr");
+                }
+            }
+        }
+
+        #endregion
+
+        #region FilterExprColors
+
+        /// <summary>
+        /// Gets or sets the expression colors used in the Custom Expression dialog
+        /// </summary>
+        [Category("Filtering")]
+        [Description("Indicates the expression colors used in the Custom Expression dialog.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ExpressionColors FilterExprColors
+        {
+            get { return (_FilterExprColors); }
+
+            set
+            {
+                if (_FilterExprColors != value)
+                {
+                    _FilterExprColors = value;
+
+                    OnPropertyChanged("FilterExprColors");
+                }
+            }
+        }
+
+        #endregion
+
+        #region FilterMaxDropDownHeight
+
+        /// <summary>
+        /// Gets or sets the max height of
+        /// the filter panel and filter popup drop-down
+        /// </summary>
+        [DefaultValue(300), Category("Filtering")]
+        [Description("Indicates the max height of the filter panel and filter popup dropdown.")]
+        public int FilterMaxDropDownHeight
+        {
+            get { return (_FilterMaxDropDownHeight); }
+
+            set
+            {
+                if (_FilterMaxDropDownHeight != value)
+                {
+                    _FilterMaxDropDownHeight = value;
+
+                    OnPropertyChanged("FilterMaxDropDownHeight");
+                }
+            }
+        }
+
+        #endregion
+
+        #region FilterUseExtendedCustomDialog
+
+        /// <summary>
+        /// Gets or sets whether the Extended Custom Expression dialog
+        /// is used (permits user filter definition persistence)
+        /// </summary>
+        [DefaultValue(false), Category("Filtering")]
+        [Description("Indicates whether the Extended Custom Expression dialog is used (permits user filter definition persistence).")]
+        public bool FilterUseExtendedCustomDialog
+        {
+            get { return (_FilterUseExtendedCustomDialog); }
+
+            set
+            {
+                if (_FilterUseExtendedCustomDialog != value)
+                {
+                    _FilterUseExtendedCustomDialog = value;
+
+                    OnPropertyChanged("FilterUseExtendedCustomDialog");
+                }
+            }
+        }
+
+        #endregion
+
+        #region GridCursor
+
+        ///<summary>
+        /// Gets or sets the logical grid cursor
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public Cursor GridCursor
+        {
+            get { return (_GridCursor); }
+
+            set
+            {
+                if (value == null || value == Cursors.Default)
+                    _GridCursor = _DefaultCursor;
+                else
+                    _GridCursor = value;
+            }
+        }
+
+        #endregion
+
+        #region HScrollBar
+
+        ///<summary>
+        /// Gets a reference to the grid�s horizontal scrollbar
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public HScrollBarAdv HScrollBar
+        {
+            get { return (_HScrollBar); }
+        }
+
+        #endregion
+
+        #region HScrollMaximum
+
+        ///<summary>
+        /// Gets the horizontal scrollbar maximum value
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public int HScrollMaximum
+        {
+            get { return (_HScrollBar.Maximum); }
+        }
+
+        #endregion
+
+        #region HScrollOffset
+
+        ///<summary>
+        /// Gets or sets the horizontal scrollbar offset
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public int HScrollOffset
+        {
+            get { return (_HScrollOffset); }
+            set { SetHScrollValue(value); }
+        }
+
+        #endregion
+
+        #region HScrollBarVisible
+
+        /// <summary>
+        /// Gets or sets whether Horizontal Scroll-bar is shown if needed because content of the control exceeds available width. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance"), Description("Indicates whether Vertical Scroll-bar is shown if needed because content of the control exceeds available height.")]
+        public bool HScrollBarVisible
+        {
+            get { return _HScrollBarVisible; }
+
+            set
+            {
+                _HScrollBarVisible = value;
+
+                if (_HScrollBar != null && _HScrollBar.Visible != _HScrollBarVisible)
+                {
+                    _HScrollBar.Visible = _HScrollBarVisible;
+
+                    PrimaryGrid.InvalidateLayout();
+                    Invalidate();
+                }
+            }
+        }
+
+        #endregion
+
+        #region IsUpdateSuspended
+
+        ///<summary>
+        /// Gets whether grid updating / rendering is suspended
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsUpdateSuspended
+        {
+            get { return (_BeginUpdateCount > 0); }
+        }
+
+        #endregion
+
+        #region NonModalEditorCell
+
+        ///<summary>
+        /// Gets the current NonModal cell being edited, or
+        /// null if no NonModel cell edit is in progress
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public GridCell NonModalEditorCell
+        {
+            get { return (_NonModalEditorCell); }
+            internal set { _NonModalEditorCell = value; }
+        }
+
+        #endregion
+
+        #region PopupControl
+
+        /// <summary>
+        /// Gets the current active PopupControl
+        /// (Returns null if none is currently active).
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public PopupControl PopupControl
+        {
+            get { return (_PopupControl); }
+            internal set { _PopupControl = value; }
+        }
+
+        #endregion
+
+        #region PrimaryGrid
+
+        ///<summary>
+        /// Gets the primary, root grid.
+        ///</summary>
+        [Browsable(true)]
+        [Description("Indicates the primary, root grid")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public GridPanel PrimaryGrid
+        {
+            get { return (_PrimaryGrid); }
+        }
+
+        #endregion
+
+        #region ShowCustomFilterHelp
+
+        /// <summary>
+        /// Gets or sets whether the Custom
+        /// Expression dialog shows user help
+        /// </summary>
+        [DefaultValue(true), Category("Filtering")]
+        [Description("Indicates whether the Custom Expression dialog shows user help.")]
+        public bool ShowCustomFilterHelp
+        {
+            get { return (_ShowCustomFilterHelp); }
+
+            set
+            {
+                if (_ShowCustomFilterHelp != value)
+                {
+                    _ShowCustomFilterHelp = value;
+
+                    OnPropertyChanged("ShowCustomFilterHelp");
+                }
+            }
+        }
+
+        #endregion
+
+        #region SizingStyle
+
+        /// <summary>
+        /// Gets or sets which StyleType (Default, MouseOver, etc) to use for element sizing
+        /// </summary>
+        [Browsable(true), DefaultValue(StyleType.NotSet), Category("Appearance")]
+        [Description("Indicates which StyleType (Default, MouseOver, etc) to use for element sizing")]
+        public StyleType SizingStyle
+        {
+            get { return (_SizingStyle); }
+
+            set
+            {
+                if (_SizingStyle != value)
+                {
+                    _SizingStyle = value;
+
+                    OnSizingStyleChanged();
+                }
+            }
+        }
+
+        private void OnSizingStyleChanged()
+        {
+            _PrimaryGrid.InvalidateLayout();
+
+            OnPropertyChanged("SizingStyle");
+        }
+
+        #endregion
+
+        #region TabSelection
+
+        ///<summary>
+        /// Gets or sets how the TAB key moves the focus when pressed. 
+        ///</summary>
+        [Browsable(true), DefaultValue(TabSelection.Cell), Category("Behavior")]
+        [Description("Indicates how the TAB key moves the focus when pressed.")]
+        public TabSelection TabSelection
+        {
+            get { return (_TabSelection); }
+                        
+            set
+            {
+                if (_TabSelection != value)
+                {
+                    _TabSelection = value;
+
+                    OnPropertyChanged("TabSelection");
+                }
+            }
+        }
+
+        #endregion
+
+        #region MaxToolTipLength
+
+        ///<summary>
+        /// Gets or sets the maximum tooltip length
+        ///</summary>
+        [Browsable(true), DefaultValue(2000), Category("Behavior")]
+        [Description("Indicates the maximum tooltip length.")]
+        public int MaxToolTipLength
+        {
+            get { return (_MaxToolTipLength); }
+            set { _MaxToolTipLength = value; }
+        }
+
+        #endregion
+
+        #region VScrollBar
+
+        ///<summary>
+        /// Gets a reference to the grid�s vertical scrollbar
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public VScrollBarAdv VScrollBar
+        {
+            get { return (_VScrollBar); }
+        }
+
+        #endregion
+
+        #region VScrollMaximum
+
+        ///<summary>
+        /// Gets the vertical scrollbar maximum value
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public int VScrollMaximum
+        {
+            get { return (_VScrollBar.Maximum); }
+        }
+
+        #endregion
+
+        #region VScrollOffset
+
+        ///<summary>
+        /// Gets the vertical scrollbar offset
+        ///</summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public int VScrollOffset
+        {
+            get { return (_VScrollOffset); }
+            set { SetVScrollValue(value); }
+        }
+
+        #endregion
+
+        #region VScrollBarVisible
+
+        /// <summary>
+        /// Gets or sets whether Vertical Scroll-bar is shown if needed because content of the control exceeds available height. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance"), Description("Indicates whether Vertical Scroll-bar is shown if needed because content of the control exceeds available height.")]
+        public bool VScrollBarVisible
+        {
+            get { return _VScrollBarVisible; }
+
+            set
+            {
+                _VScrollBarVisible = value;
+
+                if (_VScrollBar != null && _VScrollBar.Visible != _VScrollBarVisible)
+                {
+                    _VScrollBar.Visible = _VScrollBarVisible;
+
+                    PrimaryGrid.InvalidateLayout();
+                    Invalidate();
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region ActiveNonModalEditor
+
+        ///<summary>
+        /// ActiveNonModalEditor
+        ///</summary>
+        internal IGridCellEditControl ActiveNonModalEditor
+        {
+            get { return (_ActiveNonModalEditor); }
+            set { _ActiveNonModalEditor = value; }
+        }
+
+        #endregion
+
+        #region ArrangeLayoutCount
+
+        internal ushort ArrangeLayoutCount
+        {
+            get { return (_ArrangeLayoutCount); }
+            set { _ArrangeLayoutCount = value; }
+        }
+
+        #endregion
+
+        #region BoundsUpdateCount
+
+        internal ushort BoundsUpdateCount
+        {
+            get {return (_BoundsUpdateCount); }
+            set { _BoundsUpdateCount = value; }
+        }
+
+        #endregion
+
+        #region CanScrollEx
+
+        internal bool CanScrollEx
+        {
+            get { return (_CanScrollEx); }
+            set { _CanScrollEx = value; }
+        }
+
+        #endregion
+
+        #region CapturedItem
+
+        internal GridElement CapturedItem
+        {
+            get
+            {
+                if (Capture == false)
+                    _CapturedItem = null;
+
+                return (_CapturedItem);
+            }
+
+            set { Capture = ((_CapturedItem = value) != null); }
+        }
+
+        #endregion
+
+        #region CViewRect
+
+        internal Rectangle CViewRect
+        {
+            get
+            {
+                if (_CViewRect.IsEmpty == true)
+                {
+                    _CViewRect = ClientRectangle;
+
+                    int n =_PrimaryGrid.FixedHeaderHeight;
+
+                    _CViewRect.Y += n;
+                    _CViewRect.Height -= n;
+
+                    if (_PrimaryGrid.Footer != null && _PrimaryGrid.Footer.Visible == true)
+                        _CViewRect.Height -= _PrimaryGrid.Footer.Size.Height;
+
+                    if (_VScrollBar != null && _VScrollBar.Visible == true)
+                        _CViewRect.Width -= VScrollBarWidth;
+
+                    if (_HScrollBar != null && _HScrollBar.Visible == true)
+                        _CViewRect.Height -= HScrollBarHeight;
+                }
+
+                return (_CViewRect);
+            }
+        }
+
+        #endregion
+
+        #region DisplayedMergeLayoutCount
+
+        internal ushort DisplayedMergeLayoutCount
+        {
+            get { return (_DisplayedMergeLayoutCount); }
+            set { _DisplayedMergeLayoutCount = value; }
+        }
+
+        #endregion
+
+        #region FilterApplyString
+
+        internal string FilterApplyString
+        {
+            get { return (LocalizedString(ref _FilterApplyString)); }
+        }
+
+        #endregion
+
+        #region FilterCancelString
+
+        internal string FilterCancelString
+        {
+            get { return (LocalizedString(ref _FilterCancelString)); }
+        }
+
+        #endregion
+
+        #region FilterCloseString
+
+        internal string FilterCloseString
+        {
+            get { return (LocalizedString(ref _FilterCloseString)); }
+        }
+
+        #endregion
+
+        #region FilterCustomString
+
+        internal string FilterCustomString
+        {
+            get { return (LocalizedString(ref _FilterCustomString)); }
+        }
+
+        #endregion
+
+        #region FilterOkString
+
+        internal string FilterOkString
+        {
+            get { return (LocalizedString(ref _FilterOkString)); }
+        }
+
+        #endregion
+
+        #region FilterShowAllString
+
+        internal string FilterShowAllString
+        {
+            get { return (LocalizedString(ref _FilterShowAllString)); }
+        }
+
+        #endregion
+
+        #region FilterShowNotNullString
+
+        internal string FilterShowNotNullString
+        {
+            get { return (LocalizedString(ref _FilterShowNotNullString)); }
+        }
+
+        #endregion
+
+        #region FilterShowNullString
+
+        internal string FilterShowNullString
+        {
+            get { return (LocalizedString(ref _FilterShowNullString)); }
+        }
+
+        #endregion
+
+        #region GroupByWaterMarkText
+
+        internal string GroupByWaterMarkText
+        {
+            get { return (LocalizedString(ref _GroupByWaterMarkText)); }
+        }
+
+        #endregion
+
+        #region HasDataErrorHandler
+
+        internal bool HasDataErrorHandler
+        {
+            get { return (DataError != null); }
+        }
+
+        #endregion
+
+        #region HasItemDragHandler
+
+        internal bool HasItemDragHandler
+        {
+            get { return (ItemDrag != null); }
+        }
+
+        #endregion
+
+        #region HScrollBarHeight
+
+        internal int HScrollBarHeight
+        {
+            get
+            {
+                if (_HScrollBar != null)
+                    return (_HScrollBar.Height);
+
+                return (SystemInformation.HorizontalScrollBarHeight);
+            }
+        }
+
+        #endregion
+
+        #region SViewRect
+
+        internal Rectangle SViewRect
+        {
+            get
+            {
+                Rectangle r = ViewRect;
+
+                if (PrimaryGrid.ShowRowHeaders == true)
+                {
+                    r.X += _PrimaryGrid.RowHeaderWidthEx;
+                    r.Width -= _PrimaryGrid.RowHeaderWidthEx;
+
+                    if (r.Width < 0)
+                        r.Width = 0;
+                }
+
+                return (r);
+            }
+        }
+
+        #endregion
+
+        #region IndiceesUpdateCount
+
+        internal ushort IndiceesUpdateCount
+        {
+            get { return (_IndiceesUpdateCount); }
+        }
+
+        #endregion
+
+        #region IsDesignerHosted
+
+        internal bool IsDesignerHosted
+        {
+            get { return (DesignMode); }
+        }
+
+        #endregion
+
+        #region IsHScrollBarVisible
+
+        internal bool IsHScrollBarVisible
+        {
+            get { return (_HScrollBar != null && _HScrollBar.Visible); }
+        }
+
+        #endregion
+
+        #region IsVScrollBarVisible
+
+        internal bool IsVScrollBarVisible
+        {
+            get { return (_VScrollBar != null && _VScrollBar.Visible); }
+        }
+
+        #endregion
+
+        #region LastActiveCell
+
+        internal GridCell LastActiveCell
+        {
+            get { return (_LastActiveCell); }
+            set { _LastActiveCell = value; }
+        }
+
+        #endregion
+
+        #region NeedMergeLayout
+
+        private bool _NeedMergeLayout;
+
+        internal bool NeedMergeLayout
+        {
+            get { return (_NeedMergeLayout); }
+            set { _NeedMergeLayout = value; }
+        }
+
+        #endregion
+
+        #region NeedToUpdateIndicees
+
+        internal bool NeedToUpdateIndicees
+        {
+            get { return (_NeedToUpdateIndicees); }
+
+            set
+            {
+                _NeedToUpdateIndicees = value;
+
+                if (value == true)
+                    _IndiceesUpdateCount++;
+            }
+        }
+
+        #endregion
+
+        #region ScrollBarScrolling
+
+        internal bool ScrollBarScrolling
+        {
+            get { return (_ScrollBarScrolling); }
+            set { _ScrollBarScrolling = value; }
+        }
+
+        #endregion
+
+        #region SetGridCursor
+
+        internal bool SetGridCursor
+        {
+            get { return (_SetGridCursor); }
+            set { _SetGridCursor = value; }
+        }
+
+        #endregion
+
+        #region StyleMouseOverUpdateCount
+
+        internal ushort StyleMouseOverUpdateCount
+        {
+            get { return (_StyleMouseOverUpdateCount); }
+            set { _StyleMouseOverUpdateCount = value; }
+        }
+
+        #endregion
+
+        #region StyleSelectedUpdateCount
+
+        internal ushort StyleSelectedUpdateCount
+        {
+            get { return (_StyleSelectedUpdateCount); }
+            set { _StyleSelectedUpdateCount = value; }
+        }
+
+        #endregion
+
+        #region StyleSelectedMouseOverUpdateCount
+
+        internal ushort StyleSelectedMouseOverUpdateCount
+        {
+            get { return (_StyleSelectedMouseOverUpdateCount); }
+            set { _StyleSelectedMouseOverUpdateCount = value; }
+        }
+
+        #endregion
+
+        #region StyleUpdateCount
+
+        internal ushort StyleUpdateCount
+        {
+            get { return (_StyleUpdateCount); }
+            set { _StyleUpdateCount = value; }
+        }
+
+        #endregion
+
+        #region ToolTip
+
+        /// <summary>
+        /// Gets the Tooltip object used for the grid.
+        /// </summary>
+        public System.Windows.Forms.ToolTip ToolTip
+        {
+            get
+            {
+                if (_ToolTip == null)
+                    _ToolTip = new System.Windows.Forms.ToolTip();
+
+                return (_ToolTip);
+            }
+        }
+
+        #endregion
+
+        #region ToolTipText
+
+        internal string ToolTipText
+        {
+            get { return (_ToolTipText); }
+
+            set
+            {
+                if (_ToolTipText != value)
+                {
+                    _ToolTipText = value;
+
+                    if (string.IsNullOrEmpty(value) == false && value.Length > _MaxToolTipLength)
+                        ToolTip.SetToolTip(this, value.Substring(0, _MaxToolTipLength));
+                    else
+                        ToolTip.SetToolTip(this, value);
+
+                    ToolTip.Active =
+                        (string.IsNullOrEmpty(value) == false);
+                }
+            }
+        }
+
+        #endregion
+
+        #region PrimaryGridSize
+
+        internal Size PrimaryGridSize
+        {
+            get
+            {
+                Size size = _PrimaryGrid.SizeNeeded;
+
+                int n = (_VScrollOffset > 0) ?
+                    _PrimaryGrid.FixedRowHeight : _PrimaryGrid.FixedHeaderHeight;
+
+                size.Height -= (n + 1);
+
+                if (_PrimaryGrid.Footer != null && _PrimaryGrid.Footer.Visible == true)
+                    size.Height -= _PrimaryGrid.Footer.Size.Height;
+
+                if (PrimaryGrid.ShowRowHeaders == true)
+                    size.Width -= _PrimaryGrid.RowHeaderWidthEx;
+
+                if (size.Width < 0)
+                    size.Width = 0;
+
+                if (size.Height < 0)
+                    size.Height = 0;
+
+                return (size);
+            }
+        }
+
+        #endregion
+
+        #region ViewRect
+
+        internal Rectangle ViewRect
+        {
+            get
+            {
+                if (_ViewRect.IsEmpty == true)
+                    _ViewRect = GetAdjustedBounds(ClientRectangle);
+
+                return (_ViewRect);
+            }
+
+            set
+            {
+                _BoundsUpdateCount++;
+
+                _ViewRect = value;
+                _CViewRect = value;
+            }
+        }
+
+        #endregion
+
+        #region GetAdjustedBounds
+
+        private Rectangle GetAdjustedBounds(Rectangle r)
+        {
+            int n = (_VScrollOffset > 0) ?
+                _PrimaryGrid.FixedRowHeight : _PrimaryGrid.FixedHeaderHeight;
+
+            r.Y += n;
+            r.Height -= (n + 1);
+
+            if (_PrimaryGrid.Footer != null && _PrimaryGrid.Footer.Visible == true)
+                r.Height -= _PrimaryGrid.Footer.Size.Height;
+
+            if (_VScrollBar != null && _VScrollBar.Visible == true)
+                r.Width -= (VScrollBarWidth + 1);
+
+            if (_HScrollBar != null && _HScrollBar.Visible == true)
+                r.Height -= (HScrollBarHeight + 1);
+
+            if (r.Width < 0)
+                r.Width = 0;
+
+            if (r.Height < 0)
+                r.Height = 0;
+
+            return (r);
+        }
+
+        #endregion
+
+        #region ViewRectEx
+
+        internal Rectangle ViewRectEx
+        {
+            get
+            {
+                Rectangle r = ViewRect;
+
+                int n = (_VScrollOffset > 0) ?
+                   _PrimaryGrid.FixedRowHeight - _PrimaryGrid.FixedHeaderHeight : 0;
+
+                r.Y -= n;
+                r.Height += n;
+
+                return (r);
+            }
+        }
+
+        #endregion
+
+        #region VScrollBarWidth
+
+        internal int VScrollBarWidth
+        {
+            get
+            {
+                if (_VScrollBar != null)
+                    return (_VScrollBar.Width);
+
+                return (SystemInformation.VerticalScrollBarWidth);
+            }
+        }
+
+        #endregion
+
+        #region DefaultSize
+
+        /// <summary>
+        /// DefaultSize
+        /// </summary>
+        protected override Size DefaultSize
+        {
+            get { return new Size(200, 200); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region OnPaint
+
+        #region OnPaint
+
+        /// <summary>
+        /// Renders the control.
+        /// </summary>
+        /// <param name="e">Paint arguments.</param>
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            if (IsUpdateSuspended == false)
+            {
+                SmoothingMode sm = e.Graphics.SmoothingMode;
+                TextRenderingHint th = e.Graphics.TextRenderingHint;
+
+                base.OnPaintBackground(e);
+
+                if (_PrimaryGrid.IsLayoutValid == false)
+                    ArrangeGrid(e.Graphics);
+
+                GridRenderInfo renderInfo = GetGridRenderInfo(e);
+
+                PaintControl(renderInfo);
+
+                e.Graphics.SmoothingMode = sm;
+                e.Graphics.TextRenderingHint = th;
+
+                base.OnPaint(e);
+
+#if !TRIAL
+                if (NativeFunctions.keyValidated2 != 266)
+                {
+                    TextDrawing.DrawString(e.Graphics, "Invalid License", Font,
+                                           Color.FromArgb(180, Color.Red), ClientRectangle,
+                                           eTextFormat.Bottom | eTextFormat.HorizontalCenter);
+                }
+#else
+                RenderWaterMark(renderInfo);
+#endif
+            }
+        }
+
+        #endregion
+
+        #region PaintControl
+
+        private void PaintControl(GridRenderInfo renderInfo)
+        {
+            Rectangle r = ClientRectangle;
+            r.Intersect(renderInfo.ClipRectangle);
+
+            if (r.Width > 0 && r.Height > 0)
+                _PrimaryGrid.Render(renderInfo);
+
+            RenderScrollBoxArea(renderInfo);
+
+            NeedMergeLayout = false;
+        }
+
+        #endregion
+
+        #region RenderScrollBoxArea
+
+        private void RenderScrollBoxArea(GridRenderInfo renderInfo)
+        {
+            if (_HScrollBar.Visible && _VScrollBar.Visible)
+            {
+                Rectangle r = _HScrollBar.Bounds;
+                r.X = _VScrollBar.Bounds.X;
+                r.Width = _VScrollBar.Bounds.Width;
+
+                if (r.IntersectsWith(renderInfo.ClipRectangle))
+                {
+                    Graphics g = renderInfo.Graphics;
+
+                    SmoothingMode sm = g.SmoothingMode;
+                    g.SmoothingMode = SmoothingMode.None;
+
+                    g.FillRectangle(SystemBrushes.Control, r);
+
+                    g.SmoothingMode = sm;
+                }
+            }
+        }
+
+        #endregion
+
+        #region RenderWaterMark
+
+        private void RenderWaterMark(GridRenderInfo renderInfo)
+        {
+            Rectangle r = ViewRect;
+            r.X = r.Right - 30;
+            r.Width = 30;
+
+            if (r.IntersectsWith(renderInfo.ClipRectangle) == true)
+            {
+                Graphics g = renderInfo.Graphics;
+
+                using (StringFormat sf = new StringFormat())
+                {
+                    sf.Alignment = StringAlignment.Center;
+                    sf.LineAlignment = StringAlignment.Center;
+
+                    sf.FormatFlags = StringFormatFlags.NoWrap | StringFormatFlags.DirectionVertical;
+
+                    using (Font font = new Font("Times New Roman", 9))
+                    {
+                        Rectangle t = r;
+                        t.X++;
+                        t.Y++;
+
+                        using (SolidBrush brush = new SolidBrush(Color.FromArgb(128, Color.Gray)))
+                        {
+                            g.DrawString("DevComponents SuperGrid Trial",
+                                         font, brush, t, sf);
+                        }
+
+                        using (SolidBrush brush = new SolidBrush(Color.FromArgb(128, Color.Gainsboro)))
+                        {
+                            g.DrawString("DevComponents SuperGrid Trial",
+                                         font, brush, r, sf);
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ArrangeGrid
+
+        /// <summary>
+        /// OnHandleCreated
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnHandleCreated(EventArgs e)
+        {
+            ArrangeGrid();
+
+            base.OnHandleCreated(e);
+        }
+
+        /// <summary>
+        /// Performs grid layout.
+        /// </summary>
+        public void ArrangeGrid()
+        {
+            ArrangeGrid(false);
+        }
+
+        /// <summary>
+        /// Performs grid layout.
+        /// </summary>
+        ///<param name="force">Whether to force operation even if layout is valid.</param>
+        public void ArrangeGrid(bool force)
+        {
+            if (force == true || _PrimaryGrid.IsLayoutValid == false)
+            {
+                if (_InArrangeGrid == false)
+                {
+                    _InArrangeGrid = true;
+
+                    try
+                    {
+                        using (Graphics g = CreateGraphics())
+                            ArrangeGrid(g);
+                    }
+                    finally
+                    {
+                        _InArrangeGrid = false;
+                    }
+                }
+            }
+        }
+
+        private void ArrangeGrid(Graphics g)
+        {
+            ArrangeLayoutCount++;
+            DisplayedMergeLayoutCount++;
+
+            GridLayoutInfo layoutInfo = GetGridLayoutInfo(g);
+            GridLayoutStateInfo stateInfo = new GridLayoutStateInfo(_PrimaryGrid, 0);
+
+            Size constraintSize = Size.Empty;
+
+            _PrimaryGrid.Measure(layoutInfo, stateInfo, constraintSize);
+
+            stateInfo.PassCount++;
+
+            CanScrollEx = true;
+            NeedToUpdateIndicees = false;
+
+            if (HorizontalIsOver(layoutInfo) == true && _HScrollBarVisible)
+            {
+                if(_HScrollBarVisible)
+                    layoutInfo.ClientBounds.Height -= HScrollBarHeight;
+
+                if (VerticalIsOver(layoutInfo) == true && _VScrollBarVisible)
+                    layoutInfo.ClientBounds.Width -= VScrollBarWidth;
+
+                _PrimaryGrid.Measure(layoutInfo, stateInfo, constraintSize);
+            }
+            else
+            {
+                if (VerticalIsOver(layoutInfo) == true && _VScrollBarVisible)
+                {
+                    layoutInfo.ClientBounds.Width -= VScrollBarWidth;
+
+                    _PrimaryGrid.Measure(layoutInfo, stateInfo, constraintSize);
+
+                    if (HorizontalIsOver(layoutInfo) == true && _HScrollBarVisible)
+                        layoutInfo.ClientBounds.Height -= HScrollBarHeight;
+                }
+            }
+
+            layoutInfo.ClientBounds.Width = Math.Max(0, layoutInfo.ClientBounds.Width);
+            layoutInfo.ClientBounds.Height = Math.Max(0, layoutInfo.ClientBounds.Height);
+
+            EnableVScrollBar(layoutInfo);
+            EnableHScrollBar(layoutInfo);
+
+            ViewRect = Rectangle.Empty;
+            _PrimaryGrid.Arrange(layoutInfo, stateInfo, layoutInfo.ClientBounds);
+            ViewRect = Rectangle.Empty;
+
+            UpdateScrollBars(layoutInfo);
+
+            if (_ActiveEditor != null)
+                EditorCell.PositionEditPanel(_ActiveEditor);
+
+            if (NonModalEditorCell != null)
+                NonModalEditorCell.PositionEditPanel(_ActiveNonModalEditor);
+
+            if (ActiveFilterPanel != null)
+                _ActiveFilterPanel.PositionEditPanel();
+        }
+
+        #region GetGridLayoutInfo
+
+        private GridLayoutInfo GetGridLayoutInfo(Graphics g)
+        {
+            GridLayoutInfo layoutInfo = new GridLayoutInfo(g, GetGridItemBounds());
+
+            layoutInfo.RightToLeft = (RightToLeft == RightToLeft.No);
+            layoutInfo.DefaultVisualStyles = _DefaultVisualStyles; 
+
+            return (layoutInfo);
+        }
+
+        #endregion
+
+        #region GetGridItemBounds
+
+        private Rectangle GetGridItemBounds()
+        {
+            return (ClientRectangle);
+        }
+
+        #endregion
+
+        #region GetGridRenderInfo
+
+        private GridRenderInfo GetGridRenderInfo(PaintEventArgs e)
+        {
+            GridRenderInfo renderInfo =
+                new GridRenderInfo(e.Graphics, Rectangle.Ceiling(e.ClipRectangle));
+
+            renderInfo.RightToLeft = (RightToLeft == RightToLeft.Yes);
+
+            return (renderInfo);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Scrollbar support
+
+        #region UpdateScrollBars
+
+        private void UpdateScrollBars(GridLayoutInfo layoutInfo)
+        {
+            if (_HScrollBarEnabled == true)
+            {
+                _HScrollBar.SmallChange = layoutInfo.ClientBounds.Width / 20;
+                _HScrollBar.Maximum = Math.Max(0, PrimaryGridSize.Width);
+                _HScrollBar.LargeChange = Math.Min(SViewRect.Width, _HScrollBar.Maximum);
+
+                if (_HScrollBar.Value + _HScrollBar.LargeChange > _HScrollBar.Maximum)
+                {
+                    _HScrollBar.Value = _HScrollBar.Maximum - _HScrollBar.LargeChange;
+                    _HScrollOffset = _HScrollBar.Value;
+                }
+
+                _HScrollBar.Refresh();
+            }
+
+            if (_VScrollBarEnabled == true)
+            {
+                _VScrollBar.SmallChange = layoutInfo.ClientBounds.Height / 20;
+                _VScrollBar.Maximum = Math.Max(0, PrimaryGridSize.Height);
+                _VScrollBar.LargeChange = Math.Min(SViewRect.Height, _VScrollBar.Maximum);
+
+                if (_VScrollBar.Value + _VScrollBar.LargeChange > _VScrollBar.Maximum)
+                {
+                    _VScrollBar.Value = _VScrollBar.Maximum - _VScrollBar.LargeChange;
+                    _VScrollOffset = _VScrollBar.Value;
+                }
+
+                _VScrollBar.Refresh();
+            }
+        }
+
+        #endregion
+
+        #region EnableHScrollBar
+
+        private void EnableHScrollBar(GridLayoutInfo layoutInfo)
+        {
+            bool enable = _HScrollBarVisible && (_PrimaryGrid.Size.Width > layoutInfo.ClientBounds.Width);
+
+            if (enable == true)
+            {
+                _HScrollBar.Location = new
+                    Point(layoutInfo.ClientBounds.Left + 1,
+                    layoutInfo.ClientBounds.Bottom - 1);
+
+                int n = layoutInfo.ClientBounds.Width - 2;
+
+                if (_VScrollBar.Visible == true)
+                    n++;
+
+                _HScrollBar.Width = n;
+            }
+            else
+            {
+                _HScrollBar.Value = 0;
+                _HScrollOffset = 0;
+            }
+
+            _HScrollBarEnabled = enable;
+
+            _HScrollBar.Enabled = enable;
+            _HScrollBar.Visible = enable;
+        }
+
+        #endregion
+
+        #region EnableVScrollBar
+
+        private void EnableVScrollBar(GridLayoutInfo layoutInfo)
+        {
+            bool enable = _VScrollBarVisible && (_PrimaryGrid.Size.Height > layoutInfo.ClientBounds.Height);
+
+            if (enable == true)
+            {
+                _VScrollBar.Location = new
+                    Point(layoutInfo.ClientBounds.Right - 1,
+                    layoutInfo.ClientBounds.Top + 1);
+
+                int n = layoutInfo.ClientBounds.Height - 2;
+
+                if (_HScrollBarVisible && (_PrimaryGrid.Size.Width > layoutInfo.ClientBounds.Width))
+                    n++;
+
+                _VScrollBar.Height = n;
+            }
+            else
+            {
+                _VScrollBar.Value = 0;
+                _VScrollOffset = 0;
+            }
+
+            _VScrollBarEnabled = enable;
+
+            _VScrollBar.Enabled = enable;
+            _VScrollBar.Visible = enable;
+        }
+
+        #endregion
+
+        #region HScrollBarScroll
+
+        private void HScrollBarScroll(object sender, ScrollEventArgs e)
+        {
+            ScrollBarAdv sbar =
+                sender as ScrollBarAdv;
+
+            if (sbar != null)
+            {
+                if (_HScrollOffset != e.NewValue)
+                {
+                    int oldValue = _HScrollOffset;
+                    _HScrollOffset = e.NewValue;
+
+                    PostHScrollUpdateEx(oldValue, _HScrollOffset);
+
+                    DoScrollEvent(_PrimaryGrid, e, sbar);
+                }
+            }
+        }
+
+        #endregion
+
+        #region VScrollBarScroll
+
+        private void VScrollBarScroll(object sender, ScrollEventArgs e)
+        {
+            ScrollBarAdv sbar =
+                sender as ScrollBarAdv;
+
+            if (sbar != null)
+            {
+                if (_VScrollOffset != e.NewValue)
+                {
+                    int oldValue = _VScrollOffset;
+                    _VScrollOffset = e.NewValue;
+
+                    PostVScrollUpdateEx(oldValue, _VScrollOffset);
+
+                    DoScrollEvent(_PrimaryGrid, e, sbar);
+                }
+            }
+        }
+
+        #endregion
+
+        #region HorizontalIsOver
+
+        private bool HorizontalIsOver(GridLayoutInfo layoutInfo)
+        {
+            return (_PrimaryGrid.Size.Width > layoutInfo.ClientBounds.Width);
+        }
+
+        #endregion
+
+        #region VerticalIsOver
+
+        private bool VerticalIsOver(GridLayoutInfo layoutInfo)
+        {
+            return (_PrimaryGrid.Size.Height > layoutInfo.ClientBounds.Height);
+        }
+
+        #endregion
+
+        #region SetupScrollBars
+
+        private void SetupScrollBars()
+        {
+            if (_VScrollBar == null)
+            {
+                _VScrollBar = new VScrollBarAdv();
+                _VScrollBar.Width = Dpi.DescaleWidth(SystemInformation.VerticalScrollBarWidth);
+                _VScrollBar.Scroll += VScrollBarScroll;
+                _VScrollBar.MouseEnter += ScrollBarMouseEnter;
+                _VScrollBar.SizeChanged += ScrollBarSizeChanged;
+
+                _VScrollBar.MouseDown += ScrollBar_MouseDown;
+                _VScrollBar.MouseUp += ScrollBar_MouseUp;
+
+                _VScrollBar.Visible = false;
+
+                Controls.Add(_VScrollBar);
+            }
+
+            if (_HScrollBar == null)
+            {
+                _HScrollBar = new HScrollBarAdv();
+                _HScrollBar.Height = Dpi.DescaleHeight(SystemInformation.HorizontalScrollBarHeight);
+                _HScrollBar.Scroll += HScrollBarScroll;
+                _HScrollBar.MouseEnter += ScrollBarMouseEnter;
+                _HScrollBar.SizeChanged += ScrollBarSizeChanged;
+
+                _HScrollBar.MouseDown += ScrollBar_MouseDown;
+                _HScrollBar.MouseUp += ScrollBar_MouseUp;
+
+                _HScrollBar.Visible = false;
+
+                Controls.Add(_HScrollBar);
+            }
+        }
+
+        void ScrollBar_MouseUp(object sender, MouseEventArgs e)
+        {
+            ScrollBarScrolling = false;
+        }
+
+        void ScrollBar_MouseDown(object sender, MouseEventArgs e)
+        {
+            ScrollBarScrolling = true;
+        }
+
+        private void ScrollBarSizeChanged(object sender, EventArgs e)
+        {
+            _PrimaryGrid.InvalidateLayout();
+        }
+
+        void ScrollBarMouseEnter(object sender, EventArgs e)
+        {
+            SetGridCursor = true;
+            Cursor = Cursors.Default;
+            SetGridCursor = false;
+        }
+
+        #endregion
+
+        #region SetVScrollValue
+
+        internal void SetVScrollValue(int value)
+        {
+            if (_VScrollBar.Visible == true)
+            {
+                int oldValue = _VScrollBar.Value;
+
+                value = Math.Max(value, 0);
+                value = Math.Min(value, _VScrollBar.Maximum);
+
+                if (value + _VScrollBar.LargeChange - 1 > _VScrollBar.Maximum)
+                    value = _VScrollBar.Maximum - _VScrollBar.LargeChange + 1;
+
+                value = Math.Max(value, 0);
+
+                if (_VScrollBar.Value != value)
+                {
+                    _VScrollBar.Value = value;
+                    _VScrollOffset = value;
+
+                    PostVScrollUpdateEx(oldValue, value);
+
+                    if (Scroll != null || ScrollMin != null || ScrollMax != null)
+                    {
+                        ScrollEventArgs e = new ScrollEventArgs(ScrollEventType.EndScroll,
+                            oldValue, value, ScrollOrientation.VerticalScroll);
+
+                        DoScrollEvent(_PrimaryGrid, e, _VScrollBar);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region SetHScrollValue
+
+        internal void SetHScrollValue(int value)
+        {
+            if (_HScrollBar.Visible == true)
+            {
+                int oldValue = _HScrollBar.Value;
+
+                value = Math.Max(value, 0);
+                value = Math.Min(value, _HScrollBar.Maximum);
+
+                if (value + _HScrollBar.LargeChange > _HScrollBar.Maximum)
+                    value = _HScrollBar.Maximum - _HScrollBar.LargeChange;
+
+                value = Math.Max(value, 0);
+
+                if (_HScrollBar.Value != value)
+                {
+                    _HScrollBar.Value = value;
+                    _HScrollOffset = value;
+
+                    PostHScrollUpdateEx(oldValue, value);
+
+                    if (Scroll != null || ScrollMin != null || ScrollMax != null)
+                    {
+                        ScrollEventArgs e = new ScrollEventArgs(ScrollEventType.EndScroll,
+                            oldValue, value, ScrollOrientation.HorizontalScroll);
+
+                        DoScrollEvent(_PrimaryGrid, e, _HScrollBar);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region PostScrollUpdate
+
+        private void PostScrollUpdate()
+        {
+            ViewRect = Rectangle.Empty;
+
+            _PrimaryGrid.InvalidateRender();
+
+            PostScrollRefresh();
+        }
+
+        #endregion
+
+        #region PostVScrollUpdateEx
+
+        private void PostVScrollUpdateEx(int oldValue, int newValue)
+        {
+            if (CanVScrollWindowEx())
+            {
+                int dv = oldValue - newValue;
+
+                ViewRect = Rectangle.Empty;
+                Rectangle vr = ViewRect;
+
+                RECT scroll = new RECT(0, vr.Top, vr.Right, vr.Bottom);
+                RECT update = new RECT();
+
+                ScrollWindowEx(
+                    Handle,
+                    0,
+                    dv,
+                    ref scroll,
+                    ref scroll,
+                    IntPtr.Zero,
+                    ref update,
+                    0);
+
+                Rectangle r = new Rectangle(update.X, update.Y, update.Width, update.Height);
+                r.Inflate(0, 4);
+
+                Invalidate(r);
+
+                PostScrollRefresh();
+            }
+            else
+            {
+                PostScrollUpdate();
+            }
+        }
+
+        #region CanVScrollWindowEx
+
+        private bool CanVScrollWindowEx()
+        {
+            if (IsUpdateSuspended == true ||
+                (EnableFastScrolling == false || CanScrollEx == false))
+            {
+                return (false);
+            }
+
+            return (_PrimaryGrid.FrozenRowCount == 0);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region PostHScrollUpdateEx
+
+        private void PostHScrollUpdateEx(int oldValue, int newValue)
+        {
+            if (CanHScrollWindowEx() == true)
+            {
+                int dh = oldValue - newValue;
+
+                ViewRect = Rectangle.Empty;
+                Rectangle vr = ViewRect;
+
+                int n = vr.Y - _PrimaryGrid.ColumnHeader.Bounds.Y;
+                vr.Y -= n;
+                vr.Height += n;
+
+                if (_PrimaryGrid.ShowRowHeaders == true)
+                {
+                    vr.X += _PrimaryGrid.RowHeaderWidthEx;
+                    vr.Width -= _PrimaryGrid.RowHeaderWidthEx;
+                }
+                else
+                {
+                    vr.X++;
+                    vr.Width--;
+                }
+
+                RECT scroll = new RECT(vr.Left, vr.Top, vr.Right - 1, vr.Bottom);
+                RECT update = new RECT();
+
+                ScrollWindowEx(
+                    Handle,
+                    dh,
+                    0,
+                    ref scroll,
+                    ref scroll,
+                    IntPtr.Zero,
+                    ref update,
+                    0);
+
+                Rectangle r = new Rectangle(update.X, update.Y, update.Width, update.Height);
+                r.Inflate(4, 0);
+
+                Invalidate(r);
+
+                PostScrollRefresh();
+            }
+            else
+            {
+                PostScrollUpdate();
+            }
+        }
+
+        #region CanHScrollWindowEx
+
+        private bool CanHScrollWindowEx()
+        {
+            if (IsUpdateSuspended == true || EnableFastScrolling == false)
+                return (false);
+
+            if (_PrimaryGrid.EnableCellMerging == true || _PrimaryGrid.IsGrouped == true)
+                return (false);
+
+            if (_PrimaryGrid.Header.Visible == true && _PrimaryGrid.Header.Size.Height > 0)
+                return (false);
+
+            if (_PrimaryGrid.IsGrouped == true)
+                return (false);
+
+            return (_PrimaryGrid.FrozenColumnCount == 0);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region PostScrollRefresh
+
+        private void PostScrollRefresh()
+        {
+            if (_EditorCell != null)
+                _EditorCell.PositionEditPanel(_ActiveEditor);
+
+            if (_ActiveFilterPanel != null)
+                _ActiveFilterPanel.PositionEditPanel();
+
+            if (_ActiveNonModalEditor != null)
+                DeactivateNonModalEditor();
+
+            PostInternalMouseMove();
+
+            DisplayedMergeLayoutCount++;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InvalidateRender
+
+        /// <summary>
+        /// Invalidates render of the grid element.
+        /// </summary>
+        /// <param name="gridElement">Element to invalidate rendering for.</param>
+        internal void InvalidateRender(GridElement gridElement)
+        {
+            Rectangle bounds = gridElement.BoundsRelative;
+
+            if (gridElement.Parent != null)
+            {
+                if (gridElement is GridColumn == false || ((GridColumn)gridElement).IsHFrozen == false)  
+                    bounds.X -= _HScrollOffset;
+
+                if (bounds.Y > _PrimaryGrid.FixedRowHeight)
+                    bounds.Y -= _VScrollOffset;
+            }
+
+            Invalidate(bounds, true);
+        }
+
+        internal void InvalidateRender(Rectangle bounds)
+        {
+            Invalidate(bounds, InvokeRequired == false);
+        }
+
+        #endregion
+
+        #region Mouse Support
+
+        #region OnMouseLeave
+
+        /// <summary>
+        /// OnMouseLeave
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnMouseLeave(EventArgs e)
+        {
+            _PrimaryGrid.InternalMouseLeave(e);
+
+            base.OnMouseLeave(e);
+        }
+
+        #endregion
+
+        #region OnMouseMove
+
+        /// <summary>
+        /// OnMouseMove
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnMouseMove(MouseEventArgs e)
+        {
+            if (CanProcessMouseMove())
+            {
+                if (CapturedItem != null)
+                    CapturedItem.InternalMouseMove(e);
+                else
+                    _PrimaryGrid.InternalMouseMove(e);
+
+                base.OnMouseMove(e);
+
+                base.Cursor = _GridCursor;
+
+                if (_PrimaryGrid.IsDesignerHosted == true)
+                    Cursor = Cursors.Arrow;
+            }
+        }
+
+        private bool CanProcessMouseMove()
+        {
+            return (Keyboard.IsKeyDown(Keys.Up) == false && Keyboard.IsKeyDown(Keys.Down) == false &&
+                Keyboard.IsKeyDown(Keys.Left) == false && Keyboard.IsKeyDown(Keys.Right) == false);
+        }
+
+        #endregion
+
+        #region OnMouseDown
+
+        /// <summary>
+        /// OnMouseDown
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnMouseDown(MouseEventArgs e)
+        {
+            Focus();
+
+            base.OnMouseDown(e);
+
+            _PrimaryGrid.InternalMouseDown(e);
+        }
+
+        #endregion
+
+        #region OnMouseUp
+
+        /// <summary>
+        /// OnMouseUp
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnMouseUp(MouseEventArgs e)
+        {
+            DisableAutoScrolling();
+
+            if (CapturedItem != null)
+                CapturedItem.InternalMouseUp(e);
+            else
+                _PrimaryGrid.InternalMouseUp(e);
+            
+            base.OnMouseUp(e);
+
+            if (_ActiveEditor != null)
+                _ActiveEditor.EditorCell.FocusEditor(_ActiveEditor);
+        }
+
+        #endregion
+
+        #region OnMouseClick
+
+        /// <summary>
+        /// OnMouseClick
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnMouseClick(MouseEventArgs e)
+        {
+            _PrimaryGrid.InternalMouseClick(e);
+
+            base.OnMouseClick(e);
+        }
+
+        #endregion
+
+        #region OnMouseDoubleClick
+
+        /// <summary>
+        /// OnMouseDoubleClick
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnMouseDoubleClick(MouseEventArgs e)
+        {
+            _PrimaryGrid.InternalMouseDoubleClick(e);
+
+            base.OnMouseDoubleClick(e);
+        }
+
+        #endregion
+
+        #region OnMousewheel
+
+        protected override void OnMouseWheel(MouseEventArgs e)
+        {
+            if (CanProcessMouseWheel() == true)
+                MouseWheelHandler(e.Delta / SystemInformation.MouseWheelScrollDelta);
+
+            base.OnMouseWheel(e);
+        }
+
+        private void MouseWheelHandler(int delta)
+        {
+            int value = -(delta * SystemInformation.MouseWheelScrollLines);
+
+            value *= _VScrollBar.SmallChange;
+            value += _VScrollBar.Value;
+
+            SetVScrollValue(value);
+
+            Cursor.Position = Cursor.Position;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Keyboard support
+
+        #region IsInputChar
+
+        /// <summary>
+        /// IsInputChar
+        /// </summary>
+        /// <param name="charCode"></param>
+        /// <returns></returns>
+        protected override bool IsInputChar(char charCode)
+        {
+            if (char.IsLetterOrDigit(charCode))
+                return (true);
+
+            return (base.IsInputChar(charCode));
+        }
+
+        #endregion
+
+        #region OnKeyDown
+
+        /// <summary>
+        /// Handles KeyDown events
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnKeyDown(KeyEventArgs e)
+        {
+            base.OnKeyDown(e);
+
+            if (e.Handled == false)
+            {
+                if (e.Handled == true ||
+                    ProcessInCellKeyDown(e.KeyData) == true)
+                {
+                    e.SuppressKeyPress = true;
+                }
+            }
+        }
+
+        #endregion
+
+        #region OnKeyPress
+
+        /// <summary>
+        /// Handles KeyPress events
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnKeyPress(KeyPressEventArgs e)
+        {
+            GridCell cell = GetCellToEdit();
+
+            if (cell != null)
+            {
+                if (cell.CellEditMode == CellEditMode.Modal)
+                {
+                    switch (cell.GridPanel.KeyboardEditMode)
+                    {
+                        case KeyboardEditMode.EditOnKeystroke:
+                        case KeyboardEditMode.EditOnKeystrokeOrF2:
+                            if (cell.CanSetActiveCell(cell.GridPanel) == true)
+                            {
+                                if (cell.BeginEdit(true) != null)
+                                {
+                                    Keys modifiers = ModifierKeys;
+
+                                    bool shift = ((modifiers & Keys.Shift) == Keys.Shift) ^
+                                                 (Console.CapsLock == true);
+
+                                    if (shift == true)
+                                        modifiers |= Keys.Shift;
+                                    else
+                                        modifiers &= ~Keys.Shift;
+
+                                    Keys keyData = _LastKeyDown | modifiers;
+
+                                    if (_ActiveEditor.WantsInputKey(keyData, false) == true)
+                                        PressKeyDown((ushort)(keyData));
+                                }
+                            }
+                            break;
+                    }
+                }
+                else
+                {
+                    cell.PostCellKeyDown(_LastKeyDown);
+                }
+            }
+
+            base.OnKeyPress(e);
+        }
+
+        #endregion
+
+        #region ProcessInCellKeyDown
+
+        private bool ProcessInCellKeyDown(Keys keyData)
+        {
+            if (ProcessGridKeyDown(keyData) == false)
+            {
+                if (keyData == Keys.F2)
+                {
+                    GridCell cell = GetCellToEdit();
+
+                    if (cell != null)
+                    {
+                        if (cell.CellEditMode == CellEditMode.Modal)
+                        {
+                            switch (cell.GridPanel.KeyboardEditMode)
+                            {
+                                case KeyboardEditMode.EditOnF2:
+                                case KeyboardEditMode.EditOnKeystrokeOrF2:
+                                    if (cell.IsEmptyCell == false)
+                                    {
+                                        if (cell.CanSetActiveCell(cell.GridPanel) == true)
+                                        {
+                                            cell.BeginEdit(false);
+                                            return (true);
+                                        }
+                                    }
+                                    break;
+                            }
+                        }
+                    }
+                }
+
+                return (false);
+            }
+
+            return (true);
+        }
+
+        #endregion 
+
+        #region PressKeyDown
+
+        ///<summary>
+        /// Sends the given input scanCode to the
+        /// current active edit control
+        ///</summary>
+        ///<param name="scanCode"></param>
+        public void PressKeyDown(ushort scanCode)
+        {
+            _KeyPressSent = true;
+
+            if (Marshal.SizeOf(new IntPtr()) == 8)
+                SendInput64(scanCode);
+            else
+                SendInput32(scanCode);
+        }
+
+        private void SendInput32(ushort scanCode)
+        {
+            Input32[] inputs = new Input32[1];
+
+            inputs[0].type = InputKeyboard;
+            inputs[0].ki = new KeyBoardInput(scanCode);
+
+            SendInput(1, inputs, Marshal.SizeOf(inputs[0]));
+        }
+
+        private void SendInput64(ushort scanCode)
+        {
+            Input64[] inputs = new Input64[1];
+
+            inputs[0].type = InputKeyboard;
+            inputs[0].ki = new KeyboardInput64(scanCode);
+
+            SendInput(1, inputs, Marshal.SizeOf(inputs[0]));
+        }
+
+        #endregion
+
+        #region GetCellToEdit
+
+        private GridCell GetCellToEdit()
+        {
+            GridPanel panel = _ActiveGrid;
+
+            if (panel != null && panel.SuperGrid.Focused == true)
+            {
+                if (panel.ReadOnly == true)
+                    return (null);
+
+                if (panel.SelectionGranularity != SelectionGranularity.Cell)
+                {
+                    GridRow row = panel.ActiveRow as GridRow;
+
+                    if (row != null)
+                    {
+                        if (panel.PrimaryColumn != null &&
+                            panel.PrimaryColumn.Visible == true)
+                        {
+                            if (row.Cells.Count > panel.PrimaryColumnIndex)
+                                return (row.Cells[panel.PrimaryColumnIndex]);
+                        }
+
+                        return (row.FirstVisibleCell);
+                    }
+                }
+                else
+                {
+                    GridCell cell = ActiveElement as GridCell;
+
+                    if (cell != null)
+                    {
+                        if (cell.AllowSelection == true)
+                            return (cell);
+                    }
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region SuperGridControlPreviewKeyDown
+
+        void SuperGridControlPreviewKeyDown(object sender, PreviewKeyDownEventArgs e)
+        {
+            DoPreviewKeyDown(e.KeyData);
+
+            if (e.KeyData == Keys.Tab ||
+                e.KeyData == (Keys.Tab | Keys.Shift))
+            {
+                if (_TabSelection != TabSelection.Control)
+                    e.IsInputKey = true;
+            }
+            else
+            {
+                if (GridWantsKey(e.KeyData) == true)
+                    e.IsInputKey = true;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ProcessInFilterEditKeyDown
+
+        private bool ProcessInFilterEditKeyDown(Keys keyData)
+        {
+            bool wantsKey = GridWantsKey(keyData);
+
+            wantsKey = ActiveFilterPanel.WantsInputKey(keyData, wantsKey);
+
+            if (wantsKey == false)
+                return (ProcessFilterEditKeyDown(keyData));
+
+            return (false);
+        }
+
+        #endregion
+
+        #region ProcessInEditKeyDown
+
+        private bool ProcessInEditKeyDown(Keys keyData)
+        {
+            bool wantsKey = GridWantsKey(keyData);
+
+            wantsKey = _ActiveEditor.WantsInputKey(keyData, wantsKey);
+
+            if (wantsKey == false)
+                ProcessInEditGridKeyDown(keyData);
+
+            return (wantsKey == false);
+        }
+
+        #endregion
+
+        #region ProcessInEditGridKeyDown
+
+        private void ProcessInEditGridKeyDown(Keys keyData)
+        {
+            switch (keyData)
+            {
+                case Keys.Escape:
+                    _EditorCell.CancelEdit();
+                    break;
+
+                case Keys.Enter:
+                    if (_EditorCell.EndEdit() == true)
+                        ProcessGridKeyDown(keyData);
+                    break;
+
+                default:
+                    if (GridWantsKey(keyData) == true)
+                    {
+                        if (_EditorCell.EndEdit() == true)
+                            ProcessGridKeyDown(keyData);
+                    }
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region ProcessGridKeyDown
+
+        #region ProcessGridKeyDown
+
+        private bool ProcessGridKeyDown(Keys keyData)
+        {
+            if (ActiveElement == null)
+            {
+                switch (_PrimaryGrid.SelectionGranularity)
+                {
+                    case SelectionGranularity.Cell:
+                        SetFirstAvailableCell(_PrimaryGrid, false);
+                        break;
+
+                    default:
+                        SetFirstAvailableRow(_PrimaryGrid, false);
+                        break;
+                }
+
+                switch (keyData)
+                {
+                    case Keys.Tab | Keys.Control:
+                        Parent.SelectNextControl(this, true, true, true, true);
+                        return (true);
+
+                    case Keys.Tab | Keys.Shift | Keys.Control:
+                        Parent.SelectNextControl(this, false, true, true, true);
+                        return (true);
+
+                    case Keys.Insert:
+                        if (_PrimaryGrid != null)
+                        {
+                            if (_PrimaryGrid.Rows.Count == 0)
+                            {
+                                if (_PrimaryGrid.DataBinder.CanInsertRow == true)
+                                {
+                                    _PrimaryGrid.InsertRow(0);
+                                    return (true);
+                                }
+                            }
+                        }
+                        break;
+                }
+
+                return (false);
+            }
+
+            if (ActiveElement.GridPanel == null)
+                return (false);
+
+            bool processed = true;
+
+            if (keyData == Keys.Escape)
+                CancelCapture();
+
+            bool ms = ActiveElement.GridPanel.MultiSelect;
+
+            switch (keyData)
+            {
+                case Keys.NumLock:
+                    break;
+
+                case Keys.Down:
+                    ProcessDownKey(true, false);
+                    break;
+
+                case Keys.Down | Keys.Control:
+                    ProcessDownKey(false, false);
+                    break;
+
+                case Keys.Down | Keys.Shift:
+                case Keys.Down | Keys.Shift | Keys.Control:
+                    ProcessDownKey(true, ms);
+                    break;
+
+                case Keys.End:
+                    ProcessEndKey(false);
+                    break;
+
+                case Keys.End | Keys.Shift:
+                    ProcessEndKey(ms);
+                    break;
+
+                case Keys.End | Keys.Control:
+                    ProcessCtrlEndKey(false);
+                    break;
+
+                case Keys.End | Keys.Control | Keys.Shift:
+                    ProcessCtrlEndKey(ms);
+                    break;
+
+                case Keys.Enter:
+                    ProcessEnterKey(true, false);
+                    break;
+
+                case Keys.Enter | Keys.Shift:
+                case Keys.Enter | Keys.Control:
+                case Keys.Enter | Keys.Shift | Keys.Control:
+                    ProcessShiftEnterKey();
+                    break;
+
+                case Keys.Escape:
+                    if (ProcessEscapeKey() == false)
+                    {
+                        Form form = FindForm();
+
+                        if (form != null && form.CancelButton != null)
+                            form.CancelButton.PerformClick();
+                    }
+                    break;
+
+                case Keys.Home:
+                    ProcessHomeKey(false);
+                    break;
+
+                case Keys.Home | Keys.Shift:
+                    ProcessHomeKey(ms);
+                    break;
+
+                case Keys.Home | Keys.Control:
+                    ProcessCtrlHomeKey(false);
+                    break;
+
+                case Keys.Home | Keys.Control | Keys.Shift:
+                    ProcessCtrlHomeKey(ms);
+                    break;
+
+                case Keys.Left:
+                    ProcessLeftKey(true, false);
+                    break;
+
+                case Keys.Left | Keys.Shift:
+                case Keys.Left | Keys.Shift | Keys.Control:
+                    ProcessLeftKey(true, ms);
+                    break;
+
+                case Keys.Left | Keys.Control:
+                    ProcessLeftKey(false, false);
+                    break;
+
+                case Keys.PageUp:
+                    ProcessPageUpKey(false);
+                    break;
+
+                case Keys.PageUp | Keys.Shift:
+                case Keys.PageUp | Keys.Shift | Keys.Control:
+                    ProcessPageUpKey(ms);
+                    break;
+
+                case Keys.PageDown:
+                    ProcessPageDownKey(false);
+                    break;
+
+                case Keys.PageDown | Keys.Shift:
+                case Keys.PageDown | Keys.Shift | Keys.Control:
+                    ProcessPageDownKey(ms);
+                    break;
+
+                case Keys.Tab:
+                    processed = ProcessTabKey();
+                    break;
+
+                case Keys.Tab | Keys.Shift:
+                    processed = ProcessShiftTabKey();
+                    break;
+
+                case Keys.Tab | Keys.Control:
+                    Parent.SelectNextControl(this, true, true, true, true);
+                    break;
+
+                case Keys.Tab | Keys.Shift | Keys.Control:
+                    Parent.SelectNextControl(this, false, true, true, true);
+                    break;
+
+                case Keys.Right:
+                    ProcessRightKey(true, false);
+                    break;
+
+                case Keys.Right | Keys.Shift:
+                case Keys.Right | Keys.Shift | Keys.Control:
+                    ProcessRightKey(true, ms);
+                    break;
+
+                case Keys.Right | Keys.Control:
+                    ProcessRightKey(false, false);
+                    break;
+
+                case Keys.Space:
+                    if (ActiveElement is GridContainer)
+                    {
+                        GridContainer item = (GridContainer)ActiveElement;
+
+                        item.Expanded = !item.Expanded;
+                    }
+                    else
+                    {
+                        processed = false;
+
+                        if (ActiveElement is GridCell)
+                        {
+                            GridCell cell = (GridCell)ActiveElement;
+
+                            if (cell.Merged && cell.MergeSuspended == false)
+                            {
+                                cell.SuspendMerge(false);
+                                processed = true;
+                            }
+                        }
+                    }
+                    break;
+
+                case Keys.Space | Keys.Shift:
+                    ProcessShiftSpaceKey(ms);
+                    break;
+
+                case Keys.Space | Keys.Control:
+                    ProcessCtrlSpaceKey(ms);
+                    break;
+
+                case Keys.Up:
+                    ProcessUpKey(true, false);
+                    break;
+
+                case Keys.Up | Keys.Shift:
+                case Keys.Up | Keys.Shift | Keys.Control:
+                    ProcessUpKey(true, ms);
+                    break;
+
+                case Keys.Up | Keys.Control:
+                    ProcessUpKey(false, false);
+                    break;
+
+                case Keys.Delete:
+                    ProcessDeleteKey();
+                    break;
+
+                case Keys.Delete | Keys.Shift:
+                    ProcessShiftDeleteKey();
+                    break;
+
+                case Keys.Insert:
+                    ProcessInsertKey();
+                    break;
+
+                case Keys.Insert | Keys.Shift:
+                    ProcessShiftInsertKey();
+                    break;
+
+                default:
+                    processed = false;
+                    break;
+            }
+
+            return (processed);
+        }
+
+        #endregion
+
+        #region ProcessEscapeKey
+
+        private bool ProcessEscapeKey()
+        {
+            if (ActiveElement is GridCell)
+            {
+                GridCell cell = (GridCell)ActiveElement;
+
+                if (cell.MergeSuspended == true)
+                {
+                    cell.ResumeMerge(null);
+
+                    return (true);
+                }
+            }
+
+            GridRow row = ActiveRow as GridRow;
+
+            if (row != null)
+            {
+                GridPanel panel = row.GridPanel;
+
+                if (row.IsInsertRow == false &&
+                    row.IsTempInsertRow == true)
+                {
+                    row.RowNeedsStored = false;
+
+                    if (panel.VirtualMode == true)
+                    {
+                        panel.VirtualRowCountEx--;
+                        panel.VirtualRows.MaxRowIndex = row.RowIndex - 1;
+
+                        panel.LatentActiveRowIndex = row.RowIndex;
+                        panel.LatentActiveContainer = panel;
+
+                        panel.VirtualTempInsertRow = null;
+
+                        panel.InvalidateLayout();
+                        row.Dispose();
+                    }
+                    else
+                    {
+                        panel.LatentActiveRowIndex = row.RowIndex;
+                        panel.LatentActiveContainer = panel;
+
+                        panel.Rows.Remove(row);
+
+                        _LastProcessedItem = null;
+                    }
+
+                    ActiveRow = null;
+                    panel.ActiveRow = null;
+
+                    return (true);
+                }
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region ProcessPageUpKey
+
+        private void ProcessPageUpKey(bool extend)
+        {
+            try
+            {
+                BeginUpdate();
+
+                if (ActiveElement is GridCell)
+                    ProcessCellPageUpKey(extend);
+
+                else if (ActiveElement is GridContainer)
+                    ProcessRowPageUpKey(extend);
+            }
+            finally
+            {
+                EndUpdate();
+            }
+        }
+
+        #region ProcessCellPageUpKey
+
+        private void ProcessCellPageUpKey(bool extend)
+        {
+            GridCell cell = (GridCell)ActiveElement;
+
+            GridPanel panel = cell.GridPanel;
+            GridContainer lrow = cell.GridRow;
+
+            GridContainer container = panel.FirstOnScreenRow;
+
+            if (lrow == container)
+            {
+                lrow.ScrollToBottom();
+
+                container = panel.FirstOnScreenRow;
+            }
+
+            while (container != null)
+            {
+                GridRow row = container as GridRow;
+
+                if (row != null)
+                {
+                    GridCell ecell = row.GetCell(cell.ColumnIndex,
+                        panel.AllowEmptyCellSelection);
+
+                    if (ecell != null)
+                    {
+                        if (ecell.AllowSelection == true)
+                        {
+                            KeySelectCell(panel, ecell, true, extend);
+                            break;
+                        }
+                    }
+                }
+
+                container = container.PrevVisibleRow;
+            }
+        }
+
+        #endregion
+
+        #region ProcessRowPageUpKey
+
+        private void ProcessRowPageUpKey(bool extend)
+        {
+            GridContainer lrow = (GridContainer)ActiveElement;
+            GridPanel panel = lrow.GridPanel;
+
+            GridContainer row = panel.FirstOnScreenRow;
+
+            if (lrow != row)
+            {
+                KeySelectRow(panel, row, true, extend);
+            }
+            else
+            {
+                lrow.ScrollToBottom();
+
+                KeySelectRow(panel, panel.FirstOnScreenRow, true, extend);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ProcessPageDownKey
+
+        private void ProcessPageDownKey(bool extend)
+        {
+            try
+            {
+                BeginUpdate();
+
+                if (ActiveElement is GridCell)
+                    ProcessCellPageDownKey(extend);
+
+                else if (ActiveElement is GridContainer)
+                    ProcessRowPageDownKey(extend);
+            }
+            finally
+            {
+                EndUpdate();
+            }
+        }
+
+        #region ProcessCellPageDownKey
+
+        private void ProcessCellPageDownKey(bool extend)
+        {
+            GridCell cell = (GridCell)ActiveElement;
+
+            GridPanel panel = cell.GridPanel;
+            GridContainer lrow = cell.GridRow;
+
+            GridContainer container = panel.LastOnScreenRow;
+
+            if (lrow.GridIndex == container.GridIndex)
+            {
+                lrow.ScrollToTop();
+
+                container = panel.LastOnScreenRow;
+            }
+
+            while (container != null)
+            {
+                GridRow row = container as GridRow;
+
+                if (row != null)
+                {
+                    GridCell ecell = row.GetCell(cell.ColumnIndex,
+                        panel.AllowEmptyCellSelection);
+
+                    if (ecell != null)
+                    {
+                        if (ecell.AllowSelection == true)
+                        {
+                            KeySelectCell(panel, ecell, true, extend);
+                            break;
+                        }
+                    }
+                }
+
+                container = container.NextVisibleRow;
+            }
+        }
+
+        #endregion
+
+        #region ProcessRowPageDownKey
+
+        private void ProcessRowPageDownKey(bool extend)
+        {
+            GridContainer lrow = (GridContainer)ActiveElement;
+            GridPanel panel = lrow.GridPanel;
+
+            GridContainer row = panel.LastOnScreenRow;
+
+            if (lrow != row)
+            {
+                KeySelectRow(panel, row, true, extend);
+            }
+            else
+            {
+                lrow.ScrollToTop();
+
+                row = panel.LastOnScreenRow;
+
+                KeySelectRow(panel, row, true, extend);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ProcessEnterKey
+
+        private void ProcessEnterKey(bool select, bool extend)
+        {
+            if (ActiveElement is GridCell)
+            {
+                GridCell cell = (GridCell) ActiveElement;
+                GridPanel panel = cell.GridPanel;
+
+                if (cell.GridRow.IsInsertRow == true)
+                {
+                    cell.BeginEdit(false);
+                    cell.EditorDirty = true;
+                    cell.EndEdit();
+                }
+                else
+                {
+                    if (panel.EnterKeySelectsNextRow == true)
+                        ProcessCellDownKey(select, extend);
+                    else
+                        cell.EndEdit();
+                }
+            }
+            else if (ActiveElement is GridContainer)
+            {
+                GridContainer row = (GridContainer)ActiveElement;
+                GridPanel panel = row.GridPanel;
+
+                if (panel.EnterKeySelectsNextRow == true)
+                    ProcessRowDownKey(select, extend);
+            }
+        }
+
+        #endregion
+
+        #region ProcessShiftEnterKey
+
+        private void ProcessShiftEnterKey()
+        {
+            if (ActiveElement is GridCell)
+                ProcessCellShiftEnterKey();
+
+            else if (ActiveElement is GridContainer)
+                ProcessRowShiftEnterKey();
+        }
+
+        #region ProcessCellShiftEnterKey
+
+        private void ProcessCellShiftEnterKey()
+        {
+            GridCell cell = (GridCell)ActiveElement;
+
+            KeySelectRow(cell.GridPanel, cell.GridRow, true, false);
+        }
+
+        #endregion
+
+        #region ProcessRowShiftEnterKey
+
+        private void ProcessRowShiftEnterKey()
+        {
+            if (ActiveElement is GridRow)
+            {
+                GridRow row = (GridRow)ActiveElement;
+
+                GridPanel panel = row.GridPanel;
+                GridColumn column = panel.Columns.FirstVisibleColumn;
+
+                if (column != null)
+                    KeySelectCell(panel, row[column.ColumnIndex], true, false);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ProcessCtrlSpaceKey
+
+        private void ProcessCtrlSpaceKey(bool extend)
+        {
+            if (ActiveElement is GridCell)
+                ProcessCellCtrlSpaceKey(extend);
+
+            else if (ActiveElement is GridContainer)
+                ProcessRowCtrlSpaceKey(extend);
+        }
+
+        #region ProcessCellCtrlSpaceKey
+
+        private void ProcessCellCtrlSpaceKey(bool extend)
+        {
+            GridCell cell = (GridCell) ActiveElement;
+
+            if (extend == true)
+                KeyCtrlSelectCell(cell);
+            else
+                KeySelectCell(cell.GridPanel, cell, true, false);
+        }
+
+        #endregion
+
+        #region ProcessRowCtrlSpaceKey
+
+        private void ProcessRowCtrlSpaceKey(bool extend)
+        {
+            GridContainer row = (GridContainer)ActiveElement;
+
+            if (extend == true)
+                KeyCtrlSelectRow(row);
+            else
+                KeySelectRow(row.GridPanel, row, true, false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ProcessShiftSpaceKey
+
+        private void ProcessShiftSpaceKey(bool extend)
+        {
+            if (ActiveElement is GridCell)
+                ProcessCellShiftSpaceKey(extend);
+
+            else if (ActiveElement is GridContainer)
+                ProcessRowShiftSpaceKey(extend);
+        }
+
+        #region ProcessCellShiftSpaceKey
+
+        private void ProcessCellShiftSpaceKey(bool extend)
+        {
+            GridCell cell = (GridCell)ActiveElement;
+            GridPanel panel = cell.GridPanel;
+
+            KeySelectCell(panel, cell, true, extend);
+        }
+
+        #endregion
+
+        #region ProcessRowShiftSpaceKey
+
+        private void ProcessRowShiftSpaceKey(bool extend)
+        {
+            GridContainer lrow = (GridContainer)ActiveElement;
+            GridPanel panel = (lrow is GridPanel) ? lrow.GetParentPanel() : lrow.GridPanel;
+
+            KeySelectRow(panel, lrow, true, extend);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ProcessUpKey
+
+        private void ProcessUpKey(bool select, bool extend)
+        {
+            if (ActiveElement is GridCell)
+                ProcessCellUpKey(select, extend);
+
+            else if (ActiveElement is GridContainer)
+                ProcessRowUpKey(select, extend);
+        }
+
+        #region ProcessCellUpKey
+
+        private void ProcessCellUpKey(bool select, bool extend)
+        {
+            GridCell cell = (GridCell)ActiveElement;
+            GridPanel panel = cell.GridPanel;
+
+            _LastCellIndex = cell.ColumnIndex;
+
+            GridContainer prow = GetPrevRow(cell.GridRow);
+
+            if (panel.GroupHeaderKeyBehavior == GroupHeaderKeyBehavior.Select)
+            {
+                if (prow is GridGroup)
+                {
+                    KeySelectRow(panel, (GridGroup)cell.GridRow.Parent, select, extend);
+                    return;
+                }
+            }
+
+            GridCell pcell = GetPrevRowCell(prow, cell.ColumnIndex);
+
+            if (KeySelectCell(panel, pcell, select, extend) == false)
+            {
+                if (VScrollOffset > 0)
+                {
+                    VScrollOffset -= _VScrollBar.SmallChange;
+                }
+                else
+                {
+                    if (select == false && panel.Filter.Visible == true &&
+                        cell.GridColumn.IsFilteringEnabled == true)
+                    {
+                        panel.Filter.ActivateFilterEdit(cell.GridColumn);
+                    }
+                }
+            }
+        }
+
+        #region GetPrevRowCell
+
+        private GridCell GetPrevRowCell(GridContainer item, int index)
+        {
+            while (item != null)
+            {
+                GridRow row = item as GridRow;
+
+                if (row != null)
+                {
+                    if (item.AllowSelection == true)
+                    {
+                        GridCell cell = row.GetCell(index,
+                            row.GridPanel.AllowEmptyCellSelection);
+
+                        if (cell != null)
+                        {
+                            if (cell.AllowSelection == true)
+                                return (cell);
+                        }
+                    }
+                }
+
+                item = item.PrevVisibleRow;
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ProcessRowUpKey
+
+        private void ProcessRowUpKey(bool select, bool extend)
+        {
+            GridContainer lrow = (GridContainer)ActiveElement;
+            GridPanel panel = (lrow is GridPanel) ? lrow.GetParentPanel() : lrow.GridPanel;
+
+            GridContainer row = GetPrevRow(lrow);
+
+            if (lrow is GridGroup)
+            {
+                if (_LastCellIndex >= 0 && (row is GridGroup == false))
+                {
+                    GridCell cell = GetPrevRowCell(row, _LastCellIndex);
+
+                    KeySelectCell(panel, cell, select, extend);
+                    return;
+                }
+            }
+            else
+            {
+                _LastCellIndex = -1;
+            }
+
+            if (KeySelectRow(panel, row, select, extend) == false)
+            {
+                if (VScrollOffset > 0)
+                {
+                    VScrollOffset -= _VScrollBar.SmallChange;
+                }
+                else
+                {
+                    if (select == false && panel.Filter.Visible == true)
+                    {
+                        GridColumn column = panel.Columns.FirstVisibleColumn;
+
+                        while (column != null)
+                        {
+                            if (column.IsFilteringEnabled == true)
+                            {
+                                ActivateFilterPanel(column);
+                                break;
+                            }
+
+                            column = column.NextVisibleColumn;
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region GetPrevRow
+
+        private GridContainer GetPrevRow(GridContainer lrow)
+        {
+            GridContainer row = lrow.PrevVisibleRow;
+
+            while (row != null)
+            {
+                if (row.AllowSelection == true)
+                    return (row);
+
+                row = row.PrevVisibleRow;
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ProcessDownKey
+
+        private void ProcessDownKey(bool select, bool extend)
+        {
+            if (ActiveElement is GridCell)
+                ProcessCellDownKey(select, extend);
+
+            else if (ActiveElement is GridContainer)
+                ProcessRowDownKey(select, extend);
+        }
+
+        #region ProcessCellDownKey
+
+        private void ProcessCellDownKey(bool select, bool extend)
+        {
+            GridCell cell = (GridCell) ActiveElement;
+            GridPanel panel = cell.GridPanel;
+
+            _LastCellIndex = cell.ColumnIndex;
+
+            GridContainer nrow = GetNextRow(cell.GridRow);
+
+            if (panel.GroupHeaderKeyBehavior == GroupHeaderKeyBehavior.Select)
+            {
+                if (nrow is GridGroup)
+                {
+                    if (KeySelectRow(panel, nrow, select, extend) == false)
+                        VScrollOffset += _VScrollBar.SmallChange;
+
+                    return;
+                }
+            }
+
+            GridCell ncell = GetNextRowCell(nrow, _LastCellIndex);
+
+            if (KeySelectCell(panel, ncell, select, extend) == false)
+            {
+                if (nrow == null)
+                    VScrollOffset += _VScrollBar.SmallChange;
+            }
+        }
+
+        #region GetNextRowCell
+
+        private GridCell GetNextRowCell(GridContainer item, int index)
+        {
+            while (item != null)
+            {
+                GridRow row = item as GridRow;
+
+                if (row != null)
+                {
+                    if (row.AllowSelection == true)
+                    {
+                        GridCell cell = row.GetCell(index,
+                            row.GridPanel.AllowEmptyCellSelection);
+
+                        if (cell != null)
+                        {
+                            if (cell.AllowSelection == true)
+                                return (cell);
+                        }
+                    }
+                }
+
+                item = item.NextVisibleRow;
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ProcessRowDownKey
+
+        private void ProcessRowDownKey(bool select, bool extend)
+        {
+            GridContainer lrow = (GridContainer)ActiveElement;
+            GridPanel panel = (lrow is GridPanel) ? lrow.GetParentPanel() : lrow.GridPanel;
+
+            GridContainer row = GetNextRow(lrow);
+
+            if (lrow is GridGroup)
+            {
+                if (_LastCellIndex >= 0 && (row is GridGroup == false))
+                {
+                    GridCell cell = GetNextRowCell(row, _LastCellIndex);
+
+                    KeySelectCell(panel, cell, select, extend);
+                    return;
+                }
+            }
+            else
+            {
+                _LastCellIndex = -1;
+            }
+
+            if (KeySelectRow(panel, row, select, extend) == false)
+                VScrollOffset += _VScrollBar.SmallChange;
+        }
+
+        #endregion
+
+        #region GetNextRow
+
+        private GridContainer GetNextRow(GridContainer lrow)
+        {
+            GridContainer row = lrow.NextVisibleRow;
+
+            while (row != null)
+            {
+                if (row.AllowSelection == true)
+                    return (row);
+
+                row = row.NextVisibleRow;
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ProcessLeftKey
+
+        private bool ProcessLeftKey(bool select, bool extend)
+        {
+            if (ActiveElement is GridCell)
+                return (ProcessCellLeftKey(select, extend));
+
+            if (ActiveElement is GridContainer)
+                ProcessRowLeftKey();
+
+            return (true);
+        }
+
+        #region ProcessCellLeftKey
+
+        private bool ProcessCellLeftKey(bool select, bool extend)
+        {
+            GridCell lcell = (GridCell) ActiveElement;
+            GridPanel panel = lcell.GridPanel;
+
+            if ((ModifierKeys & (Keys.Shift | Keys.Control)) == (Keys.Shift | Keys.Control))
+            {
+                KeySelectRow(panel, lcell.GridRow, true, false);
+
+                return (true);
+            }
+            
+            GridCell cell = lcell.GetPreviousCell(true, !extend);
+
+            bool selected = KeySelectCell(panel, cell, select, extend);
+
+            if (selected == false)
+                HScrollOffset -= _HScrollBar.SmallChange;
+
+            return (selected);
+        }
+
+        #endregion
+
+        #region ProcessRowLeftKey
+
+        private void ProcessRowLeftKey()
+        {
+            GridContainer lrow = (GridContainer)ActiveElement;
+
+            if (lrow.Expanded == true)
+            {
+                lrow.Expanded = false;
+            }
+            else
+            {
+                GridContainer crow = lrow.Parent as GridContainer;
+
+                if (crow != null && crow.Parent != null)
+                {
+                    ActiveElement = crow;
+
+                    crow.GridPanel.ClearAll(true);
+                    crow.IsSelected = true;
+
+                    crow.EnsureVisible();
+                }
+                else
+                {
+                    GridRow row = lrow as GridRow;
+
+                    if (row != null)
+                    {
+                        if (lrow.GridPanel.SelectionGranularity == SelectionGranularity.Cell)
+                        {
+                            GridCell cell = row.LastSelectableCell;
+
+                            if (cell != null)
+                                KeySelectCell(row.GridPanel, cell, true, false);
+                        }
+                        else
+                        {
+                            HScrollOffset -= _HScrollBar.SmallChange;
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ProcessRightKey
+
+        private bool ProcessRightKey(bool select, bool extend)
+        {
+            if (ActiveElement is GridCell)
+                return (ProcessCellRightKey(select, extend));
+
+            if (ActiveElement is GridContainer)
+                ProcessRowRightKey();
+
+            return (true);
+        }
+
+        #region ProcessCellRightKey
+
+        private bool ProcessCellRightKey(bool select, bool extend)
+        {
+            GridCell lcell = (GridCell) ActiveElement;
+            GridPanel panel = lcell.GridPanel;
+
+            GridCell cell = lcell.GetNextCell(true, !extend);
+
+            bool selected = KeySelectCell(panel, cell, select, extend);
+            
+            if (selected == false)
+                HScrollOffset += _HScrollBar.SmallChange;
+
+            return (selected);
+        }
+
+        #endregion
+
+        #region ProcessRowRightKey
+
+        private void ProcessRowRightKey()
+        {
+            GridContainer lrow = (GridContainer)ActiveElement;
+
+            if (lrow is GridPanel)
+            {
+                GridPanel panel = (GridPanel)lrow;
+                GridRow row = panel.GetRowFromIndex(0) as GridRow;
+
+                if (row != null)
+                {
+                    ActiveElement = row;
+
+                    lrow.GetParentPanel().ClearAll(true);
+                    lrow.GridPanel.ClearAll(true);
+
+                    row.IsSelected = true;
+
+                    row.EnsureVisible();
+                }
+            }
+            else
+            {
+                if (lrow.Rows.Count > 0 || lrow.RowsUnresolved == true)
+                {
+                    if (lrow.Expanded == false)
+                        lrow.Expanded = true;
+                }
+                else
+                {
+                    GridRow row = lrow as GridRow;
+
+                    if (row != null)
+                    {
+                        if (lrow.GridPanel.SelectionGranularity == SelectionGranularity.Cell)
+                        {
+                            GridCell cell = row.FirstSelectableCell;
+
+                            if (cell != null)
+                                KeySelectCell(row.GridPanel, cell, true, false);
+                        }
+                        else
+                        {
+                            HScrollOffset += _HScrollBar.SmallChange;
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ProcessTabKey
+
+        private bool ProcessTabKey()
+        {
+            if (_TabSelection == TabSelection.Control)
+                return (false);
+
+            if (ActiveElement is GridCell)
+            {
+                GridCell lcell = (GridCell)ActiveElement;
+                GridPanel panel = lcell.GridPanel;
+
+                GridCell cell =
+                    lcell.GetNextCell(true, _TabSelection == TabSelection.Cell);
+
+                KeySelectCell(panel, cell, true, false);
+
+                return (true);
+            }
+
+            GridRow row = ActiveElement as GridRow;
+
+            if (row != null)
+            {
+                if (row.GridPanel.SelectionGranularity != SelectionGranularity.Cell)
+                {
+                    GridCell cell = row.FirstOnScreenCell;
+
+                    if (cell != null)
+                    {
+                        GridCell cellNext = cell.GetNextCell(false, false);
+
+                        if (cellNext != null)
+                        {
+                            int n = 0;
+
+                            GridColumn col = row.GridPanel.Columns.FirstVisibleColumn;
+
+                            while (col != null && col.ColumnIndex != cellNext.ColumnIndex)
+                            {
+                                n += col.Bounds.Width;
+
+                                col = col.NextVisibleColumn;
+                            }
+
+                            HScrollOffset = n;
+                        }
+                    }
+
+                    return (true);
+                }
+            }
+
+            return (ProcessRightKey(true, false));
+        }
+
+        #endregion
+
+        #region ProcessShiftTabKey
+
+        private bool ProcessShiftTabKey()
+        {
+            if (_TabSelection == TabSelection.Control)
+                return (false);
+
+            if (ActiveElement is GridCell)
+            {
+                GridCell lcell = (GridCell)ActiveElement;
+                GridPanel panel = lcell.GridPanel;
+
+                GridCell cell =
+                    lcell.GetPreviousCell(true, _TabSelection == TabSelection.Cell);
+
+                return (KeySelectCell(panel, cell, true, false));
+            }
+
+            GridRow row = ActiveElement as GridRow;
+
+            if (row != null)
+            {
+                if (row.GridPanel.SelectionGranularity != SelectionGranularity.Cell)
+                {
+                    if (_HScrollOffset > 0)
+                    {
+                        GridCell cell = row.FirstOnScreenCell;
+
+                        if (cell != null)
+                        {
+                            Rectangle t = row.GridPanel.ViewRect;
+                            Rectangle r = cell.Bounds;
+
+                            GridCell fcell = row.LastFrozenCell;
+
+                            if (fcell != null)
+                                t.X = fcell.Bounds.Right;
+
+                            if (r.Left >= t.Left)
+                                cell = cell.GetPreviousCell(false, false);
+
+                            if (cell != null)
+                                cell.EnsureVisible();
+
+                            return (true);
+                        }
+                    }
+                }
+            }
+
+            return (ProcessLeftKey(true, false));
+        }
+
+        #endregion
+
+        #region ProcessHomeKey
+
+        private void ProcessHomeKey(bool extend)
+        {
+            if (ActiveElement is GridCell)
+            {
+                GridCell lcell = (GridCell)ActiveElement;
+                GridPanel panel = lcell.GridPanel;
+
+                GridCell cell = lcell.GridRow.FirstSelectableCell;
+
+                if (cell != lcell)
+                    KeySelectCell(panel, cell, true, extend);
+            }
+            else if (ActiveElement is GridContainer)
+            {
+                GridPanel panel = ActiveElement.GridPanel;
+
+                KeySelectRow(panel, panel.FirstSelectableRow, true, extend);
+            }
+        }
+
+        #endregion
+
+        #region ProcessCtrlHomeKey
+
+        private void ProcessCtrlHomeKey(bool extend)
+        {
+            if (ActiveElement is GridCell)
+            {
+                GridCell cell = (GridCell)ActiveElement;
+                GridPanel panel = cell.GridPanel;
+
+                SetFirstAvailableCell(panel, extend);
+            }
+            else if (ActiveElement is GridRow)
+            {
+                KeySelectRow(_PrimaryGrid, _PrimaryGrid.FirstSelectableRow, true, extend);
+            }
+        }
+
+        #endregion
+
+        #region ProcessEndKey
+
+        private void ProcessEndKey(bool extend)
+        {
+            if (ActiveElement is GridCell)
+            {
+                GridCell lcell = (GridCell)ActiveElement;
+
+                GridPanel panel = lcell.GridPanel;
+                GridCell cell = lcell.GridRow.LastSelectableCell;
+
+                if (cell != lcell)
+                    KeySelectCell(panel, cell, true, extend);
+            }
+            else if (ActiveElement is GridContainer)
+            {
+                GridPanel panel = ActiveElement.GridPanel;
+
+                GridContainer row = panel.LastSelectableRow;
+
+                if (row != null)
+                    KeySelectRow(panel, row, true, extend);
+            }
+        }
+
+        #endregion
+
+        #region ProcessCtrlEndKey
+
+        private void ProcessCtrlEndKey(bool extend)
+        {
+            if (ActiveElement is GridCell)
+            {
+                GridCell cell = (GridCell)ActiveElement;
+                GridPanel panel = cell.GridPanel;
+
+                SetLastAvailableCell(panel, extend);
+            }
+            else if (ActiveElement is GridRow)
+            {
+                KeySelectRow(_PrimaryGrid, _PrimaryGrid.LastVisibleRow, true, extend);
+            }
+        }
+
+        #endregion
+
+        #region SetFirstAvailableRow
+
+        private void SetFirstAvailableRow(GridPanel panel, bool extend)
+        {
+            GridContainer container = panel.FirstVisibleRow;
+            
+            while (container != null)
+            {
+                GridRow row = container as GridRow;
+
+                if (row != null)
+                {
+                    if (row.AllowSelection == true)
+                    {
+                        KeySelectRow(panel, row, true, extend);
+                        break;
+                    }
+                }
+
+                container = container.NextVisibleRow;
+            }
+        }
+
+        #endregion
+
+        #region SetFirstAvailableCell
+
+        private void SetFirstAvailableCell(GridPanel panel, bool extend)
+        {
+            GridColumn column = panel.Columns.FirstVisibleColumn;
+            GridContainer container = panel.FirstVisibleRow;
+
+            if (column != null)
+            {
+                while (container != null)
+                {
+                    GridRow row = container as GridRow;
+
+                    if (row != null)
+                    {
+                        if (row.AllowSelection == true)
+                        {
+                            GridCell cell = row.GetCell(column.ColumnIndex,
+                                panel.AllowEmptyCellSelection);
+
+                            if (cell != null)
+                            {
+                                if (cell.AllowSelection == false)
+                                    cell = cell.GetNextCell(true);
+
+                                KeySelectCell(panel, cell, true, extend);
+                            }
+                            break;
+                        }
+                    }
+
+                    container = container.NextVisibleRow;
+                }
+            }
+        }
+
+        #endregion
+
+        #region SetLastAvailableCell
+
+        private void SetLastAvailableCell(GridPanel panel, bool extend)
+        {
+            GridColumn column = panel.Columns.LastVisibleColumn;
+            GridContainer container = panel.LastVisibleRow;
+
+            while (container != null)
+            {
+                GridRow row = container as GridRow;
+
+                if (row != null)
+                {
+                    if (row.AllowSelection == true)
+                    {
+                        GridCell cell = row.GetCell(column.ColumnIndex,
+                            panel.AllowEmptyCellSelection);
+
+                        if (cell != null)
+                        {
+                            if (cell.AllowSelection == false)
+                                cell = cell.GetPreviousCell(true);
+
+                            KeySelectCell(panel, cell, true, extend);
+                        }
+                        break;
+                    }
+                }
+
+                container = container.PrevVisibleRow;
+            }
+        }
+
+        #endregion
+
+        #region KeySelectCell
+
+        internal bool KeySelectCell(
+            GridPanel panel, GridCell cell, bool select, bool extend)
+        {
+            if (cell != null)
+            {
+                int rowIndex = cell.GridRow.RowIndex;
+
+                if (cell.CanSetActiveCell(panel) == true)
+                {
+                    if (select == true && extend == false)
+                    {
+                        panel.SelectionRowAnchor = cell.GridRow;
+                        panel.SelectionColumnAnchor = cell.GridColumn;
+                    }
+
+                    if (select == true)
+                    {
+                        if (rowIndex != cell.GridRow.RowIndex)
+                            ArrangeGrid();
+
+                        cell.ExtendSelection(panel, cell, extend);
+
+                        if (cell.CellEditMode == CellEditMode.Modal)
+                        {
+                            if (panel.KeyboardEditMode == KeyboardEditMode.EditOnEntry)
+                                cell.BeginEdit(true);
+                        }
+                    }
+                    else
+                    {
+                        if (ActiveElement != null)
+                            ActiveElement.InvalidateRender();
+
+                        cell.InvalidateRender();
+                    }
+
+                    panel.LastProcessedItem = cell;
+
+                    cell.EnsureVisible();
+
+                    return (true);
+                }
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region KeyCtrlSelectCell
+
+        private void KeyCtrlSelectCell(GridCell cell)
+        {
+            if (cell != null)
+            {
+                ActiveElement = cell;
+
+                cell.IsSelected = !cell.IsSelected;
+
+                cell.EnsureVisible();
+            }
+        }
+
+        #endregion
+
+        #region KeySelectRow
+
+        internal bool KeySelectRow(GridPanel panel,
+            GridContainer row, bool select, bool extend)
+        {
+            if (row != null)
+            {
+                int rowIndex = row.RowIndex;
+
+                if (row.CanSetActiveRow(false) == true)
+                {
+                    if (select == true && (extend == false || panel.SelectionRowAnchor == null))
+                        panel.SelectionRowAnchor = row;
+
+                    if (select == true)
+                    {
+                        if (rowIndex != row.RowIndex)
+                            ArrangeGrid();
+
+                        row.ExtendSelection(panel, row, extend);
+                    }
+                    else
+                    {
+                        if (ActiveElement != null)
+                            ActiveElement.InvalidateRender();
+
+                        row.InvalidateRender();
+                    }
+
+                    panel.SetActiveRow(row, true);
+                    panel.LastProcessedItem = row;
+
+                    row.EnsureVisible();
+                }
+
+                return (true);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region KeyCtrlSelectRow
+
+        private void KeyCtrlSelectRow(GridContainer row)
+        {
+            if (row != null)
+            {
+                ActiveElement = row;
+
+                row.IsSelected = !row.IsSelected;
+
+                row.EnsureVisible();
+            }
+        }
+
+        #endregion
+
+        #region ProcessDeleteKey
+
+        private void ProcessDeleteKey()
+        {
+            if (CanDeleteRows() == true)
+            {
+                SelectedElements selRows =
+                    _ActiveGrid.InternalSelectedRows.Copy();
+
+                if (selRows.Count > 0)
+                {
+                    if (_ActiveGrid.ShowInsertRow == true)
+                    {
+                        if (_ActiveGrid.VirtualMode == true)
+                        {
+                            selRows.RemoveItem(_ActiveGrid.VirtualRowCountEx - 1);
+                        }
+                        else
+                        {
+                            int n = _ActiveGrid.Rows.Count - 1;
+
+                            GridRow row = _ActiveGrid.Rows[n] as GridRow;
+
+                            if (row != null)
+                            {
+                                if (row.IsInsertRow == false)
+                                    throw new Exception();
+
+                                selRows.RemoveItem(row.GridIndex);
+                            }
+                        }
+                    }
+                }
+
+                if (selRows.Count > 0)
+                {
+                    if (DoRowDeletingEvent(_ActiveGrid, selRows) == false)
+                    {
+                        if (selRows.Count > 0)
+                            DeleteRows(_ActiveGrid, selRows);
+                    }
+                }
+            }
+            else
+            {
+                if (DoPlayingSoundEvent(null, null, PlaySoundContext.RowDeleteAttempt) == false)
+                    SystemSounds.Beep.Play();
+            }
+        }
+
+        #region CanDeleteRows
+
+        private bool CanDeleteRows()
+        {
+            if (_ActiveGrid == null)
+                return (false);
+
+            return (_ActiveGrid.CanDeleteRow);
+        }
+
+        #endregion
+
+        #region DeleteRows
+
+        private void DeleteRows(GridPanel panel, SelectedElements selRows)
+        {
+            BeginUpdate();
+
+            for (int i = selRows.Ranges.Count - 1; i >= 0; --i)
+            {
+                SelectedRange range = selRows.Ranges[i];
+
+                if (panel.VirtualMode == true)
+                {
+                    panel.SetDeletedRows(range.StartIndex, range.Count, true);
+                }
+                else
+                {
+                    for (int j = range.EndIndex; j >= range.StartIndex; --j)
+                    {
+                        GridContainer row = panel.GetRowFromIndex(j);
+
+                        if (row != null)
+                            row.IsDeleted = true;
+                    }
+                }
+            }
+
+            EndUpdate();
+
+            DoRowDeletedEvent(panel, selRows);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ProcessShiftDeleteKey
+
+        private void ProcessShiftDeleteKey()
+        {
+            if (_ActiveGrid != null)
+            {
+                if (_ActiveGrid.AllowRowDelete == true)
+                {
+                    BeginUpdate();
+
+                    SelectedElements selRows =
+                        _ActiveGrid.InternalSelectedRows.Copy();
+
+                    if (DoRowRestoringEvent(_ActiveGrid, selRows) == false)
+                    {
+                        if (selRows.Count > 0)
+                            RestoreRows(_ActiveGrid, selRows);
+                    }
+
+                    EndUpdate();
+                }
+            }
+            else
+            {
+                if (DoPlayingSoundEvent(null, null, PlaySoundContext.RowUnDeleteAttempt) == false)
+                    SystemSounds.Beep.Play();
+            }
+        }
+
+        #region RestoreRows
+
+        private void RestoreRows(GridPanel panel, SelectedElements selRows)
+        {
+            for (int i = selRows.Ranges.Count - 1; i >= 0; --i)
+            {
+                SelectedRange range = selRows.Ranges[i];
+
+                if (panel.VirtualMode == true)
+                {
+                    panel.SetDeletedRows(range.StartIndex, range.Count, false);
+                }
+                else
+                {
+                    for (int j = range.EndIndex; j >= range.StartIndex; --j)
+                    {
+                        GridContainer row = panel.GetRowFromIndex(j);
+
+                        if (row != null)
+                            row.IsDeleted = false;
+                    }
+                }
+            }
+
+            DoRowRestoredEvent(panel, selRows);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ProcessInsertKey
+
+        private void ProcessInsertKey()
+        {
+            ProcessInsert(0);
+        }
+
+        #endregion
+
+        #region ProcessShiftInsertKey
+
+        private void ProcessShiftInsertKey()
+        {
+            ProcessInsert(1);
+        }
+
+        #endregion
+
+        #region ProcessInsert
+
+        private void ProcessInsert(int offset)
+        {
+            if (CanInsertRow() == true)
+            {
+                int index = ActiveRow.RowIndex + offset;
+
+                if (index >= 0)
+                    _ActiveGrid.InsertRow(index);
+            }
+            else
+            {
+                SystemSounds.Beep.Play();
+            }
+        }
+
+        #region CanInsertRow
+
+        private bool CanInsertRow()
+        {
+            if (_ActiveGrid == null ||
+                _ActiveRow == null || _ActiveRow.IsDeleted == true)
+            {
+                return (false);
+            }
+
+            return (_ActiveGrid.CanInsertRow);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region ProcessFilterEditKeyDown
+
+        #region ProcessFilterEditKeyDown
+
+        private bool ProcessFilterEditKeyDown(Keys keyData)
+        {
+            bool processed = true;
+
+            switch (keyData)
+            {
+                case Keys.Enter:
+                    ExitFilterEdit(false);
+                    break;
+
+                case Keys.Escape:
+                    ExitFilterEdit(true);
+                    break;
+
+                case Keys.Right:
+                    ProcessFilterKeyRight();
+                    break;
+
+                case Keys.Left:
+                    ProcessFilterKeyLeft();
+                    break;
+
+                case Keys.Tab:
+                    processed = ProcessFilterTabKey();
+                    break;
+
+                case Keys.Tab | Keys.Shift:
+                    processed = ProcessFilterShiftTabKey();
+                    break;
+
+                case Keys.Down | Keys.Control:
+                    ExitFilterEdit(false);
+                    break;
+
+                default:
+                    processed = false;
+                    break;
+            }
+
+            return (processed);
+        }
+
+        #region ProcessFilterKeyLeft
+
+        private void ProcessFilterKeyLeft()
+        {
+            GridColumn column = ActiveFilterPanel.GridColumn.PrevVisibleColumn;
+
+            while (column != null)
+            {
+                if (column.IsFilteringEnabled == true)
+                {
+                    ActivateFilterPanel(column);
+                    break;
+                }
+
+                column = column.PrevVisibleColumn;
+            }
+        }
+
+        #endregion
+
+        #region ProcessFilterKeyRight
+
+        private void ProcessFilterKeyRight()
+        {
+            GridColumn column = ActiveFilterPanel.GridColumn.NextVisibleColumn;
+
+            while (column != null)
+            {
+                if (column.IsFilteringEnabled == true)
+                {
+                    ActivateFilterPanel(column);
+                    break;
+                }
+
+                column = column.NextVisibleColumn;
+            }
+        }
+
+        #endregion
+
+        #region ActivateFilterPanel
+
+        private void ActivateFilterPanel(GridColumn col)
+        {
+            if (col != null)
+            {
+                if (ActiveFilterPanel != null)
+                    ActiveFilterPanel.EndEdit();
+
+                FilterPanel fp = FilterPanel.GetFilterPanel(col);
+
+                if (fp != null)
+                    fp.BeginEdit();
+            }
+        }
+
+        #endregion
+
+        #region ExitFilterEdit
+
+        private void ExitFilterEdit(bool cancel)
+        {
+            GridColumn column = ActiveFilterPanel.GridColumn;
+            GridPanel panel = column.GridPanel;
+
+            if (cancel == true)
+                ActiveFilterPanel.CancelEdit();
+            else
+                ActiveFilterPanel.EndEdit();
+
+            GridRow row = panel.FirstSelectableRow as GridRow;
+
+            if (row != null)
+            {
+                if (_LastProcessedItem is GridContainer)
+                {
+                    row.SetActive();
+                    row.IsSelected = true;
+                }
+                else if (_LastProcessedItem is GridCell)
+                {
+                    GridCell cell = GetNextRowCell(row, column.ColumnIndex);
+
+                    if (cell != null)
+                    {
+                        cell.SetActive();
+                        cell.IsSelected = true;
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ProcessFilterTabKey
+
+        private bool ProcessFilterTabKey()
+        {
+            if (_TabSelection == TabSelection.Control)
+                return (false);
+
+            ProcessFilterKeyRight();
+
+            return (true);
+        }
+
+        #endregion
+
+        #region ProcessFilterShiftTabKey
+
+        private bool ProcessFilterShiftTabKey()
+        {
+            if (_TabSelection == TabSelection.Control)
+                return (false);
+
+            ProcessFilterKeyLeft();
+
+            return (true);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GridWantsKey
+
+        private bool GridWantsKey(Keys keyData)
+        {
+            switch (keyData)
+            {
+                case Keys.Escape:
+
+                case Keys.Up | Keys.Shift:
+                case Keys.Up:
+
+                case Keys.Down:
+                case Keys.Down | Keys.Shift:
+
+                case Keys.Left:
+                case Keys.Left | Keys.Shift:
+
+                case Keys.Right:
+                case Keys.Right | Keys.Shift:
+
+                case Keys.Enter:
+
+                case Keys.Tab:
+                case Keys.Tab | Keys.Shift:
+                    return (true);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region DoEvent support
+
+        #region ActiveGridChangedEvent
+
+        /// <summary>
+        /// Handles invocation of ActiveGridChanged events
+        /// </summary>
+        internal void DoActiveGridChangedEvent(GridPanel oldPanel)
+        {
+            if (ActiveGridChanged != null)
+            {
+                GridActiveGridChangedEventArgs ev = new
+                    GridActiveGridChangedEventArgs(oldPanel, _ActiveGrid);
+
+                ActiveGridChanged(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region CellActivatedEvent
+
+        /// <summary>
+        /// Handles invocation of CellActivated events
+        /// </summary>
+        internal void DoCellActivatedEvent(
+            GridPanel gridPanel, GridCell oldCell, GridCell newCell)
+        {
+            if (CellActivated != null)
+            {
+                GridCellActivatedEventArgs ev = new
+                    GridCellActivatedEventArgs(gridPanel, oldCell, newCell);
+
+                CellActivated(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region CellActivatingEvent
+
+        /// <summary>
+        /// Handles invocation of CellActivating events
+        /// </summary>
+        internal bool DoCellActivatingEvent(
+            GridPanel gridPanel, GridCell oldCell, GridCell newCell)
+        {
+            if (CellActivating != null)
+            {
+                GridCellActivatingEventArgs ev = new
+                    GridCellActivatingEventArgs(gridPanel, oldCell, newCell);
+
+                CellActivating(this, ev);
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region CellClickEvent
+
+        /// <summary>
+        /// Handles invocation of CellClick events
+        /// </summary>
+        internal bool DoCellClickEvent(GridCell gridCell, MouseEventArgs e)
+        {
+            if (CellClick != null)
+            {
+                GridCellClickEventArgs ev = new
+                    GridCellClickEventArgs(gridCell.GridPanel, gridCell, e);
+
+                CellClick(this, ev);
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region CellDoubleClickEvent
+
+        /// <summary>
+        /// Handles invocation of CellDoubleClick events
+        /// </summary>
+        internal bool DoCellDoubleClickEvent(GridCell gridCell, MouseEventArgs e)
+        {
+            if (CellDoubleClick != null)
+            {
+                GridCellDoubleClickEventArgs ev = new
+                    GridCellDoubleClickEventArgs(gridCell.GridPanel, gridCell, e);
+
+                CellDoubleClick(this, ev);
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region CellInfoClickEvent
+
+        /// <summary>
+        /// Handles invocation of CellInfoClick events
+        /// </summary>
+        internal void DoCellInfoClickEvent(GridCell gridCell, MouseEventArgs e)
+        {
+            if (CellInfoClick != null)
+            {
+                GridCellClickEventArgs ev = new
+                    GridCellClickEventArgs(gridCell.GridPanel, gridCell, e);
+
+                CellInfoClick(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region CellInfoDoubleClickEvent
+
+        /// <summary>
+        /// Handles invocation of CellInfoDoubleClick events
+        /// </summary>
+        internal void DoCellInfoDoubleClickEvent(GridCell gridCell, MouseEventArgs e)
+        {
+            if (CellInfoDoubleClick != null)
+            {
+                GridCellDoubleClickEventArgs ev = new
+                    GridCellDoubleClickEventArgs(gridCell.GridPanel, gridCell, e);
+
+                CellInfoDoubleClick(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region CellInfoEnterEvent
+
+        /// <summary>
+        /// Handles invocation of CellInfoEnter events
+        /// </summary>
+        internal bool DoCellInfoEnterEvent(GridCell gridCell,
+            Control control, System.Windows.Forms.ToolTip toolTip, Point pt)
+        {
+            if (CellInfoEnter != null)
+            {
+                GridCellInfoEnterEventArgs ev = new
+                    GridCellInfoEnterEventArgs(gridCell.GridPanel, gridCell, control, toolTip, pt);
+
+                CellInfoEnter(this, ev);
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region CellInfoLeaveEvent
+
+        /// <summary>
+        /// Handles invocation of CellInfoLeave events
+        /// </summary>
+        internal void DoCellInfoLeaveEvent(
+            GridCell gridCell, Control control, System.Windows.Forms.ToolTip toolTip)
+        {
+            if (CellInfoLeave != null)
+            {
+                GridCellInfoLeaveEventArgs ev = new
+                    GridCellInfoLeaveEventArgs(gridCell.GridPanel, gridCell, control, toolTip);
+
+                CellInfoLeave(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region CellMouseDownEvent
+
+        /// <summary>
+        /// Handles invocation of CellMouseDown events
+        /// </summary>
+        internal void DoCellMouseDownEvent(GridCell gridCell, MouseEventArgs args)
+        {
+            if (CellMouseDown != null)
+            {
+                GridCellMouseEventArgs ev = new
+                    GridCellMouseEventArgs(gridCell.GridPanel, gridCell, args);
+
+                CellMouseDown(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region CellMouseEnterEvent
+
+        /// <summary>
+        /// Handles invocation of CellMouseEnter events
+        /// </summary>
+        internal void DoCellMouseEnterEvent(GridCell gridCell)
+        {
+            if (CellMouseEnter != null)
+            {
+                GridCellEventArgs ev = new
+                    GridCellEventArgs(gridCell.GridPanel, gridCell);
+
+                CellMouseEnter(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region CellMouseLeaveEvent
+
+        /// <summary>
+        /// Handles invocation of CellMouseLeave events
+        /// </summary>
+        internal void DoCellMouseLeaveEvent(GridCell gridCell)
+        {
+            if (CellMouseLeave != null)
+            {
+                GridCellEventArgs ev = new
+                    GridCellEventArgs(gridCell.GridPanel, gridCell);
+
+                CellMouseLeave(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region CellMouseMoveEvent
+
+        /// <summary>
+        /// Handles invocation of CellMouseMove events
+        /// </summary>
+        internal void DoCellMouseMoveEvent(GridCell gridCell, MouseEventArgs args)
+        {
+            if (CellMouseMove != null)
+            {
+                GridCellMouseEventArgs ev = new 
+                    GridCellMouseEventArgs(gridCell.GridPanel, gridCell, args);
+
+                CellMouseMove(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region CellMouseUpEvent
+
+        /// <summary>
+        /// Handles invocation of CellMouseUp events
+        /// </summary>
+        internal void DoCellMouseUpEvent(GridCell gridCell, MouseEventArgs args)
+        {
+            if (CellMouseUp != null)
+            {
+                GridCellMouseEventArgs ev = new
+                    GridCellMouseEventArgs(gridCell.GridPanel, gridCell, args);
+
+                CellMouseUp(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region CellUserFunctionEvent
+
+        /// <summary>
+        /// Handles invocation of CellUserFunction events
+        /// </summary>
+        internal void DoCellUserFunctionEvent(
+            GridCell gridCell, object[] args, ref object result)
+        {
+            if (CellUserFunction != null)
+            {
+                GridCellUserFunctionEventArgs ev = new
+                    GridCellUserFunctionEventArgs(gridCell.GridPanel, gridCell, args, result);
+
+                CellUserFunction(this, ev);
+
+                result = ev.Result;
+            }
+        }
+
+        #endregion
+
+        #region CellValidatingEvent
+
+        /// <summary>
+        /// Handles invocation of CellValidating events
+        /// </summary>
+        internal bool DoCellValidatingEvent(
+            GridCell gridCell, ref object value, object formattedValue)
+        {
+            if (CellValidating != null)
+            {
+                GridCellValidatingEventArgs ev = new GridCellValidatingEventArgs(
+                    gridCell.GridPanel, gridCell, value, formattedValue);
+
+                CellValidating(this, ev);
+
+                value = ev.Value;
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region CellValidatedEvent
+
+        /// <summary>
+        /// Handles invocation of CellValidated events
+        /// </summary>
+        internal void DoCellValidatedEvent(GridCell gridCell)
+        {
+            if (CellValidated != null)
+            {
+                GridCellValidatedEventArgs ev = new
+                    GridCellValidatedEventArgs(gridCell.GridPanel, gridCell);
+
+                CellValidated(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region CellValueChangedEvent
+
+        /// <summary>
+        /// Handles invocation of CellValueChanged events
+        /// </summary>
+        internal void DoCellValueChangedEvent(
+            GridCell gridCell, object oldValue, object newValue, DataContext context)
+        {
+            if (CellValueChanged != null)
+            {
+                GridCellValueChangedEventArgs ev = new
+                    GridCellValueChangedEventArgs(gridCell.GridPanel, gridCell, oldValue, newValue, context);
+
+                CellValueChanged(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region Check events
+
+        #region AfterCheckEvent
+
+        /// <summary>
+        /// Handles invocation of AfterCheckEvent events
+        /// </summary>
+        internal void DoAfterCheckEvent(GridPanel gridPanel, GridElement item)
+        {
+            if (AfterCheck != null)
+            {
+                GridAfterCheckEventArgs ev = new
+                    GridAfterCheckEventArgs(gridPanel, item);
+
+                AfterCheck(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region BeforeCheckEvent
+
+        /// <summary>
+        /// Handles invocation of BeforeCheck events
+        /// </summary>
+        internal bool DoBeforeCheckEvent(GridPanel gridPanel, GridElement gridRow)
+        {
+            if (BeforeCheck != null)
+            {
+                GridBeforeCheckEventArgs ev = new
+                    GridBeforeCheckEventArgs(gridPanel, gridRow);
+
+                BeforeCheck(this, ev);
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Collapse events
+
+        #region AfterCollapseEvent
+
+        /// <summary>
+        /// Handles invocation of AfterCollapse events
+        /// </summary>
+        internal void DoAfterCollapseEvent(GridPanel gridPanel, GridContainer gridContainer, ExpandSource expandSource)
+        {
+            if (AfterCollapse != null)
+            {
+                GridAfterCollapseEventArgs ev = new
+                    GridAfterCollapseEventArgs(gridPanel, gridContainer, expandSource);
+
+                AfterCollapse(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region BeforeCollapseEvent
+
+        /// <summary>
+        /// Handles invocation of BeforeCollapse events
+        /// </summary>
+        internal bool DoBeforeCollapseEvent(GridPanel gridPanel, GridContainer gridContainer, ExpandSource expandSource)
+        {
+            if (BeforeCollapse != null)
+            {
+                GridBeforeCollapseEventArgs ev = new
+                    GridBeforeCollapseEventArgs(gridPanel, gridContainer, expandSource);
+
+                BeforeCollapse(this, ev);
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Column events
+
+        #region ColumnGroupedEvent
+
+        /// <summary>
+        /// Handles invocation of ColumnGrouped events
+        /// </summary>
+        internal void DoColumnGroupedEvent(
+            GridPanel gridPanel, GridColumn gridColumn, GridGroup gridGroup)
+        {
+            if (ColumnGrouped != null)
+            {
+                GridColumnGroupedEventArgs ev = new
+                    GridColumnGroupedEventArgs(gridPanel, gridColumn, gridGroup);
+
+                ColumnGrouped(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region ColumnHeaderClickEvent
+
+        /// <summary>
+        /// Handles invocation of ColumnHeaderClick events
+        /// </summary>
+        internal bool DoColumnHeaderClickEvent(
+            GridPanel gridPanel, GridColumn gridColumn, MouseEventArgs e)
+        {
+            if (ColumnHeaderClick != null)
+            {
+                GridColumnHeaderClickEventArgs ev = new
+                    GridColumnHeaderClickEventArgs(gridPanel, gridColumn, e);
+
+                ColumnHeaderClick(this, ev);
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region ColumnHeaderDoubleClickEvent
+
+        /// <summary>
+        /// Handles invocation of ColumnHeaderDoubleClick events
+        /// </summary>
+        internal bool DoColumnHeaderDoubleClickEvent(GridColumn gridColumn, MouseEventArgs e)
+        {
+            if (ColumnHeaderDoubleClick != null)
+            {
+                GridColumnHeaderDoubleClickEventArgs ev = new
+                    GridColumnHeaderDoubleClickEventArgs(gridColumn.GridPanel, gridColumn, e);
+
+                ColumnHeaderDoubleClick(this, ev);
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region ColumnHeaderMarkupLinkClick Event
+
+        /// <summary>
+        /// Handles invocation of ColumnHeaderMarkupLinkClick events
+        /// </summary>
+        internal void DoColumnHeaderMarkupLinkClickEvent(
+            GridColumn gridColumn, HyperLink hyperLink)
+        {
+            if (ColumnHeaderMarkupLinkClick != null)
+            {
+                GridColumnHeaderMarkupLinkClickEventArgs ev = new GridColumnHeaderMarkupLinkClickEventArgs(
+                    gridColumn.GridPanel, gridColumn, hyperLink.Name, hyperLink.HRef);
+
+                ColumnHeaderMarkupLinkClick(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region ColumnHeaderMouseDownEvent
+
+        /// <summary>
+        /// Handles invocation of ColumnHeaderMouseDown events
+        /// </summary>
+        internal void DoColumnHeaderMouseDownEvent(GridColumnHeader gridColumnHeader, MouseEventArgs args)
+        {
+            if (ColumnHeaderMouseDown != null)
+            {
+                GridColumnHeaderMouseEventArgs ev = new
+                    GridColumnHeaderMouseEventArgs(gridColumnHeader, args);
+
+                ColumnHeaderMouseDown(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region ColumnHeaderMouseEnterEvent
+
+        /// <summary>
+        /// Handles invocation of ColumnHeaderMouseEnter events
+        /// </summary>
+        internal void DoColumnHeaderMouseEnterEvent(GridColumnHeader gridColumnHeader)
+        {
+            if (ColumnHeaderMouseEnter != null)
+            {
+                GridColumnHeaderEventArgs ev = new
+                    GridColumnHeaderEventArgs(gridColumnHeader);
+
+                ColumnHeaderMouseEnter(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region ColumnHeaderMouseLeaveEvent
+
+        /// <summary>
+        /// Handles invocation of ColumnHeaderMouseLeave events
+        /// </summary>
+        internal void DoColumnHeaderMouseLeaveEvent(GridColumnHeader gridColumnHeader)
+        {
+            if (ColumnHeaderMouseLeave != null)
+            {
+                GridColumnHeaderEventArgs ev = new
+                    GridColumnHeaderEventArgs(gridColumnHeader);
+
+                ColumnHeaderMouseLeave(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region ColumnHeaderMouseMoveEvent
+
+        /// <summary>
+        /// Handles invocation of ColumnHeaderMouseMove events
+        /// </summary>
+        internal void DoColumnHeaderMouseMoveEvent(GridColumnHeader gridColumnHeader, MouseEventArgs args)
+        {
+            if (ColumnHeaderMouseMove != null)
+            {
+                GridColumnHeaderMouseEventArgs ev = new
+                    GridColumnHeaderMouseEventArgs(gridColumnHeader, args);
+
+                ColumnHeaderMouseMove(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region ColumnHeaderMouseUpEvent
+
+        /// <summary>
+        /// Handles invocation of CellMouseUp events
+        /// </summary>
+        internal void DoColumnHeaderMouseUpEvent(GridColumnHeader gridColumnHeader, MouseEventArgs args)
+        {
+            if (ColumnHeaderMouseUp != null)
+            {
+                GridColumnHeaderMouseEventArgs ev = new
+                    GridColumnHeaderMouseEventArgs(gridColumnHeader, args);
+
+                ColumnHeaderMouseUp(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region ColumnGroupHeaderClickEvent
+
+        /// <summary>
+        /// Handles invocation of ColumnGroupHeaderClick events
+        /// </summary>
+        internal bool DoColumnGroupHeaderClickEvent(GridPanel gridPanel,
+            GridColumnHeader header, ColumnGroupHeader groupHeader, MouseEventArgs e)
+        {
+            if (ColumnGroupHeaderClick != null)
+            {
+                GridColumnGroupHeaderClickEventArgs ev = new
+                    GridColumnGroupHeaderClickEventArgs(gridPanel, header, groupHeader, e);
+
+                ColumnGroupHeaderClick(this, ev);
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region ColumnGroupHeaderDoubleClickEvent
+
+        /// <summary>
+        /// Handles invocation of ColumnGroupHeaderDoubleClick events
+        /// </summary>
+        internal bool DoColumnGroupHeaderDoubleClickEvent(GridPanel gridPanel,
+            GridColumnHeader header, ColumnGroupHeader groupHeader, MouseEventArgs e)
+        {
+            if (ColumnGroupHeaderDoubleClick != null)
+            {
+                GridColumnGroupHeaderDoubleClickEventArgs ev = new
+                    GridColumnGroupHeaderDoubleClickEventArgs(gridPanel, header, groupHeader, e);
+
+                ColumnGroupHeaderDoubleClick(this, ev);
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region ColumnGroupHeaderMarkupLinkClick Event
+
+        /// <summary>
+        /// Handles invocation of ColumnGroupHeaderMarkupLinkClick events
+        /// </summary>
+        internal void DoColumnGroupHeaderMarkupLinkClickEvent(GridPanel gridPanel,
+            GridColumnHeader header, ColumnGroupHeader groupHeader, HyperLink hyperLink)
+        {
+            if (ColumnGroupHeaderMarkupLinkClick != null)
+            {
+                GridColumnGroupHeaderMarkupLinkClickEventArgs ev = new GridColumnGroupHeaderMarkupLinkClickEventArgs(
+                    gridPanel, header, groupHeader, hyperLink.Name, hyperLink.HRef);
+
+                ColumnGroupHeaderMarkupLinkClick(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region ColumnGroupHeaderResizedEvent
+
+        /// <summary>
+        /// Handles invocation of ColumnGroupHeaderResized events
+        /// </summary>
+        internal void DoColumnGroupHeaderResizedEvent(
+            GridPanel gridPanel, ColumnGroupHeader groupHeader, Size oldSize)
+        {
+            if (ColumnGroupHeaderResized != null)
+            {
+                GridColumnGroupHeaderResizedEventArgs ev = new
+                    GridColumnGroupHeaderResizedEventArgs(gridPanel, groupHeader, oldSize);
+
+                ColumnGroupHeaderResized(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region ColumnRowHeaderClickEvent
+
+        /// <summary>
+        /// Handles invocation of ColumnRowHeaderClick events
+        /// </summary>
+        internal void DoColumnRowHeaderClickEvent(GridPanel gridPanel)
+        {
+            if (ColumnRowHeaderClick != null)
+            {
+                GridEventArgs ev = new GridEventArgs(gridPanel);
+
+                ColumnRowHeaderClick(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region ColumnRowHeaderDoubleClickEvent
+
+        /// <summary>
+        /// Handles invocation of ColumnRowHeaderDoubleClick events
+        /// </summary>
+        internal void DoColumnRowHeaderDoubleClickEvent(GridPanel gridPanel)
+        {
+            if (ColumnRowHeaderDoubleClick != null)
+            {
+                GridEventArgs ev = new GridEventArgs(gridPanel);
+
+                ColumnRowHeaderDoubleClick(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region ColumnMovedEvent
+
+        /// <summary>
+        /// Handles invocation of ColumnMoved events
+        /// </summary>
+        internal void DoColumnMovedEvent(GridPanel gridPanel, GridColumn gridColumn)
+        {
+            if (ColumnMoved != null)
+            {
+                GridColumnEventArgs ev = new
+                    GridColumnEventArgs(gridPanel, gridColumn);
+
+                ColumnMoved(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region ColumnResizedEvent
+
+        /// <summary>
+        /// Handles invocation of ColumnResized events
+        /// </summary>
+        internal void DoColumnResizedEvent(GridPanel gridPanel, GridColumn gridColumn)
+        {
+            if (ColumnResized != null)
+            {
+                GridColumnEventArgs ev = new
+                    GridColumnEventArgs(gridPanel, gridColumn);
+
+                ColumnResized(this, ev);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region CompareElementsEvent
+
+        /// <summary>
+        /// Handles invocation of CompareElementsEvent events
+        /// </summary>
+        internal bool DoCompareElementsEvent(GridPanel panel,
+            GridElement a, GridElement b, ref int result)
+        {
+            if (CompareElements != null)
+            {
+                GridCompareElementsEventArgs ev = new
+                    GridCompareElementsEventArgs(panel, a, b);
+
+                CompareElements(this, ev);
+
+                result = ev.Result;
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region DataBindingStartEvent
+
+        /// <summary>
+        /// Handles invocation of DataBindingStart events
+        /// </summary>
+        internal bool DoDataBindingStartEvent(GridPanel gridPanel,
+            GridRow row, string tableName, ref bool autogen, ref ProcessChildRelations crProcess)
+        {
+            if (DataBindingStart != null)
+            {
+                GridDataBindingStartEventArgs ev = new
+                    GridDataBindingStartEventArgs(gridPanel, row, tableName, autogen, crProcess);
+
+                DataBindingStart(this, ev);
+
+                autogen = ev.AutoGenerateColumns;
+                crProcess = ev.ProcessChildRelations;
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region DataBindingCompleteEvent
+
+        /// <summary>
+        /// Handles invocation of DataBindingComplete events
+        /// </summary>
+        internal void DoDataBindingCompleteEvent(GridPanel gridPanel)
+        {
+            if (DataBindingComplete != null)
+            {
+                GridDataBindingCompleteEventArgs ev = new
+                    GridDataBindingCompleteEventArgs(gridPanel);
+
+                DataBindingComplete(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region DataErrorEvent
+
+        /// <summary>
+        /// Handles invocation of DataError events
+        /// </summary>
+        internal bool DoDataErrorEvent(GridPanel gridPanel, GridCell gridCell, Exception exception,
+            DataContext errorContext, ref object value, ref bool throwException, ref bool retry)
+        {
+            if (DataError != null)
+            {
+                GridDataErrorEventArgs ev = new
+                    GridDataErrorEventArgs(gridPanel, gridCell, exception, errorContext, value);
+
+                DataError(this, ev);
+
+                value = ev.Value;
+                throwException = ev.ThrowException;
+                retry = ev.Retry;
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region DataFilteringStartEvent
+
+        /// <summary>
+        /// Handles invocation of DataFilteringStart events
+        /// </summary>
+        internal bool DoDataFilteringStartEvent(GridPanel gridPanel)
+        {
+            if (DataFilteringStart != null)
+            {
+                GridDataFilteringStartEventArgs ev = new
+                    GridDataFilteringStartEventArgs(gridPanel);
+
+                DataFilteringStart(this, ev);
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region DataFilteringCompleteEvent
+
+        /// <summary>
+        /// Handles invocation of DataFilteringCompleteEvent events
+        /// </summary>
+        internal void DoDataFilteringCompleteEvent(GridPanel gridPanel)
+        {
+            if (DataFilteringComplete != null)
+            {
+                GridDataFilteringCompleteEventArgs ev = new
+                    GridDataFilteringCompleteEventArgs(gridPanel);
+
+                DataFilteringComplete(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region ItemDragEvent
+
+        /// <summary>
+        /// Handles ItemDrag events
+        /// </summary>
+        internal bool DoItemDragEvent(GridElement element, MouseEventArgs e)
+        {
+            if (ItemDrag != null)
+            {
+                GridItemDragEventArgs ev = new
+                    GridItemDragEventArgs(element.GridPanel, element, e);
+
+                ItemDrag(this, ev);
+
+                return (ev.Cancel);
+            }
+
+            return (true);
+        }
+
+        #endregion
+
+        #region Editor events
+
+        #region BeginEditEvent
+
+        /// <summary>
+        /// Handles invocation of BeginEdit events
+        /// </summary>
+        internal bool DoBeginEditEvent(
+            GridPanel gridPanel, GridCell cell, IGridCellEditControl editor)
+        {
+            if (BeginEdit != null)
+            {
+                GridEditEventArgs ev = new
+                    GridEditEventArgs(gridPanel, cell, editor);
+
+                BeginEdit(this, ev);
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region CancelEditEvent
+
+        /// <summary>
+        /// Handles invocation of CancelEdit events
+        /// </summary>
+        internal bool DoCancelEditEvent(
+            GridPanel gridPanel, GridCell cell, IGridCellEditControl editor)
+        {
+            if (CancelEdit != null)
+            {
+                GridEditEventArgs ev = new
+                    GridEditEventArgs(gridPanel, cell, editor);
+
+                CancelEdit(this, ev);
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region CloseEdit
+
+        /// <summary>
+        /// Handles invocation of CloseEdit events
+        /// </summary>
+        internal void DoCloseEditEvent(GridPanel gridPanel, GridCell cell)
+        {
+            if (CloseEdit != null)
+            {
+                GridCloseEditEventArgs ev = new
+                    GridCloseEditEventArgs(gridPanel, cell);
+
+                CloseEdit(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region EditorValueChangedEvent
+
+        /// <summary>
+        /// Handles invocation of EditorValueChanged events
+        /// </summary>
+        internal void DoEditorValueChangedEvent(
+            GridCell gridCell, IGridCellEditControl editor)
+        {
+            if (EditorValueChanged != null)
+            {
+                GridEditEventArgs ev = new
+                    GridEditEventArgs(gridCell.GridPanel, gridCell, editor);
+
+                EditorValueChanged(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region EndEditEvent
+
+        /// <summary>
+        /// Handles invocation of EndEdit events
+        /// </summary>
+        internal bool DoEndEditEvent(
+            GridPanel gridPanel, GridCell cell, IGridCellEditControl editor)
+        {
+            if (EndEdit != null)
+            {
+                GridEditEventArgs ev = new
+                    GridEditEventArgs(gridPanel, cell, editor);
+
+                EndEdit(this, ev);
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region GetEditorEvent
+
+        /// <summary>
+        /// Handles invocation of GetEditor events
+        /// </summary>
+        internal void DoGetEditorEvent(
+            GridPanel gridPanel, GridCell cell, ref Type type, ref object[] editorParams)
+        {
+            if (GetEditor != null)
+            {
+                GridGetEditorEventArgs ev = new
+                    GridGetEditorEventArgs(gridPanel, cell, type, editorParams);
+
+                GetEditor(this, ev);
+
+                if (ev.EditorType != null)
+                    type = ev.EditorType;
+
+                editorParams = ev.EditorParams;
+            }
+        }
+
+        #endregion
+
+        #region GetRendererEvent
+
+        /// <summary>
+        /// Handles invocation of GetRenderer events
+        /// </summary>
+        internal void DoGetRendererEvent(
+            GridPanel gridPanel, GridCell cell, ref Type type, ref object[] renderParams)
+        {
+            if (GetRenderer != null)
+            {
+                GridGetRendererEventArgs ev = new
+                    GridGetRendererEventArgs(gridPanel, cell, type, renderParams);
+
+                GetRenderer(this, ev);
+
+                type = ev.RenderType;
+                renderParams = ev.RenderParams;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Expand events
+
+        #region AfterExpandEvent
+
+        /// <summary>
+        /// Handles invocation of AfterExpand events
+        /// </summary>
+        internal void DoAfterExpandEvent(
+            GridPanel gridPanel, GridContainer container, ExpandSource expandSource)
+        {
+            if (AfterExpand != null)
+            {
+                GridAfterExpandEventArgs ev = new
+                    GridAfterExpandEventArgs(gridPanel, container, expandSource);
+
+                AfterExpand(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region BeforeExpandEvent
+
+        /// <summary>
+        /// Handles invocation of BeforeExpand events
+        /// </summary>
+        internal bool DoBeforeExpandEvent(
+            GridPanel gridPanel, GridContainer container, ExpandSource expandSource)
+        {
+            if (BeforeExpand != null)
+            {
+                GridBeforeExpandEventArgs ev = new
+                    GridBeforeExpandEventArgs(gridPanel, container, expandSource);
+
+                BeforeExpand(this, ev);
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Filter events
+
+        #region FilterBeginEditEvent
+
+        /// <summary>
+        /// Handles invocation of FilterBeginEdit events
+        /// </summary>
+        internal bool DoFilterBeginEditEvent(
+            GridPanel panel, GridColumn column, FilterPanel filterPanel)
+        {
+            if (FilterBeginEdit != null)
+            {
+                GridFilterBeginEditEventArgs ev = new
+                    GridFilterBeginEditEventArgs(panel, column, filterPanel);
+
+                FilterBeginEdit(this, ev);
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region FilterCancelEditEvent
+
+        /// <summary>
+        /// Handles invocation of FilterCancelEdit events
+        /// </summary>
+        internal void DoFilterCancelEditEvent(GridColumn column, FilterPanel filterPanel)
+        {
+            if (FilterCancelEdit != null)
+            {
+                GridFilterCancelEditEventArgs ev = new
+                    GridFilterCancelEditEventArgs(column.GridPanel, column, filterPanel);
+
+                FilterCancelEdit(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region FilterColumnErrorEvent
+
+        /// <summary>
+        /// Handles invocation of FilterColumnError events
+        /// </summary>
+        internal bool DoFilterColumnErrorEvent(GridPanel panel, GridRow row,
+            GridColumn col, Exception exp, ref bool filteredOut, ref bool throwException, ref bool postError)
+        {
+            if (FilterColumnError != null)
+            {
+                GridFilterColumnErrorEventArgs ev = new GridFilterColumnErrorEventArgs(
+                    panel, row, col, exp, filteredOut, throwException, postError);
+
+                FilterColumnError(this, ev);
+
+                filteredOut = ev.FilteredOut;
+                throwException = ev.ThrowException;
+                postError = ev.PostError;
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region FilterEditValueChangedEvent
+
+        /// <summary>
+        /// Handles invocation of FilterEditValueChanged events
+        /// </summary>
+        internal bool DoFilterEditValueChangedEvent(GridPanel panel, GridColumn column, FilterPanel fp,
+            object oldValue, ref object newValue, ref object newDisplayValue, ref string newExpr)
+        {
+            if (FilterEditValueChanged != null)
+            {
+                GridFilterEditValueChangedEventArgs ev = new
+                    GridFilterEditValueChangedEventArgs(panel,
+                    column, fp, oldValue, newValue, newDisplayValue, newExpr);
+
+                FilterEditValueChanged(this, ev);
+
+                newValue = ev.NewValue;
+                newDisplayValue = ev.NewDisplayValue;
+                newExpr = ev.NewExpr;
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region FilterEndEditEvent
+
+        /// <summary>
+        /// Handles invocation of FilterEndEdit events
+        /// </summary>
+        internal void DoFilterEndEditEvent(GridColumn column, FilterPanel filterPanel)
+        {
+            if (FilterEndEdit != null)
+            {
+                GridFilterEndEditEventArgs ev = new
+                    GridFilterEndEditEventArgs(column.GridPanel, column, filterPanel);
+
+                FilterEndEdit(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region FilterHeaderClickEvent
+
+        /// <summary>
+        /// Handles invocation of FilterHeaderClick events
+        /// </summary>
+        internal bool DoFilterHeaderClickEvent(
+            GridPanel gridPanel, GridColumn gridColumn, MouseEventArgs e)
+        {
+            if (FilterHeaderClick != null)
+            {
+                GridFilterHeaderClickEventArgs ev = new
+                    GridFilterHeaderClickEventArgs(gridPanel, gridColumn, e);
+
+                FilterHeaderClick(this, ev);
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region FilterHelpClosingEvent
+
+        /// <summary>
+        /// Handles invocation of FilterHelpClosing events
+        /// </summary>
+        internal void DoFilterHelpClosingEvent(GridPanel panel, GridColumn column, SampleExpr sampleExpr)
+        {
+            if (FilterHelpClosing != null)
+            {
+                GridFilterHelpClosingEventArgs ev = new
+                    GridFilterHelpClosingEventArgs(panel, column, sampleExpr);
+
+                FilterHelpClosing(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region FilterHelpOpeningEvent
+
+        /// <summary>
+        /// Handles invocation of FilterHelpOpening events
+        /// </summary>
+        internal bool DoFilterHelpOpeningEvent(GridPanel panel, GridColumn column, SampleExpr sampleExpr)
+        {
+            if (FilterHelpOpening != null)
+            {
+                GridFilterHelpOpeningEventArgs ev = new
+                    GridFilterHelpOpeningEventArgs(panel, column, sampleExpr);
+
+                FilterHelpOpening(this, ev);
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region FilterItemsLoadedEvent
+
+        /// <summary>
+        /// Handles invocation of FilterItemsLoaded events
+        /// </summary>
+        internal void DoFilterItemsLoadedEvent(GridColumn column, ComboBoxEx comboBox)
+        {
+            if (FilterItemsLoaded != null)
+            {
+                GridFilterItemsLoadedEventArgs ev = new
+                    GridFilterItemsLoadedEventArgs(column.GridPanel, column, comboBox);
+
+                FilterItemsLoaded(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region FilterLoadItemsEvent
+
+        /// <summary>
+        /// Handles invocation of FilterLoadItems events
+        /// </summary>
+        internal bool DoFilterLoadItemsEvent(GridColumn column, ComboBoxEx comboBox)
+        {
+            if (FilterLoadItems != null)
+            {
+                GridFilterLoadItemsEventArgs ev = new
+                    GridFilterLoadItemsEventArgs(column.GridPanel, column, comboBox);
+
+                FilterLoadItems(this, ev);
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region FilterLoadUserDataEvent
+
+        /// <summary>
+        /// Handles invocation of FilterLoadUserData events
+        /// </summary>
+        internal bool DoFilterLoadUserDataEvent(
+            GridPanel gridPanel, ref string filterPath, ref List<UserFilterData> filterData)
+        {
+            if (FilterLoadUserData != null)
+            {
+                GridFilterLoadUserDataEventArgs ev = new
+                    GridFilterLoadUserDataEventArgs(gridPanel, filterPath, filterData);
+
+                FilterLoadUserData(this, ev);
+
+                filterPath = ev.FilterPath;
+                filterData = ev.FilterData;
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region FilterPopupClosingEvent
+
+        /// <summary>
+        /// Handles invocation of FilterPopupClosing events
+        /// </summary>
+        internal void DoFilterPopupClosingEvent(GridColumn column, FilterPopup filterPopup)
+        {
+            if (FilterPopupClosing != null)
+            {
+                GridFilterPopupClosingEventArgs ev = new
+                    GridFilterPopupClosingEventArgs(column.GridPanel, column, filterPopup);
+
+                FilterPopupClosing(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region FilterPopupLoadEvent
+
+        /// <summary>
+        /// Handles invocation of FilterPopupLoad events
+        /// </summary>
+        internal bool DoFilterPopupLoadEvent(GridColumn column, FilterPopup filterPopup)
+        {
+            if (FilterPopupLoad != null)
+            {
+                GridFilterPopupLoadEventArgs ev = new
+                    GridFilterPopupLoadEventArgs(column.GridPanel, column, filterPopup);
+
+                FilterPopupLoad(this, ev);
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region FilterPopupLoadedEvent
+
+        /// <summary>
+        /// Handles invocation of FilterPopupLoaded events
+        /// </summary>
+        internal void DoFilterPopupLoadedEvent(GridColumn column, FilterPopup filterPopup)
+        {
+            if (FilterPopupLoaded != null)
+            {
+                GridFilterPopupLoadedEventArgs ev = new
+                    GridFilterPopupLoadedEventArgs(column.GridPanel, column, filterPopup);
+
+                FilterPopupLoaded(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region FilterPopupOpeningEvent
+
+        /// <summary>
+        /// Handles invocation of FilterPopupOpening events
+        /// </summary>
+        internal bool DoFilterPopupOpeningEvent(GridColumn column, FilterPopup filterPopup)
+        {
+            if (FilterPopupOpening != null)
+            {
+                GridFilterPopupOpeningEventArgs ev = new
+                    GridFilterPopupOpeningEventArgs(column.GridPanel, column, filterPopup);
+
+                FilterPopupOpening(this, ev);
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region FilterPopupValueChangedEvent
+
+        /// <summary>
+        /// Handles invocation of FilterPopupValueChanged events
+        /// </summary>
+        internal bool DoFilterPopupValueChangedEvent(GridColumn column, FilterItemType filterItemType,
+            ref object filterValue, ref object filterDisplayValue, ref string filterExpr)
+        {
+            if (FilterPopupValueChanged != null)
+            {
+                GridFilterPopupValueChangedEventArgs ev = 
+                    new GridFilterPopupValueChangedEventArgs(column.GridPanel,
+                    column, filterItemType, filterValue, filterDisplayValue, filterExpr);
+
+                FilterPopupValueChanged(this, ev);
+
+                filterValue = ev.FilterValue;
+                filterDisplayValue = ev.FilterDisplayValue;
+                filterExpr = ev.FilterExpr;
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region FilterRowErrorEvent
+
+        /// <summary>
+        /// Handles invocation of FilterRowError events
+        /// </summary>
+        internal bool DoFilterRowErrorEvent(GridPanel panel, GridRow row,
+            Exception exp, ref bool filteredOut, ref bool throwException, ref bool postError)
+        {
+            if (FilterRowError != null)
+            {
+                GridFilterRowErrorEventArgs ev = new GridFilterRowErrorEventArgs(
+                    panel, row, exp, filteredOut, throwException, postError);
+
+                FilterRowError(this, ev);
+
+                filteredOut = ev.FilteredOut;
+                throwException = ev.ThrowException;
+                postError = ev.PostError;
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region FilterRowHeaderClickEvent
+
+        /// <summary>
+        /// Handles invocation of FilterRowHeaderClick events
+        /// </summary>
+        internal bool DoFilterRowHeaderClickEvent(GridPanel gridPanel)
+        {
+            if (FilterRowHeaderClick != null)
+            {
+                GridCancelEventArgs ev = new GridCancelEventArgs(gridPanel);
+
+                FilterRowHeaderClick(this, ev);
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region FilterStoreUserDataEvent
+
+        /// <summary>
+        /// Handles invocation of FilterStoreUserData events
+        /// </summary>
+        internal bool DoFilterStoreUserDataEvent(
+            GridPanel gridPanel, ref string filterPath, ref List<UserFilterData> filterData)
+        {
+            if (FilterStoreUserData != null)
+            {
+                GridFilterStoreUserDataEventArgs ev = new
+                    GridFilterStoreUserDataEventArgs(gridPanel, filterPath, filterData);
+
+                FilterStoreUserData(this, ev);
+
+                filterPath = ev.FilterPath;
+                filterData = ev.FilterData;
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region FilterUserFunctionEvent
+
+        /// <summary>
+        /// Handles invocation of FilterUserFunction events
+        /// </summary>
+        internal bool DoFilterUserFunctionEvent(
+            GridRow gridRow, object[] args, ref object result)
+        {
+            if (FilterUserFunction != null)
+            {
+                GridFilterUserFunctionEventArgs ev = new
+                    GridFilterUserFunctionEventArgs(gridRow.GridPanel, gridRow, args, result);
+
+                FilterUserFunction(this, ev);
+
+                if (ev.Handled == true)
+                {
+                    result = ev.Result;
+
+                    return (true);
+                }
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region GetFilterColumnHeaderStyleEvent
+
+        /// <summary>
+        /// Handles invocation of GetFilterColumnHeaderStyle events
+        /// </summary>
+        internal void DoGetFilterColumnHeaderStyleEvent(
+            GridColumn gridColumn, StyleType eStyle, ref FilterColumnHeaderVisualStyle style)
+        {
+            if (GetFilterColumnHeaderStyle != null)
+            {
+                GridGetFilterColumnHeaderStyleEventArgs ev = new
+                    GridGetFilterColumnHeaderStyleEventArgs(gridColumn.GridPanel, gridColumn, eStyle, style);
+
+                GetFilterColumnHeaderStyle(this, ev);
+
+                style = ev.Style;
+            }
+        }
+
+        #endregion
+
+        #region GetFilterEditTypeEvent
+
+        /// <summary>
+        /// Handles invocation of GetFilterEditType events
+        /// </summary>
+        internal void DoGetFilterEditTypeEvent(
+            GridColumn gridColumn, ref FilterEditType filterType)
+        {
+            if (GetFilterEditType != null)
+            {
+                GridGetFilterEditTypeEventArgs ev = new
+                    GridGetFilterEditTypeEventArgs(gridColumn.GridPanel, gridColumn, filterType);
+
+                GetFilterEditType(this, ev);
+
+                filterType = ev.FilterEditType;
+            }
+        }
+
+        #endregion
+
+        #region GetFilterRowStyleEvent
+
+        /// <summary>
+        /// Handles invocation of GetFilterRowStyle events
+        /// </summary>
+        internal void DoGetFilterRowStyleEvent(
+            GridFilter gridFilter, StyleType eStyle, ref FilterRowVisualStyle style)
+        {
+            if (GetFilterRowStyle != null)
+            {
+                GridGetFilterRowStyleEventArgs ev = new
+                    GridGetFilterRowStyleEventArgs(gridFilter.GridPanel, gridFilter, eStyle, style);
+
+                GetFilterRowStyle(this, ev);
+
+                style = ev.Style;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetCellRangesEvent
+
+        /// <summary>
+        /// Handles invocation of GetCellRanges events
+        /// </summary>
+        internal bool DoGetCellRangesEvent(
+            GridContainer gridContainer, DisplayRange displayRange, ref List<CellRange> cellRanges)
+        {
+            if (GetCellRanges != null)
+            {
+                GridGetCellRangesEventArgs ev = new
+                    GridGetCellRangesEventArgs(gridContainer.GridPanel, gridContainer, displayRange, cellRanges);
+
+                GetCellRanges(this, ev);
+
+                cellRanges = ev.CellRanges;
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region GetCellFormattedValueEvent
+
+        /// <summary>
+        /// Handles invocation of GetCellFormattedValue events
+        /// </summary>
+        internal void DoGetCellFormattedValueEvent(
+            GridCell gridCell, ref string formattedValue, ref CellSizingSource sizingSource)
+        {
+            if (GetCellFormattedValue != null)
+            {
+                GridGetCellFormattedValueEventArgs ev = new
+                    GridGetCellFormattedValueEventArgs(gridCell.GridPanel, gridCell, formattedValue, sizingSource);
+
+                GetCellFormattedValue(this, ev);
+
+                formattedValue = ev.FormattedValue;
+                sizingSource = ev.SizingSource;
+            }
+        }
+
+        #endregion
+
+        #region GetCellRangeFormattedValueEvent
+
+        /// <summary>
+        /// Handles invocation of GetCellRangeFormattedValue events
+        /// </summary>
+        internal void DoGetCellRangeFormattedValueEvent(
+            GridContainer gridContainer, CellRange cellRange, ref string formattedValue)
+        {
+            if (GetCellRangeFormattedValue != null)
+            {
+                GridGetCellRangeFormattedValueEventArgs ev = new
+                    GridGetCellRangeFormattedValueEventArgs(gridContainer.GridPanel, gridContainer, cellRange, formattedValue);
+
+                GetCellRangeFormattedValue(this, ev);
+
+                formattedValue = ev.FormattedValue;
+            }
+        }
+
+        #endregion
+
+        #region GetCellStyleEvent
+
+        /// <summary>
+        /// Handles invocation of GetCellStyle events
+        /// </summary>
+        internal void DoGetCellStyleEvent(
+            GridCell gridCell, StyleType eStyle, ref CellVisualStyle style)
+        {
+            if (GetCellStyle != null)
+            {
+                GridGetCellStyleEventArgs ev = new
+                    GridGetCellStyleEventArgs(gridCell.GridPanel, gridCell, eStyle, style);
+
+                GetCellStyle(this, ev);
+
+                style = ev.Style;
+            }
+        }
+
+        #endregion
+
+        #region GetCellToolTipEvent
+
+        /// <summary>
+        /// Handles invocation of GetCellToolTipEvent events
+        /// </summary>
+        internal bool DoGetCellToolTipEvent(
+            GridPanel panel, GridCell gridCell, ref string toolTip)
+        {
+            if (GetCellToolTip != null)
+            {
+                GridGetCellToolTipEventArgs ev = new
+                    GridGetCellToolTipEventArgs(panel, gridCell, toolTip);
+
+                GetCellToolTip(this, ev);
+
+                toolTip = ev.ToolTip;
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region GetCellValueEvent
+
+        /// <summary>
+        /// Handles invocation of GetCellValue events
+        /// </summary>
+        internal void DoGetCellValueEvent(GridCell gridCell, ref object value)
+        {
+            if (GetCellValue != null)
+            {
+                GridGetCellValueEventArgs ev = new
+                    GridGetCellValueEventArgs(gridCell.GridPanel, gridCell, value);
+
+                GetCellValue(this, ev);
+
+                value = ev.Value;
+            }
+        }
+
+        #endregion
+
+        #region GetColumnGroupHeaderToolTipEvent
+
+        /// <summary>
+        /// Handles invocation of GetColumnGroupHeaderToolTip events
+        /// </summary>
+        internal bool DoGetColumnGroupHeaderToolTipEvent(GridPanel panel,
+            ColumnGroupHeader groupHeader, HeaderArea hitArea, ref string toolTip)
+        {
+            if (GetColumnGroupHeaderToolTip != null)
+            {
+                GridGetColumnGroupHeaderToolTipEventArgs ev = new
+                    GridGetColumnGroupHeaderToolTipEventArgs(panel, groupHeader, hitArea, toolTip);
+
+                GetColumnGroupHeaderToolTip(this, ev);
+
+                toolTip = ev.ToolTip;
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region GetColumnGroupHeaderStyleEvent
+
+        /// <summary>
+        /// Handles invocation of GetColumnGroupHeader events
+        /// </summary>
+        internal void DoGetColumnGroupHeaderStyleEvent(GridPanel panel,
+            ColumnGroupHeader cgh, StyleType eStyle, ref ColumnHeaderVisualStyle style)
+        {
+            if (GetColumnGroupHeaderStyle != null)
+            {
+                GridGetColumnGroupHeaderStyleEventArgs ev = new
+                    GridGetColumnGroupHeaderStyleEventArgs(panel, cgh, eStyle, style);
+
+                GetColumnGroupHeaderStyle(this, ev);
+
+                style = ev.Style;
+            }
+        }
+
+        #endregion
+
+        #region GetColumnHeaderRowHeaderStyleEvent
+
+        /// <summary>
+        /// Handles invocation of GetColumnHeader RowHeader events
+        /// </summary>
+        internal void DoGetColumnHeaderRowHeaderStyleEvent(
+            GridColumnHeader columnHeader, StyleType eStyle, ref ColumnHeaderRowVisualStyle style)
+        {
+            if (GetColumnHeaderRowHeaderStyle != null)
+            {
+                GridGetColumnHeaderRowHeaderStyleEventArgs ev = new
+                    GridGetColumnHeaderRowHeaderStyleEventArgs(columnHeader.GridPanel, columnHeader, eStyle, style);
+
+                GetColumnHeaderRowHeaderStyle(this, ev);
+
+                style = ev.Style;
+            }
+        }
+
+        #endregion
+
+        #region GetColumnHeaderStyleEvent
+
+        /// <summary>
+        /// Handles invocation of GetColumnHeader events
+        /// </summary>
+        internal void DoGetColumnHeaderStyleEvent(
+            GridColumn gridColumn, StyleType eStyle, ref ColumnHeaderVisualStyle style)
+        {
+            if (GetColumnHeaderStyle != null)
+            {
+                GridGetColumnHeaderStyleEventArgs ev = new
+                    GridGetColumnHeaderStyleEventArgs(gridColumn.GridPanel, gridColumn, eStyle, style);
+
+                GetColumnHeaderStyle(this, ev);
+
+                style = ev.Style;
+            }
+        }
+
+        #endregion
+
+        #region GetColumnHeaderToolTipEvent
+
+        /// <summary>
+        /// Handles invocation of GetColumnHeaderToolTip events
+        /// </summary>
+        internal bool DoGetColumnHeaderToolTipEvent(GridPanel panel,
+            GridColumn gridColumn, HeaderArea hitArea, ref string toolTip)
+        {
+            if (GetColumnHeaderToolTip != null)
+            {
+                GridGetColumnHeaderToolTipEventArgs ev = new
+                    GridGetColumnHeaderToolTipEventArgs(panel, gridColumn, hitArea, toolTip);
+
+                GetColumnHeaderToolTip(this, ev);
+
+                toolTip = ev.ToolTip;
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region GetDisplayRangesEvent
+
+        /// <summary>
+        /// Handles invocation of GetDisplayRanges events
+        /// </summary>
+        internal void DoGetDisplayRangesEvent(
+            GridContainer gridContainer, ref List<DisplayRange> displayRanges)
+        {
+            if (GetDisplayRanges != null)
+            {
+                GridGetDisplayRangesEventArgs ev = new
+                    GridGetDisplayRangesEventArgs(gridContainer.GridPanel, gridContainer, displayRanges);
+
+                GetDisplayRanges(this, ev);
+
+                displayRanges = ev.DisplayRanges;
+            }
+        }
+
+        #endregion
+
+        #region ConfigureGroupBox
+
+        /// <summary>
+        /// Handles invocation of ConfigureGroupBox events
+        /// </summary>
+        internal void DoConfigureGroupBoxEvent(
+            GridGroupByRow groupByRow, GridGroupBox gridGroupBox)
+        {
+            if (ConfigureGroupBox != null)
+            {
+                GridConfigureGroupBoxEventArgs ev = new
+                    GridConfigureGroupBoxEventArgs(groupByRow.GridPanel, groupByRow, gridGroupBox);
+
+                ConfigureGroupBox(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region GetGroupedDetailRowsEvent
+
+        /// <summary>
+        /// Handles invocation of GetGroupedDetailRows events
+        /// </summary>
+        internal bool DoGetGroupedDetailRowsEvent(GridPanel gridPanel, GridColumn gridColumn,
+            GridGroup gridGroup, out List<GridRow> preRows, out List<GridRow> postRows)
+        {
+            if (GetGroupDetailRows != null)
+            {
+                GridGetGroupDetailRowsEventArgs ev = new
+                    GridGetGroupDetailRowsEventArgs(gridPanel, gridColumn, gridGroup);
+
+                GetGroupDetailRows(this, ev);
+
+                preRows = ev.PreDetailRows;
+                postRows = ev.PostDetailRows;
+
+                return (true);
+            }
+
+            preRows = null;
+            postRows = null;
+
+            return (false);
+        }
+
+        #endregion
+
+        #region GetGroupHeaderStyleEvent
+
+        /// <summary>
+        /// Handles invocation of GetGroupHeaderStyle events
+        /// </summary>
+        internal void DoGetGroupHeaderStyleEvent(
+            GridGroup gridRow, StyleType eStyle, ref GroupHeaderVisualStyle style)
+        {
+            if (GetGroupHeaderStyle != null)
+            {
+                GridGetGroupHeaderStyleEventArgs ev = new
+                    GridGetGroupHeaderStyleEventArgs(gridRow.GridPanel, gridRow, eStyle, style);
+
+                GetGroupHeaderStyle(this, ev);
+
+                style = ev.Style;
+            }
+        }
+
+        #endregion
+
+        #region GetGroupIdEvent
+
+        /// <summary>
+        /// Handles invocation of GetGroupId events
+        /// </summary>
+        internal void DoGetGroupIdEvent(
+            GridElement row, GridColumn column, ref object groupId)
+        {
+            if (GetGroupId != null)
+            {
+                GridGetGroupIdEventArgs ev = new
+                    GridGetGroupIdEventArgs(row.GridPanel, row, column, groupId);
+
+                GetGroupId(this, ev);
+
+                groupId = ev.GroupId ?? "<null>";
+            }
+        }
+
+        #endregion
+
+        #region GetMergedCellStyleEvent
+
+        /// <summary>
+        /// Handles invocation of GetMergedCellStyle events
+        /// </summary>
+        internal void DoGetMergedCellStyleEvent(GridPanel panel,
+            CellRange cellRange, StyleType eStyle, ref CellVisualStyle style)
+        {
+            if (GetMergedCellStyle != null)
+            {
+                GridGetMergedCellStyleEventArgs ev = new
+                    GridGetMergedCellStyleEventArgs(panel, cellRange, eStyle, style);
+
+                GetMergedCellStyle(this, ev);
+
+                style = ev.Style;
+            }
+        }
+
+        #endregion
+
+        #region GetPanelStyleEvent
+
+        /// <summary>
+        /// Handles invocation of GetPanelStyle events
+        /// </summary>
+        internal void DoGetPanelStyleEvent(
+            GridPanel gridPanel, ref GridPanelVisualStyle style)
+        {
+            if (GetPanelStyle != null)
+            {
+                GridGetPanelStyleEventArgs ev = new
+                    GridGetPanelStyleEventArgs(gridPanel, style);
+
+                GetPanelStyle(this, ev);
+
+                style = ev.Style;
+            }
+        }
+
+        #endregion
+
+        #region GetRowCellStyleEvent
+
+        /// <summary>
+        /// Handles invocation of GetRowCellStyle events
+        /// </summary>
+        internal void DoGetRowCellStyleEvent(
+            GridContainer gridRow, StyleType eStyle, ref CellVisualStyle style)
+        {
+            if (GetRowCellStyle != null)
+            {
+                GridGetRowCellStyleEventArgs ev = new
+                    GridGetRowCellStyleEventArgs(gridRow.GridPanel, gridRow, eStyle, style);
+
+                GetRowCellStyle(this, ev);
+
+                style = ev.Style;
+            }
+        }
+
+        #endregion
+
+        #region GetRowHeaderStyleEvent
+
+        /// <summary>
+        /// Handles invocation of GetRowHeader events
+        /// </summary>
+        internal void DoGetRowHeaderStyleEvent(
+            GridContainer gridRow, StyleType eStyle, ref RowHeaderVisualStyle style)
+        {
+            if (GetRowHeaderStyle != null)
+            {
+                GridGetRowHeaderStyleEventArgs ev = new
+                    GridGetRowHeaderStyleEventArgs(gridRow.GridPanel, gridRow, eStyle, style);
+
+                GetRowHeaderStyle(this, ev);
+
+                style = ev.Style;
+            }
+        }
+
+        #endregion
+
+        #region GetRowStyleEvent
+
+        /// <summary>
+        /// Handles invocation of GetRowStyle events
+        /// </summary>
+        internal void DoGetRowStyleEvent(
+            GridContainer gridRow, StyleType eStyle, ref RowVisualStyle style)
+        {
+            if (GetRowStyle != null)
+            {
+                GridGetRowStyleEventArgs ev = new
+                    GridGetRowStyleEventArgs(gridRow.GridPanel, gridRow, eStyle, style);
+
+                GetRowStyle(this, ev);
+
+                style = ev.Style;
+            }
+        }
+
+        #endregion
+
+        #region GetRowHeaderTextEvent
+
+        /// <summary>
+        /// Handles invocation of GetRowHeaderText events
+        /// </summary>
+        internal void DoGetRowHeaderTextEvent(GridContainer row, ref string text)
+        {
+            if (GetRowHeaderText != null)
+            {
+                GridGetRowHeaderTextEventArgs ev = new
+                    GridGetRowHeaderTextEventArgs(row.GridPanel, row, text);
+
+                GetRowHeaderText(this, ev);
+
+                text = ev.Text;
+            }
+        }
+
+        #endregion
+
+        #region GetTextRowStyleEvent
+
+        /// <summary>
+        /// Handles invocation of GetTextRowStyle events
+        /// </summary>
+        internal void DoGetTextRowStyleEvent(
+            GridTextRow gridTextRow, StyleType eStyle, ref TextRowVisualStyle style)
+        {
+            if (GetTextRowStyle != null)
+            {
+                GridGetTextRowStyleEventArgs ev = new
+                    GridGetTextRowStyleEventArgs(gridTextRow.GridPanel, gridTextRow, eStyle, style);
+
+                GetTextRowStyle(this, ev);
+
+                style = ev.Style;
+            }
+        }
+
+        #endregion
+
+        #region GridPreviewKeyDown
+
+        private bool DoGridPreviewKeyDown(Keys keyData)
+        {
+            if (GridPreviewKeyDown != null)
+            {
+                GridPreviewKeyDownEventArgs args =
+                    new GridPreviewKeyDownEventArgs(keyData | ModifierKeys);
+
+                args.IsInputKey = _IsInputKey;
+
+                GridPreviewKeyDown(this, args);
+
+                _IsInputKey = args.IsInputKey;
+
+                return (args.Handled);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region GroupChangedEvent
+
+        /// <summary>
+        /// Handles invocation of GroupChanged events
+        /// </summary>
+        internal void DoGroupChangedEvent(
+            GridPanel gridPanel, GroupChangedAction action, GridColumn gridColumn)
+        {
+            if (GroupChanged != null)
+            {
+                GridGroupChangedEventArgs ev = new
+                    GridGroupChangedEventArgs(gridPanel, action, gridColumn);
+
+                GroupChanged(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region GroupHeaderClickEvent
+
+        /// <summary>
+        /// Handles invocation of GroupHeaderClick events
+        /// </summary>
+        internal bool DoGroupHeaderClickEvent(GridGroup group, GroupArea area, MouseEventArgs e)
+        {
+            if (GroupHeaderClick != null)
+            {
+                GridGroupHeaderClickEventArgs ev =
+                    new GridGroupHeaderClickEventArgs(group.GridPanel, group, area, e);
+
+                GroupHeaderClick(this, ev);
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region GroupHeaderDoubleClickEvent
+
+        /// <summary>
+        /// Handles invocation of GroupHeaderDoubleClick events
+        /// </summary>
+        internal bool DoGroupHeaderDoubleClickEvent(GridGroup group, GroupArea area, MouseEventArgs e)
+        {
+            if (GroupHeaderDoubleClick != null)
+            {
+                GridGroupHeaderDoubleClickEventArgs ev =
+                    new GridGroupHeaderDoubleClickEventArgs(group.GridPanel, group, area, e);
+
+                GroupHeaderDoubleClick(this, ev);
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region GroupSortingEvent
+
+        /// <summary>
+        /// Handles invocation of GroupSorting events
+        /// </summary>
+        internal bool DoGroupSortingEvent(GridPanel panel)
+        {
+            if (GroupSorting != null)
+            {
+                GridCancelEventArgs ev = new GridCancelEventArgs(panel);
+
+                GroupSorting(this, ev);
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region GroupSortedEvent
+
+        /// <summary>
+        /// Handles invocation of GroupSorted events
+        /// </summary>
+        internal void DoGroupSortedEvent(GridPanel panel)
+        {
+            if (GroupSorted != null)
+            {
+                GridEventArgs ev = new GridEventArgs(panel);
+
+                GroupSorted(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region InitEditContext
+
+        /// <summary>
+        /// Handles invocation of InitEditContext events
+        /// </summary>
+        internal void DoInitEditContextEvent(
+            GridCell gridCell, IGridCellEditControl editControl)
+        {
+            if (InitEditContext != null)
+            {
+                GridInitEditContextEventArgs ev = new
+                    GridInitEditContextEventArgs(gridCell.GridPanel, gridCell, editControl);
+
+                InitEditContext(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region LayoutOrderUpdatingEvent
+
+        /// <summary>
+        /// Handles invocation of LayoutOrderUpdating events
+        /// </summary>
+        internal bool DoLayoutOrderUpdatingEvent(GridPanel panel)
+        {
+            if (LayoutOrderUpdating != null)
+            {
+                GridCancelEventArgs ev = new GridCancelEventArgs(panel);
+
+                LayoutOrderUpdating(this, ev);
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region LayoutOrderUpdatedEvent
+
+        /// <summary>
+        /// Handles invocation of LayoutOrderUpdated events
+        /// </summary>
+        internal void DoLayoutOrderUpdatedEvent(GridPanel panel)
+        {
+            if (LayoutOrderUpdated != null)
+            {
+                GridEventArgs ev = new GridEventArgs(panel);
+
+                LayoutOrderUpdated(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region NoRowsMarkupLinkClick Event
+
+        /// <summary>
+        /// Handles invocation of NoRowsTextMarkupLinkClick events
+        /// </summary>
+        internal void DoNoRowsMarkupLinkClickEvent(
+            GridPanel gridPanel, HyperLink hyperLink)
+        {
+            if (NoRowsMarkupLinkClick != null)
+            {
+                GridNoRowsMarkupLinkClickEventArgs ev = new GridNoRowsMarkupLinkClickEventArgs(
+                    gridPanel, hyperLink.Name, hyperLink.HRef);
+
+                NoRowsMarkupLinkClick(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region PlayingSoundEvent
+
+        /// <summary>
+        /// Handles invocation of PlayingSound Events
+        /// </summary>
+        internal bool DoPlayingSoundEvent(
+            GridPanel panel, object item, PlaySoundContext context)
+        {
+            if (PlayingSound != null)
+            {
+                GridPlayingSoundEventArgs ev =
+                    new GridPlayingSoundEventArgs(panel, item, context);
+
+                PlayingSound(this, ev);
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region PreviewKeyDown
+
+        private void DoPreviewKeyDown(Keys keyData)
+        {
+            if (PreviewKeyDown != null)
+            {
+                PreviewKeyDownEventArgs args =
+                    new PreviewKeyDownEventArgs(keyData);
+
+                args.IsInputKey = _IsInputKey;
+
+                PreviewKeyDown(this, args);
+
+                _IsInputKey = args.IsInputKey;
+            }
+        }
+
+        #endregion
+
+        #region RefreshFilter
+
+        internal bool DoRefreshFilter(GridPanel panel)
+        {
+            if (RefreshFilter != null)
+            {
+                GridRefreshFilterEventArgs args =
+                    new GridRefreshFilterEventArgs(panel);
+
+                RefreshFilter(this, args);
+
+                return (args.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region Render events
+
+        #region PostRenderCellEvent
+
+        /// <summary>
+        /// Handles invocation of PostRenderCell events
+        /// </summary>
+        internal void DoPostRenderCellEvent(Graphics g,
+            GridCell gridCell, RenderParts parts, Rectangle bounds)
+        {
+            if (PostRenderCell != null)
+            {
+                GridPostRenderCellEventArgs ev = new
+                    GridPostRenderCellEventArgs(g, gridCell.GridPanel, gridCell, parts, bounds);
+
+                PostRenderCell(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region PreRenderCellEvent
+
+        /// <summary>
+        /// Handles invocation of PreRenderCell events
+        /// </summary>
+        internal bool DoPreRenderCellEvent(Graphics g,
+            GridCell gridCell, RenderParts parts, Rectangle bounds)
+        {
+            if (PreRenderCell != null)
+            {
+                GridPreRenderCellEventArgs ev = new
+                    GridPreRenderCellEventArgs(g, gridCell.GridPanel, gridCell, parts, bounds);
+
+                PreRenderCell(this, ev);
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region PostRenderColumnHeaderEvent
+
+        /// <summary>
+        /// Handles invocation of PostRenderColumnHeader events
+        /// </summary>
+        internal void DoPostRenderColumnHeaderEvent(Graphics g,
+            GridColumnHeader header, GridColumn column, RenderParts parts, Rectangle bounds)
+        {
+            if (PostRenderColumnHeader != null)
+            {
+                GridPanel panel = header.GridPanel;
+
+                GridPostRenderColumnHeaderEventArgs ev = new
+                    GridPostRenderColumnHeaderEventArgs(g, panel, header, column, parts, bounds);
+
+                PostRenderColumnHeader(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region PreRenderColumnHeaderEvent
+
+        /// <summary>
+        /// Handles invocation of PreRenderColumnHeaderEvent events
+        /// </summary>
+        internal bool DoPreRenderColumnHeaderEvent(Graphics g,
+            GridColumnHeader header, GridColumn column, RenderParts parts, Rectangle bounds)
+        {
+            if (PreRenderColumnHeader != null)
+            {
+                GridPanel panel = header.GridPanel;
+
+                GridPreRenderColumnHeaderEventArgs ev = new
+                    GridPreRenderColumnHeaderEventArgs(g, panel, header, column, parts, bounds);
+
+                PreRenderColumnHeader(this, ev);
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region PostRenderColumnGroupHeaderEvent
+
+        /// <summary>
+        /// Handles invocation of PostRenderColumnGroupHeader events
+        /// </summary>
+        internal void DoPostRenderColumnGroupHeaderEvent(Graphics g,
+            GridColumnHeader header, ColumnGroupHeader groupHeader, RenderParts parts, Rectangle bounds)
+        {
+            if (PostRenderColumnGroupHeader != null)
+            {
+                GridPanel panel = header.GridPanel;
+
+                GridPostRenderColumnGroupHeaderEventArgs ev = new
+                    GridPostRenderColumnGroupHeaderEventArgs(g, panel, header, groupHeader, parts, bounds);
+
+                PostRenderColumnGroupHeader(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region PreRenderColumnGroupHeaderEvent
+
+        /// <summary>
+        /// Handles invocation of PreRenderColumnGroupHeader events
+        /// </summary>
+        internal bool DoPreRenderColumnGroupHeaderEvent(Graphics g,
+            GridColumnHeader header, ColumnGroupHeader groupHeader, RenderParts parts, Rectangle bounds)
+        {
+            if (PreRenderColumnGroupHeader != null)
+            {
+                GridPanel panel = header.GridPanel;
+
+                GridPreRenderColumnGroupHeaderEventArgs ev = new
+                    GridPreRenderColumnGroupHeaderEventArgs(g, panel, header, groupHeader, parts, bounds);
+
+                PreRenderColumnGroupHeader(this, ev);
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region PostRenderFilterPopupGripBarEvent
+
+        /// <summary>
+        /// Handles invocation of PostRenderFilterPopupGripBar events
+        /// </summary>
+        internal void DoPostRenderFilterPopupGripBarEvent(
+            Graphics g, FilterPopup filterPopup, GridColumn gridColumn, Rectangle bounds)
+        {
+            if (PostRenderFilterPopupGripBar != null)
+            {
+                GridPostRenderFilterPopupGripBarEventArgs ev = new
+                    GridPostRenderFilterPopupGripBarEventArgs(g, filterPopup, gridColumn, bounds);
+
+                PostRenderFilterPopupGripBar(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region PreRenderFilterPopupGripBarEvent
+
+        /// <summary>
+        /// Handles invocation of PreRenderFilterPopupGripBar events
+        /// </summary>
+        internal bool DoPreRenderFilterPopupGripBarEvent(
+            Graphics g, FilterPopup filterPopup, GridColumn gridColumn, Rectangle bounds)
+        {
+            if (PreRenderFilterPopupGripBar != null)
+            {
+                GridPreRenderFilterPopupGripBarEventArgs ev = new
+                    GridPreRenderFilterPopupGripBarEventArgs(g, filterPopup, gridColumn, bounds);
+
+                PreRenderFilterPopupGripBar(this, ev);
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region PostRenderFilterRowEvent
+
+        /// <summary>
+        /// Handles invocation of PostRenderFilterRow events
+        /// </summary>
+        internal void DoPostRenderFilterRowEvent(Graphics g,
+            GridFilter filter, GridColumn column, RenderParts parts, Rectangle bounds)
+        {
+            if (PostRenderFilterRow != null)
+            {
+                GridPanel panel = filter.GridPanel;
+
+                GridPostRenderFilterRowEventArgs ev = new
+                    GridPostRenderFilterRowEventArgs(g, panel, filter, column, parts, bounds);
+
+                PostRenderFilterRow(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region PreRenderFilterRowEvent
+
+        /// <summary>
+        /// Handles invocation of PreRenderFilterRowEvent events
+        /// </summary>
+        internal bool DoPreRenderFilterRowEvent(Graphics g,
+            GridFilter filter, GridColumn column, RenderParts parts, Rectangle bounds)
+        {
+            if (PreRenderFilterRow != null)
+            {
+                GridPanel panel = filter.GridPanel;
+
+                GridPreRenderFilterRowEventArgs ev = new
+                    GridPreRenderFilterRowEventArgs(g, panel, filter, column, parts, bounds);
+
+                PreRenderFilterRow(this, ev);
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region PostRenderGroupBoxConnectorEvent
+
+        /// <summary>
+        /// Handles invocation of PostRenderGroupBoxConnector events
+        /// </summary>
+        internal void DoPostRenderGroupBoxConnectorEvent(Graphics g,
+            GridGroupByRow groupByRow, GridGroupBox box1, GridGroupBox box2)
+        {
+            if (PostRenderGroupBoxConnector != null)
+            {
+                GridPostRenderGroupBoxConnectorEventArgs ev = new
+                    GridPostRenderGroupBoxConnectorEventArgs(g, groupByRow.GridPanel, groupByRow, box1, box2);
+
+                PostRenderGroupBoxConnector(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region PreRenderGroupBoxConnectorEvent
+
+        /// <summary>
+        /// Handles invocation of PreRenderGroupBoxConnector events
+        /// </summary>
+        internal bool DoPreRenderGroupBoxConnectorEvent(Graphics g,
+            GridGroupByRow groupByRow, GridGroupBox box1, GridGroupBox box2)
+        {
+            if (PreRenderGroupBoxConnector != null)
+            {
+                GridPreRenderGroupBoxConnectorEventArgs ev = new
+                    GridPreRenderGroupBoxConnectorEventArgs(g, groupByRow.GridPanel, groupByRow, box1, box2);
+
+                PreRenderGroupBoxConnector(this, ev);
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region PostRenderGroupBoxEvent
+
+        /// <summary>
+        /// Handles invocation of PostRenderGroupBox events
+        /// </summary>
+        internal void DoPostRenderGroupBoxEvent(Graphics g,
+            GridGroupByRow groupByRow, GridGroupBox box, RenderParts parts, Rectangle bounds)
+        {
+            if (PostRenderGroupBox != null)
+            {
+                GridPostRenderGroupBoxEventArgs ev = new
+                    GridPostRenderGroupBoxEventArgs(g, groupByRow.GridPanel, groupByRow, box, parts, bounds);
+
+                PostRenderGroupBox(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region PreRenderGroupBoxEvent
+
+        /// <summary>
+        /// Handles invocation of PreRenderGroupBox events
+        /// </summary>
+        internal bool DoPreRenderGroupBoxEvent(Graphics g,
+            GridGroupByRow groupByRow, GridGroupBox box, RenderParts parts, Rectangle bounds)
+        {
+            if (PreRenderGroupBox != null)
+            {
+                GridPreRenderGroupBoxEventArgs ev = new
+                    GridPreRenderGroupBoxEventArgs(g, groupByRow.GridPanel, groupByRow, box, parts, bounds);
+
+                PreRenderGroupBox(this, ev);
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region PostRenderGroupHeaderEvent
+
+        /// <summary>
+        /// Handles invocation of PostRenderGroupHeader events
+        /// </summary>
+        internal void DoPostRenderGroupHeaderEvent(
+            Graphics g, GridGroup gridGroup, RenderParts parts, Rectangle bounds)
+        {
+            if (PostRenderGroupHeader != null)
+            {
+                GridPanel panel = gridGroup.GridPanel;
+
+                GridPostRenderRowEventArgs ev = new
+                    GridPostRenderRowEventArgs(g, panel, gridGroup, parts, bounds);
+
+                PostRenderGroupHeader(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region PreRenderGroupHeaderEvent
+
+        /// <summary>
+        /// Handles invocation of PreRenderGroupHeader events
+        /// </summary>
+        internal bool DoPreRenderGroupHeaderEvent(
+            Graphics g, GridGroup gridGroup, RenderParts parts, Rectangle bounds)
+        {
+            if (PreRenderGroupHeader != null)
+            {
+                GridPanel panel = gridGroup.GridPanel;
+
+                GridPreRenderRowEventArgs ev = new
+                    GridPreRenderRowEventArgs(g, panel, gridGroup, parts, bounds);
+
+                PreRenderGroupHeader(this, ev);
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region PostRenderPanelRowEvent
+
+        /// <summary>
+        /// Handles invocation of PostRenderPanelRow events
+        /// </summary>
+        internal void DoPostRenderPanelRowEvent(
+            Graphics g, GridContainer gridRow, RenderParts parts, Rectangle bounds)
+        {
+            if (PostRenderPanelRow != null)
+            {
+                GridPostRenderRowEventArgs ev = new
+                    GridPostRenderRowEventArgs(g, gridRow.GridPanel, gridRow, parts, bounds);
+
+                PostRenderPanelRow(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region PreRenderPanelRowEvent
+
+        /// <summary>
+        /// Handles invocation of PreRenderPanelRow events
+        /// </summary>
+        internal bool DoPreRenderPanelRowEvent(
+            Graphics g, GridContainer gridRow, RenderParts parts, Rectangle bounds)
+        {
+            if (PreRenderPanelRow != null)
+            {
+                GridPreRenderRowEventArgs ev = new
+                    GridPreRenderRowEventArgs(g, gridRow.GridPanel, gridRow, parts, bounds);
+
+                PreRenderPanelRow(this, ev);
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region PostRenderRowEvent
+
+        /// <summary>
+        /// Handles invocation of PostRenderRow events
+        /// </summary>
+        internal void DoPostRenderRowEvent(
+            Graphics g, GridRow gridRow, RenderParts parts, Rectangle bounds)
+        {
+            if (PostRenderRow != null)
+            {
+                GridPostRenderRowEventArgs ev = new
+                    GridPostRenderRowEventArgs(g, gridRow.GridPanel, gridRow, parts, bounds);
+
+                PostRenderRow(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region PreRenderRowEvent
+
+        /// <summary>
+        /// Handles invocation of PreRenderRow events
+        /// </summary>
+        internal bool DoPreRenderRowEvent(Graphics g, 
+            GridRow gridRow, RenderParts parts, Rectangle bounds)
+        {
+            if (PreRenderRow != null)
+            {
+                GridPreRenderRowEventArgs ev = new
+                    GridPreRenderRowEventArgs(g, gridRow.GridPanel, gridRow, parts, bounds);
+
+                PreRenderRow(this, ev);
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region PostRenderTextRowEvent
+
+        /// <summary>
+        /// Handles invocation of PostRenderTextRow events
+        /// </summary>
+        internal void DoPostRenderTextRowEvent(
+            Graphics g, GridTextRow gridTextRow, RenderParts parts, Rectangle bounds)
+        {
+            if (PostRenderTextRow != null)
+            {
+                GridPostRenderTextRowEventArgs ev = new
+                    GridPostRenderTextRowEventArgs(g, gridTextRow.GridPanel, gridTextRow, parts, bounds);
+
+                PostRenderTextRow(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region PreRenderTextRowEvent
+
+        /// <summary>
+        /// Handles invocation of PreRenderTextRow events
+        /// </summary>
+        internal bool DoPreRenderTextRowEvent(Graphics g,
+            GridTextRow gridTextRow, RenderParts parts, Rectangle bounds)
+        {
+            if (PreRenderTextRow != null)
+            {
+                GridPreRenderTextRowEventArgs ev = new
+                    GridPreRenderTextRowEventArgs(g, gridTextRow.GridPanel, gridTextRow, parts, bounds);
+
+                PreRenderTextRow(this, ev);
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Row events
+
+        #region RowLoadedEvent
+
+        /// <summary>
+        /// Handles invocation of RowLoaded events
+        /// </summary>
+        internal void DoRowLoadedEvent(GridPanel panel, GridRow row)
+        {
+            if (RowLoaded != null)
+            {
+                GridRowLoadedEventArgs ev = new
+                    GridRowLoadedEventArgs(panel, row);
+
+                RowLoaded(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region RowActivatedEvent
+
+        /// <summary>
+        /// Handles invocation of RowActivated events
+        /// </summary>
+        internal void DoRowActivatedEvent(
+            GridPanel gridPanel, GridContainer oldRow, GridContainer newRow)
+        {
+            if (RowActivated != null)
+            {
+                GridRowActivatedEventArgs ev = new
+                    GridRowActivatedEventArgs(gridPanel, oldRow, newRow);
+
+                RowActivated(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region RowActivatingEvent
+
+        /// <summary>
+        /// Handles invocation of RowActivating events
+        /// </summary>
+        internal bool DoRowActivatingEvent(
+            GridPanel panel, GridContainer orow, GridContainer nrow)
+        {
+            if (RowActivating != null)
+            {
+                GridRowActivatingEventArgs ev = new
+                    GridRowActivatingEventArgs(panel, orow, nrow);
+
+                RowActivating(this, ev);
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region RowAddedEvent
+
+        /// <summary>
+        /// Handles invocation of RowAdded events
+        /// </summary>
+        internal void DoRowAddedEvent(GridPanel panel, int index)
+        {
+            if (RowAdded != null)
+            {
+                GridRowAddedEventArgs ev = new
+                    GridRowAddedEventArgs(panel, index);
+
+                RowAdded(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region RowAddingEvent
+
+        /// <summary>
+        /// Handles invocation of DoRowAdding events
+        /// </summary>
+        internal bool DoRowAddingEvent(GridPanel panel, ref int index)
+        {
+            if (RowAdding != null)
+            {
+                GridRowAddingEventArgs ev = new
+                    GridRowAddingEventArgs(panel, index);
+
+                RowAdding(this, ev);
+
+                index = ev.Index;
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region RowClickEvent
+
+        /// <summary>
+        /// Handles invocation of RowClick events
+        /// </summary>
+        internal bool DoRowClickEvent(GridRow row, RowArea rowArea, MouseEventArgs e)
+        {
+            if (RowClick != null)
+            {
+                GridRowClickEventArgs ev =
+                    new GridRowClickEventArgs(row.GridPanel, row, rowArea, e);
+
+                RowClick(this, ev);
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region RowDeletedEvent
+
+        /// <summary>
+        /// Handles invocation of RowDeleted events
+        /// </summary>
+        internal void DoRowDeletedEvent(GridPanel panel, SelectedElements selRows)
+        {
+            if (RowDeleted != null)
+            {
+                GridRowDeletedEventArgs ev = new
+                    GridRowDeletedEventArgs(panel, selRows);
+
+                RowDeleted(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region RowDeletingEvent
+
+        /// <summary>
+        /// Handles invocation of RowDeleting events
+        /// </summary>
+        internal bool DoRowDeletingEvent(GridPanel panel, SelectedElements selRows)
+        {
+            if (RowDeleting != null)
+            {
+                GridRowDeletingEventArgs ev = new
+                    GridRowDeletingEventArgs(panel, selRows);
+
+                RowDeleting(this, ev);
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region RowDoubleClickEvent
+
+        /// <summary>
+        /// Handles invocation of RowDoubleClick events
+        /// </summary>
+        internal bool DoRowDoubleClickEvent(GridRow row, RowArea rowArea, MouseEventArgs e)
+        {
+            if (RowDoubleClick != null)
+            {
+                GridRowDoubleClickEventArgs ev = new
+                    GridRowDoubleClickEventArgs(row.GridPanel, row, rowArea, e);
+
+                RowDoubleClick(this, ev);
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region RowGetDetailHeightEvent
+
+        /// <summary>
+        /// Handles invocation of RowGetDetailHeight events
+        /// </summary>
+        internal void DoRowGetDetailHeightEvent(GridRow row, 
+            GridLayoutInfo layoutInfo, Size sizeNeeded, ref int preHeight, ref int postHeight)
+        {
+            if (GetDetailRowHeight != null)
+            {
+                GridGetDetailRowHeightEventArgs ev = new
+                    GridGetDetailRowHeightEventArgs(row.GridPanel, row, layoutInfo, sizeNeeded, preHeight, postHeight);
+
+                GetDetailRowHeight(this, ev);
+
+                preHeight = ev.PreDetailHeight;
+                postHeight = ev.PostDetailHeight;
+            }
+        }
+
+        #endregion
+
+        #region RowHeaderClickEvent
+
+        /// <summary>
+        /// Handles invocation of RowHeaderClick events
+        /// </summary>
+        internal void DoRowHeaderClickEvent(
+            GridPanel gridPanel, GridContainer row, MouseEventArgs e)
+        {
+            if (RowHeaderClick != null)
+            {
+                GridRowHeaderClickEventArgs ev =
+                    new GridRowHeaderClickEventArgs(gridPanel, row, e);
+
+                RowHeaderClick(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region RowHeaderDoubleClickEvent
+
+        /// <summary>
+        /// Handles invocation of RowHeaderDoubleClick events
+        /// </summary>
+        internal bool DoRowHeaderDoubleClickEvent(GridContainer row, MouseEventArgs e)
+        {
+            if (RowHeaderDoubleClick != null)
+            {
+                GridRowHeaderDoubleClickEventArgs ev = new
+                    GridRowHeaderDoubleClickEventArgs(row.GridPanel, row, e);
+
+                RowHeaderDoubleClick(this, ev);
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region RowHeaderResizedEvent
+
+        /// <summary>
+        /// Handles invocation of RowHeaderResized events
+        /// </summary>
+        internal void DoRowHeaderResizedEvent(GridPanel gridPanel)
+        {
+            if (RowHeaderResized != null)
+            {
+                GridEventArgs ev = new GridEventArgs(gridPanel);
+
+                RowHeaderResized(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region RowInfoClickEvent
+
+        /// <summary>
+        /// Handles invocation of RowInfoClick events
+        /// </summary>
+        internal void DoRowInfoClickEvent(GridRow gridRow, MouseEventArgs e)
+        {
+            if (RowInfoClick != null)
+            {
+                GridRowClickEventArgs ev = new
+                    GridRowClickEventArgs(gridRow.GridPanel, gridRow, RowArea.InRowInfo, e);
+
+                RowInfoClick(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region RowInfoEnterEvent
+
+        /// <summary>
+        /// Handles invocation of RowInfoEnter events
+        /// </summary>
+        internal bool DoRowInfoEnterEvent(GridRow gridRow, Point pt)
+        {
+            if (RowInfoEnter != null)
+            {
+                GridRowInfoEnterEventArgs ev = new
+                    GridRowInfoEnterEventArgs(gridRow.GridPanel, gridRow, pt);
+
+                RowInfoEnter(this, ev);
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region RowInfoLeaveEvent
+
+        /// <summary>
+        /// Handles invocation of RowInfoLeave events
+        /// </summary>
+        internal void DoRowInfoLeaveEvent(GridRow gridRow)
+        {
+            if (RowInfoLeave != null)
+            {
+                GridRowInfoLeaveEventArgs ev = new
+                    GridRowInfoLeaveEventArgs(gridRow.GridPanel, gridRow);
+
+                RowInfoLeave(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region RowInfoDoubleClickEvent
+
+        /// <summary>
+        /// Handles invocation of RowInfoDoubleClick events
+        /// </summary>
+        internal void DoRowInfoDoubleClickEvent(GridRow gridRow, MouseEventArgs e)
+        {
+            if (RowInfoDoubleClick != null)
+            {
+                GridRowDoubleClickEventArgs ev = new
+                    GridRowDoubleClickEventArgs(gridRow.GridPanel, gridRow, RowArea.InRowInfo, e);
+
+                RowInfoDoubleClick(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region RowMarkedDirtyEvent
+
+        /// <summary>
+        /// Handles invocation of RowMarkedDirty events
+        /// </summary>
+        internal bool DoRowMarkedDirtyEvent(
+            GridCell gridCell, IGridCellEditControl editor)
+        {
+            if (RowMarkedDirty != null)
+            {
+                GridEditEventArgs ev = new
+                    GridEditEventArgs(gridCell.GridPanel, gridCell, editor);
+
+                RowMarkedDirty(this, ev);
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region RowMouseDownEvent
+
+        /// <summary>
+        /// Handles invocation of RowMouseDown events
+        /// </summary>
+        internal void DoRowMouseDownEvent(
+            GridRow gridRow, MouseEventArgs args, RowArea area)
+        {
+            if (RowMouseDown != null)
+            {
+                GridRowMouseEventArgs ev = new
+                    GridRowMouseEventArgs(gridRow.GridPanel, gridRow, args, area);
+
+                RowMouseDown(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region RowMouseEnterEvent
+
+        /// <summary>
+        /// Handles invocation of RowMouseEnter events
+        /// </summary>
+        internal void DoRowMouseEnterEvent(GridRow gridRow)
+        {
+            if (RowMouseEnter != null)
+            {
+                GridRowEventArgs ev = new
+                    GridRowEventArgs(gridRow.GridPanel, gridRow);
+
+                RowMouseEnter(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region RowMouseLeaveEvent
+
+        /// <summary>
+        /// Handles invocation of RowMouseLeave events
+        /// </summary>
+        internal void DoRowMouseLeaveEvent(GridRow gridRow)
+        {
+            if (RowMouseLeave != null)
+            {
+                GridRowEventArgs ev = new
+                    GridRowEventArgs(gridRow.GridPanel, gridRow);
+
+                RowMouseLeave(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region RowMouseMoveEvent
+
+        /// <summary>
+        /// Handles invocation of RowMouseMove events
+        /// </summary>
+        internal void DoRowMouseMoveEvent(GridRow gridRow, MouseEventArgs args, RowArea area)
+        {
+            if (RowMouseMove != null)
+            {
+                GridRowMouseEventArgs ev = new
+                    GridRowMouseEventArgs(gridRow.GridPanel, gridRow, args, area);
+
+                RowMouseMove(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region RowMouseUpEvent
+
+        /// <summary>
+        /// Handles invocation of RowMouseUp events
+        /// </summary>
+        internal void DoRowMouseUpEvent(GridRow gridRow, MouseEventArgs args, RowArea area)
+        {
+            if (RowMouseUp != null)
+            {
+                GridRowMouseEventArgs ev = new
+                    GridRowMouseEventArgs(gridRow.GridPanel, gridRow, args, area);
+
+                RowMouseUp(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region RowMovedEvent
+
+        /// <summary>
+        /// Handles invocation of RowMoved events
+        /// </summary>
+        internal void DoRowMovedEvent(
+            GridPanel gridPanel, GridContainer gridContainer, GridContainer gridRow)
+        {
+            if (RowMoved != null)
+            {
+                GridRowMovedEventArgs ev = new
+                    GridRowMovedEventArgs(gridPanel, gridContainer, gridRow);
+
+                RowMoved(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region RowMovingEvent
+
+        /// <summary>
+        /// Handles invocation of RowMoving events
+        /// </summary>
+        internal bool DoRowMovingEvent(GridRow gridRow,
+            GridContainer srcCont, int srcIndex, ref GridContainer destCont, ref int destIndex)
+        {
+            if (RowMoving != null)
+            {
+                GridRowMovingEventArgs ev = new GridRowMovingEventArgs(
+                    gridRow.GridPanel, gridRow, srcCont, srcIndex, destCont, destIndex);
+
+                RowMoving(this, ev);
+
+                destIndex = ev.DestIndex;
+                destCont = ev.DestContainer;
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region RowResizedEvent
+
+        /// <summary>
+        /// Handles invocation of RowResized events
+        /// </summary>
+        internal void DoRowResizedEvent(GridPanel gridPanel, GridContainer gridRow)
+        {
+            if (RowResized != null)
+            {
+                GridRowEventArgs ev = new
+                    GridRowEventArgs(gridPanel, gridRow);
+
+                RowResized(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region RowRestoredEvent
+
+        /// <summary>
+        /// Handles invocation of RowRestored events
+        /// </summary>
+        internal void DoRowRestoredEvent(GridPanel panel, SelectedElements selRows)
+        {
+            if (RowRestored != null)
+            {
+                GridRowRestoredEventArgs ev = new
+                    GridRowRestoredEventArgs(panel, selRows);
+
+                RowRestored(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region RowRestoringEvent
+
+        /// <summary>
+        /// Handles invocation of RowRestoring events
+        /// </summary>
+        internal bool DoRowRestoringEvent(GridPanel panel, SelectedElements selRows)
+        {
+            if (RowRestoring != null)
+            {
+                GridRowRestoringEventArgs ev = new
+                    GridRowRestoringEventArgs(panel, selRows);
+
+                RowRestoring(this, ev);
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region RowSetDefaultValuesEvent
+
+        /// <summary>
+        /// Handles invocation of RowSetDefaultValues events
+        /// </summary>
+        internal void DoRowSetDefaultValuesEvent(
+            GridPanel panel, GridRow row, NewRowContext context)
+        {
+            if (RowSetDefaultValues != null)
+            {
+                GridRowSetDefaultValuesEventArgs ev = new
+                    GridRowSetDefaultValuesEventArgs(panel, row, context);
+
+                bool loading = row.Loading;
+                row.Loading = true;
+
+                try
+                {
+                    RowSetDefaultValues(this, ev);
+                }
+                finally
+                {
+                    row.Loading = loading;
+                }
+            }
+        }
+
+        #endregion
+
+        #region RowsGroupedEvent
+
+        /// <summary>
+        /// Handles invocation of RowsGroupedEvent events
+        /// </summary>
+        internal void DoRowsGroupedEvent(GridPanel panel)
+        {
+            if (RowsGrouped != null)
+            {
+                GridEventArgs ev = new GridEventArgs(panel);
+
+                RowsGrouped(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region RowsGroupingEvent
+
+        /// <summary>
+        /// Handles invocation of RowsGrouping events
+        /// </summary>
+        internal bool DoRowsGroupingEvent(GridPanel panel)
+        {
+            if (RowsGrouping != null)
+            {
+                GridCancelEventArgs ev = new GridCancelEventArgs(panel);
+
+                RowsGrouping(this, ev);
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region RowsPurgingEvent
+
+        /// <summary>
+        /// Handles invocation of RowsPurging events
+        /// </summary>
+        internal bool DoRowsPurgingEvent(GridContainer row, ref bool includeNestedRows)
+        {
+            if (RowsPurging != null)
+            {
+                GridRowsPurgingEventArgs ev = new
+                    GridRowsPurgingEventArgs(row.GridPanel, row, includeNestedRows);
+
+                RowsPurging(this, ev);
+
+                includeNestedRows = ev.IncludeNestedRows;
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region RowsPurgedEvent
+
+        /// <summary>
+        /// Handles invocation of RowsPurged events
+        /// </summary>
+        internal void DoRowsPurgedEvent(GridContainer row)
+        {
+            if (RowsPurged != null)
+            {
+                GridRowEventArgs ev = new GridRowEventArgs(row.GridPanel, row);
+
+                RowsPurged(this, ev);
+            }
+        }
+
+        #endregion
+        
+        #region RowsSortingEvent
+
+        /// <summary>
+        /// Handles invocation of RowsSorting events
+        /// </summary>
+        internal bool DoRowsSortingEvent(GridPanel panel)
+        {
+            if (RowsSorting != null)
+            {
+                GridCancelEventArgs ev = new GridCancelEventArgs(panel);
+
+                RowsSorting(this, ev);
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region RowsSortedEvent
+
+        /// <summary>
+        /// Handles invocation of RowsSortedEvent events
+        /// </summary>
+        internal void DoRowsSortedEvent(GridPanel panel)
+        {
+            if (RowsSorted != null)
+            {
+                GridEventArgs ev = new GridEventArgs(panel);
+
+                RowsSorted(this, ev);
+            }
+        }
+
+        #endregion
+        
+        #region RowValidatingEvent
+
+        /// <summary>
+        /// Handles invocation of RowValidating events
+        /// </summary>
+        internal bool DoRowValidatingEvent(GridRow gridRow)
+        {
+            if (RowValidating != null)
+            {
+                GridRowValidatingEventArgs ev = new
+                    GridRowValidatingEventArgs(gridRow.GridPanel, gridRow);
+
+                RowValidating(this, ev);
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region RowValidatedEvent
+
+        /// <summary>
+        /// Handles invocation of RowValidated events
+        /// </summary>
+        internal void DoRowValidatedEvent(GridRow gridRow)
+        {
+            if (RowValidated != null)
+            {
+                GridRowValidatedEventArgs ev = new
+                    GridRowValidatedEventArgs(gridRow.GridPanel, gridRow);
+
+                RowValidated(this, ev);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ScrollEvent
+
+        /// <summary>
+        /// Handles invocation of Scroll events
+        /// </summary>
+        internal void DoScrollEvent(GridPanel gridPanel,
+            ScrollEventArgs args, ScrollBarAdv sbar)
+        {
+            if (Scroll != null)
+            {
+                GridScrollEventArgs ev = new
+                    GridScrollEventArgs(gridPanel, args);
+
+                Scroll(this, ev);
+            }
+
+            if (args.Type == ScrollEventType.EndScroll)
+            {
+                if (args.NewValue == 0)
+                    DoScrollMinEvent(gridPanel, args);
+
+                else if (args.NewValue + sbar.LargeChange >= sbar.Maximum)
+                    DoScrollMaxEvent(gridPanel, args);
+            }
+        }
+
+        #endregion
+
+        #region ScrollMinEvent
+
+        /// <summary>
+        /// Handles invocation of ScrollMin events
+        /// </summary>
+        internal void DoScrollMinEvent(GridPanel gridPanel, ScrollEventArgs args)
+        {
+            if (ScrollMin != null)
+            {
+                GridScrollEventArgs ev = new
+                    GridScrollEventArgs(gridPanel, args);
+
+                ScrollMin(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region ScrollMaxEvent
+
+        /// <summary>
+        /// Handles invocation of ScrollMax events
+        /// </summary>
+        internal void DoScrollMaxEvent(GridPanel gridPanel, ScrollEventArgs args)
+        {
+            if (ScrollMax != null)
+            {
+                GridScrollEventArgs ev = new
+                    GridScrollEventArgs(gridPanel, args);
+
+                ScrollMax(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region SelectionChanged Event
+
+        /// <summary>
+        /// Handles invocation of SelectionChanged events
+        /// </summary>
+        internal void DoSelectionChangedEvent(GridPanel gridPanel)
+        {
+            if (SelectionChanged != null)
+            {
+                GridEventArgs ev = new
+                    GridEventArgs(gridPanel);
+
+                SelectionChanged(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region SelectionChanging Event
+
+        /// <summary>
+        /// Handles invocation of SelectionChanging events
+        /// </summary>
+        internal bool DoSelectionChangingEvent(GridPanel gridPanel, 
+            ref SelectedElements selectedElements, int index, int count, bool selected)
+        {
+            if (SelectionChanging != null)
+            {
+                GridSelectionChangingEventArgs ev = new
+                    GridSelectionChangingEventArgs(gridPanel, selectedElements, index, count, selected);
+
+                SelectionChanging(this, ev);
+
+                selectedElements = ev.SelectedElements;
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region SortChanged Event
+
+        /// <summary>
+        /// Handles invocation of SortChanged events
+        /// </summary>
+        internal void DoSortChangedEvent(GridPanel gridPanel)
+        {
+            if (SortChanged != null)
+            {
+                GridEventArgs ev = new
+                    GridEventArgs(gridPanel);
+
+                SortChanged(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region TextRowClickEvent
+
+        /// <summary>
+        /// Handles invocation of TextRowClick events
+        /// </summary>
+        internal void DoTextRowClickEvent(GridTextRow textRow, MouseEventArgs e)
+        {
+            if (TextRowClick != null)
+            {
+                GridTextRowEventArgs ev = new
+                    GridTextRowEventArgs(textRow.GridPanel, textRow, e);
+
+                TextRowClick(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region TextRowHeaderClickEvent
+
+        /// <summary>
+        /// Handles invocation of TextRowHeaderClick events
+        /// </summary>
+        internal void DoTextRowHeaderClickEvent(GridTextRow textRow, MouseEventArgs e)
+        {
+            if (TextRowHeaderClick != null)
+            {
+                GridTextRowEventArgs ev = new
+                    GridTextRowEventArgs(textRow.GridPanel, textRow, e);
+
+                TextRowHeaderClick(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region TextRowMarkupLinkClickEvent
+
+        /// <summary>
+        /// Handles invocation of TextRowMarkupLinkClick events
+        /// </summary>
+        internal void DoTextRowMarkupLinkClickEvent(
+            GridTextRow textRow, HyperLink hyperLink)
+        {
+            if (TextRowMarkupLinkClick != null)
+            {
+                GridTextRowMarkupLinkClickEventArgs ev = new GridTextRowMarkupLinkClickEventArgs(
+                    textRow.GridPanel, textRow, hyperLink.Name, hyperLink.HRef);
+
+                TextRowMarkupLinkClick(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region UpdateCellDisplayRangesEvent
+
+        /// <summary>
+        /// Handles invocation of UpdateCellDisplayRanges events
+        /// </summary>
+        internal void DoUpdateCellDisplayRangesEvent(
+            GridContainer gridContainer, DisplayRange displayRange, ref List<CellRange> cellRanges)
+        {
+            if (UpdateCellDisplayRanges != null)
+            {
+                GridUpdateCellDisplayRangesEventArgs ev = new
+                    GridUpdateCellDisplayRangesEventArgs(gridContainer.GridPanel, gridContainer, displayRange, cellRanges);
+
+                UpdateCellDisplayRanges(this, ev);
+
+                cellRanges = ev.CellRanges;
+            }
+        }
+
+        #endregion
+
+        #region Virtual Row events
+
+        #region DoLoadVirtualRowEvent
+
+        /// <summary>
+        /// Handles invocation of LoadVirtualRow events
+        /// </summary>
+        internal void DoLoadVirtualRowEvent(GridPanel panel, GridRow row)
+        {
+            if (LoadVirtualRow != null)
+            {
+                GridVirtualRowEventArgs ev = new
+                    GridVirtualRowEventArgs(panel, row, row.Index);
+
+                LoadVirtualRow(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region DoVirtualRowLoadedEvent
+
+        /// <summary>
+        /// Handles invocation of VirtualRowed events
+        /// </summary>
+        internal void DoVirtualRowLoadedEvent(GridPanel panel, GridRow row)
+        {
+            if (VirtualRowLoaded != null)
+            {
+                GridVirtualRowEventArgs ev = new
+                    GridVirtualRowEventArgs(panel, row, row.Index);
+
+                VirtualRowLoaded(this, ev);
+            }
+        }
+
+        #endregion
+
+        #region DoStoreVirtualRowEvent
+
+        /// <summary>
+        /// Handles invocation of StoreVirtualRow events
+        /// </summary>
+        internal void DoStoreVirtualRowEvent(GridPanel gridPanel, GridRow gridRow)
+        {
+            if (StoreVirtualRow != null)
+            {
+                GridVirtualRowEventArgs ev = new
+                    GridVirtualRowEventArgs(gridPanel, gridRow, gridRow.Index);
+
+                StoreVirtualRow(this, ev);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region GetElementAt
+
+        ///<summary>
+        /// Gets the GridElement at the given coordinates
+        ///</summary>
+        ///<param name="pt"></param>
+        ///<returns></returns>
+        public GridElement GetElementAt(Point pt)
+        {
+            return (GetElementAt(pt.X, pt.Y));
+        }
+
+        ///<summary>
+        /// Gets the GridElement at the given coordinates
+        ///</summary>
+        ///<param name="x"></param>
+        ///<param name="y"></param>
+        ///<returns></returns>
+        public GridElement GetElementAt(int x, int y)
+        {
+            GridElement item = _PrimaryGrid.GetElementAt(x, y);
+
+            if (item == null)
+                return (_PrimaryGrid);
+
+            while (item is GridContainer)
+            {
+                GridElement subItem = ((GridContainer) item).GetElementAt(x, y);
+
+                if (subItem == null)
+                    break;
+
+                item = subItem;
+            }
+
+            return (item);
+        }
+
+        #endregion
+
+        #region FindGridPanel
+
+        ///<summary>
+        /// Finds the defined GridPanel with the given Name.
+        /// Nested GridPanels will not be searched.
+        ///</summary>
+        ///<returns>GridPanel or null</returns>
+        public GridPanel FindGridPanel(string name)
+        {
+            return (FindGridPanel(name, false));
+        }
+
+        ///<summary>
+        /// Finds the defined GridPanel with the given Name.
+        /// If 'includeNested' is true, then nested GridPanels
+        /// will also be searched.
+        ///</summary>
+        ///<returns></returns>
+        public GridPanel FindGridPanel(string name, bool includeNested)
+        {
+            if (_PrimaryGrid != null)
+            {
+                if (_PrimaryGrid.Name != null && _PrimaryGrid.Name.Equals(name) == true)
+                    return (_PrimaryGrid);
+
+                return (_PrimaryGrid.FindGridPanel(name, includeNested));
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetSelectedElements
+
+        ///<summary>
+        /// This routine returns a SelectedElementCollection,
+        /// containing a list of the currently selected elements.
+        ///</summary>
+        ///<returns>SelectedElementCollection</returns>
+        public SelectedElementCollection GetSelectedElements()
+        {
+            SelectedElementCollection items =
+                _PrimaryGrid.GetSelectedElements();
+
+            GetSelectedElements(_PrimaryGrid, items);
+
+            return (items);
+        }
+
+        private void GetSelectedElements(
+            GridContainer container, SelectedElementCollection items)
+        {
+            foreach (GridElement item in container.Rows)
+            {
+                if (item.Visible == true)
+                {
+                    GridContainer citem = item as GridContainer;
+
+                    if (citem != null)
+                    {
+                        GridPanel panel = citem as GridPanel;
+
+                        if (panel != null)
+                        {
+                            if (panel.VirtualMode == false)
+                                panel.GetSelectedElements(items);
+                        }
+
+                        if (citem.Rows.Count > 0)
+                            GetSelectedElements(citem, items);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region GetSelectedRows
+
+        ///<summary>
+        /// This routine returns a SelectedElementCollection,
+        /// containing a list of the currently selected rows.
+        ///</summary>
+        ///<returns>SelectedElementCollection</returns>
+        public SelectedElementCollection GetSelectedRows()
+        {
+            SelectedElementCollection items =
+                _PrimaryGrid.GetSelectedRows();             
+            
+            GetSelectedRows(_PrimaryGrid, items);
+
+            return (items);
+        }
+
+        private void GetSelectedRows(
+            GridContainer container, ICollection<GridElement> items)
+        {
+            foreach (GridElement item in container.Rows)
+            {
+                if (item.Visible == true)
+                {
+                    GridContainer citem = item as GridContainer;
+
+                    if (citem != null)
+                    {
+                        GridPanel panel = citem as GridPanel;
+
+                        if (panel != null)
+                        {
+                            if (panel.VirtualMode == false)
+                                panel.GetSelectedRows(items);
+                        }
+
+                        if (citem.Rows.Count > 0)
+                            GetSelectedRows(citem, items);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region GetSelectedColumns
+
+        ///<summary>
+        /// This routine returns a SelectedElementCollection,
+        /// containing a list of the currently selected columns.
+        ///</summary>
+        ///<returns>SelectedElementCollection</returns>
+        public SelectedElementCollection GetSelectedColumns()
+        {
+            SelectedElementCollection items = 
+                _PrimaryGrid.GetSelectedColumns();
+
+            GetSelectedColumns(_PrimaryGrid, items);
+
+            return (items);
+        }
+
+        private void GetSelectedColumns(GridContainer container, ICollection<GridElement> items)
+        {
+            foreach (GridElement item in container.Rows)
+            {
+                if (item.Visible == true)
+                {
+                    GridContainer citem = item as GridContainer;
+
+                    if (citem != null)
+                    {
+                        GridPanel panel = citem as GridPanel;
+
+                        if (panel != null)
+                        {
+                            if (panel.VirtualMode == false)
+                                panel.GetSelectedColumns(items);
+                        }
+
+                        if (citem.Rows.Count > 0)
+                            GetSelectedColumns(citem, items);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region GetSelectedCells
+
+        ///<summary>
+        /// This routine returns a SelectedElementCollection,
+        /// containing a list of the currently selected cells.
+        ///</summary>
+        ///<returns>SelectedElementCollection</returns>
+        public SelectedElementCollection GetSelectedCells()
+        {
+            SelectedElementCollection items =
+                _PrimaryGrid.GetSelectedCells();
+
+            GetSelectedCells(_PrimaryGrid, items);
+
+            return (items);
+        }
+
+        private void GetSelectedCells(GridContainer container, SelectedElementCollection items)
+        {
+            foreach (GridElement item in container.Rows)
+            {
+                if (item.Visible == true)
+                {
+                    GridContainer citem = item as GridContainer;
+
+                    if (citem != null)
+                    {
+                        GridPanel panel = citem as GridPanel;
+
+                        if (panel != null)
+                        {
+                            if (panel.VirtualMode == false)
+                                panel.GetSelectedCells(items);
+                        }
+
+                        if (citem.Rows.Count > 0)
+                            GetSelectedCells(citem, items);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region GetCell
+
+        ///<summary>
+        /// Gets the GridCell for the given
+        /// row and column index of the PrimaryGrid
+        ///</summary>
+        ///<param name="rowIndex"></param>
+        ///<param name="columnIndex"></param>
+        ///<returns>GridCell, or null if not a valid cell</returns>
+        public GridCell GetCell(int rowIndex, int columnIndex)
+        {
+            return (PrimaryGrid.GetCell(rowIndex, columnIndex));
+        }
+
+        ///<summary>
+        /// Gets the GridCell for the given
+        /// row and column index of the given GridPanel
+        ///</summary>
+        ///<param name="panel"></param>
+        ///<param name="rowIndex"></param>
+        ///<param name="columnIndex"></param>
+        ///<returns>GridCell, or null if not a valid cell</returns>
+        public GridCell GetCell(GridPanel panel, int rowIndex, int columnIndex)
+        {
+            return (panel.GetCell(rowIndex, columnIndex));
+        }
+
+        #endregion
+
+        #region AutoScrolling support
+
+        #region EnableAutoScrolling
+
+        internal void EnableAutoScrolling(
+            AutoScrollEnable enable, Rectangle scrollRect)
+        {
+            if (Focused == true)
+            {
+                _AutoScrollEnable = enable;
+
+                if ((_HScrollBar != null && _HScrollBar.Visible == true) ||
+                    (_VScrollBar != null && _VScrollBar.Visible == true))
+                {
+                    _ScrollRect = scrollRect;
+
+                    if (_AutoScrollTimer == null)
+                    {
+                        _AutoScrollTimer = new Timer();
+
+                        _AutoScrollTimer.Interval = 10;
+                        _AutoScrollTimer.Tick += AutoScrollTimerTick;
+                        _AutoScrollTimer.Start();
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region DisableAutoScrolling
+
+        internal void DisableAutoScrolling()
+        {
+            if (_AutoScrollTimer != null)
+            {
+                _AutoScrollTimer.Stop();
+                _AutoScrollTimer.Tick -= AutoScrollTimerTick;
+
+                _AutoScrollTimer = null;
+            }
+        }
+
+        #endregion
+
+        #region AutoScrollTimerTick
+
+        private void AutoScrollTimerTick(object sender, EventArgs e)
+        {
+            Point pt = PointToClient(Cursor.Position);
+            Rectangle t = _ScrollRect;
+
+            if ((_AutoScrollEnable & AutoScrollEnable.Horizontal) == AutoScrollEnable.Horizontal &&
+                (_HScrollBar != null && _HScrollBar.Visible == true))
+            {
+                int dx = (pt.X < t.X)
+                    ? ScrollAmount(pt.X - t.X)
+                    : (pt.X >= t.Right) ? ScrollAmount(pt.X - t.Right) : 0;
+
+                SetHScrollValue(_HScrollOffset + dx);
+            }
+
+            if ((_AutoScrollEnable & AutoScrollEnable.Vertical) == AutoScrollEnable.Vertical &&
+                (_VScrollBar != null && _VScrollBar.Visible == true))
+            {
+                int dy = (pt.Y < t.Top)
+                    ? ScrollAmount(pt.Y - t.Top)
+                    : (pt.Y >= t.Bottom) ? ScrollAmount(pt.Y - t.Bottom) : 0;
+
+                SetVScrollValue(_VScrollOffset + dy);
+            }
+        }
+
+        #endregion
+
+        #region ScrollAmount
+
+        private int ScrollAmount(int delta)
+        {
+            int n = Math.Abs(delta);
+            int amt = 1 << ((n / 16) + 1);
+
+            return (delta < 0 ? -amt : amt);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region PostInternalMouseMove
+
+        internal void PostInternalMouseMove()
+        {
+            _PostMouseMove = true;
+        }
+
+        #endregion
+
+        #region UpdateInternalMouseMove
+
+        internal void UpdateInternalMouseMove()
+        {
+            if (_PostMouseMove == true)
+            {
+                _PostMouseMove = false;
+
+                Cursor.Position = Cursor.Position;
+            }
+        }
+
+        #endregion
+
+        #region Cursor
+
+        /// <summary>
+        /// Cursor
+        /// </summary>
+        public override Cursor Cursor
+        {
+            get { return base.Cursor; }
+
+            set
+            {
+                base.Cursor = value;
+
+                if (SetGridCursor == true)
+                    GridCursor = value;
+                else
+                    _DefaultCursor = value;
+            }
+        }
+
+        #endregion
+
+        #region OnGotFocus
+
+        /// <summary>
+        /// OnGotFocus
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnGotFocus(EventArgs e)
+        {
+            base.OnGotFocus(e);
+
+            if (_ActiveRow != null)
+                _ActiveRow.InvalidateRender();
+        }
+
+        #endregion
+
+        #region OnLostFocus
+
+        /// <summary>
+        /// OnLostFocus
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnLostFocus(EventArgs e)
+        {
+            CancelCapture();
+
+            if (_ActiveRow != null)
+                _ActiveRow.InvalidateRender();
+
+            base.OnLostFocus(e);
+        }
+
+        #endregion
+
+        #region OnResize
+
+        /// <summary>
+        /// OnResize
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnResize(EventArgs e)
+        {
+            base.OnResize(e);
+
+            if (_PrimaryGrid != null)
+            {
+                _PrimaryGrid.InvalidateLayout();
+                _PrimaryGrid.ContainerBounds = ClientRectangle;
+            }
+        }
+
+        #endregion
+
+        #region OnValidating
+
+        /// <summary>
+        /// OnValidating
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnValidating(CancelEventArgs e)
+        {
+            if (_ActiveRow != null && _ActiveRow.GridPanel != null)
+            {
+                if (_ActiveRow.GridPanel.SetActiveRow(null, false) == false)
+                {
+                    e.Cancel = true;
+
+                    return;
+                }
+            }
+
+            base.OnValidating(e);
+        }
+
+        #endregion
+
+        #region Update support
+
+        ///<summary>
+        /// Calling the BeginUpdate routine informs the grid
+        /// that an extended update phase has begun. The SuperGrid
+        /// will suspend all layout calculations and display updates
+        /// until the corresponding EndUpdate routine is called.
+        /// 
+        /// BeginUpdate / EndUpdate can be nested and must be
+        /// called in pairs � every BeginUpdate must have a
+        /// matching EndUpdate call.
+        ///</summary>
+        public void BeginUpdate()
+        {
+            _BeginUpdateCount++;
+        }
+
+        ///<summary>
+        /// Calling the EndUpdate routine informs the grid
+        /// that an extended update phase has ended.
+        /// 
+        /// BeginUpdate / EndUpdate can be nested and must be
+        /// called in pairs � every EndUpdate must have a
+        /// matching BeginUpdate call.
+        ///</summary>
+        public void EndUpdate()
+        {
+            if (_BeginUpdateCount > 0)
+            {
+                if (--_BeginUpdateCount == 0)
+                    _PrimaryGrid.InvalidateMerge();
+            }
+        }
+
+        #endregion
+
+        #region INotifyPropertyChanged Members
+
+        /// <summary>
+        /// Occurs when property value has changed.
+        /// </summary>
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        /// <summary>
+        /// Raises the PropertyChanged event.
+        /// </summary>
+        /// <param name="e">Event arguments</param>
+        protected virtual void OnPropertyChanged(PropertyChangedEventArgs e)
+        {
+            PropertyChangedEventHandler handler = PropertyChanged;
+
+            if (handler != null)
+                handler(this, e);
+        }
+
+        /// <summary>
+        /// Default PropertyChanged processing
+        /// </summary>
+        /// <param name="s"></param>
+        protected void OnPropertyChanged(string s)
+        {
+            if (PropertyChanged != null)
+                OnPropertyChanged(new PropertyChangedEventArgs(s));
+        }
+
+        #endregion
+
+        #region IMessageFilter Members
+
+        /// <summary>
+        /// PreFilterMessage
+        /// </summary>
+        /// <param name="m"></param>
+        /// <returns></returns>
+        public bool PreFilterMessage(ref Message m)
+        {
+            if (DesignMode == true || Enabled == false)
+                return (false);
+
+            if (ContainsFocus == true || m.Msg == WmMouseDown || m.Msg == WmMouseWheel)
+            {
+                switch (m.Msg)
+                {
+                    case WmKeyDown:
+                        TrackModifiers();
+
+                        if (_KeyPressSent == true)
+                        {
+                            _KeyPressSent = false;
+                        }
+                        else
+                        {
+                            _IsInputKey = false;
+
+                            Keys keyData = (Keys) (int) m.WParam & Keys.KeyCode;
+
+                            if (DoGridPreviewKeyDown(keyData) == true)
+                                return (true);
+
+                            keyData |= ModifierKeys;
+
+                            _LastKeyDown = keyData;
+
+                            if (_ActiveEditor != null && _EditorCell != null)
+                                return (ProcessInEditKeyDown(keyData));
+
+                            if (_ActiveFilterPanel != null)
+                                return (ProcessInFilterEditKeyDown(keyData));
+                        }
+
+                        return (false);
+
+                    case WmKeyUp:
+                        TrackModifiers();
+                        UpdateInternalMouseMove();
+                        break;
+
+                    case WmMouseDown:
+                        if (IsOverNonModalEditorWindow() == true)
+                        {
+                            Focus();
+                            ExtendNonModalSelection();
+                        }
+                        break;
+
+                    case WmMouseWheel:
+                        if (CanProcessMouseWheel() == true)
+                        {
+                            if ((LoWord(m.WParam) & 0x8) == 0)
+                            {
+                                if (_VScrollBar.Visible == true)
+                                {
+                                    Rectangle r = DisplayRectangle;
+                                    r.Location = PointToScreen(r.Location);
+
+                                    Point mousePos = new Point(LoWord(m.LParam), HiWord(m.LParam));
+
+                                    if (r.Contains(mousePos))
+                                    {
+                                        short detents = (short)HiWord(m.WParam);
+                                        int delta = (detents / SystemInformation.MouseWheelScrollDelta);
+
+                                        MouseWheelHandler(delta);
+
+                                        return (true);
+                                    }
+                                }
+                            }
+                        }
+                        break;
+                }
+            }
+
+            if (_ActiveNonModalEditor != null)
+            {
+                switch (m.Msg)
+                {
+                    case WmMouseMove:
+                        if (IsOverNonModalEditorWindow() == false)
+                        {
+                            if (_ActiveNonModalEditor.CanInterrupt == true)
+                                DeactivateNonModalEditor();
+                        }
+                        break;
+                }
+            }
+
+            return (false);
+        }
+
+        #region CanProcessMouseWheel
+
+        [System.Runtime.InteropServices.DllImport("user32.dll")]
+        private static extern IntPtr WindowFromPoint(Point pnt);
+
+        private bool CanProcessMouseWheel()
+        {
+            IntPtr hWnd = WindowFromPoint(Control.MousePosition);
+
+            if (hWnd != IntPtr.Zero)
+            {
+                Control ctl = Control.FromHandle(hWnd);
+
+                if (ctl == null || ctl.FindForm() != FindForm())
+                    return (false);
+            }
+
+            if (_ActiveEditor == null && _ActiveFilterPanel == null)
+            {
+                if (_ActiveNonModalEditor != null)
+                {
+                    if (_ActiveNonModalEditor.CanInterrupt == false)
+                        return (false);
+                }
+
+                return (true);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region HiWord / LoWord
+
+        private int LoWord(int n)
+        {
+            return (short)(n & 0xffff);
+        }
+
+        private int HiWord(int n)
+        {
+            return (n >> 0x10);
+        }
+
+        private int LoWord(IntPtr n)
+        {
+            return LoWord((int)((long)n));
+        }
+
+        private int HiWord(IntPtr n)
+        {
+            return HiWord((int)((long)n));
+        }
+
+        #endregion
+
+        #region TrackModifiers
+
+        private void TrackModifiers()
+        {
+            if ((_LastModifierKeys & Keys.Control) != (ModifierKeys & Keys.Control))
+            {
+                _LastModifierKeys = ModifierKeys;
+
+                Cursor.Position = Cursor.Position;
+            }
+        }
+
+        #endregion
+
+        #region IsOverNonModalEditorWindow
+
+        private bool IsOverNonModalEditorWindow()
+        {
+            if (_ActiveNonModalEditor != null)
+            {
+                Point pt = MousePosition;
+
+                if (NonModalEditorCell.GridColumn != null)
+                {
+                    Rectangle r = NonModalEditorCell.CellBounds;
+                    r.Location = PointToScreen(r.Location);
+
+                    bool hit = r.Contains(pt);
+
+                    return (hit);
+                }
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region WndProc
+
+        /// <summary>
+        /// WndProc
+        /// </summary>
+        /// <param name="m"></param>
+        protected override void WndProc(ref Message m)
+        {
+            switch (m.Msg)
+            {
+                case WmSetFocus:
+                    if (_PopupControl != null)
+                        _PopupControl.Hide();
+                    break;
+            }
+
+            base.WndProc(ref m);
+        }
+
+        #endregion
+
+        #region ActivateNonModalEditor
+
+        internal void ActivateNonModalEditor(
+            IGridCellEditControl editor, GridCell cell)
+        {
+            ActiveNonModalEditor = editor;
+            NonModalEditorCell = cell;
+        }
+
+        #endregion
+
+        #region DeactivateNonModalEditor
+
+        ///<summary>
+        /// Deactivates any active NonModal editor.
+        ///</summary>
+        public void DeactivateNonModalEditor()
+        {
+            if (_ActiveNonModalEditor != null)
+            {
+                _ActiveNonModalEditor.EditorPanel.Hide();
+                _ActiveNonModalEditor.OnCellMouseLeave(EventArgs.Empty);
+
+                if (_NonModalEditorCell.GridPanel != null)
+                {
+                    _NonModalEditorCell.GridPanel.InternalMouseMove(new MouseEventArgs(MouseButtons.None, 0, -1, -1, 0));
+
+                    if (_NonModalEditorCell.GridPanel.SelectionGranularity != SelectionGranularity.Cell)
+                        _NonModalEditorCell.GridRow.InvalidateRender();
+                    else
+                        _NonModalEditorCell.InvalidateRender();
+                }
+
+                if (_NonModalEditorCell.SuperGrid.ContainsFocus == true)
+                    Focus();
+
+                _ActiveNonModalEditor = null;
+                _NonModalEditorCell = null;
+            }
+        }
+
+        #region ExtendNonModalSelection
+
+        ///<summary>
+        /// ExtendNonModalSelection
+        ///</summary>
+        internal void ExtendNonModalSelection()
+        {
+            GridPanel panel = _NonModalEditorCell.GridPanel;
+
+            if (panel != null)
+            {
+                GridCell cell = _NonModalEditorCell;
+                GridRow row = cell.GridRow;
+
+                panel.SetActiveRow(row, true);
+
+                switch (panel.SelectionGranularity)
+                {
+                    case SelectionGranularity.Row:
+                    case SelectionGranularity.RowWithCellHighlight:
+                        row.ExtendSelection(panel);
+                        break;
+
+                    case SelectionGranularity.Cell:
+                        cell.ExtendSelection(panel);
+
+                        if (_ActiveNonModalEditor != null)
+                            cell.PositionEditPanel(_ActiveNonModalEditor);
+                        break;
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region UpdateStyleCount
+
+        internal int UpdateStyleCount()
+        {
+            StyleUpdateCount++;
+
+            return (StyleUpdateCount);
+        }
+
+        #endregion
+
+        #region CancelCapture
+
+        ///<summary>
+        /// Cancels any in-progress operations that
+        /// may have the mouse captured (and releases the capture).
+        ///</summary>
+        public void CancelCapture()
+        {
+            if (_CapturedItem != null)
+                _CapturedItem.CancelCapture();
+        }
+
+        #endregion
+
+        #region Dispose
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        /// <param name="disposing"></param>
+        protected override void Dispose(bool disposing)
+        {
+            EndWorkers();
+
+            Application.RemoveMessageFilter(this);
+            StyleManager.Unregister(this);
+
+            PrimaryGrid.Dispose();
+
+            if (_VScrollBar != null)
+            {
+                _VScrollBar.Scroll -= VScrollBarScroll;
+                _VScrollBar.MouseEnter -= ScrollBarMouseEnter;
+                _VScrollBar.SizeChanged -= ScrollBarSizeChanged;
+            }
+
+            if (_HScrollBar != null)
+            {
+                _HScrollBar.Scroll -= HScrollBarScroll;
+                _HScrollBar.MouseEnter -= ScrollBarMouseEnter;
+                _HScrollBar.SizeChanged -= ScrollBarSizeChanged;
+            }
+
+            base.Dispose(disposing);
+        }
+
+        private int _WorkerCount;
+        internal bool DisposeRequested;
+
+        private List<Thread> _Threads = new List<Thread>();
+
+        internal void BeginWorker(Thread thread)
+        {
+            Interlocked.Increment(ref _WorkerCount);
+
+            _Threads.Add(thread);
+        }
+
+        internal void EndWorker(Thread thread)
+        {
+            Interlocked.Decrement(ref _WorkerCount);
+
+            _Threads.Remove(thread);
+        }
+
+        private void EndWorkers()
+        {
+            DisposeRequested = true;
+
+            foreach (Thread th in _Threads)
+                th.Abort();
+
+            for (int i = 0; _WorkerCount > 0 && i < 500; i++)
+            {
+                Thread.Sleep(10);
+
+                Application.DoEvents();
+            }
+        }
+
+        #endregion
+
+        #region Licensing
+#if !TRIAL
+        private string _LicenseKey = "";
+        ///<summary>
+        /// LicenseKey
+        ///</summary>
+        [Browsable(false), DefaultValue("")]
+        public string LicenseKey
+        {
+            get { return _LicenseKey; }
+            set
+            {
+                if (NativeFunctions.ValidateLicenseKey(value))
+                    return;
+                _LicenseKey = (!NativeFunctions.CheckLicenseKey(value) ? "9dsjkhds7" : value);
+            }
+        }
+#endif
+        #endregion
+
+        #region Touch Handling
+
+        private Touch.TouchHandler _TouchHandler;
+        private bool _TouchEnabled = true;
+
+        /// <summary>
+        /// Indicates whether touch support for scrolling is enabled.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior")]
+        [Description("Indicates whether touch support for scrolling is enabled.")]
+        public bool TouchEnabled
+        {
+            get { return _TouchEnabled; }
+
+            set
+            {
+                if (value != _TouchEnabled)
+                {
+                    bool oldValue = _TouchEnabled;
+                    _TouchEnabled = value;
+
+                    OnTouchEnabledChanged(oldValue, value);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Called when TouchEnabled property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnTouchEnabledChanged(bool oldValue, bool newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("TouchEnabled"));
+        }
+
+        //private int TriggerPageChangeOffset
+        //{
+        //    get { return 32; }
+        //}
+
+        private int MaximumReversePageOffset
+        {
+            get { return 0; } //Math.Min(32, this.Width / 6);
+        }
+
+        private bool _TouchDrag;
+        private Point _TouchStartLocation = Point.Empty;
+        private Point _TouchStartScrollPosition = Point.Empty;
+        private Rectangle _TouchInnerBounds = Rectangle.Empty;
+
+        private void TouchHandlerPanBegin(object sender, Touch.GestureEventArgs e)
+        {
+            if (_TouchEnabled)
+            {
+                _TouchInnerBounds = SViewRect;
+                _TouchStartLocation = e.Location;
+                _TouchStartScrollPosition = AutoScrollPosition;
+                _TouchDrag = true;
+
+                e.Handled = true;
+            }
+        }
+
+        private void TouchHandlerPanEnd(object sender, Touch.GestureEventArgs e)
+        {
+            if (_TouchDrag)
+            {
+                EndTouchPan();
+
+                e.Handled = true;
+            }
+        }
+
+        private Point AutoScrollPosition
+        {
+            get { return new Point(-_HScrollOffset, -_VScrollOffset); }
+
+            set
+            {
+                if (value.X != _HScrollOffset)
+                    SetHScrollValue(-value.X);
+
+                if (value.Y != _VScrollOffset)
+                    SetVScrollValue(-value.Y);
+            }
+        }
+
+        private void EndTouchPan()
+        {
+            _TouchDrag = false;
+
+            Point autoScrollPosition = AutoScrollPosition;
+            Size autoScrollMinSize = new Size(_HScrollBar.Maximum, _VScrollBar.Maximum);
+
+            if (autoScrollMinSize.Width > _TouchInnerBounds.Width)
+            {
+                if (autoScrollMinSize.Width - _TouchInnerBounds.Width < -autoScrollPosition.X)
+                    autoScrollPosition = new Point(autoScrollMinSize.Width - _TouchInnerBounds.Width, autoScrollPosition.Y);
+                else if (-autoScrollPosition.X < 0)
+                    autoScrollPosition = new Point(0, autoScrollPosition.Y);
+            }
+
+            if (autoScrollMinSize.Height > _TouchInnerBounds.Height)
+            {
+                if (autoScrollMinSize.Height - _TouchInnerBounds.Height < -autoScrollPosition.Y)
+                    autoScrollPosition = new Point(autoScrollPosition.X, autoScrollMinSize.Height - _TouchInnerBounds.Height);
+                else if (-autoScrollPosition.Y < 0)
+                    autoScrollPosition = new Point(autoScrollPosition.X, 0);
+            }
+
+            if (AutoScrollPosition != autoScrollPosition)
+                AutoScrollPosition = autoScrollPosition;
+
+            //ApplyScrollChange();
+
+        }
+
+        private void TouchHandlerPan(object sender, Touch.GestureEventArgs e)
+        {
+            if (_TouchDrag)
+            {
+                Point autoScrollPosition = AutoScrollPosition;
+                Size autoScrollMinSize = new Size(_HScrollBar.Maximum, _VScrollBar.Maximum);
+                int offset = (e.Location.X - _TouchStartLocation.X);
+                int offsetChange = offset + _TouchStartScrollPosition.X;
+
+                bool overflowH = false;
+
+                if (autoScrollMinSize.Width > _TouchInnerBounds.Width)
+                {
+                    if (-offsetChange + MaximumReversePageOffset > autoScrollMinSize.Width - _TouchInnerBounds.Width)
+                    {
+                        autoScrollPosition.X = -(autoScrollMinSize.Width + MaximumReversePageOffset - _TouchInnerBounds.Width);
+                        overflowH = true;
+                    }
+                    else if (offsetChange > MaximumReversePageOffset)
+                    {
+                        autoScrollPosition.X = MaximumReversePageOffset;
+                        overflowH = true;
+                    }
+                    else
+                        autoScrollPosition.X = offsetChange;
+                }
+
+                // Y Scroll
+                bool overflowV = false;
+                if (autoScrollMinSize.Height > _TouchInnerBounds.Height)
+                {
+                    offset = (e.Location.Y - _TouchStartLocation.Y);
+                    offsetChange = offset + _TouchStartScrollPosition.Y;
+
+                    if (-offsetChange + MaximumReversePageOffset > autoScrollMinSize.Height - _TouchInnerBounds.Height)
+                    {
+                        autoScrollPosition.Y = -(autoScrollMinSize.Height + MaximumReversePageOffset - _TouchInnerBounds.Height);
+                        overflowV = true;
+                    }
+                    else if (offsetChange > MaximumReversePageOffset)
+                    {
+                        autoScrollPosition.Y = MaximumReversePageOffset;
+                        overflowV = true;
+                    }
+                    else
+                        autoScrollPosition.Y = offsetChange;
+                }
+                
+                if (AutoScrollPosition != autoScrollPosition)
+                {
+                    AutoScrollPosition = autoScrollPosition;
+                    Update();
+                }
+
+                if (overflowH && overflowV && e.IsInertia)
+                    EndTouchPan();
+
+                e.Handled = true;
+            }
+        }
+
+        #endregion
+
+        #region Localize Members
+
+        #region InvokeLocalizeString
+
+        ///<summary>
+        /// InvokeLocalizeString
+        ///</summary>
+        ///<param name="e"></param>
+        public void InvokeLocalizeString(LocalizeEventArgs e)
+        {
+            if (LocalizeString != null)
+                LocalizeString(this, e);
+        }
+
+        #endregion
+
+        #region LocalizedString
+
+        private string LocalizedString(ref string lstring)
+        {
+            LoadLocalizedStrings();
+
+            return (lstring);
+        }
+
+        #endregion
+
+        #region LoadLocalizedStrings
+
+        private void LoadLocalizedStrings()
+        {
+            if (_LocalizedStringsLoaded == false)
+            {
+                using (LocalizationManager lm = new LocalizationManager(this))
+                {
+                    string s;
+
+                    if ((s = lm.GetLocalizedString(LocalizationKeys.SuperGridFilterShowAll)) != "")
+                        _FilterShowAllString = s;
+
+                    if ((s = lm.GetLocalizedString(LocalizationKeys.SuperGridFilterCustom)) != "")
+                        _FilterCustomString = s;
+
+                    if ((s = lm.GetLocalizedString(LocalizationKeys.SuperGridFilterShowNull)) != "")
+                        _FilterShowNullString = s;
+
+                    if ((s = lm.GetLocalizedString(LocalizationKeys.SuperGridFilterShowNotNull)) != "")
+                        _FilterShowNotNullString = s;
+
+                    if ((s = lm.GetLocalizedString(LocalizationKeys.SuperGridFilterApply)) != "")
+                        _FilterApplyString = s;
+
+                    if ((s = lm.GetLocalizedString(LocalizationKeys.SuperGridFilterOk)) != "")
+                        _FilterOkString = s;
+
+                    if ((s = lm.GetLocalizedString(LocalizationKeys.SuperGridFilterCancel)) != "")
+                        _FilterCancelString = s;
+
+                    if ((s = lm.GetLocalizedString(LocalizationKeys.SuperGridFilterClose)) != "")
+                        _FilterCloseString = s;
+
+                    if ((s = lm.GetLocalizedString(LocalizationKeys.SuperGridGroupByWaterMarkText)) != "")
+                        _GroupByWaterMarkText = s;
+                }
+
+                _LocalizedStringsLoaded = true;
+            }
+        }
+
+        #endregion
+
+        #endregion
+    }
+
+    #region enums
+
+    #region AutoScrollEnable
+
+    [Flags]
+    internal enum AutoScrollEnable
+    {
+        None = 0,
+        Vertical = (1 << 0),
+        Horizontal = (1 << 1),
+    }
+
+    #endregion
+
+    #region PlaySoundContext
+
+    ///<summary>
+    /// Context under which system sound ('beep') is played.
+    ///</summary>
+    public enum PlaySoundContext
+    {
+        ///<summary>
+        /// Attempted activation of a cell which is marked as non-selectable
+        /// or is an EmptyCell with AllowEmptyCellSelection set to false.
+        ///</summary>
+        CellActivate,
+
+        ///<summary>
+        /// Cell validation failure notification.
+        ///</summary>
+        CellValidate,
+
+        ///<summary>
+        /// Attempted activation of a grid row which is marked as non-selectable.
+        ///</summary>
+        RowActivate,
+
+        ///<summary>
+        /// Row validation failure notification.
+        ///</summary>
+        RowDeactivate,
+
+        ///<summary>
+        /// Row validation failure notification.
+        ///</summary>
+        RowValidate,
+        
+        ///<summary>
+        /// Row deletion failure via DEL key input.
+        ///</summary>
+        RowDeleteAttempt,
+
+        ///<summary>
+        /// Row un-deletion failure via Shift-DEL key input.
+        ///</summary>
+        RowUnDeleteAttempt,
+
+        ///<summary>
+        /// Row insert failure via INS key input.
+        ///</summary>
+        RowInsertAttempt,
+
+        ///<summary>
+        /// Trying to suspend merge of a group of mergesd cells when
+        /// AllowSuspend is set to false.
+        ///</summary>
+        MergeSuspend,
+    }
+
+
+    #endregion
+
+    #region DataContext
+
+    ///<summary>
+    /// Context under which data is being accessed
+    ///</summary>
+    public enum DataContext
+    {
+        ///<summary>
+        /// CellEdit
+        ///</summary>
+        CellEdit,
+
+        ///<summary>
+        /// CellKeyEvent
+        ///</summary>
+        CellKeyEvent,
+
+        ///<summary>
+        /// CellMouseEvent
+        ///</summary>
+        CellMouseEvent,
+
+        ///<summary>
+        /// CellProposedSize
+        ///</summary>
+        CellProposedSize,
+
+        ///<summary>
+        /// CellRender
+        ///</summary>
+        CellRender,
+
+        ///<summary>
+        /// CellValueLoad
+        ///</summary>
+        CellValueLoad,
+
+        ///<summary>
+        /// CellValueStore
+        ///</summary>
+        CellValueStore,
+
+        ///<summary>
+        /// CellExpressionParse
+        ///</summary>
+        CellExpressionParse,
+
+        ///<summary>
+        /// CellExpressionEval
+        ///</summary>
+        CellExpressionEval,
+
+        /// <summary>
+        /// CellGetFormattedValue
+        /// </summary>
+        CellGetFormattedValue,
+
+        ///<summary>
+        /// SetRowPosition
+        ///</summary>
+        SetRowPosition,
+
+        ///<summary>
+        /// RowFlush
+        ///</summary>
+        RowFlush,
+
+        ///<summary>
+        /// InsertRow
+        ///</summary>
+        InsertRow,
+    }
+
+    #endregion
+
+    #region ExpandButtonType
+
+    ///<summary>
+    /// Expand button type
+    ///</summary>
+    public enum ExpandButtonType
+    {
+        ///<summary>
+        /// NotSet
+        ///</summary>
+        NotSet = -1,
+
+        ///<summary>
+        /// None
+        ///</summary>
+        None,
+
+        ///<summary>
+        /// Circle
+        ///</summary>
+        Circle,
+
+        ///<summary>
+        /// Square
+        ///</summary>
+        Square,
+
+        ///<summary>
+        /// Triangle
+        ///</summary>
+        Triangle,
+    }
+
+    #endregion
+
+    #region NewRowContext
+
+    ///<summary>
+    /// Context under which the New
+    /// row is being accessed / created
+    ///</summary>
+    public enum NewRowContext
+    {
+        ///<summary>
+        /// RowInit
+        ///</summary>
+        RowInit,
+
+        ///<summary>
+        /// RowActivate
+        ///</summary>
+        RowActivate,
+
+        ///<summary>
+        /// RowDeactivate
+        ///</summary>
+        RowDeactivate,
+    }
+
+    #endregion
+
+    #region RenderParts
+
+    ///<summary>
+    /// Identifies grid 'parts' to be rendered
+    ///</summary>
+    [Flags]
+    public enum RenderParts
+    {
+        ///<summary>
+        /// Nothing to render
+        ///</summary>
+        Nothing = 0,
+
+        ///<summary>
+        /// Background needs to be rendered
+        ///</summary>
+        Background = (1 << 0),
+
+        ///<summary>
+        /// Border needs to be rendered
+        ///</summary>
+        Border = (1 << 1),
+
+        ///<summary>
+        /// Content needs to be rendered
+        ///</summary>
+        Content = (1 << 2),
+
+        ///<summary>
+        /// RowHeader needs to be rendered
+        ///</summary>
+        RowHeader = (1 << 3),
+
+        ///<summary>
+        /// Whitespace needs to be rendered
+        ///</summary>
+        Whitespace = (1 << 4),
+    }
+
+    #endregion
+
+    #region TabSelection
+
+    ///<summary>
+    /// Identifies selection style when the Tab key is pressed
+    ///</summary>
+    public enum TabSelection
+    {
+        ///<summary>
+        /// Previous / Next cell.
+        ///</summary>
+        Cell,
+
+        ///<summary>
+        /// Previous / Next cell in the same row.
+        ///</summary>
+        CellSameRow,
+
+        ///<summary>
+        /// Previous / Next Control.
+        ///</summary>
+        Control,
+    }
+
+    #endregion
+
+    #endregion
+
+    #region EventArgs
+
+    #region GridCellActivatedEventArgs
+
+    /// <summary>
+    /// GridCellActivatedEventArgs
+    /// </summary>
+    public class GridCellActivatedEventArgs : GridEventArgs
+    {
+        #region Private variables
+
+        private readonly GridCell _OldActiveCell;
+        private readonly GridCell _NewActiveCell;
+
+        #endregion
+
+        ///<summary>
+        /// GridCellActivatedEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="oldCell"></param>
+        ///<param name="newCell"></param>
+        public GridCellActivatedEventArgs(
+            GridPanel gridPanel, GridCell oldCell, GridCell newCell)
+            : base(gridPanel)
+        {
+            _OldActiveCell = oldCell;
+            _NewActiveCell = newCell;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the old (previous) ActiveCell
+        /// </summary>
+        public GridCell OldActiveCell
+        {
+            get { return (_OldActiveCell); }
+        }
+
+        /// <summary>
+        /// Gets the new (current) ActiveCell
+        /// </summary>
+        public GridCell NewActiveCell
+        {
+            get { return (_NewActiveCell); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridCellActivatingEventArgs
+
+    /// <summary>
+    /// GridCellActivatingEventArgs
+    /// </summary>
+    public class GridCellActivatingEventArgs : GridCellActivatedEventArgs
+    {
+        #region Private variables
+
+        private bool _Cancel;
+
+        #endregion
+
+        ///<summary>
+        /// GridCellActivatedEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="oldCell"></param>
+        ///<param name="newCell"></param>
+        public GridCellActivatingEventArgs(
+            GridPanel gridPanel, GridCell oldCell, GridCell newCell)
+            : base(gridPanel, oldCell, newCell)
+        {
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets or sets whether to Cancel the operation
+        /// </summary>
+        public bool Cancel
+        {
+            get { return (_Cancel); }
+            set { _Cancel = value; }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridActiveGridChangedEventArgs
+
+    /// <summary>
+    /// ActiveGridChangedEventArgs
+    /// </summary>
+    public class GridActiveGridChangedEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private readonly GridPanel _NewGridPanel;
+        private readonly GridPanel _OldGridPanel;
+
+        #endregion
+
+        ///<summary>
+        /// GridActiveGridChangedEventArgs
+        ///</summary>
+        ///<param name="oldGridPanel"></param>
+        ///<param name="newGridPanel"></param>
+        public GridActiveGridChangedEventArgs(
+            GridPanel oldGridPanel, GridPanel newGridPanel)
+        {
+            _OldGridPanel = oldGridPanel;
+            _NewGridPanel = newGridPanel;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the old (previous) active GridPanel
+        /// </summary>
+        public GridPanel OldGridPanel
+        {
+            get { return (_OldGridPanel); }
+        }
+
+        /// <summary>
+        /// Gets the new (current) active GridPanel
+        /// </summary>
+        public GridPanel NewGridPanel
+        {
+            get { return (_NewGridPanel); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridAfterCheckEventArgs
+
+    /// <summary>
+    /// GridAfterCheckEventArgs
+    /// </summary>
+    public class GridAfterCheckEventArgs : GridEventArgs
+    {
+        #region Private variables
+
+        private GridElement _Item;
+
+        #endregion
+
+        ///<summary>
+        /// GridAfterCheckEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="item"></param>
+        public GridAfterCheckEventArgs(GridPanel gridPanel, GridElement item)
+            : base(gridPanel)
+        {
+            _Item = item;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the Item being checked or unchecked
+        /// </summary>
+        public GridElement Item
+        {
+            get { return (_Item); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridAfterCollapseEventArgs
+
+    /// <summary>
+    /// GridAfterCollapseEventArgs
+    /// </summary>
+    public class GridAfterCollapseEventArgs : GridAfterExpandEventArgs
+    {
+        ///<summary>
+        /// GridRowAfterCollapseEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="gridContainer"></param>
+        ///<param name="expandSource"></param>
+        public GridAfterCollapseEventArgs(GridPanel gridPanel, GridContainer gridContainer, ExpandSource expandSource)
+            : base(gridPanel, gridContainer, expandSource)
+        {
+        }
+    }
+
+    #endregion
+
+    #region GridAfterExpandEventArgs
+
+    /// <summary>
+    /// GridAfterExpandChangeEventArgs
+    /// </summary>
+    public class GridAfterExpandEventArgs : GridEventArgs
+    {
+        #region Private variables
+
+        private GridContainer _GridContainer;
+        private ExpandSource _ExpandSource;
+
+        #endregion
+
+        ///<summary>
+        /// GridAfterExpandChangeEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="gridContainer"></param>
+        ///<param name="expandSource"></param>
+        public GridAfterExpandEventArgs(
+            GridPanel gridPanel, GridContainer gridContainer, ExpandSource expandSource)
+            : base(gridPanel)
+        {
+            _GridContainer = gridContainer;
+            _ExpandSource = expandSource;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the GridContainer being expanded or collapsed
+        /// </summary>
+        public GridContainer GridContainer
+        {
+            get { return (_GridContainer); }
+        }
+
+        /// <summary>
+        /// Returns the source of the operation
+        /// </summary>
+        public ExpandSource ExpandSource
+        {
+            get { return (_ExpandSource); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridBeforeCheckEventArgs
+
+    /// <summary>
+    /// GridRowBeforeExpandEventArgs
+    /// </summary>
+    public class GridBeforeCheckEventArgs : GridAfterCheckEventArgs
+    {
+        #region Private variables
+
+        private bool _Cancel;
+
+        #endregion
+
+        ///<summary>
+        /// GridBeforeCheckEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="gridRow"></param>
+        public GridBeforeCheckEventArgs(GridPanel gridPanel, GridElement gridRow)
+            : base(gridPanel, gridRow)
+        {
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets or sets whether to Cancel the operation
+        /// </summary>
+        public bool Cancel
+        {
+            get { return (_Cancel); }
+            set { _Cancel = value; }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridBeforeCollapseEventArgs
+
+    /// <summary>
+    /// GridBeforeExpandEventArgs
+    /// </summary>
+    public class GridBeforeCollapseEventArgs : GridBeforeExpandEventArgs
+    {
+        ///<summary>
+        /// GridBeforeExpandEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="gridContainer"></param>
+        ///<param name="expandSource"></param>
+        public GridBeforeCollapseEventArgs(GridPanel gridPanel, GridContainer gridContainer, ExpandSource expandSource)
+            : base(gridPanel, gridContainer, expandSource)
+        {
+        }
+    }
+
+    #endregion
+
+    #region GridBeforeExpandEventArgs
+
+    /// <summary>
+    /// GridBeforeExpandEventArgs
+    /// </summary>
+    public class GridBeforeExpandEventArgs : GridAfterExpandEventArgs
+    {
+        #region Private variables
+
+        private bool _Cancel;
+
+        #endregion
+
+        ///<summary>
+        /// GridRowBeforeExpandEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="gridContainer"></param>
+        ///<param name="expandSource"></param>
+        public GridBeforeExpandEventArgs(GridPanel gridPanel, GridContainer gridContainer, ExpandSource expandSource)
+            : base(gridPanel, gridContainer, expandSource)
+        {
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets or sets whether to Cancel the operation
+        /// </summary>
+        public bool Cancel
+        {
+            get { return (_Cancel); }
+            set { _Cancel = value; }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridCellEventArgs
+
+    /// <summary>
+    /// GridCellEventArgs
+    /// </summary>
+    public class GridCellEventArgs : GridEventArgs
+    {
+        #region Private variables
+
+        private readonly GridCell _GridCell;
+
+        #endregion
+
+        ///<summary>
+        /// GridCellEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="gridCell"></param>
+        public GridCellEventArgs(GridPanel gridPanel, GridCell gridCell)
+            : base(gridPanel)
+        {
+            _GridCell = gridCell;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated GridCell
+        /// </summary>
+        public GridCell GridCell
+        {
+            get { return (_GridCell); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridCellClickEventArgs
+
+    /// <summary>
+    /// GridCellClickEventArgs
+    /// </summary>
+    public class GridCellClickEventArgs : GridCellEventArgs
+    {
+        #region Private variables
+
+        private bool _Cancel;
+        private MouseEventArgs _MouseEventArgs;
+
+        #endregion
+
+        ///<summary>
+        /// GridCellClickEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="gridCell"></param>
+        ///<param name="e"></param>
+        public GridCellClickEventArgs(
+            GridPanel gridPanel, GridCell gridCell, MouseEventArgs e)
+            : base(gridPanel, gridCell)
+        {
+            _MouseEventArgs = e;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets or sets whether to cancel the operation
+        /// </summary>
+        public bool Cancel
+        {
+            get { return (_Cancel); }
+            set { _Cancel = value; }
+        }
+
+        /// <summary>
+        /// Gets the associated MouseEventArgs
+        /// </summary>
+        public MouseEventArgs MouseEventArgs
+        {
+            get { return (_MouseEventArgs); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridCellDoubleClickEventArgs
+
+    /// <summary>
+    /// GridCellDoubleClickEventArgs
+    /// </summary>
+    public class GridCellDoubleClickEventArgs : GridCellClickEventArgs
+    {
+        ///<summary>
+        /// GridCellDoubleClickEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="gridCell"></param>
+        ///<param name="e"></param>
+        public GridCellDoubleClickEventArgs(GridPanel gridPanel, GridCell gridCell, MouseEventArgs e)
+            : base(gridPanel, gridCell, e)
+        {
+        }
+    }
+
+    #endregion
+
+    #region GridCellInfoEnterEventArgs
+
+    /// <summary>
+    /// GridCellInfoEnterEventArgs
+    /// </summary>
+    public class GridCellInfoEnterEventArgs : GridCellEventArgs
+    {
+        #region Private variables
+
+        private bool _Cancel;
+        private Point _Location;
+        private Control _Control;
+
+        private System.Windows.Forms.ToolTip _ToolTip;
+
+        #endregion
+
+        ///<summary>
+        /// GridCellInfoEnterEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="gridCell"></param>
+        ///<param name="control"></param>
+        ///<param name="pt"></param>
+        public GridCellInfoEnterEventArgs(GridPanel gridPanel,
+            GridCell gridCell, Control control, System.Windows.Forms.ToolTip toolTip, Point pt)
+            : base(gridPanel, gridCell)
+        {
+            _Location = pt;
+            _Control = control;
+            _ToolTip = toolTip;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets or sets whether to cancel the default operation
+        /// </summary>
+        public bool Cancel
+        {
+            get { return (_Cancel); }
+            set { _Cancel = value; }
+        }
+
+        /// <summary>
+        /// Gets the associated Control associated with the CellInfo (can
+        /// either be the GridControl or CellInfoWindow - depending upon
+        /// whether an edit is currently active or not).
+        /// </summary>
+        public Control Control
+        {
+            get { return (_Control); }
+        }
+
+        // <summary>
+        /// Gets the associated event ToolTip control
+        /// </summary>
+        public System.Windows.Forms.ToolTip ToolTip
+        {
+            get { return (_ToolTip); }
+        }
+
+        // <summary>
+        /// Gets the associated event Location
+        /// </summary>
+        public Point Location
+        {
+            get { return (_Location); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridCellInfoLeaveEventArgs
+
+    /// <summary>
+    /// GridCellInfoLeaveEventArgs
+    /// </summary>
+    public class GridCellInfoLeaveEventArgs : GridCellEventArgs
+    {
+        #region Private variables
+
+        private Control _Control;
+        private System.Windows.Forms.ToolTip _ToolTip;
+
+        #endregion
+
+        ///<summary>
+        /// GridRowInfoLeaveEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="gridCell"></param>
+        ///<param name="control"></param>
+        public GridCellInfoLeaveEventArgs(GridPanel gridPanel,
+            GridCell gridCell, Control control, System.Windows.Forms.ToolTip toolTip)
+            : base(gridPanel, gridCell)
+        {
+            _Control = control;
+            _ToolTip = toolTip;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated Control associated with the CellInfo (can
+        /// either be the GridControl or CellInfoWindow - depending upon
+        /// whether an edit is currently active or not).
+        /// </summary>
+        public Control Control
+        {
+            get { return (_Control); }
+        }
+
+        // <summary>
+        /// Gets the associated event ToolTip control
+        /// </summary>
+        public System.Windows.Forms.ToolTip ToolTip
+        {
+            get { return (_ToolTip); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridCellMouseEventArgs
+
+    /// <summary>
+    /// GridCellMouseEventArgs
+    /// </summary>
+    public class GridCellMouseEventArgs : MouseEventArgs
+    {
+        #region Private variables
+
+        private readonly GridPanel _GridPanel;
+        private readonly GridCell _GridCell;
+
+        #endregion
+
+        ///<summary>
+        /// GridCellMouseEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="gridCell"></param>
+        ///<param name="ev"></param>
+        public GridCellMouseEventArgs(GridPanel gridPanel, GridCell gridCell, MouseEventArgs ev)
+            : base(ev.Button, ev.Clicks, ev.X, ev.Y, ev.Delta)
+        {
+            _GridPanel = gridPanel;
+            _GridCell = gridCell;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated GridCell
+        /// </summary>
+        public GridCell GridCell
+        {
+            get { return (_GridCell); }
+        }
+
+        /// <summary>
+        /// Gets the associated GridPanel
+        /// </summary>
+        public GridPanel GridPanel
+        {
+            get { return (_GridPanel); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridCellUserFunctionEventArgs
+
+    /// <summary>
+    /// GridCellUserFunctionEventArgs
+    /// </summary>
+    public class GridCellUserFunctionEventArgs : GridCellEventArgs
+    {
+        #region Private variables
+
+        private object[] _Args;
+        private object _Result;
+
+        #endregion
+
+        ///<summary>
+        /// GridCellUserFunctionEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="gridCell"></param>
+        ///<param name="args"></param>
+        ///<param name="result"></param>
+        public GridCellUserFunctionEventArgs(
+            GridPanel gridPanel, GridCell gridCell, object[] args, object result)
+            : base(gridPanel, gridCell)
+        {
+            _Args = args;
+            _Result = result;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets or sets the associated function arguments
+        /// </summary>
+        public object[] Args
+        {
+            get { return (_Args); }
+            set { _Args = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the associated function result
+        /// </summary>
+        public object Result
+        {
+            get { return (_Result); }
+            set { _Result = value; }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridCellValidatedEventArgs
+
+    /// <summary>
+    /// GridCellValidatedEventArgs
+    /// </summary>
+    public class GridCellValidatedEventArgs : GridCellEventArgs
+    {
+        ///<summary>
+        /// GridCellValidatedEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="gridCell"></param>
+        public GridCellValidatedEventArgs(GridPanel gridPanel, GridCell gridCell)
+            : base(gridPanel, gridCell)
+        {
+        }
+    }
+
+    #endregion
+
+    #region GridCellValidatingEventArgs
+
+    /// <summary>
+    /// GridCellValidatingEventArgs
+    /// </summary>
+    public class GridCellValidatingEventArgs : GridCellEventArgs
+    {
+        #region Private variables
+
+        private bool _Cancel;
+
+        private object _Value;
+        private object _FormattedValue;
+
+        #endregion
+
+        ///<summary>
+        /// GridCellValidatingEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="gridCell"></param>
+        ///<param name="value"></param>
+        ///<param name="formattedValue"></param>
+        public GridCellValidatingEventArgs(GridPanel gridPanel,
+            GridCell gridCell, object value, object formattedValue)
+            : base(gridPanel, gridCell)
+        {
+            _Value = value;
+            _FormattedValue = formattedValue;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets or sets the Value to validate
+        /// </summary>
+        public object Value
+        {
+            get { return (_Value); }
+            set { _Value = value; }
+        }
+
+        /// <summary>
+        /// Gets the formatted Value
+        /// </summary>
+        public object FormattedValue
+        {
+            get { return (_FormattedValue); }
+        }
+
+        /// <summary>
+        /// Gets or sets whether to cancel the operation
+        /// resulting in the cell validation
+        /// </summary>
+        public bool Cancel
+        {
+            get { return (_Cancel); }
+            set { _Cancel = value; }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridCellValueChangedEventArgs
+
+    /// <summary>
+    /// GridCellValueChangedEventArgs
+    /// </summary>
+    public class GridCellValueChangedEventArgs : GridCellEventArgs
+    {
+        #region Private variables
+
+        private object _OldValue;
+        private object _NewValue;
+        private DataContext _DataContext;
+
+        #endregion
+
+        ///<summary>
+        /// GridCellValueChangedEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="gridCell"></param>
+        ///<param name="oldValue"></param>
+        ///<param name="newValue"></param>
+        ///<param name="context"></param>
+        public GridCellValueChangedEventArgs(GridPanel gridPanel,
+            GridCell gridCell, object oldValue, object newValue, DataContext context)
+            : base(gridPanel, gridCell)
+        {
+            _OldValue = oldValue;
+            _NewValue = newValue;
+
+            _DataContext = context;
+        }
+
+        #region Public properties
+
+        ///<summary>
+        /// Gets the context under which
+        /// the call value was changed
+        ///</summary>
+        public DataContext DataContext
+        {
+            get { return (_DataContext); }
+        }      
+
+        ///<summary>
+        /// Gets the old cell Value
+        ///</summary>
+        public object OldValue
+        {
+            get { return (_OldValue); }
+        }
+
+        ///<summary>
+        /// Gets the new cell Value
+        ///</summary>
+        public object NewValue
+        {
+            get { return (_NewValue); }
+        }      
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridColumnEventArgs
+
+    /// <summary>
+    /// GridColumnEventArgs
+    /// </summary>
+    public class GridColumnEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private GridPanel _GridPanel;
+        private GridColumn _GridColumn;
+
+        #endregion
+
+        ///<summary>
+        /// GridColumnEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="gridColumn"></param>
+        public GridColumnEventArgs(GridPanel gridPanel, GridColumn gridColumn)
+        {
+            _GridPanel = gridPanel;
+            _GridColumn = gridColumn;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets th associated GridPanel
+        /// </summary>
+        public GridPanel GridPanel
+        {
+            get { return (_GridPanel); }
+        }
+
+        /// <summary>
+        /// Gets the associated GridColumn
+        /// </summary>
+        public GridColumn GridColumn
+        {
+            get { return (_GridColumn); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridColumnHeaderClickEventArgs
+
+    /// <summary>
+    /// GridColumnHeaderClickEventArgs
+    /// </summary>
+    public class GridColumnHeaderClickEventArgs : GridColumnEventArgs
+    {
+        #region Private variables
+
+        private bool _Cancel;
+        private MouseEventArgs _MouseEventArgs;
+
+        #endregion
+
+        ///<summary>
+        /// GridColumnHeaderClickEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="gridColumn"></param>
+        ///<param name="e"></param>
+        public GridColumnHeaderClickEventArgs(
+            GridPanel gridPanel, GridColumn gridColumn, MouseEventArgs e)
+            : base(gridPanel, gridColumn)
+        {
+            _MouseEventArgs = e;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets or sets whether to cancel the operation
+        /// </summary>
+        public bool Cancel
+        {
+            get { return (_Cancel); }
+            set { _Cancel = value; }
+        }
+
+        /// <summary>
+        /// Gets the associated MouseEventArgs
+        /// </summary>
+        public MouseEventArgs MouseEventArgs
+        {
+            get { return (_MouseEventArgs); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridColumnHeaderEventArgs
+
+    /// <summary>
+    /// GridColumnHeaderEventArgs
+    /// </summary>
+    public class GridColumnHeaderEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private GridColumnHeader _GridColumnHeader;
+
+        #endregion
+
+        ///<summary>
+        /// GridColumnHeaderEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="gridColumnHeader"></param>
+        public GridColumnHeaderEventArgs(GridColumnHeader gridColumnHeader)
+        {
+            _GridColumnHeader = gridColumnHeader;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets th associated GridPanel
+        /// </summary>
+        public GridPanel GridPanel
+        {
+            get { return (_GridColumnHeader.GridPanel); }
+        }
+
+        /// <summary>
+        /// Gets the associated GridColumnHeader
+        /// </summary>
+        public GridColumnHeader GridColumnHeader
+        {
+            get { return (_GridColumnHeader); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridColumnHeaderMarkupLinkClickEventArgs
+
+    /// <summary>
+    /// GridColumnHeaderMarkupLinkClickEventArgs
+    /// </summary>
+    public class GridColumnHeaderMarkupLinkClickEventArgs : GridColumnEventArgs
+    {
+        #region Private variables
+
+        private string _HRef;
+        private string _Name;
+
+        #endregion
+
+        ///<summary>
+        /// GridColumnHeaderMarkupLinkClickEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="gridColumn"></param>
+        ///<param name="name"></param>
+        ///<param name="href"></param>
+        public GridColumnHeaderMarkupLinkClickEventArgs(
+            GridPanel gridPanel, GridColumn gridColumn, string name, string href)
+            : base(gridPanel, gridColumn)
+        {
+            _HRef = href;
+            _Name = name;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated HyperLink HRef
+        /// </summary>
+        public string HRef
+        {
+            get { return (_HRef); }
+        }
+
+        /// <summary>
+        /// Gets the associated HyperLink Name
+        /// </summary>
+        public string Name
+        {
+            get { return (_Name); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridColumnHeaderDoubleClickEventArgs
+
+    /// <summary>
+    /// GridColumnHeaderDoubleClickEventArgs
+    /// </summary>
+    public class GridColumnHeaderDoubleClickEventArgs : GridColumnHeaderClickEventArgs
+    {
+        ///<summary>
+        /// GridColumnHeaderDoubleClickEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="gridColumn"></param>
+        ///<param name="e"></param>
+        public GridColumnHeaderDoubleClickEventArgs(
+            GridPanel gridPanel, GridColumn gridColumn, MouseEventArgs e)
+            : base(gridPanel, gridColumn, e)
+        {
+        }
+    }
+
+    #endregion
+
+    #region GridColumnHeaderMouseEventArgs
+
+    /// <summary>
+    /// GridColumnHeaderMouseEventArgs
+    /// </summary>
+    public class GridColumnHeaderMouseEventArgs : MouseEventArgs
+    {
+        #region Private variables
+
+        private readonly GridColumnHeader _GridColumnHeader;
+
+        #endregion
+
+        ///<summary>
+        /// GridColumnHeaderMouseEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="gridCell"></param>
+        ///<param name="ev"></param>
+        public GridColumnHeaderMouseEventArgs(GridColumnHeader gridColumnHeader, MouseEventArgs ev)
+            : base(ev.Button, ev.Clicks, ev.X, ev.Y, ev.Delta)
+        {
+            _GridColumnHeader = gridColumnHeader;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated GridColumnHeader
+        /// </summary>
+        public GridColumnHeader GridColumnHeader
+        {
+            get { return (_GridColumnHeader); }
+        }
+
+        /// <summary>
+        /// Gets the associated GridPanel
+        /// </summary>
+        public GridPanel GridPanel
+        {
+            get { return (_GridColumnHeader.GridPanel); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridColumnGroupHeaderClickEventArgs
+
+    /// <summary>
+    /// GridColumnGroupHeaderClickEventArgs
+    /// </summary>
+    public class GridColumnGroupHeaderClickEventArgs : GridEventArgs
+    {
+        #region Private variables
+
+        private GridColumnHeader _ColumnHeader;
+        private ColumnGroupHeader _GroupHeader;
+        private MouseEventArgs _MouseEventArgs;
+
+        private bool _Cancel;
+
+        #endregion
+
+        ///<summary>
+        /// GridColumnGroupHeaderClickEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="header"></param>
+        ///<param name="groupHeader"></param>
+        ///<param name="e"></param>
+        public GridColumnGroupHeaderClickEventArgs(GridPanel gridPanel,
+            GridColumnHeader header, ColumnGroupHeader groupHeader, MouseEventArgs e)
+            : base(gridPanel)
+        {
+            _ColumnHeader = header;
+            _GroupHeader = groupHeader;
+            _MouseEventArgs = e;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets or sets whether to cancel the operation
+        /// </summary>
+        public bool Cancel
+        {
+            get { return (_Cancel); }
+            set { _Cancel = value; }
+        }
+
+        /// <summary>
+        /// Gets the associated ColumnHeader
+        /// </summary>
+        public GridColumnHeader ColumnHeader
+        {
+            get { return (_ColumnHeader); }
+        }
+
+        /// <summary>
+        /// Gets the associated GroupHeader
+        /// </summary>
+        public ColumnGroupHeader GroupHeader
+        {
+            get { return (_GroupHeader); }
+        }
+
+        /// <summary>
+        /// Gets the associated MouseEventArgs
+        /// </summary>
+        public MouseEventArgs MouseEventArgs
+        {
+            get { return (_MouseEventArgs); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridColumnGroupHeaderMarkupLinkClickEventArgs
+
+    /// <summary>
+    /// GridColumnGroupHeaderMarkupLinkClickEventArgs
+    /// </summary>
+    public class GridColumnGroupHeaderMarkupLinkClickEventArgs : GridEventArgs
+    {
+        #region Private variables
+
+        private GridColumnHeader _ColumnHeader;
+        private ColumnGroupHeader _GroupHeader;
+
+        private string _HRef;
+        private string _Name;
+
+        #endregion
+
+        ///<summary>
+        /// GridColumnGroupHeaderMarkupLinkClickEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="groupHeader"></param>
+        ///<param name="name"></param>
+        ///<param name="href"></param>
+        ///<param name="header"></param>
+        public GridColumnGroupHeaderMarkupLinkClickEventArgs(GridPanel gridPanel,
+            GridColumnHeader header, ColumnGroupHeader groupHeader, string name, string href)
+            : base(gridPanel)
+        {
+            _ColumnHeader = header;
+            _GroupHeader = groupHeader;
+
+            _HRef = href;
+            _Name = name;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated ColumnHeader
+        /// </summary>
+        public GridColumnHeader ColumnHeader
+        {
+            get { return (_ColumnHeader); }
+        }
+
+        /// <summary>
+        /// Gets the associated GroupHeader
+        /// </summary>
+        public ColumnGroupHeader GroupHeader
+        {
+            get { return (_GroupHeader); }
+        }
+
+        /// <summary>
+        /// Gets the associated HyperLink HRef
+        /// </summary>
+        public string HRef
+        {
+            get { return (_HRef); }
+        }
+
+        /// <summary>
+        /// Gets the associated HyperLink Name
+        /// </summary>
+        public string Name
+        {
+            get { return (_Name); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridColumnGroupHeaderDoubleClickEventArgs
+
+    /// <summary>
+    /// GridColumnGroupHeaderDoubleClickEventArgs
+    /// </summary>
+    public class GridColumnGroupHeaderDoubleClickEventArgs : GridColumnGroupHeaderClickEventArgs
+    {
+        ///<summary>
+        /// GridColumnGroupHeaderDoubleClickEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="groupHeader"></param>
+        ///<param name="e"></param>
+        ///<param name="header"></param>
+        public GridColumnGroupHeaderDoubleClickEventArgs(GridPanel gridPanel,
+            GridColumnHeader header, ColumnGroupHeader groupHeader, MouseEventArgs e)
+            : base(gridPanel, header, groupHeader, e)
+        {
+        }
+    }
+
+    #endregion
+
+    #region GridColumnGroupHeaderResizedEventArgs
+
+    /// <summary>
+    /// GridColumnGroupHeaderResizedEventArgs
+    /// </summary>
+    public class GridColumnGroupHeaderResizedEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private GridPanel _GridPanel;
+        private ColumnGroupHeader _GroupHeader;
+        private Size _OldSize;
+
+        #endregion
+
+        ///<summary>
+        /// GridColumnGroupHeaderResizedEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="groupHeader"></param>
+        ///<param name="oldSize"></param>
+        public GridColumnGroupHeaderResizedEventArgs(
+            GridPanel gridPanel, ColumnGroupHeader groupHeader, Size oldSize)
+        {
+            _GridPanel = gridPanel;
+            _GroupHeader = groupHeader;
+            _OldSize = oldSize;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets th associated GridPanel
+        /// </summary>
+        public GridPanel GridPanel
+        {
+            get { return (_GridPanel); }
+        }
+
+        /// <summary>
+        /// Gets the associated GridHeader
+        /// </summary>
+        public ColumnGroupHeader GroupHeader
+        {
+            get { return (_GroupHeader); }
+        }
+
+        /// <summary>
+        /// Gets the OldSize
+        /// </summary>
+        public Size OldSize
+        {
+            get { return (_OldSize); }
+        }
+
+        /// <summary>
+        /// Gets the NewSize
+        /// </summary>
+        public Size NewSize
+        {
+            get { return (_GroupHeader.Size); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridColumnGroupedEventArgs
+
+    /// <summary>
+    /// GridColumnGroupedEventArgs
+    /// </summary>
+    public class GridColumnGroupedEventArgs : GridColumnEventArgs
+    {
+        #region Private variables
+
+        private GridGroup _GridGroup;
+
+        #endregion
+
+        ///<summary>
+        /// GridColumnEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="gridColumn"></param>
+        ///<param name="gridGroup"></param>
+        public GridColumnGroupedEventArgs(
+            GridPanel gridPanel, GridColumn gridColumn, GridGroup gridGroup)
+            : base(gridPanel, gridColumn)
+        {
+            _GridGroup = gridGroup;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets th associated GridGroup
+        /// </summary>
+        public GridGroup GridGroup
+        {
+            get { return (_GridGroup); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridCompareElementsEventArgs
+
+    /// <summary>
+    /// GridCompareElementsEventArgs
+    /// </summary>
+    public class GridCompareElementsEventArgs : GridCancelEventArgs
+    {
+        #region Private variables
+
+        private readonly GridElement _ElementA;
+        private readonly GridElement _ElementB;
+
+        private int _Result;
+
+        #endregion
+
+        ///<summary>
+        /// GridCompareElementsEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="a"></param>
+        ///<param name="b"></param>
+        public GridCompareElementsEventArgs(
+            GridPanel gridPanel, GridElement a, GridElement b)
+            : base(gridPanel)
+        {
+            _ElementA = a;
+            _ElementB = b;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the left-hand element of the comparison
+        /// </summary>
+        public GridElement ElementA
+        {
+            get { return (_ElementA); }
+        }
+
+        /// <summary>
+        /// Gets the right-hand element of the comparison
+        /// </summary>
+        public GridElement ElementB
+        {
+            get { return (_ElementB); }
+        }
+
+        /// <summary>
+        /// Gets or sets the result of the element compare.
+        /// -1 = ElementA is less than ElementB
+        /// 0 = ElementA is equal to ElementB
+        /// +1 = ElementA is greater than ElementB
+        /// </summary>
+        public int Result
+        {
+            get { return (_Result); }
+            set { _Result = value; }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridDataBindingStartEventArgs
+
+    /// <summary>
+    /// GridDataBindingStartEventArgs
+    /// </summary>
+    public class GridDataBindingStartEventArgs : GridRowCancelEventArgs
+    {
+        #region Private variables
+
+        private string _TableName;
+        private bool _AutoGenerateColumns;
+        private ProcessChildRelations _ProcessChildRelations;
+
+        #endregion
+
+        ///<summary>
+        /// GridDataBindingStartEventArgs
+        ///</summary>
+        ///<param name="gridPanel">Associated GridPanel</param>
+        ///<param name="row">Associated GridRow</param>
+        ///<param name="tableName">Name of table being bound to</param>
+        ///<param name="autoGenerateColumns">Whether to auto-generate columns</param>
+        ///<param name="crProcess"></param>
+        public GridDataBindingStartEventArgs(GridPanel gridPanel,
+            GridRow row, string tableName, bool autoGenerateColumns, ProcessChildRelations crProcess)
+            : base(gridPanel, row)
+        {
+            _TableName = tableName;
+            _AutoGenerateColumns = autoGenerateColumns;
+            _ProcessChildRelations = crProcess;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets or sets whether to auto-generate
+        /// the nested table columns
+        /// </summary>
+        public bool AutoGenerateColumns
+        {
+            get { return (_AutoGenerateColumns); }
+            set { _AutoGenerateColumns = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets how Child Relations
+        /// are processed by the SuperGrid
+        /// </summary>
+        public ProcessChildRelations ProcessChildRelations
+        {
+            get { return (_ProcessChildRelations); }
+            set { _ProcessChildRelations = value; }
+        }
+
+        /// <summary>
+        /// Gets the nested table name being bound
+        /// </summary>
+        public string TableName
+        {
+            get { return (_TableName); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridDataBindingCompleteEventArgs
+
+    /// <summary>
+    /// GridDataBindingCompleteEventArgs
+    /// </summary>
+    public class GridDataBindingCompleteEventArgs : GridEventArgs
+    {
+        #region Private variables
+
+        private ListChangedType _ListChangedType;
+
+        #endregion
+
+        ///<summary>
+        /// GridDataBindingCompleteEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        public GridDataBindingCompleteEventArgs(GridPanel gridPanel)
+            : base(gridPanel)
+        {
+            _ListChangedType = ListChangedType.Reset;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets how the list was changed
+        /// </summary>
+        public ListChangedType ListChangedType
+        {
+            get { return (_ListChangedType); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridDataErrorEventArgs
+
+    /// <summary>
+    /// GridDataErrorEventArgs
+    /// </summary>
+    public class GridDataErrorEventArgs : CancelEventArgs
+    {
+        #region Private variables
+
+        private GridPanel _GridPanel;
+        private GridCell _GridCell;
+        private Exception _Exception;
+        private DataContext _ErrorContext;
+
+        private object _Value;
+
+        private bool _Retry;
+        private bool _ThrowException;
+
+        #endregion
+
+        ///<summary>
+        /// GridDataErrorEventArgs
+        ///</summary>
+        public GridDataErrorEventArgs(
+            GridPanel gridPanel, GridCell gridCell,
+            Exception exception, DataContext context, object value)
+        {
+            _GridPanel = gridPanel;
+            _GridCell = gridCell;
+            _Exception = exception;
+            _ErrorContext = context;
+            _Value = value;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated GridPanel
+        /// </summary>
+        public GridPanel GridPanel
+        {
+            get { return (_GridPanel); }
+        }
+
+        /// <summary>
+        /// Gets the associated cell
+        /// </summary>
+        public GridCell GridCell
+        {
+            get { return (_GridCell); }
+        }
+
+        /// <summary>
+        /// Gets the context under which the Exception was thrown
+        /// </summary>
+        public DataContext ErrorContext
+        {
+            get { return (_ErrorContext); }
+        }
+
+        /// <summary>
+        /// Gets the Exception that was thrown
+        /// </summary>
+        public Exception Exception
+        {
+            get { return (_Exception); }
+        }
+
+        /// <summary>
+        /// Gets or sets whether the grid should retry the operation
+        /// </summary>
+        public bool Retry
+        {
+            get { return (_Retry); }
+            set { _Retry = value; }
+        }
+
+        /// <summary>
+        /// Gets whether the exception should be re-thrown by the grid
+        /// </summary>
+        public bool ThrowException
+        {
+            get { return (_ThrowException); }
+            set { _ThrowException = value; }
+        }
+
+        /// <summary>
+        /// Gets the value that caused the Exception
+        /// </summary>
+        public object Value
+        {
+            get { return (_Value); }
+            set { _Value = value; }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridDataFilteringStartEventArgs
+
+    /// <summary>
+    /// GridDataFilteringStartEventArgs
+    /// </summary>
+    public class GridDataFilteringStartEventArgs : GridCancelEventArgs
+    {
+        ///<summary>
+        /// GridDataFilteringStartEventArgs
+        ///</summary>
+        ///<param name="gridPanel">Associated GridPanel</param>
+        public GridDataFilteringStartEventArgs(GridPanel gridPanel)
+            : base(gridPanel)
+        {
+        }
+    }
+
+    #endregion
+
+    #region GridDataFilteringCompleteEventArgs
+
+    /// <summary>
+    /// GridDataFilteringCompleteEventArgs
+    /// </summary>
+    public class GridDataFilteringCompleteEventArgs : GridEventArgs
+    {
+        ///<summary>
+        /// GridDataFilteringCompleteEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        public GridDataFilteringCompleteEventArgs(GridPanel gridPanel)
+            : base(gridPanel)
+        {
+        }
+    }
+
+    #endregion
+
+    #region GridFilterBeginEditEventArgs
+
+    /// <summary>
+    /// GridFilterBeginEditEventArgs
+    /// </summary>
+    public class GridFilterBeginEditEventArgs : GridFilterEventArgs
+    {
+        #region Private variables
+
+        private bool _Cancel;
+        private FilterPanel _FilterPanel;
+
+        #endregion
+
+        ///<summary>
+        /// GridFilterBeginEditEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="gridColumn"></param>
+        ///<param name="filterPanel"></param>
+        public GridFilterBeginEditEventArgs(
+            GridPanel gridPanel, GridColumn gridColumn, FilterPanel filterPanel)
+            : base(gridPanel, gridColumn)
+        {
+            _FilterPanel = filterPanel;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets or sets whether to cancel the operation
+        /// </summary>
+        public bool Cancel
+        {
+            get { return (_Cancel); }
+            set { _Cancel = value; }
+        }
+
+        /// <summary>
+        /// Gets the associated FilterPanel
+        /// </summary>
+        public FilterPanel FilterPanel
+        {
+            get { return (_FilterPanel); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridFilterCancelEditEventArgs
+
+    /// <summary>
+    /// GridFilterCancelEditEventArgs
+    /// </summary>
+    public class GridFilterCancelEditEventArgs : GridFilterEventArgs
+    {
+        #region Private variables
+
+        private FilterPanel _FilterPanel;
+
+        #endregion
+
+        ///<summary>
+        /// GridFilterCancelEditEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="gridColumn"></param>
+        ///<param name="filterPanel"></param>
+        public GridFilterCancelEditEventArgs(
+            GridPanel gridPanel, GridColumn gridColumn, FilterPanel filterPanel)
+            : base(gridPanel, gridColumn)
+        {
+            _FilterPanel = filterPanel;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated FilterPanel
+        /// </summary>
+        public FilterPanel FilterPanel
+        {
+            get { return (_FilterPanel); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridFilterColumnErrorEventArgs
+
+    /// <summary>
+    /// GridFilterColumnErrorEventArgs
+    /// </summary>
+    public class GridFilterColumnErrorEventArgs : GridFilterRowErrorEventArgs
+    {
+        #region Private variables
+
+        private GridColumn _GridColumn;
+
+        #endregion
+
+        ///<summary>
+        /// GridFilterColumnErrorEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="gridRow"></param>
+        ///<param name="gridColumn"></param>
+        ///<param name="exp"></param>
+        ///<param name="filteredOut"></param>
+        ///<param name="throwException"></param>
+        public GridFilterColumnErrorEventArgs(GridPanel gridPanel, GridRow gridRow,
+            GridColumn gridColumn, Exception exp, bool filteredOut, bool throwException, bool postError)
+            : base(gridPanel, gridRow, exp, filteredOut, throwException, postError)
+        {
+            _GridColumn = gridColumn;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated GridColumn
+        /// </summary>
+        public GridColumn GridColumn
+        {
+            get { return (_GridColumn); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridFilterEditValueChangedEventArgs
+
+    /// <summary>
+    /// GridFilterEditValueChangedEventArgs
+    /// </summary>
+    public class GridFilterEditValueChangedEventArgs : GridFilterEventArgs
+    {
+        #region Private variables
+
+        private object _OldValue;
+
+        private object _NewValue;
+        private object _NewDisplayValue;
+        private string _NewExpr;
+
+        private FilterPanel _FilterPanel;
+
+        private bool _Cancel;
+
+        #endregion
+
+        ///<summary>
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="gridColumn"></param>
+        ///<param name="fp"></param>
+        ///<param name="oldValue"></param>
+        ///<param name="newValue"></param>
+        ///<param name="newDisplayValue"></param>
+        ///<param name="newExpr"></param>
+        public GridFilterEditValueChangedEventArgs(GridPanel gridPanel, GridColumn gridColumn,
+            FilterPanel fp, object oldValue, object newValue, object newDisplayValue, string newExpr)
+            : base(gridPanel, gridColumn)
+        {
+            _FilterPanel = fp;
+
+            _OldValue = oldValue;
+
+            _NewValue = newValue;
+            _NewDisplayValue = newDisplayValue;
+            _NewExpr = newExpr;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets or sets whether to cancel the operation
+        /// </summary>
+        public bool Cancel
+        {
+            get { return (_Cancel); }
+            set { _Cancel = value; }
+        }
+
+        ///<summary>
+        /// Gets the associated FilterPanel
+        ///</summary>
+        public FilterPanel FilterPanel
+        {
+            get { return (_FilterPanel); }
+        }
+
+        ///<summary>
+        /// Gets the old filter value
+        ///</summary>
+        public object OldValue
+        {
+            get { return (_OldValue); }
+        }
+
+        ///<summary>
+        /// Gets or sets the new filter value
+        ///</summary>
+        public object NewValue
+        {
+            get { return (_NewValue); }
+            set { _NewValue = value; }
+        }
+
+        ///<summary>
+        /// Gets or sets the new filter display value
+        ///</summary>
+        public object NewDisplayValue
+        {
+            get { return (_NewDisplayValue); }
+            set { _NewDisplayValue = value; }
+        }
+
+        ///<summary>
+        /// Gets or sets the new filter expression
+        ///</summary>
+        public string NewExpr
+        {
+            get { return (_NewExpr); }
+            set { _NewExpr = value; }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridFilterEndEditEventArgs
+
+    /// <summary>
+    /// GridFilterEndEditEventArgs
+    /// </summary>
+    public class GridFilterEndEditEventArgs : GridFilterEventArgs
+    {
+        #region Private variables
+
+        private FilterPanel _FilterPanel;
+
+        #endregion
+        
+        ///<summary>
+        /// GridFilterEndEditEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="gridColumn"></param>
+        ///<param name="filterPanel"></param>
+        public GridFilterEndEditEventArgs(
+            GridPanel gridPanel, GridColumn gridColumn, FilterPanel filterPanel)
+            : base(gridPanel, gridColumn)
+        {
+            _FilterPanel = filterPanel;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated FilterPanel
+        /// </summary>
+        public FilterPanel FilterPanel
+        {
+            get { return (_FilterPanel); }
+        }
+
+        #endregion
+
+    }
+
+    #endregion
+
+    #region GridFilterEventArgs
+
+    /// <summary>
+    /// GridFilterEventArgs
+    /// </summary>
+    public class GridFilterEventArgs : GridColumnEventArgs
+    {
+        ///<summary>
+        /// GridFilterEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="gridColumn"></param>
+        public GridFilterEventArgs(GridPanel gridPanel, GridColumn gridColumn)
+            : base(gridPanel, gridColumn)
+        {
+        }
+    }
+
+    #endregion
+
+    #region GridFilterHeaderClickEventArgs
+
+    /// <summary>
+    /// GridFilterHeaderClickEventArgs
+    /// </summary>
+    public class GridFilterHeaderClickEventArgs : GridColumnEventArgs
+    {
+        #region Private variables
+
+        private bool _Cancel;
+        private MouseEventArgs _MouseEventArgs;
+
+        #endregion
+
+        ///<summary>
+        /// GridFilterHeaderClickEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="gridColumn"></param>
+        ///<param name="e"></param>
+        public GridFilterHeaderClickEventArgs(
+            GridPanel gridPanel, GridColumn gridColumn, MouseEventArgs e)
+            : base(gridPanel, gridColumn)
+        {
+            _MouseEventArgs = e;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets or sets whether to cancel the operation
+        /// </summary>
+        public bool Cancel
+        {
+            get { return (_Cancel); }
+            set { _Cancel = value; }
+        }
+
+        /// <summary>
+        /// Gets the associated MouseEventArgs
+        /// </summary>
+        public MouseEventArgs MouseEventArgs
+        {
+            get { return (_MouseEventArgs); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridFilterHelpClosingEventArgs
+
+    /// <summary>
+    /// GridFilterHelpClosingEventArgs
+    /// </summary>
+    public class GridFilterHelpClosingEventArgs : GridFilterEventArgs
+    {
+        #region Private variables
+
+        private SampleExpr _SampleExpr;
+
+        #endregion
+
+        ///<summary>
+        /// GridFilterHelpClosingEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="gridColumn"></param>
+        ///<param name="sampleExpr"></param>
+        public GridFilterHelpClosingEventArgs(
+            GridPanel gridPanel, GridColumn gridColumn, SampleExpr sampleExpr)
+            : base(gridPanel, gridColumn)
+        {
+            _SampleExpr = sampleExpr;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated Sample Expression help window
+        /// </summary>
+        public SampleExpr SampleExpr
+        {
+            get { return (_SampleExpr); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridFilterHelpOpeningEventArgs
+
+    /// <summary>
+    /// GridFilterHelpOpeningEventArgs
+    /// </summary>
+    public class GridFilterHelpOpeningEventArgs : GridFilterEventArgs
+    {
+        #region Private variables
+
+        private bool _Cancel;
+        private SampleExpr _SampleExpr;
+
+        #endregion
+
+        ///<summary>
+        /// GridFilterHelpOpeningEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="gridColumn"></param>
+        ///<param name="sampleExpr"></param>
+        public GridFilterHelpOpeningEventArgs(
+            GridPanel gridPanel, GridColumn gridColumn, SampleExpr sampleExpr)
+            : base(gridPanel, gridColumn)
+        {
+            _SampleExpr = sampleExpr;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets or sets whether to cancel the operation
+        /// </summary>
+        public bool Cancel
+        {
+            get { return (_Cancel); }
+            set { _Cancel = value; }
+        }
+
+        /// <summary>
+        /// Gets the associated Sample Expression help window
+        /// </summary>
+        public SampleExpr SampleExpr
+        {
+            get { return (_SampleExpr); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridFilterItemsLoadedEventArgs
+
+    /// <summary>
+    /// GridFilterItemsLoadedEventArgs
+    /// </summary>
+    public class GridFilterItemsLoadedEventArgs : GridFilterEventArgs
+    {
+        #region Private variables
+
+        private ComboBoxEx _ComboBox;
+
+        #endregion
+
+        ///<summary>
+        /// GridFilterItemsLoadedEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="gridColumn"></param>
+        ///<param name="comboBox"></param>
+        public GridFilterItemsLoadedEventArgs(
+            GridPanel gridPanel, GridColumn gridColumn, ComboBoxEx comboBox)
+            : base(gridPanel, gridColumn)
+        {
+            _ComboBox = comboBox;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated ComboBoxEx
+        /// </summary>
+        public ComboBoxEx ComboBox
+        {
+            get { return (_ComboBox); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridFilterLoadItemsEventArgs
+
+    /// <summary>
+    /// GridFilterLoadItemsEventArgs
+    /// </summary>
+    public class GridFilterLoadItemsEventArgs : GridFilterEventArgs
+    {
+        #region Private variables
+
+        private bool _Cancel;
+        private ComboBoxEx _ComboBox;
+
+        #endregion
+
+        ///<summary>
+        /// GridFilterBeginEditEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="gridColumn"></param>
+        ///<param name="comboBox"></param>
+        public GridFilterLoadItemsEventArgs(
+            GridPanel gridPanel, GridColumn gridColumn, ComboBoxEx comboBox)
+            : base(gridPanel, gridColumn)
+        {
+            _ComboBox = comboBox;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets or sets whether to cancel the operation
+        /// </summary>
+        public bool Cancel
+        {
+            get { return (_Cancel); }
+            set { _Cancel = value; }
+        }
+
+        /// <summary>
+        /// Gets the associated ComboBoxEx
+        /// </summary>
+        public ComboBoxEx ComboBox
+        {
+            get { return (_ComboBox); }
+        }
+
+        #endregion
+
+    }
+
+    #endregion
+
+    #region GridFilterLoadUserDataEventArgs
+
+    /// <summary>
+    /// GridFilterLoadUserDataEventArgs
+    /// </summary>
+    public class GridFilterLoadUserDataEventArgs : GridCancelEventArgs
+    {
+        #region Private variables
+
+        private string _FilterPath;
+        private List<UserFilterData> _FilterData;
+
+        #endregion
+
+        ///<summary>
+        /// GridFilterLoadUserDataEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="filterPath"></param>
+        ///<param name="filterData"></param>
+        public GridFilterLoadUserDataEventArgs(
+            GridPanel gridPanel, string filterPath, List<UserFilterData> filterData)
+            : base(gridPanel)
+        {
+            _FilterPath = filterPath;
+            _FilterData = filterData;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets or sets the associated FilterData (user defined
+        /// Custom filter expressions)
+        /// </summary>
+        public List<UserFilterData> FilterData
+        {
+            get { return (_FilterData); }
+            set { _FilterData = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the associated Path to
+        /// the user defined filter data expression file
+        /// </summary>
+        public string FilterPath
+        {
+            get { return (_FilterPath); }
+            set { _FilterPath = value; }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridFilterPopupClosingEventArgs
+
+    /// <summary>
+    /// GridFilterPopupClosingEventArgs
+    /// </summary>
+    public class GridFilterPopupClosingEventArgs : GridFilterEventArgs
+    {
+        #region Private variables
+
+        private FilterPopup _FilterPopup;
+
+        #endregion
+
+        ///<summary>
+        /// GridFilterPopupClosingEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="gridColumn"></param>
+        ///<param name="filterPopup"></param>
+        public GridFilterPopupClosingEventArgs(
+            GridPanel gridPanel, GridColumn gridColumn, FilterPopup filterPopup)
+            : base(gridPanel, gridColumn)
+        {
+            _FilterPopup = filterPopup;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated filter popup
+        /// </summary>
+        public FilterPopup FilterPopup
+        {
+            get { return (_FilterPopup); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridFilterPopupLoadEventArgs
+
+    /// <summary>
+    /// GridFilterPopupLoadEventArgs
+    /// </summary>
+    public class GridFilterPopupLoadEventArgs : GridFilterEventArgs
+    {
+        #region Private variables
+
+        private bool _Cancel;
+
+        private FilterPopup _FilterPopup;
+
+        #endregion
+
+        ///<summary>
+        /// GridFilterPopupLoadEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="gridColumn"></param>
+        ///<param name="filterPopup"></param>
+        public GridFilterPopupLoadEventArgs(
+            GridPanel gridPanel, GridColumn gridColumn, FilterPopup filterPopup)
+            : base(gridPanel, gridColumn)
+        {
+            _FilterPopup = filterPopup;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets or sets whether to cancel the operation
+        /// </summary>
+        public bool Cancel
+        {
+            get { return (_Cancel); }
+            set { _Cancel = value; }
+        }
+
+        /// <summary>
+        /// Gets the associated filter popup
+        /// </summary>
+        public FilterPopup FilterPopup
+        {
+            get { return (_FilterPopup); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridFilterPopupLoadedEventArgs
+
+    /// <summary>
+    /// GridFilterPopupLoadedEventArgs
+    /// </summary>
+    public class GridFilterPopupLoadedEventArgs : GridFilterEventArgs
+    {
+        #region Private variables
+
+        private FilterPopup _FilterPopup;
+
+        #endregion
+
+        ///<summary>
+        /// GridFilterPopupLoadedEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="gridColumn"></param>
+        ///<param name="filterPopup"></param>
+        public GridFilterPopupLoadedEventArgs(
+            GridPanel gridPanel, GridColumn gridColumn, FilterPopup filterPopup)
+            : base(gridPanel, gridColumn)
+        {
+            _FilterPopup = filterPopup;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated filter popup
+        /// </summary>
+        public FilterPopup FilterPopup
+        {
+            get { return (_FilterPopup); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridFilterPopupOpeningEventArgs
+
+    /// <summary>
+    /// GridFilterPopupOpeningEventArgs
+    /// </summary>
+    public class GridFilterPopupOpeningEventArgs : GridFilterEventArgs
+    {
+        #region Private variables
+
+        private bool _Cancel;
+
+        private FilterPopup _FilterPopup;
+
+        #endregion
+
+        ///<summary>
+        /// GridFilterPopupOpeningEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="gridColumn"></param>
+        ///<param name="filterPopup"></param>
+        public GridFilterPopupOpeningEventArgs(
+            GridPanel gridPanel, GridColumn gridColumn, FilterPopup filterPopup)
+            : base(gridPanel, gridColumn)
+        {
+            _FilterPopup = filterPopup;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets or sets whether to cancel the operation
+        /// </summary>
+        public bool Cancel
+        {
+            get { return (_Cancel); }
+            set { _Cancel = value; }
+        }
+
+        /// <summary>
+        /// Gets the associated filter popup
+        /// </summary>
+        public FilterPopup FilterPopup
+        {
+            get { return (_FilterPopup); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridFilterPopupValueChangedEventArgs
+
+    /// <summary>
+    /// GridFilterPopupValueChangedEventArgs
+    /// </summary>
+    public class GridFilterPopupValueChangedEventArgs : GridFilterEventArgs
+    {
+        #region Private variables
+
+        private object _FilterValue;
+        private object _FilterDisplayValue;
+        private string _FilterExpr;
+
+        private FilterItemType _FilterItemType;
+
+        private bool _Cancel;
+
+        #endregion
+
+        ///<summary>
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="gridColumn"></param>
+        ///<param name="filterItemType"></param>
+        ///<param name="filterValue"></param>
+        ///<param name="filterDisplayValue"></param>
+        ///<param name="filterExpr"></param>
+        public GridFilterPopupValueChangedEventArgs(GridPanel gridPanel, GridColumn gridColumn,
+            FilterItemType filterItemType, object filterValue, object filterDisplayValue, string filterExpr)
+            : base(gridPanel, gridColumn)
+        {
+            _FilterItemType = filterItemType;
+            _FilterValue = filterValue;
+            _FilterDisplayValue = filterDisplayValue;
+            _FilterExpr = filterExpr;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets or sets whether to cancel the operation
+        /// </summary>
+        public bool Cancel
+        {
+            get { return (_Cancel); }
+            set { _Cancel = value; }
+        }
+
+        ///<summary>
+        /// Gets or sets the new filter value
+        ///</summary>
+        public object FilterValue
+        {
+            get { return (_FilterValue); }
+            set { _FilterValue = value; }
+        }
+
+        ///<summary>
+        /// Gets or sets the new filter display value
+        ///</summary>
+        public object FilterDisplayValue
+        {
+            get { return (_FilterDisplayValue); }
+            set { _FilterDisplayValue = value; }
+        }
+
+        ///<summary>
+        /// Gets or sets the new filter expression
+        ///</summary>
+        public string FilterExpr
+        {
+            get { return (_FilterExpr); }
+            set { _FilterExpr = value; }
+        }
+
+        ///<summary>
+        /// Gets the filter popup item selected
+        ///</summary>
+        public FilterItemType FilterItemType
+        {
+            get { return (_FilterItemType); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridFilterRowErrorEventArgs
+
+    /// <summary>
+    /// GridFilterRowErrorEventArgs
+    /// </summary>
+    public class GridFilterRowErrorEventArgs : GridRowEventArgs
+    {
+        #region Private variables
+
+        private bool _Cancel;
+
+        private bool _FilteredOut;
+        private bool _ThrowException;
+        private bool _PostError;
+
+        private Exception _Exception;
+
+        #endregion
+
+        ///<summary>
+        /// GridFilterRowErrorEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="gridRow"></param>
+        ///<param name="exp"></param>
+        ///<param name="filteredOut"></param>
+        ///<param name="throwException"></param>
+        ///<param name="postError"></param>
+        public GridFilterRowErrorEventArgs(GridPanel gridPanel,
+            GridRow gridRow, Exception exp, bool filteredOut, bool throwException, bool postError)
+            : base(gridPanel, gridRow)
+        {
+            _Exception = exp;
+            _FilteredOut = filteredOut;
+            _ThrowException = throwException;
+            _PostError = postError;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets or sets whether to cancel the operation
+        /// </summary>
+        public bool Cancel
+        {
+            get { return (_Cancel); }
+            set { _Cancel = value; }
+        }
+
+        /// <summary>
+        /// Gets the associated filter Exception
+        /// </summary>
+        public Exception Exception
+        {
+            get { return (_Exception); }
+        }
+
+        /// <summary>
+        /// Gets or sets whether the row is filtered out
+        /// </summary>
+        public bool FilteredOut
+        {
+            get { return (_FilteredOut); }
+            set { _FilteredOut = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether to re-throw the exception
+        /// </summary>
+        public bool ThrowException
+        {
+            get { return (_ThrowException); }
+            set { _ThrowException = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether to post/display the error to the user
+        /// </summary>
+        public bool PostError
+        {
+            get { return (_PostError); }
+            set { _PostError = value; }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridFilterStoreUserDataEventArgs
+
+    /// <summary>
+    /// GridFilterStoreUserDataEventArgs
+    /// </summary>
+    public class GridFilterStoreUserDataEventArgs : GridCancelEventArgs
+    {
+        #region Private variables
+
+        private string _FilterPath;
+        private List<UserFilterData> _FilterData;
+
+        #endregion
+
+        ///<summary>
+        /// GridFilterStoreUserDataEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="filterPath"></param>
+        ///<param name="filterData"></param>
+        public GridFilterStoreUserDataEventArgs(
+            GridPanel gridPanel, string filterPath, List<UserFilterData> filterData)
+            : base(gridPanel)
+        {
+            _FilterPath = filterPath;
+            _FilterData = filterData;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets or sets the associated FilterData (user defined
+        /// Custom filter expressions)
+        /// </summary>
+        public List<UserFilterData> FilterData
+        {
+            get { return (_FilterData); }
+            set { _FilterData = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the associated Path to
+        /// the user defined filter data expression file
+        /// </summary>
+        public string FilterPath
+        {
+            get { return (_FilterPath); }
+            set { _FilterPath = value; }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridFilterUserFunctionEventArgs
+
+    /// <summary>
+    /// GridFilterUserFunctionEventArgs
+    /// </summary>
+    public class GridFilterUserFunctionEventArgs : GridRowEventArgs
+    {
+        #region Private variables
+
+        private object[] _Args;
+        private object _Result;
+
+        private bool _Handled;
+
+        #endregion
+
+        ///<summary>
+        /// GridFilterUserFunctionEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="gridRow"></param>
+        ///<param name="args"></param>
+        ///<param name="result"></param>
+        public GridFilterUserFunctionEventArgs(
+            GridPanel gridPanel, GridRow gridRow, object[] args, object result)
+            : base(gridPanel, gridRow)
+        {
+            _Args = args;
+            _Result = result;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets or sets the associated function arguments
+        /// </summary>
+        public object[] Args
+        {
+            get { return (_Args); }
+            set { _Args = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether the function was handled
+        /// </summary>
+        public bool Handled
+        {
+            get { return (_Handled); }
+            set { _Handled = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the associated function result
+        /// </summary>
+        public object Result
+        {
+            get { return (_Result); }
+            set { _Result = value; }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridGetGroupDetailRowsEventArgs
+
+    /// <summary>
+    /// GridGetGroupDetailRowsEventArgs
+    /// </summary>
+    public class GridGetGroupDetailRowsEventArgs : GridColumnEventArgs
+    {
+        #region Private variables
+
+        private GridGroup _GridGroup;
+        private List<GridRow> _PreDetailRows;
+        private List<GridRow> _PostDetailRows;
+
+        #endregion
+
+        ///<summary>
+        /// GridGetGroupDetailRowsEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="gridColumn"></param>
+        ///<param name="gridGroup"></param>
+        public GridGetGroupDetailRowsEventArgs(
+            GridPanel gridPanel, GridColumn gridColumn, GridGroup gridGroup)
+            : base(gridPanel, gridColumn)
+        {
+            _GridGroup = gridGroup;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets or sets the list of Post grouping DetailRows
+        /// </summary>
+        [Obsolete]
+        public List<GridRow> DetailRows
+        {
+            get { return (_PostDetailRows); }
+            set { _PostDetailRows = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the list of Post grouping DetailRows
+        /// </summary>
+        public List<GridRow> PostDetailRows
+        {
+            get { return (_PostDetailRows); }
+            set { _PostDetailRows = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the list of Pre grouping DetailRows
+        /// </summary>
+        public List<GridRow> PreDetailRows
+        {
+            get { return (_PreDetailRows); }
+            set { _PreDetailRows = value; }
+        }
+
+        /// <summary>
+        /// Gets the associated GridGroup
+        /// </summary>
+        public GridGroup GridGroup
+        {
+            get { return (_GridGroup); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridItemDragEventArgs
+
+    /// <summary>
+    /// GridItemDragEventArgs
+    /// </summary>
+    public class GridItemDragEventArgs : ItemDragEventArgs
+    {
+        #region Private variables
+
+        private GridPanel _GridPanel;
+        private bool _Cancel;
+
+        #endregion
+
+        ///<summary>
+        /// GridDragStartedEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="item"></param>
+        ///<param name="e"></param>
+        public GridItemDragEventArgs(GridPanel gridPanel, GridElement item, MouseEventArgs e)
+            : base(e.Button, item)
+        {
+            _GridPanel = gridPanel;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets or sets whether to cancel the operation
+        /// </summary>
+        public bool Cancel
+        {
+            get { return (_Cancel); }
+            set { _Cancel = value; }
+        }
+
+        /// <summary>
+        /// Gets the associated GridPanel
+        /// </summary>
+        public GridPanel GridPanel
+        {
+            get { return (_GridPanel); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridGetCellFormattedValueEventArgs
+
+    /// <summary>
+    /// GridGetCellFormattedValueEventArgs
+    /// </summary>
+    public class GridGetCellFormattedValueEventArgs : GridCellEventArgs
+    {
+        #region Private variables
+
+        private string _FormattedValue;
+        private CellSizingSource _SizingSource;
+
+        #endregion
+
+        ///<summary>
+        /// GridGetCellFormattedValueEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="gridCell"></param>
+        ///<param name="formattedValue"></param>
+        public GridGetCellFormattedValueEventArgs(
+            GridPanel gridPanel, GridCell gridCell, string formattedValue, CellSizingSource sizingSource)
+            : base(gridPanel, gridCell)
+        {
+            _FormattedValue = formattedValue;
+            _SizingSource = sizingSource;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets or sets the associated FormattedValue
+        /// </summary>
+        public string FormattedValue
+        {
+            get { return (_FormattedValue); }
+            set { _FormattedValue = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the associated cell SizingSource
+        /// </summary>
+        public CellSizingSource SizingSource
+        {
+            get { return (_SizingSource); }
+            set { _SizingSource = value; }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridGetCellRangeFormattedValueEventArgs
+
+    /// <summary>
+    /// GridGetCellRangeFormattedValueEventArgs
+    /// </summary>
+    public class GridGetCellRangeFormattedValueEventArgs : GridRowEventArgs
+    {
+        #region Private variables
+
+        private CellRange _CellRange;
+        private string _FormattedValue;
+
+        #endregion
+
+        ///<summary>
+        /// GridGetCellRangeFormattedValueEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="gridContainer"></param>
+        ///<param name="cellRange"></param>
+        ///<param name="formattedValue"></param>
+        public GridGetCellRangeFormattedValueEventArgs(GridPanel gridPanel,
+            GridContainer gridContainer, CellRange cellRange, string formattedValue)
+            : base(gridPanel, gridContainer)
+        {
+            _CellRange = cellRange;
+            _FormattedValue = formattedValue;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated CellRange
+        /// </summary>
+        public CellRange CellRange
+        {
+            get { return (_CellRange); }
+            set { _CellRange = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the associated FormattedValue
+        /// </summary>
+        public string FormattedValue
+        {
+            get { return (_FormattedValue); }
+            set { _FormattedValue = value; }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridGetCellRangesEventArgs
+
+    /// <summary>
+    /// GridGetCellRangesEventArgs
+    /// </summary>
+    public class GridGetCellRangesEventArgs : GridEventArgs
+    {
+        #region Private variables
+
+        private bool _Cancel;
+
+        private List<CellRange> _CellRanges;
+        private DisplayRange _DisplayRange;
+        private GridContainer _GridContainer;
+
+        #endregion
+
+        ///<summary>
+        /// GridGetCellRangesEventArgs
+        ///</summary>
+        ///<param name="gridPanel">Associated GridPanel</param>
+        ///<param name="gridContainer">Associated GridContainer</param>
+        ///<param name="displayRange">Row/col range being merge evaluated</param>
+        ///<param name="cellRanges">List of CellRanges</param>
+        public GridGetCellRangesEventArgs(GridPanel gridPanel,
+            GridContainer gridContainer, DisplayRange displayRange, List<CellRange> cellRanges)
+            : base(gridPanel)
+        {
+            _GridContainer = gridContainer;
+            _DisplayRange = displayRange;
+            _CellRanges = cellRanges;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets or sets whether to cancel the default operation
+        /// </summary>
+        public bool Cancel
+        {
+            get { return (_Cancel); }
+            set { _Cancel = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the CellRanges
+        /// </summary>
+        public List<CellRange> CellRanges
+        {
+            get { return (_CellRanges); }
+            set { _CellRanges = value; }
+        }
+
+        /// <summary>
+        /// Gets the current DisplayRange (row/col range
+        /// being processed / merged evaluated)
+        /// </summary>
+        public DisplayRange DisplayRange
+        {
+            get { return (_DisplayRange); }
+        }
+
+        /// <summary>
+        /// Gets the associated GridContainer 
+        /// </summary>
+        public GridContainer GridContainer
+        {
+            get { return (_GridContainer); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridGetCellStyleEventArgs
+
+    /// <summary>
+    /// GridGetCellStyleEventArgs
+    /// </summary>
+    public class GridGetCellStyleEventArgs : GridCellEventArgs
+    {
+        #region Private variables
+
+        private StyleType _StyleType;
+        private CellVisualStyle _Style;
+
+        #endregion
+
+        ///<summary>
+        /// GridGetCellStyleEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="gridCell"></param>
+        ///<param name="styleType"></param>
+        ///<param name="style"></param>
+        public GridGetCellStyleEventArgs(
+            GridPanel gridPanel, GridCell gridCell, StyleType styleType, CellVisualStyle style)
+            : base(gridPanel, gridCell)
+        {
+            _StyleType = styleType;
+            _Style = style;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated StyleType
+        /// </summary>
+        public StyleType StyleType
+        {
+            get { return (_StyleType); }
+        }
+
+        /// <summary>
+        /// Gets or sets the associated VisualStyle
+        /// </summary>
+        public CellVisualStyle Style
+        {
+            get { return (_Style); }
+
+            set
+            {
+                if (value == null)
+                    throw new Exception("Style cannot be null.");
+
+                _Style = value;
+            }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridGetCellToolTipEventArgs
+
+    /// <summary>
+    /// GridGetCellToolTipEventArgs
+    /// </summary>
+    public class GridGetCellToolTipEventArgs : GridCellEventArgs
+    {
+        #region Private variables
+
+        private string _ToolTip;
+        private bool _Cancel;
+
+        #endregion
+
+        ///<summary>
+        /// GridGetCellToolTipEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="gridCell"></param>
+        ///<param name="toolTip"></param>
+        public GridGetCellToolTipEventArgs(
+            GridPanel gridPanel, GridCell gridCell, string toolTip)
+            : base(gridPanel, gridCell)
+        {
+            _ToolTip = toolTip;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets or sets whether to cancel the operation
+        /// </summary>
+        public bool Cancel
+        {
+            get { return (_Cancel); }
+            set { _Cancel = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the associated ToolTip text
+        /// </summary>
+        public string ToolTip
+        {
+            get { return (_ToolTip); }
+            set { _ToolTip = value; }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridGetCellValueEventArgs
+
+    /// <summary>
+    /// GridGetCellValueEventArgs
+    /// </summary>
+    public class GridGetCellValueEventArgs : GridCellEventArgs
+    {
+        #region Private variables
+
+        private object _Value;
+
+        #endregion
+
+        ///<summary>
+        /// GridGetCellValueEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="gridCell"></param>
+        ///<param name="value"></param>
+        public GridGetCellValueEventArgs(
+            GridPanel gridPanel, GridCell gridCell, object value)
+            : base(gridPanel, gridCell)
+        {
+            _Value = value;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets or sets the associated Value
+        /// </summary>
+        public object Value
+        {
+            get { return (_Value); }
+            set { _Value = value; }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridGetColumnGroupHeaderStyleEventArgs
+
+    /// <summary>
+    /// GridGetColumnGroupHeaderStyleEventArgs
+    /// </summary>
+    public class GridGetColumnGroupHeaderStyleEventArgs : GridEventArgs
+    {
+        #region Private variables
+
+        private StyleType _StyleType;
+        private ColumnHeaderVisualStyle _Style;
+        private ColumnGroupHeader _GroupHeader;
+
+        #endregion
+
+        ///<summary>
+        /// GridGetColumnGroupHeaderStyleEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="groupHeader"></param>
+        ///<param name="styleType"></param>
+        ///<param name="style"></param>
+        public GridGetColumnGroupHeaderStyleEventArgs(GridPanel gridPanel,
+            ColumnGroupHeader groupHeader, StyleType styleType, ColumnHeaderVisualStyle style)
+            : base(gridPanel)
+        {
+            _GroupHeader = groupHeader;
+            _StyleType = styleType;
+            _Style = style;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated StyleType
+        /// </summary>
+        public StyleType StyleType
+        {
+            get { return (_StyleType); }
+        }
+
+        /// <summary>
+        /// Gets or sets the associated VisualStyle
+        /// </summary>
+        public ColumnHeaderVisualStyle Style
+        {
+            get { return (_Style); }
+
+            set
+            {
+                if (value == null)
+                    throw new Exception("Style cannot by null.");
+
+                _Style = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the associated ColumnGroupHeader
+        /// </summary>
+        public ColumnGroupHeader GroupHeader
+        {
+            get { return (_GroupHeader); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridGetColumnHeaderRowHeaderStyleEventArgs
+
+    /// <summary>
+    /// GridGetColumnHeaderRowHeaderStyleEventArgs
+    /// </summary>
+    public class GridGetColumnHeaderRowHeaderStyleEventArgs : GridEventArgs
+    {
+        #region Private variables
+
+        private StyleType _StyleType;
+        private GridColumnHeader _ColumnHeader;
+        private ColumnHeaderRowVisualStyle _Style;
+
+        #endregion
+
+        ///<summary>
+        /// GridGetColumnHeaderRowHeaderStyleEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="columnHeader"></param>
+        ///<param name="styleType"></param>
+        ///<param name="style"></param>
+        public GridGetColumnHeaderRowHeaderStyleEventArgs(GridPanel gridPanel,
+            GridColumnHeader columnHeader, StyleType styleType, ColumnHeaderRowVisualStyle style)
+            : base(gridPanel)
+        {
+            _ColumnHeader = columnHeader;
+            _StyleType = styleType;
+            _Style = style;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated ColumnHeader
+        /// </summary>
+        public GridColumnHeader ColumnHeader
+        {
+            get { return (_ColumnHeader); }
+        }
+
+        /// <summary>
+        /// Gets the associated StyleType
+        /// </summary>
+        public StyleType StyleType
+        {
+            get { return (_StyleType); }
+        }
+
+        /// <summary>
+        /// Gets or sets the associated VisualStyle
+        /// </summary>
+        public ColumnHeaderRowVisualStyle Style
+        {
+            get { return (_Style); }
+
+            set
+            {
+                if (value == null)
+                    throw new Exception("Style cannot by null.");
+
+                _Style = value;
+            }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridGetColumnHeaderStyleEventArgs
+
+    /// <summary>
+    /// GridGetColumnHeaderStyleEventArgs
+    /// </summary>
+    public class GridGetColumnHeaderStyleEventArgs : GridColumnEventArgs
+    {
+        #region Private variables
+
+        private StyleType _StyleType;
+        private ColumnHeaderVisualStyle _Style;
+
+        #endregion
+
+        ///<summary>
+        /// GridGetColumnHeaderStyleEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="gridColumn"></param>
+        ///<param name="styleType"></param>
+        ///<param name="style"></param>
+        public GridGetColumnHeaderStyleEventArgs(
+            GridPanel gridPanel, GridColumn gridColumn, StyleType styleType, ColumnHeaderVisualStyle style)
+            : base(gridPanel, gridColumn)
+        {
+            _StyleType = styleType;
+            _Style = style;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated StyleType
+        /// </summary>
+        public StyleType StyleType
+        {
+            get { return (_StyleType); }
+        }
+
+        /// <summary>
+        /// Gets or sets the associated VisualStyle
+        /// </summary>
+        public ColumnHeaderVisualStyle Style
+        {
+            get { return (_Style); }
+
+            set
+            {
+                if (value == null)
+                    throw new Exception("Style cannot by null.");
+
+                _Style = value;
+            }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridGetColumnGroupHeaderToolTipEventArgs
+
+    /// <summary>
+    /// GridGetColumnGroupHeaderToolTipEventArgs
+    /// </summary>
+    public class GridGetColumnGroupHeaderToolTipEventArgs : GridEventArgs
+    {
+        #region Private variables
+
+        private string _ToolTip;
+        private HeaderArea _HitArea;
+        private ColumnGroupHeader _GroupHeader;
+
+        private bool _Cancel;
+
+        #endregion
+
+        ///<summary>
+        /// GridGetColumnGroupHeaderToolTipEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="groupHeader"></param>
+        ///<param name="hitArea"></param>
+        ///<param name="toolTip"></param>
+        public GridGetColumnGroupHeaderToolTipEventArgs(
+            GridPanel gridPanel, ColumnGroupHeader groupHeader, HeaderArea hitArea, string toolTip)
+            : base(gridPanel)
+        {
+            _GroupHeader = groupHeader;
+
+            _HitArea = hitArea;
+            _ToolTip = toolTip;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets or sets whether to cancel the operation
+        /// </summary>
+        public bool Cancel
+        {
+            get { return (_Cancel); }
+            set { _Cancel = value; }
+        }
+
+        /// <summary>
+        /// Gets the associated ColumnGroupHeader
+        /// </summary>
+        public ColumnGroupHeader GroupHeader
+        {
+            get { return (_GroupHeader); }
+        }
+
+        /// <summary>
+        /// Gets the associated Header hit area
+        /// </summary>
+        public HeaderArea HitArea
+        {
+            get { return (_HitArea); }
+        }
+
+        /// <summary>
+        /// Gets or sets the associated ToolTip text
+        /// </summary>
+        public string ToolTip
+        {
+            get { return (_ToolTip); }
+            set { _ToolTip = value; }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridGetColumnHeaderToolTipEventArgs
+
+    /// <summary>
+    /// GridGetColumnHeaderToolTipEventArgs
+    /// </summary>
+    public class GridGetColumnHeaderToolTipEventArgs : GridColumnEventArgs
+    {
+        #region Private variables
+
+        private string _ToolTip;
+        private HeaderArea _HitArea;
+
+        private bool _Cancel;
+
+        #endregion
+
+        ///<summary>
+        /// GridGetColumnHeaderToolTipEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="gridColumn"></param>
+        ///<param name="hitArea"></param>
+        ///<param name="toolTip"></param>
+        public GridGetColumnHeaderToolTipEventArgs(
+            GridPanel gridPanel, GridColumn gridColumn, HeaderArea hitArea, string toolTip)
+            : base(gridPanel, gridColumn)
+        {
+            _HitArea = hitArea;
+            _ToolTip = toolTip;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets or sets whether to cancel the operation
+        /// </summary>
+        public bool Cancel
+        {
+            get { return (_Cancel); }
+            set { _Cancel = value; }
+        }
+
+        /// <summary>
+        /// Gets the associated Header hit area
+        /// </summary>
+        public HeaderArea HitArea
+        {
+            get { return (_HitArea); }
+        }
+
+        /// <summary>
+        /// Gets or sets the associated ToolTip text
+        /// </summary>
+        public string ToolTip
+        {
+            get { return (_ToolTip); }
+            set { _ToolTip = value; }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridGetDisplayRangesEventArgs
+
+    /// <summary>
+    /// GridGetDisplayRangesEventArgs
+    /// </summary>
+    public class GridGetDisplayRangesEventArgs : GridEventArgs
+    {
+        #region Private variables
+
+        private List<DisplayRange> _DisplayRanges;
+        private GridContainer _GridContainer;
+
+        #endregion
+
+        ///<summary>
+        /// GridGetDisplayRangesEventArgs
+        ///</summary>
+        ///<param name="gridPanel">Associated GridPanel</param>
+        ///<param name="gridContainer">Associated GridContainer</param>
+        ///<param name="displayRanges">List of Row/col ranges to be merge evaluated</param>
+        public GridGetDisplayRangesEventArgs(GridPanel gridPanel,
+            GridContainer gridContainer, List<DisplayRange> displayRanges)
+            : base(gridPanel)
+        {
+            _GridContainer = gridContainer;
+            _DisplayRanges = displayRanges;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets or sets the DisplayRanges
+        /// </summary>
+        public List<DisplayRange> DisplayRanges
+        {
+            get { return (_DisplayRanges); }
+            set { _DisplayRanges = value; }
+        }
+
+        /// <summary>
+        /// Gets the associated GridContainer 
+        /// </summary>
+        public GridContainer GridContainer
+        {
+            get { return (_GridContainer); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridGetFilterRowStyleEventArgs
+
+    /// <summary>
+    /// GridGetFilterRowStyleEventArgs
+    /// </summary>
+    public class GridGetFilterRowStyleEventArgs : GridEventArgs
+    {
+        #region Private variables
+
+        private StyleType _StyleType;
+        private GridFilter _GridFilter;
+        private FilterRowVisualStyle _Style;
+
+        #endregion
+
+        ///<summary>
+        /// GridGetFilterRowStyleEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="gridFilter"></param>
+        ///<param name="styleType"></param>
+        ///<param name="style"></param>
+        public GridGetFilterRowStyleEventArgs(GridPanel gridPanel,
+            GridFilter gridFilter, StyleType styleType, FilterRowVisualStyle style)
+            : base(gridPanel)
+        {
+            _GridFilter = gridFilter;
+            _StyleType = styleType;
+            _Style = style;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated GridFilter
+        /// </summary>
+        public GridFilter GridFilter
+        {
+            get { return (_GridFilter); }
+        }
+
+        /// <summary>
+        /// Gets the associated StyleType
+        /// </summary>
+        public StyleType StyleType
+        {
+            get { return (_StyleType); }
+        }
+
+        /// <summary>
+        /// Gets or sets the associated VisualStyle
+        /// </summary>
+        public FilterRowVisualStyle Style
+        {
+            get { return (_Style); }
+
+            set
+            {
+                if (value == null)
+                    throw new Exception("Style cannot by null.");
+
+                _Style = value;
+            }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridGetFilterColumnHeaderStyleEventArgs
+
+    /// <summary>
+    /// GridGetFilterColumnHeaderStyleEventArgs
+    /// </summary>
+    public class GridGetFilterColumnHeaderStyleEventArgs : GridColumnEventArgs
+    {
+        #region Private variables
+
+        private StyleType _StyleType;
+        private FilterColumnHeaderVisualStyle _Style;
+
+        #endregion
+
+        ///<summary>
+        /// GridGetFilterColumnHeaderStyleEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="gridColumn"></param>
+        ///<param name="styleType"></param>
+        ///<param name="style"></param>
+        public GridGetFilterColumnHeaderStyleEventArgs(GridPanel gridPanel,
+            GridColumn gridColumn, StyleType styleType, FilterColumnHeaderVisualStyle style)
+            : base(gridPanel, gridColumn)
+        {
+            _StyleType = styleType;
+            _Style = style;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated StyleType
+        /// </summary>
+        public StyleType StyleType
+        {
+            get { return (_StyleType); }
+        }
+
+        /// <summary>
+        /// Gets or sets the associated VisualStyle
+        /// </summary>
+        public FilterColumnHeaderVisualStyle Style
+        {
+            get { return (_Style); }
+
+            set
+            {
+                if (value == null)
+                    throw new Exception("Style cannot by null.");
+
+                _Style = value;
+            }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridConfigureGroupBoxEventArgs
+
+    /// <summary>
+    /// GridConfigureGroupBoxEventArgs
+    /// </summary>
+    public class GridConfigureGroupBoxEventArgs : GridEventArgs
+    {
+        #region Private variables
+
+        private GridGroupByRow _GroupByRow;
+        private GridGroupBox _GridGroupBox;
+
+        #endregion
+
+        ///<summary>
+        /// GridConfigureGroupBoxEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="groupByRow"></param>
+        ///<param name="gridGroupBox"></param>
+        public GridConfigureGroupBoxEventArgs(GridPanel gridPanel,
+            GridGroupByRow groupByRow, GridGroupBox gridGroupBox)
+            : base(gridPanel)
+        {
+            _GroupByRow = groupByRow;
+            _GridGroupBox = gridGroupBox;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated GroupByRow
+        /// </summary>
+        public GridGroupByRow GroupByRow
+        {
+            get { return (_GroupByRow); }
+        }
+
+        /// <summary>
+        /// Gets the associated GridColumn
+        /// </summary>
+        public GridGroupBox GridGroupBox
+        {
+            get { return (_GridGroupBox); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridGetGroupHeaderStyleEventArgs
+
+    /// <summary>
+    /// GridGetGroupHeaderStyleEventArgs
+    /// </summary>
+    public class GridGetGroupHeaderStyleEventArgs : GridEventArgs
+    {
+        #region Private variables
+
+        private GridGroup _GridRow;
+        private StyleType _StyleType;
+
+        private GroupHeaderVisualStyle _Style;
+
+        #endregion
+
+        ///<summary>
+        /// GridGetGroupHeaderStyleEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="gridRow"></param>
+        ///<param name="styleType"></param>
+        ///<param name="style"></param>
+        public GridGetGroupHeaderStyleEventArgs(
+            GridPanel gridPanel, GridGroup gridRow, StyleType styleType, GroupHeaderVisualStyle style)
+            : base(gridPanel)
+        {
+            _GridRow = gridRow;
+            _StyleType = styleType;
+            _Style = style;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated StyleType
+        /// </summary>
+        public StyleType StyleType
+        {
+            get { return (_StyleType); }
+        }
+
+        /// <summary>
+        /// Gets the associated Group Header Row
+        /// </summary>
+        public GridGroup GridRow
+        {
+            get { return (_GridRow); }
+        }
+
+        /// <summary>
+        /// Gets or sets the associated VisualStyle
+        /// </summary>
+        public GroupHeaderVisualStyle Style
+        {
+            get { return (_Style); }
+
+            set
+            {
+                if (value == null)
+                    throw new Exception("Style cannot by null.");
+
+                _Style = value;
+            }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridGetMergedCellStyleEventArgs
+
+    /// <summary>
+    /// GridGetMergedCellStyleEventArgs
+    /// </summary>
+    public class GridGetMergedCellStyleEventArgs : GridEventArgs
+    {
+        #region Private variables
+
+        private CellRange _CellRange;
+        private StyleType _StyleType;
+        private CellVisualStyle _Style;
+
+        #endregion
+
+        ///<summary>
+        /// GridGetMergedCellStyleEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="cellRange"></param>
+        ///<param name="styleType"></param>
+        ///<param name="style"></param>
+        public GridGetMergedCellStyleEventArgs(
+            GridPanel gridPanel, CellRange cellRange, StyleType styleType, CellVisualStyle style)
+            : base(gridPanel)
+        {
+            _CellRange = cellRange;
+            _StyleType = styleType;
+            _Style = style;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated CellRange
+        /// </summary>
+        public CellRange CellRange
+        {
+            get { return (_CellRange); }
+        }
+
+        /// <summary>
+        /// Gets the associated StyleType
+        /// </summary>
+        public StyleType StyleType
+        {
+            get { return (_StyleType); }
+        }
+
+        /// <summary>
+        /// Gets or sets the associated VisualStyle
+        /// </summary>
+        public CellVisualStyle Style
+        {
+            get { return (_Style); }
+
+            set
+            {
+                if (value == null)
+                    throw new Exception("Style cannot by null.");
+
+                _Style = value;
+            }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridGetPanelStyleEventArgs
+
+    /// <summary>
+    /// GridGetPanelStyleEventArgs
+    /// </summary>
+    public class GridGetPanelStyleEventArgs : GridEventArgs
+    {
+        #region Private variables
+
+        private GridPanelVisualStyle _Style;
+
+        #endregion
+
+        ///<summary>
+        /// GridGetPanelStyleEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="style"></param>
+        public GridGetPanelStyleEventArgs(GridPanel gridPanel, GridPanelVisualStyle style)
+            : base(gridPanel)
+        {
+            _Style = style;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets or sets the associated VisualStyle
+        /// </summary>
+        public GridPanelVisualStyle Style
+        {
+            get { return (_Style); }
+
+            set
+            {
+                if (value == null)
+                    throw new Exception("Style cannot by null.");
+
+                _Style = value;
+            }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridGetRowCellStyleEventArgs
+
+    /// <summary>
+    /// GridGetRowCellStyleEventArgs
+    /// </summary>
+    public class GridGetRowCellStyleEventArgs : GridRowEventArgs
+    {
+        #region Private variables
+
+        private StyleType _StyleType;
+        private CellVisualStyle _Style;
+
+        #endregion
+
+        ///<summary>
+        /// GridGetRowCellStyleEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="gridRow"></param>
+        ///<param name="styleType"></param>
+        ///<param name="style"></param>
+        public GridGetRowCellStyleEventArgs(
+            GridPanel gridPanel, GridContainer gridRow, StyleType styleType, CellVisualStyle style)
+            : base(gridPanel, gridRow)
+        {
+            _StyleType = styleType;
+            _Style = style;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated StyleType
+        /// </summary>
+        public StyleType StyleType
+        {
+            get { return (_StyleType); }
+        }
+
+        /// <summary>
+        /// Gets or sets the associated VisualStyle
+        /// </summary>
+        public CellVisualStyle Style
+        {
+            get { return (_Style); }
+
+            set
+            {
+                if (value == null)
+                    throw new Exception("Style cannot by null.");
+
+                _Style = value;
+            }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridGetRowHeaderStyleEventArgs
+
+    /// <summary>
+    /// GridGetRowHeaderStyleEventArgs
+    /// </summary>
+    public class GridGetRowHeaderStyleEventArgs : GridRowEventArgs
+    {
+        #region Private variables
+
+        private StyleType _StyleType;
+        private RowHeaderVisualStyle _Style;
+
+        #endregion
+
+        ///<summary>
+        /// GridGetRowHeaderStyleEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="row"></param>
+        ///<param name="styleType"></param>
+        ///<param name="style"></param>
+        public GridGetRowHeaderStyleEventArgs(
+            GridPanel gridPanel, GridContainer row, StyleType styleType, RowHeaderVisualStyle style)
+            : base(gridPanel, row)
+        {
+            _StyleType = styleType;
+            _Style = style;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated StyleType
+        /// </summary>
+        public StyleType StyleType
+        {
+            get { return (_StyleType); }
+        }
+
+        /// <summary>
+        /// Gets or sets the associated VisualStyle
+        /// </summary>
+        public RowHeaderVisualStyle Style
+        {
+            get { return (_Style); }
+
+            set
+            {
+                if (value == null)
+                    throw new Exception("Style cannot by null.");
+
+                _Style = value;
+            }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridGetRowHeaderTextEventArgs
+
+    /// <summary>
+    /// GridGetRowHeaderTextEventArgs
+    /// </summary>
+    public class GridGetRowHeaderTextEventArgs : GridRowEventArgs
+    {
+        #region Private variables
+
+        private string _Text;
+
+        #endregion
+
+        ///<summary>
+        /// GridGetRowHeaderTextEventArgs
+        ///</summary>
+        ///<param name="gridPanel">Associated GridPanel</param>
+        ///<param name="row">Associated container row</param>
+        ///<param name="text">Text to display in row header</param>
+        public GridGetRowHeaderTextEventArgs(
+            GridPanel gridPanel, GridContainer row, string text)
+            : base(gridPanel, row)
+        {
+            _Text = text;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets or sets the associated header text
+        /// </summary>
+        public string Text
+        {
+            get { return (_Text); }
+            set { _Text = value; }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridGetRowStyleEventArgs
+
+    /// <summary>
+    /// GridGetRowStyleEventArgs
+    /// </summary>
+    public class GridGetRowStyleEventArgs : GridRowEventArgs
+    {
+        #region Private variables
+
+        private StyleType _StyleType;
+        private RowVisualStyle _Style;
+
+        #endregion
+
+        ///<summary>
+        /// GridGetCellStyleEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="gridRow"></param>
+        ///<param name="styleType"></param>
+        ///<param name="style"></param>
+        public GridGetRowStyleEventArgs(
+            GridPanel gridPanel, GridContainer gridRow, StyleType styleType, RowVisualStyle style)
+            : base(gridPanel, gridRow)
+        {
+            _StyleType = styleType;
+            _Style = style;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated StyleType
+        /// </summary>
+        public StyleType StyleType
+        {
+            get { return (_StyleType); }
+        }
+
+        /// <summary>
+        /// Gets or sets the associated VisualStyle
+        /// </summary>
+        public RowVisualStyle Style
+        {
+            get { return (_Style); }
+
+            set
+            {
+                if (value == null)
+                    throw new Exception("Style cannot by null.");
+
+                _Style = value;
+            }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridGetTextRowStyleEventArgs
+
+    /// <summary>
+    /// GridGetTextRowStyleEventArgs
+    /// </summary>
+    public class GridGetTextRowStyleEventArgs : GridEventArgs
+    {
+        #region Private variables
+
+        private StyleType _StyleType;
+        private TextRowVisualStyle _Style;
+        private readonly GridTextRow _GridTextRow;
+
+        #endregion
+
+        ///<summary>
+        /// GridGetTextRowStyleEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="gridTextRow"></param>
+        ///<param name="styleType"></param>
+        ///<param name="style"></param>
+        public GridGetTextRowStyleEventArgs(
+            GridPanel gridPanel, GridTextRow gridTextRow, StyleType styleType, TextRowVisualStyle style)
+            : base(gridPanel)
+        {
+            _GridTextRow = gridTextRow;
+            _StyleType = styleType;
+            _Style = style;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated StyleType
+        /// </summary>
+        public StyleType StyleType
+        {
+            get { return (_StyleType); }
+        }
+
+        /// <summary>
+        /// Gets or sets the associated VisualStyle
+        /// </summary>
+        public TextRowVisualStyle Style
+        {
+            get { return (_Style); }
+
+            set
+            {
+                if (value == null)
+                    throw new Exception("Style cannot by null.");
+
+                _Style = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the associated GridTextRow
+        /// </summary>
+        public GridTextRow GridTextRow
+        {
+            get { return (_GridTextRow); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridEditEventArgs
+
+    /// <summary>
+    /// GridEditEventArgs
+    /// </summary>
+    public class GridEditEventArgs : CancelEventArgs
+    {
+        #region Private variables
+
+        private GridPanel _GridPanel;
+        private GridCell _GridCell;
+        private IGridCellEditControl _EditControl;
+
+        #endregion
+
+        ///<summary>
+        /// GridEditEventArgs
+        ///</summary>
+        public GridEditEventArgs(
+            GridPanel gridPanel, GridCell gridCell, IGridCellEditControl editControl)
+        {
+            _GridPanel = gridPanel;
+            _GridCell = gridCell;
+            _EditControl = editControl;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated GridPanel
+        /// </summary>
+        public GridPanel GridPanel
+        {
+            get { return (_GridPanel); }
+        }
+
+        /// <summary>
+        /// Gets the associated cell
+        /// </summary>
+        public GridCell GridCell
+        {
+            get { return (_GridCell); }
+        }
+
+        /// <summary>
+        /// Gets the associated cell EditControl
+        /// </summary>
+        public IGridCellEditControl EditControl
+        {
+            get { return (_EditControl); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridEventArgs
+
+    /// <summary>
+    /// GridEventArgs
+    /// </summary>
+    public class GridEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private readonly GridPanel _GridPanel;
+
+        #endregion
+
+        ///<summary>
+        /// GridEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        public GridEventArgs(GridPanel gridPanel)
+        {
+            _GridPanel = gridPanel;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the event Grid
+        /// </summary>
+        public GridPanel GridPanel
+        {
+            get { return (_GridPanel); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridCancelEventArgs
+
+    /// <summary>
+    /// GridCancelEventArgs
+    /// </summary>
+    public class GridCancelEventArgs : GridEventArgs
+    {
+        #region Private variables
+
+        private bool _Cancel;
+
+        #endregion
+
+        ///<summary>
+        /// GridEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        public GridCancelEventArgs(GridPanel gridPanel)
+            : base(gridPanel)
+        {
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets or sets whether
+        /// to cancel the operation entirely
+        /// </summary>
+        public bool Cancel
+        {
+            get { return (_Cancel); }
+            set { _Cancel = value; }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridCloseEditEventArgs
+
+    /// <summary>
+    /// GridCloseEditEventArgs
+    /// </summary>
+    public class GridCloseEditEventArgs : GridCellEventArgs
+    {
+        ///<summary>
+        /// GridCloseEditEventArgs
+        ///</summary>
+        public GridCloseEditEventArgs(GridPanel gridPanel, GridCell gridCell)
+            : base(gridPanel, gridCell)
+        {
+        }
+    }
+
+    #endregion
+
+    #region GridGetEditorEventArgs
+
+    /// <summary>
+    /// GridGetEditorEventArgs
+    /// </summary>
+    public class GridGetEditorEventArgs : GridEventArgs
+    {
+        #region Private variables
+
+        private readonly GridCell _GridCell;
+        private Type _EditorType;
+        private object[] _EditorParams;
+
+        #endregion
+
+        ///<summary>
+        /// GridGetEditorEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="gridCell"></param>
+        ///<param name="editorType"></param>
+        ///<param name="editorParams"></param>
+        public GridGetEditorEventArgs(
+            GridPanel gridPanel, GridCell gridCell, Type editorType, object[] editorParams)
+            : base(gridPanel)
+        {
+            _GridCell = gridCell;
+            _EditorType = editorType;
+            _EditorParams = editorParams;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated GridCell
+        /// </summary>
+        public GridCell GridCell
+        {
+            get { return (_GridCell); }
+        }
+
+        /// <summary>
+        /// Gets or sets the associated cell editor Type
+        /// </summary>
+        public Type EditorType
+        {
+            get { return (_EditorType); }
+            set { _EditorType = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the associated cell editor params
+        /// </summary>
+        public object[] EditorParams
+        {
+            get { return (_EditorParams); }
+            set { _EditorParams = value; }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridGetRendererEventArgs
+
+    /// <summary>
+    /// GridGetRendererEventArgs
+    /// </summary>
+    public class GridGetRendererEventArgs : GridEventArgs
+    {
+        #region Private variables
+
+        private readonly GridCell _GridCell;
+        private Type _RenderType;
+        private object[] _RenderParams;
+
+        #endregion
+
+        ///<summary>
+        /// GridGetRendererEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="gridCell"></param>
+        ///<param name="renderType"></param>
+        ///<param name="renderParams"></param>
+        public GridGetRendererEventArgs(
+            GridPanel gridPanel, GridCell gridCell, Type renderType, object[] renderParams)
+            : base(gridPanel)
+        {
+            _GridCell = gridCell;
+            _RenderType = renderType;
+            _RenderParams = renderParams;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated GridCell
+        /// </summary>
+        public GridCell GridCell
+        {
+            get { return (_GridCell); }
+        }
+
+        /// <summary>
+        /// Gets or sets the associated cell Render Type
+        /// </summary>
+        public Type RenderType
+        {
+            get { return (_RenderType); }
+            set { _RenderType = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the associated cell Render params
+        /// </summary>
+        public object[] RenderParams
+        {
+            get { return (_RenderParams); }
+            set { _RenderParams = value; }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridGetFilterEditTypeEventArgs
+
+    /// <summary>
+    /// GridGetFilterEditTypeEventArgs
+    /// </summary>
+    public class GridGetFilterEditTypeEventArgs : GridColumnEventArgs
+    {
+        #region Private variables
+
+        private FilterEditType _FilterEditType;
+
+        #endregion
+
+        ///<summary>
+        /// GridGetFilterEditTypeEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="gridColumn"></param>
+        ///<param name="filterEditType"></param>
+        public GridGetFilterEditTypeEventArgs(
+            GridPanel gridPanel, GridColumn gridColumn, FilterEditType filterEditType)
+            : base(gridPanel, gridColumn)
+        {
+            _FilterEditType = filterEditType;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated Filter edit type
+        /// </summary>
+        public FilterEditType FilterEditType
+        {
+            get { return (_FilterEditType); }
+            set { _FilterEditType = value; }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridGroupChangedEventArgs
+
+    /// <summary>
+    /// GridGroupChangedEventArgs
+    /// </summary>
+    public class GridGroupChangedEventArgs : GridEventArgs
+    {
+        #region Private variables
+
+        private GroupChangedAction _Action;
+        private GridColumn _GridColumn;
+
+        #endregion
+
+        ///<summary>
+        /// GridRowClickEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="action"></param>
+        ///<param name="column"></param>
+        public GridGroupChangedEventArgs(
+            GridPanel gridPanel, GroupChangedAction action, GridColumn column)
+            : base(gridPanel)
+        {
+            _Action = action;
+            _GridColumn = column;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated GroupChangedAction
+        /// </summary>
+        public GroupChangedAction Action
+        {
+            get { return (_Action); }
+        }
+
+        /// <summary>
+        /// Gets the associated GridColumn
+        /// </summary>
+        public GridColumn GridColumn
+        {
+            get { return (_GridColumn); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridGroupHeaderClickEventArgs
+
+    /// <summary>
+    /// GridGroupHeaderClickEventArgs
+    /// </summary>
+    public class GridGroupHeaderClickEventArgs : GridEventArgs
+    {
+        #region Private variables
+
+        private GridGroup _GridGroup;
+
+        private bool _Cancel;
+        private GroupArea _GroupArea;
+        private MouseEventArgs _MouseEventArgs;
+
+        #endregion
+
+        ///<summary>
+        /// GridRowClickEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="gridGroup"></param>
+        ///<param name="area"></param>
+        ///<param name="e"></param>
+        public GridGroupHeaderClickEventArgs(
+            GridPanel gridPanel, GridGroup gridGroup, GroupArea area, MouseEventArgs e)
+            : base(gridPanel)
+        {
+            _GridGroup = gridGroup;
+            _GroupArea = area;
+
+            _MouseEventArgs = e;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated GridGroup
+        /// </summary>
+        public GridGroup GridGroup
+        {
+            get { return (_GridGroup); }
+        }
+
+        /// <summary>
+        /// Gets or sets whether to cancel the default operation
+        /// </summary>
+        public bool Cancel
+        {
+            get { return (_Cancel); }
+            set { _Cancel = value; }
+        }
+
+        /// <summary>
+        /// Gets the associated MouseEventArgs
+        /// </summary>
+        public MouseEventArgs MouseEventArgs
+        {
+            get { return (_MouseEventArgs); }
+        }
+
+        /// <summary>
+        /// Gets the associated GroupArea
+        /// </summary>
+        public GroupArea GroupArea
+        {
+            get { return (_GroupArea); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridGroupHeaderDoubleClickEventArgs
+
+    /// <summary>
+    /// GridGroupHeaderDoubleClickEventArgs
+    /// </summary>
+    public class GridGroupHeaderDoubleClickEventArgs : GridGroupHeaderClickEventArgs
+    {
+        ///<summary>
+        /// GridRowClickEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="gridGroup"></param>
+        ///<param name="area"></param>
+        ///<param name="e"></param>
+        public GridGroupHeaderDoubleClickEventArgs(
+            GridPanel gridPanel, GridGroup gridGroup, GroupArea area, MouseEventArgs e)
+            : base(gridPanel, gridGroup, area, e)
+        {
+        }
+    }
+
+    #endregion
+
+    #region GridInitEditContextEventArgs
+
+    /// <summary>
+    /// GridInitEditContextEventArgs
+    /// </summary>
+    public class GridInitEditContextEventArgs : GridCellEventArgs
+    {
+        #region Private variables
+
+        private readonly IGridCellEditControl _EditControl;
+
+        #endregion
+
+        ///<summary>
+        /// GridInitEditContextEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="gridCell"></param>
+        ///<param name="editControl"></param>
+        public GridInitEditContextEventArgs(GridPanel gridPanel,
+            GridCell gridCell, IGridCellEditControl editControl)
+            : base(gridPanel, gridCell)
+        {
+            _EditControl = editControl;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated GridCell
+        /// </summary>
+        public IGridCellEditControl EditControl
+        {
+            get { return (_EditControl); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridNoRowsTextMarkupLinkClickEventArgs
+
+    /// <summary>
+    /// GridNoRowsMarkupLinkClickEventArgs
+    /// </summary>
+    public class GridNoRowsMarkupLinkClickEventArgs : GridEventArgs
+    {
+        #region Private variables
+
+        private string _HRef;
+        private string _Name;
+
+        #endregion
+
+        ///<summary>
+        /// GridNoRowsMarkupLinkClickEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="name"></param>
+        ///<param name="href"></param>
+        public GridNoRowsMarkupLinkClickEventArgs(
+            GridPanel gridPanel, string name, string href)
+            : base(gridPanel)
+        {
+            _HRef = href;
+            _Name = name;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated HyperLink HRef
+        /// </summary>
+        public string HRef
+        {
+            get { return (_HRef); }
+        }
+
+        /// <summary>
+        /// Gets the associated HyperLink Name
+        /// </summary>
+        public string Name
+        {
+            get { return (_Name); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridPlayingSoundEventArgs
+
+    /// <summary>
+    /// GridPlayingSoundEventArgs
+    /// </summary>
+    public class GridPlayingSoundEventArgs : CancelEventArgs
+    {
+        #region Private variables
+
+        private GridPanel _GridPanel;
+        private object _Item;
+        private PlaySoundContext _PlaySoundContext;
+
+        #endregion
+
+        /// <summary>
+        /// GridPlayingSoundEventArgs
+        /// </summary>
+        /// <param name="panel"></param>
+        /// <param name="gridElement"></param>
+        /// <param name="context"></param>
+        public GridPlayingSoundEventArgs(
+            GridPanel panel, object item, PlaySoundContext context)
+        {
+            _GridPanel = panel;
+            _Item = item;
+            _PlaySoundContext = context;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the GridPanel
+        /// </summary>
+        public GridPanel GridPanel
+        {
+            get { return (_GridPanel); }
+        }
+
+        /// <summary>
+        /// Gets the grid "item" (GridCell, GridRow, CellRange, etc)
+        /// associated with the event.
+        /// </summary>
+        public object Item
+        {
+            get { return (_Item); }
+        }
+
+        /// <summary>
+        /// Gets the context under which the event is being played.
+        /// </summary>
+        public PlaySoundContext PlaySoundContext
+        {
+            get { return (_PlaySoundContext); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridPostRenderCellEventArgs
+
+    /// <summary>
+    /// GridPostRenderCellEventArgs
+    /// </summary>
+    public class GridPostRenderCellEventArgs : GridCellEventArgs
+    {
+        #region Private variables
+
+        private Rectangle _Bounds;
+        private Graphics _Graphics;
+        private RenderParts _RenderParts;
+
+        #endregion
+
+        ///<summary>
+        /// GridPostRenderCellEventArgs
+        ///</summary>
+        ///<param name="graphics"></param>
+        ///<param name="gridPanel"></param>
+        ///<param name="gridCell"></param>
+        ///<param name="parts"></param>
+        ///<param name="bounds"></param>
+        public GridPostRenderCellEventArgs(Graphics graphics,
+            GridPanel gridPanel, GridCell gridCell, RenderParts parts, Rectangle bounds)
+            : base(gridPanel, gridCell)
+        {
+            _Bounds = bounds;
+            _Graphics = graphics;
+            _RenderParts = parts;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the cell bounding rectangle
+        /// </summary>
+        public Rectangle Bounds
+        {
+            get { return (_Bounds); }
+        }
+
+        /// <summary>
+        /// Gets the Graphics object
+        /// </summary>
+        public Graphics Graphics
+        {
+            get { return (_Graphics); }
+        }
+
+        /// <summary>
+        /// Gets the cell parts to render
+        /// </summary>
+        public RenderParts RenderParts
+        {
+            get { return (_RenderParts); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridPreRenderCellEventArgs
+
+    /// <summary>
+    /// GridPreRenderCellEventArgs
+    /// </summary>
+    public class GridPreRenderCellEventArgs : GridPostRenderCellEventArgs
+    {
+        #region Private variables
+
+        private bool _Cancel;
+
+        #endregion
+
+        ///<summary>
+        /// GridPreRenderCellEventArgs
+        ///</summary>
+        ///<param name="graphics"></param>
+        ///<param name="gridPanel"></param>
+        ///<param name="gridCell"></param>
+        ///<param name="parts"></param>
+        ///<param name="bounds"></param>
+        public GridPreRenderCellEventArgs(Graphics graphics,
+            GridPanel gridPanel, GridCell gridCell, RenderParts parts, Rectangle bounds)
+            : base(graphics, gridPanel, gridCell, parts, bounds)
+        {
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets or sets whether
+        /// to cancel the operation entirely
+        /// </summary>
+        public bool Cancel
+        {
+            get { return (_Cancel); }
+            set { _Cancel = value; }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridPostRenderRowEventArgs
+
+    /// <summary>
+    /// GridPostRenderRowEventArgs
+    /// </summary>
+    public class GridPostRenderRowEventArgs : GridRowEventArgs
+    {
+        #region Private variables
+
+        private Graphics _Graphics;
+        private Rectangle _Bounds;
+        private RenderParts _RenderParts;
+
+        #endregion
+
+        ///<summary>
+        /// GridPostRenderEventArgs
+        ///</summary>
+        ///<param name="graphics"></param>
+        ///<param name="gridPanel"></param>
+        ///<param name="gridRow"></param>
+        ///<param name="parts"></param>
+        ///<param name="bounds"></param>
+        public GridPostRenderRowEventArgs(Graphics graphics, GridPanel gridPanel,
+            GridContainer gridRow, RenderParts parts, Rectangle bounds)
+            : base(gridPanel, gridRow)
+        {
+            _Graphics = graphics;
+            _RenderParts = parts;
+            _Bounds = bounds;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the Graphics object
+        /// </summary>
+        public Graphics Graphics
+        {
+            get { return (_Graphics); }
+        }
+
+        /// <summary>
+        /// Gets the bounding rectangle
+        /// </summary>
+        public Rectangle Bounds
+        {
+            get { return (_Bounds); }
+        }
+
+        /// <summary>
+        /// Gets the parts to render
+        /// </summary>
+        public RenderParts RenderParts
+        {
+            get { return (_RenderParts); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridPreRenderRowEventArgs
+
+    /// <summary>
+    /// GridPreRenderRowEventArgs
+    /// </summary>
+    public class GridPreRenderRowEventArgs : GridPostRenderRowEventArgs
+    {
+        #region Private variables
+
+        private bool _Cancel;
+
+        #endregion
+
+        ///<summary>
+        /// GridPreRenderRowEventArgs
+        ///</summary>
+        ///<param name="graphics"></param>
+        ///<param name="gridPanel"></param>
+        ///<param name="gridRow"></param>
+        ///<param name="parts"></param>
+        ///<param name="bounds"></param>
+        public GridPreRenderRowEventArgs(Graphics graphics, GridPanel gridPanel,
+            GridContainer gridRow, RenderParts parts, Rectangle bounds)
+            : base(graphics, gridPanel, gridRow, parts, bounds)
+        {
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets or sets whether
+        /// to cancel the operation entirely
+        /// </summary>
+        public bool Cancel
+        {
+            get { return (_Cancel); }
+            set { _Cancel = value; }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridPostRenderColumnHeaderEventArgs
+
+    /// <summary>
+    /// GridPostRenderColumnHeaderEventArgs
+    /// </summary>
+    public class GridPostRenderColumnHeaderEventArgs : GridEventArgs
+    {
+        #region Private variables
+
+        private Rectangle _Bounds;
+        private Graphics _Graphics;
+        private GridColumnHeader _ColumnHeader;
+        private GridColumn _GridColumn;
+        private RenderParts _RenderParts;
+
+        #endregion
+
+        ///<summary>
+        /// GridPostRenderColumnHeaderEventArgs
+        ///</summary>
+        ///<param name="graphics"></param>
+        ///<param name="gridPanel"></param>
+        ///<param name="columnHeader"></param>
+        ///<param name="column"></param>
+        ///<param name="parts"></param>
+        ///<param name="bounds"></param>
+        public GridPostRenderColumnHeaderEventArgs(Graphics graphics, GridPanel gridPanel,
+            GridColumnHeader columnHeader, GridColumn column, RenderParts parts, Rectangle bounds)
+            : base(gridPanel)
+        {
+            _Bounds = bounds;
+            _Graphics = graphics;
+            _ColumnHeader = columnHeader;
+            _GridColumn = column;
+            _RenderParts = parts;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the cell bounding rectangle
+        /// </summary>
+        public Rectangle Bounds
+        {
+            get { return (_Bounds); }
+        }
+
+        /// <summary>
+        /// Gets the Graphics object
+        /// </summary>
+        public Graphics Graphics
+        {
+            get { return (_Graphics); }
+        }
+
+        /// <summary>
+        /// Gets the associated GridColumnHeader
+        /// </summary>
+        public GridColumnHeader ColumnHeader
+        {
+            get { return (_ColumnHeader); }
+        }
+
+        /// <summary>
+        /// Gets the associated GridColumn (which can be null
+        /// if the ColumnHeader's RowHeader is being rendered)
+        /// </summary>
+        public GridColumn GridColumn
+        {
+            get { return (_GridColumn); }
+        }
+
+        /// <summary>
+        /// Gets the cell parts to render
+        /// </summary>
+        public RenderParts RenderParts
+        {
+            get { return (_RenderParts); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridPreRenderColumnHeaderEventArgs
+
+    /// <summary>
+    /// GridPreRenderColumnHeaderEventArgs
+    /// </summary>
+    public class GridPreRenderColumnHeaderEventArgs : GridPostRenderColumnHeaderEventArgs
+    {
+        #region Private variables
+
+        private bool _Cancel;
+
+        #endregion
+
+        ///<summary>
+        /// GridPreRenderColumnHeaderEventArgs
+        ///</summary>
+        ///<param name="graphics"></param>
+        ///<param name="gridPanel"></param>
+        ///<param name="header"></param>
+        ///<param name="column"></param>
+        ///<param name="parts"></param>
+        ///<param name="bounds"></param>
+        public GridPreRenderColumnHeaderEventArgs(Graphics graphics, GridPanel gridPanel,
+            GridColumnHeader header, GridColumn column, RenderParts parts, Rectangle bounds)
+            : base(graphics, gridPanel, header, column, parts, bounds)
+        {
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets or sets whether
+        /// to cancel the operation entirely
+        /// </summary>
+        public bool Cancel
+        {
+            get { return (_Cancel); }
+            set { _Cancel = value; }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridPostRenderColumnGroupHeaderEventArgs
+
+    /// <summary>
+    /// GridPostRenderColumnGroupHeaderEventArgs
+    /// </summary>
+    public class GridPostRenderColumnGroupHeaderEventArgs : GridEventArgs
+    {
+        #region Private variables
+
+        private Rectangle _Bounds;
+        private Graphics _Graphics;
+        private GridColumnHeader _ColumnHeader;
+        private ColumnGroupHeader _GroupHeader;
+        private RenderParts _RenderParts;
+
+        #endregion
+
+        ///<summary>
+        /// GridPostRenderColumnGroupHeaderEventArgs
+        ///</summary>
+        ///<param name="graphics"></param>
+        ///<param name="gridPanel"></param>
+        ///<param name="columnHeader"></param>
+        ///<param name="groupHeader"></param>
+        ///<param name="parts"></param>
+        ///<param name="bounds"></param>
+        public GridPostRenderColumnGroupHeaderEventArgs(Graphics graphics, GridPanel gridPanel,
+            GridColumnHeader columnHeader, ColumnGroupHeader groupHeader, RenderParts parts, Rectangle bounds)
+            : base(gridPanel)
+        {
+            _Bounds = bounds;
+            _Graphics = graphics;
+            _ColumnHeader = columnHeader;
+            _GroupHeader = groupHeader;
+            _RenderParts = parts;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the cell bounding rectangle
+        /// </summary>
+        public Rectangle Bounds
+        {
+            get { return (_Bounds); }
+        }
+
+        /// <summary>
+        /// Gets the Graphics object
+        /// </summary>
+        public Graphics Graphics
+        {
+            get { return (_Graphics); }
+        }
+
+        /// <summary>
+        /// Gets the associated ColumnHeader
+        /// </summary>
+        public GridColumnHeader ColumnHeader
+        {
+            get { return (_ColumnHeader); }
+        }
+
+        /// <summary>
+        /// Gets the associated GroupHeader
+        /// </summary>
+        public ColumnGroupHeader GroupHeader
+        {
+            get { return (_GroupHeader); }
+        }
+
+        /// <summary>
+        /// Gets the cell parts to render
+        /// </summary>
+        public RenderParts RenderParts
+        {
+            get { return (_RenderParts); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridPreRenderColumnGroupHeaderEventArgs
+
+    /// <summary>
+    /// GridPreRenderColumnGroupHeaderEventArgs
+    /// </summary>
+    public class GridPreRenderColumnGroupHeaderEventArgs : GridPostRenderColumnGroupHeaderEventArgs
+    {
+        #region Private variables
+
+        private bool _Cancel;
+
+        #endregion
+
+        ///<summary>
+        /// GridPreRenderColumnGroupHeaderEventArgs
+        ///</summary>
+        ///<param name="graphics"></param>
+        ///<param name="gridPanel"></param>
+        ///<param name="header"></param>
+        ///<param name="groupHeader"></param>
+        ///<param name="parts"></param>
+        ///<param name="bounds"></param>
+        public GridPreRenderColumnGroupHeaderEventArgs(Graphics graphics, GridPanel gridPanel,
+            GridColumnHeader header, ColumnGroupHeader groupHeader, RenderParts parts, Rectangle bounds)
+            : base(graphics, gridPanel, header, groupHeader, parts, bounds)
+        {
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets or sets whether
+        /// to cancel the operation entirely
+        /// </summary>
+        public bool Cancel
+        {
+            get { return (_Cancel); }
+            set { _Cancel = value; }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridPostRenderFilterPopupGripBarEventArgs
+
+    /// <summary>
+    /// GridPostRenderFilterPopupGripBarEventArgs
+    /// </summary>
+    public class GridPostRenderFilterPopupGripBarEventArgs : GridColumnEventArgs
+    {
+        #region Private variables
+
+        private Graphics _Graphics;
+        private FilterPopup _FilterPopup;
+        private Rectangle _Bounds;
+
+        #endregion
+
+        ///<summary>
+        /// GridPostRenderFilterPopupGripBarEventArgs
+        ///</summary>
+        ///<param name="graphics"></param>
+        ///<param name="filterPopup"></param>
+        ///<param name="gridColumn"></param>
+        ///<param name="bounds"></param>
+        public GridPostRenderFilterPopupGripBarEventArgs(Graphics graphics,
+            FilterPopup filterPopup, GridColumn gridColumn, Rectangle bounds)
+            : base(gridColumn.GridPanel, gridColumn)
+        {
+            _Graphics = graphics;
+            _FilterPopup = filterPopup;
+            _Bounds = bounds;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the GripBar bounding rectangle
+        /// </summary>
+        public Rectangle Bounds
+        {
+            get { return (_Bounds); }
+        }
+
+        /// <summary>
+        /// Gets the FilterPopup object
+        /// </summary>
+        public FilterPopup FilterPopup
+        {
+            get { return (_FilterPopup); }
+        }
+
+        /// <summary>
+        /// Gets the Graphics object
+        /// </summary>
+        public Graphics Graphics
+        {
+            get { return (_Graphics); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridPreRenderFilterPopupGripBarEventArgs
+
+    /// <summary>
+    /// GridPreRenderFilterPopupGripBarEventArgs
+    /// </summary>
+    public class GridPreRenderFilterPopupGripBarEventArgs : GridPostRenderFilterPopupGripBarEventArgs
+    {
+        #region Private variables
+
+        private bool _Cancel;
+
+        #endregion
+
+        ///<summary>
+        /// GridPreRenderFilterPopupGripBarEventArgs
+        ///</summary>
+        ///<param name="graphics"></param>
+        ///<param name="filterPopup"></param>
+        ///<param name="gridColumn"></param>
+        ///<param name="bounds"></param>
+        public GridPreRenderFilterPopupGripBarEventArgs(Graphics graphics,
+            FilterPopup filterPopup, GridColumn gridColumn, Rectangle bounds)
+            : base(graphics, filterPopup, gridColumn, bounds)
+        {
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets or sets whether to cancel the operation entirely
+        /// </summary>
+        public bool Cancel
+        {
+            get { return (_Cancel); }
+            set { _Cancel = value; }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridPostRenderFilterRowEventArgs
+
+    /// <summary>
+    /// GridPostRenderFilterRowEventArgs
+    /// </summary>
+    public class GridPostRenderFilterRowEventArgs : GridEventArgs
+    {
+        #region Private variables
+
+        private Rectangle _Bounds;
+        private Graphics _Graphics;
+        private GridFilter _GridFilter;
+        private GridColumn _GridColumn;
+        private RenderParts _RenderParts;
+
+        #endregion
+
+        ///<summary>
+        /// GridPostRenderFilterRowEventArgs
+        ///</summary>
+        ///<param name="graphics"></param>
+        ///<param name="gridPanel"></param>
+        ///<param name="filter"></param>
+        ///<param name="column"></param>
+        ///<param name="parts"></param>
+        ///<param name="bounds"></param>
+        public GridPostRenderFilterRowEventArgs(Graphics graphics, GridPanel gridPanel,
+            GridFilter filter, GridColumn column, RenderParts parts, Rectangle bounds)
+            : base(gridPanel)
+        {
+            _Bounds = bounds;
+            _Graphics = graphics;
+            _GridFilter = filter;
+            _GridColumn = column;
+            _RenderParts = parts;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the bounding rectangle
+        /// </summary>
+        public Rectangle Bounds
+        {
+            get { return (_Bounds); }
+        }
+
+        /// <summary>
+        /// Gets the Graphics object
+        /// </summary>
+        public Graphics Graphics
+        {
+            get { return (_Graphics); }
+        }
+
+        /// <summary>
+        /// Gets the associated GridFilter
+        /// </summary>
+        public GridFilter GridFilter
+        {
+            get { return (_GridFilter); }
+        }
+
+        /// <summary>
+        /// Gets the associated GridColumn (which can be null
+        /// if the Filter's RowHeader is being rendered)
+        /// </summary>
+        public GridColumn GridColumn
+        {
+            get { return (_GridColumn); }
+        }
+
+        /// <summary>
+        /// Gets the parts to render
+        /// </summary>
+        public RenderParts RenderParts
+        {
+            get { return (_RenderParts); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridPreRenderFilterRowEventArgs
+
+    /// <summary>
+    /// GridPreRenderFilterRowEventArgs
+    /// </summary>
+    public class GridPreRenderFilterRowEventArgs : GridPostRenderFilterRowEventArgs
+    {
+        #region Private variables
+
+        private bool _Cancel;
+
+        #endregion
+
+        ///<summary>
+        /// GridPreRenderFilterRowEventArgs
+        ///</summary>
+        ///<param name="graphics"></param>
+        ///<param name="gridPanel"></param>
+        ///<param name="filter"></param>
+        ///<param name="column"></param>
+        ///<param name="parts"></param>
+        ///<param name="bounds"></param>
+        public GridPreRenderFilterRowEventArgs(Graphics graphics, GridPanel gridPanel,
+            GridFilter filter, GridColumn column, RenderParts parts, Rectangle bounds)
+            : base(graphics, gridPanel, filter, column, parts, bounds)
+        {
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets or sets whether
+        /// to cancel the operation entirely
+        /// </summary>
+        public bool Cancel
+        {
+            get { return (_Cancel); }
+            set { _Cancel = value; }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridPostRenderGroupBoxConnectorEventArgs
+
+    /// <summary>
+    /// GridPostRenderGroupBoxConnectorEventArgs
+    /// </summary>
+    public class GridPostRenderGroupBoxConnectorEventArgs : GridEventArgs
+    {
+        #region Private variables
+
+        private Graphics _Graphics;
+        private GridGroupByRow _GroupByRow;
+        private GridGroupBox _GridGroupBox1;
+        private GridGroupBox _GridGroupBox2;
+
+        #endregion
+
+        ///<summary>
+        /// GridPostRenderGroupBoxConnectorEventArgs
+        ///</summary>
+        ///<param name="graphics"></param>
+        ///<param name="gridPanel"></param>
+        ///<param name="groupByRow"></param>
+        ///<param name="groupBox1"></param>
+        ///<param name="groupBox2"></param>
+        public GridPostRenderGroupBoxConnectorEventArgs(Graphics graphics,
+            GridPanel gridPanel, GridGroupByRow groupByRow, GridGroupBox groupBox1, GridGroupBox groupBox2)
+            : base(gridPanel)
+        {
+            _Graphics = graphics;
+            _GroupByRow = groupByRow;
+            _GridGroupBox1 = groupBox1;
+            _GridGroupBox2 = groupBox2;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the Graphics object
+        /// </summary>
+        public Graphics Graphics
+        {
+            get { return (_Graphics); }
+        }
+
+        /// <summary>
+        /// Gets the associated GroupByRow
+        /// </summary>
+        public GridGroupByRow GroupByRow
+        {
+            get { return (_GroupByRow); }
+        }
+
+        /// <summary>
+        /// Gets the first associated GridGroupBox
+        /// </summary>
+        public GridGroupBox GridGroupBox1
+        {
+            get { return (_GridGroupBox1); }
+        }
+
+        /// <summary>
+        /// Gets the second associated GridGroupBox
+        /// </summary>
+        public GridGroupBox GridGroupBox2
+        {
+            get { return (_GridGroupBox2); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridPreRenderGroupBoxConnectorEventArgs
+
+    /// <summary>
+    /// GridPreRenderGroupBoxConnectorEventArgs
+    /// </summary>
+    public class GridPreRenderGroupBoxConnectorEventArgs : GridPostRenderGroupBoxConnectorEventArgs
+    {
+        #region Private variables
+
+        private bool _Cancel;
+
+        #endregion
+
+        ///<summary>
+        /// GridPreRenderGroupBoxConnectorEventArgs
+        ///</summary>
+        ///<param name="graphics"></param>
+        ///<param name="gridPanel"></param>
+        ///<param name="groupByRow"></param>
+        ///<param name="groupBox1"></param>
+        ///<param name="groupBox2"></param>
+        public GridPreRenderGroupBoxConnectorEventArgs(Graphics graphics, GridPanel gridPanel,
+            GridGroupByRow groupByRow, GridGroupBox groupBox1, GridGroupBox groupBox2)
+            : base(graphics, gridPanel, groupByRow, groupBox1, groupBox2)
+        {
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets or sets whether
+        /// to cancel the operation entirely
+        /// </summary>
+        public bool Cancel
+        {
+            get { return (_Cancel); }
+            set { _Cancel = value; }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridPostRenderGroupBoxEventArgs
+
+    /// <summary>
+    /// GridPostRenderGroupBoxEventArgs
+    /// </summary>
+    public class GridPostRenderGroupBoxEventArgs : GridEventArgs
+    {
+        #region Private variables
+
+        private Graphics _Graphics;
+        private Rectangle _Bounds;
+        private RenderParts _RenderParts;
+        private GridGroupByRow _GroupByRow;
+        private GridGroupBox _GridGroupBox;
+
+        #endregion
+
+        ///<summary>
+        /// GridPostRenderGroupBoxEventArgs
+        ///</summary>
+        ///<param name="graphics"></param>
+        ///<param name="gridPanel"></param>
+        ///<param name="groupByRow"></param>
+        ///<param name="gridGroupBox"></param>
+        ///<param name="parts"></param>
+        ///<param name="bounds"></param>
+        public GridPostRenderGroupBoxEventArgs(Graphics graphics, GridPanel gridPanel,
+            GridGroupByRow groupByRow, GridGroupBox gridGroupBox, RenderParts parts, Rectangle bounds)
+            : base(gridPanel)
+        {
+            _Graphics = graphics;
+            _GroupByRow = groupByRow;
+            _GridGroupBox = gridGroupBox;
+            _RenderParts = parts;
+            _Bounds = bounds;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the Graphics object
+        /// </summary>
+        public Graphics Graphics
+        {
+            get { return (_Graphics); }
+        }
+
+        /// <summary>
+        /// Gets the bounding rectangle
+        /// </summary>
+        public Rectangle Bounds
+        {
+            get { return (_Bounds); }
+        }
+
+        /// <summary>
+        /// Gets the parts to render
+        /// </summary>
+        public RenderParts RenderParts
+        {
+            get { return (_RenderParts); }
+        }
+
+        /// <summary>
+        /// Gets the associated GroupByRow
+        /// </summary>
+        public GridGroupByRow GroupByRow
+        {
+            get { return (_GroupByRow); }
+        }
+
+        /// <summary>
+        /// Gets the associated GridGroupBox
+        /// </summary>
+        public GridGroupBox GridGroupBox
+        {
+            get { return (_GridGroupBox); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridPreRenderGroupBoxEventArgs
+
+    /// <summary>
+    /// GridPreRenderGroupBoxEventArgs
+    /// </summary>
+    public class GridPreRenderGroupBoxEventArgs : GridPostRenderGroupBoxEventArgs
+    {
+        #region Private variables
+
+        private bool _Cancel;
+
+        #endregion
+
+        ///<summary>
+        /// GridPreRenderGroupBoxEventArgs
+        ///</summary>
+        ///<param name="graphics"></param>
+        ///<param name="gridPanel"></param>
+        ///<param name="groupByRow"></param>
+        ///<param name="gridGroupBox"></param>
+        ///<param name="parts"></param>
+        ///<param name="bounds"></param>
+        public GridPreRenderGroupBoxEventArgs(Graphics graphics, GridPanel gridPanel,
+            GridGroupByRow groupByRow, GridGroupBox gridGroupBox, RenderParts parts, Rectangle bounds)
+            : base(graphics, gridPanel, groupByRow, gridGroupBox, parts, bounds)
+        {
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets or sets whether
+        /// to cancel the operation entirely
+        /// </summary>
+        public bool Cancel
+        {
+            get { return (_Cancel); }
+            set { _Cancel = value; }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridPostRenderTextRowEventArgs
+
+    /// <summary>
+    /// GridPostRenderTextRowEventArgs
+    /// </summary>
+    public class GridPostRenderTextRowEventArgs : GridEventArgs
+    {
+        #region Private variables
+
+        private Graphics _Graphics;
+        private Rectangle _Bounds;
+        private RenderParts _RenderParts;
+        private GridTextRow _GridTextRow;
+
+        #endregion
+
+        ///<summary>
+        /// GridPostRenderTextRowEventArgs
+        ///</summary>
+        ///<param name="graphics"></param>
+        ///<param name="gridPanel"></param>
+        ///<param name="gridTextRow"></param>
+        ///<param name="parts"></param>
+        ///<param name="bounds"></param>
+        public GridPostRenderTextRowEventArgs(Graphics graphics, GridPanel gridPanel,
+            GridTextRow gridTextRow, RenderParts parts, Rectangle bounds)
+            : base(gridPanel)
+        {
+            _Graphics = graphics;
+            _RenderParts = parts;
+            _Bounds = bounds;
+            _GridTextRow = gridTextRow;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the Graphics object
+        /// </summary>
+        public Graphics Graphics
+        {
+            get { return (_Graphics); }
+        }
+
+        /// <summary>
+        /// Gets the bounding rectangle
+        /// </summary>
+        public Rectangle Bounds
+        {
+            get { return (_Bounds); }
+        }
+
+        /// <summary>
+        /// Gets the parts to render
+        /// </summary>
+        public RenderParts RenderParts
+        {
+            get { return (_RenderParts); }
+        }
+
+        /// <summary>
+        /// Gets the associated GridTextRow
+        /// </summary>
+        public GridTextRow GridTextRow
+        {
+            get { return (_GridTextRow); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridPreRenderTextRowEventArgs
+
+    /// <summary>
+    /// GridPreRenderTextRowEventArgs
+    /// </summary>
+    public class GridPreRenderTextRowEventArgs : GridPostRenderTextRowEventArgs
+    {
+        #region Private variables
+
+        private bool _Cancel;
+
+        #endregion
+
+        ///<summary>
+        /// GridPreRenderTextRowEventArgs
+        ///</summary>
+        ///<param name="graphics"></param>
+        ///<param name="gridPanel"></param>
+        ///<param name="gridTextRow"></param>
+        ///<param name="parts"></param>
+        ///<param name="bounds"></param>
+        public GridPreRenderTextRowEventArgs(Graphics graphics, GridPanel gridPanel,
+            GridTextRow gridTextRow, RenderParts parts, Rectangle bounds)
+            : base(graphics, gridPanel, gridTextRow, parts, bounds)
+        {
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets or sets whether
+        /// to cancel the operation entirely
+        /// </summary>
+        public bool Cancel
+        {
+            get { return (_Cancel); }
+            set { _Cancel = value; }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridPreviewKeyDownEventArgs
+
+    ///<summary>
+    /// PreviewKeyDown event, with the ability to specify that the key has been handled
+    ///</summary>
+    public class GridPreviewKeyDownEventArgs : PreviewKeyDownEventArgs
+    {
+        #region Private variables
+
+        private bool _Handled;
+
+        #endregion
+
+        ///<summary>
+        /// PreviewKeyDown event, with the ability to specify that the key has been handled
+        ///</summary>
+        ///<param name="keyData"></param>
+        public GridPreviewKeyDownEventArgs(Keys keyData)
+            : base(keyData)
+        {
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets or sets whether the key was handled
+        /// </summary>
+        public bool Handled
+        {
+            get { return (_Handled); }
+            set { _Handled = value; }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridRefreshFilterEventArgs
+
+    /// <summary>
+    /// GridRefreshFilterEventArgs
+    /// </summary>
+    public class GridRefreshFilterEventArgs : GridCancelEventArgs
+    {
+        ///<summary>
+        /// GridRefreshFilterEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        public GridRefreshFilterEventArgs(GridPanel gridPanel)
+            : base(gridPanel)
+        {
+        }
+    }
+
+    #endregion
+
+    #region GridRowActivatedEventArgs
+
+    /// <summary>
+    /// GridRowActivatedEventArgs
+    /// </summary>
+    public class GridRowActivatedEventArgs : GridEventArgs
+    {
+        #region Private variables
+
+        private readonly GridContainer _OldActiveRow;
+        private readonly GridContainer _NewActiveRow;
+
+        #endregion
+
+        ///<summary>
+        /// GridRowActivatedEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="oldRow"></param>
+        ///<param name="newRow"></param>
+        public GridRowActivatedEventArgs(GridPanel gridPanel,
+            GridContainer oldRow, GridContainer newRow)
+            : base(gridPanel)
+        {
+            _OldActiveRow = oldRow;
+            _NewActiveRow = newRow;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the old (previous) ActiveRow
+        /// </summary>
+        public GridContainer OldActiveRow
+        {
+            get { return (_OldActiveRow); }
+        }
+
+        /// <summary>
+        /// Gets the new (current) ActiveRow
+        /// </summary>
+        public GridContainer NewActiveRow
+        {
+            get { return (_NewActiveRow); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridRowActivatingEventArgs
+
+    /// <summary>
+    /// GridRowActivatingEventArgs
+    /// </summary>
+    public class GridRowActivatingEventArgs : GridRowActivatedEventArgs
+    {
+        #region Private variables
+
+        private bool _Cancel;
+
+        #endregion
+
+        ///<summary>
+        /// GridRowActivatingEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="oldRow"></param>
+        ///<param name="newRow"></param>
+        public GridRowActivatingEventArgs(GridPanel gridPanel, GridContainer oldRow, GridContainer newRow)
+            : base(gridPanel, oldRow, newRow)
+        {
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets or sets whether
+        /// to cancel the operation entirely
+        /// </summary>
+        public bool Cancel
+        {
+            get { return (_Cancel); }
+            set { _Cancel = value; }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridRowAddedEventArgs
+
+    /// <summary>
+    /// GridRowAddedEventArgs
+    /// </summary>
+    public class GridRowAddedEventArgs : GridEventArgs
+    {
+        #region Private variables
+
+        private int _Index;
+
+        #endregion
+
+        ///<summary>
+        /// GridRowAddedEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="index"></param>
+        public GridRowAddedEventArgs(GridPanel gridPanel, int index)
+            : base(gridPanel)
+        {
+            _Index = index;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated GridPanel.Rows
+        /// index where the row is to be inserted
+        /// </summary>
+        public int Index
+        {
+            get { return (_Index); }
+            protected set { _Index = value; }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridRowAddingEventArgs
+
+    /// <summary>
+    /// GridRowAddingEventArgs
+    /// </summary>
+    public class GridRowAddingEventArgs : GridRowAddedEventArgs
+    {
+        #region Private variables
+
+        private bool _Cancel;
+
+        #endregion
+
+        ///<summary>
+        /// GridRowAddingEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="index"></param>
+        public GridRowAddingEventArgs(GridPanel gridPanel, int index)
+            : base(gridPanel, index)
+        {
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets or sets whether
+        /// to cancel the operation entirely
+        /// </summary>
+        public bool Cancel
+        {
+            get { return (_Cancel); }
+            set { _Cancel = value; }
+        }
+
+        /// <summary>
+        /// Gets the associated GridPanel.Rows
+        /// index where the row is to be inserted
+        /// </summary>
+        public new int Index
+        {
+            get { return (base.Index); }
+            set { base.Index = value; }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridRowCancelEventArgs
+
+    /// <summary>
+    /// GridRowCancelEventArgs
+    /// </summary>
+    public class GridRowCancelEventArgs : GridRowEventArgs
+    {
+        #region Private variables
+
+        private bool _Cancel;
+
+        #endregion
+
+        ///<summary>
+        /// GridRowCancelEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="gridRow"></param>
+        public GridRowCancelEventArgs(
+            GridPanel gridPanel, GridContainer gridRow)
+            : base(gridPanel, gridRow)
+        {
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets or sets whether to cancel the operation.
+        /// </summary>
+        public bool Cancel
+        {
+            get { return (_Cancel); }
+            set { _Cancel = value; }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridRowDeletedEventArgs
+
+    /// <summary>
+    /// GridRowMovedEventArgs
+    /// </summary>
+    public class GridRowDeletedEventArgs : GridEventArgs
+    {
+        #region Private variables
+
+        private readonly SelectedElements _SelectedRows;
+
+        #endregion
+
+        ///<summary>
+        /// GridRowDeletedEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="selRows"></param>
+        public GridRowDeletedEventArgs(GridPanel gridPanel, SelectedElements selRows)
+            : base(gridPanel)
+        {
+            _SelectedRows = selRows;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated selection of row indices to delete
+        /// </summary>
+        public SelectedElements SelectedRows
+        {
+            get { return (_SelectedRows); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridRowDeletingEventArgs
+
+    /// <summary>
+    /// GridRowDeletingEventArgs
+    /// </summary>
+    public class GridRowDeletingEventArgs : GridRowDeletedEventArgs
+    {
+        #region Private variables
+
+        private bool _Cancel;
+
+        #endregion
+
+        ///<summary>
+        /// GridRowDeletingEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="selRows"></param>
+        public GridRowDeletingEventArgs(GridPanel gridPanel, SelectedElements selRows)
+            : base(gridPanel, selRows)
+        {
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets or sets whether
+        /// to cancel the operation entirely
+        /// </summary>
+        public bool Cancel
+        {
+            get { return (_Cancel); }
+            set { _Cancel = value; }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridRowEventArgs
+
+    /// <summary>
+    /// GridRowEventArgs
+    /// </summary>
+    public class GridRowEventArgs : GridEventArgs
+    {
+        #region Private variables
+
+        private GridContainer _GridRow;
+
+        #endregion
+
+        ///<summary>
+        /// GridRowEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="gridRow"></param>
+        public GridRowEventArgs(GridPanel gridPanel, GridContainer gridRow)
+            : base(gridPanel)
+        {
+            _GridRow = gridRow;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated GridRow
+        /// </summary>
+        public GridContainer GridRow
+        {
+            get { return (_GridRow); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridRowClickEventArgs
+
+    /// <summary>
+    /// GridRowClickEventArgs
+    /// </summary>
+    public class GridRowClickEventArgs : GridRowEventArgs
+    {
+        #region Private variables
+
+        private bool _Cancel;
+        private RowArea _RowArea;
+        private MouseEventArgs _MouseEventArgs;
+
+        #endregion
+
+        ///<summary>
+        /// GridRowClickEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="gridRow"></param>
+        ///<param name="rowArea"></param>
+        ///<param name="e"></param>
+        public GridRowClickEventArgs(
+            GridPanel gridPanel, GridRow gridRow, RowArea rowArea, MouseEventArgs e)
+            : base(gridPanel, gridRow)
+        {
+            _RowArea = rowArea;
+            _MouseEventArgs = e;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets or sets whether to cancel the default operation
+        /// </summary>
+        public bool Cancel
+        {
+            get { return (_Cancel); }
+            set { _Cancel = value; }
+        }
+
+        /// <summary>
+        /// Gets the associated MouseEventArgs
+        /// </summary>
+        public MouseEventArgs MouseEventArgs
+        {
+            get { return (_MouseEventArgs); }
+        }
+
+        /// <summary>
+        /// Gets the associated RowArea
+        /// </summary>
+        public RowArea RowArea
+        {
+            get { return (_RowArea); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridRowDoubleClickEventArgs
+
+    /// <summary>
+    /// GridRowDoubleClickEventArgs
+    /// </summary>
+    public class GridRowDoubleClickEventArgs : GridRowClickEventArgs
+    {
+        ///<summary>
+        /// GridRowDoubleClickEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="gridRow"></param>
+        ///<param name="rowArea"></param>
+        ///<param name="e"></param>
+        public GridRowDoubleClickEventArgs(
+            GridPanel gridPanel, GridRow gridRow, RowArea rowArea, MouseEventArgs e)
+            : base(gridPanel, gridRow, rowArea, e)
+        {
+        }
+    }
+
+    #endregion
+
+    #region GridGetDetailRowHeightEventArgs
+
+    /// <summary>
+    /// GridGetDetailRowHeightEventArgs
+    /// </summary>
+    public class GridGetDetailRowHeightEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private GridRow _GridRow;
+        private GridPanel _GridPanel;
+
+        private int _PreDetailHeight;
+        private int _PostDetailHeight;
+
+        private GridLayoutInfo _LayoutInfo;
+        private Size _SizeNeeded;
+
+        #endregion
+
+        ///<summary>
+        /// GridGetDetailRowHeightEventArgs
+        ///</summary>
+        ///<param name="gridPanel">Associated GridPanel</param>
+        ///<param name="gridRow">Associated container row</param>
+        ///<param name="layoutInfo"></param>
+        ///<param name="sizeNeeded"></param>
+        ///<param name="preHeight"></param>
+        ///<param name="postHeight"></param>
+        public GridGetDetailRowHeightEventArgs(GridPanel gridPanel,
+            GridRow gridRow, GridLayoutInfo layoutInfo, Size sizeNeeded, int preHeight, int postHeight)
+        {
+            _GridPanel = gridPanel;
+            _GridRow = gridRow;
+
+            _SizeNeeded = sizeNeeded;
+            _LayoutInfo = layoutInfo;
+
+            _PreDetailHeight = preHeight;
+            _PostDetailHeight = postHeight;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the event Grid
+        /// </summary>
+        public GridPanel GridPanel
+        {
+            get { return (_GridPanel); }
+        }
+
+        /// <summary>
+        /// Gets the associated GridRow
+        /// </summary>
+        public GridRow GridRow
+        {
+            get { return (_GridRow); }
+        }
+
+        /// <summary>
+        /// Gets or sets the associated row PreDetail Height
+        /// </summary>
+        public int PreDetailHeight
+        {
+            get { return (_PreDetailHeight); }
+            set { _PreDetailHeight = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the associated row PostDetail Height
+        /// </summary>
+        public int PostDetailHeight
+        {
+            get { return (_PostDetailHeight); }
+            set { _PostDetailHeight = value; }
+        }
+
+        /// <summary>
+        /// Gets the associated row LayoutInfo
+        /// </summary>
+        public GridLayoutInfo LayoutInfo
+        {
+            get { return (_LayoutInfo); }
+        }
+
+        /// <summary>
+        /// Gets or sets the associated row's needed size
+        /// </summary>
+        public Size SizeNeeded
+        {
+            get { return (_SizeNeeded); }
+            set { _SizeNeeded = value; }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridGetGroupIdEventArgs
+
+    /// <summary>
+    /// GridGetGroupIdEventArgs
+    /// </summary>
+    public class GridGetGroupIdEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private GridPanel _GridPanel;
+        private GridElement _GridItem;
+        private GridColumn _GridColumn;
+
+        private object _GroupId;
+
+        #endregion
+
+        ///<summary>
+        /// GridGetGroupIdEventArgs
+        ///</summary>
+        ///<param name="gridPanel">Associated GridPanel</param>
+        ///<param name="gridItem">Associated grid element</param>
+        ///<param name="column">Associated grid column</param>
+        ///<param name="groupId">Associated Group identifier</param>
+        public GridGetGroupIdEventArgs(
+            GridPanel gridPanel, GridElement gridItem, GridColumn column, object groupId)
+        {
+            _GridPanel = gridPanel;
+            _GridColumn = column;
+            _GridItem = gridItem;
+
+            _GroupId = groupId;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the event Grid
+        /// </summary>
+        public GridPanel GridPanel
+        {
+            get { return (_GridPanel); }
+        }
+
+        /// <summary>
+        /// Gets the associated GridElement
+        /// </summary>
+        public GridElement GridItem
+        {
+            get { return (_GridItem); }
+        }
+
+        /// <summary>
+        /// Gets the associated GridColumn
+        /// </summary>
+        public GridColumn GridColumn
+        {
+            get { return (_GridColumn); }
+        }
+
+        /// <summary>
+        /// Gets or sets the associated row Group Identifier
+        /// </summary>
+        public object GroupId
+        {
+            get { return (_GroupId); }
+            set { _GroupId = value; }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridRowHeaderClickEventArgs
+
+    /// <summary>
+    /// GridRowHeaderClickEventArgs
+    /// </summary>
+    public class GridRowHeaderClickEventArgs : GridRowEventArgs
+    {
+        #region Private variables
+
+        private bool _Cancel;
+        private MouseEventArgs _MouseEventArgs;
+
+        #endregion
+
+        ///<summary>
+        /// GridRowHeaderClickEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="row"></param>
+        ///<param name="e"></param>
+        public GridRowHeaderClickEventArgs(
+            GridPanel gridPanel, GridContainer row, MouseEventArgs e)
+            : base(gridPanel, row)
+        {
+            _MouseEventArgs = e;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated MouseEventArgs
+        /// </summary>
+        public MouseEventArgs MouseEventArgs
+        {
+            get { return (_MouseEventArgs); }
+        }
+
+        /// <summary>
+        /// Gets or sets whether to cancel the operation
+        /// </summary>
+        public bool Cancel
+        {
+            get { return (_Cancel); }
+            set { _Cancel = value; }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridRowHeaderDoubleClickEventArgs
+
+    /// <summary>
+    /// GridRowHeaderDoubleClickEventArgs
+    /// </summary>
+    public class GridRowHeaderDoubleClickEventArgs : GridRowHeaderClickEventArgs
+    {
+        ///<summary>
+        /// GridRowHeaderDoubleClickEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="row"></param>
+        ///<param name="e"></param>
+        public GridRowHeaderDoubleClickEventArgs(
+            GridPanel gridPanel, GridContainer row, MouseEventArgs e)
+            : base(gridPanel, row, e)
+        {
+        }
+    }
+
+    #endregion
+
+    #region GridRowInfoEnterEventArgs
+
+    /// <summary>
+    /// GridRowInfoEnterEventArgs
+    /// </summary>
+    public class GridRowInfoEnterEventArgs : GridRowEventArgs
+    {
+        #region Private variables
+
+        private bool _Cancel;
+        private Point _Location;
+
+        #endregion
+
+        ///<summary>
+        /// GridRowInfoEnterEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="gridRow"></param>
+        ///<param name="pt"></param>
+        public GridRowInfoEnterEventArgs(
+            GridPanel gridPanel, GridRow gridRow, Point pt)
+            : base(gridPanel, gridRow)
+        {
+            _Location = pt;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets or sets whether to cancel the default operation
+        /// </summary>
+        public bool Cancel
+        {
+            get { return (_Cancel); }
+            set { _Cancel = value; }
+        }
+
+        /// <summary>
+        /// Gets the associated event Location
+        /// </summary>
+        public Point Location
+        {
+            get { return (_Location); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridRowInfoLeaveEventArgs
+
+    /// <summary>
+    /// GridRowInfoLeaveEventArgs
+    /// </summary>
+    public class GridRowInfoLeaveEventArgs : GridRowEventArgs
+    {
+        ///<summary>
+        /// GridRowInfoLeaveEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="gridRow"></param>
+        public GridRowInfoLeaveEventArgs(
+            GridPanel gridPanel, GridRow gridRow)
+            : base(gridPanel, gridRow)
+        {
+        }
+    }
+
+    #endregion
+
+    #region GridRowLoadedEventArgs
+
+    /// <summary>
+    /// GridRowLoadedEventArgs
+    /// </summary>
+    public class GridRowLoadedEventArgs : GridEventArgs
+    {
+        #region Private variables
+
+        private GridRow _GridRow;
+
+        #endregion
+
+        ///<summary>
+        /// GridRowLoadedEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="row"></param>
+        public GridRowLoadedEventArgs(GridPanel gridPanel, GridRow row)
+            : base(gridPanel)
+        {
+            _GridRow = row;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets a reference to the loaded GridRow
+        /// </summary>
+        public GridRow GridRow
+        {
+            get { return (_GridRow); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridRowMouseEventArgs
+
+    /// <summary>
+    /// GridRowMouseEventArgs
+    /// </summary>
+    public class GridRowMouseEventArgs : MouseEventArgs
+    {
+        #region Private variables
+
+        private readonly GridPanel _GridPanel;
+        private readonly GridContainer _GridRow;
+        private readonly RowArea _RowArea;
+
+        #endregion
+
+        ///<summary>
+        /// GridRowMouseEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="gridRow"></param>
+        ///<param name="ev"></param>
+        ///<param name="rowArea"></param>
+        public GridRowMouseEventArgs(GridPanel gridPanel, GridContainer gridRow, MouseEventArgs ev, RowArea rowArea)
+            : base(ev.Button, ev.Clicks, ev.X, ev.Y, ev.Delta)
+        {
+            _GridPanel = gridPanel;
+            _GridRow = gridRow;
+            _RowArea = rowArea;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated GridRow
+        /// </summary>
+        public GridContainer GridRow
+        {
+            get { return (_GridRow); }
+        }
+
+        /// <summary>
+        /// Gets the associated GridPanel
+        /// </summary>
+        public GridPanel GridPanel
+        {
+            get { return (_GridPanel); }
+        }
+
+        /// <summary>
+        /// Gets the associated RowArea
+        /// </summary>
+        public RowArea RowArea
+        {
+            get { return (_RowArea); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridRowMovedEventArgs
+
+    /// <summary>
+    /// GridRowMovedEventArgs
+    /// </summary>
+    public class GridRowMovedEventArgs : GridRowEventArgs
+    {
+        #region Private variables
+
+        private readonly GridContainer _GridContainer;
+
+        #endregion
+
+        ///<summary>
+        /// GridRowMovedEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="gridContainer"></param>
+        ///<param name="gridRow"></param>
+        public GridRowMovedEventArgs(GridPanel gridPanel,
+            GridContainer gridContainer, GridContainer gridRow)
+            : base(gridPanel, gridRow)
+        {
+            _GridContainer = gridContainer;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated GridContainer
+        /// </summary>
+        public GridContainer GridContainer
+        {
+            get { return (_GridContainer); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridRowMovingEventArgs
+
+    /// <summary>
+    /// GridRowMovingEventArgs
+    /// </summary>
+    public class GridRowMovingEventArgs : GridRowCancelEventArgs
+    {
+        #region Private variables
+
+        private int _SrcIndex;
+        private GridContainer _SrcContainer;
+
+        private int _DestIndex;
+        private GridContainer _DestContainer;
+
+        #endregion
+
+        ///<summary>
+        /// GridRowMovingEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="gridRow"></param>
+        ///<param name="srcCont"></param>
+        ///<param name="srcIndex"></param>
+        ///<param name="destCont"></param>
+        ///<param name="destIndex"></param>
+        public GridRowMovingEventArgs(GridPanel gridPanel, GridRow gridRow,
+            GridContainer srcCont, int srcIndex, GridContainer destCont, int destIndex)
+            : base(gridPanel, gridRow)
+        {
+            _SrcIndex = srcIndex;
+            _SrcContainer = srcCont;
+
+            _DestIndex = destIndex;
+            _DestContainer = destCont;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets or sets the Destination Container for the row
+        /// being moved.
+        /// </summary>
+        public GridContainer DestContainer
+        {
+            get { return (_DestContainer); }
+            set { _DestContainer = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the Destination index for the row
+        /// being moved.
+        /// </summary>
+        public int DestIndex
+        {
+            get { return (_DestIndex); }
+            set { _DestIndex = value; }
+        }
+
+        /// <summary>
+        /// Gets the Source Container of the row
+        /// being moved.
+        /// </summary>
+        public GridContainer SrcContainer
+        {
+            get { return (_SrcContainer); }
+        }
+
+        /// <summary>
+        /// Gets the Source index of the row being moved.
+        /// </summary>
+        public int SrcIndex
+        {
+            get { return (_SrcIndex); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridRowsPurgingEventArgs
+
+    /// <summary>
+    /// GridRowsPurgingEventArgs
+    /// </summary>
+    public class GridRowsPurgingEventArgs : GridRowCancelEventArgs
+    {
+        #region Private variables
+
+        private bool _IncludeNestedRows;
+
+        #endregion
+
+        ///<summary>
+        /// GridRowPurgeEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="gridRow"></param>
+        ///<param name="includeNestedRows"></param>
+        public GridRowsPurgingEventArgs(
+            GridPanel gridPanel, GridContainer gridRow, bool includeNestedRows)
+            : base(gridPanel, gridRow)
+        {
+            _IncludeNestedRows = includeNestedRows;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets or sets whether to include the associated GridPanel's 
+        /// nested rows when purging deleted rows.
+        /// </summary>
+        public bool IncludeNestedRows
+        {
+            get { return (_IncludeNestedRows); }
+            set { _IncludeNestedRows = value; }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridRowRestoredEventArgs
+
+    /// <summary>
+    /// GridRowRestoredEventArgs
+    /// </summary>
+    public class GridRowRestoredEventArgs : GridRowDeletedEventArgs
+    {
+        ///<summary>
+        /// GridRowRestoredEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="selRows"></param>
+        public GridRowRestoredEventArgs(GridPanel gridPanel, SelectedElements selRows)
+            : base(gridPanel, selRows)
+        {
+        }
+    }
+
+    #endregion
+
+    #region GridRowRestoringEventArgs
+
+    /// <summary>
+    /// GridRowRestoringEventArgs
+    /// </summary>
+    public class GridRowRestoringEventArgs : GridRowDeletingEventArgs
+    {
+        ///<summary>
+        /// GridRowRestoringEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="selRows"></param>
+        public GridRowRestoringEventArgs(GridPanel gridPanel, SelectedElements selRows)
+            : base(gridPanel, selRows)
+        {
+        }
+    }
+
+    #endregion
+
+    #region GridRowSetDefaultValuesEventArgs
+
+    /// <summary>
+    /// GridRowSetDefaultValuesEventArgs
+    /// </summary>
+    public class GridRowSetDefaultValuesEventArgs : GridEventArgs
+    {
+        #region Private variables
+
+        private readonly GridRow _GridRow;
+        private readonly NewRowContext _NewRowContext;
+
+        #endregion
+
+        ///<summary>
+        /// GridRowDeletedEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="gridRow"></param>
+        ///<param name="context"></param>
+        public GridRowSetDefaultValuesEventArgs(
+            GridPanel gridPanel, GridRow gridRow, NewRowContext context)
+            : base(gridPanel)
+        {
+            _GridRow = gridRow;
+            _NewRowContext = context;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated GridRow
+        /// </summary>
+        public GridRow GridRow
+        {
+            get { return (_GridRow); }
+        }
+
+        /// <summary>
+        /// Gets the associated context under which
+        /// the new row data needs to be initialized
+        /// </summary>
+        public NewRowContext NewRowContext
+        {
+            get { return (_NewRowContext); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridRowValidatedEventArgs
+
+    /// <summary>
+    /// GridRowValidatedEventArgs
+    /// </summary>
+    public class GridRowValidatedEventArgs : GridEventArgs
+    {
+        #region Private variables
+
+        private readonly GridRow _GridRow;
+
+        #endregion
+
+        ///<summary>
+        /// GridRowDeletedEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="gridRow"></param>
+        public GridRowValidatedEventArgs(GridPanel gridPanel, GridRow gridRow)
+            : base(gridPanel)
+        {
+            _GridRow = gridRow;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated GridRow
+        /// </summary>
+        public GridRow GridRow
+        {
+            get { return (_GridRow); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridRowValidatingEventArgs
+
+    /// <summary>
+    /// GridRowValidatingEventArgs
+    /// </summary>
+    public class GridRowValidatingEventArgs : GridRowValidatedEventArgs
+    {
+        #region Private variables
+
+        private bool _Cancel;
+
+        #endregion
+
+        ///<summary>
+        /// GridRowValidatingEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="gridRow"></param>
+        public GridRowValidatingEventArgs(GridPanel gridPanel, GridRow gridRow)
+            : base(gridPanel, gridRow)
+        {
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets or sets whether
+        /// to cancel the operation entirely
+        /// </summary>
+        public bool Cancel
+        {
+            get { return (_Cancel); }
+            set { _Cancel = value; }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridScrollEventArgs
+
+    /// <summary>
+    /// GridScrollEventArgs
+    /// </summary>
+    public class GridScrollEventArgs : GridEventArgs
+    {
+        #region Private variables
+
+        private ScrollEventArgs _ScrollEventArgs;
+
+        #endregion
+
+        ///<summary>
+        /// GridScrollEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="scrollEventArgs"></param>
+        public GridScrollEventArgs(
+            GridPanel gridPanel, ScrollEventArgs scrollEventArgs)
+            : base(gridPanel)
+        {
+            _ScrollEventArgs = scrollEventArgs;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the scroll event args
+        /// </summary>
+        public ScrollEventArgs ScrollEventArgs
+        {
+            get { return (_ScrollEventArgs); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridSelectionChangingEventArgs
+
+    /// <summary>
+    /// GridSelectionChangingEventArgs
+    /// </summary>
+    public class GridSelectionChangingEventArgs : GridEventArgs
+    {
+        #region Private variables
+
+        private SelectedElements _SelectedElements;
+
+        private int _Index;
+        private int _Count;
+
+        private bool _Selected;
+        private bool _Cancel;
+
+        #endregion
+
+        ///<summary>
+        /// GridSelectionChangingEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="selectedElements"></param>
+        ///<param name="index"></param>
+        ///<param name="count"></param>
+        ///<param name="selected"></param>
+        public GridSelectionChangingEventArgs(GridPanel gridPanel,
+            SelectedElements selectedElements, int index, int count, bool selected)
+            : base (gridPanel)
+        {
+            _SelectedElements = selectedElements;
+
+            _Index = index;
+            _Count = count;
+
+            _Selected = selected;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets or sets whether to Cancel the operation
+        /// </summary>
+        public bool Cancel
+        {
+            get { return (_Cancel); }
+            set { _Cancel = value; }
+        }
+
+        /// <summary>
+        /// Gets the associated SelectedElements collection
+        /// </summary>
+        public SelectedElements SelectedElements
+        {
+            get { return (_SelectedElements); }
+            set { _SelectedElements = value; }
+        }
+
+        /// <summary>
+        /// Gets the associated starting selection index
+        /// </summary>
+        public int Index
+        {
+            get { return (_Index); }
+        }
+
+        /// <summary>
+        /// Gets the associated starting selection count
+        /// </summary>
+        public int Count
+        {
+            get { return (_Count); }
+        }
+
+        /// <summary>
+        /// Gets the selected state (true/selected, false/cleared)
+        /// </summary>
+        public bool Selected
+        {
+            get { return (_Selected); }
+        }
+
+        #endregion
+
+    }
+
+    #endregion
+
+    #region GridTextRowEventArgs
+
+    /// <summary>
+    /// GridTextRowEventArgs
+    /// </summary>
+    public class GridTextRowEventArgs : GridEventArgs
+    {
+        #region Private variables
+
+        private readonly GridTextRow _GridTextRow;
+        private MouseEventArgs _MouseEventArgs;
+
+        #endregion
+
+        ///<summary>
+        /// GridTextRowEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="textRow"></param>
+        ///<param name="e"></param>
+        public GridTextRowEventArgs(
+            GridPanel gridPanel, GridTextRow textRow, MouseEventArgs e)
+            : base(gridPanel)
+        {
+            _GridTextRow = textRow;
+            _MouseEventArgs = e;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated GridTextRow
+        /// </summary>
+        public GridTextRow GridTextRow
+        {
+            get { return (_GridTextRow); }
+        }
+
+        /// <summary>
+        /// Gets the associated MouseEventArgs
+        /// </summary>
+        public MouseEventArgs MouseEventArgs
+        {
+            get { return (_MouseEventArgs); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridTextRowMarkupLinkClickEventArgs
+
+    /// <summary>
+    /// GridTextRowMarkupLinkClickEventArgs
+    /// </summary>
+    public class GridTextRowMarkupLinkClickEventArgs : GridEventArgs
+    {
+        #region Private variables
+
+        private string _HRef;
+        private string _Name;
+        private readonly GridTextRow _GridTextRow;
+
+        #endregion
+
+        ///<summary>
+        /// GridTextRowMarkupLinkClickEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="gridTextRow"></param>
+        ///<param name="name"></param>
+        ///<param name="href"></param>
+        public GridTextRowMarkupLinkClickEventArgs(GridPanel gridPanel,
+            GridTextRow gridTextRow, string name, string href)
+            : base(gridPanel)
+        {
+            _GridTextRow = gridTextRow;
+
+            _HRef = href;
+            _Name = name;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the associated HyperLink HRef
+        /// </summary>
+        public string HRef
+        {
+            get { return (_HRef); }
+        }
+
+        /// <summary>
+        /// Gets the associated HyperLink Name
+        /// </summary>
+        public string Name
+        {
+            get { return (_Name); }
+        }
+
+        /// <summary>
+        /// Gets the associated GridTextRow
+        /// </summary>
+        public GridTextRow GridTextRow
+        {
+            get { return (_GridTextRow); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridUpdateCellDisplayRangesEventArgs
+
+    /// <summary>
+    /// GridUpdateCellDisplayRangesEventArgs
+    /// </summary>
+    public class GridUpdateCellDisplayRangesEventArgs : GridEventArgs
+    {
+        #region Private variables
+
+        private DisplayRange _DisplayRange;
+        private List<CellRange> _CellRanges;
+        private GridContainer _GridContainer;
+
+        #endregion
+
+        ///<summary>
+        /// GridUpdateCellDisplayRangesEventArgs
+        ///</summary>
+        ///<param name="gridPanel">Associated GridPanel</param>
+        ///<param name="gridContainer">Associated GridContainer</param>
+        ///<param name="displayRange">Row/col range being merge evaluated</param>
+        ///<param name="cellRanges">List of CellRanges</param>
+        public GridUpdateCellDisplayRangesEventArgs(GridPanel gridPanel,
+            GridContainer gridContainer, DisplayRange displayRange, List<CellRange> cellRanges)
+            : base(gridPanel)
+        {
+            _GridContainer = gridContainer;
+            _DisplayRange = displayRange;
+            _CellRanges = cellRanges;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets or sets the CellRanges
+        /// </summary>
+        public List<CellRange> CellRanges
+        {
+            get { return (_CellRanges); }
+            set { _CellRanges = value; }
+        }
+
+        /// <summary>
+        /// Gets the current DisplayRange (row/col range
+        /// being processed / merged evaluated)
+        /// </summary>
+        public DisplayRange DisplayRange
+        {
+            get { return (_DisplayRange); }
+        }
+
+        /// <summary>
+        /// Gets the GridContainer 
+        /// </summary>
+        public GridContainer GridContainer
+        {
+            get { return (_GridContainer); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GridVirtualRowEventArgs
+
+    /// <summary>
+    /// GridVirtualRowEventArgs
+    /// </summary>
+    public class GridVirtualRowEventArgs : GridEventArgs
+    {
+        #region Private variables
+
+        private GridRow _GridRow;
+        private int _Index;
+
+        #endregion
+
+        ///<summary>
+        /// GridVirtualRowEventArgs
+        ///</summary>
+        ///<param name="gridPanel"></param>
+        ///<param name="gridRow"></param>
+        ///<param name="index"></param>
+        public GridVirtualRowEventArgs(GridPanel gridPanel, GridRow gridRow, int index)
+            : base(gridPanel)
+        {
+            _GridRow = gridRow;
+            _Index = index;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the GridRow
+        /// </summary>
+        public GridRow GridRow
+        {
+            get { return (_GridRow); }
+        }
+
+        /// <summary>
+        /// Gets the associated row index
+        /// </summary>
+        public int Index
+        {
+            get { return (_Index); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/TextDrawing.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/TextDrawing.cs
new file mode 100644
index 00000000..af3fc1e3
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/TextDrawing.cs	
@@ -0,0 +1,250 @@
+using System;
+using System.Drawing;
+using System.Windows.Forms;
+using System.Drawing.Text;
+
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    internal class TextDrawing
+    {
+        #region Public / internal variables
+
+        public static bool UseTextRenderer = true;
+        public static bool TextDrawingEnabled = true;
+
+        internal static bool UseGenericDefault = false;
+
+        #endregion
+
+        #region DrawString
+
+        public static void DrawString(Graphics g,
+            string text, Font font, Color color, int x, int y, eTextFormat format)
+        {
+            DrawString(g, text, font, color, new Rectangle(x, y, 0, 0), format);
+        }
+
+        public static void DrawString(Graphics g,
+            string text, Font font, Color color, Rectangle bounds, eTextFormat format)
+        {
+            if (UseTextRenderer && (format & eTextFormat.Vertical) == 0)
+                TextRenderer.DrawText(g, text, font, bounds, color, GetTextFormatFlags(format));
+            else
+                DrawStringLegacy(g, text, font, color, bounds, format);
+        }
+
+        #endregion
+
+        #region DrawStringLegacy
+
+        public static void DrawStringLegacy(Graphics g,
+            string text, Font font, Color color, Rectangle bounds, eTextFormat format)
+        {
+            if (color.IsEmpty == false && TextDrawingEnabled == true)
+            {
+                using (SolidBrush brush = new SolidBrush(color))
+                {
+                    using (StringFormat sf = GetStringFormat(format))
+                        g.DrawString(text, font, brush, bounds, sf);
+                }
+            }
+        }
+
+        #endregion
+
+        #region MeasureString
+
+        public static Size MeasureString(Graphics g,
+            string text, Font font)
+        {
+            return MeasureString(g, text, font, Size.Empty, eTextFormat.Default);
+        }
+
+        public static Size MeasureString(Graphics g,
+            string text, Font font, int proposedWidth, eTextFormat format)
+        {
+            return MeasureString(g, text, font, new Size(proposedWidth, 0), format);
+        }
+
+        public static Size MeasureString(Graphics g,
+            string text, Font font, int proposedWidth)
+        {
+            return MeasureString(g, text, font, new Size(proposedWidth, 0), eTextFormat.Default);
+        }
+
+        public static Size MeasureString(Graphics g,
+            string text, Font font, Size proposedSize, eTextFormat format)
+        {
+            if (UseTextRenderer && (format & eTextFormat.Vertical) == 0)
+            {
+                format = format & ~(format & eTextFormat.VerticalCenter); // Bug in .NET Framework 2.0
+                format = format & ~(format & eTextFormat.Bottom); // Bug in .NET Framework 2.0
+                format = format & ~(format & eTextFormat.HorizontalCenter); // Bug in .NET Framework 2.0
+                format = format & ~(format & eTextFormat.Right); // Bug in .NET Framework 2.0
+                format = format & ~(format & eTextFormat.EndEllipsis); // Bug in .NET Framework 2.0
+
+                return (Size.Ceiling(TextRenderer.MeasureText(g, text, font, proposedSize, GetTextFormatFlags(format))));
+            }
+
+            using (StringFormat sf = GetStringFormat(format))
+                return Size.Ceiling(g.MeasureString(text, font, proposedSize, sf));
+        }
+
+        #endregion
+
+        #region MeasureStringLegacy
+
+        public static Size MeasureStringLegacy(Graphics g,
+            string text, Font font, Size proposedSize, eTextFormat format)
+        {
+            using (StringFormat sf = GetStringFormat(format))
+                return (g.MeasureString(text, font, proposedSize, sf).ToSize());
+        }
+
+        #endregion
+
+        #region TranslateHorizontal
+
+        public static eTextFormat TranslateHorizontal(StringAlignment align)
+        {
+            if (align == StringAlignment.Center)
+                return (eTextFormat.HorizontalCenter);
+
+            if (align == StringAlignment.Far)
+                return (eTextFormat.Right);
+
+            return (eTextFormat.Default);
+        }
+
+        #endregion
+
+        #region TranslateVertical
+
+        public static eTextFormat TranslateVertical(StringAlignment align)
+        {
+            if (align == StringAlignment.Center)
+                return (eTextFormat.VerticalCenter);
+
+            if (align == StringAlignment.Far)
+                return (eTextFormat.Bottom);
+
+            return (eTextFormat.Default);
+        }
+
+        #endregion
+
+        #region GetTextFormatFlags
+
+        private static TextFormatFlags GetTextFormatFlags(eTextFormat format)
+        {
+            format |= eTextFormat.PreserveGraphicsTranslateTransform |
+                eTextFormat.PreserveGraphicsClipping;
+
+            if ((format & eTextFormat.SingleLine) == eTextFormat.SingleLine &&
+                (format & eTextFormat.WordBreak) == eTextFormat.WordBreak)
+            {
+                format = format & ~(format & eTextFormat.SingleLine);
+            }
+
+            return (TextFormatFlags)format;
+        }
+
+        #endregion
+
+        #region GetStringFormat
+
+        public static StringFormat GetStringFormat(eTextFormat format)
+        {
+            StringFormat sf = new StringFormat(UseGenericDefault
+                ? StringFormat.GenericDefault : StringFormat.GenericTypographic);
+
+            if (format == eTextFormat.Default)
+                return sf;
+
+            if ((format & eTextFormat.HorizontalCenter) == eTextFormat.HorizontalCenter)
+                sf.Alignment = StringAlignment.Center;
+
+            else if ((format & eTextFormat.Right) == eTextFormat.Right)
+                sf.Alignment = StringAlignment.Far;
+
+            if ((format & eTextFormat.VerticalCenter) == eTextFormat.VerticalCenter)
+                sf.LineAlignment = StringAlignment.Center;
+
+            else if ((format & eTextFormat.Bottom) == eTextFormat.Bottom)
+                sf.LineAlignment = StringAlignment.Far;
+
+            if ((format & eTextFormat.EndEllipsis) == eTextFormat.EndEllipsis)
+                sf.Trimming = StringTrimming.EllipsisCharacter;
+            else
+                sf.Trimming = StringTrimming.Character;
+
+            if ((format & eTextFormat.HidePrefix) == eTextFormat.HidePrefix)
+                sf.HotkeyPrefix = HotkeyPrefix.Hide;
+            else if ((format & eTextFormat.NoPrefix) == eTextFormat.NoPrefix)
+                sf.HotkeyPrefix = HotkeyPrefix.None;
+            else
+                sf.HotkeyPrefix = HotkeyPrefix.Show;
+
+            if ((format & eTextFormat.WordBreak) == eTextFormat.WordBreak)
+                sf.FormatFlags = sf.FormatFlags & ~(sf.FormatFlags & StringFormatFlags.NoWrap);
+            else
+                sf.FormatFlags |= StringFormatFlags.NoWrap;
+
+            if ((format & eTextFormat.LeftAndRightPadding) == eTextFormat.LeftAndRightPadding)
+                sf.FormatFlags |= StringFormatFlags.MeasureTrailingSpaces;
+
+            if ((format & eTextFormat.RightToLeft) == eTextFormat.RightToLeft)
+                sf.FormatFlags |= StringFormatFlags.DirectionRightToLeft;
+
+            if ((format & eTextFormat.Vertical) == eTextFormat.Vertical)
+                sf.FormatFlags |= StringFormatFlags.DirectionVertical;
+
+            if ((format & eTextFormat.NoClipping) == eTextFormat.NoClipping)
+                sf.FormatFlags |= StringFormatFlags.NoClip;
+
+            return (sf);
+        }
+
+        #endregion
+    }
+
+    #region enums
+
+    #region eTextFormat
+    [Flags]
+    internal enum eTextFormat
+    {
+        Bottom = 8,
+        Default = 0,
+        EndEllipsis = 0x8000,
+        ExpandTabs = 0x40,
+        ExternalLeading = 0x200,
+        GlyphOverhangPadding = 0,
+        HidePrefix = 0x100000,
+        HorizontalCenter = 1,
+        Internal = 0x1000,
+        Left = 0,
+        LeftAndRightPadding = 0x20000000,
+        ModifyString = 0x10000,
+        NoClipping = 0x100,
+        NoFullWidthCharacterBreak = 0x80000,
+        NoPadding = 0x10000000,
+        NoPrefix = 0x800,
+        PathEllipsis = 0x4000,
+        PrefixOnly = 0x200000,
+        PreserveGraphicsClipping = 0x1000000,
+        PreserveGraphicsTranslateTransform = 0x2000000,
+        Right = 2,
+        RightToLeft = 0x20000,
+        SingleLine = 0x20,
+        TextBoxControl = 0x2000,
+        Top = 0,
+        VerticalCenter = 4,
+        WordBreak = 0x10,
+        WordEllipsis = 0x40000,
+        Vertical = 0x40000000
+    }
+    #endregion
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/TreeDisplay.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/TreeDisplay.cs
new file mode 100644
index 00000000..844ba186
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGrid/TreeDisplay.cs	
@@ -0,0 +1,210 @@
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using DevComponents.DotNetBar.SuperGrid.Style;
+
+namespace DevComponents.DotNetBar.SuperGrid
+{
+    ///<summary>
+    /// TreeDisplay
+    ///</summary>
+    public class TreeDisplay
+    {
+        #region RenderLines
+
+        ///<summary>
+        /// RenderTreeLines
+        ///</summary>
+        ///<param name="g"></param>
+        ///<param name="panel"></param>
+        ///<param name="bounds"></param>
+        ///<param name="item"></param>
+        ///<param name="indentLevel"></param>
+        ///<param name="indentAmount"></param>
+        ///<param name="width"></param>
+        ///<param name="hasButton"></param>
+        static public void RenderLines(Graphics g, GridPanel panel, Rectangle bounds,
+            GridContainer item, int indentLevel, int indentAmount, int width, bool hasButton)
+        {
+            if (panel.NewFullIndex <= 1)
+                return;
+
+            Rectangle r = bounds;
+
+            SmoothingMode sm = g.SmoothingMode;
+            g.SmoothingMode = SmoothingMode.None;
+
+            GridPanelVisualStyle style = panel.GetEffectiveStyle();
+
+            if (style.TreeLinePattern == LinePattern.Dot)
+            {
+                if (r.Y % 2 == 0)
+                {
+                    r.Y++;
+
+                    if (r.Height % 2 != 0)
+                        r.Height--;
+                }
+            }
+
+            GetLineBounds(bounds, ref r, indentLevel, indentAmount, width);
+
+            using (Pen pen = new Pen(style.TreeLineColor, Dpi.Width1))
+            {
+                pen.DashStyle = (DashStyle)style.TreeLinePattern;
+
+                Rectangle t = Rectangle.Empty;
+                int n = 0;
+
+                if (item is GridPanel)
+                {
+                    t = item.BoundsRelative;
+
+                    t.X -= item.HScrollOffset;
+                    t.Y -= item.VScrollOffset;
+
+                    if (item.HasCheckBox == true)
+                        n = Dpi.Width(panel.CheckBoxSize.Width);
+                }
+
+                if (r.Width > 0)
+                    DrawDash(g, item, style, pen, r, t, n, hasButton);
+
+                int rowIndex = item.GridIndex;
+
+                GridContainer tRow = item;
+                GridContainer nRow = tRow.GetNextItem();
+
+                while (tRow != null)
+                {
+                    int tIndex = (nRow != null) ? nRow.GridIndex : -1;
+
+                    if (r.Width > 0)
+                    {
+                        if (t.IsEmpty || r.Right <= t.Left)
+                        {
+                            if (tIndex > rowIndex)
+                            {
+                                if (rowIndex == 0 && item.Parent is GridPanel)
+                                    DrawLower(g, style, pen, r);
+                                else
+                                    DrawFull(g, pen, r);
+                            }
+                            else
+                            {
+                                if (item == tRow && (indentLevel > 0 || rowIndex > 0))
+                                    DrawUpper(g, pen, r);
+                            }
+                        }
+                    }
+
+                    tRow = tRow.Parent as GridRow;
+
+                    if (tRow != null)
+                        nRow = tRow.GetNextItem();
+
+                    GetLineBounds(bounds, ref r, --indentLevel, indentAmount, width);
+                }
+            }
+
+            g.SmoothingMode = sm;
+        }
+
+        #endregion
+
+        #region GetLineBounds
+
+        static private void GetLineBounds(
+            Rectangle bounds, ref Rectangle r, int indentLevel, int indentAmount, int width)
+        {
+            r.X = bounds.X + indentAmount * indentLevel;
+            r.Width = width;
+        }
+
+        #endregion
+
+        #region DrawDash
+
+        static void DrawDash(Graphics g, GridContainer item, GridPanelVisualStyle style,
+            Pen pen, Rectangle r, Rectangle t, int n, bool hasButton)
+        {
+            int x = r.X + r.Width / 2 + 1;
+            int y = r.Y + r.Height / 2;
+
+            GridPanel ppanel = item.GetParentPanel();
+
+            if (ppanel.CheckBoxes == true && item.ShowCheckBox == false)
+            {
+                r.Width += Dpi.Width(ppanel.CheckBoxSize.Width);
+
+                if (item is GridPanel)
+                    r.Width += Dpi.Width4;
+            }
+
+            if (t.Width > 0 && r.Right > t.Left - n)
+                r.Width -= r.Right - (t.Left - n);
+            
+            if (r.Width > 0)
+            {
+                if (style.TreeLinePattern == LinePattern.Dot)
+                {
+                    x++;
+
+                    if (hasButton == false)
+                    {
+                        if (y % 2 == 0)
+                            y--;
+                    }
+                    else
+                    {
+                        y -= 2;
+                    }
+                }
+
+                g.DrawLine(pen, x, y, r.Right, y);
+            }
+        }
+
+        #endregion
+
+        #region DrawUpper
+
+        static void DrawUpper(Graphics g, Pen pen, Rectangle r)
+        {
+            int x = r.X + r.Width / 2;
+
+            g.DrawLine(pen, x, r.Y, x, r.Y + r.Height / 2);
+        }
+
+        #endregion
+
+        #region DrawLower
+
+        static void DrawLower(Graphics g,
+            GridPanelVisualStyle style, Pen pen, Rectangle r)
+        {
+            int x = r.X + r.Width / 2;
+            int y = r.Y + r.Height / 2;
+
+            if (style.TreeLinePattern == LinePattern.Dot)
+            {
+                if (y % 2 == 0)
+                    y--;
+            }
+
+            g.DrawLine(pen, x, y, x, r.Bottom);
+        }
+
+        #endregion
+
+        #region DrawFull
+
+        static void DrawFull(Graphics g, Pen pen, Rectangle r)
+        {
+            g.DrawLine(pen,
+                       r.X + r.Width / 2, r.Y,
+                       r.X + r.Width / 2, r.Bottom);
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGridControl.png b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGridControl.png
new file mode 100644
index 00000000..df28cefc
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/SuperGridControl.png differ
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/TextMarkup/BodyElement.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/TextMarkup/BodyElement.cs
new file mode 100644
index 00000000..37d3d151
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/TextMarkup/BodyElement.cs	
@@ -0,0 +1,95 @@
+using System;
+using System.Text;
+using System.Windows.Forms;
+
+#if AdvTree
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#endif
+{
+    internal class BodyElement : ContainerElement
+    {
+        #region Private Variables
+        private MarkupElementCollection m_ActiveElements=null;
+        private IActiveMarkupElement m_MouseOverElement = null;
+        internal bool HasExpandElement = false;
+        internal string PlainText = "";
+        #endregion
+
+        #region Events
+        public event EventHandler HyperLinkClick;
+        #endregion
+
+        #region Internal Implementation
+        public BodyElement()
+        {
+            m_ActiveElements = new MarkupElementCollection(null);
+        }
+
+        public MarkupElementCollection ActiveElements
+        {
+            get { return m_ActiveElements; }
+        }
+
+        public void MouseLeave(Control parent)
+        {
+            if (m_MouseOverElement != null)
+                m_MouseOverElement.MouseLeave(parent);
+            m_MouseOverElement = null;
+        }
+
+        public void MouseMove(Control parent, MouseEventArgs e)
+        {
+            if (m_MouseOverElement != null && m_MouseOverElement.HitTest(e.X, e.Y))
+                return;
+            if (m_MouseOverElement != null)
+                m_MouseOverElement.MouseLeave(parent);
+            
+            m_MouseOverElement = null;
+
+            foreach(IActiveMarkupElement el in m_ActiveElements)
+            {
+                if (el.HitTest(e.X, e.Y))
+                {
+                    m_MouseOverElement = el;
+                    m_MouseOverElement.MouseEnter(parent);
+                }
+            }
+        }
+
+        public void MouseDown(Control parent, MouseEventArgs e)
+        {
+            if (m_MouseOverElement != null)
+                m_MouseOverElement.MouseDown(parent, e);
+        }
+
+        public void MouseUp(Control parent, MouseEventArgs e)
+        {
+            if (m_MouseOverElement != null)
+                m_MouseOverElement.MouseUp(parent, e);
+        }
+
+        public void Click(Control parent)
+        {
+            if (m_MouseOverElement != null)
+            {
+                m_MouseOverElement.Click(parent);
+                if (m_MouseOverElement is HyperLink)
+                {
+                    if (HyperLinkClick != null)
+                        HyperLinkClick(m_MouseOverElement, new EventArgs());
+                }
+            }
+        }
+
+        internal IActiveMarkupElement MouseOverElement
+        {
+            get { return (m_MouseOverElement); }
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/TextMarkup/ContainerElement.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/TextMarkup/ContainerElement.cs
new file mode 100644
index 00000000..fc8c98e7
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/TextMarkup/ContainerElement.cs	
@@ -0,0 +1,111 @@
+using System;
+using System.Text;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+
+#if AdvTree
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+using DevComponents.UI.ContentManager;
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#endif
+{
+    internal class ContainerElement : MarkupElement
+    {
+        #region Private Variables
+        private SerialContentLayoutManager m_Layout = null;
+        private MarkupLayoutManager m_MarkupLayout = null;
+        #endregion
+
+        #region Internal Implementation
+        public override void Measure(Size availableSize, MarkupDrawContext d)
+        {
+            ArrangeInternal(new Rectangle(Point.Empty, availableSize), d);
+        }
+
+        protected virtual SerialContentLayoutManager GetLayoutManager(bool mutliLine)
+        {
+            if (m_Layout == null)
+            {
+                m_Layout = new SerialContentLayoutManager();
+                m_Layout.MultiLine = mutliLine;
+                m_Layout.ContentVerticalAlignment = eContentVerticalAlignment.Top;
+                m_Layout.BlockLineAlignment = eContentVerticalAlignment.Top;
+                m_Layout.BlockSpacing = 0;
+            }
+
+            m_Layout.EvenHeight = true;
+            return m_Layout;
+        }
+
+        private MarkupLayoutManager GetMarkupLayout()
+        {
+            if (m_MarkupLayout == null)
+            {
+                m_MarkupLayout = new MarkupLayoutManager();
+            }
+            return m_MarkupLayout;
+        }
+
+        public override void Render(MarkupDrawContext d)
+        {
+            Point offset = this.GetContainerOffset();
+            d.Offset.Offset(offset.X, offset.Y);
+
+            try
+            {
+                foreach (MarkupElement e in this.Elements)
+                {
+                    e.Render(d);
+                }
+            }
+            finally
+            {
+                d.Offset.Offset(-offset.X, -offset.Y);
+            }
+        }
+
+        protected virtual Point GetContainerOffset()
+        {
+            return this.Bounds.Location;
+        }
+
+        protected override void ArrangeCore(Rectangle finalRect, MarkupDrawContext d)
+        {
+            this.Bounds = finalRect;
+            ArrangeInternal(finalRect, d);
+        }
+
+        protected virtual void ArrangeInternal(Rectangle bounds, MarkupDrawContext d)
+        {
+            SerialContentLayoutManager layout = GetLayoutManager(d.AllowMultiLine);
+            layout.RightToLeft = d.RightToLeft;
+            MarkupLayoutManager markupLayout = GetMarkupLayout();
+            markupLayout.MarkupDrawContext = d;
+            try
+            {
+                MarkupElement[] blocks = new MarkupElement[this.Elements.Count];
+                this.Elements.CopyTo(blocks);
+
+                Rectangle r = layout.Layout(new Rectangle(Point.Empty, bounds.Size), blocks, markupLayout);
+                this.Bounds = new Rectangle(bounds.Location, r.Size);
+            }
+            finally
+            {
+                markupLayout.MarkupDrawContext = null;
+            }
+        }
+
+        /// <summary>
+        /// Returns whether markup element is an block element that always consumes a whole line in layout.
+        /// </summary>
+        public override bool IsBlockElement
+        {
+            get { return true; }
+        }
+        #endregion
+        
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/TextMarkup/Div.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/TextMarkup/Div.cs
new file mode 100644
index 00000000..a4bf93fb
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/TextMarkup/Div.cs	
@@ -0,0 +1,168 @@
+using System;
+using System.Text;
+using System.Drawing;
+using System.Xml;
+
+#if AdvTree
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+using DevComponents.UI.ContentManager;
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+using DevComponents.DotNetBar.SuperGrid.Style;
+namespace DevComponents.SuperGrid.TextMarkup
+#endif
+{
+    internal class Div : ContainerElement
+    {
+        #region Private Variables
+        private eParagraphAlignment m_Align = eParagraphAlignment.Left;
+        private eParagraphVerticalAlignment m_VAlign = eParagraphVerticalAlignment.Top;
+        private int m_Width = 0;
+        private Padding m_Padding = new Padding(0, 0, 0, 0);
+        #endregion
+
+        #region Internal Implementation
+        public eParagraphAlignment Align
+        {
+            get { return m_Align; }
+            set { m_Align = value; }
+        }
+
+        protected override SerialContentLayoutManager GetLayoutManager(bool multiLine)
+        {
+            SerialContentLayoutManager sm = base.GetLayoutManager(multiLine);
+            if (m_Align == eParagraphAlignment.Left)
+                sm.ContentAlignment = eContentAlignment.Left;
+            else if (m_Align == eParagraphAlignment.Right)
+                sm.ContentAlignment = eContentAlignment.Right;
+            else if (m_Align == eParagraphAlignment.Center)
+                sm.ContentAlignment = eContentAlignment.Center;
+
+            if (m_VAlign != eParagraphVerticalAlignment.Top)
+            {
+                sm.EvenHeight = false;
+                sm.BlockLineAlignment = (m_VAlign == eParagraphVerticalAlignment.Bottom ? eContentVerticalAlignment.Bottom : eContentVerticalAlignment.Middle);
+            }
+
+            return sm;
+        }
+
+        protected override Point GetContainerOffset()
+        {
+            if (m_Padding.Left == 0 && m_Padding.Top == 0)
+                return base.GetContainerOffset();
+            
+            Point p = base.GetContainerOffset();
+            p.X += m_Padding.Left;
+            p.Y += m_Padding.Top;
+            return p;
+        }
+
+        protected override void ArrangeInternal(Rectangle bounds, MarkupDrawContext d)
+        {
+            Rectangle r = bounds;
+            if (m_Width > 0)
+                r.Width = m_Width;
+            if (m_Padding.IsEmpty)
+            {
+                base.ArrangeInternal(r, d);
+                if (m_Width > 0)
+                    this.Bounds = new Rectangle(this.Bounds.X, this.Bounds.Y, m_Width, this.Bounds.Height + m_Padding.Bottom);
+            }
+            else
+            {
+                r.X += m_Padding.Left;
+                r.Y += m_Padding.Top;
+                base.ArrangeInternal(r, d);
+
+                r = new Rectangle(bounds.X, bounds.Y, this.Bounds.Width + m_Padding.Horizontal, this.Bounds.Height + m_Padding.Vertical);
+                if (m_Width > 0)
+                    r.Width = m_Width;
+                
+                this.Bounds = r;
+            }
+        }
+
+        public override void ReadAttributes(XmlTextReader reader)
+        {
+            for (int i = 0; i < reader.AttributeCount; i++)
+            {
+                reader.MoveToAttribute(i);
+                if (reader.Name.ToLower() == "align")
+                {
+                    string s = reader.Value.ToLower();
+                    if (s == "left")
+                        m_Align = eParagraphAlignment.Left;
+                    else if (s == "right")
+                        m_Align = eParagraphAlignment.Right;
+                    else if (s == "center")
+                        m_Align = eParagraphAlignment.Center;
+                }
+                else if (reader.Name.ToLower() == "valign")
+                {
+                    string s = reader.Value.ToLower();
+                    if (s == "top")
+                        m_VAlign = eParagraphVerticalAlignment.Top;
+                    else if (s == "middle")
+                        m_VAlign = eParagraphVerticalAlignment.Middle;
+                    else if (s == "bottom")
+                        m_VAlign = eParagraphVerticalAlignment.Bottom;
+                }
+                else if (reader.Name.ToLower() == "width")
+                {
+                    try
+                    {
+                        m_Width = Int32.Parse(reader.Value);
+                    }
+                    catch
+                    {
+                        m_Width = 0;
+                    }
+                }
+                else if (reader.Name.ToLower() == "padding")
+                {
+                    try
+                    {
+                        string[] values = reader.Value.Split(',');
+                        if (values.Length > 0)
+                            m_Padding.Left = Int32.Parse(values[0]);
+                        if (values.Length > 1)
+                            m_Padding.Right = Int32.Parse(values[1]);
+                        if (values.Length > 2)
+                            m_Padding.Top = Int32.Parse(values[2]);
+                        if (values.Length > 3)
+                            m_Padding.Bottom = Int32.Parse(values[3]);
+                    }
+                    catch
+                    {
+                        m_Padding = new Padding(0,0,0,0);
+                    }
+                }
+            }
+        }
+        #endregion
+    }
+
+    #region eParagraphAlignment
+    /// <summary>
+    /// Indicates paragraph content alignment
+    /// </summary>
+    internal enum eParagraphAlignment
+    {
+        Left,
+        Right,
+        Center
+    }
+
+    /// <summary>
+    /// Indicates paragraph content alignment
+    /// </summary>
+    internal enum eParagraphVerticalAlignment
+    {
+        Top,
+        Middle,
+        Bottom
+    }
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/TextMarkup/EndMarkupElement.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/TextMarkup/EndMarkupElement.cs
new file mode 100644
index 00000000..b9ee4987
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/TextMarkup/EndMarkupElement.cs	
@@ -0,0 +1,48 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+#if AdvTree
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#endif
+{
+    internal class EndMarkupElement : MarkupElement
+    {
+        #region Internap Implementation
+        private MarkupElement m_StartElement = null;
+
+        public EndMarkupElement(MarkupElement startElement)
+        {
+            m_StartElement = startElement;
+        }
+
+        public override void Measure(System.Drawing.Size availableSize, MarkupDrawContext d)
+        {
+            m_StartElement.MeasureEnd(availableSize, d);
+            this.Bounds = Rectangle.Empty;
+        }
+
+        public override void Render(MarkupDrawContext d)
+        {
+            m_StartElement.RenderEnd(d);
+        }
+
+        protected override void ArrangeCore(System.Drawing.Rectangle finalRect, MarkupDrawContext d)
+        {
+            this.Bounds = Rectangle.Empty;
+        }
+
+        /// <summary>
+        /// Gets reference to markup start element.
+        /// </summary>
+        public MarkupElement StartElement
+        {
+            get { return m_StartElement; }
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/TextMarkup/ExpandElement.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/TextMarkup/ExpandElement.cs
new file mode 100644
index 00000000..43f61f2f
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/TextMarkup/ExpandElement.cs	
@@ -0,0 +1,199 @@
+using System;
+using System.Text;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Xml;
+
+#if AdvTree
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#endif
+{
+    internal class ExpandElement : MarkupElement
+    {
+        #region Internal Implementation
+        private Size m_DefaultSize = new Size(5, 4);
+        private eExpandDirection m_Direction = eExpandDirection.Default;
+
+        public override void Measure(System.Drawing.Size availableSize, MarkupDrawContext d)
+        {
+            this.Bounds = new Rectangle(Point.Empty, m_DefaultSize);
+        }
+
+        protected override void ArrangeCore(System.Drawing.Rectangle finalRect, MarkupDrawContext d) { }
+
+        public override void Render(MarkupDrawContext d)
+        {
+            Rectangle r = this.Bounds;
+            r.Offset(d.Offset);
+
+            if (!d.ClipRectangle.IsEmpty && !r.IntersectsWith(d.ClipRectangle))
+                return;
+
+            Graphics g = d.Graphics;
+            Color color = d.CurrentForeColor;
+            //Color shadeColor = Color.FromArgb(96, Color.White);
+
+            eExpandDirection direction = eExpandDirection.Bottom;
+            if (m_Direction != eExpandDirection.Default)
+                direction = m_Direction;
+
+            #if DOTNETBAR
+            if(d.ContextObject is ButtonItem)
+            {
+                if (m_Direction == eExpandDirection.Default)
+                {
+                    ButtonItem item = d.ContextObject as ButtonItem;
+                    if (item.IsOnMenu)
+                    {
+                        direction = eExpandDirection.Right;
+                        if (item.PopupSide == ePopupSide.Default && d.RightToLeft || item.PopupSide == ePopupSide.Left)
+                            direction = eExpandDirection.Left;
+                    }
+                    else if (item.PopupSide == ePopupSide.Default)
+                        direction = eExpandDirection.Bottom;
+                    else if (item.PopupSide == ePopupSide.Left)
+                        direction = eExpandDirection.Left;
+                    else if (item.PopupSide == ePopupSide.Right)
+                        direction = eExpandDirection.Right;
+                    else if (item.PopupSide == ePopupSide.Bottom)
+                        direction = eExpandDirection.Bottom;
+                    else if (item.PopupSide == ePopupSide.Top)
+                        direction = eExpandDirection.Top;
+                }
+            }
+            #endif
+
+            SmoothingMode sm = g.SmoothingMode;
+            g.SmoothingMode = SmoothingMode.None;
+
+            Rectangle shadeRect = r;
+            if (direction == eExpandDirection.Bottom || direction == eExpandDirection.PopupDropDown)
+                shadeRect.Offset(0, 1);
+            else if (direction == eExpandDirection.Top)
+                shadeRect.Offset(0, -1);
+            else if (direction == eExpandDirection.Left)
+                shadeRect.Offset(1, 0);
+            else if (direction == eExpandDirection.Right)
+                shadeRect.Offset(-1, 0);
+            Point[] p = GetExpandPolygon(shadeRect, direction);
+            //using (SolidBrush brush = new SolidBrush(shadeColor))
+            //    g.FillPolygon(brush, p);
+
+            p = GetExpandPolygon(r, direction);
+            using(SolidBrush brush = new SolidBrush(color))
+                g.FillPolygon(brush, p);
+
+            if (direction == eExpandDirection.PopupDropDown)
+            {
+                using (Pen pen = new Pen(color, 1))
+                    g.DrawLine(pen, r.X, r.Y - 2, r.Right - 1, r.Y - 2);
+                //using (Pen pen = new Pen(shadeColor, 1))
+                //    g.DrawLine(pen, r.X, r.Y - 1, r.Right - 1, r.Y - 1);
+            }
+
+            g.SmoothingMode = sm;
+
+            this.RenderBounds = r;
+        }
+
+        private Point[] GetExpandPolygon(Rectangle r, eExpandDirection direction)
+        {
+            Point[] p = new Point[3];
+            switch (direction)
+            {
+                case eExpandDirection.Right:
+                    {
+                        p[0].X = r.Left + 1;
+                        p[0].Y = r.Top + (r.Height - m_DefaultSize.Height) / 2 - 1;
+                        p[1].X = p[0].X;
+                        p[1].Y = p[0].Y + 6;
+                        p[2].X = p[0].X + 3;
+                        p[2].Y = p[0].Y + 3;
+                        break;
+                    }
+                case eExpandDirection.Left:
+                    {
+                        p[0].X = r.Left + 3;
+                        p[0].Y = r.Top + (r.Height - m_DefaultSize.Height) / 2 - 1;
+                        p[1].X = p[0].X;
+                        p[1].Y = p[0].Y + 6;
+                        p[2].X = p[0].X - 3;
+                        p[2].Y = p[0].Y + 3;
+                        break;
+                    }
+                case eExpandDirection.Top:
+                    {
+                        p[0].X = r.Left - 1;
+                        p[0].Y = r.Top + (r.Height - m_DefaultSize.Height) / 2 + m_DefaultSize.Height;
+                        p[1].X = p[0].X + 6;
+                        p[1].Y = p[0].Y;
+                        p[2].X = p[0].X + 3;
+                        p[2].Y = p[0].Y - 4;
+                        break;
+                    }
+                case eExpandDirection.Bottom:
+                case eExpandDirection.PopupDropDown:
+                    {
+                        p[0].X = r.Left;
+                        p[0].Y = r.Top + (r.Height - m_DefaultSize.Height) / 2 + 1;
+                        p[1].X = p[0].X + 5;
+                        p[1].Y = p[0].Y;
+                        p[2].X = p[0].X + 2;
+                        p[2].Y = p[0].Y + 3;
+                        break;
+                    }
+            }
+            return p;
+        }
+
+        public override void ReadAttributes(XmlTextReader reader)
+        {
+            m_Direction = eExpandDirection.Default;
+
+            for (int i = 0; i < reader.AttributeCount; i++)
+            {
+                reader.MoveToAttribute(i);
+                if (reader.Name.ToLower() == "direction")
+                {
+                    string s = reader.Value.ToLower();
+                    if (s == "left")
+                        m_Direction = eExpandDirection.Left;
+                    else if (s == "right")
+                        m_Direction = eExpandDirection.Right;
+                    else if (s == "top")
+                        m_Direction = eExpandDirection.Top;
+                    else if (s == "bottom")
+                        m_Direction = eExpandDirection.Bottom;
+                    else if (s == "popup")
+                        m_Direction = eExpandDirection.PopupDropDown;
+                    break;
+                }
+            }
+        }
+
+        private enum eExpandDirection
+        {
+            Left,
+            Right,
+            Top,
+            Bottom,
+            Default,
+            PopupDropDown
+        }
+
+        /// <summary>
+        /// Returns whether layout manager can start new line with this element.
+        /// </summary>
+        public override bool CanStartNewLine
+        {
+            get { return false; }
+        }
+        #endregion
+
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/TextMarkup/FontChangeElement.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/TextMarkup/FontChangeElement.cs
new file mode 100644
index 00000000..3bd6835c
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/TextMarkup/FontChangeElement.cs	
@@ -0,0 +1,55 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+#if AdvTree
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#endif
+{
+    internal class FontChangeElement : MarkupElement
+    {
+        #region Private Variables
+        protected Font m_OldFont = null;
+        #endregion
+
+        #region Internal Implementation
+
+        public override void Measure(Size availableSize, MarkupDrawContext d)
+        {
+            this.Bounds = Rectangle.Empty;
+            SetFont(d);
+        }
+
+        public override void Render(MarkupDrawContext d)
+        {
+            SetFont(d);
+        }
+
+        protected virtual void SetFont(MarkupDrawContext d)
+        {
+            
+        }
+
+        public override void RenderEnd(MarkupDrawContext d)
+        {
+            if(m_OldFont!=null)
+                d.CurrentFont = m_OldFont;
+            m_OldFont = null;
+            base.RenderEnd(d);
+        }
+
+        public override void MeasureEnd(Size availableSize, MarkupDrawContext d)
+        {
+            if (m_OldFont != null)
+                d.CurrentFont = m_OldFont;
+            m_OldFont = null;
+            base.MeasureEnd(availableSize, d);
+        }
+        protected override void ArrangeCore(Rectangle finalRect, MarkupDrawContext d) { }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/TextMarkup/FontElement.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/TextMarkup/FontElement.cs
new file mode 100644
index 00000000..8cece36e
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/TextMarkup/FontElement.cs	
@@ -0,0 +1,186 @@
+using System;
+using System.Drawing;
+using System.Xml;
+
+#if AdvTree
+using DevComponents.Tree;
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+using DevComponents.DotNetBar.SuperGrid;
+namespace DevComponents.SuperGrid.TextMarkup
+#endif
+{
+    internal class FontElement : FontChangeElement
+    {
+        #region Private Variables
+
+        private Color _MForeColor = Color.Empty;
+        private Color _MOldForeColor = Color.Empty;
+        private int _MSize;
+        private bool _MRelativeSize;
+        private string _MFace = "";
+        private string _MSystemColorName = "";
+
+        #endregion
+
+        #region Internal Implementation
+        protected override void SetFont(MarkupDrawContext d)
+        {
+            Font font = d.CurrentFont;
+            try
+            {
+                if (_MFace != "" || _MSize != 0 && _MRelativeSize || _MSize>4 && !_MRelativeSize)
+                {
+                    if (_MFace != "")
+                        d.CurrentFont = new Font(_MFace, ((_MRelativeSize || _MSize == 0)?font.SizeInPoints + _MSize:_MSize), font.Style);
+                    else
+                        d.CurrentFont = new Font(font.FontFamily, ((_MRelativeSize || _MSize == 0)? font.SizeInPoints + _MSize : _MSize), font.Style);
+                }
+                else
+                    font = null;
+            }
+            catch
+            {
+                font = null;
+            }
+
+            if (font != null)
+                m_OldFont = font;
+
+            if (!d.IgnoreFormattingColors)
+            {
+                if (!_MForeColor.IsEmpty)
+                {
+                    _MOldForeColor = d.CurrentForeColor;
+                    d.CurrentForeColor = _MForeColor;
+                }
+                else if (_MSystemColorName != "")
+                {
+#if DOTNETBAR
+                    if (Rendering.GlobalManager.Renderer is Rendering.Office2007Renderer)
+                    {
+                        m_OldForeColor = d.CurrentForeColor;
+                        d.CurrentForeColor = ((Rendering.Office2007Renderer)Rendering.GlobalManager.Renderer).ColorTable.Form.Active.CaptionTextExtra;
+                    }
+#endif
+                }
+            }
+        }
+
+        public override void RenderEnd(MarkupDrawContext d)
+        {
+            RestoreForeColor(d);
+
+            base.RenderEnd(d);
+        }
+
+        public override void MeasureEnd(Size availableSize, MarkupDrawContext d)
+        {
+            RestoreForeColor(d);
+            base.MeasureEnd(availableSize, d);
+        }
+
+        protected virtual void RestoreForeColor(MarkupDrawContext d)
+        {
+            if (!_MOldForeColor.IsEmpty)
+                d.CurrentForeColor = _MOldForeColor;
+            _MOldForeColor = Color.Empty;
+        }
+
+        public Color ForeColor
+        {
+            get { return _MForeColor; }
+            set { _MForeColor = value; }
+        }
+
+        public int Size
+        {
+            get { return _MSize; }
+            set { _MSize = value; }
+        }
+
+        public string Face
+        {
+            get { return _MFace; }
+            set { _MFace = value; }
+        }
+
+        private Color GetColorFromName(string name)
+        {
+            string s = name.ToLower();
+            _MSystemColorName = "";
+            if (s == "syscaptiontextextra")
+            {
+                _MSystemColorName = s;
+                return Color.Empty;
+            }
+
+            return Color.FromName(name);
+        }
+
+        public override void ReadAttributes(XmlTextReader reader)
+        {
+            _MRelativeSize = false;
+            for (int i = 0; i < reader.AttributeCount; i++)
+            {
+                reader.MoveToAttribute(i);
+                if (reader.Name.ToLower() == "color")
+                {
+                    try
+                    {
+                        string s = reader.Value;
+                        if (s.StartsWith("#"))
+                        {
+                            if (s.Length == 7)
+                                _MForeColor = ColorHelpers.GetColor(s.Substring(1));
+                        }
+                        else
+                        {
+                            _MForeColor = GetColorFromName(s);
+                        }
+                    }
+                    catch
+                    {
+                        _MForeColor = Color.Empty;
+                    }
+                }
+                else if (reader.Name.ToLower() == "size")
+                {
+                    string s = reader.Value;
+                    if (s.StartsWith("+"))
+                    {
+                        try
+                        {
+                            _MSize = Int32.Parse(s.Substring(1));
+                            _MRelativeSize = true;
+                        }
+                        catch
+                        {
+                            _MSize = 0;
+                        }
+                    }
+                    else
+                    {
+                        if (s.StartsWith("-"))
+                            _MRelativeSize = true;
+                        try
+                        {
+                            _MSize = Int32.Parse(s);
+                        }
+                        catch
+                        {
+                            _MSize = 0;
+                        }
+                    }
+                }
+                else if (reader.Name.ToLower() == "face")
+                {
+                    _MFace = reader.Value;
+                }
+            }
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/TextMarkup/Heading.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/TextMarkup/Heading.cs
new file mode 100644
index 00000000..25522df6
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/TextMarkup/Heading.cs	
@@ -0,0 +1,95 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+#if AdvTree
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#endif
+{
+    internal class Heading: ContainerElement
+    {
+        #region Private Variables
+        private int m_Level = 1;
+        private Font m_OldFont = null;
+        #endregion
+
+        #region Internal Implementation
+        public Heading() { }
+        public Heading(int level)
+        {
+            m_Level = level;
+        }
+
+        public override void Measure(Size availableSize, MarkupDrawContext d)
+        {
+            SetFont(d);
+            base.Measure(availableSize, d);
+            if (m_OldFont != null)
+                d.CurrentFont = m_OldFont;
+        }
+
+        public override void Render(MarkupDrawContext d)
+        {
+            SetFont(d);
+            base.Render(d);
+            if (m_OldFont != null)
+                d.CurrentFont = m_OldFont;
+        }
+
+        protected virtual void SetFont(MarkupDrawContext d)
+        {
+            Font font = d.CurrentFont;
+            try
+            {
+                float size = d.CurrentFont.SizeInPoints;
+                if (m_Level == 1)
+                {
+                    size += 12;
+                }
+                else if (m_Level == 2)
+                {
+                    size += 8;
+                }
+                else if (m_Level == 3)
+                {
+                    size += 6;
+                }
+                else if (m_Level == 4)
+                {
+                    size += 4;
+                }
+                else if (m_Level == 5)
+                {
+                    size += 2;
+                }
+                else if (m_Level == 6)
+                {
+                    size += 1;
+                }
+
+                d.CurrentFont = new Font(d.CurrentFont.FontFamily, size, FontStyle.Bold);
+            }
+            catch
+            {
+                font = null;
+            }
+
+            if (font != null)
+                m_OldFont = font;
+        }
+
+        /// <summary>
+        /// Gets or sets heading level. Values from 1 to 6 are valid. Default is 1.
+        /// </summary>
+        public int Level
+        {
+            get { return m_Level; }
+            set { m_Level = value; }
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/TextMarkup/HyperLink.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/TextMarkup/HyperLink.cs
new file mode 100644
index 00000000..f7e8d845
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/TextMarkup/HyperLink.cs	
@@ -0,0 +1,221 @@
+using System;
+using System.Text;
+using System.Drawing;
+using System.Xml;
+using System.Windows.Forms;
+using System.Drawing.Drawing2D;
+
+#if AdvTree
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#endif
+{
+    internal class HyperLink : MarkupElement, IActiveMarkupElement
+    {
+        #region Private Variables
+        private Color m_ForeColor = Color.Empty;
+        private Color m_OldForeColor = Color.Empty;
+        private string m_HRef = "";
+        private string m_Name = "";
+        private Cursor m_OldCursor = null;
+        private bool m_IsMouseOver = false;
+        private bool m_Visited = false;
+        #endregion
+
+        #region Internal Implementation
+        public override void Measure(Size availableSize, MarkupDrawContext d)
+        {
+            this.Bounds = Rectangle.Empty;
+            SetForeColor(d);
+        }
+
+        public override void Render(MarkupDrawContext d)
+        {
+            d.HyperLink = true;
+            d.HyperlinkStyle = GetHyperlinkStyle();
+            if (!d.HyperlinkStyle.BackColor.IsEmpty)
+            {
+                using (GraphicsPath gp = new GraphicsPath())
+                {
+                    MarkupElementCollection col = this.Parent.Elements;
+                    int start = col.IndexOf(this) + 1;
+                    for (int i = start; i < col.Count; i++)
+                    {
+                        MarkupElement elem = col[i];
+                        if (!elem.Visible) continue;
+                        if (elem is EndMarkupElement && ((EndMarkupElement)elem).StartElement == this)
+                            break;
+                        gp.AddRectangle(elem.RenderBounds);
+                    }
+
+                    using (SolidBrush brush = new SolidBrush(d.HyperlinkStyle.BackColor))
+                        d.Graphics.FillPath(brush, gp);
+                }
+            }
+            SetForeColor(d);
+        }
+
+        private HyperlinkStyle GetHyperlinkStyle()
+        {
+            if (m_IsMouseOver && MarkupSettings.MouseOverHyperlink.IsChanged)
+                return MarkupSettings.MouseOverHyperlink;
+            else if (m_Visited && MarkupSettings.VisitedHyperlink.IsChanged)
+                return MarkupSettings.VisitedHyperlink;
+
+            return MarkupSettings.NormalHyperlink;
+        }
+
+        protected virtual void SetForeColor(MarkupDrawContext d)
+        {
+            Color c = Color.Empty;
+            HyperlinkStyle style = GetHyperlinkStyle();
+            if (style != null && !style.TextColor.IsEmpty)
+                c = style.TextColor;
+
+            if (!m_ForeColor.IsEmpty)
+                c = m_ForeColor;
+            if (!c.IsEmpty)
+            {
+                m_OldForeColor = d.CurrentForeColor;
+                d.CurrentForeColor = c;
+            }
+        }
+
+        public override void RenderEnd(MarkupDrawContext d)
+        {
+            RestoreForeColor(d);
+            d.HyperLink = false;
+            d.HyperlinkStyle = null;
+            base.RenderEnd(d);
+        }
+
+        public override void MeasureEnd(Size availableSize, MarkupDrawContext d)
+        {
+            RestoreForeColor(d);
+            base.MeasureEnd(availableSize, d);
+        }
+
+        protected override void ArrangeCore(Rectangle finalRect, MarkupDrawContext d) { }
+
+        protected virtual void RestoreForeColor(MarkupDrawContext d)
+        {
+            if (!m_OldForeColor.IsEmpty)
+                d.CurrentForeColor = m_OldForeColor;
+            m_OldForeColor = Color.Empty;
+        }
+
+        public Color ForeColor
+        {
+            get { return m_ForeColor; }
+            set { m_ForeColor = value; }
+        }
+
+        public string HRef
+        {
+            get { return m_HRef; }
+            set { m_HRef = value; }
+        }
+
+        public string Name
+        {
+            get { return m_Name; }
+            set { m_Name = value; }
+        }
+
+        public override void ReadAttributes(XmlTextReader reader)
+        {
+            for (int i = 0; i < reader.AttributeCount; i++)
+            {
+                reader.MoveToAttribute(i);
+                if (reader.Name.ToLower() == "href")
+                {
+                    m_HRef = reader.Value;
+                }
+                else if (reader.Name.ToLower() == "name")
+                {
+                    m_Name = reader.Value;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Returns whether hyper-link contains specified coordinates.
+        /// </summary>
+        /// <param name="x"></param>
+        /// <param name="y"></param>
+        /// <returns></returns>
+        public bool HitTest(int x, int y)
+        {
+            if (this.Parent == null)
+                return false;
+
+            MarkupElementCollection col = this.Parent.Elements;
+            int start = col.IndexOf(this)+1;
+            for (int i = start; i < col.Count; i++)
+            {
+                MarkupElement el = col[i];
+                if (el is EndMarkupElement && ((EndMarkupElement)el).StartElement == this)
+                    break;
+
+                if (col[i].RenderBounds.Contains(x, y))
+                    return true;
+
+            }
+
+            return false;
+        }
+
+        public void MouseEnter(Control parent)
+        {
+            m_OldCursor = parent.Cursor;
+            parent.Cursor = Cursors.Hand;
+            m_IsMouseOver = true;
+            if (MarkupSettings.MouseOverHyperlink.IsChanged)
+            {
+                InvalidateElements(parent);
+            }
+        }
+
+        public void MouseLeave(Control parent)
+        {
+            if (m_OldCursor != null && parent!=null)
+                parent.Cursor = m_OldCursor;
+            m_OldCursor = null;
+            m_IsMouseOver = false;
+            if (MarkupSettings.MouseOverHyperlink.IsChanged)
+            {
+                InvalidateElements(parent);
+            }
+        }
+
+        public void MouseDown(Control parent, MouseEventArgs e) { }
+        public void MouseUp(Control parent, MouseEventArgs e) { }
+        public void Click(Control parent)
+        {
+            m_Visited = true;
+            if (MarkupSettings.VisitedHyperlink.IsChanged)
+            {
+                InvalidateElements(parent);
+            }
+        }
+
+        private void InvalidateElements(Control parent)
+        {
+            if (this.Parent == null) return;
+            MarkupElementCollection col = this.Parent.Elements;
+            int start = col.IndexOf(this) + 1;
+            for (int i = start; i < col.Count; i++)
+            {
+                MarkupElement elem = col[i];
+                if (!elem.Visible) continue;
+                if (elem is EndMarkupElement && ((EndMarkupElement)elem).StartElement == this)
+                    break;
+                parent.Invalidate(elem.RenderBounds);
+            }
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/TextMarkup/IActiveMarkupElement.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/TextMarkup/IActiveMarkupElement.cs
new file mode 100644
index 00000000..66080c79
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/TextMarkup/IActiveMarkupElement.cs	
@@ -0,0 +1,22 @@
+using System;
+using System.Text;
+using System.Windows.Forms;
+
+#if AdvTree
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#endif
+{
+    internal interface IActiveMarkupElement
+    {
+        bool HitTest(int x, int y);
+        void MouseEnter(Control parent);
+        void MouseLeave(Control parent);
+        void MouseDown(Control parent, MouseEventArgs e);
+        void MouseUp(Control parent, MouseEventArgs e);
+        void Click(Control parent);
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/TextMarkup/ImageElement.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/TextMarkup/ImageElement.cs
new file mode 100644
index 00000000..4e19d6ac
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/TextMarkup/ImageElement.cs	
@@ -0,0 +1,187 @@
+using System;
+using System.Text;
+using System.Drawing;
+using System.Xml;
+using System.Reflection;
+
+#if AdvTree
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#endif
+
+{
+    internal class ImageElement : MarkupElement
+    {
+        #region Private Variables
+        private Size m_ImageSize = Size.Empty;
+        private string m_ImageSource = "";
+        private Image m_Image = null;
+        #endregion
+
+        #region Internal Implementation
+        public override void Measure(System.Drawing.Size availableSize, MarkupDrawContext d)
+        {
+            if (!m_ImageSize.IsEmpty)
+                this.Bounds = new Rectangle(Point.Empty, m_ImageSize);
+            else if (m_ImageSource.Length == 0)
+                this.Bounds = Rectangle.Empty;
+            else
+            {
+                Image img = this.GetImage();
+                if (img != null)
+                    this.Bounds = new Rectangle(Point.Empty, img.Size);
+                else
+                    this.Bounds = new Rectangle(Point.Empty, new Size(16,16));
+            }
+        }
+
+        public override bool IsBlockElement
+        {
+            get
+            {
+                return false;
+            }
+        }
+
+        private Image GetImage()
+        {
+            if (m_Image != null) return m_Image;
+            Assembly a = null;
+
+            // Load from format: ClassLibrary1/ClassLibrary1.MyImage.png or ClassLibrary1/global::ClassLibrary1.Resources.MyImage
+            if (m_ImageSource.IndexOf('/') >= 0)
+            {
+                string[] parts = m_ImageSource.Split('/');
+                a = Assembly.Load(parts[0]);
+                string ResourceName = parts[1];
+                if (a != null)
+                {
+                    m_Image = LoadImageGlobalResource(parts[1], a);
+                    if (m_Image == null)
+                        m_Image = LoadImageResource(parts[1], a);
+
+                    if (m_Image != null) return m_Image;
+                }
+            }
+
+            // Probe Executing Assembly
+            a = Assembly.GetExecutingAssembly();
+            m_Image = LoadImageGlobalResource(m_ImageSource, a);
+            if(m_Image==null)
+                m_Image = LoadImageResource(m_ImageSource, a);
+
+            // Probe Entry Assembly
+            if (m_Image == null)
+            {
+                a = Assembly.GetEntryAssembly();
+                m_Image = LoadImageGlobalResource(m_ImageSource, a);
+                if (m_Image == null)
+                    m_Image = LoadImageResource(m_ImageSource, a);
+            }
+
+            return m_Image;
+        }
+
+        private Image LoadImageGlobalResource(string imageSource, Assembly a)
+        {
+            Image img = null;
+#if FRAMEWORK20
+            if (imageSource.StartsWith("global::"))
+            {
+                string name = imageSource.Substring(8);
+                if (name.Length > 0)
+                {
+                    try
+                    {
+                        int i = name.LastIndexOf('.');
+                        string resName = name.Substring(0, i);
+                        name = name.Substring(i + 1);
+                        System.Resources.ResourceManager r = new System.Resources.ResourceManager(resName, a);
+                        object obj = r.GetObject(name);
+                        img = (Bitmap)obj;
+                    }
+                    catch
+                    {
+                        img = null;
+                    }
+                }
+            }
+#endif
+            return img;
+        }
+
+        private Image LoadImageResource(string imageSource, Assembly a)
+        {
+            Image img = null;
+            try
+            {
+                img = new Bitmap(a.GetManifestResourceStream(imageSource));
+            }
+            catch { }
+
+            return img;
+        }
+
+        public override void Render(MarkupDrawContext d)
+        {
+            Rectangle r = this.Bounds;
+            r.Offset(d.Offset);
+
+            if (!d.ClipRectangle.IsEmpty && !r.IntersectsWith(d.ClipRectangle))
+                return;
+
+            Image img = this.GetImage();
+            if (img != null)
+            {
+                Rectangle imageRect = r;
+                imageRect.Size = img.Size;
+                d.Graphics.DrawImage(img, imageRect);
+            }
+            else
+            {
+                using (SolidBrush brush = new SolidBrush(Color.White))
+                {
+                    d.Graphics.FillRectangle(brush, r);
+                }
+                using (Pen pen = new Pen(Color.DarkGray, 1))
+                {
+                    d.Graphics.DrawRectangle(pen, r);
+                    d.Graphics.DrawLine(pen, r.X, r.Y, r.Right, r.Bottom);
+                    d.Graphics.DrawLine(pen, r.Right, r.Y, r.X, r.Bottom);
+                }
+            }
+        }
+
+        protected override void ArrangeCore(System.Drawing.Rectangle finalRect, MarkupDrawContext d)  { }
+
+        public override void ReadAttributes(XmlTextReader reader)
+        {
+            m_ImageSize = Size.Empty;
+            m_ImageSource = "";
+            m_Image = null;
+
+            for (int i = 0; i < reader.AttributeCount; i++)
+            {
+                reader.MoveToAttribute(i);
+                if (reader.Name.ToLower() == "width")
+                {
+                    string s = reader.Value;
+                    m_ImageSize.Width = int.Parse(s);
+                }
+                else if (reader.Name.ToLower() == "height")
+                {
+                    string s = reader.Value;
+                    m_ImageSize.Height = int.Parse(s);
+                }
+                else if (reader.Name.ToLower() == "src")
+                {
+                    m_ImageSource = reader.Value;
+                }
+            }
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/TextMarkup/Italic.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/TextMarkup/Italic.cs
new file mode 100644
index 00000000..aa6b58e4
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/TextMarkup/Italic.cs	
@@ -0,0 +1,33 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+#if AdvTree
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#endif
+{
+    internal class Italic : FontChangeElement
+    {
+        #region Internal Implementation
+        protected override void SetFont(MarkupDrawContext d)
+        {
+            Font font = d.CurrentFont;
+            FontStyle style=font.Style | FontStyle.Italic;
+
+            if (!font.Italic && d.CurrentFont.FontFamily.IsStyleAvailable(style))
+                d.CurrentFont = new Font(font, style);
+            else
+                font = null;
+
+            if (font != null)
+                m_OldFont = font;
+
+            base.SetFont(d);
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/TextMarkup/MarkupDrawContext.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/TextMarkup/MarkupDrawContext.cs
new file mode 100644
index 00000000..e1aaf18f
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/TextMarkup/MarkupDrawContext.cs	
@@ -0,0 +1,56 @@
+using System;
+using System.Drawing;
+using System.Text;
+
+#if AdvTree
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#endif
+{
+    internal class MarkupDrawContext
+    {
+        public Graphics Graphics = null;
+        public Font CurrentFont = null;
+        public Color CurrentForeColor = SystemColors.ControlText;
+        public bool RightToLeft = false;
+        public Point Offset = Point.Empty;
+        public bool HyperLink = false;
+        public HyperlinkStyle HyperlinkStyle = null;
+        public bool Underline = false;
+        public Rectangle ClipRectangle = Rectangle.Empty;
+        public bool HotKeyPrefixVisible = false;
+        public object ContextObject = null;
+        public bool AllowMultiLine = true;
+        public bool IgnoreFormattingColors = false;
+        public bool StrikeOut;
+
+        public MarkupDrawContext(Graphics g, Font currentFont, Color currentForeColor, bool rightToLeft) : this(g, currentFont, currentForeColor, rightToLeft, Rectangle.Empty, false)
+        {
+        }
+
+        public MarkupDrawContext(Graphics g, Font currentFont, Color currentForeColor, bool rightToLeft, Rectangle clipRectangle, bool hotKeyPrefixVisible)
+        {
+            this.Graphics = g;
+            this.CurrentFont = currentFont;
+            this.CurrentForeColor  = currentForeColor;
+            this.RightToLeft = rightToLeft;
+            this.ClipRectangle = clipRectangle;
+            this.HotKeyPrefixVisible = hotKeyPrefixVisible;
+        }
+
+        public MarkupDrawContext(Graphics g, Font currentFont, Color currentForeColor, bool rightToLeft, Rectangle clipRectangle, bool hotKeyPrefixVisible, object contextObject)
+        {
+            this.Graphics = g;
+            this.CurrentFont = currentFont;
+            this.CurrentForeColor = currentForeColor;
+            this.RightToLeft = rightToLeft;
+            this.ClipRectangle = clipRectangle;
+            this.HotKeyPrefixVisible = hotKeyPrefixVisible;
+            this.ContextObject = contextObject;
+        }
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/TextMarkup/MarkupElement.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/TextMarkup/MarkupElement.cs
new file mode 100644
index 00000000..99041396
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/TextMarkup/MarkupElement.cs	
@@ -0,0 +1,178 @@
+using System;
+using System.Drawing;
+using System.Text;
+using System.Xml;
+
+#if AdvTree
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+using DevComponents.UI.ContentManager;
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#endif
+{
+    internal abstract class MarkupElement : IBlockExtended
+    {
+        #region Private Variables
+        private MarkupElementCollection m_Elements = null;
+        private MarkupElement m_Parent = null;
+        private Rectangle m_Bounds = Rectangle.Empty;
+        private bool m_Visible = true;
+        private bool m_SizeValid = false;
+        private Rectangle m_RenderBounds = Rectangle.Empty;
+        #endregion
+
+        #region Internal Implementation
+        public MarkupElement()
+        {
+            m_Elements = new MarkupElementCollection(this);
+        }
+
+        /// <summary>
+        /// Returns whether markup element is an block element that always consumes a whole line in layout.
+        /// </summary>
+        public virtual bool IsBlockElement
+        {
+            get { return false; }
+        }
+
+        /// <summary>
+        /// Returns whether layout manager switches to new line after processing this element.
+        /// </summary>
+        public virtual bool IsNewLineAfterElement
+        {
+            get { return false; }
+        }
+
+        /// <summary>
+        /// Returns whether layout manager can start new line with this element.
+        /// </summary>
+        public virtual bool CanStartNewLine
+        {
+            get { return true; }
+        }
+
+        /// <summary>
+        /// Gets the collection of child elements if any for this markup element.
+        /// </summary>
+        public virtual MarkupElementCollection Elements
+        {
+            get
+            {
+                if (m_Elements == null)
+                    m_Elements = new MarkupElementCollection(this);
+                return m_Elements; 
+            }
+        }
+
+        internal void InvalidateElementsSize()
+        {
+            this.IsSizeValid = false;
+            if (m_Elements==null || m_Elements.Count == 0)
+                return;
+            foreach (MarkupElement e in m_Elements)
+            {
+                e.InvalidateElementsSize();
+                e.IsSizeValid = false;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether element size is valid. When size is not valid element Measure method will be called to validate size.
+        /// </summary>
+        public virtual bool IsSizeValid
+        {
+            get { return m_SizeValid; }
+            set { m_SizeValid = value; }
+        }
+
+        /// <summary>
+        /// Gets element parent or null if parent is not set.
+        /// </summary>
+        public virtual MarkupElement Parent
+        {
+            get { return m_Parent; }
+        }
+
+        internal void SetParent(MarkupElement parent)
+        {
+            m_Parent = parent;
+        }
+
+        /// <summary>
+        /// Gets or sets actual rendering bounds.
+        /// </summary>
+        public Rectangle Bounds
+        {
+            get { return m_Bounds; }
+            set { m_Bounds = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether markup element is visible.
+        /// </summary>
+        public bool Visible
+        {
+            get { return m_Visible; }
+            set { m_Visible = value; }
+        }
+
+        /// <summary>
+        /// Measures the element given available size.
+        /// </summary>
+        /// <param name="availableSize">Size available to element</param>
+        /// <param name="d">Reference to graphics object</param>
+        public abstract void Measure(Size availableSize, MarkupDrawContext d);
+
+        /// <summary>
+        /// Measures the end tag of an element. Most implementations do not need to do anything but implementations like the ones
+        /// that change color should return state back at this time.
+        /// </summary>
+        /// <param name="availableSize"></param>
+        /// <param name="d"></param>
+        public virtual void MeasureEnd(Size availableSize, MarkupDrawContext d) { }
+
+        /// <summary>
+        /// Renders element.
+        /// </summary>
+        /// <param name="d">Provides markup drawing context information.</param>
+        public abstract void Render(MarkupDrawContext d);
+
+        /// <summary>
+        /// Renders element tag end. Most implementations do not need to do anything but mplementations like the ones
+        /// that change color should return state back at this time.
+        /// </summary>
+        /// <param name="d">Provides markup drawing context information.</param>
+        public virtual void RenderEnd(MarkupDrawContext d) { }
+
+        /// <summary>
+        /// Provides final rectangle to element and lets it arrange it's content given new constraint.
+        /// </summary>
+        /// <param name="finalRect">Final rectangle.</param>
+        /// <param name="d"></param>
+        protected abstract void ArrangeCore(Rectangle finalRect, MarkupDrawContext d);
+
+        /// <summary>
+        /// Arranges the element given the final size. Layout is two step process with Measure followed by Arrange.
+        /// </summary>
+        /// <param name="finalSize"></param>
+        /// <param name="d"></param>
+        public void Arrange(Rectangle finalSize, MarkupDrawContext d)
+        {
+            this.ArrangeCore(finalSize, d);
+        }
+
+        public virtual void ReadAttributes(XmlTextReader reader) { }
+
+        /// <summary>
+        /// Gets or sets actual rendered bounds for a give markup element if applicable.
+        /// </summary>
+        public Rectangle RenderBounds
+        {
+            get { return m_RenderBounds; }
+            set { m_RenderBounds = value; }
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/TextMarkup/MarkupElementCollection.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/TextMarkup/MarkupElementCollection.cs
new file mode 100644
index 00000000..81b75528
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/TextMarkup/MarkupElementCollection.cs	
@@ -0,0 +1,139 @@
+using System;
+using System.Text;
+using System.Collections;
+
+#if AdvTree
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#endif
+{
+    internal class MarkupElementCollection : CollectionBase
+    {
+        #region Private Variables
+        private MarkupElement m_Parent = null;
+        #endregion
+
+        #region Internal Implementation
+        /// <summary>Creates new instance of the class.</summary>
+        public MarkupElementCollection(MarkupElement parent)
+		{
+            m_Parent = parent;
+		}
+
+        /// <summary>
+        /// Gets or sets the collection parent element.
+        /// </summary>
+        public MarkupElement Parent
+        {
+            get { return m_Parent; }
+            set { m_Parent = value; }
+        }
+
+		/// <summary>
+		/// Adds new object to the collection.
+		/// </summary>
+		/// <param name="MarkupElement">Object to add.</param>
+		/// <returns>Index of newly added object.</returns>
+		public int Add(MarkupElement MarkupElement)
+		{
+			return List.Add(MarkupElement);
+		}
+		/// <summary>
+		/// Returns reference to the object in collection based on it's index.
+		/// </summary>
+		public MarkupElement this[int index]
+		{
+			get {return (MarkupElement)(List[index]);}
+			set {List[index] = value;}
+		}
+
+		/// <summary>
+		/// Inserts new object into the collection.
+		/// </summary>
+		/// <param name="index">Position of the object.</param>
+		/// <param name="value">Object to insert.</param>
+		public void Insert(int index, MarkupElement value) 
+		{
+			List.Insert(index, value);
+		}
+
+		/// <summary>
+		/// Returns index of the object inside of the collection.
+		/// </summary>
+		/// <param name="value">Reference to the object.</param>
+		/// <returns>Index of the object.</returns>
+		public int IndexOf(MarkupElement value) 
+		{
+			return List.IndexOf(value);
+		}
+
+		/// <summary>
+		/// Returns whether collection contains specified object.
+		/// </summary>
+		/// <param name="value">Object to look for.</param>
+		/// <returns>true if object is part of the collection, otherwise false.</returns>
+		public bool Contains(MarkupElement value) 
+		{
+			return List.Contains(value);
+		}
+
+		/// <summary>
+		/// Removes specified object from the collection.
+		/// </summary>
+		/// <param name="value"></param>
+		public void Remove(MarkupElement value) 
+		{
+			List.Remove(value);
+		}
+
+		protected override void OnRemoveComplete(int index,object value)
+		{
+			base.OnRemoveComplete(index,value);
+			MarkupElement me=value as MarkupElement;
+            if (m_Parent != null)
+            {
+                me.SetParent(null);
+                m_Parent.IsSizeValid = false;
+            }
+		}
+		protected override void OnInsertComplete(int index,object value)
+		{
+			base.OnInsertComplete(index,value);
+			MarkupElement me=value as MarkupElement;
+            if (m_Parent != null)
+            {
+                me.SetParent(m_Parent);
+                m_Parent.IsSizeValid = false;
+            }
+		}
+
+		/// <summary>
+		/// Copies collection into the specified array.
+		/// </summary>
+		/// <param name="array">Array to copy collection to.</param>
+		/// <param name="index">Starting index.</param>
+		public void CopyTo(MarkupElement[] array, int index) 
+		{
+			List.CopyTo(array, index);
+		}
+
+		/// <summary>
+		/// Copies contained items to the MarkupElement array.
+		/// </summary>
+		/// <param name="array">Array to copy to.</param>
+		internal void CopyTo(MarkupElement[] array)
+		{
+			List.CopyTo(array,0);
+		}
+
+		protected override void OnClear()
+		{
+			base.OnClear();
+		}
+
+		#endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/TextMarkup/MarkupLayoutManager.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/TextMarkup/MarkupLayoutManager.cs
new file mode 100644
index 00000000..6e36f2a4
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/TextMarkup/MarkupLayoutManager.cs	
@@ -0,0 +1,39 @@
+using System.Collections;
+using System.Drawing;
+using System.Text;
+
+#if AdvTree
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+using DevComponents.UI.ContentManager;
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#endif
+{
+    internal class MarkupLayoutManager : BlockLayoutManager
+    {
+        private MarkupDrawContext m_MarkupDrawContext = null;
+
+        public MarkupDrawContext MarkupDrawContext
+        {
+            get { return m_MarkupDrawContext; }
+            set { m_MarkupDrawContext = value; }
+        }
+
+        public override void Layout(IBlock block, Size availableSize)
+        {
+            if (block is MarkupElement)
+            {
+                MarkupElement m = block as MarkupElement;
+                if(!m.IsSizeValid)
+                    m.Measure(availableSize, m_MarkupDrawContext);
+            }
+        }
+
+        public override Rectangle FinalizeLayout(Rectangle containerBounds, Rectangle blocksBounds, ArrayList lines)
+        {
+            return (blocksBounds);
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/TextMarkup/MarkupParser.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/TextMarkup/MarkupParser.cs
new file mode 100644
index 00000000..86ee5ae9
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/TextMarkup/MarkupParser.cs	
@@ -0,0 +1,256 @@
+using System;
+using System.Text;
+using System.IO;
+using System.Xml;
+using System.Collections;
+using System.Text.RegularExpressions;
+
+#if AdvTree
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#endif
+{
+    internal class MarkupParser
+    {
+        #region Private Variables
+        private static string TextElementName = "text";
+        private static string BodyTag = "body";
+        #endregion
+
+        #region Internal Implementation
+        public static BodyElement Parse(string text)
+        {
+            StringBuilder plainText = new StringBuilder(text.Length);
+            BodyElement root = new BodyElement();
+            root.HasExpandElement = false;
+            MarkupElement currentParent = root;
+            Stack openTags = new Stack();
+            openTags.Push(root);
+            // Input text is not wrapped into the container tag so we wrap it here
+            text = text.Replace("&nbsp;", "{ent_nbsp}");
+            text = text.Replace("&zwsp;", "{ent_zwsp}");
+            text = text.Replace("&lt;", "{ent_lt}");
+            text = text.Replace("&gt;", "{ent_gt}");
+            text = text.Replace("&amp;", "{ent_amp}");
+            text = text.Replace("|", "{ent_l}");
+            text = text.Replace("&", "|");
+            text = text.Replace("{ent_nbsp}", "&nbsp;");
+            text = text.Replace("{ent_zwsp}", "&zwsp;"); 
+            text = text.Replace("{ent_lt}", "&lt;");
+            text = text.Replace("{ent_gt}", "&gt;");
+            StringReader sr = new StringReader("<"+BodyTag+">" + text + "</"+BodyTag+">");
+#if !DEBUG
+            try
+#endif
+            {
+                XmlTextReader reader = new XmlTextReader(sr);
+                //reader.EntityHandling = EntityHandling.ExpandCharEntities;
+                while (reader.Read())
+                {
+                    if (reader.NodeType == XmlNodeType.Element)
+                    {
+                        if (reader.Name == BodyTag)
+                            continue;
+                        MarkupElement el = CreateMarkupElement(reader.Name);
+                        if (el == null)
+                        {
+                            reader.Skip();
+                            continue;
+                        }
+                        else if (el is ExpandElement)
+                            root.HasExpandElement = true;
+
+                        if (el is IActiveMarkupElement)
+                            root.ActiveElements.Add(el);
+
+                        // Parse any attributes here
+                        if (reader.AttributeCount > 0)
+                        {
+                            el.ReadAttributes(reader);
+                            reader.MoveToElement();
+                        }
+
+                        currentParent.Elements.Add(el);
+
+                        if (el is ContainerElement)
+                            currentParent = el;
+
+                        if (!reader.IsEmptyElement)
+                            openTags.Push(el);
+                    }
+                    else if (reader.NodeType == XmlNodeType.Text)
+                    {
+                        if (reader.Value.Length == 1)
+                        {
+                            TextElement el = CreateMarkupElement(TextElementName) as TextElement;
+                            if (reader.Value == " ")
+                            {
+                                el.TrailingSpace = true;
+                                plainText.Append(' ');
+                            }
+                            else
+                            {
+                                el.Text = reader.Value;
+                                el.Text = el.Text.Replace("|", "&");
+                                el.Text = el.Text.Replace("{ent_l}", "|");
+                                el.Text = el.Text.Replace("{ent_amp}", "&&");
+                                plainText.Append(el.Text+" ");
+                            }
+                            currentParent.Elements.Add(el);
+                        }
+                        else
+                        {
+                            string s = reader.Value;
+                            if (s.StartsWith("\r\n"))
+                                s = s.TrimStart(new char[] { '\r', '\n' });
+                            s = s.Replace("\r\n", " ");
+                            string[] words = s.Split(' ');
+                            bool space = false;
+                            if (currentParent.Elements.Count > 0 && currentParent.Elements[currentParent.Elements.Count - 1] is NewLine)
+                                space = true;
+                            for (int i = 0; i < words.Length; i++)
+                            {
+                                if (words[i].Length == 0)
+                                {
+                                    if (space)
+                                        continue;
+                                    space = true;
+                                }
+                                else
+                                    space = false;
+
+                                TextElement el = CreateMarkupElement(TextElementName) as TextElement;
+                                el.Text = words[i].Replace("|","&");
+                                el.Text = el.Text.Replace("{ent_l}", "|");
+                                el.Text = el.Text.Replace("{ent_amp}", "&&");
+                                plainText.Append(el.Text + " ");
+                                if (i < words.Length - 1)
+                                {
+                                    el.TrailingSpace = true;
+                                    space = true;
+                                }
+
+                                currentParent.Elements.Add(el);
+                            }
+                        }
+                    }
+                    else if (reader.NodeType == XmlNodeType.Whitespace)
+                    {
+                        if (reader.Value.IndexOf(' ') >= 0)
+                        {
+                            TextElement el = CreateMarkupElement(TextElementName) as TextElement;
+                            el.TrailingSpace = true;
+                            currentParent.Elements.Add(el);
+                        }
+                    }
+                    else if (reader.NodeType == XmlNodeType.EntityReference)
+                    {
+                        TextElement el = CreateMarkupElement(TextElementName) as TextElement;
+                        if (reader.Name == "nbsp")
+                        {
+                            el.TrailingSpace = true;
+                        }
+                        else if (reader.Name == "zwsp")
+                        {
+                            el.TrailingSpace = false;
+                        }
+                        else
+                            el.Text = reader.Name;
+                        el.EnablePrefixHandling = false;
+                        currentParent.Elements.Add(el);
+                    }
+                    else if (reader.NodeType == XmlNodeType.EndElement)
+                    {
+                        MarkupElement el = openTags.Pop() as MarkupElement;
+                        if (el != currentParent)
+                        {
+                            currentParent.Elements.Add(new EndMarkupElement(el));
+                        }
+                        else
+                        {
+                            if (currentParent != root)
+                                currentParent = currentParent.Parent;
+                        }
+                    }
+                }
+            }
+#if !DEBUG
+            catch
+            {
+                return null;
+            }
+#endif
+            root.PlainText = plainText.ToString();
+            return root;
+        }
+
+        public static MarkupElement CreateMarkupElement(string elementName)
+        {
+            if (elementName == "b" || elementName == "strong")
+                return new Strong();
+            else if (elementName == "i" || elementName == "em")
+                return new Italic();
+            else if (elementName == "u")
+                return new Underline();
+            else if (elementName == "br")
+                return new NewLine();
+            else if (elementName == "expand")
+                return new ExpandElement();
+            else if (elementName == "a")
+                return new HyperLink();
+            else if (elementName == "p")
+                return new Paragraph();
+            else if (elementName == "div")
+                return new Div();
+            else if (elementName == "span")
+                return new Span();
+            else if (elementName == "img")
+                return new ImageElement();
+            else if (elementName == "h1")
+                return new Heading();
+            else if (elementName == "h2")
+                return new Heading(2);
+            else if (elementName == "h3")
+                return new Heading(3);
+            else if (elementName == "h4")
+                return new Heading(4);
+            else if (elementName == "h5")
+                return new Heading(5);
+            else if (elementName == "h6")
+                return new Heading(6);
+            else if (elementName == "font")
+                return new FontElement();
+            else if (elementName == "s" || elementName == "strike")
+                return new Strike();
+            else if (elementName == TextElementName)
+                return new TextElement();
+
+            return null;
+        }
+
+        /// <summary>
+        /// Tests whether input text could be markup text.
+        /// </summary>
+        /// <param name="text">Text to test.</param>
+        /// <returns>true if text could be markup, otherwise false</returns>
+        public static bool IsMarkup(string text)
+        {
+            if (string.IsNullOrEmpty(text) ||
+                (text.IndexOf("</") < 0 && text.IndexOf("/>") < 0))
+            {
+                return false;
+            }
+
+            return true;
+        }
+
+        internal static string RemoveExpand(string text)
+        {
+            return Regex.Replace(text, "<expand.*?>", "", RegexOptions.IgnoreCase);
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/TextMarkup/MarkupSettings.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/TextMarkup/MarkupSettings.cs
new file mode 100644
index 00000000..b448f45b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/TextMarkup/MarkupSettings.cs	
@@ -0,0 +1,156 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+#if AdvTree
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#endif
+{
+    /// <summary>
+    /// Holds text-markup related settings.
+    /// </summary>
+    public static class MarkupSettings
+    {
+        private static HyperlinkStyle _NormalHyperlink = new HyperlinkStyle(Color.Blue, eHyperlinkUnderlineStyle.SolidLine);
+        /// <summary>
+        /// Gets the style of the hyperlink in its default state.
+        /// </summary>
+        public static HyperlinkStyle NormalHyperlink
+        {
+            get { return _NormalHyperlink; }
+        }
+
+        private static HyperlinkStyle _MouseOverHyperlink = new HyperlinkStyle();
+        /// <summary>
+        /// Gets the style of the hyperlink when mouse is over the link.
+        /// </summary>
+        public static HyperlinkStyle MouseOverHyperlink
+        {
+            get { return _MouseOverHyperlink; }
+        }
+
+        private static HyperlinkStyle _VisitedHyperlink = new HyperlinkStyle();
+        /// <summary>
+        /// Gets the style of the visited hyperlink.
+        /// </summary>
+        public static HyperlinkStyle VisitedHyperlink
+        {
+            get { return _VisitedHyperlink; }
+        }
+    }
+
+    /// <summary>
+    /// Defines the text-markup hyperlink appearance style.
+    /// </summary>
+    public class HyperlinkStyle
+    {
+        /// <summary>
+        /// Initializes a new instance of the HyperlinkStyle class.
+        /// </summary>
+        public HyperlinkStyle()
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the HyperlinkStyle class.
+        /// </summary>
+        /// <param name="textColor"></param>
+        /// <param name="underlineStyle"></param>
+        public HyperlinkStyle(Color textColor, eHyperlinkUnderlineStyle underlineStyle)
+        {
+            _TextColor = textColor;
+            _UnderlineStyle = underlineStyle;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the HyperlinkStyle class.
+        /// </summary>
+        /// <param name="textColor"></param>
+        /// <param name="backColor"></param>
+        /// <param name="underlineStyle"></param>
+        public HyperlinkStyle(Color textColor, Color backColor, eHyperlinkUnderlineStyle underlineStyle)
+        {
+            _TextColor = textColor;
+            _BackColor = backColor;
+            _UnderlineStyle = underlineStyle;
+        }
+        private Color _TextColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets hyperlink text color.
+        /// </summary>
+        public Color TextColor
+        {
+            get { return _TextColor; }
+            set
+            {
+                if (_TextColor != value)
+                {
+                    _TextColor = value;
+                }
+            }
+        }
+
+        private Color _BackColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets hyperlink back color.
+        /// </summary>
+        public Color BackColor
+        {
+            get { return _BackColor; }
+            set
+            {
+                if (_BackColor != value)
+                {
+                    _BackColor = value;
+                }
+            }
+        }
+
+        private eHyperlinkUnderlineStyle _UnderlineStyle = eHyperlinkUnderlineStyle.None;
+        /// <summary>
+        /// Gets or sets the underline style for the hyperlink.
+        /// </summary>
+        public eHyperlinkUnderlineStyle UnderlineStyle
+        {
+            get { return _UnderlineStyle; }
+            set
+            {
+                if (_UnderlineStyle != value)
+                {
+                    _UnderlineStyle = value;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether style has been changed from its default state.
+        /// </summary>
+        public bool IsChanged
+        {
+            get { return !_TextColor.IsEmpty || !_BackColor.IsEmpty || _UnderlineStyle != eHyperlinkUnderlineStyle.None; }
+        }
+    }
+
+    /// <summary>
+    /// Defines hyperlink styles.
+    /// </summary>
+    public enum eHyperlinkUnderlineStyle
+    {
+        /// <summary>
+        /// Hyper links are not marked.
+        /// </summary>
+        None,
+        /// <summary>
+        /// Hyper links are underlined using solid line.
+        /// </summary>
+        SolidLine,
+        /// <summary>
+        /// Hyper links are underlined using dashed line.
+        /// </summary>
+        DashedLine
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/TextMarkup/NewLine.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/TextMarkup/NewLine.cs
new file mode 100644
index 00000000..e132ba5d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/TextMarkup/NewLine.cs	
@@ -0,0 +1,45 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+#if AdvTree
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#endif
+{
+    internal class NewLine : MarkupElement
+    {
+        #region Internal Implementation
+        public override void Measure(System.Drawing.Size availableSize, MarkupDrawContext d)
+        {
+            // Causes layout manager to switch to the new line
+            this.Bounds = new Rectangle(0, 0, 0, d.CurrentFont.Height);
+        }
+
+        /// <summary>
+        /// Gets or sets whether element size is valid. When size is not valid element Measure method will be called to validate size.
+        /// </summary>
+        public override bool IsSizeValid
+        {
+            get { return false; }
+            set {  }
+        }
+
+        public override void Render(MarkupDrawContext d) {}
+
+        protected override void ArrangeCore(System.Drawing.Rectangle finalRect, MarkupDrawContext d) { }
+
+        /// <summary>
+        /// Returns whether layout manager switches to new line after processing this element.
+        /// </summary>
+        public override bool IsNewLineAfterElement
+        {
+            get { return true; }
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/TextMarkup/Paragraph.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/TextMarkup/Paragraph.cs
new file mode 100644
index 00000000..a54e772c
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/TextMarkup/Paragraph.cs	
@@ -0,0 +1,27 @@
+using System;
+using System.Text;
+using System.Drawing;
+using System.Xml;
+
+#if AdvTree
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+using DevComponents.UI.ContentManager;
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#endif
+{
+    internal class Paragraph : Div
+    {
+        #region Internal Implementation
+        protected override void ArrangeInternal(Rectangle bounds, MarkupDrawContext d)
+        {
+            base.ArrangeInternal(bounds, d);
+            this.Bounds = new Rectangle(this.Bounds.X, this.Bounds.Y, this.Bounds.Width , this.Bounds.Height + d.CurrentFont.Height);
+        }
+        #endregion
+    }
+
+    
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/TextMarkup/Span.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/TextMarkup/Span.cs
new file mode 100644
index 00000000..77743982
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/TextMarkup/Span.cs	
@@ -0,0 +1,23 @@
+using System;
+using System.Text;
+
+#if AdvTree
+using DevComponents.Tree;
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#endif
+{
+    internal class Span : Div
+    {
+        /// <summary>
+        /// Returns whether markup element is an block element that always consumes a whole line in layout.
+        /// </summary>
+        public override bool IsBlockElement
+        {
+            get { return false; }
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/TextMarkup/Strike.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/TextMarkup/Strike.cs
new file mode 100644
index 00000000..97578d60
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/TextMarkup/Strike.cs	
@@ -0,0 +1,34 @@
+using System.Drawing;
+
+#if AdvTree
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#endif
+{
+    internal class Strike : MarkupElement
+    {
+        public override void Measure(Size availableSize, MarkupDrawContext d)
+        {
+            Bounds = Rectangle.Empty;
+        }
+
+        public override void Render(MarkupDrawContext d)
+        {
+            d.StrikeOut = true;
+        }
+
+        public override void RenderEnd(MarkupDrawContext d)
+        {
+            d.StrikeOut = false;
+
+            base.RenderEnd(d);
+        }
+
+        protected override void ArrangeCore(Rectangle finalRect, MarkupDrawContext d)
+        {
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/TextMarkup/Strong.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/TextMarkup/Strong.cs
new file mode 100644
index 00000000..d8643be7
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/TextMarkup/Strong.cs	
@@ -0,0 +1,33 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+#if AdvTree
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#endif
+{
+    internal class Strong : FontChangeElement
+    {
+        #region Internal Implementation
+        protected override void SetFont(MarkupDrawContext d)
+        {
+            Font font = d.CurrentFont;
+            FontStyle style = d.CurrentFont.Style | FontStyle.Bold;
+
+            if (!font.Bold && font.FontFamily.IsStyleAvailable(style))
+                d.CurrentFont = new Font(d.CurrentFont, style);
+            else
+                font = null;
+
+            if (font != null)
+                m_OldFont = font;
+
+            base.SetFont(d);
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/TextMarkup/TextElement.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/TextMarkup/TextElement.cs
new file mode 100644
index 00000000..46934e8b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/TextMarkup/TextElement.cs	
@@ -0,0 +1,222 @@
+using System.Drawing;
+using System.Drawing.Drawing2D;
+#if AdvTree
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+using DevComponents.DotNetBar.Controls;
+using DevComponents.DotNetBar.SuperGrid;
+
+namespace DevComponents.SuperGrid.TextMarkup
+#endif
+{
+    internal class TextElement : MarkupElement
+    {
+        private static bool PadText;
+        static TextElement()
+        {
+            string lc = System.Windows.Forms.Application.CurrentCulture.TwoLetterISOLanguageName;
+            if (lc == "ja")
+                PadText = true;
+        }
+        #region Private Variables
+        private string m_Text = "";
+        private bool m_TrailingSpace;
+        private bool m_EnablePrefixHandling = true;
+        #endregion
+
+        #region Internal Implementation
+        public override void Measure(System.Drawing.Size availableSize, MarkupDrawContext d)
+        {
+#if (FRAMEWORK20)
+            if (BarUtilities.UseTextRenderer)
+            {
+                eTextFormat format = eTextFormat.Default | eTextFormat.NoPadding;
+                if (!d.HotKeyPrefixVisible || m_EnablePrefixHandling)
+                    format |= eTextFormat.HidePrefix;
+                Size size = Size.Empty;
+                if (m_TrailingSpace)
+                {
+                    if (d.CurrentFont.Italic)
+                    {
+                        size = Size.Ceiling(TextDrawing.MeasureString(d.Graphics, m_Text, d.CurrentFont, 0, format));
+                        size.Width += (int)(d.Graphics.MeasureString("||", d.CurrentFont).Width / 4);
+                    }
+                    else
+                        size = Size.Ceiling(TextDrawing.MeasureString(d.Graphics, m_Text + (BarFunctions.IsVista && m_Text.Length > 0 ? "|" : "||"), d.CurrentFont, 0, format));
+                }
+                else
+                    size = Size.Ceiling(TextDrawing.MeasureString(d.Graphics, m_Text, d.CurrentFont, 0, format));
+                if (PadText)
+                {
+                    size.Width += BarUtilities.TextMarkupCultureSpecificPadding;
+                    size.Height += BarUtilities.TextMarkupCultureSpecificPadding;
+                }
+                this.Bounds = new Rectangle(Point.Empty, size);
+            }
+            else
+#endif
+            {
+                using (StringFormat format = new StringFormat(StringFormat.GenericTypographic))
+                {
+                    format.FormatFlags = StringFormatFlags.NoWrap;
+                    if (d.HotKeyPrefixVisible || !m_EnablePrefixHandling)
+                        format.HotkeyPrefix = System.Drawing.Text.HotkeyPrefix.Show;
+                    else
+                        format.HotkeyPrefix = System.Drawing.Text.HotkeyPrefix.Hide;
+
+                    if (m_TrailingSpace)
+                    {
+                        if (d.CurrentFont.Italic)
+                        {
+                            Size size = Size.Ceiling(d.Graphics.MeasureString(m_Text, d.CurrentFont, 0, format));
+                            size.Width += (int)(d.Graphics.MeasureString("|", d.CurrentFont).Width / 4);
+                            if (PadText)
+                            {
+                                size.Width += TextHelper.TextMarkupCultureSpecificPadding;
+                                size.Height += TextHelper.TextMarkupCultureSpecificPadding;
+                            }
+                            this.Bounds = new Rectangle(Point.Empty, size);
+                        }
+                        else
+                        {
+                            Size size = Size.Ceiling(d.Graphics.MeasureString(m_Text + "|", d.CurrentFont, 0, format));
+                            if (PadText)
+                            {
+                                size.Width += TextHelper.TextMarkupCultureSpecificPadding;
+                                size.Height += TextHelper.TextMarkupCultureSpecificPadding;
+                            }
+                            this.Bounds = new Rectangle(Point.Empty, size);
+                        }
+                    }
+                    else
+                    {
+                        Size size = Size.Ceiling(d.Graphics.MeasureString(m_Text, d.CurrentFont, 0, format));
+                        if (PadText)
+                        {
+                            size.Width += TextHelper.TextMarkupCultureSpecificPadding;
+                            size.Height += TextHelper.TextMarkupCultureSpecificPadding;
+                        }
+                        this.Bounds = new Rectangle(Point.Empty, size);
+                    }
+                }
+            }
+            IsSizeValid = true;
+        }
+
+        public override void Render(MarkupDrawContext d)
+        {
+            Rectangle r = this.Bounds;
+            r.Offset(d.Offset);
+
+            if (!d.ClipRectangle.IsEmpty && !r.IntersectsWith(d.ClipRectangle))
+                return;
+
+            Graphics g = d.Graphics;
+            #if (FRAMEWORK20)
+            if (BarUtilities.UseTextRenderer)
+            {
+                eTextFormat format = eTextFormat.Default | eTextFormat.NoClipping | eTextFormat.NoPadding;
+                if (d.RightToLeft) format |= eTextFormat.RightToLeft;
+                if (!d.HotKeyPrefixVisible)
+                    format |= eTextFormat.HidePrefix;
+
+                if (!d.ClipRectangle.IsEmpty && r.Right > d.ClipRectangle.Right)
+                {
+                    format|= eTextFormat.EndEllipsis;
+                    r.Width -= (r.Right - d.ClipRectangle.Right);
+                }
+                TextDrawing.DrawString(g, m_Text, d.CurrentFont, d.CurrentForeColor, r, format);
+                
+            }
+            else
+            #endif
+            {
+                using (StringFormat format = new StringFormat(StringFormat.GenericTypographic))
+                {
+                    format.FormatFlags |= StringFormatFlags.NoWrap;
+                    if (d.RightToLeft) format.FormatFlags |= StringFormatFlags.DirectionRightToLeft;
+                    if (d.HotKeyPrefixVisible)
+                        format.HotkeyPrefix = System.Drawing.Text.HotkeyPrefix.Show;
+                    else
+                        format.HotkeyPrefix = System.Drawing.Text.HotkeyPrefix.Hide;
+                    if (!d.ClipRectangle.IsEmpty && r.Right > d.ClipRectangle.Right)
+                    {
+                        format.Trimming = StringTrimming.EllipsisCharacter;
+                        r.Width -= (r.Right - d.ClipRectangle.Right);
+                    }
+                    
+                    using (SolidBrush brush = new SolidBrush(d.CurrentForeColor))
+                        g.DrawString(m_Text, d.CurrentFont, brush, r, format);
+                }
+            }
+
+            if (d.StrikeOut == true)
+            {
+                // StrikeOut
+
+                float descent = d.CurrentFont.FontFamily.GetCellDescent(d.CurrentFont.Style) *
+                    d.CurrentFont.Size / d.CurrentFont.FontFamily.GetEmHeight(d.CurrentFont.Style) + 1;
+
+                using (Pen pen = new Pen(d.CurrentForeColor, 1))
+                {
+                    SmoothingMode sm = g.SmoothingMode;
+                    g.SmoothingMode = SmoothingMode.Default;
+
+                    float y = r.Top + (r.Height + descent) / 2;
+
+                    g.DrawLine(pen, r.X, y, r.Right - 1, y);
+                    g.SmoothingMode = sm;
+                }
+            }
+
+            if ((d.HyperLink && (d.HyperlinkStyle == null || d.HyperlinkStyle.UnderlineStyle != eHyperlinkUnderlineStyle.None)) || d.Underline)
+            {
+                // Underline Hyperlink
+                float descent = d.CurrentFont.FontFamily.GetCellDescent(d.CurrentFont.Style) * d.CurrentFont.Size / d.CurrentFont.FontFamily.GetEmHeight(d.CurrentFont.Style);
+                using (Pen pen = new Pen(d.CurrentForeColor, 1))
+                {
+                    if (d.HyperLink && d.HyperlinkStyle != null && d.HyperlinkStyle.UnderlineStyle == eHyperlinkUnderlineStyle.DashedLine)
+                        pen.DashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
+                    descent -= 1;
+                    System.Drawing.Drawing2D.SmoothingMode sm = g.SmoothingMode;
+                    g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.Default;
+                    g.DrawLine(pen, r.X, r.Bottom - descent, r.Right - 1, r.Bottom - descent);
+                    g.SmoothingMode = sm;
+                }
+            }
+
+            this.RenderBounds = r;
+        }
+
+        protected override void ArrangeCore(System.Drawing.Rectangle finalRect, MarkupDrawContext d) {}
+
+        public string Text
+        {
+            get { return m_Text; }
+            set
+            {
+                m_Text = value;
+                this.IsSizeValid = false;
+            }
+        }
+
+        public bool TrailingSpace
+        {
+            get { return m_TrailingSpace; }
+            set
+            {
+                m_TrailingSpace = value;
+                this.IsSizeValid = false;
+            }
+        }
+
+        public bool EnablePrefixHandling
+        {
+            get { return m_EnablePrefixHandling; }
+            set { m_EnablePrefixHandling = value; }
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/TextMarkup/Underline.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/TextMarkup/Underline.cs
new file mode 100644
index 00000000..b2c3fdc1
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/TextMarkup/Underline.cs	
@@ -0,0 +1,46 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+#if AdvTree
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#endif
+{
+    internal class Underline : FontChangeElement
+    {
+        #region Internal Implementation
+        protected override void SetFont(MarkupDrawContext d)
+        {
+            d.Underline = true;
+            //Font font = d.CurrentFont;
+            //FontStyle style = d.CurrentFont.Style | FontStyle.Underline;
+
+            //if (!font.Underline && font.FontFamily.IsStyleAvailable(style))
+            //    d.CurrentFont = new Font(font, style);
+            //else
+            //    font = null;
+
+            //if (font != null)
+            //    m_OldFont = font;
+
+            base.SetFont(d);
+        }
+
+        public override void MeasureEnd(Size availableSize, MarkupDrawContext d)
+        {
+            d.Underline = false;
+            base.MeasureEnd(availableSize, d);
+        }
+
+        public override void RenderEnd(MarkupDrawContext d)
+        {
+            d.Underline = false;
+            base.RenderEnd(d);
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/VisualStyles/MetroStyleFactory.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/VisualStyles/MetroStyleFactory.cs
new file mode 100644
index 00000000..e4263416
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/VisualStyles/MetroStyleFactory.cs	
@@ -0,0 +1,615 @@
+using System.Drawing;
+using DevComponents.DotNetBar.Metro.ColorTables;
+using DevComponents.DotNetBar.Metro.Rendering;
+using DevComponents.DotNetBar.Rendering;
+
+namespace DevComponents.DotNetBar.SuperGrid.Style
+{
+    /// <summary>
+    /// Create the Metro Visual Style for SuperGridControl.
+    /// </summary>
+    public class MetroStyleFactory : VisualStyleFactory
+    {
+        private MetroPartColors _MetroPartColors;
+
+        /// <summary>
+        /// Initializes a new instance of the MetroStyleFactory class.
+        /// </summary>
+        public MetroStyleFactory()
+        {
+            _MetroPartColors = MetroRender.GetColorTable().MetroPartColors;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the MetroStyleFactory class.
+        /// </summary>
+        /// <param name="metroPartColors">Metro Part Colors to Initialize Style with.</param>
+        public MetroStyleFactory(MetroPartColors metroPartColors)
+        {
+            _MetroPartColors = metroPartColors;
+
+            if (metroPartColors == null)
+                _MetroPartColors = MetroRender.GetColorTable().MetroPartColors;
+        }
+
+        /// <summary>
+        /// Create the DefaultVisualStyle for SuperGridControl.
+        /// </summary>
+        /// <param name="factory">Color-Factory used to generate colors.</param>
+        /// <returns>New instance of DefaultVisualStyles class.</returns>s
+        public override DefaultVisualStyles CreateStyle(ColorFactory factory)
+        {
+            DefaultVisualStyles visualStyle = new DefaultVisualStyles();
+
+            InitGridPanelStyle(visualStyle, factory);
+
+            InitCellStyles(visualStyle, factory);
+            InitMergedCellStyles(visualStyle, factory);
+            InitAltRowCellStyles(visualStyle, factory);
+
+            InitColumnStyles(visualStyle, factory);
+            InitAltColumnStyles(visualStyle, factory);
+            InitColumnHeaderStyles(visualStyle, factory);
+
+            InitRowStyles(visualStyle, factory);
+            InitTextRowStyles(visualStyle, factory);
+
+            InitGroupHeaderStyles(visualStyle, factory);
+
+            InitFilterRowStyles(visualStyle, factory);
+            InitFilterColumnHeaderStyles(visualStyle, factory);
+
+            InitGroupByStyles(visualStyle, factory);
+
+            return (visualStyle);
+        }
+
+        #region InitGridPanelStyle
+
+        private void InitGridPanelStyle(DefaultVisualStyles visualStyle, ColorFactory factory)
+        {
+            GridPanelVisualStyle style = new GridPanelVisualStyle();
+
+            MetroPartColors metroColors = _MetroPartColors;
+            style.Background = new Background(factory.GetColor(metroColors.EditControlBackColor));
+            style.BorderColor = new BorderColor(factory.GetColor(metroColors.CanvasColorDarkShade));
+            style.BorderPattern.All = LinePattern.Solid;
+            style.BorderThickness = new Thickness(1);
+            style.TextColor = factory.GetColor(metroColors.TextColor);
+
+            style.TreeLineColor = factory.GetColor(metroColors.CanvasColorLighterShade);
+            style.HeaderLineColor = factory.GetColor(metroColors.CanvasColorDarkShade);
+            style.HorizontalLineColor = factory.GetColor(metroColors.CanvasColorLighterShade);
+            style.VerticalLineColor = factory.GetColor(metroColors.CanvasColorLighterShade);
+
+            style.TreeLinePattern = LinePattern.Solid;
+            style.HorizontalLinePattern = LinePattern.Solid;
+            style.VerticalLinePattern = LinePattern.Solid;
+            style.HeaderHLinePattern = LinePattern.Solid;
+            style.HeaderVLinePattern = LinePattern.Solid;
+
+            BaseTreeButtonVisualStyle tstyle = new BaseTreeButtonVisualStyle();
+
+            tstyle.BorderColor = factory.GetColor(metroColors.CanvasColorDarkShade);
+            tstyle.HotBorderColor = factory.GetColor(metroColors.CanvasColorDarkShade);
+            tstyle.LineColor = factory.GetColor(metroColors.CanvasColorDarkShade);
+            tstyle.HotLineColor = factory.GetColor(metroColors.CanvasColorDarkShade);
+            tstyle.Background = new Background(factory.GetColor(metroColors.EditControlBackColor), factory.GetColor(metroColors.EditControlBackColor), 90);
+            tstyle.HotBackground = new Background(factory.GetColor(metroColors.CanvasColor), factory.GetColor(metroColors.CanvasColor), 90);
+
+            style.CircleTreeButtonStyle.CollapseButton = tstyle;
+            style.CircleTreeButtonStyle.ExpandButton = tstyle;
+
+            style.SquareTreeButtonStyle.CollapseButton = tstyle;
+            style.SquareTreeButtonStyle.ExpandButton = tstyle;
+
+            style.TriangleTreeButtonStyle.CollapseButton = tstyle;
+            style.TriangleTreeButtonStyle.ExpandButton = tstyle;
+
+            style.TriangleTreeButtonStyle.ExpandButton = tstyle;
+            visualStyle.GridPanelStyle = style;
+        }
+
+        #endregion
+
+        #region InitColumnHeaderStyles
+
+        private void InitColumnHeaderStyles(DefaultVisualStyles visualStyle, ColorFactory factory)
+        {
+            ColumnHeaderRowVisualStyle style = new ColumnHeaderRowVisualStyle();
+            MetroPartColors metroColors = _MetroPartColors;
+
+            style.FilterBorderColor = factory.GetColor(metroColors.CanvasColorDarkShade);
+
+            style.FilterBackground = new Background(
+                Color.White, factory.GetColor(metroColors.CanvasColorDarkShade), 0);
+
+            style.WhiteSpaceBackground = new Background(factory.GetColor(metroColors.CanvasColor));
+
+            style.RowHeader.Background = new
+                Background(factory.GetColor(metroColors.CanvasColorLighterShade));
+
+            style.RowHeader.BorderHighlightColor = GetBorderHighlight();
+
+            style.IndicatorBackground = new Background(factory.GetColor(metroColors.ComplementColor));
+            style.IndicatorBorderColor = factory.GetColor(metroColors.ComplementColorDark);
+
+            visualStyle.ColumnHeaderRowStyles[StyleType.Default] = style;
+
+            style = style.Copy();
+
+            style.FilterBorderColor = factory.GetColor(metroColors.ComplementColor);
+
+            style.FilterBackground = new Background(
+                Color.White, factory.GetColor(metroColors.ComplementColor), 45);
+
+            visualStyle.ColumnHeaderRowStyles[StyleType.Selected] = style;
+
+            style = style.Copy();
+
+            style.FilterBorderColor = factory.GetColor(metroColors.CanvasColorDarkShade);
+            
+            style.FilterBackground = new Background(
+                Color.White, factory.GetColor(metroColors.BaseColorDark), 0);
+
+            style.RowHeader.Background = new Background(
+                factory.GetColor(metroColors.CanvasColorLightShade));
+
+            visualStyle.ColumnHeaderRowStyles[StyleType.MouseOver] = style;
+            visualStyle.ColumnHeaderRowStyles[StyleType.SelectedMouseOver] = style;
+        }
+
+        #endregion
+
+        #region InitTextRowStyles
+
+        private void InitTextRowStyles(DefaultVisualStyles visualStyle, ColorFactory factory)
+        {
+            TextRowVisualStyle style = new TextRowVisualStyle();
+            MetroPartColors metroColors = _MetroPartColors;
+
+            style.Alignment = Alignment.MiddleCenter;
+            style.AllowWrap = Tbool.True;
+
+            style.Background = new Background(factory.GetColor(metroColors.EditControlBackColor));
+            style.BorderColor = new BorderColor(factory.GetColor(metroColors.CanvasColorLighterShade));
+
+            style.Padding.All = 2;
+
+            style.TextColor = factory.GetColor(metroColors.TextColor);
+
+            style.RowHeaderStyle.Background = new Background(factory.GetColor(metroColors.CanvasColorLighterShade));
+            style.RowHeaderStyle.BorderHighlightColor = GetBorderHighlight();
+
+            visualStyle.TitleStyles[StyleType.Default] = style;
+            visualStyle.HeaderStyles[StyleType.Default] = style.Copy();
+            visualStyle.FooterStyles[StyleType.Default] = style.Copy();
+
+            style = style.Copy();
+            style.Background = new Background(Color.Transparent);
+
+            visualStyle.CaptionStyles[StyleType.Default] = style;
+        }
+
+        #endregion
+
+        #region InitCellStyles
+
+        private void InitCellStyles(DefaultVisualStyles visualStyle, ColorFactory factory)
+        {
+            CellVisualStyle style = new CellVisualStyle();
+            MetroPartColors metroColors = _MetroPartColors;
+
+            style.Alignment = Alignment.MiddleLeft;
+            style.Background = new Background(factory.GetColor(metroColors.EditControlBackColor));
+            style.BorderColor = new BorderColor(factory.GetColor(metroColors.CanvasColorLighterShade));
+            style.BorderPattern.All = LinePattern.Solid;
+            style.BorderThickness.All = 0;
+            style.Font = SystemFonts.DefaultFont;
+            style.ImageAlignment = Alignment.MiddleLeft;
+            style.ImagePadding.All = 2;
+            style.Margin.All = 0;
+            style.ImageOverlay = ImageOverlay.None;
+            style.Padding.All = 0;
+            style.TextColor = metroColors.TextColor;
+
+            visualStyle.CellStyles[StyleType.Default] = style;
+
+            style = new CellVisualStyle();
+            style.TextColor = metroColors.CanvasColorDarkShade;
+            visualStyle.CellStyles[StyleType.ReadOnly] = style;
+
+            style = new CellVisualStyle();
+            style.Background = GetDefaultSelectedBackground(factory);
+            style.TextColor = factory.GetColor(metroColors.BaseTextColor);
+
+            visualStyle.CellStyles[StyleType.Selected] = style;
+            visualStyle.CellStyles[StyleType.ReadOnlySelected] = style.Copy();
+
+            style = new CellVisualStyle();
+            style.Background = GetSelectedMouseOverBackground(factory);
+            style.TextColor = factory.GetColor(metroColors.BaseColorLightText);
+
+            visualStyle.CellStyles[StyleType.SelectedMouseOver] = style;
+            visualStyle.CellStyles[StyleType.ReadOnlySelectedMouseOver] = style.Copy();
+
+            style = new CellVisualStyle();
+            style.Background = new Background(factory.GetColor(metroColors.EditControlBackColor));
+
+            visualStyle.CellStyles[StyleType.Empty] = style;
+        }
+
+        #endregion
+
+        #region InitMergedCellStyles
+
+        private void InitMergedCellStyles(DefaultVisualStyles visualStyle, ColorFactory factory)
+        {
+            visualStyle.MergedCellStyles[StyleType.Default] = new CellVisualStyle();
+            visualStyle.MergedCellStyles[StyleType.ReadOnly] = new CellVisualStyle();
+            visualStyle.MergedCellStyles[StyleType.Selected] = new CellVisualStyle();
+            visualStyle.MergedCellStyles[StyleType.ReadOnlySelected] = new CellVisualStyle();
+            visualStyle.MergedCellStyles[StyleType.SelectedMouseOver] = new CellVisualStyle();
+            visualStyle.MergedCellStyles[StyleType.ReadOnlySelectedMouseOver] = new CellVisualStyle();
+            visualStyle.MergedCellStyles[StyleType.Empty] = new CellVisualStyle();
+        }
+
+        #endregion
+
+        #region InitAltRowCellStyles
+
+        private void InitAltRowCellStyles(DefaultVisualStyles visualStyle, ColorFactory factory)
+        {
+            MetroPartColors metroColors = _MetroPartColors;
+            visualStyle.AlternateRowCellStyles[StyleType.Default].Background =
+                new Background(factory.GetColor((metroColors.CanvasColor == metroColors.EditControlBackColor) ? metroColors.CanvasColorLightShade : metroColors.CanvasColor));
+        }
+
+        #endregion
+
+        #region InitColumnStyles
+
+        private void InitColumnStyles(DefaultVisualStyles visualStyle, ColorFactory factory)
+        {
+            ColumnHeaderVisualStyle colStyle = new ColumnHeaderVisualStyle();
+            MetroPartColors metroColors = _MetroPartColors;
+
+            colStyle.Alignment = Alignment.MiddleCenter;
+            colStyle.BorderColor = new BorderColor(factory.GetColor(metroColors.CanvasColorLightShade));
+            colStyle.BorderPattern.All = LinePattern.Solid;
+            colStyle.BorderThickness.All = 0;
+            colStyle.Font = SystemFonts.CaptionFont;
+            colStyle.ImageAlignment = Alignment.MiddleLeft;
+            colStyle.Margin.All = 0;
+            colStyle.ImageOverlay = ImageOverlay.None;
+            colStyle.TextColor = factory.GetColor(metroColors.TextColor);
+
+            colStyle.Background = new Background(factory.GetColor(metroColors.CanvasColorLighterShade));
+
+            visualStyle.ColumnHeaderStyles[StyleType.Default] = colStyle;
+            visualStyle.ColumnHeaderStyles[StyleType.ReadOnly] = colStyle.Copy();
+            visualStyle.ColumnHeaderStyles[StyleType.ReadOnly].Font = null;
+
+            colStyle = new ColumnHeaderVisualStyle();
+            colStyle.Background = new Background(factory.GetColor(metroColors.CanvasColorLightShade));
+            visualStyle.ColumnHeaderStyles[StyleType.MouseOver] = colStyle;
+            visualStyle.ColumnHeaderStyles[StyleType.ReadOnlyMouseOver] = colStyle.Copy();
+
+            colStyle = new ColumnHeaderVisualStyle();
+            colStyle.Background = GetDefaultSelectedColumnBackground(factory);
+            visualStyle.ColumnHeaderStyles[StyleType.Selected] = colStyle;
+            visualStyle.ColumnHeaderStyles[StyleType.ReadOnlySelected] = colStyle.Copy();
+
+            colStyle = new ColumnHeaderVisualStyle();
+            colStyle.Background = GetSelectedColumnMouseOverBackground();
+            visualStyle.ColumnHeaderStyles[StyleType.SelectedMouseOver] = colStyle;
+            visualStyle.ColumnHeaderStyles[StyleType.ReadOnlySelectedMouseOver] = colStyle.Copy();
+        }
+
+        #endregion
+
+        #region InitAltColumnStyles
+
+        private void InitAltColumnStyles(DefaultVisualStyles visualStyle, ColorFactory factory)
+        {
+            MetroPartColors metroColors = _MetroPartColors;
+            visualStyle.AlternateColumnCellStyles[StyleType.Default].Background =
+                new Background(factory.GetColor(metroColors.EditControlBackColor));
+        }
+
+        #endregion
+
+        #region InitRowStyles
+
+        private void InitRowStyles(DefaultVisualStyles visualStyle, ColorFactory factory)
+        {
+            visualStyle.RowStyles[StyleType.Default] = GetDefaultRowStyle();
+            visualStyle.RowStyles[StyleType.MouseOver] = GetMouseOverRowStyle();
+            visualStyle.RowStyles[StyleType.SelectedMouseOver] = GetSelectedMouseOverRowStyle(visualStyle, factory);
+        }
+
+        #region GetDefaultRowStyle
+
+        private RowVisualStyle GetDefaultRowStyle()
+        {
+            MetroPartColors metroColors = _MetroPartColors;
+
+            RowVisualStyle rowStyle = new RowVisualStyle();
+            rowStyle.Background = new Background(metroColors.EditControlBackColor);
+
+            RowHeaderVisualStyle style = new RowHeaderVisualStyle();
+
+            style.Font = SystemFonts.DefaultFont;
+            style.TextColor = metroColors.TextColor;
+
+            Background bg = new Background(metroColors.CanvasColorLighterShade);
+            style.Background = bg;
+
+            bg = new Background(metroColors.BaseColor);
+            style.ActiveRowBackground = bg;
+            style.DirtyMarkerBackground = new Background(metroColors.BaseColorDarker);
+            style.BorderHighlightColor = GetBorderHighlight();
+
+            rowStyle.RowHeaderStyle = style;
+
+            return (rowStyle);
+        }
+
+        #endregion
+
+        #region GetMouseOverRowStyle
+
+        private RowVisualStyle GetMouseOverRowStyle()
+        {
+            MetroPartColors metroColors = _MetroPartColors;
+
+            RowVisualStyle rowStyle = new RowVisualStyle();
+            rowStyle.Background = new Background(metroColors.EditControlBackColor);
+
+            RowHeaderVisualStyle style = new RowHeaderVisualStyle();
+            style.Background = new Background(metroColors.CanvasColorLighterShade);
+            style.ActiveRowBackground = new Background(metroColors.CanvasColorLightShade);
+
+            Background bg = new Background(metroColors.CanvasColorLightShade);
+            style.Background = bg;
+
+            bg = new Background(metroColors.BaseColor);
+            style.ActiveRowBackground = bg;
+
+            rowStyle.RowHeaderStyle = style;
+
+            return (rowStyle);
+        }
+
+        #endregion
+
+        #region GetSelectedMouseOverRowStyle
+
+        private RowVisualStyle GetSelectedMouseOverRowStyle(DefaultVisualStyles visualStyle, ColorFactory factory)
+        {
+            MetroPartColors metroColors = _MetroPartColors;
+
+            RowVisualStyle rowStyle = new RowVisualStyle();
+            rowStyle.Background = GetDefaultSelectedBackground(factory);
+
+            RowHeaderVisualStyle style = new RowHeaderVisualStyle();
+            style.Background = new Background(metroColors.BaseColor);
+            style.ActiveRowBackground = new Background(metroColors.BaseColor);
+
+            rowStyle.RowHeaderStyle = style;
+
+            visualStyle.RowStyles[StyleType.Selected] = rowStyle;
+
+            rowStyle = new RowVisualStyle();
+            rowStyle.Background = GetSelectedColumnMouseOverBackground();
+
+            style = new RowHeaderVisualStyle();
+            style.Background = new Background(metroColors.BaseColor);
+            style.ActiveRowBackground = new Background(metroColors.BaseColor);
+
+            rowStyle.RowHeaderStyle = style;
+
+            return (rowStyle);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InitGroupHeaderStyles
+
+        private void InitGroupHeaderStyles(DefaultVisualStyles visualStyle, ColorFactory factory)
+        {
+            MetroPartColors metroColors = _MetroPartColors;
+
+            GroupHeaderVisualStyle style = new GroupHeaderVisualStyle();
+
+            style.AllowWrap = Tbool.True;
+            style.Alignment = Alignment.MiddleLeft;
+            style.Font = SystemFonts.DefaultFont;
+
+            style.Background = new
+                Background(factory.GetColor(metroColors.EditControlBackColor));
+
+            style.UnderlineColor = factory.GetColor(metroColors.ComplementColor);
+
+            style.RowHeaderStyle.Background = new Background(factory.GetColor(metroColors.CanvasColorLighterShade));
+            style.RowHeaderStyle.BorderHighlightColor = GetBorderHighlight();
+            style.RowHeaderStyle.Font = SystemFonts.DefaultFont;
+
+            style.TextColor = metroColors.TextColor;
+            
+            visualStyle.GroupHeaderStyles[StyleType.Default] = style;
+        }
+
+        #endregion
+
+        #region GetDefaultSelectedColumnBackground
+        private Background GetDefaultSelectedColumnBackground(ColorFactory factory)
+        {
+            MetroPartColors metroColors = _MetroPartColors;
+
+            Background bg = new Background(factory.GetColor(metroColors.CanvasColorLighterShade),
+                factory.GetColor(metroColors.CanvasColorLightShade));
+
+            return (bg);
+        }
+        #endregion
+
+        #region GetDefaultSelectedBackground
+
+        private Background GetDefaultSelectedBackground(ColorFactory factory)
+        {
+            MetroPartColors metroColors = _MetroPartColors;
+
+            Background bg = new Background(factory.GetColor(metroColors.BaseColor));
+
+            return (bg);
+        }
+
+        #endregion
+
+        #region GetDefaultSelectedColumnMouseOverStyle
+
+        private Background GetSelectedColumnMouseOverBackground()
+        {
+            MetroPartColors metroColors = _MetroPartColors;
+
+            return (new Background(metroColors.BaseColorLight));
+        }
+
+        #endregion
+
+        #region GetDefaultSelectedMouseOverStyle
+
+        private Background GetSelectedMouseOverBackground(ColorFactory factory)
+        {
+            MetroPartColors metroColors = _MetroPartColors;
+
+            return (new Background(factory.GetColor(metroColors.BaseColorLight)));
+        }
+
+        #endregion
+
+        #region InitFilterColumnHeaderStyles
+
+        private void InitFilterColumnHeaderStyles(
+            DefaultVisualStyles visualStyle, ColorFactory factory)
+        {
+            FilterColumnHeaderVisualStyle colStyle = new FilterColumnHeaderVisualStyle();
+            MetroPartColors metroColors = _MetroPartColors;
+
+            colStyle.Alignment = Alignment.MiddleCenter;
+            colStyle.Font = SystemFonts.CaptionFont;
+
+            colStyle.TextColor = factory.GetColor(metroColors.TextColor);
+            colStyle.ErrorTextColor = factory.GetColor(metroColors.BaseColorDarker);
+
+            colStyle.Background = new Background(factory.GetColor(metroColors.CanvasColorLighterShade));
+            colStyle.GripBarBackground = new Background(factory.GetColor(metroColors.CanvasColor));
+            visualStyle.FilterColumnHeaderStyles[StyleType.Default] = colStyle;
+
+            colStyle = new FilterColumnHeaderVisualStyle();
+            colStyle.Background = new Background(factory.GetColor(metroColors.CanvasColorLightShade));
+            visualStyle.FilterColumnHeaderStyles[StyleType.MouseOver] = colStyle;
+
+            colStyle = new FilterColumnHeaderVisualStyle();
+            colStyle.Background = GetDefaultSelectedColumnBackground(factory);
+            visualStyle.FilterColumnHeaderStyles[StyleType.Selected] = colStyle;
+
+            colStyle = new FilterColumnHeaderVisualStyle();
+            colStyle.Background = GetSelectedColumnMouseOverBackground();
+            visualStyle.FilterColumnHeaderStyles[StyleType.SelectedMouseOver] = colStyle;
+        }
+
+        #endregion
+
+        #region InitFilterRowStyles
+
+        private void InitFilterRowStyles(
+            DefaultVisualStyles visualStyle, ColorFactory factory)
+        {
+            FilterRowVisualStyle style = new FilterRowVisualStyle();
+            MetroPartColors metroColors = _MetroPartColors;
+
+            style.FilterBorderColor = factory.GetColor(0x787D87);
+
+            style.FilterBackground = new Background(
+                Color.White, factory.GetColor(metroColors.CanvasColorDarkShade), 0);
+
+            style.WhiteSpaceBackground = new Background(factory.GetColor(metroColors.EditControlBackColor));
+
+            style.RowHeader.Background = new
+                Background(factory.GetColor(metroColors.CanvasColorLighterShade));
+
+            style.RowHeader.BorderHighlightColor = GetBorderHighlight();
+
+            visualStyle.FilterRowStyles[StyleType.Default] = style;
+
+            style = style.Copy();
+
+            style.FilterBackground = new Background(
+                Color.White, factory.GetColor(metroColors.ComplementColor), 45);
+
+            visualStyle.FilterRowStyles[StyleType.Selected] = style;
+
+            style = style.Copy();
+
+            style.FilterBackground = new Background(
+                Color.White, factory.GetColor(metroColors.BaseColorDark), 0);
+
+            style.RowHeader.Background = new
+                Background(factory.GetColor(metroColors.CanvasColorLightShade));
+
+            visualStyle.FilterRowStyles[StyleType.MouseOver] = style;
+            visualStyle.FilterRowStyles[StyleType.SelectedMouseOver] = style;
+        }
+
+        #endregion
+
+        #region InitGroupByStyles
+
+        private void InitGroupByStyles(DefaultVisualStyles visualStyle, ColorFactory factory)
+        {
+            GroupByVisualStyle style = new GroupByVisualStyle();
+            MetroPartColors metroColors = _MetroPartColors;
+
+            style.Alignment = Alignment.MiddleCenter;
+            style.GroupBoxConnectorColor = factory.GetColor(metroColors.BaseColorDark); // Panel border color
+            style.GroupBoxBorderColor = factory.GetColor(metroColors.BaseColorDark);
+
+            style.InsertMarkerBorderColor = factory.GetColor(metroColors.BaseColorDark);
+            style.InsertMarkerBackground = GetSelectedColumnMouseOverBackground();
+
+            style.RowHeaderStyle.Background = new Background(factory.GetColor(metroColors.CanvasColorLighterShade));
+            style.RowHeaderStyle.BorderHighlightColor = GetBorderHighlight();
+
+            style.TextColor = factory.GetColor(0x363636); // Col text color
+            style.GroupBoxBackground = new Background(factory.GetColor(metroColors.CanvasColorLighterShade));  // col background
+            visualStyle.GroupByStyles[StyleType.Default] = style;
+
+            style = new GroupByVisualStyle();
+            style.GroupBoxBackground = new Background(factory.GetColor(metroColors.CanvasColorLightShade));  // col background
+            visualStyle.GroupByStyles[StyleType.MouseOver] = style;
+
+            style = new GroupByVisualStyle();
+            style.GroupBoxBackground = GetDefaultSelectedColumnBackground(factory);  // col background
+            visualStyle.GroupByStyles[StyleType.Selected] = style;
+
+            style = new GroupByVisualStyle();
+            style.GroupBoxBackground = GetSelectedColumnMouseOverBackground();  // col background
+            visualStyle.GroupByStyles[StyleType.SelectedMouseOver] = style;
+        }
+
+        #endregion
+
+        #region GetBorderHighlight
+
+        private Color GetBorderHighlight()
+        {
+            return (Color.Transparent);
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/VisualStyles/Office2010BlackStyleFactory.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/VisualStyles/Office2010BlackStyleFactory.cs
new file mode 100644
index 00000000..cae45d72
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/VisualStyles/Office2010BlackStyleFactory.cs	
@@ -0,0 +1,590 @@
+using System.Drawing;
+using DevComponents.DotNetBar.Rendering;
+
+namespace DevComponents.DotNetBar.SuperGrid.Style
+{
+    ///<summary>
+    /// Office2010BlackStyleFactory
+    ///</summary>
+    public class Office2010BlackStyleFactory : VisualStyleFactory
+    {
+        /// <summary>
+        /// Create the DefaultVisualStyle for SuperGridControl.
+        /// </summary>
+        /// <param name="factory">Color-Factory used to generate colors.</param>
+        /// <returns>New instance of DefaultVisualStyles class.</returns>s
+        public override DefaultVisualStyles CreateStyle(ColorFactory factory)
+        {
+            DefaultVisualStyles visualStyle = new DefaultVisualStyles();
+
+            InitGridPanelStyle(visualStyle, factory);
+
+            InitCellStyles(visualStyle, factory);
+            InitMergedCellStyles(visualStyle, factory);
+            InitAltRowCellStyles(visualStyle, factory);
+
+            InitColumnStyles(visualStyle, factory);
+            InitAltColumnStyles(visualStyle, factory);
+            InitColumnHeaderStyles(visualStyle, factory);
+
+            InitRowStyles(visualStyle, factory);
+            InitTextRowStyles(visualStyle, factory);
+
+            InitGroupHeaderStyles(visualStyle, factory);
+
+            InitFilterRowStyles(visualStyle, factory);
+            InitFilterColumnHeaderStyles(visualStyle, factory);
+
+            InitGroupByStyles(visualStyle, factory);
+
+            return (visualStyle);
+        }
+
+        #region InitGridPanelStyle
+
+        private void InitGridPanelStyle(DefaultVisualStyles visualStyle, ColorFactory factory)
+        {
+            GridPanelVisualStyle style = new GridPanelVisualStyle();
+
+            style.Background = new Background(factory.GetColor(0xFFFFFF));
+            style.BorderColor = new BorderColor(factory.GetColor(0x313131));
+            style.BorderPattern.All = LinePattern.Solid;
+            style.BorderThickness = new Thickness(1);
+            style.TextColor = factory.GetColor(0x000000);
+
+            style.TreeLineColor = factory.GetColor(0x484848);
+            style.HeaderLineColor = factory.GetColor(0x444444);
+            style.HorizontalLineColor = factory.GetColor(0xDADCDD);
+            style.VerticalLineColor = factory.GetColor(0xDADCDD);
+
+            style.TreeLinePattern = LinePattern.Solid;
+            style.HorizontalLinePattern = LinePattern.Solid;
+            style.VerticalLinePattern = LinePattern.Solid;
+            style.HeaderHLinePattern = LinePattern.Solid;
+            style.HeaderVLinePattern = LinePattern.Solid;
+
+            BaseTreeButtonVisualStyle tstyle = new BaseTreeButtonVisualStyle();
+
+            tstyle.BorderColor = factory.GetColor(Color.SlateGray);
+            tstyle.HotBorderColor = factory.GetColor(Color.SlateGray);
+            tstyle.LineColor = factory.GetColor(Color.DarkSlateGray);
+            tstyle.HotLineColor = factory.GetColor(Color.DarkSlateGray);
+            tstyle.Background = new Background(factory.GetColor(Color.White), factory.GetColor(Color.Gainsboro), 90);
+            tstyle.HotBackground = new Background(factory.GetColor(Color.White), factory.GetColor(Color.Gainsboro), 90);
+
+            style.CircleTreeButtonStyle.CollapseButton = tstyle;
+            style.CircleTreeButtonStyle.ExpandButton = tstyle;
+
+            style.SquareTreeButtonStyle.CollapseButton = tstyle;
+            style.SquareTreeButtonStyle.ExpandButton = tstyle;
+
+            tstyle = new BaseTreeButtonVisualStyle();
+
+            tstyle.BorderColor = factory.GetColor(Color.Black);
+            tstyle.HotBorderColor = factory.GetColor(0x27C7F7);
+            tstyle.Background = new Background(factory.GetColor(Color.Black));
+            tstyle.HotBackground = new Background(factory.GetColor(0xC7EBFA));
+
+            style.TriangleTreeButtonStyle.CollapseButton = tstyle;
+
+            tstyle = new BaseTreeButtonVisualStyle();
+
+            tstyle.BorderColor = factory.GetColor(Color.DimGray);
+            tstyle.HotBorderColor = factory.GetColor(0x27C7F7);
+            tstyle.Background = new Background(factory.GetColor(Color.White));
+            tstyle.HotBackground = new Background(factory.GetColor(0xC7EBFA));
+
+            style.TriangleTreeButtonStyle.ExpandButton = tstyle;
+
+            visualStyle.GridPanelStyle = style;
+        }
+
+        #endregion
+
+        #region InitColumnHeaderStyles
+
+        private void InitColumnHeaderStyles(DefaultVisualStyles visualStyle, ColorFactory factory)
+        {
+            ColumnHeaderRowVisualStyle style = new ColumnHeaderRowVisualStyle();
+
+            style.FilterBorderColor = factory.GetColor(Color.LightGray);
+            style.FilterBackground = new Background(Color.White, factory.GetColor(Color.LightGray), 0);
+
+            style.WhiteSpaceBackground = new Background(factory.GetColor(0x797979));
+            style.RowHeader.Background = new Background(factory.GetColor(0x6A6A6A), factory.GetColor(0x595959), BackFillType.ForwardDiagonal);
+
+            style.RowHeader.BorderHighlightColor = GetBorderHighlight(factory);
+
+            style.IndicatorBackground = new Background(factory.GetColor(0xF9FAFB), factory.GetColor(0xD7DAE2), BackFillType.Angle);
+            style.IndicatorBorderColor = factory.GetColor(0xBDCFE8);
+
+            visualStyle.ColumnHeaderRowStyles[StyleType.Default] = style;
+            
+            style = style.Copy();
+
+            style.FilterBorderColor = factory.GetColor(Color.LightGreen);
+            style.FilterBackground = new Background(Color.White, factory.GetColor(Color.Green), 45);
+
+            visualStyle.ColumnHeaderRowStyles[StyleType.Selected] = style;
+
+            style = style.Copy();
+
+            style.FilterBorderColor = factory.GetColor(0x797979);
+            style.FilterBackground = new Background(Color.White, factory.GetColor(0xE2AA00), 0);
+
+            style.RowHeader.Background = new Background(factory.GetColor(0x8E8E8E));
+
+            visualStyle.ColumnHeaderRowStyles[StyleType.MouseOver] = style;
+            visualStyle.ColumnHeaderRowStyles[StyleType.SelectedMouseOver] = style;
+        }
+
+        #endregion
+
+        #region InitTextRowStyles
+
+        private void InitTextRowStyles(DefaultVisualStyles visualStyle, ColorFactory factory)
+        {
+            TextRowVisualStyle style = new TextRowVisualStyle();
+
+            style.Alignment = Alignment.MiddleCenter;
+            style.AllowWrap = Tbool.True;
+
+            style.Background = new Background(factory.GetColor(0x6A6A6A));
+            style.BorderColor = new BorderColor(factory.GetColor(0x444444));
+
+            style.Padding.All = 2;
+
+            style.TextColor = factory.GetColor(0xE2E2E2);
+
+            style.RowHeaderStyle.Background = new Background(factory.GetColor(0x6A6A6A));
+            style.RowHeaderStyle.BorderHighlightColor = GetBorderHighlight(factory);
+
+            visualStyle.TitleStyles[StyleType.Default] = style;
+            visualStyle.HeaderStyles[StyleType.Default] = style.Copy();
+            visualStyle.FooterStyles[StyleType.Default] = style.Copy();
+
+            style = style.Copy();
+            style.Background = new Background(factory.GetColor(0x686868));
+
+            visualStyle.CaptionStyles[StyleType.Default] = style;
+        }
+
+        #endregion
+
+        #region InitCellStyles
+
+        private void InitCellStyles(DefaultVisualStyles visualStyle, ColorFactory factory)
+        {
+            CellVisualStyle style = new CellVisualStyle();
+
+            style.Alignment = Alignment.MiddleLeft;
+            style.Background = new Background(factory.GetColor(Color.White));
+            style.Font = SystemFonts.DefaultFont;
+            style.ImageAlignment = Alignment.MiddleLeft;
+            style.ImagePadding.All = 2;
+            style.Margin.All = 0;
+            style.ImageOverlay = ImageOverlay.None;
+            style.Padding.All = 0;
+            style.TextColor = Color.Black;
+
+            visualStyle.CellStyles[StyleType.Default] = style;
+
+            style = new CellVisualStyle();
+            style.Background = GetDefaultSelectedBackground(factory);
+
+            visualStyle.CellStyles[StyleType.Selected] = style;
+
+            style = new CellVisualStyle();
+            style.Background = GetSelectedMouseOverBackground(factory);
+
+            visualStyle.CellStyles[StyleType.SelectedMouseOver] = style;
+
+            style = new CellVisualStyle();
+            style.Background = new Background(factory.GetColor(0xF4F4F4));
+
+            visualStyle.CellStyles[StyleType.Empty] = style;
+        }
+
+        #endregion
+
+        #region InitMergedCellStyles
+
+        private void InitMergedCellStyles(DefaultVisualStyles visualStyle, ColorFactory factory)
+        {
+            visualStyle.MergedCellStyles[StyleType.Default] = new CellVisualStyle();
+            visualStyle.MergedCellStyles[StyleType.ReadOnly] = new CellVisualStyle();
+            visualStyle.MergedCellStyles[StyleType.Selected] = new CellVisualStyle();
+            visualStyle.MergedCellStyles[StyleType.ReadOnlySelected] = new CellVisualStyle();
+            visualStyle.MergedCellStyles[StyleType.SelectedMouseOver] = new CellVisualStyle();
+            visualStyle.MergedCellStyles[StyleType.ReadOnlySelectedMouseOver] = new CellVisualStyle();
+            visualStyle.MergedCellStyles[StyleType.Empty] = new CellVisualStyle();
+        }
+
+        #endregion
+
+        #region InitAltRowCellStyles
+
+        private void InitAltRowCellStyles(DefaultVisualStyles visualStyle, ColorFactory factory)
+        {
+            visualStyle.AlternateRowCellStyles[StyleType.Default].Background =
+                new Background(factory.GetColor(0xF4F4F4));
+        }
+
+        #endregion
+
+        #region InitColumnStyles
+
+        private void InitColumnStyles(DefaultVisualStyles visualStyle, ColorFactory factory)
+        {
+            ColumnHeaderVisualStyle colStyle = new ColumnHeaderVisualStyle();
+
+            colStyle.Alignment = Alignment.MiddleCenter;
+            colStyle.Font = SystemFonts.CaptionFont;
+            colStyle.ImageAlignment = Alignment.MiddleLeft;
+            colStyle.Margin.All = 0;
+            colStyle.ImageOverlay = ImageOverlay.None;
+            colStyle.TextColor = factory.GetColor(0xE2E2E2);
+
+            colStyle.Background = new Background(factory.GetColor(0x6A6A6A));
+            visualStyle.ColumnHeaderStyles[StyleType.Default] = colStyle;
+            colStyle = new ColumnHeaderVisualStyle();
+
+            colStyle.Background = new Background(factory.GetColor(0xFFDF6B), factory.GetColor(0xFFFCE6));
+            colStyle.TextColor = factory.GetColor(0x444444);
+            visualStyle.ColumnHeaderStyles[StyleType.MouseOver] = colStyle;
+
+            colStyle = new ColumnHeaderVisualStyle();
+            colStyle.Background = GetDefaultSelectedColumnBackground(factory);
+            colStyle.TextColor = factory.GetColor(0x444444);
+            visualStyle.ColumnHeaderStyles[StyleType.Selected] = colStyle;
+
+            colStyle = new ColumnHeaderVisualStyle();
+            colStyle.Background = GetSelectedColumnMouseOverBackground(factory);
+            colStyle.TextColor = factory.GetColor(0x444444);
+            visualStyle.ColumnHeaderStyles[StyleType.SelectedMouseOver] = colStyle;
+        }
+
+        #endregion
+
+        #region InitAltColumnStyles
+
+        private void InitAltColumnStyles(DefaultVisualStyles visualStyle, ColorFactory factory)
+        {
+            visualStyle.AlternateColumnCellStyles[StyleType.Default].Background =
+                new Background(factory.GetColor(0xEAF2FB));
+        }
+
+        #endregion
+
+        #region InitRowStyles
+
+        private void InitRowStyles(DefaultVisualStyles visualStyle, ColorFactory factory)
+        {
+            visualStyle.RowStyles[StyleType.Default] = GetDefaultRowStyle(factory);
+            visualStyle.RowStyles[StyleType.MouseOver] = GetMouseOverRowStyle(factory);
+            visualStyle.RowStyles[StyleType.SelectedMouseOver] = GetSelectedMouseOverRowStyle(visualStyle, factory);
+        }
+
+        #region GetDefaultRowStyle
+
+        private RowVisualStyle GetDefaultRowStyle(ColorFactory factory)
+        {
+            RowVisualStyle rowStyle = new RowVisualStyle();
+            rowStyle.Background = new Background(factory.GetColor(Color.White));
+
+            RowHeaderVisualStyle style = new RowHeaderVisualStyle();
+
+            style.Font = SystemFonts.DefaultFont;
+            style.TextColor = factory.GetColor(0x1E395B);
+
+            Background bg = new Background();
+            BackColorBlend bcb = new BackColorBlend();
+
+            bcb.Colors = new Color[3];
+            bcb.Colors[0] = factory.GetColor(0x6A6A6A);
+            bcb.Colors[1] = factory.GetColor(0x6A6A6A);
+            bcb.Colors[2] = factory.GetColor(0x5E5E5E);
+
+            bcb.Positions = new float[3];
+            bcb.Positions[0] = 0f;
+            bcb.Positions[1] = .75f;
+            bcb.Positions[2] = 1f;
+
+            bg.BackColorBlend = bcb;
+            bg.GradientAngle = 0;
+
+            style.Background = bg;
+            style.TextColor = factory.GetColor(0xE2E2E2);
+
+            bg = new Background(factory.GetColor(0x6A6A6A));
+
+            style.ActiveRowBackground = bg;
+            style.DirtyMarkerBackground = new Background(factory.GetColor(0xAE054F), factory.GetColor(0xE75E94), BackFillType.VerticalCenter);
+            style.BorderHighlightColor = GetBorderHighlight(factory);
+
+            rowStyle.RowHeaderStyle = style;
+
+            return (rowStyle);
+        }
+
+        #endregion
+
+        #region GetMouseOverRowStyle
+
+        private RowVisualStyle GetMouseOverRowStyle(ColorFactory factory)
+        {
+            RowVisualStyle rowStyle = new RowVisualStyle();
+            rowStyle.Background = new Background(Color.White);
+
+            RowHeaderVisualStyle style = new RowHeaderVisualStyle();
+            style.Background = new Background(Color.Plum);
+            style.ActiveRowBackground = new Background(Color.Blue);
+
+            Background bg = new Background();
+            BackColorBlend bcb = new BackColorBlend();
+
+            bcb.Colors = new Color[3];
+            bcb.Colors[0] = factory.GetColor(0xFFE575);
+            bcb.Colors[1] = factory.GetColor(0xFFE575);
+            bcb.Colors[2] = factory.GetColor(0xF2CD66);
+
+            bcb.Positions = new float[3];
+            bcb.Positions[0] = 0f;
+            bcb.Positions[1] = .75f;
+            bcb.Positions[2] = 1f;
+
+            bg.BackColorBlend = bcb;
+            bg.GradientAngle = 0;
+
+            style.Background = bg;
+            style.TextColor = factory.GetColor(0x444444);
+
+            bg = new Background();
+            bcb = new BackColorBlend();
+
+            bcb.Colors = new Color[3];
+            bcb.Colors[0] = Color.FromArgb(254 - 20, 240 - 20, 214 - 20);
+            bcb.Colors[1] = Color.FromArgb(254 - 30, 199 - 30, 104 - 30);
+            bcb.Colors[2] = Color.FromArgb(229 - 30, 133 - 30, 0);
+
+            bcb.Positions = new float[3];
+            bcb.Positions[0] = 0f;
+            bcb.Positions[1] = .75f;
+            bcb.Positions[2] = 1f;
+
+            bg.BackColorBlend = bcb;
+            bg.GradientAngle = 0;
+
+            style.ActiveRowBackground = bg;
+
+            rowStyle.RowHeaderStyle = style;
+
+            return (rowStyle);
+        }
+
+        #endregion
+
+        #region GetSelectedMouseOverRowStyle
+
+        private RowVisualStyle GetSelectedMouseOverRowStyle(DefaultVisualStyles visualStyle, ColorFactory factory)
+        {
+            RowVisualStyle rowStyle = new RowVisualStyle();
+            rowStyle.Background = GetDefaultSelectedBackground(factory);
+
+            RowHeaderVisualStyle style = new RowHeaderVisualStyle();
+            style.Background = new Background(factory.GetColor(0xBABABA));
+            style.ActiveRowBackground = new Background(factory.GetColor(0xBABABA));
+            style.TextColor = factory.GetColor(0x444444);
+
+            rowStyle.RowHeaderStyle = style;
+
+            visualStyle.RowStyles[StyleType.Selected] = rowStyle;
+
+            rowStyle = new RowVisualStyle();
+            rowStyle.Background = GetSelectedColumnMouseOverBackground(factory);
+
+            style = new RowHeaderVisualStyle();
+            style.Background = new Background(factory.GetColor(0xFFEB91));
+            style.ActiveRowBackground = new Background(factory.GetColor(0xB7DBFF));
+
+            rowStyle.RowHeaderStyle = style;
+
+            return (rowStyle);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InitGroupHeaderStyles
+
+        private void InitGroupHeaderStyles(DefaultVisualStyles visualStyle, ColorFactory factory)
+        {
+            GroupHeaderVisualStyle style = new GroupHeaderVisualStyle();
+
+            style.AllowWrap = Tbool.True;
+            style.Alignment = Alignment.MiddleLeft;
+            style.Font = SystemFonts.DefaultFont;
+
+            style.Background = new
+                Background(factory.GetColor(0xFFFFFF));
+
+            style.UnderlineColor = factory.GetColor(0x444444);
+
+            style.RowHeaderStyle.Background = new Background(factory.GetColor(0xBABABA));
+            style.RowHeaderStyle.BorderHighlightColor = GetBorderHighlight(factory);
+            style.RowHeaderStyle.Font = SystemFonts.DefaultFont;
+
+            visualStyle.GroupHeaderStyles[StyleType.Default] = style;
+        }
+
+        #endregion
+
+        #region GetDefaultSelectedColumnBackground
+        private Background GetDefaultSelectedColumnBackground(ColorFactory factory)
+        {
+            return (new Background(factory.GetColor(0xFFD359), factory.GetColor(0xFFEF71)));
+        }
+        #endregion
+
+        #region GetDefaultSelectedBackground
+
+        private Background GetDefaultSelectedBackground(ColorFactory factory)
+        {
+            return (new Background(factory.GetColor(0xB7DBFF)));
+        }
+
+        #endregion
+
+        #region GetDefaultSelectedColumnMouseOverStyle
+
+        private Background GetSelectedColumnMouseOverBackground(ColorFactory factory)
+        {
+            return (new Background(factory.GetColor(0xFFE063), factory.GetColor(0xFFF9A2)));
+        }
+
+        #endregion
+
+        #region GetDefaultSelectedMouseOverStyle
+
+        private Background GetSelectedMouseOverBackground(ColorFactory factory)
+        {
+            return (new Background(factory.GetColor(0xB0D4F7)));
+        }
+
+        #endregion
+
+        #region InitFilterColumnHeaderStyles
+
+        private void InitFilterColumnHeaderStyles(
+            DefaultVisualStyles visualStyle, ColorFactory factory)
+        {
+            FilterColumnHeaderVisualStyle colStyle = new FilterColumnHeaderVisualStyle();
+
+            colStyle.Alignment = Alignment.MiddleCenter;
+            colStyle.Font = SystemFonts.CaptionFont;
+
+            colStyle.TextColor = factory.GetColor(0xE2E2E2);
+            colStyle.ErrorTextColor = Color.Red;
+
+            colStyle.Background = new Background(factory.GetColor(0x6A6A6A));
+            colStyle.GripBarBackground = new Background(factory.GetColor(0x797979));
+            visualStyle.FilterColumnHeaderStyles[StyleType.Default] = colStyle;
+
+            colStyle = new FilterColumnHeaderVisualStyle();
+            colStyle.Background = new Background(factory.GetColor(0xFFDF6B), factory.GetColor(0xFFFCE6));
+            colStyle.TextColor = factory.GetColor(0x444444);
+            visualStyle.FilterColumnHeaderStyles[StyleType.MouseOver] = colStyle;
+
+            colStyle = new FilterColumnHeaderVisualStyle();
+            colStyle.Background = GetDefaultSelectedColumnBackground(factory);
+            visualStyle.FilterColumnHeaderStyles[StyleType.Selected] = colStyle;
+
+            colStyle = new FilterColumnHeaderVisualStyle();
+            colStyle.Background = GetSelectedColumnMouseOverBackground(factory);
+            visualStyle.FilterColumnHeaderStyles[StyleType.SelectedMouseOver] = colStyle;
+        }
+
+        #endregion
+
+        #region InitFilterRowStyles
+
+        private void InitFilterRowStyles(
+            DefaultVisualStyles visualStyle, ColorFactory factory)
+        {
+            FilterRowVisualStyle style = new FilterRowVisualStyle();
+
+            style.FilterBorderColor = GetBorderHighlight(factory);
+            style.FilterBackground = new Background(Color.White, factory.GetColor(Color.LightGray), 0);
+
+            style.WhiteSpaceBackground = new Background(factory.GetColor(0x797979));
+
+            style.RowHeader.Background = new Background(factory.GetColor(0x6A6A6A),
+                factory.GetColor(0x595959), BackFillType.ForwardDiagonal);
+
+            style.RowHeader.BorderHighlightColor = GetBorderHighlight(factory);
+
+            visualStyle.FilterRowStyles[StyleType.Default] = style;
+
+            style = style.Copy();
+
+            style.FilterBackground = new Background(Color.White, factory.GetColor(Color.Green), 45);
+
+            visualStyle.FilterRowStyles[StyleType.Selected] = style;
+
+            style = style.Copy();
+
+            style.FilterBackground = new Background(Color.White, factory.GetColor(0xE2AA00), 0);
+            style.RowHeader.Background = new Background(factory.GetColor(0x8E8E8E));
+
+            visualStyle.FilterRowStyles[StyleType.MouseOver] = style;
+            visualStyle.FilterRowStyles[StyleType.SelectedMouseOver] = style;
+        }
+
+        #endregion
+
+        #region InitGroupByStyles
+
+        private void InitGroupByStyles(DefaultVisualStyles visualStyle, ColorFactory factory)
+        {
+            GroupByVisualStyle style = new GroupByVisualStyle();
+
+            style.Alignment = Alignment.MiddleCenter;
+            style.GroupBoxConnectorColor = factory.GetColor(0x313131); // Panel border color
+            style.GroupBoxBorderColor = factory.GetColor(0x313131);
+
+            style.InsertMarkerBorderColor = factory.GetColor(0x313131);
+            style.InsertMarkerBackground = new Background(factory.GetColor(Color.Red));
+
+            style.RowHeaderStyle.Background = new Background(factory.GetColor(0x6A6A6A), factory.GetColor(0x595959), BackFillType.ForwardDiagonal);
+            style.RowHeaderStyle.BorderHighlightColor = GetBorderHighlight(factory);
+
+            style.TextColor = factory.GetColor(0x363636); // Col text color
+            style.GroupBoxBackground = new Background(factory.GetColor(0x6A6A6A));  // col background
+            visualStyle.GroupByStyles[StyleType.Default] = style;
+
+            style = new GroupByVisualStyle();
+            style.GroupBoxBackground = new Background(factory.GetColor(0xFFDF6B), factory.GetColor(0xFFFCE6));  // col background
+            visualStyle.GroupByStyles[StyleType.MouseOver] = style;
+
+            style = new GroupByVisualStyle();
+            style.GroupBoxBackground = GetDefaultSelectedColumnBackground(factory);  // col background
+            visualStyle.GroupByStyles[StyleType.Selected] = style;
+
+            style = new GroupByVisualStyle();
+            style.GroupBoxBackground = GetSelectedColumnMouseOverBackground(factory);  // col background
+            visualStyle.GroupByStyles[StyleType.SelectedMouseOver] = style;
+        }
+
+        #endregion
+
+        #region GetBorderHighlight
+
+        private Color GetBorderHighlight(ColorFactory factory)
+        {
+            return factory.GetColor("10FFFFFF");
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/VisualStyles/Office2010BlueStyleFactory.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/VisualStyles/Office2010BlueStyleFactory.cs
new file mode 100644
index 00000000..cd7192d4
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/VisualStyles/Office2010BlueStyleFactory.cs	
@@ -0,0 +1,593 @@
+using System.Drawing;
+using DevComponents.DotNetBar.Rendering;
+
+namespace DevComponents.DotNetBar.SuperGrid.Style
+{
+    /// <summary>
+    /// Create the Office 2010 Blue Visual Style for SuperGridControl.
+    /// </summary>
+    public class Office2010BlueStyleFactory : VisualStyleFactory
+    {
+        /// <summary>
+        /// Create the DefaultVisualStyle for SuperGridControl.
+        /// </summary>
+        /// <param name="factory">Color-Factory used to generate colors.</param>
+        /// <returns>New instance of DefaultVisualStyles class.</returns>s
+        public override DefaultVisualStyles CreateStyle(ColorFactory factory)
+        {
+            DefaultVisualStyles visualStyle = new DefaultVisualStyles();
+
+            InitGridPanelStyle(visualStyle, factory);
+
+            InitCellStyles(visualStyle, factory);
+            InitMergedCellStyles(visualStyle, factory);
+            InitAltRowCellStyles(visualStyle, factory);
+
+            InitColumnStyles(visualStyle, factory);
+            InitAltColumnStyles(visualStyle, factory);
+            InitColumnHeaderStyles(visualStyle, factory);
+
+            InitRowStyles(visualStyle, factory);
+            InitTextRowStyles(visualStyle, factory);
+
+            InitGroupHeaderStyles(visualStyle, factory);
+
+            InitFilterRowStyles(visualStyle, factory);
+            InitFilterColumnHeaderStyles(visualStyle, factory);
+
+            InitGroupByStyles(visualStyle, factory);
+
+            return (visualStyle);
+        } 
+
+        #region InitGridPanelStyle
+
+        private void InitGridPanelStyle(DefaultVisualStyles visualStyle, ColorFactory factory)
+        {
+            GridPanelVisualStyle style = new GridPanelVisualStyle();
+
+            style.Background = new Background(factory.GetColor(0xFFFFFF));
+            style.BorderColor = new BorderColor(factory.GetColor(0x849DBD));
+            style.BorderPattern.All = LinePattern.Solid;
+            style.BorderThickness = new Thickness(1);
+            style.TextColor = factory.GetColor(0x000000);
+
+            style.TreeLineColor = factory.GetColor(0x484848);
+            style.HeaderLineColor = factory.GetColor(0x849DBD);
+            style.HorizontalLineColor = factory.GetColor(0xC4D9F6);
+            style.VerticalLineColor = factory.GetColor(0xC4D9F6);
+
+            style.TreeLinePattern = LinePattern.Solid;
+            style.HorizontalLinePattern = LinePattern.Solid;
+            style.VerticalLinePattern = LinePattern.Solid;
+            style.HeaderHLinePattern = LinePattern.Solid;
+            style.HeaderVLinePattern = LinePattern.Solid;
+
+            BaseTreeButtonVisualStyle tstyle = new BaseTreeButtonVisualStyle();
+
+            tstyle.BorderColor = factory.GetColor(Color.SlateGray);
+            tstyle.HotBorderColor = factory.GetColor(Color.SlateGray);
+            tstyle.LineColor = factory.GetColor(Color.DarkSlateGray);
+            tstyle.HotLineColor = factory.GetColor(Color.DarkSlateGray);
+            tstyle.Background = new Background(factory.GetColor(Color.White), factory.GetColor(Color.Gainsboro), 90);
+            tstyle.HotBackground = new Background(factory.GetColor(Color.White), factory.GetColor(Color.Gainsboro), 90);
+
+            style.CircleTreeButtonStyle.CollapseButton = tstyle;
+            style.CircleTreeButtonStyle.ExpandButton = tstyle;
+
+            style.SquareTreeButtonStyle.CollapseButton = tstyle;
+            style.SquareTreeButtonStyle.ExpandButton = tstyle;
+
+            tstyle = new BaseTreeButtonVisualStyle();
+
+            tstyle.BorderColor = factory.GetColor(Color.Black);
+            tstyle.HotBorderColor = factory.GetColor(0x27C7F7);
+            tstyle.Background = new Background(factory.GetColor(Color.Black));
+            tstyle.HotBackground = new Background(factory.GetColor(0xC7EBFA));
+
+            style.TriangleTreeButtonStyle.CollapseButton = tstyle;
+
+            tstyle = new BaseTreeButtonVisualStyle();
+
+            tstyle.BorderColor = factory.GetColor(Color.DimGray);
+            tstyle.HotBorderColor = factory.GetColor(0x27C7F7);
+            tstyle.Background = new Background(factory.GetColor(Color.White));
+            tstyle.HotBackground = new Background(factory.GetColor(0xC7EBFA));
+
+            style.TriangleTreeButtonStyle.ExpandButton = tstyle;
+
+            visualStyle.GridPanelStyle = style;
+        }
+
+        #endregion
+
+        #region InitColumnHeaderStyles
+
+        private void InitColumnHeaderStyles(DefaultVisualStyles visualStyle, ColorFactory factory)
+        {
+            ColumnHeaderRowVisualStyle style = new ColumnHeaderRowVisualStyle();
+
+            style.FilterBorderColor = factory.GetColor(0x697D96);
+            style.FilterBackground = new Background(Color.White, factory.GetColor(0x5B92FF), 0);
+
+            style.WhiteSpaceBackground = new Background(factory.GetColor(0xCFDDEE));
+
+            style.RowHeader.Background = new Background(
+                factory.GetColor(0xEFF5FB), factory.GetColor(0xE2EDFA), BackFillType.ForwardDiagonal);
+
+            style.RowHeader.BorderHighlightColor = GetBorderHighlight(factory);
+
+            style.IndicatorBackground = new Background(factory.GetColor(0x4488E5));
+            style.IndicatorBorderColor = factory.GetColor(0x1F48A1);
+
+            visualStyle.ColumnHeaderRowStyles[StyleType.Default] = style;
+
+            style = style.Copy();
+
+            style.FilterBorderColor = factory.GetColor(Color.Green);
+            style.FilterBackground = new Background(Color.White, factory.GetColor(Color.Green), 0);
+
+            visualStyle.ColumnHeaderRowStyles[StyleType.Selected] = style;
+
+            style = style.Copy();
+
+            style.FilterBorderColor = factory.GetColor(0x697D96);
+            style.FilterBackground = new Background(Color.White, factory.GetColor(0xE2AA00), 0);
+
+            style.RowHeader.Background = new Background(
+                factory.GetColor(0xFFDF6B), factory.GetColor(0xFFFCE6), BackFillType.Angle);
+
+            visualStyle.ColumnHeaderRowStyles[StyleType.MouseOver] = style;
+            visualStyle.ColumnHeaderRowStyles[StyleType.SelectedMouseOver] = style;
+        }
+
+        #endregion
+
+        #region InitTextRowStyles
+
+        private void InitTextRowStyles(DefaultVisualStyles visualStyle, ColorFactory factory)
+        {
+            TextRowVisualStyle style = new TextRowVisualStyle();
+
+            style.Alignment = Alignment.MiddleCenter;
+            style.AllowWrap = Tbool.True;
+
+            style.Background = new Background(factory.GetColor(0xEFF5FB), factory.GetColor(0xE2ECFA), BackFillType.Angle);
+            style.BorderColor = new BorderColor(factory.GetColor(0x849DBD));
+
+            style.Padding.All = 2;
+
+            style.TextColor = factory.GetColor(0x1E395B);
+
+            style.RowHeaderStyle.Background = new Background(factory.GetColor(0xEFF5FB), factory.GetColor(0xE2ECFA), BackFillType.Angle);
+            style.RowHeaderStyle.BorderHighlightColor = GetBorderHighlight(factory);
+
+            visualStyle.TitleStyles[StyleType.Default] = style;
+            visualStyle.HeaderStyles[StyleType.Default] = style.Copy();
+            visualStyle.FooterStyles[StyleType.Default] = style.Copy();
+
+            style = style.Copy();
+            style.Background = new Background(Color.Transparent);
+
+            visualStyle.CaptionStyles[StyleType.Default] = style;
+        }
+
+        #endregion
+
+        #region InitCellStyles
+
+        private void InitCellStyles(DefaultVisualStyles visualStyle, ColorFactory factory)
+        {
+            CellVisualStyle style = new CellVisualStyle();
+
+            style.Alignment = Alignment.MiddleLeft;
+            style.Background = new Background(factory.GetColor(Color.White));
+            style.BorderColor = new BorderColor(factory.GetColor(0xC4D9F6));
+            style.BorderPattern.All = LinePattern.Solid;
+            style.BorderThickness.All = 0;
+            style.Font = SystemFonts.DefaultFont;
+            style.ImageAlignment = Alignment.MiddleLeft;
+            style.ImagePadding.All = 2;
+            style.Margin.All = 0;
+            style.ImageOverlay = ImageOverlay.None;
+            style.Padding.All = 0;
+            style.TextColor = Color.Black;
+
+            visualStyle.CellStyles[StyleType.Default] = style;
+
+            style = new CellVisualStyle();
+            style.Background = GetDefaultSelectedBackground(factory);
+            visualStyle.CellStyles[StyleType.Selected] = style;
+
+            style = new CellVisualStyle();
+            style.Background = GetSelectedMouseOverBackground(factory);
+            visualStyle.CellStyles[StyleType.SelectedMouseOver] = style;
+
+            style = new CellVisualStyle();
+            style.Background = new Background(factory.GetColor(0xF1F8FF));
+            visualStyle.CellStyles[StyleType.Empty] = style;
+        }
+
+        #endregion
+
+        #region InitMergedCellStyles
+
+        private void InitMergedCellStyles(DefaultVisualStyles visualStyle, ColorFactory factory)
+        {
+            visualStyle.MergedCellStyles[StyleType.Default] = new CellVisualStyle();
+            visualStyle.MergedCellStyles[StyleType.ReadOnly] = new CellVisualStyle();
+            visualStyle.MergedCellStyles[StyleType.Selected] = new CellVisualStyle();
+            visualStyle.MergedCellStyles[StyleType.ReadOnlySelected] = new CellVisualStyle();
+            visualStyle.MergedCellStyles[StyleType.SelectedMouseOver] = new CellVisualStyle();
+            visualStyle.MergedCellStyles[StyleType.ReadOnlySelectedMouseOver] = new CellVisualStyle();
+            visualStyle.MergedCellStyles[StyleType.Empty] = new CellVisualStyle();
+        }
+
+        #endregion
+
+        #region InitAltRowCellStyles
+
+        private void InitAltRowCellStyles(DefaultVisualStyles visualStyle, ColorFactory factory)
+        {
+            visualStyle.AlternateRowCellStyles[StyleType.Default].Background =
+                new Background(factory.GetColor(0xF4F4F4));
+        }
+
+        #endregion
+
+        #region InitColumnStyles
+
+        private void InitColumnStyles(DefaultVisualStyles visualStyle, ColorFactory factory)
+        {
+            ColumnHeaderVisualStyle colStyle = new ColumnHeaderVisualStyle();
+
+            colStyle.Alignment = Alignment.MiddleCenter;
+            colStyle.BorderColor = new BorderColor(factory.GetColor(0xA0B0C7));
+            colStyle.BorderPattern.All = LinePattern.Solid;
+            colStyle.BorderThickness.All = 0;
+            colStyle.Font = SystemFonts.CaptionFont;
+            colStyle.ImageAlignment = Alignment.MiddleLeft;
+            colStyle.Margin.All = 0;
+            colStyle.ImageOverlay = ImageOverlay.None;
+            colStyle.TextColor = Color.Black;
+
+            colStyle.Background = new Background(factory.GetColor(0xEFF4FB), factory.GetColor(0xE1ECFA));
+            visualStyle.ColumnHeaderStyles[StyleType.Default] = colStyle;
+
+            colStyle = new ColumnHeaderVisualStyle();
+            colStyle.Background = new Background(factory.GetColor(0xFFDF6B), factory.GetColor(0xFFFCE6));
+            visualStyle.ColumnHeaderStyles[StyleType.MouseOver] = colStyle;
+
+            colStyle = new ColumnHeaderVisualStyle();
+            colStyle.Background = GetDefaultSelectedColumnBackground(factory);
+            visualStyle.ColumnHeaderStyles[StyleType.Selected] = colStyle;
+
+            colStyle = new ColumnHeaderVisualStyle();
+            colStyle.Background = GetSelectedColumnMouseOverBackground(factory);
+            visualStyle.ColumnHeaderStyles[StyleType.SelectedMouseOver] = colStyle;
+        }
+
+        #endregion
+
+        #region InitAltColumnStyles
+
+        private void InitAltColumnStyles(DefaultVisualStyles visualStyle, ColorFactory factory)
+        {
+            visualStyle.AlternateColumnCellStyles[StyleType.Default].Background =
+                new Background(factory.GetColor(0xEAF2FB));
+        }
+
+        #endregion
+
+        #region InitRowStyles
+
+        private void InitRowStyles(DefaultVisualStyles visualStyle, ColorFactory factory)
+        {
+            visualStyle.RowStyles[StyleType.Default] = GetDefaultRowStyle(factory);
+            visualStyle.RowStyles[StyleType.MouseOver] = GetMouseOverRowStyle(factory);
+            visualStyle.RowStyles[StyleType.SelectedMouseOver] = GetSelectedMouseOverRowStyle(visualStyle, factory);
+        }
+
+        #region GetDefaultRowStyle
+
+        private RowVisualStyle GetDefaultRowStyle(ColorFactory factory)
+        {
+            RowVisualStyle rowStyle = new RowVisualStyle();
+            rowStyle.Background = new Background(Color.White);
+
+            RowHeaderVisualStyle style = new RowHeaderVisualStyle();
+
+            style.Font = SystemFonts.DefaultFont;
+            style.TextColor = factory.GetColor(0x1E395B);
+
+            Background bg = new Background();
+            BackColorBlend bcb = new BackColorBlend();
+
+            bcb.Colors = new Color[3];
+            bcb.Colors[0] = factory.GetColor(0xDAE7F5);
+            bcb.Colors[1] = factory.GetColor(0xDAE7F5);
+            bcb.Colors[2] = factory.GetColor(0xB4C6E0);
+
+            bcb.Positions = new float[3];
+            bcb.Positions[0] = 0f;
+            bcb.Positions[1] = .75f;
+            bcb.Positions[2] = 1f;
+
+            bg.BackColorBlend = bcb;
+            bg.GradientAngle = 0;
+
+            style.Background = bg;
+
+            bg = new Background(factory.GetColor(0xDAE7F5));
+
+            style.ActiveRowBackground = bg;
+            style.DirtyMarkerBackground = new Background(factory.GetColor(0xAE054F), factory.GetColor(0xE75E94), BackFillType.VerticalCenter);
+            style.BorderHighlightColor = GetBorderHighlight(factory);
+
+            rowStyle.RowHeaderStyle = style;
+
+            return (rowStyle);
+        }
+
+        #endregion
+
+        #region GetMouseOverRowStyle
+
+        private RowVisualStyle GetMouseOverRowStyle(ColorFactory factory)
+        {
+            RowVisualStyle rowStyle = new RowVisualStyle();
+            rowStyle.Background = new Background(Color.White);
+
+            RowHeaderVisualStyle style = new RowHeaderVisualStyle();
+            style.Background = new Background(Color.Plum);
+            style.ActiveRowBackground = new Background(Color.Blue);
+
+            Background bg = new Background();
+            BackColorBlend bcb = new BackColorBlend();
+
+            bcb.Colors = new Color[3];
+            bcb.Colors[0] = factory.GetColor(0xFFE575);
+            bcb.Colors[1] = factory.GetColor(0xFFE575);
+            bcb.Colors[2] = factory.GetColor(0xF2CD66);
+
+            bcb.Positions = new float[3];
+            bcb.Positions[0] = 0f;
+            bcb.Positions[1] = .75f;
+            bcb.Positions[2] = 1f;
+
+            bg.BackColorBlend = bcb;
+            bg.GradientAngle = 0;
+
+            style.Background = bg;
+
+            bg = new Background();
+            bcb = new BackColorBlend();
+
+            bcb.Colors = new Color[3];
+            bcb.Colors[0] = Color.FromArgb(254 - 20, 240 - 20, 214 - 20);
+            bcb.Colors[1] = Color.FromArgb(254 - 30, 199 - 30, 104 - 30);
+            bcb.Colors[2] = Color.FromArgb(229 - 30, 133 - 30, 0);
+
+            bcb.Positions = new float[3];
+            bcb.Positions[0] = 0f;
+            bcb.Positions[1] = .75f;
+            bcb.Positions[2] = 1f;
+
+            bg.BackColorBlend = bcb;
+            bg.GradientAngle = 0;
+
+            style.ActiveRowBackground = bg;
+
+            rowStyle.RowHeaderStyle = style;
+
+            return (rowStyle);
+        }
+
+        #endregion
+
+        #region GetSelectedMouseOverRowStyle
+
+        private RowVisualStyle GetSelectedMouseOverRowStyle(
+            DefaultVisualStyles visualStyle, ColorFactory factory)
+        {
+            RowVisualStyle rowStyle = new RowVisualStyle();
+            rowStyle.Background = GetDefaultSelectedBackground(factory);
+
+            RowHeaderVisualStyle style = new RowHeaderVisualStyle();
+            style.Background = new Background(factory.GetColor(0xC7CED6));
+            style.ActiveRowBackground = new Background(factory.GetColor(0xC7CED6));
+
+            rowStyle.RowHeaderStyle = style;
+
+            visualStyle.RowStyles[StyleType.Selected] = rowStyle;
+
+            rowStyle = new RowVisualStyle();
+            rowStyle.Background = GetSelectedColumnMouseOverBackground(factory);
+
+            style = new RowHeaderVisualStyle();
+            style.Background = new Background(factory.GetColor(0xC7CED6));
+            style.ActiveRowBackground = new Background(factory.GetColor(0xC7CED6));
+
+            rowStyle.RowHeaderStyle = style;
+
+            return (rowStyle);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InitGroupHeaderStyles
+
+        private void InitGroupHeaderStyles(DefaultVisualStyles visualStyle, ColorFactory factory)
+        {
+            GroupHeaderVisualStyle style = new GroupHeaderVisualStyle();
+
+            style.AllowWrap = Tbool.True;
+            style.Alignment = Alignment.MiddleLeft;
+            style.Font = SystemFonts.DefaultFont;
+
+            style.Background = new
+                Background(factory.GetColor(0xFFFFFF));
+
+            style.UnderlineColor = factory.GetColor(0xC4D9F6);
+
+            style.RowHeaderStyle.Background = new Background(factory.GetColor(0xE3EDFA));
+            style.RowHeaderStyle.BorderHighlightColor = GetBorderHighlight(factory);
+            style.RowHeaderStyle.Font = SystemFonts.DefaultFont;
+
+            visualStyle.GroupHeaderStyles[StyleType.Default] = style;
+        }
+
+        #endregion
+
+        #region GetDefaultSelectedColumnBackground
+        private Background GetDefaultSelectedColumnBackground(ColorFactory factory)
+        {
+            Background bg = new Background(factory.GetColor(0xFFD359), factory.GetColor(0xFFEF71));
+            return bg;
+        }
+        #endregion
+
+        #region GetDefaultSelectedBackground
+
+        private Background GetDefaultSelectedBackground(ColorFactory factory)
+        {
+            return (new Background(factory.GetColor(0xB0D4F7)));
+        }
+
+        #endregion
+
+        #region GetDefaultSelectedColumnMouseOverStyle
+
+        private Background GetSelectedColumnMouseOverBackground(ColorFactory factory)
+        {
+            return (new Background(factory.GetColor(0xFFE063), factory.GetColor(0xFFF9A2)));
+        }
+
+        #endregion
+
+        #region GetDefaultSelectedMouseOverStyle
+
+        private Background GetSelectedMouseOverBackground(ColorFactory factory)
+        {
+            return (new Background(factory.GetColor(0xB0D4F7)));
+        }
+
+        #endregion
+
+        #region InitFilterColumnHeaderStyles
+
+        private void InitFilterColumnHeaderStyles(
+            DefaultVisualStyles visualStyle, ColorFactory factory)
+        {
+            FilterColumnHeaderVisualStyle style = new FilterColumnHeaderVisualStyle();
+
+            style.Alignment = Alignment.MiddleLeft;
+            style.Font = SystemFonts.CaptionFont;
+
+            style.TextColor = Color.Black;
+            style.ErrorTextColor = Color.Red;
+
+            style.Background = new Background(factory.GetColor(0xEFF4FB), factory.GetColor(0xE1ECFA));
+            style.GripBarBackground = new Background(factory.GetColor(0xCFDDEE));
+            visualStyle.FilterColumnHeaderStyles[StyleType.Default] = style;
+
+            style = new FilterColumnHeaderVisualStyle();
+            style.Background = new Background(factory.GetColor(0xFFDF6B), factory.GetColor(0xFFFCE6));
+            visualStyle.FilterColumnHeaderStyles[StyleType.MouseOver] = style;
+
+            style = new FilterColumnHeaderVisualStyle();
+            style.Background = GetDefaultSelectedColumnBackground(factory);
+            visualStyle.FilterColumnHeaderStyles[StyleType.Selected] = style;
+
+            style = new FilterColumnHeaderVisualStyle();
+            style.Background = GetSelectedColumnMouseOverBackground(factory);
+            visualStyle.FilterColumnHeaderStyles[StyleType.SelectedMouseOver] = style;
+        }
+
+        #endregion
+
+        #region InitFilterRowStyles
+
+        private void InitFilterRowStyles(
+            DefaultVisualStyles visualStyle, ColorFactory factory)
+        {
+            FilterRowVisualStyle style = new FilterRowVisualStyle();
+
+            style.FilterBorderColor = factory.GetColor(0x697D96);
+            style.FilterBackground = new Background(Color.White, factory.GetColor(0x4168B6), 0);
+
+            style.WhiteSpaceBackground = new Background(factory.GetColor(0xCFDDEE));
+
+            style.RowHeader.Background = new Background(factory.GetColor(0xEFF5FB),
+                factory.GetColor(0xE2EDFA), BackFillType.ForwardDiagonal);
+
+            style.RowHeader.BorderHighlightColor = GetBorderHighlight(factory);
+
+            visualStyle.FilterRowStyles[StyleType.Default] = style;
+
+            style = style.Copy();
+
+            style.FilterBackground = new Background(Color.White, factory.GetColor(Color.Green), 0);
+
+            visualStyle.FilterRowStyles[StyleType.Selected] = style;
+
+            style = style.Copy();
+
+            style.FilterBackground = new Background(Color.White, factory.GetColor(0xE2AA00), 0);
+
+            style.RowHeader.Background = new
+                Background(factory.GetColor(0xFFDF6B), factory.GetColor(0xFFFCE6), BackFillType.Angle);
+
+            visualStyle.FilterRowStyles[StyleType.MouseOver] = style;
+            visualStyle.FilterRowStyles[StyleType.SelectedMouseOver] = style;
+        }
+
+        #endregion
+
+        #region InitGroupByStyles
+
+        private void InitGroupByStyles(DefaultVisualStyles visualStyle, ColorFactory factory)
+        {
+            GroupByVisualStyle style = new GroupByVisualStyle();
+
+            style.Alignment = Alignment.MiddleCenter;
+            style.GroupBoxConnectorColor = factory.GetColor(0x849DBD); // Panel border color
+            style.GroupBoxBorderColor = factory.GetColor(0x849DBD);
+
+            style.InsertMarkerBorderColor = factory.GetColor(0x849DBD);
+            style.InsertMarkerBackground = new Background(factory.GetColor(Color.Red));
+
+            style.RowHeaderStyle.Background = new Background(factory.GetColor(0xEFF5FB), factory.GetColor(0xE2EDFA), BackFillType.ForwardDiagonal);
+            style.RowHeaderStyle.BorderHighlightColor = GetBorderHighlight(factory);
+
+            style.TextColor = factory.GetColor(0x363636); // Col text color
+            style.GroupBoxBackground = new Background(factory.GetColor(0xEFF4FB), factory.GetColor(0xE1ECFA));  // col background
+            visualStyle.GroupByStyles[StyleType.Default] = style;
+
+            style = new GroupByVisualStyle();
+            style.GroupBoxBackground = new Background(factory.GetColor(0xFFDF6B), factory.GetColor(0xFFFCE6));  // col background
+            visualStyle.GroupByStyles[StyleType.MouseOver] = style;
+
+            style = new GroupByVisualStyle();
+            style.GroupBoxBackground = GetDefaultSelectedColumnBackground(factory);  // col background
+            visualStyle.GroupByStyles[StyleType.Selected] = style;
+
+            style = new GroupByVisualStyle();
+            style.GroupBoxBackground = GetSelectedColumnMouseOverBackground(factory);  // col background
+            visualStyle.GroupByStyles[StyleType.SelectedMouseOver] = style;
+        }
+
+        #endregion
+
+        #region GetBorderHighlight
+
+        private Color GetBorderHighlight(ColorFactory factory)
+        {
+            return factory.GetColor("80FFFFFF");
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/VisualStyles/Office2010SilverStyleFactory.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/VisualStyles/Office2010SilverStyleFactory.cs
new file mode 100644
index 00000000..a8963c35
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/VisualStyles/Office2010SilverStyleFactory.cs	
@@ -0,0 +1,598 @@
+using System.Drawing;
+using DevComponents.DotNetBar.Rendering;
+
+namespace DevComponents.DotNetBar.SuperGrid.Style
+{
+    /// <summary>
+    /// Create the Office 2010 Silver Visual Style for SuperGridControl.
+    /// </summary>
+    public class Office2010SilverStyleFactory : VisualStyleFactory
+    {
+        /// <summary>
+        /// Create the DefaultVisualStyle for SuperGridControl.
+        /// </summary>
+        /// <param name="factory">Color-Factory used to generate colors.</param>
+        /// <returns>New instance of DefaultVisualStyles class.</returns>s
+        public override DefaultVisualStyles CreateStyle(ColorFactory factory)
+        {
+            DefaultVisualStyles visualStyle = new DefaultVisualStyles();
+
+            InitGridPanelStyle(visualStyle, factory);
+
+            InitCellStyles(visualStyle, factory);
+            InitMergedCellStyles(visualStyle, factory);
+            InitAltRowCellStyles(visualStyle, factory);
+
+            InitColumnStyles(visualStyle, factory);
+            InitAltColumnStyles(visualStyle, factory);
+            InitColumnHeaderStyles(visualStyle, factory);
+
+            InitRowStyles(visualStyle, factory);
+            InitTextRowStyles(visualStyle, factory);
+
+            InitGroupHeaderStyles(visualStyle, factory);
+
+            InitFilterRowStyles(visualStyle, factory);
+            InitFilterColumnHeaderStyles(visualStyle, factory);
+
+            InitGroupByStyles(visualStyle, factory);
+
+            return (visualStyle);
+        }
+
+        #region InitGridPanelStyle
+
+        private void InitGridPanelStyle(DefaultVisualStyles visualStyle, ColorFactory factory)
+        {
+            GridPanelVisualStyle style = new GridPanelVisualStyle();
+
+            style.Background = new Background(factory.GetColor(0xFFFFFF));
+            style.BorderColor = new BorderColor(factory.GetColor(0x8B9097));
+            style.BorderPattern.All = LinePattern.Solid;
+            style.BorderThickness = new Thickness(1);
+            style.TextColor = factory.GetColor(0x000000);
+
+            style.TreeLineColor = factory.GetColor(0x484848);
+            style.HeaderLineColor = factory.GetColor(0x8B9097);
+            style.HorizontalLineColor = factory.GetColor(0xDBDEE1);
+            style.VerticalLineColor = factory.GetColor(0xDBDEE1);
+
+            style.TreeLinePattern = LinePattern.Solid;
+            style.HorizontalLinePattern = LinePattern.Solid;
+            style.VerticalLinePattern = LinePattern.Solid;
+            style.HeaderHLinePattern = LinePattern.Solid;
+            style.HeaderVLinePattern = LinePattern.Solid;
+
+            BaseTreeButtonVisualStyle tstyle = new BaseTreeButtonVisualStyle();
+
+            tstyle.BorderColor = factory.GetColor(Color.SlateGray);
+            tstyle.HotBorderColor = factory.GetColor(Color.SlateGray);
+            tstyle.LineColor = factory.GetColor(Color.DarkSlateGray);
+            tstyle.HotLineColor = factory.GetColor(Color.DarkSlateGray);
+            tstyle.Background = new Background(factory.GetColor(Color.White), factory.GetColor(Color.Gainsboro), 90);
+            tstyle.HotBackground = new Background(factory.GetColor(Color.White), factory.GetColor(Color.Gainsboro), 90);
+
+            style.CircleTreeButtonStyle.CollapseButton = tstyle;
+            style.CircleTreeButtonStyle.ExpandButton = tstyle;
+
+            style.SquareTreeButtonStyle.CollapseButton = tstyle;
+            style.SquareTreeButtonStyle.ExpandButton = tstyle;
+
+            tstyle = new BaseTreeButtonVisualStyle();
+
+            tstyle.BorderColor = factory.GetColor(Color.Black);
+            tstyle.HotBorderColor = factory.GetColor(0x27C7F7);
+            tstyle.Background = new Background(factory.GetColor(Color.Black));
+            tstyle.HotBackground = new Background(factory.GetColor(0xC7EBFA));
+
+            style.TriangleTreeButtonStyle.CollapseButton = tstyle;
+
+            tstyle = new BaseTreeButtonVisualStyle();
+
+            tstyle.BorderColor = factory.GetColor(Color.DimGray);
+            tstyle.HotBorderColor = factory.GetColor(0x27C7F7);
+            tstyle.Background = new Background(factory.GetColor(Color.White));
+            tstyle.HotBackground = new Background(factory.GetColor(0xC7EBFA));
+
+            style.TriangleTreeButtonStyle.ExpandButton = tstyle;
+            visualStyle.GridPanelStyle = style;
+        }
+
+        #endregion
+
+        #region InitColumnHeaderStyles
+
+        private void InitColumnHeaderStyles(DefaultVisualStyles visualStyle, ColorFactory factory)
+        {
+            ColumnHeaderRowVisualStyle style = new ColumnHeaderRowVisualStyle();
+
+            style.FilterBorderColor = factory.GetColor(0x787D87);
+            style.FilterBackground = new Background(Color.White, factory.GetColor(0xB0B6BC), 0);
+
+            style.WhiteSpaceBackground = new Background(factory.GetColor(0xE9EDF1));
+
+            style.RowHeader.Background = new Background(
+                factory.GetColor(0xF5F7F9), factory.GetColor(0xEFF2F6), BackFillType.ForwardDiagonal);
+
+            style.RowHeader.BorderHighlightColor = GetBorderHighlight(factory);
+
+            style.IndicatorBackground = new Background(factory.GetColor(0xB0B6BC));
+            style.IndicatorBorderColor = factory.GetColor(0x787D87);
+
+            visualStyle.ColumnHeaderRowStyles[StyleType.Default] = style;
+
+            style = style.Copy();
+
+            style.FilterBorderColor = factory.GetColor(Color.Green);
+            style.FilterBackground = new Background(Color.White, factory.GetColor(Color.Green), 45);
+
+            visualStyle.ColumnHeaderRowStyles[StyleType.Selected] = style;
+
+            style = style.Copy();
+
+            style.FilterBorderColor = factory.GetColor(0x797979);
+            style.FilterBackground = new Background(Color.White, factory.GetColor(0xE2AA00), 0);
+
+            style.RowHeader.Background = new Background(
+                factory.GetColor(0xFFDF6B), factory.GetColor(0xFFFCE6), BackFillType.Angle);
+
+            visualStyle.ColumnHeaderRowStyles[StyleType.MouseOver] = style;
+            visualStyle.ColumnHeaderRowStyles[StyleType.SelectedMouseOver] = style;
+        }
+
+        #endregion
+
+        #region InitTextRowStyles
+
+        private void InitTextRowStyles(DefaultVisualStyles visualStyle, ColorFactory factory)
+        {
+            TextRowVisualStyle style = new TextRowVisualStyle();
+
+            style.Alignment = Alignment.MiddleCenter;
+            style.AllowWrap = Tbool.True;
+
+            style.Background = new Background(factory.GetColor(0xF5F7F9), factory.GetColor(0xEFF2F6), BackFillType.Angle);
+            style.BorderColor = new BorderColor(factory.GetColor(0xA5ACB5));
+
+            style.Padding.All = 2;
+
+            style.TextColor = factory.GetColor(0x3B3B3B);
+
+            style.RowHeaderStyle.Background = new Background(factory.GetColor(0xF5F7F9), factory.GetColor(0xEFF2F6), BackFillType.Angle);
+            style.RowHeaderStyle.BorderHighlightColor = GetBorderHighlight(factory);
+
+            visualStyle.TitleStyles[StyleType.Default] = style;
+            visualStyle.HeaderStyles[StyleType.Default] = style.Copy();
+            visualStyle.FooterStyles[StyleType.Default] = style.Copy();
+
+            style = style.Copy();
+            style.Background = new Background(factory.GetColor(0xE9EDF1));
+
+            visualStyle.CaptionStyles[StyleType.Default] = style;
+        }
+
+        #endregion
+
+        #region InitCellStyles
+
+        private void InitCellStyles(DefaultVisualStyles visualStyle, ColorFactory factory)
+        {
+            CellVisualStyle style = new CellVisualStyle();
+
+            style.Alignment = Alignment.MiddleLeft;
+            style.Background = new Background(factory.GetColor(Color.White));
+            style.BorderColor = new BorderColor(factory.GetColor(0xDBDEE1));
+            style.BorderPattern.All = LinePattern.Solid;
+            style.BorderThickness.All = 0;
+            style.Font = SystemFonts.DefaultFont;
+            style.ImageAlignment = Alignment.MiddleLeft;
+            style.ImagePadding.All = 2;
+            style.Margin.All = 0;
+            style.ImageOverlay = ImageOverlay.None;
+            style.Padding.All = 0;
+            style.TextColor = Color.Black;
+
+            visualStyle.CellStyles[StyleType.Default] = style;
+
+            style = new CellVisualStyle();
+            style.Background = GetDefaultSelectedBackground(factory);
+
+            visualStyle.CellStyles[StyleType.Selected] = style;
+
+            style = new CellVisualStyle();
+            style.Background = GetSelectedMouseOverBackground(factory);
+
+            visualStyle.CellStyles[StyleType.SelectedMouseOver] = style;
+
+            style = new CellVisualStyle();
+            style.Background = new Background(factory.GetColor(0xE9EDF1));
+
+            visualStyle.CellStyles[StyleType.Empty] = style;
+        }
+
+        #endregion
+
+        #region InitMergedCellStyles
+
+        private void InitMergedCellStyles(DefaultVisualStyles visualStyle, ColorFactory factory)
+        {
+            visualStyle.MergedCellStyles[StyleType.Default] = new CellVisualStyle();
+            visualStyle.MergedCellStyles[StyleType.ReadOnly] = new CellVisualStyle();
+            visualStyle.MergedCellStyles[StyleType.Selected] = new CellVisualStyle();
+            visualStyle.MergedCellStyles[StyleType.ReadOnlySelected] = new CellVisualStyle();
+            visualStyle.MergedCellStyles[StyleType.SelectedMouseOver] = new CellVisualStyle();
+            visualStyle.MergedCellStyles[StyleType.ReadOnlySelectedMouseOver] = new CellVisualStyle();
+            visualStyle.MergedCellStyles[StyleType.Empty] = new CellVisualStyle();
+        }
+
+        #endregion
+
+        #region InitAltRowCellStyles
+
+        private void InitAltRowCellStyles(DefaultVisualStyles visualStyle, ColorFactory factory)
+        {
+            visualStyle.AlternateRowCellStyles[StyleType.Default].Background =
+                new Background(factory.GetColor(0xF4F4F4));
+        }
+
+        #endregion
+
+        #region InitColumnStyles
+
+        private void InitColumnStyles(DefaultVisualStyles visualStyle, ColorFactory factory)
+        {
+            ColumnHeaderVisualStyle colStyle = new ColumnHeaderVisualStyle();
+
+            colStyle.Alignment = Alignment.MiddleCenter;
+            colStyle.BorderColor = new BorderColor(factory.GetColor(Color.Transparent));
+            colStyle.BorderPattern.All = LinePattern.Solid;
+            colStyle.BorderThickness.All = 0;
+            colStyle.Font = SystemFonts.CaptionFont;
+            colStyle.ImageAlignment = Alignment.MiddleLeft;
+            colStyle.Margin.All = 0;
+            colStyle.ImageOverlay = ImageOverlay.None;
+            colStyle.TextColor = factory.GetColor(0x363636);
+
+            colStyle.Background = new Background(factory.GetColor(0xF5F7F9), factory.GetColor(0xEFF2F6));
+
+            visualStyle.ColumnHeaderStyles[StyleType.Default] = colStyle;
+
+            colStyle = new ColumnHeaderVisualStyle();
+
+            colStyle.Background = new Background(factory.GetColor(0xFFDF6B), factory.GetColor(0xFFFCE6));
+
+            visualStyle.ColumnHeaderStyles[StyleType.MouseOver] = colStyle;
+
+            colStyle = new ColumnHeaderVisualStyle();
+            colStyle.Background = GetDefaultSelectedColumnBackground(factory);
+
+            visualStyle.ColumnHeaderStyles[StyleType.Selected] = colStyle;
+
+            colStyle = new ColumnHeaderVisualStyle();
+            colStyle.Background = GetSelectedColumnMouseOverBackground(factory);
+
+            visualStyle.ColumnHeaderStyles[StyleType.SelectedMouseOver] = colStyle;
+        }
+
+        #endregion
+
+        #region InitAltColumnStyles
+
+        private void InitAltColumnStyles(DefaultVisualStyles visualStyle, ColorFactory factory)
+        {
+            visualStyle.AlternateColumnCellStyles[StyleType.Default].Background =
+                new Background(factory.GetColor(0xF7F7FF));
+        }
+
+        #endregion
+
+        #region InitRowStyles
+
+        private void InitRowStyles(DefaultVisualStyles visualStyle, ColorFactory factory)
+        {
+            visualStyle.RowStyles[StyleType.Default] = GetDefaultRowStyle(factory);
+            visualStyle.RowStyles[StyleType.MouseOver] = GetMouseOverRowStyle(factory);
+            visualStyle.RowStyles[StyleType.SelectedMouseOver] = GetSelectedMouseOverRowStyle(visualStyle, factory);
+        }
+
+        #region GetDefaultRowStyle
+
+        private RowVisualStyle GetDefaultRowStyle(ColorFactory factory)
+        {
+            RowVisualStyle rowStyle = new RowVisualStyle();
+            rowStyle.Background = new Background(Color.White);
+
+            RowHeaderVisualStyle style = new RowHeaderVisualStyle();
+
+            style.Font = SystemFonts.DefaultFont;
+            style.TextColor = factory.GetColor(0x363636);
+
+            Background bg = new Background();
+            BackColorBlend bcb = new BackColorBlend();
+
+            bcb.Colors = new Color[3];
+            bcb.Colors[0] = factory.GetColor(0xDFE3E8);
+            bcb.Colors[1] = factory.GetColor(0xDFE3E8);
+            bcb.Colors[2] = factory.GetColor(0xC6CACF);
+
+            bcb.Positions = new float[3];
+            bcb.Positions[0] = 0f;
+            bcb.Positions[1] = .75f;
+            bcb.Positions[2] = 1f;
+
+            bg.BackColorBlend = bcb;
+            bg.GradientAngle = 0;
+
+            style.Background = bg;
+
+            bg = new Background(factory.GetColor(0xDFE3E8));
+
+            style.ActiveRowBackground = bg;
+            style.DirtyMarkerBackground = new Background(factory.GetColor(0xAE054F), factory.GetColor(0xE75E94), BackFillType.VerticalCenter);
+            style.BorderHighlightColor = GetBorderHighlight(factory);
+
+            rowStyle.RowHeaderStyle = style;
+
+            return (rowStyle);
+        }
+
+        #endregion
+
+        #region GetMouseOverRowStyle
+
+        private RowVisualStyle GetMouseOverRowStyle(ColorFactory factory)
+        {
+            RowVisualStyle rowStyle = new RowVisualStyle();
+            rowStyle.Background = new Background(Color.White);
+
+            RowHeaderVisualStyle style = new RowHeaderVisualStyle();
+            style.Background = new Background(Color.Plum);
+            style.ActiveRowBackground = new Background(Color.Blue);
+
+            Background bg = new Background();
+            BackColorBlend bcb = new BackColorBlend();
+
+            bcb.Colors = new Color[3];
+            bcb.Colors[0] = factory.GetColor(0xFFE575);
+            bcb.Colors[1] = factory.GetColor(0xFFE575);
+            bcb.Colors[2] = factory.GetColor(0xF2CD66);
+
+            bcb.Positions = new float[3];
+            bcb.Positions[0] = 0f;
+            bcb.Positions[1] = .75f;
+            bcb.Positions[2] = 1f;
+
+            bg.BackColorBlend = bcb;
+            bg.GradientAngle = 0;
+
+            style.Background = bg;
+
+            bg = new Background();
+            bcb = new BackColorBlend();
+
+            bcb.Colors = new Color[3];
+            bcb.Colors[0] = Color.FromArgb(254 - 20, 240 - 20, 214 - 20);
+            bcb.Colors[1] = Color.FromArgb(254 - 30, 199 - 30, 104 - 30);
+            bcb.Colors[2] = Color.FromArgb(229 - 30, 133 - 30, 0);
+
+            bcb.Positions = new float[3];
+            bcb.Positions[0] = 0f;
+            bcb.Positions[1] = .75f;
+            bcb.Positions[2] = 1f;
+
+            bg.BackColorBlend = bcb;
+            bg.GradientAngle = 0;
+
+            style.ActiveRowBackground = bg;
+
+            rowStyle.RowHeaderStyle = style;
+
+            return (rowStyle);
+        }
+
+        #endregion
+
+        #region GetSelectedMouseOverRowStyle
+
+        private RowVisualStyle GetSelectedMouseOverRowStyle(DefaultVisualStyles visualStyle, ColorFactory factory)
+        {
+            RowVisualStyle rowStyle = new RowVisualStyle();
+            rowStyle.Background = GetDefaultSelectedBackground(factory);
+
+            RowHeaderVisualStyle style = new RowHeaderVisualStyle();
+            style.Background = new Background(factory.GetColor(0xAAAAAA));
+            style.ActiveRowBackground = new Background(factory.GetColor(0xAAAAAA));
+
+            rowStyle.RowHeaderStyle = style;
+
+            visualStyle.RowStyles[StyleType.Selected] = rowStyle;
+
+            rowStyle = new RowVisualStyle();
+            rowStyle.Background = GetSelectedColumnMouseOverBackground(factory);
+
+            style = new RowHeaderVisualStyle();
+            style.Background = new Background(factory.GetColor(0xAAAAAA));
+            style.ActiveRowBackground = new Background(factory.GetColor(0xAAAAAA));
+
+            rowStyle.RowHeaderStyle = style;
+
+            return (rowStyle);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InitGroupHeaderStyles
+
+        private void InitGroupHeaderStyles(DefaultVisualStyles visualStyle, ColorFactory factory)
+        {
+            GroupHeaderVisualStyle style = new GroupHeaderVisualStyle();
+
+            style.AllowWrap = Tbool.True;
+            style.Alignment = Alignment.MiddleLeft;
+            style.Font = SystemFonts.DefaultFont;
+
+            style.Background = new
+                Background(factory.GetColor(0xE5E7E9));
+
+            style.UnderlineColor = factory.GetColor(0xE5E7E9);
+
+            style.RowHeaderStyle.Background = new Background(factory.GetColor(0xDFE3E8));
+            style.RowHeaderStyle.BorderHighlightColor = GetBorderHighlight(factory);
+            style.RowHeaderStyle.Font = SystemFonts.DefaultFont;
+
+            visualStyle.GroupHeaderStyles[StyleType.Default] = style;
+        }
+
+        #endregion
+
+        #region GetDefaultSelectedColumnBackground
+        private Background GetDefaultSelectedColumnBackground(ColorFactory factory)
+        {
+            return (new Background(factory.GetColor(0xFFD359), factory.GetColor(0xFFEF71)));
+        }
+        #endregion
+
+        #region GetDefaultSelectedBackground
+
+        private Background GetDefaultSelectedBackground(ColorFactory factory)
+        {
+            return (new Background(factory.GetColor(0xB7DBFF)));
+        }
+
+        #endregion
+
+        #region GetDefaultSelectedColumnMouseOverStyle
+
+        private Background GetSelectedColumnMouseOverBackground(ColorFactory factory)
+        {
+            return (new Background(factory.GetColor(0xB0D4F7)));
+        }
+
+        #endregion
+
+        #region GetDefaultSelectedMouseOverStyle
+
+        private Background GetSelectedMouseOverBackground(ColorFactory factory)
+        {
+            return (new Background(factory.GetColor(0xB0D4F7)));
+        }
+
+        #endregion
+
+        #region InitFilterColumnHeaderStyles
+
+        private void InitFilterColumnHeaderStyles(
+            DefaultVisualStyles visualStyle, ColorFactory factory)
+        {
+            FilterColumnHeaderVisualStyle colStyle = new FilterColumnHeaderVisualStyle();
+
+            colStyle.Alignment = Alignment.MiddleLeft;
+            colStyle.Font = SystemFonts.CaptionFont;
+
+            colStyle.TextColor = factory.GetColor(0x363636);
+            colStyle.ErrorTextColor = Color.Red;
+
+            colStyle.Background = new Background(factory.GetColor(0xF5F7F9), factory.GetColor(0xEFF2F6));
+            colStyle.GripBarBackground = new Background(factory.GetColor(0xE9EDF1));
+            visualStyle.FilterColumnHeaderStyles[StyleType.Default] = colStyle;
+
+            colStyle = new FilterColumnHeaderVisualStyle();
+            colStyle.Background = new Background(factory.GetColor(0xFFDF6B), factory.GetColor(0xFFFCE6));
+            visualStyle.FilterColumnHeaderStyles[StyleType.MouseOver] = colStyle;
+
+            colStyle = new FilterColumnHeaderVisualStyle();
+            colStyle.Background = GetDefaultSelectedColumnBackground(factory);
+            visualStyle.FilterColumnHeaderStyles[StyleType.Selected] = colStyle;
+
+            colStyle = new FilterColumnHeaderVisualStyle();
+            colStyle.Background = GetSelectedColumnMouseOverBackground(factory);
+            visualStyle.FilterColumnHeaderStyles[StyleType.SelectedMouseOver] = colStyle;
+        }
+
+        #endregion
+
+        #region InitFilterRowStyles
+
+        private void InitFilterRowStyles(
+            DefaultVisualStyles visualStyle, ColorFactory factory)
+        {
+            FilterRowVisualStyle style = new FilterRowVisualStyle();
+
+            style.FilterBorderColor = factory.GetColor(0x787D87);
+            style.FilterBackground = new Background(Color.White, factory.GetColor(0xB0B6BC), 0);
+
+            style.WhiteSpaceBackground = new Background(factory.GetColor(0xE9EDF1));
+
+            style.RowHeader.Background = new Background(
+                factory.GetColor(0xF5F7F9), factory.GetColor(0xEFF2F6), BackFillType.ForwardDiagonal);
+
+            style.RowHeader.BorderHighlightColor = GetBorderHighlight(factory);
+
+            visualStyle.FilterRowStyles[StyleType.Default] = style;
+
+            style = style.Copy();
+
+            style.FilterBackground = new Background(Color.White, factory.GetColor(Color.Green), 45);
+
+            visualStyle.FilterRowStyles[StyleType.Selected] = style;
+
+            style = style.Copy();
+
+            style.FilterBackground = new Background(Color.White, factory.GetColor(0xE2AA00), 0);
+
+            style.RowHeader.Background = new Background(
+                factory.GetColor(0xFFDF6B), factory.GetColor(0xFFFCE6), BackFillType.Angle);
+
+            visualStyle.FilterRowStyles[StyleType.MouseOver] = style;
+            visualStyle.FilterRowStyles[StyleType.SelectedMouseOver] = style;
+        }
+
+        #endregion
+
+        #region InitGroupByStyles
+
+        private void InitGroupByStyles(DefaultVisualStyles visualStyle, ColorFactory factory)
+        {
+            GroupByVisualStyle style = new GroupByVisualStyle();
+
+            style.Alignment = Alignment.MiddleCenter;
+            style.GroupBoxConnectorColor = factory.GetColor(0x8B9097); // Panel border color
+            style.GroupBoxBorderColor = factory.GetColor(0x8B9097);
+
+            style.InsertMarkerBorderColor = factory.GetColor(0x8B9097);
+            style.InsertMarkerBackground = new Background(factory.GetColor(Color.Red));
+
+            style.RowHeaderStyle.Background = new Background(factory.GetColor(0xF5F7F9), factory.GetColor(0xEFF2F6), BackFillType.ForwardDiagonal);
+            style.RowHeaderStyle.BorderHighlightColor = GetBorderHighlight(factory);
+
+            style.TextColor = factory.GetColor(0x363636); // Col text color
+            style.GroupBoxBackground = new Background(factory.GetColor(0xF5F7F9), factory.GetColor(0xEFF2F6));  // col background
+            visualStyle.GroupByStyles[StyleType.Default] = style;
+
+            style = new GroupByVisualStyle();
+            style.GroupBoxBackground = new Background(factory.GetColor(0xFFDF6B), factory.GetColor(0xFFFCE6));  // col background
+            visualStyle.GroupByStyles[StyleType.MouseOver] = style;
+
+            style = new GroupByVisualStyle();
+            style.GroupBoxBackground = GetDefaultSelectedColumnBackground(factory);  // col background
+            visualStyle.GroupByStyles[StyleType.Selected] = style;
+
+            style = new GroupByVisualStyle();
+            style.GroupBoxBackground = GetSelectedColumnMouseOverBackground(factory);  // col background
+            visualStyle.GroupByStyles[StyleType.SelectedMouseOver] = style;
+        }
+
+        #endregion
+
+        #region GetBorderHighlight
+
+        private Color GetBorderHighlight(ColorFactory factory)
+        {
+            return factory.GetColor("80FFFFFF");
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/VisualStyles/VisualStyleFactory.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/VisualStyles/VisualStyleFactory.cs
new file mode 100644
index 00000000..ecbec3ed
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/VisualStyles/VisualStyleFactory.cs	
@@ -0,0 +1,52 @@
+using System;
+
+namespace DevComponents.DotNetBar.SuperGrid.Style
+{
+    /// <summary>
+    /// Represents base class that each visual style factory for SuperGridControl inherits from.
+    /// </summary>
+    public abstract class VisualStyleFactory
+    {
+        /// <summary>
+        /// Create the DefaultVisualStyle for SuperGridControl.
+        /// </summary>
+        /// <param name="factory">Color-Factory used to generate colors.</param>
+        /// <returns>New instance of DefaultVisualStyles class.</returns>
+        public abstract DefaultVisualStyles CreateStyle(Rendering.ColorFactory factory);
+
+        /// <summary>
+        /// Create the DefaultVisualStyle for SuperGridControl with empty color factory.
+        /// </summary>
+        /// <returns>New instance of DefaultVisualStyles class.</returns>
+        public virtual DefaultVisualStyles CreateStyle()
+        {
+            if (StyleManager.ColorTint.IsEmpty)
+                return CreateStyle(Rendering.ColorFactory.Empty);
+
+            return CreateStyle(new Rendering.ColorBlendFactory(StyleManager.ColorTint));
+        }
+
+        /// <summary>
+        /// Returns the style factory for specified visual style.
+        /// </summary>
+        /// <param name="style">Style to create factory for.</param>
+        /// <returns>An instance of VisualStyleFactory.</returns>
+        public static VisualStyleFactory GetStyleFactory(SuperGridStyle style)
+        {
+            if (style == SuperGridStyle.Office2010Blue)
+                return new Office2010BlueStyleFactory();
+
+            if (style == SuperGridStyle.Office2010Silver)
+                return new Office2010SilverStyleFactory();
+
+            if (style == SuperGridStyle.Office2010Black)
+                return new Office2010BlackStyleFactory();
+
+            if (style == SuperGridStyle.Metro)
+                return new MetroStyleFactory();
+
+            throw new ArgumentException(string.Format(
+                "Specified style '{0}' factory has not been implemented.", style));
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/VisualStyles/VisualStylesTable.cs b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/VisualStyles/VisualStylesTable.cs
new file mode 100644
index 00000000..72b50953
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.DotNetBar.SuperGrid/VisualStyles/VisualStylesTable.cs	
@@ -0,0 +1,72 @@
+using System.Collections.Generic;
+
+namespace DevComponents.DotNetBar.SuperGrid.Style
+{
+    ///<summary>
+    /// VisualStylesTable
+    ///</summary>
+    public static class VisualStylesTable
+    {
+        private static Dictionary<SuperGridStyle, DefaultVisualStyles>
+            _DefaultStyles = new Dictionary<SuperGridStyle,DefaultVisualStyles>();
+
+        /// <summary>
+        /// Gets the DefaultVisualStyles for specified SuperGrid style.
+        /// </summary>
+        /// <param name="style">SuperGridStyle to return.</param>
+        /// <returns>An instance of DefaultVisualStyle.</returns>
+        public static DefaultVisualStyles GetStyle(SuperGridStyle style)
+        {
+            DefaultVisualStyles visualStyle;
+            bool cacheStyle = true;
+
+            if (style == SuperGridStyle.Metro || !StyleManager.ColorTint.IsEmpty)
+                cacheStyle = false;
+
+            if (cacheStyle == false || !_DefaultStyles.TryGetValue(style, out visualStyle))
+            {
+                VisualStyleFactory factory = VisualStyleFactory.GetStyleFactory(style);
+
+                visualStyle = factory.CreateStyle();
+
+                if (cacheStyle) // Do not cache Metro style
+                    _DefaultStyles.Add(style, visualStyle);
+            }
+
+            return visualStyle;
+        }
+
+        /// <summary>
+        /// Replaces an system style with the specified visual style.
+        /// </summary>
+        /// <param name="style">SuperGridStyle to replace.</param>
+        /// <param name="visualStyle">DefaultVisualStyles to replace the system style with.</param>
+        public static void SetStyleFactory(SuperGridStyle style, DefaultVisualStyles visualStyle)
+        {
+            _DefaultStyles[style] = visualStyle;
+        }
+    }
+
+    /// <summary>
+    /// Defines available pre-defined SuperGrid visual styles.
+    /// </summary>
+    public enum SuperGridStyle
+    {
+        /// <summary>
+        /// Office 2010 Blue style.
+        /// </summary>
+        Office2010Blue,
+        /// <summary>
+        /// Office 2010 Silver style.
+        /// </summary>
+        Office2010Silver,
+        /// <summary>
+        /// Office 2010 Black style.
+        /// </summary>
+        Office2010Black,
+        /// <summary>
+        /// Metro Style.
+        /// </summary>
+        Metro
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.SuperGrid.Design/BoolValueTypeDropDown.cs b/PROMS/DotNetBar Source Code/DevComponents.SuperGrid.Design/BoolValueTypeDropDown.cs
new file mode 100644
index 00000000..a101a2aa
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.SuperGrid.Design/BoolValueTypeDropDown.cs	
@@ -0,0 +1,45 @@
+using System;
+using System.ComponentModel;
+using System.Windows.Forms;
+using System.Windows.Forms.Design;
+
+namespace DevComponents.SuperGrid.Design
+{
+    [ToolboxItem(false)]
+    public class BoolValueTypeDropDown : ValueTypeDropDown
+    {
+        public BoolValueTypeDropDown()
+        {
+        }
+
+        public BoolValueTypeDropDown(object value,
+            IWindowsFormsEditorService editorService, ITypeDescriptorContext context)
+            : base(value, editorService, context)
+        {
+        }
+
+        protected override string[] GetListBoxItems()
+        {
+            return (new string[] { "True", "False" });
+        }
+
+        protected override int GetSelectedIndex()
+        {
+            if (Value is bool)
+                return ((bool)Value == true ? 0 : 1);
+
+            return (-1);
+        }
+
+        protected override void ListBoxSelectedIndexChanged(object sender, EventArgs e)
+        {
+            ListBox listBox = sender as ListBox;
+
+            if (listBox != null)
+            {
+                if (listBox.SelectedIndex >= 0)
+                    Value = (listBox.SelectedIndex == 0);
+            }
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.SuperGrid.Design/ColumnGroupHeaderCollectionEditor.cs b/PROMS/DotNetBar Source Code/DevComponents.SuperGrid.Design/ColumnGroupHeaderCollectionEditor.cs
new file mode 100644
index 00000000..9bddd981
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.SuperGrid.Design/ColumnGroupHeaderCollectionEditor.cs	
@@ -0,0 +1,232 @@
+using System;
+using System.ComponentModel;
+using System.ComponentModel.Design;
+using System.Drawing;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.SuperGrid;
+
+namespace DevComponents.SuperGrid.Design
+{
+    /// <summary>
+    /// ColumnGroupHeaderCollectionEditor
+    /// </summary>
+    public class ColumnGroupHeaderCollectionEditor : CollectionEditor
+    {
+        #region Static variables
+
+        static Size _lastSize = Size.Empty;
+        static Point _lastLoc = Point.Empty;
+
+        #endregion
+
+        public ColumnGroupHeaderCollectionEditor(Type type)
+            : base(type)
+        {
+        }
+
+        #region CreateCollectionForm
+
+        protected override CollectionForm CreateCollectionForm()
+        {
+            CollectionForm collectionForm = base.CreateCollectionForm();
+
+            if (collectionForm.Controls[0] is TableLayoutPanel)
+            {
+                TableLayoutPanel tlpf =
+                    collectionForm.Controls["overArchingTableLayoutPanel"] as TableLayoutPanel;
+
+                if (tlpf != null)
+                {
+                    PropertyGrid propertyGrid =
+                        tlpf.Controls["propertyBrowser"] as PropertyGrid;
+
+                    if (propertyGrid != null)
+                    {
+                        propertyGrid.HelpVisible = true;
+
+                        propertyGrid.GotFocus += PropertyGridGotFocus;
+                        propertyGrid.SelectedObjectsChanged += PropertyGridSelectedObjectsChanged;
+                    }
+                }
+            }
+
+            collectionForm.Load += CollectionFormLoad;
+            collectionForm.Resize += CollectionFormResize;
+            collectionForm.LocationChanged += CollectionFormLocationChanged;
+
+            return (collectionForm);
+        }
+
+        #region CollectionFormLoad
+
+        void CollectionFormLoad(object sender, EventArgs e)
+        {
+            CollectionForm form = sender as CollectionForm;
+
+            if (form != null)
+            {
+                if (_lastSize != Size.Empty)
+                    form.Size = _lastSize;
+
+                if (_lastLoc != Point.Empty)
+                    form.Location = _lastLoc;
+            }
+        }
+
+        #endregion
+
+        #region CollectionFormResize
+
+        void CollectionFormResize(object sender, EventArgs e)
+        {
+            CollectionForm form = sender as CollectionForm;
+
+            if (form != null && form.Visible == true)
+                _lastSize = form.Size;
+        }
+
+        #endregion
+
+        #region CollectionFormLocationChanged
+
+        void CollectionFormLocationChanged(object sender, EventArgs e)
+        {
+            CollectionForm form = sender as CollectionForm;
+
+            if (form != null && form.Visible == true)
+                _lastLoc = form.Location;
+        }
+
+        #endregion
+
+        #region PropertyGridGotFocus
+
+        void PropertyGridGotFocus(object sender, EventArgs e)
+        {
+            PropertyGrid propertyGrid = sender as PropertyGrid;
+
+            if (propertyGrid != null)
+                UpdateDesignerFocus(propertyGrid);
+        }
+
+        #endregion
+
+        #region PropertyGridSelectedObjectsChanged
+
+        void PropertyGridSelectedObjectsChanged(object sender, EventArgs e)
+        {
+            PropertyGrid propertyGrid = sender as PropertyGrid;
+
+            if (propertyGrid != null)
+                UpdateDesignerFocus(propertyGrid);
+        }
+
+        #endregion
+
+        #region UpdateDesignerFocus
+
+        private void UpdateDesignerFocus(PropertyGrid propertyGrid)
+        {
+            GridContainer row = Context.Instance as GridContainer;
+
+            if (row != null)
+            {
+                GridElement item = propertyGrid.SelectedObject as GridElement;
+
+                if (item != null)
+                    row.SuperGrid.DesignerElement = item;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region CreateCollectionItemType
+
+        protected override Type CreateCollectionItemType()
+        {
+            return typeof(ColumnGroupHeader);
+        }
+
+        #endregion
+
+        #region CreateNewItemTypes
+
+        protected override Type[] CreateNewItemTypes()
+        {
+            return new Type[]
+            {
+                typeof(ColumnGroupHeader),
+            };
+        }
+
+        #endregion
+
+        #region EditValue
+
+        public override object EditValue(
+            ITypeDescriptorContext context, IServiceProvider provider, object value)
+        {
+            object o = base.EditValue(context, provider, value);
+
+            return (o);
+        }
+
+        #endregion
+
+        #region CreateInstance
+
+        protected override object CreateInstance(Type itemType)
+        {
+            ColumnGroupHeader item =
+                (ColumnGroupHeader) base.CreateInstance(typeof (ColumnGroupHeader));
+
+            if (item != null)
+            {
+                GridColumnHeader gch = Context.Instance as GridColumnHeader;
+
+                if (gch != null)
+                {
+                    item.Name = GetGroupHeaderName(gch.GroupHeaders);
+                }
+                else
+                {
+                    ColumnGroupHeader csh = Context.Instance as ColumnGroupHeader;
+
+                    if (csh != null)
+                    {
+                        item.Name = GetGroupHeaderName(csh.GroupHeaders);
+
+                        item.StartDisplayIndex = csh.StartDisplayIndex;
+                        item.EndDisplayIndex = csh.EndDisplayIndex;
+
+                        item.ShowColumnHeaders = csh.ShowColumnHeaders;
+                    }
+                }
+            }
+
+            return (item);
+        }
+
+        #region GetGroupHeaderName
+
+        private string GetGroupHeaderName(ColumnGroupHeaderCollection csc)
+        {
+            for (int i = 1; i < 200; i++)
+            {
+                string s = "GroupHeader" + i;
+
+                if (csc[s] == null)
+                    return (s);
+            }
+
+            return ("");
+        }
+
+        #endregion
+
+        #endregion
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.SuperGrid.Design/ColumnListTypeEditor.cs b/PROMS/DotNetBar Source Code/DevComponents.SuperGrid.Design/ColumnListTypeEditor.cs
new file mode 100644
index 00000000..ffdf81da
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.SuperGrid.Design/ColumnListTypeEditor.cs	
@@ -0,0 +1,98 @@
+using System;
+using System.ComponentModel;
+using System.Drawing.Design;
+using System.Windows.Forms;
+using System.Windows.Forms.Design;
+using DevComponents.DotNetBar.Controls;
+using DevComponents.DotNetBar.SuperGrid;
+
+namespace DevComponents.SuperGrid.Design
+{
+    public class ColumnListTypeEditor : UITypeEditor
+    {
+        #region Private variables
+
+        IWindowsFormsEditorService _EditorService;
+
+        #endregion
+
+        #region GetEditStyle
+
+        public override UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext context)
+        {
+            return (UITypeEditorEditStyle.DropDown);
+        }
+
+        #endregion
+
+        #region GetPaintValueSupported
+
+        public override bool GetPaintValueSupported(ITypeDescriptorContext context)
+        {
+            return (false);
+        }
+
+        #endregion
+
+        #region EditValue
+
+        public override object EditValue(
+            ITypeDescriptorContext context, IServiceProvider provider, object value)
+        {
+            _EditorService =
+                provider.GetService(typeof (IWindowsFormsEditorService)) as IWindowsFormsEditorService;
+
+            if (_EditorService != null)
+            {
+                GridPanel panel = context.Instance as GridPanel;
+
+                if (panel != null)
+                {
+                    ListBox lb = new ListBox();
+                    lb.Dock = DockStyle.Fill;
+                    lb.BorderStyle = BorderStyle.None;
+
+                    lb.MouseClick += ListBoxMouseClick;
+
+                    for (int i = 0; i < panel.Columns.Count; i++)
+                    {
+                        GridColumn col = panel.Columns[i];
+
+                        string s = GetColumnText(col, i);
+
+                        lb.Items.Add(s);
+                    }
+
+                    _EditorService.DropDownControl(lb);
+
+                    if (lb.SelectedIndex >= 0)
+                        return (lb.SelectedIndex);
+
+                    return (panel.PrimaryColumnIndex);
+                }
+            }
+
+            return (base.EditValue(context, provider, value));
+        }
+
+        private string GetColumnText(GridColumn col, int index)
+        {
+            string s = index + " ";
+
+            if (string.IsNullOrEmpty(col.Name) == false)
+                return (s + "-" + col.Name);
+
+            if (string.IsNullOrEmpty(col.HeaderText) == false)
+                return (s + "-" + col.HeaderText);
+
+            return (s);
+        }
+
+        private void ListBoxMouseClick(object sender, MouseEventArgs e)
+        {
+            _EditorService.CloseDropDown();
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.SuperGrid.Design/EditTypeDropDown.Designer.cs b/PROMS/DotNetBar Source Code/DevComponents.SuperGrid.Design/EditTypeDropDown.Designer.cs
new file mode 100644
index 00000000..e8332098
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.SuperGrid.Design/EditTypeDropDown.Designer.cs	
@@ -0,0 +1,64 @@
+namespace DevComponents.SuperGrid.Design
+{
+    partial class EditTypeDropDown
+    {
+        /// <summary> 
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #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.listBox1 = new System.Windows.Forms.ListBox();
+            this.SuspendLayout();
+            // 
+            // listBox1
+            // 
+            this.listBox1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.listBox1.FormattingEnabled = true;
+            this.listBox1.Location = new System.Drawing.Point(0, 0);
+            this.listBox1.Name = "listBox1";
+            this.listBox1.Size = new System.Drawing.Size(172, 95);
+            this.listBox1.TabIndex = 1;
+            this.listBox1.MouseClick += new System.Windows.Forms.MouseEventHandler(this.ListBox1MouseClick);
+            this.listBox1.SelectedIndexChanged += new System.EventHandler(this.ListBox1SelectedIndexChanged);
+            // 
+            // EditTypeDropDown
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.Controls.Add(this.listBox1);
+            this.Name = "EditTypeDropDown";
+            this.Size = new System.Drawing.Size(172, 95);
+            this.PreviewKeyDown += new System.Windows.Forms.PreviewKeyDownEventHandler(this.DropDownPreviewKeyDown);
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.ListBox listBox1;
+
+
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.SuperGrid.Design/EditTypeDropDown.cs b/PROMS/DotNetBar Source Code/DevComponents.SuperGrid.Design/EditTypeDropDown.cs
new file mode 100644
index 00000000..9103b2a9
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.SuperGrid.Design/EditTypeDropDown.cs	
@@ -0,0 +1,147 @@
+using System;
+using System.ComponentModel;
+using System.Windows.Forms;
+using System.Windows.Forms.Design;
+using DevComponents.DotNetBar.SuperGrid;
+
+namespace DevComponents.SuperGrid.Design
+{
+    [ToolboxItem(false)]
+    public partial class EditTypeDropDown : UserControl
+    {
+        #region Static data
+
+        static readonly Type[] Types = new Type[]
+        {
+            typeof(GridButtonXEditControl), typeof(GridCheckBoxXEditControl),
+            typeof(GridColorPickerEditControl), typeof(GridComboBoxExEditControl),
+            typeof(GridComboTreeEditControl), typeof(GridDateTimeInputEditControl),
+            typeof(GridDateTimePickerEditControl), typeof(GridDoubleInputEditControl),
+            typeof(GridIntegerInputEditControl), typeof(GridIpAddressInputEditControl),
+            typeof(GridLabelXEditControl), typeof(GridMaskedTextBoxEditControl),
+            typeof(GridMicroChartEditControl), typeof(GridNumericUpDownEditControl),
+            typeof(GridImageEditControl), typeof(GridProgressBarXEditControl),
+            typeof(GridRadialMenuEditControl), typeof(GridSliderEditControl),
+            typeof(GridSwitchButtonEditControl), typeof(GridTextBoxDropDownEditControl),
+            typeof(GridTextBoxXEditControl),
+        };
+
+        #endregion
+
+        #region Private variables
+
+        private Type _EditType;
+
+        private bool _EscapePressed;
+
+        private IWindowsFormsEditorService _EditorService;
+        private ITypeDescriptorContext _Context;
+
+        #endregion
+
+        public EditTypeDropDown(Type value, 
+            IWindowsFormsEditorService editorService, ITypeDescriptorContext context)
+        {
+            Initialize();
+
+            _EditorService = editorService;
+            _Context = context;
+
+            EditType = value;
+        }
+
+        public EditTypeDropDown()
+        {
+            Initialize();
+        }
+
+        #region Initialize
+
+        private void Initialize()
+        {
+            InitializeComponent();
+
+            SetStyle(ControlStyles.UserPaint, true);
+            SetStyle(ControlStyles.AllPaintingInWmPaint, true);
+            SetStyle(ControlStyles.OptimizedDoubleBuffer, true);
+
+            listBox1.Items.Add("(None)");
+
+            foreach (Type type in Types)
+                listBox1.Items.Add(type.Name);
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region EditorService
+
+        public IWindowsFormsEditorService EditorService
+        {
+            get { return (_EditorService); }
+            set { _EditorService = value; }
+        }
+
+        #endregion
+
+        #region EscapePressed
+
+        public bool EscapePressed
+        {
+            get { return (_EscapePressed); }
+            set { _EscapePressed = value; }
+        }
+
+        #endregion
+
+        #region EditType
+
+        public Type EditType
+        {
+            get { return (_EditType); }
+
+            set
+            {
+                _EditType = value;
+
+                _Context.OnComponentChanging();
+                _Context.PropertyDescriptor.SetValue(_Context.Instance, value);
+                _Context.OnComponentChanged();
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region DropDownPreviewKeyDown
+
+        private void DropDownPreviewKeyDown(object sender, PreviewKeyDownEventArgs e)
+        {
+            if (e.KeyCode == Keys.Escape)
+                _EscapePressed = true;
+        }
+
+        #endregion
+
+        #region ListBox1MouseClick
+
+        private void ListBox1MouseClick(object sender, MouseEventArgs e)
+        {
+            _EditorService.CloseDropDown();
+        }
+
+        #endregion
+
+        #region ListBox1SelectedIndexChanged
+
+        private void ListBox1SelectedIndexChanged(object sender, EventArgs e)
+        {
+            EditType = (listBox1.SelectedIndex > 0)
+                ? Types[listBox1.SelectedIndex - 1] : null;
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.SuperGrid.Design/EditTypeDropDown.resx b/PROMS/DotNetBar Source Code/DevComponents.SuperGrid.Design/EditTypeDropDown.resx
new file mode 100644
index 00000000..19dc0dd8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.SuperGrid.Design/EditTypeDropDown.resx	
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DevComponents.SuperGrid.Design/EditTypeEditor.cs b/PROMS/DotNetBar Source Code/DevComponents.SuperGrid.Design/EditTypeEditor.cs
new file mode 100644
index 00000000..26f849a0
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.SuperGrid.Design/EditTypeEditor.cs	
@@ -0,0 +1,55 @@
+using System;
+using System.ComponentModel;
+using System.Drawing.Design;
+using System.Windows.Forms.Design;
+
+namespace DevComponents.SuperGrid.Design
+{
+    public class EditTypeEditor : UITypeEditor
+    {
+        #region GetEditStyle
+
+        public override UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext context)
+        {
+            return (UITypeEditorEditStyle.DropDown);
+        }
+
+        #endregion
+
+        #region GetPaintValueSupported
+
+        public override bool GetPaintValueSupported(ITypeDescriptorContext context)
+        {
+            return (false);
+        }
+
+        #endregion
+
+        #region EditValue
+
+        public override object EditValue(
+            ITypeDescriptorContext context, IServiceProvider provider, object value)
+        {
+            IWindowsFormsEditorService editorService =
+                provider.GetService(typeof (IWindowsFormsEditorService)) as IWindowsFormsEditorService;
+
+            if (editorService != null)
+            {
+                EditTypeDropDown pv = new EditTypeDropDown((Type)value, editorService, context);
+
+                pv.EscapePressed = false;
+
+                editorService.DropDownControl(pv);
+
+                if (pv.EscapePressed == true)
+                    context.PropertyDescriptor.SetValue(context.Instance, value);
+                else
+                    return (pv.EditType);
+            }
+
+            return (base.EditValue(context, provider, value));
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.SuperGrid.Design/GridCellCollectionEditor.cs b/PROMS/DotNetBar Source Code/DevComponents.SuperGrid.Design/GridCellCollectionEditor.cs
new file mode 100644
index 00000000..03518601
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.SuperGrid.Design/GridCellCollectionEditor.cs	
@@ -0,0 +1,148 @@
+using System;
+using System.ComponentModel;
+using System.ComponentModel.Design;
+using System.Drawing;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.SuperGrid;
+
+namespace DevComponents.SuperGrid.Design
+{
+    /// <summary>
+    /// GridRowCollectionEditor
+    /// </summary>
+    public class GridCellCollectionEditor : CollectionEditor
+    {
+        #region Static variables
+
+        static Size _lastSize = Size.Empty;
+        static Point _lastLoc = Point.Empty;
+
+        #endregion
+
+        #region Private variables
+
+        private CollectionForm _CollectionForm;
+        private TableLayoutPanel _LayoutPanel;
+
+        #endregion
+
+        public GridCellCollectionEditor(Type type)
+            : base(type)
+        {
+        }
+
+        #region CreateCollectionItemType
+
+        protected override Type CreateCollectionItemType()
+        {
+            return typeof(GridCell);
+        }
+
+        #endregion
+
+        #region CreateCollectionForm
+
+        protected override CollectionForm CreateCollectionForm()
+        {
+            _CollectionForm = base.CreateCollectionForm();
+
+            _LayoutPanel =
+                _CollectionForm.Controls["overArchingTableLayoutPanel"] as TableLayoutPanel;
+
+            if (_LayoutPanel != null)
+            {
+                PropertyGrid propertyGrid =
+                    _LayoutPanel.Controls["propertyBrowser"] as PropertyGrid;
+
+                if (propertyGrid != null)
+                {
+                    propertyGrid.HelpVisible = true;
+                    propertyGrid.GotFocus += PropertyGridGotFocus;
+                }
+            }
+
+            _CollectionForm.Load += CollectionFormLoad;
+            _CollectionForm.Resize += CollectionFormResize;
+            _CollectionForm.LocationChanged += CollectionFormLocationChanged;
+
+            return (_CollectionForm);
+        }
+
+        #region CollectionFormLoad
+
+        void CollectionFormLoad(object sender, EventArgs e)
+        {
+            CollectionForm form = sender as CollectionForm;
+
+            if (form != null)
+            {
+                if (_lastSize != Size.Empty)
+                    form.Size = _lastSize;
+
+                if (_lastLoc != Point.Empty)
+                    form.Location = _lastLoc;
+            }
+        }
+
+        #endregion
+
+        #region CollectionFormResize
+
+        void CollectionFormResize(object sender, EventArgs e)
+        {
+            CollectionForm form = sender as CollectionForm;
+
+            if (form != null && form.Visible == true)
+                _lastSize = form.Size;
+        }
+
+        #endregion
+
+        #region CollectionFormLocationChanged
+
+        void CollectionFormLocationChanged(object sender, EventArgs e)
+        {
+            CollectionForm form = sender as CollectionForm;
+
+            if (form != null && form.Visible == true)
+                _lastLoc = form.Location;
+        }
+
+        #endregion
+
+        #region PropertyGridGotFocus
+
+        void PropertyGridGotFocus(object sender, EventArgs e)
+        {
+            _LayoutPanel.Controls[4].Refresh();
+        }
+
+        #endregion
+
+        #endregion
+
+        #region EditValue
+
+        public override object EditValue(
+            ITypeDescriptorContext context, IServiceProvider provider, object value)
+        {
+            object o = base.EditValue(context, provider, value);
+
+            return (o);
+        }
+
+        #endregion
+
+        #region CreateInstance
+
+        protected override object CreateInstance(Type itemType)
+        {
+            object o = base.CreateInstance(itemType);
+
+            return (o);
+        }
+
+        #endregion
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.SuperGrid.Design/GridColumnCollectionEditor.cs b/PROMS/DotNetBar Source Code/DevComponents.SuperGrid.Design/GridColumnCollectionEditor.cs
new file mode 100644
index 00000000..fc646903
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.SuperGrid.Design/GridColumnCollectionEditor.cs	
@@ -0,0 +1,252 @@
+using System;
+using System.ComponentModel;
+using System.ComponentModel.Design;
+using System.Drawing;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.SuperGrid;
+
+namespace DevComponents.SuperGrid.Design
+{
+    /// <summary>
+    /// GridColumnCollectionEditor
+    /// </summary>
+    public class GridColumnCollectionEditor : CollectionEditor
+    {
+        #region Static variables
+
+        static Size _lastSize = Size.Empty;
+        static Point _lastLoc = Point.Empty;
+
+        #endregion
+
+        public GridColumnCollectionEditor(Type type)
+            : base(type)
+        {
+        }
+
+        #region CreateCollectionForm
+
+        protected override CollectionForm CreateCollectionForm()
+        {
+            CollectionForm collectionForm = base.CreateCollectionForm();
+
+            if (collectionForm.Controls[0] is TableLayoutPanel)
+            {
+                TableLayoutPanel tlpf =
+                    collectionForm.Controls["overArchingTableLayoutPanel"] as TableLayoutPanel;
+
+                if (tlpf != null)
+                {
+                    PropertyGrid propertyGrid =
+                        tlpf.Controls["propertyBrowser"] as PropertyGrid;
+
+                    if (propertyGrid != null)
+                    {
+                        propertyGrid.HelpVisible = true;
+
+                        propertyGrid.GotFocus += PropertyGridGotFocus;
+                        propertyGrid.SelectedObjectsChanged += PropertyGridSelectedObjectsChanged;
+                    }
+                }
+            }
+
+            collectionForm.Load += CollectionFormLoad;
+            collectionForm.Resize += CollectionFormResize;
+            collectionForm.LocationChanged += CollectionFormLocationChanged;
+
+            return (collectionForm);
+        }
+
+        #region CollectionFormLoad
+
+        void CollectionFormLoad(object sender, EventArgs e)
+        {
+            CollectionForm form = sender as CollectionForm;
+
+            if (form != null)
+            {
+                if (_lastSize != Size.Empty)
+                    form.Size = _lastSize;
+
+                if (_lastLoc != Point.Empty)
+                    form.Location = _lastLoc;
+            }
+        }
+
+        #endregion
+
+        #region CollectionFormResize
+
+        void CollectionFormResize(object sender, EventArgs e)
+        {
+            CollectionForm form = sender as CollectionForm;
+
+            if (form != null && form.Visible == true)
+                _lastSize = form.Size;
+        }
+
+        #endregion
+
+        #region CollectionFormLocationChanged
+
+        void CollectionFormLocationChanged(object sender, EventArgs e)
+        {
+            CollectionForm form = sender as CollectionForm;
+
+            if (form != null && form.Visible == true)
+                _lastLoc = form.Location;
+        }
+
+        #endregion
+
+        #region PropertyGridGotFocus
+
+        void PropertyGridGotFocus(object sender, EventArgs e)
+        {
+            PropertyGrid propertyGrid = sender as PropertyGrid;
+
+            if (propertyGrid != null)
+                UpdateDesignerFocus(propertyGrid);
+        }
+
+        #endregion
+
+        #region PropertyGridSelectedObjectsChanged
+
+        void PropertyGridSelectedObjectsChanged(object sender, EventArgs e)
+        {
+            PropertyGrid propertyGrid = sender as PropertyGrid;
+
+            if (propertyGrid != null)
+                UpdateDesignerFocus(propertyGrid);
+        }
+
+        #endregion
+
+        #region UpdateDesignerFocus
+
+        private void UpdateDesignerFocus(PropertyGrid propertyGrid)
+        {
+            GridContainer row = Context.Instance as GridContainer;
+
+            if (row != null)
+            {
+                GridElement item = propertyGrid.SelectedObject as GridElement;
+
+                if (item != null)
+                    row.SuperGrid.DesignerElement = item;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region CreateCollectionItemType
+
+        protected override Type CreateCollectionItemType()
+        {
+            return typeof(GridColumn);
+        }
+
+        #endregion
+
+        #region CreateNewItemTypes
+
+        protected override Type[] CreateNewItemTypes()
+        {
+            return new Type[]
+            {
+                typeof(GridTextBoxXEditControl),
+                typeof(GridButtonXEditControl),
+                typeof(GridCheckBoxXEditControl),
+                typeof(GridColorPickerEditControl),
+                typeof(GridComboBoxExEditControl),
+                typeof(GridComboTreeEditControl),
+                typeof(GridDateTimeInputEditControl),
+                typeof(GridDateTimePickerEditControl),
+                typeof(GridDoubleInputEditControl),
+                typeof(GridImageEditControl),
+                typeof(GridIntegerInputEditControl),
+                typeof(GridIpAddressInputEditControl),
+                typeof(GridLabelXEditControl),
+                typeof(GridMaskedTextBoxEditControl),
+                typeof(GridMicroChartEditControl),
+                typeof(GridNumericUpDownEditControl),
+                typeof(GridImageEditControl),
+                typeof(GridProgressBarXEditControl),
+                typeof(GridRadialMenuEditControl),
+                typeof(GridRatingStarEditControl),
+                typeof(GridSliderEditControl),
+                typeof(GridSwitchButtonEditControl),
+                typeof(GridTextBoxDropDownEditControl),
+            };
+        }
+
+        #endregion
+
+        #region EditValue
+
+        public override object EditValue(
+            ITypeDescriptorContext context, IServiceProvider provider, object value)
+        {
+            object o = base.EditValue(context, provider, value);
+
+            if (Context != null)
+            {
+                GridPanel panel = Context.Instance as GridPanel;
+
+                if (panel != null)
+                {
+                    if (panel.SuperGrid.DesignerElement is GridColumn)
+                        panel.SuperGrid.DesignerElement = null;
+                }
+            }
+
+            return (o);
+        }
+
+        #endregion
+
+        #region CreateInstance
+
+        protected override object CreateInstance(Type itemType)
+        {
+            GridColumn item = (GridColumn)base.CreateInstance(typeof(GridColumn));
+
+            if (item != null)
+            {
+                item.EditorType = itemType;
+
+                item.Name = GetColumnName(item);
+            }
+
+            return (item);
+        }
+
+        #region GetColumnName
+
+        private string GetColumnName(GridColumn item)
+        {
+            GridPanel panel = Context.Instance as GridPanel;
+
+            if (panel != null)
+            {
+                for (int i = 1; i < 200; i++)
+                {
+                    string s = "Column" + i;
+
+                    if (panel.Columns[s] == null)
+                        return (s);
+                }
+            }
+
+            return (this.GetDisplayText(item));
+        }
+
+        #endregion
+
+        #endregion
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.SuperGrid.Design/GridRowCollectionEditor.cs b/PROMS/DotNetBar Source Code/DevComponents.SuperGrid.Design/GridRowCollectionEditor.cs
new file mode 100644
index 00000000..4c1012a4
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.SuperGrid.Design/GridRowCollectionEditor.cs	
@@ -0,0 +1,311 @@
+using System;
+using System.ComponentModel;
+using System.ComponentModel.Design;
+using System.Drawing;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.SuperGrid;
+
+namespace DevComponents.SuperGrid.Design
+{
+    /// <summary>
+    /// GridRowCollectionEditor
+    /// </summary>
+    public class GridRowCollectionEditor : CollectionEditor
+    {
+        #region Static variables
+
+        static Size _lastSize = Size.Empty;
+        static Point _lastLoc = Point.Empty;
+
+        #endregion
+
+        #region Private variables
+
+        private CollectionForm _CollectionForm;
+        private TableLayoutPanel _LayoutPanel;
+        private PropertyGrid _PropertyGrid;
+
+        #endregion
+
+        public GridRowCollectionEditor(Type type)
+            : base(type)
+        {
+        }
+
+        #region CreateCollectionItemType
+
+        protected override Type CreateCollectionItemType()
+        {
+            return typeof(GridRow);
+        }
+
+        #endregion
+
+        #region CreateCollectionForm
+
+        protected override CollectionForm CreateCollectionForm()
+        {
+            _CollectionForm = base.CreateCollectionForm();
+
+            _LayoutPanel = 
+                _CollectionForm.Controls["overArchingTableLayoutPanel"] as TableLayoutPanel;
+
+            if (_LayoutPanel != null)
+            {
+                _PropertyGrid =
+                    _LayoutPanel.Controls["propertyBrowser"] as PropertyGrid;
+
+                if (_PropertyGrid != null)
+                {
+                    _PropertyGrid.HelpVisible = true;
+
+                    _PropertyGrid.GotFocus += PropertyGridGotFocus;
+                    _PropertyGrid.SelectedObjectsChanged += PropertyGridSelectedObjectsChanged;
+                }
+            }
+
+            _CollectionForm.Load += CollectionFormLoad;
+            _CollectionForm.Resize += CollectionFormResize;
+            _CollectionForm.LocationChanged += CollectionFormLocationChanged;
+
+            return (_CollectionForm);
+        }
+
+        #region CollectionFormLoad
+
+        void CollectionFormLoad(object sender, EventArgs e)
+        {
+            CollectionForm form = sender as CollectionForm;
+
+            if (form != null)
+            {
+                if (_lastSize != Size.Empty)
+                    form.Size = _lastSize;
+
+                if (_lastLoc != Point.Empty)
+                    form.Location = _lastLoc;
+            }
+        }
+
+        #endregion
+
+        #region CollectionFormResize
+
+        void CollectionFormResize(object sender, EventArgs e)
+        {
+            CollectionForm form = sender as CollectionForm;
+
+            if (form != null && form.Visible == true)
+                _lastSize = form.Size;
+        }
+
+        #endregion
+
+        #region CollectionFormLocationChanged
+
+        void CollectionFormLocationChanged(object sender, EventArgs e)
+        {
+            CollectionForm form = sender as CollectionForm;
+
+            if (form != null && form.Visible == true)
+                _lastLoc = form.Location;
+        }
+
+        #endregion
+
+        #region PropertyGridGotFocus
+
+        void PropertyGridGotFocus(object sender, EventArgs e)
+        {
+            UpdateDesignerFocus();
+            
+            _LayoutPanel.Controls[4].Refresh();
+        }
+
+        #endregion
+
+        #region PropertyGridSelectedObjectsChanged
+
+        void PropertyGridSelectedObjectsChanged(object sender, EventArgs e)
+        {
+            UpdateDesignerFocus();
+        }
+
+        #endregion
+
+        #region UpdateDesignerFocus
+
+        private void UpdateDesignerFocus()
+        {
+            if (_PropertyGrid != null)
+            {
+                GridContainer row = Context.Instance as GridContainer;
+
+                if (row != null)
+                {
+                    GridElement item = _PropertyGrid.SelectedObject as GridElement;
+
+                    if (item != null)
+                        row.SuperGrid.DesignerElement = item;
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region CreateNewItemTypes
+
+        protected override Type[] CreateNewItemTypes()
+        {
+            GridPanel panel = Context.Instance as GridPanel;
+
+            if (panel == null)
+            {
+                return new Type[]
+                {
+                    typeof (GridRow),
+                    typeof (GridPanel),
+                };
+            }
+
+            return (base.CreateNewItemTypes());
+        }
+
+        #endregion
+
+        #region EditValue
+
+        public override object EditValue(
+            ITypeDescriptorContext context, IServiceProvider provider, object value)
+        {
+            object o;
+
+            if (_CollectionForm != null && _CollectionForm.Visible)
+            {
+                GridRowCollectionEditor editor =
+                   new GridRowCollectionEditor(this.CollectionType);
+
+                o = editor.EditValue(context, provider, value);
+            }
+            else
+            {
+                o = base.EditValue(context, provider, value);
+
+                GridPanel panel = Context.Instance as GridPanel;
+
+                if (panel != null && panel.Parent == null)
+                    panel.SuperGrid.DesignerElement = null;
+            }
+
+            return (o);
+        }
+
+        #endregion
+
+        #region CreateInstance
+
+        protected override object CreateInstance(Type itemType)
+        {
+            object o = base.CreateInstance(itemType);
+
+            GridContainer crow = Context.Instance as GridContainer;
+
+            if (crow != null)
+            {
+                IDesignerHost dh = (IDesignerHost)GetService(typeof(IDesignerHost));
+
+                crow.Expanded = true;
+
+                GridPanel cpanel = crow.GridPanel;
+
+                GridRow row = o as GridRow;
+
+                if (row != null)
+                {
+                    if (cpanel.Columns.Count == 0)
+                    {
+                        if (dh != null)
+                        {
+                            GridColumn col = dh.CreateComponent(typeof(GridColumn)) as GridColumn;
+
+                            if (col != null)
+                            {
+                                col.Name = "Column1";
+                                cpanel.Columns.Add(col);
+
+                                GridCell cell = dh.CreateComponent(typeof(GridCell)) as GridCell;
+
+                                if (cell != null)
+                                    row.Cells.Add(cell);
+
+                                row.InvalidateRender();
+                            }
+                        }
+                    }
+                }
+                else
+                {
+                    GridPanel panel = o as GridPanel;
+
+                    if (panel != null)
+                    {
+                        if (cpanel != null)
+                        {
+                            panel.Name = GetPanelName(cpanel);
+
+                            if (dh != null)
+                            {
+                                GridColumn col = dh.CreateComponent(typeof(GridColumn)) as GridColumn;
+
+                                col.Name = "Column1";
+                                panel.Columns.Add(col);
+                            }
+                        }
+                    }
+                }
+            }
+
+            return (o);
+        }
+
+        #region GetPanelName
+
+        private string GetPanelName(GridPanel panel)
+        {
+            for (int i = 1; i < 200; i++)
+            {
+                string s = "GridPanel" + i;
+
+                if (UnusedPanelName(panel, s) == true)
+                    return (s);
+            }
+
+            return ("GridPanel");
+        }
+
+        #region UnusedPanelName
+
+        private bool UnusedPanelName(GridPanel panel, string s)
+        {
+            foreach (GridContainer row in panel.Rows)
+            {
+                if (row is GridPanel)
+                {
+                    if (s.Equals(((GridPanel) row).Name) == true)
+                        return (false);
+                }
+            }
+
+            return (true);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.SuperGrid.Design/ImageIndexEditor.cs b/PROMS/DotNetBar Source Code/DevComponents.SuperGrid.Design/ImageIndexEditor.cs
new file mode 100644
index 00000000..25e1e863
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.SuperGrid.Design/ImageIndexEditor.cs	
@@ -0,0 +1,124 @@
+using System;
+using System.ComponentModel.Design;
+using System.Drawing;
+using System.Drawing.Design;
+using System.ComponentModel;
+using System.Windows.Forms;
+using System.Windows.Forms.Design;
+using DevComponents.DotNetBar.Controls;
+using DevComponents.DotNetBar.SuperGrid;
+
+namespace DevComponents.SuperGrid.Design
+{
+	/// <summary>
+	/// Represents the class used for picking an image from image list
+	/// </summary>
+	public class ImageIndexEditor : UITypeEditor
+    {
+        #region Private variables
+
+        private ImageList _ImageList;
+
+        #endregion
+
+        #region GetEditStyle
+
+        public override UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext context)
+        {
+            if (context != null)
+                 _ImageList = GetImageList(context);
+
+            return (UITypeEditorEditStyle.DropDown);
+        }
+
+        #region GetImageList
+
+        private ImageList GetImageList(ITypeDescriptorContext context)
+        {
+            IReferenceService r = (IReferenceService)context.GetService(typeof(IReferenceService));
+
+            object[] objs = r.GetReferences(typeof(GridPanel));
+
+            if (objs.Length > 0)
+            {
+                GridPanel panel = (GridPanel)objs[0];
+                GridElement item = panel.SuperGrid.DesignerElement;
+
+                if (item != null)
+                    return (item.GridPanel.ImageList);
+
+                return (panel.ImageList);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetPaintValueSupported
+
+        public override bool GetPaintValueSupported(ITypeDescriptorContext context)
+		{
+			return (true);
+        }
+
+        #endregion
+
+        #region PaintValue
+
+        public override void PaintValue(PaintValueEventArgs e)
+        {
+            if (e.Value != null)
+            {
+                Image img = GetImage((int)e.Value);
+
+                if (img != null)
+                    e.Graphics.DrawImage(img, e.Bounds);
+            }
+        }
+
+        #region GetImage
+
+        private Image GetImage(int index)
+        {
+            if (_ImageList != null && (uint)index < _ImageList.Images.Count)
+                return (_ImageList.Images[index]);
+
+            return (null);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region EditValue
+
+        public override object EditValue(
+            ITypeDescriptorContext context, IServiceProvider provider, object value)
+        {
+            IWindowsFormsEditorService editorService =
+                provider.GetService(typeof (IWindowsFormsEditorService)) as IWindowsFormsEditorService;
+
+            if (editorService != null && value is int)
+            {
+                ImageIndexTypeDropDown dd = new
+                    ImageIndexTypeDropDown((int)value, _ImageList, editorService, context);
+
+                dd.EscapePressed = false;
+
+                editorService.DropDownControl(dd);
+
+                if (dd.EscapePressed == true)
+                    context.PropertyDescriptor.SetValue(context.Instance, value);
+                else
+                    return (dd.Value);
+            }
+
+            return (base.EditValue(context, provider, value));
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.SuperGrid.Design/ImageIndexTypeDropDown.Designer.cs b/PROMS/DotNetBar Source Code/DevComponents.SuperGrid.Design/ImageIndexTypeDropDown.Designer.cs
new file mode 100644
index 00000000..2fb50957
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.SuperGrid.Design/ImageIndexTypeDropDown.Designer.cs	
@@ -0,0 +1,47 @@
+namespace DevComponents.SuperGrid.Design
+{
+    partial class ImageIndexTypeDropDown
+    {
+        /// <summary> 
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #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.SuspendLayout();
+            // 
+            // ImageIndexTypeDropDown
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.Name = "ImageIndexTypeDropDown";
+            this.Size = new System.Drawing.Size(132, 78);
+            this.PreviewKeyDown += new System.Windows.Forms.PreviewKeyDownEventHandler(this.DropDownPreviewKeyDown);
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.SuperGrid.Design/ImageIndexTypeDropDown.cs b/PROMS/DotNetBar Source Code/DevComponents.SuperGrid.Design/ImageIndexTypeDropDown.cs
new file mode 100644
index 00000000..584b246e
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.SuperGrid.Design/ImageIndexTypeDropDown.cs	
@@ -0,0 +1,155 @@
+using System;
+using System.ComponentModel;
+using System.Windows.Forms;
+using System.Windows.Forms.Design;
+
+namespace DevComponents.SuperGrid.Design
+{
+    [ToolboxItem(false)]
+    public partial class ImageIndexTypeDropDown : UserControl
+    {
+        #region Private variables
+
+        private int _Value;
+        private bool _EscapePressed;
+        private ImageList _ImageList;
+        private ImageListBox _ListBox;
+
+        private IWindowsFormsEditorService _EditorService;
+        private ITypeDescriptorContext _Context;
+
+        #endregion
+
+        public ImageIndexTypeDropDown(int value, ImageList imageList,
+            IWindowsFormsEditorService editorService, ITypeDescriptorContext context)
+        {
+            _EditorService = editorService;
+            _Context = context;
+            _Value = value;
+            _ImageList = imageList;
+
+            Initialize();
+        }
+
+        public ImageIndexTypeDropDown()
+        {
+            Initialize();
+        }
+
+        #region Initialize
+
+        private void Initialize()
+        {
+            InitializeComponent();
+
+            SetStyle(ControlStyles.UserPaint, true);
+            SetStyle(ControlStyles.AllPaintingInWmPaint, true);
+            SetStyle(ControlStyles.OptimizedDoubleBuffer, true);
+
+            if (_ImageList != null)
+            {
+                _ListBox = new ImageListBox();
+
+                Controls.Add(_ListBox);
+
+                _ListBox.MouseClick += ListBoxMouseClick;
+                _ListBox.SelectedIndexChanged += ListBoxSelectedIndexChanged;
+                _ListBox.ImageList = _ImageList;
+                _ListBox.BorderStyle = BorderStyle.None;
+                _ListBox.Dock = DockStyle.Fill;
+
+                for (int i = 0; i < _ImageList.Images.Count; i++)
+                {
+                    ImageListBoxItem item =
+                        new ImageListBoxItem(i.ToString(), i);
+
+                    _ListBox.Items.Add(item);
+                }
+
+                _ListBox.Items.Add(new ImageListBoxItem("(none)", _ImageList.Images.Count));
+
+                int index = Value;
+
+                _ListBox.SelectedIndex =
+                    (index >= 0 && index < _ImageList.Images.Count)
+                    ? index : _ImageList.Images.Count;
+
+                Size = _ListBox.PreferredSize;
+            }
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region EditorService
+
+        public IWindowsFormsEditorService EditorService
+        {
+            get { return (_EditorService); }
+            set { _EditorService = value; }
+        }
+
+        #endregion
+
+        #region EscapePressed
+
+        public bool EscapePressed
+        {
+            get { return (_EscapePressed); }
+            set { _EscapePressed = value; }
+        }
+
+        #endregion
+
+        #region Value
+
+        public int Value
+        {
+            get { return (_Value); }
+
+            set
+            {
+                _Value = value;
+
+                _Context.OnComponentChanging();
+                _Context.PropertyDescriptor.SetValue(_Context.Instance, value);
+                _Context.OnComponentChanged();
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region DropDownPreviewKeyDown
+
+        private void DropDownPreviewKeyDown(object sender, PreviewKeyDownEventArgs e)
+        {
+            if (e.KeyCode == Keys.Escape)
+                _EscapePressed = true;
+        }
+
+        #endregion
+
+        #region ListBoxMouseClick
+
+        private void ListBoxMouseClick(object sender, MouseEventArgs e)
+        {
+            _EditorService.CloseDropDown();
+        }
+
+        #endregion
+
+        #region ListBoxSelectedIndexChanged
+
+        protected virtual void ListBoxSelectedIndexChanged(object sender, EventArgs e)
+        {
+            int index = _ListBox.SelectedIndex;
+
+            Value = (index >= _ImageList.Images.Count ? -1 : index);
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.SuperGrid.Design/ImageIndexTypeDropDown.resx b/PROMS/DotNetBar Source Code/DevComponents.SuperGrid.Design/ImageIndexTypeDropDown.resx
new file mode 100644
index 00000000..19dc0dd8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.SuperGrid.Design/ImageIndexTypeDropDown.resx	
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DevComponents.SuperGrid.Design/ImageListBox.cs b/PROMS/DotNetBar Source Code/DevComponents.SuperGrid.Design/ImageListBox.cs
new file mode 100644
index 00000000..605fb5ed
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.SuperGrid.Design/ImageListBox.cs	
@@ -0,0 +1,143 @@
+using System.ComponentModel;
+using System.Drawing;
+using System.Windows.Forms;
+
+namespace DevComponents.SuperGrid.Design
+{
+    [ToolboxItem(false)]
+    public class ImageListBox : ListBox
+    {
+        #region Private variables
+
+        private ImageList _ImageList;
+
+        #endregion
+
+        public ImageListBox()
+        {
+            MinimumSize = new Size(20, 20);
+            IntegralHeight = true;
+
+            DrawMode = DrawMode.OwnerDrawVariable;
+        }
+
+        #region Public properties
+
+        public ImageList ImageList
+        {
+            get { return (_ImageList); }
+            set { _ImageList = value; }
+        }
+
+        #endregion
+
+        #region OnMeasureItem
+
+        protected override void OnMeasureItem(MeasureItemEventArgs e)
+        {
+            base.OnMeasureItem(e);
+
+            e.ItemWidth += 22;
+
+            if (e.ItemHeight < 20)
+                e.ItemHeight = 20;
+        }
+
+        #endregion
+
+        #region OnDrawItem
+
+        protected override void OnDrawItem(DrawItemEventArgs e)
+        {
+            Graphics g = e.Graphics;
+
+            e.DrawBackground();
+
+            if (e.Index < Items.Count)
+            {
+                Rectangle r = e.Bounds;
+                r.Width = 18;
+
+                if (r.Height > 18)
+                {
+                    r.Y += (r.Height - 18)/2;
+                    r.Height = 18;
+                }
+
+                ImageListBoxItem item = (ImageListBoxItem) Items[e.Index];
+
+                Image image = (uint) item.ImageIndex < _ImageList.Images.Count
+                                  ? _ImageList.Images[item.ImageIndex]
+                                  : null;
+
+                if (image != null)
+                    g.DrawImage(image, r);
+
+                g.DrawRectangle(Pens.Black, r);
+
+                using (Brush br = new SolidBrush(e.ForeColor))
+                {
+                    using (StringFormat sf = new StringFormat())
+                    {
+                        sf.Alignment = StringAlignment.Near;
+                        sf.LineAlignment = StringAlignment.Center;
+
+                        r = e.Bounds;
+                        r.X += 30;
+                        r.Width -= 30;
+
+                        g.DrawString(item.Text, e.Font, br, r, sf);
+                    }
+                }
+            }
+        }
+
+        #endregion
+    }
+
+    public class ImageListBoxItem
+    {
+        #region Private variables
+
+        private string _Text;
+        private int _ImageIndex;
+
+        #endregion
+
+        #region Constructors
+
+        public ImageListBoxItem(string text, int index)
+        {
+            Text = text;
+            ImageIndex = index;
+        }
+
+        public ImageListBoxItem(string text)
+            : this(text, -1)
+        {
+        }
+
+        public ImageListBoxItem()
+            : this("", -1)
+        {
+        }
+
+        #endregion
+
+        #region Public properties
+
+        public int ImageIndex
+        {
+            get { return (_ImageIndex); }
+            set { _ImageIndex = value; }
+        }
+
+        public string Text
+        {
+            get { return (_Text); }
+            set { _Text = value; }
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.SuperGrid.Design/SuperGridActionList.cs b/PROMS/DotNetBar Source Code/DevComponents.SuperGrid.Design/SuperGridActionList.cs
new file mode 100644
index 00000000..1ae72d4d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.SuperGrid.Design/SuperGridActionList.cs	
@@ -0,0 +1,401 @@
+using System;
+using System.ComponentModel;
+using System.ComponentModel.Design;
+using System.Data;
+using System.Data.SqlTypes;
+using System.Drawing.Design;
+using System.Windows.Forms;
+using System.Windows.Forms.Design;
+using DevComponents.DotNetBar.Controls;
+using DevComponents.DotNetBar.SuperGrid;
+
+namespace DevComponents.SuperGrid.Design
+{
+    public class SuperGridActionList : DesignerActionList,
+        ITypeDescriptorContext, IWindowsFormsEditorService, IServiceProvider
+    {
+        #region Private variables
+
+        private SuperGridControl _SuperGrid;
+
+        private PropertyDescriptor _PropertyDescriptor;
+        private IComponentChangeService _ChangeService;
+
+        private IDesignerHost dh;
+
+        #endregion
+
+        /// <summary>
+        /// SuperGridActionList
+        /// </summary>
+        /// <param name="superGrid">Associated SuperGridControl</param>
+        public SuperGridActionList(SuperGridControl superGrid)
+            : base(superGrid)
+        {
+            _SuperGrid = superGrid;
+
+            _ChangeService = Component.Site.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets or sets the GridPanel DataSource
+        /// </summary>
+        [AttributeProvider(typeof(IListSource))]
+        public object DataSource
+        {
+            get { return (_SuperGrid.PrimaryGrid.DataSource); }
+            set { SetValue("DataSource", value); }
+        }
+
+        /// <summary>
+        /// Gets or sets whether rows can be deleted
+        /// </summary>
+        public bool AllowRowDelete
+        {
+            get { return (_SuperGrid.PrimaryGrid.AllowRowDelete); }
+            set { SetValue("AllowRowDelete", value); }
+        }
+
+        /// <summary>
+        /// Gets or sets whether rows can be Inserted
+        /// </summary>
+        public bool AllowRowInsert
+        {
+            get { return (_SuperGrid.PrimaryGrid.AllowRowInsert); }
+            set { SetValue("AllowRowInsert", value); }
+        }
+
+        /// <summary>
+        /// Gets or sets whether the Insert Row is displayed at runtime
+        /// </summary>
+        public bool ShowInsertRow
+        {
+            get { return (_SuperGrid.PrimaryGrid.ShowInsertRow); }
+            set { SetValue("ShowInsertRow", value); }
+        }
+
+        /// <summary>
+        /// Gets or sets which Grid Lines are displayed
+        /// </summary>
+        public GridLines GridLines
+        {
+            get { return (_SuperGrid.PrimaryGrid.GridLines); }
+            set { SetValue("GridLines", value); }
+        }
+
+        /// <summary>
+        /// Gets or sets whether Tree Lines are displayed
+        /// </summary>
+        public bool ShowTreeLines
+        {
+            get { return (_SuperGrid.PrimaryGrid.ShowTreeLines); }
+            set { SetValue("ShowTreeLines", value); }
+        }
+
+        /// <summary>
+        /// Gets or sets whether Tree Buttons are displayed
+        /// </summary>
+        public bool ShowTreeButtons
+        {
+            get { return (_SuperGrid.PrimaryGrid.ShowTreeButtons); }
+            set { SetValue("ShowTreeButtons", value); }
+        }
+
+        /// <summary>
+        /// Gets or sets whether to use the Alternate Row Style
+        /// </summary>
+        public bool UseAlternateRowStyle
+        {
+            get { return (_SuperGrid.PrimaryGrid.UseAlternateRowStyle); }
+            set { SetValue("UseAlternateRowStyle", value); }
+        }
+
+        /// <summary>
+        /// Gets or sets whether to use the Alternate Column Style
+        /// </summary>
+        public bool UseAlternateColumnStyle
+        {
+            get { return (_SuperGrid.PrimaryGrid.UseAlternateColumnStyle); }
+            set { SetValue("UseAlternateColumnStyle", value); }
+        }
+
+        /// <summary>
+        /// Gets or sets whether to allow multi selection
+        /// </summary>
+        public bool MultiSelect
+        {
+            get { return (_SuperGrid.PrimaryGrid.MultiSelect); }
+            set { SetValue("MultiSelect", value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the selection granularity
+        /// </summary>
+        public SelectionGranularity SelectionGranularity
+        {
+            get { return (_SuperGrid.PrimaryGrid.SelectionGranularity); }
+            set { SetValue("SelectionGranularity", value); }
+        }
+
+        #endregion
+
+        #region SetValue
+
+        private void SetValue(string property, object value)
+        {
+            _ChangeService.OnComponentChanging(_SuperGrid.PrimaryGrid, null);
+
+            GetPrimaryGridPropertyByName(property).SetValue(_SuperGrid.PrimaryGrid, value);
+
+            _ChangeService.OnComponentChanged(_SuperGrid.PrimaryGrid, null, null, null);
+        }
+
+        #endregion
+
+        #region GetPrimaryGridPropertyByName
+
+        /// <summary>
+        /// Gets the PrimaryGrid property via the given name
+        /// </summary>
+        /// <param name="propName">Property name</param>
+        /// <returns>PropertyDescriptor</returns>
+        private PropertyDescriptor GetPrimaryGridPropertyByName(string propName)
+        {
+            PropertyDescriptor prop =
+                TypeDescriptor.GetProperties(_SuperGrid.PrimaryGrid)[propName];
+
+            if (prop == null)
+                throw new ArgumentException("Matching property not found.", propName);
+
+            return (prop);
+        }
+
+        #endregion
+
+        #region GetSortedActionItems
+
+        /// <summary>
+        /// Gets the SortedActionItems
+        /// </summary>
+        /// <returns>DesignerActionItemCollection</returns>
+        public override DesignerActionItemCollection GetSortedActionItems()
+        {
+            DesignerActionItemCollection items = new DesignerActionItemCollection();
+
+            items.Add(new DesignerActionPropertyItem("DataSource", "Data Source",
+                "Data", "Sets the GridPanel Data Source."));
+
+            items.Add(new DesignerActionPropertyItem("AllowRowDelete", "Allow Row Delete",
+                "User Interaction", "Determines whether rows can be deleted."));
+
+            items.Add(new DesignerActionPropertyItem("AllowRowInsert", "Allow Row Insert",
+                "User Interaction", "Determines whether rows can be inserted."));
+
+            items.Add(new DesignerActionPropertyItem("ShowInsertRow", "Show Insert Row",
+                "User Interaction", "Determines whether the InsertRow is shown at runtime."));
+
+            items.Add(new DesignerActionPropertyItem("GridLines", "Grid Lines",
+                "Appearance", "Determines which Grid Lines are displayed."));
+
+            items.Add(new DesignerActionPropertyItem("ShowTreeLines", "Show Tree Lines",
+                "Appearance", "Determines whether Tree Lines are displayed."));
+
+            items.Add(new DesignerActionPropertyItem("ShowTreeButtons", "Show Tree Buttons",
+                "Appearance", "Determines whether Tree Buttons are displayed."));
+
+            items.Add(new DesignerActionPropertyItem("UseAlternateColumnStyle", "Use Alternate Column Style",
+                "Style", "Determines whether to use the defined Alternate Column Style."));
+
+            items.Add(new DesignerActionPropertyItem("UseAlternateRowStyle", "Use Alternate Row Style",
+                "Style", "Determines whether to use the defined Alternate Row Style."));
+
+            items.Add(new DesignerActionPropertyItem("SelectionGranularity", "Selection Granularity",
+                "Behavior", "Determines user selection granularity."));
+
+            items.Add(new DesignerActionPropertyItem("MultiSelect", "Enable Multi Selection",
+                "Behavior", "Determines whether Multi Selection is enabled."));
+
+            if (DataSource != null)
+            {
+                items.Add(new DesignerActionMethodItem(this, "GenBoundColumns", "Generate Bound Columns",
+                    "Data1", "Clears all previous bound column definitions and\r\ngenerates new column definitions from current DataSource."));
+            }
+
+            items.Add(new DesignerActionMethodItem(this, "EditColumns", "Edit Columns...", "Data2"));
+            items.Add(new DesignerActionMethodItem(this, "EditRows", "Edit Rows...", "Data2"));
+
+            return (items);
+        }
+
+        #endregion
+
+        #region EditColumns
+
+        /// <summary>
+        /// EditColumns
+        /// </summary>
+        private void EditColumns()
+        {
+            _PropertyDescriptor = TypeDescriptor.GetProperties(_SuperGrid.PrimaryGrid)["Columns"];
+
+            UITypeEditor editor = (UITypeEditor)_PropertyDescriptor.GetEditor(typeof(UITypeEditor));
+
+            if (editor != null)
+                editor.EditValue(this, this, _SuperGrid.PrimaryGrid.Columns);
+        }
+
+        #endregion
+
+        #region EditRows
+
+        /// <summary>
+        /// EditRows
+        /// </summary>
+        private void EditRows()
+        {
+            _PropertyDescriptor = TypeDescriptor.GetProperties(_SuperGrid.PrimaryGrid)["Rows"];
+
+            UITypeEditor editor = (UITypeEditor)_PropertyDescriptor.GetEditor(typeof(UITypeEditor));
+
+            if (editor != null)
+                editor.EditValue(this, this, _SuperGrid.PrimaryGrid.Rows);
+        }
+
+        #endregion
+
+        #region GenBoundColumns
+
+        /// <summary>
+        /// GenBoundColumns
+        /// </summary>
+        private void GenBoundColumns()
+        {
+            dh =  (IDesignerHost)GetService(typeof(IDesignerHost));
+
+            if (dh != null)
+            {
+                DesignerTransaction dt = dh.CreateTransaction();
+
+                try
+                {
+                    IComponentChangeService change =
+                        GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+
+                    if (change != null)
+                    {
+                        change.OnComponentChanging(Component, null);
+
+                        GridColumnCollection colc = _SuperGrid.PrimaryGrid.Columns;
+
+                        _SuperGrid.PrimaryGrid.GenerateColumns(CreateGridColumn);
+
+                        GridColumnCollection cc = _SuperGrid.PrimaryGrid.Columns;
+
+                        for (int i = cc.Count - 1; i >= 0; i--)
+                        {
+                            GridColumn col = cc[i];
+
+                            if (string.IsNullOrEmpty(col.DataPropertyName) == false && col.IsDataBound == false)
+                                cc.RemoveAt(i);
+                        }
+
+                        change.OnComponentChanged(Component, null, null, null);
+                    }
+                }
+                catch
+                {
+                    dt.Cancel();
+                }
+                finally
+                {
+                    if (dt.Canceled == false)
+                        dt.Commit();
+                }
+            }
+
+        }
+
+        #region CreateGridColumn
+
+        private GridColumn CreateGridColumn()
+        {
+            if (dh != null)
+                return (dh.CreateComponent(typeof(GridColumn)) as GridColumn);
+
+            return (null);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ITypeDescriptorContext Members
+
+        public IContainer Container
+        {
+            get { return (Component.Site.Container); }
+        }
+
+        public object Instance
+        {
+            get { return (Component); }
+        }
+
+        public void OnComponentChanged()
+        {
+            object value = _SuperGrid.PrimaryGrid.Columns;
+
+            _ChangeService.OnComponentChanged(Component, _PropertyDescriptor, value, value);
+        }
+
+        public bool OnComponentChanging()
+        {
+            if (Component is SuperGridControl)
+                _ChangeService.OnComponentChanging(((SuperGridControl)Component).PrimaryGrid, _PropertyDescriptor);
+            else
+                _ChangeService.OnComponentChanging(Component, _PropertyDescriptor);
+
+            return true;
+        }
+
+        public PropertyDescriptor PropertyDescriptor
+        {
+            get { return (_PropertyDescriptor); }
+        }
+
+        #endregion
+
+        #region IWindowsFormsEditorService Members
+
+        public void CloseDropDown()
+        {
+            throw new Exception("The method or operation is not implemented.");
+        }
+
+        public void DropDownControl(Control control)
+        {
+            throw new Exception("The method or operation is not implemented.");
+        }
+
+        public DialogResult ShowDialog(Form dialog)
+        {
+            return (dialog.ShowDialog());
+        }
+
+        #endregion
+
+        #region IServiceProvider
+
+        object IServiceProvider.GetService(Type serviceType)
+        {
+            if (serviceType.Equals(typeof(IWindowsFormsEditorService)))
+                return (this);
+
+            return GetService(serviceType);
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.SuperGrid.Design/SuperGridDesignTime.csproj b/PROMS/DotNetBar Source Code/DevComponents.SuperGrid.Design/SuperGridDesignTime.csproj
new file mode 100644
index 00000000..bc1decc8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.SuperGrid.Design/SuperGridDesignTime.csproj	
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{D06A8233-416A-4547-BFF6-7A26345B7396}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>DevComponents.SuperGrid.Design</RootNamespace>
+    <AssemblyName>DevComponents.SuperGrid.Design</AssemblyName>
+    <StartupObject>
+    </StartupObject>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>SuperGridDesignTime.snk</AssemblyOriginatorKeyFile>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>2.0</OldToolsVersion>
+    <UpgradeBackupLocation />
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE;SUPERGRID</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <DocumentationFile>
+    </DocumentationFile>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseTrial|AnyCPU' ">
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE;SUPERGRID;TRIAL</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+  <ItemGroup>
+    <Compile Include="BoolValueTypeDropDown.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="ColumnGroupHeaderCollectionEditor.cs" />
+    <Compile Include="ColumnListTypeEditor.cs" />
+    <Compile Include="ImageIndexTypeDropDown.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="ImageIndexTypeDropDown.Designer.cs">
+      <DependentUpon>ImageIndexTypeDropDown.cs</DependentUpon>
+    </Compile>
+    <Compile Include="ImageIndexEditor.cs">
+    </Compile>
+    <Compile Include="ImageListBox.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SuperGridActionList.cs" />
+    <Compile Include="SuperGridDesigner.cs" />
+    <Compile Include="ValueTypeDropDown.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="ValueTypeDropDown.Designer.cs">
+      <DependentUpon>ValueTypeDropDown.cs</DependentUpon>
+    </Compile>
+    <Compile Include="ValueTypeEditor.cs" />
+    <Compile Include="GridCellCollectionEditor.cs" />
+    <Compile Include="GridRowCollectionEditor.cs" />
+    <Compile Include="GridColumnCollectionEditor.cs" />
+    <Compile Include="EditTypeDropDown.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="EditTypeDropDown.Designer.cs">
+      <DependentUpon>EditTypeDropDown.cs</DependentUpon>
+    </Compile>
+    <Compile Include="EditTypeEditor.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\DevComponents.DotNetBar.SuperGrid\SuperGrid.csproj">
+      <Project>{A344305F-D2E2-4350-B61E-D7277959A5B4}</Project>
+      <Name>SuperGrid</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\DotNetBar.csproj">
+      <Project>{36546CE3-335C-4AB6-A2F3-40F8C818BC66}</Project>
+      <Name>DotNetBar</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Design" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Drawing.Design" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.XML" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="SuperGridDesignTime.snk" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="ImageIndexTypeDropDown.resx">
+      <DependentUpon>ImageIndexTypeDropDown.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="ValueTypeDropDown.resx">
+      <DependentUpon>ValueTypeDropDown.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="EditTypeDropDown.resx">
+      <DependentUpon>EditTypeDropDown.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+      <Visible>False</Visible>
+      <ProductName>Windows Installer 3.1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DevComponents.SuperGrid.Design/SuperGridDesignTime.snk b/PROMS/DotNetBar Source Code/DevComponents.SuperGrid.Design/SuperGridDesignTime.snk
new file mode 100644
index 00000000..d9c2a028
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DevComponents.SuperGrid.Design/SuperGridDesignTime.snk differ
diff --git a/PROMS/DotNetBar Source Code/DevComponents.SuperGrid.Design/SuperGridDesigner.cs b/PROMS/DotNetBar Source Code/DevComponents.SuperGrid.Design/SuperGridDesigner.cs
new file mode 100644
index 00000000..5e9484a2
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.SuperGrid.Design/SuperGridDesigner.cs	
@@ -0,0 +1,278 @@
+using System.ComponentModel;
+using System.ComponentModel.Design;
+using System.Drawing;
+using System.Windows.Forms;
+using System.Windows.Forms.Design;
+using DevComponents.DotNetBar.Controls;
+using DevComponents.DotNetBar.SuperGrid;
+using System;
+using System.Collections;
+
+namespace DevComponents.SuperGrid.Design
+{
+    /// <summary>
+    /// SuperGridDesigner
+    /// </summary>
+    public class SuperGridDesigner : ControlDesigner
+    {
+        #region Private variables
+
+        private SuperGridControl _SuperGrid;
+        private DesignerActionListCollection _ActionLists;
+
+        #endregion
+
+        #region Initialize
+
+        /// <summary>
+        /// Initializes our designer
+        /// </summary>
+        /// <param name="component"></param>
+        public override void Initialize(IComponent component)
+        {
+            base.Initialize(component);
+
+            if (component.Site.DesignMode == true)
+                _SuperGrid = component as SuperGridControl;
+				
+#if !TRIAL
+            IDesignerHost dh = this.GetService(typeof(IDesignerHost)) as IDesignerHost;
+            if (dh != null)
+                dh.LoadComplete += new EventHandler(DesignerLoadComplete);
+#endif
+
+            // If our component is removed we need to clean-up
+            IComponentChangeService cc = (IComponentChangeService)GetService(typeof(IComponentChangeService));
+
+            if (cc != null)
+                cc.ComponentRemoving += new ComponentEventHandler(OnComponentRemoving);
+        }
+
+        #endregion
+
+        #region Dispose
+
+        protected override void Dispose(bool disposing)
+        {
+            // If our component is removed we need to clean-up
+            IComponentChangeService cc = (IComponentChangeService)GetService(typeof(IComponentChangeService));
+
+            if (cc != null)
+                cc.ComponentRemoving -= new ComponentEventHandler(OnComponentRemoving);
+        }
+
+        #endregion
+
+        #region Verbs
+
+        /// <summary>
+        /// Creates our verb collection
+        /// </summary>
+        public override DesignerVerbCollection Verbs
+        {
+            get
+            {
+                DesignerVerb[] verbs = new DesignerVerb[]
+                {
+                    //new DesignerVerb("KnobStyle 1", SetStyle1),
+                    //new DesignerVerb("KnobStyle 2", SetStyle2),
+                    //new DesignerVerb("KnobStyle 3", SetStyle3),
+                    //new DesignerVerb("KnobStyle 4", SetStyle4),
+                };
+
+                return (new DesignerVerbCollection(verbs));
+            }
+        }
+
+        #endregion
+
+        #region ActionLists
+
+        /// <summary>
+        /// Gets our DesignerActionListCollection list
+        /// </summary>
+        public override DesignerActionListCollection ActionLists
+        {
+            get
+            {
+                if (_ActionLists == null)
+                {
+                    _ActionLists = new DesignerActionListCollection();
+
+                    _ActionLists.Add(new SuperGridActionList(_SuperGrid));
+                }
+
+                return (_ActionLists);
+            }
+        }
+
+        #endregion
+
+        #region OnSetCursor
+
+        protected override void OnSetCursor()
+        {
+            if (InScrollBar(Control.MousePosition) == true)
+                Cursor.Current = Cursors.Default;
+
+            base.OnSetCursor();
+        }
+
+        #region InScrollBar
+
+        private bool InScrollBar(Point point)
+        {
+            if (_SuperGrid != null)
+            {
+                Point pt = _SuperGrid.PointToClient(point);
+
+                if (_SuperGrid.HScrollBar.Visible)
+                {
+                    if (_SuperGrid.HScrollBar.Bounds.Contains(pt))
+                        return (true);
+                }
+
+                if (_SuperGrid.VScrollBar.Visible)
+                {
+                    if (_SuperGrid.VScrollBar.Bounds.Contains(pt))
+                        return (true);
+                }
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region OnComponentRemoving
+
+        /// <summary>Called when component is about to be removed from designer.</summary>
+        /// <param name="sender">Event sender.</param>
+        /// <param name="e">Event arguments.</param>
+        public void OnComponentRemoving(object sender, ComponentEventArgs e)
+        {
+            if (e.Component == this.Component)
+            {
+                IDesignerHost dh = (IDesignerHost)GetService(typeof(IDesignerHost));
+
+                if (dh == null)
+                    return;
+
+                ArrayList list = new ArrayList(AssociatedComponents);
+
+                foreach (IComponent c in list)
+                    dh.DestroyComponent(c);
+            }
+        }
+
+        #endregion
+
+        #region AssociatedComponents
+
+        /// <summary>
+        /// Returns all components associated with this control
+        /// </summary>
+        public override ICollection AssociatedComponents
+        {
+            get
+            {
+                ArrayList c = new ArrayList(base.AssociatedComponents);
+
+                SuperGridControl sg = Control as SuperGridControl;
+
+                if (sg != null)
+                    GetComponents(sg.PrimaryGrid, c);
+
+                return (c);
+            }
+        }
+
+        #region GetComponents
+
+        private void GetComponents(GridContainer cont, ArrayList c)
+        {
+            if (cont is GridPanel)
+            {
+                foreach (GridColumn col in ((GridPanel)cont).Columns)
+                    c.Add(col);
+            }
+
+            if (cont.Rows != null && cont.Rows.Count > 0)
+            {
+                foreach (GridElement item in cont.Rows)
+                {
+                    c.Add(item);
+
+                    if (item is GridRow)
+                    {
+                        foreach (GridCell cell in ((GridRow)item).Cells)
+                            c.Add(cell);
+                    }
+
+                    if (item is GridContainer)
+                        GetComponents((GridContainer)item, c);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetHitTest
+
+        protected override bool GetHitTest(Point point)
+        {
+            if (InScrollBar(point) == true)
+                return (true);
+
+            return (base.GetHitTest(point));
+        }
+
+        #endregion
+
+        #region Licensing Stuff
+        public override void InitializeNewComponent(IDictionary defaultValues)
+        {
+            base.InitializeNewComponent(defaultValues);
+            SetDesignTimeDefaults();
+        }
+        private void SetDesignTimeDefaults()
+        {
+            SuperGridControl c = this.Control as SuperGridControl;
+#if !TRIAL
+            string key = GetLicenseKey();
+            c.LicenseKey = key;
+#endif
+        }
+#if !TRIAL
+        internal static string GetLicenseKey()
+        {
+            string key = "";
+            Microsoft.Win32.RegistryKey regkey = Microsoft.Win32.Registry.LocalMachine;
+            regkey = regkey.OpenSubKey("Software\\DevComponents\\Licenses", false);
+            if (regkey != null)
+            {
+                object keyValue = regkey.GetValue("DevComponents.DotNetBar.DotNetBarManager2");
+                if (keyValue != null)
+                    key = keyValue.ToString();
+            }
+            return key;
+        }
+        private void DesignerLoadComplete(object sender, EventArgs e)
+        {
+            IDesignerHost dh = this.GetService(typeof(IDesignerHost)) as IDesignerHost;
+            if (dh != null)
+                dh.LoadComplete -= new EventHandler(DesignerLoadComplete);
+
+            string key = GetLicenseKey();
+            SuperGridControl grid = this.Control as SuperGridControl;
+            if (key != "" && grid != null && grid.LicenseKey == "" && grid.LicenseKey != key)
+                TypeDescriptor.GetProperties(grid)["LicenseKey"].SetValue(grid, key);
+        }
+#endif
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.SuperGrid.Design/ValueTypeDropDown.Designer.cs b/PROMS/DotNetBar Source Code/DevComponents.SuperGrid.Design/ValueTypeDropDown.Designer.cs
new file mode 100644
index 00000000..7a508a3c
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.SuperGrid.Design/ValueTypeDropDown.Designer.cs	
@@ -0,0 +1,66 @@
+namespace DevComponents.SuperGrid.Design
+{
+    partial class ValueTypeDropDown
+    {
+        /// <summary> 
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #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.listBox1 = new System.Windows.Forms.ListBox();
+            this.SuspendLayout();
+            // 
+            // listBox1
+            // 
+            this.listBox1.BorderStyle = System.Windows.Forms.BorderStyle.None;
+            this.listBox1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.listBox1.FormattingEnabled = true;
+            this.listBox1.IntegralHeight = false;
+            this.listBox1.Location = new System.Drawing.Point(0, 0);
+            this.listBox1.Name = "listBox1";
+            this.listBox1.Size = new System.Drawing.Size(172, 78);
+            this.listBox1.TabIndex = 1;
+            this.listBox1.MouseClick += new System.Windows.Forms.MouseEventHandler(this.ListBoxMouseClick);
+            this.listBox1.SelectedIndexChanged += new System.EventHandler(this.ListBoxSelectedIndexChanged);
+            // 
+            // ValueTypeDropDown
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.Controls.Add(this.listBox1);
+            this.Name = "ValueTypeDropDown";
+            this.Size = new System.Drawing.Size(172, 78);
+            this.PreviewKeyDown += new System.Windows.Forms.PreviewKeyDownEventHandler(this.DropDownPreviewKeyDown);
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.ListBox listBox1;
+
+
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.SuperGrid.Design/ValueTypeDropDown.cs b/PROMS/DotNetBar Source Code/DevComponents.SuperGrid.Design/ValueTypeDropDown.cs
new file mode 100644
index 00000000..63ec820b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.SuperGrid.Design/ValueTypeDropDown.cs	
@@ -0,0 +1,151 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Windows.Forms;
+using System.Windows.Forms.Design;
+
+namespace DevComponents.SuperGrid.Design
+{
+    [ToolboxItem(false)]
+    public partial class ValueTypeDropDown : UserControl
+    {
+        #region Private variables
+
+        private object _Value;
+        private bool _EscapePressed;
+
+        private IWindowsFormsEditorService _EditorService;
+        private ITypeDescriptorContext _Context;
+
+        #endregion
+
+        public ValueTypeDropDown(object value, 
+            IWindowsFormsEditorService editorService, ITypeDescriptorContext context)
+        {
+            _EditorService = editorService;
+            _Context = context;
+            _Value = value;
+
+            Initialize();
+        }
+
+        public ValueTypeDropDown()
+        {
+            Initialize();
+        }
+
+        #region Initialize
+
+        private void Initialize()
+        {
+            InitializeComponent();
+
+            SetStyle(ControlStyles.UserPaint, true);
+            SetStyle(ControlStyles.AllPaintingInWmPaint, true);
+            SetStyle(ControlStyles.OptimizedDoubleBuffer, true);
+
+            string[] items = GetListBoxItems();
+
+            listBox1.Items.Clear();
+            listBox1.Items.AddRange(items);
+
+            listBox1.SelectedIndex = GetSelectedIndex();
+
+            int height = 0;
+            int width = 0;
+
+            foreach (string s in listBox1.Items)
+            {
+                Size size = TextRenderer.MeasureText(s, listBox1.Font);
+
+                width = Math.Max(width, size.Width);
+                height += listBox1.ItemHeight;
+            }
+
+            height += 5;
+
+            Size = new Size(width, height);
+        }
+
+        protected virtual string[] GetListBoxItems()
+        {
+            return (null);
+        }
+
+        protected virtual int GetSelectedIndex()
+        {
+            return (0);
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region EditorService
+
+        public IWindowsFormsEditorService EditorService
+        {
+            get { return (_EditorService); }
+            set { _EditorService = value; }
+        }
+
+        #endregion
+
+        #region EscapePressed
+
+        public bool EscapePressed
+        {
+            get { return (_EscapePressed); }
+            set { _EscapePressed = value; }
+        }
+
+        #endregion
+
+        #region Value
+
+        public object Value
+        {
+            get { return (_Value); }
+
+            set
+            {
+                _Value = value;
+
+                _Context.OnComponentChanging();
+                _Context.PropertyDescriptor.SetValue(_Context.Instance, value);
+                _Context.OnComponentChanged();
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region DropDownPreviewKeyDown
+
+        private void DropDownPreviewKeyDown(object sender, PreviewKeyDownEventArgs e)
+        {
+            if (e.KeyCode == Keys.Escape)
+                _EscapePressed = true;
+        }
+
+        #endregion
+
+        #region ListBoxMouseClick
+
+        private void ListBoxMouseClick(object sender, MouseEventArgs e)
+        {
+            _EditorService.CloseDropDown();
+        }
+
+        #endregion
+
+        #region ListBoxSelectedIndexChanged
+
+        protected virtual void ListBoxSelectedIndexChanged(object sender, EventArgs e)
+        {
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DevComponents.SuperGrid.Design/ValueTypeDropDown.resx b/PROMS/DotNetBar Source Code/DevComponents.SuperGrid.Design/ValueTypeDropDown.resx
new file mode 100644
index 00000000..19dc0dd8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.SuperGrid.Design/ValueTypeDropDown.resx	
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DevComponents.SuperGrid.Design/ValueTypeEditor.cs b/PROMS/DotNetBar Source Code/DevComponents.SuperGrid.Design/ValueTypeEditor.cs
new file mode 100644
index 00000000..b571e0cd
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DevComponents.SuperGrid.Design/ValueTypeEditor.cs	
@@ -0,0 +1,144 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Windows.Forms;
+using System.Windows.Forms.Design;
+using DevComponents.DotNetBar.SuperGrid;
+
+namespace DevComponents.SuperGrid.Design
+{
+    public class ValueTypeEditor : UITypeEditor
+    {
+        #region Private variables
+
+        private GridCell _Cell;
+        private GridColumn _Column;
+
+        private bool _HasBoolDropDown;
+
+        #endregion
+
+        #region GetEditStyle
+
+        public override UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext context)
+        {
+            if (context != null)
+            {
+                _Cell = context.Instance as GridCell;
+
+                if (_Cell != null)
+                {
+                    _HasBoolDropDown = HasBoolDropDown(_Cell);
+                }
+                else 
+                {
+                    _Column = context.Instance as GridColumn;
+
+                    if (_Column != null)
+                        _HasBoolDropDown = HasBoolDropDown(_Column);
+                }
+            }
+
+            return (UITypeEditorEditStyle.DropDown);
+        }
+
+        #region HasBoolDropDown
+
+        private bool HasBoolDropDown(GridCell cell)
+        {
+            if (cell.EditorType != null)
+                return (HasBoolDropDown(cell.EditorType));
+
+            return (HasBoolDropDown(cell.GridColumn));
+        }
+
+        private bool HasBoolDropDown(GridColumn column)
+        {
+            if (column != null)
+                return (HasBoolDropDown(column.EditorType));
+
+            return (false);
+        }
+
+        private bool HasBoolDropDown(Type type)
+        {
+            if (type == typeof(GridCheckBoxEditControl) ||
+                type == typeof(GridCheckBoxXEditControl) ||
+                type == typeof(GridSwitchButtonEditControl))
+            {
+                return (true);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region IsDropDownResizable
+
+        public override bool IsDropDownResizable
+        {
+            get { return (_HasBoolDropDown == false); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetPaintValueSupported
+
+        public override bool GetPaintValueSupported(ITypeDescriptorContext context)
+        {
+            return (false);
+        }
+
+        #endregion
+
+        #region EditValue
+
+        public override object EditValue(
+            ITypeDescriptorContext context, IServiceProvider provider, object value)
+        {
+            IWindowsFormsEditorService editorService =
+                provider.GetService(typeof (IWindowsFormsEditorService)) as IWindowsFormsEditorService;
+
+            if (editorService != null)
+            {
+                if (_HasBoolDropDown == true)
+                {
+                    BoolValueTypeDropDown bv = new BoolValueTypeDropDown(value, editorService, context);
+
+                    bv.EscapePressed = false;
+
+                    editorService.DropDownControl(bv);
+
+                    if (bv.EscapePressed == true)
+                        context.PropertyDescriptor.SetValue(context.Instance, value);
+                    else
+                        return (bv.Value);
+                }
+                else
+                {
+                    TextBox tb = new TextBox();
+
+                    tb.Multiline = true;
+                    tb.Size = new Size(300, 100);
+                    tb.ScrollBars = ScrollBars.Both;
+
+                    if (value != null)
+                        tb.Text = value.ToString();
+
+                    editorService.DropDownControl(tb);
+
+                    return (tb.Text);
+                }
+            }
+
+            return (base.EditValue(context, provider, value));
+        }
+        
+        #endregion
+    }
+}
+
diff --git a/PROMS/DotNetBar Source Code/Display.cs b/PROMS/DotNetBar Source Code/Display.cs
new file mode 100644
index 00000000..bfc7c0b2
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Display.cs	
@@ -0,0 +1,60 @@
+using System.Drawing;
+using System.Drawing.Drawing2D;
+
+#if TREEGX
+namespace DevComponents.Tree
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar
+#endif
+{
+	/// <summary>
+	/// Summary description for Display.
+	/// </summary>
+	internal class Display
+	{
+		private Display()
+		{
+		}
+
+		public static LinearGradientBrush CreateLinearGradientBrush(Rectangle r,Color color1, Color color2,float gradientAngle)
+		{
+			if(r.Width<=0)
+				r.Width=1;
+			if(r.Height<=0)
+				r.Height=1;
+			return new LinearGradientBrush(new Rectangle(r.X,r.Y-1,r.Width,r.Height+1),color1,color2,gradientAngle);
+		}
+
+		public static LinearGradientBrush CreateLinearGradientBrush(RectangleF r,Color color1, Color color2,float gradientAngle)
+		{
+			if(r.Width<=0)
+				r.Width=1;
+			if(r.Height<=0)
+				r.Height=1;
+			return new LinearGradientBrush(new RectangleF(r.X,r.Y-1,r.Width,r.Height+1),color1,color2,gradientAngle);
+		}
+
+		public static LinearGradientBrush CreateLinearGradientBrush(Rectangle r,Color color1, Color color2,float gradientAngle, bool isAngleScalable)
+		{
+			if(r.Width<=0)
+				r.Width=1;
+			if(r.Height<=0)
+				r.Height=1;
+			return new LinearGradientBrush(new Rectangle(r.X,r.Y-1,r.Width,r.Height+1),color1,color2,gradientAngle,isAngleScalable);
+		}
+
+		public static Rectangle GetDrawRectangle(Rectangle r)
+		{
+			r.Width--;
+			r.Height--;
+			return r;
+		}
+
+		public static Rectangle GetPathRectangle(Rectangle r)
+		{
+			//r.Width++;
+			//r.Height++;
+			return r;
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/DisplayHelp.cs b/PROMS/DotNetBar Source Code/DisplayHelp.cs
new file mode 100644
index 00000000..b47669f5
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DisplayHelp.cs	
@@ -0,0 +1,1068 @@
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System;
+using System.Drawing.Text;
+using System.Windows.Forms.VisualStyles;
+
+#if AdvTree
+namespace DevComponents.Tree
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar
+#elif LAYOUT
+namespace DevComponents.DotNetBar.Layout
+#endif
+{
+    /// <summary>
+    /// Summary description for Display.
+    /// </summary>
+    public class DisplayHelp
+    {
+        private DisplayHelp()
+        {
+        }
+        public static Brush CreateBrush(RectangleF bounds, Color[] backColors, int backColorsGradientAngle, float[] backColorsPositions)
+        {
+            return CreateBrush(Rectangle.Round(bounds), backColors, backColorsGradientAngle, backColorsPositions);
+        }
+        public static Brush CreateBrush(Rectangle bounds, Color[] backColors, int backColorsGradientAngle, float[] backColorsPositions)
+        {
+            if (backColors.Length == 0)
+                return new SolidBrush(Color.White);
+            else if (backColors.Length == 1)
+                return new SolidBrush(backColors[0]);
+            else
+            {
+                LinearGradientBrush brush = new LinearGradientBrush(bounds, backColors[0], backColors[backColors.Length - 1], backColorsGradientAngle);
+                if (backColors.Length > 2)
+                {
+                    ColorBlend blend = new ColorBlend();
+                    blend.Colors = backColors;
+                    if (backColorsPositions.Length > 0)
+                        blend.Positions = backColorsPositions;
+                    else
+                    {
+                        float[] pos=new float[backColors.Length];
+                        float f = 1/backColors.Length;
+                        pos[backColors.Length - 1] = 1f;
+                        for (int i = 1; i < backColors.Length - 1; i++)
+                        {
+                            pos[i] = f*1;
+                        }
+                        blend.Positions = pos;
+                    }
+                    brush.InterpolationColors = blend;
+                }
+                return brush;
+            }
+        }
+        public static LinearGradientBrush CreateLinearGradientBrush(Rectangle r, Color color1, Color color2, float gradientAngle)
+        {
+            if (r.Width <= 0)
+                r.Width = 1;
+            if (r.Height <= 0)
+                r.Height = 1;
+            return new LinearGradientBrush(new Rectangle(r.X, r.Y - 1, r.Width, r.Height + 1), color1, color2, gradientAngle);
+        }
+
+        public static LinearGradientBrush CreateLinearGradientBrush(RectangleF r, Color color1, Color color2, float gradientAngle)
+        {
+            if (r.Width <= 0)
+                r.Width = 1;
+            if (r.Height <= 0)
+                r.Height = 1;
+            return new LinearGradientBrush(new RectangleF(r.X, r.Y - 1, r.Width, r.Height + 1), color1, color2, gradientAngle);
+        }
+
+        public static LinearGradientBrush CreateLinearGradientBrush(Rectangle r, Color color1, Color color2, float gradientAngle, bool isAngleScalable)
+        {
+            if (r.Width <= 0)
+                r.Width = 1;
+            if (r.Height <= 0)
+                r.Height = 1;
+            return new LinearGradientBrush(new Rectangle(r.X, r.Y - 1, r.Width, r.Height + 1), color1, color2, gradientAngle, isAngleScalable);
+        }
+
+        public static Rectangle GetDrawRectangle(Rectangle r)
+        {
+            r.Width--;
+            r.Height--;
+            return r;
+        }
+
+        public static Rectangle GetPathRectangle(Rectangle r)
+        {
+            //r.Width++;
+            //r.Height++;
+            return r;
+        }
+
+        public static void DrawRectangle(System.Drawing.Graphics g, Color color, int x, int y, int width, int height)
+        {
+            using (Pen pen = new Pen(color, 1))
+                DrawRectangle(g, pen, x, y, width, height);
+        }
+        public static void DrawRectangle(System.Drawing.Graphics g, Color color, System.Drawing.Rectangle r)
+        {
+            DrawRectangle(g, color, r.X, r.Y, r.Width, r.Height);
+        }
+
+        public static void DrawRectangle(System.Drawing.Graphics g, System.Drawing.Pen pen, int x, int y, int width, int height)
+        {
+            // Fix for GDI issue
+            width--;
+            height--;
+            g.DrawRectangle(pen, x, y, width, height);
+        }
+        public static void DrawRectangle(System.Drawing.Graphics g, System.Drawing.Pen pen, System.Drawing.Rectangle r)
+        {
+            DrawRectangle(g, pen, r.X, r.Y, r.Width, r.Height);
+        }
+
+        private static Pen GetPen(Color color, Color lastColor, Pen lastPen)
+        {
+            if (lastPen == null || color != lastColor)
+            {
+                if (lastPen != null)
+                    lastPen.Dispose();
+                return new Pen(color);
+            }
+            else
+            {
+
+                return lastPen;
+            }
+        }
+        public static void DrawRoundedRectangle(System.Drawing.Graphics g, Rectangle r, Color[] borderColors, int cornerRadius)
+        {
+            if (cornerRadius <= 0)
+            {
+                // Square corners consider borderColors array differently. For less than 4 colors each color specifies color
+                // for all 4 sides of borders. For 4 colors or more in array the array of colors is considered as: Left, Top, Right, Bottom specification
+                if (borderColors.Length < 4)
+                {
+                    Pen pen = null;
+                    Color lastColor = Color.Empty;
+                    r.Width--;
+                    r.Height--; // GDI+ render bug fix
+                    for (int i = 0; i < borderColors.Length; i++)
+                    {
+                        if (borderColors[i].IsEmpty) continue;
+                        pen = GetPen(borderColors[i], lastColor, pen);
+                        g.DrawRectangle(pen, r);
+                        r.Inflate(-1,-1);
+                    }
+                    if (pen != null)
+                    {
+                        pen.Dispose();
+                        pen = null;
+                    }
+                }
+                else
+                {
+                    Pen pen = null;
+                    Color lastColor = Color.Empty;
+                    for (int i = 0; i < borderColors.Length; i += 4)
+                    {
+                        Color left = borderColors[i];
+                        Color top = borderColors[i+1];
+                        Color right = borderColors[i + 2];
+                        Color bottom = borderColors[i + 3];
+                        if (!left.IsEmpty)
+                        {
+                            pen = GetPen(left, lastColor, pen);
+                            g.DrawLine(pen, r.X, r.Y, r.X, r.Bottom);
+                            lastColor = left;
+                        }
+                        if (!top.IsEmpty)
+                        {
+                            pen = GetPen(top, lastColor, pen);
+                            g.DrawLine(pen, r.X, r.Y, r.Right, r.Y);
+                            lastColor = top;
+                        }
+                        if (!right.IsEmpty)
+                        {
+                            pen = GetPen(right, lastColor, pen);
+                            g.DrawLine(pen, r.Right - 1, r.Y, r.Right - 1, r.Bottom);
+                            lastColor = right;
+                        }
+                        if (!bottom.IsEmpty)
+                        {
+                            pen = GetPen(bottom, lastColor, pen);
+                            g.DrawLine(pen, r.X, r.Bottom - 1, r.Right, r.Bottom - 1);
+                            lastColor = bottom;
+                        }
+                    }
+                    if (pen != null)
+                    {
+                        pen.Dispose();
+                        pen = null;
+                    }
+                }
+            }
+            else
+            {
+                for (int i = 0; i < borderColors.Length; i++)
+                {
+                    DrawRoundedRectangle(g, borderColors[i], r, cornerRadius);
+                    r.Inflate(-1, -1);
+                }
+            }
+        }
+
+        public static void DrawRoundedRectangle(System.Drawing.Graphics g, Color color, DevComponents.DotNetBar.Rendering.LinearGradientColorTable fillColor, Rectangle bounds, int cornerSize)
+        {
+            using (Brush fill = CreateBrush(bounds, fillColor))
+            {
+                using (Pen pen = new Pen(color))
+                    DrawRoundedRectangle(g, pen, fill, bounds.X, bounds.Y, bounds.Width, bounds.Height, cornerSize);
+            }
+        }
+
+        public static void DrawRoundedRectangle(System.Drawing.Graphics g, Color color, Color fillColor, Rectangle bounds, int cornerSize)
+        {
+            using (Brush fill = new SolidBrush(fillColor))
+            {
+                using (Pen pen = new Pen(color))
+                    DrawRoundedRectangle(g, pen, fill, bounds.X, bounds.Y, bounds.Width, bounds.Height, cornerSize);
+            }
+        }
+
+        public static void DrawRoundedRectangle(System.Drawing.Graphics g, Color color, Rectangle bounds, int cornerSize)
+        {
+            if (!color.IsEmpty)
+            {
+                using (Pen pen = new Pen(color))
+                    DrawRoundedRectangle(g, pen, bounds.X, bounds.Y, bounds.Width, bounds.Height, cornerSize);
+            }
+        }
+
+        public static void DrawRoundedRectangle(System.Drawing.Graphics g, Color color, int x, int y, int width, int height, int cornerSize)
+        {
+            if (!color.IsEmpty)
+            {
+                using (Pen pen = new Pen(color))
+                    DrawRoundedRectangle(g, pen, x, y, width, height, cornerSize);
+            }
+        }
+
+        public static void DrawRoundedRectangle(System.Drawing.Graphics g, System.Drawing.Pen pen, Rectangle bounds, int cornerSize)
+        {
+            DrawRoundedRectangle(g, pen, bounds.X, bounds.Y, bounds.Width, bounds.Height, cornerSize);
+        }
+        public static void DrawRoundedRectangle(System.Drawing.Graphics g, System.Drawing.Pen pen, int x, int y, int width, int height, int cornerSize)
+        {
+            DrawRoundedRectangle(g, pen, null, x, y, width, height, cornerSize);
+        }
+        public static void DrawRoundedRectangle(System.Drawing.Graphics g, System.Drawing.Pen pen, Brush fill, int x, int y, int width, int height, int cornerSize)
+        {
+            // Fix for GDI issue
+            width--;
+            height--;
+
+            Rectangle r = new Rectangle(x, y, width, height);
+
+            //SmoothingMode sm = g.SmoothingMode;
+            //g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.HighQuality;
+
+            using (GraphicsPath path = GetRoundedRectanglePath(r, cornerSize))
+            {
+                if (fill != null)
+                    g.FillPath(fill, path);
+                g.DrawPath(pen, path);
+            }
+
+            //g.SmoothingMode = sm;
+        }
+
+        public static GraphicsPath GetRoundedRectanglePath(Rectangle r, int cornerSize)
+        {
+            GraphicsPath path = new GraphicsPath();
+            if (cornerSize == 0)
+                path.AddRectangle(r);
+            else
+            {
+                ElementStyleDisplay.AddCornerArc(path, r, cornerSize, eCornerArc.TopLeft);
+                ElementStyleDisplay.AddCornerArc(path, r, cornerSize, eCornerArc.TopRight);
+                ElementStyleDisplay.AddCornerArc(path, r, cornerSize, eCornerArc.BottomRight);
+                ElementStyleDisplay.AddCornerArc(path, r, cornerSize, eCornerArc.BottomLeft);
+                path.CloseAllFigures();
+            }
+            return path;
+        }
+
+        public static GraphicsPath GetRoundedRectanglePath(Rectangle r, int cornerTopLeft, int cornerTopRight, int cornerBottomRight, int cornerBottomLeft)
+        {
+            GraphicsPath path = new GraphicsPath();
+            ElementStyleDisplay.AddCornerArc(path, r, cornerTopLeft, eCornerArc.TopLeft);
+            ElementStyleDisplay.AddCornerArc(path, r, cornerTopRight, eCornerArc.TopRight);
+            ElementStyleDisplay.AddCornerArc(path, r, cornerBottomRight, eCornerArc.BottomRight);
+            ElementStyleDisplay.AddCornerArc(path, r, cornerBottomLeft, eCornerArc.BottomLeft);
+            path.CloseAllFigures();
+            return path;
+        }
+
+        public static GraphicsPath GetRoundedRectanglePath(Rectangle clientRectangle, int cornerSize, eStyleBackgroundPathPart pathPart,
+            eCornerType topLeftCornerType, eCornerType topRightCornerType, eCornerType bottomLeftCornerType, eCornerType bottomRightCornerType)
+        {
+            return GetRoundedRectanglePath(clientRectangle, cornerSize, pathPart, topLeftCornerType, topRightCornerType, bottomLeftCornerType, bottomRightCornerType, 0);
+        }
+
+        public static GraphicsPath GetRoundedRectanglePath(Rectangle clientRectangle, int cornerSize, eStyleBackgroundPathPart pathPart,
+            eCornerType topLeftCornerType, eCornerType topRightCornerType, eCornerType bottomLeftCornerType, eCornerType bottomRightCornerType, float partSize)
+        {
+            return GetRoundedRectanglePath(clientRectangle, cornerSize, cornerSize, cornerSize, cornerSize, pathPart, topLeftCornerType, topRightCornerType, bottomLeftCornerType, bottomRightCornerType, partSize);
+        }
+
+        public static GraphicsPath GetRoundedRectanglePath(Rectangle clientRectangle, int topLeftCornerSize, int topRightCornerSize, int bottomLeftCornerSize, int bottomRightCornerSize, eStyleBackgroundPathPart pathPart,
+            eCornerType topLeftCornerType, eCornerType topRightCornerType, eCornerType bottomLeftCornerType, eCornerType bottomRightCornerType, float partSize)
+        {
+            GraphicsPath path = new GraphicsPath();
+
+            if (pathPart == eStyleBackgroundPathPart.TopHalf)
+            {
+                if (partSize == 0)
+                    clientRectangle.Height = clientRectangle.Height / 2;
+                else
+                    clientRectangle.Height = (int)(clientRectangle.Height * partSize);
+            }
+            else if (pathPart == eStyleBackgroundPathPart.BottomHalf)
+            {
+                int h = clientRectangle.Height;
+                if (partSize == 0)
+                    clientRectangle.Height = clientRectangle.Height / 2;
+                else
+                    clientRectangle.Height = (int)(clientRectangle.Height * partSize);
+                clientRectangle.Y += (h - clientRectangle.Height - 1);
+            }
+
+            eCornerType corner = topLeftCornerType;
+            if (corner == eCornerType.Inherit)
+                corner = eCornerType.Square;
+
+            if (pathPart == eStyleBackgroundPathPart.BottomHalf)
+                corner = eCornerType.Square;
+
+            if (corner == eCornerType.Rounded && topLeftCornerSize > 0)
+            {
+                ArcData ad = ElementStyleDisplay.GetCornerArc(clientRectangle, topLeftCornerSize, eCornerArc.TopLeft);
+                path.AddArc(ad.X, ad.Y, ad.Width, ad.Height, ad.StartAngle, ad.SweepAngle);
+            }
+            else if (corner == eCornerType.Diagonal)
+            {
+                path.AddLine(clientRectangle.X, clientRectangle.Y + topLeftCornerSize, clientRectangle.X + topLeftCornerSize, clientRectangle.Y);
+            }
+            else
+            {
+                path.AddLine(clientRectangle.X, clientRectangle.Y + 2, clientRectangle.X, clientRectangle.Y);
+                path.AddLine(clientRectangle.X, clientRectangle.Y, clientRectangle.X + 2, clientRectangle.Y);
+            }
+
+            corner = topRightCornerType;
+            if (corner == eCornerType.Inherit)
+                corner = eCornerType.Square;
+            if (pathPart == eStyleBackgroundPathPart.BottomHalf)
+                corner = eCornerType.Square;
+            if (corner == eCornerType.Rounded && topRightCornerSize > 0)
+            {
+                ArcData ad = ElementStyleDisplay.GetCornerArc(clientRectangle, topRightCornerSize, eCornerArc.TopRight);
+                path.AddArc(ad.X, ad.Y, ad.Width, ad.Height, ad.StartAngle, ad.SweepAngle);
+            }
+            else if (corner == eCornerType.Diagonal)
+            {
+                path.AddLine(clientRectangle.Right - topRightCornerSize - 1, clientRectangle.Y, clientRectangle.Right, clientRectangle.Y + topRightCornerSize);
+            }
+            else
+            {
+                path.AddLine(clientRectangle.Right - 2, clientRectangle.Y, clientRectangle.Right, clientRectangle.Y);
+                path.AddLine(clientRectangle.Right, clientRectangle.Y, clientRectangle.Right, clientRectangle.Y + 2);
+            }
+
+            corner = bottomRightCornerType;
+            if (corner == eCornerType.Inherit)
+                corner = eCornerType.Square;
+            if (pathPart == eStyleBackgroundPathPart.TopHalf)
+                corner = eCornerType.Square;
+            if (corner == eCornerType.Rounded && bottomRightCornerSize > 0)
+            {
+                ArcData ad = ElementStyleDisplay.GetCornerArc(clientRectangle, bottomRightCornerSize, eCornerArc.BottomRight);
+                path.AddArc(ad.X, ad.Y, ad.Width, ad.Height, ad.StartAngle, ad.SweepAngle);
+            }
+            else if (corner == eCornerType.Diagonal)
+            {
+                path.AddLine(clientRectangle.Right, clientRectangle.Bottom - bottomRightCornerSize - 1, clientRectangle.Right - bottomRightCornerSize - 1, clientRectangle.Bottom);
+            }
+            else
+            {
+                path.AddLine(clientRectangle.Right, clientRectangle.Bottom - 2, clientRectangle.Right, clientRectangle.Bottom);
+                path.AddLine(clientRectangle.Right, clientRectangle.Bottom, clientRectangle.Right - 2, clientRectangle.Bottom);
+            }
+
+            corner = bottomLeftCornerType;
+            if (corner == eCornerType.Inherit)
+                corner = eCornerType.Square;
+            if (pathPart == eStyleBackgroundPathPart.TopHalf)
+                corner = eCornerType.Square;
+            if (corner == eCornerType.Rounded && bottomLeftCornerSize > 0)
+            {
+                ArcData ad = ElementStyleDisplay.GetCornerArc(clientRectangle, bottomLeftCornerSize, eCornerArc.BottomLeft);
+                path.AddArc(ad.X, ad.Y, ad.Width, ad.Height, ad.StartAngle, ad.SweepAngle);
+            }
+            else if (corner == eCornerType.Diagonal)
+            {
+                path.AddLine(clientRectangle.X + 2, clientRectangle.Bottom, clientRectangle.X, clientRectangle.Bottom - bottomLeftCornerSize - 1);
+            }
+            else
+            {
+                path.AddLine(clientRectangle.X + 2, clientRectangle.Bottom, clientRectangle.X, clientRectangle.Bottom);
+                path.AddLine(clientRectangle.X, clientRectangle.Bottom, clientRectangle.X, clientRectangle.Bottom - 2);
+            }
+
+            path.CloseAllFigures();
+            return path;
+        }
+
+        public static GraphicsPath GetBorderPath(Rectangle clientRectangle, int cornerSize, eStyleBackgroundPathPart pathPart,
+            eCornerType topLeftCornerType, eCornerType topRightCornerType, eCornerType bottomLeftCornerType, eCornerType bottomRightCornerType,
+            bool leftBorder, bool rightBorder, bool topBorder, bool bottomBorder)
+        {
+            GraphicsPath path = new GraphicsPath();
+
+            if (pathPart == eStyleBackgroundPathPart.TopHalf)
+                clientRectangle.Height = clientRectangle.Height / 2;
+            else if (pathPart == eStyleBackgroundPathPart.BottomHalf)
+            {
+                int h = clientRectangle.Height;
+                clientRectangle.Height = clientRectangle.Height / 2;
+                clientRectangle.Y += (h - clientRectangle.Height - 1);
+            }
+
+            eCornerType corner = topLeftCornerType;
+            if (corner == eCornerType.Inherit)
+                corner = eCornerType.Square;
+
+            if (pathPart == eStyleBackgroundPathPart.BottomHalf)
+                corner = eCornerType.Square;
+
+            if (leftBorder)
+            {
+                path.AddLine(clientRectangle.X, clientRectangle.Bottom -
+                    (bottomBorder && (bottomLeftCornerType == eCornerType.Diagonal || bottomLeftCornerType == eCornerType.Rounded) ? cornerSize : 0),
+                    clientRectangle.X, clientRectangle.Y +
+                    (topBorder && (topLeftCornerType == eCornerType.Diagonal || topLeftCornerType == eCornerType.Rounded) ? cornerSize : 0));
+            }
+
+            if (leftBorder && topBorder)
+            {
+                if (corner == eCornerType.Rounded)
+                {
+                    ArcData ad = ElementStyleDisplay.GetCornerArc(clientRectangle, cornerSize, eCornerArc.TopLeft);
+                    path.AddArc(ad.X, ad.Y, ad.Width, ad.Height, ad.StartAngle, ad.SweepAngle);
+                }
+                else if (corner == eCornerType.Diagonal)
+                {
+                    path.AddLine(clientRectangle.X, clientRectangle.Y + cornerSize, clientRectangle.X + cornerSize, clientRectangle.Y);
+                }
+            }
+
+            if (topBorder)
+            {
+                path.AddLine(clientRectangle.X +
+                    ((topLeftCornerType == eCornerType.Diagonal || topLeftCornerType == eCornerType.Rounded) ? cornerSize : 0)
+                    , clientRectangle.Y, clientRectangle.Right -
+                    (rightBorder && (topRightCornerType == eCornerType.Diagonal || topRightCornerType == eCornerType.Rounded) ? cornerSize : 0),
+                    clientRectangle.Y);
+            }
+
+            corner = topRightCornerType;
+            if (corner == eCornerType.Inherit)
+                corner = eCornerType.Square;
+            if (pathPart == eStyleBackgroundPathPart.BottomHalf)
+                corner = eCornerType.Square;
+
+            if (topBorder && rightBorder)
+            {
+                if (corner == eCornerType.Rounded)
+                {
+                    ArcData ad = ElementStyleDisplay.GetCornerArc(clientRectangle, cornerSize, eCornerArc.TopRight);
+                    path.AddArc(ad.X, ad.Y, ad.Width, ad.Height, ad.StartAngle, ad.SweepAngle);
+                }
+                else if (corner == eCornerType.Diagonal)
+                {
+                    path.AddLine(clientRectangle.Right - cornerSize - 1, clientRectangle.Y, clientRectangle.Right, clientRectangle.Y + cornerSize);
+                }
+            }
+
+            if (rightBorder)
+            {
+                path.AddLine(clientRectangle.Right, clientRectangle.Y +
+                    ((topRightCornerType == eCornerType.Diagonal || topRightCornerType == eCornerType.Rounded) ? cornerSize : 0),
+                    clientRectangle.Right, clientRectangle.Bottom -
+                    (bottomBorder && (bottomRightCornerType == eCornerType.Diagonal || bottomRightCornerType == eCornerType.Rounded) ? cornerSize : 0));
+            }
+
+            corner = bottomRightCornerType;
+            if (corner == eCornerType.Inherit)
+                corner = eCornerType.Square;
+            if (pathPart == eStyleBackgroundPathPart.TopHalf)
+                corner = eCornerType.Square;
+            if (corner == eCornerType.Rounded)
+            {
+                ArcData ad = ElementStyleDisplay.GetCornerArc(clientRectangle, cornerSize, eCornerArc.BottomRight);
+                path.AddArc(ad.X, ad.Y, ad.Width, ad.Height, ad.StartAngle, ad.SweepAngle);
+            }
+            else if (corner == eCornerType.Diagonal)
+            {
+                path.AddLine(clientRectangle.Right, clientRectangle.Bottom - cornerSize - 1, clientRectangle.Right - cornerSize - 1, clientRectangle.Bottom);
+            }
+
+            if (bottomBorder)
+            {
+                path.AddLine(clientRectangle.Right -
+                    ((bottomRightCornerType == eCornerType.Diagonal || bottomRightCornerType == eCornerType.Rounded) ? cornerSize : 0),
+                    clientRectangle.Bottom,
+                    clientRectangle.X +
+                    ((bottomLeftCornerType == eCornerType.Diagonal || bottomLeftCornerType == eCornerType.Rounded) ? cornerSize : 0),
+                    clientRectangle.Bottom);
+            }
+
+            corner = bottomLeftCornerType;
+            if (corner == eCornerType.Inherit)
+                corner = eCornerType.Square;
+            if (pathPart == eStyleBackgroundPathPart.TopHalf)
+                corner = eCornerType.Square;
+            if (corner == eCornerType.Rounded)
+            {
+                ArcData ad = ElementStyleDisplay.GetCornerArc(clientRectangle, cornerSize, eCornerArc.BottomLeft);
+                path.AddArc(ad.X, ad.Y, ad.Width, ad.Height, ad.StartAngle, ad.SweepAngle);
+            }
+            else if (corner == eCornerType.Diagonal)
+            {
+                path.AddLine(clientRectangle.X + 2, clientRectangle.Bottom, clientRectangle.X, clientRectangle.Bottom - cornerSize - 1);
+            }
+
+            return path;
+        }
+
+        public static void FillRoundedRectangle(Graphics g, Rectangle bounds, int cornerSize, Color color1, Color color2, int gradientAngle)
+        {
+            if (color2.IsEmpty)
+            {
+                if (!color1.IsEmpty)
+                {
+                    using (SolidBrush brush = new SolidBrush(color1))
+                        FillRoundedRectangle(g, brush, bounds, cornerSize);
+                }
+            }
+            else
+            {
+                using (LinearGradientBrush brush = CreateLinearGradientBrush(bounds, color1, color2, gradientAngle))
+                    FillRoundedRectangle(g, brush, bounds, cornerSize);
+            }
+        }
+
+        public static void FillRoundedRectangle(Graphics g, Rectangle bounds, int cornerSize, Color color1, Color color2)
+        {
+            FillRoundedRectangle(g, bounds, cornerSize, color1, color2, 90);
+        }
+
+        public static void FillRoundedRectangle(Graphics g, Rectangle bounds, int cornerSize, Color color1)
+        {
+            using (SolidBrush brush = new SolidBrush(color1))
+                FillRoundedRectangle(g, brush, bounds, cornerSize);
+        }
+
+        public static void FillRoundedRectangle(Graphics g, Brush brush, Rectangle bounds, int cornerSize)
+        {
+            if (cornerSize <= 0)
+            {
+                SmoothingMode sm = g.SmoothingMode;
+                g.SmoothingMode = SmoothingMode.None;
+                g.FillRectangle(brush, bounds);
+                g.SmoothingMode = sm;
+            }
+            else
+            {
+                // Fix for GDI issue
+                bounds.Width--;
+                bounds.Height--;
+
+                using (GraphicsPath path = GetRoundedRectanglePath(bounds, cornerSize))
+                {
+                    g.FillPath(brush, path);
+                }
+            }
+        }
+
+        public static void FillRectangle(Graphics g, Rectangle bounds, Color color1)
+        {
+            FillRectangle(g, bounds, color1, Color.Empty, 90);
+        }
+
+        public static void FillRectangle(Graphics g, Rectangle bounds, Color color1, Color color2)
+        {
+            FillRectangle(g, bounds, color1, color2, 90);
+        }
+
+#if DOTNETBAR
+        public static void FillRectangle(Graphics g, Rectangle r, Rendering.LinearGradientColorTable table)
+        {
+            FillRectangle(g, r, table.Start, table.End, table.GradientAngle);
+        }
+#endif
+
+        public static void FillRectangle(Graphics g, Rectangle r, Color color1, Color color2, int gradientAngle)
+        {
+            if (r.Width == 0 || r.Height == 0)
+                return;
+
+            if (color2.IsEmpty)
+            {
+                if (!color1.IsEmpty)
+                {
+                    SmoothingMode sm = g.SmoothingMode;
+                    g.SmoothingMode = SmoothingMode.None;
+                    using (SolidBrush brush = new SolidBrush(color1))
+                        g.FillRectangle(brush, r);
+                    g.SmoothingMode = sm;
+                }
+            }
+            else
+            {
+                using (LinearGradientBrush brush = CreateLinearGradientBrush(r, color1, color2, gradientAngle))
+                    g.FillRectangle(brush, r);
+            }
+        }
+
+        public static void FillRectangle(Graphics g, Rectangle r, Color color1, Color color2, int gradientAngle, float[] factors, float[] positions)
+        {
+            if (r.Width == 0 || r.Height == 0)
+                return;
+
+            if (color2.IsEmpty)
+            {
+                if (!color1.IsEmpty)
+                {
+                    SmoothingMode sm = g.SmoothingMode;
+                    g.SmoothingMode = SmoothingMode.None;
+                    using (SolidBrush brush = new SolidBrush(color1))
+                        g.FillRectangle(brush, r);
+                    g.SmoothingMode = sm;
+                }
+            }
+            else
+            {
+                using (LinearGradientBrush brush = CreateLinearGradientBrush(r, color1, color2, gradientAngle))
+                {
+                    Blend blend = new Blend(factors.Length);
+                    blend.Factors = factors;
+                    blend.Positions = positions;
+                    brush.Blend = blend;
+                    g.FillRectangle(brush, r);
+                }
+            }
+        }
+
+        public static void FillPath(Graphics g, GraphicsPath path, Color color1, Color color2)
+        {
+            FillPath(g, path, color1, color2, 90);
+        }
+
+#if DOTNETBAR
+        public static void FillPath(Graphics g, GraphicsPath path, Rendering.LinearGradientColorTable table)
+        {
+            FillPath(g, path, table.Start, table.End, table.GradientAngle);
+        }
+#endif
+
+        public static void FillPath(Graphics g, GraphicsPath path, Color color1, Color color2, int gradientAngle)
+        {
+            if (color2.IsEmpty)
+            {
+                if (!color1.IsEmpty)
+                {
+                    using (SolidBrush brush = new SolidBrush(color1))
+                        g.FillPath(brush, path);
+                }
+            }
+            else if (!color1.IsEmpty)
+            {
+                using (LinearGradientBrush brush = CreateLinearGradientBrush(path.GetBounds(), color1, color2, gradientAngle))
+                    g.FillPath(brush, path);
+            }
+        }
+
+        //public static void DrawGradientLine(Graphics g, Point start, Point end, Color color1, Color color2, int gradientAngle, int penWidth)
+        //{
+        //    if (color1.IsEmpty || penWidth <= 0 || start == end)
+        //        return;
+
+        //    using (GraphicsPath path = new GraphicsPath())
+        //    {
+        //        start.Offset(-1, -1);
+        //        end.Offset(-1, -1);
+        //        path.AddLine(start, end);
+        //        using (Pen pen = new Pen(Color.White, penWidth))
+        //            path.Widen(pen);
+        //        Rectangle r = Rectangle.Ceiling(path.GetBounds());
+        //        r.Inflate(1, 1);
+        //        using (LinearGradientBrush brush = CreateLinearGradientBrush(r, color1, color2, gradientAngle))
+        //            g.FillPath(brush, path);
+        //    }
+        //}
+
+        public static void DrawLine(Graphics g, Point start, Point end, Color color, int penWidth)
+        {
+            if (!color.IsEmpty)
+            {
+                using (Pen pen = new Pen(color, penWidth))
+                    g.DrawLine(pen, start, end);
+            }
+        }
+
+        public static void DrawLine(Graphics g, int x1, int y1, int x2, int y2, Color color, int penWidth)
+        {
+            if (!color.IsEmpty)
+            {
+                using (Pen pen = new Pen(color, penWidth))
+                    g.DrawLine(pen, x1, y1, x2, y2);
+            }
+        }
+
+#if DOTNETBAR
+        public static void DrawGradientRectangle(Graphics g, Rectangle bounds, Rendering.LinearGradientColorTable table, int penWidth)
+        {
+            DrawGradientRectangle(g, bounds, table.Start, table.End, table.GradientAngle, penWidth);
+        }
+#endif
+
+        public static void DrawGradientRectangle(Graphics g, Rectangle bounds, Color color1, Color color2, int gradientAngle, int penWidth)
+        {
+            if (color1.IsEmpty || bounds.Width <= 0 || bounds.Height <= 0 || penWidth <= 0)
+                return;
+
+            Rectangle r = bounds;
+            // Workaround for GDI+ bug
+            r.Width--;
+            r.Height--;
+
+            if (color2.IsEmpty)
+            {
+                using (Pen pen = new Pen(color1, penWidth))
+                    g.DrawRectangle(pen, r);
+                return;
+            }
+
+            using (GraphicsPath path = new GraphicsPath())
+            {
+                path.AddRectangle(r);
+
+                DrawGradientPath(g, path, r, color1, color2, gradientAngle, penWidth);
+            }
+        }
+
+        public static void DrawGradientPath(Graphics g, GraphicsPath path, Rectangle bounds, Rendering.LinearGradientColorTable table, int penWidth)
+        {
+            DrawGradientPath(g, path, bounds, table.Start, table.End, table.GradientAngle, penWidth);
+        }
+
+        public static void DrawGradientPath(Graphics g, GraphicsPath path, Rectangle bounds, Color color1, Color color2, int gradientAngle, int penWidth)
+        {
+            using (Pen pen = new Pen(color1, penWidth))
+                path.Widen(pen);
+
+            if (color2.IsEmpty)
+            {
+                if (!color1.IsEmpty)
+                {
+                    using (SolidBrush brush = new SolidBrush(color1))
+                        g.FillPath(brush, path);
+                }
+            }
+            else if (!color1.IsEmpty)
+            {
+                using (LinearGradientBrush brush = new LinearGradientBrush(bounds, color1, color2, gradientAngle))
+                    g.FillPath(brush, path);
+            }
+        }
+
+#if DOTNETBAR
+        public static void DrawRoundGradientRectangle(Graphics g, Rectangle bounds, Rendering.LinearGradientColorTable table, int penWidth, int roundCornerSize)
+        {
+            DrawRoundGradientRectangle(g, bounds, table.Start, table.End, table.GradientAngle, penWidth, roundCornerSize);
+        }
+#endif
+
+        public static void DrawRoundGradientRectangle(Graphics g, Rectangle bounds, Color color1, Color color2, int gradientAngle, int penWidth, int roundCornerSize)
+        {
+            if (color1.IsEmpty && color2.IsEmpty || bounds.Width <= 0 || bounds.Height <= 0 || roundCornerSize <= 0 || penWidth <= 0)
+                return;
+
+            if (color2.IsEmpty)
+            {
+                using (Pen pen = new Pen(color1, penWidth))
+                    DrawRoundedRectangle(g, pen, bounds, roundCornerSize);
+                return;
+            }
+
+            Rectangle r = bounds;
+            // Workaround for GDI+ bug
+            r.Width--;
+            r.Height--;
+
+            using (GraphicsPath roundPath = GetRoundedRectanglePath(r, roundCornerSize))
+            {
+                using (Pen pen = new Pen(color1, penWidth))
+                    roundPath.Widen(pen);
+
+                using (LinearGradientBrush brush = new LinearGradientBrush(bounds, color1, color2, gradientAngle))
+                    g.FillPath(brush, roundPath);
+            }
+        }
+
+#if DOTNETBAR
+        public static void DrawGradientPathBorder(Graphics g, GraphicsPath path, Rendering.LinearGradientColorTable table, int penWidth)
+        {
+            DrawGradientPathBorder(g, path, table.Start, table.End, table.GradientAngle, penWidth);
+        }
+#endif
+
+        public static void DrawGradientPathBorder(Graphics g, GraphicsPath path, Color color1, Color color2, int gradientAngle, int penWidth)
+        {
+            if (color1.IsEmpty && color2.IsEmpty) return;
+            using (Pen pen = new Pen(color1, penWidth))
+                path.Widen(pen);
+
+            Rectangle r = Rectangle.Ceiling(path.GetBounds());
+            r.Inflate(1, 1);
+
+            if (color2.IsEmpty)
+            {
+                if (!color1.IsEmpty)
+                {
+                    using (SolidBrush brush = new SolidBrush(color1))
+                        g.FillPath(brush, path);
+                }
+            }
+            else if (!color1.IsEmpty)
+            {
+                using (LinearGradientBrush brush = new LinearGradientBrush(r, color1, color2, gradientAngle))
+                    g.FillPath(brush, path);
+            }
+        }
+#if DOTNETBAR
+        public static void DrawGradientLine(Graphics g, Point start, Point end, Rendering.LinearGradientColorTable table, int penWidth)
+        {
+            DrawGradientLine(g, start, end, table.Start, table.End, table.GradientAngle, penWidth);
+        }
+        public static void DrawGradientLine(Graphics g, int x1, int y1, int x2, int y2, Rendering.LinearGradientColorTable table, int penWidth)
+        {
+            DrawGradientLine(g, new Point(x1, y1), new Point(x2, y2), table.Start, table.End, table.GradientAngle, penWidth);
+        }
+#endif
+        public static void DrawGradientLine(Graphics g, Point start, Point end, Color color1, Color color2, int gradientAngle, int penWidth)
+        {
+            if (color2.IsEmpty || penWidth == 1 && start.Y == end.Y && gradientAngle == 90)
+            {
+                if (!color1.IsEmpty)
+                {
+                    using (Pen pen = new Pen(color1, penWidth))
+                    {
+                        g.DrawLine(pen, start, end);
+                    }
+                }
+            }
+            else if (!color1.IsEmpty)
+            {
+                using (GraphicsPath path = new GraphicsPath())
+                {
+                    //start.Offset(-1, -1);
+                    //end.Offset(-1, -1);
+                    path.AddLine(start, end);
+                    using (Pen pen = new Pen(color1, penWidth))
+                        path.Widen(pen);
+                    Rectangle r = Rectangle.Ceiling(path.GetBounds());
+                    r.Inflate(1, 1);
+                    SmoothingMode sm = g.SmoothingMode;
+                    g.SmoothingMode = SmoothingMode.Default;
+                    using (LinearGradientBrush brush = DisplayHelp.CreateLinearGradientBrush(r, color1, color2, gradientAngle))
+                        g.FillPath(brush, path);
+                    g.SmoothingMode = sm;
+                }
+            }
+        }
+
+        public static void DrawGradientLine(Graphics g, Point start, Point end, Color color1, Color color2, int gradientAngle, int penWidth, float[] factors, float[] positions)
+        {
+            if (color2.IsEmpty)
+            {
+                if (!color1.IsEmpty)
+                {
+                    using (Pen pen = new Pen(color1, penWidth))
+                        g.DrawLine(pen, start, end);
+                }
+            }
+            else if (!color1.IsEmpty)
+            {
+                using (GraphicsPath path = new GraphicsPath())
+                {
+                    start.Offset(-1, -1);
+                    end.Offset(-1, -1);
+                    path.AddLine(start, end);
+                    using (Pen pen = new Pen(color1, penWidth))
+                        path.Widen(pen);
+                    Rectangle r = Rectangle.Ceiling(path.GetBounds());
+                    r.Inflate(1, 1);
+                    using (LinearGradientBrush brush = DisplayHelp.CreateLinearGradientBrush(r, color1, color2, gradientAngle))
+                    {
+                        Blend blend = new Blend(factors.Length);
+                        blend.Factors = factors;
+                        blend.Positions = positions;
+                        brush.Blend = blend;
+                        g.FillPath(brush, path);
+                    }
+                }
+            }
+        }
+#if DOTNETBAR
+        public static Brush CreateBrush(Rectangle bounds, GradientColorTable colorBlend)
+        {
+            return CreateBrush(bounds, colorBlend.Colors, colorBlend.LinearGradientAngle, colorBlend.GradientType);
+        }
+        public static Brush CreateBrush(Rectangle bounds, DevComponents.DotNetBar.Rendering.LinearGradientColorTable colorTable)
+        {
+            if (colorTable.End.IsEmpty) return new SolidBrush(colorTable.Start);
+            return new LinearGradientBrush(bounds, colorTable.Start, colorTable.End, colorTable.GradientAngle);
+        }
+#endif
+        public static Brush CreateBrush(Rectangle bounds, BackgroundColorBlendCollection colorBlend, int gradientAngle, eGradientType gradientType)
+        {
+            eBackgroundColorBlendType blendType = colorBlend.GetBlendType();
+            if (blendType == eBackgroundColorBlendType.Invalid)
+                return null;
+
+            if (blendType == eBackgroundColorBlendType.SolidColor)
+            {
+                return new SolidBrush(colorBlend[0].Color);
+            }
+            else if (blendType == eBackgroundColorBlendType.Relative)
+            {
+                try
+                {
+                    if (gradientType == eGradientType.Linear)
+                    {
+                        bounds.Inflate(1, 1);
+                        LinearGradientBrush brush =
+                        DisplayHelp.CreateLinearGradientBrush(bounds, colorBlend[0].Color, colorBlend[colorBlend.Count - 1].Color,
+                                                          gradientAngle);
+                        brush.InterpolationColors = colorBlend.GetColorBlend();
+                        return brush;
+                    }
+                    else if (gradientType == eGradientType.Radial)
+                    {
+                        int d = (int)Math.Sqrt(bounds.Width * bounds.Width + bounds.Height * bounds.Height) + 4;
+                        GraphicsPath fillPath = new GraphicsPath();
+                        fillPath.AddEllipse(bounds.X - (d - bounds.Width) / 2, bounds.Y - (d - bounds.Height) / 2, d, d);
+                        PathGradientBrush brush = new PathGradientBrush(fillPath);
+                        brush.CenterColor = colorBlend[0].Color;
+                        brush.SurroundColors = new Color[] { colorBlend[colorBlend.Count - 1].Color };
+                        brush.InterpolationColors = colorBlend.GetColorBlend();
+                        return brush;
+                    }
+                }
+                catch
+                {
+                    return null;
+                }
+            }
+            else
+            {
+                BackgroundColorBlendCollection bc = colorBlend;
+                for (int i = 0; i < bc.Count; i += 2)
+                {
+                    BackgroundColorBlend b1 = bc[i];
+                    BackgroundColorBlend b2 = null;
+                    if (i < bc.Count)
+                        b2 = bc[i + 1];
+                    if (b1 != null && b2 != null)
+                    {
+                        Rectangle rb = new Rectangle(bounds.X, bounds.Y + (int)b1.Position, bounds.Width,
+                            (b2.Position == 1f ? bounds.Height : (int)b2.Position) - (int)b1.Position);
+                        return DisplayHelp.CreateLinearGradientBrush(rb, b1.Color, b2.Color, gradientAngle);
+                    }
+                }
+            }
+
+            return null;
+        }
+
+        public static System.Windows.Forms.ControlStyles DoubleBufferFlag
+        {
+            get
+            {
+#if FRAMEWORK20
+                return System.Windows.Forms.ControlStyles.OptimizedDoubleBuffer;
+#else
+                return System.Windows.Forms.ControlStyles.DoubleBuffer;
+#endif
+            }
+        }
+
+        private static TextRenderingHint s_AntiAliasTextRenderingHint = TextRenderingHint.ClearTypeGridFit;
+        public static TextRenderingHint AntiAliasTextRenderingHint
+        {
+            get
+            {
+                return s_AntiAliasTextRenderingHint;
+            }
+            set
+            {
+                s_AntiAliasTextRenderingHint = value;
+            }
+        }
+
+        public static Rectangle[] ExcludeRectangle(Rectangle r1, Rectangle exclude)
+        {
+            if (r1.X >= exclude.X && exclude.Right < r1.Right) // Left aligned
+                return new Rectangle[] { new Rectangle(exclude.Right, r1.Y, r1.Width - (exclude.Right - r1.X), r1.Height) };
+            else if (r1.Right <= exclude.Right && exclude.X > r1.X) // Right aligned
+                return new Rectangle[] { new Rectangle(r1.X, r1.Y, r1.Width - (r1.Right - exclude.X), r1.Height) };
+            else if (exclude.X > r1.X && exclude.Right < r1.Right)
+            {
+                return new Rectangle[] { new Rectangle(r1.X, r1.Y, exclude.X-r1.X, r1.Height),
+                    new Rectangle(exclude.Right, r1.Y, r1.Right - exclude.Right, r1.Height)};
+            }
+            else if (exclude.Bottom >= r1.Bottom && exclude.Y > r1.Y) // Bottom Aligned
+            {
+                return new Rectangle[] { new Rectangle(r1.X, r1.Y, r1.Width, Math.Max(0, exclude.Y - r1.Y)) };
+            }
+            else if (exclude.Y <= r1.Y && exclude.Bottom < r1.Bottom) // Top Aligned
+            {
+                return new Rectangle[] { new Rectangle(r1.X, exclude.Bottom, r1.Width, r1.Bottom - exclude.Bottom) };
+            }
+            return new Rectangle[] { };
+        }
+
+        internal static Size MaxSize(Size size1, Size size2)
+        {
+            if (size2.Width > size1.Width) size1.Width = size2.Width;
+            if (size2.Height > size1.Height) size1.Height = size2.Height;
+            return size1;
+        }
+
+        internal static void ExcludeEdgeRect(ref Rectangle captionRect, Rectangle exclude)
+        {
+            if (exclude.X + exclude.Width / 2 < captionRect.X + captionRect.Width / 2)
+            {
+                // Left aligned
+                int r = exclude.Right - captionRect.X;
+                captionRect.X = exclude.Right;
+                captionRect.Width -= r;
+            }
+            else
+            {
+                // Right aligned
+                captionRect.Width -= (captionRect.Right - exclude.X);
+            }
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DisplayMoreItem.cs b/PROMS/DotNetBar Source Code/DisplayMoreItem.cs
new file mode 100644
index 00000000..0a54df09
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DisplayMoreItem.cs	
@@ -0,0 +1,642 @@
+using System;
+using System.Drawing;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// System item that displays the items that could not fit inside the container on popup menu or toolbar.
+    /// </summary>
+    [System.ComponentModel.ToolboxItem(false),System.ComponentModel.DesignTimeVisible(false)]
+    public class DisplayMoreItem:PopupItem
+    {
+		private bool m_MouseOver;
+		private const int FIXED_SIZE=14;
+		private bool m_PopupSubItemsOnMenu;
+		private eOrientation m_OldOrientation=eOrientation.Horizontal;
+		private bool m_Localized=false;
+
+		/// <summary>
+		/// Create new instance of DisplayMoreItem object.
+		/// </summary>
+        public DisplayMoreItem()
+        {
+			this.GlobalItem=false;
+			m_MouseOver=false;
+			m_PopupSubItemsOnMenu=false;
+			m_Tooltip="More Buttons";
+			m_SystemItem=true;
+			this.CanCustomize=false;
+			m_ShouldSerialize=false;
+
+			// Localization loading will repeat in OnContainerChanged becouse at this time
+			// DotNetBarManager owner is not known and LocalizeString event cannot be invoked
+			using(LocalizationManager lm=new LocalizationManager(null))
+			{
+				m_Tooltip=lm.GetLocalizedString(LocalizationKeys.OverlfowDisplayMoreTooltip);
+			}
+        }
+
+		/// <summary>
+		/// Returns copy of DisplayMoreItem item
+		/// </summary>
+		public override BaseItem Copy()
+		{
+			DisplayMoreItem objCopy=new DisplayMoreItem();
+			this.CopyToItem(objCopy);
+			return objCopy;
+		}
+
+		/// <summary>
+		/// Called when item container has changed. If you override this method you must call the base implementation to allow default processing to occur.
+		/// </summary>
+		/// <param name="objOldContainer">Previous container of the item.</param>
+		protected internal override void OnContainerChanged(object objOldContainer)
+		{
+			base.OnContainerChanged(objOldContainer);
+			if(!m_Localized)
+			{
+				m_Localized=true;
+				using(LocalizationManager lm=new LocalizationManager(this.GetOwner() as IOwnerLocalize))
+				{
+					m_Tooltip=lm.GetLocalizedString(LocalizationKeys.OverlfowDisplayMoreTooltip);
+				}
+			}
+		}
+
+		/// <summary>
+		/// Returns the fixed size of the item.
+		/// </summary>
+		public static int FixedSize
+		{
+			get
+			{
+				return FIXED_SIZE;
+			}
+		}
+
+		/// <summary>
+		/// Overridden. Draws the item.
+		/// </summary>
+		/// <param name="g">Target Graphics object.</param>
+        public override void Paint(ItemPaintArgs pa)
+        {
+            if (this.SuspendLayout)
+                return;
+            eDotNetBarStyle effectiveStyle = EffectiveStyle;
+            if (effectiveStyle == eDotNetBarStyle.Office2000)
+                PaintOffice(pa);
+            else
+            {
+                if (this.IsThemed)
+                {
+                    PaintThemed(pa);
+                    return;
+                }
+                else if (effectiveStyle == eDotNetBarStyle.Office2003 || effectiveStyle == eDotNetBarStyle.VS2005 || BarFunctions.IsOffice2007Style(effectiveStyle))
+                {
+                    PaintOffice2003(pa);
+                    return;
+                }
+                else
+                    PaintDotNet(pa);
+            }
+
+            System.Drawing.Graphics g = pa.Graphics;
+
+            if (m_Orientation == eOrientation.Vertical)
+            {
+                Point[] p = new Point[3];
+                p[0].X = m_Rect.Right - 8;
+                p[0].Y = m_Rect.Top + 4;
+                p[1].X = p[0].X + 2;
+                p[1].Y = p[0].Y + 2;
+                p[2].X = p[0].X + 4;
+                p[2].Y = p[0].Y;
+                g.DrawLines(SystemPens.ControlText, p);
+                p[0].Y += 1;
+                p[1].Y += 1;
+                p[2].Y += 1;
+                g.DrawLines(SystemPens.ControlText, p);
+
+                p[0].Y += 3;
+                p[1].Y += 3;
+                p[2].Y += 3;
+                g.DrawLines(SystemPens.ControlText, p);
+                p[0].Y += 1;
+                p[1].Y += 1;
+                p[2].Y += 1;
+                g.DrawLines(SystemPens.ControlText, p);
+
+                p[0].X = m_Rect.Left + 7;
+                p[0].Y = m_Rect.Top + 4;
+                p[1].X = p[0].X - 3;
+                p[1].Y = p[0].Y + 3;
+                p[2].X = p[0].X;
+                p[2].Y = p[0].Y + 6;
+                g.FillPolygon(SystemBrushes.ControlText, p);
+            }
+            else
+            {
+                Point[] p = new Point[3];
+                p[0].X = m_Rect.Left + (m_Rect.Width - 7) / 2 - 1;
+                p[0].Y = m_Rect.Top + 4;
+                p[1].X = p[0].X + 2;
+                p[1].Y = p[0].Y + 2;
+                p[2].X = p[0].X;
+                p[2].Y = p[0].Y + 4;
+                g.DrawLines(SystemPens.ControlText, p);
+                p[0].X += 1;
+                p[1].X += 1;
+                p[2].X += 1;
+                g.DrawLines(SystemPens.ControlText, p);
+
+                p[0].X += 3;
+                p[1].X += 3;
+                p[2].X += 3;
+                g.DrawLines(SystemPens.ControlText, p);
+                p[0].X += 1;
+                p[1].X += 1;
+                p[2].X += 1;
+                g.DrawLines(SystemPens.ControlText, p);
+
+                p[0].X = m_Rect.Left + (m_Rect.Width / 2) - 1;
+                p[0].Y = m_Rect.Bottom - 4;
+                p[1].X = p[0].X - 2;
+                p[1].Y = p[0].Y - 3;
+                p[2].X = p[1].X + 5;
+                p[2].Y = p[1].Y;
+                g.FillPolygon(SystemBrushes.ControlText, p);
+            }
+        }
+
+		private void PaintDotNet(ItemPaintArgs pa)
+		{
+			Rectangle r;
+			System.Drawing.Graphics g=pa.Graphics;
+			if(m_Expanded)
+			{
+				r=new Rectangle(m_Rect.Left+2,m_Rect.Top+2,m_Rect.Width-2,m_Rect.Height-2);
+				if(!pa.Colors.ItemExpandedShadow.IsEmpty)
+				{
+					using(SolidBrush shadow=new SolidBrush(pa.Colors.ItemExpandedShadow))
+						g.FillRectangle(shadow,r);
+				}
+				r.Offset(-2,-2);
+				r.Height+=2;
+				if(pa.Colors.ItemExpandedBackground2.IsEmpty)
+					g.FillRectangle(new SolidBrush(pa.Colors.ItemExpandedBackground),r);
+				else
+				{
+					System.Drawing.Drawing2D.LinearGradientBrush gradient=BarFunctions.CreateLinearGradientBrush(r,pa.Colors.ItemExpandedBackground,pa.Colors.ItemExpandedBackground2,pa.Colors.ItemExpandedBackgroundGradientAngle);
+					g.FillRectangle(gradient,r);
+					gradient.Dispose();
+				}
+                // TODO: Beta 2 fix --> g.DrawRectangle(new Pen(ColorFunctions.MenuFocusBorderColor(g),1),r);
+				NativeFunctions.DrawRectangle(g,new Pen(pa.Colors.MenuBorder,1),r);
+			}
+			else if(m_MouseOver)
+			{
+				r=new Rectangle(m_Rect.Left,m_Rect.Top,m_Rect.Width-2,m_Rect.Height);
+				if(!pa.Colors.ItemHotBackground2.IsEmpty)
+				{
+					System.Drawing.Drawing2D.LinearGradientBrush gradient=BarFunctions.CreateLinearGradientBrush(r,pa.Colors.ItemHotBackground,pa.Colors.ItemHotBackground2,pa.Colors.ItemHotBackgroundGradientAngle);
+					g.FillRectangle(gradient,r);
+					gradient.Dispose();
+				}
+				else
+					g.FillRectangle(new SolidBrush(pa.Colors.ItemHotBackground),r);
+				// TODO: Beta 2 Fix --> g.DrawRectangle(SystemPens.Highlight,r);
+				NativeFunctions.DrawRectangle(g,new Pen(pa.Colors.ItemHotBorder),r);
+			}
+		}
+
+		private void PaintThemed(ItemPaintArgs pa)
+		{
+			ThemeRebar theme=pa.ThemeRebar;
+			ThemeRebarParts part=ThemeRebarParts.Chevron;
+			ThemeRebarStates state=ThemeRebarStates.ChevronNormal;
+			if(m_Expanded)
+				state=ThemeRebarStates.ChevronPressed;
+			else if(m_MouseOver)
+				state=ThemeRebarStates.ChevronHot;
+
+			theme.DrawBackground(pa.Graphics,part,state,m_Rect);
+		}
+
+		private void PaintOffice(ItemPaintArgs pa)
+		{
+			System.Drawing.Graphics g=pa.Graphics;
+			if(m_Expanded)
+			{
+				System.Windows.Forms.ControlPaint.DrawBorder3D(g,m_Rect,System.Windows.Forms.Border3DStyle.SunkenOuter);
+			}
+			else if(m_MouseOver)
+			{
+				System.Windows.Forms.ControlPaint.DrawBorder3D(g,m_Rect,System.Windows.Forms.Border3DStyle.RaisedInner);
+			}
+		}
+
+		private void PaintOffice2003(ItemPaintArgs pa)
+		{
+			Graphics g=pa.Graphics;
+
+			// When on docked toolbar it has a special look...
+			Rectangle r=m_Rect;
+
+            System.Drawing.Drawing2D.GraphicsPath path = new System.Drawing.Drawing2D.GraphicsPath();
+            if (this.Orientation == eOrientation.Vertical)
+            {
+                // When on docked toolbar it has a special look...
+                r.Y += 2;
+                r.Height -= 1;
+                r.X -= 2;
+                r.Width += 2;
+
+                path.AddLine(r.X, r.Y, r.X + 2, r.Y + 2);
+                path.AddLine(r.Right - 2, r.Y + 2, r.Right, r.Y);
+                path.AddLine(r.Right, r.Bottom - 2, r.Right - 2, r.Bottom);
+                path.AddLine(r.X + 2, r.Bottom, r.X, r.Bottom - 2);
+                path.CloseAllFigures();
+            }
+            else
+            {
+                // When on docked toolbar it has a special look...
+                r.X += 2;
+                r.Width -= 1;
+                r.Y -= 2;
+                r.Height += 3;
+
+                path.AddLine(r.X, r.Y, r.X + 2, r.Y + 2);
+                path.AddLine(r.X + 2, r.Bottom - 2, r.X, r.Bottom);
+                path.AddLine(r.Right - 2, r.Bottom, r.Right, r.Bottom - 2);
+                path.AddLine(r.Right, r.Y + 2, r.Right - 2, r.Y);
+                path.CloseAllFigures();
+            }
+
+			System.Drawing.Drawing2D.SmoothingMode smooth=g.SmoothingMode;
+			g.SmoothingMode=System.Drawing.Drawing2D.SmoothingMode.AntiAlias;
+			if(this.Expanded)
+			{
+				System.Drawing.Drawing2D.LinearGradientBrush gradient=BarFunctions.CreateLinearGradientBrush(r,pa.Colors.ItemPressedBackground,pa.Colors.ItemPressedBackground2,pa.Colors.ItemPressedBackgroundGradientAngle);
+				g.FillPath(gradient,path);
+				gradient.Dispose();
+			}
+			else if(m_MouseOver)
+			{
+				System.Drawing.Drawing2D.LinearGradientBrush gradient=BarFunctions.CreateLinearGradientBrush(r,pa.Colors.ItemHotBackground,pa.Colors.ItemHotBackground2,pa.Colors.ItemHotBackgroundGradientAngle);
+				g.FillPath(gradient,path);
+				gradient.Dispose();
+			}
+			else
+			{
+				System.Drawing.Drawing2D.LinearGradientBrush gradient=BarFunctions.CreateLinearGradientBrush(r,pa.Colors.CustomizeBackground,pa.Colors.CustomizeBackground2,pa.Colors.CustomizeBackgroundGradientAngle);
+				g.FillPath(gradient,path);
+				gradient.Dispose();
+			}
+			g.SmoothingMode=smooth;
+
+            if (this.Orientation == eOrientation.Vertical)
+            {
+                g.DrawLine(SystemPens.HighlightText, r.Left + (m_Rect.Width - 4) / 2, r.Bottom - 10 + 1, r.Left + (m_Rect.Width - 4) / 2 + 4, r.Bottom - 10 + 1);
+
+                g.DrawLine(SystemPens.HighlightText, r.Left + (m_Rect.Width - 4) / 2 - 1 + 1, r.Top + 6 + 1, r.Left + (m_Rect.Width - 4) / 2 - 1 + 1, r.Top + 8 + 1);
+                g.DrawLine(SystemPens.HighlightText, r.Left + (m_Rect.Width - 4) / 2 + 3 + 1, r.Top + 6 + 1, r.Left + (m_Rect.Width - 4) / 2 + 3 + 1, r.Top + 8 + 1);
+                g.DrawLine(SystemPens.HighlightText, r.Left + (m_Rect.Width - 4) / 2 - 1 + 1, r.Top + 7 + 1, r.Left + (m_Rect.Width - 4) / 2 + 1, r.Top + 7 + 1);
+                g.DrawLine(SystemPens.HighlightText, r.Left + (m_Rect.Width - 4) / 2 + 3 + 1, r.Top + 7 + 1, r.Left + (m_Rect.Width - 4) / 2 + 4 + 1, r.Top + 7 + 1);
+
+                // Draw Arrow
+                using (Pen pen = new Pen(pa.Colors.CustomizeText, 1))
+                {
+                    g.DrawLine(pen, r.Left + (m_Rect.Width - 4) / 2, r.Bottom - 10, r.Left + (m_Rect.Width - 4) / 2 + 4, r.Bottom - 10);
+
+                    g.DrawLine(pen, r.Left + (m_Rect.Width - 4) / 2 - 1, r.Top + 6, r.Left + (m_Rect.Width - 4) / 2 - 1, r.Top + 8);
+                    g.DrawLine(pen, r.Left + (m_Rect.Width - 4) / 2 + 3, r.Top + 6, r.Left + (m_Rect.Width - 4) / 2 + 3, r.Top + 8);
+                    g.DrawLine(pen, r.Left + (m_Rect.Width - 4) / 2 - 1, r.Top + 7, r.Left + (m_Rect.Width - 4) / 2, r.Top + 7);
+                    g.DrawLine(pen, r.Left + (m_Rect.Width - 4) / 2 + 3, r.Top + 7, r.Left + (m_Rect.Width - 4) / 2 + 4, r.Top + 7);
+                }
+            }
+            else
+            {
+                g.DrawLine(SystemPens.HighlightText, r.Left + (m_Rect.Width - 4) / 2 + 1, r.Bottom - 11 + 1, r.Left + (m_Rect.Width - 4) / 2 + 4 + 1, r.Bottom - 11 + 1);
+
+                g.DrawLine(SystemPens.HighlightText, r.Left + (m_Rect.Width - 4) / 2 - 1 + 1, r.Top + 6 + 1, r.Left + (m_Rect.Width - 4) / 2 - 1 + 1, r.Top + 8 + 1);
+                g.DrawLine(SystemPens.HighlightText, r.Left + (m_Rect.Width - 4) / 2 + 3 + 1, r.Top + 6 + 1, r.Left + (m_Rect.Width - 4) / 2 + 3 + 1, r.Top + 8 + 1);
+                g.DrawLine(SystemPens.HighlightText, r.Left + (m_Rect.Width - 4) / 2 - 1 + 1, r.Top + 7 + 1, r.Left + (m_Rect.Width - 4) / 2 + 1, r.Top + 7 + 1);
+                g.DrawLine(SystemPens.HighlightText, r.Left + (m_Rect.Width - 4) / 2 + 3 + 1, r.Top + 7 + 1, r.Left + (m_Rect.Width - 4) / 2 + 4 + 1, r.Top + 7 + 1);
+
+                // Draw Arrow Shade
+                Point[] p = new Point[3];
+                p[0].X = r.Left + (m_Rect.Width - 4) / 2 + 2 + 1;
+                p[0].Y = r.Bottom - 5 + 1;
+                p[1].X = p[0].X - 2;
+                p[1].Y = p[0].Y - 3;
+                p[2].X = p[1].X + 5;
+                p[2].Y = p[1].Y;
+                using (SolidBrush brush = new SolidBrush(SystemColors.HighlightText))
+                    g.FillPolygon(brush, p);
+
+                // Draw Arrow
+                using (Pen pen = new Pen(pa.Colors.CustomizeText, 1))
+                {
+                    g.DrawLine(pen, r.Left + (m_Rect.Width - 4) / 2, r.Bottom - 11, r.Left + (m_Rect.Width - 4) / 2 + 4, r.Bottom - 11);
+
+                    g.DrawLine(pen, r.Left + (m_Rect.Width - 4) / 2 - 1, r.Top + 6, r.Left + (m_Rect.Width - 4) / 2 - 1, r.Top + 8);
+                    g.DrawLine(pen, r.Left + (m_Rect.Width - 4) / 2 + 3, r.Top + 6, r.Left + (m_Rect.Width - 4) / 2 + 3, r.Top + 8);
+                    g.DrawLine(pen, r.Left + (m_Rect.Width - 4) / 2 - 1, r.Top + 7, r.Left + (m_Rect.Width - 4) / 2, r.Top + 7);
+                    g.DrawLine(pen, r.Left + (m_Rect.Width - 4) / 2 + 3, r.Top + 7, r.Left + (m_Rect.Width - 4) / 2 + 4, r.Top + 7);
+                }
+                p = new Point[3];
+                p[0].X = r.Left + (m_Rect.Width - 4) / 2 + 2;
+                p[0].Y = r.Bottom - 5;
+                p[1].X = p[0].X - 2;
+                p[1].Y = p[0].Y - 3;
+                p[2].X = p[1].X + 5;
+                p[2].Y = p[1].Y;
+                using (SolidBrush brush = new SolidBrush(pa.Colors.CustomizeText))
+                    g.FillPolygon(brush, p);
+            }
+		}
+
+		/// <summary>
+		/// Overriden. Recalculates the size of the item.
+		/// </summary>
+		public override void RecalcSize()
+		{
+			if(this.SuspendLayout)
+				return;
+
+			if(m_Orientation==eOrientation.Vertical)
+			{
+				// Take suggested width
+				m_Rect.Height=FIXED_SIZE;
+			}
+			else
+			{
+				// Take suggested height
+				m_Rect.Width=FIXED_SIZE;
+			}
+			base.RecalcSize();
+		}
+
+		[System.ComponentModel.Browsable(false),System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+		public override void InternalMouseEnter()
+		{
+			base.InternalMouseEnter();
+			m_MouseOver=true;
+			this.Refresh();
+		}
+
+		[System.ComponentModel.Browsable(false),System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+		public override void InternalMouseLeave()
+		{
+			base.InternalMouseLeave();
+			m_MouseOver=false;
+			this.Refresh();
+		}
+
+		[System.ComponentModel.Browsable(false),System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+		public override void InternalMouseDown(System.Windows.Forms.MouseEventArgs objArg)
+		{
+			base.InternalMouseDown(objArg);
+			if(objArg.Button != System.Windows.Forms.MouseButtons.Left)
+				return;
+			//if(m_Expanded)
+			//	m_Parent.AutoExpand=false;
+			this.Expanded=!m_Expanded;
+		}
+
+		/// <summary>
+		/// Overridden. Displays the sub-items on popup.
+		/// </summary>
+		/// <param name="p">Popup location.</param>
+		public override void Popup(Point p)
+		{
+			Popup(p.X,p.Y);
+		}
+
+		/// <summary>
+		/// Overridden. Displays the sub-items on popup.
+		/// </summary>
+		/// <param name="x">Horizontal coordinate in pixels of the upper left corner of a popup.</param>
+		/// <param name="y">Vertical coordinate in pixels of the upper left corner of a popup.</param>
+		public override void Popup(int x, int y)
+		{
+			if(m_PopupSubItemsOnMenu)
+				PopupMenu(x,y);
+			else
+				PopupBar(x,y);
+		}
+
+		/// <summary>
+		/// Overridden. Displays the sub-items on popup toolbar.
+		/// </summary>
+		/// <param name="x">Horizontal coordinate in pixels of the upper left corner of a popup.</param>
+		/// <param name="y">Vertical coordinate in pixels of the upper left corner of a popup.</param>
+		public override void PopupBar(int x, int y)
+		{
+			AddItems();
+			// Reset Need Recalc Size since adding the items will trigger this flag
+			m_NeedRecalcSize=false;
+			base.PopupBar(x,y);
+            m_NeedRecalcSize = false;
+		}
+
+		/// <summary>
+		/// Overridden. Displays the sub-items on popup menu.
+		/// </summary>
+		/// <param name="x">Horizontal coordinate in pixels of the upper left corner of a popup.</param>
+		/// <param name="y">Vertical coordinate in pixels of the upper left corner of a popup.</param>
+		public override void PopupMenu(int x, int y)
+		{
+			AddItems();
+			// Reset Need Recalc Size since adding the items will trigger this flag
+			m_NeedRecalcSize=false;
+			base.PopupMenu(x,y);
+            m_NeedRecalcSize = false;
+		}
+
+		/// <summary>
+		/// Overridden. Close the popup window if open.
+		/// </summary>
+		public override void ClosePopup()
+		{
+			base.ClosePopup();
+			this.SubItems.Clear();
+		}
+
+		/// <summary>
+		/// Get or sets whether item has been changed in a way that it needs its size recalculated. This is internal
+		/// property and it should not be used by your code.
+		/// </summary>
+		[Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public override bool NeedRecalcSize
+		{
+			get
+			{
+				return base.NeedRecalcSize;
+			}
+			set
+			{
+				m_NeedRecalcSize=value;
+			}
+		}
+
+        /// <summary>
+        /// Adds the items that are not visible to the overflow popup.
+        /// </summary>
+		protected virtual void AddItems()
+		{
+			if(m_SubItems==null)
+			{
+				m_SubItems=new SubItemsCollection(this);
+			}
+
+			m_OldOrientation=this.Orientation;
+			foreach(BaseItem objItem in m_Parent.SubItems)
+			{
+				if(!objItem.Displayed && objItem.Visible)
+				{
+					m_SubItems._Add(objItem);
+					ImageItem objImageItem=objItem as ImageItem;
+					if(objImageItem!=null)
+					{
+						if(objImageItem.ImageSize.Width>this.SubItemsImageSize.Width)
+							this.SubItemsImageSize=new Size(objImageItem.ImageSize.Width,this.SubItemsImageSize.Height);
+						if(objImageItem.ImageSize.Height>this.SubItemsImageSize.Height)
+							this.SubItemsImageSize=new Size(this.SubItemsImageSize.Width,objImageItem.ImageSize.Height);
+					}
+				}
+			}
+			
+			foreach(BaseItem objItem in m_SubItems)
+			{
+				object objItemContainer=objItem.ContainerControl;
+				m_Parent.SubItems._Remove(objItem);
+				objItem.SetOrientation(eOrientation.Horizontal);
+				objItem.SetParent(this);
+				objItem.ContainerControl=null;
+				objItem.OnContainerChanged(objItemContainer);
+			}
+			NeedRecalcSize=true;
+		}
+
+        /// <summary>
+        /// Returns the insertion index for the items removed from overflow popup. Assumes that right-most items are removed first by the layout manager.
+        /// </summary>
+        /// <returns></returns>
+        protected virtual int GetReInsertIndex()
+        {
+            int insertPos = m_Parent.SubItems.Count;
+            for (int i = insertPos - 1; i >= 0; i--)
+            {
+                if (m_Parent.SubItems[i] is CustomizeItem)
+                {
+                    insertPos = i;
+                    break;
+                }
+            }
+            return insertPos;
+        }
+
+        /// <summary>
+        /// Removes the items from the overflow and adds them back to the parent item.
+        /// </summary>
+        protected virtual void RemoveItems()
+        {
+            // Return the items back to the parent...
+            m_HotSubItem = null;
+            // Need to leave customize item at the end of the collection
+            int insertPos = GetReInsertIndex();
+
+            foreach (BaseItem objItem in m_SubItems)
+            {
+                object objItemContainer = objItem.ContainerControl;
+                objItem.Orientation = m_OldOrientation;
+                m_Parent.SubItems._Add(objItem, insertPos);
+                insertPos++;
+                objItem.SetParent(m_Parent);
+                objItem.ContainerControl = null;
+            }
+            System.Collections.ArrayList col = new System.Collections.ArrayList(m_SubItems.Count);
+            m_SubItems.CopyTo(col);
+            while (m_SubItems.Count > 0)
+                m_SubItems._Remove(m_SubItems[0]);
+            foreach (BaseItem item in col)
+                item.Displayed = false;
+
+            base.OnExpandChange();
+
+            if (this.PopupControl is Bar)
+            {
+                Bar bar = (Bar)this.PopupControl;
+                bar.ParentItem = null;
+            }
+
+            BaseItem objParent = m_Parent;
+
+            System.Windows.Forms.Control objCtrl = null;
+            if (objParent != null)
+                objCtrl = objParent.ContainerControl as System.Windows.Forms.Control;
+            bool recalcSize = true;
+            if (objCtrl != null)
+            {
+                recalcSize= !BarFunctions.InvokeRecalcLayout(objCtrl, false);
+            }
+            if (recalcSize && objParent != null)
+            {
+                objParent.RecalcSize();
+                objParent.Refresh();
+            }
+        }
+
+		protected internal override void OnExpandChange()
+		{
+			if(!this.Expanded && m_SubItems!=null && m_Parent!=null)
+			{
+                RemoveItems();
+				return;
+			}
+			base.OnExpandChange();
+		}
+
+		/// <summary>
+		/// Forces the repaint the item.
+		/// </summary>
+		public override void Refresh()
+		{
+			if(this.SuspendLayout)
+				return;
+            if ((EffectiveStyle == eDotNetBarStyle.Office2003 || EffectiveStyle == eDotNetBarStyle.VS2005 || BarFunctions.IsOffice2007Style(EffectiveStyle)) && !BaseItem.IsOnPopup(this))
+			{
+				if((m_Visible || this.IsOnCustomizeMenu) && m_Displayed)
+				{
+					System.Windows.Forms.Control objCtrl=this.ContainerControl as System.Windows.Forms.Control;
+					if(objCtrl!=null && IsHandleValid(objCtrl) && !(objCtrl is ItemsListBox))
+					{
+						if(m_NeedRecalcSize)
+						{
+							RecalcSize();
+							if(m_Parent!=null)
+								m_Parent.SubItemSizeChanged(this);
+						}
+						Rectangle r=m_Rect;
+						r.Inflate(2,2);
+						objCtrl.Invalidate(r,true);
+					}
+				}
+			}
+			else
+				base.Refresh();
+		}
+
+        /// <summary>
+        /// Gets whether the mouse is over the item.
+        /// </summary>
+        [Browsable(false)]
+        public bool IsMouseOver
+        {
+            get { return m_MouseOver; }
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DockContainerItem.cs b/PROMS/DotNetBar Source Code/DockContainerItem.cs
new file mode 100644
index 00000000..f5abf87d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DockContainerItem.cs	
@@ -0,0 +1,1620 @@
+using System;
+using System.Drawing;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Item container for dockable windows.
+	/// </summary>
+    [System.ComponentModel.ToolboxItem(false), System.ComponentModel.DesignTimeVisible(false), Designer("DevComponents.DotNetBar.Design.DockContainerItemDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+	public class DockContainerItem:ImageItem
+	{
+		/// <summary>
+		/// Occurs when container control needs to be assigned to the item.
+		/// </summary>
+		public event EventHandler ContainerLoadControl;
+		public event ControlContainerItem.ControlContainerSerializationEventHandler ContainerControlSerialize;
+		public event ControlContainerItem.ControlContainerSerializationEventHandler ContainerControlDeserialize;
+
+		private System.Windows.Forms.Control m_Control=null;
+		private bool m_MouseOver=false;
+		private bool m_InternalResize=false;
+		private Size m_MinimumSize=new Size(32,32);
+		private Size m_DefaultFloatingSize=new Size(128,128);
+
+		private System.Drawing.Image m_Image=null;
+		private int m_ImageIndex=-1;
+		private System.Drawing.Image m_TabImage=null;
+		private System.Drawing.Icon m_Icon=null;
+		
+		private int m_MinFormClientSize=64;
+		private int m_DelayedWidth=-1;
+		private int m_DelayedHeight=-1;
+        private eTabItemColor m_PredefinedTabColor = eTabItemColor.Default;
+
+		/// <summary>
+		/// Creates new instance of ControlContainerItem and assigns item name.
+		/// </summary>
+		public DockContainerItem():this("","") {}
+		/// <summary>
+		/// Creates new instance of ControlContainerItem and assigns item name.
+		/// </summary>
+		/// <param name="sName">Item name.</param>
+		public DockContainerItem(string sName):this(sName,""){}
+		/// <summary>
+		/// Creates new instance of ControlContainerItem and assigns item name and item text.
+		/// </summary>
+		/// <param name="sName">Item name.</param>
+		/// <param name="ItemText">Item text.</param>
+		public DockContainerItem(string sName, string ItemText):base(sName,ItemText)
+		{
+			m_SupportedOrientation=eSupportedOrientation.Both;
+			this.Stretch=true;
+			this.CanCustomize=false;
+			m_Displayed=true;  // need so the hosted control can be hidden...
+            this.GlobalItem = false;
+		}
+
+		internal void InitControl()
+		{
+			EventArgs e=new EventArgs();
+			if(ContainerLoadControl!=null)
+				ContainerLoadControl(this,e);
+			IOwnerItemEvents owner=this.GetIOwnerItemEvents();
+			if(owner!=null)
+				owner.InvokeContainerLoadControl(this,e);
+		}
+
+		/// <summary>
+		/// Overriden. Returns the copy of the ControlContainerItem.
+		/// </summary>
+		/// <returns>Copy of the ControlContainerItem.</returns>
+		public override BaseItem Copy()
+		{
+            DockContainerItem objCopy = new DockContainerItem(this.Name);
+			this.CopyToItem(objCopy);
+			return objCopy;
+		}
+		protected override void CopyToItem(BaseItem copy)
+		{
+			DockContainerItem objCopy=copy as DockContainerItem;
+			base.CopyToItem(objCopy);
+			objCopy.SetImageIndex(m_ImageIndex);
+			if(m_Icon!=null)
+				objCopy.Icon=m_Icon.Clone() as Icon;
+			if(objCopy.Image!=null)
+				objCopy.Image=m_Image.Clone() as Image;
+			objCopy.ContainerLoadControl=this.ContainerLoadControl;
+			objCopy.InitControl();
+		}
+        protected override void Dispose(bool disposing)
+		{
+            if (BarUtilities.DisposeItemImages && !this.DesignMode)
+            {
+                BarUtilities.DisposeImage(ref m_Image);
+                BarUtilities.DisposeImage(ref m_Icon);
+            }
+			m_Control=null;
+			base.Dispose(disposing);
+		}
+		protected internal override void Serialize(ItemSerializationContext context)
+		{
+			base.Serialize(context);
+            System.Xml.XmlElement ThisItem = context.ItemXmlElement;
+			System.Xml.XmlElement xmlElem=null, xmlElem2=null;
+			// Serialize Images
+			if(m_Image!=null || m_ImageIndex>=0)
+			{
+				xmlElem=ThisItem.OwnerDocument.CreateElement("images");
+				ThisItem.AppendChild(xmlElem);
+
+				if(m_ImageIndex>=0)
+					xmlElem.SetAttribute("imageindex",System.Xml.XmlConvert.ToString(m_ImageIndex));
+
+				if(m_Image!=null)
+				{
+					xmlElem2=ThisItem.OwnerDocument.CreateElement("image");
+					xmlElem2.SetAttribute("type","default");
+					xmlElem.AppendChild(xmlElem2);
+					BarFunctions.SerializeImage(m_Image,xmlElem2);
+				}
+			}
+			else if(m_Icon!=null)
+			{
+				xmlElem=ThisItem.OwnerDocument.CreateElement("images");
+				ThisItem.AppendChild(xmlElem);
+
+				xmlElem2=ThisItem.OwnerDocument.CreateElement("image");
+				xmlElem2.SetAttribute("type","icon");
+				xmlElem.AppendChild(xmlElem2);
+				BarFunctions.SerializeIcon(m_Icon,xmlElem2);
+			}
+
+			if(m_MinimumSize.Width!=32 || m_MinimumSize.Height!=32)
+			{
+				ThisItem.SetAttribute("minw",m_MinimumSize.Width.ToString());
+				ThisItem.SetAttribute("minh",m_MinimumSize.Height.ToString());
+			}
+
+			if(m_DefaultFloatingSize.Width!=128 || m_DefaultFloatingSize.Height!=128)
+			{
+				ThisItem.SetAttribute("defw",m_DefaultFloatingSize.Width.ToString());
+				ThisItem.SetAttribute("defh",m_DefaultFloatingSize.Height.ToString());
+			}
+
+			if(m_MinFormClientSize!=64)
+			{
+				ThisItem.SetAttribute("csize",m_MinFormClientSize.ToString());
+			}
+
+            if(m_PredefinedTabColor!=eTabItemColor.Default)
+                ThisItem.SetAttribute("PredefinedTabColor", System.Xml.XmlConvert.ToString(((int)m_PredefinedTabColor)));
+
+
+			if(ContainerControlSerialize!=null)
+				this.ContainerControlSerialize(this,new ControlContainerSerializationEventArgs(ThisItem));
+			IOwnerItemEvents owner=this.GetIOwnerItemEvents();
+			if(owner!=null)
+				owner.InvokeContainerControlSerialize(this,new ControlContainerSerializationEventArgs(ThisItem));
+
+		}
+		public override void Deserialize(ItemSerializationContext context)
+		{
+			base.Deserialize(context);
+
+            System.Xml.XmlElement ItemXmlSource = context.ItemXmlElement;
+
+			// Load Images
+			foreach(System.Xml.XmlElement xmlElem in ItemXmlSource.ChildNodes)
+			{
+				if(xmlElem.Name=="images")
+				{
+					if(xmlElem.HasAttribute("imageindex"))
+						m_ImageIndex=System.Xml.XmlConvert.ToInt32(xmlElem.GetAttribute("imageindex"));
+
+					foreach(System.Xml.XmlElement xmlElem2 in xmlElem.ChildNodes)
+					{
+						if(xmlElem2.GetAttribute("type")=="default")
+						{
+							m_Image=BarFunctions.DeserializeImage(xmlElem2);
+							m_ImageIndex=-1;
+						}
+						else if(xmlElem2.GetAttribute("type")=="icon")
+						{
+							m_Icon=BarFunctions.DeserializeIcon(xmlElem2);
+							m_ImageIndex=-1;
+						}
+					}
+					break;
+				}
+			}
+
+			if(ItemXmlSource.HasAttribute("minw"))
+			{
+				m_MinimumSize=new Size(System.Xml.XmlConvert.ToInt32(ItemXmlSource.GetAttribute("minw")),System.Xml.XmlConvert.ToInt32(ItemXmlSource.GetAttribute("minh")));
+			}
+
+			if(ItemXmlSource.HasAttribute("defw"))
+			{
+				m_DefaultFloatingSize=new Size(System.Xml.XmlConvert.ToInt32(ItemXmlSource.GetAttribute("defw")),System.Xml.XmlConvert.ToInt32(ItemXmlSource.GetAttribute("defh")));
+			}
+
+			if(ItemXmlSource.HasAttribute("csize"))
+				m_MinFormClientSize=System.Xml.XmlConvert.ToInt32(ItemXmlSource.GetAttribute("csize"));
+			else
+				m_MinFormClientSize=64;
+
+            if (ItemXmlSource.HasAttribute("PredefinedTabColor"))
+                m_PredefinedTabColor = (eTabItemColor)System.Xml.XmlConvert.ToInt32(ItemXmlSource.GetAttribute("PredefinedTabColor"));
+            else
+                m_PredefinedTabColor = eTabItemColor.Default;
+
+			InitControl();
+
+            if (m_Control == null && context.DockControls != null && context.DockControls.ContainsKey(this.Name))
+            {
+                this.Control = context.DockControls[this.Name] as System.Windows.Forms.Control;
+                context.DockControls.Remove(this.Name);
+            }
+
+			if(ContainerControlDeserialize!=null)
+				this.ContainerControlDeserialize(this,new ControlContainerSerializationEventArgs(ItemXmlSource));
+			IOwnerItemEvents owner=this.GetIOwnerItemEvents();
+			if(owner!=null)
+				owner.InvokeContainerControlDeserialize(this,new ControlContainerSerializationEventArgs(ItemXmlSource));
+		}
+
+        private DockItemAccessibleObject _AccessibleObject = null;
+        protected override System.Windows.Forms.AccessibleObject CreateAccessibilityInstance()
+        {
+            if (_AccessibleObject == null)
+                _AccessibleObject = new DockItemAccessibleObject(this);
+            return _AccessibleObject;
+        }
+
+		/// <summary>
+		/// Gets or sets the reference to the contained control.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DevCoBrowsable(false),DefaultValue(null),Description("Indicates the control hosted on dockable window"),Category("Docking")]
+		public System.Windows.Forms.Control Control
+		{
+			get
+			{
+				return m_Control;
+			}
+			set
+			{
+				if(m_Control!=null)
+				{
+					if(m_Control.Parent!=null)
+					{
+						if(!(this.DesignMode && this.Site!=null))
+						{
+							m_Control.Visible=false;
+						}
+						m_Control.Parent.Controls.Remove(m_Control);
+					}
+				}
+				m_Control=value;
+				if(m_Control!=null)
+				{
+					if(m_Control is PanelDockContainer)
+						((PanelDockContainer)m_Control).DockContainerItem=this;
+
+					if(m_Control is System.Windows.Forms.ListBox)
+						((System.Windows.Forms.ListBox)m_Control).IntegralHeight=false;
+
+					if(m_Control.Parent!=null)
+						m_Control.Parent.Controls.Remove(m_Control);
+
+					m_Control.Dock=System.Windows.Forms.DockStyle.None;
+
+					// Check auto-size property
+					PropertyDescriptorCollection props=TypeDescriptor.GetProperties(m_Control);
+					if(props.Find("AutoSize",true)!=null)
+					{
+						props.Find("AutoSize",true).SetValue(m_Control,false);
+					}
+
+					if(!(this.DesignMode && this.Site!=null))
+					{
+						m_Control.Visible=false;
+					}
+
+					System.Windows.Forms.Control objCtrl=null;
+					if(this.ContainerControl!=null)
+					{
+						objCtrl=this.ContainerControl as System.Windows.Forms.Control;
+						if(objCtrl!=null)
+						{
+							objCtrl.Controls.Add(m_Control);
+							if(this.DesignMode && this.Site!=null && m_Control.Visible && !this.Selected)
+								m_Control.SendToBack();
+						}
+					}
+
+					OnDisplayedChanged();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Returns category for this item. If item cannot be customzied using the
+		/// customize dialog category is empty string.
+		/// </summary>
+		[Browsable(false),DevCoBrowsable(false),DefaultValue(""),Category("Design"),Description("Indicates item category used to group similar items at design-time.")]
+		public override string Category
+		{
+			get {return base.Category;}
+			set {base.Category=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets whether Click event will be auto repeated when mouse button is kept pressed over the item.
+		/// </summary>
+		[Browsable(false),DevCoBrowsable(false),DefaultValue(false),Category("Behavior"),Description("Gets or sets whether Click event will be auto repeated when mouse button is kept pressed over the item.")]
+		public override bool ClickAutoRepeat
+		{
+			get {return base.ClickAutoRepeat;}
+			set {base.ClickAutoRepeat=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets the auto-repeat interval for the click event when mouse button is kept pressed over the item.
+		/// </summary>
+		[Browsable(false),DevCoBrowsable(false),DefaultValue(600),Category("Behavior"),Description("Gets or sets the auto-repeat interval for the click event when mouse button is kept pressed over the item.")]
+		public override int ClickRepeatInterval
+		{
+			get {return base.ClickRepeatInterval;}
+			set {base.ClickRepeatInterval=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets item description. This description is displayed in
+		/// Customize dialog to describe the item function in an application.
+		/// </summary>
+		[Browsable(false),DevCoBrowsable(false),DefaultValue(""),Category("Design"),Description("Indicates description of the item that is displayed during design.")]
+		public override string Description
+		{
+			get {return base.Description;}
+			set {base.Description=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets item alignment inside the container.
+		/// </summary>
+		[Browsable(false),DevCoBrowsable(false),DefaultValue(eItemAlignment.Near),Category("Appearance"),Description("Determines alignment of the item inside the container.")]
+		public override eItemAlignment ItemAlignment
+		{
+			get {return base.ItemAlignment;}
+			set {base.ItemAlignment=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets the collection of shortcut keys associated with the item.
+		/// </summary>
+		[Browsable(false),DevCoBrowsable(false),Category("Design"),Description("Indicates list of shortcut keys for this item."),System.ComponentModel.Editor("DevComponents.DotNetBar.Design.ShortcutsDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf",typeof(System.Drawing.Design.UITypeEditor)),System.ComponentModel.TypeConverter("DevComponents.DotNetBar.Design.ShortcutsConverter, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf"),System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
+		public override ShortcutsCollection Shortcuts
+		{
+			get {return base.Shortcuts;}				
+			set {base.Shortcuts=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets whether item will display sub items.
+		/// </summary>
+		[Browsable(false),DevCoBrowsable(false),DefaultValue(true),Category("Behavior"),Description("Determines whether sub-items are displayed.")]
+		public override bool ShowSubItems
+		{
+			get {return base.ShowSubItems;}
+			set {base.ShowSubItems=value;}
+		}
+
+//		private void ControlResize(object sender, EventArgs e)
+//		{
+//			if(m_Painting || m_InternalResize)
+//				return;
+//			m_ControlSize=m_Control.Size;
+//		}
+        protected override void OnExternalSizeChange()
+        {
+            //if (this.DesignMode)
+                ResizeControl();
+            base.OnExternalSizeChange();
+        }
+		private void ResizeControl()
+		{
+			if(m_InternalResize)
+				return;
+			m_InternalResize=true;
+			try
+			{
+				Rectangle r=this.DisplayRectangle;
+                
+				Size objImageSize=GetMaxImageSize();
+				bool bOnMenu=this.IsOnMenu;
+                if (bOnMenu && EffectiveStyle != eDotNetBarStyle.Office2000)
+				{
+					objImageSize.Width+=7;
+					r.Width-=objImageSize.Width;
+					r.X+=objImageSize.Width;
+				}
+
+				if(this.IsOnCustomizeMenu)
+				{
+                    if (EffectiveStyle != eDotNetBarStyle.Office2000)
+					{
+						r.X+=(objImageSize.Height+8);
+						r.Width-=(objImageSize.Height+8);
+					}
+					else
+					{
+						r.X+=(objImageSize.Height+4);
+						r.Width-=(objImageSize.Height+4);
+					}
+				}
+
+				if(m_Control!=null)
+				{
+                    r.Inflate(-2, -2);
+                    if (r.Width > 0 && r.Height > 0)
+                    {
+                        if (!m_Control.Size.Equals(r.Size))
+                        {
+                            m_Control.SuspendLayout();
+                            m_Control.Size = r.Size;
+                            m_Control.ResumeLayout();
+                        }
+                        Point loc = r.Location;
+                        loc.Offset((r.Width - m_Control.Width) / 2, (r.Height - m_Control.Height) / 2);
+                        if (loc.X != m_Control.Location.X || loc.Y != m_Control.Location.Y)
+                            m_Control.Location = loc;
+                    }
+				}
+			}
+			finally
+			{
+				m_InternalResize=false;
+			}
+
+		}
+
+		/// <summary>
+		/// Overriden. Draws the item.
+		/// </summary>
+		/// <param name="g">Target Graphics object.</param>
+		public override void Paint(ItemPaintArgs pa)
+		{
+			if(this.SuspendLayout)
+				return;
+			System.Drawing.Graphics g=pa.Graphics;
+			if(m_Control!=null && m_Control.Visible!=this.Displayed && !m_Control.Visible)
+				CustomizeChanged();  // Determine based on customize status				
+
+			Rectangle r=this.DisplayRectangle;
+
+			Size objImageSize=GetMaxImageSize();
+			bool bOnMenu=this.IsOnMenu;
+
+            if (bOnMenu && EffectiveStyle != eDotNetBarStyle.Office2000)
+			{
+				objImageSize.Width+=7;
+				r.Width-=objImageSize.Width;
+				r.X+=objImageSize.Width;
+				if(this.IsOnCustomizeMenu)
+					objImageSize.Width+=objImageSize.Height+8;
+				// Draw side bar
+				if(!pa.Colors.MenuSide2.IsEmpty)
+				{
+					System.Drawing.Drawing2D.LinearGradientBrush gradient=BarFunctions.CreateLinearGradientBrush(new Rectangle(m_Rect.Left,m_Rect.Top,objImageSize.Width,m_Rect.Height),pa.Colors.MenuSide,pa.Colors.MenuSide2,pa.Colors.MenuSideGradientAngle);
+					g.FillRectangle(gradient,m_Rect.Left,m_Rect.Top,objImageSize.Width,m_Rect.Height);
+					gradient.Dispose();
+				}
+				else
+					g.FillRectangle(new SolidBrush(pa.Colors.MenuSide),m_Rect.Left,m_Rect.Top,objImageSize.Width,m_Rect.Height);
+			}
+
+			if(this.IsOnCustomizeMenu)
+			{
+                if (EffectiveStyle != eDotNetBarStyle.Office2000)
+				{
+					r.X+=(objImageSize.Height+8);
+					r.Width-=(objImageSize.Height+8);
+				}
+				else
+				{
+					r.X+=(objImageSize.Height+4);
+					r.Width-=(objImageSize.Height+4);
+				}
+			}
+
+			//if(bOnMenu && this.Style==eDotNetBarStyle.OfficeXP)
+			//{
+			//	g.FillRectangle(new SolidBrush(pa.Colors.MenuBackground),r);
+			//}
+
+			// Draw text if needed
+			if(m_Control==null)
+			{
+				string text=m_Text;
+				if(text=="")
+					text="Container";
+				eTextFormat objStringFormat=GetStringFormat();
+				Font objFont=this.GetFont();
+				Rectangle rText=new Rectangle(r.X+8,r.Y,r.Width,r.Height);
+                if (EffectiveStyle == eDotNetBarStyle.Office2000)
+				{
+					TextDrawing.DrawString(g,text,objFont,SystemColors.ControlText,rText,objStringFormat);
+				}
+				else
+				{
+                    TextDrawing.DrawString(g,text, objFont, SystemColors.ControlText, rText, objStringFormat);
+				}
+				Size textSize=TextDrawing.MeasureString(g,text,objFont,0,objStringFormat);
+				r.X+=(int)textSize.Width+8;
+				r.Width-=((int)textSize.Width+8);
+			}
+			else if(m_Control!=null)
+			{
+				ResizeControl();
+			}
+
+			if(this.IsOnCustomizeMenu && this.Visible)
+			{
+				// Draw check box if this item is visible
+				Rectangle rBox=new Rectangle(m_Rect.Left,m_Rect.Top,m_Rect.Height,m_Rect.Height);
+                if (EffectiveStyle != eDotNetBarStyle.Office2000)
+					rBox.Inflate(-1,-1);
+                BarFunctions.DrawMenuCheckBox(pa, rBox, EffectiveStyle, m_MouseOver);
+			}
+
+			if(this.Focused && this.DesignMode)
+			{
+				r=this.DisplayRectangle;
+				r.Inflate(-1,-1);
+				DesignTime.DrawDesignTimeSelection(g,r,pa.Colors.ItemDesignTimeBorder);
+			}
+		}
+		/// <summary>
+		/// Overriden. Recalculates the size of the item.
+		/// </summary>
+		public override void RecalcSize()
+		{
+			if(this.SuspendLayout)
+				return;
+
+			bool bOnMenu=this.IsOnMenu;
+
+			if(m_Control==null && !this.DesignMode)
+				InitControl();
+
+			if(m_Control==null)
+			{
+				// Default Height
+				if(this.Parent!=null && this.Parent is ImageItem)
+					m_Rect.Height=((ImageItem)this.Parent).SubItemsImageSize.Height+4;
+				else
+					m_Rect.Height=this.SubItemsImageSize.Height+4;
+
+                if (EffectiveStyle != eDotNetBarStyle.Office2000)
+				{
+					if(m_Control!=null && m_Rect.Height<(m_Control.Height+2))
+						m_Rect.Height=m_Control.Height+2;
+				}
+				else
+				{
+					if(m_Control!=null && m_Rect.Height<(m_Control.Height+2))
+						m_Rect.Height=m_Control.Height+2;
+				}
+			}
+			else
+				m_Rect.Height=m_MinimumSize.Height+4;
+                
+			// Default width
+			//if(m_Control!=null)
+				m_Rect.Width=m_MinimumSize.Width+4;
+			//else
+			//	m_Rect.Width=64+4;
+
+			// Calculate Item Height
+			if(m_Control==null)
+			{
+				string text=m_Text;
+				if(text=="")
+					text="Container";
+				System.Windows.Forms.Control objCtrl=this.ContainerControl as System.Windows.Forms.Control;
+				if(objCtrl!=null && IsHandleValid(objCtrl))
+				{
+					Graphics g=BarFunctions.CreateGraphics(objCtrl);
+                    try
+                    {
+                        Size textSize = TextDrawing.MeasureString(g, text, GetFont(), 0, GetStringFormat());
+                        if (textSize.Height > this.SubItemsImageSize.Height && textSize.Height > m_Rect.Height)
+                            m_Rect.Height = (int)textSize.Height + 4;
+                    }
+                    finally
+                    {
+                        g.Dispose();
+                    }
+				}
+			}
+
+			Size objImageSize=GetMaxImageSize();
+            if (this.IsOnMenu && EffectiveStyle != eDotNetBarStyle.Office2000)
+			{
+				// THis is side bar that will need to be drawn for DotNet style
+				m_Rect.Width+=(objImageSize.Width+7);
+			}
+
+			if(this.IsOnCustomizeMenu)
+				m_Rect.Width+=(objImageSize.Height+2);
+
+			// Always call base implementation to reset resize flag
+			base.RecalcSize();
+		}
+		
+		protected internal override void OnContainerChanged(object objOldContainer)
+		{	
+			base.OnContainerChanged(objOldContainer);
+			ParentControlChanged();
+			//this.RefreshBarText();
+		}
+
+		private void ParentControlChanged()
+		{
+			if(m_Control!=null)
+			{
+				System.Windows.Forms.Control objCtrl=this.ContainerControl as System.Windows.Forms.Control;
+				if(objCtrl!=m_Control.Parent)
+				{
+					bool bTextBoxMultiLine=false;
+					if(m_Control.Parent!=null)
+					{
+						// Must set the multiline=false on text box becouse it was crashing otherwise under certain conditions
+						if(m_Control is System.Windows.Forms.TextBox && ((System.Windows.Forms.TextBox)m_Control).Multiline)
+						{
+							bTextBoxMultiLine=true;
+							((System.Windows.Forms.TextBox)m_Control).Multiline=false;
+						}
+						m_Control.Parent.Controls.Remove(m_Control);
+					}
+
+					if(objCtrl!=null)
+					{
+						objCtrl.Controls.Add(m_Control);
+						if(m_Control is System.Windows.Forms.TextBox && bTextBoxMultiLine)
+							((System.Windows.Forms.TextBox)m_Control).Multiline=true;
+						if(m_Control.Visible)
+							m_Control.Refresh();
+					}
+				}
+			}
+		}
+
+		protected internal override void OnProcessDelayedCommands()
+		{
+			if(m_DelayedWidth>=0)
+			{
+				int v=m_DelayedWidth;
+				m_DelayedWidth=-1;
+				this.Width=v;
+			}
+			if(m_DelayedHeight>0)
+			{
+				int v=m_DelayedHeight;
+				m_DelayedHeight=-1;
+				this.Height=v;
+			}
+		}
+
+		protected internal override void OnVisibleChanged(bool newValue)
+		{
+			if(m_Control!=null && !newValue)
+			{
+				if(!(this.DesignMode && this.Site!=null))
+					m_Control.Visible=newValue;
+				else
+				{
+					if(newValue)
+						m_Control.SendToBack();
+					else
+						m_Control.BringToFront();
+				}
+			}
+			Bar bar=this.ContainerControl as Bar;
+			if(bar!=null && bar.LayoutType==eLayoutType.DockContainer)
+			{
+				bar.OnDockContainerVisibleChanged(this);
+                if (bar.AutoHide)
+                {
+                    bar.RefreshAutoHidePanel();
+                    bar.RefreshDockTab(true);
+                }
+                else
+                    bar.RefreshDockTab(true);
+			}
+			base.OnVisibleChanged(newValue);
+		}
+		protected override void OnDisplayedChanged()
+		{
+			if(this.Displayed)
+			{
+				this.Refresh();
+				Bar bar=this.ContainerControl as Bar;
+                if (bar != null)
+                {
+                    //bar.MinClientSize = m_MinFormClientSize;
+                    bar.SyncBarCaption();
+                }
+			}
+
+			if(m_Control!=null && !(this.IsOnCustomizeMenu || this.IsOnCustomizeDialog))
+			{
+				ResizeControl();
+				if(!(this.DesignMode && this.Site!=null))
+					m_Control.Visible=this.Displayed;
+				else
+				{
+					if(this.Displayed)
+                        m_Control.BringToFront();
+					else
+						m_Control.SendToBack();
+                    ResizeControl();
+				}
+			}
+			base.OnDisplayedChanged();
+		}
+
+		protected override void OnIsOnCustomizeDialogChanged()
+		{
+			base.OnIsOnCustomizeDialogChanged();
+			CustomizeChanged();
+		}
+
+		protected override void OnDesignModeChanged()
+		{
+			base.OnDesignModeChanged();
+			CustomizeChanged();
+		}
+
+		protected override void OnIsOnCustomizeMenuChanged()
+		{
+			base.OnIsOnCustomizeMenuChanged();
+			CustomizeChanged();
+		}
+
+		private void CustomizeChanged()
+		{
+			if(m_Control!=null)
+			{
+				if(this.DesignMode && this.Site!=null)
+					return;
+
+				if(this.IsOnCustomizeMenu || this.IsOnCustomizeDialog || this.DesignMode)
+				{
+					m_Control.Enabled=false;
+				}
+				else
+				{
+					if(!(this.DesignMode && this.Site!=null))
+						m_Control.Visible=this.Displayed;
+					m_Control.Enabled=true;
+				}
+			}
+		}
+
+		private Size GetMaxImageSize()
+		{
+			if(m_Parent!=null)
+			{
+				ImageItem objParentImageItem=m_Parent as ImageItem;
+				if(objParentImageItem!=null)
+					return objParentImageItem.SubItemsImageSize;
+				else
+					return this.ImageSize;
+			}
+			else
+				return this.ImageSize;
+		}
+        private eTextFormat GetStringFormat()
+		{
+            eTextFormat format = eTextFormat.Default;
+            format |= eTextFormat.SingleLine;
+            format |= eTextFormat.EndEllipsis;
+            format |= eTextFormat.VerticalCenter;
+            return format;
+
+            //StringFormat sfmt=BarFunctions.CreateStringFormat(); //new StringFormat(StringFormat.GenericDefault);
+            //sfmt.HotkeyPrefix=System.Drawing.Text.HotkeyPrefix.Show;
+            ////sfmt.FormatFlags=sfmt.FormatFlags & ~(sfmt.FormatFlags & StringFormatFlags.DisableKerning);
+            //sfmt.FormatFlags=sfmt.FormatFlags | StringFormatFlags.NoWrap;
+            //sfmt.Trimming=StringTrimming.EllipsisCharacter;
+            //sfmt.Alignment=System.Drawing.StringAlignment.Near;
+            //sfmt.LineAlignment=System.Drawing.StringAlignment.Center;
+
+            //return sfmt;
+		}
+
+		/// <summary>
+		/// Returns the Font object to be used for drawing the item text.
+		/// </summary>
+		/// <returns>Font object.</returns>
+		protected virtual Font GetFont()
+		{
+			System.Windows.Forms.Control objCtrl=this.ContainerControl as System.Windows.Forms.Control;
+			if(objCtrl!=null)
+				return (Font)objCtrl.Font;
+            return SystemFonts.DefaultFont; // (Font)System.Windows.Forms.SystemInformation.MenuFont;
+		}
+		protected internal override bool IsAnyOnHandle(IntPtr iHandle)
+		{
+			bool bRet=base.IsAnyOnHandle(iHandle);
+			if(!bRet && m_Control!=null && m_Control.Handle==iHandle)
+				bRet=true;
+			return bRet;
+		}
+		protected override void OnEnabledChanged()
+		{
+			base.OnEnabledChanged();
+			
+			if(this.DesignMode && this.Site!=null)
+				return;
+
+			if(m_Control!=null)
+				m_Control.Enabled=this.Enabled;
+		}
+
+//		[System.ComponentModel.Browsable(false),System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+//		public override void InternalMouseEnter()
+//		{
+//			base.InternalMouseEnter();
+//			if(!m_MouseOver)
+//			{
+//				m_MouseOver=true;
+//				this.Refresh();
+//			}
+//		}
+//
+//		[System.ComponentModel.Browsable(false),System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+//		public override void InternalMouseLeave()
+//		{
+//			base.InternalMouseLeave();
+//			if(m_MouseOver)
+//			{
+//				m_MouseOver=false;
+//				this.Refresh();
+//			}
+//		}
+        [EditorBrowsable(EditorBrowsableState.Never)]
+		public override void OnGotFocus()
+		{
+			base.OnGotFocus();
+			if(m_Control==null)
+				return;
+			if(m_Control.Focused || this.IsOnCustomizeMenu || this.IsOnCustomizeDialog || this.DesignMode)
+				return;
+			m_Control.Focus();
+		}
+
+		/// <summary>
+		/// Gets or sets a value indicating whether the item is visible.
+		/// </summary>
+		public override bool Visible
+		{
+			get
+			{
+				if(this.IsOnMenu)
+					return false;
+				Bar objTlb=this.ContainerControl as Bar;
+				if(objTlb!=null)
+				{
+					if(objTlb.BarState==eBarState.Docked || objTlb.BarState==eBarState.Floating || objTlb.BarState==eBarState.AutoHide)
+						return base.Visible;
+					else
+						return false;
+				}
+				return base.Visible;
+			}
+			set
+			{
+				base.Visible=value;
+			}
+		}
+
+		// Property Editor support for ImageIndex selection
+		[System.ComponentModel.Browsable(false),System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+		public System.Windows.Forms.ImageList ImageList
+		{
+			get
+			{
+				IOwner owner=this.GetOwner() as IOwner;
+				if(owner!=null)
+					return owner.Images;
+				return null;
+			}
+		}
+
+		/// <summary>
+		/// Specifies the Tab image. Image specified here is used only on Tab when there are multiple dock containers on Bar.
+        /// </summary>
+        [Browsable(true),DevCoBrowsable(true),DefaultValue(null),Category("Appearance"),Description("Specifies the Tab image. Image specified here is used only on Tab when there are multiple dock containers on Bar.")]
+		public System.Drawing.Image Image
+		{
+			get
+			{
+				return m_Image;
+			}
+			set
+			{
+				m_Image=value;
+				m_TabImage=null;
+				Bar bar=this.ContainerControl as Bar;
+				if(bar!=null)
+					bar.RefreshDockContainerItem(this);
+			}
+		}
+
+		/// <summary>
+		/// Specifies the index of the Tab image if ImageList is used. Image specified here is used only on Tab when there are multiple dock containers on Bar.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),DefaultValue(-1),Category("Appearance"),Description("Specifies the index of the Tab image if ImageList is used. Image specified here is used only on Tab when there are multiple dock containers on Bar."),System.ComponentModel.Editor("DevComponents.DotNetBar.Design.ImageIndexEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)),System.ComponentModel.TypeConverter(typeof(System.Windows.Forms.ImageIndexConverter))]
+		public int ImageIndex
+		{
+			get
+			{
+				return m_ImageIndex;
+			}
+			set
+			{
+				if(m_ImageIndex!=value)
+				{
+					m_ImageIndex=value;
+                    if(ShouldSyncProperties)
+                        BarFunctions.SyncProperty(this, "ImageIndex");
+					m_TabImage=null;
+					Bar bar=this.ContainerControl as Bar;
+					if(bar!=null)
+						bar.RefreshDockContainerItem(this);
+				}
+			}
+		}
+
+		/// <summary>
+		/// Specifies the Button icon. Icons support multiple image sizes and alpha blending.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),Category("Appearance"),Description("Specifies the Button icon. Icons support multiple image sizes and alpha blending."),DefaultValue(null)]
+		public System.Drawing.Icon Icon
+		{
+			get
+			{
+				return m_Icon;
+			}
+			set
+			{
+				NeedRecalcSize=true;
+				m_Icon=value;
+
+				m_TabImage=null;
+				Bar bar=this.ContainerControl as Bar;
+				if(bar!=null)
+					bar.RefreshDockContainerItem(this);
+			}
+		}
+
+        /// <summary>
+        /// Gets or sets the predefined tab color. Default value is eTabItemColor.Default which means that default color is used.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), DefaultValue(eTabItemColor.Default), Category("Style"), Description("Applies predefined color to tab.")]
+        public eTabItemColor PredefinedTabColor
+        {
+            get { return m_PredefinedTabColor; }
+            set
+            {
+				if(m_PredefinedTabColor!=value)
+				{
+					m_PredefinedTabColor = value;
+					Bar bar=this.ContainerControl as Bar;
+					if(bar!=null && bar.DockTabControl!=null)
+					{
+					    TabItem tab = GetTabItem(bar.DockTabControl);
+						if(tab!=null)
+							tab.PredefinedColor=m_PredefinedTabColor;
+					}
+					if (this.DesignMode)
+					{
+						System.Windows.Forms.Control c = this.ContainerControl as System.Windows.Forms.Control;
+                        if(c!=null)
+						    c.Refresh();
+					}
+				}
+            }
+        }
+
+        private TabItem GetTabItem(TabStrip dockTabControl)
+        {
+            foreach (TabItem tab in dockTabControl.Tabs)
+            {
+                if (tab.AttachedItem == this)
+                    return tab;
+            }
+            return null;
+        }
+
+	    internal System.Drawing.Image TabImage
+		{
+			get
+			{
+				if(m_TabImage==null)
+				{
+                    System.Drawing.Image img=this.GetImage();
+					if(img!=null)
+					{
+						if(img.Width==16 && img.Height==16)
+						{
+							m_TabImage=(System.Drawing.Image)img.Clone();
+						}
+						else
+						{
+							m_TabImage=new Bitmap(img,16,16);
+							Graphics g=Graphics.FromImage(m_TabImage);
+							g.DrawImage(img,new Rectangle(0,0,16,16),0,0,16,16,GraphicsUnit.Pixel);
+							g.Dispose();
+						}
+					}
+				}
+
+				return m_TabImage;
+			}
+		}
+
+		private Image GetImage()
+		{
+			if(m_Image!=null)
+				return m_Image;
+			return GetImageFromImageList(m_ImageIndex);
+		}
+
+		internal void SetImageIndex(int iImageIndex)
+		{
+			m_ImageIndex=iImageIndex;
+		}
+
+		private Image GetImageFromImageList(int ImageIndex)
+		{
+			if(ImageIndex>=0)
+			{
+				IOwner owner=this.GetOwner() as IOwner;
+				if(owner!=null)
+				{
+					if(owner.Images!=null && owner.Images.Images.Count>0 && ImageIndex<owner.Images.Images.Count)
+						return owner.Images.Images[ImageIndex];
+				}
+			}
+			return null;
+		}
+
+		/// <summary>
+		/// Gets or sets whether tab that dock container item is on is selected.
+		/// </summary>
+		[Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public bool Selected
+		{
+			get
+			{
+				if(this.Visible)
+				{
+					Bar bar= this.ContainerControl as Bar;
+					if(bar!=null)
+					{
+						return (bar.SelectedDockContainerItem == this);
+					}
+				}
+				return false;
+			}
+			set
+			{
+				if(this.Visible)
+				{
+					Bar bar= this.ContainerControl as Bar;
+					if(bar!=null)
+					{
+						bar.SelectedDockContainerItem = this;
+					}
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the width of the item in pixels.
+		/// </summary>
+		[Browsable(false),DevCoBrowsable(false),DefaultValue(0),Category("Layout"),Description("Indicates the width of the item in pixels."), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public int Width
+		{
+			get
+			{
+				return this.DisplayRectangle.Width;
+			}
+			set
+			{
+				if(value<m_MinimumSize.Width)
+					value=m_MinimumSize.Width;
+				if(value>=m_MinimumSize.Width)
+				{
+					Bar bar=this.ContainerControl as Bar;
+					GenericItemContainer parent=this.Parent as GenericItemContainer;
+					if(parent!=null && parent.SystemContainer && bar!=null && bar.LayoutType==eLayoutType.DockContainer && bar.Stretch)
+					{
+						bar.OnDockContainerWidthChanged(this,value);
+						m_DelayedWidth=-1;
+					}
+					else
+						m_DelayedWidth=value;
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the height of the item in pixels.
+		/// </summary>
+		[Browsable(false),DevCoBrowsable(true),DefaultValue(0),Category("Layout"),Description("Indicates height of the item in pixels."), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public int Height
+		{
+			get
+			{
+				return this.DisplayRectangle.Height;
+			}
+			set
+			{
+				if(value<m_MinimumSize.Height)
+					value=m_MinimumSize.Height;
+				if(value>=m_MinimumSize.Height)
+				{
+					Bar bar=this.ContainerControl as Bar;
+					GenericItemContainer parent=this.Parent as GenericItemContainer;
+					if(parent!=null && parent.SystemContainer && bar!=null && bar.LayoutType==eLayoutType.DockContainer && bar.Stretch)
+					{
+						bar.OnDockContainerHeightChanged(this,value);
+						m_DelayedHeight=-1;
+					}
+					else
+                        m_DelayedHeight=value;
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the minimum size of the item. When used please note that layout logic for dockable windows expects that
+        /// all DockContainerItems that are in particular docking side have exact same minimum size. When setting this property it is
+        /// best to set the same value for all DockContainerItem instances you create.
+		/// </summary>
+		[Browsable(false),DevCoBrowsable(false),Category("Layout"),Description("Gets or sets the minimum size of the item.")]
+		public System.Drawing.Size MinimumSize
+		{
+			get
+			{
+				return m_MinimumSize;
+			}
+			set
+			{
+				m_MinimumSize=value;
+				if(m_MinimumSize.Width>m_DefaultFloatingSize.Width)
+					m_DefaultFloatingSize.Width=m_MinimumSize.Width;
+				if(m_MinimumSize.Height>m_DefaultFloatingSize.Height)
+					m_DefaultFloatingSize.Height=m_MinimumSize.Height;
+				Bar bar=this.ContainerControl as Bar;
+				if(bar!=null)
+					bar.OnDockContainerMinimumSizeChanged(this);
+				if(m_MinimumSize.Width>this.Width)
+					this.Width=m_MinimumSize.Width;
+				if(m_MinimumSize.Height>this.Height)
+					this.Height=m_MinimumSize.Height;
+			}
+		}
+
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeMinimumSize()
+		{
+			if(m_MinimumSize.Width!=32 || m_MinimumSize.Height!=32)
+				return true;
+			return false;
+		}
+
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetMinimumSize()
+		{
+			this.MinimumSize = new Size(32,32);
+		}
+
+		/// <summary>
+		/// Gets or sets the default floating size of the Bar that is containing this item.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Layout"),System.ComponentModel.Description("Gets or sets the default floating size of the Bar that is containing this item.")]
+		public System.Drawing.Size DefaultFloatingSize
+		{
+			get
+			{
+				return m_DefaultFloatingSize;
+			}
+			set
+			{
+				if(value.Width<m_MinimumSize.Width)
+					value.Width=m_MinimumSize.Width;
+				if(value.Height<m_MinimumSize.Height)
+					value.Height=m_MinimumSize.Height;
+				m_DefaultFloatingSize=value;
+			}
+		}
+
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeDefaultFloatingSize()
+		{
+			if(m_DefaultFloatingSize.Width!=128 || m_DefaultFloatingSize.Height!=128)
+				return true;
+			return false;
+		}
+
+		/// <summary>
+		/// Gets or sets the minimum size of the form client area that is tried to maintain when dockable window is resized.
+		/// </summary>
+		[Obsolete("This property is obsolete and it will be removed in next version"), EditorBrowsable(EditorBrowsableState.Never),Browsable(false),DevCoBrowsable(false),System.ComponentModel.DefaultValue(64),System.ComponentModel.Category("Layout"),System.ComponentModel.Description("Gets or sets the minimum size of the form client area that is tried to maintain when dockable window is resized."), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public int MinFormClientSize
+		{
+			get {return m_MinFormClientSize;}
+			set
+			{
+				m_MinFormClientSize=value;
+                //if(this.Displayed)
+                //{
+                //    Bar bar=this.ContainerControl as Bar;
+                //    if(bar!=null)
+                //        bar.MinClientSize=m_MinFormClientSize;
+                //}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets whether the item expands automatically to fill out the remaining space inside the container. Applies to Items on stretchable, no-wrap Bars only.
+		/// </summary>
+		[Browsable(false),DevCoBrowsable(false),DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public override bool Stretch
+		{
+			get
+			{
+				return base.Stretch;
+			}
+			set
+			{
+				base.Stretch=value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets whether item can be customized by end user.
+		/// </summary>
+		[Browsable(false),DevCoBrowsable(false),DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden),Category("Behavior"),Description("Indicates whether item can be customized by user.")]
+		public override bool CanCustomize
+		{
+			get
+			{
+				return base.CanCustomize;
+			}
+			set
+			{
+				base.CanCustomize=value;
+			}
+		}
+
+
+		/// <summary>
+		/// Occurs after an item has been removed.
+		/// </summary>
+		/// <param name="item">Item being removed.</param>
+        protected internal override void OnAfterItemRemoved(BaseItem item, int itemIndex)
+		{
+			base.OnAfterItemRemoved(item, itemIndex);
+			ParentControlChanged();
+		}
+
+		[System.ComponentModel.Browsable(false),System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+		public override bool IsWindowed
+		{
+			get {return true;}
+		}
+
+		/// <summary>
+		/// Occurs after text has changed.
+		/// </summary>
+		protected override void OnTextChanged()
+		{
+			base.OnTextChanged();
+			if(this.ContainerControl is Bar /*&& !this.Displayed*/) // Refresh Tab Text even when dock container item is selected.
+				((Bar)this.ContainerControl).RefreshDockContainerItem(this);
+		}
+
+        protected override void OnTooltipChanged()
+        {
+            base.OnTooltipChanged();
+            if (this.ContainerControl is Bar) // Refresh Tab Tooltip even when dock container item is selected.
+                ((Bar)this.ContainerControl).RefreshDockContainerItem(this);
+        }
+
+		/// <summary>
+		/// Returns whether item is in design mode or not.
+		/// </summary>
+		[System.ComponentModel.Browsable(false),DevCoBrowsable(false)]
+		public override bool DesignMode
+		{
+			get
+			{
+				return (base.DesignMode || this.Site!=null && this.Site.DesignMode);
+			}
+		}
+
+		/// <summary>
+		/// Occurs after item visual style has changed.
+		/// </summary>
+		protected override void OnStyleChanged()
+		{
+			base.OnStyleChanged();
+			if(m_Control is PanelDockContainer)
+			{
+				if(!((PanelDockContainer)m_Control).UseCustomStyle)
+					((PanelDockContainer)m_Control).ColorSchemeStyle=this.Style;
+			}
+		}
+
+        /// <summary>
+        /// Gets or sets whether item is global or not.
+        /// This flag is used to propagate property changes to all items with the same name.
+        /// Setting for example Visible property on the item that has GlobalItem set to true will
+        /// set visible property to the same value on all items with the same name.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), DefaultValue(false), Category("Behavior"), Description("Indicates whether certain global properties are propagated to all items with the same name when changed.")]
+        public override bool GlobalItem
+        {
+            get { return base.GlobalItem; }
+            set { base.GlobalItem = value; }
+        }
+
+        private eDockContainerClose _CanClose = eDockContainerClose.Inherit;
+        /// <summary>
+        /// Gets or sets the close button behavior on the host Bar. Default value is eDockContainerClose.Inherit which means that Bar.CanHide will control whether DockContainerItem can be closed.
+        /// </summary>
+        [Category("Behavior"), DefaultValue(eDockContainerClose.Inherit), Description("Specifies close button behavior on the host Bar. Default value is eDockContainerClose.Inherit which means that Bar.CanHide will control whether DockContainerItem can be closed.")]
+        public eDockContainerClose CanClose
+        {
+            get { return _CanClose; }
+            set
+            {
+                if (value != _CanClose)
+                {
+                    eDockContainerClose oldValue = _CanClose;
+                    _CanClose = value;
+                    OnCanCloseChanged(oldValue, value);
+                }
+            }
+        }
+
+        private void OnCanCloseChanged(eDockContainerClose oldValue, eDockContainerClose newValue)
+        {
+            Bar bar = this.ContainerControl as Bar;
+            if(bar!=null)
+                bar.DockContainerItemCanCloseChanged(this, oldValue, newValue);
+        }
+
+	    /// <summary>
+	    /// Gets or sets a value indicating whether the item is enabled.
+	    /// </summary>
+	    [System.ComponentModel.Browsable(false), DevCoBrowsable(false), System.ComponentModel.DefaultValue(true), System.ComponentModel.Category("Behavior"), System.ComponentModel.Description("Indicates whether is item enabled.")]
+	    public override bool Enabled
+	    {
+	        get { return base.Enabled; }
+	        set { base.Enabled = value; }
+	    }
+
+    }
+
+    #region DockItemAccessibleObject
+    public class DockItemAccessibleObject : System.Windows.Forms.AccessibleObject
+    {
+        private DockContainerItem m_Owner = null;
+        private bool m_Hot = false;
+        public DockItemAccessibleObject(DockContainerItem owner)
+        {
+            m_Owner = owner;
+
+        }
+
+        internal DockContainerItem Owner
+        {
+            get { return m_Owner; }
+        }
+
+        public override string Name
+        {
+            get
+            {
+                if (m_Owner == null)
+                    return "";
+
+                if (m_Owner.AccessibleName != "")
+                    return m_Owner.AccessibleName;
+
+                if (m_Owner.Text != null)
+                    return m_Owner.Text.Replace("&", "");
+
+                return m_Owner.Tooltip;
+            }
+            set
+            {
+                m_Owner.AccessibleName = value;
+            }
+        }
+
+        public override string Description
+        {
+            get
+            {
+                if (m_Owner == null)
+                    return "";
+                if (m_Owner.AccessibleDescription != "")
+                    return m_Owner.AccessibleDescription;
+                return "";
+            }
+        }
+
+        public override System.Windows.Forms.AccessibleRole Role
+        {
+            get
+            {
+                if (m_Owner == null || !m_Owner.IsAccessible)
+                    return System.Windows.Forms.AccessibleRole.None;
+
+                if (m_Owner.AccessibleRole != System.Windows.Forms.AccessibleRole.Default)
+                    return m_Owner.AccessibleRole;
+                return System.Windows.Forms.AccessibleRole.Pane;
+            }
+        }
+
+        public override System.Windows.Forms.AccessibleStates State
+        {
+            get
+            {
+                if (m_Owner == null)
+                    return System.Windows.Forms.AccessibleStates.Unavailable;
+                //System.Diagnostics.Trace.WriteLine("Getting state for "+m_Owner.Text);
+                System.Windows.Forms.AccessibleStates state = 0;
+
+                if (!m_Owner.IsAccessible)
+                    return System.Windows.Forms.AccessibleStates.Unavailable;
+
+                if (!m_Owner.Displayed || !m_Owner.Visible)
+                    state |= System.Windows.Forms.AccessibleStates.Invisible;
+                else if (!m_Owner.GetEnabled())
+                {
+                    state = System.Windows.Forms.AccessibleStates.Unavailable;
+                    return state;
+                }
+                else
+                {
+                    if (m_Owner.Selected)
+                        state |= (System.Windows.Forms.AccessibleStates.Selected);
+                    else
+                        state |= System.Windows.Forms.AccessibleStates.Selectable | System.Windows.Forms.AccessibleStates.Focusable;
+                }
+
+                return state;
+            }
+        }
+
+        public override System.Windows.Forms.AccessibleObject Parent
+        {
+            get
+            {
+                if (m_Owner == null)
+                    return null;
+                if (m_Owner.Parent != null)
+                {
+                    if (!(m_Owner.Parent is GenericItemContainer && ((GenericItemContainer)m_Owner.Parent).SystemContainer))
+                        return m_Owner.Parent.AccessibleObject;
+                }
+
+                System.Windows.Forms.Control control = m_Owner.ContainerControl as System.Windows.Forms.Control;
+                if (control != null)
+                    return control.AccessibilityObject;
+                return null;
+            }
+        }
+
+        public override System.Drawing.Rectangle Bounds
+        {
+            get
+            {
+                if (m_Owner == null)
+                    return System.Drawing.Rectangle.Empty;
+
+                System.Windows.Forms.Control objCtrl = m_Owner.ContainerControl as System.Windows.Forms.Control;
+                if (objCtrl != null)
+                    return objCtrl.RectangleToScreen(m_Owner.DisplayRectangle);
+                return m_Owner.Bounds;
+            }
+        }
+
+        public override int GetChildCount()
+        {
+            if (m_Owner == null)
+                return 0;
+            return m_Owner.Control != null ? 1 : 0;
+        }
+
+        public override System.Windows.Forms.AccessibleObject GetChild(int iIndex)
+        {
+            if (m_Owner == null || iIndex < 0 || iIndex >= 1 || m_Owner.Control == null)
+                return null;
+            return m_Owner.Control.AccessibilityObject;
+        }
+
+        public override string DefaultAction
+        {
+            get
+            {
+                if (m_Owner.AccessibleDefaultActionDescription != "")
+                    return m_Owner.AccessibleDefaultActionDescription;
+                return "Select";
+            }
+        }
+
+        public override void DoDefaultAction()
+        {
+            if (m_Owner == null)
+                return;
+
+            m_Owner.Selected = true;
+            //System.Windows.Forms.Control cont = m_Owner.ContainerControl as System.Windows.Forms.Control;
+            //if (cont is MenuPanel && !(cont is IAccessibilitySupport))
+            //{
+            //    cont = ((MenuPanel)cont).ParentItem.ContainerControl as System.Windows.Forms.Control;
+            //}
+
+            //IAccessibilitySupport ias = cont as IAccessibilitySupport;
+            //if (ias != null)
+            //{
+            //    ias.DoDefaultActionItem = m_Owner;
+            //    NativeFunctions.PostMessage(cont.Handle, NativeFunctions.WM_USER + 107, IntPtr.Zero, IntPtr.Zero);
+            //}
+
+            base.DoDefaultAction();
+        }
+
+        public override string KeyboardShortcut
+        {
+            get
+            {
+                return m_Owner.ShortcutString;
+            }
+        }
+
+        public override System.Windows.Forms.AccessibleObject GetSelected()
+        {
+            if (m_Owner == null)
+                return base.GetSelected();
+
+            return base.GetSelected();
+        }
+
+        public override System.Windows.Forms.AccessibleObject HitTest(int x, int y)
+        {
+            if (m_Owner == null)
+                return base.HitTest(x, y);
+
+            Point screen = new Point(x, y);
+            if (m_Owner.Control != null)
+            {
+                System.Windows.Forms.Control cont = m_Owner.Control;
+                if (cont != null)
+                {
+                    Point p = cont.PointToClient(screen);
+                    if (cont.ClientRectangle.Contains(p))
+                        return cont.AccessibilityObject;
+                }
+            }
+            return base.HitTest(x, y);
+        }
+
+        public override System.Windows.Forms.AccessibleObject Navigate(System.Windows.Forms.AccessibleNavigation navdir)
+        {
+            if (m_Owner == null)
+                return base.Navigate(navdir);
+
+            if (navdir == System.Windows.Forms.AccessibleNavigation.FirstChild || navdir == System.Windows.Forms.AccessibleNavigation.LastChild)
+            {
+                if (m_Owner.Control != null)
+                    return m_Owner.Control.AccessibilityObject;
+            }
+
+            return base.Navigate(navdir);
+        }
+
+    }
+    #endregion
+
+    /// <summary>
+    /// Specifies the behavior of the close button on host bar for the DockContainerItem.
+    /// </summary>
+    public enum eDockContainerClose
+    {
+        /// <summary>
+        /// Closing of the bar is inherited from the host bar. Bar.CanHide property will control close button visibility.
+        /// </summary>
+        Inherit,
+        /// <summary>
+        /// Closing of the DockContainerItem is allowed.
+        /// </summary>
+        Yes,
+        /// <summary>
+        /// Closing of DockContainerItem is not allowed.
+        /// </summary>
+        No
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DockContainerItemDesigner.cs b/PROMS/DotNetBar Source Code/DockContainerItemDesigner.cs
new file mode 100644
index 00000000..9d2ad128
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DockContainerItemDesigner.cs	
@@ -0,0 +1,57 @@
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.ComponentModel.Design;
+using System.Drawing;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Summary description for DockContainerItemDesigner.
+	/// </summary>
+	public class DockContainerItemDesigner:ComponentDesigner
+	{
+		public override void Initialize(IComponent component) 
+		{
+			base.Initialize(component);
+
+			if(!component.Site.DesignMode)
+				return;
+
+			DockContainerItem c=component as DockContainerItem;
+			if(c!=null)
+			{
+				this.Visible=c.Visible;
+			}
+		}
+
+		protected override void PreFilterProperties(IDictionary properties)
+		{
+			base.PreFilterProperties(properties);
+			properties["Visible"] = TypeDescriptor.CreateProperty(typeof(DockContainerItemDesigner),(PropertyDescriptor)properties["Visible"], new Attribute[]
+				{
+						new DefaultValueAttribute(true),
+					new BrowsableAttribute(true),
+					new CategoryAttribute("Layout")});
+
+		}
+
+		/// <summary>
+		/// Gets or sets whether item is visible.
+		/// </summary>
+		[DefaultValue(true),Browsable(true),DevCoBrowsable(true),Category("Layout"),Description("Gets or sets whether item is visible.")]
+		public bool Visible 
+		{
+			get 
+			{
+				return (bool)ShadowProperties["Visible"];
+			}
+			set 
+			{
+				// this value is not passed to the actual control
+				this.ShadowProperties["Visible"] = value;
+			}
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/DockSite.cs b/PROMS/DotNetBar Source Code/DockSite.cs
new file mode 100644
index 00000000..cc8a5bdb
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DockSite.cs	
@@ -0,0 +1,3189 @@
+namespace DevComponents.DotNetBar
+{
+    using System;
+    using System.Collections;
+    using System.ComponentModel;
+    using System.Drawing;
+    using System.Data;
+    using System.Windows.Forms;
+    using DevComponents.DotNetBar.Rendering;
+
+	#region IDockInfo
+	/// <summary>
+	/// Interface used for docking support.
+	/// </summary>
+	public interface IDockInfo
+	{
+		/// <summary>
+		/// Returns Minimum docked size of the control.
+		/// </summary>
+		System.Drawing.Size MinimumDockSize(eOrientation dockOrientation);
+		/// <summary>
+		/// Returns Preferrred size of the docked control.
+		/// </summary>
+		System.Drawing.Size PreferredDockSize(eOrientation dockOrientation);
+		/// <summary>
+		/// Indicated whether control can be docked on top dock site.
+		/// </summary>
+		bool CanDockTop {get;}
+		/// <summary>
+		///  Indicated whether control can be docked on bottom dock site.
+		/// </summary>
+		bool CanDockBottom {get;}
+		/// <summary>
+		///  Indicated whether control can be docked on left dock site.
+		/// </summary>
+		bool CanDockLeft {get;}
+		/// <summary>
+		///  Indicated whether control can be docked on right dock site.
+		/// </summary>
+		bool CanDockRight {get;}
+		/// <summary>
+		/// Indicates whether control can be docked as document i.e. middle (fill) dock site.
+		/// </summary>
+		bool CanDockDocument {get;}
+		/// <summary>
+		/// Indicates whether control can be docked as tab to another bar.
+		/// </summary>
+		bool CanDockTab {get;}
+		/// <summary>
+		///  Indicated whether control can be stretched to fill dock site.
+		/// </summary>
+		bool Stretch {get;set;}
+		/// <summary>
+		/// Holds the left position (dock offset) of the control.
+		/// </summary>
+		int DockOffset {get;set;}
+		/// <summary>
+		/// Specifies the dock line for the control.
+		/// </summary>
+		int DockLine {get;set;}
+		/// <summary>
+		/// Specifies current dock orientation.
+		/// </summary>
+		eOrientation DockOrientation {get;set;}
+		/// <summary>
+		/// Gets whether control is docked.
+		/// </summary>
+		bool Docked {get;}
+		/// <summary>
+		/// Returns the dock site of the control.
+		/// </summary>
+		System.Windows.Forms.Control DockedSite {get;}
+		/// <summary>
+		/// Gets or sets the control dock side.
+		/// </summary>
+		eDockSide DockSide{get;set;}
+		/// <summary>
+		/// Sets the dock line for the control. Used internaly by dock manager.
+		/// </summary>
+		/// <param name="iLine">New Dock line.</param>
+		void SetDockLine(int iLine);
+		/// <summary>
+		/// Gets or sets whether bar is locked to prevent docking below it.
+		/// </summary>
+		bool LockDockPosition{get;set;}
+	}
+	#endregion
+
+	#region DockSiteInfo
+	/// <summary>
+	/// Represent the docking information for an control.
+	/// </summary>
+	public class DockSiteInfo
+	{
+		/// <summary>
+		/// Control dock side.
+		/// </summary>
+		public System.Windows.Forms.DockStyle DockSide;
+		/// <summary>
+		/// Control dock site.
+		/// </summary>
+		public DockSite objDockSite;
+		/// <summary>
+		/// Docking offset.
+		/// </summary>
+		public int DockOffset;
+		/// <summary>
+		/// Docking line.
+		/// </summary>
+		public int DockLine;
+		/// <summary>
+		/// Docked control width.
+		/// </summary>
+		public int DockedWidth;
+		/// <summary>
+		/// Docked control height.
+		/// </summary>
+		public int DockedHeight;
+		/// <summary>
+		/// Control position.
+		/// </summary>
+		public int InsertPosition;
+		public bool NewLine;
+		public bool IsEmpty()
+		{
+			if(this.DockSide==System.Windows.Forms.DockStyle.None && this.objDockSite==null && this.DockOffset==0 && this.DockLine==0 && this.DockedWidth==0 && this.DockedHeight==0 && this.InsertPosition==0 && this.NewLine==false)
+				return true;
+			return false;
+		}
+		public Bar TabDockContainer;
+		/// <summary>
+		/// Indicates whether to use outline or not
+		/// </summary>
+		public bool UseOutline;
+		/// <summary>
+		/// Indicates that dock site should change it's Z-Order so it maximizes the space it consumes as related to other dock sites.
+		/// </summary>
+		public bool FullSizeDock;
+		/// <summary>
+		/// Indicates that dock site should change it's Z-Order so it reduces the amount of space it consumes as related to other dock sites.
+		/// </summary>
+		public bool PartialSizeDock;
+		/// <summary>
+		/// When either FullSizeDock or PartialSizeDock is set it indicates the new dock site Z-Order index.
+		/// </summary>
+		public int DockSiteZOrderIndex;
+		/// <summary>
+		/// Returns the bar that mouse is placed over.
+		/// </summary>
+		public Bar MouseOverBar;
+		/// <summary>
+		/// Returns dock side the mouse is indicating user wants to dock bar at.
+		/// </summary>
+		public eDockSide MouseOverDockSide;
+        /// <summary>
+        /// Gets the last relative docked to bar.
+        /// </summary>
+        public Bar LastRelativeDockToBar;
+        /// <summary>
+        /// Gets the last relative docked to document id.
+        /// </summary>
+        public long LastRelativeDocumentId;
+        /// <summary>
+        /// Returns side of last docked-to dock site.
+        /// </summary>
+        public eDockSide LastDockSiteSide;
+	}
+	#endregion
+
+    /// <summary>
+    ///    Dock Sites are created by DotNetBar control on each edge of the
+    ///    DotNetBar container control and are used for docking purposes.
+    ///    If Dock Site does not contain any controls it will be invisible.
+    /// </summary>
+    [ToolboxItem(false), DesignTimeVisible(false), Designer("DevComponents.DotNetBar.Design.DockSiteDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+	public class DockSite : System.Windows.Forms.Control
+	{
+		private eOrientation m_DockOrientation;
+		private bool m_Layingout=false;
+		private bool m_OversizeLayout=false;
+		//private int m_DockMargin;
+		private DotNetBarManager m_Owner=null;
+		private bool m_NeedsLayout=false;
+		private bool m_NeedsNormalize=false;
+
+		// Theme Cache
+		private ThemeRebar m_ThemeRebar=null;
+
+		private eBackgroundImagePosition m_BackgroundImagePosition=eBackgroundImagePosition.Stretch;
+		private byte m_BackgroundImageAlpha=255;
+		private Color m_BackColor2=Color.Empty;
+		private int m_BackColorGradientAngle=90;
+
+		private bool m_Disposed=false;
+		private DocumentDockUIManager m_DocumentUIManager=null;
+		private bool m_LayoutSuspended=false;
+        [EditorBrowsable(EditorBrowsableState.Never), Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool _DesignerLoading = false;
+        private int m_OriginalSize = 0;
+        private bool m_OptimizeLayoutRedraw = true;
+
+		/// <summary>
+		/// Creates new instance of DockSite object with specified dock style.
+		/// </summary>
+		/// <param name="DockSide">Specifies the position and manner in which a site is docked.</param>
+		public DockSite(System.Windows.Forms.DockStyle DockSide):this()
+		{
+			this.Dock=DockSide;
+		}
+
+        protected override AccessibleObject CreateAccessibilityInstance()
+        {
+            return new DockSiteAccessibleObject(this);
+        }
+
+		/// <summary>
+		/// Creates new instance of DockSite object.
+		/// </summary>
+		public DockSite()
+		{
+			this.TabStop=false;
+			this.SetStyle(ControlStyles.Selectable,false);
+            this.SetStyle(ControlStyles.SupportsTransparentBackColor, true);
+			this.IsAccessible=true;
+			this.AccessibleRole=AccessibleRole.Window;
+		}
+
+		protected override void Dispose(bool disposing)
+		{
+			m_Owner=null;
+			m_Disposed=true;
+			base.Dispose(disposing);
+		}
+
+        protected override void ScaleControl(SizeF factor, BoundsSpecified specified)
+        {
+            if (Dpi.RecordScalePerControl)
+                Dpi.SetScaling(factor);
+            base.ScaleControl(factor, specified);
+        }
+
+        /// <summary>
+        /// Gets or sets whether painting is disabled on dock site while layout of bars is performed. Default value is true.
+        /// You might need to set this property to false if you are expirience vide flashing while using DirectX video animation in Bar controls that are part of the
+        /// dock site.
+        /// </summary>
+        [DefaultValue(true), Description("Indicates whether painting is disabled on dock site while layout of bars is performed.")]
+        public bool OptimizeLayoutRedraw
+        {
+            get { return m_OptimizeLayoutRedraw; }
+            set { m_OptimizeLayoutRedraw = value; }
+        }
+
+		private DocumentDockContainer m_DocumentDockContainer=null;
+		[Browsable(false), DefaultValue(null)]
+		public DocumentDockContainer DocumentDockContainer
+		{
+			get {return m_DocumentDockContainer;}
+			set
+			{
+				m_DocumentDockContainer=value;
+				m_DocumentUIManager=this.GetDocumentUIManager();
+				m_DocumentUIManager.RootDocumentDockContainer=m_DocumentDockContainer;
+                if (this.Dock != DockStyle.Fill && value!=null) m_DocumentDockContainer.RecordDocumentSize = true;
+			}
+		}
+
+		/// <summary>
+		/// Returns reference to the DocumentDockUIManager object used for interaction with document docking engine.
+		/// </summary>
+		/// <returns>Reference to the DocumentDockUIManager object.</returns>
+		public DocumentDockUIManager GetDocumentUIManager()
+		{
+            if (m_DocumentUIManager == null)
+            {
+                m_DocumentUIManager = new DocumentDockUIManager(this);
+                m_DocumentUIManager.RootDocumentDockContainer = m_DocumentDockContainer;
+            }
+			return m_DocumentUIManager;
+		}
+
+		/// <summary>
+		/// Specifies background image position when container is larger than image.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),Category("Appearance"),DefaultValue(eBackgroundImagePosition.Stretch),Description("Specifies background image position when container is larger than image.")]
+		public eBackgroundImagePosition BackgroundImagePosition
+		{
+			get {return m_BackgroundImagePosition;}
+			set
+			{
+				if(m_BackgroundImagePosition!=value)
+				{
+					m_BackgroundImagePosition=value;
+					this.Refresh();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Saves layout for bars contained by dock site.
+		/// </summary>
+		/// <param name="xmlBars">Parent XmlElement.</param>
+		public void SaveLayout(System.Xml.XmlElement xmlBars)
+		{
+			if(this.IsDocumentDock || m_DocumentDockContainer!=null)
+			{
+				this.GetDocumentUIManager().SerializeLayout(xmlBars);
+			}
+			else
+			{
+				foreach(Control ctrl in this.Controls)
+				{
+					DevComponents.DotNetBar.Bar bar=ctrl as DevComponents.DotNetBar.Bar;
+					if(bar!=null && bar.Name!="" && bar.SaveLayoutChanges)
+					{
+						System.Xml.XmlElement xmlBar=xmlBars.OwnerDocument.CreateElement("bar");
+						xmlBars.AppendChild(xmlBar);
+						bar.SerializeLayout(xmlBar);
+					}
+				}
+			}
+		}
+
+		/// <summary>
+		/// Loads layout for the bars.
+		/// </summary>
+		/// <param name="xmlBars">Parent XmlElement that was passed to SaveLayout method to save layout</param>
+		public void LoadLayout(System.Xml.XmlElement xmlBars)
+		{
+			m_LayoutSuspended=true;
+			try
+			{
+				if(!this.IsDocumentDock &&  m_DocumentDockContainer==null)
+				{
+					foreach(System.Xml.XmlElement xmlBar in xmlBars.ChildNodes)
+					{
+						DevComponents.DotNetBar.Bar bar=null;
+						if(m_Owner.Bars.Contains(m_Owner.Bars[xmlBar.GetAttribute("name")]))
+							bar=m_Owner.Bars[xmlBar.GetAttribute("name")];
+						else
+						{
+							bar=new Bar();
+							m_Owner.Bars.Add(bar);
+						}
+						bar.DeserializeLayout(xmlBar);
+					}
+				}
+				else
+				{
+					this.GetDocumentUIManager().DeserializeLayout((System.Xml.XmlElement)xmlBars.FirstChild);
+				}
+			}
+			finally
+			{
+				m_LayoutSuspended=false;
+				this.RecalcLayout();
+			}
+		}
+
+        /// <summary>
+        /// Suspends normal layout logic.
+        /// </summary>
+        public new void SuspendLayout()
+        {
+            m_LayoutSuspended = true;
+            base.SuspendLayout();
+        }
+
+        /// <summary>
+        /// Resumes normal layout logic.
+        /// </summary>
+        public new void ResumeLayout()
+        {
+            this.ResumeLayout(true);
+        }
+
+        /// <summary>
+        /// Resumes normal layout logic. Optionally forces an immediate layout of pending layout requests.
+        /// </summary>
+        public new void ResumeLayout(bool performLayout)
+        {
+            m_LayoutSuspended = false;
+            base.ResumeLayout(performLayout);
+        }
+
+		/// <summary>
+		/// Specifies the transparency of background image.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),Category("Appearance"),DefaultValue((byte)255),Description("Specifies the transparency of background image.")]
+		public byte BackgroundImageAlpha
+		{
+			get {return m_BackgroundImageAlpha;}
+			set
+			{
+				if(m_BackgroundImageAlpha!=value)
+				{
+					m_BackgroundImageAlpha=value;
+					this.Refresh();
+				}
+			}
+		}
+
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeBackgroundImageAlpha()
+		{
+			return m_BackgroundImageAlpha!=255;
+		}
+
+		/// <summary>
+		/// Gets or sets the target gradient background color.
+		/// </summary>
+		[Browsable(true),Description("Indicates the target gradient background color."),Category("Style")]
+		public Color BackColor2
+		{
+			get {return m_BackColor2;}
+			set
+			{
+				m_BackColor2=value;
+				if(this.DesignMode)
+					this.Refresh();
+			}
+		}
+		[Browsable(false),EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeBackColor2()
+		{
+			return !m_BackColor2.IsEmpty;
+		}
+		[Browsable(false),EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetBackColor2()
+		{
+			m_BackColor2=Color.Empty;
+		}
+
+		/// <summary>
+		/// Gets or sets gradient fill angle.
+		/// </summary>
+		[Browsable(true),Description("Indicates gradient fill angle."),Category("Style"),DefaultValue(90)]
+		public int BackColorGradientAngle
+		{
+			get {return m_BackColorGradientAngle;}
+			set
+			{
+				if(value!=m_BackColorGradientAngle)
+				{
+					m_BackColorGradientAngle=value;
+					if(this.DesignMode)
+						this.Refresh();
+				}
+			}
+		}
+
+		internal bool GetDesignMode()
+		{
+			return this.DesignMode;
+		}
+
+//		/// <summary>
+//		/// Gets the collection of controls contained within the control.
+//		/// </summary>
+//		[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden),Browsable(false),DevCoBrowsable(false)]
+//		public new Control.ControlCollection Controls
+//		{
+//			get
+//			{
+//				return base.Controls;
+//			}
+//		}
+
+        //public bool ShouldSerializeControls()
+        //{
+        //    if(this.Dock==DockStyle.Fill)
+        //        return true;
+        //    else
+        //        return false;
+        //}
+
+		protected override void OnVisibleChanged(EventArgs e)
+		{
+			base.OnVisibleChanged(e);
+			if(this.Visible)
+			{
+				Control.ControlAccessibleObject acc=this.AccessibilityObject as Control.ControlAccessibleObject;
+				if(acc!=null)
+				{
+					acc.NotifyClients(AccessibleEvents.Show);
+				}
+			}
+		}
+
+        private bool IsToolbarDockSite
+        {
+            get
+            {
+                return !(this.Dock == DockStyle.Fill || m_DocumentDockContainer != null);
+            }
+        }
+        protected override void OnPaintBackground(PaintEventArgs pevent)
+		{
+			if(IsLayoutSuspended)
+				return;
+            if (this.BackgroundImage != null && this.BackgroundImageAlpha == 255 && ((this.BackgroundImagePosition == eBackgroundImagePosition.Stretch || this.BackgroundImagePosition == eBackgroundImagePosition.Tile) ||
+                this.BackgroundImage.Width >= this.Width && this.BackgroundImage.Height >= this.Height))
+                return;
+			if(!m_BackColor2.IsEmpty && !this.BackColor.IsEmpty)
+			{
+				if(this.Width>0 && this.Height>0)
+				{
+                    DisplayHelp.FillRectangle(pevent.Graphics, this.ClientRectangle, this.BackColor, this.BackColor2, m_BackColorGradientAngle);
+					return;
+				}
+			}
+
+			if(this.Controls.Count>0 && this.Controls[0] is Bar && ((Bar)this.Controls[0]).ThemedBackground)
+			{
+				ThemeRebar theme=this.ThemeRebar;
+				theme.DrawBackground(pevent.Graphics,ThemeRebarParts.Background,ThemeRebarStates.Normal,this.ClientRectangle);
+                return;
+			}
+            ColorScheme cs = GetColorScheme();
+            if (cs != null && this.BackColor != Color.Transparent)
+            {
+                if(this.IsToolbarDockSite && StyleManager.IsVisualStudio2012(StyleManager.Style))
+                    DisplayHelp.FillRectangle(pevent.Graphics, this.ClientRectangle, cs.BarBackground, cs.BarBackground2, cs.BarBackgroundGradientAngle);
+                else
+                    DisplayHelp.FillRectangle(pevent.Graphics, this.ClientRectangle, cs.DockSiteBackColor, cs.DockSiteBackColor2, cs.DockSiteBackColorGradientAngle);
+            }
+            else
+                base.OnPaintBackground(pevent);
+		}
+
+        private ColorScheme GetColorScheme()
+        {
+            if (m_Owner != null && m_Owner.UseGlobalColorScheme)
+            {
+                if ((m_Owner.Style == eDotNetBarStyle.Office2007 || m_Owner.Style == eDotNetBarStyle.StyleManagerControlled) && GlobalManager.Renderer is Office2007Renderer)
+                {
+                    return ((Office2007Renderer)GlobalManager.Renderer).ColorTable.LegacyColors;
+                }
+                return m_Owner.ColorScheme;
+            }
+            else if (this.Controls.Count > 0 && this.Controls[0] is Bar && (((Bar)this.Controls[0]).Style == eDotNetBarStyle.Office2003 || ((Bar)this.Controls[0]).Style == eDotNetBarStyle.VS2005 || BarFunctions.IsOffice2007Style(((Bar)this.Controls[0]).Style)) )
+            {
+                Bar bar = this.Controls[0] as Bar;
+                if (bar.Style == eDotNetBarStyle.StyleManagerControlled && GlobalManager.Renderer is Office2007Renderer)
+                    return ((Office2007Renderer)GlobalManager.Renderer).ColorTable.LegacyColors;
+                return bar.GetColorScheme();
+            }
+
+            return null;
+        }
+
+		protected override void OnPaint(PaintEventArgs pevent)
+		{
+			if(IsLayoutSuspended)
+				return;
+			if(this.BackgroundImage!=null)
+			{
+				BarFunctions.PaintBackgroundImage(pevent.Graphics,this.ClientRectangle,this.BackgroundImage,m_BackgroundImagePosition,m_BackgroundImageAlpha);
+			}
+			else
+				base.OnPaint(pevent);
+		}
+
+		private DevComponents.DotNetBar.ThemeRebar ThemeRebar
+		{
+			get
+			{
+				if(m_ThemeRebar==null)
+				{
+					m_ThemeRebar=new ThemeRebar(this);
+				}
+				return m_ThemeRebar;
+			}
+		}
+
+        protected override void OnHandleCreated(EventArgs e)
+        {
+            base.OnHandleCreated(e);
+            this.RecalcLayout();
+        }
+
+		protected override void OnHandleDestroyed(EventArgs e)
+		{
+			if(m_ThemeRebar!=null)
+			{
+				m_ThemeRebar.Dispose();
+				m_ThemeRebar=null;
+			}
+			base.OnHandleDestroyed(e);
+		}
+		protected override void WndProc(ref Message m)
+		{
+			if(m.Msg==NativeFunctions.WM_THEMECHANGED)
+			{
+				m_ThemeRebar=null;
+			}
+			base.WndProc(ref m);
+		}
+
+		/// <summary>
+		/// Specifies the position and manner in which a site is docked.
+		/// </summary>
+		public override System.Windows.Forms.DockStyle Dock
+		{
+			get
+			{
+				return base.Dock;
+			}
+			set
+			{
+				base.Dock=value;
+                if(value==System.Windows.Forms.DockStyle.Top || value==System.Windows.Forms.DockStyle.Bottom || value==DockStyle.Fill)
+				{
+					if(this.Controls.Count==0)
+						this.Height=0;
+					m_DockOrientation=eOrientation.Horizontal;
+				}
+				else
+				{
+					if(this.Controls.Count==0)
+						this.Width=0;
+					m_DockOrientation=eOrientation.Vertical;
+				}
+			}
+		}
+
+        protected override void OnControlRemoved(ControlEventArgs e)
+        {
+            base.OnControlRemoved(e);
+            // Designer is removing controls directly during Undo operations so resize the site.
+            if (this.DesignMode)
+                RecalcLayout();
+        }
+
+		protected override void OnControlAdded(ControlEventArgs e)
+		{
+			base.OnControlAdded(e);
+			
+			IDockInfo pDockInfo=e.Control as IDockInfo;
+            
+			if(pDockInfo==null)
+			{
+				// Refuse controls that does not implement IDockInfo interface
+				this.Controls.Remove(e.Control);
+                throw new System.ArgumentException("Only Bar objects can be added to DockSite through DotNetBar designer.");
+			}
+
+			//if(IsDocumentDock)
+				UpdateBarsCollection();
+		}
+
+        internal bool IsAnyControlVisible
+        {
+            get
+            {
+                foreach (Control c in this.Controls)
+                {
+                    if (c is Bar)
+                    {
+                        if(((Bar)c).IsVisible) return true;
+                    }
+                    else if ( c.Visible) return true;
+                }
+                return false;
+            }
+        }
+
+		/// <summary>
+		/// Docks the bar to the dock site.
+		/// </summary>
+		/// <param name="objBar">Bar to dock.</param>
+		internal void AddBar(Control objBar)
+		{
+			IDockInfo pDockInfo=objBar as IDockInfo;
+			if(pDockInfo==null)
+			{
+				// Throw exception IDockInfo must be implemented
+                throw new System.ArgumentException("Only Bar objects can be added to DockSite through DotNetBar designer.");
+			}
+
+			if(!this.Visible)
+			{
+				if(this.Owner==null || this.Owner!=null && !this.Owner.IsLoadingDefinition)
+				{
+					BarFunctions.SetControlVisible(this,true);
+				}
+			}
+
+			// Set Dock Orientation
+			pDockInfo.DockOrientation=m_DockOrientation;
+
+			// Find the right place for the control
+			Control objCtrl=null;
+			IDockInfo pCtrlDockInfo=null;
+			bool bAdded=false;
+			for(int i=0;i<this.Controls.Count;i++)
+			{
+				objCtrl=this.Controls[i];
+				pCtrlDockInfo=objCtrl as IDockInfo;
+				if(pCtrlDockInfo==null)
+					continue;
+				if(pDockInfo.DockLine<=pCtrlDockInfo.DockLine && pDockInfo.DockOffset<pCtrlDockInfo.DockOffset || pDockInfo.DockLine<pCtrlDockInfo.DockLine)
+				{
+					this.Controls.Add(objBar);
+					this.Controls.SetChildIndex(objBar,i);
+					bAdded=true;
+					break;
+				}
+			}
+
+			// Add it to the end if not added in the loop before
+			if(!bAdded)
+				this.Controls.Add(objBar);
+
+			if(objBar is Bar && ((Bar)objBar).LayoutType==eLayoutType.DockContainer)
+			{
+				Bar bar=objBar as Bar;
+				if(m_DockOrientation==eOrientation.Horizontal && bar.ItemsContainer.MinHeight>0)
+					((Bar)objBar).SyncLineMinHeight();
+				else if(m_DockOrientation==eOrientation.Vertical && bar.ItemsContainer.MinWidth>0)
+					((Bar)objBar).SyncLineMinWidth();
+			}
+			NormalizeBars();
+			LayoutBars();
+		}
+
+		/// <summary>
+		/// Dockes the Bar to dock site at specified position.
+		/// </summary>
+		/// <param name="objBar">Bar to dock.</param>
+		/// <param name="iInsertAtPosition">Bar insert position.</param>
+		internal void AddBar(Control objBar, int iInsertAtPosition)
+		{
+			IDockInfo pDockInfo=objBar as IDockInfo;
+			if(pDockInfo==null)
+			{
+				// Throw exception IDockInfo must be implemented
+                throw new System.ArgumentException("Only Bar objects can be added to DockSite through DotNetBar designer.");
+			}
+
+			if(!this.Visible)
+			{
+				BarFunctions.SetControlVisible(this,true);
+			}
+
+			// Set Dock Orientation
+			pDockInfo.DockOrientation=m_DockOrientation;
+
+			this.Controls.Add(objBar);
+			this.Controls.SetChildIndex(objBar,iInsertAtPosition);
+			if(objBar is Bar && ((Bar)objBar).LayoutType==eLayoutType.DockContainer)
+			{
+				Bar bar=objBar as Bar;
+				if(m_DockOrientation==eOrientation.Horizontal && bar.ItemsContainer.MinHeight>0)
+					((Bar)objBar).SyncLineMinHeight();
+				else if(m_DockOrientation==eOrientation.Vertical && bar.ItemsContainer.MinWidth>0)
+					((Bar)objBar).SyncLineMinWidth();
+			}
+			NormalizeBars();
+			LayoutBars();
+		}
+
+		internal void SetBarPosition(Control objBar, int iNewIndex)
+		{
+			if(this.Contains(objBar))
+			{
+				if(this.Controls.GetChildIndex(objBar)!=iNewIndex)
+				{
+					this.Controls.SetChildIndex(objBar,iNewIndex);
+				}
+				LayoutBars();
+			}
+		}
+
+		internal void SetBarPosition(Control objBar, int iNewIndex, bool bInNewLine)
+		{
+			if(this.Contains(objBar))
+			{
+				if(this.Controls.GetChildIndex(objBar)!=iNewIndex)
+				{
+					this.Controls.SetChildIndex(objBar,iNewIndex);
+				}
+				if(bInNewLine)
+				{
+					iNewIndex=this.Controls.IndexOf(objBar);
+					if(iNewIndex>=0)
+					{
+						if(iNewIndex>0)
+							((IDockInfo)objBar).SetDockLine(((IDockInfo)this.Controls[iNewIndex-1]).DockLine+1);
+						else
+							((IDockInfo)objBar).SetDockLine(-1);
+
+						for(int i=iNewIndex+1;i<this.Controls.Count;i++)
+							((IDockInfo)this.Controls[i]).SetDockLine(((IDockInfo)this.Controls[i]).DockLine+2);
+					}
+				}
+				LayoutBars();
+			}
+		}
+
+		internal void AdjustBarPosition(Control objBar)
+		{
+			IDockInfo pDockInfo=objBar as IDockInfo;
+			if(pDockInfo==null)
+			{
+				// Throw exception IDockInfo must be implemented
+                throw new System.ArgumentException("Only Bar objects can be added to DockSite through DotNetBar designer.");
+			}
+			if(!this.Controls.Contains(objBar))
+				throw new System.ArgumentException("Control is not part of this collection.");
+
+			// Find the right place for the control
+			Control objCtrl=null;
+			IDockInfo pCtrlDockInfo=null;
+			for(int i=0;i<this.Controls.Count;i++)
+			{
+				objCtrl=this.Controls[i];
+				if(objCtrl==objBar)
+					continue;
+				pCtrlDockInfo=objCtrl as IDockInfo;
+				if(pCtrlDockInfo==null)
+					continue;
+				if(pDockInfo.DockLine==pCtrlDockInfo.DockLine && pDockInfo.DockOffset<=pCtrlDockInfo.DockOffset)
+				{
+					if(i>0 && i>this.Controls.GetChildIndex(objBar))
+						i--;
+					this.Controls.SetChildIndex(objBar,i);
+					return;
+				}
+				else if(pDockInfo.DockLine<pCtrlDockInfo.DockLine)
+				{
+					if(i>0)
+						i--;
+					this.Controls.SetChildIndex(objBar,i);
+					return;
+				}
+			}
+			// Set its position to the end
+			this.Controls.SetChildIndex(objBar,this.Controls.Count);
+		}
+
+		/// <summary>
+		/// Relayouts all docked controls in the site.
+		/// </summary>
+		public void RecalcLayout()
+		{
+			LayoutBars();
+		}
+
+		[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), System.ComponentModel.Browsable(false),System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+		public bool NeedsLayout
+		{
+			get {return m_NeedsLayout;}
+			set {m_NeedsLayout=value;}
+		}
+
+		private void NormalizeBars()
+		{
+			if(IsLayoutSuspended)
+			{
+				m_NeedsNormalize=true;
+				return;
+			}
+
+			int iDockLine=-1, iLastDockLine=-2;
+			for(int i=0;i<this.Controls.Count;i++)
+			{
+				Bar bar=this.Controls[i] as Bar;
+				if(bar==null /*|| !bar.Visible*/) // Need to preserve dock line even for invisible bars so they retain position when they are shown 
+					continue;
+				if(bar.DockLine!=iLastDockLine)
+				{
+					iDockLine++;
+					iLastDockLine=bar.DockLine;
+					bar.SetDockLine(iDockLine);
+				}
+				else
+					bar.SetDockLine(iDockLine);
+			}
+
+			m_NeedsNormalize=false;
+		}
+
+		private bool IsLayoutSuspended
+		{
+			get
+			{
+                if (m_Owner != null && m_Owner.SuspendLayout || m_LayoutSuspended || _DesignerLoading)
+					return true;
+				return false;
+			}
+		}
+
+        private Rectangle GetDockLayoutRectangle()
+        {
+            Rectangle r = this.ClientRectangle;
+            if (this.Dock == DockStyle.Fill || m_DocumentDockContainer== null)
+                return r;
+            int splitter = Dpi.Width(m_DocumentDockContainer.SplitterSize);
+
+            if (this.Dock == DockStyle.Left)
+            {
+                r.Width -= splitter;
+            }
+            else if (this.Dock == DockStyle.Right)
+            {
+                r.Width -= splitter;
+                r.X += splitter;
+            }
+            else if (this.Dock == DockStyle.Bottom)
+            {
+                r.Height -= splitter;
+                r.Y += splitter;
+            }
+            else if (this.Dock == DockStyle.Top)
+            {
+                r.Height -= splitter;
+            }
+
+            return r;
+        }
+
+		private void LayoutBars()
+		{
+			if(m_Disposed || this.IsDisposed)
+				return;
+
+			if(IsLayoutSuspended)
+			{
+				m_NeedsLayout=true;
+				return;
+			}
+
+			if(m_NeedsNormalize)
+				NormalizeBars();
+
+            if (this.Controls.Count == 0 && ((this.Dock == DockStyle.Left || this.Dock == DockStyle.Right) && this.Width == 0 || 
+                (this.Dock == DockStyle.Top || this.Dock == DockStyle.Bottom) && this.Height == 0))
+                return;
+
+			// Make sure that recalc layout is not called if form is minimized OR width or height=0
+			System.Windows.Forms.Form form=this.FindForm();
+			if(form!=null && (form.Width==0 || form.Height==0))
+				return;
+			if(form!=null && form.ParentForm!=null)
+				form=form.ParentForm;
+			if(form!=null && (form.Width==0 || form.Height==0))
+				return;
+			if(form!=null && form.WindowState==FormWindowState.Minimized)
+				return;
+
+			m_NeedsLayout=false;
+
+			if(m_Layingout)
+			{
+				return;
+			}
+			m_Layingout=true;
+			
+			int parentZOrder=-1;
+
+			if(this.Dock==DockStyle.Fill || m_DocumentDockContainer!=null)
+			{
+                Rectangle oldBounds = this.Bounds;
+                if (this.Parent != null && this.Parent.Visible && m_OptimizeLayoutRedraw) // WARNING: Sending this message when parent is not visible was causing strange effects with layout of native .NET dock controls
+				{
+					if(this.Parent!=null) parentZOrder=this.Parent.Controls.IndexOf(this);
+					NativeFunctions.SendMessage(this.Handle,NativeFunctions.WM_SETREDRAW,0,0);
+				}
+
+                if (m_DocumentDockContainer != null)
+                {
+                    if (m_Owner != null)
+                    {
+                        m_DocumentDockContainer.SplitterSize = m_Owner.DockSplitterSize;
+                        GetDocumentUIManager().SplitterWidth = m_Owner.DockSplitterSize;
+                    }
+
+                    if (this.Dock != DockStyle.Fill) m_DocumentDockContainer.RecordDocumentSize = true;
+                    m_DocumentDockContainer.Layout(this.GetDockLayoutRectangle());
+                    if (this.Dock != DockStyle.Fill && m_DocumentDockContainer.DisplayBounds.IsEmpty)
+                    {
+                        if (this.Dock == DockStyle.Left || this.Dock == DockStyle.Right)
+                            this.Width = 0;
+                        else
+                            this.Height = 0;
+                    }
+                }
+
+				m_Layingout=false;
+                if (this.Parent != null && this.Parent.Visible && m_OptimizeLayoutRedraw) // See WARNING at the beginning
+				{
+					NativeFunctions.SendMessage(this.Handle,NativeFunctions.WM_SETREDRAW,1,0);
+                    this.Parent.Invalidate(((this.Width == 0 || this.Height == 0) && oldBounds.Width > 0 && oldBounds.Height > 0) ? oldBounds : this.Bounds, true);
+					this.Parent.Update();
+				}
+				if(parentZOrder!=-1) this.Parent.Controls.SetChildIndex(this,parentZOrder);
+				return;
+			}
+
+			IDockInfo pDockInfo=null;
+			Bar objBar=null;
+			Control objCtrl=null;
+			System.Drawing.Size objMinSize;
+			//System.Drawing.Size objOldSize;
+			//System.Drawing.Point objOldLocation;
+			bool bResetOffset=false;
+
+			Rectangle oldDockSiteSize=this.Bounds;
+            if (this.Parent != null && this.Parent.Visible && m_OptimizeLayoutRedraw) // WARNING: Sending this message when parent is not visible was causing strange effects with layout of native .NET dock controls
+			{
+				if(this.Parent!=null) parentZOrder=this.Parent.Controls.IndexOf(this);
+				NativeFunctions.SendMessage(this.Handle,NativeFunctions.WM_SETREDRAW,0,0);
+			}
+            
+			// Horizontal and vertical spacing is needed for Office2003 style support
+			int iHorSpacing=0, iVerSpacing=0;
+
+			// Need to know when we have stretched dock containers in the same line
+			int[] lineDockCounts=new int[256];
+			int[] lineDockProcessed=new int[256];
+			int[] lineContainerMaxSize=new int[256];
+			int[] lineDockSize=new int[256];
+			int[] lineDefHeightCount=new int[256];
+			ArrayList arrBarsInSameLine=null;
+			for(int i=0;i<this.Controls.Count;i++)
+			{
+				objBar=this.Controls[i] as Bar;
+				if(objBar!=null && !objBar.Visible)
+					continue;
+				if(objBar!=null && objBar.LayoutType==eLayoutType.DockContainer && objBar.Stretch)
+				{
+					if(objBar.DockLine>=0)
+					{
+						lineDockCounts[objBar.DockLine]++;
+						lineDockProcessed[objBar.DockLine]++;
+						if(m_DockOrientation==eOrientation.Horizontal)
+						{
+							if(objBar.SplitDockWidth==0)
+								lineDefHeightCount[objBar.DockLine]++;
+							else
+								lineDockSize[objBar.DockLine]+=objBar.SplitDockWidth;
+							
+						}
+						else
+						{
+							if(objBar.SplitDockHeight==0)
+								lineDefHeightCount[objBar.DockLine]++;
+							else
+								lineDockSize[objBar.DockLine]+=objBar.SplitDockHeight;
+						}
+					}
+				}
+			}
+
+            if (this.Controls.Count > 0 && this.Controls[0] is Bar && ((Bar)this.Controls[0]).LayoutType == eLayoutType.Toolbar && (((Bar)this.Controls[0]).Style == eDotNetBarStyle.Office2003 || ((Bar)this.Controls[0]).Style == eDotNetBarStyle.VS2005 || BarFunctions.IsOffice2007Style(((Bar)this.Controls[0]).Style)))
+			{
+				iHorSpacing=2;
+				iVerSpacing=1;
+			}
+
+			int iMaxSize=0, iX=0, iY=0; // When in horizontal layout this is max. height, for vertical layout this is max width
+			bool bSameLineDocking=false;
+			int iCurrentLine=0,iLastLine=0;
+
+			bool bRepeatLayout=false;
+			bool bCurrentLineIncreased=false, bSwitchLine=false;
+			do
+			{
+				iMaxSize=0; // When in horizontal layout this is max. height, for vertical layout this is max width
+				iX=0;
+				iY=0;
+				iCurrentLine=0;
+				iLastLine=0;
+				bRepeatLayout=false;
+				arrBarsInSameLine=new ArrayList(this.Controls.Count);
+				if(this.Controls.Count>0)
+				{
+					pDockInfo=this.Controls[0] as IDockInfo;
+					iLastLine=pDockInfo.DockLine;
+				}
+				bool bLastHidden=false;
+
+				for(int i=0;i<this.Controls.Count;i++)
+				{
+					objCtrl=this.Controls[i];
+					pDockInfo=objCtrl as IDockInfo;
+					objBar=objCtrl as Bar;
+					//objOldSize=objCtrl.Size;
+					//objOldLocation=objCtrl.Location;
+					bSameLineDocking=false;
+
+					if(pDockInfo==null || !objCtrl.Visible)
+					{
+						// Allow hidden bars to remember the dock line they had when visible so
+						// same position can be retained
+						if(objBar!=null)
+						{
+							if(pDockInfo.DockLine>iLastLine)
+							{
+								iLastLine=pDockInfo.DockLine;
+								if(!bCurrentLineIncreased)
+								{
+									iCurrentLine++;
+									bSwitchLine=true;
+								}
+							}
+						}
+						bLastHidden=true;
+						// end hidden bar mod
+						continue;
+					}
+
+					bCurrentLineIncreased=false;
+
+					if(m_DockOrientation==eOrientation.Horizontal)
+					{
+						if(bSwitchLine)
+						{
+							iY+=(iMaxSize+iVerSpacing);
+							iX=0;
+							iMaxSize=0;
+							bSwitchLine=false;
+						}
+
+						System.Drawing.Size frameSize=System.Drawing.Size.Empty;
+                        if(objBar.LayoutType == eLayoutType.Toolbar)
+                            objMinSize = objBar.GetAdjustedFullSize(pDockInfo.MinimumDockSize(m_DockOrientation));
+                        else
+                            objMinSize = new Size(1, 1); // objBar.GetAdjustedFullSize(pDockInfo.MinimumDockSize(m_DockOrientation));
+						if(objBar.Stretch || (i>0 && ((iX+objCtrl.Width>this.Width && objMinSize.Width+iX>this.Width) || pDockInfo.DockLine>iLastLine)))
+						{
+							if(objBar.Stretch && objBar.LayoutType==eLayoutType.DockContainer && objBar.DockLine>=0 && lineDockCounts[objBar.DockLine]>0)
+							{
+								if(lineDockCounts[objBar.DockLine]==1)
+									objBar.SplitDockWidth=0;
+
+								if(objBar.SplitDockWidth!=0 && !(lineDockProcessed[objBar.DockLine]==1 && lineDockSize[objBar.DockLine]!=this.Width))
+									frameSize=new Size(objBar.SplitDockWidth,1); //objBar.Size=new Size(objBar._SplitDockWidth,1);
+								else
+								{
+									if(lineDockProcessed[objBar.DockLine]==1) // && lineDockSize[objBar.DockLine]!=this.Width && (lineDefHeightCount[objBar.DockLine]==0 || objBar._SplitDockWidth+iX==this.Width))
+									{
+//										if(objBar._SplitDockWidth>0)
+//											objBar.Size=new Size(this.Width-lineDockSize[objBar.DockLine]+objBar._SplitDockWidth,1);
+//										else
+//											objBar.Size=new Size(this.Width-lineDockSize[objBar.DockLine],1);
+										frameSize=new Size(this.Width-iX,1); //objBar.Size=new Size(this.Width-iX,1);
+									}
+									else
+										frameSize=new Size((this.Width-lineDockSize[objBar.DockLine])/(lineDefHeightCount[objBar.DockLine]==0?1:lineDefHeightCount[objBar.DockLine]),1); //objBar.Size=new Size((this.Width-lineDockSize[objBar.DockLine])/lineDefHeightCount[objBar.DockLine],1);
+								}
+								//objBar.Size=new Size(this.Width/lineDockCounts[objBar.DockLine],1);
+								// We need to switch to new line here
+								if(iLastLine!=pDockInfo.DockLine && lineDockProcessed[objBar.DockLine]==lineDockCounts[objBar.DockLine] && iX>0)
+								{
+									iLastLine=pDockInfo.DockLine;
+									iCurrentLine++;
+									iY+=(iMaxSize+iVerSpacing);
+									iX=0;
+									iMaxSize=0;
+									if(lineDockCounts[objBar.DockLine]==1 || frameSize.IsEmpty) // added to allow split bars on top dock site
+										frameSize=new Size(this.Width,1); //objBar.Size=new Size(this.Width,1);
+								}
+								lineDockProcessed[objBar.DockLine]--;
+								bSameLineDocking=true;
+								arrBarsInSameLine.Add(objBar);
+							}
+							else
+								frameSize=new Size(this.Width,1); //objBar.Size=new Size(this.Width,1);
+						}
+						else
+							frameSize=new Size(this.Width-iX,1); //objBar.Size=new Size(this.Width-iX,1);
+
+						objBar.RecalcSize(frameSize);
+
+						// If item cannot fit move it to the next line if we are not on first line
+						// Or if item wants to be in new line
+                        if(i>0 && pDockInfo.DockLine>iLastLine && iX>0)
+                        {
+                            // If it did not fit and we do same line docking we need to rearrange things
+                            if(bSameLineDocking)
+                            {
+                                lineDockCounts[objBar.DockLine]=0;
+                                lineDockProcessed[objBar.DockLine]=0;
+                                bRepeatLayout=true;
+                                break;
+                            }
+
+                            if(pDockInfo.DockLine>iLastLine)
+                                bResetOffset=false;
+                            else
+                                bResetOffset=true;
+
+                            // Remember Last Line
+                            iLastLine=pDockInfo.DockLine;
+                            // Go to the new line
+                            iCurrentLine++;
+                            iY+=(iMaxSize+iVerSpacing);
+                            iX=0;
+                            iMaxSize=0;
+
+                            if(bResetOffset)
+                                pDockInfo.DockOffset=0;
+
+                            // See can we honor the DockOffset
+                            if(pDockInfo.DockOffset>0)
+                            {
+                                if(pDockInfo.DockOffset+objCtrl.Width>this.Width)
+                                    iX=this.Width-objCtrl.Width;
+                                else
+                                    iX=pDockInfo.DockOffset;
+                                if(iX<0)
+                                    iX=0;
+                            }
+                        }
+                        else
+						{
+							if(iLastLine!=pDockInfo.DockLine)
+							{
+								iLastLine=pDockInfo.DockLine;
+								if(bLastHidden)
+									iCurrentLine++; // Done to retain the position of hidden bars
+							}
+							if(bResetOffset)
+								pDockInfo.DockOffset=0;
+							// Try to honor DockOffset
+							if(!pDockInfo.Stretch)
+							{
+								if(pDockInfo.DockOffset>iX && pDockInfo.DockOffset+objCtrl.Width<=this.Width)
+									iX=pDockInfo.DockOffset;
+								else if(pDockInfo.DockOffset>iX && this.Width-objCtrl.Width>iX)
+									iX=this.Width-objCtrl.Width;
+							}
+						}
+
+						if(iX+objCtrl.Width>this.Width)
+						{
+							// We have to resize it to fit...
+							//objCtrl.Width=this.Width-iX;
+							if(objBar!=null)
+								objBar.RecalcSize(new Size(this.Width-iX,objBar.Height));
+							else
+                                objCtrl.Width=this.Width-iX;
+							// Then reset DockOffset
+							pDockInfo.DockOffset=0;
+						}
+						//					else
+						//					{
+						//						if(pDockInfo.Stretch)
+						//						{
+						//							objCtrl.Width=this.Width;
+						//							if(objBar!=null)
+						//								objBar.RecalcSize();
+						//						}
+						//					}
+
+						objCtrl.Location=new Point(iX,iY);
+
+						iX+=(objCtrl.Width+iHorSpacing);
+						if(bResetOffset || pDockInfo.DockLine!=iCurrentLine)
+							pDockInfo.DockOffset=objCtrl.Left;
+
+						// Get the max height
+						if(objCtrl.Height>iMaxSize)
+							iMaxSize=objCtrl.Height;
+
+						if(objBar!=null && objBar.ItemsContainer.HeightInternal>lineContainerMaxSize[iCurrentLine])
+							lineContainerMaxSize[iCurrentLine]=objBar.ItemsContainer.HeightInternal;
+
+						if(pDockInfo.Stretch)
+						{
+							if(objBar.LayoutType==eLayoutType.DockContainer && objBar.DockLine>=0 && lineDockProcessed[objBar.DockLine]>0)
+							{
+								pDockInfo.SetDockLine(iCurrentLine);
+							}
+							else
+							{
+								pDockInfo.SetDockLine(iCurrentLine);
+								// Remember Last Line
+								iLastLine=pDockInfo.DockLine;
+								// Go to the new line
+								iCurrentLine++;
+								bCurrentLineIncreased=true;
+								iY+=(iMaxSize+iVerSpacing);
+								iX=0;
+								iMaxSize=0;
+							}
+						}
+						else
+							pDockInfo.SetDockLine(iCurrentLine);
+					}
+					else
+					{
+						//*********************************************************************
+						// Vertical layout
+						//*********************************************************************
+						if(bSwitchLine)
+						{
+							iX+=(iMaxSize+iVerSpacing);
+							iY=0;
+							iMaxSize=0;
+							bSwitchLine=false;
+						}
+
+						
+						System.Drawing.Size frameSize=System.Drawing.Size.Empty;
+                        objMinSize = new Size(1, 1); // objBar.GetAdjustedFullSize(pDockInfo.MinimumDockSize(m_DockOrientation));
+						if(objBar.Stretch || (i>0 && ((iY+objCtrl.Height>this.Height && objMinSize.Height+iY>this.Height) || pDockInfo.DockLine>iLastLine)))
+						{
+							if(objBar.Stretch && objBar.LayoutType==eLayoutType.DockContainer && objBar.DockLine>=0 && lineDockCounts[objBar.DockLine]>0)
+							{
+								if(lineDockCounts[objBar.DockLine]==1)
+									objBar.SplitDockHeight=0;
+								if(objBar.SplitDockHeight!=0 && !(lineDockProcessed[objBar.DockLine]==1 && lineDockSize[objBar.DockLine]!=this.Height))
+									frameSize=new Size(1,objBar.SplitDockHeight);// objBar.Size=new Size(1,objBar._SplitDockHeight);
+								else
+								{
+									if(lineDockProcessed[objBar.DockLine]==1)
+										frameSize=new Size(1,this.Height-iY); //objBar.Size=new Size(1,this.Height-iY);
+									else
+										frameSize=new Size(1,(this.Height-lineDockSize[objBar.DockLine])/(lineDefHeightCount[objBar.DockLine]==0?1:lineDefHeightCount[objBar.DockLine])); //objBar.Size=new Size(1,(this.Height-lineDockSize[objBar.DockLine])/lineDefHeightCount[objBar.DockLine]);
+								}
+								//objBar.Size=new Size(1,this.Height/lineDockCounts[objBar.DockLine]);
+								
+								// We need to switch to new line here
+								if(iLastLine!=pDockInfo.DockLine && lineDockProcessed[objBar.DockLine]==lineDockCounts[objBar.DockLine] && iY>0)
+								{
+									iLastLine=pDockInfo.DockLine;
+									iCurrentLine++;
+									iX+=(iMaxSize+iVerSpacing);
+									iY=0;
+									iMaxSize=0;
+									frameSize=new Size(1,this.Height); // objBar.Size=new Size(1,this.Height);
+								}
+								lineDockProcessed[objBar.DockLine]--;
+								bSameLineDocking=true;
+								arrBarsInSameLine.Add(objBar);
+							}
+							else
+								frameSize=new Size(1,this.Height); //objBar.Size=new Size(1,this.Height);
+						}
+						else
+							frameSize=new Size(1,this.Height-iY); //objBar.Size=new Size(1,this.Height-iY);
+
+						objBar.RecalcSize(frameSize);
+
+						// If item cannot fit move it to the next line if we are not on first line anyway
+						// Or if item wants to be in new line anyway
+						//if(i>0 && ((iY+objCtrl.Height>this.Height && objMinSize.Height+iY>this.Height) || pDockInfo.DockLine>iLastLine && iY>0))
+						//if(i>0 && pDockInfo.DockLine>iLastLine && iY>0)
+                        if(i>0 && pDockInfo.DockLine>iLastLine && iY>0)
+                        {
+                            // If it did not fit and we do same line docking we need to rearrange things
+                            if(bSameLineDocking)
+                            {
+                                lineDockCounts[objBar.DockLine]=0;
+                                lineDockProcessed[objBar.DockLine]=0;
+                                bRepeatLayout=true;
+                                break;
+                            }
+
+                            if(pDockInfo.DockLine>iLastLine)
+                                bResetOffset=false;
+                            else
+                                bResetOffset=true;
+
+                            // Remember Last Line
+                            iLastLine=pDockInfo.DockLine;
+
+                            // Go to the new line
+                            iCurrentLine++;
+                            iX+=(iMaxSize+iVerSpacing);
+                            iY=0;
+                            iMaxSize=0;
+
+                            if(bResetOffset)
+                                pDockInfo.DockOffset=0;
+
+                            // See can we honor the DockOffset
+                            if(pDockInfo.DockOffset>0)
+                            {
+                                if(pDockInfo.DockOffset+objCtrl.Height>this.Height)
+                                    iY=this.Height-objCtrl.Height;
+                                else
+                                    iY=pDockInfo.DockOffset;
+                                if(iY<0)
+                                    iY=0;
+                            }
+                        }
+                        else
+						{
+							if(iLastLine!=pDockInfo.DockLine)
+								iLastLine=pDockInfo.DockLine;
+
+							if(bResetOffset)
+								pDockInfo.DockOffset=0;
+							// Try to honor DockOffset
+							if(!pDockInfo.Stretch)
+							{
+								if(pDockInfo.DockOffset>iY && pDockInfo.DockOffset+objCtrl.Height<=this.Height)
+									iY=pDockInfo.DockOffset;
+								else if(pDockInfo.DockOffset>iY && this.Height-objCtrl.Height>iY)
+									iY=this.Height-objCtrl.Height;
+							}
+						}
+
+						if(iY+objCtrl.Height>this.Height)
+						{
+							// We have to resize it to fit...
+							if(objBar!=null)
+								objBar.RecalcSize(new Size(objBar.Width,this.Height-iY));
+							else
+                                objCtrl.Height=this.Height-iY;
+							// Then reset DockOffset
+							pDockInfo.DockOffset=0;
+						}
+						//					else
+						//					{
+						//						if(pDockInfo.Stretch)
+						//						{
+						//							objCtrl.Height=this.Height;
+						//							if(objBar!=null)
+						//								objBar.RecalcSize();
+						//						}
+						//					}
+
+						objCtrl.Location=new Point(iX,iY);
+
+						iY+=(objCtrl.Height+iHorSpacing);
+						if(bResetOffset || pDockInfo.DockLine!=iCurrentLine)
+							pDockInfo.DockOffset=objCtrl.Top;
+						// Get the max Width
+						if(objCtrl.Width>iMaxSize)
+							iMaxSize=objCtrl.Width;
+
+						if(objBar!=null && objBar.ItemsContainer.WidthInternal>lineContainerMaxSize[iCurrentLine])
+							lineContainerMaxSize[iCurrentLine]=objBar.ItemsContainer.WidthInternal;
+
+						if(pDockInfo.Stretch)
+						{
+							if(objBar.LayoutType==eLayoutType.DockContainer && objBar.DockLine>=0 && lineDockProcessed[objBar.DockLine]>0)
+							{
+								pDockInfo.SetDockLine(iCurrentLine);
+							}
+							else
+							{
+								pDockInfo.SetDockLine(iCurrentLine);
+								// Remember Last Line
+								iLastLine=pDockInfo.DockLine;
+								// Go to the new line
+								iCurrentLine++;
+								iX+=(iMaxSize+iVerSpacing);
+								iY=0;
+								iMaxSize=0;
+							}
+						}
+						else
+							pDockInfo.SetDockLine(iCurrentLine);
+					}
+
+					// Repaint control if needed
+					//if(objOldSize.Width!=objCtrl.Width || objOldSize.Height!=objCtrl.Height)
+					//	objCtrl.Refresh();
+					//else
+					//objCtrl.Update();
+					bLastHidden=false;
+				}
+			} while(bRepeatLayout);
+
+			// Make sure that bars that are stretching and sharing same line have same width/height
+			foreach(Bar bar in arrBarsInSameLine)
+			{
+				if(m_DockOrientation==eOrientation.Horizontal)
+				{
+					if(bar.ItemsContainer.HeightInternal!=lineContainerMaxSize[bar.DockLine])
+					{
+						bar.ItemsContainer.MinHeight=lineContainerMaxSize[bar.DockLine];
+						System.Drawing.Size frameSize=new Size(bar.Width,1);//bar.Size=new Size(bar.Width,1);
+						bar.RecalcSize(frameSize);
+					}
+				}
+				else
+				{
+					if(bar.ItemsContainer.WidthInternal!=lineContainerMaxSize[bar.DockLine])
+					{
+						bar.ItemsContainer.MinWidth=lineContainerMaxSize[bar.DockLine];
+						System.Drawing.Size frameSize=new Size(1,bar.Height); //bar.Size=new Size(1,bar.Height);
+						bar.RecalcSize(frameSize);
+					}
+				}
+			}
+
+			if(m_DockOrientation==eOrientation.Horizontal)
+			{
+                // Flip  for RTL
+                //if (this.RightToLeft == RightToLeft.Yes)
+                //{
+                //    foreach (Control c in this.Controls)
+                //    {
+                //        c.Left = this.Width - (c.Left + c.Width);
+                //    }
+                //}
+				if(this.Height!=iY+iMaxSize)
+				{
+					this.Height=iY+iMaxSize;
+					if(this.Parent!=null)
+						this.Parent.PerformLayout(this,"Height");
+					this.Invalidate();
+				}
+			}
+			else
+			{
+				if(this.Width!=iX+iMaxSize)
+				{
+					this.Width=iX+iMaxSize;
+					if(this.Parent!=null)
+						this.Parent.PerformLayout(this,"Width");
+					this.Invalidate();
+				}
+			}
+			if(!m_OversizeLayout)
+			{
+				if(this.Dock==DockStyle.Right && this.Location.X<0 || this.Dock==DockStyle.Left && this.Parent!=null && this.Right>this.Parent.Width || this.Dock==DockStyle.Top && this.Parent!=null && this.Bottom>this.Parent.Height || this.Dock==DockStyle.Bottom && this.Location.Y<0)
+				{
+					m_OversizeLayout=true;
+					m_Layingout=false;
+					EnforceClientMinSize();
+					if(m_OversizeLayout)
+						m_OversizeLayout=false;
+				}
+			}
+			else
+				m_OversizeLayout=false;
+
+            if (this.Parent != null && this.Parent.Visible && m_OptimizeLayoutRedraw) // See WARNING at the beggining
+			{
+				NativeFunctions.SendMessage(this.Handle,NativeFunctions.WM_SETREDRAW,1,0);
+				if(parentZOrder!=-1) this.Parent.Controls.SetChildIndex(this,parentZOrder);
+				this.Parent.Invalidate(oldDockSiteSize,true);
+				this.Parent.Invalidate(this.Bounds,true);
+				this.Parent.Update();
+			}
+			m_Layingout=false;
+		}
+
+		protected override void OnParentChanged(EventArgs e)
+		{
+			base.OnParentChanged(e);
+			Control parentControl=this.FindForm();
+            if (parentControl != null)
+                parentControl.Resize += new EventHandler(ParentResized);
+		}
+		private void ParentResized(object sender, EventArgs e)
+		{
+            Control parentControl = this.Parent;
+
+            if (parentControl != null && (parentControl.Width == 0 || parentControl.Height == 0))
+				return;
+
+            if (parentControl != null && parentControl is Form && ((Form)parentControl).WindowState == FormWindowState.Minimized)
+				return;
+
+			EnforceClientMinSize();
+
+		}
+		private void EnforceClientMinSize()
+		{
+            if (this.Dock == DockStyle.Fill || this.Dock == DockStyle.None || m_DocumentDockContainer == null || this.Width == 0 || this.Height == 0)
+                return;
+            if(this.Parent!=null && (this.Parent.Width==0 || this.Parent.Height==0))
+                return;
+
+            bool isWidth = (this.Dock == DockStyle.Right || this.Dock == DockStyle.Left);
+
+            int clientSize = isWidth?this.GetClientWidth():this.GetClientHeight();
+            int minClientSize = 32;
+            if (m_Owner != null) minClientSize = isWidth?m_Owner.MinimumClientSize.Width:m_Owner.MinimumClientSize.Height;
+
+            if (clientSize > minClientSize)
+            {
+                if (m_OriginalSize > 0)
+                {
+                    int increase = m_OriginalSize - (isWidth?this.Width:this.Height);
+                    if (clientSize - increase < minClientSize)
+                        increase -= (minClientSize - (clientSize - increase));
+
+                    if (increase > 0)
+                    {
+                        if(isWidth)
+                            this.Width += increase;
+                        else
+                            this.Height += increase;
+                    }
+
+                    if (isWidth && this.Width >= m_OriginalSize || !isWidth && this.Height >= m_OriginalSize)
+                        m_OriginalSize = 0;
+
+                }
+                return;
+            }
+
+            // Try to reduce size of the dock area to maintain the minimum client width
+            this.GetDocumentUIManager().RootDocumentDockContainer.RefreshMinimumSize();
+            DocumentDockUIManager dm = this.GetDocumentUIManager();
+            Size minContainerSize = dm.GetContainerMinimumSize(dm.RootDocumentDockContainer);
+            int minimumDockSize = isWidth ? minContainerSize.Width : minContainerSize.Height;
+            
+            int diff = minClientSize - clientSize;
+
+            if (isWidth && this.Width - diff < minimumDockSize || !isWidth && this.Height - diff < minimumDockSize)
+                diff = (isWidth ? this.Width : this.Height) - minimumDockSize;
+
+            if (diff > 0)
+            {
+                if (m_OriginalSize == 0)
+                    m_OriginalSize = isWidth ? this.Width : this.Height;
+                if(isWidth)
+                    this.Width -= diff;
+                else
+                    this.Height -= diff;
+            }
+		}
+
+        internal int OriginalSize
+        {
+            get { return m_OriginalSize; }
+            set
+            {
+                m_OriginalSize = value;
+            }
+        }
+        
+
+		protected override void OnResize(EventArgs e)
+		{
+			base.OnResize(e);
+			if(m_Layingout)
+				return;
+
+            Control parentControl = this.Parent;
+
+            if (parentControl != null && (parentControl.Width == 0 || parentControl.Height == 0))
+				return;
+
+            if (parentControl != null && parentControl is Form && ((Form)parentControl).WindowState == FormWindowState.Minimized)
+                return;
+
+            if (parentControl != null)
+			{
+				if(m_Owner!=null && m_Owner.ParentForm!=null && m_Owner.ParentForm.WindowState!=FormWindowState.Minimized || m_Owner==null || m_Owner.ParentForm==null)
+				{
+					this.Invalidate(this.Region,false);
+					LayoutBars();
+				}
+			}
+		}
+
+//		protected override void OnLayout(LayoutEventArgs e)
+//		{
+//			System.Windows.Forms.Form form=this.FindForm();
+//			
+//			if(form!=null && (form.Width==0 || form.Height==0))
+//				return;
+//
+//			if(form!=null && form.ParentForm!=null)
+//				form=form.ParentForm;
+//
+//			if(form!=null && (form.Width==0 || form.Height==0))
+//				return;
+//
+//			if(form!=null && form.WindowState!=FormWindowState.Minimized)
+//				return;
+//
+//			base.OnLayout(e);
+//		}
+
+        internal int GetClientWidth()
+        {
+            if (this.Parent == null)
+                return 0;
+
+            Control parentControl = this.Parent;
+            int width = parentControl.ClientSize.Width;
+
+            foreach (Control ctrl in parentControl.Controls)
+            {
+                if (ctrl.Visible && (ctrl.Dock == DockStyle.Left || ctrl.Dock == DockStyle.Right))
+                    width -= ctrl.Width;
+            }
+
+            return width;
+        }
+
+        internal int GetClientHeight()
+        {
+            if (this.Parent == null)
+                return 0;
+
+            Control parentControl = this.Parent;
+            int height = parentControl.ClientSize.Height;
+
+            foreach (Control ctrl in parentControl.Controls)
+            {
+                if (ctrl.Visible && (ctrl.Dock == DockStyle.Top || ctrl.Dock == DockStyle.Bottom))
+                    height -= ctrl.Height;
+            }
+
+            return height;
+        }
+
+		private int getDockLineWidth(int iStartPos, int iCurrentLine, bool bDirectionForward)
+		{
+			IDockInfo pDock;
+			int iWidth=0, i=0;
+			if(bDirectionForward)
+			{
+				for(i=iStartPos;i<this.Controls.Count;i++)
+				{
+					if(!this.Controls[i].Visible)
+						continue;
+					pDock=this.Controls[i] as IDockInfo;
+					if(pDock.DockLine==iCurrentLine)
+						iWidth+=this.Controls[i].Width;
+					else
+						break;
+				}
+			}
+			else
+			{
+				for(i=iStartPos;i>=0;i--)
+				{
+					if(!this.Controls[i].Visible)
+						continue;
+					pDock=this.Controls[i] as IDockInfo;
+					if(pDock.DockLine==iCurrentLine)
+						iWidth+=this.Controls[i].Width;
+					else
+						break;
+				}
+			}
+
+			return iWidth;
+		}
+
+		private int getDockLineHeight(int iStartPos, int iCurrentLine, bool bDirectionForward)
+		{
+			IDockInfo pDock;
+			int iHeight=0, i=0;
+			if(bDirectionForward)
+			{
+				for(i=iStartPos;i<this.Controls.Count;i++)
+				{
+					if(!this.Controls[i].Visible)
+						continue;
+					pDock=this.Controls[i] as IDockInfo;
+					if(pDock.DockLine==iCurrentLine)
+						iHeight+=this.Controls[i].Height;
+					else
+						break;
+				}
+			}
+			else
+			{
+				for(i=iStartPos;i>=0;i--)
+				{
+					if(!this.Controls[i].Visible)
+						continue;
+					pDock=this.Controls[i] as IDockInfo;
+					if(pDock.DockLine==iCurrentLine)
+						iHeight+=this.Controls[i].Height;
+					else
+						break;
+				}
+			}
+
+			return iHeight;
+		}
+
+		/*private void GetInsertPointAbove(ref DockSiteInfo pInfo, int iStartFrom, int iAboveLine, int iPosX, int iItemWidth, int iCtrlToDockIndex)
+		{
+			pInfo.InsertPosition=0;
+			pInfo.DockLine=iAboveLine-1;
+
+			if(iStartFrom==0 || iAboveLine==0)
+			{
+				// This is easy case
+				if(iPosX+iItemWidth>this.Width)
+				{
+					pInfo.DockOffset=this.Width-iItemWidth;
+					if(pInfo.DockOffset<0)
+						pInfo.DockOffset=0;
+				}
+				else
+					pInfo.DockOffset=iPosX;
+				return;
+			}
+
+			// We will need to scan to find right insertion point
+			Control objCtrl;
+			IDockInfo pCtrlDockInfo;
+			pInfo.InsertPosition=-1;
+			int iStopIndex=0;
+			if(iCtrlToDockIndex>0 && iCtrlToDockIndex<iStartFrom)
+				iStopIndex=iCtrlToDockIndex;
+
+			for(int i=iStartFrom;i>=iStopIndex;i--)
+			{
+				objCtrl=this.Controls[i];
+				pCtrlDockInfo=objCtrl as IDockInfo;
+				if(pCtrlDockInfo.DockLine==iAboveLine-1)
+				{
+					// Mouse inside this control, add after it
+					if(objCtrl.Left<iPosX)
+					{
+						pInfo.InsertPosition=i+1;
+					}
+					else
+					{
+						// Mouse on the left side of the control, add before it
+						if(i>0)
+							pInfo.InsertPosition=i-1;
+						break;
+					}
+					pInfo.DockOffset=iPosX;
+				}
+				else if(pCtrlDockInfo.DockLine<iAboveLine)
+					break;
+			}
+
+			if(pInfo.InsertPosition<0)
+			{
+				// Could not determine it
+				GetInsertPointAbove(ref pInfo,0,0,iPosX,iItemWidth,iCtrlToDockIndex);
+			}
+		}*/
+
+		/*private void GetInsertPointBelow(ref DockSiteInfo pInfo, int iStartFrom, int iBelowLine, int iPosX, int iItemWidth, int iCtrlToDockIndex)
+		{
+			pInfo.InsertPosition=0;
+			pInfo.DockLine=iBelowLine+1;
+			int iStopIndex=this.Controls.Count;
+
+			if(iStartFrom==this.Controls.Count)
+			{
+				// This is easy case
+				if(iPosX+iItemWidth>this.Width)
+				{
+					pInfo.DockOffset=this.Width-iItemWidth;
+					if(pInfo.DockOffset<0)
+						pInfo.DockOffset=0;
+				}
+				else
+					pInfo.DockOffset=iPosX;
+				pInfo.InsertPosition=this.Controls.Count;
+
+				return;
+			}
+
+			// We will need to scan to find right insertion point
+			Control objCtrl;
+			
+			if(iCtrlToDockIndex>0)
+				iStopIndex=iCtrlToDockIndex;
+			
+			objCtrl=null;
+			IDockInfo pCtrlDockInfo;
+			pInfo.InsertPosition=-1;
+			for(int i=iStartFrom;i<iStopIndex;i++)
+			{
+				objCtrl=this.Controls[i];
+				pCtrlDockInfo=objCtrl as IDockInfo;
+				if(pCtrlDockInfo.DockLine==iBelowLine+1)
+				{
+					// Mouse inside this control, add after it
+					if(objCtrl.Left<iPosX)
+					{
+						pInfo.InsertPosition=i+1;
+					}
+					else
+					{
+						// Mouse on the left side of the control, add before it
+						if(i>0)
+							pInfo.InsertPosition=i;
+						break;
+					}
+					pInfo.DockOffset=iPosX;
+				}
+				else if(pCtrlDockInfo.DockLine>iBelowLine)
+					break;
+			}
+
+			if(pInfo.InsertPosition<0)
+			{
+				// Could not determine it
+				GetInsertPointBelow(ref pInfo,this.Controls.Count,iBelowLine,iPosX,iItemWidth,iCtrlToDockIndex);
+			}
+		}*/
+
+		/// <summary>
+		/// Returns the docking information for current position.
+		/// </summary>
+		/// <param name="pDock">Controls docking provider.</param>
+		/// <param name="x">Horizontal assumed docking position.</param>
+		/// <param name="y">Vertical assumed docking position.</param>
+		/// <returns>Docking information.</returns>
+		public DockSiteInfo GetDockSiteInfo(IDockInfo pDock, int x, int y)
+		{
+			if(m_DockOrientation==eOrientation.Horizontal)
+			{
+				return GetDockSiteInfoH(pDock,x,y);
+			}
+			else
+			{
+				return GetDockSiteInfoV(pDock,x,y);
+			}
+		}
+
+		private DockSiteInfo GetDockSiteInfoH(IDockInfo pDock, int x, int y)
+		{
+			DockSiteInfo pInfo=new DockSiteInfo();
+			Rectangle thisRect=new Rectangle(this.PointToScreen(new Point(0,0)),this.Size);
+			Point pInsertionPoint=this.PointToClient(new Point(x,y));
+			Control objCtrlToDock=pDock as Control;
+
+			System.Drawing.Size objDockSize=pDock.PreferredDockSize(m_DockOrientation);
+			System.Drawing.Size minDockSize=pDock.MinimumDockSize(m_DockOrientation);
+
+			if(this.Height==0)
+			{
+				thisRect.Height=10;
+				if(this.Dock==System.Windows.Forms.DockStyle.Bottom)
+					thisRect.Y-=10;
+			}
+			else if(this.Width==0)
+			{
+				thisRect.Width=this.TopLevelControl.Width;
+				if(this.Dock==System.Windows.Forms.DockStyle.Right)
+					thisRect.X-=10;
+			}
+
+			// If mouse is not inside exit
+			thisRect.Inflate(8,8); // m_DockMargin
+			if(!thisRect.Contains(x,y) || pDock==null)
+				return pInfo;
+
+            bool bDockedHere=(pDock.DockedSite==this);
+			int[] lineCount=new int[255];
+			int iMaxDockLine=0;
+			int iDockLine=-10;
+			bool bDocked=false;
+			foreach(Control objCtrl in this.Controls)
+			{
+				if(!objCtrl.Visible)
+					continue;
+				IDockInfo pCtrlDockInfo=objCtrl as IDockInfo;
+				lineCount[pCtrlDockInfo.DockLine]++;
+                iMaxDockLine=pCtrlDockInfo.DockLine;
+			}
+			
+			int iLockedDockLine=-1;
+
+			for(int i=0;i<this.Controls.Count;i++)
+			{
+				Control objCtrl=this.Controls[i];
+				if(!objCtrl.Visible)
+					continue;
+				IDockInfo pCtrlDockInfo=objCtrl as IDockInfo;
+				if(pCtrlDockInfo.LockDockPosition && objCtrlToDock is Bar && !((Bar)objCtrl).CanUndock)
+				{
+					if(this.Dock==DockStyle.Top)
+                        iLockedDockLine=pCtrlDockInfo.DockLine;
+					else if(iLockedDockLine==-1)
+						iLockedDockLine=pCtrlDockInfo.DockLine;
+				}
+				if(pInsertionPoint.Y>objCtrl.Top+4 && ((pInsertionPoint.Y<objCtrl.Top+objDockSize.Height-4 && objDockSize.Height<=objCtrl.Height) || pInsertionPoint.Y<objCtrl.Bottom-4 && objDockSize.Height>objCtrl.Height))
+				{
+					if(pCtrlDockInfo.Stretch && objCtrl!=objCtrlToDock)
+					{
+						if(objCtrl is Bar && objCtrlToDock is Bar && ((Bar)objCtrl).LayoutType==eLayoutType.DockContainer && ((Bar)objCtrlToDock).LayoutType==eLayoutType.DockContainer && ((Bar)objCtrl).CanTearOffTabs)
+						{
+							if(!objCtrl.Bounds.Contains(pInsertionPoint))
+								continue;
+							iDockLine=pCtrlDockInfo.DockLine;
+							if(((Bar)objCtrl).IsPositionOnDockTab(x,y))
+							{
+								pInfo.DockLine=pCtrlDockInfo.DockLine;
+								pInfo.DockOffset=pCtrlDockInfo.DockOffset;
+								pInfo.InsertPosition=i;
+								pInfo.objDockSite=this;
+								pInfo.DockSide=this.Dock;
+								pInfo.TabDockContainer=objCtrl as Bar;
+								return pInfo;
+							}
+						}
+						else
+						{
+							iDockLine=pCtrlDockInfo.DockLine-1;
+						}
+					}
+					else
+					{
+						if(objCtrl!=objCtrlToDock && objCtrlToDock is Bar && ((Bar)objCtrlToDock).Stretch)
+						{
+							int iInsertPosition=i;
+							for(int iInsertIndex=i-1;iInsertIndex>=0;iInsertIndex--)
+							{
+								if(((IDockInfo)this.Controls[iInsertIndex]).DockLine==pDock.DockLine)
+									iInsertPosition=iInsertIndex;
+								else
+									break;
+							}
+							pInfo.DockLine=pDock.DockLine;
+							pInfo.DockOffset=pDock.DockOffset;
+							pInfo.InsertPosition=iInsertPosition;
+							pInfo.objDockSite=this;
+							pInfo.DockSide=this.Dock;
+							pInfo.NewLine=true;
+							return pInfo;
+						}
+						else
+							iDockLine=pCtrlDockInfo.DockLine;
+					}
+
+					break;
+				}
+				else if(objCtrl==objCtrlToDock && pInsertionPoint.Y<=objCtrl.Top+4 && pInsertionPoint.Y>objCtrl.Top && lineCount[pCtrlDockInfo.DockLine]>1)
+				{
+					int iInsertPosition=i;
+					for(int iInsertIndex=i-1;iInsertIndex>=0;iInsertIndex--)
+					{
+						if(((IDockInfo)this.Controls[iInsertIndex]).DockLine==pDock.DockLine)
+							iInsertPosition=iInsertIndex;
+						else
+							break;
+					}
+					pInfo.DockLine=pDock.DockLine;
+					pInfo.DockOffset=pDock.DockOffset;
+					pInfo.InsertPosition=iInsertPosition;
+					pInfo.objDockSite=this;
+					pInfo.DockSide=this.Dock;
+					pInfo.NewLine=true;
+					return pInfo;
+				}
+				else if(this.Dock==DockStyle.Top && objCtrl==objCtrlToDock && pInsertionPoint.Y>=objCtrl.Bottom-4 && pInsertionPoint.Y<objCtrl.Bottom-1 && lineCount[pCtrlDockInfo.DockLine]==1 && pDock.DockLine!=iMaxDockLine)
+				{
+					int iInsertPosition=i;
+					for(int iInsertIndex=i+1;iInsertIndex<this.Controls.Count;iInsertIndex++)
+					{
+						if(((IDockInfo)this.Controls[iInsertIndex]).DockLine==pDock.DockLine+1 && (((IDockInfo)this.Controls[iInsertIndex]).DockOffset<=pDock.DockOffset || pDock.Stretch) || ((IDockInfo)this.Controls[iInsertIndex]).DockLine==pDock.DockLine)
+							iInsertPosition=iInsertIndex;
+						else
+							break;
+					}
+					pInfo.DockLine=pDock.DockLine+1;
+					pInfo.DockOffset=pDock.DockOffset;
+					pInfo.InsertPosition=iInsertPosition;
+					pInfo.objDockSite=this;
+					pInfo.DockSide=this.Dock;
+					return pInfo;
+				}
+			}
+
+			if(iDockLine==-10)
+			{
+				if(pInsertionPoint.Y<=-5 && !(bDockedHere && pDock.DockLine==0 && lineCount[0]==1))
+				{
+					iDockLine=-1;
+				}
+				else if(!bDockedHere)
+				{
+					if(pInsertionPoint.Y>this.Height)
+						iDockLine=iMaxDockLine+1;
+					else
+						iDockLine=iMaxDockLine;
+				}
+                else if (pInsertionPoint.Y > this.Height + 4 && !(bDockedHere && pDock.DockLine == iMaxDockLine && lineCount[iMaxDockLine] == 1))
+				{
+					iDockLine=iMaxDockLine+1;
+				}
+				
+				if(iDockLine==-10)
+				{
+					pInfo.DockLine=pDock.DockLine;
+					pInfo.DockOffset=pDock.DockOffset;
+					pInfo.InsertPosition=this.Controls.GetChildIndex(objCtrlToDock);
+					pInfo.objDockSite=this;
+					pInfo.DockSide=this.Dock;
+					return pInfo;
+				}
+			}
+
+			if(iLockedDockLine!=-1)
+			{
+				if(this.Dock==DockStyle.Top && iDockLine<=iLockedDockLine)
+					iDockLine=iLockedDockLine+1;
+				else if(this.Dock==DockStyle.Bottom && iDockLine>=iLockedDockLine)
+					iDockLine=iLockedDockLine-1;
+			}
+
+			// We have the docking line now, find right Docking offset for object to dock
+
+			// First get the index of the docking line, default is at the end
+			int iIndex=this.Controls.Count;
+			for(int i=0;i<this.Controls.Count;i++)
+			{
+				Control objCtrl=this.Controls[i];
+				if(!objCtrl.Visible)
+					continue;
+				IDockInfo pCtrlDockInfo=objCtrl as IDockInfo;
+				if(pCtrlDockInfo.DockLine>=iDockLine)
+				{
+					iIndex=i;
+					break;
+				}
+			}
+
+			// Find the right insertion point based on X coordinate
+			for(int i=iIndex;i<this.Controls.Count;i++)
+			{
+				Control objCtrl=this.Controls[i];
+				if(!objCtrl.Visible)
+					continue;
+				IDockInfo pCtrlDockInfo=objCtrl as IDockInfo;
+				if(pCtrlDockInfo.DockLine>iDockLine)
+				{
+					pInfo.InsertPosition=i;
+					if(bDockedHere && i>0 && this.Controls.GetChildIndex(objCtrlToDock)<i)
+						pInfo.InsertPosition=i-1;
+					if(pInsertionPoint.X+objDockSize.Width>this.Width)
+						pInfo.DockOffset=this.Width-objDockSize.Width;
+					else
+						pInfo.DockOffset=pInsertionPoint.X;
+					pInfo.DockLine=iDockLine;
+					pInfo.DockSide=this.Dock;
+					pInfo.objDockSite=this;
+					bDocked=true;
+					break;
+				}
+				if(objCtrl.Bounds.Contains(pInsertionPoint))
+				{
+					if(objCtrl!=objCtrlToDock)
+					{
+						if(pInsertionPoint.X>=objCtrl.Left && pInsertionPoint.X<=objCtrl.Left+10)
+						{
+							// This is right position, insert before docked control
+							pInfo.InsertPosition=i;
+							if(bDockedHere && i>0 && this.Controls.GetChildIndex(objCtrlToDock)<i)
+								pInfo.InsertPosition=i-1;
+							pInfo.DockOffset=0;
+							pInfo.DockLine=iDockLine;
+							pInfo.DockSide=this.Dock;
+							pInfo.objDockSite=this;
+						}
+						else
+						{
+							// Insert after docked control
+							int iTmp=getDockLineWidth(i,iDockLine,false);
+							if(iTmp+objDockSize.Width>=this.Width || pInsertionPoint.X<iTmp)
+								pInfo.DockOffset=objCtrl.Right;
+							else
+								pInfo.DockOffset=pInsertionPoint.X;
+
+							pInfo.InsertPosition=i+1;
+
+							if(pDock.Stretch)
+							{
+								//if(iDockLine<iMaxDockLine)
+								//	iDockLine++;
+								pInfo.DockOffset=pDock.DockOffset;
+							}
+							if(bDockedHere && i>0 && this.Controls.GetChildIndex(objCtrlToDock)<i)
+								pInfo.InsertPosition=i;
+
+							pInfo.DockLine=iDockLine;
+							pInfo.DockSide=this.Dock;
+							pInfo.objDockSite=this;
+						}
+					}
+					else
+					{
+						// This just tries to move control to the right, insertion point is over the object that needs to be docked
+						pInfo.InsertPosition=i;
+						pInfo.DockLine=iDockLine;
+						pInfo.DockSide=this.Dock;
+						pInfo.objDockSite=this;
+
+						int iTmp=getDockLineWidth(i+1,pDock.DockLine,true);
+						
+						if(iTmp+objDockSize.Width+pInsertionPoint.X>=this.Width)
+							pInfo.DockOffset=this.Width-iTmp-objDockSize.Width;
+						else
+							pInfo.DockOffset=pInsertionPoint.X;
+
+						if(pInfo.DockOffset<0)
+							pInfo.DockOffset=0;
+					}
+					bDocked=true;
+					break;
+				}
+				else if(pInsertionPoint.X<objCtrl.Left || pInsertionPoint.Y<objCtrl.Top && iLockedDockLine<0)
+				{
+					// Dock it before this control, insertion point is in empty space before docked control
+					pInfo.InsertPosition=i;
+					if(bDockedHere && i>0 && this.Controls.GetChildIndex(objCtrlToDock)<i)
+						pInfo.InsertPosition=i-1;
+					if(pDock.Stretch)
+						pInfo.DockOffset=pDock.DockOffset;
+					else
+						pInfo.DockOffset=pInsertionPoint.X;
+					pInfo.DockLine=iDockLine;
+					pInfo.DockSide=this.Dock;
+					pInfo.objDockSite=this;
+					bDocked=true;
+					break;
+				}
+			}
+
+			if(!bDocked)
+			{
+				// Add it to the end
+				if(iDockLine>=0)
+				{
+					if(bDockedHere)
+						pInfo.InsertPosition=this.Controls.Count-1;
+					else
+						pInfo.InsertPosition=this.Controls.Count;
+
+				}
+				else
+					pInfo.InsertPosition=0;
+
+				if(pInsertionPoint.X+objDockSize.Width>this.Width)
+					pInfo.DockOffset=this.Width-objDockSize.Width;
+				else
+					pInfo.DockOffset=pInsertionPoint.X;
+				if(iDockLine>=0)
+				{
+					pInfo.DockLine=iDockLine;
+				}
+				else
+					pInfo.DockLine=-1;
+
+				pInfo.DockSide=this.Dock;
+				pInfo.objDockSite=this;
+			}
+
+			// Snap it to the left
+			if(pInfo.DockOffset<10)
+				pInfo.DockOffset=0;
+
+			if(m_DockOrientation==eOrientation.Horizontal)
+			{
+				if(objDockSize.Width>this.Width)
+					pInfo.DockedWidth=this.Width;
+				else
+					pInfo.DockedWidth=objDockSize.Width;
+
+				pInfo.DockedHeight=objDockSize.Height;
+			}
+			else
+			{
+				if(objDockSize.Height>this.Height)
+					pInfo.DockedHeight=this.Height;
+				else
+					pInfo.DockedHeight=objDockSize.Height;
+
+				pInfo.DockedWidth=objDockSize.Width;
+			}
+
+			return pInfo;
+		}
+
+		private DockSiteInfo GetDockSiteInfoV(IDockInfo pDock, int x, int y)
+		{
+			DockSiteInfo pInfo=new DockSiteInfo();
+			Rectangle thisRect=new Rectangle(this.PointToScreen(new Point(0,0)),this.Size);
+			Point pInsertionPoint=this.PointToClient(new Point(x,y));
+			Control objCtrlToDock=pDock as Control;
+
+			System.Drawing.Size objDockSize=pDock.PreferredDockSize(m_DockOrientation);
+
+			if(this.Height==0)
+			{
+				thisRect.Height=10;
+				if(this.Dock==System.Windows.Forms.DockStyle.Bottom)
+					thisRect.Y-=10;
+			}
+			else if(this.Width==0)
+			{
+				thisRect.Width=10;
+				if(this.Dock==System.Windows.Forms.DockStyle.Right)
+					thisRect.X-=10;
+			}
+
+			// If mouse is not inside exit
+			thisRect.Inflate(8,8); // m_DockMargin
+			if(!thisRect.Contains(x,y) || pDock==null)
+				return pInfo;
+
+			bool bDockedHere=(pDock.DockedSite==this);
+			int[] lineCount=new int[255];
+			int iMaxDockLine=0;
+			int iDockLine=-10;
+			bool bDocked=false;
+			foreach(Control objCtrl in this.Controls)
+			{
+				if(!objCtrl.Visible)
+					continue;
+				IDockInfo pCtrlDockInfo=objCtrl as IDockInfo;
+				lineCount[pCtrlDockInfo.DockLine]++;
+				iMaxDockLine=pCtrlDockInfo.DockLine;
+			}
+
+			int iLockedDockLine=-1;
+
+			for(int i=0;i<this.Controls.Count;i++)
+			{
+				Control objCtrl=this.Controls[i];
+				if(!objCtrl.Visible)
+					continue;
+				IDockInfo pCtrlDockInfo=objCtrl as IDockInfo;
+				if(pInsertionPoint.X>objCtrl.Left+4 && ((pInsertionPoint.X<objCtrl.Left+objDockSize.Width-4 && objDockSize.Width<=objCtrl.Width) || pInsertionPoint.X<objCtrl.Right-4 && objDockSize.Width>objCtrl.Width))
+				{
+					if(pCtrlDockInfo.Stretch && objCtrl!=objCtrlToDock)
+					{
+						if(objCtrl is Bar && objCtrlToDock is Bar && ((Bar)objCtrl).LayoutType==eLayoutType.DockContainer && ((Bar)objCtrlToDock).LayoutType==eLayoutType.DockContainer  && ((Bar)objCtrl).CanTearOffTabs)
+						{
+							if(!objCtrl.Bounds.Contains(pInsertionPoint))
+								continue;
+							iDockLine=pCtrlDockInfo.DockLine;
+							if(((Bar)objCtrl).IsPositionOnDockTab(x,y))
+							{
+								pInfo.DockLine=pCtrlDockInfo.DockLine;
+								pInfo.DockOffset=pCtrlDockInfo.DockOffset;
+								pInfo.InsertPosition=i;
+								pInfo.objDockSite=this;
+								pInfo.DockSide=this.Dock;
+								pInfo.TabDockContainer=objCtrl as Bar;
+								return pInfo;
+							}
+						}
+						else
+						{
+							iDockLine=pCtrlDockInfo.DockLine-1;
+						}
+					}
+					else
+					{
+						iDockLine=pCtrlDockInfo.DockLine;
+					}
+					break;
+				}
+				else if(objCtrl==objCtrlToDock && pInsertionPoint.X<=objCtrl.Left+4 && pInsertionPoint.X>objCtrl.Left && lineCount[pCtrlDockInfo.DockLine]>1)
+				{
+					int iInsertPosition=i;
+					for(int iInsertIndex=i-1;iInsertIndex>=0;iInsertIndex--)
+					{
+						if(((IDockInfo)this.Controls[iInsertIndex]).DockLine==pDock.DockLine)
+							iInsertPosition=iInsertIndex;
+						else
+							break;
+					}
+					pInfo.DockLine=pDock.DockLine;
+					pInfo.DockOffset=pDock.DockOffset;
+					pInfo.InsertPosition=iInsertPosition;
+					pInfo.objDockSite=this;
+					pInfo.DockSide=this.Dock;
+					pInfo.NewLine=true;
+					return pInfo;
+				}
+				else if(this.Dock==DockStyle.Left && objCtrl==objCtrlToDock && pInsertionPoint.X>=objCtrl.Right-4 && pInsertionPoint.X<objCtrl.Right && lineCount[pCtrlDockInfo.DockLine]==1 && pDock.DockLine!=iMaxDockLine)
+				{
+					int iInsertPosition=i;
+					for(int iInsertIndex=i+1;iInsertIndex<this.Controls.Count;iInsertIndex++)
+					{
+						if(((IDockInfo)this.Controls[iInsertIndex]).DockLine==pDock.DockLine+1 && (((IDockInfo)this.Controls[iInsertIndex]).DockOffset<=pDock.DockOffset || pDock.Stretch) || ((IDockInfo)this.Controls[iInsertIndex]).DockLine==pDock.DockLine)
+							iInsertPosition=iInsertIndex;
+						else
+							break;
+					}
+					pInfo.DockLine=pDock.DockLine+1;
+					pInfo.DockOffset=pDock.DockOffset;
+					pInfo.InsertPosition=iInsertPosition;
+					pInfo.objDockSite=this;
+					pInfo.DockSide=this.Dock;
+					return pInfo;
+				}
+			}
+
+			if(iDockLine==-10)
+			{
+				if(pInsertionPoint.X<=-5 && !(bDockedHere && pDock.DockLine==0 && lineCount[0]==1))
+				{
+					iDockLine=-1;
+				}
+				else if(!bDockedHere)
+				{
+					if(pInsertionPoint.X>this.Width)
+						iDockLine=iMaxDockLine+1;
+					else
+						iDockLine=iMaxDockLine;
+				}
+				else if(pInsertionPoint.X>this.Width+4 && !(bDockedHere && pDock.DockLine==iMaxDockLine && lineCount[iMaxDockLine]==1))
+				{
+					iDockLine=iMaxDockLine+1;
+				}
+
+				if(iDockLine==-10)
+				{
+					pInfo.DockLine=pDock.DockLine;
+					pInfo.DockOffset=pDock.DockOffset;
+					pInfo.InsertPosition=this.Controls.GetChildIndex(objCtrlToDock);
+					pInfo.objDockSite=this;
+					pInfo.DockSide=this.Dock;
+					return pInfo;
+				}
+			}
+
+			if(iLockedDockLine!=-1)
+			{
+				if(this.Dock==DockStyle.Top && iDockLine<=iLockedDockLine)
+					iDockLine=iLockedDockLine+1;
+				else if(this.Dock==DockStyle.Bottom && iDockLine>=iLockedDockLine)
+					iDockLine=iLockedDockLine-1;
+			}
+
+			// We have the docking line now, find right Docking offset for object to dock
+
+			// First get the index of the docking line, default is at the end
+			int iIndex=this.Controls.Count;
+			for(int i=0;i<this.Controls.Count;i++)
+			{
+				Control objCtrl=this.Controls[i];
+				if(!objCtrl.Visible)
+					continue;
+				IDockInfo pCtrlDockInfo=objCtrl as IDockInfo;
+				if(pCtrlDockInfo.DockLine>=iDockLine)
+				{
+					iIndex=i;
+					break;
+				}
+			}
+
+			// Find the right insertion point based on X coordinate
+			for(int i=iIndex;i<this.Controls.Count;i++)
+			{
+				Control objCtrl=this.Controls[i];
+				if(!objCtrl.Visible)
+					continue;
+				IDockInfo pCtrlDockInfo=objCtrl as IDockInfo;
+				if(pCtrlDockInfo.DockLine>iDockLine)
+				{
+					pInfo.InsertPosition=i;
+					if(bDockedHere && i>0 && this.Controls.GetChildIndex(objCtrlToDock)<i)
+						pInfo.InsertPosition=i-1;
+					if(pInsertionPoint.Y+objDockSize.Height>this.Height)
+						pInfo.DockOffset=this.Height-objDockSize.Height;
+					else
+						pInfo.DockOffset=pInsertionPoint.Y;
+					pInfo.DockLine=iDockLine;
+					pInfo.DockSide=this.Dock;
+					pInfo.objDockSite=this;
+					bDocked=true;
+					break;
+				}
+				if(objCtrl.Bounds.Contains(pInsertionPoint))
+				{
+					if(objCtrl!=objCtrlToDock)
+					{
+						if(pInsertionPoint.Y>=objCtrl.Top && pInsertionPoint.Y<=objCtrl.Top+10)
+						{
+							// This is right position, insert before docked control
+							pInfo.InsertPosition=i;
+							if(bDockedHere && i>0 && this.Controls.GetChildIndex(objCtrlToDock)<i)
+								pInfo.InsertPosition=i-1;
+							pInfo.DockOffset=0;
+							pInfo.DockLine=iDockLine;
+							pInfo.DockSide=this.Dock;
+							pInfo.objDockSite=this;
+						}
+						else
+						{
+							// Insert after docked control
+							int iTmp=getDockLineHeight(i,iDockLine,false);
+							if(iTmp+objDockSize.Height>=this.Height || pInsertionPoint.Y<iTmp)
+								pInfo.DockOffset=objCtrl.Bottom;
+							else
+								pInfo.DockOffset=pInsertionPoint.Y;
+							
+							pInfo.InsertPosition=i+1;
+
+							if(pDock.Stretch)
+							{
+								//if(iDockLine<iMaxDockLine)
+								//	iDockLine++;
+								pInfo.DockOffset=pDock.DockOffset;
+							}
+							if(bDockedHere && i>0 && this.Controls.GetChildIndex(objCtrlToDock)<i)
+								pInfo.InsertPosition=i;
+
+							pInfo.DockLine=iDockLine;
+							pInfo.DockSide=this.Dock;
+							pInfo.objDockSite=this;
+						}
+					}
+					else
+					{
+						// This just tries to move control to the right, insertion point is over the object that needs to be docked
+						pInfo.InsertPosition=i;
+						pInfo.DockLine=iDockLine;
+						pInfo.DockSide=this.Dock;
+						pInfo.objDockSite=this;
+
+						int iTmp=getDockLineHeight(i+1,pDock.DockLine,true);
+						
+						if(iTmp+objDockSize.Height+pInsertionPoint.Y>=this.Height)
+							pInfo.DockOffset=this.Height-iTmp-objDockSize.Height;
+						else
+							pInfo.DockOffset=pInsertionPoint.Y;
+
+						if(pInfo.DockOffset<0)
+							pInfo.DockOffset=0;
+					}
+					bDocked=true;
+					break;
+				}
+				else if(pInsertionPoint.Y<objCtrl.Top || pInsertionPoint.X<objCtrl.Left && iLockedDockLine<0)
+				{
+					// Dock it before this control, insertion point is in empty space before docked control
+					pInfo.InsertPosition=i;
+					if(bDockedHere && i>0 && this.Controls.GetChildIndex(objCtrlToDock)<i)
+						pInfo.InsertPosition=i-1;
+					if(pDock.Stretch)
+						pInfo.DockOffset=pDock.DockOffset;
+					else
+						pInfo.DockOffset=pInsertionPoint.Y;
+					pInfo.DockLine=iDockLine;
+					pInfo.DockSide=this.Dock;
+					pInfo.objDockSite=this;
+					bDocked=true;
+					break;
+				}
+			}
+
+			if(!bDocked)
+			{
+				// Add it to the end
+				if(iDockLine>=0)
+				{
+					if(bDockedHere)
+						pInfo.InsertPosition=this.Controls.Count-1;
+					else
+						pInfo.InsertPosition=this.Controls.Count;
+
+				}
+				else
+					pInfo.InsertPosition=0;
+
+				if(pInsertionPoint.Y+objDockSize.Height>this.Height)
+					pInfo.DockOffset=this.Height-objDockSize.Height;
+				else
+					pInfo.DockOffset=pInsertionPoint.Y;
+				if(iDockLine>=0)
+				{
+					pInfo.DockLine=iDockLine;
+				}
+				else
+					pInfo.DockLine=-1;
+
+				pInfo.DockSide=this.Dock;
+				pInfo.objDockSite=this;
+			}
+
+			// Snap it to the left
+			if(pInfo.DockOffset<10)
+				pInfo.DockOffset=0;
+
+			if(m_DockOrientation==eOrientation.Horizontal)
+			{
+				if(objDockSize.Width>this.Width)
+					pInfo.DockedWidth=this.Width;
+				else
+					pInfo.DockedWidth=objDockSize.Width;
+
+				pInfo.DockedHeight=objDockSize.Height;
+			}
+			else
+			{
+				if(objDockSize.Height>this.Height)
+					pInfo.DockedHeight=this.Height;
+				else
+					pInfo.DockedHeight=objDockSize.Height;
+
+				pInfo.DockedWidth=objDockSize.Width;
+			}
+
+			return pInfo;
+		}
+
+		/// <summary>
+		/// Estimates the docking position and size of a given bar for outline purposes during drag&drop
+		/// </summary>
+		/// <param name="bar">Bar to find estimated docking position and size for</param>
+		/// <param name="pDockInfo">Docking information</param>
+		/// <returns>Rectangle screen coordinates.</returns>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+        public Rectangle GetBarDockRectangle(Bar bar, ref DockSiteInfo pDockInfo)
+		{
+			if(pDockInfo.objDockSite==null)
+				return Rectangle.Empty;
+
+			if(pDockInfo.objDockSite.Dock==DockStyle.Fill || m_DocumentDockContainer!=null)
+			{
+				DocumentDockUIManager m_UIManager=GetDocumentUIManager();
+				return m_UIManager.GetDockPreviewRectangle(bar,ref pDockInfo);
+			}
+			
+			Rectangle r=Rectangle.Empty;
+
+			if(pDockInfo.InsertPosition<0 && pDockInfo.NewLine)
+				pDockInfo.DockLine=-1;
+			else if(pDockInfo.InsertPosition>=this.Controls.Count && pDockInfo.NewLine)
+                pDockInfo.DockLine=999;
+
+			if(pDockInfo.TabDockContainer!=null)
+			{
+				r=pDockInfo.TabDockContainer.Bounds;
+				r.Location=this.PointToScreen(r.Location);
+			}
+			else if(pDockInfo.DockLine==999 || pDockInfo.DockLine==-1) // Handle the edge cases
+			{
+				int fullSizeIndex=-1;
+				int partialSizeIndex=-1;
+				if(pDockInfo.FullSizeDock)
+					fullSizeIndex=this.GetFullSizeIndex();
+				else if(pDockInfo.PartialSizeDock)
+					partialSizeIndex=this.GetPartialSizeIndex();
+
+				// Docks the bar to the edge
+				switch(this.Dock)
+				{
+					case DockStyle.Top:
+					{
+						r.Width=this.ClientRectangle.Width;
+						r.Height=bar.GetBarDockedSize(eOrientation.Horizontal);
+
+						if(fullSizeIndex>=0)
+						{
+							r.Width+=GetSiteZOrderSize(m_Owner.LeftDockSite,true).Width;
+							r.Width+=GetSiteZOrderSize(m_Owner.RightDockSite,true).Width;
+							pDockInfo.DockSiteZOrderIndex=fullSizeIndex;
+						}
+						else if(partialSizeIndex>=0)
+						{
+							// Reduce by the size of the left and right dock site
+							r.Width-=GetSiteZOrderSize(m_Owner.LeftDockSite,false).Width;
+							r.Width-=GetSiteZOrderSize(m_Owner.RightDockSite,false).Width;
+							pDockInfo.DockSiteZOrderIndex=partialSizeIndex;
+							
+						}
+
+						Point p=Point.Empty;
+						if(pDockInfo.DockLine==-1)
+						{
+							p=this.PointToScreen(this.ClientRectangle.Location);
+						}
+						else
+						{
+							p=this.PointToScreen(new Point(this.ClientRectangle.X,this.ClientRectangle.Bottom));
+							p.Y++;
+						}
+						if(fullSizeIndex>=0)
+							p.X-=GetSiteZOrderSize(m_Owner.LeftDockSite,true).Width;
+						else if(partialSizeIndex>=0)
+							p.X+=GetSiteZOrderSize(m_Owner.LeftDockSite,false).Width;
+						r.Location=p;
+						break;
+					}
+					case DockStyle.Bottom:
+					{
+						r.Width=this.ClientRectangle.Width;
+						r.Height=bar.GetBarDockedSize(eOrientation.Horizontal);
+						if(fullSizeIndex>=0)
+						{
+							r.Width+=GetSiteZOrderSize(m_Owner.LeftDockSite,true).Width;
+							r.Width+=GetSiteZOrderSize(m_Owner.RightDockSite,true).Width;
+							pDockInfo.DockSiteZOrderIndex=fullSizeIndex;
+						}
+						else if(partialSizeIndex>=0)
+						{
+							// Reduce by the size of the left and right dock site
+							r.Width-=GetSiteZOrderSize(m_Owner.LeftDockSite,false).Width;
+							r.Width-=GetSiteZOrderSize(m_Owner.RightDockSite,false).Width;
+							pDockInfo.DockSiteZOrderIndex=partialSizeIndex;
+							
+						}
+
+						Point p=Point.Empty;
+						if(pDockInfo.DockLine==-1)
+						{
+							p=this.PointToScreen(new Point(this.ClientRectangle.X,this.ClientRectangle.Y-r.Height));
+						}
+						else
+						{
+							p=this.PointToScreen(new Point(this.ClientRectangle.X,this.ClientRectangle.Bottom-r.Height));
+							p.Y++;
+						}
+						if(fullSizeIndex>=0)
+							p.X-=GetSiteZOrderSize(m_Owner.LeftDockSite,true).Width;
+						else if(partialSizeIndex>=0)
+							p.X+=GetSiteZOrderSize(m_Owner.LeftDockSite,false).Width;
+						r.Location=p;
+						break;
+					}
+					case DockStyle.Right:
+					{
+						r.Height=this.ClientRectangle.Height;
+
+						if(fullSizeIndex>=0)
+						{
+							r.Height+=GetSiteZOrderSize(m_Owner.TopDockSite,true).Height;
+							r.Height+=GetSiteZOrderSize(m_Owner.BottomDockSite,true).Height;
+							pDockInfo.DockSiteZOrderIndex=fullSizeIndex;
+						}
+						else if(partialSizeIndex>=0)
+						{
+							// Reduce by the size of the top and bottom dock site
+							r.Height-=GetSiteZOrderSize(m_Owner.TopDockSite,false).Height;
+							r.Height-=GetSiteZOrderSize(m_Owner.BottomDockSite,false).Height;
+							pDockInfo.DockSiteZOrderIndex=partialSizeIndex;
+							
+						}
+
+						r.Width=bar.GetBarDockedSize(eOrientation.Vertical);
+						Point p=Point.Empty;
+                        if (pDockInfo.DockLine == -1)
+						{
+							p=this.PointToScreen(new Point(this.ClientRectangle.X-r.Width,this.ClientRectangle.Y));
+						}
+						else
+						{
+							p=this.PointToScreen(new Point(this.ClientRectangle.Right-r.Width,this.ClientRectangle.Y));
+							p.X--;	
+						}
+						if(fullSizeIndex>=0)
+							p.Y-=GetSiteZOrderSize(m_Owner.TopDockSite,true).Height;
+						else if(partialSizeIndex>=0)
+							p.Y+=GetSiteZOrderSize(m_Owner.TopDockSite,false).Height;
+						r.Location=p;
+						break;
+					}
+					default:
+					{
+						r.Height=this.ClientRectangle.Height;
+						if(fullSizeIndex>=0)
+						{
+							r.Height+=GetSiteZOrderSize(m_Owner.TopDockSite,true).Height;
+							r.Height+=GetSiteZOrderSize(m_Owner.BottomDockSite,true).Height;
+							pDockInfo.DockSiteZOrderIndex=fullSizeIndex;
+						}
+						else if(partialSizeIndex>=0)
+						{
+							// Reduce by the size of the top and bottom dock site
+							r.Height-=GetSiteZOrderSize(m_Owner.TopDockSite,false).Height;
+							r.Height-=GetSiteZOrderSize(m_Owner.BottomDockSite,false).Height;
+							pDockInfo.DockSiteZOrderIndex=partialSizeIndex;
+							
+						}
+						r.Width=bar.GetBarDockedSize(eOrientation.Vertical);
+						
+						Point p=Point.Empty;
+						if(pDockInfo.DockLine==-1)
+						{
+							p=this.PointToScreen(new Point(this.ClientRectangle.X,this.ClientRectangle.Y));
+						}
+						else
+						{
+							p=this.PointToScreen(new Point(this.ClientRectangle.Right,this.ClientRectangle.Y));
+							p.X++;
+						}
+						if(fullSizeIndex>=0)
+							p.Y-=GetSiteZOrderSize(m_Owner.TopDockSite,true).Height;
+						else if(partialSizeIndex>=0)
+							p.Y+=GetSiteZOrderSize(m_Owner.TopDockSite,false).Height;
+						r.Location=p;
+						break;
+					}
+				}
+			}
+			else
+			{
+				Bar barInsertPos=null;
+				if(pDockInfo.InsertPosition>=0 && pDockInfo.InsertPosition<this.Controls.Count)
+				{
+					barInsertPos=this.Controls[pDockInfo.InsertPosition] as Bar;
+					if(!pDockInfo.NewLine)
+					{
+						// Docking on the same line the DockLine should match
+						if(barInsertPos.DockLine>pDockInfo.DockLine)
+						{
+							int ipos=pDockInfo.InsertPosition-1;
+							while(ipos>=0)
+							{
+								Bar b=this.Controls[ipos] as Bar;
+								if(b!=null && b.LayoutType==eLayoutType.DockContainer && b.DockLine==pDockInfo.DockLine)
+								{
+									barInsertPos=b;
+									break;
+								}
+							}
+						}
+						else if(barInsertPos.DockLine<pDockInfo.DockLine)
+						{
+							int ipos=pDockInfo.InsertPosition+1;
+							while(ipos<this.Controls.Count)
+							{
+								Bar b=this.Controls[ipos] as Bar;
+								if(b!=null && b.LayoutType==eLayoutType.DockContainer && b.DockLine==pDockInfo.DockLine)
+								{
+									barInsertPos=b;
+									break;
+								}
+							}
+						}
+					}
+				}
+				else if(pDockInfo.InsertPosition<0)
+					barInsertPos=this.Controls[0] as Bar;
+				else if(pDockInfo.InsertPosition>=this.Controls.Count)
+					barInsertPos=this.Controls[this.Controls.Count-1] as Bar;
+
+				int i=pDockInfo.InsertPosition+1;
+				while(i<this.Controls.Count && (bar==null || barInsertPos.LayoutType!=eLayoutType.DockContainer || !barInsertPos.Visible))
+				{
+					barInsertPos=this.Controls[i] as Bar;
+					i++;
+				}
+
+				if(barInsertPos==null)
+					return r;
+
+				// Docks the bar to the edge
+				switch(this.Dock)
+				{
+					case DockStyle.Top:
+					case DockStyle.Bottom:
+					{
+						r.Height=bar.GetBarDockedSize(eOrientation.Horizontal);
+						if(pDockInfo.NewLine || barInsertPos==bar)
+						{
+							r.Width=barInsertPos.Width;
+							if(r.Width==0)
+								r.Width=this.Width;
+							Point p=this.PointToScreen(new Point(barInsertPos.Left,barInsertPos.Top));
+							r.Location=p;
+						}
+						else
+						{
+							if(barInsertPos.DockOffset>pDockInfo.DockOffset)
+							{
+								// Left half
+								r.Height=barInsertPos.Height;
+								r.Width=barInsertPos.Width/2;
+								Point p=this.PointToScreen(new Point(barInsertPos.Left,barInsertPos.Top));
+								r.Location=p;
+							}
+							else
+							{
+								// Split Right Half
+								r.Height=barInsertPos.Height;
+								r.Width=barInsertPos.Width/2;
+								Point p=this.PointToScreen(new Point(barInsertPos.Left+r.Width,barInsertPos.Top));
+								r.Location=p;
+							}
+						}
+						break;
+					}
+					default: // Covers both Right and Left
+					{
+						r.Width=bar.GetBarDockedSize(eOrientation.Vertical);
+						if(pDockInfo.NewLine || barInsertPos==bar)
+						{
+							r.Height=barInsertPos.Height;
+							Point p=this.PointToScreen(new Point(barInsertPos.Left,barInsertPos.Top));
+							r.Location=p;
+						}
+						else
+						{
+							if(barInsertPos.DockOffset<pDockInfo.DockOffset)
+							{
+								// Bottom half
+								r.Width=barInsertPos.Width;
+								r.Height=barInsertPos.Height/2;
+								Point p=this.PointToScreen(new Point(barInsertPos.Left,barInsertPos.Top+r.Height));
+								r.Location=p;
+							}
+							else
+							{
+								// Split Top Half
+								r.Width=barInsertPos.Width;
+								r.Height=barInsertPos.Height/2;
+								Point p=this.PointToScreen(new Point(barInsertPos.Left,barInsertPos.Top));
+								r.Location=p;
+							}
+						}
+						break;
+					}
+				}
+			}
+
+			return r;
+		}
+
+		internal System.Drawing.Size GetSiteZOrderSize(DockSite dockSite, bool bFullSize)
+		{
+			if(dockSite==null || dockSite.Parent==null)
+				return Size.Empty;
+            
+			System.Drawing.Size size=Size.Empty;
+
+			if(bFullSize)
+			{
+				if(dockSite.Parent.Controls.IndexOf(dockSite)>this.Parent.Controls.IndexOf(this))
+					size=dockSite.Size;
+			}
+			else
+			{
+				if(this.Parent.Controls.IndexOf(this)>dockSite.Parent.Controls.IndexOf(dockSite))
+					size=dockSite.Size;
+			}
+			return size;
+		}
+
+		internal int GetPartialSizeIndex()
+		{
+			if(this.Parent==null)
+				return -1;
+			int index=1;
+			if(this.Dock==DockStyle.Left || this.Dock==DockStyle.Right)
+			{
+				if(m_Owner==null || m_Owner.TopDockSite==null || m_Owner.BottomDockSite==null || m_Owner.TopDockSite.Parent==null || m_Owner.BottomDockSite.Parent==null)
+					return -1;
+
+				index=Math.Min(m_Owner.TopDockSite.Parent.Controls.IndexOf(m_Owner.TopDockSite),m_Owner.BottomDockSite.Parent.Controls.IndexOf(m_Owner.BottomDockSite));
+			}
+			else
+			{
+				if(m_Owner==null || m_Owner.LeftDockSite==null || m_Owner.RightDockSite==null || m_Owner.LeftDockSite.Parent==null || m_Owner.RightDockSite.Parent==null)
+					return -1;
+
+				index=Math.Min(m_Owner.LeftDockSite.Parent.Controls.IndexOf(m_Owner.LeftDockSite),m_Owner.RightDockSite.Parent.Controls.IndexOf(m_Owner.RightDockSite));
+			}
+
+			if(this.Parent.Controls.IndexOf(this)<index)
+				return -1;
+			return index;
+		}
+
+		internal int GetFullSizeIndex()
+		{
+			if(this.Parent==null)
+				return -1;
+			int index=-1;
+			if(this.Dock==DockStyle.Left || this.Dock==DockStyle.Right)
+			{
+				if(m_Owner==null || m_Owner.TopDockSite==null || m_Owner.BottomDockSite==null || m_Owner.TopDockSite.Parent==null || m_Owner.BottomDockSite.Parent==null)
+					return -1;
+
+				index=Math.Max(m_Owner.TopDockSite.Parent.Controls.IndexOf(m_Owner.TopDockSite),m_Owner.BottomDockSite.Parent.Controls.IndexOf(m_Owner.BottomDockSite));
+			}
+			else
+			{
+				if(m_Owner==null || m_Owner.LeftDockSite==null || m_Owner.RightDockSite==null || m_Owner.LeftDockSite.Parent==null || m_Owner.RightDockSite.Parent==null)
+					return -1;
+
+				index=Math.Max(m_Owner.LeftDockSite.Parent.Controls.IndexOf(m_Owner.LeftDockSite),m_Owner.RightDockSite.Parent.Controls.IndexOf(m_Owner.RightDockSite));
+			}
+			if(this.Parent.Controls.IndexOf(this)>index)
+				return -1;
+			return index;
+		}
+
+		internal eOrientation DockOrientation
+		{
+			get{return m_DockOrientation;}
+		}
+
+		/// <summary>
+		/// Undocks the control from the site.
+		/// </summary>
+		/// <param name="objBar">Control to undock.</param>
+		internal void RemoveBar(Control objBar)
+		{
+			if(!this.Contains(objBar))
+				return;
+			this.Controls.Remove(objBar);
+			LayoutBars();
+		}
+
+		internal bool IsDocumentDock
+		{
+			get
+			{
+				return (this.Dock==DockStyle.Fill || m_DocumentDockContainer!=null);
+			}
+		}
+		protected override void OnMouseMove(MouseEventArgs e)
+		{
+			base.OnMouseMove(e);
+            //if(!IsDocumentDock)
+            //    return;
+			if(m_DocumentDockContainer!=null)
+				m_DocumentUIManager.OnMouseMove(e);
+		}
+		protected override void OnMouseLeave(EventArgs e)
+		{
+			base.OnMouseLeave(e);
+            //if(!IsDocumentDock)
+            //    return;
+			if(m_DocumentDockContainer!=null)
+				m_DocumentUIManager.OnMouseLeave();
+		}
+
+		protected override void OnMouseDown(MouseEventArgs e)
+		{
+			base.OnMouseDown(e);
+			if(e.Button==MouseButtons.Right && m_DocumentDockContainer == null)
+			{
+				IOwnerBarSupport ownersupport=m_Owner as IOwnerBarSupport;
+				if(ownersupport!=null)
+					ownersupport.BarContextMenu(this,e);
+			}
+
+            //if(!IsDocumentDock)
+            //    return;
+			if(m_DocumentDockContainer!=null)
+				m_DocumentUIManager.OnMouseDown(e);
+		}
+
+		protected override void OnMouseUp(MouseEventArgs e)
+		{
+			base.OnMouseUp(e);
+
+            //if(!IsDocumentDock)
+            //    return;
+			if(m_DocumentDockContainer!=null)
+				m_DocumentUIManager.OnMouseUp(e);
+		}
+
+		private void UpdateBarsCollection()
+		{
+			if(m_Owner==null)
+				return;
+			foreach(Control c in this.Controls)
+			{
+				if(c is Bar)
+				{
+					Bar bar=c as Bar;
+					if(!m_Owner.Bars.Contains(bar))
+						m_Owner.Bars.Add(bar);
+				}
+			}
+		}
+
+		protected override void OnDockChanged(EventArgs e)
+		{
+			base.OnDockChanged(e);
+			if(this.IsDocumentDock)
+				UpdateBarsCollection();
+		}
+
+		internal void SetOwner(DotNetBarManager owner)
+		{
+			m_Owner=owner;
+			
+            UpdateBarsCollection();
+		}
+
+		/// <summary>
+		/// Gets the reference to the DotNetBarManager that uses this dock site.
+		/// </summary>
+		[Browsable(false),DevCoBrowsable(false)]
+		public DotNetBarManager Owner
+		{
+			get {return m_Owner;}
+		}
+
+		internal bool HasFixedBars
+		{
+			get
+			{
+				foreach(Control ctrl in this.Controls)
+				{
+					Bar bar=ctrl as Bar;
+					if(bar!=null && bar.LockDockPosition)
+					{
+						return true;
+					}
+				}
+				return false;
+			}
+		}
+
+        #region DockSiteAccessibleObject
+        public class DockSiteAccessibleObject : System.Windows.Forms.Control.ControlAccessibleObject
+        {
+            DockSite m_Owner = null;
+            public DockSiteAccessibleObject(DockSite owner)
+                : base(owner)
+            {
+                m_Owner = owner;
+            }
+
+            //public override string Name
+            //{
+            //    get
+            //    {
+            //        if (m_Owner != null && !m_Owner.IsDisposed)
+            //            return m_Owner.AccessibleName;
+            //        return "";
+            //    }
+            //    set
+            //    {
+            //        if (m_Owner != null && !m_Owner.IsDisposed)
+            //            m_Owner.AccessibleName = value;
+            //    }
+            //}
+
+            //public override string Description
+            //{
+            //    get
+            //    {
+            //        if (m_Owner != null && !m_Owner.IsDisposed)
+            //            return m_Owner.AccessibleDescription;
+            //        return "";
+            //    }
+            //}
+
+            public override AccessibleRole Role
+            {
+                get
+                {
+                    if (m_Owner != null && !m_Owner.IsDisposed)
+                        return m_Owner.AccessibleRole;
+                    return System.Windows.Forms.AccessibleRole.None;
+                }
+            }
+
+            public override Rectangle Bounds
+            {
+                get
+                {
+                    if (m_Owner != null && !m_Owner.IsDisposed && m_Owner.Parent != null)
+                        return this.m_Owner.Parent.RectangleToScreen(m_Owner.Bounds);
+                    return Rectangle.Empty;
+                }
+            }
+
+            public override int GetChildCount()
+            {
+                if (m_Owner != null && !m_Owner.IsDisposed)
+                    return m_Owner.Controls.Count;
+                return 0;
+            }
+
+            public override System.Windows.Forms.AccessibleObject GetChild(int iIndex)
+            {
+                if (m_Owner != null && !m_Owner.IsDisposed && m_Owner.Controls.Count > 0 && m_Owner.Controls.Count > iIndex)
+                    return m_Owner.Controls[iIndex].AccessibilityObject;
+                return null;
+            }
+
+            public override AccessibleStates State
+            {
+                get
+                {
+                    AccessibleStates state;
+                    if (m_Owner == null || m_Owner.IsDisposed)
+                        return AccessibleStates.None;
+
+                       state = AccessibleStates.None;
+                    return state;
+                }
+            }
+        }
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DockSiteDesigner.cs b/PROMS/DotNetBar Source Code/DockSiteDesigner.cs
new file mode 100644
index 00000000..af6d7f3d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DockSiteDesigner.cs	
@@ -0,0 +1,166 @@
+using System;
+using System.ComponentModel;
+using System.ComponentModel.Design;
+using System.Windows.Forms.Design;
+using System.Windows.Forms;
+using System.Drawing;
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Summary description for DockSiteDesigner.
+	/// </summary>
+	public class DockSiteDesigner:ParentControlDesigner
+	{
+		private bool m_MouseDrag=false;
+
+		public override SelectionRules SelectionRules
+		{
+			get{return SelectionRules.None;}
+		}
+		protected override void OnContextMenu(int x,int y)
+		{
+		}
+
+		public override void Initialize(IComponent component) 
+		{
+			base.Initialize(component);
+			if(!component.Site.DesignMode)
+				return;
+			// If our component is removed we need to clean-up
+			IComponentChangeService cc=(IComponentChangeService)GetService(typeof(IComponentChangeService));
+			if(cc!=null)
+			{
+				cc.ComponentRemoving+=new ComponentEventHandler(this.OnComponentRemoving);
+			}
+		}
+
+		protected override void Dispose(bool disposing)
+		{
+			// Unhook events
+			IComponentChangeService cc=(IComponentChangeService)GetService(typeof(IComponentChangeService));
+			if(cc!=null)
+			{
+				cc.ComponentRemoving-=new ComponentEventHandler(this.OnComponentRemoving);
+			}
+
+			base.Dispose(disposing);
+		}
+
+		private void OnComponentRemoving(object sender,ComponentEventArgs e)
+		{
+			
+			if(e.Component!=this.Component)
+			{
+				return;
+			}
+			// Unhook events
+			IComponentChangeService cc=(IComponentChangeService)GetService(typeof(IComponentChangeService));
+			if(cc!=null)
+				cc.ComponentRemoving-=new ComponentEventHandler(this.OnComponentRemoving);
+			DockSite c=this.Control as DockSite;
+			if(c==null)
+				return;
+			if(c.Owner!=null)
+			{
+				if(c.Owner.FillDockSite==c)
+					c.Owner.FillDockSite=null;
+				else if(c.Owner.LeftDockSite==c)
+					c.Owner.LeftDockSite=null;
+				else if(c.Owner.RightDockSite==c)
+					c.Owner.RightDockSite=null;
+				else if(c.Owner.TopDockSite==c)
+					c.Owner.TopDockSite=null;
+				else if(c.Owner.BottomDockSite==c)
+					c.Owner.BottomDockSite=null;
+			}
+		}
+
+		protected override void OnSetCursor()
+		{
+			//base.OnSetCursor();
+			if(this.Control.Dock!=DockStyle.Fill)
+				return;
+			Point p=Control.MousePosition;
+			DockSite site=this.Control as DockSite;
+			if(site==null || site.Controls.Count==0) return;
+
+			DocumentDockUIManager m=site.GetDocumentUIManager();
+			Point pClient=site.PointToClient(p);
+			Cursor c=m.GetCursor(pClient.X,pClient.Y);
+			if(c!=null)
+				Cursor.Current=c;
+			else
+				Cursor.Current=Cursors.Default;
+		}
+
+		protected override void OnMouseDragBegin(int x, int y)
+		{
+			DockSite site=this.Control as DockSite;
+			if(this.Control.Dock==DockStyle.Fill && site!=null)
+			{
+				DocumentDockUIManager m=site.GetDocumentUIManager();
+				Point pClient=site.PointToClient(new Point(x,y));
+				Cursor c=m.GetCursor(pClient.X,pClient.Y);
+				if(c!=null)
+				{
+					m.OnMouseDown(new MouseEventArgs(MouseButtons.Left,0,pClient.X,pClient.Y,0));
+					m_MouseDrag=true;
+				}
+			}
+
+			base.OnMouseDragBegin(x,y);
+
+			if(m_MouseDrag)
+			{
+				site.Capture = true;
+				NativeFunctions.RECT rect = new NativeFunctions.RECT(0,0,0,0);
+				NativeFunctions.GetWindowRect(site.Handle, ref rect);
+				Rectangle r=Rectangle.FromLTRB(rect.Left, rect.Top, rect.Right, rect.Bottom);
+				Cursor.Clip=r;
+			}
+		}
+
+		protected override void OnMouseDragMove(int x, int y)
+		{
+			DockSite site=this.Control as DockSite;
+			if(m_MouseDrag && site!=null)
+			{
+				DocumentDockUIManager m=site.GetDocumentUIManager();
+				Point pClient=site.PointToClient(new Point(x,y));
+				m.OnMouseMove(new MouseEventArgs(MouseButtons.Left,0,pClient.X,pClient.Y,0));
+			}
+			else
+				base.OnMouseDragMove(x,y);
+		}
+
+		protected override void OnMouseDragEnd(bool cancel)
+		{
+			if(m_MouseDrag)
+			{
+				this.Control.Capture = false;
+				Cursor.Clip = Rectangle.Empty;
+			}
+			DockSite site=this.Control as DockSite;
+			if(m_MouseDrag && site!=null)
+			{
+				DocumentDockUIManager m=site.GetDocumentUIManager();
+				Point pClient=site.PointToClient(Control.MousePosition);
+				
+				IComponentChangeService cc=(IComponentChangeService)GetService(typeof(IComponentChangeService));
+				if(cc!=null)
+				{
+					cc.OnComponentChanging(site,TypeDescriptor.GetProperties(typeof(DockSite))["DocumentDockContainer"]);
+				}
+
+				m.OnMouseUp(new MouseEventArgs(MouseButtons.Left,0,pClient.X,pClient.Y,0));
+
+				if(cc!=null)
+				{
+					cc.OnComponentChanged(site,TypeDescriptor.GetProperties(typeof(DockSite))["DocumentDockContainer"],null,null);
+				}
+			}
+			m_MouseDrag=false;
+			base.OnMouseDragEnd(cancel);
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/DockSiteDocumentLayout.cs b/PROMS/DotNetBar Source Code/DockSiteDocumentLayout.cs
new file mode 100644
index 00000000..4d3b607a
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DockSiteDocumentLayout.cs	
@@ -0,0 +1,103 @@
+using System;
+using System.Drawing;
+using System.Collections;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Provides fill layout for the dock site.
+	/// </summary>
+	public class DockSiteDocumentLayout
+	{
+		private int m_BarSpacing=2;
+		private eOrientation m_Orientation=eOrientation.Horizontal;
+
+		public DockSiteDocumentLayout()
+		{
+		}
+
+		public void Layout(DockSite site)
+		{
+			if(m_Orientation==eOrientation.Horizontal)
+				LayoutHorizontal(site);
+			//else
+			//	LayoutVertical(site);
+		}
+
+		private void LayoutHorizontal(DockSite site)
+		{
+			int height=site.ClientRectangle.Height;
+			Rectangle containerRectangle=site.ClientRectangle;
+			int totalWidth=0, specifiedWidth=0;
+			int variableCount=0;
+			ArrayList visibleBars=new ArrayList();
+
+			// Calculate fixed/specified and variable width
+			for(int i=0;i<site.Controls.Count;i++)
+			{
+				Bar bar=site.Controls[i] as Bar;
+				bar.SetDockLine(0);
+				if(bar==null || !bar.Visible)
+					continue;
+				if(bar.SplitDockWidth>0)
+				{
+					totalWidth+=bar.SplitDockWidth;
+					specifiedWidth+=bar.SplitDockWidth;
+				}
+				else
+				{
+					totalWidth+=bar.MinimumSize(m_Orientation).Width;
+					variableCount++;
+				}
+
+				if(i+1<site.Controls.Count)
+					totalWidth+=m_BarSpacing;
+				visibleBars.Add(bar);
+			}
+			if(specifiedWidth>0 && visibleBars.Count-variableCount-1>0)
+				specifiedWidth+=(visibleBars.Count-variableCount-1)*m_BarSpacing;
+
+			int x=containerRectangle.X, y=containerRectangle.Y;
+
+			int variableWidth=0;
+			int totalVariableWidth=(containerRectangle.Width-specifiedWidth-m_BarSpacing*(variableCount-1));
+			if(variableCount>0)
+				variableWidth=totalVariableWidth/variableCount;
+
+
+			int availableWidth=containerRectangle.Width;
+			int count=visibleBars.Count;
+			for(int i=0;i<count;i++)
+			{
+				Bar bar=visibleBars[i] as Bar;
+				bar.Location=new Point(x,y);
+				
+				if(i+1==count)
+					variableWidth=availableWidth;
+
+				if(bar.SplitDockWidth>0)
+				{
+					if(i+1==count)
+						bar.RecalcSize(new Size(availableWidth,containerRectangle.Height));
+					else
+						bar.RecalcSize(new Size(bar.SplitDockWidth,containerRectangle.Height));
+				}
+				else
+				{
+					bar.SplitDockWidth=variableWidth;
+					bar.RecalcSize(new Size(variableWidth,containerRectangle.Height));
+					totalVariableWidth-=variableWidth;
+				}
+				x+=(m_BarSpacing+bar.Width);
+				availableWidth-=(m_BarSpacing+bar.Width);
+			}
+		}
+
+		public eOrientation Orientation
+		{
+			get {return m_Orientation;}
+			set {m_Orientation=value;}
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/DockingHint.cs b/PROMS/DotNetBar Source Code/DockingHint.cs
new file mode 100644
index 00000000..e0f6f35f
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DockingHint.cs	
@@ -0,0 +1,877 @@
+using System;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Collections;
+using System.ComponentModel;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar
+{
+    #region Enums
+    [System.Flags()]
+    internal enum eDockingHintSide
+    {
+        Left = 1,
+        Right = 2,
+        Top = 4,
+        Bottom = 8,
+        DockTab = 16,
+        All = (Left | Right | Top | Bottom | DockTab),
+        Sides = (Left | Right | Top | Bottom)
+    }
+
+    internal enum eMouseOverHintSide
+    {
+        None,
+        Left,
+        Right,
+        Top,
+        Bottom,
+        DockTab,
+    }
+    #endregion
+
+    /// <summary>
+    /// Summary description for DockingHint.
+    /// </summary>
+    [ToolboxItem(false)]
+    internal class DockingHint : System.Windows.Forms.Form
+    {
+        #region Private Variables
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.Container components = null;
+        private eDockingHintSide m_DockingHintSide = eDockingHintSide.All;
+
+        private eMouseOverHintSide m_MouseOverHintSide = eMouseOverHintSide.None;
+        private bool m_PendingRefresh = false;
+
+        private GraphicsPath m_LeftHint = null;
+        private GraphicsPath m_RightHint = null;
+        private GraphicsPath m_BottomHint = null;
+        private GraphicsPath m_TopHint = null;
+        private GraphicsPath m_DockTabHint = null;
+        private bool m_MiddleDockHint = false;
+        #endregion
+
+        #region Static Members
+        // Static Images
+        private static Bitmap s_ImageGuideTop = null;
+        private static Bitmap s_ImageGuideBottom = null;
+        private static Bitmap s_ImageGuideLeft = null;
+        private static Bitmap s_ImageGuideRight = null;
+        private static Bitmap s_ImageGuideTab = null;
+        private static Bitmap s_ImageGuideAllSides = null;
+
+        private static Bitmap s_ImageGuideTop2010 = null;
+        private static Bitmap s_ImageGuideBottom2010 = null;
+        private static Bitmap s_ImageGuideLeft2010 = null;
+        private static Bitmap s_ImageGuideRight2010 = null;
+        private static Bitmap s_ImageGuideTab2010 = null;
+        private static Bitmap s_ImageGuideTabTopBottom2010 = null;
+        private static Bitmap s_ImageGuideTabLeftRight2010 = null;
+        private static Bitmap s_ImageGuideAllSides2010 = null;
+
+        public static Bitmap ImageGuideTop
+        {
+            get
+            {
+                if (s_ImageGuideTop == null)
+                    s_ImageGuideTop = BarFunctions.LoadBitmap("SystemImages.DockHintTop.png");
+                return s_ImageGuideTop;
+            }
+        }
+        public static Bitmap ImageGuideTop2010
+        {
+            get
+            {
+                if (s_ImageGuideTop2010 == null)
+                    s_ImageGuideTop2010 = BarFunctions.LoadBitmap("SystemImages.DockHintTop2010.png");
+                return s_ImageGuideTop2010;
+            }
+        }
+
+        public static Bitmap ImageGuideBottom
+        {
+            get
+            {
+                if (s_ImageGuideBottom == null)
+                    s_ImageGuideBottom = BarFunctions.LoadBitmap("SystemImages.DockHintBottom.png");
+                return s_ImageGuideBottom;
+            }
+        }
+        public static Bitmap ImageGuideBottom2010
+        {
+            get
+            {
+                if (s_ImageGuideBottom2010 == null)
+                    s_ImageGuideBottom2010 = BarFunctions.LoadBitmap("SystemImages.DockHintBottom2010.png");
+                return s_ImageGuideBottom2010;
+            }
+        }
+
+        public static Bitmap ImageGuideLeft
+        {
+            get
+            {
+                if (s_ImageGuideLeft == null)
+                    s_ImageGuideLeft = BarFunctions.LoadBitmap("SystemImages.DockHintLeft.png");// new Bitmap(typeof(DevComponents.DotNetBar.DotNetBarManager),"SystemImages.DockHintLeft.png");
+                return s_ImageGuideLeft;
+            }
+        }
+        public static Bitmap ImageGuideLeft2010
+        {
+            get
+            {
+                if (s_ImageGuideLeft2010 == null)
+                    s_ImageGuideLeft2010 = BarFunctions.LoadBitmap("SystemImages.DockHintLeft2010.png");// new Bitmap(typeof(DevComponents.DotNetBar.DotNetBarManager),"SystemImages.DockHintLeft.png");
+                return s_ImageGuideLeft2010;
+            }
+        }
+
+        public static Bitmap ImageGuideRight
+        {
+            get
+            {
+                if (s_ImageGuideRight == null)
+                    s_ImageGuideRight = BarFunctions.LoadBitmap("SystemImages.DockHintRight.png");
+                return s_ImageGuideRight;
+            }
+        }
+        public static Bitmap ImageGuideRight2010
+        {
+            get
+            {
+                if (s_ImageGuideRight2010 == null)
+                    s_ImageGuideRight2010 = BarFunctions.LoadBitmap("SystemImages.DockHintRight2010.png");
+                return s_ImageGuideRight2010;
+            }
+        }
+
+        public static Bitmap ImageGuideTab
+        {
+            get
+            {
+                if (s_ImageGuideTab == null)
+                    s_ImageGuideTab = BarFunctions.LoadBitmap("SystemImages.DockHintTab.png");
+                return s_ImageGuideTab;
+            }
+        }
+        public static Bitmap ImageGuideTab2010
+        {
+            get
+            {
+                if (s_ImageGuideTab2010 == null)
+                    s_ImageGuideTab2010 = BarFunctions.LoadBitmap("SystemImages.DockHintTab2010.png");
+                return s_ImageGuideTab2010;
+            }
+        }
+        public static Bitmap ImageGuideAllTopBottom2010
+        {
+            get
+            {
+                if (s_ImageGuideTabTopBottom2010 == null)
+                    s_ImageGuideTabTopBottom2010 = BarFunctions.LoadBitmap("SystemImages.DockHintTopBottom2010.png");
+                return s_ImageGuideTabTopBottom2010;
+            }
+        }
+        public static Bitmap ImageGuideAllLeftRight2010
+        {
+            get
+            {
+                if (s_ImageGuideTabLeftRight2010 == null)
+                    s_ImageGuideTabLeftRight2010 = BarFunctions.LoadBitmap("SystemImages.DockHintLeftRight2010.png");
+                return s_ImageGuideTabLeftRight2010;
+            }
+        }
+
+        public static Bitmap ImageGuideAllSides
+        {
+            get
+            {
+                if (s_ImageGuideAllSides == null)
+                    s_ImageGuideAllSides = BarFunctions.LoadBitmap("SystemImages.DockHintAllSides.png");
+                return s_ImageGuideAllSides;
+            }
+        }
+        public static Bitmap ImageGuideAllSides2010
+        {
+            get
+            {
+                if (s_ImageGuideAllSides2010 == null)
+                    s_ImageGuideAllSides2010 = BarFunctions.LoadBitmap("SystemImages.DockHintAllSides2010.png");
+                return s_ImageGuideAllSides2010;
+            }
+        }
+
+        #endregion
+
+        #region Constructor
+        private eDotNetBarStyle _Style = eDotNetBarStyle.Office2003;
+        public DockingHint(eDockingHintSide hintSide, eDotNetBarStyle style) : this(hintSide, false, style) { }
+        public DockingHint(eDockingHintSide hintSide, bool middleDockingHint, eDotNetBarStyle style)
+        {
+            //
+            // Required for Windows Form Designer support
+            //
+            InitializeComponent();
+            _Style = style;
+            m_MiddleDockHint = middleDockingHint;
+
+            this.SetStyle(ControlStyles.Selectable, false);
+            this.SetStyle(ControlStyles.AllPaintingInWmPaint, true);
+            this.SetStyle(DisplayHelp.DoubleBufferFlag, true);
+            this.SetStyle(ControlStyles.Opaque, true);
+
+            m_DockingHintSide = hintSide;
+            UpdateControlRegion();
+        }
+        #endregion
+
+        #region Internal Implemementation
+        public void ShowFocusless()
+        {
+            Size size = this.Size;
+            NativeFunctions.SetWindowPos(this.Handle, new IntPtr(NativeFunctions.HWND_TOP), 0, 0, size.Width, size.Height, NativeFunctions.SWP_SHOWWINDOW | NativeFunctions.SWP_NOACTIVATE | NativeFunctions.SWP_NOMOVE);
+            //this.TopMost=true;
+            if (!BarFunctions.ThemedOS)
+                UpdateControlRegion();
+        }
+
+        protected override CreateParams CreateParams
+        {
+            get
+            {
+                CreateParams cp = base.CreateParams;
+                cp.ExStyle |= (int)NativeFunctions.WS_EX_TOPMOST | (int)NativeFunctions.SWP_NOACTIVATE;
+                return cp;
+            }
+        }
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                if (components != null)
+                {
+                    components.Dispose();
+                }
+            }
+            base.Dispose(disposing);
+        }
+
+        private void DisposeHintPaths()
+        {
+            DisposeHintPath(ref m_LeftHint);
+            DisposeHintPath(ref m_RightHint);
+            DisposeHintPath(ref m_TopHint);
+            DisposeHintPath(ref m_BottomHint);
+        }
+        private void DisposeHintPath(ref GraphicsPath path)
+        {
+            if (path != null) path.Dispose();
+            path = null;
+        }
+        /// <summary>
+        /// Update control region based on hint side
+        /// </summary>
+        public void UpdateControlRegion()
+        {
+            System.Drawing.Region region = null;
+            System.Drawing.Size size = Size.Empty;
+            if (m_MiddleDockHint)
+            {
+                GraphicsPath path = new GraphicsPath();
+
+                m_DockTabHint = this.GetHintPath(eDockingHintSide.DockTab);
+                DisposeHintPaths();
+                if (m_DockingHintSide == (eDockingHintSide.Left | eDockingHintSide.Right) && (_Style == eDotNetBarStyle.Office2010 || StyleManager.IsMetro(_Style)))
+                {
+                    m_LeftHint = this.GetHintPath(eDockingHintSide.Left);
+                    m_RightHint = this.GetHintPath(eDockingHintSide.Right);
+                    path.AddRectangle(new Rectangle(0, 36, 112, 40));
+                }
+                else if (m_DockingHintSide == (eDockingHintSide.Top | eDockingHintSide.Bottom) && (_Style == eDotNetBarStyle.Office2010 || StyleManager.IsMetro(_Style)))
+                {
+                    m_TopHint = this.GetHintPath(eDockingHintSide.Top);
+                    m_BottomHint = this.GetHintPath(eDockingHintSide.Bottom);
+                    path.AddRectangle(new Rectangle(36, 0, 40, 112));
+                }
+                else
+                {
+                    // Assign paths
+                    if ((m_DockingHintSide & eDockingHintSide.Left) != 0)
+                    {
+                        m_LeftHint = this.GetHintPath(eDockingHintSide.Left);
+                        path.AddPath(m_LeftHint, true);
+                    }
+                    else
+                    {
+                        if (_Style == eDotNetBarStyle.Office2010 || StyleManager.IsMetro(_Style))
+                            path.AddLine(26, 36, 26, 76);
+                        else
+                            path.AddLine(23, 57, 23, 29);
+                    }
+
+                    if ((m_DockingHintSide & eDockingHintSide.Top) != 0)
+                    {
+                        m_TopHint = this.GetHintPath(eDockingHintSide.Top);
+                        path.AddPath(m_TopHint, true);
+                    }
+                    else
+                    {
+                        if (_Style == eDotNetBarStyle.Office2010 || StyleManager.IsMetro(_Style))
+                            path.AddLine(26, 36, 88, 36);
+                        else
+                            path.AddLine(29, 23, 57, 23);
+                    }
+
+                    if ((m_DockingHintSide & eDockingHintSide.Right) != 0)
+                    {
+                        m_RightHint = this.GetHintPath(eDockingHintSide.Right);
+                        path.AddPath(m_RightHint, true);
+                    }
+                    else
+                    {
+                        if (_Style == eDotNetBarStyle.Office2010 || StyleManager.IsMetro(_Style))
+                            path.AddLine(88, 36, 88, 76);
+                        else
+                            path.AddLine(64, 29, 64, 57);
+                    }
+
+                    if ((m_DockingHintSide & eDockingHintSide.Bottom) != 0)
+                    {
+                        m_BottomHint = this.GetHintPath(eDockingHintSide.Bottom);
+                        path.AddPath(m_BottomHint, true);
+                    }
+                    else
+                    {
+                        if (_Style == eDotNetBarStyle.Office2010 || StyleManager.IsMetro(_Style))
+                            path.AddLine(88, 76, 26, 76);
+                        else
+                            path.AddLine(57, 64, 29, 64);
+                    }
+                    path.CloseAllFigures();
+                }
+                if (_Style == eDotNetBarStyle.Office2010 || StyleManager.IsMetro(_Style))
+                    size = new Size(112, 112);
+                else
+                    size = new Size(88, 88);
+                region = new Region(path);
+            }
+            else
+            {
+                if (_Style == eDotNetBarStyle.Office2010 || StyleManager.IsMetro(_Style))
+                    size = new Size(40, 40);
+                else
+                {
+                    if ((m_DockingHintSide & eDockingHintSide.Left) != 0 || (m_DockingHintSide & eDockingHintSide.Right) != 0)
+                        size = new Size(31, 29);
+                    else
+                        size = new Size(29, 31);
+                }
+                if ((m_DockingHintSide & eDockingHintSide.Left) != 0)
+                {
+                    m_LeftHint = new GraphicsPath();
+                    m_LeftHint.AddRectangle(new Rectangle(Point.Empty, size));
+                }
+                if ((m_DockingHintSide & eDockingHintSide.Right) != 0)
+                {
+                    m_RightHint = new GraphicsPath();
+                    m_RightHint.AddRectangle(new Rectangle(Point.Empty, size));
+                }
+                if ((m_DockingHintSide & eDockingHintSide.Top) != 0)
+                {
+                    m_TopHint = new GraphicsPath();
+                    m_TopHint.AddRectangle(new Rectangle(Point.Empty, size));
+                }
+                if ((m_DockingHintSide & eDockingHintSide.Bottom) != 0)
+                {
+                    m_BottomHint = new GraphicsPath();
+                    m_BottomHint.AddRectangle(new Rectangle(Point.Empty, size));
+                }
+                region = new Region(new Rectangle(Point.Empty, size));
+            }
+
+            this.Size = size;
+            if (region != null)
+                this.Region = region;
+        }
+
+        private Rectangle GetHintRect()
+        {
+            System.Drawing.Size size = Size.Empty;
+
+            if ((m_DockingHintSide & eDockingHintSide.Bottom) == eDockingHintSide.Bottom)
+            {
+                SizeF sf = m_BottomHint.GetBounds().Size;
+                size = new Size((int)sf.Width, (int)sf.Height);
+            }
+            if ((m_DockingHintSide & eDockingHintSide.Top) == eDockingHintSide.Top)
+            {
+                SizeF sf = m_TopHint.GetBounds().Size;
+                size = new Size((int)sf.Width, (int)sf.Height);
+            }
+            if ((m_DockingHintSide & eDockingHintSide.Right) == eDockingHintSide.Right)
+            {
+                SizeF sf = m_RightHint.GetBounds().Size;
+                size = new Size((int)sf.Width, (int)sf.Height);
+            }
+            if ((m_DockingHintSide & eDockingHintSide.DockTab) == eDockingHintSide.DockTab)
+            {
+                SizeF sf = m_DockTabHint.GetBounds().Size;
+                size = new Size((int)sf.Width, (int)sf.Height);
+            }
+            if ((m_DockingHintSide & eDockingHintSide.Left) == eDockingHintSide.Left)
+            {
+                SizeF sf = m_LeftHint.GetBounds().Size;
+                size = new Size((int)sf.Width, (int)sf.Height);
+            }
+            if (m_DockingHintSide == eDockingHintSide.Sides)
+                size = new Size(88, 88);
+
+            return new Rectangle(Point.Empty, size);
+        }
+
+        private Image GetImageGuideTab()
+        {
+            if (_Style == eDotNetBarStyle.Office2010 || StyleManager.IsMetro(_Style))
+            {
+                return DockingHint.ImageGuideTab2010;
+            }
+            return DockingHint.ImageGuideTab;
+        }
+
+        private Image GetImageGuideAllSides()
+        {
+            if (_Style == eDotNetBarStyle.Office2010 || StyleManager.IsMetro(_Style))
+            {
+                if (m_DockingHintSide == (eDockingHintSide.Left | eDockingHintSide.Right))
+                    return DockingHint.ImageGuideAllLeftRight2010;
+                else if (m_DockingHintSide == (eDockingHintSide.Top | eDockingHintSide.Bottom))
+                    return DockingHint.ImageGuideAllTopBottom2010;
+                return DockingHint.ImageGuideAllSides2010;
+            }
+            return DockingHint.ImageGuideAllSides;
+        }
+
+        private Image GetImageGuideLeft()
+        {
+            if (_Style == eDotNetBarStyle.Office2010 || StyleManager.IsMetro(_Style))
+                return DockingHint.ImageGuideLeft2010;
+            return DockingHint.ImageGuideLeft;
+        }
+        private Image GetImageGuideRight()
+        {
+            if (_Style == eDotNetBarStyle.Office2010 || StyleManager.IsMetro(_Style))
+                return DockingHint.ImageGuideRight2010;
+            return DockingHint.ImageGuideRight;
+        }
+        private Image GetImageGuideTop()
+        {
+            if (_Style == eDotNetBarStyle.Office2010 || StyleManager.IsMetro(_Style))
+                return DockingHint.ImageGuideTop2010;
+            return DockingHint.ImageGuideTop;
+        }
+        private Image GetImageGuideBottom()
+        {
+            if (_Style == eDotNetBarStyle.Office2010 || StyleManager.IsMetro(_Style))
+                return DockingHint.ImageGuideBottom2010;
+            return DockingHint.ImageGuideBottom;
+        }
+
+        private SolidBrush CreateOverlayMouseOverBrush()
+        {
+            return new SolidBrush(Color.FromArgb(48, Color.Navy));
+        }
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            Graphics g = e.Graphics;
+            Color colorHot = Color.FromArgb(65, 112, 202);
+            Color color = Color.FromArgb(228, 228, 228);
+
+            SolidBrush brush = new SolidBrush(color);
+            Pen pen = new Pen(colorHot, 1);
+
+            try
+            {
+                if (m_MiddleDockHint)
+                {
+                    g.DrawImageUnscaled(GetImageGuideAllSides(), 0, 0);
+                    if ((m_DockingHintSide & eDockingHintSide.DockTab) == eDockingHintSide.DockTab)
+                    {
+                        Image imageGuideTab = GetImageGuideTab();
+                        if (_Style == eDotNetBarStyle.Office2010 || StyleManager.IsMetro(_Style))
+                            g.DrawImageUnscaled(imageGuideTab, (this.Width - imageGuideTab.Width) / 2, (this.Height - imageGuideTab.Height) / 2);
+                        else
+                            g.DrawImageUnscaled(imageGuideTab, (this.Width - imageGuideTab.Width) / 2 + 2, (this.Height - imageGuideTab.Height) / 2 + 2);
+                    }
+
+                    if (_Style == eDotNetBarStyle.Office2010 || StyleManager.IsMetro(_Style))
+                    {
+                    }
+                    else
+                    {
+                        if ((m_DockingHintSide & eDockingHintSide.Bottom) != eDockingHintSide.Bottom)
+                            g.FillRectangle(brush, 33, 60, 23, 26);
+                        if ((m_DockingHintSide & eDockingHintSide.Top) != eDockingHintSide.Top)
+                            g.FillRectangle(brush, 33, 4, 23, 26);
+                        if ((m_DockingHintSide & eDockingHintSide.Left) != eDockingHintSide.Left)
+                            g.FillRectangle(brush, 4, 33, 26, 23);
+                        if ((m_DockingHintSide & eDockingHintSide.Right) != eDockingHintSide.Right)
+                            g.FillRectangle(brush, 60, 33, 26, 23);
+                    }
+                }
+                else
+                {
+
+                    if ((m_DockingHintSide & eDockingHintSide.Left) == eDockingHintSide.Left)
+                    {
+                        g.DrawImage(GetImageGuideLeft(), m_LeftHint.GetBounds());
+                    }
+
+                    if ((m_DockingHintSide & eDockingHintSide.Right) == eDockingHintSide.Right)
+                    {
+                        g.DrawImage(GetImageGuideRight(), m_RightHint.GetBounds());
+                    }
+
+                    if ((m_DockingHintSide & eDockingHintSide.Top) == eDockingHintSide.Top)
+                    {
+                        g.DrawImage(GetImageGuideTop(), m_TopHint.GetBounds());
+                    }
+
+                    if ((m_DockingHintSide & eDockingHintSide.Bottom) == eDockingHintSide.Bottom)
+                    {
+                        g.DrawImage(GetImageGuideBottom(), m_BottomHint.GetBounds());
+                    }
+                    else
+                        g.FillRectangle(brush, 33, 84, 23, 26);
+                }
+
+                if (m_MouseOverHintSide == eMouseOverHintSide.Left)
+                {
+                    if (_Style == eDotNetBarStyle.Office2010 || StyleManager.IsMetro(_Style)) 
+                    {
+                        Rectangle hintRect;
+                        if (m_MiddleDockHint)
+                            hintRect = new Rectangle(4, 40, 32, 32);
+                        else
+                            hintRect = new Rectangle(4, 4, 32, 32);
+                        using (GraphicsPath mp = DisplayHelp.GetRoundedRectanglePath(hintRect, 1))
+                        {
+                            using(SolidBrush brush2=CreateOverlayMouseOverBrush())
+                                g.FillPath(brush2, mp);
+                        }
+                    }
+                    else
+                    {
+                        RectangleF r = m_LeftHint.GetBounds();
+                        if (m_MiddleDockHint)
+                        {
+                            r.Inflate(0, -6);
+                            r.Width -= 6;
+                        }
+                        g.DrawLine(pen, r.X, r.Y, r.Right, r.Y);
+                        g.DrawLine(pen, r.X, r.Y, r.X, r.Bottom);
+                        g.DrawLine(pen, r.X, r.Bottom - 1, r.Right, r.Bottom - 1);
+                    }
+                }
+                if (m_MouseOverHintSide == eMouseOverHintSide.Right)
+                {
+                    if (_Style == eDotNetBarStyle.Office2010 || StyleManager.IsMetro(_Style))
+                    {
+                        Rectangle hintRect;
+                        if (m_MiddleDockHint)
+                            hintRect = new Rectangle(76, 40, 32, 32);
+                        else
+                            hintRect = new Rectangle(4, 4, 32, 32);
+                        using (GraphicsPath mp = DisplayHelp.GetRoundedRectanglePath(hintRect, 1))
+                        {
+                            using (SolidBrush brush2 = CreateOverlayMouseOverBrush())
+                                g.FillPath(brush2, mp);
+                        }
+                    }
+                    else
+                    {
+                        RectangleF r = m_RightHint.GetBounds();
+                        if (m_MiddleDockHint)
+                        {
+                            r.Inflate(0, -6);
+                            r.Width -= 6;
+                            r.X += 6;
+                        }
+                        g.DrawLine(pen, r.X, r.Y, r.Right, r.Y);
+                        g.DrawLine(pen, r.Right - 1, r.Y, r.Right - 1, r.Bottom);
+                        g.DrawLine(pen, r.X, r.Bottom - 1, r.Right, r.Bottom - 1);
+                    }
+                }
+                if (m_MouseOverHintSide == eMouseOverHintSide.Top)
+                {
+                    if (_Style == eDotNetBarStyle.Office2010 || StyleManager.IsMetro(_Style))
+                    {
+                        Rectangle hintRect;
+                        if (m_MiddleDockHint)
+                            hintRect = new Rectangle(40, 4, 32, 32);
+                        else
+                            hintRect = new Rectangle(4, 4, 32, 32);
+                        using (GraphicsPath mp = DisplayHelp.GetRoundedRectanglePath(hintRect, 1))
+                        {
+                            using (SolidBrush brush2 = CreateOverlayMouseOverBrush())
+                                g.FillPath(brush2, mp);
+                        }
+                    }
+                    else
+                    {
+                        RectangleF r = m_TopHint.GetBounds();
+                        if (m_MiddleDockHint)
+                        {
+                            r.Inflate(-6, 0);
+                            r.Height -= 6;
+                        }
+                        g.DrawLine(pen, r.X, r.Y, r.Right, r.Y);
+                        g.DrawLine(pen, r.Right - 1, r.Y, r.Right - 1, r.Bottom);
+                        g.DrawLine(pen, r.X, r.Y, r.X, r.Bottom);
+                    }
+                }
+                if (m_MouseOverHintSide == eMouseOverHintSide.Bottom)
+                {
+                    if (_Style == eDotNetBarStyle.Office2010 || StyleManager.IsMetro(_Style))
+                    {
+                        Rectangle hintRect;
+                        if (m_MiddleDockHint)
+                            hintRect = new Rectangle(40, 76, 32, 32);
+                        else
+                            hintRect = new Rectangle(4, 4, 32, 32);
+                        using (GraphicsPath mp = DisplayHelp.GetRoundedRectanglePath(hintRect, 1))
+                        {
+                            using (SolidBrush brush2 = CreateOverlayMouseOverBrush())
+                                g.FillPath(brush2, mp);
+                        }
+                    }
+                    else
+                    {
+                        RectangleF r = m_BottomHint.GetBounds();
+                        if (m_MiddleDockHint)
+                        {
+                            r.Inflate(-6, 0);
+                            r.Height -= 6;
+                            r.Y += 6;
+                        }
+                        g.DrawLine(pen, r.X, r.Bottom - 1, r.Right, r.Bottom - 1);
+                        g.DrawLine(pen, r.Right - 1, r.Y, r.Right - 1, r.Bottom);
+                        g.DrawLine(pen, r.X, r.Y, r.X, r.Bottom);
+                    }
+                }
+                if (m_MouseOverHintSide == eMouseOverHintSide.DockTab)
+                {
+                    if ((_Style == eDotNetBarStyle.Office2010 || StyleManager.IsMetro(_Style)) && m_MiddleDockHint)
+                    {
+                        Rectangle hintRect = new Rectangle(40, 40, 32, 32);
+                        using (GraphicsPath mp = DisplayHelp.GetRoundedRectanglePath(hintRect, 1))
+                        {
+                            using (SolidBrush brush2 = CreateOverlayMouseOverBrush())
+                                g.FillPath(brush2, mp);
+                        }
+                    }
+                }
+                
+            }
+            finally
+            {
+                brush.Dispose();
+                pen.Dispose();
+            }
+        }
+
+        public GraphicsPath GetHintPath(eDockingHintSide hintSide)
+        {
+            // Create top hint path then rotate depending on desired side
+            GraphicsPath path = new GraphicsPath();
+            if (hintSide == eDockingHintSide.DockTab)
+            {
+                if (_Style == eDotNetBarStyle.Office2010 || StyleManager.IsMetro(_Style))
+                    path.AddRectangle(new Rectangle(40, 40, 32, 32));
+                else
+                    path.AddRectangle(new Rectangle(29, 29, 29, 29));
+            }
+            else
+            {
+                path.StartFigure();
+                if (_Style == eDotNetBarStyle.Office2010 || StyleManager.IsMetro(_Style))
+                {
+                    //path.AddLine(26, 36, 36, 26);
+                    //path.AddLine(36, 0, 76, 0);
+                    //path.AddLine(76, 26, 86, 36);
+                    path.AddLine(27, 35, 36, 26);
+                    path.AddLine(36, 0, 76, 0);
+                    path.AddLine(76, 26, 86, 35);
+                }
+                else
+                {
+                    path.AddLine(23, 28, 28, 23);
+                    path.AddLine(29, 23, 29, 0);
+                    path.AddLine(57, 0, 57, 23);
+                    path.AddLine(58, 23, 63, 28);
+                }
+            }
+
+            switch (hintSide)
+            {
+                case eDockingHintSide.Bottom:
+                    {
+                        using (Matrix matrix = new Matrix())
+                        {
+                            matrix.Rotate(180);
+                            if (_Style == eDotNetBarStyle.Office2010 || StyleManager.IsMetro(_Style))
+                                matrix.Translate(-path.GetBounds().Width * 2 + 6, -path.GetBounds().Height * 2 - 42);
+                            else
+                                matrix.Translate(-path.GetBounds().Width * 2 - 6, -path.GetBounds().Height * 2 - 30);
+                            path.Transform(matrix);
+                        }
+                        break;
+                    }
+                case eDockingHintSide.Left:
+                    {
+                        using (Matrix matrix = new Matrix())
+                        {
+                            matrix.Rotate(-90);
+                            if (_Style == eDotNetBarStyle.Office2010 || StyleManager.IsMetro(_Style))
+                                matrix.Translate(-53, 0);
+                            else
+                                matrix.Translate(-46, 0);
+                            path.Transform(matrix);
+                            matrix.Reset();
+                            matrix.Translate(0, path.GetBounds().Height);
+                            path.Transform(matrix);
+                        }
+                        break;
+                    }
+                case eDockingHintSide.Right:
+                    {
+                        using (Matrix matrix = new Matrix())
+                        {
+                            matrix.Rotate(90);
+                            path.Transform(matrix);
+                            matrix.Reset();
+                            if (_Style == eDotNetBarStyle.Office2010 || StyleManager.IsMetro(_Style))
+                                matrix.Translate(path.GetBounds().Width * 2 + 42, 0);
+                            else
+                                matrix.Translate(path.GetBounds().Width * 2 + 30, 0);
+                            path.Transform(matrix);
+                        }
+                        break;
+                    }
+            }
+
+            return path;
+        }
+
+        internal eMouseOverHintSide ExMouseMove(int x, int y)
+        {
+            if (this.Bounds.Contains(x, y))
+            {
+                Point p = this.PointToClient(new Point(x, y));
+                if (m_LeftHint != null && m_LeftHint.IsVisible(p))
+                {
+                    this.MouseOverHintSide = eMouseOverHintSide.Left;
+                }
+                else if (m_RightHint != null && m_RightHint.IsVisible(p))
+                {
+                    this.MouseOverHintSide = eMouseOverHintSide.Right;
+                }
+                else if (m_TopHint != null && m_TopHint.IsVisible(p))
+                {
+                    this.MouseOverHintSide = eMouseOverHintSide.Top;
+                }
+                else if (m_BottomHint != null && m_BottomHint.IsVisible(p))
+                {
+                    this.MouseOverHintSide = eMouseOverHintSide.Bottom;
+                }
+                else if (m_DockTabHint != null && m_DockTabHint.IsVisible(p) && ((m_DockingHintSide & eDockingHintSide.DockTab) == eDockingHintSide.DockTab))
+                {
+                    this.MouseOverHintSide = eMouseOverHintSide.DockTab;
+                }
+                else
+                    this.MouseOverHintSide = eMouseOverHintSide.None;
+            }
+            else
+                this.MouseOverHintSide = eMouseOverHintSide.None;
+            this.ProcessPendingRefresh();
+
+            return this.MouseOverHintSide;
+        }
+
+        private eMouseOverHintSide MouseOverHintSide
+        {
+            get { return m_MouseOverHintSide; }
+            set
+            {
+                if (m_MouseOverHintSide != value)
+                {
+                    m_MouseOverHintSide = value;
+                    m_PendingRefresh = true;
+                }
+            }
+        }
+
+        private void ProcessPendingRefresh()
+        {
+            if (m_PendingRefresh)
+            {
+                m_PendingRefresh = false;
+                this.Refresh();
+            }
+        }
+
+        public eDockingHintSide DockingHintSides
+        {
+            get { return m_DockingHintSide; }
+            set
+            {
+                if (m_DockingHintSide != value)
+                {
+                    m_DockingHintSide = value;
+                    UpdateControlRegion();
+                    if (this.IsHandleCreated)
+                        this.Refresh();
+                }
+            }
+        }
+
+        public bool MiddleDockHint
+        {
+            get { return m_MiddleDockHint; }
+            set { m_MiddleDockHint = value; }
+        }
+        #endregion
+
+        #region Windows Form 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()
+        {
+            // 
+            // DockingHint
+            // 
+            //			this.AutoScaleBaseSize = new System.Drawing.Size(5, 13);
+            //			this.ClientSize = new System.Drawing.Size(24, 24);
+            this.ControlBox = false;
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.MinimizeBox = false;
+            this.MaximizeBox = false;
+            this.ControlBox = false;
+            this.Name = "DockingHint";
+            this.Text = "";
+            this.ShowInTaskbar = false;
+            this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
+            this.StartPosition = FormStartPosition.Manual;
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DocumentDock/DocumentBarContainer.cs b/PROMS/DotNetBar Source Code/DocumentDock/DocumentBarContainer.cs
new file mode 100644
index 00000000..963dbf80
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DocumentDock/DocumentBarContainer.cs	
@@ -0,0 +1,98 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Xml;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Represents class that is a bar container for document docking.
+	/// </summary>
+	[DesignTimeVisible(false),ToolboxItem(false),TypeConverter(typeof(DocumentBarContainerConverter))]
+	public class DocumentBarContainer:DocumentBaseContainer
+	{
+		#region Private Variables and Constructor
+		private Bar m_Bar=null;
+
+		/// <summary>
+		/// Creates new instance of the class.
+		/// </summary>
+		public DocumentBarContainer(){}
+
+		/// <summary>
+		/// Creates new instance of the class and initializes it with the Bar object.
+		/// </summary>
+		/// <param name="bar">Bar to contain on document.</param>
+		public DocumentBarContainer(Bar bar)
+		{
+			m_Bar=bar;
+            if(m_Bar.SplitDockHeight>0 || m_Bar.SplitDockWidth>0)
+				this.SetLayoutBounds(new Rectangle(0,0,m_Bar.SplitDockWidth,m_Bar.SplitDockHeight));
+		}
+
+		/// <summary>
+		/// Creates new instance of the class and initializes it with the bar and propesed width and height.
+		/// </summary>
+		/// <param name="bar">Bar to contain on document.</param>
+		/// <param name="proposedWidth">Proposed width of the document in pixels</param>
+		/// <param name="proposedHeight">Proposed height of the document in pixels</param>
+		public DocumentBarContainer(Bar bar, int proposedWidth, int proposedHeight)
+		{
+			m_Bar=bar;
+			this.SetLayoutBounds(new Rectangle(0,0,proposedWidth,proposedHeight));
+		}
+		#endregion
+
+		#region Internal Implementation
+		/// <summary>
+		/// Gets or sets the bar that is contained by this document.
+		/// </summary>
+		[Browsable(false),DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public Bar Bar
+		{
+			get {return m_Bar;}
+			set {m_Bar=value;}
+		}
+
+		/// <summary>
+		/// Resizes document object.
+		/// </summary>
+		/// <param name="bounds">Available bounds for the document.</param>
+		public override void Layout(Rectangle bounds)
+		{
+            if (m_Bar != null)
+            {
+                m_Bar.SplitDockHeight = 0;
+                m_Bar.SplitDockWidth = 0;
+                m_Bar.MinHeight = 0;
+                m_Bar.RecalcSize(bounds.Size);
+                m_Bar.Location = bounds.Location;
+            }
+			SetDisplayBounds(bounds);
+		}
+
+		/// <summary>
+		/// Gets whether document is visible.
+		/// </summary>
+		public override bool Visible
+		{
+			get
+			{
+                if (m_Bar == null)
+                    return false;
+				if(m_Bar.GetDesignMode())
+					return true;
+                return m_Bar.IsVisible;
+			}
+		}
+
+		/// <summary>
+		/// Gets the minimum size of the document.
+		/// </summary>
+		protected internal override System.Drawing.Size MinimumSize
+		{
+			get {return m_Bar.GetAdjustedFullSize(m_Bar.MinimumDockSize(eOrientation.Horizontal));}
+		}
+		#endregion
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/DocumentDock/DocumentBarContainerConverter.cs b/PROMS/DotNetBar Source Code/DocumentDock/DocumentBarContainerConverter.cs
new file mode 100644
index 00000000..09b240fc
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DocumentDock/DocumentBarContainerConverter.cs	
@@ -0,0 +1,65 @@
+using System;
+using System.ComponentModel;
+using System.ComponentModel.Design.Serialization;
+using System.Globalization;
+using System.Reflection;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Represents DocumentBarContainer converter.
+	/// </summary>
+	public class DocumentBarContainerConverter:TypeConverter
+	{
+		/// <summary>
+		/// Creates new instance of the class.
+		/// </summary>
+		public DocumentBarContainerConverter(){}
+
+		/// <summary>
+		/// Checks whether conversion can be made to specified type.
+		/// </summary>
+		/// <param name="context">Context Information.</param>
+		/// <param name="destinationType">Destination type.</param>
+		/// <returns></returns>
+		public override bool CanConvertTo(ITypeDescriptorContext context, Type destinationType)
+		{
+			if(destinationType==typeof(InstanceDescriptor))
+				return true;
+			return base.CanConvertTo(context, destinationType);
+		}
+
+		/// <summary>
+		/// Converts object to specified type.
+		/// </summary>
+		/// <param name="context">Context information.</param>
+		/// <param name="culture">Culture information.</param>
+		/// <param name="value">Object to convert.</param>
+		/// <param name="destinationType">Destination type.</param>
+		/// <returns>Object converted to destination type.</returns>
+		public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+		{
+			if(destinationType==null)
+				throw new ArgumentNullException("destinationType");
+
+			if((destinationType==typeof(InstanceDescriptor)) && (value is DocumentBarContainer))
+			{
+				DocumentBarContainer doc=(DocumentBarContainer)value;
+				Type[] constructorParams=null;
+				MemberInfo constructorMemberInfo = null;
+				object[] constructorValues = null;
+
+				constructorParams = new Type[3] { typeof(Bar),typeof(int),typeof(int) } ;
+				constructorMemberInfo = typeof(DocumentBarContainer).GetConstructor(constructorParams);
+				constructorValues=new object[3] {doc.Bar,doc.LayoutBounds.Width,doc.LayoutBounds.Height};
+
+				if(constructorMemberInfo!=null)
+				{
+					return new InstanceDescriptor(constructorMemberInfo, constructorValues);
+				}
+			}
+
+			return base.ConvertTo(context, culture, value, destinationType);
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/DocumentDock/DocumentBaseContainer.cs b/PROMS/DotNetBar Source Code/DocumentDock/DocumentBaseContainer.cs
new file mode 100644
index 00000000..8b8ae53c
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DocumentDock/DocumentBaseContainer.cs	
@@ -0,0 +1,186 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Represents Document container base class.
+	/// </summary>
+	public abstract class DocumentBaseContainer
+	{
+		#region Private Variables and Constructor
+		private Rectangle m_LayoutBounds=Rectangle.Empty;
+		private Rectangle m_DisplayBounds=Rectangle.Empty;
+		private DocumentBaseContainer m_Parent=null;
+        private static long IdCounter = 0;
+        private long _Id = 0;
+		/// <summary>
+		/// Creates new instance of the class.
+		/// </summary>
+		public DocumentBaseContainer()
+		{
+            IdCounter++;
+            _Id = IdCounter;
+		}
+		#endregion
+
+		#region Internal Implementation
+        /// <summary>
+        /// Gets the unique ID for the container.
+        /// </summary>
+        public long Id
+        {
+            get { return _Id; }
+        }
+        
+		/// <summary>
+		/// Returns actual display bounds of the document.
+		/// </summary>
+		[Browsable(false)]
+		public virtual Rectangle DisplayBounds
+		{
+			get {return m_DisplayBounds;}
+		}
+
+		/// <summary>
+		/// Returns layout bounds of the document. Layout bounds are proposed bounds of the layout and might not be the same
+		/// as DisplayBounds.
+		/// </summary>
+		[Browsable(false)]
+		public virtual Rectangle LayoutBounds
+		{
+			get {return m_LayoutBounds;}
+		}
+
+		/// <summary>
+		/// Gets the parent container.
+		/// </summary>
+		public virtual DocumentBaseContainer Parent
+		{
+			get {return m_Parent;}
+		}
+
+		/// <summary>
+		/// Resizes the document within specified bounds.
+		/// </summary>
+		/// <param name="bounds">Area available for the document.</param>
+		public abstract void Layout(Rectangle bounds);
+
+		/// <summary>
+		/// Sets the display bounds.
+		/// </summary>
+		/// <param name="r">New display bounds.</param>
+		internal void SetDisplayBounds(Rectangle r)
+		{
+			m_DisplayBounds=r;
+		}
+
+		/// <summary>
+		/// Sets layout bounds.
+		/// </summary>
+		/// <param name="r">New layout bounds.</param>
+		internal void SetLayoutBounds(Rectangle r)
+		{
+			m_LayoutBounds=r;
+		}
+
+        /// <summary>
+        /// Resets the layout bounds for the document base container to the empty bounds.
+        /// </summary>
+        public void ResetLayoutBounds()
+        {
+            m_LayoutBounds = Rectangle.Empty;
+        }
+
+        /// <summary>
+        /// Resets the layout bounds for the document base container to the empty bounds.
+        /// </summary>
+        public void ResetDisplayBounds()
+        {
+            m_DisplayBounds = Rectangle.Empty;
+        }
+
+		/// <summary>
+		/// Sets the parent document.
+		/// </summary>
+		/// <param name="parent">Parent container.</param>
+		internal void SetParent(DocumentBaseContainer parent)
+		{
+			m_Parent=parent;
+		}
+
+		/// <summary>
+		/// Sets the width of the document.
+		/// </summary>
+		/// <param name="width">Width in pixels</param>
+		public virtual void SetWidth(int width)
+		{
+			if(m_Parent!=null)
+			{
+				//if(!m_Parent.OnSetWidth(this,width))
+					//return;
+                m_Parent.OnSetWidth(this, width);
+			}
+
+            if (width >= this.MinimumSize.Width || this.MinimumSize.Width == 0)
+            {
+                ResetDisplayBounds();
+                m_LayoutBounds.Width = width;
+            }
+		}
+
+		/// <summary>
+		/// Sets the height of the document.
+		/// </summary>
+		/// <param name="height">Height in pixels.</param>
+		public virtual void SetHeight(int height)
+		{
+			if(m_Parent!=null)
+				m_Parent.OnSetHeight(this,height);
+
+            if (height >= this.MinimumSize.Height || this.MinimumSize.Height == 0)
+            {
+                ResetDisplayBounds();
+                m_LayoutBounds.Height = height;
+            }
+		}
+
+		/// <summary>
+		/// Occurs when width is being set on child document.
+		/// </summary>
+		/// <param name="doc">Reference document being changed</param>
+		/// <param name="width">Width in pixels</param>
+		/// <returns>True if width was applied by parent otherwise false</returns>
+		protected internal virtual bool OnSetWidth(DocumentBaseContainer doc, int width){return false;}
+
+		/// <summary>
+		/// Occurs when height is being set on child document.
+		/// </summary>
+		/// <param name="doc">Reference document being changed</param>
+		/// <param name="height">Height in pixels</param>
+		/// <returns>True if width was applied by parent otherwise false</returns>
+		protected internal virtual bool OnSetHeight(DocumentBaseContainer doc, int height){return false;}
+
+		/// <summary>
+		/// Gets whether document is visible or not.
+		/// </summary>
+		public abstract bool Visible {get;}
+
+		/// <summary>
+		/// Gets minimum size of the document.
+		/// </summary>
+		protected internal abstract System.Drawing.Size MinimumSize {get;}
+
+        /// <summary>
+        /// Updates bounds of the item in response to the scrolling of LayoutControl.
+        /// </summary>
+        /// <param name="xScroll"></param>
+        /// <param name="yScroll"></param>
+        internal virtual void UpdateScrollBounds(int xScroll, int yScroll, bool moveControls)
+        {
+            m_DisplayBounds.Offset(xScroll, yScroll);
+        }
+		#endregion
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/DocumentDock/DocumentBaseContainerCollection.cs b/PROMS/DotNetBar Source Code/DocumentDock/DocumentBaseContainerCollection.cs
new file mode 100644
index 00000000..99d389bd
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DocumentDock/DocumentBaseContainerCollection.cs	
@@ -0,0 +1,153 @@
+using System;
+using System.Collections;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Collection of DocumentBaseContainer objects.
+	/// </summary>
+	public class DocumentBaseContainerCollection:CollectionBase
+	{
+		#region Private Variables and Events
+		public event EventHandler DocumentRemoved;
+		public event EventHandler DocumentAdded;
+		private DocumentBaseContainer m_Owner=null;
+		#endregion
+
+		#region Internal Implementation
+		public DocumentBaseContainerCollection()
+		{
+			//m_Owner=owner;
+		}
+		/// <summary>
+		/// Adds new object to the collection.
+		/// </summary>
+		/// <param name="tab">Object to add.</param>
+		/// <returns>Index of newly added object.</returns>
+		public int Add(DocumentBaseContainer tab)
+		{
+			return List.Add(tab);
+		}
+
+		/// <summary>
+		/// Adds new objects to the collection.
+		/// </summary>
+		/// <param name="documents">Array of documents to add.</param>
+		public void AddRange(DocumentBaseContainer[] documents)
+		{
+			foreach(DocumentBaseContainer doc in documents)
+				List.Add(doc);
+		}
+
+		/// <summary>
+		/// Returns reference to the object in collection based on it's index.
+		/// </summary>
+		public DocumentBaseContainer this[int index]
+		{
+			get {return (DocumentBaseContainer)(List[index]);}
+			set {List[index] = value;}
+		}
+
+		/// <summary>
+		/// Inserts new object into the collection.
+		/// </summary>
+		/// <param name="index">Position of the object.</param>
+		/// <param name="value">Object to insert.</param>
+		public void Insert(int index, DocumentBaseContainer value) 
+		{
+			List.Insert(index, value);
+		}
+
+		/// <summary>
+		/// Returns index of the object inside of the collection.
+		/// </summary>
+		/// <param name="value">Reference to the object.</param>
+		/// <returns>Index of the object.</returns>
+		public int IndexOf(DocumentBaseContainer value) 
+		{
+			return List.IndexOf(value);
+		}
+
+		/// <summary>
+		/// Returns whether collection contains specified object.
+		/// </summary>
+		/// <param name="value">Object to look for.</param>
+		/// <returns>true if object is part of the collection, otherwise false.</returns>
+		public bool Contains(DocumentBaseContainer value) 
+		{
+			return List.Contains(value);
+		}
+
+		/// <summary>
+		/// Removes specified object from the collection.
+		/// </summary>
+		/// <param name="value"></param>
+		public void Remove(DocumentBaseContainer value) 
+		{
+			List.Remove(value);
+		}
+
+		protected override void OnRemoveComplete(int index,object value)
+		{
+			base.OnRemoveComplete(index,value);
+			DocumentBaseContainer item=value as DocumentBaseContainer;
+			item.SetParent(null);
+			if(DocumentRemoved!=null)
+				DocumentRemoved(item,new EventArgs());
+		}
+		protected override void OnInsertComplete(int index,object value)
+		{
+			base.OnInsertComplete(index,value);
+			DocumentBaseContainer item=value as DocumentBaseContainer;
+			if(m_Owner!=null)
+				item.SetParent(m_Owner);
+			if(DocumentAdded!=null)
+				DocumentAdded(item,new EventArgs());
+		}
+
+		/// <summary>
+		/// Copies collection into the specified array.
+		/// </summary>
+		/// <param name="array">Array to copy collection to.</param>
+		/// <param name="index">Starting index.</param>
+		public void CopyTo(DocumentBaseContainer[] array, int index) 
+		{
+			List.CopyTo(array, index);
+		}
+
+		/// <summary>
+		/// Copies contained items to the DocumentBaseContainer array.
+		/// </summary>
+		/// <param name="array">Array to copy to.</param>
+		internal void CopyTo(DocumentBaseContainer[] array)
+		{
+			List.CopyTo(array,0);
+		}
+
+		internal DocumentBaseContainer Owner
+		{
+			get {return m_Owner;}
+			set {m_Owner=value;}
+		}
+
+		protected override void OnClear()
+		{
+			//m_Owner.OnTabsCleared();
+			base.OnClear();
+		}
+
+        public int VisibleCount
+        {
+            get
+            {
+                int count = 0;
+                foreach (DocumentBaseContainer item in this.List)
+                {
+                    if (item.Visible) count++;
+                }
+                return count;
+            }
+        }
+		#endregion
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/DocumentDock/DocumentDockContainer.cs b/PROMS/DotNetBar Source Code/DocumentDock/DocumentDockContainer.cs
new file mode 100644
index 00000000..b6095e18
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DocumentDock/DocumentDockContainer.cs	
@@ -0,0 +1,562 @@
+using System;
+using System.Windows.Forms;
+using System.ComponentModel;
+using System.Drawing;
+using System.Xml;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represents Dock container with either horizontal or vertical layout.
+    /// </summary>
+    [DesignTimeVisible(false), ToolboxItem(false), TypeConverter(typeof(DocumentDockContainerConverter))]
+    public class DocumentDockContainer : DocumentBaseContainer
+    {
+        #region Private Variables
+        private bool _OversizeEnabled;
+        private eOrientation m_Orientation = eOrientation.Horizontal;
+        private DocumentBaseContainerCollection m_Documents = new DocumentBaseContainerCollection();
+        private int m_SplitterSize = 3;
+        private Size m_MinimumSize = Size.Empty;
+        private bool m_RecordDocumentSize = false;
+        #endregion
+
+        #region Internal Implementation
+
+        /// <summary>
+        /// Creates new instance of the object and initializes it with specified values.
+        /// </summary>
+        /// <param name="documents">Array of documents to host in this container.</param>
+        /// <param name="orientation">Container orientation</param>
+        public DocumentDockContainer(DocumentBaseContainer[] documents, eOrientation orientation)
+        {
+            m_Orientation = orientation;
+            m_Documents.Owner = this;
+            m_Documents.DocumentAdded += new EventHandler(DocumentAdded);
+            m_Documents.DocumentRemoved += new EventHandler(DocumentRemoved);
+
+            if (documents != null)
+            {
+                foreach (DocumentBaseContainer doc in documents)
+                    m_Documents.Add(doc);
+            }
+        }
+
+        /// <summary>
+        /// Creates new instance of the object.
+        /// </summary>
+        public DocumentDockContainer() : this(null, eOrientation.Horizontal) { }
+
+        /// <summary>
+        /// Resizes the object inside of the given bounds.
+        /// </summary>
+        /// <param name="bounds">Available area.</param>
+        public override void Layout(Rectangle bounds)
+        {
+            if (LayoutInternal(bounds))
+            {
+                if (!_OversizeEnabled)
+                    this.SetDisplayBounds(bounds);
+            }
+            else
+                this.SetDisplayBounds(Rectangle.Empty);
+        }
+
+        private struct DocumentMeasureInfo
+        {
+            public int TotalSize;
+            public int VisibleCount;
+        }
+
+        private DocumentMeasureInfo MeasureDocuments(Rectangle bounds)
+        {
+            DocumentMeasureInfo info = new DocumentMeasureInfo();
+
+            if (m_Documents.Count == 0)
+                return info;
+
+            int boundsSize = (m_Orientation == eOrientation.Horizontal ? bounds.Width : bounds.Height);
+            int defaultSize = 0; // (boundsSize - ((m_Documents.Count - 1) * m_SplitterSize)) / m_Documents.Count;
+
+            // Check whether default size is below minimum size and make appropriate adjustments...
+            int[] dockSizes = new int[m_Documents.Count];
+            bool adjustDefaultSize = false;
+            int defaultSizeCount = m_Documents.Count;
+            int splitterSize = Dpi.Width(m_SplitterSize);
+            do
+            {
+                defaultSize = (boundsSize - ((defaultSizeCount - 1) * splitterSize)) / defaultSizeCount;
+                adjustDefaultSize = false;
+                for (int i = 0; i < m_Documents.Count; i++)
+                {
+                    if (dockSizes[i] != 0) continue;
+
+                    DocumentBaseContainer doc = m_Documents[i];
+                    if (m_Orientation == eOrientation.Horizontal && doc.LayoutBounds.Width == 0 && doc.MinimumSize.Width > defaultSize)
+                    {
+                        dockSizes[i] = doc.MinimumSize.Width;
+                        adjustDefaultSize = true;
+                        boundsSize -= dockSizes[i];
+                        defaultSizeCount--;
+                        break;
+                    }
+                    else if (m_Orientation == eOrientation.Vertical && doc.LayoutBounds.Height == 0 && doc.MinimumSize.Height > defaultSize)
+                    {
+                        dockSizes[i] = doc.MinimumSize.Height;
+                        adjustDefaultSize = true;
+                        boundsSize -= dockSizes[i];
+                        defaultSizeCount--;
+                        break;
+                    }
+                }
+            } while (adjustDefaultSize && defaultSizeCount > 0);
+
+            int totalSize = 0;
+            int visibleCount = 0;
+            for (int i = 0; i < m_Documents.Count; i++)
+            {
+                DocumentBaseContainer doc = m_Documents[i];
+                if (m_Orientation == eOrientation.Horizontal && doc.LayoutBounds.Width == 0)
+                    doc.SetLayoutBounds(new Rectangle(0, 0, (dockSizes[i] > 0 ? dockSizes[i] : defaultSize), bounds.Height));
+                else if (m_Orientation == eOrientation.Vertical && doc.LayoutBounds.Height == 0)
+                    doc.SetLayoutBounds(new Rectangle(0, 0, bounds.Width, (dockSizes[i] > 0 ? dockSizes[i] : defaultSize)));
+
+                if (doc.Visible)
+                {
+                    totalSize += ((m_Orientation == eOrientation.Horizontal ? doc.LayoutBounds.Width : doc.LayoutBounds.Height) + splitterSize);
+                    visibleCount++;
+                }
+            }
+            if (visibleCount > 0)
+                totalSize -= splitterSize;
+
+            info.TotalSize = totalSize;
+            info.VisibleCount = visibleCount;
+            return info;
+        }
+
+        private bool AdjustLayoutBoundsForMinimumSize(float m, Rectangle layoutBounds)
+        {
+            bool layoutAdjusted = false;
+            foreach (DocumentBaseContainer doc in m_Documents)
+            {
+                if (!doc.Visible) continue;
+                Rectangle docBounds;
+                if (m_Orientation == eOrientation.Horizontal)
+                {
+                    docBounds = new Rectangle(layoutBounds.X, layoutBounds.Y, (int)(doc.LayoutBounds.Width * m), layoutBounds.Height);
+                    if (docBounds.Width < doc.MinimumSize.Width)
+                    {
+                        layoutAdjusted = true;
+                        break;
+                    }
+                }
+                else
+                {
+                    docBounds = new Rectangle(layoutBounds.X, layoutBounds.Y, layoutBounds.Width, (int)(doc.LayoutBounds.Height * m));
+                    if (docBounds.Height < doc.MinimumSize.Height)
+                    {
+                        layoutAdjusted = true;
+                        break;
+                    }
+                }
+            }
+
+            if (layoutAdjusted)
+            {
+                foreach (DocumentBaseContainer doc in m_Documents)
+                    doc.SetLayoutBounds(Rectangle.Empty);
+            }
+
+            return layoutAdjusted;
+        }
+
+        private bool LayoutInternal(Rectangle bounds)
+        {
+            if (m_Documents.Count == 0)
+                return false;
+
+            int boundsSize = (m_Orientation == eOrientation.Horizontal ? bounds.Width : bounds.Height);
+            DocumentMeasureInfo info = MeasureDocuments(bounds);
+            if (info.VisibleCount == 0)
+                return false;
+            int totalSize = info.TotalSize;
+            int visibleCount = info.VisibleCount;
+            float m = (float)boundsSize / (float)totalSize;
+
+            if (AdjustLayoutBoundsForMinimumSize(m, bounds))
+                info = MeasureDocuments(bounds);
+
+            Rectangle layoutBounds = bounds;
+            int processed = 0;
+            bool setSize = true;
+            if (!m_RecordDocumentSize && Math.Abs(totalSize - boundsSize) / m_Documents.Count != (int)(Math.Abs(totalSize - boundsSize) / m_Documents.Count) * m_Documents.Count)
+                setSize = false;
+            bool resize = (totalSize != boundsSize);
+            Rectangle contentBounds = Rectangle.Empty;
+
+            for (int i = 0; i < m_Documents.Count; i++)
+            {
+                DocumentBaseContainer doc = m_Documents[i];
+                if (doc.Visible)
+                {
+                    processed++;
+                    Rectangle docBounds;
+                    if (resize)
+                    {
+                        if (m_Orientation == eOrientation.Horizontal)
+                        {
+                            if (_OversizeEnabled)
+                                docBounds = new Rectangle(layoutBounds.X, layoutBounds.Y, (int)Math.Max(doc.MinimumSize.Width, (doc.LayoutBounds.Width * m)), Math.Max(layoutBounds.Height, doc.MinimumSize.Height));
+                            else
+                                docBounds = new Rectangle(layoutBounds.X, layoutBounds.Y, (int)(doc.LayoutBounds.Width * m), layoutBounds.Height);
+                        }
+                        else
+                        {
+                            if (_OversizeEnabled)
+                                docBounds = new Rectangle(layoutBounds.X, layoutBounds.Y, Math.Max(layoutBounds.Width, doc.MinimumSize.Width), (int)Math.Max(doc.MinimumSize.Height, (doc.LayoutBounds.Height * m)));
+                            else
+                                docBounds = new Rectangle(layoutBounds.X, layoutBounds.Y, layoutBounds.Width, (int)(doc.LayoutBounds.Height * m));
+                        }
+                    }
+                    else
+                    {
+                        if (m_Orientation == eOrientation.Horizontal)
+                        {
+                            if (_OversizeEnabled)
+                                docBounds = new Rectangle(layoutBounds.X, layoutBounds.Y, doc.LayoutBounds.Width, Math.Max(layoutBounds.Height, doc.MinimumSize.Height));
+                            else
+                                docBounds = new Rectangle(layoutBounds.X, layoutBounds.Y, doc.LayoutBounds.Width, layoutBounds.Height);
+                        }
+                        else
+                        {
+                            if (_OversizeEnabled)
+                                docBounds = new Rectangle(layoutBounds.X, layoutBounds.Y, Math.Max(layoutBounds.Width, doc.MinimumSize.Width), doc.LayoutBounds.Height);
+                            else
+                                docBounds = new Rectangle(layoutBounds.X, layoutBounds.Y, layoutBounds.Width, doc.LayoutBounds.Height);
+                        }
+                    }
+
+                    if (processed == visibleCount && (!_OversizeEnabled || docBounds.Width < layoutBounds.Width && m_Orientation == eOrientation.Horizontal || docBounds.Height < layoutBounds.Height && m_Orientation == eOrientation.Vertical))
+                        docBounds = layoutBounds;
+
+                    Rectangle actualDocBounds = docBounds;
+                    actualDocBounds.Offset(_ScrollPosition);
+                    doc.Layout(actualDocBounds);
+
+                    if (setSize) doc.SetLayoutBounds(actualDocBounds);
+
+                    if (contentBounds.IsEmpty)
+                        contentBounds = actualDocBounds;
+                    else
+                        contentBounds = Rectangle.Union(contentBounds, actualDocBounds);
+
+                    int splitterSize = Dpi.Width(m_SplitterSize);
+                    if (m_Orientation == eOrientation.Horizontal)
+                    {
+                        layoutBounds.Width -= (docBounds.Width + splitterSize);
+                        layoutBounds.X += (docBounds.Width + splitterSize);
+                    }
+                    else
+                    {
+                        layoutBounds.Height -= (docBounds.Height + splitterSize);
+                        layoutBounds.Y += (docBounds.Height + splitterSize);
+                    }
+                }
+            }
+
+            if (_OversizeEnabled)
+            {
+                this.SetDisplayBounds(contentBounds);
+            }
+
+            return true;
+        }
+
+        private Point _ScrollPosition = Point.Empty;
+        internal Point ScrollPosition
+        {
+            get { return _ScrollPosition; }
+            set { _ScrollPosition = value; }
+        }
+
+        /// <summary>
+        /// Gets whether document is visible or not.
+        /// </summary>
+        public override bool Visible
+        {
+            get
+            {
+
+                foreach (DocumentBaseContainer doc in m_Documents)
+                {
+                    if (doc.Visible)
+                        return true;
+                }
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// Gets the orientation of the container. Default value is Horizontal.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public eOrientation Orientation
+        {
+            get { return m_Orientation; }
+            set
+            {
+                if (m_Orientation != value)
+                {
+                    m_Orientation = value;
+                    OnOrientationChanged();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Returns collection of the documents hosted by this container.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public DocumentBaseContainerCollection Documents
+        {
+            get { return m_Documents; }
+        }
+
+        /// <summary>
+        /// Occurs when width is being set on child document.
+        /// </summary>
+        /// <param name="doc">Reference document being changed</param>
+        /// <param name="width">Width in pixels</param>
+        /// <returns>True if width was applied by parent otherwise false</returns>
+        protected internal override bool OnSetWidth(DocumentBaseContainer doc, int width)
+        {
+            bool ret = false;
+            if (m_Orientation != eOrientation.Horizontal || width < doc.MinimumSize.Width && doc.MinimumSize.Width > 0)
+                return ret;
+
+            DocumentBaseContainer pairDoc = null;
+            DocumentBaseContainer previousDoc = null;
+
+            int refIndex = m_Documents.IndexOf(doc);
+
+            // Lock in the display size if it is set
+            for (int i = 0; i < m_Documents.Count; i++)
+            {
+                DocumentBaseContainer dc = m_Documents[i];
+                if (!dc.Visible) continue;
+                if (dc.DisplayBounds.Width > 0)
+                    dc.SetLayoutBounds(dc.DisplayBounds);
+                if (i > refIndex && dc.Visible && pairDoc == null)
+                    pairDoc = dc;
+                else if (i < refIndex && dc.Visible)
+                    previousDoc = dc;
+            }
+
+            int diff = doc.LayoutBounds.Width - width;
+            if (pairDoc != null && pairDoc.LayoutBounds.Width > 0 && pairDoc.LayoutBounds.Width + diff > 0 &&
+                (pairDoc.LayoutBounds.Width + diff >= pairDoc.MinimumSize.Width || pairDoc.MinimumSize.Width == 0))
+            {
+                pairDoc.SetLayoutBounds(new Rectangle(pairDoc.LayoutBounds.X, pairDoc.LayoutBounds.Y, pairDoc.LayoutBounds.Width + diff, pairDoc.LayoutBounds.Height));
+                ret = true;
+            }
+            else if (pairDoc == null && previousDoc != null && previousDoc.LayoutBounds.Width > 0 && previousDoc.LayoutBounds.Width + diff > 0 &&
+                (previousDoc.LayoutBounds.Width + diff >= previousDoc.MinimumSize.Width || previousDoc.MinimumSize.Width == 0))
+            {
+                doc.SetLayoutBounds(new Rectangle(doc.LayoutBounds.X, doc.LayoutBounds.Y, width, doc.LayoutBounds.Height));
+                // Resetting previous document width caused problem with ever growing bar when Width of single bar is set
+                // Reason is that resetting width here will cause the new space in container to be proportionally allocated thus setting single bar width which is intent of this function never works
+                //previousDoc.SetLayoutBounds(new Rectangle(previousDoc.LayoutBounds.X, previousDoc.LayoutBounds.Y, 0, previousDoc.LayoutBounds.Height));
+                ret = true;
+            }
+
+            return ret;
+        }
+
+        /// <summary>
+        /// Occurs when height is being set on child document.
+        /// </summary>
+        /// <param name="doc">Reference document being changed</param>
+        /// <param name="height">Height in pixels</param>
+        /// <returns>True if width was applied by parent otherwise false</returns>
+        protected internal override bool OnSetHeight(DocumentBaseContainer doc, int height)
+        {
+            bool ret = false;
+            if (m_Orientation != eOrientation.Vertical || height < doc.MinimumSize.Height && doc.MinimumSize.Height > 0)
+                return ret;
+
+            DocumentBaseContainer pairDoc = null;
+            DocumentBaseContainer previousDoc = null;
+
+            int refIndex = m_Documents.IndexOf(doc);
+
+            // Lock in the display size if it is set
+            for (int i = 0; i < m_Documents.Count; i++)
+            {
+                DocumentBaseContainer dc = m_Documents[i];
+                if (!dc.Visible) continue;
+                if (dc.DisplayBounds.Height > 0)
+                    dc.SetLayoutBounds(dc.DisplayBounds);
+                if (i > refIndex && dc.Visible && pairDoc == null)
+                    pairDoc = dc;
+                else if (i < refIndex && dc.Visible)
+                    previousDoc = dc;
+            }
+
+            if (pairDoc == null) pairDoc = previousDoc;
+
+            int diff = doc.LayoutBounds.Height - height;
+            if (pairDoc != null && pairDoc.LayoutBounds.Height > 0 && pairDoc.LayoutBounds.Height + diff > 0 &&
+                (pairDoc.LayoutBounds.Height + diff >= pairDoc.MinimumSize.Height || pairDoc.MinimumSize.Height == 0))
+            {
+                pairDoc.SetLayoutBounds(new Rectangle(pairDoc.LayoutBounds.X, pairDoc.LayoutBounds.Y, pairDoc.LayoutBounds.Width, pairDoc.LayoutBounds.Height + diff));
+                ret = true;
+            }
+            else if (pairDoc == null && previousDoc != null && previousDoc.LayoutBounds.Height > 0 && previousDoc.LayoutBounds.Height + diff > 0 &&
+                (previousDoc.LayoutBounds.Height + diff >= previousDoc.MinimumSize.Height || previousDoc.MinimumSize.Height == 0))
+            {
+                doc.SetLayoutBounds(new Rectangle(doc.LayoutBounds.X, doc.LayoutBounds.Y, doc.LayoutBounds.Width, height));
+                previousDoc.SetLayoutBounds(new Rectangle(previousDoc.LayoutBounds.X, previousDoc.LayoutBounds.Y, previousDoc.LayoutBounds.Width, 0));
+                ret = true;
+            }
+            return ret;
+        }
+
+        /// <summary>
+        /// Returns the DocumentBarContainer object for a given bar.
+        /// </summary>
+        /// <param name="bar">Bar to search for.</param>
+        /// <returns>Reference to container or null if bar could not be found</returns>
+        public DocumentBarContainer GetBarDocumentContainer(Bar bar)
+        {
+            foreach (DocumentBaseContainer doc in m_Documents)
+            {
+                if (doc is DocumentBarContainer && ((DocumentBarContainer)doc).Bar == bar)
+                    return (DocumentBarContainer)doc;
+                else if (doc is DocumentDockContainer)
+                {
+                    DocumentBarContainer db = ((DocumentDockContainer)doc).GetBarDocumentContainer(bar);
+                    if (db != null) return db;
+                }
+            }
+            return null;
+        }
+
+        /// <summary>
+        /// Returns minimum size of the object.
+        /// </summary>
+        protected internal override System.Drawing.Size MinimumSize
+        {
+            get
+            {
+                return m_MinimumSize;
+            }
+        }
+
+        private void DocumentAdded(object sender, EventArgs e)
+        {
+            DocumentBaseContainer doc = sender as DocumentBaseContainer;
+            Size s = doc.MinimumSize;
+            int splitterSize = Dpi.Width(m_SplitterSize);
+            if (m_Orientation == eOrientation.Horizontal)
+            {
+                m_MinimumSize.Width += (s.Width + splitterSize);
+                if (s.Height > m_MinimumSize.Height)
+                    m_MinimumSize.Height = s.Height;
+            }
+            else
+            {
+                m_MinimumSize.Height += (s.Height + splitterSize);
+                if (s.Width > m_MinimumSize.Width)
+                    m_MinimumSize.Width = s.Width;
+            }
+        }
+
+        internal void DocumentRemoved(object sender, EventArgs e)
+        {
+            RefreshMinimumSize();
+        }
+
+        internal void RefreshMinimumSize()
+        {
+            m_MinimumSize = Size.Empty;
+            foreach (DocumentBaseContainer doc in m_Documents)
+            {
+                Size s = doc.MinimumSize;
+                int splitterSize = Dpi.Width(m_SplitterSize);
+                if (m_Orientation == eOrientation.Horizontal)
+                {
+                    m_MinimumSize.Width += (s.Width + splitterSize);
+                    if (s.Height > m_MinimumSize.Height)
+                        m_MinimumSize.Height = s.Height;
+                }
+                else
+                {
+                    m_MinimumSize.Height += (s.Height + splitterSize);
+                    if (s.Width > m_MinimumSize.Width)
+                        m_MinimumSize.Width = s.Width;
+                }
+            }
+        }
+
+        private void OnOrientationChanged()
+        {
+            ResetDocumentsLayout();
+        }
+
+        private void ResetDocumentsLayout()
+        {
+            foreach (DocumentBaseContainer doc in m_Documents)
+                doc.SetLayoutBounds(Rectangle.Empty);
+        }
+
+        /// <summary>
+        /// Gets or sets splitter size in pixels between the documents docking inside the container. Default value is 3.
+        /// </summary>
+        [Browsable(true), DefaultValue(3), Description("Indicates the splitter size between the documents docking inside the container."), Category("Layout")]
+        public virtual int SplitterSize
+        {
+            get { return m_SplitterSize; }
+            set
+            {
+                m_SplitterSize = value;
+                foreach (DocumentBaseContainer doc in m_Documents)
+                {
+                    DocumentDockContainer cont = doc as DocumentDockContainer;
+                    if (cont != null)
+                        cont.SplitterSize = value;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether the size of the documents is recorded once the layout is calculated.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool RecordDocumentSize
+        {
+            get { return m_RecordDocumentSize; }
+            set { m_RecordDocumentSize = value; }
+        }
+
+        /// <summary>
+        /// Indicates whether the container is allowed to exceed the parent control client size due to inner child windows minimum size constraints.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool OversizeEnabled
+        {
+            get { return _OversizeEnabled; }
+            set { _OversizeEnabled = value; }
+        }
+
+        internal override void UpdateScrollBounds(int xScroll, int yScroll, bool moveControls)
+        {
+            base.UpdateScrollBounds(xScroll, yScroll, moveControls);
+            foreach (DocumentBaseContainer doc in m_Documents)
+            {
+                doc.UpdateScrollBounds(xScroll, yScroll, moveControls);
+            }
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DocumentDock/DocumentDockContainerConverter.cs b/PROMS/DotNetBar Source Code/DocumentDock/DocumentDockContainerConverter.cs
new file mode 100644
index 00000000..2fc40177
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DocumentDock/DocumentDockContainerConverter.cs	
@@ -0,0 +1,60 @@
+using System;
+using System.ComponentModel;
+using System.ComponentModel.Design.Serialization;
+using System.Globalization;
+using System.Reflection;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Represents DocumentDockContainer object converter.
+	/// </summary>
+	public class DocumentDockContainerConverter:TypeConverter
+	{
+		public DocumentDockContainerConverter(){}
+
+		public override bool CanConvertTo(ITypeDescriptorContext context, Type destinationType)
+		{
+			if(destinationType==typeof(InstanceDescriptor))
+				return true;
+			return base.CanConvertTo(context, destinationType);
+		}
+
+		public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+		{
+			if(destinationType==null)
+				throw new ArgumentNullException("destinationType");
+
+			if((destinationType==typeof(InstanceDescriptor)) && (value is DocumentDockContainer))
+			{
+				DocumentDockContainer doc=(DocumentDockContainer)value;
+				Type[] constructorParams=null;
+				MemberInfo constructorMemberInfo = null;
+				object[] constructorValues = null;
+
+				if(doc.Documents.Count==0)
+				{
+					constructorParams = new Type[0];
+					constructorMemberInfo = typeof(DocumentDockContainer).GetConstructor(constructorParams);
+					constructorValues = new object[0];
+				}
+				else
+				{
+					constructorParams = new Type[2] { typeof(DocumentBaseContainer[]), typeof(eOrientation) } ;
+					constructorMemberInfo = typeof(DocumentDockContainer).GetConstructor(constructorParams);
+					DocumentBaseContainer[] documentsArray = new DocumentBaseContainer[doc.Documents.Count];
+					doc.Documents.CopyTo(documentsArray);
+					constructorValues=new object[2] {documentsArray,doc.Orientation};
+				}
+
+				if(constructorMemberInfo!=null)
+				{
+					return new InstanceDescriptor(constructorMemberInfo, constructorValues);
+				}
+			}
+
+			return base.ConvertTo(context, culture, value, destinationType);
+		}
+
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/DocumentDock/DocumentDockUIManager.cs b/PROMS/DotNetBar Source Code/DocumentDock/DocumentDockUIManager.cs
new file mode 100644
index 00000000..7ab6b84b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DocumentDock/DocumentDockUIManager.cs	
@@ -0,0 +1,1653 @@
+using System;
+using System.Windows.Forms;
+using System.Drawing;
+using System.Xml;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Represents class that manages document docking UI interaction.
+	/// </summary>
+	public class DocumentDockUIManager
+	{
+		#region Private Variables, Constructor
+		private DocumentDockContainer m_DocumentDockContainer=null;
+		private Cursor m_ContainerCursor=null;
+		private DockSite m_Container=null;
+		private Point m_MouseDownPoint=Point.Empty;
+		private bool m_ResizePreview=false;
+		private Form m_Splitter=null;
+		private DocumentDockContainer m_ResizeDockContainer=null;
+		private DocumentBaseContainer m_ResizeDocument=null;
+		private int m_SplitterWidth=3;
+		private bool m_LoadingLayout=false;
+
+		public DocumentDockUIManager(DockSite container)
+		{
+			m_Container=container;
+		}
+		#endregion
+
+		#region Properties
+		/// <summary>
+		/// Gets or sets the root document dock container object.
+		/// </summary>
+		public DocumentDockContainer RootDocumentDockContainer
+		{
+			get {return m_DocumentDockContainer;}
+			set {m_DocumentDockContainer=value;}
+		}
+
+        /// <summary>
+        /// Gets or sets the splitter width used for mouse hit-testing.
+        /// </summary>
+        public int SplitterWidth
+        {
+            get
+            {
+                return m_SplitterWidth;
+            }
+            set
+            {
+                m_SplitterWidth = value;
+            }
+        }
+
+		/// <summary>
+		/// Gets or sets the container of the document. 
+		/// </summary>
+		public DockSite Container
+		{
+			get {return m_Container;}
+			set {m_Container=value;}
+		}
+		#endregion
+
+		#region Methods
+		/// <summary>
+		/// Estimates the docking position and size of a given bar for outline purposes during drag&drop
+		/// </summary>
+		/// <param name="bar">Bar to find estimated docking position and size for</param>
+		/// <param name="pDockInfo">Docking information</param>
+		/// <returns>Preview Rectangle in screen coordinates.</returns>
+		internal Rectangle GetDockPreviewRectangle(Bar bar, ref DockSiteInfo dockInfo)
+		{
+			DocumentBaseContainer referenceDoc=GetDocumentFromBar(dockInfo.MouseOverBar);
+			Rectangle r=Rectangle .Empty;
+
+            // Handle edge case docking first
+            if (m_Container.Dock!= DockStyle.Fill && (dockInfo.DockLine == 999 || dockInfo.DockLine == -1))
+            {
+                return GetEdgeDockPreviewRectangle(bar, ref dockInfo);
+            }
+			else if(referenceDoc!=null)
+			{
+				if(dockInfo.MouseOverDockSide==eDockSide.Left)
+				{
+					r=referenceDoc.DisplayBounds;
+					r.Width=r.Width/2;
+				}
+				else if(dockInfo.MouseOverDockSide==eDockSide.Right)
+				{
+					r=referenceDoc.DisplayBounds;
+					r.X+=r.Width/2;
+					r.Width=r.Width/2;
+				}
+				else if(dockInfo.MouseOverDockSide==eDockSide.Top)
+				{
+					r=referenceDoc.DisplayBounds;
+					r.Height=r.Height/2;
+				}
+				else if(dockInfo.MouseOverDockSide==eDockSide.Bottom)
+				{
+					r=referenceDoc.DisplayBounds;
+					r.Y+=r.Height/2;
+					r.Height=r.Height/2;
+				}
+				else if(dockInfo.MouseOverDockSide==eDockSide.Document)
+				{
+					r=referenceDoc.DisplayBounds;
+				}
+				r.Location=m_Container.PointToScreen(r.Location);
+			}
+			else
+			{
+                if (m_Container.Dock == DockStyle.Fill)
+                {
+                    r = m_Container.ClientRectangle;
+                    r.Location = m_Container.PointToScreen(r.Location);
+                }
+                else if (m_Container.Dock == DockStyle.Right)
+                {
+                    r = m_Container.ClientRectangle;
+                    r.Location = m_Container.PointToScreen(r.Location);
+                    if (r.Width == 0)
+                    {
+                        r.Width = bar.GetBarDockedSize(eOrientation.Vertical);
+                        r.X -= r.Width;
+                    }
+                }
+                else if (m_Container.Dock == DockStyle.Left)
+                {
+                    r = m_Container.ClientRectangle;
+                    r.Location = m_Container.PointToScreen(r.Location);
+                    if (r.Width == 0)
+                    {
+                        r.Width = bar.GetBarDockedSize(eOrientation.Vertical);
+                    }
+                }
+                else if (m_Container.Dock == DockStyle.Top)
+                {
+                    r = m_Container.ClientRectangle;
+                    r.Location = m_Container.PointToScreen(r.Location);
+                    if (r.Height == 0)
+                    {
+                        r.Height = bar.GetBarDockedSize(eOrientation.Horizontal);
+                    }
+                }
+                else if (m_Container.Dock == DockStyle.Bottom)
+                {
+                    r = m_Container.ClientRectangle;
+                    r.Location = m_Container.PointToScreen(r.Location);
+                    if (r.Height == 0)
+                    {
+                        r.Height = bar.GetBarDockedSize(eOrientation.Horizontal);
+                        r.Y -= r.Height;
+                    }
+                }
+			}
+
+			return r;
+		}
+
+        private Rectangle GetEdgeDockPreviewRectangle(Bar bar, ref DockSiteInfo dockInfo)
+        {
+            Rectangle r = Rectangle.Empty;
+            int fullSizeIndex = -1;
+            int partialSizeIndex = -1;
+            if (dockInfo.FullSizeDock)
+                fullSizeIndex = m_Container.GetFullSizeIndex();
+            else if (dockInfo.PartialSizeDock)
+                partialSizeIndex = m_Container.GetPartialSizeIndex();
+
+            // Docks the bar to the edge
+            switch (m_Container.Dock)
+            {
+                case DockStyle.Top:
+                    {
+                        r.Width = m_Container.ClientRectangle.Width;
+                        r.Height = bar.GetBarDockedSize(eOrientation.Horizontal);
+
+                        if (fullSizeIndex >= 0)
+                        {
+                            r.Width += m_Container.GetSiteZOrderSize(m_Container.Owner.LeftDockSite, true).Width;
+                            r.Width += m_Container.GetSiteZOrderSize(m_Container.Owner.RightDockSite, true).Width;
+                            dockInfo.DockSiteZOrderIndex = fullSizeIndex;
+                        }
+                        else if (partialSizeIndex >= 0)
+                        {
+                            // Reduce by the size of the left and right dock site
+                            r.Width -= m_Container.GetSiteZOrderSize(m_Container.Owner.LeftDockSite, false).Width;
+                            r.Width -= m_Container.GetSiteZOrderSize(m_Container.Owner.RightDockSite, false).Width;
+                            dockInfo.DockSiteZOrderIndex = partialSizeIndex;
+
+                        }
+
+                        Point p = Point.Empty;
+                        if (dockInfo.DockLine == -1)
+                        {
+                            p = m_Container.PointToScreen(m_Container.ClientRectangle.Location);
+                        }
+                        else
+                        {
+                            p = m_Container.PointToScreen(new Point(m_Container.ClientRectangle.X, m_Container.ClientRectangle.Bottom));
+                            p.Y++;
+                        }
+                        if (fullSizeIndex >= 0)
+                            p.X -= m_Container.GetSiteZOrderSize(m_Container.Owner.LeftDockSite, true).Width;
+                        else if (partialSizeIndex >= 0)
+                            p.X += m_Container.GetSiteZOrderSize(m_Container.Owner.LeftDockSite, false).Width;
+                        r.Location = p;
+                        break;
+                    }
+                case DockStyle.Bottom:
+                    {
+                        r.Width = m_Container.ClientRectangle.Width;
+                        r.Height = bar.GetBarDockedSize(eOrientation.Horizontal);
+                        if (fullSizeIndex >= 0)
+                        {
+                            r.Width += m_Container.GetSiteZOrderSize(m_Container.Owner.LeftDockSite, true).Width;
+                            r.Width += m_Container.GetSiteZOrderSize(m_Container.Owner.RightDockSite, true).Width;
+                            dockInfo.DockSiteZOrderIndex = fullSizeIndex;
+                        }
+                        else if (partialSizeIndex >= 0)
+                        {
+                            // Reduce by the size of the left and right dock site
+                            r.Width -= m_Container.GetSiteZOrderSize(m_Container.Owner.LeftDockSite, false).Width;
+                            r.Width -= m_Container.GetSiteZOrderSize(m_Container.Owner.RightDockSite, false).Width;
+                            dockInfo.DockSiteZOrderIndex = partialSizeIndex;
+
+                        }
+
+                        Point p = Point.Empty;
+                        if (dockInfo.DockLine == -1)
+                        {
+                            p = m_Container.PointToScreen(new Point(m_Container.ClientRectangle.X, m_Container.ClientRectangle.Y - r.Height));
+                        }
+                        else
+                        {
+                            p = m_Container.PointToScreen(new Point(m_Container.ClientRectangle.X, m_Container.ClientRectangle.Bottom - r.Height));
+                            p.Y++;
+                        }
+                        if (fullSizeIndex >= 0)
+                            p.X -= m_Container.GetSiteZOrderSize(m_Container.Owner.LeftDockSite, true).Width;
+                        else if (partialSizeIndex >= 0)
+                            p.X += m_Container.GetSiteZOrderSize(m_Container.Owner.LeftDockSite, false).Width;
+                        r.Location = p;
+                        break;
+                    }
+                case DockStyle.Right:
+                    {
+                        r.Height = m_Container.ClientRectangle.Height;
+
+                        if (fullSizeIndex >= 0)
+                        {
+                            r.Height += m_Container.GetSiteZOrderSize(m_Container.Owner.TopDockSite, true).Height;
+                            r.Height += m_Container.GetSiteZOrderSize(m_Container.Owner.BottomDockSite, true).Height;
+                            dockInfo.DockSiteZOrderIndex = fullSizeIndex;
+                        }
+                        else if (partialSizeIndex >= 0)
+                        {
+                            // Reduce by the size of the top and bottom dock site
+                            r.Height -= m_Container.GetSiteZOrderSize(m_Container.Owner.TopDockSite, false).Height;
+                            r.Height -= m_Container.GetSiteZOrderSize(m_Container.Owner.BottomDockSite, false).Height;
+                            dockInfo.DockSiteZOrderIndex = partialSizeIndex;
+
+                        }
+
+                        r.Width = bar.GetBarDockedSize(eOrientation.Vertical);
+                        Point p = Point.Empty;
+                        if (dockInfo.DockLine == -1)
+                        {
+                            p = m_Container.PointToScreen(new Point(m_Container.ClientRectangle.X - r.Width, m_Container.ClientRectangle.Y));
+                        }
+                        else
+                        {
+                            p = m_Container.PointToScreen(new Point(m_Container.ClientRectangle.Right - r.Width, m_Container.ClientRectangle.Y));
+                            p.X--;
+                        }
+                        if (fullSizeIndex >= 0)
+                            p.Y -= m_Container.GetSiteZOrderSize(m_Container.Owner.TopDockSite, true).Height;
+                        else if (partialSizeIndex >= 0)
+                            p.Y += m_Container.GetSiteZOrderSize(m_Container.Owner.TopDockSite, false).Height;
+                        r.Location = p;
+                        break;
+                    }
+                default:
+                    {
+                        r.Height = m_Container.ClientRectangle.Height;
+                        if (fullSizeIndex >= 0)
+                        {
+                            r.Height += m_Container.GetSiteZOrderSize(m_Container.Owner.TopDockSite, true).Height;
+                            r.Height += m_Container.GetSiteZOrderSize(m_Container.Owner.BottomDockSite, true).Height;
+                            dockInfo.DockSiteZOrderIndex = fullSizeIndex;
+                        }
+                        else if (partialSizeIndex >= 0)
+                        {
+                            // Reduce by the size of the top and bottom dock site
+                            r.Height -= m_Container.GetSiteZOrderSize(m_Container.Owner.TopDockSite, false).Height;
+                            r.Height -= m_Container.GetSiteZOrderSize(m_Container.Owner.BottomDockSite, false).Height;
+                            dockInfo.DockSiteZOrderIndex = partialSizeIndex;
+
+                        }
+                        r.Width = bar.GetBarDockedSize(eOrientation.Vertical);
+
+                        Point p = Point.Empty;
+                        if (dockInfo.DockLine == -1)
+                        {
+                            p = m_Container.PointToScreen(new Point(m_Container.ClientRectangle.X, m_Container.ClientRectangle.Y));
+                        }
+                        else
+                        {
+                            p = m_Container.PointToScreen(new Point(m_Container.ClientRectangle.Right, m_Container.ClientRectangle.Y));
+                            p.X++;
+                        }
+                        if (fullSizeIndex >= 0)
+                            p.Y -= m_Container.GetSiteZOrderSize(m_Container.Owner.TopDockSite, true).Height;
+                        else if (partialSizeIndex >= 0)
+                            p.Y += m_Container.GetSiteZOrderSize(m_Container.Owner.TopDockSite, false).Height;
+                        r.Location = p;
+                        break;
+                    }
+            }
+
+            return r;
+        }
+
+		/// <summary>
+		/// Returns DocumentBaseContainer that holds the reference bar.
+		/// </summary>
+		/// <param name="bar">Bar to return document container for.</param>
+		/// <returns>Returns null if document container cannot  be found or reference to the document container.</returns>
+		public DocumentBaseContainer GetDocumentFromBar(Bar bar)
+		{
+			if(bar==null)
+				return null;
+			return GetDocumentFromBar(bar,m_DocumentDockContainer);
+		}
+
+		private DocumentBaseContainer GetDocumentFromBar(Bar bar, DocumentDockContainer dockContainer)
+		{
+			foreach(DocumentBaseContainer doc in dockContainer.Documents)
+			{
+				if(doc is DocumentBarContainer && ((DocumentBarContainer)doc).Bar==bar)
+					return doc;
+				else if(doc is DocumentDockContainer)
+				{
+					DocumentBaseContainer d=GetDocumentFromBar(bar,doc as DocumentDockContainer);
+					if(d!=null)
+						return d;
+				}
+			}
+			return null;
+		}
+
+        private bool IsAddedInFront(eDockSide dockSide)
+        {
+            if (m_Container.Dock == DockStyle.Left && dockSide == eDockSide.Left ||
+                m_Container.Dock == DockStyle.Right && dockSide == eDockSide.Left ||
+                m_Container.Dock == DockStyle.Top && dockSide== eDockSide.Top || 
+                m_Container.Dock == DockStyle.Bottom && dockSide == eDockSide.Top)
+                return true;
+
+            return false;
+        }
+
+		/// <summary>
+		/// Docks specified bar by appending it to the container. Bar will be added according to the container's orientation.
+		/// </summary>
+		/// <param name="barToDock">Bar to dock.</param>
+		public void Dock(Bar barToDock)
+		{
+			Dock(null,barToDock,eDockSide.None);
+		}
+
+        /// <summary>
+        /// Docks specified bar by appending it to the container. Bar will be added according to the container's orientation.
+        /// </summary>
+        /// <param name="barToDock">Bar to dock.</param>
+        /// <param name="dockSide">Side to dock bar at.</param>
+		public void Dock(Bar referenceBar, Bar barToDock, eDockSide dockSide)
+		{
+			if(dockSide==eDockSide.None && barToDock.Parent==m_Container)
+			{
+				ApplyBarStyle(barToDock);
+				return;
+			}
+
+			if(barToDock.Parent is DockSite && ((DockSite)barToDock.Parent).DocumentDockContainer!=null)
+				((DockSite)barToDock.Parent).GetDocumentUIManager().UnDock(barToDock);
+			else if(barToDock.Parent is DockSite && barToDock.Parent!=m_Container)
+				((DockSite)barToDock.Parent).RemoveBar(barToDock);
+            else if (barToDock.Parent != null && barToDock.Parent != m_Container)
+            {
+                if (barToDock.Parent is FloatingContainer)
+                {
+                    barToDock.RemoveFromFloatingContainer();
+                    barToDock.SetBarState(eBarState.Docked);
+                }
+                else
+                    barToDock.Parent.Controls.Remove(barToDock);
+            }
+
+			if(!m_LoadingLayout)
+			{
+				// TODO: Add Docking as Document, i.e. add DockContainerItems from barToDock...
+				DocumentBarContainer doc=this.CreateDocumentBarContainer(barToDock);
+                DocumentBaseContainer referenceDoc = this.GetDocumentFromBar(referenceBar);
+
+                if (referenceBar == null || dockSide == eDockSide.None || referenceBar == barToDock || referenceDoc == null)
+				{
+                    if (m_Container.Dock == DockStyle.Fill)
+                        m_DocumentDockContainer.Documents.Add(doc);
+                    else
+                    {
+                        eOrientation containerOrientation = eOrientation.Horizontal; // Needed container orientation
+                        if (m_Container.Dock == DockStyle.Top || m_Container.Dock == DockStyle.Bottom)
+                            containerOrientation = eOrientation.Vertical;
+
+                        // Switch orientation when adding new bar if possible
+                        if (m_DocumentDockContainer.Orientation != containerOrientation)
+                        {
+                            if (m_DocumentDockContainer.Documents.Count <= 1)
+                            {
+                                m_DocumentDockContainer.Orientation = containerOrientation;
+                                if (IsAddedInFront(dockSide))
+                                    m_DocumentDockContainer.Documents.Insert(0, doc);
+                                else
+                                    m_DocumentDockContainer.Documents.Add(doc);
+                            }
+                            else
+                            {
+                                DocumentBaseContainer[] docs = new DocumentBaseContainer[m_DocumentDockContainer.Documents.Count];
+                                m_DocumentDockContainer.Documents.CopyTo(docs);
+                                m_DocumentDockContainer.Documents.Clear();
+
+                                DocumentDockContainer newParent = new DocumentDockContainer(docs, m_DocumentDockContainer.Orientation);
+								newParent.SetLayoutBounds(m_DocumentDockContainer.DisplayBounds);
+                                m_DocumentDockContainer.Orientation = containerOrientation;
+                                m_DocumentDockContainer.Documents.Add(newParent);
+                                if (IsAddedInFront(dockSide))
+                                    m_DocumentDockContainer.Documents.Insert(0, doc);
+                                else
+                                    m_DocumentDockContainer.Documents.Add(doc);
+                            }
+                        }
+                        else
+                        {
+                            if (IsAddedInFront(dockSide))
+                                m_DocumentDockContainer.Documents.Insert(0, doc);
+                            else
+                                m_DocumentDockContainer.Documents.Add(doc);
+                        }
+                    }
+				}
+				else
+				{
+					DocumentDockContainer parent=referenceDoc.Parent as DocumentDockContainer;
+
+					referenceDoc.SetLayoutBounds(Rectangle.Empty);
+					doc.SetLayoutBounds(Rectangle.Empty);
+
+					if((parent.Orientation==eOrientation.Horizontal && (dockSide==eDockSide.Left || dockSide==eDockSide.Right)) ||
+						(parent.Orientation==eOrientation.Vertical && (dockSide==eDockSide.Top || dockSide==eDockSide.Bottom)))
+					{
+						if(dockSide==eDockSide.Right || dockSide==eDockSide.Bottom)
+							parent.Documents.Insert(parent.Documents.IndexOf(referenceDoc)+1,doc);
+						else
+							parent.Documents.Insert(parent.Documents.IndexOf(referenceDoc),doc);
+					}
+					else if(parent.Documents.Count==1)
+					{
+						// Orientation of the parent dock container can be changed
+						if(parent.Orientation==eOrientation.Vertical)
+							parent.Orientation=eOrientation.Horizontal;
+						else
+							parent.Orientation=eOrientation.Vertical;
+
+						if(dockSide==eDockSide.Right || dockSide==eDockSide.Bottom)
+							parent.Documents.Insert(parent.Documents.IndexOf(referenceDoc)+1,doc);
+						else
+							parent.Documents.Insert(parent.Documents.IndexOf(referenceDoc),doc);
+					}
+					else
+					{
+						// New DocumentDockContainer needs to be inserted with appropriate orientation and referenceBar needs
+						// to be moved into it.
+						DocumentDockContainer newParent=new DocumentDockContainer();
+						if(parent.Orientation==eOrientation.Horizontal)
+							newParent.Orientation=eOrientation.Vertical;
+						else
+							newParent.Orientation=eOrientation.Horizontal;
+
+						parent.Documents.Insert(parent.Documents.IndexOf(referenceDoc),newParent);
+						parent.Documents.Remove(referenceDoc);
+	                    
+						if(dockSide==eDockSide.Right || dockSide==eDockSide.Bottom)
+						{
+							newParent.Documents.Add(referenceDoc);
+							newParent.Documents.Add(doc);
+						}
+						else
+						{
+							newParent.Documents.Add(doc);
+							newParent.Documents.Add(referenceDoc);
+						}
+					}
+				}
+
+                AdjustContainerSize(barToDock, false);
+			}
+
+			if(m_Container!=null)
+			{
+				if(barToDock.Parent==null)
+					m_Container.Controls.Add(barToDock);
+                ApplyBarStyle(barToDock);	
+				m_Container.RecalcLayout();
+			}
+			else
+				ApplyBarStyle(barToDock);
+		}
+
+        /// <summary>
+        /// Adjusts the size of the dock container if needed after a bar has been docked to it.
+        /// </summary>
+        /// <param name="barToDock">Bar object that has been docked.</param>
+        /// <param name="visibleChanged">Indicates that bar was already docked but its Visible property has changed</param>
+        internal void AdjustContainerSize(Bar barToDock, bool visibleChanged)
+        {
+            if (m_Container.Owner != null && m_Container.Owner.IsLoadingLayout) return;
+
+            // Adjust the size of the container since it dictates the size of the bars docked inside
+            if (m_Container.Dock != DockStyle.Fill)
+            {
+                DocumentBaseContainer doc = this.GetDocumentFromBar(barToDock);
+                if (doc == null) return;
+                if (m_Container.Dock == DockStyle.Left || m_Container.Dock == DockStyle.Right)
+                {
+                    if (m_Container.Width == 0 || doc.Parent == m_DocumentDockContainer &&
+                        (m_DocumentDockContainer.Orientation == eOrientation.Horizontal || visibleChanged && m_DocumentDockContainer.Documents.Count == 1))
+                    {
+                        int width = barToDock.GetBarDockedSize(eOrientation.Vertical);
+                        if (barToDock.Width > 0 && barToDock.Width<m_Container.Width) width = barToDock.Width;
+                        int clientWidth = GetClientWidth();
+
+                        if (barToDock.Visible)
+                        {
+                            if (width > clientWidth)
+                                width = barToDock.MinimumDockSize(eOrientation.Vertical).Width * 2;
+                            if (width > clientWidth)
+                                width = barToDock.MinimumDockSize(eOrientation.Vertical).Width;
+                        }
+                        
+						if(doc.LayoutBounds.Width == 0)
+							doc.SetLayoutBounds(new Rectangle(doc.LayoutBounds.X, doc.LayoutBounds.Y, width, doc.LayoutBounds.Height));
+                        width += Dpi.Width(m_DocumentDockContainer.SplitterSize);
+                        if (visibleChanged)
+                        {
+                            if(barToDock.Visible)
+                                m_Container.Width += width;
+                            else if(m_Container.Width>0)
+                                m_Container.Width -= Math.Min(width, m_Container.Width);
+                        }
+                        else
+                            m_Container.Width += width;
+                        m_Container.Invalidate();
+                    }
+                }
+                else if (m_Container.Dock == DockStyle.Top || m_Container.Dock == DockStyle.Bottom)
+                {
+                    if (m_Container.Height == 0 || doc.Parent == m_DocumentDockContainer &&
+                        (m_DocumentDockContainer.Orientation == eOrientation.Vertical || visibleChanged && m_DocumentDockContainer.Documents.Count == 1))
+                    {
+                        int height = barToDock.GetBarDockedSize(eOrientation.Horizontal);
+                        if (barToDock.Height > 0 && barToDock.Height<m_Container.Height) height = barToDock.Height;
+                        int clientHeight = GetClientHeight();
+
+                        if (barToDock.Visible)
+                        {
+                            if (height > clientHeight)
+                                height = barToDock.MinimumDockSize(eOrientation.Horizontal).Height * 2;
+                            if (height > clientHeight)
+                                height = barToDock.MinimumDockSize(eOrientation.Horizontal).Height;
+                        }
+                        
+						if(doc.LayoutBounds.Height == 0)
+							doc.SetLayoutBounds(new Rectangle(doc.LayoutBounds.X, doc.LayoutBounds.Y, doc.LayoutBounds.Width, height));
+                        height += Dpi.Width(m_DocumentDockContainer.SplitterSize);
+                        if (visibleChanged)
+                        {
+                            if (barToDock.Visible)
+                                m_Container.Height += height;
+                            else if (m_Container.Height > 0)
+                                m_Container.Height -= Math.Min(height, m_Container.Height);
+                        }
+                        else
+                            m_Container.Height += height;
+                        m_Container.Invalidate();
+                    }
+                }
+            }
+        }
+
+        private int GetClientWidth()
+        {
+            if (m_Container == null)
+                return 0;
+
+            return m_Container.GetClientWidth();
+        }
+
+        private int GetClientHeight()
+        {
+            if (m_Container == null)
+                return 0;
+            return m_Container.GetClientHeight();
+        }
+
+		public void UnDock(Bar barToUnDock)
+		{
+			UnDock(barToUnDock,true);
+		}
+
+        internal void SaveLastDockInfo(Bar bar, DocumentBarContainer doc, DockSiteInfo info)
+        {
+            if (bar.m_LastDockSiteInfo == null) return;
+            //bar.m_LastDockSiteInfo.LastRelativeDockToBar = null;
+            //bar.m_LastDockSiteInfo.LastRelativeDocumentId = -1;
+            // Tries to find relative dock-to-bar so un-docked bar can be returned back
+            if (!(doc.Parent is DocumentDockContainer)) return;
+            DocumentDockContainer dockParent = (DocumentDockContainer)doc.Parent;
+            DocumentBaseContainer nextBarDocument = GetNextDocument(dockParent, dockParent.Documents.IndexOf(doc));
+            if (nextBarDocument == null)
+            {
+                DocumentBaseContainer prevBarDocument = GetPreviousDocument(dockParent, dockParent.Documents.IndexOf(doc));
+                if (prevBarDocument != null)
+                {
+                    Bar prevBar = null;
+                    if (prevBarDocument is DocumentBarContainer)
+                    {
+                        prevBar = ((DocumentBarContainer)prevBarDocument).Bar;
+                        bar.m_LastDockSiteInfo.LastRelativeDockToBar = prevBar;
+                        prevBar.m_LastDockSiteInfo.LastRelativeDockToBar = bar;
+                        prevBar.m_LastDockSiteInfo.LastRelativeDocumentId = doc.Id;
+                    }
+                    bar.m_LastDockSiteInfo.LastRelativeDocumentId = prevBarDocument.Id;
+                    if (dockParent.Orientation == eOrientation.Horizontal)
+                    {
+                        bar.LastDockSide = eDockSide.Right;
+                        if (prevBar != null) prevBar.LastDockSide = eDockSide.Left;
+                    }
+                    else
+                    {
+                        bar.LastDockSide = eDockSide.Bottom;
+                        if (prevBar != null) prevBar.LastDockSide = eDockSide.Top;
+                    }
+                }
+            }
+            else
+            {
+                Bar nextBar = null;
+                if (nextBarDocument is DocumentBarContainer)
+                {
+                    nextBar = ((DocumentBarContainer)nextBarDocument).Bar;
+                    bar.m_LastDockSiteInfo.LastRelativeDockToBar = nextBar;
+                    nextBar.m_LastDockSiteInfo.LastRelativeDockToBar = bar;
+                    nextBar.m_LastDockSiteInfo.LastRelativeDocumentId = doc.Id;
+                }
+                bar.m_LastDockSiteInfo.LastRelativeDocumentId = nextBarDocument.Id;
+                if (dockParent.Orientation == eOrientation.Horizontal)
+                {
+                    bar.LastDockSide = eDockSide.Left;
+                    if (nextBar != null) nextBar.LastDockSide = eDockSide.Right;
+                }
+                else
+                {
+                    bar.LastDockSide = eDockSide.Top;
+                    if (nextBar != null) nextBar.LastDockSide = eDockSide.Bottom;
+                }
+            }
+            if (GetDockSide(bar) != eDockSide.None)
+                bar.m_LastDockSiteInfo.LastDockSiteSide = GetDockSide(bar);
+        }
+
+        private eDockSide GetDockSide(Bar bar)
+        {
+            if (bar.Parent == null)
+                return eDockSide.None;
+            else if (bar.Parent.Dock == DockStyle.Left)
+                return eDockSide.Left;
+            else if (bar.Parent.Dock == DockStyle.Right)
+                return eDockSide.Right;
+            else if (bar.Parent.Dock == DockStyle.Top)
+                return eDockSide.Top;
+            else if (bar.Parent.Dock == DockStyle.Bottom)
+                return eDockSide.Bottom;
+            else if (bar.Parent.Dock == DockStyle.Fill)
+                return eDockSide.Document;
+            return eDockSide.None;
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+		public void UnDock(Bar barToUnDock, bool removeFromContainer)
+		{
+			DocumentBarContainer doc=m_DocumentDockContainer.GetBarDocumentContainer(barToUnDock);
+
+            if (barToUnDock.DockSide != eDockSide.None) barToUnDock.LastDockSide = barToUnDock.DockSide;
+            if (doc != null)
+                SaveLastDockInfo(barToUnDock, doc, barToUnDock.m_LastDockSiteInfo);
+            
+            int containerSizeReduction = 0;
+            // Calculate the size reduction of container if needed
+            if (doc != null && m_Container != null && m_Container.Dock != DockStyle.Fill)
+            {
+                if (m_Container.Dock == DockStyle.Left || m_Container.Dock == DockStyle.Right)
+                {
+                    if (doc.Parent != null && doc.Parent == m_DocumentDockContainer && m_DocumentDockContainer.Orientation == eOrientation.Horizontal)
+                        containerSizeReduction = barToUnDock.Width + Dpi.Width(m_DocumentDockContainer.SplitterSize);
+                }
+                else if (m_Container.Dock == DockStyle.Top || m_Container.Dock == DockStyle.Bottom)
+                {
+                    if (doc.Parent != null && doc.Parent == m_DocumentDockContainer && m_DocumentDockContainer.Orientation == eOrientation.Vertical)
+                        containerSizeReduction = barToUnDock.Height + Dpi.Width(m_DocumentDockContainer.SplitterSize);
+                }
+            }
+
+            if(doc==null)
+            {
+                if (removeFromContainer && barToUnDock.Parent == m_Container)
+                    m_Container.Controls.Remove(barToUnDock);
+				RestoreBarStyle(barToUnDock);
+                return;
+            }
+			
+			DocumentDockContainer parent=doc.Parent as DocumentDockContainer;
+			if(parent!=null)
+			{
+				parent.Documents.Remove(doc);
+				if(parent!=m_DocumentDockContainer)
+					RemoveEmptyContainers(parent);
+				else if(parent.Documents.Count==1 && parent.Documents[0] is DocumentDockContainer)
+					RemoveEmptyContainers(parent.Documents[0] as DocumentDockContainer);
+			}
+
+			if(m_Container!=null)
+			{
+				if(removeFromContainer)
+					m_Container.Controls.Remove(barToUnDock);
+				RestoreBarStyle(barToUnDock);
+                bool isLoadingLayout = false;
+                if (m_Container.Owner != null) isLoadingLayout = m_Container.Owner.IsLoadingLayout;
+                if (!isLoadingLayout && !m_Container.IsAnyControlVisible)
+                {
+                    if (m_Container.Dock == DockStyle.Left || m_Container.Dock == DockStyle.Right)
+                        m_Container.Width = 0;
+                    else if (m_Container.Dock == DockStyle.Top || m_Container.Dock == DockStyle.Bottom)
+                        m_Container.Height = 0;
+                }
+                else if (!isLoadingLayout && containerSizeReduction != 0)
+                {
+                    if (m_Container.Dock == DockStyle.Left || m_Container.Dock == DockStyle.Right)
+                        m_Container.Width -= containerSizeReduction;
+                    else if (m_Container.Dock == DockStyle.Top || m_Container.Dock == DockStyle.Bottom)
+                        m_Container.Height -= containerSizeReduction;
+                }
+                else
+                    m_Container.RecalcLayout();
+			}
+			else
+				RestoreBarStyle(barToUnDock);
+		}
+
+		private void RemoveEmptyContainers(DocumentDockContainer parent)
+		{
+			while(parent.Documents.Count==0 && parent.Parent!=null && parent.Parent is DocumentDockContainer ||
+				parent.Parent!=null && parent.Parent is DocumentDockContainer && (((DocumentDockContainer)parent.Parent).Documents.Count==1 ||
+                   parent.Documents.Count == 1))
+			{
+				if(parent.Parent!=null && parent.Parent is DocumentDockContainer && ((DocumentDockContainer)parent.Parent).Documents.Count==1)
+				{
+					// Removes the instances where DocumentDockContainer hosts another one and only one DocumentDockContainer object
+					DocumentDockContainer p=parent.Parent as DocumentDockContainer;
+                    p.Orientation = parent.Orientation;
+                    p.Documents.Remove(parent);
+					DocumentBaseContainer[] documents=new DocumentBaseContainer[parent.Documents.Count];
+					parent.Documents.CopyTo(documents);
+					p.Documents.AddRange(documents);
+					parent=p;
+				}
+                else if (parent.Parent != null && parent.Parent is DocumentDockContainer && parent.Documents.Count == 1)
+                {
+                    DocumentDockContainer p = parent.Parent as DocumentDockContainer;
+                    int index = p.Documents.IndexOf(parent);
+                    p.Documents.Remove(parent);
+                    DocumentBaseContainer document = parent.Documents[0];
+                    p.Documents.Insert(index, document);
+                    parent = p;
+                }
+				else
+				{
+					DocumentDockContainer p=parent.Parent as DocumentDockContainer;
+					p.Documents.Remove(parent);
+					parent=p;
+				}
+			}
+		}
+
+		private void ApplyBarStyle(Bar bar)
+		{
+			if(m_Container!=null && m_Container.Owner!=null && m_Container.Owner.ApplyDocumentBarStyle && m_Container.Dock == DockStyle.Fill)
+			{
+				BarFunctions.ApplyAutoDocumentBarStyle(bar);
+			}
+		}
+
+		private void RestoreBarStyle(Bar bar)
+		{
+            if (m_Container != null && m_Container.Owner != null && m_Container.Owner.ApplyDocumentBarStyle && m_Container.Dock == DockStyle.Fill)
+			{
+				BarFunctions.RestoreAutoDocumentBarStyle(bar);
+			}
+		}
+
+		private DocumentBarContainer CreateDocumentBarContainer(Bar bar)
+		{
+			DocumentBarContainer doc=new DocumentBarContainer(bar);
+			return doc;
+		}
+
+		private DocumentDockContainer CreateDocumentDockContainer()
+		{
+			DocumentDockContainer dock=new DocumentDockContainer();
+			return dock;
+		}
+
+		#endregion
+
+		#region Mouse Resize Handling
+        /// <summary>
+        /// Gets whether document/bar is being resized.
+        /// </summary>
+        public bool IsResizingDocument
+        {
+            get
+            {
+                return (m_ResizeDocument != null);
+            }
+        }
+		/// <summary>
+		/// Processes OnMouseMove events from DockSite. This routine assumes that mouse messages are received only when mouse is actually over
+		/// the dock site and not containing bars. This is significant because it will receive messages only if mouse is over the splitter
+		/// space between bars.
+		/// </summary>
+		/// <param name="e">Mouse event arguments.</param>
+		public void OnMouseMove(MouseEventArgs e)
+		{
+			int x=e.X,y=e.Y;
+			if(e.Button==MouseButtons.None)
+			{
+				Cursor c=this.GetCursor(x,y);
+				if(c==null)
+				{
+					if(m_ContainerCursor!=null)
+						this.Container.Cursor=m_ContainerCursor;
+					m_ContainerCursor=null;
+				}
+				else
+				{
+					if(m_ContainerCursor==null)
+						m_ContainerCursor=this.Container.Cursor;
+					this.Container.Cursor=c;
+				}
+			}
+			else if(e.Button==MouseButtons.Left)
+			{
+				Point p=GetResizeToPoint(x,y);
+				if(p.IsEmpty)
+					return;
+
+				if(!m_ResizePreview)
+					SplitterMouseMove(p.X,p.Y);
+				else
+				{
+					ResizeTo(p.X,p.Y);
+					m_MouseDownPoint=p;
+				}
+			}
+		}
+        [EditorBrowsable(EditorBrowsableState.Never)]
+		public Cursor GetCursor(int x, int y)
+		{
+			Cursor c=null;
+			DocumentDockContainer context=this.GetContainerFromRoot(x,y);
+			if(context!=null)
+			{
+				if(context.Orientation==eOrientation.Horizontal)
+					c=Cursors.VSplit;
+				else if(context.Orientation==eOrientation.Vertical)
+					c=Cursors.HSplit;
+			}
+            else if (m_Container != null && m_Container.Dock != DockStyle.Fill)
+            {
+                if(m_Container.Dock == DockStyle.Top || m_Container.Dock == DockStyle.Bottom)
+                    c = Cursors.HSplit;
+                else if (m_Container.Dock == DockStyle.Left || m_Container.Dock == DockStyle.Right)
+                    c = Cursors.VSplit;
+            }
+
+			return c;
+		}
+
+		public void OnMouseDown(MouseEventArgs e)
+		{
+			int x=e.X, y=e.Y;
+			if(e.Button==MouseButtons.Left)
+			{
+				m_MouseDownPoint=new Point(x,y);
+				DocumentDockContainer context=this.GetContainerFromRoot(x,y);
+                
+                if(context!=null)
+				{
+					m_ResizeDocument=this.GetClosestDocument(context,x,y);
+					if(m_ResizeDocument==null)
+						return;
+					m_ResizeDockContainer=context;
+					if(!m_ResizePreview)
+					{
+						CreateSplitter();
+						SplitterMouseMove(x,y);
+					}
+				}
+                else if (m_Container != null && m_Container.Dock != DockStyle.Fill)
+                {
+                    m_ResizeDockContainer = m_DocumentDockContainer;
+                    if (!m_ResizePreview)
+                    {
+                        CreateSplitter();
+                        SplitterMouseMove(x, y);
+                    }
+                }
+			}
+		}
+
+		public void OnMouseUp(MouseEventArgs e)
+		{
+			if(m_ResizeDockContainer!=null && !m_MouseDownPoint.IsEmpty)
+			{
+				ResizeTo(e.X,e.Y);
+			}
+
+			m_MouseDownPoint=Point.Empty;
+			m_ResizeDockContainer=null;
+			m_ResizeDocument=null;
+			DestroySplitter();
+		}
+
+		public void OnMouseLeave()
+		{
+			if(m_ContainerCursor!=null)
+				this.Container.Cursor=m_ContainerCursor;
+			m_ContainerCursor=null;
+		}
+
+		private DocumentBaseContainer GetClosestDocument(DocumentDockContainer parent, int x, int y)
+		{
+			DocumentBaseContainer ret=null;
+			eOrientation orientation=parent.Orientation;
+			foreach(DocumentBaseContainer doc in parent.Documents)
+			{
+				if(orientation==eOrientation.Horizontal && doc.DisplayBounds.X>x && doc.Visible)
+                    break;
+                else if(orientation==eOrientation.Vertical && doc.DisplayBounds.Y>y && doc.Visible)
+					break;
+                if(doc.Visible)
+				    ret=doc;
+			}
+			return ret;
+		}
+
+		/// <summary>
+		/// Returns reference to the DocumentDockContainer that contains specified coordinates. Searches through the Documents collection first.
+		/// </summary>
+		/// <param name="x">X coordinate</param>
+		/// <param name="y">Y coordinate</param>
+		/// <returns></returns>
+		private DocumentDockContainer GetContainerFromRoot(int x, int y)
+		{
+			return GetContainer(m_DocumentDockContainer,x,y);
+		}
+
+		private DocumentDockContainer GetContainer(DocumentDockContainer parent, int x, int y)
+		{
+			if(parent==null || !parent.DisplayBounds.Contains(x,y) || !parent.Visible)
+				return null;
+			DocumentDockContainer ret=null;
+			foreach(DocumentBaseContainer doc in parent.Documents)
+			{
+				if(doc is DocumentDockContainer)
+				{
+					ret=this.GetContainer((DocumentDockContainer)doc,x,y);
+					if(ret!=null)
+						break;
+				}
+			}
+
+            if (ret == null)
+                ret = parent;
+			return ret;
+		}
+		
+		private void CreateSplitter()
+		{
+            if (m_ResizeDockContainer == null)
+				return;
+
+			if(m_Splitter==null)
+				m_Splitter=BarFunctions.CreateOutlineForm();
+		}
+
+		private void SplitterMouseMove(int x, int y)
+		{
+			if(m_Splitter==null || m_ResizeDockContainer==null)
+				return;
+			
+            Rectangle splitterBounds=Rectangle.Empty;
+
+			// Set splitter size
+		    int splitterWidth = Dpi.Width(m_SplitterWidth);
+		    if (m_ResizeDockContainer.Orientation == eOrientation.Horizontal && m_ResizeDocument != null || 
+                m_ResizeDocument == null && (m_Container.Dock == DockStyle.Left || m_Container.Dock == DockStyle.Right))
+			{
+				Point p=m_Container.PointToScreen(new Point(x-splitterWidth/2,m_ResizeDockContainer.DisplayBounds.Y));
+				splitterBounds.X=p.X;
+				splitterBounds.Y=p.Y;
+				splitterBounds.Height=m_ResizeDockContainer.DisplayBounds.Height;
+				splitterBounds.Width=splitterWidth;
+			}
+            else if (m_ResizeDockContainer.Orientation == eOrientation.Vertical && m_ResizeDocument != null || 
+                m_ResizeDocument == null && (m_Container.Dock == DockStyle.Bottom || m_Container.Dock == DockStyle.Top))
+			{
+				Point p=m_Container.PointToScreen(new Point(m_ResizeDockContainer.DisplayBounds.X,y-splitterWidth/2));
+				splitterBounds.X=p.X;
+				splitterBounds.Y=p.Y;
+				splitterBounds.Width=m_ResizeDockContainer.DisplayBounds.Width;
+				splitterBounds.Height=splitterWidth;
+			}
+
+			NativeFunctions.SetWindowPos(m_Splitter.Handle,new IntPtr(NativeFunctions.HWND_TOP),splitterBounds.X,splitterBounds.Y,splitterBounds.Width,splitterBounds.Height,NativeFunctions.SWP_SHOWWINDOW | NativeFunctions.SWP_NOACTIVATE);
+		}
+
+		private void DestroySplitter()
+		{
+			if(m_Splitter!=null)
+			{
+				m_Splitter.Visible=false;
+				m_Splitter.Dispose();
+				m_Splitter=null;
+			}
+		}
+
+        internal Size GetContainerMinimumSize(DocumentDockContainer dockContainer)
+        {
+            Size minimumSize = Size.Empty;
+
+            foreach (DocumentBaseContainer d in dockContainer.Documents)
+            {
+                Size dm = Size.Empty;
+
+                if (d is DocumentBarContainer)
+                {
+                    if (!((DocumentBarContainer)d).Visible) continue;
+                    dm = d.MinimumSize;
+                }
+                else if (d is DocumentDockContainer)
+                {
+                    dm = GetContainerMinimumSize(d as DocumentDockContainer);
+                }
+
+                if (dockContainer.Orientation == eOrientation.Horizontal)
+                {
+                    minimumSize.Width += dm.Width + Dpi.Width(dockContainer.SplitterSize);
+                    if (dm.Height < minimumSize.Height || minimumSize.Height == 0)
+                        minimumSize.Height = dm.Height;
+                }
+                else
+                {
+                    minimumSize.Height += dm.Height + Dpi.Width(dockContainer.SplitterSize);
+                    if (dm.Width < minimumSize.Width || minimumSize.Width == 0)
+                        minimumSize.Width = dm.Width;
+                }
+            }
+
+            if (minimumSize.Width > 0 && dockContainer.Orientation == eOrientation.Horizontal)
+                minimumSize.Width += Dpi.Width(dockContainer.SplitterSize);
+            else if (minimumSize.Height > 0 && dockContainer.Orientation == eOrientation.Vertical)
+                minimumSize.Height += Dpi.Width(dockContainer.SplitterSize);
+
+            if (minimumSize.Width == 0)
+                minimumSize.Width = 32;
+            if (minimumSize.Height == 0)
+                minimumSize.Height = 32;
+
+            return minimumSize;
+        }
+
+		private Point GetResizeToPoint(int x, int y)
+		{
+			if(m_ResizeDockContainer==null)
+				return Point.Empty;
+
+			Point resizeTo=new Point(x,y);
+
+			int xDiff=x-m_MouseDownPoint.X;
+			int yDiff=y-m_MouseDownPoint.Y;
+
+            if (m_ResizeDocument == null)
+            {
+                // Resizing the dock site
+                if (m_Container.Dock == DockStyle.Left || m_Container.Dock == DockStyle.Right)
+                {
+                    if (m_Container.Dock == DockStyle.Right) xDiff *= -1;
+
+                    Size minimumSize = GetContainerMinimumSize(m_ResizeDockContainer);
+                    if (m_ResizeDockContainer.DisplayBounds.Width + xDiff < minimumSize.Width)
+                        resizeTo.X -= ((m_ResizeDockContainer.DisplayBounds.Width + xDiff) - minimumSize.Width) * ((m_Container.Dock == DockStyle.Right ? -1 : 1));
+                    else
+                    {
+                        int clientWidth = GetClientWidth();
+                        int minClientWidth = 32;
+                        if (m_Container.Owner != null)
+                            minClientWidth = m_Container.Owner.MinimumClientSize.Width;
+
+                        if (clientWidth - xDiff < minClientWidth)
+                            resizeTo.X -= (minClientWidth - (clientWidth - xDiff)) * ((m_Container.Dock == DockStyle.Right ? -1 : 1));
+                    }
+
+                    return resizeTo;
+                }
+                else if (m_Container.Dock == DockStyle.Top || m_Container.Dock == DockStyle.Bottom)
+                {
+                    if (m_Container.Dock == DockStyle.Bottom) yDiff *= -1;
+
+                    Size minimumSize = GetContainerMinimumSize(m_ResizeDockContainer);
+                    if (m_ResizeDockContainer.DisplayBounds.Height + yDiff < minimumSize.Height)
+                        resizeTo.Y -= ((m_ResizeDockContainer.DisplayBounds.Height + yDiff) - minimumSize.Height) * ((m_Container.Dock == DockStyle.Bottom ? -1 : 1));
+                    else
+                    {
+                        int clientHeight = GetClientHeight();
+                        int minClientHeight = 32;
+                        if (m_Container.Owner != null)
+                            minClientHeight = m_Container.Owner.MinimumClientSize.Height;
+                        
+                        if (clientHeight - yDiff < minClientHeight)
+                            resizeTo.Y -= (minClientHeight - (clientHeight - yDiff)) * ((m_Container.Dock == DockStyle.Bottom ? -1 : 1));
+                    }
+
+                    return resizeTo;
+                }
+
+                return Point.Empty;
+            }
+			else if(m_ResizeDockContainer.Orientation==eOrientation.Horizontal)
+			{
+				if(m_ResizeDocument.DisplayBounds.Width+xDiff>=m_ResizeDocument.MinimumSize.Width)
+				{
+					// Verify document next to it
+					DocumentBaseContainer nextDoc=GetNextDocument(m_ResizeDockContainer,m_ResizeDockContainer.Documents.IndexOf(m_ResizeDocument));
+					if(nextDoc!=null)
+					{
+						if(nextDoc.DisplayBounds.Width-xDiff<nextDoc.MinimumSize.Width)
+							resizeTo.X+=(nextDoc.DisplayBounds.Width-xDiff-nextDoc.MinimumSize.Width);
+					}
+				}
+				else
+					resizeTo.X-=(m_ResizeDocument.DisplayBounds.Width+xDiff-m_ResizeDocument.MinimumSize.Width);
+			}
+			else if(m_ResizeDockContainer.Orientation==eOrientation.Vertical)
+			{
+				if(m_ResizeDocument.DisplayBounds.Height+yDiff>=m_ResizeDocument.MinimumSize.Height)
+				{
+					DocumentBaseContainer nextDoc=GetNextDocument(m_ResizeDockContainer,m_ResizeDockContainer.Documents.IndexOf(m_ResizeDocument));
+					if(nextDoc!=null)
+					{
+						if(nextDoc.DisplayBounds.Height-yDiff<nextDoc.MinimumSize.Height)
+							resizeTo.Y+=(nextDoc.DisplayBounds.Height-yDiff-nextDoc.MinimumSize.Height);
+					}
+				}
+				else
+					resizeTo.Y-=(m_ResizeDocument.DisplayBounds.Height+yDiff-m_ResizeDocument.MinimumSize.Height);
+			}
+
+			return resizeTo;
+		}
+
+		private void ResetLayoutBounds(DocumentDockContainer doc)
+		{
+			foreach(DocumentBaseContainer d in doc.Documents)
+				d.SetLayoutBounds(Rectangle.Empty);
+		}
+
+		private void ResizeTo(int x, int y)
+		{
+			if(m_ResizeDockContainer==null)
+				return;
+
+			Point resizeTo=GetResizeToPoint(x,y);
+			
+            int xDiff=resizeTo.X-m_MouseDownPoint.X;
+			int yDiff=resizeTo.Y-m_MouseDownPoint.Y;
+
+            if (m_ResizeDocument == null)
+            {
+                m_Container.SuspendLayout();
+                if (m_Container.Dock == DockStyle.Left && xDiff!=0)
+                {
+                    if (m_DocumentDockContainer.Documents.Count > 0)
+                    {
+                        DocumentBaseContainer lastDoc = m_DocumentDockContainer.Documents[m_DocumentDockContainer.Documents.Count - 1];
+                        int docWidth = lastDoc.DisplayBounds.Width + xDiff;
+                        if (docWidth > lastDoc.MinimumSize.Width)
+                            lastDoc.SetLayoutBounds(new Rectangle(lastDoc.DisplayBounds.X, lastDoc.DisplayBounds.Y, docWidth, lastDoc.DisplayBounds.Height));
+						else
+							ResetLayoutBounds(m_DocumentDockContainer);
+                    }
+
+                    m_Container.Width = m_Container.Width + xDiff;
+					if(m_Container.Width <= this.GetContainerMinimumSize(m_DocumentDockContainer).Width)
+						ResetLayoutBounds(m_DocumentDockContainer);
+                }
+                else if (m_Container.Dock == DockStyle.Right && xDiff != 0)
+                {
+                    if (m_DocumentDockContainer.Documents.Count > 0)
+                    {
+                        DocumentBaseContainer lastDoc = m_DocumentDockContainer.Documents[0];
+                        int docWidth = lastDoc.DisplayBounds.Width - xDiff;
+                        if (docWidth > lastDoc.MinimumSize.Width)
+                            lastDoc.SetLayoutBounds(new Rectangle(lastDoc.DisplayBounds.X, lastDoc.DisplayBounds.Y, docWidth, lastDoc.DisplayBounds.Height));
+                        else
+                            ResetLayoutBounds(m_DocumentDockContainer);
+                    }
+
+                    m_Container.Width = m_Container.Width - xDiff;
+					if(m_Container.Width <= this.GetContainerMinimumSize(m_DocumentDockContainer).Width)
+						ResetLayoutBounds(m_DocumentDockContainer);
+                }
+                else if (m_Container.Dock == DockStyle.Top && yDiff != 0)
+                {
+                    if (m_DocumentDockContainer.Documents.Count > 0)
+                    {
+                        DocumentBaseContainer lastDoc = m_DocumentDockContainer.Documents[m_DocumentDockContainer.Documents.Count - 1];
+                        int docHeight = lastDoc.DisplayBounds.Height + yDiff;
+                        if (docHeight > lastDoc.MinimumSize.Height)
+                            lastDoc.SetLayoutBounds(new Rectangle(lastDoc.DisplayBounds.X, lastDoc.DisplayBounds.Y, lastDoc.DisplayBounds.Width, docHeight));
+                        else
+                            ResetLayoutBounds(m_DocumentDockContainer);
+                    }
+
+                    m_Container.Height = m_Container.Height + yDiff;
+					if(m_Container.Height <= this.GetContainerMinimumSize(m_DocumentDockContainer).Height)
+						ResetLayoutBounds(m_DocumentDockContainer);
+                }
+                else if (m_Container.Dock == DockStyle.Bottom && yDiff != 0)
+                {
+                    if (m_DocumentDockContainer.Documents.Count > 0)
+                    {
+                        DocumentBaseContainer lastDoc = m_DocumentDockContainer.Documents[0];
+                        int docHeight = lastDoc.DisplayBounds.Height - yDiff;
+                        if (docHeight > lastDoc.MinimumSize.Height)
+                            lastDoc.SetLayoutBounds(new Rectangle(lastDoc.DisplayBounds.X, lastDoc.DisplayBounds.Y, lastDoc.DisplayBounds.Width, docHeight));
+                        else
+                            ResetLayoutBounds(m_DocumentDockContainer);
+                    }
+
+                    m_Container.Height = m_Container.Height - yDiff;
+					if(m_Container.Height <= this.GetContainerMinimumSize(m_DocumentDockContainer).Height)
+						ResetLayoutBounds(m_DocumentDockContainer);
+                }
+                m_Container.ResumeLayout();
+            }
+			else if(m_ResizeDockContainer.Orientation==eOrientation.Horizontal && xDiff!=0)
+			{
+				m_ResizeDocument.SetWidth(m_ResizeDocument.DisplayBounds.Width+xDiff);
+			}
+            else if (m_ResizeDockContainer.Orientation == eOrientation.Vertical && yDiff != 0)
+			{
+				m_ResizeDocument.SetHeight(m_ResizeDocument.DisplayBounds.Height+yDiff);
+			}
+
+			m_Container.RecalcLayout();
+
+            if (m_Container.Owner != null)
+                ((IOwner)m_Container.Owner).InvokeUserCustomize(m_ResizeDocument, EventArgs.Empty);
+		}
+
+		private DocumentBaseContainer GetNextDocument(DocumentDockContainer parent, int refIndex)
+		{
+			int count=parent.Documents.Count;
+			for(int i=refIndex+1;i<count;i++)
+			{
+				if(parent.Documents[i].Visible)
+					return parent.Documents[i];
+			}
+			return null;
+		}
+        private DocumentBaseContainer GetPreviousDocument(DocumentDockContainer parent, int refIndex)
+        {
+            int count = parent.Documents.Count;
+            for (int i = refIndex - 1; i >= 0; i--)
+            {
+                if (parent.Documents[i].Visible)
+                    return parent.Documents[i];
+            }
+            return null;
+        }
+
+		/// <summary>
+		/// Sets the width of the bar that is managed by this document layout. Width can be set only if parent container has
+		/// Horizontal orientation. Note that bar minimum size is respected by this method and
+		/// it will be enforced. If width is less than minimum width bar's width will be set to minimum width.
+		/// </summary>
+		/// <param name="bar">Reference to bar object.</param>
+		/// <param name="width">Desired width.</param>
+		public void SetBarWidth(Bar bar, int width)
+		{
+			DocumentBarContainer docBar=GetDocumentFromBar(bar) as DocumentBarContainer;
+			if(docBar==null)
+				return;
+			if(docBar.Parent == m_DocumentDockContainer && (m_Container.Dock == DockStyle.Left || m_Container.Dock == DockStyle.Right)
+				/*&& (m_DocumentDockContainer.Orientation == eOrientation.Vertical || m_DocumentDockContainer.Documents.Count == 1)*/)
+			{
+				m_Container.SuspendLayout();
+				int diff = width;
+				if(docBar.DisplayBounds.Width == 0)
+					diff -= bar.GetBarDockedSize(eOrientation.Vertical);
+				else
+					diff -= docBar.DisplayBounds.Width;
+                if (diff != 0)
+                {
+                    m_Container.Width += diff;
+                    docBar.SetWidth(width);
+                }
+				//((DocumentDockContainer)docBar.Parent).SetWidth(width);
+				m_Container.ResumeLayout(true);
+			}
+            else if (docBar.Parent is DocumentDockContainer && ((DocumentDockContainer)docBar.Parent).Orientation == eOrientation.Vertical)
+            {
+                ((DocumentDockContainer)docBar.Parent).SetWidth(width);
+            }
+            else
+            {
+                if (width < docBar.MinimumSize.Width)
+                    width = docBar.MinimumSize.Width;
+                docBar.SetWidth(width);
+            }
+			m_Container.RecalcLayout();
+		}
+
+		/// <summary>
+		/// Sets the height of the bar that is managed by this document layout. Height can be set only if parent container has
+		/// vertical orientation. Note that bar minimum size is respected by this method and
+		/// it will be enforced. If height is less than minimum height bar's height will be set to minimum height.
+		/// </summary>
+		/// <param name="bar">Reference to bar object.</param>
+		/// <param name="height">Desired height.</param>
+		public void SetBarHeight(Bar bar, int height)
+		{
+			DocumentBarContainer docBar=GetDocumentFromBar(bar) as DocumentBarContainer;
+			if(docBar==null)
+				return;
+
+            if (m_Container!=null && (m_Container.Dock == DockStyle.Top || m_Container.Dock== DockStyle.Bottom) && 
+                docBar.Parent == m_DocumentDockContainer
+                /*&& (m_DocumentDockContainer.Orientation == eOrientation.Horizontal || m_DocumentDockContainer.Documents.Count == 1)*/)
+            {
+                //m_Container.Height += (height - bar.Height);
+                //m_DocumentDockContainer.SetHeight(height);
+                m_Container.SuspendLayout();
+                int diff = height;
+                if (docBar.DisplayBounds.Height == 0)
+                    diff -= bar.GetBarDockedSize(eOrientation.Vertical);
+                else
+                    diff -= docBar.DisplayBounds.Height;
+                m_Container.Height += diff;
+                //((DocumentDockContainer)docBar.Parent).SetHeight(height);
+                docBar.SetHeight(height);
+                m_Container.ResumeLayout(true);
+            }
+            else if (docBar.Parent is DocumentDockContainer && ((DocumentDockContainer)docBar.Parent).Orientation == eOrientation.Horizontal)
+            {
+                ((DocumentDockContainer)docBar.Parent).SetHeight(height);
+            }
+            else
+            {
+                if (height < docBar.MinimumSize.Height)
+                    height = docBar.MinimumSize.Height;
+                docBar.SetHeight(height);
+            }
+			m_Container.RecalcLayout();
+		}
+		#endregion
+
+		#region Serialization
+		internal void SerializeDefinition(XmlElement parent)
+		{
+            XmlElement docs = null;
+            if (m_Container.Dock == DockStyle.Fill)
+                docs = parent.OwnerDocument.CreateElement(DocumentSerializationXml.Documents);
+            else
+            {
+                docs = parent.OwnerDocument.CreateElement(DocumentSerializationXml.DockSite);
+                docs.SetAttribute(DocumentSerializationXml.DockSiteSize, XmlConvert.ToString((m_Container.Dock == DockStyle.Left || m_Container.Dock == DockStyle.Right) ? m_Container.Width : m_Container.Height));
+                docs.SetAttribute(DocumentSerializationXml.DockingSide, Enum.GetName(typeof(DockStyle), m_Container.Dock));
+            }
+
+			parent.AppendChild(docs);
+
+			SerializeDocumentDockContainer(docs,m_DocumentDockContainer, true);
+		}
+
+		internal void SerializeLayout(XmlElement parent)
+		{
+            XmlElement docs = null;
+            if (m_Container.Dock == DockStyle.Fill)
+                docs = parent.OwnerDocument.CreateElement(DocumentSerializationXml.Documents);
+            else
+            {
+                docs = parent.OwnerDocument.CreateElement(DocumentSerializationXml.DockSite);
+                docs.SetAttribute(DocumentSerializationXml.DockSiteSize, XmlConvert.ToString((m_Container.Dock == DockStyle.Left || m_Container.Dock == DockStyle.Right) ? m_Container.Width : m_Container.Height));
+                docs.SetAttribute(DocumentSerializationXml.DockingSide, Enum.GetName(typeof(DockStyle), m_Container.Dock));
+                docs.SetAttribute(DocumentSerializationXml.OriginalDockSiteSize, XmlConvert.ToString(m_Container.OriginalSize));
+            }
+
+			parent.AppendChild(docs);
+
+			SerializeDocumentDockContainer(docs,m_DocumentDockContainer,false);
+		}
+
+        private bool SerializeDocument(DocumentDockContainer instance)
+        {
+            if (instance.Documents.Count == 0) return false;
+            foreach (DocumentBaseContainer doc in instance.Documents)
+            {
+                DocumentBarContainer bar = doc as DocumentBarContainer;
+                if (bar != null)
+                {
+                    if (bar.Bar != null && bar.Bar.SaveLayoutChanges) return true;
+                }
+                else
+                    return true;
+            }
+            return false;
+        }
+
+		private void SerializeDocumentDockContainer(XmlElement parent, DocumentDockContainer instance, bool definitionSerialization)
+		{
+            if (!SerializeDocument(instance))
+				return;
+            XmlElement document = null;
+			
+            document=parent.OwnerDocument.CreateElement(DocumentSerializationXml.DockContainer);
+			parent.AppendChild(document);
+			document.SetAttribute(DocumentSerializationXml.Orientation,XmlConvert.ToString((int)instance.Orientation));
+            document.SetAttribute(DocumentSerializationXml.Width, instance.LayoutBounds.Width.ToString());
+            document.SetAttribute(DocumentSerializationXml.Height, instance.LayoutBounds.Height.ToString());
+
+			foreach(DocumentBaseContainer doc in instance.Documents)
+			{
+				if(doc is DocumentDockContainer)
+                    SerializeDocumentDockContainer(document,(DocumentDockContainer)doc,definitionSerialization);
+				else if(doc is DocumentBarContainer)
+					SerializeDocumentBarContainer(document,(DocumentBarContainer)doc,definitionSerialization);
+			}
+		}
+
+		private void SerializeDocumentBarContainer(XmlElement parent, DocumentBarContainer instance, bool definitionSerialization)
+		{
+			if(instance.Bar==null || !instance.Bar.SaveLayoutChanges)
+				return;
+            
+			XmlElement barDocument=parent.OwnerDocument.CreateElement(DocumentSerializationXml.BarContainer);
+			parent.AppendChild(barDocument);
+			
+			barDocument.SetAttribute(DocumentSerializationXml.Width,instance.LayoutBounds.Width.ToString());
+			barDocument.SetAttribute(DocumentSerializationXml.Height,instance.LayoutBounds.Height.ToString());
+			
+			XmlElement barElement=parent.OwnerDocument.CreateElement(BarSerializationXml.Bar);
+			barDocument.AppendChild(barElement);
+			
+			if(definitionSerialization)
+				instance.Bar.Serialize(barElement);
+			else
+				instance.Bar.SerializeLayout(barElement);
+		}
+
+		internal void DeserializeLayout(XmlElement parent)
+		{
+            if (parent.Name != DocumentSerializationXml.Documents && parent.Name != DocumentSerializationXml.DockSite || m_LoadingLayout)
+				return;
+
+			m_LoadingLayout=true;
+            ItemSerializationContext context = new ItemSerializationContext();
+			try
+			{
+				foreach(XmlElement elem in parent.ChildNodes)
+				{
+					if(elem.Name==DocumentSerializationXml.DockContainer)
+					{
+                        context.ItemXmlElement = elem;
+						DeserializeDocumentDockContainer(context,m_DocumentDockContainer,false);
+						break;
+					}
+				}
+			}
+			finally
+			{
+				m_LoadingLayout=false;
+			}
+            if (parent.Name == DocumentSerializationXml.DockSite)
+            {
+                if (m_Container.Dock == DockStyle.Left || m_Container.Dock == DockStyle.Right)
+                    m_Container.Width = XmlConvert.ToInt32(parent.GetAttribute(DocumentSerializationXml.DockSiteSize));
+                else if (m_Container.Dock == DockStyle.Top || m_Container.Dock == DockStyle.Bottom)
+                    m_Container.Height = XmlConvert.ToInt32(parent.GetAttribute(DocumentSerializationXml.DockSiteSize));
+
+                if (parent.HasAttribute(DocumentSerializationXml.OriginalDockSiteSize))
+                    m_Container.OriginalSize = XmlConvert.ToInt32(parent.GetAttribute(DocumentSerializationXml.OriginalDockSiteSize));
+            }
+
+			m_Container.RecalcLayout();
+		}
+
+		internal void DeserializeDefinition(ItemSerializationContext context)
+		{
+            XmlElement parent = context.ItemXmlElement;
+            if ((parent.Name != DocumentSerializationXml.Documents && parent.Name != DocumentSerializationXml.DockSite) || m_LoadingLayout)
+				return;
+
+			m_LoadingLayout=true;
+			try
+			{
+				foreach(XmlElement elem in parent.ChildNodes)
+				{
+					if(elem.Name==DocumentSerializationXml.DockContainer)
+					{
+                        context.ItemXmlElement = elem;
+						DeserializeDocumentDockContainer(context,m_DocumentDockContainer,true);
+						break;
+					}
+				}
+
+                if (parent.HasAttribute(DocumentSerializationXml.DockSiteSize))
+                {
+                    if (m_Container.Dock == DockStyle.Left || m_Container.Dock == DockStyle.Right)
+                        m_Container.Width = XmlConvert.ToInt32(parent.GetAttribute(DocumentSerializationXml.DockSiteSize));
+                    else if (m_Container.Dock == DockStyle.Top || m_Container.Dock == DockStyle.Bottom)
+                        m_Container.Height = XmlConvert.ToInt32(parent.GetAttribute(DocumentSerializationXml.DockSiteSize));
+                }
+			}
+			finally
+			{
+				m_LoadingLayout=false;
+			}
+			m_Container.RecalcLayout();
+		}
+
+		private void DeserializeDocumentDockContainer(ItemSerializationContext context, DocumentDockContainer instance, bool deserializeDefinition)
+		{
+            XmlElement docElement = context.ItemXmlElement;
+			if(docElement.Name!=DocumentSerializationXml.DockContainer)
+				return;
+
+			instance.Documents.Clear();
+			instance.Orientation=(eOrientation)XmlConvert.ToInt32(docElement.GetAttribute(DocumentSerializationXml.Orientation));
+            if (docElement.HasAttribute(DocumentSerializationXml.Width) && docElement.HasAttribute(DocumentSerializationXml.Height))
+            {
+                instance.SetLayoutBounds(new Rectangle(0,0,
+                    XmlConvert.ToInt32(docElement.GetAttribute(DocumentSerializationXml.Width)),
+                    XmlConvert.ToInt32(docElement.GetAttribute(DocumentSerializationXml.Height))));
+            }
+
+			foreach(XmlElement elem in docElement.ChildNodes)
+			{
+				bool add=true;
+				DocumentBaseContainer doc=DocumentSerializationXml.CreateDocument(elem.Name);
+                context.ItemXmlElement = elem;
+				if(doc is DocumentDockContainer)
+					DeserializeDocumentDockContainer(context,(DocumentDockContainer)doc,deserializeDefinition);
+				else if(doc is DocumentBarContainer)
+                    add=DeserializeDocumentBarContainer(context,(DocumentBarContainer)doc,deserializeDefinition);
+				if(add)
+					instance.Documents.Add(doc);
+			}
+		}
+
+		private bool DeserializeDocumentBarContainer(ItemSerializationContext context, DocumentBarContainer instance, bool deserializeDefinition)
+		{
+            XmlElement docElement = context.ItemXmlElement;
+			if(docElement.Name!=DocumentSerializationXml.BarContainer)
+				return false;
+			
+			instance.SetLayoutBounds(new Rectangle(0,0,XmlConvert.ToInt32(docElement.GetAttribute(DocumentSerializationXml.Width)),XmlConvert.ToInt32(docElement.GetAttribute(DocumentSerializationXml.Height))));
+			
+			foreach(XmlElement elem in docElement.ChildNodes)
+			{
+				if(elem.Name==BarSerializationXml.Bar)
+				{
+					instance.Bar=m_Container.Owner.Bars[elem.GetAttribute(BarSerializationXml.Name)];
+					if(deserializeDefinition || instance.Bar==null && elem.HasAttribute(BarSerializationXml.Custom) && XmlConvert.ToBoolean(elem.GetAttribute(BarSerializationXml.Custom)))
+					{
+						// New bar that user has created try to deserialize but if it does not have items ignore it
+						instance.Bar=new Bar();
+						m_Container.Owner.Bars.Add(instance.Bar);
+						if(deserializeDefinition)
+							instance.Bar.Deserialize(elem, context);
+						else
+							instance.Bar.DeserializeLayout(elem);
+						if(instance.Bar.Items.Count==0 && !deserializeDefinition)
+						{
+							m_Container.Owner.Bars.Remove(instance.Bar);
+							return false;
+						}
+						return true;
+					}
+
+                    if (instance.Bar != null)
+                    {
+                        instance.Bar.DeserializeLayout(elem);
+                        // Restore hidden dock container size so it can be used when bar is shown
+                        if (!instance.Bar.IsVisible)
+                        {
+                            if (instance.LayoutBounds.Height > 0 && (instance.Bar.DockSide == eDockSide.Top || instance.Bar.DockSide == eDockSide.Bottom))
+                            {
+                                instance.Bar.Height = instance.LayoutBounds.Height;
+                            }
+                            else if (instance.LayoutBounds.Width > 0 && (instance.Bar.DockSide == eDockSide.Left || instance.Bar.DockSide == eDockSide.Right))
+                            {
+                                instance.Bar.Width = instance.LayoutBounds.Width;
+                            }
+                        }
+                    }
+                    else
+                        return false;
+					break;
+				}
+			}
+
+			return true;
+		}
+		
+		#endregion
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/DocumentDock/DocumentSerializationXml.cs b/PROMS/DotNetBar Source Code/DocumentDock/DocumentSerializationXml.cs
new file mode 100644
index 00000000..5517c26e
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DocumentDock/DocumentSerializationXml.cs	
@@ -0,0 +1,29 @@
+using System;
+
+namespace DevComponents.DotNetBar
+{
+	internal class DocumentSerializationXml
+	{
+		public static string Documents="documents";
+		public static string DockContainer="dockcontainer";
+		public static string BarContainer="barcontainer";
+		public static string Orientation="orientation";
+		public static string Width="w";
+		public static string Height="h";
+        public static string DockSite = "docksite";
+        public static string DockingSide = "dockingside";
+        public static string DockSiteSize = "size";
+        public static string Version = "version";
+        public static string OriginalDockSiteSize = "originaldocksitesize";
+
+		public static DocumentBaseContainer CreateDocument(string xmlName)
+		{
+			if(xmlName==DocumentSerializationXml.DockContainer)
+				return new DocumentDockContainer();
+			else if(xmlName==DocumentSerializationXml.BarContainer)
+				return new DocumentBarContainer();
+			else
+				throw new InvalidOperationException("Document type not recognized: "+xmlName);
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/DocumentDock/PanelDockContainer.cs b/PROMS/DotNetBar Source Code/DocumentDock/PanelDockContainer.cs
new file mode 100644
index 00000000..8d819df0
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DocumentDock/PanelDockContainer.cs	
@@ -0,0 +1,333 @@
+using System;
+using System.Windows.Forms;
+using System.Windows.Forms.Design;
+using System.Collections;
+using System.Drawing;
+using System.ComponentModel.Design;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Represents panel that is hosted by DockContainerItem as docked control.
+	/// </summary>
+    [ToolboxItem(false), Designer("DevComponents.DotNetBar.Design.PanelDockContainerDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+	public class PanelDockContainer:PanelEx
+	{
+		#region Private Variables
+		private const string INFO_TEXT="Drop controls here. Drag and Drop tabs to perform docking.";
+		private DockContainerItem m_DockContainerItem=null;
+		private bool m_UseCustomStyle=false;
+		#endregion
+
+		#region Internal Implementation
+#if FRAMEWORK20
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override bool AutoSize
+        {
+            get
+            {
+                return base.AutoSize;
+            }
+            set
+            {
+                base.AutoSize = value;
+            }
+        }
+
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override AutoSizeMode AutoSizeMode
+        {
+            get
+            {
+                return base.AutoSizeMode;
+            }
+            set
+            {
+                base.AutoSizeMode = value;
+            }
+        }
+#endif
+		/// <summary>
+		/// Creates new instance of the panel.
+		/// </summary>
+		public PanelDockContainer():base()
+		{
+			this.BackColor=SystemColors.Control;
+		}
+
+		private Rectangle GetThemedRect(Rectangle r)
+		{
+			const int offset=6;
+
+			switch(this.TabAlignment)
+			{
+				case eTabStripAlignment.Top:
+				{
+					r.Y-=offset;
+					r.Height+=offset;
+					break;
+				}
+				case eTabStripAlignment.Left:
+				{
+					r.X-=offset;
+					r.Width+=offset;
+					break;
+				}
+				case eTabStripAlignment.Right:
+				{
+					r.Width+=offset;
+					break;
+				}
+				case eTabStripAlignment.Bottom:
+				{
+					r.Height+=offset;
+					break;
+				}
+					
+			}
+			return r;
+		}
+
+		private eTabStripAlignment TabAlignment
+		{
+			get
+			{
+				if(m_DockContainerItem!=null)
+				{
+					if(m_DockContainerItem.ContainerControl is Bar)
+					{
+						return ((Bar)m_DockContainerItem.ContainerControl).DockTabAlignment;
+					}
+				}
+				return eTabStripAlignment.Top;
+			}
+		}
+		
+		protected override void OnPaint(PaintEventArgs e)
+		{
+			bool baseCall=true;
+			if(DrawThemedPane && BarFunctions.ThemedOS && m_DockContainerItem!=null)
+			{
+				Rectangle r=GetThemedRect(this.ClientRectangle);
+				eTabStripAlignment tabAlignment=this.TabAlignment;
+				
+				Rectangle rTemp=new Rectangle(0,0,r.Width,r.Height);
+				if(tabAlignment==eTabStripAlignment.Right || tabAlignment==eTabStripAlignment.Left)
+					rTemp=new Rectangle(0,0,rTemp.Height,rTemp.Width);
+				if(m_ThemeCachedBitmap==null || m_ThemeCachedBitmap.Size!=rTemp.Size)
+				{
+					DisposeThemeCachedBitmap();
+					Bitmap bmp=new Bitmap(rTemp.Width,rTemp.Height,e.Graphics);
+					try
+					{
+						Graphics gTemp=Graphics.FromImage(bmp);
+						try
+						{
+							using(SolidBrush brush=new SolidBrush(Color.Transparent))
+								gTemp.FillRectangle(brush,0,0,bmp.Width,bmp.Height);
+							this.ThemeTab.DrawBackground(gTemp,ThemeTabParts.Pane,ThemeTabStates.Normal,rTemp);
+						}
+						finally
+						{
+							gTemp.Dispose();
+						}
+					}
+					finally
+					{
+						if(tabAlignment==eTabStripAlignment.Left)
+							bmp.RotateFlip(RotateFlipType.Rotate270FlipNone);
+						else if(tabAlignment==eTabStripAlignment.Right)
+							bmp.RotateFlip(RotateFlipType.Rotate90FlipNone);
+						else if(tabAlignment==eTabStripAlignment.Bottom)
+							bmp.RotateFlip(RotateFlipType.Rotate180FlipNone);
+						e.Graphics.DrawImageUnscaled(bmp,r.X,r.Y);							
+						m_ThemeCachedBitmap=bmp;
+					}
+				}
+				else
+					e.Graphics.DrawImageUnscaled(m_ThemeCachedBitmap,r.X,r.Y);
+
+				baseCall=false;
+			}
+
+			if(baseCall)
+				base.OnPaint(e);
+
+			if(this.DesignMode && this.Controls.Count==0 && this.Text=="")
+			{
+				Rectangle r=this.ClientRectangle;
+				r.Inflate(-2,-2);
+                eTextFormat sf = eTextFormat.HorizontalCenter | eTextFormat.VerticalCenter | eTextFormat.EndEllipsis | eTextFormat.WordBreak;
+				Font font=new Font(this.Font,FontStyle.Bold);
+				TextDrawing.DrawString(e.Graphics,INFO_TEXT,font,ControlPaint.Dark(this.Style.BackColor1.Color),r,sf);
+				font.Dispose();
+			}
+		}
+
+
+        /// <summary>
+        /// Called after either ColorScheme or ColorSchemeStyle has changed. If you override make sure that you call base implementation so default
+        /// processing can occur.
+        /// </summary>
+        protected override void OnColorSchemeChanged()
+        {
+            base.OnColorSchemeChanged();
+            if (!UseCustomStyle)
+            {
+                if (StyleManager.IsVisualStudio2012(StyleManager.Style))
+                {
+                    this.Style.BackColor1.ColorSchemePart = eColorSchemePart.PanelBackground;
+                }
+                else
+                {
+                    this.Style.BackColor1.ColorSchemePart = eColorSchemePart.BarBackground;
+                }
+            }
+        }
+
+		/// <summary>
+		/// Indicates whether style of the panel is managed by tab control automatically.
+		/// Set this to true if you would like to control style of the panel.
+		/// </summary>
+		[Browsable(true),DefaultValue(false),Category("Appearance"),Description("Indicates whether style of the panel is managed by tab control automatically. Set this to true if you would like to control style of the panel.")]
+		public bool UseCustomStyle
+		{
+			get {return m_UseCustomStyle;}
+			set {m_UseCustomStyle=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets TabItem that this panel is attached to.
+		/// </summary>
+		[Browsable(false),DefaultValue(null),DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public DockContainerItem DockContainerItem
+		{
+			get {return m_DockContainerItem;}
+			set	{m_DockContainerItem=value;}
+		}
+
+		protected override void OnResize(EventArgs e)
+		{
+			DisposeThemeCachedBitmap();
+			base.OnResize(e);
+		}
+
+		/// <summary>
+		/// Gets or sets which edge of the parent container a control is docked to.
+		/// </summary>
+		[Browsable(false),DefaultValue(DockStyle.None),DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public override DockStyle Dock
+		{
+			get {return base.Dock;}
+			set {base.Dock=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets the size of the control.
+		/// </summary>
+		[Browsable(false)]
+		public new System.Drawing.Size Size
+		{
+			get {return base.Size;}
+			set {base.Size=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets the coordinates of the upper-left corner of the control relative to the upper-left corner of its container.
+		/// </summary>
+		[Browsable(false)]
+		public new Point Location
+		{
+			get {return base.Location;}
+			set {base.Location=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets a value indicating whether the control is displayed.
+		/// </summary>
+		[Browsable(false)]
+		public new bool Visible
+		{
+			get {return base.Visible;}
+			set {base.Visible=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets which edges of the control are anchored to the edges of its container.
+		/// </summary>
+		[Browsable(false)]
+		public override AnchorStyles Anchor
+		{
+			get {return base.Anchor;}
+			set {base.Anchor=value;}
+		}
+
+		private TabStrip GetDockTabStrip()
+		{
+			TabStrip tabStrip=null;
+			
+			if(m_DockContainerItem!=null && m_DockContainerItem.ContainerControl is Bar)
+			{
+				Bar bar=m_DockContainerItem.ContainerControl as Bar;
+				if(bar.DockSide==eDockSide.Document)
+					tabStrip=bar.DockTabControl;
+			}
+
+			return tabStrip;
+		}
+
+		protected override void OnEnter(EventArgs e)
+		{
+            // Notify DotNetBarManager on activation
+            DotNetBarManager manager = GetDotNetBarManager();
+            if (manager != null) manager.InternalDockContainerActivated(m_DockContainerItem);
+
+			TabStrip tabStrip=GetDockTabStrip();
+			if(tabStrip==null)
+				return;
+			try
+			{
+				if(tabStrip.SelectedTabFont == null)
+					tabStrip.SelectedTabFont = new Font(tabStrip.Font, FontStyle.Bold);
+			}
+			catch{}
+
+            if (this.Controls.Count > 0)
+            {
+                Form f = this.FindForm();
+                if (f != null)
+                {
+                    if (f.ActiveControl == this || f.ActiveControl == tabStrip && tabStrip != null)
+                        this.SelectNextControl(null, true, true, true, true);
+                }
+            }
+
+            base.OnEnter(e);
+		}
+
+        private DotNetBarManager GetDotNetBarManager()
+        {
+            if (m_DockContainerItem != null && m_DockContainerItem.ContainerControl is Bar)
+            {
+                return ((Bar)m_DockContainerItem.ContainerControl).Owner as DotNetBarManager;
+            }
+            return null;
+        }
+        protected override void OnLeave(EventArgs e)
+		{
+            // Notify DotNetBarManager on activation
+            DotNetBarManager manager = GetDotNetBarManager();
+            if (manager != null) manager.InternalDockContainerDeactivated(m_DockContainerItem);
+
+			TabStrip tabStrip=GetDockTabStrip();
+			if(tabStrip==null)
+				return;
+			if(tabStrip.SelectedTabFont != null)
+				tabStrip.SelectedTabFont = null;
+
+            base.OnLeave(e);
+		}
+		#endregion
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBar.csproj b/PROMS/DotNetBar Source Code/DotNetBar.csproj
new file mode 100644
index 00000000..513c8573
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBar.csproj	
@@ -0,0 +1,2243 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{36546CE3-335C-4AB6-A2F3-40F8C818BC66}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon>
+    </ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>DevComponents.DotNetBar2</AssemblyName>
+    <AssemblyOriginatorKeyFile>dotnetbar.snk</AssemblyOriginatorKeyFile>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Flow</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE32Nav30</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Library</OutputType>
+    <RootNamespace>DevComponents.DotNetBar</RootNamespace>
+    <StartupObject>
+    </StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <SignAssembly>false</SignAssembly>
+    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
+    <OldToolsVersion>2.0</OldToolsVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>bin\Debug\</OutputPath>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <BaseAddress>0</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DEBUG;DOTNETBAR;FRAMEWORK20</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>true</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>false</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>full</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>bin\Release\</OutputPath>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <BaseAddress>0</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DOTNETBAR;FRAMEWORK20</DefineConstants>
+    <DocumentationFile>DevComponents.DotNetBar.xml</DocumentationFile>
+    <DebugSymbols>false</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>true</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>none</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseTrial|AnyCPU' ">
+    <OutputPath>bin\Release\</OutputPath>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <BaseAddress>0</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;TRIAL;DOTNETBAR</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>false</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>true</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>none</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseTrialNoLimit|AnyCPU' ">
+    <OutputPath>bin\Release\</OutputPath>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <BaseAddress>0</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;TRIAL;NOTIMELIMIT;DOTNETBAR</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>false</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>true</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>none</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release2005|AnyCPU' ">
+    <OutputPath>bin\Release\</OutputPath>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <BaseAddress>0</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DOTNETBAR;FRAMEWORK20</DefineConstants>
+    <DocumentationFile>DevComponents.DotNetBar2.xml</DocumentationFile>
+    <DebugSymbols>false</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>true</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>none</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+    <NoWarn>1591,1573</NoWarn>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseTrial2005|AnyCPU' ">
+    <OutputPath>bin\Release\</OutputPath>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <BaseAddress>0</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;TRIAL;DOTNETBAR;FRAMEWORK20</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>false</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>true</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>none</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+    <NoWarn>1591,1573</NoWarn>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Accessibility">
+      <Name>Accessibility</Name>
+    </Reference>
+    <Reference Include="mscorlib">
+      <Name>mscorlib</Name>
+    </Reference>
+    <Reference Include="System">
+      <Name>System</Name>
+    </Reference>
+    <Reference Include="System.Data">
+      <Name>System.Data</Name>
+    </Reference>
+    <Reference Include="System.Drawing">
+      <Name>System.Drawing</Name>
+    </Reference>
+    <Reference Include="System.Windows.Forms">
+      <Name>SYSTEM.WINDOWS.FORMS</Name>
+    </Reference>
+    <Reference Include="System.Xml">
+      <Name>System.XML</Name>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="AdvTree\AdvTree.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="AdvTree\Cell.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="AdvTree\CellCollection.cs" />
+    <Compile Include="AdvTree\CellEditEventArgs.cs" />
+    <Compile Include="AdvTree\CellImages.cs" />
+    <Compile Include="AdvTree\ColumnHeader.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="AdvTree\ColumnHeaderCollection.cs" />
+    <Compile Include="AdvTree\ColumnHeaderControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="AdvTree\ColumnWidth.cs" />
+    <Compile Include="AdvTree\CommandButtonEventArgs.cs" />
+    <Compile Include="AdvTree\ConnectorPointsCollection.cs" />
+    <Compile Include="AdvTree\CustomEditors.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="AdvTree\Display\CellDisplay.cs" />
+    <Compile Include="AdvTree\Display\ColorTableInitializer.cs" />
+    <Compile Include="AdvTree\Display\ColumnHeaderDisplay.cs" />
+    <Compile Include="AdvTree\Display\ColumnHeaderRendererEventArgs.cs" />
+    <Compile Include="AdvTree\Display\ConnectorRendererEventArgs.cs" />
+    <Compile Include="AdvTree\Display\DragDropMarkerDisplay.cs" />
+    <Compile Include="AdvTree\Display\DragDropMarkerRendererEventArgs.cs" />
+    <Compile Include="AdvTree\Display\LineConnectorDisplay.cs" />
+    <Compile Include="AdvTree\Display\NodeCellRendererEventArgs.cs" />
+    <Compile Include="AdvTree\Display\NodeConnectorDisplay.cs" />
+    <Compile Include="AdvTree\Display\NodeDisplay.cs" />
+    <Compile Include="AdvTree\Display\NodeExpandDisplay.cs" />
+    <Compile Include="AdvTree\Display\NodeExpandEllipseDisplay.cs" />
+    <Compile Include="AdvTree\Display\NodeExpandImageDisplay.cs" />
+    <Compile Include="AdvTree\Display\NodeExpandPartRendererEventArgs.cs" />
+    <Compile Include="AdvTree\Display\NodeExpandRectDisplay.cs" />
+    <Compile Include="AdvTree\Display\NodeExpandTriangleDisplay.cs" />
+    <Compile Include="AdvTree\Display\NodeGroupLineDisplay.cs" />
+    <Compile Include="AdvTree\Display\NodeRendererEventArgs.cs" />
+    <Compile Include="AdvTree\Display\NodeSelectionDisplay.cs" />
+    <Compile Include="AdvTree\Display\NodeSystemRenderer.cs" />
+    <Compile Include="AdvTree\Display\NodeTreeDisplay.cs" />
+    <Compile Include="AdvTree\Display\SelectionColorTable.cs" />
+    <Compile Include="AdvTree\Display\SelectionRendererEventArgs.cs" />
+    <Compile Include="AdvTree\Display\TreeBackgroundRendererEventArgs.cs" />
+    <Compile Include="AdvTree\Display\TreeColorTable.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="AdvTree\Display\TreeExpandColorTable.cs" />
+    <Compile Include="AdvTree\Display\TreeRenderer.cs" />
+    <Compile Include="AdvTree\Display\TreeSelectionColors.cs" />
+    <Compile Include="AdvTree\Drawing\Border.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="AdvTree\Drawing\ColorBlendCollection.cs" />
+    <Compile Include="AdvTree\Drawing\ColorStop.cs" />
+    <Compile Include="AdvTree\Drawing\ColorStopConverter.cs" />
+    <Compile Include="AdvTree\Drawing\CornerRadius.cs" />
+    <Compile Include="AdvTree\Drawing\Fill.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="AdvTree\Drawing\GradientFill.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="AdvTree\Drawing\RectangleShape.cs" />
+    <Compile Include="AdvTree\Drawing\Shape.cs" />
+    <Compile Include="AdvTree\Drawing\SolidBorder.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="AdvTree\Drawing\SolidFill.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="AdvTree\Enums.cs" />
+    <Compile Include="AdvTree\EventDelegates.cs" />
+    <Compile Include="AdvTree\Events\CustomCellEditorEventArgs.cs" />
+    <Compile Include="AdvTree\Events\MarkupLinkClickEventArgs.cs" />
+    <Compile Include="AdvTree\Events\SerializeNodeEventArgs.cs" />
+    <Compile Include="AdvTree\HeaderDefinition.cs" />
+    <Compile Include="AdvTree\HeadersCollection.cs" />
+    <Compile Include="AdvTree\INodeNotify.cs" />
+    <Compile Include="AdvTree\Interop\WinApi.cs" />
+    <Compile Include="AdvTree\KeyNavigation.cs" />
+    <Compile Include="AdvTree\Layout\CellTileLayout.cs" />
+    <Compile Include="AdvTree\Layout\ColumnHeaderLayout.cs" />
+    <Compile Include="AdvTree\Layout\LayoutSettings.cs" />
+    <Compile Include="AdvTree\Layout\NodeCellLayout.cs" />
+    <Compile Include="AdvTree\Layout\NodeLayout.cs" />
+    <Compile Include="AdvTree\Layout\NodeLayoutContextInfo.cs" />
+    <Compile Include="AdvTree\Layout\NodeTileLayout.cs" />
+    <Compile Include="AdvTree\Layout\NodeTreeLayout.cs" />
+    <Compile Include="AdvTree\Node.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="AdvTree\NodeCollection.cs">
+    </Compile>
+    <Compile Include="AdvTree\NodeConnector.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="AdvTree\NodeOperations.cs">
+    </Compile>
+    <Compile Include="AdvTree\NodeStyles.cs" />
+    <Compile Include="AdvTree\SelectedNodesCollection.cs" />
+    <Compile Include="AdvTree\TextBoxEx.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="AdvTree\TreeAreaInfo.cs" />
+    <Compile Include="AdvTree\TreeCellCancelEventArgs.cs" />
+    <Compile Include="AdvTree\TreeCellEventArgs.cs" />
+    <Compile Include="AdvTree\TreeDragDropEventArgs.cs" />
+    <Compile Include="AdvTree\TreeDragFeedbackEventArgs.cs" />
+    <Compile Include="AdvTree\TreeNodeCancelEventArgs.cs" />
+    <Compile Include="AdvTree\TreeNodeCollectionEventArgs.cs" />
+    <Compile Include="AdvTree\TreeNodeEventArgs.cs" />
+    <Compile Include="AdvTree\TreeNodeMouseEventArgs.cs" />
+    <Compile Include="AdvTree\TreeSerializer.cs" />
+    <Compile Include="AdvTree\Utilites.cs" />
+    <Compile Include="AnalogClock\AnalogClockControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="AnalogClock\ClockHandStyleData.cs" />
+    <Compile Include="AnalogClock\ClockStyleData.cs" />
+    <Compile Include="AnalogClock\ColorData.cs" />
+    <Compile Include="AnalogClock\MathHelper.cs" />
+    <Compile Include="Animation\Animation.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Animation\AnimationDouble.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Animation\AnimationInt.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Animation\AnimationPoint.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Animation\AnimationRectangle.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Animation\Storyline.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Attributes.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="AutoHidePanel.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Balloon.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="BalloonTip.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Bar.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="BarBaseControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="BarFunctions.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Bars.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="BarSerialization\BarSerializationXml.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="BarUtilities.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="BaseItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="BaseItemController.cs" />
+    <Compile Include="BindingDef.cs" />
+    <Compile Include="BubbleBar.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="BubbleBarOverlay.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="BubbleBarTab.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="BubbleBarTabCollection.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="BubbleButton.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="BubbleButtonCollection.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="BubbleButtonDisplay.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="BubbleButtonLayoutManager.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="BubbleContentManager.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="BufferedBitmap.cs" />
+    <Compile Include="ButtonItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="ButtonItemLayout.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ButtonX\ButtonX.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="ButtonX\ThemedButtonXPainter.cs" />
+    <Compile Include="CheckBoxItem\CheckBoxItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="CheckBoxItem\CheckBoxItemPainter.cs" />
+    <Compile Include="CheckBoxItem\Office2007CheckBoxItemPainter.cs" />
+    <Compile Include="CircularProgressItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="ColorFunctions.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ColorPicker.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="ColorPickers\ColorCombControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="ColorPickers\ColorContrastControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="ColorPickers\ColorItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="ColorPickers\ColorPickerDropDown.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="ColorPickers\ColorSelectionPreviewControl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="ColorPickers\CombCell.cs" />
+    <Compile Include="ColorPickers\CustomColorBlender.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="ColorPickers\CustomColorDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="ColorScheme.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ColorSchemeEditor.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="ColorSchemeVSEditor.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ColorTypeEditor.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="CommandManager.cs" />
+    <Compile Include="ContainerKeyboardNavigation.cs" />
+    <Compile Include="Controls\BindingNavigatorEx.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\CircularProgress.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\CollapsibleSplitContainer.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\ColorPickerButton.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\ComboBoxEx.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="ComboBoxItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="ComboItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="CompositeImage.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ContentManager\BlockLayoutManager.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ContentManager\Enums.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ContentManager\IBlock.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ContentManager\IBlockExtended.cs" />
+    <Compile Include="ContentManager\IContentLayoutManager.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ContentManager\SerialContentLayoutManager.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ContextExMenuTypeEditor.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ContextMenuBar.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="ContextMenusCollection.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ControlContainerItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\BaseItemControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\CheckBoxX.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\ComboTree.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\ControlWithBackgroundStyle.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\CursorHelper.cs" />
+    <Compile Include="Controls\DataGridViewX.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\DataGridViewX\DataGridViewButtonX\DataGridViewButtonXCell.cs" />
+    <Compile Include="Controls\DataGridViewX\DataGridViewButtonX\DataGridViewButtonXColumn.cs" />
+    <Compile Include="Controls\DataGridViewX\DataGridViewCheckBoxX\DataGridViewCheckBoxXCell.cs" />
+    <Compile Include="Controls\DataGridViewX\DataGridViewCheckBoxX\DataGridViewCheckBoxXColumn.cs" />
+    <Compile Include="Controls\DataGridViewX\DataGridViewComboBoxEx\DataGridViewComboBoxExCell.cs" />
+    <Compile Include="Controls\DataGridViewX\DataGridViewComboBoxEx\DataGridViewComboBoxExColumn.cs" />
+    <Compile Include="Controls\DataGridViewX\DataGridViewComboBoxEx\DataGridViewComboBoxExEditingControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\DataGridViewX\DataGridViewDateTimeInput\DataGridViewDateTimeInputCell.cs" />
+    <Compile Include="Controls\DataGridViewX\DataGridViewDateTimeInput\DataGridViewDateTimeInputColumn.cs" />
+    <Compile Include="Controls\DataGridViewX\DataGridViewDateTimeInput\DataGridViewDateTimeInputEditingControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\DataGridViewX\DataGridViewDoubleInput\DataGridViewDoubleInputCell.cs" />
+    <Compile Include="Controls\DataGridViewX\DataGridViewDoubleInput\DataGridViewDoubleInputColumn.cs" />
+    <Compile Include="Controls\DataGridViewX\DataGridViewDoubleInput\DataGridViewDoubleInputEditingControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\DataGridViewX\DataGridViewIntegerInput\DataGridViewIntegerInputCell.cs" />
+    <Compile Include="Controls\DataGridViewX\DataGridViewIntegerInput\DataGridViewIntegerInputColumn.cs" />
+    <Compile Include="Controls\DataGridViewX\DataGridViewIntegerInput\DataGridViewIntegerInputEditingControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\DataGridViewX\DataGridViewIpAddressInput\DataGridViewIpAddressInputCell.cs" />
+    <Compile Include="Controls\DataGridViewX\DataGridViewIpAddressInput\DataGridViewIpAddressInputColumn.cs" />
+    <Compile Include="Controls\DataGridViewX\DataGridViewIpAddressInput\DataGridViewIpAddressInputEditingControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\DataGridViewX\DataGridViewLabelX\DataGridViewLabelXCell.cs" />
+    <Compile Include="Controls\DataGridViewX\DataGridViewLabelX\DataGridViewLabelXColumn.cs" />
+    <Compile Include="Controls\DataGridViewX\DataGridViewMaskedTextBoxAdv\DataGridViewMaskedTextBoxAdvCell.cs" />
+    <Compile Include="Controls\DataGridViewX\DataGridViewMaskedTextBoxAdv\DataGridViewMaskedTextBoxAdvColumn.cs" />
+    <Compile Include="Controls\DataGridViewX\DataGridViewMaskedTextBoxAdv\DataGridViewMaskedTextBoxAdvEditingControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\DataGridViewX\DataGridViewProgressBarX\DataGridViewProgressBarXCell.cs" />
+    <Compile Include="Controls\DataGridViewX\DataGridViewProgressBarX\DataGridViewProgressBarXColumn.cs" />
+    <Compile Include="Controls\DataGridViewX\DataGridViewSlider\DataGridViewSliderCell.cs" />
+    <Compile Include="Controls\DataGridViewX\DataGridViewSlider\DataGridViewSliderColumn.cs" />
+    <Compile Include="Controls\DataGridViewX\DataGridViewTextBoxDropDown\DataGridViewTextBoxDropDownCell.cs" />
+    <Compile Include="Controls\DataGridViewX\DataGridViewTextBoxDropDown\DataGridViewTextBoxDropDownColumn.cs" />
+    <Compile Include="Controls\DataGridViewX\DataGridViewTextBoxDropDown\DataGridViewTextBoxDropDownEditingControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\DataGridViewX\IDataGridViewColumn.cs" />
+    <Compile Include="Controls\DesktopAlert\DesktopAlert.cs" />
+    <Compile Include="Controls\DesktopAlert\DesktopAlertWindow.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Controls\Flyout\Flyout.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\Flyout\FlyoutColorTable.cs" />
+    <Compile Include="Controls\Flyout\FlyoutForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Controls\Flyout\FlyoutForm.Designer.cs">
+      <DependentUpon>FlyoutForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Controls\GroupPanel.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\DGHScrollBar.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\LabelX.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\Line.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\ListBoxAdv\CheckStateConvertEventArgs.cs" />
+    <Compile Include="Controls\ListBoxAdv\ListBoxAdv.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\ListBoxAdv\ListBoxAdvItemCheckEventArgs.cs" />
+    <Compile Include="Controls\ListBoxAdv\ListBoxAdvItemCheckEventHandler.cs" />
+    <Compile Include="Controls\ListBoxAdv\ListBoxItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\ListBoxAdv\ListBoxItemPainter.cs" />
+    <Compile Include="Controls\ListBoxAdv\ListBoxItemRendererEventArgs.cs" />
+    <Compile Include="Controls\ListBoxAdv\OfficeListBoxItemColorTable.cs" />
+    <Compile Include="Controls\ListBoxAdv\OfficeListBoxItemPainter.cs" />
+    <Compile Include="Controls\ListViewEx.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\MaskedTextBoxAdv.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\NonClientHook.cs" />
+    <Compile Include="Controls\NonClientPaintHandler.cs" />
+    <Compile Include="Controls\PageNavigator.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\PageNavigatorItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\PageSlider\PageSlider.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\PageSlider\PageSliderPage.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\PageSlider\StepIndicator.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\PopupControlHost.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\ProgressBarX.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\ProgressStepper\OfficeStepItemColorTable.cs" />
+    <Compile Include="Controls\ProgressStepper\OfficeStepItemPainter.cs" />
+    <Compile Include="Controls\ProgressStepper\OfficeStepItemStateColorTable.cs" />
+    <Compile Include="Controls\ProgressStepper\ProgressSteps.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\ProgressStepper\StepItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\ProgressStepper\StepItemContainer.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\ProgressStepper\StepItemPainter.cs" />
+    <Compile Include="Controls\ProgressStepper\StepItemRendererEventArgs.cs" />
+    <Compile Include="Controls\TabbedForm\MultiFormAppContext.cs" />
+    <Compile Include="Controls\TabbedForm\NewTabFormItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\TabbedForm\OfficeNewTabFormItemPainter.cs" />
+    <Compile Include="Controls\TabbedForm\OfficeTabFormItemPainter.cs" />
+    <Compile Include="Controls\TabbedForm\OfficeTabFormStripPainter.cs" />
+    <Compile Include="Controls\TabbedForm\TabFormColorTable.cs" />
+    <Compile Include="Controls\RangeSlider.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\RatingStar.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\ReflectionImage.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\ReflectionLabel.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\RichTextBoxEx.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\RichTextBoxScrollEx.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\ScrollbarControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\ScrollBarReplacement.cs" />
+    <Compile Include="Controls\ScrollbarSkinner.cs" />
+    <Compile Include="Controls\SideNav\OfficeSideNavItemPainter.cs" />
+    <Compile Include="Controls\SideNav\SideNav.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\SideNav\SideNavItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\SideNav\SideNavItemPainter.cs" />
+    <Compile Include="Controls\SideNav\SideNavItemRendererEventArgs.cs" />
+    <Compile Include="Controls\SideNav\SideNavItemStateColorTable.cs" />
+    <Compile Include="Controls\SideNav\SideNavPanel.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\SideNav\SideNavStrip.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\SlidePanel\SlidePanel.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Controls\SlidePanel\SliderButton.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\Slider.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\SymbolBox.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\TabbedForm\TabFormItemBase.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\TabbedForm\TabFormItemColorTable.cs" />
+    <Compile Include="Controls\TabbedForm\TabFormPainter.cs" />
+    <Compile Include="Controls\TabbedForm\TabParentForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Controls\TabbedForm\TabFormControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\TabbedForm\TabFormItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\TabbedForm\TabFormPanel.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\TabbedForm\TabFormStateColorTable.cs" />
+    <Compile Include="Controls\TabbedForm\TabFormStripContainerItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\TabbedForm\TabFormStripControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\TabbedForm\TabFormStripPainter.cs" />
+    <Compile Include="Controls\TextBoxDropDown.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\TextBoxX.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\DGVScrollBar.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\TokenEditor\EditToken.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\TokenEditor\TokenEditor.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\TokenEditor\TokenEditorColorTable.cs" />
+    <Compile Include="Controls\Toolbox\ToolboxControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\Toolbox\ToolboxGroup.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\Toolbox\ToolboxItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\WarningBox.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Controls\WarningBox.Designer.cs">
+      <DependentUpon>WarningBox.cs</DependentUpon>
+    </Compile>
+    <Compile Include="CrumbBar\CrumbBar.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="CrumbBar\CrumbBarItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="CrumbBar\CrumbBarItemsCollection.cs" />
+    <Compile Include="CrumbBar\CrumbBarItemView.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="CrumbBar\CrumbBarItemViewPainter.cs" />
+    <Compile Include="CrumbBar\CrumbBarOverflowButton.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="CrumbBar\CrumbBarViewContainer.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="AdvTree\ElementStyleCollection.cs" />
+    <Compile Include="Dpi.cs" />
+    <Compile Include="DualButton.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Editors\Calculator\Calculator.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Editors\Calculator\Calculator.Designer.cs">
+      <DependentUpon>Calculator.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Editors\DateTimeAdv\TimeSelector.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Editors\DateTimeAdv\TimeSelectorItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Editors\IPAddressGroup.cs" />
+    <Compile Include="Editors\IpAddressInput.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="EllipticalShapeDescriptor.cs" />
+    <Compile Include="FormatHelper.cs" />
+    <Compile Include="ICommand.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="ItemDockContainer.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="ItemVisualGenerator.cs" />
+    <Compile Include="Metro\BorderColors.cs" />
+    <Compile Include="Metro\ColorTables\MetroColorTable.cs" />
+    <Compile Include="Metro\ColorTables\MetroColorTableInitializer.cs" />
+    <Compile Include="Metro\ColorTables\MetroFormColorTable.cs" />
+    <Compile Include="Metro\ColorTables\MetroOfficeColorTableInitializer.cs" />
+    <Compile Include="Metro\ColorTables\MetroStatusBarColorTable.cs" />
+    <Compile Include="Metro\ColorTables\MetroTabColorTable.cs" />
+    <Compile Include="Metro\ColorTables\MetroTabItemColorTable.cs" />
+    <Compile Include="Metro\ColorTables\MetroTabStripColorTable.cs" />
+    <Compile Include="Metro\ColorTables\MetroTileColorTable.cs" />
+    <Compile Include="Metro\ColorTables\MetroToolbarColorTable.cs" />
+    <Compile Include="Metro\ColorTables\Office2016ColorTableInitializer.cs" />
+    <Compile Include="Metro\ColorTables\Office2016MetroInitializer.cs" />
+    <Compile Include="Metro\ColorTables\VisualStudio2012ColorTableInitializer.cs" />
+    <Compile Include="Metro\ColorTables\VisualStudio2012OfficeColorTableInitializer.cs" />
+    <Compile Include="Metro\Helpers\ColorHelpers.cs" />
+    <Compile Include="Metro\Helpers\DoubleHelpers.cs" />
+    <Compile Include="Metro\MetroAppButton.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Metro\MetroAppForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Metro\MetroForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Metro\MetroMessageBoxDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Metro\MetroQatCustomizeDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Metro\MetroShell.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Metro\MetroStatusBar.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Metro\MetroStripContainerItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Metro\MetroTabItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Metro\MetroTabItemContainer.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Metro\MetroTabPanel.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Metro\MetroTabStrip.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Metro\MetroTileItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Metro\MetroTilePanel.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Metro\MetroToolbar.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Metro\MetroToolbarContainer.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Metro\ColorTables\OfficeMobile2014ColorTableInitializer.cs" />
+    <Compile Include="Metro\ColorTables\OfficeMobile2014MetroInitializer.cs" />
+    <Compile Include="Metro\Rendering\DrawingHelpers.cs" />
+    <Compile Include="Metro\Rendering\MetroAppButtonPainter.cs" />
+    <Compile Include="Metro\Rendering\MetroButtonItemPainter.cs" />
+    <Compile Include="Metro\Rendering\MetroCaptionItemPainter.cs" />
+    <Compile Include="Metro\Rendering\MetroFormRenderer.cs" />
+    <Compile Include="Metro\Rendering\MetroKeyTipsPainter.cs" />
+    <Compile Include="Metro\Rendering\MetroRender.cs" />
+    <Compile Include="Metro\Rendering\MetroRibbonTabGroupPainter.cs" />
+    <Compile Include="Metro\Rendering\MetroScrollBarPainter.cs" />
+    <Compile Include="Metro\Rendering\MetroStatusBarPainter.cs" />
+    <Compile Include="Metro\Rendering\MetroSwitchButtonPainter.cs" />
+    <Compile Include="Metro\Rendering\MetroTabItemPainter.cs" />
+    <Compile Include="Metro\Rendering\MetroTabStripPainter.cs" />
+    <Compile Include="Metro\Rendering\MetroTileItemPainter.cs" />
+    <Compile Include="Metro\Rendering\MetroToolbarPainter.cs" />
+    <Compile Include="Metro\Thickness.cs" />
+    <Compile Include="MicroCharts\AreaMicroChart.cs" />
+    <Compile Include="MicroCharts\BarBaseMicroChart.cs" />
+    <Compile Include="MicroCharts\BarMicroChart.cs" />
+    <Compile Include="MicroCharts\ColumnMicroChart.cs" />
+    <Compile Include="MicroCharts\HundredPctBar.cs" />
+    <Compile Include="MicroCharts\LineMicroChart.cs" />
+    <Compile Include="MicroCharts\MicroChart.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="MicroCharts\MicroChartBase.cs" />
+    <Compile Include="MicroCharts\MicroChartItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="MicroCharts\PieMicroChart.cs" />
+    <Compile Include="MicroCharts\PlotMicroChart.cs" />
+    <Compile Include="MicroCharts\WinLoseMicroChart.cs" />
+    <Compile Include="PopupDelayedClose.cs" />
+    <Compile Include="PopupManager.cs" />
+    <Compile Include="Primitives\CustomCollection.cs" />
+    <Compile Include="PropertyGrid\AdvPropertyGrid.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="PropertyGrid\AdvPropertyGridAppearance.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="PropertyGrid\AdvPropertyGridLocalization.cs" />
+    <Compile Include="PropertyGrid\PropertyCategoryNode.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="PropertyGrid\PropertyCheckBoxNode.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="PropertyGrid\PropertyDateTimeEditor.cs" />
+    <Compile Include="PropertyGrid\PropertyDoubleEditor.cs" />
+    <Compile Include="PropertyGrid\PropertyIntegerEditor.cs" />
+    <Compile Include="PropertyGrid\PropertyMultiChoiceEditor.cs" />
+    <Compile Include="PropertyGrid\PropertyOptionListNode.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="PropertyGrid\PropertySettings.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="PropertyGrid\PropertyNode.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="PropertyGrid\PropertyNodeColor.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="PropertyGrid\PropertyNodeFactory.cs" />
+    <Compile Include="PropertyGrid\PropertyParser.cs" />
+    <Compile Include="PropertyGrid\PropertySettingsCollection.cs" />
+    <Compile Include="PropertyGrid\PropertySliderEditor.cs" />
+    <Compile Include="RadialMenu\RadialMenu.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="RadialMenu\RadialMenuColorTable.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="RadialMenu\RadialMenuContainer.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="RadialMenu\RadialMenuItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="RadialMenu\RadialMenuPopup.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="RatingItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Rendering\ButtonItemStaticColorTables.cs" />
+    <Compile Include="Rendering\CrumbBarItemViewColorTable.cs" />
+    <Compile Include="Rendering\CrumbBarItemViewStateColorTable.cs" />
+    <Compile Include="Rendering\NotificationMarkPainter.cs" />
+    <Compile Include="Rendering\Office2007CalendarViewColorTable.cs" />
+    <Compile Include="Rendering\Office2007VistaBlackColorTableFactory.cs" />
+    <Compile Include="Rendering\Office2007WarningBoxColorTable.cs" />
+    <Compile Include="Rendering\Office2010AppButtonPainter.cs" />
+    <Compile Include="Rendering\Office2010BlackFactory.cs" />
+    <Compile Include="Rendering\Office2010BlueFactory.cs" />
+    <Compile Include="Rendering\Office2010NavPaneButtonPainter.cs" />
+    <Compile Include="Rendering\Office2010RangeSliderPainter.cs" />
+    <Compile Include="Rendering\Office2010RangeSliderColorTable.cs" />
+    <Compile Include="Rendering\Office2010RibbonTabGroupPainter.cs" />
+    <Compile Include="Rendering\Office2010SilverFactory.cs" />
+    <Compile Include="Rendering\Office2010ColorTable.cs" />
+    <Compile Include="Rendering\Office2010SystemCaptionItemPainter.cs" />
+    <Compile Include="Rendering\ResizeHandlePainter.cs" />
+    <Compile Include="Rendering\StepIndicatorColorTable.cs" />
+    <Compile Include="Rendering\SuperTabColorTable.cs" />
+    <Compile Include="Rendering\SuperTabControlBoxStatesColorTable.cs" />
+    <Compile Include="Rendering\SuperTabItemColorTable.cs" />
+    <Compile Include="Rendering\SuperTabItemStateColorTable.cs" />
+    <Compile Include="Rendering\SuperTabLinearGradientColorTable.cs" />
+    <Compile Include="Rendering\SuperTabPanelColorTable.cs" />
+    <Compile Include="Rendering\SuperTabStyleColorFactory.cs" />
+    <Compile Include="Rendering\SwitchButtonColorTable.cs" />
+    <Compile Include="Rendering\VisualStudio2010Factory.cs" />
+    <Compile Include="Rendering\Windows7BlueFactory.cs" />
+    <Compile Include="Rendering\Windows7ColorTable.cs" />
+    <Compile Include="Ribbon\ItemPanelBase.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Ribbon\RangeSliderItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Schedule\Color\CalendarColor.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Schedule\Model\TimeZoneInfo\NativeMethods.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Schedule\Model\TimeZoneInfo\TimeZoneInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Schedule\Model\TimeZoneInfo\UnsafeNativeMethods.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Separator.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="ShapeDescriptor.cs" />
+    <Compile Include="CustomizeItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Editors\DateTimeAdv\CalendarBase.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Editors\DateTimeAdv\DateAppearanceDescription.cs" />
+    <Compile Include="Editors\DateTimeAdv\HourPeriodInput.cs" />
+    <Compile Include="Editors\DateTimeAdv\MonthCalendarAdv.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Editors\DateTimeAdv\SingleMonthCalendar.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Editors\DateTimeAdv\MonthCalendarColors.cs" />
+    <Compile Include="Editors\DateTimeAdv\DateTimeGroup.cs" />
+    <Compile Include="Editors\DateTimeAdv\DateTimeInput.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Editors\DateTimeAdv\DayLabel.cs" />
+    <Compile Include="Editors\DateTimeAdv\HourPeriodLabel.cs" />
+    <Compile Include="Editors\DateTimeAdv\IDateTimePartInput.cs" />
+    <Compile Include="Editors\DateTimeAdv\MonthNameInput.cs" />
+    <Compile Include="Editors\DateTimeAdv\NumericDayInput.cs" />
+    <Compile Include="Editors\DateTimeAdv\NumericDayOfYearInput.cs" />
+    <Compile Include="Editors\DateTimeAdv\NumericHourInput.cs" />
+    <Compile Include="Editors\DateTimeAdv\NumericMinuteInput.cs" />
+    <Compile Include="Editors\DateTimeAdv\NumericMonthInput.cs" />
+    <Compile Include="Editors\DateTimeAdv\NumericSecondInput.cs" />
+    <Compile Include="Editors\DateTimeAdv\NumericYearInput.cs" />
+    <Compile Include="Editors\DateTimeAdv\ParseDateTimeValueEventArgs.cs" />
+    <Compile Include="Editors\DateTimeAdv\DayLabelItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Editors\DateTimeAdv\DayPaintEventArgs.cs" />
+    <Compile Include="Editors\DoubleInput.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Editors\Enums.cs" />
+    <Compile Include="Editors\InputButtonSettings.cs" />
+    <Compile Include="Editors\InputControlColors.cs" />
+    <Compile Include="Editors\InputValidationEventArgs.cs" />
+    <Compile Include="Editors\IntegerInput.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Editors\LockUpdateCheckBox.cs" />
+    <Compile Include="Editors\DateTimeAdv\MonthCalendarItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Editors\PaintInfo.cs" />
+    <Compile Include="Editors\ParseDoubleValueEventArgs.cs" />
+    <Compile Include="Editors\ParseIntegerValueEventArgs.cs" />
+    <Compile Include="Editors\Primitives\StartsWithPredicate.cs" />
+    <Compile Include="Editors\SystemOptions.cs" />
+    <Compile Include="Editors\VisualButton.cs" />
+    <Compile Include="Editors\VisualButtonBase.cs" />
+    <Compile Include="Editors\VisualCheckBox.cs" />
+    <Compile Include="Editors\VisualControlBase.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Editors\VisualCustomButton.cs" />
+    <Compile Include="Editors\VisualDoubleInput.cs" />
+    <Compile Include="Editors\VisualDropDownButton.cs" />
+    <Compile Include="Editors\VisualGroup.cs" />
+    <Compile Include="Editors\VisualInputBase.cs" />
+    <Compile Include="Editors\NumericInputBase.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Editors\VisualInputGroup.cs" />
+    <Compile Include="Editors\VisualIntegerInput.cs" />
+    <Compile Include="Editors\VisualItem.cs" />
+    <Compile Include="Editors\VisualItemCollection.cs" />
+    <Compile Include="Editors\VisualLabel.cs" />
+    <Compile Include="Editors\VisualListInput.cs" />
+    <Compile Include="Editors\VisualNumericInput.cs" />
+    <Compile Include="Editors\VisualStringListInput.cs" />
+    <Compile Include="Editors\VisualToggleButton.cs" />
+    <Compile Include="Editors\VisualUpDownButton.cs" />
+    <Compile Include="DesignTime.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="DesignTimeDte.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="DisplayHelp.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="DisplayMoreItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="DocumentDock\PanelDockContainer.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="ElementStyle\BackgroundColorBlend.cs" />
+    <Compile Include="ElementStyle\BackgroundColorBlendCollection.cs" />
+    <Compile Include="ElementStyle\BackgroundColorBlendConverter.cs" />
+    <Compile Include="ElementStyle\IElementStyleClassProvider.cs" />
+    <Compile Include="Events\CancelIntValueEventArgs.cs" />
+    <Compile Include="Events\CancelObjectValueEventArgs.cs" />
+    <Compile Include="Events\CheckBoxItemRenderEventArgs.cs" />
+    <Compile Include="Events\ColorPreviewEventArgs.cs" />
+    <Compile Include="Events\EventSourceArgs.cs" />
+    <Compile Include="Events\NavPaneRenderEventArgs.cs" />
+    <Compile Include="Events\ProgressBarItemRenderEventArgs.cs" />
+    <Compile Include="Events\QatCustomizeDialogEventArgs.cs" />
+    <Compile Include="Events\QatCustomizeItemRendererEventArgs.cs" />
+    <Compile Include="Events\QatOverflowItemRendererEventArgs.cs" />
+    <Compile Include="Events\RibbonCustomizeEventArgs.cs" />
+    <Compile Include="Events\MdiSystemItemRendererEventArgs.cs" />
+    <Compile Include="Events\RibbonControlRendererEventArgs.cs" />
+    <Compile Include="Events\RibbonPopupCloseEventArgs.cs" />
+    <Compile Include="Events\SideBarPanelItemRendererEventArgs.cs" />
+    <Compile Include="Events\SideBarRendererEventArgs.cs" />
+    <Compile Include="Events\SliderItemRendererEventArgs.cs" />
+    <Compile Include="ImageHelper.cs" />
+    <Compile Include="IShapeDescriptor.cs" />
+    <Compile Include="Office2007Form\FormCaptionPainter.cs" />
+    <Compile Include="Office2007Form\FormCaptionRendererEventArgs.cs" />
+    <Compile Include="Office2007Form\OfficeForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Office2007Form\Office2007FormCaptionPainter.cs" />
+    <Compile Include="Office2007Form\RibbonForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Office2007Form\Office2007SystemCaptionItemPainter.cs" />
+    <Compile Include="Office2007Form\SystemCaptionItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Office2007Form\SystemCaptionItemPainter.cs" />
+    <Compile Include="Office2007Form\SystemCaptionItemRendererEventArgs.cs" />
+    <Compile Include="PopupItemControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Presentation\Line.cs" />
+    <Compile Include="Presentation\Location.cs" />
+    <Compile Include="Presentation\PaddingInfo.cs" />
+    <Compile Include="Presentation\Rectangle.cs" />
+    <Compile Include="Presentation\Shape.cs" />
+    <Compile Include="Presentation\ShapeBorder.cs" />
+    <Compile Include="Presentation\ShapeCollection.cs" />
+    <Compile Include="Presentation\ShapeFill.cs" />
+    <Compile Include="Presentation\ShapePaintInfo.cs" />
+    <Compile Include="Presentation\ShapePath.cs" />
+    <Compile Include="Presentation\SizeInfo.cs" />
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="Rendering\ColorFactory.cs" />
+    <Compile Include="Rendering\ColorItemPainter.cs" />
+    <Compile Include="Rendering\ElementStyleClassKeys.cs" />
+    <Compile Include="Rendering\GlobalManager.cs" />
+    <Compile Include="Rendering\GradientColorTable.cs" />
+    <Compile Include="Rendering\IOffice2007Painter.cs" />
+    <Compile Include="Rendering\LinearGradientColorTable.cs" />
+    <Compile Include="DockContainerItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="DockingHint.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="DockSite.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="DocumentDock\DocumentBarContainer.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="DocumentDock\DocumentBarContainerConverter.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="DocumentDock\DocumentBaseContainer.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="DocumentDock\DocumentBaseContainerCollection.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="DocumentDock\DocumentDockContainer.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="DocumentDock\DocumentDockContainerConverter.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="DocumentDock\DocumentDockUIManager.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="DocumentDock\DocumentSerializationXml.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="DotNetBarManager.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="DotNetBarResourcesAttribute.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="DotNetBarStreamer.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ElementSerializer.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ElementStyle.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ElementStyleDisplay.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ElementStyleLayout.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Enums.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Events\ColorItemRendererEventArgs.cs" />
+    <Compile Include="Events\DockTabClosingEventHandler.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Events\SerializeItemEventArgs.cs" />
+    <Compile Include="Events\MarkupLinkClickEventArgs.cs" />
+    <Compile Include="ExpandablePanel.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="ExpandableSplitter.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="ExplorerBar.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="ExplorerBarContainerItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="ExplorerBarGroupItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="frmCustomize.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="GenericItemContainer.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Hook.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="HTMLHelp.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ImageItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Interfaces.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ISimpleTab.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ItemPaintArgs.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Items.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ItemSerializationContext.cs" />
+    <Compile Include="ItemsListBox.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="ItemStyle.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ItemStyleMapper.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="LabelItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="LocalizationKeys.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="LogItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="MDISystemItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="MdiWindowListItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="MenuPanel.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="MessageHandler.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="NativeFunctions.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="NavigationBar.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="NavigationBarContainer.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="NavigationPane.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="NavigationPanePanel.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="NavPaneOptions.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="PanelEx.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="PanelExTitle.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="PopupContainer.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="PopupContainerControl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="PopupItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="PopupShadow.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="ProgressBarItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="RemindForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Rendering\NavigationPanePainter.cs" />
+    <Compile Include="Rendering\Office2007BarColorTable.cs" />
+    <Compile Include="Rendering\Office2007ButtonItemColorTable.cs" />
+    <Compile Include="Rendering\Office2007ButtonItemColorTableCollection.cs" />
+    <Compile Include="Rendering\Office2007ButtonItemStateColorTable.cs" />
+    <Compile Include="Rendering\Office2007CheckBoxColorTable.cs" />
+    <Compile Include="Rendering\Office2007CheckBoxStateColorTable.cs" />
+    <Compile Include="Rendering\Office2007ColorItemColorTable.cs" />
+    <Compile Include="Rendering\Office2007ColorItemPainter.cs" />
+    <Compile Include="Rendering\Office2007ColorTable.cs" />
+    <Compile Include="Rendering\Office2007ColorTableFactory.cs" />
+    <Compile Include="Rendering\Office2007ComboBoxColorTable.cs" />
+    <Compile Include="Rendering\Office2007ComboBoxStateColorTable.cs" />
+    <Compile Include="Rendering\Office2007DataGridViewColorTable.cs" />
+    <Compile Include="Rendering\Office2007DialogLauncherColorTable.cs" />
+    <Compile Include="Rendering\Office2007DialogLauncherStateColorTable.cs" />
+    <Compile Include="Rendering\Office2007FormCaptionColorTable.cs" />
+    <Compile Include="Rendering\Office2007FormCaptionStateColorTable.cs" />
+    <Compile Include="Rendering\Office2007GalleryColorTable.cs" />
+    <Compile Include="Rendering\Office2007ItemGroupColorTable.cs" />
+    <Compile Include="Rendering\Office2007KeyTipsColorTable.cs" />
+    <Compile Include="Rendering\Office2007ListViewColorTable.cs" />
+    <Compile Include="Rendering\Office2007MenuColorTable.cs" />
+    <Compile Include="Rendering\Office2007NavigationPaneColorTable.cs" />
+    <Compile Include="Rendering\Office2007NavigationPanePainter.cs">
+    </Compile>
+    <Compile Include="Rendering\Office2007ProgressBarColorTable.cs" />
+    <Compile Include="Rendering\Office2007ProgressBarItemPainter.cs" />
+    <Compile Include="Rendering\Office2007QatCustomizeItemPainter.cs" />
+    <Compile Include="Rendering\Office2007QatOverflowPainter.cs" />
+    <Compile Include="Rendering\Office2007QuickAccessToolbarColorTable.cs" />
+    <Compile Include="Rendering\Office2007QuickAccessToolbarStateColorTable.cs" />
+    <Compile Include="Rendering\Office2007Renderer.cs" />
+    <Compile Include="Rendering\Office2007RibbonBarColorTable.cs" />
+    <Compile Include="Rendering\Office2007RibbonBarStateColorTable.cs" />
+    <Compile Include="Rendering\Office2007RibbonColorTable.cs" />
+    <Compile Include="Rendering\Office2007RibbonOverflowPainter.cs" />
+    <Compile Include="Rendering\Office2007RibbonTabGroupColorTable.cs" />
+    <Compile Include="Rendering\Office2007RibbonTabGroupColorTableCollection.cs" />
+    <Compile Include="Rendering\Office2007RibbonTabItemColorTable.cs" />
+    <Compile Include="Rendering\Office2007RibbonTabItemColorTableCollection.cs" />
+    <Compile Include="Rendering\Office2007RibbonTabItemStateColorTable.cs" />
+    <Compile Include="Rendering\Office2007ScrollBarColorTable.cs" />
+    <Compile Include="Rendering\Office2007ScrollBarStateColorTable.cs" />
+    <Compile Include="Rendering\Office2007SideBarColorTable.cs" />
+    <Compile Include="Rendering\Office2007SideBarPainter.cs" />
+    <Compile Include="Rendering\Office2007SilverColorTableFactory.cs" />
+    <Compile Include="Rendering\Office2007SliderColorTable.cs" />
+    <Compile Include="Rendering\Office2007SliderPainter.cs" />
+    <Compile Include="Rendering\Office2007SliderStateColorTable.cs" />
+    <Compile Include="Rendering\Office2007SuperTooltipColorTable.cs" />
+    <Compile Include="Rendering\Office2007SystemButtonColorTable.cs" />
+    <Compile Include="Rendering\Office2007SystemButtonStateColorTable.cs" />
+    <Compile Include="Rendering\Office2007TabColorTable.cs" />
+    <Compile Include="Rendering\Office2007TabItemStateColorTable.cs" />
+    <Compile Include="Rendering\ProgressBarItemPainter.cs" />
+    <Compile Include="Rendering\QatCustomizeItemPainter.cs" />
+    <Compile Include="Rendering\QatOverflowPainter.cs" />
+    <Compile Include="Rendering\SideBarPainter.cs" />
+    <Compile Include="Rendering\SliderPainter.cs" />
+    <Compile Include="Ribbon\BarBackgroundPainter.cs" />
+    <Compile Include="Ribbon\BaseItemAutoSizeBag.cs" />
+    <Compile Include="Ribbon\ButtonItemPainter.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Ribbon\ButtonItemPainterHelper.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Ribbon\ButtonItemRendererEventArgs.cs" />
+    <Compile Include="Ribbon\CaptionItemContainer.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Ribbon\DesignTimeProviderContainer.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Ribbon\EventDelegates.cs" />
+    <Compile Include="Ribbon\FadeAnimator.cs" />
+    <Compile Include="Ribbon\GalleryContainer.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Ribbon\GalleryGroup.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Ribbon\GalleryGroupCollection.cs" />
+    <Compile Include="Ribbon\ISimpleElement.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Ribbon\ItemBlockLayoutManager.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Ribbon\ItemContainer.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Ribbon\ItemContainerPainter.cs" />
+    <Compile Include="Ribbon\ItemContainerRendererEventArgs.cs" />
+    <Compile Include="Ribbon\ItemControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Ribbon\ItemDisplay.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Ribbon\ItemPanel.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Ribbon\KeyTipsCanvasControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Ribbon\KeyTipsPainter.cs" />
+    <Compile Include="Ribbon\KeyTipsRendererEventArgs.cs" />
+    <Compile Include="Ribbon\MdiSystemItemPainter.cs" />
+    <Compile Include="Ribbon\MessageBoxDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Ribbon\MessageBoxEx.cs" />
+    <Compile Include="Ribbon\Office2007KeyTipsPainter.cs" />
+    <Compile Include="Ribbon\Office2003ButtonItemPainter.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Ribbon\Office2003RibbonTabItemPainter.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Ribbon\Office2007BarBackgroundPainter.cs" />
+    <Compile Include="Ribbon\Office2007ButtonItemPainter.cs" />
+    <Compile Include="Ribbon\Office2007ItemContainerPainter.cs" />
+    <Compile Include="Ribbon\Office2007DialogLauncherPainter.cs" />
+    <Compile Include="Ribbon\Office2007MdiSystemItemPainter.cs" />
+    <Compile Include="Ribbon\Office2007RibbonControlPainter.cs" />
+    <Compile Include="Ribbon\Office2007RibbonTabGroupPainter.cs" />
+    <Compile Include="Ribbon\Office2007RibbonTabItemPainter.cs" />
+    <Compile Include="Ribbon\ApplicationButton.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Ribbon\PainterFactory.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Ribbon\PanelControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Ribbon\QatCustomizeDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Ribbon\QatCustomizeItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Ribbon\QatCustomizePanel.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Ribbon\QatToolbar.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Ribbon\RibbonBar.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Ribbon\DialogLauncherPainter.cs" />
+    <Compile Include="Ribbon\RibbonBarMergeContainer.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Ribbon\RibbonClientPanel.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Ribbon\RibbonControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Ribbon\RibbonControlPainter.cs" />
+    <Compile Include="Ribbon\RibbonDialogLauncherRendererEventArgs.cs" />
+    <Compile Include="Ribbon\RibbonLocalization.cs" />
+    <Compile Include="Ribbon\RibbonOverflowButtonItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Ribbon\RibbonPanel.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Ribbon\RibbonPredefinedColorSchemes.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Rendering\BaseRenderer.cs" />
+    <Compile Include="Ribbon\QatOverflowItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Ribbon\RibbonStrip.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Ribbon\RibbonStripContainerItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Ribbon\RibbonTabGroupPainter.cs" />
+    <Compile Include="Ribbon\RibbonTabGroupRendererEventArgs.cs" />
+    <Compile Include="Ribbon\RibbonTabItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Ribbon\RibbonTabItemContainer.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Ribbon\RibbonTabItemGroup.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Ribbon\RibbonTabItemGroupCollection.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Ribbon\RibbonTabItemRendererEventArgs.cs" />
+    <Compile Include="Ribbon\SimpleElement.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Ribbon\SimpleElementLayout.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Ribbon\SimpleNodeDisplay.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Ribbon\SliderItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Ribbon\Spacing.cs" />
+    <Compile Include="Ribbon\SubItemsQatCollection.cs" />
+    <Compile Include="Ribbon\SuperTooltip.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Ribbon\SuperTooltipControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Ribbon\ThemedButtonItemPainter.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Ribbon\ThreadUIOperation.cs" />
+    <Compile Include="Ribbon\ToolbarRendererEventArgs.cs" />
+    <Compile Include="RoundRectangleShapeDescriptor.cs">
+    </Compile>
+    <Compile Include="ScrollBar\HScrollBarAdv.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="ScrollBar\Office2007ScrollBarPainter.cs" />
+    <Compile Include="ScrollBar\ScrollBarAdv.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="ScrollBar\ScrollBarCore.cs" />
+    <Compile Include="ScrollBar\ScrollBarPainter.cs" />
+    <Compile Include="ScrollBar\VScrollBarAdv.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="ScrollButton.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="ShadowPainter.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ShortcutCollection.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="SideBar.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SideBarContainerItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SideBarPanelControlHost.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SideBarPanelItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SimpleItemContainer.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SimpleTabDisplay.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="SimpleTabLayoutManager.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="SplitterMozillaPainter.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="SplitterOffice2003Painter.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="SplitterPainter.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="StringHelper.cs" />
+    <Compile Include="StyleManager.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="StyleManagerAmbient.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SubItemsCollection.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="SuperTabControl\Office2007\Office2007SuperTabItem.cs" />
+    <Compile Include="SuperTabControl\Office2007\Office2007SuperTabStrip.cs" />
+    <Compile Include="SuperTabControl\Office2010Backstage\Office2010BackstageSuperTabItem.cs" />
+    <Compile Include="SuperTabControl\Office2010Backstage\Office2010BackstageSuperTabStrip.cs" />
+    <Compile Include="SuperTabControl\OfficeMobile2014\OfficeMobile2014SuperTabItem.cs" />
+    <Compile Include="SuperTabControl\OfficeMobile2014\OfficeMobile2014SuperTabStrip.cs" />
+    <Compile Include="SuperTabControl\OneNote2007\OneNote2007SuperTabItem.cs" />
+    <Compile Include="SuperTabControl\OneNote2007\OneNote2007SuperTabStrip.cs" />
+    <Compile Include="SuperTabControl\SuperTabControlBox\SuperTabCloseBox.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SuperTabControl\SuperTabControlBox\SuperTabControlBox.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SuperTabControl\SuperTabControlBox\SuperTabMenuBox.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SuperTabControl\SuperTabControl\SuperTabControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SuperTabControl\SuperTabControl\SuperTabControlPanel.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SuperTabControl\SuperTabItem\SuperTabItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SuperTabControl\SuperTabItem\SuperTabItemBaseDisplay.cs" />
+    <Compile Include="SuperTabControl\SuperTabStrip\SuperTabDragWindow.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="SuperTabControl\SuperTabStrip\SuperTabDragWindow.Designer.cs">
+      <DependentUpon>SuperTabDragWindow.cs</DependentUpon>
+    </Compile>
+    <Compile Include="SuperTabControl\SuperTabStrip\SuperTabStrip.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SuperTabControl\SuperTabStrip\SuperTabStripBaseDisplay.cs" />
+    <Compile Include="SuperTabControl\SuperTabStrip\SuperTabStripItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SuperTabControl\SuperTabStrip\SuperTabStripLayoutManager.cs" />
+    <Compile Include="SuperTabControl\VS2008Dock\VS2008DockSuperTabItem.cs" />
+    <Compile Include="SuperTabControl\VS2008Dock\VS2008SuperTabStrip.cs" />
+    <Compile Include="SuperTabControl\VS2008Document\VS2008DocumentSuperTabItem.cs" />
+    <Compile Include="SuperTabControl\VS2008Document\VS2008DocumentSuperTabStrip.cs" />
+    <Compile Include="SuperTabControl\WinMediaPlayer12\WinMediaPlayer12SuperTabItem.cs" />
+    <Compile Include="SuperTabControl\WinMediaPlayer12\WinMediaPlayer12SuperTabStrip.cs" />
+    <Compile Include="SwitchButton\Office2010SwitchButtonPainter.cs" />
+    <Compile Include="SwitchButton\SwitchButton.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SwitchButton\SwitchButtonItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SwitchButton\SwitchButtonPainter.cs" />
+    <Compile Include="SwitchButton\SwitchButtonRenderEventArgs.cs" />
+    <Compile Include="Symbols.cs" />
+    <Compile Include="TabColors.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="TabColorScheme.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="TabControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="TabControlPanel.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="TabItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="TabItemAccessibleObject.cs" />
+    <Compile Include="TabItemLayoutManager.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="TabsCollection.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="TabStrip.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="TabStripAccessibleObject.cs" />
+    <Compile Include="TabStripBaseDisplay.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="TabStripOffice2007DockDisplay.cs" />
+    <Compile Include="TabStripOffice2007DocumentDisplay.cs" />
+    <Compile Include="TabStripRoundHeaderDisplay.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="TabStripSimulatedThemeDisplay.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="TabStripVS2005DockDisplay.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="TaskDialog\TaskDialog.cs" />
+    <Compile Include="TaskDialog\TaskDialogForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="TaskDialog\TaskDialogForm.Designer.cs">
+      <DependentUpon>TaskDialogForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="TextBoxItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="TextDrawing.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="TextMarkup\BodyElement.cs" />
+    <Compile Include="TextMarkup\ContainerElement.cs" />
+    <Compile Include="TextMarkup\Div.cs" />
+    <Compile Include="TextMarkup\EndMarkupElement.cs" />
+    <Compile Include="TextMarkup\ExpandElement.cs" />
+    <Compile Include="TextMarkup\FontChangeElement.cs" />
+    <Compile Include="TextMarkup\FontElement.cs" />
+    <Compile Include="TextMarkup\Heading.cs" />
+    <Compile Include="TextMarkup\HyperLink.cs" />
+    <Compile Include="TextMarkup\IActiveMarkupElement.cs" />
+    <Compile Include="TextMarkup\ImageElement.cs" />
+    <Compile Include="TextMarkup\Italic.cs" />
+    <Compile Include="TextMarkup\MarkupDrawContext.cs" />
+    <Compile Include="TextMarkup\MarkupElement.cs" />
+    <Compile Include="TextMarkup\MarkupElementCollection.cs" />
+    <Compile Include="TextMarkup\MarkupLayoutManager.cs" />
+    <Compile Include="TextMarkup\MarkupParser.cs" />
+    <Compile Include="TextMarkup\MarkupSettings.cs" />
+    <Compile Include="TextMarkup\NewLine.cs" />
+    <Compile Include="TextMarkup\Paragraph.cs" />
+    <Compile Include="TextMarkup\Span.cs" />
+    <Compile Include="TextMarkup\Strike.cs" />
+    <Compile Include="TextMarkup\Strong.cs" />
+    <Compile Include="TextMarkup\SymbolElement.cs" />
+    <Compile Include="TextMarkup\TextElement.cs" />
+    <Compile Include="TextMarkup\Underline.cs" />
+    <Compile Include="Themes.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ToastDisplay.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="ToastNotification.cs" />
+    <Compile Include="ToolbarName.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="ToolTip.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Touch\TouchHandler.cs" />
+    <Compile Include="Touch\WinApi.cs" />
+    <Compile Include="UIGraphics.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Validator\CompareValidator.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Validator\CustomValidator.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Validator\Highlighter.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Validator\ErrorProviderWrapper.cs" />
+    <Compile Include="Validator\HighlightPanel.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Validator\IErrorProvider.cs" />
+    <Compile Include="Validator\RangeValidator.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Validator\RegularExpressionValidator.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Validator\RequiredFieldValidator.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Validator\SuperValidator.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Validator\ValidatorBase.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="WinApi.cs" />
+    <Compile Include="Wizard\Wizard.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Wizard\WizardButtonsEventArgs.cs" />
+    <Compile Include="Wizard\WizardPage.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Wizard\WizardPageCollection.cs" />
+    <Compile Include="Wizard\WizardPageChangeEventArgs.cs" />
+    <EmbeddedResource Include="Balloon.resx">
+      <DependentUpon>Balloon.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="BalloonImages\AlertHot.png" />
+    <EmbeddedResource Include="BalloonImages\AlertNormal.png" />
+    <EmbeddedResource Include="BalloonImages\AlertPress.png" />
+    <EmbeddedResource Include="BalloonImages\BalloonHot.png" />
+    <EmbeddedResource Include="BalloonImages\BalloonNormal.png" />
+    <EmbeddedResource Include="BalloonImages\BalloonPress.png" />
+    <EmbeddedResource Include="BalloonTip.bmp" />
+    <EmbeddedResource Include="BarEditorImages\FileClose.bmp" />
+    <EmbeddedResource Include="BarEditorImages\FileCloseSol.bmp" />
+    <EmbeddedResource Include="BarEditorImages\FileNew.bmp" />
+    <EmbeddedResource Include="BarEditorImages\FileOpen.bmp" />
+    <EmbeddedResource Include="BarEditorImages\FileOpenSol.bmp" />
+    <EmbeddedResource Include="ColorPicker.resx">
+      <DependentUpon>ColorPicker.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="ColorSchemeEditor.resx">
+      <DependentUpon>ColorSchemeEditor.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Controls\ComboBoxEx.bmp" />
+    <EmbeddedResource Include="DRAGCOPY.CUR" />
+    <EmbeddedResource Include="DRAGMOVE.CUR" />
+    <EmbeddedResource Include="DRAGNONE.CUR" />
+    <EmbeddedResource Include="ExpandablePanel.ico" />
+    <EmbeddedResource Include="ExpandableSplitter.bmp" />
+    <EmbeddedResource Include="ExpandableSplitter.resx">
+      <DependentUpon>ExpandableSplitter.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="ExplorerBar.bmp" />
+    <EmbeddedResource Include="frmCustomize.resx">
+      <DependentUpon>frmCustomize.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="NavigationBar.bmp" />
+    <EmbeddedResource Include="NavigationPane.bmp" />
+    <EmbeddedResource Include="NavigationPane.resx">
+      <DependentUpon>NavigationPane.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="NavPaneOptions.resx">
+      <DependentUpon>NavPaneOptions.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="PanelEx.bmp" />
+    <EmbeddedResource Include="RemindForm.resx">
+      <DependentUpon>RemindForm.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Ribbon\ItemControl.resx">
+      <DependentUpon>ItemControl.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Ribbon\RibbonBar.ico" />
+    <EmbeddedResource Include="Ribbon\RibbonControl.ico" />
+    <EmbeddedResource Include="Ribbon\RibbonControl.png" />
+    <EmbeddedResource Include="SideBar.bmp" />
+    <EmbeddedResource Include="SideBar.resx">
+      <DependentUpon>SideBar.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Strings.resources" />
+    <EmbeddedResource Include="Strings_de.resources" />
+    <EmbeddedResource Include="Strings_es.resources" />
+    <EmbeddedResource Include="Strings_fr.resources" />
+    <EmbeddedResource Include="Strings_it.resources" />
+    <EmbeddedResource Include="Strings_ja.resources" />
+    <EmbeddedResource Include="Strings_ko.resources" />
+    <EmbeddedResource Include="Strings_sv.resources" />
+    <EmbeddedResource Include="Strings_zh-chs.resources" />
+    <EmbeddedResource Include="Strings_zh-cht.resources" />
+    <EmbeddedResource Include="SystemImages\AddMoreItemsContainer.png" />
+    <EmbeddedResource Include="SystemImages\CollapseTitle.png" />
+    <EmbeddedResource Include="SystemImages\DefaultNavBarImage.png" />
+    <EmbeddedResource Include="SystemImages\DockHintAllSides.png" />
+    <EmbeddedResource Include="SystemImages\DockHintBottom.png" />
+    <EmbeddedResource Include="SystemImages\DockHintLeft.png" />
+    <EmbeddedResource Include="SystemImages\DockHintRight.png" />
+    <EmbeddedResource Include="SystemImages\DockHintTab.png" />
+    <EmbeddedResource Include="SystemImages\DockHintTop.png" />
+    <EmbeddedResource Include="SystemImages\ExpandTitle.png" />
+    <EmbeddedResource Include="SystemImages\NavBarConfigure.png" />
+    <EmbeddedResource Include="SystemImages\NavBarShowLess.png" />
+    <EmbeddedResource Include="SystemImages\NavBarShowMore.png" />
+    <EmbeddedResource Include="SystemImages\Note24.png" />
+    <EmbeddedResource Include="SystemImages\Note64.png" />
+    <EmbeddedResource Include="SystemImages\Pin.png" />
+    <EmbeddedResource Include="SystemImages\PinInactive.png" />
+    <EmbeddedResource Include="SystemImages\PinPushed.png" />
+    <EmbeddedResource Include="SystemImages\PinPushedInactive.png" />
+    <EmbeddedResource Include="TabControl.bmp" />
+    <EmbeddedResource Include="TabControl.resx">
+      <DependentUpon>TabControl.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="TabStrip.bmp" />
+    <EmbeddedResource Include="ToolbarName.resx">
+      <DependentUpon>ToolbarName.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="AdvTree\AdvTree.resx">
+      <DependentUpon>AdvTree.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="AdvTree\Cell.resx">
+      <DependentUpon>Cell.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Controls\WarningBox.resx">
+      <SubType>Designer</SubType>
+      <DependentUpon>WarningBox.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Form1.dotNetBarManager1.xml" />
+    <EmbeddedResource Include="Bar.ico" />
+    <EmbeddedResource Include="DotNetBarManager.ico" />
+    <EmbeddedResource Include="Controls\CheckBoxX.ico" />
+    <EmbeddedResource Include="Controls\ProgressBarX.ico" />
+    <EmbeddedResource Include="Controls\ComboBoxEx.ico" />
+    <EmbeddedResource Include="Controls\LabelX.ico" />
+    <EmbeddedResource Include="Controls\ColorPickerButton.ico" />
+    <EmbeddedResource Include="Controls\DataGridViewX.bmp" />
+    <EmbeddedResource Include="Command.ico" />
+    <EmbeddedResource Include="AdvTree.ico" />
+    <EmbeddedResource Include="Controls\ComboTree.ico" />
+    <EmbeddedResource Include="AdvPropertyGrid.ico" />
+    <EmbeddedResource Include="BubbleBar.bmp" />
+    <EmbeddedResource Include="ButtonX\ButtonX.ico" />
+    <EmbeddedResource Include="Controls\GroupPanel.ico" />
+    <EmbeddedResource Include="Controls\Slider.ico" />
+    <EmbeddedResource Include="Controls\ListViewEx.ico" />
+    <EmbeddedResource Include="Controls\ReflectionImage.ico" />
+    <EmbeddedResource Include="Controls\ReflectionLabel.ico" />
+    <EmbeddedResource Include="Controls\MaskedTextBoxAdv.ico" />
+    <EmbeddedResource Include="Controls\TextBoxDropDown.ico" />
+    <EmbeddedResource Include="Controls\PageNavigator.ico" />
+    <EmbeddedResource Include="Controls\RatingStar.ico" />
+    <EmbeddedResource Include="Controls\TextBoxX.ico" />
+    <EmbeddedResource Include="DateTimeInput.ico" />
+    <EmbeddedResource Include="MonthCalendarAdv.ico" />
+    <EmbeddedResource Include="DoubleInput.ico" />
+    <EmbeddedResource Include="IntegerInput.ico" />
+    <EmbeddedResource Include="ScrollBar\HScrollBarAdv.ico" />
+    <EmbeddedResource Include="CrumbBar\CrumbBar.ico" />
+    <EmbeddedResource Include="Controls\WarningBox.ico" />
+    <EmbeddedResource Include="IpAddressInput.ico" />
+    <EmbeddedResource Include="Ribbon\ItemPanel.ico" />
+    <EmbeddedResource Include="Ribbon\RibbonClientPanel.bmp" />
+    <EmbeddedResource Include="Ribbon\SuperTooltip.ico" />
+    <EmbeddedResource Include="StyleManager.ico" />
+    <EmbeddedResource Include="SuperTabControl\SuperTabStrip\SuperTabDragWindow.resx">
+      <DependentUpon>SuperTabDragWindow.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="SystemImages\BlankOffice2010HotSilver.png" />
+    <EmbeddedResource Include="SystemImages\BlankOffice2010NormalSilver.png" />
+    <EmbeddedResource Include="SystemImages\BlankOffice2010PressedSilver.png" />
+    <EmbeddedResource Include="SystemImages\BlankWin7HotBlue.png" />
+    <EmbeddedResource Include="SystemImages\BlankWin7NormalBlue.png" />
+    <EmbeddedResource Include="SystemImages\BlankWin7PressedBlue.png" />
+    <EmbeddedResource Include="Validator\Highlighter.ico" />
+    <EmbeddedResource Include="Validator\SuperValidator.ico" />
+    <EmbeddedResource Include="SystemImages\Category.png" />
+    <EmbeddedResource Include="SystemImages\Sort.png" />
+    <EmbeddedResource Include="SystemImages\ErrorIcon.png" />
+    <EmbeddedResource Include="SystemImages\FreeText.png" />
+    <EmbeddedResource Include="SystemImages\CloseButton.png" />
+    <EmbeddedResource Include="SystemImages\Rating.png" />
+    <EmbeddedResource Include="SystemImages\BlankStartButtonPressedVistaBlack.png" />
+    <EmbeddedResource Include="SystemImages\BlankStartButtonHotVistaBlack.png" />
+    <EmbeddedResource Include="SystemImages\BlankStartButtonNormalVistaBlack.png" />
+    <EmbeddedResource Include="ScrollBar\VScrollBarAdv.ico" />
+    <EmbeddedResource Include="SystemImages\DateReset.png" />
+    <EmbeddedResource Include="SystemImages\ColorPickerButtonImage.png" />
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <SubType>Designer</SubType>
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+    <EmbeddedResource Include="SystemImages\BlankStartButtonPressedBlack.png" />
+    <EmbeddedResource Include="SystemImages\BlankStartButtonPressedSilver.png" />
+    <EmbeddedResource Include="SystemImages\BlankStartButtonNormalSilver.png" />
+    <EmbeddedResource Include="SystemImages\BlankStartButtonHotSilver.png" />
+    <EmbeddedResource Include="SystemImages\BlankStartButtonHot.png" />
+    <EmbeddedResource Include="SystemImages\BlankStartButtonHotBlack.png" />
+    <EmbeddedResource Include="SystemImages\BlankStartButtonNormal.png" />
+    <EmbeddedResource Include="SystemImages\BlankStartButtonNormalBlack.png" />
+    <EmbeddedResource Include="SystemImages\BlankStartButtonPressed.png" />
+    <EmbeddedResource Include="SystemImages\QatCustomizeItemCombo.png" />
+    <EmbeddedResource Include="Ribbon\QatCustomizeDialog.resx">
+      <SubType>Designer</SubType>
+      <DependentUpon>QatCustomizeDialog.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Ribbon\QatCustomizePanel.resx">
+      <SubType>Designer</SubType>
+      <DependentUpon>QatCustomizePanel.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="SystemImages\GreenLight.png" />
+    <EmbeddedResource Include="SystemImages\ColorPickerCustomColors.png" />
+    <EmbeddedResource Include="Wizard\Wizard.ico" />
+    <EmbeddedResource Include="SystemImages\WizardHeaderImage.png" />
+    <EmbeddedResource Include="SystemImages\ImagePlaceHolder16x16.png" />
+    <EmbeddedResource Include="SystemImages\ImagePlaceHolder.png" />
+    <EmbeddedResource Include="SystemImages\RibbonOverflow.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="dotnetbar.snk" />
+    <EmbeddedResource Include="SystemImages\MaterialIcons-Regular.ttf" />
+    <EmbeddedResource Include="SystemImages\FontAwesome.ttf" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="SuperTabControl.ico" />
+    <EmbeddedResource Include="SuperTabStrip.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Controls\SwitchButton.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="SystemImages\TaskBlueFlag.png" />
+    <EmbeddedResource Include="SystemImages\TaskBlueStop.png" />
+    <EmbeddedResource Include="SystemImages\TaskBulb.png" />
+    <EmbeddedResource Include="SystemImages\TaskCheckMark.png" />
+    <EmbeddedResource Include="SystemImages\TaskCheckMark2.png" />
+    <EmbeddedResource Include="SystemImages\TaskDelete.png" />
+    <EmbeddedResource Include="SystemImages\TaskExclamation.png" />
+    <EmbeddedResource Include="SystemImages\TaskFlag.png" />
+    <EmbeddedResource Include="SystemImages\TaskHand.png" />
+    <EmbeddedResource Include="SystemImages\TaskHelp.png" />
+    <EmbeddedResource Include="SystemImages\TaskInformation.png" />
+    <EmbeddedResource Include="SystemImages\TaskInformation2.png" />
+    <EmbeddedResource Include="SystemImages\TaskNoEntry.png" />
+    <EmbeddedResource Include="SystemImages\TaskShield.png" />
+    <EmbeddedResource Include="SystemImages\TaskShieldHelp.png" />
+    <EmbeddedResource Include="SystemImages\TaskShieldOk.png" />
+    <EmbeddedResource Include="SystemImages\TaskShieldStop.png" />
+    <EmbeddedResource Include="SystemImages\TaskStop.png" />
+    <EmbeddedResource Include="SystemImages\TaskStop2.png" />
+    <EmbeddedResource Include="SystemImages\TaskUsers.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="MicroCharts\MicroChart.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Controls\CircularProgress.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="ColorPickers\ColorCombControl.ico" />
+    <EmbeddedResource Include="ColorPickers\CustomColorBlender.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Controls\AnalogClockControl.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="SystemImages\DockHintAllSides2010.png" />
+    <EmbeddedResource Include="SystemImages\DockHintBottom2010.png" />
+    <EmbeddedResource Include="SystemImages\DockHintLeft2010.png" />
+    <EmbeddedResource Include="SystemImages\DockHintRight2010.png" />
+    <EmbeddedResource Include="SystemImages\DockHintTab2010.png" />
+    <EmbeddedResource Include="SystemImages\DockHintTop2010.png" />
+    <EmbeddedResource Include="SystemImages\Office2010BlackClientBackground.png" />
+    <EmbeddedResource Include="SystemImages\Office2010BlueClientBackground.png" />
+    <EmbeddedResource Include="SystemImages\Office2010SilverClientBackground.png" />
+    <EmbeddedResource Include="SystemImages\VS2010ClientBackground.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Metro\MetroShell.ico" />
+    <EmbeddedResource Include="Metro\MetroStatusBar.ico" />
+    <EmbeddedResource Include="Metro\MetroToolbar.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Controls\SlidePanel.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="SystemImages\WinClose.png" />
+    <EmbeddedResource Include="SystemImages\WinMax.png" />
+    <EmbeddedResource Include="SystemImages\WinMin.png" />
+    <EmbeddedResource Include="SystemImages\WinRestore.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TimeSelector.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Controls\PageSlider.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Controls\StepIndicator.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="SystemImages\Shadow3px.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Metro\MetroTilePanel.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="SystemImages\Shadow3px-2.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Editors\Calculator\Calculator.resx">
+      <DependentUpon>Calculator.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="SystemImages\DockHintLeftRight2010.png" />
+    <EmbeddedResource Include="SystemImages\DockHintTopBottom2010.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Calculator.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="SystemImages\Calculator.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="SystemImages\Delete.png" />
+    <EmbeddedResource Include="SystemImages\FirstRecord.png" />
+    <EmbeddedResource Include="SystemImages\LastRecord.png" />
+    <EmbeddedResource Include="SystemImages\NewRecord.png" />
+    <EmbeddedResource Include="SystemImages\NextRecord.png" />
+    <EmbeddedResource Include="SystemImages\PreviousRecord.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Controls\BindingNavigatorEx.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Controls\RichTextBoxEx.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="RadialMenu.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+      <Visible>False</Visible>
+      <ProductName>Windows Installer 3.1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Controls\RangeSlider.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="ProgressSteps.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="ListBoxAdv.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Controls\CollapsibleSplitContainer.ico" />
+    <EmbeddedResource Include="Controls\SymbolBox.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Controls\Flyout\FlyoutForm.resx">
+      <DependentUpon>FlyoutForm.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Controls\TokenEditor.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Controls\Flyout.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Controls\Line.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Controls\SideNav.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Controls\TabFormControl.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Controls\ToolboxControl.bmp" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DotNetBar.ico b/PROMS/DotNetBar Source Code/DotNetBar.ico
new file mode 100644
index 00000000..95a1f596
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DotNetBar.ico differ
diff --git a/PROMS/DotNetBar Source Code/DotNetBar.sln b/PROMS/DotNetBar Source Code/DotNetBar.sln
new file mode 100644
index 00000000..ddf0659a
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBar.sln	
@@ -0,0 +1,37 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.35425.106
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNetBar", "DotNetBar.csproj", "{36546CE3-335C-4AB6-A2F3-40F8C818BC66}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+		Release2005|Any CPU = Release2005|Any CPU
+		ReleaseTrial|Any CPU = ReleaseTrial|Any CPU
+		ReleaseTrial2005|Any CPU = ReleaseTrial2005|Any CPU
+		ReleaseTrialNoLimit|Any CPU = ReleaseTrialNoLimit|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{36546CE3-335C-4AB6-A2F3-40F8C818BC66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{36546CE3-335C-4AB6-A2F3-40F8C818BC66}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{36546CE3-335C-4AB6-A2F3-40F8C818BC66}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{36546CE3-335C-4AB6-A2F3-40F8C818BC66}.Release|Any CPU.Build.0 = Release|Any CPU
+		{36546CE3-335C-4AB6-A2F3-40F8C818BC66}.Release2005|Any CPU.ActiveCfg = Release2005|Any CPU
+		{36546CE3-335C-4AB6-A2F3-40F8C818BC66}.Release2005|Any CPU.Build.0 = Release2005|Any CPU
+		{36546CE3-335C-4AB6-A2F3-40F8C818BC66}.ReleaseTrial|Any CPU.ActiveCfg = ReleaseTrial|Any CPU
+		{36546CE3-335C-4AB6-A2F3-40F8C818BC66}.ReleaseTrial|Any CPU.Build.0 = ReleaseTrial|Any CPU
+		{36546CE3-335C-4AB6-A2F3-40F8C818BC66}.ReleaseTrial2005|Any CPU.ActiveCfg = ReleaseTrial2005|Any CPU
+		{36546CE3-335C-4AB6-A2F3-40F8C818BC66}.ReleaseTrial2005|Any CPU.Build.0 = ReleaseTrial2005|Any CPU
+		{36546CE3-335C-4AB6-A2F3-40F8C818BC66}.ReleaseTrialNoLimit|Any CPU.ActiveCfg = ReleaseTrialNoLimit|Any CPU
+		{36546CE3-335C-4AB6-A2F3-40F8C818BC66}.ReleaseTrialNoLimit|Any CPU.Build.0 = ReleaseTrialNoLimit|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {3FB5F3B5-F346-4DC3-A8A9-F4C0DE754306}
+	EndGlobalSection
+EndGlobal
diff --git a/PROMS/DotNetBar Source Code/DotNetBarBuild.csproj b/PROMS/DotNetBar Source Code/DotNetBarBuild.csproj
new file mode 100644
index 00000000..f8347fb9
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarBuild.csproj	
@@ -0,0 +1,2236 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{36546CE3-335C-4AB6-A2F3-40F8C818BC66}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon>
+    </ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>DevComponents.DotNetBar2</AssemblyName>
+    <AssemblyOriginatorKeyFile>dotnetbar.snk</AssemblyOriginatorKeyFile>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Flow</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE32Nav30</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Library</OutputType>
+    <RootNamespace>DevComponents.DotNetBar</RootNamespace>
+    <StartupObject>
+    </StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <SignAssembly>false</SignAssembly>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <OldToolsVersion>2.0</OldToolsVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>bin\Debug\</OutputPath>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <BaseAddress>0</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DEBUG;DOTNETBAR;FRAMEWORK20</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>true</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>false</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>full</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>bin\Release\</OutputPath>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <BaseAddress>0</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DOTNETBAR;FRAMEWORK20</DefineConstants>
+    <DocumentationFile>DevComponents.DotNetBar.xml</DocumentationFile>
+    <DebugSymbols>false</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>true</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>none</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseTrial|AnyCPU' ">
+    <OutputPath>bin\Release\</OutputPath>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <BaseAddress>0</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;TRIAL;DOTNETBAR</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>false</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>true</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>none</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseTrialNoLimit|AnyCPU' ">
+    <OutputPath>bin\Release\</OutputPath>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <BaseAddress>0</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;TRIAL;NOTIMELIMIT;DOTNETBAR</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>false</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>true</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>none</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release2005|AnyCPU' ">
+    <OutputPath>bin\Release\</OutputPath>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <BaseAddress>0</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DOTNETBAR;FRAMEWORK20</DefineConstants>
+    <DocumentationFile>DevComponents.DotNetBar2.xml</DocumentationFile>
+    <DebugSymbols>false</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>true</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>none</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+    <NoWarn>1591,1573</NoWarn>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseTrial2005|AnyCPU' ">
+    <OutputPath>bin\Release\</OutputPath>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <BaseAddress>0</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;TRIAL;DOTNETBAR;FRAMEWORK20</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>false</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>true</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>none</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+    <NoWarn>1591,1573</NoWarn>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Accessibility">
+      <Name>Accessibility</Name>
+    </Reference>
+    <Reference Include="mscorlib">
+      <Name>mscorlib</Name>
+    </Reference>
+    <Reference Include="System">
+      <Name>System</Name>
+    </Reference>
+    <Reference Include="System.Data">
+      <Name>System.Data</Name>
+    </Reference>
+    <Reference Include="System.Drawing">
+      <Name>System.Drawing</Name>
+    </Reference>
+    <Reference Include="System.Windows.Forms">
+      <Name>SYSTEM.WINDOWS.FORMS</Name>
+    </Reference>
+    <Reference Include="System.Xml">
+      <Name>System.XML</Name>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="AdvTree\AdvTree.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="AdvTree\Cell.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="AdvTree\CellCollection.cs" />
+    <Compile Include="AdvTree\CellEditEventArgs.cs" />
+    <Compile Include="AdvTree\CellImages.cs" />
+    <Compile Include="AdvTree\ColumnHeader.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="AdvTree\ColumnHeaderCollection.cs" />
+    <Compile Include="AdvTree\ColumnHeaderControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="AdvTree\ColumnWidth.cs" />
+    <Compile Include="AdvTree\CommandButtonEventArgs.cs" />
+    <Compile Include="AdvTree\ConnectorPointsCollection.cs" />
+    <Compile Include="AdvTree\CustomEditors.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="AdvTree\Display\CellDisplay.cs" />
+    <Compile Include="AdvTree\Display\ColorTableInitializer.cs" />
+    <Compile Include="AdvTree\Display\ColumnHeaderDisplay.cs" />
+    <Compile Include="AdvTree\Display\ColumnHeaderRendererEventArgs.cs" />
+    <Compile Include="AdvTree\Display\ConnectorRendererEventArgs.cs" />
+    <Compile Include="AdvTree\Display\DragDropMarkerDisplay.cs" />
+    <Compile Include="AdvTree\Display\DragDropMarkerRendererEventArgs.cs" />
+    <Compile Include="AdvTree\Display\LineConnectorDisplay.cs" />
+    <Compile Include="AdvTree\Display\NodeCellRendererEventArgs.cs" />
+    <Compile Include="AdvTree\Display\NodeConnectorDisplay.cs" />
+    <Compile Include="AdvTree\Display\NodeDisplay.cs" />
+    <Compile Include="AdvTree\Display\NodeExpandDisplay.cs" />
+    <Compile Include="AdvTree\Display\NodeExpandEllipseDisplay.cs" />
+    <Compile Include="AdvTree\Display\NodeExpandImageDisplay.cs" />
+    <Compile Include="AdvTree\Display\NodeExpandPartRendererEventArgs.cs" />
+    <Compile Include="AdvTree\Display\NodeExpandRectDisplay.cs" />
+    <Compile Include="AdvTree\Display\NodeExpandTriangleDisplay.cs" />
+    <Compile Include="AdvTree\Display\NodeGroupLineDisplay.cs" />
+    <Compile Include="AdvTree\Display\NodeRendererEventArgs.cs" />
+    <Compile Include="AdvTree\Display\NodeSelectionDisplay.cs" />
+    <Compile Include="AdvTree\Display\NodeSystemRenderer.cs" />
+    <Compile Include="AdvTree\Display\NodeTreeDisplay.cs" />
+    <Compile Include="AdvTree\Display\SelectionColorTable.cs" />
+    <Compile Include="AdvTree\Display\SelectionRendererEventArgs.cs" />
+    <Compile Include="AdvTree\Display\TreeBackgroundRendererEventArgs.cs" />
+    <Compile Include="AdvTree\Display\TreeColorTable.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="AdvTree\Display\TreeExpandColorTable.cs" />
+    <Compile Include="AdvTree\Display\TreeRenderer.cs" />
+    <Compile Include="AdvTree\Display\TreeSelectionColors.cs" />
+    <Compile Include="AdvTree\Drawing\Border.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="AdvTree\Drawing\ColorBlendCollection.cs" />
+    <Compile Include="AdvTree\Drawing\ColorStop.cs" />
+    <Compile Include="AdvTree\Drawing\ColorStopConverter.cs" />
+    <Compile Include="AdvTree\Drawing\CornerRadius.cs" />
+    <Compile Include="AdvTree\Drawing\Fill.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="AdvTree\Drawing\GradientFill.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="AdvTree\Drawing\RectangleShape.cs" />
+    <Compile Include="AdvTree\Drawing\Shape.cs" />
+    <Compile Include="AdvTree\Drawing\SolidBorder.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="AdvTree\Drawing\SolidFill.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="AdvTree\Enums.cs" />
+    <Compile Include="AdvTree\EventDelegates.cs" />
+    <Compile Include="AdvTree\Events\CustomCellEditorEventArgs.cs" />
+    <Compile Include="AdvTree\Events\MarkupLinkClickEventArgs.cs" />
+    <Compile Include="AdvTree\Events\SerializeNodeEventArgs.cs" />
+    <Compile Include="AdvTree\HeaderDefinition.cs" />
+    <Compile Include="AdvTree\HeadersCollection.cs" />
+    <Compile Include="AdvTree\INodeNotify.cs" />
+    <Compile Include="AdvTree\Interop\WinApi.cs" />
+    <Compile Include="AdvTree\KeyNavigation.cs" />
+    <Compile Include="AdvTree\Layout\CellTileLayout.cs" />
+    <Compile Include="AdvTree\Layout\ColumnHeaderLayout.cs" />
+    <Compile Include="AdvTree\Layout\LayoutSettings.cs" />
+    <Compile Include="AdvTree\Layout\NodeCellLayout.cs" />
+    <Compile Include="AdvTree\Layout\NodeLayout.cs" />
+    <Compile Include="AdvTree\Layout\NodeLayoutContextInfo.cs" />
+    <Compile Include="AdvTree\Layout\NodeTileLayout.cs" />
+    <Compile Include="AdvTree\Layout\NodeTreeLayout.cs" />
+    <Compile Include="AdvTree\Node.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="AdvTree\NodeCollection.cs">
+    </Compile>
+    <Compile Include="AdvTree\NodeConnector.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="AdvTree\NodeOperations.cs">
+    </Compile>
+    <Compile Include="AdvTree\NodeStyles.cs" />
+    <Compile Include="AdvTree\SelectedNodesCollection.cs" />
+    <Compile Include="AdvTree\TextBoxEx.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="AdvTree\TreeAreaInfo.cs" />
+    <Compile Include="AdvTree\TreeCellCancelEventArgs.cs" />
+    <Compile Include="AdvTree\TreeCellEventArgs.cs" />
+    <Compile Include="AdvTree\TreeDragDropEventArgs.cs" />
+    <Compile Include="AdvTree\TreeDragFeedbackEventArgs.cs" />
+    <Compile Include="AdvTree\TreeNodeCancelEventArgs.cs" />
+    <Compile Include="AdvTree\TreeNodeCollectionEventArgs.cs" />
+    <Compile Include="AdvTree\TreeNodeEventArgs.cs" />
+    <Compile Include="AdvTree\TreeNodeMouseEventArgs.cs" />
+    <Compile Include="AdvTree\TreeSerializer.cs" />
+    <Compile Include="AdvTree\Utilites.cs" />
+    <Compile Include="AnalogClock\AnalogClockControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="AnalogClock\ClockHandStyleData.cs" />
+    <Compile Include="AnalogClock\ClockStyleData.cs" />
+    <Compile Include="AnalogClock\ColorData.cs" />
+    <Compile Include="AnalogClock\MathHelper.cs" />
+    <Compile Include="Animation\Animation.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Animation\AnimationDouble.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Animation\AnimationInt.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Animation\AnimationPoint.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Animation\AnimationRectangle.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Animation\Storyline.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Attributes.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="AutoHidePanel.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Balloon.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="BalloonTip.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Bar.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="BarBaseControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="BarFunctions.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Bars.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="BarSerialization\BarSerializationXml.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="BarUtilities.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="BaseItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="BaseItemController.cs" />
+    <Compile Include="BindingDef.cs" />
+    <Compile Include="BubbleBar.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="BubbleBarOverlay.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="BubbleBarTab.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="BubbleBarTabCollection.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="BubbleButton.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="BubbleButtonCollection.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="BubbleButtonDisplay.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="BubbleButtonLayoutManager.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="BubbleContentManager.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="BufferedBitmap.cs" />
+    <Compile Include="ButtonItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="ButtonItemLayout.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ButtonX\ButtonX.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="ButtonX\ThemedButtonXPainter.cs" />
+    <Compile Include="CheckBoxItem\CheckBoxItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="CheckBoxItem\CheckBoxItemPainter.cs" />
+    <Compile Include="CheckBoxItem\Office2007CheckBoxItemPainter.cs" />
+    <Compile Include="CircularProgressItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="ColorFunctions.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ColorPicker.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="ColorPickers\ColorCombControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="ColorPickers\ColorContrastControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="ColorPickers\ColorItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="ColorPickers\ColorPickerDropDown.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="ColorPickers\ColorSelectionPreviewControl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="ColorPickers\CombCell.cs" />
+    <Compile Include="ColorPickers\CustomColorBlender.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="ColorPickers\CustomColorDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="ColorScheme.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ColorSchemeEditor.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="ColorSchemeVSEditor.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ColorTypeEditor.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="CommandManager.cs" />
+    <Compile Include="ContainerKeyboardNavigation.cs" />
+    <Compile Include="Controls\BindingNavigatorEx.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\CircularProgress.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\CollapsibleSplitContainer.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\ColorPickerButton.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\ComboBoxEx.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="ComboBoxItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="ComboItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="CompositeImage.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ContentManager\BlockLayoutManager.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ContentManager\Enums.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ContentManager\IBlock.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ContentManager\IBlockExtended.cs" />
+    <Compile Include="ContentManager\IContentLayoutManager.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ContentManager\SerialContentLayoutManager.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ContextExMenuTypeEditor.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ContextMenuBar.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="ContextMenusCollection.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ControlContainerItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\BaseItemControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\CheckBoxX.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\ComboTree.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\ControlWithBackgroundStyle.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\CursorHelper.cs" />
+    <Compile Include="Controls\DataGridViewX.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\DataGridViewX\DataGridViewButtonX\DataGridViewButtonXCell.cs" />
+    <Compile Include="Controls\DataGridViewX\DataGridViewButtonX\DataGridViewButtonXColumn.cs" />
+    <Compile Include="Controls\DataGridViewX\DataGridViewCheckBoxX\DataGridViewCheckBoxXCell.cs" />
+    <Compile Include="Controls\DataGridViewX\DataGridViewCheckBoxX\DataGridViewCheckBoxXColumn.cs" />
+    <Compile Include="Controls\DataGridViewX\DataGridViewComboBoxEx\DataGridViewComboBoxExCell.cs" />
+    <Compile Include="Controls\DataGridViewX\DataGridViewComboBoxEx\DataGridViewComboBoxExColumn.cs" />
+    <Compile Include="Controls\DataGridViewX\DataGridViewComboBoxEx\DataGridViewComboBoxExEditingControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\DataGridViewX\DataGridViewDateTimeInput\DataGridViewDateTimeInputCell.cs" />
+    <Compile Include="Controls\DataGridViewX\DataGridViewDateTimeInput\DataGridViewDateTimeInputColumn.cs" />
+    <Compile Include="Controls\DataGridViewX\DataGridViewDateTimeInput\DataGridViewDateTimeInputEditingControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\DataGridViewX\DataGridViewDoubleInput\DataGridViewDoubleInputCell.cs" />
+    <Compile Include="Controls\DataGridViewX\DataGridViewDoubleInput\DataGridViewDoubleInputColumn.cs" />
+    <Compile Include="Controls\DataGridViewX\DataGridViewDoubleInput\DataGridViewDoubleInputEditingControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\DataGridViewX\DataGridViewIntegerInput\DataGridViewIntegerInputCell.cs" />
+    <Compile Include="Controls\DataGridViewX\DataGridViewIntegerInput\DataGridViewIntegerInputColumn.cs" />
+    <Compile Include="Controls\DataGridViewX\DataGridViewIntegerInput\DataGridViewIntegerInputEditingControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\DataGridViewX\DataGridViewIpAddressInput\DataGridViewIpAddressInputCell.cs" />
+    <Compile Include="Controls\DataGridViewX\DataGridViewIpAddressInput\DataGridViewIpAddressInputColumn.cs" />
+    <Compile Include="Controls\DataGridViewX\DataGridViewIpAddressInput\DataGridViewIpAddressInputEditingControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\DataGridViewX\DataGridViewLabelX\DataGridViewLabelXCell.cs" />
+    <Compile Include="Controls\DataGridViewX\DataGridViewLabelX\DataGridViewLabelXColumn.cs" />
+    <Compile Include="Controls\DataGridViewX\DataGridViewMaskedTextBoxAdv\DataGridViewMaskedTextBoxAdvCell.cs" />
+    <Compile Include="Controls\DataGridViewX\DataGridViewMaskedTextBoxAdv\DataGridViewMaskedTextBoxAdvColumn.cs" />
+    <Compile Include="Controls\DataGridViewX\DataGridViewMaskedTextBoxAdv\DataGridViewMaskedTextBoxAdvEditingControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\DataGridViewX\DataGridViewProgressBarX\DataGridViewProgressBarXCell.cs" />
+    <Compile Include="Controls\DataGridViewX\DataGridViewProgressBarX\DataGridViewProgressBarXColumn.cs" />
+    <Compile Include="Controls\DataGridViewX\DataGridViewSlider\DataGridViewSliderCell.cs" />
+    <Compile Include="Controls\DataGridViewX\DataGridViewSlider\DataGridViewSliderColumn.cs" />
+    <Compile Include="Controls\DataGridViewX\DataGridViewTextBoxDropDown\DataGridViewTextBoxDropDownCell.cs" />
+    <Compile Include="Controls\DataGridViewX\DataGridViewTextBoxDropDown\DataGridViewTextBoxDropDownColumn.cs" />
+    <Compile Include="Controls\DataGridViewX\DataGridViewTextBoxDropDown\DataGridViewTextBoxDropDownEditingControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\DataGridViewX\IDataGridViewColumn.cs" />
+    <Compile Include="Controls\DesktopAlert\DesktopAlert.cs" />
+    <Compile Include="Controls\DesktopAlert\DesktopAlertWindow.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Controls\Flyout\Flyout.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\Flyout\FlyoutColorTable.cs" />
+    <Compile Include="Controls\Flyout\FlyoutForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Controls\Flyout\FlyoutForm.Designer.cs">
+      <DependentUpon>FlyoutForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Controls\GroupPanel.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\DGHScrollBar.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\LabelX.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\Line.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\ListBoxAdv\CheckStateConvertEventArgs.cs" />
+    <Compile Include="Controls\ListBoxAdv\ListBoxAdv.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\ListBoxAdv\ListBoxAdvItemCheckEventArgs.cs" />
+    <Compile Include="Controls\ListBoxAdv\ListBoxAdvItemCheckEventHandler.cs" />
+    <Compile Include="Controls\ListBoxAdv\ListBoxItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\ListBoxAdv\ListBoxItemPainter.cs" />
+    <Compile Include="Controls\ListBoxAdv\ListBoxItemRendererEventArgs.cs" />
+    <Compile Include="Controls\ListBoxAdv\OfficeListBoxItemColorTable.cs" />
+    <Compile Include="Controls\ListBoxAdv\OfficeListBoxItemPainter.cs" />
+    <Compile Include="Controls\ListViewEx.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\MaskedTextBoxAdv.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\NonClientHook.cs" />
+    <Compile Include="Controls\NonClientPaintHandler.cs" />
+    <Compile Include="Controls\PageNavigator.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\PageNavigatorItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\PageSlider\PageSlider.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\PageSlider\PageSliderPage.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\PageSlider\StepIndicator.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\PopupControlHost.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\ProgressBarX.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\ProgressStepper\OfficeStepItemColorTable.cs" />
+    <Compile Include="Controls\ProgressStepper\OfficeStepItemPainter.cs" />
+    <Compile Include="Controls\ProgressStepper\OfficeStepItemStateColorTable.cs" />
+    <Compile Include="Controls\ProgressStepper\ProgressSteps.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\ProgressStepper\StepItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\ProgressStepper\StepItemContainer.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\ProgressStepper\StepItemPainter.cs" />
+    <Compile Include="Controls\ProgressStepper\StepItemRendererEventArgs.cs" />
+    <Compile Include="Controls\TabbedForm\MultiFormAppContext.cs" />
+    <Compile Include="Controls\TabbedForm\NewTabFormItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\TabbedForm\OfficeNewTabFormItemPainter.cs" />
+    <Compile Include="Controls\TabbedForm\OfficeTabFormItemPainter.cs" />
+    <Compile Include="Controls\TabbedForm\OfficeTabFormStripPainter.cs" />
+    <Compile Include="Controls\TabbedForm\TabFormColorTable.cs" />
+    <Compile Include="Controls\RangeSlider.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\RatingStar.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\ReflectionImage.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\ReflectionLabel.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\RichTextBoxEx.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\RichTextBoxScrollEx.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\ScrollbarControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\ScrollBarReplacement.cs" />
+    <Compile Include="Controls\ScrollbarSkinner.cs" />
+    <Compile Include="Controls\SideNav\OfficeSideNavItemPainter.cs" />
+    <Compile Include="Controls\SideNav\SideNav.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\SideNav\SideNavItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\SideNav\SideNavItemPainter.cs" />
+    <Compile Include="Controls\SideNav\SideNavItemRendererEventArgs.cs" />
+    <Compile Include="Controls\SideNav\SideNavItemStateColorTable.cs" />
+    <Compile Include="Controls\SideNav\SideNavPanel.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\SideNav\SideNavStrip.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\SlidePanel\SlidePanel.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Controls\SlidePanel\SliderButton.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\Slider.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\SymbolBox.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\TabbedForm\TabFormItemBase.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\TabbedForm\TabFormItemColorTable.cs" />
+    <Compile Include="Controls\TabbedForm\TabFormPainter.cs" />
+    <Compile Include="Controls\TabbedForm\TabParentForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Controls\TabbedForm\TabFormControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\TabbedForm\TabFormItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\TabbedForm\TabFormPanel.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\TabbedForm\TabFormStateColorTable.cs" />
+    <Compile Include="Controls\TabbedForm\TabFormStripContainerItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\TabbedForm\TabFormStripControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\TabbedForm\TabFormStripPainter.cs" />
+    <Compile Include="Controls\TextBoxDropDown.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\TextBoxX.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\DGVScrollBar.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\TokenEditor\EditToken.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\TokenEditor\TokenEditor.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\TokenEditor\TokenEditorColorTable.cs" />
+    <Compile Include="Controls\Toolbox\ToolboxControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\Toolbox\ToolboxGroup.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\Toolbox\ToolboxItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Controls\WarningBox.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Controls\WarningBox.Designer.cs">
+      <DependentUpon>WarningBox.cs</DependentUpon>
+    </Compile>
+    <Compile Include="CrumbBar\CrumbBar.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="CrumbBar\CrumbBarItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="CrumbBar\CrumbBarItemsCollection.cs" />
+    <Compile Include="CrumbBar\CrumbBarItemView.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="CrumbBar\CrumbBarItemViewPainter.cs" />
+    <Compile Include="CrumbBar\CrumbBarOverflowButton.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="CrumbBar\CrumbBarViewContainer.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="AdvTree\ElementStyleCollection.cs" />
+    <Compile Include="Dpi.cs" />
+    <Compile Include="DualButton.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Editors\Calculator\Calculator.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Editors\Calculator\Calculator.Designer.cs">
+      <DependentUpon>Calculator.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Editors\DateTimeAdv\TimeSelector.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Editors\DateTimeAdv\TimeSelectorItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Editors\IPAddressGroup.cs" />
+    <Compile Include="Editors\IpAddressInput.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="EllipticalShapeDescriptor.cs" />
+    <Compile Include="FormatHelper.cs" />
+    <Compile Include="ICommand.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="ItemDockContainer.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="ItemVisualGenerator.cs" />
+    <Compile Include="Metro\BorderColors.cs" />
+    <Compile Include="Metro\ColorTables\MetroColorTable.cs" />
+    <Compile Include="Metro\ColorTables\MetroColorTableInitializer.cs" />
+    <Compile Include="Metro\ColorTables\MetroFormColorTable.cs" />
+    <Compile Include="Metro\ColorTables\MetroOfficeColorTableInitializer.cs" />
+    <Compile Include="Metro\ColorTables\MetroStatusBarColorTable.cs" />
+    <Compile Include="Metro\ColorTables\MetroTabColorTable.cs" />
+    <Compile Include="Metro\ColorTables\MetroTabItemColorTable.cs" />
+    <Compile Include="Metro\ColorTables\MetroTabStripColorTable.cs" />
+    <Compile Include="Metro\ColorTables\MetroTileColorTable.cs" />
+    <Compile Include="Metro\ColorTables\MetroToolbarColorTable.cs" />
+    <Compile Include="Metro\ColorTables\Office2016ColorTableInitializer.cs" />
+    <Compile Include="Metro\ColorTables\Office2016MetroInitializer.cs" />
+    <Compile Include="Metro\ColorTables\VisualStudio2012ColorTableInitializer.cs" />
+    <Compile Include="Metro\ColorTables\VisualStudio2012OfficeColorTableInitializer.cs" />
+    <Compile Include="Metro\Helpers\ColorHelpers.cs" />
+    <Compile Include="Metro\Helpers\DoubleHelpers.cs" />
+    <Compile Include="Metro\MetroAppButton.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Metro\MetroAppForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Metro\MetroForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Metro\MetroMessageBoxDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Metro\MetroQatCustomizeDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Metro\MetroShell.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Metro\MetroStatusBar.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Metro\MetroStripContainerItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Metro\MetroTabItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Metro\MetroTabItemContainer.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Metro\MetroTabPanel.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Metro\MetroTabStrip.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Metro\MetroTileItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Metro\MetroTilePanel.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Metro\MetroToolbar.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Metro\MetroToolbarContainer.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Metro\ColorTables\OfficeMobile2014ColorTableInitializer.cs" />
+    <Compile Include="Metro\ColorTables\OfficeMobile2014MetroInitializer.cs" />
+    <Compile Include="Metro\Rendering\DrawingHelpers.cs" />
+    <Compile Include="Metro\Rendering\MetroAppButtonPainter.cs" />
+    <Compile Include="Metro\Rendering\MetroButtonItemPainter.cs" />
+    <Compile Include="Metro\Rendering\MetroCaptionItemPainter.cs" />
+    <Compile Include="Metro\Rendering\MetroFormRenderer.cs" />
+    <Compile Include="Metro\Rendering\MetroKeyTipsPainter.cs" />
+    <Compile Include="Metro\Rendering\MetroRender.cs" />
+    <Compile Include="Metro\Rendering\MetroRibbonTabGroupPainter.cs" />
+    <Compile Include="Metro\Rendering\MetroScrollBarPainter.cs" />
+    <Compile Include="Metro\Rendering\MetroStatusBarPainter.cs" />
+    <Compile Include="Metro\Rendering\MetroSwitchButtonPainter.cs" />
+    <Compile Include="Metro\Rendering\MetroTabItemPainter.cs" />
+    <Compile Include="Metro\Rendering\MetroTabStripPainter.cs" />
+    <Compile Include="Metro\Rendering\MetroTileItemPainter.cs" />
+    <Compile Include="Metro\Rendering\MetroToolbarPainter.cs" />
+    <Compile Include="Metro\Thickness.cs" />
+    <Compile Include="MicroCharts\AreaMicroChart.cs" />
+    <Compile Include="MicroCharts\BarBaseMicroChart.cs" />
+    <Compile Include="MicroCharts\BarMicroChart.cs" />
+    <Compile Include="MicroCharts\ColumnMicroChart.cs" />
+    <Compile Include="MicroCharts\HundredPctBar.cs" />
+    <Compile Include="MicroCharts\LineMicroChart.cs" />
+    <Compile Include="MicroCharts\MicroChart.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="MicroCharts\MicroChartBase.cs" />
+    <Compile Include="MicroCharts\MicroChartItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="MicroCharts\PieMicroChart.cs" />
+    <Compile Include="MicroCharts\PlotMicroChart.cs" />
+    <Compile Include="MicroCharts\WinLoseMicroChart.cs" />
+    <Compile Include="PopupDelayedClose.cs" />
+    <Compile Include="PopupManager.cs" />
+    <Compile Include="Primitives\CustomCollection.cs" />
+    <Compile Include="PropertyGrid\AdvPropertyGrid.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="PropertyGrid\AdvPropertyGridAppearance.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="PropertyGrid\AdvPropertyGridLocalization.cs" />
+    <Compile Include="PropertyGrid\PropertyCategoryNode.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="PropertyGrid\PropertyCheckBoxNode.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="PropertyGrid\PropertyDateTimeEditor.cs" />
+    <Compile Include="PropertyGrid\PropertyDoubleEditor.cs" />
+    <Compile Include="PropertyGrid\PropertyIntegerEditor.cs" />
+    <Compile Include="PropertyGrid\PropertyMultiChoiceEditor.cs" />
+    <Compile Include="PropertyGrid\PropertyOptionListNode.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="PropertyGrid\PropertySettings.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="PropertyGrid\PropertyNode.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="PropertyGrid\PropertyNodeColor.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="PropertyGrid\PropertyNodeFactory.cs" />
+    <Compile Include="PropertyGrid\PropertyParser.cs" />
+    <Compile Include="PropertyGrid\PropertySettingsCollection.cs" />
+    <Compile Include="PropertyGrid\PropertySliderEditor.cs" />
+    <Compile Include="RadialMenu\RadialMenu.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="RadialMenu\RadialMenuColorTable.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="RadialMenu\RadialMenuContainer.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="RadialMenu\RadialMenuItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="RadialMenu\RadialMenuPopup.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="RatingItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Rendering\ButtonItemStaticColorTables.cs" />
+    <Compile Include="Rendering\CrumbBarItemViewColorTable.cs" />
+    <Compile Include="Rendering\CrumbBarItemViewStateColorTable.cs" />
+    <Compile Include="Rendering\NotificationMarkPainter.cs" />
+    <Compile Include="Rendering\Office2007CalendarViewColorTable.cs" />
+    <Compile Include="Rendering\Office2007VistaBlackColorTableFactory.cs" />
+    <Compile Include="Rendering\Office2007WarningBoxColorTable.cs" />
+    <Compile Include="Rendering\Office2010AppButtonPainter.cs" />
+    <Compile Include="Rendering\Office2010BlackFactory.cs" />
+    <Compile Include="Rendering\Office2010BlueFactory.cs" />
+    <Compile Include="Rendering\Office2010NavPaneButtonPainter.cs" />
+    <Compile Include="Rendering\Office2010RangeSliderPainter.cs" />
+    <Compile Include="Rendering\Office2010RangeSliderColorTable.cs" />
+    <Compile Include="Rendering\Office2010RibbonTabGroupPainter.cs" />
+    <Compile Include="Rendering\Office2010SilverFactory.cs" />
+    <Compile Include="Rendering\Office2010ColorTable.cs" />
+    <Compile Include="Rendering\Office2010SystemCaptionItemPainter.cs" />
+    <Compile Include="Rendering\ResizeHandlePainter.cs" />
+    <Compile Include="Rendering\StepIndicatorColorTable.cs" />
+    <Compile Include="Rendering\SuperTabColorTable.cs" />
+    <Compile Include="Rendering\SuperTabControlBoxStatesColorTable.cs" />
+    <Compile Include="Rendering\SuperTabItemColorTable.cs" />
+    <Compile Include="Rendering\SuperTabItemStateColorTable.cs" />
+    <Compile Include="Rendering\SuperTabLinearGradientColorTable.cs" />
+    <Compile Include="Rendering\SuperTabPanelColorTable.cs" />
+    <Compile Include="Rendering\SuperTabStyleColorFactory.cs" />
+    <Compile Include="Rendering\SwitchButtonColorTable.cs" />
+    <Compile Include="Rendering\VisualStudio2010Factory.cs" />
+    <Compile Include="Rendering\Windows7BlueFactory.cs" />
+    <Compile Include="Rendering\Windows7ColorTable.cs" />
+    <Compile Include="Ribbon\ItemPanelBase.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Ribbon\RangeSliderItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Schedule\Color\CalendarColor.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Schedule\Model\TimeZoneInfo\NativeMethods.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Schedule\Model\TimeZoneInfo\TimeZoneInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Schedule\Model\TimeZoneInfo\UnsafeNativeMethods.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Separator.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="ShapeDescriptor.cs" />
+    <Compile Include="CustomizeItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Editors\DateTimeAdv\CalendarBase.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Editors\DateTimeAdv\DateAppearanceDescription.cs" />
+    <Compile Include="Editors\DateTimeAdv\HourPeriodInput.cs" />
+    <Compile Include="Editors\DateTimeAdv\MonthCalendarAdv.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Editors\DateTimeAdv\SingleMonthCalendar.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Editors\DateTimeAdv\MonthCalendarColors.cs" />
+    <Compile Include="Editors\DateTimeAdv\DateTimeGroup.cs" />
+    <Compile Include="Editors\DateTimeAdv\DateTimeInput.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Editors\DateTimeAdv\DayLabel.cs" />
+    <Compile Include="Editors\DateTimeAdv\HourPeriodLabel.cs" />
+    <Compile Include="Editors\DateTimeAdv\IDateTimePartInput.cs" />
+    <Compile Include="Editors\DateTimeAdv\MonthNameInput.cs" />
+    <Compile Include="Editors\DateTimeAdv\NumericDayInput.cs" />
+    <Compile Include="Editors\DateTimeAdv\NumericDayOfYearInput.cs" />
+    <Compile Include="Editors\DateTimeAdv\NumericHourInput.cs" />
+    <Compile Include="Editors\DateTimeAdv\NumericMinuteInput.cs" />
+    <Compile Include="Editors\DateTimeAdv\NumericMonthInput.cs" />
+    <Compile Include="Editors\DateTimeAdv\NumericSecondInput.cs" />
+    <Compile Include="Editors\DateTimeAdv\NumericYearInput.cs" />
+    <Compile Include="Editors\DateTimeAdv\ParseDateTimeValueEventArgs.cs" />
+    <Compile Include="Editors\DateTimeAdv\DayLabelItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Editors\DateTimeAdv\DayPaintEventArgs.cs" />
+    <Compile Include="Editors\DoubleInput.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Editors\Enums.cs" />
+    <Compile Include="Editors\InputButtonSettings.cs" />
+    <Compile Include="Editors\InputControlColors.cs" />
+    <Compile Include="Editors\InputValidationEventArgs.cs" />
+    <Compile Include="Editors\IntegerInput.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Editors\LockUpdateCheckBox.cs" />
+    <Compile Include="Editors\DateTimeAdv\MonthCalendarItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Editors\PaintInfo.cs" />
+    <Compile Include="Editors\ParseDoubleValueEventArgs.cs" />
+    <Compile Include="Editors\ParseIntegerValueEventArgs.cs" />
+    <Compile Include="Editors\Primitives\StartsWithPredicate.cs" />
+    <Compile Include="Editors\SystemOptions.cs" />
+    <Compile Include="Editors\VisualButton.cs" />
+    <Compile Include="Editors\VisualButtonBase.cs" />
+    <Compile Include="Editors\VisualCheckBox.cs" />
+    <Compile Include="Editors\VisualControlBase.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Editors\VisualCustomButton.cs" />
+    <Compile Include="Editors\VisualDoubleInput.cs" />
+    <Compile Include="Editors\VisualDropDownButton.cs" />
+    <Compile Include="Editors\VisualGroup.cs" />
+    <Compile Include="Editors\VisualInputBase.cs" />
+    <Compile Include="Editors\NumericInputBase.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Editors\VisualInputGroup.cs" />
+    <Compile Include="Editors\VisualIntegerInput.cs" />
+    <Compile Include="Editors\VisualItem.cs" />
+    <Compile Include="Editors\VisualItemCollection.cs" />
+    <Compile Include="Editors\VisualLabel.cs" />
+    <Compile Include="Editors\VisualListInput.cs" />
+    <Compile Include="Editors\VisualNumericInput.cs" />
+    <Compile Include="Editors\VisualStringListInput.cs" />
+    <Compile Include="Editors\VisualToggleButton.cs" />
+    <Compile Include="Editors\VisualUpDownButton.cs" />
+    <Compile Include="DesignTime.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="DesignTimeDte.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="DisplayHelp.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="DisplayMoreItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="DocumentDock\PanelDockContainer.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="ElementStyle\BackgroundColorBlend.cs" />
+    <Compile Include="ElementStyle\BackgroundColorBlendCollection.cs" />
+    <Compile Include="ElementStyle\BackgroundColorBlendConverter.cs" />
+    <Compile Include="ElementStyle\IElementStyleClassProvider.cs" />
+    <Compile Include="Events\CancelIntValueEventArgs.cs" />
+    <Compile Include="Events\CancelObjectValueEventArgs.cs" />
+    <Compile Include="Events\CheckBoxItemRenderEventArgs.cs" />
+    <Compile Include="Events\ColorPreviewEventArgs.cs" />
+    <Compile Include="Events\EventSourceArgs.cs" />
+    <Compile Include="Events\NavPaneRenderEventArgs.cs" />
+    <Compile Include="Events\ProgressBarItemRenderEventArgs.cs" />
+    <Compile Include="Events\QatCustomizeDialogEventArgs.cs" />
+    <Compile Include="Events\QatCustomizeItemRendererEventArgs.cs" />
+    <Compile Include="Events\QatOverflowItemRendererEventArgs.cs" />
+    <Compile Include="Events\RibbonCustomizeEventArgs.cs" />
+    <Compile Include="Events\MdiSystemItemRendererEventArgs.cs" />
+    <Compile Include="Events\RibbonControlRendererEventArgs.cs" />
+    <Compile Include="Events\RibbonPopupCloseEventArgs.cs" />
+    <Compile Include="Events\SideBarPanelItemRendererEventArgs.cs" />
+    <Compile Include="Events\SideBarRendererEventArgs.cs" />
+    <Compile Include="Events\SliderItemRendererEventArgs.cs" />
+    <Compile Include="ImageHelper.cs" />
+    <Compile Include="IShapeDescriptor.cs" />
+    <Compile Include="Office2007Form\FormCaptionPainter.cs" />
+    <Compile Include="Office2007Form\FormCaptionRendererEventArgs.cs" />
+    <Compile Include="Office2007Form\OfficeForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Office2007Form\Office2007FormCaptionPainter.cs" />
+    <Compile Include="Office2007Form\RibbonForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Office2007Form\Office2007SystemCaptionItemPainter.cs" />
+    <Compile Include="Office2007Form\SystemCaptionItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Office2007Form\SystemCaptionItemPainter.cs" />
+    <Compile Include="Office2007Form\SystemCaptionItemRendererEventArgs.cs" />
+    <Compile Include="PopupItemControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Presentation\Line.cs" />
+    <Compile Include="Presentation\Location.cs" />
+    <Compile Include="Presentation\PaddingInfo.cs" />
+    <Compile Include="Presentation\Rectangle.cs" />
+    <Compile Include="Presentation\Shape.cs" />
+    <Compile Include="Presentation\ShapeBorder.cs" />
+    <Compile Include="Presentation\ShapeCollection.cs" />
+    <Compile Include="Presentation\ShapeFill.cs" />
+    <Compile Include="Presentation\ShapePaintInfo.cs" />
+    <Compile Include="Presentation\ShapePath.cs" />
+    <Compile Include="Presentation\SizeInfo.cs" />
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="Rendering\ColorFactory.cs" />
+    <Compile Include="Rendering\ColorItemPainter.cs" />
+    <Compile Include="Rendering\ElementStyleClassKeys.cs" />
+    <Compile Include="Rendering\GlobalManager.cs" />
+    <Compile Include="Rendering\GradientColorTable.cs" />
+    <Compile Include="Rendering\IOffice2007Painter.cs" />
+    <Compile Include="Rendering\LinearGradientColorTable.cs" />
+    <Compile Include="DockContainerItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="DockingHint.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="DockSite.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="DocumentDock\DocumentBarContainer.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="DocumentDock\DocumentBarContainerConverter.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="DocumentDock\DocumentBaseContainer.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="DocumentDock\DocumentBaseContainerCollection.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="DocumentDock\DocumentDockContainer.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="DocumentDock\DocumentDockContainerConverter.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="DocumentDock\DocumentDockUIManager.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="DocumentDock\DocumentSerializationXml.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="DotNetBarManager.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="DotNetBarResourcesAttribute.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="DotNetBarStreamer.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ElementSerializer.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ElementStyle.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ElementStyleDisplay.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ElementStyleLayout.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Enums.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Events\ColorItemRendererEventArgs.cs" />
+    <Compile Include="Events\DockTabClosingEventHandler.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Events\SerializeItemEventArgs.cs" />
+    <Compile Include="Events\MarkupLinkClickEventArgs.cs" />
+    <Compile Include="ExpandablePanel.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="ExpandableSplitter.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="ExplorerBar.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="ExplorerBarContainerItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="ExplorerBarGroupItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="frmCustomize.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="GenericItemContainer.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Hook.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="HTMLHelp.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ImageItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Interfaces.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ISimpleTab.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ItemPaintArgs.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Items.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ItemSerializationContext.cs" />
+    <Compile Include="ItemsListBox.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="ItemStyle.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ItemStyleMapper.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="LabelItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="LocalizationKeys.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="LogItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="MDISystemItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="MdiWindowListItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="MenuPanel.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="MessageHandler.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="NativeFunctions.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="NavigationBar.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="NavigationBarContainer.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="NavigationPane.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="NavigationPanePanel.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="NavPaneOptions.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="PanelEx.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="PanelExTitle.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="PopupContainer.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="PopupContainerControl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="PopupItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="PopupShadow.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="ProgressBarItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="RemindForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Rendering\NavigationPanePainter.cs" />
+    <Compile Include="Rendering\Office2007BarColorTable.cs" />
+    <Compile Include="Rendering\Office2007ButtonItemColorTable.cs" />
+    <Compile Include="Rendering\Office2007ButtonItemColorTableCollection.cs" />
+    <Compile Include="Rendering\Office2007ButtonItemStateColorTable.cs" />
+    <Compile Include="Rendering\Office2007CheckBoxColorTable.cs" />
+    <Compile Include="Rendering\Office2007CheckBoxStateColorTable.cs" />
+    <Compile Include="Rendering\Office2007ColorItemColorTable.cs" />
+    <Compile Include="Rendering\Office2007ColorItemPainter.cs" />
+    <Compile Include="Rendering\Office2007ColorTable.cs" />
+    <Compile Include="Rendering\Office2007ColorTableFactory.cs" />
+    <Compile Include="Rendering\Office2007ComboBoxColorTable.cs" />
+    <Compile Include="Rendering\Office2007ComboBoxStateColorTable.cs" />
+    <Compile Include="Rendering\Office2007DataGridViewColorTable.cs" />
+    <Compile Include="Rendering\Office2007DialogLauncherColorTable.cs" />
+    <Compile Include="Rendering\Office2007DialogLauncherStateColorTable.cs" />
+    <Compile Include="Rendering\Office2007FormCaptionColorTable.cs" />
+    <Compile Include="Rendering\Office2007FormCaptionStateColorTable.cs" />
+    <Compile Include="Rendering\Office2007GalleryColorTable.cs" />
+    <Compile Include="Rendering\Office2007ItemGroupColorTable.cs" />
+    <Compile Include="Rendering\Office2007KeyTipsColorTable.cs" />
+    <Compile Include="Rendering\Office2007ListViewColorTable.cs" />
+    <Compile Include="Rendering\Office2007MenuColorTable.cs" />
+    <Compile Include="Rendering\Office2007NavigationPaneColorTable.cs" />
+    <Compile Include="Rendering\Office2007NavigationPanePainter.cs">
+    </Compile>
+    <Compile Include="Rendering\Office2007ProgressBarColorTable.cs" />
+    <Compile Include="Rendering\Office2007ProgressBarItemPainter.cs" />
+    <Compile Include="Rendering\Office2007QatCustomizeItemPainter.cs" />
+    <Compile Include="Rendering\Office2007QatOverflowPainter.cs" />
+    <Compile Include="Rendering\Office2007QuickAccessToolbarColorTable.cs" />
+    <Compile Include="Rendering\Office2007QuickAccessToolbarStateColorTable.cs" />
+    <Compile Include="Rendering\Office2007Renderer.cs" />
+    <Compile Include="Rendering\Office2007RibbonBarColorTable.cs" />
+    <Compile Include="Rendering\Office2007RibbonBarStateColorTable.cs" />
+    <Compile Include="Rendering\Office2007RibbonColorTable.cs" />
+    <Compile Include="Rendering\Office2007RibbonOverflowPainter.cs" />
+    <Compile Include="Rendering\Office2007RibbonTabGroupColorTable.cs" />
+    <Compile Include="Rendering\Office2007RibbonTabGroupColorTableCollection.cs" />
+    <Compile Include="Rendering\Office2007RibbonTabItemColorTable.cs" />
+    <Compile Include="Rendering\Office2007RibbonTabItemColorTableCollection.cs" />
+    <Compile Include="Rendering\Office2007RibbonTabItemStateColorTable.cs" />
+    <Compile Include="Rendering\Office2007ScrollBarColorTable.cs" />
+    <Compile Include="Rendering\Office2007ScrollBarStateColorTable.cs" />
+    <Compile Include="Rendering\Office2007SideBarColorTable.cs" />
+    <Compile Include="Rendering\Office2007SideBarPainter.cs" />
+    <Compile Include="Rendering\Office2007SilverColorTableFactory.cs" />
+    <Compile Include="Rendering\Office2007SliderColorTable.cs" />
+    <Compile Include="Rendering\Office2007SliderPainter.cs" />
+    <Compile Include="Rendering\Office2007SliderStateColorTable.cs" />
+    <Compile Include="Rendering\Office2007SuperTooltipColorTable.cs" />
+    <Compile Include="Rendering\Office2007SystemButtonColorTable.cs" />
+    <Compile Include="Rendering\Office2007SystemButtonStateColorTable.cs" />
+    <Compile Include="Rendering\Office2007TabColorTable.cs" />
+    <Compile Include="Rendering\Office2007TabItemStateColorTable.cs" />
+    <Compile Include="Rendering\ProgressBarItemPainter.cs" />
+    <Compile Include="Rendering\QatCustomizeItemPainter.cs" />
+    <Compile Include="Rendering\QatOverflowPainter.cs" />
+    <Compile Include="Rendering\SideBarPainter.cs" />
+    <Compile Include="Rendering\SliderPainter.cs" />
+    <Compile Include="Ribbon\BarBackgroundPainter.cs" />
+    <Compile Include="Ribbon\BaseItemAutoSizeBag.cs" />
+    <Compile Include="Ribbon\ButtonItemPainter.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Ribbon\ButtonItemPainterHelper.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Ribbon\ButtonItemRendererEventArgs.cs" />
+    <Compile Include="Ribbon\CaptionItemContainer.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Ribbon\DesignTimeProviderContainer.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Ribbon\EventDelegates.cs" />
+    <Compile Include="Ribbon\FadeAnimator.cs" />
+    <Compile Include="Ribbon\GalleryContainer.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Ribbon\GalleryGroup.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Ribbon\GalleryGroupCollection.cs" />
+    <Compile Include="Ribbon\ISimpleElement.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Ribbon\ItemBlockLayoutManager.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Ribbon\ItemContainer.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Ribbon\ItemContainerPainter.cs" />
+    <Compile Include="Ribbon\ItemContainerRendererEventArgs.cs" />
+    <Compile Include="Ribbon\ItemControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Ribbon\ItemDisplay.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Ribbon\ItemPanel.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Ribbon\KeyTipsCanvasControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Ribbon\KeyTipsPainter.cs" />
+    <Compile Include="Ribbon\KeyTipsRendererEventArgs.cs" />
+    <Compile Include="Ribbon\MdiSystemItemPainter.cs" />
+    <Compile Include="Ribbon\MessageBoxDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Ribbon\MessageBoxEx.cs" />
+    <Compile Include="Ribbon\Office2007KeyTipsPainter.cs" />
+    <Compile Include="Ribbon\Office2003ButtonItemPainter.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Ribbon\Office2003RibbonTabItemPainter.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Ribbon\Office2007BarBackgroundPainter.cs" />
+    <Compile Include="Ribbon\Office2007ButtonItemPainter.cs" />
+    <Compile Include="Ribbon\Office2007ItemContainerPainter.cs" />
+    <Compile Include="Ribbon\Office2007DialogLauncherPainter.cs" />
+    <Compile Include="Ribbon\Office2007MdiSystemItemPainter.cs" />
+    <Compile Include="Ribbon\Office2007RibbonControlPainter.cs" />
+    <Compile Include="Ribbon\Office2007RibbonTabGroupPainter.cs" />
+    <Compile Include="Ribbon\Office2007RibbonTabItemPainter.cs" />
+    <Compile Include="Ribbon\ApplicationButton.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Ribbon\PainterFactory.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Ribbon\PanelControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Ribbon\QatCustomizeDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Ribbon\QatCustomizeItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Ribbon\QatCustomizePanel.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Ribbon\QatToolbar.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Ribbon\RibbonBar.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Ribbon\DialogLauncherPainter.cs" />
+    <Compile Include="Ribbon\RibbonBarMergeContainer.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Ribbon\RibbonClientPanel.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Ribbon\RibbonControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Ribbon\RibbonControlPainter.cs" />
+    <Compile Include="Ribbon\RibbonDialogLauncherRendererEventArgs.cs" />
+    <Compile Include="Ribbon\RibbonLocalization.cs" />
+    <Compile Include="Ribbon\RibbonOverflowButtonItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Ribbon\RibbonPanel.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Ribbon\RibbonPredefinedColorSchemes.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Rendering\BaseRenderer.cs" />
+    <Compile Include="Ribbon\QatOverflowItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Ribbon\RibbonStrip.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Ribbon\RibbonStripContainerItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Ribbon\RibbonTabGroupPainter.cs" />
+    <Compile Include="Ribbon\RibbonTabGroupRendererEventArgs.cs" />
+    <Compile Include="Ribbon\RibbonTabItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Ribbon\RibbonTabItemContainer.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Ribbon\RibbonTabItemGroup.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Ribbon\RibbonTabItemGroupCollection.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Ribbon\RibbonTabItemRendererEventArgs.cs" />
+    <Compile Include="Ribbon\SimpleElement.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Ribbon\SimpleElementLayout.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Ribbon\SimpleNodeDisplay.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Ribbon\SliderItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Ribbon\Spacing.cs" />
+    <Compile Include="Ribbon\SubItemsQatCollection.cs" />
+    <Compile Include="Ribbon\SuperTooltip.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Ribbon\SuperTooltipControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Ribbon\ThemedButtonItemPainter.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Ribbon\ThreadUIOperation.cs" />
+    <Compile Include="Ribbon\ToolbarRendererEventArgs.cs" />
+    <Compile Include="RoundRectangleShapeDescriptor.cs">
+    </Compile>
+    <Compile Include="ScrollBar\HScrollBarAdv.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="ScrollBar\Office2007ScrollBarPainter.cs" />
+    <Compile Include="ScrollBar\ScrollBarAdv.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="ScrollBar\ScrollBarCore.cs" />
+    <Compile Include="ScrollBar\ScrollBarPainter.cs" />
+    <Compile Include="ScrollBar\VScrollBarAdv.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="ScrollButton.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="ShadowPainter.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ShortcutCollection.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="SideBar.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SideBarContainerItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SideBarPanelControlHost.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SideBarPanelItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SimpleItemContainer.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SimpleTabDisplay.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="SimpleTabLayoutManager.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="SplitterMozillaPainter.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="SplitterOffice2003Painter.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="SplitterPainter.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="StringHelper.cs" />
+    <Compile Include="StyleManager.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="StyleManagerAmbient.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SubItemsCollection.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="SuperTabControl\Office2007\Office2007SuperTabItem.cs" />
+    <Compile Include="SuperTabControl\Office2007\Office2007SuperTabStrip.cs" />
+    <Compile Include="SuperTabControl\Office2010Backstage\Office2010BackstageSuperTabItem.cs" />
+    <Compile Include="SuperTabControl\Office2010Backstage\Office2010BackstageSuperTabStrip.cs" />
+    <Compile Include="SuperTabControl\OfficeMobile2014\OfficeMobile2014SuperTabItem.cs" />
+    <Compile Include="SuperTabControl\OfficeMobile2014\OfficeMobile2014SuperTabStrip.cs" />
+    <Compile Include="SuperTabControl\OneNote2007\OneNote2007SuperTabItem.cs" />
+    <Compile Include="SuperTabControl\OneNote2007\OneNote2007SuperTabStrip.cs" />
+    <Compile Include="SuperTabControl\SuperTabControlBox\SuperTabCloseBox.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SuperTabControl\SuperTabControlBox\SuperTabControlBox.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SuperTabControl\SuperTabControlBox\SuperTabMenuBox.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SuperTabControl\SuperTabControl\SuperTabControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SuperTabControl\SuperTabControl\SuperTabControlPanel.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SuperTabControl\SuperTabItem\SuperTabItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SuperTabControl\SuperTabItem\SuperTabItemBaseDisplay.cs" />
+    <Compile Include="SuperTabControl\SuperTabStrip\SuperTabDragWindow.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="SuperTabControl\SuperTabStrip\SuperTabDragWindow.Designer.cs">
+      <DependentUpon>SuperTabDragWindow.cs</DependentUpon>
+    </Compile>
+    <Compile Include="SuperTabControl\SuperTabStrip\SuperTabStrip.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SuperTabControl\SuperTabStrip\SuperTabStripBaseDisplay.cs" />
+    <Compile Include="SuperTabControl\SuperTabStrip\SuperTabStripItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SuperTabControl\SuperTabStrip\SuperTabStripLayoutManager.cs" />
+    <Compile Include="SuperTabControl\VS2008Dock\VS2008DockSuperTabItem.cs" />
+    <Compile Include="SuperTabControl\VS2008Dock\VS2008SuperTabStrip.cs" />
+    <Compile Include="SuperTabControl\VS2008Document\VS2008DocumentSuperTabItem.cs" />
+    <Compile Include="SuperTabControl\VS2008Document\VS2008DocumentSuperTabStrip.cs" />
+    <Compile Include="SuperTabControl\WinMediaPlayer12\WinMediaPlayer12SuperTabItem.cs" />
+    <Compile Include="SuperTabControl\WinMediaPlayer12\WinMediaPlayer12SuperTabStrip.cs" />
+    <Compile Include="SwitchButton\Office2010SwitchButtonPainter.cs" />
+    <Compile Include="SwitchButton\SwitchButton.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SwitchButton\SwitchButtonItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="SwitchButton\SwitchButtonPainter.cs" />
+    <Compile Include="SwitchButton\SwitchButtonRenderEventArgs.cs" />
+    <Compile Include="Symbols.cs" />
+    <Compile Include="TabColors.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="TabColorScheme.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="TabControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="TabControlPanel.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="TabItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="TabItemAccessibleObject.cs" />
+    <Compile Include="TabItemLayoutManager.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="TabsCollection.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="TabStrip.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="TabStripAccessibleObject.cs" />
+    <Compile Include="TabStripBaseDisplay.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="TabStripOffice2007DockDisplay.cs" />
+    <Compile Include="TabStripOffice2007DocumentDisplay.cs" />
+    <Compile Include="TabStripRoundHeaderDisplay.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="TabStripSimulatedThemeDisplay.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="TabStripVS2005DockDisplay.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="TaskDialog\TaskDialog.cs" />
+    <Compile Include="TaskDialog\TaskDialogForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="TaskDialog\TaskDialogForm.Designer.cs">
+      <DependentUpon>TaskDialogForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="TextBoxItem.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="TextDrawing.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="TextMarkup\BodyElement.cs" />
+    <Compile Include="TextMarkup\ContainerElement.cs" />
+    <Compile Include="TextMarkup\Div.cs" />
+    <Compile Include="TextMarkup\EndMarkupElement.cs" />
+    <Compile Include="TextMarkup\ExpandElement.cs" />
+    <Compile Include="TextMarkup\FontChangeElement.cs" />
+    <Compile Include="TextMarkup\FontElement.cs" />
+    <Compile Include="TextMarkup\Heading.cs" />
+    <Compile Include="TextMarkup\HyperLink.cs" />
+    <Compile Include="TextMarkup\IActiveMarkupElement.cs" />
+    <Compile Include="TextMarkup\ImageElement.cs" />
+    <Compile Include="TextMarkup\Italic.cs" />
+    <Compile Include="TextMarkup\MarkupDrawContext.cs" />
+    <Compile Include="TextMarkup\MarkupElement.cs" />
+    <Compile Include="TextMarkup\MarkupElementCollection.cs" />
+    <Compile Include="TextMarkup\MarkupLayoutManager.cs" />
+    <Compile Include="TextMarkup\MarkupParser.cs" />
+    <Compile Include="TextMarkup\MarkupSettings.cs" />
+    <Compile Include="TextMarkup\NewLine.cs" />
+    <Compile Include="TextMarkup\Paragraph.cs" />
+    <Compile Include="TextMarkup\Span.cs" />
+    <Compile Include="TextMarkup\Strike.cs" />
+    <Compile Include="TextMarkup\Strong.cs" />
+    <Compile Include="TextMarkup\SymbolElement.cs" />
+    <Compile Include="TextMarkup\TextElement.cs" />
+    <Compile Include="TextMarkup\Underline.cs" />
+    <Compile Include="Themes.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ToastDisplay.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="ToastNotification.cs" />
+    <Compile Include="ToolbarName.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="ToolTip.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Touch\TouchHandler.cs" />
+    <Compile Include="Touch\WinApi.cs" />
+    <Compile Include="UIGraphics.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Validator\CompareValidator.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Validator\CustomValidator.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Validator\Highlighter.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Validator\ErrorProviderWrapper.cs" />
+    <Compile Include="Validator\HighlightPanel.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Validator\IErrorProvider.cs" />
+    <Compile Include="Validator\RangeValidator.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Validator\RegularExpressionValidator.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Validator\RequiredFieldValidator.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Validator\SuperValidator.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Validator\ValidatorBase.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="WinApi.cs" />
+    <Compile Include="Wizard\Wizard.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Wizard\WizardButtonsEventArgs.cs" />
+    <Compile Include="Wizard\WizardPage.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Wizard\WizardPageCollection.cs" />
+    <Compile Include="Wizard\WizardPageChangeEventArgs.cs" />
+    <EmbeddedResource Include="Balloon.resx">
+      <DependentUpon>Balloon.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="BalloonImages\AlertHot.png" />
+    <EmbeddedResource Include="BalloonImages\AlertNormal.png" />
+    <EmbeddedResource Include="BalloonImages\AlertPress.png" />
+    <EmbeddedResource Include="BalloonImages\BalloonHot.png" />
+    <EmbeddedResource Include="BalloonImages\BalloonNormal.png" />
+    <EmbeddedResource Include="BalloonImages\BalloonPress.png" />
+    <EmbeddedResource Include="BalloonTip.bmp" />
+    <EmbeddedResource Include="BarEditorImages\FileClose.bmp" />
+    <EmbeddedResource Include="BarEditorImages\FileCloseSol.bmp" />
+    <EmbeddedResource Include="BarEditorImages\FileNew.bmp" />
+    <EmbeddedResource Include="BarEditorImages\FileOpen.bmp" />
+    <EmbeddedResource Include="BarEditorImages\FileOpenSol.bmp" />
+    <EmbeddedResource Include="ColorPicker.resx">
+      <DependentUpon>ColorPicker.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="ColorSchemeEditor.resx">
+      <DependentUpon>ColorSchemeEditor.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Controls\ComboBoxEx.bmp" />
+    <EmbeddedResource Include="DRAGCOPY.CUR" />
+    <EmbeddedResource Include="DRAGMOVE.CUR" />
+    <EmbeddedResource Include="DRAGNONE.CUR" />
+    <EmbeddedResource Include="ExpandablePanel.ico" />
+    <EmbeddedResource Include="ExpandableSplitter.bmp" />
+    <EmbeddedResource Include="ExpandableSplitter.resx">
+      <DependentUpon>ExpandableSplitter.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="ExplorerBar.bmp" />
+    <EmbeddedResource Include="frmCustomize.resx">
+      <DependentUpon>frmCustomize.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="NavigationBar.bmp" />
+    <EmbeddedResource Include="NavigationPane.bmp" />
+    <EmbeddedResource Include="NavigationPane.resx">
+      <DependentUpon>NavigationPane.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="NavPaneOptions.resx">
+      <DependentUpon>NavPaneOptions.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="PanelEx.bmp" />
+    <EmbeddedResource Include="RemindForm.resx">
+      <DependentUpon>RemindForm.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Ribbon\ItemControl.resx">
+      <DependentUpon>ItemControl.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Ribbon\RibbonBar.ico" />
+    <EmbeddedResource Include="Ribbon\RibbonControl.ico" />
+    <EmbeddedResource Include="Ribbon\RibbonControl.png" />
+    <EmbeddedResource Include="SideBar.bmp" />
+    <EmbeddedResource Include="SideBar.resx">
+      <DependentUpon>SideBar.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Strings.resources" />
+    <EmbeddedResource Include="Strings_de.resources" />
+    <EmbeddedResource Include="Strings_es.resources" />
+    <EmbeddedResource Include="Strings_fr.resources" />
+    <EmbeddedResource Include="Strings_it.resources" />
+    <EmbeddedResource Include="Strings_ja.resources" />
+    <EmbeddedResource Include="Strings_ko.resources" />
+    <EmbeddedResource Include="Strings_sv.resources" />
+    <EmbeddedResource Include="Strings_zh-chs.resources" />
+    <EmbeddedResource Include="Strings_zh-cht.resources" />
+    <EmbeddedResource Include="SystemImages\AddMoreItemsContainer.png" />
+    <EmbeddedResource Include="SystemImages\CollapseTitle.png" />
+    <EmbeddedResource Include="SystemImages\DefaultNavBarImage.png" />
+    <EmbeddedResource Include="SystemImages\DockHintAllSides.png" />
+    <EmbeddedResource Include="SystemImages\DockHintBottom.png" />
+    <EmbeddedResource Include="SystemImages\DockHintLeft.png" />
+    <EmbeddedResource Include="SystemImages\DockHintRight.png" />
+    <EmbeddedResource Include="SystemImages\DockHintTab.png" />
+    <EmbeddedResource Include="SystemImages\DockHintTop.png" />
+    <EmbeddedResource Include="SystemImages\ExpandTitle.png" />
+    <EmbeddedResource Include="SystemImages\NavBarConfigure.png" />
+    <EmbeddedResource Include="SystemImages\NavBarShowLess.png" />
+    <EmbeddedResource Include="SystemImages\NavBarShowMore.png" />
+    <EmbeddedResource Include="SystemImages\Note24.png" />
+    <EmbeddedResource Include="SystemImages\Note64.png" />
+    <EmbeddedResource Include="SystemImages\Pin.png" />
+    <EmbeddedResource Include="SystemImages\PinInactive.png" />
+    <EmbeddedResource Include="SystemImages\PinPushed.png" />
+    <EmbeddedResource Include="SystemImages\PinPushedInactive.png" />
+    <EmbeddedResource Include="TabControl.bmp" />
+    <EmbeddedResource Include="TabControl.resx">
+      <DependentUpon>TabControl.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="TabStrip.bmp" />
+    <EmbeddedResource Include="ToolbarName.resx">
+      <DependentUpon>ToolbarName.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="AdvTree\AdvTree.resx">
+      <DependentUpon>AdvTree.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="AdvTree\Cell.resx">
+      <DependentUpon>Cell.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Controls\WarningBox.resx">
+      <SubType>Designer</SubType>
+      <DependentUpon>WarningBox.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Form1.dotNetBarManager1.xml" />
+    <EmbeddedResource Include="Bar.ico" />
+    <EmbeddedResource Include="DotNetBarManager.ico" />
+    <EmbeddedResource Include="Controls\CheckBoxX.ico" />
+    <EmbeddedResource Include="Controls\ProgressBarX.ico" />
+    <EmbeddedResource Include="Controls\ComboBoxEx.ico" />
+    <EmbeddedResource Include="Controls\LabelX.ico" />
+    <EmbeddedResource Include="Controls\ColorPickerButton.ico" />
+    <EmbeddedResource Include="Controls\DataGridViewX.bmp" />
+    <EmbeddedResource Include="Command.ico" />
+    <EmbeddedResource Include="AdvTree.ico" />
+    <EmbeddedResource Include="Controls\ComboTree.ico" />
+    <EmbeddedResource Include="AdvPropertyGrid.ico" />
+    <EmbeddedResource Include="BubbleBar.bmp" />
+    <EmbeddedResource Include="ButtonX\ButtonX.ico" />
+    <EmbeddedResource Include="Controls\GroupPanel.ico" />
+    <EmbeddedResource Include="Controls\Slider.ico" />
+    <EmbeddedResource Include="Controls\ListViewEx.ico" />
+    <EmbeddedResource Include="Controls\ReflectionImage.ico" />
+    <EmbeddedResource Include="Controls\ReflectionLabel.ico" />
+    <EmbeddedResource Include="Controls\MaskedTextBoxAdv.ico" />
+    <EmbeddedResource Include="Controls\TextBoxDropDown.ico" />
+    <EmbeddedResource Include="Controls\PageNavigator.ico" />
+    <EmbeddedResource Include="Controls\RatingStar.ico" />
+    <EmbeddedResource Include="Controls\TextBoxX.ico" />
+    <EmbeddedResource Include="DateTimeInput.ico" />
+    <EmbeddedResource Include="MonthCalendarAdv.ico" />
+    <EmbeddedResource Include="DoubleInput.ico" />
+    <EmbeddedResource Include="IntegerInput.ico" />
+    <EmbeddedResource Include="ScrollBar\HScrollBarAdv.ico" />
+    <EmbeddedResource Include="CrumbBar\CrumbBar.ico" />
+    <EmbeddedResource Include="Controls\WarningBox.ico" />
+    <EmbeddedResource Include="IpAddressInput.ico" />
+    <EmbeddedResource Include="Ribbon\ItemPanel.ico" />
+    <EmbeddedResource Include="Ribbon\RibbonClientPanel.bmp" />
+    <EmbeddedResource Include="Ribbon\SuperTooltip.ico" />
+    <EmbeddedResource Include="StyleManager.ico" />
+    <EmbeddedResource Include="SuperTabControl\SuperTabStrip\SuperTabDragWindow.resx">
+      <DependentUpon>SuperTabDragWindow.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="SystemImages\BlankOffice2010HotSilver.png" />
+    <EmbeddedResource Include="SystemImages\BlankOffice2010NormalSilver.png" />
+    <EmbeddedResource Include="SystemImages\BlankOffice2010PressedSilver.png" />
+    <EmbeddedResource Include="SystemImages\BlankWin7HotBlue.png" />
+    <EmbeddedResource Include="SystemImages\BlankWin7NormalBlue.png" />
+    <EmbeddedResource Include="SystemImages\BlankWin7PressedBlue.png" />
+    <EmbeddedResource Include="Validator\Highlighter.ico" />
+    <EmbeddedResource Include="Validator\SuperValidator.ico" />
+    <EmbeddedResource Include="SystemImages\Category.png" />
+    <EmbeddedResource Include="SystemImages\Sort.png" />
+    <EmbeddedResource Include="SystemImages\ErrorIcon.png" />
+    <EmbeddedResource Include="SystemImages\FreeText.png" />
+    <EmbeddedResource Include="SystemImages\CloseButton.png" />
+    <EmbeddedResource Include="SystemImages\Rating.png" />
+    <EmbeddedResource Include="SystemImages\BlankStartButtonPressedVistaBlack.png" />
+    <EmbeddedResource Include="SystemImages\BlankStartButtonHotVistaBlack.png" />
+    <EmbeddedResource Include="SystemImages\BlankStartButtonNormalVistaBlack.png" />
+    <EmbeddedResource Include="ScrollBar\VScrollBarAdv.ico" />
+    <EmbeddedResource Include="SystemImages\DateReset.png" />
+    <EmbeddedResource Include="SystemImages\ColorPickerButtonImage.png" />
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <SubType>Designer</SubType>
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+    <EmbeddedResource Include="SystemImages\BlankStartButtonPressedBlack.png" />
+    <EmbeddedResource Include="SystemImages\BlankStartButtonPressedSilver.png" />
+    <EmbeddedResource Include="SystemImages\BlankStartButtonNormalSilver.png" />
+    <EmbeddedResource Include="SystemImages\BlankStartButtonHotSilver.png" />
+    <EmbeddedResource Include="SystemImages\BlankStartButtonHot.png" />
+    <EmbeddedResource Include="SystemImages\BlankStartButtonHotBlack.png" />
+    <EmbeddedResource Include="SystemImages\BlankStartButtonNormal.png" />
+    <EmbeddedResource Include="SystemImages\BlankStartButtonNormalBlack.png" />
+    <EmbeddedResource Include="SystemImages\BlankStartButtonPressed.png" />
+    <EmbeddedResource Include="SystemImages\QatCustomizeItemCombo.png" />
+    <EmbeddedResource Include="Ribbon\QatCustomizeDialog.resx">
+      <SubType>Designer</SubType>
+      <DependentUpon>QatCustomizeDialog.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Ribbon\QatCustomizePanel.resx">
+      <SubType>Designer</SubType>
+      <DependentUpon>QatCustomizePanel.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="SystemImages\GreenLight.png" />
+    <EmbeddedResource Include="SystemImages\ColorPickerCustomColors.png" />
+    <EmbeddedResource Include="Wizard\Wizard.ico" />
+    <EmbeddedResource Include="SystemImages\WizardHeaderImage.png" />
+    <EmbeddedResource Include="SystemImages\ImagePlaceHolder16x16.png" />
+    <EmbeddedResource Include="SystemImages\ImagePlaceHolder.png" />
+    <EmbeddedResource Include="SystemImages\RibbonOverflow.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="dotnetbar.snk" />
+    <EmbeddedResource Include="SystemImages\MaterialIcons-Regular.ttf" />
+    <EmbeddedResource Include="SystemImages\FontAwesome.ttf" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="SuperTabControl.ico" />
+    <EmbeddedResource Include="SuperTabStrip.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Controls\SwitchButton.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="SystemImages\TaskBlueFlag.png" />
+    <EmbeddedResource Include="SystemImages\TaskBlueStop.png" />
+    <EmbeddedResource Include="SystemImages\TaskBulb.png" />
+    <EmbeddedResource Include="SystemImages\TaskCheckMark.png" />
+    <EmbeddedResource Include="SystemImages\TaskCheckMark2.png" />
+    <EmbeddedResource Include="SystemImages\TaskDelete.png" />
+    <EmbeddedResource Include="SystemImages\TaskExclamation.png" />
+    <EmbeddedResource Include="SystemImages\TaskFlag.png" />
+    <EmbeddedResource Include="SystemImages\TaskHand.png" />
+    <EmbeddedResource Include="SystemImages\TaskHelp.png" />
+    <EmbeddedResource Include="SystemImages\TaskInformation.png" />
+    <EmbeddedResource Include="SystemImages\TaskInformation2.png" />
+    <EmbeddedResource Include="SystemImages\TaskNoEntry.png" />
+    <EmbeddedResource Include="SystemImages\TaskShield.png" />
+    <EmbeddedResource Include="SystemImages\TaskShieldHelp.png" />
+    <EmbeddedResource Include="SystemImages\TaskShieldOk.png" />
+    <EmbeddedResource Include="SystemImages\TaskShieldStop.png" />
+    <EmbeddedResource Include="SystemImages\TaskStop.png" />
+    <EmbeddedResource Include="SystemImages\TaskStop2.png" />
+    <EmbeddedResource Include="SystemImages\TaskUsers.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="MicroCharts\MicroChart.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Controls\CircularProgress.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="ColorPickers\ColorCombControl.ico" />
+    <EmbeddedResource Include="ColorPickers\CustomColorBlender.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Controls\AnalogClockControl.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="SystemImages\DockHintAllSides2010.png" />
+    <EmbeddedResource Include="SystemImages\DockHintBottom2010.png" />
+    <EmbeddedResource Include="SystemImages\DockHintLeft2010.png" />
+    <EmbeddedResource Include="SystemImages\DockHintRight2010.png" />
+    <EmbeddedResource Include="SystemImages\DockHintTab2010.png" />
+    <EmbeddedResource Include="SystemImages\DockHintTop2010.png" />
+    <EmbeddedResource Include="SystemImages\Office2010BlackClientBackground.png" />
+    <EmbeddedResource Include="SystemImages\Office2010BlueClientBackground.png" />
+    <EmbeddedResource Include="SystemImages\Office2010SilverClientBackground.png" />
+    <EmbeddedResource Include="SystemImages\VS2010ClientBackground.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Metro\MetroShell.ico" />
+    <EmbeddedResource Include="Metro\MetroStatusBar.ico" />
+    <EmbeddedResource Include="Metro\MetroToolbar.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Controls\SlidePanel.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="SystemImages\WinClose.png" />
+    <EmbeddedResource Include="SystemImages\WinMax.png" />
+    <EmbeddedResource Include="SystemImages\WinMin.png" />
+    <EmbeddedResource Include="SystemImages\WinRestore.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TimeSelector.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Controls\PageSlider.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Controls\StepIndicator.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="SystemImages\Shadow3px.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Metro\MetroTilePanel.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="SystemImages\Shadow3px-2.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Editors\Calculator\Calculator.resx">
+      <DependentUpon>Calculator.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="SystemImages\DockHintLeftRight2010.png" />
+    <EmbeddedResource Include="SystemImages\DockHintTopBottom2010.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Calculator.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="SystemImages\Calculator.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="SystemImages\Delete.png" />
+    <EmbeddedResource Include="SystemImages\FirstRecord.png" />
+    <EmbeddedResource Include="SystemImages\LastRecord.png" />
+    <EmbeddedResource Include="SystemImages\NewRecord.png" />
+    <EmbeddedResource Include="SystemImages\NextRecord.png" />
+    <EmbeddedResource Include="SystemImages\PreviousRecord.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Controls\BindingNavigatorEx.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Controls\RichTextBoxEx.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="RadialMenu.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+      <Visible>False</Visible>
+      <ProductName>Windows Installer 3.1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Controls\RangeSlider.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="ProgressSteps.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="ListBoxAdv.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Controls\CollapsibleSplitContainer.ico" />
+    <EmbeddedResource Include="Controls\SymbolBox.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Controls\Flyout\FlyoutForm.resx">
+      <DependentUpon>FlyoutForm.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Controls\TokenEditor.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Controls\Flyout.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Controls\Line.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Controls\SideNav.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Controls\TabFormControl.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Controls\ToolboxControl.bmp" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DotNetBarBuild.sln b/PROMS/DotNetBar Source Code/DotNetBarBuild.sln
new file mode 100644
index 00000000..175060bb
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarBuild.sln	
@@ -0,0 +1,37 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.35425.106
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNetBarBuild", "DotNetBarBuild.csproj", "{36546CE3-335C-4AB6-A2F3-40F8C818BC66}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+		Release2005|Any CPU = Release2005|Any CPU
+		ReleaseTrial|Any CPU = ReleaseTrial|Any CPU
+		ReleaseTrial2005|Any CPU = ReleaseTrial2005|Any CPU
+		ReleaseTrialNoLimit|Any CPU = ReleaseTrialNoLimit|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{36546CE3-335C-4AB6-A2F3-40F8C818BC66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{36546CE3-335C-4AB6-A2F3-40F8C818BC66}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{36546CE3-335C-4AB6-A2F3-40F8C818BC66}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{36546CE3-335C-4AB6-A2F3-40F8C818BC66}.Release|Any CPU.Build.0 = Release|Any CPU
+		{36546CE3-335C-4AB6-A2F3-40F8C818BC66}.Release2005|Any CPU.ActiveCfg = Release2005|Any CPU
+		{36546CE3-335C-4AB6-A2F3-40F8C818BC66}.Release2005|Any CPU.Build.0 = Release2005|Any CPU
+		{36546CE3-335C-4AB6-A2F3-40F8C818BC66}.ReleaseTrial|Any CPU.ActiveCfg = ReleaseTrial|Any CPU
+		{36546CE3-335C-4AB6-A2F3-40F8C818BC66}.ReleaseTrial|Any CPU.Build.0 = ReleaseTrial|Any CPU
+		{36546CE3-335C-4AB6-A2F3-40F8C818BC66}.ReleaseTrial2005|Any CPU.ActiveCfg = ReleaseTrial2005|Any CPU
+		{36546CE3-335C-4AB6-A2F3-40F8C818BC66}.ReleaseTrial2005|Any CPU.Build.0 = ReleaseTrial2005|Any CPU
+		{36546CE3-335C-4AB6-A2F3-40F8C818BC66}.ReleaseTrialNoLimit|Any CPU.ActiveCfg = ReleaseTrialNoLimit|Any CPU
+		{36546CE3-335C-4AB6-A2F3-40F8C818BC66}.ReleaseTrialNoLimit|Any CPU.Build.0 = ReleaseTrialNoLimit|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {DD0367A5-82AA-4576-8494-126E7C7ABF66}
+	EndGlobalSection
+EndGlobal
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/AdvTree.Design/AdvTreeActionList.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/AdvTree.Design/AdvTreeActionList.cs
new file mode 100644
index 00000000..3970d6d8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/AdvTree.Design/AdvTreeActionList.cs	
@@ -0,0 +1,155 @@
+#if FRAMEWORK20
+using System;
+using System.Text;
+using System.ComponentModel.Design;
+using System.ComponentModel;
+using System.Drawing;
+
+namespace DevComponents.AdvTree.Design
+{
+    internal class AdvTreeActionList : DesignerActionList
+    {
+        private AdvTreeDesigner _Designer = null;
+
+        /// <summary>
+        /// Initializes a new instance of the AdvTreeActionList class.
+        /// </summary>
+        /// <param name="designer"></param>
+        public AdvTreeActionList(AdvTreeDesigner designer):base(designer.Component)
+        {
+            _Designer = designer;
+        }
+
+        public override DesignerActionItemCollection GetSortedActionItems()
+        {
+            DesignerActionItemCollection items = new DesignerActionItemCollection();
+            items.Add(new DesignerActionHeaderItem("Nodes"));
+            items.Add(new DesignerActionHeaderItem("Columns"));
+            items.Add(new DesignerActionHeaderItem("Selection"));
+
+            items.Add(new DesignerActionMethodItem(this, "CreateNode", "Create Node", "Nodes", true));
+            items.Add(new DesignerActionPropertyItem("CellEdit", "Allow node text editing?", "Nodes", "Indicates whether node cells are editable"));
+
+            items.Add(new DesignerActionMethodItem(this, "EditColumns", "Edit Columns...", "Columns", "Edit Tree Control Columns", true));
+            items.Add(new DesignerActionPropertyItem("ColumnsVisible", "Column header visible?", "Columns", "Indicates whether tree column header is visible"));
+            items.Add(new DesignerActionPropertyItem("GridColumnLines", "Show grid column lines?", "Columns", "Indicates whether grid lines are visible"));
+            items.Add(new DesignerActionPropertyItem("GridRowLines", "Show grid row lines?", "Nodes", "Indicates whether grid lines between nodes are visible"));
+            items.Add(new DesignerActionPropertyItem("GridLinesColor", "Grid lines color:", "Columns", "Indicates custom color for grid lines"));
+
+            items.Add(new DesignerActionPropertyItem("SelectionBox", "Show selection?", "Selection", "Indicates whether selection is shown for selected node"));
+            items.Add(new DesignerActionPropertyItem("SelectionBoxStyle", "Selection style:", "Selection", "Indicates selection style"));
+            items.Add(new DesignerActionPropertyItem("HotTracking", "Highlight mouse over node?", "Selection", "Indicates whether node that mouse is over is highlighted"));
+   
+            return items;
+        }
+
+        public void CreateNode()
+        {
+            _Designer.CreateNode();
+        }
+
+        public void EditColumns()
+        {
+            _Designer.EditColumns();
+        }
+
+        public bool HotTracking
+        {
+            get
+            {
+                return ((AdvTree)base.Component).HotTracking;
+            }
+            set
+            {
+                TypeDescriptor.GetProperties(base.Component)["HotTracking"].SetValue(base.Component, value);
+            }
+        }
+
+        public bool SelectionBox
+        {
+            get
+            {
+                return ((AdvTree)base.Component).SelectionBox;
+            }
+            set
+            {
+                TypeDescriptor.GetProperties(base.Component)["SelectionBox"].SetValue(base.Component, value);
+            }
+        }
+
+        public eSelectionStyle SelectionBoxStyle
+        {
+            get
+            {
+                return ((AdvTree)base.Component).SelectionBoxStyle;
+            }
+            set
+            {
+                TypeDescriptor.GetProperties(base.Component)["SelectionBoxStyle"].SetValue(base.Component, value);
+            }
+        }
+
+        public bool ColumnsVisible
+        {
+            get
+            {
+                return ((AdvTree)base.Component).ColumnsVisible;
+            }
+            set
+            {
+                TypeDescriptor.GetProperties(base.Component)["ColumnsVisible"].SetValue(base.Component, value);
+            }
+        }
+
+        public bool GridColumnLines
+        {
+            get
+            {
+                return ((AdvTree)base.Component).GridColumnLines;
+            }
+            set
+            {
+                TypeDescriptor.GetProperties(base.Component)["GridColumnLines"].SetValue(base.Component, value);
+            }
+        }
+
+        public bool GridRowLines
+        {
+            get
+            {
+                return ((AdvTree)base.Component).GridRowLines;
+            }
+            set
+            {
+                TypeDescriptor.GetProperties(base.Component)["GridRowLines"].SetValue(base.Component, value);
+            }
+        }
+
+        public Color GridLinesColor
+        {
+            get
+            {
+                return ((AdvTree)base.Component).GridLinesColor;
+            }
+            set
+            {
+                TypeDescriptor.GetProperties(base.Component)["GridLinesColor"].SetValue(base.Component, value);
+            }
+        }
+
+        public bool CellEdit
+        {
+            get
+            {
+                return ((AdvTree)base.Component).CellEdit;
+            }
+            set
+            {
+                TypeDescriptor.GetProperties(base.Component)["CellEdit"].SetValue(base.Component, value);
+            }
+        }
+ 
+
+    }
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/AdvTree.Design/AdvTreeDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/AdvTree.Design/AdvTreeDesigner.cs
new file mode 100644
index 00000000..d96bf9c9
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/AdvTree.Design/AdvTreeDesigner.cs	
@@ -0,0 +1,1033 @@
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.ComponentModel.Design;
+using System.Drawing;
+using System.Windows.Forms;
+using System.Windows.Forms.Design;
+using DevComponents.DotNetBar;
+using System.Drawing.Design;
+using System.Reflection;
+
+namespace DevComponents.AdvTree.Design
+{
+	/// <summary>
+	/// Represents windows forms designer for the control.
+	/// </summary>
+	public class AdvTreeDesigner:ParentControlDesigner
+	{
+		#region Private Variables
+//		private Point m_MouseDownPosition=Point.Empty;
+//		private bool m_IgnoreMouseUp=false;
+//		private bool m_Capture=false;
+		private bool m_DragDropStarted=false;
+		const string TEMP_NAME="tempDragDropItem";
+		const int WM_RBUTTONDOWN=0x0204;
+		const int WM_LBUTTONDOWN=0x0201;
+//		const int WM_LBUTTONUP=0x0202;
+//		const int WM_RBUTTONUP=0x0205;
+//		const int WM_MOUSEMOVE=0x0200;
+		const int WM_LBUTTONDBLCLK=0x0203;
+		
+		private Timer m_TimerAdded=null;
+		private Timer m_TimerDragDrop=null;
+		private bool m_DragLeave=false;
+		private bool m_ControlRemoved=false;
+		private DateTime m_JustAdded=DateTime.MinValue;
+		private bool m_NewControlAdded=false;
+		private Point m_MouseDownPoint=Point.Empty;
+		#endregion
+		
+		#region Designer Implementation
+		/// <summary>Initializes designer with given component.</summary>
+		/// <param name="component">Component to initialize designer with.</param>
+		public override void Initialize(IComponent component) 
+		{
+			base.Initialize(component);
+			if(!component.Site.DesignMode)
+				return;
+
+			ISelectionService ss =(ISelectionService)GetService(typeof(ISelectionService));
+			if(ss!=null)
+				ss.SelectionChanged+=new EventHandler(OnSelectionChanged);
+
+			// If our component is removed we need to clean-up
+			IComponentChangeService cc=(IComponentChangeService)GetService(typeof(IComponentChangeService));
+			if(cc!=null)
+			{
+				cc.ComponentRemoving+=new ComponentEventHandler(this.OnComponentRemoving);
+			}
+			
+			if(component is Control)
+			{
+				((Control)component).ControlAdded+=new ControlEventHandler(this.ControlAdded);
+				((Control)component).ControlRemoved+=new ControlEventHandler(this.ControlRemoved);
+			}
+			
+			#if !TRIAL
+			IDesignerHost dh = this.GetService(typeof (IDesignerHost)) as IDesignerHost;
+			if(dh!=null)
+				dh.LoadComplete+=new EventHandler(dh_LoadComplete);			
+			#endif
+		}
+
+		protected override void Dispose(bool disposing)
+		{
+			
+			ISelectionService ss =(ISelectionService)GetService(typeof(ISelectionService));
+			if(ss!=null)
+				ss.SelectionChanged-=new EventHandler(OnSelectionChanged);
+
+			// If our component is removed we need to clean-up
+			IComponentChangeService cc=(IComponentChangeService)GetService(typeof(IComponentChangeService));
+			if(cc!=null)
+				cc.ComponentRemoving-=new ComponentEventHandler(this.OnComponentRemoving);
+		
+			if(this.Control!=null)
+			{
+				this.Control.ControlAdded-=new ControlEventHandler(this.ControlAdded);
+				this.Control.ControlRemoved-=new ControlEventHandler(this.ControlRemoved);
+			}
+			
+			base.Dispose (disposing);
+		}
+
+		internal void HookControl(Control c)
+		{
+			this.HookChildControls(c);
+		}
+
+#if FRAMEWORK20
+        public override void InitializeNewComponent(IDictionary defaultValues)
+        {
+            SetDefaults();
+            base.InitializeNewComponent(defaultValues);
+        }
+#else
+		/// <summary>Sets design-time defaults for component.</summary>
+		public override void OnSetComponentDefaults()
+		{
+			base.OnSetComponentDefaults();
+			SetDefaults();
+		}
+#endif
+		
+		private void SetDefaults()
+		{
+			CreateNode(null,true);
+			IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+			if(dh==null)
+				return;
+			Utilities.InitializeTree(this.Control as AdvTree,new ComponentFactory(dh));
+            this.Control.Size = new Size(100, 100);
+#if !TRIAL
+			string key=GetLicenseKey();
+			AdvTree tree=this.Control as AdvTree;
+			tree.LicenseKey=key;
+#endif
+		}
+
+		private Node CreateNode(Node parentNode, bool addToCollections)
+		{
+			AdvTree tree=this.Control as AdvTree;
+
+			IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+			if(dh==null)
+				return null;
+            
+			Node node=null;
+			tree.BeginUpdate();
+			try
+			{
+				IComponentChangeService change=this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+				if(addToCollections)
+				{
+					if(change!=null)
+					{
+						if(parentNode!=null)
+							change.OnComponentChanging(this.Component,TypeDescriptor.GetProperties(parentNode).Find("Nodes",true));
+						else
+							change.OnComponentChanging(this.Component,TypeDescriptor.GetProperties(tree).Find("Nodes",true));
+					}
+				}
+
+				node=dh.CreateComponent(typeof(Node)) as Node;
+				
+				if(node!=null)
+				{
+					node.Text=node.Name;
+					node.Expanded = true;
+					if(addToCollections)
+					{
+						if(parentNode==null)
+							tree.Nodes.Add(node);
+						else
+							parentNode.Nodes.Add(node);
+
+						if(change!=null)
+						{
+							if(parentNode!=null)
+								change.OnComponentChanged(this.Component,TypeDescriptor.GetProperties(parentNode).Find("Nodes",true),null,null);
+							else
+								change.OnComponentChanged(this.Component,TypeDescriptor.GetProperties(tree).Find("Nodes",true),null,null);
+						}
+					}
+				}
+			}
+			finally
+			{
+				tree.EndUpdate();
+			}
+
+			return node;
+		}
+		
+		private void OnSelectionChanged(object sender,EventArgs e)
+		{
+			ISelectionService ss = (ISelectionService)sender;
+            if (ss.PrimarySelection == this.Component)
+            {
+                AdvTree tree = this.Control as AdvTree;
+                tree.SelectedNode = null;
+            }
+		}
+
+		/// <summary>Called when component is about to be removed from designer.</summary>
+		/// <param name="sender">Event sender.</param>
+		/// <param name="e">Event arguments.</param>
+		public void OnComponentRemoving(object sender,ComponentEventArgs e)
+		{
+			if(e.Component==this.Component)
+			{
+				IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+				if(dh==null)
+					return;
+				
+				ArrayList list = new ArrayList(this.AssociatedComponents);
+				foreach(IComponent c in list)
+					dh.DestroyComponent(c);
+			}
+			else if(e.Component is Node && ((Node)e.Component).TreeControl==this.Control)
+			{
+				OnNodeRemoving(e.Component as Node);
+			}
+		}
+
+		private void OnNodeRemoving(Node node)
+		{
+			IComponentChangeService cc=this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+			IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+
+            if (node.Parent != null)
+            {
+                Node parent = node.Parent;
+                if (cc != null)
+                    cc.OnComponentChanging(parent, TypeDescriptor.GetProperties(parent)["Nodes"]);
+                node.Remove();
+                if (cc != null)
+                    cc.OnComponentChanged(parent, TypeDescriptor.GetProperties(parent)["Nodes"], null, null);
+            }
+            else
+            {
+                // Root node
+                AdvTree tree = this.Control as AdvTree;
+                if (cc != null)
+                    cc.OnComponentChanging(tree, TypeDescriptor.GetProperties(tree)["Nodes"]);
+                node.Remove();
+                if (cc != null)
+                    cc.OnComponentChanged(tree, TypeDescriptor.GetProperties(tree)["Nodes"], null, null);
+            }
+
+			if(node.Nodes.Count>0)
+			{
+				Node[] nodes=new Node[node.Nodes.Count];
+				node.Nodes.CopyTo(nodes);
+				foreach(Node n in nodes)
+				{
+					n.Remove();
+
+					if(n.ParentConnector!=null && dh!=null)
+						dh.DestroyComponent(n.ParentConnector);
+
+					if(dh!=null)
+						dh.DestroyComponent(n);
+				}
+			}
+
+			this.RecalcLayout();
+		}
+
+		/// <summary>
+		/// Returns all components associated with this control
+		/// </summary>
+		public override ICollection AssociatedComponents
+		{
+			get
+			{
+				ArrayList c=new ArrayList(base.AssociatedComponents);
+				AdvTree tree=this.Control as AdvTree;
+				if(tree!=null)
+				{
+					foreach(Node node in tree.Nodes)
+						GetNodesRecursive(node,c);
+
+					foreach(ElementStyle style in tree.Styles)
+						c.Add(style);
+
+					if(tree.NodesConnector!=null)
+						c.Add(tree.NodesConnector);
+                    //if(tree.RootConnector!=null)
+                    //    c.Add(tree.RootConnector);
+                    //if(tree.LinkConnector!=null)
+                    //    c.Add(tree.LinkConnector);
+					if(tree.SelectedPathConnector!=null)
+						c.Add(tree.SelectedPathConnector);
+                    foreach (ColumnHeader ch in tree.Columns)
+                    {
+                        c.Add(ch);
+                    }
+				}
+				return c;
+			}
+		}
+
+		private void GetNodesRecursive(Node parent,ArrayList c)
+		{
+			c.Add(parent);
+			
+			if(parent.ParentConnector!=null)
+				c.Add(parent.ParentConnector);
+			foreach(Node node in parent.Nodes)
+			{
+				c.Add(node);
+                if (node.Cells.Count > 1)
+                {
+                    for (int i = 1; i < node.Cells.Count; i++)
+                    {
+                        c.Add(node.Cells[i]);
+                    }
+                }
+                if (node.NodesColumns.Count > 0)
+                {
+                    foreach (ColumnHeader ch in node.NodesColumns)
+                    {
+                        c.Add(ch);
+                    }
+                }
+				GetNodesRecursive(node,c);
+			}
+		}
+
+		/// <summary>
+		/// Selection support for items on container.
+		/// </summary>
+		protected override void WndProc(ref Message m)
+		{
+			switch(m.Msg)
+			{
+				case WM_LBUTTONDOWN:
+				{
+					if(OnMouseDown(ref m,MouseButtons.Left))
+						return;
+					break;
+				}
+				case WM_RBUTTONDOWN:
+				{
+					if(OnMouseDown(ref m,MouseButtons.Right))
+						return;
+					break;
+				}
+//				case WM_LBUTTONUP:
+//				{
+//					if(OnMouseUp(ref m,MouseButtons.Left))
+//						return;
+//					break;
+//				}
+//				case WM_RBUTTONUP:
+//				{
+//					if(OnMouseUp(ref m,MouseButtons.Right))
+//						return;
+//					break;
+//				}
+//				case WM_MOUSEMOVE:
+//				{
+//					if(OnMouseMove(ref m))
+//						return;
+//					break;
+//				}
+				case WM_LBUTTONDBLCLK:
+				{
+					if(OnMouseDoubleClick())
+						return;
+					break;
+				}
+			}
+
+			base.WndProc(ref m);
+		}
+
+		private bool OnMouseDoubleClick()
+		{
+			bool processed=false;
+
+			ISelectionService selection = (ISelectionService) this.GetService(typeof(ISelectionService));
+			if(selection.PrimarySelection is Node && ((Node)selection.PrimarySelection).TreeControl==this.Control)
+			{
+				IDesignerHost host=(IDesignerHost) this.GetService(typeof(IDesignerHost));
+				if(host!=null)
+				{
+					IDesigner designer=host.GetDesigner(selection.PrimarySelection as IComponent);
+					if(designer!=null)
+					{
+						designer.DoDefaultAction();
+						processed=true;
+					}
+				}
+			}
+
+			return processed;
+		}
+
+		protected virtual bool OnMouseDown(ref Message m, MouseButtons button)
+		{
+			
+			AdvTree tree=this.Control as AdvTree;
+
+			if(tree==null)
+				return false;
+
+			Point pos=tree.PointToClient(System.Windows.Forms.Control.MousePosition);
+			//m_MouseDownPosition=pos;
+
+			Node node=tree.GetNodeAt(pos);
+			if(node!=null && button==MouseButtons.Right)
+			{
+				ISelectionService selection = (ISelectionService) this.GetService(typeof(ISelectionService));
+				ArrayList arr=new ArrayList(1);
+				arr.Add(node);
+				selection.SetSelectedComponents(arr,SelectionTypes.MouseDown);
+
+				tree.SelectedNode=node;
+				this.OnContextMenu(System.Windows.Forms.Control.MousePosition.X,System.Windows.Forms.Control.MousePosition.Y);
+
+				return true;
+			}
+					
+			return false;
+		}
+
+        /// <summary>Specifies selection rules for designer.</summary>
+        public override SelectionRules SelectionRules
+        {
+            get
+            {
+
+                PropertyDescriptorCollection properties = TypeDescriptor.GetProperties(this.Component);
+                PropertyDescriptor lockDesc = properties["Locked"];
+                if (lockDesc != null)
+                {
+                    object lockValue = lockDesc.GetValue(this.Component);
+                    if ((lockValue is bool) && ((bool)lockValue))
+                    {
+                        return SelectionRules.Visible | SelectionRules.Locked;
+                    }
+                }
+                return (SelectionRules.AllSizeable | SelectionRules.Moveable | SelectionRules.Visible);
+            }
+        }
+		#endregion
+		
+		#region Drag & Drop External Control Support
+		private void DestroyComponent(IComponent c)
+		{
+			IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+			if(dh==null)
+				return;
+			dh.DestroyComponent(c);
+		}
+		
+		private void RecalcLayout()
+		{
+			AdvTree tree = this.Control as AdvTree;
+			if(tree!=null)
+			{
+				tree.RecalcLayout();
+				tree.Refresh();
+			}
+		}
+		private void ControlAdded(object sender, ControlEventArgs e)
+		{
+			if(!m_NewControlAdded)
+			{
+				if(!m_NewControlAdded)
+				{
+					if(!OnControlAdded(e))
+						return;
+				}
+				else
+					return;
+			}
+
+			m_TimerAdded=new Timer();
+			m_TimerAdded.Tick+=new EventHandler(this.TimerTick);
+			m_TimerAdded.Interval=50;
+			m_TimerAdded.Enabled=true;
+			m_TimerAdded.Start();
+			m_NewControlAdded=false;
+		}
+
+		/// <summary>
+		/// Called after control has been added to container but not through drag & drop. Control added could also be
+		/// internal control by the bar container.
+		/// </summary>
+		/// <param name="e">Event arguments</param>
+		/// <returns>true if acted upon this new control otherwise false.</returns>
+		protected virtual bool OnControlAdded(ControlEventArgs e)
+		{
+			return false;
+		}
+
+		private void ControlRemoved(object sender, ControlEventArgs e)
+		{
+			IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+			if(dh==null || dh.Loading)
+				return;
+
+			if(m_JustAdded!=DateTime.MinValue && DateTime.Now.Subtract(m_JustAdded).Seconds<2)
+			{
+				m_JustAdded=DateTime.MinValue;
+				return;
+			}
+			m_JustAdded=DateTime.MinValue;
+			if(m_DragLeave)
+				ControlRemoved(e.Control);
+			else if(m_TimerDragDrop!=null)
+				m_ControlRemoved=true;
+			else
+			{
+				ISelectionService ss =(ISelectionService)GetService(typeof(ISelectionService));
+				if(ss!=null && ss.PrimarySelection==e.Control && Utilities.FindNodeForControl(this.Control as AdvTree, e.Control)!=null)
+				{
+					ControlRemoved(e.Control);
+				}
+			}
+		}
+
+		private void ControlRemoved(Control control)
+		{
+			AdvTree tree = this.Control as AdvTree;
+			
+			if(control!=null)
+			{
+				Node node=Utilities.FindNodeForControl(tree,control);
+				if(node!=null)
+				{
+					if(m_DragDropStarted)
+					{
+						tree.InternalDragLeave();
+						m_DragDropStarted = false;
+					}
+					
+					if(node.Parent!=null)
+					{
+						Node parent=node.Parent;
+						IComponentChangeService cc = this.GetService(typeof (IComponentChangeService)) as IComponentChangeService;
+						if(cc!=null)
+							cc.OnComponentChanging(parent, TypeDescriptor.GetProperties(parent)["Nodes"]);
+						node.Remove();
+						if(cc!=null)
+							cc.OnComponentChanged(parent, TypeDescriptor.GetProperties(parent)["Nodes"],null,null);
+					}
+					
+					this.DestroyComponent(node);
+					this.RecalcLayout();
+				}
+			}
+		}
+
+		private void TimerTick(object sender, EventArgs e)
+		{
+			m_TimerAdded.Stop();
+			m_TimerAdded.Enabled=false;
+			m_TimerAdded=null;
+			this.RecalcLayout();
+			ISelectionService sel=(ISelectionService)this.GetService(typeof(ISelectionService));
+			if(sel!=null && sel.PrimarySelection is Control && this.Control.Controls.Contains((Control)sel.PrimarySelection))
+			{
+				IComponentChangeService cc=this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+				cc.OnComponentChanged(sel.PrimarySelection,null,null,null);
+			}
+		}
+		
+		private void TimerTickDragDrop(object sender, EventArgs e)
+		{
+			Point p=this.Control.PointToClient(System.Windows.Forms.Control.MousePosition);
+			if(this.Control.Bounds.Contains(p))
+				m_DragLeave=false;
+			else
+				m_DragLeave=true;
+
+			if(System.Windows.Forms.Control.MouseButtons!=MouseButtons.Left)
+			{
+				m_TimerDragDrop.Enabled=false;
+				m_TimerDragDrop.Stop();
+				m_TimerDragDrop.Tick-=new EventHandler(TimerTickDragDrop);
+				m_TimerDragDrop.Dispose();
+				m_TimerDragDrop=null;
+				if(m_ControlRemoved)
+				{
+					m_ControlRemoved=false;
+					ISelectionService sel=this.GetService(typeof(ISelectionService)) as ISelectionService;
+					if(sel!=null && sel.PrimarySelection is Control)
+						ControlRemoved((Control)sel.PrimarySelection);
+				}
+			}
+		}
+		
+		protected override void OnDragLeave(EventArgs e)
+		{
+			if(m_DragDropStarted)
+			{
+				AdvTree tree=this.Control as AdvTree;
+				tree.InternalDragLeave();
+				m_DragDropStarted = false;
+			}
+			base.OnDragLeave (e);
+		}
+		
+		protected override void OnDragOver(DragEventArgs de)
+		{
+			AdvTree tree=this.Control as AdvTree;
+			if(tree==null)
+			{
+				base.OnDragOver(de);
+				return;
+			}
+			
+			if(m_DragDropStarted)
+			{
+				DragEventArgs d=new DragEventArgs(null,de.KeyState,de.X,de.Y,DragDropEffects.All,DragDropEffects.Move);
+				tree.InternalDragOver(d);
+				de.Effect=DragDropEffects.Move;
+				return;
+			}
+
+			ISelectionService sel=(ISelectionService)this.GetService(typeof(ISelectionService));
+			if(sel!=null && sel.PrimarySelection!=this.Component)
+			{
+				if(sel.PrimarySelection is Control && this.Control.Controls.Contains((Control)sel.PrimarySelection))
+				{			
+					Node node=Utilities.FindNodeForControl(tree,sel.PrimarySelection as Control);
+					if(node!=null)
+					{
+						if(tree.StartDragDrop(node))
+						{
+							if(m_TimerDragDrop==null)
+							{
+								m_TimerDragDrop=new Timer();
+								m_TimerDragDrop.Tick+=new EventHandler(this.TimerTickDragDrop);
+								m_TimerDragDrop.Interval=100;
+								m_TimerDragDrop.Enabled=true;
+								m_TimerDragDrop.Start();
+							}
+							m_DragDropStarted = true;
+						}
+					}
+					return;
+				}
+				else if(sel.SelectionCount>1)
+				{
+					de.Effect=DragDropEffects.None;
+					return;
+				}
+				else if(sel.PrimarySelection is Control && ((Control)sel.PrimarySelection).Parent!=null)
+				{
+					// New control being added to the container
+					Node node=new Node();
+					node.Name=TEMP_NAME;
+					node.Text = ((Control) sel.PrimarySelection).Name;
+					if(tree.StartDragDrop(node))
+						m_DragDropStarted = true;
+				}
+			}
+			
+			base.OnDragOver (de);
+		}
+
+		protected override void OnDragDrop(DragEventArgs de)
+		{
+			AdvTree tree=this.Control as AdvTree;
+			if(tree==null)
+			{
+				base.OnDragDrop(de);
+				return;
+			}
+			
+			ISelectionService sel=(ISelectionService)this.GetService(typeof(ISelectionService));
+            IComponentChangeService change = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+
+			if(sel!=null && sel.PrimarySelection is Control && this.Control.Controls.Contains((Control)sel.PrimarySelection))
+			{
+				de.Effect=DragDropEffects.Move;
+				tree.InternalDragDrop(new DragEventArgs(null,0,0,0,DragDropEffects.Move,DragDropEffects.All));
+
+                
+                if (change != null)
+                    change.OnComponentChanged(this.Control, TypeDescriptor.GetProperties(tree).Find("Nodes", true), null, null);
+			}
+			else
+			{
+				if(sel.SelectionCount>1)
+				{
+					de.Effect=DragDropEffects.None;
+					return;
+				}
+				else
+				{
+					Node node = tree.GetDragNode();
+                    Node[] dragNodes = node.Tag as Node[];
+                    Node dragNode = null;
+                    if (dragNodes != null && dragNodes.Length > 0)
+                        dragNode = dragNodes[0];
+
+                    if (node != null && dragNode != null && dragNode.Name == TEMP_NAME)
+                    {
+                        m_JustAdded = DateTime.Now;
+                        dragNode = CreateNode(null, false);
+                        TypeDescriptor.GetProperties(dragNode)["HostedControl"].SetValue(dragNode, sel.PrimarySelection as Control);
+                        TypeDescriptor.GetProperties(dragNode)["Text"].SetValue(dragNode, dragNode.HostedControl.Name);
+                        node.Tag = new Node[] { dragNode };
+
+                        Node newParent=tree.GetDragNode().Parent;
+						Node oldParent=dragNode.Parent;
+
+                        tree.InternalDragDrop(new DragEventArgs(null, 0, 0, 0, DragDropEffects.Move, DragDropEffects.All));
+                        m_NewControlAdded = true;
+                        m_DragDropStarted = false;
+                        newParent = dragNode.Parent;
+                        
+                        if (change != null)
+                        {
+                            if (oldParent != null)
+                                change.OnComponentChanged(this.Component, TypeDescriptor.GetProperties(oldParent).Find("Nodes", true), null, null);
+                            else
+                                change.OnComponentChanged(this.Component, TypeDescriptor.GetProperties(tree).Find("Nodes", true), null, null);
+                            if (newParent != null)
+                                change.OnComponentChanged(this.Component, TypeDescriptor.GetProperties(newParent).Find("Nodes", true), null, null);
+                            else
+                                change.OnComponentChanged(this.Component, TypeDescriptor.GetProperties(tree).Find("Nodes", true), null, null);
+                        }
+                        tree.RecalcLayout();
+                    }
+				}
+			}
+		
+			base.OnDragDrop(de);
+		}
+		#endregion
+
+		#region Drag & Drop support
+		/// <summary>
+		/// Called after node has been selected by designer as response to mouse action
+		/// </summary>
+		/// <param name="node">Node that is selected</param>
+		protected virtual void OnNodeSelected(Node node)
+		{
+			
+		}
+		
+		/// <summary>
+		/// Returns whether specified node can be dragged and dropped
+		/// </summary>
+		/// <param name="node">Node to verify</param>
+		/// <returns>true if node can be dragged and dropped</returns>
+		protected virtual bool CanDragNode(Node node)
+		{
+			return true;
+		}
+		
+		protected override void OnMouseDragBegin(int x, int y)
+		{
+			AdvTree tree=this.Control as AdvTree;
+			if(tree==null)
+			{
+				base.OnMouseDragBegin(x,y);
+				return;
+			}
+			
+			Point pos=tree.PointToClient(new Point(x,y));
+			Node node = tree.GetNodeAt(pos);
+			
+			if(node!=null)
+			{
+                Rectangle expandedRect = Display.NodeDisplay.GetNodeRectangle(eNodeRectanglePart.ExpandHitTestBounds, node, tree.NodeDisplay.Offset);
+				if(!expandedRect.IsEmpty && expandedRect.Contains(pos))
+				{
+					node.Expanded=!node.Expanded;
+					return;
+				}
+				ISelectionService selection = (ISelectionService) this.GetService(typeof(ISelectionService));
+				if(selection!=null)
+				{
+					ArrayList arr=new ArrayList(1);
+					arr.Add(node);
+					selection.SetSelectedComponents(arr,SelectionTypes.MouseDown);
+					OnNodeSelected(node);
+				}
+				tree.SelectedNode = node;
+			}
+			else
+				tree.SelectedNode = null;
+
+			if(node==null || !CanDragNode(node))
+			{
+				if(node==null)
+					base.OnMouseDragBegin(x,y);
+				else
+					this.Control.Capture = true; // Does same as base implementation
+				return;
+			}
+			
+			m_MouseDownPoint=new Point(x,y);
+			this.Control.Capture = true;
+		}
+		
+		protected override void OnMouseDragMove(int x, int y)
+		{
+			AdvTree tree=this.Control as AdvTree;
+			if(!m_MouseDownPoint.IsEmpty && tree.SelectedNode!=null)
+			{
+				if(Math.Abs(m_MouseDownPoint.X-x)>=SystemInformation.DragSize.Width || Math.Abs(m_MouseDownPoint.Y-y)>=SystemInformation.DragSize.Height)
+				{
+					tree.StartDragDrop(tree.SelectedNode);
+					m_MouseDownPoint=Point.Empty;
+					m_DragDropStarted=true;
+					return;
+				}
+			}
+
+			if(m_DragDropStarted)
+			{
+				DragEventArgs de=new DragEventArgs(null,(int)Control.ModifierKeys,x,y,DragDropEffects.All,DragDropEffects.Move);
+				tree.InternalDragOver(de);
+			}
+		}
+		
+		protected override void OnMouseDragEnd(bool cancel)
+		{
+			this.Control.Capture = false;
+			Cursor.Clip = Rectangle.Empty;
+			AdvTree tree=this.Control as AdvTree;
+			if(m_DragDropStarted)
+			{
+				if(tree!=null && tree.IsDragDropInProgress)
+				{
+					if(cancel)
+						tree.InternalDragLeave();
+					else if(tree.GetDragNode()!=null)
+					{
+						IComponentChangeService change=this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+
+                        Node[] dragNodes = tree.GetDragNode().Tag as Node[];
+                        Node dragNode = null;
+                        if (dragNodes != null && dragNodes.Length > 0)
+                            dragNode = dragNodes[0];
+						if(dragNode!=null)
+						{
+							Node newParent=tree.GetDragNode().Parent;
+							Node parent=dragNode.Parent;
+
+							if(change!=null)
+							{
+								if(parent!=null)
+									change.OnComponentChanging(this.Component,TypeDescriptor.GetProperties(parent).Find("Nodes",true));
+								else
+									change.OnComponentChanging(this.Component,TypeDescriptor.GetProperties(tree).Find("Nodes",true));
+							}
+
+							tree.InternalDragDrop(new DragEventArgs(null,0,0,0,DragDropEffects.None,DragDropEffects.None));
+
+                            newParent = dragNode.Parent;
+
+							if(change!=null)
+							{
+								if(parent!=null)
+									change.OnComponentChanged(this.Component,TypeDescriptor.GetProperties(parent).Find("Nodes",true),null,null);
+								else
+									change.OnComponentChanged(this.Component,TypeDescriptor.GetProperties(tree).Find("Nodes",true),null,null);
+								if(newParent!=null)
+									change.OnComponentChanged(this.Component,TypeDescriptor.GetProperties(newParent).Find("Nodes",true),null,null);
+								else
+									change.OnComponentChanged(this.Component,TypeDescriptor.GetProperties(tree).Find("Nodes",true),null,null);
+							}
+						}
+					}
+				}
+				cancel=true;
+			}
+			else
+			{
+                if (tree.SelectedNode != null)
+                    cancel = true;
+			}
+			
+			m_DragDropStarted = false;
+			base.OnMouseDragEnd(cancel);
+		}
+#if FRAMEWORK20
+        private DesignerActionListCollection _ActionLists = null;
+        public override DesignerActionListCollection ActionLists
+        {
+            get
+            {
+                if (this._ActionLists == null)
+                {
+                    this._ActionLists = new DesignerActionListCollection();
+                    this._ActionLists.Add(new AdvTreeActionList(this));
+                }
+                return this._ActionLists;
+            }
+        }
+#else
+        /// <summary>Returns design-time commands applicable to this designer.</summary>
+        public override DesignerVerbCollection Verbs
+        {
+            get
+            {
+                DesignerVerb[] verbs = new DesignerVerb[]
+					{
+						new DesignerVerb("Create Node", new EventHandler(CreateNode)),
+                        new DesignerVerb("Edit Columns...", new EventHandler(EditColumns))
+				};
+                return new DesignerVerbCollection(verbs);
+            }
+        }
+#endif
+
+        private void EditColumns(object sender, EventArgs e)
+        {
+            EditColumns();
+        }
+
+        internal void EditColumns()
+        {
+            AdvTree tree = this.Component as AdvTree;
+            EditValue(this, tree, "Columns");
+        }
+
+        internal static object EditValue(ComponentDesigner designer, object objectToChange, string propName)
+        {
+            Type t = Type.GetType("System.Windows.Forms.Design.EditorServiceContext");
+            if (t == null) t = Type.GetType("System.Windows.Forms.Design.EditorServiceContext, System.Design, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a");
+            if (t != null)
+            {
+                MethodInfo mi = t.GetMethod("EditValue");
+                if (mi != null)
+                    return mi.Invoke(null, new object[] { designer, objectToChange, propName });
+            }
+            return null;
+        }
+
+        private void CreateNode(object sender, EventArgs e)
+        {
+            CreateNode();
+        }
+
+        internal void CreateNode()
+        {
+            Node node = CreateNode(this.Component as AdvTree);
+            if (node != null)
+            {
+                ISelectionService sel = this.GetService(typeof(ISelectionService)) as ISelectionService;
+                ArrayList list = new ArrayList(1);
+                list.Add(node);
+                if (sel != null)
+                {
+                    sel.SetSelectedComponents(list, SelectionTypes.MouseDown);
+                    node.TreeControl.SelectedNode = node;
+                }
+            }
+        }
+
+        private Node CreateNode(AdvTree tree)
+        {
+            IDesignerHost dh = (IDesignerHost)GetService(typeof(IDesignerHost));
+            if (dh == null)
+                return null;
+
+            Node node = null;
+            tree.BeginUpdate();
+            try
+            {
+                IComponentChangeService change = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+                if (change != null)
+                {
+                    change.OnComponentChanging(this.Component, TypeDescriptor.GetProperties(tree).Find("Nodes", true));
+                }
+
+                node = dh.CreateComponent(typeof(Node)) as Node;
+                if (node != null)
+                {
+                    node.Text = node.Name;
+                    node.Expanded = true;
+                    tree.Nodes.Add(node);
+                    
+                    if (change != null)
+                        change.OnComponentChanged(this.Component, TypeDescriptor.GetProperties(tree).Find("Nodes", true), null, null);
+                }
+            }
+            finally
+            {
+                tree.EndUpdate();
+            }
+
+            return node;
+        }
+
+        protected override bool GetHitTest(Point pt)
+        {
+            AdvTree tree = this.Control as AdvTree;
+            if (tree != null && tree.IsHandleCreated && tree.AutoScroll)
+            {
+                Point p = tree.PointToClient(pt);
+                if (tree.VScrollBar != null && tree.VScrollBar.Bounds.Contains(p))
+                    return true;
+                if (tree.HScrollBar != null && tree.HScrollBar.Bounds.Contains(p))
+                    return true;
+                
+            }
+            return base.GetHitTest(pt);
+        }
+		#endregion
+		
+		#region Licensing Stuff
+		#if !TRIAL
+		private string GetLicenseKey()
+		{
+			string key="";
+			Microsoft.Win32.RegistryKey regkey=Microsoft.Win32.Registry.LocalMachine;
+			regkey=regkey.OpenSubKey("Software\\DevComponents\\Licenses",false);
+			if(regkey!=null)
+			{
+				object keyValue=regkey.GetValue("DevComponents.DotNetBar.DotNetBarManager2");
+				if(keyValue!=null)
+					key=keyValue.ToString();
+			}
+			return key;
+		}
+		private void dh_LoadComplete(object sender, EventArgs e)
+		{
+			IDesignerHost dh = this.GetService(typeof (IDesignerHost)) as IDesignerHost;
+			if(dh!=null)
+				dh.LoadComplete-=new EventHandler(dh_LoadComplete);
+			
+			string key=GetLicenseKey();
+            
+			AdvTree tree=this.Control as AdvTree;
+            if (key != "" && tree != null && tree.LicenseKey == "" && tree.LicenseKey != key)
+                TypeDescriptor.GetProperties(tree)["LicenseKey"].SetValue(tree, key);
+		}
+		#endif
+		#endregion
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/AdvTree.Design/CellCollectionEditor.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/AdvTree.Design/CellCollectionEditor.cs
new file mode 100644
index 00000000..b4541b4f
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/AdvTree.Design/CellCollectionEditor.cs	
@@ -0,0 +1,37 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace DevComponents.AdvTree.Design
+{
+    /// <summary>
+    /// Support for Cell tabs design-time editor.
+    /// </summary>
+    public class CellCollectionEditor : System.ComponentModel.Design.CollectionEditor
+    {
+        /// <summary>Creates new instance of cell collection editor.</summary>
+        /// <param name="type">Type to initialize editor with.</param>
+        public CellCollectionEditor(Type type)
+            : base(type)
+        {
+        }
+        protected override Type CreateCollectionItemType()
+        {
+            return typeof(Cell);
+        }
+        protected override Type[] CreateNewItemTypes()
+        {
+            return new Type[] { typeof(Cell) };
+        }
+        protected override object CreateInstance(Type itemType)
+        {
+            object item = base.CreateInstance(itemType);
+            if (item is Cell)
+            {
+                Cell cell = item as Cell;
+                cell.Text = cell.Name;
+            }
+            return item;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/AdvTree.Design/ColumnHeaderDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/AdvTree.Design/ColumnHeaderDesigner.cs
new file mode 100644
index 00000000..503eeca5
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/AdvTree.Design/ColumnHeaderDesigner.cs	
@@ -0,0 +1,38 @@
+using System;
+using System.Text;
+using System.ComponentModel.Design;
+using DevComponents.AdvTree;
+using System.Collections;
+
+namespace DevComponents.AdvTree.Design
+{
+    /// <summary>
+    /// Defines designer for ColumnHeader class.
+    /// </summary>
+    public class ColumnHeaderDesigner : ComponentDesigner
+    {
+        #region Internal Implementation
+        #if FRAMEWORK20
+        public override void InitializeNewComponent(IDictionary defaultValues)
+        {
+            SetDefaults();
+            base.InitializeNewComponent(defaultValues);
+        }
+#else
+		/// <summary>Sets design-time defaults for component.</summary>
+		public override void OnSetComponentDefaults()
+		{
+			base.OnSetComponentDefaults();
+			SetDefaults();
+		}
+#endif
+
+        private void SetDefaults()
+        {
+            ColumnHeader ch = this.Component as ColumnHeader;
+            ch.Width.Absolute = 150;
+            ch.Text = "Column";
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/AdvTree.Design/ComponentNotLicensed.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/AdvTree.Design/ComponentNotLicensed.cs
new file mode 100644
index 00000000..dca94124
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/AdvTree.Design/ComponentNotLicensed.cs	
@@ -0,0 +1,271 @@
+using System;
+using System.Drawing;
+using System.Collections;
+using System.ComponentModel;
+using System.Windows.Forms;
+
+namespace DevComponents.AdvTree.Design
+{
+	/// <summary>
+	/// Summary description for ComponentNotLicensed.
+	/// </summary>
+	public class ComponentNotLicensed : System.Windows.Forms.Form
+	{
+		private System.Windows.Forms.GroupBox groupBox1;
+		private System.Windows.Forms.Label label7;
+		private System.Windows.Forms.LinkLabel linkOrder;
+		private System.Windows.Forms.Label label6;
+		private System.Windows.Forms.Label label5;
+		private System.Windows.Forms.Label label4;
+		private System.Windows.Forms.Label label3;
+		private System.Windows.Forms.Label label2;
+		private System.Windows.Forms.Label label1;
+		private System.Windows.Forms.LinkLabel linkHome;
+		private System.Windows.Forms.LinkLabel linkEmail;
+		private System.Windows.Forms.Button button2;
+		private System.Windows.Forms.Button button1;
+		private System.Windows.Forms.Timer timer1;
+		private System.ComponentModel.IContainer components;
+
+		public ComponentNotLicensed()
+		{
+			//
+			// Required for Windows Form Designer support
+			//
+			InitializeComponent();
+
+			//
+			// TODO: Add any constructor code after InitializeComponent call
+			//
+		}
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		protected override void Dispose( bool disposing )
+		{
+			if( disposing )
+			{
+				if(components != null)
+				{
+					components.Dispose();
+				}
+			}
+			base.Dispose( disposing );
+		}
+
+		#region Windows Form 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.groupBox1 = new System.Windows.Forms.GroupBox();
+			this.label7 = new System.Windows.Forms.Label();
+			this.linkOrder = new System.Windows.Forms.LinkLabel();
+			this.label6 = new System.Windows.Forms.Label();
+			this.label5 = new System.Windows.Forms.Label();
+			this.label4 = new System.Windows.Forms.Label();
+			this.label3 = new System.Windows.Forms.Label();
+			this.label2 = new System.Windows.Forms.Label();
+			this.label1 = new System.Windows.Forms.Label();
+			this.linkHome = new System.Windows.Forms.LinkLabel();
+			this.linkEmail = new System.Windows.Forms.LinkLabel();
+			this.button2 = new System.Windows.Forms.Button();
+			this.button1 = new System.Windows.Forms.Button();
+			this.timer1 = new System.Windows.Forms.Timer(this.components);
+			this.groupBox1.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// groupBox1
+			// 
+			this.groupBox1.Controls.Add(this.label7);
+			this.groupBox1.Controls.Add(this.linkOrder);
+			this.groupBox1.Controls.Add(this.label6);
+			this.groupBox1.Controls.Add(this.label5);
+			this.groupBox1.Location = new System.Drawing.Point(11, 54);
+			this.groupBox1.Name = "groupBox1";
+			this.groupBox1.Size = new System.Drawing.Size(294, 135);
+			this.groupBox1.TabIndex = 17;
+			this.groupBox1.TabStop = false;
+			// 
+			// label7
+			// 
+			this.label7.Location = new System.Drawing.Point(3, 104);
+			this.label7.Name = "label7";
+			this.label7.Size = new System.Drawing.Size(285, 12);
+			this.label7.TabIndex = 3;
+			this.label7.Text = "Order at:";
+			this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+			// 
+			// linkOrder
+			// 
+			this.linkOrder.Location = new System.Drawing.Point(6, 116);
+			this.linkOrder.Name = "linkOrder";
+			this.linkOrder.Size = new System.Drawing.Size(280, 15);
+			this.linkOrder.TabIndex = 2;
+			this.linkOrder.TabStop = true;
+			this.linkOrder.Text = "http://www.devcomponents.com/AdvTree/order.html";
+			this.linkOrder.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+			this.linkOrder.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkOrder_LinkClicked);
+			// 
+			// label6
+			// 
+			this.label6.Location = new System.Drawing.Point(9, 72);
+			this.label6.Name = "label6";
+			this.label6.Size = new System.Drawing.Size(276, 31);
+			this.label6.TabIndex = 1;
+			this.label6.Text = "For pricing and licensing information please visit our web site. ";
+			// 
+			// label5
+			// 
+			this.label5.ForeColor = System.Drawing.Color.Maroon;
+			this.label5.Location = new System.Drawing.Point(8, 20);
+			this.label5.Name = "label5";
+			this.label5.Size = new System.Drawing.Size(276, 52);
+			this.label5.TabIndex = 0;
+			this.label5.Text = "This component is not registered and it is provided for evaluation purposes only." +
+				" This message will not appear after you register the component.";
+			// 
+			// label4
+			// 
+			this.label4.AutoSize = true;
+			this.label4.Location = new System.Drawing.Point(10, 216);
+			this.label4.Name = "label4";
+			this.label4.Size = new System.Drawing.Size(31, 16);
+			this.label4.TabIndex = 16;
+			this.label4.Text = "Web:";
+			// 
+			// label3
+			// 
+			this.label3.AutoSize = true;
+			this.label3.Location = new System.Drawing.Point(9, 200);
+			this.label3.Name = "label3";
+			this.label3.Size = new System.Drawing.Size(40, 16);
+			this.label3.TabIndex = 14;
+			this.label3.Text = "E-Mail:";
+			// 
+			// label2
+			// 
+			this.label2.AutoSize = true;
+			this.label2.Location = new System.Drawing.Point(7, 31);
+			this.label2.Name = "label2";
+			this.label2.Size = new System.Drawing.Size(307, 16);
+			this.label2.TabIndex = 11;
+			this.label2.Text = "(c) 2005-2006 by DevComponents.com, All Rights Reserved";
+			// 
+			// label1
+			// 
+			this.label1.AutoSize = true;
+			this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((System.Byte)(0)));
+			this.label1.Location = new System.Drawing.Point(9, 7);
+			this.label1.Name = "label1";
+			this.label1.Size = new System.Drawing.Size(236, 18);
+			this.label1.TabIndex = 9;
+			this.label1.Text = "DevComponents AdvTree Component";
+			// 
+			// linkHome
+			// 
+			this.linkHome.Location = new System.Drawing.Point(50, 215);
+			this.linkHome.Name = "linkHome";
+			this.linkHome.Size = new System.Drawing.Size(145, 16);
+			this.linkHome.TabIndex = 15;
+			this.linkHome.TabStop = true;
+			this.linkHome.Text = "www.devcomponents.com";
+			this.linkHome.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkHome_LinkClicked);
+			// 
+			// linkEmail
+			// 
+			this.linkEmail.Location = new System.Drawing.Point(49, 199);
+			this.linkEmail.Name = "linkEmail";
+			this.linkEmail.Size = new System.Drawing.Size(167, 16);
+			this.linkEmail.TabIndex = 13;
+			this.linkEmail.TabStop = true;
+			this.linkEmail.Text = "support@devcomponents.com";
+			this.linkEmail.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkEmail_LinkClicked);
+			// 
+			// button2
+			// 
+			this.button2.Location = new System.Drawing.Point(232, 240);
+			this.button2.Name = "button2";
+			this.button2.Size = new System.Drawing.Size(72, 24);
+			this.button2.TabIndex = 12;
+			this.button2.Text = "Buy Now";
+			this.button2.Click += new System.EventHandler(this.button2_Click);
+			// 
+			// button1
+			// 
+			this.button1.Enabled = false;
+			this.button1.Location = new System.Drawing.Point(152, 240);
+			this.button1.Name = "button1";
+			this.button1.Size = new System.Drawing.Size(72, 24);
+			this.button1.TabIndex = 10;
+			this.button1.Text = "OK";
+			this.button1.Click += new System.EventHandler(this.button1_Click);
+			// 
+			// timer1
+			// 
+			this.timer1.Enabled = true;
+			this.timer1.Interval = 800;
+			this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
+			// 
+			// ComponentNotLicensed
+			// 
+			this.AutoScaleBaseSize = new System.Drawing.Size(5, 13);
+			this.BackColor = System.Drawing.Color.BlanchedAlmond;
+			this.ClientSize = new System.Drawing.Size(314, 273);
+			this.ControlBox = false;
+			this.Controls.Add(this.groupBox1);
+			this.Controls.Add(this.label4);
+			this.Controls.Add(this.label3);
+			this.Controls.Add(this.label2);
+			this.Controls.Add(this.label1);
+			this.Controls.Add(this.linkHome);
+			this.Controls.Add(this.linkEmail);
+			this.Controls.Add(this.button2);
+			this.Controls.Add(this.button1);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.MaximizeBox = false;
+			this.Name = "ComponentNotLicensed";
+			this.Text = "AdvTree License not found";
+			this.groupBox1.ResumeLayout(false);
+			this.ResumeLayout(false);
+
+		}
+		#endregion
+
+		private void button2_Click(object sender, System.EventArgs e)
+		{
+			System.Diagnostics.Process.Start(linkOrder.Text);
+		}
+
+		private void button1_Click(object sender, System.EventArgs e)
+		{
+			this.Close();
+		}
+
+		private void linkHome_LinkClicked(object sender, System.Windows.Forms.LinkLabelLinkClickedEventArgs e)
+		{
+			System.Diagnostics.Process.Start("http://www.devcomponents.com");
+		}
+
+		private void linkOrder_LinkClicked(object sender, System.Windows.Forms.LinkLabelLinkClickedEventArgs e)
+		{
+			System.Diagnostics.Process.Start(linkOrder.Text);
+		}
+
+		private void linkEmail_LinkClicked(object sender, System.Windows.Forms.LinkLabelLinkClickedEventArgs e)
+		{
+			System.Diagnostics.Process.Start(linkEmail.Text);
+		}
+
+		private void timer1_Tick(object sender, System.EventArgs e)
+		{
+			timer1.Enabled=false;
+			button1.Enabled=true;
+			button1.Focus();
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/AdvTree.Design/ComponentNotLicensed.resx b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/AdvTree.Design/ComponentNotLicensed.resx
new file mode 100644
index 00000000..6f118cb1
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/AdvTree.Design/ComponentNotLicensed.resx	
@@ -0,0 +1,265 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 1.3
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">1.3</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1">this is my long string</data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        [base64 mime encoded serialized .NET Framework object]
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        [base64 mime encoded string representing a byte array form of the .NET Framework object]
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used forserialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>1.3</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="groupBox1.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="groupBox1.GridSize" type="System.Drawing.Size, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>8, 8</value>
+  </data>
+  <data name="groupBox1.SnapToGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+  <data name="groupBox1.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="groupBox1.DrawGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+  <data name="groupBox1.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="label7.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="label7.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="label7.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="linkOrder.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="linkOrder.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="linkOrder.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="label6.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="label6.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="label6.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="label5.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="label5.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="label5.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="label4.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="label4.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="label4.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="label3.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="label3.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="label3.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="label2.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="label2.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="label2.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="label1.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="label1.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="label1.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="linkHome.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="linkHome.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="linkHome.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="linkEmail.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="linkEmail.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="linkEmail.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="button2.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="button2.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="button2.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="button1.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="button1.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="button1.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="timer1.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="timer1.Location" type="System.Drawing.Point, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </data>
+  <data name="timer1.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="$this.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="$this.Language" type="System.Globalization.CultureInfo, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>(Default)</value>
+  </data>
+  <data name="$this.TrayLargeIcon" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="$this.Localizable" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="$this.GridSize" type="System.Drawing.Size, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>8, 8</value>
+  </data>
+  <data name="$this.Name">
+    <value>ComponentNotLicensed</value>
+  </data>
+  <data name="$this.DrawGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="$this.TrayHeight" type="System.Int32, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>80</value>
+  </data>
+  <data name="$this.SnapToGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+  <data name="$this.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/AdvTree.Design/ElementStyleTypeEditor.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/AdvTree.Design/ElementStyleTypeEditor.cs
new file mode 100644
index 00000000..d3dcc64b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/AdvTree.Design/ElementStyleTypeEditor.cs	
@@ -0,0 +1,151 @@
+using System;
+using System.ComponentModel;
+using System.Drawing.Design;
+using System.Windows.Forms.Design;
+using System.Windows.Forms;
+using System.ComponentModel.Design;
+using DevComponents.DotNetBar;
+
+namespace DevComponents.AdvTree.Design
+{
+	/// <summary>
+	/// Represents type editor for ElementStyle used for Windows Forms design-time support.
+	/// </summary>
+	public class ElementStyleTypeEditor:System.Drawing.Design.UITypeEditor 
+	{
+		#region Private Variables
+		private IWindowsFormsEditorService m_EditorService = null;
+		private const string OPTION_CREATE="Create style";
+		private const string OPTION_REMOVE="Delete selected style";
+		private const string OPTION_STYLES="Styles.";
+		#endregion
+
+		#region Internal Implementation
+		public override object EditValue(ITypeDescriptorContext context, IServiceProvider provider, object value) 
+		{
+			if (context != null
+				&& context.Instance != null
+				&& provider != null) 
+			{				
+				ElementStyle es=value as ElementStyle;
+				
+				m_EditorService = provider.GetService(typeof(IWindowsFormsEditorService)) as IWindowsFormsEditorService;
+								
+				if(m_EditorService!=null)
+				{
+					AdvTree tree = null;
+					if(context.Instance is AdvTree)
+						tree=context.Instance as AdvTree;
+					else if(context.Instance is Node)
+						tree=((Node)context.Instance).TreeControl;
+					else if(context.Instance is Cell)
+						tree=((Cell)context.Instance).TreeControl;
+					
+					ListBox lb=new ListBox();
+					
+					if(es==null)
+						lb.Items.Add(OPTION_CREATE);
+					else
+						lb.Items.Add(OPTION_REMOVE);
+					
+					if(tree!=null)
+					{
+						foreach(ElementStyle style in tree.Styles)
+							lb.Items.Add(style);
+					}
+					
+					string[] styles = Enum.GetNames(typeof (ePredefinedElementStyle));
+					foreach(string s in styles)
+						lb.Items.Add(OPTION_STYLES + s);
+
+					lb.SelectedIndexChanged+=new EventHandler(this.SelectedChanged);
+					m_EditorService.DropDownControl(lb);
+					
+					IDesignerHost dh=(IDesignerHost)provider.GetService(typeof(IDesignerHost));
+					if(lb.SelectedItem!=null && dh!=null)
+					{
+						if(lb.SelectedItem is ElementStyle)
+						{
+							value=lb.SelectedItem as ElementStyle;
+						}
+						else if(lb.SelectedItem!=null && lb.SelectedItem.ToString().StartsWith(OPTION_STYLES))
+						{
+							string styleName = lb.SelectedItem.ToString().Substring(OPTION_STYLES.Length);
+							Type t = typeof (NodeStyles);
+							ElementStyle predefinedStyle=t.GetProperty(styleName).GetValue(null, null) as ElementStyle;
+							ElementStyle newStyle=dh.CreateComponent(typeof(ElementStyle)) as ElementStyle;
+							newStyle.ApplyStyle(predefinedStyle);
+							newStyle.Description = styleName;
+							value = newStyle;
+							if(tree!=null)
+							{
+								IComponentChangeService cc = provider.GetService(typeof (IComponentChangeService)) as IComponentChangeService;
+								if(cc!=null)
+									cc.OnComponentChanging(tree, TypeDescriptor.GetProperties(tree)["Style"]);
+								tree.Styles.Add(value as ElementStyle);
+								if(cc!=null)
+									cc.OnComponentChanged(tree, TypeDescriptor.GetProperties(tree)["Style"],null,null);
+							}
+						}
+						else if(lb.SelectedItem!=null && lb.SelectedItem.ToString()==OPTION_CREATE)
+						{
+							value=dh.CreateComponent(typeof(ElementStyle)) as ElementStyle;
+							if(tree!=null)
+							{
+								IComponentChangeService cc = provider.GetService(typeof (IComponentChangeService)) as IComponentChangeService;
+								if(cc!=null)
+									cc.OnComponentChanging(tree, TypeDescriptor.GetProperties(tree)["Style"]);
+								tree.Styles.Add(value as ElementStyle);
+								if(cc!=null)
+									cc.OnComponentChanged(tree, TypeDescriptor.GetProperties(tree)["Style"],null,null);
+							}
+						}
+						else if(lb.SelectedItem!=null && lb.SelectedItem.ToString()==OPTION_REMOVE)
+						{
+							if(tree!=null)
+							{
+								IComponentChangeService cc = provider.GetService(typeof (IComponentChangeService)) as IComponentChangeService;
+								if(cc!=null)
+									cc.OnComponentChanging(tree, TypeDescriptor.GetProperties(tree)["Style"]);
+								if(tree!=null)
+									tree.Styles.Remove(value as ElementStyle);
+								if(cc!=null)
+									cc.OnComponentChanged(tree, TypeDescriptor.GetProperties(tree)["Style"],null,null);
+								if(tree.Styles.Count>0)
+									value = tree.Styles[0];
+								else
+									value=null;
+							}
+							else
+								value=null;
+							dh.DestroyComponent(es);
+						}
+					}
+				}
+			}
+
+			return value;
+		}
+
+		private void SelectedChanged(object sender, EventArgs e)
+		{
+			if(m_EditorService!=null)
+				m_EditorService.CloseDropDown();
+		}
+
+		/// <summary>
+		/// Gets the editor style used by the EditValue method.
+		/// </summary>
+		/// <param name="context">An ITypeDescriptorContext that can be used to gain additional context information.</param>
+		/// <returns>A UITypeEditorEditStyle value that indicates the style of editor used by EditValue. If the UITypeEditor does not support this method, then GetEditStyle will return None</returns>
+		public override UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext context) 
+		{
+			if (context != null && context.Instance != null) 
+			{
+				return UITypeEditorEditStyle.DropDown;
+			}
+			return base.GetEditStyle(context);
+		}
+		#endregion
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/AdvTree.Design/HostedItemTypeEditor.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/AdvTree.Design/HostedItemTypeEditor.cs
new file mode 100644
index 00000000..b4d74810
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/AdvTree.Design/HostedItemTypeEditor.cs	
@@ -0,0 +1,124 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows.Forms.Design;
+using DevComponents.DotNetBar;
+using System.Windows.Forms;
+using System.Collections;
+using System.ComponentModel.Design;
+using System.ComponentModel;
+using System.Drawing.Design;
+
+namespace DevComponents.AdvTree.Design
+{
+    public class HostedItemTypeEditor : System.Drawing.Design.UITypeEditor
+    {
+        #region Private Variables
+        private IWindowsFormsEditorService m_EditorService = null;
+        private const string OPTION_REMOVE = "Delete Item";
+        private Dictionary<string, Type> _Items = new Dictionary<string, Type>();
+        #endregion
+
+        #region Internal Implementation
+        /// <summary>
+        /// Initializes a new instance of the HostedItemTypeEditor class.
+        /// </summary>
+        public HostedItemTypeEditor() : base()
+        {
+            _Items.Add("Button", typeof(ButtonItem));
+            _Items.Add("Check-box", typeof(CheckBoxItem));
+            _Items.Add("Micro-Chart", typeof(MicroChartItem));
+            _Items.Add("Switch", typeof(SwitchButtonItem));
+            _Items.Add("Slider", typeof(SliderItem));
+            _Items.Add("Rating", typeof(RatingItem));
+            _Items.Add("Progress bar", typeof(ProgressBarItem));
+            _Items.Add("Container", typeof(ItemContainer));
+        }
+        public override object EditValue(ITypeDescriptorContext context, IServiceProvider provider, object value)
+        {
+            if (context != null
+                && context.Instance != null
+                && provider != null)
+            {
+                m_EditorService = provider.GetService(typeof(IWindowsFormsEditorService)) as IWindowsFormsEditorService;
+
+                if (m_EditorService != null)
+                {
+                    Cell currentCell = null;
+                    if (context.Instance is Node)
+                        currentCell = ((Node)context.Instance).Cells[0];
+                    else if (context.Instance is Cell)
+                        currentCell = (Cell)context.Instance;
+                    if (currentCell == null)
+                    {
+                        MessageBox.Show(string.Format("Invalid context.Instance. Instance: {0}", context.Instance));
+                        return value;
+                    }
+
+                    ListBox lb = new ListBox();
+
+                    if (currentCell.HostedItem != null)
+                    {
+                        lb.Items.Add(OPTION_REMOVE);
+                        lb.Items.Add("------------------");
+                    }
+                    foreach (KeyValuePair<string, Type> item in _Items)
+                    {
+                        lb.Items.Add(item.Key);
+                    }
+                    
+
+                    lb.SelectedIndexChanged += new EventHandler(this.SelectedChanged);
+                    m_EditorService.DropDownControl(lb);
+
+                    IDesignerHost dh = (IDesignerHost)provider.GetService(typeof(IDesignerHost));
+                    if (lb.SelectedItem != null && dh != null)
+                    {
+                        if (lb.SelectedItem == OPTION_REMOVE)
+                        {
+                            BaseItem item = currentCell.HostedItem;
+                            dh.DestroyComponent(item);
+                            value = null;
+                        }
+                        else if (_Items.ContainsKey(lb.SelectedItem.ToString()))
+                        {
+                            if (currentCell.HostedItem != null)
+                            {
+                                BaseItem item = currentCell.HostedItem;
+                                dh.DestroyComponent(item);
+                            }
+
+                            BaseItem newItem = dh.CreateComponent(_Items[(string)lb.SelectedItem]) as BaseItem;
+                            if (!string.IsNullOrEmpty(newItem.Name) && string.IsNullOrEmpty(newItem.Text))
+                                TypeDescriptor.GetProperties(newItem)["Text"].SetValue(newItem, newItem.Name);
+                            value = newItem;
+                        }
+                    }
+                }
+            }
+
+            return value;
+        }
+
+        private void SelectedChanged(object sender, EventArgs e)
+        {
+            if (m_EditorService != null)
+                m_EditorService.CloseDropDown();
+        }
+
+        /// <summary>
+        /// Gets the editor style used by the EditValue method.
+        /// </summary>
+        /// <param name="context">An ITypeDescriptorContext that can be used to gain additional context information.</param>
+        /// <returns>A UITypeEditorEditStyle value that indicates the style of editor used by EditValue. If the UITypeEditor does not support this method, then GetEditStyle will return None</returns>
+        public override UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext context)
+        {
+            if (context != null && context.Instance != null)
+            {
+                return UITypeEditorEditStyle.DropDown;
+            }
+            return base.GetEditStyle(context);
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/AdvTree.Design/ImageIndexEditor.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/AdvTree.Design/ImageIndexEditor.cs
new file mode 100644
index 00000000..9e157ec8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/AdvTree.Design/ImageIndexEditor.cs	
@@ -0,0 +1,75 @@
+using System;
+using System.ComponentModel.Design;
+using System.Drawing.Design;
+using System.ComponentModel;
+using System.Windows.Forms.ComponentModel;
+using System.Windows.Forms.Design;
+
+namespace DevComponents.AdvTree.Design
+{
+	/// <summary>
+	/// Represents the class used by windows forms editor for picking an image from image list.
+	/// </summary>
+	public class ImageIndexEditor:UITypeEditor
+	{
+		private ImageEditor m_ImageEditor;
+		private System.Windows.Forms.ImageList m_ImageList=null;
+		public ImageIndexEditor():base()
+		{
+			m_ImageEditor=System.ComponentModel.TypeDescriptor.GetEditor(typeof(System.Drawing.Image),typeof(UITypeEditor)) as ImageEditor;
+		}
+		
+		public override bool GetPaintValueSupported(ITypeDescriptorContext context)
+		{
+			return true;
+		}
+
+		public override void PaintValue(PaintValueEventArgs e)
+		{
+			try
+			{
+				if(e==null || e.Value==null)
+					return;
+				int iIndex=(int)e.Value;
+				System.Drawing.Image img=this.GetImage(e.Context,iIndex);
+				if(img==null)
+					return;
+				PaintValueEventArgs pi=new PaintValueEventArgs(e.Context,img,e.Graphics,e.Bounds);
+				m_ImageEditor.PaintValue(pi);
+				//m_ImageEditor.PaintValue(img,e.Graphics,e.Bounds);
+			}
+			catch{}
+		}
+
+		private System.Drawing.Image GetImage(System.ComponentModel.ITypeDescriptorContext context,int index)
+		{
+			if(m_ImageList!=null && index>=0 && index<=m_ImageList.Images.Count)
+			{
+				return m_ImageList.Images[index];
+			}
+			if(context==null)
+				return null;
+
+			object o=context.Instance;
+			if(o==null)
+				return null;
+			System.ComponentModel.PropertyDescriptorCollection pd=System.ComponentModel.TypeDescriptor.GetProperties(o);
+			if(pd==null)
+				return null;
+
+			foreach(System.ComponentModel.PropertyDescriptor prop in pd)
+			{
+				if(prop.PropertyType==typeof(System.Windows.Forms.ImageList))
+				{
+					m_ImageList=prop.GetValue(o) as System.Windows.Forms.ImageList;
+					if(m_ImageList!=null && index>=0 && index<=m_ImageList.Images.Count)
+					{
+						return m_ImageList.Images[index];
+					}
+					break;
+				}
+			}
+			return null;
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/AdvTree.Design/NodeCollectionEditor.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/AdvTree.Design/NodeCollectionEditor.cs
new file mode 100644
index 00000000..70c07e77
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/AdvTree.Design/NodeCollectionEditor.cs	
@@ -0,0 +1,37 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace DevComponents.AdvTree.Design
+{
+    #region NodeCollectionEditor
+    /// <summary>
+    /// Support for Node tabs design-time editor.
+    /// </summary>
+    public class NodeCollectionEditor : System.ComponentModel.Design.CollectionEditor
+    {
+        public NodeCollectionEditor(Type type)
+            : base(type)
+        {
+        }
+        protected override Type CreateCollectionItemType()
+        {
+            return typeof(Node);
+        }
+        protected override Type[] CreateNewItemTypes()
+        {
+            return new Type[] { typeof(Node) };
+        }
+        protected override object CreateInstance(Type itemType)
+        {
+            object item = base.CreateInstance(itemType);
+            if (item is Node)
+            {
+                Node node = item as Node;
+                node.Text = node.Name;
+            }
+            return item;
+        }
+    }
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/AdvTree.Design/NodeConnectorTypeEditor.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/AdvTree.Design/NodeConnectorTypeEditor.cs
new file mode 100644
index 00000000..eb355deb
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/AdvTree.Design/NodeConnectorTypeEditor.cs	
@@ -0,0 +1,86 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Windows.Forms.Design;
+using System.Windows.Forms;
+using System.ComponentModel.Design;
+
+namespace DevComponents.AdvTree.Design
+{
+	/// <summary>
+	/// Represents type editor for NodeConnector used for Windows Forms design-time support.
+	/// </summary>
+	public class NodeConnectorTypeEditor:System.Drawing.Design.UITypeEditor
+	{
+		#region Private Variables
+		private IWindowsFormsEditorService m_EditorService = null;
+		private const string OPTION_CREATE="Create new connector";
+		private const string OPTION_REMOVE="Remove connector";
+		#endregion
+
+		#region Internal Implementation
+		public override object EditValue(ITypeDescriptorContext context, IServiceProvider provider, object value) 
+		{
+			if (context != null
+				&& context.Instance != null
+				&& provider != null) 
+			{				
+				NodeConnector conn=value as NodeConnector;
+				
+				m_EditorService = provider.GetService(typeof(IWindowsFormsEditorService)) as IWindowsFormsEditorService;
+								
+				if(m_EditorService!=null)
+				{
+					ListBox lb=new ListBox();
+					lb.SelectedIndexChanged+=new EventHandler(this.SelectedChanged);
+					if(conn==null)
+						lb.Items.Add(OPTION_CREATE);
+					else
+						lb.Items.Add(OPTION_REMOVE);
+
+					m_EditorService.DropDownControl(lb);
+					
+					IDesignerHost dh=(IDesignerHost)provider.GetService(typeof(IDesignerHost));
+					if(lb.SelectedItem!=null && dh!=null)
+					{
+						if(lb.SelectedItem.ToString()==OPTION_CREATE)
+						{
+							NodeConnector nd=dh.CreateComponent(typeof(NodeConnector)) as NodeConnector;
+							nd.LineWidth = 1;
+							value = nd;
+						}
+						else if(lb.SelectedItem.ToString()==OPTION_REMOVE)
+						{
+							value=null;
+							dh.DestroyComponent(conn);
+						}
+					}
+				}
+			}
+
+			return value;
+		}
+
+		private void SelectedChanged(object sender, EventArgs e)
+		{
+			if(m_EditorService!=null)
+				m_EditorService.CloseDropDown();
+		}
+
+		/// <summary>
+		/// Gets the editor style used by the EditValue method.
+		/// </summary>
+		/// <param name="context">An ITypeDescriptorContext that can be used to gain additional context information.</param>
+		/// <returns>A UITypeEditorEditStyle value that indicates the style of editor used by EditValue. If the UITypeEditor does not support this method, then GetEditStyle will return None</returns>
+		public override UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext context) 
+		{
+			if (context != null && context.Instance != null) 
+			{
+				return UITypeEditorEditStyle.DropDown;
+			}
+			return base.GetEditStyle(context);
+		}
+		#endregion
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/AdvTree.Design/NodeContextMenuTypeEditor.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/AdvTree.Design/NodeContextMenuTypeEditor.cs
new file mode 100644
index 00000000..3575016f
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/AdvTree.Design/NodeContextMenuTypeEditor.cs	
@@ -0,0 +1,97 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Windows.Forms.Design;
+using System.Windows.Forms;
+using System.ComponentModel.Design;
+using System.Collections;
+using DevComponents.DotNetBar;
+
+namespace DevComponents.AdvTree.Design
+{
+	/// <summary>
+	/// Represents context menu type editor for Node.ContextMenu property.
+	/// </summary>
+	public class NodeContextMenuTypeEditor:System.Drawing.Design.UITypeEditor
+	{
+		#region Private Variables
+		private IWindowsFormsEditorService m_EditorService = null;
+		public static string DotNetBarPrefix="DotNetBar.";
+		#endregion
+		
+		#region Internal Implementation
+		public override object EditValue(ITypeDescriptorContext context, IServiceProvider provider, object value) 
+		{
+			if (context != null
+				&& context.Instance != null
+				&& provider != null) 
+			{								
+				m_EditorService = provider.GetService(typeof(IWindowsFormsEditorService)) as IWindowsFormsEditorService;
+								
+				if(m_EditorService!=null)
+				{
+					ListBox lb=new ListBox();
+                    DevComponents.DotNetBar.ContextMenuBar contextMenuBar = null;
+					lb.SelectedIndexChanged+=new EventHandler(this.SelectedChanged);
+					
+					IDesignerHost host = (IDesignerHost)provider.GetService(typeof(IDesignerHost));
+					foreach(IComponent component in host.Container.Components)
+					{
+						if(component is ContextMenu || component.GetType().FullName=="System.Windows.Forms.ContextMenuStrip")
+						{
+							lb.Items.Add(component);
+						}
+						if (component is DevComponents.DotNetBar.ContextMenuBar)
+                        {
+                            contextMenuBar = component as DevComponents.DotNetBar.ContextMenuBar;
+                            foreach (BaseItem item in contextMenuBar.Items)
+                            {
+                                lb.Items.Add(DotNetBarPrefix + item.Name);
+                            }
+                        }
+					}
+
+					m_EditorService.DropDownControl(lb);
+					
+					if(lb.SelectedItem!=null)
+					{
+						if(lb.SelectedItem.ToString().StartsWith(DotNetBarPrefix))
+						{
+							Node node=context.Instance as Node;
+                            if (node != null && node.TreeControl != null)
+                            {
+                                TypeDescriptor.GetProperties(node.TreeControl)["ContextMenuBar"].SetValue(node.TreeControl, contextMenuBar);
+                            }
+                            return contextMenuBar.Items[lb.SelectedItem.ToString().Substring(DotNetBarPrefix.Length)];
+						}
+						return lb.SelectedItem;
+					}
+				}
+			}
+
+			return value;
+		}
+
+		private void SelectedChanged(object sender, EventArgs e)
+		{
+			if(m_EditorService!=null)
+				m_EditorService.CloseDropDown();
+		}
+
+		/// <summary>
+		/// Gets the editor style used by the EditValue method.
+		/// </summary>
+		/// <param name="context">An ITypeDescriptorContext that can be used to gain additional context information.</param>
+		/// <returns>A UITypeEditorEditStyle value that indicates the style of editor used by EditValue. If the UITypeEditor does not support this method, then GetEditStyle will return None</returns>
+		public override UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext context) 
+		{
+			if (context != null && context.Instance != null) 
+			{
+				return UITypeEditorEditStyle.DropDown;
+			}
+			return base.GetEditStyle(context);
+		}
+		#endregion
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/AdvTree.Design/NodeDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/AdvTree.Design/NodeDesigner.cs
new file mode 100644
index 00000000..52f2fb3c
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/AdvTree.Design/NodeDesigner.cs	
@@ -0,0 +1,207 @@
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.ComponentModel.Design;
+using System.Windows.Forms;
+using System.Windows.Forms.Design;
+
+namespace DevComponents.AdvTree.Design
+{
+	/// <summary>
+	/// Represents Windows Forms designer for Node object.
+	/// </summary>
+	public class NodeDesigner:ComponentDesigner
+	{
+		/// <summary>
+		/// Initializes designer with given component.
+		/// </summary>
+		/// <param name="component">Component to initialize designer with.</param>
+		public override void Initialize(IComponent component) 
+		{
+			base.Initialize(component);
+			if(!component.Site.DesignMode)
+				return;
+
+			ISelectionService ss =(ISelectionService)GetService(typeof(ISelectionService));
+			if(ss!=null)
+				ss.SelectionChanged+=new EventHandler(OnSelectionChanged);
+			
+			Node n=component as Node;
+			if(n!=null)
+				this.Visible=n.Visible;
+		}
+		private void OnSelectionChanged(object sender, EventArgs e) 
+		{
+			ISelectionService ss = (ISelectionService)sender;
+            if (this.Component != null && ss.PrimarySelection != this.Component)
+            {
+                Node node = this.Component as Node;
+                if (ss.PrimarySelection is Node)
+                {
+                    Node selected = ss.PrimarySelection as Node;
+
+                    if (selected.TreeControl != node.TreeControl)
+                    {
+                        node.TreeControl.SelectedNode = null;
+                    }
+                }
+                else if (node != null && node.TreeControl != null)
+                    node.TreeControl.SelectedNode = null;
+            }
+		}
+
+		protected override void PreFilterProperties(System.Collections.IDictionary properties)
+		{
+			base.PreFilterProperties(properties);
+			properties["Visible"] = TypeDescriptor.CreateProperty(typeof(NodeDesigner),(PropertyDescriptor)properties["Visible"], new Attribute[]
+				{
+					new DefaultValueAttribute(true),
+					new BrowsableAttribute(true),
+					new CategoryAttribute("Layout")});
+//			properties["HostedControl"] = TypeDescriptor.CreateProperty(typeof(NodeDesigner),(PropertyDescriptor)properties["HostedControl"], new Attribute[]
+//				{
+//					new DefaultValueAttribute(null),
+//					new BrowsableAttribute(true),
+//					new CategoryAttribute("Behavior"),
+//					new DescriptionAttribute("Indicates control hosted inside of the cell.")});
+
+		}
+		
+		/// <summary>
+		/// Gets or sets whether item is visible.
+		/// </summary>
+		[DefaultValue(true),Browsable(true),Category("Layout"),Description("Gets or sets whether node is visible.")]
+		public bool Visible 
+		{
+			get 
+			{
+				return (bool)ShadowProperties["Visible"];
+			}
+			set 
+			{
+				// this value is not passed to the actual control
+				this.ShadowProperties["Visible"] = value;
+			}
+		}
+		
+//		/// <summary>
+//		/// Gets or sets whether item is visible.
+//		/// </summary>
+//		[DefaultValue(null),Browsable(true),Category("Behavior"),Description("Indicates control hosted inside of the cell.")]
+//		public Control HostedControl 
+//		{
+//			get 
+//			{
+//				Node node = this.Component as Node;
+//				return node.HostedControl;
+//			}
+//			set 
+//			{
+//				Node node = this.Component as Node;
+//				node.HostedControl = value;
+//				if(value!=null)
+//				{
+//					IDesignerHost dh = this.GetService(typeof (IDesignerHost)) as IDesignerHost;
+//					if(dh!=null)
+//					{
+//						AdvTreeDesigner ds = dh.GetDesigner(node.TreeControl) as AdvTreeDesigner;
+//						if(ds!=null)
+//							ds.HookControl(value);
+//					}
+//				}
+//			}
+//		}
+		
+		/// <summary>Returns design-time commands applicable to this designer.</summary>
+		public override DesignerVerbCollection Verbs 
+		{
+			get 
+			{
+				DesignerVerb[] verbs = new DesignerVerb[]
+					{
+						new DesignerVerb("Create Child Node", new EventHandler(CreateNode)),
+                        new DesignerVerb("Edit Cells...", new EventHandler(EditCells)),
+                        new DesignerVerb("Edit Columns...", new EventHandler(EditColumns))
+				};
+				return new DesignerVerbCollection(verbs);
+			}
+		}
+
+        private void EditCells(object sender, EventArgs e)
+        {
+            AdvTreeDesigner.EditValue(this, this.Component, "Cells");
+        }
+
+        private void EditColumns(object sender, EventArgs e)
+        {
+            AdvTreeDesigner.EditValue(this, this.Component, "NodesColumns");
+        }
+
+		private void CreateNode(object sender, EventArgs e)
+		{
+			Node node=CreateNode(this.Component as Node);
+			if(node!=null)
+			{
+				ISelectionService sel = this.GetService(typeof (ISelectionService)) as ISelectionService;
+				ArrayList list=new ArrayList(1);
+				list.Add(node);
+				if(sel!=null)
+				{
+					sel.SetSelectedComponents(list, SelectionTypes.MouseDown);
+					node.TreeControl.SelectedNode = node;
+				}
+			}
+		}
+		
+		private Node CreateNode(Node parentNode)
+		{
+			IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+			if(dh==null)
+				return null;
+            
+			Node node=null;
+			AdvTree tree=((Node)this.Component).TreeControl;
+			tree.BeginUpdate();
+			try
+			{
+				IComponentChangeService change=this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+				if(change!=null)
+				{
+					if(parentNode!=null)
+						change.OnComponentChanging(this.Component,TypeDescriptor.GetProperties(parentNode).Find("Nodes",true));
+					else
+						change.OnComponentChanging(this.Component,TypeDescriptor.GetProperties(tree).Find("Nodes",true));
+				}
+
+				node=dh.CreateComponent(typeof(Node)) as Node;
+				if(node!=null)
+				{
+					node.Text=node.Name;
+					node.Expanded = true;
+					if(parentNode==null)
+						tree.Nodes.Add(node);
+					else
+					{
+						parentNode.Nodes.Add(node);
+						parentNode.Expand();
+						TypeDescriptor.GetProperties(node)["Style"].SetValue(node,parentNode.Style);
+					}
+					
+					if(change!=null)
+					{
+						if(parentNode!=null)
+							change.OnComponentChanged(this.Component,TypeDescriptor.GetProperties(parentNode).Find("Nodes",true),null,null);
+						else
+							change.OnComponentChanged(this.Component,TypeDescriptor.GetProperties(tree).Find("Nodes",true),null,null);
+					}
+				}
+			}
+			finally
+			{
+				tree.EndUpdate();
+			}
+
+			return node;
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ApplicationButtonDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ApplicationButtonDesigner.cs
new file mode 100644
index 00000000..eff2f2c7
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ApplicationButtonDesigner.cs	
@@ -0,0 +1,253 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel.Design;
+using System.ComponentModel;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Design
+{
+    public class ApplicationButtonDesigner : BaseItemDesigner
+    {
+        #region Internal Implementation
+        protected override DesignerVerb[] GetVerbs()
+        {
+            DesignerVerb[] baseVerbs = base.GetVerbs();
+            int verbsCount = baseVerbs.Length + 1;
+            if (IsBackstageSet) verbsCount = 1;
+
+            bool includeClearSubItems = false;
+            ApplicationButton appButton = this.Component as ApplicationButton;
+            if (appButton != null && appButton.BackstageTab != null && appButton.SubItems.Count > 0)
+            {
+                includeClearSubItems = true;
+                verbsCount++;
+            }
+
+            int verbsOffset = 1;
+            DesignerVerb[] verbs = new DesignerVerb[verbsCount];
+            verbs[0] = new DesignerVerb((IsBackstageSet ? "Remove Backstage" : "Set Backstage"), new EventHandler(CreateBackstageTab));
+
+            if (includeClearSubItems)
+            {
+                verbs[1] = new DesignerVerb("Clear Sub-items", new EventHandler(ClearSubItems));
+                verbsOffset++;
+            }
+
+            if (!IsBackstageSet)
+            {
+                for (int i = 0; i < baseVerbs.Length; i++)
+                {
+                    verbs[i + verbsOffset] = baseVerbs[i];
+                }
+            }
+
+            return verbs;
+        }
+
+        private void ClearSubItems(object sender, EventArgs e)
+        {
+            if (MessageBox.Show("Are you sure you want to delete all sub-items?", "DotNetBar Application Button", MessageBoxButtons.YesNo) == DialogResult.No) return;
+
+            IDesignerHost dh = GetService(typeof(IDesignerHost)) as IDesignerHost;
+            IComponentChangeService cc = GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+            if (dh == null) return;
+            ApplicationButton appButton = (ApplicationButton)this.Component;
+            if (appButton.SubItems.Count == 0) return;
+
+            DesignerTransaction trans = dh.CreateTransaction("Clearing Application Button SubItems");
+            try
+            {
+                cc.OnComponentChanging(appButton, TypeDescriptor.GetProperties(appButton)["SubItems"]);
+                BaseItem[] items = new BaseItem[appButton.SubItems.Count];
+                appButton.SubItems.CopyTo(items, 0);
+                foreach (BaseItem item in items)
+                {
+                    appButton.SubItems.Remove(item);
+                    dh.DestroyComponent(item);
+                }
+                cc.OnComponentChanged(appButton, TypeDescriptor.GetProperties(appButton)["SubItems"], null, null);
+            }
+            catch
+            {
+                trans.Cancel();
+                throw;
+            }
+            finally
+            {
+                if (!trans.Canceled)
+                    trans.Commit();
+            }
+        }
+
+        private bool IsBackstageSet
+        {
+            get
+            {
+                ApplicationButton appButton = (ApplicationButton)this.Component;
+                if (appButton != null && appButton.BackstageTab != null) return true;
+                return false;
+            }
+        }
+
+        private void CreateBackstageTab()
+        {
+            IDesignerHost dh = GetService(typeof(IDesignerHost)) as IDesignerHost;
+            IComponentChangeService cc = GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+            if (dh == null) return;
+
+            ApplicationButton appButton = (ApplicationButton)this.Component;
+            if (appButton.BackstageTab != null)
+            {
+                DesignerTransaction trans1 = dh.CreateTransaction("Removing Backstage tab");
+                try
+                {
+                    SuperTabControl backstageTab = appButton.BackstageTab;
+                    SetProperty(appButton, "BackstageTab", null);
+                    backstageTab.Visible = true;
+                    SetProperty(backstageTab, "Location", new System.Drawing.Point(0, 150));
+                    SetProperty(backstageTab, "Size", new System.Drawing.Size(250, 350));
+                    ISelectionService selection = (ISelectionService)GetService(typeof(ISelectionService));
+                    if (selection != null) selection.SetSelectedComponents(new Control[] { backstageTab }, SelectionTypes.Primary);
+                }
+                catch
+                {
+                    trans1.Cancel();
+                    throw;
+                }
+                finally
+                {
+                    if (!trans1.Canceled)
+                        trans1.Commit();
+                }
+                return;
+            }
+
+            DesignerTransaction trans = dh.CreateTransaction("Create Backstage");
+            try
+            {
+
+                if (appButton.Expanded) appButton.Expanded = false;
+                SuperTabControl backstageTab = (SuperTabControl)dh.CreateComponent(typeof(SuperTabControl));
+                SetProperty(appButton, "BackstageTab", backstageTab);
+
+                Control root = dh.RootComponent as Control;
+                if (root != null)
+                {
+                    cc.OnComponentChanging(root, TypeDescriptor.GetProperties(root)["Controls"]);
+                    root.Controls.Add(backstageTab);
+                    cc.OnComponentChanged(root, TypeDescriptor.GetProperties(root)["Controls"], null, null);
+                }
+                SetupBackstageTab(backstageTab, dh);
+            }
+            catch
+            {
+                trans.Cancel();
+                throw;
+            }
+            finally
+            {
+                if (!trans.Canceled)
+                    trans.Commit();
+            }
+        }
+        private void CreateBackstageTab(object sender, EventArgs e)
+        {
+            CreateBackstageTab();
+        }
+
+        private void SetupBackstageTab(SuperTabControl backstageTab, IDesignerHost dh)
+        {
+            backstageTab.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+                        | System.Windows.Forms.AnchorStyles.Left)
+                        | System.Windows.Forms.AnchorStyles.Right)));
+            backstageTab.ControlBox.Visible = false;
+            backstageTab.ItemPadding.Left = 6;
+            backstageTab.ItemPadding.Right = 4;
+            backstageTab.ItemPadding.Top = 4;
+            backstageTab.ReorderTabsEnabled = false;
+            try
+            {
+                backstageTab.SelectedTabFont = new System.Drawing.Font("Segoe UI", 9.75F);
+            }
+            catch { }
+            backstageTab.SelectedTabIndex = 0;
+            backstageTab.Size = new System.Drawing.Size(614, 315);
+            backstageTab.TabAlignment = DevComponents.DotNetBar.eTabStripAlignment.Left;
+            try
+            {
+                backstageTab.TabFont = new System.Drawing.Font("Segoe UI", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            }
+            catch { }
+            backstageTab.TabHorizontalSpacing = 16;
+            backstageTab.TabStyle = DevComponents.DotNetBar.eSuperTabStyle.Office2010BackstageBlue;
+            backstageTab.TabVerticalSpacing = 8;
+
+            SuperTabControlDesigner tabDesigner = dh.GetDesigner(backstageTab) as SuperTabControlDesigner;
+            if (tabDesigner != null)
+            {
+                ButtonItem button;
+                // Save button
+                button = tabDesigner.CreateButton();
+                SetProperty(button, "Text", "Save");
+                SetProperty(button, "KeyTips", "S");
+                SetProperty(button, "Image", RibbonControlDesigner.LoadImage("Save16.png"));
+
+                // Open
+                button = tabDesigner.CreateButton();
+                SetProperty(button, "Text", "Open");
+                SetProperty(button, "KeyTips", "O");
+                SetProperty(button, "Image", RibbonControlDesigner.LoadImage("Open.png"));
+
+                // Close
+                button = tabDesigner.CreateButton();
+                SetProperty(button, "Text", "Close");
+                SetProperty(button, "KeyTips", "C");
+                SetProperty(button, "Image", RibbonControlDesigner.LoadImage("Close16.png"));
+
+                SuperTabItem tab;
+                tab = tabDesigner.CreateNewTab();
+                SetProperty(tab, "Text", "Recent");
+                SetProperty(tab, "KeyTips", "R");
+                SetProperty((SuperTabControlPanel)tab.AttachedControl, "BackgroundImage", RibbonControlDesigner.LoadImage("BlueBackstageBgImage.png"));
+                SetProperty((SuperTabControlPanel)tab.AttachedControl, "BackgroundImagePosition", DevComponents.DotNetBar.eStyleBackgroundImage.BottomRight);
+
+                tab = tabDesigner.CreateNewTab();
+                SetProperty(tab, "Text", "New");
+                SetProperty(tab, "KeyTips", "N");
+                SetProperty((SuperTabControlPanel)tab.AttachedControl, "BackgroundImage", RibbonControlDesigner.LoadImage("BlueBackstageBgImage.png"));
+                SetProperty((SuperTabControlPanel)tab.AttachedControl, "BackgroundImagePosition", DevComponents.DotNetBar.eStyleBackgroundImage.BottomRight);
+
+                tab = tabDesigner.CreateNewTab();
+                SetProperty(tab, "Text", "Print");
+                SetProperty(tab, "KeyTips", "P");
+                SetProperty((SuperTabControlPanel)tab.AttachedControl, "BackgroundImage", RibbonControlDesigner.LoadImage("BlueBackstageBgImage.png"));
+                SetProperty((SuperTabControlPanel)tab.AttachedControl, "BackgroundImagePosition", DevComponents.DotNetBar.eStyleBackgroundImage.BottomRight);
+
+                tab = tabDesigner.CreateNewTab();
+                SetProperty(tab, "Text", "Help");
+                SetProperty(tab, "KeyTips", "H");
+                SetProperty((SuperTabControlPanel)tab.AttachedControl, "BackgroundImage", RibbonControlDesigner.LoadImage("BlueBackstageBgImage.png"));
+                SetProperty((SuperTabControlPanel)tab.AttachedControl, "BackgroundImagePosition", DevComponents.DotNetBar.eStyleBackgroundImage.BottomRight);
+
+                // Options
+                button = tabDesigner.CreateButton();
+                SetProperty(button, "Text", "Options");
+                SetProperty(button, "KeyTips", "T");
+                SetProperty(button, "Image", RibbonControlDesigner.LoadImage("Options2.png"));
+
+                // Exit
+                button = tabDesigner.CreateButton();
+                SetProperty(button, "Text", "Exit");
+                SetProperty(button, "KeyTips", "X");
+                SetProperty(button, "Image", RibbonControlDesigner.LoadImage("Exit2.png"));
+            }
+        }
+
+        private void SetProperty(object targetObject, string propertyName, object propertyValue)
+        {
+            TypeDescriptor.GetProperties(targetObject)[propertyName].SetValue(targetObject, propertyValue);
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/BarBaseControlDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/BarBaseControlDesigner.cs
new file mode 100644
index 00000000..74213c98
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/BarBaseControlDesigner.cs	
@@ -0,0 +1,2462 @@
+using System;
+using System.Windows.Forms;
+using System.Windows.Forms.Design;
+using System.Collections;
+using System.Drawing;
+using System.ComponentModel.Design;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar.Design
+{
+	/// <summary>
+	/// Summary description for BarBaseControlDesigner.
+	/// </summary>
+    public class BarBaseControlDesigner : System.Windows.Forms.Design.ParentControlDesigner, IDesignerServices, IBarItemDesigner
+	{
+		#region Private Variables
+		const string TEMP_NAME="tempDragDropItem";
+        public const string CreatingItemTransactionDescription = "Creating item";
+		private bool m_EnableItemDragDrop=false;
+		private bool m_AcceptExternalControls=true;
+		private Point m_MouseDownPoint=Point.Empty;
+		private BaseItem m_DragItem=null;
+		private bool m_DragInProgress=false;
+		private IDesignTimeProvider m_DesignTimeProvider=null;
+		private int m_InsertPosition;
+		private bool m_InsertBefore;
+		private bool m_Capture=false;
+		private System.Windows.Forms.Control m_DesignerHost=null;
+		private Timer m_TimerAdded=null;
+		private Timer m_TimerDragDrop=null;
+		private bool m_NewControlAdded=false;
+		private bool m_SuspendInternalCursor=false;
+		private bool m_DragLeave=false;
+		private bool m_ControlRemoved=false;
+		private DateTime m_JustAdded=DateTime.MinValue;
+		private bool m_MouseDownSelectionPerformed=false;
+        private bool m_PassiveContainer = false;
+        protected bool m_AddingItem = false;
+        protected bool m_CreatingItem = false;
+        protected DesignerTransaction m_InsertItemTransaction = null;
+        private bool m_InternalRemoveInProgress = false;
+		#endregion
+
+		#region Designer Implementation
+		public BarBaseControlDesigner()
+		{
+			
+		}
+
+		public override void Initialize(IComponent component) 
+		{
+			base.Initialize(component);
+			if(!component.Site.DesignMode)
+				return;
+
+			ISelectionService ss =(ISelectionService)GetService(typeof(ISelectionService));
+            if (ss != null)
+            {
+                ss.SelectionChanged += new EventHandler(OnSelectionChanged);
+            }
+
+			// If our component is removed we need to clean-up
+			IComponentChangeService cc=(IComponentChangeService)GetService(typeof(IComponentChangeService));
+			if(cc!=null)
+			{
+				cc.ComponentRemoving+=new ComponentEventHandler(this.OnComponentRemoving);
+				cc.ComponentRemoved+=new ComponentEventHandler(this.OnComponentRemoved);
+                cc.ComponentAdding += new ComponentEventHandler(ComponentChangeComponentAdding);
+                cc.ComponentAdded += new ComponentEventHandler(ComponentChangeComponentAdded);
+			}
+
+			IDesignerEventService ds=GetService(typeof(IDesignerEventService)) as IDesignerEventService;
+			if(ds!=null)
+			{
+				ds.ActiveDesignerChanged+=new ActiveDesignerEventHandler(this.OnActiveDesignerChanged);
+				ds.SelectionChanged+=new EventHandler(DesignerSelectionChanged);
+			}
+
+			if(this.Control is IBarDesignerServices)
+				((IBarDesignerServices)this.Control).Designer=this;
+
+            if (this.Control is ItemControl)
+                ((ItemControl)this.Control).SetDesignMode(true);
+
+			if(component is System.Windows.Forms.Control)
+			{
+				((Control)component).ControlAdded+=new ControlEventHandler(this.ComponentAdded);
+				((Control)component).ControlRemoved+=new ControlEventHandler(this.ComponentRemoved);
+			}
+			//this.EnableDragDrop(false);
+		}
+
+        protected virtual void ComponentChangeComponentAdded(object sender, ComponentEventArgs e)
+        {
+            if (m_AddingItem)
+            {
+                m_AddingItem = false;
+                IComponentChangeService cc = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+                if (cc != null)
+                    cc.OnComponentChanging(this.Control, null);
+                this.GetDefaultNewItemContainer().SubItems.Add(e.Component as BaseItem);
+                if (cc != null)
+                    cc.OnComponentChanged(this.Control, null, null, null);
+                m_InsertItemTransaction.Commit();
+                m_InsertItemTransaction = null;
+                this.RecalcLayout();
+            }
+        }
+
+        private void ComponentChangeComponentAdding(object sender, ComponentEventArgs e)
+        {
+            if (m_InsertItemTransaction == null && !m_AddingItem && !m_CreatingItem && e.Component is BaseItem)
+            {
+                ISelectionService ss = this.GetService(typeof(ISelectionService)) as ISelectionService;
+                if (ss != null && ss.PrimarySelection == this.Control)
+                {
+                    IDesignerHost dh = this.GetService(typeof(IDesignerHost)) as IDesignerHost;
+                    if (dh.InTransaction && dh.TransactionDescription == CreatingItemTransactionDescription) return;
+
+                    m_AddingItem = true;
+                    m_InsertItemTransaction = dh.CreateTransaction("Adding Item Clip");
+                }
+            }
+        }
+
+		protected override void Dispose(bool disposing)
+		{
+			// Unhook events
+			IComponentChangeService cc=(IComponentChangeService)GetService(typeof(IComponentChangeService));
+			if(cc!=null)
+			{
+				cc.ComponentRemoving-=new ComponentEventHandler(this.OnComponentRemoving);
+				cc.ComponentRemoved-=new ComponentEventHandler(this.OnComponentRemoved);
+			}
+
+			ISelectionService ss =(ISelectionService)GetService(typeof(ISelectionService));
+            if (ss != null)
+            {
+                ss.SelectionChanged -= new EventHandler(OnSelectionChanged);
+            }
+			
+			IDesignerEventService ds=GetService(typeof(IDesignerEventService)) as IDesignerEventService;
+			if(ds!=null)
+			{
+				ds.ActiveDesignerChanged-=new ActiveDesignerEventHandler(this.OnActiveDesignerChanged);
+				ds.SelectionChanged-=new EventHandler(DesignerSelectionChanged);
+			}
+
+			if(this.Component is System.Windows.Forms.Control)
+			{
+				((Control)this.Component).ControlAdded-=new ControlEventHandler(this.ComponentAdded);
+				((Control)this.Component).ControlRemoved-=new ControlEventHandler(this.ComponentRemoved);
+			}
+
+			base.Dispose(disposing);
+		}
+
+		public override bool CanParent(Control control)
+		{
+			BaseItem item = GetControlItem(control);
+			if (item != null && item != m_DragItem && !m_NewControlAdded)
+				return false;
+			return base.CanParent(control);
+		}
+
+		private void ComponentAdded(object sender, ControlEventArgs e)
+		{
+			if(!m_NewControlAdded || !m_EnableItemDragDrop || !m_AcceptExternalControls || this.IsDockableWindow)
+			{
+				if(!m_NewControlAdded)
+				{
+					if(!OnControlAdded(e))
+						return;
+				}
+				else
+					return;
+			}
+
+			m_TimerAdded=new Timer();
+			m_TimerAdded.Tick+=new EventHandler(this.TimerTick);
+			m_TimerAdded.Interval=50;
+			m_TimerAdded.Enabled=true;
+			m_TimerAdded.Start();
+			m_NewControlAdded=false;
+		}
+
+		/// <summary>
+		/// Called after control has been added to container but not through drag & drop. Control added could also be
+		/// internal control by the bar container.
+		/// </summary>
+		/// <param name="e">Event arguments</param>
+		/// <returns>true if acted upon this new control otherwise false.</returns>
+		protected virtual bool OnControlAdded(ControlEventArgs e)
+		{
+			return false;
+		}
+
+		private void ComponentRemoved(object sender, ControlEventArgs e)
+		{
+			IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+            if (dh == null || dh.Loading || m_InternalRemoveInProgress)
+				return;
+
+			if(m_JustAdded!=DateTime.MinValue && DateTime.Now.Subtract(m_JustAdded).Seconds<2)
+			{
+				m_JustAdded=DateTime.MinValue;
+				return;
+			}
+			m_JustAdded=DateTime.MinValue;
+			if(m_DragLeave)
+				ControlRemoved(e.Control);
+			else if(m_TimerDragDrop!=null)
+				m_ControlRemoved=true;
+			else
+			{
+				ISelectionService ss =(ISelectionService)GetService(typeof(ISelectionService));
+				if(ss!=null && ss.PrimarySelection==e.Control && this.GetControlItem(e.Control)!=null)
+				{
+					ControlRemoved(e.Control);
+				}
+			}
+		}
+
+		private void ControlRemoved(Control control)
+		{
+            if (control != null && !m_InternalRemoveInProgress)
+			{
+				BaseItem item=this.GetControlItem(control);
+				if(item!=null)
+				{
+					MouseDragDrop(-1,-1);
+					if(item.Parent!=null)
+						item.Parent.SubItems.Remove(item);
+                    if (item is ControlContainerItem)
+                        ((ControlContainerItem)item).Control = null;
+					this.DestroyComponent(item);
+					this.RecalcLayout();
+				}
+			}
+		}
+
+		private void TimerTick(object sender, EventArgs e)
+		{
+			m_TimerAdded.Stop();
+			m_TimerAdded.Enabled=false;
+			m_TimerAdded=null;
+			this.RecalcLayout();
+			ISelectionService sel=(ISelectionService)this.GetService(typeof(ISelectionService));
+			if(sel!=null && sel.PrimarySelection is Control && this.Control.Controls.Contains((Control)sel.PrimarySelection))
+			{
+				IComponentChangeService cc=this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+				cc.OnComponentChanged(sel.PrimarySelection,null,null,null);
+			}
+		}
+
+		private void OnSelectionChanged(object sender, EventArgs e) 
+		{
+			DesignTimeSelectionChanged(sender as ISelectionService);
+		}
+
+		private void OnActiveDesignerChanged(object sender, ActiveDesignerEventArgs e)
+		{
+			this.ActiveDesignerChanged(e);
+		}
+
+		/// <summary>
+		/// Support for popup menu closing.
+		/// </summary>
+		/// <param name="e"></param>
+		protected virtual void ActiveDesignerChanged(ActiveDesignerEventArgs e)
+		{
+            ClosePopups();
+		}
+
+        protected virtual void ClosePopups()
+        {
+            IOwner owner = GetIOwner();
+            if (owner != null)
+            {
+                owner.OnApplicationDeactivate(); // Closes all popups
+            }
+        }
+
+        protected virtual IOwner GetIOwner()
+        {
+            return this.GetItemContainerControl() as IOwner;
+        }
+
+        protected virtual IOwnerMenuSupport GetIOwnerMenuSupport()
+        {
+            return this.GetItemContainerControl() as IOwnerMenuSupport;
+        }
+
+        private bool _IsSelected = false;
+        /// <summary>
+        /// Gets whether this control or an item inside of it is selected.
+        /// </summary>
+        public bool IsSelected
+        {
+            get { return _IsSelected; }
+            internal set
+            {
+                if (value != _IsSelected)
+                {
+                    bool oldValue = _IsSelected;
+                    _IsSelected = value;
+                    OnIsSelectedChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when IsSelected property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnIsSelectedChanged(bool oldValue, bool newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("IsSelected"));
+        }
+
+
+        private bool IsItemContained(BaseItem item)
+        {
+            if (item.ContainerControl == this.Control) return true;
+            BaseItem parent = item.Parent;
+            while (parent != null)
+            {
+                if (parent.ContainerControl == this.Control) return true;
+                parent = parent.Parent;
+            }
+            return false;
+        }
+        /// <summary>
+		/// Support for popup menu closing.
+		/// </summary>
+		protected virtual void DesignTimeSelectionChanged(ISelectionService ss)
+		{
+			if(ss==null)
+				return;
+			if(this.Control==null || this.Control.IsDisposed || this.IsDockableWindow)
+				return;
+
+            if (ss.PrimarySelection != this.Control)
+            {
+                BaseItem container = this.GetItemContainer();
+                if (container == null)
+                    return;
+                if (ss.PrimarySelection is BaseItem)
+                {
+                    BaseItem item = ss.PrimarySelection as BaseItem;
+                    if (IsItemContained(item))
+                        IsSelected = true;
+                    else
+                        IsSelected = false;
+
+                    if (item.ContainerControl == this.GetItemContainerControl())
+                    {
+                        if ((!item.IsOnMenu || item.IsOnBar && ((Bar)item.ContainerControl).BarState == eBarState.Popup) && !(item.Expanded && item is PopupItem || item is GalleryContainer && ((GalleryContainer)item).PopupGalleryItem.Expanded))
+                            this.GetIOwnerMenuSupport().ClosePopups();
+                        return;
+                    }
+
+                    if (this.GetAllAssociatedComponents().Contains(item))
+                    {
+                        if (!item.IsOnMenu && !(item.IsOnBar && ((Bar)item.ContainerControl).BarState == eBarState.Popup))
+                            this.GetIOwnerMenuSupport().ClosePopups();
+                        return;
+                    }
+
+                    IOwner owner = this.GetIOwner();
+                    if (owner != null && owner != item.GetOwner())
+                    {
+                        owner.SetFocusItem(null);
+                        owner.OnApplicationDeactivate();  // Closes all popups
+                    }
+                }
+                else
+                {
+                    IOwner owner = this.GetIOwner();
+                    if (owner != null)
+                    {
+                        owner.SetFocusItem(null);
+                        owner.OnApplicationDeactivate(); // Closes all popups
+                    }
+                    IsSelected = false;
+                }
+            }
+            else
+            {
+                IOwner owner = this.GetIOwner();
+                if (owner != null)
+                    owner.OnApplicationDeactivate(); // Closes all popups
+                IsSelected = true;
+            }
+		}
+
+        protected virtual BaseItem GetDefaultNewItemContainer()
+        {
+            return GetItemContainer();
+        }
+
+		protected virtual BaseItem GetItemContainer()
+		{
+			BarBaseControl bar=this.Control as BarBaseControl;
+			if(bar!=null)
+				return bar.GetBaseItemContainer();
+			if(this.Control is ItemControl)
+				return ((ItemControl)this.Control).GetBaseItemContainer();
+			return null;
+		}
+
+		protected virtual System.Windows.Forms.Control GetItemContainerControl()
+		{
+			return this.Control;
+		}
+
+		protected bool m_InternalRemoving=false;
+		private void OnComponentRemoving(object sender,ComponentEventArgs e)
+		{
+			if(e.Component==this.Component)
+				ThisComponentRemoving(sender,e);
+			else
+				OtherComponentRemoving(sender,e);
+		}
+
+		private void OnComponentRemoved(object sender,ComponentEventArgs e)
+		{
+			ComponentRemoved(sender,e);
+		}
+
+		protected virtual void ComponentRemoved(object sender, ComponentEventArgs e){}
+
+		/// <summary>
+		/// Removes all subitems from container.
+		/// </summary>
+		protected virtual void ThisComponentRemoving(object sender, ComponentEventArgs e)
+		{
+			if(!m_InternalRemoving)
+			{
+				m_InternalRemoving=true;
+				try
+				{
+					// Unhook events
+					IComponentChangeService cc=(IComponentChangeService)GetService(typeof(IComponentChangeService));
+					if(cc!=null)
+						cc.ComponentRemoving-=new ComponentEventHandler(this.OnComponentRemoving);
+
+					BaseItem container=this.GetItemContainer();
+					IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+
+					if(dh==null || container==null)
+						return;
+
+                    //foreach(BaseItem item in container.SubItems)
+                    //{
+
+                    for (int i = container.SubItems.Count - 1; i >= 0; i--)
+                    {
+                        BaseItem item = container.SubItems[i];
+
+                        // Covers the undo case in designer
+                        if (item.Parent == container)
+                        {
+                            DestroySubItems(item, dh);
+                            dh.DestroyComponent(item);
+                        }
+                    }
+				}
+				finally
+				{
+					m_InternalRemoving=false;
+				}
+			}
+		}
+
+		/// <summary>
+		/// Triggered when some other component on the form is removed.
+		/// </summary>
+		protected virtual void OtherComponentRemoving(object sender, ComponentEventArgs e)
+		{
+			if(e.Component is BaseItem)
+			{
+				BaseItem item=e.Component as BaseItem;
+				if(item.ContainerControl==GetItemContainerControl())
+				{
+					if(item.Parent!=null && item.Parent.SubItems.Contains(item))
+						item.Parent.SubItems.Remove(item);
+					if(item!=null)
+						DestroySubItems(item);
+					this.RecalcLayout();
+				}
+			}
+		}
+
+		protected virtual void DestroySubItems(BaseItem parent, IDesignerHost dh)
+		{
+			if(parent is ControlContainerItem)
+			{
+				if(((ControlContainerItem)parent).Control!=null)
+				{
+					Control c=((ControlContainerItem)parent).Control;
+					((ControlContainerItem)parent).Control=null;
+					dh.DestroyComponent(c);
+				}
+			}
+			else if(parent is DockContainerItem)
+			{
+				if(((DockContainerItem)parent).Control!=null)
+				{
+					Control c=((DockContainerItem)parent).Control;
+					((DockContainerItem)parent).Control=null;
+					dh.DestroyComponent(c);
+				}
+			}
+
+			BaseItem[] subitems=new BaseItem[parent.SubItems.Count];
+			parent.SubItems.CopyTo(subitems,0);
+			foreach(BaseItem item in subitems)
+			{
+				DestroySubItems(item,dh);
+				dh.DestroyComponent(item);
+			}
+		}
+
+		protected virtual void DestroySubItems(BaseItem parent)
+		{
+			IDesignerHost dh=GetService(typeof(IDesignerHost)) as IDesignerHost;
+			if(dh!=null)
+				DestroySubItems(parent,dh);
+		}
+
+		/// <summary>
+		/// Selection support for items on container.
+		/// </summary>
+		protected override void WndProc(ref Message m)
+		{
+            if(m_DesignerHost==null)
+				m_DesignerHost=System.Windows.Forms.Control.FromHandle(m.HWnd);
+			BaseItem container=this.GetItemContainer();
+			System.Windows.Forms.Control ctrl=this.GetItemContainerControl();
+			if(container==null || ctrl==null || ctrl.IsDisposed)
+			{
+				base.WndProc(ref m);
+				return;
+			}
+
+			switch(m.Msg)
+			{
+				case WinApi.WM_LBUTTONDOWN:
+                case WinApi.WM_RBUTTONDOWN:
+				{
+					if(OnMouseDown(ref m, m.Msg==WinApi.WM_LBUTTONDOWN?MouseButtons.Left:MouseButtons.Right))
+						return;
+					break;
+				}
+				case WinApi.WM_RBUTTONUP:
+				case WinApi.WM_LBUTTONUP:
+				{
+					if(OnMouseUp(ref m))
+						return;
+
+					break;
+				}
+				case WinApi.WM_MOUSEMOVE:
+				{
+					if(OnMouseMove(ref m))
+					{
+						m.Result=IntPtr.Zero;
+						return;
+					}
+					break;
+				}
+				case WinApi.WM_MOUSELEAVE:
+				{
+					if(OnMouseLeave(ref m))
+						return;
+					break;
+				}
+				case WinApi.WM_LBUTTONDBLCLK:
+				{
+					if(OnMouseDoubleClick(m))
+						return;
+					break;
+				}
+                case WinApi.WM_HSCROLL:
+                case WinApi.WM_VSCROLL:
+                {
+                    base.WndProc(ref m);
+                    this.RecalcLayout();
+                    return;
+                }
+			}
+
+			base.WndProc(ref m);
+		}
+
+		protected virtual bool OnMouseDown(ref Message m, MouseButtons button)
+		{
+			if(this.IsDockableWindow)
+				return false;
+
+			System.Windows.Forms.Control ctrl=this.GetItemContainerControl();
+			BaseItem container=this.GetItemContainer();
+            IOwner owner = this.GetIOwner();
+
+			if(ctrl==null || owner==null || container==null)
+				return false;
+
+			if(m.Msg==WinApi.WM_RBUTTONDOWN)
+			{
+				Point pos=ctrl.PointToClient(System.Windows.Forms.Control.MousePosition);
+				MouseEventArgs e=new MouseEventArgs(MouseButtons.Left,0,pos.X,pos.Y,0);
+				container.InternalMouseDown(e);
+                BaseItem focusItem = owner.GetFocusItem();
+				if(focusItem!=null)
+				{
+					ISelectionService selection = (ISelectionService) this.GetService(typeof(ISelectionService));
+					if(selection!=null)
+					{
+						ArrayList arr=new ArrayList(1);
+                        arr.Add(focusItem);
+#if FRAMEWORK20
+						selection.SetSelectedComponents(arr,SelectionTypes.Primary);
+#else
+                        selection.SetSelectedComponents(arr,SelectionTypes.MouseDown);
+#endif
+                        OnItemSelected(focusItem);
+                        if (arr[0] is PopupItem && ((PopupItem)arr[0]).SubItems.Count > 0 && !((PopupItem)arr[0]).Expanded)
+                            ((PopupItem)arr[0]).Expanded = true;
+                        focusItem.DesignTimeMouseDownPoint = pos;
+						this.OnContextMenu(System.Windows.Forms.Control.MousePosition.X, System.Windows.Forms.Control.MousePosition.Y);
+						return true;
+					}
+				}
+			}
+			return false;
+		}
+
+		protected virtual bool OnMouseUp(ref Message m)
+		{
+			bool bProcessed=false;
+
+			if(m_Capture)
+			{
+				m_Capture=false;
+				System.Windows.Forms.Control c=System.Windows.Forms.Control.FromHandle(m.HWnd);
+				if(c!=null)
+					c.Capture=false;
+			}
+
+			System.Windows.Forms.Control ctrl=this.GetItemContainerControl();
+			BaseItem container=this.GetItemContainer();
+            IOwner owner = this.GetIOwner();
+
+			if(ctrl==null || owner==null || container==null)
+				return false;
+
+			Point pos=ctrl.PointToClient(System.Windows.Forms.Control.MousePosition);
+			MouseEventArgs e=new MouseEventArgs(MouseButtons.Left,0,pos.X,pos.Y,0);
+			container.InternalMouseUp(e);
+					
+            if (m_MouseDownSelectionPerformed)
+                bProcessed = true;
+			m_MouseDownSelectionPerformed=false;
+
+			if(m_DragItem!=null && m_DragItem is ControlContainerItem && ((ControlContainerItem)m_DragItem).Control!=null)
+				MouseDragDrop(pos.X,pos.Y);
+
+			return bProcessed;
+		}
+
+		protected virtual bool OnMouseMove(ref Message m)
+		{
+			return false;
+		}
+
+		protected override void OnMouseDragBegin(int x, int y)
+		{
+            if (m_PassiveContainer)
+            {
+                base.OnMouseDragBegin(x, y);
+                return;
+            }
+
+			Control bar=this.GetItemContainerControl();
+			System.Windows.Forms.Control ctrl=this.GetItemContainerControl();
+            IOwner owner = this.GetIOwner();
+			BaseItem container=this.GetItemContainer();
+			Point pos=ctrl.PointToClient(new Point(x,y));
+			MouseEventArgs e=new MouseEventArgs(MouseButtons.Left,0,pos.X,pos.Y,0);
+			
+			BaseItem dragItem=null;
+            BaseItem previousFocusItem = owner.GetFocusItem();
+			container.InternalMouseDown(e);
+			dragItem=owner.GetFocusItem();
+
+//            // Allow control selection
+//            if (dragItem != null && dragItem == previousFocusItem && (dragItem.SubItems.Count == 0 || !(dragItem is PopupItem)))
+//            {
+//                ArrayList arr = new ArrayList(1);
+//                arr.Add(this.Control);
+//                ISelectionService selection = (ISelectionService)this.GetService(typeof(ISelectionService));
+//#if FRAMEWORK20
+//                selection.SetSelectedComponents(arr, SelectionTypes.Primary);
+//#else
+//                    selection.SetSelectedComponents(arr,SelectionTypes.MouseDown);
+//#endif
+//                owner.SetFocusItem(null);
+//                dragItem = null;
+//            }
+
+			if(dragItem!=null)
+			{
+				ISelectionService selection = (ISelectionService) this.GetService(typeof(ISelectionService));
+				if(selection!=null)
+				{
+					ArrayList arr=new ArrayList(1);
+					arr.Add(dragItem);
+#if FRAMEWORK20
+                    selection.SetSelectedComponents(arr, SelectionTypes.Primary);
+#else
+                    selection.SetSelectedComponents(arr,SelectionTypes.MouseDown);
+#endif
+                    OnItemSelected(owner.GetFocusItem());
+				}
+			}
+
+			if(bar==null || dragItem==null || this.IsDockableWindow || !m_EnableItemDragDrop || !CanDragItem(dragItem))
+			{
+				if(dragItem==null)
+					base.OnMouseDragBegin(x,y);
+				else
+					this.Control.Capture = true; // Does same as base implementation
+				return;
+			}
+
+			bar.Capture = true;
+            if (this.IsDockableWindow)
+            {
+                WinApi.RECT rect = new WinApi.RECT(0, 0, 0, 0);
+                WinApi.GetWindowRect(bar.Handle, ref rect);
+                Rectangle r = Rectangle.FromLTRB(rect.Left, rect.Top, rect.Right, rect.Bottom);
+                Cursor.Clip = r;
+            }
+			StartItemDrag(dragItem);
+
+			// Does same as base implementation
+			this.Control.Capture = true;
+		}
+		protected virtual bool CanDragItem(BaseItem item)
+		{
+            if (item is ControlContainerItem && ((ControlContainerItem)item).Control != null)
+                return false;
+			return true;
+		}
+        protected virtual Point GetClientPoint(int x, int y)
+        {
+            Point p = this.Control.PointToClient(new Point(x, y));
+            return p;
+        }
+        protected override void OnMouseDragMove(int x, int y)
+		{
+			if(m_DragInProgress)
+			{
+                Point p = GetClientPoint(x, y);
+				MouseDragOver(p.X,p.Y);
+			}
+		}
+		protected override void OnMouseDragEnd(bool cancel)
+		{
+			if(!this.IsDockableWindow && !m_PassiveContainer)
+			{
+				this.Control.Capture = false;
+				Cursor.Clip = Rectangle.Empty;
+
+				if(m_DragInProgress)
+				{
+					if(cancel)
+						MouseDragDrop(-1,-1);
+					else
+					{
+						Point p=this.Control.PointToClient(Control.MousePosition);
+						MouseDragDrop(p.X,p.Y);
+					}
+					cancel=true;
+				}
+				else
+				{
+					System.Windows.Forms.Control ctrl=this.GetItemContainerControl();
+                    IOwner owner = this.GetIOwner();
+					if(owner!=null && owner.GetFocusItem()!=null)
+						cancel=true;
+				}
+			}
+
+			base.OnMouseDragEnd(cancel);
+		}
+
+		protected virtual bool OnMouseLeave(ref Message m)
+		{
+			return false;
+		}
+
+		protected virtual bool OnMouseDoubleClick(Message m)
+		{
+			bool processed=false;
+
+			ISelectionService selection = (ISelectionService) this.GetService(typeof(ISelectionService));
+            if (selection != null && selection.PrimarySelection == this.Control)
+            {
+                Point p = this.Control.PointToClient(Control.MousePosition);
+                IOwner owner = this.GetIOwner();
+                BaseItem container = this.GetItemContainer();
+                container.InternalMouseDown(new MouseEventArgs(MouseButtons.Left, 0, p.X, p.Y, 0));
+                BaseItem focusItem = owner.GetFocusItem();
+
+                // Allow control selection
+                if (focusItem!=null)
+                {
+                    ArrayList arr = new ArrayList(1);
+                    arr.Add(focusItem);
+                    selection = (ISelectionService)this.GetService(typeof(ISelectionService));
+#if FRAMEWORK20
+                    selection.SetSelectedComponents(arr, SelectionTypes.Primary);
+#else
+                    selection.SetSelectedComponents(arr,SelectionTypes.MouseDown);
+#endif
+                }
+            }
+
+			if(selection!=null && selection.PrimarySelection is ButtonItem && ((ButtonItem)selection.PrimarySelection).ContainerControl==this.GetItemContainerControl())
+			{
+				IDesignerHost host=(IDesignerHost) this.GetService(typeof(IDesignerHost));
+				if(host!=null)
+				{
+					IDesigner designer=host.GetDesigner(selection.PrimarySelection as IComponent);
+					if(designer!=null)
+					{
+						designer.DoDefaultAction();
+						processed=true;
+					}
+				}
+			}
+
+			return processed;
+		}
+
+		protected virtual void OnItemSelected(BaseItem item)
+		{
+
+		}
+
+		protected virtual void RecalcLayout()
+		{
+			Control c=this.GetItemContainerControl();
+            if (c is BarBaseControl)
+                ((BarBaseControl)c).RecalcLayout();
+            else if (c is ItemControl)
+                ((ItemControl)c).RecalcLayout();
+            else if (c is ButtonX)
+                ((ButtonX)c).RecalcLayout();
+		}
+
+		/// <summary>
+		/// Indicates to the designed control that it has been selected or one of the elements managed by the control is selected in designer.
+		/// </summary>
+		/// <param name="selected">true if selected otherwise false</param>
+		protected virtual void SetComponentSelected(bool selected)
+		{
+			if(this.GetItemContainerControl() is ItemControl)
+			{
+				((ItemControl)this.GetItemContainerControl()).DesignerSelection=selected;
+			}
+            else if (this.GetItemContainerControl() is Bar)
+            {
+                ((Bar)this.GetItemContainerControl()).DesignerSelection = selected;
+            }
+            else if (this.GetItemContainerControl() is ExplorerBar)
+            {
+                ((ExplorerBar)this.GetItemContainerControl()).DesignerSelection = selected;
+            }
+		}
+
+		public override System.Collections.ICollection AssociatedComponents
+		{
+			get
+			{
+				ArrayList c=new ArrayList(base.AssociatedComponents);
+				BaseItem container=this.GetItemContainer();
+				if(container!=null)
+				{
+					foreach(BaseItem item in container.SubItems)
+					{
+						if(item.DesignMode)
+							c.Add(item);
+					}
+				}
+				return c;
+			}
+		}
+
+        protected System.Collections.ICollection BaseAssociatedComponents
+        {
+            get { return base.AssociatedComponents; }
+        }
+
+		protected virtual ArrayList GetAllAssociatedComponents()
+		{
+			ArrayList c=new ArrayList(base.AssociatedComponents);
+			BaseItem container=this.GetItemContainer();
+			if(container!=null)
+			{
+				AddSubItems(container,c);
+			}
+			return c;
+		}
+
+        protected override bool GetHitTest(Point pt)
+        {
+            if (base.GetHitTest(pt))
+            {
+                return true;
+            }
+            ScrollableControl c = this.Control as ScrollableControl;
+            if (c!=null && c.IsHandleCreated && c.AutoScroll)
+            {
+                int res = WinApi.SendMessage(c.Handle, 0x84, 0, WinApi.MAKELPARAM(pt.X, pt.Y));
+                if ((res == 7) || (res == 6))
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+		protected virtual void AddSubItems(BaseItem parent, ArrayList list)
+		{
+			foreach(BaseItem item in parent.SubItems)
+			{
+				if(item.DesignMode)
+					list.Add(item);
+				AddSubItems(item,list);
+			}
+		}
+		#endregion
+
+		#region Design-Time Item Creation
+		protected virtual void CreateButton(object sender, EventArgs e)
+		{
+            CreateButton();
+		}
+        public virtual ButtonItem CreateButton()
+        {
+            OnSubItemsChanging();
+            ButtonItem button = CreateButton(this.GetDefaultNewItemContainer());
+            OnSubItemsChanged();
+            return button;
+        }
+		protected virtual ButtonItem CreateButton(BaseItem parent)
+		{
+			if(parent==null)
+				return null;
+            ButtonItem item = null;
+
+			IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+			if(dh!=null)
+			{
+                DesignerTransaction trans = dh.CreateTransaction("Adding new item");
+                try
+                {
+                    m_CreatingItem = true;
+                    item = dh.CreateComponent(typeof(ButtonItem)) as ButtonItem;
+                    if (item == null)
+                        return null;
+
+                    TypeDescriptor.GetProperties(item)["Text"].SetValue(item, item.Name);
+
+                    IComponentChangeService cc = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+                    if (parent != this.GetDefaultNewItemContainer() && cc != null)
+                        cc.OnComponentChanging(parent, TypeDescriptor.GetProperties(typeof(BaseItem))["SubItems"]);
+
+                    parent.SubItems.Add(item);
+                    this.RecalcLayout();
+
+                    if (parent != this.GetDefaultNewItemContainer() && cc != null)
+                        cc.OnComponentChanged(parent, TypeDescriptor.GetProperties(typeof(BaseItem))["SubItems"], null, null);
+
+                    OnitemCreated(item);
+                }
+                catch
+                {
+                    trans.Cancel();
+                }
+                finally
+                {
+                    if (!trans.Canceled)
+                        trans.Commit();
+                    m_CreatingItem = false;
+                }
+			}
+            return item;
+		}
+
+        protected virtual void CreateRatingItem(object sender, EventArgs e)
+        {
+            OnSubItemsChanging();
+            CreateRatingItem(this.GetDefaultNewItemContainer());
+            OnSubItemsChanged();
+        }
+
+        protected virtual void CreateRatingItem(BaseItem parent)
+        {
+            if (parent == null)
+                return;
+
+            IDesignerHost dh = (IDesignerHost)GetService(typeof(IDesignerHost));
+            if (dh != null)
+            {
+                DesignerTransaction trans = dh.CreateTransaction("Adding new item");
+                try
+                {
+                    m_CreatingItem = true;
+                    RatingItem item = dh.CreateComponent(typeof(RatingItem)) as RatingItem;
+                    if (item == null)
+                        return;
+
+                    IComponentChangeService cc = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+                    if (parent != this.GetDefaultNewItemContainer() && cc != null)
+                        cc.OnComponentChanging(parent, TypeDescriptor.GetProperties(typeof(BaseItem))["SubItems"]);
+
+                    parent.SubItems.Add(item);
+                    this.RecalcLayout();
+
+                    if (parent != this.GetDefaultNewItemContainer() && cc != null)
+                        cc.OnComponentChanged(parent, TypeDescriptor.GetProperties(typeof(BaseItem))["SubItems"], null, null);
+
+                    OnitemCreated(item);
+                }
+                catch
+                {
+                    trans.Cancel();
+                }
+                finally
+                {
+                    if (!trans.Canceled)
+                        trans.Commit();
+                    m_CreatingItem = false;
+                }
+            }
+        }
+
+        protected virtual void CreateCircularProgressItem(object sender, EventArgs e)
+        {
+            OnSubItemsChanging();
+            CreateCircularProgressItem(this.GetDefaultNewItemContainer());
+            OnSubItemsChanged();
+        }
+
+        protected virtual void CreateCircularProgressItem(BaseItem parent)
+        {
+            if (parent == null)
+                return;
+
+            IDesignerHost dh = (IDesignerHost)GetService(typeof(IDesignerHost));
+            if (dh != null)
+            {
+                DesignerTransaction trans = dh.CreateTransaction("Adding new item");
+                try
+                {
+                    m_CreatingItem = true;
+                    CircularProgressItem item = dh.CreateComponent(typeof(CircularProgressItem)) as CircularProgressItem;
+                    if (item == null)
+                        return;
+
+                    IComponentChangeService cc = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+                    if (parent != this.GetDefaultNewItemContainer() && cc != null)
+                        cc.OnComponentChanging(parent, TypeDescriptor.GetProperties(typeof(BaseItem))["SubItems"]);
+
+                    parent.SubItems.Add(item);
+                    this.RecalcLayout();
+
+                    if (parent != this.GetDefaultNewItemContainer() && cc != null)
+                        cc.OnComponentChanged(parent, TypeDescriptor.GetProperties(typeof(BaseItem))["SubItems"], null, null);
+
+                    OnitemCreated(item);
+                }
+                catch
+                {
+                    trans.Cancel();
+                }
+                finally
+                {
+                    if (!trans.Canceled)
+                        trans.Commit();
+                    m_CreatingItem = false;
+                }
+            }
+        }
+
+        protected virtual void CreateCheckBox(object sender, EventArgs e)
+        {
+            OnSubItemsChanging();
+            CreateCheckBox(this.GetDefaultNewItemContainer());
+            OnSubItemsChanged();
+        }
+
+        protected virtual void CreateCheckBox(BaseItem parent)
+        {
+            if (parent == null)
+                return;
+
+            IDesignerHost dh = (IDesignerHost)GetService(typeof(IDesignerHost));
+            if (dh != null)
+            {
+                DesignerTransaction trans = dh.CreateTransaction("Adding new item");
+                try
+                {
+                    m_CreatingItem = true;
+                    CheckBoxItem item = dh.CreateComponent(typeof(CheckBoxItem)) as CheckBoxItem;
+                    if (item == null)
+                        return;
+
+                    TypeDescriptor.GetProperties(item)["Text"].SetValue(item, item.Name);
+
+                    IComponentChangeService cc = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+                    if (parent != this.GetDefaultNewItemContainer() && cc != null)
+                        cc.OnComponentChanging(parent, TypeDescriptor.GetProperties(typeof(BaseItem))["SubItems"]);
+
+                    parent.SubItems.Add(item);
+                    this.RecalcLayout();
+
+                    if (parent != this.GetDefaultNewItemContainer() && cc != null)
+                        cc.OnComponentChanged(parent, TypeDescriptor.GetProperties(typeof(BaseItem))["SubItems"], null, null);
+
+                    OnitemCreated(item);
+                }
+                catch
+                {
+                    trans.Cancel();
+                }
+                finally
+                {
+                    if (!trans.Canceled)
+                        trans.Commit();
+                    m_CreatingItem = false;
+                }
+            }
+        }
+
+		protected virtual void CreateTextBox(object sender, EventArgs e)
+		{
+			OnSubItemsChanging();
+            CreateTextBox(this.GetDefaultNewItemContainer());
+			OnSubItemsChanged();
+		}
+
+		protected virtual void CreateTextBox(BaseItem parent)
+		{
+			if(parent==null)
+				return;
+
+			IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+			if(dh!=null)
+			{
+                DesignerTransaction trans = dh.CreateTransaction("Adding new item");
+                try
+                {
+                    m_CreatingItem = true;
+                    TextBoxItem item = dh.CreateComponent(typeof(TextBoxItem)) as TextBoxItem;
+                    if (item == null)
+                        return;
+
+                    IComponentChangeService cc = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+                    if (parent != this.GetDefaultNewItemContainer() && cc != null)
+                        cc.OnComponentChanging(parent, TypeDescriptor.GetProperties(typeof(BaseItem))["SubItems"]);
+
+                    parent.SubItems.Add(item);
+                    this.RecalcLayout();
+
+                    if (parent != this.GetDefaultNewItemContainer() && cc != null)
+                        cc.OnComponentChanged(parent, TypeDescriptor.GetProperties(typeof(BaseItem))["SubItems"], null, null);
+
+                    OnitemCreated(item);
+                }
+                catch
+                {
+                    trans.Cancel();
+                }
+                finally
+                {
+                    if (!trans.Canceled)
+                        trans.Commit();
+                    m_CreatingItem = false;
+                }
+			}
+		}
+
+
+		protected virtual void CreateComboBox(object sender, EventArgs e)
+		{
+			OnSubItemsChanging();
+            CreateComboBox(this.GetDefaultNewItemContainer());
+			OnSubItemsChanged();
+		}
+
+		protected virtual void CreateComboBox(BaseItem parent)
+		{
+			if(parent==null)
+				return;
+
+			IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+			if(dh!=null)
+			{
+                DesignerTransaction trans = dh.CreateTransaction("Adding new item");
+                try
+                {
+                    m_CreatingItem = true;
+				    ComboBoxItem item=dh.CreateComponent(typeof(ComboBoxItem)) as ComboBoxItem;
+				    if(item==null)
+					    return;
+
+				    IComponentChangeService cc=this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+                    if (parent != this.GetDefaultNewItemContainer() && cc != null)
+					    cc.OnComponentChanging(parent,TypeDescriptor.GetProperties(typeof(BaseItem))["SubItems"]);
+
+				    parent.SubItems.Add(item);
+				    this.RecalcLayout();
+
+                    if (parent != this.GetDefaultNewItemContainer() && cc != null)
+					    cc.OnComponentChanged(parent,TypeDescriptor.GetProperties(typeof(BaseItem))["SubItems"],null,null);
+
+                    OnitemCreated(item);
+                }
+                catch
+                {
+                    trans.Cancel();
+                    throw;
+                }
+                finally
+                {
+                    m_CreatingItem = false;
+                    if (!trans.Canceled)
+                        trans.Commit();
+                }
+			}
+		}
+
+		protected virtual void CreateLabel(object sender, EventArgs e)
+		{
+			OnSubItemsChanging();
+            CreateLabel(this.GetDefaultNewItemContainer());
+			OnSubItemsChanged();
+		}
+
+		protected virtual LabelItem CreateLabel(BaseItem parent)
+		{
+			if(parent==null)
+				return null;
+            LabelItem item = null;
+			IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+			if(dh!=null)
+			{
+                DesignerTransaction trans = dh.CreateTransaction("Adding new item");
+                try
+                {
+                    m_CreatingItem = true;
+                    item = dh.CreateComponent(typeof(LabelItem)) as LabelItem;
+                    if (item == null)
+                        return null;
+
+                    TypeDescriptor.GetProperties(item)["Text"].SetValue(item, item.Name);
+
+                    IComponentChangeService cc = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+                    if (parent != this.GetDefaultNewItemContainer() && cc != null)
+                        cc.OnComponentChanging(parent, TypeDescriptor.GetProperties(typeof(BaseItem))["SubItems"]);
+
+                    parent.SubItems.Add(item);
+                    this.RecalcLayout();
+
+                    if (parent != this.GetDefaultNewItemContainer() && cc != null)
+                        cc.OnComponentChanged(parent, TypeDescriptor.GetProperties(typeof(BaseItem))["SubItems"], null, null);
+
+                    OnitemCreated(item);
+                }
+                catch
+                {
+                    trans.Cancel();
+                    throw;
+                }
+                finally
+                {
+                    m_CreatingItem = false;
+                    if (!trans.Canceled)
+                        trans.Commit();
+                }
+			}
+            return item;
+		}
+
+        protected virtual void CreateColorPicker(object sender, EventArgs e)
+        {
+            OnSubItemsChanging();
+            CreateColorPicker(this.GetDefaultNewItemContainer());
+            OnSubItemsChanged();
+        }
+
+        protected virtual void CreateColorPicker(BaseItem parent)
+        {
+            if (parent == null)
+                return;
+
+            IDesignerHost dh = (IDesignerHost)GetService(typeof(IDesignerHost));
+            if (dh != null)
+            {
+                DesignerTransaction trans = dh.CreateTransaction("Adding new item");
+                try
+                {
+                    m_CreatingItem = true;
+                    ColorPickerDropDown item = dh.CreateComponent(typeof(ColorPickerDropDown)) as ColorPickerDropDown;
+                    if (item == null)
+                        return;
+
+                    TypeDescriptor.GetProperties(item)["Text"].SetValue(item, item.Name);
+
+                    IComponentChangeService cc = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+                    if (parent != this.GetDefaultNewItemContainer() && cc != null)
+                        cc.OnComponentChanging(parent, TypeDescriptor.GetProperties(typeof(BaseItem))["SubItems"]);
+
+                    parent.SubItems.Add(item);
+                    this.RecalcLayout();
+
+                    if (parent != this.GetDefaultNewItemContainer() && cc != null)
+                        cc.OnComponentChanged(parent, TypeDescriptor.GetProperties(typeof(BaseItem))["SubItems"], null, null);
+
+                    OnitemCreated(item);
+                }
+                catch
+                {
+                    trans.Cancel();
+                    throw;
+                }
+                finally
+                {
+                    m_CreatingItem = false;
+                    if (!trans.Canceled)
+                        trans.Commit();
+                }
+            }
+        }
+
+        protected virtual void CreateContainer(object sender, EventArgs e)
+        {
+            OnSubItemsChanging();
+            CreateContainer(this.GetDefaultNewItemContainer());
+            OnSubItemsChanged();
+        }
+
+        protected virtual void CreateContainer(BaseItem parent)
+        {
+            if (parent == null)
+                return;
+
+            IDesignerHost dh = (IDesignerHost)GetService(typeof(IDesignerHost));
+            if (dh != null)
+            {
+                DesignerTransaction trans = dh.CreateTransaction("Adding new item");
+                try
+                {
+                    m_CreatingItem = true;
+                    ItemContainer item = dh.CreateComponent(typeof(ItemContainer)) as ItemContainer;
+                    if (item == null)
+                        return;
+
+                    IComponentChangeService cc = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+                    if (parent != this.GetDefaultNewItemContainer() && cc != null)
+                        cc.OnComponentChanging(parent, TypeDescriptor.GetProperties(typeof(BaseItem))["SubItems"]);
+
+                    parent.SubItems.Add(item);
+                    this.RecalcLayout();
+
+                    if (parent != this.GetDefaultNewItemContainer() && cc != null)
+                        cc.OnComponentChanged(parent, TypeDescriptor.GetProperties(typeof(BaseItem))["SubItems"], null, null);
+
+                    OnitemCreated(item);
+                }
+                catch
+                {
+                    trans.Cancel();
+                    throw;
+                }
+                finally
+                {
+                    m_CreatingItem = false;
+                    if (!trans.Canceled)
+                        trans.Commit();
+                }
+            }
+        }
+
+		protected virtual void CreateProgressBar(object sender, EventArgs e)
+		{
+			OnSubItemsChanging();
+            CreateProgressBar(this.GetDefaultNewItemContainer());
+			OnSubItemsChanged();
+		}
+
+		protected virtual void CreateProgressBar(BaseItem parent)
+		{
+			if (parent == null)
+				return;
+
+			IDesignerHost dh = (IDesignerHost)GetService(typeof(IDesignerHost));
+			if (dh != null)
+			{
+                DesignerTransaction trans = dh.CreateTransaction("Adding new item");
+                try
+                {
+                    m_CreatingItem = true;
+                    ProgressBarItem item = dh.CreateComponent(typeof(ProgressBarItem)) as ProgressBarItem;
+                    if (item == null)
+                        return;
+
+                    IComponentChangeService cc = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+                    if (parent != this.GetDefaultNewItemContainer() && cc != null)
+                        cc.OnComponentChanging(parent, TypeDescriptor.GetProperties(typeof(BaseItem))["SubItems"]);
+
+                    parent.SubItems.Add(item);
+                    this.RecalcLayout();
+
+                    if (parent != this.GetDefaultNewItemContainer() && cc != null)
+                        cc.OnComponentChanged(parent, TypeDescriptor.GetProperties(typeof(BaseItem))["SubItems"], null, null);
+
+                    OnitemCreated(item);
+                }
+                catch
+                {
+                    trans.Cancel();
+                    throw;
+                }
+                finally
+                {
+                    m_CreatingItem = false;
+                    if (!trans.Canceled)
+                        trans.Commit();
+                }
+			}
+		}
+
+        protected virtual void CreateSwitch(object sender, EventArgs e)
+        {
+            OnSubItemsChanging();
+            CreateSwitch(this.GetDefaultNewItemContainer());
+            OnSubItemsChanged();
+        }
+
+        protected virtual void CreateSwitch(BaseItem parent)
+        {
+            if (parent == null)
+                return;
+
+            IDesignerHost dh = (IDesignerHost)GetService(typeof(IDesignerHost));
+            if (dh != null)
+            {
+                DesignerTransaction trans = dh.CreateTransaction("Adding new item");
+                try
+                {
+                    m_CreatingItem = true;
+                    SwitchButtonItem item = dh.CreateComponent(typeof(SwitchButtonItem)) as SwitchButtonItem;
+                    if (item == null)
+                        return;
+
+                    IComponentChangeService cc = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+                    if (parent != this.GetDefaultNewItemContainer() && cc != null)
+                        cc.OnComponentChanging(parent, TypeDescriptor.GetProperties(typeof(BaseItem))["SubItems"]);
+
+                    parent.SubItems.Add(item);
+                    this.RecalcLayout();
+
+                    if (parent != this.GetDefaultNewItemContainer() && cc != null)
+                        cc.OnComponentChanged(parent, TypeDescriptor.GetProperties(typeof(BaseItem))["SubItems"], null, null);
+
+                    OnitemCreated(item);
+                }
+                catch
+                {
+                    trans.Cancel();
+                    throw;
+                }
+                finally
+                {
+                    m_CreatingItem = false;
+                    if (!trans.Canceled)
+                        trans.Commit();
+                }
+            }
+        }
+
+        protected virtual void CreateMicroChart(object sender, EventArgs e)
+        {
+            OnSubItemsChanging();
+            CreateMicroChart(this.GetDefaultNewItemContainer());
+            OnSubItemsChanged();
+        }
+
+        protected virtual void CreateMicroChart(BaseItem parent)
+        {
+            if (parent == null)
+                return;
+
+            IDesignerHost dh = (IDesignerHost)GetService(typeof(IDesignerHost));
+            if (dh != null)
+            {
+                DesignerTransaction trans = dh.CreateTransaction("Adding new item");
+                try
+                {
+                    m_CreatingItem = true;
+                    MicroChartItem item = dh.CreateComponent(typeof(MicroChartItem)) as MicroChartItem;
+                    if (item == null)
+                        return;
+
+                    IComponentChangeService cc = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+                    if (parent != this.GetDefaultNewItemContainer() && cc != null)
+                        cc.OnComponentChanging(parent, TypeDescriptor.GetProperties(typeof(BaseItem))["SubItems"]);
+
+                    parent.SubItems.Add(item);
+                    this.RecalcLayout();
+
+                    if (parent != this.GetDefaultNewItemContainer() && cc != null)
+                        cc.OnComponentChanged(parent, TypeDescriptor.GetProperties(typeof(BaseItem))["SubItems"], null, null);
+
+                    OnitemCreated(item);
+                }
+                catch
+                {
+                    trans.Cancel();
+                    throw;
+                }
+                finally
+                {
+                    m_CreatingItem = false;
+                    if (!trans.Canceled)
+                        trans.Commit();
+                }
+            }
+        }
+
+		protected virtual void CreateDocument(object sender, EventArgs e)
+		{
+            IDesignerHost dh = (IDesignerHost)GetService(typeof(IDesignerHost));
+            if (dh == null)
+                return;
+
+            DesignerTransaction trans = dh.CreateTransaction("Adding new item");
+            try
+            {
+                m_CreatingItem = true;    
+                DockContainerItem item = dh.CreateComponent(typeof(DockContainerItem)) as DockContainerItem;
+                item.Text = item.Name;
+                OnSubItemsChanging();
+                this.GetDefaultNewItemContainer().SubItems.Add(item);
+                PanelDockContainer panel = dh.CreateComponent(typeof(PanelDockContainer)) as PanelDockContainer;
+                this.Control.Controls.Add(panel);
+                panel.ColorSchemeStyle = this.InternalStyle;
+                panel.ApplyLabelStyle();
+                item.Control = panel;
+                OnSubItemsChanged();
+                this.RecalcLayout();
+                if (this.Control is Bar)
+                {
+                    Bar bar = this.Control as Bar;
+                    bar.SelectedDockTab = bar.Items.IndexOf(item);
+                }
+                panel.BringToFront();
+            }
+            catch
+            {
+                trans.Cancel();
+                throw;
+            }
+            finally
+            {
+                m_CreatingItem = false;
+                if (!trans.Canceled)
+                    trans.Commit();
+            }
+		}
+
+        protected virtual void CreateMetroTile(object sender, EventArgs e)
+        {
+            OnSubItemsChanging();
+            CreateMetroTile(this.GetDefaultNewItemContainer());
+            OnSubItemsChanged();
+        }
+
+        protected virtual void CreateMetroTile(BaseItem parent)
+        {
+            if (parent == null)
+                return;
+
+            IDesignerHost dh = (IDesignerHost)GetService(typeof(IDesignerHost));
+            if (dh != null)
+            {
+                DesignerTransaction trans = dh.CreateTransaction("Adding new item");
+                try
+                {
+                    m_CreatingItem = true;
+                    DevComponents.DotNetBar.Metro.MetroTileItem item = dh.CreateComponent(typeof(DevComponents.DotNetBar.Metro.MetroTileItem)) as DevComponents.DotNetBar.Metro.MetroTileItem;
+                    if (item == null)
+                        return;
+                    IComponentChangeService cc = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+                    if (parent != this.GetDefaultNewItemContainer() && cc != null)
+                        cc.OnComponentChanging(parent, TypeDescriptor.GetProperties(typeof(BaseItem))["SubItems"]);
+
+                    parent.SubItems.Add(item);
+                    this.RecalcLayout();
+
+                    if (parent != this.GetDefaultNewItemContainer() && cc != null)
+                        cc.OnComponentChanged(parent, TypeDescriptor.GetProperties(typeof(BaseItem))["SubItems"], null, null);
+
+                    OnitemCreated(item);
+                }
+                catch
+                {
+                    trans.Cancel();
+                    throw;
+                }
+                finally
+                {
+                    m_CreatingItem = false;
+                    if (!trans.Canceled)
+                        trans.Commit();
+                }
+            }
+        }
+
+        protected virtual void CreateControlContainer(object sender, EventArgs e)
+        {
+            OnSubItemsChanging();
+            CreateControlContainer(this.GetDefaultNewItemContainer());
+            OnSubItemsChanged();
+        }
+
+        protected virtual void CreateControlContainer(BaseItem parent)
+        {
+            if (parent == null)
+                return;
+
+            IDesignerHost dh = (IDesignerHost)GetService(typeof(IDesignerHost));
+            if (dh != null)
+            {
+                DesignerTransaction trans = dh.CreateTransaction("Adding new item");
+                try
+                {
+                    m_CreatingItem = true;
+                    ControlContainerItem item = dh.CreateComponent(typeof(ControlContainerItem)) as ControlContainerItem;
+                    if (item == null)
+                        return;
+                    item.AllowItemResize = false;
+                    IComponentChangeService cc = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+                    if (parent != this.GetDefaultNewItemContainer() && cc != null)
+                        cc.OnComponentChanging(parent, TypeDescriptor.GetProperties(typeof(BaseItem))["SubItems"]);
+
+                    parent.SubItems.Add(item);
+                    this.RecalcLayout();
+
+                    if (parent != this.GetDefaultNewItemContainer() && cc != null)
+                        cc.OnComponentChanged(parent, TypeDescriptor.GetProperties(typeof(BaseItem))["SubItems"], null, null);
+
+                    OnitemCreated(item);
+                }
+                catch
+                {
+                    trans.Cancel();
+                    throw;
+                }
+                finally
+                {
+                    m_CreatingItem = false;
+                    if (!trans.Canceled)
+                        trans.Commit();
+                }
+            }
+        }
+
+        protected virtual void CreateGalleryContainer(object sender, EventArgs e)
+        {
+            OnSubItemsChanging();
+            CreateGalleryContainer(this.GetDefaultNewItemContainer());
+            OnSubItemsChanged();
+        }
+
+        protected virtual void CreateGalleryContainer(BaseItem parent)
+        {
+            if (parent == null)
+                return;
+
+            IDesignerHost dh = (IDesignerHost)GetService(typeof(IDesignerHost));
+            if (dh != null)
+            {
+                DesignerTransaction trans = dh.CreateTransaction("Adding new item");
+                try
+                {
+                    m_CreatingItem = true;
+                    GalleryContainer item = dh.CreateComponent(typeof(GalleryContainer)) as GalleryContainer;
+                    if (item == null)
+                        return;
+                    IComponentChangeService cc = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+                    if (parent != this.GetDefaultNewItemContainer() && cc != null)
+                        cc.OnComponentChanging(parent, TypeDescriptor.GetProperties(typeof(BaseItem))["SubItems"]);
+
+                    parent.SubItems.Add(item);
+                    this.RecalcLayout();
+
+                    if (parent != this.GetDefaultNewItemContainer() && cc != null)
+                        cc.OnComponentChanged(parent, TypeDescriptor.GetProperties(typeof(BaseItem))["SubItems"], null, null);
+
+                    OnitemCreated(item);
+                }
+                catch
+                {
+                    trans.Cancel();
+                    throw;
+                }
+                finally
+                {
+                    m_CreatingItem = false;
+                    if (!trans.Canceled)
+                        trans.Commit();
+                }
+            }
+        }
+
+        protected virtual void CreateCustomizeItem(object sender, EventArgs e)
+        {
+            OnSubItemsChanging();
+            CreateCustomizeItem(this.GetDefaultNewItemContainer());
+            OnSubItemsChanged();
+        }
+
+        protected virtual void CreateCustomizeItem(BaseItem parent)
+        {
+            if (parent == null)
+                return;
+
+            IDesignerHost dh = (IDesignerHost)GetService(typeof(IDesignerHost));
+            if (dh != null)
+            {
+                DesignerTransaction trans = dh.CreateTransaction("Adding new item");
+                try
+                {
+                    m_CreatingItem = true;
+                    CustomizeItem item = dh.CreateComponent(typeof(CustomizeItem)) as CustomizeItem;
+                    if (item == null)
+                        return;
+                    IComponentChangeService cc = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+                    if (parent != this.GetDefaultNewItemContainer() && cc != null)
+                        cc.OnComponentChanging(parent, TypeDescriptor.GetProperties(typeof(BaseItem))["SubItems"]);
+
+                    parent.SubItems.Add(item);
+                    this.RecalcLayout();
+
+                    if (parent != this.GetDefaultNewItemContainer() && cc != null)
+                        cc.OnComponentChanged(parent, TypeDescriptor.GetProperties(typeof(BaseItem))["SubItems"], null, null);
+
+                    OnitemCreated(item);
+                }
+                catch
+                {
+                    trans.Cancel();
+                    throw;
+                }
+                finally
+                {
+                    m_CreatingItem = false;
+                    if (!trans.Canceled)
+                        trans.Commit();
+                }
+            }
+        }
+
+        protected virtual void CreateMdiWindowList(object sender, EventArgs e)
+        {
+            OnSubItemsChanging();
+            CreateMdiWindowList(this.GetDefaultNewItemContainer());
+            OnSubItemsChanged();
+        }
+
+        protected virtual void CreateMdiWindowList(BaseItem parent)
+        {
+            if (parent == null)
+                return;
+
+            IDesignerHost dh = (IDesignerHost)GetService(typeof(IDesignerHost));
+            if (dh != null)
+            {
+                DesignerTransaction trans = dh.CreateTransaction("Adding new item");
+                try
+                {
+                    m_CreatingItem = true;
+                    MdiWindowListItem item = dh.CreateComponent(typeof(MdiWindowListItem)) as MdiWindowListItem;
+                    if (item == null)
+                        return;
+                    IComponentChangeService cc = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+                    if (parent != this.GetDefaultNewItemContainer() && cc != null)
+                        cc.OnComponentChanging(parent, TypeDescriptor.GetProperties(typeof(BaseItem))["SubItems"]);
+
+                    parent.SubItems.Add(item);
+                    this.RecalcLayout();
+
+                    if (parent != this.GetDefaultNewItemContainer() && cc != null)
+                        cc.OnComponentChanged(parent, TypeDescriptor.GetProperties(typeof(BaseItem))["SubItems"], null, null);
+
+                    OnitemCreated(item);
+                }
+                catch
+                {
+                    trans.Cancel();
+                    throw;
+                }
+                finally
+                {
+                    m_CreatingItem = false;
+                    if (!trans.Canceled)
+                        trans.Commit();
+                }
+            }
+        }
+
+        protected virtual void CreateSliderItem(object sender, EventArgs e)
+        {
+            OnSubItemsChanging();
+            CreateSliderItem(this.GetDefaultNewItemContainer());
+            OnSubItemsChanged();
+        }
+
+        protected virtual void CreateRangeSliderItem(object sender, EventArgs e)
+        {
+            OnSubItemsChanging();
+            CreateRangeSliderItem(this.GetDefaultNewItemContainer());
+            OnSubItemsChanged();
+        }
+        protected virtual void CreateRangeSliderItem(BaseItem parent)
+        {
+            if (parent == null)
+                return;
+
+            IDesignerHost dh = (IDesignerHost)GetService(typeof(IDesignerHost));
+            if (dh != null)
+            {
+                DesignerTransaction trans = dh.CreateTransaction("Adding new item");
+                try
+                {
+                    m_CreatingItem = true;
+                    RangeSliderItem item = dh.CreateComponent(typeof(RangeSliderItem)) as RangeSliderItem;
+                    if (item == null)
+                        return;
+
+                    TypeDescriptor.GetProperties(item)["Text"].SetValue(item, item.Name);
+
+                    IComponentChangeService cc = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+                    if (parent != this.GetDefaultNewItemContainer() && cc != null)
+                        cc.OnComponentChanging(parent, TypeDescriptor.GetProperties(typeof(BaseItem))["SubItems"]);
+
+                    parent.SubItems.Add(item);
+                    this.RecalcLayout();
+
+                    if (parent != this.GetDefaultNewItemContainer() && cc != null)
+                        cc.OnComponentChanged(parent, TypeDescriptor.GetProperties(typeof(BaseItem))["SubItems"], null, null);
+
+                    OnitemCreated(item);
+                }
+                catch
+                {
+                    trans.Cancel();
+                    throw;
+                }
+                finally
+                {
+                    m_CreatingItem = false;
+                    if (!trans.Canceled)
+                        trans.Commit();
+                }
+            }
+        }
+        protected virtual void CreateSliderItem(BaseItem parent)
+        {
+            if (parent == null)
+                return;
+
+            IDesignerHost dh = (IDesignerHost)GetService(typeof(IDesignerHost));
+            if (dh != null)
+            {
+                DesignerTransaction trans = dh.CreateTransaction("Adding new item");
+                try
+                {
+                    m_CreatingItem = true;
+                    SliderItem item = dh.CreateComponent(typeof(SliderItem)) as SliderItem;
+                    if (item == null)
+                        return;
+                    
+                    TypeDescriptor.GetProperties(item)["Text"].SetValue(item, item.Name);
+
+                    IComponentChangeService cc = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+                    if (parent != this.GetDefaultNewItemContainer() && cc != null)
+                        cc.OnComponentChanging(parent, TypeDescriptor.GetProperties(typeof(BaseItem))["SubItems"]);
+
+                    parent.SubItems.Add(item);
+                    this.RecalcLayout();
+
+                    if (parent != this.GetDefaultNewItemContainer() && cc != null)
+                        cc.OnComponentChanged(parent, TypeDescriptor.GetProperties(typeof(BaseItem))["SubItems"], null, null);
+
+                    OnitemCreated(item);
+                }
+                catch
+                {
+                    trans.Cancel();
+                    throw;
+                }
+                finally
+                {
+                    m_CreatingItem = false;
+                    if (!trans.Canceled)
+                        trans.Commit();
+                }
+            }
+        }
+        protected virtual void OnitemCreated(BaseItem item) {}
+		protected virtual void OnSubItemsChanging() {}
+		protected virtual void OnSubItemsChanged() {}
+
+		protected virtual eDotNetBarStyle InternalStyle
+		{
+			get {return eDotNetBarStyle.Office2003;}
+		}
+		#endregion
+
+		#region Drag & Drop support
+		private void TimerTickDragDrop(object sender, EventArgs e)
+		{
+			Point p=this.Control.PointToClient(System.Windows.Forms.Control.MousePosition);
+			if(this.Control.Bounds.Contains(p))
+				m_DragLeave=false;
+			else
+				m_DragLeave=true;
+
+			if(System.Windows.Forms.Control.MouseButtons!=MouseButtons.Left)
+			{
+				m_TimerDragDrop.Enabled=false;
+				m_TimerDragDrop.Stop();
+				m_TimerDragDrop.Tick-=new EventHandler(TimerTickDragDrop);
+				m_TimerDragDrop.Dispose();
+				m_TimerDragDrop=null;
+				if(m_ControlRemoved)
+				{
+					m_ControlRemoved=false;
+					ISelectionService sel=this.GetService(typeof(ISelectionService)) as ISelectionService;
+					if(sel!=null && sel.PrimarySelection is System.Windows.Forms.Control)
+						ControlRemoved((System.Windows.Forms.Control)sel.PrimarySelection);
+				}
+                else if (m_DragInProgress)
+                {
+                    if (m_DragLeave)
+                    {
+                        ControlContainerItem cc = m_DragItem as ControlContainerItem;
+                        MouseDragDrop(-1, -1);
+                        if (cc != null)
+                        {
+                            cc.Control = null;
+                            DestroyComponent(cc);
+                        }
+                    }
+                }
+			}
+		}
+
+        protected override void OnDragLeave(EventArgs e)
+        {
+            if (m_DragInProgress && m_AcceptExternalControls && !this.IsDockableWindow)
+            {
+                MouseDragDrop(-1, -1);
+            }
+            base.OnDragLeave(e);
+        }
+
+		protected override void OnDragOver(DragEventArgs de)
+		{
+			if(m_DragInProgress)
+			{
+				Point p=this.Control.PointToClient(new Point(de.X,de.Y));
+				MouseDragOver(p.X,p.Y);
+				de.Effect=DragDropEffects.Move;
+				return;
+			}
+
+			if(m_EnableItemDragDrop && m_AcceptExternalControls && !this.IsDockableWindow)
+			{
+				ISelectionService sel=(ISelectionService)this.GetService(typeof(ISelectionService));
+				if(sel!=null && sel.PrimarySelection!=this.Component)
+				{
+					if(sel.PrimarySelection is Control && this.Control.Controls.Contains((Control)sel.PrimarySelection))
+					{			
+						BaseItem item=GetControlItem(sel.PrimarySelection as Control);
+						if(item!=null)
+						{
+							m_MouseDownPoint=this.Control.PointToClient(new Point(de.X,de.Y));
+							m_SuspendInternalCursor=true;
+							StartItemDrag(item);
+							if(m_TimerDragDrop==null)
+							{
+								m_TimerDragDrop=new Timer();
+								m_TimerDragDrop.Tick+=new EventHandler(this.TimerTickDragDrop);
+								m_TimerDragDrop.Interval=100;
+								m_TimerDragDrop.Enabled=true;
+								m_TimerDragDrop.Start();
+							}
+						}
+						return;
+					}
+					else if(sel.SelectionCount>1)
+					{
+						de.Effect=DragDropEffects.None;
+						return;
+					}
+					else if(sel.PrimarySelection is Control && ((Control)sel.PrimarySelection).Parent!=null)
+					{
+						// New control being added to the container
+						BaseItem dragItem=null;
+						if(this.IsDockableWindow)
+						{
+							DockContainerItem dc=new DockContainerItem();
+							dc.Name=TEMP_NAME;
+							//dc.Control=sel.PrimarySelection as System.Windows.Forms.Control;
+							dragItem=dc;
+						}
+						else
+						{
+							ControlContainerItem cc=new ControlContainerItem();
+                            cc.AllowItemResize = false;
+							cc.Name=TEMP_NAME;
+							//cc.Control=sel.PrimarySelection as System.Windows.Forms.Control;
+							dragItem=cc;
+						}
+						m_MouseDownPoint=this.Control.PointToClient(new Point(de.X,de.Y));
+						m_SuspendInternalCursor=true;
+						StartItemDrag(dragItem);
+                        if (m_TimerDragDrop == null)
+                        {
+                            m_TimerDragDrop = new Timer();
+                            m_TimerDragDrop.Tick += new EventHandler(this.TimerTickDragDrop);
+                            m_TimerDragDrop.Interval = 100;
+                            m_TimerDragDrop.Enabled = true;
+                            m_TimerDragDrop.Start();
+                        }
+					}
+				}
+			}
+			base.OnDragOver (de);
+		}
+
+		protected override void OnDragDrop(DragEventArgs de)
+		{
+			if(m_EnableItemDragDrop && m_AcceptExternalControls && !this.IsDockableWindow)
+			{
+				ISelectionService sel=(ISelectionService)this.GetService(typeof(ISelectionService));
+				if(sel!=null && sel.PrimarySelection is Control && this.Control.Controls.Contains((Control)sel.PrimarySelection))
+				{
+					de.Effect=DragDropEffects.Move;
+					Point p=this.Control.PointToClient(new Point(de.X,de.Y));
+					MouseDragDrop(p.X,p.Y);
+				}
+				else
+				{
+					if(sel.SelectionCount>1)
+					{
+						de.Effect=DragDropEffects.None;
+						return;
+					}
+					else
+					{
+						if(m_DragItem!=null && m_DragItem.Name==TEMP_NAME && (m_DragItem is ControlContainerItem || m_DragItem is DockContainerItem))
+						{
+							m_JustAdded=DateTime.Now;
+							BaseItem dragItem=null;
+							if(m_DragItem is ControlContainerItem)
+							{
+								ControlContainerItem cc=m_DragItem as ControlContainerItem;
+								cc.Control=null;
+                                cc = this.CreateComponent(typeof(ControlContainerItem)) as ControlContainerItem;
+                                TypeDescriptor.GetProperties(cc)["Control"].SetValue(cc, sel.PrimarySelection as System.Windows.Forms.Control);
+                                TypeDescriptor.GetProperties(cc)["AllowItemResize"].SetValue(cc, false);
+                                dragItem = cc;
+							}
+							else if(m_DragItem is DockContainerItem)
+							{
+								DockContainerItem dc=m_DragItem as DockContainerItem;
+								dc.Control=null;
+                                dc = this.CreateComponent(typeof(DockContainerItem)) as DockContainerItem;
+                                TypeDescriptor.GetProperties(dc)["Control"].SetValue(dc, sel.PrimarySelection as System.Windows.Forms.Control);
+                                dragItem = dc;
+							}
+							m_DragItem=dragItem;
+							Point p=this.Control.PointToClient(new Point(de.X,de.Y));
+							MouseDragDrop(p.X,p.Y);
+						}
+						m_NewControlAdded=true;
+					}
+				}
+			}
+		
+			base.OnDragDrop(de);
+		}
+
+		protected virtual BaseItem GetControlItem(System.Windows.Forms.Control control)
+		{
+			BaseItem parent=this.GetItemContainer();
+			if(parent==null)
+				return null;
+			return GetControlItem(control,parent);
+		}
+
+		internal BaseItem GetControlItem(System.Windows.Forms.Control control, BaseItem parent)
+		{
+			if(parent is ControlContainerItem && ((ControlContainerItem)parent).Control==control)
+				return parent;
+			else if(parent is DockContainerItem && ((DockContainerItem)parent).Control==control)
+				return parent;
+
+			foreach(BaseItem item in parent.SubItems)
+			{
+				BaseItem i2=GetControlItem(control,item);
+				if(i2!=null)
+					return i2;
+			}
+			return null;
+		}
+
+		protected virtual bool DragInProgress
+		{
+			get {return m_DragInProgress;}
+			set {m_DragInProgress=value;}
+		}
+
+		protected void StartItemDrag(BaseItem item)
+		{
+			if(item==null)
+				return;
+
+			if(m_DragItem==null)
+			{
+				m_DragItem=item;
+				if(!m_SuspendInternalCursor)
+					System.Windows.Forms.Cursor.Current=System.Windows.Forms.Cursors.Hand;
+				DragInProgress=true;
+			}
+		}
+
+		protected void MouseDragOver(int x, int y)
+		{
+			if(!m_DragInProgress)
+				return;
+			BaseItem dragItem=m_DragItem;
+			BaseItem container=this.GetItemContainer();
+			
+			if(m_DesignTimeProvider!=null)
+			{
+				m_DesignTimeProvider.DrawReversibleMarker(m_InsertPosition,m_InsertBefore);
+				m_DesignTimeProvider=null;
+			}
+            
+            Point pScreen = this.Control.PointToScreen(new Point(x, y));
+
+			Control control=this.GetItemContainerControl();
+			
+
+			InsertPosition pos=((IDesignTimeProvider)container).GetInsertPosition(pScreen, dragItem);
+				
+			if(pos!=null)
+			{
+				if(pos.TargetProvider==null)
+				{
+					// Cursor is over drag item
+					if(!m_SuspendInternalCursor)
+						System.Windows.Forms.Cursor.Current=System.Windows.Forms.Cursors.No;
+				}
+				else
+				{
+					pos.TargetProvider.DrawReversibleMarker(pos.Position,pos.Before);
+					m_InsertPosition=pos.Position;
+					m_InsertBefore=pos.Before;
+					m_DesignTimeProvider=pos.TargetProvider;
+					if(!m_SuspendInternalCursor)
+						System.Windows.Forms.Cursor.Current=System.Windows.Forms.Cursors.Hand;
+				}
+			}
+			else
+			{
+				if(!m_SuspendInternalCursor)
+					System.Windows.Forms.Cursor.Current=System.Windows.Forms.Cursors.No;
+			}
+		}
+
+        internal BaseItem DragItem
+        {
+            get { return m_DragItem; }
+        }
+
+        protected virtual void OnItemDragAndDropped(BaseItem dragItem)
+        {
+            IComponentChangeService cc = (IComponentChangeService)GetService(typeof(IComponentChangeService));
+            if (cc != null)
+                cc.OnComponentChanged(dragItem.Parent, TypeDescriptor.GetProperties(typeof(BaseItem))["SubItems"], null, null);
+            
+        }
+        internal void MouseDragDrop(int x, int y)
+		{
+			if(!m_DragInProgress)
+				return;
+            if (m_DesignerHost != null && m_DesignerHost.Capture)
+                m_DesignerHost.Capture = false;
+			BaseItem dragItem=m_DragItem;
+			BaseItem container=this.GetItemContainer();
+			bool changed=false;
+
+			if(m_DesignTimeProvider!=null)
+			{
+				if(x==-1 && y==-1)
+				{
+					// Cancel state
+					m_DesignTimeProvider.DrawReversibleMarker(m_InsertPosition, m_InsertBefore);
+				}
+				else
+				{
+					m_DesignTimeProvider.DrawReversibleMarker(m_InsertPosition, m_InsertBefore);
+					if(dragItem!=null)
+					{
+                        m_InternalRemoveInProgress = true;
+                        try
+                        {
+                            BaseItem objParent = dragItem.Parent;
+                            if (objParent != null)
+                            {
+                                if (objParent == (BaseItem)m_DesignTimeProvider && m_InsertPosition > 0)
+                                {
+                                    if (objParent.SubItems.IndexOf(dragItem) < m_InsertPosition)
+                                        m_InsertPosition--;
+                                }
+                                objParent.SubItems.Remove(dragItem);
+                            }
+                            m_DesignTimeProvider.InsertItemAt(dragItem, m_InsertPosition, m_InsertBefore);
+                            m_DesignTimeProvider = null;
+                            changed = true;
+                            if (dragItem.Parent != null && dragItem.Parent != this.GetItemContainer())
+                            {
+                                OnItemDragAndDropped(dragItem);
+                            }
+                        }
+                        finally
+                        {
+                            m_InternalRemoveInProgress = false;
+                        }
+					}
+				}
+			}
+			else if(x!=-1 && y!=-1 && dragItem is ControlContainerItem && ((ControlContainerItem)dragItem).Control!=null)
+			{
+                BaseItem parent = container;
+                if (dragItem.Parent != null)
+                    dragItem.Parent.SubItems.Remove(dragItem);
+                parent.SubItems.Add(dragItem);
+                OnItemDragAndDropped(dragItem);
+                changed = true;
+			}
+
+			m_DesignTimeProvider=null;
+			DragInProgress=false;
+			if(!m_SuspendInternalCursor)
+				System.Windows.Forms.Cursor.Current=System.Windows.Forms.Cursors.Default;
+			if(dragItem!=null)
+				dragItem._IgnoreClick=true;
+			container.InternalMouseUp(new MouseEventArgs(MouseButtons.Left,0,x,y,0));
+			if(dragItem!=null)
+				dragItem._IgnoreClick=false;
+
+			m_DragItem=null;
+			this.RecalcLayout();
+
+			if(changed)
+			{
+				IComponentChangeService cc=(IComponentChangeService)GetService(typeof(IComponentChangeService));
+				if(cc!=null)
+				{
+					cc.OnComponentChanged(this.Control,null,null,null);
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets whether drag and drop of BaseItems is enabled. Default is false.
+		/// </summary>
+		protected virtual bool EnableItemDragDrop
+		{
+			get {return m_EnableItemDragDrop;}
+			set {m_EnableItemDragDrop=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets whether dropping of external control into Bar is enabled. Default is false. 
+		/// </summary>
+		protected virtual bool AcceptExternalControls
+		{
+			get {return m_AcceptExternalControls;}
+			set {m_AcceptExternalControls=value;}
+		}
+
+		public void StartExternalDrag(BaseItem item)
+		{
+			if(!m_DragInProgress && m_DesignerHost!=null)
+			{
+				m_SuspendInternalCursor=false;
+				m_MouseDownPoint=this.Control.PointToClient(System.Windows.Forms.Control.MousePosition);
+				this.StartItemDrag(item);
+				m_DesignerHost.Capture=true;
+			}
+		}
+
+		protected virtual bool IsDockableWindow
+		{
+			get {return false;}
+		}
+
+		protected virtual void SelectComponent(IComponent comp, SelectionTypes selectionType)
+		{
+			ISelectionService selection = (ISelectionService) this.GetService(typeof(ISelectionService));
+			if(selection!=null && comp!=null)
+			{
+				ArrayList arr=new ArrayList(1);
+				arr.Add(comp);
+				selection.SetSelectedComponents(arr,selectionType);
+			}
+		}
+
+		protected virtual bool MouseDownSelectionPerformed
+		{
+			get {return m_MouseDownSelectionPerformed;}
+			set {m_MouseDownSelectionPerformed=value;}
+		}
+
+        protected virtual bool PassiveContainer
+        {
+            get { return m_PassiveContainer; }
+            set { m_PassiveContainer = value; }
+        }
+		#endregion
+
+		#region IDesignerServices Implementation
+		public object CreateComponent(System.Type componentClass)
+		{
+			IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+			if(dh==null)
+				return null;
+            object comp = null;
+            try
+            {
+                m_CreatingItem = true;
+                comp = dh.CreateComponent(componentClass);
+            }
+            finally
+            {
+                m_CreatingItem = false;
+            }
+
+            return comp;
+		}
+
+        public object CreateComponent(System.Type componentClass, string name)
+        {
+            IDesignerHost dh = (IDesignerHost)GetService(typeof(IDesignerHost));
+            if (dh == null)
+                return null;
+            object comp = null;
+            try
+            {
+                m_CreatingItem = true;
+                comp = dh.CreateComponent(componentClass, name);
+            }
+            finally
+            {
+                m_CreatingItem = false;
+            }
+
+            return comp;
+        }
+
+		public void DestroyComponent(IComponent c)
+		{
+			IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+			if(dh==null)
+				return;
+			dh.DestroyComponent(c);
+		}
+
+		object IDesignerServices.GetService(Type serviceType)
+		{
+			return this.GetService(serviceType);
+		}
+		#endregion
+
+		private void DesignerSelectionChanged(object sender, EventArgs e)
+		{
+			ISelectionService sel=this.GetService(typeof(ISelectionService)) as ISelectionService;
+			if(sel==null)
+			{
+				SetComponentSelected(false);
+				return;
+			}
+			bool selected=false;
+			if(sel.PrimarySelection==this.Control || sel.PrimarySelection==this.GetItemContainerControl())
+				selected=true;
+			else if(sel.PrimarySelection is BaseItem && ((BaseItem)sel.PrimarySelection).ContainerControl==this.GetItemContainerControl())
+				selected=true;
+
+			SetComponentSelected(selected);
+		}
+	}
+
+	#region IDesignerServices
+	/// <summary>
+	/// Classes used for internal support of design-time features.
+	/// </summary>
+	public interface IDesignerServices
+	{
+		/// <summary>
+		/// Creates new component.
+		/// </summary>
+		/// <param name="componentClass">Component type to create</param>
+		/// <returns>New instance of component</returns>
+		object CreateComponent(System.Type componentClass);
+
+        /// <summary>
+        /// Creates new component.
+        /// </summary>
+        /// <param name="componentClass">Component type to create</param>
+        /// <param name="name">Name to assign to component</param>
+        /// <returns>New instance of component</returns>
+        object CreateComponent(System.Type componentClass, string name);
+
+		/// <summary>
+		/// Destroys component
+		/// </summary>
+		/// <param name="c">Component to destroy</param>
+		void DestroyComponent(IComponent c);
+
+		/// <summary>
+		/// Gets specified designer service.
+		/// </summary>
+		/// <param name="serviceType">Type of the service to get</param>
+		/// <returns>Returns reference to the service.</returns>
+		object GetService(Type serviceType);
+	}
+	#endregion
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/BarDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/BarDesigner.cs
new file mode 100644
index 00000000..39d3e2be
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/BarDesigner.cs	
@@ -0,0 +1,1092 @@
+using System;
+using System.ComponentModel;
+using System.ComponentModel.Design;
+using System.Windows.Forms;
+using System.ComponentModel.Design.Serialization;
+using System.CodeDom;
+using System.Drawing;
+using System.Collections;
+using System.Windows.Forms.Design;
+using System.Drawing.Design;
+
+namespace DevComponents.DotNetBar.Design
+{
+	/// <summary>
+	/// Represents Windows Forms designer for Bar control.
+	/// </summary>
+	public class BarDesigner:BarBaseControlDesigner
+	{
+		#region Internal Implementation
+		private int m_MouseDownSelectedTabIndex=-1;
+		private bool m_IsDocking=false;
+		private Form m_OutlineForm=null;
+		private DockSiteInfo m_DockInfo;
+		private bool m_DragDrop=false;
+
+		public BarDesigner():base()
+		{
+			m_DockInfo=new DockSiteInfo();
+			this.EnableItemDragDrop=true;
+		}
+
+        public override void Initialize(IComponent component)
+        {
+            base.Initialize(component);
+            Bar bar = component as Bar;
+            if (bar != null) bar.SetDesignMode(true);
+			IDesignerHost ds=GetService(typeof(IDesignerHost)) as IDesignerHost;
+			if(ds!=null)
+				ds.LoadComplete += new EventHandler(this.DesignerLoadComplete);
+        }
+
+		public override DesignerVerbCollection Verbs 
+		{
+			get 
+			{
+				Bar bar=this.Control as Bar;
+				DesignerVerb[] verbs=null;
+				if(this.IsDockableWindow)
+				{
+					
+                    verbs = new DesignerVerb[]
+					{
+						new DesignerVerb("Create Dock Tab", new EventHandler(CreateDocument))};
+				}
+				else
+				{
+					verbs = new DesignerVerb[]
+						{
+							new DesignerVerb("Add Button", new EventHandler(CreateButton)),
+							new DesignerVerb("Add Text Box", new EventHandler(CreateTextBox)),
+							new DesignerVerb("Add Combo Box", new EventHandler(CreateComboBox)),
+							new DesignerVerb("Add Label", new EventHandler(CreateLabel)),
+                            new DesignerVerb("Add Color Picker", new EventHandler(CreateColorPicker)),
+                            new DesignerVerb("Add Container", new EventHandler(CreateContainer)),
+							new DesignerVerb("Add Progress-Bar", new EventHandler(CreateProgressBar)),
+                            new DesignerVerb("Add Circular Progress", new EventHandler(CreateCircularProgressItem)),
+                            new DesignerVerb("Add Micro-Chart", new EventHandler(CreateMicroChart)),
+                            new DesignerVerb("Add Switch Button", new EventHandler(CreateSwitch)),
+							new DesignerVerb("Add Color Picker", new EventHandler(CreateColorPicker)),
+                            new DesignerVerb("Add Check Box", new EventHandler(CreateCheckBox)),
+                            new DesignerVerb("Add Slider", new EventHandler(CreateSliderItem)),
+                            new DesignerVerb("Add Range Slider", new EventHandler(CreateRangeSliderItem)),
+                            new DesignerVerb("Add Customize Item", new EventHandler(CreateCustomizeItem)),
+                            new DesignerVerb("Add MDI Window List Item", new EventHandler(CreateMdiWindowList)),
+                            new DesignerVerb("Add Rating Item", new EventHandler(CreateRatingItem)),
+                            new DesignerVerb("Add Control Container", new EventHandler(CreateControlContainer))
+							};
+				}
+				
+				return new DesignerVerbCollection(verbs);
+			}
+		}
+
+        protected override void PreFilterProperties(System.Collections.IDictionary properties)
+        {
+            base.PreFilterProperties(properties);
+
+            properties["AutoHide"] = TypeDescriptor.CreateProperty(
+                this.GetType(),
+                "AutoHide",
+                typeof(bool),
+                new Attribute[] { new BrowsableAttribute(true), new DefaultValueAttribute(false), 
+                    new CategoryAttribute("Auto-Hide"),
+                    new DescriptionAttribute("Indicates whether Bar is in auto-hide state. Applies to non-document dockable bars only.") });
+
+            properties["CanCustomize"] = TypeDescriptor.CreateProperty(
+                this.GetType(),
+                "CanCustomize",
+                typeof(bool),
+                new Attribute[] { new BrowsableAttribute(true), new DefaultValueAttribute(true), 
+                    new CategoryAttribute("Behavior"),
+                    new DescriptionAttribute("Gets or sets whether items on the Bar can be customized.") });
+
+            properties["Style"] = TypeDescriptor.CreateProperty(
+                this.GetType(),
+                "Style",
+                typeof(eDotNetBarStyle),
+                new Attribute[] { new BrowsableAttribute(true), new DefaultValueAttribute(eDotNetBarStyle.OfficeXP), 
+                    new CategoryAttribute("Appearance"),
+                    new DescriptionAttribute("Gets or sets the control style.") });
+        }
+
+        /// <summary>
+        /// Gets/Sets the visual style of the Bar.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), Description("Specifies the visual style of the Bar."), DefaultValue(eDotNetBarStyle.OfficeXP)]
+        public eDotNetBarStyle Style
+        {
+            get
+            {
+                Bar b = this.Control as Bar;
+                return b.Style;
+            }
+            set
+            {
+                Bar b = this.Control as Bar;
+                bool isChanged = (b.Style != value);
+                b.Style = value;
+                if (isChanged && b.Owner is DotNetBarManager)
+                {
+                    IDesignerHost ds = GetService(typeof(IDesignerHost)) as IDesignerHost;
+                    if (ds != null && !ds.Loading)
+                    {
+                        DotNetBarManager dnb = b.Owner as DotNetBarManager;
+                        TypeDescriptor.GetProperties(dnb)["Style"].SetValue(dnb, value);
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether items on the Bar can be customized.
+        /// </summary>
+        [Browsable(true), Category("Behavior"), Description("Gets or sets whether items on the Bar can be customized."), DefaultValue(true)]
+        public bool CanCustomize
+        {
+            get
+            {
+                return (bool)ShadowProperties["CanCustomize"];
+            }
+            set
+            {
+                ShadowProperties["CanCustomize"] = value;
+            }
+        }
+
+		private void DesignerLoadComplete(object sender, EventArgs e)
+		{
+			if(this.IsDockableWindow)
+			{
+				Bar bar= this.Control as Bar;
+				DockContainerItem dc = bar.SelectedDockContainerItem;
+				if(dc!=null && dc.Control!=null)
+				{
+					if(bar.Controls.IndexOf(dc.Control)>0)
+						bar.Controls.SetChildIndex(dc.Control, 0);
+				}
+			}
+
+			IDesignerHost ds=GetService(typeof(IDesignerHost)) as IDesignerHost;
+			if(ds!=null)
+				ds.LoadComplete -= new EventHandler(this.DesignerLoadComplete);
+		}
+
+        /// <summary>
+        /// Indicates whether Bar is in auto-hide state.
+        /// </summary>
+        [Browsable(true), DefaultValue(false), Description("Indicates whether Bar is in auto-hide state. Applies to non-document dockable bars only.")]
+        public bool AutoHide
+        {
+            set
+            {
+                ShadowProperties["AutoHide"] = value;
+            }
+            get
+            {
+                return (bool)ShadowProperties["AutoHide"];
+            }
+        }
+        //public override void DoDefaultAction()
+        //{
+        //    ISelectionService selection = (ISelectionService) this.GetService(typeof(ISelectionService));
+        //    if(!this.IsDockableWindow && selection!=null && selection.PrimarySelection==this.Control)
+        //        OpenDesigner();
+        //    else
+        //        base.DoDefaultAction();
+        //}
+
+        //private void OpenDesigner()
+        //{
+        //    Bar bar=this.Control as Bar;
+        //    if(bar!=null)	
+        //    {
+        //        DotNetBarManagerDesigner.OpenDesignerEditor(null,bar,this);
+        //    }
+        //}
+
+#if FRAMEWORK20
+        public override void InitializeNewComponent(IDictionary defaultValues)
+        {
+            base.InitializeNewComponent(defaultValues);
+            SetDesignTimeDefaults();
+        }
+#else
+		public override void OnSetComponentDefaults()
+		{
+			base.OnSetComponentDefaults();
+			SetDesignTimeDefaults();
+		}
+#endif
+
+        protected virtual void SetDesignTimeDefaults()
+        {
+            Bar bar = this.Component as Bar;
+            if (bar == null)
+                return;
+            bar.Style = eDotNetBarStyle.StyleManagerControlled;
+            bar.AntiAlias = true;
+        }
+
+		protected override BaseItem GetItemContainer()
+		{
+			Bar bar=this.Control as Bar;
+			if(bar!=null)
+				return bar.ItemsContainer;
+			return null;
+		}
+
+		protected override void RecalcLayout()
+		{
+			Bar bar=this.GetItemContainerControl() as Bar;
+			if(bar!=null)
+				bar.RecalcLayout();
+		}
+
+		protected override void OnSubItemsChanging()
+		{
+			base.OnSubItemsChanging();
+			IComponentChangeService change=this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+			if(change!=null)
+			{
+				Bar bar=this.GetItemContainerControl() as Bar;
+				change.OnComponentChanging(this.Component,TypeDescriptor.GetProperties(bar).Find("Items",true));
+			}
+		}
+
+		protected override void OnSubItemsChanged()
+		{
+			base.OnSubItemsChanged();
+			IComponentChangeService change=this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+			if(change!=null)
+			{
+				Bar bar=this.GetItemContainerControl() as Bar;
+				change.OnComponentChanged(this.Component,TypeDescriptor.GetProperties(bar).Find("Items",true),null,null);
+			}
+		}
+
+		
+		#endregion
+
+		#region Support For Dockable Windows
+
+		public override SelectionRules SelectionRules
+		{
+			get
+			{
+				if(this.IsDockableWindow || this.Control.Parent is DockSite)
+					return (SelectionRules.Locked);
+				return base.SelectionRules;
+			}
+		}
+
+		public override bool CanParent(Control control)
+		{
+			if(control.Contains(this.Control) || control is Bar)
+				return false;
+			if(this.IsDockableWindow && !(control is PanelDockContainer))
+				return false;
+			return base.CanParent(control);
+		}
+
+		protected override bool IsDockableWindow
+		{
+			get
+			{
+				Bar bar=this.Control as Bar;
+				if(bar!=null && bar.LayoutType==eLayoutType.DockContainer)
+					return true;
+				return false;
+			}
+		}
+
+        private bool IsDockableToolbar
+        {
+            get
+            {
+                Bar bar = this.Control as Bar;
+                if (bar != null && bar.LayoutType == eLayoutType.Toolbar && bar.Parent is DockSite)
+                    return true;
+                return false;
+            }
+        }
+
+        private bool IsDocumentDock
+        {
+            get
+            {
+                Bar bar = this.Control as Bar;
+                if (bar == null || bar.LayoutType != eLayoutType.DockContainer)
+                    return false;
+                if (bar.Parent is DockSite && bar.Parent.Dock == DockStyle.Fill)
+                    return true;
+                return false;
+            }
+        }
+
+		private void SelectDockTab(int index)
+		{
+			Bar bar=this.Control as Bar;
+			if(bar==null) return;
+
+			IComponentChangeService cc=(IComponentChangeService)GetService(typeof(IComponentChangeService));
+			if(cc!=null)
+				cc.OnComponentChanging(bar,TypeDescriptor.GetProperties(typeof(Bar))["SelectedDockTab"]);
+			bar.SelectedDockTab=index;
+			if(cc!=null)
+				cc.OnComponentChanged(bar,TypeDescriptor.GetProperties(typeof(Bar))["SelectedDockTab"],null,null);
+			if(bar.SelectedDockTab>=0)
+			{
+#if FRAMEWORK20
+                SelectComponent(bar.Items[bar.SelectedDockTab], SelectionTypes.Primary);
+#else
+                SelectComponent(bar.Items[bar.SelectedDockTab],SelectionTypes.MouseDown);
+#endif
+                DockContainerItem dock=bar.Items[bar.SelectedDockTab] as DockContainerItem;
+				if(dock!=null && dock.Control!=null)
+				{
+					if(cc!=null)
+						cc.OnComponentChanging(bar,TypeDescriptor.GetProperties(typeof(Bar))["Controls"]);
+					dock.Control.BringToFront();
+					if(cc!=null)
+						cc.OnComponentChanged(bar,TypeDescriptor.GetProperties(typeof(Bar))["Controls"],null,null);
+				}
+			}
+		}
+
+		protected override eDotNetBarStyle InternalStyle
+		{
+			get
+			{
+				Bar bar=this.Control as Bar;
+				if(bar!=null)
+					return bar.Style;
+				return base.InternalStyle;;
+			}
+		}
+        
+		protected override void OtherComponentRemoving(object sender, ComponentEventArgs e)
+		{
+			Bar bar=this.Control as Bar;
+			if(e.Component is Control)
+			{
+				BaseItem item=GetControlItem(e.Component as Control);
+				if(item!=null && item.Parent!=null && item.Parent.SubItems.Contains(item))
+				{
+					if(item is DockContainerItem)
+						((DockContainerItem)item).Control=null;
+                    else if(item is ControlContainerItem)
+                        ((ControlContainerItem)item).Control = null;
+                    if (item.Parent != null)
+                        item.Parent.SubItems.Remove(item);
+					DestroySubItems(item);
+					this.RecalcLayout();
+					if(bar!=null && bar.Items.Count>0)
+						SelectDockTab(0);
+				}
+			}
+			else if(!m_InternalRemoving && bar!=null && e.Component is DockContainerItem && bar.Items.Contains((BaseItem)e.Component))
+			{
+				// Throw exception to stop removing the last dock container item.
+                //if(bar.VisibleItemCount==1)
+                //    throw new InvalidOperationException("Cannot delete last DockContainerItem object. Select and Delete Bar object instead");
+			}
+			base.OtherComponentRemoving(sender,e);
+		}
+
+		protected override bool OnMouseDown(ref Message m, MouseButtons mb)
+		{
+			Bar bar=this.Control as Bar;
+			if(!this.IsDockableWindow || bar==null)
+				return base.OnMouseDown(ref m, mb);
+			Point p=Control.MousePosition;
+			int i=GetTabAt(p.X,p.Y);
+			if(i>=0 && m.Msg==WinApi.WM_RBUTTONDOWN)
+			{
+				ISelectionService selection = (ISelectionService) this.GetService(typeof(ISelectionService));
+				if(selection!=null && selection.PrimarySelection!=bar.Items[i])
+				{
+					ArrayList arr=new ArrayList(1);
+					arr.Add(bar.Items[i]);
+#if FRAMEWORK20
+                    selection.SetSelectedComponents(arr, SelectionTypes.Primary);
+#else
+                    selection.SetSelectedComponents(arr,SelectionTypes.MouseDown);
+#endif
+
+                    SelectDockTab(i);
+					this.OnContextMenu(System.Windows.Forms.Control.MousePosition.X,System.Windows.Forms.Control.MousePosition.Y);
+					return true;
+				}
+			}
+
+
+			return base.OnMouseDown(ref m, mb);
+		}
+
+		protected override void OnMouseDragBegin(int x, int y)
+		{
+			Bar bar=this.Control as Bar;
+			m_DragDrop=false;
+
+			if(bar!=null && this.IsDockableWindow)
+			{
+				m_MouseDownSelectedTabIndex=GetTabAt(x,y);
+				if(m_MouseDownSelectedTabIndex!=-1)
+				{
+					if(bar.SelectedDockTab!=m_MouseDownSelectedTabIndex)
+						SelectDockTab(m_MouseDownSelectedTabIndex);
+					m_DragDrop=true;
+				}
+				else if(IsInTabSystemBox(x,y))
+				{
+					MouseDownTabSystemBox(x,y);
+				}
+				else if(IsCaptionGrabHandle(bar))
+				{
+					Point clientPos=bar.PointToClient(new Point(x,y));
+					if(bar.GrabHandleRect.Contains(clientPos))
+						m_DragDrop=true;
+				}
+			}
+            else if (bar != null && this.IsDockableToolbar && bar.GrabHandleStyle != eGrabHandleStyle.None)
+            {
+                Point clientPos = bar.PointToClient(new Point(x, y));
+                if (bar.GrabHandleRect.Contains(clientPos))
+                    m_DragDrop = true;
+            }
+
+			base.OnMouseDragBegin(x,y);
+			
+			if(m_MouseDownSelectedTabIndex!=-1)
+			{
+				ISelectionService selection = (ISelectionService) this.GetService(typeof(ISelectionService));
+				if(selection!=null && selection.PrimarySelection!=bar.Items[m_MouseDownSelectedTabIndex])
+				{
+					ArrayList arr=new ArrayList(1);
+					arr.Add(bar.Items[m_MouseDownSelectedTabIndex]);
+#if FRAMEWORK20
+                    selection.SetSelectedComponents(arr, SelectionTypes.Primary);
+#else
+                    selection.SetSelectedComponents(arr,SelectionTypes.Click);
+#endif
+                }
+			}
+
+			if(m_DragDrop)
+			{
+				bar.Capture = true;
+				if (IsDocumentDock)
+				{
+					WinApi.RECT rect = new WinApi.RECT(0, 0, 0, 0);
+					WinApi.GetWindowRect(bar.Parent.Handle, ref rect);
+					Rectangle r = Rectangle.FromLTRB(rect.Left, rect.Top, rect.Right, rect.Bottom);
+					Cursor.Clip = r;
+				}
+				#if !FRAMEWORK20
+				else
+				{
+					Cursor.Clip = Rectangle.Empty;
+				}
+				#endif
+			}
+		}
+
+		private bool IsCaptionGrabHandle(Bar bar)
+		{
+			return (bar.GrabHandleStyle==eGrabHandleStyle.Caption || bar.GrabHandleStyle==eGrabHandleStyle.CaptionTaskPane);
+		}
+
+		protected override void OnMouseDragMove(int x, int y)
+		{
+			if(!this.IsDockableWindow && !this.IsDockableToolbar || !m_DragDrop)
+			{
+				base.OnMouseDragMove(x,y);
+				return;
+			}
+
+			Point screenPos=new Point(x,y);
+			
+			Bar bar=this.Control as Bar;
+			if(bar==null) return;
+
+            if (this.IsDockableToolbar)
+            {
+                IOwnerBarSupport ownerDock = bar.Owner as IOwnerBarSupport;
+                m_DockInfo = ownerDock.GetDockInfo(bar, screenPos.X, screenPos.Y);
+                if (m_DockInfo.objDockSite != null)
+                {
+                    IComponentChangeService cc = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+                    Control oldParent = null;
+                    bool offsetChange = false;
+                    if (m_DockInfo.objDockSite != bar.Parent)
+                    {
+                        oldParent = bar.Parent;
+                        cc.OnComponentChanging(bar.Parent, null);
+                        cc.OnComponentChanging(bar, TypeDescriptor.GetProperties(bar)["DockSide"]);
+                    }
+                    cc.OnComponentChanging(m_DockInfo.objDockSite, null);
+
+                    if (m_DockInfo.DockOffset != bar.DockOffset)
+                    {
+                        offsetChange = true;
+                        cc.OnComponentChanging(bar, TypeDescriptor.GetProperties(bar)["DockOffset"]);
+                        cc.OnComponentChanging(bar, TypeDescriptor.GetProperties(bar)["Location"]);
+                    }
+
+                    bar.DockingHandler(m_DockInfo, screenPos);
+
+                    if (oldParent != null)
+                    {
+                        cc.OnComponentChanged(bar, TypeDescriptor.GetProperties(bar)["DockSide"], null, null);
+                        cc.OnComponentChanged(oldParent, null, null, null);
+                    }
+
+                    cc.OnComponentChanged(m_DockInfo.objDockSite, null, null, null);
+                    if (offsetChange)
+                    {
+                        cc.OnComponentChanged(bar, TypeDescriptor.GetProperties(bar)["DockOffset"], null, null);
+                        cc.OnComponentChanged(bar, TypeDescriptor.GetProperties(bar)["Location"], null, null);
+                    }
+                }
+                bar.Refresh();
+                return;
+            }
+
+            Point tabPos = Point.Empty;
+            if (bar.DockTabControl != null) tabPos = bar.DockTabControl.PointToClient(screenPos);
+
+			if(bar.DockTabControl!=null && bar.DockTabControl.ClientRectangle.Contains(tabPos))
+			{
+				if(m_IsDocking)
+				{
+					EndBarOwnerDocking(bar);
+					m_IsDocking=false;
+					m_DockInfo=new DockSiteInfo();
+				}
+				MouseEventArgs e=new MouseEventArgs(MouseButtons.Left,0,tabPos.X,tabPos.Y,0);
+				bar.DockTabControl.InternalOnMouseMove(e);
+			}
+			else
+			{
+				m_IsDocking=true;
+				IOwnerBarSupport ownerDock=bar.Owner as IOwnerBarSupport;
+				m_DockInfo=ownerDock.GetDockInfo(bar,screenPos.X,screenPos.Y);
+				if(m_DockInfo.objDockSite==null)
+				{
+					if(m_OutlineForm!=null)
+						m_OutlineForm.Hide();
+				}
+				else
+				{
+					Rectangle r=m_DockInfo.objDockSite.GetBarDockRectangle(bar,ref m_DockInfo);
+					if(!r.IsEmpty)
+					{
+						if(m_OutlineForm==null)
+							m_OutlineForm=bar.CreateOutlineForm();
+                        WinApi.SetWindowPos(m_OutlineForm.Handle, WinApi.HWND_TOP, r.X, r.Y, r.Width, r.Height, WinApi.SWP_SHOWWINDOW | WinApi.SWP_NOACTIVATE);
+					}
+					else if(m_OutlineForm!=null)
+						m_OutlineForm.Hide();
+				}
+			}
+		}
+
+		protected override void OnMouseDragEnd(bool cancel)
+		{
+			if(!this.IsDockableWindow)
+			{
+				base.OnMouseDragEnd(cancel);
+				return;
+			}
+
+			this.Control.Capture = false;
+			Cursor.Clip = Rectangle.Empty;
+			
+			Bar bar=this.Control as Bar;
+
+			if(cancel || bar==null || !m_DragDrop)
+			{
+				base.OnMouseDragEnd(cancel);
+				return;
+			}
+
+			m_DragDrop=false;
+
+			IDesignerHost designerHost=this.GetService(typeof(IDesignerHost)) as IDesignerHost;
+			if(designerHost==null)
+			{
+				EndBarOwnerDocking(bar);
+				m_IsDocking=false;
+				m_MouseDownSelectedTabIndex=-1;
+				base.OnMouseDragEnd(cancel);
+				return;
+			}
+
+			if(m_IsDocking)
+			{
+				EndBarOwnerDocking(bar);
+				// Moves and docks the selected DockContainerItem or bar
+				Bar referenceBar=m_DockInfo.MouseOverBar;
+				if(m_DockInfo.MouseOverDockSide!=eDockSide.None && m_DockInfo.MouseOverDockSide!=eDockSide.Document && (referenceBar!=bar || m_MouseDownSelectedTabIndex!=-1 && bar.VisibleItemCount>1) ||
+                    m_DockInfo.DockSide != DockStyle.None && m_DockInfo.MouseOverDockSide != eDockSide.Document)
+				{
+					DesignerTransaction trans=designerHost.CreateTransaction("DotNetBar Docking");
+					IComponentChangeService cc=(IComponentChangeService)GetService(typeof(IComponentChangeService));
+					try
+					{
+						Bar newBar=null;
+                        DockSite newDockSite = m_DockInfo.objDockSite;
+                        DockSite oldDockSite = bar.Parent as DockSite;
+
+                        if (m_MouseDownSelectedTabIndex != -1 && bar.VisibleItemCount > 1)
+                        {
+                            Bar copy = designerHost.CreateComponent(typeof(Bar)) as Bar;
+                            newBar = BarFunctions.CreateDuplicateDockBar(bar, copy);
+                        }
+                        else
+                            newBar = bar;
+
+						cc.OnComponentChanging(bar,TypeDescriptor.GetProperties(typeof(Bar))["SelectedDockTab"]);
+						
+						if(m_MouseDownSelectedTabIndex!=-1 && bar.VisibleItemCount>1)
+						{
+							DockContainerItem item=bar.Items[bar.SelectedDockTab] as DockContainerItem;
+							cc.OnComponentChanging(bar,TypeDescriptor.GetProperties(typeof(Bar))["Controls"]);
+							cc.OnComponentChanging(bar,TypeDescriptor.GetProperties(typeof(Bar))["Items"]);
+							bar.Items.Remove(item);
+							cc.OnComponentChanged(bar,TypeDescriptor.GetProperties(typeof(Bar))["Items"],null,null);
+							cc.OnComponentChanged(bar,TypeDescriptor.GetProperties(typeof(Bar))["Controls"],null,null);
+
+							cc.OnComponentChanging(newBar,TypeDescriptor.GetProperties(typeof(Bar))["Controls"]);
+							cc.OnComponentChanging(newBar,TypeDescriptor.GetProperties(typeof(Bar))["Items"]);
+							newBar.Items.Add(item);
+							cc.OnComponentChanged(newBar,TypeDescriptor.GetProperties(typeof(Bar))["Items"],null,null);
+							cc.OnComponentChanged(newBar,TypeDescriptor.GetProperties(typeof(Bar))["Controls"],null,null);							
+						}
+						
+						cc.OnComponentChanging(newDockSite,TypeDescriptor.GetProperties(typeof(DockSite))["Controls"]);
+						cc.OnComponentChanging(newBar,null);
+                        if(referenceBar!=null)
+						    cc.OnComponentChanging(referenceBar,null);
+						cc.OnComponentChanging(newDockSite,TypeDescriptor.GetProperties(typeof(DockSite))["DocumentDockContainer"]);
+                        if (newDockSite != oldDockSite && oldDockSite != null)
+                        {
+                            cc.OnComponentChanging(oldDockSite, TypeDescriptor.GetProperties(typeof(DockSite))["Controls"]);
+                            cc.OnComponentChanging(oldDockSite, TypeDescriptor.GetProperties(typeof(DockSite))["DocumentDockContainer"]);
+                        }
+
+                        m_DockInfo.MouseOverBar = referenceBar;
+                        newBar.DockDocumentManager(m_DockInfo);
+						//newDockSite.GetDocumentUIManager().Dock(referenceBar,newBar,m_DockInfo.MouseOverDockSide);
+                        
+                        if (newDockSite.Width == 0 && (newDockSite.Dock == DockStyle.Left || newDockSite.Dock == DockStyle.Right))
+                            newDockSite.Width = newBar.GetBarDockedSize(eOrientation.Vertical);
+                        else if (newDockSite.Height == 0 && (newDockSite.Dock == DockStyle.Top || newDockSite.Dock == DockStyle.Bottom))
+                            newDockSite.Height = newBar.GetBarDockedSize(eOrientation.Horizontal);
+
+                        if (newDockSite != oldDockSite && oldDockSite != null)
+                        {
+                            cc.OnComponentChanged(oldDockSite, TypeDescriptor.GetProperties(typeof(DockSite))["DocumentDockContainer"], null, null);
+                            cc.OnComponentChanged(oldDockSite, TypeDescriptor.GetProperties(typeof(DockSite))["Controls"], null, null);
+                        }
+
+						cc.OnComponentChanged(newDockSite,TypeDescriptor.GetProperties(typeof(DockSite))["DocumentDockContainer"],null,null);
+                        if (referenceBar != null)
+						    cc.OnComponentChanged(referenceBar,null,null,null);
+						cc.OnComponentChanged(newBar,null,null,null);
+						cc.OnComponentChanged(newDockSite,TypeDescriptor.GetProperties(typeof(DockSite))["Controls"],null,null);
+						Form f = newBar.FindForm();
+						if(f!=null) f.Refresh();
+					}
+					catch
+					{
+						trans.Cancel();
+						throw;
+					}
+					finally
+					{
+						if(!trans.Canceled)
+							trans.Commit();
+					}
+				}
+				else if(m_DockInfo.MouseOverDockSide==eDockSide.Document && bar!=referenceBar)
+				{
+					BarDesigner referenceDesigner=designerHost.GetDesigner(referenceBar) as BarDesigner;
+					if(referenceDesigner!=null)
+						referenceDesigner.DelayedDockTabs(bar,m_MouseDownSelectedTabIndex);
+				}
+
+				m_DockInfo=new DockSiteInfo();
+			}
+			else if(m_MouseDownSelectedTabIndex!=-1)
+			{
+				if(m_MouseDownSelectedTabIndex!=bar.SelectedDockTab)
+				{
+					IComponentChangeService cc=(IComponentChangeService)GetService(typeof(IComponentChangeService));
+					if(cc!=null)
+					{
+						cc.OnComponentChanged(bar,TypeDescriptor.GetProperties(typeof(Bar))["Items"],null,null);
+						cc.OnComponentChanged(bar,TypeDescriptor.GetProperties(typeof(Bar))["SelectedDockTab"],null,null);
+						cc.OnComponentChanged(bar,TypeDescriptor.GetProperties(typeof(Bar))["Controls"],null,null);
+					}
+				}
+			}
+			m_IsDocking=false;
+			m_MouseDownSelectedTabIndex=-1;
+			base.OnMouseDragEnd(cancel);
+		}
+
+		private Timer m_TimerDelayRemove=null;
+		private Bar m_DelayDockBar=null;
+		private int m_DelayDockTabIndex=-1;
+		internal void DelayedDockTabs(Bar bar, int tabIndex)
+		{
+			if(m_TimerDelayRemove==null)
+			{
+				m_DelayDockBar=bar;
+				m_DelayDockTabIndex=tabIndex;
+				m_TimerDelayRemove=new Timer();
+				m_TimerDelayRemove.Tick+=new EventHandler(this.TimerTickDelayRemove);
+				m_TimerDelayRemove.Interval=200;
+				m_TimerDelayRemove.Enabled=true;
+				m_TimerDelayRemove.Start();
+			}
+		}
+		private void TimerTickDelayRemove(object sender, EventArgs e)
+		{
+			m_TimerDelayRemove.Stop();
+			m_TimerDelayRemove.Enabled=false;
+			m_TimerDelayRemove.Dispose();
+			m_TimerDelayRemove=null;
+
+			DockTabs(m_DelayDockBar,m_DelayDockTabIndex,this.Control as Bar);
+
+			m_DelayDockBar=null;
+			m_DelayDockTabIndex=-1;
+		}
+
+		private void DockTabs(Bar sourceBar, int selectedTabIndex, Bar targetBar)
+		{
+			// Move Dock-container item to different bar
+			IDesignerHost designerHost=this.GetService(typeof(IDesignerHost)) as IDesignerHost;
+			DesignerTransaction trans=designerHost.CreateTransaction("DotNetBar Docking");
+			IComponentChangeService cc=(IComponentChangeService)GetService(typeof(IComponentChangeService));
+			try
+			{
+				DockContainerItem[] items=null;
+				if(selectedTabIndex!=-1)
+					items=new DockContainerItem[] {sourceBar.Items[sourceBar.SelectedDockTab] as DockContainerItem};
+				else
+				{
+					items=new DockContainerItem[sourceBar.Items.Count];
+					sourceBar.Items.CopyTo(items,0);
+				}
+
+				cc.OnComponentChanging(sourceBar,TypeDescriptor.GetProperties(typeof(Bar))["Controls"]);
+				cc.OnComponentChanging(sourceBar,TypeDescriptor.GetProperties(typeof(Bar))["Items"]);
+				sourceBar.Items.RemoveRange(items);
+				cc.OnComponentChanged(sourceBar,TypeDescriptor.GetProperties(typeof(Bar))["Items"],null,null);
+				cc.OnComponentChanged(sourceBar,TypeDescriptor.GetProperties(typeof(Bar))["Controls"],null,null);
+
+				cc.OnComponentChanging(targetBar,TypeDescriptor.GetProperties(typeof(Bar))["Controls"]);
+				cc.OnComponentChanging(targetBar,TypeDescriptor.GetProperties(typeof(Bar))["Items"]);
+				targetBar.Items.AddRange(items);
+				cc.OnComponentChanged(targetBar,TypeDescriptor.GetProperties(typeof(Bar))["Items"],null,null);
+				cc.OnComponentChanged(targetBar,TypeDescriptor.GetProperties(typeof(Bar))["Controls"],null,null);
+
+				if(sourceBar.Items.Count==0)
+				{
+					DockSite sourceDockSite=sourceBar.Parent as DockSite;
+					cc.OnComponentChanging(sourceDockSite,TypeDescriptor.GetProperties(typeof(DockSite))["DocumentDockContainer"]);
+					cc.OnComponentChanging(sourceBar,null);
+					sourceDockSite.GetDocumentUIManager().UnDock(sourceBar,false);
+					cc.OnComponentChanged(sourceBar,null,null,null);
+					cc.OnComponentChanged(sourceDockSite,TypeDescriptor.GetProperties(typeof(DockSite))["DocumentDockContainer"],null,null);
+
+					designerHost.DestroyComponent(sourceBar);
+				}
+
+				if(targetBar!=null && targetBar.SelectedDockTab>=0)
+				{
+					DockContainerItem dock=targetBar.Items[targetBar.SelectedDockTab] as DockContainerItem;
+					if(dock!=null && dock.Control!=null)
+					{
+						cc.OnComponentChanged(targetBar,TypeDescriptor.GetProperties(typeof(Bar))["Controls"],null,null);
+						dock.Control.BringToFront();
+						cc.OnComponentChanged(targetBar,TypeDescriptor.GetProperties(typeof(Bar))["Controls"],null,null);
+					}
+				}
+			}
+			catch
+			{
+				trans.Cancel();
+				throw;
+			}
+			finally
+			{
+				if(!trans.Canceled)
+					trans.Commit();
+			}
+		}
+
+		private void EndBarOwnerDocking(Bar bar)
+		{
+			IOwnerBarSupport barSupport=bar.Owner as IOwnerBarSupport;
+			if(barSupport!=null)
+				barSupport.DockComplete();
+			if(m_OutlineForm!=null)
+			{
+				m_OutlineForm.Hide();
+				m_OutlineForm.Dispose();
+				m_OutlineForm=null;
+			}
+		}
+
+        protected override IOwner GetIOwner()
+        {
+            Bar bar = this.Control as Bar;
+            if (bar.Owner is IOwner)
+                return bar.Owner as IOwner;
+            return base.GetIOwner();
+        }
+
+        protected override IOwnerMenuSupport GetIOwnerMenuSupport()
+        {
+            Bar bar = this.Control as Bar;
+            if (bar.Owner is IOwnerMenuSupport)
+                return bar.Owner as IOwnerMenuSupport;
+            return base.GetIOwnerMenuSupport();
+        }
+
+		/// <summary>
+		/// Returns tab index under specified coordinates.
+		/// </summary>
+		/// <param name="x">Screen X coordinate</param>
+		/// <param name="y">Screen Y coordinate</param>
+		/// <returns>Tab index or -1 if tab was not found</returns>
+		private int GetTabAt(int x, int y)
+		{
+			Bar bar=this.Control as Bar;
+			if(bar==null) return -1;
+			
+			// Select dockable tab if mouse is clicked over the tab
+			if(this.IsDockableWindow && bar.DockTabControl!=null)
+			{
+				Point posTab=bar.DockTabControl.PointToClient(new Point(x,y));
+				if(bar.DockTabControl._TabSystemBox.Visible && bar.DockTabControl._TabSystemBox.DisplayRectangle.Contains(posTab))
+				{
+					return -1;
+				}
+				TabItem tab=bar.DockTabControl.HitTest(posTab.X,posTab.Y);
+				if(tab!=null)
+					return bar.Items.IndexOf(tab.AttachedItem);
+			}
+
+			return -1;
+		}
+
+		private bool IsInTabSystemBox(int x, int y)
+		{
+			Bar bar=this.Control as Bar;
+			if(bar==null) return false;
+
+			// Select dockable tab if mouse is clicked over the tab
+			if(this.IsDockableWindow && bar.DockTabControl!=null)
+			{
+				Point posTab=bar.DockTabControl.PointToClient(new Point(x,y));
+				if(bar.DockTabControl._TabSystemBox.Visible && bar.DockTabControl._TabSystemBox.DisplayRectangle.Contains(posTab))
+					return true;
+			}
+
+			return false;
+		}
+
+		private void MouseDownTabSystemBox(int x, int y)
+		{
+			Bar bar=this.Control as Bar;
+			if(bar==null) return;
+
+			// Select dockable tab if mouse is clicked over the tab
+			if(this.IsDockableWindow && bar.DockTabControl!=null)
+			{
+				Point posTab=bar.DockTabControl.PointToClient(new Point(x,y));
+				if(bar.DockTabControl._TabSystemBox.Visible && bar.DockTabControl._TabSystemBox.DisplayRectangle.Contains(posTab))
+				{
+					if(bar.DockTabControl._TabSystemBox.ForwardEnabled && bar.DockTabControl._TabSystemBox.ForwardRect.Contains(posTab))
+					{
+						bar.DockTabControl.ScrollForward();
+					}
+					else if(bar.DockTabControl._TabSystemBox.BackEnabled && bar.DockTabControl._TabSystemBox.BackRect.Contains(posTab))
+					{
+						bar.DockTabControl.ScrollBackwards();
+					}
+				}
+			}
+
+		}
+
+		/// <summary>
+		/// Removes all subitems from container.
+		/// </summary>
+		protected override void ThisComponentRemoving(object sender, ComponentEventArgs e)
+		{
+			if(!m_InternalRemoving)
+			{
+				m_InternalRemoving=true;
+				try
+				{
+					if(this.IsDockableWindow)
+					{
+						Bar bar=this.Control as Bar;
+						if(bar!=null && bar.Parent is DockSite && ((DockSite)bar.Parent).DocumentDockContainer!=null)
+						{
+							IComponentChangeService cc=this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+							if(cc!=null)
+								cc.OnComponentChanging(((DockSite)bar.Parent),TypeDescriptor.GetProperties(typeof(DockSite)).Find("DocumentDockContainer",true));
+							((DockSite)bar.Parent).GetDocumentUIManager().UnDock(bar,false);
+							if(cc!=null)
+								cc.OnComponentChanged(((DockSite)bar.Parent),TypeDescriptor.GetProperties(typeof(DockSite)).Find("DocumentDockContainer",true),null,null);
+						}
+					}
+				}
+				finally
+				{
+					m_InternalRemoving=false;
+				}
+			}
+
+			base.ThisComponentRemoving(sender,e);
+		}
+
+//#if FRAMEWORK20
+//        public override DesignerActionListCollection ActionLists
+//        {
+//            get
+//            {
+//                DesignerActionListCollection lists = new DesignerActionListCollection();
+//                lists.AddRange(base.ActionLists);
+
+//                if (this.IsDockableWindow)
+//                {
+//                    lists.Add(
+//                        new BarDockableDesignerActionList(this.Component));
+//                }
+//                return lists;
+//            }
+//        }
+//#endif
+		#endregion
+	}
+
+//#if FRAMEWORK20
+//    public class BarDockableDesignerActionList : DesignerActionList
+//    {
+//#region Private Variables
+//        private Bar m_Bar = null;
+//#endregion
+
+//        #region Internal Implementation
+//        public BarDockableDesignerActionList(IComponent c)
+//            : base(c)
+//        {
+//            m_Bar = (Bar)c;
+
+//        }
+
+//        [Editor(typeof(SelectedDockTabEditor), typeof(UITypeEditor))]
+//        public int Selected
+//        {
+//            get
+//            {
+//                return m_Bar.SelectedDockTab;
+//            }
+//            set
+//            {
+//                TypeDescriptor.GetProperties(m_Bar)["SelectedDockTab"].SetValue(m_Bar, value);
+//            }
+//        }
+
+//        public override DesignerActionItemCollection GetSortedActionItems()
+//        {
+//            DesignerActionItemCollection items = new DesignerActionItemCollection();
+            
+//            //Define static section header entries.
+//            items.Add(new DesignerActionHeaderItem("Dock Tabs"));
+
+//            items.Add(new DesignerActionPropertyItem("Selected",
+//                         "Selected", "Dock Tabs",
+//                         "Changes selected dock tab"));
+
+//            return items;
+
+//        }
+//        #endregion
+//    }
+
+//    /// <summary>
+//    /// Represents Selected dock tab editor.
+//    /// </summary>
+//    public class SelectedDockTabEditor : UITypeEditor
+//    {
+//        private IWindowsFormsEditorService edSvc = null;
+//        public override object EditValue(ITypeDescriptorContext context, IServiceProvider provider, object value)
+//        {
+//            if (context != null
+//                && context.Instance != null
+//                && provider != null)
+//            {
+//                edSvc = provider.GetService(typeof(IWindowsFormsEditorService)) as IWindowsFormsEditorService;
+//                Bar bar = ((BarDockableDesignerActionList)context.Instance).Component as Bar;
+
+//                int index=-1;
+//                if (value != null && value is int)
+//                    index = (int)value;
+
+//                if (bar != null && edSvc != null)
+//                {
+//                    ListBox lb = new ListBox();
+//                    lb.BorderStyle = BorderStyle.None;
+//                    lb.SelectedIndexChanged += new EventHandler(SelectedIndexChanged);
+
+//                    for(int i = 0; i<bar.Items.Count;i++)
+//                    {
+//                        BaseItem item = bar.Items[i];
+//                        lb.Items.Add(item.Text + "[" + item.Name + "]");
+//                        if (i == index)
+//                            lb.SelectedIndex = i;
+//                    }
+//                    edSvc.DropDownControl(lb);
+//                    if (lb.SelectedItem != null)
+//                        return lb.SelectedIndex;
+//                    else
+//                        return -1;
+//                }
+//            }
+
+//            return value;
+//        }
+
+//        private void SelectedIndexChanged(object sender, EventArgs e)
+//        {
+//            if (edSvc != null)
+//                edSvc.CloseDropDown();
+//        }
+
+//        /// <summary>
+//        /// Gets the editor style used by the EditValue method.
+//        /// </summary>
+//        /// <param name="context">An ITypeDescriptorContext that can be used to gain additional context information.</param>
+//        /// <returns>A UITypeEditorEditStyle value that indicates the style of editor used by EditValue. If the UITypeEditor does not support this method, then GetEditStyle will return None.
+//        /// </returns>
+//        public override UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext context)
+//        {
+//            if (context != null && context.Instance != null)
+//            {
+//                return UITypeEditorEditStyle.DropDown;
+//            }
+//            return base.GetEditStyle(context);
+//        }
+//    }
+//#endif
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/BaseItemDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/BaseItemDesigner.cs
new file mode 100644
index 00000000..c943fd37
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/BaseItemDesigner.cs	
@@ -0,0 +1,585 @@
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.ComponentModel.Design;
+using System.Drawing;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Design
+{
+	/// <summary>
+	/// Represents designer for BaseItem objects and derived classes.
+	/// </summary>
+	public class BaseItemDesigner:System.ComponentModel.Design.ComponentDesigner,IDesignerServices
+    {
+        #region Private Variables
+        protected bool m_AddingItem = false;
+        protected bool m_CreatingItem = false;
+        protected DesignerTransaction m_InsertItemTransaction = null;
+        #endregion
+
+        #region Internal Implementation
+        /// <summary>
+		/// Creates new instance of the class.
+		/// </summary>
+		public BaseItemDesigner()
+		{
+		}
+
+		public override void Initialize(IComponent component) 
+		{
+			base.Initialize(component);
+			if(!component.Site.DesignMode)
+				return;
+
+			ISelectionService ss =(ISelectionService)GetService(typeof(ISelectionService));
+			if(ss!=null)
+				ss.SelectionChanged+=new EventHandler(OnSelectionChanged);
+
+			BaseItem c=component as BaseItem;
+			if(c!=null)
+				this.Visible=c.Visible;
+
+			// If our component is removed we need to clean-up
+			IComponentChangeService cc=(IComponentChangeService)GetService(typeof(IComponentChangeService));
+			if(cc!=null)
+			{
+				cc.ComponentRemoved+=new ComponentEventHandler(this.OnComponentRemoved);
+                cc.ComponentAdding += new ComponentEventHandler(ComponentChangeComponentAdding);
+                cc.ComponentAdded += new ComponentEventHandler(ComponentChangeComponentAdded);
+			}
+		}
+
+#if FRAMEWORK20
+        public override void InitializeNewComponent(IDictionary defaultValues)
+        {
+            base.InitializeNewComponent(defaultValues);
+            SetDesignTimeDefaults();
+        }
+#else
+		public override void OnSetComponentDefaults()
+		{
+			base.OnSetComponentDefaults();
+			SetDesignTimeDefaults();
+		}
+#endif
+
+        protected virtual void SetDesignTimeDefaults()
+        {
+        }
+
+        protected virtual void ComponentChangeComponentAdded(object sender, ComponentEventArgs e)
+        {
+            if (m_AddingItem)
+            {
+                m_AddingItem = false;
+                IComponentChangeService cc = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+                BaseItem parent = this.Component as BaseItem;
+
+                if (cc != null)
+                    cc.OnComponentChanging(parent, TypeDescriptor.GetProperties(parent)["SubItems"]);
+                
+                parent.SubItems.Add(e.Component as BaseItem);
+                
+                if (cc != null)
+                    cc.OnComponentChanged(parent, TypeDescriptor.GetProperties(parent)["SubItems"], null, null);
+
+                m_InsertItemTransaction.Commit();
+                m_InsertItemTransaction = null;
+                this.RecalcLayout();
+            }
+        }
+
+        protected virtual void ComponentChangeComponentAdding(object sender, ComponentEventArgs e)
+        {
+            if (m_InsertItemTransaction == null && !m_AddingItem && !m_CreatingItem && e.Component is BaseItem)
+            {
+                ISelectionService ss = this.GetService(typeof(ISelectionService)) as ISelectionService;
+                if (ss != null && ss.PrimarySelection == this.Component)
+                {
+                    m_AddingItem = true;
+                    IDesignerHost dh = this.GetService(typeof(IDesignerHost)) as IDesignerHost;
+                    m_InsertItemTransaction = dh.CreateTransaction("Adding Item Clip");
+                }
+            }
+        }
+		protected override void Dispose(bool disposing)
+		{
+			ISelectionService ss =(ISelectionService)GetService(typeof(ISelectionService));
+			if(ss!=null)
+				ss.SelectionChanged-=new EventHandler(OnSelectionChanged);
+
+			IComponentChangeService cc=(IComponentChangeService)GetService(typeof(IComponentChangeService));
+			if(cc!=null)
+			{
+				cc.ComponentRemoved-=new ComponentEventHandler(this.OnComponentRemoved);
+			}
+
+			base.Dispose(disposing);
+		}
+
+		private void OnComponentRemoved(object sender,ComponentEventArgs e)
+		{
+			if(e.Component is BaseItem)
+			{
+				BaseItem parent=this.Component as BaseItem;
+				BaseItem item=e.Component as BaseItem;
+				if(item!=null && parent!=null && parent.SubItems.Contains(item))
+				{
+					IComponentChangeService cc=(IComponentChangeService)GetService(typeof(IComponentChangeService));
+					if(cc!=null)
+						cc.OnComponentChanging(parent,TypeDescriptor.GetProperties(parent)["SubItems"]);
+					parent.SubItems.Remove(item);
+					if(cc!=null)
+						cc.OnComponentChanged(parent,TypeDescriptor.GetProperties(parent)["SubItems"],null,null);
+					this.RecalcLayout();
+				}
+			}
+            ComponentRemoved(e);
+		}
+
+        protected virtual void ComponentRemoved(ComponentEventArgs e) { }
+
+		private void OnSelectionChanged(object sender, EventArgs e) 
+		{
+			ISelectionService ss = (ISelectionService)sender;
+            
+            if (ss != null && ss.PrimarySelection != this.Component)
+            {
+                ((BaseItem)this.Component).DesignTimeMouseDownPoint = Point.Empty;
+            }
+
+			if(ss!=null && ss.PrimarySelection!=this.Component && ss.PrimarySelection is BaseItem)
+			{
+				BaseItem item=this.Component as BaseItem;
+				if(item!=null)
+				{
+					BaseItem selected=ss.PrimarySelection as BaseItem;
+					IOwner owner=item.GetOwner() as IOwner;
+					if(owner!=null)
+					{
+						if(owner.GetItem(selected.Name)!=selected)
+							owner.SetFocusItem(null);
+					}
+				}
+			}
+
+            if (ss != null)
+            {
+                ICollection selectedComponents = ss.GetSelectedComponents();
+                bool selected = false;
+                foreach(object o in selectedComponents)
+                {
+                    if (o == this.Component)
+                    {
+                        selected = true;
+                        break;
+                    }
+                }
+
+                BaseItem item = this.Component as BaseItem;
+                if (selected)
+                {
+                    if (!item.Focused)
+                        item.OnGotFocus();
+                }
+                else if (item.Focused)
+                    item.OnLostFocus();
+            }
+		}
+
+        protected virtual DesignerVerb[] GetVerbs()
+        {
+            DesignerVerb[] verbs = new DesignerVerb[]
+                							{
+                								new DesignerVerb("Add Button", new EventHandler(CreateButton)),
+                								new DesignerVerb("Add Text Box", new EventHandler(CreateTextBox)),
+                								new DesignerVerb("Add Combo Box", new EventHandler(CreateComboBox)),
+                								new DesignerVerb("Add Label", new EventHandler(CreateLabel)),
+                		                        new DesignerVerb("Add Color Picker", new EventHandler(CreateColorPicker)),
+                		                        new DesignerVerb("Add Check Box", new EventHandler(CreateCheckBox)),
+                		                        new DesignerVerb("Add Control Container", new EventHandler(CreateControlContainer)),
+                                                new DesignerVerb("Add Micro-Chart", new EventHandler(CreateMicroChart)),
+                                                new DesignerVerb("Add Switch Button", new EventHandler(CreateSwitch)),
+                		                        new DesignerVerb("Add Slider", new EventHandler(CreateSlider)),
+                		                        new DesignerVerb("Add Rating Item", new EventHandler(CreateRatingItem)),
+                		                        new DesignerVerb("Add Horizontal Container", new EventHandler(CreateHorizontalContainer)),
+                		                        new DesignerVerb("Add Vertical Container", new EventHandler(CreateVerticalContainer)),
+                		                        new DesignerVerb("Add Gallery Container", new EventHandler(CreateGallery))
+                						};
+            return verbs;
+        }
+
+        public override DesignerVerbCollection Verbs 
+		{
+			get 
+			{
+                DesignerVerb[] verbs = GetVerbs();
+				return new DesignerVerbCollection(verbs);
+			}
+		}
+
+        protected virtual void CreateMicroChart(object sender, EventArgs e)
+        {
+            CreateNewItem(typeof(MicroChartItem));
+        }
+
+
+        protected virtual void CreateCheckBox(object sender, EventArgs e)
+        {
+            CreateNewItem(typeof(CheckBoxItem));
+        }
+
+        protected virtual void CreateRatingItem(object sender, EventArgs e)
+        {
+            CreateNewItem(typeof(RatingItem));
+        }
+
+		protected virtual void CreateButton(object sender, EventArgs e)
+		{
+			CreateNewItem(typeof(ButtonItem));
+		}
+
+		protected virtual void CreateComboBox(object sender, EventArgs e)
+		{
+			CreateNewItem(typeof(ComboBoxItem));
+		}
+
+		protected virtual void CreateLabel(object sender, EventArgs e)
+		{
+			CreateNewItem(typeof(LabelItem));
+		}
+
+		protected virtual void CreateTextBox(object sender, EventArgs e)
+		{
+			CreateNewItem(typeof(TextBoxItem));
+		}
+
+        protected virtual void CreateColorPicker(object sender, EventArgs e)
+        {
+            CreateNewItem(typeof(ColorPickerDropDown));
+        }
+
+        protected virtual void CreateControlContainer(object sender, EventArgs e)
+        {
+            CreateNewItem(typeof(ControlContainerItem));
+        }
+
+        protected virtual void CreateSlider(object sender, EventArgs e)
+        {
+            CreateNewItem(typeof(SliderItem));
+        }
+
+        protected virtual void CreateRangeSlider(object sender, EventArgs e)
+        {
+            CreateNewItem(typeof(RangeSliderItem));
+        }
+
+        protected virtual void CreateSwitch(object sender, EventArgs e)
+        {
+            CreateNewItem(typeof(SwitchButtonItem));
+        }
+
+        protected virtual void CreateProgressBar(object sender, EventArgs e)
+        {
+            CreateNewItem(typeof(ProgressBarItem));
+        }
+
+        protected virtual void CreateCircularProgressItem(object sender, EventArgs e)
+        {
+            CreateNewItem(typeof(CircularProgressItem));
+        }
+#if FRAMEWORK20
+        protected virtual void CreateMonthCalendar(object sender, EventArgs e)
+        {
+            CreateNewItem(typeof(DevComponents.Editors.DateTimeAdv.MonthCalendarItem));
+        }
+#endif
+
+        protected virtual void CreateMetroTile(object sender, EventArgs e)
+        {
+            CreateNewItem(typeof(DevComponents.DotNetBar.Metro.MetroTileItem));
+        }
+
+        private void CreateVerticalContainer(object sender, EventArgs e)
+        {
+            CreateContainer(eOrientation.Vertical);
+        }
+
+        private void CreateHorizontalContainer(object sender, EventArgs e)
+        {
+            CreateContainer(eOrientation.Horizontal);
+        }
+
+        private void CreateContainer(eOrientation orientation)
+        {
+            try
+            {
+                m_CreatingItem = true;
+                DesignerSupport.CreateItemContainer(this, (BaseItem)this.Component, orientation);
+            }
+            finally
+            {
+                m_CreatingItem = false;
+            }
+            this.RecalcLayout();
+        }
+
+        protected virtual void CreateGallery(object sender, EventArgs e)
+        {
+            CreateNewItem(typeof(GalleryContainer));
+        }
+
+		protected virtual void CreateNewItem(Type itemType)
+		{
+			BaseItem parent=this.Component as BaseItem;
+			System.ComponentModel.Design.IDesignerHost dh=(System.ComponentModel.Design.IDesignerHost)GetService(typeof(System.ComponentModel.Design.IDesignerHost));
+
+            DesignerTransaction trans = dh.CreateTransaction("Creating New Item");
+            try
+            {
+                m_CreatingItem = true;
+                BaseItem item = dh.CreateComponent(itemType) as BaseItem;
+                if (item == null)
+                    return;
+                if (itemType != typeof(RatingItem))
+                    item.Text = item.Name;
+                BeforeNewItemAdded(item);
+
+                AddNewItem(item);
+
+                AfterNewItemAdded(item);
+                this.RecalcLayout();
+                this.NewItemAdded(item);
+            }
+            catch
+            {
+                trans.Cancel();
+                throw;
+            }
+            finally
+            {
+                m_CreatingItem = false;
+                if (!trans.Canceled)
+                    trans.Commit();
+            }
+		}
+
+        protected virtual void AddNewItem(BaseItem newItem)
+        {
+            BaseItem parent = this.Component as BaseItem;
+            System.ComponentModel.Design.IComponentChangeService change = this.GetService(typeof(System.ComponentModel.Design.IComponentChangeService)) as IComponentChangeService;
+            if (change != null)
+                change.OnComponentChanging(this.Component, TypeDescriptor.GetProperties(parent).Find("SubItems", true));
+
+            parent.SubItems.Add(newItem);
+
+            if (change != null)
+                change.OnComponentChanged(this.Component, TypeDescriptor.GetProperties(parent).Find("SubItems", true), null, null);
+        }
+
+		protected virtual void BeforeNewItemAdded(BaseItem item) {}
+
+		protected virtual void AfterNewItemAdded(BaseItem item)
+        {
+            if (item is LabelItem && Helpers.IsOffice2007Style(item.EffectiveStyle))
+            {
+                LabelItem label = item as LabelItem;
+                if (item.Parent is PopupItem && ((PopupItem)item.Parent).PopupType == ePopupType.Menu)
+                {
+                    label.BackColor = ColorScheme.GetColor("DDE7EE");
+                    label.BorderType = eBorderType.SingleLine;
+                    label.SingleLineColor = ColorScheme.GetColor("C5C5C5");
+                    label.ForeColor = ColorScheme.GetColor("00156E");
+                    label.BorderSide = eBorderSide.Bottom;
+                    label.PaddingTop = 1;
+                    label.PaddingLeft = 10;
+                    label.PaddingBottom = 1;
+                }
+            }
+            else if (item is GalleryContainer && item.Parent is ButtonItem)
+            {
+                TypeDescriptor.GetProperties(item)["MinimumSize"].SetValue(item, new Size(150, 200));
+                item.NeedRecalcSize = true;
+                TypeDescriptor.GetProperties(((GalleryContainer)item).BackgroundStyle)["Class"].SetValue(((GalleryContainer)item).BackgroundStyle, "");
+                if(item.Parent is PopupItem)
+                    TypeDescriptor.GetProperties(item)["EnableGalleryPopup"].SetValue(item, false);
+            }
+            else if (item is GalleryContainer && item.Parent is ItemContainer && !(item.ContainerControl is RibbonBar))
+            {
+                TypeDescriptor.GetProperties(item)["MinimumSize"].SetValue(item, new Size(150, 200));
+                TypeDescriptor.GetProperties(((GalleryContainer)item).BackgroundStyle)["Class"].SetValue(((GalleryContainer)item).BackgroundStyle, "");
+                TypeDescriptor.GetProperties(item)["EnableGalleryPopup"].SetValue(item, false);
+                TypeDescriptor.GetProperties(item)["LayoutOrientation"].SetValue(item, DevComponents.DotNetBar.eOrientation.Vertical);
+                TypeDescriptor.GetProperties(item)["MultiLine"].SetValue(item, false);
+                TypeDescriptor.GetProperties(item)["PopupUsesStandardScrollbars"].SetValue(item, false);
+                item.NeedRecalcSize = true;
+            }
+        }
+
+		protected virtual void RecalcLayout()
+		{
+			BaseItem item=this.Component as BaseItem;
+			System.Windows.Forms.Control control=item.ContainerControl as System.Windows.Forms.Control;
+			
+			if(control is Bar)
+				((Bar)control).RecalcLayout();
+			else if(control is ExplorerBar)
+				((ExplorerBar)control).RecalcLayout();
+			else if(control is BarBaseControl)
+				((BarBaseControl)control).RecalcLayout();
+			else if(control is SideBar)
+				((SideBar)control).RecalcLayout();
+			else if(control is ItemControl)
+				((ItemControl)control).RecalcLayout();
+            else if (control is MenuPanel)
+                ((MenuPanel)control).RecalcSize();
+
+            if (item.Expanded && item is PopupItem && ((PopupItem)item).PopupControl != null)
+            {
+                control = ((PopupItem)item).PopupControl;
+                if (control is MenuPanel)
+                    ((MenuPanel)control).RecalcSize();
+                else if (control is Bar)
+                    ((Bar)control).RecalcLayout();
+            }
+		}
+
+        protected virtual void NewItemAdded(BaseItem itemAdded)
+        {
+            BaseItem item=this.Component as BaseItem;
+			System.Windows.Forms.Control control=item.GetOwner() as System.Windows.Forms.Control;
+            
+            //if(control is Bar)
+            //    ((Bar)control).RecalcLayout();
+            //else if(control is ExplorerBar)
+            //    ((ExplorerBar)control).RecalcLayout();
+            //else if(control is BarBaseControl)
+            //    ((BarBaseControl)control).RecalcLayout();
+            //else if(control is SideBar)
+            //    ((SideBar)control).RecalcLayout();
+			if(control is ItemControl)
+                ((ItemControl)control).DesignerNewItemAdded();
+            //else if (control is MenuPanel)
+            //    ((MenuPanel)control).RecalcSize();
+            
+        }
+
+		public override System.Collections.ICollection AssociatedComponents
+		{
+			get
+			{
+				System.Collections.ArrayList components=new System.Collections.ArrayList();
+				BaseItem parent=this.Component as BaseItem;
+				if(parent==null)
+					return base.AssociatedComponents;
+				parent.SubItems.CopyTo(components);
+				return components;
+			}
+		}
+
+		protected override void PreFilterProperties(IDictionary properties)
+		{
+			base.PreFilterProperties(properties);
+			properties["Visible"] = TypeDescriptor.CreateProperty(typeof(BaseItemDesigner),(PropertyDescriptor)properties["Visible"], new Attribute[]
+				{
+					new DefaultValueAttribute(true),
+					new BrowsableAttribute(true),
+					new CategoryAttribute("Layout")});
+			properties["CanCustomize"] = TypeDescriptor.CreateProperty(typeof(BaseItemDesigner),(PropertyDescriptor)properties["CanCustomize"], new Attribute[]
+				{
+					new DefaultValueAttribute(true),
+					new BrowsableAttribute(true),
+					new CategoryAttribute("Behavior"),
+					new DescriptionAttribute("Indicates whether item can be customized by user.")});
+		}
+
+		/// <summary>
+		/// Gets or sets whether item can be customized by end user.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DevCoBrowsable(true),System.ComponentModel.DefaultValue(true),System.ComponentModel.Category("Behavior"),System.ComponentModel.Description("Indicates whether item can be customized by user.")]
+		public virtual bool CanCustomize
+		{
+			get
+			{
+				return (bool)ShadowProperties["CanCustomize"];
+			}
+			set
+			{
+				// this value is not passed to the actual control
+				this.ShadowProperties["CanCustomize"] = value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets whether item is visible.
+		/// </summary>
+		[DefaultValue(true),Browsable(true),DevCoBrowsable(true),Category("Layout"),Description("Gets or sets whether item is visible.")]
+		public bool Visible 
+		{
+			get 
+			{
+				return (bool)ShadowProperties["Visible"];
+			}
+			set 
+			{
+				// this value is not passed to the actual control
+				this.ShadowProperties["Visible"] = value;
+			}
+		}
+		#endregion
+
+		#region IDesignerServices Implementation
+        object IDesignerServices.CreateComponent(System.Type componentClass)
+        {
+            IDesignerHost dh = (IDesignerHost)GetService(typeof(IDesignerHost));
+            if (dh == null)
+                return null;
+            object comp = null;
+            try
+            {
+                m_CreatingItem = true;
+                comp = dh.CreateComponent(componentClass);
+            }
+            finally
+            {
+                m_CreatingItem = false;
+            }
+
+            return comp;
+        }
+
+        object IDesignerServices.CreateComponent(System.Type componentClass, string name)
+        {
+            IDesignerHost dh = (IDesignerHost)GetService(typeof(IDesignerHost));
+            if (dh == null)
+                return null;
+            object comp = null;
+            try
+            {
+                m_CreatingItem = true;
+                comp = dh.CreateComponent(componentClass, name);
+            }
+            finally
+            {
+                m_CreatingItem = false;
+            }
+
+            return comp;
+        }
+
+		void IDesignerServices.DestroyComponent(IComponent c)
+		{
+			IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+			if(dh==null)
+				return;
+			dh.DestroyComponent(c);
+		}
+
+		object IDesignerServices.GetService(Type serviceType)
+		{
+			return this.GetService(serviceType);
+		}
+		#endregion
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/BindingNavigatorExDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/BindingNavigatorExDesigner.cs
new file mode 100644
index 00000000..430c52fc
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/BindingNavigatorExDesigner.cs	
@@ -0,0 +1,253 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel.Design;
+using System.ComponentModel;
+using System.ComponentModel.Design.Serialization;
+using System.Collections;
+using System.Globalization;
+using DevComponents.DotNetBar.Controls;
+
+namespace DevComponents.DotNetBar.Design
+{
+    /// <summary>
+    /// Provides design-time support for BindingNavigatorEx control.
+    /// </summary>
+    public class BindingNavigatorExDesigner : BarDesigner
+    {
+        #region Internal Implementation
+        private static readonly string[] ItemPropertyNames =
+            new string[] { 
+                "MovePreviousButton", 
+                "MoveFirstButton", 
+                "MoveNextButton", 
+                "MoveLastButton", 
+                "AddNewRecordButton", 
+                "DeleteButton", 
+                "PositionTextBox", 
+                "CountLabel" };
+
+        public override void InitializeNewComponent(IDictionary defaultValues)
+        {
+            base.InitializeNewComponent(defaultValues);
+            BindingNavigatorEx navigator = (BindingNavigatorEx)base.Component;
+            IDesignerHost designerHost = (IDesignerHost)base.Component.Site.GetService(typeof(IDesignerHost));
+            navigator.Dock = System.Windows.Forms.DockStyle.Top;
+            navigator.SuspendLayout();
+            navigator.AddDefaultItems();
+            this.SiteItems(designerHost, navigator.Items);
+            this.RaiseItemsChanged();
+            navigator.ResumeLayout();
+            navigator.RecalcLayout();
+        }
+
+        public override void Initialize(IComponent component)
+        {
+            base.Initialize(component);
+            IComponentChangeService service = (IComponentChangeService)this.GetService(typeof(IComponentChangeService));
+            if (service != null)
+            {
+                service.ComponentRemoved += ComponentRemoved;
+                service.ComponentChanged += ComponentChanged;
+            }
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                IComponentChangeService service = (IComponentChangeService)this.GetService(typeof(IComponentChangeService));
+                if (service != null)
+                {
+                    service.ComponentRemoved -= this.ComponentRemoved;
+                    service.ComponentChanged -= this.ComponentChanged;
+                }
+            }
+            base.Dispose(disposing);
+        }
+
+
+        private void ComponentChanged(object sender, ComponentChangedEventArgs e)
+        {
+            BindingNavigatorEx component = (BindingNavigatorEx)base.Component;
+            if (((e.Component != null) && (e.Component == component.CountLabel)) && ((e.Member != null) && (e.Member.Name == "Text")))
+            {
+                component.CountLabelFormat = component.CountLabel.Text;
+            }
+        }
+
+        private void ComponentRemoved(object sender, ComponentEventArgs e)
+        {
+            BaseItem item = e.Component as BaseItem;
+            if (item != null)
+            {
+                BindingNavigatorEx navigator = (BindingNavigatorEx)base.Component;
+                if (item == navigator.MoveFirstButton)
+                {
+                    navigator.MoveFirstButton = null;
+                }
+                else if (item == navigator.MovePreviousButton)
+                {
+                    navigator.MovePreviousButton = null;
+                }
+                else if (item == navigator.MoveNextButton)
+                {
+                    navigator.MoveNextButton = null;
+                }
+                else if (item == navigator.MoveLastButton)
+                {
+                    navigator.MoveLastButton = null;
+                }
+                else if (item == navigator.PositionTextBox)
+                {
+                    navigator.PositionTextBox = null;
+                }
+                else if (item == navigator.CountLabel)
+                {
+                    navigator.CountLabel = null;
+                }
+                else if (item == navigator.AddNewRecordButton)
+                {
+                    navigator.AddNewRecordButton = null;
+                }
+                else if (item == navigator.DeleteButton)
+                {
+                    navigator.DeleteButton = null;
+                }
+            }
+        }
+
+        private void RaiseItemsChanged()
+        {
+            BindingNavigatorEx component = (BindingNavigatorEx)base.Component;
+            IComponentChangeService service = (IComponentChangeService)this.GetService(typeof(IComponentChangeService));
+            if (service != null)
+            {
+                MemberDescriptor member = TypeDescriptor.GetProperties(component)["Items"];
+                service.OnComponentChanging(component, member);
+                service.OnComponentChanged(component, member, null, null);
+                foreach (string str in ItemPropertyNames)
+                {
+                    PropertyDescriptor itemsDescriptor = TypeDescriptor.GetProperties(component)[str];
+                    if (itemsDescriptor != null)
+                    {
+                        service.OnComponentChanging(component, itemsDescriptor);
+                        service.OnComponentChanged(component, itemsDescriptor, null, null);
+                    }
+                }
+            }
+        }
+        private void SiteItems(IDesignerHost host, SubItemsCollection items)
+        {
+            foreach (BaseItem item in items)
+            {
+                this.SiteItem(host, item);
+            }
+        }
+        private void SiteItem(IDesignerHost host, BaseItem item)
+        {
+            host.Container.Add(item, GetUniqueSiteName(host, item.Name));
+            item.Name = item.Site.Name;
+            if (item.SubItems.Count > 0)
+            {
+                this.SiteItems(host, item.SubItems);
+            }
+        }
+
+        internal static string GetUniqueSiteName(IDesignerHost host, string name)
+        {
+            if (string.IsNullOrEmpty(name))
+            {
+                return null;
+            }
+            INameCreationService service = (INameCreationService)host.GetService(typeof(INameCreationService));
+            if (service == null)
+            {
+                return null;
+            }
+            if (host.Container.Components[name] == null)
+            {
+                if (!service.IsValidName(name))
+                {
+                    return null;
+                }
+                return name;
+            }
+            string str = name;
+            for (int i = 1; !service.IsValidName(str); i++)
+            {
+                str = name + i.ToString(CultureInfo.InvariantCulture);
+            }
+            return str;
+        }
+
+        protected override void PreFilterProperties(System.Collections.IDictionary properties)
+        {
+            base.PreFilterProperties(properties);
+            RemoveDescriptors(properties,
+                new String[] { "AlwaysDisplayDockTab", 
+                                 "AlwaysDisplayKeyAccelerators", 
+                                 "AutoCreateCaptionMenu", 
+                                 "AutoHide", 
+                                 "AutoHideAnimationTime", 
+                                 "AutoHideTabTextAlwaysVisible", 
+                                 "AutoSyncBarCaption",
+                                 "BarType",
+                                 "CanAutoHide",
+                                 "CanCustomize",
+                                 "CanDockBottom",
+                                 "CanDockDocument",
+                                 "CanDockLeft",
+                                 "CanDockRight",
+                                 "CanDockTab",
+                                 "CanDockTop",
+                                 "CanDockHide",
+                                 "CanReorderTabs",
+                                 "CanUndock",
+                                 "CaptionHeight",
+                                 "CloseSingleTab",
+                                 "DisplayMoreItemsOnMenu",
+                                 "DockOrientation",
+                                 "DockTabAlignment",
+                                 "DockTabCloseButtonVisible",
+                                 "DockTabStripHeight",
+                                 "EqualButtonSize",
+                                 "LayoutType",
+                                 "MenuBar",
+                                 "SaveLayoutChanges",
+                                 "SelectedDockTab",
+                                 "TabNavigation",
+                                 "WrapItemsDock" });
+        }
+        private void RemoveDescriptors(System.Collections.IDictionary properties, String[] propNames)
+        {
+            foreach (String propName in propNames)
+            {
+                if (properties.Contains(propName))
+                    properties.Remove(propName);
+            }
+        }
+        protected override void PreFilterEvents(System.Collections.IDictionary events)
+        {
+            RemoveDescriptors(events,
+                new string[] { 
+                    "AutoHideChanged", 
+                    "AutoHideDisplay", 
+                    "BarDock", 
+                    "BarUndock", 
+                    "BeforeAutoHideDisplayed", 
+                    "BeforeAutoHideHidden", 
+                    "BeforeDockTabDisplayed",
+                    "Closing",
+                    "DefinitionLoaded",
+                    "DeserializeItem",
+                    "DockTabChange",
+                    "DockTabClosed",
+                    "DockTabClosing",
+                    "SerializeItem",
+                });
+            base.PreFilterEvents(events);
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/BubbleBarDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/BubbleBarDesigner.cs
new file mode 100644
index 00000000..6aa65a07
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/BubbleBarDesigner.cs	
@@ -0,0 +1,673 @@
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.ComponentModel.Design;
+using System.Drawing;
+using System.Reflection;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Design
+{
+	/// <summary>
+	/// Represents Windows Forms designer for BubbleBar control.
+	/// </summary>
+	public class BubbleBarDesigner:System.Windows.Forms.Design.ControlDesigner
+	{
+		#region Private Variables
+		private bool m_IgnoreMouseUp=false;
+		private Point m_MouseDownPosition=Point.Empty;
+		private bool m_Capture=false;
+
+		#endregion
+
+        #region Internal Implementation
+        public BubbleBarDesigner()
+		{
+		}
+
+		public override void Initialize(IComponent component) 
+		{
+			base.Initialize(component);
+			if(!component.Site.DesignMode)
+				return;
+
+			ISelectionService ss =(ISelectionService)GetService(typeof(ISelectionService));
+			if(ss!=null)
+				ss.SelectionChanged+=new EventHandler(OnSelectionChanged);
+
+			// If our component is removed we need to clean-up
+			IComponentChangeService cc=(IComponentChangeService)GetService(typeof(IComponentChangeService));
+			if(cc!=null)
+				cc.ComponentRemoving+=new ComponentEventHandler(this.OnComponentRemoving);
+
+#if !TRIAL
+            IDesignerHost dh = this.GetService(typeof(IDesignerHost)) as IDesignerHost;
+            if (dh != null)
+                dh.LoadComplete += new EventHandler(dh_LoadComplete);
+#endif
+		}
+
+		protected override void Dispose(bool disposing)
+		{
+			ISelectionService ss =(ISelectionService)GetService(typeof(ISelectionService));
+			if(ss!=null)
+				ss.SelectionChanged-=new EventHandler(OnSelectionChanged);
+
+			// If our component is removed we need to clean-up
+			IComponentChangeService cc=(IComponentChangeService)GetService(typeof(IComponentChangeService));
+			if(cc!=null)
+				cc.ComponentRemoving-=new ComponentEventHandler(this.OnComponentRemoving);
+
+			base.Dispose(disposing);
+		}
+
+		public override DesignerVerbCollection Verbs 
+		{
+			get 
+			{
+				DesignerVerb[] verbs = new DesignerVerb[]
+					{
+						new DesignerVerb("Create Tab", new EventHandler(CreateTab)),
+						new DesignerVerb("Create Button", new EventHandler(CreateButton))};
+				return new DesignerVerbCollection(verbs);
+			}
+		}
+
+#if FRAMEWORK20
+        public override void InitializeNewComponent(IDictionary defaultValues)
+        {
+            base.InitializeNewComponent(defaultValues);
+            SetDesignTimeDefaults();
+        }
+#else
+		public override void OnSetComponentDefaults()
+		{
+			base.OnSetComponentDefaults();
+			SetDesignTimeDefaults();
+		}
+#endif
+
+        private void SetDesignTimeDefaults()
+        {
+            BubbleBar bar = this.Component as BubbleBar;
+            if (bar == null)
+                return;
+            // Setup default back style
+            bar.ButtonBackAreaStyle.SetColorScheme(new ColorScheme(eDotNetBarStyle.Office2003));
+            bar.ButtonBackAreaStyle.BackColor = Color.FromArgb(66, Color.DimGray);
+            bar.ButtonBackAreaStyle.BorderColor = Color.FromArgb(180, Color.WhiteSmoke);
+            bar.ButtonBackAreaStyle.BorderTop = eStyleBorderType.Solid;
+            bar.ButtonBackAreaStyle.BorderTopWidth = 1;
+            bar.ButtonBackAreaStyle.BorderBottom = eStyleBorderType.Solid;
+            bar.ButtonBackAreaStyle.BorderBottomWidth = 1;
+            bar.ButtonBackAreaStyle.BorderLeft = eStyleBorderType.Solid;
+            bar.ButtonBackAreaStyle.BorderLeftWidth = 1;
+            bar.ButtonBackAreaStyle.BorderRight = eStyleBorderType.Solid;
+            bar.ButtonBackAreaStyle.BorderRightWidth = 1;
+            bar.ButtonBackAreaStyle.PaddingBottom = 3;
+            bar.ButtonBackAreaStyle.PaddingTop = 3;
+            bar.ButtonBackAreaStyle.PaddingLeft = 3;
+            bar.ButtonBackAreaStyle.PaddingRight = 3;
+            bar.SelectedTabColors.BorderColor = Color.Black;
+            bar.MouseOverTabColors.BorderColor = SystemColors.Highlight;
+
+#if !TRIAL
+            string key = GetLicenseKey();
+            bar.LicenseKey = key;
+#endif
+        }
+
+		private void OnSelectionChanged(object sender, EventArgs e) 
+		{
+			ISelectionService ss =(ISelectionService)GetService(typeof(ISelectionService));
+			if(ss==null)
+				return;
+
+			bool refresh=ResetFocus();
+			if(ss.PrimarySelection is BubbleBarTab)
+			{
+				if(((BubbleBarTab)ss.PrimarySelection).Parent==this.Control)
+				{
+					((BubbleBarTab)ss.PrimarySelection).Focus=true;
+					refresh=true;
+				}
+			}
+			else if(ss.PrimarySelection is BubbleButton)
+			{
+				if(((BubbleButton)ss.PrimarySelection).Parent.Parent==this.Control)
+				{
+					((BubbleButton)ss.PrimarySelection).Focus=true;
+					refresh=true;
+				}
+			}
+
+			if(refresh)
+				this.Control.Refresh();
+		}
+
+		private bool ResetFocus()
+		{
+			bool refresh=false;
+			BubbleBar bar=this.Control as BubbleBar;
+			foreach(BubbleBarTab tab in bar.Tabs)
+			{
+				if(tab.Focus)
+				{
+					tab.Focus=false;
+					refresh=true;
+				}
+				foreach(BubbleButton button in tab.Buttons)
+				{
+					if(button.Focus)
+					{
+						button.Focus=false;
+						refresh=true;
+					}
+				}
+			}
+			return refresh;
+		}
+
+		private void OnComponentRemoving(object sender,ComponentEventArgs e)
+		{
+			if(e.Component==this.Component)
+				ThisComponentRemoving(sender,e);
+			else if(e.Component is BubbleBarTab)
+			{
+				BubbleBarTab tab=e.Component as BubbleBarTab;
+				if(tab.Parent==this.Control)
+				{
+					IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+                    BubbleButton[] buttons = new BubbleButton[tab.Buttons.Count];
+                    tab.Buttons.CopyTo(buttons, 0);
+					foreach(BubbleButton button in buttons)
+						dh.DestroyComponent(button);
+					BubbleBar bar=this.Component as BubbleBar;
+                    if(bar.Tabs.Contains(tab))
+    					bar.Tabs.Remove(tab);
+                    dh.DestroyComponent(tab);
+					bar.RecalcLayout();
+					bar.Refresh();
+				}
+			}
+			else if(e.Component is BubbleButton)
+			{
+				BubbleButton button=e.Component as BubbleButton;
+				if(button.GetBubbleBar()==this.Control)
+				{
+                    if (button.Parent.Buttons.Contains(button))
+    					button.Parent.Buttons.Remove(button);
+                    IDesignerHost dh = (IDesignerHost)GetService(typeof(IDesignerHost));
+                    dh.DestroyComponent(button);
+					BubbleBar bar=this.Component as BubbleBar;
+					bar.RecalcLayout();
+					bar.Refresh();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Removes all tabs and buttons.
+		/// </summary>
+		protected virtual void ThisComponentRemoving(object sender, ComponentEventArgs e)
+		{
+			//m_InternalRemoving=true;
+//			try
+//			{
+				// Unhook events
+				IComponentChangeService cc=(IComponentChangeService)GetService(typeof(IComponentChangeService));
+				if(cc!=null)
+					cc.ComponentRemoving-=new ComponentEventHandler(this.OnComponentRemoving);
+
+				ISelectionService ss =(ISelectionService)GetService(typeof(ISelectionService));
+				if(ss!=null)
+					ss.SelectionChanged-=new EventHandler(OnSelectionChanged);
+
+				IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+				BubbleBar bar=this.Component as BubbleBar;
+				if(dh==null)
+					return;
+
+				foreach(BubbleBarTab tab in bar.Tabs)
+				{
+					foreach(BubbleButton button in tab.Buttons)
+						dh.DestroyComponent(button);
+					dh.DestroyComponent(tab);
+				}
+			//}
+//			finally
+//			{
+//				m_InternalRemoving=false;
+//			}
+		}
+
+		private void CreateButton(object sender,EventArgs e)
+		{
+			BubbleBar bar=this.Control as BubbleBar;
+			if(bar==null)
+				return;
+
+			if(bar.SelectedTab==null)
+			{
+				BubbleBarTab tab=CreateTab();
+				IComponentChangeService change=this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+				if(change!=null)
+					change.OnComponentChanging(this.Component,TypeDescriptor.GetProperties(bar).Find("SelectedTab",true));
+				bar.SelectedTab=tab;
+				if(change!=null)
+					change.OnComponentChanged(this.Component,TypeDescriptor.GetProperties(bar).Find("SelectedTab",true),null,null);
+			}
+
+			if(bar.SelectedTab==null)
+				return;
+
+			BubbleButton button=CreateButton(bar.SelectedTab);
+
+			if(button==null)
+				return;
+
+			ISelectionService ss=(ISelectionService)GetService(typeof(ISelectionService));
+			if(ss!=null)
+			{
+				ArrayList list=new ArrayList();
+				list.Add(button);
+				ss.SetSelectedComponents(list);
+			}
+		}
+
+		private void CreateTab(object sender,EventArgs e)
+		{
+			BubbleBar bar=this.Control as BubbleBar;
+			if(bar==null)
+				return;
+
+			BubbleBarTab tab=CreateTab();
+			if(tab!=null)
+			{
+				if(bar.SelectedTab!=tab)
+				{
+					IComponentChangeService change=this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+					if(change!=null)
+						change.OnComponentChanging(this.Component,TypeDescriptor.GetProperties(bar).Find("SelectedTab",true));
+					bar.SelectedTab=tab;
+					if(change!=null)
+						change.OnComponentChanged(this.Component,TypeDescriptor.GetProperties(bar).Find("SelectedTab",true),null,null);
+				}
+
+				ISelectionService ss=(ISelectionService)GetService(typeof(ISelectionService));
+				if(ss!=null)
+				{
+					ArrayList list=new ArrayList();
+					list.Add(tab);
+					ss.SetSelectedComponents(list);
+				}
+			}
+		}
+
+		private BubbleBarTab CreateTab()
+		{
+			BubbleBar bar=this.Control as BubbleBar;
+			if(bar==null)
+				return null;
+			
+			IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+			if(dh==null)
+				return null;
+
+			IComponentChangeService change=this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+			if(change!=null)
+				change.OnComponentChanging(this.Component,TypeDescriptor.GetProperties(bar).Find("Tabs",true));
+
+			BubbleBarTab tab=dh.CreateComponent(typeof(BubbleBarTab)) as BubbleBarTab;
+			if(tab==null)
+				return null;
+            
+			tab.Text=tab.Name;
+			eTabItemColor color=eTabItemColor.Blue;
+			if(bar.Tabs.Count>0)
+			{
+				int tt=bar.Tabs.Count+1;
+				Type t=typeof(eTabItemColor);
+				FieldInfo[] fi=t.GetFields(BindingFlags.Public | BindingFlags.Static);
+				int count=fi.Length;
+                while(tt>count)
+					tt-=count;
+				if(tt==0) tt++;
+				color=(eTabItemColor)Enum.Parse(typeof(eTabItemColor),fi[tt].Name);
+			}
+			tab.PredefinedColor=color;
+
+			bar.Tabs.Add(tab);
+
+			if(change!=null)
+				change.OnComponentChanged(this.Component,TypeDescriptor.GetProperties(bar).Find("Tabs",true),null,null);
+
+			return tab;
+		}
+
+		private BubbleButton CreateButton(BubbleBarTab tab)
+		{
+			BubbleBar bar=this.Control as BubbleBar;
+			if(bar==null)
+				return null;
+			
+			IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+			if(dh==null)
+				return null;
+
+			IComponentChangeService change=this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+			if(change!=null)
+				change.OnComponentChanging(this.Component,TypeDescriptor.GetProperties(tab).Find("Buttons",true));
+
+			BubbleButton button=dh.CreateComponent(typeof(BubbleButton)) as BubbleButton;
+			if(button==null)
+				return null;
+            button.Image=Helpers.LoadBitmap("SystemImages.Note24.png");
+            button.ImageLarge = Helpers.LoadBitmap("SystemImages.Note64.png");
+			tab.Buttons.Add(button);
+
+			if(change!=null)
+				change.OnComponentChanged(this.Component,TypeDescriptor.GetProperties(tab).Find("Buttons",true),null,null);
+
+			return button;
+		}
+
+		/// <summary>
+		/// Returns all components associated with this control
+		/// </summary>
+		public override System.Collections.ICollection AssociatedComponents
+		{
+			get
+			{
+				ArrayList c=new ArrayList(base.AssociatedComponents);
+				BubbleBar bar=this.Control as BubbleBar;
+				if(bar!=null)
+				{
+					foreach(BubbleBarTab tab in bar.Tabs)
+					{
+						c.Add(tab);
+						GetTabComponents(tab,c);
+					}
+				}
+				return c;
+			}
+		}
+
+		private void GetTabComponents(BubbleBarTab tab, ArrayList c)
+		{
+			foreach(BubbleButton b in tab.Buttons)
+				c.Add(b);
+		}
+
+		protected override void OnSetCursor()
+		{
+			BubbleBar bar=this.Control as BubbleBar;
+			Point pos=bar.PointToClient(System.Windows.Forms.Control.MousePosition);
+			BubbleButton button=bar.GetButtonAt(pos);
+			if(button!=null)
+			{
+				Cursor.Current=Cursors.Default;
+				return;
+			}
+			BubbleBarTab tab=bar.GetTabAt(pos);
+			if(tab!=null)
+			{
+				Cursor.Current=Cursors.Default;
+				return;
+			}
+			base.OnSetCursor();
+		}
+
+		/// <summary>
+		/// Selection support for items on container.
+		/// </summary>
+		protected override void WndProc(ref Message m)
+		{
+			switch(m.Msg)
+			{
+				case WinApi.WM_LBUTTONDOWN:
+				case WinApi.WM_RBUTTONDOWN:
+				{
+					if(OnMouseDown(ref m))
+						return;
+					break;
+				}
+				case WinApi.WM_RBUTTONUP:
+				case WinApi.WM_LBUTTONUP:
+				{
+					if(OnMouseUp(ref m))
+						return;
+					break;
+				}
+				case WinApi.WM_MOUSEMOVE:
+				{
+					if(OnMouseMove(ref m))
+						return;
+					break;
+				}
+				case WinApi.WM_LBUTTONDBLCLK:
+				{
+					if(OnMouseDoubleClick(m))
+						return;
+					break;
+				}
+			}
+
+			base.WndProc(ref m);
+		}
+
+		private bool OnMouseDoubleClick(Message m)
+		{
+			bool processed=false;
+
+			ISelectionService selection = (ISelectionService) this.GetService(typeof(ISelectionService));
+			if(selection!=null && selection.PrimarySelection is BubbleButton && ((BubbleButton)selection.PrimarySelection).GetBubbleBar()==this.Control)
+			{
+				IDesignerHost host=(IDesignerHost) this.GetService(typeof(IDesignerHost));
+				if(host!=null)
+				{
+					IDesigner designer=host.GetDesigner(selection.PrimarySelection as IComponent);
+					if(designer!=null)
+					{
+						designer.DoDefaultAction();
+						processed=true;
+					}
+				}
+			}
+
+			return processed;
+		}
+
+		protected virtual bool OnMouseDown(ref Message m)
+		{
+			BubbleBar bar=this.Control as BubbleBar;
+
+			if(bar==null)
+				return false;
+
+			Point pos=bar.PointToClient(System.Windows.Forms.Control.MousePosition);
+			m_MouseDownPosition=pos;
+
+			BubbleButton button=bar.GetButtonAt(pos);
+			if(button!=null)
+			{
+				ISelectionService selection = (ISelectionService) this.GetService(typeof(ISelectionService));
+				if(selection!=null)
+				{
+					ArrayList arr=new ArrayList(1);
+					arr.Add(button);
+#if FRAMEWORK20
+                    selection.SetSelectedComponents(arr, SelectionTypes.Primary);
+#else
+                    selection.SetSelectedComponents(arr,SelectionTypes.MouseDown);
+#endif
+                    m_IgnoreMouseUp =true;
+
+					if(m.Msg==WinApi.WM_RBUTTONDOWN)
+					{
+						this.OnContextMenu(System.Windows.Forms.Control.MousePosition.X,System.Windows.Forms.Control.MousePosition.Y);
+					}
+
+					return true;
+				}
+			}
+
+			BubbleBarTab tab=bar.GetTabAt(pos);
+			if(tab!=null)
+			{
+				ISelectionService selection = (ISelectionService) this.GetService(typeof(ISelectionService));
+				if(selection!=null && selection.PrimarySelection!=tab)
+				{
+					ArrayList arr=new ArrayList(1);
+					arr.Add(tab);
+#if FRAMEWORK20
+                    selection.SetSelectedComponents(arr, SelectionTypes.Primary);
+#else
+                    selection.SetSelectedComponents(arr,SelectionTypes.MouseDown);
+#endif
+
+                    if (bar.SelectedTab!=tab)
+					{
+						IComponentChangeService change=this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+						if(change!=null)
+							change.OnComponentChanging(this.Component,TypeDescriptor.GetProperties(bar).Find("SelectedTab",true));
+
+						bar.SelectedTab=tab;
+
+						if(change!=null)
+							change.OnComponentChanged(this.Component,TypeDescriptor.GetProperties(bar).Find("SelectedTab",true),null,null);
+					}
+					m_IgnoreMouseUp=true;
+					if(m.Msg!=WinApi.WM_RBUTTONDOWN)
+						return true;
+				}
+
+				if(m.Msg==WinApi.WM_RBUTTONDOWN)
+				{
+					this.OnContextMenu(System.Windows.Forms.Control.MousePosition.X,System.Windows.Forms.Control.MousePosition.Y);
+					return true;
+				}
+			}
+					
+			return false;
+		}
+
+		protected virtual bool OnMouseMove(ref Message m)
+		{
+			BubbleBar bar=this.Control as BubbleBar;
+			Point pos=bar.PointToClient(System.Windows.Forms.Control.MousePosition);
+
+			if(Control.MouseButtons==MouseButtons.Left)
+			{
+				if(bar.DragInProgress)
+				{
+					bar.DragMouseMove(pos);
+					return true;
+				}
+				else if(!m_MouseDownPosition.IsEmpty && Math.Abs(m_MouseDownPosition.X-pos.X)>=2 || Math.Abs(m_MouseDownPosition.Y-pos.Y)>=2)
+				{
+					BubbleBarTab tabDrag=bar.GetTabAt(pos);
+					if(tabDrag!=null)
+					{
+						bar.StartDrag(tabDrag);
+						System.Windows.Forms.Control c=System.Windows.Forms.Control.FromHandle(m.HWnd);
+						if(c!=null)
+						{
+							m_Capture=true;
+							c.Capture=true;
+						}
+						return true;
+					}
+					BubbleButton buttonDrag=bar.GetButtonAt(pos);
+					if(buttonDrag!=null)
+					{
+						bar.StartDrag(buttonDrag);
+						System.Windows.Forms.Control c=System.Windows.Forms.Control.FromHandle(m.HWnd);
+						if(c!=null)
+						{
+							m_Capture=true;
+							c.Capture=true;
+						}
+						return true;
+					}
+					m_MouseDownPosition=Point.Empty;
+				}
+			}
+
+			//BubbleButton button=bar.GetButtonAt(pos);
+			BubbleBarTab tab=bar.GetTabAt(pos);
+			if(tab!=null)
+				bar.SetMouseOverTab(tab);
+			else
+				bar.SetMouseOverTab(null);
+
+			return false;
+		}
+
+		private bool OnMouseUp(ref Message m)
+		{
+			if(m_Capture)
+			{
+				System.Windows.Forms.Control c=System.Windows.Forms.Control.FromHandle(m.HWnd);
+				if(c!=null)
+					c.Capture=false;
+				m_Capture=false;
+			}
+
+            BubbleBar bar=this.Control as BubbleBar;
+			if(bar!=null && bar.DragInProgress)
+			{
+				Point pos=bar.PointToClient(System.Windows.Forms.Control.MousePosition);
+				bar.DragMouseUp(pos);
+				
+				BubbleBarTab tab=bar.SelectedTab;
+				if(tab!=null)
+				{
+					IComponentChangeService change=this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+					if(change!=null)
+						change.OnComponentChanging(this.Component,TypeDescriptor.GetProperties(tab).Find("Buttons",true));
+					if(change!=null)
+						change.OnComponentChanged(this.Component,TypeDescriptor.GetProperties(tab).Find("Buttons",true),null,null);
+				}
+			}
+
+			if(m_IgnoreMouseUp)
+			{
+				m_IgnoreMouseUp=false;
+				return true;
+			}
+
+			return false;
+        }
+        #endregion
+
+        #region Licensing Stuff
+#if !TRIAL
+        private string GetLicenseKey()
+        {
+            string key = "";
+            Microsoft.Win32.RegistryKey regkey = Microsoft.Win32.Registry.LocalMachine;
+            regkey = regkey.OpenSubKey("Software\\DevComponents\\Licenses", false);
+            if (regkey != null)
+            {
+                object keyValue = regkey.GetValue("DevComponents.DotNetBar.DotNetBarManager2");
+                if (keyValue != null)
+                    key = keyValue.ToString();
+            }
+            return key;
+        }
+        private void dh_LoadComplete(object sender, EventArgs e)
+        {
+            IDesignerHost dh = this.GetService(typeof(IDesignerHost)) as IDesignerHost;
+            if (dh != null)
+                dh.LoadComplete -= new EventHandler(dh_LoadComplete);
+
+            string key = GetLicenseKey();
+            BubbleBar bar = this.Control as BubbleBar;
+            if (key != "" && bar != null && bar.LicenseKey == "" && bar.LicenseKey != key)
+                TypeDescriptor.GetProperties(bar)["LicenseKey"].SetValue(bar, key);
+        }
+#endif
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/BubbleBarTabCollectionEditor.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/BubbleBarTabCollectionEditor.cs
new file mode 100644
index 00000000..767fd2c4
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/BubbleBarTabCollectionEditor.cs	
@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace DevComponents.DotNetBar.Design
+{
+    /// <summary>
+    /// Support for BubbleBarTab tabs design-time editor.
+    /// </summary>
+    public class BubbleBarTabCollectionEditor : System.ComponentModel.Design.CollectionEditor
+    {
+        public BubbleBarTabCollectionEditor(Type type)
+            : base(type)
+        {
+        }
+        protected override Type CreateCollectionItemType()
+        {
+            return typeof(BubbleBarTab);
+        }
+        protected override Type[] CreateNewItemTypes()
+        {
+            return new Type[] { typeof(BubbleBarTab) };
+        }
+        protected override object CreateInstance(Type itemType)
+        {
+            object item = base.CreateInstance(itemType);
+            if (item is BubbleBarTab)
+            {
+                BubbleBarTab tabItem = item as BubbleBarTab;
+                tabItem.Text = "My Tab";
+                tabItem.PredefinedColor = eTabItemColor.Blue;
+            }
+            return item;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/BubbleBarTabDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/BubbleBarTabDesigner.cs
new file mode 100644
index 00000000..d4d73129
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/BubbleBarTabDesigner.cs	
@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel.Design;
+using System.Collections;
+
+namespace DevComponents.DotNetBar.Design
+{
+    #region BubbleBarTabDesigner
+    /// <summary>
+    /// Represents designer for BaseItem objects and derived classes.
+    /// </summary>
+    public class BubbleBarTabDesigner : ComponentDesigner
+    {
+        /// <summary>
+        /// Creates new instance of the class.
+        /// </summary>
+        public BubbleBarTabDesigner()
+        {
+        }
+
+        public override ICollection AssociatedComponents
+        {
+            get
+            {
+                ArrayList components = new ArrayList();
+                BubbleBarTab parent = this.Component as BubbleBarTab;
+                if (parent == null)
+                    return base.AssociatedComponents;
+                parent.Buttons.CopyTo(components);
+                return components;
+            }
+        }
+    }
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/BubbleButtonCollectionEditor.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/BubbleButtonCollectionEditor.cs
new file mode 100644
index 00000000..0993e10e
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/BubbleButtonCollectionEditor.cs	
@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace DevComponents.DotNetBar.Design
+{
+    #region BubbleButtonCollectionEditor
+    /// <summary>
+    /// Support for BubbleBarTab tabs design-time editor.
+    /// </summary>
+    public class BubbleButtonCollectionEditor : System.ComponentModel.Design.CollectionEditor
+    {
+        public BubbleButtonCollectionEditor(Type type)
+            : base(type)
+        {
+        }
+        protected override Type CreateCollectionItemType()
+        {
+            return typeof(BubbleButton);
+        }
+        protected override Type[] CreateNewItemTypes()
+        {
+            return new Type[] { typeof(BubbleButton) };
+        }
+        protected override object CreateInstance(Type itemType)
+        {
+            object item = base.CreateInstance(itemType);
+            if (item is BubbleButton)
+            {
+                BubbleButton button = item as BubbleButton;
+                button.Image = Helpers.LoadBitmap("SystemImages.Note24.png");
+                button.ImageLarge = Helpers.LoadBitmap("SystemImages.Note64.png");
+            }
+            return item;
+        }
+    }
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ButtonItemEditor.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ButtonItemEditor.cs
new file mode 100644
index 00000000..8698b739
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ButtonItemEditor.cs	
@@ -0,0 +1,41 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace DevComponents.DotNetBar.Design
+{
+    /// <summary>
+    /// Summary description for ComboItemsEditor.
+    /// </summary>
+    public class ButtonItemEditor : System.ComponentModel.Design.CollectionEditor
+    {
+        public ButtonItemEditor(Type type)
+            : base(type)
+        {
+        }
+        protected override Type CreateCollectionItemType()
+        {
+            return typeof(ButtonItem);
+        }
+        protected override object CreateInstance(Type itemType)
+        {
+            object item = base.CreateInstance(itemType);
+            if (item is ButtonItem)
+            {
+                ButtonItem button = item as ButtonItem;
+                button.Text = "New Item";
+                button.ImagePosition = eImagePosition.Left;
+            }
+            else if (item is LabelItem)
+            {
+                LabelItem label = item as LabelItem;
+                label.Text = "New Label";
+            }
+            return item;
+        }
+        protected override Type[] CreateNewItemTypes()
+        {
+            return new Type[] { typeof(ButtonItem), typeof(LabelItem) };
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ButtonXDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ButtonXDesigner.cs
new file mode 100644
index 00000000..9b94c1d7
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ButtonXDesigner.cs	
@@ -0,0 +1,220 @@
+using System;
+using System.Text;
+using System.ComponentModel.Design;
+using System.Drawing;
+using System.Windows.Forms;
+using System.ComponentModel;
+using System.Collections;
+
+namespace DevComponents.DotNetBar.Design
+{
+    /// <summary>
+    /// Represents Windows Forms designer for ButtonX control.
+    /// </summary>
+    public class ButtonXDesigner : BarBaseControlDesigner
+    {
+        #region Constructor
+        public ButtonXDesigner()
+		{
+			this.EnableItemDragDrop=false;
+            this.PassiveContainer = true;
+        }
+
+        public override void Initialize(IComponent component)
+        {
+            base.Initialize(component);
+            if (!component.Site.DesignMode)
+                return;
+
+            ((ButtonX)component).SetDesignMode(true);
+        }
+        #endregion
+
+        #region Internal Implementation
+#if FRAMEWORK20
+        public override void InitializeNewComponent(IDictionary defaultValues)
+        {
+            base.InitializeNewComponent(defaultValues);
+            SetDesignTimeDefaults();
+        }
+#else
+		public override void OnSetComponentDefaults()
+		{
+			base.OnSetComponentDefaults();
+            SetDesignTimeDefaults();
+		}
+#endif
+
+        private void SetDesignTimeDefaults()
+        {
+            ButtonX button = this.Control as ButtonX;
+            if (button == null)
+                return;
+            button.ColorTable = eButtonColor.OrangeWithBackground;
+            button.Style = eDotNetBarStyle.StyleManagerControlled;
+        }
+
+        public override DesignerVerbCollection Verbs
+        {
+            get
+            {
+                Bar bar = this.Control as Bar;
+                DesignerVerb[] verbs = null;
+                verbs = new DesignerVerb[]
+						{
+							new DesignerVerb("Add Button", new EventHandler(CreateButton)),
+							new DesignerVerb("Add Horizontal Container", new EventHandler(CreateHorizontalContainer)),
+							new DesignerVerb("Add Vertical Container", new EventHandler(CreateVerticalContainer)),
+                            new DesignerVerb("Add Gallery Container", new EventHandler(CreateGalleryContainer)),
+                            new DesignerVerb("Add Scrollable Container", new EventHandler(CreateScrollContainer)),
+							new DesignerVerb("Add Text Box", new EventHandler(CreateTextBox)),
+							new DesignerVerb("Add Combo Box", new EventHandler(CreateComboBox)),
+							new DesignerVerb("Add Label", new EventHandler(CreateLabel)),
+                            new DesignerVerb("Add Check Box", new EventHandler(CreateCheckBox)),
+                            new DesignerVerb("Add Micro-Chart", new EventHandler(CreateMicroChart)),
+                            new DesignerVerb("Add Switch Button", new EventHandler(CreateSwitch)),
+                            new DesignerVerb("Add Slider", new EventHandler(CreateSliderItem)),
+                            new DesignerVerb("Add Rating Item", new EventHandler(CreateRatingItem)),
+                            new DesignerVerb("Add Control Container", new EventHandler(CreateControlContainer)),
+							new DesignerVerb("Add Color Picker", new EventHandler(CreateColorPicker))};
+                return new DesignerVerbCollection(verbs);
+            }
+        }
+
+        protected override void OnitemCreated(BaseItem item)
+        {
+            TypeDescriptor.GetProperties(item)["GlobalItem"].SetValue(item, false);
+        }
+
+        private void CreateScrollContainer(object sender, EventArgs e)
+        {
+            GalleryContainer item = CreateComponent(typeof(GalleryContainer)) as GalleryContainer;
+            TypeDescriptor.GetProperties(item)["MinimumSize"].SetValue(item, new Size(150, 200));
+            TypeDescriptor.GetProperties(((GalleryContainer)item).BackgroundStyle)["Class"].SetValue(((GalleryContainer)item).BackgroundStyle, "");
+            TypeDescriptor.GetProperties(item)["EnableGalleryPopup"].SetValue(item, false);
+            TypeDescriptor.GetProperties(item)["LayoutOrientation"].SetValue(item, DevComponents.DotNetBar.eOrientation.Vertical);
+            TypeDescriptor.GetProperties(item)["MultiLine"].SetValue(item, false);
+            TypeDescriptor.GetProperties(item)["PopupUsesStandardScrollbars"].SetValue(item, false);
+            item.NeedRecalcSize = true;
+            this.RecalcLayout();
+        }
+
+
+        private void CreateVerticalContainer(object sender, EventArgs e)
+        {
+            CreateContainer(this.GetItemContainer(), eOrientation.Vertical);
+        }
+
+        private void CreateHorizontalContainer(object sender, EventArgs e)
+        {
+            CreateContainer(this.GetItemContainer(), eOrientation.Horizontal);
+        }
+
+        private void CreateContainer(BaseItem parent, eOrientation orientation)
+        {
+            try
+            {
+                m_CreatingItem = true;
+                DesignerSupport.CreateItemContainer(this, parent, orientation);
+            }
+            finally
+            {
+                m_CreatingItem = false;
+            }
+            this.RecalcLayout();
+        }
+
+        protected override BaseItem GetItemContainer()
+        {
+            ButtonX button = this.Control as ButtonX;
+            if (button != null)
+                return button.InternalItem;
+            return base.GetItemContainer();
+        }
+
+        public override bool CanParent(Control control)
+        {
+            return false;
+        }
+
+        protected override void OnMouseDragBegin(int x, int y)
+        {
+            ButtonX ctrl = this.GetItemContainerControl() as ButtonX;
+            if (ctrl != null)
+            {
+                ISelectionService ss = GetService(typeof(ISelectionService)) as ISelectionService;
+                bool selected = false;
+                if (ss != null) selected = ss.PrimarySelection == this.Component;
+                ButtonItem container = this.GetItemContainer() as ButtonItem;
+                Point pos = ctrl.PointToClient(new Point(x, y));
+                MouseEventArgs e = new MouseEventArgs(MouseButtons.Left, 0, pos.X, pos.Y, 0);
+                if (container != null &&
+                    (!container.SubItemsRect.IsEmpty && container.SubItemsRect.Contains(pos) || 
+                    (!container.ShowSubItems || container.SubItemsExpandWidth <= 1) && selected) 
+                    && container.SubItems.Count > 0)
+                {
+                    container.Expanded = !container.Expanded;
+                    return;
+                }
+            }
+            base.OnMouseDragBegin(x, y);
+        }
+
+        protected override bool OnMouseDown(ref Message m, MouseButtons button)
+        {
+            return false;
+        }
+
+        protected override bool OnMouseUp(ref Message m)
+        {
+            ButtonX ctrl = this.GetItemContainerControl() as ButtonX;
+            if (ctrl != null)
+            {
+                if (ctrl.Expanded && !this.DragInProgress)
+                    return true;
+            }
+
+            bool bProcessed = false;
+
+            BaseItem container = this.GetItemContainer();
+            IOwner owner = this.GetIOwner();
+
+            if (ctrl == null || owner == null || container == null)
+                return false;
+
+            Point pos = ctrl.PointToClient(System.Windows.Forms.Control.MousePosition);
+            MouseEventArgs e = new MouseEventArgs(MouseButtons.Left, 0, pos.X, pos.Y, 0);
+            container.InternalMouseUp(e);
+
+            if (this.DragItem != null)
+            {
+                MouseDragDrop(pos.X, pos.Y);
+                return true;
+            }
+
+            return bProcessed;
+        }
+
+        /// <summary>
+        /// Triggered when some other component on the form is removed.
+        /// </summary>
+        protected override void OtherComponentRemoving(object sender, ComponentEventArgs e)
+        {
+            bool callBase = true;
+            if (e.Component is BaseItem)
+            {
+                BaseItem item = e.Component as BaseItem;
+                BaseItem parent = this.GetItemContainer();
+                if (item!=null && parent!=null && parent.SubItems.Contains(item))
+                {
+                    parent.SubItems.Remove(item);
+                    this.RecalcLayout();
+                    callBase = false;
+                }
+            }
+            if(callBase)
+                base.OtherComponentRemoving(sender, e);
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/CheckBoxItemDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/CheckBoxItemDesigner.cs
new file mode 100644
index 00000000..6b20d560
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/CheckBoxItemDesigner.cs	
@@ -0,0 +1,23 @@
+using System;
+using System.Text;
+using System.ComponentModel.Design;
+
+namespace DevComponents.DotNetBar.Design
+{
+    public class CheckBoxItemDesigner : BaseItemDesigner
+    {
+        public override DesignerVerbCollection Verbs
+        {
+            get
+            {
+                return new DesignerVerbCollection();
+            }
+        }
+
+        protected override void SetDesignTimeDefaults()
+        {
+            CheckBoxItem c = this.Component as CheckBoxItem;
+            if (c != null) c.AutoCollapseOnClick = false;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/CheckBoxXDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/CheckBoxXDesigner.cs
new file mode 100644
index 00000000..803116e9
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/CheckBoxXDesigner.cs	
@@ -0,0 +1,41 @@
+using System;
+using System.Text;
+using System.Windows.Forms.Design;
+using DevComponents.DotNetBar.Controls;
+#if FRAMEWORK20
+using System.Collections.Generic;
+using System.Collections;
+#endif
+
+namespace DevComponents.DotNetBar.Design
+{
+    /// <summary>
+    /// Represents WinForms designer for Slider control.
+    /// </summary>
+    public class CheckBoxXDesigner : ControlDesigner
+    {
+#if FRAMEWORK20
+        public override void InitializeNewComponent(IDictionary defaultValues)
+        {
+            base.InitializeNewComponent(defaultValues);
+            SetDesignTimeDefaults();
+        }
+#else
+        public override void OnSetComponentDefaults()
+        {
+            SetDesignTimeDefaults();
+            base.OnSetComponentDefaults();
+        }
+#endif
+
+        private void SetDesignTimeDefaults()
+        {
+            CheckBoxX checkBox = this.Control as CheckBoxX;
+            if (checkBox != null)
+            {
+                checkBox.Style = eDotNetBarStyle.StyleManagerControlled;
+                checkBox.Width = 100;
+            }
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/CheckedListBoxSelector.Designer.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/CheckedListBoxSelector.Designer.cs
new file mode 100644
index 00000000..e27786bb
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/CheckedListBoxSelector.Designer.cs differ
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/CheckedListBoxSelector.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/CheckedListBoxSelector.cs
new file mode 100644
index 00000000..2e345000
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/CheckedListBoxSelector.cs	
@@ -0,0 +1,62 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Data;
+using System.Text;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Design
+{
+    public partial class CheckedListBoxSelector : UserControl
+    {
+        public CheckedListBoxSelector()
+        {
+            InitializeComponent();
+        }
+
+        private void checkedListBox1_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            buttonMoveUp.Enabled = checkedListBox1.SelectedIndex >= 0;
+            buttonMoveDown.Enabled = buttonMoveUp.Enabled;
+        }
+
+        public CheckedListBox ListBox
+        {
+            get
+            {
+                return checkedListBox1;
+            }
+        }
+
+        private void buttonMoveUp_Click(object sender, EventArgs e)
+        {
+            if (checkedListBox1.SelectedIndex > 0)
+            {
+                int index = checkedListBox1.SelectedIndex;
+                object item = checkedListBox1.Items[index];
+                CheckState checkState = checkedListBox1.GetItemCheckState(index);
+                checkedListBox1.Items.RemoveAt(index);
+                index--;
+                checkedListBox1.Items.Insert(index, item);
+                checkedListBox1.SelectedIndex = index;
+                checkedListBox1.SetItemCheckState(index, checkState);
+            }
+        }
+
+        private void buttonMoveDown_Click(object sender, EventArgs e)
+        {
+            if (checkedListBox1.SelectedIndex < checkedListBox1.Items.Count - 1)
+            {
+                int index = checkedListBox1.SelectedIndex;
+                object item = checkedListBox1.Items[index];
+                CheckState checkState = checkedListBox1.GetItemCheckState(index);
+                checkedListBox1.Items.RemoveAt(index);
+                index++;
+                checkedListBox1.Items.Insert(index, item);
+                checkedListBox1.SelectedIndex = index;
+                checkedListBox1.SetItemCheckState(index, checkState);
+            }
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/CheckedListBoxSelector.resx b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/CheckedListBoxSelector.resx
new file mode 100644
index 00000000..19dc0dd8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/CheckedListBoxSelector.resx	
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ColorPickerButtonDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ColorPickerButtonDesigner.cs
new file mode 100644
index 00000000..532f6798
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ColorPickerButtonDesigner.cs	
@@ -0,0 +1,35 @@
+using System;
+using System.Text;
+using System.ComponentModel;
+using System.Drawing;
+using System.Collections;
+
+namespace DevComponents.DotNetBar.Design
+{
+    public class ColorPickerButtonDesigner : ButtonXDesigner
+    {
+#if FRAMEWORK20
+        public override void InitializeNewComponent(IDictionary defaultValues)
+        {
+            base.InitializeNewComponent(defaultValues);
+            SetDesignTimeDefaults();
+        }
+#else
+		public override void OnSetComponentDefaults()
+		{
+			base.OnSetComponentDefaults();
+            SetDesignTimeDefaults();
+		}
+#endif
+
+        private void SetDesignTimeDefaults()
+        {
+            ColorPickerButton b = this.Control as ColorPickerButton;
+            TypeDescriptor.GetProperties(b)["Image"].SetValue(b, Helpers.LoadBitmap("SystemImages.ColorPickerButtonImage.png"));
+            TypeDescriptor.GetProperties(b)["SelectedColorImageRectangle"].SetValue(b, new Rectangle(2,2,12,12));
+            TypeDescriptor.GetProperties(b)["Text"].SetValue(b, "");
+            TypeDescriptor.GetProperties(b)["Size"].SetValue(b, new Size(37,23));
+            TypeDescriptor.GetProperties(b)["Style"].SetValue(b, eDotNetBarStyle.StyleManagerControlled);
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ColorSchemeColorConverter.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ColorSchemeColorConverter.cs
new file mode 100644
index 00000000..313000c6
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ColorSchemeColorConverter.cs	
@@ -0,0 +1,68 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Globalization;
+using System.Reflection;
+
+#if AdvTree
+namespace DevComponents.Tree.Design
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar.Design
+#endif
+{
+	/// <summary>
+	/// Summary description for ColorSchemeColorConverter.
+	/// </summary>
+	public class ColorSchemeColorConverter:ColorConverter   
+	{
+		/// <summary>
+		/// This member supports the .NET Framework infrastructure and is not intended to be used directly from your code.
+		/// </summary>
+		/// <param name="context">An ITypeDescriptorContext that provides a format context. </param>
+		/// <param name="culture">The CultureInfo to use as the current culture. </param>
+		/// <param name="value">The Object to convert. </param>
+		/// <returns>An Object that represents the converted value.</returns>
+		public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
+		{
+			Color color=Color.Empty;
+			if(value is string && value.ToString().StartsWith("CS."))
+			{
+				string propertyName=context.PropertyDescriptor.Name;
+				PropertyInfo property=context.Instance.GetType().GetProperty(propertyName+"SchemePart",BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance);
+				if(property!=null)
+				{
+					property.SetValue(context.Instance,Enum.Parse(typeof(eColorSchemePart),value.ToString().Substring(4)),new object[]{});
+					color=(Color)context.PropertyDescriptor.GetValue(context.Instance);
+				}
+			}
+			else
+				return base.ConvertFrom(context, culture, value);
+			
+			return color;
+		}
+		
+		/// <summary>
+		/// Converts the given value object to the specified type.
+		/// </summary>
+		/// <param name="context">An ITypeDescriptorContext that provides a format context. </param>
+		/// <param name="culture">A CultureInfo object. If a null reference (Nothing in Visual Basic) is passed, the current culture is assumed. </param>
+		/// <param name="value">The Object to convert.</param>
+		/// <param name="destinationType">The Type to convert the value parameter to. </param>
+		/// <returns>An Object that represents the converted value.</returns>
+		public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+		{
+			if(context!=null && (destinationType == typeof(string)) && (value is Color))
+			{
+				string propertyName=context.PropertyDescriptor.Name;
+				PropertyInfo property=context.Instance.GetType().GetProperty(propertyName+"SchemePart",BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance);
+				if(property!=null)
+				{
+					eColorSchemePart part = (eColorSchemePart)property.GetValue(context.Instance, new object[] {});
+					if(part!=eColorSchemePart.None)
+						return "CS." + part.ToString();
+				}
+			}
+			return base.ConvertTo(context, culture, value, destinationType); 
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ColumnHeaderCollectionEditor.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ColumnHeaderCollectionEditor.cs
new file mode 100644
index 00000000..ddf927e4
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ColumnHeaderCollectionEditor.cs	
@@ -0,0 +1,40 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using DevComponents.AdvTree;
+
+namespace DevComponents.DotNetBar.Design
+{
+    #region ColumnHeaderCollectionEditor
+    /// <summary>
+    /// Support for ColumnHeader tabs design-time editor.
+    /// </summary>
+    public class ColumnHeaderCollectionEditor : System.ComponentModel.Design.CollectionEditor
+    {
+        /// <summary>Creates new instance of the class</summary>
+        /// <param name="type">Type to initialize editor with.</param>
+        public ColumnHeaderCollectionEditor(Type type)
+            : base(type)
+        {
+        }
+        protected override Type CreateCollectionItemType()
+        {
+            return typeof(ColumnHeader);
+        }
+        protected override Type[] CreateNewItemTypes()
+        {
+            return new Type[] { typeof(ColumnHeader) };
+        }
+        protected override object CreateInstance(Type itemType)
+        {
+            object item = base.CreateInstance(itemType);
+            if (item is ColumnHeader)
+            {
+                ColumnHeader ch = item as ColumnHeader;
+                ch.Text = ch.Name;
+            }
+            return item;
+        }
+    }
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ColumnNamesEditor.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ColumnNamesEditor.cs
new file mode 100644
index 00000000..a1ec0596
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ColumnNamesEditor.cs	
@@ -0,0 +1,106 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing.Design;
+using System.ComponentModel;
+using System.Windows.Forms.Design;
+using DevComponents.DotNetBar.Controls;
+using DevComponents.DotNetBar.Rendering;
+using System.Globalization;
+
+namespace DevComponents.DotNetBar.Design
+{
+    public class ColumnNamesEditor : UITypeEditor
+    {
+        #region Constructor
+        private TextBoxX _TextBox = null;
+        /// <summary>
+        /// Initializes a new instance of the ColumnNamesEditor class.
+        /// </summary>
+        public ColumnNamesEditor()
+        {
+            _TextBox = new TextBoxX();
+            _TextBox.Multiline = true;
+            _TextBox.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
+            _TextBox.WatermarkBehavior = eWatermarkBehavior.HideNonEmpty;
+            _TextBox.WatermarkText = "Use Enter key to separate custom column names";
+            _TextBox.Border.Class = ElementStyleClassKeys.TextBoxBorderKey;
+            _TextBox.AcceptsReturn = true;
+        }
+        #endregion
+
+        #region Implementation
+        public override object EditValue(ITypeDescriptorContext context, IServiceProvider provider, object value)
+        {
+            if (context != null
+                && context.Instance != null
+                && provider != null)
+            {
+                IWindowsFormsEditorService edSvc = (IWindowsFormsEditorService)provider.GetService(typeof(IWindowsFormsEditorService));
+                if (edSvc != null)
+                {
+                    PropertyDescriptor descriptor = TypeDescriptor.GetProperties(context.Instance)["DataSource"];
+                    if (descriptor == null)
+                    {
+                        return value;
+                    }
+
+                    _TextBox.Text = (string)value;
+                    _TextBox.MinimumSize = new System.Drawing.Size(24, 120);
+                    edSvc.DropDownControl(_TextBox);
+
+                    return _TextBox.Text;
+                }
+            }
+            return value;
+        }
+
+        public override UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext context)
+        {
+            return UITypeEditorEditStyle.DropDown;
+        }
+        #endregion
+    }
+
+    #region ColumnNamesConverter
+    public class ColumnNamesConverter : TypeConverter
+    {
+        // Methods
+        public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
+        {
+            return ((sourceType == typeof(string)) || base.CanConvertFrom(context, sourceType));
+        }
+        const string tempCommaReplacement = "```";
+        public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
+        {
+            if (value != null && value is string)
+            {
+                string s = ((string)value).Replace(",,", tempCommaReplacement);
+                s = s.Replace(",", "\r\n");
+                s = s.Replace(tempCommaReplacement, ",");
+                return s;
+            }
+            return value;
+        }
+
+        public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+        {
+            if ((destinationType != typeof(string)) || !(value is string))
+            {
+                return base.ConvertTo(context, culture, value, destinationType);
+            }
+            if (value != null)
+            {
+                string s = ((string)value).Replace(",", tempCommaReplacement);
+                s = s.Replace("\r\n", ",");
+                s = s.Replace(tempCommaReplacement, ",");
+                return s;
+            }
+            return "";
+        }
+    }
+    #endregion
+
+ 
+
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ComboBoxExDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ComboBoxExDesigner.cs
new file mode 100644
index 00000000..af400c93
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ComboBoxExDesigner.cs	
@@ -0,0 +1,173 @@
+using System;
+using System.Text;
+using System.Windows.Forms.Design;
+using DevComponents.DotNetBar.Controls;
+using System.ComponentModel;
+using System.Collections;
+using System.Windows.Forms;
+using System.ComponentModel.Design;
+using DevComponents.Editors;
+
+namespace DevComponents.DotNetBar.Design
+{
+    /// <summary>
+    /// Represents Windows Forms designer for the ComboBoxEx control.
+    /// </summary>
+    public class ComboBoxExDesigner : ControlDesigner
+    {
+#if FRAMEWORK20
+        public override void InitializeNewComponent(IDictionary defaultValues)
+        {
+            base.InitializeNewComponent(defaultValues);
+            SetDesignTimeDefaults();
+        }
+#else
+		public override void OnSetComponentDefaults()
+		{
+			base.OnSetComponentDefaults();
+			SetDesignTimeDefaults();
+		}
+#endif
+
+        public override void Initialize(IComponent component)
+        {
+            base.Initialize(component);
+            if (component.Site!=null && !component.Site.DesignMode)
+                return;
+
+            // If our component is removed we need to clean-up
+            IComponentChangeService cc = (IComponentChangeService)GetService(typeof(IComponentChangeService));
+            if (cc != null)
+            {
+                cc.ComponentRemoving += new ComponentEventHandler(this.OnComponentRemoved);
+            }
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            IComponentChangeService cc = (IComponentChangeService)GetService(typeof(IComponentChangeService));
+            if (cc != null)
+                cc.ComponentRemoved -= new ComponentEventHandler(this.OnComponentRemoved);
+
+            base.Dispose(disposing);
+        }
+
+        private void SetDesignTimeDefaults()
+        {
+            ComboBoxEx c = this.Control as ComboBoxEx;
+            c.DisplayMember = "Text";
+            c.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed;
+            c.ItemHeight = c.GetFontHeight() + 1;
+            c.Style = eDotNetBarStyle.StyleManagerControlled;
+#if FRAMEWORK20
+            c.FormattingEnabled = true;
+#endif
+
+            PropertyDescriptor d = TypeDescriptor.GetProperties(c)["Text"];
+            if (d != null && d.PropertyType == typeof(string) && !d.IsReadOnly && d.IsBrowsable)
+            {
+                d.SetValue(c, "");
+            }
+        }
+
+#if FRAMEWORK20
+        private DesignerActionListCollection m_ActionLists;
+        public override DesignerActionListCollection ActionLists
+        {
+            get
+            {
+                if (m_ActionLists == null)
+                {
+                    m_ActionLists = new DesignerActionListCollection();
+                    object o = this.GetType().Assembly.CreateInstance("System.Windows.Forms.Design.ListControlBoundActionList", false, System.Reflection.BindingFlags.NonPublic, null, new object[] { this }, null, null);
+                    if(o!=null)
+                        m_ActionLists.Add(o as DesignerActionList);
+                }
+                return m_ActionLists;
+            }
+        }
+#endif
+        public override SelectionRules SelectionRules
+        {
+            get
+            {
+                SelectionRules r = base.SelectionRules;
+                ComboBoxEx c = this.Control as ComboBoxEx; ;
+                PropertyDescriptor d = TypeDescriptor.GetProperties(c)["DropDownStyle"];
+                if (d == null)
+                    return r;
+
+                ComboBoxStyle style = (ComboBoxStyle)d.GetValue(c);
+                if (style != ComboBoxStyle.DropDown && style != ComboBoxStyle.DropDownList)
+                {
+                    return r;
+                }
+                return (r & ~(SelectionRules.BottomSizeable | SelectionRules.TopSizeable));
+            }
+        }
+
+        #if FRAMEWORK20
+        protected override void PreFilterProperties(System.Collections.IDictionary properties)
+        {
+            base.PreFilterProperties(properties);
+
+            properties["FlatStyle"] = TypeDescriptor.CreateProperty(
+                this.GetType(),
+                "FlatStyle",
+                typeof(FlatStyle),
+                new Attribute[] { new BrowsableAttribute(true), new DefaultValueAttribute(FlatStyle.Flat)});
+        }
+        
+
+        [Browsable(true), DefaultValue(FlatStyle.Flat), Description("Gets or sets the combo box flat style")]
+        public FlatStyle FlatStyle
+        {
+            get
+            {
+                ComboBox cb = this.Control as ComboBox;
+                return cb.FlatStyle;
+            }
+            set
+            {
+                ComboBox cb = this.Control as ComboBox;
+                cb.FlatStyle = value;
+            }
+        }
+        #endif
+
+		public override ICollection AssociatedComponents
+		{
+			get
+			{
+				ArrayList al = new ArrayList(base.AssociatedComponents);
+				ComboBoxEx cex = this.Component as ComboBoxEx;
+				foreach(object o in cex.Items)
+				{
+					if (o is ComboItem)
+					{
+						al.Add(o);
+					}
+				}
+				return al;
+			}
+		}
+
+		private void OnComponentRemoved(object sender, ComponentEventArgs e)
+		{
+			if (e.Component == this.Component)
+			{
+				ComboBoxEx cex = this.Component as ComboBoxEx;
+				IDesignerHost dh = GetService(typeof(IDesignerHost)) as IDesignerHost;
+				if (dh == null) return;
+				foreach (object o in cex.Items)
+				{
+					if (o is ComboItem)
+					{
+						ComboItem ci = o as ComboItem;
+						dh.DestroyComponent(ci);
+					}
+				}
+			}
+		}
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ComboItemsEditor.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ComboItemsEditor.cs
new file mode 100644
index 00000000..d9965247
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ComboItemsEditor.cs	
@@ -0,0 +1,111 @@
+using System;
+using System.ComponentModel.Design;
+using System.Drawing.Design;
+using System.ComponentModel;
+using System.Windows.Forms.ComponentModel;
+using System.Windows.Forms.Design;
+using System.Drawing;
+using DevComponents.Editors;
+
+namespace DevComponents.DotNetBar.Design
+{
+	/// <summary>
+	/// Summary description for ComboItemsEditor.
+	/// </summary>
+	public class ComboItemsEditor:CollectionEditor
+	{
+		public ComboItemsEditor(Type type):base(type)
+		{
+		}
+		protected override Type CreateCollectionItemType()
+		{
+			return typeof(ComboItem);
+		}
+        protected override object CreateInstance(Type itemType)
+        {
+            object o = base.CreateInstance(itemType);
+            ComboItem ci = o as ComboItem;
+            if (ci != null)
+            {
+                if (ci.Site != null && ci.Site.Name != "")
+                    ci.Text = ci.Site.Name;
+                else
+                    ci.Text = "comboItem";
+            }
+            return o;
+        }
+	}
+
+	public class ImageIndexEditor:UITypeEditor
+	{
+		//private System.Windows.Forms.Design.IWindowsFormsEditorService m_EditorService=null;
+		//private UITypeEditor m_ImageEditor;
+		private System.Windows.Forms.ImageList m_ImageList=null;
+		public ImageIndexEditor():base()
+		{
+			//m_ImageEditor= System.ComponentModel.TypeDescriptor.GetEditor(typeof(System.Drawing.Image),typeof(UITypeEditor)) as ImageEditor;
+		}
+		
+		public override bool GetPaintValueSupported(ITypeDescriptorContext context)
+		{
+			return true;
+		}
+
+		public override void PaintValue(PaintValueEventArgs e)
+		{
+			try
+			{
+				if(e==null || e.Value==null)
+					return;
+				int iIndex=(int)e.Value;
+				System.Drawing.Image img=this.GetImage(e.Context,iIndex);
+				if(img==null)
+					return;
+				PaintValueEventArgs pi=new PaintValueEventArgs(e.Context,img,e.Graphics,e.Bounds);
+                if (img != null)
+                {
+                    Rectangle r = e.Bounds;
+                    r.Width--;
+                    r.Height--;
+                    e.Graphics.DrawRectangle(SystemPens.WindowFrame, r);
+                    e.Graphics.DrawImage(img, e.Bounds);
+                }
+
+				//m_ImageEditor.PaintValue(pi);
+				//m_ImageEditor.PaintValue(img,e.Graphics,e.Bounds);
+			}
+			catch{}
+		}
+
+		private System.Drawing.Image GetImage(System.ComponentModel.ITypeDescriptorContext context,int index)
+		{
+			if(m_ImageList!=null && index>=0 && index<=m_ImageList.Images.Count)
+			{
+				return m_ImageList.Images[index];
+			}
+			if(context==null)
+				return null;
+
+			object o=context.Instance;
+			if(o==null)
+				return null;
+			System.ComponentModel.PropertyDescriptorCollection pd=System.ComponentModel.TypeDescriptor.GetProperties(o);
+			if(pd==null)
+				return null;
+
+			foreach(System.ComponentModel.PropertyDescriptor prop in pd)
+			{
+				if(prop.PropertyType==typeof(System.Windows.Forms.ImageList))
+				{
+					m_ImageList=prop.GetValue(o) as System.Windows.Forms.ImageList;
+					if(m_ImageList!=null && index>=0 && index<=m_ImageList.Images.Count)
+					{
+						return m_ImageList.Images[index];
+					}
+					break;
+				}
+			}
+			return null;
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ComboTreeActionList.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ComboTreeActionList.cs
new file mode 100644
index 00000000..f77431c2
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ComboTreeActionList.cs	
@@ -0,0 +1,128 @@
+#if FRAMEWORK20
+using System;
+using System.Text;
+using System.ComponentModel.Design;
+using System.ComponentModel;
+using System.Drawing;
+using DevComponents.DotNetBar.Controls;
+using DevComponents.AdvTree;
+
+namespace DevComponents.DotNetBar.Design
+{
+    internal class ComboTreeActionList : DesignerActionList
+    {
+        private ComboTreeDesigner _Designer = null;
+
+        /// <summary>
+        /// Initializes a new instance of the ComboTreeActionList class.
+        /// </summary>
+        /// <param name="designer"></param>
+        public ComboTreeActionList(ComboTreeDesigner designer)
+            : base(designer.Component)
+        {
+            _Designer = designer;
+        }
+
+        public override DesignerActionItemCollection GetSortedActionItems()
+        {
+            DesignerActionItemCollection items = new DesignerActionItemCollection();
+            items.Add(new DesignerActionHeaderItem("Nodes"));
+            items.Add(new DesignerActionHeaderItem("Columns"));
+            
+            items.Add(new DesignerActionMethodItem(this, "EditColumns", "Edit Columns...", "Columns", "Edit Tree Control Columns", true));
+            items.Add(new DesignerActionPropertyItem("ColumnsVisible", "Column header visible?", "Columns", "Indicates whether tree column header is visible"));
+            items.Add(new DesignerActionPropertyItem("GridColumnLines", "Show grid column lines?", "Columns", "Indicates whether grid lines are visible"));
+            items.Add(new DesignerActionPropertyItem("GridRowLines", "Show grid row lines?", "Nodes", "Indicates whether grid lines between nodes are visible"));
+            items.Add(new DesignerActionPropertyItem("GridLinesColor", "Grid lines color:", "Columns", "Indicates custom color for grid lines"));
+
+            items.Add(new DesignerActionPropertyItem("SelectionBoxStyle", "Selection style:", "Selection", "Indicates selection style"));
+            items.Add(new DesignerActionPropertyItem("HotTracking", "Highlight mouse over node?", "Selection", "Indicates whether node that mouse is over is highlighted"));
+
+            return items;
+        }
+
+        public void CreateNode()
+        {
+            _Designer.CreateNode();
+        }
+
+        public void EditColumns()
+        {
+            _Designer.EditColumns();
+        }
+
+        public bool HotTracking
+        {
+            get
+            {
+                return ((ComboTree)base.Component).HotTracking;
+            }
+            set
+            {
+                TypeDescriptor.GetProperties(base.Component)["HotTracking"].SetValue(base.Component, value);
+            }
+        }
+
+        public eSelectionStyle SelectionBoxStyle
+        {
+            get
+            {
+                return ((ComboTree)base.Component).SelectionBoxStyle;
+            }
+            set
+            {
+                TypeDescriptor.GetProperties(base.Component)["SelectionBoxStyle"].SetValue(base.Component, value);
+            }
+        }
+
+        public bool ColumnsVisible
+        {
+            get
+            {
+                return ((ComboTree)base.Component).ColumnsVisible;
+            }
+            set
+            {
+                TypeDescriptor.GetProperties(base.Component)["ColumnsVisible"].SetValue(base.Component, value);
+            }
+        }
+
+        public bool GridColumnLines
+        {
+            get
+            {
+                return ((ComboTree)base.Component).GridColumnLines;
+            }
+            set
+            {
+                TypeDescriptor.GetProperties(base.Component)["GridColumnLines"].SetValue(base.Component, value);
+            }
+        }
+
+        public bool GridRowLines
+        {
+            get
+            {
+                return ((ComboTree)base.Component).GridRowLines;
+            }
+            set
+            {
+                TypeDescriptor.GetProperties(base.Component)["GridRowLines"].SetValue(base.Component, value);
+            }
+        }
+
+        public Color GridLinesColor
+        {
+            get
+            {
+                return ((ComboTree)base.Component).GridLinesColor;
+            }
+            set
+            {
+                TypeDescriptor.GetProperties(base.Component)["GridLinesColor"].SetValue(base.Component, value);
+            }
+        }
+
+    }
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ComboTreeDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ComboTreeDesigner.cs
new file mode 100644
index 00000000..1bc0b93a
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ComboTreeDesigner.cs	
@@ -0,0 +1,195 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows.Forms.Design;
+using System.Collections;
+using DevComponents.DotNetBar.Controls;
+using DevComponents.AdvTree;
+using System.ComponentModel;
+using System.ComponentModel.Design;
+using DevComponents.DotNetBar.Rendering;
+
+namespace DevComponents.DotNetBar.Design
+{
+    public class ComboTreeDesigner : ControlDesigner
+    {
+        public override void InitializeNewComponent(IDictionary defaultValues)
+        {
+            base.InitializeNewComponent(defaultValues);
+            SetDesignTimeDefaults();
+        }
+
+        public override void Initialize(IComponent component)
+        {
+            base.Initialize(component);
+            if (component.Site!=null && !component.Site.DesignMode)
+                return;
+
+            // If our component is removed we need to clean-up
+            IComponentChangeService cc = (IComponentChangeService)GetService(typeof(IComponentChangeService));
+            if (cc != null)
+            {
+                cc.ComponentRemoving += new ComponentEventHandler(this.OnComponentRemoved);
+            }
+
+#if !TRIAL
+            IDesignerHost dh = this.GetService(typeof(IDesignerHost)) as IDesignerHost;
+            if (dh != null)
+                dh.LoadComplete += new EventHandler(dh_LoadComplete);
+#endif
+        }
+#if !TRIAL
+        private void dh_LoadComplete(object sender, EventArgs e)
+        {
+            IDesignerHost dh = this.GetService(typeof(IDesignerHost)) as IDesignerHost;
+            if (dh != null)
+                dh.LoadComplete -= new EventHandler(dh_LoadComplete);
+
+            string key = RibbonBarDesigner.GetLicenseKey();
+            ComboTree bar = this.Control as ComboTree;
+            if (key != "" && bar != null && bar.LicenseKey == "" && bar.LicenseKey != key)
+                TypeDescriptor.GetProperties(bar)["LicenseKey"].SetValue(bar, key);
+        }
+#endif
+
+        protected override void Dispose(bool disposing)
+        {
+            IComponentChangeService cc = (IComponentChangeService)GetService(typeof(IComponentChangeService));
+            if (cc != null)
+                cc.ComponentRemoved -= new ComponentEventHandler(this.OnComponentRemoved);
+
+            base.Dispose(disposing);
+        }
+
+        private void SetDesignTimeDefaults()
+        {
+            ComboTree c = this.Control as ComboTree;
+            PropertyDescriptor d = TypeDescriptor.GetProperties(c)["Text"];
+            if (d != null && d.PropertyType == typeof(string) && !d.IsReadOnly && d.IsBrowsable)
+            {
+                d.SetValue(c, "");
+            }
+            c.ButtonDropDown.Visible = true;
+            c.BackgroundStyle.Class = ElementStyleClassKeys.TextBoxBorderKey;
+            c.Style = eDotNetBarStyle.StyleManagerControlled;
+#if !TRIAL
+            string key = RibbonBarDesigner.GetLicenseKey();
+            c.LicenseKey = key;
+#endif
+        }
+
+		public override ICollection AssociatedComponents
+		{
+			get
+			{
+				ArrayList al = new ArrayList(base.AssociatedComponents);
+                ComboTree combo = this.Component as ComboTree;
+				foreach(Node o in combo.Nodes)
+				{
+                    al.Add(o);
+                    AddChildNodes(o, al);
+				}
+				return al;
+			}
+		}
+
+        private void AddChildNodes(Node parent, ArrayList al)
+        {
+            foreach (Node item in parent.Nodes)
+            {
+                al.Add(item);
+            }
+        }
+
+		private void OnComponentRemoved(object sender, ComponentEventArgs e)
+		{
+			if (e.Component == this.Component)
+			{
+                ICollection nodes = AssociatedComponents;
+				IDesignerHost dh = GetService(typeof(IDesignerHost)) as IDesignerHost;
+				if (dh == null) return;
+				foreach (object item in nodes)
+				{
+					if (item is Node)
+					{
+						Node ci = item as Node;
+						dh.DestroyComponent(ci);
+					}
+				}
+			}
+		}
+
+        internal void EditColumns()
+        {
+            ComboTree tree = this.Component as ComboTree;
+            DevComponents.AdvTree.Design.AdvTreeDesigner.EditValue(this, tree, "Columns");
+        }
+
+        private DesignerActionListCollection _ActionLists = null;
+        public override DesignerActionListCollection ActionLists
+        {
+            get
+            {
+                if (this._ActionLists == null)
+                {
+                    this._ActionLists = new DesignerActionListCollection();
+                    this._ActionLists.Add(new ComboTreeActionList(this));
+                }
+                return this._ActionLists;
+            }
+        }
+
+        internal void CreateNode()
+        {
+            Node node = CreateNode(this.Component as ComboTree);
+            //if (node != null)
+            //{
+            //    ISelectionService sel = this.GetService(typeof(ISelectionService)) as ISelectionService;
+            //    ArrayList list = new ArrayList(1);
+            //    list.Add(node);
+            //    if (sel != null)
+            //    {
+            //        sel.SetSelectedComponents(list, SelectionTypes.MouseDown);
+            //        node.TreeControl.SelectedNode = node;
+            //    }
+            //}
+        }
+
+        private Node CreateNode(ComboTree tree)
+        {
+            IDesignerHost dh = (IDesignerHost)GetService(typeof(IDesignerHost));
+            if (dh == null)
+                return null;
+
+            Node node = null;
+            tree.AdvTree.BeginUpdate();
+            try
+            {
+                IComponentChangeService change = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+                if (change != null)
+                {
+                    change.OnComponentChanging(this.Component, TypeDescriptor.GetProperties(tree).Find("Nodes", true));
+                }
+
+                node = dh.CreateComponent(typeof(Node)) as Node;
+                if (node != null)
+                {
+                    node.Text = node.Name;
+                    node.Expanded = true;
+                    tree.Nodes.Add(node);
+
+                    if (change != null)
+                        change.OnComponentChanged(this.Component, TypeDescriptor.GetProperties(tree).Find("Nodes", true), null, null);
+                }
+            }
+            finally
+            {
+                tree.AdvTree.EndUpdate();
+            }
+
+            return node;
+        }
+    }
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ComponentDesignerWithAction.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ComponentDesignerWithAction.cs
new file mode 100644
index 00000000..41f87795
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ComponentDesignerWithAction.cs	
@@ -0,0 +1,468 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.ComponentModel.Design;
+using System.Drawing;
+using System.Reflection;
+using System.Text;
+using System.Windows.Forms;
+using System.Windows.Forms.Design;
+using System.Windows.Forms.Design.Behavior;
+
+namespace DevComponents.DotNetBar.Design
+{
+    public class ComponentDesignerWithAction : ComponentDesigner
+
+    {
+        private Adorner _DesignerActionAdorner = null;
+
+        public override void Initialize(System.ComponentModel.IComponent component)
+        {
+            base.Initialize(component);
+
+            if (DesignerActionUIEnabled)
+            {
+                ISelectionService selectionService = (ISelectionService) GetService(typeof(ISelectionService));
+                if (selectionService != null)
+                    selectionService.SelectionChanged += SelectionChanged;
+
+                _DesignerActionAdorner = new Adorner();
+
+                // If our component is removed we need to clean-up
+                IComponentChangeService cc = (IComponentChangeService) GetService(typeof(IComponentChangeService));
+                if (cc != null)
+                {
+                    cc.ComponentRemoving += ComponentRemoving;
+                    cc.ComponentRemoved += ComponentRemoved;
+                }
+            }
+        }
+
+        private void ComponentRemoved(object sender, ComponentEventArgs e)
+        {
+            if (e.Component is BaseItem)
+            {
+                BaseItem parent = this.Component as BaseItem;
+                BaseItem item = e.Component as BaseItem;
+                if (item != null && parent != null && parent.SubItems.Contains(item))
+                {
+                    IComponentChangeService cc = (IComponentChangeService)GetService(typeof(IComponentChangeService));
+                    if (cc != null)
+                        cc.OnComponentChanging(parent, TypeDescriptor.GetProperties(parent)["SubItems"]);
+                    parent.SubItems.Remove(item);
+                    if (cc != null)
+                        cc.OnComponentChanged(parent, TypeDescriptor.GetProperties(parent)["SubItems"], null, null);
+                    this.RecalcLayout();
+                }
+            }
+        }
+
+        public virtual void RecalcLayout()
+        {
+        }
+
+        private void ComponentRemoving(object sender, ComponentEventArgs e)
+        {
+            if(e.Component == this.Component)
+                RemoveGlyph();
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            if (DesignerActionUIEnabled)
+            {
+                ISelectionService selectionService = (ISelectionService) GetService(typeof(ISelectionService));
+                if (selectionService != null)
+                    selectionService.SelectionChanged -= SelectionChanged;
+
+                IComponentChangeService cc = (IComponentChangeService)GetService(typeof(IComponentChangeService));
+                if (cc != null)
+                {
+                    cc.ComponentRemoving -= ComponentRemoving;
+                    cc.ComponentRemoved -= ComponentRemoved;
+                }
+            }
+            base.Dispose(disposing);
+        }
+
+        public bool IsSelected = false;
+
+        private void SelectionChanged(object sender, EventArgs e)
+        {
+            bool selected = false;
+            ISelectionService selectionService = (ISelectionService) GetService(typeof(ISelectionService));
+            if (selectionService == null) return;
+
+            if (selectionService.PrimarySelection == this.Component)
+                selected = true;
+            else
+            {
+                ICollection selectedComponents = selectionService.GetSelectedComponents();
+                foreach (object o in selectedComponents)
+                {
+                    if (o.Equals(this.Component))
+                    {
+                        selected = true;
+                        break;
+                    }
+                }
+            }
+
+            OnDesignerSelectionChanged(selected);
+
+            if (selected)
+            {
+                Control hostControl = GetContainerControl();
+                if (hostControl != null)
+                {
+                    Rectangle itemScreenBounds = hostControl.RectangleToScreen(ComponentBounds);
+                    _DesignerGlyph = CreateDesignerGlyphWrapper((Component) this.Component, GetParentControl(),
+                        itemScreenBounds,
+                        this.ActionLists);
+                }
+            }
+            else
+            {
+                RemoveGlyph();
+            }
+            IsSelected = selected;
+        }
+
+        protected virtual Rectangle ComponentBounds
+        {
+            get
+            {
+                BaseItem item = this.Component as BaseItem;
+                if (item != null)
+                    return item.Bounds;
+                return Rectangle.Empty;
+            }
+        }
+
+        public virtual Control GetHostControl()
+        {
+            return GetParentControl();
+        }
+
+        protected virtual Control GetParentControl()
+        {
+            return GetContainerControl();
+        }
+
+        protected virtual Control GetContainerControl()
+        {
+            BaseItem item = this.Component as BaseItem;
+            if (item != null)
+                return (Control) item.ContainerControl;
+            return null;
+        }
+
+        protected virtual void OnDesignerSelectionChanged(bool isSelected)
+        {
+        }
+
+        protected virtual bool DesignerActionUIEnabled
+        {
+            get { return true; }
+        }
+
+        private Glyph _DesignerGlyph = null;
+
+        private void RemoveGlyph()
+        {
+            BehaviorService svc = (BehaviorService) this.GetService(typeof(BehaviorService));
+            if (svc == null) return;
+            _DesignerActionAdorner.Glyphs.Clear();
+            if (svc.Adorners.Contains(_DesignerActionAdorner))
+                svc.Adorners.Remove(_DesignerActionAdorner);
+            if (_ActionListToolStrip != null)
+                _ActionListToolStrip.LocationChanged -= HostLocationChanged;
+            _ActionListToolStrip = null;
+            InvalidateDesignerSurface();
+        }
+
+        private void InvalidateDesignerSurface()
+        {
+            BehaviorService behaviorService = (BehaviorService) GetService(typeof(BehaviorService));
+            if (behaviorService == null) return;
+            object actionUi = GetActionUI(behaviorService);
+            if (actionUi == null) return;
+            object mainParentWindow = ReflectionHelpers.GetValueField(actionUi, "mainParentWindow",
+                BindingFlags.Instance | BindingFlags.NonPublic);
+            if (mainParentWindow is IWin32Window)
+            {
+                WinApi.RedrawWindow(((IWin32Window) mainParentWindow).Handle, IntPtr.Zero, IntPtr.Zero,
+                    (uint) (WinApi.RedrawWindowFlags.RDW_INVALIDATE | WinApi.RedrawWindowFlags.RDW_ALLCHILDREN));
+            }
+        }
+
+        private ToolStripDropDown _ActionListToolStrip = null;
+
+        private Glyph CreateDesignerGlyphWrapper(Component targetComponent, Control ownerControl,
+            Rectangle screenBounds, DesignerActionListCollection actionLists)
+        {
+            BehaviorService behaviorService = (BehaviorService) GetService(typeof(BehaviorService));
+
+            if (targetComponent != null && behaviorService != null && actionLists != null)
+            {
+                try
+                {
+                    object actionUi = GetActionUI(behaviorService);
+                    FieldInfo fieldInfo1 = ReflectionHelpers.GetFieldInfo(actionUi, "designerActionHost",
+                        BindingFlags.Instance | BindingFlags.NonPublic);
+                    ToolStripDropDown designerActionHost = null;
+                    object mainParentWindow = ReflectionHelpers.GetValueField(actionUi, "mainParentWindow",
+                        BindingFlags.Instance | BindingFlags.NonPublic);
+                    if (!(fieldInfo1.GetValue(actionUi) is ToolStripDropDown))
+                    {
+                        ConstructorInfo constructorInfo = ReflectionHelpers.GetConstructorInfo(fieldInfo1.FieldType,
+                            new Type[2]
+                            {
+                                actionUi.GetType(),
+                                typeof(IWin32Window)
+                            });
+                        designerActionHost = constructorInfo.Invoke(new object[2]
+                        {
+                            actionUi,
+                            mainParentWindow
+                        }) as ToolStripDropDown;
+                        designerActionHost.AutoSize = false;
+                        designerActionHost.Padding = System.Windows.Forms.Padding.Empty;
+                        designerActionHost.Renderer = (ToolStripRenderer) new NoBorderRenderer();
+                        designerActionHost.Text = "DesignerActionTopLevelForm";
+                        fieldInfo1.SetValue(actionUi, (object) designerActionHost);
+                    }
+                    else
+                    {
+                        designerActionHost = fieldInfo1.GetValue(actionUi) as ToolStripDropDown;
+                    }
+                    Glyph glyph = ReflectionHelpers.InvokeMethod(actionUi, "GetDesignerActionGlyph",
+                        BindingFlags.Instance | BindingFlags.NonPublic, new object[2]
+                        {
+                            (object) targetComponent,
+                            (object) actionLists
+                        }) as Glyph;
+                    if (glyph != null)
+                    {
+                        BarUtilities.InvokeDelayed(new MethodInvoker(delegate { SetGlyphBounds(glyph, screenBounds, behaviorService); }), 100);
+                        if (designerActionHost != null)
+                        {
+                            designerActionHost.LocationChanged += HostLocationChanged;
+                            Point p = new Point(glyph.Bounds.Right, glyph.Bounds.Y);
+                            designerActionHost.Bounds =
+                                new Rectangle(behaviorService.AdornerWindowPointToScreen(p), designerActionHost.Size);
+                        }
+                        FieldInfo fieldInfo2 = ReflectionHelpers.GetFieldInfo((object) glyph.Behavior,
+                            "serviceProvider", BindingFlags.Instance | BindingFlags.NonPublic);
+                        GlyphServiceProvider glyphServiceProvider =
+                            new GlyphServiceProvider((IServiceProvider) fieldInfo2.GetValue((object) glyph.Behavior));
+                        fieldInfo2.SetValue((object) glyph.Behavior, (object) glyphServiceProvider);
+                        //SmartTagInfoCache.Default.Add(info.TargetComponent, new SmartTagCacheElement(glyph, info.TargetComponent, (Control)null, actionUi, info.BehaviorService));
+                        behaviorService.Adorners.Add(_DesignerActionAdorner);
+                        _DesignerActionAdorner.Glyphs.Add(glyph);
+                        //TestGlyph testGlyph = new TestGlyph(behaviorService, this);
+                        //_DesignerActionAdorner.Glyphs.Add(testGlyph);
+                        if (mainParentWindow is Control) ((Control) mainParentWindow).Invalidate();
+                    }
+                    if (mainParentWindow is IWin32Window)
+                    {
+                        WinApi.RedrawWindow(((IWin32Window) mainParentWindow).Handle, IntPtr.Zero, IntPtr.Zero,
+                            (uint) (WinApi.RedrawWindowFlags.RDW_INVALIDATE |
+                                    WinApi.RedrawWindowFlags.RDW_ALLCHILDREN));
+                    }
+                    if (_ActionListToolStrip != designerActionHost)
+                    {
+                        if (_ActionListToolStrip != null)
+                            _ActionListToolStrip.LocationChanged -= HostLocationChanged;
+                        _ActionListToolStrip = designerActionHost;
+                    }
+                    return glyph;
+                }
+                catch
+                {
+                    return (Glyph) null;
+                }
+            }
+            return (Glyph) null;
+        }
+
+        private bool _SettingBounds = false;
+
+        private void HostLocationChanged(object sender, EventArgs e)
+        {
+            if (_SettingBounds) return;
+
+            ToolStripDropDown toolStripDropDown = sender as ToolStripDropDown;
+            BehaviorService svc = (BehaviorService) this.GetService(typeof(BehaviorService));
+            if (toolStripDropDown == null || _DesignerGlyph == null || svc == null)
+                return;
+            _SettingBounds = true;
+            Point p = new Point(_DesignerGlyph.Bounds.Right, _DesignerGlyph.Bounds.Y);
+            Rectangle r = new Rectangle(svc.AdornerWindowPointToScreen(p), toolStripDropDown.Size);
+            toolStripDropDown.Bounds = r;
+            _SettingBounds = false;
+        }
+
+        private void SetGlyphBounds(Glyph gl, Rectangle itemBounds, BehaviorService behaviorService)
+        {
+            Size glyphSize = GetGlyphSize();
+            Point adornerWindow = behaviorService.ScreenToAdornerWindow(new Point(itemBounds.Right - 6, itemBounds.Y));
+            Point p = behaviorService.ScreenToAdornerWindow(Point.Empty);
+            ReflectionHelpers.SetValueField((object) gl, "bounds",
+                BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.GetField,
+                (object) new Rectangle(adornerWindow, glyphSize));
+            InvalidateDesignerSurface();
+        }
+
+        private class NoBorderRenderer : ToolStripProfessionalRenderer
+        {
+            public NoBorderRenderer()
+            {
+            }
+
+            protected override void OnRenderToolStripBorder(ToolStripRenderEventArgs e)
+            {
+            }
+        }
+
+        private object GetActionUI(BehaviorService behaviorService)
+        {
+            if (behaviorService == null)
+                return null;
+            return ReflectionHelpers.GetValueProperty((object) behaviorService, "DesignerActionUI",
+                BindingFlags.Instance | BindingFlags.NonPublic);
+        }
+
+
+        private Rectangle GetGlyphBounds(Rectangle componentBounds)
+        {
+            Size glyphSize = GetGlyphSize();
+            return new Rectangle(componentBounds.Right - glyphSize.Width, componentBounds.Y, glyphSize.Width,
+                glyphSize.Height);
+        }
+
+        private Size GetGlyphSize()
+        {
+            try
+            {
+                Type type = typeof(ControlDesigner).Assembly.GetType("System.Windows.Forms.DpiHelper");
+                if (type != (Type) null)
+                {
+                    if ((bool) type.GetProperty("IsScalingRequired", BindingFlags.Static | BindingFlags.Public)
+                        .GetValue((object) null, (object[]) null))
+                    {
+                        object[] parameters = new object[2]
+                        {
+                            (object) new Bitmap(10, 10),
+                            (object) 0
+                        };
+                        type.GetMethod("ScaleBitmapLogicalToDevice", BindingFlags.Static | BindingFlags.Public)
+                            .Invoke((object) null, parameters);
+                        return ((Image) parameters[0]).Size;
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine(e);
+            }
+            return new Size(10, 10);
+        }
+
+        class TestBehavior : Behavior
+        {
+        }
+
+        class TestGlyph : Glyph
+        {
+            ComponentDesignerWithAction _Item;
+            BehaviorService _BehaviorSvc;
+
+            public TestGlyph(BehaviorService behaviorSvc, ComponentDesignerWithAction item)
+                :
+                base(new TestBehavior())
+            {
+                _BehaviorSvc = behaviorSvc;
+                _Item = item;
+            }
+
+            public ComponentDesignerWithAction Item
+            {
+                get { return _Item; }
+            }
+
+            public override Rectangle Bounds
+            {
+                get
+                {
+                    // Glyph coordinates are in adorner window coordinates, so we must map using the behavior service.
+                    Rectangle bounds = Rectangle.Empty;
+                    if (_Item != null && _Item.GetHostControl() != null)
+                    {
+                        Point edge = _BehaviorSvc.ControlToAdornerWindow(_Item.GetHostControl());
+
+                        bounds = _Item.ComponentBounds;
+                        bounds.Offset(edge);
+                    }
+
+                    return bounds;
+                }
+            }
+
+
+            public override Cursor GetHitTest(Point p)
+            {
+                if (_Item != null && !_Item.IsSelected)
+                    return null;
+                // GetHitTest is called to see if the point is 
+                // within this glyph.  This gives us a chance to decide 
+                // what cursor to show.  Returning null from here means 
+                // the mouse pointer is not currently inside of the glyph. 
+                // Returning a valid cursor here indicates the pointer is 
+                // inside the glyph, and also enables our Behavior property 
+                // as the active behavior. 
+                if (Bounds.Contains(p))
+                {
+                    return Cursors.SizeAll;
+                }
+
+                return null;
+            }
+
+            public Rectangle CompleteBounds
+            {
+                get
+                {
+                    Rectangle bounds = Rectangle.Empty;
+                    if (_Item != null && _Item.GetHostControl() != null)
+                    {
+                        Point edge = _BehaviorSvc.ControlToAdornerWindow(_Item.GetContainerControl());
+                        bounds = _Item.ComponentBounds;
+                        bounds.Offset(edge);
+                    }
+                    return bounds;
+                }
+            }
+
+            public override void Paint(PaintEventArgs pe)
+            {
+                // Draw our glyph
+                if (_Item != null)
+                {
+                    if (_Item.IsSelected)
+                    {
+                        Rectangle r = CompleteBounds;
+                        r.Width--;
+                        r.Height--;
+                        Graphics g = pe.Graphics;
+                        using(SolidBrush brush=new SolidBrush(Color.FromArgb(129,Color.Red)))
+                        {
+                            g.FillRectangle(brush, r);
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ContextMenuBarDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ContextMenuBarDesigner.cs
new file mode 100644
index 00000000..04b1d18d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ContextMenuBarDesigner.cs	
@@ -0,0 +1,54 @@
+using System;
+using System.Text;
+using System.ComponentModel.Design;
+
+namespace DevComponents.DotNetBar.Design
+{
+	/// <summary>
+	/// Represents designer for the ContextMenuBar control.
+	/// </summary>
+    public class ContextMenuBarDesigner : BarDesigner
+    {
+        protected override void PreFilterProperties(System.Collections.IDictionary properties)
+        {
+            base.PreFilterProperties(properties);
+            string[] remove = new string[] {
+                "AccessibleDescription", "AccessibleName", "AccessibleRole",
+                "AlwaysDisplayDockTab", "AlwaysDisplayKeyAccelerators", "AutoCreateCaptionMenu",
+                "AutoHide", "AutoHideAnimationTime", "AutoSyncBarCaption",
+                "BackColor", "BackgroundImage", "BackgroundImageAlpha","BackgroundImageLayout",
+                "BarType", "CanDockBottom", "CanDockTop","CanDockLeft", "CanDockRight", "CanDockTab",
+                "CanHide", "CanReorderTabs", "CanUndock",
+                "DisplayMoreItemsOnMenu", "DockedBorderStyle", "DockOrientation",
+                "DockTabAlignment", "Enabled", "EqualButtonSize",
+                "FadeEffect", "GrabHandleStyle", "ImageSize",
+                "ImagesLarge", "ImagesMedium", "ItemSpacing",
+                "LayoutType", "MenuBar", "PaddingBottom","PaddingTop","PaddingLeft","PaddingRight",
+                "RoundCorners", "SaveLayoutChanges", "SingleLineColor", "SelectedDockTab",
+                "TabNavigation", "ThemeAware",
+                "WrapItemsDock"
+            };
+            foreach(string prop in remove)
+                properties.Remove(prop);
+        }
+
+        public override System.ComponentModel.Design.DesignerVerbCollection Verbs
+        {
+            get
+            {
+                DesignerVerb[] verbs = null;
+                verbs = new DesignerVerb[]
+					{
+						new DesignerVerb("Add Context Menu", new EventHandler(CreateButton))
+						};
+                return new DesignerVerbCollection(verbs);
+            }
+        }
+
+        protected override void OnitemCreated(BaseItem item)
+        {
+            if (item is ButtonItem) ((ButtonItem)item).AutoExpandOnClick = true;
+            base.OnitemCreated(item);
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/CrumbBarDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/CrumbBarDesigner.cs
new file mode 100644
index 00000000..3883830e
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/CrumbBarDesigner.cs	
@@ -0,0 +1,387 @@
+using System;
+using System.Text;
+using System.Windows.Forms.Design;
+using System.Collections;
+using System.ComponentModel.Design;
+using System.ComponentModel;
+using DevComponents.DotNetBar.Rendering;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Design
+{
+    /// <summary>
+    /// Represents VS.NET designer for the CrumbBar control.
+    /// </summary>
+    public class CrumbBarDesigner : ControlDesigner
+    {
+        #region Internal Implementation
+        /// <summary>Initializes designer with given component.</summary>
+        /// <param name="component">Component to initialize designer with.</param>
+        public override void Initialize(IComponent component)
+        {
+            base.Initialize(component);
+            if (!component.Site.DesignMode)
+                return;
+
+            // If our component is removed we need to clean-up
+            IComponentChangeService cc = (IComponentChangeService)GetService(typeof(IComponentChangeService));
+            if (cc != null)
+            {
+                cc.ComponentRemoving += new ComponentEventHandler(this.OnComponentRemoving);
+            }
+
+#if !TRIAL
+            IDesignerHost dh = this.GetService(typeof(IDesignerHost)) as IDesignerHost;
+            if (dh != null)
+                dh.LoadComplete += new EventHandler(dh_LoadComplete);
+#endif
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            // If our component is removed we need to clean-up
+            IComponentChangeService cc = (IComponentChangeService)GetService(typeof(IComponentChangeService));
+            if (cc != null)
+                cc.ComponentRemoving -= new ComponentEventHandler(this.OnComponentRemoving);
+            base.Dispose(disposing);
+        }
+
+#if FRAMEWORK20
+        public override void InitializeNewComponent(IDictionary defaultValues)
+        {
+            base.InitializeNewComponent(defaultValues);
+            SetDesignTimeDefaults();
+        }
+#else
+		public override void OnSetComponentDefaults()
+		{
+			base.OnSetComponentDefaults();
+			SetDesignTimeDefaults();
+		}
+#endif
+        private void SetDesignTimeDefaults()
+        {
+            SetVistaBackgroundStyle();
+            CrumbBar bar = this.Control as CrumbBar;
+#if (FRAMEWORK20)
+            bar.AutoSize = true;
+#endif
+#if !TRIAL
+            string key = RibbonBarDesigner.GetLicenseKey();
+            bar.LicenseKey = key;
+#endif
+            if(IsMetroHosted())
+                bar.Style = eCrumbBarStyle.Office2007;
+        }
+
+        private bool IsMetroHosted()
+        {
+            IDesignerHost dh = (IDesignerHost)this.GetService(typeof(IDesignerHost));
+            if (dh != null && (dh.RootComponent is DevComponents.DotNetBar.Metro.MetroAppForm || dh.RootComponent is DevComponents.DotNetBar.Metro.MetroForm))
+                return true;
+            return false;
+        }
+#if !TRIAL
+        private void dh_LoadComplete(object sender, EventArgs e)
+        {
+            IDesignerHost dh = this.GetService(typeof(IDesignerHost)) as IDesignerHost;
+            if (dh != null)
+                dh.LoadComplete -= new EventHandler(dh_LoadComplete);
+
+            string key = RibbonBarDesigner.GetLicenseKey();
+            CrumbBar bar = this.Control as CrumbBar;
+            if (key != "" && bar != null && bar.LicenseKey == "" && bar.LicenseKey != key)
+                TypeDescriptor.GetProperties(bar)["LicenseKey"].SetValue(bar, key);
+        }
+#endif
+
+        private void SetVistaBackgroundStyle()
+        {
+            CrumbBar cb = this.Control as CrumbBar;
+
+            IComponentChangeService cc = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+            if (cc != null)
+                cc.OnComponentChanging(this, TypeDescriptor.GetProperties(cb)["BackgroundStyle"]);
+
+            cb.BackgroundStyle.Reset();
+            cb.BackgroundStyle.Border = eStyleBorderType.Solid;
+            cb.BackgroundStyle.BorderWidth = 1;
+            cb.BackgroundStyle.BorderColor = ColorScheme.GetColor("53595E");
+            cb.BackgroundStyle.BorderColor2 = ColorScheme.GetColor("A9B4BF");
+            cb.BackgroundStyle.BackColor = ColorScheme.GetColor("F8FAFD");
+            if (cc != null)
+                cc.OnComponentChanged(this, TypeDescriptor.GetProperties(cb)["BackgroundStyle"], null, null);
+
+        }
+
+        private void SetOffice2007BackgroundStyle()
+        {
+            CrumbBar cb = this.Control as CrumbBar;
+
+            IComponentChangeService cc = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+            if (cc != null)
+                cc.OnComponentChanging(this, TypeDescriptor.GetProperties(cb)["BackgroundStyle"]);
+
+            cb.BackgroundStyle.Reset();
+            cb.BackgroundStyle.Class = ElementStyleClassKeys.CrumbBarBackgroundKey;
+
+            if (cc != null)
+                cc.OnComponentChanged(this, TypeDescriptor.GetProperties(cb)["BackgroundStyle"], null, null);
+        }
+
+        protected override void PreFilterProperties(System.Collections.IDictionary properties)
+        {
+            base.PreFilterProperties(properties);
+            properties["Style"] = TypeDescriptor.CreateProperty(typeof(CrumbBarDesigner), (PropertyDescriptor)properties["Style"], new Attribute[]
+				{
+					new DefaultValueAttribute(eCrumbBarStyle.Vista),
+					new BrowsableAttribute(true),
+					new CategoryAttribute("Appearance")});
+
+        }
+
+        /// <summary>
+        /// Gets or sets the visual style of the control. Default value is Windows Vista style.
+        /// </summary>
+        [DefaultValue(eCrumbBarStyle.Vista), Category("Appearance"), Description("Indicates visual style of the control.")]
+        public eCrumbBarStyle Style
+        {
+            get { return ((CrumbBar)this.Control).Style; }
+            set
+            {
+                CrumbBar b = this.Control as CrumbBar;
+                bool isChanged = (b.Style != value);
+                b.Style = value;
+                if (isChanged)
+                {
+                    IDesignerHost ds = GetService(typeof(IDesignerHost)) as IDesignerHost;
+                    if (ds != null && !ds.Loading)
+                    {
+                        if (value == eCrumbBarStyle.Vista)
+                            SetVistaBackgroundStyle();
+                        else if (value == eCrumbBarStyle.Office2007)
+                            SetOffice2007BackgroundStyle();
+                    }
+                }
+            }
+        }
+
+        /// <summary>Returns design-time commands applicable to this designer.</summary>
+        public override DesignerVerbCollection Verbs
+        {
+            get
+            {
+                DesignerVerb[] verbs = null;
+#if (FRAMEWORK20)
+                verbs = new DesignerVerb[]
+					{
+                        new DesignerVerb("Edit Items...", new EventHandler(EditItems))
+				};
+#else
+                verbs = new DesignerVerb[]
+					{
+						new DesignerVerb("Create Item", new EventHandler(CreateItem))
+				};
+#endif
+                return new DesignerVerbCollection(verbs);
+            }
+        }
+
+        private void EditItems(object sender, EventArgs e)
+        {
+            EditItems();
+        }
+
+        internal void EditItems()
+        {
+            CrumbBar crumbBar = this.Component as CrumbBar;
+#if (FRAMEWORK20)
+            Form form = new Form();
+            form.Text = "CrumbBar control editor";
+            form.FormBorderStyle = FormBorderStyle.Sizable;
+            form.MinimizeBox = false;
+            form.StartPosition = FormStartPosition.CenterScreen;
+            CrumbBarItemsEditor editor = new CrumbBarItemsEditor();
+            editor.Dock = DockStyle.Fill;
+            form.Size = new System.Drawing.Size(800, 600);
+            form.Controls.Add(editor);
+
+            editor.CrumbBar = crumbBar;
+            editor.Designer = this;
+            editor.UpdateDisplay();
+            form.ShowDialog();
+            form.Dispose();
+#else
+            DevComponents.AdvTree.Design.AdvTreeDesigner.EditValue(this, crumbBar, "Items");
+#endif
+        }
+
+        private void CreateItem(object sender, EventArgs e)
+        {
+            CreateItem();
+        }
+
+        internal void CreateItem()
+        {
+            CrumbBarItem node = CreateItem(this.Component as CrumbBar);
+            if (node != null)
+            {
+                ISelectionService sel = this.GetService(typeof(ISelectionService)) as ISelectionService;
+                ArrayList list = new ArrayList(1);
+                list.Add(node);
+                if (sel != null)
+                {
+                    sel.SetSelectedComponents(list, SelectionTypes.MouseDown);
+                    CrumbBar crumbBar = this.Component as CrumbBar;
+                    if (crumbBar != null && crumbBar.SelectedItem == null)
+                        crumbBar.SelectedItem = node;
+                }
+            }
+        }
+
+        public object GetDesignService(Type serviceType)
+        {
+            return GetService(serviceType);
+        }
+
+        private CrumbBarItem CreateItem(CrumbBar crumbBar)
+        {
+            IDesignerHost dh = (IDesignerHost)GetService(typeof(IDesignerHost));
+            if (dh == null)
+                return null;
+
+            CrumbBarItem node = null;
+            try
+            {
+                IComponentChangeService change = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+                if (change != null)
+                {
+                    change.OnComponentChanging(this.Component, TypeDescriptor.GetProperties(crumbBar).Find("Items", true));
+                }
+
+                node = dh.CreateComponent(typeof(CrumbBarItem)) as CrumbBarItem;
+                if (node != null)
+                {
+                    node.Text = node.Name;
+                    crumbBar.Items.Add(node);
+
+                    if (change != null)
+                        change.OnComponentChanged(this.Component, TypeDescriptor.GetProperties(crumbBar).Find("Items", true), null, null);
+                }
+            }
+            finally
+            {
+                crumbBar.RecalcLayout();
+            }
+
+            return node;
+        }
+
+        /// <summary>Called when component is about to be removed from designer.</summary>
+        /// <param name="sender">Event sender.</param>
+        /// <param name="e">Event arguments.</param>
+        public void OnComponentRemoving(object sender, ComponentEventArgs e)
+        {
+            if (e.Component == this.Component)
+            {
+                IDesignerHost dh = (IDesignerHost)GetService(typeof(IDesignerHost));
+                if (dh == null)
+                    return;
+
+                ArrayList list = new ArrayList(this.AssociatedComponents);
+                foreach (IComponent c in list)
+                    dh.DestroyComponent(c);
+            }
+            else if (e.Component is CrumbBarItem && ((CrumbBarItem)e.Component).GetOwner() == this.Control)
+            {
+                OnNodeRemoving(e.Component as CrumbBarItem);
+            }
+        }
+
+        private void OnNodeRemoving(CrumbBarItem node)
+        {
+            IComponentChangeService cc = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+            IDesignerHost dh = (IDesignerHost)GetService(typeof(IDesignerHost));
+            
+            // Root node
+            CrumbBar tree = this.Control as CrumbBar;
+            bool wasSelected = tree.GetIsInSelectedPath(node);
+
+            if (node.Parent != null)
+            {
+                CrumbBarItem parent = node.Parent as CrumbBarItem;
+                if (parent != null)
+                {
+                    if (cc != null)
+                        cc.OnComponentChanging(parent, TypeDescriptor.GetProperties(parent)["SubItems"]);
+                    parent.SubItems.Remove(node);
+                    if (cc != null)
+                        cc.OnComponentChanged(parent, TypeDescriptor.GetProperties(parent)["SubItems"], null, null);
+                }
+            }
+            else
+            {
+                if (cc != null)
+                    cc.OnComponentChanging(tree, TypeDescriptor.GetProperties(tree)["Items"]);
+                tree.Items.Remove(node);
+                if (cc != null)
+                    cc.OnComponentChanged(tree, TypeDescriptor.GetProperties(tree)["Items"], null, null);
+            }
+
+            if (node.SubItems.Count > 0)
+            {
+                BaseItem[] nodes = new BaseItem[node.SubItems.Count];
+                node.SubItems.CopyTo(nodes, 0);
+                foreach (BaseItem n in nodes)
+                {
+                    node.SubItems.Remove(n);
+
+                    if (dh != null)
+                        dh.DestroyComponent(n);
+                }
+            }
+
+            if (wasSelected)
+            {
+                tree.SelectedItem = tree.GetFirstVisibleItem();
+            }
+
+            this.RecalcLayout();
+        }
+
+        private void RecalcLayout()
+        {
+            CrumbBar tree = this.Control as CrumbBar;
+            if (tree != null) tree.RecalcLayout();
+        }
+
+        /// <summary>
+        /// Returns all components associated with this control
+        /// </summary>
+        public override ICollection AssociatedComponents
+        {
+            get
+            {
+                ArrayList c = new ArrayList(base.AssociatedComponents);
+                CrumbBar tree = this.Control as CrumbBar;
+                if (tree != null)
+                {
+                    foreach (BaseItem node in tree.Items)
+                        GetItemsRecursive(node, c);
+                }
+                return c;
+            }
+        }
+
+        private void GetItemsRecursive(BaseItem parent, ArrayList c)
+        {
+            c.Add(parent);
+            foreach (BaseItem node in parent.SubItems)
+            {
+                c.Add(node);
+                GetItemsRecursive(node, c);
+            }
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/CrumbBarItemCollectionEditor.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/CrumbBarItemCollectionEditor.cs
new file mode 100644
index 00000000..c3de4e6c
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/CrumbBarItemCollectionEditor.cs	
@@ -0,0 +1,37 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace DevComponents.DotNetBar.Design
+{
+    /// <summary>
+    /// Support for ColumnHeader tabs design-time editor.
+    /// </summary>
+    public class CrumbBarItemCollectionEditor : System.ComponentModel.Design.CollectionEditor
+    {
+        /// <summary>Creates new instance of the class</summary>
+        /// <param name="type">Type to initialize editor with.</param>
+        public CrumbBarItemCollectionEditor(Type type)
+            : base(type)
+        {
+        }
+        protected override Type CreateCollectionItemType()
+        {
+            return typeof(CrumbBarItem);
+        }
+        protected override Type[] CreateNewItemTypes()
+        {
+            return new Type[] { typeof(CrumbBarItem) };
+        }
+        protected override object CreateInstance(Type itemType)
+        {
+            object item = base.CreateInstance(itemType);
+            if (item is CrumbBarItem)
+            {
+                CrumbBarItem ch = item as CrumbBarItem;
+                ch.Text = ch.Name;
+            }
+            return item;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/CrumbBarItemDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/CrumbBarItemDesigner.cs
new file mode 100644
index 00000000..547a8225
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/CrumbBarItemDesigner.cs	
@@ -0,0 +1,56 @@
+using System;
+using System.Text;
+using System.ComponentModel.Design;
+using System.Collections;
+
+namespace DevComponents.DotNetBar.Design
+{
+    public class CrumbBarItemDesigner : ComponentDesigner
+    {
+        #region Internal Implementation
+        public override System.Collections.ICollection AssociatedComponents
+        {
+            get
+            {
+                ArrayList c = new ArrayList(base.AssociatedComponents);
+                CrumbBarItem item = this.Component as CrumbBarItem;
+                if (item != null)
+                {
+                    foreach (BaseItem node in item.SubItems)
+                        GetItemsRecursive(node, c);
+                }
+                return c;
+            }
+        }
+        private void GetItemsRecursive(BaseItem parent, ArrayList c)
+        {
+            c.Add(parent);
+            foreach (BaseItem node in parent.SubItems)
+            {
+                c.Add(node);
+                GetItemsRecursive(node, c);
+            }
+        }
+
+#if FRAMEWORK20
+        public override void InitializeNewComponent(IDictionary defaultValues)
+        {
+            base.InitializeNewComponent(defaultValues);
+            SetDesignTimeDefaults();
+        }
+#else
+		public override void OnSetComponentDefaults()
+		{
+			base.OnSetComponentDefaults();
+			SetDesignTimeDefaults();
+		}
+#endif
+        private void SetDesignTimeDefaults()
+        {
+            CrumbBarItem item = this.Component as CrumbBarItem;
+            item.Text = item.Name;
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/CrumbBarItemsEditor.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/CrumbBarItemsEditor.cs
new file mode 100644
index 00000000..271f19f0
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/CrumbBarItemsEditor.cs	
@@ -0,0 +1,610 @@
+#if FRAMEWORK20
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Data;
+using System.Text;
+using System.Windows.Forms;
+using DevComponents.DotNetBar;
+using DevComponents.DotNetBar.Design;
+using System.ComponentModel.Design;
+using System.Drawing.Imaging;
+using DevComponents.DotNetBar.Rendering;
+using DevComponents.AdvTree;
+using System.Windows.Forms.Design;
+using System.Reflection;
+
+namespace DevComponents.DotNetBar.Design
+{
+    internal class CrumbBarItemsEditor : UserControl
+    {
+        #region Private Variables
+        private DevComponents.AdvTree.AdvTree advTree1;
+        private DevComponents.AdvTree.Node node1;
+        private DevComponents.DotNetBar.ElementStyle elementStyle1;
+        private DevComponents.DotNetBar.ButtonX buttonAddItem;
+        private DevComponents.AdvTree.ColumnHeader columnHeader1;
+        private DevComponents.AdvTree.ColumnHeader columnHeader2;
+        private DevComponents.DotNetBar.ButtonX buttonRemoveItem;
+        private System.Windows.Forms.PropertyGrid propertyGrid1;
+        internal DevComponents.DotNetBar.ButtonX buttonX1;
+
+        private CrumbBar _CrumbBar = null;
+        private Label label1;
+        private CrumbBarDesigner _Designer = null;
+        #endregion
+
+        #region Constructors
+        public CrumbBarItemsEditor()
+        {
+            InitializeComponent();
+#if (!TRIAL)
+            this.advTree1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F";
+#endif
+        }
+
+        /// <summary> 
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+        #endregion
+
+        #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.propertyGrid1 = new System.Windows.Forms.PropertyGrid();
+            this.buttonX1 = new DevComponents.DotNetBar.ButtonX();
+            this.buttonRemoveItem = new DevComponents.DotNetBar.ButtonX();
+            this.buttonAddItem = new DevComponents.DotNetBar.ButtonX();
+            this.advTree1 = new DevComponents.AdvTree.AdvTree();
+            this.columnHeader1 = new DevComponents.AdvTree.ColumnHeader();
+            this.columnHeader2 = new DevComponents.AdvTree.ColumnHeader();
+            this.node1 = new DevComponents.AdvTree.Node();
+            this.elementStyle1 = new DevComponents.DotNetBar.ElementStyle();
+            this.label1 = new System.Windows.Forms.Label();
+            ((System.ComponentModel.ISupportInitialize)(this.advTree1)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // propertyGrid1
+            // 
+            this.propertyGrid1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+                        | System.Windows.Forms.AnchorStyles.Left)
+                        | System.Windows.Forms.AnchorStyles.Right)));
+            this.propertyGrid1.Location = new System.Drawing.Point(300, 3);
+            this.propertyGrid1.Name = "propertyGrid1";
+            this.propertyGrid1.Size = new System.Drawing.Size(284, 331);
+            this.propertyGrid1.TabIndex = 4;
+            this.propertyGrid1.PropertyValueChanged += new System.Windows.Forms.PropertyValueChangedEventHandler(this.propertyGrid1_PropertyValueChanged);
+            // 
+            // buttonX1
+            // 
+            this.buttonX1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+            this.buttonX1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonX1.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+            this.buttonX1.Location = new System.Drawing.Point(515, 341);
+            this.buttonX1.Name = "buttonX1";
+            this.buttonX1.Shape = new DevComponents.DotNetBar.RoundRectangleShapeDescriptor();
+            this.buttonX1.Size = new System.Drawing.Size(69, 24);
+            this.buttonX1.TabIndex = 5;
+            this.buttonX1.Text = "&Close";
+            this.buttonX1.Click += new System.EventHandler(this.buttonX1_Click);
+            // 
+            // buttonRemoveItem
+            // 
+            this.buttonRemoveItem.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+            this.buttonRemoveItem.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.buttonRemoveItem.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+            this.buttonRemoveItem.Enabled = false;
+            this.buttonRemoveItem.FocusCuesEnabled = false;
+            this.buttonRemoveItem.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.buttonRemoveItem.Location = new System.Drawing.Point(32, 341);
+            this.buttonRemoveItem.Name = "buttonRemoveItem";
+            this.buttonRemoveItem.Shape = new DevComponents.DotNetBar.RoundRectangleShapeDescriptor();
+            this.buttonRemoveItem.Size = new System.Drawing.Size(24, 24);
+            this.buttonRemoveItem.TabIndex = 3;
+            this.buttonRemoveItem.Click += new System.EventHandler(this.buttonRemoveItem_Click);
+            // 
+            // buttonAddItem
+            // 
+            this.buttonAddItem.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+            this.buttonAddItem.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.buttonAddItem.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+            this.buttonAddItem.FocusCuesEnabled = false;
+            this.buttonAddItem.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.buttonAddItem.Location = new System.Drawing.Point(4, 341);
+            this.buttonAddItem.Name = "buttonAddItem";
+            this.buttonAddItem.Shape = new DevComponents.DotNetBar.RoundRectangleShapeDescriptor();
+            this.buttonAddItem.Size = new System.Drawing.Size(24, 24);
+            this.buttonAddItem.TabIndex = 1;
+            this.buttonAddItem.Click += new System.EventHandler(this.buttonAddItem_Click);
+            // 
+            // advTree1
+            // 
+            this.advTree1.AccessibleRole = System.Windows.Forms.AccessibleRole.Outline;
+            this.advTree1.AllowDrop = true;
+            this.advTree1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+                        | System.Windows.Forms.AnchorStyles.Left)));
+            this.advTree1.BackColor = System.Drawing.SystemColors.Window;
+            // 
+            // 
+            // 
+            this.advTree1.BackgroundStyle.Class = "TreeBorderKey";
+            this.advTree1.Columns.Add(this.columnHeader1);
+            this.advTree1.Columns.Add(this.columnHeader2);
+            this.advTree1.ExpandButtonType = DevComponents.AdvTree.eExpandButtonType.Triangle;
+            this.advTree1.ExpandWidth = 18;
+            this.advTree1.Location = new System.Drawing.Point(3, 3);
+            this.advTree1.Name = "advTree1";
+            this.advTree1.Nodes.AddRange(new DevComponents.AdvTree.Node[] {
+            this.node1});
+            this.advTree1.NodeStyle = this.elementStyle1;
+            this.advTree1.PathSeparator = ";";
+            this.advTree1.SelectionBoxStyle = DevComponents.AdvTree.eSelectionStyle.FullRowSelect;
+            this.advTree1.Size = new System.Drawing.Size(291, 332);
+            this.advTree1.Styles.Add(this.elementStyle1);
+            this.advTree1.SuspendPaint = false;
+            this.advTree1.TabIndex = 0;
+            this.advTree1.Text = "advTree1";
+            this.advTree1.AfterNodeDrop += new DevComponents.AdvTree.TreeDragDropEventHandler(this.advTree1_AfterNodeDrop);
+            this.advTree1.MouseUp += new System.Windows.Forms.MouseEventHandler(this.advTree1_MouseUp);
+            this.advTree1.AfterNodeSelect += new DevComponents.AdvTree.AdvTreeNodeEventHandler(this.advTree1_AfterNodeSelect);
+            // 
+            // columnHeader1
+            // 
+            this.columnHeader1.Name = "columnHeader1";
+            this.columnHeader1.Text = "Text";
+            this.columnHeader1.Width.Relative = 70;
+            // 
+            // columnHeader2
+            // 
+            this.columnHeader2.Name = "columnHeader2";
+            this.columnHeader2.Text = "Name";
+            this.columnHeader2.Width.Relative = 30;
+            // 
+            // node1
+            // 
+            this.node1.Expanded = true;
+            this.node1.Name = "node1";
+            this.node1.Text = "node1";
+            // 
+            // elementStyle1
+            // 
+            this.elementStyle1.Name = "elementStyle1";
+            this.elementStyle1.TextColor = System.Drawing.SystemColors.ControlText;
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Location = new System.Drawing.Point(153, 352);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(141, 13);
+            this.label1.TabIndex = 6;
+            this.label1.Text = "Drag && drop items to re-order";
+            this.label1.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
+            // 
+            // CrumbBarItemsEditor
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.BackColor = Color.White;
+            this.Controls.Add(this.label1);
+            this.Controls.Add(this.buttonX1);
+            this.Controls.Add(this.propertyGrid1);
+            this.Controls.Add(this.buttonRemoveItem);
+            this.Controls.Add(this.buttonAddItem);
+            this.Controls.Add(this.advTree1);
+            this.Name = "CrumbBarItemsEditor";
+            this.Size = new System.Drawing.Size(587, 373);
+            this.Load += new System.EventHandler(this.CrumbBarItemsEditor_Load);
+            ((System.ComponentModel.ISupportInitialize)(this.advTree1)).EndInit();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        #region Internal Implementation
+
+        private object GetDesignService(Type serviceType)
+        {
+            if (_Designer != null)
+            {
+                return _Designer.GetDesignService(serviceType);
+            }
+            return null;
+        }
+
+        private CrumbBarItem CreateItem()
+        {
+            IDesignerHost dh = (IDesignerHost)GetDesignService(typeof(IDesignerHost));
+            if (dh == null)
+                return null;
+
+            CrumbBarItem item = (CrumbBarItem)dh.CreateComponent(typeof(CrumbBarItem));
+            item.Text = item.Name;
+            return item;
+        }
+
+        private void AddNewItem()
+        {
+            AddNewItem(null);
+        }
+
+        private void AddNewItem(CrumbBarItem parent)
+        {
+            IDesignerHost dh = (IDesignerHost)GetDesignService(typeof(IDesignerHost));
+            DesignerTransaction dt = null;
+            if (dh != null)
+            {
+                dt = dh.CreateTransaction("New CrumbBarItem");
+            }
+            bool isEmpty = advTree1.Nodes.Count == 0;
+            CrumbBarItem item = CreateItem();
+            if (item == null) return;
+
+            IComponentChangeService cc = GetDesignService(typeof(IComponentChangeService)) as IComponentChangeService;
+            if (cc != null)
+            {
+                if (parent == null)
+                    cc.OnComponentChanging(_CrumbBar, TypeDescriptor.GetProperties(_CrumbBar)["Items"]);
+                else
+                    cc.OnComponentChanging(parent, TypeDescriptor.GetProperties(parent)["SubItems"]);
+            }
+
+            if (parent == null)
+                _CrumbBar.Items.Add(item);
+            else
+                parent.SubItems.Add(item);
+
+            if (cc != null)
+            {
+                if (parent == null)
+                    cc.OnComponentChanged(_CrumbBar, TypeDescriptor.GetProperties(_CrumbBar)["Items"], null, null);
+                else
+                    cc.OnComponentChanged(parent, TypeDescriptor.GetProperties(parent)["SubItems"], null, null);
+            }
+
+            if (dt != null)
+                dt.Commit();
+
+            if (parent == null)
+                advTree1.Nodes.Add(CreateNodeForItem(item));
+            else
+            {
+                advTree1.SelectedNode.Nodes.Add(CreateNodeForItem(item));
+                advTree1.SelectedNode.Expand();
+            }
+
+            if (isEmpty && advTree1.SelectedNode == null && advTree1.Nodes.Count > 0)
+                advTree1.SelectedNode = advTree1.Nodes[0];
+        }
+        #endregion
+
+        private void CrumbBarItemsEditor_Load(object sender, EventArgs e)
+        {
+            Bitmap img = new Bitmap(16, 16, PixelFormat.Format32bppArgb);
+            Color c = Color.DarkGray;
+            if (GlobalManager.Renderer is Office2007Renderer)
+                c = ((Office2007Renderer)GlobalManager.Renderer).ColorTable.CheckBoxItem.Default.Text;
+            using (Graphics g = Graphics.FromImage(img))
+            {
+                using (Brush brush = new SolidBrush(c))
+                {
+                    g.FillRectangle(brush, 7, 2, 3, 13);
+                    g.FillRectangle(brush, 2, 7, 13, 3);
+                }
+            }
+            buttonAddItem.Image = img;
+
+            img = new Bitmap(16, 16, PixelFormat.Format32bppArgb);
+            using (Graphics g = Graphics.FromImage(img))
+            {
+                using (Brush brush = new SolidBrush(c))
+                {
+                    g.FillRectangle(brush, 2, 7, 13, 3);
+                }
+            }
+            buttonRemoveItem.Image = img;
+
+#if (FRAMEWORK20)
+            IUIService service = GetDesignService(typeof(IUIService)) as IUIService;
+            if (service != null)
+            {
+                PropertyInfo pi = propertyGrid1.GetType().GetProperty("ToolStripRenderer", System.Reflection.BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance);
+                if (pi != null)
+                {
+                    pi.SetValue(propertyGrid1, (ToolStripProfessionalRenderer)service.Styles["VsToolWindowRenderer"], null);
+                }
+            }
+#endif
+        }
+
+        private void advTree1_MouseUp(object sender, MouseEventArgs e)
+        {
+            Node node = advTree1.GetNodeAt(e.Y);
+            if (node == null) advTree1.SelectedNode = null;
+        }
+
+        internal void UpdateDisplay()
+        {
+            advTree1.Nodes.Clear();
+            if (_CrumbBar == null) return;
+
+            advTree1.BeginUpdate();
+
+            foreach (CrumbBarItem item in _CrumbBar.Items)
+            {
+                Node node = CreateNodeForItem(item);
+                advTree1.Nodes.Add(node);
+                LoadSubItems(node, item);
+            }
+
+            advTree1.EndUpdate();
+        }
+
+        private void LoadSubItems(Node parent, CrumbBarItem item)
+        {
+            foreach (BaseItem o in item.SubItems)
+            {
+                if (o is CrumbBarItem)
+                {
+                    CrumbBarItem cb = (CrumbBarItem)o;
+                    Node node = CreateNodeForItem(cb);
+                    parent.Nodes.Add(node);
+                    LoadSubItems(node, cb);
+                }
+            }
+        }
+
+        private Node CreateNodeForItem(CrumbBarItem item)
+        {
+            Node node = new Node();
+            node.Expanded = true;
+            node.Tag = item;
+            node.Text = item.Text;
+            node.Image = item.GetItemImage();
+            node.Cells.Add(new Cell(item.Name));
+            return node;
+        }
+
+        public CrumbBarDesigner Designer
+        {
+            get { return _Designer; }
+            set 
+            {
+                _Designer = value; 
+                if(_Designer!=null)
+                    this.propertyGrid1.Site = new PropertyGridSite((IServiceProvider)_Designer.Component.Site, this.propertyGrid1);
+            }
+        }
+
+        public CrumbBar CrumbBar
+        {
+            get { return _CrumbBar; }
+            set
+            {
+                if (value != _CrumbBar)
+                {
+                    CrumbBar oldValue = _CrumbBar;
+                    _CrumbBar = value;
+                    OnCrumbBarChanged(oldValue, value);
+                }
+            }
+        }
+
+        private void OnCrumbBarChanged(CrumbBar oldValue, CrumbBar newValue)
+        {
+            UpdateDisplay();
+        }
+
+        private void buttonAddItem_Click(object sender, EventArgs e)
+        {
+            CrumbBarItem parent = null;
+            if (advTree1.SelectedNode != null) parent = advTree1.SelectedNode.Tag as CrumbBarItem;
+            AddNewItem(parent);
+        }
+
+        private void buttonRemoveItem_Click(object sender, EventArgs e)
+        {
+            if (advTree1.SelectedNode == null) return;
+            CrumbBarItem item = advTree1.SelectedNode.Tag as CrumbBarItem;
+            if (item == null) return;
+            advTree1.SelectedNode.Remove();
+            DeleteItem(item);
+        }
+
+        private void DeleteItem(CrumbBarItem item)
+        {
+            IDesignerHost dh = (IDesignerHost)GetDesignService(typeof(IDesignerHost));
+            if (dh == null)
+                return;
+            dh.DestroyComponent(item);
+        }
+
+        private void advTree1_AfterNodeSelect(object sender, AdvTreeNodeEventArgs e)
+        {
+            buttonRemoveItem.Enabled = e.Node != null;
+            if (e.Node != null)
+                propertyGrid1.SelectedObject = e.Node.Tag;
+            else
+                propertyGrid1.SelectedObject = null;
+        }
+
+        private void advTree1_AfterNodeDrop(object sender, TreeDragDropEventArgs e)
+        {
+            IDesignerHost dh = (IDesignerHost)GetDesignService(typeof(IDesignerHost));
+            DesignerTransaction dt = null;
+            if (dh != null) dt = dh.CreateTransaction("Move items");
+
+            IComponentChangeService cc = GetDesignService(typeof(IComponentChangeService)) as IComponentChangeService;
+
+            try
+            {
+                CrumbBarItem movedItem = e.Node.Tag as CrumbBarItem;
+                CrumbBarItem parent = (CrumbBarItem)movedItem.Parent;
+                if (cc != null)
+                {
+                    if (parent == null)
+                        cc.OnComponentChanging(_CrumbBar, TypeDescriptor.GetProperties(_CrumbBar)["Items"]);
+                    else
+                        cc.OnComponentChanging(parent, TypeDescriptor.GetProperties(parent)["SubItems"]);
+                }
+
+                if (parent == null)
+                    _CrumbBar.Items.Remove(movedItem);
+                else
+                    parent.SubItems.Remove(movedItem);
+
+                if (cc != null)
+                {
+                    if (parent == null)
+                        cc.OnComponentChanged(_CrumbBar, TypeDescriptor.GetProperties(_CrumbBar)["Items"], null, null);
+                    else
+                        cc.OnComponentChanged(parent, TypeDescriptor.GetProperties(parent)["SubItems"], null, null);
+                }
+
+                if (e.NewParentNode == null)
+                {
+                    int index = advTree1.Nodes.IndexOf(e.Node);
+                    if (cc != null) cc.OnComponentChanging(_CrumbBar, TypeDescriptor.GetProperties(_CrumbBar)["Items"]);
+                    _CrumbBar.Items.Insert(index, movedItem);
+                    if (cc != null) cc.OnComponentChanged(_CrumbBar, TypeDescriptor.GetProperties(_CrumbBar)["Items"], null, null);
+                }
+                else
+                {
+                    parent = e.NewParentNode.Tag as CrumbBarItem;
+                    int index = e.NewParentNode.Nodes.IndexOf(e.Node);
+                    if (cc != null) cc.OnComponentChanging(parent, TypeDescriptor.GetProperties(parent)["SubItems"]);
+                    parent.SubItems.Insert(index, movedItem);
+                    if (cc != null) cc.OnComponentChanged(parent, TypeDescriptor.GetProperties(parent)["SubItems"], null, null);
+                }
+            }
+            catch
+            {
+                if (dt != null)
+                    dt.Cancel();
+                throw;
+            }
+            finally
+            {
+                if (dt != null && !dt.Canceled)
+                    dt.Commit();
+            }
+        }
+
+        private void propertyGrid1_PropertyValueChanged(object s, PropertyValueChangedEventArgs e)
+        {
+            if (advTree1.SelectedNode == null) return;
+            Node node = advTree1.SelectedNode;
+            CrumbBarItem item = (CrumbBarItem)propertyGrid1.SelectedObject;
+            if (e.ChangedItem.PropertyDescriptor.Name == "Text")
+            {
+                node.Text = item.Text;
+            }
+            else if (e.ChangedItem.PropertyDescriptor.Name == "Image" || e.ChangedItem.PropertyDescriptor.Name=="ImageIndex")
+            {
+                node.Image = item.GetItemImage();
+            }
+            else if (e.ChangedItem.PropertyDescriptor.Name == "Name")
+            {
+                node.Cells[1].Text = item.Name;
+            }
+        }
+
+        #region PropertyGridSite
+        internal class PropertyGridSite : ISite, IServiceProvider
+        {
+            // Fields
+            private IComponent comp;
+            private bool inGetService;
+            private IServiceProvider sp;
+
+            // Methods
+            public PropertyGridSite(IServiceProvider sp, IComponent comp)
+            {
+                this.sp = sp;
+                this.comp = comp;
+            }
+
+            public object GetService(Type t)
+            {
+                if (!this.inGetService && (this.sp != null))
+                {
+                    try
+                    {
+                        this.inGetService = true;
+                        return this.sp.GetService(t);
+                    }
+                    finally
+                    {
+                        this.inGetService = false;
+                    }
+                }
+                return null;
+            }
+
+            // Properties
+            public IComponent Component
+            {
+                get
+                {
+                    return this.comp;
+                }
+            }
+
+            public IContainer Container
+            {
+                get
+                {
+                    return null;
+                }
+            }
+
+            public bool DesignMode
+            {
+                get
+                {
+                    return false;
+                }
+            }
+
+            public string Name
+            {
+                get
+                {
+                    return null;
+                }
+                set
+                {
+                }
+            }
+        }
+        #endregion
+
+        private void buttonX1_Click(object sender, EventArgs e)
+        {
+            Form form = this.FindForm();
+            if (form != null) form.Close();
+        }
+    }
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/CustomTypeEditorProvider.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/CustomTypeEditorProvider.cs
new file mode 100644
index 00000000..78c8dc85
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/CustomTypeEditorProvider.cs	
@@ -0,0 +1,106 @@
+using System;
+using System.Text;
+using System.ComponentModel;
+using System.Windows.Forms.Design;
+using System.ComponentModel.Design;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Design
+{
+    public class CustomTypeEditorProvider : ITypeDescriptorContext, IWindowsFormsEditorService
+    {
+        #region Private Variables, Constructor
+        private IContainer m_Container = null;
+        private object m_Instance = null;
+        private IServiceProvider m_Provider = null;
+        private PropertyDescriptor m_PropertyDescriptor = null;
+
+        public CustomTypeEditorProvider(IContainer container, IServiceProvider provider)
+        {
+            m_Container = container;
+            m_Provider = provider;
+        }
+
+        public void SetInstance(object instance, PropertyDescriptor desc)
+        {
+            m_Instance = instance;
+            m_PropertyDescriptor = desc;
+        }
+        #endregion
+
+        #region ITypeDescriptorContext Members
+
+        public IContainer Container
+        {
+            get { return m_Container; }
+        }
+
+        public object Instance
+        {
+            get { return m_Instance; }
+        }
+
+        public void OnComponentChanged()
+        {
+            IComponentChangeService cc = m_Provider.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+            if (cc != null)
+                cc.OnComponentChanged(m_Instance, m_PropertyDescriptor, null, null);
+        }
+
+        public bool OnComponentChanging()
+        {
+            return true;
+        }
+
+        public PropertyDescriptor PropertyDescriptor
+        {
+            get { return m_PropertyDescriptor; }
+        }
+
+        #endregion
+
+        #region IServiceProvider Members
+
+        public object GetService(Type serviceType)
+        {
+            return m_Provider.GetService(serviceType);
+        }
+
+        #endregion
+
+        #region IWindowsFormsEditorService Members
+
+        public void CloseDropDown()
+        {
+            throw new Exception("The method or operation is not implemented.");
+        }
+
+        public void DropDownControl(System.Windows.Forms.Control control)
+        {
+            throw new Exception("The method or operation is not implemented.");
+        }
+
+        public System.Windows.Forms.DialogResult ShowDialog(System.Windows.Forms.Form dialog)
+        {
+            DialogResult result;
+
+            IntPtr focushWnd = WinApi.GetFocus();
+            IUIService uiService = (IUIService)this.GetService(typeof(IUIService));
+            if (uiService != null)
+            {
+                result = uiService.ShowDialog(dialog);
+            }
+            else
+            {
+                result = dialog.ShowDialog();
+            }
+            if (focushWnd != IntPtr.Zero)
+            {
+                WinApi.SetFocus(focushWnd);
+            }
+            return result;
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/DataMembersSelector.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/DataMembersSelector.cs
new file mode 100644
index 00000000..49dc8bb7
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/DataMembersSelector.cs	
@@ -0,0 +1,178 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing.Design;
+using System.ComponentModel;
+using System.Windows.Forms.Design;
+using System.Windows.Forms;
+using System.Threading;
+using System.Collections;
+
+namespace DevComponents.DotNetBar.Design
+{
+    public class DataMembersSelector : UITypeEditor
+    {
+        #region Constructor
+        private CheckedListBoxSelector _ListSelector;
+        private BindingContext _BindingContext;
+        /// <summary>
+        /// Initializes a new instance of the DataMembersSelector class.
+        /// </summary>
+        public DataMembersSelector()
+        {
+            _ListSelector = new CheckedListBoxSelector();
+            _BindingContext = new BindingContext();
+        }
+        
+        #endregion
+
+        #region Implementation
+        public override object EditValue(ITypeDescriptorContext context, IServiceProvider provider, object value)
+        {
+            if (context != null
+                && context.Instance != null
+                && provider != null)
+            {
+                IWindowsFormsEditorService edSvc = (IWindowsFormsEditorService)provider.GetService(typeof(IWindowsFormsEditorService));
+                if (edSvc != null)
+                {
+                    PropertyDescriptor descriptor = TypeDescriptor.GetProperties(context.Instance)["DataSource"];
+                    if (descriptor == null)
+                    {
+                        return value;
+                    }
+                    object dataSource = descriptor.GetValue(context.Instance);
+                    LoadDataMembers(_ListSelector, dataSource, value);
+
+                    edSvc.DropDownControl(_ListSelector);
+
+                    string returnValue = "";
+                    foreach (string item in _ListSelector.ListBox.CheckedItems)
+                    {
+                        if (returnValue.Length > 0) returnValue += ",";
+                        returnValue += item;
+                    }
+                    return returnValue;
+                }
+            }
+            return value;
+        }
+
+        private bool IsSelected(string str,ref string[] selected)
+        {
+            string strl = str.ToLower();
+            for (int i = 0; i < selected.Length; i++)
+            {
+                string item = selected[i];
+                if (item.Trim().ToLower() == strl)
+                {
+                    selected[i] = str;
+                    return true;
+                }
+            }
+            return false;
+        }
+        private void LoadDataMembers(CheckedListBoxSelector listSelector, object dataSource, object value)
+        {
+            listSelector.ListBox.Items.Clear();
+            string v = value as string;
+            if (v == null) v = "";
+            string[] selected = v.Split(',');
+            string dataMember = string.Empty;
+
+            if (dataSource is Type)
+            {
+                try
+                {
+                    BindingSource source = new BindingSource();
+                    source.DataSource = dataSource;
+                    dataSource = source.List;
+                }
+                catch (Exception exception)
+                {
+                    if (IsCriticalException(exception))
+                    {
+                        throw;
+                    }
+                }
+                catch
+                {
+                }
+            }
+            if (this.IsBindableDataSource(dataSource))
+            {
+                PropertyDescriptorCollection properties = GetItemProperties(dataSource, string.Empty);
+                if (properties == null)
+                    return;
+                for (int i = 0; i < properties.Count; i++)
+                {
+                    PropertyDescriptor property = properties[i];
+                    if (this.IsBindableDataMember(property))
+                    {
+                        string str = string.IsNullOrEmpty(dataMember) ? property.Name : (dataMember + "." + property.Name);
+                        _ListSelector.ListBox.Items.Add(str, IsSelected(str,ref selected));
+                    }
+                }
+                if (selected.Length > 1)
+                {
+                    for (int i = 0; i < selected.Length; i++)
+                    {
+                        string s1 = selected[i];
+                        int i1 = _ListSelector.ListBox.Items.IndexOf(s1);
+                        _ListSelector.ListBox.Items.RemoveAt(i1);
+                        _ListSelector.ListBox.Items.Insert(i, s1);
+                        _ListSelector.ListBox.SetItemChecked(i, true);
+                    }
+                }
+            }
+        }
+
+        private bool IsBindableDataMember(PropertyDescriptor property)
+        {
+            if (!typeof(byte[]).IsAssignableFrom(property.PropertyType))
+            {
+                ListBindableAttribute attribute = (ListBindableAttribute)property.Attributes[typeof(ListBindableAttribute)];
+                if ((attribute != null) && !attribute.ListBindable)
+                {
+                    return false;
+                }
+            }
+            return true;
+        }
+        private PropertyDescriptorCollection GetItemProperties(object dataSource, string dataMember)
+        {
+            CurrencyManager manager = (CurrencyManager)_BindingContext[dataSource, dataMember];
+            if (manager != null)
+            {
+                return manager.GetItemProperties();
+            }
+            return null;
+        }
+        private bool IsBindableDataSource(object dataSource)
+        {
+            if ((!(dataSource is IListSource) && !(dataSource is IList)) && !(dataSource is Array))
+            {
+                return false;
+            }
+            ListBindableAttribute attribute = (ListBindableAttribute)TypeDescriptor.GetAttributes(dataSource)[typeof(ListBindableAttribute)];
+            if ((attribute != null) && !attribute.ListBindable)
+            {
+                return false;
+            }
+            return true;
+        }
+        private static bool IsCriticalException(Exception ex)
+        {
+            return (((((ex is NullReferenceException) || (ex is StackOverflowException)) || ((ex is OutOfMemoryException) ||
+                (ex is ThreadAbortException))) || ((ex is ExecutionEngineException) ||
+                (ex is IndexOutOfRangeException))) || (ex is AccessViolationException));
+        }
+
+
+        public override UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext context)
+        {
+            return UITypeEditorEditStyle.DropDown;
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/DateNavigatorDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/DateNavigatorDesigner.cs
new file mode 100644
index 00000000..fe4d0784
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/DateNavigatorDesigner.cs	
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Design
+{
+    public class DateNavigatorDesigner : DotNetBar.Design.PanelExDesigner
+    {
+        protected override void SetDesignTimeDefaults()
+        {
+            PanelEx p = this.Control as PanelEx;
+            if (p == null)
+                return;
+            p.CanvasColor = SystemColors.Control;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/DesignerSupport.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/DesignerSupport.cs
new file mode 100644
index 00000000..684ddb06
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/DesignerSupport.cs	
@@ -0,0 +1,147 @@
+using System;
+using System.ComponentModel;
+using System.ComponentModel.Design;
+using System.Drawing;
+using DevComponents.DotNetBar.Design;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Summary description for DesignerSupport.
+	/// </summary>
+	internal class DesignerSupport
+	{
+		public static ItemContainer CreateItemContainer(IDesignerServices designer, BaseItem parent, eOrientation containerOrientation)
+		{
+			IDesignerHost dh=designer.GetService(typeof(IDesignerHost)) as IDesignerHost;
+			IComponentChangeService cc=designer.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+			
+			if(dh==null || parent==null || cc==null)
+				return null;
+
+			ItemContainer c=null;
+
+			DesignerTransaction trans=dh.CreateTransaction("New DotNetBar Item Container");
+			try
+			{
+				c=dh.CreateComponent(typeof(ItemContainer)) as ItemContainer;
+				TypeDescriptor.GetProperties(c)["LayoutOrientation"].SetValue(c,containerOrientation);
+				cc.OnComponentChanging(parent,TypeDescriptor.GetProperties(c)["SubItems"]);
+				parent.SubItems.Add(c);
+				cc.OnComponentChanged(parent,TypeDescriptor.GetProperties(c)["SubItems"],null,null);
+			}
+			finally
+			{
+				if(!trans.Canceled)
+					trans.Commit();
+			}
+
+			return c;
+        }
+
+        public static ItemDockContainer CreateItemDockContainer(IDesignerServices designer, BaseItem parent)
+        {
+            IDesignerHost dh = designer.GetService(typeof(IDesignerHost)) as IDesignerHost;
+            IComponentChangeService cc = designer.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+
+            if (dh == null || parent == null || cc == null)
+                return null;
+
+            ItemDockContainer c = null;
+
+            DesignerTransaction trans = dh.CreateTransaction("New DotNetBar Item Dock Container");
+            try
+            {
+                c = dh.CreateComponent(typeof(ItemDockContainer)) as ItemDockContainer;
+                cc.OnComponentChanging(parent, TypeDescriptor.GetProperties(c)["SubItems"]);
+                parent.SubItems.Add(c);
+                cc.OnComponentChanged(parent, TypeDescriptor.GetProperties(c)["SubItems"], null, null);
+            }
+            finally
+            {
+                if (!trans.Canceled)
+                    trans.Commit();
+            }
+
+            return c;
+        }
+
+        public static RibbonTabItemGroup CreateRibbonTabItemGroup(RibbonStrip strip, IServiceProvider provider)
+		{
+			IDesignerHost dh=provider.GetService(typeof(IDesignerHost)) as IDesignerHost;
+			IComponentChangeService cc=provider.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+			if(dh==null || cc==null) return null;
+            
+			DesignerTransaction trans=dh.CreateTransaction("New RibbonTabItemGroup");
+			RibbonTabItemGroup group=null;
+			try
+			{
+				group=dh.CreateComponent(typeof(RibbonTabItemGroup)) as RibbonTabItemGroup;
+				cc.OnComponentChanging(strip,TypeDescriptor.GetProperties(strip)["TabGroups"]);
+				strip.TabGroups.Add(group);				
+				cc.OnComponentChanged(strip,TypeDescriptor.GetProperties(strip)["TabGroups"],null,null);
+				SetDefaults(group);
+			}
+			catch
+			{
+				trans.Cancel();
+				throw;
+			}
+			finally
+			{
+				if(!trans.Canceled)
+					trans.Commit();
+			}
+			return group;
+		}
+
+        public static GalleryGroup CreateGalleryGroup(GalleryContainer gallery, IServiceProvider provider)
+        {
+            IDesignerHost dh = provider.GetService(typeof(IDesignerHost)) as IDesignerHost;
+            IComponentChangeService cc = provider.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+            if (dh == null || cc == null) return null;
+
+            DesignerTransaction trans = dh.CreateTransaction("New GalleryGroup");
+            GalleryGroup group = null;
+            try
+            {
+                group = dh.CreateComponent(typeof(GalleryGroup)) as GalleryGroup;
+
+                cc.OnComponentChanging(gallery, TypeDescriptor.GetProperties(gallery)["GalleryGroups"]);
+                gallery.GalleryGroups.Add(group);
+                cc.OnComponentChanged(gallery, TypeDescriptor.GetProperties(gallery)["GalleryGroups"], null, null);
+
+                group.Text = group.Name;
+            }
+            catch
+            {
+                trans.Cancel();
+                throw;
+            }
+            finally
+            {
+                if (!trans.Canceled)
+                    trans.Commit();
+            }
+            return group;
+        }
+        
+
+		public static void SetDefaults(RibbonTabItemGroup group)
+		{
+			TypeDescriptor.GetProperties(group)["GroupTitle"].SetValue(group,"New Group");
+			TypeDescriptor.GetProperties(group.Style)["Border"].SetValue(group.Style,eStyleBorderType.Solid);
+			TypeDescriptor.GetProperties(group.Style)["BorderColor"].SetValue(group.Style,ColorScheme.GetColor("9A3A3B"));
+			TypeDescriptor.GetProperties(group.Style)["CornerType"].SetValue(group.Style,eCornerType.Square);
+            TypeDescriptor.GetProperties(group.Style)["BackColor"].SetValue(group.Style, ColorScheme.GetColor("AE6D94"));
+            TypeDescriptor.GetProperties(group.Style)["BackColor2"].SetValue(group.Style, ColorScheme.GetColor("90487B"));
+			TypeDescriptor.GetProperties(group.Style)["BackColorGradientAngle"].SetValue(group.Style,90);
+			TypeDescriptor.GetProperties(group.Style)["BorderWidth"].SetValue(group.Style,1);
+			TypeDescriptor.GetProperties(group.Style)["TextColor"].SetValue(group.Style,Color.White);
+            TypeDescriptor.GetProperties(group.Style)["TextShadowColor"].SetValue(group.Style, Color.Black);
+            TypeDescriptor.GetProperties(group.Style)["TextShadowOffset"].SetValue(group.Style, new Point(1,1));
+			TypeDescriptor.GetProperties(group.Style)["TextAlignment"].SetValue(group.Style,eStyleTextAlignment.Center);
+			TypeDescriptor.GetProperties(group.Style)["TextLineAlignment"].SetValue(group.Style,eStyleTextAlignment.Near);
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/DockContainerItemDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/DockContainerItemDesigner.cs
new file mode 100644
index 00000000..6fb08821
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/DockContainerItemDesigner.cs	
@@ -0,0 +1,57 @@
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.ComponentModel.Design;
+using System.Drawing;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Design
+{
+	/// <summary>
+	/// Summary description for DockContainerItemDesigner.
+	/// </summary>
+	public class DockContainerItemDesigner:ComponentDesigner
+	{
+		public override void Initialize(IComponent component) 
+		{
+			base.Initialize(component);
+
+			if(!component.Site.DesignMode)
+				return;
+
+			DockContainerItem c=component as DockContainerItem;
+			if(c!=null)
+			{
+				this.Visible=c.Visible;
+			}
+		}
+
+		protected override void PreFilterProperties(IDictionary properties)
+		{
+			base.PreFilterProperties(properties);
+			properties["Visible"] = TypeDescriptor.CreateProperty(typeof(DockContainerItemDesigner),(PropertyDescriptor)properties["Visible"], new Attribute[]
+				{
+						new DefaultValueAttribute(true),
+					new BrowsableAttribute(true),
+					new CategoryAttribute("Layout")});
+
+		}
+
+		/// <summary>
+		/// Gets or sets whether item is visible.
+		/// </summary>
+		[DefaultValue(true),Browsable(true),DevCoBrowsable(true),Category("Layout"),Description("Gets or sets whether item is visible.")]
+		public bool Visible 
+		{
+			get 
+			{
+				return (bool)ShadowProperties["Visible"];
+			}
+			set 
+			{
+				// this value is not passed to the actual control
+				this.ShadowProperties["Visible"] = value;
+			}
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/DockSiteDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/DockSiteDesigner.cs
new file mode 100644
index 00000000..eac7afa3
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/DockSiteDesigner.cs	
@@ -0,0 +1,224 @@
+using System;
+using System.ComponentModel;
+using System.ComponentModel.Design;
+using System.Windows.Forms.Design;
+using System.Windows.Forms;
+using System.Drawing;
+namespace DevComponents.DotNetBar.Design
+{
+	/// <summary>
+	/// Summary description for DockSiteDesigner.
+	/// </summary>
+	public class DockSiteDesigner:ParentControlDesigner
+	{
+		private bool m_MouseDrag=false;
+        internal bool DotNetBarManagerRemoving = false;
+
+		public override SelectionRules SelectionRules
+		{
+			get{return SelectionRules.None;}
+		}
+		protected override void OnContextMenu(int x,int y)
+		{
+		}
+
+        public override bool CanParent(Control control)
+        {
+            if (control is IDockInfo && !(control is ContextMenuBar))
+                return true;
+            return false;
+        }
+
+		public override void Initialize(IComponent component) 
+		{
+			base.Initialize(component);
+			if(!component.Site.DesignMode)
+				return;
+			// If our component is removed we need to clean-up
+			IComponentChangeService cc=(IComponentChangeService)GetService(typeof(IComponentChangeService));
+			if(cc!=null)
+			{
+				cc.ComponentRemoving+=new ComponentEventHandler(this.OnComponentRemoving);
+			}
+
+            IDesignerHost dh = GetService(typeof(IDesignerHost)) as IDesignerHost;
+            if (dh != null && dh.Loading)
+            {
+                ((DockSite)component)._DesignerLoading = true;
+                dh.LoadComplete += new EventHandler(DesignerHostLoadComplete);
+            }
+		}
+
+        private void DesignerHostLoadComplete(object sender, EventArgs e)
+        {
+			DockSite site = (DockSite)this.Control;
+            site._DesignerLoading = false;
+
+            IDesignerHost dh = GetService(typeof(IDesignerHost)) as IDesignerHost;
+            if (dh != null)
+                dh.LoadComplete -= new EventHandler(DesignerHostLoadComplete);
+#if !FRAMEWORK20
+			if(site.Dock == DockStyle.Fill && site.Controls.Count > 0)
+				site.RecalcLayout();
+#endif
+        }
+
+		protected override void Dispose(bool disposing)
+		{
+			// Unhook events
+			IComponentChangeService cc=(IComponentChangeService)GetService(typeof(IComponentChangeService));
+			if(cc!=null)
+			{
+				cc.ComponentRemoving-=new ComponentEventHandler(this.OnComponentRemoving);
+			}
+
+			base.Dispose(disposing);
+		}
+
+		private void OnComponentRemoving(object sender,ComponentEventArgs e)
+		{
+			
+			if(e.Component!=this.Component)
+			{
+				return;
+			}
+
+            DockSite c = this.Control as DockSite;
+            if (c.Dock != DockStyle.Fill && !DotNetBarManagerRemoving)
+            {
+                throw new InvalidOperationException("DotNetBarManager dock sites must not be removed manually. Delete DotNetBarManager component to remove all dock sites.");
+            }
+            else
+            {
+                IDesignerHost dh = (IDesignerHost)GetService(typeof(IDesignerHost));
+                if (dh != null)
+                {
+                    Bar[] bars = new Bar[c.Controls.Count];
+                    c.Controls.CopyTo(bars, 0);
+                    foreach (Bar bar in bars)
+                    {
+                        if (bar != null)
+                        {
+                            dh.DestroyComponent(bar);
+                        }
+                    }
+                }
+            }
+
+			// Unhook events
+			IComponentChangeService cc=(IComponentChangeService)GetService(typeof(IComponentChangeService));
+			if(cc!=null)
+				cc.ComponentRemoving-=new ComponentEventHandler(this.OnComponentRemoving);
+			
+			if(c==null)
+				return;
+			if(c.Owner!=null)
+			{
+				if(c.Owner.FillDockSite==c)
+					c.Owner.FillDockSite=null;
+				else if(c.Owner.LeftDockSite==c)
+					c.Owner.LeftDockSite=null;
+				else if(c.Owner.RightDockSite==c)
+					c.Owner.RightDockSite=null;
+				else if(c.Owner.TopDockSite==c)
+					c.Owner.TopDockSite=null;
+				else if(c.Owner.BottomDockSite==c)
+					c.Owner.BottomDockSite=null;
+			}
+		}
+
+		protected override void OnSetCursor()
+		{
+            DockSite site = this.Control as DockSite;
+			if(site.Dock!=DockStyle.Fill && site.DocumentDockContainer==null)
+				return;
+			Point p=Control.MousePosition;
+			if(site==null || site.Controls.Count==0) return;
+
+			DocumentDockUIManager m=site.GetDocumentUIManager();
+			Point pClient=site.PointToClient(p);
+			Cursor c=m.GetCursor(pClient.X,pClient.Y);
+			if(c!=null)
+				Cursor.Current=c;
+			else
+				Cursor.Current=Cursors.Default;
+		}
+
+		protected override void OnMouseDragBegin(int x, int y)
+		{
+			DockSite site=this.Control as DockSite;
+            if (this.Control.Dock == DockStyle.Fill && site != null || site.DocumentDockContainer != null)
+			{
+				DocumentDockUIManager m=site.GetDocumentUIManager();
+				Point pClient=site.PointToClient(new Point(x,y));
+				Cursor c=m.GetCursor(pClient.X,pClient.Y);
+				if(c!=null)
+				{
+					m.OnMouseDown(new MouseEventArgs(MouseButtons.Left,0,pClient.X,pClient.Y,0));
+					m_MouseDrag=true;
+				}
+			}
+
+			base.OnMouseDragBegin(x,y);
+
+			if(m_MouseDrag)
+			{
+				site.Capture = true;
+                if (site.Dock == DockStyle.Fill || site.GetDocumentUIManager().IsResizingDocument)
+                {
+                    WinApi.RECT rect = new WinApi.RECT(0, 0, 0, 0);
+                    WinApi.GetWindowRect(site.Handle, ref rect);
+                    Rectangle r = Rectangle.FromLTRB(rect.Left, rect.Top, rect.Right, rect.Bottom);
+                    Cursor.Clip = r;
+                }
+				#if !FRAMEWORK20
+				else
+					Cursor.Clip = Rectangle.Empty;
+				#endif
+			}
+		}
+
+		protected override void OnMouseDragMove(int x, int y)
+		{
+			DockSite site=this.Control as DockSite;
+			if(m_MouseDrag && site!=null)
+			{
+				DocumentDockUIManager m=site.GetDocumentUIManager();
+				Point pClient=site.PointToClient(new Point(x,y));
+				m.OnMouseMove(new MouseEventArgs(MouseButtons.Left,0,pClient.X,pClient.Y,0));
+			}
+			else
+				base.OnMouseDragMove(x,y);
+		}
+
+		protected override void OnMouseDragEnd(bool cancel)
+		{
+			if(m_MouseDrag)
+			{
+				this.Control.Capture = false;
+				Cursor.Clip = Rectangle.Empty;
+			}
+			DockSite site=this.Control as DockSite;
+			if(m_MouseDrag && site!=null)
+			{
+				DocumentDockUIManager m=site.GetDocumentUIManager();
+				Point pClient=site.PointToClient(Control.MousePosition);
+				
+				IComponentChangeService cc=(IComponentChangeService)GetService(typeof(IComponentChangeService));
+				if(cc!=null)
+				{
+					cc.OnComponentChanging(site,TypeDescriptor.GetProperties(typeof(DockSite))["DocumentDockContainer"]);
+				}
+
+				m.OnMouseUp(new MouseEventArgs(MouseButtons.Left,0,pClient.X,pClient.Y,0));
+
+				if(cc!=null)
+				{
+					cc.OnComponentChanged(site,TypeDescriptor.GetProperties(typeof(DockSite))["DocumentDockContainer"],null,null);
+				}
+			}
+			m_MouseDrag=false;
+			base.OnMouseDragEnd(cancel);
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/DotNetBarDesignTime.csproj b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/DotNetBarDesignTime.csproj
new file mode 100644
index 00000000..12e4b3f4
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/DotNetBarDesignTime.csproj	
@@ -0,0 +1,500 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{BDA04B2C-CE5A-4264-8266-EF8ED4A6837D}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>DevComponents.DotNetBar.Design</RootNamespace>
+    <AssemblyName>DevComponents.DotNetBar.Design</AssemblyName>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>DotNetBarDesignTime.snk</AssemblyOriginatorKeyFile>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <OldToolsVersion>2.0</OldToolsVersion>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;DOTNETBAR; FRAMEWORK20</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE;DOTNETBAR;FRAMEWORK20</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseTrial2005Design|AnyCPU' ">
+    <OutputPath>bin\ReleaseTrial2005Design\</OutputPath>
+    <DefineConstants>TRACE;TRIAL;DOTNETBAR;FRAMEWORK20</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Design" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Drawing.Design" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="AdvTree.Design\CellCollectionEditor.cs" />
+    <Compile Include="AdvTree.Design\HostedItemTypeEditor.cs" />
+    <Compile Include="AdvTree.Design\ImageIndexEditor.cs" />
+    <Compile Include="AdvTree.Design\NodeCollectionEditor.cs" />
+    <Compile Include="ApplicationButtonDesigner.cs" />
+    <Compile Include="BarBaseControlDesigner.cs" />
+    <Compile Include="BarDesigner.cs" />
+    <Compile Include="BaseItemDesigner.cs" />
+    <Compile Include="BindingNavigatorExDesigner.cs">
+    </Compile>
+    <Compile Include="BubbleBarDesigner.cs" />
+    <Compile Include="BubbleBarTabCollectionEditor.cs" />
+    <Compile Include="BubbleBarTabDesigner.cs" />
+    <Compile Include="BubbleButtonCollectionEditor.cs" />
+    <Compile Include="ButtonItemEditor.cs" />
+    <Compile Include="ButtonXDesigner.cs" />
+    <Compile Include="CheckedListBoxSelector.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="CheckedListBoxSelector.Designer.cs">
+      <DependentUpon>CheckedListBoxSelector.cs</DependentUpon>
+    </Compile>
+    <Compile Include="ColumnNamesEditor.cs" />
+    <Compile Include="ComponentDesignerWithAction.cs" />
+    <Compile Include="DataMembersSelector.cs" />
+    <Compile Include="Editors.Design\CalculatorDesigner.cs" />
+    <Compile Include="CheckBoxItemDesigner.cs" />
+    <Compile Include="CheckBoxXDesigner.cs" />
+    <Compile Include="ColorPickerButtonDesigner.cs" />
+    <Compile Include="ColorSchemeColorConverter.cs" />
+    <Compile Include="ColumnHeaderCollectionEditor.cs" />
+    <Compile Include="ComboBoxExDesigner.cs" />
+    <Compile Include="ComboItemsEditor.cs" />
+    <Compile Include="ComboTreeActionList.cs" />
+    <Compile Include="ComboTreeDesigner.cs" />
+    <Compile Include="ContextMenuBarDesigner.cs" />
+    <Compile Include="CrumbBarDesigner.cs" />
+    <Compile Include="CrumbBarItemCollectionEditor.cs" />
+    <Compile Include="CrumbBarItemDesigner.cs" />
+    <Compile Include="CrumbBarItemsEditor.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="CustomTypeEditorProvider.cs" />
+    <Compile Include="DateNavigatorDesigner.cs" />
+    <Compile Include="AdvTree.Design\AdvTreeActionList.cs" />
+    <Compile Include="AdvTree.Design\AdvTreeDesigner.cs" />
+    <Compile Include="AdvTree.Design\ColumnHeaderDesigner.cs" />
+    <Compile Include="AdvTree.Design\ElementStyleTypeEditor.cs" />
+    <Compile Include="AdvTree.Design\NodeConnectorTypeEditor.cs" />
+    <Compile Include="AdvTree.Design\NodeContextMenuTypeEditor.cs" />
+    <Compile Include="AdvTree.Design\NodeDesigner.cs" />
+    <Compile Include="DesignerSupport.cs" />
+    <Compile Include="DockContainerItemDesigner.cs" />
+    <Compile Include="DockSiteDesigner.cs" />
+    <Compile Include="DotNetBarManagerDesigner.cs" />
+    <Compile Include="Editors.Design\DateTimeInputDesigner.cs" />
+    <Compile Include="Editors.Design\IpAddressInputDesigner.cs" />
+    <Compile Include="Editors.Design\MonthCalendarAdvDesigner.cs" />
+    <Compile Include="Editors.Design\NumericInputBaseDesigner.cs" />
+    <Compile Include="Editors.Design\TimeSelectorDesigner.cs" />
+    <Compile Include="Editors.Design\VisualControlBaseDesigner.cs" />
+    <Compile Include="ElementStyleClassTypeEditor.cs" />
+    <Compile Include="ElementStyleCollectionEditor.cs" />
+    <Compile Include="ExpandablePanelDesigner.cs" />
+    <Compile Include="ExpandableSplitterDesigner.cs" />
+    <Compile Include="ExplorerBarDesigner.cs" />
+    <Compile Include="ExplorerBarGroupItemDesigner.cs" />
+    <Compile Include="ExplorerBarGroupItemEditor.cs" />
+    <Compile Include="ExplorerBarPanelsEditor.cs" />
+    <Compile Include="FlagEnumEditor.cs" />
+    <Compile Include="FlyoutDesigner.cs" />
+    <Compile Include="GalleryContainerDesigner.cs" />
+    <Compile Include="GalleryGroupCollectionEditor.cs" />
+    <Compile Include="GalleryGroupConverter.cs" />
+    <Compile Include="GalleryGroupTypeEditor.cs" />
+    <Compile Include="GlyphServiceProvider.cs" />
+    <Compile Include="GroupPanelDesigner.cs" />
+    <Compile Include="Helpers.cs" />
+    <Compile Include="ItemContainerDesigner.cs" />
+    <Compile Include="ItemPanelDesigner.cs" />
+    <Compile Include="ItemSelectorTypeEditor.cs" />
+    <Compile Include="LabelXDesigner.cs" />
+    <Compile Include="ListBoxAdvDesigner.cs" />
+    <Compile Include="MaskedTextBoxAdvDesigner.cs" />
+    <Compile Include="Metro\MetroApplicationButtonDesigner.cs" />
+    <Compile Include="Metro\MetroColorThemeEditor.cs" />
+    <Compile Include="Metro\MetroStatusBarDesigner.cs" />
+    <Compile Include="Metro\MetroShellDesigner.cs" />
+    <Compile Include="Metro\MetroTabItemDesigner.cs" />
+    <Compile Include="Metro\MetroTabPanelDesigner.cs" />
+    <Compile Include="Metro\MetroTileFrameDesigner.cs" />
+    <Compile Include="Metro\MetroTilePanelDesigner.cs" />
+    <Compile Include="Metro\MetroToolbarDesigner.cs" />
+    <Compile Include="MicroChartDesigner.cs" />
+    <Compile Include="MicroChartItemDesigner.cs" />
+    <Compile Include="NavigationBarDesigner.cs" />
+    <Compile Include="NavigationPaneDesigner.cs" />
+    <Compile Include="NavigationPanePanelDesigner.cs" />
+    <Compile Include="PageSliderDesigner.cs" />
+    <Compile Include="PageSliderPageDesigner.cs" />
+    <Compile Include="PanelControlDesigner.cs" />
+    <Compile Include="PanelDockContainerDesigner.cs" />
+    <Compile Include="PanelExDesigner.cs" />
+    <Compile Include="ProgressStepsDesigner.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="RadialMenu\RadialMenuActionList.cs" />
+    <Compile Include="RadialMenu\RadialMenuDesigner.cs" />
+    <Compile Include="RadialMenu\RadialMenuItemDesigner.cs" />
+    <Compile Include="RadialMenu\RadialMenuItemEditor.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="RadialMenu\RadialMenuItemEditor.Designer.cs">
+      <DependentUpon>RadialMenuItemEditor.cs</DependentUpon>
+    </Compile>
+    <Compile Include="RangeSliderDesigner.cs" />
+    <Compile Include="RatingItemDesigner.cs" />
+    <Compile Include="ReflectionHelpers.cs" />
+    <Compile Include="ReflectionImageDesigner.cs" />
+    <Compile Include="ReflectionLabelDesigner.cs" />
+    <Compile Include="RibbonBarDesigner.cs" />
+    <Compile Include="RibbonBarMergeContainerDesigner.cs" />
+    <Compile Include="RibbonClientPanelDesigner.cs" />
+    <Compile Include="RibbonControlDesigner.cs" />
+    <Compile Include="RibbonPanelDesigner.cs" />
+    <Compile Include="RibbonTabItemDesigner.cs" />
+    <Compile Include="RibbonTabItemGroupCollectionEditor.cs" />
+    <Compile Include="RibbonTabItemGroupConverter.cs" />
+    <Compile Include="RibbonTabItemGroupTypeEditor.cs" />
+    <Compile Include="RichTextBoxExDesigner.cs" />
+    <Compile Include="Schedule.Design\CalendarViewDesigner.cs" />
+    <Compile Include="ShapeEditorForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="ShapeEditorForm.Designer.cs">
+      <DependentUpon>ShapeEditorForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="ShapeTypeEditor.cs" />
+    <Compile Include="ShortcutsDesigner.cs" />
+    <Compile Include="SideBarColorSchemePicker.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="SideBarDesigner.cs" />
+    <Compile Include="SideBarPanelItemDesigner.cs" />
+    <Compile Include="SideBarPanelItemEditor.cs" />
+    <Compile Include="SideBarPanelsEditor.cs" />
+    <Compile Include="SideNavDesigner.cs" />
+    <Compile Include="SimpleBaseItemDesigner.cs" />
+    <Compile Include="SimpleItemDesigner.cs" />
+    <Compile Include="SlidePanelDesigner.cs" />
+    <Compile Include="SliderDesigner.cs" />
+    <Compile Include="SuperTabControl.Design\SuperTabControlDesigner.cs" />
+    <Compile Include="SuperTabControl.Design\SuperTabControlPanelDesigner.cs" />
+    <Compile Include="SuperTabControl.Design\SuperTabControlTabsEditor.cs" />
+    <Compile Include="SuperTabControl.Design\SuperTabItemColorTableEditor.cs" />
+    <Compile Include="SuperTabControl.Design\SuperTabItemDesigner.cs" />
+    <Compile Include="SuperTabControl.Design\SuperTabStripDesigner.cs" />
+    <Compile Include="SuperTabControl.Design\SuperTabStripTabsEditor.cs" />
+    <Compile Include="SuperTooltipDesigner.cs" />
+    <Compile Include="SuperTooltipInfoConverter.cs" />
+    <Compile Include="SuperTooltipInfoEditor.cs" />
+    <Compile Include="SuperTooltipVisualEditor.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="SwitchButtonDesigner.cs" />
+    <Compile Include="SymbolTypeEditor.cs" />
+    <Compile Include="TabControlDesigner.cs" />
+    <Compile Include="TabControlPanelDesigner.cs" />
+    <Compile Include="TabFormItemDesigner.cs" />
+    <Compile Include="TabForm\TabFormControlDesigner.cs" />
+    <Compile Include="TabItemDesigner.cs" />
+    <Compile Include="TabStripDesigner.cs" />
+    <Compile Include="TabStripTabsEditor.cs" />
+    <Compile Include="TextBoxDropDownDesigner.cs" />
+    <Compile Include="TextBoxItemDesigner.cs" />
+    <Compile Include="TextBoxXDesigner.cs" />
+    <Compile Include="TextMarkupEditor.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="TextMarkupUIEditor.cs" />
+    <Compile Include="TimeZoneSelectionEditor.cs" />
+    <Compile Include="TokenEditorDesigner.cs" />
+    <Compile Include="ToolboxControl\ToolboxControlDesigner.cs" />
+    <Compile Include="ToolboxControl\ToolboxGroupDesigner.cs" />
+    <Compile Include="ToolboxControl\ToolboxItemDesigner.cs" />
+    <Compile Include="Validator.Design\HighlighterDesigner.cs" />
+    <Compile Include="Validator.Design\RequiredFieldValidatorConverter.cs" />
+    <Compile Include="Validator.Design\SuperValidatorDesigner.cs" />
+    <Compile Include="Validator.Design\ValidationExpressionEditor.cs" />
+    <Compile Include="Validator.Design\ValidatorEditor.cs" />
+    <Compile Include="WarningBoxDesigner.cs" />
+    <Compile Include="WinApi.cs" />
+    <Compile Include="WizardDesigner.cs" />
+    <Compile Include="WizardPageDesigner.cs" />
+    <Compile Include="WizardPageNavigationControl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="WizardPageOrderDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Service Include="{94E38DFF-614B-4cbd-B67C-F211BB35CE8B}" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="DotNetBarDesignTime.snk" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="SuperTooltipVisualEditor.resx">
+      <DependentUpon>SuperTooltipVisualEditor.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="SystemImages\AddMoreItemsContainer.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="SystemImages\BlankOffice2010HotSilver.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="SystemImages\BlankOffice2010NormalSilver.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="SystemImages\BlankOffice2010PressedSilver.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="SystemImages\BlankStartButtonHot.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="SystemImages\BlankStartButtonHotBlack.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="SystemImages\BlankStartButtonHotSilver.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="SystemImages\BlankStartButtonHotVistaBlack.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="SystemImages\BlankStartButtonNormal.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="SystemImages\BlankStartButtonNormalBlack.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="SystemImages\BlankStartButtonNormalSilver.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="SystemImages\BlankStartButtonNormalVistaBlack.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="SystemImages\BlankStartButtonPressed.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="SystemImages\BlankStartButtonPressedBlack.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="SystemImages\BlankStartButtonPressedSilver.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="SystemImages\BlankStartButtonPressedVistaBlack.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="SystemImages\BlankWin7HotBlue.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="SystemImages\BlankWin7NormalBlue.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="SystemImages\BlankWin7PressedBlue.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="SystemImages\Category.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="SystemImages\CloseButton.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="SystemImages\CollapseTitle.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="SystemImages\ColorPickerButtonImage.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="SystemImages\ColorPickerCustomColors.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="SystemImages\DateReset.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="SystemImages\DefaultNavBarImage.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="SystemImages\DockHintAllSides.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="SystemImages\DockHintBottom.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="SystemImages\DockHintLeft.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="SystemImages\DockHintRight.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="SystemImages\DockHintTab.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="SystemImages\DockHintTop.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="SystemImages\ErrorIcon.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="SystemImages\ExpandTitle.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="SystemImages\FreeText.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="SystemImages\GreenLight.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="SystemImages\ImagePlaceHolder.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="SystemImages\ImagePlaceHolder16x16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="SystemImages\NavBarConfigure.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="SystemImages\NavBarShowLess.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="SystemImages\NavBarShowMore.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="SystemImages\Note24.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="SystemImages\Note64.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="SystemImages\Pin.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="SystemImages\PinInactive.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="SystemImages\PinPushed.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="SystemImages\PinPushedInactive.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="SystemImages\QatCustomizeItemCombo.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="SystemImages\Rating.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="SystemImages\RibbonOverflow.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="SystemImages\Sort.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="CheckedListBoxSelector.resx">
+      <DependentUpon>CheckedListBoxSelector.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="RadialMenu\RadialMenuItemEditor.resx">
+      <SubType>Designer</SubType>
+      <DependentUpon>RadialMenuItemEditor.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="ShapeEditorForm.resx">
+      <DependentUpon>ShapeEditorForm.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="SideBarColorSchemePicker.resx">
+      <DependentUpon>SideBarColorSchemePicker.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="SystemImages\WizardHeaderImage.png" />
+    <EmbeddedResource Include="TextMarkupEditor.resx">
+      <DependentUpon>TextMarkupEditor.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="WizardPageOrderDialog.resx">
+      <DependentUpon>WizardPageOrderDialog.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\DevComponents.DotNetBar.Schedule\DevComponents.DotNetBar.Schedule.csproj">
+      <Project>{C25DFA40-9897-47FA-A525-7528C5BE7724}</Project>
+      <Name>DevComponents.DotNetBar.Schedule</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\DotNetBar.csproj">
+      <Project>{36546CE3-335C-4AB6-A2F3-40F8C818BC66}</Project>
+      <Name>DotNetBar</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+      <Visible>False</Visible>
+      <ProductName>Windows Installer 3.1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/DotNetBarDesignTime.snk b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/DotNetBarDesignTime.snk
new file mode 100644
index 00000000..33a02ddf
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/DotNetBarDesignTime.snk differ
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/DotNetBarManagerDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/DotNetBarManagerDesigner.cs
new file mode 100644
index 00000000..416ecfe9
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/DotNetBarManagerDesigner.cs	
@@ -0,0 +1,1250 @@
+using System;
+using System.ComponentModel;
+using System.ComponentModel.Design;
+using System.Reflection;
+using System.Collections;
+using System.Xml;
+using System.Windows.Forms;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Design
+{
+	/// <summary>
+	/// Summary description for DotNetBarDesigner.
+	/// </summary>
+	public class DotNetBarManagerDesigner:System.ComponentModel.Design.ComponentDesigner,IDesignerServices
+    {
+        #region Private Variables
+        //private bool m_PopupProvider=false;
+		private bool m_Selected=false;
+        #endregion
+
+        #region Licensing Stuff
+#if !TRIAL
+        internal static string GetLicenseKey()
+        {
+            string key = "";
+            Microsoft.Win32.RegistryKey regkey = Microsoft.Win32.Registry.LocalMachine;
+            regkey = regkey.OpenSubKey("Software\\DevComponents\\Licenses", false);
+            if (regkey != null)
+            {
+                object keyValue = regkey.GetValue("DevComponents.DotNetBar.DotNetBarManager2");
+                if (keyValue != null)
+                    key = keyValue.ToString();
+            }
+            return key;
+        }
+#endif
+        #endregion
+
+        #region Internal Implementation
+
+        public override DesignerVerbCollection Verbs 
+		{
+			get 
+			{
+				DesignerVerb[] verbs = new DesignerVerb[] {
+                    new DesignerVerb("Create Dock Bar Left", new EventHandler(CreateDockBarLeft)),
+                    new DesignerVerb("Create Dock Bar Right", new EventHandler(CreateDockBarRight)),
+                    new DesignerVerb("Create Dock Bar Bottom", new EventHandler(CreateDockBarBottom)),
+                    new DesignerVerb("Create Dock Bar Top", new EventHandler(CreateDockBarTop)),
+                    new DesignerVerb("Create Menu Bar", new EventHandler(CreateMenuBar)),
+                    new DesignerVerb("Create Toolbar", new EventHandler(CreateToolbar)),
+					new DesignerVerb("Enable Document Docking", new EventHandler(OnEnableDocumentDocking))};
+				return new DesignerVerbCollection(verbs);
+			}
+		}
+
+        //public override void DoDefaultAction()
+        //{
+        //    DotNetBarManager dbm=this.Component as DotNetBarManager;
+        //    if(dbm!=null)
+        //    {
+        //        dbm.Customize(this);
+        //    }
+        //}
+
+		protected override void Dispose(bool disposing) 
+		{
+			// Unhook events
+			if(disposing)
+			{
+				IComponentChangeService cc=(IComponentChangeService)GetService(typeof(IComponentChangeService));
+				if(cc!=null)
+					cc.ComponentRemoving-=new ComponentEventHandler(this.OnComponentRemoving);
+				ISelectionService ss = (ISelectionService)GetService(typeof(ISelectionService));
+				if (ss!=null)
+					ss.SelectionChanged-=new EventHandler(OnSelectionChanged);
+			}
+
+			base.Dispose(disposing);
+		}
+
+        //private void ComponentRenamed(object sender, ComponentRenameEventArgs e)
+        //{
+        //    IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+        //    if(dh==null)
+        //        return;
+
+        //    if(e.Component==dh.RootComponent || e.Component==this.Component)
+        //    {
+        //        DotNetBarManager m=this.Component as DotNetBarManager;
+        //        if(m!=null && m.DefinitionName!="")
+        //        {
+        //            if(DesignTimeDte.DeleteFromProject(m.DefinitionName, this.Component.Site))
+        //            {
+        //                m.DefinitionName="";
+        //                m.SaveDesignDefinition();
+        //            }
+        //        }
+        //    }
+        //}
+		public override void Initialize(IComponent component) 
+		{
+			base.Initialize(component);
+			if(!component.Site.DesignMode)
+				return;
+
+			// If our component is removed we need to clean-up
+			IComponentChangeService cc=(IComponentChangeService)GetService(typeof(IComponentChangeService));
+			if(cc!=null)
+			{
+				cc.ComponentRemoving+=new ComponentEventHandler(this.OnComponentRemoving);
+				//cc.ComponentRename+=new ComponentRenameEventHandler(this.ComponentRenamed);
+            }
+            #if DEBUG
+            if(cc!=null)
+                cc.ComponentChanging += new ComponentChangingEventHandler(DebugDesignerComponentChanging);
+            #endif
+
+            ISelectionService ss =(ISelectionService)GetService(typeof(ISelectionService));
+			if(ss!=null)
+				ss.SelectionChanged+=new EventHandler(OnSelectionChanged);
+
+			IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+			if(dh==null)
+				return;
+
+            if (dh.Loading)
+			{
+				dh.LoadComplete+=new EventHandler(this.LoadComplete);
+				return;
+			}
+			
+		}
+        #if DEBUG
+        void DebugDesignerComponentChanging(object sender, ComponentChangingEventArgs e)
+        {
+            System.Diagnostics.Trace.WriteLine("ComponentChanging");
+        }
+        #endif
+
+#if FRAMEWORK20
+        public override void InitializeNewComponent(IDictionary defaultValues)
+        {
+            base.InitializeNewComponent(defaultValues);
+            SetDesignTimeDefaults();
+        }
+#else
+		public override void OnSetComponentDefaults()
+		{
+			base.OnSetComponentDefaults();
+			SetDesignTimeDefaults();
+		}
+#endif
+
+        private void SetDesignTimeDefaults()
+        {
+            SetupDockSites();
+            SetupToolbarDockSites();
+
+            // Set auto shortcuts that are automatically dispatched...
+            DotNetBarManager m = this.Component as DotNetBarManager;
+            m.AutoDispatchShortcuts.Add(eShortcut.F1);
+            m.AutoDispatchShortcuts.Add(eShortcut.CtrlC);
+            m.AutoDispatchShortcuts.Add(eShortcut.CtrlA);
+            m.AutoDispatchShortcuts.Add(eShortcut.CtrlV);
+            m.AutoDispatchShortcuts.Add(eShortcut.CtrlX);
+            m.AutoDispatchShortcuts.Add(eShortcut.CtrlZ);
+            m.AutoDispatchShortcuts.Add(eShortcut.CtrlY);
+            m.AutoDispatchShortcuts.Add(eShortcut.Del);
+            m.AutoDispatchShortcuts.Add(eShortcut.Ins);
+            m.Style = eDotNetBarStyle.Office2003;
+            m.EnableFullSizeDock = false;
+
+
+#if !TRIAL
+            string key = GetLicenseKey();
+            m.LicenseKey = key;
+#endif
+        }
+
+		private void LoadComplete(object sender, EventArgs e)
+		{
+			IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+			if(dh!=null && e!=null)
+				dh.LoadComplete-=new EventHandler(this.LoadComplete);
+			DotNetBarManager bar = this.Component as DotNetBarManager;
+#if !TRIAL
+            string key = GetLicenseKey();
+            if (key != "" && bar != null && bar.LicenseKey == "" && bar.LicenseKey != key)
+                TypeDescriptor.GetProperties(bar)["LicenseKey"].SetValue(bar, key);
+
+            //if (NativeFunctions.keyValidated2 != 266)
+            //{
+            //    RemindForm frm = new RemindForm();
+            //    frm.ShowDialog();
+            //}
+#endif
+            LoadDefinition();
+
+            if (bar.ToolbarTopDockSite == null && bar.ToolbarBottomDockSite == null && bar.ToolbarLeftDockSite == null && bar.ToolbarRightDockSite == null)
+                SetupToolbarDockSites();
+		}
+
+		private void LoadDefinition()
+		{
+			// Make sure at-least this property is set
+			DotNetBarManager m=this.Component as DotNetBarManager;
+
+            if (m.DefinitionName.Length > 0)
+            {
+                DialogResult dr = MessageBox.Show("DotNetBarManager needs to be upgraded to code based serialization. Please make sure that you have BACKUP of this form prior to proceeding.\r\n\r\nDo you want to proceed with the upgrade?", "DotNetBarManager Upgrade", MessageBoxButtons.YesNo, MessageBoxIcon.Stop, MessageBoxDefaultButton.Button2);
+                if (dr == DialogResult.Yes)
+                {
+                    ImportDefinition(m);
+                    m.DefinitionName = "";
+                    MessageBox.Show("DotNetBarManager upgraded. DO NOT save this form unless you have backup.", "DotNetBarManager Upgrade", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                }
+            }
+
+			if(m!=null && !m.IsDisposed && (m.LeftDockSite==null && m.RightDockSite==null && m.TopDockSite==null && m.BottomDockSite==null))
+			{
+				//m_PopupProvider=true;
+				m.BarStreamLoad(true);
+			}
+			else
+			{
+				//m_PopupProvider=false;
+				//m.BarStreamLoad(true);
+			}
+		}
+
+		private void OnEditDotNetBar(object sender, EventArgs e) 
+		{
+			DotNetBarManager dbm=this.Component as DotNetBarManager;
+			if(dbm!=null)
+				dbm.Customize();
+		}
+
+		private void OnEnableDocumentDocking(object sender, EventArgs e)
+		{
+			DotNetBarManager m=this.Component as DotNetBarManager;
+			if(m.FillDockSite==null)
+			{
+				IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+				if(dh==null)
+					return;
+
+				System.Windows.Forms.Control parent=dh.RootComponent as System.Windows.Forms.Control;
+				if(parent==null)
+					return;
+
+				IComponentChangeService cc=(IComponentChangeService)GetService(typeof(IComponentChangeService));
+				if(cc==null)
+					return;
+
+				DesignerTransaction trans=dh.CreateTransaction("Document Docking Enabled");
+				
+                DockSite fillDock=dh.CreateComponent(typeof(DockSite)) as DockSite;
+                fillDock.Dock=System.Windows.Forms.DockStyle.Fill;
+
+				cc.OnComponentChanging(parent,TypeDescriptor.GetProperties(typeof(System.Windows.Forms.Control))["Controls"]);
+				parent.Controls.Add(fillDock);
+				fillDock.BringToFront();
+				cc.OnComponentChanged(parent,TypeDescriptor.GetProperties(typeof(System.Windows.Forms.Control))["Controls"],null,null);
+
+				cc.OnComponentChanging(m,TypeDescriptor.GetProperties(typeof(DotNetBarManager))["FillDockSite"]);
+				m.FillDockSite=fillDock;
+				cc.OnComponentChanged(m,TypeDescriptor.GetProperties(typeof(DotNetBarManager))["FillDockSite"],null,fillDock);
+
+				DocumentDockContainer dockContainer=new DocumentDockContainer();
+				cc.OnComponentChanging(fillDock,TypeDescriptor.GetProperties(typeof(DockSite))["DocumentDockContainer"]);
+				fillDock.DocumentDockContainer=dockContainer;
+				cc.OnComponentChanged(fillDock,TypeDescriptor.GetProperties(typeof(DockSite))["DocumentDockContainer"],null,dockContainer);
+				
+				Bar bar=dh.CreateComponent(typeof(Bar)) as Bar;
+				BarUtilities.InitializeDocumentBar(bar);
+				TypeDescriptor.GetProperties(bar)["Style"].SetValue(bar,m.Style);
+
+				DockContainerItem item=dh.CreateComponent(typeof(DockContainerItem)) as DockContainerItem;
+				item.Text=item.Name;
+				cc.OnComponentChanging(bar,TypeDescriptor.GetProperties(typeof(Bar))["Items"]);
+				bar.Items.Add(item);
+				PanelDockContainer panel=dh.CreateComponent(typeof(PanelDockContainer)) as PanelDockContainer;
+				cc.OnComponentChanging(bar, TypeDescriptor.GetProperties(typeof(Bar))["Controls"]);
+				item.Control=panel;                
+				cc.OnComponentChanged(bar, TypeDescriptor.GetProperties(typeof(Bar))["Controls"], null, null);
+                //bar.Controls.Add(panel);
+				panel.ColorSchemeStyle=m.Style;
+				panel.ApplyLabelStyle();
+				cc.OnComponentChanged(bar,TypeDescriptor.GetProperties(typeof(Bar))["Items"],null,null);
+
+				DocumentBarContainer doc=new DocumentBarContainer(bar);
+				dockContainer.Documents.Add(doc);
+                
+				cc.OnComponentChanging(fillDock,TypeDescriptor.GetProperties(typeof(DockSite))["Controls"]);
+				fillDock.Controls.Add(bar);
+				cc.OnComponentChanged(fillDock,TypeDescriptor.GetProperties(typeof(DockSite))["Controls"],null,null);
+
+				fillDock.RecalcLayout();
+				
+				trans.Commit();
+			}
+		}
+
+		#region IDesignerServices Implementation
+		public object CreateComponent(System.Type componentClass)
+		{
+			IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+			if(dh==null)
+				return null;
+			return dh.CreateComponent(componentClass);
+		}
+
+        public object CreateComponent(System.Type componentClass, string name)
+        {
+            IDesignerHost dh = (IDesignerHost)GetService(typeof(IDesignerHost));
+            if (dh == null)
+                return null;
+            return dh.CreateComponent(componentClass, name);
+        }
+
+		public void DestroyComponent(IComponent c)
+		{
+			IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+			if(dh==null)
+				return;
+			dh.DestroyComponent(c);
+		}
+
+		object IDesignerServices.GetService(Type serviceType)
+		{
+			return this.GetService(serviceType);
+		}
+		#endregion
+
+		private void OnComponentRemoving(object sender,ComponentEventArgs e)
+		{
+			
+			if(e.Component!=this.Component)
+			{
+				return;
+			}
+			// Unhook events
+			IComponentChangeService cc=(IComponentChangeService)GetService(typeof(IComponentChangeService));
+			if(cc!=null)
+				cc.ComponentRemoving-=new ComponentEventHandler(this.OnComponentRemoving);
+            
+			DotNetBarManager m=this.Component as DotNetBarManager;
+			IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+			if(dh==null || m==null)
+				return;
+
+            // Destroy bars
+            Bar[] bars = new Bar[m.Bars.Count];
+            m.Bars.CopyTo(bars);
+            foreach (Bar bar in bars)
+                dh.DestroyComponent(bar);
+
+            if (m.TopDockSite != null)
+            {
+                DockSiteDesigner designer = dh.GetDesigner(m.TopDockSite) as DockSiteDesigner;
+                if (designer != null) designer.DotNetBarManagerRemoving = true;
+                dh.DestroyComponent(m.TopDockSite);
+            }
+            if (m.BottomDockSite != null)
+            {
+                DockSiteDesigner designer = dh.GetDesigner(m.BottomDockSite) as DockSiteDesigner;
+                if (designer != null) designer.DotNetBarManagerRemoving = true;
+                dh.DestroyComponent(m.BottomDockSite);
+            }
+            if (m.LeftDockSite != null)
+            {
+                DockSiteDesigner designer = dh.GetDesigner(m.LeftDockSite) as DockSiteDesigner;
+                if (designer != null) designer.DotNetBarManagerRemoving = true;
+                dh.DestroyComponent(m.LeftDockSite);
+            }
+            if (m.RightDockSite != null)
+            {
+                DockSiteDesigner designer = dh.GetDesigner(m.RightDockSite) as DockSiteDesigner;
+                if (designer != null) designer.DotNetBarManagerRemoving = true;
+                dh.DestroyComponent(m.RightDockSite);
+            }
+
+            if (m.FillDockSite != null)
+            {
+                DockSiteDesigner designer = dh.GetDesigner(m.FillDockSite) as DockSiteDesigner;
+                if (designer != null) designer.DotNetBarManagerRemoving = true;
+                dh.DestroyComponent(m.FillDockSite);
+            }
+
+            if (m.ToolbarTopDockSite != null)
+            {
+                DockSiteDesigner designer = dh.GetDesigner(m.ToolbarTopDockSite) as DockSiteDesigner;
+                if (designer != null) designer.DotNetBarManagerRemoving = true;
+                dh.DestroyComponent(m.ToolbarTopDockSite);
+            }
+            if (m.ToolbarBottomDockSite != null)
+            {
+                DockSiteDesigner designer = dh.GetDesigner(m.ToolbarBottomDockSite) as DockSiteDesigner;
+                if (designer != null) designer.DotNetBarManagerRemoving = true;
+                dh.DestroyComponent(m.ToolbarBottomDockSite);
+            }
+            if (m.ToolbarLeftDockSite != null)
+            {
+                DockSiteDesigner designer = dh.GetDesigner(m.ToolbarLeftDockSite) as DockSiteDesigner;
+                if (designer != null) designer.DotNetBarManagerRemoving = true;
+                dh.DestroyComponent(m.ToolbarLeftDockSite);
+            }
+            if (m.ToolbarRightDockSite != null)
+            {
+                DockSiteDesigner designer = dh.GetDesigner(m.ToolbarRightDockSite) as DockSiteDesigner;
+                if (designer != null) designer.DotNetBarManagerRemoving = true;
+                dh.DestroyComponent(m.ToolbarRightDockSite);
+            }
+
+			if(m.DefinitionName!=null)
+			{
+				//DesignTimeDte.DeleteFromProject(m.DefinitionName, this.Component.Site);
+				m.DefinitionName="";
+			}
+
+            //// Remove Command links if any
+            //if (m.CommandLinks.Count > 0)
+            //{
+            //    CommandLink[] links = new CommandLink[m.CommandLinks.Count];
+            //    m.CommandLinks.CopyTo(links);
+            //    foreach (CommandLink link in links)
+            //    {
+            //        dh.DestroyComponent(link);
+            //    }
+            //}
+		}
+
+//		protected override void PreFilterProperties(System.Collections.IDictionary properties) 
+//		{
+//			// Always call base first in PreFilter* methods, and last in PostFilter*
+//			// methods.
+//			base.PreFilterProperties(properties);
+//
+//			properties["ProvidePopupsOnly"] = TypeDescriptor.CreateProperty(
+//				this.GetType(),		// the type this property is defined on
+//				"ProvidePopupsOnly",	// the name of the property
+//				typeof(bool),		// the type of the property
+//				new Attribute[] {CategoryAttribute.Design,System.ComponentModel.DesignerSerializationVisibilityAttribute.Hidden,new DescriptionAttribute("When set to True DotNetBar provides Popups only without Toolbars or Menu Bars. Use on child forms to provide Context Menus.")});	// attributes
+//
+//            //properties["Style"] = TypeDescriptor.CreateProperty(
+//            //    this.GetType(),		// the type this property is defined on
+//            //    "Style",	// the name of the property
+//            //    typeof(eDotNetBarStyle),		// the type of the property
+//            //    new Attribute[0]);
+//
+//            //properties["ThemeAware"] = TypeDescriptor.CreateProperty(
+//            //    this.GetType(),		// the type this property is defined on
+//            //    "ThemeAware",	// the name of the property
+//            //    typeof(bool),		// the type of the property
+//            //    new Attribute[0]);
+//		}
+//
+//		// Popup Provider is design-time only property that determines whether current DotNetBar provides
+//		// Popup Context Menu only or is full blown Toolbar/Menu bar component
+//		[DefaultValue(false)]
+//		protected bool ProvidePopupsOnly
+//		{
+//			get 
+//			{
+//				return m_PopupProvider;
+//			}
+//			set 
+//			{
+//				if(m_PopupProvider==value)
+//					return;
+//				
+//				m_PopupProvider=value;
+//
+//				DotNetBarManager m=this.Component as DotNetBarManager;
+//				IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+//
+//				if(m_PopupProvider)
+//				{
+//					RemoveDockSites();
+//					if(m!=null && dh!=null && dh.RootComponent is System.Windows.Forms.UserControl)
+//					{
+//						m.ParentUserControl=dh.RootComponent as System.Windows.Forms.UserControl;
+//						IComponentChangeService cc=(IComponentChangeService)GetService(typeof(IComponentChangeService));
+//						cc.OnComponentChanged(m,(TypeDescriptor.GetProperties(m)["ParentUserControl"]),null,null);
+//					}
+//				}
+//				else
+//				{
+//					SetupDockSites();
+//					if(m!=null)
+//					{
+//						m.ParentUserControl=null;
+//						IComponentChangeService cc=(IComponentChangeService)GetService(typeof(IComponentChangeService));
+//						cc.OnComponentChanged(m,(TypeDescriptor.GetProperties(m)["ParentUserControl"]),null,null);
+//					}
+//				}
+//			}
+//		}
+		public override System.Collections.ICollection AssociatedComponents
+		{
+			get
+			{
+				DotNetBarManager m=this.Component as DotNetBarManager;
+				if(m==null)
+					return base.AssociatedComponents;
+				System.Collections.ArrayList list=new System.Collections.ArrayList(4);
+				if(m.TopDockSite!=null)
+					list.Add(m.TopDockSite);
+				if(m.BottomDockSite!=null)
+					list.Add(m.BottomDockSite);
+				if(m.LeftDockSite!=null)
+					list.Add(m.LeftDockSite);
+				if(m.RightDockSite!=null)
+					list.Add(m.RightDockSite);
+				if(m.DefinitionName=="")
+				{
+					list.AddRange(m.Bars);
+					foreach(Bar bar in m.Bars)
+						AddItems(bar.ItemsContainer,list);
+					foreach(BaseItem item in m.Items)
+					{
+						list.Add(item);
+						AddItems(item,list);
+					}
+					foreach(BaseItem item in m.ContextMenus)
+					{
+						list.Add(item);
+						AddItems(item,list);
+					}
+				}
+				return list;
+			}
+		}
+		private void AddItems(BaseItem parent,System.Collections.ArrayList list)
+		{
+            if (parent == null) return;
+			foreach(BaseItem item in parent.SubItems)
+			{
+				if(!item.SystemItem)
+				{
+					list.Add(item);
+					if(item.SubItems.Count>0)
+						AddItems(item,list);
+				}
+			}
+		}
+		private void RemoveDockSites()
+		{
+			IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+			if(dh==null)
+				return;		
+
+			DotNetBarManager m=this.Component as DotNetBarManager;
+
+            if (m.TopDockSite != null)
+            {
+                DockSiteDesigner designer = dh.GetDesigner(m.TopDockSite) as DockSiteDesigner;
+                if (designer != null) designer.DotNetBarManagerRemoving = true;
+                dh.DestroyComponent(m.TopDockSite);
+            }
+            if (m.BottomDockSite != null)
+            {
+                DockSiteDesigner designer = dh.GetDesigner(m.BottomDockSite) as DockSiteDesigner;
+                if (designer != null) designer.DotNetBarManagerRemoving = true;
+                dh.DestroyComponent(m.BottomDockSite);
+            }
+            if (m.LeftDockSite != null)
+            {
+                DockSiteDesigner designer = dh.GetDesigner(m.LeftDockSite) as DockSiteDesigner;
+                if (designer != null) designer.DotNetBarManagerRemoving = true;
+                dh.DestroyComponent(m.LeftDockSite);
+            }
+            if (m.RightDockSite != null)
+            {
+                DockSiteDesigner designer = dh.GetDesigner(m.RightDockSite) as DockSiteDesigner;
+                if (designer != null) designer.DotNetBarManagerRemoving = true;
+                dh.DestroyComponent(m.RightDockSite);
+            }
+
+			m.LeftDockSite=null;
+			m.TopDockSite=null;
+			m.BottomDockSite=null;
+			m.RightDockSite=null;
+		}
+
+        private void SetupToolbarDockSites()
+        {
+            IDesignerHost dh = (IDesignerHost)GetService(typeof(IDesignerHost));
+            if (dh == null) return;
+
+            DotNetBarManager m = this.Component as DotNetBarManager;
+            System.Windows.Forms.Control parent = dh.RootComponent as System.Windows.Forms.Control;
+            if (m == null || parent == null) return;
+
+            DockSite ds = null;
+
+            // Toolbar Dock Sites
+            // Left
+            if (m.ToolbarLeftDockSite == null)
+            {
+                ds = (DockSite)dh.CreateComponent(typeof(DockSite));
+                parent.Controls.Add(ds);
+                TypeDescriptor.GetProperties(m)["ToolbarLeftDockSite"].SetValue(m, ds);
+                ds.Dock = System.Windows.Forms.DockStyle.Left;
+            }
+
+            // Toolbar Right Dock Site
+            if (m.ToolbarRightDockSite == null)
+            {
+                ds = (DockSite)dh.CreateComponent(typeof(DockSite));
+                parent.Controls.Add(ds);
+                TypeDescriptor.GetProperties(m)["ToolbarRightDockSite"].SetValue(m, ds);
+                ds.Dock = System.Windows.Forms.DockStyle.Right;
+            }
+
+            // Toolbar Top Dock Site
+            if (m.ToolbarTopDockSite == null)
+            {
+                ds = (DockSite)dh.CreateComponent(typeof(DockSite));
+                parent.Controls.Add(ds);
+                TypeDescriptor.GetProperties(m)["ToolbarTopDockSite"].SetValue(m, ds);
+                ds.Dock = System.Windows.Forms.DockStyle.Top;
+            }
+
+            // Toolbar Bottom Dock Site
+            if (m.ToolbarBottomDockSite == null)
+            {
+                ds = (DockSite)dh.CreateComponent(typeof(DockSite));
+                parent.Controls.Add(ds);
+                TypeDescriptor.GetProperties(m)["ToolbarBottomDockSite"].SetValue(m, ds);
+                ds.Dock = System.Windows.Forms.DockStyle.Bottom;
+            }
+        }
+
+        private void SetupDockSites()
+        {
+            IDesignerHost dh = (IDesignerHost)GetService(typeof(IDesignerHost));
+            if (dh == null) return;
+
+            if (dh.Loading)
+            {
+                dh.LoadComplete += new EventHandler(this.LoadComplete);
+                return;
+            }
+
+            IComponentChangeService cc = (IComponentChangeService)GetService(typeof(IComponentChangeService));
+
+            // Set default properties for this control and add default dependent controls
+            DotNetBarManager m = this.Component as DotNetBarManager;
+            System.Windows.Forms.Control parent = dh.RootComponent as System.Windows.Forms.Control;
+            if (m == null || parent == null)
+                return;
+
+            if (parent is System.Windows.Forms.Form)
+                m.ParentForm = (System.Windows.Forms.Form)parent;
+            else if (parent is System.Windows.Forms.UserControl)
+                m.ParentUserControl = parent;
+
+            // Dockable Windows Dock Sites
+            // Left Dock Site
+            DockSite ds = (DockSite)dh.CreateComponent(typeof(DockSite));
+            parent.Controls.Add(ds);
+            m.LeftDockSite = ds;
+            ds.Dock = System.Windows.Forms.DockStyle.Left;
+            ds.DocumentDockContainer = new DocumentDockContainer();
+            ds.BringToFront();
+
+            // Right Dock Site
+            ds = (DockSite)dh.CreateComponent(typeof(DockSite));
+            parent.Controls.Add(ds);
+            m.RightDockSite = ds;
+            ds.Dock = System.Windows.Forms.DockStyle.Right;
+            ds.DocumentDockContainer = new DocumentDockContainer();
+            ds.BringToFront();
+
+            // Top Dock Site
+            ds = (DockSite)dh.CreateComponent(typeof(DockSite));
+            parent.Controls.Add(ds);
+            m.TopDockSite = ds;
+            ds.Dock = System.Windows.Forms.DockStyle.Top;
+            ds.DocumentDockContainer = new DocumentDockContainer();
+
+            // Bottom Dock Site
+            ds = (DockSite)dh.CreateComponent(typeof(DockSite));
+            parent.Controls.Add(ds);
+            m.BottomDockSite = ds;
+            ds.Dock = System.Windows.Forms.DockStyle.Bottom;
+            ds.DocumentDockContainer = new DocumentDockContainer();
+
+            if (cc != null)
+            {
+                cc.OnComponentChanging(parent, TypeDescriptor.GetProperties(parent).Find("Controls", true));
+                cc.OnComponentChanged(parent, TypeDescriptor.GetProperties(parent).Find("Controls", true), null, null);
+            }
+        }
+
+        //private void SetupDockSites()
+        //{
+        //    IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+        //    if(dh==null)
+        //    {
+        //        return;
+        //    }
+
+        //    if(dh.Loading)
+        //    {
+        //        dh.LoadComplete+=new EventHandler(this.LoadComplete);
+        //        return;
+        //    }
+
+        //    IComponentChangeService cc=(IComponentChangeService)GetService(typeof(IComponentChangeService));
+
+        //    // Set default properties for this control and add default dependent controls
+        //    DotNetBarManager m=this.Component as DotNetBarManager;
+        //    System.Windows.Forms.Form form=dh.RootComponent as System.Windows.Forms.Form;
+        //    System.Windows.Forms.UserControl parentControl=dh.RootComponent as System.Windows.Forms.UserControl;
+        //    if(m==null || (form==null && parentControl==null))
+        //    {
+        //        return;
+        //    }
+
+        //    if(form!=null)
+        //    {
+        //        try
+        //        {
+        //            m.ParentForm=form;
+
+        //            // Left Dock Site
+        //            DockSite ds=(DockSite)dh.CreateComponent(typeof(DockSite),"barLeftDockSite");
+        //            form.Controls.Add(ds);
+        //            m.LeftDockSite=ds;
+        //            ds.Dock=System.Windows.Forms.DockStyle.Left;
+
+        //            // Right Dock Site
+        //            ds=(DockSite)dh.CreateComponent(typeof(DockSite),"barRightDockSite");
+        //            form.Controls.Add(ds);
+        //            m.RightDockSite=ds;
+        //            ds.Dock=System.Windows.Forms.DockStyle.Right;
+
+        //            // Top Dock Site
+        //            ds=(DockSite)dh.CreateComponent(typeof(DockSite),"barTopDockSite");
+        //            form.Controls.Add(ds);
+        //            m.TopDockSite=ds;
+        //            ds.Dock=System.Windows.Forms.DockStyle.Top;
+        //            // Bottom Dock Site
+        //            ds=(DockSite)dh.CreateComponent(typeof(DockSite),"barBottomDockSite");
+        //            form.Controls.Add(ds);
+        //            m.BottomDockSite=ds;
+        //            ds.Dock=System.Windows.Forms.DockStyle.Bottom;
+
+        //            if(cc!=null)
+        //            {
+        //                cc.OnComponentChanging(form,TypeDescriptor.GetProperties(form).Find("Controls",true));
+        //                cc.OnComponentChanged(form,TypeDescriptor.GetProperties(form).Find("Controls",true),null,null);
+        //            }
+        //        }
+        //        catch(Exception e)
+        //        {
+        //            // DEBUG
+        //            System.Windows.Forms.MessageBox.Show("Error setting up dock sites: " + e.ToString());
+        //        }
+        //    }
+        //    else if(parentControl!=null)
+        //    {
+        //        try
+        //        {
+        //            // Left Dock Site
+        //            DockSite ds=(DockSite)dh.CreateComponent(typeof(DockSite),"barLeftDockSite");
+        //            parentControl.Controls.Add(ds);
+        //            m.LeftDockSite=ds;
+        //            ds.Dock=System.Windows.Forms.DockStyle.Left;
+
+        //            // Right Dock Site
+        //            ds=(DockSite)dh.CreateComponent(typeof(DockSite),"barRightDockSite");
+        //            parentControl.Controls.Add(ds);
+        //            m.RightDockSite=ds;
+        //            ds.Dock=System.Windows.Forms.DockStyle.Right;
+
+        //            // Top Dock Site
+        //            ds=(DockSite)dh.CreateComponent(typeof(DockSite),"barTopDockSite");
+        //            parentControl.Controls.Add(ds);
+        //            m.TopDockSite=ds;
+        //            ds.Dock=System.Windows.Forms.DockStyle.Top;
+        //            // Bottom Dock Site
+        //            ds=(DockSite)dh.CreateComponent(typeof(DockSite),"barBottomDockSite");
+        //            parentControl.Controls.Add(ds);
+        //            m.BottomDockSite=ds;
+        //            ds.Dock=System.Windows.Forms.DockStyle.Bottom;
+
+        //            if(cc!=null)
+        //            {
+        //                cc.OnComponentChanging(parentControl,TypeDescriptor.GetProperties(parentControl).Find("Controls",true));
+        //                cc.OnComponentChanged(parentControl,TypeDescriptor.GetProperties(parentControl).Find("Controls",true),null,null);
+        //            }
+        //        }
+        //        catch(Exception e)
+        //        {
+        //            // DEBUG
+        //            System.Windows.Forms.MessageBox.Show("Error setting up dock sites on UserControl: " + e.ToString());
+        //        }
+        //    }
+        //}
+
+		private void OnSelectionChanged(object sender, EventArgs e) 
+		{
+			ISelectionService ss = (ISelectionService)sender;
+			if(ss!=null && ss.PrimarySelection==this.Component)
+			{
+				IOwner manager=this.Component as IOwner;
+				manager.OnApplicationActivate();
+				m_Selected=true;
+			}
+			else if(m_Selected)
+			{
+				IOwner manager=this.Component as IOwner;
+				manager.OnApplicationDeactivate();
+				m_Selected=false;
+			}
+		}
+		
+        //public static bool OpenDesignerEditor(DotNetBarManager manager, IDesignerServices designerServices)
+        //{
+        //    DevComponents.DotNetBar.Design.DotNetBarDesigner designer=new DevComponents.DotNetBar.Design.DotNetBarDesigner();
+
+        //    if (designerServices != null)
+        //        designer.DesignerServices = designerServices;
+
+        //    if(manager!=null)
+        //        designer.ExternalManager=manager;
+
+        //    System.Windows.Forms.DialogResult dr=designer.ShowDialog();
+
+        //    if(dr==System.Windows.Forms.DialogResult.Yes)
+        //        return true;
+
+        //    return false;
+        //}
+
+		/// <summary>
+		/// Sets the style of all items in DotNetBar Manager.
+		/// </summary>
+        //public eDotNetBarStyle Style
+        //{
+        //    set
+        //    {
+        //        DotNetBarManager manager=this.Component as DotNetBarManager;
+        //        if(manager.Style!=value)
+        //        {
+        //            manager.Style=value;
+        //            IDesignerHost dh=this.GetService(typeof(IDesignerHost)) as IDesignerHost;
+        //            if(dh!=null && !dh.Loading)
+        //                manager.SaveDesignDefinition();
+        //        }
+        //    }
+        //    get
+        //    {
+        //        DotNetBarManager manager=this.Component as DotNetBarManager;
+        //        return manager.Style;
+        //    }
+        //}
+
+        ///// <summary>
+        ///// Specifies whether new bars created are drawn using Themes when running on OS that supports themes like Windows XP. Note this setting
+        ///// applies to new bars created.
+        ///// </summary>
+        //public bool ThemeAware
+        //{
+        //    set
+        //    {
+        //        DotNetBarManager manager=this.Component as DotNetBarManager;
+        //        if(manager.ThemeAware!=value)
+        //        {
+        //            manager.ThemeAware=value;
+        //            IDesignerHost dh=this.GetService(typeof(IDesignerHost)) as IDesignerHost;
+        //            if(dh!=null && !dh.Loading)
+        //                manager.SaveDesignDefinition();
+        //        }
+        //    }
+        //    get
+        //    {
+        //        DotNetBarManager manager=this.Component as DotNetBarManager;
+        //        return manager.ThemeAware;
+        //    }
+        //}
+        #endregion
+
+        #region Dock Bars Creation
+        private void CreateDockBarLeft(object sender, EventArgs e)
+        {
+            DotNetBarManager d = this.Component as DotNetBarManager;
+            CreateDockBar(d.LeftDockSite);
+        }
+
+        private void CreateDockBarRight(object sender, EventArgs e)
+        {
+            DotNetBarManager d = this.Component as DotNetBarManager;
+            CreateDockBar(d.RightDockSite);
+        }
+
+        private void CreateDockBarTop(object sender, EventArgs e)
+        {
+            DotNetBarManager d = this.Component as DotNetBarManager;
+            CreateDockBar(d.TopDockSite);
+        }
+
+        private void CreateDockBarBottom(object sender, EventArgs e)
+        {
+            DotNetBarManager d = this.Component as DotNetBarManager;
+            CreateDockBar(d.BottomDockSite);
+        }
+
+        private void CreateDockBar(DockSite parentSite)
+        {
+            IDesignerHost dh = this.GetService(typeof(IDesignerHost)) as IDesignerHost;
+            if (dh == null) return;
+            IComponentChangeService cc = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+            DotNetBarManager dm = this.Component as DotNetBarManager;
+
+            DesignerTransaction dt = dh.CreateTransaction("Creating Dock Bar");
+            try
+            {
+                // Make sure that DockSite has document manager
+                if (parentSite.DocumentDockContainer == null)
+                    TypeDescriptor.GetProperties(parentSite)["DocumentDockContainer"].SetValue(parentSite, new DocumentDockContainer());
+
+                Bar bar = dh.CreateComponent(typeof(Bar)) as Bar;
+                bar.AutoSyncBarCaption = true;
+                bar.CloseSingleTab = true;
+                bar.CanDockDocument = false;
+                bar.Style = dm.Style;
+                bar.LayoutType = eLayoutType.DockContainer;
+                bar.GrabHandleStyle = eGrabHandleStyle.Caption;
+                bar.Stretch = true;
+                bar.Style = eDotNetBarStyle.StyleManagerControlled;
+
+                // Add Dock Container to it...
+                DockContainerItem dockItem = dh.CreateComponent(typeof(DockContainerItem)) as DockContainerItem;
+                dockItem.Text = dockItem.Name;
+                bar.Items.Add(dockItem);
+
+                // Panel for DockContainerItem
+                PanelDockContainer panel = dh.CreateComponent(typeof(PanelDockContainer)) as PanelDockContainer;
+                bar.Controls.Add(panel);
+                panel.ColorSchemeStyle = bar.Style;
+                panel.ApplyLabelStyle();
+                dockItem.Control = panel;
+                bar.SelectedDockTab = 0;
+
+                // Add them to the dock manager
+                cc.OnComponentChanging(parentSite, null);
+
+                parentSite.GetDocumentUIManager().Dock(bar);
+
+                parentSite.RecalcLayout();
+
+                cc.OnComponentChanged(parentSite, null, null, null);
+            }
+            catch
+            {
+                dt.Cancel();
+            }
+            finally
+            {
+                if (!dt.Canceled)
+                    dt.Commit();
+            }
+        }
+        #endregion
+
+        #region Menu bar, Toolbar Creation
+        private void CreateMenuBar(object sender, EventArgs e)
+        {
+            CreateToolbar(true);
+        }
+
+        private void CreateToolbar(object sender, EventArgs e)
+        {
+            CreateToolbar(false);
+        }
+
+        private void CreateToolbar(bool menuBar)
+        {
+            DotNetBarManager m = this.Component as DotNetBarManager;
+            IDesignerHost dh = this.GetService(typeof(IDesignerHost)) as IDesignerHost;
+            IComponentChangeService cc = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+
+            if (dh == null || m == null) return;
+
+            DesignerTransaction dt = dh.CreateTransaction("Creating Bar Control");
+            try
+            {
+                // Make sure dock sites exists...
+                if (m.ToolbarTopDockSite == null)
+                    SetupToolbarDockSites();
+
+                Bar bar = dh.CreateComponent(typeof(Bar)) as Bar;
+                bar.LayoutType = eLayoutType.Toolbar;
+                bar.Text = bar.Name;
+                bar.Style = eDotNetBarStyle.StyleManagerControlled;
+
+                ButtonItem item = dh.CreateComponent(typeof(ButtonItem)) as ButtonItem;
+                item.Text = item.Name;
+                bar.Items.Add(item);
+                
+                if (menuBar)
+                {
+                    bar.Stretch = true;
+                    bar.MenuBar = true;
+                }
+                else
+                    bar.GrabHandleStyle = eGrabHandleStyle.Office2003;
+
+                cc.OnComponentChanging(m.ToolbarTopDockSite, null);
+                m.Bars.Add(bar);
+                if (menuBar)
+                    bar.DockLine = -1;
+                bar.DockSide = eDockSide.Top;
+                bar.RecalcLayout();
+                cc.OnComponentChanged(m.ToolbarTopDockSite, null, null, null);
+            }
+            catch
+            {
+                dt.Cancel();
+            }
+            finally
+            {
+                if(!dt.Canceled)
+                    dt.Commit();
+            }
+
+        }
+        #endregion
+
+        #region Old Definition Import
+        private void ImportDefinition(DotNetBarManager manager)
+        {
+            IDesignerHost dh = this.GetService(typeof(IDesignerHost)) as IDesignerHost;
+            if (manager.DefinitionName == "" || dh==null) return;
+
+            XmlDocument def = LoadDefinition(manager);
+            if (def == null) return;
+
+            IComponentChangeService cc = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+
+            if (manager.ToolbarTopDockSite == null)
+                SetupToolbarDockSites();
+
+            manager.SuspendLayout = true;
+
+            try
+            {
+                if(manager.TopDockSite!=null && manager.TopDockSite.DocumentDockContainer == null)
+                    manager.TopDockSite.DocumentDockContainer = new DocumentDockContainer();
+                if (manager.BottomDockSite != null && manager.BottomDockSite.DocumentDockContainer == null)
+                    manager.BottomDockSite.DocumentDockContainer = new DocumentDockContainer();
+                if (manager.LeftDockSite != null && manager.LeftDockSite.DocumentDockContainer == null)
+                    manager.LeftDockSite.DocumentDockContainer = new DocumentDockContainer();
+                if (manager.RightDockSite != null && manager.RightDockSite.DocumentDockContainer == null)
+                    manager.RightDockSite.DocumentDockContainer = new DocumentDockContainer();
+
+                System.Xml.XmlElement xmlDotNetBar = def.FirstChild as System.Xml.XmlElement;
+
+                // Creates serialization context
+                ItemSerializationContext context = new ItemSerializationContext();
+                context.Serializer = manager;
+                context.HasDeserializeItemHandlers = false;
+                context.HasSerializeItemHandlers = false;
+                context._DesignerHost = dh;
+
+                // Load bars first 
+                foreach (System.Xml.XmlElement xmlElem in xmlDotNetBar.ChildNodes)
+                {
+                    if (xmlElem.Name == "bars")
+                    {
+                        foreach (System.Xml.XmlElement xmlBar in xmlElem.ChildNodes)
+                        {
+                            Bar bar = null;
+                            string name = xmlBar.GetAttribute("name");
+                            try
+                            {
+                                bar = dh.CreateComponent(typeof(Bar), name) as Bar;
+                            }
+                            catch { }
+                            if(bar==null)
+                                bar = dh.CreateComponent(typeof(Bar)) as Bar;
+
+                            manager.Bars.Add(bar);
+
+                            bar.Deserialize(xmlBar, context);
+
+                            if (bar.LayoutType == eLayoutType.DockContainer)
+                            {
+                                // Create dock panels for the bar
+                                foreach (BaseItem item in bar.Items)
+                                {
+                                    if (!(item is DockContainerItem)) continue;
+                                    DockContainerItem dc = item as DockContainerItem;
+                                    PanelDockContainer panel = dh.CreateComponent(typeof(PanelDockContainer)) as PanelDockContainer;
+                                    bar.Controls.Add(panel);
+                                    panel.ColorSchemeStyle = bar.Style;
+                                    panel.ApplyLabelStyle();
+                                    dc.Control = panel;
+                                }
+                            }
+                        }
+                    }
+                }
+
+                // Context menus loading
+                foreach (System.Xml.XmlElement xmlElem in xmlDotNetBar.ChildNodes)
+                {
+                    if (xmlElem.Name == "popups")
+                    {
+                        ContextMenuBar contextBar = null;
+                        Control parent = manager.ParentForm;
+                        if (parent == null) parent = manager.ParentUserControl;
+                        if (parent == null)
+                            parent = dh.RootComponent as System.Windows.Forms.Control;
+
+                        if (parent != null)
+                        {
+                            if (xmlElem.ChildNodes.Count > 0)
+                            {
+                                contextBar = dh.CreateComponent(typeof(ContextMenuBar)) as ContextMenuBar;
+                                parent.Controls.Add(contextBar);
+                                contextBar.BringToFront();
+                                contextBar.Style = manager.Style;
+                                contextBar.Size = new Size(150, 26);
+                            }
+
+                            foreach (System.Xml.XmlElement xmlItem in xmlElem.ChildNodes)
+                            {
+                                BaseItem objItem = context.CreateItemFromXml(xmlItem);
+                                if (objItem == null)
+                                    MessageBox.Show("Invalid Item in file found (" + Helpers.GetItemErrorInfo(xmlItem) + ").");
+                                // Do not change this order. Item should be Deserialized first and then added to the items
+                                // collection. See GlobalItem property for performace reasons...
+                                context.ItemXmlElement = xmlItem;
+                                objItem.Deserialize(context);
+                                if (!objItem.Visible) objItem.Visible = true;
+                                if (objItem.Text == "" || objItem.Text == null) objItem.Text = objItem.Name;
+                                if (objItem is ButtonItem) ((ButtonItem)objItem).AutoExpandOnClick = true;
+                                contextBar.Items.Add(objItem);
+                            }
+                            if (contextBar != null)
+                                contextBar.RecalcLayout();
+                            if (cc != null && contextBar != null)
+                            {
+                                cc.OnComponentChanged(contextBar, TypeDescriptor.GetProperties(contextBar)["Items"], null, null);
+                                cc.OnComponentChanged(contextBar, null, null, null);
+                            }
+                        }
+                    }
+                }
+
+                if (cc != null)
+                {
+                    cc.OnComponentChanged(manager, null, null, null);
+                    if (manager.TopDockSite != null)
+                        cc.OnComponentChanged(manager.TopDockSite, null, null, null);
+                    if (manager.BottomDockSite != null)
+                        cc.OnComponentChanged(manager.BottomDockSite, null, null, null);
+                    if (manager.LeftDockSite != null)
+                        cc.OnComponentChanged(manager.LeftDockSite, null, null, null);
+                    if (manager.RightDockSite != null)
+                        cc.OnComponentChanged(manager.RightDockSite, null, null, null);
+
+                    if (manager.ToolbarTopDockSite != null)
+                        cc.OnComponentChanged(manager.ToolbarTopDockSite, null, null, null);
+                    if (manager.BottomDockSite != null)
+                        cc.OnComponentChanged(manager.ToolbarBottomDockSite, null, null, null);
+                    if (manager.ToolbarLeftDockSite != null)
+                        cc.OnComponentChanged(manager.ToolbarLeftDockSite, null, null, null);
+                    if (manager.ToolbarRightDockSite != null)
+                        cc.OnComponentChanged(manager.ToolbarRightDockSite, null, null, null);
+                }
+            }
+            finally
+            {
+                manager.SuspendLayout = false;
+            }
+
+            foreach (Bar bar in manager.Bars)
+            {
+                if (bar.LayoutType != eLayoutType.DockContainer)
+                    continue;
+
+                DockContainerItem dc = bar.SelectedDockContainerItem;
+                if (dc != null && dc.Control != null)
+                {
+                    if (bar.Controls.IndexOf(dc.Control) > 0)
+                    {
+                        if (cc != null)
+                            cc.OnComponentChanging(bar, TypeDescriptor.GetProperties(bar)["Controls"]);
+                        bar.Controls.SetChildIndex(dc.Control, 0);
+                        if (cc != null)
+                            cc.OnComponentChanged(bar, TypeDescriptor.GetProperties(bar)["Controls"], null, null);
+                    }
+                }
+            }
+
+            //// Load items for customization i.e. categories etc.
+            //foreach (System.Xml.XmlElement xmlElem in xmlDotNetBar.ChildNodes)
+            //{
+            //    if (xmlElem.Name == "items")
+            //    {
+            //        foreach (System.Xml.XmlElement xmlItem in xmlElem.ChildNodes)
+            //        {
+            //            BaseItem objItem = BarFunctions.CreateItemFromXml(xmlItem, dh);
+            //            if (objItem == null)
+            //                MessageBox.Show("Invalid Item in file found (" + BarFunctions.GetItemErrorInfo(xmlItem) + ").");
+            //            // Do not change this order. Item should be Deserialized first and then added to the items
+            //            // collection. See GlobalItem property for performace reasons...
+            //            context.ItemXmlElement = xmlItem;
+            //            objItem.Deserialize(context);
+            //            manager.Items.Add(objItem);
+            //        }
+            //    }
+            //}
+        }
+
+        private XmlDocument LoadDefinition(DotNetBarManager manager)
+        {
+            string path = DesignTimeDte.GetDefinitionPath(manager.DefinitionName, manager.Site);
+            if (path != null && path != "")
+            {
+                if (!path.EndsWith("\\"))
+                    path += "\\";
+                if (System.IO.File.Exists(path + manager.DefinitionName))
+                {
+                    XmlDocument doc = new XmlDocument();
+                    doc.Load(path + manager.DefinitionName);
+                    return doc;
+                }
+                else
+                {
+                    MessageBox.Show("Could not import. DotNetBar definition file not found: " + path + manager.DefinitionName, "Import Routine", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                }
+            }
+            else
+                MessageBox.Show("Could not find DotNetBarManager path. Import aborted.", "Import Routine", MessageBoxButtons.OK, MessageBoxIcon.Error);
+
+            return null;
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/Editors.Design/CalculatorDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/Editors.Design/CalculatorDesigner.cs
new file mode 100644
index 00000000..fb293dab
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/Editors.Design/CalculatorDesigner.cs	
@@ -0,0 +1,113 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows.Forms.Design;
+using DevComponents.Editors;
+
+namespace DevComponents.DotNetBar.Design
+{
+    public class CalculatorDesigner : ControlDesigner
+    {
+        #region Internal Implementation
+        public override void InitializeNewComponent(System.Collections.IDictionary defaultValues)
+        {
+            Calculator mc = this.Control as Calculator;
+            if (mc != null)
+            {
+                mc.AutoSize = true;
+            }
+            base.InitializeNewComponent(defaultValues);
+        }
+
+        protected override void PreFilterProperties(System.Collections.IDictionary properties)
+        {
+            base.PreFilterProperties(properties);
+            RemoveDescriptors(properties,
+                new String[] { "AutoScrollMargin", 
+                                 "AlwaysDisplayKeyAccelerators", 
+                                 "AutoScroll", 
+                                 "AutoScrollMinSize", 
+                                 "AutoValidate", 
+                                 "BorderStyle",
+                                 "ForeColor",
+                                 "DisabledImagesGrayScale", 
+                                 "DispatchShortcuts", 
+                                 "Enabled",
+                                 "BackColor", 
+                                 "BackgroundImage", 
+                                 "BackgroundImageLayout", 
+                                 "Margin", 
+                                 "MaximumSize", 
+                                 "MinimumSize", 
+                                 "Padding", 
+                                 "RightToLeft", 
+                                 "TabStop",
+                                 "TabIndex",
+                                 "UseWaitCursor", 
+                                 "ImeMode" });
+        }
+        private void RemoveDescriptors(System.Collections.IDictionary properties, String[] propNames)
+        {
+            foreach (String propName in propNames)
+            {
+                if (properties.Contains(propName))
+                    properties.Remove(propName);
+            }
+        }
+        protected override void PreFilterEvents(System.Collections.IDictionary events)
+        {
+            RemoveDescriptors(events,
+                new string[] {   
+                                 "AutoSizeChanged",
+                                 "AutoValidate",
+                                 "BackColorChanged", 
+                                 "BackgroundImageChanged", 
+                                 "BackgroundImageLayoutChanged", 
+                                 "BindingContext",
+                                 "BackgroundStyle", 
+                                 "ButtonCheckedChanged", 
+                                 "CausesValidationChanged", 
+                                 "ChangeUICues", 
+                                 "ClientSizeChanged", 
+                                 "ContainerControlDeserialize", 
+                                 "ContainerControlSerialize", 
+                                 "ContainerLoadControl", 
+                                 "Enter", 
+                                 "Leave", 
+                                 "ContextMenuStripChanged", 
+                                 "ControlAdded", 
+                                 "ControlRemoved", 
+                                 "CursorChanged", 
+                                 "DefinitionLoaded", 
+                                 "DockChanged", 
+                                 "EnabledChanged", 
+                                 "ExpandedChange", 
+                                 "FontChanged", 
+                                 "ForeColorChanged", 
+                                 "ImeModeChanged", 
+                                 "KeyDown", 
+                                 "KeyPress", 
+                                 "KeyUp", 
+                                 "Layout", 
+                                 "MarginChanged", 
+                                 "PaddingChanged", 
+                                 "Paint", 
+                                 "ParentChanged", 
+                                 "PreviewKeyDown",
+                                 "RegionChanged", 
+                                 "Scroll", 
+                                 "RightToLeftChanged", 
+                                 "StyleChanged", 
+                                 "SystemColorsChanged", 
+                                 "TabIndexChanged", 
+                                 "TabStopChanged", 
+                                 "TextChanged", 
+                                 "Resize", 
+                                 "Validating",
+                                 "Validated",
+                                 "VisibleChanged" });
+            base.PreFilterEvents(events);
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/Editors.Design/DateTimeInputDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/Editors.Design/DateTimeInputDesigner.cs
new file mode 100644
index 00000000..b8ed2664
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/Editors.Design/DateTimeInputDesigner.cs	
@@ -0,0 +1,137 @@
+#if FRAMEWORK20
+using System;
+using System.Text;
+using System.Windows.Forms.Design;
+using DevComponents.Editors.DateTimeAdv;
+using DevComponents.DotNetBar;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar.Design
+{
+    public class DateTimeInputDesigner : VisualControlBaseDesigner
+    {
+        #region Internal Implementation
+        /// <summary>
+        /// Initializes a new instance of the DateTimeInputDesigner class.
+        /// </summary>
+        public DateTimeInputDesigner()
+        {
+            this.AutoResizeHandles = true;
+        }
+
+        public override void InitializeNewComponent(System.Collections.IDictionary defaultValues)
+        {
+            DateTimeInput c = this.Control as DateTimeInput;
+            if (c != null)
+            {
+                c.MonthCalendar.NavigationBackgroundStyle.BackColorSchemePart = eColorSchemePart.PanelBackground;
+                c.MonthCalendar.NavigationBackgroundStyle.BackColor2SchemePart = eColorSchemePart.PanelBackground2;
+                c.MonthCalendar.NavigationBackgroundStyle.BackColorGradientAngle = 90;
+                c.MonthCalendar.CommandsBackgroundStyle.BackColorSchemePart = eColorSchemePart.BarBackground;
+                c.MonthCalendar.CommandsBackgroundStyle.BackColor2SchemePart = eColorSchemePart.BarBackground2;
+                c.MonthCalendar.CommandsBackgroundStyle.BackColorGradientAngle = 90;
+                c.MonthCalendar.CommandsBackgroundStyle.BorderTop = eStyleBorderType.Solid;
+                c.MonthCalendar.CommandsBackgroundStyle.BorderTopColorSchemePart = eColorSchemePart.BarDockedBorder;
+                c.MonthCalendar.CommandsBackgroundStyle.BorderTopWidth = 1;
+                c.ButtonDropDown.Visible = true;
+                c.MonthCalendar.TodayButtonVisible = true;
+                c.MonthCalendar.ClearButtonVisible = true;
+                c.ButtonDropDown.Shortcut = eShortcut.AltDown;
+                c.Style = eDotNetBarStyle.StyleManagerControlled;
+            }
+            base.InitializeNewComponent(defaultValues);
+        }
+
+        public override System.Windows.Forms.Design.SelectionRules SelectionRules
+        {
+            get
+            {
+                SelectionRules rules = base.SelectionRules;
+                if (!this.Control.AutoSize)
+                {
+                    rules &= ~(SelectionRules.BottomSizeable | SelectionRules.TopSizeable);
+                }
+                return rules;
+            }
+        }
+
+        private void RemoveDescriptors(System.Collections.IDictionary properties, String[] propNames)
+        {
+            foreach (String propName in propNames)
+            {
+                if (properties.Contains(propName))
+                {
+                    if (properties[propName] is PropertyDescriptor)
+                        properties[propName] = TypeDescriptor.CreateProperty(this.Component.GetType(), (PropertyDescriptor)properties[propName], new BrowsableAttribute(false));
+                    else if (properties[propName] is EventDescriptor)
+                        properties[propName] = TypeDescriptor.CreateEvent(this.Component.GetType(), (EventDescriptor)properties[propName], new BrowsableAttribute(false));
+                    else
+                        properties.Remove(propName);
+                }
+            }
+        }
+
+        protected override void PreFilterProperties(System.Collections.IDictionary properties)
+        {
+            base.PreFilterProperties(properties);
+            RemoveDescriptors(properties,
+                new String[] { "AllowDrop", 
+                                 "BackColor",
+                                 "MaximumSize", 
+                                 "MinimumSize", 
+                                 "RightToLeft", 
+                                 "UseWaitCursor", 
+                                 "ImeMode" });
+        }
+
+        protected override void PreFilterEvents(System.Collections.IDictionary events)
+        {
+            RemoveDescriptors(events,
+                new string[] { "BackColorChanged", 
+                                 "BackgroundImageChanged", 
+                                 "BackgroundImageLayoutChanged", 
+                                 "BackgroundStyle", 
+                                 "CausesValidationChanged", 
+                                 "ChangeUICues", 
+                                 "ClientSizeChanged", 
+                                 "Colors", 
+                                 "ContextMenuStripChanged", 
+                                 "ControlAdded", 
+                                 "ControlRemoved", 
+                                 "CursorChanged", 
+                                 "DefinitionLoaded", 
+                                 "DockChanged", 
+                                 "EnabledChanged", 
+                                 "FontChanged", 
+                                 "ForeColorChanged", 
+                                 "ImeModeChanged", 
+                                 "KeyDown", 
+                                 "KeyPress", 
+                                 "KeyUp", 
+                                 "Layout", 
+                                 "MarginChanged", 
+                                 "MonthCalendar",
+                                 "PaddingChanged", 
+                                 "Paint", 
+                                 "ParentChanged", 
+                                 "PopupClose", 
+                                 "PopupContainerLoad", 
+                                 "PopupContainerUnload", 
+                                 "PopupOpen", 
+                                 "PopupShowing", 
+                                 "RegionChanged",                             
+                                 "RightToLeftChanged", 
+                                 "StyleChanged", 
+                                 "SystemColorsChanged", 
+                                 "TabIndexChanged", 
+                                 "TabStopChanged", 
+                                 "Resize", 
+                                 "SizeChanged", 
+                                 "VisibleChanged" });
+            base.PreFilterEvents(events);
+        }
+        #endregion
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/Editors.Design/IpAddressInputDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/Editors.Design/IpAddressInputDesigner.cs
new file mode 100644
index 00000000..f659db52
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/Editors.Design/IpAddressInputDesigner.cs	
@@ -0,0 +1,56 @@
+#if FRAMEWORK20
+using System;
+using System.Windows.Forms.Design;
+using System.Text;
+using DevComponents.Editors;
+
+namespace DevComponents.DotNetBar.Design
+{
+    /// <summary>
+    /// Represents designer for IpAddressInput control.
+    /// </summary>
+    public class IpAddressInputDesigner: VisualControlBaseDesigner
+    {
+        #region Private Variables
+        #endregion
+
+        #region Constructor
+        /// <summary>
+        /// Initializes a new instance of the IpAddressInputDesigner class.
+        /// </summary>
+        public IpAddressInputDesigner()
+        {
+            this.AutoResizeHandles = true;
+        }
+        #endregion
+
+        #region Internal Implementation
+        public override void InitializeNewComponent(System.Collections.IDictionary defaultValues)
+        {
+            IpAddressInput c = this.Control as IpAddressInput;
+            if (c != null)
+            {
+                c.AutoOverwrite = true;
+                c.ButtonFreeText.Visible = true;
+                c.ButtonFreeText.Shortcut = DevComponents.DotNetBar.eShortcut.F2;
+                c.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            }
+            base.InitializeNewComponent(defaultValues);
+        }
+
+        public override System.Windows.Forms.Design.SelectionRules SelectionRules
+        {
+            get
+            {
+                SelectionRules rules = base.SelectionRules;
+                if (!this.Control.AutoSize)
+                {
+                    rules &= ~(SelectionRules.BottomSizeable | SelectionRules.TopSizeable);
+                }
+                return rules;
+            }
+        }
+        #endregion
+    }
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/Editors.Design/MonthCalendarAdvDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/Editors.Design/MonthCalendarAdvDesigner.cs
new file mode 100644
index 00000000..93b11a9e
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/Editors.Design/MonthCalendarAdvDesigner.cs	
@@ -0,0 +1,45 @@
+#if FRAMEWORK20
+using System;
+using System.Text;
+using System.Windows.Forms.Design;
+using DevComponents.Editors.DateTimeAdv;
+using System.Drawing;
+using DevComponents.DotNetBar.Rendering;
+
+namespace DevComponents.DotNetBar.Design
+{
+    /// <summary>
+    /// Represents Windows Forms designer for MonthCalendarAdv control.
+    /// </summary>
+    public class MonthCalendarAdvDesigner : ControlDesigner
+    {
+        #region Private Variables
+        #endregion
+
+        #region Constructor
+        #endregion
+
+        #region Internal Implementation
+        public override void InitializeNewComponent(System.Collections.IDictionary defaultValues)
+        {
+            MonthCalendarAdv mc = this.Control as MonthCalendarAdv;
+            if (mc != null)
+            {
+                mc.BackgroundStyle.Class = ElementStyleClassKeys.MonthCalendarAdvKey;
+                //mc.BackgroundStyle.BackColor = SystemColors.Window;
+                //mc.BackgroundStyle.Border = DevComponents.DotNetBar.eStyleBorderType.Solid;
+                //mc.BackgroundStyle.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+                //mc.BackgroundStyle.BorderWidth = 1;
+                mc.NavigationBackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground;
+                mc.NavigationBackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground2;
+                mc.NavigationBackgroundStyle.BackColorGradientAngle = 90;
+                mc.AutoSize = true;
+            }
+            base.InitializeNewComponent(defaultValues);
+        }
+        #endregion
+
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/Editors.Design/NumericInputBaseDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/Editors.Design/NumericInputBaseDesigner.cs
new file mode 100644
index 00000000..d36f0700
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/Editors.Design/NumericInputBaseDesigner.cs	
@@ -0,0 +1,58 @@
+#if FRAMEWORK20
+using System;
+using System.Windows.Forms.Design;
+using System.Text;
+using DevComponents.DotNetBar;
+using DevComponents.Editors;
+
+namespace DevComponents.DotNetBar.Design
+{
+    /// <summary>
+    /// Represents the base designer for the NumericInputBase controls.
+    /// </summary>
+    public class NumericInputBaseDesigner : VisualControlBaseDesigner
+    {
+        #region Private Variables
+        #endregion
+
+        #region Constructor
+        /// <summary>
+        /// Initializes a new instance of the NumericInputBaseDesigner class.
+        /// </summary>
+        public NumericInputBaseDesigner()
+        {
+            this.AutoResizeHandles = true;
+        }
+        #endregion
+
+        #region Internal Implementation
+        public override void InitializeNewComponent(System.Collections.IDictionary defaultValues)
+        {
+            NumericInputBase c = this.Control as NumericInputBase;
+            if (c != null)
+            {
+                c.ShowUpDown = true;
+                c.AutoOverwrite = false;
+                c.ButtonFreeText.Shortcut = eShortcut.F2;
+            }
+            base.InitializeNewComponent(defaultValues);
+        }
+
+        public override System.Windows.Forms.Design.SelectionRules SelectionRules
+        {
+            get
+            {
+                SelectionRules rules = base.SelectionRules;
+                if (!this.Control.AutoSize)
+                {
+                    rules &= ~(SelectionRules.BottomSizeable | SelectionRules.TopSizeable);
+                }
+                return rules;
+            }
+        }
+        #endregion
+
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/Editors.Design/TimeSelectorDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/Editors.Design/TimeSelectorDesigner.cs
new file mode 100644
index 00000000..81ea1eed
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/Editors.Design/TimeSelectorDesigner.cs	
@@ -0,0 +1,134 @@
+using System;
+using System.Text;
+using System.Windows.Forms.Design;
+using DevComponents.Editors.DateTimeAdv;
+using System.Drawing;
+using DevComponents.DotNetBar.Rendering;
+using System.ComponentModel;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Design
+{
+    public class TimeSelectorDesigner : ControlDesigner
+    {
+        #region Private Variables
+        #endregion
+
+        #region Constructor
+        #endregion
+
+        #region Internal Implementation
+        public override void InitializeNewComponent(System.Collections.IDictionary defaultValues)
+        {
+            TimeSelector mc = this.Control as TimeSelector;
+            if (mc != null)
+            {
+                mc.BackgroundStyle.Class = ElementStyleClassKeys.ItemPanelKey;
+                mc.AutoSize = true;
+            }
+            base.InitializeNewComponent(defaultValues);
+        }
+
+        protected override void PreFilterProperties(System.Collections.IDictionary properties)
+        {
+            base.PreFilterProperties(properties);
+            RemoveDescriptors(properties,
+                new String[] { "AutoScrollMargin", 
+                                 "AlwaysDisplayKeyAccelerators", 
+                                 "AutoScroll", 
+                                 "AutoScrollMinSize", 
+                                 "DisabledImagesGrayScale", 
+                                 "DispatchShortcuts", 
+                                 "Enabled",
+                                 "Images", 
+                                 "ImageSize", 
+                                 "ImagesLarge", 
+                                 "ImagesMedium", 
+                                 "KeyTipsFont", 
+                                 "BackColor", 
+                                 "BackgroundImage", 
+                                 "BackgroundImageLayout", 
+                                 "Margin", 
+                                 "MaximumSize", 
+                                 "MinimumSize", 
+                                 "Padding", 
+                                 "RightToLeft", 
+                                 "ShowShortcutKeysInToolTips", 
+                                 "ShowToolTips", 
+                                 "TabStop",
+                                 "TabIndex",
+                                 "UseWaitCursor", 
+                                 "ImeMode" });
+        }
+        private void RemoveDescriptors(System.Collections.IDictionary properties, String[] propNames)
+        {
+            foreach (String propName in propNames)
+            {
+                if (properties.Contains(propName))
+                    properties.Remove(propName);
+            }
+        }
+        protected override void PreFilterEvents(System.Collections.IDictionary events)
+        {
+            RemoveDescriptors(events,
+                new string[] { "BackColorChanged", 
+                                 "BackgroundImageChanged", 
+                                 "BackgroundImageLayoutChanged", 
+                                 "BackgroundStyle", 
+                                 "ButtonCheckedChanged", 
+                                 "CausesValidationChanged", 
+                                 "ChangeUICues", 
+                                 "ClientSizeChanged", 
+                                 "ContainerControlDeserialize", 
+                                 "ContainerControlSerialize", 
+                                 "ContainerLoadControl", 
+                                 "Enter", 
+                                 "Leave", 
+                                 "ContextMenuStripChanged", 
+                                 "ControlAdded", 
+                                 "ControlRemoved", 
+                                 "CursorChanged", 
+                                 "DefinitionLoaded", 
+                                 "DockChanged", 
+                                 "EnabledChanged", 
+                                 "ExpandedChange", 
+                                 "FontChanged", 
+                                 "ForeColorChanged", 
+                                 "ImeModeChanged", 
+                                 "ItemAdded", 
+                                 "ItemClick", 
+                                 "ItemDoubleClick", 
+                                 "ItemLayoutUpdated", 
+                                 "ItemRemoved", 
+                                 "ItemTextChanged", 
+                                 "KeyDown", 
+                                 "KeyPress", 
+                                 "KeyUp", 
+                                 "Layout", 
+                                 "MarginChanged", 
+                                 "OptionGroupChanging", 
+                                 "PaddingChanged", 
+                                 "Paint", 
+                                 "ParentChanged", 
+                                 "PopupClose", 
+                                 "PopupContainerLoad", 
+                                 "PopupContainerUnload", 
+                                 "PopupOpen", 
+                                 "PopupShowing", 
+                                 "RegionChanged", 
+                                 "Scroll", 
+                                 "RightToLeftChanged", 
+                                 "StyleChanged", 
+                                 "SystemColorsChanged", 
+                                 "TabIndexChanged", 
+                                 "TabStopChanged", 
+                                 "TextChanged", 
+                                 "Resize", 
+                                 "ToolTipShowing", 
+                                 "UserCustomize", 
+                                 "VisibleChanged" });
+            base.PreFilterEvents(events);
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/Editors.Design/VisualControlBaseDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/Editors.Design/VisualControlBaseDesigner.cs
new file mode 100644
index 00000000..78fb977d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/Editors.Design/VisualControlBaseDesigner.cs	
@@ -0,0 +1,36 @@
+#if FRAMEWORK20
+using System;
+using System.Text;
+using System.Windows.Forms.Design;
+using DevComponents.Editors;
+
+namespace DevComponents.DotNetBar.Design
+{
+    /// <summary>
+    /// Represents Windows Forms designer for the VisualControlBase control.
+    /// </summary>
+    public class VisualControlBaseDesigner : ControlDesigner
+    {
+        #region Private Variables
+        #endregion
+
+        #region Constructor
+        #endregion
+
+        #region Internal Implementation
+        public override void InitializeNewComponent(System.Collections.IDictionary defaultValues)
+        {
+            VisualControlBase c = this.Control as VisualControlBase;
+            if (c != null)
+            {
+                c.Height = c.PreferredHeight;
+            }
+            base.InitializeNewComponent(defaultValues);
+        }
+
+        #endregion
+
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ElementStyleClassTypeEditor.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ElementStyleClassTypeEditor.cs
new file mode 100644
index 00000000..cace715f
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ElementStyleClassTypeEditor.cs	
@@ -0,0 +1,71 @@
+using System;
+using System.ComponentModel;
+using System.Collections;
+using System.Diagnostics;
+using System.Windows.Forms;
+using System.Windows.Forms.Design;
+using System.Drawing.Design;
+using System.Reflection;
+using DevComponents.DotNetBar.Rendering;
+
+namespace DevComponents.DotNetBar.Design
+{
+    /// <summary>
+    /// Summary description for ContextExMenuTypeEditor.
+    /// </summary>
+    public class ElementStyleClassTypeEditor : System.Drawing.Design.UITypeEditor
+    {
+        private IWindowsFormsEditorService edSvc = null;
+        public override object EditValue(ITypeDescriptorContext context, IServiceProvider provider, object value)
+        {
+            if (context != null
+                && context.Instance != null
+                && provider != null)
+            {
+                edSvc = provider.GetService(typeof(IWindowsFormsEditorService)) as IWindowsFormsEditorService;
+
+                if (edSvc != null)
+                {
+                    ListBox lb = new ListBox();
+                    lb.SelectedIndexChanged += new EventHandler(this.SelectedChanged);
+                    Type t = typeof(ElementStyleClassKeys);
+                    FieldInfo[] fields = t.GetFields(BindingFlags.Public | BindingFlags.Static);
+                    foreach (FieldInfo pi in fields)
+                    {
+                        string s = pi.GetValue(null).ToString();
+                        lb.Items.Add(s);
+                        if (s == value.ToString())
+                            lb.SelectedItem = s;
+                    }
+
+                    edSvc.DropDownControl(lb);
+                    if (lb.SelectedItem != null)
+                        return lb.SelectedItem.ToString();
+                }
+            }
+
+            return value;
+        }
+
+        private void SelectedChanged(object sender, EventArgs e)
+        {
+            if (edSvc != null)
+                edSvc.CloseDropDown();
+        }
+
+        /// <summary>
+        /// Gets the editor style used by the EditValue method.
+        /// </summary>
+        /// <param name="context">An ITypeDescriptorContext that can be used to gain additional context information.</param>
+        /// <returns>A UITypeEditorEditStyle value that indicates the style of editor used by EditValue. If the UITypeEditor does not support this method, then GetEditStyle will return None</returns>
+        public override UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext context)
+        {
+            if (context != null && context.Instance != null)
+            {
+                return UITypeEditorEditStyle.DropDown;
+            }
+            return base.GetEditStyle(context);
+        }
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ElementStyleCollectionEditor.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ElementStyleCollectionEditor.cs
new file mode 100644
index 00000000..d9fbf23c
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ElementStyleCollectionEditor.cs	
@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace DevComponents.DotNetBar.Design
+{
+    #region ElementStyleCollectionEditor
+    /// <summary>
+    /// Support for ElementStyle design-time editor.
+    /// </summary>
+    public class ElementStyleCollectionEditor : System.ComponentModel.Design.CollectionEditor
+    {
+        /// <summary>Creates new instance of the object.</summary>
+        public ElementStyleCollectionEditor(Type type)
+            : base(type)
+        {
+        }
+        protected override Type CreateCollectionItemType()
+        {
+            return typeof(ElementStyle);
+        }
+        protected override Type[] CreateNewItemTypes()
+        {
+            return new Type[] { typeof(ElementStyle) };
+        }
+        protected override object CreateInstance(Type itemType)
+        {
+            object item = base.CreateInstance(itemType);
+            return item;
+        }
+    }
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ExpandablePanelDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ExpandablePanelDesigner.cs
new file mode 100644
index 00000000..7a48230a
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ExpandablePanelDesigner.cs	
@@ -0,0 +1,97 @@
+using System.Collections;
+using System.ComponentModel;
+using System.ComponentModel.Design;
+using System;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Design
+{
+    public class ExpandablePanelDesigner : PanelExDesigner
+    {
+        #region Internal Implementation
+        
+#if FRAMEWORK20
+        public override void InitializeNewComponent(IDictionary defaultValues)
+        {
+            base.InitializeNewComponent(defaultValues);
+            SetDesignTimeDefaults();
+        }
+#else
+		public override void OnSetComponentDefaults()
+		{
+			base.OnSetComponentDefaults();
+			SetDesignTimeDefaults();
+		}
+#endif
+
+        private void SetDesignTimeDefaults()
+        {
+            ExpandablePanel p = this.Control as ExpandablePanel;
+            if (p == null)
+                return;
+            p.ApplyLabelStyle();
+            p.Style.BorderColor.ColorSchemePart = eColorSchemePart.BarDockedBorder;
+            p.Style.Border = eBorderType.SingleLine;
+            p.Style.BackColor1.ColorSchemePart = eColorSchemePart.PanelBackground;
+            p.Style.BackColor2.ColorSchemePart = eColorSchemePart.PanelBackground2;
+            p.Text = "";
+			p.TitlePanel.ApplyPanelStyle();
+            p.HideControlsWhenCollapsed = true;
+            this.ColorSchemeStyle = eDotNetBarStyle.StyleManagerControlled;
+        }
+
+        protected override void PreFilterProperties(IDictionary properties)
+        {
+            base.PreFilterProperties(properties);
+            properties["ColorSchemeStyle"] = TypeDescriptor.CreateProperty(typeof(ExpandablePanelDesigner), (PropertyDescriptor)properties["ColorSchemeStyle"], new Attribute[]
+				{
+					new DefaultValueAttribute(eDotNetBarStyle.Office2003),
+					new BrowsableAttribute(true),
+					new CategoryAttribute("Style"),
+                    new DescriptionAttribute("Gets or sets color scheme style.")});
+        }
+
+        /// <summary>
+        ///     Gets or sets color scheme style.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Category("Style"), Description("Gets or sets color scheme style."), DefaultValue(eDotNetBarStyle.Office2003)]
+        public eDotNetBarStyle ColorSchemeStyle
+        {
+            get
+            {
+                ExpandablePanel ep = this.Control as ExpandablePanel;
+                return ep.ColorSchemeStyle;
+            }
+            set
+            {
+                ExpandablePanel ep = this.Control as ExpandablePanel;
+                ep.ColorSchemeStyle = value;
+                IDesignerHost dh = this.GetService(typeof(IDesignerHost)) as IDesignerHost;
+                if (dh != null && !dh.Loading)
+                {
+                    if (Helpers.IsOffice2007Style(value))
+                        ep.TitleStyle.Border = eBorderType.RaisedInner;
+                    else
+                        ep.TitleStyle.Border = eBorderType.SingleLine;
+                }
+            }
+        }
+
+        protected override bool GetHitTest(System.Drawing.Point pt)
+        {
+            ExpandablePanel p = this.Control as ExpandablePanel;
+            if (p != null)
+            {
+                Point pt2 = p.PointToClient(pt);
+                PanelExTitle titlePanel = p.TitlePanel as PanelExTitle;
+                if (titlePanel != null && titlePanel.ExpandChangeButton!=null && titlePanel.ExpandChangeButton.DisplayRectangle.Contains(pt2))
+                    return true;
+                else if (titlePanel != null && titlePanel.ExpandChangeButton!=null)
+                    titlePanel.ExpandChangeButton.InternalMouseLeave();
+
+            }
+            return base.GetHitTest(pt);
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ExpandableSplitterDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ExpandableSplitterDesigner.cs
new file mode 100644
index 00000000..a4555ace
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ExpandableSplitterDesigner.cs	
@@ -0,0 +1,109 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows.Forms.Design;
+using System.ComponentModel.Design;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar.Design
+{
+    /// <summary>
+    /// Represents windows forms designer support for ExpandableSplitter control.
+    /// </summary>
+    public class ExpandableSplitterDesigner : ControlDesigner
+    {
+        /// <summary>
+        /// Default constructor.
+        /// </summary>
+        public ExpandableSplitterDesigner() { }
+
+#if FRAMEWORK20
+        public override void InitializeNewComponent(System.Collections.IDictionary defaultValues)
+        {
+            base.InitializeNewComponent(defaultValues);
+            SetDesignTimeDefaults();
+        }
+#else
+        public override void OnSetComponentDefaults()
+        {
+            SetDesignTimeDefaults();
+            base.OnSetComponentDefaults();
+        }
+#endif
+
+        private void SetDesignTimeDefaults()
+        {
+            this.Style = eSplitterStyle.Office2007;
+            ((ExpandableSplitter)this.Control).Width = 6;
+        }
+
+        protected override void PreFilterProperties(
+            System.Collections.IDictionary properties)
+        {
+            base.PreFilterProperties(properties);
+            properties["Style"] =
+                TypeDescriptor.CreateProperty(typeof(ExpandableSplitterDesigner),
+                (PropertyDescriptor)properties["Style"],
+                new Attribute[0]);
+        }
+
+        /// <summary>
+        /// Gets or sets visual style of the control. Default value is eSplitterStyle.Office2003.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), DefaultValue(eSplitterStyle.Office2003), Description("Indicates visual style of the control.")]
+        public eSplitterStyle Style
+        {
+            get { return ((ExpandableSplitter)this.Control).Style; }
+            set
+            {
+                ((ExpandableSplitter)this.Control).Style = value;
+                IDesignerHost dh = GetService(typeof(IDesignerHost)) as IDesignerHost;
+                if (dh != null && dh.Loading)
+                    return;
+
+                ((ExpandableSplitter)this.Control).ApplyStyle(value);
+                OnStyleChanged();
+            }
+        }
+
+        private void OnStyleChanged()
+        {
+            ExpandableSplitter splitter = this.Control as ExpandableSplitter;
+            IComponentChangeService change = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+            if (change != null)
+            {
+                change.OnComponentChanging(splitter, TypeDescriptor.GetProperties(typeof(ExpandableSplitter))["Style"]);
+                change.OnComponentChanged(splitter, TypeDescriptor.GetProperties(typeof(ExpandableSplitter))["Style"], null, null);
+
+                change.OnComponentChanging(splitter, TypeDescriptor.GetProperties(typeof(ExpandableSplitter))["BackColor"]);
+                change.OnComponentChanged(splitter, TypeDescriptor.GetProperties(typeof(ExpandableSplitter))["BackColor"], null, null);
+
+                change.OnComponentChanging(splitter, TypeDescriptor.GetProperties(typeof(ExpandableSplitter))["BackColor2"]);
+                change.OnComponentChanged(splitter, TypeDescriptor.GetProperties(typeof(ExpandableSplitter))["BackColor2"], null, null);
+
+                change.OnComponentChanging(splitter, TypeDescriptor.GetProperties(typeof(ExpandableSplitter))["GripLightColor"]);
+                change.OnComponentChanged(splitter, TypeDescriptor.GetProperties(typeof(ExpandableSplitter))["GripLightColor"], null, null);
+
+                change.OnComponentChanging(splitter, TypeDescriptor.GetProperties(typeof(ExpandableSplitter))["GripDarkColor"]);
+                change.OnComponentChanged(splitter, TypeDescriptor.GetProperties(typeof(ExpandableSplitter))["GripDarkColor"], null, null);
+
+                change.OnComponentChanging(splitter, TypeDescriptor.GetProperties(typeof(ExpandableSplitter))["EpxandFillColor"]);
+                change.OnComponentChanged(splitter, TypeDescriptor.GetProperties(typeof(ExpandableSplitter))["ExpandFillColor"], null, null);
+
+                change.OnComponentChanging(splitter, TypeDescriptor.GetProperties(typeof(ExpandableSplitter))["EpxandLineColor"]);
+                change.OnComponentChanged(splitter, TypeDescriptor.GetProperties(typeof(ExpandableSplitter))["ExpandLineColor"], null, null);
+            }
+        }
+
+        private IDesignerHost GetIDesignerHost()
+        {
+            try
+            {
+                IDesignerHost dh = (IDesignerHost)GetService(typeof(IDesignerHost));
+                return dh;
+            }
+            catch { }
+            return null;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ExplorerBarDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ExplorerBarDesigner.cs
new file mode 100644
index 00000000..25779fd6
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ExplorerBarDesigner.cs	
@@ -0,0 +1,259 @@
+using System;
+using System.ComponentModel;
+using System.ComponentModel.Design;
+using System.Windows.Forms;
+using System.ComponentModel.Design.Serialization;
+using System.CodeDom;
+using System.Drawing;
+using System.Collections;
+
+namespace DevComponents.DotNetBar.Design
+{
+	/// <summary>
+	/// Summary description for ExplorerBarDesigner.
+	/// </summary>
+	public class ExplorerBarDesigner:BarBaseControlDesigner
+	{
+		#region Internal Implementation
+		public ExplorerBarDesigner():base()
+		{
+			this.EnableItemDragDrop=true;
+		}
+
+		public override void Initialize(IComponent component) 
+		{
+			base.Initialize(component);
+			if(!component.Site.DesignMode)
+				return;
+			ExplorerBar bar=this.Control as ExplorerBar;
+			if(bar!=null)
+				bar.SetDesignMode();
+		}
+
+		public override DesignerVerbCollection Verbs 
+		{
+			get 
+			{
+				DesignerVerb[] verbs = new DesignerVerb[]
+					{
+						new DesignerVerb("Create Group", new EventHandler(OnAddGroup)),
+						new DesignerVerb("Create Button", new EventHandler(OnAddButton))
+					};
+				return new DesignerVerbCollection(verbs);
+			}
+		}
+
+#if FRAMEWORK20
+        public override void InitializeNewComponent(IDictionary defaultValues)
+        {
+            base.InitializeNewComponent(defaultValues);
+            SetDesignTimeDefaults();
+        }
+#else
+		public override void OnSetComponentDefaults()
+		{
+			base.OnSetComponentDefaults();
+			SetDesignTimeDefaults();
+		}
+#endif
+        private void SetDesignTimeDefaults()
+        {
+            if (this.Control is ExplorerBar)
+            {
+                ExplorerBar eb = this.Control as ExplorerBar;
+                eb.ApplyDefaultSettings();
+                //eb.ThemeAware = true;
+                eb.StockStyle = eExplorerBarStockStyle.SystemColors;
+            }
+        }
+
+		protected override BaseItem GetItemContainer()
+		{
+			ExplorerBar bar=this.Control as ExplorerBar;
+			if(bar!=null)
+				return bar.ItemsContainer;
+			return null;
+		}
+
+		protected override void RecalcLayout()
+		{
+			ExplorerBar bar=this.GetItemContainerControl() as ExplorerBar;
+			if(bar!=null)
+				bar.RecalcLayout();
+		}
+
+		protected override void OnSubItemsChanging()
+		{
+			base.OnSubItemsChanging();
+			IComponentChangeService change=this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+			if(change!=null)
+			{
+				ExplorerBar bar=this.GetItemContainerControl() as ExplorerBar;
+				change.OnComponentChanging(this.Component,TypeDescriptor.GetProperties(bar).Find("Groups",true));
+			}
+		}
+
+		protected override void OnSubItemsChanged()
+		{
+			base.OnSubItemsChanged();
+			IComponentChangeService change=this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+			if(change!=null)
+			{
+				ExplorerBar bar=this.GetItemContainerControl() as ExplorerBar;
+				change.OnComponentChanged(this.Component,TypeDescriptor.GetProperties(bar).Find("Groups",true),null,null);
+			}
+		}
+
+//		/// <summary>
+//		/// Triggered when some other component on the form is removed.
+//		/// </summary>
+//		protected override void ComponentRemoved(object sender, ComponentEventArgs e)
+//		{
+//			base.ComponentRemoved(sender,e);
+//			if(e.Component is ExplorerBarGroupItem)
+//			{
+//				ExplorerBar bar=this.GetItemContainerControl() as ExplorerBar;
+//				if(bar.Groups.Contains(e.Component as BaseItem))
+//					bar.Groups.Remove(e.Component as BaseItem);
+//				DestroySubItems(e.Component as BaseItem);
+//				bar.RecalcLayout();
+//			}
+//		}
+		#endregion
+
+		#region Design-Time Item Creation
+		private void OnAddGroup(object sender, EventArgs e)
+		{
+            IDesignerHost dh = (IDesignerHost)GetService(typeof(IDesignerHost));
+            DesignerTransaction dt = dh.CreateTransaction();
+            try
+            {
+                CreateGroup();
+            }
+            catch
+            {
+                dt.Cancel();
+            }
+            finally
+            {
+                if(!dt.Canceled)
+                    dt.Commit();
+            }
+		}
+
+		private ExplorerBarGroupItem CreateGroup()
+		{
+			ExplorerBar bar=this.Component as ExplorerBar;
+			ExplorerBarGroupItem item=null;
+			IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+
+			if(bar!=null && dh!=null)
+			{
+				OnSubItemsChanging();
+                try
+                {
+                    m_CreatingItem = true;
+                    item = dh.CreateComponent(typeof(ExplorerBarGroupItem)) as ExplorerBarGroupItem;
+                    if (item == null)
+                        return null;
+                    item.SetDefaultAppearance();
+                    item.Text = "New Group";
+                    item.Expanded = true;
+                    bar.Groups.Add(item);
+                    OnSubItemsChanged();
+                }
+                finally
+                {
+                    m_CreatingItem = false;
+                }
+			}
+
+			return item;
+		}
+
+		private void OnAddButton(object sender, EventArgs e)
+		{
+			ExplorerBar bar=this.Component as ExplorerBar;
+			ExplorerBarGroupItem group=null;
+
+			IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+			ISelectionService selection = (ISelectionService) this.GetService(typeof(ISelectionService));
+
+            DesignerTransaction dt = dh.CreateTransaction();
+            try
+            {
+                if (selection != null && selection.PrimarySelection is ExplorerBarGroupItem)
+                {
+                    group = selection.PrimarySelection as ExplorerBarGroupItem;
+                }
+                else if (bar.Groups.Count > 0)
+                {
+                    System.Drawing.Point point = bar.PointToClient(Form.MousePosition);
+                    if (bar.Bounds.Contains(point))
+                    {
+                        foreach (BaseItem item in bar.Groups)
+                        {
+                            if (item.DisplayRectangle.Contains(point))
+                            {
+                                group = item as ExplorerBarGroupItem;
+                                break;
+                            }
+                        }
+                    }
+                    if (group == null)
+                    {
+                        foreach (BaseItem item in bar.Groups)
+                        {
+                            if (item.Visible)
+                            {
+                                group = item as ExplorerBarGroupItem;
+                                break;
+                            }
+                        }
+                    }
+                }
+
+                if (group == null)
+                    group = CreateGroup();
+
+                IComponentChangeService change = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+                if (change != null)
+                    change.OnComponentChanging(this.Component, TypeDescriptor.GetProperties(group).Find("SubItems", true));
+                try
+                {
+                    m_CreatingItem = true;
+                    ButtonItem button = dh.CreateComponent(typeof(ButtonItem)) as ButtonItem;
+                    if (button == null)
+                        return;
+                    ExplorerBarGroupItem.SetDesignTimeDefaults(button, group.StockStyle);
+                    group.SubItems.Add(button);
+                    if (change != null)
+                        change.OnComponentChanged(this.Component, TypeDescriptor.GetProperties(group).Find("SubItems", true), null, null);
+                }
+                finally
+                {
+                    m_CreatingItem = false;
+                }
+
+                this.RecalcLayout();
+            }
+            catch
+            {
+                dt.Cancel();
+            }
+            finally
+            {
+                if(!dt.Canceled)
+                    dt.Commit();
+            }
+		}
+
+		protected override bool CanDragItem(BaseItem item)
+		{
+			if(item is ExplorerBarGroupItem)
+				return false;
+			return base.CanDragItem(item);
+		}
+		#endregion
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ExplorerBarGroupItemDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ExplorerBarGroupItemDesigner.cs
new file mode 100644
index 00000000..5e360329
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ExplorerBarGroupItemDesigner.cs	
@@ -0,0 +1,43 @@
+using System;
+using System.Collections;
+
+namespace DevComponents.DotNetBar.Design
+{
+	/// <summary>
+	/// Designer for ExplorerBarGroupItem object.
+	/// </summary>
+	public class ExplorerBarGroupItemDesigner:BaseItemDesigner
+	{
+		protected override void BeforeNewItemAdded(BaseItem item)
+		{
+			base.BeforeNewItemAdded(item);
+			if(item is ButtonItem)
+				ExplorerBarGroupItem.SetDesignTimeDefaults((ButtonItem)item,((ExplorerBarGroupItem)this.Component).StockStyle);
+		}
+
+		protected override void SetDesignTimeDefaults()
+		{
+			if (this.Component is ExplorerBarGroupItem)
+			{
+				ExplorerBarGroupItem e = this.Component as ExplorerBarGroupItem;
+				e.SetDefaultAppearance();
+                e.StockStyle = eExplorerBarStockStyle.SystemColors;
+			}
+		}
+
+		public override System.Collections.ICollection AssociatedComponents
+		{
+			get
+			{
+				System.Collections.ArrayList c=new System.Collections.ArrayList(base.AssociatedComponents);
+				BaseItem container=this.Component as BaseItem;
+				if(container!=null)
+				{
+					foreach(BaseItem item in container.SubItems)
+						c.Add(item);
+				}
+				return c;
+			}
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ExplorerBarGroupItemEditor.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ExplorerBarGroupItemEditor.cs
new file mode 100644
index 00000000..a4384dbf
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ExplorerBarGroupItemEditor.cs	
@@ -0,0 +1,28 @@
+using System;
+
+namespace DevComponents.DotNetBar.Design
+{
+	/// <summary>
+	/// Collection editor for ExplorerGroupItem.
+	/// </summary>
+	public class ExplorerBarGroupItemEditor:System.ComponentModel.Design.CollectionEditor
+	{
+		public ExplorerBarGroupItemEditor(Type type):base(type)
+		{
+		}
+		protected override Type CreateCollectionItemType()
+		{
+			return typeof(ButtonItem);
+		}
+		protected override object CreateInstance(Type itemType)
+		{
+			object item=base.CreateInstance(itemType);
+			if(item is ButtonItem)
+			{
+				ButtonItem button=item as ButtonItem;
+				ExplorerBarGroupItem.SetDesignTimeDefaults(button,eExplorerBarStockStyle.Custom);
+			}
+			return item;
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ExplorerBarPanelsEditor.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ExplorerBarPanelsEditor.cs
new file mode 100644
index 00000000..8fea5fe8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ExplorerBarPanelsEditor.cs	
@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace DevComponents.DotNetBar.Design
+{
+    /// <summary>
+    /// Summary description for ComboItemsEditor.
+    /// </summary>
+    public class ExplorerBarPanelsEditor : System.ComponentModel.Design.CollectionEditor
+    {
+        public ExplorerBarPanelsEditor(Type type)
+            : base(type)
+        {
+        }
+        protected override Type CreateCollectionItemType()
+        {
+            return typeof(ExplorerBarGroupItem);
+        }
+        protected override Type[] CreateNewItemTypes()
+        {
+            return new Type[] { typeof(ExplorerBarGroupItem) };
+        }
+        protected override object CreateInstance(Type itemType)
+        {
+            object item = base.CreateInstance(itemType);
+            if (item is ExplorerBarGroupItem)
+            {
+                ExplorerBarGroupItem panel = item as ExplorerBarGroupItem;
+                panel.Text = "New Group";
+            }
+            return item;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/FlagEnumEditor.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/FlagEnumEditor.cs
new file mode 100644
index 00000000..c32febcc
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/FlagEnumEditor.cs	
@@ -0,0 +1,281 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel;
+using System.Drawing.Design;
+using System.Windows.Forms;
+using System.Windows.Forms.Design;
+
+namespace DevComponents.DotNetBar.Design
+{
+    // UITypeEditor for flag enums
+    public class FlagEnumUIEditor : UITypeEditor
+    {
+        // The checklistbox
+        private FlagCheckedListBox flagEnumCB;
+
+        public FlagEnumUIEditor()
+        {
+            flagEnumCB = new FlagCheckedListBox();
+            flagEnumCB.BorderStyle = BorderStyle.None;
+        }
+
+        public override object EditValue(ITypeDescriptorContext context, IServiceProvider provider, object value)
+        {
+            if (context != null
+                && context.Instance != null
+                && provider != null)
+            {
+
+                IWindowsFormsEditorService edSvc = (IWindowsFormsEditorService)provider.GetService(typeof(IWindowsFormsEditorService));
+
+                if (edSvc != null)
+                {
+
+                    Enum e = (Enum)Convert.ChangeType(value, context.PropertyDescriptor.PropertyType);
+                    flagEnumCB.EnumValue = e;
+                    edSvc.DropDownControl(flagEnumCB);
+                    return flagEnumCB.EnumValue;
+
+                }
+            }
+            return null;
+        }
+
+        public override UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext context)
+        {
+            return UITypeEditorEditStyle.DropDown;
+        }
+
+
+    }
+
+    #region FlagCheckedListBox
+    internal class FlagCheckedListBox : CheckedListBox
+    {
+        private System.ComponentModel.Container components = null;
+
+        public FlagCheckedListBox()
+        {
+            // This call is required by the Windows.Forms Form Designer.
+            InitializeComponent();
+
+            // TODO: Add any initialization after the InitForm call
+
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                if (components != null)
+                    components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Component Designer generated code
+        private void InitializeComponent()
+        {
+            // 
+            // FlaggedCheckedListBox
+            // 
+            this.CheckOnClick = true;
+
+        }
+        #endregion
+
+        // Adds an integer value and its associated description
+        public FlagCheckedListBoxItem Add(int v, string c)
+        {
+            FlagCheckedListBoxItem item = new FlagCheckedListBoxItem(v, c);
+            Items.Add(item);
+            return item;
+        }
+
+        public FlagCheckedListBoxItem Add(FlagCheckedListBoxItem item)
+        {
+            Items.Add(item);
+            return item;
+        }
+
+        protected override void OnItemCheck(ItemCheckEventArgs e)
+        {
+            base.OnItemCheck(e);
+
+            if (isUpdatingCheckStates)
+                return;
+
+            // Get the checked/unchecked item
+            FlagCheckedListBoxItem item = Items[e.Index] as FlagCheckedListBoxItem;
+            // Update other items
+            UpdateCheckedItems(item, e.NewValue);
+        }
+
+        // Checks/Unchecks items depending on the give bitvalue
+        protected void UpdateCheckedItems(int value)
+        {
+
+            isUpdatingCheckStates = true;
+
+            // Iterate over all items
+            for (int i = 0; i < Items.Count; i++)
+            {
+                FlagCheckedListBoxItem item = Items[i] as FlagCheckedListBoxItem;
+
+                if (item.value == 0)
+                {
+                    SetItemChecked(i, value == 0);
+                }
+                else
+                {
+
+                    // If the bit for the current item is on in the bitvalue, check it
+                    if ((item.value & value) == item.value && item.value != 0)
+                        SetItemChecked(i, true);
+                    // Otherwise uncheck it
+                    else
+                        SetItemChecked(i, false);
+                }
+            }
+
+            isUpdatingCheckStates = false;
+
+        }
+
+        // Updates items in the checklistbox
+        // composite = The item that was checked/unchecked
+        // cs = The check state of that item
+        protected void UpdateCheckedItems(FlagCheckedListBoxItem composite, CheckState cs)
+        {
+
+            // If the value of the item is 0, call directly.
+            if (composite.value == 0)
+                UpdateCheckedItems(0);
+
+
+            // Get the total value of all checked items
+            int sum = 0;
+            for (int i = 0; i < Items.Count; i++)
+            {
+                FlagCheckedListBoxItem item = Items[i] as FlagCheckedListBoxItem;
+
+                // If item is checked, add its value to the sum.
+                if (GetItemChecked(i))
+                    sum |= item.value;
+            }
+
+            // If the item has been unchecked, remove its bits from the sum
+            if (cs == CheckState.Unchecked)
+                sum = sum & (~composite.value);
+            // If the item has been checked, combine its bits with the sum
+            else
+                sum |= composite.value;
+
+            // Update all items in the checklistbox based on the final bit value
+            UpdateCheckedItems(sum);
+
+        }
+
+        private bool isUpdatingCheckStates = false;
+
+        // Gets the current bit value corresponding to all checked items
+        public int GetCurrentValue()
+        {
+            int sum = 0;
+
+            for (int i = 0; i < Items.Count; i++)
+            {
+                FlagCheckedListBoxItem item = Items[i] as FlagCheckedListBoxItem;
+
+                if (GetItemChecked(i))
+                    sum |= item.value;
+            }
+
+            return sum;
+        }
+
+        Type enumType;
+        Enum enumValue;
+
+        // Adds items to the checklistbox based on the members of the enum
+        private void FillEnumMembers()
+        {
+            foreach (string name in Enum.GetNames(enumType))
+            {
+                object val = Enum.Parse(enumType, name);
+                int intVal = (int)Convert.ChangeType(val, typeof(int));
+
+                Add(intVal, name);
+            }
+        }
+
+        // Checks/unchecks items based on the current value of the enum variable
+        private void ApplyEnumValue()
+        {
+            int intVal = (int)Convert.ChangeType(enumValue, typeof(int));
+            UpdateCheckedItems(intVal);
+
+        }
+
+        [DesignerSerializationVisibilityAttribute(DesignerSerializationVisibility.Hidden)]
+        public Enum EnumValue
+        {
+            get
+            {
+                object e = Enum.ToObject(enumType, GetCurrentValue());
+                return (Enum)e;
+            }
+            set
+            {
+
+                Items.Clear();
+                enumValue = value; // Store the current enum value
+                enumType = value.GetType(); // Store enum type
+                FillEnumMembers(); // Add items for enum members
+                ApplyEnumValue(); // Check/uncheck items depending on enum value
+
+            }
+        }
+
+
+    }
+
+    // Represents an item in the checklistbox
+    public class FlagCheckedListBoxItem
+    {
+        public FlagCheckedListBoxItem(int v, string c)
+        {
+            value = v;
+            caption = c;
+        }
+
+        public override string ToString()
+        {
+            return caption;
+        }
+
+        // Returns true if the value corresponds to a single bit being set
+        public bool IsFlag
+        {
+            get
+            {
+                return ((value & (value - 1)) == 0);
+            }
+        }
+
+        // Returns true if this value is a member of the composite bit value
+        public bool IsMemberFlag(FlagCheckedListBoxItem composite)
+        {
+            return (IsFlag && ((value & composite.value) == value));
+        }
+
+        public int value;
+        public string caption;
+    }
+    #endregion
+
+    
+
+    
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/FlyoutDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/FlyoutDesigner.cs
new file mode 100644
index 00000000..099bc29b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/FlyoutDesigner.cs	
@@ -0,0 +1,50 @@
+using DevComponents.DotNetBar.Controls;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel.Design;
+using System.Text;
+
+namespace DevComponents.DotNetBar.Design
+{
+    public class FlyoutDesigner : ComponentDesigner
+    {
+        #region Implementation
+        public override void InitializeNewComponent(IDictionary defaultValues)
+        {
+            SetDefaults();
+            base.InitializeNewComponent(defaultValues);
+
+        }
+
+        private void SetDefaults()
+        {
+            IDesignerHost dh = (IDesignerHost)GetService(typeof(IDesignerHost));
+            if (dh != null)
+            {
+                if (dh.Loading)
+                {
+                    dh.LoadComplete += DesignerLoadComplete;
+                    return;
+                }
+                Flyout flyout = this.Component as Flyout;
+                if (flyout != null)
+                {
+                    System.Windows.Forms.Control parent = dh.RootComponent as System.Windows.Forms.Control;
+                    if (parent != null)
+                    {
+                        flyout.Parent = parent;
+                    }
+                }
+            }
+        }
+        void DesignerLoadComplete(object sender, EventArgs e)
+        {
+            IDesignerHost dh = (IDesignerHost)GetService(typeof(IDesignerHost));
+            if (dh != null)
+                dh.LoadComplete -= DesignerLoadComplete;
+            SetDefaults();
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/GalleryContainerDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/GalleryContainerDesigner.cs
new file mode 100644
index 00000000..55f0165e
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/GalleryContainerDesigner.cs	
@@ -0,0 +1,111 @@
+using System;
+using System.Text;
+using System.Windows.Forms;
+using System.ComponentModel.Design;
+using System.ComponentModel;
+using System.Drawing;
+using System.Collections;
+
+namespace DevComponents.DotNetBar.Design
+{
+    /// <summary>
+    /// Represents Windows Forms Designer for GalleryContainer object.
+    /// </summary>
+    public class GalleryContainerDesigner : ItemContainerDesigner
+    {
+        public override void Initialize(IComponent component)
+        {
+            base.Initialize(component);
+
+            if (component is GalleryContainer)
+                ((GalleryContainer)component).PopupGalleryItem.SetDesignMode(true);
+        }
+
+        protected override void SetDesignTimeDefaults()
+        {
+            GalleryContainer gc = this.Component as GalleryContainer;
+            gc.StretchGallery = true;
+            gc.BackgroundStyle.Class = Rendering.ElementStyleClassKeys.RibbonGalleryContainerKey;
+            base.SetDesignTimeDefaults();
+        }
+
+        protected override void AddNewItem(BaseItem newItem)
+        {
+            GalleryContainer gc = this.Component as GalleryContainer;
+            if (gc != null && !gc.DesignTimeMouseDownPoint.IsEmpty)
+            {
+                if (gc.PopupGalleryButtonBounds.Contains(gc.DesignTimeMouseDownPoint))
+                {
+                    gc.DesignTimeMouseDownPoint = Point.Empty;
+                    // Add new item to the PopupGalleryItems collection instead of to SubItems...
+                    System.ComponentModel.Design.IComponentChangeService change = this.GetService(typeof(System.ComponentModel.Design.IComponentChangeService)) as IComponentChangeService;
+                    if (change != null)
+                        change.OnComponentChanging(this.Component, TypeDescriptor.GetProperties(this.Component).Find("PopupGalleryItems", true));
+
+                    gc.PopupGalleryItems.Add(newItem);
+
+                    if (change != null)
+                        change.OnComponentChanged(this.Component, TypeDescriptor.GetProperties(this.Component).Find("PopupGalleryItems", true), null, null);
+                    return;
+                }
+            }
+
+            base.AddNewItem(newItem);
+        }
+
+        protected override void NewItemAdded(BaseItem itemAdded)
+        {
+            base.NewItemAdded(itemAdded);
+            GalleryContainer gc = this.Component as GalleryContainer;
+            if (gc != null && gc.SubItems.Contains(itemAdded) && !(gc.Parent is ButtonItem))
+                gc.EnsureVisible(itemAdded);
+        }
+
+        protected override void RecalcLayout()
+        {
+            base.RecalcLayout();
+            GalleryContainer gc = this.Component as GalleryContainer;
+            if (gc.PopupGalleryItem.Expanded && gc.PopupGalleryItem.PopupControl != null)
+            {
+                Control control = gc.PopupGalleryItem.PopupControl;
+                if (control is MenuPanel)
+                    ((MenuPanel)control).RecalcSize();
+                else if (control is Bar)
+                    ((Bar)control).RecalcLayout();
+            }
+        }
+
+        public override System.Collections.ICollection AssociatedComponents
+        {
+            get
+            {
+                System.Collections.ArrayList components = new System.Collections.ArrayList();
+                components.AddRange(base.AssociatedComponents);
+                GalleryContainer gc = this.Component as GalleryContainer;
+                if (gc == null)
+                    return components;
+                gc.PopupGalleryItems.CopyTo(components);
+                return components;
+            }
+        }
+
+        protected override void ComponentRemoved(ComponentEventArgs e)
+        {
+            if (e.Component is GalleryGroup)
+            {
+                GalleryGroup g = e.Component  as GalleryGroup;
+                GalleryContainer c = this.Component as GalleryContainer;
+                if (c != null && c.GalleryGroups.Contains(g))
+                {
+                    IComponentChangeService cc = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+                    if (cc != null)
+                        cc.OnComponentChanging(c, TypeDescriptor.GetProperties(c)["GalleryGroups"]);
+                    c.GalleryGroups.Remove(g);
+                    if (cc != null)
+                        cc.OnComponentChanged(c, TypeDescriptor.GetProperties(c)["GalleryGroups"], null, null);
+                }
+            }
+            base.ComponentRemoved(e);
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/GalleryGroupCollectionEditor.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/GalleryGroupCollectionEditor.cs
new file mode 100644
index 00000000..098af40d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/GalleryGroupCollectionEditor.cs	
@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace DevComponents.DotNetBar.Design
+{
+    /// <summary>
+    /// Summary description for ComboItemsEditor.
+    /// </summary>
+    public class GalleryGroupCollectionEditor : System.ComponentModel.Design.CollectionEditor
+    {
+        public GalleryGroupCollectionEditor(Type type)
+            : base(type)
+        {
+        }
+        protected override Type CreateCollectionItemType()
+        {
+            return typeof(GalleryGroup);
+        }
+        protected override object CreateInstance(Type itemType)
+        {
+            object item = base.CreateInstance(itemType);
+            if (item is GalleryGroup)
+            {
+                GalleryGroup group = item as GalleryGroup;
+                group.Text = group.Name;
+            }
+            return item;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/GalleryGroupConverter.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/GalleryGroupConverter.cs
new file mode 100644
index 00000000..04de6a38
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/GalleryGroupConverter.cs	
@@ -0,0 +1,34 @@
+using System;
+using System.Text;
+using System.ComponentModel;
+using System.Globalization;
+
+namespace DevComponents.DotNetBar.Design
+{
+    /// <summary>
+    /// Represents converter for GalleryGroup object.
+    /// </summary>
+    public class GalleryGroupConverter : ExpandableObjectConverter
+    {
+        public override bool CanConvertTo(ITypeDescriptorContext context, System.Type destinationType)
+        {
+            if (destinationType == typeof(GalleryGroup))
+                return true;
+
+            return base.CanConvertTo(context, destinationType);
+        }
+
+        public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, System.Type destinationType)
+        {
+            if (destinationType == typeof(System.String) && value is GalleryGroup)
+            {
+
+                GalleryGroup g = (GalleryGroup)value;
+
+                return g.Text;
+            }
+            return base.ConvertTo(context, culture, value, destinationType);
+        }
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/GalleryGroupTypeEditor.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/GalleryGroupTypeEditor.cs
new file mode 100644
index 00000000..eb1e1e98
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/GalleryGroupTypeEditor.cs	
@@ -0,0 +1,85 @@
+using System;
+using System.ComponentModel;
+using System.ComponentModel.Design;
+using System.Drawing.Design;
+using System.Windows.Forms;
+using System.Windows.Forms.Design;
+
+
+namespace DevComponents.DotNetBar.Design
+{
+    /// <summary>
+    /// Represents GalleryGroup type editor provided for Windows Forms designer support.
+    /// </summary>
+    public class GalleryGroupTypeEditor : UITypeEditor
+    {
+        private IWindowsFormsEditorService m_EdSvc = null;
+        private const string CREATE_NEW_GROUP = "<Create new group>";
+
+        public override UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext context)
+        {
+            if (context != null && context.Instance != null)
+            {
+                return UITypeEditorEditStyle.DropDown;
+            }
+            return base.GetEditStyle(context);
+        }
+
+        public override object EditValue(ITypeDescriptorContext context, IServiceProvider provider, object value)
+        {
+
+            if (context != null && context.Instance != null && provider != null)
+            {
+                m_EdSvc = (IWindowsFormsEditorService)provider.GetService(typeof(IWindowsFormsEditorService));
+                if (m_EdSvc != null)
+                {
+                    GalleryGroupCollection groups = null;
+                    BaseItem itemToAssign = null;
+                    GalleryContainer gallery = null;
+                    if (context.Instance is BaseItem)
+                    {
+                        itemToAssign = (BaseItem)context.Instance;
+                        gallery = itemToAssign.Parent as GalleryContainer;
+                        if (gallery != null)
+                            groups = gallery.GalleryGroups;
+                        else
+                        {
+                            System.Windows.Forms.MessageBox.Show("Item does not belong to the Gallery. Cannot edit groups.");
+                            return value;
+                        }
+                    }
+                    if (groups == null && context.Instance != null)
+                        System.Windows.Forms.MessageBox.Show("Unknow control using GalleryGroupTypeEditor. Cannot edit groups. [" + context.Instance.ToString() + "]");
+                    else if (groups == null)
+                        System.Windows.Forms.MessageBox.Show("Unknow control using GalleryGroupTypeEditor. Cannot edit groups. [context instance null]");
+
+                    GalleryGroup selectedGroup = gallery.GetGalleryGroup(itemToAssign);
+                    ListBox listBox = new ListBox();
+                    foreach (GalleryGroup g in groups)
+                    {
+                        listBox.Items.Add(g);
+                        if (g == selectedGroup)
+                            listBox.SelectedItem = g;
+                    }
+
+                    listBox.Items.Add(CREATE_NEW_GROUP);
+
+                    listBox.SelectedIndexChanged += new EventHandler(this.SelectedChanged);
+                    m_EdSvc.DropDownControl(listBox);
+                    if (listBox.SelectedItem is string && listBox.SelectedItem.ToString() == CREATE_NEW_GROUP)
+                        value = DesignerSupport.CreateGalleryGroup(gallery, provider);
+                    else
+                        value = listBox.SelectedItem;
+                }
+            }
+
+            return value;
+        }
+
+        private void SelectedChanged(object sender, EventArgs e)
+        {
+            if (m_EdSvc != null)
+                m_EdSvc.CloseDropDown();
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/GlyphServiceProvider.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/GlyphServiceProvider.cs
new file mode 100644
index 00000000..7a28a964
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/GlyphServiceProvider.cs	
@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.Design;
+using System.Text;
+
+namespace DevComponents.DotNetBar.Design
+{
+    internal class GlyphServiceProvider : IServiceProvider
+    {
+        private IServiceProvider source;
+
+        public GlyphServiceProvider(IServiceProvider source)
+        {
+            this.source = source;
+        }
+
+        object IServiceProvider.GetService(Type serviceType)
+        {
+            if (serviceType.Equals(typeof(ISelectionService)))
+                return (object)null;
+            return this.source.GetService(serviceType);
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/GroupPanelDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/GroupPanelDesigner.cs
new file mode 100644
index 00000000..27e644da
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/GroupPanelDesigner.cs	
@@ -0,0 +1,111 @@
+using System;
+using System.Text;
+using DevComponents.DotNetBar.Controls;
+using System.Collections;
+using System.ComponentModel.Design;
+using System.Windows.Forms;
+using System.Drawing;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar.Design
+{
+    /// <summary>
+    /// Represents the Windows Forms designer for the GroupPanel control.
+    /// </summary>
+    public class GroupPanelDesigner : System.Windows.Forms.Design.ScrollableControlDesigner
+    {
+        public override DesignerVerbCollection Verbs
+        {
+            get
+            {
+                DesignerVerb[] verbs;
+                verbs = new DesignerVerb[]
+				{
+					new DesignerVerb("Reset Style", new EventHandler(ResetStyle)),
+				};
+                return new DesignerVerbCollection(verbs);
+            }
+        }
+
+        private void ResetStyle(object sender, EventArgs e)
+        {
+            GroupPanel p = this.Control as GroupPanel;
+            if (p == null)
+                return;
+
+            IComponentChangeService change = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+            if (change != null)
+                change.OnComponentChanging(this.Component, null);
+
+            p.SetDefaultPanelStyle();
+
+            if (change != null)
+                change.OnComponentChanged(this.Component, null, null, null);
+        }
+
+#if FRAMEWORK20
+        public override void InitializeNewComponent(IDictionary defaultValues)
+        {
+            base.InitializeNewComponent(defaultValues);
+            SetDesignTimeDefaults();
+        }
+#else
+		public override void OnSetComponentDefaults()
+		{
+			base.OnSetComponentDefaults();
+            SetDesignTimeDefaults();
+		}
+#endif
+
+        private void SetDesignTimeDefaults()
+        {
+            GroupPanel p = this.Control as GroupPanel;
+            if (p == null)
+                return;
+            p.SetDefaultPanelStyle();
+        }
+
+        protected override void OnPaintAdornments(PaintEventArgs pe)
+        {
+            PanelControl p;
+            p = this.Component as PanelControl;
+            if (p.Style.Border == eStyleBorderType.None)
+                this.DrawBorder(pe.Graphics);
+            base.OnPaintAdornments(pe);
+        }
+
+        /// <summary>
+        /// Draws design-time border around the panel when panel does not have one.
+        /// </summary>
+        /// <param name="g"></param>
+        protected virtual void DrawBorder(Graphics g)
+        {
+            PanelControl panel = this.Control as PanelControl;
+            Color border = SystemColors.ControlDarkDark;
+            Rectangle rClient = this.Control.ClientRectangle;
+            Color backColor = panel.Style.BackColor;
+
+            Helpers.DrawDesignTimeSelection(g, rClient, backColor, border, 1);
+        }
+
+        protected override void WndProc(ref Message m)
+        {
+            if (m.Msg == (int)WinApi.WindowsMessages.WM_NCHITTEST)
+            {
+                GroupPanel gp = this.Control as GroupPanel;
+                if (gp != null)
+                {
+                    int x = WinApi.LOWORD(m.LParam);
+                    int y = WinApi.HIWORD(m.LParam);
+                    Point p = gp.PointToClient(new Point(x, y));
+                    if (p.Y<0)
+                    {
+                        m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.ClientArea);
+                        return;
+                    }
+                }
+            }
+            base.WndProc(ref m);
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/Helpers.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/Helpers.cs
new file mode 100644
index 00000000..bdb17241
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/Helpers.cs	
@@ -0,0 +1,69 @@
+using System;
+using System.Text;
+using System.Drawing;
+using System.Reflection;
+
+namespace DevComponents.DotNetBar.Design
+{
+    internal static class Helpers
+    {
+        internal static Bitmap LoadBitmap(string imageName)
+        {
+            DotNetBarResourcesAttribute att = Attribute.GetCustomAttribute(System.Reflection.Assembly.GetExecutingAssembly(), typeof(DotNetBarResourcesAttribute)) as DotNetBarResourcesAttribute;
+            if (att != null && att.NamespacePrefix != "")
+            {
+                return new Bitmap(Assembly.GetExecutingAssembly().GetManifestResourceStream(att.NamespacePrefix + "." + imageName));
+            }
+            else
+                return new Bitmap(typeof(DevComponents.DotNetBar.DotNetBarManager), imageName);
+        }
+
+        internal static Icon LoadIcon(string imageName)
+        {
+            DotNetBarResourcesAttribute att = Attribute.GetCustomAttribute(System.Reflection.Assembly.GetExecutingAssembly(), typeof(DotNetBarResourcesAttribute)) as DotNetBarResourcesAttribute;
+            if (att != null && att.NamespacePrefix != "")
+            {
+                return new Icon(Assembly.GetExecutingAssembly().GetManifestResourceStream(att.NamespacePrefix + "." + imageName));
+            }
+            else
+                return new Icon(typeof(DevComponents.DotNetBar.DotNetBarManager), imageName);
+        }
+
+        public static void DrawDesignTimeSelection(Graphics g, Rectangle r, Color backColor, Color border, int penWidth)
+        {
+            if (r.Width <= 0 || r.Height <= 0)
+                return;
+            if (!backColor.IsEmpty && backColor != Color.Transparent)
+            {
+                if ((double)backColor.GetBrightness() < 0.5)
+                    border = System.Windows.Forms.ControlPaint.Light(backColor);
+                else
+                    border = System.Windows.Forms.ControlPaint.Dark(backColor);
+            }
+            using (Pen pen = new Pen(border, penWidth))
+            {
+                pen.DashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
+                r.Width--;
+                r.Height--;
+                g.DrawRectangle(pen, r);
+            }
+        }
+
+        public static bool IsOffice2007Style(eDotNetBarStyle style)
+        {
+            if (style == eDotNetBarStyle.StyleManagerControlled)
+                style = StyleManager.GetEffectiveStyle();
+            return (style == eDotNetBarStyle.Office2007 || style == eDotNetBarStyle.Office2010 || style == eDotNetBarStyle.Windows7 || StyleManager.IsMetro(style));
+        }
+
+        internal static string GetItemErrorInfo(System.Xml.XmlElement xmlItem)
+        {
+            string s = "";
+            if (xmlItem.HasAttribute("assembly"))
+                s = s + xmlItem.GetAttribute("assembly");
+            if (xmlItem.HasAttribute("class"))
+                s = s + xmlItem.GetAttribute("class");
+            return s;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ItemContainerDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ItemContainerDesigner.cs
new file mode 100644
index 00000000..b16195f9
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ItemContainerDesigner.cs	
@@ -0,0 +1,80 @@
+using System;
+using System.ComponentModel.Design;
+
+namespace DevComponents.DotNetBar.Design
+{
+	/// <summary>
+	/// Represents Windows Forms Designer for ItemContainer object.
+	/// </summary>
+	public class ItemContainerDesigner:BaseItemDesigner
+	{
+		public override DesignerVerbCollection Verbs 
+		{
+			get 
+			{
+                DesignerVerb[] verbs;
+                if (this.Component is BaseItem && ((BaseItem)this.Component).ContainerControl is DevComponents.DotNetBar.Metro.MetroTilePanel)
+                {
+                    verbs = new DesignerVerb[]
+					{
+                        new DesignerVerb("Add Metro Tile", new EventHandler(CreateMetroTile)),
+                        new DesignerVerb("Add Label", new EventHandler(CreateLabel))
+				    };
+                }
+                else
+                {
+                    verbs = new DesignerVerb[]
+					{
+						new DesignerVerb("Add Button", new EventHandler(CreateButton)),
+						new DesignerVerb("Add Horizontal Container", new EventHandler(CreateHorizontalContainer)),
+						new DesignerVerb("Add Vertical Container", new EventHandler(CreateVerticalContainer)),
+                        new DesignerVerb("Add Scrollable Container", new EventHandler(CreateGallery)),
+						new DesignerVerb("Add Text Box", new EventHandler(CreateTextBox)),
+						new DesignerVerb("Add Combo Box", new EventHandler(CreateComboBox)),
+						new DesignerVerb("Add Label", new EventHandler(CreateLabel)),
+                        new DesignerVerb("Add Check Box", new EventHandler(CreateCheckBox)),
+                        new DesignerVerb("Add Micro-Chart", new EventHandler(CreateMicroChart)),
+                        new DesignerVerb("Add Switch button", new EventHandler(CreateSwitch)),
+                        new DesignerVerb("Add Control Container", new EventHandler(CreateControlContainer)),
+						new DesignerVerb("Add Color Picker", new EventHandler(CreateColorPicker)),
+                        new DesignerVerb("Add Progress-Bar", new EventHandler(CreateProgressBar)),
+                        new DesignerVerb("Add Circular Progress", new EventHandler(CreateCircularProgressItem)),
+                        new DesignerVerb("Add Rating Item", new EventHandler(CreateRatingItem)),
+                        new DesignerVerb("Add Slider", new EventHandler(CreateSlider)),
+                        new DesignerVerb("Add Range Slider", new EventHandler(CreateRangeSlider))
+#if FRAMEWORK20
+                        ,new DesignerVerb("Add Month Calendar", new EventHandler(CreateMonthCalendar))
+                        ,new DesignerVerb("Add Metro Tile", new EventHandler(CreateMetroTile))
+#endif
+				};
+                }
+				return new DesignerVerbCollection(verbs);
+			}
+		}
+
+		private void CreateVerticalContainer(object sender, EventArgs e)
+		{
+			CreateContainer(eOrientation.Vertical);
+		}
+
+		private void CreateHorizontalContainer(object sender, EventArgs e)
+		{
+			CreateContainer(eOrientation.Horizontal);
+		}
+
+		private void CreateContainer(eOrientation orientation)
+		{
+            try
+            {
+                m_CreatingItem = true;
+                DesignerSupport.CreateItemContainer(this, (BaseItem)this.Component, orientation);
+                this.RecalcLayout();
+            }
+            finally
+            {
+                m_CreatingItem = false;
+            }
+		}
+
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ItemPanelDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ItemPanelDesigner.cs
new file mode 100644
index 00000000..06e926ea
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ItemPanelDesigner.cs	
@@ -0,0 +1,234 @@
+using System;
+using System.Text;
+using System.Collections;
+using System.ComponentModel;
+using System.ComponentModel.Design;
+using System.Drawing;
+using DevComponents.DotNetBar.Rendering;
+
+namespace DevComponents.DotNetBar.Design
+{
+    /// <summary>
+    /// Represents Windows Forms Designer for the ItemPanel control.
+    /// </summary>
+    public class ItemPanelDesigner : BarBaseControlDesigner
+    {
+        public ItemPanelDesigner()
+		{
+			this.EnableItemDragDrop=true;
+		}
+
+        public override void Initialize(IComponent component)
+        {
+            base.Initialize(component);
+            if (component == null || component.Site == null || !component.Site.DesignMode)
+                return;
+
+#if !TRIAL
+            IDesignerHost dh = this.GetService(typeof(IDesignerHost)) as IDesignerHost;
+            if (dh != null)
+                dh.LoadComplete += new EventHandler(dh_LoadComplete);
+#endif
+        }
+
+#if FRAMEWORK20
+        public override void InitializeNewComponent(IDictionary defaultValues)
+        {
+            base.InitializeNewComponent(defaultValues);
+            SetDesignTimeDefaults();
+        }
+#else
+		public override void OnSetComponentDefaults()
+		{
+            SetDesignTimeDefaults();
+			base.OnSetComponentDefaults();
+		}
+#endif
+
+        protected virtual void SetDesignTimeDefaults()
+        {
+            ItemPanel panel = this.Control as ItemPanel;
+            panel.LayoutOrientation = eOrientation.Vertical;
+            panel.BackgroundStyle.Class = ElementStyleClassKeys.ItemPanelKey;
+            //panel.BackgroundStyle.Border = eStyleBorderType.Solid;
+            //panel.BackgroundStyle.BorderColor = ColorScheme.GetColor("7F9DB9");
+            //panel.BackgroundStyle.BorderWidth = 1;
+            //panel.BackgroundStyle.PaddingLeft = 1;
+            //panel.BackgroundStyle.PaddingRight = 1;
+            //panel.BackgroundStyle.PaddingTop = 1;
+            //panel.BackgroundStyle.PaddingBottom = 1;
+            //panel.BackgroundStyle.BackColor = Color.White;
+#if !TRIAL
+            string key = GetLicenseKey();
+            panel.LicenseKey = key;
+#endif
+        }
+
+        public override DesignerVerbCollection Verbs
+        {
+            get
+            {
+                Bar bar = this.Control as Bar;
+                DesignerVerb[] verbs = null;
+                verbs = new DesignerVerb[]
+						{
+							new DesignerVerb("Add Button", new EventHandler(CreateButton)),
+							new DesignerVerb("Add Horizontal Container", new EventHandler(CreateHorizontalContainer)),
+							new DesignerVerb("Add Vertical Container", new EventHandler(CreateVerticalContainer)),
+                            new DesignerVerb("Add Dock Container", new EventHandler(CreateDockContainer)),
+							new DesignerVerb("Add Text Box", new EventHandler(CreateTextBox)),
+							new DesignerVerb("Add Combo Box", new EventHandler(CreateComboBox)),
+							new DesignerVerb("Add Label", new EventHandler(CreateLabel)),
+							new DesignerVerb("Add Color Picker", new EventHandler(CreateColorPicker)),
+                            new DesignerVerb("Add Micro-Chart", new EventHandler(CreateMicroChart)),
+                            new DesignerVerb("Add Switch Button", new EventHandler(CreateSwitch)),
+                            new DesignerVerb("Add Progress bar", new EventHandler(CreateProgressBar)),
+                            new DesignerVerb("Add Check box", new EventHandler(CreateCheckBox)),
+                            new DesignerVerb("Add WinForms Control Container", new EventHandler(CreateControlContainer)),
+                            new DesignerVerb("Add Metro Tile", new EventHandler(CreateMetroTile)),
+                            new DesignerVerb("Apply Panel Style", new EventHandler(ApplyPanelStyle)),
+                            new DesignerVerb("Apply Default Style", new EventHandler(ApplyDefaultStyle))
+                        };
+                return new DesignerVerbCollection(verbs);
+            }
+        }
+
+        private void ApplyPanelStyle(object sender, EventArgs e)
+        {
+            ItemPanel p = this.Control as ItemPanel;
+            if (p == null)
+                return;
+
+            IComponentChangeService change = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+            if (change != null)
+                change.OnComponentChanging(this.Component, null);
+
+            ElementStyle bs = p.BackgroundStyle;
+            bs.Reset();
+
+            bs.Border = eStyleBorderType.Solid;
+            bs.BorderWidth = 1;
+            bs.BorderColorSchemePart = eColorSchemePart.PanelBorder;
+            bs.BackColorSchemePart = eColorSchemePart.PanelBackground;
+            bs.BackColor2SchemePart = eColorSchemePart.PanelBackground2;
+            bs.BackColorGradientAngle = 90;
+            
+            if (change != null)
+                change.OnComponentChanged(this.Component, null, null, null);
+        }
+
+        private void ApplyDefaultStyle(object sender, EventArgs e)
+        {
+            ItemPanel p = this.Control as ItemPanel;
+            if (p == null)
+                return;
+
+            IComponentChangeService change = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+            if (change != null)
+                change.OnComponentChanging(this.Component, null);
+
+            ElementStyle bs = p.BackgroundStyle;
+            bs.Reset();
+
+            bs.Border = eStyleBorderType.Solid;
+            bs.BorderWidth = 1;
+            bs.BorderColorSchemePart = eColorSchemePart.PanelBorder;
+            bs.BackColor = Color.White;
+
+            if (change != null)
+                change.OnComponentChanged(this.Component, null, null, null);
+        }
+
+        private void CreateDockContainer(object sender, EventArgs e)
+        {
+            CreateDockContainer(this.GetItemContainer());
+        }
+        private void CreateVerticalContainer(object sender, EventArgs e)
+        {
+            CreateContainer(this.GetItemContainer(), eOrientation.Vertical);
+        }
+
+        protected virtual void CreateHorizontalContainer(object sender, EventArgs e)
+        {
+            CreateContainer(this.GetItemContainer(), eOrientation.Horizontal);
+        }
+
+        protected virtual ItemContainer CreateContainer(BaseItem parent, eOrientation orientation)
+        {
+            ItemContainer container = null;
+            m_CreatingItem = true;
+            try
+            {
+                container = DesignerSupport.CreateItemContainer(this, parent, orientation);
+            }
+            finally
+            {
+                m_CreatingItem = false;
+            }
+            this.RecalcLayout();
+
+            return container;
+        }
+
+        protected virtual ItemDockContainer CreateDockContainer(BaseItem parent)
+        {
+            ItemDockContainer container = null;
+            m_CreatingItem = true;
+            try
+            {
+                container = DesignerSupport.CreateItemDockContainer(this, parent);
+            }
+            finally
+            {
+                m_CreatingItem = false;
+            }
+            this.RecalcLayout();
+
+            return container;
+        }
+
+        protected override bool GetHitTest(Point pt)
+        {
+            ItemPanel panel = this.Control as ItemPanel;
+            if (panel != null && panel.IsHandleCreated && panel.AutoScroll)
+            {
+                Point p = panel.PointToClient(pt);
+                if (panel.VScrollBar != null && panel.VScrollBar.Bounds.Contains(p))
+                    return true;
+                if (panel.HScrollBar != null && panel.HScrollBar.Bounds.Contains(p))
+                    return true;
+
+            }
+            return base.GetHitTest(pt);
+        }
+
+        #region Licensing Stuff
+#if !TRIAL
+        protected string GetLicenseKey()
+        {
+            string key = "";
+            Microsoft.Win32.RegistryKey regkey = Microsoft.Win32.Registry.LocalMachine;
+            regkey = regkey.OpenSubKey("Software\\DevComponents\\Licenses", false);
+            if (regkey != null)
+            {
+                object keyValue = regkey.GetValue("DevComponents.DotNetBar.DotNetBarManager2");
+                if (keyValue != null)
+                    key = keyValue.ToString();
+            }
+            return key;
+        }
+        private void dh_LoadComplete(object sender, EventArgs e)
+        {
+            IDesignerHost dh = this.GetService(typeof(IDesignerHost)) as IDesignerHost;
+            if (dh != null)
+                dh.LoadComplete -= new EventHandler(dh_LoadComplete);
+
+            string key = GetLicenseKey();
+            ItemPanel bar = this.Control as ItemPanel;
+            if (key != "" && bar != null && bar.LicenseKey == "" && bar.LicenseKey != key)
+                TypeDescriptor.GetProperties(bar)["LicenseKey"].SetValue(bar, key);
+        }
+#endif
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ItemSelectorTypeEditor.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ItemSelectorTypeEditor.cs
new file mode 100644
index 00000000..f83698eb
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ItemSelectorTypeEditor.cs	
@@ -0,0 +1,90 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows.Forms.Design;
+using System.ComponentModel;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.Metro;
+using System.ComponentModel.Design;
+using System.Drawing.Design;
+
+namespace DevComponents.DotNetBar.Design
+{
+    public class ItemSelectorTypeEditor : System.Drawing.Design.UITypeEditor
+    {
+        private IWindowsFormsEditorService edSvc = null;
+        private Type[] _AvailableTypes = new Type[] {
+            typeof(ButtonItem),
+            typeof(CheckBoxItem),
+            typeof(MetroTileItem),
+            typeof(LabelItem)
+        };
+
+        public override object EditValue(ITypeDescriptorContext context, IServiceProvider provider, object value)
+        {
+            if (context != null
+                && context.Instance != null
+                && provider != null)
+            {
+                edSvc = provider.GetService(typeof(IWindowsFormsEditorService)) as IWindowsFormsEditorService;
+
+                if (edSvc != null)
+                {
+                    ListBox lb = new ListBox();
+                    lb.SelectedIndexChanged += new EventHandler(this.SelectedChanged);
+
+                    for (int i = 0; i < _AvailableTypes.Length; i++)
+                    {
+                        Type itemType = _AvailableTypes[i];
+                        lb.Items.Add(itemType.Name);
+                        if (value != null && value.GetType() == itemType)
+                            lb.SelectedIndex = i;
+                    }
+
+                    edSvc.DropDownControl(lb);
+                    if (lb.SelectedItem != null)
+                    {
+                        int index = lb.SelectedIndex;
+                        if (value == null || _AvailableTypes[index] != value.GetType())
+                        {
+                            IDesignerHost dh = provider.GetService(typeof(IDesignerHost)) as IDesignerHost;
+                            if (dh != null)
+                            {
+                                DesignerTransaction trans = dh.CreateTransaction(BarBaseControlDesigner.CreatingItemTransactionDescription);
+                                if (value is IComponent)
+                                    dh.DestroyComponent((IComponent)value);
+                                value = dh.CreateComponent(_AvailableTypes[index]);
+                                trans.Commit();
+                            }
+                        }
+                    }
+
+                    return value;
+                }
+            }
+
+            return value;
+        }
+
+        private void SelectedChanged(object sender, EventArgs e)
+        {
+            if (edSvc != null)
+                edSvc.CloseDropDown();
+        }
+
+        /// <summary>
+        /// Gets the editor style used by the EditValue method.
+        /// </summary>
+        /// <param name="context">An ITypeDescriptorContext that can be used to gain additional context information.</param>
+        /// <returns>A UITypeEditorEditStyle value that indicates the style of editor used by EditValue. If the UITypeEditor does not support this method, then GetEditStyle will return None</returns>
+        public override UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext context)
+        {
+            if (context != null && context.Instance != null)
+            {
+                return UITypeEditorEditStyle.DropDown;
+            }
+            return base.GetEditStyle(context);
+        }
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/LabelXDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/LabelXDesigner.cs
new file mode 100644
index 00000000..0cacbd06
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/LabelXDesigner.cs	
@@ -0,0 +1,39 @@
+#if FRAMEWORK20
+using System;
+using System.Text;
+using System.Windows.Forms.Design;
+using System.Collections;
+using System.Windows.Forms.Design.Behavior;
+
+namespace DevComponents.DotNetBar.Design
+{
+    public class LabelXDesigner : ControlDesigner
+    {
+        public override System.Collections.IList SnapLines
+        {
+            get
+            {
+                LabelX l = this.Control as LabelX;
+                IList snapLines = base.SnapLines;
+                
+                int fontBaseOffset = (int)Math.Floor(l.Font.Size * l.Font.FontFamily.GetCellDescent(l.Font.Style) / l.Font.FontFamily.GetEmHeight(l.Font.Style));
+                if (l.TextLineAlignment == System.Drawing.StringAlignment.Center)
+                {
+                    fontBaseOffset = (int)Math.Floor((double)(l.Height - l.Font.Height) / 2) + l.Font.Height-fontBaseOffset;
+                }
+                else if (l.TextLineAlignment == System.Drawing.StringAlignment.Far)
+                {
+                    fontBaseOffset = l.Height - fontBaseOffset;
+                }
+                else
+                {
+                    fontBaseOffset = l.Font.Height - fontBaseOffset;
+                }
+
+                snapLines.Add(new SnapLine(SnapLineType.Baseline, fontBaseOffset, SnapLinePriority.Medium));
+                return snapLines;
+            }
+        }
+    }
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ListBoxAdvDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ListBoxAdvDesigner.cs
new file mode 100644
index 00000000..8967ef1d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ListBoxAdvDesigner.cs	
@@ -0,0 +1,164 @@
+using DevComponents.DotNetBar.Rendering;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.ComponentModel.Design;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Design
+{
+    public class ListBoxAdvDesigner : BarBaseControlDesigner
+    {
+        public ListBoxAdvDesigner()
+        {
+            this.EnableItemDragDrop = true;
+        }
+
+        public override void Initialize(IComponent component)
+        {
+            base.Initialize(component);
+            if (component == null || component.Site == null || !component.Site.DesignMode)
+                return;
+
+#if !TRIAL
+            IDesignerHost dh = this.GetService(typeof(IDesignerHost)) as IDesignerHost;
+            if (dh != null)
+                dh.LoadComplete += new EventHandler(dh_LoadComplete);
+#endif
+        }
+
+#if FRAMEWORK20
+        public override void InitializeNewComponent(IDictionary defaultValues)
+        {
+            base.InitializeNewComponent(defaultValues);
+            SetDesignTimeDefaults();
+        }
+#else
+		public override void OnSetComponentDefaults()
+		{
+            SetDesignTimeDefaults();
+			base.OnSetComponentDefaults();
+		}
+#endif
+
+        protected virtual void SetDesignTimeDefaults()
+        {
+            ListBoxAdv panel = this.Control as ListBoxAdv;
+            panel.BackgroundStyle.Class = ElementStyleClassKeys.ListBoxAdvKey;
+            panel.AutoScroll = true;
+#if !TRIAL
+            string key = GetLicenseKey();
+            panel.LicenseKey = key;
+#endif
+        }
+
+        public override DesignerVerbCollection Verbs
+        {
+            get
+            {
+                Bar bar = this.Control as Bar;
+                DesignerVerb[] verbs = null;
+                verbs = new DesignerVerb[]
+						{
+							new DesignerVerb("Add ListBoxItem", new EventHandler(CreateListBoxItem))
+                        };
+                return new DesignerVerbCollection(verbs);
+            }
+        }
+
+        protected virtual void CreateListBoxItem(object sender, EventArgs e)
+        {
+            OnSubItemsChanging();
+            CreateListBoxItem(this.GetDefaultNewItemContainer());
+            OnSubItemsChanged();
+        }
+
+        protected virtual void CreateListBoxItem(BaseItem parent)
+        {
+            if (parent == null)
+                return;
+            ListBoxAdv listBox = this.Control as ListBoxAdv;
+            IDesignerHost dh = (IDesignerHost)GetService(typeof(IDesignerHost));
+            if (dh != null)
+            {
+                DesignerTransaction trans = dh.CreateTransaction("Adding new item");
+                try
+                {
+                    m_CreatingItem = true;
+                    ListBoxItem item = dh.CreateComponent(typeof(ListBoxItem)) as ListBoxItem;
+                    if (item == null)
+                        return;
+
+                    IComponentChangeService cc = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+                    if (listBox != null && cc != null)
+                        cc.OnComponentChanging(listBox, TypeDescriptor.GetProperties(typeof(ListBoxAdv))["Items"]);
+                    item.Text = string.Format("Item {0}", parent.SubItems.Count + 1);
+                    listBox.Items.Add(item);
+
+                    this.RecalcLayout();
+
+                    if (listBox != null && cc != null)
+                        cc.OnComponentChanged(listBox, TypeDescriptor.GetProperties(typeof(ListBoxAdv))["Items"], null, null);
+
+                    OnitemCreated(item);
+                }
+                catch
+                {
+                    trans.Cancel();
+                }
+                finally
+                {
+                    if (!trans.Canceled)
+                        trans.Commit();
+                    m_CreatingItem = false;
+                }
+            }
+        }
+
+
+        protected override bool GetHitTest(Point pt)
+        {
+            ListBoxAdv panel = this.Control as ListBoxAdv;
+            if (panel != null && panel.IsHandleCreated && panel.AutoScroll)
+            {
+                Point p = panel.PointToClient(pt);
+                if (panel.VScrollBar != null && panel.VScrollBar.Bounds.Contains(p))
+                    return true;
+                if (panel.HScrollBar != null && panel.HScrollBar.Bounds.Contains(p))
+                    return true;
+
+            }
+            return base.GetHitTest(pt);
+        }
+
+        #region Licensing Stuff
+#if !TRIAL
+        protected string GetLicenseKey()
+        {
+            string key = "";
+            Microsoft.Win32.RegistryKey regkey = Microsoft.Win32.Registry.LocalMachine;
+            regkey = regkey.OpenSubKey("Software\\DevComponents\\Licenses", false);
+            if (regkey != null)
+            {
+                object keyValue = regkey.GetValue("DevComponents.DotNetBar.DotNetBarManager2");
+                if (keyValue != null)
+                    key = keyValue.ToString();
+            }
+            return key;
+        }
+        private void dh_LoadComplete(object sender, EventArgs e)
+        {
+            IDesignerHost dh = this.GetService(typeof(IDesignerHost)) as IDesignerHost;
+            if (dh != null)
+                dh.LoadComplete -= new EventHandler(dh_LoadComplete);
+
+            string key = GetLicenseKey();
+            ItemPanel bar = this.Control as ItemPanel;
+            if (key != "" && bar != null && bar.LicenseKey == "" && bar.LicenseKey != key)
+                TypeDescriptor.GetProperties(bar)["LicenseKey"].SetValue(bar, key);
+        }
+#endif
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/MaskedTextBoxAdvDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/MaskedTextBoxAdvDesigner.cs
new file mode 100644
index 00000000..deb06073
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/MaskedTextBoxAdvDesigner.cs	
@@ -0,0 +1,251 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows.Forms.Design;
+using System.ComponentModel;
+using DevComponents.DotNetBar.Controls;
+using System.Collections;
+using DevComponents.DotNetBar.Rendering;
+using System.Drawing.Design;
+using System.ComponentModel.Design;
+using System.Reflection;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Design
+{
+    public class MaskedTextBoxAdvDesigner : ControlDesigner
+    {
+        public override void InitializeNewComponent(IDictionary defaultValues)
+        {
+            base.InitializeNewComponent(defaultValues);
+            MaskedTextBoxAdv control = this.Control as MaskedTextBoxAdv;
+            control.BackgroundStyle.Class = ElementStyleClassKeys.TextBoxBorderKey;
+            control.ButtonClear.Visible = true;
+            control.Height = control.PreferredHeight;
+            control.Text = "";
+            control.Style = eDotNetBarStyle.StyleManagerControlled;
+        }
+
+        public override SelectionRules SelectionRules
+        {
+            get
+            {
+                return (base.SelectionRules & ~(SelectionRules.BottomSizeable | SelectionRules.TopSizeable));
+            }
+        }
+
+        protected override void PreFilterProperties(IDictionary properties)
+        {
+            base.PreFilterProperties(properties);
+            string[] strArray = new string[] { "Text", "PasswordChar" };
+            Attribute[] attributes = new Attribute[0];
+            for (int i = 0; i < strArray.Length; i++)
+            {
+                PropertyDescriptor oldPropertyDescriptor = (PropertyDescriptor)properties[strArray[i]];
+                if (oldPropertyDescriptor != null)
+                {
+                    properties[strArray[i]] = TypeDescriptor.CreateProperty(typeof(MaskedTextBoxAdvDesigner), oldPropertyDescriptor, attributes);
+                }
+            }
+        }
+
+        public char PasswordChar
+        {
+            get
+            {
+                MaskedTextBoxAdv control = this.Control as MaskedTextBoxAdv;
+                if (control.UseSystemPasswordChar)
+                {
+                    control.UseSystemPasswordChar = false;
+                    char passwordChar = control.PasswordChar;
+                    control.UseSystemPasswordChar = true;
+                    return passwordChar;
+                }
+                return control.PasswordChar;
+            }
+            set
+            {
+                MaskedTextBoxAdv control = this.Control as MaskedTextBoxAdv;
+                control.PasswordChar = value;
+            }
+        }
+
+        public string Text
+        {
+            get
+            {
+                MaskedTextBoxAdv control = this.Control as MaskedTextBoxAdv;
+                if (string.IsNullOrEmpty(control.Mask))
+                {
+                    return control.Text;
+                }
+                return control.MaskedTextProvider.ToString(false, false);
+            }
+            set
+            {
+                MaskedTextBoxAdv control = this.Control as MaskedTextBoxAdv;
+                if (string.IsNullOrEmpty(control.Mask))
+                {
+                    control.Text = value;
+                }
+                else
+                {
+                    bool resetOnSpace = control.ResetOnSpace;
+                    bool resetOnPrompt = control.ResetOnPrompt;
+                    bool skipLiterals = control.SkipLiterals;
+                    control.ResetOnSpace = true;
+                    control.ResetOnPrompt = true;
+                    control.SkipLiterals = true;
+                    control.Text = value;
+                    control.ResetOnSpace = resetOnSpace;
+                    control.ResetOnPrompt = resetOnPrompt;
+                    control.SkipLiterals = skipLiterals;
+                }
+            }
+        }
+
+        private DesignerActionListCollection _Actions = null;
+        public override DesignerActionListCollection ActionLists
+        {
+            get
+            {
+                if (this._Actions == null)
+                {
+                    this._Actions = new DesignerActionListCollection();
+                    this._Actions.Add(new MaskedTextBoxAdvDesignerActionList(this));
+                }
+                return this._Actions;
+            }
+        }
+
+        public override DesignerVerbCollection Verbs
+        {
+            get
+            {
+                if (this._Verbs == null)
+                {
+                    this._Verbs = new DesignerVerbCollection();
+                    this._Verbs.Add(new DesignerVerb("Set Mask...", new EventHandler(this.OnVerbSetMask)));
+                }
+                return this._Verbs;
+            }
+        }
+
+        private DesignerVerbCollection _Verbs = null;
+        private void OnVerbSetMask(object sender, EventArgs e)
+        {
+            new MaskedTextBoxAdvDesignerActionList(this).SetMask();
+        }
+    }
+
+    public class MaskedTextBoxAdvDesignerActionList : DesignerActionList
+    {
+        // Fields
+        private ITypeDiscoveryService discoverySvc;
+        private IHelpService helpService;
+        private MaskedTextBoxAdv maskedTextBox;
+        private IUIService uiSvc;
+
+        // Methods
+        public MaskedTextBoxAdvDesignerActionList(MaskedTextBoxAdvDesigner designer)
+            : base(designer.Component)
+        {
+            this.maskedTextBox = (MaskedTextBoxAdv)designer.Component;
+            this.discoverySvc = base.GetService(typeof(ITypeDiscoveryService)) as ITypeDiscoveryService;
+            this.uiSvc = base.GetService(typeof(IUIService)) as IUIService;
+            this.helpService = base.GetService(typeof(IHelpService)) as IHelpService;
+            if (this.discoverySvc != null)
+            {
+                IUIService uiSvc = this.uiSvc;
+            }
+        }
+
+        public override DesignerActionItemCollection GetSortedActionItems()
+        {
+            DesignerActionItemCollection items = new DesignerActionItemCollection();
+            items.Add(new DesignerActionMethodItem(this, "SetMask", "Set Mask..."));
+            return items;
+        }
+
+        public void SetMask()
+        {
+            string str = MaskAdvPropertyEditor.EditMask(this.discoverySvc, this.uiSvc, this.maskedTextBox, this.helpService);
+            if (str != null)
+            {
+                PropertyDescriptor descriptor = TypeDescriptor.GetProperties(this.maskedTextBox)["Mask"];
+                if (descriptor != null)
+                {
+                    descriptor.SetValue(this.maskedTextBox, str);
+                }
+            }
+        }
+    }
+
+    public class MaskAdvPropertyEditor : UITypeEditor
+    {
+        // Methods
+        internal static string EditMask(ITypeDiscoveryService discoverySvc, IUIService uiSvc, MaskedTextBoxAdv instance, IHelpService helpService)
+        {
+            string mask = null;
+            Type formType = Type.GetType("System.Windows.Forms.Design.MaskDesignerDialog, System.Design, Version= 2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a");
+            ConstructorInfo ci = formType.GetConstructor(new Type[] { typeof(MaskedTextBox), typeof(IHelpService) });
+            Form form = ci.Invoke(new object[]{instance.MaskedTextBox, helpService}) as Form;
+            
+            try
+            {
+                MethodInfo mi = formType.GetMethod("DiscoverMaskDescriptors");
+                mi.Invoke(form, new object[]{discoverySvc});
+                //form.DiscoverMaskDescriptors(discoverySvc);
+                DialogResult result = (uiSvc != null) ? uiSvc.ShowDialog(form) : form.ShowDialog();
+                if (result == DialogResult.OK)
+                {
+                    PropertyInfo pi = formType.GetProperty("Mask");
+                    mask = (string)pi.GetValue(form, null);
+                    pi = formType.GetProperty("ValidatingType");
+                    Type validatingType = pi.GetValue(form, null) as Type;
+                    //mask = form.Mask;
+                    if (validatingType == instance.ValidatingType)
+                    {
+                        return mask;
+                    }
+                    instance.ValidatingType = validatingType;
+                }
+            }
+            finally
+            {
+                form.Dispose();
+            }
+            return mask;
+        }
+
+        public override object EditValue(ITypeDescriptorContext context, IServiceProvider provider, object value)
+        {
+            if ((context != null) && (provider != null))
+            {
+                ITypeDiscoveryService discoverySvc = (ITypeDiscoveryService)provider.GetService(typeof(ITypeDiscoveryService));
+                IUIService service = (IUIService)provider.GetService(typeof(IUIService));
+                IHelpService helpService = (IHelpService)provider.GetService(typeof(IHelpService));
+                string str = EditMask(discoverySvc, service, context.Instance as MaskedTextBoxAdv, helpService);
+                if (str != null)
+                {
+                    return str;
+                }
+            }
+            return value;
+        }
+
+        public override UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext context)
+        {
+            return UITypeEditorEditStyle.Modal;
+        }
+
+        public override bool GetPaintValueSupported(ITypeDescriptorContext context)
+        {
+            return false;
+        }
+    }
+
+
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/Metro/MetroApplicationButtonDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/Metro/MetroApplicationButtonDesigner.cs
new file mode 100644
index 00000000..b5676df4
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/Metro/MetroApplicationButtonDesigner.cs	
@@ -0,0 +1,257 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel.Design;
+using System.ComponentModel;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.Metro;
+
+namespace DevComponents.DotNetBar.Design
+{ 
+    /// <summary>
+    /// Provides designer for MetroAppButton.
+    /// </summary>
+    public class MetroAppButtonDesigner : BaseItemDesigner
+    {
+        #region Internal Implementation
+        protected override DesignerVerb[] GetVerbs()
+        {
+            DesignerVerb[] baseVerbs = base.GetVerbs();
+            int verbsCount = baseVerbs.Length + 1;
+            if (IsBackstageSet) verbsCount = 1;
+
+            bool includeClearSubItems = false;
+            MetroAppButton appButton = this.Component as MetroAppButton;
+            if (appButton != null && appButton.BackstageTab != null && appButton.SubItems.Count > 0)
+            {
+                includeClearSubItems = true;
+                verbsCount++;
+            }
+
+            int verbsOffset = 1;
+            DesignerVerb[] verbs = new DesignerVerb[verbsCount];
+            verbs[0] = new DesignerVerb((IsBackstageSet ? "Remove Backstage" : "Set Backstage"), new EventHandler(CreateBackstageTab));
+
+            if (includeClearSubItems)
+            {
+                verbs[1] = new DesignerVerb("Clear Sub-items", new EventHandler(ClearSubItems));
+                verbsOffset++;
+            }
+
+            if (!IsBackstageSet)
+            {
+                for (int i = 0; i < baseVerbs.Length; i++)
+                {
+                    verbs[i + verbsOffset] = baseVerbs[i];
+                }
+            }
+
+            return verbs;
+        }
+
+        private void ClearSubItems(object sender, EventArgs e)
+        {
+            if (MessageBox.Show("Are you sure you want to delete all sub-items?", "DotNetBar Application Button", MessageBoxButtons.YesNo) == DialogResult.No) return;
+
+            IDesignerHost dh = GetService(typeof(IDesignerHost)) as IDesignerHost;
+            IComponentChangeService cc = GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+            if (dh == null) return;
+            MetroAppButton appButton = (MetroAppButton)this.Component;
+            if (appButton.SubItems.Count == 0) return;
+
+            DesignerTransaction trans = dh.CreateTransaction("Clearing Application Button SubItems");
+            try
+            {
+                cc.OnComponentChanging(appButton, TypeDescriptor.GetProperties(appButton)["SubItems"]);
+                BaseItem[] items = new BaseItem[appButton.SubItems.Count];
+                appButton.SubItems.CopyTo(items, 0);
+                foreach (BaseItem item in items)
+                {
+                    appButton.SubItems.Remove(item);
+                    dh.DestroyComponent(item);
+                }
+                cc.OnComponentChanged(appButton, TypeDescriptor.GetProperties(appButton)["SubItems"], null, null);
+            }
+            catch
+            {
+                trans.Cancel();
+                throw;
+            }
+            finally
+            {
+                if (!trans.Canceled)
+                    trans.Commit();
+            }
+        }
+
+        private bool IsBackstageSet
+        {
+            get
+            {
+                MetroAppButton appButton = (MetroAppButton)this.Component;
+                if (appButton != null && appButton.BackstageTab != null) return true;
+                return false;
+            }
+        }
+
+        private void CreateBackstageTab()
+        {
+            IDesignerHost dh = GetService(typeof(IDesignerHost)) as IDesignerHost;
+            IComponentChangeService cc = GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+            if (dh == null) return;
+
+            MetroAppButton appButton = (MetroAppButton)this.Component;
+            if (appButton.BackstageTab != null)
+            {
+                DesignerTransaction trans1 = dh.CreateTransaction("Removing Backstage tab");
+                try
+                {
+                    SuperTabControl backstageTab = appButton.BackstageTab;
+                    SetProperty(appButton, "BackstageTab", null);
+                    backstageTab.Visible = true;
+                    SetProperty(backstageTab, "Location", new System.Drawing.Point(0, 150));
+                    SetProperty(backstageTab, "Size", new System.Drawing.Size(250, 350));
+                    ISelectionService selection = (ISelectionService)GetService(typeof(ISelectionService));
+                    if (selection != null) selection.SetSelectedComponents(new Control[] { backstageTab }, SelectionTypes.Primary);
+                }
+                catch
+                {
+                    trans1.Cancel();
+                    throw;
+                }
+                finally
+                {
+                    if (!trans1.Canceled)
+                        trans1.Commit();
+                }
+                return;
+            }
+
+            DesignerTransaction trans = dh.CreateTransaction("Create Backstage");
+            try
+            {
+
+                if (appButton.Expanded) appButton.Expanded = false;
+                SuperTabControl backstageTab = (SuperTabControl)dh.CreateComponent(typeof(SuperTabControl));
+                SetProperty(appButton, "BackstageTab", backstageTab);
+
+                Control root = dh.RootComponent as Control;
+                if (root != null)
+                {
+                    cc.OnComponentChanging(root, TypeDescriptor.GetProperties(root)["Controls"]);
+                    root.Controls.Add(backstageTab);
+                    cc.OnComponentChanged(root, TypeDescriptor.GetProperties(root)["Controls"], null, null);
+                }
+                SetupBackstageTab(backstageTab, dh);
+            }
+            catch
+            {
+                trans.Cancel();
+                throw;
+            }
+            finally
+            {
+                if (!trans.Canceled)
+                    trans.Commit();
+            }
+        }
+        private void CreateBackstageTab(object sender, EventArgs e)
+        {
+            CreateBackstageTab();
+        }
+
+        private void SetupBackstageTab(SuperTabControl backstageTab, IDesignerHost dh)
+        {
+            backstageTab.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+                        | System.Windows.Forms.AnchorStyles.Left)
+                        | System.Windows.Forms.AnchorStyles.Right)));
+            backstageTab.ControlBox.Visible = false;
+            backstageTab.ItemPadding.Left = 6;
+            backstageTab.ItemPadding.Right = 4;
+            backstageTab.ItemPadding.Top = 4;
+            backstageTab.ReorderTabsEnabled = false;
+            try
+            {
+                backstageTab.SelectedTabFont = new System.Drawing.Font("Segoe UI", 9.75F);
+            }
+            catch { }
+            backstageTab.SelectedTabIndex = 0;
+            backstageTab.Size = new System.Drawing.Size(614, 315);
+            backstageTab.TabAlignment = DevComponents.DotNetBar.eTabStripAlignment.Left;
+            try
+            {
+                backstageTab.TabFont = new System.Drawing.Font("Segoe UI", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            }
+            catch { }
+            backstageTab.TabHorizontalSpacing = 16;
+            backstageTab.TabStyle = DevComponents.DotNetBar.eSuperTabStyle.Office2010BackstageBlue;
+            backstageTab.TabVerticalSpacing = 8;
+
+            SuperTabControlDesigner tabDesigner = dh.GetDesigner(backstageTab) as SuperTabControlDesigner;
+            if (tabDesigner != null)
+            {
+                ButtonItem button;
+                // Save button
+                button = tabDesigner.CreateButton();
+                SetProperty(button, "Text", "Save");
+                SetProperty(button, "KeyTips", "S");
+                SetProperty(button, "Image", RibbonControlDesigner.LoadImage("Save16.png"));
+
+                // Open
+                button = tabDesigner.CreateButton();
+                SetProperty(button, "Text", "Open");
+                SetProperty(button, "KeyTips", "O");
+                SetProperty(button, "Image", RibbonControlDesigner.LoadImage("Open.png"));
+
+                // Close
+                button = tabDesigner.CreateButton();
+                SetProperty(button, "Text", "Close");
+                SetProperty(button, "KeyTips", "C");
+                SetProperty(button, "Image", RibbonControlDesigner.LoadImage("Close16.png"));
+
+                SuperTabItem tab;
+                tab = tabDesigner.CreateNewTab();
+                SetProperty(tab, "Text", "Recent");
+                SetProperty(tab, "KeyTips", "R");
+                //SetProperty((SuperTabControlPanel)tab.AttachedControl, "BackgroundImage", RibbonControlDesigner.LoadImage("BlueBackstageBgImage.png"));
+                //SetProperty((SuperTabControlPanel)tab.AttachedControl, "BackgroundImagePosition", DevComponents.DotNetBar.eStyleBackgroundImage.BottomRight);
+
+                tab = tabDesigner.CreateNewTab();
+                SetProperty(tab, "Text", "New");
+                SetProperty(tab, "KeyTips", "N");
+                //SetProperty((SuperTabControlPanel)tab.AttachedControl, "BackgroundImage", RibbonControlDesigner.LoadImage("BlueBackstageBgImage.png"));
+                //SetProperty((SuperTabControlPanel)tab.AttachedControl, "BackgroundImagePosition", DevComponents.DotNetBar.eStyleBackgroundImage.BottomRight);
+
+                tab = tabDesigner.CreateNewTab();
+                SetProperty(tab, "Text", "Print");
+                SetProperty(tab, "KeyTips", "P");
+                //SetProperty((SuperTabControlPanel)tab.AttachedControl, "BackgroundImage", RibbonControlDesigner.LoadImage("BlueBackstageBgImage.png"));
+                //SetProperty((SuperTabControlPanel)tab.AttachedControl, "BackgroundImagePosition", DevComponents.DotNetBar.eStyleBackgroundImage.BottomRight);
+
+                tab = tabDesigner.CreateNewTab();
+                SetProperty(tab, "Text", "Help");
+                SetProperty(tab, "KeyTips", "H");
+                SetProperty((SuperTabControlPanel)tab.AttachedControl, "BackgroundImage", RibbonControlDesigner.LoadImage("BlueBackstageBgImage.png"));
+                SetProperty((SuperTabControlPanel)tab.AttachedControl, "BackgroundImagePosition", DevComponents.DotNetBar.eStyleBackgroundImage.BottomRight);
+
+                // Options
+                button = tabDesigner.CreateButton();
+                SetProperty(button, "Text", "Options");
+                SetProperty(button, "KeyTips", "T");
+                SetProperty(button, "Image", RibbonControlDesigner.LoadImage("Options2.png"));
+
+                // Exit
+                button = tabDesigner.CreateButton();
+                SetProperty(button, "Text", "Exit");
+                SetProperty(button, "KeyTips", "X");
+                SetProperty(button, "Image", RibbonControlDesigner.LoadImage("Exit2.png"));
+            }
+        }
+
+        private void SetProperty(object targetObject, string propertyName, object propertyValue)
+        {
+            TypeDescriptor.GetProperties(targetObject)[propertyName].SetValue(targetObject, propertyValue);
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/Metro/MetroColorThemeEditor.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/Metro/MetroColorThemeEditor.cs
new file mode 100644
index 00000000..1cbfa736
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/Metro/MetroColorThemeEditor.cs	
@@ -0,0 +1,75 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows.Forms.Design;
+using System.ComponentModel;
+using System.Windows.Forms;
+using System.Drawing.Design;
+using DevComponents.DotNetBar.Metro.ColorTables;
+
+namespace DevComponents.DotNetBar.Design.Metro
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public class MetroColorThemeEditor : System.Drawing.Design.UITypeEditor
+    {
+        private IWindowsFormsEditorService edSvc = null;
+        public override object EditValue(ITypeDescriptorContext context, IServiceProvider provider, object value)
+        {
+            if (context != null
+                && context.Instance != null
+                && provider != null)
+            {
+                edSvc = provider.GetService(typeof(IWindowsFormsEditorService)) as IWindowsFormsEditorService;
+
+                if (edSvc != null)
+                {
+                    ListBox lb = new ListBox();
+                    lb.SelectedIndexChanged += new EventHandler(this.SelectedChanged);
+                    MetroColorGeneratorParameters currentParams = (MetroColorGeneratorParameters)value;
+                    MetroColorGeneratorParameters[] metroThemes = MetroColorGeneratorParameters.GetAllPredefinedThemes();
+                    string selectedTheme = null;
+                    foreach (MetroColorGeneratorParameters mt in metroThemes)
+                    {
+                        lb.Items.Add(mt.ThemeName);
+                        if (currentParams.BaseColor == mt.BaseColor && currentParams.CanvasColor == mt.CanvasColor)
+                        {
+                            lb.SelectedItem = mt.ThemeName;
+                            selectedTheme = mt.ThemeName;
+                        }
+                    }
+
+                    edSvc.DropDownControl(lb);
+                    if (lb.SelectedItem != null && selectedTheme != (string)lb.SelectedItem)
+                    {
+                        return metroThemes[lb.SelectedIndex];
+                    }
+                }
+            }
+
+            return value;
+        }
+
+        private void SelectedChanged(object sender, EventArgs e)
+        {
+            if (edSvc != null)
+                edSvc.CloseDropDown();
+        }
+
+        /// <summary>
+        /// Gets the editor style used by the EditValue method.
+        /// </summary>
+        /// <param name="context">An ITypeDescriptorContext that can be used to gain additional context information.</param>
+        /// <returns>A UITypeEditorEditStyle value that indicates the style of editor used by EditValue. If the UITypeEditor does not support this method, then GetEditStyle will return None</returns>
+        public override UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext context)
+        {
+            if (context != null && context.Instance != null)
+            {
+                return UITypeEditorEditStyle.DropDown;
+            }
+            return base.GetEditStyle(context);
+        }
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/Metro/MetroShellDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/Metro/MetroShellDesigner.cs
new file mode 100644
index 00000000..d7bc2790
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/Metro/MetroShellDesigner.cs	
@@ -0,0 +1,725 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using DevComponents.DotNetBar.Metro;
+using System.ComponentModel;
+using System.ComponentModel.Design;
+using System.Windows.Forms;
+using System.Collections;
+using System.Drawing;
+using System.IO;
+
+namespace DevComponents.DotNetBar.Design
+{
+    // <summary>
+    /// Represents Windows Forms designer for MetroTab control.
+    /// </summary>
+    public class MetroShellDesigner : BarBaseControlDesigner
+    {
+        #region Private Variables
+        private bool m_QuickAccessToolbarSelected = false;
+        #endregion
+
+        #region Internal Implementation
+
+        public MetroShellDesigner()
+        {
+            this.EnableItemDragDrop = true;
+            this.AcceptExternalControls = false;
+        }
+
+        public override void Initialize(IComponent component)
+        {
+            base.Initialize(component);
+            if (!component.Site.DesignMode)
+                return;
+            MetroShell c = component as MetroShell;
+            if (c != null)
+            {
+                c.SetDesignMode();
+                //this.Expanded = c.Expanded;
+            }
+            this.EnableDragDrop(false);
+        }
+
+        public override bool CanParent(Control control)
+        {
+            if (control is MetroTabPanel && !this.Control.Controls.Contains(control))
+                return true;
+            return false;
+        }
+
+        public override DesignerVerbCollection Verbs
+        {
+            get
+            {
+                DesignerVerb[] verbs = null;
+                verbs = new DesignerVerb[]
+					{
+						new DesignerVerb("Create Tab", new EventHandler(CreateMetroTab)),
+						new DesignerVerb("Create Button", new EventHandler(CreateButton)),
+						new DesignerVerb("Create Text Box", new EventHandler(CreateTextBox)),
+						new DesignerVerb("Create Combo Box", new EventHandler(CreateComboBox)),
+                        new DesignerVerb("Create Label", new EventHandler(CreateLabel)),
+                        new DesignerVerb("Create Micro-Chart", new EventHandler(CreateMicroChart)),
+                        new DesignerVerb("Create Switch Button", new EventHandler(CreateSwitch)),
+                        new DesignerVerb("Create Rating Item", new EventHandler(CreateRatingItem)),};
+
+                return new DesignerVerbCollection(verbs);
+            }
+        }
+
+        private BaseItem GetNewItemContainer()
+        {
+            MetroShell r = this.Control as MetroShell;
+            if (m_QuickAccessToolbarSelected)
+                return r.MetroTabStrip.CaptionContainerItem;
+            else
+                return r.MetroTabStrip.StripContainerItem;
+        }
+
+        protected override void CreateButton(object sender, EventArgs e)
+        {
+            MetroShell r = this.Control as MetroShell;
+            if (r != null)
+            {
+                CreateButton(GetNewItemContainer());
+            }
+        }
+
+        protected override void CreateTextBox(object sender, EventArgs e)
+        {
+            MetroShell r = this.Control as MetroShell;
+            if (r != null)
+            {
+                CreateTextBox(GetNewItemContainer());
+            }
+        }
+
+        protected override void CreateComboBox(object sender, EventArgs e)
+        {
+            MetroShell r = this.Control as MetroShell;
+            if (r != null)
+            {
+                CreateComboBox(GetNewItemContainer());
+            }
+        }
+
+        protected override void CreateLabel(object sender, EventArgs e)
+        {
+            MetroShell r = this.Control as MetroShell;
+            if (r != null)
+            {
+                CreateLabel(GetNewItemContainer());
+            }
+        }
+
+        protected override void CreateColorPicker(object sender, EventArgs e)
+        {
+            MetroShell r = this.Control as MetroShell;
+            if (r != null)
+            {
+                CreateColorPicker(GetNewItemContainer());
+            }
+        }
+
+        protected override void CreateProgressBar(object sender, EventArgs e)
+        {
+            MetroShell r = this.Control as MetroShell;
+            if (r != null)
+            {
+                CreateProgressBar(GetNewItemContainer());
+            }
+        }
+
+        protected override void CreateRatingItem(object sender, EventArgs e)
+        {
+            MetroShell r = this.Control as MetroShell;
+            if (r != null)
+            {
+                CreateRatingItem(GetNewItemContainer());
+            }
+        }
+
+        protected override void CreateSwitch(object sender, EventArgs e)
+        {
+            MetroShell r = this.Control as MetroShell;
+            if (r != null)
+            {
+                CreateSwitch(GetNewItemContainer());
+            }
+        }
+
+        protected override void ComponentChangeComponentAdded(object sender, ComponentEventArgs e)
+        {
+            if (m_AddingItem)
+            {
+                m_AddingItem = false;
+                IComponentChangeService cc = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+                if (cc != null)
+                    cc.OnComponentChanging(this.Control, null);
+                this.GetNewItemContainer().SubItems.Add(e.Component as BaseItem);
+                if (cc != null)
+                    cc.OnComponentChanged(this.Control, null, null, null);
+                m_InsertItemTransaction.Commit();
+                m_InsertItemTransaction = null;
+                this.RecalcLayout();
+            }
+        }
+
+        protected override ArrayList GetAllAssociatedComponents()
+        {
+            ArrayList c = new ArrayList(base.AssociatedComponents);
+            MetroShell r = this.Control as MetroShell;
+            if (r != null)
+            {
+                AddSubItems(r.MetroTabStrip.StripContainerItem, c);
+                AddSubItems(r.MetroTabStrip.CaptionContainerItem, c);
+            }
+            return c;
+        }
+
+        public override System.Collections.ICollection AssociatedComponents
+        {
+            get
+            {
+                ArrayList c = new ArrayList(this.BaseAssociatedComponents);
+                MetroShell rc = this.Control as MetroShell;
+                if (rc != null)
+                {
+                    foreach (BaseItem item in rc.QuickToolbarItems)
+                    {
+                        if (!item.SystemItem)
+                            c.Add(item);
+                    }
+                    foreach (BaseItem item in rc.Items)
+                    {
+                        if (!item.SystemItem)
+                            c.Add(item);
+                    }
+                }
+                return c;
+            }
+        }
+
+#if FRAMEWORK20
+        public override void InitializeNewComponent(IDictionary defaultValues)
+        {
+            base.InitializeNewComponent(defaultValues);
+            SetDesignTimeDefaults();
+        }
+#else
+        public override void OnSetComponentDefaults()
+        {
+            SetDesignTimeDefaults();
+            base.OnSetComponentDefaults();
+        }
+#endif
+
+        private StyleManager CreateStyleManager()
+        {
+            StyleManager manager = null;
+
+            IDesignerHost dh = (IDesignerHost)GetService(typeof(IDesignerHost));
+            if (dh != null)
+            {
+                DesignerTransaction trans = dh.CreateTransaction("Create Style Manager");
+                try
+                {
+                    manager = dh.CreateComponent(typeof(StyleManager)) as StyleManager;
+                }
+                finally
+                {
+                    if (!trans.Canceled) trans.Commit();
+                }
+            }
+
+            return manager;
+        }
+        private void SetDesignTimeDefaults()
+        {
+            CreateMetroTab("&HOME");
+            CreateMetroTab("&VIEW");
+            StyleManager manager = CreateStyleManager();
+            MetroShell c = this.Control as MetroShell;
+            if (c != null)
+            {
+                try
+                {
+                    c.KeyTipsFont = new Font("Tahoma", 7);
+                    c.TabStripFont = new System.Drawing.Font("Segoe UI", 10.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+                }
+                catch { }
+            }
+            //this.Style = eDotNetBarStyle.StyleManagerControlled;
+            this.CanCustomize = true;
+            c.Size = new Size(200, 154);
+            c.Dock = DockStyle.Top;
+            this.CaptionVisible = true;
+
+            if (manager != null)
+                manager.ManagerStyle = eStyle.Metro;
+        }
+
+        protected override BaseItem GetItemContainer()
+        {
+            MetroShell tab = this.Control as MetroShell;
+            if (tab != null)
+                return tab.MetroTabStrip.GetBaseItemContainer();
+            return null;
+        }
+
+        protected override System.Windows.Forms.Control GetItemContainerControl()
+        {
+            MetroShell tab = this.Control as MetroShell;
+            if (tab != null)
+                return tab.MetroTabStrip;
+            return null;
+        }
+
+        /// <summary>
+        /// Support for popup menu closing.
+        /// </summary>
+        protected override void DesignTimeSelectionChanged(ISelectionService ss)
+        {
+            if (ss == null)
+                return;
+            if (this.Control == null || this.Control.IsDisposed)
+                return;
+
+            if (IsApplicationButtonBackstageControl(ss.PrimarySelection))
+                return;
+
+            base.DesignTimeSelectionChanged(ss);
+
+            MetroShell r = this.Control as MetroShell;
+            if (r == null) return;
+
+            BaseItem container = r.MetroTabStrip.StripContainerItem;
+            if (container == null) return;
+
+            if (ss.PrimarySelection is MetroTabItem)
+            {
+                MetroTabItem item = ss.PrimarySelection as MetroTabItem;
+                if (container.SubItems.Contains(item))
+                {
+                    TypeDescriptor.GetProperties(item)["Checked"].SetValue(item, true);
+                }
+            }
+        }
+
+        private bool IsApplicationButtonBackstageControl(object primarySelection)
+        {
+            MetroShell tab = this.Control as MetroShell;
+            if (tab == null || !(tab.GetApplicationButton() is MetroAppButton)) return false;
+            MetroAppButton appButton = tab.GetApplicationButton() as MetroAppButton;
+            if (appButton.BackstageTab == null) return false;
+
+            SuperTabControl backstageTab = appButton.BackstageTab;
+            if (primarySelection is BaseItem)
+            {
+                BaseItem item = (BaseItem)primarySelection;
+                if (backstageTab.Tabs.Contains(item)) return true;
+                while (item.Parent != null) item = item.Parent;
+                Control parentControl = item.ContainerControl as Control;
+                if (parentControl == null) return false;
+                return ContainsControl(backstageTab, parentControl);
+            }
+            else if (primarySelection is Control)
+                return ContainsControl(backstageTab, (Control)primarySelection);
+
+            return false;
+        }
+
+        private bool ContainsControl(Control container, Control childControl)
+        {
+            Control parent = childControl;
+            while (parent != null)
+            {
+                if (parent == container) return true;
+                parent = parent.Parent;
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// Triggered when some other component on the form is removed.
+        /// </summary>
+        protected override void OtherComponentRemoving(object sender, ComponentEventArgs e)
+        {
+            MetroShell r = this.Control as MetroShell;
+            if (r != null)
+            {
+                BaseItem container = r.MetroTabStrip.StripContainerItem;
+
+                if (e.Component is MetroTabItem && container != null && container.SubItems != null &&
+                    container.SubItems.Contains(((MetroTabItem)e.Component)))
+                {
+                    IDesignerHost dh = this.GetService(typeof(IDesignerHost)) as IDesignerHost;
+                    if (dh != null)
+                        dh.DestroyComponent(((MetroTabItem)e.Component).Panel);
+                }
+            }
+            base.OtherComponentRemoving(sender, e);
+        }
+
+        protected override void ComponentRemoved(object sender, ComponentEventArgs e)
+        {
+            MetroShell r = this.Control as MetroShell;
+            if (e.Component is BaseItem && r != null)
+            {
+                BaseItem item = e.Component as BaseItem;
+                if (r.Items.Contains(item))
+                    r.Items.Remove(item);
+                else if (r.QuickToolbarItems.Contains(item))
+                    r.QuickToolbarItems.Remove(item);
+                DestroySubItems(item);
+            }
+        }
+
+        protected override bool OnMouseDown(ref Message m, MouseButtons button)
+        {
+            m_QuickAccessToolbarSelected = false;
+
+            System.Windows.Forms.Control ctrl = this.GetItemContainerControl();
+            MetroTabStrip strip = ctrl as MetroTabStrip;
+
+            if (strip == null)
+                return base.OnMouseDown(ref m, button);
+
+            Point pos = strip.PointToClient(System.Windows.Forms.Control.MousePosition);
+            if (!strip.ClientRectangle.Contains(pos))
+                return base.OnMouseDown(ref m, button);
+
+            if (button == MouseButtons.Right)
+            {
+                if (strip.QuickToolbarBounds.Contains(pos))
+                    m_QuickAccessToolbarSelected = true;
+                return base.OnMouseDown(ref m, button);
+            }
+
+            bool callBase = true;
+
+            if (callBase)
+                return base.OnMouseDown(ref m, button);
+            else
+                return true;
+        }
+
+        #endregion
+
+        #region Design-Time Item Creation
+        protected virtual void CreateMetroTab(object sender, EventArgs e)
+        {
+            CreateMetroTab(string.Empty);
+        }
+
+        private void CreateMetroTab(string text)
+        {
+            m_QuickAccessToolbarSelected = false;
+            IDesignerHost dh = (IDesignerHost)GetService(typeof(IDesignerHost));
+            if (dh != null)
+            {
+                DesignerTransaction trans = dh.CreateTransaction("Creating Metro Tab");
+                IComponentChangeService cc = (IComponentChangeService)GetService(typeof(IComponentChangeService));
+                MetroShell tab = this.Control as MetroShell;
+                try
+                {
+                    m_CreatingItem = true;
+                    OnSubItemsChanging();
+                    MetroTabItem item = dh.CreateComponent(typeof(MetroTabItem)) as MetroTabItem;
+                    if (string.IsNullOrEmpty(text))
+                        TypeDescriptor.GetProperties(item)["Text"].SetValue(item, item.Name);
+                    else
+                        TypeDescriptor.GetProperties(item)["Text"].SetValue(item, text);
+
+                    MetroTabPanel panel = dh.CreateComponent(typeof(MetroTabPanel)) as MetroTabPanel;
+                    TypeDescriptor.GetProperties(panel)["Dock"].SetValue(panel, DockStyle.Fill);
+                    //TypeDescriptor.GetProperties(panel)["ColorSchemeStyle"].SetValue(panel, tab.Style);
+                    tab.SetTabPanelStyle(panel);
+                    
+                    //panel.Style.BorderBottom = eStyleBorderType.Solid;
+                    //TypeDescriptor.GetProperties(panel.Style)["BorderBottom"].SetValue(panel.Style, eStyleBorderType.Solid);
+
+                    cc.OnComponentChanging(this.Control, TypeDescriptor.GetProperties(typeof(Control))["Controls"]);
+                    this.Control.Controls.Add(panel);
+                    panel.SendToBack();
+                    cc.OnComponentChanged(this.Control, TypeDescriptor.GetProperties(typeof(Control))["Controls"], null, null);
+
+                    TypeDescriptor.GetProperties(item)["Panel"].SetValue(item, panel);
+
+                    SimpleItemContainer cont = tab.MetroTabStrip.StripContainerItem;
+                    cc.OnComponentChanging(cont, TypeDescriptor.GetProperties(typeof(BaseItem))["SubItems"]);
+                    cont.SubItems.Add(item);
+                    cc.OnComponentChanged(cont, TypeDescriptor.GetProperties(typeof(BaseItem))["SubItems"], null, null);
+                    if (cont.SubItems.Count == 1)
+                        TypeDescriptor.GetProperties(item)["Checked"].SetValue(item, true);
+
+                    this.RecalcLayout();
+                    OnSubItemsChanged();
+                }
+                catch
+                {
+                    trans.Cancel();
+                    throw;
+                }
+                finally
+                {
+                    if (!trans.Canceled)
+                        trans.Commit();
+                    m_CreatingItem = false;
+                }
+            }
+        }
+
+        #endregion
+
+        #region Shadowing
+        /// <summary>
+        /// Gets or sets whether custom caption and quick access toolbar provided by the control is visible. Default value is false.
+        /// This property should be set to true when control is used on MetroForm.
+        /// </summary>
+        [Browsable(true), DefaultValue(false), Category("Appearance"), Description("Indicates whether custom caption and quick access toolbar provided by the control is visible.")]
+        public bool CaptionVisible
+        {
+            get
+            {
+                MetroShell r = this.Control as MetroShell;
+                return r.CaptionVisible;
+            }
+            set
+            {
+                MetroShell r = this.Control as MetroShell;
+                if (r.CaptionVisible == value) return;
+                r.CaptionVisible = value;
+                
+                if (r.CaptionVisible && (
+                    r.QuickToolbarItems.Count == 6 && r.QuickToolbarItems[0] is SystemCaptionItem && r.QuickToolbarItems[5] is SystemCaptionItem))
+                {
+                    // Add custom items to the toolbar
+                    IDesignerHost dh = this.GetService(typeof(IDesignerHost)) as IDesignerHost;
+                    IComponentChangeService cc = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+                    if (dh != null && !dh.Loading && cc != null && dh.TransactionDescription != "Paste components")
+                    {
+                        DesignerTransaction trans = dh.CreateTransaction();
+                        try
+                        {
+                            m_CreatingItem = true;
+                            MetroAppButton sb = dh.CreateComponent(typeof(MetroAppButton)) as MetroAppButton;
+                            sb.Text = "&File";
+                            sb.ShowSubItems = false;
+                            sb.CanCustomize = false;
+                            sb.AutoExpandOnClick = true;
+                            cc.OnComponentChanging(r, TypeDescriptor.GetProperties(r)["QuickToolbarItems"]);
+                            sb.ImageFixedSize = new Size(16, 16);
+                            r.Items.Insert(0, sb);
+                            cc.OnComponentChanged(r, TypeDescriptor.GetProperties(r)["QuickToolbarItems"], null, null);
+                            ButtonItem buttonStart = sb;
+
+                            ButtonItem b = dh.CreateComponent(typeof(ButtonItem)) as ButtonItem;
+                            b.Text = b.Name;
+                            cc.OnComponentChanging(r, TypeDescriptor.GetProperties(r)["QuickToolbarItems"]);
+                            r.QuickToolbarItems.Add(b, 2);
+                            cc.OnComponentChanged(r, TypeDescriptor.GetProperties(r)["QuickToolbarItems"], null, null);
+
+                            
+                        }
+                        catch
+                        {
+                            trans.Cancel();
+                        }
+                        finally
+                        {
+                            if (!trans.Canceled) trans.Commit();
+                            m_CreatingItem = false;
+                        }
+                    }
+                }
+            }
+        }
+
+        private ButtonItem CreateFileButton(IDesignerHost dh, string text, Image image)
+        {
+            ButtonItem button = dh.CreateComponent(typeof(ButtonItem)) as ButtonItem;
+            button.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText;
+            button.Image = image;
+            button.SubItemsExpandWidth = 24;
+            button.Text = text;
+
+            return button;
+        }
+
+        private ButtonItem CreateMRUButton(IDesignerHost dh, string text)
+        {
+            ButtonItem button = dh.CreateComponent(typeof(ButtonItem)) as ButtonItem;
+            button.Text = text;
+
+            return button;
+        }
+
+
+        internal static Bitmap LoadImage(string imageName)
+        {
+            string imagesFolder = GetImagesFolder();
+            if (imagesFolder != "")
+            {
+                if (File.Exists(imagesFolder + imageName))
+                    return new Bitmap(imagesFolder + imageName);
+            }
+
+            return null;
+        }
+
+        private static string GetImagesFolder()
+        {
+            try
+            {
+                Microsoft.Win32.RegistryKey key = Microsoft.Win32.Registry.LocalMachine;
+                string path = "";
+                try
+                {
+                    if (key != null)
+                        key = key.OpenSubKey("Software\\DevComponents\\DotNetBar");
+                    if (key != null)
+                        path = key.GetValue("InstallationFolder", "").ToString();
+                }
+                finally { if (key != null) key.Close(); }
+
+                if (path != "")
+                {
+                    if (path.Substring(path.Length - 1, 1) != "\\")
+                        path += "\\";
+                    path += "Images\\";
+                    return path;
+                }
+            }
+            catch (Exception)
+            {
+            }
+            return "";
+        }
+
+        /// <summary>
+        /// Gets or sets whether control can be customized and items added by end-user using context menu to the quick access toolbar.
+        /// Caption of the control must be visible for customization to be enabled. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Browsable(true), Category("Quick Access Toolbar"), Description("Indicates whether control can be customized. Caption must be visible for customization to be fully enabled.")]
+        public bool CanCustomize
+        {
+            get
+            {
+                MetroShell rc = this.Control as MetroShell;
+                return rc.CanCustomize;
+            }
+            set
+            {
+                MetroShell rc = this.Control as MetroShell;
+                rc.CanCustomize = value;
+
+                IDesignerHost dh = this.GetService(typeof(IDesignerHost)) as IDesignerHost;
+                if (dh != null && !dh.Loading)
+                {
+                    if (value)
+                    {
+                        // Make sure that QatCustomizeItem exists
+                        QatCustomizeItem qatCustom = GetQatCustomizeItem(rc);
+                        if (qatCustom == null)
+                        {
+                            DesignerTransaction dt = dh.CreateTransaction("Creating the QAT");
+                            try
+                            {
+                                // Create QatCustomItem...
+                                m_CreatingItem = true;
+                                qatCustom = dh.CreateComponent(typeof(QatCustomizeItem)) as QatCustomizeItem;
+                                qatCustom.BeginGroup = true;
+                                IComponentChangeService cc = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+                                if (cc != null)
+                                    cc.OnComponentChanging(rc, TypeDescriptor.GetProperties(rc)["QuickToolbarItems"]);
+                                rc.QuickToolbarItems.Add(qatCustom);
+                                if (cc != null)
+                                    cc.OnComponentChanged(rc, TypeDescriptor.GetProperties(rc)["QuickToolbarItems"], null, null);
+                                m_CreatingItem = false;
+                                this.RecalcLayout();
+                            }
+                            catch
+                            {
+                                dt.Cancel();
+                            }
+                            finally
+                            {
+                                if (!dt.Canceled) dt.Commit();
+                            }
+                        }
+                    }
+                    else
+                    {
+                        QatCustomizeItem qatCustom = GetQatCustomizeItem(rc);
+                        if (qatCustom != null)
+                        {
+                            DesignerTransaction dt = dh.CreateTransaction("Removing the QAT");
+                            try
+                            {
+                                IComponentChangeService cc = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+                                if (cc != null)
+                                    cc.OnComponentChanging(rc, TypeDescriptor.GetProperties(rc)["QuickToolbarItems"]);
+                                rc.QuickToolbarItems.Remove(qatCustom);
+                                if (cc != null)
+                                    cc.OnComponentChanged(rc, TypeDescriptor.GetProperties(rc)["QuickToolbarItems"], null, null);
+                                dh.DestroyComponent(qatCustom);
+                            }
+                            catch
+                            {
+                                dt.Cancel();
+                            }
+                            finally
+                            {
+                                if (!dt.Canceled) dt.Commit();
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        private QatCustomizeItem GetQatCustomizeItem(MetroShell rc)
+        {
+            QatCustomizeItem qatCustom = null;
+            // Remove QatCustomizeItem if it exists
+            foreach (BaseItem item in rc.QuickToolbarItems)
+            {
+                if (item is QatCustomizeItem)
+                {
+                    qatCustom = item as QatCustomizeItem;
+                    break;
+                }
+            }
+            return qatCustom;
+        }
+
+        protected override void PreFilterProperties(IDictionary properties)
+        {
+            base.PreFilterProperties(properties);
+
+            properties["CaptionVisible"] = TypeDescriptor.CreateProperty(typeof(MetroShellDesigner), (PropertyDescriptor)properties["CaptionVisible"], new Attribute[]
+				{
+					new DefaultValueAttribute(false),
+					new BrowsableAttribute(true),
+					new CategoryAttribute("Appearance"),
+                    new DescriptionAttribute("Indicates whether custom caption and quick access toolbar provided by the control is visible.")});
+
+            properties["CanCustomize"] = TypeDescriptor.CreateProperty(typeof(MetroShellDesigner), (PropertyDescriptor)properties["CanCustomize"], new Attribute[]
+				{
+					new DefaultValueAttribute(true),
+					new BrowsableAttribute(true),
+					new CategoryAttribute("Quick Access Toolbar"),
+                    new DescriptionAttribute("Indicates whether control can be customized. Caption must be visible for customization to be fully enabled")});
+
+            //DesignTime.RemoveProperties(properties, new string[] { "AccessibleDescription" 
+            //    ,"AccessibleName","AccessibleRole","AutoScroll", "AutoScrollMargin", "AutoScrollMinSize",
+            //    "BackColor", "BackgroundImage", "BackgroundImageLayout", "DisplayRectangle", "ForeColor",
+            //    "MaximumSize", "MinimumSize", "Site","Text","UseWaitCursor", "Cursor","ContextMenuStrip"});
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/Metro/MetroStatusBarDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/Metro/MetroStatusBarDesigner.cs
new file mode 100644
index 00000000..64125acf
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/Metro/MetroStatusBarDesigner.cs	
@@ -0,0 +1,144 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel;
+using System.Collections;
+using System.ComponentModel.Design;
+using DevComponents.DotNetBar.Rendering;
+using System.Drawing;
+using DevComponents.DotNetBar.Metro;
+
+namespace DevComponents.DotNetBar.Design
+{
+    public class MetroStatusBarDesigner : BarBaseControlDesigner
+    {
+        public MetroStatusBarDesigner()
+		{
+			this.EnableItemDragDrop=true;
+		}
+
+        public override void Initialize(IComponent component)
+        {
+            base.Initialize(component);
+            if (component == null || component.Site == null || !component.Site.DesignMode)
+                return;
+
+#if !TRIAL
+            IDesignerHost dh = this.GetService(typeof(IDesignerHost)) as IDesignerHost;
+            if (dh != null)
+                dh.LoadComplete += new EventHandler(dh_LoadComplete);
+#endif
+        }
+
+#if FRAMEWORK20
+        public override void InitializeNewComponent(IDictionary defaultValues)
+        {
+            base.InitializeNewComponent(defaultValues);
+            SetDesignTimeDefaults();
+        }
+#else
+		public override void OnSetComponentDefaults()
+		{
+            SetDesignTimeDefaults();
+			base.OnSetComponentDefaults();
+		}
+#endif
+
+        private void SetDesignTimeDefaults()
+        {
+            MetroStatusBar bar = this.Control as MetroStatusBar;
+            bar.Dock = System.Windows.Forms.DockStyle.Bottom;
+            try
+            {
+                bar.Font = new System.Drawing.Font("Segoe UI", 10.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            }
+            catch
+            {
+                
+            }
+#if !TRIAL
+            string key = GetLicenseKey();
+            bar.LicenseKey = key;
+#endif
+        }
+
+        public override DesignerVerbCollection Verbs
+        {
+            get
+            {
+                Bar bar = this.Control as Bar;
+                DesignerVerb[] verbs = null;
+                verbs = new DesignerVerb[]
+						{
+							new DesignerVerb("Add Button", new EventHandler(CreateButton)),
+							new DesignerVerb("Add Horizontal Container", new EventHandler(CreateHorizontalContainer)),
+							new DesignerVerb("Add Vertical Container", new EventHandler(CreateVerticalContainer)),
+                            new DesignerVerb("Add Slider", new EventHandler(CreateSliderItem)),
+							new DesignerVerb("Add Text Box", new EventHandler(CreateTextBox)),
+							new DesignerVerb("Add Combo Box", new EventHandler(CreateComboBox)),
+							new DesignerVerb("Add Label", new EventHandler(CreateLabel)),
+							new DesignerVerb("Add Color Picker", new EventHandler(CreateColorPicker)),
+                            new DesignerVerb("Add Micro-Chart", new EventHandler(CreateMicroChart)),
+                            new DesignerVerb("Add Switch Button", new EventHandler(CreateSwitch)),
+                            new DesignerVerb("Add Progress bar", new EventHandler(CreateProgressBar)),
+                            new DesignerVerb("Add Check box", new EventHandler(CreateCheckBox)),
+                            new DesignerVerb("Add WinForms Control Container", new EventHandler(CreateControlContainer))
+                        };
+                return new DesignerVerbCollection(verbs);
+            }
+        }
+
+        private void CreateVerticalContainer(object sender, EventArgs e)
+        {
+            CreateContainer(this.GetItemContainer(), eOrientation.Vertical);
+        }
+
+        private void CreateHorizontalContainer(object sender, EventArgs e)
+        {
+            CreateContainer(this.GetItemContainer(), eOrientation.Horizontal);
+        }
+
+        private void CreateContainer(BaseItem parent, eOrientation orientation)
+        {
+            m_CreatingItem = true;
+            try
+            {
+                DesignerSupport.CreateItemContainer(this, parent, orientation);
+            }
+            finally
+            {
+                m_CreatingItem = false;
+            }
+            this.RecalcLayout();
+        }
+
+        #region Licensing Stuff
+#if !TRIAL
+        private string GetLicenseKey()
+        {
+            string key = "";
+            Microsoft.Win32.RegistryKey regkey = Microsoft.Win32.Registry.LocalMachine;
+            regkey = regkey.OpenSubKey("Software\\DevComponents\\Licenses", false);
+            if (regkey != null)
+            {
+                object keyValue = regkey.GetValue("DevComponents.DotNetBar.DotNetBarManager2");
+                if (keyValue != null)
+                    key = keyValue.ToString();
+            }
+            return key;
+        }
+        private void dh_LoadComplete(object sender, EventArgs e)
+        {
+            IDesignerHost dh = this.GetService(typeof(IDesignerHost)) as IDesignerHost;
+            if (dh != null)
+                dh.LoadComplete -= new EventHandler(dh_LoadComplete);
+
+            string key = GetLicenseKey();
+            MetroStatusBar bar = this.Control as MetroStatusBar;
+            if (key != "" && bar != null && bar.LicenseKey == "" && bar.LicenseKey != key)
+                TypeDescriptor.GetProperties(bar)["LicenseKey"].SetValue(bar, key);
+        }
+#endif
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/Metro/MetroTabItemDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/Metro/MetroTabItemDesigner.cs
new file mode 100644
index 00000000..b486faea
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/Metro/MetroTabItemDesigner.cs	
@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel.Design;
+
+namespace DevComponents.DotNetBar.Design
+{
+    /// <summary>
+    /// Represents Windows Forms designer for MetroTabItem
+    /// </summary>
+    public class MetroTabItemDesigner : BaseItemDesigner
+    {
+        public override DesignerVerbCollection Verbs
+        {
+            get
+            {
+                return null;
+            }
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/Metro/MetroTabPanelDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/Metro/MetroTabPanelDesigner.cs
new file mode 100644
index 00000000..d60f3959
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/Metro/MetroTabPanelDesigner.cs	
@@ -0,0 +1,58 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel.Design;
+using System.Drawing;
+using DevComponents.DotNetBar.Metro;
+using System.Windows.Forms.Design;
+
+namespace DevComponents.DotNetBar.Design
+{
+    public class MetroTabPanelDesigner : PanelControlDesigner
+    {
+        #region Internal Implementation
+        public override SelectionRules SelectionRules
+        {
+            get { return (SelectionRules.Locked | SelectionRules.Visible); }
+        }
+
+        protected override void SetDesignTimeDefaults()
+        {
+//            RibbonPanel p = this.Control as RibbonPanel;
+//#if FRAMEWORK20
+//            p.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3);
+//#else
+//            p.DockPadding.Left = 3;
+//            p.DockPadding.Right = 3;
+//            p.DockPadding.Bottom = 3;
+//#endif
+        }
+
+        public override DesignerVerbCollection Verbs
+        {
+            get
+            {
+                return new DesignerVerbCollection();
+            }
+        }
+
+        /// <summary>
+        /// Draws design-time border around the panel when panel does not have one.
+        /// </summary>
+        /// <param name="g"></param>
+        protected override void DrawBorder(Graphics g)
+        {
+            MetroTabPanel panel = this.Control as MetroTabPanel;
+            if (panel == null) return;
+            Rectangle r = panel.ClientRectangle;
+            using (Pen pen = new Pen(Color.WhiteSmoke, 1))
+            {
+                pen.DashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
+                r.Width--;
+                r.Height--;
+                g.DrawRectangle(pen, r);
+            }
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/Metro/MetroTileFrameDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/Metro/MetroTileFrameDesigner.cs
new file mode 100644
index 00000000..fca17151
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/Metro/MetroTileFrameDesigner.cs	
@@ -0,0 +1,62 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel.Design;
+using System.ComponentModel;
+using System.Reflection;
+using System.Collections;
+
+namespace DevComponents.DotNetBar.Design
+{
+    public class MetroTileFrameDesigner : ComponentDesigner
+    {
+        private static bool SetGenerateMemberProperty(
+         IExtenderListService service,
+         IComponent component,
+         bool value)
+        {
+            IExtenderProvider provider = null;
+            IExtenderProvider[] providers = service.GetExtenderProviders();
+            foreach (IExtenderProvider item in providers)
+            {
+                if (item.GetType().FullName ==
+                       "System.ComponentModel.Design.Serialization.CodeDomDesignerLoader+ModifiersExtenderProvider")
+                {
+                    provider = item;
+                    break;
+                }
+            }
+
+            if (provider == null) return false;
+
+            MethodInfo methodInfo =
+               provider.GetType().GetMethod(
+                  "SetGenerateMember", BindingFlags.Public |
+                                       BindingFlags.Instance);
+
+            if (methodInfo != null)
+            {
+                methodInfo.Invoke(
+                   provider, new object[]
+                            {
+                               component,
+                               value
+                            });
+                return true;
+            }
+
+            return false;
+        }
+
+        public override void InitializeNewComponent(IDictionary defaultValues)
+        {
+            // no reason to create a member since container has no use aside from logical grouping at design time
+            SetGenerateMemberProperty(
+               (IExtenderListService)GetService(typeof(IExtenderListService)),
+               this.Component,
+               false);
+
+            base.InitializeNewComponent(defaultValues);
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/Metro/MetroTilePanelDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/Metro/MetroTilePanelDesigner.cs
new file mode 100644
index 00000000..2117d810
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/Metro/MetroTilePanelDesigner.cs	
@@ -0,0 +1,74 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel.Design;
+using DevComponents.DotNetBar.Rendering;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar.Design
+{
+    public class MetroTilePanelDesigner : ItemPanelDesigner
+    {
+        public override DesignerVerbCollection Verbs
+        {
+            get
+            {
+                Bar bar = this.Control as Bar;
+                DesignerVerb[] verbs = null;
+                verbs = new DesignerVerb[]
+						{
+                            new DesignerVerb("Add Metro Tile", new EventHandler(CreateMetroTile)),
+                            new DesignerVerb("Add Tile Group", new EventHandler(CreateHorizontalContainer))
+                        };
+                return new DesignerVerbCollection(verbs);
+            }
+        }
+
+        protected override void SetDesignTimeDefaults()
+        {
+            ItemPanel panel = this.Control as ItemPanel;
+            panel.BackgroundStyle.Class = ElementStyleClassKeys.MetroTilePanelKey;
+
+            ItemContainer container = CreateContainer(this.GetItemContainer(), eOrientation.Horizontal);
+            container.TitleStyle.Class = ElementStyleClassKeys.MetroTileGroupTitleKey;
+            container.TitleText = "First";
+            //LabelItem label = CreateLabel(container);
+            ////label.Width = 530;
+            //label.ContainerNewLineAfter = true;
+            //label.Font = new System.Drawing.Font("Segoe UI Semibold", 27.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            //label.Text = "First";
+
+            CreateMetroTile(container);
+            CreateMetroTile(container);
+            CreateMetroTile(container);
+            CreateMetroTile(container);
+
+            container = CreateContainer(this.GetItemContainer(), eOrientation.Horizontal);
+            container.TitleStyle.Class = ElementStyleClassKeys.MetroTileGroupTitleKey;
+            container.TitleText = "Second";
+            //label = CreateLabel(container);
+            ////label.Width = 530;
+            //label.ContainerNewLineAfter = true;
+            //label.Font = new System.Drawing.Font("Segoe UI Semibold", 27.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            //label.Text = "Second";
+
+            CreateMetroTile(container);
+            CreateMetroTile(container);
+            CreateMetroTile(container);
+            CreateMetroTile(container);
+#if !TRIAL
+            string key = GetLicenseKey();
+            panel.LicenseKey = key;
+#endif
+        }
+
+        protected override ItemContainer CreateContainer(BaseItem parent, eOrientation orientation)
+        {
+            ItemContainer container = base.CreateContainer(parent, orientation);
+            if (container != null)
+                TypeDescriptor.GetProperties(container)["MultiLine"].SetValue(container, true);
+            return container;
+        }
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/Metro/MetroToolbarDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/Metro/MetroToolbarDesigner.cs
new file mode 100644
index 00000000..2afd04b6
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/Metro/MetroToolbarDesigner.cs	
@@ -0,0 +1,258 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using DevComponents.DotNetBar.Metro;
+using System.ComponentModel;
+using System.Collections;
+using System.ComponentModel.Design;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Design
+{
+    class MetroToolbarDesigner : BarBaseControlDesigner
+    {
+        public MetroToolbarDesigner()
+		{
+			this.EnableItemDragDrop=true;
+            this.ShadowProperties["Expanded"] = false;
+		}
+
+        public override void Initialize(IComponent component)
+        {
+            base.Initialize(component);
+            if (component == null || component.Site == null || !component.Site.DesignMode)
+                return;
+
+#if !TRIAL
+            IDesignerHost dh = this.GetService(typeof(IDesignerHost)) as IDesignerHost;
+            if (dh != null)
+                dh.LoadComplete += new EventHandler(dh_LoadComplete);
+#endif
+        }
+
+#if FRAMEWORK20
+        public override void InitializeNewComponent(IDictionary defaultValues)
+        {
+            base.InitializeNewComponent(defaultValues);
+            SetDesignTimeDefaults();
+        }
+#else
+		public override void OnSetComponentDefaults()
+		{
+            SetDesignTimeDefaults();
+			base.OnSetComponentDefaults();
+		}
+#endif
+
+        private void SetDesignTimeDefaults()
+        {
+            MetroToolbar bar = this.Control as MetroToolbar;
+            try
+            {
+                bar.Font = new System.Drawing.Font("Segoe UI", 10.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            }
+            catch
+            {
+                
+            }
+#if !TRIAL
+            string key = GetLicenseKey();
+            bar.LicenseKey = key;
+#endif
+        }
+
+        //protected override BaseItem GetItemContainer()
+        //{
+        //    MetroToolbar bar = this.Control as MetroToolbar;
+        //    return ((MetroToolbarContainer)bar.GetBaseItemContainer()).MainItemsContainer;
+        //}
+
+        public override DesignerVerbCollection Verbs
+        {
+            get
+            {
+                Bar bar = this.Control as Bar;
+                DesignerVerb[] verbs = null;
+                verbs = new DesignerVerb[]
+						{
+							new DesignerVerb("Add Button", new EventHandler(CreateButton)),
+							new DesignerVerb("Add Horizontal Container", new EventHandler(CreateHorizontalContainer)),
+							new DesignerVerb("Add Vertical Container", new EventHandler(CreateVerticalContainer)),
+							new DesignerVerb("Add Text Box", new EventHandler(CreateTextBox)),
+							new DesignerVerb("Add Combo Box", new EventHandler(CreateComboBox)),
+							new DesignerVerb("Add Label", new EventHandler(CreateLabel)),
+							new DesignerVerb("Add Color Picker", new EventHandler(CreateColorPicker)),
+                            new DesignerVerb("Add Micro-Chart", new EventHandler(CreateMicroChart)),
+                            new DesignerVerb("Add Switch Button", new EventHandler(CreateSwitch)),
+                            new DesignerVerb("Add Progress bar", new EventHandler(CreateProgressBar)),
+                            new DesignerVerb("Add Check box", new EventHandler(CreateCheckBox)),
+                            new DesignerVerb("Add WinForms Control Container", new EventHandler(CreateControlContainer))
+                        };
+                return new DesignerVerbCollection(verbs);
+            }
+        }
+
+        private void CreateVerticalContainer(object sender, EventArgs e)
+        {
+            CreateContainer(this.GetItemContainer(), eOrientation.Vertical);
+        }
+
+        private void CreateHorizontalContainer(object sender, EventArgs e)
+        {
+            CreateContainer(this.GetItemContainer(), eOrientation.Horizontal);
+        }
+
+        private void CreateContainer(BaseItem parent, eOrientation orientation)
+        {
+            m_CreatingItem = true;
+            try
+            {
+                DesignerSupport.CreateItemContainer(this, parent, orientation);
+            }
+            finally
+            {
+                m_CreatingItem = false;
+            }
+            this.RecalcLayout();
+        }
+
+        protected override void OnIsSelectedChanged(bool oldValue, bool newValue)
+        {
+            if (newValue)
+            {
+                MetroToolbar bar = (MetroToolbar)this.Control;
+                if (!this.Expanded && bar.ExpandButtonVisible)
+                {
+                    bar.Expanded = true;
+                }
+            }
+            else
+            {
+                if (!this.Expanded)
+                {
+                    MetroToolbar bar = (MetroToolbar)this.Control;
+                    bar.Expanded = false;
+                    IComponentChangeService cc = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+                    if (cc != null)
+                        cc.OnComponentChanged(bar, TypeDescriptor.GetProperties(cc)["Location"], null, null);
+                }
+            }
+            base.OnIsSelectedChanged(oldValue, newValue);
+        }
+
+        protected override void PreFilterProperties(IDictionary properties)
+        {
+            base.PreFilterProperties(properties);
+            properties["Expanded"] = TypeDescriptor.CreateProperty(typeof(MetroToolbarDesigner), (PropertyDescriptor)properties["Expanded"], new Attribute[]
+				{
+					new DefaultValueAttribute(false),
+					new BrowsableAttribute(true),
+					new CategoryAttribute("Layout"),
+                    new DescriptionAttribute("Indicates whether control is expanded or not. When control is expanded both main and extra toolbar items are visible.")});
+        }
+
+        /// <summary>
+        /// Gets or sets whether control is expanded or not. When control is expanded both main and extra toolbar items are visible. When collapsed
+        /// only main items are visible. Default value is false.
+        /// </summary>
+        [DefaultValue(false), Browsable(true), Category("Layout"), Description("Indicates whether control is expanded or not. When control is expanded both main and extra toolbar items are visible.")]
+        public bool Expanded
+        {
+            get { return (bool)ShadowProperties["Expanded"]; }
+            set
+            {
+                // this value is not passed to the actual control at design-time
+                this.ShadowProperties["Expanded"] = value;
+            }
+        }
+
+        public override System.Collections.ICollection AssociatedComponents
+        {
+            get
+            {
+                ArrayList c = new ArrayList(base.AssociatedComponents);
+                MetroToolbar bar = (MetroToolbar)this.Control;
+                foreach (BaseItem item in bar.Items)
+                {
+                    if (item.DesignMode)
+                        c.Add(item);
+                }
+                foreach (BaseItem item in bar.ExtraItems)
+                {
+                    if (item.DesignMode)
+                        c.Add(item);
+                }
+                
+                return c;
+            }
+        }
+
+        protected override ArrayList GetAllAssociatedComponents()
+        {
+            ArrayList c = new ArrayList(base.AssociatedComponents);
+            MetroToolbar bar = (MetroToolbar)this.Control;
+            BaseItem container = ((MetroToolbarContainer)bar.GetBaseItemContainer()).MainItemsContainer;
+            if (container != null)
+            {
+                AddSubItems(container, c);
+            }
+            container = ((MetroToolbarContainer)bar.GetBaseItemContainer()).ExtraItemsContainer;
+            if (container != null)
+            {
+                AddSubItems(container, c);
+            }
+            return c;
+        }
+
+        protected override BaseItem GetControlItem(System.Windows.Forms.Control control)
+        {
+            MetroToolbar bar = (MetroToolbar)this.Control;
+            BaseItem parent = ((MetroToolbarContainer)bar.GetBaseItemContainer()).MainItemsContainer;
+            if (parent == null)
+                return null;
+            BaseItem item = GetControlItem(control, parent);
+            if (item != null) return item;
+
+            parent = ((MetroToolbarContainer)bar.GetBaseItemContainer()).ExtraItemsContainer;
+            if (parent == null)
+                return null;
+            item = GetControlItem(control, parent);
+            return item;
+        }
+
+        protected override BaseItem GetDefaultNewItemContainer()
+        {
+            MetroToolbar bar = (MetroToolbar)this.Control;
+            return ((MetroToolbarContainer)bar.GetBaseItemContainer()).MainItemsContainer;
+        }
+
+        #region Licensing Stuff
+#if !TRIAL
+        private string GetLicenseKey()
+        {
+            string key = "";
+            Microsoft.Win32.RegistryKey regkey = Microsoft.Win32.Registry.LocalMachine;
+            regkey = regkey.OpenSubKey("Software\\DevComponents\\Licenses", false);
+            if (regkey != null)
+            {
+                object keyValue = regkey.GetValue("DevComponents.DotNetBar.DotNetBarManager2");
+                if (keyValue != null)
+                    key = keyValue.ToString();
+            }
+            return key;
+        }
+        private void dh_LoadComplete(object sender, EventArgs e)
+        {
+            IDesignerHost dh = this.GetService(typeof(IDesignerHost)) as IDesignerHost;
+            if (dh != null)
+                dh.LoadComplete -= new EventHandler(dh_LoadComplete);
+
+            string key = GetLicenseKey();
+            MetroToolbar bar = this.Control as MetroToolbar;
+            if (key != "" && bar != null && bar.LicenseKey == "" && bar.LicenseKey != key)
+                TypeDescriptor.GetProperties(bar)["LicenseKey"].SetValue(bar, key);
+        }
+#endif
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/MicroChartDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/MicroChartDesigner.cs
new file mode 100644
index 00000000..30ed0942
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/MicroChartDesigner.cs	
@@ -0,0 +1,62 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel;
+using System.Collections;
+using System.ComponentModel.Design;
+using System.Windows.Forms;
+using System.Drawing;
+using System.Windows.Forms.Design;
+
+namespace DevComponents.DotNetBar.Design
+{
+    public class MicroChartDesigner : ControlDesigner
+    {
+        #region Constructor
+        public MicroChartDesigner()
+		{
+        }
+
+        public override void Initialize(IComponent component)
+        {
+            base.Initialize(component);
+            if (!component.Site.DesignMode)
+                return;
+
+            SetDataPointsDefaults();
+        }
+        #endregion
+
+        #region Internal Implementation
+#if FRAMEWORK20
+        public override void InitializeNewComponent(IDictionary defaultValues)
+        {
+            base.InitializeNewComponent(defaultValues);
+            SetDesignTimeDefaults();
+        }
+#else
+		public override void OnSetComponentDefaults()
+		{
+			base.OnSetComponentDefaults();
+            SetDesignTimeDefaults();
+		}
+#endif
+
+        private void SetDataPointsDefaults()
+        {
+            MicroChart chart = this.Control as MicroChart;
+            if (chart == null)
+                return;
+            chart.DataPoints = MicroChartItemDesigner.GetRandomDataPoints();
+        }
+        private void SetDesignTimeDefaults()
+        {
+            MicroChart chart = this.Control as MicroChart;
+            if (chart == null)
+                return;
+            chart.Style = eDotNetBarStyle.StyleManagerControlled;
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/MicroChartItemDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/MicroChartItemDesigner.cs
new file mode 100644
index 00000000..0addc22b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/MicroChartItemDesigner.cs	
@@ -0,0 +1,56 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace DevComponents.DotNetBar.Design
+{
+    public class MicroChartItemDesigner : BaseItemDesigner
+    {
+        public override void Initialize(System.ComponentModel.IComponent component)
+        {
+            base.Initialize(component);
+            if (component != null && component.Site != null && component.Site.DesignMode)
+                SetDataPointsDefaults();
+        }
+        private void SetDataPointsDefaults()
+        {
+            MicroChartItem item = (MicroChartItem)this.Component;
+            item.DataPoints = GetRandomDataPoints();
+        }
+
+        public override void InitializeExistingComponent(System.Collections.IDictionary defaultValues)
+        {
+            SetDataPointsDefaults();
+            base.InitializeExistingComponent(defaultValues);
+        }
+
+        protected override void SetDesignTimeDefaults()
+        {
+            SetDataPointsDefaults();
+            base.SetDesignTimeDefaults();
+        }
+
+        internal static List<double> GetRandomDataPoints(bool allowNegative)
+        {
+            return GetRandomDataPoints(allowNegative, 12);
+        }
+        internal static List<double> GetRandomDataPoints(bool allowNegative, int pointsToCreate)
+        {
+            List<double> points = new List<double>();
+            Random rnd = new Random((int)DateTime.Now.Ticks);
+            Random rnd2 = new Random();
+
+            for (int i = 0; i < pointsToCreate; i++)
+            {
+                points.Add(allowNegative ? ((rnd2.Next(50) > 25 ? 1 : -1) * rnd.Next(100)) : rnd.Next(100));
+            }
+
+            return points;
+        }
+        internal static List<double> GetRandomDataPoints()
+        {
+            return GetRandomDataPoints(true);
+        }
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/NavigationBarDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/NavigationBarDesigner.cs
new file mode 100644
index 00000000..3bf7bc5f
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/NavigationBarDesigner.cs	
@@ -0,0 +1,235 @@
+using System;
+using System.Windows.Forms;
+using System.Windows.Forms.Design;
+using System.Collections;
+using System.Drawing;
+using System.ComponentModel.Design;
+using System.ComponentModel;
+using System.ComponentModel.Design.Serialization;
+using System.CodeDom;
+
+namespace DevComponents.DotNetBar.Design
+{
+	/// <summary>
+	/// Provides design time support for NavigationBar control.
+	/// </summary>
+	public class NavigationBarDesigner:BarBaseControlDesigner
+	{
+		/// <summary>
+		/// Default constructor
+		/// </summary>
+		public NavigationBarDesigner()
+		{
+			this.EnableItemDragDrop=true;
+		}
+
+        public override void OnSetComponentDefaults()
+        {
+            NavigationBar navbar = this.Control as NavigationBar;
+            if (navbar != null) navbar.Style = eDotNetBarStyle.StyleManagerControlled;
+            base.OnSetComponentDefaults();
+        }
+
+		public override DesignerVerbCollection Verbs 
+		{
+			get 
+			{
+				DesignerVerb[] verbs;
+				verbs = new DesignerVerb[]
+				{
+					new DesignerVerb("Create New Button", new EventHandler(CreateNewButton)),
+				};
+				return new DesignerVerbCollection(verbs);
+			}
+		}
+		private void CreateNewButton(object sender, EventArgs e)
+		{
+			IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+			NavigationBar navbar=this.Control as NavigationBar;
+			if(navbar==null || dh==null)
+				return;
+
+            DesignerTransaction dt = dh.CreateTransaction();
+            try
+            {
+                IComponentChangeService change = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+                if (change != null)
+                    change.OnComponentChanging(this.Component, null);
+                ButtonItem item = null;
+                try
+                {
+                    m_CreatingItem = true;
+                    item = dh.CreateComponent(typeof(ButtonItem)) as ButtonItem;
+                    item.Text = item.Name;
+                    item.OptionGroup = "navBar";
+                    item.Image = Helpers.LoadBitmap("SystemImages.DefaultNavBarImage.png");
+                    navbar.Items.Add(item);
+                }
+                finally
+                {
+                    m_CreatingItem = false;
+                }
+
+                if (navbar.Items.Count == 1)
+                    item.Checked = true;
+                navbar.RecalcLayout();
+
+                if (change != null)
+                    change.OnComponentChanged(this.Component, null, null, null);
+            }
+            catch
+            {
+                dt.Cancel();
+            }
+            finally
+            {
+                if (!dt.Canceled) dt.Commit();
+            }
+		}
+
+		protected override bool OnMouseDown(ref Message m, MouseButtons mb)
+		{
+			if(base.OnMouseDown(ref m, mb))
+				return true;
+			
+			NavigationBar navbar=this.GetItemContainerControl() as NavigationBar;
+			if(navbar==null || navbar.IsDisposed || !navbar.SplitterVisible)
+				return false;
+
+			Point pos=navbar.PointToClient(System.Windows.Forms.Control.MousePosition);
+			MouseEventArgs e=new MouseEventArgs(MouseButtons.Left,0,pos.X,pos.Y,0);
+
+			if(m.Msg==WinApi.WM_LBUTTONDOWN)
+			{
+				if(navbar.HitTestSplitter(e.X,e.Y))
+					navbar.SplitterMouseDown(e);
+				if(navbar.IsSplitterMouseDown /*|| navbar.ClientRectangle.Contains(pos)*/)
+					return true;;
+			}
+
+			return false;
+		}
+
+		protected override bool OnMouseUp(ref Message m)
+		{
+			NavigationBar navbar=this.GetItemContainerControl() as NavigationBar;
+			if(navbar!=null && !navbar.IsDisposed && navbar.SplitterVisible)
+			{
+				Point pos=navbar.PointToClient(System.Windows.Forms.Control.MousePosition);
+				MouseEventArgs e=new MouseEventArgs(MouseButtons.Left,0,pos.X,pos.Y,0);
+				// Design-time splitter support
+				if(navbar.IsSplitterMouseDown)
+				{
+					navbar.SplitterMouseUp(e);
+					this.OnNavigationBarHeightChanged(navbar.Height);
+				}
+				else
+					navbar.SplitterMouseUp(e);
+			}
+
+			if(base.OnMouseUp(ref m))
+				return true;
+
+			return false;
+		}
+
+		protected virtual void OnNavigationBarHeightChanged(int newHeight)
+		{
+//			IComponentChangeService change=this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+//			if(change!=null)
+//			{
+//				change.OnComponentChanging(this.Control,TypeDescriptor.GetProperties(this.Control).Find("NavigationBarHeight",true));
+//				change.OnComponentChanged(this.Control,TypeDescriptor.GetProperties(this.Control).Find("NavigationBarHeight",true),0,newHeight);
+//			}
+		}
+
+		protected override bool OnMouseMove(ref Message m)
+		{
+			if(base.OnMouseMove(ref m))
+				return true;
+			NavigationBar navbar=this.GetItemContainerControl() as NavigationBar;
+			if(navbar!=null && !navbar.IsDisposed && navbar.SplitterVisible)
+			{
+				Point pos=navbar.PointToClient(System.Windows.Forms.Control.MousePosition);
+				MouseEventArgs e=new MouseEventArgs(System.Windows.Forms.Control.MouseButtons,0,pos.X,pos.Y,0);
+				navbar.SplitterMouseMove(e);
+			}
+			return false;
+		}
+
+		protected override bool OnMouseLeave(ref Message m)
+		{
+			if(base.OnMouseLeave(ref m))
+				return true;
+			NavigationBar navbar=this.GetItemContainerControl() as NavigationBar;
+			if(navbar!=null && !navbar.IsDisposed && navbar.SplitterVisible)
+				navbar.SplitterMouseLeave();
+			return false;
+		}
+
+		protected override void OnItemSelected(BaseItem item)
+		{
+			base.OnItemSelected(item);
+
+			if(item is ButtonItem && !((ButtonItem)item).Checked)
+			{
+				ButtonItem button=item as ButtonItem;
+				IComponentChangeService change=this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+				if(change!=null)
+					change.OnComponentChanging(button,TypeDescriptor.GetProperties(button).Find("Checked",true));
+				button.Checked=true;
+				if(change!=null)
+					change.OnComponentChanged(button,TypeDescriptor.GetProperties(button).Find("Checked",true),null,null);
+			}
+		}
+	}
+
+//	public class NavigationBarSerializer : CodeDomSerializer
+//	{
+//		public override object Serialize(IDesignerSerializationManager manager, object value) 
+//		{
+//			// first, locate and invoke the default serializer for 
+//			CodeDomSerializer baseSerializer = (CodeDomSerializer)manager.GetSerializer(
+//				typeof(NavigationBar).BaseType, 
+//				typeof(CodeDomSerializer));
+//
+//			object codeObject = baseSerializer.Serialize(manager, value);
+//
+//			// now add some custom code
+//			if (codeObject is CodeStatementCollection) 
+//			{
+//
+//				//				// add a custom comment to the code.
+//				CodeStatementCollection statements = 
+//					(CodeStatementCollection)codeObject;
+//
+//				// call a custom method.
+//				CodeExpression targetObject = 
+//					base.SerializeToReferenceExpression(manager, value);
+//				if(targetObject != null) 
+//				{
+//					
+//					CodeMethodInvokeExpression methodCall = 
+//						new CodeMethodInvokeExpression(targetObject, "RecalcLayout");
+//					statements.Add(methodCall);
+//				}
+//         
+//			}
+//
+//			// finally, return the statements that have been created
+//			return codeObject;
+//		}
+//
+//		/// The default serializer can handle the deserialization just fine.  We override this
+//		/// because it is an abstract member.
+//		/// </summary>
+//		public override object Deserialize(IDesignerSerializationManager manager, object codeDomObject)  
+//		{
+//			// delegate straight through to the default serializer
+//			//
+//			CodeDomSerializer baseSerializer = (CodeDomSerializer)manager.GetSerializer(typeof(NavigationBar).BaseType, typeof(CodeDomSerializer));
+//
+//			return baseSerializer.Deserialize(manager, codeDomObject);
+//		}
+//	}
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/NavigationPaneDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/NavigationPaneDesigner.cs
new file mode 100644
index 00000000..5d8ac5b3
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/NavigationPaneDesigner.cs	
@@ -0,0 +1,237 @@
+using System;
+using System.Windows.Forms;
+using System.Windows.Forms.Design;
+using System.Collections;
+using System.Drawing;
+using System.ComponentModel.Design;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar.Design
+{
+	/// <summary>
+	/// Summary description for NavigationPaneDesigner.
+	/// </summary>
+	public class NavigationPaneDesigner:NavigationBarDesigner
+	{
+		public override void Initialize(IComponent component) 
+		{
+			base.Initialize(component);
+			if(!component.Site.DesignMode)
+				return;
+			NavigationPane pane=this.Control as NavigationPane;
+			if(pane!=null)
+				pane.SetDesignMode();
+		}
+		public override DesignerVerbCollection Verbs 
+		{
+			get 
+			{
+				DesignerVerb[] verbs;
+				verbs = new DesignerVerb[]
+				{
+					new DesignerVerb("Create New Pane", new EventHandler(CreateNewPane)),
+				};
+				return new DesignerVerbCollection(verbs);
+			}
+		}
+
+#if FRAMEWORK20
+        public override void InitializeNewComponent(IDictionary defaultValues)
+        {
+            base.InitializeNewComponent(defaultValues);
+            SetDesignTimeDefaults();
+        }
+#else
+		public override void OnSetComponentDefaults()
+		{
+			base.OnSetComponentDefaults();
+			SetDesignTimeDefaults();
+		}
+#endif
+
+        private void SetDesignTimeDefaults()
+        {
+            CreateNewPane();
+            NavigationPane pane = this.Control as NavigationPane;
+            pane.Style = eDotNetBarStyle.StyleManagerControlled;
+        }
+
+		private void CreateNewPane(object sender, EventArgs e)
+		{
+			CreateNewPane();
+		}
+
+		private void CreateNewPane()
+		{
+			IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+			NavigationPane navPane=this.Control as NavigationPane;
+			if(navPane==null || dh==null)
+				return;
+
+            DesignerTransaction dt = dh.CreateTransaction();
+            try
+            {
+                IComponentChangeService change = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+                if (change != null)
+                    change.OnComponentChanging(this.Component, null);
+
+                ButtonItem item = null;
+                try
+                {
+                    m_CreatingItem = true;
+                    item = dh.CreateComponent(typeof(ButtonItem)) as ButtonItem;
+                    item.Text = item.Name;
+                    item.OptionGroup = "navBar";
+                    item.Image = Helpers.LoadBitmap("SystemImages.DefaultNavBarImage.png");
+                }
+                finally
+                {
+                    m_CreatingItem = false;
+                }
+
+                NavigationPanePanel panel = dh.CreateComponent(typeof(NavigationPanePanel)) as NavigationPanePanel;
+                panel.ParentItem = item;
+                navPane.Items.Add(item);
+                navPane.Controls.Add(panel);
+                panel.Dock = DockStyle.Fill;
+                panel.SendToBack();
+                panel.ApplyPanelStyle();
+                panel.ColorSchemeStyle = navPane.Style;
+                if (Helpers.IsOffice2007Style(navPane.Style))
+                    panel.ColorScheme = navPane.NavigationBar.GetColorScheme();
+                panel.Style.BackColor2.ColorSchemePart = eColorSchemePart.None;
+                panel.Style.Border = eBorderType.None;
+                panel.Style.BorderColor.ColorSchemePart = eColorSchemePart.PanelBorder;
+
+                if (navPane.Items.Count == 1)
+                    item.Checked = true;
+                navPane.RecalcLayout();
+                if (change != null)
+                    change.OnComponentChanged(this.Component, null, null, null);
+
+                if (change != null)
+                {
+                    change.OnComponentChanging(panel, null);
+                    change.OnComponentChanged(panel, null, null, null);
+                }
+            }
+            catch
+            {
+                dt.Cancel();
+            }
+            finally
+            {
+                if (!dt.Canceled) dt.Commit();
+            }
+		}
+
+		public override bool CanParent(Control c)
+		{
+			if(c is NavigationPanePanel)
+				return true;
+			return false;
+		}
+
+		protected override BaseItem GetItemContainer()
+		{
+			NavigationPane bar=this.Control as NavigationPane;
+			if(bar!=null)
+				return bar.NavigationBar.GetBaseItemContainer();
+			return null;
+		}
+
+		protected override System.Windows.Forms.Control GetItemContainerControl()
+		{
+			NavigationPane bar=this.Control as NavigationPane;
+			if(bar!=null)
+				return bar.NavigationBar;
+			return null;
+		}
+		/// <summary>
+		/// Triggered when some other component on the form is removed.
+		/// </summary>
+		protected override void OtherComponentRemoving(object sender, ComponentEventArgs e)
+		{
+			base.OtherComponentRemoving(sender,e);
+
+			NavigationPane bar=this.Component as NavigationPane;
+			if(bar==null || bar.IsDisposed)
+				return;
+
+			IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+			if(dh==null)
+				return;
+            IComponentChangeService cc = (IComponentChangeService)GetService(typeof(IComponentChangeService));
+
+			// Check is any of the buttons or panel that we host
+			if(!m_InternalRemoving && e.Component is BaseItem && dh.TransactionDescription.StartsWith("Delete "))
+			{
+                ButtonItem item = e.Component as ButtonItem;
+                if (item != null)
+                {
+                    NavigationPanePanel panel = bar.GetPanel(item);
+                    if (panel != null && dh != null)
+                    {
+                        DesignerTransaction dt = dh.CreateTransaction("Removing associated NavigationPanePanel");
+                        panel.ParentItem = null;
+                        if (cc != null) cc.OnComponentChanging(bar, TypeDescriptor.GetProperties(bar)["Controls"]);
+                        bar.Controls.Remove(panel);
+                        if (cc != null) cc.OnComponentChanged(bar, TypeDescriptor.GetProperties(bar)["Controls"], null, null);
+                        dh.DestroyComponent(panel);
+                        dt.Commit();
+                        bar.RecalcLayout();
+                    }
+                }
+			}
+			else if(!m_InternalRemoving && e.Component is NavigationPanePanel)
+			{
+				if(bar.Controls.Contains(e.Component as NavigationPanePanel))
+				{
+					NavigationPanePanel navpane=e.Component as NavigationPanePanel;
+                    if (navpane.ParentItem != null)
+                    {
+                        BaseItem item = navpane.ParentItem;
+                        navpane.ParentItem = null;
+                        if (cc != null) cc.OnComponentChanging(bar, TypeDescriptor.GetProperties(bar)["Items"]);
+                        bar.Items.Remove(item);
+                        if (cc != null) cc.OnComponentChanged(bar, TypeDescriptor.GetProperties(bar)["Items"], null, null);
+                        dh.DestroyComponent(item);
+                    }
+					bar.RecalcLayout();
+				}
+			}
+
+            if (bar.CheckedButton == null && bar.Items.Count > 0 && bar.Items[0] is ButtonItem)
+            {
+                ButtonItem buttonItem = (ButtonItem)bar.Items[0];
+                buttonItem.Checked = true;
+            }
+		}
+
+        protected override void PreFilterProperties(IDictionary properties)
+        {
+            base.PreFilterProperties(properties);
+            properties["Expanded"] = TypeDescriptor.CreateProperty(typeof(NavigationPaneDesigner), (PropertyDescriptor)properties["Expanded"], new Attribute[]
+				{
+					new DefaultValueAttribute(true),
+					new BrowsableAttribute(true),
+					new CategoryAttribute("Title"),
+                    new DescriptionAttribute("Indicates whether navigation pane can be collapsed.")});
+        }
+
+        /// <summary>
+        /// Gets or sets whether navigation pane is expanded. Default value is true. 
+        /// When control is collapsed it is reduced in size so it consumes less space.
+        /// </summary>
+        [Browsable(true), Category("Title"), DefaultValue(true), Description("Indicates whether navigation pane can be collapsed.")]
+        public bool Expanded
+        {
+            get { return (bool)ShadowProperties["Expanded"]; }
+            set
+            {
+                // this value is not passed to the actual control at design-time
+                this.ShadowProperties["Expanded"] = value;
+            }
+        }
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/NavigationPanePanelDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/NavigationPanePanelDesigner.cs
new file mode 100644
index 00000000..5244f188
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/NavigationPanePanelDesigner.cs	
@@ -0,0 +1,40 @@
+using System;
+using System.Windows.Forms.Design;
+using System.Collections;
+
+namespace DevComponents.DotNetBar.Design
+{
+	/// <summary>
+	/// Designer for Navigation Pane Panel.
+	/// </summary>
+	public class NavigationPanePanelDesigner:PanelExDesigner
+	{
+		public override SelectionRules SelectionRules
+		{
+			get{return (SelectionRules.Locked | SelectionRules.Visible);}
+		}
+
+#if FRAMEWORK20
+        public override void InitializeNewComponent(IDictionary defaultValues)
+        {
+            base.InitializeNewComponent(defaultValues);
+            SetDesignTimeDefaults();
+        }
+#else
+		public override void OnSetComponentDefaults()
+		{
+			base.OnSetComponentDefaults();
+			SetDesignTimeDefaults();
+		}
+#endif
+		private void SetDesignTimeDefaults()
+		{
+			PanelEx p = this.Control as PanelEx;
+			if (p == null)
+				return;
+			p.ApplyPanelStyle();
+            p.Style.BackColor2.ColorSchemePart = eColorSchemePart.None;
+			p.Text = "";
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/PageSliderDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/PageSliderDesigner.cs
new file mode 100644
index 00000000..35846b27
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/PageSliderDesigner.cs	
@@ -0,0 +1,218 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel;
+using System.ComponentModel.Design;
+using DevComponents.DotNetBar.Controls;
+using System.Collections;
+
+namespace DevComponents.DotNetBar.Design
+{
+    public class PageSliderDesigner : System.Windows.Forms.Design.ControlDesigner
+    {
+        public override void Initialize(IComponent component)
+        {
+            base.Initialize(component);
+            if (!component.Site.DesignMode)
+                return;
+
+            IComponentChangeService cc = (IComponentChangeService)GetService(typeof(IComponentChangeService));
+            if (cc != null)
+            {
+                cc.ComponentRemoved += new ComponentEventHandler(this.OnComponentRemoved);
+            }
+        }
+        protected override void Dispose(bool disposing)
+        {
+            IComponentChangeService cc = (IComponentChangeService)GetService(typeof(IComponentChangeService));
+            if (cc != null)
+            {
+                cc.ComponentRemoved -= new ComponentEventHandler(this.OnComponentRemoved);
+            }
+
+            base.Dispose(disposing);
+        }
+
+        private void OnComponentRemoved(object sender, ComponentEventArgs e)
+        {
+            if (e.Component is PageSliderPage)
+            {
+                PageSliderPage page = e.Component as PageSliderPage;
+                PageSlider slider = this.Control as PageSlider;
+
+                if (page != null && slider.Controls.Contains(page))
+                {
+                    IComponentChangeService cc = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+                    if (cc != null)
+                        cc.OnComponentChanging(slider, TypeDescriptor.GetProperties(slider)["Controls"]);
+
+                    slider.Controls.Remove(page);
+
+                    if (cc != null)
+                        cc.OnComponentChanged(slider, TypeDescriptor.GetProperties(slider)["Controls"], null, null);
+                }
+            }
+        }
+
+        public override void DoDefaultAction()
+        {
+        }
+
+        public override DesignerVerbCollection Verbs
+        {
+            get
+            {
+                DesignerVerb[] verbs = null;
+                verbs = new DesignerVerb[]
+					{
+						new DesignerVerb("Create Page", new EventHandler(CreatePage)),
+                        new DesignerVerb("Delete Page", new EventHandler(DeletePage)),
+                        new DesignerVerb("Next Page", new EventHandler(NextPage)),
+                        new DesignerVerb("Previous Page", new EventHandler(PreviousPage))
+                    };
+                return new DesignerVerbCollection(verbs);
+            }
+        }
+
+#if FRAMEWORK20
+        public override void InitializeNewComponent(IDictionary defaultValues)
+        {
+            base.InitializeNewComponent(defaultValues);
+            SetDesignTimeDefaults();
+        }
+#else
+		public override void OnSetComponentDefaults()
+		{
+			base.OnSetComponentDefaults();
+            SetDesignTimeDefaults();
+		}
+#endif
+
+        private void SetDesignTimeDefaults()
+        {
+        }
+
+        private void CreatePage(object sender, EventArgs e)
+        {
+            IDesignerHost dh = this.GetService(typeof(IDesignerHost)) as IDesignerHost;
+            IComponentChangeService cc = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+            ISelectionService ss = this.GetService(typeof(ISelectionService)) as ISelectionService;
+
+            CreatePage(this.Control as PageSlider, dh, cc, ss);
+        }
+
+        internal static PageSliderPage CreatePage(PageSlider parent, IDesignerHost dh, IComponentChangeService cc, ISelectionService ss)
+        {
+            DesignerTransaction dt = dh.CreateTransaction();
+            PageSliderPage page = null;
+            try
+            {
+                page = dh.CreateComponent(typeof(PageSliderPage)) as PageSliderPage;
+
+                if (cc != null)
+                    cc.OnComponentChanging(parent, TypeDescriptor.GetProperties(parent)["Controls"]);
+                parent.Controls.Add(page);
+                if (cc != null)
+                    cc.OnComponentChanged(parent, TypeDescriptor.GetProperties(parent)["Controls"], null, null);
+
+                if (ss != null)
+                    ss.SetSelectedComponents(new PageSliderPage[] { page }, SelectionTypes.Replace);
+
+                TypeDescriptor.GetProperties(parent)["SelectedPage"].SetValue(parent, page);
+            }
+            catch
+            {
+                dt.Cancel();
+            }
+            finally
+            {
+                if (!dt.Canceled)
+                    dt.Commit();
+            }
+
+            return page;
+        }
+
+        private void DeletePage(object sender, EventArgs e)
+        {
+            IDesignerHost dh = this.GetService(typeof(IDesignerHost)) as IDesignerHost;
+            IComponentChangeService cc = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+            PageSlider w = this.Control as PageSlider;
+            if (w == null)
+                return;
+            DeletePage(w.SelectedPage, dh, cc);
+        }
+
+        internal static void DeletePage(PageSliderPage page, IDesignerHost dh, IComponentChangeService cc)
+        {
+            if (page == null || !(page.Parent is PageSlider))
+                return;
+
+            PageSlider slider = (PageSlider)page.Parent;
+
+            DesignerTransaction dt = dh.CreateTransaction("Deleting page");
+
+            try
+            {
+                if (cc != null)
+                    cc.OnComponentChanging(slider, TypeDescriptor.GetProperties(slider)["Controls"]);
+
+                slider.Controls.Remove(page);
+
+                if (cc != null)
+                    cc.OnComponentChanged(slider, TypeDescriptor.GetProperties(slider)["Controls"], null, null);
+
+                dh.DestroyComponent(page);
+            }
+            catch
+            {
+                dt.Cancel();
+            }
+            finally
+            {
+                if (!dt.Canceled)
+                    dt.Commit();
+            }
+        }
+
+        private void NextPage(object sender, EventArgs e)
+        {
+            SelectNextPage(this.Control as PageSlider);
+        }
+
+        private void PreviousPage(object sender, EventArgs e)
+        {
+            SelectPreviousPage(this.Control as PageSlider);
+        }
+
+        internal static bool SelectNextPage(PageSlider slider)
+        {
+            if (slider == null)
+                return false;
+            if (slider.PageCount > 0)
+            {
+                if (slider.SelectedPageIndex < slider.PageCount - 1)
+                    slider.SelectedPageIndex++;
+                else
+                    slider.SelectedPageIndex = 0;
+                return true;
+            }
+            return false;
+        }
+
+        internal static bool SelectPreviousPage(PageSlider slider)
+        {
+            if (slider == null)
+                return false;
+            if (slider.PageCount > 0)
+            {
+                if (slider.SelectedPageIndex > 0)
+                    slider.SelectedPageIndex--;
+                else
+                    slider.SelectedPageIndex = slider.PageCount - 1;
+                return true;
+            }
+            return false;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/PageSliderPageDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/PageSliderPageDesigner.cs
new file mode 100644
index 00000000..a59ee003
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/PageSliderPageDesigner.cs	
@@ -0,0 +1,118 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows.Forms.Design;
+using DevComponents.DotNetBar.Controls;
+using System.ComponentModel.Design;
+using System.ComponentModel;
+using System.Drawing;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Design
+{
+    public class PageSliderPageDesigner : ScrollableControlDesigner
+    {
+        #region Internal Implementation
+        public override DesignerVerbCollection Verbs
+        {
+            get
+            {
+                DesignerVerb[] verbs = null;
+                verbs = new DesignerVerb[]
+					{
+						new DesignerVerb("Move Forward", new EventHandler(MovePageForward)),
+						new DesignerVerb("Move Backward", new EventHandler(MovePageBackward)),
+						new DesignerVerb("Make First", new EventHandler(MakeFirstPage)),
+                        new DesignerVerb("Make Last", new EventHandler(MakeLastPage))
+                    };
+                return new DesignerVerbCollection(verbs);
+            }
+        }
+
+        private void MovePageTo(PageSliderPage page, PageSlider slider, int newIndex)
+        {
+            IDesignerHost dh = this.GetService(typeof(IDesignerHost)) as IDesignerHost;
+            IComponentChangeService cc = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+            ISelectionService ss = this.GetService(typeof(ISelectionService)) as ISelectionService;
+
+            DesignerTransaction dt = dh.CreateTransaction("Moving page");
+            if (cc != null)
+                cc.OnComponentChanging(slider, TypeDescriptor.GetProperties(slider)["Controls"]);
+            slider.Controls.SetChildIndex(page, newIndex);
+            if (cc != null)
+                cc.OnComponentChanged(slider, TypeDescriptor.GetProperties(slider)["Controls"], null, null);
+            dt.Commit();
+        }
+        private void MovePageForward(object sender, EventArgs e)
+        {
+            PageSliderPage page = this.Control as PageSliderPage;
+            if (page == null) return;
+            PageSlider slider = page.Parent as PageSlider;
+            if (slider == null) return;
+            int newIndex = slider.Controls.IndexOf(page);
+            if (newIndex < slider.PageCount - 1)
+                newIndex++;
+            else
+                newIndex = 0;
+
+            MovePageTo(page, slider, newIndex);
+        }
+        private void MovePageBackward(object sender, EventArgs e)
+        {
+            PageSliderPage page = this.Control as PageSliderPage;
+            if (page == null) return;
+            PageSlider slider = page.Parent as PageSlider;
+            if (slider == null) return;
+            int newIndex = slider.Controls.IndexOf(page);
+            if (newIndex > 0)
+                newIndex--;
+            else
+                newIndex = slider.PageCount - 1;
+
+            MovePageTo(page, slider, newIndex);
+        }
+        private void MakeFirstPage(object sender, EventArgs e)
+        {
+            PageSliderPage page = this.Control as PageSliderPage;
+            if (page == null) return;
+            PageSlider slider = page.Parent as PageSlider;
+            if (slider == null) return;
+            MovePageTo(page, slider, 0);
+        }
+        private void MakeLastPage(object sender, EventArgs e)
+        {
+            PageSliderPage page = this.Control as PageSliderPage;
+            if (page == null) return;
+            PageSlider slider = page.Parent as PageSlider;
+            if (slider == null) return;
+            MovePageTo(page, slider, slider.PageCount - 1);
+        }
+        public override SelectionRules SelectionRules
+        {
+            get { return SelectionRules.Locked; }
+        }
+
+        protected override void OnPaintAdornments(PaintEventArgs pe)
+        {
+            PageSliderPage p;
+            p = this.Component as PageSliderPage;
+            if (p != null)
+            {
+                this.DrawBorder(pe.Graphics);
+            }
+            base.OnPaintAdornments(pe);
+        }
+
+
+        private void DrawBorder(Graphics g)
+        {
+            PageSliderPage panel = this.Control as PageSliderPage;
+            Color border = SystemColors.ControlDarkDark;
+            Rectangle rClient = this.Control.ClientRectangle;
+            Color backColor = Color.Empty;
+
+            Helpers.DrawDesignTimeSelection(g, rClient, backColor, border, 1);
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/PanelControlDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/PanelControlDesigner.cs
new file mode 100644
index 00000000..c95ea8c1
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/PanelControlDesigner.cs	
@@ -0,0 +1,123 @@
+using System;
+using System.Windows.Forms;
+using System.Windows.Forms.Design;
+using System.Collections;
+using System.Drawing;
+using System.ComponentModel.Design;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar.Design
+{
+    /// <summary>
+    /// Windows Forms Designer for PanelControl
+    /// </summary>
+    public class PanelControlDesigner : System.Windows.Forms.Design.ScrollableControlDesigner
+    {
+        public override DesignerVerbCollection Verbs
+        {
+            get
+            {
+                DesignerVerb[] verbs;
+                verbs = new DesignerVerb[]
+				{
+					new DesignerVerb("Apply Panel Style", new EventHandler(ApplyPanelStyle)),
+					new DesignerVerb("Apply Button Style", new EventHandler(ApplyButtonStyle)),
+					new DesignerVerb("Apply Label Style", new EventHandler(ApplyLabelStyle))
+				};
+                return new DesignerVerbCollection(verbs);
+            }
+        }
+
+        private void ApplyPanelStyle(object sender, EventArgs e)
+        {
+            PanelControl p = this.Control as PanelControl;
+            if (p == null)
+                return;
+
+            IComponentChangeService change = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+            if (change != null)
+                change.OnComponentChanging(this.Component, null);
+
+            p.ApplyPanelStyle();
+
+            if (change != null)
+                change.OnComponentChanged(this.Component, null, null, null);
+        }
+
+        private void ApplyButtonStyle(object sender, EventArgs e)
+        {
+            PanelControl p = this.Control as PanelControl;
+            if (p == null)
+                return;
+
+            IComponentChangeService change = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+            if (change != null)
+                change.OnComponentChanging(this.Component, null);
+
+            p.ApplyButtonStyle();
+
+            if (change != null)
+                change.OnComponentChanged(this.Component, null, null, null);
+        }
+
+        private void ApplyLabelStyle(object sender, EventArgs e)
+        {
+            PanelControl p = this.Control as PanelControl;
+            if (p == null)
+                return;
+
+            IComponentChangeService change = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+            if (change != null)
+                change.OnComponentChanging(this.Component, null);
+
+            p.ApplyLabelStyle();
+
+            if (change != null)
+                change.OnComponentChanged(this.Component, null, null, null);
+        }
+#if FRAMEWORK20
+        public override void InitializeNewComponent(IDictionary defaultValues)
+        {
+            base.InitializeNewComponent(defaultValues);
+            SetDesignTimeDefaults();
+        }
+#else
+		public override void OnSetComponentDefaults()
+		{
+			base.OnSetComponentDefaults();
+            SetDesignTimeDefaults();
+		}
+#endif
+
+        protected virtual void SetDesignTimeDefaults()
+        {
+            PanelControl p = this.Control as PanelControl;
+            if (p == null)
+                return;
+            p.ApplyPanelStyle();
+            p.CanvasColor = SystemColors.Control;
+        }
+
+        protected override void OnPaintAdornments(PaintEventArgs pe)
+        {
+            PanelControl p = this.Component as PanelControl;
+            if (p != null && p.Style.Border == eStyleBorderType.None)
+                this.DrawBorder(pe.Graphics);
+            base.OnPaintAdornments(pe);
+        }
+
+        /// <summary>
+        /// Draws design-time border around the panel when panel does not have one.
+        /// </summary>
+        /// <param name="g"></param>
+        protected virtual void DrawBorder(Graphics g)
+        {
+            PanelControl panel = this.Control as PanelControl;
+            Color border = SystemColors.ControlDarkDark;
+            Rectangle rClient = this.Control.ClientRectangle;
+            Color backColor = panel.Style.BackColor;
+
+            Helpers.DrawDesignTimeSelection(g, rClient, backColor, border, 1);
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/PanelDockContainerDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/PanelDockContainerDesigner.cs
new file mode 100644
index 00000000..45e18827
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/PanelDockContainerDesigner.cs	
@@ -0,0 +1,41 @@
+using System;
+using System.Windows.Forms.Design;
+using System.Collections;
+
+namespace DevComponents.DotNetBar.Design
+{
+	#region PanelDockContainerDesigner
+	/// <summary>
+	/// Designer for Tab Control Panel.
+	/// </summary>
+	public class PanelDockContainerDesigner:PanelExDesigner
+	{
+		public override SelectionRules SelectionRules
+		{
+			get{return (SelectionRules.Locked | SelectionRules.Visible);}
+		}
+#if FRAMEWORK20
+        public override void InitializeNewComponent(IDictionary defaultValues)
+        {
+            base.InitializeNewComponent(defaultValues);
+            SetDesignTimeDefaults();
+        }
+#else
+		public override void OnSetComponentDefaults()
+		{
+			base.OnSetComponentDefaults();
+			SetDesignTimeDefaults();
+		}
+#endif
+
+		private void SetDesignTimeDefaults()
+		{
+			PanelDockContainer p = this.Control as PanelDockContainer;
+			if (p == null)
+				return;
+			p.ApplyLabelStyle();
+			p.Text = "";
+		}
+	}
+	#endregion
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/PanelExDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/PanelExDesigner.cs
new file mode 100644
index 00000000..722216e9
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/PanelExDesigner.cs	
@@ -0,0 +1,125 @@
+using System;
+using System.Windows.Forms;
+using System.Windows.Forms.Design;
+using System.Collections;
+using System.Drawing;
+using System.ComponentModel.Design;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar.Design
+{
+	/// <summary>
+	/// Summary description for PanelExDesigner.
+	/// </summary>
+	public class PanelExDesigner:System.Windows.Forms.Design.ScrollableControlDesigner
+	{
+		public override DesignerVerbCollection Verbs 
+		{
+			get 
+			{
+				DesignerVerb[] verbs;
+				verbs = new DesignerVerb[]
+				{
+					new DesignerVerb("Apply Panel Style", new EventHandler(ApplyPanelStyle)),
+					new DesignerVerb("Apply Button Style", new EventHandler(ApplyButtonStyle)),
+					new DesignerVerb("Apply Label Style", new EventHandler(ApplyLabelStyle))
+				};
+				return new DesignerVerbCollection(verbs);
+			}
+		}
+
+		private void ApplyPanelStyle(object sender, EventArgs e)
+		{
+			PanelEx p=this.Control as PanelEx;
+			if(p==null)
+				return;
+
+			IComponentChangeService change=this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+			if(change!=null)
+				change.OnComponentChanging(this.Component,null);
+
+			p.ApplyPanelStyle();
+
+			if(change!=null)
+				change.OnComponentChanged(this.Component,null,null,null);
+		}
+
+		private void ApplyButtonStyle(object sender, EventArgs e)
+		{
+			PanelEx p=this.Control as PanelEx;
+			if(p==null)
+				return;
+			
+			IComponentChangeService change=this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+			if(change!=null)
+				change.OnComponentChanging(this.Component,null);
+
+			p.ApplyButtonStyle();
+
+			if(change!=null)
+				change.OnComponentChanged(this.Component,null,null,null);
+		}
+
+		private void ApplyLabelStyle(object sender, EventArgs e)
+		{
+			PanelEx p=this.Control as PanelEx;
+			if(p==null)
+				return;
+			
+			IComponentChangeService change=this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+			if(change!=null)
+				change.OnComponentChanging(this.Component,null);
+
+			p.ApplyLabelStyle();
+
+			if(change!=null)
+				change.OnComponentChanged(this.Component,null,null,null);
+		}
+#if FRAMEWORK20
+        public override void InitializeNewComponent(IDictionary defaultValues)
+        {
+            base.InitializeNewComponent(defaultValues);
+            SetDesignTimeDefaults();
+        }
+#else
+		public override void OnSetComponentDefaults()
+		{
+			base.OnSetComponentDefaults();
+            SetDesignTimeDefaults();
+		}
+#endif
+
+        protected virtual void SetDesignTimeDefaults()
+        {
+            PanelEx p = this.Control as PanelEx;
+            if (p == null)
+                return;
+            p.ApplyPanelStyle();
+            p.CanvasColor = SystemColors.Control;
+            p.ColorSchemeStyle = eDotNetBarStyle.StyleManagerControlled;
+        }
+
+		protected override void OnPaintAdornments(PaintEventArgs pe) 
+		{
+			PanelEx p;
+			p = this.Component as PanelEx;
+            if (p != null)
+            {
+                if (p.Style.Border == eBorderType.None)
+                    this.DrawBorder(pe.Graphics);
+            }
+			base.OnPaintAdornments(pe);
+		}
+
+		
+		private void DrawBorder(Graphics g) 
+		{
+			PanelEx panel=this.Control as PanelEx;
+            Color border=SystemColors.ControlDarkDark;
+			Rectangle rClient = this.Control.ClientRectangle;
+			Color backColor = panel.Style.BackColor1.Color;
+
+			Helpers.DrawDesignTimeSelection(g,rClient,backColor,border,1);
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ProgressStepsDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ProgressStepsDesigner.cs
new file mode 100644
index 00000000..4c58c044
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ProgressStepsDesigner.cs	
@@ -0,0 +1,197 @@
+using DevComponents.DotNetBar.Rendering;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.ComponentModel.Design;
+using System.Text;
+
+namespace DevComponents.DotNetBar.Design
+{
+    /// <summary>
+    /// Designer for ProgressSteps control.
+    /// </summary>
+    public class ProgressStepsDesigner : BarBaseControlDesigner
+    {
+        public ProgressStepsDesigner()
+		{
+			this.EnableItemDragDrop=true;
+		}
+
+        public override void Initialize(IComponent component)
+        {
+            base.Initialize(component);
+            if (component == null || component.Site == null || !component.Site.DesignMode)
+                return;
+
+#if !TRIAL
+            IDesignerHost dh = this.GetService(typeof(IDesignerHost)) as IDesignerHost;
+            if (dh != null)
+                dh.LoadComplete += new EventHandler(dh_LoadComplete);
+#endif
+        }
+
+#if FRAMEWORK20
+        public override void InitializeNewComponent(IDictionary defaultValues)
+        {
+            base.InitializeNewComponent(defaultValues);
+            SetDesignTimeDefaults();
+        }
+#else
+		public override void OnSetComponentDefaults()
+		{
+            SetDesignTimeDefaults();
+			base.OnSetComponentDefaults();
+		}
+#endif
+
+        protected virtual void SetDesignTimeDefaults()
+        {
+            ProgressSteps ps = this.Control as ProgressSteps;
+            ps.BackgroundStyle.Class = ElementStyleClassKeys.ProgressStepsKey;
+            BaseItem cont = this.GetDefaultNewItemContainer();
+            StepItem item = CreateStepItem(cont);
+            item.Text = "Step 1";
+            item = CreateStepItem(cont);
+            item.Text = "Step 2";
+            item = CreateStepItem(cont);
+            item.Text = "Step 3";
+
+#if !TRIAL
+            string key = GetLicenseKey();
+            ps.LicenseKey = key;
+#endif
+        }
+
+        public override DesignerVerbCollection Verbs
+        {
+            get
+            {
+                DesignerVerb[] verbs = null;
+                verbs = new DesignerVerb[]
+						{
+							new DesignerVerb("Add Item", new EventHandler(CreateItem))
+                        };
+                return new DesignerVerbCollection(verbs);
+            }
+        }
+
+        //protected override bool GetHitTest(Point pt)
+        //{
+        //    ItemPanel panel = this.Control as ItemPanel;
+        //    if (panel != null && panel.IsHandleCreated && panel.AutoScroll)
+        //    {
+        //        Point p = panel.PointToClient(pt);
+        //        if (panel.VScrollBar != null && panel.VScrollBar.Bounds.Contains(p))
+        //            return true;
+        //        if (panel.HScrollBar != null && panel.HScrollBar.Bounds.Contains(p))
+        //            return true;
+
+        //    }
+        //    return base.GetHitTest(pt);
+        //}
+
+        private void CreateItem(object sender, EventArgs e)
+        {
+            OnSubItemsChanging();
+            CreateStepItem(this.GetDefaultNewItemContainer());
+            OnSubItemsChanged();
+        }
+        protected virtual StepItem CreateStepItem(BaseItem parent)
+        {
+            if (parent == null)
+                return null;
+            StepItem item = null;
+
+            IDesignerHost dh = (IDesignerHost)GetService(typeof(IDesignerHost));
+            if (dh != null)
+            {
+                DesignerTransaction trans = dh.CreateTransaction("Adding new item");
+                try
+                {
+                    m_CreatingItem = true;
+                    item = dh.CreateComponent(typeof(StepItem)) as StepItem;
+                    if (item == null)
+                        return null;
+
+                    TypeDescriptor.GetProperties(item)["Text"].SetValue(item, item.Name);
+
+                    IComponentChangeService cc = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+                    if (parent != this.GetDefaultNewItemContainer() && cc != null)
+                        cc.OnComponentChanging(parent, TypeDescriptor.GetProperties(typeof(BaseItem))["SubItems"]);
+
+                    parent.SubItems.Add(item);
+                    this.RecalcLayout();
+
+                    if (parent != this.GetDefaultNewItemContainer() && cc != null)
+                        cc.OnComponentChanged(parent, TypeDescriptor.GetProperties(typeof(BaseItem))["SubItems"], null, null);
+
+                    OnitemCreated(item);
+                }
+                catch
+                {
+                    trans.Cancel();
+                }
+                finally
+                {
+                    if (!trans.Canceled)
+                        trans.Commit();
+                    m_CreatingItem = false;
+                }
+            }
+            return item;
+        }
+
+        private void RemoveDescriptors(System.Collections.IDictionary properties, String[] propNames)
+        {
+            foreach (String propName in propNames)
+            {
+                if (properties.Contains(propName))
+                {
+                    if (properties[propName] is PropertyDescriptor)
+                        properties[propName] = TypeDescriptor.CreateProperty(this.Component.GetType(), (PropertyDescriptor)properties[propName], new BrowsableAttribute(false));
+                    else if (properties[propName] is EventDescriptor)
+                        properties[propName] = TypeDescriptor.CreateEvent(this.Component.GetType(), (EventDescriptor)properties[propName], new BrowsableAttribute(false));
+                    else
+                        properties.Remove(propName);
+                }
+            }
+        }
+
+        protected override void PreFilterProperties(System.Collections.IDictionary properties)
+        {
+            base.PreFilterProperties(properties);
+            RemoveDescriptors(properties,
+                new String[] { "ForeColor" });
+        }
+
+        #region Licensing Stuff
+#if !TRIAL
+        protected string GetLicenseKey()
+        {
+            string key = "";
+            Microsoft.Win32.RegistryKey regkey = Microsoft.Win32.Registry.LocalMachine;
+            regkey = regkey.OpenSubKey("Software\\DevComponents\\Licenses", false);
+            if (regkey != null)
+            {
+                object keyValue = regkey.GetValue("DevComponents.DotNetBar.DotNetBarManager2");
+                if (keyValue != null)
+                    key = keyValue.ToString();
+            }
+            return key;
+        }
+        private void dh_LoadComplete(object sender, EventArgs e)
+        {
+            IDesignerHost dh = this.GetService(typeof(IDesignerHost)) as IDesignerHost;
+            if (dh != null)
+                dh.LoadComplete -= new EventHandler(dh_LoadComplete);
+
+            string key = GetLicenseKey();
+            ProgressSteps ps = this.Control as ProgressSteps;
+            if (key != "" && ps != null && ps.LicenseKey == "" && ps.LicenseKey != key)
+                TypeDescriptor.GetProperties(ps)["LicenseKey"].SetValue(ps, key);
+        }
+#endif
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/RadialMenu/RadialMenuActionList.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/RadialMenu/RadialMenuActionList.cs
new file mode 100644
index 00000000..38aac2b0
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/RadialMenu/RadialMenuActionList.cs	
@@ -0,0 +1,63 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel.Design;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar.Design
+{
+    class RadialMenuActionList : DesignerActionList
+    {
+        private RadialMenuDesigner _Designer = null;
+
+        /// <summary>
+        /// Initializes a new instance of the AdvTreeActionList class.
+        /// </summary>
+        /// <param name="designer"></param>
+        public RadialMenuActionList(RadialMenuDesigner designer)
+            : base(designer.Component)
+        {
+            _Designer = designer;
+        }
+
+        public override DesignerActionItemCollection GetSortedActionItems()
+        {
+            DesignerActionItemCollection items = new DesignerActionItemCollection();
+            items.Add(new DesignerActionHeaderItem("Menu Items"));
+            items.Add(new DesignerActionHeaderItem("Menu Type"));
+            items.Add(new DesignerActionHeaderItem("Appearance"));
+
+            items.Add(new DesignerActionMethodItem(this, "EditItems", "Edit Items", "Menu Items", true));
+            items.Add(new DesignerActionMethodItem(this, "RightSize", "Right Size Control", "Appearance", true));
+
+            items.Add(new DesignerActionPropertyItem("MenuType", "Type of Radial Menu", "Menu Type", "Specifies the type of radial menu displayed."));
+   
+            return items;
+        }
+
+        public void EditItems()
+        {
+            _Designer.EditItems();
+        }
+
+        public void RightSize()
+        {
+            ((RadialMenu)_Designer.Control).Size = new System.Drawing.Size(28, 28);
+        }
+
+
+        public eRadialMenuType MenuType
+        {
+            get
+            {
+                return ((RadialMenu)base.Component).MenuType;
+            }
+            set
+            {
+                TypeDescriptor.GetProperties(base.Component)["MenuType"].SetValue(base.Component, value);
+            }
+        }
+
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/RadialMenu/RadialMenuDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/RadialMenu/RadialMenuDesigner.cs
new file mode 100644
index 00000000..7733ff95
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/RadialMenu/RadialMenuDesigner.cs	
@@ -0,0 +1,98 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows.Forms.Design;
+using System.ComponentModel.Design;
+using DevComponents.DotNetBar;
+using System.Windows.Forms;
+using System.Drawing;
+using System.Collections;
+namespace DevComponents.DotNetBar.Design
+{
+    public class RadialMenuDesigner : ControlDesigner
+    {
+        #region Implementation
+        public override System.Collections.ICollection AssociatedComponents
+        {
+            get
+            {
+                ArrayList c = new ArrayList(base.AssociatedComponents);
+                RadialMenu menu = this.Control as RadialMenu;
+                if (menu != null)
+                {
+                    foreach (BaseItem item in menu.Items)
+                    {
+                        if (item.DesignMode)
+                            c.Add(item);
+                    }
+                }
+                return c;
+            }
+        }
+
+        public override void InitializeNewComponent(System.Collections.IDictionary defaultValues)
+        {
+            RadialMenu menu = this.Control as RadialMenu;
+            menu.Symbol = "\uf043";
+            menu.SymbolSize = 13;
+            if (defaultValues != null)
+            {
+                if (defaultValues.Contains("Size"))
+                {
+                    defaultValues["Size"] = new Size(28, 28);
+                }
+            }
+            base.InitializeNewComponent(defaultValues);
+        }
+
+        private DesignerActionListCollection _ActionLists = null;
+        public override DesignerActionListCollection ActionLists
+        {
+            get
+            {
+                if (this._ActionLists == null)
+                {
+                    this._ActionLists = new DesignerActionListCollection();
+                    this._ActionLists.Add(new RadialMenuActionList(this));
+                }
+                return this._ActionLists;
+            }
+        }
+
+        public void EditItems()
+        {
+            RadialMenu radialMenu = this.Component as RadialMenu;
+
+            Form form = new Form();
+            form.Text = "Radial Menu Editor";
+            form.FormBorderStyle = FormBorderStyle.Sizable;
+            form.MinimizeBox = false;
+            //form.MaximizeBox = false;
+            form.StartPosition = FormStartPosition.CenterScreen;
+            RadialMenuItemEditor editor = new RadialMenuItemEditor();
+            editor.Dock = DockStyle.Fill;
+            form.ClientSize = new System.Drawing.Size(722, 660);
+            form.Controls.Add(editor);
+            form.BackColor = Color.White;
+            editor.RadialMenu = radialMenu;
+            editor.Designer = this;
+            editor.UpdateDisplay();
+            form.ShowDialog();
+            form.Dispose();
+        }
+
+        public object GetDesignService(Type serviceType)
+        {
+            return GetService(serviceType);
+        }
+
+        public override SelectionRules SelectionRules
+        {
+            get
+            {
+                return SelectionRules.Moveable | SelectionRules.Visible;
+            }
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/RadialMenu/RadialMenuItemDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/RadialMenu/RadialMenuItemDesigner.cs
new file mode 100644
index 00000000..5192c1b2
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/RadialMenu/RadialMenuItemDesigner.cs	
@@ -0,0 +1,49 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel;
+using System.Collections;
+
+namespace DevComponents.DotNetBar.Design
+{
+    public class RadialMenuItemDesigner : BaseItemDesigner
+    {
+        #region Implementation
+        private void RemoveDescriptors(System.Collections.IDictionary properties, String[] propNames)
+        {
+            foreach (String propName in propNames)
+            {
+                if (properties.Contains(propName))
+                {
+                    if (properties[propName] is PropertyDescriptor)
+                        properties[propName] = TypeDescriptor.CreateProperty(this.Component.GetType(), (PropertyDescriptor)properties[propName], new BrowsableAttribute(false));
+                    else if (properties[propName] is EventDescriptor)
+                        properties[propName] = TypeDescriptor.CreateEvent(this.Component.GetType(), (EventDescriptor)properties[propName], new BrowsableAttribute(false));
+                    else
+                        properties.Remove(propName);
+                }
+            }
+        }
+
+        protected override void PreFilterProperties(System.Collections.IDictionary properties)
+        {
+            base.PreFilterProperties(properties);
+            RemoveDescriptors(properties,
+                new String[] {  "ItemAlignment", 
+                                "GlobalItem",
+                                "AccessibleDefaultActionDescription",
+                                "AccessibleDescription",
+                                "AccessibleName",
+                                "AccessibleRole",
+                                "CanCustomize",
+                                "Category",
+                                "KeyTips",
+                                "Shortcuts",
+                                "ThemeAware",
+                                "GlobalName", 
+                                "Stretch", 
+                                "BeginGroup" });
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/RadialMenu/RadialMenuItemEditor.Designer.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/RadialMenu/RadialMenuItemEditor.Designer.cs
new file mode 100644
index 00000000..820a9d4e
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/RadialMenu/RadialMenuItemEditor.Designer.cs differ
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/RadialMenu/RadialMenuItemEditor.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/RadialMenu/RadialMenuItemEditor.cs
new file mode 100644
index 00000000..934f33ce
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/RadialMenu/RadialMenuItemEditor.cs	
@@ -0,0 +1,529 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Data;
+using System.Text;
+using System.Windows.Forms;
+using System.ComponentModel.Design;
+using System.Windows.Forms.Design;
+using System.Reflection;
+using DevComponents.AdvTree;
+
+namespace DevComponents.DotNetBar.Design
+{
+    public partial class RadialMenuItemEditor : UserControl
+    {
+        private RadialMenuDesigner _Designer = null;
+        private RadialMenuContainer _RadialMenuContainer = null;
+        private RadialMenu _RadialMenu = null;
+        public RadialMenuItemEditor()
+        {
+            InitializeComponent();
+        }
+
+        #region Implementation
+        private object GetDesignService(Type serviceType)
+        {
+            if (_Designer != null)
+            {
+                return _Designer.GetDesignService(serviceType);
+            }
+            return null;
+        }
+
+        private RadialMenuItem CreateItem()
+        {
+            IDesignerHost dh = (IDesignerHost)GetDesignService(typeof(IDesignerHost));
+            if (dh == null)
+                return null;
+
+            RadialMenuItem item = (RadialMenuItem)dh.CreateComponent(typeof(RadialMenuItem));
+            int index = 1;
+            if (_RadialMenu != null)
+                index = _RadialMenu.Items.Count + 1;
+            else if (_RadialMenuContainer != null)
+                index = _RadialMenuContainer.SubItems.Count + 1;
+
+            item.Text = "Item " + index.ToString();
+            return item;
+        }
+
+        private void AddNewItem()
+        {
+            AddNewItem(null);
+        }
+
+        private void OnComponentChanging(RadialMenuItem parent, IComponentChangeService cc)
+        {
+            if (parent == null)
+            {
+                if (_RadialMenu != null)
+                    cc.OnComponentChanging(_RadialMenu, TypeDescriptor.GetProperties(_RadialMenu)["Items"]);
+                else if (_RadialMenuContainer != null)
+                    cc.OnComponentChanging(_RadialMenuContainer, TypeDescriptor.GetProperties(_RadialMenuContainer)["SubItems"]);
+            }
+            else
+                cc.OnComponentChanging(parent, TypeDescriptor.GetProperties(parent)["SubItems"]);
+        }
+        private void OnComponentChanged(RadialMenuItem parent, IComponentChangeService cc)
+        {
+            if (parent == null)
+            {
+                if (_RadialMenu != null)
+                    cc.OnComponentChanged(_RadialMenu, TypeDescriptor.GetProperties(_RadialMenu)["Items"], null, null);
+                else if (_RadialMenuContainer != null)
+                    cc.OnComponentChanged(_RadialMenuContainer, TypeDescriptor.GetProperties(_RadialMenuContainer)["SubItems"], null, null);
+            }
+            else
+                cc.OnComponentChanged(parent, TypeDescriptor.GetProperties(parent)["SubItems"], null, null);
+        }
+        private void AddNewItem(RadialMenuItem parent)
+        {
+            IDesignerHost dh = (IDesignerHost)GetDesignService(typeof(IDesignerHost));
+            DesignerTransaction dt = null;
+            if (dh != null)
+            {
+                dt = dh.CreateTransaction("New RadialMenuItem");
+            }
+            //bool isEmpty = advTree1.Nodes.Count == 0;
+            RadialMenuItem item = CreateItem();
+            if (item == null) return;
+
+            IComponentChangeService cc = GetDesignService(typeof(IComponentChangeService)) as IComponentChangeService;
+            if (cc != null)
+            {
+                OnComponentChanging(parent, cc);
+            }
+
+            if (parent == null)
+            {
+                if (_RadialMenu != null)
+                    _RadialMenu.Items.Add(item);
+                else if (_RadialMenuContainer != null)
+                    _RadialMenuContainer.SubItems.Add(item);
+            }
+            else
+                parent.SubItems.Add(item);
+
+            if (cc != null)
+            {
+                OnComponentChanged(parent, cc);
+            }
+
+            if (dt != null)
+                dt.Commit();
+            Node node = CreateNodeForItem(item);
+            if (parent == null)
+                advTree1.Nodes.Add(node);
+            else
+            {
+                advTree1.SelectedNode.Nodes.Add(node);
+                advTree1.SelectedNode.Expand();
+            }
+
+            //if (isEmpty && advTree1.SelectedNode == null && advTree1.Nodes.Count > 0)
+            //    advTree1.SelectedNode = advTree1.Nodes[0];
+            advTree1.SelectedNode = node;
+        }
+        #endregion
+
+        private void RadialMenuItemEditor_Load(object sender, EventArgs e)
+        {
+            IUIService service = GetDesignService(typeof(IUIService)) as IUIService;
+            if (service != null)
+            {
+                PropertyInfo pi = propertyGrid1.GetType().GetProperty("ToolStripRenderer", System.Reflection.BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance);
+                if (pi != null)
+                {
+                    pi.SetValue(propertyGrid1, (ToolStripProfessionalRenderer)service.Styles["VsToolWindowRenderer"], null);
+                }
+            }
+        }
+
+        private void advTree1_MouseUp(object sender, MouseEventArgs e)
+        {
+            Node node = advTree1.GetNodeAt(e.Y);
+            if (node == null) advTree1.SelectedNode = null;
+        }
+
+        internal void UpdateDisplay()
+        {
+            advTree1.Nodes.Clear();
+            if (_RadialMenu == null && _RadialMenuContainer == null) return;
+
+            advTree1.BeginUpdate();
+
+            SubItemsCollection collection = null;
+            if (_RadialMenu != null)
+                collection = _RadialMenu.Items;
+            else
+                collection = _RadialMenuContainer.SubItems;
+
+            foreach (BaseItem item in collection)
+            {
+                RadialMenuItem menu = item as RadialMenuItem;
+                if (menu != null)
+                {
+                    Node node = CreateNodeForItem(menu);
+                    advTree1.Nodes.Add(node);
+                    LoadSubItems(node, menu);
+                }
+            }
+
+            advTree1.EndUpdate();
+        }
+
+        private void LoadSubItems(Node parent, RadialMenuItem item)
+        {
+            foreach (BaseItem o in item.SubItems)
+            {
+                if (o is RadialMenuItem)
+                {
+                    RadialMenuItem menu = (RadialMenuItem)o;
+                    Node node = CreateNodeForItem(menu);
+                    parent.Nodes.Add(node);
+                    LoadSubItems(node, menu);
+                }
+            }
+        }
+
+        private Node CreateNodeForItem(RadialMenuItem item)
+        {
+            Node node = new Node();
+            node.Expanded = true;
+            node.Tag = item;
+            node.Text = item.Text + " [" + item.Name + "]";
+            //node.Image = item.GetItemImage();
+            //node.Cells.Add(new Cell(item.Name));
+            return node;
+        }
+        private string GetText(RadialMenuItem item)
+        {
+            return item.Text + " [" + item.Name + "]";
+        }
+
+        public RadialMenuDesigner Designer
+        {
+            get { return _Designer; }
+            set
+            {
+                _Designer = value;
+                if (_Designer != null)
+                    this.propertyGrid1.Site = new PropertyGridSite((IServiceProvider)_Designer.Component.Site, this.propertyGrid1);
+            }
+        }
+
+        public RadialMenu RadialMenu
+        {
+            get { return _RadialMenu; }
+            set
+            {
+                if (value != _RadialMenu)
+                {
+                    RadialMenu oldValue = _RadialMenu;
+                    _RadialMenu = value;
+                    OnRadialMenuChanged(oldValue, value);
+                }
+            }
+        }
+        private void OnRadialMenuChanged(RadialMenu oldValue, RadialMenu newValue)
+        {
+            UpdateDisplay();
+        }
+
+        public RadialMenuContainer RadialMenuContainer
+        {
+            get { return _RadialMenuContainer; }
+            set
+            {
+                if (value != _RadialMenuContainer)
+                {
+                    RadialMenuContainer oldValue = _RadialMenuContainer;
+                    _RadialMenuContainer = value;
+                    OnRadialMenuContainerChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when RadialMenuContainer property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnRadialMenuContainerChanged(RadialMenuContainer oldValue, RadialMenuContainer newValue)
+        {
+            UpdateDisplay();
+        }
+
+        private void buttonAddItem_Click(object sender, EventArgs e)
+        {
+            AddNewItem(null);
+        }
+
+        private void buttonNewSubMenu_Click(object sender, EventArgs e)
+        {
+            RadialMenuItem parent = null;
+            if (advTree1.SelectedNode != null) parent = advTree1.SelectedNode.Tag as RadialMenuItem;
+            AddNewItem(parent);
+        }
+
+        private void buttonRemoveItem_Click(object sender, EventArgs e)
+        {
+            if (advTree1.SelectedNode == null) return;
+            RadialMenuItem item = advTree1.SelectedNode.Tag as RadialMenuItem;
+            if (item == null) return;
+            advTree1.SelectedNode.Remove();
+            DeleteItem(item);
+        }
+
+        private void DeleteItem(RadialMenuItem item)
+        {
+            IDesignerHost dh = (IDesignerHost)GetDesignService(typeof(IDesignerHost));
+            if (dh == null)
+                return;
+
+            IComponentChangeService cc = GetDesignService(typeof(IComponentChangeService)) as IComponentChangeService;
+            RadialMenuItem parent = item.Parent as RadialMenuItem;
+            if (cc != null)
+                OnComponentChanging(parent, cc);
+
+            if (parent == null)
+            {
+                if (_RadialMenu != null)
+                    _RadialMenu.Items.Remove(item);
+                else if (_RadialMenuContainer != null)
+                    _RadialMenuContainer.SubItems.Remove(item);
+            }
+            else
+                parent.SubItems.Remove(item);
+
+            if (cc != null)
+                OnComponentChanged(parent, cc);
+
+            dh.DestroyComponent(item);
+        }
+
+        private void advTree1_AfterNodeSelect(object sender, AdvTreeNodeEventArgs e)
+        {
+            buttonRemove.Enabled = e.Node != null;
+            buttonNewSubMenu.Enabled = e.Node != null;
+            if (e.Node != null)
+                propertyGrid1.SelectedObject = e.Node.Tag;
+            else
+                propertyGrid1.SelectedObject = null;
+        }
+
+        private void advTree1_AfterNodeDrop(object sender, TreeDragDropEventArgs e)
+        {
+            IDesignerHost dh = (IDesignerHost)GetDesignService(typeof(IDesignerHost));
+            DesignerTransaction dt = null;
+            if (dh != null) dt = dh.CreateTransaction("Move items");
+
+            IComponentChangeService cc = GetDesignService(typeof(IComponentChangeService)) as IComponentChangeService;
+
+            try
+            {
+                RadialMenuItem movedItem = e.Node.Tag as RadialMenuItem;
+                RadialMenuItem parent = movedItem.Parent as RadialMenuItem;
+                
+                if (cc != null)
+                {
+                    OnComponentChanging(parent, cc);
+                }
+
+                if (parent == null)
+                {
+                    if (_RadialMenu != null)
+                        _RadialMenu.Items.Remove(movedItem);
+                    else if (_RadialMenuContainer != null)
+                        _RadialMenuContainer.SubItems.Remove(movedItem);
+                }
+                else
+                    parent.SubItems.Remove(movedItem);
+
+                if (cc != null)
+                {
+                    OnComponentChanged(parent, cc);
+                }
+
+                if (e.NewParentNode == null)
+                {
+                    int index = advTree1.Nodes.IndexOf(e.Node);
+                    if (cc != null)
+                    {
+                        if (_RadialMenu != null)
+                            cc.OnComponentChanging(_RadialMenu, TypeDescriptor.GetProperties(_RadialMenu)["Items"]);
+                        else if (_RadialMenuContainer != null)
+                            cc.OnComponentChanging(_RadialMenuContainer, TypeDescriptor.GetProperties(_RadialMenuContainer)["SubItems"]);
+                    }
+
+                    if (_RadialMenu != null)
+                        _RadialMenu.Items.Insert(index, movedItem);
+                    else if (_RadialMenuContainer != null)
+                        _RadialMenuContainer.SubItems.Insert(index, movedItem);
+
+                    if (cc != null)
+                    {
+                        if (_RadialMenu != null)
+                            cc.OnComponentChanged(_RadialMenu, TypeDescriptor.GetProperties(_RadialMenu)["Items"], null, null);
+                        else if (_RadialMenuContainer != null)
+                            cc.OnComponentChanged(_RadialMenuContainer, TypeDescriptor.GetProperties(_RadialMenuContainer)["SubItems"], null, null);
+                    }
+                }
+                else
+                {
+                    parent = e.NewParentNode.Tag as RadialMenuItem;
+                    int index = e.NewParentNode.Nodes.IndexOf(e.Node);
+                    if (cc != null) cc.OnComponentChanging(parent, TypeDescriptor.GetProperties(parent)["SubItems"]);
+                    parent.SubItems.Insert(index, movedItem);
+                    if (cc != null) cc.OnComponentChanged(parent, TypeDescriptor.GetProperties(parent)["SubItems"], null, null);
+                }
+            }
+            catch
+            {
+                if (dt != null)
+                    dt.Cancel();
+                throw;
+            }
+            finally
+            {
+                if (dt != null && !dt.Canceled)
+                    dt.Commit();
+            }
+        }
+
+        private void propertyGrid1_PropertyValueChanged(object s, PropertyValueChangedEventArgs e)
+        {
+            if (advTree1.SelectedNode == null) return;
+            Node node = advTree1.SelectedNode;
+            RadialMenuItem item = (RadialMenuItem)propertyGrid1.SelectedObject;
+            if (e.ChangedItem.PropertyDescriptor.Name == "Text" || e.ChangedItem.PropertyDescriptor.Name == "Name")
+            {
+                node.Text = GetText(item);
+            }
+        }
+
+
+        private void buttonX1_Click(object sender, EventArgs e)
+        {
+            Form form = this.FindForm();
+            if (form != null) form.Close();
+        }
+
+        private void radialMenu1_BeforeMenuOpen(object sender, DevComponents.DotNetBar.Events.CancelableEventSourceArgs e)
+        {
+            SubItemsCollection collection = null;
+            if (_RadialMenu != null)
+            {
+                collection = _RadialMenu.Items;
+                radialMenu1.MenuType = _RadialMenu.MenuType;
+                radialMenu1.Diameter = _RadialMenu.Diameter;
+                radialMenu1.CenterButtonDiameter = _RadialMenu.CenterButtonDiameter;
+                radialMenu1.Font = _RadialMenu.Font;
+            }
+            else if (_RadialMenuContainer != null)
+            {
+                collection = _RadialMenuContainer.SubItems;
+                radialMenu1.MenuType = _RadialMenuContainer.MenuType;
+                radialMenu1.Diameter = _RadialMenuContainer.Diameter;
+                radialMenu1.CenterButtonDiameter = _RadialMenuContainer.CenterButtonDiameter;
+            }
+            if (collection == null) return;
+
+            
+            if (radialMenu1.Items.Count > 0)
+            {
+                BaseItem[] cleanUpItems = new BaseItem[radialMenu1.Items.Count];
+                radialMenu1.Items.CopyTo(cleanUpItems, 0);
+                radialMenu1.Items.Clear();
+                foreach (BaseItem item in cleanUpItems)
+                {
+                    item.Dispose();
+                }
+            }
+
+            foreach (BaseItem item in collection)
+            {
+                if (item is RadialMenuItem)
+                {
+                    BaseItem copy = item.Copy();
+                    radialMenu1.Items.Add(copy);
+                }
+            }
+        }
+
+        #region PropertyGridSite
+        internal class PropertyGridSite : ISite, IServiceProvider
+        {
+            // Fields
+            private IComponent comp;
+            private bool inGetService;
+            private IServiceProvider sp;
+
+            // Methods
+            public PropertyGridSite(IServiceProvider sp, IComponent comp)
+            {
+                this.sp = sp;
+                this.comp = comp;
+            }
+
+            public object GetService(Type t)
+            {
+                if (!this.inGetService && (this.sp != null))
+                {
+                    try
+                    {
+                        this.inGetService = true;
+                        return this.sp.GetService(t);
+                    }
+                    finally
+                    {
+                        this.inGetService = false;
+                    }
+                }
+                return null;
+            }
+
+            // Properties
+            public IComponent Component
+            {
+                get
+                {
+                    return this.comp;
+                }
+            }
+
+            public IContainer Container
+            {
+                get
+                {
+                    return null;
+                }
+            }
+
+            public bool DesignMode
+            {
+                get
+                {
+                    return false;
+                }
+            }
+
+            public string Name
+            {
+                get
+                {
+                    return null;
+                }
+                set
+                {
+                }
+            }
+        }
+        #endregion
+
+
+    }
+}
+
+
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/RadialMenu/RadialMenuItemEditor.resx b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/RadialMenu/RadialMenuItemEditor.resx
new file mode 100644
index 00000000..19dc0dd8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/RadialMenu/RadialMenuItemEditor.resx	
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/RangeSliderDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/RangeSliderDesigner.cs
new file mode 100644
index 00000000..332f74c1
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/RangeSliderDesigner.cs	
@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Collections;
+using DevComponents.DotNetBar.Controls;
+using System.Windows.Forms.Design;
+
+namespace DevComponents.DotNetBar.Design
+{
+    /// <summary>
+    /// Represents WinForms designer for RangeSlider control.
+    /// </summary>
+    public class RangeSliderDesigner : ControlDesigner
+    {
+        public override void InitializeNewComponent(IDictionary defaultValues)
+        {
+            base.InitializeNewComponent(defaultValues);
+            SetDesignTimeDefaults();
+        }
+
+        private void SetDesignTimeDefaults()
+        {
+            RangeSlider slider = this.Control as RangeSlider;
+            if (slider != null)
+            {
+                slider.Style = eDotNetBarStyle.StyleManagerControlled;
+                slider.Width = 140;
+                slider.Height = 24;
+                slider.FocusCuesEnabled = false;
+            }
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/RatingItemDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/RatingItemDesigner.cs
new file mode 100644
index 00000000..a882a500
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/RatingItemDesigner.cs	
@@ -0,0 +1,20 @@
+using System;
+using System.Text;
+using System.ComponentModel.Design;
+
+namespace DevComponents.DotNetBar.Design
+{
+    /// <summary>
+    /// Represents default designer for RatingItem
+    /// </summary>
+    public class RatingItemDesigner : BaseItemDesigner
+    {
+        public override DesignerVerbCollection Verbs
+        {
+            get
+            {
+                return new DesignerVerbCollection();
+            }
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ReflectionHelpers.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ReflectionHelpers.cs
new file mode 100644
index 00000000..bdbf27c0
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ReflectionHelpers.cs	
@@ -0,0 +1,100 @@
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Text;
+
+namespace DevComponents.DotNetBar.Design
+{
+    internal static class ReflectionHelpers
+    {
+        public static object GetValueProperty(object owner, string propertyName, BindingFlags flags)
+        {
+            if (owner == null)
+                return (object)null;
+            PropertyInfo propertyInfo = owner.GetType().GetProperty(propertyName, flags);
+            return ReflectionHelpers.GetValueProperty(owner, propertyInfo);
+        }
+
+        public static object GetValueProperty(object owner, PropertyInfo propertyInfo)
+        {
+            if (owner == null || propertyInfo == (PropertyInfo)null)
+                return (object)null;
+            return propertyInfo.GetValue(owner, (object[])null);
+        }
+
+        public static PropertyInfo GetPropertyInfo(object owner, string propertyName, BindingFlags flags)
+        {
+            if (owner == null)
+                return (PropertyInfo)null;
+            return ReflectionHelpers.GetPropertyInfo(owner.GetType(), propertyName, flags);
+        }
+
+        public static object InvokeMethod(object owner, string nameMethod, BindingFlags flags, object[] args)
+        {
+            MethodInfo methodInfo = ReflectionHelpers.GetMethodInfo(owner, nameMethod, flags);
+            return ReflectionHelpers.InvokeMethod(owner, methodInfo, args);
+        }
+
+        public static MethodInfo GetMethodInfo(object owner, string nameMethod, BindingFlags flags)
+        {
+            if (owner == null)
+                return (MethodInfo)null;
+            return ReflectionHelpers.GetMethodInfo(owner.GetType(), nameMethod, flags);
+        }
+
+        public static MethodInfo GetMethodInfo(Type type, string nameMethod, BindingFlags flags)
+        {
+            if (type == (Type)null)
+                return (MethodInfo)null;
+            return type.GetMethod(nameMethod, flags);
+        }
+        public static object InvokeMethod(object owner, MethodInfo methodInfo, object[] args)
+        {
+            if (methodInfo == (MethodInfo)null || owner == null)
+                return (object)null;
+            return methodInfo.Invoke(owner, args);
+        }
+
+        public static void SetValueField(object owner, string nameField, BindingFlags flags, object value)
+        {
+            FieldInfo fieldInfo = ReflectionHelpers.GetFieldInfo(owner, nameField, flags);
+            ReflectionHelpers.SetValueField(owner, fieldInfo, value);
+        }
+
+        public static void SetValueField(object owner, FieldInfo fieldInfo, object value)
+        {
+            if (owner == null || fieldInfo == (FieldInfo)null)
+                return;
+            fieldInfo.SetValue(owner, value);
+        }
+
+        public static FieldInfo GetFieldInfo(Type type, string nameField, BindingFlags flags)
+        {
+            if (type == (Type)null)
+                return (FieldInfo)null;
+            return type.GetField(nameField, flags);
+        }
+
+        public static FieldInfo GetFieldInfo(object owner, string nameField, BindingFlags flags)
+        {
+            if (owner == null)
+                return (FieldInfo)null;
+            return ReflectionHelpers.GetFieldInfo(owner.GetType(), nameField, flags);
+        }
+
+        public static ConstructorInfo GetConstructorInfo(Type type, Type[] args)
+        {
+            if (type == (Type)null)
+                return (ConstructorInfo)null;
+            return type.GetConstructor(args);
+        }
+
+        public static object GetValueField(object owner, string nameField, BindingFlags flags)
+        {
+            if (owner == null) return null;
+            FieldInfo fieldInfo = owner.GetType().GetField(nameField, flags);
+            if (fieldInfo == null) return null;
+            return fieldInfo.GetValue(owner);
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ReflectionImageDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ReflectionImageDesigner.cs
new file mode 100644
index 00000000..dda8f155
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ReflectionImageDesigner.cs	
@@ -0,0 +1,77 @@
+using System;
+using System.Text;
+using System.Windows.Forms.Design;
+using System.Collections;
+using DevComponents.DotNetBar.Controls;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Design
+{
+    /// <summary>
+    /// Represents Windows Forms designer for ReflectionImage control.
+    /// </summary>
+    public class ReflectionImageDesigner : ControlDesigner
+    {
+#if FRAMEWORK20
+        public override void InitializeNewComponent(IDictionary defaultValues)
+        {
+            base.InitializeNewComponent(defaultValues);
+            SetDesignTimeDefaults();
+        }
+#else
+		public override void OnSetComponentDefaults()
+		{
+			base.OnSetComponentDefaults();
+			SetDesignTimeDefaults();
+		}
+#endif
+
+        protected virtual void SetDesignTimeDefaults()
+        {
+            ReflectionImage m = this.Control as ReflectionImage;
+            m.Image = LoadReflectionImage();
+            if (m.Image != null)
+            {
+                m.BackgroundStyle.TextAlignment = eStyleTextAlignment.Center;
+            }
+        }
+
+        private static Image LoadReflectionImage()
+        {
+            string imageName = "ReflectionImage.png";
+            try
+            {
+                Microsoft.Win32.RegistryKey key = Microsoft.Win32.Registry.LocalMachine;
+                string path = "";
+                try
+                {
+                    if (key != null)
+                        key = key.OpenSubKey("Software\\DevComponents\\DotNetBar");
+                    if (key != null)
+                        path = key.GetValue("InstallationFolder", "").ToString();
+                }
+                finally { if (key != null) key.Close(); }
+
+                if (path != "")
+                {
+                    if (path.Substring(path.Length - 1, 1) != "\\")
+                        path += "\\";
+                    path += "Images\\";
+                    if (System.IO.File.Exists(path + imageName))
+                        path += imageName;
+                    else
+                        path = "";
+                }
+
+                if (path != "")
+                {
+                    return new Bitmap(path);
+                }
+            }
+            catch (Exception)
+            {
+            }
+            return null;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ReflectionLabelDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ReflectionLabelDesigner.cs
new file mode 100644
index 00000000..883d9034
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ReflectionLabelDesigner.cs	
@@ -0,0 +1,31 @@
+using System;
+using System.Text;
+using System.Windows.Forms.Design;
+using DevComponents.DotNetBar.Controls;
+using System.Collections;
+
+namespace DevComponents.DotNetBar.Design
+{
+    public class ReflectionLabelDesigner : ControlDesigner
+    {
+#if FRAMEWORK20
+        public override void InitializeNewComponent(IDictionary defaultValues)
+        {
+            base.InitializeNewComponent(defaultValues);
+            SetDesignTimeDefaults();
+        }
+#else
+		public override void OnSetComponentDefaults()
+		{
+			base.OnSetComponentDefaults();
+			SetDesignTimeDefaults();
+		}
+#endif
+
+        protected virtual void SetDesignTimeDefaults()
+        {
+            ReflectionLabel l = this.Control as ReflectionLabel;
+            l.Text = "<b><font size=\"+6\"><i>Dev</i><font color=\"#B02B2C\">Components</font></font></b>";
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/RibbonBarDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/RibbonBarDesigner.cs
new file mode 100644
index 00000000..a51b5deb
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/RibbonBarDesigner.cs	
@@ -0,0 +1,180 @@
+using System;
+using System.ComponentModel;
+using System.ComponentModel.Design;
+using System.Drawing;
+using System.Windows.Forms;
+using System.Windows.Forms.Design;
+using System.Collections;
+
+namespace DevComponents.DotNetBar.Design
+{
+	/// <summary>
+	/// Represents Windows Forms Designer for RibbonBar control
+	/// </summary>
+	public class RibbonBarDesigner:BarBaseControlDesigner
+	{
+		public RibbonBarDesigner()
+		{
+			this.EnableItemDragDrop=true;
+		}
+
+		public override void Initialize(IComponent component) 
+		{
+			base.Initialize(component);
+			if(component==null || component.Site==null || !component.Site.DesignMode)
+				return;
+
+#if !TRIAL
+            IDesignerHost dh = this.GetService(typeof(IDesignerHost)) as IDesignerHost;
+            if (dh != null)
+                dh.LoadComplete += new EventHandler(dh_LoadComplete);
+#endif
+		}
+#if FRAMEWORK20
+        public override void InitializeNewComponent(IDictionary defaultValues)
+        {
+            base.InitializeNewComponent(defaultValues);
+            SetDesignTimeDefaults();
+        }
+#else
+		public override void OnSetComponentDefaults()
+		{
+            SetDesignTimeDefaults();
+			base.OnSetComponentDefaults();
+		}
+#endif
+
+        private void SetDesignTimeDefaults()
+        {
+            RibbonBar b = this.Control as RibbonBar;
+            this.Style = eDotNetBarStyle.StyleManagerControlled;
+#if !TRIAL
+            string key = GetLicenseKey();
+            b.LicenseKey = key;
+#endif
+        }
+
+		public override DesignerVerbCollection Verbs 
+		{
+			get 
+			{
+				Bar bar=this.Control as Bar;
+				DesignerVerb[] verbs=null;
+				verbs = new DesignerVerb[]
+						{
+							new DesignerVerb("Add Button", new EventHandler(CreateButton)),
+							new DesignerVerb("Add Horizontal Container", new EventHandler(CreateHorizontalContainer)),
+							new DesignerVerb("Add Vertical Container", new EventHandler(CreateVerticalContainer)),
+							new DesignerVerb("Add Text Box", new EventHandler(CreateTextBox)),
+							new DesignerVerb("Add Combo Box", new EventHandler(CreateComboBox)),
+							new DesignerVerb("Add Label", new EventHandler(CreateLabel)),
+							new DesignerVerb("Add Color Picker", new EventHandler(CreateColorPicker)),
+                            new DesignerVerb("Add Check Box", new EventHandler(CreateCheckBox)),
+                            new DesignerVerb("Add Micro-Chart", new EventHandler(CreateMicroChart)),
+                            new DesignerVerb("Add Switch Button", new EventHandler(CreateSwitch)),
+                            new DesignerVerb("Add Slider", new EventHandler(CreateSliderItem)),
+                            new DesignerVerb("Add Range Slider", new EventHandler(CreateRangeSliderItem)),
+                            new DesignerVerb("Add Rating Item", new EventHandler(CreateRatingItem)),
+                            new DesignerVerb("Add Circular Progress", new EventHandler(CreateCircularProgressItem)),
+                            new DesignerVerb("Add Gallery Container", new EventHandler(CreateGalleryContainer)),
+                            new DesignerVerb("Add Control Container", new EventHandler(CreateControlContainer))};
+				return new DesignerVerbCollection(verbs);
+			}
+		}
+
+		private void CreateVerticalContainer(object sender, EventArgs e)
+		{
+			CreateContainer(this.GetItemContainer(),eOrientation.Vertical);
+		}
+
+		private void CreateHorizontalContainer(object sender, EventArgs e)
+		{
+			CreateContainer(this.GetItemContainer(),eOrientation.Horizontal);
+		}
+
+		private void CreateContainer(BaseItem parent, eOrientation orientation)
+		{
+            m_CreatingItem = true;
+            try
+            {
+                DesignerSupport.CreateItemContainer(this, parent, orientation);
+            }
+            finally
+            {
+                m_CreatingItem = false;
+            }
+			this.RecalcLayout();
+		}
+		protected override void PreFilterProperties(
+			System.Collections.IDictionary properties) 
+		{
+			base.PreFilterProperties(properties);
+			properties["Style"] = 
+				TypeDescriptor.CreateProperty(typeof(RibbonBarDesigner), 
+				(PropertyDescriptor)properties["Style"], 
+				new Attribute[0]);
+		}
+
+		/// <summary>
+		/// Gets/Sets the visual style of the control.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),Category("Appearance"),Description("Specifies the visual style of the control."),DefaultValue(eDotNetBarStyle.Office2003)]
+		public eDotNetBarStyle Style
+		{
+			get
+			{
+				RibbonBar bar=this.Control as RibbonBar;
+				return bar.Style;
+			}
+			set 
+			{
+				RibbonBar bar=this.Control as RibbonBar;
+				bar.Style=value;
+				IDesignerHost dh=this.GetService(typeof(IDesignerHost)) as IDesignerHost;
+				if(dh!=null && !dh.Loading)
+				{
+                    RibbonPredefinedColorSchemes.SetRibbonBarStyle(bar, value);
+				}
+			}
+		}
+
+        protected override void OnitemCreated(BaseItem item)
+        {
+            if (item is ButtonItem)
+            {
+                ButtonItem b = item as ButtonItem;
+                TypeDescriptor.GetProperties(b)["SubItemsExpandWidth"].SetValue(b, 14);
+            }
+            base.OnitemCreated(item);
+        }
+
+        #region Licensing Stuff
+#if !TRIAL
+        internal static string GetLicenseKey()
+        {
+            string key = "";
+            Microsoft.Win32.RegistryKey regkey = Microsoft.Win32.Registry.LocalMachine;
+            regkey = regkey.OpenSubKey("Software\\DevComponents\\Licenses", false);
+            if (regkey != null)
+            {
+                object keyValue = regkey.GetValue("DevComponents.DotNetBar.DotNetBarManager2");
+                if (keyValue != null)
+                    key = keyValue.ToString();
+            }
+            return key;
+        }
+        private void dh_LoadComplete(object sender, EventArgs e)
+        {
+            IDesignerHost dh = this.GetService(typeof(IDesignerHost)) as IDesignerHost;
+            if (dh != null)
+                dh.LoadComplete -= new EventHandler(dh_LoadComplete);
+
+            string key = GetLicenseKey();
+            RibbonBar bar = this.Control as RibbonBar;
+            if (key != "" && bar != null && bar.LicenseKey == "" && bar.LicenseKey != key)
+                TypeDescriptor.GetProperties(bar)["LicenseKey"].SetValue(bar, key);
+        }
+#endif
+        #endregion
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/RibbonBarMergeContainerDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/RibbonBarMergeContainerDesigner.cs
new file mode 100644
index 00000000..13ec86d9
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/RibbonBarMergeContainerDesigner.cs	
@@ -0,0 +1,75 @@
+using System;
+using System.Text;
+using System.Windows.Forms.Design;
+using System.ComponentModel;
+using System.Collections;
+using System.ComponentModel.Design;
+
+namespace DevComponents.DotNetBar.Design
+{
+    /// <summary>
+    /// Represents the Windows Forms Designer for RibbonBarMergeContainer control.
+    /// </summary>
+    public class RibbonBarMergeContainerDesigner : ParentControlDesigner
+    {
+#if FRAMEWORK20
+        public override void InitializeNewComponent(IDictionary defaultValues)
+        {
+            base.InitializeNewComponent(defaultValues);
+            SetDesignTimeDefaults();
+        }
+#else
+		public override void OnSetComponentDefaults()
+		{
+            SetDesignTimeDefaults();
+			base.OnSetComponentDefaults();
+		}
+#endif
+
+        private void SetDesignTimeDefaults()
+        {
+            RibbonBarMergeContainer c = this.Control as RibbonBarMergeContainer;
+            if (c != null)
+            {
+                TypeDescriptor.GetProperties(c)["Visible"].SetValue(c, false);
+                TypeDescriptor.GetProperties(c)["ColorSchemeStyle"].SetValue(c, eDotNetBarStyle.Office2007);
+            }
+        }
+
+        public override DesignerVerbCollection Verbs
+        {
+            get
+            {
+                DesignerVerbCollection verbs = new DesignerVerbCollection(new DesignerVerb[]
+				    {
+					    new DesignerVerb("Layout Ribbons", new EventHandler(LayoutRibbons))
+                    });
+                //verbs.AddRange(base.Verbs);
+
+                return verbs;
+            }
+        }
+
+        private void LayoutRibbons(object sender, EventArgs e)
+        {
+            RibbonPanel panel = this.Control as RibbonPanel;
+            if (panel == null)
+                return;
+
+            IDesignerHost host = this.GetService(typeof(IDesignerHost)) as IDesignerHost;
+            DesignerTransaction trans = null;
+            if (host != null)
+                trans = host.CreateTransaction("Rendering Layout");
+
+            try
+            {
+                panel.LayoutRibbons();
+            }
+            finally
+            {
+                if (trans != null)
+                    trans.Commit();
+            }
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/RibbonClientPanelDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/RibbonClientPanelDesigner.cs
new file mode 100644
index 00000000..ee5cf595
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/RibbonClientPanelDesigner.cs	
@@ -0,0 +1,19 @@
+using System;
+using System.Text;
+using DevComponents.DotNetBar.Rendering;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Design
+{
+    public class RibbonClientPanelDesigner : PanelControlDesigner
+    {
+        protected override void SetDesignTimeDefaults()
+        {
+            PanelControl p = this.Control as PanelControl;
+            if (p == null)
+                return;
+            p.CanvasColor = SystemColors.Control;
+            p.Style.Class = ElementStyleClassKeys.RibbonClientPanelKey;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/RibbonControlDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/RibbonControlDesigner.cs
new file mode 100644
index 00000000..0820410d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/RibbonControlDesigner.cs	
@@ -0,0 +1,1025 @@
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.ComponentModel.Design;
+using System.Drawing;
+using System.Windows.Forms;
+using System.IO;
+using DevComponents.DotNetBar.Rendering;
+
+namespace DevComponents.DotNetBar.Design
+{
+    /// <summary>
+    /// Represents Windows Forms designer for RibbonControl.
+    /// </summary>
+    public class RibbonControlDesigner : BarBaseControlDesigner
+    {
+        #region Private Variables
+        private bool m_QuickAccessToolbarSelected = false;
+        #endregion
+
+        #region Internal Implementation
+
+        public RibbonControlDesigner()
+        {
+            this.EnableItemDragDrop = true;
+            this.AcceptExternalControls = false;
+        }
+
+        public override void Initialize(IComponent component)
+        {
+            base.Initialize(component);
+            if (!component.Site.DesignMode)
+                return;
+            RibbonControl c = component as RibbonControl;
+            if (c != null)
+            {
+                c.SetDesignMode();
+                this.Expanded = c.Expanded;
+            }
+            this.EnableDragDrop(false);
+        }
+
+        public override bool CanParent(Control control)
+        {
+            if (control is RibbonPanel && !this.Control.Controls.Contains(control))
+                return true;
+            return false;
+        }
+
+        public override DesignerVerbCollection Verbs
+        {
+            get
+            {
+                Bar bar = this.Control as Bar;
+                DesignerVerb[] verbs = null;
+                verbs = new DesignerVerb[]
+					{
+						new DesignerVerb("Create Ribbon Tab", new EventHandler(CreateRibbonTab)),
+						new DesignerVerb("Create Button", new EventHandler(CreateButton)),
+						new DesignerVerb("Create Text Box", new EventHandler(CreateTextBox)),
+						new DesignerVerb("Create Combo Box", new EventHandler(CreateComboBox)),
+                        new DesignerVerb("Create Label", new EventHandler(CreateLabel)),
+                        new DesignerVerb("Create Micro-Chart", new EventHandler(CreateMicroChart)),
+                        new DesignerVerb("Create Switch Button", new EventHandler(CreateSwitch)),
+                        new DesignerVerb("Create Rating Item", new EventHandler(CreateRatingItem)),};
+
+                return new DesignerVerbCollection(verbs);
+            }
+        }
+
+        private BaseItem GetNewItemContainer()
+        {
+            RibbonControl r = this.Control as RibbonControl;
+            if (m_QuickAccessToolbarSelected)
+                return r.RibbonStrip.CaptionContainerItem;
+            else
+                return r.RibbonStrip.StripContainerItem;
+        }
+
+        protected override void CreateButton(object sender, EventArgs e)
+        {
+            RibbonControl r = this.Control as RibbonControl;
+            if (r != null)
+            {
+                CreateButton(GetNewItemContainer());
+            }
+        }
+
+        protected override void CreateTextBox(object sender, EventArgs e)
+        {
+            RibbonControl r = this.Control as RibbonControl;
+            if (r != null)
+            {
+                CreateTextBox(GetNewItemContainer());
+            }
+        }
+
+        protected override void CreateComboBox(object sender, EventArgs e)
+        {
+            RibbonControl r = this.Control as RibbonControl;
+            if (r != null)
+            {
+                CreateComboBox(GetNewItemContainer());
+            }
+        }
+
+        protected override void CreateLabel(object sender, EventArgs e)
+        {
+            RibbonControl r = this.Control as RibbonControl;
+            if (r != null)
+            {
+                CreateLabel(GetNewItemContainer());
+            }
+        }
+
+        protected override void CreateColorPicker(object sender, EventArgs e)
+        {
+            RibbonControl r = this.Control as RibbonControl;
+            if (r != null)
+            {
+                CreateColorPicker(GetNewItemContainer());
+            }
+        }
+
+        protected override void CreateProgressBar(object sender, EventArgs e)
+        {
+            RibbonControl r = this.Control as RibbonControl;
+            if (r != null)
+            {
+                CreateProgressBar(GetNewItemContainer());
+            }
+        }
+
+        protected override void CreateRatingItem(object sender, EventArgs e)
+        {
+            RibbonControl r = this.Control as RibbonControl;
+            if (r != null)
+            {
+                CreateRatingItem(GetNewItemContainer());
+            }
+        }
+
+        protected override void CreateSwitch(object sender, EventArgs e)
+        {
+            RibbonControl r = this.Control as RibbonControl;
+            if (r != null)
+            {
+                CreateSwitch(GetNewItemContainer());
+            }
+        }
+
+        protected override void ComponentChangeComponentAdded(object sender, ComponentEventArgs e)
+        {
+            if (m_AddingItem)
+            {
+                m_AddingItem = false;
+                IComponentChangeService cc = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+                if (cc != null)
+                    cc.OnComponentChanging(this.Control, null);
+                this.GetNewItemContainer().SubItems.Add(e.Component as BaseItem);
+                if (cc != null)
+                    cc.OnComponentChanged(this.Control, null, null, null);
+                m_InsertItemTransaction.Commit();
+                m_InsertItemTransaction = null;
+                this.RecalcLayout();
+            }
+        }
+
+        protected override ArrayList GetAllAssociatedComponents()
+        {
+            ArrayList c = new ArrayList(base.AssociatedComponents);
+            RibbonControl r = this.Control as RibbonControl;
+            if (r != null)
+            {
+                AddSubItems(r.RibbonStrip.StripContainerItem, c);
+                AddSubItems(r.RibbonStrip.CaptionContainerItem, c);
+            }
+            return c;
+        }
+
+        public override System.Collections.ICollection AssociatedComponents
+        {
+            get
+            {
+                ArrayList c = new ArrayList(this.BaseAssociatedComponents);
+                RibbonControl rc = this.Control as RibbonControl;
+                if (rc != null)
+                {
+                    foreach (BaseItem item in rc.QuickToolbarItems)
+                    {
+                        if (!item.SystemItem)
+                            c.Add(item);
+                    }
+                    foreach (BaseItem item in rc.Items)
+                    {
+                        if (!item.SystemItem)
+                            c.Add(item);
+                    }
+                    foreach (RibbonTabItemGroup group in rc.TabGroups)
+                        c.Add(group);
+                }
+                return c;
+            }
+        }
+
+#if FRAMEWORK20
+        public override void InitializeNewComponent(IDictionary defaultValues)
+        {
+            base.InitializeNewComponent(defaultValues);
+            SetDesignTimeDefaults();
+        }
+#else
+		public override void OnSetComponentDefaults()
+		{
+            SetDesignTimeDefaults();
+			base.OnSetComponentDefaults();
+		}
+#endif
+
+        private StyleManager CreateStyleManager()
+        {
+            StyleManager manager = null;
+
+            IDesignerHost dh = (IDesignerHost)GetService(typeof(IDesignerHost));
+            if (dh != null)
+            {
+                DesignerTransaction trans = dh.CreateTransaction("Create Style Manager");
+                try
+                {
+                    manager = dh.CreateComponent(typeof(StyleManager)) as StyleManager;
+                }
+                finally
+                {
+                    if (!trans.Canceled) trans.Commit();
+                }
+            }
+
+            return manager;
+        }
+        private void SetDesignTimeDefaults()
+        {
+            CreateRibbonTab();
+            CreateRibbonTab();
+            StyleManager manager = CreateStyleManager();
+            RibbonControl c = this.Control as RibbonControl;
+            if (c != null)
+            {
+                try
+                {
+                    c.KeyTipsFont = new Font("Tahoma", 7);
+                }
+                catch { }
+            }
+            this.Style = eDotNetBarStyle.StyleManagerControlled;
+            this.CanCustomize = true;
+            c.Size = new Size(200, 154);
+            c.Dock = DockStyle.Top;
+            CreateRibbonBar();
+            this.CaptionVisible = true;
+
+            if (manager != null)
+                manager.ManagerStyle = eStyle.Office2010Blue;
+        }
+
+        protected override BaseItem GetItemContainer()
+        {
+            RibbonControl ribbon = this.Control as RibbonControl;
+            if (ribbon != null)
+                return ribbon.RibbonStrip.GetBaseItemContainer();
+            return null;
+        }
+
+        protected override System.Windows.Forms.Control GetItemContainerControl()
+        {
+            RibbonControl ribbon = this.Control as RibbonControl;
+            if (ribbon != null)
+                return ribbon.RibbonStrip;
+            return null;
+        }
+
+        /// <summary>
+        /// Support for popup menu closing.
+        /// </summary>
+        protected override void DesignTimeSelectionChanged(ISelectionService ss)
+        {
+            if (ss == null)
+                return;
+            if (this.Control == null || this.Control.IsDisposed)
+                return;
+
+            if (IsApplicationButtonBackstageControl(ss.PrimarySelection))
+                return;
+
+            base.DesignTimeSelectionChanged(ss);
+
+            RibbonControl r = this.Control as RibbonControl;
+            if (r == null) return;
+
+            BaseItem container = r.RibbonStrip.StripContainerItem;
+            if (container == null) return;
+
+            if (ss.PrimarySelection is RibbonTabItem)
+            {
+                RibbonTabItem item = ss.PrimarySelection as RibbonTabItem;
+                if (container.SubItems.Contains(item))
+                {
+                    TypeDescriptor.GetProperties(item)["Checked"].SetValue(item, true);
+                }
+            }
+        }
+
+        private bool IsApplicationButtonBackstageControl(object primarySelection)
+        {
+            RibbonControl ribbon = this.Control as RibbonControl;
+            if (ribbon == null || !(ribbon.GetApplicationButton() is ApplicationButton)) return false;
+            ApplicationButton appButton = ribbon.GetApplicationButton() as ApplicationButton;
+            if (appButton.BackstageTab == null) return false;
+
+            SuperTabControl backstageTab = appButton.BackstageTab;
+            if (primarySelection is BaseItem)
+            {
+                BaseItem item = (BaseItem)primarySelection;
+                if (backstageTab.Tabs.Contains(item)) return true;
+                while (item.Parent != null) item = item.Parent;
+                Control parentControl = item.ContainerControl as Control;
+                if (parentControl == null) return false;
+                return ContainsControl(backstageTab, parentControl);
+            }
+            else if (primarySelection is Control)
+                return ContainsControl(backstageTab, (Control)primarySelection);
+
+            return false;
+        }
+
+        private bool ContainsControl(Control container, Control childControl)
+        {
+            Control parent = childControl;
+            while (parent != null)
+            {
+                if (parent == container) return true;
+                parent = parent.Parent;
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// Triggered when some other component on the form is removed.
+        /// </summary>
+        protected override void OtherComponentRemoving(object sender, ComponentEventArgs e)
+        {
+            RibbonControl r = this.Control as RibbonControl;
+            if (r != null)
+            {
+                BaseItem container = r.RibbonStrip.StripContainerItem;
+
+                if (e.Component is RibbonTabItem && container != null && container.SubItems != null &&
+                    container.SubItems.Contains(((RibbonTabItem)e.Component)))
+                {
+                    IDesignerHost dh = this.GetService(typeof(IDesignerHost)) as IDesignerHost;
+                    if (dh != null)
+                        dh.DestroyComponent(((RibbonTabItem)e.Component).Panel);
+                }
+            }
+            base.OtherComponentRemoving(sender, e);
+        }
+
+        protected override void ComponentRemoved(object sender, ComponentEventArgs e)
+        {
+            RibbonControl r = this.Control as RibbonControl;
+            if (e.Component is BaseItem && r != null)
+            {
+                BaseItem item = e.Component as BaseItem;
+                if (r.Items.Contains(item))
+                    r.Items.Remove(item);
+                else if (r.QuickToolbarItems.Contains(item))
+                    r.QuickToolbarItems.Remove(item);
+                DestroySubItems(item);
+            }
+        }
+
+        protected override bool OnMouseDown(ref Message m, MouseButtons button)
+        {
+            m_QuickAccessToolbarSelected = false;
+
+            System.Windows.Forms.Control ctrl = this.GetItemContainerControl();
+            RibbonStrip strip = ctrl as RibbonStrip;
+
+            if (strip == null)
+                return base.OnMouseDown(ref m, button);
+
+            Point pos = strip.PointToClient(System.Windows.Forms.Control.MousePosition);
+            if (!strip.ClientRectangle.Contains(pos))
+                return base.OnMouseDown(ref m, button);
+
+            if (button == MouseButtons.Right)
+            {
+                if (strip.QuickToolbarBounds.Contains(pos))
+                    m_QuickAccessToolbarSelected = true;
+                return base.OnMouseDown(ref m, button);
+            }
+
+            bool callBase = true;
+            foreach (RibbonTabItemGroup g in strip.TabGroups)
+            {
+                foreach (Rectangle r in g.DisplayPositions)
+                {
+                    if (r.Contains(pos))
+                    {
+                        ArrayList arr = new ArrayList(1);
+                        arr.Add(g);
+                        ISelectionService selection = (ISelectionService)this.GetService(typeof(ISelectionService));
+#if FRAMEWORK20
+                        selection.SetSelectedComponents(arr, SelectionTypes.Primary);
+#else
+                        selection.SetSelectedComponents(arr,SelectionTypes.MouseDown);
+#endif
+                        this.MouseDownSelectionPerformed = true;
+                        callBase = false;
+                        break;
+                    }
+                }
+            }
+
+            if (callBase)
+                return base.OnMouseDown(ref m, button);
+            else
+                return true;
+        }
+
+        #endregion
+
+        #region Design-Time Item Creation
+        protected virtual void CreateRibbonTab(object sender, EventArgs e)
+        {
+            CreateRibbonTab();
+        }
+
+        private void CreateRibbonTab()
+        {
+            m_QuickAccessToolbarSelected = false;
+            IDesignerHost dh = (IDesignerHost)GetService(typeof(IDesignerHost));
+            if (dh != null)
+            {
+                DesignerTransaction trans = dh.CreateTransaction("Create Ribbon Tab");
+                IComponentChangeService cc = (IComponentChangeService)GetService(typeof(IComponentChangeService));
+                RibbonControl ribbon = this.Control as RibbonControl;
+                try
+                {
+                    m_CreatingItem = true;
+                    OnSubItemsChanging();
+                    RibbonTabItem item = dh.CreateComponent(typeof(RibbonTabItem)) as RibbonTabItem;
+                    TypeDescriptor.GetProperties(item)["Text"].SetValue(item, item.Name);
+
+                    RibbonPanel panel = dh.CreateComponent(typeof(RibbonPanel)) as RibbonPanel;
+                    TypeDescriptor.GetProperties(panel)["Dock"].SetValue(panel, DockStyle.Fill);
+                    TypeDescriptor.GetProperties(panel)["ColorSchemeStyle"].SetValue(panel, ribbon.Style);
+                    ribbon.SetRibbonPanelStyle(panel);
+
+                    //TypeDescriptor.GetProperties(panel.DockPadding)["Bottom"].SetValue(panel.DockPadding, 1);
+                    //panel.Style.BorderBottom = eStyleBorderType.Solid;
+                    //TypeDescriptor.GetProperties(panel.Style)["BorderBottom"].SetValue(panel.Style, eStyleBorderType.Solid);
+
+                    cc.OnComponentChanging(this.Control, TypeDescriptor.GetProperties(typeof(Control))["Controls"]);
+                    this.Control.Controls.Add(panel);
+                    panel.SendToBack();
+                    cc.OnComponentChanged(this.Control, TypeDescriptor.GetProperties(typeof(Control))["Controls"], null, null);
+
+                    TypeDescriptor.GetProperties(item)["Panel"].SetValue(item, panel);
+
+                    GenericItemContainer cont = ribbon.RibbonStrip.StripContainerItem;
+                    cc.OnComponentChanging(cont, TypeDescriptor.GetProperties(typeof(BaseItem))["SubItems"]);
+                    cont.SubItems.Add(item);
+                    cc.OnComponentChanged(cont, TypeDescriptor.GetProperties(typeof(BaseItem))["SubItems"], null, null);
+                    if (cont.SubItems.Count == 1)
+                        TypeDescriptor.GetProperties(item)["Checked"].SetValue(item, true);
+
+                    this.RecalcLayout();
+                    OnSubItemsChanged();
+                }
+                catch
+                {
+                    trans.Cancel();
+                    throw;
+                }
+                finally
+                {
+                    if (!trans.Canceled)
+                        trans.Commit();
+                    m_CreatingItem = false;
+                }
+            }
+        }
+
+        private void CreateRibbonBar()
+        {
+            RibbonControl ribbon = this.Control as RibbonControl;
+            if (ribbon == null || ribbon.SelectedRibbonTabItem == null || ribbon.SelectedRibbonTabItem.Panel == null) return;
+            IDesignerHost dh = (IDesignerHost)GetService(typeof(IDesignerHost));
+            if (dh != null)
+            {
+                DesignerTransaction trans = dh.CreateTransaction("Create Default Ribbon Bar");
+                IComponentChangeService cc = (IComponentChangeService)GetService(typeof(IComponentChangeService));
+                try
+                {
+                    RibbonBar bar = dh.CreateComponent(typeof(RibbonBar)) as RibbonBar;
+                    TypeDescriptor.GetProperties(bar)["Width"].SetValue(bar, 100);
+#if !TRIAL
+                    string key = RibbonBarDesigner.GetLicenseKey();
+                    bar.LicenseKey = key;
+#endif
+                    TypeDescriptor.GetProperties(bar)["Text"].SetValue(bar, bar.Name);
+
+                    cc.OnComponentChanging(ribbon.SelectedRibbonTabItem.Panel, TypeDescriptor.GetProperties(typeof(Control))["Controls"]);
+                    ribbon.SelectedRibbonTabItem.Panel.Controls.Add(bar);
+                    bar.Dock = DockStyle.Left;
+                    cc.OnComponentChanged(ribbon.SelectedRibbonTabItem.Panel, TypeDescriptor.GetProperties(typeof(Control))["Controls"], null, null);
+
+                    this.RecalcLayout();
+                }
+                catch
+                {
+                    trans.Cancel();
+                    throw;
+                }
+                finally
+                {
+                    if (!trans.Canceled)
+                        trans.Commit();
+                }
+            }
+        }
+        #endregion
+
+        #region Shadowing
+        /// <summary>
+        /// Gets/Sets the visual style of the control.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(true), Category("Appearance"), Description("Specifies the visual style of the control."), DefaultValue(eDotNetBarStyle.Office2003)]
+        public eDotNetBarStyle Style
+        {
+            get
+            {
+                RibbonControl r = this.Control as RibbonControl;
+                return r.Style;
+            }
+            set
+            {
+                RibbonControl r = this.Control as RibbonControl;
+                r.Style = value;
+                IDesignerHost dh = this.GetService(typeof(IDesignerHost)) as IDesignerHost;
+                if (dh != null && !dh.Loading)
+                {
+                    DesignerTransaction trans = dh.CreateTransaction("Changing Ribbon Style");
+                    Form form = null;
+                    if (value == eDotNetBarStyle.Office2010 || value == eDotNetBarStyle.Windows7 || StyleManager.IsMetro(value) || value == eDotNetBarStyle.Office2007 && r.Style == eDotNetBarStyle.Office2007)
+                        form = r.FindForm();
+                    IComponentChangeService cc = GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+                    if (cc != null)
+                    {
+                        cc.OnComponentChanging(this.Component, null);
+                        if (form != null) cc.OnComponentChanging(form, null);
+                    }
+                    if (form != null)
+                        RibbonPredefinedColorSchemes.ChangeStyle(value, form);
+                    else
+                        RibbonPredefinedColorSchemes.SetRibbonControlStyle(r, value);
+                    if (cc != null)
+                    {
+                        cc.OnComponentChanged(this.Component, null, null, null);
+                        if (form != null)
+                        {
+                            cc.OnComponentChanged(form, null, null, null);
+                            form.Invalidate(true);
+                        }
+                    }
+                    if (trans != null) trans.Commit();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether custom caption and quick access toolbar provided by the control is visible. Default value is false.
+        /// This property should be set to true when control is used on Office2007RibbonForm.
+        /// </summary>
+        [Browsable(true), DefaultValue(false), Category("Appearance"), Description("Indicates whether custom caption and quick access toolbar provided by the control is visible.")]
+
+        public bool CaptionVisible
+        {
+            get
+            {
+                RibbonControl r = this.Control as RibbonControl;
+                return r.CaptionVisible;
+            }
+            set
+            {
+                RibbonControl r = this.Control as RibbonControl;
+                if (r.CaptionVisible == value) return;
+                r.CaptionVisible = value;
+
+                if (r.CaptionVisible && ((r.QuickToolbarItems.Count == 0 || r.QuickToolbarItems.Count == 1 && (r.QuickToolbarItems[0] is SystemCaptionItem || r.QuickToolbarItems[0] is QatCustomizeItem) ||
+                    r.QuickToolbarItems.Count == 2 && r.QuickToolbarItems[0] is QatCustomizeItem) ||
+                    ((r.EffectiveStyle == eDotNetBarStyle.Windows7 || r.EffectiveStyle == eDotNetBarStyle.Office2010 || StyleManager.IsMetro(r.EffectiveStyle)) &&
+                    r.QuickToolbarItems.Count == 4 && r.QuickToolbarItems[0] is SystemCaptionItem && r.QuickToolbarItems[3] is SystemCaptionItem)))
+                {
+                    string fileNormal = "StartButtonImage.png";
+                    //string fileHot = "StartButtonHot.png";
+                    //string filePressed = "StartButtonPressed.png";
+                    string fileNewDocument = "NewDocument.png";
+                    string fileOpenDocument = "OpenDocument.png";
+                    string fileSaveDocument = "Save.png";
+                    string fileShare = "Share.png";
+                    string filePrint = "Print.png";
+                    string fileClose = "Close.png";
+                    string fileExit = "Exit.png";
+                    string fileOptions = "Options.png";
+
+                    // Add custom items to the toolbar
+                    IDesignerHost dh = this.GetService(typeof(IDesignerHost)) as IDesignerHost;
+                    IComponentChangeService cc = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+                    if (dh != null && !dh.Loading && cc != null && dh.TransactionDescription != "Paste components")
+                    {
+                        DesignerTransaction trans = dh.CreateTransaction();
+                        try
+                        {
+                            Rendering.Office2007MenuColorTable mc = null;
+                            if (Rendering.GlobalManager.Renderer is Rendering.Office2007Renderer)
+                                mc = ((Rendering.Office2007Renderer)Rendering.GlobalManager.Renderer).ColorTable.Menu;
+
+                            m_CreatingItem = true;
+                            ApplicationButton sb = dh.CreateComponent(typeof(ApplicationButton)) as ApplicationButton;
+                            sb.HotTrackingStyle = eHotTrackingStyle.Image;
+
+                            sb.Image = LoadImage(fileNormal);
+                            //b.HoverImage = LoadImage(fileHot);
+                            //b.PressedImage = LoadImage(filePressed);
+
+                            sb.ImagePaddingHorizontal = 2;
+                            sb.ImagePaddingVertical = 2;
+                            sb.ShowSubItems = false;
+                            sb.CanCustomize = false;
+                            sb.AutoExpandOnClick = true;
+                            sb.Text = "&File";
+                            cc.OnComponentChanging(r, TypeDescriptor.GetProperties(r)["QuickToolbarItems"]);
+                            if (r.EffectiveStyle == eDotNetBarStyle.Office2010 || r.EffectiveStyle == eDotNetBarStyle.Windows7 || StyleManager.IsMetro(r.EffectiveStyle))
+                            {
+                                sb.ImageFixedSize = new Size(16, 16);
+                                r.Items.Insert(0, sb);
+                            }
+                            else
+                                r.QuickToolbarItems.Add(sb, 0);
+                            cc.OnComponentChanged(r, TypeDescriptor.GetProperties(r)["QuickToolbarItems"], null, null);
+                            ButtonItem buttonStart = sb;
+
+                            ButtonItem b = dh.CreateComponent(typeof(ButtonItem)) as ButtonItem;
+                            b.Text = b.Name;
+                            cc.OnComponentChanging(r, TypeDescriptor.GetProperties(r)["QuickToolbarItems"]);
+                            r.QuickToolbarItems.Add(b, 1);
+                            cc.OnComponentChanged(r, TypeDescriptor.GetProperties(r)["QuickToolbarItems"], null, null);
+
+                            ItemContainer topContainer = dh.CreateComponent(typeof(ItemContainer)) as ItemContainer;
+                            topContainer.BackgroundStyle.Class = ElementStyleClassKeys.RibbonFileMenuContainerKey;
+                            topContainer.LayoutOrientation = eOrientation.Vertical;
+                            //RibbonPredefinedColorSchemes.SetupFileMenuContainer(topContainer);
+                            buttonStart.SubItems.Add(topContainer);
+
+                            ItemContainer twoColumnMenu = dh.CreateComponent(typeof(ItemContainer)) as ItemContainer;
+                            twoColumnMenu.BackgroundStyle.Class = ElementStyleClassKeys.RibbonFileMenuTwoColumnContainerKey;
+                            twoColumnMenu.ItemSpacing = 0;
+                            //RibbonPredefinedColorSchemes.SetupTwoColumnMenuContainer(twoColumnMenu);
+
+                            topContainer.SubItems.Add(twoColumnMenu);
+
+                            // Column One
+                            ItemContainer columnOne = dh.CreateComponent(typeof(ItemContainer)) as ItemContainer;
+                            columnOne.BackgroundStyle.Class = ElementStyleClassKeys.RibbonFileMenuColumnOneContainerKey;
+                            columnOne.LayoutOrientation = DevComponents.DotNetBar.eOrientation.Vertical;
+                            columnOne.MinimumSize = new System.Drawing.Size(120, 0);
+                            //RibbonPredefinedColorSchemes.SetupMenuColumnOneContainer(columnOne);
+                            ButtonItem fileButton = CreateFileButton(dh, "&New", LoadImage(fileNewDocument));
+                            columnOne.SubItems.Add(fileButton);
+                            fileButton = CreateFileButton(dh, "&Open...", LoadImage(fileOpenDocument));
+                            columnOne.SubItems.Add(fileButton);
+                            fileButton = CreateFileButton(dh, "&Save...", LoadImage(fileSaveDocument));
+                            columnOne.SubItems.Add(fileButton);
+                            fileButton = CreateFileButton(dh, "S&hare...", LoadImage(fileShare));
+                            fileButton.BeginGroup = true;
+                            columnOne.SubItems.Add(fileButton);
+                            fileButton = CreateFileButton(dh, "&Print...", LoadImage(filePrint));
+                            columnOne.SubItems.Add(fileButton);
+                            fileButton = CreateFileButton(dh, "&Close", LoadImage(fileClose));
+                            fileButton.BeginGroup = true;
+                            columnOne.SubItems.Add(fileButton);
+                            twoColumnMenu.SubItems.Add(columnOne);
+
+                            // Column Two
+                            GalleryContainer columnTwo = dh.CreateComponent(typeof(GalleryContainer)) as GalleryContainer;
+                            columnTwo.BackgroundStyle.Class = ElementStyleClassKeys.RibbonFileMenuColumnTwoContainerKey;
+                            columnTwo.LayoutOrientation = DevComponents.DotNetBar.eOrientation.Vertical;
+                            columnTwo.MinimumSize = new System.Drawing.Size(180, 240);
+                            columnTwo.MultiLine = false;
+                            columnTwo.EnableGalleryPopup = false;
+                            columnTwo.PopupUsesStandardScrollbars = false;
+                            //RibbonPredefinedColorSchemes.SetupMenuColumnTwoContainer(columnTwo);
+                            LabelItem mruLabel = dh.CreateComponent(typeof(LabelItem)) as LabelItem;
+                            mruLabel.CanCustomize = false;
+                            mruLabel.BackColor = System.Drawing.Color.Empty;
+                            mruLabel.BorderSide = DevComponents.DotNetBar.eBorderSide.Bottom;
+                            mruLabel.BorderType = DevComponents.DotNetBar.eBorderType.Etched;
+                            mruLabel.Font = null;
+                            mruLabel.ForeColor = System.Drawing.SystemColors.ControlText;
+                            mruLabel.Name = "labelItem8";
+                            mruLabel.PaddingBottom = 2;
+                            mruLabel.PaddingTop = 2;
+                            mruLabel.Stretch = true;
+                            mruLabel.Text = "Recent Documents";
+                            columnTwo.SubItems.Add(mruLabel);
+                            columnTwo.SubItems.Add(CreateMRUButton(dh, "&1. Short News 5-7.rtf"));
+                            columnTwo.SubItems.Add(CreateMRUButton(dh, "&2. Prospect Email.rtf"));
+                            columnTwo.SubItems.Add(CreateMRUButton(dh, "&3. Customer Email.rtf"));
+                            columnTwo.SubItems.Add(CreateMRUButton(dh, "&4. example.rtf"));
+
+                            twoColumnMenu.SubItems.Add(columnTwo);
+
+                            // Bottom Container
+                            ItemContainer bottomContainer = dh.CreateComponent(typeof(ItemContainer)) as ItemContainer;
+                            bottomContainer.BackgroundStyle.Class = ElementStyleClassKeys.RibbonFileMenuBottomContainerKey;
+                            bottomContainer.HorizontalItemAlignment = DevComponents.DotNetBar.eHorizontalItemsAlignment.Right;
+                            //RibbonPredefinedColorSchemes.SetupMenuBottomContainer(bottomContainer);
+                            fileButton = CreateFileButton(dh, "Opt&ions", LoadImage(fileOptions));
+                            fileButton.ColorTable = eButtonColor.OrangeWithBackground;
+                            bottomContainer.SubItems.Add(fileButton);
+                            fileButton = CreateFileButton(dh, "E&xit", LoadImage(fileExit));
+                            fileButton.ColorTable = eButtonColor.OrangeWithBackground;
+                            bottomContainer.SubItems.Add(fileButton);
+                            topContainer.SubItems.Add(bottomContainer);
+                        }
+                        catch
+                        {
+                            trans.Cancel();
+                        }
+                        finally
+                        {
+                            if (!trans.Canceled) trans.Commit();
+                            m_CreatingItem = false;
+                        }
+                    }
+                }
+            }
+        }
+
+        private ButtonItem CreateFileButton(IDesignerHost dh, string text, Image image)
+        {
+            ButtonItem button = dh.CreateComponent(typeof(ButtonItem)) as ButtonItem;
+            button.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText;
+            button.Image = image;
+            button.SubItemsExpandWidth = 24;
+            button.Text = text;
+
+            return button;
+        }
+
+        private ButtonItem CreateMRUButton(IDesignerHost dh, string text)
+        {
+            ButtonItem button = dh.CreateComponent(typeof(ButtonItem)) as ButtonItem;
+            button.Text = text;
+
+            return button;
+        }
+
+
+        internal static Bitmap LoadImage(string imageName)
+        {
+            string imagesFolder = GetImagesFolder();
+            if (imagesFolder != "")
+            {
+                if (File.Exists(imagesFolder + imageName))
+                    return new Bitmap(imagesFolder + imageName);
+            }
+
+            return null;
+        }
+
+        private static string GetImagesFolder()
+        {
+            try
+            {
+                Microsoft.Win32.RegistryKey key = Microsoft.Win32.Registry.LocalMachine;
+                string path = "";
+                try
+                {
+                    if (key != null)
+                        key = key.OpenSubKey("Software\\DevComponents\\DotNetBar");
+                    if (key != null)
+                        path = key.GetValue("InstallationFolder", "").ToString();
+                }
+                finally { if (key != null) key.Close(); }
+
+                if (path != "")
+                {
+                    if (path.Substring(path.Length - 1, 1) != "\\")
+                        path += "\\";
+                    path += "Images\\";
+                    return path;
+                }
+            }
+            catch (Exception)
+            {
+            }
+            return "";
+        }
+
+        /// <summary>
+        /// Gets or sets whether control is expanded or not. When control is expanded both the tabs and the tab ribbons are visible. When collapsed
+        /// only tabs are visible.
+        /// </summary>
+        [DefaultValue(true), Browsable(true), DevCoBrowsable(true), Category("Layout"), Description("Gets or sets whether control is expanded or not. When control is expanded both the tabs and the tab ribbons are visible.")]
+        public bool Expanded
+        {
+            get
+            {
+                return (bool)ShadowProperties["Expanded"];
+            }
+            set
+            {
+                // this value is not passed to the actual control
+                this.ShadowProperties["Expanded"] = value;
+
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether control can be customized and items added by end-user using context menu to the quick access toolbar.
+        /// Caption of the control must be visible for customization to be enabled. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Browsable(true), Category("Quick Access Toolbar"), Description("Indicates whether control can be customized. Caption must be visible for customization to be fully enabled.")]
+        public bool CanCustomize
+        {
+            get
+            {
+                RibbonControl rc = this.Control as RibbonControl;
+                return rc.CanCustomize;
+            }
+            set
+            {
+                RibbonControl rc = this.Control as RibbonControl;
+                rc.CanCustomize = value;
+
+                IDesignerHost dh = this.GetService(typeof(IDesignerHost)) as IDesignerHost;
+                if (dh != null && !dh.Loading)
+                {
+                    if (value)
+                    {
+                        // Make sure that QatCustomizeItem exists
+                        QatCustomizeItem qatCustom = GetQatCustomizeItem(rc);
+                        if (qatCustom == null)
+                        {
+                            DesignerTransaction dt = dh.CreateTransaction("Creating the QAT");
+                            try
+                            {
+                                // Create QatCustomItem...
+                                m_CreatingItem = true;
+                                qatCustom = dh.CreateComponent(typeof(QatCustomizeItem)) as QatCustomizeItem;
+                                IComponentChangeService cc = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+                                if (cc != null)
+                                    cc.OnComponentChanging(rc, TypeDescriptor.GetProperties(rc)["QuickToolbarItems"]);
+                                rc.QuickToolbarItems.Add(qatCustom);
+                                if (cc != null)
+                                    cc.OnComponentChanged(rc, TypeDescriptor.GetProperties(rc)["QuickToolbarItems"], null, null);
+                                m_CreatingItem = false;
+                                this.RecalcLayout();
+                            }
+                            catch
+                            {
+                                dt.Cancel();
+                            }
+                            finally
+                            {
+                                if (!dt.Canceled) dt.Commit();
+                            }
+                        }
+                    }
+                    else
+                    {
+                        QatCustomizeItem qatCustom = GetQatCustomizeItem(rc);
+                        if (qatCustom != null)
+                        {
+                            DesignerTransaction dt = dh.CreateTransaction("Removing the QAT");
+                            try
+                            {
+                                IComponentChangeService cc = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+                                if (cc != null)
+                                    cc.OnComponentChanging(rc, TypeDescriptor.GetProperties(rc)["QuickToolbarItems"]);
+                                rc.QuickToolbarItems.Remove(qatCustom);
+                                if (cc != null)
+                                    cc.OnComponentChanged(rc, TypeDescriptor.GetProperties(rc)["QuickToolbarItems"], null, null);
+                                dh.DestroyComponent(qatCustom);
+                            }
+                            catch
+                            {
+                                dt.Cancel();
+                            }
+                            finally
+                            {
+                                if (!dt.Canceled) dt.Commit();
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        private QatCustomizeItem GetQatCustomizeItem(RibbonControl rc)
+        {
+            QatCustomizeItem qatCustom = null;
+            // Remove QatCustomizeItem if it exists
+            foreach (BaseItem item in rc.QuickToolbarItems)
+            {
+                if (item is QatCustomizeItem)
+                {
+                    qatCustom = item as QatCustomizeItem;
+                    break;
+                }
+            }
+            return qatCustom;
+        }
+
+        protected override void PreFilterProperties(IDictionary properties)
+        {
+            base.PreFilterProperties(properties);
+            properties["Expanded"] = TypeDescriptor.CreateProperty(typeof(RibbonControlDesigner), (PropertyDescriptor)properties["Expanded"], new Attribute[]
+				{new DefaultValueAttribute(true),
+					new BrowsableAttribute(true),
+					new CategoryAttribute("Layout")});
+
+            properties["Style"] = TypeDescriptor.CreateProperty(typeof(RibbonControlDesigner), (PropertyDescriptor)properties["Style"], new Attribute[]
+				{
+						new DefaultValueAttribute(eDotNetBarStyle.Office2003),
+					new BrowsableAttribute(false),
+					new CategoryAttribute("Appearance")});
+
+            properties["CaptionVisible"] = TypeDescriptor.CreateProperty(typeof(RibbonControlDesigner), (PropertyDescriptor)properties["CaptionVisible"], new Attribute[]
+				{
+					new DefaultValueAttribute(false),
+					new BrowsableAttribute(true),
+					new CategoryAttribute("Appearance"),
+                    new DescriptionAttribute("Indicates whether custom caption and quick access toolbar provided by the control is visible.")});
+
+            properties["CanCustomize"] = TypeDescriptor.CreateProperty(typeof(RibbonControlDesigner), (PropertyDescriptor)properties["CanCustomize"], new Attribute[]
+				{
+					new DefaultValueAttribute(true),
+					new BrowsableAttribute(true),
+					new CategoryAttribute("Quick Access Toolbar"),
+                    new DescriptionAttribute("Indicates whether control can be customized. Caption must be visible for customization to be fully enabled")});
+
+            properties["BackgroundImageStock"] = TypeDescriptor.CreateProperty(
+                this.GetType(),
+                "BackgroundImageStock",
+                typeof(eRibbonBackgroundStock),
+                new Attribute[] { 
+                    new BrowsableAttribute(true), 
+                    new DesignOnlyAttribute(true),
+                    new DefaultValueAttribute(eRibbonBackgroundStock.PickOne), 
+                    new DesignerSerializationVisibilityAttribute(DesignerSerializationVisibility.Hidden),
+                    new DescriptionAttribute("Specifies the stock ribbon background image loaded from DotNetBar Images folder")});
+
+            //DesignTime.RemoveProperties(properties, new string[] { "AccessibleDescription" 
+            //    ,"AccessibleName","AccessibleRole","AutoScroll", "AutoScrollMargin", "AutoScrollMinSize",
+            //    "BackColor", "BackgroundImage", "BackgroundImageLayout", "DisplayRectangle", "ForeColor",
+            //    "MaximumSize", "MinimumSize", "Site","Text","UseWaitCursor", "Cursor","ContextMenuStrip"});
+        }
+
+        private eRibbonBackgroundStock _BackgroundImageStock = eRibbonBackgroundStock.PickOne;
+        public eRibbonBackgroundStock BackgroundImageStock
+        {
+            get { return _BackgroundImageStock; }
+            set
+            {
+                if (_BackgroundImageStock != value)
+                {
+                    _BackgroundImageStock = value;
+                    if (_BackgroundImageStock != eRibbonBackgroundStock.PickOne)
+                    {
+                        IDesignerHost dh = GetService(typeof(IDesignerHost)) as IDesignerHost;
+                        if (dh != null && !dh.Loading)
+                        {
+                            RibbonControl ribbon = this.Control as RibbonControl;
+                            if (ribbon != null)
+                            {
+                                IComponentChangeService cc = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+                                if (cc != null)
+                                    cc.OnComponentChanging(ribbon, TypeDescriptor.GetProperties(ribbon)["BackgroundImage"]);
+
+                                ribbon.BackgroundImage = RibbonControlDesigner.LoadImage(value.ToString() + ".png");
+
+                                if (cc != null)
+                                    cc.OnComponentChanged(ribbon, TypeDescriptor.GetProperties(ribbon)["BackgroundImage"], null, null);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        #endregion
+    }
+
+    public enum eRibbonBackgroundStock
+    {
+        PickOne,
+        RibbonCalligraphy1,
+        RibbonCalligraphy2,
+        RibbonCircleAndStripes,
+        RibbonCircuit,
+        RibbonClouds,
+        RibbonDoodleCircles,
+        RibbonDoodleDiamonds,
+        RibbonGeometry,
+        RibbonLunchBox,
+        RibbonSchoolStuff,
+        RibbonSpring,
+        RibbonStars,
+        RibbonStraws,
+        RibbonTreeRings,
+        RibbonUnderwater
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/RibbonPanelDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/RibbonPanelDesigner.cs
new file mode 100644
index 00000000..3a5912ee
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/RibbonPanelDesigner.cs	
@@ -0,0 +1,121 @@
+using System;
+using System.Text;
+using System.ComponentModel.Design;
+using System.Windows.Forms.Design;
+using System.Drawing;
+using System.Collections;
+using System.ComponentModel;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Design
+{
+    /// <summary>
+    /// Represents designer for RibbonPanel control.
+    /// </summary>
+    public class RibbonPanelDesigner:PanelControlDesigner
+    {
+        #region Internal Implementation
+        public override SelectionRules SelectionRules
+		{
+			get{return (SelectionRules.Locked | SelectionRules.Visible);}
+        }
+
+        protected override void SetDesignTimeDefaults()
+        {
+            RibbonPanel p = this.Control as RibbonPanel;
+            #if FRAMEWORK20
+            p.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3);
+            #else
+            p.DockPadding.Left = 3;
+            p.DockPadding.Right = 3;
+            p.DockPadding.Bottom = 3;
+            #endif
+        }
+
+        public override DesignerVerbCollection Verbs
+        {
+            get
+            {
+                DesignerVerbCollection verbs=new DesignerVerbCollection(new DesignerVerb[]
+				    {
+                        new DesignerVerb("Create RibbonBar", new EventHandler(CreateRibbonBar)),
+					    new DesignerVerb("Layout Ribbons", new EventHandler(LayoutRibbons))
+                    });
+                //verbs.AddRange(base.Verbs);
+                
+                return verbs;
+            }
+        }
+
+        private void LayoutRibbons(object sender, EventArgs e)
+        {
+            RibbonPanel panel = this.Control as RibbonPanel;
+            if (panel == null)
+                return;
+
+            IDesignerHost host = this.GetService(typeof(IDesignerHost)) as IDesignerHost;
+            DesignerTransaction trans=null;
+            if (host != null)
+                trans=host.CreateTransaction("Rendering Layout");
+
+            try
+            {
+                panel.LayoutRibbons();
+            }
+            finally
+            {
+                if (trans != null)
+                    trans.Commit();
+            }
+        }
+
+        private void CreateRibbonBar(object sender, EventArgs e)
+        {
+            RibbonPanel panel = this.Control as RibbonPanel;
+            if (panel == null)
+                return;
+
+            IDesignerHost dh = (IDesignerHost)GetService(typeof(IDesignerHost));
+            if (dh != null)
+            {
+                DesignerTransaction trans = dh.CreateTransaction("Create Default Ribbon Bar");
+                IComponentChangeService cc = (IComponentChangeService)GetService(typeof(IComponentChangeService));
+                try
+                {
+                    RibbonBar bar = dh.CreateComponent(typeof(RibbonBar)) as RibbonBar;
+                    TypeDescriptor.GetProperties(bar)["Width"].SetValue(bar, 100);
+#if !TRIAL
+                    string key = RibbonBarDesigner.GetLicenseKey();
+                    bar.LicenseKey = key;
+#endif
+                    TypeDescriptor.GetProperties(bar)["Text"].SetValue(bar, bar.Name);
+
+                    cc.OnComponentChanging(panel, TypeDescriptor.GetProperties(typeof(Control))["Controls"]);
+                    panel.Controls.Add(bar);
+                    bar.Dock = DockStyle.Left;
+                    bar.BringToFront();
+                    cc.OnComponentChanged(panel, TypeDescriptor.GetProperties(typeof(Control))["Controls"], null, null);
+                }
+                catch
+                {
+                    trans.Cancel();
+                    throw;
+                }
+                finally
+                {
+                    if (!trans.Canceled)
+                        trans.Commit();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Draws design-time border around the panel when panel does not have one.
+        /// </summary>
+        /// <param name="g"></param>
+        protected override void DrawBorder(Graphics g)
+        {
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/RibbonTabItemDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/RibbonTabItemDesigner.cs
new file mode 100644
index 00000000..57775f06
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/RibbonTabItemDesigner.cs	
@@ -0,0 +1,18 @@
+using System.ComponentModel.Design;
+
+namespace DevComponents.DotNetBar.Design
+{
+	/// <summary>
+	/// Represents Windows Forms designer for RibbonTabItem
+	/// </summary>
+	public class RibbonTabItemDesigner:BaseItemDesigner
+	{
+		public override DesignerVerbCollection Verbs 
+		{
+			get 
+			{
+				return null;
+			}
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/RibbonTabItemGroupCollectionEditor.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/RibbonTabItemGroupCollectionEditor.cs
new file mode 100644
index 00000000..1f7207fb
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/RibbonTabItemGroupCollectionEditor.cs	
@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace DevComponents.DotNetBar.Design
+{
+    /// <summary>
+    /// Summary description for RibbonTabItemGroupCollectionEditor.
+    /// </summary>
+    public class RibbonTabItemGroupCollectionEditor : System.ComponentModel.Design.CollectionEditor
+    {
+        public RibbonTabItemGroupCollectionEditor(Type type)
+            : base(type)
+        {
+        }
+        protected override Type CreateCollectionItemType()
+        {
+            return typeof(RibbonTabItemGroup);
+        }
+        protected override object CreateInstance(Type itemType)
+        {
+            object item = base.CreateInstance(itemType);
+            if (item is RibbonTabItemGroup)
+            {
+                RibbonTabItemGroup group = item as RibbonTabItemGroup;
+                DesignerSupport.SetDefaults(group);
+            }
+            return item;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/RibbonTabItemGroupConverter.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/RibbonTabItemGroupConverter.cs
new file mode 100644
index 00000000..35f5419d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/RibbonTabItemGroupConverter.cs	
@@ -0,0 +1,34 @@
+using System;
+using System.ComponentModel;
+using System.Globalization;
+
+namespace DevComponents.DotNetBar.Design
+{
+	/// <summary>
+	/// Represents the converted for RibbonTabItemGroup. Used for Windows Forms designer support.
+	/// </summary>
+	public class RibbonTabItemGroupConverter:ExpandableObjectConverter
+	{
+		public override bool CanConvertTo(ITypeDescriptorContext context,System.Type destinationType) 
+		{
+			if (destinationType == typeof(RibbonTabItemGroup))
+				return true;
+
+			return base.CanConvertTo(context, destinationType);
+		}
+
+		public override object ConvertTo(ITypeDescriptorContext context,CultureInfo culture, object value, System.Type destinationType) 
+		{
+			if (destinationType == typeof(System.String) && value is RibbonTabItemGroup)
+			{
+
+				RibbonTabItemGroup g = (RibbonTabItemGroup)value;
+
+				return g.GroupTitle;
+			}
+			return base.ConvertTo(context, culture, value, destinationType);
+		}
+
+
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/RibbonTabItemGroupTypeEditor.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/RibbonTabItemGroupTypeEditor.cs
new file mode 100644
index 00000000..a5bf224d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/RibbonTabItemGroupTypeEditor.cs	
@@ -0,0 +1,78 @@
+using System;
+using System.ComponentModel;
+using System.ComponentModel.Design;
+using System.Drawing.Design;
+using System.Windows.Forms;
+using System.Windows.Forms.Design;
+
+namespace DevComponents.DotNetBar.Design
+{
+	/// <summary>
+	/// Represents Windows Forms designer support for RibbonTabItemGroup object.
+	/// </summary>
+	public class RibbonTabItemGroupTypeEditor:UITypeEditor
+	{
+		private IWindowsFormsEditorService m_EdSvc = null;
+		private const string CREATE_NEW_GROUP="<Create new group>";
+
+		public override UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext context) 
+		{
+			if (context != null && context.Instance != null) 
+			{
+				return UITypeEditorEditStyle.DropDown;
+			}
+			return base.GetEditStyle(context);
+		}
+
+		public override object EditValue(ITypeDescriptorContext context, IServiceProvider provider, object value) 
+		{
+
+			if (context!=null && context.Instance!=null && provider!=null) 
+			{
+				m_EdSvc=(IWindowsFormsEditorService)provider.GetService(typeof(IWindowsFormsEditorService));
+				if(m_EdSvc!=null) 
+				{
+					RibbonTabItemGroupCollection groups=null;
+					RibbonTabItem ribbonTabItem=null;
+					RibbonStrip strip=null;
+					if(context.Instance is RibbonTabItem)
+					{
+						ribbonTabItem=(RibbonTabItem)context.Instance;
+						strip=ribbonTabItem.ContainerControl as RibbonStrip;
+						if(strip!=null)
+							groups=strip.TabGroups;
+					}
+					if(groups==null && context.Instance!=null)
+						System.Windows.Forms.MessageBox.Show("Unknow control using RibbonTabGroupEditor. Cannot edit groups. ["+context.Instance.ToString()+"]");
+					else if(groups==null)
+						System.Windows.Forms.MessageBox.Show("Unknow control using RibbonTabGroupEditor. Cannot edit groups. [context instance null]");
+
+					ListBox listBox=new ListBox();
+					foreach(RibbonTabItemGroup g in groups)
+					{
+						listBox.Items.Add(g);
+						if(g==ribbonTabItem.Group)
+							listBox.SelectedItem=g;
+					}
+
+					listBox.Items.Add(CREATE_NEW_GROUP);
+
+					listBox.SelectedIndexChanged+=new EventHandler(this.SelectedChanged);
+					m_EdSvc.DropDownControl(listBox);
+					if(listBox.SelectedItem is string && listBox.SelectedItem.ToString()==CREATE_NEW_GROUP)
+						value=DesignerSupport.CreateRibbonTabItemGroup(strip,provider);
+					else
+						value=listBox.SelectedItem;
+				}
+			}
+
+			return value;
+		}
+
+		private void SelectedChanged(object sender, EventArgs e)
+		{
+			if(m_EdSvc!=null)
+				m_EdSvc.CloseDropDown();
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/RichTextBoxExDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/RichTextBoxExDesigner.cs
new file mode 100644
index 00000000..7eb3a491
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/RichTextBoxExDesigner.cs	
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows.Forms.Design;
+using DevComponents.DotNetBar.Controls;
+using DevComponents.DotNetBar.Rendering;
+
+namespace DevComponents.DotNetBar.Design
+{
+    public class RichTextBoxExDesigner : ControlDesigner
+    {
+        public override void InitializeNewComponent(System.Collections.IDictionary defaultValues)
+        {
+            RichTextBoxEx rtb = (RichTextBoxEx)this.Control;
+            rtb.BackgroundStyle.Class = ElementStyleClassKeys.RichTextBoxBorderKey;
+            base.InitializeNewComponent(defaultValues);
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/Schedule.Design/CalendarViewDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/Schedule.Design/CalendarViewDesigner.cs
new file mode 100644
index 00000000..ce7724e4
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/Schedule.Design/CalendarViewDesigner.cs	
@@ -0,0 +1,86 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows.Forms.Design;
+using System.ComponentModel.Design;
+using System.ComponentModel;
+using System.Collections;
+using DevComponents.DotNetBar.Schedule;
+
+namespace DevComponents.DotNetBar.Design
+{
+    /// <summary>
+    /// Represents designer for the CalendarView control.
+    /// </summary>
+    public class CalendarViewDesigner : ControlDesigner
+    {
+        #region Internal Implementation
+        public override void Initialize(IComponent component)
+        {
+            base.Initialize(component);
+            if (component == null || component.Site == null || !component.Site.DesignMode)
+                return;
+
+#if !TRIAL
+            IDesignerHost dh = this.GetService(typeof(IDesignerHost)) as IDesignerHost;
+            if (dh != null)
+                dh.LoadComplete += new EventHandler(DesignerLoadComplete);
+#endif
+        }
+#if FRAMEWORK20
+        public override void InitializeNewComponent(IDictionary defaultValues)
+        {
+            base.InitializeNewComponent(defaultValues);
+            SetDesignTimeDefaults();
+        }
+#else
+		public override void OnSetComponentDefaults()
+		{
+            SetDesignTimeDefaults();
+			base.OnSetComponentDefaults();
+		}
+#endif
+
+        private void SetDesignTimeDefaults()
+        {
+            CalendarView calendar = this.Control as CalendarView;
+#if !TRIAL
+            string key = GetLicenseKey();
+            calendar.LicenseKey = key;
+#endif
+        }
+        #endregion
+
+        #region Licensing Stuff
+#if !TRIAL
+        internal static string GetLicenseKey()
+        {
+            string key = "";
+            Microsoft.Win32.RegistryKey regkey = Microsoft.Win32.Registry.LocalMachine;
+            regkey = regkey.OpenSubKey("Software\\DevComponents\\Licenses", false);
+            if (regkey != null)
+            {
+                object keyValue = regkey.GetValue("DevComponents.DotNetBar.DotNetBarManager2");
+                if (keyValue != null)
+                    key = keyValue.ToString();
+            }
+            return key;
+        }
+        private void DesignerLoadComplete(object sender, EventArgs e)
+        {
+            IDesignerHost dh = this.GetService(typeof(IDesignerHost)) as IDesignerHost;
+            if (dh != null)
+                dh.LoadComplete -= new EventHandler(DesignerLoadComplete);
+
+            string key = GetLicenseKey();
+            CalendarView calendar = this.Control as CalendarView;
+            if (key != "" && calendar != null && calendar.LicenseKey == "" && calendar.LicenseKey != key)
+                TypeDescriptor.GetProperties(calendar)["LicenseKey"].SetValue(calendar, key);
+        }
+#endif
+        #endregion
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ShapeEditorForm.Designer.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ShapeEditorForm.Designer.cs
new file mode 100644
index 00000000..30905770
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ShapeEditorForm.Designer.cs	
@@ -0,0 +1,445 @@
+#if FRAMEWORK20
+namespace DevComponents.DotNetBar.Design
+{
+    partial class ShapeEditorForm
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form 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();
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ShapeEditorForm));
+            this.itemPanel1 = new DevComponents.DotNetBar.ItemPanel();
+            this.labelItem1 = new DevComponents.DotNetBar.LabelItem();
+            this.itemContainer1 = new DevComponents.DotNetBar.ItemContainer();
+            this.buttonDefault = new DevComponents.DotNetBar.ButtonItem();
+            this.buttonRect = new DevComponents.DotNetBar.ButtonItem();
+            this.buttonRound = new DevComponents.DotNetBar.ButtonItem();
+            this.buttonEllipse = new DevComponents.DotNetBar.ButtonItem();
+            this.button1 = new System.Windows.Forms.Button();
+            this.button2 = new System.Windows.Forms.Button();
+            this.tabControl1 = new DevComponents.DotNetBar.TabControl();
+            this.tabControlPanel1 = new DevComponents.DotNetBar.TabControlPanel();
+            this.tabDefault = new DevComponents.DotNetBar.TabItem(this.components);
+            this.tabControlPanel4 = new DevComponents.DotNetBar.TabControlPanel();
+            this.tabItem1 = new DevComponents.DotNetBar.TabItem(this.components);
+            this.tabControlPanel2 = new DevComponents.DotNetBar.TabControlPanel();
+            this.tabRect = new DevComponents.DotNetBar.TabItem(this.components);
+            this.tabControlPanel3 = new DevComponents.DotNetBar.TabControlPanel();
+            this.roundBottomRight = new DevComponents.Editors.IntegerInput();
+            this.roundTopRight = new DevComponents.Editors.IntegerInput();
+            this.roundBottomLeft = new DevComponents.Editors.IntegerInput();
+            this.roundTopLeft = new DevComponents.Editors.IntegerInput();
+            this.buttonRoundPreview = new DevComponents.DotNetBar.ButtonX();
+            this.tabRound = new DevComponents.DotNetBar.TabItem(this.components);
+            ((System.ComponentModel.ISupportInitialize)(this.tabControl1)).BeginInit();
+            this.tabControl1.SuspendLayout();
+            this.tabControlPanel3.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.roundBottomRight)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.roundTopRight)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.roundBottomLeft)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.roundTopLeft)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // itemPanel1
+            // 
+            // 
+            // 
+            // 
+            this.itemPanel1.BackgroundStyle.BackColor = System.Drawing.Color.White;
+            this.itemPanel1.BackgroundStyle.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            this.itemPanel1.BackgroundStyle.BorderBottomWidth = 1;
+            this.itemPanel1.BackgroundStyle.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(157)))), ((int)(((byte)(185)))));
+            this.itemPanel1.BackgroundStyle.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            this.itemPanel1.BackgroundStyle.BorderLeftWidth = 1;
+            this.itemPanel1.BackgroundStyle.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            this.itemPanel1.BackgroundStyle.BorderRightWidth = 1;
+            this.itemPanel1.BackgroundStyle.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            this.itemPanel1.BackgroundStyle.BorderTopWidth = 1;
+            this.itemPanel1.BackgroundStyle.PaddingBottom = 1;
+            this.itemPanel1.BackgroundStyle.PaddingLeft = 1;
+            this.itemPanel1.BackgroundStyle.PaddingRight = 1;
+            this.itemPanel1.BackgroundStyle.PaddingTop = 1;
+            this.itemPanel1.Dock = System.Windows.Forms.DockStyle.Top;
+            this.itemPanel1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+            this.labelItem1,
+            this.itemContainer1});
+            this.itemPanel1.ItemSpacing = 2;
+            this.itemPanel1.LayoutOrientation = DevComponents.DotNetBar.eOrientation.Vertical;
+            this.itemPanel1.Location = new System.Drawing.Point(0, 0);
+            this.itemPanel1.Name = "itemPanel1";
+            this.itemPanel1.Size = new System.Drawing.Size(387, 69);
+            this.itemPanel1.TabIndex = 0;
+            this.itemPanel1.Text = "itemPanel1";
+            this.itemPanel1.OptionGroupChanging += new DevComponents.DotNetBar.OptionGroupChangingEventHandler(this.itemPanel1_OptionGroupChanging);
+            // 
+            // labelItem1
+            // 
+            this.labelItem1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            this.labelItem1.BorderSide = DevComponents.DotNetBar.eBorderSide.Bottom;
+            this.labelItem1.BorderType = DevComponents.DotNetBar.eBorderType.SingleLine;
+            this.labelItem1.Name = "labelItem1";
+            this.labelItem1.PaddingBottom = 2;
+            this.labelItem1.PaddingLeft = 2;
+            this.labelItem1.PaddingTop = 2;
+            this.labelItem1.SingleLineColor = System.Drawing.Color.DarkGray;
+            this.labelItem1.Text = "<b>Choose the shape you want to use:</b>";
+            // 
+            // itemContainer1
+            // 
+            this.itemContainer1.Name = "itemContainer1";
+            this.itemContainer1.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+            this.buttonDefault,
+            this.buttonRect,
+            this.buttonRound,
+            this.buttonEllipse});
+            // 
+            // buttonDefault
+            // 
+            this.buttonDefault.AutoCheckOnClick = true;
+            this.buttonDefault.Image = ((System.Drawing.Image)(resources.GetObject("buttonDefault.Image")));
+            this.buttonDefault.ImagePaddingHorizontal = 8;
+            this.buttonDefault.Name = "buttonDefault";
+            this.buttonDefault.OptionGroup = "shape";
+            this.buttonDefault.Text = "Default";
+            this.buttonDefault.Tooltip = "Use Default Shape";
+            // 
+            // buttonRect
+            // 
+            this.buttonRect.AutoCheckOnClick = true;
+            this.buttonRect.Image = ((System.Drawing.Image)(resources.GetObject("buttonRect.Image")));
+            this.buttonRect.ImagePaddingHorizontal = 8;
+            this.buttonRect.Name = "buttonRect";
+            this.buttonRect.OptionGroup = "shape";
+            this.buttonRect.Text = "Rect";
+            this.buttonRect.Tooltip = "Rectangle Shape";
+            // 
+            // buttonRound
+            // 
+            this.buttonRound.AutoCheckOnClick = true;
+            this.buttonRound.Image = ((System.Drawing.Image)(resources.GetObject("buttonRound.Image")));
+            this.buttonRound.ImagePaddingHorizontal = 8;
+            this.buttonRound.Name = "buttonRound";
+            this.buttonRound.OptionGroup = "shape";
+            this.buttonRound.Text = "Round";
+            this.buttonRound.Tooltip = "Rounded Rectangle Shape";
+            // 
+            // buttonEllipse
+            // 
+            this.buttonEllipse.AutoCheckOnClick = true;
+            this.buttonEllipse.Image = ((System.Drawing.Image)(resources.GetObject("buttonEllipse.Image")));
+            this.buttonEllipse.ImagePaddingHorizontal = 8;
+            this.buttonEllipse.Name = "buttonEllipse";
+            this.buttonEllipse.OptionGroup = "shape";
+            this.buttonEllipse.Text = "Elliptical Shape";
+            this.buttonEllipse.Tooltip = "Elliptical Shape";
+            // 
+            // button1
+            // 
+            this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.button1.DialogResult = System.Windows.Forms.DialogResult.OK;
+            this.button1.Location = new System.Drawing.Point(228, 165);
+            this.button1.Name = "button1";
+            this.button1.Size = new System.Drawing.Size(75, 24);
+            this.button1.TabIndex = 1;
+            this.button1.Text = "OK";
+            this.button1.UseVisualStyleBackColor = true;
+            this.button1.Click += new System.EventHandler(this.button1_Click);
+            // 
+            // button2
+            // 
+            this.button2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.button2.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+            this.button2.Location = new System.Drawing.Point(309, 165);
+            this.button2.Name = "button2";
+            this.button2.Size = new System.Drawing.Size(75, 24);
+            this.button2.TabIndex = 2;
+            this.button2.Text = "Cancel";
+            this.button2.UseVisualStyleBackColor = true;
+            // 
+            // tabControl1
+            // 
+            this.tabControl1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+                        | System.Windows.Forms.AnchorStyles.Left)
+                        | System.Windows.Forms.AnchorStyles.Right)));
+            this.tabControl1.CanReorderTabs = true;
+            this.tabControl1.Controls.Add(this.tabControlPanel1);
+            this.tabControl1.Controls.Add(this.tabControlPanel4);
+            this.tabControl1.Controls.Add(this.tabControlPanel2);
+            this.tabControl1.Controls.Add(this.tabControlPanel3);
+            this.tabControl1.Location = new System.Drawing.Point(0, 70);
+            this.tabControl1.Name = "tabControl1";
+            this.tabControl1.SelectedTabFont = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold);
+            this.tabControl1.SelectedTabIndex = 0;
+            this.tabControl1.Size = new System.Drawing.Size(387, 89);
+            this.tabControl1.Style = DevComponents.DotNetBar.eTabStripStyle.Office2007Dock;
+            this.tabControl1.TabIndex = 3;
+            this.tabControl1.TabLayoutType = DevComponents.DotNetBar.eTabLayoutType.FixedWithNavigationBox;
+            this.tabControl1.Tabs.Add(this.tabDefault);
+            this.tabControl1.Tabs.Add(this.tabRect);
+            this.tabControl1.Tabs.Add(this.tabRound);
+            this.tabControl1.Tabs.Add(this.tabItem1);
+            this.tabControl1.TabsVisible = false;
+            this.tabControl1.Text = "tabControl1";
+            this.tabControl1.SelectedTabChanged += new DevComponents.DotNetBar.TabStrip.SelectedTabChangedEventHandler(this.tabControl1_SelectedTabChanged);
+            // 
+            // tabControlPanel1
+            // 
+            this.tabControlPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tabControlPanel1.Location = new System.Drawing.Point(0, 22);
+            this.tabControlPanel1.Name = "tabControlPanel1";
+            this.tabControlPanel1.Padding = new System.Windows.Forms.Padding(1);
+            this.tabControlPanel1.Size = new System.Drawing.Size(387, 67);
+            this.tabControlPanel1.Style.Alignment = System.Drawing.StringAlignment.Center;
+            this.tabControlPanel1.Style.BackColor1.Color = System.Drawing.Color.White;
+            this.tabControlPanel1.Style.BackColor2.Color = System.Drawing.Color.White;
+            this.tabControlPanel1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+            this.tabControlPanel1.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(157)))), ((int)(((byte)(185)))));
+            this.tabControlPanel1.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right)
+                        | DevComponents.DotNetBar.eBorderSide.Bottom)));
+            this.tabControlPanel1.Style.ForeColor.Color = System.Drawing.Color.DimGray;
+            this.tabControlPanel1.Style.GradientAngle = 90;
+            this.tabControlPanel1.TabIndex = 1;
+            this.tabControlPanel1.TabItem = this.tabDefault;
+            this.tabControlPanel1.Text = "No properties available for this shape.";
+            this.tabControlPanel1.UseCustomStyle = true;
+            // 
+            // tabDefault
+            // 
+            this.tabDefault.AttachedControl = this.tabControlPanel1;
+            this.tabDefault.Name = "tabDefault";
+            this.tabDefault.Text = "Default";
+            // 
+            // tabControlPanel4
+            // 
+            this.tabControlPanel4.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tabControlPanel4.Location = new System.Drawing.Point(0, 22);
+            this.tabControlPanel4.Name = "tabControlPanel4";
+            this.tabControlPanel4.Padding = new System.Windows.Forms.Padding(1);
+            this.tabControlPanel4.Size = new System.Drawing.Size(387, 67);
+            this.tabControlPanel4.Style.Alignment = System.Drawing.StringAlignment.Center;
+            this.tabControlPanel4.Style.BackColor1.Color = System.Drawing.Color.White;
+            this.tabControlPanel4.Style.BackColor2.Color = System.Drawing.Color.White;
+            this.tabControlPanel4.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+            this.tabControlPanel4.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(146)))), ((int)(((byte)(165)))), ((int)(((byte)(199)))));
+            this.tabControlPanel4.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right)
+                        | DevComponents.DotNetBar.eBorderSide.Bottom)));
+            this.tabControlPanel4.Style.ForeColor.Color = System.Drawing.Color.DimGray;
+            this.tabControlPanel4.Style.GradientAngle = 90;
+            this.tabControlPanel4.TabIndex = 4;
+            this.tabControlPanel4.TabItem = this.tabItem1;
+            this.tabControlPanel4.Text = "No properties available for this shape.";
+            this.tabControlPanel4.UseCustomStyle = true;
+            // 
+            // tabItem1
+            // 
+            this.tabItem1.AttachedControl = this.tabControlPanel4;
+            this.tabItem1.Name = "tabItem1";
+            this.tabItem1.Text = "Ellipse";
+            // 
+            // tabControlPanel2
+            // 
+            this.tabControlPanel2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tabControlPanel2.Location = new System.Drawing.Point(0, 22);
+            this.tabControlPanel2.Name = "tabControlPanel2";
+            this.tabControlPanel2.Padding = new System.Windows.Forms.Padding(1);
+            this.tabControlPanel2.Size = new System.Drawing.Size(387, 67);
+            this.tabControlPanel2.Style.Alignment = System.Drawing.StringAlignment.Center;
+            this.tabControlPanel2.Style.BackColor1.Color = System.Drawing.Color.White;
+            this.tabControlPanel2.Style.BackColor2.Color = System.Drawing.Color.White;
+            this.tabControlPanel2.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+            this.tabControlPanel2.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(157)))), ((int)(((byte)(185)))));
+            this.tabControlPanel2.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right)
+                        | DevComponents.DotNetBar.eBorderSide.Bottom)));
+            this.tabControlPanel2.Style.ForeColor.Color = System.Drawing.Color.DimGray;
+            this.tabControlPanel2.Style.GradientAngle = 90;
+            this.tabControlPanel2.TabIndex = 2;
+            this.tabControlPanel2.TabItem = this.tabRect;
+            this.tabControlPanel2.Text = "No properties available for this shape.";
+            this.tabControlPanel2.UseCustomStyle = true;
+            // 
+            // tabRect
+            // 
+            this.tabRect.AttachedControl = this.tabControlPanel2;
+            this.tabRect.Name = "tabRect";
+            this.tabRect.Text = "Rect";
+            // 
+            // tabControlPanel3
+            // 
+            this.tabControlPanel3.Controls.Add(this.roundBottomRight);
+            this.tabControlPanel3.Controls.Add(this.roundTopRight);
+            this.tabControlPanel3.Controls.Add(this.roundBottomLeft);
+            this.tabControlPanel3.Controls.Add(this.roundTopLeft);
+            this.tabControlPanel3.Controls.Add(this.buttonRoundPreview);
+            this.tabControlPanel3.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tabControlPanel3.Location = new System.Drawing.Point(0, 22);
+            this.tabControlPanel3.Name = "tabControlPanel3";
+            this.tabControlPanel3.Padding = new System.Windows.Forms.Padding(1);
+            this.tabControlPanel3.Size = new System.Drawing.Size(387, 67);
+            this.tabControlPanel3.Style.BackColor1.Color = System.Drawing.Color.White;
+            this.tabControlPanel3.Style.BackColor2.Color = System.Drawing.Color.White;
+            this.tabControlPanel3.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+            this.tabControlPanel3.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(157)))), ((int)(((byte)(185)))));
+            this.tabControlPanel3.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Right)
+                        | DevComponents.DotNetBar.eBorderSide.Bottom)));
+            this.tabControlPanel3.Style.GradientAngle = 90;
+            this.tabControlPanel3.TabIndex = 3;
+            this.tabControlPanel3.TabItem = this.tabRound;
+            this.tabControlPanel3.UseCustomStyle = true;
+            // 
+            // roundBottomRight
+            // 
+            this.roundBottomRight.AllowEmptyState = false;
+            // 
+            // 
+            // 
+            this.roundBottomRight.BackgroundStyle.Class = "DateTimeInputBackground";
+            this.roundBottomRight.Location = new System.Drawing.Point(231, 29);
+            this.roundBottomRight.MaxValue = 999;
+            this.roundBottomRight.MinValue = 0;
+            this.roundBottomRight.Name = "roundBottomRight";
+            this.roundBottomRight.ShowUpDown = true;
+            this.roundBottomRight.Size = new System.Drawing.Size(46, 20);
+            this.roundBottomRight.TabIndex = 4;
+            this.roundBottomRight.ValueChanged += new System.EventHandler(this.RoundCorner_ValueChanged);
+            // 
+            // roundTopRight
+            // 
+            this.roundTopRight.AllowEmptyState = false;
+            // 
+            // 
+            // 
+            this.roundTopRight.BackgroundStyle.Class = "DateTimeInputBackground";
+            this.roundTopRight.Location = new System.Drawing.Point(231, 4);
+            this.roundTopRight.MaxValue = 999;
+            this.roundTopRight.MinValue = 0;
+            this.roundTopRight.Name = "roundTopRight";
+            this.roundTopRight.ShowUpDown = true;
+            this.roundTopRight.Size = new System.Drawing.Size(46, 20);
+            this.roundTopRight.TabIndex = 3;
+            this.roundTopRight.ValueChanged += new System.EventHandler(this.RoundCorner_ValueChanged);
+            // 
+            // roundBottomLeft
+            // 
+            this.roundBottomLeft.AllowEmptyState = false;
+            // 
+            // 
+            // 
+            this.roundBottomLeft.BackgroundStyle.Class = "DateTimeInputBackground";
+            this.roundBottomLeft.Location = new System.Drawing.Point(96, 29);
+            this.roundBottomLeft.MaxValue = 999;
+            this.roundBottomLeft.MinValue = 0;
+            this.roundBottomLeft.Name = "roundBottomLeft";
+            this.roundBottomLeft.ShowUpDown = true;
+            this.roundBottomLeft.Size = new System.Drawing.Size(46, 20);
+            this.roundBottomLeft.TabIndex = 2;
+            this.roundBottomLeft.ValueChanged += new System.EventHandler(this.RoundCorner_ValueChanged);
+            // 
+            // roundTopLeft
+            // 
+            this.roundTopLeft.AllowEmptyState = false;
+            // 
+            // 
+            // 
+            this.roundTopLeft.BackgroundStyle.Class = "DateTimeInputBackground";
+            this.roundTopLeft.Location = new System.Drawing.Point(96, 4);
+            this.roundTopLeft.MaxValue = 999;
+            this.roundTopLeft.MinValue = 0;
+            this.roundTopLeft.Name = "roundTopLeft";
+            this.roundTopLeft.ShowUpDown = true;
+            this.roundTopLeft.Size = new System.Drawing.Size(46, 20);
+            this.roundTopLeft.TabIndex = 1;
+            this.roundTopLeft.ValueChanged += new System.EventHandler(this.RoundCorner_ValueChanged);
+            // 
+            // buttonRoundPreview
+            // 
+            this.buttonRoundPreview.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+            this.buttonRoundPreview.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+            this.buttonRoundPreview.Location = new System.Drawing.Point(148, 4);
+            this.buttonRoundPreview.Name = "buttonRoundPreview";
+            this.buttonRoundPreview.Shape = new DevComponents.DotNetBar.RoundRectangleShapeDescriptor(2);
+            this.buttonRoundPreview.Size = new System.Drawing.Size(77, 45);
+            this.buttonRoundPreview.TabIndex = 0;
+            this.buttonRoundPreview.Text = "Preview";
+            // 
+            // tabRound
+            // 
+            this.tabRound.AttachedControl = this.tabControlPanel3;
+            this.tabRound.Name = "tabRound";
+            this.tabRound.Text = "Round";
+            // 
+            // ShapeEditorForm
+            // 
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
+            this.ClientSize = new System.Drawing.Size(387, 194);
+            this.Controls.Add(this.tabControl1);
+            this.Controls.Add(this.button2);
+            this.Controls.Add(this.button1);
+            this.Controls.Add(this.itemPanel1);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.Name = "ShapeEditorForm";
+            this.Text = "Shape Editor";
+            ((System.ComponentModel.ISupportInitialize)(this.tabControl1)).EndInit();
+            this.tabControl1.ResumeLayout(false);
+            this.tabControlPanel3.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.roundBottomRight)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.roundTopRight)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.roundBottomLeft)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.roundTopLeft)).EndInit();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private ItemPanel itemPanel1;
+        private ButtonItem buttonRect;
+        private ButtonItem buttonRound;
+        private LabelItem labelItem1;
+        private ItemContainer itemContainer1;
+        private System.Windows.Forms.Button button1;
+        private System.Windows.Forms.Button button2;
+        private TabControl tabControl1;
+        private TabControlPanel tabControlPanel1;
+        private TabItem tabDefault;
+        private ButtonItem buttonDefault;
+        private TabControlPanel tabControlPanel3;
+        private TabItem tabRound;
+        private TabControlPanel tabControlPanel2;
+        private TabItem tabRect;
+        private DevComponents.Editors.IntegerInput roundBottomRight;
+        private DevComponents.Editors.IntegerInput roundTopRight;
+        private DevComponents.Editors.IntegerInput roundBottomLeft;
+        private DevComponents.Editors.IntegerInput roundTopLeft;
+        private ButtonX buttonRoundPreview;
+        private ButtonItem buttonEllipse;
+        private TabControlPanel tabControlPanel4;
+        private TabItem tabItem1;
+
+    }
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ShapeEditorForm.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ShapeEditorForm.cs
new file mode 100644
index 00000000..8662b021
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ShapeEditorForm.cs	
@@ -0,0 +1,96 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Design
+{
+    public partial class ShapeEditorForm : Form
+    {
+        public ShapeEditorForm()
+        {
+            InitializeComponent();
+#if (!TRIAL)
+            this.itemPanel1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F";
+#endif
+        }
+
+        private void itemPanel1_OptionGroupChanging(object sender, OptionGroupChangingEventArgs e)
+        {
+            BaseItem parent = e.NewChecked.Parent;
+            tabControl1.SelectedTabIndex = parent.SubItems.IndexOf(e.NewChecked);
+        }
+
+        private IShapeDescriptor _Shape = null;
+        public IShapeDescriptor Value
+        {
+            get
+            {
+                return _Shape;
+            }
+            set
+            {
+                _Shape = value;
+                OnShapeChanged();
+            }
+        }
+
+        private void OnShapeChanged()
+        {
+            if (_Shape is RoundRectangleShapeDescriptor)
+            {
+                RoundRectangleShapeDescriptor rcd = (RoundRectangleShapeDescriptor)_Shape;
+                if (rcd.IsEmpty)
+                    buttonRect.Checked = true;
+                else
+                    buttonRound.Checked = true;
+            }
+            else if (_Shape is EllipticalShapeDescriptor)
+                buttonEllipse.Checked = true;
+            else
+                buttonDefault.Checked = true;
+        }
+
+        private void tabControl1_SelectedTabChanged(object sender, TabStripTabChangedEventArgs e)
+        {
+            if (e.NewTab == tabRound)
+            {
+                RoundRectangleShapeDescriptor rcd = _Shape as RoundRectangleShapeDescriptor;
+                if (rcd == null)
+                {
+                    rcd = new RoundRectangleShapeDescriptor(2);
+                }
+                
+                roundTopLeft.Value = rcd.TopLeft;
+                roundTopRight.Value = rcd.TopRight;
+                roundBottomLeft.Value = rcd.BottomLeft;
+                roundBottomRight.Value = rcd.BottomRight;
+            }
+        }
+
+        private void button1_Click(object sender, EventArgs e)
+        {
+            if (buttonDefault.Checked)
+                _Shape = null;
+            else if (buttonRect.Checked)
+                _Shape = new RoundRectangleShapeDescriptor(0);
+            else if (buttonRound.Checked)
+            {
+                _Shape = new RoundRectangleShapeDescriptor(roundTopLeft.Value, roundTopRight.Value, roundBottomLeft.Value, roundBottomRight.Value);
+            }
+            else if (buttonEllipse.Checked)
+                _Shape = new EllipticalShapeDescriptor();
+        }
+
+        private void RoundCorner_ValueChanged(object sender, EventArgs e)
+        {
+            RoundRectangleShapeDescriptor rd = new RoundRectangleShapeDescriptor(roundTopLeft.Value, roundTopRight.Value, roundBottomLeft.Value, roundBottomRight.Value);
+            buttonRoundPreview.Shape = rd;
+        }
+    }
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ShapeEditorForm.resx b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ShapeEditorForm.resx
new file mode 100644
index 00000000..0414fe15
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ShapeEditorForm.resx	
@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="buttonDefault.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAARtJREFUSEu11s0O
+        ATEQwHGe2kmC8AQu4us9JD72AZzdxAU3xMWVkWl2u+10ZtrtbogL/1+13Wa7vemm0+oFwHhVXO6vb9br
+        8f5M1sV/9PCGel4D68fTzQAw9IxGWYdsBeQy7LoLNDecOgGgMVoeEtbcr9NAmkHWg0CsEapzgN5g6gKA
+        xnCxZ9aDr8sAb4h1FRAyNHUt4BvKegRgG/p6HIDGYL6D2xBOMeXJWzuLxN/A2KHen23193kEUM6MuHft
+        gWoBZ971hgogV/V8ffL3IP4PGWD2jMYQAHFHigYHiHWcBN4IAsq6bYDkb3QaiKrzBgEk1BnDBZLrIaMG
+        NKyTRgVkqfuGATLWHcMA+BwpnqZRX4BdC0evAeCjvdcPJU3BHJsJxscAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="buttonRect.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAElJREFUSEtjLJ+8
+        k4GmAGjBW5oBkOtHLcAbvKNBRDD1jQbRaBARDAGCCkZT0WgQEQwBggpGU9FoEBEMAYIKRlPRyAkiYFzT
+        DgEAW9poC2OGm6gAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="buttonRound.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAHhJREFUWEftl7sN
+        gDAMBZPlmIYeRqAPy8BOnsHIkWwQNTjNRbLyKfLO17mqavG17ud9idfvD9s81fjVAJZ2qJWIpJTn9eaz
+        w71Jyw2ArM7fOQbRDQCAAQxgAAMYwAAGMIABDGBguIERw4mPhGX4cGoATwgn+3v33AsdsD+EVKrZ5QAA
+        AABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="buttonEllipse.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAvZJREFUWEe9l8tv
+        ElEUxmtMSEy6ZUvSrUm3/geabk266qorViQurcFH4sqdTVArpkpMfEStaF9RXqlaKaFAWyxtoeURaClW
+        qBSEUl69nm/CkIEC5Tk3OekMc875fvfOvXNOLzDG+podY4/0/eR7lewymYxMWoqN0t8Q2SaZ4YHiWqrZ
+        nH0AOM9uqnTXbz3Wz7+YceR/rgXZ3kGChaNJCmMsly9y94H9ODMue5nqnSVH/nOIOS8vN/lGTpTkyj21
+        yWqy+Vgmm+cEmxmHiWM2ZXIxil9CjkYadQEoUPneuM7SmVwzmjV9IrF/bGLKChBlPYgzAOR86faE4aPZ
+        GWxbWBhYKBQZJkJ5PyB3NUgFADlISHx2OxTrirgwic6yA4hpaAghqgHGLeuhrovzCV99WQPEeE0AejCE
+        perlwIl5+MYMiCEeglsB+uHiXbXJlzrO9lKfy70V+AOAHWiWjyHdjOIMizWefbIBYrQMcOep0dbKOe8U
+        FJucAKwcAF3IXn91dpqzpfji6Sm7P7kACBkA5L3c+fXI3up+AUAOAFUwEm9pBt1w/u4IAEAFAH0nn9t2
+        YVy+AwDoAbCEz6XYg9+IALDiAyH28ASj3EkAgCmROhFbnzm3IwAwAUDt2/srOgB6DGgDQLFg94sOoJld
+        AYACAIP4NIo5sOeo7ANgkCtG1O9toI0SazjcYYhvCIuRfObHllj6fEmWCwEkyicGb+wo3XOIVc8+X465
+        zqjcEdGSDKu1ywyFolcjmT7hi9AwxCsAcEMQmnmzpyf62HilDlnDi9cCkBDEYrebk2yuwJ5PO7D0i2T1
+        m9LSKkjJyY4eoRuf6Hgyw2+6VcorFc7+zArwD8mxn0yLBjL0+6jtV4LjVmo8tMhZLV4XQAAyQoH+l3Mr
+        XDPZTNVEabdvhvlZ+yl+pJZwzU1YyxHvjOwGmZt6R4beHs2E1bXLvLuHDHUd1/jHY/KzHe8Z5i7FVLzv
+        llegOoCSDpCNoYiQfcNeKRmu8RueDTSacfWz/9qYA03zaAcqAAAAAElFTkSuQmCC
+</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ShapeTypeEditor.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ShapeTypeEditor.cs
new file mode 100644
index 00000000..201a0f4e
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ShapeTypeEditor.cs	
@@ -0,0 +1,88 @@
+using System;
+using System.Text;
+using System.Drawing.Design;
+using System.Windows.Forms.Design;
+using System.ComponentModel.Design;
+using System.ComponentModel;
+using System.Globalization;
+
+namespace DevComponents.DotNetBar.Design
+{
+    public class ShapeTypeEditor : System.Drawing.Design.UITypeEditor
+    {
+        /// <summary>
+        /// Gets the editor style used by the EditValue method.
+        /// </summary>
+        /// <param name="context">An ITypeDescriptorContext that can be used to gain additional context information.</param>
+        /// <returns>A UITypeEditorEditStyle value that indicates the style of editor used by EditValue. If the UITypeEditor does not support this method, then GetEditStyle will return None</returns>
+        public override UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext context)
+        {
+            return UITypeEditorEditStyle.Modal;
+        }
+
+        public override object EditValue(ITypeDescriptorContext context, IServiceProvider provider, object value)
+        {
+            if ((context != null) && (provider != null))
+            {
+                IUIService service = (IUIService)provider.GetService(typeof(IUIService));
+                IHelpService helpService = (IHelpService)provider.GetService(typeof(IHelpService));
+                IShapeDescriptor shape = EditShape(service, context.Instance, helpService, value);
+                return shape;
+            }
+            return value;
+        }
+
+        internal static IShapeDescriptor EditShape(IUIService uiService, object instance, IHelpService helpService, object currentValue)
+        {
+#if FRAMEWORK20
+            ShapeEditorForm editor = new ShapeEditorForm();
+            editor.Value = currentValue as IShapeDescriptor;
+            if (uiService != null)
+                uiService.ShowDialog(editor);
+            else
+                editor.ShowDialog();
+
+            if (editor.DialogResult == System.Windows.Forms.DialogResult.OK)
+            {
+                currentValue = editor.Value;
+            }
+
+            editor.Dispose();
+
+#endif
+			return currentValue as IShapeDescriptor;
+        }
+    }
+
+    public class ShapeStringConverter : TypeConverter
+    {
+        public override bool CanConvertTo(ITypeDescriptorContext context, Type destinationType)
+        {
+            if (destinationType == typeof(string)) return true;
+
+            return base.CanConvertTo(context, destinationType);
+        }
+
+        public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+        {
+            if (destinationType == typeof(string))
+            {
+                if (value is RoundRectangleShapeDescriptor)
+                {
+                    RoundRectangleShapeDescriptor rd = (RoundRectangleShapeDescriptor)value;
+                    if (rd.IsEmpty)
+                        return "Rectangle";
+                    else
+                        return "Round Rectangle";
+                }
+                else if (value is EllipticalShapeDescriptor)
+                    return "Ellipse";
+                else if (value == null)
+                    return "System Default";
+            }
+
+            return base.ConvertTo(context, culture, value, destinationType);
+        }
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ShortcutsDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ShortcutsDesigner.cs
new file mode 100644
index 00000000..726fe214
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ShortcutsDesigner.cs	
@@ -0,0 +1,154 @@
+using System;
+using System.ComponentModel;
+using System.ComponentModel.Design;
+using System.Windows.Forms;
+using System.Windows.Forms.ComponentModel;
+using System.Windows.Forms.Design;
+using System.Drawing.Design;
+using System.Globalization;
+
+namespace DevComponents.DotNetBar.Design
+{
+	/// <summary>
+	/// Summary description for ShortcutsDesigner.
+	/// </summary>
+	public class ShortcutsDesigner:UITypeEditor
+	{
+		private IWindowsFormsEditorService m_EdSvc = null;
+
+		public override UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext context) 
+		{
+			if (context != null && context.Instance != null) 
+			{
+				return UITypeEditorEditStyle.DropDown;
+			}
+			return base.GetEditStyle(context);
+		}
+
+		public override object EditValue(ITypeDescriptorContext context, IServiceProvider provider, object value) 
+		{
+
+			if (context!=null && context.Instance!=null && provider!=null) 
+			{
+				m_EdSvc=(IWindowsFormsEditorService)provider.GetService(typeof(IWindowsFormsEditorService));
+				if(m_EdSvc!=null) 
+				{
+					ShortcutsListBox lst=null;
+					if(context.Instance is BaseItem)
+						lst=new ShortcutsListBox(((BaseItem)context.Instance).Shortcuts);
+                    else if (context.Instance is ButtonX)
+                        lst = new ShortcutsListBox(((ButtonX)context.Instance).Shortcuts);
+					else if(context.Instance is DotNetBarManager)
+						lst=new ShortcutsListBox(((DotNetBarManager)context.Instance).AutoDispatchShortcuts);
+					else if(context.Instance!=null)
+						System.Windows.Forms.MessageBox.Show("Unknow control using shortcuts. Cannot edit shortcuts. ["+context.Instance.ToString()+"]");
+					else
+						System.Windows.Forms.MessageBox.Show("Unknow control using shortcuts. Cannot edit shortcuts. [context instance null]");
+					if(lst!=null)
+					{
+						m_EdSvc.DropDownControl(lst);
+						value=lst.Shortcuts();
+						((ShortcutsCollection)value).Parent=context.Instance as BaseItem;
+					}
+				}
+			}
+
+			return value;
+		}
+
+		private class ShortcutsListBox:CheckedListBox
+		{
+			public ShortcutsListBox(ShortcutsCollection editingInstance):base()
+			{
+				// Load all shortcuts
+				Array a=eShortcut.GetValues(typeof(eShortcut));
+				for(int i=1;i<a.Length;i++)
+				{
+					NameValue nv=new NameValue(eShortcut.GetName(typeof(eShortcut),a.GetValue(i)),(eShortcut)a.GetValue(i));
+					if(editingInstance.Contains((eShortcut)a.GetValue(i)))
+					{
+						this.Items.Add(nv,System.Windows.Forms.CheckState.Checked);
+					}
+					else
+						this.Items.Add(nv,System.Windows.Forms.CheckState.Unchecked);
+				}
+			}
+
+			public ShortcutsCollection Shortcuts()
+			{
+				ShortcutsCollection sl=new ShortcutsCollection(null);
+				foreach(NameValue nv in this.CheckedItems)
+					sl.Add(nv.Key);
+				return sl;
+			}
+
+			private struct NameValue
+			{
+				public NameValue(string name,eShortcut k)
+				{
+					Name=name;
+					Key=k;
+				}
+				public override string ToString()
+				{
+					return Name;
+				}
+				public string Name;
+				public eShortcut Key;
+			}
+		}
+	}
+	public class ShortcutsConverter:TypeConverter 
+	{
+		public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType) 
+		{
+			if (sourceType == typeof(string)) 
+			{
+				return true;
+			}
+			return base.CanConvertFrom(context, sourceType);
+		}
+		// Overrides the ConvertFrom method of TypeConverter.
+		public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value) 
+		{
+			if(value is string)
+			{
+				return this.FromString((string)value);
+			}
+			return base.ConvertFrom(context, culture, value);
+		}
+		// Overrides the ConvertTo method of TypeConverter.
+		public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+		{  
+			if (destinationType == typeof(string)) 
+			{
+                if (value == null) return "";
+				ShortcutsCollection sl=(ShortcutsCollection)value;
+				System.Text.StringBuilder sb=new System.Text.StringBuilder();
+
+				for(int i=0;i<sl.Count;i++)
+				{
+					sb.Append(eShortcut.GetName(typeof(eShortcut),sl[i]));
+					if(i<sl.Count-1)
+						sb.Append(",");
+				}
+
+				return sb.ToString();
+			}
+			return base.ConvertTo(context, culture, value, destinationType);
+		}
+            
+		private ShortcutsCollection FromString(string str)
+		{
+			ShortcutsCollection sl=new ShortcutsCollection(null);
+			if(str=="" || str==null)
+				return sl;
+			string[] v=str.Split(',');
+			for(int i=0;i<v.Length;i++)
+			{
+				sl.Add((eShortcut)eShortcut.Parse(typeof(eShortcut),v[i],true));
+			}
+			return sl;
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SideBarColorSchemePicker.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SideBarColorSchemePicker.cs
new file mode 100644
index 00000000..5b428c71
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SideBarColorSchemePicker.cs	
@@ -0,0 +1,331 @@
+using System;
+using System.Drawing;
+using System.Collections;
+using System.ComponentModel;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Summary description for SideBarColorSchemePicker.
+	/// </summary>
+	[ToolboxItem(false)]
+	internal class SideBarColorSchemePicker : System.Windows.Forms.Form
+	{
+		private System.Windows.Forms.ListBox listBox1;
+		private System.Windows.Forms.Label label1;
+		private System.Windows.Forms.Label label2;
+		private System.Windows.Forms.Button button1;
+		private System.Windows.Forms.Button button2;
+		public eSideBarColorScheme SelectedColorScheme=eSideBarColorScheme.Blue;
+		private DevComponents.DotNetBar.SideBar sideBar1;
+		private DevComponents.DotNetBar.SideBarPanelItem sideBarPanelItem1;
+		private DevComponents.DotNetBar.ButtonItem buttonItem1;
+		private DevComponents.DotNetBar.ButtonItem buttonItem2;
+		private DevComponents.DotNetBar.ButtonItem buttonItem3;
+		private DevComponents.DotNetBar.ButtonItem buttonItem4;
+		private DevComponents.DotNetBar.SideBarPanelItem sideBarPanelItem2;
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.Container components = null;
+
+		public SideBarColorSchemePicker()
+		{
+			//
+			// Required for Windows Form Designer support
+			//
+			InitializeComponent();
+		}
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		protected override void Dispose( bool disposing )
+		{
+			if( disposing )
+			{
+				if(components != null)
+				{
+					components.Dispose();
+				}
+			}
+			base.Dispose( disposing );
+		}
+
+		#region Windows Form 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()
+		{
+			System.Resources.ResourceManager resources = new System.Resources.ResourceManager(typeof(SideBarColorSchemePicker));
+			this.listBox1 = new System.Windows.Forms.ListBox();
+			this.label1 = new System.Windows.Forms.Label();
+			this.label2 = new System.Windows.Forms.Label();
+			this.button1 = new System.Windows.Forms.Button();
+			this.button2 = new System.Windows.Forms.Button();
+			this.sideBar1 = new DevComponents.DotNetBar.SideBar();
+			this.sideBarPanelItem1 = new DevComponents.DotNetBar.SideBarPanelItem();
+			this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem();
+			this.buttonItem2 = new DevComponents.DotNetBar.ButtonItem();
+			this.buttonItem3 = new DevComponents.DotNetBar.ButtonItem();
+			this.buttonItem4 = new DevComponents.DotNetBar.ButtonItem();
+			this.sideBarPanelItem2 = new DevComponents.DotNetBar.SideBarPanelItem();
+			this.SuspendLayout();
+			// 
+			// listBox1
+			// 
+			this.listBox1.Location = new System.Drawing.Point(8, 24);
+			this.listBox1.Name = "listBox1";
+			this.listBox1.Size = new System.Drawing.Size(152, 238);
+			this.listBox1.TabIndex = 1;
+			this.listBox1.SelectedIndexChanged += new System.EventHandler(this.listBox1_SelectedIndexChanged);
+			// 
+			// label1
+			// 
+			this.label1.Location = new System.Drawing.Point(8, 8);
+			this.label1.Name = "label1";
+			this.label1.Size = new System.Drawing.Size(152, 16);
+			this.label1.TabIndex = 2;
+			this.label1.Text = "Available Color Schemes:";
+			// 
+			// label2
+			// 
+			this.label2.Location = new System.Drawing.Point(176, 8);
+			this.label2.Name = "label2";
+			this.label2.Size = new System.Drawing.Size(208, 16);
+			this.label2.TabIndex = 3;
+			this.label2.Text = "Example of Color Scheme Applied:";
+			// 
+			// button1
+			// 
+			this.button1.DialogResult = System.Windows.Forms.DialogResult.OK;
+			this.button1.FlatStyle = System.Windows.Forms.FlatStyle.System;
+			this.button1.Location = new System.Drawing.Point(232, 272);
+			this.button1.Name = "button1";
+			this.button1.Size = new System.Drawing.Size(72, 24);
+			this.button1.TabIndex = 4;
+			this.button1.Text = "OK";
+			// 
+			// button2
+			// 
+			this.button2.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.button2.FlatStyle = System.Windows.Forms.FlatStyle.System;
+			this.button2.Location = new System.Drawing.Point(312, 272);
+			this.button2.Name = "button2";
+			this.button2.Size = new System.Drawing.Size(72, 24);
+			this.button2.TabIndex = 5;
+			this.button2.Text = "Cancel";
+			// 
+			// sideBar1
+			// 
+			this.sideBar1.AccessibleRole = System.Windows.Forms.AccessibleRole.ToolBar;
+			this.sideBar1.Appearance = DevComponents.DotNetBar.eSideBarAppearance.Flat;
+			this.sideBar1.BorderStyle = DevComponents.DotNetBar.eBorderType.None;
+			this.sideBar1.ColorScheme.BarBackground = System.Drawing.Color.FromArgb(((System.Byte)(239)), ((System.Byte)(237)), ((System.Byte)(222)));
+			this.sideBar1.ColorScheme.BarBackground2 = System.Drawing.Color.Empty;
+			this.sideBar1.ColorScheme.BarCaptionBackground = System.Drawing.Color.FromArgb(((System.Byte)(172)), ((System.Byte)(168)), ((System.Byte)(153)));
+			this.sideBar1.ColorScheme.BarCaptionInactiveBackground = System.Drawing.SystemColors.Control;
+			this.sideBar1.ColorScheme.BarCaptionInactiveText = System.Drawing.SystemColors.ControlText;
+			this.sideBar1.ColorScheme.BarCaptionText = System.Drawing.Color.FromArgb(((System.Byte)(64)), ((System.Byte)(64)), ((System.Byte)(64)));
+			this.sideBar1.ColorScheme.BarDockedBorder = System.Drawing.Color.Empty;
+			this.sideBar1.ColorScheme.BarFloatingBorder = System.Drawing.Color.FromArgb(((System.Byte)(172)), ((System.Byte)(168)), ((System.Byte)(153)));
+			this.sideBar1.ColorScheme.BarPopupBackground = System.Drawing.Color.FromArgb(((System.Byte)(252)), ((System.Byte)(252)), ((System.Byte)(249)));
+			this.sideBar1.ColorScheme.BarPopupBorder = System.Drawing.Color.FromArgb(((System.Byte)(138)), ((System.Byte)(134)), ((System.Byte)(122)));
+			this.sideBar1.ColorScheme.BarStripeColor = System.Drawing.Color.FromArgb(((System.Byte)(191)), ((System.Byte)(188)), ((System.Byte)(177)));
+			this.sideBar1.ColorScheme.CustomizeBackground = System.Drawing.Color.Empty;
+			this.sideBar1.ColorScheme.CustomizeBackground2 = System.Drawing.Color.Empty;
+			this.sideBar1.ColorScheme.CustomizeText = System.Drawing.Color.Empty;
+			this.sideBar1.ColorScheme.ItemBackground = System.Drawing.Color.Empty;
+			this.sideBar1.ColorScheme.ItemCheckedBackground = System.Drawing.Color.Empty;
+			this.sideBar1.ColorScheme.ItemCheckedBackground2 = System.Drawing.Color.Empty;
+			this.sideBar1.ColorScheme.ItemCheckedBorder = System.Drawing.Color.FromArgb(((System.Byte)(0)), ((System.Byte)(0)), ((System.Byte)(128)));
+			this.sideBar1.ColorScheme.ItemCheckedText = System.Drawing.Color.Black;
+			this.sideBar1.ColorScheme.ItemDesignTimeBorder = System.Drawing.SystemColors.Highlight;
+			this.sideBar1.ColorScheme.ItemDisabledBackground = System.Drawing.Color.Empty;
+			this.sideBar1.ColorScheme.ItemDisabledText = System.Drawing.SystemColors.ControlDark;
+			this.sideBar1.ColorScheme.ItemExpandedBackground = System.Drawing.Color.FromArgb(((System.Byte)(254)), ((System.Byte)(142)), ((System.Byte)(75)));
+			this.sideBar1.ColorScheme.ItemExpandedBackground2 = System.Drawing.Color.FromArgb(((System.Byte)(255)), ((System.Byte)(207)), ((System.Byte)(139)));
+			this.sideBar1.ColorScheme.ItemExpandedShadow = System.Drawing.Color.Empty;
+			this.sideBar1.ColorScheme.ItemExpandedText = System.Drawing.Color.Black;
+			this.sideBar1.ColorScheme.ItemHotBackground = System.Drawing.Color.FromArgb(((System.Byte)(255)), ((System.Byte)(244)), ((System.Byte)(204)));
+			this.sideBar1.ColorScheme.ItemHotBackground2 = System.Drawing.Color.FromArgb(((System.Byte)(255)), ((System.Byte)(209)), ((System.Byte)(147)));
+			this.sideBar1.ColorScheme.ItemHotBorder = System.Drawing.Color.FromArgb(((System.Byte)(0)), ((System.Byte)(0)), ((System.Byte)(128)));
+			this.sideBar1.ColorScheme.ItemHotText = System.Drawing.Color.Black;
+			this.sideBar1.ColorScheme.ItemPressedBackground = System.Drawing.Color.FromArgb(((System.Byte)(254)), ((System.Byte)(142)), ((System.Byte)(75)));
+			this.sideBar1.ColorScheme.ItemPressedBackground2 = System.Drawing.Color.FromArgb(((System.Byte)(255)), ((System.Byte)(207)), ((System.Byte)(139)));
+			this.sideBar1.ColorScheme.ItemPressedBorder = System.Drawing.Color.FromArgb(((System.Byte)(0)), ((System.Byte)(0)), ((System.Byte)(128)));
+			this.sideBar1.ColorScheme.ItemPressedText = System.Drawing.Color.Black;
+			this.sideBar1.ColorScheme.ItemSeparator = System.Drawing.Color.FromArgb(((System.Byte)(197)), ((System.Byte)(194)), ((System.Byte)(184)));
+			this.sideBar1.ColorScheme.ItemSeparatorShade = System.Drawing.Color.Empty;
+			this.sideBar1.ColorScheme.ItemText = System.Drawing.Color.Black;
+			this.sideBar1.ColorScheme.MenuBackground = System.Drawing.Color.FromArgb(((System.Byte)(232)), ((System.Byte)(232)), ((System.Byte)(232)));
+			this.sideBar1.ColorScheme.MenuBackground2 = System.Drawing.Color.White;
+			this.sideBar1.ColorScheme.MenuBarBackground = System.Drawing.SystemColors.Control;
+			this.sideBar1.ColorScheme.MenuBarBackground2 = System.Drawing.Color.Empty;
+			this.sideBar1.ColorScheme.MenuBorder = System.Drawing.Color.FromArgb(((System.Byte)(0)), ((System.Byte)(0)), ((System.Byte)(128)));
+			this.sideBar1.ColorScheme.MenuSide = System.Drawing.Color.FromArgb(((System.Byte)(94)), ((System.Byte)(137)), ((System.Byte)(207)));
+			this.sideBar1.ColorScheme.MenuSide2 = System.Drawing.Color.Empty;
+			this.sideBar1.ColorScheme.MenuUnusedBackground = System.Drawing.Color.FromArgb(((System.Byte)(252)), ((System.Byte)(252)), ((System.Byte)(249)));
+			this.sideBar1.ColorScheme.MenuUnusedSide = System.Drawing.Color.FromArgb(((System.Byte)(230)), ((System.Byte)(227)), ((System.Byte)(210)));
+			this.sideBar1.ColorScheme.MenuUnusedSide2 = System.Drawing.Color.Empty;
+			this.sideBar1.ExpandedPanel = this.sideBarPanelItem1;
+			this.sideBar1.Font = new System.Drawing.Font("Tahoma", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.World);
+			this.sideBar1.Location = new System.Drawing.Point(176, 24);
+			this.sideBar1.Name = "sideBar1";
+			this.sideBar1.Panels.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+																					 this.sideBarPanelItem1,
+																					 this.sideBarPanelItem2});
+			this.sideBar1.Size = new System.Drawing.Size(208, 240);
+			this.sideBar1.TabIndex = 6;
+			this.sideBar1.TabStop = false;
+			// 
+			// sideBarPanelItem1
+			// 
+			this.sideBarPanelItem1.BackgroundStyle.BackColor1.Color = System.Drawing.Color.FromArgb(((System.Byte)(232)), ((System.Byte)(232)), ((System.Byte)(232)));
+			this.sideBarPanelItem1.BackgroundStyle.BackColor2.Color = System.Drawing.Color.White;
+			this.sideBarPanelItem1.BackgroundStyle.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+			this.sideBarPanelItem1.BackgroundStyle.BorderColor.Color = System.Drawing.Color.FromArgb(((System.Byte)(59)), ((System.Byte)(97)), ((System.Byte)(156)));
+			this.sideBarPanelItem1.HeaderHotStyle.BackColor1.Color = System.Drawing.Color.FromArgb(((System.Byte)(133)), ((System.Byte)(171)), ((System.Byte)(228)));
+			this.sideBarPanelItem1.HeaderHotStyle.BackColor2.Color = System.Drawing.Color.FromArgb(((System.Byte)(221)), ((System.Byte)(236)), ((System.Byte)(254)));
+			this.sideBarPanelItem1.HeaderHotStyle.GradientAngle = 90;
+			this.sideBarPanelItem1.HeaderSideHotStyle.BackColor1.Color = System.Drawing.Color.FromArgb(((System.Byte)(133)), ((System.Byte)(171)), ((System.Byte)(228)));
+			this.sideBarPanelItem1.HeaderSideHotStyle.BackColor2.Color = System.Drawing.Color.FromArgb(((System.Byte)(221)), ((System.Byte)(236)), ((System.Byte)(254)));
+			this.sideBarPanelItem1.HeaderSideHotStyle.GradientAngle = 90;
+			this.sideBarPanelItem1.HeaderSideStyle.BackColor1.Color = System.Drawing.Color.FromArgb(((System.Byte)(200)), ((System.Byte)(220)), ((System.Byte)(248)));
+			this.sideBarPanelItem1.HeaderSideStyle.BackColor2.Color = System.Drawing.Color.FromArgb(((System.Byte)(94)), ((System.Byte)(137)), ((System.Byte)(207)));
+			this.sideBarPanelItem1.HeaderSideStyle.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+			this.sideBarPanelItem1.HeaderSideStyle.BorderColor.Color = System.Drawing.Color.FromArgb(((System.Byte)(59)), ((System.Byte)(97)), ((System.Byte)(156)));
+			this.sideBarPanelItem1.HeaderSideStyle.BorderSide = ((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Top) 
+				| DevComponents.DotNetBar.eBorderSide.Bottom);
+			this.sideBarPanelItem1.HeaderSideStyle.GradientAngle = 90;
+			this.sideBarPanelItem1.HeaderStyle.BackColor1.Color = System.Drawing.Color.FromArgb(((System.Byte)(221)), ((System.Byte)(236)), ((System.Byte)(254)));
+			this.sideBarPanelItem1.HeaderStyle.BackColor2.Color = System.Drawing.Color.FromArgb(((System.Byte)(133)), ((System.Byte)(171)), ((System.Byte)(228)));
+			this.sideBarPanelItem1.HeaderStyle.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+			this.sideBarPanelItem1.HeaderStyle.BorderColor.Color = System.Drawing.Color.FromArgb(((System.Byte)(59)), ((System.Byte)(97)), ((System.Byte)(156)));
+			this.sideBarPanelItem1.HeaderStyle.BorderSide = ((DevComponents.DotNetBar.eBorderSide.Right | DevComponents.DotNetBar.eBorderSide.Top) 
+				| DevComponents.DotNetBar.eBorderSide.Bottom);
+			this.sideBarPanelItem1.HeaderStyle.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold);
+			this.sideBarPanelItem1.HeaderStyle.ForeColor.Color = System.Drawing.Color.FromArgb(((System.Byte)(0)), ((System.Byte)(51)), ((System.Byte)(102)));
+			this.sideBarPanelItem1.HeaderStyle.GradientAngle = 90;
+			this.sideBarPanelItem1.Icon = ((System.Drawing.Icon)(resources.GetObject("sideBarPanelItem1.Icon")));
+			this.sideBarPanelItem1.Name = "sideBarPanelItem1";
+			this.sideBarPanelItem1.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+																								this.buttonItem1,
+																								this.buttonItem2,
+																								this.buttonItem3,
+																								this.buttonItem4});
+			this.sideBarPanelItem1.Text = "My Mail Folders";
+			// 
+			// buttonItem1
+			// 
+			this.buttonItem1.Icon = ((System.Drawing.Icon)(resources.GetObject("buttonItem1.Icon")));
+			this.buttonItem1.Name = "buttonItem1";
+			this.buttonItem1.Text = "Inbox";
+			// 
+			// buttonItem2
+			// 
+			this.buttonItem2.Icon = ((System.Drawing.Icon)(resources.GetObject("buttonItem2.Icon")));
+			this.buttonItem2.Name = "buttonItem2";
+			this.buttonItem2.Text = "Sent Items";
+			// 
+			// buttonItem3
+			// 
+			this.buttonItem3.Icon = ((System.Drawing.Icon)(resources.GetObject("buttonItem3.Icon")));
+			this.buttonItem3.Name = "buttonItem3";
+			this.buttonItem3.Text = "Blocked Junk E-Mail";
+			// 
+			// buttonItem4
+			// 
+			this.buttonItem4.BeginGroup = true;
+			this.buttonItem4.Icon = ((System.Drawing.Icon)(resources.GetObject("buttonItem4.Icon")));
+			this.buttonItem4.Name = "buttonItem4";
+			this.buttonItem4.Text = "Actions";
+			// 
+			// sideBarPanelItem2
+			// 
+			this.sideBarPanelItem2.BackgroundStyle.BackColor1.Color = System.Drawing.Color.FromArgb(((System.Byte)(232)), ((System.Byte)(232)), ((System.Byte)(232)));
+			this.sideBarPanelItem2.BackgroundStyle.BackColor2.Color = System.Drawing.Color.White;
+			this.sideBarPanelItem2.BackgroundStyle.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+			this.sideBarPanelItem2.BackgroundStyle.BorderColor.Color = System.Drawing.Color.FromArgb(((System.Byte)(59)), ((System.Byte)(97)), ((System.Byte)(156)));
+			this.sideBarPanelItem2.HeaderHotStyle.BackColor1.Color = System.Drawing.Color.FromArgb(((System.Byte)(133)), ((System.Byte)(171)), ((System.Byte)(228)));
+			this.sideBarPanelItem2.HeaderHotStyle.BackColor2.Color = System.Drawing.Color.FromArgb(((System.Byte)(221)), ((System.Byte)(236)), ((System.Byte)(254)));
+			this.sideBarPanelItem2.HeaderHotStyle.GradientAngle = 90;
+			this.sideBarPanelItem2.HeaderSideHotStyle.BackColor1.Color = System.Drawing.Color.FromArgb(((System.Byte)(133)), ((System.Byte)(171)), ((System.Byte)(228)));
+			this.sideBarPanelItem2.HeaderSideHotStyle.BackColor2.Color = System.Drawing.Color.FromArgb(((System.Byte)(221)), ((System.Byte)(236)), ((System.Byte)(254)));
+			this.sideBarPanelItem2.HeaderSideHotStyle.GradientAngle = 90;
+			this.sideBarPanelItem2.HeaderSideStyle.BackColor1.Color = System.Drawing.Color.FromArgb(((System.Byte)(200)), ((System.Byte)(220)), ((System.Byte)(248)));
+			this.sideBarPanelItem2.HeaderSideStyle.BackColor2.Color = System.Drawing.Color.FromArgb(((System.Byte)(94)), ((System.Byte)(137)), ((System.Byte)(207)));
+			this.sideBarPanelItem2.HeaderSideStyle.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+			this.sideBarPanelItem2.HeaderSideStyle.BorderColor.Color = System.Drawing.Color.FromArgb(((System.Byte)(59)), ((System.Byte)(97)), ((System.Byte)(156)));
+			this.sideBarPanelItem2.HeaderSideStyle.BorderSide = ((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Top) 
+				| DevComponents.DotNetBar.eBorderSide.Bottom);
+			this.sideBarPanelItem2.HeaderSideStyle.GradientAngle = 90;
+			this.sideBarPanelItem2.HeaderStyle.BackColor1.Color = System.Drawing.Color.FromArgb(((System.Byte)(221)), ((System.Byte)(236)), ((System.Byte)(254)));
+			this.sideBarPanelItem2.HeaderStyle.BackColor2.Color = System.Drawing.Color.FromArgb(((System.Byte)(133)), ((System.Byte)(171)), ((System.Byte)(228)));
+			this.sideBarPanelItem2.HeaderStyle.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+			this.sideBarPanelItem2.HeaderStyle.BorderColor.Color = System.Drawing.Color.FromArgb(((System.Byte)(59)), ((System.Byte)(97)), ((System.Byte)(156)));
+			this.sideBarPanelItem2.HeaderStyle.BorderSide = ((DevComponents.DotNetBar.eBorderSide.Right | DevComponents.DotNetBar.eBorderSide.Top) 
+				| DevComponents.DotNetBar.eBorderSide.Bottom);
+			this.sideBarPanelItem2.HeaderStyle.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold);
+			this.sideBarPanelItem2.HeaderStyle.ForeColor.Color = System.Drawing.Color.FromArgb(((System.Byte)(0)), ((System.Byte)(51)), ((System.Byte)(102)));
+			this.sideBarPanelItem2.HeaderStyle.GradientAngle = 90;
+			this.sideBarPanelItem2.Icon = ((System.Drawing.Icon)(resources.GetObject("sideBarPanelItem2.Icon")));
+			this.sideBarPanelItem2.Name = "sideBarPanelItem2";
+			this.sideBarPanelItem2.Text = "My Calendar";
+			// 
+			// SideBarColorSchemePicker
+			// 
+			this.AutoScaleBaseSize = new System.Drawing.Size(5, 13);
+			this.ClientSize = new System.Drawing.Size(392, 304);
+			this.Controls.AddRange(new System.Windows.Forms.Control[] {
+																		  this.sideBar1,
+																		  this.button2,
+																		  this.button1,
+																		  this.label2,
+																		  this.label1,
+																		  this.listBox1});
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
+			this.Name = "SideBarColorSchemePicker";
+			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+			this.Text = "SideBar Color Scheme Picker";
+			this.Closing += new System.ComponentModel.CancelEventHandler(this.SideBarColorSchemePicker_Closing);
+			this.Load += new System.EventHandler(this.SideBarColorSchemePicker_Load);
+			this.ResumeLayout(false);
+
+		}
+		#endregion
+
+		private void SideBarColorSchemePicker_Load(object sender, System.EventArgs e)
+		{
+			// Load all color schemes in ListBox
+			foreach(string s in Enum.GetNames(typeof(eSideBarColorScheme)))
+			{
+				listBox1.Items.Add(s);
+			}
+			listBox1.SelectedIndex=0;
+		}
+
+		private void SideBarColorSchemePicker_Closing(object sender, System.ComponentModel.CancelEventArgs e)
+		{
+			if(listBox1.SelectedIndex<0 && this.DialogResult==DialogResult.OK)
+			{
+				e.Cancel=true;
+				MessageBox.Show("Please select color scheme to apply.","Color Scheme Picker",MessageBoxButtons.OK,MessageBoxIcon.Information);
+			}
+		}
+
+		private void listBox1_SelectedIndexChanged(object sender, System.EventArgs e)
+		{
+			eSideBarColorScheme scheme;
+			if(listBox1.SelectedIndex<0)
+				return;
+			string sSel=listBox1.SelectedItem.ToString();
+			scheme=(eSideBarColorScheme)Enum.Parse(typeof(eSideBarColorScheme),sSel,false);
+			SelectedColorScheme=scheme;
+			sideBar1.PredefinedColorScheme=scheme;
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SideBarColorSchemePicker.resx b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SideBarColorSchemePicker.resx
new file mode 100644
index 00000000..f5423c9f
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SideBarColorSchemePicker.resx	
@@ -0,0 +1,294 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<root>
+	<!-- 
+            Microsoft ResX Schema 
+        
+            Version 1.3
+                
+            The primary goals of this format is to allow a simple XML format 
+            that is mostly human readable. The generation and parsing of the 
+            various data types are done through the TypeConverter classes 
+            associated with the data types.
+        
+            Example:
+        
+                ... ado.net/XML headers & schema ...
+                <resheader name="resmimetype">text/microsoft-resx</resheader>
+                <resheader name="version">1.3</resheader>
+                <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+                <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+                <data name="Name1">this is my long string</data>
+                <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+                <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+                    [base64 mime encoded serialized .NET Framework object]
+                </data>
+                <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+                    [base64 mime encoded string representing a byte array form of the .NET Framework object]
+                </data>
+        
+            There are any number of "resheader" rows that contain simple 
+            name/value pairs.
+            
+            Each data row contains a name, and value. The row also contains a 
+            type or mimetype. Type corresponds to a .NET class that support 
+            text/value conversion through the TypeConverter architecture. 
+            Classes that don't support this are serialized and stored with the 
+            mimetype set.
+                     
+            The mimetype is used for serialized objects, and tells the 
+            ResXResourceReader how to depersist the object. This is currently not 
+            extensible. For a given mimetype the value must be set accordingly:
+        
+            Note - application/x-microsoft.net.object.binary.base64 is the format 
+                   that the ResXResourceWriter will generate, however the reader can 
+                   read any of the formats listed below.
+        
+            mimetype: application/x-microsoft.net.object.binary.base64
+            value   : The object must be serialized with 
+                    : System.Serialization.Formatters.Binary.BinaryFormatter
+                    : and then encoded with base64 encoding.
+        
+            mimetype: application/x-microsoft.net.object.soap.base64
+            value   : The object must be serialized with 
+                    : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+                    : and then encoded with base64 encoding.
+            mimetype: application/x-microsoft.net.object.bytearray.base64
+            value   : The object must be serialized into a byte array 
+                    : using a System.ComponentModel.TypeConverter
+                    : and then encoded with base64 encoding.
+        -->
+	<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+		<xsd:element name="root" msdata:IsDataSet="true">
+			<xsd:complexType>
+				<xsd:choice maxOccurs="unbounded">
+					<xsd:element name="data">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+								<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+							<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+							<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+						</xsd:complexType>
+					</xsd:element>
+					<xsd:element name="resheader">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" use="required" />
+						</xsd:complexType>
+					</xsd:element>
+				</xsd:choice>
+			</xsd:complexType>
+		</xsd:element>
+	</xsd:schema>
+	<resheader name="resmimetype">
+		<value>text/microsoft-resx</value>
+	</resheader>
+	<resheader name="version">
+		<value>1.3</value>
+	</resheader>
+	<resheader name="reader">
+		<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+	<resheader name="writer">
+		<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+	<data name="sideBarPanelItem1.Icon" type="System.Drawing.Icon, System.Drawing, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" mimetype="application/x-microsoft.net.object.bytearray.base64">
+		<value>
+        AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAABILAAASCwAAAAAAAAAA
+        AAAAAAAAAAAAALZtRw8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAC2bUf/tm1H/LZtR8m2bUeWtm1HY7ZtRzAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAtm1H/7ZtR9vpvJLA7L6VwNefd8XCgFnet25I/MiHXtS2bUeWtm1HY7Zt
+        RzAAAAAAAAAAAAAAAAAAAAAAAAAAALZtR/+2bUei2qmCwv7kvf/+47z//uC3///csP/50KPQ67mLwNea
+        b8XCflbetm1H/LZtR/8AAAAAAAAAAAAAAAC2bUf//+fC99Keed/v0KzC/uvH//7nwf/+4rr//tyx//7W
+        qP/+0qL/+8yb17ZtR6W2bUf/AAAAAAAAAAAAAAAAtm1H///uy//+8NHlxYpl6frpytH+7sv//ufC//7g
+        t//+2q3/+9Ch28J9Ve31xJTItm1H/wAAAAAAAAAAAAAAALZtR///8tL///jb//rx1NDEiGPc//LS///r
+        x//+5Lv//Nmt38SBWuvywZHF/tGf/7ZtR/8AAAAAAAAAAAAAAAC2bUf///TV///63/f379XL4L6ewMKD
+        XuDYqYTE4bSMwO7BmMHwwZPD/9Kg//7Rn/+2bUf/AAAAAAAAAAAAAAAAtm1H/963lMC5eFb0rJeGy6HG
+        yMD//////////6OprcC0c1Hx1ZtwxfnKmdH+0Z//tm1H/wAAAAAAAAAAAAAAALZtR/+2bUfDl9324///
+        /////////////////////////////5mwzcG7hmvkyIZd1LZtR/8AAAAAAAAAAAAAAAAAAAAAtm1HdbN3
+        Vuyd09/Gmuj5/5nl+f+W3vn/lNX5/5LM+f+Pxfn/m6bBv7ZtR/22bUf/AAAAAAAAAAAAAAAAAAAAAAAA
+        AAC2bUctsYBm3qihmMWW3fj0ldj5/5LR+f+QyfjyoZunwbN0Vuy2bUdpAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAALZtRwm2bUeTsnpe5aaYlMalmZvEs3VW7LZtR5O2bUcPAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAALZtR1S6iG7/uohu/7ZtRyoAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAA//8AAMP/AADAHwAAwAEAAMABAADAAQAAwAEAAMABAADAAQAAwAEAAPABAAD4BwAA/A8AAP8/
+        AAD//////////w==
+</value>
+	</data>
+	<data name="buttonItem1.Icon" type="System.Drawing.Icon, System.Drawing, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" mimetype="application/x-microsoft.net.object.bytearray.base64">
+		<value>
+        AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAABMLAAATCwAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAthjP8KWH//CVN4/wlTeP8JU3j/CVN4/wlTeP8JU3j/CVN4/wlTeP8KVHn/CVF0/wAA
+        AAAAAAAAAAAAABJ2p/8MbJr/KaXO/yWVuv8llLn/JZS5/yWUuf8llLn/JZS5/yWUuf8llLn/JZS5/yWU
+        uv8KVXn/AAAAAAAAAAA0irP/JoKv/zDC8/8qqNL/J57G/yeexv8nnsb/J57G/yeexv8nnsb/MZa7/0GH
+        p/9RfZr/MVJx/wAAAAAAAAAAQJG4/z+QuP9L0v//Msj6/y666f8uuun/NLXh/0Oky/9SkrX/X4ak/2WN
+        qf9om7f/aJ64/0RRbP/QSEgCAAAAAECRuP9e1///OIy1/0PQ//8zzP//Yp3A/2mbvP9sqcr/b7vc/3LK
+        6/901PX/ccro/2261P9jhZ//IFJy/wAAAABAkbj/Xtf//z6Qt/9O0///StL//3+kwP+K0+//jN34/4ze
+        +f+L2vX/itTv/3PI6f9rtdH/ZpWw/1NQaP8AAAAAQJG4/2PY//9GlLr/Xdb//13W//+CtdL/mcjf/5zZ
+        8P+VvdP/krLJ/5jL4f+NyOH/dc/v/2uryP+ORFH/AAAAAECRuP9v2///Ztn//0CQuP8+kLf/WYqr/4eX
+        rf+JqsD/hpyy/4mpv/+Mscj/iam//3iTrP9dlLT/vUJG/9BGRgRFk7r/adr//2HY//9F0f//Nc3//0y/
+        6//TXFz/7eLi/92lpf/r2dn/zWlp/9B2dv/bn5//7efn/9NbW//QQ0MuW6DC/3re//9x3P//XNb//0zS
+        //8+zv7/u1lg/+jIyP/YlJT/7N7e/+rU1P/p09P/5cLC/96vr//ejY3/zjk5egAAAABan8L/c9z//3Db
+        //9e1///QtD//4RWaf/emZn/6tjY/9udnf/fra3/3KCg/+Czs//n0ND/4qur/803N8AAAAAA/////1mf
+        wf9Zn8H/TZi9/zCHsv/QSUlO2Xd3/+TDw//gsbH/zmxs/+7i4v/r2dn/6dLS/+S3t//OPDz/AAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAA0VBQD9FTU/zr1tb/6dDQ/+O2tv/hpKT/24OD/9RfX//OPT3/zDIy3gAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADOPT3I2nx8/9Zqav/QSkr/yysr68klJazKKSllzDIyGwAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAzDMzg8onJ73KKCh3yy8vMgAAAAAAAAAAAAAAAAAA
+        AAAAAAAA//8AAIAHAAAAAwAAAAMAAAADAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAACAAAAAggAAAP4A
+        AAD+B////n///w==
+</value>
+	</data>
+	<data name="buttonItem2.Icon" type="System.Drawing.Icon, System.Drawing, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" mimetype="application/x-microsoft.net.object.bytearray.base64">
+		<value>
+        AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAABMLAAATCwAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAALYYz/Clh//wlTeP8JU3j/CVN4/wlTeP8JU3j/CVN4/wlTeP8JU3j/ClR5/wlR
+        dP8AAAAAAAAAAAAAAAASdqf/L77t/yqp0/8mlrz/JZS5/yWUuf8llLn/JZS5/yWUuf8llLn/JZS5/yWV
+        uv8kj7P/CVR4/wAAAAAAAAAANIqz/0LQ//8xw/T/LLLe/yyx3f8ssd3/LLHd/yyx3f8ssd3/LLHd/yyw
+        3P8ppM3/J5zD/wpbgv8AAAAAAAAAAECRuP9b1v//SdL//zPM//8zzP//M8z//zPM//8zzP//M8z//zPM
+        //8yyvz/Lbbj/yifx/8KVnz/AAAAAAAAAABAkbj/Xtf//0zS//8zzP//M8z//zPM//8zzP//M8z//zPM
+        //8zzP//M8z//y655/8nnMP/JI+z/wlUeP8AAAAAQJG4/17X//9M0v//M8z//zPM//8zzP//M8z//zPM
+        //8zzP//M8z//zPM//8wwPD/KqnT/yigyP8KW4L/AAAAAECRuP9e1///TNL//zPM//8zzP//M8z//zPM
+        //8zzP//M8z//zPM//8zzP//M8v+/zDA8P8ts+D/C2CK/wAAAABAkbj/X9f//07T//82zf//M8z//zfN
+        //9C0P//UtT//1fV//9X1f//VdX//0zS//83zf//Msf5/wxrmf8AAAAARZO6/2na//9h2P//RdH//zXN
+        //87zv//UNP//2na//9z3P//c9z//3Db//9e1///QtD//xF1pv8AAAAAAAAAAFugwv963v//cdz//1zW
+        //9M0v//Pc7//0PQ//8+kLf/WZ/B/1mfwf9Zn8H/TZi9/zCHsv8AAAAAAAAAAAAAAAAAAAAAWp/C/3Pc
+        //9w2///Xtf//0LQ//8Rdab/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP//
+        //9Zn8H/WZ/B/02Yvf8wh7L/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAA//8AAP//AACABwAAAAMAAAADAAAAAwAAAAEAAAABAAAAAQAAAAEAAAADAAAABwAAgf8AAIP/
+        AAD//////////w==
+</value>
+	</data>
+	<data name="buttonItem3.Icon" type="System.Drawing.Icon, System.Drawing, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" mimetype="application/x-microsoft.net.object.bytearray.base64">
+		<value>
+        AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAABMLAAATCwAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMwkAADMyQAAzP8AAMz/AADM9gAA
+        zHIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMwGAADM1QAAzP8AAMz/AADM/wAA
+        zP8AAMz/AADMRQAAAAALYYz/Clh//wlTeP8JU3j/CVN4/wlTeP8JU3j/BjmT/wAAzP8AAMz/AADM/wAA
+        zP8AAMz/AADM/wAAzLcSdqf/L77t/yqp0/8mlrz/JZS5/yWUuf8llLn/JZS5/xZZwf8AAMz/////////
+        /////////////wAAzP8AAMzPNIqz/0LQ//8xw/T/LLLe/yyx3f8ssd3/LLHd/yyx3f8iidn/AADM/wAA
+        zP8AAMz/AADM/wAAzP8AAMz/AADMokCRuP9b1v//SdL//zPM//8zzP//M8z//zPM//8zzP//M8z//xA+
+        3P8AAMz/AADM/wAAzP8AAMz/AADM8wAAzCdAkbj/Xtf//0zS//8zzP//M8z//zPM//8zzP//M8z//zPM
+        //8yx/7/GWLl/wcc0P8CCcv/CijF/whHhf8AAAAAQJG4/17X//9M0v//M8z//zPM//8zzP//M8z//zPM
+        //8zzP//M8z//zPM//8wwPD/KqnT/yigyP8KW4L/AAAAAECRuP9e1///TNL//zPM//8zzP//M8z//zPM
+        //8zzP//M8z//zPM//8zzP//M8v+/zDA8P8ts+D/C2CK/wAAAABAkbj/X9f//07T//82zf//M8z//zfN
+        //9C0P//UtT//1fV//9X1f//VdX//0zS//83zf//Msf5/wxrmf8AAAAARZO6/2na//9h2P//RdH//zXN
+        //87zv//UNP//2na//9z3P//c9z//3Db//9e1///QtD//xF1pv8AAAAAAAAAAFugwv963v//cdz//1zW
+        //9M0v//Pc7//0PQ//8+kLf/WZ/B/1mfwf9Zn8H/TZi9/zCHsv8AAAAAAAAAAAAAAAAAAAAAWp/C/3Pc
+        //9w2///Xtf//0LQ//8Rdab/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP//
+        //9Zn8H/WZ/B/02Yvf8wh7L/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAA/8MAAP+BAACAAAAAAAAAAAAAAAAAAQAAAAEAAAABAAAAAQAAAAEAAAADAAAABwAAgf8AAIP/
+        AAD//////////w==
+</value>
+	</data>
+	<data name="buttonItem4.Icon" type="System.Drawing.Icon, System.Drawing, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" mimetype="application/x-microsoft.net.object.bytearray.base64">
+		<value>
+        AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAABILAAASCwAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAqNG83NDtz/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAKzh3pS147v8nL2P3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAACspTK4xhfn/K3ns/0ZYjf8AAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOGWT/Cx88f8pgez/Ul6O/wAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADIsTzwxtOb6LXvw/ymE5f9DTXzKAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8OV8VPTVW6ii/9v8sgO//Koff/zE5
+        Z5EAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAV2qc2Cd4yf8yreH/Irr5/y2H
+        8P8skej/MkF0jAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAd22OAkFstf0qjPn/K4vx/y3R
+        +/8iuvj/LY7w/y2I2f8uQXh+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABCV32VMdPz/TPD
+        9/82t/b/I9D7/yS09/8sl/P/LYrd+ScpU3wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQ0BnCCxX
+        ibAhwfP/Jc76/yrL+f8gy/r/I8H//yum//8nO3OTAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AABFR3AJJlmKuyLQ+P83rvT/LZnz/yd5sP8tgcX/JytXUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAADlGbwIsVYS2Isz3/y+J8v8yb8P/AAAAAEA5XQ8AAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAMT9qCjpqmdwzw/P/Ko/1/yVBfOAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUH+p/zCx+P8sj+P/IiNMKwAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEhGbRNHfaf/KnrJ/yVGgzUAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAenSWFyEwXf8AAAAAAAAAAAAA
+        AAAAAAAA9////+P////h////8P////h////4P///8B////Af///wD///+Af///wP///+H////w////+P
+        ////z////+///w==
+</value>
+	</data>
+	<data name="buttonItem5.Icon" type="System.Drawing.Icon, System.Drawing, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" mimetype="application/x-microsoft.net.object.bytearray.base64">
+		<value>
+        AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAABILAAASCwAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAn0A7/5w9OP+ZOjX/lzcz/5U1Mf+UNDD/kzIv/5MyL/+SMi7/kjEu/5Ix
+        Lv+SMS7/kzIv/wAAAAAAAAAAAAAAAMVcXf/y3N//79LV/+vJzf/owcb/5rvA/+S2u//js7n/4rC2/+Gu
+        tP/hrbP/4ayy/5MyL/+2R0r/AAAAAAAAAADIYWH/9+nr//Pf4f/w1tn/7c7S/+vIzP/pwsf/uXJ1/7hw
+        c/+3bXD/tmtv/+Kwtv+TMi//tkdK/wAAAAAAAAAAzGZm//z3+P/57/D/9ufp//Tg4v/x2dz/79PW/+3N
+        0f/ryMz/6cLH/+e9wv/luL3/lTQx/7dJS/8AAAAAAAAAAM9ubv////////////36+v/78/T/+O3u/8WL
+        jP/Dhoj/wYOE/79+gP+9eXv/6cTI/5c3M/+5TE7/AAAAAAAAAADRdnb/////////////////////////
+        ///+/Pz/+/X2//jt7v/15Ob/8tve/+/S1f+aOjb/vFBR/wAAAABjw9j/YMjg/4Do//9AwOD/gOj//3Dg
+        8P9gyOD/////////////////MjL5/wAAv//04uT/nT45/79UVv8AAAAAfdro/zC44P+A6P//YMjg/5Dw
+        //8wuOD/cODw/////////////////zw8//8zM/7/+vLz/6BCPP/DWlv/AAAAAIzm9P+Q8P//wPj//7Do
+        8P/A+P//kPD//4Do//////////////////////////////////+kRkD/x19f/wAAAAAgqOD/UMDg/7Do
+        8P/w////sOjw/1DA4P8wuOD/2IqK/9eHh//WgoP/1H19/9J3d//PcHD/qE1G/8tkZP8AAAAAjuf2/5Dw
+        ///A+P//sOjw/8D4//+Q8P//gNjw/+m+v//pvL3/6Lq7/+e4uf/mtbb/5bGy/+Strv/NaWn/AAAAAIff
+        7/8wuOD/kPD//2DA4P+Q8P//MLjg/4fb5/8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AABnxeH/edfq/5Ho+P8gsOD/hej4/4rh6f96zeH/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAA///////////AAf//wAD//8AA///AAP//wAD//8AA//+AAP//gAD//4AA//+AAP//gAD//4D/
+        //+A/////////w==
+</value>
+	</data>
+	<data name="buttonItem6.Icon" type="System.Drawing.Icon, System.Drawing, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" mimetype="application/x-microsoft.net.object.bytearray.base64">
+		<value>
+        AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAABMLAAATCwAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAC2GM/wpYf/8JU3j/CVN4/wlTeP8JU3j/CVN4/wlTeP8JU3j/CVN4/wpU
+        ef8JUXT/AAAAAAAAAAAAAAAAEnan/y++7f8qqdP/Jpa8/yWUuf8llLn/JZS5/yWUuf8llLn/JZS5/yWU
+        uf8llbr/JI+z/wlUeP8AAAAAAAAAADSKs/9C0P//McP0/yyy3v8ssd3/LLHd/yyx3f8ssd3/LLHd/yyx
+        3f8ssNz/KaTN/yecw/8KW4L/AAAAAAAAAABAkbj/W9b//0nS//8zzP//M8z//zPM//8zzP//M8z//zPM
+        //8zzP//Msr8/y224/8on8f/ClZ8/wAAAAAAAAAAQJG4/17X//9M0v//M8z//zPM//8zzP//M8z//zPM
+        //8zzP//M8z//zPM//8uuef/J5zD/ySPs/8JVHj/AAAAAECRuP9e1///TNL//zPM//8zzP//M8z//zPM
+        //8zzP//M8z//zPM//8zzP//MMDw/yqp0/8ooMj/CluC/wAAAABAkbj/Xtf//0zS//8zzP//M8z//zPM
+        //8zzP//M8z//zPM//8zzP//M8z//zPL/v8wwPD/LbPg/wtgiv9jw9j/YMjg/4Do//9AwOD/gOj//3Dg
+        8P9gyOD/QtD//1LU//9X1f//V9X//1XV//9M0v//N83//zLH+f8Ma5n/fdro/zC44P+A6P//YMjg/5Dw
+        //8wuOD/cODw/1DT//9p2v//c9z//3Pc//9w2///Xtf//0LQ//8Rdab/AAAAAIzm9P+Q8P//wPj//7Do
+        8P/A+P//kPD//4Do//9D0P//PpC3/1mfwf9Zn8H/WZ/B/02Yvf8wh7L/AAAAAAAAAAAgqOD/UMDg/7Do
+        8P/w////sOjw/1DA4P8wuOD/EXWm/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAjuf2/5Dw
+        ///A+P//sOjw/8D4//+Q8P//gNjw/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIff
+        7/8wuOD/kPD//2DA4P+Q8P//MLjg/4fb5/8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AABnxeH/edfq/5Ho+P8gsOD/hej4/4rh6f96zeH/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAA//8AAP//AADAAwAAgAEAAIABAACAAQAAgAAAAIAAAACAAAAAAAAAAAABAAAAAwAAAP8AAAH/
+        AAAB////Af///w==
+</value>
+	</data>
+	<data name="sideBarPanelItem2.Icon" type="System.Drawing.Icon, System.Drawing, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" mimetype="application/x-microsoft.net.object.bytearray.base64">
+		<value>
+        AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAABILAAASCwAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKNVIC2STiD/fUMc/2s5GP9dMhX/Vy4RGwAA
+        AAAAAAAAwamh/25NPP9sSTj/a0Y0/2pDMf9pQi//aUIv/4VOLf+sXSj/8O67/93ao//DwYf/oZ9r/1kw
+        FP9jPCb/aUIv/8Stpv///////Pbx/9qqjf/04dH/8dfD/8mMZv+xaDX///7i///+1P/598L/6ues/8zK
+        jv+ioGz/WC8U/2dALP/Gsar////////////dspj/+Ozi//Tg0f+4dEb////5///+7////uL///7V//z6
+        xv/t6q7/yMaL/5iWZf9ULRP/yLSt/+O/qv/ivab/4bmi/96zmv/aqo3/u3tP//////////j////u/05O
+        Tf9OTk3/TU1M/0VFRf9aWUn/WC8U/8q2r////////////+K9p////////fj1/72AVv//////////////
+        +P///+3/Tk5N/4KBdf/r6bf/ubiI/1sxFP/Lt7H////////////kwaz///////////+/g1r/////////
+        ///////////4//797f9MTEv/dXRo/7e2j/9jNRb/zbmz/+bGs//mxrP/5sWy/+XDr//kwKv/2a6T/7x+
+        U/////////////////////j/8O/g/9XUvf96Qhv/akIt/867tf///////////+fHtP///////////+O/
+        qf/lzbz/vHxQ/////////////////+3t5v+LSx//066S/2lCL//OvLb////////////nyLX/////////
+        ///jv6r///////Tp4v+5d0r/tG4+/69kMP+kWCT/5cSr/+7Ruv9pQi//57ae/+e2nv/ntp3/57Sb/+ay
+        mP/krpL/46mM/+KmiP/ipoj/4aOE/96ce//Zkm//1Ilk/9GDXf/Rg13/0YNd/+e3nv//4c///+HO///g
+        zP//3sr//93I///bxf//2sT//9rE///Zwv/+1bz/+suv//XBoP/wtpL/7rGM/9GDXf/ntp7//+HO///g
+        zf//38v//97J///cx///28X//9rD///aw///2cL//9i///vQtf/4yKr/9L6d//C1kP/Rg13/57Wc/+az
+        mf/lsJb/5K6S/+Srj//jqYv/4qaI/+Gkhv/hpIb/4aOE/+Chgf/enXz/3Jh3/9mTcf/WjWn/04Zh/wAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAA/4cAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAD//////////w==
+</value>
+	</data>
+	<data name="$this.Name">
+		<value>SideBarColorSchemePicker</value>
+	</data>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SideBarDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SideBarDesigner.cs
new file mode 100644
index 00000000..1890e0fa
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SideBarDesigner.cs	
@@ -0,0 +1,407 @@
+using System;
+using System.ComponentModel;
+using System.ComponentModel.Design;
+using System.Windows.Forms;
+using System.ComponentModel.Design.Serialization;
+using System.CodeDom;
+using System.Drawing;
+using System.Collections;
+
+namespace DevComponents.DotNetBar.Design
+{
+	/// <summary>
+	/// Represents Windows Forms designer for SideBar control.
+	/// </summary>
+	public class SideBarDesigner:BarBaseControlDesigner
+	{
+		#region Internal Implementation
+		public SideBarDesigner():base()
+		{
+			this.EnableItemDragDrop=true;
+		}
+
+		public override void Initialize(IComponent component) 
+		{
+			base.Initialize(component);
+			if(!component.Site.DesignMode)
+				return;
+			SideBar bar=this.Control as SideBar;
+			if(bar!=null)
+				bar.SetDesignMode();
+		}
+
+#if FRAMEWORK20
+        public override void InitializeNewComponent(IDictionary defaultValues)
+        {
+            base.InitializeNewComponent(defaultValues);
+            SetDesignTimeDefaults();
+        }
+#else
+		public override void OnSetComponentDefaults()
+		{
+			base.OnSetComponentDefaults();
+			SetDesignTimeDefaults();
+		}
+#endif
+        private void SetDesignTimeDefaults()
+        {
+            if (this.Control is SideBar)
+            {
+                this.Style = eDotNetBarStyle.StyleManagerControlled;
+            }
+        }
+
+		public override DesignerVerbCollection Verbs 
+		{
+			get 
+			{
+				DesignerVerb[] verbs;
+				verbs = new DesignerVerb[]
+				{
+					new DesignerVerb("Create Panel", new EventHandler(OnAddGroup)),
+					new DesignerVerb("Create Button", new EventHandler(OnAddButton)),
+					new DesignerVerb("Choose Color Scheme", new EventHandler(OnPickColorScheme))
+				};
+				return new DesignerVerbCollection(verbs);
+			}
+		}
+
+        
+
+		protected override BaseItem GetItemContainer()
+		{
+			SideBar bar=this.Control as SideBar;
+			if(bar!=null)
+				return bar.ItemsContainer;
+			return null;
+		}
+
+		protected override void RecalcLayout()
+		{
+			SideBar bar=this.GetItemContainerControl() as SideBar;
+			if(bar!=null)
+				bar.RecalcLayout();
+		}
+
+		protected override void OnSubItemsChanging()
+		{
+			base.OnSubItemsChanging();
+			IComponentChangeService change=this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+			if(change!=null)
+			{
+				SideBar bar=this.GetItemContainerControl() as SideBar;
+				change.OnComponentChanging(this.Component,TypeDescriptor.GetProperties(bar).Find("Panels",true));
+			}
+		}
+
+		protected override void OnSubItemsChanged()
+		{
+			base.OnSubItemsChanged();
+			IComponentChangeService change=this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+			if(change!=null)
+			{
+				SideBar bar=this.GetItemContainerControl() as SideBar;
+				change.OnComponentChanged(this.Component,TypeDescriptor.GetProperties(bar).Find("Panels",true),null,null);
+			}
+		}
+
+		private void OnAddGroup(object sender, EventArgs e)
+		{
+			IDesignerHost dh=this.GetService(typeof(IDesignerHost)) as IDesignerHost;
+			DesignerTransaction trans=null;
+			if(dh!=null)
+				trans=dh.CreateTransaction("New SideBarPanelItem");
+			try
+			{
+				CreateNewPanel();
+			}
+			finally
+			{
+				if(trans!=null && !trans.Canceled)
+					trans.Commit();
+			}
+			
+			this.RecalcLayout();
+		}
+		
+		private SideBarPanelItem CreateNewPanel()
+		{
+			SideBarPanelItem item=null;
+			SideBar bar=this.Component as SideBar;
+			IDesignerHost dh=GetIDesignerHost();
+			if(bar!=null && dh!=null)
+			{
+                try
+                {
+                    m_CreatingItem = true;
+                    OnSubItemsChanging();
+                    item = dh.CreateComponent(typeof(SideBarPanelItem)) as SideBarPanelItem;
+                    if (item == null)
+                        return null;
+
+                    IComponentChangeService change = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+                    if (change != null)
+                        change.OnComponentChanging(item, null);
+                    item.Text = item.Name;
+                    bar.Panels.Add(item);
+                    item.Appearance = bar.Appearance;
+                    if (item.Appearance == eSideBarAppearance.Flat)
+                        SideBar.ApplyColorScheme(item, bar.PredefinedColorScheme);
+                    if (Helpers.IsOffice2007Style(bar.Style))
+                        item.FontBold = true;
+                    if (change != null)
+                        change.OnComponentChanged(item, null, null, null);
+                    OnSubItemsChanged();
+                }
+                finally
+                {
+                    m_CreatingItem = false;
+                }
+			}
+			return item;
+		}
+
+		private void OnAddButton(object sender, EventArgs e)
+		{
+			SideBar bar=this.Component as SideBar;
+			IDesignerHost dh=GetIDesignerHost();
+			if(bar!=null && dh!=null)
+			{
+				ISelectionService selection = (ISelectionService) this.GetService(typeof(ISelectionService));
+				if(selection==null)
+					return;
+				SideBarPanelItem panel=null;
+				if(!(selection.PrimarySelection is SideBarPanelItem))
+				{
+					if(bar.ExpandedPanel==null)
+						panel=CreateNewPanel();
+					else
+						panel=bar.ExpandedPanel;
+				}
+				else
+					panel=selection.PrimarySelection as SideBarPanelItem;
+
+				if(panel==null)
+					return;
+
+                DesignerTransaction dt = dh.CreateTransaction();
+                try
+                {
+                    IComponentChangeService change = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+                    if (change != null)
+                        change.OnComponentChanging(this.Component, TypeDescriptor.GetProperties(panel).Find("SubItems", true));
+                    try
+                    {
+                        m_CreatingItem = true;
+                        ButtonItem item = dh.CreateComponent(typeof(ButtonItem)) as ButtonItem;
+                        if (item == null)
+                            return;
+                        item.Text = "New Button";
+                        if (bar.Appearance == eSideBarAppearance.Flat)
+                            item.ImagePosition = eImagePosition.Left;
+                        else
+                            item.ImagePosition = eImagePosition.Top;
+                        item.ButtonStyle = eButtonStyle.ImageAndText;
+                        panel.SubItems.Add(item);
+                        if (change != null)
+                            change.OnComponentChanged(this.Component, TypeDescriptor.GetProperties(panel).Find("SubItems", true), null, null);
+                    }
+                    finally
+                    {
+                        m_CreatingItem = false;
+                    }
+                    this.RecalcLayout();
+                }
+                catch
+                {
+                    dt.Cancel();
+                }
+                finally
+                {
+                    if (!dt.Canceled) dt.Commit();
+                }
+			}
+		}
+
+		private void OnPickColorScheme(object sender, EventArgs e)
+		{
+			using(SideBarColorSchemePicker picker=new SideBarColorSchemePicker())
+			{
+				picker.ShowDialog();
+				if(picker.DialogResult==DialogResult.OK)
+				{
+					SetColorScheme(picker.SelectedColorScheme);
+				}
+			}
+		}
+
+		private void SetColorScheme(eSideBarColorScheme scheme)
+		{
+			SideBar sidebar=this.Control as SideBar;
+			if(sidebar!=null)
+			{
+				if(sidebar.Appearance!=eSideBarAppearance.Flat)
+                    TypeDescriptor.GetProperties(sidebar)["Appearance"].SetValue(sidebar, eSideBarAppearance.Flat);
+                TypeDescriptor.GetProperties(sidebar)["PredefinedColorScheme"].SetValue(sidebar, scheme);
+				sidebar.ApplyPredefinedColorScheme(scheme);
+				this.RaiseStyleChanged();
+			}
+		}
+		private void RaiseStyleChanged()
+		{
+			IDesignerHost dh=GetIDesignerHost();
+			DesignerTransaction trans=null;
+			if(dh!=null)
+				trans=dh.CreateTransaction();
+			SideBar sidebar=this.Control as SideBar;
+			IComponentChangeService change=this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+			if(change!=null)
+			{
+				change.OnComponentChanging(this.Control,null);
+				change.OnComponentChanged(this.Control,null,null,null);
+
+				change.OnComponentChanging(this.Component,TypeDescriptor.GetProperties(sidebar).Find("ColorScheme",true));
+				change.OnComponentChanged(this.Component,TypeDescriptor.GetProperties(sidebar).Find("ColorScheme",true),null,null);
+
+				change.OnComponentChanging(this.Component,TypeDescriptor.GetProperties(sidebar).Find("Panels",true));
+				change.OnComponentChanged(this.Component,TypeDescriptor.GetProperties(sidebar).Find("Panels",true),null,null);
+
+				foreach(SideBarPanelItem panel in sidebar.Panels)
+				{
+					change.OnComponentChanging(panel,TypeDescriptor.GetProperties(typeof(SideBarPanelItem))["HeaderStyle"]);
+					change.OnComponentChanged(panel,TypeDescriptor.GetProperties(typeof(SideBarPanelItem))["HeaderStyle"],null,null);
+
+					change.OnComponentChanging(panel,TypeDescriptor.GetProperties(typeof(SideBarPanelItem))["HeaderHotStyle"]);
+					change.OnComponentChanged(panel,TypeDescriptor.GetProperties(typeof(SideBarPanelItem))["HeaderHotStyle"],null,null);
+
+					change.OnComponentChanging(panel,TypeDescriptor.GetProperties(typeof(SideBarPanelItem))["HeaderMouseDownStyle"]);
+					change.OnComponentChanged(panel,TypeDescriptor.GetProperties(typeof(SideBarPanelItem))["HeaderMouseDownStyle"],null,null);
+
+					change.OnComponentChanging(panel,TypeDescriptor.GetProperties(typeof(SideBarPanelItem))["HeaderSideHotStyle"]);
+					change.OnComponentChanged(panel,TypeDescriptor.GetProperties(typeof(SideBarPanelItem))["HeaderSideHotStyle"],null,null);
+
+					change.OnComponentChanging(panel,TypeDescriptor.GetProperties(typeof(SideBarPanelItem))["HeaderSideMouseDownStyle"]);
+					change.OnComponentChanged(panel,TypeDescriptor.GetProperties(typeof(SideBarPanelItem))["HeaderSideMouseDownStyle"],null,null);
+
+					change.OnComponentChanging(panel,TypeDescriptor.GetProperties(typeof(SideBarPanelItem))["HeaderSideStyle"]);
+					change.OnComponentChanged(panel,TypeDescriptor.GetProperties(typeof(SideBarPanelItem))["HeaderSideStyle"],null,null);
+
+				}							
+			}
+			if(trans!=null)
+				trans.Commit();
+		}
+
+		private IDesignerHost GetIDesignerHost()
+		{
+			try
+			{
+				IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+				return dh;
+			}
+			catch{}
+			return null;
+		}
+
+		protected override void PreFilterProperties(
+			IDictionary properties) 
+		{
+			base.PreFilterProperties(properties);
+			// shadow the checked property so we can intercept the set.
+			//
+			properties["Appearance"] = 
+				TypeDescriptor.CreateProperty(typeof(SideBarDesigner), 
+				(PropertyDescriptor)properties["Appearance"], 
+				new Attribute[0]);
+            properties["Style"] =
+                TypeDescriptor.CreateProperty(typeof(SideBarDesigner),
+                (PropertyDescriptor)properties["Style"],
+                new Attribute[0]);
+		}
+
+		/// <summary>
+		/// Gets or sets visual appearance for the control.
+		/// </summary>
+		[Browsable(true),DefaultValue(eSideBarAppearance.Traditional),Category("Appearance"),Description("Indicates visual appearance for the control.")]
+		public eSideBarAppearance Appearance
+		{
+			get 
+			{
+				return ((SideBar)Control).Appearance;
+			}
+			set 
+			{
+                SideBar bar = (SideBar)Control;
+				// set the value into the control
+                if (bar.Appearance != value)
+                {
+                    bar.Appearance = value;
+                    IDesignerHost dh = (IDesignerHost)GetService(typeof(IDesignerHost));
+
+                    if (dh != null && !dh.Loading)
+                    {
+                        if (value == eSideBarAppearance.Flat)
+                        {
+                            SetColorScheme(bar.PredefinedColorScheme);
+                        }
+                        else if (value == eSideBarAppearance.Traditional)
+                        {
+                            bar.ResetTraditional();
+                            RaiseStyleChanged();
+                        }
+                        if (dh != null && !dh.Loading && value == eSideBarAppearance.Flat && Helpers.IsOffice2007Style(bar.Style))
+                        {
+                            bar.Style = eDotNetBarStyle.Office2003;
+                        }
+                    }
+                }
+			}
+		}
+
+        /// <summary>
+        /// Gets/Sets the visual style of the SideBar.
+        /// </summary>
+        [System.ComponentModel.Browsable(true), DevCoBrowsable(true), System.ComponentModel.Category("Appearance"), System.ComponentModel.Description("Specifies the visual style of the side bar."), DefaultValue(eDotNetBarStyle.OfficeXP)]
+        public eDotNetBarStyle Style
+        {
+            get
+            {
+                return ((SideBar)Control).Style;
+            }
+            set
+            {
+                SideBar bar = (SideBar)Control;
+                if (bar.Style == value)
+                    return;
+                bar.Style = value;
+                IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+			    if(dh!=null && !dh.Loading)
+                {
+                    bool panelFontBold = false;
+                    if (Helpers.IsOffice2007Style(value))
+                    {
+                        bar.BorderStyle = eBorderType.None;
+                        panelFontBold = true;
+                    }
+                    else
+                    {
+                        bar.BorderStyle = eBorderType.Sunken;
+                    }
+                    foreach (SideBarPanelItem panel in bar.Panels)
+                    {
+                        panel.FontBold = panelFontBold;
+                    }
+                }
+            }
+        }
+
+		protected override bool CanDragItem(BaseItem item)
+		{
+			if(item is SideBarPanelItem)
+				return false;
+			return base.CanDragItem(item);
+		}
+		#endregion
+	}
+}
+
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SideBarPanelItemDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SideBarPanelItemDesigner.cs
new file mode 100644
index 00000000..5d9aea7c
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SideBarPanelItemDesigner.cs	
@@ -0,0 +1,27 @@
+using System;
+
+namespace DevComponents.DotNetBar.Design
+{
+	public class SideBarPanelItemDesigner:BaseItemDesigner
+	{
+		protected override void BeforeNewItemAdded(BaseItem item)
+		{
+			base.BeforeNewItemAdded(item);
+			if(item is ButtonItem)
+			{
+				ButtonItem button=item as ButtonItem;
+					
+				SideBarPanelItem panel=this.Component as SideBarPanelItem;
+				if(panel.Appearance==eSideBarAppearance.Flat)
+				{
+					button.ImagePosition=eImagePosition.Right;
+					button.ButtonStyle=eButtonStyle.ImageAndText;
+				}
+				else
+				{
+					button.ImagePosition=eImagePosition.Top;
+				}
+			}
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SideBarPanelItemEditor.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SideBarPanelItemEditor.cs
new file mode 100644
index 00000000..693f698f
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SideBarPanelItemEditor.cs	
@@ -0,0 +1,30 @@
+using System;
+
+namespace DevComponents.DotNetBar.Design
+{
+	/// <summary>
+	/// Summary description for ComboItemsEditor.
+	/// </summary>
+	public class SideBarPanelItemEditor:System.ComponentModel.Design.CollectionEditor
+	{
+		public SideBarPanelItemEditor(Type type):base(type)
+		{
+		}
+		protected override Type CreateCollectionItemType()
+		{
+			return typeof(ButtonItem);
+		}
+		protected override object CreateInstance(Type itemType)
+		{
+			object item=base.CreateInstance(itemType);
+			if(item is ButtonItem)
+			{
+				ButtonItem button=item as ButtonItem;
+				button.Text="New Item";
+				button.ButtonStyle = eButtonStyle.ImageAndText;
+				button.ImagePosition=eImagePosition.Top;
+			}
+			return item;
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SideBarPanelsEditor.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SideBarPanelsEditor.cs
new file mode 100644
index 00000000..6c17e81b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SideBarPanelsEditor.cs	
@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace DevComponents.DotNetBar.Design
+{
+    /// <summary>
+    /// Summary description for ComboItemsEditor.
+    /// </summary>
+    public class SideBarPanelsEditor : System.ComponentModel.Design.CollectionEditor
+    {
+        public SideBarPanelsEditor(Type type)
+            : base(type)
+        {
+        }
+        protected override Type CreateCollectionItemType()
+        {
+            return typeof(SideBarPanelItem);
+        }
+        protected override Type[] CreateNewItemTypes()
+        {
+            return new Type[] { typeof(SideBarPanelItem) };
+        }
+        protected override object CreateInstance(Type itemType)
+        {
+            object item = base.CreateInstance(itemType);
+            if (item is SideBarPanelItem)
+            {
+                SideBarPanelItem panel = item as SideBarPanelItem;
+                panel.Text = "New Panel";
+            }
+            return item;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SideNavDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SideNavDesigner.cs
new file mode 100644
index 00000000..b125eb6a
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SideNavDesigner.cs	
@@ -0,0 +1,439 @@
+using DevComponents.DotNetBar.Metro;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.ComponentModel.Design;
+using System.Text;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.Controls;
+using System.Drawing;
+using System.Collections;
+
+namespace DevComponents.DotNetBar.Design
+{
+    /// <summary>
+    /// Represents Windows Forms designer for SideNav control.
+    /// </summary>
+    public class SideNavDesigner: BarBaseControlDesigner
+    {
+        #region Private Variables
+        #endregion
+
+        #region Internal Implementation
+
+        public SideNavDesigner()
+        {
+            this.EnableItemDragDrop = true;
+            this.AcceptExternalControls = false;
+        }
+
+        public override void Initialize(IComponent component)
+        {
+            base.Initialize(component);
+            if (!component.Site.DesignMode)
+                return;
+            SideNav c = component as SideNav;
+            if (c != null)
+            {
+                c.SetDesignMode();
+            }
+            this.EnableDragDrop(false);
+        }
+
+        public override bool CanParent(Control control)
+        {
+            if (control is SideNavPanel && !this.Control.Controls.Contains(control))
+                return true;
+            return false;
+        }
+
+        public override DesignerVerbCollection Verbs
+        {
+            get
+            {
+                DesignerVerb[] verbs = null;
+                verbs = new DesignerVerb[]
+					{
+						new DesignerVerb("Create Tab", new EventHandler(CreateSideNavTab)),
+						new DesignerVerb("Create Button", new EventHandler(CreateButton)),
+						new DesignerVerb("Create Separator", new EventHandler(CreateSeparator))};
+
+                return new DesignerVerbCollection(verbs);
+            }
+        }
+
+        private void CreateSeparator(object sender, EventArgs e)
+        {
+            SideNav r = this.Control as SideNav;
+            if (r != null)
+            {
+                CreateSeparator(GetNewItemContainer());
+            }
+        }
+
+        private void CreateSeparator(BaseItem parent)
+        {
+            if (parent == null)
+                return;
+            Separator item = null;
+
+            IDesignerHost dh = (IDesignerHost)GetService(typeof(IDesignerHost));
+            if (dh != null)
+            {
+                DesignerTransaction trans = dh.CreateTransaction("Adding new item");
+                try
+                {
+                    m_CreatingItem = true;
+                    item = dh.CreateComponent(typeof(Separator)) as Separator;
+                    if (item == null)
+                        return;
+
+                    TypeDescriptor.GetProperties(item)["FixedSize"].SetValue(item, new Size(3,1));
+                    TypeDescriptor.GetProperties(item)["SeparatorOrientation"].SetValue(item, eDesignMarkerOrientation.Vertical);
+                    item.Padding.Left = 6;
+                    item.Padding.Right = 6;
+
+                    IComponentChangeService cc = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+                    if (parent != this.GetDefaultNewItemContainer() && cc != null)
+                        cc.OnComponentChanging(parent, TypeDescriptor.GetProperties(typeof(BaseItem))["SubItems"]);
+
+                    parent.SubItems.Add(item);
+                    this.RecalcLayout();
+
+                    if (parent != this.GetDefaultNewItemContainer() && cc != null)
+                        cc.OnComponentChanged(parent, TypeDescriptor.GetProperties(typeof(BaseItem))["SubItems"], null, null);
+
+                    OnitemCreated(item);
+                }
+                catch
+                {
+                    trans.Cancel();
+                }
+                finally
+                {
+                    if (!trans.Canceled)
+                        trans.Commit();
+                    m_CreatingItem = false;
+                }
+            }   
+        }
+
+        private BaseItem GetNewItemContainer()
+        {
+            SideNav r = this.Control as SideNav;
+            return r.SideNavStrip.GetBaseItemContainer();
+        }
+
+        protected override void CreateButton(object sender, EventArgs e)
+        {
+            SideNav r = this.Control as SideNav;
+            if (r != null)
+            {
+                CreateSideNavButton(GetNewItemContainer());
+            }
+        }
+
+        protected virtual SideNavItem CreateSideNavButton(BaseItem parent)
+        {
+            if (parent == null)
+                return null;
+            SideNavItem item = null;
+
+            IDesignerHost dh = (IDesignerHost)GetService(typeof(IDesignerHost));
+            if (dh != null)
+            {
+                DesignerTransaction trans = dh.CreateTransaction("Adding new item");
+                try
+                {
+                    m_CreatingItem = true;
+                    item = dh.CreateComponent(typeof(SideNavItem)) as SideNavItem;
+                    if (item == null)
+                        return null;
+
+                    TypeDescriptor.GetProperties(item)["Text"].SetValue(item, item.Name);
+                    TypeDescriptor.GetProperties(item)["Symbol"].SetValue(item, "\uf10c");
+
+                    IComponentChangeService cc = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+                    if (parent != this.GetDefaultNewItemContainer() && cc != null)
+                        cc.OnComponentChanging(parent, TypeDescriptor.GetProperties(typeof(BaseItem))["SubItems"]);
+
+                    parent.SubItems.Add(item);
+                    this.RecalcLayout();
+
+                    if (parent != this.GetDefaultNewItemContainer() && cc != null)
+                        cc.OnComponentChanged(parent, TypeDescriptor.GetProperties(typeof(BaseItem))["SubItems"], null, null);
+
+                    OnitemCreated(item);
+                }
+                catch
+                {
+                    trans.Cancel();
+                }
+                finally
+                {
+                    if (!trans.Canceled)
+                        trans.Commit();
+                    m_CreatingItem = false;
+                }
+            }
+            return item;
+        }
+
+        protected override void CreateTextBox(object sender, EventArgs e)
+        {
+            SideNav r = this.Control as SideNav;
+            if (r != null)
+            {
+                CreateTextBox(GetNewItemContainer());
+            }
+        }
+
+        protected override void CreateComboBox(object sender, EventArgs e)
+        {
+            SideNav r = this.Control as SideNav;
+            if (r != null)
+            {
+                CreateComboBox(GetNewItemContainer());
+            }
+        }
+
+        protected override void CreateLabel(object sender, EventArgs e)
+        {
+            SideNav r = this.Control as SideNav;
+            if (r != null)
+            {
+                CreateLabel(GetNewItemContainer());
+            }
+        }
+
+        protected override void CreateColorPicker(object sender, EventArgs e)
+        {
+            SideNav r = this.Control as SideNav;
+            if (r != null)
+            {
+                CreateColorPicker(GetNewItemContainer());
+            }
+        }
+
+        protected override void CreateProgressBar(object sender, EventArgs e)
+        {
+            SideNav r = this.Control as SideNav;
+            if (r != null)
+            {
+                CreateProgressBar(GetNewItemContainer());
+            }
+        }
+
+        protected override void CreateRatingItem(object sender, EventArgs e)
+        {
+            SideNav r = this.Control as SideNav;
+            if (r != null)
+            {
+                CreateRatingItem(GetNewItemContainer());
+            }
+        }
+
+        protected override void CreateSwitch(object sender, EventArgs e)
+        {
+            SideNav r = this.Control as SideNav;
+            if (r != null)
+            {
+                CreateSwitch(GetNewItemContainer());
+            }
+        }
+
+        protected override void ComponentChangeComponentAdded(object sender, ComponentEventArgs e)
+        {
+            if (m_AddingItem)
+            {
+                m_AddingItem = false;
+                IComponentChangeService cc = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+                if (cc != null)
+                    cc.OnComponentChanging(this.Control, null);
+                this.GetNewItemContainer().SubItems.Add(e.Component as BaseItem);
+                if (cc != null)
+                    cc.OnComponentChanged(this.Control, null, null, null);
+                m_InsertItemTransaction.Commit();
+                m_InsertItemTransaction = null;
+                this.RecalcLayout();
+            }
+        }
+
+#if FRAMEWORK20
+        public override void InitializeNewComponent(IDictionary defaultValues)
+        {
+            base.InitializeNewComponent(defaultValues);
+            SetDesignTimeDefaults();
+        }
+#else
+        public override void OnSetComponentDefaults()
+        {
+            SetDesignTimeDefaults();
+            base.OnSetComponentDefaults();
+        }
+#endif
+
+        private void SetDesignTimeDefaults()
+        {
+            CreateSideNavTab("Menu", true);
+            CreateSeparator(GetNewItemContainer());
+            CreateSideNavTab("Home");
+            SideNav c = this.Control as SideNav;
+            
+            c.Size = new Size(400, 200);
+            c.Dock = DockStyle.Left;
+        }
+
+        protected override BaseItem GetItemContainer()
+        {
+            SideNav tab = this.Control as SideNav;
+            if (tab != null)
+                return tab.SideNavStrip.GetBaseItemContainer();
+            return null;
+        }
+
+        protected override System.Windows.Forms.Control GetItemContainerControl()
+        {
+            SideNav tab = this.Control as SideNav;
+            if (tab != null)
+                return tab.SideNavStrip;
+            return null;
+        }
+
+        /// <summary>
+        /// Support for popup menu closing.
+        /// </summary>
+        protected override void DesignTimeSelectionChanged(ISelectionService ss)
+        {
+            if (ss == null)
+                return;
+            if (this.Control == null || this.Control.IsDisposed)
+                return;
+
+            base.DesignTimeSelectionChanged(ss);
+
+            SideNav r = this.Control as SideNav;
+            if (r == null) return;
+
+            BaseItem container = r.SideNavStrip.GetBaseItemContainer();
+            if (container == null) return;
+
+            if (ss.PrimarySelection is SideNavItem)
+            {
+                SideNavItem item = ss.PrimarySelection as SideNavItem;
+                if (container.SubItems.Contains(item) && !item.IsSystemMenu && item.Panel != null)
+                {
+                    TypeDescriptor.GetProperties(item)["Checked"].SetValue(item, true);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Triggered when some other component on the form is removed.
+        /// </summary>
+        protected override void OtherComponentRemoving(object sender, ComponentEventArgs e)
+        {
+            SideNav r = this.Control as SideNav;
+            if (r != null)
+            {
+                BaseItem container = r.SideNavStrip.GetBaseItemContainer();
+
+                if (e.Component is SideNavItem && container != null && container.SubItems != null &&
+                    container.SubItems.Contains(((SideNavItem)e.Component)))
+                {
+                    IDesignerHost dh = this.GetService(typeof(IDesignerHost)) as IDesignerHost;
+                    if (dh != null && ((SideNavItem)e.Component).Panel != null)
+                        dh.DestroyComponent(((SideNavItem)e.Component).Panel);
+                }
+            }
+            base.OtherComponentRemoving(sender, e);
+        }
+
+        protected override void ComponentRemoved(object sender, ComponentEventArgs e)
+        {
+            SideNav r = this.Control as SideNav;
+            if (e.Component is BaseItem && r != null)
+            {
+                BaseItem item = e.Component as BaseItem;
+                if (r.Items.Contains(item))
+                    r.Items.Remove(item);
+                DestroySubItems(item);
+            }
+        }
+
+        #endregion
+
+        #region Design-Time Item Creation
+        protected virtual void CreateSideNavTab(object sender, EventArgs e)
+        {
+            CreateSideNavTab(string.Empty);
+        }
+
+        private void CreateSideNavTab(string text)
+        {
+            CreateSideNavTab(text, false);
+        }
+        private void CreateSideNavTab(string text, bool isSysMenu)
+        {
+            IDesignerHost dh = (IDesignerHost)GetService(typeof(IDesignerHost));
+            if (dh != null)
+            {
+                DesignerTransaction trans = dh.CreateTransaction("Creating SideNav Tab");
+                IComponentChangeService cc = (IComponentChangeService)GetService(typeof(IComponentChangeService));
+                SideNav tab = this.Control as SideNav;
+                try
+                {
+                    m_CreatingItem = true;
+                    OnSubItemsChanging();
+                    SideNavItem item = dh.CreateComponent(typeof(SideNavItem)) as SideNavItem;
+                    if (string.IsNullOrEmpty(text))
+                        TypeDescriptor.GetProperties(item)["Text"].SetValue(item, item.Name);
+                    else
+                        TypeDescriptor.GetProperties(item)["Text"].SetValue(item, text);
+                    if (isSysMenu)
+                    {
+                        TypeDescriptor.GetProperties(item)["Symbol"].SetValue(item, "\uf0c9");
+                        TypeDescriptor.GetProperties(item)["IsSystemMenu"].SetValue(item, true);
+                    }
+                    else
+                    {
+                        TypeDescriptor.GetProperties(item)["Symbol"].SetValue(item, "\uf015");
+                        SideNavPanel panel = dh.CreateComponent(typeof (SideNavPanel)) as SideNavPanel;
+                        TypeDescriptor.GetProperties(panel)["Dock"].SetValue(panel, DockStyle.Fill);
+
+                        cc.OnComponentChanging(this.Control, TypeDescriptor.GetProperties(typeof (Control))["Controls"]);
+                        this.Control.Controls.Add(panel);
+                        panel.SendToBack();
+                        cc.OnComponentChanged(this.Control, TypeDescriptor.GetProperties(typeof (Control))["Controls"],
+                            null, null);
+
+                        TypeDescriptor.GetProperties(item)["Panel"].SetValue(item, panel);
+                    }
+
+                    SimpleItemContainer cont = (SimpleItemContainer)tab.SideNavStrip.GetBaseItemContainer();
+                    cc.OnComponentChanging(cont, TypeDescriptor.GetProperties(typeof(BaseItem))["SubItems"]);
+                    cont.SubItems.Add(item);
+                    cc.OnComponentChanged(cont, TypeDescriptor.GetProperties(typeof(BaseItem))["SubItems"], null, null);
+                    if (tab.SelectedItem == null && !isSysMenu)
+                        TypeDescriptor.GetProperties(item)["Checked"].SetValue(item, true);
+
+                    this.RecalcLayout();
+                    OnSubItemsChanged();
+                }
+                catch
+                {
+                    trans.Cancel();
+                    throw;
+                }
+                finally
+                {
+                    if (!trans.Canceled)
+                        trans.Commit();
+                    m_CreatingItem = false;
+                }
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SimpleBaseItemDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SimpleBaseItemDesigner.cs
new file mode 100644
index 00000000..2de4cf0e
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SimpleBaseItemDesigner.cs	
@@ -0,0 +1,47 @@
+using System;
+using System.Text;
+using System.ComponentModel.Design;
+using System.Collections;
+using DevComponents.Editors;
+
+namespace DevComponents.DotNetBar.Design
+{
+    public class SimpleBaseItemDesigner : BaseItemDesigner
+    {
+        public override DesignerVerbCollection Verbs
+        {
+            get
+            {
+                return new DesignerVerbCollection();
+            }
+        }
+    }
+
+    public class ComboBoxItemDesigner : SimpleBaseItemDesigner
+    {
+        protected override void SetDesignTimeDefaults()
+        {
+            ComboBoxItem item = this.Component as ComboBoxItem;
+            if (item != null) item.DisplayMember = "Text";
+            base.SetDesignTimeDefaults();
+        }
+
+        public override System.Collections.ICollection AssociatedComponents
+        {
+            get
+            {
+                ArrayList items = new ArrayList(base.AssociatedComponents);
+                ComboBoxItem combo = this.Component as ComboBoxItem;
+                if (combo != null)
+                {
+                    foreach (object item in combo.Items)
+                    {
+                        if (item is ComboItem)
+                            items.Add(item);
+                    }
+                }
+                return items;
+            }
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SimpleItemDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SimpleItemDesigner.cs
new file mode 100644
index 00000000..78132a0a
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SimpleItemDesigner.cs	
@@ -0,0 +1,37 @@
+using System;
+using System.Text;
+using System.Collections;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar.Design
+{
+    public class SimpleItemDesigner : System.ComponentModel.Design.ComponentDesigner
+    {
+        protected override void PreFilterProperties(IDictionary properties)
+        {
+            base.PreFilterProperties(properties);
+            properties["Visible"] = TypeDescriptor.CreateProperty(typeof(SimpleItemDesigner), (PropertyDescriptor)properties["Visible"], new Attribute[]
+				{
+					new DefaultValueAttribute(true),
+					new BrowsableAttribute(true),
+					new CategoryAttribute("Layout")});
+        }
+
+        /// <summary>
+        /// Gets or sets whether item is visible.
+        /// </summary>
+        [DefaultValue(true), Browsable(true), DevCoBrowsable(true), Category("Layout"), Description("Gets or sets whether item is visible.")]
+        public bool Visible
+        {
+            get
+            {
+                return (bool)ShadowProperties["Visible"];
+            }
+            set
+            {
+                // this value is not passed to the actual control
+                this.ShadowProperties["Visible"] = value;
+            }
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SlidePanelDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SlidePanelDesigner.cs
new file mode 100644
index 00000000..4ee4834b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SlidePanelDesigner.cs	
@@ -0,0 +1,58 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows.Forms.Design;
+using System.ComponentModel;
+using System.Windows.Forms;
+using System.Collections;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using DevComponents.DotNetBar.Controls;
+
+namespace DevComponents.DotNetBar.Design
+{
+    [ToolboxItemFilter("System.Windows.Forms.MainMenu", ToolboxItemFilterType.Prevent), ToolboxItemFilter("System.Windows.Forms.UserControl", ToolboxItemFilterType.Custom)]
+    public class SlidePanelDesigner : ScrollableControlDesigner
+    {
+        public SlidePanelDesigner()
+        {
+            base.AutoResizeHandles = true;
+        }
+
+        protected virtual void DrawBorder(Graphics graphics)
+        {
+            SlidePanel component = (SlidePanel)base.Component;
+            if ((component != null) && component.Visible)
+            {
+                Pen borderPen = this.BorderPen;
+                Rectangle clientRectangle = this.Control.ClientRectangle;
+                clientRectangle.Width--;
+                clientRectangle.Height--;
+                graphics.DrawRectangle(borderPen, clientRectangle);
+                borderPen.Dispose();
+            }
+        }
+
+        protected override void OnPaintAdornments(PaintEventArgs pe)
+        {
+            SlidePanel component = (SlidePanel)base.Component;
+            if (component.BorderStyle == BorderStyle.None)
+            {
+                this.DrawBorder(pe.Graphics);
+            }
+            base.OnPaintAdornments(pe);
+        }
+
+        // Properties
+        protected Pen BorderPen
+        {
+            get
+            {
+                Color color = (this.Control.BackColor.GetBrightness() < 0.5) ? ControlPaint.Light(this.Control.BackColor) : ControlPaint.Dark(this.Control.BackColor);
+                Pen pen = new Pen(color);
+                pen.DashStyle = DashStyle.Dash;
+                return pen;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SliderDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SliderDesigner.cs
new file mode 100644
index 00000000..46bab44b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SliderDesigner.cs	
@@ -0,0 +1,38 @@
+using System;
+using System.Text;
+using System.Windows.Forms.Design;
+using DevComponents.DotNetBar.Controls;
+using System.Collections;
+
+namespace DevComponents.DotNetBar.Design
+{
+    /// <summary>
+    /// Represents WinForms designer for Slider control.
+    /// </summary>
+    public class SliderDesigner : ControlDesigner
+    {
+#if FRAMEWORK20
+        public override void InitializeNewComponent(IDictionary defaultValues)
+        {
+            base.InitializeNewComponent(defaultValues);
+            SetDesignTimeDefaults();
+        }
+#else
+        public override void OnSetComponentDefaults()
+        {
+            SetDesignTimeDefaults();
+            base.OnSetComponentDefaults();
+        }
+#endif
+
+        private void SetDesignTimeDefaults()
+        {
+            Slider slider = this.Control as Slider;
+            if (slider != null)
+            {
+                slider.Style = eDotNetBarStyle.StyleManagerControlled;
+                slider.Width = 150;
+            }
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SuperTabControl.Design/SuperTabControlDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SuperTabControl.Design/SuperTabControlDesigner.cs
new file mode 100644
index 00000000..b1a409e3
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SuperTabControl.Design/SuperTabControlDesigner.cs	
@@ -0,0 +1,391 @@
+using System;
+using System.Windows.Forms;
+using System.Collections;
+using System.ComponentModel.Design;
+using System.ComponentModel;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Design
+{
+    /// <summary>
+    /// Summary description for SuperTabControlDesigner
+    /// </summary>
+    public class SuperTabControlDesigner : SuperTabStripDesigner
+    {
+        #region Private variables
+
+        private SuperTabControl _TabControl;
+
+        #endregion
+
+        public SuperTabControlDesigner()
+        {
+            TabsVisible = true;
+        }
+
+        #region Initialize
+
+        public override void Initialize(IComponent component)
+        {
+            base.Initialize(component);
+
+            if (component.Site.DesignMode == true)
+            {
+                _TabControl = component as SuperTabControl;
+
+                if (_TabControl != null)
+                {
+                    TabStrip = _TabControl.TabStrip;
+
+                    if (Inherited == true)
+                    {
+                        if (_TabControl.TabsVisible == false)
+                            _TabControl.TabsVisible = true;
+
+                        if (_TabControl.SelectedPanel != null)
+                            _TabControl.SelectedPanel.BringToFront();
+                    }
+                    _TabControl.TabStrip.GetBaseItemContainer().SetDesignMode(true);
+                }
+            }
+        }
+
+        protected override BaseItem GetItemContainer()
+        {
+            return _TabControl.TabStrip.GetBaseItemContainer();
+        }
+
+        protected override Control GetItemContainerControl()
+        {
+            return _TabControl.TabStrip;
+        }
+        #endregion
+
+        #region PreFilterProperties
+
+        protected override void PreFilterProperties(IDictionary properties)
+        {
+            base.PreFilterProperties(properties);
+
+            properties["SelectedTabIndex"] = TypeDescriptor.CreateProperty(typeof(SuperTabControlDesigner),
+                (PropertyDescriptor)properties["SelectedTabIndex"], new Attribute[]
+			{
+				new BrowsableAttribute(true),
+				new CategoryAttribute("Behavior")
+            });
+
+            properties["TabsVisible"] = TypeDescriptor.CreateProperty(typeof(SuperTabControlDesigner),
+                (PropertyDescriptor)properties["TabsVisible"], new Attribute[]
+			{
+				new BrowsableAttribute(true),
+				new CategoryAttribute("Behavior")
+            });
+        }
+
+        /// <summary>
+        /// Gets or sets whether item is visible.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Category("Behavior")]
+        [Description("Indicates the index of selected tab.")]
+        public int SelectedTabIndex
+        {
+            get { return (int)ShadowProperties["SelectedTabIndex"]; }
+            set { this.ShadowProperties["SelectedTabIndex"] = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether tabs are visible. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance")]
+        [Description("Indicates whether tabs are visible")]
+        public bool TabsVisible
+        {
+            get { return ((bool)ShadowProperties["TabsVisible"]); }
+            set { ShadowProperties["TabsVisible"] = value; }
+        }
+
+        #endregion
+        
+        #region PostFilterEvents
+
+        protected override void  PostFilterEvents(IDictionary events)
+        {
+            events.Remove("MouseUp");
+            events.Remove("MouseDown");
+            events.Remove("MouseMove");
+            events.Remove("MouseClick");
+            events.Remove("MouseDoubleClick");
+
+            events.Remove("MouseEnter");
+            events.Remove("MouseHover");
+            events.Remove("MouseLeave");
+
+ 	        base.PostFilterEvents(events);
+        }
+
+        #endregion
+
+        #region CreateNewTab
+
+        public override SuperTabItem CreateNewTab()
+        {
+            IDesignerHost dh = (IDesignerHost)GetService(typeof(IDesignerHost));
+
+            if (dh == null)
+                return null;
+            SuperTabItem tab = null;
+            DesignerTransaction dt = dh.CreateTransaction();
+
+            try
+            {
+                IComponentChangeService change =
+                    GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+               
+                if (change != null)
+                    change.OnComponentChanging(this.Component, null);
+
+                tab = dh.CreateComponent(typeof(SuperTabItem)) as SuperTabItem;
+                SuperTabControlPanel panel = dh.CreateComponent(typeof(SuperTabControlPanel)) as SuperTabControlPanel;
+
+                if (tab != null && panel != null)
+                {
+                    tab.Text = tab.Name;
+                    _TabControl.CreateTab(tab, panel, -1);
+                    _TabControl.SelectedTab = tab;
+                }
+
+                if (change != null)
+                    change.OnComponentChanged(this.Component, null, null, null);
+
+                if (change != null)
+                {
+                    change.OnComponentChanging(panel, null);
+                    change.OnComponentChanged(panel, null, null, null);
+                }
+            }
+            catch
+            {
+                dt.Cancel();
+            }
+            finally
+            {
+                if (!dt.Canceled)
+                    dt.Commit();
+            }
+            return tab;
+        }
+
+        #endregion
+
+        #region SelectNextTab
+
+        protected override void SelectNextTab(object sender, EventArgs e)
+        {
+            if (_TabControl.SelectedTabIndex < _TabControl.Tabs.Count - 1)
+                _TabControl.SelectNextTab();
+        }
+
+        #endregion
+
+        #region SelectPreviousTab
+
+        protected override void SelectPreviousTab(object sender, EventArgs e)
+        {
+            if (_TabControl.SelectedTabIndex > 0)
+                _TabControl.SelectPreviousTab();
+        }
+
+        #endregion
+
+        #region GetTabStrip
+
+        protected SuperTabStrip GetTabStrip()
+        {
+            return (_TabControl.TabStrip);
+        }
+
+        #endregion
+
+        #region GetIOwner
+
+        protected override IOwner GetIOwner()
+        {
+            return (GetTabStrip());
+        }
+
+        #endregion
+
+        #region CanParent
+
+        public override bool CanParent(Control c)
+        {
+            return (c is SuperTabControlPanel);
+        }
+
+        #endregion
+
+        #region AssociatedComponents
+
+        public override ICollection AssociatedComponents
+        {
+            get
+            {
+                ArrayList list = new ArrayList(base.AssociatedComponents);
+
+                foreach (BaseItem item in _TabControl.Tabs)
+                    list.Add(item);
+
+                return (list);
+            }
+        }
+
+        #endregion
+
+        #region ComponentChangeComponentAdded
+
+        protected override void ComponentChangeComponentAdded(object sender, ComponentEventArgs e)
+        {
+            ISelectionService ss = this.GetService(typeof (ISelectionService)) as ISelectionService;
+
+            if (ss != null && ss.PrimarySelection == _TabControl)
+            {
+                if (m_InsertItemTransaction == null)
+                {
+                    IDesignerHost dh = sender as IDesignerHost;
+
+                    if (dh != null)
+                        m_InsertItemTransaction = dh.CreateTransaction("Adding Item Clip");
+                }
+
+                IComponentChangeService cc =
+                    GetService(typeof (IComponentChangeService)) as IComponentChangeService;
+
+                if (cc != null)
+                {
+                    if (e.Component is BaseItem)
+                    {
+                        cc.OnComponentChanging(_TabControl, null);
+                        _TabControl.Tabs.Add(e.Component as BaseItem);
+                        cc.OnComponentChanged(_TabControl, null, null, null);
+
+                        if (e.Component is SuperTabItem)
+                            _TabControl.SelectedTab = e.Component as SuperTabItem;
+                    }
+                }
+
+                if (m_InsertItemTransaction != null)
+                {
+                    m_InsertItemTransaction.Commit();
+                    m_InsertItemTransaction = null;
+                }
+
+                RecalcLayout();
+            }
+        }
+
+        #endregion
+
+        #region OtherComponentRemoving
+
+        protected override void OtherComponentRemoving(object sender, ComponentEventArgs e)
+        {
+            if (InternalRemove == true)
+                return;
+
+            IDesignerHost dh = (IDesignerHost)GetService(typeof(IDesignerHost));
+
+            if (dh == null)
+                return;
+
+            if (e.Component is SuperTabControlPanel &&
+                _TabControl.Controls.Contains(e.Component as Control))
+            {
+                SuperTabControlPanel panel = e.Component as SuperTabControlPanel;
+
+                _TabControl.Controls.Remove(panel);
+
+                if (panel.TabItem != null)
+                {
+                    if (_TabControl.Tabs.Contains(panel.TabItem))
+                        _TabControl.Tabs.Remove(panel.TabItem);
+                    if (!Inherited)
+                        dh.DestroyComponent(panel.TabItem);
+                }
+            }
+            else if (e.Component is BaseItem &&
+                _TabControl.Tabs.Contains(e.Component as BaseItem))
+            {
+                if (dh.TransactionDescription.StartsWith("Deleting") == false)
+                {
+                    BaseItem item = e.Component as BaseItem;
+
+                    _TabControl.Tabs.Remove(item);
+
+                    SuperTabItem tab = item as SuperTabItem;
+
+                    if (tab != null)
+                    {
+                        if (tab.AttachedControl != null &&
+                            _TabControl.Controls.Contains(tab.AttachedControl))
+                        {
+                            _TabControl.Controls.Remove(tab.AttachedControl);
+
+                            dh.DestroyComponent(tab.AttachedControl);
+                        }
+                    }
+                }
+            }
+            else if (e.Component == this.Control)
+            {
+                InternalRemove = true;
+
+                try
+                {
+                    for (int i = _TabControl.Tabs.Count - 1; i >= 0; i--)
+                        dh.DestroyComponent(_TabControl.Tabs[i]);
+                }
+                finally
+                {
+                    InternalRemove = false;
+                }
+            }
+        }
+
+        #endregion
+
+        #region GetClientPoint
+
+        protected override Point GetClientPoint(int x, int y)
+        {
+            Point p = _TabControl.TabStrip.PointToClient(new Point(x, y));
+            return p;
+        }
+        #endregion
+
+        #region Backstage Support
+        protected override void OnitemCreated(BaseItem item)
+        {
+            if (item is ButtonItem && IsBackstageTab)
+            {
+                ButtonItem button = (ButtonItem)item;
+                button.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText;
+                button.ColorTable = DevComponents.DotNetBar.eButtonColor.Blue;
+                button.ImagePaddingVertical = 10;
+                button.ImagePaddingHorizontal = 18;
+                button.Stretch = true;
+            }
+            base.OnitemCreated(item);
+        }
+        internal bool IsBackstageTab
+        {
+            get
+            {
+                SuperTabControl tab = (SuperTabControl)this.Control;
+                if (tab != null && tab.TabStrip != null)
+                    return (tab.TabStrip.ApplicationButton != null);
+                return false;
+            }
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SuperTabControl.Design/SuperTabControlPanelDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SuperTabControl.Design/SuperTabControlPanelDesigner.cs
new file mode 100644
index 00000000..de5292bd
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SuperTabControl.Design/SuperTabControlPanelDesigner.cs	
@@ -0,0 +1,163 @@
+using System;
+using System.Windows.Forms.Design;
+using System.Collections;
+using System.ComponentModel.Design;
+
+namespace DevComponents.DotNetBar.Design
+{
+    /// <summary>
+    /// Designer for Tab Control Panel.
+    /// </summary>
+    public class SuperTabControlPanelDesigner : PanelControlDesigner
+    {
+        #region SelectionRules
+
+        public override SelectionRules SelectionRules
+        {
+            get { return (SelectionRules.Locked | SelectionRules.Visible); }
+        }
+
+        #endregion
+
+        #region InitializeNewComponent
+
+#if FRAMEWORK20
+        public override void InitializeNewComponent(IDictionary defaultValues)
+        {
+            base.InitializeNewComponent(defaultValues);
+
+            SetDesignTimeDefaults();
+        }
+#else
+		public override void OnSetComponentDefaults()
+		{
+			base.OnSetComponentDefaults();
+			SetDesignTimeDefaults();
+		}
+#endif
+
+        #endregion
+
+        #region SetDesignTimeDefaults
+
+        protected override void SetDesignTimeDefaults()
+        {
+            PanelControl p = this.Control as PanelControl;
+
+            if (p != null)
+            {
+                p.ApplyLabelStyle();
+                p.Text = "";
+            }
+        }
+
+        #endregion
+
+        #region Verbs
+
+        public override DesignerVerbCollection Verbs
+        {
+            get
+            {
+                DesignerVerb[] verbs = new DesignerVerb[]
+                {
+                    new DesignerVerb("Next Tab", SelectNextTab),
+                    new DesignerVerb("Previous Tab", SelectPreviousTab),
+                    new DesignerVerb("Create New Tab", CreateNewTab)
+                };
+
+                return (new DesignerVerbCollection(verbs));
+            }
+        }
+
+        #endregion
+
+        #region CreateNewTab
+
+        protected virtual void CreateNewTab(object sender, EventArgs e)
+        {
+            SuperTabControlPanel cp = this.Control as SuperTabControlPanel;
+
+            if (cp == null || !(cp.Parent is SuperTabControl))
+                return;
+
+            IDesignerHost dh = (IDesignerHost)GetService(typeof(IDesignerHost));
+            SuperTabControl tabControl = cp.Parent as SuperTabControl;
+
+            if (tabControl == null || dh == null)
+                return;
+
+            DesignerTransaction dt = dh.CreateTransaction();
+
+            try
+            {
+                IComponentChangeService change = 
+                    GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+                
+                if (change != null)
+                    change.OnComponentChanging(this.Component, null);
+
+                SuperTabItem tab = dh.CreateComponent(typeof(SuperTabItem)) as SuperTabItem;
+                SuperTabControlPanel panel = dh.CreateComponent(typeof(SuperTabControlPanel)) as SuperTabControlPanel;
+
+                if (tab != null && panel != null)
+                {
+                    tab.Text = tab.Name;
+                    tabControl.CreateTab(tab, panel, -1);
+                    tabControl.SelectedTab = tab;
+                }
+
+                if (change != null)
+                    change.OnComponentChanged(this.Component, null, null, null);
+
+                if (change != null)
+                {
+                    change.OnComponentChanging(panel, null);
+                    change.OnComponentChanged(panel, null, null, null);
+                }
+            }
+            catch
+            {
+                dt.Cancel();
+            }
+            finally
+            {
+                if (!dt.Canceled) dt.Commit();
+            }
+        }
+
+        #endregion
+
+        #region SelectNextTab
+
+        private void SelectNextTab(object sender, EventArgs e)
+        {
+            SuperTabControlPanel panel = Control as SuperTabControlPanel;
+
+            if (panel == null || !(panel.Parent is SuperTabControl))
+                return;
+
+            SuperTabControl tc = panel.Parent as SuperTabControl;
+
+            tc.SelectNextTab();
+        }
+
+        #endregion
+
+        #region SelectPreviousTab
+
+        private void SelectPreviousTab(object sender, EventArgs e)
+        {
+            SuperTabControlPanel panel = Control as SuperTabControlPanel;
+
+            if (panel == null || !(panel.Parent is SuperTabControl))
+                return;
+
+            SuperTabControl tc = panel.Parent as SuperTabControl;
+
+            tc.SelectPreviousTab();
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SuperTabControl.Design/SuperTabControlTabsEditor.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SuperTabControl.Design/SuperTabControlTabsEditor.cs
new file mode 100644
index 00000000..046e020e
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SuperTabControl.Design/SuperTabControlTabsEditor.cs	
@@ -0,0 +1,103 @@
+using System;
+using System.ComponentModel.Design;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Design
+{
+    /// <summary>
+    /// Support for SuperTabStrip tabs design-time editor
+    /// </summary>
+    public class SuperTabControlTabsEditor : SuperTabStripTabsEditor
+    {
+        public SuperTabControlTabsEditor(Type type)
+            : base(type)
+        {
+        }
+
+        #region CreateInstance
+
+        protected override object CreateInstance(Type itemType)
+        {
+            object item = base.CreateInstance(itemType);
+
+            if (item is SuperTabItem)
+            {
+                SuperTabItem tab = item as SuperTabItem;
+
+                tab.Text = String.IsNullOrEmpty(tab.Name) ? "My Tab" : tab.Name;
+
+                CreateNewTab(tab);
+            }
+            else if (item is ButtonItem)
+            {
+                ButtonItem bi = item as ButtonItem;
+
+                bi.Text = String.IsNullOrEmpty(bi.Name) ? "My Button" : bi.Name;
+            }
+
+            return (item);
+        }
+
+        #endregion
+
+        #region CreateNewTab
+
+        private void CreateNewTab(SuperTabItem tab)
+        {
+            IDesignerHost dh = (IDesignerHost)GetService(typeof(IDesignerHost));
+            SuperTabControl tabControl = Context.Instance as SuperTabControl;
+
+            if (dh == null || tabControl == null)
+                return;
+
+            DesignerTransaction dt = dh.CreateTransaction();
+
+            try
+            {
+                IComponentChangeService change =
+                    GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+
+                if (change != null)
+                    change.OnComponentChanging(Context.Container, null);
+
+                SuperTabControlPanel panel = dh.CreateComponent(typeof(SuperTabControlPanel)) as SuperTabControlPanel;
+
+                if (tab != null && panel != null)
+                {
+                    tab.AttachedControl = panel;
+                    panel.TabItem = tab;
+
+                    tabControl.Controls.Add(panel);
+                    tabControl.Tabs.Add(tab);
+
+                    panel.Dock = DockStyle.Fill;
+                    panel.BringToFront();
+
+                    tabControl.ApplyPanelStyle(panel);
+
+                    tabControl.SelectedTab = tab;
+                }
+
+                if (change != null)
+                    change.OnComponentChanged(Context.Container, null, null, null);
+
+                if (change != null)
+                {
+                    change.OnComponentChanging(panel, null);
+                    change.OnComponentChanged(panel, null, null, null);
+                }
+            }
+            catch
+            {
+                dt.Cancel();
+            }
+            finally
+            {
+                if (!dt.Canceled)
+                    dt.Commit();
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SuperTabControl.Design/SuperTabItemColorTableEditor.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SuperTabControl.Design/SuperTabItemColorTableEditor.cs
new file mode 100644
index 00000000..df78b9fa
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SuperTabControl.Design/SuperTabItemColorTableEditor.cs	
@@ -0,0 +1,10 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace DevComponents.DotNetBar.Design
+{
+    class SuperTabItemColorTableEditor
+    {
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SuperTabControl.Design/SuperTabItemDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SuperTabControl.Design/SuperTabItemDesigner.cs
new file mode 100644
index 00000000..a3515ab2
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SuperTabControl.Design/SuperTabItemDesigner.cs	
@@ -0,0 +1,61 @@
+using System.Collections;
+using System.ComponentModel.Design;
+
+namespace DevComponents.DotNetBar.Design
+{
+    public class SuperTabItemDesigner : BaseItemDesigner
+    {
+        #region GetTabItem
+
+        protected virtual SuperTabItem GetTabItem()
+        {
+            return (Component as SuperTabItem);
+        }
+
+        #endregion
+
+        #region Verbs
+
+        public override DesignerVerbCollection Verbs
+        {
+            get
+            {
+                DesignerVerb[] verbs = new DesignerVerb[] { };
+
+                return (new DesignerVerbCollection(verbs));
+            }
+        }
+
+        #endregion
+
+        #region AssociatedComponents
+
+        public override ICollection AssociatedComponents
+        {
+            get
+            {
+                ArrayList c = new ArrayList(base.AssociatedComponents);
+
+                SuperTabItem tab = GetTabItem();
+
+                if (tab != null)
+                {
+                    if (tab.AttachedControl != null)
+                        c.Add(tab.AttachedControl);
+                }
+
+                return (c);
+            }
+        }
+
+        #endregion
+
+        #region ComponentChangeComponentAdding
+
+        protected override void ComponentChangeComponentAdding(object sender, ComponentEventArgs e)
+        {
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SuperTabControl.Design/SuperTabStripDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SuperTabControl.Design/SuperTabStripDesigner.cs
new file mode 100644
index 00000000..68f8648d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SuperTabControl.Design/SuperTabStripDesigner.cs	
@@ -0,0 +1,378 @@
+using System;
+using System.Collections;
+using System.ComponentModel.Design;
+using System.ComponentModel;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Design
+{
+    /// <summary>
+    /// Summary description for SuperTabStripDesigner
+    /// </summary>
+    public class SuperTabStripDesigner : BarBaseControlDesigner
+    {
+        #region Protected variables
+
+        protected bool InternalRemove;
+
+        #endregion
+
+        #region Private variables
+
+        private SuperTabStrip _TabStrip;
+        private SuperTabItem _SelectItem;
+
+        #endregion
+
+        public SuperTabStripDesigner()
+        {
+            EnableItemDragDrop = true;
+        }
+
+        #region Public properties
+
+        public SuperTabStrip TabStrip
+        {
+            get { return (_TabStrip); }
+            set { _TabStrip = value; }
+        }
+
+        #endregion
+
+        #region Initialize
+
+        public override void Initialize(IComponent component)
+        {
+            base.Initialize(component);
+
+            if (component.Site.DesignMode == true)
+            {
+                _TabStrip = component as SuperTabStrip;
+
+                ISelectionService ss =
+                    (ISelectionService) GetService(typeof (ISelectionService));
+
+                if (ss != null)
+                    ss.SelectionChanged += OnSelectionChanged;
+            }
+        }
+
+        #endregion
+
+        #region InitializeNewComponent
+
+#if FRAMEWORK20
+        public override void InitializeNewComponent(IDictionary defaultValues)
+        {
+            base.InitializeNewComponent(defaultValues);
+
+            SetDesignTimeDefaults();
+        }
+#else
+		public override void OnSetComponentDefaults()
+		{
+			base.OnSetComponentDefaults();
+			SetDesignTimeDefaults();
+		}
+#endif
+        #endregion
+
+        #region SetDesignTimeDefaults
+
+        private void SetDesignTimeDefaults()
+        {
+            if (Component != null && Component.Site != null && Component.Site.DesignMode == true)
+            {
+                _TabStrip.TabStyle = eSuperTabStyle.Office2007;
+                _TabStrip.TabFont = _TabStrip.Font;
+                _TabStrip.SelectedTabFont = new System.Drawing.Font(_TabStrip.TabFont, FontStyle.Bold);
+                CreateNewTab(null, null);
+            }
+        }
+
+        #endregion
+
+        #region Verbs
+
+        public override DesignerVerbCollection Verbs
+        {
+            get
+            {
+                DesignerVerb[] verbs = new DesignerVerb[]
+                {
+                    new DesignerVerb("Next Tab", SelectNextTab),
+                    new DesignerVerb("Previous Tab", SelectPreviousTab),
+                    new DesignerVerb("Create New Tab", CreateNewTab),
+
+					new DesignerVerb("Add Button", CreateButton),
+					new DesignerVerb("Add Text Box", CreateTextBox),
+					new DesignerVerb("Add Combo Box", CreateComboBox),
+					new DesignerVerb("Add Label", CreateLabel),
+					new DesignerVerb("Add Color Picker", CreateColorPicker),
+                    new DesignerVerb("Add Progress bar", CreateProgressBar),
+                    new DesignerVerb("Add Check box", CreateCheckBox),
+                    new DesignerVerb("Add Switch Button", CreateSwitch),
+                    new DesignerVerb("Add Micro-Chart", CreateMicroChart)
+                };
+
+                return (new DesignerVerbCollection(verbs));
+            }
+        }
+
+        #endregion
+
+        #region CreateNewTab
+        public virtual SuperTabItem CreateNewTab()
+        {
+            IDesignerHost dh =
+                (IDesignerHost)GetService(typeof(IDesignerHost));
+            SuperTabItem tab = null;
+            if (dh != null)
+            {
+                DesignerTransaction dt = dh.CreateTransaction();
+
+                try
+                {
+                    m_CreatingItem = true;
+                    IComponentChangeService change =
+                        GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+
+                    if (change != null)
+                        change.OnComponentChanging(Component, null);
+
+                    tab =
+                        dh.CreateComponent(typeof(SuperTabItem)) as SuperTabItem;
+
+                    if (tab != null)
+                    {
+                        tab.Text = tab.Name;
+
+                        _TabStrip.Tabs.Add(tab);
+                    }
+
+                    if (change != null)
+                        change.OnComponentChanged(Component, null, null, null);
+                    OnitemCreated(tab);
+                }
+                catch
+                {
+                    dt.Cancel();
+                }
+                finally
+                {
+                    if (dt.Canceled == false)
+                        dt.Commit();
+                    m_CreatingItem = false;
+                }
+            }
+            return tab;
+        }
+        private void CreateNewTab(object sender, EventArgs e)
+        {
+            CreateNewTab();
+        }
+        #endregion
+
+        #region SelectNextTab
+
+        protected virtual void SelectNextTab(object sender, EventArgs e)
+        {
+            if (_TabStrip.SelectedTabIndex < _TabStrip.Tabs.Count - 1)
+                _TabStrip.SelectNextTab();
+        }
+
+        #endregion
+
+        #region SelectPreviousTab
+
+        protected virtual void SelectPreviousTab(object sender, EventArgs e)
+        {
+            if (_TabStrip.SelectedTabIndex > 0)
+                _TabStrip.SelectPreviousTab();
+        }
+
+        #endregion
+
+        #region OnSelectionChanged
+
+        private void OnSelectionChanged(object sender, EventArgs e)
+        {
+            if (_TabStrip != null && _TabStrip.IsDisposed == false)
+            {
+                ISelectionService ss = (ISelectionService) sender;
+                BaseItem item = null;
+
+                if (ss != null && ss.PrimarySelection != Control)
+                {
+                    item = ss.PrimarySelection as BaseItem;
+
+                    if (item != null && _TabStrip.Tabs.Contains(item) == false)
+                        item = null;
+                }
+
+                if (_TabStrip.DesignTimeSelection != item)
+                {
+                    _TabStrip.DesignTimeSelection = item;
+
+                    if (item != null)
+                        ClosePopups();
+                }
+            }
+        }
+
+        #endregion
+
+        #region ComponentChangeComponentAdded
+
+        protected override void ComponentChangeComponentAdded(object sender, ComponentEventArgs e)
+        {
+            ISelectionService ss = this.GetService(typeof (ISelectionService)) as ISelectionService;
+
+            if (ss != null && ss.PrimarySelection == _TabStrip)
+            {
+                if (e.Component is BaseItem)
+                {
+                   if (m_InsertItemTransaction == null)
+                    {
+                        IDesignerHost dh = sender as IDesignerHost;
+
+                        if (dh != null)
+                            m_InsertItemTransaction = dh.CreateTransaction("Adding Item Clip");
+                    }
+
+                    IComponentChangeService cc =
+                        GetService(typeof (IComponentChangeService)) as IComponentChangeService;
+
+                    if (cc != null)
+                        cc.OnComponentChanging(_TabStrip, TypeDescriptor.GetProperties(_TabStrip)["SubItems"]);
+
+                    _TabStrip.Tabs.Add(e.Component as BaseItem);
+
+                    if (cc != null)
+                        cc.OnComponentChanged(_TabStrip, TypeDescriptor.GetProperties(_TabStrip)["SubItems"], null, null);
+
+                    if (m_InsertItemTransaction != null)
+                    {
+                        m_InsertItemTransaction.Commit();
+                        m_InsertItemTransaction = null;
+                    }
+
+                    RecalcLayout();
+
+                    if (e.Component is SuperTabItem)
+                        _TabStrip.SelectedTab = e.Component as SuperTabItem;
+                }
+                else if (e.Component is SuperTabControlPanel)
+                {
+                    throw new Exception("Invalid component addition");
+                }
+            }
+        }
+
+        #endregion
+
+        #region OtherComponentRemoving
+
+        protected override void OtherComponentRemoving(object sender, ComponentEventArgs e)
+        {
+            BaseItem item = e.Component as BaseItem;
+
+            if (item != null)
+            {
+                if (item.Parent != null && item.Parent.SubItems.Contains(item))
+                    item.Parent.SubItems.Remove(item);
+
+                DestroySubItems(item);
+
+                RecalcLayout();
+            }
+        }
+
+        #endregion
+
+        #region AssociatedComponents
+
+        public override ICollection AssociatedComponents
+        {
+            get
+            {
+                ArrayList list = new ArrayList(base.AssociatedComponents);
+
+                foreach (BaseItem tab in _TabStrip.Tabs)
+                    list.Add(tab);
+
+                return (list);
+            }
+        }
+
+        #endregion
+
+        #region DragInProgress
+
+        protected override bool DragInProgress
+        {
+            get { return (base.DragInProgress); }
+
+            set
+            {
+                if (value == true)
+                {
+                    if (_TabStrip != null)
+                        _SelectItem = _TabStrip.SelectedTab;
+                }
+                else
+                {
+                    if (_TabStrip != null)
+                        _TabStrip.SelectedTab = _SelectItem;
+                }
+
+                base.DragInProgress = value;
+            }
+        }
+
+        #endregion
+
+        #region OnMouseDragBegin
+
+        protected override void OnMouseDragBegin(int x, int y)
+        {
+            base.OnMouseDragBegin(x, y);
+
+            if (DragInProgress == true)
+                _SelectItem = _TabStrip.SelectedTab;
+        }
+
+        #endregion
+
+        #region Dispose
+
+        protected override void Dispose(bool disposing)
+        {
+            ISelectionService ss =
+                (ISelectionService)GetService(typeof(ISelectionService));
+
+            if (ss != null)
+                ss.SelectionChanged -= OnSelectionChanged;
+
+            base.Dispose(disposing);
+        }
+
+        #endregion
+
+
+        #region GetHitTest
+        private const string SysBackstageBackButtonName = "sys_backstage_back_button";
+        protected override bool GetHitTest(Point pt)
+        {
+            if (_TabStrip.TabStyle == eSuperTabStyle.Office2010BackstageBlue)
+            {
+                Point clientPt = _TabStrip.PointToClient(pt);
+                BaseItem item = _TabStrip.HitTest(clientPt.X, clientPt.Y);
+                if (item != null && item.Name == SysBackstageBackButtonName)
+                    return true;
+            }
+            return base.GetHitTest(pt);
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SuperTabControl.Design/SuperTabStripTabsEditor.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SuperTabControl.Design/SuperTabStripTabsEditor.cs
new file mode 100644
index 00000000..0f1b406a
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SuperTabControl.Design/SuperTabStripTabsEditor.cs	
@@ -0,0 +1,104 @@
+using System;
+using System.ComponentModel.Design;
+
+namespace DevComponents.DotNetBar.Design
+{
+    /// <summary>
+    /// Support for SuperTabStrip tabs design-time editor
+    /// </summary>
+    public class SuperTabStripTabsEditor : CollectionEditor
+    {
+        public SuperTabStripTabsEditor(Type type)
+            : base(type)
+        {
+        }
+
+        #region CreateCollectionItemType
+
+        protected override Type CreateCollectionItemType()
+        {
+            return typeof(SuperTabItem);
+        }
+
+        #endregion
+
+        #region CreateNewItemTypes
+
+        protected override Type[] CreateNewItemTypes()
+        {
+            return new Type[]
+            {
+                typeof(SuperTabItem),
+                typeof(ButtonItem),
+                typeof(TextBoxItem),
+                typeof(ComboBoxItem),
+                typeof(LabelItem),
+                typeof(ColorPickerDropDown),
+                typeof(ProgressBarItem),
+                typeof(CheckBoxItem),
+            };
+        }
+
+        #endregion
+
+        #region CreateInstance
+
+        protected override object CreateInstance(Type itemType)
+        {
+            object item = base.CreateInstance(itemType);
+
+            if (item is SuperTabItem)
+            {
+                SuperTabItem tabItem = item as SuperTabItem;
+
+                tabItem.Text = String.IsNullOrEmpty(tabItem.Name) ? "My Tab" : tabItem.Name;
+            }
+            else if (item is ButtonItem)
+            {
+                ButtonItem bi = item as ButtonItem;
+
+                bi.Text = String.IsNullOrEmpty(bi.Name) ? "My Button" : bi.Name;
+            }
+            else if (item is TextBoxItem)
+            {
+                TextBoxItem tbi = item as TextBoxItem;
+
+                tbi.Text = String.IsNullOrEmpty(tbi.Name) ? "My TextBox" : tbi.Name;
+            }
+            else if (item is ComboBoxItem)
+            {
+                ComboBoxItem cbi = item as ComboBoxItem;
+
+                cbi.Text = String.IsNullOrEmpty(cbi.Name) ? "My ComboBox" : cbi.Name;
+            }
+            else if (item is LabelItem)
+            {
+                LabelItem lbi = item as LabelItem;
+
+                lbi.Text = String.IsNullOrEmpty(lbi.Name) ? "My Label" : lbi.Name;
+            }
+            else if (item is ColorItem)
+            {
+                ColorItem ci = item as ColorItem;
+
+                ci.Text = String.IsNullOrEmpty(ci.Name) ? "My Color" : ci.Name;
+            }
+            else if (item is ProgressBarItem)
+            {
+                ProgressBarItem pbi = item as ProgressBarItem;
+
+                pbi.Text = String.IsNullOrEmpty(pbi.Name) ? "My ProgressBar" : pbi.Name;
+            }
+            else if (item is CheckBoxItem)
+            {
+                CheckBoxItem cbi = item as CheckBoxItem;
+
+                cbi.Text = String.IsNullOrEmpty(cbi.Name) ? "My CheckBox" : cbi.Name;
+            }
+            
+            return (item);
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SuperTooltipDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SuperTooltipDesigner.cs
new file mode 100644
index 00000000..1d2d93dd
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SuperTooltipDesigner.cs	
@@ -0,0 +1,91 @@
+using System;
+using System.Windows.Forms;
+using System.Windows.Forms.Design;
+using System.Collections;
+using System.Drawing;
+using System.ComponentModel.Design;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar.Design
+{
+	/// <summary>
+	/// Summary description for SuperTooltipDesigner.
+	/// </summary>
+	public class SuperTooltipDesigner:ComponentDesigner
+    {
+        #region Internal Implementation
+        public override void Initialize(IComponent component)
+        {
+            base.Initialize(component);
+            if (!component.Site.DesignMode)
+                return;
+
+#if !TRIAL
+            IDesignerHost dh = this.GetService(typeof(IDesignerHost)) as IDesignerHost;
+            if (dh != null)
+                dh.LoadComplete += new EventHandler(dh_LoadComplete);
+#endif
+        }
+
+#if FRAMEWORK20
+        public override void InitializeNewComponent(IDictionary defaultValues)
+        {
+            base.InitializeNewComponent(defaultValues);
+            SetDesignTimeDefaults();
+        }
+#else
+		public override void OnSetComponentDefaults()
+		{
+			base.OnSetComponentDefaults();
+			SetDesignTimeDefaults();
+		}
+#endif
+
+		private void SetDesignTimeDefaults()
+		{
+			SuperTooltip sp=this.Component as SuperTooltip;
+			if(sp==null)
+				return;
+            //try
+            //{
+            //    sp.DefaultFont = new System.Drawing.Font("Tahoma", System.Windows.Forms.Control.DefaultFont.Size);
+            //}
+            //catch { }
+
+#if !TRIAL
+            string key = GetLicenseKey();
+            sp.LicenseKey = key;
+#endif
+        }
+        #endregion
+
+        #region Licensing
+#if !TRIAL
+        private string GetLicenseKey()
+        {
+            string key = "";
+            Microsoft.Win32.RegistryKey regkey = Microsoft.Win32.Registry.LocalMachine;
+            regkey = regkey.OpenSubKey("Software\\DevComponents\\Licenses", false);
+            if (regkey != null)
+            {
+                object keyValue = regkey.GetValue("DevComponents.DotNetBar.DotNetBarManager2");
+                if (keyValue != null)
+                    key = keyValue.ToString();
+            }
+            return key;
+        }
+        private void dh_LoadComplete(object sender, EventArgs e)
+        {
+            IDesignerHost dh = this.GetService(typeof(IDesignerHost)) as IDesignerHost;
+            if (dh != null)
+                dh.LoadComplete -= new EventHandler(dh_LoadComplete);
+
+            string key = GetLicenseKey();
+            SuperTooltip sp = this.Component as SuperTooltip;
+            if (key != "" && sp != null && sp.LicenseKey == "" && sp.LicenseKey != key)
+                TypeDescriptor.GetProperties(sp)["LicenseKey"].SetValue(sp, key);
+        }
+#endif
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SuperTooltipInfoConverter.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SuperTooltipInfoConverter.cs
new file mode 100644
index 00000000..9ddc39e2
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SuperTooltipInfoConverter.cs	
@@ -0,0 +1,77 @@
+using System;
+using System.ComponentModel;
+using System.ComponentModel.Design.Serialization;
+using System.Globalization;
+using System.Reflection;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Design
+{
+    /// <summary>
+    /// Represents SuperTooltipInfoConverter converter.
+    /// </summary>
+    public class SuperTooltipInfoConverter : TypeConverter
+    {
+        /// <summary>
+        /// Creates new instance of the class.
+        /// </summary>
+        public SuperTooltipInfoConverter() { }
+
+        /// <summary>
+        /// Checks whether conversion can be made to specified type.
+        /// </summary>
+        /// <param name="context">Context Information.</param>
+        /// <param name="destinationType">Destination type.</param>
+        /// <returns></returns>
+        public override bool CanConvertTo(ITypeDescriptorContext context, Type destinationType)
+        {
+            if (destinationType == typeof(InstanceDescriptor))
+                return true;
+            return base.CanConvertTo(context, destinationType);
+        }
+
+        /// <summary>
+        /// Converts object to specified type.
+        /// </summary>
+        /// <param name="context">Context information.</param>
+        /// <param name="culture">Culture information.</param>
+        /// <param name="value">Object to convert.</param>
+        /// <param name="destinationType">Destination type.</param>
+        /// <returns>Object converted to destination type.</returns>
+        public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+        {
+            if (destinationType == null)
+                throw new ArgumentNullException("destinationType");
+
+            if ((destinationType == typeof(InstanceDescriptor)) && (value is SuperTooltipInfo))
+            {
+                SuperTooltipInfo info = (SuperTooltipInfo)value;
+                Type[] constructorParams = null;
+                MemberInfo constructorMemberInfo = null;
+                object[] constructorValues = null;
+
+                if (info.HeaderVisible && info.FooterVisible && info.CustomSize.IsEmpty)
+                {
+                    constructorParams = new Type[] { typeof(string), typeof(string), typeof(string), typeof(Image), typeof(Image), typeof(eTooltipColor) };
+                    constructorMemberInfo = typeof(SuperTooltipInfo).GetConstructor(constructorParams);
+                    constructorValues = new object[] { info.HeaderText, info.FooterText, info.BodyText, info.BodyImage, info.FooterImage, info.Color};
+                }
+                else
+                {
+                    //(string headerText, string footerText, string bodyText, Image bodyImage, bool headerVisible, bool footerVisible, Size customSize)
+                    constructorParams = new Type[] { typeof(string), typeof(string), typeof(string), typeof(Image), typeof(Image), typeof(eTooltipColor), typeof(bool), typeof(bool), typeof(Size) };
+                    constructorMemberInfo = typeof(SuperTooltipInfo).GetConstructor(constructorParams);
+                    constructorValues = new object[] { info.HeaderText, info.FooterText, info.BodyText, info.BodyImage, info.FooterImage, info.Color, info.HeaderVisible, info.FooterVisible, info.CustomSize };
+                }
+                
+
+                if (constructorMemberInfo != null)
+                {
+                    return new InstanceDescriptor(constructorMemberInfo, constructorValues);
+                }
+            }
+
+            return base.ConvertTo(context, culture, value, destinationType);
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SuperTooltipInfoEditor.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SuperTooltipInfoEditor.cs
new file mode 100644
index 00000000..0c5372bb
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SuperTooltipInfoEditor.cs	
@@ -0,0 +1,125 @@
+using System;
+using System.Text;
+using System.Drawing.Design;
+using System.ComponentModel;
+using System.Windows.Forms.Design;
+using System.Windows.Forms;
+using System.Drawing;
+using System.ComponentModel.Design;
+
+namespace DevComponents.DotNetBar.Design
+{
+    public class SuperTooltipInfoEditor : UITypeEditor 
+    {
+
+        /// <summary>
+        /// Edits the value of the specified object using the editor style indicated by GetEditStyle.
+        /// </summary>
+        /// <param name="context">An ITypeDescriptorContext that can be used to gain additional context information.</param>
+        /// <param name="provider">An IServiceProvider that this editor can use to obtain services.</param>
+        /// <param name="value">The object to edit.</param>
+        /// <returns>The new value of the object.</returns>
+        public override object EditValue(ITypeDescriptorContext context, IServiceProvider provider, object value)
+        {
+            if (context != null && context.Instance != null && provider != null)
+            {
+                IWindowsFormsEditorService m_EditorService = provider.GetService(typeof(IWindowsFormsEditorService)) as IWindowsFormsEditorService;
+
+                SuperTooltipInfo info = value as SuperTooltipInfo;
+
+                SuperTooltip superTooltipInstance = null;
+                if (context.PropertyDescriptor != null)
+                {
+                    string name = context.PropertyDescriptor.DisplayName;
+                    IDesignerHost dh = provider.GetService(typeof(IDesignerHost)) as IDesignerHost;
+                    if (dh != null && dh.Container!=null)
+                    {
+                        foreach (IComponent comp in dh.Container.Components)
+                        {
+                            SuperTooltip st = comp as SuperTooltip;
+                            if (st != null && st.Site != null)
+                            {
+                                if (name.EndsWith(st.Site.Name))
+                                {
+                                    superTooltipInstance = st;
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                }
+
+                if (info == null)
+                {
+                    info = new SuperTooltipInfo();
+                    if (!(context.Instance is SuperTooltip))
+                    {
+                        if (superTooltipInstance != null && superTooltipInstance.DefaultTooltipSettings!=null)
+                        {
+                            info.BodyImage = superTooltipInstance.DefaultTooltipSettings.BodyImage;
+                            info.BodyText = superTooltipInstance.DefaultTooltipSettings.BodyText;
+                            info.Color = superTooltipInstance.DefaultTooltipSettings.Color;
+                            info.CustomSize = superTooltipInstance.DefaultTooltipSettings.CustomSize;
+                            info.FooterImage = superTooltipInstance.DefaultTooltipSettings.FooterImage;
+                            info.FooterText = superTooltipInstance.DefaultTooltipSettings.FooterText;
+                            info.FooterVisible = superTooltipInstance.DefaultTooltipSettings.FooterVisible;
+                            info.HeaderText = superTooltipInstance.DefaultTooltipSettings.HeaderText;
+                            info.HeaderVisible = superTooltipInstance.DefaultTooltipSettings.HeaderVisible;
+                        }
+                        else
+                            info.Color = eTooltipColor.System;
+                    }
+                }
+                
+                if (m_EditorService != null)
+                {
+                    SuperTooltipVisualEditor tipDesigner = new SuperTooltipVisualEditor();
+                    tipDesigner.EditorProvider = new CustomTypeEditorProvider(context.Container, provider);
+                    tipDesigner.EditorService = m_EditorService;
+                    tipDesigner.SuperTooltipInfo = info;
+                    tipDesigner.ParentSuperTooltip = superTooltipInstance;
+                    
+                    Form f = new Form();
+                    f.Controls.Add(tipDesigner);
+                    f.AcceptButton = tipDesigner.buttonOK;
+                    f.CancelButton = tipDesigner.buttonCancel;
+                    f.Size = new Size(tipDesigner.Size.Width+SystemInformation.Border3DSize.Width*4,
+                        tipDesigner.Size.Height+SystemInformation.Border3DSize.Height*4+SystemInformation.CaptionHeight);
+                    tipDesigner.Dock = DockStyle.Fill;
+                    f.StartPosition = FormStartPosition.CenterScreen;
+                    f.MinimizeBox = false;
+                    f.MaximizeBox = false;
+                    f.Text = "SuperTooltip Editor";
+                    m_EditorService.ShowDialog(f);
+
+                    //m_EditorService.DropDownControl(tipDesigner);
+
+                    if (!tipDesigner.Canceled)
+                    {
+                        SuperTooltipInfo returnInfo = tipDesigner.SuperTooltipInfo;
+                        f.Dispose();
+                        return returnInfo;
+                    }
+                    f.Dispose();
+                }
+            }
+
+            return value;
+        }
+
+        /// <summary>
+        /// Gets the editor style used by the EditValue method.
+        /// </summary>
+        /// <param name="context">An ITypeDescriptorContext that can be used to gain additional context information.</param>
+        /// <returns>A UITypeEditorEditStyle value that indicates the style of editor used by EditValue. If the UITypeEditor does not support this method, then GetEditStyle will return None.
+        /// </returns>
+        public override UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext context)
+        {
+            if (context != null && context.Instance != null)
+            {
+                return UITypeEditorEditStyle.Modal;
+            }
+            return base.GetEditStyle(context);
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SuperTooltipVisualEditor.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SuperTooltipVisualEditor.cs
new file mode 100644
index 00000000..ba2c545d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SuperTooltipVisualEditor.cs	
@@ -0,0 +1,713 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Data;
+using System.Text;
+using System.Windows.Forms;
+using System.Windows.Forms.Design;
+using System.Drawing.Design;
+using System.Reflection;
+
+namespace DevComponents.DotNetBar.Design
+{
+	/// <summary>
+	/// Represents designer for SuperTooltip.
+	/// </summary>
+    [ToolboxItem(false)]
+	public class SuperTooltipVisualEditor : UserControl
+    {
+        /// <summary> 
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        private PanelEx panelEx1;
+        internal ButtonX buttonOK;
+        internal ButtonX buttonCancel;
+        private System.Windows.Forms.CheckBox footerVisible;
+        private System.Windows.Forms.CheckBox headerVisible;
+        private System.Windows.Forms.TextBox textFooter;
+        private System.Windows.Forms.TextBox textBody;
+        private System.Windows.Forms.TextBox textHeader;
+        private PanelEx panelBodyImage;
+        private PanelEx panelEx5;
+        private System.Windows.Forms.ComboBox comboColors;
+        private System.Windows.Forms.Label label1;
+        private PanelEx panelFooterImage;
+        private System.Windows.Forms.CheckBox checkCustomSize;
+        private System.Windows.Forms.NumericUpDown customHeight;
+        private System.Windows.Forms.NumericUpDown customWidth;
+        private System.Windows.Forms.Label label2;
+
+        private SuperTooltipInfo m_Info = null;
+        private bool m_Canceled = false;
+        private IWindowsFormsEditorService m_EditorService = null;
+        private bool m_BodyImageSelected = false;
+        private bool m_FooterImageSelected = false;
+        private SuperTooltipControl m_Tooltip = null;
+        private PanelEx resetBodyImage;
+        private PanelEx resetFooterImage;
+        private SuperTooltip superTooltip1;
+        private CustomTypeEditorProvider m_EditorProvider = null;
+        private Font m_DefaultFont = null;
+        internal int MaximumWidth = 0;
+        private SuperTooltip m_ParentSuperTooltip = null;
+
+        /// <summary> 
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #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.panelEx1 = new DevComponents.DotNetBar.PanelEx();
+            this.resetFooterImage = new DevComponents.DotNetBar.PanelEx();
+            this.resetBodyImage = new DevComponents.DotNetBar.PanelEx();
+            this.customWidth = new System.Windows.Forms.NumericUpDown();
+            this.customHeight = new System.Windows.Forms.NumericUpDown();
+            this.label2 = new System.Windows.Forms.Label();
+            this.checkCustomSize = new System.Windows.Forms.CheckBox();
+            this.panelFooterImage = new DevComponents.DotNetBar.PanelEx();
+            this.comboColors = new System.Windows.Forms.ComboBox();
+            this.label1 = new System.Windows.Forms.Label();
+            this.panelEx5 = new DevComponents.DotNetBar.PanelEx();
+            this.panelBodyImage = new DevComponents.DotNetBar.PanelEx();
+            this.textFooter = new System.Windows.Forms.TextBox();
+            this.textBody = new System.Windows.Forms.TextBox();
+            this.textHeader = new System.Windows.Forms.TextBox();
+            this.footerVisible = new System.Windows.Forms.CheckBox();
+            this.headerVisible = new System.Windows.Forms.CheckBox();
+            this.buttonCancel = new DevComponents.DotNetBar.ButtonX();
+            this.buttonOK = new DevComponents.DotNetBar.ButtonX();
+            this.superTooltip1 = new DevComponents.DotNetBar.SuperTooltip();
+            this.panelEx1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.customWidth)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.customHeight)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // panelEx1
+            // 
+            this.panelEx1.AntiAlias = true;
+            this.panelEx1.CanvasColor = System.Drawing.SystemColors.Control;
+            this.panelEx1.Controls.Add(this.resetFooterImage);
+            this.panelEx1.Controls.Add(this.resetBodyImage);
+            this.panelEx1.Controls.Add(this.customWidth);
+            this.panelEx1.Controls.Add(this.customHeight);
+            this.panelEx1.Controls.Add(this.label2);
+            this.panelEx1.Controls.Add(this.checkCustomSize);
+            this.panelEx1.Controls.Add(this.panelFooterImage);
+            this.panelEx1.Controls.Add(this.comboColors);
+            this.panelEx1.Controls.Add(this.label1);
+            this.panelEx1.Controls.Add(this.panelEx5);
+            this.panelEx1.Controls.Add(this.panelBodyImage);
+            this.panelEx1.Controls.Add(this.textFooter);
+            this.panelEx1.Controls.Add(this.textBody);
+            this.panelEx1.Controls.Add(this.textHeader);
+            this.panelEx1.Controls.Add(this.footerVisible);
+            this.panelEx1.Controls.Add(this.headerVisible);
+            this.panelEx1.Controls.Add(this.buttonCancel);
+            this.panelEx1.Controls.Add(this.buttonOK);
+            this.panelEx1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.panelEx1.Location = new System.Drawing.Point(0, 0);
+            this.panelEx1.Name = "panelEx1";
+            this.panelEx1.Size = new System.Drawing.Size(432, 320);
+            this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center;
+            this.panelEx1.Style.BackColor1.Color = System.Drawing.Color.WhiteSmoke;
+            this.panelEx1.Style.BackColor2.Color = System.Drawing.Color.White;
+            this.panelEx1.Style.BackgroundImagePosition = DevComponents.DotNetBar.eBackgroundImagePosition.Tile;
+            this.panelEx1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+            this.panelEx1.Style.BorderColor.Color = System.Drawing.Color.DimGray;
+            this.panelEx1.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText;
+            this.panelEx1.Style.GradientAngle = 90;
+            this.panelEx1.TabIndex = 1;
+            // 
+            // resetFooterImage
+            // 
+            this.resetFooterImage.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.resetFooterImage.AntiAlias = true;
+            this.resetFooterImage.CanvasColor = System.Drawing.SystemColors.Control;
+            this.resetFooterImage.DialogResult = System.Windows.Forms.DialogResult.OK;
+            this.resetFooterImage.Location = new System.Drawing.Point(29, 230);
+            this.resetFooterImage.Name = "resetFooterImage";
+            this.resetFooterImage.Size = new System.Drawing.Size(73, 20);
+            this.resetFooterImage.Style.Alignment = System.Drawing.StringAlignment.Center;
+            this.resetFooterImage.Style.BackColor1.Color = System.Drawing.Color.Gainsboro;
+            this.resetFooterImage.Style.BackColor2.Color = System.Drawing.Color.WhiteSmoke;
+            this.resetFooterImage.Style.BackgroundImagePosition = DevComponents.DotNetBar.eBackgroundImagePosition.Tile;
+            this.resetFooterImage.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+            this.resetFooterImage.Style.BorderColor.Color = System.Drawing.Color.Gray;
+            this.resetFooterImage.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
+            this.resetFooterImage.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText;
+            this.resetFooterImage.Style.GradientAngle = 90;
+            this.resetFooterImage.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center;
+            this.resetFooterImage.StyleMouseDown.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground;
+            this.resetFooterImage.StyleMouseDown.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground2;
+            this.resetFooterImage.StyleMouseDown.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBorder;
+            this.resetFooterImage.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
+            this.resetFooterImage.StyleMouseDown.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedText;
+            this.resetFooterImage.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
+            this.resetFooterImage.StyleMouseOver.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemHotBackground;
+            this.resetFooterImage.StyleMouseOver.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemHotBackground2;
+            this.resetFooterImage.StyleMouseOver.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemHotBorder;
+            this.resetFooterImage.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
+            this.resetFooterImage.StyleMouseOver.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemHotText;
+            this.superTooltip1.SetSuperTooltip(this.resetFooterImage, new DevComponents.DotNetBar.SuperTooltipInfo("Reset footer image", "", "Click to reset footer image.", null, null, DevComponents.DotNetBar.eTooltipColor.Lemon, true, false, new System.Drawing.Size(0, 0)));
+            this.resetFooterImage.TabIndex = 17;
+            this.resetFooterImage.Text = "Reset Image";
+            this.resetFooterImage.Click += new System.EventHandler(this.resetFooterImage_Click);
+            // 
+            // resetBodyImage
+            // 
+            this.resetBodyImage.AntiAlias = true;
+            this.resetBodyImage.CanvasColor = System.Drawing.SystemColors.Control;
+            this.resetBodyImage.DialogResult = System.Windows.Forms.DialogResult.OK;
+            this.resetBodyImage.Location = new System.Drawing.Point(7, 60);
+            this.resetBodyImage.Name = "resetBodyImage";
+            this.resetBodyImage.Size = new System.Drawing.Size(95, 20);
+            this.resetBodyImage.Style.Alignment = System.Drawing.StringAlignment.Center;
+            this.resetBodyImage.Style.BackColor1.Color = System.Drawing.Color.Gainsboro;
+            this.resetBodyImage.Style.BackColor2.Color = System.Drawing.Color.WhiteSmoke;
+            this.resetBodyImage.Style.BackgroundImagePosition = DevComponents.DotNetBar.eBackgroundImagePosition.Tile;
+            this.resetBodyImage.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+            this.resetBodyImage.Style.BorderColor.Color = System.Drawing.Color.Gray;
+            this.resetBodyImage.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
+            this.resetBodyImage.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText;
+            this.resetBodyImage.Style.GradientAngle = 90;
+            this.resetBodyImage.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center;
+            this.resetBodyImage.StyleMouseDown.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground;
+            this.resetBodyImage.StyleMouseDown.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground2;
+            this.resetBodyImage.StyleMouseDown.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBorder;
+            this.resetBodyImage.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
+            this.resetBodyImage.StyleMouseDown.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedText;
+            this.resetBodyImage.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
+            this.resetBodyImage.StyleMouseOver.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemHotBackground;
+            this.resetBodyImage.StyleMouseOver.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemHotBackground2;
+            this.resetBodyImage.StyleMouseOver.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemHotBorder;
+            this.resetBodyImage.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
+            this.resetBodyImage.StyleMouseOver.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemHotText;
+            this.superTooltip1.SetSuperTooltip(this.resetBodyImage, new DevComponents.DotNetBar.SuperTooltipInfo("Reset Body Image", "", "Click to reset body image.", null, null, DevComponents.DotNetBar.eTooltipColor.Lemon, true, false, new System.Drawing.Size(0, 0)));
+            this.resetBodyImage.TabIndex = 16;
+            this.resetBodyImage.Text = "Reset Image";
+            this.resetBodyImage.Click += new System.EventHandler(this.resetBodyImage_Click);
+            // 
+            // customWidth
+            // 
+            this.customWidth.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.customWidth.Enabled = false;
+            this.customWidth.Location = new System.Drawing.Point(107, 256);
+            this.customWidth.Maximum = new decimal(new int[] {
+            10000,
+            0,
+            0,
+            0});
+            this.customWidth.Minimum = new decimal(new int[] {
+            1,
+            0,
+            0,
+            0});
+            this.customWidth.Name = "customWidth";
+            this.customWidth.Size = new System.Drawing.Size(52, 21);
+            this.customWidth.TabIndex = 13;
+            this.customWidth.Value = new decimal(new int[] {
+            1,
+            0,
+            0,
+            0});
+            // 
+            // customHeight
+            // 
+            this.customHeight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.customHeight.Enabled = false;
+            this.customHeight.Location = new System.Drawing.Point(174, 256);
+            this.customHeight.Maximum = new decimal(new int[] {
+            10000,
+            0,
+            0,
+            0});
+            this.customHeight.Minimum = new decimal(new int[] {
+            0,
+            0,
+            0,
+            0});
+            this.customHeight.Name = "customHeight";
+            this.customHeight.Size = new System.Drawing.Size(52, 21);
+            this.customHeight.TabIndex = 14;
+            this.customHeight.Value = new decimal(new int[] {
+            1,
+            0,
+            0,
+            0});
+            // 
+            // label2
+            // 
+            this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.label2.AutoSize = true;
+            this.label2.Location = new System.Drawing.Point(160, 258);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(13, 13);
+            this.label2.TabIndex = 15;
+            this.label2.Text = "x";
+            // 
+            // checkCustomSize
+            // 
+            this.checkCustomSize.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.checkCustomSize.Location = new System.Drawing.Point(7, 260);
+            this.checkCustomSize.Name = "checkCustomSize";
+            this.checkCustomSize.Size = new System.Drawing.Size(83, 17);
+            this.checkCustomSize.TabIndex = 12;
+            this.checkCustomSize.Text = "Custom size";
+            this.checkCustomSize.CheckedChanged += new System.EventHandler(this.checkCustomSize_CheckedChanged);
+            // 
+            // panelFooterImage
+            // 
+            this.panelFooterImage.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.panelFooterImage.AntiAlias = true;
+            this.panelFooterImage.CanvasColor = System.Drawing.SystemColors.Control;
+            this.panelFooterImage.Location = new System.Drawing.Point(76, 203);
+            this.panelFooterImage.Name = "panelFooterImage";
+            this.panelFooterImage.Size = new System.Drawing.Size(24, 24);
+            this.panelFooterImage.Style.Alignment = System.Drawing.StringAlignment.Center;
+            this.panelFooterImage.Style.BackColor1.Color = System.Drawing.Color.White;
+            this.panelFooterImage.Style.BackColor2.Color = System.Drawing.Color.White;
+            this.panelFooterImage.Style.BackgroundImagePosition = DevComponents.DotNetBar.eBackgroundImagePosition.Center;
+            this.panelFooterImage.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+            this.panelFooterImage.Style.BorderColor.Color = System.Drawing.Color.DimGray;
+            this.panelFooterImage.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText;
+            this.panelFooterImage.Style.GradientAngle = 90;
+            this.superTooltip1.SetSuperTooltip(this.panelFooterImage, new DevComponents.DotNetBar.SuperTooltipInfo("Click to set footer image", "", "Allows you to choose footer image. Note that image displayed here is preview image. You can see tooltip preview below.", null, null, DevComponents.DotNetBar.eTooltipColor.Lemon, true, false, new System.Drawing.Size(280, 170)));
+            this.panelFooterImage.TabIndex = 11;
+            this.panelFooterImage.Click += new System.EventHandler(this.panelFooterImage_Click);
+            // 
+            // comboColors
+            // 
+            this.comboColors.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                        | System.Windows.Forms.AnchorStyles.Right)));
+            this.comboColors.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboColors.Location = new System.Drawing.Point(107, 6);
+            this.comboColors.Name = "comboColors";
+            this.comboColors.Size = new System.Drawing.Size(316, 21);
+            this.comboColors.Sorted = true;
+            this.comboColors.TabIndex = 10;
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Location = new System.Drawing.Point(4, 9);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(96, 13);
+            this.label1.TabIndex = 9;
+            this.label1.Text = "Predefined Colors:";
+            // 
+            // panelEx5
+            // 
+            this.panelEx5.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
+                        | System.Windows.Forms.AnchorStyles.Right)));
+            this.panelEx5.AntiAlias = true;
+            this.panelEx5.CanvasColor = System.Drawing.SystemColors.Control;
+            this.panelEx5.Location = new System.Drawing.Point(7, 287);
+            this.panelEx5.Name = "panelEx5";
+            this.panelEx5.Size = new System.Drawing.Size(283, 24);
+            this.panelEx5.Style.Alignment = System.Drawing.StringAlignment.Center;
+            this.panelEx5.Style.BackColor1.Color = System.Drawing.Color.LightGray;
+            this.panelEx5.Style.BackColor2.Color = System.Drawing.Color.DimGray;
+            this.panelEx5.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+            this.panelEx5.Style.BorderColor.Color = System.Drawing.Color.DimGray;
+            this.panelEx5.Style.CornerType = DevComponents.DotNetBar.eCornerType.Rounded;
+            this.panelEx5.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
+            this.panelEx5.Style.GradientAngle = 90;
+            this.panelEx5.TabIndex = 8;
+            this.panelEx5.Text = "Place mouse here to preview";
+            this.panelEx5.MouseLeave += new System.EventHandler(this.panelEx5_MouseLeave);
+            this.panelEx5.MouseEnter += new System.EventHandler(this.panelEx5_MouseEnter);
+            // 
+            // panelBodyImage
+            // 
+            this.panelBodyImage.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+                        | System.Windows.Forms.AnchorStyles.Left)));
+            this.panelBodyImage.AntiAlias = true;
+            this.panelBodyImage.CanvasColor = System.Drawing.SystemColors.Control;
+            this.panelBodyImage.Location = new System.Drawing.Point(7, 83);
+            this.panelBodyImage.Name = "panelBodyImage";
+            this.panelBodyImage.Size = new System.Drawing.Size(94, 117);
+            this.panelBodyImage.Style.Alignment = System.Drawing.StringAlignment.Center;
+            this.panelBodyImage.Style.BackColor1.Color = System.Drawing.Color.White;
+            this.panelBodyImage.Style.BackColor2.Color = System.Drawing.Color.White;
+            this.panelBodyImage.Style.BackgroundImagePosition = DevComponents.DotNetBar.eBackgroundImagePosition.Center;
+            this.panelBodyImage.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+            this.panelBodyImage.Style.BorderColor.Color = System.Drawing.Color.DimGray;
+            this.panelBodyImage.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText;
+            this.panelBodyImage.Style.GradientAngle = 90;
+            this.superTooltip1.SetSuperTooltip(this.panelBodyImage, new DevComponents.DotNetBar.SuperTooltipInfo("Click to set body image", "", "Allows you to choose body image. Note that image displayed here is preview image. You can see tooltip preview below", null, null, DevComponents.DotNetBar.eTooltipColor.Lemon, true, false, Size.Empty));
+            this.panelBodyImage.TabIndex = 6;
+            this.panelBodyImage.Click += new System.EventHandler(this.panelBodyImage_Click);
+            // 
+            // textFooter
+            // 
+            this.textFooter.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
+                        | System.Windows.Forms.AnchorStyles.Right)));
+            this.textFooter.Location = new System.Drawing.Point(107, 206);
+            this.textFooter.Name = "textFooter";
+            this.textFooter.Size = new System.Drawing.Size(316, 21);
+            this.textFooter.TabIndex = 2;
+            // 
+            // textBody
+            // 
+            this.textBody.AcceptsReturn = true;
+            this.textBody.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+                        | System.Windows.Forms.AnchorStyles.Left)
+                        | System.Windows.Forms.AnchorStyles.Right)));
+            this.textBody.Location = new System.Drawing.Point(107, 60);
+            this.textBody.Multiline = true;
+            this.textBody.Name = "textBody";
+            this.textBody.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
+            this.textBody.Size = new System.Drawing.Size(316, 140);
+            this.textBody.TabIndex = 1;
+            // 
+            // textHeader
+            // 
+            this.textHeader.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                        | System.Windows.Forms.AnchorStyles.Right)));
+            this.textHeader.Location = new System.Drawing.Point(107, 33);
+            this.textHeader.Name = "textHeader";
+            this.textHeader.Size = new System.Drawing.Size(316, 21);
+            this.textHeader.TabIndex = 0;
+            // 
+            // footerVisible
+            // 
+            this.footerVisible.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.footerVisible.Location = new System.Drawing.Point(7, 208);
+            this.footerVisible.Name = "footerVisible";
+            this.footerVisible.Size = new System.Drawing.Size(58, 17);
+            this.footerVisible.TabIndex = 7;
+            this.footerVisible.Text = "Footer";
+            // 
+            // headerVisible
+            // 
+            this.headerVisible.Location = new System.Drawing.Point(7, 39);
+            this.headerVisible.Name = "headerVisible";
+            this.headerVisible.Size = new System.Drawing.Size(61, 17);
+            this.headerVisible.TabIndex = 5;
+            this.headerVisible.Text = "Header";
+            // 
+            // buttonCancel
+            // 
+            this.buttonCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonCancel.AntiAlias = true;
+            this.buttonCancel.Style = eDotNetBarStyle.Office2007;
+            this.buttonCancel.ColorTable = eButtonColor.Office2007WithBackground;
+            this.buttonCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+            this.buttonCancel.Location = new System.Drawing.Point(364, 287);
+            this.buttonCancel.Name = "buttonCancel";
+            this.buttonCancel.Size = new System.Drawing.Size(60, 25);
+            this.buttonCancel.TabIndex = 4;
+            this.buttonCancel.Text = "Cancel";
+            this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click);
+            // 
+            // buttonOK
+            // 
+            this.buttonOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonOK.AntiAlias = true;
+            this.buttonOK.DialogResult = System.Windows.Forms.DialogResult.OK;
+            this.buttonOK.Location = new System.Drawing.Point(296, 287);
+            this.buttonOK.Name = "buttonOK";
+            this.buttonOK.Size = new System.Drawing.Size(62, 25);
+            this.buttonOK.Style = eDotNetBarStyle.Office2007;
+            this.buttonOK.ColorTable = eButtonColor.Office2007WithBackground;
+            this.buttonOK.TabIndex = 3;
+            this.buttonOK.Text = "OK";
+            this.buttonOK.Click += new System.EventHandler(this.buttonOK_Click);
+            // 
+            // SuperTooltipVisualEditor
+            // 
+            this.BackColor = System.Drawing.Color.WhiteSmoke;
+            this.Controls.Add(this.panelEx1);
+            this.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.Name = "SuperTooltipVisualEditor";
+            this.Size = new System.Drawing.Size(432, 320);
+            this.panelEx1.ResumeLayout(false);
+            this.panelEx1.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.customWidth)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.customHeight)).EndInit();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        public SuperTooltipVisualEditor()
+        {
+            InitializeComponent();
+            panelBodyImage.Style.BackgroundImage = Helpers.LoadBitmap("SystemImages.ImagePlaceHolder.png");
+            panelFooterImage.Style.BackgroundImage = Helpers.LoadBitmap("SystemImages.ImagePlaceHolder16x16.png");
+            comboColors.Items.AddRange(Enum.GetNames(typeof(eTooltipColor)));
+#if (!TRIAL)
+            this.superTooltip1.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F";
+#endif
+        }
+
+        private void panelBodyImage_Click(object sender, EventArgs e)
+        {
+            Image image = null;
+
+            if (m_EditorProvider != null)
+            {
+                UITypeEditor edit = (UITypeEditor)TypeDescriptor.GetEditor(typeof(Image), typeof(UITypeEditor));
+                m_EditorProvider.SetInstance(m_Info, TypeDescriptor.GetProperties(m_Info)["BodyImage"]);
+
+                image = edit.EditValue(m_EditorProvider, m_EditorProvider, m_Info.BodyImage) as Image;
+            }
+            
+            if (m_Info.BodyImage != image)
+            {
+                m_Info.BodyImage = image;
+                if (m_Info.BodyImage != null)
+                    panelBodyImage.Style.BackgroundImage = m_Info.BodyImage;
+                else
+                    panelBodyImage.Style.BackgroundImage = Helpers.LoadBitmap("SystemImages.ImagePlaceHolder.png");
+                m_BodyImageSelected = true;
+            }
+        }
+
+        public CustomTypeEditorProvider EditorProvider
+        {
+            get { return m_EditorProvider; }
+            set { m_EditorProvider = value; }
+        }
+
+        public SuperTooltipInfo SuperTooltipInfo
+        {
+            get
+            {
+                SuperTooltipInfo info = new SuperTooltipInfo();
+                UpdateSuperTooltipInfo(info);
+                return info; 
+            }
+            set
+            {
+                m_Info = value;
+                OnSuperTooltipInfoChanged();
+            }
+        }
+
+        //public Font DefaultSuperTooltipFont
+        //{
+        //    get { return m_DefaultFont; }
+        //    set { m_DefaultFont = value; }
+        //}
+
+        public IWindowsFormsEditorService EditorService
+        {
+            get { return m_EditorService; }
+            set { m_EditorService = value; }
+        }
+
+        public bool Canceled
+        {
+            get { return m_Canceled; }
+        }
+
+        private void OnSuperTooltipInfoChanged()
+        {
+            if (m_Info == null)
+                return;
+            textHeader.Text = m_Info.HeaderText;
+            headerVisible.Checked = m_Info.HeaderVisible;
+            textBody.Text = m_Info.BodyText;
+            if (m_Info.BodyImage != null)
+            {
+                panelBodyImage.Style.BackgroundImage = m_Info.BodyImage;
+                m_BodyImageSelected = true;
+            }
+            else
+                panelBodyImage.Style.BackgroundImage = Helpers.LoadBitmap("SystemImages.ImagePlaceHolder.png");
+
+            if (m_Info.FooterImage != null)
+            {
+                panelFooterImage.Style.BackgroundImage = m_Info.FooterImage;
+                m_FooterImageSelected = true;
+            }
+            else
+                panelFooterImage.Style.BackgroundImage = Helpers.LoadBitmap("SystemImages.ImagePlaceHolder16x16.png");
+
+            textFooter.Text = m_Info.FooterText;
+            footerVisible.Checked = m_Info.FooterVisible;
+            comboColors.SelectedItem = Enum.GetName(typeof(eTooltipColor), m_Info.Color);
+
+            if (m_Info.CustomSize.IsEmpty)
+            {
+                checkCustomSize.Checked = false;
+            }
+            else
+            {
+                checkCustomSize.Checked = true;
+                customWidth.Value = m_Info.CustomSize.Width;
+                customHeight.Value = m_Info.CustomSize.Height;
+            }
+            customHeight.Enabled = checkCustomSize.Checked;
+            customWidth.Enabled = checkCustomSize.Checked;
+        }
+
+        private void UpdateSuperTooltipInfo(SuperTooltipInfo info)
+        {
+            if (info == null)
+                return;
+            info.HeaderText = textHeader.Text;
+            info.HeaderVisible = headerVisible.Checked;
+            info.BodyText = textBody.Text;
+            if(m_BodyImageSelected)
+                info.BodyImage = panelBodyImage.Style.BackgroundImage;
+            else
+                info.BodyImage = null;
+
+            if (m_FooterImageSelected)
+                info.FooterImage = panelFooterImage.Style.BackgroundImage;
+            else
+                info.FooterImage = null;
+
+            info.FooterText = textFooter.Text;
+            info.FooterVisible = footerVisible.Checked;
+            info.Color = (eTooltipColor)Enum.Parse(typeof(eTooltipColor), comboColors.SelectedItem.ToString());
+
+            if (checkCustomSize.Checked)
+                info.CustomSize = new Size((int)customWidth.Value, (int)customHeight.Value);
+            else
+                info.CustomSize = Size.Empty;
+        }
+
+        private void buttonCancel_Click(object sender, EventArgs e)
+        {
+            DestroyTooltip();
+            m_Canceled = true;
+            ((Form)this.Parent).Close();
+            //if (m_EditorService != null)
+            //    m_EditorService.CloseDropDown();
+        }
+
+        private void buttonOK_Click(object sender, EventArgs e)
+        {
+            DestroyTooltip();
+            m_Canceled = false;
+            ((Form)this.Parent).Close();
+            //if (m_EditorService != null)
+            //    m_EditorService.CloseDropDown();
+        }
+
+        private void DestroyTooltip()
+        {
+            if (m_Tooltip == null)
+                return;
+            m_Tooltip.Hide();
+            m_Tooltip.Dispose();
+            m_Tooltip = null;
+        }
+
+        private void panelEx5_MouseEnter(object sender, EventArgs e)
+        {
+            DestroyTooltip();
+
+            m_Tooltip = new SuperTooltipControl();
+            if (m_DefaultFont != null)
+                m_Tooltip.Font = m_DefaultFont;
+            if (m_ParentSuperTooltip != null)
+            {
+                m_Tooltip.MaximumWidth = m_ParentSuperTooltip.MaximumWidth;
+                m_Tooltip.MinimumTooltipSize = m_ParentSuperTooltip.MinimumTooltipSize;
+                m_Tooltip.AntiAlias = m_ParentSuperTooltip.AntiAlias;
+                if (m_ParentSuperTooltip.DefaultFont != null)
+                    m_Tooltip.Font = m_ParentSuperTooltip.DefaultFont;
+            }
+            else
+                m_Tooltip.MaximumWidth = MaximumWidth;
+            SuperTooltipInfo info=new SuperTooltipInfo();
+            UpdateSuperTooltipInfo(info);
+            Point p = panelEx5.PointToScreen(new Point(0, panelEx5.Height + 1));
+            m_Tooltip.ShowTooltip(info, p.X, p.Y, true);
+        }
+
+        private void panelEx5_MouseLeave(object sender, EventArgs e)
+        {
+            DestroyTooltip();
+        }
+
+        protected override void OnVisibleChanged(EventArgs e)
+        {
+            base.OnVisibleChanged(e);
+            if(!this.Visible)
+                DestroyTooltip();
+        }
+
+        private void panelFooterImage_Click(object sender, EventArgs e)
+        {
+            Image image = null;
+
+            if (m_EditorProvider != null)
+            {
+                UITypeEditor edit = (UITypeEditor)TypeDescriptor.GetEditor(typeof(Image), typeof(UITypeEditor));
+                m_EditorProvider.SetInstance(m_Info, TypeDescriptor.GetProperties(m_Info)["FooterImage"]);
+
+                image = edit.EditValue(m_EditorProvider, m_EditorProvider, m_Info.FooterImage) as Image;
+            }
+
+            if (m_Info.FooterImage != image)
+            {
+                m_Info.FooterImage = image;
+                if (m_Info.FooterImage != null)
+                    panelFooterImage.Style.BackgroundImage = m_Info.FooterImage;
+                else
+                    panelFooterImage.Style.BackgroundImage = Helpers.LoadBitmap("SystemImages.ImagePlaceHolder16x16.png");
+                m_FooterImageSelected = true;
+            }
+        }
+
+        private void checkCustomSize_CheckedChanged(object sender, EventArgs e)
+        {
+            customWidth.Enabled = checkCustomSize.Checked;
+            customHeight.Enabled = checkCustomSize.Checked;
+            if (checkCustomSize.Checked)
+            {
+                SuperTooltipInfo info = new SuperTooltipInfo();
+                UpdateSuperTooltipInfo(info);
+                SuperTooltipControl c = new SuperTooltipControl();
+                c.UpdateWithSuperTooltipInfo(info);
+                c.RecalcSize();
+                customWidth.Value = c.Width;
+                customHeight.Value = c.Height;
+                c.Dispose();
+            }
+        }
+
+        private void resetBodyImage_Click(object sender, EventArgs e)
+        {
+            panelBodyImage.Style.BackgroundImage = Helpers.LoadBitmap("SystemImages.ImagePlaceHolder.png");
+            m_Info.BodyImage = null;
+            m_BodyImageSelected = false;
+        }
+
+        private void resetFooterImage_Click(object sender, EventArgs e)
+        {
+            panelFooterImage.Style.BackgroundImage = Helpers.LoadBitmap("SystemImages.ImagePlaceHolder16x16.png");
+            m_Info.FooterImage = null;
+            m_FooterImageSelected = false;
+        }
+
+        public SuperTooltip ParentSuperTooltip
+        {
+            get { return m_ParentSuperTooltip; }
+            set { m_ParentSuperTooltip = value; }
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SuperTooltipVisualEditor.resx b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SuperTooltipVisualEditor.resx
new file mode 100644
index 00000000..1a46739d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SuperTooltipVisualEditor.resx	
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="superTooltip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <metadata name="superTooltip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <data name="panelFooterImage.SuperTooltip" xml:space="preserve">
+    <value>Click to set footer image.
+
+You can assign images larger than this area as footer image. This area is used only as preview and does not represents how image will appear on final SuperTooltip.
+
+Move mouse to "Place mouse here to preview" area below to see how your tooltip looks like.</value>
+  </data>
+  <data name="panelBodyImage.SuperTooltip" xml:space="preserve">
+    <value>Click to set body image.
+
+You can assign images larger than this area as body image. This area is used only as preview and does not represents how image will appear on final SuperTooltip.
+
+Move mouse to "Place mouse here to preview" area below to see how your tooltip looks like.</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SwitchButtonDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SwitchButtonDesigner.cs
new file mode 100644
index 00000000..b4ad33aa
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SwitchButtonDesigner.cs	
@@ -0,0 +1,38 @@
+using System;
+using System.Text;
+using System.Windows.Forms.Design;
+using DevComponents.DotNetBar.Controls;
+using System.Collections.Generic;
+using System.Collections;
+
+namespace DevComponents.DotNetBar.Design
+{
+    /// <summary>
+    /// Designer for SwitchButton control.
+    /// </summary>
+    public class SwitchButtonDesigner : ControlDesigner
+    {
+        #if FRAMEWORK20
+        public override void InitializeNewComponent(IDictionary defaultValues)
+        {
+            base.InitializeNewComponent(defaultValues);
+            SetDesignTimeDefaults();
+        }
+#else
+        public override void OnSetComponentDefaults()
+        {
+            SetDesignTimeDefaults();
+            base.OnSetComponentDefaults();
+        }
+#endif
+
+        private void SetDesignTimeDefaults()
+        {
+            SwitchButton switchButton = this.Control as SwitchButton;
+            if (switchButton != null)
+            {
+                switchButton.Style = eDotNetBarStyle.StyleManagerControlled;
+            }
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SymbolTypeEditor.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SymbolTypeEditor.cs
new file mode 100644
index 00000000..7d822884
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SymbolTypeEditor.cs	
@@ -0,0 +1,263 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows.Forms.Design;
+using System.ComponentModel;
+using System.Windows.Forms;
+using System.Drawing.Design;
+using System.Reflection;
+using DevComponents.DotNetBar;
+using System.Runtime.InteropServices;
+using System.Drawing;
+using DevComponents.DotNetBar.Rendering;
+
+namespace DevComponents.DotNetBar.Design
+{
+    public class SymbolTypeEditor : System.Drawing.Design.UITypeEditor
+    {
+        #region Implementation
+        private IWindowsFormsEditorService edSvc = null;
+        public override object EditValue(ITypeDescriptorContext context, IServiceProvider provider, object value)
+        {
+            if (context != null
+                && context.Instance != null
+                && provider != null)
+            {
+                edSvc = provider.GetService(typeof(IWindowsFormsEditorService)) as IWindowsFormsEditorService;
+                string stringValue = null;
+                if (value != null) stringValue = value.ToString();
+
+                if (edSvc != null)
+                {
+                    System.Windows.Forms.TabControl tab = new System.Windows.Forms.TabControl();
+                    tab.TabPages.Add("Awesome");
+                    tab.TabPages.Add("Material");
+                    tab.Height = 200;
+
+                    ItemPanel itemPanel = new ItemPanel();
+                    itemPanel.Font = Symbols.FontAwesome;
+                    itemPanel.MultiLine = true;
+                    itemPanel.AutoScroll = true;
+                    itemPanel.LayoutOrientation = eOrientation.Horizontal;
+                    itemPanel.SelectedIndexChanged += new EventHandler(ItemPanelSelectedIndexChanged);
+                    itemPanel.Dock = DockStyle.Fill;
+                    tab.TabPages[0].Controls.Add(itemPanel);
+#if !TRIAL
+                    itemPanel.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F";
+#endif
+                    SetColors(itemPanel);
+
+                    Dictionary<int, bool> supportedChars = GetFontSupportedChars(itemPanel.Font);
+                    for (int i = 0xf000; i <= 0xf200; i++)
+                    {
+                        if (!supportedChars.ContainsKey(i)) continue;
+                        ButtonItem button = new ButtonItem();
+                        button.AutoCheckOnClick = true;
+                        button.OptionGroup = "sym";
+                        button.Text = char.ConvertFromUtf32(i);
+                        button.Tooltip = string.Format("{0:x}", i);
+                        button.Tag = i;
+                        if (button.Text == stringValue) button.Checked = true;
+                        itemPanel.Items.Add(button);
+                    }
+
+                    // Load Material font
+                    ItemPanel itemPanel2 = new ItemPanel();
+                    itemPanel2.Font = Symbols.FontMaterial;
+                    itemPanel2.MultiLine = true;
+                    itemPanel2.AutoScroll = true;
+                    itemPanel2.LayoutOrientation = eOrientation.Horizontal;
+                    itemPanel2.SelectedIndexChanged += new EventHandler(ItemPanelSelectedIndexChanged);
+                    itemPanel2.Dock = DockStyle.Fill;
+                    tab.TabPages[1].Controls.Add(itemPanel2);
+#if !TRIAL
+                    itemPanel2.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F";
+#endif
+                    SetColors(itemPanel2);
+
+                    Dictionary<int, bool> supportedChars2 = GetFontSupportedChars(itemPanel2.Font);
+                    int count = 0;
+                    for (int i = 0xE000; i <= 0xE90A; i++)
+                    {
+                        if (!supportedChars2.ContainsKey(i)) continue;
+                        ButtonItem button = new ButtonItem();
+                        button.AutoCheckOnClick = true;
+                        button.OptionGroup = "sym";
+                        button.Text = char.ConvertFromUtf32(i);
+                        button.Tooltip = string.Format("{0:x}", i);
+                        button.Tag = i;
+                        if (button.Text == stringValue) button.Checked = true;
+                        itemPanel2.Items.Add(button);
+                        count++;
+                    }
+                    //itemPanel2.Items[0].Tooltip = "count=" + count.ToString();
+                    // Select right tab
+                    eSymbolSet currentSet = eSymbolSet.Awesome;
+                    string propertyName = context.PropertyDescriptor.Name;
+                    PropertyInfo property = context.Instance.GetType().GetProperty(propertyName + "Set", BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance);
+                    if(property!=null && property.PropertyType == typeof(eSymbolSet))
+                    {
+                        currentSet = (eSymbolSet)property.GetValue(context.Instance, null);
+                    }
+                    if (currentSet == eSymbolSet.Material)
+                        tab.SelectedIndex = 1;
+                    else
+                        tab.SelectedIndex = 0;
+
+                    edSvc.DropDownControl(tab);
+                    itemPanel.SelectedIndexChanged -= new EventHandler(ItemPanelSelectedIndexChanged);
+                    itemPanel2.SelectedIndexChanged -= new EventHandler(ItemPanelSelectedIndexChanged);
+                    if (tab.SelectedIndex == 0 && itemPanel.SelectedItem != null)
+                    {
+                        if (property != null && currentSet != eSymbolSet.Awesome)
+                            property.SetValue(context.Instance, eSymbolSet.Awesome, null);
+                        return itemPanel.SelectedItem.Text;
+                    }
+                    else if (tab.SelectedIndex == 1 && itemPanel2.SelectedItem != null)
+                    {
+                        if (property != null && currentSet != eSymbolSet.Material)
+                            property.SetValue(context.Instance, eSymbolSet.Material, null);
+                        return itemPanel2.SelectedItem.Tag.ToString();
+                    }
+                }
+            }
+
+            return value;
+        }
+
+        private void SetColors(ItemPanel itemPanel)
+        {
+            Office2007ColorTable table = ((Office2007Renderer)GlobalManager.Renderer).ColorTable;
+            ElementStyle style = (ElementStyle)table.StyleClasses[ElementStyleClassKeys.ItemPanelKey];
+            itemPanel.BackgroundStyle.BackColor = style.BackColor;
+            itemPanel.BackgroundStyle.BackColor2 = style.BackColor2;
+        }
+
+        void ItemPanelSelectedIndexChanged(object sender, EventArgs e)
+        {
+            if (edSvc != null)
+                edSvc.CloseDropDown();
+        }
+
+        /// <summary>
+        /// Gets the editor style used by the EditValue method.
+        /// </summary>
+        /// <param name="context">An ITypeDescriptorContext that can be used to gain additional context information.</param>
+        /// <returns>A UITypeEditorEditStyle value that indicates the style of editor used by EditValue. If the UITypeEditor does not support this method, then GetEditStyle will return None</returns>
+        public override UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext context)
+        {
+            if (context != null && context.Instance != null)
+            {
+                return UITypeEditorEditStyle.DropDown;
+            }
+            return base.GetEditStyle(context);
+        }
+
+        // This method indicates to the design environment that
+        // the type editor will paint additional content in the
+        // LightShape entry in the PropertyGrid.
+        public override bool GetPaintValueSupported(
+            ITypeDescriptorContext context)
+        {
+            return true;
+        }
+
+        public override void PaintValue(PaintValueEventArgs e)
+        {
+            string symbol = (string)e.Value;
+
+            ITypeDescriptorContext context = e.Context;
+            eSymbolSet currentSet = eSymbolSet.Awesome;
+
+            if (context != null)
+            {
+                string propertyName = context.PropertyDescriptor.Name;
+                //MessageBox.Show("PropertyName");
+                PropertyInfo property = context.Instance.GetType().GetProperty(propertyName + "Set", BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance);
+                if (property != null && property.PropertyType == typeof(eSymbolSet))
+                {
+                    currentSet = (eSymbolSet)property.GetValue(context.Instance, null);
+                }
+            }
+
+            Font font = Symbols.GetFont(10, currentSet);
+            e.Graphics.DrawString(Symbols.GetSymbol(symbol), font, Brushes.Brown, e.Bounds.X, e.Bounds.Y + 2, StringFormat.GenericDefault);
+
+        }
+        #endregion
+
+        #region GetFontSupportedChars
+        private static readonly IntPtr HGDI_ERROR = new IntPtr(-1);
+        private const int UIntSize = 4;
+        [DllImport("gdi32.dll")]
+        private static extern uint GetFontUnicodeRanges(IntPtr hdc, IntPtr lpgs);
+        [DllImport("gdi32.dll")]
+        private static extern IntPtr SelectObject(IntPtr hdc, IntPtr hgdiobj);
+        private Dictionary<int, bool> GetFontSupportedChars(Font font)
+        {
+            Dictionary<int, bool> table = new Dictionary<int, bool>();
+
+            IntPtr glyphSetData = IntPtr.Zero;
+            IntPtr savedFont = HGDI_ERROR;
+            IntPtr hdc = IntPtr.Zero;
+            Graphics g = null;
+
+            try 
+            {
+                g = Graphics.FromHwnd(IntPtr.Zero);
+                hdc = g.GetHdc();
+                IntPtr hFont = font.ToHfont();
+                savedFont = SelectObject(hdc, hFont);
+                if (savedFont == HGDI_ERROR)
+                    throw new Exception(
+                        "Unexpected failure of SelectObject.");
+                uint size = GetFontUnicodeRanges(hdc, IntPtr.Zero);
+                if (size == 0)
+                    throw new Exception(
+                        "Unexpected failure of GetFontUnicodeRanges.");
+                glyphSetData = Marshal.AllocHGlobal((int)size);
+                if (GetFontUnicodeRanges(hdc, glyphSetData) == 0)
+                    throw new Exception(
+                        "Unexpected failure of GetFontUnicodeRanges.");
+                int offset = UIntSize;
+                uint flags = (uint)Marshal.ReadInt32(
+                    glyphSetData, offset);
+                offset += UIntSize;
+                uint codePointCount = (uint)Marshal.ReadInt32(
+                    glyphSetData, offset);
+                offset += UIntSize;
+                uint rangeCount = (uint)Marshal.ReadInt32(
+                    glyphSetData, offset);
+                offset += UIntSize;
+                for (uint index = 0; index < rangeCount; index++)
+                {
+                    ushort first = (ushort)Marshal.ReadInt16(
+                        glyphSetData, offset);
+                    offset += Marshal.SizeOf(typeof(ushort));
+                    ushort count = (ushort)Marshal.ReadInt16(
+                        glyphSetData, offset);
+                    offset += Marshal.SizeOf(typeof(ushort));
+                    for (int i = first; i < first + count; i++)
+                    {
+                        table.Add(i, true);
+                    }
+                } 
+            }
+			finally 
+            {
+                if (glyphSetData != IntPtr.Zero)
+                    Marshal.FreeHGlobal(glyphSetData);
+                if (savedFont != HGDI_ERROR)
+                    SelectObject(hdc, savedFont);
+                if (g != null)
+                {
+                    if (hdc != IntPtr.Zero)
+                        g.ReleaseHdc(hdc);
+                    g.Dispose();
+                } 
+            }
+            return table;
+        }        
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/AddMoreItemsContainer.png b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/AddMoreItemsContainer.png
new file mode 100644
index 00000000..8a316e86
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/AddMoreItemsContainer.png differ
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/BlankOffice2010HotBlue.png b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/BlankOffice2010HotBlue.png
new file mode 100644
index 00000000..7053db50
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/BlankOffice2010HotBlue.png differ
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/BlankOffice2010HotSilver.png b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/BlankOffice2010HotSilver.png
new file mode 100644
index 00000000..0ecc3d0c
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/BlankOffice2010HotSilver.png differ
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/BlankOffice2010NormalBlue.png b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/BlankOffice2010NormalBlue.png
new file mode 100644
index 00000000..865c3a2c
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/BlankOffice2010NormalBlue.png differ
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/BlankOffice2010NormalSilver.png b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/BlankOffice2010NormalSilver.png
new file mode 100644
index 00000000..4065fa05
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/BlankOffice2010NormalSilver.png differ
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/BlankOffice2010PressedBlue.png b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/BlankOffice2010PressedBlue.png
new file mode 100644
index 00000000..dc97111f
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/BlankOffice2010PressedBlue.png differ
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/BlankOffice2010PressedSilver.png b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/BlankOffice2010PressedSilver.png
new file mode 100644
index 00000000..dd33032c
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/BlankOffice2010PressedSilver.png differ
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/BlankStartButtonHot.png b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/BlankStartButtonHot.png
new file mode 100644
index 00000000..2afc20ff
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/BlankStartButtonHot.png differ
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/BlankStartButtonHotBlack.png b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/BlankStartButtonHotBlack.png
new file mode 100644
index 00000000..4a42af5e
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/BlankStartButtonHotBlack.png differ
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/BlankStartButtonHotSilver.png b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/BlankStartButtonHotSilver.png
new file mode 100644
index 00000000..a8514b1d
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/BlankStartButtonHotSilver.png differ
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/BlankStartButtonHotVistaBlack.png b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/BlankStartButtonHotVistaBlack.png
new file mode 100644
index 00000000..f6f8cedc
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/BlankStartButtonHotVistaBlack.png differ
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/BlankStartButtonNormal.png b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/BlankStartButtonNormal.png
new file mode 100644
index 00000000..b923ba69
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/BlankStartButtonNormal.png differ
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/BlankStartButtonNormalBlack.png b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/BlankStartButtonNormalBlack.png
new file mode 100644
index 00000000..8f3e519f
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/BlankStartButtonNormalBlack.png differ
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/BlankStartButtonNormalSilver.png b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/BlankStartButtonNormalSilver.png
new file mode 100644
index 00000000..c9e5eacd
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/BlankStartButtonNormalSilver.png differ
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/BlankStartButtonNormalVistaBlack.png b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/BlankStartButtonNormalVistaBlack.png
new file mode 100644
index 00000000..86708e1b
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/BlankStartButtonNormalVistaBlack.png differ
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/BlankStartButtonPressed.png b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/BlankStartButtonPressed.png
new file mode 100644
index 00000000..b44452c1
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/BlankStartButtonPressed.png differ
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/BlankStartButtonPressedBlack.png b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/BlankStartButtonPressedBlack.png
new file mode 100644
index 00000000..cd64bc97
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/BlankStartButtonPressedBlack.png differ
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/BlankStartButtonPressedSilver.png b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/BlankStartButtonPressedSilver.png
new file mode 100644
index 00000000..edab5743
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/BlankStartButtonPressedSilver.png differ
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/BlankStartButtonPressedVistaBlack.png b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/BlankStartButtonPressedVistaBlack.png
new file mode 100644
index 00000000..232dc833
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/BlankStartButtonPressedVistaBlack.png differ
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/BlankWin7HotBlue.png b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/BlankWin7HotBlue.png
new file mode 100644
index 00000000..99508daf
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/BlankWin7HotBlue.png differ
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/BlankWin7NormalBlue.png b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/BlankWin7NormalBlue.png
new file mode 100644
index 00000000..c45e10a5
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/BlankWin7NormalBlue.png differ
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/BlankWin7PressedBlue.png b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/BlankWin7PressedBlue.png
new file mode 100644
index 00000000..120e8b34
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/BlankWin7PressedBlue.png differ
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/Category.png b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/Category.png
new file mode 100644
index 00000000..fe01c4a9
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/Category.png differ
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/CloseButton.png b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/CloseButton.png
new file mode 100644
index 00000000..a2bdd041
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/CloseButton.png differ
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/CollapseTitle.png b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/CollapseTitle.png
new file mode 100644
index 00000000..e260ec0c
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/CollapseTitle.png differ
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/ColorPickerButtonImage.png b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/ColorPickerButtonImage.png
new file mode 100644
index 00000000..06c2e80d
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/ColorPickerButtonImage.png differ
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/ColorPickerCustomColors.png b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/ColorPickerCustomColors.png
new file mode 100644
index 00000000..23c8059a
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/ColorPickerCustomColors.png differ
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/DateReset.png b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/DateReset.png
new file mode 100644
index 00000000..51a459ad
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/DateReset.png differ
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/DefaultNavBarImage.png b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/DefaultNavBarImage.png
new file mode 100644
index 00000000..54e6e6ca
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/DefaultNavBarImage.png differ
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/DockGuideBottom.png b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/DockGuideBottom.png
new file mode 100644
index 00000000..75f68a46
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/DockGuideBottom.png differ
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/DockGuideLeft.png b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/DockGuideLeft.png
new file mode 100644
index 00000000..b612f468
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/DockGuideLeft.png differ
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/DockGuideRight.png b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/DockGuideRight.png
new file mode 100644
index 00000000..48440d6c
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/DockGuideRight.png differ
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/DockGuideTab.png b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/DockGuideTab.png
new file mode 100644
index 00000000..cd2a7541
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/DockGuideTab.png differ
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/DockGuideTop.png b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/DockGuideTop.png
new file mode 100644
index 00000000..caf6095e
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/DockGuideTop.png differ
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/DockHintAllSides.png b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/DockHintAllSides.png
new file mode 100644
index 00000000..4c12ac60
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/DockHintAllSides.png differ
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/DockHintBottom.png b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/DockHintBottom.png
new file mode 100644
index 00000000..cbc073b1
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/DockHintBottom.png differ
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/DockHintLeft.png b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/DockHintLeft.png
new file mode 100644
index 00000000..58f6f9f8
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/DockHintLeft.png differ
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/DockHintRight.png b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/DockHintRight.png
new file mode 100644
index 00000000..c5e6233d
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/DockHintRight.png differ
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/DockHintTab.png b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/DockHintTab.png
new file mode 100644
index 00000000..af8a4606
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/DockHintTab.png differ
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/DockHintTop.png b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/DockHintTop.png
new file mode 100644
index 00000000..0b7a5aba
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/DockHintTop.png differ
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/ErrorIcon.png b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/ErrorIcon.png
new file mode 100644
index 00000000..1d198590
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/ErrorIcon.png differ
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/ExpandTitle.png b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/ExpandTitle.png
new file mode 100644
index 00000000..674f7bdc
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/ExpandTitle.png differ
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/FreeText.png b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/FreeText.png
new file mode 100644
index 00000000..90adc54e
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/FreeText.png differ
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/GreenLight.png b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/GreenLight.png
new file mode 100644
index 00000000..f0987ece
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/GreenLight.png differ
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/ImagePlaceHolder.png b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/ImagePlaceHolder.png
new file mode 100644
index 00000000..8d7e0561
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/ImagePlaceHolder.png differ
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/ImagePlaceHolder16x16.png b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/ImagePlaceHolder16x16.png
new file mode 100644
index 00000000..571d4e1a
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/ImagePlaceHolder16x16.png differ
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/NavBarConfigure.png b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/NavBarConfigure.png
new file mode 100644
index 00000000..78475cdf
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/NavBarConfigure.png differ
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/NavBarShowLess.png b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/NavBarShowLess.png
new file mode 100644
index 00000000..85174de6
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/NavBarShowLess.png differ
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/NavBarShowMore.png b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/NavBarShowMore.png
new file mode 100644
index 00000000..e4528eb4
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/NavBarShowMore.png differ
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/Note24.png b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/Note24.png
new file mode 100644
index 00000000..aeca3326
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/Note24.png differ
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/Note64.png b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/Note64.png
new file mode 100644
index 00000000..d89cde1e
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/Note64.png differ
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/Pin.png b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/Pin.png
new file mode 100644
index 00000000..45050781
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/Pin.png differ
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/PinInactive.png b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/PinInactive.png
new file mode 100644
index 00000000..b6567bca
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/PinInactive.png differ
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/PinPushed.png b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/PinPushed.png
new file mode 100644
index 00000000..b55e4240
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/PinPushed.png differ
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/PinPushedInactive.png b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/PinPushedInactive.png
new file mode 100644
index 00000000..e11be365
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/PinPushedInactive.png differ
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/QatCustomizeItemCombo.png b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/QatCustomizeItemCombo.png
new file mode 100644
index 00000000..dbf9af19
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/QatCustomizeItemCombo.png differ
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/Rating.png b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/Rating.png
new file mode 100644
index 00000000..dc2d7c09
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/Rating.png differ
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/RibbonOverflow.png b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/RibbonOverflow.png
new file mode 100644
index 00000000..4d9792fc
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/RibbonOverflow.png differ
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/RibbonOverflow24.png b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/RibbonOverflow24.png
new file mode 100644
index 00000000..bdd9c470
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/RibbonOverflow24.png differ
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/Sort.png b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/Sort.png
new file mode 100644
index 00000000..089d8949
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/Sort.png differ
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/WizardHeaderImage.png b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/WizardHeaderImage.png
new file mode 100644
index 00000000..572baf61
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/SystemImages/WizardHeaderImage.png differ
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/TabControlDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/TabControlDesigner.cs
new file mode 100644
index 00000000..3f18160a
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/TabControlDesigner.cs	
@@ -0,0 +1,223 @@
+using System;
+using System.Windows.Forms;
+using System.Windows.Forms.Design;
+using System.Collections;
+using System.Drawing;
+using System.ComponentModel.Design;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar.Design
+{
+	/// <summary>
+	/// Summary description for TabControlDesigner.
+	/// </summary>
+	public class TabControlDesigner:TabStripDesigner
+	{
+		public TabControlDesigner()
+		{
+            this.TabsVisible = true;
+		}
+
+        public override void Initialize(IComponent component)
+        {
+            base.Initialize(component);
+            if (!component.Site.DesignMode)
+                return;
+
+            TabControl tc = component as TabControl;
+            if (this.Inherited)
+            {
+                if(!tc.TabsVisible)
+                    tc.TabsVisible = true;
+                if (tc.SelectedPanel != null)
+                    tc.SelectedPanel.BringToFront();
+            }
+        }
+
+		protected override void CreateNewTab(object sender, EventArgs e)
+		{
+			IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+			TabControl tabControl=this.Control as TabControl;
+			if(tabControl==null || dh==null)
+				return;
+
+            DesignerTransaction dt = dh.CreateTransaction();
+            try
+            {
+                IComponentChangeService change = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+                if (change != null)
+                    change.OnComponentChanging(this.Component, null);
+
+                TabItem tab = dh.CreateComponent(typeof(TabItem)) as TabItem;
+                tab.Text = tab.Name;
+
+                TabControlPanel panel = dh.CreateComponent(typeof(TabControlPanel)) as TabControlPanel;
+                tabControl.ApplyDefaultPanelStyle(panel);
+                tab.AttachedControl = panel;
+                panel.TabItem = tab;
+
+                tabControl.Tabs.Add(tab);
+                tabControl.Controls.Add(panel);
+                panel.Dock = DockStyle.Fill;
+                panel.SendToBack();
+
+                tabControl.RecalcLayout();
+
+                if (change != null)
+                    change.OnComponentChanged(this.Component, null, null, null);
+
+                if (change != null)
+                {
+                    change.OnComponentChanging(panel, null);
+                    change.OnComponentChanged(panel, null, null, null);
+                }
+            }
+            catch
+            {
+                dt.Cancel();
+            }
+            finally
+            {
+                if (!dt.Canceled) dt.Commit();
+            }
+		}
+
+		public override bool CanParent(Control c)
+		{
+			if(c is TabControlPanel)
+				return true;
+			return false;
+		}
+
+		protected override void InternalComponentRemoving(ComponentEventArgs e)
+		{
+			if(m_InternalRemove)
+				return;
+			IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+			if(dh==null)
+				return;
+
+			if(e.Component is TabControlPanel && this.Control!=null && this.Control.Controls.Contains(e.Component as Control))
+			{
+				try
+				{
+					TabControlPanel panel=e.Component as TabControlPanel;
+					if(panel.TabItem!=null)
+					{
+						TabControl tabControl=this.Control as TabControl;
+						tabControl.Tabs.Remove(panel.TabItem);
+						dh.DestroyComponent(panel.TabItem);
+					}
+				}
+				finally
+				{
+					m_InternalRemove=false;
+				}
+			}
+			else if(e.Component is TabItem && this.Control!=null && ((TabControl)this.Control).Tabs.Contains(e.Component as TabItem))
+			{
+				try
+				{
+					TabItem item=e.Component as TabItem;
+					if(item.AttachedControl!=null && this.Control.Controls.Contains(item.AttachedControl))
+					{
+						TabControl tabControl=this.Control as TabControl;
+						tabControl.Controls.Remove(item.AttachedControl);
+						dh.DestroyComponent(item.AttachedControl);
+					}
+				}
+				finally
+				{
+					m_InternalRemove=false;
+				}
+			}
+            else if (e.Component == this.Control)
+            {
+                m_InternalRemove = true;
+                try
+                {
+                    TabControl tabControl=this.Control as TabControl;
+                    TabItem[] tabs = new TabItem[tabControl.Tabs.Count];
+                    tabControl.Tabs.CopyTo(tabs, 0);
+                    foreach (TabItem tab in tabs)
+                        dh.DestroyComponent(tab);
+                }
+                finally
+                {
+                    m_InternalRemove = false;
+                }
+            }
+		}
+
+		protected override TabStrip GetTabStrip()
+		{
+			if(this.Control==null || !(this.Control is TabControl))
+				return null;
+			return ((TabControl)this.Control).TabStrip;
+		}
+
+		public override System.Collections.ICollection AssociatedComponents
+		{
+			get
+			{
+				ArrayList c=new ArrayList(base.AssociatedComponents);
+				TabControl tabControl=this.Control as TabControl;
+				if(tabControl!=null)
+				{
+					foreach(TabItem tab in tabControl.Tabs)
+						c.Add(tab);
+				}
+
+				return c;
+			}
+		}
+
+        protected override void PreFilterProperties(IDictionary properties)
+        {
+            base.PreFilterProperties(properties);
+            properties["SelectedTabIndex"] = TypeDescriptor.CreateProperty(typeof(TabControlDesigner), (PropertyDescriptor)properties["SelectedTabIndex"], new Attribute[]
+				{
+					new BrowsableAttribute(true),
+					new CategoryAttribute("Behavior")});
+            properties["TabsVisible"] = TypeDescriptor.CreateProperty(typeof(TabControlDesigner), (PropertyDescriptor)properties["TabsVisible"], new Attribute[]
+				{
+					new BrowsableAttribute(true),
+					new CategoryAttribute("Behavior")});
+        }
+
+        /// <summary>
+        /// Gets or sets whether item is visible.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Category("Behavior"), Description("Indicates the index of selected tab.")]
+        public int SelectedTabIndex
+        {
+            get
+            {
+                return (int)ShadowProperties["SelectedTabIndex"];
+            }
+            set
+            {
+                // this value is not passed to the actual control
+                this.ShadowProperties["SelectedTabIndex"] = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether tabs are visible. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance"), Description("Indicates whether tabs are visible")]
+        public bool TabsVisible
+        {
+            get
+            {
+                return (bool)ShadowProperties["TabsVisible"];
+            }
+            set
+            {
+                // this value is not passed to the actual control
+                this.ShadowProperties["TabsVisible"] = value;
+            }
+        }
+
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/TabControlPanelDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/TabControlPanelDesigner.cs
new file mode 100644
index 00000000..c1c8db9e
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/TabControlPanelDesigner.cs	
@@ -0,0 +1,129 @@
+using System;
+using System.Windows.Forms.Design;
+using System.Collections;
+using System.ComponentModel.Design;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Design
+{
+	#region TabControlPanelDesigner
+	/// <summary>
+	/// Designer for Tab Control Panel.
+	/// </summary>
+	public class TabControlPanelDesigner:PanelExDesigner
+	{
+		public override SelectionRules SelectionRules
+		{
+			get{return (SelectionRules.Locked | SelectionRules.Visible);}
+		}
+
+#if FRAMEWORK20
+        public override void InitializeNewComponent(IDictionary defaultValues)
+        {
+            base.InitializeNewComponent(defaultValues);
+            SetDesignTimeDefaults();
+        }
+#else
+		public override void OnSetComponentDefaults()
+		{
+			base.OnSetComponentDefaults();
+			SetDesignTimeDefaults();
+		}
+#endif
+
+		private void SetDesignTimeDefaults()
+		{
+			PanelEx p = this.Control as PanelEx;
+			if (p == null)
+				return;
+			p.ApplyLabelStyle();
+			p.Text = "";
+		}
+
+        public override DesignerVerbCollection Verbs
+        {
+            get
+            {
+                DesignerVerb[] verbs;
+                verbs = new DesignerVerb[]
+				{
+                    new DesignerVerb("Next Tab", new EventHandler(SelectNextTab)),
+                    new DesignerVerb("Previous Tab", new EventHandler(SelectPreviousTab)),
+                    new DesignerVerb("Create New Tab", new EventHandler(CreateNewTab))
+				};
+                return new DesignerVerbCollection(verbs);
+            }
+        }
+
+        protected virtual void CreateNewTab(object sender, EventArgs e)
+        {
+            TabControlPanel cp = this.Control as TabControlPanel;
+            if (cp == null || !(cp.Parent is TabControl))
+                return;
+
+            IDesignerHost dh = (IDesignerHost)GetService(typeof(IDesignerHost));
+            TabControl tabControl = cp.Parent as TabControl;
+            if (tabControl == null || dh == null)
+                return;
+            DesignerTransaction dt = dh.CreateTransaction();
+            try
+            {
+                IComponentChangeService change = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+                if (change != null)
+                    change.OnComponentChanging(this.Component, null);
+
+                TabItem tab = dh.CreateComponent(typeof(TabItem)) as TabItem;
+                tab.Text = tab.Name;
+
+                TabControlPanel panel = dh.CreateComponent(typeof(TabControlPanel)) as TabControlPanel;
+                tabControl.ApplyDefaultPanelStyle(panel);
+                tab.AttachedControl = panel;
+                panel.TabItem = tab;
+
+                tabControl.Tabs.Add(tab);
+                tabControl.Controls.Add(panel);
+                panel.Dock = DockStyle.Fill;
+                panel.SendToBack();
+
+                tabControl.RecalcLayout();
+                tabControl.SelectedTab = tab;
+
+                if (change != null)
+                    change.OnComponentChanged(this.Component, null, null, null);
+
+                if (change != null)
+                {
+                    change.OnComponentChanging(panel, null);
+                    change.OnComponentChanged(panel, null, null, null);
+                }
+            }
+            catch
+            {
+                dt.Cancel();
+            }
+            finally
+            {
+                if (!dt.Canceled) dt.Commit();
+            }
+        }
+
+        private void SelectNextTab(object sender, EventArgs e)
+        {
+            TabControlPanel panel = this.Control as TabControlPanel;
+            if (panel == null || !(panel.Parent is TabControl))
+                return;
+            TabControl tc = panel.Parent as TabControl;
+            tc.SelectNextTab();
+        }
+
+        private void SelectPreviousTab(object sender, EventArgs e)
+        {
+            TabControlPanel panel = this.Control as TabControlPanel;
+            if (panel == null || !(panel.Parent is TabControl))
+                return;
+            TabControl tc = panel.Parent as TabControl;
+            tc.SelectPreviousTab();
+        }
+	}
+	#endregion
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/TabForm/TabFormControlDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/TabForm/TabFormControlDesigner.cs
new file mode 100644
index 00000000..d9ae37cb
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/TabForm/TabFormControlDesigner.cs	
@@ -0,0 +1,737 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.ComponentModel.Design;
+using System.Drawing;
+using System.IO;
+using System.Text;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.Controls;
+using DevComponents.DotNetBar.Metro;
+
+namespace DevComponents.DotNetBar.Design
+{
+    class TabFormControlDesigner : BarBaseControlDesigner
+    {
+        #region Private Variables
+        #endregion
+
+        #region Internal Implementation
+
+        public TabFormControlDesigner()
+        {
+            this.EnableItemDragDrop = true;
+            this.AcceptExternalControls = false;
+        }
+
+        public override void Initialize(IComponent component)
+        {
+            base.Initialize(component);
+            if (!component.Site.DesignMode)
+                return;
+            TabFormControl c = component as TabFormControl;
+            if (c != null)
+            {
+                c.SetDesignMode();
+                //this.Expanded = c.Expanded;
+            }
+            this.EnableDragDrop(false);
+        }
+
+        public override bool CanParent(Control control)
+        {
+            if (control is TabFormPanel && !this.Control.Controls.Contains(control))
+                return true;
+            return false;
+        }
+
+        public override DesignerVerbCollection Verbs
+        {
+            get
+            {
+                DesignerVerb[] verbs = null;
+                verbs = new DesignerVerb[]
+					{
+						new DesignerVerb("Create Tab", new EventHandler(CreateTab)),
+						new DesignerVerb("Create Button", new EventHandler(CreateButton)),
+						new DesignerVerb("Create Combo Box", new EventHandler(CreateComboBox)),
+                        new DesignerVerb("Create Label", new EventHandler(CreateLabel))};
+
+                return new DesignerVerbCollection(verbs);
+            }
+        }
+
+        private DesignerActionListCollection _ActionLists = null;
+        public override DesignerActionListCollection ActionLists
+        {
+            get
+            {
+                if (this._ActionLists == null)
+                {
+                    this._ActionLists = new DesignerActionListCollection();
+                    this._ActionLists.Add(new TabFormControlActionList(this));
+                }
+                return this._ActionLists;
+            }
+        }
+
+        private BaseItem GetNewItemContainer()
+        {
+            TabFormControl r = this.Control as TabFormControl;
+            //if (m_QuickAccessToolbarSelected)
+            //    return r.TabStrip.CaptionContainerItem;
+            //else
+            return r.TabStrip.StripContainerItem;
+        }
+
+        public override ButtonItem CreateButton()
+        {
+            OnSubItemsChanging();
+            ButtonItem button = CreateButton(GetNewItemContainer());
+            OnSubItemsChanged();
+            return button;
+        }
+
+        protected override void CreateButton(object sender, EventArgs e)
+        {
+            TabFormControl r = this.Control as TabFormControl;
+            if (r != null)
+            {
+                CreateButton(GetNewItemContainer());
+            }
+        }
+
+        protected override void CreateTextBox(object sender, EventArgs e)
+        {
+            TabFormControl r = this.Control as TabFormControl;
+            if (r != null)
+            {
+                CreateTextBox(GetNewItemContainer());
+            }
+        }
+
+        protected override void CreateComboBox(object sender, EventArgs e)
+        {
+            TabFormControl r = this.Control as TabFormControl;
+            if (r != null)
+            {
+                CreateComboBox(GetNewItemContainer());
+            }
+        }
+
+        protected override void CreateLabel(object sender, EventArgs e)
+        {
+            TabFormControl r = this.Control as TabFormControl;
+            if (r != null)
+            {
+                CreateLabel(GetNewItemContainer());
+            }
+        }
+
+        protected override void CreateColorPicker(object sender, EventArgs e)
+        {
+            TabFormControl r = this.Control as TabFormControl;
+            if (r != null)
+            {
+                CreateColorPicker(GetNewItemContainer());
+            }
+        }
+
+        protected override void CreateProgressBar(object sender, EventArgs e)
+        {
+            TabFormControl r = this.Control as TabFormControl;
+            if (r != null)
+            {
+                CreateProgressBar(GetNewItemContainer());
+            }
+        }
+
+        protected override void CreateRatingItem(object sender, EventArgs e)
+        {
+            TabFormControl r = this.Control as TabFormControl;
+            if (r != null)
+            {
+                CreateRatingItem(GetNewItemContainer());
+            }
+        }
+
+        protected override void CreateSwitch(object sender, EventArgs e)
+        {
+            TabFormControl r = this.Control as TabFormControl;
+            if (r != null)
+            {
+                CreateSwitch(GetNewItemContainer());
+            }
+        }
+
+        protected override void ComponentChangeComponentAdded(object sender, ComponentEventArgs e)
+        {
+            if (m_AddingItem)
+            {
+                m_AddingItem = false;
+                IComponentChangeService cc = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+                if (cc != null)
+                    cc.OnComponentChanging(this.Control, null);
+                this.GetNewItemContainer().SubItems.Add(e.Component as BaseItem);
+                if (cc != null)
+                    cc.OnComponentChanged(this.Control, null, null, null);
+                m_InsertItemTransaction.Commit();
+                m_InsertItemTransaction = null;
+                this.RecalcLayout();
+            }
+        }
+
+        protected override ArrayList GetAllAssociatedComponents()
+        {
+            ArrayList c = new ArrayList(base.AssociatedComponents);
+            TabFormControl r = this.Control as TabFormControl;
+            if (r != null)
+            {
+                AddSubItems(r.TabStrip.StripContainerItem, c);
+                AddSubItems(r.TabStrip.CaptionContainerItem, c);
+            }
+            return c;
+        }
+
+        public override System.Collections.ICollection AssociatedComponents
+        {
+            get
+            {
+                ArrayList c = new ArrayList(this.BaseAssociatedComponents);
+                TabFormControl rc = this.Control as TabFormControl;
+                if (rc != null)
+                {
+                    foreach (BaseItem item in rc.Items)
+                    {
+                        if (!item.SystemItem)
+                            c.Add(item);
+                    }
+                    foreach (BaseItem item in rc.CaptionItems)
+                    {
+                        if (!item.SystemItem)
+                            c.Add(item);
+                    }
+                }
+                return c;
+            }
+        }
+
+#if FRAMEWORK20
+        public override void InitializeNewComponent(IDictionary defaultValues)
+        {
+            base.InitializeNewComponent(defaultValues);
+            SetDesignTimeDefaults();
+        }
+#else
+        public override void OnSetComponentDefaults()
+        {
+            SetDesignTimeDefaults();
+            base.OnSetComponentDefaults();
+        }
+#endif
+
+        private void SetDesignTimeDefaults()
+        {
+            CreateTab("Document 1");
+            CreateTab("Document 2");
+            TabFormControl c = this.Control as TabFormControl;
+            c.Dock = DockStyle.Fill;
+        }
+
+        protected override BaseItem GetItemContainer()
+        {
+            TabFormControl tab = this.Control as TabFormControl;
+            if (tab != null)
+                return tab.TabStrip.GetBaseItemContainer();
+            return null;
+        }
+
+        protected override System.Windows.Forms.Control GetItemContainerControl()
+        {
+            TabFormControl tab = this.Control as TabFormControl;
+            if (tab != null)
+                return tab.TabStrip;
+            return null;
+        }
+
+        /// <summary>
+        /// Support for popup menu closing.
+        /// </summary>
+        protected override void DesignTimeSelectionChanged(ISelectionService ss)
+        {
+            if (ss == null)
+                return;
+            if (this.Control == null || this.Control.IsDisposed)
+                return;
+
+            base.DesignTimeSelectionChanged(ss);
+
+            TabFormControl r = this.Control as TabFormControl;
+            if (r == null) return;
+
+            BaseItem container = r.TabStrip.StripContainerItem;
+            if (container == null) return;
+
+            if (ss.PrimarySelection is TabFormItem)
+            {
+                TabFormItem item = ss.PrimarySelection as TabFormItem;
+                if (container.SubItems.Contains(item))
+                {
+                    TypeDescriptor.GetProperties(item)["Checked"].SetValue(item, true);
+                }
+            }
+        }
+
+        private bool ContainsControl(Control container, Control childControl)
+        {
+            Control parent = childControl;
+            while (parent != null)
+            {
+                if (parent == container) return true;
+                parent = parent.Parent;
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// Triggered when some other component on the form is removed.
+        /// </summary>
+        protected override void OtherComponentRemoving(object sender, ComponentEventArgs e)
+        {
+            TabFormControl r = this.Control as TabFormControl;
+            if (r != null)
+            {
+                BaseItem container = r.TabStrip.StripContainerItem;
+
+                if (e.Component is TabFormItem && container != null && container.SubItems != null &&
+                    container.SubItems.Contains(((TabFormItem)e.Component)))
+                {
+                    IDesignerHost dh = this.GetService(typeof(IDesignerHost)) as IDesignerHost;
+                    if (dh != null)
+                        dh.DestroyComponent(((TabFormItem)e.Component).Panel);
+                }
+            }
+            base.OtherComponentRemoving(sender, e);
+        }
+
+        protected override void ComponentRemoved(object sender, ComponentEventArgs e)
+        {
+            TabFormControl r = this.Control as TabFormControl;
+            if (e.Component is BaseItem && r != null)
+            {
+                BaseItem item = e.Component as BaseItem;
+                if (r.Items.Contains(item))
+                    r.Items.Remove(item);
+                else if (r.CaptionItems.Contains(item))
+                    r.CaptionItems.Remove(item);
+                DestroySubItems(item);
+            }
+        }
+
+        protected override bool OnMouseDown(ref Message m, MouseButtons button)
+        {
+            System.Windows.Forms.Control ctrl = this.GetItemContainerControl();
+            TabFormStripControl strip = ctrl as TabFormStripControl;
+
+            if (strip == null)
+                return base.OnMouseDown(ref m, button);
+
+            Point pos = strip.PointToClient(System.Windows.Forms.Control.MousePosition);
+            if (!strip.ClientRectangle.Contains(pos))
+                return base.OnMouseDown(ref m, button);
+
+            bool callBase = true;
+
+            if (callBase)
+                return base.OnMouseDown(ref m, button);
+            else
+                return true;
+        }
+
+        #endregion
+
+        #region Design-Time Item Creation
+        protected virtual void CreateTab(object sender, EventArgs e)
+        {
+            CreateTab(string.Empty);
+        }
+
+        internal void CreateTab(string text)
+        {
+            IDesignerHost dh = (IDesignerHost)GetService(typeof(IDesignerHost));
+            if (dh != null)
+            {
+                DesignerTransaction trans = dh.CreateTransaction("Creating Tab");
+                IComponentChangeService cc = (IComponentChangeService)GetService(typeof(IComponentChangeService));
+                TabFormControl tab = this.Control as TabFormControl;
+                try
+                {
+                    m_CreatingItem = true;
+                    OnSubItemsChanging();
+                    TabFormItem item = dh.CreateComponent(typeof(TabFormItem)) as TabFormItem;
+                    if (string.IsNullOrEmpty(text))
+                        TypeDescriptor.GetProperties(item)["Text"].SetValue(item, item.Name);
+                    else
+                        TypeDescriptor.GetProperties(item)["Text"].SetValue(item, text);
+
+                    TabFormPanel panel = (TabFormPanel)dh.CreateComponent(typeof(TabFormPanel));
+                    TypeDescriptor.GetProperties(panel)["Dock"].SetValue(panel, DockStyle.Fill);
+                    //TypeDescriptor.GetProperties(panel)["ColorSchemeStyle"].SetValue(panel, tab.Style);
+                    tab.SetTabPanelStyle(panel);
+
+                    //panel.Style.BorderBottom = eStyleBorderType.Solid;
+                    //TypeDescriptor.GetProperties(panel.Style)["BorderBottom"].SetValue(panel.Style, eStyleBorderType.Solid);
+
+                    cc.OnComponentChanging(this.Control, TypeDescriptor.GetProperties(typeof(Control))["Controls"]);
+                    this.Control.Controls.Add(panel);
+                    panel.SendToBack();
+                    cc.OnComponentChanged(this.Control, TypeDescriptor.GetProperties(typeof(Control))["Controls"], null, null);
+
+                    TypeDescriptor.GetProperties(item)["Panel"].SetValue(item, panel);
+
+                    SimpleItemContainer cont = tab.TabStrip.StripContainerItem;
+                    cc.OnComponentChanging(cont, TypeDescriptor.GetProperties(typeof(BaseItem))["SubItems"]);
+                    cont.SubItems.Add(item);
+                    cc.OnComponentChanged(cont, TypeDescriptor.GetProperties(typeof(BaseItem))["SubItems"], null, null);
+                    if (cont.SubItems.Count == 1)
+                        TypeDescriptor.GetProperties(item)["Checked"].SetValue(item, true);
+
+                    this.RecalcLayout();
+                    OnSubItemsChanged();
+                }
+                catch
+                {
+                    trans.Cancel();
+                    throw;
+                }
+                finally
+                {
+                    if (!trans.Canceled)
+                        trans.Commit();
+                    m_CreatingItem = false;
+                }
+            }
+        }
+
+        #endregion
+
+        #region Shadowing
+        ///// <summary>
+        ///// Gets or sets whether custom caption and quick access toolbar provided by the control is visible. Default value is false.
+        ///// This property should be set to true when control is used on MetroForm.
+        ///// </summary>
+        //[Browsable(true), DefaultValue(false), Category("Appearance"), Description("Indicates whether custom caption and quick access toolbar provided by the control is visible.")]
+        //public bool CaptionVisible
+        //{
+        //    get
+        //    {
+        //        TabFormControl r = this.Control as TabFormControl;
+        //        return r.CaptionVisible;
+        //    }
+        //    set
+        //    {
+        //        TabFormControl r = this.Control as TabFormControl;
+        //        if (r.CaptionVisible == value) return;
+        //        r.CaptionVisible = value;
+
+        //        if (r.CaptionVisible && (
+        //            r.QuickToolbarItems.Count == 6 && r.QuickToolbarItems[0] is SystemCaptionItem && r.QuickToolbarItems[5] is SystemCaptionItem))
+        //        {
+        //            // Add custom items to the toolbar
+        //            IDesignerHost dh = this.GetService(typeof(IDesignerHost)) as IDesignerHost;
+        //            IComponentChangeService cc = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+        //            if (dh != null && !dh.Loading && cc != null && dh.TransactionDescription != "Paste components")
+        //            {
+        //                DesignerTransaction trans = dh.CreateTransaction();
+        //                try
+        //                {
+        //                    m_CreatingItem = true;
+        //                    MetroAppButton sb = dh.CreateComponent(typeof(MetroAppButton)) as MetroAppButton;
+        //                    sb.Text = "&File";
+        //                    sb.ShowSubItems = false;
+        //                    sb.CanCustomize = false;
+        //                    sb.AutoExpandOnClick = true;
+        //                    cc.OnComponentChanging(r, TypeDescriptor.GetProperties(r)["QuickToolbarItems"]);
+        //                    sb.ImageFixedSize = new Size(16, 16);
+        //                    r.Items.Insert(0, sb);
+        //                    cc.OnComponentChanged(r, TypeDescriptor.GetProperties(r)["QuickToolbarItems"], null, null);
+        //                    ButtonItem buttonStart = sb;
+
+        //                    ButtonItem b = dh.CreateComponent(typeof(ButtonItem)) as ButtonItem;
+        //                    b.Text = b.Name;
+        //                    cc.OnComponentChanging(r, TypeDescriptor.GetProperties(r)["QuickToolbarItems"]);
+        //                    r.QuickToolbarItems.Add(b, 2);
+        //                    cc.OnComponentChanged(r, TypeDescriptor.GetProperties(r)["QuickToolbarItems"], null, null);
+
+
+        //                }
+        //                catch
+        //                {
+        //                    trans.Cancel();
+        //                }
+        //                finally
+        //                {
+        //                    if (!trans.Canceled) trans.Commit();
+        //                    m_CreatingItem = false;
+        //                }
+        //            }
+        //        }
+        //    }
+        //}
+
+        internal static Bitmap LoadImage(string imageName)
+        {
+            string imagesFolder = GetImagesFolder();
+            if (imagesFolder != "")
+            {
+                if (File.Exists(imagesFolder + imageName))
+                    return new Bitmap(imagesFolder + imageName);
+            }
+
+            return null;
+        }
+
+        private static string GetImagesFolder()
+        {
+            try
+            {
+                Microsoft.Win32.RegistryKey key = Microsoft.Win32.Registry.LocalMachine;
+                string path = "";
+                try
+                {
+                    if (key != null)
+                        key = key.OpenSubKey("Software\\DevComponents\\DotNetBar");
+                    if (key != null)
+                        path = key.GetValue("InstallationFolder", "").ToString();
+                }
+                finally { if (key != null) key.Close(); }
+
+                if (path != "")
+                {
+                    if (path.Substring(path.Length - 1, 1) != "\\")
+                        path += "\\";
+                    path += "Images\\";
+                    return path;
+                }
+            }
+            catch (Exception)
+            {
+            }
+            return "";
+        }
+
+        //protected override void PreFilterProperties(IDictionary properties)
+        //{
+        //    base.PreFilterProperties(properties);
+
+        //    properties["CaptionVisible"] = TypeDescriptor.CreateProperty(typeof(TabFormControlDesigner), (PropertyDescriptor)properties["CaptionVisible"], new Attribute[]
+        //        {
+        //            new DefaultValueAttribute(false),
+        //            new BrowsableAttribute(true),
+        //            new CategoryAttribute("Appearance"),
+        //            new DescriptionAttribute("Indicates whether custom caption and quick access toolbar provided by the control is visible.")});
+
+        //}
+
+        #endregion
+
+        protected override void OnItemDragAndDropped(BaseItem dragItem)
+        {
+            TabFormControl tc = (TabFormControl)this.Component;
+            IComponentChangeService cc = (IComponentChangeService)GetService(typeof(IComponentChangeService));
+            if (cc != null && tc != null && tc.CaptionItems.Contains(dragItem))
+            {
+                cc.OnComponentChanged(tc, TypeDescriptor.GetProperties(typeof(BaseItem))["CaptionItems"], null, null);
+            }
+            else
+                base.OnItemDragAndDropped(dragItem);
+        }
+
+        public void CreateCaptionButton()
+        {
+            ButtonItem item = null;
+
+            IDesignerHost dh = (IDesignerHost)GetService(typeof(IDesignerHost));
+            if (dh != null)
+            {
+                DesignerTransaction trans = dh.CreateTransaction("Adding new item");
+                try
+                {
+                    m_CreatingItem = true;
+                    item = dh.CreateComponent(typeof(ButtonItem)) as ButtonItem;
+                    if (item == null)
+                        return;
+
+                    TabFormControl tc = (TabFormControl)this.Component;
+
+                    TypeDescriptor.GetProperties(item)["Text"].SetValue(item, item.Name);
+                    item.ItemAlignment = eItemAlignment.Far;
+                    IComponentChangeService cc = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+                    cc.OnComponentChanging(this.Component, TypeDescriptor.GetProperties(typeof(TabFormControl))["CaptionItems"]);
+
+                    tc.CaptionItems.Add(item);
+                    this.RecalcLayout();
+
+                    cc.OnComponentChanged(this.Component, TypeDescriptor.GetProperties(typeof(TabFormControl))["CaptionItems"], null, null);
+
+                    OnitemCreated(item);
+                }
+                catch
+                {
+                    trans.Cancel();
+                }
+                finally
+                {
+                    if (!trans.Canceled)
+                        trans.Commit();
+                    m_CreatingItem = false;
+                }
+            }
+        }
+
+        public void CreateCaptionLabel()
+        {
+
+            LabelItem item = null;
+
+            IDesignerHost dh = (IDesignerHost)GetService(typeof(IDesignerHost));
+            if (dh != null)
+            {
+                DesignerTransaction trans = dh.CreateTransaction("Adding new item");
+                try
+                {
+                    m_CreatingItem = true;
+                    item = dh.CreateComponent(typeof(LabelItem)) as LabelItem;
+                    if (item == null)
+                        return;
+
+                    TabFormControl tc = (TabFormControl)this.Component;
+
+                    TypeDescriptor.GetProperties(item)["Text"].SetValue(item, item.Name);
+                    item.ItemAlignment = eItemAlignment.Far;
+
+                    IComponentChangeService cc = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+                    cc.OnComponentChanging(this.Component, TypeDescriptor.GetProperties(typeof(TabFormControl))["CaptionItems"]);
+
+                    tc.CaptionItems.Add(item);
+                    this.RecalcLayout();
+
+                    cc.OnComponentChanged(this.Component, TypeDescriptor.GetProperties(typeof(TabFormControl))["CaptionItems"], null, null);
+
+                    OnitemCreated(item);
+                }
+                catch
+                {
+                    trans.Cancel();
+                }
+                finally
+                {
+                    if (!trans.Canceled)
+                        trans.Commit();
+                    m_CreatingItem = false;
+                }
+            }
+        }
+
+        internal void CreateLabel()
+        {
+            CreateLabel(this, EventArgs.Empty);
+        }
+
+        internal void CreateComboBox()
+        {
+            CreateComboBox(this, EventArgs.Empty);
+        }
+
+        internal void CreateTextBox()
+        {
+            CreateTextBox(this, EventArgs.Empty);
+        }
+    }
+
+    internal class TabFormControlActionList : DesignerActionList
+    {
+        private TabFormControlDesigner _Designer = null;
+
+        /// <summary>
+        /// Initializes a new instance of the AdvTreeActionList class.
+        /// </summary>
+        /// <param name="designer"></param>
+        public TabFormControlActionList(TabFormControlDesigner designer)
+            : base(designer.Component)
+        {
+            _Designer = designer;
+        }
+
+        public override DesignerActionItemCollection GetSortedActionItems()
+        {
+            DesignerActionItemCollection items = new DesignerActionItemCollection();
+            string tabStripCategory = "Tab Strip";
+            items.Add(new DesignerActionHeaderItem(tabStripCategory));
+            string captionCategory = "Caption";
+            items.Add(new DesignerActionHeaderItem(captionCategory));
+
+            items.Add(new DesignerActionMethodItem(this, "CreateTab", "Create Tab", tabStripCategory, true));
+            items.Add(new DesignerActionMethodItem(this, "CreateButton", "Create Button", tabStripCategory, true));
+            items.Add(new DesignerActionMethodItem(this, "CreateLabel", "Create Label", tabStripCategory, true));
+            items.Add(new DesignerActionMethodItem(this, "CreateComboBox", "Create ComboBox", tabStripCategory, true));
+            items.Add(new DesignerActionMethodItem(this, "CreateTextBox", "Create TextBox", tabStripCategory, true));
+
+            items.Add(new DesignerActionMethodItem(this, "CreateCaptionButton", "Create Button", captionCategory, true));
+            items.Add(new DesignerActionMethodItem(this, "CreateCaptionLabel", "Create Label", captionCategory, true));
+            items.Add(new DesignerActionPropertyItem("CaptionVisible", "Caption visible?", captionCategory, "Indicates whether caption is visible"));
+
+            return items;
+        }
+
+        public void CreateCaptionButton()
+        {
+            _Designer.CreateCaptionButton();
+        }
+        public void CreateCaptionLabel()
+        {
+            _Designer.CreateCaptionLabel();
+        }
+
+        public void CreateTab()
+        {
+            _Designer.CreateTab(string.Empty);
+        }
+
+        public void CreateButton()
+        {
+            _Designer.CreateButton();
+        }
+
+        public void CreateLabel()
+        {
+            _Designer.CreateLabel();
+        }
+
+        public void CreateComboBox()
+        {
+            _Designer.CreateComboBox();
+        }
+
+        public void CreateTextBox()
+        {
+            _Designer.CreateTextBox();
+        }
+
+        public bool CaptionVisible
+        {
+            get
+            {
+                return ((TabFormControl)base.Component).CaptionVisible;
+            }
+            set
+            {
+                TypeDescriptor.GetProperties(base.Component)["CaptionVisible"].SetValue(base.Component, value);
+            }
+        }
+
+
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/TabFormItemDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/TabFormItemDesigner.cs
new file mode 100644
index 00000000..f57ae89b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/TabFormItemDesigner.cs	
@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.Design;
+using System.Text;
+
+namespace DevComponents.DotNetBar.Design
+{
+    /// <summary>
+    /// Represents Windows Forms designer for RibbonTabItem
+    /// </summary>
+    public class TabFormItemDesigner : BaseItemDesigner
+    {
+        public override DesignerVerbCollection Verbs
+        {
+            get
+            {
+                return null;
+            }
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/TabItemDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/TabItemDesigner.cs
new file mode 100644
index 00000000..13648cc5
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/TabItemDesigner.cs	
@@ -0,0 +1,42 @@
+using System;
+using System.Text;
+using System.ComponentModel.Design;
+using System.Collections;
+using System.ComponentModel;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Design
+{
+    /// <summary>
+    /// Defines Windows Forms designer for the TabItem object.
+    /// </summary>
+    public class TabItemDesigner : ComponentDesigner
+    {
+        protected override void PreFilterProperties(IDictionary properties)
+        {
+            base.PreFilterProperties(properties);
+            properties["Visible"] = TypeDescriptor.CreateProperty(typeof(TabItemDesigner), (PropertyDescriptor)properties["Visible"], new Attribute[]
+				{
+					new DefaultValueAttribute(true),
+					new BrowsableAttribute(true),
+					new CategoryAttribute("Layout")});
+        }
+
+        /// <summary>
+        /// Gets or sets whether item is visible.
+        /// </summary>
+        [DefaultValue(true), Browsable(true), Category("Layout"), Description("Gets or sets whether item is visible.")]
+        public bool Visible
+        {
+            get
+            {
+                return (bool)ShadowProperties["Visible"];
+            }
+            set
+            {
+                // this value is not passed to the actual control
+                this.ShadowProperties["Visible"] = value;
+            }
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/TabStripDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/TabStripDesigner.cs
new file mode 100644
index 00000000..18ba49c8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/TabStripDesigner.cs	
@@ -0,0 +1,508 @@
+using System;
+using System.Windows.Forms;
+using System.Windows.Forms.Design;
+using System.Collections;
+using System.Drawing;
+using System.ComponentModel.Design;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar.Design
+{
+	/// <summary>
+	/// Summary description for TabStripDesigner.
+	/// </summary>
+	public class TabStripDesigner:ParentControlDesigner
+	{
+		public TabStripDesigner()
+		{
+		}
+
+		public override void Initialize(IComponent component) 
+		{
+			base.Initialize(component);
+			if(!component.Site.DesignMode)
+				return;
+
+			ISelectionService ss =(ISelectionService)GetService(typeof(ISelectionService));
+			if(ss!=null)
+				ss.SelectionChanged+=new EventHandler(OnSelectionChanged);
+
+			// If our component is removed we need to clean-up
+			IComponentChangeService cc=(IComponentChangeService)GetService(typeof(IComponentChangeService));
+			if(cc!=null)
+				cc.ComponentRemoving+=new ComponentEventHandler(this.OnComponentRemoving);
+
+			TabStrip tabStrip=this.GetTabStrip();
+			if(tabStrip!=null)
+				tabStrip.TabMoved+=new TabStrip.TabMovedEventHandler(this.TabMoved);
+		}
+
+		protected override void Dispose(bool disposing)
+		{
+			ISelectionService ss =(ISelectionService)GetService(typeof(ISelectionService));
+			if(ss!=null)
+				ss.SelectionChanged-=new EventHandler(OnSelectionChanged);
+
+			// If our component is removed we need to clean-up
+			IComponentChangeService cc=(IComponentChangeService)GetService(typeof(IComponentChangeService));
+			if(cc!=null)
+				cc.ComponentRemoving-=new ComponentEventHandler(this.OnComponentRemoving);
+
+			base.Dispose(disposing);
+		}
+		public override DesignerVerbCollection Verbs 
+		{
+			get 
+			{
+				DesignerVerb[] verbs;
+				verbs = new DesignerVerb[]
+				{
+                    new DesignerVerb("Next Tab", new EventHandler(SelectNextTab)),
+                    new DesignerVerb("Previous Tab", new EventHandler(SelectPreviousTab)),
+                    new DesignerVerb("Create New Tab", new EventHandler(CreateNewTab))
+				};
+				return new DesignerVerbCollection(verbs);
+			}
+		}
+
+		protected virtual void CreateNewTab(object sender, EventArgs e)
+		{
+			IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+			TabStrip tabStrip=this.Control as TabStrip;
+			if(tabStrip==null || dh==null)
+				return;
+
+            DesignerTransaction dt = dh.CreateTransaction();
+            try
+            {
+                IComponentChangeService change = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+                if (change != null)
+                    change.OnComponentChanging(this.Component, null);
+
+                TabItem tab = dh.CreateComponent(typeof(TabItem)) as TabItem;
+                tab.Text = tab.Name;
+
+                tabStrip.Tabs.Add(tab);
+
+                if (change != null)
+                    change.OnComponentChanged(this.Component, null, null, null);
+            }
+            catch
+            {
+                dt.Cancel();
+            }
+            finally
+            {
+                if (!dt.Canceled) dt.Commit();
+            }
+		}
+
+        private void SelectNextTab(object sender, EventArgs e)
+        {
+            TabStrip tabStrip = this.Control as TabStrip;
+            if (tabStrip == null)
+                return;
+            if (tabStrip.SelectedTabIndex < tabStrip.Tabs.Count - 1)
+                TypeDescriptor.GetProperties(tabStrip)["SelectedTabIndex"].SetValue(tabStrip, tabStrip.SelectedTabIndex + 1);
+        }
+
+        private void SelectPreviousTab(object sender, EventArgs e)
+        {
+            TabStrip tabStrip = this.Control as TabStrip;
+            if (tabStrip == null)
+                return;
+            if (tabStrip.SelectedTabIndex >0)
+                TypeDescriptor.GetProperties(tabStrip)["SelectedTabIndex"].SetValue(tabStrip, tabStrip.SelectedTabIndex - 1);
+        }
+
+		private void TabMoved(object sender, TabStripTabMovedEventArgs e)
+		{
+			IComponentChangeService change=this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+			if(change!=null)
+			{
+				change.OnComponentChanging(this.Control,null);
+				change.OnComponentChanged(this.Control,null,null,null);
+			}
+		}
+
+		private void OnSelectionChanged(object sender, EventArgs e) 
+		{
+			TabStrip tabStrip=this.GetTabStrip();
+			if(tabStrip==null || tabStrip.IsDisposed)
+				return;
+			
+			ISelectionService ss = (ISelectionService)sender;
+			if(ss!=null && ss.PrimarySelection!=this.Control)
+			{
+				if(ss.PrimarySelection is TabItem && tabStrip.Tabs.Contains(ss.PrimarySelection as TabItem))
+				{
+					tabStrip.DesignTimeSelection=ss.PrimarySelection as TabItem;
+					return;
+				}
+			}
+			tabStrip.DesignTimeSelection=null;
+		}
+
+		protected bool m_InternalRemove=false;
+		private void OnComponentRemoving(object sender,ComponentEventArgs e)
+		{
+			InternalComponentRemoving(e);
+		}
+
+		protected virtual void InternalComponentRemoving(ComponentEventArgs e)
+		{
+			if(m_InternalRemove)
+				return;
+			IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+			if(dh==null)
+				return;
+
+			TabStrip tabStrip=this.GetTabStrip();
+			if(tabStrip==null || tabStrip.IsDisposed)
+				return;
+
+			if(e.Component is TabItem && this.Control!=null && tabStrip.Tabs.Contains(e.Component as TabItem))
+			{
+				try
+				{
+					TabItem item=e.Component as TabItem;
+					if(item.AttachedControl!=null && this.Control.Controls.Contains(item.AttachedControl))
+					{
+						this.Control.Controls.Remove(item.AttachedControl);
+						dh.DestroyComponent(item.AttachedControl);
+					}
+					tabStrip.Tabs.Remove(item);
+					tabStrip.RecalcSize();
+					tabStrip.Refresh();
+				}
+				finally
+				{
+					m_InternalRemove=false;
+				}
+			}
+            else if (e.Component == this.Control)
+            {
+                m_InternalRemove = true;
+                try
+                {
+                    TabStrip tabControl = this.Control as TabStrip;
+                    TabItem[] tabs = new TabItem[tabControl.Tabs.Count];
+                    tabControl.Tabs.CopyTo(tabs, 0);
+                    foreach (TabItem tab in tabs)
+                        dh.DestroyComponent(tab);
+                }
+                finally
+                {
+                    m_InternalRemove = false;
+                }
+            }
+		}
+
+		protected virtual TabStrip GetTabStrip()
+		{
+			return this.Control as TabStrip;
+		}
+
+        protected override void PreFilterProperties(IDictionary properties)
+        {
+            base.PreFilterProperties(properties);
+            if (this.Control is TabStrip)
+            {
+                properties["MdiTabbedDocuments"] = TypeDescriptor.CreateProperty(typeof(TabStripDesigner), (PropertyDescriptor)properties["MdiTabbedDocuments"], new Attribute[]
+				{
+					new DefaultValueAttribute(false)});
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether Tab-Strip control provides Tabbed MDI Child form support. Default value is false.
+        /// </summary>
+        [Browsable(true), Description("Indicates whether Tab-Strip control provides Tabbed MDI Child form support."), Category("Mdi Support"), DefaultValue(false)]
+        public bool MdiTabbedDocuments
+        {
+            get
+            {
+                return (bool)ShadowProperties["MdiTabbedDocuments"];
+            }
+            set
+            {
+                IDesignerHost dh = (IDesignerHost)GetService(typeof(IDesignerHost));
+                DesignerTransaction dt = null;
+                if (dh != null) dt = dh.CreateTransaction();
+
+                try
+                {
+                    // this value is not passed to the actual control
+                    this.ShadowProperties["MdiTabbedDocuments"] = value;
+                    TabStrip ts = this.Control as TabStrip;
+                    if (ts != null)
+                    {
+                        if (dh == null || dh.Loading)
+                            return;
+
+                        if (value)
+                        {
+                            TypeDescriptor.GetProperties(ts)["MdiForm"].SetValue(ts, null);
+                            
+                            System.Windows.Forms.Form f = dh.RootComponent as System.Windows.Forms.Form;
+                            TypeDescriptor.GetProperties(ts)["MdiForm"].SetValue(ts, f);
+                        }
+                        else
+                            TypeDescriptor.GetProperties(ts)["MdiForm"].SetValue(ts, null);
+                    }
+                }
+                catch
+                {
+                    if (dt != null) dt.Cancel();
+                    throw;
+                }
+                finally
+                {
+                    if (dt != null && !dt.Canceled) dt.Commit();
+                }
+            }
+        }
+
+#if FRAMEWORK20
+        public override void InitializeNewComponent(IDictionary defaultValues)
+        {
+            base.InitializeNewComponent(defaultValues);
+            SetDesignTimeDefaults();
+        }
+#else
+		public override void OnSetComponentDefaults()
+		{
+			base.OnSetComponentDefaults();
+			SetDesignTimeDefaults();
+		}
+#endif
+        private void SetDesignTimeDefaults()
+        {
+            if (this.Component == null || this.Component.Site == null || !this.Component.Site.DesignMode)
+                return;
+            TabStrip ts = this.Control as TabStrip;
+            if (ts != null)
+                ts.Style = eTabStripStyle.VS2005;
+            this.CreateNewTab(null, null);
+        }
+
+		public override System.Collections.ICollection AssociatedComponents
+		{
+			get
+			{
+				ArrayList c=new ArrayList(base.AssociatedComponents);
+				TabStrip tabStrip=this.GetTabStrip();
+				if(tabStrip!=null)
+				{
+					foreach(TabItem tab in tabStrip.Tabs)
+						c.Add(tab);
+				}
+
+				return c;
+			}
+		}
+		#region WndProc Support
+		/// <summary>
+		/// Selection support for items on container.
+		/// </summary>
+		private TabItem m_SelectItem=null;
+		protected override void WndProc(ref Message m)
+		{
+			System.Windows.Forms.Control ctrl=this.Control;
+			if(ctrl==null || ctrl.IsDisposed)
+			{
+				base.WndProc(ref m);
+				return;
+			}
+
+			switch(m.Msg)
+			{
+				case WinApi.WM_LBUTTONDOWN:
+				case WinApi.WM_RBUTTONDOWN:
+				{
+					if(OnMouseDown(ref m))
+						return;
+					break;
+				}
+				case WinApi.WM_RBUTTONUP:
+				case WinApi.WM_LBUTTONUP:
+				{
+					if(OnMouseUp(ref m))
+						return;
+
+					break;
+				}
+				case WinApi.WM_MOUSEMOVE:
+				{
+					if(OnMouseMove(ref m))
+						return;
+					break;
+				}
+				case WinApi.WM_MOUSELEAVE:
+				{
+					if(OnMouseLeave(ref m))
+						return;
+					break;
+				}
+				case WinApi.WM_USER+101:
+				{
+					if(OnProcessPendingSelection(ref m))
+						return;
+					break;
+				}
+			}
+
+			base.WndProc(ref m);
+		}
+
+		private bool m_IgnoreMouseUp=false;
+		private bool m_SelectTabControl=false;
+		protected virtual bool OnMouseDown(ref Message m)
+		{
+			TabStrip tabStrip=this.GetTabStrip();
+
+			if(tabStrip==null || tabStrip.IsDisposed || this.Control.IsDisposed)
+				return false;
+
+			Point pos=tabStrip.PointToClient(System.Windows.Forms.Control.MousePosition);
+			MouseEventArgs e=new MouseEventArgs(MouseButtons.Left,0,pos.X,pos.Y,0);
+			TabItem oldSelected=tabStrip.SelectedTab;
+			tabStrip.InternalOnMouseDown(e);
+
+			ISelectionService selection = (ISelectionService) this.GetService(typeof(ISelectionService));
+			TabItem selected=null;
+			if(selection!=null && selection.PrimarySelection is TabItem)
+				selected=selection.PrimarySelection as TabItem;
+
+			if(tabStrip.SelectedTab!=null && selected!=tabStrip.SelectedTab && tabStrip.HitTest(e.X,e.Y)!=null)
+			{
+				ArrayList arr=new ArrayList(1);
+				arr.Add(tabStrip.SelectedTab);
+#if FRAMEWORK20
+                selection.SetSelectedComponents(arr, SelectionTypes.Primary);
+#else
+                selection.SetSelectedComponents(arr,SelectionTypes.MouseDown);
+#endif
+
+                //m_SelectItem=tabStrip.SelectedTab;
+				//WinApi.PostMessage(m.HWnd.ToInt32(),WinApi.WM_USER+101,0,0);
+				m_IgnoreMouseUp=true;
+
+				if(m.Msg==WinApi.WM_RBUTTONDOWN)
+					this.OnContextMenu(System.Windows.Forms.Control.MousePosition.X,System.Windows.Forms.Control.MousePosition.Y);
+				return true;
+			}
+			else if(tabStrip.SelectedTab==oldSelected)
+			{
+				if(tabStrip.HitTest(e.X,e.Y)!=null)
+				{
+					if(m.Msg==WinApi.WM_RBUTTONDOWN)
+						this.OnContextMenu(System.Windows.Forms.Control.MousePosition.X,System.Windows.Forms.Control.MousePosition.Y);
+					return true;
+				}
+			}
+			
+			return false;
+		}
+
+		protected virtual bool OnMouseUp(ref Message m)
+		{
+			TabStrip tabStrip=this.GetTabStrip();
+			if(tabStrip==null || tabStrip.IsDisposed || this.Control.IsDisposed)
+				return false;
+
+			Point pos=tabStrip.PointToClient(System.Windows.Forms.Control.MousePosition);
+			MouseEventArgs e=new MouseEventArgs(MouseButtons.Left,0,pos.X,pos.Y,0);
+
+			tabStrip.InternalOnMouseUp(e);
+			
+			if(m_IgnoreMouseUp)
+			{
+				m_IgnoreMouseUp=false;
+				return true;
+			}
+
+			if(m_SelectTabControl)
+			{
+				m_SelectTabControl=false;
+				ISelectionService selection = (ISelectionService) this.GetService(typeof(ISelectionService));
+				if(selection!=null && selection.PrimarySelection!=this.Control && !(selection.PrimarySelection.GetType() == this.Control.GetType()))
+				{
+					ArrayList arr=new ArrayList(1);
+					arr.Add(this.Control);
+#if FRAMEWORK20
+                    selection.SetSelectedComponents(arr, SelectionTypes.Primary);
+#else
+                    selection.SetSelectedComponents(arr,SelectionTypes.Click);
+#endif
+                }
+			}
+
+			return false;
+		}
+
+		protected virtual bool OnMouseMove(ref Message m)
+		{
+			TabStrip tabStrip=this.GetTabStrip();
+			if(tabStrip==null || tabStrip.IsDisposed || this.Control.IsDisposed)
+				return false;
+
+			Point pos=tabStrip.PointToClient(System.Windows.Forms.Control.MousePosition);
+			MouseEventArgs e=new MouseEventArgs((m.WParam.ToInt32()==1?MouseButtons.Left:MouseButtons.None),0,pos.X,pos.Y,0);
+			tabStrip.InternalOnMouseMove(e);
+			if(tabStrip.DisplayRectangle.Contains(pos))
+				return true;
+
+			return false;
+		}
+
+		protected virtual bool OnMouseLeave(ref Message m)
+		{
+			TabStrip tabStrip=this.GetTabStrip();
+			if(tabStrip==null || tabStrip.IsDisposed || this.Control.IsDisposed)
+				return false;
+			tabStrip.InternalOnMouseLeave(new EventArgs());
+			return false;
+		}
+
+		protected virtual bool OnProcessPendingSelection(ref Message m)
+		{
+			return ProcessPendingSelection();
+		}
+
+		protected virtual bool ProcessPendingSelection()
+		{
+			TabStrip tabStrip=this.GetTabStrip();
+			if(tabStrip==null || tabStrip.IsDisposed || this.Control.IsDisposed)
+				return false;
+
+			if(m_SelectItem!=null)
+			{
+				tabStrip.DesignTimeSelection=m_SelectItem;
+				//Point pos=tabStrip.PointToClient(System.Windows.Forms.Control.MousePosition);
+				ISelectionService selection = (ISelectionService) this.GetService(typeof(ISelectionService));
+				if(selection==null)
+					return false;
+				ArrayList arr=new ArrayList(1);
+				arr.Add(m_SelectItem);
+#if FRAMEWORK20
+                selection.SetSelectedComponents(arr, SelectionTypes.Primary);
+#else
+                selection.SetSelectedComponents(arr,SelectionTypes.Click);
+#endif
+
+                m_SelectItem =null;
+
+				IComponentChangeService change=this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+				if(change!=null)
+				{
+					change.OnComponentChanging(this.Control,null);
+					change.OnComponentChanged(this.Control,null,null,null);
+				}
+				return true;
+			}
+			return false;
+		}
+		#endregion
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/TabStripTabsEditor.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/TabStripTabsEditor.cs
new file mode 100644
index 00000000..5273f44b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/TabStripTabsEditor.cs	
@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel.Design;
+
+namespace DevComponents.DotNetBar.Design
+{
+    /// <summary>
+    /// Support for TabStrip tabs design-time editor.
+    /// </summary>
+    public class TabStripTabsEditor : CollectionEditor
+    {
+        public TabStripTabsEditor(Type type)
+            : base(type)
+        {
+        }
+        protected override Type CreateCollectionItemType()
+        {
+            return typeof(TabItem);
+        }
+        protected override Type[] CreateNewItemTypes()
+        {
+            return new Type[] { typeof(TabItem) };
+        }
+        protected override object CreateInstance(Type itemType)
+        {
+            object item = base.CreateInstance(itemType);
+            if (item is TabItem)
+            {
+                TabItem tabItem = item as TabItem;
+                tabItem.Text = "My Tab";
+            }
+            return item;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/TextBoxDropDownDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/TextBoxDropDownDesigner.cs
new file mode 100644
index 00000000..f3a941bd
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/TextBoxDropDownDesigner.cs	
@@ -0,0 +1,180 @@
+#if FRAMEWORK20
+using System;
+using System.Text;
+using DevComponents.DotNetBar.Controls;
+using System.Windows.Forms.Design;
+using System.Collections;
+using DevComponents.DotNetBar.Rendering;
+using System.ComponentModel.Design;
+using System.Windows.Forms;
+using System.Drawing;
+using System.ComponentModel;
+using System.Runtime.InteropServices;
+
+namespace DevComponents.DotNetBar.Design
+{
+    public class TextBoxDropDownDesigner : ControlDesigner
+    {
+        public override void InitializeNewComponent(IDictionary defaultValues)
+        {
+            base.InitializeNewComponent(defaultValues);
+            TextBoxDropDown control = this.Control as TextBoxDropDown;
+            control.BackgroundStyle.Class = ElementStyleClassKeys.TextBoxBorderKey;
+            control.ButtonDropDown.Visible = true;
+            control.Height = control.PreferredHeight;
+            control.Text = "";
+            control.Style = eDotNetBarStyle.StyleManagerControlled;
+        }
+
+        public override SelectionRules SelectionRules
+        {
+            get
+            {
+                return (base.SelectionRules & ~(SelectionRules.BottomSizeable | SelectionRules.TopSizeable));
+            }
+        }
+
+        protected override void PreFilterProperties(IDictionary properties)
+        {
+            base.PreFilterProperties(properties);
+            string[] ta = new string[] { "PasswordChar" };
+            Attribute[] aa = new Attribute[0];
+            for (int num1 = 0; num1 < ta.Length; num1++)
+            {
+                PropertyDescriptor desc = (PropertyDescriptor)properties[ta[num1]];
+                if (desc != null)
+                {
+                    properties[ta[num1]] = TypeDescriptor.CreateProperty(typeof(TextBoxDropDownDesigner), desc, aa);
+                }
+            }
+
+            ta = new string[] { "Text" };
+            aa = new Attribute[0];
+            for (int num1 = 0; num1 < ta.Length; num1++)
+            {
+                PropertyDescriptor desc = (PropertyDescriptor)properties[ta[num1]];
+                if (desc != null)
+                {
+                    properties[ta[num1]] = TypeDescriptor.CreateProperty(typeof(TextBoxDropDownDesigner), desc, aa);
+                }
+            }
+
+        }
+
+        public void ResetText()
+        {
+            this.Control.Text = "";
+        }
+
+        public bool ShouldSerializeText()
+        {
+            return TypeDescriptor.GetProperties(typeof(TextBoxDropDownDesigner))["Text"].ShouldSerializeValue(base.Component);
+        }
+
+        public string Text
+        {
+            get
+            {
+                return this.Control.Text;
+            }
+            set
+            {
+                this.Control.Text = value;
+                ((TextBoxDropDown)this.Control).Select(0, 0);
+            }
+        }
+
+        public char PasswordChar
+        {
+            get
+            {
+                TextBoxDropDown box1 = this.Control as TextBoxDropDown;
+                if (box1.UseSystemPasswordChar)
+                {
+                    box1.UseSystemPasswordChar = false;
+                    char ch1 = box1.PasswordChar;
+                    box1.UseSystemPasswordChar = true;
+                    return ch1;
+                }
+                return box1.PasswordChar;
+            }
+            set
+            {
+                TextBoxDropDown box1 = this.Control as TextBoxDropDown;
+                box1.PasswordChar = value;
+            }
+        }
+
+        private DesignerActionListCollection m_ActionLists;
+        public override DesignerActionListCollection ActionLists
+        {
+            get
+            {
+                if (m_ActionLists == null)
+                {
+                    m_ActionLists = new DesignerActionListCollection();
+                    object o = this.GetType().Assembly.CreateInstance("System.Windows.Forms.Design.TextBoxActionList", false, System.Reflection.BindingFlags.NonPublic, null, new object[] { this }, null, null);
+                    if (o != null)
+                        m_ActionLists.Add(o as DesignerActionList);
+                }
+                return m_ActionLists;
+            }
+        }
+
+        public override IList SnapLines
+        {
+            get
+            {
+                ArrayList sl = base.SnapLines as ArrayList;
+                int textBaseLine = GetTextBaseline(this.Control, ContentAlignment.TopLeft);
+                BorderStyle border = BorderStyle.FixedSingle;
+                if (border == BorderStyle.FixedSingle || border == BorderStyle.None)
+                {
+                    textBaseLine += 2;
+                }
+                else if (border == BorderStyle.Fixed3D)
+                {
+                    textBaseLine += 3;
+                }
+                sl.Add(new System.Windows.Forms.Design.Behavior.SnapLine(System.Windows.Forms.Design.Behavior.SnapLineType.Baseline, textBaseLine, System.Windows.Forms.Design.Behavior.SnapLinePriority.Medium));
+                return sl;
+            }
+        }
+
+        private static int GetTextBaseline(Control ctrl, ContentAlignment alignment)
+        {
+            Rectangle clientRect = ctrl.ClientRectangle;
+            int ascent = 0;
+            int height = 0;
+            using (Graphics g = ctrl.CreateGraphics())
+            {
+                IntPtr hdc = g.GetHdc();
+                IntPtr hFont = ctrl.Font.ToHfont();
+                try
+                {
+                    IntPtr oldObject = WinApi.SelectObject(hdc, hFont);
+                    WinApi.TEXTMETRIC tm = new WinApi.TEXTMETRIC();
+                    WinApi.GetTextMetrics(new HandleRef(ctrl, hdc), tm);
+                    ascent = tm.tmAscent + 1;
+                    height = tm.tmHeight;
+                    WinApi.SelectObject(hdc, oldObject);
+                }
+                finally
+                {
+                    WinApi.DeleteObject(hFont);
+                    g.ReleaseHdc(hdc);
+                }
+            }
+            if ((alignment & (ContentAlignment.TopRight | ContentAlignment.TopCenter | ContentAlignment.TopLeft)) != (ContentAlignment)0)
+            {
+                return (clientRect.Top + ascent);
+            }
+            if ((alignment & (ContentAlignment.MiddleRight | ContentAlignment.MiddleCenter | ContentAlignment.MiddleLeft)) != (ContentAlignment)0)
+            {
+                return (((clientRect.Top + (clientRect.Height / 2)) - (height / 2)) + ascent);
+            }
+            return ((clientRect.Bottom - height) + ascent);
+        }
+    }
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/TextBoxItemDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/TextBoxItemDesigner.cs
new file mode 100644
index 00000000..bc834148
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/TextBoxItemDesigner.cs	
@@ -0,0 +1,74 @@
+using System;
+using System.Text;
+using System.ComponentModel;
+using System.Collections;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Design
+{
+    public class TextBoxItemDesigner : SimpleBaseItemDesigner
+    {
+        protected override void PreFilterProperties(IDictionary properties)
+        {
+            base.PreFilterProperties(properties);
+            properties["WatermarkText"] = TypeDescriptor.CreateProperty(typeof(TextBoxItemDesigner), (PropertyDescriptor)properties["WatermarkText"], null);
+            properties["WatermarkBehavior"] = TypeDescriptor.CreateProperty(typeof(TextBoxItemDesigner), (PropertyDescriptor)properties["WatermarkBehavior"], null);
+            properties["WatermarkColor"] = TypeDescriptor.CreateProperty(typeof(TextBoxItemDesigner), (PropertyDescriptor)properties["WatermarkColor"], null);
+            properties["WatermarkEnabled"] = TypeDescriptor.CreateProperty(typeof(TextBoxItemDesigner), (PropertyDescriptor)properties["WatermarkEnabled"], null);
+            properties["WatermarkFont"] = TypeDescriptor.CreateProperty(typeof(TextBoxItemDesigner), (PropertyDescriptor)properties["WatermarkFont"], null);
+        }
+
+        // <summary>
+        /// Gets or sets the watermark (tip) text displayed inside of the control when Text is not set and control does not have input focus. This property supports text-markup.
+        /// </summary>
+        [Browsable(true), DefaultValue(""), Localizable(true), Category("Appearance"), Description("Indicates watermark text displayed inside of the control when Text is not set and control does not have input focus."), Editor(typeof(Design.TextMarkupUIEditor), typeof(System.Drawing.Design.UITypeEditor))]
+        public string WatermarkText
+        {
+            get { return (string)ShadowProperties["WatermarkText"]; }
+            set
+            {
+                ShadowProperties["WatermarkText"] = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the watermark hiding behaviour. Default value indicates that watermark is hidden when control receives input focus.
+        /// </summary>
+        [DefaultValue(eWatermarkBehavior.HideOnFocus), Category("Behavior"), Description("Indicates watermark hiding behaviour.")]
+        public eWatermarkBehavior WatermarkBehavior
+        {
+            get { return (eWatermarkBehavior)ShadowProperties["WatermarkBehavior"]; }
+            set { ShadowProperties["WatermarkBehavior"] = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the watermark text color.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), Description("Indicates watermark text color.")]
+        public Color WatermarkColor
+        {
+            get { return (Color)ShadowProperties["WatermarkColor"]; }
+            set { ShadowProperties["WatermarkColor"] = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether watermark text is displayed when control is empty. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Description("Indicates whether watermark text is displayed when control is empty.")]
+        public bool WatermarkEnabled
+        {
+            get { return (bool)ShadowProperties["WatermarkEnabled"]; }
+            set { ShadowProperties["WatermarkEnabled"] = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the watermark font.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), Description("Indicates watermark font."), DefaultValue(null)]
+        public Font WatermarkFont
+        {
+            get { return (Font)ShadowProperties["WatermarkFont"]; }
+            set { ShadowProperties["WatermarkFont"] = value; }
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/TextBoxXDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/TextBoxXDesigner.cs
new file mode 100644
index 00000000..999f664d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/TextBoxXDesigner.cs	
@@ -0,0 +1,221 @@
+using System;
+using System.Text;
+using System.Windows.Forms;
+using System.Collections;
+using System.ComponentModel;
+using System.Windows.Forms.Design;
+using DevComponents.DotNetBar.Controls;
+using DevComponents.DotNetBar.Rendering;
+using System.ComponentModel.Design;
+using System.Drawing;
+using System.Runtime.InteropServices;
+
+namespace DevComponents.DotNetBar.Design
+{
+    public class TextBoxXDesigner : ControlDesigner
+    {
+#if FRAMEWORK20
+        public override void InitializeNewComponent(IDictionary defaultValues)
+        {
+            base.InitializeNewComponent(defaultValues);
+            SetDesignTimeDefaults();
+        }
+#else
+		public override void OnSetComponentDefaults()
+		{
+			base.OnSetComponentDefaults();
+			SetDesignTimeDefaults();
+		}
+#endif
+
+        private void SetDesignTimeDefaults()
+        {
+            PropertyDescriptor descriptor1 = TypeDescriptor.GetProperties(base.Component)["Text"];
+            if (descriptor1 != null && descriptor1.PropertyType == typeof(string) && !descriptor1.IsReadOnly && descriptor1.IsBrowsable)
+                descriptor1.SetValue(base.Component, "");
+            TextBoxX tx = this.Control as TextBoxX;
+            tx.Border.Class = ElementStyleClassKeys.TextBoxBorderKey;
+            tx.SetAutoHeight();
+            tx.PreventEnterBeep = true;
+        }
+
+        protected override void PreFilterProperties(IDictionary properties)
+        {
+            base.PreFilterProperties(properties);
+            string[] ta = new string[] { "PasswordChar" };
+            Attribute[] aa = new Attribute[0];
+            for (int num1 = 0; num1 < ta.Length; num1++)
+            {
+                PropertyDescriptor desc = (PropertyDescriptor)properties[ta[num1]];
+                if (desc != null)
+                {
+                    properties[ta[num1]] = TypeDescriptor.CreateProperty(typeof(TextBoxXDesigner), desc, aa);
+                }
+            }
+
+            ta = new string[] { "Text" };
+            aa = new Attribute[0];
+            for (int num1 = 0; num1 < ta.Length; num1++)
+            {
+                PropertyDescriptor desc = (PropertyDescriptor)properties[ta[num1]];
+                if (desc != null)
+                {
+                    properties[ta[num1]] = TypeDescriptor.CreateProperty(typeof(TextBoxXDesigner), desc, aa);
+                }
+            }
+
+        }
+
+        public void ResetText()
+        {
+            this.Control.Text = "";
+        }
+
+        public bool ShouldSerializeText()
+        {
+            return TypeDescriptor.GetProperties(typeof(TextBoxX))["Text"].ShouldSerializeValue(base.Component);
+        }
+
+        public string Text
+        {
+            get
+            {
+                return this.Control.Text;
+            }
+            set
+            {
+                this.Control.Text = value;
+                ((TextBoxX)this.Control).Select(0, 0);
+            }
+        }
+ 
+        public char PasswordChar
+        {
+            get
+            {
+                TextBox box1 = this.Control as TextBox;
+#if FRAMEWORK20
+                if (box1.UseSystemPasswordChar)
+                {
+                    box1.UseSystemPasswordChar = false;
+                    char ch1 = box1.PasswordChar;
+                    box1.UseSystemPasswordChar = true;
+                    return ch1;
+                }
+#endif
+                return box1.PasswordChar;
+            }
+            set
+            {
+                TextBox box1 = this.Control as TextBox;
+                box1.PasswordChar = value;
+            }
+        }
+
+        public override SelectionRules SelectionRules
+        {
+            get
+            {
+                SelectionRules sr = base.SelectionRules;
+                object o = base.Component;
+                sr |= SelectionRules.AllSizeable;
+                PropertyDescriptor desc = TypeDescriptor.GetProperties(o)["Multiline"];
+                if (desc != null)
+                {
+                    object o2 = desc.GetValue(o);
+                    if ((o2 is bool) && !((bool)o2))
+                    {
+                        PropertyDescriptor desc2 = TypeDescriptor.GetProperties(o)["AutoSize"];
+                        if (desc2 != null)
+                        {
+                            object o3 = desc2.GetValue(o);
+                            if ((o3 is bool) && ((bool)o3))
+                            {
+                                sr &= ~(SelectionRules.BottomSizeable | SelectionRules.TopSizeable);
+                            }
+                        }
+                    }
+                }
+                return sr;
+            }
+        }
+ 
+#if FRAMEWORK20
+        private DesignerActionListCollection m_ActionLists;
+        public override DesignerActionListCollection ActionLists
+        {
+            get
+            {
+                if (m_ActionLists == null)
+                {
+                    m_ActionLists = new DesignerActionListCollection();
+                    object o = this.GetType().Assembly.CreateInstance("System.Windows.Forms.Design.TextBoxActionList", false, System.Reflection.BindingFlags.NonPublic, null, new object[] { this }, null, null);
+                    if (o != null)
+                        m_ActionLists.Add(o as DesignerActionList);
+                }
+                return m_ActionLists;
+            }
+        }
+
+        public override IList SnapLines
+        {
+            get
+            {
+                ArrayList sl = base.SnapLines as ArrayList;
+                int textBaseLine = GetTextBaseline(this.Control, ContentAlignment.TopLeft);
+                BorderStyle border = BorderStyle.Fixed3D;
+                PropertyDescriptor d = TypeDescriptor.GetProperties(base.Component)["BorderStyle"];
+                if (d != null)
+                {
+                    border = (BorderStyle)d.GetValue(base.Component);
+                }
+                if (border == BorderStyle.FixedSingle || border == BorderStyle.None)
+                {
+                    textBaseLine += 2;
+                }
+                else if (border == BorderStyle.Fixed3D)
+                {
+                    textBaseLine += 3;
+                }
+                sl.Add(new System.Windows.Forms.Design.Behavior.SnapLine(System.Windows.Forms.Design.Behavior.SnapLineType.Baseline, textBaseLine, System.Windows.Forms.Design.Behavior.SnapLinePriority.Medium));
+                return sl;
+            }
+        }
+
+        private static int GetTextBaseline(Control ctrl, ContentAlignment alignment)
+        {
+            Rectangle clientRect = ctrl.ClientRectangle;
+            int ascent = 0;
+            int height = 0;
+            using (Graphics g = ctrl.CreateGraphics())
+            {
+                IntPtr hdc = g.GetHdc();
+                IntPtr hFont = ctrl.Font.ToHfont();
+                try
+                {
+                    IntPtr oldObject = WinApi.SelectObject(hdc, hFont);
+                    WinApi.TEXTMETRIC tm = new WinApi.TEXTMETRIC();
+                    WinApi.GetTextMetrics(new HandleRef(ctrl, hdc), tm);
+                    ascent = tm.tmAscent + 1;
+                    height = tm.tmHeight;
+                    WinApi.SelectObject(hdc, oldObject);
+                }
+                finally
+                {
+                    WinApi.DeleteObject(hFont);
+                    g.ReleaseHdc(hdc);
+                }
+            }
+            if ((alignment & (ContentAlignment.TopRight | ContentAlignment.TopCenter | ContentAlignment.TopLeft)) != (ContentAlignment)0)
+            {
+                return (clientRect.Top + ascent);
+            }
+            if ((alignment & ( ContentAlignment.MiddleRight | ContentAlignment.MiddleCenter | ContentAlignment.MiddleLeft)) != (ContentAlignment)0)
+            {
+                return (((clientRect.Top + (clientRect.Height / 2)) - (height / 2)) + ascent);
+            }
+            return ((clientRect.Bottom - height) + ascent);
+        }
+#endif
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/TextMarkupEditor.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/TextMarkupEditor.cs
new file mode 100644
index 00000000..5841c765
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/TextMarkupEditor.cs	
@@ -0,0 +1,324 @@
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.Drawing;
+using System.Data;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Design
+{
+	/// <summary>
+	/// Summary description for TextMarkupEditor.
+	/// </summary>
+	[ToolboxItem(false)]
+    public class TextMarkupEditor : PanelEx
+    {
+        public System.Windows.Forms.Button buttonCancel;
+		public System.Windows.Forms.Button buttonOK;
+		private System.Windows.Forms.Timer timer1;
+		private DevComponents.DotNetBar.PanelEx previewPanel;
+		public System.Windows.Forms.TextBox inputText;
+        private Label label2;
+		private System.ComponentModel.IContainer components;
+        private Bar bar1;
+        private ButtonItem buttonBold;
+        private ButtonItem buttonItalic;
+        private ButtonItem buttonUnderline;
+        private ColorPickerDropDown buttonColor;
+        private SuperTooltipControl m_Tooltip = null;
+
+		public TextMarkupEditor()
+		{
+			// This call is required by the Windows.Forms Form Designer.
+			InitializeComponent();
+
+			this.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
+			this.ApplyLabelStyle();
+			this.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder;
+			this.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+            this.TabStop = false;
+		}
+
+		/// <summary> 
+		/// Clean up any resources being used.
+		/// </summary>
+		protected override void Dispose( bool disposing )
+		{
+			if( disposing )
+			{
+				if(components != null)
+				{
+					components.Dispose();
+				}
+			}
+			base.Dispose( disposing );
+		}
+
+		#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.inputText = new System.Windows.Forms.TextBox();
+            this.previewPanel = new DevComponents.DotNetBar.PanelEx();
+            this.buttonCancel = new System.Windows.Forms.Button();
+            this.buttonOK = new System.Windows.Forms.Button();
+            this.timer1 = new System.Windows.Forms.Timer(this.components);
+            this.label2 = new System.Windows.Forms.Label();
+            this.bar1 = new DevComponents.DotNetBar.Bar();
+            this.buttonBold = new DevComponents.DotNetBar.ButtonItem();
+            this.buttonItalic = new DevComponents.DotNetBar.ButtonItem();
+            this.buttonUnderline = new DevComponents.DotNetBar.ButtonItem();
+            this.buttonColor = new DevComponents.DotNetBar.ColorPickerDropDown();
+            ((System.ComponentModel.ISupportInitialize)(this.bar1)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // inputText
+            // 
+            this.inputText.AcceptsReturn = true;
+            this.inputText.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+                        | System.Windows.Forms.AnchorStyles.Left)
+                        | System.Windows.Forms.AnchorStyles.Right)));
+            this.inputText.Location = new System.Drawing.Point(8, 8);
+            this.inputText.Multiline = true;
+            this.inputText.Name = "inputText";
+            this.inputText.Size = new System.Drawing.Size(332, 110);
+            this.inputText.TabIndex = 0;
+            this.inputText.TextChanged += new System.EventHandler(this.inputText_TextChanged);
+            // 
+            // previewPanel
+            // 
+            this.previewPanel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
+                        | System.Windows.Forms.AnchorStyles.Right)));
+            this.previewPanel.AutoScroll = true;
+            this.previewPanel.CanvasColor = System.Drawing.SystemColors.Control;
+            this.previewPanel.Location = new System.Drawing.Point(8, 152);
+            this.previewPanel.Name = "previewPanel";
+            this.previewPanel.Size = new System.Drawing.Size(332, 75);
+            this.previewPanel.Style.BackColor1.Color = System.Drawing.Color.White;
+            this.previewPanel.Style.BackgroundImagePosition = DevComponents.DotNetBar.eBackgroundImagePosition.Tile;
+            this.previewPanel.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+            this.previewPanel.Style.BorderColor.Color = System.Drawing.Color.DarkGray;
+            this.previewPanel.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText;
+            this.previewPanel.Style.GradientAngle = 90;
+            this.previewPanel.Style.LineAlignment = System.Drawing.StringAlignment.Near;
+            this.previewPanel.TabIndex = 1;
+            // 
+            // buttonCancel
+            // 
+            this.buttonCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+            this.buttonCancel.FlatStyle = System.Windows.Forms.FlatStyle.System;
+            this.buttonCancel.Location = new System.Drawing.Point(269, 233);
+            this.buttonCancel.Name = "buttonCancel";
+            this.buttonCancel.Size = new System.Drawing.Size(71, 24);
+            this.buttonCancel.TabIndex = 4;
+            this.buttonCancel.Text = "Cancel";
+            this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click);
+            // 
+            // buttonOK
+            // 
+            this.buttonOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonOK.DialogResult = System.Windows.Forms.DialogResult.OK;
+            this.buttonOK.FlatStyle = System.Windows.Forms.FlatStyle.System;
+            this.buttonOK.Location = new System.Drawing.Point(194, 233);
+            this.buttonOK.Name = "buttonOK";
+            this.buttonOK.Size = new System.Drawing.Size(71, 24);
+            this.buttonOK.TabIndex = 3;
+            this.buttonOK.Text = "OK";
+            this.buttonOK.Click += new System.EventHandler(this.buttonOK_Click);
+            // 
+            // timer1
+            // 
+            this.timer1.Interval = 1000;
+            this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
+            // 
+            // label2
+            // 
+            this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.label2.BackColor = System.Drawing.Color.WhiteSmoke;
+            this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.label2.Location = new System.Drawing.Point(316, 133);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(24, 16);
+            this.label2.TabIndex = 5;
+            this.label2.Text = "?";
+            this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            this.label2.MouseLeave += new System.EventHandler(this.label2_MouseLeave);
+            this.label2.MouseEnter += new System.EventHandler(this.label2_MouseEnter);
+            // 
+            // bar1
+            // 
+            this.bar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+            this.buttonBold,
+            this.buttonItalic,
+            this.buttonUnderline,
+            this.buttonColor});
+            this.bar1.Location = new System.Drawing.Point(8, 124);
+            this.bar1.Name = "bar1";
+            this.bar1.Size = new System.Drawing.Size(174, 25);
+            this.bar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.Office2007;
+            this.bar1.TabIndex = 6;
+            this.bar1.TabStop = false;
+            this.bar1.Text = "bar1";
+            // 
+            // buttonBold
+            // 
+            this.buttonBold.Name = "buttonBold";
+            this.buttonBold.Shortcuts.Add(DevComponents.DotNetBar.eShortcut.CtrlB);
+            this.buttonBold.Text = "Bold";
+            this.buttonBold.Click += new System.EventHandler(this.buttonBold_Click);
+            // 
+            // buttonItalic
+            // 
+            this.buttonItalic.Name = "buttonItalic";
+            this.buttonItalic.Shortcuts.Add(DevComponents.DotNetBar.eShortcut.CtrlI);
+            this.buttonItalic.Text = "Italic";
+            this.buttonItalic.Click += new System.EventHandler(this.buttonItalic_Click);
+            // 
+            // buttonUnderline
+            // 
+            this.buttonUnderline.Name = "buttonUnderline";
+            this.buttonUnderline.Shortcuts.Add(DevComponents.DotNetBar.eShortcut.CtrlU);
+            this.buttonUnderline.Text = "Underline";
+            this.buttonUnderline.Click += new System.EventHandler(this.buttonUnderline_Click);
+            // 
+            // buttonColor
+            // 
+            this.buttonColor.Name = "buttonColor";
+            this.buttonColor.Tooltip = "Sets the text color";
+            this.buttonColor.Image = Helpers.LoadBitmap("SystemImages.ColorPickerButtonImage.png");
+            this.buttonColor.SelectedColorImageRectangle = new System.Drawing.Rectangle(2, 2, 12, 12);
+            this.buttonColor.Click += new System.EventHandler(this.buttonColor_SelectedColorChanged);
+            // 
+            // TextMarkupEditor
+            // 
+            this.Controls.Add(this.bar1);
+            this.Controls.Add(this.label2);
+            this.Controls.Add(this.buttonOK);
+            this.Controls.Add(this.buttonCancel);
+            this.Controls.Add(this.previewPanel);
+            this.Controls.Add(this.inputText);
+            this.Name = "TextMarkupEditor";
+            this.Size = new System.Drawing.Size(348, 263);
+            ((System.ComponentModel.ISupportInitialize)(this.bar1)).EndInit();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+		}
+
+        void buttonCancel_Click(object sender, EventArgs e)
+        {
+            DestroyTooltip();
+            this.DialogResult = DialogResult.Cancel;
+        }
+
+        void buttonOK_Click(object sender, EventArgs e)
+        {
+            DestroyTooltip();
+            this.DialogResult = DialogResult.OK;
+        }
+		#endregion
+
+		private void inputText_TextChanged(object sender, System.EventArgs e)
+		{
+			timer1.Stop();
+			timer1.Start();
+		}
+
+		private void timer1_Tick(object sender, System.EventArgs e)
+		{
+			timer1.Stop();
+            UpdatePreview();
+		}
+
+        private void UpdatePreview()
+        {
+            previewPanel.Text = inputText.Text;
+        }
+
+        protected override void OnGotFocus(EventArgs e)
+        {
+            base.OnGotFocus(e);
+            inputText.Focus();
+        }
+
+        private void label2_MouseEnter(object sender, EventArgs e)
+        {
+            DestroyTooltip();
+
+            m_Tooltip = new SuperTooltipControl();
+            m_Tooltip.AntiAlias = false;
+            SuperTooltipInfo info = new SuperTooltipInfo();
+            info.HeaderText = "Markup tags available";
+            info.BodyText = "<b>b</b> - Bold <br/>" +
+                "<b>i</b> - Italic <br/>" +
+                "<b>u</b> - Underline <br/>" +
+                "<b>p</b> - Paragraph container, <b>width</b> attribute indicates width of block element <br/>" +
+                "<b>div</b> - Block-level container, <b>width</b> attribute indicates width of block element<br/>" +
+                "<b>span</b> - Inline container, <b>width</b> attribute indicates width of block element. Can be used to create tables<br/>" +
+                "<b>br</b> - Line break<br/>" +
+                "<b>font</b> - Changes font, color, size. <b>size</b> attribute indicates absolute or relative font size. <b>color</b> attribute to change the color" +
+                "You can use relative sizing for example +1 to increase font size by one point or -1 to decrease by one point. <b>face</b> attribute can be employed to set the specific font name to use.<br/>" +
+                "<b>h1</b> - Header markup. You can use h1, h2, h3, h4, h5, h6 to represent header sizes<br/>" +
+                "<b>a</b> - Denotes hypertext link. <b>href</b> and <b>name</b> attributes are supported<br/>" +
+                "<b>expand</b> - Displays the expand part of the button" +
+                "<br/>All tags must be lower case and they must be well formed i.e. each tag must be closed with end tag or be an empty tag.";
+            info.Color = eTooltipColor.Default;
+            Point p = label2.PointToScreen(new Point(0, label2.Height + 1));
+            m_Tooltip.ShowTooltip(info, p.X, p.Y, true);
+        }
+
+        private void DestroyTooltip()
+        {
+            if (m_Tooltip == null)
+                return;
+            m_Tooltip.Hide();
+            m_Tooltip.Dispose();
+            m_Tooltip = null;
+        }
+
+        private void label2_MouseLeave(object sender, EventArgs e)
+        {
+            DestroyTooltip();
+        }
+
+        private void buttonBold_Click(object sender, EventArgs e)
+        {
+            ApplyTag("<b>", "</b>");
+        }
+
+        private void buttonItalic_Click(object sender, EventArgs e)
+        {
+            ApplyTag("<i>", "</i>");
+        }
+
+        private void buttonUnderline_Click(object sender, EventArgs e)
+        {
+            ApplyTag("<u>", "</u>");
+        }
+
+        private void buttonColor_SelectedColorChanged(object sender, EventArgs e)
+        {
+            ApplyTag("<font color=\"" + GetHexColor(buttonColor.SelectedColor) +"\">", "</font>");
+        }
+
+        private void ApplyTag(string startTag, string endTag)
+        {
+            if (inputText.SelectionLength == 0)
+                inputText.SelectedText = startTag + endTag;
+            else
+                inputText.SelectedText = startTag + inputText.SelectedText + endTag;
+
+            UpdatePreview();
+        }
+
+        private string GetHexColor(Color color)
+        {
+            return "#" + color.R.ToString("X02") + color.G.ToString("X02") + color.B.ToString("X02");
+        }
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/TextMarkupEditor.resx b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/TextMarkupEditor.resx
new file mode 100644
index 00000000..fce63f71
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/TextMarkupEditor.resx	
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/TextMarkupUIEditor.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/TextMarkupUIEditor.cs
new file mode 100644
index 00000000..b1b7e496
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/TextMarkupUIEditor.cs	
@@ -0,0 +1,72 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Windows.Forms.Design;
+using System.Windows.Forms;
+using System.ComponentModel.Design;
+using System.Collections;
+
+namespace DevComponents.DotNetBar.Design
+{
+    public class TextMarkupUIEditor : System.Drawing.Design.UITypeEditor
+    {
+        #region Private Variables
+        private IWindowsFormsEditorService m_EditorService = null;
+        #endregion
+
+        #region Internal Implementation
+        public override object EditValue(ITypeDescriptorContext context, IServiceProvider provider, object value)
+        {
+            if (context != null
+                && context.Instance != null
+                && provider != null)
+            {
+                m_EditorService = provider.GetService(typeof(IWindowsFormsEditorService)) as IWindowsFormsEditorService;
+
+                if (m_EditorService != null)
+                {
+                    TextMarkupEditor editor = new TextMarkupEditor();
+                    editor.buttonOK.Click += new EventHandler(MarkupEditorButtonClick);
+                    editor.buttonCancel.Click += new EventHandler(MarkupEditorButtonClick);
+                    
+                    if(value!=null)
+                        editor.inputText.Text = value.ToString();
+
+                    m_EditorService.DropDownControl(editor);
+
+                    if (editor.DialogResult == DialogResult.OK)
+                    {
+                        string text = editor.inputText.Text;
+                        editor.Dispose();
+                        return text;
+                    }
+                    editor.Dispose();
+                }
+            }
+
+            return value;
+        }
+
+        void MarkupEditorButtonClick(object sender, EventArgs e)
+        {
+            if (m_EditorService != null)
+                m_EditorService.CloseDropDown();
+        }
+
+        /// <summary>
+        /// Gets the editor style used by the EditValue method.
+        /// </summary>
+        /// <param name="context">An ITypeDescriptorContext that can be used to gain additional context information.</param>
+        /// <returns>A UITypeEditorEditStyle value that indicates the style of editor used by EditValue. If the UITypeEditor does not support this method, then GetEditStyle will return None</returns>
+        public override UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext context)
+        {
+            if (context != null && context.Instance != null)
+            {
+                return UITypeEditorEditStyle.DropDown;
+            }
+            return base.GetEditStyle(context);
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/TimeZoneSelectionEditor.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/TimeZoneSelectionEditor.cs
new file mode 100644
index 00000000..c11c9e28
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/TimeZoneSelectionEditor.cs	
@@ -0,0 +1,76 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows.Forms.Design;
+using System.ComponentModel;
+using System.Windows.Forms;
+using System.Drawing.Design;
+
+namespace DevComponents.DotNetBar.Design
+{
+    /// <summary>
+    /// Represents editor for Time-Zone ID selection.
+    /// </summary>
+    public class TimeZoneSelectionEditor : System.Drawing.Design.UITypeEditor
+    {
+        #region Constructor
+
+        #endregion
+
+        #region Implementation
+        private IWindowsFormsEditorService _EditorService = null;
+
+        public override object EditValue(ITypeDescriptorContext context, IServiceProvider provider, object value)
+        {
+            if (context != null
+                && context.Instance != null
+                && provider != null)
+            {
+                ElementStyle es = value as ElementStyle;
+
+                _EditorService = provider.GetService(typeof(IWindowsFormsEditorService)) as IWindowsFormsEditorService;
+
+                if (_EditorService != null)
+                {
+                    ListBox lb = new ListBox();
+                    List<DevComponents.Schedule.TimeZoneInfo> timeZonesList = DevComponents.Schedule.TimeZoneInfo.GetSystemTimeZones();
+                    int selectedIndex = -1;
+                    for (int i = 0; i < timeZonesList.Count; i++)
+                    {
+                        DevComponents.Schedule.TimeZoneInfo timeZoneInfo = timeZonesList[i];
+                        lb.Items.Add(timeZoneInfo.Id);
+                        if (timeZoneInfo.Id.Equals((string)value))
+                            selectedIndex = i;
+                    }
+                    lb.SelectedIndex = selectedIndex;
+                    lb.SelectedIndexChanged += new EventHandler(this.SelectedChanged);
+                    _EditorService.DropDownControl(lb);
+                    return lb.SelectedItem;
+                }
+            }
+
+            return value;
+        }
+
+        private void SelectedChanged(object sender, EventArgs e)
+        {
+            if (_EditorService != null)
+                _EditorService.CloseDropDown();
+        }
+
+        /// <summary>
+        /// Gets the editor style used by the EditValue method.
+        /// </summary>
+        /// <param name="context">An ITypeDescriptorContext that can be used to gain additional context information.</param>
+        /// <returns>A UITypeEditorEditStyle value that indicates the style of editor used by EditValue. If the UITypeEditor does not support this method, then GetEditStyle will return None</returns>
+        public override UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext context)
+        {
+            if (context != null && context.Instance != null)
+            {
+                return UITypeEditorEditStyle.DropDown;
+            }
+            return base.GetEditStyle(context);
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/TokenEditorDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/TokenEditorDesigner.cs
new file mode 100644
index 00000000..11e924f6
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/TokenEditorDesigner.cs	
@@ -0,0 +1,56 @@
+using DevComponents.DotNetBar.Controls;
+using DevComponents.DotNetBar.Rendering;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.ComponentModel.Design;
+using System.Text;
+using System.Windows.Forms.Design;
+
+namespace DevComponents.DotNetBar.Design
+{
+    public class TokenEditorDesigner : ControlDesigner
+    {
+        #region Private Variables
+        #endregion
+
+        #region Constructor
+        #endregion
+
+        #region Internal Implementation
+        public override void Initialize(System.ComponentModel.IComponent component)
+        {
+            base.Initialize(component);
+            if (component == null || component.Site == null || !component.Site.DesignMode)
+                return;
+
+            IDesignerHost dh = this.GetService(typeof(IDesignerHost)) as IDesignerHost;
+            if (dh != null)
+                dh.LoadComplete += DesignerLoadComplete;
+        }
+        private void DesignerLoadComplete(object sender, EventArgs e)
+        {
+            IDesignerHost dh = this.GetService(typeof(IDesignerHost)) as IDesignerHost;
+            if (dh != null)
+                dh.LoadComplete -= DesignerLoadComplete;
+
+            System.Windows.Forms.Control c = this.Control;
+            if (c != null && !string.IsNullOrEmpty(c.Text))
+                TypeDescriptor.GetProperties(c)["Text"].SetValue(c, "");
+        }
+        public override void InitializeNewComponent(System.Collections.IDictionary defaultValues)
+        {
+            TokenEditor c = this.Control as TokenEditor;
+            if (c != null)
+            {
+                c.BackgroundStyle.Class = ElementStyleClassKeys.DateTimeInputBackgroundKey;
+                c.Separators.Add(";");
+                c.Separators.Add(",");
+            }
+            base.InitializeNewComponent(defaultValues);
+        }
+
+        #endregion
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ToolboxControl/ToolboxControlDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ToolboxControl/ToolboxControlDesigner.cs
new file mode 100644
index 00000000..addcd9e8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ToolboxControl/ToolboxControlDesigner.cs	
@@ -0,0 +1,562 @@
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.ComponentModel.Design;
+using System.Drawing;
+using System.Windows.Forms;
+using System.Windows.Forms.Design;
+using DevComponents.DotNetBar.Controls;
+
+namespace DevComponents.DotNetBar.Design
+{
+    public class ToolboxControlDesigner : ControlDesigner
+    {
+        public void SelectionRefresh()
+        {
+            Message m = new Message();
+            m.Msg = 0x115;
+            base.WndProc(ref m);
+        }
+
+        public override void Initialize(IComponent component)
+        {
+            base.Initialize(component);
+
+            IDesignerHost dh = this.GetService(typeof(IDesignerHost)) as IDesignerHost;
+            if (dh != null)
+                dh.LoadComplete += new EventHandler(dh_LoadComplete);
+
+            // If our item is removed we need to clean-up
+            IComponentChangeService cc = (IComponentChangeService)GetService(typeof(IComponentChangeService));
+            if (cc != null)
+            {
+                cc.ComponentRemoved += ComponentRemoved;
+                cc.ComponentRemoving += ComponentRemoving;
+            }
+        }
+
+        private bool _InternalRemoving = false;
+        private void ComponentRemoving(object sender, ComponentEventArgs e)
+        {
+            if (e.Component != this.Component) return;
+
+            if (!_InternalRemoving)
+            {
+                _InternalRemoving = true;
+                try
+                {
+                    // Unhook events
+                    IComponentChangeService cc = (IComponentChangeService)GetService(typeof(IComponentChangeService));
+                    if (cc != null)
+                        cc.ComponentRemoving -= ComponentRemoving;
+
+                    ToolboxControl tc = (ToolboxControl) this.Component;
+                    IDesignerHost dh = (IDesignerHost)GetService(typeof(IDesignerHost));
+
+                    if (dh == null || tc == null)
+                        return;
+
+                    for (int i = tc.Groups.Count - 1; i >= 0; i--)
+                    {
+                        BaseItem item = tc.Groups[i];
+
+                        // Covers the undo case in designer
+                        if (item.Parent == tc.ItemsPanel.GetBaseItemContainer())
+                        {
+                            DestroySubItems(item, dh);
+                            dh.DestroyComponent(item);
+                        }
+                    }
+                }
+                finally
+                {
+                    _InternalRemoving = false;
+                }
+            }
+        }
+
+        protected virtual void DestroySubItems(BaseItem parent, IDesignerHost dh)
+        {
+            if (parent is ControlContainerItem)
+            {
+                if (((ControlContainerItem)parent).Control != null)
+                {
+                    Control c = ((ControlContainerItem)parent).Control;
+                    ((ControlContainerItem)parent).Control = null;
+                    dh.DestroyComponent(c);
+                }
+            }
+            else if (parent is DockContainerItem)
+            {
+                if (((DockContainerItem)parent).Control != null)
+                {
+                    Control c = ((DockContainerItem)parent).Control;
+                    ((DockContainerItem)parent).Control = null;
+                    dh.DestroyComponent(c);
+                }
+            }
+
+            BaseItem[] subitems = new BaseItem[parent.SubItems.Count];
+            parent.SubItems.CopyTo(subitems, 0);
+            foreach (BaseItem item in subitems)
+            {
+                DestroySubItems(item, dh);
+                dh.DestroyComponent(item);
+            }
+        }
+
+        protected virtual void DestroySubItems(BaseItem parent)
+        {
+            IDesignerHost dh = GetService(typeof(IDesignerHost)) as IDesignerHost;
+            if (dh != null)
+                DestroySubItems(parent, dh);
+        }
+
+        private void ComponentRemoved(object sender, ComponentEventArgs e)
+        {
+            ToolboxGroup group = e.Component as ToolboxGroup;
+            ToolboxControl tc = (ToolboxControl)this.Control;
+            if (group != null && tc != null)
+            {
+                if (tc.Groups.Contains(group))
+                {
+                    IComponentChangeService cc = (IComponentChangeService)GetService(typeof(IComponentChangeService));
+                    if (cc != null)
+                        cc.OnComponentChanging(tc, TypeDescriptor.GetProperties(tc)["Groups"]);
+                    tc.Groups.Remove(group);
+                    if (cc != null)
+                        cc.OnComponentChanged(tc, TypeDescriptor.GetProperties(tc)["Groups"], null, null);
+                }
+                this.RecalcLayout();
+            }
+        }
+
+        public override System.Collections.ICollection AssociatedComponents
+        {
+            get
+            {
+                ArrayList c = new ArrayList(base.AssociatedComponents);
+                ToolboxControl tc = (ToolboxControl) this.Control;
+                if (tc != null)
+                {
+                    foreach (BaseItem item in tc.Groups)
+                    {
+                        if (item.DesignMode)
+                            c.Add(item);
+                    }
+                }
+                return c;
+            }
+        }
+        private void RecalcLayout()
+        {
+            ToolboxControl tc = (ToolboxControl)this.Control;
+            if (tc == null) return;
+            tc.RecalcLayout();
+        }
+
+        public override void InitializeNewComponent(IDictionary defaultValues)
+        {
+            SetDefaults();
+            base.InitializeNewComponent(defaultValues);
+        }
+
+        private void SetDefaults()
+        {
+            ToolboxGroup group = CreateToolboxGroup(true);
+            CreateToolboxItem(group, true);
+            IDesignerHost dh = (IDesignerHost)GetService(typeof(IDesignerHost));
+            if (dh == null)
+                return;
+            this.Control.Size = new Size(200, 200);
+#if !TRIAL
+            string key = GetLicenseKey();
+            ToolboxControl tc = this.Control as ToolboxControl;
+            tc.LicenseKey = key;
+#endif
+        }
+
+        public void CreateGroup()
+        {
+            CreateToolboxGroup(true);
+        }
+        private ToolboxGroup CreateToolboxGroup(bool addToCollections)
+        {
+            ToolboxControl tc = this.Control as ToolboxControl;
+
+            IDesignerHost dh = (IDesignerHost)GetService(typeof(IDesignerHost));
+            if (dh == null)
+                return null;
+
+            ToolboxGroup toolboxGroup = null;
+
+            IComponentChangeService change = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+            if (addToCollections)
+            {
+                if (change != null)
+                {
+                    change.OnComponentChanging(this.Component, TypeDescriptor.GetProperties(tc).Find("Groups", true));
+                }
+            }
+
+            toolboxGroup = dh.CreateComponent(typeof(ToolboxGroup)) as ToolboxGroup;
+
+            if (toolboxGroup != null)
+            {
+                toolboxGroup.TitleText = toolboxGroup.Name;
+                toolboxGroup.Expanded = true;
+                toolboxGroup.LayoutOrientation = eOrientation.Vertical;
+                toolboxGroup.MultiLine = false;
+                toolboxGroup.ResizeItemsToFit = true;
+                if (addToCollections)
+                {
+                    tc.Groups.Add(toolboxGroup);
+
+                    if (change != null)
+                    {
+                        change.OnComponentChanged(this.Component, TypeDescriptor.GetProperties(tc).Find("Groups", true), null, null);
+                    }
+                }
+            }
+
+            return toolboxGroup;
+        }
+        private ToolboxItem CreateToolboxItem(ToolboxGroup parentGroup, bool addToCollections)
+        {
+            ToolboxControl tc = this.Control as ToolboxControl;
+
+            IDesignerHost dh = (IDesignerHost)GetService(typeof(IDesignerHost));
+            if (dh == null)
+                return null;
+
+            if (parentGroup == null)
+                throw new ArgumentNullException("parentGroup", "ToolboxGroup must be specified");
+
+            ToolboxItem item = null;
+
+            IComponentChangeService change = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+            if (addToCollections)
+            {
+                if (change != null)
+                {
+                    change.OnComponentChanging(this.Component, TypeDescriptor.GetProperties(parentGroup).Find("SubItems", true));
+                }
+            }
+
+            item = dh.CreateComponent(typeof(ToolboxItem)) as ToolboxItem;
+
+            if (item != null)
+            {
+                item.Text = item.Name;
+                item.Symbol = "\ue251";
+                item.SymbolSet = eSymbolSet.Material;
+                if (addToCollections)
+                {
+                    parentGroup.SubItems.Add(item);
+
+                    if (change != null)
+                    {
+                        change.OnComponentChanged(this.Component, TypeDescriptor.GetProperties(parentGroup).Find("Nodes", true), null, null);
+                    }
+                }
+            }
+
+            return item;
+        }
+
+        protected override bool GetHitTest(System.Drawing.Point point)
+        {
+            if (base.GetHitTest(point))
+                return true;
+
+            ToolboxControl c = this.Control as ToolboxControl;
+            if (c == null) return false;
+
+            Point pc = c.ItemsPanel.PointToClient(point);
+            if (c.ItemsPanel.VScrollBar != null && c.ItemsPanel.VScrollBar.Visible && c.ItemsPanel.VScrollBar.Bounds.Contains(pc))
+                return true;
+            if (c.ItemsPanel.HScrollBar != null && c.ItemsPanel.HScrollBar.Visible && c.ItemsPanel.HScrollBar.Bounds.Contains(pc))
+                return true;
+
+            return base.GetHitTest(point);
+        }
+
+        private bool IsControlSelected
+        {
+            get
+            {
+                ISelectionService ss = (ISelectionService)GetService(typeof(ISelectionService));
+                if (ss == null) return false;
+                ICollection selected = ss.GetSelectedComponents();
+                if (IsSelected(selected, this.Control))
+                    return true;
+                return false;
+            }
+        }
+        private bool IsSelected(ICollection selectedComponents, object item)
+        {
+            foreach (object o in selectedComponents)
+            {
+                if (o == item) return true;
+            }
+            return false;
+        }
+
+        private System.Windows.Forms.Control _DesignerHost = null;
+        /// <summary>
+        /// Selection support for items on container.
+        /// </summary>
+        protected override void WndProc(ref Message m)
+        {
+            if (_DesignerHost == null)
+                _DesignerHost = System.Windows.Forms.Control.FromHandle(m.HWnd);
+            switch (m.Msg)
+            {
+                case WinApi.WM_LBUTTONDOWN:
+                case WinApi.WM_RBUTTONDOWN:
+                    {
+                        if (OnMouseDown(ref m, m.Msg == WinApi.WM_LBUTTONDOWN ? MouseButtons.Left : MouseButtons.Right))
+                            return;
+                        break;
+                    }
+                case WinApi.WM_RBUTTONUP:
+                case WinApi.WM_LBUTTONUP:
+                    {
+                        if (OnMouseUp(ref m, m.Msg == WinApi.WM_LBUTTONDOWN ? MouseButtons.Left : MouseButtons.Right))
+                            return;
+
+                        break;
+                    }
+            }
+
+            base.WndProc(ref m);
+        }
+
+        protected virtual bool OnMouseUp(ref Message m, MouseButtons param1)
+        {
+            if (_MouseDownSelectionPerformed)
+            {
+                _MouseDownSelectionPerformed = false;
+                return true;
+            }
+            return false;
+        }
+        private bool _MouseDownSelectionPerformed = false;
+        protected virtual bool OnMouseDown(ref Message m, MouseButtons button)
+        {
+            ToolboxControl lc = this.Control as ToolboxControl;
+            if (lc == null) return false;
+            if (m.HWnd != lc.ItemsPanel.Handle)
+                return false;
+
+            Point p = new Point(WinApi.LOWORD(m.LParam), WinApi.HIWORD(m.LParam));
+            BaseItem item = lc.ItemsPanel.HitTest(p);
+            if (item != null)
+            {
+                SelectComponent(item, (Control.ModifierKeys == Keys.Control || Control.ModifierKeys == Keys.Shift) ? SelectionTypes.Add : SelectionTypes.Primary);
+                _MouseDownSelectionPerformed = true;
+                return true;
+            }
+            else if (!IsControlSelected)
+            {
+                SelectComponent(this.Control, SelectionTypes.Replace);
+                //return true;
+            }
+            return false;
+        }
+
+        protected virtual void SelectComponent(IComponent comp, SelectionTypes selectionType)
+        {
+            ISelectionService selection = (ISelectionService)this.GetService(typeof(ISelectionService));
+            if (selection != null && comp != null)
+            {
+                ArrayList arr = new ArrayList(1);
+                arr.Add(comp);
+                selection.SetSelectedComponents(arr, selectionType);
+            }
+        }
+
+        private DesignerActionListCollection _ActionLists = null;
+        public override DesignerActionListCollection ActionLists
+        {
+            get
+            {
+                if (this._ActionLists == null)
+                {
+                    this._ActionLists = new DesignerActionListCollection();
+                    this._ActionLists.Add(new ToolboxControlActionList(this));
+                }
+                return this._ActionLists;
+            }
+        }
+
+        protected override void PreFilterProperties(System.Collections.IDictionary properties)
+        {
+            base.PreFilterProperties(properties);
+
+            properties["Expanded"] = TypeDescriptor.CreateProperty(
+                this.GetType(),
+                "Expanded",
+                typeof(bool),
+                new Attribute[]
+                {
+                    new BrowsableAttribute(true), new DefaultValueAttribute(true),
+                    new CategoryAttribute("Appearance"),
+                    new DescriptionAttribute(
+                        "Indicates whether control is expanded and shows items in full size with images and text")
+                });
+
+        }
+
+        /// <summary>
+        /// Indicates whether Bar is in auto-hide state.
+        /// </summary>
+        public bool Expanded
+        {
+            set
+            {
+                ShadowProperties["Expanded"] = value;
+            }
+            get
+            {
+                return (bool)ShadowProperties["Expanded"];
+            }
+        }
+
+        private void dh_LoadComplete(object sender, EventArgs e)
+        {
+            IDesignerHost dh = this.GetService(typeof(IDesignerHost)) as IDesignerHost;
+            if (dh != null)
+                dh.LoadComplete -= new EventHandler(dh_LoadComplete);
+
+#if !TRIAL
+            string key = GetLicenseKey();
+
+            ToolboxControl tc = (ToolboxControl)this.Control;
+            if (key != "" && tc != null && tc.LicenseKey == "" && tc.LicenseKey != key)
+                TypeDescriptor.GetProperties(tc)["LicenseKey"].SetValue(tc, key);
+#endif
+            this.RecalcLayout();
+        }
+
+        #region Licensing Stuff
+#if !TRIAL
+        private string GetLicenseKey()
+        {
+            string key = "";
+            Microsoft.Win32.RegistryKey regkey = Microsoft.Win32.Registry.LocalMachine;
+            regkey = regkey.OpenSubKey("Software\\DevComponents\\Licenses", false);
+            if (regkey != null)
+            {
+                object keyValue = regkey.GetValue("DevComponents.DotNetBar.DotNetBarManager2");
+                if (keyValue != null)
+                    key = keyValue.ToString();
+            }
+            return key;
+        }
+        
+#endif
+        #endregion
+    }
+
+    #region ToolboxItemActionList
+    internal class ToolboxControlActionList : DesignerActionList
+    {
+        private ToolboxControlDesigner _Designer = null;
+
+        /// <summary>
+        /// Initializes a new instance of the AdvTreeActionList class.
+        /// </summary>
+        /// <param name="designer"></param>
+        public ToolboxControlActionList(ToolboxControlDesigner designer)
+            : base(designer.Component)
+        {
+            _Designer = designer;
+        }
+
+        public override DesignerActionItemCollection GetSortedActionItems()
+        {
+            DesignerActionItemCollection items = new DesignerActionItemCollection();
+            items.Add(new DesignerActionHeaderItem("Items"));
+            items.Add(new DesignerActionHeaderItem("Position"));
+
+            items.Add(new DesignerActionMethodItem(this, "CreateGroup", "Create Group", "Items", true));
+            //items.Add(new DesignerActionMethodItem(this, "MoveItemDown", "Move Down", "Position", true));
+            items.Add(new DesignerActionPropertyItem("Expanded", "Toolbox Expanded?", "Behavior", "Indicates whether toolbox control is expanded and displays items at their full size."));
+            items.Add(new DesignerActionPropertyItem("ItemDragDropEnabled", "Item Drag and Drop?", "Behavior", "Indicates whether item drag and drop is enabled."));
+
+            items.Add(new DesignerActionPropertyItem("SearchBoxVisible", "Search Visible?", "Appearance", "Indicates whether search text-box is visible."));
+            items.Add(new DesignerActionPropertyItem("TitleVisible", "Title Visible?", "Appearance", "Indicates whether title bar is visible."));
+            items.Add(new DesignerActionPropertyItem("MenuVisible", "Menu Visible?", "Appearance", "Indicates whether menu bar is visible."));
+            return items;
+        }
+
+        public void CreateGroup()
+        {
+            _Designer.CreateGroup();
+        }
+        public bool Expanded
+        {
+            get { return _Designer.Expanded; }
+            set { _Designer.Expanded = value; }
+        }
+        public bool ItemDragDropEnabled
+        {
+            get { return ToolboxControl.ItemDragDropEnabled; }
+            set { TypeDescriptor.GetProperties(base.Component)["ItemDragDropEnabled"].SetValue(base.Component, value); }
+        }
+
+        public bool SearchBoxVisible
+        {
+            get { return ToolboxControl.SearchBoxVisible; }
+            set { TypeDescriptor.GetProperties(base.Component)["SearchBoxVisible"].SetValue(base.Component, value); }
+        }
+
+        public bool TitleVisible
+        {
+            get { return ToolboxControl.TitleVisible; }
+            set { TypeDescriptor.GetProperties(base.Component)["TitleVisible"].SetValue(base.Component, value); }
+        }
+
+        public bool MenuVisible
+        {
+            get { return ToolboxControl.MenuVisible; }
+            set { TypeDescriptor.GetProperties(base.Component)["MenuVisible"].SetValue(base.Component, value); }
+        }
+
+        public ToolboxControl ToolboxControl
+        {
+            get { return (ToolboxControl)this.Component; }
+        }
+    }
+    #endregion
+
+    /// <summary>
+    /// Support for TabStrip tabs design-time editor.
+    /// </summary>
+    public class ToolboxControlGroupsEditor : CollectionEditor
+    {
+        public ToolboxControlGroupsEditor(Type type)
+            : base(type)
+        {
+        }
+        protected override Type CreateCollectionItemType()
+        {
+            return typeof(ToolboxGroup);
+        }
+        protected override Type[] CreateNewItemTypes()
+        {
+            return new Type[] { typeof(ToolboxGroup) };
+        }
+        protected override object CreateInstance(Type itemType)
+        {
+            object item = base.CreateInstance(itemType);
+            if (item is ToolboxGroup)
+            {
+                ToolboxGroup tabItem = item as ToolboxGroup;
+                tabItem.Text = "Group";
+            }
+            return item;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ToolboxControl/ToolboxGroupDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ToolboxControl/ToolboxGroupDesigner.cs
new file mode 100644
index 00000000..19f096a5
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ToolboxControl/ToolboxGroupDesigner.cs	
@@ -0,0 +1,186 @@
+using System.Collections;
+using System.ComponentModel;
+using System.ComponentModel.Design;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.Controls;
+
+namespace DevComponents.DotNetBar.Design
+{
+    public class ToolboxGroupDesigner : ComponentDesignerWithAction
+    {
+        #region Implementation
+        private DesignerActionListCollection _ActionLists = null;
+
+        public override DesignerActionListCollection ActionLists
+        {
+            get
+            {
+                if (this._ActionLists == null)
+                {
+                    this._ActionLists = new DesignerActionListCollection();
+                    this._ActionLists.Add(new ToolboxGroupActionList(this));
+                }
+                return this._ActionLists;
+            }
+        }
+
+        public override System.Collections.ICollection AssociatedComponents
+        {
+            get
+            {
+                ToolboxGroup item = this.Component as ToolboxGroup;
+                if (item.SubItems.Count == 0)
+                    return base.AssociatedComponents;
+                ArrayList items = new ArrayList();
+                item.SubItems.CopyTo(items);
+                return items;
+            }
+        }
+
+        protected override void OnDesignerSelectionChanged(bool isSelected)
+        {
+            ToolboxGroup item = (ToolboxGroup)this.Component;
+            if (isSelected && !item.Expanded)
+            {
+                item.Expanded = true;
+            }
+            base.OnDesignerSelectionChanged(isSelected);
+        }
+
+        public override void RecalcLayout()
+        {
+            ToolboxGroup item = this.Component as ToolboxGroup;
+            if (item != null && item.GetToolboxControl() != null)
+                item.GetToolboxControl().RecalcLayout();
+        }
+
+        public void MoveItemDown()
+        {
+            IComponentChangeService cc = (IComponentChangeService)GetService(typeof(IComponentChangeService));
+            ToolboxGroup item = (ToolboxGroup)this.Component;
+            BaseItem parent = item.Parent;
+            if (parent == null) return;
+            int index = parent.SubItems.IndexOf(item);
+            if (index == parent.SubItems.Count - 1)
+                return;
+
+            cc.OnComponentChanging(parent, TypeDescriptor.GetProperties(parent)["SubItems"]);
+            parent.SubItems.Remove(item);
+            parent.SubItems.Insert(index + 1, item);
+            cc.OnComponentChanged(parent, TypeDescriptor.GetProperties(parent)["SubItems"], null, null);
+            this.RecalcLayout();
+        }
+        public void MoveItemUp()
+        {
+            IComponentChangeService cc = (IComponentChangeService)GetService(typeof(IComponentChangeService));
+            ToolboxGroup item = (ToolboxGroup)this.Component;
+            BaseItem parent = item.Parent;
+            if (parent == null) return;
+            int index = parent.SubItems.IndexOf(item);
+            if (index == 0)
+                return;
+
+            cc.OnComponentChanging(parent, TypeDescriptor.GetProperties(parent)["SubItems"]);
+            parent.SubItems.Remove(item);
+            parent.SubItems.Insert(index - 1, item);
+            cc.OnComponentChanged(parent, TypeDescriptor.GetProperties(parent)["SubItems"], null, null);
+            this.RecalcLayout();
+        }
+
+        public void CreateItem()
+        {
+            ToolboxGroup group = (ToolboxGroup)this.Component;
+            ToolboxControl tc = group.GetToolboxControl();
+
+            IDesignerHost dh = (IDesignerHost)GetService(typeof(IDesignerHost));
+            if (dh == null)
+                return;
+
+            ToolboxItem item = null;
+
+            IComponentChangeService change = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+            if (change != null)
+            {
+                change.OnComponentChanging(this.Component, TypeDescriptor.GetProperties(group).Find("SubItems", true));
+            }
+
+            item = dh.CreateComponent(typeof(ToolboxItem)) as ToolboxItem;
+
+            if (item != null)
+            {
+                item.Text = item.Name;
+                item.Symbol = "\ue251";
+                item.SymbolSet = eSymbolSet.Material;
+                group.SubItems.Add(item);
+                if (change != null)
+                {
+                    change.OnComponentChanged(this.Component, TypeDescriptor.GetProperties(group).Find("Nodes", true), null, null);
+                }
+            }
+
+            this.RecalcLayout();
+        }
+
+        public override Control GetHostControl()
+        {
+            return GetParentControl().Parent;
+        }
+    }
+    #endregion
+
+    #region ToolboxItemActionList
+    internal class ToolboxGroupActionList : DesignerActionList
+    {
+        private ToolboxGroupDesigner _Designer = null;
+
+        /// <summary>
+        /// Initializes a new instance of the AdvTreeActionList class.
+        /// </summary>
+        /// <param name="designer"></param>
+        public ToolboxGroupActionList(ToolboxGroupDesigner designer)
+            : base(designer.Component)
+        {
+            _Designer = designer;
+        }
+
+        public override DesignerActionItemCollection GetSortedActionItems()
+        {
+            DesignerActionItemCollection items = new DesignerActionItemCollection();
+            items.Add(new DesignerActionHeaderItem("Items"));
+            items.Add(new DesignerActionHeaderItem("Position"));
+            //items.Add(new DesignerActionHeaderItem("Selection"));
+
+            items.Add(new DesignerActionMethodItem(this, "CreateItem", "New Toolbox Item", "Items", true));
+            items.Add(new DesignerActionMethodItem(this, "MoveItemUp", "Move Up", "Position", true));
+            items.Add(new DesignerActionMethodItem(this, "MoveItemDown", "Move Down", "Position", true));
+            //items.Add(new DesignerActionPropertyItem("CellEdit", "Allow node text editing?", "Nodes", "Indicates whether node cells are editable"));
+
+            //items.Add(new DesignerActionMethodItem(this, "EditColumns", "Edit Columns...", "Columns", "Edit Tree Control Columns", true));
+            //items.Add(new DesignerActionPropertyItem("ColumnsVisible", "Column header visible?", "Columns", "Indicates whether tree column header is visible"));
+            //items.Add(new DesignerActionPropertyItem("GridColumnLines", "Show grid column lines?", "Columns", "Indicates whether grid lines are visible"));
+            //items.Add(new DesignerActionPropertyItem("GridRowLines", "Show grid row lines?", "Nodes", "Indicates whether grid lines between nodes are visible"));
+            //items.Add(new DesignerActionPropertyItem("GridLinesColor", "Grid lines color:", "Columns", "Indicates custom color for grid lines"));
+
+            //items.Add(new DesignerActionPropertyItem("SelectionBox", "Show selection?", "Selection", "Indicates whether selection is shown for selected node"));
+            //items.Add(new DesignerActionPropertyItem("SelectionBoxStyle", "Selection style:", "Selection", "Indicates selection style"));
+            //items.Add(new DesignerActionPropertyItem("HotTracking", "Highlight mouse over node?", "Selection", "Indicates whether node that mouse is over is highlighted"));
+
+            return items;
+        }
+
+        public void CreateItem()
+        {
+            _Designer.CreateItem();
+        }
+        public void MoveItemUp()
+        {
+            _Designer.MoveItemUp();
+        }
+
+        public void MoveItemDown()
+        {
+            _Designer.MoveItemDown();
+        }
+    }
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ToolboxControl/ToolboxItemDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ToolboxControl/ToolboxItemDesigner.cs
new file mode 100644
index 00000000..60a495d0
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/ToolboxControl/ToolboxItemDesigner.cs	
@@ -0,0 +1,291 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.ComponentModel.Design;
+using System.Drawing;
+using System.Reflection;
+using System.Text;
+using System.Windows.Forms;
+using System.Windows.Forms.Design;
+using System.Windows.Forms.Design.Behavior;
+using DevComponents.AdvTree;
+using DevComponents.AdvTree.Design;
+using DevComponents.DotNetBar.Controls;
+
+namespace DevComponents.DotNetBar.Design
+{
+    public class ToolboxItemDesigner : ComponentDesignerWithAction
+    {
+        #region Constructor
+
+        /// <summary>
+        /// Initializes a new instance of the LayoutItemBaseDesigner class.
+        /// </summary>
+        public ToolboxItemDesigner()
+        {
+
+        }
+
+        #endregion
+
+        #region Implementation
+
+        public override void Initialize(System.ComponentModel.IComponent component)
+        {
+            base.Initialize(component);
+
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            base.Dispose(disposing);
+        }
+
+        public override void InitializeNewComponent(IDictionary defaultValues)
+        {
+            base.InitializeNewComponent(defaultValues);
+
+            ToolboxItem item = (ToolboxItem)this.Component;
+            item.Text = item.Name;
+            item.Symbol = "\ue251";
+            item.SymbolSet = eSymbolSet.Material;
+        }
+
+        private DesignerActionListCollection _ActionLists = null;
+
+        public override DesignerActionListCollection ActionLists
+        {
+            get
+            {
+                if (this._ActionLists == null)
+                {
+                    this._ActionLists = new DesignerActionListCollection();
+                    this._ActionLists.Add(new ToolboxItemActionList(this));
+                }
+                return this._ActionLists;
+            }
+        }
+
+        public void MoveItemUp()
+        {
+            IComponentChangeService cc = (IComponentChangeService)GetService(typeof(IComponentChangeService));
+            ToolboxItem item = (ToolboxItem)this.Component;
+            BaseItem parent = item.Parent;
+            if (parent == null) return;
+            int index = parent.SubItems.IndexOf(item);
+            if (index == 0)
+            {
+                // Move to previous group
+                if (parent.Parent != null && parent.Parent.SubItems.IndexOf(parent) > 0)
+                {
+                    int j = parent.Parent.SubItems.IndexOf(parent);
+                    for (int i = j; i >= 0; i--)
+                    {
+                        BaseItem previousItem = parent.Parent.SubItems[i];
+                        if (previousItem is ToolboxGroup && previousItem.Visible)
+                        {
+                            cc.OnComponentChanging(parent, TypeDescriptor.GetProperties(parent)["SubItems"]);
+                            parent.SubItems.Remove(item);
+                            cc.OnComponentChanged(parent, TypeDescriptor.GetProperties(parent)["SubItems"], null, null);
+                            cc.OnComponentChanging(parent.Parent, TypeDescriptor.GetProperties(parent.Parent)["SubItems"]);
+                            parent.Parent.SubItems.Add(item);
+                            cc.OnComponentChanged(parent.Parent, TypeDescriptor.GetProperties(parent)["SubItems"], null, null);
+                            break;
+                        }
+                    }
+                }
+            }
+            else
+            {
+                cc.OnComponentChanging(parent, TypeDescriptor.GetProperties(parent)["SubItems"]);
+                parent.SubItems.Remove(item);
+                parent.SubItems.Insert(index - 1, item);
+                cc.OnComponentChanged(parent, TypeDescriptor.GetProperties(parent)["SubItems"], null, null);
+            }
+            this.RecalcLayout();
+        }
+
+        public override void RecalcLayout()
+        {
+            ToolboxItem item = this.Component as ToolboxItem;
+            if (item != null && item.GetToolboxControl() != null)
+                item.GetToolboxControl().RecalcLayout();
+        }
+
+        public void MoveItemDown()
+        {
+            IComponentChangeService cc = (IComponentChangeService)GetService(typeof(IComponentChangeService));
+            ToolboxItem item = (ToolboxItem)this.Component;
+            BaseItem parent = item.Parent;
+            if (parent == null) return;
+            int index = parent.SubItems.IndexOf(item);
+            if (index == parent.SubItems.Count - 1)
+            {
+                // Move to next group
+                if (parent.Parent != null && parent.Parent.SubItems.IndexOf(parent) < parent.Parent.SubItems.Count - 1)
+                {
+                    int j = parent.Parent.SubItems.IndexOf(parent);
+                    for (int i = j; i < parent.Parent.SubItems.Count; i++)
+                    {
+                        BaseItem previousItem = parent.Parent.SubItems[i];
+                        if (previousItem is ToolboxGroup && previousItem.Visible)
+                        {
+                            cc.OnComponentChanging(parent, TypeDescriptor.GetProperties(parent)["SubItems"]);
+                            parent.SubItems.Remove(item);
+                            cc.OnComponentChanged(parent, TypeDescriptor.GetProperties(parent)["SubItems"], null, null);
+                            cc.OnComponentChanging(parent.Parent, TypeDescriptor.GetProperties(parent.Parent)["SubItems"]);
+                            parent.Parent.SubItems.Add(item);
+                            cc.OnComponentChanged(parent.Parent, TypeDescriptor.GetProperties(parent)["SubItems"], null, null);
+                            break;
+                        }
+                    }
+                }
+            }
+            else
+            {
+                cc.OnComponentChanging(parent, TypeDescriptor.GetProperties(parent)["SubItems"]);
+                parent.SubItems.Remove(item);
+                parent.SubItems.Insert(index + 1, item);
+                cc.OnComponentChanged(parent, TypeDescriptor.GetProperties(parent)["SubItems"], null, null);
+            }
+            this.RecalcLayout();
+        }
+
+        //private void OnComponentRemoved(object sender, ComponentEventArgs e)
+        //{
+        //    if (e.Component == this.Component)
+        //    {
+        //        ToolboxItem item = e.Component as ToolboxItem;
+        //        BaseItem parent = item.Parent;
+        //        Controls.ToolboxControl lc = item.GetToolboxControl();
+        //        if (parent != null)
+        //        {
+        //            IComponentChangeService cc = (IComponentChangeService)GetService(typeof(IComponentChangeService));
+        //            if (cc != null)
+        //                cc.OnComponentChanging(parent, TypeDescriptor.GetProperties(parent)["SubItems"]);
+        //            parent.SubItems.Remove(item);
+        //            if (cc != null)
+        //                cc.OnComponentChanged(parent, TypeDescriptor.GetProperties(parent)["SubItems"], null, null);
+        //            if (lc != null)
+        //            {
+        //                lc.Invalidate();
+        //                IDesignerHost host = (IDesignerHost)GetService(typeof(IDesignerHost));
+        //                if (host != null)
+        //                {
+        //                    IDesigner designer = host.GetDesigner(lc);
+        //                    if (designer is ToolboxControlDesigner)
+        //                    {
+        //                        ((ToolboxControlDesigner)designer).SelectionRefresh();
+        //                    }
+        //                }
+        //            }
+        //        }
+        //    }
+        //}
+
+        protected override void OnDesignerSelectionChanged(bool isSelected)
+        {
+            ToolboxItem item = (ToolboxItem)this.Component;
+            item.Checked = isSelected;
+            base.OnDesignerSelectionChanged(isSelected);
+        }
+
+        public override System.Collections.ICollection AssociatedComponents
+        {
+            get
+            {
+                ToolboxItem item = this.Component as ToolboxItem;
+                if (item.SubItems.Count == 0)
+                    return base.AssociatedComponents;
+                ArrayList items = new ArrayList();
+                item.SubItems.CopyTo(items);
+                return items;
+            }
+        }
+
+        protected override void PreFilterProperties(IDictionary properties)
+        {
+            base.PreFilterProperties(properties);
+            properties["Visible"] = TypeDescriptor.CreateProperty(typeof(ToolboxItemDesigner),
+                (PropertyDescriptor)properties["Visible"], new Attribute[]
+                {
+                    new DefaultValueAttribute(true),
+                    new BrowsableAttribute(true),
+                    new CategoryAttribute("Appearance")
+                });
+        }
+
+        /// <summary>
+        /// Gets or sets whether item is visible.
+        /// </summary>
+        [DefaultValue(true), Browsable(true), Category("Appearance"), Description("Indicates visiblity of the item.")]
+        public bool Visible
+        {
+            get { return (bool)ShadowProperties["Visible"]; }
+            set
+            {
+                // this value is not passed to the actual control
+                this.ShadowProperties["Visible"] = value;
+            }
+        }
+
+        public override Control GetHostControl()
+        {
+            return GetParentControl().Parent;
+        }
+        #endregion
+    }
+
+
+    #region ToolboxItemActionList
+    internal class ToolboxItemActionList : DesignerActionList
+    {
+        private ToolboxItemDesigner _Designer = null;
+
+        /// <summary>
+        /// Initializes a new instance of the AdvTreeActionList class.
+        /// </summary>
+        /// <param name="designer"></param>
+        public ToolboxItemActionList(ToolboxItemDesigner designer)
+            : base(designer.Component)
+        {
+            _Designer = designer;
+        }
+
+        public override DesignerActionItemCollection GetSortedActionItems()
+        {
+            DesignerActionItemCollection items = new DesignerActionItemCollection();
+            items.Add(new DesignerActionHeaderItem("Position"));
+            //items.Add(new DesignerActionHeaderItem("Columns"));
+            //items.Add(new DesignerActionHeaderItem("Selection"));
+
+            items.Add(new DesignerActionMethodItem(this, "MoveItemUp", "Move Up", "Position", true));
+            items.Add(new DesignerActionMethodItem(this, "MoveItemDown", "Move Down", "Position", true));
+            //items.Add(new DesignerActionPropertyItem("CellEdit", "Allow node text editing?", "Nodes", "Indicates whether node cells are editable"));
+
+            //items.Add(new DesignerActionMethodItem(this, "EditColumns", "Edit Columns...", "Columns", "Edit Tree Control Columns", true));
+            //items.Add(new DesignerActionPropertyItem("ColumnsVisible", "Column header visible?", "Columns", "Indicates whether tree column header is visible"));
+            //items.Add(new DesignerActionPropertyItem("GridColumnLines", "Show grid column lines?", "Columns", "Indicates whether grid lines are visible"));
+            //items.Add(new DesignerActionPropertyItem("GridRowLines", "Show grid row lines?", "Nodes", "Indicates whether grid lines between nodes are visible"));
+            //items.Add(new DesignerActionPropertyItem("GridLinesColor", "Grid lines color:", "Columns", "Indicates custom color for grid lines"));
+
+            //items.Add(new DesignerActionPropertyItem("SelectionBox", "Show selection?", "Selection", "Indicates whether selection is shown for selected node"));
+            //items.Add(new DesignerActionPropertyItem("SelectionBoxStyle", "Selection style:", "Selection", "Indicates selection style"));
+            //items.Add(new DesignerActionPropertyItem("HotTracking", "Highlight mouse over node?", "Selection", "Indicates whether node that mouse is over is highlighted"));
+
+            return items;
+        }
+
+        public void MoveItemUp()
+        {
+            _Designer.MoveItemUp();
+        }
+
+        public void MoveItemDown()
+        {
+            _Designer.MoveItemDown();
+        }
+    }
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/Validator.Design/HighlighterDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/Validator.Design/HighlighterDesigner.cs
new file mode 100644
index 00000000..72fcd49c
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/Validator.Design/HighlighterDesigner.cs	
@@ -0,0 +1,92 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel.Design;
+using System.ComponentModel;
+using System.Collections;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.Validator;
+
+namespace DevComponents.DotNetBar.Design
+{
+    internal class HighlighterDesigner : ComponentDesigner
+    {
+        #region Internal Implementation
+        public override void Initialize(IComponent component)
+        {
+            base.Initialize(component);
+            if (!component.Site.DesignMode)
+                return;
+
+#if !TRIAL
+            IDesignerHost dh = this.GetService(typeof(IDesignerHost)) as IDesignerHost;
+            if (dh != null)
+                dh.LoadComplete += new EventHandler(dh_LoadComplete);
+#endif
+        }
+
+#if FRAMEWORK20
+        public override void InitializeNewComponent(IDictionary defaultValues)
+        {
+            base.InitializeNewComponent(defaultValues);
+            SetDesignTimeDefaults();
+        }
+#else
+		public override void OnSetComponentDefaults()
+		{
+			base.OnSetComponentDefaults();
+			SetDesignTimeDefaults();
+		}
+#endif
+
+        private void SetDesignTimeDefaults()
+        {
+            Highlighter highlighter = this.Component as Highlighter;
+            if (highlighter == null)
+                return;
+
+#if !TRIAL
+            string key = GetLicenseKey();
+            highlighter.LicenseKey = key;
+#endif
+            // Create and assign error provider
+            IDesignerHost dh = this.GetService(typeof(IDesignerHost)) as IDesignerHost;
+            if (dh != null)
+            {
+                highlighter.ContainerControl = dh.RootComponent as Control;
+            }
+        }
+        #endregion
+
+        #region Licensing
+#if !TRIAL
+        private string GetLicenseKey()
+        {
+            string key = "";
+            Microsoft.Win32.RegistryKey regkey = Microsoft.Win32.Registry.LocalMachine;
+            regkey = regkey.OpenSubKey("Software\\DevComponents\\Licenses", false);
+            if (regkey != null)
+            {
+                object keyValue = regkey.GetValue("DevComponents.DotNetBar.DotNetBarManager2");
+                if (keyValue != null)
+                    key = keyValue.ToString();
+            }
+            return key;
+        }
+        private void dh_LoadComplete(object sender, EventArgs e)
+        {
+            IDesignerHost dh = this.GetService(typeof(IDesignerHost)) as IDesignerHost;
+            if (dh != null)
+                dh.LoadComplete -= new EventHandler(dh_LoadComplete);
+
+            string key = GetLicenseKey();
+            Highlighter highlighter = this.Component as Highlighter;
+            if (key != "" && highlighter != null && highlighter.LicenseKey == "" && highlighter.LicenseKey != key)
+                TypeDescriptor.GetProperties(highlighter)["LicenseKey"].SetValue(highlighter, key);
+        }
+#endif
+        #endregion
+    }
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/Validator.Design/RequiredFieldValidatorConverter.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/Validator.Design/RequiredFieldValidatorConverter.cs
new file mode 100644
index 00000000..6f8de102
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/Validator.Design/RequiredFieldValidatorConverter.cs	
@@ -0,0 +1,77 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel;
+using System.Reflection;
+using System.Globalization;
+using System.ComponentModel.Design.Serialization;
+using DevComponents.DotNetBar.Validator;
+
+namespace DevComponents.DotNetBar.Design
+{
+    public class RequiredFieldValidatorConverter : ExpandableObjectConverter
+    {
+        /// <summary>
+        /// Creates new instance of the class.
+        /// </summary>
+        public RequiredFieldValidatorConverter() { }
+
+        /// <summary>
+        /// Checks whether conversion can be made to specified type.
+        /// </summary>
+        /// <param name="context">Context Information.</param>
+        /// <param name="destinationType">Destination type.</param>
+        /// <returns></returns>
+        public override bool CanConvertTo(ITypeDescriptorContext context, Type destinationType)
+        {
+            if (destinationType == typeof(InstanceDescriptor))
+                return true;
+            return base.CanConvertTo(context, destinationType);
+        }
+
+        /// <summary>
+        /// Converts object to specified type.
+        /// </summary>
+        /// <param name="context">Context information.</param>
+        /// <param name="culture">Culture information.</param>
+        /// <param name="value">Object to convert.</param>
+        /// <param name="destinationType">Destination type.</param>
+        /// <returns>Object converted to destination type.</returns>
+        public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+        {
+            if (destinationType == null)
+                throw new ArgumentNullException("destinationType");
+
+            if ((destinationType == typeof(InstanceDescriptor)) && (value is RequiredFieldValidator))
+            {
+                RequiredFieldValidator validator = (RequiredFieldValidator)value;
+                Type[] constructorParams = null;
+                MemberInfo constructorMemberInfo = null;
+                object[] constructorValues = null;
+
+                if (string.IsNullOrEmpty(validator.OptionalValidationGroup))
+                {
+                    constructorParams = new Type[] { typeof(string) };
+                    constructorMemberInfo = typeof(RequiredFieldValidator).GetConstructor(constructorParams);
+                    constructorValues = new object[] { validator.ErrorMessage};
+                }
+                else
+                {
+                    constructorParams = new Type[] { typeof(string), typeof(string) };
+                    constructorMemberInfo = typeof(RequiredFieldValidator).GetConstructor(constructorParams);
+                    constructorValues = new object[] { validator.ErrorMessage, validator.OptionalValidationGroup };
+                }
+                
+
+                if (constructorMemberInfo != null)
+                {
+                    return new InstanceDescriptor(constructorMemberInfo, constructorValues);
+                }
+            }
+
+            return base.ConvertTo(context, culture, value, destinationType);
+        }
+    }
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/Validator.Design/SuperValidatorDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/Validator.Design/SuperValidatorDesigner.cs
new file mode 100644
index 00000000..a1ce8e2b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/Validator.Design/SuperValidatorDesigner.cs	
@@ -0,0 +1,102 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel.Design;
+using System.Collections;
+using System.ComponentModel;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.Validator;
+
+namespace DevComponents.DotNetBar.Design
+{
+    internal class SuperValidatorDesigner : ComponentDesigner
+    {
+        #region Internal Implementation
+        public override void Initialize(IComponent component)
+        {
+            base.Initialize(component);
+            if (!component.Site.DesignMode)
+                return;
+
+#if !TRIAL
+            IDesignerHost dh = this.GetService(typeof(IDesignerHost)) as IDesignerHost;
+            if (dh != null)
+                dh.LoadComplete += new EventHandler(dh_LoadComplete);
+#endif
+        }
+
+#if FRAMEWORK20
+        public override void InitializeNewComponent(IDictionary defaultValues)
+        {
+            base.InitializeNewComponent(defaultValues);
+            SetDesignTimeDefaults();
+        }
+#else
+		public override void OnSetComponentDefaults()
+		{
+			base.OnSetComponentDefaults();
+			SetDesignTimeDefaults();
+		}
+#endif
+
+        private void SetDesignTimeDefaults()
+        {
+            SuperValidator sv = this.Component as SuperValidator;
+            if (sv == null)
+                return;
+            
+#if !TRIAL
+            string key = GetLicenseKey();
+            sv.LicenseKey = key;
+#endif
+            // Create and assign error provider
+            IDesignerHost dh = this.GetService(typeof(IDesignerHost)) as IDesignerHost;
+            if (dh != null)
+            {
+                ErrorProvider provider = dh.CreateComponent(typeof(ErrorProvider)) as ErrorProvider;
+                if (provider == null) return;
+                Highlighter highlighter = dh.CreateComponent(typeof(Highlighter)) as Highlighter;
+                if (highlighter == null) return;
+                if (highlighter.ContainerControl == null)
+                    highlighter.ContainerControl = dh.RootComponent as Control;
+
+                TypeDescriptor.GetProperties(sv)["Highlighter"].SetValue(sv, highlighter);
+                TypeDescriptor.GetProperties(sv)["ErrorProvider"].SetValue(sv, provider);
+                provider.Icon = Helpers.LoadIcon("Validator.SuperValidator.ico");
+                sv.ContainerControl = dh.RootComponent as Control;
+            }
+        }
+        #endregion
+
+        #region Licensing
+#if !TRIAL
+        private string GetLicenseKey()
+        {
+            string key = "";
+            Microsoft.Win32.RegistryKey regkey = Microsoft.Win32.Registry.LocalMachine;
+            regkey = regkey.OpenSubKey("Software\\DevComponents\\Licenses", false);
+            if (regkey != null)
+            {
+                object keyValue = regkey.GetValue("DevComponents.DotNetBar.DotNetBarManager2");
+                if (keyValue != null)
+                    key = keyValue.ToString();
+            }
+            return key;
+        }
+        private void dh_LoadComplete(object sender, EventArgs e)
+        {
+            IDesignerHost dh = this.GetService(typeof(IDesignerHost)) as IDesignerHost;
+            if (dh != null)
+                dh.LoadComplete -= new EventHandler(dh_LoadComplete);
+
+            string key = GetLicenseKey();
+            SuperValidator sv = this.Component as SuperValidator;
+            if (key != "" && sv != null && sv.LicenseKey == "" && sv.LicenseKey != key)
+                TypeDescriptor.GetProperties(sv)["LicenseKey"].SetValue(sv, key);
+        }
+#endif
+        #endregion
+    }
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/Validator.Design/ValidationExpressionEditor.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/Validator.Design/ValidationExpressionEditor.cs
new file mode 100644
index 00000000..eedbf96e
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/Validator.Design/ValidationExpressionEditor.cs	
@@ -0,0 +1,93 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing.Design;
+using System.ComponentModel;
+using System.Windows.Forms.Design;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.Validator;
+
+namespace DevComponents.DotNetBar.Design
+{
+    public class ValidationExpressionEditor : UITypeEditor
+    {
+        #region Implementation
+        private IWindowsFormsEditorService _EditorService = null;
+
+        public override object EditValue(ITypeDescriptorContext context, IServiceProvider provider, object value)
+        {
+            if (context != null
+                && context.Instance != null
+                && provider != null)
+            {
+                ValidatorBase es = value as ValidatorBase;
+
+                _EditorService = provider.GetService(typeof(IWindowsFormsEditorService)) as IWindowsFormsEditorService;
+
+                if (_EditorService != null)
+                {
+                    ListBox list = new ListBox();
+                    list.Items.Add("At least 5 characters");
+                    list.Items.Add("Phone Number");
+                    list.Items.Add("E-mail Address");
+                    list.Items.Add("ZIP Code");
+                    list.Items.Add("Social Security Number");
+                    list.Items.Add("URL");
+                    list.Items.Add("First, Last Name");
+                    list.SelectedIndexChanged += new EventHandler(ValidatorListSelectedIndexChanged);
+
+                    _EditorService.DropDownControl(list);
+
+                    if (list.SelectedIndex < 0) return es;
+
+                    string regExp = "";
+                    if (list.SelectedIndex == 1) // Phone Number
+                        regExp = @"^[01]?[- .]?(\([2-9]\d{2}\)|[2-9]\d{2})[- .]?\d{3}[- .]?\d{4}$";
+                    else if (list.SelectedIndex == 2) // Email Address
+                        regExp = @"^([0-9a-zA-Z]([-\.\w]*[0-9a-zA-Z])*@([0-9a-zA-Z][-\w]*[0-9a-zA-Z]\.)+[a-zA-Z]{2,9})$";
+                    else if (list.SelectedIndex == 3) // ZIP Code
+                        regExp = @"^(\d{5}-\d{4}|\d{5}|\d{9})$|^([a-zA-Z]\d[a-zA-Z] \d[a-zA-Z]\d)$";
+                    else if (list.SelectedIndex == 4) // SSN
+                        regExp = @"^\d{3}-\d{2}-\d{4}$";
+                    else if (list.SelectedIndex == 5) // URL
+                        regExp = @"^(ht|f)tp(s?)\:\/\/[0-9a-zA-Z]([-.\w]*[0-9a-zA-Z])*(:(0-9)*)*(\/?)([a-zA-Z0-9\-\.\?\,\'\/\\\+&amp;%\$#_]*)?$";
+                    else if (list.SelectedIndex == 6) // First Name, Last Name
+                        regExp = @"^[a-zA-Z''-'\s]{1,40}$";
+                    else // At least 5 characters
+                        regExp = @"\S{5,5}";
+
+                    return regExp;
+                    
+                }
+                return "";
+            }
+
+            return "";
+        }
+
+        private void ValidatorListSelectedIndexChanged(object sender, EventArgs e)
+        {
+            if (_EditorService != null)
+                _EditorService.CloseDropDown();
+        }
+
+
+        /// <summary>
+        /// Gets the editor style used by the EditValue method.
+        /// </summary>
+        /// <param name="context">An ITypeDescriptorContext that can be used to gain additional context information.</param>
+        /// <returns>A UITypeEditorEditStyle value that indicates the style of editor used by EditValue. If the UITypeEditor does not support this method, then GetEditStyle will return None.
+        /// </returns>
+        public override UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext context)
+        {
+            if (context != null && context.Instance != null)
+            {
+                return UITypeEditorEditStyle.DropDown;
+            }
+            return base.GetEditStyle(context);
+        }
+        #endregion
+    }
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/Validator.Design/ValidatorEditor.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/Validator.Design/ValidatorEditor.cs
new file mode 100644
index 00000000..caa4e396
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/Validator.Design/ValidatorEditor.cs	
@@ -0,0 +1,100 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing.Design;
+using System.ComponentModel;
+using System.Windows.Forms.Design;
+using System.ComponentModel.Design;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.Validator;
+
+namespace DevComponents.DotNetBar.Design
+{
+    public class ValidatorEditor : UITypeEditor 
+    {
+        #region Implementation
+        private IWindowsFormsEditorService _EditorService = null;
+
+        public override object EditValue(ITypeDescriptorContext context, IServiceProvider provider, object value)
+        {
+            if (context != null
+                && context.Instance != null
+                && provider != null)
+            {
+                ValidatorBase es = value as ValidatorBase;
+
+                _EditorService = provider.GetService(typeof(IWindowsFormsEditorService)) as IWindowsFormsEditorService;
+
+                if (_EditorService != null)
+                {
+                    ListBox list = new ListBox();
+                    list.Items.Add("(none)");
+                    list.Items.Add("Required Field Validator");
+                    list.Items.Add("Regular Expression Validator");
+                    list.Items.Add("Compare Fields Validator");
+                    list.Items.Add("Range Validator");
+                    list.Items.Add("Custom Code Validator");
+                    list.SelectedIndexChanged += new EventHandler(ValidatorListSelectedIndexChanged);
+
+                    _EditorService.DropDownControl(list);
+
+                    int listSelectedIndex = list.SelectedIndex;
+                    if (listSelectedIndex > 0)
+                    {
+                        listSelectedIndex--;
+                        Type validatorType = null;
+                        if (listSelectedIndex == 1)
+                            validatorType = typeof(RegularExpressionValidator);
+                        else if (listSelectedIndex == 2)
+                            validatorType = typeof(CompareValidator);
+                        else if (listSelectedIndex == 3)
+                            validatorType = typeof(RangeValidator);
+                        else if (listSelectedIndex == 4)
+                            validatorType = typeof(CustomValidator);
+                        else
+                            validatorType = typeof(RequiredFieldValidator);
+
+                        IDesignerHost dh = provider.GetService(typeof(IDesignerHost)) as IDesignerHost;
+                        if (dh != null)
+                        {
+                            ValidatorBase val = dh.CreateComponent(validatorType) as ValidatorBase;
+                            val.HighlightColor = eHighlightColor.Red;
+                            val.ErrorMessage = "Your error message here.";
+                            return val;
+                        }
+                    }
+                    else
+                        return null;
+                }
+                return es;
+            }
+
+            return null;
+        }
+
+        private void ValidatorListSelectedIndexChanged(object sender, EventArgs e)
+        {
+            if (_EditorService != null)
+                _EditorService.CloseDropDown();
+        }
+
+
+        /// <summary>
+        /// Gets the editor style used by the EditValue method.
+        /// </summary>
+        /// <param name="context">An ITypeDescriptorContext that can be used to gain additional context information.</param>
+        /// <returns>A UITypeEditorEditStyle value that indicates the style of editor used by EditValue. If the UITypeEditor does not support this method, then GetEditStyle will return None.
+        /// </returns>
+        public override UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext context)
+        {
+            if (context != null && context.Instance != null)
+            {
+                return UITypeEditorEditStyle.DropDown;
+            }
+            return base.GetEditStyle(context);
+        }
+        #endregion
+    }
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/WarningBoxDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/WarningBoxDesigner.cs
new file mode 100644
index 00000000..f5d67d07
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/WarningBoxDesigner.cs	
@@ -0,0 +1,168 @@
+#if FRAMEWORK20
+using System;
+using System.Text;
+using System.Windows.Forms.Design;
+using DevComponents.DotNetBar.Controls;
+using System.ComponentModel;
+using System.Drawing;
+using System.ComponentModel.Design;
+
+namespace DevComponents.DotNetBar.Design
+{
+    /// <summary>
+    /// Represents the designer for WarningBox control.
+    /// </summary>
+    public class WarningBoxDesigner : ControlDesigner
+    {
+        #region Internal Implementation
+        public override void InitializeNewComponent(System.Collections.IDictionary defaultValues)
+        {
+            base.InitializeNewComponent(defaultValues);
+            SetDefaults();
+        }
+
+        private void SetDefaults()
+        {
+            WarningBox box = this.Control as WarningBox;
+            if (box == null) return;
+
+            TypeDescriptor.GetProperties(box)["Text"].SetValue(box, "<b>Warning Box</b> control with <i>text-markup</i> support.");
+            Image image = GetDefaultImage();
+            if (image != null)
+                TypeDescriptor.GetProperties(box)["Image"].SetValue(box, image);
+        }
+
+        private Image GetDefaultImage()
+        {
+            string imageName = "images\\Warning.png";
+            try
+            {
+                Microsoft.Win32.RegistryKey key = Microsoft.Win32.Registry.LocalMachine;
+                string path = "";
+                try
+                {
+                    if (key != null)
+                        key = key.OpenSubKey("Software\\DevComponents\\DotNetBar");
+                    if (key != null)
+                        path = key.GetValue("InstallationFolder", "").ToString();
+                }
+                finally { if (key != null) key.Close(); }
+
+                if (path != "")
+                {
+                    if (path.Substring(path.Length - 1, 1) != "\\")
+                        path += "\\";
+
+                    if (System.IO.File.Exists(path + imageName))
+                        path += imageName;
+                    else
+                        path = "";
+                }
+
+                if (path != "")
+                {
+                    return new Bitmap(path);
+                }
+            }
+            catch (Exception)
+            {
+            }
+            return null;
+        }
+
+        private DesignerActionListCollection _ActionLists = null;
+        public override DesignerActionListCollection ActionLists
+        {
+            get
+            {
+                if (_ActionLists == null)
+                {
+                    _ActionLists = new DesignerActionListCollection();
+                    _ActionLists.Add(new WarningBoxActionList(this));
+                }
+                return _ActionLists;
+            }
+        }
+        #endregion
+    }
+
+    #region WarningBoxActionList
+    public class WarningBoxActionList : DesignerActionList
+    {
+        private WarningBoxDesigner _Designer = null;
+
+        /// <summary>
+        /// Initializes a new instance of the AdvTreeActionList class.
+        /// </summary>
+        /// <param name="designer"></param>
+        public WarningBoxActionList(WarningBoxDesigner designer)
+            : base(designer.Component)
+        {
+            _Designer = designer;
+        }
+
+        public override DesignerActionItemCollection GetSortedActionItems()
+        {
+            DesignerActionItemCollection items = new DesignerActionItemCollection();
+            items.Add(new DesignerActionHeaderItem("Appearance"));
+            items.Add(new DesignerActionHeaderItem("Information"));
+
+            items.Add(new DesignerActionPropertyItem("OptionsButtonVisible", "Show Options button?", "Appearance", "Controls visibility of Options button in WarningBox"));
+            items.Add(new DesignerActionPropertyItem("CloseButtonVisible", "Show Close button?", "Appearance", "Controls visibility of Close button in WarningBox"));
+            items.Add(new DesignerActionPropertyItem("Image", "Image", "Appearance", "Image that is displayed on Warning Box"));
+
+            items.Add(new DesignerActionTextItem("See Office2007ColorTable.WarningBox members to customize colors.", "Information"));
+            items.Add(new DesignerActionMethodItem(this, "OpenKB", "How to customize color table?", "Information", "Opens online Knowledge Base article which shows how to customize Office2007ColorTable", true));
+            items.Add(new DesignerActionMethodItem(this, "OpenTextMarkupRef", "Text Markup Reference...", "Information", "Opens online Text Markup reference. Markup can be used in Text property.", true));
+            
+            return items;
+        }
+
+        public void OpenKB()
+        {
+            System.Diagnostics.Process.Start("http://www.devcomponents.com/kb2/");
+        }
+        public void OpenTextMarkupRef()
+        {
+            System.Diagnostics.Process.Start("http://www.devcomponents.com/kb2/?p=515");
+        }
+
+        public bool OptionsButtonVisible
+        {
+            get
+            {
+                return ((WarningBox)base.Component).OptionsButtonVisible;
+            }
+            set
+            {
+                TypeDescriptor.GetProperties(base.Component)["OptionsButtonVisible"].SetValue(base.Component, value);
+            }
+        }
+
+        public bool CloseButtonVisible
+        {
+            get
+            {
+                return ((WarningBox)base.Component).CloseButtonVisible;
+            }
+            set
+            {
+                TypeDescriptor.GetProperties(base.Component)["CloseButtonVisible"].SetValue(base.Component, value);
+            }
+        }
+
+        public Image Image
+        {
+            get
+            {
+                return ((WarningBox)base.Component).Image;
+            }
+            set
+            {
+                TypeDescriptor.GetProperties(base.Component)["Image"].SetValue(base.Component, value);
+            }
+        }
+    }
+    #endregion
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/WinApi.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/WinApi.cs
new file mode 100644
index 00000000..fcbeb695
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/WinApi.cs	
@@ -0,0 +1,312 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Runtime.InteropServices;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Design
+{
+    internal static class WinApi
+    {
+        #region API
+        [DllImport("user32.dll")]
+        public static extern IntPtr SetFocus(IntPtr hWnd);
+
+        [DllImport("user32.dll")]
+        public static extern IntPtr GetFocus();
+
+        [DllImport("user32")]
+        public static extern bool SetWindowPos(IntPtr hWnd, int hWndInsertAfter, int X, int Y, int cx, int cy, int uFlags);
+
+        [DllImport("gdi32.dll", CharSet = CharSet.Auto)]
+        public static extern IntPtr SelectObject(IntPtr hDC, IntPtr hObject);
+        [DllImport("gdi32")]
+        public static extern bool DeleteObject(IntPtr hObject);
+
+        [DllImport("gdi32.dll", CharSet = CharSet.Auto)]
+        public static extern bool GetTextMetrics(HandleRef hdc, TEXTMETRIC tm);
+        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
+        public class TEXTMETRIC
+        {
+            public int tmHeight;
+            public int tmAscent;
+            public int tmDescent;
+            public int tmInternalLeading;
+            public int tmExternalLeading;
+            public int tmAveCharWidth;
+            public int tmMaxCharWidth;
+            public int tmWeight;
+            public int tmOverhang;
+            public int tmDigitizedAspectX;
+            public int tmDigitizedAspectY;
+            public char tmFirstChar;
+            public char tmLastChar;
+            public char tmDefaultChar;
+            public char tmBreakChar;
+            public byte tmItalic;
+            public byte tmUnderlined;
+            public byte tmStruckOut;
+            public byte tmPitchAndFamily;
+            public byte tmCharSet;
+        }
+
+        public const int WM_LBUTTONDOWN = 0x0201;
+        public const int WM_LBUTTONUP = 0x0202;
+        public const int WM_RBUTTONDOWN = 0x0204;
+        public const int WM_RBUTTONUP = 0x0205;
+        public const int WM_MOUSEMOVE = 0x0200;
+        public const int WM_MOUSELEAVE = 0x02A3;
+        public const int WM_HSCROLL = 0x0114;
+        public const int WM_VSCROLL = 0x0115;
+        public const int WM_LBUTTONDBLCLK = 0x0203;
+
+        [DllImport("user32")]
+        public static extern int SendMessage(IntPtr hWnd, int Msg, int wParam, int lParam);
+        public static int MAKELPARAM(int low, int high)
+        {
+            return ((high << 0x10) | (low & 0xffff));
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        public struct RECT
+        {
+            public RECT(int left, int top, int right, int bottom)
+            {
+                this.Left = left;
+                this.Top = top;
+                this.Right = right;
+                this.Bottom = bottom;
+            }
+            public int Left;
+            public int Top;
+            public int Right;
+            public int Bottom;
+
+            public static RECT FromRectangle(Rectangle rectangle)
+            {
+                return new RECT(rectangle.Left, rectangle.Top, rectangle.Right, rectangle.Bottom);
+            }
+        }
+
+        [DllImport("user32")]
+        public static extern bool GetWindowRect(IntPtr hWnd, ref RECT r);
+        #endregion
+
+        #region Windows Messages
+        public enum WindowsMessages
+        {
+            WM_NCPAINT = 0x0085,
+            WM_NCCALCSIZE = 0x0083,
+            WM_NCACTIVATE = 0x0086,
+            WM_SETTEXT = 0x000C,
+            WM_INITMENUPOPUP = 0x0117,
+            WM_WINDOWPOSCHANGED = 0x0047,
+            WM_NCHITTEST = 0x0084,
+            WM_ERASEBKGND = 0x0014,
+            WM_NCMOUSEMOVE = 0xA0,
+            WM_NCLBUTTONDOWN = 0xA1,
+            WM_NCMOUSELEAVE = 0x2A2,
+            WM_NCLBUTTONUP = 0xA2,
+            WM_NCMOUSEHOVER = 0x2A0,
+            WM_SETCURSOR = 0x20,
+            WM_SETICON = 0x0080,
+            WM_HSCROLL = 0x0114,
+            WM_VSCROLL = 0x115,
+            WM_MOUSEWHEEL = 0x020A,
+            WM_STYLECHANGED = 0x7D,
+            WM_NCLBUTTONDBLCLK = 0xA3,
+            WM_MOUSEACTIVATE = 0x21,
+            WM_MOUSEMOVE = 0x0200,
+            WM_MDISETMENU = 0x230,
+            WM_MDIREFRESHMENU = 0x234,
+            WM_KEYDOWN = 0x0100,
+            WM_SIZE = 0x5,
+            WM_DWMCOMPOSITIONCHANGED = 0x031E,
+            WM_DRAWITEM = 0x002B,
+            SBM_SETPOS = 0x00E0,
+            SBM_SETSCROLLINFO = 0x00E9,
+            EM_GETMODIFY = 0x00B8,
+            EM_SETMODIFY = 0x00B9,
+            WM_LBUTTONUP = 0x0202,
+            WM_LBUTTONDOWN = 0x0201,
+            WM_LBUTTONDBLCLK = 0x0203,
+            WM_SYSTIMER = 0x0118,
+            WM_SETFOCUS = 0x0007,
+            WM_KILLFOCUS = 0x0008,
+            WM_PAINT = 0x000F,
+            WM_COMMAND = 0x0111,
+            WM_CTLCOLORBTN = 0x0135,
+            WM_CTLCOLORSCROLLBAR = 0x0137,
+            WM_MDIACTIVATE = 0x222,
+            WM_CAPTURECHANGED = 0x0215,
+            CB_GETDROPPEDSTATE = 0x0157,
+            WVR_VALIDRECTS = 0x400
+        }
+
+        public enum ComboNotificationCodes : int
+        {
+            CBN_DROPDOWN = 7,
+            CBN_CLOSEUP = 8
+        }
+
+        public enum MouseKeyState : int
+        {
+            MK_LBUTTON = 0x0001,
+            MK_RBUTTON = 0x0002,
+            MK_SHIFT = 0x0004,
+            MK_CONTROL = 0x0008,
+            MK_MBUTTON = 0x0010,
+            MK_XBUTTON1 = 0x0020,
+            MK_XBUTTON2 = 0x0040
+
+        }
+
+        /// <summary>Options available when a form is tested for mose positions.</summary>
+        public enum WindowHitTestRegions
+        {
+            /// <summary>HTERROR: On the screen background or on a dividing line between windows 
+            /// (same as HTNOWHERE, except that the DefWindowProc function produces a system 
+            /// beep to indicate an error).</summary>
+            Error = -2,
+            /// <summary>HTTRANSPARENT: In a window currently covered by another window in the 
+            /// same thread (the message will be sent to underlying windows in the same thread 
+            /// until one of them returns a code that is not HTTRANSPARENT).</summary>
+            TransparentOrCovered = -1,
+            /// <summary>HTNOWHERE: On the screen background or on a dividing line between 
+            /// windows.</summary>
+            NoWhere = 0,
+            /// <summary>HTCLIENT: In a client area.</summary>
+            ClientArea = 1,
+            /// <summary>HTCAPTION: In a title bar.</summary>
+            TitleBar = 2,
+            /// <summary>HTSYSMENU: In a window menu or in a Close button in a child window.</summary>
+            SystemMenu = 3,
+            /// <summary>HTGROWBOX: In a size box (same as HTSIZE).</summary>
+            GrowBox = 4,
+            /// <summary>HTMENU: In a menu.</summary>
+            Menu = 5,
+            /// <summary>HTHSCROLL: In a horizontal scroll bar.</summary>
+            HorizontalScrollBar = 6,
+            /// <summary>HTVSCROLL: In the vertical scroll bar.</summary>
+            VerticalScrollBar = 7,
+            /// <summary>HTMINBUTTON: In a Minimize button. </summary>
+            MinimizeButton = 8,
+            /// <summary>HTMAXBUTTON: In a Maximize button.</summary>
+            MaximizeButton = 9,
+            /// <summary>HTLEFT: In the left border of a resizable window (the user can click 
+            /// the mouse to resize the window horizontally).</summary>
+            LeftSizeableBorder = 10,
+            /// <summary>HTRIGHT: In the right border of a resizable window (the user can click 
+            /// the mouse to resize the window horizontally).</summary>
+            RightSizeableBorder = 11,
+            /// <summary>HTTOP: In the upper-horizontal border of a window.</summary>
+            TopSizeableBorder = 12,
+            /// <summary>HTTOPLEFT: In the upper-left corner of a window border.</summary>
+            TopLeftSizeableCorner = 13,
+            /// <summary>HTTOPRIGHT: In the upper-right corner of a window border.</summary>
+            TopRightSizeableCorner = 14,
+            /// <summary>HTBOTTOM: In the lower-horizontal border of a resizable window (the 
+            /// user can click the mouse to resize the window vertically).</summary>
+            BottomSizeableBorder = 15,
+            /// <summary>HTBOTTOMLEFT: In the lower-left corner of a border of a resizable 
+            /// window (the user can click the mouse to resize the window diagonally).</summary>
+            BottomLeftSizeableCorner = 16,
+            /// <summary>HTBOTTOMRIGHT: In the lower-right corner of a border of a resizable 
+            /// window (the user can click the mouse to resize the window diagonally).</summary>
+            BottomRightSizeableCorner = 17,
+            /// <summary>HTBORDER: In the border of a window that does not have a sizing 
+            /// border.</summary>
+            NonSizableBorder = 18,
+            /// <summary>HTOBJECT: Unknown...No Documentation Found</summary>
+            Object = 19,
+            /// <summary>HTCLOSE: In a Close button.</summary>
+            CloseButton = 20,
+            /// <summary>HTHELP: In a Help button.</summary>
+            HelpButton = 21,
+            /// <summary>HTSIZE: In a size box (same as HTGROWBOX). (Same as GrowBox).</summary>
+            SizeBox = GrowBox,
+            /// <summary>HTREDUCE: In a Minimize button. (Same as MinimizeButton).</summary>
+            ReduceButton = MaximizeButton,
+            /// <summary>HTZOOM: In a Maximize button. (Same as MaximizeButton).</summary>
+            ZoomButton = MaximizeButton,
+        }
+
+        public enum GWL
+        {
+            GWL_WNDPROC = (-4),
+            GWL_HINSTANCE = (-6),
+            GWL_HWNDPARENT = (-8),
+            GWL_STYLE = (-16),
+            GWL_EXSTYLE = (-20),
+            GWL_USERDATA = (-21),
+            GWL_ID = (-12)
+        }
+
+        public enum RedrawWindowFlags : uint
+        {
+            RDW_INVALIDATE = 0x0001,
+            RDW_INTERNALPAINT = 0x0002,
+            RDW_ERASE = 0x0004,
+            RDW_VALIDATE = 0x0008,
+            RDW_NOINTERNALPAINT = 0x0010,
+            RDW_NOERASE = 0x0020,
+            RDW_NOCHILDREN = 0x0040,
+            RDW_ALLCHILDREN = 0x0080,
+            RDW_UPDATENOW = 0x0100,
+            RDW_ERASENOW = 0x0200,
+            RDW_FRAME = 0x0400,
+            RDW_NOFRAME = 0x0800
+        }
+        [Flags()]
+        public enum WindowStyles
+        {
+            WS_VISIBLE = 0x10000000,
+            WS_CAPTION = 0x00C00000
+        }
+
+        public const int HWND_TOP = 0;
+        public const int HWND_BOTTOM = 1;
+        public const int HWND_TOPMOST = -1;
+        public const int HWND_NOTOPMOST = -2;
+        public const int SWP_NOMOVE = 0x0002;
+        public const int SWP_NOSIZE = 0x0001;
+        public const int SWP_NOACTIVATE = 0x0010;
+        public const int SWP_NOZORDER = 0x0004;
+        public const int SWP_SHOWWINDOW = 0x0040;
+        public const int SWP_HIDEWINDOW = 0x0080;
+        public const int SWP_FRAMECHANGED = 0x0020;
+        public const int SWP_NOOWNERZORDER = 0x0200;  /* Don't do owner Z ordering */
+        public const int SWP_NOSENDCHANGING = 0x0400;
+        public const int WM_USER = 0x0400;
+        #endregion
+
+        #region Functions
+        [DllImport("user32")]
+        public static extern bool RedrawWindow(IntPtr hWnd, IntPtr lprcUpdate, IntPtr hrgnUpdate, uint flags);
+        public static int LOWORD(int n)
+        {
+            return (short)(n & 0xffff);
+        }
+        public static int HIWORD(int n)
+        {
+            return (short)((n >> 0x10) & 0xffff);
+        }
+        public static int LOWORD(IntPtr n)
+        {
+            return LOWORD((int)((long)n));
+        }
+        public static int HIWORD(IntPtr n)
+        {
+            return HIWORD((int)((long)n));
+        }
+
+        public static IntPtr CreateLParam(int loWord, int hiWord)
+        {
+            byte[] bx = BitConverter.GetBytes(loWord);
+            byte[] by = BitConverter.GetBytes(hiWord);
+            byte[] blp = new byte[] { bx[0], bx[1], by[0], by[1] };
+            return new IntPtr(BitConverter.ToInt32(blp, 0));
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/WizardDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/WizardDesigner.cs
new file mode 100644
index 00000000..76bea426
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/WizardDesigner.cs	
@@ -0,0 +1,757 @@
+using System;
+using System.Text;
+using System.ComponentModel.Design;
+using System.ComponentModel;
+using System.Windows.Forms;
+using System.Collections;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Design
+{
+    /// <summary>
+    /// Represents Windows Forms Designer for Wizard control.
+    /// </summary>
+    public class WizardDesigner : System.Windows.Forms.Design.ControlDesigner
+    {
+        #region Internal Implementation
+		WizardPageNavigationControl m_NavigationControl=null;
+
+        public override void Initialize(IComponent component)
+        {
+            base.Initialize(component);
+            if (!component.Site.DesignMode)
+                return;
+
+            IComponentChangeService cc = (IComponentChangeService)GetService(typeof(IComponentChangeService));
+            if (cc != null)
+            {
+                cc.ComponentRemoved += new ComponentEventHandler(this.OnComponentRemoved);
+            }
+
+			// Setup navigation box in lower left corner
+			Wizard w=component as Wizard;
+			if(w!=null)
+			{
+				WizardPageNavigationControl wpn=new WizardPageNavigationControl();
+				wpn.Location=new Point(4, w.panelFooter.Height - wpn.Height - 4);
+				w.panelFooter.Controls.Add(wpn);
+				wpn.BackColor=SystemColors.Control;
+				m_NavigationControl=wpn;
+			}
+
+#if !TRIAL
+			IDesignerHost dh = this.GetService(typeof(IDesignerHost)) as IDesignerHost;
+			if (dh != null)
+				dh.LoadComplete += new EventHandler(dh_LoadComplete);
+#endif
+        }
+        protected override void Dispose(bool disposing)
+        {
+            IComponentChangeService cc = (IComponentChangeService)GetService(typeof(IComponentChangeService));
+            if (cc != null)
+            {
+                cc.ComponentRemoved -= new ComponentEventHandler(this.OnComponentRemoved);
+            }
+
+            base.Dispose(disposing);
+        }
+
+        private void OnComponentRemoved(object sender, ComponentEventArgs e)
+        {
+            if (e.Component is WizardPage)
+            {
+                WizardPage page = e.Component as WizardPage;
+                Wizard w = this.Control as Wizard;
+
+                if (page != null && w.WizardPages.Contains(page))
+                {
+                    IComponentChangeService cc = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+                    if (cc != null)
+                        cc.OnComponentChanging(w, TypeDescriptor.GetProperties(w)["WizardPages"]);
+
+                    w.WizardPages.Remove(page);
+
+                    if (cc != null)
+                        cc.OnComponentChanged(w, TypeDescriptor.GetProperties(w)["WizardPages"], null, null);
+                }
+            }
+        }
+
+        public override void DoDefaultAction()
+        {
+        }
+
+        public override DesignerVerbCollection Verbs
+        {
+            get
+            {
+                DesignerVerb[] verbs = null;
+                verbs = new DesignerVerb[]
+					{
+						new DesignerVerb("Create Inner Page", new EventHandler(CreatePage)),
+						new DesignerVerb("Create Welcome Page", new EventHandler(CreateWelcomePage)),
+						new DesignerVerb("Create Outer Page", new EventHandler(CreateOuterPage)),
+                        new DesignerVerb("Delete Page", new EventHandler(DeletePage)),
+                        new DesignerVerb("Next Page", new EventHandler(NextPage)),
+                        new DesignerVerb("Previous Page", new EventHandler(PreviousPage)),
+                        new DesignerVerb("Goto Page/Change Order", new EventHandler(GotoPage))
+                    };
+                return new DesignerVerbCollection(verbs);
+            }
+        }
+
+#if FRAMEWORK20
+        public override void InitializeNewComponent(IDictionary defaultValues)
+        {
+            base.InitializeNewComponent(defaultValues);
+            SetDesignTimeDefaults();
+        }
+#else
+		public override void OnSetComponentDefaults()
+		{
+			base.OnSetComponentDefaults();
+            SetDesignTimeDefaults();
+		}
+#endif
+
+        private void SetDesignTimeDefaults()
+        {
+            Wizard w = this.Control as Wizard;
+            if (w == null)
+                return;
+            TypeDescriptor.GetProperties(w)["HeaderImageVisible"].SetValue(w, true);
+            TypeDescriptor.GetProperties(w)["Dock"].SetValue(w,DockStyle.Fill);
+
+            SetDefaultFooterStyle(w);
+#if !TRIAL
+			string key = GetLicenseKey();
+			w.LicenseKey = key;
+#endif
+        }
+
+        private void GotoPage(object sender, EventArgs e)
+        {
+            Wizard w = this.Control as Wizard;
+            IComponentChangeService cc = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+            ISelectionService ss = this.GetService(typeof(ISelectionService)) as ISelectionService;
+            GotoPage(w, cc, ss);
+        }
+
+        internal static void GotoPage(Wizard w, IComponentChangeService cc, ISelectionService ss)
+        {
+            if (w == null)
+                return;
+
+            WizardPageOrderDialog d = new WizardPageOrderDialog();
+            d.SetWizard(w);
+            d.StartPosition = FormStartPosition.CenterScreen;
+            if (d.ShowDialog() == DialogResult.OK)
+            {
+                string pageName = d.SelectedPageName;
+                
+                if (d.OrderChanged)
+                {
+                    if (cc != null)
+                        cc.OnComponentChanging(w, TypeDescriptor.GetProperties(w)["WizardPages"]);
+
+                    string[] newOrder = d.OrderedPageNames;
+                    w.WizardPages.IgnoreEvents = true;
+                    try
+                    {
+                        WizardPageCollection col = new WizardPageCollection();
+                        w.WizardPages.CopyTo(col);
+                        w.WizardPages.Clear();
+                        foreach (string pn in newOrder)
+                            w.WizardPages.Add(col[pn]);
+                    }
+                    finally
+                    {
+                        w.WizardPages.IgnoreEvents = false;
+                    }
+
+                    if (cc != null)
+                        cc.OnComponentChanged(w, TypeDescriptor.GetProperties(w)["WizardPages"], null, null);
+                }
+
+                if (pageName != "")
+                    w.SelectedPage = w.WizardPages[pageName];
+                else if (d.OrderChanged)
+                    w.SelectedPageIndex = 0;
+
+                if (ss != null && (pageName!="" || d.OrderChanged))
+                    ss.SetSelectedComponents(new WizardPage[] { w.SelectedPage }, SelectionTypes.Replace);
+            }
+            d.Dispose();
+        }
+
+        private void CreatePage(object sender, EventArgs e)
+        {
+            IDesignerHost dh = this.GetService(typeof(IDesignerHost)) as IDesignerHost;
+            IComponentChangeService cc = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+            ISelectionService ss = this.GetService(typeof(ISelectionService)) as ISelectionService;
+
+            CreatePage(this.Control as Wizard, true, dh, cc, ss, m_WizardStyle);
+        }
+
+        private void CreateWelcomePage(object sender, EventArgs e)
+        {
+            IDesignerHost dh = this.GetService(typeof(IDesignerHost)) as IDesignerHost;
+            IComponentChangeService cc = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+            ISelectionService ss = this.GetService(typeof(ISelectionService)) as ISelectionService;
+
+            CreateWelcomePage(this.Control as Wizard, dh, cc, ss, this.WizardStyle);
+        }
+
+        private void CreateOuterPage(object sender, EventArgs e)
+        {
+            IDesignerHost dh = this.GetService(typeof(IDesignerHost)) as IDesignerHost;
+            IComponentChangeService cc = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+            ISelectionService ss = this.GetService(typeof(ISelectionService)) as ISelectionService;
+
+            CreatePage(this.Control as Wizard, false, dh, cc, ss, m_WizardStyle);
+        }
+
+        private void DeletePage(object sender, EventArgs e)
+        {
+            IDesignerHost dh = this.GetService(typeof(IDesignerHost)) as IDesignerHost;
+            IComponentChangeService cc = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+            Wizard w = this.Control as Wizard;
+            if (w == null)
+                return;
+            DeletePage(w.SelectedPage, dh, cc);
+        }
+
+        internal static void DeletePage(WizardPage page, IDesignerHost dh, IComponentChangeService cc)
+        {
+            if (page == null || !(page.Parent is Wizard))
+                return;
+
+            Wizard w = page.Parent as Wizard;
+
+            DesignerTransaction dt = dh.CreateTransaction();
+
+            try
+            {
+                if (cc != null)
+                    cc.OnComponentChanging(w, TypeDescriptor.GetProperties(w)["WizardPages"]);
+
+                w.WizardPages.Remove(page);
+
+                if (cc != null)
+                    cc.OnComponentChanged(w, TypeDescriptor.GetProperties(w)["WizardPages"], null, null);
+
+                dh.DestroyComponent(page);
+            }
+            catch
+            {
+                dt.Cancel();
+            }
+            finally
+            {
+                if (!dt.Canceled)
+                    dt.Commit();
+            }
+        }
+
+        private void NextPage(object sender, EventArgs e)
+        {
+            SelectNextPage(this.Control as Wizard);
+        }
+
+        private void PreviousPage(object sender, EventArgs e)
+        {
+            SelectPreviousPage(this.Control as Wizard);
+        }
+
+        internal static bool SelectNextPage(Wizard w)
+        {
+            if (w == null)
+                return false;
+
+            WizardPage page = w.GetNextPage();
+            if (page != null)
+            {
+                w.SelectedPage = page;
+                return true;
+            }
+            return false;
+        }
+
+        internal static bool SelectPreviousPage(Wizard w)
+        {
+            if (w == null)
+                return false;
+
+            WizardPage page = w.GetBackPage();
+            if (page != null)
+            {
+                w.SelectedPage = page;
+                return true;
+            }
+            return false;
+        }
+
+        private enum eWizardImages
+        {
+            WelcomeDefault,
+            BackgroundOffice2007
+        }
+
+        private static Image LoadWizardImage(eWizardImages wizardImage)
+        {
+            string wizardImageName = "WizardWelcomeImage.png";
+            if (wizardImage == eWizardImages.BackgroundOffice2007)
+                wizardImageName = "WizardOffice2007Background.png";
+            try
+            {
+                Microsoft.Win32.RegistryKey key = Microsoft.Win32.Registry.LocalMachine;
+                string path = "";
+                try
+                {
+                    if (key != null)
+                        key = key.OpenSubKey("Software\\DevComponents\\DotNetBar");
+                    if (key != null)
+                        path = key.GetValue("InstallationFolder", "").ToString();
+                }
+                finally { if (key != null) key.Close(); }
+
+                if (path != "")
+                {
+                    if (path.Substring(path.Length - 1, 1) != "\\")
+                        path += "\\";
+
+                    if (System.IO.File.Exists(path + wizardImageName))
+                        path += wizardImageName;
+                    else
+                        path = "";
+                }
+
+                if (path != "")
+                {
+                    return new Bitmap(path);
+                }
+            }
+            catch (Exception)
+            {
+            }
+            return null;
+        }
+
+        internal static void ApplyOffice2007WelcomePageStyle(WizardPage page, IDesignerHost dh, IComponentChangeService cc)
+        {
+            DesignerTransaction dt = null;
+            if (dh != null) dt = dh.CreateTransaction();
+            
+            try
+            {
+                if (cc != null) cc.OnComponentChanging(page, null);
+                page.BackColor = Color.Transparent;
+                page.Style.Reset();
+                //page.BackColor = ColorScheme.GetColor(0xBBDBF7);
+                //page.CanvasColor = page.BackColor;
+                //page.Style.BackColor = Color.Empty;
+                //page.Style.BackColor2 = Color.Empty;
+                //page.Style.BackColorBlend.Clear();
+                //page.Style.BackColorBlend.AddRange(new BackgroundColorBlend[] {
+                //new BackgroundColorBlend(ColorScheme.GetColor(0xBBDBF7), 0f),
+                //new BackgroundColorBlend(ColorScheme.GetColor(0xBBDBF7), .3f),
+                //new BackgroundColorBlend(ColorScheme.GetColor(0xF3F9FE), .9f),
+                //new BackgroundColorBlend(ColorScheme.GetColor(0xFEFFFF), 1f)});
+                //page.Style.BackColorGradientAngle = 90;
+                //page.Style.BackgroundImage = GetWelcomeImage(eWizardImages.BackgroundOffice2007);
+                //page.Style.BackgroundImagePosition = eStyleBackgroundImage.TopLeft;
+
+                if (cc != null) cc.OnComponentChanged(page, null, null, null);
+            }
+            catch
+            {
+                dt.Cancel();
+                throw;
+            }
+            finally
+            {
+                if (dt != null && !dt.Canceled)
+                    dt.Commit();
+            }
+        }
+
+        internal static void ApplyOffice2007InnerPageStyle(WizardPage page, IDesignerHost dh, IComponentChangeService cc)
+        {
+            if (cc != null) cc.OnComponentChanging(page, null);
+            
+            page.BackColor = Color.Transparent;
+            page.Style.Reset();
+            
+            if (cc != null) cc.OnComponentChanged(page, null, null, null);
+        }
+
+        internal static void ApplyDefaultInnerPageStyle(WizardPage page, IDesignerHost dh, IComponentChangeService cc)
+        {
+            if (cc != null) cc.OnComponentChanging(page, null);
+
+            page.BackColor = SystemColors.Control;
+            if (!page.InteriorPage)
+            {
+                TypeDescriptor.GetProperties(page.Style)["BackColor"].SetValue(page.Style, Color.White);
+            }
+            
+            if (cc != null) cc.OnComponentChanged(page, null, null, null);
+        }
+
+        internal static void ApplyDefaultWelcomePageStyle(WizardPage page, IDesignerHost dh, IComponentChangeService cc)
+        {
+            DesignerTransaction dt = null;
+            if (dh != null) dt = dh.CreateTransaction();
+            
+            try
+            {
+                page.BackColor = Color.White;
+                page.Style.BackColorBlend.Clear();
+                TypeDescriptor.GetProperties(page)["InteriorPage"].SetValue(page, false);
+                TypeDescriptor.GetProperties(page)["BackColor"].SetValue(page, Color.White);
+                TypeDescriptor.GetProperties(page)["CanvasColor"].SetValue(page, Color.White);
+                TypeDescriptor.GetProperties(page.Style)["BackColor"].SetValue(page.Style, Color.White);
+                TypeDescriptor.GetProperties(page.Style)["BackColor2"].SetValue(page.Style, Color.Empty);
+                TypeDescriptor.GetProperties(page.Style)["BackgroundImage"].SetValue(page.Style, LoadWizardImage(eWizardImages.WelcomeDefault));
+                TypeDescriptor.GetProperties(page.Style)["BackgroundImagePosition"].SetValue(page.Style, eStyleBackgroundImage.TopLeft);
+            }
+            catch
+            {
+                dt.Cancel();
+                throw;
+            }
+            finally
+            {
+                if (dt != null && !dt.Canceled)
+                    dt.Commit();
+            }
+        }
+
+        internal static WizardPage CreateWelcomePage(Wizard parent, IDesignerHost dh, IComponentChangeService cc, ISelectionService ss, eWizardStyle style)
+        {
+            DesignerTransaction dt = dh.CreateTransaction();
+            WizardPage page = null;
+            try
+            {
+                page = dh.CreateComponent(typeof(WizardPage)) as WizardPage;
+
+                if(style == eWizardStyle.Default)
+                    ApplyDefaultWelcomePageStyle(page, null, null);
+                else
+                    ApplyOffice2007WelcomePageStyle(page, null, null);
+                //TypeDescriptor.GetProperties(page)["InteriorPage"].SetValue(page, false);
+                //TypeDescriptor.GetProperties(page)["BackColor"].SetValue(page, Color.White);
+                //TypeDescriptor.GetProperties(page)["CanvasColor"].SetValue(page, Color.White);
+                //TypeDescriptor.GetProperties(page.Style)["BackColor"].SetValue(page.Style, Color.White);
+                //TypeDescriptor.GetProperties(page.Style)["BackgroundImage"].SetValue(page.Style, GetWelcomeImage(false));
+                //TypeDescriptor.GetProperties(page.Style)["BackgroundImagePosition"].SetValue(page.Style, eStyleBackgroundImage.TopLeft);
+                page.Size = new Size(534, 289);
+
+                // Load labels onto the page, first Welcome to the Wizard...
+                System.Windows.Forms.Label label = dh.CreateComponent(typeof(System.Windows.Forms.Label)) as System.Windows.Forms.Label;
+                page.Controls.Add(label);
+                label.Location = new Point(210, 18);
+                label.Text = "Welcome to the <Wizard Name> Wizard";
+                label.BackColor = Color.Transparent;
+                try
+                {
+                    label.Font = new Font("Tahoma", 16);
+                    TypeDescriptor.GetProperties(label)["AutoSize"].SetValue(label, false);
+                }
+                catch { }
+                label.Size = new Size(310, 66);
+                label.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+
+                // Wizard description label...
+                label = dh.CreateComponent(typeof(System.Windows.Forms.Label)) as System.Windows.Forms.Label;
+                page.Controls.Add(label);
+                label.Location = new Point(210, 100);
+                label.Text = "This wizard will guide you through the <Enter Process Name>.\r\n\r\n<Enter brief description of the process wizard is covering.>";
+                label.BackColor = Color.Transparent;
+                try
+                {
+                    TypeDescriptor.GetProperties(label)["AutoSize"].SetValue(label, false);
+                }
+                catch { }
+                label.Size = new Size(309, 157);
+                label.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right | AnchorStyles.Bottom;
+
+                // Click Next to Continue label...
+                label = dh.CreateComponent(typeof(System.Windows.Forms.Label)) as System.Windows.Forms.Label;
+                page.Controls.Add(label);
+                label.Location = new Point(210, 266);
+                label.Text = "To continue, click Next.";
+                label.Size = new Size(120, 13);
+                label.Anchor = AnchorStyles.Left | AnchorStyles.Bottom;
+                label.BackColor = Color.Transparent;
+                
+                if (cc != null)
+                    cc.OnComponentChanging(parent, TypeDescriptor.GetProperties(parent)["WizardPages"]);
+                parent.WizardPages.Add(page);
+                if (cc != null)
+                    cc.OnComponentChanged(parent, TypeDescriptor.GetProperties(parent)["WizardPages"], null, null);
+
+
+                if (ss != null)
+                    ss.SetSelectedComponents(new WizardPage[] { page }, SelectionTypes.Replace);
+
+                TypeDescriptor.GetProperties(parent)["SelectedPageIndex"].SetValue(parent, parent.WizardPages.IndexOf(page));
+            }
+            catch
+            {
+                dt.Cancel();
+            }
+            finally
+            {
+                if (!dt.Canceled)
+                    dt.Commit();
+            }
+
+            return page;
+        }
+
+        internal static WizardPage CreatePage(Wizard parent, bool innerPage, IDesignerHost dh, IComponentChangeService cc, ISelectionService ss, eWizardStyle wizardStyle)
+        {
+            DesignerTransaction dt = dh.CreateTransaction();
+            WizardPage page=null;
+            try
+            {
+                page = dh.CreateComponent(typeof(WizardPage)) as WizardPage;
+				
+				page.AntiAlias=false;
+                page.InteriorPage = innerPage;
+                if (innerPage)
+                {
+                    page.PageTitle = "< Wizard step title >";
+                    page.PageDescription = "< Wizard step description >";
+                }
+                if (wizardStyle == eWizardStyle.Default)
+                    ApplyDefaultInnerPageStyle(page, dh, cc);
+                else if (wizardStyle == eWizardStyle.Office2007)
+                    ApplyOffice2007InnerPageStyle(page, dh, cc);
+                //else
+                //{
+                //    TypeDescriptor.GetProperties(page.Style)["BackColor"].SetValue(page.Style, Color.White);
+                //}
+
+                if (cc != null)
+                    cc.OnComponentChanging(parent, TypeDescriptor.GetProperties(parent)["WizardPages"]);
+                parent.WizardPages.Add(page);
+                if (cc != null)
+                    cc.OnComponentChanged(parent, TypeDescriptor.GetProperties(parent)["WizardPages"], null, null);
+
+                if (ss != null)
+                    ss.SetSelectedComponents(new WizardPage[] { page }, SelectionTypes.Replace);
+
+                TypeDescriptor.GetProperties(parent)["SelectedPageIndex"].SetValue(parent, parent.WizardPages.IndexOf(page));
+            }
+            catch
+            {
+                dt.Cancel();
+            }
+            finally
+            {
+                if (!dt.Canceled)
+                    dt.Commit();
+            }
+
+            return page;
+        }
+
+        protected override void OnMouseDragBegin(int x, int y)
+        {
+            Wizard w = this.Control as Wizard;
+
+            if (w != null)
+            {
+                Point p = w.NextButtonControl.Parent.PointToClient(new Point(x, y));
+                if (w.NextButtonControl.Enabled && w.NextButtonControl.Visible && w.NextButtonControl.Bounds.Contains(p))
+                {
+                    SelectNextPage(w);
+                    return;
+                }
+                else if (w.BackButtonControl.Enabled && w.BackButtonControl.Visible && w.BackButtonControl.Bounds.Contains(p))
+                {
+                    SelectPreviousPage(w);
+                    return;
+                }
+				if(m_NavigationControl!=null)
+				{
+					p = m_NavigationControl.PointToClient(new Point(x, y));
+					if(m_NavigationControl.LinkNext.Bounds.Contains(p))
+					{
+						SelectNextPage(w);
+						return;
+					}
+					else if(m_NavigationControl.LinkBack.Bounds.Contains(p))
+					{
+						SelectPreviousPage(w);
+						return;
+					}
+				}
+            }
+
+            base.OnMouseDragBegin(x, y);
+        }
+
+        protected override void PreFilterProperties(System.Collections.IDictionary properties)
+        {
+            base.PreFilterProperties(properties);
+
+            properties["WizardStyle"] = TypeDescriptor.CreateProperty(
+                this.GetType(),
+                "WizardStyle",
+                typeof(eWizardStyle),
+                new Attribute[] { 
+                    new BrowsableAttribute(true), 
+                    new DesignOnlyAttribute(true),
+                    new DefaultValueAttribute(eWizardStyle.Default), 
+                    new DescriptionAttribute("Indicates the visual appearance style of the Wizard")});
+        }
+
+        private eWizardStyle m_WizardStyle = eWizardStyle.Default;
+        public eWizardStyle WizardStyle
+        {
+            get { return m_WizardStyle; }
+            set
+            {
+                if(m_WizardStyle!=value)
+                {
+                    m_WizardStyle = value;
+                    ((Wizard)this.Control).ButtonStyle = m_WizardStyle;
+
+                    IDesignerHost dh = GetService(typeof(IDesignerHost)) as IDesignerHost;
+                    if(dh!=null && !dh.Loading)
+                        ChangeWizardStyle(m_WizardStyle);
+                }
+            }
+        }
+
+        private void SetDefaultFooterStyle(Wizard w)
+        {
+            w.FooterStyle.BackColor = System.Drawing.SystemColors.Control;
+            w.FooterStyle.BackColorGradientAngle = 90;
+            w.FooterStyle.BorderBottomWidth = 1;
+            w.FooterStyle.BorderColor = System.Drawing.SystemColors.Control;
+            w.FooterStyle.BorderLeftWidth = 1;
+            w.FooterStyle.BorderRightWidth = 1;
+            w.FooterStyle.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Etched;
+            w.FooterStyle.BorderTopColor = System.Drawing.SystemColors.Control;
+            w.FooterStyle.BorderTopWidth = 1;
+            w.FooterStyle.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
+            w.FooterStyle.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
+        }
+
+        private void ChangeWizardStyle(eWizardStyle style)
+        {
+            IComponentChangeService cc = GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+            IDesignerHost dh = GetService(typeof(IDesignerHost)) as IDesignerHost;
+
+            DesignerTransaction dt = dh.CreateTransaction();
+            try
+            {
+                Wizard w = this.Control as Wizard;
+
+                w.FooterStyle.Reset();
+                if (style == eWizardStyle.Office2007)
+                {
+                    w.FooterStyle.BackColor = Color.Transparent;
+                    w.BackColor = Color.FromArgb(205, 229, 253);
+                    w.ForeColor = ColorScheme.GetColor(0x0F3981);
+                    w.BackgroundImage = LoadWizardImage(eWizardImages.BackgroundOffice2007);
+                    w.HeaderStyle.Reset();
+                    w.HeaderStyle.BackColor = Color.Transparent;// ColorScheme.GetColor(0xBFD7F3);
+                    w.HeaderStyle.BackColor2 = Color.Empty; // ColorScheme.GetColor(0xDBF1FE);
+                    w.HeaderStyle.BackColorGradientAngle = 90;
+                    w.HeaderStyle.BorderBottomColor = ColorScheme.GetColor(0x799DB6);
+                    w.HeaderStyle.BorderBottomWidth = 1;
+                    w.HeaderStyle.BorderBottom = eStyleBorderType.Solid;
+                    w.HeaderHeight = 90;
+                    w.HeaderDescriptionVisible = false;
+                    w.HeaderImageAlignment = eWizardTitleImageAlignment.Left;
+                    w.HeaderCaptionFont = new Font(w.Font.FontFamily, 12, FontStyle.Bold);
+                }
+                else if (style == eWizardStyle.Default)
+                {
+                    SetDefaultFooterStyle(w);
+                    w.BackgroundImage = null;
+                    w.BackColor = SystemColors.Control;
+                    w.ForeColor = SystemColors.ControlText;
+                    w.HeaderStyle.Reset();
+                    w.HeaderStyle.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
+                    w.HeaderStyle.BackColorGradientAngle = 90;
+                    w.HeaderStyle.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Etched;
+                    w.HeaderStyle.BorderBottomWidth = 1;
+                    w.HeaderStyle.BorderColor = System.Drawing.SystemColors.Control;
+                    w.HeaderStyle.BorderLeftWidth = 1;
+                    w.HeaderStyle.BorderRightWidth = 1;
+                    w.HeaderStyle.BorderTopWidth = 1;
+                    w.HeaderStyle.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
+                    w.HeaderStyle.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
+                    w.HeaderHeight = 60;
+                    w.HeaderDescriptionVisible = true;
+                    w.HeaderCaptionFont = new Font(w.Font, FontStyle.Bold);
+                    w.HeaderImageAlignment = eWizardTitleImageAlignment.Right;
+                }
+
+                for (int i = 0; i < w.WizardPages.Count; i++)
+                {
+                    WizardPage p = w.WizardPages[i];
+                    if (!p.InteriorPage && i==0)
+                    {
+                        if (style == eWizardStyle.Default)
+                            ApplyDefaultWelcomePageStyle(p, null, cc);
+                        else if (style == eWizardStyle.Office2007)
+                            ApplyOffice2007WelcomePageStyle(p, null, cc);
+                    }
+                    else
+                    {
+                        if (style == eWizardStyle.Default)
+                            ApplyDefaultInnerPageStyle(p, null, cc);
+                        else if (style == eWizardStyle.Office2007)
+                            ApplyOffice2007InnerPageStyle(p, null, cc);
+                    }
+                }
+            }
+            catch
+            {
+                dt.Cancel();
+            }
+            finally
+            {
+                if(!dt.Canceled)
+                    dt.Commit();
+            }
+        }
+        #endregion
+
+        #region Licensing Stuff
+#if !TRIAL
+        private string GetLicenseKey()
+		{
+			string key = "";
+			Microsoft.Win32.RegistryKey regkey = Microsoft.Win32.Registry.LocalMachine;
+			regkey = regkey.OpenSubKey("Software\\DevComponents\\Licenses", false);
+			if (regkey != null)
+			{
+				object keyValue = regkey.GetValue("DevComponents.DotNetBar.DotNetBarManager2");
+				if (keyValue != null)
+					key = keyValue.ToString();
+			}
+			return key;
+		}
+		private void dh_LoadComplete(object sender, EventArgs e)
+		{
+			IDesignerHost dh = this.GetService(typeof(IDesignerHost)) as IDesignerHost;
+			if (dh != null)
+				dh.LoadComplete -= new EventHandler(dh_LoadComplete);
+
+			string key = GetLicenseKey();
+			Wizard w = this.Control as Wizard;
+			if (key != "" && w != null && w.LicenseKey == "" && w.LicenseKey != key)
+				TypeDescriptor.GetProperties(w)["LicenseKey"].SetValue(w, key);
+		}
+#endif
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/WizardPageDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/WizardPageDesigner.cs
new file mode 100644
index 00000000..5febc2fa
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/WizardPageDesigner.cs	
@@ -0,0 +1,103 @@
+using System;
+using System.Text;
+using System.Windows.Forms.Design;
+using System.ComponentModel.Design;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar.Design
+{
+    /// <summary>
+    /// Represents Windows Forms Designer for WizardPage.
+    /// </summary>
+    public class WizardPageDesigner : ScrollableControlDesigner
+    {
+        #region Internal Implementation
+        public override DesignerVerbCollection Verbs
+        {
+            get
+            {
+                DesignerVerb[] verbs = null;
+                verbs = new DesignerVerb[]
+					{
+						new DesignerVerb("Create Inner Page", new EventHandler(CreateInnerPage)),
+						new DesignerVerb("Create Welcome Page", new EventHandler(CreateWelcomePage)),
+						new DesignerVerb("Create Outer Page", new EventHandler(CreateOuterPage)),
+                        new DesignerVerb("Delete Page", new EventHandler(DeletePage)),
+                        new DesignerVerb("Next Page", new EventHandler(NextPage)),
+                        new DesignerVerb("Previous Page", new EventHandler(PreviousPage)),
+                        new DesignerVerb("Goto Page/Change Order", new EventHandler(GotoPage))
+                    };
+                return new DesignerVerbCollection(verbs);
+            }
+        }
+
+        public override SelectionRules SelectionRules
+		{
+			get{return SelectionRules.Locked;}
+        }
+
+        private Wizard GetWizard()
+        {
+            WizardPage page = this.Control as WizardPage;
+            return page.Parent as Wizard;
+        }
+
+        private void GotoPage(object sender, EventArgs e)
+        {
+            IComponentChangeService cc = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+            ISelectionService ss = this.GetService(typeof(ISelectionService)) as ISelectionService;
+            WizardDesigner.GotoPage(this.GetWizard(), cc, ss);
+        }
+
+
+        private void CreateInnerPage(object sender, EventArgs e)
+        {
+            IDesignerHost dh = this.GetService(typeof(IDesignerHost)) as IDesignerHost;
+            IComponentChangeService cc = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+            ISelectionService ss = this.GetService(typeof(ISelectionService)) as ISelectionService;
+
+            Wizard w = GetWizard();
+            WizardDesigner.CreatePage(w, true, dh, cc, ss, w.ButtonStyle);
+        }
+
+        private void CreateWelcomePage(object sender, EventArgs e)
+        {
+            IDesignerHost dh = this.GetService(typeof(IDesignerHost)) as IDesignerHost;
+            IComponentChangeService cc = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+            ISelectionService ss = this.GetService(typeof(ISelectionService)) as ISelectionService;
+
+            Wizard w = GetWizard();
+            WizardDesigner.CreateWelcomePage(w, dh, cc, ss, w.ButtonStyle);
+        }
+
+        private void CreateOuterPage(object sender, EventArgs e)
+        {
+            IDesignerHost dh = this.GetService(typeof(IDesignerHost)) as IDesignerHost;
+            IComponentChangeService cc = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+            ISelectionService ss = this.GetService(typeof(ISelectionService)) as ISelectionService;
+
+            Wizard w = GetWizard();
+            WizardDesigner.CreatePage(w, false, dh, cc, ss, w.ButtonStyle);
+        }
+
+        private void DeletePage(object sender, EventArgs e)
+        {
+            WizardPage page = this.Control as WizardPage;
+            IDesignerHost dh = this.GetService(typeof(IDesignerHost)) as IDesignerHost;
+            IComponentChangeService cc = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+
+            WizardDesigner.DeletePage(page, dh, cc);
+        }
+
+        private void NextPage(object sender, EventArgs e)
+        {
+            WizardDesigner.SelectNextPage(GetWizard());
+        }
+
+        private void PreviousPage(object sender, EventArgs e)
+        {
+            WizardDesigner.SelectPreviousPage(GetWizard());
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/WizardPageNavigationControl.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/WizardPageNavigationControl.cs
new file mode 100644
index 00000000..b0457219
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/WizardPageNavigationControl.cs	
@@ -0,0 +1,86 @@
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.Drawing;
+using System.Data;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Design
+{
+	/// <summary>
+	/// Summary description for WizardPageNavigationControl.
+	/// </summary>
+    [ToolboxItem(false)]
+    internal class WizardPageNavigationControl : System.Windows.Forms.UserControl
+	{
+		public System.Windows.Forms.LinkLabel LinkBack;
+		public System.Windows.Forms.LinkLabel LinkNext;
+		/// <summary> 
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.Container components = null;
+
+		public WizardPageNavigationControl()
+		{
+			// This call is required by the Windows.Forms Form Designer.
+			InitializeComponent();
+		}
+
+		/// <summary> 
+		/// Clean up any resources being used.
+		/// </summary>
+		protected override void Dispose( bool disposing )
+		{
+			if( disposing )
+			{
+				if(components != null)
+				{
+					components.Dispose();
+				}
+			}
+			base.Dispose( disposing );
+		}
+
+		#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.LinkBack = new System.Windows.Forms.LinkLabel();
+			this.LinkNext = new System.Windows.Forms.LinkLabel();
+			this.SuspendLayout();
+			// 
+			// LinkBack
+			// 
+			this.LinkBack.Dock = System.Windows.Forms.DockStyle.Left;
+			this.LinkBack.Name = "LinkBack";
+			this.LinkBack.Size = new System.Drawing.Size(45, 16);
+			this.LinkBack.TabIndex = 0;
+			this.LinkBack.TabStop = true;
+			this.LinkBack.Text = "< Back";
+			// 
+			// LinkNext
+			// 
+			this.LinkNext.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.LinkNext.Location = new System.Drawing.Point(40, 0);
+			this.LinkNext.Name = "LinkNext";
+			this.LinkNext.Size = new System.Drawing.Size(45, 16);
+			this.LinkNext.TabIndex = 1;
+			this.LinkNext.TabStop = true;
+			this.LinkNext.Text = "Next >";
+			// 
+			// WizardPageNavigationControl
+			// 
+			this.Controls.AddRange(new System.Windows.Forms.Control[] {
+																		  this.LinkNext,
+																		  this.LinkBack});
+			this.Name = "WizardPageNavigationControl";
+			this.Size = new System.Drawing.Size(90, 16);
+			this.ResumeLayout(false);
+
+		}
+		#endregion
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/WizardPageOrderDialog.cs b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/WizardPageOrderDialog.cs
new file mode 100644
index 00000000..da4a98e2
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/WizardPageOrderDialog.cs	
@@ -0,0 +1,263 @@
+using System;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Design
+{
+    [ToolboxItem(false)]
+    internal class WizardPageOrderDialog : Form
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        private System.Windows.Forms.ListView listView1;
+        private System.Windows.Forms.Button buttonOK;
+        private System.Windows.Forms.Button buttonCancel;
+        private Bar bar1;
+        private ButtonItem buttonPageUp;
+        private ButtonItem buttonPageDown;
+        private System.Windows.Forms.ColumnHeader columnHeaderName;
+        private System.Windows.Forms.ColumnHeader columnHeaderTitle;
+        private System.Windows.Forms.ColumnHeader columnHeaderDesc;
+        private Wizard m_Wizard = null;
+        private ColumnHeader columnInterior;
+        internal bool OrderChanged = false;
+
+
+        public WizardPageOrderDialog()
+        {
+            InitializeComponent();
+        }
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form 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.listView1 = new System.Windows.Forms.ListView();
+            this.columnHeaderName = new System.Windows.Forms.ColumnHeader();
+            this.columnHeaderTitle = new System.Windows.Forms.ColumnHeader();
+            this.columnHeaderDesc = new System.Windows.Forms.ColumnHeader();
+            this.buttonOK = new System.Windows.Forms.Button();
+            this.buttonCancel = new System.Windows.Forms.Button();
+            this.bar1 = new DevComponents.DotNetBar.Bar();
+            this.buttonPageUp = new DevComponents.DotNetBar.ButtonItem();
+            this.buttonPageDown = new DevComponents.DotNetBar.ButtonItem();
+            this.columnInterior = new System.Windows.Forms.ColumnHeader();
+            ((System.ComponentModel.ISupportInitialize)(this.bar1)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // listView1
+            // 
+            this.listView1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+                        | System.Windows.Forms.AnchorStyles.Left)
+                        | System.Windows.Forms.AnchorStyles.Right)));
+            this.listView1.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
+            this.columnHeaderName,
+            this.columnInterior,
+            this.columnHeaderTitle,
+            this.columnHeaderDesc});
+            this.listView1.FullRowSelect = true;
+            this.listView1.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable;
+            this.listView1.HideSelection = false;
+            this.listView1.Location = new System.Drawing.Point(12, 31);
+            this.listView1.MultiSelect = false;
+            this.listView1.Name = "listView1";
+            this.listView1.Size = new System.Drawing.Size(488, 233);
+            this.listView1.TabIndex = 0;
+            this.listView1.View = System.Windows.Forms.View.Details;
+            this.listView1.DoubleClick += new System.EventHandler(this.listView1_DoubleClick);
+            this.listView1.Resize += new System.EventHandler(this.listView1_Resize);
+            // 
+            // columnHeaderName
+            // 
+            this.columnHeaderName.Text = "Name";
+            this.columnHeaderName.Width = 100;
+            // 
+            // columnHeaderTitle
+            // 
+            this.columnHeaderTitle.Text = "Page Title";
+            this.columnHeaderTitle.Width = 150;
+            // 
+            // columnHeaderDesc
+            // 
+            this.columnHeaderDesc.Text = "Page Description";
+            this.columnHeaderDesc.Width = 187;
+            // 
+            // buttonOK
+            // 
+            this.buttonOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonOK.DialogResult = System.Windows.Forms.DialogResult.OK;
+            this.buttonOK.Location = new System.Drawing.Point(352, 270);
+            this.buttonOK.Name = "buttonOK";
+            this.buttonOK.Size = new System.Drawing.Size(73, 25);
+            this.buttonOK.TabIndex = 1;
+            this.buttonOK.Text = "OK";
+            // 
+            // buttonCancel
+            // 
+            this.buttonCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+            this.buttonCancel.Location = new System.Drawing.Point(427, 270);
+            this.buttonCancel.Name = "buttonCancel";
+            this.buttonCancel.Size = new System.Drawing.Size(73, 25);
+            this.buttonCancel.TabIndex = 2;
+            this.buttonCancel.Text = "Cancel";
+            // 
+            // bar1
+            // 
+            this.bar1.BackgroundImageAlpha = ((byte)(255));
+            this.bar1.Dock = System.Windows.Forms.DockStyle.Top;
+            this.bar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+            this.buttonPageUp,
+            this.buttonPageDown});
+            this.bar1.Location = new System.Drawing.Point(0, 0);
+            this.bar1.Name = "bar1";
+            this.bar1.Size = new System.Drawing.Size(512, 25);
+            this.bar1.Stretch = true;
+            this.bar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.VS2005;
+            this.bar1.TabIndex = 3;
+            this.bar1.TabStop = false;
+            this.bar1.Text = "bar1";
+            // 
+            // buttonPageUp
+            // 
+            this.buttonPageUp.Name = "buttonPageUp";
+            this.buttonPageUp.Shortcuts.Add(DevComponents.DotNetBar.eShortcut.CtrlUp);
+            this.buttonPageUp.Text = "Move Page Up";
+            this.buttonPageUp.Tooltip = "Change selected page order by moving it up";
+            this.buttonPageUp.Click += new System.EventHandler(this.buttonPageUp_Click);
+            // 
+            // buttonPageDown
+            // 
+            this.buttonPageDown.Name = "buttonPageDown";
+            this.buttonPageDown.Shortcuts.Add(DevComponents.DotNetBar.eShortcut.CtrlDown);
+            this.buttonPageDown.Text = "Move Page Down";
+            this.buttonPageDown.Tooltip = "Change selected page order by moving it down";
+            this.buttonPageDown.Click += new System.EventHandler(this.buttonPageDown_Click);
+            // 
+            // columnInterior
+            // 
+            this.columnInterior.Text = "Interior";
+            this.columnInterior.Width = 47;
+            // 
+            // WizardPageOrderDialog
+            // 
+            this.AcceptButton = this.buttonOK;
+            this.CancelButton = this.buttonCancel;
+            this.ClientSize = new System.Drawing.Size(512, 303);
+            this.Controls.Add(this.bar1);
+            this.Controls.Add(this.buttonCancel);
+            this.Controls.Add(this.buttonOK);
+            this.Controls.Add(this.listView1);
+            this.MinimizeBox = false;
+            this.Name = "WizardPageOrderDialog";
+            this.Text = "Wizard Pages";
+            ((System.ComponentModel.ISupportInitialize)(this.bar1)).EndInit();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private void listView1_DoubleClick(object sender, EventArgs e)
+        {
+            if (listView1.SelectedItems.Count == 1)
+            {
+                this.DialogResult = DialogResult.OK;
+                this.Close();
+            }
+        }
+
+        public void SetWizard(Wizard w)
+        {
+            m_Wizard = w;
+            foreach(WizardPage page in m_Wizard.WizardPages)
+            {
+                ListViewItem item = new ListViewItem(new string[] { page.Name, (page.InteriorPage?"Yes":"No") ,page.PageTitle, page.PageDescription });
+                listView1.Items.Add(item);
+            }
+        }
+
+        private void buttonPageUp_Click(object sender, EventArgs e)
+        {
+            if (listView1.SelectedItems.Count != 1)
+                return;
+            int i=listView1.SelectedItems[0].Index;
+            if (i == 0)
+                return;
+            ListViewItem item = listView1.SelectedItems[0];
+            listView1.Items.Remove(item);
+            listView1.Items.Insert(i - 1, item);
+            OrderChanged = true;
+        }
+
+        private void buttonPageDown_Click(object sender, EventArgs e)
+        {
+            if (listView1.SelectedItems.Count != 1)
+                return;
+
+            if (listView1.SelectedItems.Count != 1)
+                return;
+            int i = listView1.SelectedItems[0].Index;
+            if (i == listView1.Items.Count - 1)
+                return;
+            ListViewItem item = listView1.SelectedItems[0];
+            listView1.Items.Remove(item);
+            listView1.Items.Insert(i + 1, item);
+
+            OrderChanged = false;
+        }
+
+        private void listView1_Resize(object sender, EventArgs e)
+        {
+            int i = listView1.Width - columnHeaderName.Width - columnInterior.Width - columnHeaderTitle.Width - 6;
+            if(i>64)
+                columnHeaderDesc.Width=i;
+        }
+
+        internal string SelectedPageName
+        {
+            get
+            {
+                if (listView1.SelectedItems.Count == 1)
+                {
+                    return listView1.SelectedItems[0].Text;
+                }
+                return "";
+            }
+        }
+
+        internal string[] OrderedPageNames
+        {
+            get
+            {
+                string[] names = new string[listView1.Items.Count];
+                for (int i = 0; i < names.Length; i++)
+                    names[i] = listView1.Items[i].Text;
+                return names;
+            }
+        }
+        }
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesignTime/WizardPageOrderDialog.resx b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/WizardPageOrderDialog.resx
new file mode 100644
index 00000000..19dc0dd8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesignTime/WizardPageOrderDialog.resx	
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarDesigner.cs
new file mode 100644
index 00000000..fd0feded
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesigner.cs	
@@ -0,0 +1,2985 @@
+using System;
+using System.Drawing;
+using System.Collections;
+using System.ComponentModel;
+using System.Windows.Forms;
+using System.Data;
+
+namespace DevComponents.DotNetBar.Design
+{
+	/// <summary>
+	/// Summary description for Form1.
+	/// </summary>
+	public class DotNetBarDesigner : System.Windows.Forms.Form
+	{
+		#region Private variables
+		private IDesignerServices m_Designer=null;
+		internal DevComponents.DotNetBar.NavigationPane navigationPane1;
+		internal DevComponents.DotNetBar.NavigationPanePanel navigationPanePanel1;
+		internal DevComponents.DotNetBar.NavigationPanePanel navigationPanePanel2;
+		internal DevComponents.DotNetBar.ButtonItem buttonBars;
+		internal DevComponents.DotNetBar.ButtonItem buttonContext;
+		private DevComponents.DotNetBar.NavigationPanePanel navigationPanePanel3;
+		private DevComponents.DotNetBar.ButtonItem buttonCategories;
+		private ExpandableSplitter splitter1;
+		private DevComponents.DotNetBar.PanelEx panelEx1;
+		private ExpandableSplitter splitter2;
+		private DevComponents.DotNetBar.DotNetBarManager dotNetBarManager1;
+		private DevComponents.DotNetBar.DockSite barLeftDockSite;
+		private DevComponents.DotNetBar.DockSite barRightDockSite;
+		private DevComponents.DotNetBar.DockSite barTopDockSite;
+		private DevComponents.DotNetBar.DockSite barBottomDockSite;
+		private System.Windows.Forms.PropertyGrid propertyBars;
+		private System.Windows.Forms.TreeView treeBars;
+		private DevComponents.DotNetBar.Design.DefinitionPreviewControl definitionPreview;
+		private System.ComponentModel.IContainer components;
+		private System.Windows.Forms.PropertyGrid propertyCategories;
+		private DevComponents.DotNetBar.ExpandableSplitter splitterOffice20031;
+		private System.Windows.Forms.TreeView treeCategories;
+		private bool m_DataChanged=false;
+		private bool m_ShowItemText=true;
+		private System.Windows.Forms.OpenFileDialog m_OpenFileDialog;
+		private string m_DefinitionFileName="";
+		private System.Windows.Forms.ImageList imageList;
+		private System.Windows.Forms.PropertyGrid propertyMenus;
+		private DevComponents.DotNetBar.ExpandableSplitter splitterOffice20032;
+		private System.Windows.Forms.TreeView treeMenus;
+		private Bar m_DesignBar=null;
+
+		private Hashtable m_catTable;
+
+		private HTMLHelp m_HtmlHelp=null;
+
+		private GridViewSubclass m_GridSubclassBars=null;
+		private GridViewSubclass m_GridSubclassMenus=null;
+		private GridViewSubclass m_GridSubclassCategories=null;
+
+		private System.Windows.Forms.SaveFileDialog m_SaveFileDialog;
+
+		private DotNetBarManager m_ExternalManager=null;
+		private Bar m_ExternalBar=null;
+
+		private Timer m_LoadTimer=null;
+		private bool m_Loaded=false;
+
+        private ArrayList m_CommandLinksDeleted = new ArrayList();
+        private ArrayList m_CommandLinksCreated = new ArrayList();
+		#endregion
+
+		#region Command Constants
+		const string NEW_BUTTON="buttonNewButton";
+		const string NEW_LABEL="buttonNewLabel";
+		const string NEW_COLORPICKER="buttonNewColorPicker";
+		const string NEW_COMBO="buttonNewCombo";
+		const string NEW_PROGRESS="buttonNewProgress";
+		const string NEW_TEXTBOX="buttonNewTextBox";
+		const string NEW_DOCK="buttonNewDock";
+		const string NEW_CUSTOMIZE="buttonNewCustomize";
+		const string NEW_MDILIST="buttonNewMdiList";
+		const string NEW_CONTROLCONT="buttonNewControlCont";
+        const string SAVE_CLOSE = "buttonSaveAndClose";
+             
+		const string CONTEXT_MENU="popup";
+		const string MOVE_TO="buttonMoveTo";
+		const string COPY_TO="buttonCopyTo";
+		const string MOVE_LEFT="buttonMoveLeft";
+		const string MOVE_RIGHT="buttonMoveRight";
+		const string MOVE_UP="buttonMoveUp";
+		const string MOVE_DOWN="buttonMoveDown";
+
+		const string DELETE="buttonDelete";
+
+		const string SAVE_DEFINITION_AS="buttonSaveAs";
+		const string SAVE_DEFINITION="buttonSave";
+		const string SAVE_BAR_AS="buttonSaveBar";
+		const string LOAD_BAR="buttonLoadBar";
+		const string SYNC_CATEGORIES="buttonSyncCategories";
+
+		const string TO_CATEGORIES="buttonToCategories";
+		const string TO_CONTEXTMENUS="buttonToContextMenus";
+
+		const string RESET_IMAGE_POPUP="resetimagepopup";
+		const string RESET_IMAGE="buttonResetImage";
+		const string NEW_DEFINITION="buttonNewDefinition";
+		const string OPEN_DEFINITION="buttonOpen";
+		const string CLOSE_DESIGNER="buttonClose";
+		const string SHOW_HELP="buttonHelpContents";
+		const string SHOW_HELP_SEARCH="buttonHelpSearch";
+		const string NEW_TOOLBAR="buttonNewToolbar";
+		const string NEW_MENUBAR="buttonNewMenubar";
+		const string NEW_STATUSBAR="buttonNewStatusbar";
+		const string NEW_DOCKBAR="buttonNewDockWindow";
+		const string NEW_TASKBAR="buttonNewTaskPane";
+
+		const string CREATE_BARS_PARENT="buttonCreateBar";
+		#endregion
+
+		#region Constructor, load, unload  and dispose
+		public DotNetBarDesigner()
+		{
+			//
+			// Required for Windows Form Designer support
+			//
+			InitializeComponent();
+			InitializeInternal();
+
+            this.GetDesignManager().MouseDown += new MouseEventHandler(PreviewManagerMouseDown);
+		}
+
+        private void PreviewManagerMouseDown(object sender, MouseEventArgs e)
+        {
+            if (sender is BaseItem)
+            {
+                if (!((BaseItem)sender).SystemItem && !(sender is GenericItemContainer && ((GenericItemContainer)sender).SystemContainer))
+                    SelectObjectInPropertyGrid(sender);
+                else
+                {
+                    Bar bar = ((BaseItem)sender).ContainerControl as Bar;
+                    if (bar != null)
+                        SelectObjectInPropertyGrid(bar);
+                    else
+                        SelectObjectInPropertyGrid(null);
+                }
+            }
+            else if (sender is Bar)
+                SelectObjectInPropertyGrid(sender);
+            else
+                SelectObjectInPropertyGrid(null);
+        }
+
+		private void InitializeInternal()
+		{
+			propertyBars.CommandsVisibleIfAvailable=false;
+			propertyMenus.CommandsVisibleIfAvailable=false;
+			propertyCategories.CommandsVisibleIfAvailable=false;
+
+			m_catTable=new Hashtable(20);
+			
+			m_GridSubclassBars=new GridViewSubclass();
+			m_GridSubclassBars.ParentGrid=propertyBars;
+			m_GridSubclassBars.OnRightMouseDown+=new EventHandler(this.GridViewMouseDown);
+			m_GridSubclassMenus=new GridViewSubclass();
+			m_GridSubclassMenus.ParentGrid=propertyMenus;
+			m_GridSubclassMenus.OnRightMouseDown+=new EventHandler(this.GridViewMouseDown);
+			m_GridSubclassCategories=new GridViewSubclass();
+			m_GridSubclassCategories.ParentGrid=propertyCategories;
+			m_GridSubclassCategories.OnRightMouseDown+=new EventHandler(this.GridViewMouseDown);
+			
+			foreach(Control ctrl in propertyBars.Controls)
+			{
+				if(ctrl.GetType().ToString().IndexOf("PropertyGridView")>=0)
+				{
+					m_GridSubclassBars.AssignHandle(ctrl.Handle);
+					break;
+				}
+			}
+			foreach(Control ctrl in propertyMenus.Controls)
+			{
+				if(ctrl.GetType().ToString().IndexOf("PropertyGridView")>=0)
+				{
+					m_GridSubclassMenus.AssignHandle(ctrl.Handle);
+					break;
+				}
+			}
+			foreach(Control ctrl in propertyCategories.Controls)
+			{
+				if(ctrl.GetType().ToString().IndexOf("PropertyGridView")>=0)
+				{
+					m_GridSubclassCategories.AssignHandle(ctrl.Handle);
+					break;
+				}
+			}
+		}
+
+		private void DotNetBarDesigner_Load(object sender, System.EventArgs e)
+		{
+            dotNetBarManager1.Style = eDotNetBarStyle.Office2003;
+			try
+			{
+				Microsoft.Win32.RegistryKey key=Microsoft.Win32.Registry.LocalMachine;
+				string helpfile="";
+				try
+				{
+					if(key!=null)
+						key=key.OpenSubKey("Software\\DevComponents\\DotNetBar");
+					if(key!=null)
+						helpfile=key.GetValue("InstallationFolder","").ToString();
+				}
+				finally{if(key!=null) key.Close();}
+
+				if(helpfile!="")
+				{
+					if(helpfile.Substring(helpfile.Length-1,1)!="\\")
+						helpfile+="\\";
+
+					if(System.IO.File.Exists(helpfile+"dotnetbar.chm"))
+						helpfile+="dotnetbar.chm";
+					else
+						helpfile="";
+				}
+
+				if(helpfile!="")
+					m_HtmlHelp=new HTMLHelp(this,helpfile);
+			}
+			catch(Exception)
+			{
+			}
+
+			LoadFormLayout();
+			
+			SetupProperties();
+			this.RefreshView();
+
+			SetupToolbars();
+
+			if(m_LoadTimer!=null)
+				m_LoadTimer.Enabled=true;
+			m_Loaded=true;
+		}
+
+		private void CheckColorSchemeDataChanged()
+		{
+			if(m_DataChanged)
+				return;
+
+			if(this.GetDesignManager()!=null)
+			{
+				foreach(Bar bar in this.GetDesignManager().Bars)
+				{
+					if(bar.ColorScheme!=null && bar.ColorScheme.SchemeChanged)
+					{
+						m_DataChanged=true;
+						break;
+					}
+				}
+			}
+			else if(this.GetDesignBar()!=null)
+			{
+				if(this.GetDesignBar().ColorScheme!=null && this.GetDesignBar().ColorScheme.SchemeChanged)
+					m_DataChanged=true;
+			}
+		}
+
+		private void DotNetBarDesigner_Closing(object sender, System.ComponentModel.CancelEventArgs e)
+		{
+			CheckColorSchemeDataChanged();
+
+			if(m_DataChanged)
+			{
+				DialogResult result=DialogResult.No;
+				if(m_ExternalManager!=null)
+				{
+					result=MessageBox.Show("Definition has changed. Would you like to keep changes?","DotNetBar Designer",MessageBoxButtons.YesNoCancel,MessageBoxIcon.Question,MessageBoxDefaultButton.Button1);
+				}
+				else if(m_ExternalBar==null)
+				{
+					// Stand-alone editing
+					result=MessageBox.Show("Definition has changed. Would you like to save changes?","DotNetBar Desinger",MessageBoxButtons.YesNoCancel,MessageBoxIcon.Question,MessageBoxDefaultButton.Button1);
+				}
+
+				if(result==DialogResult.Cancel)
+				{
+					e.Cancel=true;
+					return;
+				}
+
+				if(result==DialogResult.Yes)
+				{
+					if(m_ExternalManager!=null)
+						m_ExternalManager.Definition=this.GetDesignManager().Definition;
+					else
+					{
+						if(SaveDefinition(false)==DialogResult.Cancel)
+						{
+							e.Cancel=true;
+							return;
+						}
+					}
+					this.DialogResult=DialogResult.Yes;
+				}
+				else
+					this.DialogResult=DialogResult.No;
+			}
+
+			SaveFormLayout();
+		}
+
+        private void DotNetBarDesigner_Closed(object sender, EventArgs e)
+        {
+            //ProcessCommandLinks((this.DialogResult == DialogResult.Yes));
+        }
+
+        private void ProcessCommandLinks(bool saveDefinition)
+        {
+            //if (m_Designer == null)
+            //    return;
+
+            //if (saveDefinition)
+            //{
+            //    // Delete removed CommandLinks when definition is saved
+            //    foreach (CommandLink link in m_CommandLinksDeleted)
+            //    {
+            //        link.Manager = null;
+            //        m_Designer.DestroyComponent(link);
+            //    }
+            //}
+            //else
+            //{
+            //    // Delete created CommandLinks when definition is saved
+            //    foreach (CommandLink link in m_CommandLinksCreated)
+            //    {
+            //        link.Manager = null;
+            //        m_Designer.DestroyComponent(link);
+            //    }
+            //}
+        }
+
+		private void LoadFormLayout()
+		{
+			// Load position if any
+			try
+			{
+				Microsoft.Win32.RegistryKey key=Microsoft.Win32.Registry.CurrentUser;
+				key=key.OpenSubKey("Software\\DevComponents\\DotNetBar");
+				if(key!=null)
+				{
+					try
+					{
+						string s=key.GetValue("Designer2Position","").ToString();
+						if(s!="")
+						{
+							if(s=="1")
+							{
+								this.WindowState=FormWindowState.Maximized;
+							}
+							else
+							{
+								string[] arr=s.Split(',');
+								if(arr.Length==4)
+								{
+									Rectangle r=new Rectangle(System.Xml.XmlConvert.ToInt32(arr[0]),System.Xml.XmlConvert.ToInt32(arr[1]),System.Xml.XmlConvert.ToInt32(arr[2]),System.Xml.XmlConvert.ToInt32(arr[3]));
+									foreach(Screen screen in Screen.AllScreens)
+									{
+										if(screen.Bounds.IntersectsWith(r))
+										{
+											this.StartPosition=FormStartPosition.Manual;
+											this.DesktopLocation=r.Location;
+											this.Size=r.Size;
+											break;
+										}
+									}
+								}
+							}
+						}
+						s=key.GetValue("Designer2PanelSize","").ToString();
+						navigationPane1.Width=System.Xml.XmlConvert.ToInt32(s);
+						s=key.GetValue("Designer2TreeHeight","").ToString();
+						treeBars.Height=System.Xml.XmlConvert.ToInt32(s);
+						treeMenus.Height=System.Xml.XmlConvert.ToInt32(s);
+						treeCategories.Height=System.Xml.XmlConvert.ToInt32(s);
+
+						s=key.GetValue("Designer2PropSortBars","").ToString();
+						if(s=="1")
+							propertyBars.PropertySort=PropertySort.Alphabetical;
+						s=key.GetValue("Designer2PropSortCat","").ToString();
+						if(s=="1")
+							propertyCategories.PropertySort=PropertySort.Alphabetical;
+						s=key.GetValue("Designer2PropSortMenus","").ToString();
+						if(s=="1")
+							propertyMenus.PropertySort=PropertySort.Alphabetical;
+					}
+					finally
+					{
+						key.Close();
+					}
+				}
+			}
+			catch(Exception)
+			{
+			}
+		}
+
+		private void SaveFormLayout()
+		{
+			// Save form position
+			if(this.WindowState!=FormWindowState.Minimized)
+			{
+				string s="";
+				if(this.WindowState==FormWindowState.Maximized)
+				{
+					s="1";
+				}
+				else
+				{
+					s=this.DesktopLocation.X+","+this.DesktopLocation.Y+","+this.Width+","+this.Height;
+				}
+				try
+				{
+					Microsoft.Win32.RegistryKey key=Microsoft.Win32.Registry.CurrentUser;
+					key=key.CreateSubKey("Software\\DevComponents\\DotNetBar");
+					key.SetValue("Designer2Position",s);
+					// Save Panel size
+					key.SetValue("Designer2PanelSize",navigationPane1.Width);
+					key.SetValue("Designer2TreeHeight",treeBars.Height);
+					key.SetValue("Designer2PropSortBars",(propertyBars.PropertySort==PropertySort.Alphabetical?"1":"0"));
+					key.SetValue("Designer2PropSortCat",(propertyCategories.PropertySort==PropertySort.Alphabetical?"1":"0"));
+					key.SetValue("Designer2PropSortMenus",(propertyMenus.PropertySort==PropertySort.Alphabetical?"1":"0"));
+					key.Close();
+				}
+				catch(Exception)
+				{
+				}
+			}
+		}
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		protected override void Dispose( bool disposing )
+		{
+			if( disposing )
+			{
+				if (components != null) 
+				{
+					components.Dispose();
+				}
+			}
+			base.Dispose( disposing );
+		}
+		#endregion
+
+		#region Preview Support
+		private DotNetBarManager GetDesignManager()
+		{
+			if(m_ExternalBar!=null)
+				return null;
+			return definitionPreview.previewManager;
+		}
+		private Bar GetDesignBar()
+		{
+			return m_ExternalBar;
+		}
+		#endregion
+
+		#region Categories Support
+		public void RescanCategories()
+		{
+			DotNetBarManager manager=GetDesignManager();
+			if(manager==null)
+				return;
+			if(manager.Bars.Count==0)
+				return;
+			manager.Items.Clear();
+			treeCategories.Nodes.Clear();
+			foreach(Bar bar in manager.Bars)
+			{
+				foreach(BaseItem item in bar.Items)
+					AutoCategorizeItem(item);
+			}
+			m_DataChanged=true;
+			RefreshCategories();
+		}
+
+		private void AutoCategorizeItem(BaseItem item)
+		{
+			DotNetBarManager manager=GetDesignManager();
+			if(item.Category!="" && item.Name!="" && !manager.Items.Contains(item.Name))
+				manager.Items.Add(item.Copy());
+			foreach(BaseItem i in item.SubItems)
+				AutoCategorizeItem(i);
+		}
+
+		private void RefreshCategories()
+		{
+			DotNetBarManager manager=this.GetDesignManager();
+			if(manager==null)
+				return;
+			// Load nodes from items
+			m_catTable.Clear();
+			foreach(DictionaryEntry o in manager.Items)
+			{
+				BaseItem objItem=o.Value as BaseItem;
+				TreeNode itemNode=CategorizeItem(objItem);
+				itemNode.Tag=objItem;
+
+				itemNode.ImageIndex=GetItemImageIndex(objItem);
+				itemNode.SelectedImageIndex=itemNode.ImageIndex;
+
+				AddSubItems(objItem,itemNode);
+			}
+		}
+
+		private TreeNode CategorizeItem(BaseItem newItem)
+		{
+			// Assign item to category
+			if(newItem.Category=="")
+				newItem.Category="(Untitled)";
+
+			TreeNode parentNode=null;
+			if(m_catTable.ContainsKey(newItem.Category))
+				parentNode=m_catTable[newItem.Category] as TreeNode;
+			else
+			{
+				parentNode=treeCategories.Nodes.Add(newItem.Category);
+				parentNode.ImageIndex=5;
+				parentNode.SelectedImageIndex=5;
+				m_catTable.Add(newItem.Category,parentNode);
+			}
+			
+			TreeNode newNode=parentNode.Nodes.Add(GetTreeItemText(newItem));
+			newNode.ImageIndex=GetItemImageIndex(newItem);
+			newNode.SelectedImageIndex=newNode.ImageIndex;
+			newNode.Tag=newItem;
+			return newNode;
+		}
+		#endregion
+
+		#region Bars Support
+		private void RefreshBars()
+		{
+			treeBars.Nodes.Clear();
+
+			if(GetDesignBar()!=null)
+			{
+				try
+				{
+					Bar bar=this.GetDesignBar();
+					this.Cursor=Cursors.WaitCursor;
+					
+					TreeNode barNode=treeBars.Nodes.Add(bar.Text);
+					barNode.Tag=bar;
+					barNode.ImageIndex=1;
+					barNode.SelectedImageIndex=1;
+					foreach(BaseItem objItem in bar.Items)
+					{
+						TreeNode itemNode=barNode.Nodes.Add(GetTreeItemText(objItem));
+						itemNode.Tag=objItem;
+
+						itemNode.ImageIndex=GetItemImageIndex(objItem);
+						itemNode.SelectedImageIndex=itemNode.ImageIndex;
+
+						AddSubItems(objItem,itemNode);
+					}
+					barNode.Expand();
+				}
+				finally
+				{
+					this.Cursor=Cursors.Arrow;
+				}
+				return;
+			}
+
+			if(this.GetDesignManager()==null)
+				return;
+
+			this.Cursor=Cursors.WaitCursor;
+
+			DotNetBarManager manager=this.GetDesignManager();
+			if(manager.TopDockSite==null && manager.BottomDockSite==null && manager.LeftDockSite==null && manager.RightDockSite==null)
+			{
+				// Context Menu editing ONLY
+			}
+			else
+			{
+			}
+
+			foreach(Bar bar in manager.Bars)
+			{
+				DisplayTreeBar(bar);
+			}
+
+			this.Cursor=Cursors.Arrow;
+		}
+		private void DisplayTreeBar(Bar bar)
+		{
+			TreeNode barNode=treeBars.Nodes.Add(bar.Text);
+			barNode.Tag=bar;
+			barNode.ImageIndex=1;
+			barNode.SelectedImageIndex=1;
+			foreach(BaseItem objItem in bar.Items)
+			{
+				TreeNode itemNode=barNode.Nodes.Add(GetTreeItemText(objItem));
+				itemNode.Tag=objItem;
+
+				itemNode.ImageIndex=GetItemImageIndex(objItem);
+				itemNode.SelectedImageIndex=itemNode.ImageIndex;
+
+				AddSubItems(objItem,itemNode);
+			}
+		}
+		#endregion
+
+		#region Context Menus Support
+		private void RefreshContextMenus()
+		{
+			treeMenus.Nodes.Clear();
+			DotNetBarManager manager=this.GetDesignManager();
+			if(manager==null)
+				return;
+
+			this.Cursor=Cursors.WaitCursor;
+			try
+			{
+				// Load all popups
+				foreach(BaseItem objItem in manager.ContextMenus)
+				{
+					TreeNode itemNode=treeMenus.Nodes.Add(GetTreeItemText(objItem));
+					itemNode.Tag=objItem;
+
+					itemNode.ImageIndex=GetItemImageIndex(objItem);
+					itemNode.SelectedImageIndex=itemNode.ImageIndex;
+
+					AddSubItems(objItem,itemNode);
+				}
+			}
+			finally
+			{
+				this.Cursor=Cursors.Arrow;
+			}
+		}
+		#endregion
+
+		#region Item Tree Loading
+		private void AddSubItems(BaseItem objItem, TreeNode parentNode)
+		{
+			if(objItem.SubItems.Count==0)
+				return;
+			foreach(BaseItem objChild in objItem.SubItems)
+			{
+				TreeNode itemNode=parentNode.Nodes.Add(GetTreeItemText(objChild));
+				itemNode.Tag=objChild;
+
+				itemNode.ImageIndex=GetItemImageIndex(objChild);
+				itemNode.SelectedImageIndex=itemNode.ImageIndex;
+
+				AddSubItems(objChild,itemNode);
+			}
+		}
+
+		private string GetTreeItemText(BaseItem objItem)
+		{
+			if(objItem==null)
+				return "";
+
+			if(m_ShowItemText)
+				return objItem.Text;
+			else
+				return objItem.Name;
+		}
+
+		private int GetItemImageIndex(BaseItem objItem)
+		{
+			int index=0;
+			if(objItem is ButtonItem)
+			{
+				index=7;
+			}
+			else if(objItem is ComboBoxItem)
+			{
+				index=8;
+			}
+			else if(objItem is TextBoxItem)
+			{
+				index=9;
+			}
+			else if(objItem is CustomizeItem)
+			{
+				index=10;
+			}
+			else if(objItem is LabelItem)
+			{
+				index=11;
+			}
+			return index;
+		}
+		private void RefreshView()
+		{
+			this.RefreshBars();
+			this.RefreshContextMenus();
+			this.RefreshCategories();
+			propertyBars.SelectedObject=null;
+			propertyCategories.SelectedObject=null;
+			propertyMenus.SelectedObject=null;
+		}
+
+		private void SetupToolbars()
+		{
+			if(!dotNetBarManager1.IsDefinitionLoaded)
+				return;
+
+			bool bVisible=true;
+
+			if(m_ExternalBar!=null)
+				bVisible=false;
+
+			dotNetBarManager1.GetItem(CREATE_BARS_PARENT,true).Visible=bVisible;
+			dotNetBarManager1.GetItem(SYNC_CATEGORIES,true).Visible=bVisible;
+			dotNetBarManager1.GetItem(NEW_DOCK,true).Visible=bVisible;
+			dotNetBarManager1.GetItem(NEW_DEFINITION,true).Visible=bVisible;
+			dotNetBarManager1.GetItem(OPEN_DEFINITION,true).Visible=bVisible;
+			dotNetBarManager1.GetItem(SAVE_DEFINITION,true).Visible=bVisible;
+			dotNetBarManager1.GetItem(SAVE_DEFINITION_AS,true).Visible=bVisible;
+			dotNetBarManager1.GetItem(LOAD_BAR,true).Visible=bVisible;
+		}
+
+		private void OnExternalManagerChanged()
+		{
+			if(m_ExternalManager!=null)
+			{
+				if(!dotNetBarManager1.IsDefinitionLoaded)
+					dotNetBarManager1.ForceDefinitionLoad();
+				this.GetDesignManager().Style=m_ExternalManager.Style;
+				this.GetDesignManager().ThemeAware=m_ExternalManager.ThemeAware;
+				this.GetDesignManager().UseGlobalColorScheme=m_ExternalManager.UseGlobalColorScheme;
+				this.GetDesignManager().ColorScheme=m_ExternalManager.ColorScheme;
+				this.GetDesignManager().ShowCustomizeContextMenu=m_ExternalManager.ShowCustomizeContextMenu;
+				this.GetDesignManager().ShowResetButton=m_ExternalManager.ShowResetButton;
+				this.GetDesignManager().ShowToolTips=m_ExternalManager.ShowToolTips;
+				this.GetDesignManager().Images=m_ExternalManager.Images;
+				this.GetDesignManager().ImagesLarge=m_ExternalManager.ImagesLarge;
+				this.GetDesignManager().ImagesMedium=m_ExternalManager.ImagesMedium;
+				if(this.Visible || !this.HasFloatingBars(m_ExternalManager))
+					this.GetDesignManager().Definition=m_ExternalManager.Definition;
+				else
+					this.CreateLoadTimer();
+			}
+			SetupNavigationPane();
+			SetupProperties();
+			m_DataChanged=false;
+		}
+
+		private void CreateLoadTimer()
+		{
+			m_LoadTimer=new Timer();
+			m_LoadTimer.Enabled=false;
+			m_LoadTimer.Interval=100;
+			m_LoadTimer.Tick+=new EventHandler(LoadTimerTick);
+			if(m_Loaded)
+				m_LoadTimer.Enabled=true;
+		}
+
+		private void LoadTimerTick(object sender, EventArgs e)
+		{
+			if(m_Loaded)
+			{
+				m_LoadTimer.Enabled=false;
+				this.GetDesignManager().Definition=m_ExternalManager.Definition;
+				m_LoadTimer.Dispose();
+				m_LoadTimer=null;
+				m_DataChanged=false;
+				this.RefreshView();
+			}
+		}
+
+		private bool HasFloatingBars(DotNetBarManager manager)
+		{
+			bool bRet=false;
+			foreach(Bar bar in manager.Bars)
+			{
+				if(bar.DockSide==eDockSide.None && !bar.AutoHide)
+				{
+					bRet=true;
+					break;
+				}
+			}
+			return bRet;
+		}
+
+		private void OnExternalBarChanged()
+		{
+			if(m_ExternalBar!=null)
+			{
+				DotNetBarManager manager=definitionPreview.previewManager;
+				manager.SuspendLayout=true;
+				manager.Bars.ClearNonDocumentBars();
+				manager.Items.Clear();
+				manager.ContextMenus.Clear();
+				manager.Images=m_ExternalBar.Images;
+				manager.ImagesLarge=m_ExternalBar.ImagesLarge;
+				manager.ImagesMedium=m_ExternalBar.ImagesMedium;
+				manager.SuspendLayout=false;
+				manager.Bars.Add(new Bar(m_ExternalBar.Text));
+				manager.Bars[0].DockSide=eDockSide.Top;
+				m_DesignBar=manager.Bars[0];
+				RefreshDesignBar();
+			}
+			else
+			{
+				m_DesignBar=null;
+			}
+			SetupNavigationPane();
+			SetupProperties();
+			m_DataChanged=false;
+		}
+
+		private void RefreshDesignBar()
+		{
+			if(m_DesignBar!=null && m_ExternalBar!=null)
+			{
+				m_DesignBar.Definition=m_ExternalBar.Definition;
+				m_DesignBar.DockSide=eDockSide.Top;
+			}
+		}
+
+		private void SetupNavigationPane()
+		{
+			if(m_ExternalBar!=null)
+			{
+				buttonContext.Visible=false;
+				buttonCategories.Visible=false;
+				buttonBars.Checked=true;
+			}
+			else
+			{
+				if(m_ExternalManager.TopDockSite==null && 
+					m_ExternalManager.BottomDockSite==null &&
+					m_ExternalManager.LeftDockSite==null &&
+					m_ExternalManager.RightDockSite==null)
+				{
+					// Manager provides popups only
+					buttonContext.Visible=true;
+					buttonContext.Checked=true;
+					buttonCategories.Visible=false;
+					buttonBars.Visible=false;
+				}
+				else
+				{
+					buttonContext.Visible=true;
+					buttonCategories.Visible=true;
+					buttonBars.Checked=true;
+				}
+			}
+			navigationPane1.RecalcLayout();
+		}
+
+		private void SetupProperties()
+		{
+			if(m_ExternalBar!=null)
+			{
+				propertyBars.BrowsableAttributes=new AttributeCollection(new Attribute[] {BrowsableAttribute.Yes});
+				propertyMenus.BrowsableAttributes=new AttributeCollection(new Attribute[] {BrowsableAttribute.Yes});
+				propertyCategories.BrowsableAttributes=new AttributeCollection(new Attribute[] {BrowsableAttribute.Yes});
+			}
+			else
+			{
+                propertyBars.BrowsableAttributes = new AttributeCollection(new Attribute[] { DevCoBrowsable.Yes });
+                propertyMenus.BrowsableAttributes = new AttributeCollection(new Attribute[] { DevCoBrowsable.Yes });
+                propertyCategories.BrowsableAttributes = new AttributeCollection(new Attribute[] { DevCoBrowsable.Yes });
+			}
+		}
+		#endregion
+
+		#region Windows Form 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();
+			System.Resources.ResourceManager resources = new System.Resources.ResourceManager(typeof(DotNetBarDesigner));
+			this.navigationPane1 = new DevComponents.DotNetBar.NavigationPane();
+			this.navigationPanePanel1 = new DevComponents.DotNetBar.NavigationPanePanel();
+			this.propertyBars = new System.Windows.Forms.PropertyGrid();
+			this.splitter1 = new DevComponents.DotNetBar.ExpandableSplitter();
+			this.treeBars = new System.Windows.Forms.TreeView();
+			this.imageList = new System.Windows.Forms.ImageList(this.components);
+			this.buttonBars = new DevComponents.DotNetBar.ButtonItem();
+			this.navigationPanePanel3 = new DevComponents.DotNetBar.NavigationPanePanel();
+			this.propertyCategories = new System.Windows.Forms.PropertyGrid();
+			this.splitterOffice20031 = new DevComponents.DotNetBar.ExpandableSplitter();
+			this.treeCategories = new System.Windows.Forms.TreeView();
+			this.buttonCategories = new DevComponents.DotNetBar.ButtonItem();
+			this.navigationPanePanel2 = new DevComponents.DotNetBar.NavigationPanePanel();
+			this.propertyMenus = new System.Windows.Forms.PropertyGrid();
+			this.splitterOffice20032 = new DevComponents.DotNetBar.ExpandableSplitter();
+			this.treeMenus = new System.Windows.Forms.TreeView();
+			this.buttonContext = new DevComponents.DotNetBar.ButtonItem();
+			this.panelEx1 = new DevComponents.DotNetBar.PanelEx();
+			this.definitionPreview = new DevComponents.DotNetBar.Design.DefinitionPreviewControl();
+			this.splitter2 = new DevComponents.DotNetBar.ExpandableSplitter();
+			#if !TRIAL
+			this.dotNetBarManager1 = new DevComponents.DotNetBar.DotNetBarManager(this.components,true);
+			#else
+			this.dotNetBarManager1 = new DevComponents.DotNetBar.DotNetBarManager(this.components);
+			#endif
+			
+			this.barBottomDockSite = new DevComponents.DotNetBar.DockSite();
+			this.barLeftDockSite = new DevComponents.DotNetBar.DockSite();
+			this.barRightDockSite = new DevComponents.DotNetBar.DockSite();
+			this.barTopDockSite = new DevComponents.DotNetBar.DockSite();
+			this.m_OpenFileDialog = new System.Windows.Forms.OpenFileDialog();
+			this.m_SaveFileDialog = new System.Windows.Forms.SaveFileDialog();
+			this.navigationPane1.SuspendLayout();
+			this.navigationPanePanel1.SuspendLayout();
+			this.navigationPanePanel3.SuspendLayout();
+			this.navigationPanePanel2.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// navigationPane1
+			// 
+			this.navigationPane1.ConfigureAddRemoveVisible = false;
+			this.navigationPane1.ConfigureNavOptionsVisible = false;
+			this.navigationPane1.Controls.AddRange(new System.Windows.Forms.Control[] {
+																						  this.navigationPanePanel1,
+																						  this.navigationPanePanel3,
+																						  this.navigationPanePanel2,
+																						  this.navigationPane1.TitlePanel});
+			this.navigationPane1.Dock = System.Windows.Forms.DockStyle.Left;
+			this.navigationPane1.ItemPaddingBottom = 2;
+			this.navigationPane1.ItemPaddingTop = 2;
+			this.navigationPane1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+																						   this.buttonBars,
+																						   this.buttonContext,
+																						   this.buttonCategories});
+			this.navigationPane1.Location = new System.Drawing.Point(0, 48);
+			this.navigationPane1.Name = "navigationPane1";
+			this.navigationPane1.NavigationBarHeight = 88;
+			this.navigationPane1.Size = new System.Drawing.Size(304, 468);
+			this.navigationPane1.TabIndex = 1;
+			// 
+			// navigationPane1.TitlePanel
+			// 
+			this.navigationPane1.TitlePanel.Dock = System.Windows.Forms.DockStyle.Top;
+			this.navigationPane1.TitlePanel.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((System.Byte)(0)));
+			this.navigationPane1.TitlePanel.Name = "panelEx1";
+			this.navigationPane1.TitlePanel.Size = new System.Drawing.Size(304, 24);
+			this.navigationPane1.TitlePanel.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
+			this.navigationPane1.TitlePanel.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
+			this.navigationPane1.TitlePanel.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+			this.navigationPane1.TitlePanel.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+			this.navigationPane1.TitlePanel.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
+			this.navigationPane1.TitlePanel.Style.GradientAngle = 90;
+			this.navigationPane1.TitlePanel.Style.MarginLeft = 4;
+			this.navigationPane1.TitlePanel.TabIndex = 0;
+			this.navigationPane1.TitlePanel.Text = "Bars";
+			this.navigationPane1.PanelChanging += new DevComponents.DotNetBar.PanelChangingEventHandler(this.navigationPane1_PanelChanging);
+			// 
+			// navigationPanePanel1
+			// 
+			this.navigationPanePanel1.Controls.AddRange(new System.Windows.Forms.Control[] {
+																							   this.propertyBars,
+																							   this.splitter1,
+																							   this.treeBars});
+			this.navigationPanePanel1.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.navigationPanePanel1.DockPadding.Left = 1;
+			this.navigationPanePanel1.DockPadding.Right = 1;
+			this.navigationPanePanel1.DockPadding.Top = 1;
+			this.navigationPanePanel1.Location = new System.Drawing.Point(0, 24);
+			this.navigationPanePanel1.Name = "navigationPanePanel1";
+			this.navigationPanePanel1.ParentItem = this.buttonBars;
+			this.navigationPanePanel1.Size = new System.Drawing.Size(304, 356);
+			this.navigationPanePanel1.Style.Alignment = System.Drawing.StringAlignment.Center;
+			this.navigationPanePanel1.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground;
+			this.navigationPanePanel1.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground2;
+			this.navigationPanePanel1.Style.BackgroundImagePosition = DevComponents.DotNetBar.eBackgroundImagePosition.Tile;
+			this.navigationPanePanel1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+			this.navigationPanePanel1.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+			this.navigationPanePanel1.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText;
+			this.navigationPanePanel1.Style.GradientAngle = 90;
+			this.navigationPanePanel1.TabIndex = 2;
+			// 
+			// propertyBars
+			// 
+			this.propertyBars.BackColor = System.Drawing.SystemColors.Control;
+			this.propertyBars.CommandsBackColor = System.Drawing.SystemColors.Window;
+			this.propertyBars.CommandsVisibleIfAvailable = true;
+			this.propertyBars.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.propertyBars.HelpBackColor = System.Drawing.SystemColors.ControlLight;
+			this.propertyBars.LargeButtons = false;
+			this.propertyBars.LineColor = System.Drawing.SystemColors.ControlLight;
+			this.propertyBars.Location = new System.Drawing.Point(1, 150);
+			this.propertyBars.Name = "propertyBars";
+			this.propertyBars.Size = new System.Drawing.Size(302, 206);
+			this.propertyBars.TabIndex = 3;
+			this.propertyBars.Text = "propertyGrid1";
+			this.propertyBars.ViewBackColor = System.Drawing.SystemColors.Window;
+			this.propertyBars.ViewForeColor = System.Drawing.SystemColors.WindowText;
+			this.propertyBars.PropertyValueChanged += new System.Windows.Forms.PropertyValueChangedEventHandler(this.GridPropertyValueChanged);
+			// 
+			// splitter1
+			// 
+			this.splitter1.Expandable = false;
+			this.splitter1.Dock = System.Windows.Forms.DockStyle.Top;
+			this.splitter1.Location = new System.Drawing.Point(1, 144);
+			this.splitter1.Name = "splitter1";
+			this.splitter1.Size = new System.Drawing.Size(302, 6);
+			this.splitter1.TabIndex = 4;
+			this.splitter1.TabStop = false;
+			// 
+			// treeBars
+			// 
+			this.treeBars.BorderStyle = System.Windows.Forms.BorderStyle.None;
+			this.treeBars.Dock = System.Windows.Forms.DockStyle.Top;
+			this.treeBars.ImageList = this.imageList;
+			this.treeBars.Location = new System.Drawing.Point(1, 1);
+			this.treeBars.Name = "treeBars";
+			this.treeBars.Size = new System.Drawing.Size(302, 143);
+			this.treeBars.TabIndex = 2;
+			this.treeBars.KeyDown += new System.Windows.Forms.KeyEventHandler(this.TreeKeyDown);
+			this.treeBars.MouseDown += new System.Windows.Forms.MouseEventHandler(this.TreeMouseDown);
+			this.treeBars.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.TreeAfterSelect);
+			this.treeBars.BeforeSelect += new System.Windows.Forms.TreeViewCancelEventHandler(this.TreeBeforeSelect);
+			this.treeBars.AfterLabelEdit += new System.Windows.Forms.NodeLabelEditEventHandler(this.TreeAfterLabelEdit);
+			this.treeBars.BeforeCollapse += new System.Windows.Forms.TreeViewCancelEventHandler(this.TreeBeforeCollapse);
+			this.treeBars.BeforeExpand += new System.Windows.Forms.TreeViewCancelEventHandler(this.TreeBeforeExpand);
+			this.treeBars.HideSelection=false;
+			// 
+			// imageList
+			// 
+			this.imageList.ColorDepth = System.Windows.Forms.ColorDepth.Depth8Bit;
+			this.imageList.ImageSize = new System.Drawing.Size(16, 16);
+			this.imageList.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageList.ImageStream")));
+			this.imageList.TransparentColor = System.Drawing.Color.Magenta;
+			// 
+			// buttonBars
+			// 
+			this.buttonBars.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText;
+			this.buttonBars.Checked = true;
+			this.buttonBars.Image = ((System.Drawing.Bitmap)(resources.GetObject("buttonBars.Image")));
+			this.buttonBars.Name = "buttonBars";
+			this.buttonBars.OptionGroup = "navBar";
+			this.buttonBars.Style = DevComponents.DotNetBar.eDotNetBarStyle.Office2003;
+			this.buttonBars.Text = "Bars";
+			this.buttonBars.Tooltip = "View Toolbars, Menu bars and dockable windows";
+			// 
+			// navigationPanePanel3
+			// 
+			this.navigationPanePanel3.Controls.AddRange(new System.Windows.Forms.Control[] {
+																							   this.propertyCategories,
+																							   this.splitterOffice20031,
+																							   this.treeCategories});
+			this.navigationPanePanel3.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.navigationPanePanel3.DockPadding.Left = 1;
+			this.navigationPanePanel3.DockPadding.Right = 1;
+			this.navigationPanePanel3.DockPadding.Top = 1;
+			this.navigationPanePanel3.Location = new System.Drawing.Point(0, 24);
+			this.navigationPanePanel3.Name = "navigationPanePanel3";
+			this.navigationPanePanel3.ParentItem = this.buttonCategories;
+			this.navigationPanePanel3.Size = new System.Drawing.Size(304, 356);
+			this.navigationPanePanel3.Style.Alignment = System.Drawing.StringAlignment.Center;
+			this.navigationPanePanel3.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground;
+			this.navigationPanePanel3.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground2;
+			this.navigationPanePanel3.Style.BackgroundImagePosition = DevComponents.DotNetBar.eBackgroundImagePosition.Tile;
+			this.navigationPanePanel3.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+			this.navigationPanePanel3.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+			this.navigationPanePanel3.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText;
+			this.navigationPanePanel3.Style.GradientAngle = 90;
+			this.navigationPanePanel3.TabIndex = 4;
+			// 
+			// propertyCategories
+			// 
+			this.propertyCategories.BackColor = System.Drawing.SystemColors.Control;
+			this.propertyCategories.CommandsBackColor = System.Drawing.SystemColors.Window;
+			this.propertyCategories.CommandsVisibleIfAvailable = true;
+			this.propertyCategories.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.propertyCategories.HelpBackColor = System.Drawing.SystemColors.ControlLight;
+			this.propertyCategories.HelpVisible = false;
+			this.propertyCategories.LargeButtons = false;
+			this.propertyCategories.LineColor = System.Drawing.SystemColors.ControlLight;
+			this.propertyCategories.Location = new System.Drawing.Point(1, 150);
+			this.propertyCategories.Name = "propertyCategories";
+			this.propertyCategories.Size = new System.Drawing.Size(302, 206);
+			this.propertyCategories.TabIndex = 6;
+			this.propertyCategories.Text = "propertyGrid1";
+			this.propertyCategories.ToolbarVisible = false;
+			this.propertyCategories.ViewBackColor = System.Drawing.SystemColors.Window;
+			this.propertyCategories.ViewForeColor = System.Drawing.SystemColors.WindowText;
+			this.propertyCategories.PropertyValueChanged += new System.Windows.Forms.PropertyValueChangedEventHandler(this.GridPropertyValueChanged);
+			// 
+			// splitterOffice20031
+			// 
+			this.splitterOffice20031.Dock = System.Windows.Forms.DockStyle.Top;
+			this.splitterOffice20031.Location = new System.Drawing.Point(1, 144);
+			this.splitterOffice20031.Name = "splitterOffice20031";
+			this.splitterOffice20031.Size = new System.Drawing.Size(302, 6);
+			this.splitterOffice20031.Expandable=false;
+			this.splitterOffice20031.TabIndex = 7;
+			this.splitterOffice20031.TabStop = false;
+			// 
+			// treeCategories
+			// 
+			this.treeCategories.BorderStyle = System.Windows.Forms.BorderStyle.None;
+			this.treeCategories.Dock = System.Windows.Forms.DockStyle.Top;
+			this.treeCategories.ImageList = this.imageList;
+			this.treeCategories.Location = new System.Drawing.Point(1, 1);
+			this.treeCategories.Name = "treeCategories";
+			this.treeCategories.Size = new System.Drawing.Size(302, 143);
+			this.treeCategories.TabIndex = 5;
+			this.treeCategories.KeyDown += new System.Windows.Forms.KeyEventHandler(this.TreeKeyDown);
+			this.treeCategories.MouseDown += new System.Windows.Forms.MouseEventHandler(this.TreeMouseDown);
+			this.treeCategories.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.TreeAfterSelect);
+			this.treeCategories.BeforeSelect += new System.Windows.Forms.TreeViewCancelEventHandler(this.TreeBeforeSelect);
+			this.treeCategories.AfterLabelEdit += new System.Windows.Forms.NodeLabelEditEventHandler(this.TreeAfterLabelEdit);
+			this.treeCategories.BeforeCollapse += new System.Windows.Forms.TreeViewCancelEventHandler(this.TreeBeforeCollapse);
+			this.treeCategories.BeforeExpand += new System.Windows.Forms.TreeViewCancelEventHandler(this.TreeBeforeExpand);
+			this.treeCategories.HideSelection=false;
+			// 
+			// buttonCategories
+			// 
+			this.buttonCategories.Image = ((System.Drawing.Bitmap)(resources.GetObject("buttonCategories.Image")));
+			this.buttonCategories.Name = "buttonCategories";
+			this.buttonCategories.OptionGroup = "navBar";
+			this.buttonCategories.Style = DevComponents.DotNetBar.eDotNetBarStyle.Office2003;
+			this.buttonCategories.Text = "Categories";
+			this.buttonCategories.Tooltip = "View Command Categories";
+			// 
+			// navigationPanePanel2
+			// 
+			this.navigationPanePanel2.Controls.AddRange(new System.Windows.Forms.Control[] {
+																							   this.propertyMenus,
+																							   this.splitterOffice20032,
+																							   this.treeMenus});
+			this.navigationPanePanel2.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.navigationPanePanel2.DockPadding.Left = 1;
+			this.navigationPanePanel2.DockPadding.Right = 1;
+			this.navigationPanePanel2.DockPadding.Top = 1;
+			this.navigationPanePanel2.Location = new System.Drawing.Point(0, 24);
+			this.navigationPanePanel2.Name = "navigationPanePanel2";
+			this.navigationPanePanel2.ParentItem = this.buttonContext;
+			this.navigationPanePanel2.Size = new System.Drawing.Size(304, 356);
+			this.navigationPanePanel2.Style.Alignment = System.Drawing.StringAlignment.Center;
+			this.navigationPanePanel2.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground;
+			this.navigationPanePanel2.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground2;
+			this.navigationPanePanel2.Style.BackgroundImagePosition = DevComponents.DotNetBar.eBackgroundImagePosition.Tile;
+			this.navigationPanePanel2.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+			this.navigationPanePanel2.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+			this.navigationPanePanel2.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText;
+			this.navigationPanePanel2.Style.GradientAngle = 90;
+			this.navigationPanePanel2.TabIndex = 3;
+			// 
+			// propertyMenus
+			// 
+			this.propertyMenus.BackColor = System.Drawing.SystemColors.Control;
+			this.propertyMenus.CommandsBackColor = System.Drawing.SystemColors.Window;
+			this.propertyMenus.CommandsVisibleIfAvailable = true;
+			this.propertyMenus.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.propertyMenus.HelpBackColor = System.Drawing.SystemColors.ControlLight;
+			this.propertyMenus.HelpVisible = false;
+			this.propertyMenus.LargeButtons = false;
+			this.propertyMenus.LineColor = System.Drawing.SystemColors.ControlLight;
+			this.propertyMenus.Location = new System.Drawing.Point(1, 150);
+			this.propertyMenus.Name = "propertyMenus";
+			this.propertyMenus.Size = new System.Drawing.Size(302, 206);
+			this.propertyMenus.TabIndex = 6;
+			this.propertyMenus.Text = "propertyGrid1";
+			this.propertyMenus.ToolbarVisible = false;
+			this.propertyMenus.ViewBackColor = System.Drawing.SystemColors.Window;
+			this.propertyMenus.ViewForeColor = System.Drawing.SystemColors.WindowText;
+			this.propertyMenus.PropertyValueChanged += new System.Windows.Forms.PropertyValueChangedEventHandler(this.GridPropertyValueChanged);
+			// 
+			// splitterOffice20032
+			// 
+			this.splitterOffice20032.Expandable = false;
+			this.splitterOffice20032.Dock = System.Windows.Forms.DockStyle.Top;
+			this.splitterOffice20032.Location = new System.Drawing.Point(1, 144);
+			this.splitterOffice20032.Name = "splitterOffice20032";
+			this.splitterOffice20032.Size = new System.Drawing.Size(302, 6);
+			this.splitterOffice20032.TabIndex = 7;
+			this.splitterOffice20032.TabStop = false;
+			// 
+			// treeMenus
+			// 
+			this.treeMenus.BorderStyle = System.Windows.Forms.BorderStyle.None;
+			this.treeMenus.Dock = System.Windows.Forms.DockStyle.Top;
+			this.treeMenus.ImageList = this.imageList;
+			this.treeMenus.Location = new System.Drawing.Point(1, 1);
+			this.treeMenus.Name = "treeMenus";
+			this.treeMenus.Size = new System.Drawing.Size(302, 143);
+			this.treeMenus.TabIndex = 5;
+			this.treeMenus.KeyDown += new System.Windows.Forms.KeyEventHandler(this.TreeKeyDown);
+			this.treeMenus.MouseDown += new System.Windows.Forms.MouseEventHandler(this.TreeMouseDown);
+			this.treeMenus.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.TreeAfterSelect);
+			this.treeMenus.BeforeSelect += new System.Windows.Forms.TreeViewCancelEventHandler(this.TreeBeforeSelect);
+			this.treeMenus.AfterLabelEdit += new System.Windows.Forms.NodeLabelEditEventHandler(this.TreeAfterLabelEdit);
+			this.treeMenus.BeforeCollapse += new System.Windows.Forms.TreeViewCancelEventHandler(this.TreeBeforeCollapse);
+			this.treeMenus.BeforeExpand += new System.Windows.Forms.TreeViewCancelEventHandler(this.TreeBeforeExpand);
+			this.treeMenus.HideSelection=false;
+			// 
+			// buttonContext
+			// 
+			this.buttonContext.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText;
+			this.buttonContext.Image = ((System.Drawing.Bitmap)(resources.GetObject("buttonContext.Image")));
+			this.buttonContext.Name = "buttonContext";
+			this.buttonContext.OptionGroup = "navBar";
+			this.buttonContext.Style = DevComponents.DotNetBar.eDotNetBarStyle.Office2003;
+			this.buttonContext.Text = "Context Menus";
+			this.buttonContext.Tooltip = "View Context Menus";
+			// 
+			// panelEx1
+			// 
+			this.panelEx1.Dock = System.Windows.Forms.DockStyle.Top;
+			this.panelEx1.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((System.Byte)(0)));
+			this.panelEx1.Location = new System.Drawing.Point(310, 48);
+			this.panelEx1.Name = "panelEx1";
+			this.panelEx1.Size = new System.Drawing.Size(432, 25);
+			this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center;
+			this.panelEx1.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
+			this.panelEx1.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
+			this.panelEx1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+			this.panelEx1.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+			this.panelEx1.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
+			this.panelEx1.Style.GradientAngle = 90;
+			this.panelEx1.TabIndex = 2;
+			this.panelEx1.Text = "Layout Preview";
+			// 
+			// definitionPreview
+			// 
+			this.definitionPreview.BackColor = System.Drawing.SystemColors.Control;
+			this.definitionPreview.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.definitionPreview.Location = new System.Drawing.Point(310, 73);
+			this.definitionPreview.Name = "definitionPreview";
+			this.definitionPreview.Size = new System.Drawing.Size(432, 443);
+			this.definitionPreview.TabIndex = 3;
+			this.definitionPreview.DataChanged+=new EventHandler(this.PreviewDataChanged);
+			// 
+			// splitter2
+			// 
+			this.splitter2.Location = new System.Drawing.Point(304, 48);
+			this.splitter2.Name = "splitter2";
+			this.splitter2.Size = new System.Drawing.Size(8, 468);
+			this.splitter2.TabIndex = 4;
+			this.splitter2.TabStop = false;
+			this.splitter2.Dock=DockStyle.Left;
+			this.splitter2.ExpandableControl=navigationPane1;
+			// 
+			// dotNetBarManager1
+			// 
+			this.dotNetBarManager1.AutoDispatchShortcuts.Add(DevComponents.DotNetBar.eShortcut.F1);
+			this.dotNetBarManager1.AutoDispatchShortcuts.Add(DevComponents.DotNetBar.eShortcut.CtrlC);
+			this.dotNetBarManager1.AutoDispatchShortcuts.Add(DevComponents.DotNetBar.eShortcut.CtrlA);
+			this.dotNetBarManager1.AutoDispatchShortcuts.Add(DevComponents.DotNetBar.eShortcut.CtrlV);
+			this.dotNetBarManager1.AutoDispatchShortcuts.Add(DevComponents.DotNetBar.eShortcut.CtrlX);
+			this.dotNetBarManager1.AutoDispatchShortcuts.Add(DevComponents.DotNetBar.eShortcut.CtrlZ);
+			this.dotNetBarManager1.AutoDispatchShortcuts.Add(DevComponents.DotNetBar.eShortcut.Del);
+			this.dotNetBarManager1.AutoDispatchShortcuts.Add(DevComponents.DotNetBar.eShortcut.Ins);
+			this.dotNetBarManager1.BottomDockSite = this.barBottomDockSite;
+			this.dotNetBarManager1.DefinitionName = "DotNetBarDesigner.dotNetBarManager1.xml";
+			this.dotNetBarManager1.LeftDockSite = this.barLeftDockSite;
+			this.dotNetBarManager1.ParentForm = this;
+			this.dotNetBarManager1.RightDockSite = this.barRightDockSite;
+			this.dotNetBarManager1.Style = DevComponents.DotNetBar.eDotNetBarStyle.Office2003;
+			this.dotNetBarManager1.TopDockSite = this.barTopDockSite;
+			this.dotNetBarManager1.ItemClick += new System.EventHandler(this.dotNetBarManager1_ItemClick);
+			this.dotNetBarManager1.UseHook=true;
+			// 
+			// barBottomDockSite
+			// 
+			this.barBottomDockSite.AccessibleRole = System.Windows.Forms.AccessibleRole.Window;
+			this.barBottomDockSite.BackgroundImageAlpha = ((System.Byte)(255));
+			this.barBottomDockSite.Dock = System.Windows.Forms.DockStyle.Bottom;
+			this.barBottomDockSite.Location = new System.Drawing.Point(0, 516);
+			this.barBottomDockSite.Name = "barBottomDockSite";
+			this.barBottomDockSite.Size = new System.Drawing.Size(742, 0);
+			this.barBottomDockSite.TabIndex = 8;
+			this.barBottomDockSite.TabStop = false;
+			// 
+			// barLeftDockSite
+			// 
+			this.barLeftDockSite.AccessibleRole = System.Windows.Forms.AccessibleRole.Window;
+			this.barLeftDockSite.BackgroundImageAlpha = ((System.Byte)(255));
+			this.barLeftDockSite.Dock = System.Windows.Forms.DockStyle.Left;
+			this.barLeftDockSite.Location = new System.Drawing.Point(0, 48);
+			this.barLeftDockSite.Name = "barLeftDockSite";
+			this.barLeftDockSite.Size = new System.Drawing.Size(0, 468);
+			this.barLeftDockSite.TabIndex = 5;
+			this.barLeftDockSite.TabStop = false;
+			// 
+			// barRightDockSite
+			// 
+			this.barRightDockSite.AccessibleRole = System.Windows.Forms.AccessibleRole.Window;
+			this.barRightDockSite.BackgroundImageAlpha = ((System.Byte)(255));
+			this.barRightDockSite.Dock = System.Windows.Forms.DockStyle.Right;
+			this.barRightDockSite.Location = new System.Drawing.Point(742, 48);
+			this.barRightDockSite.Name = "barRightDockSite";
+			this.barRightDockSite.Size = new System.Drawing.Size(0, 468);
+			this.barRightDockSite.TabIndex = 6;
+			this.barRightDockSite.TabStop = false;
+			// 
+			// barTopDockSite
+			// 
+			this.barTopDockSite.AccessibleRole = System.Windows.Forms.AccessibleRole.Window;
+			this.barTopDockSite.BackgroundImageAlpha = ((System.Byte)(255));
+			this.barTopDockSite.Dock = System.Windows.Forms.DockStyle.Top;
+			this.barTopDockSite.Name = "barTopDockSite";
+			this.barTopDockSite.Size = new System.Drawing.Size(742, 48);
+			this.barTopDockSite.TabIndex = 7;
+			this.barTopDockSite.TabStop = false;
+			// 
+			// m_OpenFileDialog
+			// 
+			this.m_OpenFileDialog.Filter = "DotNetBar Files (*.dnb, *.xml)|*.dnb;*.xml|All Files (*.*)|*.*";
+			this.m_OpenFileDialog.ShowReadOnly = true;
+			this.m_OpenFileDialog.Title = "Open DotNetBar Definition File";
+			// 
+			// m_SaveFileDialog
+			// 
+			this.m_SaveFileDialog.DefaultExt = "dnb";
+			this.m_SaveFileDialog.FileName = "dotnetbardefinition";
+			this.m_SaveFileDialog.Filter = "DotNetBar Files (*.dnb)|*.dnb|XML Files (*.xml)|*.xml|All Files (*.*)|*.*";
+			this.m_SaveFileDialog.Title = "Save DotNetBar Definition";
+			// 
+			// DotNetBarDesigner
+			// 
+			this.AutoScaleBaseSize = new System.Drawing.Size(5, 13);
+			this.ClientSize = new System.Drawing.Size(742, 516);
+			this.Controls.AddRange(new System.Windows.Forms.Control[] {
+																		  this.definitionPreview,
+																		  this.panelEx1,
+																		  this.splitter2,
+																		  this.navigationPane1,
+																		  this.barLeftDockSite,
+																		  this.barRightDockSite,
+																		  this.barTopDockSite,
+																		  this.barBottomDockSite});
+			this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+			this.Name = "DotNetBarDesigner";
+			this.Text = "DotNetBar Designer";
+			this.Closing += new System.ComponentModel.CancelEventHandler(this.DotNetBarDesigner_Closing);
+            this.Closed += new EventHandler(DotNetBarDesigner_Closed);
+			this.Load += new System.EventHandler(this.DotNetBarDesigner_Load);
+			this.navigationPane1.ResumeLayout(false);
+			this.navigationPanePanel1.ResumeLayout(false);
+			this.navigationPanePanel3.ResumeLayout(false);
+			this.navigationPanePanel2.ResumeLayout(false);
+			this.ResumeLayout(false);
+
+		}
+		#endregion
+
+		#region Toolbar and menu bar support
+
+		private void dotNetBarManager1_ItemClick(object sender, System.EventArgs e)
+		{
+			BaseItem item=sender as BaseItem;
+
+			if(item==null)
+				return;
+
+			PropertyGrid grid=propertyBars;
+			if(navigationPane1.SelectedPanel==navigationPanePanel2)
+				grid=propertyMenus;
+			if(navigationPane1.SelectedPanel==navigationPanePanel3)
+				grid=propertyCategories;
+
+			switch(item.Name)
+			{
+				case CREATE_BARS_PARENT:
+				{
+                    if (!item.Expanded)
+                        item.Expanded = true;
+					break;
+				}
+				case OPEN_DEFINITION:
+				{
+					if(m_OpenFileDialog.ShowDialog()==DialogResult.OK && System.IO.File.Exists(m_OpenFileDialog.FileName))
+					{
+						DotNetBarManager manager=this.GetDesignManager();
+						manager.LoadDefinition(m_OpenFileDialog.FileName);
+						m_DefinitionFileName=m_OpenFileDialog.FileName;
+						SetupProperties();
+						RefreshView();
+						m_DataChanged=true;
+					}
+					break;
+				}
+				case RESET_IMAGE:
+				{
+					m_DataChanged=true;
+					if(grid.SelectedGridItem!=null && (grid.SelectedGridItem.PropertyDescriptor.PropertyType==typeof(System.Drawing.Image) || grid.SelectedGridItem.PropertyDescriptor.PropertyType==typeof(System.Drawing.Icon)))
+					{
+						grid.SelectedGridItem.PropertyDescriptor.SetValue(grid.SelectedObject,null);
+					}
+					grid.Refresh();
+					break;
+				}
+				case CLOSE_DESIGNER:
+				{
+					this.DialogResult=DialogResult.OK;
+					this.Close();
+					break;
+				}
+				case SHOW_HELP:
+				{
+					if(m_HtmlHelp!=null)
+						m_HtmlHelp.ShowContents();
+					break;
+				}
+				case SHOW_HELP_SEARCH:
+				{
+					if(m_HtmlHelp!=null)
+						m_HtmlHelp.ShowSearch();
+					break;
+				}
+				case NEW_TOOLBAR:
+				case NEW_MENUBAR:
+				case NEW_STATUSBAR:
+				case NEW_TASKBAR:
+				{
+					m_DataChanged=true;
+					Bar bar;
+
+					if(item.Name==NEW_MENUBAR)
+					{
+						bar=CreateObject(typeof(Bar)) as Bar;
+						bar.Text="Main Menu";
+						bar.MenuBar=true;
+						bar.Stretch=true;
+						bar.Name="mainmenu";
+					}
+					else if(item.Name==NEW_STATUSBAR)
+					{
+						bar=CreateObject(typeof(Bar)) as Bar;
+						bar.Text="Status";
+						bar.Stretch=true;
+						bar.Name="statusBar"+((int)this.GetDesignManager().Bars.Count+1).ToString();
+						bar.LayoutType=eLayoutType.Toolbar;
+						bar.GrabHandleStyle=eGrabHandleStyle.ResizeHandle;
+						bar.ItemSpacing=2;
+					}
+					else if(item.Name==NEW_TASKBAR)
+					{
+						bar=CreateObject(typeof(Bar)) as Bar;
+						bar.Text="Task Pane";
+						bar.Stretch=true;
+						bar.Name="taskbar"+((int)this.GetDesignManager().Bars.Count+1).ToString();
+						bar.LayoutType=eLayoutType.TaskList;
+						bar.GrabHandleStyle=eGrabHandleStyle.Caption;
+					}
+					else
+					{
+						bar=CreateObject(typeof(Bar)) as Bar;
+						bar.Text="My Bar";
+						bar.Name="bar"+((int)this.GetDesignManager().Bars.Count+1).ToString();
+					}
+                
+					//bar.SetDesignMode(true);
+
+					TreeNode barNode=treeBars.Nodes.Add(bar.Text);
+					barNode.Tag=bar;
+					barNode.ImageIndex=3;
+					barNode.SelectedImageIndex=3;
+					bar.DockLine=this.GetDesignManager().Bars.Count;
+					this.GetDesignManager().Bars.Add(bar);
+					if(item.Name==NEW_TASKBAR)
+						bar.DockSide=eDockSide.Right;
+					else if(item.Name==NEW_STATUSBAR)
+						bar.DockSide=eDockSide.Bottom;
+					else
+						bar.DockSide=eDockSide.Top;
+
+					if(item.Name==NEW_MENUBAR || item.Name==NEW_TOOLBAR)
+					{
+						ButtonItem button=CreateObject(typeof(ButtonItem)) as ButtonItem;
+						AssignItemName(button);
+						button.Text=button.Name;
+                        //button.GenerateCommandLink = true;
+                        //UpdateCommandLink(button);
+						bar.Items.Add(button);
+						bar.RecalcLayout();
+						TreeNode itemTreeNode=barNode.Nodes.Add(GetTreeItemText(button));
+						itemTreeNode.Tag=button;
+						itemTreeNode.ImageIndex=GetItemImageIndex(button);
+						itemTreeNode.SelectedImageIndex=itemTreeNode.ImageIndex;
+						itemTreeNode.EnsureVisible();
+						treeBars.SelectedNode=barNode;
+						barNode.EnsureVisible();
+
+					}
+					else if(item.Name==NEW_STATUSBAR)
+					{
+						LabelItem status=CreateObject(typeof(LabelItem)) as LabelItem;
+						AssignItemName(status);
+						status.Text="Status Ready...";
+						status.BorderType=eBorderType.SingleLine;
+						status.Width=136;
+						bar.Items.Add(status);
+						bar.RecalcLayout();
+						TreeNode itemTreeNode=barNode.Nodes.Add(GetTreeItemText(status));
+						itemTreeNode.Tag=status;
+						itemTreeNode.ImageIndex=GetItemImageIndex(status);
+						itemTreeNode.SelectedImageIndex=itemTreeNode.ImageIndex;
+						itemTreeNode.EnsureVisible();
+
+						treeBars.SelectedNode=barNode;
+						barNode.EnsureVisible();
+					}
+					else
+					{
+						treeBars.SelectedNode=barNode;
+						barNode.EnsureVisible();
+					}
+					break;
+				}
+				case NEW_DOCKBAR:
+				{
+					m_DataChanged=true;
+					Bar bar=CreateObject(typeof(Bar)) as Bar;;
+					bar.Text="Dockable Window";
+					bar.Stretch=true;
+					bar.LayoutType=eLayoutType.DockContainer;
+					bar.GrabHandleStyle=eGrabHandleStyle.Caption;
+					bar.Name="dockwindow"+this.GetDesignManager().Bars.Count.ToString();
+
+					DockContainerItem dockItem=CreateObject(typeof(DockContainerItem)) as DockContainerItem;
+					AssignItemName(dockItem);
+					dockItem.Text="Dock Container";
+					bar.Items.Add(dockItem);
+
+					TreeNode barNode=treeBars.Nodes.Add(bar.Text);
+					barNode.Tag=bar;
+					barNode.ImageIndex=3;
+					barNode.SelectedImageIndex=3;
+					bar.DockLine=this.GetDesignManager().Bars.Count;
+					this.GetDesignManager().Bars.Add(bar);
+					bar.DockSide=eDockSide.Left;
+
+					TreeNode itemTreeNode=barNode.Nodes.Add(GetTreeItemText(dockItem));
+					itemTreeNode.Tag=dockItem;
+					itemTreeNode.ImageIndex=GetItemImageIndex(dockItem);
+					itemTreeNode.SelectedImageIndex=itemTreeNode.ImageIndex;
+					itemTreeNode.EnsureVisible();
+
+					treeBars.SelectedNode=barNode;
+					barNode.EnsureVisible();
+					break;
+				}
+				case DELETE:
+				{
+					TreeView tree=GetSelectedTreeView();
+					DotNetBarManager manager=this.GetDesignManager();
+
+					if(tree.SelectedNode==null)
+						break;
+
+					m_DataChanged=true;
+
+					if(tree.SelectedNode.Nodes.Count>0)
+					{
+						if(MessageBox.Show(this,"Are you sure you want to delete selected item?","DotNetBar Editor",MessageBoxButtons.YesNo,MessageBoxIcon.Question)==DialogResult.No)
+							break;
+					}
+
+					TreeNode nextNode=tree.SelectedNode.NextVisibleNode;
+
+					if(tree.SelectedNode.Tag is BaseItem)
+					{
+						BaseItem selectedItem=tree.SelectedNode.Tag as BaseItem;
+						Bar cont=selectedItem.ContainerControl as Bar;
+
+						TreeNode topParentNode=tree.SelectedNode;
+						while(topParentNode.Parent!=null)
+							topParentNode=topParentNode.Parent;
+					
+						if(selectedItem.Parent!=null)
+							selectedItem.Parent.SubItems.Remove(selectedItem);
+						else if(tree==treeCategories)
+							manager.Items.Remove(selectedItem);
+						else if(tree==treeMenus)
+							manager.ContextMenus.Remove(selectedItem);
+					
+						DeleteComponent(selectedItem);
+
+						tree.SelectedNode.Tag=null;
+						TreeNode parentNode=tree.SelectedNode.Parent;
+						tree.Nodes.Remove(tree.SelectedNode);
+						// If it is last node under one of the categories remove parent too
+						if(parentNode!=null && parentNode.Parent==null && parentNode.Nodes.Count==0 && tree==treeCategories)
+							tree.Nodes.Remove(parentNode);
+						if(cont!=null)
+							cont.RecalcLayout();
+					
+					}
+					else if(tree.SelectedNode.Tag is Bar)
+					{
+						Bar bar=tree.SelectedNode.Tag as Bar;
+
+						manager.Bars.Remove(bar);
+						DeleteComponent(bar);
+						tree.SelectedNode.Tag=null;
+						tree.Nodes.Remove(tree.SelectedNode);
+					}
+					else if(tree==treeCategories && tree.SelectedNode.Parent==null)
+					{
+						// Delete all items within this category
+						foreach(TreeNode node in tree.SelectedNode.Nodes)
+						{
+							BaseItem childItem=node.Tag as BaseItem;
+							if(childItem!=null)
+							{
+								manager.Items.Remove(childItem);
+								DeleteComponent(childItem);
+							}
+							node.Tag=null;
+						}
+						tree.SelectedNode.Remove();
+					}
+
+					if(tree.Nodes.Count==0)
+					{
+						propertyBars.SelectedObject=null;
+						propertyMenus.SelectedObject=null;
+						propertyCategories.SelectedObject=null;
+					}
+					
+					RefreshDesignBar();
+
+                    EnableCommands(tree, tree.SelectedNode);
+					break;
+				}
+				case NEW_DEFINITION:
+				{
+					DotNetBarManager manager=this.GetDesignManager();
+					if(manager!=null)
+					{
+						manager.SuspendLayout=true;
+						manager.Bars.ClearNonDocumentBars();
+						manager.Items.Clear();
+						manager.ContextMenus.Clear();
+						manager.SuspendLayout=false;
+						SetupProperties();
+						this.RefreshView();
+					}
+					break;
+				}
+				case SAVE_DEFINITION:
+				case SAVE_DEFINITION_AS:
+				{
+					SaveDefinition((item.Name==SAVE_DEFINITION_AS));
+					break;
+				}
+                case SAVE_CLOSE:
+                {
+                    if (m_ExternalManager != null)
+                        m_ExternalManager.Definition = this.GetDesignManager().Definition;
+                    else
+                    {
+                        if (SaveDefinition(false) == DialogResult.Cancel)
+                            return;
+                    }
+                    m_DataChanged = false;
+                    this.DialogResult = DialogResult.Yes;
+                    this.Close();
+                    break;
+                }
+				case SAVE_BAR_AS:
+				{
+					TreeView tree=GetSelectedTreeView();
+
+					// Save currently selected bar
+					if(tree.SelectedNode==null || !(tree.SelectedNode.Tag is Bar))
+						return;
+				
+					Bar bar=tree.SelectedNode.Tag as Bar;
+					string stitle=m_SaveFileDialog.Title;
+					string defaultExt=m_SaveFileDialog.DefaultExt;
+					string fileName=m_SaveFileDialog.FileName;
+					string filter=m_SaveFileDialog.Filter;
+
+					m_SaveFileDialog.Title="Save Bar Definition";
+					m_SaveFileDialog.DefaultExt = "xml";
+					m_SaveFileDialog.FileName = (bar.Name!=""?bar.Name:"MyBar");
+					m_SaveFileDialog.Filter = "DotNetBar Bar Files (*.xml)|*.xml|All Files (*.*)|*.*";
+				
+					if(m_SaveFileDialog.ShowDialog()==DialogResult.OK)
+					{
+						bar.SaveDefinition(m_SaveFileDialog.FileName);
+					}
+
+					m_SaveFileDialog.Title=stitle;
+					m_SaveFileDialog.DefaultExt=defaultExt;
+					m_SaveFileDialog.FileName=fileName;
+					m_SaveFileDialog.Filter=filter;
+					break;
+				}
+				case LOAD_BAR:
+				{
+					string defaultExt=m_OpenFileDialog.DefaultExt;
+					string filter=m_OpenFileDialog.Filter;
+					m_OpenFileDialog.DefaultExt="xml";
+					m_OpenFileDialog.Filter = "DotNetBar Bar Files (*.xml)|*.xml|All Files (*.*)|*.*";
+					if(m_OpenFileDialog.ShowDialog()==DialogResult.OK && System.IO.File.Exists(m_OpenFileDialog.FileName))
+					{
+						Bar bar=new Bar();
+						try
+						{
+							bar.LoadDefinition(m_OpenFileDialog.FileName);
+						}
+						catch(Exception ex)
+						{
+							MessageBox.Show("File '"+m_OpenFileDialog.FileName+"' does not appear to be valid Bar file.\n\rException has been generated while loading: "+ex.Source+": "+ex.Message+"\n\r"+ex.StackTrace);
+							return;
+						}
+						bar.Dispose();
+						bar=new Bar();
+						this.GetDesignManager().SuspendLayout=true;
+						this.GetDesignManager().Bars.Add(bar);
+						bar.LoadDefinition(m_OpenFileDialog.FileName);
+						this.GetDesignManager().SuspendLayout=false;
+						this.DisplayTreeBar(bar);
+					}
+					m_OpenFileDialog.DefaultExt=defaultExt;
+					m_OpenFileDialog.Filter=filter;
+					break;
+				}
+				case MOVE_LEFT:
+				case MOVE_RIGHT:
+				case MOVE_UP:
+				case MOVE_DOWN:
+				{
+					MoveSelectedItem(item.Name);
+					RefreshDesignBar();
+					break;
+				}
+				case SYNC_CATEGORIES:
+				{
+					RescanCategories();
+					break;
+				}
+				case NEW_BUTTON:
+				{
+					ButtonItem btn=CreateObject(typeof(ButtonItem)) as ButtonItem;
+					AssignItemName(btn);
+					btn.Text=btn.Name;
+					AddNewItem(btn);
+					RefreshDesignBar();
+                    //if ((btn.ContainerControl is Bar || btn.Parent != null) && navigationPane1.CheckedButton != buttonCategories)
+                    //{
+                    //    btn.GenerateCommandLink = true;
+                    //    UpdateCommandLink(btn);
+                    //}
+					break;
+				}
+				case NEW_TEXTBOX:
+				{
+					TextBoxItem tb=CreateObject(typeof(TextBoxItem)) as TextBoxItem;
+					AssignItemName(tb);
+					tb.Text=tb.Name;
+					AddNewItem(tb);
+					RefreshDesignBar();
+					break;
+				}
+				case NEW_COMBO:
+				{
+					ComboBoxItem cb=CreateObject(typeof(ComboBoxItem)) as ComboBoxItem;
+                    TypeDescriptor.GetProperties(cb)["DisplayMember"].SetValue(cb, "Text");
+					AssignItemName(cb);
+					cb.Text=cb.Name;
+					AddNewItem(cb);
+					RefreshDesignBar();
+					break;
+				}
+				case NEW_CUSTOMIZE:
+				{
+					CustomizeItem cust=CreateObject(typeof(CustomizeItem)) as CustomizeItem;
+					AssignItemName(cust);
+					AddNewItem(cust);
+					RefreshDesignBar();
+					break;
+				}
+				case NEW_LABEL:
+				{
+					LabelItem li=CreateObject(typeof(LabelItem)) as LabelItem;
+					li.BorderType=eBorderType.SingleLine;
+					AssignItemName(li);
+					li.Text=li.Name;
+					AddNewItem(li);
+					RefreshDesignBar();
+					break;
+				}
+				case NEW_COLORPICKER:
+				{
+					ColorPickerDropDown cp=CreateObject(typeof(ColorPickerDropDown)) as ColorPickerDropDown;
+					AssignItemName(cp);
+					cp.Text=cp.Name;
+					AddNewItem(cp);
+					RefreshDesignBar();
+					break;
+				}
+				case NEW_MDILIST:
+				{
+					MdiWindowListItem mdi=CreateObject(typeof(MdiWindowListItem)) as MdiWindowListItem;
+					mdi.Text="MDI Window List";
+					AssignItemName(mdi);
+					AddNewItem(mdi);
+					RefreshDesignBar();
+					break;
+				}
+				case NEW_CONTROLCONT:
+				{
+					ControlContainerItem cci=CreateObject(typeof(ControlContainerItem)) as ControlContainerItem;
+					AssignItemName(cci);
+					AddNewItem(cci);
+					RefreshDesignBar();
+					break;
+				}
+				case NEW_DOCK:
+				{
+					DockContainerItem dci=CreateObject(typeof(DockContainerItem)) as DockContainerItem;
+					dci.Text="Dockable Window";
+					AssignItemName(dci);
+					AddNewItem(dci);
+					RefreshDesignBar();
+					break;
+				}
+				case NEW_PROGRESS:
+				{
+					ProgressBarItem pb=CreateObject(typeof(ProgressBarItem)) as ProgressBarItem;
+					pb.SetDesignMode(true);
+					if(this.GetDesignManager()!=null)
+						pb.Style=this.GetDesignManager().Style;
+					else if(this.GetDesignBar()!=null)
+						pb.Style=this.GetDesignBar().Style;
+					pb.ResetBackgroundStyle();
+					pb.SetDesignMode(false);
+					AssignItemName(pb);
+					pb.Text=pb.Name;
+					AddNewItem(pb);
+					RefreshDesignBar();
+					break;
+				}
+			}
+		}
+
+		private DialogResult SaveDefinition(bool saveAs)
+		{
+			DialogResult result=DialogResult.OK;
+			if(m_DefinitionFileName!="" && !saveAs)
+				this.GetDesignManager().SaveDefinition(m_DefinitionFileName);
+			else
+			{
+				result=m_SaveFileDialog.ShowDialog();
+				// Save definition as...
+				if(result==DialogResult.OK)
+				{
+					this.GetDesignManager().SaveDefinition(m_SaveFileDialog.FileName);
+					m_DefinitionFileName=m_SaveFileDialog.FileName;
+				}
+			}
+            return result;
+		}
+
+		private void AssignItemName(BaseItem newItem)
+		{
+			DotNetBarManager manager=this.GetDesignManager();
+			Bar bar=this.GetDesignBar();
+
+			if(m_Designer==null || bar==null)
+			{
+				string name=newItem.GetType().Name;
+				long id=1;
+				if(manager!=null)
+				{
+					while(manager.GetItem(name+id,true)!=null)
+						id++;
+				}
+				else if(bar!=null)
+				{
+					while(bar.GetItem(name+id)!=null)
+						id++;
+				}
+				newItem.Name=name+id;
+			}
+		}
+
+		private void AddNewItem(BaseItem newItem)
+		{
+			m_DataChanged=true;
+			TreeView tree=GetSelectedTreeView();
+			DotNetBarManager manager=this.GetDesignManager();
+
+			if(tree.SelectedNode!=null && tree.SelectedNode.Tag is BaseItem)
+			{
+				newItem.Style=((BaseItem)tree.SelectedNode.Tag).Style;
+				if(tree.SelectedNode.Tag is PopupItem && newItem is PopupItem)
+					((PopupItem)newItem).PopupType=((PopupItem)tree.SelectedNode.Tag).PopupType;
+			}
+			else if(tree.SelectedNode!=null && tree.SelectedNode.Tag is Bar)
+			{
+				newItem.Style=((Bar)tree.SelectedNode.Tag).Style;
+				if(newItem is PopupItem && ((Bar)tree.SelectedNode.Tag).MenuBar)
+					((PopupItem)newItem).PopupType=ePopupType.Menu;
+			}
+
+			// We need to determine is new item being added to the Categories
+			TreeNode itemNode=null;
+
+			if(tree==treeCategories)
+			{
+				// Assign category to new item
+				if(tree.SelectedNode==null)
+					newItem.Category="(Untitled)";
+				else if(tree.SelectedNode.Parent==null)
+					newItem.Category=tree.SelectedNode.Text;
+				else
+					newItem.Category=((BaseItem)tree.SelectedNode.Tag).Category;
+
+				manager.Items.Add(newItem);                
+				itemNode=CategorizeItem(newItem);
+			}
+			else if(tree==treeMenus)
+			{
+				if(tree.SelectedNode!=null && tree.SelectedNode.Tag is BaseItem)
+				{
+					itemNode=tree.SelectedNode.Nodes.Add(GetTreeItemText(newItem));
+
+					BaseItem objParent=(BaseItem)tree.SelectedNode.Tag;
+					int iPos=-1;
+					// New Items are always added before any system items which are by default kept at the end
+					if(objParent.SubItems.Count>0 && !newItem.SystemItem)
+					{
+						iPos=GetAppendPosition(objParent);
+					}
+					objParent.SubItems.Add(newItem,iPos);
+				}
+				else
+				{
+					itemNode=tree.Nodes.Add(GetTreeItemText(newItem));
+					manager.ContextMenus.Add(newItem);
+				}
+			}
+			else if(tree.SelectedNode!=null)
+			{
+				Control cont=null;
+				if(tree.SelectedNode.Tag is BaseItem)
+				{
+					BaseItem objParent=(BaseItem)tree.SelectedNode.Tag;
+					int iPos=-1;
+					// New Items are always added before any system items which are by default kept at the end
+					if(objParent.SubItems.Count>0 && !newItem.SystemItem)
+					{
+						iPos=GetAppendPosition(objParent);
+					}
+					objParent.SubItems.Add(newItem,iPos);
+					itemNode=new TreeNode(GetTreeItemText(newItem));
+					if(iPos!=-1)
+						tree.SelectedNode.Nodes.Insert(iPos,itemNode);
+					else
+                        tree.SelectedNode.Nodes.Add(itemNode);
+					cont=newItem.ContainerControl as Control;
+					if(cont==null)
+						((BaseItem)tree.SelectedNode.Tag).Refresh();
+
+				}
+				else if(tree.SelectedNode.Tag is Bar)
+				{
+					Bar bar=(Bar)tree.SelectedNode.Tag;
+					int iPos=-1;
+					// New Items are always added before any system items which are by default kept at the end
+					if(bar.Items.Count>0 && !newItem.SystemItem)
+					{
+						iPos=GetAppendPosition(bar.ItemsContainer);
+					}
+					bar.Items.Add(newItem,iPos);
+					itemNode=new TreeNode(GetTreeItemText(newItem));
+					if(iPos!=-1)
+						tree.SelectedNode.Nodes.Insert(iPos,itemNode);
+					else
+						tree.SelectedNode.Nodes.Add(itemNode);
+					cont=bar;
+				}
+				if(cont!=null && cont is Bar)
+					((Bar)cont).RecalcLayout();
+			}
+
+			itemNode.Tag=newItem;
+			itemNode.ImageIndex=GetItemImageIndex(newItem);
+			itemNode.SelectedImageIndex=itemNode.ImageIndex;
+
+			itemNode.EnsureVisible();
+			tree.SelectedNode=itemNode;
+		}
+
+		private TreeView GetPanelTreeView(NavigationPanePanel panel)
+		{
+			TreeView tree=treeBars;
+			if(panel==navigationPanePanel2)
+				tree=treeMenus;
+			else if(panel==navigationPanePanel3)
+				tree=treeCategories;
+			return tree;
+		}
+		private TreeView GetSelectedTreeView()
+		{
+			TreeView tree=treeBars;
+			if(navigationPane1.SelectedPanel==navigationPanePanel2)
+				tree=treeMenus;
+			else if(navigationPane1.SelectedPanel==navigationPanePanel3)
+				tree=treeCategories;
+			return tree;
+		}
+
+		private void MoveSelectedItem(string Direction)
+		{
+			TreeView tree=GetSelectedTreeView();
+			if(tree.SelectedNode==null)
+				return;
+			BaseItem objItem=tree.SelectedNode.Tag as BaseItem;
+			if(objItem==null)
+				return;
+
+			m_DataChanged=true;
+			DotNetBarManager manager=this.GetDesignManager();
+
+			bool bCategoryItem=false;
+			if(tree==treeCategories)
+				bCategoryItem=true;
+			
+			bool bPopupsItem=false;
+			if(tree==treeMenus)
+				bPopupsItem=true;
+
+			TreeNode selNode=tree.SelectedNode;
+			TreeNodeCollection parentCollection=null;
+			if(selNode.Parent==null)
+				parentCollection=tree.Nodes;
+			else
+				parentCollection=selNode.Parent.Nodes;
+		
+
+			BaseItem objParent=objItem.Parent;
+
+			int i=0;
+			if(objParent!=null)
+				i=objParent.SubItems.IndexOf(objItem);
+			else
+				i=selNode.Index;
+
+			if(Direction==MOVE_UP && i>0)
+			{
+				if(objParent!=null)
+				{
+					objParent.SubItems.Remove(objItem);
+					objParent.SubItems.Add(objItem,i-1);
+					if(objParent.ContainerControl is Bar)
+						((Bar)objParent.ContainerControl).RecalcLayout();
+				}
+				
+				i=selNode.Index;
+				selNode.Remove();
+				parentCollection.Insert(i-1,selNode);
+				tree.SelectedNode=selNode;
+				selNode.EnsureVisible();
+			}
+			else if(Direction==MOVE_RIGHT && i>0)
+			{
+				BaseItem objNewParent=null;
+				
+				if(bCategoryItem)
+					manager.Items.Remove(objItem);
+				else if(bPopupsItem)
+					manager.ContextMenus.Remove(objItem);
+
+				if(objParent!=null)
+				{
+					objNewParent=objParent.SubItems[i-1];
+					objParent.SubItems.Remove(objItem);
+					if(objParent.ContainerControl is Bar)
+						((Bar)objParent.ContainerControl).RecalcLayout();
+				}
+				else
+				{
+					objNewParent=selNode.PrevNode.Tag as BaseItem;
+				}
+				objNewParent.SubItems.Add(objItem,GetAppendPosition(objNewParent));
+				objNewParent.Refresh();
+				if(objNewParent.ContainerControl is Bar)
+					((Bar)objNewParent.ContainerControl).RecalcLayout();
+
+				i=selNode.Index;
+				TreeNode newParent=selNode.PrevNode;
+				selNode.Remove();
+				newParent.Nodes.Add(selNode);
+				tree.SelectedNode=selNode;
+				selNode.EnsureVisible();
+			}
+			else if(Direction==MOVE_DOWN && ((objParent!=null && i<objParent.SubItems.Count-1) || (objParent==null && selNode.Index<selNode.Parent.Nodes.Count-1)))
+			{
+				if(objParent!=null)
+				{
+					objParent.SubItems.Remove(objItem);
+					objParent.SubItems.Add(objItem,i+1);
+					if(objParent.ContainerControl is Bar)
+						((Bar)objParent.ContainerControl).RecalcLayout();
+				}
+
+				i=selNode.Index;
+				selNode.Remove();
+				parentCollection.Insert(i+1,selNode);
+				tree.SelectedNode=selNode;
+				selNode.EnsureVisible();
+			}
+			if(Direction==MOVE_LEFT && objParent!=null && (!(objParent is GenericItemContainer) || !((GenericItemContainer)objParent).SystemItem))
+			{
+				BaseItem objNewParent=null;
+				objNewParent=objParent.Parent;
+				if(objNewParent!=null)
+				{
+					i=objNewParent.SubItems.IndexOf(objParent)+1;
+					objParent.SubItems.Remove(objItem);
+					if(objParent.ContainerControl is Bar)
+						((Bar)objParent.ContainerControl).RecalcLayout();
+					objNewParent.SubItems.Add(objItem,i);
+					if(objNewParent.ContainerControl is Bar)
+						((Bar)objNewParent.ContainerControl).RecalcLayout();
+				}
+				else
+				{
+					objParent.SubItems.Remove(objItem);
+					if(objParent.ContainerControl is Bar)
+						((Bar)objParent.ContainerControl).RecalcLayout();
+				}
+				
+				if(tree==treeCategories)
+					manager.Items.Add(objItem);
+				else if(tree==treeMenus)
+					manager.ContextMenus.Add(objItem);
+				
+				TreeNode nodeParent=selNode.Parent;
+				selNode.Remove();
+				if(nodeParent!=null && nodeParent.Parent!=null)
+				{
+					nodeParent.Parent.Nodes.Insert(nodeParent.Index+1,selNode);
+					tree.SelectedNode=selNode;
+					selNode.EnsureVisible();
+				}
+				else if(bPopupsItem)
+				{
+					if(nodeParent!=null)
+					{
+						tree.Nodes.Insert(nodeParent.Index+1,selNode);
+					}
+					else
+						tree.Nodes.Add(selNode);
+					tree.SelectedNode=selNode;
+					selNode.EnsureVisible();
+				}
+			}
+		}
+
+		private void CopyMoveToClick(object sender, System.EventArgs e)
+		{
+			TreeView tree=GetSelectedTreeView();
+			
+			BaseItem item=sender as BaseItem;
+			BaseItem itemSel=tree.SelectedNode.Tag as BaseItem;
+			BaseItem itemOriginal=itemSel;
+
+			bool bMove=(item.Parent.Name==MOVE_TO);
+			if(!bMove)
+			{
+				itemSel=itemSel.Copy();
+				if((Control.ModifierKeys & Keys.Control)==Keys.Control)
+					itemSel.Name=itemOriginal.Name;
+				else
+					itemSel.Name="item_"+itemSel.Id;
+			}
+
+			if((item.Tag is string && (string)item.Tag=="cat") || item.Name==TO_CATEGORIES)
+			{
+				// To Categories
+				if(item.Name!=TO_CATEGORIES)
+					itemSel.Category=item.Text;
+				if(bMove)
+				{
+					if(itemSel.Parent!=null)
+						itemSel.Parent.SubItems.Remove(itemSel);
+					tree.SelectedNode.Remove();
+				}
+				if(this.GetDesignManager().Items.Contains(itemSel.Name))
+				{
+					string sDupName=itemSel.Name;
+					itemSel.Name="item_"+itemSel.Id;
+					MessageBox.Show("Item with name: '"+sDupName+"' already exists. Item that you are trying to move will be renamed.");
+				}
+				this.GetDesignManager().Items.Add(itemSel);
+				treeCategories.SelectedNode=CategorizeItem(itemSel);
+				treeCategories.SelectedNode.EnsureVisible();
+			}
+			else if(item.Name==TO_CONTEXTMENUS || item.Tag is BaseItem)
+			{
+				if(bMove)
+				{
+					if(itemSel.Parent!=null)
+						itemSel.Parent.SubItems.Remove(itemSel);
+					tree.SelectedNode.Remove();
+				}
+
+				if(item.Name==TO_CONTEXTMENUS)
+				{
+					TreeNode itemNode=treeMenus.Nodes.Add(GetTreeItemText(itemSel));
+					itemNode.Tag=itemSel;
+					itemNode.ImageIndex=GetItemImageIndex(itemSel);
+					itemNode.SelectedImageIndex=itemNode.ImageIndex;
+					AddSubItems(itemSel,itemNode);
+					this.GetDesignManager().ContextMenus.Add(itemSel);
+					itemNode.EnsureVisible();
+				}
+				else
+				{
+					BaseItem objParent=item.Tag as BaseItem;
+					objParent.SubItems.Add(itemSel);
+					foreach(TreeNode node in treeMenus.Nodes)
+					{
+						if(node.Tag==objParent)
+						{
+							TreeNode itemNode=node.Nodes.Add(GetTreeItemText(itemSel));
+							itemNode.Tag=itemSel;
+							itemNode.ImageIndex=GetItemImageIndex(itemSel);
+							itemNode.SelectedImageIndex=itemNode.ImageIndex;
+							AddSubItems(itemSel,itemNode);
+							itemNode.EnsureVisible();
+							break;
+						}
+					}
+				}
+			}
+			else if(item.Tag is TreeNode)
+			{
+				// To Bar
+				TreeNode barNode=item.Tag as TreeNode;
+				Bar bar=barNode.Tag as Bar;
+				if(bMove)
+				{
+					if(itemSel.Parent!=null)
+						itemSel.Parent.SubItems.Remove(itemSel);
+					tree.SelectedNode.Remove();
+				}
+
+				bar.Items.Add(itemSel,GetAppendPosition(bar.ItemsContainer));
+				TreeNode itemNode=barNode.Nodes.Add(GetTreeItemText(itemSel));
+				itemNode.Tag=itemSel;
+				itemNode.ImageIndex=GetItemImageIndex(itemSel);
+				itemNode.SelectedImageIndex=itemNode.ImageIndex;
+				AddSubItems(itemSel,itemNode);
+				treeBars.SelectedNode=itemNode;
+				treeBars.SelectedNode.EnsureVisible();
+				bar.RecalcLayout();
+			}
+            
+			// Clear Copy To and Move To
+			item=dotNetBarManager1.ContextMenus[CONTEXT_MENU];
+			item.SubItems[COPY_TO].SubItems.Clear();
+			item.SubItems[MOVE_TO].SubItems.Clear();
+		}
+
+		private int GetAppendPosition(BaseItem objParent)
+		{
+			int iPos=-1;
+			for(int i=objParent.SubItems.Count-1;i>=0;i--)
+			{
+				if(objParent.SubItems[i].SystemItem)
+					iPos=i;
+				else
+					break;
+			}
+			return iPos;
+		}
+
+		private object CreateObject(Type type)
+		{
+			if(m_Designer!=null && m_ExternalBar!=null)
+				return m_Designer.CreateComponent(type);
+			else
+				return type.Assembly.CreateInstance(type.FullName);
+		}
+
+        private object CreateObject(Type type, string name)
+        {
+            if (m_Designer != null)
+            {
+                return m_Designer.CreateComponent(type, name);
+            }
+
+            return null;
+        }
+		private void DeleteComponent(IComponent o)
+		{
+            if (m_Designer != null)
+            {
+                if (o is BaseItem)
+                {
+                    RemoveCommandLinks(o as BaseItem);
+                }
+                else if (o is Bar)
+                {
+                    Bar bar = o as Bar;
+                    foreach (BaseItem item in bar.Items)
+                        RemoveCommandLinks(item);
+                }
+            }
+
+			if(m_Designer!=null && m_ExternalBar!=null)
+				m_Designer.DestroyComponent(o);
+			else
+				o.Dispose();
+		}
+
+        private void RemoveCommandLinks(BaseItem item)
+        {
+            //CommandLink link = GetCommandLink(GetCommandLinkName(item));
+            //if (link != null && !m_CommandLinksDeleted.Contains(link))
+            //    m_CommandLinksDeleted.Add(link);
+
+            //foreach (BaseItem sub in item.SubItems)
+            //{
+            //    RemoveCommandLinks(sub);
+            //}
+        }
+		#endregion
+
+		#region Grid and Tree support
+		private void PreviewDataChanged(object sender, EventArgs e)
+		{
+			m_DataChanged=true;
+		}
+
+		private void GridViewMouseDown(object sender, EventArgs e)
+		{
+			PropertyGrid grid=sender as PropertyGrid;
+
+			if(grid.SelectedGridItem==null)
+				return;
+			if(!(grid.SelectedGridItem.PropertyDescriptor.PropertyType==typeof(System.Drawing.Image)) && !(grid.SelectedGridItem.PropertyDescriptor.PropertyType==typeof(System.Drawing.Icon)))
+				return;
+			PopupItem popup=dotNetBarManager1.ContextMenus[RESET_IMAGE_POPUP] as PopupItem;
+			popup.PopupMenu(Control.MousePosition);		
+		}
+
+		private void GridPropertyValueChanged(object s, System.Windows.Forms.PropertyValueChangedEventArgs e)
+		{
+			m_DataChanged=true;
+			// If user changes the category of the item that is in categories we need to
+			// reflect that change and move item to the right category
+			TreeNode node=null;
+			if(s==propertyBars)
+				node=treeBars.SelectedNode;
+			else if(s==propertyCategories)
+				node=treeCategories.SelectedNode;
+			else if(s==propertyMenus)
+				node=treeMenus.SelectedNode;
+
+            if (node == null)
+                return;
+
+			BaseItem item=node.Tag as BaseItem;
+
+            if (e.ChangedItem.PropertyDescriptor.Name == "Name" && e.ChangedItem.Value != e.OldValue && item!=null)
+            {
+                //if (item.GenerateCommandLink)
+                //{
+                //    CommandLink link = GetCommandLink(GetCommandLinkName(e.OldValue.ToString()));
+                //    if (link != null)
+                //        m_CommandLinksDeleted.Add(link);
+                //    UpdateCommandLink(item);
+                //}
+            }
+
+			if(e.ChangedItem.PropertyDescriptor.Name=="Category" && e.ChangedItem.Value!=e.OldValue && s==propertyCategories)
+			{
+				if(node.Tag==null || !(node.Tag is BaseItem))
+					return;
+	            
+				BaseItem objItem=node.Tag as BaseItem;
+				node.Remove();
+				node=CategorizeItem(objItem);
+				node.ImageIndex=GetItemImageIndex(objItem);
+				node.SelectedImageIndex=node.ImageIndex;
+				AddSubItems(objItem,node);
+				node.EnsureVisible();
+				treeCategories.SelectedNode=node;
+			}
+			else if(e.ChangedItem.PropertyDescriptor.Name=="Name" && e.ChangedItem.Value!=e.OldValue && !m_ShowItemText)
+			{
+				node.Text=(string)e.ChangedItem.Value;
+			}
+			else if(e.ChangedItem.PropertyDescriptor.Name=="Text" && e.ChangedItem.Value!=e.OldValue && m_ShowItemText)
+			{
+				node.Text=(string)e.ChangedItem.Value;
+			}
+			else if(e.ChangedItem.PropertyDescriptor.Name=="DockLine" || e.ChangedItem.PropertyDescriptor.Name=="DockOffset")
+			{
+				Bar bar=node.Tag as Bar;
+				if(bar!=null)
+				{
+					bar.DockLine=bar.DockLine;
+					bar.RecalcLayout();
+				}
+			}
+            else if (e.ChangedItem.PropertyDescriptor.Name == "GenerateCommandLink" && e.ChangedItem.Value != e.OldValue)
+            {
+                UpdateCommandLink(item);
+            }
+
+			DotNetBarManager manager=this.GetDesignManager();
+
+			if(e.ChangedItem.PropertyDescriptor.Name=="Name" && manager!=null && s==propertyCategories)
+			{
+				if(manager.Items.Contains(e.ChangedItem.Value.ToString()))
+				{
+					item.Name=e.OldValue.ToString();
+					((PropertyGrid)s).Refresh();
+					MessageBox.Show("Item with that name already exists.");
+				}
+				else
+				{
+					manager.Items.Remove(e.OldValue.ToString());
+					manager.Items.Add(item);						
+				}
+			}
+
+			if(item!=null)
+			{
+				Bar barContainer=item.ContainerControl as Bar;
+				if(barContainer!=null)
+					barContainer.RecalcLayout();
+			}
+
+			RefreshDesignBar();
+		}
+
+        //private string GetCommandLinkName(string itemName)
+        //{
+        //    return CommandLink.GetCommandLinkName(itemName);
+        //}
+
+        //private string GetCommandLinkName(BaseItem item)
+        //{
+        //    return GetCommandLinkName(item.Name);
+        //}
+
+        //private Type GetCommandLinkType(BaseItem item)
+        //{
+        //    if (item is ButtonItem)
+        //        return typeof(CommandLinkButtonItem);
+        //    else if (item is LabelItem)
+        //        return typeof(CommandLinkLabelItem);
+        //    else if (item is TextBoxItem)
+        //        return typeof(CommandLinkTextBoxItem);
+        //    else if (item is ColorPickerDropDown)
+        //        return typeof(CommandLinkColorPickerDropDown);
+        //    else if (item is ControlContainerItem)
+        //        return typeof(CommandLinkControlContainerItem);
+        //    else if (item is DockContainerItem)
+        //        return typeof(CommandLinkDockContainerItem);
+        //    else if (item is ProgressBarItem)
+        //        return typeof(CommandLinkProgressBarItem);
+        //    else if (item is ComboBoxItem)
+        //        return typeof(CommandLinkComboBoxItem);
+        //    else
+        //        return null;
+        //}
+
+        /// <summary>
+        /// Updates design-time command link for the item
+        /// </summary>
+        /// <param name="item"></param>
+        private void UpdateCommandLink(BaseItem item)
+        {
+            if (m_Designer == null)
+            {
+                MessageBox.Show("Designer for the DotNetBarManager not assigned. This could be becouse you are using design in stand-alone mode. To use command links open designer by double-clicking DotNetBarManager in VS.NET");
+                return;
+            }
+
+            //if (item.GenerateCommandLink)
+            //{
+            //    CommandLink link = GetCommandLink(GetCommandLinkName(item));
+            //    if (link != null)
+            //    {
+            //        if (m_CommandLinksDeleted.Contains(link))
+            //            m_CommandLinksDeleted.Remove(link);
+            //        else
+            //        {
+            //            if (GetCommandLinkType(item) != link.GetType())
+            //            {
+            //                item.GenerateCommandLink = false;
+            //                MessageBox.Show("Command Link with this item name already exists and is of different type. Change your item name to generate correct Command Link.");
+            //            }
+            //        }
+            //        return;
+            //    }
+
+            //    try
+            //    {
+            //        Type linkType = GetCommandLinkType(item);
+            //        if(linkType!=null)
+            //            link = CreateObject(linkType, GetCommandLinkName(item.Name)) as CommandLink;
+            //        else
+            //        {
+            //            MessageBox.Show("Selected item does not support Command Links.");
+            //            item.GenerateCommandLink = false;
+            //        }
+            //    }
+            //    catch
+            //    {
+            //        MessageBox.Show("Cannot create command link with the name '" + GetCommandLinkName(item.Name) + "' becouse object with that name already exists on the form. Please change the name of the item.");
+            //        link = null;
+            //        item.GenerateCommandLink = false;
+            //    }
+
+            //    if (link != null)
+            //    {
+            //        m_CommandLinksCreated.Add(link);
+            //        TypeDescriptor.GetProperties(link)["Manager"].SetValue(link, m_ExternalManager);
+            //    }
+            //}
+            //else
+            //{
+            //    // Remove the CommandLink
+            //    CommandLink link = GetCommandLink(GetCommandLinkName(item.Name));
+            //    if (link != null)
+            //    {
+            //        m_CommandLinksDeleted.Add(link);
+            //        if (m_CommandLinksCreated.Contains(link))
+            //            m_CommandLinksCreated.Remove(link);
+            //    }
+            //}
+        }
+
+        //private CommandLink GetCommandLink(string name)
+        //{
+        //    foreach (CommandLink link in m_ExternalManager.CommandLinks)
+        //    {
+        //        if (link.Name == name)
+        //            return link;
+        //    }
+
+        //    return null;
+        //}
+
+		private void TreeKeyDown(object sender, System.Windows.Forms.KeyEventArgs e)
+		{
+			TreeView tree=sender as TreeView;
+			if(e.KeyCode==Keys.F2 && tree.SelectedNode!=null && tree.LabelEdit)
+				tree.SelectedNode.BeginEdit();
+		}
+
+		private void TreeMouseDown(object sender, System.Windows.Forms.MouseEventArgs e)
+		{
+			if(e.Button!=MouseButtons.Right)
+				return;
+
+			TreeView tree=sender as TreeView;
+            
+			TreeNode node=tree.GetNodeAt(e.X,e.Y);
+			if(node!=null)
+				tree.SelectedNode=node;
+			else if(tree==treeMenus)
+				tree.SelectedNode=null;
+
+			// Popup menu
+			ButtonItem popup=dotNetBarManager1.ContextMenus[CONTEXT_MENU] as ButtonItem;
+			
+			// If MoveTo and CopyTo are visible add items to them
+			if(popup.SubItems[COPY_TO].Visible)
+			{
+				BaseItem itemCopyTo=popup.SubItems[COPY_TO];
+				BaseItem itemMoveTo=popup.SubItems[MOVE_TO];
+				
+				itemCopyTo.SubItems.Clear();
+				itemMoveTo.SubItems.Clear();
+				bool bBars=true,bCategories=false, bPopups=false;
+				// Don't show categories for category items...
+				
+				if(buttonContext.Visible)
+					bPopups=true;
+				if(buttonCategories.Visible)
+					bCategories=true;
+
+				if(bBars)
+				{
+					foreach(TreeNode barNode in treeBars.Nodes)
+					{
+						BaseItem newItem=new ButtonItem();
+						newItem.Text=barNode.Text;
+						newItem.Tag=barNode;
+						newItem.Click+=new System.EventHandler(this.CopyMoveToClick);
+						itemCopyTo.SubItems.Add(newItem);
+						itemMoveTo.SubItems.Add(newItem.Copy());
+					}
+				}
+
+				if(bCategories)
+				{
+					ButtonItem cat=new ButtonItem(TO_CATEGORIES);
+					cat.Text="Categories";
+					cat.BeginGroup=true;
+					cat.Click+=new System.EventHandler(this.CopyMoveToClick);
+					itemCopyTo.SubItems.Add(cat);
+					itemMoveTo.SubItems.Add(cat.Copy());
+
+					foreach(TreeNode catNode in treeCategories.Nodes)
+					{
+						BaseItem newItem=new ButtonItem();
+						newItem.Text=catNode.Text;
+						newItem.Click+=new System.EventHandler(this.CopyMoveToClick);
+						newItem.Tag="cat";
+						itemCopyTo.SubItems.Add(newItem);
+						itemMoveTo.SubItems.Add(newItem.Copy());
+					}
+				}
+				if(bPopups)
+				{
+					BaseItem pi=new ButtonItem(TO_CONTEXTMENUS);
+					pi.BeginGroup=true;
+					pi.Text="Popups";
+					pi.Click+=new System.EventHandler(this.CopyMoveToClick);
+					itemCopyTo.SubItems.Add(pi);
+					itemMoveTo.SubItems.Add(pi.Copy());
+
+					foreach(BaseItem objItem in this.GetDesignManager().ContextMenus)
+					{
+						BaseItem newItem=new ButtonItem();
+						newItem.Text=(objItem.Text=="")?objItem.Name:objItem.Text;
+						newItem.Tag=objItem;
+						newItem.Click+=new System.EventHandler(this.CopyMoveToClick);
+						itemCopyTo.SubItems.Add(newItem);
+						itemMoveTo.SubItems.Add(newItem.Copy());						
+					}
+				}
+			}
+
+			Point pt=new Point(e.X,e.Y);
+			pt=tree.PointToScreen(pt);
+			popup.PopupMenu(pt);
+		}
+
+        private void SelectObjectInPropertyGrid(object obj)
+        {
+            PropertyGrid propertyGrid=null;
+            TreeView tree = null;
+            if (navigationPane1.CheckedButton == buttonBars)
+            {
+                propertyGrid = propertyBars;
+                tree = treeBars;
+            }
+            else if (navigationPane1.CheckedButton == buttonCategories)
+            {
+                propertyGrid = propertyCategories;
+                tree = treeCategories;
+            }
+            else if (navigationPane1.CheckedButton == buttonContext)
+            {
+                propertyGrid = propertyMenus;
+                tree = treeMenus;
+            }
+
+            propertyGrid.SelectedObject = obj;
+
+            // Find object in tree and select it
+            if (tree.SelectedNode != null && tree.SelectedNode.Tag == obj)
+                return;
+
+            TreeNode node = FindObjectInNodes(tree.Nodes, obj);
+            tree.SelectedNode = node;
+            if (node != null)
+                node.EnsureVisible();
+        }
+
+        private TreeNode FindObjectInNodes(TreeNodeCollection col, object obj)
+        {
+            foreach (TreeNode node in col)
+            {
+                if (node.Tag == obj)
+                    return node;
+                else if (node.Nodes.Count > 0)
+                {
+                    TreeNode tn = FindObjectInNodes(node.Nodes, obj);
+                    if (tn != null)
+                        return tn;
+                }
+            }
+
+            return null;
+        }
+
+		private void TreeAfterSelect(object sender, System.Windows.Forms.TreeViewEventArgs e)
+		{
+			TreeView tree=sender as TreeView;
+			PropertyGrid propertyGrid=null;
+			if(tree==treeBars)
+				propertyGrid=propertyBars;
+			else if(tree==treeCategories)
+				propertyGrid=propertyCategories;
+			else if(tree==treeMenus)
+				propertyGrid=propertyMenus;
+
+			tree.LabelEdit=false;
+			if(e.Node.Tag==null)
+			{
+				propertyGrid.SelectedObject=null;
+				return;
+			}
+
+			if(e.Node.Tag is BaseItem)
+			{
+				propertyGrid.SelectedObject=e.Node.Tag;
+				tree.LabelEdit=true;
+
+				// Now way to detect when Items collection has changed, reset changed flag if combo box is selected...
+				if(e.Node.Tag is ComboBoxItem)
+					m_DataChanged=true;
+			}
+			else if(e.Node.Tag is Bar)
+			{
+				propertyGrid.SelectedObject=(Bar)e.Node.Tag;
+
+			}
+			else
+			{
+				propertyGrid.SelectedObject=null;
+			}
+		}
+
+		private void TreeBeforeSelect(object sender, System.Windows.Forms.TreeViewCancelEventArgs e)
+		{
+			EnableCommands(sender as TreeView,e.Node);
+		}
+
+		private void EnableCommands(TreeView tree, TreeNode selectedNode)
+		{
+			// Disable/Enable toolbar items...
+			bool bLeftEnabled=false, bRightEnabled=false, bUpEnabled=false, bDownEnabled=false;
+			DotNetBarManager manager=this.GetDesignManager();
+
+			BaseItem popupItem=dotNetBarManager1.ContextMenus[CONTEXT_MENU];
+
+			if(selectedNode!=null && selectedNode.Tag is BaseItem)
+			{
+				BaseItem objItem=selectedNode.Tag as BaseItem;
+				int i=0;
+				if(objItem.Parent!=null)
+					i=objItem.Parent.SubItems.IndexOf(objItem);
+				else
+					i=selectedNode.Index;
+				if(i>0)
+				{
+					bUpEnabled=true;
+					bRightEnabled=true;
+				}
+				int iCount=0;
+				if(objItem.Parent!=null)
+					iCount=objItem.Parent.SubItems.Count-1;
+				else if(selectedNode.Parent!=null)
+					iCount=selectedNode.Parent.Nodes.Count-1;
+				else
+					iCount=selectedNode.TreeView.Nodes.Count-1;
+
+				if(i<iCount)
+					bDownEnabled=true;
+
+				if((objItem.Parent!=null && !objItem.Parent.SystemItem && (!(objItem.Parent is GenericItemContainer) || !((GenericItemContainer)objItem.Parent).SystemContainer)) || (selectedNode.Parent!=null && selectedNode.Parent.Tag is BaseItem))
+					bLeftEnabled=true;
+			}
+
+			dotNetBarManager1.GetItem(MOVE_LEFT).Enabled=bLeftEnabled;
+			dotNetBarManager1.GetItem(MOVE_RIGHT).Enabled=bRightEnabled;
+			dotNetBarManager1.GetItem(MOVE_UP).Enabled=bUpEnabled;
+			dotNetBarManager1.GetItem(MOVE_DOWN).Enabled=bDownEnabled;
+
+			if(selectedNode!=null && selectedNode.Tag is BaseItem)
+			{
+				popupItem.SubItems[COPY_TO].Visible=true;
+				popupItem.SubItems[MOVE_TO].Visible=true;
+			}
+			else
+			{
+				popupItem.SubItems[COPY_TO].Visible=false;
+				popupItem.SubItems[MOVE_TO].Visible=false;
+			}
+
+			if(selectedNode==null && tree==treeBars)
+			{
+				dotNetBarManager1.GetItem(NEW_BUTTON).Enabled=false;
+				dotNetBarManager1.GetItem(NEW_TEXTBOX).Enabled=false;
+				dotNetBarManager1.GetItem(NEW_COMBO).Enabled=false;
+				dotNetBarManager1.GetItem(NEW_CUSTOMIZE).Enabled=false;
+				dotNetBarManager1.GetItem(NEW_LABEL).Enabled=false;
+				dotNetBarManager1.GetItem(NEW_COLORPICKER).Enabled=false;
+				dotNetBarManager1.GetItem(NEW_MDILIST).Enabled=false;
+				dotNetBarManager1.GetItem(NEW_CONTROLCONT).Enabled=false;
+				dotNetBarManager1.GetItem(NEW_DOCK).Enabled=false;
+				dotNetBarManager1.GetItem(NEW_PROGRESS).Enabled=false;
+				dotNetBarManager1.GetItem(DELETE).Enabled=false;
+				return;
+			}
+			else if(tree==treeCategories)
+			{
+				dotNetBarManager1.GetItem(NEW_BUTTON).Enabled=true;
+				dotNetBarManager1.GetItem(NEW_TEXTBOX).Enabled=true;
+				dotNetBarManager1.GetItem(NEW_COMBO).Enabled=true;
+				dotNetBarManager1.GetItem(NEW_CUSTOMIZE).Enabled=true;
+				dotNetBarManager1.GetItem(NEW_LABEL).Enabled=true;
+				dotNetBarManager1.GetItem(NEW_COLORPICKER).Enabled=true;
+				dotNetBarManager1.GetItem(NEW_MDILIST).Enabled=true;
+				dotNetBarManager1.GetItem(NEW_CONTROLCONT).Enabled=true;
+				dotNetBarManager1.GetItem(NEW_DOCK).Enabled=true;
+				dotNetBarManager1.GetItem(NEW_PROGRESS).Enabled=true;
+				if(selectedNode!=null && selectedNode.Tag is BaseItem)
+					dotNetBarManager1.GetItem(DELETE).Enabled=true;
+				else
+					dotNetBarManager1.GetItem(DELETE).Enabled=false;
+				return;
+			}
+
+			if(selectedNode!=null && selectedNode.Tag is Bar)
+				dotNetBarManager1.GetItem(SAVE_BAR_AS).Enabled=true;
+			else
+				dotNetBarManager1.GetItem(SAVE_BAR_AS).Enabled=false;
+
+			bool newButton=true, newTextBox=true, newCombo=true, newCustomize=true, newLabel=true, newMdiList=true, newControlCont=true,
+				newDock=false, newProgress=true;
+
+			if(selectedNode!=null && selectedNode.Tag is Bar && ((Bar)selectedNode.Tag).LayoutType==eLayoutType.DockContainer)
+			{
+				newButton=false;
+				newTextBox=false;
+				newCombo=false;
+				newCustomize=false;
+				newLabel=false;
+				newMdiList=false;
+				newControlCont=false;
+				newDock=true;
+				newProgress=false;
+			}
+			else if(selectedNode!=null && selectedNode.Tag is DockContainerItem)
+			{
+				newButton=false;
+				newTextBox=false;
+				newCombo=false;
+				newCustomize=false;
+				newLabel=false;
+				newMdiList=false;
+				newControlCont=false;
+				newDock=false;
+				newProgress=false;
+			}
+
+			dotNetBarManager1.GetItem(NEW_BUTTON).Enabled=newButton;
+			dotNetBarManager1.GetItem(NEW_TEXTBOX).Enabled=newTextBox;
+			dotNetBarManager1.GetItem(NEW_COMBO).Enabled=newCombo;
+			dotNetBarManager1.GetItem(NEW_CUSTOMIZE).Enabled=newCustomize;
+			dotNetBarManager1.GetItem(NEW_LABEL).Enabled=newLabel;
+			dotNetBarManager1.GetItem(NEW_COLORPICKER).Enabled=newLabel;
+			dotNetBarManager1.GetItem(NEW_MDILIST).Enabled=newMdiList;
+			dotNetBarManager1.GetItem(NEW_CONTROLCONT).Enabled=newControlCont;
+			dotNetBarManager1.GetItem(NEW_DOCK).Enabled=newDock;
+			dotNetBarManager1.GetItem(NEW_PROGRESS).Enabled=newProgress;
+
+			if(selectedNode!=null && (selectedNode.Tag is BaseItem || selectedNode.Tag is Bar) && !(this.GetDesignBar()!=null && selectedNode!=null && selectedNode.Tag is Bar))
+				dotNetBarManager1.GetItem(DELETE).Enabled=true;
+			else
+				dotNetBarManager1.GetItem(DELETE).Enabled=false;
+		}
+
+		private void TreeAfterLabelEdit(object sender, System.Windows.Forms.NodeLabelEditEventArgs e)
+		{
+			if(e.CancelEdit)
+				return;
+
+			BaseItem objItem=e.Node.Tag as BaseItem;
+			if(m_ShowItemText)
+				objItem.Text=e.Label;
+			else
+				objItem.Name=e.Label;
+			
+			propertyBars.Refresh();
+			propertyMenus.Refresh();
+			propertyCategories.Refresh();
+			m_DataChanged=true;
+		}
+
+		private void TreeBeforeCollapse(object sender, System.Windows.Forms.TreeViewCancelEventArgs e)
+		{
+			if(e.Node.ImageIndex==6)
+			{
+				e.Node.ImageIndex=5;
+				e.Node.SelectedImageIndex=5;
+			}
+		}
+
+		private void TreeBeforeExpand(object sender, System.Windows.Forms.TreeViewCancelEventArgs e)
+		{
+			if(e.Node.ImageIndex==5)
+			{
+				e.Node.ImageIndex=6;
+				e.Node.SelectedImageIndex=6;
+			}
+		}
+
+		private void navigationPane1_PanelChanging(object sender, DevComponents.DotNetBar.PanelChangingEventArgs e)
+		{
+			
+			if(this.dotNetBarManager1.GetItem(CREATE_BARS_PARENT,true)==null)
+				return;
+			
+			TreeView tree=GetPanelTreeView(e.NewPanel);
+			if(tree.Nodes.Count==0)
+				EnableCommands(tree,null);
+
+			if(e.NewPanel==navigationPanePanel1)
+				this.dotNetBarManager1.GetItem(CREATE_BARS_PARENT,true).Enabled=true;
+			else
+				this.dotNetBarManager1.GetItem(CREATE_BARS_PARENT,true).Enabled=false;
+		}
+
+		#endregion
+
+		#region GridViewSubclass
+		private class GridViewSubclass:NativeWindow
+		{
+			const int WM_CONTEXTMENU=0x007B;
+			public event EventHandler OnRightMouseDown;
+			public PropertyGrid ParentGrid;
+			protected override void WndProc(ref Message m)
+			{
+				if(m.Msg==WM_CONTEXTMENU)
+				{
+					if(OnRightMouseDown!=null)
+						OnRightMouseDown(this.ParentGrid,new EventArgs());
+					return;
+				}
+				base.WndProc(ref m);
+			}
+		}
+		#endregion
+
+		#region Public Interface
+		/// <summary>
+		/// Gets or sets the DotNetBar manager that is being designed by this designer.
+		/// </summary>
+		public DotNetBarManager ExternalManager
+		{
+			get {return m_ExternalManager;}
+			set
+			{
+				m_ExternalManager=value;
+				this.OnExternalManagerChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the external bar that is designed by this designer.
+		/// </summary>
+		public Bar ExternalBar
+		{
+			get {return m_ExternalBar;}
+			set
+			{
+				m_ExternalBar=value;
+				this.OnExternalBarChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets design-time designer services used to interact with design-time environment.
+		/// </summary>
+		public DevComponents.DotNetBar.Design.IDesignerServices DesignerServices
+		{
+			get {return m_Designer;}
+			set {m_Designer=value;}
+		}
+		#endregion
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesigner.dotNetBarManager1.xml b/PROMS/DotNetBar Source Code/DotNetBarDesigner.dotNetBarManager1.xml
new file mode 100644
index 00000000..26237a69
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesigner.dotNetBarManager1.xml	
@@ -0,0 +1,173 @@
+<dotnetbar fullmenus="false" fullmenushover="true" tooltips="true" scintooltip="false" animation="6">
+  <items />
+  <bars>
+    <bar name="mainmenu" candockleft="true" candockright="true" candocktop="true" candockbottom="true" candockdoc="false" candocktab="true" text="Main Menu" dockline="0" dockoffset="0" grabhandle="0" menubar="true" stretch="true" style="2" wrapdock="false" wrapfloat="true" state="2" dockside="3" visible="true" custom="false" canhide="false" imagesize="0" itemsp="0" themes="false" layout="0" eqbutton="false">
+      <items>
+        <item assembly="DevComponents.DotNetBar" class="DevComponents.DotNetBar.ButtonItem" name="item_95" text="&amp;File" iscontainer="false" visible="true" itemdata="" enabled="true" begingroup="false" style="2" desc="" tooltip="" category="" cancustomize="true" showsubitems="true" itemalignment="0" stretch="false" global="true" themes="false" PopupType="0" PopupWidth="200" PersonalizedMenus="0" panim="1" ImagePosition="0" ButtonStyle="0" Checked="false" VerticalPadding="0" HorizontalPadding="0" MenuVisibility="0" RecentlyUsed="false">
+          <subitems>
+            <item assembly="DevComponents.DotNetBar" class="DevComponents.DotNetBar.ButtonItem" name="buttonNewDefinition" text="&amp;New Definition" iscontainer="false" visible="true" itemdata="" enabled="true" begingroup="false" style="2" desc="" tooltip="" category="" cancustomize="true" showsubitems="true" itemalignment="0" stretch="false" global="true" themes="false" PopupType="0" PopupWidth="200" PersonalizedMenus="0" panim="1" ImagePosition="0" ButtonStyle="0" Checked="false" VerticalPadding="0" HorizontalPadding="0" MenuVisibility="0" RecentlyUsed="false">
+              <images>
+                <image type="default">iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAaZJREFUOE+lk0svQ1EQx8defAFr8S0srL0iRbwlRGzYSMSCnR2qKWmUEEQiHiERTTyCamkbWk21CSWEevZ1W6XU8++eSm/a9Fwbk8zmzPn/ZubMmQwA9C9jAOaDW14oNx7Qo7tD+/w1asYukK90I7fbJYZ/7/BcOlSLAJ5ldzhAzVpZiARg2XmW1WaH0bwPqtdwIRKAlc4zarZifceChTUTqFKdBpEAnYs3fECjmL3ODKraBZUbQApVCkQCtExfpQG+voH7x3c4b19gOH3CylEYVDrAByiGz9MAoegnzrwxWC6esep6xLxNAJUo+YC83pMUwFPsC5eBN9iuotg8jmDJHsK0JQgq7ucDcrqcEiDy+gmP8AbH9Qv07giWHWHM7AcxvhcAFckAMlsP8SE2LYhls8xMnOh79kDAhCkArcEPKuzjV0BNB/BFPnDuj8HuicbFOmcYc1YBk+YARkSxRu8DFcgBGizxB2M9s7IT4ilRPGr8FbPvLg+oNUliNq5E5oR4aNsH9t3lAdWDoAo1qEwVnzUbF3sw1jMTJXvyUslu2V8bmBz7ARyt7jTTRV8+AAAAAElFTkSuQmCC</image>
+              </images>
+            </item>
+            <item assembly="DevComponents.DotNetBar" class="DevComponents.DotNetBar.ButtonItem" name="buttonOpen" text="&amp;Open Definition..." iscontainer="false" visible="true" itemdata="" enabled="true" begingroup="false" style="2" desc="" tooltip="" category="" cancustomize="true" showsubitems="true" itemalignment="0" stretch="false" global="true" themes="false" shortcuts="131151" PopupType="0" PopupWidth="200" PersonalizedMenus="0" panim="1" ImagePosition="0" ButtonStyle="0" Checked="false" VerticalPadding="0" HorizontalPadding="0" MenuVisibility="0" RecentlyUsed="false">
+              <images>
+                <image type="default">iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAldJREFUOE+lk21Ik2EUhpekoaY0SaMySnHNZKutLYqhpNkMJRPJSluYEpEiiKGFDmUagabOjLIysq2wRVChDkqllmlfaEplX5SZYFG/oqIfFdLV+74jP0rtRw/c8HDOc67nPgfODED2X0cETCY/s2eM+pASjxwZG+w6lNXzMDo0+FfMJNASKJS46yYtFhPyYm8PryJZlX+unESngt29OhJuhqJtno9XucdfAG7Z0iTdOJlIS7lGehBsniuPshrI6jaQ+2QNSa5wYjpCWXhqzkRAp207DOTDqzx4ng4P1+HYJ2dtmb51jyuO0g9GTK4VrLYHv1tQ5U9AzawxQKfdBINmAbAXnu2AxxuhL4oeVzxbGmIpHk7A/MaIwhqEtdZAtmURXnmeX0Zn0H7UCC+z4UUmPBLuvasY6YukonkX21qiKf+cTMZVNanWEH48FT4Q3NUXjGuh9Ui0YHsn9G+SbJ/P9+PC/gAsV0zEXlZR+jaJuNoobBVamg5GSLmzeX7U58yW2pC5AelSkge6UdU16km/HUlau4GyBqUU/9mj41OHhiGnmsoM3+kBdwTb6x1qDHVL+HhXKwHE4v6LEdy3h3PA5DM94Hv3SsJKgog/oeJbt9vZ+7bldJ1W4jwcRmGK9xjgWk2kMP34CS2IBVl1CiJKAhjq1DIiAIcFV/ds4RRvdf8uzcBZqedSyWK+dmkZbFHxunmizp0JkWIDTSp6G5dJDn7blwDiVMWJir1dP76UtmOKKdUuOBpvf3QXqjN9saT6ULjZe1oVpfhQkOzu/Z/LNNWW/hn/BVr+af3qE5YEAAAAAElFTkSuQmCC</image>
+              </images>
+            </item>
+            <item assembly="DevComponents.DotNetBar" class="DevComponents.DotNetBar.ButtonItem" name="buttonSave" text="&amp;Save Definition..." iscontainer="false" visible="true" itemdata="" enabled="true" begingroup="true" style="2" desc="" tooltip="" category="" cancustomize="true" showsubitems="true" itemalignment="0" stretch="false" global="true" themes="false" shortcuts="131155" PopupType="0" PopupWidth="200" PersonalizedMenus="0" panim="1" ImagePosition="0" ButtonStyle="0" Checked="false" VerticalPadding="0" HorizontalPadding="0" MenuVisibility="0" RecentlyUsed="false">
+              <images>
+                <image type="default">iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAodJREFUOE+lU11Ik2EU/gIHMkRvdrML2YVeDPRC1AtvRLxQEBF/GCLMqcwfhooN0zQXW7SSBVpZXkRQEBHeBBGRRSyElbEfGdvYxiZsyNhkG2wxVhgRPJ3zWvvwtj443xnvu+c5zznn+S4BkP7rYYK5OWB6+hcmJ39Ar/+G0dGvGB7Oo78/jZ6eJLq6YujoCKK11Yemps9obPyI+vp9glJxfjF4d/cnJibOUC6XUSwWkcvlkE6nkUwmEYvFEAwG4fV6CXEfTqeT8k2ZgCvv7JxhfPw7SqUSCoUCstksUqkUEokEotEoAoEAPB4PAe9R3LlIwLK3t8sYGyuJ6vl8HplMBicnJzg+PkY4HIbf74fb7SbgXeh0HyjfkBVwzw5HkS4KAnx6elqpzvJDoRCOjo5weHhIwC2MjLynbJUJeGB2ew6Dg1lRmaVz7/F4vFKd5btcLiF/aGif8nWZgKdttabR15cSsrlvBkciEdG7z+cT1Q8ODgi4iYGBN5SvyQS8qvX1JNbWEqit3UNNzQtUVz9DVdUT+uMjioeid0lykMq3VOgV/b4qE/Cel5djMJujWFoKY3ExBJPJj9lZH6amvtB2XOQNJ3njHXnjNXp7XxLBFZmATbKwEMT8fICAJrS1taGlpQXNzc3QarVoaGiARqOBWq2GSqVCd/ceEVyWCdhhMzNecqMHRqORLh/82feWkC1Jt2Cz2WCxWFBXV4fOzud0tiATsD0Nhk9Cql6vF6s6N8umMAyvbGNjA6urq1AqlWTrp3RG/v9rZfY298ih0+no8jaFXZiF18UTX1lZoRmZoVAo0N7+mM6MMsH5F8mVOBhkrQB52jww7pllc2UGS5LhIgGT/Ev8BphTXg777xLiAAAAAElFTkSuQmCC</image>
+              </images>
+            </item>
+            <item assembly="DevComponents.DotNetBar" class="DevComponents.DotNetBar.ButtonItem" name="buttonSaveAs" text="Save Definition &amp;As..." iscontainer="false" visible="true" itemdata="" enabled="true" begingroup="false" style="2" desc="" tooltip="" category="" cancustomize="true" showsubitems="true" itemalignment="0" stretch="false" global="true" themes="false" PopupType="0" PopupWidth="200" PersonalizedMenus="0" panim="1" ImagePosition="0" ButtonStyle="0" Checked="false" VerticalPadding="0" HorizontalPadding="0" MenuVisibility="0" RecentlyUsed="false" />
+            <item assembly="DevComponents.DotNetBar" class="DevComponents.DotNetBar.ButtonItem" name="buttonLoadBar" text="&amp;Load Bar..." iscontainer="false" visible="true" itemdata="" enabled="true" begingroup="true" style="2" desc="" tooltip="" category="" cancustomize="true" showsubitems="true" itemalignment="0" stretch="false" global="true" themes="false" shortcuts="131148" PopupType="0" PopupWidth="200" PersonalizedMenus="0" panim="1" ImagePosition="0" ButtonStyle="0" Checked="false" VerticalPadding="0" HorizontalPadding="0" MenuVisibility="0" RecentlyUsed="false" />
+            <item assembly="DevComponents.DotNetBar" class="DevComponents.DotNetBar.ButtonItem" name="buttonSaveBar" text="Save &amp;Bar As..." iscontainer="false" visible="true" itemdata="" enabled="true" begingroup="false" style="2" desc="" tooltip="" category="" cancustomize="true" showsubitems="true" itemalignment="0" stretch="false" global="true" themes="false" shortcuts="131140" PopupType="0" PopupWidth="200" PersonalizedMenus="0" panim="1" ImagePosition="0" ButtonStyle="0" Checked="false" VerticalPadding="0" HorizontalPadding="0" MenuVisibility="0" RecentlyUsed="false" />
+            <item assembly="DevComponents.DotNetBar" class="DevComponents.DotNetBar.ButtonItem" name="buttonClose" text="&amp;Close Designer" iscontainer="false" visible="true" itemdata="" enabled="true" begingroup="true" style="2" desc="" tooltip="" category="" cancustomize="true" showsubitems="true" itemalignment="0" stretch="false" global="true" themes="false" PopupType="0" PopupWidth="200" PersonalizedMenus="0" panim="1" ImagePosition="0" ButtonStyle="0" Checked="false" VerticalPadding="0" HorizontalPadding="0" MenuVisibility="0" RecentlyUsed="false">
+              <images>
+                <image type="default">iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAtZJREFUOE+FU0tME1EUvYg/Im40cUEMX/moiPxUkEGUaEAxiAYlfAJCbY0xSiAEkQ0Rl0ZI3OvKrUY3BtACIojQiAiFMgj9UKBUgiilkADleN8rkLjyJaeZzsw5595z7/gAIHEcdSUhBOzD2ioJkMfDf9eJfySwukLry25ad83T2q+ff8L1s2OSKAQc9ZrXxoc6dfpRGaZqCzBZdQ32imzYyy/Dfj8LE/cuwnY7HZaiRIxdCkRzyDZ1MJZavseQL03V5icYqzUqi0iyvfIKJu5cgE17FrZbZ2DTpMJamgJLYQLGssMwkrQbg8cJbw6SajhK6TRZnatI1wc3pJO1TIHjsRZuQytW52Yk3L16TPFzVfGHMZbQF034cpjwOYqyiMtUpOvdDFhLkjD3sgFLA91wNlbBXBgPc0EcnE8r4O7rgPNZDfpjCD1HCJ2RhI4IFuByFVGyKHO6rgRL/Z2w6c5BTdmDkWQ/L5J2yRYWe/QYLVbQHUX4GE5oP8QC/LJi06bJgJaHDHA2VHpJJ7Zzvt5jiicMxxEm63VYMLSjiwWYjLYwIaBNU0RQloJ4eNwLMOfFSEdTgs8/AkMsYMoMwprrN7q4fCHQuikggrPkx8Gz+H8Bj9slBdq2BDSpirX0tHReNvZi5kk5Rk7ukGVvnmG+FhXYN1oQAW4JWItPKSKg8auRvAM5PL42GZjoWZA2MZafABeHOFyk4FOELB/6UM7AfD1aGc8Jx+j5AzAl+spRLbKICEz0LCCcXb18r7FGzF72/yFUIot+ZAQoqrJXOg7whn07RlBvpmG+9S1WZh0S4nq4JE2SxfgEuSWY8D6EBXhcye8CSRULwquJbt4wEZLoU4LLFSV3MFH0LcjNTH6xn1QWyCRezZ1MHnoVQKogCoeNgLx9env1uvL32hREeM7kpmAy8z1/+TV+jSY/3u1cdtIxWccEHT/UscMWmKxj503kCbLg/gWaR0fP58SPMgAAAABJRU5ErkJg</image>
+              </images>
+            </item>
+          </subitems>
+        </item>
+        <item assembly="DevComponents.DotNetBar" class="DevComponents.DotNetBar.ButtonItem" name="item_96" text="&amp;Tools" iscontainer="false" visible="true" itemdata="" enabled="true" begingroup="false" style="2" desc="" tooltip="" category="" cancustomize="true" showsubitems="true" itemalignment="0" stretch="false" global="true" themes="false" PopupType="0" PopupWidth="200" PersonalizedMenus="0" panim="1" ImagePosition="0" ButtonStyle="0" Checked="false" VerticalPadding="0" HorizontalPadding="0" MenuVisibility="0" RecentlyUsed="false">
+          <subitems>
+            <item assembly="DevComponents.DotNetBar" class="DevComponents.DotNetBar.ButtonItem" name="buttonCreateBar" text="&amp;Create Bar" iscontainer="false" visible="true" itemdata="" enabled="true" begingroup="false" style="2" desc="" tooltip="Create New Bar" category="" cancustomize="true" showsubitems="true" itemalignment="0" stretch="false" global="true" themes="false" PopupType="0" PopupWidth="200" PersonalizedMenus="0" panim="1" ImagePosition="0" ButtonStyle="0" Checked="false" VerticalPadding="0" HorizontalPadding="0" MenuVisibility="0" RecentlyUsed="false">
+              <subitems>
+                <item assembly="DevComponents.DotNetBar" class="DevComponents.DotNetBar.ButtonItem" name="buttonNewToolbar" text="&amp;Toolbar" iscontainer="false" visible="true" itemdata="" enabled="true" begingroup="false" style="2" desc="" tooltip="" category="" cancustomize="true" showsubitems="true" itemalignment="0" stretch="false" global="true" themes="false" PopupType="0" PopupWidth="200" PersonalizedMenus="0" panim="1" ImagePosition="0" ButtonStyle="0" Checked="false" VerticalPadding="0" HorizontalPadding="0" MenuVisibility="0" RecentlyUsed="false" />
+                <item assembly="DevComponents.DotNetBar" class="DevComponents.DotNetBar.ButtonItem" name="buttonNewMenubar" text="&amp;Menu bar" iscontainer="false" visible="true" itemdata="" enabled="true" begingroup="false" style="2" desc="" tooltip="" category="" cancustomize="true" showsubitems="true" itemalignment="0" stretch="false" global="true" themes="false" PopupType="0" PopupWidth="200" PersonalizedMenus="0" panim="1" ImagePosition="0" ButtonStyle="0" Checked="false" VerticalPadding="0" HorizontalPadding="0" MenuVisibility="0" RecentlyUsed="false" />
+                <item assembly="DevComponents.DotNetBar" class="DevComponents.DotNetBar.ButtonItem" name="buttonNewStatusbar" text="&amp;Status bar" iscontainer="false" visible="true" itemdata="" enabled="true" begingroup="false" style="2" desc="" tooltip="" category="" cancustomize="true" showsubitems="true" itemalignment="0" stretch="false" global="true" themes="false" PopupType="0" PopupWidth="200" PersonalizedMenus="0" panim="1" ImagePosition="0" ButtonStyle="0" Checked="false" VerticalPadding="0" HorizontalPadding="0" MenuVisibility="0" RecentlyUsed="false" />
+                <item assembly="DevComponents.DotNetBar" class="DevComponents.DotNetBar.ButtonItem" name="buttonNewDockWindow" text="&amp;Dockable window" iscontainer="false" visible="true" itemdata="" enabled="true" begingroup="false" style="2" desc="" tooltip="" category="" cancustomize="true" showsubitems="true" itemalignment="0" stretch="false" global="true" themes="false" PopupType="0" PopupWidth="200" PersonalizedMenus="0" panim="1" ImagePosition="0" ButtonStyle="0" Checked="false" VerticalPadding="0" HorizontalPadding="0" MenuVisibility="0" RecentlyUsed="false" />
+                <item assembly="DevComponents.DotNetBar" class="DevComponents.DotNetBar.ButtonItem" name="buttonNewTaskPane" text="&amp;Task pane" iscontainer="false" visible="true" itemdata="" enabled="true" begingroup="false" style="2" desc="" tooltip="" category="" cancustomize="true" showsubitems="true" itemalignment="0" stretch="false" global="true" themes="false" PopupType="0" PopupWidth="200" PersonalizedMenus="0" panim="1" ImagePosition="0" ButtonStyle="0" Checked="false" VerticalPadding="0" HorizontalPadding="0" MenuVisibility="0" RecentlyUsed="false" />
+              </subitems>
+              <images>
+                <image type="default">iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAArpJREFUOE+FkllIlFEUx0czWtxmdGaccdRZHZfRSc19d8YMl6BR3HLNJcfBlFFbJCKkBMkMCqGHgjBSywofghalxcJKCNRcR7PH6aUeguhJ+nfuxxiOUX3w437f/c753XPPvTwAvH89Rztsg+UtqxsHSl/1UByfcHOK/6+g3TZTallFZtGLWUqMI7z+KqhrX5CaT9u6GzpnmsqbnqZVtbxJqmz9MG5qXIE+/fpzSsz3Dz0brY6/I6F3V8KFt7WCqpa3QsuZT2CYu9ZR3/kRbHVj2SL0OXMITZ+EJnEMQfor/ZQsInY6CZj12Kl1NJxcR411DcVmGwyUHG54D3X8XcijryEw8hLEKssjx3Y8OYGpcel2SfOKvcwyP1nVtoaK1jWwsrNKF6EzzkAZOwiZ7gKkIV2QaE/AN6himgQ5hA8nMJYtfM+pWEJu9TLya4maZWSVLCLq4ByCkx/Sqn0/PXyT71FCh0BmeuItyR+md8Nvgd74rEeXMTahSx16l3R4HoyY3DmEZU5R6SNs5c8U3EZkE1FEAhFGeGz2gJ1vjJfYUB2ZPYsIIjxrGiGpE1DFDUEWfv4L/a8mVMQuLpHHcyd2bArY5fAU+BdqQjNeU7dfQps6zpXPBPKoAQgVdSMiRf0R+b6r04ERvecc98HN6RRUccMCbcpj7qjUCaNc+YqYG9SDfgREXGS9oLEXYvXxWyTQb90Cd7lIINQkPoBy/01u1UD9ZSq/G5Lgdvhp2uAXbKXRCr6kYJTCMwm+cwWxg0qWHKDr+eanbrWLVM1fhfJa8P1NP7wleXYGX1pg3+MdOUDJKWzbf1wkmgwiDrGmuQvi+3xkxfAQpk3Rt9XRyFIa8wgtsXu7wIUm9xJSJhIpzTafgBIIZEUb9F3p2LeMRrHjFFy3C7hebD5CRX0zCVaokvs0V+gQO8X8AjEoMAmZ0PRFAAAAAElFTkSuQmCC</image>
+              </images>
+            </item>
+            <item assembly="DevComponents.DotNetBar" class="DevComponents.DotNetBar.ButtonItem" name="buttonNewButton" text="Add &amp;Button (ButtonItem)" iscontainer="false" visible="true" itemdata="" enabled="false" begingroup="true" style="2" desc="" tooltip="" category="" cancustomize="true" showsubitems="true" itemalignment="0" stretch="false" global="true" themes="false" PopupType="0" PopupWidth="200" PersonalizedMenus="0" panim="1" ImagePosition="0" ButtonStyle="0" Checked="false" VerticalPadding="0" HorizontalPadding="0" MenuVisibility="0" RecentlyUsed="false" />
+            <item assembly="DevComponents.DotNetBar" class="DevComponents.DotNetBar.ButtonItem" name="buttonNewLabel" text="Add &amp;Label (LabelItem)" iscontainer="false" visible="true" itemdata="" enabled="false" begingroup="false" style="2" desc="" tooltip="" category="" cancustomize="true" showsubitems="true" itemalignment="0" stretch="false" global="true" themes="false" PopupType="0" PopupWidth="200" PersonalizedMenus="0" panim="1" ImagePosition="0" ButtonStyle="0" Checked="false" VerticalPadding="0" HorizontalPadding="0" MenuVisibility="0" RecentlyUsed="false" />
+            <item assembly="DevComponents.DotNetBar" class="DevComponents.DotNetBar.ButtonItem" name="buttonNewCombo" text="Add &amp;Combo-box (ComboBoxItem)" iscontainer="false" visible="true" itemdata="" enabled="false" begingroup="false" style="2" desc="" tooltip="" category="" cancustomize="true" showsubitems="true" itemalignment="0" stretch="false" global="true" themes="false" PopupType="0" PopupWidth="200" PersonalizedMenus="0" panim="1" ImagePosition="0" ButtonStyle="0" Checked="false" VerticalPadding="0" HorizontalPadding="0" MenuVisibility="0" RecentlyUsed="false" />
+            <item assembly="DevComponents.DotNetBar" class="DevComponents.DotNetBar.ButtonItem" name="buttonNewProgress" text="Add Progress-bar (ProgressBarItem)" iscontainer="false" visible="true" itemdata="" enabled="false" begingroup="false" style="2" desc="" tooltip="" category="" cancustomize="true" showsubitems="true" itemalignment="0" stretch="false" global="true" themes="false" PopupType="0" PopupWidth="200" PersonalizedMenus="0" panim="1" ImagePosition="0" ButtonStyle="0" Checked="false" VerticalPadding="0" HorizontalPadding="0" MenuVisibility="0" RecentlyUsed="false" />
+            <item assembly="DevComponents.DotNetBar" class="DevComponents.DotNetBar.ButtonItem" name="buttonNewTextBox" text="Add Text Box (TextBoxItem)" iscontainer="false" visible="true" itemdata="" enabled="false" begingroup="false" style="2" desc="" tooltip="" category="" cancustomize="true" showsubitems="true" itemalignment="0" stretch="false" global="true" themes="false" PopupType="0" PopupWidth="200" PersonalizedMenus="0" panim="1" ImagePosition="0" ButtonStyle="0" Checked="false" VerticalPadding="0" HorizontalPadding="0" MenuVisibility="0" RecentlyUsed="false" />
+            <item assembly="DevComponents.DotNetBar" class="DevComponents.DotNetBar.ButtonItem" name="buttonNewDock" text="Add Dock Container (DockContainerItem)" iscontainer="false" visible="true" itemdata="" enabled="false" begingroup="true" style="2" desc="" tooltip="" category="" cancustomize="true" showsubitems="true" itemalignment="0" stretch="false" global="true" themes="false" PopupType="0" PopupWidth="200" PersonalizedMenus="0" panim="1" ImagePosition="0" ButtonStyle="0" Checked="false" VerticalPadding="0" HorizontalPadding="0" MenuVisibility="0" RecentlyUsed="false" />
+            <item assembly="DevComponents.DotNetBar" class="DevComponents.DotNetBar.ButtonItem" name="buttonNewCustomize" text="Add Customization (CustomizeItem)" iscontainer="false" visible="true" itemdata="" enabled="false" begingroup="false" style="2" desc="" tooltip="" category="" cancustomize="true" showsubitems="true" itemalignment="0" stretch="false" global="true" themes="false" PopupType="0" PopupWidth="200" PersonalizedMenus="0" panim="1" ImagePosition="0" ButtonStyle="0" Checked="false" VerticalPadding="0" HorizontalPadding="0" MenuVisibility="0" RecentlyUsed="false" />
+            <item assembly="DevComponents.DotNetBar" class="DevComponents.DotNetBar.ButtonItem" name="buttonNewMdiList" text="Add MDI Window List (MdiWindowListItem)" iscontainer="false" visible="true" itemdata="" enabled="false" begingroup="false" style="2" desc="" tooltip="" category="" cancustomize="true" showsubitems="true" itemalignment="0" stretch="false" global="true" themes="false" PopupType="0" PopupWidth="200" PersonalizedMenus="0" panim="1" ImagePosition="0" ButtonStyle="0" Checked="false" VerticalPadding="0" HorizontalPadding="0" MenuVisibility="0" RecentlyUsed="false" />
+            <item assembly="DevComponents.DotNetBar" class="DevComponents.DotNetBar.ButtonItem" name="buttonNewColorPicker" text="Add Color Picker" iscontainer="false" visible="true" itemdata="" enabled="true" begingroup="false" style="0" desc="" tooltip="" category="" cancustomize="true" showsubitems="true" itemalignment="0" stretch="false" global="true" themes="false" PopupType="0" PopupWidth="200" PersonalizedMenus="0" panim="1" ImagePosition="0" ButtonStyle="0" Checked="false" VerticalPadding="0" HorizontalPadding="0" MenuVisibility="0" RecentlyUsed="false" />
+            <item assembly="DevComponents.DotNetBar" class="DevComponents.DotNetBar.ButtonItem" name="buttonNewControlCont" text="Add Control Container (ControlContainerItem)" iscontainer="false" visible="true" itemdata="" enabled="false" begingroup="false" style="2" desc="" tooltip="" category="" cancustomize="true" showsubitems="true" itemalignment="0" stretch="false" global="true" themes="false" PopupType="0" PopupWidth="200" PersonalizedMenus="0" panim="1" ImagePosition="0" ButtonStyle="0" Checked="false" VerticalPadding="0" HorizontalPadding="0" MenuVisibility="0" RecentlyUsed="false" />
+          </subitems>
+        </item>
+        <item assembly="DevComponents.DotNetBar" class="DevComponents.DotNetBar.ButtonItem" name="item_97" text="&amp;Help" iscontainer="false" visible="true" itemdata="" enabled="true" begingroup="false" style="2" desc="" tooltip="" category="" cancustomize="true" showsubitems="true" itemalignment="0" stretch="false" global="true" themes="false" PopupType="0" PopupWidth="200" PersonalizedMenus="0" panim="1" ImagePosition="0" ButtonStyle="0" Checked="false" VerticalPadding="0" HorizontalPadding="0" MenuVisibility="0" RecentlyUsed="false">
+          <subitems>
+            <item assembly="DevComponents.DotNetBar" class="DevComponents.DotNetBar.ButtonItem" name="buttonHelpContents" text="&amp;Contents..." iscontainer="false" visible="true" itemdata="" enabled="true" begingroup="false" style="2" desc="" tooltip="" category="" cancustomize="true" showsubitems="true" itemalignment="0" stretch="false" global="true" themes="false" PopupType="0" PopupWidth="200" PersonalizedMenus="0" panim="1" ImagePosition="0" ButtonStyle="0" Checked="false" VerticalPadding="0" HorizontalPadding="0" MenuVisibility="0" RecentlyUsed="false" />
+          </subitems>
+        </item>
+        <item assembly="DevComponents.DotNetBar" class="DevComponents.DotNetBar.ButtonItem" name="buttonSaveAndClose" text="Save &amp;&amp; Close" iscontainer="false" visible="true" itemdata="" enabled="true" begingroup="false" style="2" desc="" tooltip="Saves current definition and closes designer" category="" cancustomize="true" showsubitems="true" itemalignment="1" stretch="false" global="true" themes="false" PopupType="0" PopupWidth="200" PersonalizedMenus="0" panim="1" ImagePosition="0" ButtonStyle="2" Checked="false" VerticalPadding="0" HorizontalPadding="0" MenuVisibility="0" RecentlyUsed="false">
+          <images>
+            <image type="default">iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAtZJREFUOE+FU0tME1EUvYg/Im40cUEMX/moiPxUkEGUaEAxiAYlfAJCbY0xSiAEkQ0Rl0ZI3OvKrUY3BtACIojQiAiFMgj9UKBUgiilkADleN8rkLjyJaeZzsw5595z7/gAIHEcdSUhBOzD2ioJkMfDf9eJfySwukLry25ad83T2q+ff8L1s2OSKAQc9ZrXxoc6dfpRGaZqCzBZdQ32imzYyy/Dfj8LE/cuwnY7HZaiRIxdCkRzyDZ1MJZavseQL03V5icYqzUqi0iyvfIKJu5cgE17FrZbZ2DTpMJamgJLYQLGssMwkrQbg8cJbw6SajhK6TRZnatI1wc3pJO1TIHjsRZuQytW52Yk3L16TPFzVfGHMZbQF034cpjwOYqyiMtUpOvdDFhLkjD3sgFLA91wNlbBXBgPc0EcnE8r4O7rgPNZDfpjCD1HCJ2RhI4IFuByFVGyKHO6rgRL/Z2w6c5BTdmDkWQ/L5J2yRYWe/QYLVbQHUX4GE5oP8QC/LJi06bJgJaHDHA2VHpJJ7Zzvt5jiicMxxEm63VYMLSjiwWYjLYwIaBNU0RQloJ4eNwLMOfFSEdTgs8/AkMsYMoMwprrN7q4fCHQuikggrPkx8Gz+H8Bj9slBdq2BDSpirX0tHReNvZi5kk5Rk7ukGVvnmG+FhXYN1oQAW4JWItPKSKg8auRvAM5PL42GZjoWZA2MZafABeHOFyk4FOELB/6UM7AfD1aGc8Jx+j5AzAl+spRLbKICEz0LCCcXb18r7FGzF72/yFUIot+ZAQoqrJXOg7whn07RlBvpmG+9S1WZh0S4nq4JE2SxfgEuSWY8D6EBXhcye8CSRULwquJbt4wEZLoU4LLFSV3MFH0LcjNTH6xn1QWyCRezZ1MHnoVQKogCoeNgLx9env1uvL32hREeM7kpmAy8z1/+TV+jSY/3u1cdtIxWccEHT/UscMWmKxj503kCbLg/gWaR0fP58SPMgAAAABJRU5ErkJg</image>
+          </images>
+        </item>
+      </items>
+    </bar>
+    <bar name="bar2" candockleft="true" candockright="true" candocktop="true" candockbottom="true" candockdoc="false" candocktab="true" text="Main Toolbar" dockline="1" dockoffset="0" grabhandle="0" menubar="false" stretch="false" style="2" wrapdock="false" wrapfloat="true" state="2" dockside="3" visible="true" custom="false" canhide="false" imagesize="0" itemsp="0" themes="false" layout="0" eqbutton="false">
+      <items>
+        <item assembly="DevComponents.DotNetBar" class="DevComponents.DotNetBar.ButtonItem" name="buttonNewDefinition" text="&amp;New Definition" iscontainer="false" visible="true" itemdata="" enabled="true" begingroup="false" style="2" desc="" tooltip="Create New Definition" category="" cancustomize="true" showsubitems="true" itemalignment="0" stretch="false" global="true" themes="false" PopupType="0" PopupWidth="200" PersonalizedMenus="0" panim="1" ImagePosition="0" ButtonStyle="0" Checked="false" VerticalPadding="0" HorizontalPadding="0" MenuVisibility="0" RecentlyUsed="false">
+          <images>
+            <image type="default">iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAaZJREFUOE+lk0svQ1EQx8defAFr8S0srL0iRbwlRGzYSMSCnR2qKWmUEEQiHiERTTyCamkbWk21CSWEevZ1W6XU8++eSm/a9Fwbk8zmzPn/ZubMmQwA9C9jAOaDW14oNx7Qo7tD+/w1asYukK90I7fbJYZ/7/BcOlSLAJ5ldzhAzVpZiARg2XmW1WaH0bwPqtdwIRKAlc4zarZifceChTUTqFKdBpEAnYs3fECjmL3ODKraBZUbQApVCkQCtExfpQG+voH7x3c4b19gOH3CylEYVDrAByiGz9MAoegnzrwxWC6esep6xLxNAJUo+YC83pMUwFPsC5eBN9iuotg8jmDJHsK0JQgq7ucDcrqcEiDy+gmP8AbH9Qv07giWHWHM7AcxvhcAFckAMlsP8SE2LYhls8xMnOh79kDAhCkArcEPKuzjV0BNB/BFPnDuj8HuicbFOmcYc1YBk+YARkSxRu8DFcgBGizxB2M9s7IT4ilRPGr8FbPvLg+oNUliNq5E5oR4aNsH9t3lAdWDoAo1qEwVnzUbF3sw1jMTJXvyUslu2V8bmBz7ARyt7jTTRV8+AAAAAElFTkSuQmCC</image>
+          </images>
+        </item>
+        <item assembly="DevComponents.DotNetBar" class="DevComponents.DotNetBar.ButtonItem" name="buttonOpen" text="&amp;Open Definition..." iscontainer="false" visible="true" itemdata="" enabled="true" begingroup="false" style="2" desc="" tooltip="Open Definition" category="" cancustomize="true" showsubitems="true" itemalignment="0" stretch="false" global="true" themes="false" shortcuts="131151" PopupType="0" PopupWidth="200" PersonalizedMenus="0" panim="1" ImagePosition="0" ButtonStyle="0" Checked="false" VerticalPadding="0" HorizontalPadding="0" MenuVisibility="0" RecentlyUsed="false">
+          <images>
+            <image type="default">iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAldJREFUOE+lk21Ik2EUhpekoaY0SaMySnHNZKutLYqhpNkMJRPJSluYEpEiiKGFDmUagabOjLIysq2wRVChDkqllmlfaEplX5SZYFG/oqIfFdLV+74jP0rtRw/c8HDOc67nPgfODED2X0cETCY/s2eM+pASjxwZG+w6lNXzMDo0+FfMJNASKJS46yYtFhPyYm8PryJZlX+unESngt29OhJuhqJtno9XucdfAG7Z0iTdOJlIS7lGehBsniuPshrI6jaQ+2QNSa5wYjpCWXhqzkRAp207DOTDqzx4ng4P1+HYJ2dtmb51jyuO0g9GTK4VrLYHv1tQ5U9AzawxQKfdBINmAbAXnu2AxxuhL4oeVzxbGmIpHk7A/MaIwhqEtdZAtmURXnmeX0Zn0H7UCC+z4UUmPBLuvasY6YukonkX21qiKf+cTMZVNanWEH48FT4Q3NUXjGuh9Ui0YHsn9G+SbJ/P9+PC/gAsV0zEXlZR+jaJuNoobBVamg5GSLmzeX7U58yW2pC5AelSkge6UdU16km/HUlau4GyBqUU/9mj41OHhiGnmsoM3+kBdwTb6x1qDHVL+HhXKwHE4v6LEdy3h3PA5DM94Hv3SsJKgog/oeJbt9vZ+7bldJ1W4jwcRmGK9xjgWk2kMP34CS2IBVl1CiJKAhjq1DIiAIcFV/ds4RRvdf8uzcBZqedSyWK+dmkZbFHxunmizp0JkWIDTSp6G5dJDn7blwDiVMWJir1dP76UtmOKKdUuOBpvf3QXqjN9saT6ULjZe1oVpfhQkOzu/Z/LNNWW/hn/BVr+af3qE5YEAAAAAElFTkSuQmCC</image>
+          </images>
+        </item>
+        <item assembly="DevComponents.DotNetBar" class="DevComponents.DotNetBar.ButtonItem" name="buttonSave" text="&amp;Save Definition..." iscontainer="false" visible="true" itemdata="" enabled="true" begingroup="false" style="2" desc="" tooltip="Save Definition to File" category="" cancustomize="true" showsubitems="true" itemalignment="0" stretch="false" global="true" themes="false" shortcuts="131155" PopupType="0" PopupWidth="200" PersonalizedMenus="0" panim="1" ImagePosition="0" ButtonStyle="0" Checked="false" VerticalPadding="0" HorizontalPadding="0" MenuVisibility="0" RecentlyUsed="false">
+          <images>
+            <image type="default">iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAodJREFUOE+lU11Ik2EU/gIHMkRvdrML2YVeDPRC1AtvRLxQEBF/GCLMqcwfhooN0zQXW7SSBVpZXkRQEBHeBBGRRSyElbEfGdvYxiZsyNhkG2wxVhgRPJ3zWvvwtj443xnvu+c5zznn+S4BkP7rYYK5OWB6+hcmJ39Ar/+G0dGvGB7Oo78/jZ6eJLq6YujoCKK11Yemps9obPyI+vp9glJxfjF4d/cnJibOUC6XUSwWkcvlkE6nkUwmEYvFEAwG4fV6CXEfTqeT8k2ZgCvv7JxhfPw7SqUSCoUCstksUqkUEokEotEoAoEAPB4PAe9R3LlIwLK3t8sYGyuJ6vl8HplMBicnJzg+PkY4HIbf74fb7SbgXeh0HyjfkBVwzw5HkS4KAnx6elqpzvJDoRCOjo5weHhIwC2MjLynbJUJeGB2ew6Dg1lRmaVz7/F4vFKd5btcLiF/aGif8nWZgKdttabR15cSsrlvBkciEdG7z+cT1Q8ODgi4iYGBN5SvyQS8qvX1JNbWEqit3UNNzQtUVz9DVdUT+uMjioeid0lykMq3VOgV/b4qE/Cel5djMJujWFoKY3ExBJPJj9lZH6amvtB2XOQNJ3njHXnjNXp7XxLBFZmATbKwEMT8fICAJrS1taGlpQXNzc3QarVoaGiARqOBWq2GSqVCd/ceEVyWCdhhMzNecqMHRqORLh/82feWkC1Jt2Cz2WCxWFBXV4fOzud0tiATsD0Nhk9Cql6vF6s6N8umMAyvbGNjA6urq1AqlWTrp3RG/v9rZfY298ih0+no8jaFXZiF18UTX1lZoRmZoVAo0N7+mM6MMsH5F8mVOBhkrQB52jww7pllc2UGS5LhIgGT/Ev8BphTXg777xLiAAAAAElFTkSuQmCC</image>
+          </images>
+        </item>
+        <item assembly="DevComponents.DotNetBar" class="DevComponents.DotNetBar.ButtonItem" name="buttonCreateBar" text="&amp;Create Bar" iscontainer="false" visible="true" itemdata="" enabled="true" begingroup="true" style="2" desc="" tooltip="Create New Bar" category="" cancustomize="true" showsubitems="true" itemalignment="0" stretch="false" global="true" themes="false" PopupType="0" PopupWidth="200" PersonalizedMenus="0" panim="1" ImagePosition="0" ButtonStyle="0" Checked="false" VerticalPadding="0" HorizontalPadding="0" MenuVisibility="0" RecentlyUsed="false">
+          <subitems>
+            <item assembly="DevComponents.DotNetBar" class="DevComponents.DotNetBar.ButtonItem" name="buttonNewToolbar" text="&amp;Toolbar" iscontainer="false" visible="true" itemdata="" enabled="true" begingroup="false" style="2" desc="" tooltip="" category="" cancustomize="true" showsubitems="true" itemalignment="0" stretch="false" global="true" themes="false" PopupType="0" PopupWidth="200" PersonalizedMenus="0" panim="1" ImagePosition="0" ButtonStyle="0" Checked="false" VerticalPadding="0" HorizontalPadding="0" MenuVisibility="0" RecentlyUsed="false" />
+            <item assembly="DevComponents.DotNetBar" class="DevComponents.DotNetBar.ButtonItem" name="buttonNewMenubar" text="&amp;Menu bar" iscontainer="false" visible="true" itemdata="" enabled="true" begingroup="false" style="2" desc="" tooltip="" category="" cancustomize="true" showsubitems="true" itemalignment="0" stretch="false" global="true" themes="false" PopupType="0" PopupWidth="200" PersonalizedMenus="0" panim="1" ImagePosition="0" ButtonStyle="0" Checked="false" VerticalPadding="0" HorizontalPadding="0" MenuVisibility="0" RecentlyUsed="false" />
+            <item assembly="DevComponents.DotNetBar" class="DevComponents.DotNetBar.ButtonItem" name="buttonNewStatusbar" text="&amp;Status bar" iscontainer="false" visible="true" itemdata="" enabled="true" begingroup="false" style="2" desc="" tooltip="" category="" cancustomize="true" showsubitems="true" itemalignment="0" stretch="false" global="true" themes="false" PopupType="0" PopupWidth="200" PersonalizedMenus="0" panim="1" ImagePosition="0" ButtonStyle="0" Checked="false" VerticalPadding="0" HorizontalPadding="0" MenuVisibility="0" RecentlyUsed="false" />
+            <item assembly="DevComponents.DotNetBar" class="DevComponents.DotNetBar.ButtonItem" name="buttonNewDockWindow" text="&amp;Dockable window" iscontainer="false" visible="true" itemdata="" enabled="true" begingroup="false" style="2" desc="" tooltip="" category="" cancustomize="true" showsubitems="true" itemalignment="0" stretch="false" global="true" themes="false" PopupType="0" PopupWidth="200" PersonalizedMenus="0" panim="1" ImagePosition="0" ButtonStyle="0" Checked="false" VerticalPadding="0" HorizontalPadding="0" MenuVisibility="0" RecentlyUsed="false" />
+            <item assembly="DevComponents.DotNetBar" class="DevComponents.DotNetBar.ButtonItem" name="buttonNewTaskPane" text="&amp;Task pane" iscontainer="false" visible="true" itemdata="" enabled="true" begingroup="false" style="2" desc="" tooltip="" category="" cancustomize="true" showsubitems="true" itemalignment="0" stretch="false" global="true" themes="false" PopupType="0" PopupWidth="200" PersonalizedMenus="0" panim="1" ImagePosition="0" ButtonStyle="0" Checked="false" VerticalPadding="0" HorizontalPadding="0" MenuVisibility="0" RecentlyUsed="false" />
+          </subitems>
+          <images>
+            <image type="default">iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAArpJREFUOE+FkllIlFEUx0czWtxmdGaccdRZHZfRSc19d8YMl6BR3HLNJcfBlFFbJCKkBMkMCqGHgjBSywofghalxcJKCNRcR7PH6aUeguhJ+nfuxxiOUX3w437f/c753XPPvTwAvH89Rztsg+UtqxsHSl/1UByfcHOK/6+g3TZTallFZtGLWUqMI7z+KqhrX5CaT9u6GzpnmsqbnqZVtbxJqmz9MG5qXIE+/fpzSsz3Dz0brY6/I6F3V8KFt7WCqpa3QsuZT2CYu9ZR3/kRbHVj2SL0OXMITZ+EJnEMQfor/ZQsInY6CZj12Kl1NJxcR411DcVmGwyUHG54D3X8XcijryEw8hLEKssjx3Y8OYGpcel2SfOKvcwyP1nVtoaK1jWwsrNKF6EzzkAZOwiZ7gKkIV2QaE/AN6himgQ5hA8nMJYtfM+pWEJu9TLya4maZWSVLCLq4ByCkx/Sqn0/PXyT71FCh0BmeuItyR+md8Nvgd74rEeXMTahSx16l3R4HoyY3DmEZU5R6SNs5c8U3EZkE1FEAhFGeGz2gJ1vjJfYUB2ZPYsIIjxrGiGpE1DFDUEWfv4L/a8mVMQuLpHHcyd2bArY5fAU+BdqQjNeU7dfQps6zpXPBPKoAQgVdSMiRf0R+b6r04ERvecc98HN6RRUccMCbcpj7qjUCaNc+YqYG9SDfgREXGS9oLEXYvXxWyTQb90Cd7lIINQkPoBy/01u1UD9ZSq/G5Lgdvhp2uAXbKXRCr6kYJTCMwm+cwWxg0qWHKDr+eanbrWLVM1fhfJa8P1NP7wleXYGX1pg3+MdOUDJKWzbf1wkmgwiDrGmuQvi+3xkxfAQpk3Rt9XRyFIa8wgtsXu7wIUm9xJSJhIpzTafgBIIZEUb9F3p2LeMRrHjFFy3C7hebD5CRX0zCVaokvs0V+gQO8X8AjEoMAmZ0PRFAAAAAElFTkSuQmCC</image>
+          </images>
+        </item>
+        <item assembly="DevComponents.DotNetBar" class="DevComponents.DotNetBar.ButtonItem" name="buttonDelete" text="Delete" iscontainer="false" visible="true" itemdata="" enabled="false" begingroup="false" style="2" desc="" tooltip="Delete Selected Item" category="" cancustomize="true" showsubitems="true" itemalignment="0" stretch="false" global="true" themes="false" PopupType="0" PopupWidth="200" PersonalizedMenus="0" panim="1" ImagePosition="0" ButtonStyle="0" Checked="false" VerticalPadding="0" HorizontalPadding="0" MenuVisibility="0" RecentlyUsed="false">
+          <images>
+            <image type="default">iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAeZJREFUOE+lU1FIk1EYPcMRv2IDwTEZuCGTyZxMN83twRr10kuYjwrKYBqJYGRMRTSLepFYEQYRlD1YD1L5UE7mNueU6sEn38R3HyKmL4kRQXydTf7xu/2p0A+Hy7333POd/3z3GkQE//XlBNbb2pTPHR3ZL8HgV47R3NpZkSemXS5XxueTDb9fNgIBoeCtTEuLV09kranJkLDZfDGT6XzevUpK1ddH0m63ZLxeWW9tFQp+J0xaEe6bE7W1kVhlpXzIH9UIrFitSsrhuELSpkZkvlDA4bgcN5tTH41GeQPsPwfmjgmoxHRjozfT3Hyw5vEIf02SdXWX4hZL+JOibC8Amy+A2CMgpPJ1w6JID938itfUyFJFxc/3wN4rWn4MXCzORVcgabdfZUjfFnlojnhCPACuTQCWUwVoeYZVZf6o4p9pjqPEbeCeXlcKDpi4h7YTS+Xl8pIH7gOHw0ByAHD3c36T4LxL18Gq0znELuzmEmZIQqs7YWBGJfcCT29wfQT4wb0GrUjeAfv6+h0Js8QY0QcMakmcVw0BWxHu3QWelQiwrwqDyuYOh4C314H2YqusfmEcOJgCogy0rKSNVG4YBHq7gXP/ege0f2eSRRhs54n34KSHRAfLLPb7IVCtexPP+gpV3l8w4xzrIycGdAAAAABJRU5ErkJg</image>
+          </images>
+        </item>
+        <item assembly="DevComponents.DotNetBar" class="DevComponents.DotNetBar.ButtonItem" name="buttonMoveLeft" text="Move Left" iscontainer="false" visible="true" itemdata="" enabled="false" begingroup="false" style="2" desc="" tooltip="Move selected item one position left" category="" cancustomize="true" showsubitems="true" itemalignment="0" stretch="false" global="true" themes="false" PopupType="0" PopupWidth="200" PersonalizedMenus="0" panim="1" ImagePosition="0" ButtonStyle="0" Checked="false" VerticalPadding="0" HorizontalPadding="0" MenuVisibility="0" RecentlyUsed="false">
+          <images>
+            <image type="default">iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAARtJREFUOE/NUj1rg0AYtoMgZHDOJnFxyQ8QgsYhGXQQEXVR8QcKQhAHJ/cgQjeXomtxanEoHZ6eZ5WG2kFc+sLDHdzzce/d+wSA2VSDwRZsEtPbr0knrRL6442H9odHWMRP8sRZNIjjGEmSIE1T5HmOoiio4UQexbe/ghhkWUZFZVmirms0TTMbjOL7N57J+kLwStBPhgyqqkLbtuj7fkilxfM8WJYlpA+CN4J3gk/sdsB+DwgCIIoinQF0XTcLp42qqrQFSZIo+XAAjkfgdAIuF+B6BTRNGw2WyvO8+Q0URcH5DOi6Dtd1EQQBfN+H4zhgOI4jCQJkWYZpmvQgiiKEYfjwZYZhwLbt39+4Zg4sy9pmsBS2ahL/p8EX3Tp/1XYhADwAAAAASUVORK5C</image>
+          </images>
+        </item>
+        <item assembly="DevComponents.DotNetBar" class="DevComponents.DotNetBar.ButtonItem" name="buttonMoveRight" text="Move Right" iscontainer="false" visible="true" itemdata="" enabled="false" begingroup="false" style="2" desc="" tooltip="Move selected item one position right" category="" cancustomize="true" showsubitems="true" itemalignment="0" stretch="false" global="true" themes="false" PopupType="0" PopupWidth="200" PersonalizedMenus="0" panim="1" ImagePosition="0" ButtonStyle="0" Checked="false" VerticalPadding="0" HorizontalPadding="0" MenuVisibility="0" RecentlyUsed="false">
+          <images>
+            <image type="default">iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAQtJREFUOE/VkrGKg0AQhi9WCT6ApBX7gGBhOi1tBCOI2IhPKNgEi3RCxObgGpG7XhDSCHbhz4y5DSSRcIdVFr7F3WU+Z3dmAeBj1mDBHGYFj9k//p2uQ1t/z2pS8Cjh9QumDvMxQGTC32maIssy5HmOsizRNI2QsmBPHIgj8UXw4fdNwoKiKFBVFeq6Rtu2GIYBkiSNJaTpk/ghTsQZyyWwWl1fSKTedR36vuesbkPTNCHgQGC9BjYbwDSB7RbQdX28hqIod4FiYVnWVSDLMlRVpUATjuNgtwNB0281DMOYFPi+/1wuz/MQhuFdKW3bBsPyIAgQxzGSJEEURc8C13Xn9cF/mmiyE99PcAHKkH8yACO2fgAAAABJRU5ErkJg</image>
+          </images>
+        </item>
+        <item assembly="DevComponents.DotNetBar" class="DevComponents.DotNetBar.ButtonItem" name="buttonMoveUp" text="Move Up" iscontainer="false" visible="true" itemdata="" enabled="false" begingroup="false" style="2" desc="" tooltip="Move selected item one position up" category="" cancustomize="true" showsubitems="true" itemalignment="0" stretch="false" global="true" themes="false" PopupType="0" PopupWidth="200" PersonalizedMenus="0" panim="1" ImagePosition="0" ButtonStyle="0" Checked="false" VerticalPadding="0" HorizontalPadding="0" MenuVisibility="0" RecentlyUsed="false">
+          <images>
+            <image type="default">iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAS1JREFUOE+VkqGrg1AYxRWMIi4MXDEYNA8UQcS2sKB1oOBfuLBgMQkLYhVe0PjQ9nhgkBXDefdO99DNMb3w4UXP+d1zPz8WAPO8WJZ9fTmIiJ6d6CnguYgA5/MZl8sFcRwjyzKUZUmhRDrVv5iHRIiiCEmSIM9z1HWNtm3XAdI0RVEUaJqGnnpfsiwvT0Ajj83Uqev6ckBVVei67v90unEcZzmANowWjW2a5t1s2/YywLjTPM+/mMbfZ//CQ9CnuEEQhLeQt4De/EXqhxQgiuIs5O0cMMx1APyCDCY2G0CSpM89eDSvf36T6rDdAoqiQFVVaJo2gXy4wg27HbDfA5ZlLb/CY5zptensHI+A53nrABzHkcjA4QCcToDv++sAtGGGYcB1XQRBgDAMZwF/moCNUTtYcNoAAAAASUVORK5C</image>
+          </images>
+        </item>
+        <item assembly="DevComponents.DotNetBar" class="DevComponents.DotNetBar.ButtonItem" name="buttonMoveDown" text="Move Down" iscontainer="false" visible="true" itemdata="" enabled="false" begingroup="false" style="2" desc="" tooltip="Move selected item one position down" category="" cancustomize="true" showsubitems="true" itemalignment="0" stretch="false" global="true" themes="false" PopupType="0" PopupWidth="200" PersonalizedMenus="0" panim="1" ImagePosition="0" ButtonStyle="0" Checked="false" VerticalPadding="0" HorizontalPadding="0" MenuVisibility="0" RecentlyUsed="false">
+          <images>
+            <image type="default">iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAARxJREFUOE+dUrFqhEAQdfFAEZvjQK4SQazOyrOz9AsEOwvxC9Oa0k4SUlqkipCUKiRYpAkvO4Y7LrfrsdzCY3eHeW9n3iwDoF0vxpgQ5HlMSKQACVyDwpr2wPHI8URiPEXMWx5fFyDyM8fbvQIvnPjB8Q3DMNQq+Cv9hHd+/sF+D/i+jyAIll1oV97/Kyd/YrsFDgfgeASiKJJWccODL+x2QBgCcRyrtXBZDbWy2QCu666SV6dwEro1vnOO3INLMzXoug7bttU8oFfrukbbtuj7HvM8ExGWZakLNE2DruswjuNCpuU4jroAkYdhOJPpENI4ZN9e5sE0Tf/IdEnTVF1AYPNAnudqAqZpwvM8JEmCLMtQliWqqkJRFFKBX79biPBZEIGgAAAAAElFTkSuQmCC</image>
+          </images>
+        </item>
+        <item assembly="DevComponents.DotNetBar" class="DevComponents.DotNetBar.ButtonItem" name="buttonSyncCategories" text="Sync Categories" iscontainer="false" visible="true" itemdata="" enabled="true" begingroup="true" style="2" desc="" tooltip="Recreates Categories based on the current definition" category="" cancustomize="true" showsubitems="true" itemalignment="0" stretch="false" global="true" themes="false" PopupType="0" PopupWidth="200" PersonalizedMenus="0" panim="1" ImagePosition="0" ButtonStyle="0" Checked="false" VerticalPadding="0" HorizontalPadding="0" MenuVisibility="0" RecentlyUsed="false">
+          <images>
+            <image type="default">iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAApVJREFUOE9tk19Ik1EYxo8MBUEEQy/Ui0iEXeWFEjgYCMquBt4uBUEvtJtClG4aNmeOLCMZajGtiBQ1CyTxX4qO/IPsG6KtodO5XUzTi5ySbYkbbk/nPe77mNWBh4+957y/8z7veZcCgP29UtpSNDxWyXUtsXfKv1NoxeI/hwkgi5lZPtcMFzIeZ6DsbRl0gzrkdOaAYlxfuG5cyUlKruSbP9U9aiwHlnn4chX3FcN54MR2cFsA+ZkQV7WSJyyYWQnXWe2nWoSjv0Xi3elGTHmnkN2ZjQJrASKRCOLxOCxLFoJEuMpEbgIgaV5rcBG/wKR3F+oeI7KeZCGzI1MuHW2zbQJCq2GigeKbXCq6XUv+5LINHydh+HAfY1/HYFu0CYD2pRb1I/U4OTlBLBbD8dkx0i3ptKcngCX/eb7iOa3dgoXNb/B4PCjpLYFpzIThmWGsrq5ib29PqUI/pCeAlQDvy9+VK4DAjyNse70C4PP54Ha7IUkSXC4XDg8PcX5+Ls42zzYTYJwAQ7oBnQIIhUIIBALY8G9gdH0URb1F4mbfgR/B01/CQhJgkgAdyRai0SiMc0beB4Pw37XUhXnPPBrG23Grf0i8BK2EhR4C6Oig9F1Squhf61e6T83Ke5aH61338Mq5hnA4jGA4eKWJKpqwZBv0XIXWQqQ+SoXtsw2Ggdvw+/3w7u5if38fTRNNdMEaV5o8B4U0YY0zjaIKAqxsriD3aS7sdrvSRGps90I3WIsYpJvKICWGqZqmkbztHO2IN3esO+BwOLC1tQXXjgt1I3WXySZ258ooKz/MTM0hEvWktK8UNYM1qHpThQpbBVQmFXiiW775v4BEJdQTPWvlQ9LCptkDNsceshc8Rn+2NDlR/v4BTD9qflAqrjcAAAAASUVORK5C</image>
+          </images>
+        </item>
+      </items>
+    </bar>
+  </bars>
+  <popups>
+    <item assembly="DevComponents.DotNetBar" class="DevComponents.DotNetBar.ButtonItem" name="popup" text="Context Menu" iscontainer="false" visible="false" itemdata="" enabled="true" begingroup="false" style="0" desc="" tooltip="" category="" cancustomize="true" showsubitems="true" itemalignment="0" stretch="false" global="true" themes="false" PopupType="0" PopupWidth="200" PersonalizedMenus="0" panim="1" ImagePosition="0" ButtonStyle="0" Checked="false" VerticalPadding="0" HorizontalPadding="0" MenuVisibility="0" RecentlyUsed="false">
+      <subitems>
+        <item assembly="DevComponents.DotNetBar" class="DevComponents.DotNetBar.ButtonItem" name="buttonCreateBar" text="&amp;Create Bar" iscontainer="false" visible="true" itemdata="" enabled="true" begingroup="false" style="0" desc="" tooltip="Create New Bar" category="" cancustomize="true" showsubitems="true" itemalignment="0" stretch="false" global="true" themes="false" PopupType="0" PopupWidth="200" PersonalizedMenus="0" panim="1" ImagePosition="0" ButtonStyle="0" Checked="false" VerticalPadding="0" HorizontalPadding="0" MenuVisibility="0" RecentlyUsed="false">
+          <subitems>
+            <item assembly="DevComponents.DotNetBar" class="DevComponents.DotNetBar.ButtonItem" name="buttonNewToolbar" text="&amp;Toolbar" iscontainer="false" visible="true" itemdata="" enabled="true" begingroup="false" style="0" desc="" tooltip="" category="" cancustomize="true" showsubitems="true" itemalignment="0" stretch="false" global="true" themes="false" PopupType="0" PopupWidth="200" PersonalizedMenus="0" panim="1" ImagePosition="0" ButtonStyle="0" Checked="false" VerticalPadding="0" HorizontalPadding="0" MenuVisibility="0" RecentlyUsed="false" />
+            <item assembly="DevComponents.DotNetBar" class="DevComponents.DotNetBar.ButtonItem" name="buttonNewMenubar" text="&amp;Menu bar" iscontainer="false" visible="true" itemdata="" enabled="true" begingroup="false" style="0" desc="" tooltip="" category="" cancustomize="true" showsubitems="true" itemalignment="0" stretch="false" global="true" themes="false" PopupType="0" PopupWidth="200" PersonalizedMenus="0" panim="1" ImagePosition="0" ButtonStyle="0" Checked="false" VerticalPadding="0" HorizontalPadding="0" MenuVisibility="0" RecentlyUsed="false" />
+            <item assembly="DevComponents.DotNetBar" class="DevComponents.DotNetBar.ButtonItem" name="buttonNewStatusbar" text="&amp;Status bar" iscontainer="false" visible="true" itemdata="" enabled="true" begingroup="false" style="0" desc="" tooltip="" category="" cancustomize="true" showsubitems="true" itemalignment="0" stretch="false" global="true" themes="false" PopupType="0" PopupWidth="200" PersonalizedMenus="0" panim="1" ImagePosition="0" ButtonStyle="0" Checked="false" VerticalPadding="0" HorizontalPadding="0" MenuVisibility="0" RecentlyUsed="false" />
+            <item assembly="DevComponents.DotNetBar" class="DevComponents.DotNetBar.ButtonItem" name="buttonNewDockWindow" text="&amp;Dockable window" iscontainer="false" visible="true" itemdata="" enabled="true" begingroup="false" style="0" desc="" tooltip="" category="" cancustomize="true" showsubitems="true" itemalignment="0" stretch="false" global="true" themes="false" PopupType="0" PopupWidth="200" PersonalizedMenus="0" panim="1" ImagePosition="0" ButtonStyle="0" Checked="false" VerticalPadding="0" HorizontalPadding="0" MenuVisibility="0" RecentlyUsed="false" />
+            <item assembly="DevComponents.DotNetBar" class="DevComponents.DotNetBar.ButtonItem" name="buttonNewTaskPane" text="&amp;Task pane" iscontainer="false" visible="true" itemdata="" enabled="true" begingroup="false" style="0" desc="" tooltip="" category="" cancustomize="true" showsubitems="true" itemalignment="0" stretch="false" global="true" themes="false" PopupType="0" PopupWidth="200" PersonalizedMenus="0" panim="1" ImagePosition="0" ButtonStyle="0" Checked="false" VerticalPadding="0" HorizontalPadding="0" MenuVisibility="0" RecentlyUsed="false" />
+          </subitems>
+          <images>
+            <image type="default">iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAArpJREFUOE+FkllIlFEUx0czWtxmdGaccdRZHZfRSc19d8YMl6BR3HLNJcfBlFFbJCKkBMkMCqGHgjBSywofghalxcJKCNRcR7PH6aUeguhJ+nfuxxiOUX3w437f/c753XPPvTwAvH89Rztsg+UtqxsHSl/1UByfcHOK/6+g3TZTallFZtGLWUqMI7z+KqhrX5CaT9u6GzpnmsqbnqZVtbxJqmz9MG5qXIE+/fpzSsz3Dz0brY6/I6F3V8KFt7WCqpa3QsuZT2CYu9ZR3/kRbHVj2SL0OXMITZ+EJnEMQfor/ZQsInY6CZj12Kl1NJxcR411DcVmGwyUHG54D3X8XcijryEw8hLEKssjx3Y8OYGpcel2SfOKvcwyP1nVtoaK1jWwsrNKF6EzzkAZOwiZ7gKkIV2QaE/AN6himgQ5hA8nMJYtfM+pWEJu9TLya4maZWSVLCLq4ByCkx/Sqn0/PXyT71FCh0BmeuItyR+md8Nvgd74rEeXMTahSx16l3R4HoyY3DmEZU5R6SNs5c8U3EZkE1FEAhFGeGz2gJ1vjJfYUB2ZPYsIIjxrGiGpE1DFDUEWfv4L/a8mVMQuLpHHcyd2bArY5fAU+BdqQjNeU7dfQps6zpXPBPKoAQgVdSMiRf0R+b6r04ERvecc98HN6RRUccMCbcpj7qjUCaNc+YqYG9SDfgREXGS9oLEXYvXxWyTQb90Cd7lIINQkPoBy/01u1UD9ZSq/G5Lgdvhp2uAXbKXRCr6kYJTCMwm+cwWxg0qWHKDr+eanbrWLVM1fhfJa8P1NP7wleXYGX1pg3+MdOUDJKWzbf1wkmgwiDrGmuQvi+3xkxfAQpk3Rt9XRyFIa8wgtsXu7wIUm9xJSJhIpzTafgBIIZEUb9F3p2LeMRrHjFFy3C7hebD5CRX0zCVaokvs0V+gQO8X8AjEoMAmZ0PRFAAAAAElFTkSuQmCC</image>
+          </images>
+        </item>
+        <item assembly="DevComponents.DotNetBar" class="DevComponents.DotNetBar.ButtonItem" name="buttonNewButton" text="Add &amp;Button (ButtonItem)" iscontainer="false" visible="true" itemdata="" enabled="false" begingroup="true" style="0" desc="" tooltip="" category="" cancustomize="true" showsubitems="true" itemalignment="0" stretch="false" global="true" themes="false" PopupType="0" PopupWidth="200" PersonalizedMenus="0" panim="1" ImagePosition="0" ButtonStyle="0" Checked="false" VerticalPadding="0" HorizontalPadding="0" MenuVisibility="0" RecentlyUsed="false" />
+        <item assembly="DevComponents.DotNetBar" class="DevComponents.DotNetBar.ButtonItem" name="buttonNewLabel" text="Add &amp;Label (LabelItem)" iscontainer="false" visible="true" itemdata="" enabled="false" begingroup="false" style="0" desc="" tooltip="" category="" cancustomize="true" showsubitems="true" itemalignment="0" stretch="false" global="true" themes="false" PopupType="0" PopupWidth="200" PersonalizedMenus="0" panim="1" ImagePosition="0" ButtonStyle="0" Checked="false" VerticalPadding="0" HorizontalPadding="0" MenuVisibility="0" RecentlyUsed="false" />
+        <item assembly="DevComponents.DotNetBar" class="DevComponents.DotNetBar.ButtonItem" name="buttonNewCombo" text="Add &amp;Combo-box (ComboBoxItem)" iscontainer="false" visible="true" itemdata="" enabled="false" begingroup="false" style="0" desc="" tooltip="" category="" cancustomize="true" showsubitems="true" itemalignment="0" stretch="false" global="true" themes="false" PopupType="0" PopupWidth="200" PersonalizedMenus="0" panim="1" ImagePosition="0" ButtonStyle="0" Checked="false" VerticalPadding="0" HorizontalPadding="0" MenuVisibility="0" RecentlyUsed="false" />
+        <item assembly="DevComponents.DotNetBar" class="DevComponents.DotNetBar.ButtonItem" name="buttonNewProgress" text="Add Progress-bar (ProgressBarItem)" iscontainer="false" visible="true" itemdata="" enabled="false" begingroup="false" style="0" desc="" tooltip="" category="" cancustomize="true" showsubitems="true" itemalignment="0" stretch="false" global="true" themes="false" PopupType="0" PopupWidth="200" PersonalizedMenus="0" panim="1" ImagePosition="0" ButtonStyle="0" Checked="false" VerticalPadding="0" HorizontalPadding="0" MenuVisibility="0" RecentlyUsed="false" />
+        <item assembly="DevComponents.DotNetBar" class="DevComponents.DotNetBar.ButtonItem" name="buttonNewTextBox" text="Add Text Box (TextBoxItem)" iscontainer="false" visible="true" itemdata="" enabled="false" begingroup="false" style="0" desc="" tooltip="" category="" cancustomize="true" showsubitems="true" itemalignment="0" stretch="false" global="true" themes="false" PopupType="0" PopupWidth="200" PersonalizedMenus="0" panim="1" ImagePosition="0" ButtonStyle="0" Checked="false" VerticalPadding="0" HorizontalPadding="0" MenuVisibility="0" RecentlyUsed="false" />
+        <item assembly="DevComponents.DotNetBar" class="DevComponents.DotNetBar.ButtonItem" name="buttonNewDock" text="Add Dock Container (DockContainerItem)" iscontainer="false" visible="true" itemdata="" enabled="false" begingroup="true" style="0" desc="" tooltip="" category="" cancustomize="true" showsubitems="true" itemalignment="0" stretch="false" global="true" themes="false" PopupType="0" PopupWidth="200" PersonalizedMenus="0" panim="1" ImagePosition="0" ButtonStyle="0" Checked="false" VerticalPadding="0" HorizontalPadding="0" MenuVisibility="0" RecentlyUsed="false" />
+        <item assembly="DevComponents.DotNetBar" class="DevComponents.DotNetBar.ButtonItem" name="buttonNewCustomize" text="Add Customization (CustomizeItem)" iscontainer="false" visible="true" itemdata="" enabled="false" begingroup="false" style="0" desc="" tooltip="" category="" cancustomize="true" showsubitems="true" itemalignment="0" stretch="false" global="true" themes="false" PopupType="0" PopupWidth="200" PersonalizedMenus="0" panim="1" ImagePosition="0" ButtonStyle="0" Checked="false" VerticalPadding="0" HorizontalPadding="0" MenuVisibility="0" RecentlyUsed="false" />
+        <item assembly="DevComponents.DotNetBar" class="DevComponents.DotNetBar.ButtonItem" name="buttonNewMdiList" text="Add MDI Window List (MdiWindowListItem)" iscontainer="false" visible="true" itemdata="" enabled="false" begingroup="false" style="0" desc="" tooltip="" category="" cancustomize="true" showsubitems="true" itemalignment="0" stretch="false" global="true" themes="false" PopupType="0" PopupWidth="200" PersonalizedMenus="0" panim="1" ImagePosition="0" ButtonStyle="0" Checked="false" VerticalPadding="0" HorizontalPadding="0" MenuVisibility="0" RecentlyUsed="false" />
+        <item assembly="DevComponents.DotNetBar" class="DevComponents.DotNetBar.ButtonItem" name="buttonNewControlCont" text="Add Control Container (ControlContainerItem)" iscontainer="false" visible="true" itemdata="" enabled="false" begingroup="false" style="0" desc="" tooltip="" category="" cancustomize="true" showsubitems="true" itemalignment="0" stretch="false" global="true" themes="false" PopupType="0" PopupWidth="200" PersonalizedMenus="0" panim="1" ImagePosition="0" ButtonStyle="0" Checked="false" VerticalPadding="0" HorizontalPadding="0" MenuVisibility="0" RecentlyUsed="false" />
+        <item assembly="DevComponents.DotNetBar" class="DevComponents.DotNetBar.ButtonItem" name="buttonNewColorPicker" text="Add Color Picker" iscontainer="false" visible="true" itemdata="" enabled="true" begingroup="false" style="0" desc="" tooltip="" category="" cancustomize="true" showsubitems="true" itemalignment="0" stretch="false" global="true" themes="false" PopupType="0" PopupWidth="200" PersonalizedMenus="0" panim="1" ImagePosition="0" ButtonStyle="0" Checked="false" VerticalPadding="0" HorizontalPadding="0" MenuVisibility="0" RecentlyUsed="false" />
+        <item assembly="DevComponents.DotNetBar" class="DevComponents.DotNetBar.ButtonItem" name="buttonCopyTo" text="Copy To" iscontainer="false" visible="false" itemdata="" enabled="true" begingroup="true" style="0" desc="" tooltip="" category="" cancustomize="true" showsubitems="true" itemalignment="0" stretch="false" global="true" themes="false" PopupType="0" PopupWidth="200" PersonalizedMenus="0" panim="1" ImagePosition="0" ButtonStyle="0" Checked="false" VerticalPadding="0" HorizontalPadding="0" MenuVisibility="0" RecentlyUsed="false" />
+        <item assembly="DevComponents.DotNetBar" class="DevComponents.DotNetBar.ButtonItem" name="buttonMoveTo" text="Move To" iscontainer="false" visible="false" itemdata="" enabled="true" begingroup="false" style="0" desc="" tooltip="" category="" cancustomize="true" showsubitems="true" itemalignment="0" stretch="false" global="true" themes="false" PopupType="0" PopupWidth="200" PersonalizedMenus="0" panim="1" ImagePosition="0" ButtonStyle="0" Checked="false" VerticalPadding="0" HorizontalPadding="0" MenuVisibility="0" RecentlyUsed="false" />
+        <item assembly="DevComponents.DotNetBar" class="DevComponents.DotNetBar.ButtonItem" name="buttonDelete" text="Delete" iscontainer="false" visible="true" itemdata="" enabled="false" begingroup="false" style="0" desc="" tooltip="Delete Selected Item" category="" cancustomize="true" showsubitems="true" itemalignment="0" stretch="false" global="true" themes="false" PopupType="0" PopupWidth="200" PersonalizedMenus="0" panim="1" ImagePosition="0" ButtonStyle="0" Checked="false" VerticalPadding="0" HorizontalPadding="0" MenuVisibility="0" RecentlyUsed="false">
+          <images>
+            <image type="default">iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAeZJREFUOE+lU1FIk1EYPcMRv2IDwTEZuCGTyZxMN83twRr10kuYjwrKYBqJYGRMRTSLepFYEQYRlD1YD1L5UE7mNueU6sEn38R3HyKmL4kRQXydTf7xu/2p0A+Hy7333POd/3z3GkQE//XlBNbb2pTPHR3ZL8HgV47R3NpZkSemXS5XxueTDb9fNgIBoeCtTEuLV09kranJkLDZfDGT6XzevUpK1ddH0m63ZLxeWW9tFQp+J0xaEe6bE7W1kVhlpXzIH9UIrFitSsrhuELSpkZkvlDA4bgcN5tTH41GeQPsPwfmjgmoxHRjozfT3Hyw5vEIf02SdXWX4hZL+JOibC8Amy+A2CMgpPJ1w6JID938itfUyFJFxc/3wN4rWn4MXCzORVcgabdfZUjfFnlojnhCPACuTQCWUwVoeYZVZf6o4p9pjqPEbeCeXlcKDpi4h7YTS+Xl8pIH7gOHw0ByAHD3c36T4LxL18Gq0znELuzmEmZIQqs7YWBGJfcCT29wfQT4wb0GrUjeAfv6+h0Js8QY0QcMakmcVw0BWxHu3QWelQiwrwqDyuYOh4C314H2YqusfmEcOJgCogy0rKSNVG4YBHq7gXP/ege0f2eSRRhs54n34KSHRAfLLPb7IVCtexPP+gpV3l8w4xzrIycGdAAAAABJRU5ErkJg</image>
+          </images>
+        </item>
+      </subitems>
+    </item>
+    <item assembly="DevComponents.DotNetBar" class="DevComponents.DotNetBar.ButtonItem" name="resetimagepopup" text="Reset Image Popup" iscontainer="false" visible="false" itemdata="" enabled="true" begingroup="false" style="0" desc="" tooltip="" category="" cancustomize="true" showsubitems="true" itemalignment="0" stretch="false" global="true" themes="false" PopupType="0" PopupWidth="200" PersonalizedMenus="0" panim="1" ImagePosition="0" ButtonStyle="0" Checked="false" VerticalPadding="0" HorizontalPadding="0" MenuVisibility="0" RecentlyUsed="false">
+      <subitems>
+        <item assembly="DevComponents.DotNetBar" class="DevComponents.DotNetBar.ButtonItem" name="buttonResetImage" text="Reset" iscontainer="false" visible="true" itemdata="" enabled="true" begingroup="false" style="0" desc="" tooltip="" category="" cancustomize="true" showsubitems="true" itemalignment="0" stretch="false" global="true" themes="false" PopupType="0" PopupWidth="200" PersonalizedMenus="0" panim="1" ImagePosition="0" ButtonStyle="0" Checked="false" VerticalPadding="0" HorizontalPadding="0" MenuVisibility="0" RecentlyUsed="false" />
+      </subitems>
+    </item>
+  </popups>
+</dotnetbar>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DotNetBarDesigner.resx b/PROMS/DotNetBar Source Code/DotNetBarDesigner.resx
new file mode 100644
index 00000000..aea3bebf
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarDesigner.resx	
@@ -0,0 +1,276 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+            Microsoft ResX Schema 
+        
+            Version 1.3
+                
+            The primary goals of this format is to allow a simple XML format 
+            that is mostly human readable. The generation and parsing of the 
+            various data types are done through the TypeConverter classes 
+            associated with the data types.
+        
+            Example:
+        
+                ... ado.net/XML headers & schema ...
+                <resheader name="resmimetype">text/microsoft-resx</resheader>
+                <resheader name="version">1.3</resheader>
+                <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+                <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+                <data name="Name1">this is my long string</data>
+                <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+                <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+                    [base64 mime encoded serialized .NET Framework object]
+                </data>
+                <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+                    [base64 mime encoded string representing a byte array form of the .NET Framework object]
+                </data>
+        
+            There are any number of "resheader" rows that contain simple 
+            name/value pairs.
+            
+            Each data row contains a name, and value. The row also contains a 
+            type or mimetype. Type corresponds to a .NET class that support 
+            text/value conversion through the TypeConverter architecture. 
+            Classes that don't support this are serialized and stored with the 
+            mimetype set.
+                     
+            The mimetype is used for serialized objects, and tells the 
+            ResXResourceReader how to depersist the object. This is currently not 
+            extensible. For a given mimetype the value must be set accordingly:
+        
+            Note - application/x-microsoft.net.object.binary.base64 is the format 
+                   that the ResXResourceWriter will generate, however the reader can 
+                   read any of the formats listed below.
+        
+            mimetype: application/x-microsoft.net.object.binary.base64
+            value   : The object must be serialized with 
+                    : System.Serialization.Formatters.Binary.BinaryFormatter
+                    : and then encoded with base64 encoding.
+        
+            mimetype: application/x-microsoft.net.object.soap.base64
+            value   : The object must be serialized with 
+                    : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+                    : and then encoded with base64 encoding.
+            mimetype: application/x-microsoft.net.object.bytearray.base64
+            value   : The object must be serialized into a byte array 
+                    : using a System.ComponentModel.TypeConverter
+                    : and then encoded with base64 encoding.
+        -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>1.3</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="navigationPane1.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Assembly</value>
+  </data>
+  <data name="navigationPanePanel1.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Assembly</value>
+  </data>
+  <data name="imageList.Location" type="System.Drawing.Point, System.Drawing, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>310, 17</value>
+  </data>
+  <data name="imageList.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFpTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0xLjAuMzMw
+        MC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZT
+        eXN0ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMA
+        AAAkEQAAAk1TRnQBSQFMAgEBDQEAAQ4BAAEEAQABEAEAARABAAT/AQkBEAj/AUIBTQE2AQQGAAE2AQQC
+        AAEoAwABQAMAAUADAAEBAQABCAYAARAYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB
+        3AHAAQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IB
+        AAM5AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8B
+        MwMAAWYDAAGZAwABzAIAATMDAAIzAgABMwFmAgABMwGZAgABMwHMAgABMwH/AgABZgMAAWYBMwIAAmYC
+        AAFmAZkCAAFmAcwCAAFmAf8CAAGZAwABmQEzAgABmQFmAgACmQIAAZkBzAIAAZkB/wIAAcwDAAHMATMC
+        AAHMAWYCAAHMAZkCAALMAgABzAH/AgAB/wFmAgAB/wGZAgAB/wHMAQABMwH/AgAB/wEAATMBAAEzAQAB
+        ZgEAATMBAAGZAQABMwEAAcwBAAEzAQAB/wEAAf8BMwIAAzMBAAIzAWYBAAIzAZkBAAIzAcwBAAIzAf8B
+        AAEzAWYCAAEzAWYBMwEAATMCZgEAATMBZgGZAQABMwFmAcwBAAEzAWYB/wEAATMBmQIAATMBmQEzAQAB
+        MwGZAWYBAAEzApkBAAEzAZkBzAEAATMBmQH/AQABMwHMAgABMwHMATMBAAEzAcwBZgEAATMBzAGZAQAB
+        MwLMAQABMwHMAf8BAAEzAf8BMwEAATMB/wFmAQABMwH/AZkBAAEzAf8BzAEAATMC/wEAAWYDAAFmAQAB
+        MwEAAWYBAAFmAQABZgEAAZkBAAFmAQABzAEAAWYBAAH/AQABZgEzAgABZgIzAQABZgEzAWYBAAFmATMB
+        mQEAAWYBMwHMAQABZgEzAf8BAAJmAgACZgEzAQADZgEAAmYBmQEAAmYBzAEAAWYBmQIAAWYBmQEzAQAB
+        ZgGZAWYBAAFmApkBAAFmAZkBzAEAAWYBmQH/AQABZgHMAgABZgHMATMBAAFmAcwBmQEAAWYCzAEAAWYB
+        zAH/AQABZgH/AgABZgH/ATMBAAFmAf8BmQEAAWYB/wHMAQABzAEAAf8BAAH/AQABzAEAApkCAAGZATMB
+        mQEAAZkBAAGZAQABmQEAAcwBAAGZAwABmQIzAQABmQEAAWYBAAGZATMBzAEAAZkBAAH/AQABmQFmAgAB
+        mQFmATMBAAGZATMBZgEAAZkBZgGZAQABmQFmAcwBAAGZATMB/wEAApkBMwEAApkBZgEAA5kBAAKZAcwB
+        AAKZAf8BAAGZAcwCAAGZAcwBMwEAAWYBzAFmAQABmQHMAZkBAAGZAswBAAGZAcwB/wEAAZkB/wIAAZkB
+        /wEzAQABmQHMAWYBAAGZAf8BmQEAAZkB/wHMAQABmQL/AQABzAMAAZkBAAEzAQABzAEAAWYBAAHMAQAB
+        mQEAAcwBAAHMAQABmQEzAgABzAIzAQABzAEzAWYBAAHMATMBmQEAAcwBMwHMAQABzAEzAf8BAAHMAWYC
+        AAHMAWYBMwEAAZkCZgEAAcwBZgGZAQABzAFmAcwBAAGZAWYB/wEAAcwBmQIAAcwBmQEzAQABzAGZAWYB
+        AAHMApkBAAHMAZkBzAEAAcwBmQH/AQACzAIAAswBMwEAAswBZgEAAswBmQEAA8wBAALMAf8BAAHMAf8C
+        AAHMAf8BMwEAAZkB/wFmAQABzAH/AZkBAAHMAf8BzAEAAcwC/wEAAcwBAAEzAQAB/wEAAWYBAAH/AQAB
+        mQEAAcwBMwIAAf8CMwEAAf8BMwFmAQAB/wEzAZkBAAH/ATMBzAEAAf8BMwH/AQAB/wFmAgAB/wFmATMB
+        AAHMAmYBAAH/AWYBmQEAAf8BZgHMAQABzAFmAf8BAAH/AZkCAAH/AZkBMwEAAf8BmQFmAQAB/wKZAQAB
+        /wGZAcwBAAH/AZkB/wEAAf8BzAIAAf8BzAEzAQAB/wHMAWYBAAH/AcwBmQEAAf8CzAEAAf8BzAH/AQAC
+        /wEzAQABzAH/AWYBAAL/AZkBAAL/AcwBAAJmAf8BAAFmAf8BZgEAAWYC/wEAAf8CZgEAAf8BZgH/AQAC
+        /wFmAQABIQEAAaUBAANfAQADdwEAA4YBAAOWAQADywEAA7IBAAPXAQAD3QEAA+MBAAPqAQAD8QEAA/gB
+        AAHwAfsB/wEAAaQCoAEAA4ADAAH/AgAB/wMAAv8BAAH/AwAB/wEAAf8BAAL/AgAD/4MAAewKBzUAAewC
+        BwcAAQc1AAHsCgc1AAHsCgQ1AAHsAgQD/wUENQAB7AoENQAB7AoHNQAB7AIHBQADBzUAAewKBzUAAewC
+        BwQABAc1AAHsCgc1AAvs3AADBzkAAQEBJQIkAQACBzkAAQEBegEmASQBAAIHOQABAQF6ASYBJAEAAgcU
+        AAEDCDEBAAExATgBMQFzATECAA4EBgABAQF6ASYBJAEAAgcUAAEDAaAB/wGgAf8BoAH/AaABMQEAAzgB
+        MQFzAgABBAz/AQQGAAEBAXoBJgEkAQABBxUAAQMCoAH/AaAB/wGgAf8BMQEAAjgBAAE4ATECAAEEAf8B
+        AAL/AQAB/wMAAf8BAAH/AQQGAAEBAaABJgEkAQABBxUAAQMBoAH/AaAB/wGgAf8BoAExAQABOAMAATEC
+        AAEEAf8EAAH/AQAB/wEAA/8BBAYAAQEBoAEmASQBAAEHFQABAwKgAf8BoAH/AaAB/wExAQAB/wQ4AgAB
+        BAH/AQAC/wEAAf8DAAP/AQQGAAElAcMBegElFwABAwGgAf8BoAH/AaAB/wGgATEBAAE4Af8COAExAgAB
+        BAL/AgAC/wEABf8BBAcAAW8CARcAAQMHoAExAQAFoAIAAQQM/wEECAABrhgADwMCAA4EAwAB7QEAARQB
+        7QGGAbQDAAESNgABZgHiAgAB7AG7AewBAAHsAWY2AAFmAeIBZgG0ARkBuwHsAe8B4gFmNgABrgH/Aa4B
+        ZgL/AeIBGQFmOAABrgFmAf8BZgOuHgADBzsAAbIBpgEAAwc4AAOyAqYBAAMHAwABMA15BAAMMBQABbID
+        pgEAAwcCAAEwAcMBmgGgAZoBoAGaAaABmgGgA5oBeQQAATAB/wGaAaABmgGgBJoBeQEwAgABpgHcBNMB
+        PQHTAT0B0wI9AQQBPQMABrIEpgEAAwcBAAEwAcMDoAGaAaABmgGgAZoBoAKaAXkDAAEwAf8CoAGaAaAB
+        mgGgA5oBeQEAATABAAGmAdwB0wQAAdMEAAE9AQQDAAayBaYBAAEHAgABMAHDBqABmgGgAZoBoAGaAXkD
+        AAEwAf8FoAGaAaACmgEwAQABMAEAAaYB3AIAAdMCAAHTAgABPQIAAT0DAAayBaYEAAEwAcMFoAGaAaAB
+        mgGgAZoBoAF5AgABMAH/BKABmgKgAZoBoAF5AQACeQEAAaYB3AHTBAAB0wIAAdMCAAE9AwAEsgL/BaYE
+        AAEwAcMIoAGaAaABmgF5AgABMAH/BqABmgGgAZoBeQEAAnkBAAGmAtwC0wIAAdMCAAHTAgABPQMAArIC
+        /wMJBKYEAAEwAcMHoAGaAaABmgGgAXkCAAwwAXkBoAF5AQABpgHcAdMDAALTBAAB0wE9AwAC/wYJA6YE
+        AAEwAcMKoAGaAXkDAAEwAf8LoAF5AQABpgLcAdMB3APTAgAC0wI9BAAICQKmBAABMAvDAaABeQMAATAB
+        /wegBP8BeQEAAaYB3AHTAdwB0wHcAtMCAAPTAT0FAAcJBgABMAd5BjADAAEwAf8FoAH/BjABAAGmDdwG
+        AAQJCQABMAH0AsMCoAEwCgABMAX/ATAHAA6mBwABCQwABTAMAAUwoAADBzsAAbIBpgEAAwcLAAEBASUC
+        JBwAAQEBJQIkCQADsgKmAQADBwoAAQEBegEmASQcAAEBAXoBJgEkBwAFsgOmAQADBwIAB+wBAQF6ASYB
+        JAEAA+wBAAEDDZkCAAfsAQEBegEmASQBAAPsAgAGsgSmAQADBwEAAewB8AHsAf8BBwFDAf8BAQF6ASYB
+        JAEAAf8BQwHsAQABAwH2AZkB/wwAAewB8AHsAf8BBwFDAf8BAQF6ASYBJAEAAf8BQwHsAgAGsgWmAQAB
+        BwIAAewB8QHsAf8BBwFDAf8BAQF6ASYBJAEAAf8BQwHsAQABAwH2AZkM7AEAAewB8QHsAf8BBwFDAf8B
+        AQF6ASYBJAEAAf8BQwHsAgAGsgWmBAAB7AHwBewBAQGgASYBJAEAA+wBAAEDAfYBmQHsAQgB7AH/AQcB
+        FAH/AQcBFAH/ARQB7AEAAewB8AXsAQEBoAEmASQBAAPsAgAEsgL/BaYEAAHsAfIB8QHyA/EBAQGgASYB
+        JAEAA/EBAAEDAfYBmQHsAQgB7AH/AQcBFAH/AQcBFAH/ARQB7AEAAewB8gHxAfID8QEBAaABJgEkAQAD
+        8QIAArIC/wMJBKYFAAbsASUBwwF6ASUBAAPsAQABAwH2AZkB7AEICuwCAAbsASUBwwF6ASUBAAPsAgAC
+        /wYJA6YMAAFvAgEFAAEDAfYBmQHsAfYBCAH2CAgJAAFvAgEHAAgJAqYNAAGuBgABAwH2AZkB/wvsCgAB
+        rgkABwkKAAHtAQABFAHtAYYBtAMAARICAAEDC/YCmQYAAe0BAAEUAe0BhgG0AwABEgYABAkMAAFmAeIC
+        AAHsAbsB7AEAAewBZgIAAQMHmQYDBgABZgHiAgAB7AG7AewBAAHsAWYHAAEJDgABZgHiAWYBtAEZAbsB
+        7AHvAeIBZgMAAQMD9gKZAQMMAAFmAeIBZgG0ARkBuwHsAe8B4gFmFgABrgH/Aa4BZgL/AeIBGQFmBQAF
+        Aw0AAa4B/wGuAWYC/wHiARkBZhgAAa4BZgH/AWYDrhkAAa4BZgH/AWYDrgQAAUIBTQE+BwABPgMAASgD
+        AAFAAwABQAMAAQEBAAEBBgABAhYAA/8BAAL/BgABwAEDBgABwAEDBgABwAEDBgABwAEDBgABwAEDBgAB
+        wAEDBgABwAEDBgABwAEDBgABwAEDBgABwAEDBgABwAEDBgABwAEDBgABwAEDBgAC/wYAAv8GAAT/AfwB
+        Dwb/AfgBDwb/AfgBDwGHAYECAAL/AfgBDwHPAcMCAAGAAQEB+AEPAe8BxwIAAYABAQH4AR8B5wGHAgAB
+        gAEBAfgBHwHwAQ8CAAGAAQEB+AEfAfcBjwIAAYABAQH4AT8B8wEfAgABgAEBAfwBfwH7AR8CAAGAAQEB
+        /AF/AfgBHwIAAYABAQHAAU8B/AE/BP8BwAEPAfwBPwT/AcABDwH+AX8E/wHAAR8G/wHgAT8C/wH8AR8G
+        /wHwAQ8BgAEBAeABAAL/AcABBwEAAQEBwAIAAQEBAAEDAQABAQHAAgABAQEAAQEBAAEBAYACAAEBAQAB
+        AwEAAQEBgAIAAQEBAAEHAQABAQMAAQEBAAEHAQABAQMAAQEBAAEHAQABAQMAAQEBAAEHAQABAQGAAgAB
+        AQGAAQcBAAEBAYACAAEBAcABDwEAAQMBgAEBAQABAQHgAT8BgAF/AcABfwEAAQEB8AH/AcAB/wHgA/8B
+        +w//AfwBHwH/AR8D/wEfAfABDwH+AQ8C/wH+AQ8BwAEHAYABAQGAAQEBgAEBAQABAwMAAQEDAAEBAwAB
+        AQMAAQMHAAEHBwABBwcAAQcBgAEBAgABgAEBAQABBwH/AR8CAAH/AR8BgAEHAf8BHwEAAQEB/wEfAcAB
+        DwHwARMBAAEBAfABEwHgAT8B8AEDAQABAwHwAQMB8AH/AfABAwGAAf8B8AEDAfsB/wHwAQcBwQH/AfAB
+        BwL/AfgBDwL/AfgBDxYACw==
+</value>
+  </data>
+  <data name="buttonBars.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Assembly</value>
+  </data>
+  <data name="buttonBars.Image" type="System.Drawing.Bitmap, System.Drawing, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAArpJREFUOE+FkllI
+        lFEUx0czWtxmdGaccdRZHZfRSc19d8YMl6BR3HLNJcfBlFFbJCKkBMkMCqGHgjBSywofghalxcJKCNRc
+        R7PH6aUeguhJ+nfuxxiOUX3w437f/c753XPPvTwAvH89Rztsg+UtqxsHSl/1UByfcHOK/6+g3TZTallF
+        ZtGLWUqMI7z+KqhrX5CaT9u6GzpnmsqbnqZVtbxJqmz9MG5qXIE+/fpzSsz3Dz0brY6/I6F3V8KFt7WC
+        qpa3QsuZT2CYu9ZR3/kRbHVj2SL0OXMITZ+EJnEMQfor/ZQsInY6CZj12Kl1NJxcR411DcVmGwyUHG54
+        D3X8XcijryEw8hLEKssjx3Y8OYGpcel2SfOKvcwyP1nVtoaK1jWwsrNKF6EzzkAZOwiZ7gKkIV2QaE/A
+        N6himgQ5hA8nMJYtfM+pWEJu9TLya4maZWSVLCLq4ByCkx/Sqn0/PXyT71FCh0BmeuItyR+md8Nvgd74
+        rEeXMTahSx16l3R4HoyY3DmEZU5R6SNs5c8U3EZkE1FEAhFGeGz2gJ1vjJfYUB2ZPYsIIjxrGiGpE1DF
+        DUEWfv4L/a8mVMQuLpHHcyd2bArY5fAU+BdqQjNeU7dfQps6zpXPBPKoAQgVdSMiRf0R+b6r04ERvecc
+        98HN6RRUccMCbcpj7qjUCaNc+YqYG9SDfgREXGS9oLEXYvXxWyTQb90Cd7lIINQkPoBy/01u1UD9ZSq/
+        G5Lgdvhp2uAXbKXRCr6kYJTCMwm+cwWxg0qWHKDr+eanbrWLVM1fhfJa8P1NP7wleXYGX1pg3+MdOUDJ
+        KWzbf1wkmgwiDrGmuQvi+3xkxfAQpk3Rt9XRyFIa8wgtsXu7wIUm9xJSJhIpzTafgBIIZEUb9F3p2LeM
+        RrHjFFy3C7hebD5CRX0zCVaokvs0V+gQO8X8AjEoMAmZ0PRFAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="buttonCategories.Image" type="System.Drawing.Bitmap, System.Drawing, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAYlJREFUOE9j/P//
+        PwNFAGQAJRin5t61L+Smbn71f9a21/+nAenWFc//Z015+N+3/vZ/s9yLQDshFjMs2zmTZ8Wu2ZzorgBq
+        kGsDagLhhiVP/2cDNXvX3v5vmnnqv27UOoQBII0bDiw5vGrPPB5kQ8rmPJYrmvn4f860R/8T++7/96y5
+        9d8k/dh/7fDl/9W8J2AY8H/pzpln5m2eIERqeID9sXj7tP/T1rT/71lSc6ljYbkEKYaADeheUvW/clra
+        /4LuuP/5XbG74AZs1Pj/H4TXyv7/t5Dh/5V2hv8bCxj+z04CaYMGIoiR1xn7P7rI939olvu9qHxvObgB
+        65T+/9+gDjQAKLQIjwERuV7/3SKsr7qGWUmjOB9kANgF8vgN8E1wPO8QYCZKit/hXogt8ePxT3LiJ0cz
+        OCHh0/hKXvn/S0m5/y/Yef5fYGD9v4qB5f8EBub/jUCMEoi4DHnOxP7/OlDjPqDG+VCN+QxM/7OBmCgD
+        TgA1gmztAWoGaYwC4mAgjiTWAGLCBQBOY4ovCXS30gAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="navigationPanePanel2.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Assembly</value>
+  </data>
+  <data name="buttonContext.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Assembly</value>
+  </data>
+  <data name="buttonContext.Image" type="System.Drawing.Bitmap, System.Drawing, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAQVJREFUOE+lkzsO
+        gkAQhiEaidhb2dh7Als7b0GLjZ1W3sHEzgvYW+kBaGgwIZQ2mNBgDBXlOD/ZNbtmeUQ3+TLZ1zcLO2sT
+        kfVXgwD4K5+6wgmRdcg41WZuNjZnL6LrraQgCBoRggnHsRT0VYFYAHNFGIYaYnzOcSYFjiqIoojiOKYk
+        SYwIgcdxKQXDphNgQ5ZlH4Rgx9GTAlcVpGlKeZ5TURRGhGDPcS0FIwjuW6sTQnDkuNEEj0OPgNrkmBpr
+        Bc/LgLpQK5B1gB+G7y/L0kir4LsO1D6krYKfTtCUtWZOuwWXF02ZRXW3loU7PjHnGjCn1QFeFh4H6hsl
+        iirDAmQxgbmqEt/w6d73h6aEVQAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="dotNetBarManager1.Location" type="System.Drawing.Point, System.Drawing, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </data>
+  <data name="m_OpenFileDialog.Location" type="System.Drawing.Point, System.Drawing, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>168, 17</value>
+  </data>
+  <data name="m_SaveFileDialog.Location" type="System.Drawing.Point, System.Drawing, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>410, 18</value>
+  </data>
+  <data name="$this.Name">
+    <value>DotNetBarDesigner</value>
+  </data>
+  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAABELAAARCwAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAABAAAADwwFCE82HhzvIBAS0QUBBKgAAAB9AAAAVwAAADQAAAAaAAAACAAA
+        AAEAAAAAAAAAAAAAAAAAAAABAAAADw4FCVY3GhnqiHM8/5OcTv9aSC/+EgYMzggDBaIAAAB7AAAAWwAA
+        ADQAAAAVAAAABQAAAAAAAAABAAAADw4EBVI6HhvucUss/4ZwOv+532X/uNtk/21iOf8kDxf0IxIV3gIB
+        AZ4AAAB7AAAASQAAABQAAAAAAAAADBAFBlIXFTvsSSoi/3pVL/9mQhz/oK1N/8Lsa/97dz7/kItk/8vk
+        k/9dRDv8HxETzgAAAHMAAAAkAAAAABcIB0AZIF3oAELj/0spHP9bNyP/EC+V/0dNY/95ajD/d242/5WT
+        aP/p/67/6v+u/19KPP8AAAB9AAAAKQAAAAAeG0jkAlP6/wJK8v8tExX/DzOl/xBo//88iPP/M2S//y0e
+        K/99eFj/xNqX/+7/sP9dSTv7AAAAfAAAACgAAAAAHSFd/ABb//8MMIr/FyVu/wBR//8QVf//Q5T//0Kf
+        //8rW7D/YR4J/4xKKv+NhWv/QCwr+wAAAHwAAAAoAAAAABcjYvcNOar/cAMe/xkicv8AVP//MLr//0Gz
+        //9Dmv//HVez/7tVFP//mi//sVYc/04fF/sAAAB9AAAAKQAAAAAnESD3hAVH/6UAQP8IM3T/M9j//0X+
+        //9B7v//POj//ytNjv/EZB3//5Yr//+kMf9qLhz7AAAAcQAAACMAAAAAVAor97gAYf+uAVf/bz1p/x2B
+        f/887f7/Qf///zOBl//Afjz//8NT//+jPv//nC//bS8d/gAAAEkAAAATAAAAAE4JKve0AGH/7heQ//gc
+        k//OEG3/VzNV/xYoMf+uazH//+Rk///QYv//2mT/rGk2/hkJDpEAAAAaAAAABAAAAABcDTL/+xeb//8m
+        pP//I6D//yGo/6QUWv8dLFP/SUFg/7RxM//vt1L/t39F/w0HDo8AAAAaAAAAAwAAAAAAAAAARhMnkIEX
+        Tf/uIJH//yOm/6sbZP8pYar/QqH//z6T//8dU6X/Yk9b/x4LCpMAAAAbAAAABAAAAAAAAAAAAAAAAAAA
+        AAANDg0iPhEjuUUNIPAxSob/P6b//0GX//9CnP//OWWx/hEJEpQAAAAaAAAABAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAcDhE1IhAWkjNGgf89fNf/N12q/xgHB4cAAAAbAAAAAwAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAiBgJAKBoxqCMRG3sAAAAQAAAABAAAAAAAAAAAAAAAAAAA
+        AAAAAAAA/H////gf///wB///4AP//8AD//+AA///gAP//4AD//+AA///gAP//4AD//+AB///gA///+Af
+        ///4P////v///w==
+</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DotNetBarManager.bmp b/PROMS/DotNetBar Source Code/DotNetBarManager.bmp
new file mode 100644
index 00000000..f2b985fd
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DotNetBarManager.bmp differ
diff --git a/PROMS/DotNetBar Source Code/DotNetBarManager.cs b/PROMS/DotNetBar Source Code/DotNetBarManager.cs
new file mode 100644
index 00000000..3d8667c8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarManager.cs	
@@ -0,0 +1,6747 @@
+/****************************************************************************************************************************
+* (C) COPYRIGHT 2006-2014 DevComponents LLC
+* The product in this package (libraries and source code) is
+* proprietary to DevComponents LLC and is protected by
+* Federal Copyright Law.DevComponents LLC retains the title to and ownership of the Product. 
+* YOU MAY NOT distribute or sell the source code, repacked, recompiled, renamed or compiled 
+* except as expressly permitted by DotNetBar License, see Restrictions.
+* You also agree that you will not compete against DevComponents LLC by repackaging, recompiling,
+* compiling or renaming the product you purchased source code for. You may not use the source code
+* or reverse engineered code to develop products that are competing with DevComponents LLC products.
+* If you purchased the source code and you make your own builds you must change the assembly file name.
+* All other restrictions still apply. See DotNetBar license included with the product.
+* YOU MAY NOT: Distribute, rent, sub-license or otherwise make available to others the software
+* or documentation or copies thereof, except as expressly permitted in this License without prior written consent
+* from DevComponents LLC.  In the case of an authorized transfer, the transferee must agree to be
+* bound by the terms and conditions of this License Agreement.
+* RESTRICTIONS: - You may use this Product in your business application for sale or distribution as long as: 
+* The product that you produce and/or distribute is NOT a product that is similar or only extends DotNetBar Components
+* functionality in any way. Please contact DevComponents LLC for special commercial licensing provisions in these circumstances.
+* The software serial number and user must be registered with DevComponents LLC in order to receive support or distribution rights.
+* You may not remove any proprietary notices, labels, and trademarks on the software or documentation.
+* DotNetBar may not be distributed for any other purpose than to accompany software that you have developed using DotNetBar.
+* FILES THAT MAY BE DISTRIBUTED WITH YOUR APPLICATION:
+* DEVCOMPONENTS.DOTNETBAR2.DLL, DevComponents.DotNetBar.Keyboard.dll, DevComponents.DotNetBar.SuperGrid.dll
+* DevComponents.DotNetBar.Layout.dll, DevComponents.DotNetBar.Schedule.dll, DevComponents.Instrumentation.dll
+* LIMITED WARRANTY - THIS SOFTWARE AND DOCUMENTATION ARE SOLD "AS IS" WITHOUT ANY WARRANTY AS TO THEIR PERFORMANCE,
+* MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE.  THE LICENSEE ASSUMES THE ENTIRE RISK AS TO THE QUALITY AND
+* PERFORMANCE OF THE SOFTWARE. YOU USE "DOTNETBAR" AT YOUR OWN RISK. THE AUTHOR WILL NOT BE LIABLE FOR DATA LOSS, DAMAGES,
+* LOSS OF PROFITS OR ANY OTHER KIND OF LOSS WHILE USING OR MISUSING THIS SOFTWARE. 
+****************************************************************************************************************************/
+[assembly:System.CLSCompliant(true)]
+namespace DevComponents.DotNetBar
+{
+    using System;
+    using System.Collections;
+    using System.ComponentModel;
+    using System.Drawing;
+    using System.Data;
+    using System.Windows.Forms;
+    using System.Xml;
+
+    /// <summary>
+    /// Represent the menu, toolbar and popup menu structure for the form.
+    /// </summary>
+    [ToolboxBitmap(typeof(DotNetBarManager), "DotNetBarManager.ico"), Designer("DevComponents.DotNetBar.Design.DotNetBarManagerDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf"), ToolboxItem(true), System.Runtime.InteropServices.ComVisible(false), DefaultEvent("ItemClick")]
+	public class DotNetBarManager : Component,
+		System.ComponentModel.IExtenderProvider,
+		IOwnerItemEvents,
+		IOwnerMenuSupport,
+		IOwner,
+		IOwnerBarSupport,
+		IOwnerAutoHideSupport,
+		IMessageHandlerClient,
+		IOwnerLocalize,
+        ICustomSerialization
+	{
+		// Events
+		#region Event Definition
+        /// <summary>
+        /// Occurs after bar registered with DotNetBarManager state has changed, like selected dock tab has changed, bar has closed, bar has been docked or undocked etc.
+        /// </summary>
+        [Description("Occurs after bar registered with DotNetBarManager state has changed, like selected dock tab has changed, bar has closed, bar has been docked or undocked etc.")]
+        public event BarStateChangedEventHandler BarStateChanged;
+        /// <summary>
+        /// Raises BarStateChanged event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnBarStateChanged(BarStateChangedEventArgs e)
+        {
+            BarStateChangedEventHandler handler = BarStateChanged;
+            if (handler != null)
+                handler(this, e);
+        }
+        internal void InvokeOnBarStateChanged(BarStateChangedEventArgs e)
+        {
+            OnBarStateChanged(e);
+        }
+
+        /// <summary>
+        /// Occurs when focused (active) DockContainerItem has changed. You can use ActiveDockContainerItem property to get reference to currently focused DockContainerItem.
+        /// </summary>
+        [Description("Occurs when focused (active) DockContainerItem has changed. You can use ActiveDockContainerItem property to get reference to currently focused DockContainerItem.")]
+        public event ActiveDockContainerChangedEventHandler ActiveDockContainerChanged;
+		/// <summary>
+		/// Represents delegate for ContextMenu events.
+		/// </summary>
+		public delegate void CustomizeContextMenuEventHandler(object sender, CustomizeContextMenuEventArgs e);
+
+		/// <summary>
+		/// Represents the method that will handle the ItemRemoved event.
+		/// </summary>
+		public delegate void ItemRemovedEventHandler(object sender, ItemRemovedEventArgs e);
+
+		/// <summary>
+		/// Occurs just before customize popup menu is shown.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs just before customize popup menu is shown."),Category("Item")]
+		public event CustomizeContextMenuEventHandler CustomizeContextMenu;
+
+		/// <summary>
+		/// Occurs when Item is clicked.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when Item is clicked."),Category("Item")]
+		public event EventHandler ItemClick;
+
+        /// <summary>
+        /// Occurs when Item is clicked.
+        /// </summary>
+        [Description("Occurs when Item is double-clicked.")]
+        public event MouseEventHandler ItemDoubleClick;
+
+		/// <summary>
+		/// Occurs when popup of type container is loading.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when popup of type container is loading."),Category("Item")]
+		public event EventHandler PopupContainerLoad;
+
+		/// <summary>
+		/// Occurs when popup of type container is unloading.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when popup of type container is unloading."),Category("Item")]
+		public event EventHandler PopupContainerUnload;
+
+		public delegate void PopupOpenEventHandler(object sender, PopupOpenEventArgs e);
+		/// <summary>
+		/// Occurs when popup item is about to open.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when popup item is about to open."),Category("Item")]
+		public event PopupOpenEventHandler PopupOpen;
+
+		/// <summary>
+		/// Occurs when popup item is closing.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when popup item is closing."),Category("Item")]
+		public event EventHandler PopupClose;
+
+		/// <summary>
+		/// Occurs just before popup window is shown.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs just before popup window is shown."),Category("Item")]
+		public event EventHandler PopupShowing;
+
+		/// <summary>
+		/// Occurs when Item Expanded property has changed.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when Item Expanded property has changed."),Category("Item")]
+		public event EventHandler ExpandedChange;
+
+		/// <summary>
+		/// Occurs when Bar is docked.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when Bar is docked."),Category("Bar")]
+		public event EventHandler BarDock;
+
+		/// <summary>
+		/// Occurs when Bar is Undocked.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when Bar is Undocked."),Category("Bar")]
+		public event EventHandler BarUndock;
+
+		/// <summary>
+		/// Occurs before dock tab is displayed.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs before dock tab is displayed."),Category("Bar")]
+		public event EventHandler BeforeDockTabDisplay;
+
+		/// <summary>
+		/// Occurs when Bar auto-hide state has changed.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when Bar auto-hide state has changed."),Category("Bar")]
+		public event EventHandler AutoHideChanged;
+
+		/// <summary>
+		/// Occurs when mouse button is pressed.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when mouse button is pressed."),Category("Item")]
+		public event MouseEventHandler MouseDown;
+
+		/// <summary>
+		/// Occurs when mouse button is released.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when mouse button is released."),Category("Item")]
+		public event MouseEventHandler MouseUp;
+
+		/// <summary>
+		/// Occurs when mouse enters the item.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when mouse enters the item."),Category("Item")]
+		public event EventHandler MouseEnter;
+
+		/// <summary>
+		/// Occurs when mouse leaves the item.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when mouse leaves the item."),Category("Item")]
+		public event EventHandler MouseLeave;
+
+		/// <summary>
+		/// Occurs when mouse moves over the item.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when mouse moves over the item."),Category("Item")]
+		public event MouseEventHandler MouseMove;
+
+		/// <summary>
+		/// Occurs when mouse remains still inside an item for an amount of time.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when mouse remains still inside an item for an amount of time."),Category("Item")]
+		public event EventHandler MouseHover;
+
+		/// <summary>
+		/// Occurs when item loses input focus.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when item loses input focus."),Category("Item")]
+		public event EventHandler LostFocus;
+
+		/// <summary>
+		/// Occurs when item receives input focus.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when item receives input focus."),Category("Item")]
+		public event EventHandler GotFocus;
+
+		/// <summary>
+		/// Occurs when user changes the item position, removes the item, adds new item or creates new bar.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when user changes the item position, removes the item, adds new item or creates new bar."),Category("Item")]
+		public event EventHandler UserCustomize;
+
+		/// <summary>
+		/// Occurs after DotNetBar definition is loaded.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs after DotNetBar definition is loaded."),Category("General")]
+		public event EventHandler DefinitionLoaded;
+
+		/// <summary>
+		/// Occurs when users wants to reset the DotNetBar to default state.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when users wants to reset the DotNetBar to default state."),Category("General")]
+		public event EventHandler ResetDefinition;
+
+		/// <summary>
+		/// Occurs after an Item is removed from SubItemsCollection.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs after an Item is removed from SubItemsCollection."),Category("Item")]
+		public event ItemRemovedEventHandler ItemRemoved;
+
+		/// <summary>
+		/// Occurs after an Item has been added to the SubItemsCollection.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs after an Item has been added to the SubItemsCollection."),Category("Item")]
+		public event EventHandler ItemAdded;
+
+		/// <summary>
+		/// Occurs when ControlContainerControl is created and contained control is needed.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when ControlContainerControl is created and contained control is needed."),Category("Item")]
+		public event EventHandler ContainerLoadControl;
+
+		/// <summary>
+		/// Occurs when Text property of an Item has changed.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when Text property of an Item has changed."),Category("Item")]
+		public event EventHandler ItemTextChanged;
+
+		/// <summary>
+		/// Occurs when Customize Dialog is about to be shown.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when Customize Dialog is about to be shown."),Category("General")]
+		public event EventHandler EnterCustomize;
+
+		/// <summary>
+		/// Occurs when Customize Dialog is closed.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when Customize Dialog is closed."),Category("General")]
+		public event EventHandler ExitCustomize;
+
+		/// <summary>
+		/// Use this event if you want to serialize the hosted control state directly into the DotNetBar definition file.
+		/// </summary>
+		public event ControlContainerItem.ControlContainerSerializationEventHandler ContainerControlSerialize;
+		/// <summary>
+		/// Use this event if you want to deserialize the hosted control state directly from the DotNetBar definition file.
+		/// </summary>
+		public event ControlContainerItem.ControlContainerSerializationEventHandler ContainerControlDeserialize;
+
+		/// <summary>
+		/// Defines the delegate for DockTabChange event
+		/// </summary>
+		public delegate void DockTabChangeEventHandler(object sender, DockTabChangeEventArgs e);
+		/// <summary>
+		/// Occurs when current Dock tab has changed.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when current Dock tab has changed."),Category("Bar")]
+		public event DockTabChangeEventHandler DockTabChange;
+
+		/// <summary>
+		/// Defines the delegate for BarClosing event
+		/// </summary>
+		public delegate void BarClosingEventHandler(object sender, BarClosingEventArgs e);
+		/// <summary>
+		/// Occurs when Bar is about to be closed as a result of user clicking the Close button on the bar.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when Bar is about to be closed as a result of user clicking the Close button on the bar."),Category("Bar")]
+		public event BarClosingEventHandler BarClosing;
+
+		/// <summary>
+		/// Defines the delegate for BarAutoHideDisplay event
+		/// </summary>
+		public delegate void AutoHideDisplayEventHandler(object sender, AutoHideDisplayEventArgs e);
+		/// <summary>
+		/// Occurs when Bar in auto-hide state is about to be displayed.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when Bar in auto-hide state is about to be displayed."),Category("Bar")]
+		public event AutoHideDisplayEventHandler AutoHideDisplay;
+
+		/// <summary>
+		/// Occurs when user starts to drag the item when customize dialog is open.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when user start to drag item when customize dialog is open.")]
+		public event EventHandler CustomizeStartItemDrag;
+
+		/// <summary>
+		/// Occurs when users Tears-off the Tab from the Bar and new Bar is created as result of that action.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when users Tears-off the Tab from the Bar and new Bar is created as result of that action.")]
+		public event EventHandler BarTearOff;
+
+		/// <summary>
+		/// Represents the method that will handle the LocalizeString event.
+		/// </summary>
+		public delegate void LocalizeStringEventHandler(object sender, LocalizeEventArgs e);
+
+		/// <summary>
+		/// Occurs when DotNetBar is looking for translated text for one of the internal text that are
+		/// displayed on menus, toolbars and customize forms. You need to set Handled=true if you want
+		/// your custom text to be used instead of the built-in system value.
+		/// </summary>
+		public event LocalizeStringEventHandler LocalizeString;
+
+		/// <summary>
+		/// Occurs before an item in option group is checked and provides opportunity to cancel the change.
+		/// </summary>
+		public event OptionGroupChangingEventHandler OptionGroupChanging;
+
+		/// <summary>
+		/// Occurs before tooltip for an item is shown. Sender could be the BaseItem or derived class for which tooltip is being displayed or it could be a ToolTip object itself it tooltip is not displayed for any item in particular.
+		/// </summary>
+		public event EventHandler ToolTipShowing;
+
+		public event EndUserCustomizeEventHandler EndUserCustomize;
+
+		/// <summary>
+		/// Occurs on dockable bars when end-user attempts to close the individual DockContainerItem objects using system buttons on dock tab.
+		/// Event can be canceled by setting the Cancel property of event arguments to true. This even will occur only after user presses the
+		/// X button on tab that is displaying the dockable windows/documents.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs on dockable bars when end-user attempts to close the individual DockContainerItem objects using system buttons on dock tab.")]
+		public event DockTabClosingEventHandler DockTabClosing;
+
+        /// <summary>
+        /// Occurs on dockable bars after DockContainerItem is closed. This action cannot be cancelled.
+        /// </summary>
+        [System.ComponentModel.Description("Occurs on dockable bars after DockContainerItem is closed. This event cannot be cancelled.")]
+        public event DockTabClosingEventHandler DockTabClosed;
+
+        /// <summary>
+        /// Occurs after an item has been serialized to XmlElement and provides you with opportunity to add any custom data
+        /// to serialized XML. This allows you to serialize any data with the item and load it back up in DeserializeItem event.
+        /// </summary>
+        /// <remarks>
+        /// 	<para>To serialize custom data to XML definition control creates handle this event and use CustomXmlElement
+        /// property on SerializeItemEventArgs to add new nodes or set attributes with custom data you want saved.</para>
+        /// </remarks>
+        public event SerializeItemEventHandler SerializeItem;
+
+        /// <summary>
+        /// Occurs after an item has been de-serialized (load) from XmlElement and provides you with opportunity to load any custom data
+        /// you have serialized during SerializeItem event.
+        /// </summary>
+        /// <remarks>
+        /// 	<para>To de-serialize custom data from XML definition handle this event and use CustomXmlElement
+        /// property on SerializeItemEventArgs to retrive any data you saved in SerializeItem event.</para>
+        /// </remarks>
+        public event SerializeItemEventHandler DeserializeItem;
+
+        /// <summary>
+        /// Occurs when TextBoxItem input text has changed.
+        /// </summary>
+        public event EventHandler TextBoxItemTextChanged;
+
+        /// <summary>
+        /// Occurs when color on ColorPickerDropDown is choosen from drop-down color picker or from Custom Colors dialog box. Selected color can be accessed through SelectedColor property.
+        /// </summary>
+        [Description("Occurs when color is choosen from drop-down color picker or from Custom Colors dialog box.")]
+        public event EventHandler ColorPickerSelectedColorChanged;
+
+        /// <summary>
+        /// Occurs when Checked property of an button has changed.
+        /// </summary>
+        public event EventHandler ButtonCheckedChanged;
+		#endregion
+
+		#region Private Variables
+		private static Hashtable m_MdiChildParentHandlers=new Hashtable(10);
+		private License m_License = null;
+
+		private DockSite m_TopDockSite;
+		private DockSite m_BottomDockSite;
+		private DockSite m_LeftDockSite;
+		private DockSite m_RightDockSite;
+		private DockSite m_FillDockSite;
+
+        private DockSite m_ToolbarTopDockSite;
+        private DockSite m_ToolbarBottomDockSite;
+        private DockSite m_ToolbarLeftDockSite;
+        private DockSite m_ToolbarRightDockSite;
+
+		private Bars m_Bars;
+		private ArrayList m_WereVisible;
+		//private ParentMsgHandler m_MsgHandler;
+		private Items m_Items;
+		private Hashtable m_ShortcutTable;
+		private bool m_FilterInstalled;
+		private frmCustomize m_frmCustomize;
+		private ArrayList m_DisabledControls;
+		private BaseItem m_FocusItem;
+		private BaseItem m_ExpandedItem;
+
+		private ArrayList m_RegisteredPopups;
+		private MDIClientMsgHandler m_MdiHandler;
+
+		private System.Windows.Forms.Form m_ActiveMdiChild;
+		private bool m_MdiChildMaximized;
+
+		private bool m_IgnoreSysKeyUp=false, m_EatSysKeyUp=false;
+
+		private System.Windows.Forms.ImageList m_ImageList;
+		private System.Windows.Forms.ImageList m_ImageListMedium=null;
+		private System.Windows.Forms.ImageList m_ImageListLarge=null;
+
+		private DotNetBarStreamer m_BarStreamer=null;
+		private Form m_ParentForm;
+		private bool m_Disposed=false;
+		private bool m_ParentActivated=false;
+
+		private bool m_PersonalizedAllVisible=false;
+
+		private System.Windows.Forms.Timer m_ClickTimer=null;
+		private BaseItem m_ClickRepeatItem=null;
+
+		private bool m_ShowCustomizeContextMenu=true;
+		private PopupItem m_ContextMenu=null;
+
+		private ContextMenusCollection m_ContextMenus=null;
+		private eMenuDropShadow m_MenuDropShadow=eMenuDropShadow.SystemDefault;
+		private bool m_AlphaBlendShadow=true;
+		private bool m_UseHook=false;
+		private Hook m_Hook=null;
+		private bool m_ShowResetButton=false;
+
+		private bool m_AlwaysShowFullMenus=false;
+		private bool m_ShowFullMenusOnHover=true;
+		private bool m_ShowToolTips=true;
+		private bool m_ShowShortcutKeysInToolTips=false;
+		private ePopupAnimation m_PopupAnimation=ePopupAnimation.SystemDefault;
+
+		// Used to provide Context-Menu extender property...
+		private Hashtable m_ContextExMenus=new Hashtable();
+		private Hashtable m_ContextExHandlers=new Hashtable();
+
+		private bool m_AllowUserBarCustomize=true;
+		private bool m_EventControlAdded=false;
+		private bool m_MdiChildActivateHandled=false;
+		private bool m_MdiClientHandleCreatedHandled=false;
+		private bool m_UseCustomCustomizeDialog=false;
+		private bool m_MdiSystemItemVisible=true;
+		private bool m_DispatchShortcuts=false;
+		private ShortcutsCollection m_AutoDispatchShortcuts;
+
+		// Auto-hide panels
+		private AutoHidePanel m_LeftAutoHidePanel=null;
+		private AutoHidePanel m_RightAutoHidePanel=null;
+		private AutoHidePanel m_TopAutoHidePanel=null;
+		private AutoHidePanel m_BottomAutoHidePanel=null;
+
+		private bool m_SuspendLayout=false;
+		private string m_DefinitionName="";
+		private bool m_DefinitionLoaded=false;
+		private bool m_IgnoreF10Key=false;
+		//private bool m_ContextMenuSubclass=true;
+		private bool m_ThemeAware=false;
+		private eDotNetBarStyle m_Style=eDotNetBarStyle.Office2003;
+
+		private bool m_DefinitionCodeSerialize=false;
+
+		private Bar m_FocusedBar=null;
+		
+		private Control m_ParentUserControl=null;
+		private bool m_DockingHints=true;
+
+		internal bool IgnoreLoadedControlDispose=false;
+
+		private bool m_AlwaysDisplayKeyAccelerators=false;
+		private bool m_EnableFullSizeDock=true;
+		private bool m_LoadingDefinition=false;
+        private bool m_LoadingLayout = false;
+		private ColorScheme m_ColorScheme=null;
+		private bool m_UseGlobalColorScheme=false;
+		private bool m_ApplyDocumentBarStyle=true;
+		private bool m_HideMdiSystemMenu=false;
+		private bool m_IncludeDockDocumentsInDefinition=false;
+		//TODO: Menu Merging Implementation MDI Item Merging support
+		//private Hashtable m_MdiChildManagers=null;
+        //private ArrayList m_CommandLinks = new ArrayList();
+        private Size m_MinimumClientSize = new Size(48, 48);
+        private ContextMenuBar m_GlobalContextMenuBar = null;
+		#endregion
+
+		#if TRIAL
+		private int iCount=0,iMaxCount=96;
+		#endif
+
+		/// <summary>
+		/// Creates new instance of DotNetBarManager.
+		/// </summary>
+		public DotNetBarManager():this(null) {}
+		/// <summary>
+		/// Creates new instance of DotNetBarManager.
+		/// </summary>
+		/// <param name="cont">Container.</param>
+		public DotNetBarManager(IContainer cont)
+		{
+			#if TRIAL
+				RemindForm frm=new RemindForm();
+				frm.ShowDialog();
+				frm.Dispose();
+			#endif
+            //#if !DEBUG
+            //    m_License = LicenseManager.Validate(typeof(DotNetBarManager), this);
+            //#endif
+			//#endif
+
+			InitializeComponent(cont);
+		}
+
+		private void InitializeComponent(IContainer cont)
+		{
+			m_TopDockSite=null;
+			m_BottomDockSite=null;
+			m_LeftDockSite=null;
+			m_RightDockSite=null;
+			//m_MsgHandler=null;
+			m_Bars=new Bars(this);
+			m_WereVisible=new ArrayList();
+			m_Items=new Items(this);
+			m_ShortcutTable=new Hashtable();
+			m_FilterInstalled=false;
+			m_frmCustomize=null;
+			m_DisabledControls=null;
+			m_FocusItem=null;
+			m_ExpandedItem=null;
+			m_RegisteredPopups=new ArrayList();
+			m_MdiHandler=null;
+			m_ActiveMdiChild=null;
+			m_IgnoreSysKeyUp=false;
+			m_ImageList=null;
+			m_ParentForm=null;
+			m_ContextMenus=new ContextMenusCollection(this);
+
+			if(cont!=null)
+				cont.Add(this);
+
+			if(!ColorFunctions.ColorsLoaded)
+			{
+				NativeFunctions.RefreshSettings();
+				NativeFunctions.OnDisplayChange();
+				ColorFunctions.LoadColors();
+			}
+
+			m_AutoDispatchShortcuts=new ShortcutsCollection(null);
+			m_ColorScheme=new ColorScheme(m_Style);
+		}
+
+	#if !TRIAL
+		internal DotNetBarManager(IContainer cont,bool dnbe)
+		{
+            InitializeComponent(cont);
+		}
+	#endif
+
+        #region Licensing
+#if !TRIAL
+        private string m_LicenseKey = "";
+        [Browsable(false), DefaultValue("")]
+        public string LicenseKey
+        {
+            get { return m_LicenseKey; }
+            set
+            {
+                if (NativeFunctions.ValidateLicenseKey(value))
+                    return;
+                m_LicenseKey = (!NativeFunctions.CheckLicenseKey(value) ? "9dsjkhds7" : value);
+            }
+        }
+#endif
+        #endregion
+
+        #region Docking Shortcut methods
+
+        private int _DockSplitterSize = 3;
+
+        /// <summary>
+        /// Gets or sets docking splitter size.
+        /// </summary>
+        [DefaultValue(3), Category("Appearance"), Description("Indicates docking splitter size")]
+        public int DockSplitterSize
+        {
+            get { return _DockSplitterSize; }
+            set
+            {
+                _DockSplitterSize = value; 
+            }
+        }
+
+        /// <summary>
+        /// Dock bar to the specified side of the form.
+        /// </summary>
+        /// <param name="barToDock">Bar to dock.</param>
+        /// <param name="side">Side to dock bar to.</param>
+        public void Dock(Bar barToDock, eDockSide side)
+        {
+            if (side == eDockSide.None)
+            {
+                Float(barToDock);
+                return;
+            }
+
+            if (barToDock.LayoutType != eLayoutType.DockContainer)
+            {
+                barToDock.DockSide = side;
+                return;
+            }
+
+            DocumentDockUIManager dockManager = GetDocumentUIManager(side);
+            if (!this.Bars.Contains(barToDock))
+                this.Bars.Add(barToDock);
+            dockManager.Dock(barToDock);
+        }
+        /// <summary>
+        /// Docks the bar to the specified side of the reference bar.
+        /// </summary>
+        /// <param name="barToDock">Bar to dock.</param>
+        /// <param name="referenceBar">Reference bar.</param>
+        /// <param name="dockToReferenceBarSide">Side of the reference bar to dock the bar to.</param>
+        public void Dock(Bar barToDock, Bar referenceBar, eDockSide dockToReferenceBarSide)
+        {
+            if (dockToReferenceBarSide == eDockSide.None)
+                throw new ArgumentException("eDockSide.None is not supported value for dockToReferenceBarSide parameter. Use Float method to make floating bar.");
+            if (referenceBar.DockSide == eDockSide.None)
+                throw new ArgumentException("referenceBar must be docked to be used as reference for docking.");
+
+            if (barToDock.LayoutType != eLayoutType.DockContainer)
+            {
+                barToDock.DockSide = dockToReferenceBarSide;
+                return;
+            }
+
+            if (dockToReferenceBarSide == eDockSide.Document)
+            {
+                System.Collections.ArrayList list = new System.Collections.ArrayList(barToDock.Items.Count);
+                barToDock.Items.CopyTo(list);
+                DockContainerItem firstItem = null;
+                foreach (BaseItem item in list)
+                {
+                    DockContainerItem dockitem = item as DockContainerItem;
+                    if (dockitem != null)
+                    {
+                        if (firstItem == null) firstItem = dockitem;
+                        dockitem.Displayed = false;
+                        if (dockitem.OriginalBarName == "")
+                        {
+                            dockitem.OriginalBarName = barToDock.Name;
+                            dockitem.OriginalPosition = barToDock.Items.IndexOf(dockitem);
+                        }
+                        barToDock.Items.Remove(dockitem);
+                        referenceBar.Items.Add(dockitem);
+                    }
+                }
+                referenceBar.RecalcLayout();
+
+                if (firstItem != null)
+                    referenceBar.SelectedDockContainerItem = firstItem;
+                referenceBar.InvokeBarDockEvents();
+
+                if (barToDock.CustomBar)
+                {
+                    this.Bars.Remove(barToDock);
+                    barToDock.Dispose();
+                }
+                else
+                {
+                    barToDock.Visible = false;
+                }
+            }
+            else
+            {
+                DocumentDockUIManager dockManager = GetDocumentUIManager(referenceBar.DockSide);
+                if (!this.Bars.Contains(barToDock))
+                    this.Bars.Add(barToDock);
+                dockManager.Dock(referenceBar, barToDock, dockToReferenceBarSide);
+            }
+        }
+        /// <summary>
+        /// Docks specified DockContainerItem.
+        /// </summary>
+        /// <param name="itemToDock">DockContainerItem to dock.</param>
+        /// <param name="side">Side to dock item to.</param>
+        public void Dock(DockContainerItem itemToDock, eDockSide side)
+        {
+            Dock(itemToDock, null, side);
+        }
+        /// <summary>
+        /// Docks specified DockContainerItem.
+        /// </summary>
+        /// <param name="itemToDock">DockContainerItem to dock.</param>
+        /// <param name="referenceBar">Reference bar.</param>
+        /// <param name="dockToReferenceBarSide">Side to dock item to.</param>
+        public void Dock(DockContainerItem itemToDock, Bar referenceBar, eDockSide dockToReferenceBarSide)
+        {
+            Dock(itemToDock, referenceBar, dockToReferenceBarSide, Point.Empty);
+        }
+        /// <summary>
+        /// Docks specified DockContainerItem.
+        /// </summary>
+        /// <param name="itemToDock">DockContainerItem to dock.</param>
+        /// <param name="referenceBar">Reference bar.</param>
+        /// <param name="dockToReferenceBarSide">Side to dock item to.</param>
+        private void Dock(DockContainerItem itemToDock, Bar referenceBar, eDockSide dockToReferenceBarSide, Point initialFloatLocation)
+        {
+            Bar parentBar = itemToDock.ContainerControl as Bar;
+
+            if (dockToReferenceBarSide == eDockSide.None)
+            {
+                if (parentBar != null)
+                {
+                    parentBar.TearOffDockContainerItem(itemToDock, true, initialFloatLocation);
+                    return;
+                }
+            }
+
+            Bar newBar = null;
+            if (parentBar != null)
+            {
+                newBar = BarFunctions.CreateDuplicateDockBar(parentBar);
+            }
+
+            // Un-parent DockContainerItem
+            if (itemToDock.Parent != null)
+            {
+                if (parentBar != null)
+                {
+                    parentBar.Items.Remove(itemToDock);
+                    if (parentBar.Items.Count == 0)
+                    {
+                        if (parentBar.CustomBar)
+                        {
+                            this.Bars.Remove(parentBar);
+                            parentBar.Dispose();
+                        }
+                        else
+                        {
+                            parentBar.Visible = false;
+                        }
+                    }
+                    else if (parentBar.VisibleItemCount == 0)
+                        parentBar.Visible = false;
+                    else
+                        parentBar.RecalcLayout();
+                }
+                else
+                    itemToDock.Parent.SubItems.Remove(itemToDock);
+            }
+
+            if (newBar == null)
+            {
+                newBar = new Bar();
+                newBar.Name = "customBar" + itemToDock.Name;
+                newBar.LayoutType = eLayoutType.DockContainer;
+                newBar.Text = itemToDock.Text;
+                newBar.AutoSyncBarCaption = true;
+                newBar.CustomBar = true;
+                this.Bars.Add(newBar);
+            }
+
+            newBar.Items.Add(itemToDock);
+            if (dockToReferenceBarSide == eDockSide.None)
+            {
+                newBar.DockSide = eDockSide.None;
+                newBar.Location = initialFloatLocation;
+                return;
+            }
+
+            if (referenceBar == null)
+                Dock(newBar, dockToReferenceBarSide);
+            else
+                Dock(newBar, referenceBar, dockToReferenceBarSide);
+        }
+
+        /// <summary>
+        /// Tear-off specified DockContainerItem and float it.
+        /// </summary>
+        /// <param name="itemToFloat">Item to float.</param>
+        public void Float(DockContainerItem itemToFloat)
+        {
+            Bar parentBar = itemToFloat.ContainerControl as Bar;
+            if (parentBar != null && parentBar.Items.Count == 1)
+            {
+                Float(parentBar);
+                return;
+            }
+            Dock(itemToFloat, eDockSide.None);
+        }
+        /// <summary>
+        /// Tear-off specified DockContainerItem and float it.
+        /// </summary>
+        /// <param name="itemToFloat">Item to float.</param>
+        public void Float(DockContainerItem itemToFloat, Point initialFloatLocation)
+        {
+            Bar parentBar = itemToFloat.ContainerControl as Bar;
+            if (parentBar != null && parentBar.Items.Count == 1)
+            {
+                Float(parentBar, initialFloatLocation);
+                return;
+            }
+            Dock(itemToFloat, null, eDockSide.None, initialFloatLocation);
+        }
+        /// <summary>
+        /// Make specified bar floating bar, i.e. undock it and place in floating window.
+        /// </summary>
+        /// <param name="barToFloat">Bar to float.</param>
+        public void Float(Bar barToFloat)
+        {
+            barToFloat.DockSide = eDockSide.None;
+        }
+        /// <summary>
+        /// Make specified bar floating bar, i.e. undock it and place in floating window and specified location on the screen.
+        /// </summary>
+        /// <param name="barToFloat">Bar to float.</param>
+        /// <param name="initialFloatingLocation">Screen coordinates for the floating bar.</param>
+        public void Float(Bar barToFloat, Point initialFloatingLocation)
+        {
+            barToFloat.InitalFloatLocation = initialFloatingLocation;
+            barToFloat.DockSide = eDockSide.None;
+        }
+
+        private DocumentDockUIManager GetDocumentUIManager(eDockSide side)
+        {
+            if (side == eDockSide.None)
+                throw new ArgumentException("eDockSide.None is not supported parameter value");
+
+            if (side == eDockSide.Bottom)
+            {
+                return this.BottomDockSite.GetDocumentUIManager();
+            }
+            else if (side == eDockSide.Left)
+            {
+                return this.LeftDockSite.GetDocumentUIManager();
+            }
+            else if (side == eDockSide.Right)
+            {
+                return this.RightDockSite.GetDocumentUIManager();
+            }
+            else if (side == eDockSide.Top)
+            {
+                return this.TopDockSite.GetDocumentUIManager();
+            }
+            return this.FillDockSite.GetDocumentUIManager();
+        }
+        #endregion
+
+        private static bool _MouseDockingEnabled = true;
+        /// <summary>
+        /// Indicates whether mouse drag and drop for docking is enabled.
+        /// </summary>
+        public static bool MouseDockingEnabled
+        {
+            get
+            {
+                return _MouseDockingEnabled;
+            }
+            set
+            {
+                _MouseDockingEnabled = value;
+            }
+        }
+
+        private bool _EnableDockCtrlTabKey = true;
+        /// <summary>
+        /// Indicates whether Ctrl+Tab keys cycles the currently selected dock tab.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether Ctrl+Tab keys cycles the currently selected dock tab")]
+        public bool EnableDockCtrlTabKey
+        {
+            get { return _EnableDockCtrlTabKey; }
+            set
+            {
+                _EnableDockCtrlTabKey = value;
+            }
+        }
+        
+
+        /// <summary>
+        /// Gets or sets the Context menu bar associated with the this control which is used as part of Global Items feature. The context menu 
+        /// bar assigned here will be used to search for the items with the same Name or GlobalName property so global properties can be propagated when changed.
+        /// You should assign this property to enable the Global Items feature to reach your ContextMenuBar.
+        /// </summary>
+        [DefaultValue(null), Description("Indicates Context menu bar associated with the DotNetBarManager which is used as part of Global Items feature."), Category("Data")]
+        public ContextMenuBar GlobalContextMenuBar
+        {
+            get { return m_GlobalContextMenuBar; }
+            set
+            {
+                if (m_GlobalContextMenuBar != null)
+                    m_GlobalContextMenuBar.GlobalParentComponent = null;
+                m_GlobalContextMenuBar = value;
+                if (m_GlobalContextMenuBar != null)
+                    m_GlobalContextMenuBar.GlobalParentComponent = this;
+            }
+        }
+
+        ///// <summary>
+        ///// Gets the list of all CommandLinks objects associated with this manager.
+        ///// </summary>
+        //internal ArrayList CommandLinks
+        //{
+        //    get { return m_CommandLinks; }
+        //}
+        internal static bool IsManagerRegistered(IOwner manager, Form parentForm)
+        {
+            if (m_MdiChildParentHandlers.Contains(parentForm))
+            {
+                ParentMsgHandler handler = m_MdiChildParentHandlers[parentForm] as ParentMsgHandler;
+                return handler.IsRegistered(manager);
+            }
+            return false;
+        }
+
+		internal static void RegisterParentMsgHandler(IOwner manager,Form parentForm)
+		{
+			if(m_MdiChildParentHandlers.Contains(parentForm))
+			{
+				ParentMsgHandler handler=m_MdiChildParentHandlers[parentForm] as ParentMsgHandler;
+				if(!handler.IsRegistered(manager))
+					handler.Register(manager);
+			}
+			else
+			{
+                ParentMsgHandler handler=new ParentMsgHandler(manager.DesignMode);
+				handler.AssignHandle(parentForm.Handle);
+				handler.Register(manager);
+				m_MdiChildParentHandlers[parentForm]=handler;
+			}
+		}
+		internal static void UnRegisterParentMsgHandler(IOwner manager,Form parentForm)
+		{
+			if(parentForm==null)
+				return;
+			if(m_MdiChildParentHandlers.Contains(parentForm))
+			{
+				ParentMsgHandler handler=m_MdiChildParentHandlers[parentForm] as ParentMsgHandler;
+				if(handler.IsRegistered(manager))
+				{
+					handler.Unregister(manager);
+					if(handler.RegisteredCount==0 && handler.RegisteredOwnersCount==0)
+					{
+						handler.ReleaseHandle();
+						m_MdiChildParentHandlers.Remove(parentForm);
+					}
+					return;
+				}
+			}
+			else
+			{
+				foreach(DictionaryEntry item in m_MdiChildParentHandlers)
+				{
+					ParentMsgHandler handler=item.Value as ParentMsgHandler;
+					if(handler.IsRegistered(manager))
+					{
+                        handler.Unregister(manager);
+						if(handler.RegisteredCount==0 && handler.RegisteredOwnersCount==0)
+						{
+							handler.ReleaseHandle();
+							m_MdiChildParentHandlers.Remove(parentForm);
+						}
+						break;
+					}
+				}
+			}
+		}
+		internal static void RegisterOwnerParentMsgHandler(IOwner owner, Form parentForm)
+		{
+			if(m_MdiChildParentHandlers.Contains(parentForm))
+			{
+				ParentMsgHandler handler=m_MdiChildParentHandlers[parentForm] as ParentMsgHandler;
+				if(!handler.IsOwnerRegistered(owner))
+					handler.RegisterOwner(owner);
+			}
+			else
+			{
+				ParentMsgHandler handler=new ParentMsgHandler(true);
+				handler.AssignHandle(parentForm.Handle);
+				handler.RegisterOwner(owner);
+				m_MdiChildParentHandlers[parentForm]=handler;
+			}
+		}
+		internal static void UnRegisterOwnerParentMsgHandler(IOwner owner,Form parentForm)
+		{
+			if(parentForm==null)
+				return;
+
+			if(m_MdiChildParentHandlers.Contains(parentForm))
+			{
+				ParentMsgHandler handler=m_MdiChildParentHandlers[parentForm] as ParentMsgHandler;
+				if(handler.IsOwnerRegistered(owner))
+				{
+					handler.UnregisterOwner(owner);
+					if(handler.RegisteredCount==0 && handler.RegisteredOwnersCount==0)
+					{
+						handler.ReleaseHandle();
+						m_MdiChildParentHandlers.Remove(parentForm);
+					}
+					return;
+				}
+			}
+			else
+			{
+				foreach(DictionaryEntry item in m_MdiChildParentHandlers)
+				{
+					ParentMsgHandler handler=item.Value as ParentMsgHandler;
+					if(handler.IsOwnerRegistered(owner))
+					{
+						handler.UnregisterOwner(owner);
+						if(handler.RegisteredCount==0 && handler.RegisteredOwnersCount==0)
+						{
+							handler.ReleaseHandle();
+							m_MdiChildParentHandlers.Remove(parentForm);
+						}
+						break;
+					}
+				}
+			}
+		}
+
+		internal static void RelayApplicationActivate(bool bActivate)
+		{
+			ParentMsgHandler[] handlers=new ParentMsgHandler[m_MdiChildParentHandlers.Count];
+			m_MdiChildParentHandlers.Values.CopyTo(handlers,0);
+			foreach(ParentMsgHandler handler in handlers)
+			{
+                if (bActivate)
+                    handler.ApplicationActivate();
+                else
+                    handler.ApplicationDeactivate();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the form DotNetBarManager is attached to.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),System.ComponentModel.Category("Data"),System.ComponentModel.Description("Gets or sets the form DotNetBarManager is attached to.")]
+		public Form ParentForm
+		{
+			get
+			{
+				return m_ParentForm;
+			}
+			set
+			{
+				if(m_ParentForm!=null)
+				{
+					ReleaseParentFormHooks();
+				}
+				m_ParentForm=value;
+				OnParentChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the user control DotNetBarManager is parented to when on user control and providing popups only.
+		/// </summary>
+		[Browsable(false),DefaultValue(null)]
+		public Control ParentUserControl
+		{
+			get {return m_ParentUserControl;}
+			set
+			{
+				m_ParentUserControl=value;
+				SetupParentUserControl();
+			}
+		}
+
+        /// <summary>
+        /// Gets currently focused (active) DockContainerItem. Note that only if DockContainer Item has input focus it will be consider active
+        /// so there can only be one active DockContainerItem at a time.
+        /// </summary>
+        [Browsable(false)]
+        public DockContainerItem ActiveDockContainerItem
+        {
+            get
+            {
+                return _ActiveDockContainerItem;
+            }
+        }
+
+        private DockContainerItem _ActiveDockContainerItem = null;
+        internal void InternalDockContainerDeactivated(DockContainerItem item)
+        {
+            if (_ActiveDockContainerItem != null)
+            {
+                OnActiveDockContainerChanged(new ActiveDockContainerChangedEventArgs(item, false));
+                _ActiveDockContainerItem = null;
+            }
+        }
+        internal void InternalDockContainerActivated(DockContainerItem item)
+        {
+            if (_ActiveDockContainerItem != item)
+            {
+                if (_ActiveDockContainerItem != null)
+                {
+                    InternalDockContainerDeactivated(_ActiveDockContainerItem);
+                }
+                _ActiveDockContainerItem = item;
+                OnActiveDockContainerChanged(new ActiveDockContainerChangedEventArgs(item, true));
+            }
+        }
+
+        /// <summary>
+        /// Raises the ActiveDockContainerChanged event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnActiveDockContainerChanged(ActiveDockContainerChangedEventArgs e)
+        {
+            ActiveDockContainerChangedEventHandler h = ActiveDockContainerChanged;
+            if (h != null) h(this, e);
+        }
+        
+        bool IExtenderProvider.CanExtend(object target) 
+		{
+			if (target is Control)
+				return true;
+			return false;
+		}
+        void IOwnerItemEvents.InvokeItemDoubleClick(BaseItem objItem, MouseEventArgs e)
+        {
+            OnItemDoubleClick(objItem, e);
+        }
+        /// <summary>
+        /// Invokes ItemDoubleClick event.
+        /// </summary>
+        /// <param name="objItem">Reference to item double-clicked</param>
+        /// <param name="e">Event arguments</param>
+        protected virtual void OnItemDoubleClick(BaseItem objItem, MouseEventArgs e)
+        {
+            MouseEventHandler handler = ItemDoubleClick;
+            if (handler != null)
+                handler(objItem, e);
+        }
+		void IOwnerItemEvents.InvokeItemClick(BaseItem objItem)
+		{
+			if(ItemClick!=null)
+				ItemClick(objItem,new EventArgs());
+		}
+
+		internal void InvokeDockTabClosing(Bar bar, DockTabClosingEventArgs e)
+		{
+			if(DockTabClosing!=null)
+				DockTabClosing(this,e);
+		}
+        internal void InvokeDockTabClosed(Bar bar, DockTabClosingEventArgs e)
+        {
+            if (DockTabClosed != null)
+                DockTabClosed(this, e);
+        }
+
+        internal void InvokeTextBoxItemTextChanged(TextBoxItem ti)
+        {
+            if (TextBoxItemTextChanged != null)
+                TextBoxItemTextChanged(ti, new EventArgs());
+        }
+
+        internal void InvokeColorPickerSelectedColorChanged(ColorPickerDropDown d)
+        {
+            if (ColorPickerSelectedColorChanged != null)
+                ColorPickerSelectedColorChanged(d, new EventArgs());
+        }
+
+		/// <summary>
+		/// Returns the Bar object that contains the item.
+		/// </summary>
+		[System.ComponentModel.Browsable(false)]
+		public DevComponents.DotNetBar.Bar GetItemBar(BaseItem item)
+		{
+			while(item.Parent!=null)
+				item=item.Parent;
+			Bar bar=item.ContainerControl as Bar;
+			return bar;
+		}
+
+        internal bool GetDesignMode()
+        {
+            return this.DesignMode;
+        }
+
+		private void OnParentChanged()
+		{
+			// We always create docking sites on top level controls
+			if(m_ParentForm==null)
+				return;
+
+            if(!this.DesignMode)
+			    UnRegisterParentMsgHandler(this,m_ParentForm);
+
+			if(m_ParentForm.IsHandleCreated && !this.DesignMode)
+			{
+				if(m_ParentForm.IsMdiChild && m_ParentForm.MdiParent!=null)
+				{
+					RegisterParentMsgHandler(this,m_ParentForm.MdiParent);
+				}
+				else
+				{
+                    RegisterParentMsgHandler(this,m_ParentForm);					
+				}
+			}
+
+			m_ParentForm.HandleDestroyed+=new System.EventHandler(this.ParentHandleDestroyed);
+			m_ParentForm.HandleCreated+=new System.EventHandler(this.ParentHandleCreated);
+			if(!this.DesignMode)
+			{
+				m_ParentForm.Activated+=new System.EventHandler(this.ParentActivated);
+				m_ParentForm.Deactivate+=new System.EventHandler(this.ParentDeactivate);
+				m_ParentForm.Load+=new System.EventHandler(this.ParentLoad);
+				m_ParentForm.VisibleChanged+=new System.EventHandler(this.ParentVisibleChanged);
+				m_ParentForm.Resize+=new System.EventHandler(this.ParentResize);
+			}
+
+			if(!this.DesignMode)
+			{
+				if(!m_FilterInstalled && !m_UseHook)
+				{
+					MessageHandler.RegisterMessageClient(this);
+					m_FilterInstalled=true;
+				}
+				else if(m_UseHook && m_Hook==null)
+				{
+					m_Hook=new Hook(this);
+				}
+			}
+
+			// MDI Parent Handling
+			if(m_MdiHandler!=null)
+			{
+                m_MdiHandler.MdiSetMenu -= this.OnMdiSetMenu;
+				m_MdiHandler.ReleaseHandle();
+				m_MdiHandler=null;
+			}
+
+			// MDI Handling...
+			System.Windows.Forms.MdiClient client=((IOwner)this).GetMdiClient(m_ParentForm);
+			if(client!=null)
+			{
+				SetupMdiHandler(client);
+			}
+			else
+			{
+				// Watch for its creation to catch it early
+				m_ParentForm.ControlAdded+=new ControlEventHandler(ParentControlAdded);
+				m_EventControlAdded=true;
+			}
+
+			// Try to load bar stream if possible
+			//if(!this.DesignMode)
+				BarStreamLoad();
+		}
+
+		private void ParentHandleDestroyed(object sender, EventArgs e)
+		{
+            if(!this.DesignMode)
+			    UnRegisterParentMsgHandler(this,m_ParentForm);
+//			if(m_MsgHandler!=null)
+//			{
+//				m_MsgHandler.ReleaseHandle();
+//				m_MsgHandler=null;
+//			}
+		}
+		private void ParentHandleCreated(object sender, EventArgs e)
+		{
+            if (!this.DesignMode)
+            {
+                if (m_ParentForm.IsMdiChild && m_ParentForm.MdiParent != null)
+                    RegisterParentMsgHandler(this, m_ParentForm.MdiParent);
+                else
+                    RegisterParentMsgHandler(this, m_ParentForm);
+
+                if (m_MdiHandler != null)
+                {
+                    m_MdiHandler.MdiSetMenu -= this.OnMdiSetMenu;
+                    m_MdiHandler.ReleaseHandle();
+                    m_MdiHandler = null;
+                    System.Windows.Forms.MdiClient client = ((IOwner)this).GetMdiClient(m_ParentForm);
+                    if (client != null)
+                    {
+                        SetupMdiHandler(client);
+                    }
+                }
+            }
+
+			//if(!this.DesignMode)
+				BarStreamLoad(true);
+		}
+
+		private void SetupMdiHandler(System.Windows.Forms.MdiClient client)
+		{
+			// Do not force creation of window handle wait for the system to create it...
+			if(client.IsHandleCreated)
+				SetupClientMsgHandler(client);
+			else if(!m_MdiClientHandleCreatedHandled)
+			{
+				client.HandleCreated+=new EventHandler(this.MdiClientHandleCreates);
+				m_MdiClientHandleCreatedHandled=true;
+			}
+			
+			if(!m_MdiChildActivateHandled)
+			{
+				m_ParentForm.MdiChildActivate+=new EventHandler(this.OnMdiChildActivate);
+				m_MdiChildActivateHandled=true;
+				if(m_ParentForm.ActiveMdiChild!=null)
+					this.OnMdiChildActivate(m_ParentForm,new EventArgs());
+			}
+		}
+
+		private void SetupClientMsgHandler(System.Windows.Forms.MdiClient client)
+		{
+			if(client==null)
+				return;
+			if(m_MdiHandler!=null)
+			{
+                m_MdiHandler.MdiSetMenu -= this.OnMdiSetMenu;
+				m_MdiHandler.ReleaseHandle();
+				m_MdiHandler=null;
+			}
+			m_MdiHandler=new MDIClientMsgHandler();
+            m_MdiHandler.MdiSetMenu += new EventHandler(this.OnMdiSetMenu);
+			m_MdiHandler.AssignHandle(client.Handle);
+			if(m_MdiClientHandleCreatedHandled)
+			{
+				client.HandleCreated-=new EventHandler(this.MdiClientHandleCreates);
+				m_MdiClientHandleCreatedHandled=false;
+			}
+		}
+
+		private void MdiClientHandleCreates(object sender, EventArgs e)
+		{
+			SetupClientMsgHandler(sender as System.Windows.Forms.MdiClient);
+		}
+
+		private void ParentResize(object sender, System.EventArgs e)
+		{
+			if(m_ParentForm!=null && m_ParentForm.WindowState!=FormWindowState.Minimized && m_ParentActivated && m_WereVisible.Count>0)
+				((IOwner)this).OnApplicationActivate();
+			else if(m_ParentForm!=null && m_ParentForm.WindowState==FormWindowState.Minimized && m_WereVisible.Count==0)
+				((IOwner)this).OnApplicationDeactivate();
+		}
+		private void ParentActivated(object sender, System.EventArgs e)
+		{
+			m_ParentActivated=true;
+			if(m_WereVisible.Count>0 && m_ParentForm!=null && m_ParentForm.WindowState!=FormWindowState.Minimized)
+				((IOwner)this).OnApplicationActivate();
+		}
+		private void ParentDeactivate(object sender, System.EventArgs e)
+		{
+			m_ParentActivated=false;
+			if(m_ParentForm!=null && m_ParentForm.WindowState==FormWindowState.Minimized)
+				((IOwner)this).OnApplicationDeactivate();
+		}
+		private void ParentVisibleChanged(object sender, System.EventArgs e)
+		{
+			if(m_ParentForm==null)
+				return;
+			if(m_ParentForm.Visible)
+			{
+				if(!m_FilterInstalled && !m_UseHook)
+				{
+					m_FilterInstalled=true;
+					//System.Windows.Forms.Application.AddMessageFilter(this);
+					MessageHandler.RegisterMessageClient(this);
+				}
+				else if(m_UseHook && m_Hook==null)
+				{
+					m_Hook=new Hook(this);
+				}
+			}
+			else
+			{
+				if(m_FilterInstalled)
+				{
+					//System.Windows.Forms.Application.RemoveMessageFilter(this);
+					MessageHandler.UnregisterMessageClient(this);
+					m_FilterInstalled=false;
+				}
+				else if(m_Hook!=null)
+				{
+					m_Hook.Dispose();
+					m_Hook=null;
+				}
+			}
+		}
+		private void ParentLoad(object sender, System.EventArgs e)
+		{
+//			if(m_TriggerParentChange)
+//			{
+//				m_ParentForm.Load-=new System.EventHandler(this.ParentLoad);
+//				OnParentChanged();
+//			}
+			// Last chance to check for MDI Stuff...
+			if(m_MdiHandler==null)
+			{
+				System.Windows.Forms.MdiClient client=((IOwner)this).GetMdiClient(m_ParentForm);
+				if(client!=null)
+				{
+					SetupMdiHandler(client);
+				}
+			}
+
+            if (m_ParentForm.IsHandleCreated && !this.DesignMode)
+            {
+                if (m_ParentForm.IsMdiChild && m_ParentForm.MdiParent != null)
+                {
+                    if (!IsManagerRegistered(this, m_ParentForm.MdiParent))
+                    {
+                        UnRegisterParentMsgHandler(this, m_ParentForm);
+                        RegisterParentMsgHandler(this, m_ParentForm.MdiParent);
+                    }
+                }
+                else
+                    RegisterParentMsgHandler(this, m_ParentForm);
+            }
+            
+            BarStreamLoad(true);
+
+// TODO: Menu Merging Implementation
+//			// Check do we have any Bars participating in item merging
+//			if(m_ParentForm.IsMdiChild)
+//			{
+//                // Try to get to the MDI form and register with that DotNetBarManager
+//				if(m_ParentForm.MdiParent!=null)
+//				{
+//					DotNetBarManager mdiManager=null;
+//					foreach(Control ctrl in m_ParentForm.MdiParent.Controls)
+//					{
+//						if(ctrl is DockSite)
+//						{
+//							mdiManager=((DockSite)ctrl).Owner;
+//							break;
+//						}
+//					}
+//					if(mdiManager!=null)
+//						mdiManager.RegisterMdiChildManager(this);
+//					m_ParentForm.Closed+=new EventHandler(ParentFormClosed);
+//				}
+//			}
+		}
+//		private void ParentFormClosed(object sender, EventArgs e)
+//		{
+//			if(m_ParentForm.MdiParent!=null)
+//			{
+//				DotNetBarManager mdiManager=null;
+//				foreach(Control ctrl in m_ParentForm.MdiParent.Controls)
+//				{
+//					if(ctrl is DockSite)
+//					{
+//						mdiManager=((DockSite)ctrl).Owner;
+//						break;
+//					}
+//				}
+//				if(mdiManager!=null)
+//					mdiManager.UnregisterMdiChildManager(this);
+//			}
+//		}
+
+		private void ParentControlAdded(object sender, ControlEventArgs e)
+		{
+			if(e.Control is System.Windows.Forms.MdiClient)
+			{
+				SetupMdiHandler((System.Windows.Forms.MdiClient)e.Control);
+				//m_ParentForm.ControlAdded-=new ControlEventHandler(this.ParentControlAdded); 11/17/2003 Fix Matt Act, solve on-the-fly MDI form creation
+				//m_EventControlAdded=false;
+			}
+		}
+
+// TODO: Menu Merging Implementation
+//		internal void RegisterMdiChildManager(DotNetBarManager mdiChildManager)
+//		{
+//			if(m_MdiChildManagers==null)
+//			{
+//				m_MdiChildManagers=new Hashtable();
+//				m_ParentForm.MdiChildActivate+=new EventHandler(ParentMdiChildActivate);
+//			}
+//			m_MdiChildManagers.Add(mdiChildManager.ParentForm,mdiChildManager);
+//		}
+//
+//		internal void UnregisterMdiChildManager(DotNetBarManager mdiChildManager)
+//		{
+//			if(m_MdiChildManagers==null)
+//				return;
+//			if(m_MdiChildManagers.Contains(mdiChildManager.ParentForm))
+//				m_MdiChildManagers.Remove(mdiChildManager);
+//		}
+
+//		private void ParentMdiChildActivate(object sender, EventArgs e)
+//		{
+//			if(m_MdiChildManagers.Contains(sender))
+//			{
+//			}
+//		}
+
+		private void BarStreamLoad()
+		{
+			BarStreamLoad(false);
+		}
+		[Browsable(false),EditorBrowsable(EditorBrowsableState.Never)]
+		public void BarStreamLoad(bool bForceLoad)
+		{
+			if(m_DefinitionLoaded)
+				return;
+
+			if(m_DefinitionName!="" && (m_TopDockSite!=null && m_TopDockSite.Parent!=null && m_BottomDockSite!=null && m_BottomDockSite.Parent!=null && m_LeftDockSite!=null && m_LeftDockSite.Parent!=null && m_RightDockSite!=null && m_RightDockSite.Parent!=null || bForceLoad || IsPopupProviderOnly && this.ParentForm!=null && m_ParentUserControl!=null))
+			{
+				if(this.DesignMode)
+				{
+					// In design mode we are loading our definition file directly
+					string path=DesignTimeDte.GetDefinitionPath(m_DefinitionName, this.Site); // GetProjectPath();
+					//MessageBox.Show(path);
+					if(path!=null && path!="")
+					{
+						if(!path.EndsWith("\\"))
+                            path+="\\";
+						if(System.IO.File.Exists(path+m_DefinitionName))
+						{
+							this.LoadDefinition(path+m_DefinitionName);
+							// Removed becouse problem was found that form was loaded before the 
+							// definition file was loaded inside the project
+//							if(!DesignTimeDte.ExistInProject(m_DefinitionName))
+//							{
+//								if(MessageBox.Show("Definition file is not included in existing projects. "+m_DefinitionName+" but it is found at: "+path+"\n\nDo you want DotNetBar to add it to the project?","DotNetBar Definition Load",MessageBoxButtons.YesNo,MessageBoxIcon.Question)==DialogResult.Yes)
+//									DesignTimeDte.AddFileToProject(path+m_DefinitionName);
+//							}
+						}
+						else
+						{
+							MessageBox.Show("DotNetBar definition file not found: "+path+m_DefinitionName,"DotNetBar Designer",MessageBoxButtons.OK,MessageBoxIcon.Warning);
+                            m_DefinitionName="";							
+						}
+					}
+				}
+				else
+				{					
+					if((this.ParentForm!=null && (this.ParentForm.IsHandleCreated || bForceLoad || this.IsPopupProviderOnly)) || (m_TopDockSite!=null && m_TopDockSite.Parent is UserControl))
+					{
+						System.IO.Stream stream=null;
+						Hashtable assemblies=new Hashtable();
+						if(m_TopDockSite!=null && m_TopDockSite.Parent is UserControl)
+						{
+							assemblies.Add(m_TopDockSite.Parent.GetType().Assembly.FullName,m_TopDockSite.Parent.GetType().Assembly);
+							stream=m_TopDockSite.Parent.GetType().Assembly.GetManifestResourceStream(m_TopDockSite.Parent.GetType().Namespace+"."+m_DefinitionName); // stream=m_TopDockSite.Parent.GetType().Assembly.GetManifestResourceStream(m_TopDockSite.Parent.GetType().Assembly.GetName().Name+"."+m_DefinitionName);
+						}
+						else
+						{
+							if(this.ParentForm.GetType().BaseType.FullName!="System.Windows.Forms.Form")
+							{
+								Type type=this.ParentForm.GetType();
+								Stack types=new Stack(10);
+								int iCount=0;
+								while(iCount<64)
+								{
+									types.Push(type);
+									if(!assemblies.ContainsKey(type.Assembly.FullName))
+										assemblies.Add(type.Assembly.FullName,type.Assembly);
+									if(type.BaseType.FullName=="System.Windows.Forms.Form")
+										break;
+									type=type.BaseType;
+									iCount++;
+								}
+								stream=type.Assembly.GetManifestResourceStream(type.Namespace+"."+m_DefinitionName);
+								if(stream==null)
+								{
+									// Maybe manager was added on this form...
+									while(types.Count>0 && stream==null)
+									{
+										type=types.Pop() as Type;
+										stream=type.Assembly.GetManifestResourceStream(type.Namespace+"."+m_DefinitionName);
+									}
+								}
+								types.Clear();
+							}
+							else
+							{
+								stream=this.ParentForm.GetType().Assembly.GetManifestResourceStream(this.ParentForm.GetType().Namespace+"."+m_DefinitionName);
+								assemblies.Add(this.ParentForm.GetType().Assembly.FullName,this.ParentForm.GetType().Assembly);
+							}
+                            if (m_ParentUserControl != null && !assemblies.Contains(m_ParentUserControl.GetType().Assembly.FullName))
+                            {
+                                assemblies.Add(m_ParentUserControl.GetType().Assembly.FullName, m_ParentUserControl.GetType().Assembly);
+                            }
+						}
+						if(stream==null)
+						{
+							// It is possible that Form is not in the same default namespace as the definition file so we have to enumerate through the manifest and look for our definition
+							System.Reflection.Assembly[] arr=new System.Reflection.Assembly[assemblies.Count];
+							assemblies.Values.CopyTo(arr,0);
+							for(int i=arr.Length-1;i>=0;i--)
+							{
+								System.Reflection.Assembly a=arr[i];
+								string[] res=a.GetManifestResourceNames();
+								foreach(string s in res)
+								{
+									if(s.EndsWith(m_DefinitionName))
+									{
+										stream=a.GetManifestResourceStream(s);
+										break;
+									}
+								}
+								if(stream!=null)
+									break;
+							}
+						}
+						assemblies.Clear();
+						if(stream!=null)
+						{
+							System.Xml.XmlDocument document=new System.Xml.XmlDocument();
+							document.Load(stream);
+							LoadDefinition(document);
+							m_DefinitionLoaded=true;
+						}
+					}
+				}
+                m_BarStreamer=null;
+			}
+			else if(m_BarStreamer!=null && (m_TopDockSite!=null && m_TopDockSite.Parent!=null && m_BottomDockSite!=null && m_BottomDockSite.Parent!=null && m_LeftDockSite!=null && m_LeftDockSite.Parent!=null && m_RightDockSite!=null && m_RightDockSite.Parent!=null || bForceLoad))
+			{
+				if(m_BarStreamer.Data!=null)
+				{
+					LoadDefinition(m_BarStreamer.Data);
+					m_DefinitionLoaded=true;
+				}
+				m_BarStreamer=null;
+			}
+			
+		}
+
+        private bool IsPopupProviderOnly
+        {
+            get { return m_TopDockSite == null && m_BottomDockSite == null && m_LeftDockSite == null && m_RightDockSite == null; }
+        }
+
+		void IOwner.OnApplicationDeactivate()
+		{
+            if (m_ParentForm != null && m_ParentForm.InvokeRequired)
+            {
+                m_ParentForm.BeginInvoke(new InvokeActivateDelegate(OnApplicationDeactivateInternal));
+                return;
+            }
+            OnApplicationDeactivateInternal();
+		}
+
+        private void OnApplicationDeactivateInternal()
+        {
+            CloseDockingHints();
+            if (m_WereVisible.Count == 0)
+            {
+                if (m_Bars != null)
+                {
+                    // Break out if we have docking in progress since that will trigger these events...
+                    foreach (Bar bar in m_Bars)
+                    {
+                        if (bar.DockingInProgress)
+                            return;
+                    }
+
+                    foreach (Bar bar in m_Bars)
+                    {
+                        bar.AppLostFocus();
+
+                        // TODO: bar.Visible is returning false when bar is floating and visible!!! Possible bug!!!
+                        if (bar.BarState == eBarState.Floating && bar.Visible && bar.HideFloatingInactive)
+                        {
+                            //bar.Visible=false;
+                            bar.HideBar();
+                            m_WereVisible.Add(bar);
+                        }
+                    }
+                }
+                ArrayList popupList = new ArrayList(m_RegisteredPopups);
+                foreach (PopupItem objPopup in popupList)
+                    objPopup.ClosePopup();
+            }
+
+            Bar menuBar = this.GetMenuBar();
+            if (menuBar != null && menuBar.MenuFocus)
+                menuBar.MenuFocus = false;
+        }
+        //		internal void App_LostFocusMessage()
+//		{
+//			this.App_LostFocus();
+//
+//			if(ms_Managers.Count>1)
+//			{
+//				foreach(DotNetBarManager m in ms_Managers)
+//				{
+//					if(m!=this)
+//						m.App_LostFocus();
+//				}
+//			}
+//		}
+
+		//protected void Parent_Activate(object sender, System.EventArgs e)
+		void IOwner.OnApplicationActivate()
+		{
+			if(m_ParentForm==null || m_ParentForm.WindowState==FormWindowState.Minimized)
+				return;
+            if (m_ParentForm != null && m_ParentForm.InvokeRequired)
+            {
+                m_ParentForm.BeginInvoke(new InvokeActivateDelegate(OnApplicationActivateInternal));
+                return;
+            }
+            OnApplicationActivateInternal();
+		}
+
+        private void OnApplicationActivateInternal()
+        {
+            if (m_ParentForm == null || m_ParentForm.WindowState == FormWindowState.Minimized)
+                return;
+            Form active = Form.ActiveForm;
+            if (active == null || active.Modal && active != m_ParentForm)
+                return;
+            try
+            {
+                foreach (Bar bar in m_WereVisible)
+                {
+                    bar.ShowBar();
+                }
+            }
+            finally
+            {
+                m_WereVisible.Clear();
+            }
+        }
+
+//		internal void App_ActivateMessage()
+//		{
+//			this.App_Activate();
+//			if(ms_Managers.Count>1)
+//			{
+//				foreach(DotNetBarManager m in ms_Managers)
+//				{
+//					if(m!=this)
+//						m.App_Activate();
+//				}
+//			}
+//		}
+
+		ArrayList IOwnerBarSupport.WereVisible
+		{
+			get
+			{
+				return m_WereVisible;
+			}
+		}
+
+		/// <summary>
+		///     Gets whether component has been disposed.
+		/// </summary>
+		/// <value>
+		/// </value>
+		/// <remarks>
+		///     Disposed will return true after Dispose method has been executed.
+		/// </remarks>
+		[Browsable(false)]
+		public bool IsDisposed
+		{
+			get{return m_Disposed;}
+		}
+		/// <summary>
+		///    Clean up any resources being used.
+		/// </summary>
+		protected override void Dispose(bool disposing)
+		{
+			if(m_Disposed)
+			{
+				base.Dispose(disposing);
+				return;
+			}
+
+			m_Disposed=true;
+
+			if(disposing && m_License != null) 
+			{
+				m_License.Dispose();
+				m_License = null;
+			}
+
+			if(m_ActiveMdiChild!=null)
+			{
+				m_ActiveMdiChild.Resize-=new EventHandler(this.OnMdiChildResize);
+				m_ActiveMdiChild.VisibleChanged-=new EventHandler(this.OnMdiChildVisibleChanged);
+				m_ActiveMdiChild=null;
+			}
+
+			this.Images=null;
+			this.ImagesMedium=null;
+			this.ImagesLarge=null;
+			
+			//ms_Managers.Remove(this);
+
+			if(m_ClickTimer!=null)
+			{
+				m_ClickTimer.Stop();
+				m_ClickTimer.Dispose();
+				m_ClickTimer=null;
+			}
+			if(m_RegisteredPopups!=null && m_RegisteredPopups.Count>0)
+			{
+				BaseItem[] popups;
+				lock(this)
+				{
+					popups=(BaseItem[])m_RegisteredPopups.ToArray(typeof(BaseItem));
+				}
+				foreach(PopupItem popup in popups)
+					if(popup.Expanded) popup.ClosePopup();
+				//m_RegisteredPopups=null;
+			}
+
+			// This was commented out becouse of the issue described below. This might have some of the same
+			// problems as the solution below and after testing it did not show any ill effects.
+//			if(m_MdiHandler!=null && m_MdiParentMsgHandler)
+//			{
+//				m_MdiHandler.ReleaseHandle();
+//				m_MdiHandler=null;
+//			}
+
+			// Closing the form which contains dockable window which in turn contains the UserControl with DotNetBar and 
+			// when DotNetBar is used to provide context menu for that UserControl
+			// was rasing an NULL exception. fixed after 1.0.0.10
+//			if(m_MsgHandler!=null)
+//			{
+//				m_MsgHandler.ReleaseHandle();
+//				m_MsgHandler=null;
+//			}
+			ReleaseParentFormHooks();
+
+			// Very bad things were happening when we put in the try..catch block, so I just commented it out. It seems it is working ok
+			if(m_FilterInstalled)
+			{
+				// This was causing the Local Data Storage has been freed exception under some conditions. Client: Eric.Plummer@frontrange.com, 02/25/2002
+				//try
+				//{
+					//System.Windows.Forms.Application.RemoveMessageFilter(this);
+					MessageHandler.UnregisterMessageClient(this);
+				//}
+				//catch(Exception)
+				//{}
+				m_FilterInstalled=false;
+			}
+
+			if(m_Hook!=null)
+			{
+				m_Hook.Dispose();
+				m_Hook=null;
+			}
+
+			/*if(m_TopDockSite!=null)
+			{
+				if(m_TopDockSite.Parent!=null)
+					m_TopDockSite.Parent.Controls.Remove(m_TopDockSite);
+				m_TopDockSite.Dispose();
+			}
+
+			if(m_BottomDockSite!=null)
+			{
+				if(m_BottomDockSite.Parent!=null)
+					m_BottomDockSite.Parent.Controls.Remove(m_BottomDockSite);
+				m_BottomDockSite.Dispose();
+			}
+
+			if(m_LeftDockSite!=null)
+			{
+				if(m_LeftDockSite.Parent!=null)
+					m_LeftDockSite.Parent.Controls.Remove(m_LeftDockSite);
+				m_LeftDockSite.Dispose();
+			}
+
+			if(m_RightDockSite!=null)
+			{
+				if(m_RightDockSite.Parent!=null)
+					m_RightDockSite.Parent.Controls.Remove(m_RightDockSite);
+				m_RightDockSite.Dispose();
+			}*/
+
+			if(m_frmCustomize!=null)
+			{
+				m_frmCustomize.Close();
+				if(m_frmCustomize!=null)
+					m_frmCustomize.Dispose();
+			}
+
+			//foreach(DevComponents.DotNetBar.Bar  bar in m_Bars)
+			//	bar.Dispose();
+			if(m_Bars!=null)
+			{
+				//m_Bars.Clear();
+				m_Bars=null;
+			}
+			if(m_Items!=null)
+			{
+				m_Items.Dispose();
+				m_Items=null;
+			}
+			if(m_ContextMenus!=null)
+			{
+				m_ContextMenus.SetOwner(null);
+				m_ContextMenus=null;
+			}
+
+			if(m_DisposeGCCollect) GC.Collect();
+
+			base.Dispose(disposing);
+		}
+
+		private bool m_DisposeGCCollect=true;
+		/// <summary>
+		/// Gets or sets whether GC.Collect() is called when this component is disposed.
+		/// </summary>
+		[Browsable(false),DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public bool DisposeGCCollect
+		{
+			get {return m_DisposeGCCollect;}
+			set {m_DisposeGCCollect=value;}
+		}
+
+		private void ReleaseParentFormHooks()
+		{
+			if(m_ParentForm!=null)
+			{
+                if(!this.DesignMode)
+				    UnRegisterParentMsgHandler(this,m_ParentForm);				
+			
+				m_ParentForm.HandleDestroyed-=new System.EventHandler(this.ParentHandleDestroyed);
+				m_ParentForm.HandleCreated-=new System.EventHandler(this.ParentHandleCreated);
+
+				if(m_EventControlAdded)
+				{
+					m_ParentForm.ControlAdded-=new ControlEventHandler(this.ParentControlAdded);
+					m_EventControlAdded=false;
+				}
+
+				if(!this.DesignMode)
+				{
+					m_ParentForm.Activated-=new System.EventHandler(this.ParentActivated);
+					m_ParentForm.Deactivate-=new System.EventHandler(this.ParentDeactivate);
+					m_ParentForm.Load-=new System.EventHandler(this.ParentLoad);
+					m_ParentForm.VisibleChanged-=new System.EventHandler(this.ParentVisibleChanged);
+					m_ParentForm.Resize-=new System.EventHandler(this.ParentResize);
+				}
+
+				if(m_MdiChildActivateHandled)
+				{
+					m_ParentForm.MdiChildActivate-=new EventHandler(this.OnMdiChildActivate);
+					m_MdiChildActivateHandled=false;
+				}
+			}
+		}
+
+		private void ImageListDisposed(object sender, EventArgs e)
+		{
+			if(sender==m_ImageList)
+			{
+				this.Images=null;
+			}
+			else if(sender==m_ImageListLarge)
+			{
+				this.ImagesLarge=null;
+			}
+			else if(sender==m_ImageListMedium)
+			{
+				this.ImagesMedium=null;
+			}
+		}
+
+        /// <summary>
+        /// Gets or sets the minimum client size that docking windows will try to maintain for the client area (not occupied by dock windows).
+        /// Note that this value is suggested value and cannot be observed when form is resized below the minimum size required for the given layout.
+        /// Default value is 48x48 pixels.
+        /// </summary>
+        [Browsable(true), Category("Docking"), Description("Indicates minimum client size that docking windows will try to maintain for the client area (not occupied by dock windows).")]
+        public Size MinimumClientSize
+        {
+            get { return m_MinimumClientSize; }
+            set
+            {
+                m_MinimumClientSize = value;
+            }
+        }
+        /// <summary>
+        /// Returns whether property should be serialized by Windows Forms designer.
+        /// </summary>
+        public bool ShouldSerializeMinimumClientSize()
+        {
+            return (m_MinimumClientSize.Width != 48 || m_MinimumClientSize.Height != 48);
+        }
+
+		/// <summary>
+		/// Indicates whether DotNetBar provides docking hints for easy docking of bars.
+		/// </summary>
+		[Obsolete(), Browsable(false),DefaultValue(true), EditorBrowsable(EditorBrowsableState.Never), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden),  Category("Docking"),Description("Indicates whether DotNetBar provides docking hints for easy docking of bars.")]
+		public bool DockingHintsEnabled
+		{
+			get {return m_DockingHints;}
+			set
+			{m_DockingHints=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets whether user can control how first bar is docked when using docking hints (default value is True). When enabled (default value) placing the mouse over the middle
+		/// docking hint will dock the bar at partial size and using the far docking hint will dock bar at full size. Full size indicates that dock site which hosts the bar
+		/// consumes all the space of the parent form while partial size indicates that dock site consumes the full size minus the space of the other dock sites. Default value is true.
+		/// </summary>
+		[Browsable(true),DefaultValue(true),Category("Docking"),Description("Indicates whether user can control how first bar is docked when using docking hints.")]
+		public bool EnableFullSizeDock
+		{
+			get {return m_EnableFullSizeDock;}
+			set {m_EnableFullSizeDock=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets whether uniform styling is applied to bars docked as documents. Default value is true which means
+		/// that bar that will be docked as document will have it's style changed so it fits in default document styling.
+		/// Such bars will have GrabHandleStyle=None, DockTabAlignment=Top and AlwaysDisplayDockTab=true.
+		/// Set this property to false to have bars keep these properties once they are docked as documents.
+		/// Value of these properties will be returned back to the default values once bar is not docked as document.
+		/// </summary>
+		[Browsable(true),DefaultValue(true),Category("Docking"),Description("")]
+		public bool ApplyDocumentBarStyle
+		{
+			get {return m_ApplyDocumentBarStyle;}
+			set {m_ApplyDocumentBarStyle=value;}
+		}
+
+		/// <summary>
+		/// Use to remove bar from DotNetBar control. Bar will be undocked if it is docked and
+		/// removed from all internal collections.
+		/// </summary>
+		/// <param name="bar">Bar to remove.</param>
+		public void RemoveBar(Bar bar)
+		{
+			if(!m_Bars.Contains(bar))
+				throw new System.ArgumentException("Bar not part of Bars collections.");
+			m_Bars.Remove(bar);
+
+            // It is docked somewhere else, we need to undockit and dockit on another site
+            // If Bar is deserialized there is no parent
+            if (bar.Parent != null && bar.Parent is DockSite)
+            {
+                if (((DockSite)bar.Parent).IsDocumentDock || ((DockSite)bar.Parent).DocumentDockContainer != null)
+                    ((DockSite)bar.Parent).GetDocumentUIManager().UnDock(bar);
+                else
+                    ((DockSite)bar.Parent).RemoveBar(bar);
+            }
+			((IOwnerBarSupport)this).RemoveShortcutsFromBar(bar);
+		}
+
+		void IOwnerBarSupport.AddShortcutsFromBar(Bar bar)
+		{
+			IOwner owner=this as IOwner;
+			foreach(BaseItem objItem in bar.Items)
+				owner.AddShortcutsFromItem(objItem);
+		}
+
+		void IOwner.AddShortcutsFromItem(BaseItem objItem)
+		{
+			ShortcutTableEntry objEntry=null;
+			if(objItem.ShortcutString!="")
+			{
+				foreach(eShortcut key in objItem.Shortcuts)
+				{
+					if(m_ShortcutTable.ContainsKey(key))
+						objEntry=(ShortcutTableEntry)m_ShortcutTable[objItem.Shortcuts[0]];
+					else
+					{
+						objEntry=new ShortcutTableEntry(key);
+						m_ShortcutTable.Add(objEntry.Shortcut,objEntry);
+					}
+					try
+					{
+						if(!objEntry.Items.ContainsKey(objItem.Id))
+							objEntry.Items.Add(objItem.Id,objItem);
+					}
+					catch(System.ArgumentException)	{}
+				}
+			}
+			IOwner owner=this as IOwner;
+			foreach(BaseItem objTmp in objItem.SubItems)
+				owner.AddShortcutsFromItem(objTmp);
+		}
+
+		void IOwnerBarSupport.RemoveShortcutsFromBar(Bar bar)
+		{
+			IOwner owner=this as IOwner;
+			if(bar.Items==null)
+				return;
+			foreach(BaseItem objItem in bar.Items)
+				owner.RemoveShortcutsFromItem(objItem);
+		}
+
+		void IOwner.RemoveShortcutsFromItem(BaseItem objItem)
+		{
+			ShortcutTableEntry objEntry=null;
+			if(objItem.ShortcutString!="")
+			{
+				foreach(eShortcut key in objItem.Shortcuts)
+				{
+					if(m_ShortcutTable.ContainsKey(key))
+					{
+						objEntry=(ShortcutTableEntry)m_ShortcutTable[key];
+						try
+						{
+							objEntry.Items.Remove(objItem.Id);
+							if(objEntry.Items.Count==0)
+								m_ShortcutTable.Remove(objEntry.Shortcut);
+						}
+						catch(System.ArgumentException)	{}
+					}
+				}
+			}
+			IOwner owner=this as IOwner;
+			foreach(BaseItem objTmp in objItem.SubItems)
+				owner.RemoveShortcutsFromItem(objTmp);
+		}
+
+		//[Editor(typeof(DotNetBarEditor), typeof(System.Drawing.Design.UITypeEditor)),DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		/// <summary>
+		/// Gets the collection of the Bar objects associated with DotNetBarManager.
+		/// </summary>
+		[Browsable(false),DesignerSerializationVisibility(DesignerSerializationVisibility.Content)/*,DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)*/]
+		public DevComponents.DotNetBar.Bars Bars
+		{
+			get
+			{
+				return m_Bars;
+			}
+		}
+
+		[Browsable(false),DevCoBrowsable(false),EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeBars()
+		{
+			if(m_DefinitionCodeSerialize)
+				return true;
+			return false;
+		}
+
+		[Browsable(false),DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public string DefinitionName
+		{
+			get {return m_DefinitionName;}
+			set
+			{
+				m_DefinitionName=value;
+				m_DefinitionLoaded=false;
+			}
+		}
+
+		/// <summary>
+		/// Forces the loading of the definition specified in DefinitionName property.
+		/// By default definition is loaded after parent form handle has been created and form is loaded.
+		/// However, under certain circumstances you might need DotNetBar to load definition right away so
+		/// you can access bars and items. We recommend moving the code to Form Load event and leaving the loading process for DotNetBar definition as is.
+		/// </summary>
+		public void ForceDefinitionLoad()
+		{
+			if(!m_DefinitionLoaded)
+				BarStreamLoad(true);
+		}
+
+		/// <summary>
+		/// Gets whether definition is loaded.
+		/// </summary>
+		[Browsable(false),DevCoBrowsable(false)]
+		public bool IsDefinitionLoaded
+		{
+			get
+			{
+				return m_DefinitionLoaded;
+			}
+		}
+
+		[Browsable(false),DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
+		public DotNetBarStreamer BarStream
+		{
+			get
+			{
+				if(this.DefinitionName!="")
+					return null;
+				if(m_BarStreamer!=null)
+					return m_BarStreamer;
+				return new DotNetBarStreamer(this);
+			}
+			set
+			{
+				m_BarStreamer=null;
+				if(value!=null)
+				{
+					if(value.Data!=null)
+					{
+						//if(this.ParentForm!=null)
+						//	this.LoadDefinition(value.Data);
+						//else
+							m_BarStreamer=value;
+						m_DefinitionLoaded=false;
+						BarStreamLoad();
+					}
+				}
+			}
+		}
+
+		protected bool ShouldSerializeBarStream()
+		{
+			//if(m_Bars.Count==0 && m_Items.Count==0 && m_Po)
+			//	return false;
+			//if(m_Bars.Count==0 && m_Items.Count==0 && m_ContextMenus.Count==0 || this.DefinitionName!="" || )
+			return false;
+			//return true;
+		}
+
+		internal bool IsDesignTime()
+		{
+			return this.DesignMode;
+		}
+
+		/// <summary>
+		/// Gets the collection of all items that are used for end-user design-time customization.
+		/// </summary>
+		[Browsable(false)]
+		public Items Items
+		{
+			get
+			{
+				return m_Items;
+			}
+		}
+
+		/// <summary>
+		/// Gets the collection of all popup menus managed by DotNetBarManager.
+		/// </summary>
+		[Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Content), Obsolete("ContextMenus on DotNetBarManager is removed. Use ContextMenuBar control instead.")]
+		public ContextMenusCollection ContextMenus
+		{
+			get
+			{
+				return m_ContextMenus;
+			}
+		}
+
+		DockSiteInfo IOwnerBarSupport.GetDockInfo(IDockInfo pDock, int x, int y)
+		{
+			DockSiteInfo objRet=new DockSiteInfo();
+
+			// Prevent Docking if Ctrl key is pressed
+			if((Control.ModifierKeys & Keys.Control)!=0)
+				return objRet;
+
+			if(((Bar)pDock).LayoutType==eLayoutType.DockContainer)
+			{
+                if (pDock.CanDockBottom || pDock.CanDockLeft || pDock.CanDockRight || pDock.CanDockTop || pDock.CanDockDocument)
+                {
+                    if (DockingHintHandler(ref objRet, pDock, x, y))
+                        return objRet;
+                }
+                return objRet;
+			}
+
+			if(pDock.CanDockTop && m_ToolbarTopDockSite!=null)
+			{
+                objRet = m_ToolbarTopDockSite.GetDockSiteInfo(pDock, x, y);
+				if(objRet.objDockSite!=null)
+					return objRet;
+			}
+
+			if(pDock.CanDockBottom && m_ToolbarBottomDockSite!=null)
+			{
+                objRet = m_ToolbarBottomDockSite.GetDockSiteInfo(pDock, x, y);
+				if(objRet.objDockSite!=null)
+					return objRet;
+			}
+
+			if(pDock.CanDockLeft && m_ToolbarLeftDockSite!=null)
+			{
+                objRet = m_ToolbarLeftDockSite.GetDockSiteInfo(pDock, x, y);
+				if(objRet.objDockSite!=null)
+					return objRet;
+			}
+
+			if(pDock.CanDockRight && m_ToolbarRightDockSite!=null)
+			{
+                objRet = m_ToolbarRightDockSite.GetDockSiteInfo(pDock, x, y);
+				if(objRet.objDockSite!=null)
+					return objRet;
+			}
+
+			return objRet;
+		}
+
+		void IOwnerBarSupport.DockComplete()
+		{
+			CloseDockingHints();
+			m_DockingHintSetup=false;
+		}
+
+		private bool IsDocumentDockingEnabled
+		{
+			get {return (m_FillDockSite!=null);}
+		}
+
+		#region Docking Hints Support
+
+		private bool CanDockToBar(IDockInfo barDockInfo, Bar referenceBar)
+		{
+            if (!referenceBar.AcceptDropItems)
+                return false;
+
+			if(referenceBar.DockSide==eDockSide.Bottom && !barDockInfo.CanDockBottom)
+				return false;
+			if(referenceBar.DockSide==eDockSide.Left && !barDockInfo.CanDockLeft)
+				return false;
+			if(referenceBar.DockSide==eDockSide.Right && !barDockInfo.CanDockRight)
+				return false;
+			if(referenceBar.DockSide==eDockSide.Document && !barDockInfo.CanDockDocument)
+				return false;
+			if(referenceBar.DockSide==eDockSide.Top && !barDockInfo.CanDockTop)
+				return false;
+
+			return true;
+		}
+
+		private DockingHint m_DockingHintLeft=null;
+		private DockingHint m_DockingHintRight=null;
+		private DockingHint m_DockingHintTop=null;
+		private DockingHint m_DockingHintBottom=null;
+		private DockingHint m_DockingHintMiddle=null;
+		private bool m_DockingHintSetup=false;
+		private bool DockingHintHandler(ref DockSiteInfo dockInfo, IDockInfo barDockInfo, int x, int y)
+		{
+			if(!m_DockingHintSetup)
+			{
+				m_DockingHintSetup=true;
+				return true;
+			}
+			// Determine whether mouse is inside of any of our bars
+			Bar barMouseOver=null;
+			foreach(Bar bar in this.Bars)
+			{
+				if(bar.Visible && (bar!=barDockInfo || this.DesignMode || bar.DockSide==eDockSide.Document))
+				{
+					Point p=bar.PointToClient(new Point(x,y));
+					if(bar.LayoutType==eLayoutType.DockContainer && bar.ClientRectangle.Contains(p) && bar.DockSide!=eDockSide.None && CanDockToBar(barDockInfo, bar))
+					{
+						barMouseOver=bar;
+						break;
+					}
+				}
+			}
+
+			// Setup Docking Hints Windows
+			SetupDockingHintWindows(barMouseOver,barDockInfo);
+
+			bool bMiddleDockHint=false;
+			dockInfo.DockSiteZOrderIndex=-1;
+
+			eMouseOverHintSide dockHintSide=eMouseOverHintSide.None;
+			if(m_DockingHintLeft!=null)
+			{
+				dockHintSide=m_DockingHintLeft.ExMouseMove(x,y);
+			}
+			if(m_DockingHintRight!=null)
+			{
+				eMouseOverHintSide ds=m_DockingHintRight.ExMouseMove(x,y);
+				if(dockHintSide==eMouseOverHintSide.None)
+					dockHintSide=ds;
+			}
+			if(m_DockingHintTop!=null)
+			{
+				eMouseOverHintSide ds=m_DockingHintTop.ExMouseMove(x,y);
+				if(dockHintSide==eMouseOverHintSide.None)
+					dockHintSide=ds;
+			}
+			if(m_DockingHintBottom!=null)
+			{
+				eMouseOverHintSide ds=m_DockingHintBottom.ExMouseMove(x,y);
+				if(dockHintSide==eMouseOverHintSide.None)
+					dockHintSide=ds;
+			}
+			if(m_DockingHintMiddle!=null)
+			{
+				eMouseOverHintSide ds=m_DockingHintMiddle.ExMouseMove(x,y);
+				if(dockHintSide==eMouseOverHintSide.None)
+				{
+					dockHintSide=ds;
+					if(ds!=eMouseOverHintSide.None)
+						bMiddleDockHint=true;
+					if(bMiddleDockHint && this.IsDocumentDockingEnabled && barDockInfo.CanDockDocument && barMouseOver==null && barDockInfo.CanDockDocument)
+					{
+						if(!barDockInfo.CanDockTop && ds==eMouseOverHintSide.Top)
+							dockHintSide=eMouseOverHintSide.DockTab;
+						else if(!barDockInfo.CanDockBottom && ds==eMouseOverHintSide.Bottom)
+							dockHintSide=eMouseOverHintSide.DockTab;
+						else if(!barDockInfo.CanDockLeft && ds==eMouseOverHintSide.Left)
+							dockHintSide=eMouseOverHintSide.DockTab;
+						else if(!barDockInfo.CanDockRight && ds==eMouseOverHintSide.Right)
+							dockHintSide=eMouseOverHintSide.DockTab;
+					}
+				}
+			}
+			
+			dockInfo.MouseOverBar=barMouseOver;
+			if(barMouseOver==null || !bMiddleDockHint)
+			{
+				if(m_EnableFullSizeDock)
+				{
+					dockInfo.FullSizeDock=!bMiddleDockHint;
+					dockInfo.PartialSizeDock=bMiddleDockHint;
+				}
+				switch(dockHintSide)
+				{
+					case eMouseOverHintSide.Left:
+					{
+                        dockInfo.MouseOverDockSide = eDockSide.Left;
+						if(barDockInfo.DockSide!=eDockSide.Left)
+						{
+							dockInfo.DockSide=DockStyle.Left;
+                            if (bMiddleDockHint)
+                            {
+                                dockInfo.DockLine = 999;
+                                dockInfo.InsertPosition = 999;
+                            }
+                            else
+                            {
+                                dockInfo.DockLine = -1;
+                                dockInfo.InsertPosition = 0;
+                            }
+                            dockInfo.NewLine = true;
+						}
+						else
+						{
+							dockInfo.DockSide=DockStyle.Left;
+							dockInfo.DockLine=barDockInfo.DockLine;
+							dockInfo.DockOffset=barDockInfo.DockOffset;
+							dockInfo.InsertPosition=m_LeftDockSite.Controls.IndexOf(barDockInfo as Control);
+						}
+						dockInfo.objDockSite=m_LeftDockSite;
+						break;
+					}
+					case eMouseOverHintSide.Right:
+					{
+                        dockInfo.MouseOverDockSide = eDockSide.Right;
+						if(barDockInfo.DockSide!=eDockSide.Right)
+						{
+							dockInfo.DockSide=DockStyle.Right;
+                            if (bMiddleDockHint)
+                            {
+                                dockInfo.DockLine = -1;
+                                dockInfo.InsertPosition = 0;
+                            }
+                            else
+                            {
+                                dockInfo.DockLine = 999;
+                                dockInfo.InsertPosition = 999;
+                            }
+                            dockInfo.NewLine = true;
+						}
+						else
+						{
+							dockInfo.DockSide=DockStyle.Right;
+							dockInfo.DockLine=barDockInfo.DockLine;
+							dockInfo.DockOffset=barDockInfo.DockOffset;
+							dockInfo.InsertPosition=m_RightDockSite.Controls.IndexOf(barDockInfo as Control);
+						}
+						dockInfo.objDockSite=m_RightDockSite;
+						break;
+					}
+				
+					case eMouseOverHintSide.Top:
+					{
+                        dockInfo.MouseOverDockSide = eDockSide.Top;
+						if(barDockInfo.DockSide!=eDockSide.Top)
+						{
+							dockInfo.DockSide=DockStyle.Top;
+                            if (bMiddleDockHint)
+                            {
+                                dockInfo.DockLine = 999;
+                                dockInfo.InsertPosition = 999;
+                            }
+                            else
+                            {
+                                dockInfo.DockLine = -1;
+                                dockInfo.InsertPosition = 0;
+                            }
+							
+                            dockInfo.NewLine = true;
+						}
+						else
+						{
+							dockInfo.DockSide=DockStyle.Top;
+							dockInfo.DockLine=barDockInfo.DockLine;
+							dockInfo.DockOffset=barDockInfo.DockOffset;
+							dockInfo.InsertPosition=m_TopDockSite.Controls.IndexOf(barDockInfo as Control);
+						}
+						dockInfo.objDockSite=m_TopDockSite;
+						break;
+					}
+					case eMouseOverHintSide.Bottom:
+					{
+                        dockInfo.MouseOverDockSide = eDockSide.Bottom;
+						if(barDockInfo.DockSide!=eDockSide.Bottom)
+						{
+							dockInfo.DockSide=DockStyle.Bottom;
+                            if (bMiddleDockHint)
+                            {
+                                dockInfo.DockLine = -1;
+                                dockInfo.InsertPosition = 0;
+                            }
+                            else
+                            {
+                                dockInfo.DockLine = 999;
+                                dockInfo.InsertPosition = 999;
+                            }
+							dockInfo.NewLine=true;
+						}
+						else
+						{
+							dockInfo.DockSide=DockStyle.Bottom;
+							dockInfo.DockLine=barDockInfo.DockLine;
+							dockInfo.DockOffset=barDockInfo.DockOffset;
+							dockInfo.InsertPosition=m_BottomDockSite.Controls.IndexOf(barDockInfo as Control);
+						}
+						dockInfo.objDockSite=m_BottomDockSite;
+						break;
+					}
+					case eMouseOverHintSide.DockTab:
+					{
+						if(this.IsDocumentDockingEnabled)
+						{
+							dockInfo.objDockSite=m_FillDockSite;
+							dockInfo.DockSide=DockStyle.Fill;
+							dockInfo.MouseOverDockSide=eDockSide.Document;
+						}
+						break;
+					}
+				}
+			}
+			else
+			{
+				switch(dockHintSide)
+				{
+					case eMouseOverHintSide.DockTab:
+					{
+						dockInfo.MouseOverDockSide=eDockSide.Document;
+						if(barMouseOver!=null)
+						{
+							//if(((Bar)barDockInfo).TempTabBar==barMouseOver)
+							{
+								dockInfo.TabDockContainer=barMouseOver;
+								dockInfo.DockSide=barMouseOver.Parent.Dock;
+								dockInfo.objDockSite=barMouseOver.Parent as DockSite;
+							}
+//							else
+//							{
+//								if(barDockInfo.DockSide!=eDockSide.None)
+//								{
+//									dockInfo.DockSide=barMouseOver.Parent.Dock;
+//									dockInfo.objDockSite=barMouseOver.Parent as DockSite;
+//									dockInfo.DockLine=barDockInfo.DockLine;
+//									dockInfo.DockOffset=barDockInfo.DockOffset;
+//								}
+//								else
+//								{
+//									dockInfo.TabDockContainer=barMouseOver;
+//								}
+//							}
+						}
+						break;
+					}
+					case eMouseOverHintSide.Right:
+					{
+						dockInfo.MouseOverDockSide=eDockSide.Right;
+						dockInfo.DockSide=barMouseOver.Parent.Dock;
+						dockInfo.objDockSite=barMouseOver.DockedSite as DockSite;
+						switch(barMouseOver.DockSide)
+						{
+							case eDockSide.Top:
+							case eDockSide.Bottom:
+							{
+                                dockInfo.DockLine = 0; // barMouseOver.DockLine;
+								dockInfo.InsertPosition=barMouseOver.Parent.Controls.IndexOf(barMouseOver)+1;
+								dockInfo.DockOffset=barMouseOver.DockOffset+1;
+								break;
+							}
+							default:
+							{
+								dockInfo.DockLine=barMouseOver.DockLine+1;
+								dockInfo.InsertPosition=barMouseOver.Parent.Controls.IndexOf(barMouseOver);
+								dockInfo.InsertPosition++;
+								dockInfo.NewLine=true;
+								break;
+							}
+						}
+						break;
+					}
+					case eMouseOverHintSide.Left:
+					{
+						dockInfo.MouseOverDockSide=eDockSide.Left;
+						dockInfo.DockSide=barMouseOver.Parent.Dock;
+						dockInfo.objDockSite=barMouseOver.DockedSite as DockSite;
+						switch(barMouseOver.DockSide)
+						{
+							case eDockSide.Top:
+							case eDockSide.Bottom:
+							{
+                                dockInfo.DockLine = 0; // barMouseOver.DockLine;
+								dockInfo.InsertPosition=barMouseOver.Parent.Controls.IndexOf(barMouseOver);
+								dockInfo.DockOffset=barMouseOver.DockOffset-1;
+								break;
+							}
+							default:
+							{
+                                dockInfo.DockLine = 0; // barMouseOver.DockLine - 1;
+								dockInfo.InsertPosition=barMouseOver.Parent.Controls.IndexOf(barMouseOver);
+								dockInfo.NewLine=true;
+								break;
+							}
+						}
+						break;
+					}
+					case eMouseOverHintSide.Top:
+					{
+						dockInfo.MouseOverDockSide=eDockSide.Top;
+						dockInfo.DockSide=barMouseOver.Parent.Dock;
+						dockInfo.objDockSite=barMouseOver.DockedSite as DockSite;
+						switch(barMouseOver.DockSide)
+						{
+							case eDockSide.Top:
+							case eDockSide.Bottom:
+							{
+                                dockInfo.DockLine = 0; // barMouseOver.DockLine - 1;
+								dockInfo.InsertPosition=barMouseOver.Parent.Controls.IndexOf(barMouseOver);
+								dockInfo.NewLine=true;
+								break;
+							}
+							default:
+							{
+                                dockInfo.DockLine = 0;// barMouseOver.DockLine;
+								dockInfo.InsertPosition=barMouseOver.Parent.Controls.IndexOf(barMouseOver);
+								dockInfo.DockOffset=barMouseOver.DockOffset-1;
+								break;
+							}
+						}
+						break;
+					}
+					case eMouseOverHintSide.Bottom:
+					{
+						dockInfo.MouseOverDockSide=eDockSide.Bottom;
+						dockInfo.DockSide=barMouseOver.Parent.Dock;
+						dockInfo.objDockSite=barMouseOver.DockedSite as DockSite;
+						switch(barMouseOver.DockSide)
+						{
+							case eDockSide.Top:
+							case eDockSide.Bottom:
+							{
+								dockInfo.DockLine=barMouseOver.DockLine+1;
+								dockInfo.InsertPosition=barMouseOver.Parent.Controls.IndexOf(barMouseOver);
+								if(barMouseOver.DockSide==eDockSide.Bottom)
+									dockInfo.InsertPosition++;
+								dockInfo.NewLine=true;
+								break;
+							}
+							default:
+							{
+                                dockInfo.DockLine = 0; // barMouseOver.DockLine;
+								dockInfo.InsertPosition=barMouseOver.Parent.Controls.IndexOf(barMouseOver)+1;
+								dockInfo.DockOffset=barMouseOver.DockOffset+1;
+								break;
+							}
+						}
+						break;
+					}
+				}
+			}
+
+			dockInfo.UseOutline=true;
+			return true;
+		}
+
+		private bool m_ClosingHints=false;
+		private void CloseDockingHints()
+		{
+			if(m_ClosingHints)
+				return;
+			try
+			{
+				m_ClosingHints=true;
+				if(m_DockingHintLeft!=null)
+				{
+					NativeFunctions.SetWindowPos(m_DockingHintLeft.Handle,new IntPtr(NativeFunctions.HWND_TOP),0,0,0,0,NativeFunctions.SWP_HIDEWINDOW | NativeFunctions.SWP_NOACTIVATE | NativeFunctions.SWP_NOMOVE | NativeFunctions.SWP_NOSIZE);
+					m_DockingHintLeft.Close();
+					m_DockingHintLeft.Dispose();
+					m_DockingHintLeft=null;
+				}
+
+				if(m_DockingHintRight!=null)
+				{
+					NativeFunctions.SetWindowPos(m_DockingHintRight.Handle,new IntPtr(NativeFunctions.HWND_TOP),0,0,0,0,NativeFunctions.SWP_HIDEWINDOW | NativeFunctions.SWP_NOACTIVATE | NativeFunctions.SWP_NOMOVE | NativeFunctions.SWP_NOSIZE);
+					m_DockingHintRight.Close();
+					m_DockingHintRight.Dispose();
+					m_DockingHintRight=null;
+				}
+
+				if(m_DockingHintTop!=null)
+				{
+					NativeFunctions.SetWindowPos(m_DockingHintTop.Handle,new IntPtr(NativeFunctions.HWND_TOP),0,0,0,0,NativeFunctions.SWP_HIDEWINDOW | NativeFunctions.SWP_NOACTIVATE | NativeFunctions.SWP_NOMOVE | NativeFunctions.SWP_NOSIZE);
+					m_DockingHintTop.Close();
+					m_DockingHintTop.Dispose();
+					m_DockingHintTop=null;
+				}
+
+				if(m_DockingHintBottom!=null)
+				{
+					NativeFunctions.SetWindowPos(m_DockingHintBottom.Handle,new IntPtr(NativeFunctions.HWND_TOP),0,0,0,0,NativeFunctions.SWP_HIDEWINDOW | NativeFunctions.SWP_NOACTIVATE | NativeFunctions.SWP_NOMOVE | NativeFunctions.SWP_NOSIZE);
+					m_DockingHintBottom.Close();
+					m_DockingHintBottom.Dispose();
+					m_DockingHintBottom=null;
+				}
+
+				if(m_DockingHintMiddle!=null)
+				{
+					NativeFunctions.SetWindowPos(m_DockingHintMiddle.Handle,new IntPtr(NativeFunctions.HWND_TOP),0,0,0,0,NativeFunctions.SWP_HIDEWINDOW | NativeFunctions.SWP_NOACTIVATE | NativeFunctions.SWP_NOMOVE | NativeFunctions.SWP_NOSIZE);
+					m_DockingHintMiddle.Close();
+					m_DockingHintMiddle.Dispose();
+					m_DockingHintMiddle=null;
+				}
+			}
+			catch{}
+			finally
+			{
+				m_ClosingHints=false;
+			}
+		}
+
+        private eDotNetBarStyle GetEffectiveStyle()
+        {
+            if(m_Style== eDotNetBarStyle.StyleManagerControlled)
+                return StyleManager.GetEffectiveStyle();
+            return m_Style;
+        }
+        private void SetupDockingHintWindows(Bar barMouseOver, IDockInfo barDockInfo)
+		{
+			Rectangle parentFormScreenRect=Rectangle.Empty;
+			const int HINT_EDGE_OFFSET=32;
+			if(m_TopDockSite.Parent.Parent!=null)
+			{
+				parentFormScreenRect=new Rectangle(m_TopDockSite.Parent.PointToScreen(Point.Empty),m_TopDockSite.Parent.Size);
+				parentFormScreenRect.Y+=m_TopDockSite.Height;
+				parentFormScreenRect.Height-=m_TopDockSite.Height;
+			}
+			else
+			{
+				parentFormScreenRect=m_TopDockSite.Parent.Bounds;
+				parentFormScreenRect.Y+=m_TopDockSite.Height;
+				parentFormScreenRect.Height-=m_TopDockSite.Height;
+			}
+
+			if(!this.DesignMode)
+			{
+				// Left Docking Hint
+				if(barDockInfo.CanDockLeft)
+				{
+					if(m_DockingHintLeft==null)
+					{
+						m_DockingHintLeft=new DockingHint(eDockingHintSide.Left, GetEffectiveStyle());
+						m_DockingHintLeft.Location=new Point(parentFormScreenRect.X+HINT_EDGE_OFFSET,parentFormScreenRect.Y+(parentFormScreenRect.Height-m_DockingHintLeft.Height)/2);
+						m_DockingHintLeft.ShowFocusless();
+					}
+				}
+				else if(m_DockingHintLeft!=null)
+				{
+					m_DockingHintLeft.Close();
+					m_DockingHintLeft.Dispose();
+					m_DockingHintLeft=null;
+				}
+
+				// Right Docking Hint
+				if(barDockInfo.CanDockRight)
+				{
+					if(m_DockingHintRight==null)
+					{
+						m_DockingHintRight=new DockingHint(eDockingHintSide.Right, GetEffectiveStyle());
+						m_DockingHintRight.Location=new Point(parentFormScreenRect.Right-HINT_EDGE_OFFSET-m_DockingHintRight.Width,parentFormScreenRect.Y+(parentFormScreenRect.Height-m_DockingHintRight.Height)/2);
+						m_DockingHintRight.ShowFocusless();
+					}
+				}
+				else if(m_DockingHintRight!=null)
+				{
+					m_DockingHintRight.Close();
+					m_DockingHintRight.Dispose();
+					m_DockingHintRight=null;
+				}
+
+				// Top Docking Hint
+				if(barDockInfo.CanDockTop)
+				{
+					if(m_DockingHintTop==null)
+					{
+						m_DockingHintTop=new DockingHint(eDockingHintSide.Top, GetEffectiveStyle());
+						m_DockingHintTop.Location=new Point(parentFormScreenRect.X+(parentFormScreenRect.Width-m_DockingHintTop.Width)/2,parentFormScreenRect.Y+HINT_EDGE_OFFSET);
+						m_DockingHintTop.ShowFocusless();
+					}
+				}
+				else if(m_DockingHintTop!=null)
+				{
+					m_DockingHintTop.Close();
+					m_DockingHintTop.Dispose();
+					m_DockingHintTop=null;
+				}
+
+				// Bottom Docking Hint
+				if(barDockInfo.CanDockBottom)
+				{
+					if(m_DockingHintBottom==null)
+					{
+						m_DockingHintBottom=new DockingHint(eDockingHintSide.Bottom, GetEffectiveStyle());
+						m_DockingHintBottom.Location=new Point(parentFormScreenRect.X+(parentFormScreenRect.Width-m_DockingHintBottom.Width)/2,parentFormScreenRect.Bottom-HINT_EDGE_OFFSET-m_DockingHintBottom.Height);
+						m_DockingHintBottom.ShowFocusless();
+					}
+				}
+				else if(m_DockingHintBottom!=null)
+				{
+					m_DockingHintBottom.Close();
+					m_DockingHintBottom.Dispose();
+					m_DockingHintBottom=null;
+				}
+			}
+
+			// Middle docking hint
+			bool bShowMidHint=false;
+			eDockingHintSide hintSides=eDockingHintSide.All;
+			if(barMouseOver==null)
+			{
+				hintSides=eDockingHintSide.Top;
+				if(barDockInfo.CanDockBottom)
+					hintSides=eDockingHintSide.Bottom;
+				if(barDockInfo.CanDockLeft)
+					hintSides=hintSides | eDockingHintSide.Left;
+				if(barDockInfo.CanDockRight)
+					hintSides=hintSides | eDockingHintSide.Right;
+				if(barDockInfo.CanDockTop)
+					hintSides=hintSides | eDockingHintSide.Top;
+				else
+					hintSides=hintSides & ~(hintSides & eDockingHintSide.Top);
+				if(this.IsDocumentDockingEnabled && barDockInfo.CanDockDocument)
+				{
+					hintSides=eDockingHintSide.All;
+				}
+			}
+			else
+			{
+				if(!barDockInfo.CanDockTab)
+					hintSides=hintSides & ~(hintSides & eDockingHintSide.DockTab);
+			}
+			
+			if(m_DockingHintMiddle==null)
+			{
+				if(barMouseOver!=null)
+					m_DockingHintMiddle=new DockingHint(hintSides,true, GetEffectiveStyle());
+				else
+                    m_DockingHintMiddle = new DockingHint(hintSides, true, GetEffectiveStyle());
+				bShowMidHint=true;
+			}
+			else
+			{
+				if(barMouseOver!=null)
+					m_DockingHintMiddle.DockingHintSides=hintSides; // eDockingHintSide.All;
+				else
+					m_DockingHintMiddle.DockingHintSides=hintSides; //eDockingHintSide.Sides;
+			}
+
+			Point midLocation=new Point(parentFormScreenRect.X+(parentFormScreenRect.Width-m_DockingHintMiddle.Width)/2,
+				parentFormScreenRect.Y+(parentFormScreenRect.Height-m_DockingHintMiddle.Height)/2);
+
+			if(barMouseOver!=null)
+			{
+				Point p=barMouseOver.PointToScreen(Point.Empty);
+				midLocation=new Point(p.X+(barMouseOver.Width-m_DockingHintMiddle.Width)/2,
+					p.Y+(barMouseOver.Height-m_DockingHintMiddle.Height)/2);
+			}
+
+			Rectangle r=new Rectangle(midLocation,m_DockingHintMiddle.Size);
+			if(m_DockingHintLeft!=null && r.IntersectsWith(m_DockingHintLeft.Bounds))
+			{
+				if(Control.MousePosition.Y<m_DockingHintLeft.Top)
+					midLocation.Y=m_DockingHintLeft.Top-m_DockingHintMiddle.Height;
+				else
+					midLocation.Y=m_DockingHintLeft.Bottom;
+			}
+			else if(m_DockingHintRight!=null && r.IntersectsWith(m_DockingHintRight.Bounds))
+			{
+				if(Control.MousePosition.Y<m_DockingHintRight.Top)
+					midLocation.Y=m_DockingHintRight.Top-m_DockingHintMiddle.Height;
+				else
+					midLocation.Y=m_DockingHintRight.Bottom;
+			}
+			else if(m_DockingHintTop!=null && r.IntersectsWith(m_DockingHintTop.Bounds))
+			{
+				if(Control.MousePosition.X>m_DockingHintTop.Left)
+					midLocation.X=m_DockingHintTop.Right;
+				else
+					midLocation.X=m_DockingHintTop.Left-m_DockingHintMiddle.Width;
+			}
+			else if(m_DockingHintBottom!=null && r.IntersectsWith(m_DockingHintBottom.Bounds))
+			{
+				if(Control.MousePosition.X>m_DockingHintBottom.Left)
+					midLocation.X=m_DockingHintBottom.Right;
+				else
+					midLocation.X=m_DockingHintBottom.Left-m_DockingHintMiddle.Width;
+			}
+
+			if(m_DockingHintMiddle.Location!=midLocation)
+			{
+				m_DockingHintMiddle.Location=midLocation;
+			}
+
+			if(bShowMidHint)
+			{
+				m_DockingHintMiddle.ShowFocusless();
+			}
+
+		}
+		#endregion
+
+		/// <summary>
+		/// Indicates whether shortucts handled by items are dispatched to the next handler or control.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DefaultValue(false),System.ComponentModel.Category("Behavior"),System.ComponentModel.Description("Indicates whether shortucts handled by items are dispatched to the next handler or control.")]
+		public bool DispatchShortcuts
+		{
+			get {return m_DispatchShortcuts;}
+			set {m_DispatchShortcuts=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets the collection of shortcut keys that are automatically dispatched to the control that has focus even if they are handled and used by one of the items. This gives you fine control over which shortcuts are passed through the system and which ones are marked as handled by DotNetBar.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Behavior"),System.ComponentModel.Description("Indicates list of shortcut keys that are automatically dispatched to the control that has focus even if they are handled and used by one of the items."),System.ComponentModel.Editor("DevComponents.DotNetBar.Design.ShortcutsDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf",typeof(System.Drawing.Design.UITypeEditor)),System.ComponentModel.TypeConverter("DevComponents.DotNetBar.Design.ShortcutsConverter, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf"),System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Content)]
+		public ShortcutsCollection AutoDispatchShortcuts
+		{
+			get
+			{
+				return m_AutoDispatchShortcuts;
+			}
+			set
+			{
+				m_AutoDispatchShortcuts=value;
+				m_AutoDispatchShortcuts.Parent=null;
+			}
+		}
+
+		/// <summary>
+		/// Specifes the auto-hide animation speed value from 0-100. 0 value disables the animation.
+		/// </summary>
+		//[System.ComponentModel.Browsable(false),System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never),DefaultValue(100),System.ComponentModel.Category("Behavior"),System.ComponentModel.Description("Specifes the auto-hide animation speed value from 0-100. The 0 disables the animation.")]
+//		int IOwnerBarSupport.AutoHideAnimationSpeed
+//		{
+//			get {return m_AutoHideAnimationSpeed;}
+//			set
+//			{
+//				m_AutoHideAnimationSpeed=value;
+//				if(m_AutoHideAnimationSpeed<0)
+//					m_AutoHideAnimationSpeed=0;
+//				else if(m_AutoHideAnimationSpeed>100)
+//					m_AutoHideAnimationSpeed=100;
+//			}
+//		}
+
+		/// <summary>
+		/// Indicates whether Reset buttons is shown that allows end-user to reset the toolbar state.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DefaultValue(false),System.ComponentModel.Category("Behavior"),System.ComponentModel.Description("Indicates whether Reset buttons is shown that allows end-user to reset the toolbar state.")]
+		public bool ShowResetButton
+		{
+			get
+			{
+				return m_ShowResetButton;
+			}
+			set
+			{
+				m_ShowResetButton=value;
+			}
+		}
+
+		/// <summary>
+		/// ImageList for images used on Items. Images specified here will always be used on menu-items and are by default used on all Bars.
+		/// </summary>
+		[Browsable(true),DefaultValue(null),Category("Data"),Description("ImageList for images used on Items. Images specified here will always be used on menu-items and are by default used on all Bars.")]
+		public System.Windows.Forms.ImageList Images
+		{
+			get
+			{
+				return m_ImageList;
+			}
+			set
+			{
+				if(m_ImageList!=null)
+					m_ImageList.Disposed-=new EventHandler(this.ImageListDisposed);
+				m_ImageList=value;
+				if(m_ImageList!=null)
+					m_ImageList.Disposed+=new EventHandler(this.ImageListDisposed);
+			}
+		}
+
+		/// <summary>
+		/// ImageList for medium-sized images used on Items.
+		/// </summary>
+		[Browsable(true),DefaultValue(null),Category("Data"),Description("ImageList for medium-sized images used on Items.")]
+		public System.Windows.Forms.ImageList ImagesMedium
+		{
+			get
+			{
+				return m_ImageListMedium;
+			}
+			set
+			{
+				if(m_ImageListMedium!=null)
+					m_ImageListMedium.Disposed-=new EventHandler(this.ImageListDisposed);
+				m_ImageListMedium=value;
+				if(m_ImageListMedium!=null)
+					m_ImageListMedium.Disposed+=new EventHandler(this.ImageListDisposed);
+			}
+		}
+
+		/// <summary>
+		/// ImageList for large-sized images used on Items.
+		/// </summary>
+		[Browsable(true),DefaultValue(null),Category("Data"),Description("ImageList for large-sized images used on Items.")]
+		public System.Windows.Forms.ImageList ImagesLarge
+		{
+			get
+			{
+				return m_ImageListLarge;
+			}
+			set
+			{
+				if(m_ImageListLarge!=null)
+					m_ImageListLarge.Disposed-=new EventHandler(this.ImageListDisposed);
+				m_ImageListLarge=value;
+				if(m_ImageListLarge!=null)
+					m_ImageListLarge.Disposed+=new EventHandler(this.ImageListDisposed);
+			}
+		}
+
+		/// <summary>
+		/// Suspends the bar layout for all bars.
+		/// </summary>
+		[System.ComponentModel.Browsable(false),DefaultValue(false)]
+		public bool SuspendLayout
+		{
+			get
+			{
+				return m_SuspendLayout;
+			}
+			set
+			{
+				if(m_SuspendLayout!=value)
+				{
+					m_SuspendLayout=value;
+					if(!m_SuspendLayout)
+					{
+						if(m_TopDockSite!=null && m_TopDockSite.NeedsLayout)
+							m_TopDockSite.RecalcLayout();
+						if(m_BottomDockSite!=null && m_BottomDockSite.NeedsLayout)
+							m_BottomDockSite.RecalcLayout();
+						if(m_LeftDockSite!=null && m_LeftDockSite.NeedsLayout)
+							m_LeftDockSite.RecalcLayout();
+						if(m_RightDockSite!=null && m_RightDockSite.NeedsLayout)
+							m_RightDockSite.RecalcLayout();
+						if(m_FillDockSite!=null && m_FillDockSite.NeedsLayout)
+							m_FillDockSite.RecalcLayout();
+
+                        if (m_ToolbarTopDockSite != null && m_ToolbarTopDockSite.NeedsLayout)
+                            m_ToolbarTopDockSite.RecalcLayout();
+                        if (m_ToolbarBottomDockSite != null && m_ToolbarBottomDockSite.NeedsLayout)
+                            m_ToolbarBottomDockSite.RecalcLayout();
+                        if (m_ToolbarLeftDockSite != null && m_ToolbarLeftDockSite.NeedsLayout)
+                            m_ToolbarLeftDockSite.RecalcLayout();
+                        if (m_ToolbarRightDockSite != null && m_ToolbarRightDockSite.NeedsLayout)
+                            m_ToolbarRightDockSite.RecalcLayout();
+					}
+				}
+			}
+		}
+
+		/// <summary>
+		/// Specifes whether drop shadow is displayed for Menus and pop-up Bars. OfficeXP Style only.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DefaultValue(eMenuDropShadow.SystemDefault),System.ComponentModel.Category("Behavior"),System.ComponentModel.Description("Specifes whether drop shadow is displayed for Menus and pop-up Bars. OfficeXP Style only.")]
+		public eMenuDropShadow MenuDropShadow
+		{
+			get
+			{
+				return m_MenuDropShadow;
+			}
+			set
+			{
+				m_MenuDropShadow=value;
+			}
+		}
+
+		/// <summary>
+		/// Specifes whether to use Alpha-Blending shadows for pop-up items if supported by target OS. Disabling Alpha-Blended shadows can improve performance.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DefaultValue(true),System.ComponentModel.Category("Behavior"),System.ComponentModel.Description("Specifes whether to use Alpha-Blending shadows for pop-up items if supported by target OS. Disabling Alpha-Blended shadows can improve performance.")]
+		public bool AlphaBlendShadow
+		{
+			get
+			{
+				return m_AlphaBlendShadow;
+			}
+			set
+			{
+				m_AlphaBlendShadow=value;
+			}
+		}
+
+		private bool m_DisabledImagesGrayScale=true;
+		/// <summary>
+		/// Gets or sets whether gray-scale algorithm is used to create automatic gray-scale images. Default is true.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DefaultValue(true),System.ComponentModel.Category("Appearance"),Description("Gets or sets whether gray-scale algorithm is used to create automatic gray-scale images.")]
+		public bool DisabledImagesGrayScale
+		{
+			get
+			{
+				return m_DisabledImagesGrayScale;
+			}
+			set
+			{
+				m_DisabledImagesGrayScale=value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets whether hooks are used for internal DotNetBar system functionality. Using hooks is recommended only if DotNetBar is used in hybrid environments like Visual Studio designers or IE.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DefaultValue(false),System.ComponentModel.Category("Behavior"),System.ComponentModel.Description("Gets or sets whether hooks are used for internal DotNetBar system functionality. Using hooks is recommended only if DotNetBar is used in hybrid environments like Visual Studio designers or IE.")]
+		public bool UseHook
+		{
+			get
+			{
+				return m_UseHook;
+			}
+			set
+			{
+				if(m_UseHook==value)
+					return;
+				m_UseHook=value;
+				
+				if(m_ParentForm==null)
+					return;
+
+				if(m_UseHook)
+				{
+					if(m_FilterInstalled)
+						MessageHandler.UnregisterMessageClient(this);
+						//Application.RemoveMessageFilter(this);
+					m_FilterInstalled=false;
+					if(m_Hook==null)
+						m_Hook=new Hook(this);
+				}
+				else
+				{
+					if(m_Hook!=null)
+					{
+						m_Hook.Dispose();
+						m_Hook=null;
+					}
+					if(!this.DesignMode)
+					{
+						if(!m_FilterInstalled)
+							MessageHandler.RegisterMessageClient(this);
+							//Application.AddMessageFilter(this);
+						m_FilterInstalled=true;
+					}
+				}
+			}
+		}
+
+		bool IOwnerMenuSupport.ShowPopupShadow
+		{
+			get
+			{
+				if(m_MenuDropShadow==eMenuDropShadow.Show)
+					return true;
+				else if(m_MenuDropShadow==eMenuDropShadow.Hide)
+					return false;
+				// W2K and gang
+				if(Environment.OSVersion.Version.Major==5 && Environment.OSVersion.Version.Minor<1 || Environment.OSVersion.Version.Major<5)
+					return true;
+				
+				return NativeFunctions.ShowDropShadow;
+			}
+		}
+
+		/// <summary>
+		/// Loads DotNetBar definition from file.
+		/// </summary>
+		/// <param name="FileName">File that contains DotNetBar defintion.</param>
+		public void LoadDefinition(string FileName)
+		{
+			System.Xml.XmlDocument xmlDoc=new System.Xml.XmlDocument();
+			xmlDoc.Load(FileName);
+			LoadDefinition(xmlDoc);
+			
+		}
+
+        private Hashtable GetDockControls()
+        {
+            Hashtable h = new Hashtable();
+            foreach (Bar bar in this.Bars)
+            {
+                if (bar.LayoutType != eLayoutType.DockContainer)
+                    continue;
+                foreach (BaseItem item in bar.Items)
+                {
+                    if (item.Name !="" && item is DockContainerItem)
+                    {
+                        DockContainerItem dock = item as DockContainerItem;
+                        if (dock.Control != null)
+                        {
+                            try
+                            {
+                                h.Add(dock.Name, dock.Control);
+                                dock.Control = null;
+                            }
+                            catch { }
+                        }
+                    }
+                }
+            }
+            if (h.Keys.Count == 0)
+                return null;
+            return h;
+        }
+
+		internal void LoadDefinition(System.Xml.XmlDocument xmlDoc)
+		{
+            System.Xml.XmlElement xmlDotNetBar=xmlDoc.FirstChild as System.Xml.XmlElement;
+
+            // Do not load old uncompatible definitions
+            if (xmlDotNetBar != null && (!xmlDotNetBar.HasAttribute(DocumentSerializationXml.Version) ||
+               XmlConvert.ToInt32(xmlDotNetBar.GetAttribute(DocumentSerializationXml.Version)) < 6))
+                return;
+
+			bool bSuspendLayout=false;
+
+            // Creates serialization context
+            ItemSerializationContext context = new ItemSerializationContext();
+            context.Serializer = this;
+            context.HasDeserializeItemHandlers = ((ICustomSerialization)this).HasDeserializeItemHandlers;
+            context.HasSerializeItemHandlers = ((ICustomSerialization)this).HasSerializeItemHandlers;
+
+            // Cache content of DockContainerItem objects so it can be loaded by new definition if they match
+            context.DockControls = GetDockControls();
+
+			try
+			{
+				m_LoadingDefinition=true;
+
+				if(!this.SuspendLayout)
+				{
+					bSuspendLayout=true;
+					this.SuspendLayout=true;
+				}
+
+				try
+				{
+					IgnoreLoadedControlDispose=true;
+					m_Items.Clear();
+					if(m_IncludeDockDocumentsInDefinition)
+						m_Bars.Clear();
+					else
+						m_Bars.ClearNonDocumentBars();
+					m_ContextMenus.Clear();
+					m_ShortcutTable.Clear();
+				}
+				finally
+				{
+					IgnoreLoadedControlDispose=false;
+				}
+				
+				// Destroy auto-hide sites
+				DestroyAutoHidePanels();			
+
+				if(xmlDotNetBar==null)
+				{
+					if(bSuspendLayout)
+						this.SuspendLayout=false;
+					return;
+				}
+
+				if(xmlDotNetBar.Name!="dotnetbar")
+					throw new System.InvalidOperationException("Invalid file format (dotnetbar).");
+
+//				if(xmlDotNetBar.HasAttribute("zorder"))
+//					RestoreDockSiteZOrder(xmlDotNetBar.GetAttribute("zorder"));
+			
+				// Load user defined settings
+				if(xmlDotNetBar.HasAttribute("fullmenus"))
+					m_AlwaysShowFullMenus=System.Xml.XmlConvert.ToBoolean(xmlDotNetBar.GetAttribute("fullmenus"));
+				else
+					m_AlwaysShowFullMenus=false;
+				if(xmlDotNetBar.HasAttribute("fullmenushover"))
+					m_ShowFullMenusOnHover=System.Xml.XmlConvert.ToBoolean(xmlDotNetBar.GetAttribute("fullmenushover"));
+				else
+					m_ShowFullMenusOnHover=true;
+				if(xmlDotNetBar.HasAttribute("tooltips"))
+					m_ShowToolTips=System.Xml.XmlConvert.ToBoolean(xmlDotNetBar.GetAttribute("tooltips"));
+				else
+					m_ShowToolTips=true;
+				if(xmlDotNetBar.HasAttribute("scintooltip"))
+					m_ShowShortcutKeysInToolTips=System.Xml.XmlConvert.ToBoolean(xmlDotNetBar.GetAttribute("scintooltip"));
+				else
+					m_ShowShortcutKeysInToolTips=false;
+				if(xmlDotNetBar.HasAttribute("animation"))
+				{
+					if((ePopupAnimation)System.Xml.XmlConvert.ToInt32(xmlDotNetBar.GetAttribute("animation"))!=ePopupAnimation.SystemDefault)
+						m_PopupAnimation=(ePopupAnimation)System.Xml.XmlConvert.ToInt32(xmlDotNetBar.GetAttribute("animation"));
+				}
+				else
+					m_PopupAnimation=ePopupAnimation.SystemDefault;
+				
+				foreach(System.Xml.XmlElement xmlElem in xmlDotNetBar.ChildNodes)
+				{
+					if(xmlElem.Name=="items")
+					{
+						foreach(System.Xml.XmlElement xmlItem in xmlElem.ChildNodes)
+						{
+							BaseItem objItem=BarFunctions.CreateItemFromXml(xmlItem);
+							if(objItem==null)
+								throw new System.InvalidOperationException("Invalid Item in file found ("+BarFunctions.GetItemErrorInfo(xmlItem)+").");
+							// Do not change this order. Item should be Deserialized first and then added to the items
+							// collection. See GlobalItem property for performace reasons...
+                            context.ItemXmlElement = xmlItem;
+							objItem.Deserialize(context);
+							m_Items.Add(objItem);
+						}
+					}
+					else if(xmlElem.Name=="bars")
+					{
+						foreach(System.Xml.XmlElement xmlBar in xmlElem.ChildNodes)
+						{
+							DevComponents.DotNetBar.Bar bar=new DevComponents.DotNetBar.Bar();
+							bar.Visible=false;
+							bar.SetDesignMode(this.DesignMode);
+							m_Bars.Add(bar);
+							bar.Deserialize(xmlBar);
+							IOwnerBarSupport ownersupport=this as IOwnerBarSupport;
+							ownersupport.AddShortcutsFromBar(bar);
+						}
+					}
+					else if(xmlElem.Name=="popups")
+					{
+						foreach(System.Xml.XmlElement xmlItem in xmlElem.ChildNodes)
+						{
+							BaseItem objItem=BarFunctions.CreateItemFromXml(xmlItem);
+							if(objItem==null)
+								throw new System.InvalidOperationException("Invalid Item in file found ("+BarFunctions.GetItemErrorInfo(xmlItem)+").");
+							// Do not change this order. Item should be Deserialized first and then added to the items
+							// collection. See GlobalItem property for performace reasons...
+                            context.ItemXmlElement = xmlItem;
+							objItem.Deserialize(context);
+							m_ContextMenus.Add(objItem);
+						}
+					}
+					else if(xmlElem.Name==DocumentSerializationXml.Documents && m_IncludeDockDocumentsInDefinition)
+					{
+                        context.ItemXmlElement = xmlElem;
+						if(m_FillDockSite!=null)
+							m_FillDockSite.GetDocumentUIManager().DeserializeDefinition(context);
+					}
+                    else if (xmlElem.Name == DocumentSerializationXml.DockSite)
+                    {
+                        context.ItemXmlElement = xmlElem;
+
+                        DockStyle dockingSide = (DockStyle)Enum.Parse(typeof(DockStyle), xmlElem.GetAttribute(DocumentSerializationXml.DockingSide));
+                        if (dockingSide == DockStyle.Left)
+                        {
+                            if (m_LeftDockSite != null) m_LeftDockSite.GetDocumentUIManager().DeserializeDefinition(context);
+                        }
+                        else if (dockingSide == DockStyle.Right)
+                        {
+                            if (m_RightDockSite != null) m_RightDockSite.GetDocumentUIManager().DeserializeDefinition(context);
+                        }
+                        else if (dockingSide == DockStyle.Top)
+                        {
+                            if (m_TopDockSite != null) m_TopDockSite.GetDocumentUIManager().DeserializeDefinition(context);
+                        }
+                        else if (dockingSide == DockStyle.Bottom)
+                        {
+                            if (m_BottomDockSite != null) m_BottomDockSite.GetDocumentUIManager().DeserializeDefinition(context);
+                        }
+                    }
+				}
+			}
+			finally
+			{
+				m_LoadingDefinition=false;
+				if(bSuspendLayout) this.SuspendLayout=false;
+			}
+
+            if (context.DockControls != null && context.DockControls.Count > 0)
+            {
+                foreach (Control c in context.DockControls.Values)
+                    c.Dispose();
+            }
+
+			((IOwner)this).InvokeDefinitionLoaded(this,new EventArgs());
+
+			if(m_ActiveMdiChild!=null && m_MdiChildMaximized)
+			{
+				m_MdiChildMaximized=false;
+                this.OnMdiChildResize(m_ActiveMdiChild,new EventArgs());
+			}
+        }
+
+        #region ICustomSerialization Implementation
+        /// <summary>
+        /// Invokes SerializeItem event.
+        /// </summary>
+        /// <param name="e">Provides data for the event.</param>
+        void ICustomSerialization.InvokeSerializeItem(SerializeItemEventArgs e)
+        {
+            if (SerializeItem != null)
+                SerializeItem(this, e);
+        }
+
+        /// <summary>
+        /// Invokes DeserializeItem event.
+        /// </summary>
+        /// <param name="e">Provides data for the event.</param>
+        void ICustomSerialization.InvokeDeserializeItem(SerializeItemEventArgs e)
+        {
+            if (DeserializeItem != null)
+                DeserializeItem(this, e);
+        }
+
+        /// <summary>
+        /// Gets whether any handlers have been defined for SerializeItem event. If no handles have been defined to optimize performance SerializeItem event will not be attempted to fire.
+        /// </summary>
+        bool ICustomSerialization.HasSerializeItemHandlers
+        {
+            get
+            {
+                return SerializeItem != null;
+            }
+        }
+
+        /// <summary>
+        /// Gets whether any handlers have been defined for DeserializeItem event. If no handles have been defined to optimize performance DeserializeItem event will not be attempted to fire.
+        /// </summary>
+        bool ICustomSerialization.HasDeserializeItemHandlers
+        {
+            get
+            {
+                return DeserializeItem != null;
+            }
+        }
+        #endregion
+
+        /// <summary>
+		/// Returns whether definition is being currently loaded.
+		/// </summary>
+		internal bool IsLoadingDefinition
+		{
+			get {return m_LoadingDefinition;}
+		}
+
+		/// <summary>
+		/// Gets or sets whether document bars are saved in definition file. Default value is false which means that document
+		/// bars are not saved as part of definition file. You can set this value to true to save document bar to definition file and 
+		/// be able to load them.
+		/// </summary>
+		/// <remarks>
+		/// Note that by default Document bars that you created during design-time get member
+		/// variables assigned to them by Windows Forms designer. If you decide to save definition
+		/// of such bars and load definition back member variables will not point to correct bar
+		/// instances since loading definition recreates all bars from scratch. You should always
+		/// use Bars collection to access bars when saving and loading definitions.
+		/// </remarks>
+		[Browsable(false),DefaultValue(false)]
+		public bool IncludeDockDocumentsInDefinition
+		{
+			get {return m_IncludeDockDocumentsInDefinition;}
+			set {m_IncludeDockDocumentsInDefinition=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets the DotNetBar definition string.
+		/// </summary>
+		[Browsable(false),DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public string Definition
+		{
+			get
+			{
+				System.Xml.XmlDocument xmlDoc=new System.Xml.XmlDocument();
+				SaveDefinition(xmlDoc);
+				return xmlDoc.OuterXml;
+			}
+			set
+			{
+				System.Xml.XmlDocument xmlDoc=new System.Xml.XmlDocument();
+				xmlDoc.LoadXml(value);
+				LoadDefinition(xmlDoc);
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the DotNetBar layout string.
+		/// </summary>
+		[Browsable(false),DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public string LayoutDefinition
+		{
+			get
+			{
+				System.Xml.XmlDocument xmlDoc=new System.Xml.XmlDocument();
+				SaveLayout(xmlDoc);
+				return xmlDoc.OuterXml;
+			}
+			set
+			{
+				System.Xml.XmlDocument xmlDoc=new System.Xml.XmlDocument();
+				xmlDoc.LoadXml(value);
+				LoadLayout(xmlDoc);
+			}
+		}
+
+		/// <summary>
+		/// Saves current DotNetBar definition and state to the file.
+		/// </summary>
+		/// <param name="FileName">File name.</param>
+		public void SaveDefinition(string FileName)
+		{
+			System.Xml.XmlDocument xmlDoc=new System.Xml.XmlDocument();
+			SaveDefinition(xmlDoc);
+			xmlDoc.Save(FileName);
+		}
+
+		internal void SaveDefinition(System.Xml.XmlDocument xmlDoc)
+		{
+            // Creates serialization context
+            ItemSerializationContext context = new ItemSerializationContext();
+            context.Serializer = this;
+            context.HasDeserializeItemHandlers = ((ICustomSerialization)this).HasDeserializeItemHandlers;
+            context.HasSerializeItemHandlers = ((ICustomSerialization)this).HasSerializeItemHandlers;
+
+			// Save first items from categories
+			System.Xml.XmlElement xmlDotNetBar=xmlDoc.CreateElement("dotnetbar");
+            xmlDotNetBar.SetAttribute(DocumentSerializationXml.Version, "6");
+			xmlDoc.AppendChild(xmlDotNetBar);
+
+			// Save user settings
+			xmlDotNetBar.SetAttribute("fullmenus",System.Xml.XmlConvert.ToString(m_AlwaysShowFullMenus));
+			xmlDotNetBar.SetAttribute("fullmenushover",System.Xml.XmlConvert.ToString(m_ShowFullMenusOnHover));
+			xmlDotNetBar.SetAttribute("tooltips",System.Xml.XmlConvert.ToString(m_ShowToolTips));
+			xmlDotNetBar.SetAttribute("scintooltip",System.Xml.XmlConvert.ToString(m_ShowShortcutKeysInToolTips));
+			xmlDotNetBar.SetAttribute("animation",System.Xml.XmlConvert.ToString((int)m_PopupAnimation));
+
+			System.Xml.XmlElement xmlItems=xmlDoc.CreateElement("items");
+			xmlDotNetBar.AppendChild(xmlItems);
+
+			foreach(DictionaryEntry o in m_Items)
+			{
+				BaseItem objItem=o.Value as BaseItem;
+				System.Xml.XmlElement xmlItem=xmlDoc.CreateElement("item");
+				xmlItems.AppendChild(xmlItem);
+                context.ItemXmlElement = xmlItem;
+				objItem.Serialize(context);
+			}
+
+			// Go through the Bars and serialize each
+			System.Xml.XmlElement xmlBars=xmlDoc.CreateElement("bars");
+			xmlDotNetBar.AppendChild(xmlBars);
+			
+			// Serialize docked bars
+			if(m_TopDockSite!=null)
+                SerializeDockSite(m_TopDockSite, xmlDotNetBar);
+			if(m_BottomDockSite!=null)
+                SerializeDockSite(m_BottomDockSite, xmlDotNetBar);
+			if(m_LeftDockSite!=null)
+                SerializeDockSite(m_LeftDockSite, xmlDotNetBar);
+			if(m_RightDockSite!=null)
+                SerializeDockSite(m_RightDockSite, xmlDotNetBar);
+			if(m_IncludeDockDocumentsInDefinition && m_FillDockSite!=null)
+                SerializeDockSite(m_FillDockSite,xmlDotNetBar);
+
+            // Serialize toolbars bars
+            if (m_ToolbarTopDockSite != null)
+                SerializeDockSite(m_ToolbarTopDockSite, xmlBars);
+            if (m_ToolbarBottomDockSite != null)
+                SerializeDockSite(m_ToolbarBottomDockSite, xmlBars);
+            if (m_ToolbarLeftDockSite != null)
+                SerializeDockSite(m_ToolbarLeftDockSite, xmlBars);
+            if (m_ToolbarRightDockSite != null)
+                SerializeDockSite(m_ToolbarRightDockSite, xmlBars);
+
+			// Serialize floating bars
+			foreach(DevComponents.DotNetBar.Bar bar in m_Bars)
+			{
+				if(bar.DockSide==eDockSide.None)
+				{
+					System.Xml.XmlElement xmlBar=xmlDoc.CreateElement("bar");
+					xmlBars.AppendChild(xmlBar);
+					bar.Serialize(xmlBar);
+				}
+			}
+
+			// Serialize any popup items...
+			System.Xml.XmlElement xmlPopups=xmlDoc.CreateElement("popups");
+			xmlDotNetBar.AppendChild(xmlPopups);
+			foreach(BaseItem objItem in m_ContextMenus)
+			{
+				System.Xml.XmlElement xmlItem=xmlDoc.CreateElement("item");
+				xmlPopups.AppendChild(xmlItem);
+                context.ItemXmlElement = xmlItem;
+				objItem.Serialize(context);
+			}
+		}
+
+		/// <summary>
+		/// Loads DotNetBar layout from file.
+		/// </summary>
+		/// <param name="FileName">File that contains DotNetBar defintion.</param>
+		public void LoadLayout(string FileName)
+		{
+			System.Xml.XmlDocument xmlDoc=new System.Xml.XmlDocument();
+			xmlDoc.Load(FileName);
+			LoadLayout(xmlDoc);
+			
+		}
+
+		internal void LoadLayout(System.Xml.XmlDocument xmlDoc)
+		{
+            System.Xml.XmlElement xmlDotNetBar = xmlDoc.FirstChild as System.Xml.XmlElement;
+            if (xmlDotNetBar == null || !xmlDotNetBar.HasAttribute(DocumentSerializationXml.Version) ||
+                XmlConvert.ToInt32(xmlDotNetBar.GetAttribute(DocumentSerializationXml.Version))<6)
+                return;
+
+			// Destroy auto-hide sites
+			DestroyAutoHidePanels();
+			
+			bool bSuspendLayout=false;
+            m_LoadingLayout = true;
+
+			try
+			{
+				if(xmlDotNetBar.Name!="dotnetbarlayout")
+					throw new System.InvalidOperationException("Invalid file format (dotnetbarlayout expected).");
+
+				if(!this.SuspendLayout)
+				{
+					bSuspendLayout=true;
+					this.SuspendLayout=true;
+				}
+			    foreach (System.Xml.XmlElement xmlElem in xmlDotNetBar.ChildNodes)
+			    {
+			        if (xmlElem.Name == "bars")
+			        {
+			            foreach (System.Xml.XmlElement xmlBar in xmlElem.ChildNodes)
+			            {
+			                if (xmlBar.Name != "bar")
+			                    continue;
+
+			                DevComponents.DotNetBar.Bar bar = null;
+			                if (m_Bars.Contains(m_Bars[xmlBar.GetAttribute("name")]))
+			                    bar = m_Bars[xmlBar.GetAttribute("name")];
+			                else
+			                {
+			                    bar = new Bar();
+			                    this.Bars.Add(bar);
+			                }
+			                bar.DeserializeLayout(xmlBar);
+			            }
+			        }
+			    }
+			    foreach (System.Xml.XmlElement xmlElem in xmlDotNetBar.ChildNodes)
+				{
+					if(xmlElem.Name==DocumentSerializationXml.Documents)
+					{
+						if(m_FillDockSite!=null)
+							m_FillDockSite.GetDocumentUIManager().DeserializeLayout(xmlElem);
+					}
+                    else if (xmlElem.Name == DocumentSerializationXml.DockSite)
+                    {
+                        DockStyle dockingSide = (DockStyle)Enum.Parse(typeof(DockStyle), xmlElem.GetAttribute(DocumentSerializationXml.DockingSide));
+                        if (dockingSide == DockStyle.Left)
+                        {
+                            if (m_LeftDockSite != null) m_LeftDockSite.GetDocumentUIManager().DeserializeLayout(xmlElem);
+                        }
+                        else if (dockingSide == DockStyle.Right)
+                        {
+                            if (m_RightDockSite != null) m_RightDockSite.GetDocumentUIManager().DeserializeLayout(xmlElem);
+                        }
+                        else if (dockingSide == DockStyle.Top)
+                        {
+                            if (m_TopDockSite != null) m_TopDockSite.GetDocumentUIManager().DeserializeLayout(xmlElem);
+                        }
+                        else if (dockingSide == DockStyle.Bottom)
+                        {
+                            if (m_BottomDockSite != null) m_BottomDockSite.GetDocumentUIManager().DeserializeLayout(xmlElem);
+                        }
+                    }
+				}
+                if (xmlDotNetBar.HasAttribute("zorder"))
+                    RestoreDockSiteZOrder(xmlDotNetBar.GetAttribute("zorder"));
+
+                // Clean up custom created empty bars
+                Bar[] bars = new Bar[m_Bars.Count];
+                m_Bars.CopyTo(bars);
+                foreach (Bar bar in bars)
+                {
+                    if (bar.CustomBar && bar.Items.Count == 0)
+                    {
+                        bar.Visible = false;
+                        this.Bars.Remove(bar);
+                        bar.Dispose();
+                    }
+                }
+			}
+			finally
+			{
+				if(bSuspendLayout) this.SuspendLayout=false;
+                m_LoadingLayout = false;
+			}
+
+			if(m_ActiveMdiChild!=null && m_MdiChildMaximized)
+			{
+				m_MdiChildMaximized=false;
+				this.OnMdiChildResize(m_ActiveMdiChild,new EventArgs());
+			}
+		}
+
+        /// <summary>
+        /// Gets whether DotNetBarManager is loading layout.
+        /// </summary>
+        [Browsable(false)]
+        public bool IsLoadingLayout
+        {
+            get { return m_LoadingLayout; }
+        }
+
+		/// <summary>
+		/// Saves current DotNetBar layout to the file.
+		/// </summary>
+		/// <param name="FileName">File name.</param>
+		public void SaveLayout(string FileName)
+		{
+			System.Xml.XmlDocument xmlDoc=new System.Xml.XmlDocument();
+			SaveLayout(xmlDoc);
+			xmlDoc.Save(FileName);
+		}
+
+		internal void SaveLayout(System.Xml.XmlDocument xmlDoc)
+		{
+			// Save first items from categories
+			System.Xml.XmlElement xmlDotNetBar=xmlDoc.CreateElement("dotnetbarlayout");
+            xmlDotNetBar.SetAttribute(DocumentSerializationXml.Version, "6");
+			xmlDoc.AppendChild(xmlDotNetBar);
+			xmlDotNetBar.SetAttribute("zorder",GetDockSitesZOrder());
+			
+			// Serialize docked bars
+			if(m_TopDockSite!=null)
+                SerializeDockSiteLayout(m_TopDockSite, xmlDotNetBar);
+			if(m_BottomDockSite!=null)
+                SerializeDockSiteLayout(m_BottomDockSite, xmlDotNetBar);
+			if(m_LeftDockSite!=null)
+                SerializeDockSiteLayout(m_LeftDockSite, xmlDotNetBar);
+			if(m_RightDockSite!=null)
+                SerializeDockSiteLayout(m_RightDockSite, xmlDotNetBar);
+			if(m_FillDockSite!=null)
+                SerializeDockSiteLayout(m_FillDockSite, xmlDotNetBar);
+
+            // Go through the Bars and serialize each
+            System.Xml.XmlElement xmlBars = xmlDoc.CreateElement("bars");
+            xmlDotNetBar.AppendChild(xmlBars);
+			
+            // Serialize Toolbars
+            if (m_ToolbarTopDockSite != null)
+                SerializeDockSiteLayout(m_ToolbarTopDockSite, xmlBars);
+            if (m_ToolbarBottomDockSite != null)
+                SerializeDockSiteLayout(m_ToolbarBottomDockSite, xmlBars);
+            if (m_ToolbarLeftDockSite != null)
+                SerializeDockSiteLayout(m_ToolbarLeftDockSite, xmlBars);
+            if (m_ToolbarRightDockSite != null)
+                SerializeDockSiteLayout(m_ToolbarRightDockSite, xmlBars);
+
+			// Serialize floating bars
+			foreach(DevComponents.DotNetBar.Bar bar in m_Bars)
+			{
+				if(bar.DockSide==eDockSide.None && bar.Name!="" && bar.SaveLayoutChanges)
+				{
+					System.Xml.XmlElement xmlBar=xmlDoc.CreateElement("bar");
+					xmlBars.AppendChild(xmlBar);
+					bar.SerializeLayout(xmlBar);
+				}
+			}
+		}
+
+		private string GetDockSitesZOrder()
+		{
+			string s="";
+			if(m_TopDockSite!=null && m_TopDockSite.Parent!=null)
+				s+=m_TopDockSite.Parent.Controls.IndexOf(m_TopDockSite);
+			s+=",";
+			if(m_BottomDockSite!=null && m_BottomDockSite.Parent!=null)
+				s+=m_BottomDockSite.Parent.Controls.IndexOf(m_BottomDockSite);
+			s+=",";
+			if(m_LeftDockSite!=null && m_LeftDockSite.Parent!=null)
+				s+=m_LeftDockSite.Parent.Controls.IndexOf(m_LeftDockSite);
+			s+=",";
+			if(m_RightDockSite!=null)
+				s+=m_RightDockSite.Parent.Controls.IndexOf(m_RightDockSite);
+			return s;
+		}
+
+		private void RestoreDockSiteZOrder(string s)
+		{
+			try
+			{
+				string[] sa=s.Split(',');
+				if(sa[0]!="" && m_TopDockSite!=null && m_TopDockSite.Parent!=null)
+					m_TopDockSite.Parent.Controls.SetChildIndex(m_TopDockSite,int.Parse(sa[0]));
+
+				if(sa[1]!="" && m_BottomDockSite!=null && m_BottomDockSite.Parent!=null)
+					m_BottomDockSite.Parent.Controls.SetChildIndex(m_BottomDockSite,int.Parse(sa[1]));
+
+				if(sa[2]!="" && m_LeftDockSite!=null && m_LeftDockSite.Parent!=null)
+					m_LeftDockSite.Parent.Controls.SetChildIndex(m_LeftDockSite,int.Parse(sa[2]));
+
+				if(sa[3]!="" && m_RightDockSite!=null && m_RightDockSite.Parent!=null)
+					m_RightDockSite.Parent.Controls.SetChildIndex(m_RightDockSite,int.Parse(sa[3]));
+			}
+			catch{}
+		}
+
+		private void SerializeDockSite(DockSite site, System.Xml.XmlElement xmlBars)
+		{
+			if(site.IsDocumentDock || site.DocumentDockContainer != null)
+			{
+				site.GetDocumentUIManager().SerializeDefinition(xmlBars);
+			}
+			else
+			{
+				foreach(Control ctrl in site.Controls)
+				{
+					DevComponents.DotNetBar.Bar bar=ctrl as DevComponents.DotNetBar.Bar;
+					if(bar!=null)
+					{
+						System.Xml.XmlElement xmlBar=xmlBars.OwnerDocument.CreateElement("bar");
+						xmlBars.AppendChild(xmlBar);
+						bar.Serialize(xmlBar);
+					}
+				}
+			}
+		}
+
+		private void SerializeDockSiteLayout(DockSite site, System.Xml.XmlElement xmlBars)
+		{
+			if(site.IsDocumentDock || site.DocumentDockContainer!=null)
+			{
+				site.GetDocumentUIManager().SerializeLayout(xmlBars);
+			}
+			else
+			{
+				foreach(Control ctrl in site.Controls)
+				{
+					DevComponents.DotNetBar.Bar bar=ctrl as DevComponents.DotNetBar.Bar;
+					if(bar!=null && bar.Name!="" && bar.SaveLayoutChanges)
+					{
+						System.Xml.XmlElement xmlBar=xmlBars.OwnerDocument.CreateElement("bar");
+						xmlBars.AppendChild(xmlBar);
+						bar.SerializeLayout(xmlBar);
+					}
+				}
+			}
+		}
+
+		internal void SetFloatingBarVisible(bool bVisible)
+		{
+			foreach(Bar bar in m_Bars)
+			{
+				if(bar.DockSide==eDockSide.None && bar.Visible!=bVisible)
+					bar.Visible=bVisible;
+			}
+		}
+
+        private bool m_AutoCreatedCategories = false;
+		/// <summary>
+		/// Invokes the DotNetBar Customize dialog.
+		/// </summary>
+		public void Customize()
+		{
+			// Disable all child controls on parent form
+			if(m_DisabledControls==null)
+				m_DisabledControls=new ArrayList();
+
+			Form objParent=m_ParentForm.TopLevelControl as Form;
+			if(objParent==null)
+				objParent=this.ParentForm;
+			foreach(Control objCtrl in objParent.Controls)
+			{
+				if(!(objCtrl is DockSite) && objCtrl.Enabled)
+				{
+					objCtrl.Enabled=false;
+					m_DisabledControls.Add(objCtrl);
+				}
+			}
+
+			m_Customizing=true;
+
+            if (this.Items.Count == 0)
+            {
+                m_AutoCreatedCategories = true;
+                RescanCategories();
+            }
+
+			if(!m_UseCustomCustomizeDialog)
+			{
+				if(m_frmCustomize==null)
+					m_frmCustomize=new frmCustomize(this);
+				if(EnterCustomize!=null)
+					EnterCustomize(m_frmCustomize,new EventArgs());
+				m_frmCustomize.Show();
+				m_frmCustomize.Owner=this.ParentForm;
+			}
+			else
+			{
+				if(EnterCustomize!=null)
+					EnterCustomize(null,new EventArgs());
+				else
+					MessageBox.Show("You need to add event handler for EnterCustomize event since your UseCustomCustomizeDialog property is set to true.");
+			}
+		}
+		private bool m_Customizing=false;
+		internal bool IsCustomizing
+		{
+			get {return m_Customizing;}
+		}
+
+        private void RescanCategories()
+        {
+            DotNetBarManager manager = this;
+            if (manager.Bars.Count == 0)
+                return;
+            manager.Items.Clear();
+            foreach (Bar bar in manager.Bars)
+            {
+                if (bar.LayoutType == eLayoutType.Toolbar)
+                {
+                    foreach (BaseItem item in bar.Items)
+                        AutoCategorizeItem(item);
+                }
+            }
+        }
+
+        private void AutoCategorizeItem(BaseItem item)
+        {
+            if (item.Category != "" && item.Name != "" && !this.Items.Contains(item.Name))
+                this.Items.Add(item.Copy());
+            foreach (BaseItem i in item.SubItems)
+                AutoCategorizeItem(i);
+        }
+
+
+		/// <summary>
+		/// Specifies that custom customize dialog will be used. Use EnterCustomize event to show your custom dialog box.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DefaultValue(false),System.ComponentModel.Category("Run-time Behavior"),System.ComponentModel.Description("Specifies that custom customize dialog will be used. Use EnterCustomize event to show your custom dialog box.")]
+		public bool UseCustomCustomizeDialog
+		{
+			get
+			{
+				return m_UseCustomCustomizeDialog;
+			}
+			set
+			{
+				m_UseCustomCustomizeDialog=value;
+			}
+
+		}
+
+		/// <summary>
+		/// Returns the collection of items with the specified name.
+		/// </summary>
+		/// <param name="ItemName">Item name to look for.</param>
+		/// <returns></returns>
+		public ArrayList GetItems(string ItemName)
+		{
+			ArrayList list=new ArrayList(15);
+			foreach(Bar bar in m_Bars)
+			{
+                if (bar.IsDisposed) continue;
+				GetSubItemsByName(bar.ItemsContainer,ItemName,list);
+			}
+            if(m_GlobalContextMenuBar!=null)
+                GetSubItemsByName(m_GlobalContextMenuBar.ItemsContainer, ItemName, list);
+			return list;
+		}
+
+		/// <summary>
+		/// Returns the collection of items with the specified name. This method search for items on all Bars, Items collection and ContextMenus collection.
+		/// The order of search is as follows. All Bars from Bars collections are searched, then Items collection and then ContextMenus collection.
+		/// </summary>
+		/// <param name="ItemName">Item name to look for.</param>
+		/// <param name="FullSearch">Specifies that search will be performed through all DotNetBar collections.</param>
+		/// <returns></returns>
+		public ArrayList GetItems(string ItemName, bool FullSearch)
+		{
+			if(!FullSearch)
+				return GetItems(ItemName);
+
+			ArrayList list=new ArrayList(15);
+			foreach(Bar bar in m_Bars)
+			{
+                if (bar.IsDisposed) continue;
+				GetSubItemsByName(bar.ItemsContainer,ItemName,list);
+			}
+			foreach(DictionaryEntry e in m_Items)
+			{
+				BaseItem item=(BaseItem)e.Value;
+				if(item.Name==ItemName)
+					list.Add(item);
+				GetSubItemsByName(item,ItemName,list);
+			}
+			foreach(BaseItem item in m_ContextMenus)
+			{
+				if(item.Name==ItemName)
+					list.Add(item);
+				GetSubItemsByName(item,ItemName,list);
+			}
+
+			return list;
+		}
+
+        /// <summary>
+        /// Returns the collection of items with the specified name and type.
+        /// </summary>
+        /// <param name="itemName">Item name to look for.</param>
+        /// <param name="itemType">Item type to look for.</param>
+        /// <returns></returns>
+        public ArrayList GetItems(string itemName, Type itemType)
+        {
+            ArrayList list = new ArrayList(15);
+            foreach (Bar bar in m_Bars)
+            {
+                if (bar.IsDisposed) continue;
+                BarFunctions.GetSubItemsByNameAndType(bar.ItemsContainer, itemName, list, itemType, false);
+            }
+            if (m_GlobalContextMenuBar != null && !m_GlobalContextMenuBar.IsDisposed)
+                BarFunctions.GetSubItemsByNameAndType(m_GlobalContextMenuBar.ItemsContainer, itemName, list, itemType, false);
+            return list;
+        }
+
+		/// <summary>
+		/// Returns the collection of items with the specified name and type. This method will searchs for items on all Bars, Items collection and ContextMenus collection.
+		/// The order of search is as follows. All Bars from Bars collections are searced, then Items collection and then ContextMenus collection.
+		/// </summary>
+        /// <param name="itemName">Item name to look for.</param>
+		/// <param name="itemType">Item type to look for.</param>
+        /// <param name="fullSearch">Specifies that full search (through all collections) will be performed.</param>
+		/// <returns></returns>
+		public ArrayList GetItems(string itemName, Type itemType, bool fullSearch)
+		{
+            return GetItems(itemName, itemType, fullSearch, false);
+		}
+
+        /// <summary>
+        /// Returns the collection of items with the specified name and type. This method will searchs for items on all Bars, Items collection and ContextMenus collection.
+        /// The order of search is as follows. All Bars from Bars collections are searced, then Items collection and then ContextMenus collection.
+        /// </summary>
+        /// <param name="itemName">Item name to look for.</param>
+        /// <param name="itemType">Item type to look for.</param>
+        /// <param name="fullSearch">Specifies that full search (through all collections) will be performed.</param>
+        /// <returns></returns>
+        public ArrayList GetItems(string itemName, Type itemType, bool fullSearch, bool useGlobalName)
+        {
+            ArrayList list = new ArrayList(15);
+            if (m_Bars == null || this.IsDisposed) return list;
+            foreach (Bar bar in m_Bars)
+            {
+                if(!bar.IsDisposed)
+                    BarFunctions.GetSubItemsByNameAndType(bar.ItemsContainer, itemName, list, itemType, useGlobalName);
+            }
+
+            if (m_GlobalContextMenuBar != null && !m_GlobalContextMenuBar.IsDisposed)
+                BarFunctions.GetSubItemsByNameAndType(m_GlobalContextMenuBar.ItemsContainer, itemName, list, itemType, useGlobalName);
+
+            if (fullSearch)
+            {
+                foreach (DictionaryEntry e in m_Items)
+                {
+                    BaseItem item = (BaseItem)e.Value;
+                    if ((!useGlobalName && item.Name == itemName || useGlobalName && item.GlobalName == itemName) && item.GetType() == itemType)
+                        list.Add(item);
+                    BarFunctions.GetSubItemsByNameAndType(item, itemName, list, itemType, useGlobalName);
+                }
+                foreach (BaseItem item in m_ContextMenus)
+                {
+                    if ((!useGlobalName && item.Name == itemName || useGlobalName && item.GlobalName == itemName) && item.GetType() == itemType)
+                        list.Add(item);
+                    BarFunctions.GetSubItemsByNameAndType(item, itemName, list, itemType, useGlobalName);
+                }
+            }
+
+            return list;
+        }
+
+
+		/// <summary>
+		/// Returns the first item that matches specified name.
+		/// </summary>
+		/// <param name="ItemName">Item name to look for.</param>
+		/// <returns></returns>
+		public BaseItem GetItem(string ItemName)
+		{
+			foreach(Bar bar in m_Bars)
+			{
+                if (bar.IsDisposed) continue;
+				BaseItem item=GetSubItemByName(bar.ItemsContainer,ItemName);
+				if(item!=null)
+					return item;
+			}
+            if (m_GlobalContextMenuBar != null)
+                return GetSubItemByName(m_GlobalContextMenuBar.ItemsContainer, ItemName);
+			return null;
+		}
+
+		/// <summary>
+		/// Returns the first item that matches specified name with the option to indicate full search of all collections.
+		/// The order of search is as follows. All Bars from Bars collections are searced, then Items collection and then ContextMenus collection.
+		/// </summary>
+		/// <param name="ItemName">Item name to look for.</param>
+		/// <param name="FullSearch">Specifies that all collection will be searched.</param>
+		/// <returns></returns>
+		public BaseItem GetItem(string ItemName, bool FullSearch)
+		{
+			foreach(Bar bar in m_Bars)
+			{
+                if (bar.IsDisposed) continue;
+				BaseItem item=GetSubItemByName(bar.ItemsContainer,ItemName);
+				if(item!=null)
+					return item;
+			}
+            if (m_GlobalContextMenuBar != null && !m_GlobalContextMenuBar.IsDisposed)
+            {
+                BaseItem item = GetSubItemByName(m_GlobalContextMenuBar.ItemsContainer, ItemName);
+                if (item != null)
+                    return item;
+            }
+			foreach(DictionaryEntry e in m_Items)
+			{
+				BaseItem parent=(BaseItem)e.Value;
+				if(parent.Name==ItemName)
+					return parent;
+				BaseItem item=GetSubItemByName(parent,ItemName);
+				if(item!=null)
+					return item;
+			}
+
+			foreach(BaseItem parent in m_ContextMenus)
+			{
+				if(parent.Name==ItemName)
+					return parent;
+				BaseItem item=GetSubItemByName(parent,ItemName);
+				if(item!=null)
+					return item;
+			}
+
+			return null;
+		}
+
+		private void GetSubItemsByName(BaseItem objParent, string ItemName,ArrayList list)
+		{
+			if(objParent is GenericItemContainer)
+			{
+				GenericItemContainer cont=objParent as GenericItemContainer;
+				if(cont.MoreItems!=null)
+					GetSubItemsByName(cont.MoreItems,ItemName,list);
+			}
+
+			foreach(BaseItem objItem in objParent.SubItems)
+			{
+				if(objItem.Name==ItemName)
+					list.Add(objItem);
+				if(objItem.SubItems.Count>0)
+					GetSubItemsByName(objItem, ItemName, list);
+			}
+		}
+
+		private void GetSubItemsByNameAndType(BaseItem objParent, string ItemName,ArrayList list, Type itemType)
+		{
+			if(objParent is GenericItemContainer)
+			{
+				GenericItemContainer cont=objParent as GenericItemContainer;
+				if(cont.MoreItems!=null)
+					GetSubItemsByNameAndType(cont.MoreItems,ItemName,list,itemType);
+			}
+
+			if(objParent.SubItems!=null)
+			{
+				foreach(BaseItem objItem in objParent.SubItems)
+				{
+					if(objItem.GetType()==itemType && objItem.Name==ItemName)
+						list.Add(objItem);
+					if(objItem.SubItems.Count>0)
+						GetSubItemsByNameAndType(objItem, ItemName, list, itemType);
+				}
+			}
+		}
+
+		private BaseItem GetSubItemByName(BaseItem objParent, string ItemName)
+		{
+			if(objParent is GenericItemContainer)
+			{
+				GenericItemContainer cont=objParent as GenericItemContainer;
+				if(cont.MoreItems!=null)
+				{
+					BaseItem item=GetSubItemByName(cont.MoreItems,ItemName);
+					if(item!=null)
+						return item;
+				}
+			}
+
+			foreach(BaseItem objItem in objParent.SubItems)
+			{
+				if(objItem.Name==ItemName)
+					return objItem;
+				if(objItem.SubItems.Count>0)
+				{
+					BaseItem item=GetSubItemByName(objItem, ItemName);
+					if(item!=null)
+						return item;
+				}
+			}
+			return null;
+		}
+
+		/// <summary>
+		/// Called before modal dialog is displayed using ShowModal() method.
+		/// </summary>
+		public void BeginModalDisplay()
+		{
+			if(this.IsDisposed)
+				return;
+			if(m_Bars==null)
+				return;
+			foreach(Bar bar in m_Bars)
+			{
+				if(bar.DockSide==eDockSide.None && bar.Parent is Form && bar.Parent.Visible)
+				{
+					((Form)bar.Parent).TopMost=false;
+				}
+			}
+		}
+
+		/// <summary>
+		/// Called after modal dialog is closed.
+		/// </summary>
+		public void EndModalDisplay()
+		{
+			if(this.IsDisposed)
+				return;
+			if(m_Bars==null)
+				return;
+			foreach(Bar bar in m_Bars)
+			{
+				if(bar.Visible && bar.DockSide==eDockSide.None && bar.Parent is Form)
+				{
+					if(!((Form)bar.Parent).TopMost)
+						((Form)bar.Parent).TopMost=true;
+				}
+			}
+		}
+
+		[Browsable(false),EditorBrowsable(EditorBrowsableState.Never)]
+		public void SetDesignMode(bool designmode)
+		{
+			foreach(Bar bar in m_Bars)
+			{
+				bar.SetDesignMode(designmode);
+				bar.RecalcLayout();
+			}
+		}
+
+		// Currently we are using this to communicate "focus" when control is in
+		// design mode. This can be used later if we decide to add focus
+		// handling to our BaseItem class.
+		void IOwner.SetFocusItem(BaseItem objFocusItem)
+		{
+			if(m_FocusItem!=null && m_FocusItem!=objFocusItem)
+			{
+				m_FocusItem.OnLostFocus();
+			}
+			m_FocusItem=objFocusItem;
+			if(m_FocusItem!=null)
+				m_FocusItem.OnGotFocus();
+		}
+
+		BaseItem IOwner.GetFocusItem()
+		{
+			return m_FocusItem;
+		}
+
+		// Only one Popup Item can be expanded at a time. This is used
+		// to track the currently expanded popup item and to close the popup item
+		// if another item is expanding.
+		void IOwner.SetExpandedItem(BaseItem objItem)
+		{
+			if(objItem!=null && objItem.Parent is PopupItem)
+				return;
+			if(m_ExpandedItem!=null)
+			{
+				if(m_ExpandedItem.Expanded)
+					m_ExpandedItem.Expanded=false;
+				m_ExpandedItem=null;
+			}
+			m_ExpandedItem=objItem;
+		}
+
+		BaseItem IOwner.GetExpandedItem()
+		{
+			return m_ExpandedItem;
+		}
+
+
+		/// <summary>
+		/// You must call this procedure if you are implementing custom customize dialog box after your dialog box is closed.
+		/// </summary>
+		[System.ComponentModel.Browsable(false)]
+		public void CustomizeClosing()
+		{
+			m_Customizing=false;
+
+			if(m_DisabledControls==null)
+				return;
+
+			foreach(Control objCtrl in m_DisabledControls)
+				objCtrl.Enabled=true;
+			m_DisabledControls.Clear();
+			m_DisabledControls=null;
+			m_frmCustomize=null;
+
+			if(ExitCustomize!=null)
+				ExitCustomize(this,new EventArgs());
+
+            if (m_AutoCreatedCategories)
+            {
+                m_AutoCreatedCategories = false;
+                this.Items.Clear();
+            }
+		}
+
+		void IOwner.DesignTimeContextMenu(BaseItem objItem)
+		{
+			if(m_frmCustomize!=null)
+				m_frmCustomize.DesignTimeContextMenu(objItem);
+			else if(m_UseCustomCustomizeDialog)
+				this.OnCustomizeContextMenu(objItem,null);
+		}
+		
+		void IOwner.OnParentPositionChanging()
+		{
+			if(m_Bars!=null)
+			{
+				Bar[] arr=new Bar[m_Bars.Count];
+				m_Bars.CopyTo(arr);
+				foreach(Bar bar in arr)
+				{
+					if(!bar.IsDisposed && bar.IsHandleCreated && bar.BarState==eBarState.Floating)
+					{
+                        NativeFunctions.PostMessage(bar.Handle, NativeFunctions.WM_USER + 101, IntPtr.Zero, IntPtr.Zero);
+						//NativeFunctions.SetWindowPos(bar.Handle,Microsoft.Win32.Interop.win.HWND_TOP,0,0,0,0,Microsoft.Win32.Interop.win.SWP_NOMOVE | Microsoft.Win32.Interop.win.SWP_NOSIZE | Microsoft.Win32.Interop.win.SWP_NOACTIVATE);
+					}
+				}
+			}
+		}
+
+		void IOwner.StartItemDrag(BaseItem objItem)
+		{
+			if(CustomizeStartItemDrag!=null)
+				CustomizeStartItemDrag(objItem,EventArgs.Empty);
+			if(m_frmCustomize!=null)
+			{
+				objItem.Expanded=false;
+				m_frmCustomize.DragItem=objItem;
+                NativeFunctions.PostMessage(m_frmCustomize.Handle, NativeFunctions.WM_USER + 707, IntPtr.Zero, IntPtr.Zero);
+			}
+		}
+
+		BaseItem IOwner.DragItem
+		{
+			get
+			{
+				if(m_frmCustomize!=null)
+					return m_frmCustomize.DragItem;
+				return null;
+			}
+		}
+
+		bool IOwner.DragInProgress
+		{
+			get
+			{
+				if(m_frmCustomize!=null)
+					return m_frmCustomize.DragInProgress;
+				return false;
+			}
+		}
+
+		internal System.Windows.Forms.Form CustomizeForm
+		{
+			get{ return m_frmCustomize;}
+		}
+
+		internal void OnCustomizeContextMenu(object Sender, ButtonItem Parent)
+		{
+			if(CustomizeContextMenu!=null)
+				CustomizeContextMenu(Sender,new CustomizeContextMenuEventArgs(Parent));
+		}
+
+		/// <summary>
+		/// Registers popup item with DotNetBar. Use this function carefully. The registration is required only if Popup item is created completely from code and it is not added to any DotNetBarManager collection.
+		/// </summary>
+		/// <param name="objPopup"></param>
+		public void RegisterPopup(PopupItem objPopup)
+		{
+			if(m_RegisteredPopups.Contains(objPopup))
+				return;
+			
+			if(!this.DesignMode)
+			{
+				if(!m_FilterInstalled && !m_UseHook)
+				{
+					//System.Windows.Forms.Application.AddMessageFilter(this);
+					MessageHandler.RegisterMessageClient(this);
+					m_FilterInstalled=true;
+				}
+				else if(m_UseHook && m_Hook==null)
+				{
+					m_Hook=new Hook(this);
+				}
+			}
+            else if (m_Hook == null)
+            {
+                m_Hook = new Hook(this);
+            }
+
+            if (m_RegisteredPopups.Count == 0)
+                PopupManager.RegisterPopup((IOwnerMenuSupport)this);
+
+			m_RegisteredPopups.Add(objPopup);
+			if(objPopup.GetOwner()==null)
+				objPopup.SetOwner(this);
+		}
+
+		bool IOwnerMenuSupport.RelayMouseHover()
+		{
+			foreach(PopupItem popup in m_RegisteredPopups)
+			{
+				Control ctrl=popup.PopupControl;
+				if(ctrl!=null)
+				{
+					Point pClient=ctrl.PointToClient(Control.MousePosition);
+					if(ctrl.ClientRectangle.Contains(pClient))
+					{
+						if(ctrl is MenuPanel)
+							((MenuPanel)ctrl).InternalMouseHover();
+						else if(ctrl is Bar)
+							((Bar)ctrl).InternalMouseHover();
+						return true;
+					}
+				}
+			}
+			return false;
+		}
+
+		/// <summary>
+		/// Un-registers specified popup. See RegisterPopup for more information.
+		/// </summary>
+		/// <param name="objPopup"></param>
+		public void UnregisterPopup(PopupItem objPopup)
+		{
+			if(m_RegisteredPopups.Contains(objPopup))
+				m_RegisteredPopups.Remove(objPopup);
+			if(m_RegisteredPopups.Count==0 && m_Hook!=null && (!m_UseHook || this.DesignMode))
+			{
+				m_Hook.Dispose();
+				m_Hook=null;
+			}
+            if (m_RegisteredPopups.Count == 0)
+                PopupManager.UnregisterPopup((IOwnerMenuSupport)this);
+		}
+
+        /// <summary>
+		/// Gets or sets the toolbar Top dock site used by DotNetBarManager.
+		/// </summary>
+        [Browsable(false), DefaultValue(null)]
+        public DockSite ToolbarTopDockSite
+        {
+            get { return m_ToolbarTopDockSite; }
+            set
+            {
+                m_ToolbarTopDockSite = value;
+                if (m_ToolbarTopDockSite != null)
+                {
+                    m_ToolbarTopDockSite.Dock = DockStyle.Top;
+                    m_ToolbarTopDockSite.SetOwner(this);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the toolbar Bottom dock site used by DotNetBarManager.
+        /// </summary>
+        [Browsable(false), DefaultValue(null)]
+        public DockSite ToolbarBottomDockSite
+        {
+            get { return m_ToolbarBottomDockSite; }
+            set
+            {
+                m_ToolbarBottomDockSite = value;
+                if (m_ToolbarBottomDockSite != null)
+                {
+                    m_ToolbarBottomDockSite.Dock = DockStyle.Bottom;
+                    m_ToolbarBottomDockSite.SetOwner(this);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the toolbar Left dock site used by DotNetBarManager.
+        /// </summary>
+        [Browsable(false), DefaultValue(null)]
+        public DockSite ToolbarLeftDockSite
+        {
+            get { return m_ToolbarLeftDockSite; }
+            set
+            {
+                m_ToolbarLeftDockSite = value;
+                if (m_ToolbarLeftDockSite != null)
+                {
+                    m_ToolbarLeftDockSite.Dock = DockStyle.Left;
+                    m_ToolbarLeftDockSite.SetOwner(this);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the toolbar Right dock site used by DotNetBarManager.
+        /// </summary>
+        [Browsable(false), DefaultValue(null)]
+        public DockSite ToolbarRightDockSite
+        {
+            get { return m_ToolbarRightDockSite; }
+            set
+            {
+                m_ToolbarRightDockSite = value;
+                if (m_ToolbarRightDockSite != null)
+                {
+                    m_ToolbarRightDockSite.Dock = DockStyle.Right;
+                    m_ToolbarRightDockSite.SetOwner(this);
+                }
+            }
+        }
+
+		/// <summary>
+		/// Gets or sets the Top dock site used by DotNetBarManager.
+		/// </summary>
+		[Browsable(false)]
+		public DockSite TopDockSite
+		{
+			get
+			{
+				return m_TopDockSite;
+			}
+			set
+			{
+				m_TopDockSite=value;
+				if(m_TopDockSite!=null)
+				{
+					m_TopDockSite.Dock=DockStyle.Top;
+					m_TopDockSite.SetOwner(this);
+					
+					if(m_TopDockSite.Parent==null)
+					{
+						m_TopDockSite.ParentChanged+=new EventHandler(this.DockSiteParentChanged);
+					}
+					else
+					{
+						if(m_TopDockSite.Parent is UserControl)
+							SetupParentUserControl();
+						//if(!this.DesignMode) 
+							BarStreamLoad();
+						ProcessDelayedCommands();
+					}
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the Bottom dock site used by DotNetBarManager.
+		/// </summary>
+		[Browsable(false)]
+		public DockSite BottomDockSite
+		{
+			get
+			{
+				return m_BottomDockSite;
+			}
+			set
+			{
+				m_BottomDockSite=value;
+				if(m_BottomDockSite!=null)
+				{
+					m_BottomDockSite.Dock=DockStyle.Bottom;
+					m_BottomDockSite.SetOwner(this);
+
+					if(m_BottomDockSite.Parent==null)
+						m_BottomDockSite.ParentChanged+=new EventHandler(this.DockSiteParentChanged);
+					else
+					{
+						//if(!this.DesignMode)
+							BarStreamLoad();
+						ProcessDelayedCommands();
+					}
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the Left dock site used by DotNetBarManager.
+		/// </summary>
+		[Browsable(false)]
+		public DockSite LeftDockSite
+		{
+			get
+			{
+				return m_LeftDockSite;
+			}
+			set
+			{
+				m_LeftDockSite=value;
+				if(m_LeftDockSite!=null)
+				{
+					m_LeftDockSite.Dock=DockStyle.Left;
+					m_LeftDockSite.SetOwner(this);
+
+					if(m_LeftDockSite.Parent==null)
+						m_LeftDockSite.ParentChanged+=new EventHandler(this.DockSiteParentChanged);
+					else
+					{
+						//if(!this.DesignMode)
+							BarStreamLoad();
+						ProcessDelayedCommands();
+					}
+				}
+			}
+		}
+
+		private void ProcessDelayedCommands()
+		{
+			if(this.DesignMode && m_TopDockSite!=null && m_BottomDockSite!=null && m_LeftDockSite!=null && m_RightDockSite!=null)
+			{
+				if(m_TopDockSite.Parent!=null && m_BottomDockSite.Parent!=null && m_LeftDockSite.Parent!=null && m_RightDockSite.Parent!=null)
+                foreach(Bar bar in this.Bars)
+					bar.ProcessDelayedCommands();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the Right dock site used by DotNetBarManager.
+		/// </summary>
+		[Browsable(false)]
+		public DockSite RightDockSite
+		{
+			get
+			{
+				return m_RightDockSite;
+			}
+			set
+			{
+				m_RightDockSite=value;
+				if(m_RightDockSite!=null)
+				{
+					m_RightDockSite.Dock=DockStyle.Right;
+					m_RightDockSite.SetOwner(this);
+
+					if(m_RightDockSite.Parent==null)
+						m_RightDockSite.ParentChanged+=new EventHandler(this.DockSiteParentChanged);
+					else
+					{
+						//if(!this.DesignMode)
+							BarStreamLoad();
+						ProcessDelayedCommands();
+					}
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the Fill dock site used by DotNetBarManager. Fill dock site is most commonly used as dock site
+		/// for document type docking.
+		/// </summary>
+		[Browsable(false),DefaultValue(null)]
+		public DockSite FillDockSite
+		{
+			get
+			{
+				return m_FillDockSite;
+			}
+			set
+			{
+				m_FillDockSite=value;
+				if(m_FillDockSite!=null)
+					m_FillDockSite.SetOwner(this);
+			}
+		}
+
+		AutoHidePanel IOwnerAutoHideSupport.LeftAutoHidePanel
+		{
+			get
+			{
+				if(m_LeftAutoHidePanel==null)
+				{
+					if(m_LeftDockSite.Parent==null)
+						return null;
+					m_LeftAutoHidePanel=new AutoHidePanel();
+                    m_LeftAutoHidePanel.Font = SystemFonts.DefaultFont; // SystemInformation.MenuFont.Clone() as Font;
+					m_LeftAutoHidePanel.SetOwner(this);
+					m_LeftAutoHidePanel.Dock=DockStyle.Left;
+                    m_LeftAutoHidePanel.Width=0;
+					m_LeftAutoHidePanel.Visible=false;
+					m_LeftDockSite.Parent.Controls.Add(m_LeftAutoHidePanel);
+					if(m_LeftDockSite.HasFixedBars)
+						m_LeftDockSite.Parent.Controls.SetChildIndex(m_LeftAutoHidePanel,m_LeftDockSite.Parent.Controls.GetChildIndex(m_LeftDockSite));
+					else
+						m_LeftDockSite.Parent.Controls.SetChildIndex(m_LeftAutoHidePanel,m_LeftDockSite.Parent.Controls.GetChildIndex(m_LeftDockSite)+1);
+					//m_LeftDockSite.Parent.Controls.SetChildIndex(m_LeftAutoHidePanel,GetMaxDockSiteIndex(false,true,true,false)+1);
+				}
+				return m_LeftAutoHidePanel;
+			}
+			set {m_LeftAutoHidePanel=value;}
+		}
+		bool IOwnerAutoHideSupport.HasLeftAutoHidePanel
+		{
+			get {return (m_LeftAutoHidePanel!=null);}
+		}
+
+		AutoHidePanel IOwnerAutoHideSupport.RightAutoHidePanel
+		{
+			get
+			{
+				if(m_RightAutoHidePanel==null)
+				{
+					if(m_RightDockSite.Parent==null)
+						return null;
+					m_RightAutoHidePanel=new AutoHidePanel();
+                    //m_RightAutoHidePanel.Font = SystemInformation.MenuFont.Clone() as Font;
+					m_RightAutoHidePanel.SetOwner(this);
+					m_RightAutoHidePanel.Dock=DockStyle.Right;
+					m_RightAutoHidePanel.Width=0;
+					m_RightAutoHidePanel.Visible=false;
+					m_RightDockSite.Parent.Controls.Add(m_RightAutoHidePanel);
+					if(m_RightDockSite.HasFixedBars)
+						m_RightDockSite.Parent.Controls.SetChildIndex(m_RightAutoHidePanel,m_RightDockSite.Parent.Controls.GetChildIndex(m_RightDockSite));
+					else
+						m_RightDockSite.Parent.Controls.SetChildIndex(m_RightAutoHidePanel,m_RightDockSite.Parent.Controls.GetChildIndex(m_RightDockSite)+1);
+					//m_RightDockSite.Parent.Controls.SetChildIndex(m_RightAutoHidePanel,GetMaxDockSiteIndex(false,true,false,true)+1);
+				}
+				return m_RightAutoHidePanel;
+			}
+			set {m_RightAutoHidePanel=value;}
+		}
+		bool IOwnerAutoHideSupport.HasRightAutoHidePanel
+		{
+			get {return (m_RightAutoHidePanel!=null);}
+		}
+
+		AutoHidePanel IOwnerAutoHideSupport.TopAutoHidePanel
+		{
+			get
+			{
+				if(m_TopAutoHidePanel==null)
+				{
+					if(m_TopDockSite.Parent==null)
+						return null;
+					m_TopAutoHidePanel=new AutoHidePanel();
+                    m_TopAutoHidePanel.Font = SystemFonts.DefaultFont; // SystemInformation.MenuFont.Clone() as Font;
+					m_TopAutoHidePanel.SetOwner(this);
+					m_TopAutoHidePanel.Dock=DockStyle.Top;
+					m_TopAutoHidePanel.Width=0;
+					m_TopAutoHidePanel.Visible=false;
+					m_TopDockSite.Parent.Controls.Add(m_TopAutoHidePanel);
+					
+					if(m_TopDockSite.HasFixedBars)
+						m_TopDockSite.Parent.Controls.SetChildIndex(m_TopAutoHidePanel,m_TopDockSite.Parent.Controls.GetChildIndex(m_TopDockSite));
+					else
+						m_TopDockSite.Parent.Controls.SetChildIndex(m_TopAutoHidePanel,m_TopDockSite.Parent.Controls.GetChildIndex(m_TopDockSite)+1);
+				}
+				return m_TopAutoHidePanel;
+			}
+			set {m_TopAutoHidePanel=value;}
+		}
+		bool IOwnerAutoHideSupport.HasTopAutoHidePanel
+		{
+			get {return (m_TopAutoHidePanel!=null);}
+		}
+
+		AutoHidePanel IOwnerAutoHideSupport.BottomAutoHidePanel
+		{
+			get
+			{
+				if(m_BottomAutoHidePanel==null)
+				{
+					if(m_BottomDockSite.Parent==null)
+						return null;
+					m_BottomAutoHidePanel=new AutoHidePanel();
+                    m_BottomAutoHidePanel.Font = SystemFonts.DefaultFont; // SystemInformation.MenuFont.Clone() as Font;
+					m_BottomAutoHidePanel.SetOwner(this);
+					m_BottomAutoHidePanel.Dock=DockStyle.Bottom;
+					m_BottomAutoHidePanel.Width=0;
+					m_BottomAutoHidePanel.Visible=false;
+					m_BottomDockSite.Parent.Controls.Add(m_BottomAutoHidePanel);
+					if(m_BottomDockSite.HasFixedBars)
+						m_BottomDockSite.Parent.Controls.SetChildIndex(m_BottomAutoHidePanel,m_BottomDockSite.Parent.Controls.GetChildIndex(m_BottomDockSite));
+					else
+						m_BottomDockSite.Parent.Controls.SetChildIndex(m_BottomAutoHidePanel,m_BottomDockSite.Parent.Controls.GetChildIndex(m_BottomDockSite)+1);
+					//m_BottomDockSite.Parent.Controls.SetChildIndex(m_BottomAutoHidePanel,GetMaxDockSiteIndex(false,true,true,true)+1);
+				}
+				return m_BottomAutoHidePanel;
+			}
+			set {m_BottomAutoHidePanel=value;}
+		}
+		bool IOwnerAutoHideSupport.HasBottomAutoHidePanel
+		{
+			get {return (m_BottomAutoHidePanel!=null);}
+		}
+
+		private void DestroyAutoHidePanels()
+		{
+			if(m_LeftAutoHidePanel!=null)
+			{
+				if(m_LeftAutoHidePanel.Parent!=null)
+					m_LeftAutoHidePanel.Parent.Controls.Remove(m_LeftAutoHidePanel);
+				m_LeftAutoHidePanel.Dispose();
+				m_LeftAutoHidePanel=null;
+			}
+			if(m_RightAutoHidePanel!=null)
+			{
+				if(m_RightAutoHidePanel.Parent!=null)
+					m_RightAutoHidePanel.Parent.Controls.Remove(m_RightAutoHidePanel);
+				m_RightAutoHidePanel.Dispose();
+				m_RightAutoHidePanel=null;
+			}
+			if(m_TopAutoHidePanel!=null)
+			{
+				if(m_TopAutoHidePanel.Parent!=null)
+					m_TopAutoHidePanel.Parent.Controls.Remove(m_TopAutoHidePanel);
+				m_TopAutoHidePanel.Dispose();
+				m_TopAutoHidePanel=null;
+			}
+			if(m_BottomAutoHidePanel!=null)
+			{
+				if(m_BottomAutoHidePanel.Parent!=null)
+					m_BottomAutoHidePanel.Parent.Controls.Remove(m_BottomAutoHidePanel);
+				m_BottomAutoHidePanel.Dispose();
+				m_BottomAutoHidePanel=null;
+			}
+
+		}
+
+		/// <summary>
+		/// Specifies whether bars are drawn using Themes when running on OS that supports themes like Windows XP.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(false),DefaultValue(false),Category("Appearance"),Description("Specifies whether new bars created are drawn using Themes when running on OS that supports themes like Windows XP.")]
+		public virtual bool ThemeAware
+		{
+			get
+			{
+				return m_ThemeAware;
+			}
+			set
+			{
+				foreach(Bar bar in m_Bars)
+					bar.ThemeAware=value;
+				m_ThemeAware=value;
+				if(this.DesignMode)
+				{
+					if(m_TopDockSite!=null)
+						m_TopDockSite.RecalcLayout();
+					if(m_BottomDockSite!=null)
+						m_BottomDockSite.RecalcLayout();
+					if(m_LeftDockSite!=null)
+						m_LeftDockSite.RecalcLayout();
+					if(m_RightDockSite!=null)
+						m_RightDockSite.RecalcLayout();
+				}
+				else
+				{
+					if(m_TopDockSite!=null && m_TopDockSite.Controls.Count>0)
+						m_TopDockSite.NeedsLayout=true;
+					if(m_BottomDockSite!=null && m_BottomDockSite.Controls.Count>0)
+						m_BottomDockSite.NeedsLayout=true;
+					if(m_LeftDockSite!=null && m_LeftDockSite.Controls.Count>0)
+						m_LeftDockSite.NeedsLayout=true;
+					if(m_RightDockSite!=null && m_RightDockSite.Controls.Count>0)
+						m_RightDockSite.NeedsLayout=true;
+				}
+			}
+		}
+
+		private void DockSiteParentChanged(object sender, EventArgs e)
+		{
+			System.Windows.Forms.Control c=sender as System.Windows.Forms.Control;
+			if(c!=null)
+			{
+				if(c==m_TopDockSite && c.Parent is UserControl)
+					SetupParentUserControl();
+				c.ParentChanged-=new EventHandler(DockSiteParentChanged);
+				if((c.Parent==null || c.Parent.FindForm()==null) && !this.DesignMode && c.Parent is UserControl)
+					return;
+				// Try to load bar stream
+				//if(!this.DesignMode)
+					BarStreamLoad();
+				ProcessDelayedCommands();
+			}
+		}
+
+		private void SetupParentUserControl()
+		{
+			// VERY IMPORTANT that this is not done when UserControl is in design mode
+			// The whole designer was reporting exception when UserControl with DotNetBar is opened in design-mode, switched to code, code changed, switched back to design mode.
+			if((m_TopDockSite==null || !(m_TopDockSite.Parent is UserControl)) && m_ParentUserControl==null || this.DesignMode)
+			//if(m_TopDockSite==null || !(m_TopDockSite.Parent is UserControl) || this.DesignMode)
+				return;
+			Control parent=null;
+			if(m_TopDockSite!=null)
+				parent=m_TopDockSite.Parent as UserControl;
+			else
+				parent=m_ParentUserControl;
+            Form form = parent.FindForm();
+			if(form!=null)
+			{
+				// Easy case...
+				this.ParentForm=form;
+			}
+			else
+			{
+				parent.ParentChanged+=new EventHandler(ParentUserControlParentChanged);
+			}
+		}
+
+		private void ParentUserControlParentChanged(object sender, EventArgs e)
+		{
+			Control parent=null;
+			if(m_TopDockSite!=null)
+				parent=m_TopDockSite.Parent as UserControl;
+			else
+				parent=m_ParentUserControl;
+
+			Control ctrl=sender as Control;
+
+			if(ctrl!=null)
+				ctrl.ParentChanged-=new EventHandler(ParentUserControlParentChanged);
+
+            Form parentForm = parent.FindForm();
+            if (parentForm != null)
+			{
+				// Easy case...
+                this.ParentForm = parentForm;
+			}
+			else if(parent.Parent!=null)
+			{
+				while(ctrl.Parent!=null)
+					ctrl=ctrl.Parent;
+                if (ctrl is PopupContainerControl)
+                {
+                    PopupContainerControl pc = ctrl as PopupContainerControl;
+                    if (pc.ParentItem != null && pc.ParentItem.ContainerControl is Control)
+                    {
+                        Control c = pc.ParentItem.ContainerControl as Control;
+                        Form form = c.FindForm();
+                        if (form != null)
+                        {
+                            this.ParentForm = form;
+                            if (!m_DefinitionLoaded)
+                                BarStreamLoad(true);
+                            return;
+                        }
+                    }
+                }
+
+				// Walk up in the chain till we manage to get to the form
+				ctrl.ParentChanged+=new EventHandler(ParentUserControlParentChanged);
+			}
+		}
+
+		/// <summary>
+		/// Sets the style of all items in DotNetBar Manager.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Color Scheme"),System.ComponentModel.Description("Specifies the default visual style of the Bars.")]
+		public eDotNetBarStyle Style
+		{
+			set
+			{
+				foreach(Bar bar in m_Bars)
+				{
+					TypeDescriptor.GetProperties(bar)["Style"].SetValue(bar,value);
+				}
+				foreach(BaseItem item in m_ContextMenus)
+					item.Style=value;
+				foreach(DictionaryEntry e in m_Items)
+					((BaseItem)e.Value).Style=value;
+				if(m_Style!=value)
+					m_ColorScheme.SwitchStyle(value);
+				m_Style=value;
+			}
+			get
+			{
+				return m_Style;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets Color scheme for all bars. Note that you need to set UseGlobalColorScheme to true to indicate
+		/// that this ColorScheme object will be used on all bars managed by this instance of DotNetBarManager.
+		/// </summary>
+		[System.ComponentModel.Editor(typeof(ColorSchemeVSEditor), typeof(System.Drawing.Design.UITypeEditor)),System.ComponentModel.Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Color Scheme"),System.ComponentModel.Description("Indicates Color Scheme for all bars."),DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+		public DevComponents.DotNetBar.ColorScheme ColorScheme
+		{
+			get {return m_ColorScheme;}
+			set
+			{
+				if(value==null)
+					throw new ArgumentException("NULL is not a valid value for this property.");
+				m_ColorScheme=value;
+			}
+		}
+
+		[Browsable(false),EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeColorScheme()
+		{
+			return m_ColorScheme.SchemeChanged;
+		}
+
+        /// <summary>
+        /// Resets the ColorScheme property to its default value.
+        /// </summary>
+        public void ResetColorScheme()
+        {
+            m_ColorScheme.Refresh();
+            foreach (Bar bar in m_Bars)
+            {
+                bar.Invalidate();
+            }
+        }
+
+		/// <summary>
+		/// Gets or sets whether ColorScheme object on DotNetBarManager is used as a default ColorScheme for all bars managed by DotNetBarManager.
+		/// Default value is false which indicates that ColorScheme on each Bar is used.
+		/// When set to true each bar will use the ColorScheme settings from DotNetBarManager and it will ignore any
+		/// setting on the Bar.ColorScheme object.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),Category("Color Scheme"),Description("Indicates whether ColorScheme object on DotNetBarManager is used as a default ColorScheme for all bars managed by DotNetBarManager."),DefaultValue(false)]
+		public bool UseGlobalColorScheme
+		{
+			get {return m_UseGlobalColorScheme;}
+			set {m_UseGlobalColorScheme=value;}
+		}
+
+		// Following Properties reflect the end-user settings in Customize Dialog
+		/// <summary>
+		/// Indicates whether the Personalized menu setting is ignored and full menus are always shown.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DefaultValue(false),System.ComponentModel.Category("Run-time Behavior"),System.ComponentModel.Description("Indicates whether the Personalized menu setting is ignored and full menus are always shown.")]
+		public bool AlwaysShowFullMenus
+		{
+			get
+			{
+				return m_AlwaysShowFullMenus;
+			}
+			set
+			{
+				m_AlwaysShowFullMenus=value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets whether accelerator letters for menu or toolbar commands are underlined regardless of
+		/// current Windows settings. Accelerator keys allow easy access to menu commands by using
+		/// Alt + choosen key (letter). Default value is false which indicates that system setting is used
+		/// to determine whether accelerator letters are underlined. Setting this property to true
+		/// will always display accelerator letter underlined.
+		/// </summary>
+		[Browsable(true),DefaultValue(false),Category("Run-time Behavior"),Description("Indicates whether accelerator letters for menu or toolbar commands are underlined regardless of current Windows settings.")]
+		public bool AlwaysDisplayKeyAccelerators
+		{
+			get {return m_AlwaysDisplayKeyAccelerators;}
+			set
+			{
+				m_AlwaysDisplayKeyAccelerators=value;
+				Bar bar=this.GetMenuBar();
+				if(bar!=null)
+					bar.Refresh();
+			}
+		}
+
+		/// <summary>
+		/// Returns whether theme support is enabled on the OS that supports themes like Windows XP.
+		/// </summary>
+		[System.ComponentModel.Browsable(false)]
+		public bool IsThemeActive
+		{
+			get
+			{
+				if(!BarFunctions.ThemedOS) // System.Windows.Forms.OSFeature.Feature.IsPresent(System.Windows.Forms.OSFeature.Themes))
+					return false;
+				return Themes.ThemesActive;
+			}
+		}
+		
+		// Following Properties reflect the end-user settings in Customize Dialog
+		/// <summary>
+		/// Indicates whether the CustomizeItem (allows toolbar customization) is added for new Bars end users are creating.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DefaultValue(true),System.ComponentModel.Category("Run-time Behavior"),System.ComponentModel.Description("Indicates whether the CustomizeItem (allows toolbar customization) is added for new Bars end users are creating.")]
+		public bool AllowUserBarCustomize
+		{
+			get
+			{
+				return m_AllowUserBarCustomize;
+			}
+			set
+			{
+				m_AllowUserBarCustomize=value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets whether DotNetBar ignores the F10 key which when pressed sets the focus to menu bar
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DefaultValue(false),System.ComponentModel.Category("Run-time Behavior"),System.ComponentModel.Description("Indicates whether DotNetBar ignores the F10 key which when pressed sets the focus to menu bar.")]		
+		public bool IgnoreF10Key
+		{
+			get {return m_IgnoreF10Key;}
+			set {m_IgnoreF10Key=value;}
+		}
+
+		/// <summary>
+		/// Indicates whether the items that are not recenly used are shown after mouse hovers over the expand button.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DefaultValue(true),System.ComponentModel.Category("Run-time Behavior"),System.ComponentModel.Description("Indicates whether the items that are not most recenly used are shown after mouse hovers over the expand button.")]
+		public bool ShowFullMenusOnHover
+		{
+			get
+			{
+				return m_ShowFullMenusOnHover;
+			}
+			set
+			{
+				m_ShowFullMenusOnHover=value;
+			}
+		}
+
+		/// <summary>
+		/// Indicates whether Tooltips are shown on Bars and menus.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DefaultValue(true),System.ComponentModel.Category("Run-time Behavior"),System.ComponentModel.Description("Indicates whether Tooltips are shown on Bars and menus.")]
+		public bool ShowToolTips
+		{
+			get
+			{
+				return m_ShowToolTips;
+			}
+			set
+			{
+				m_ShowToolTips=value;
+			}
+		}
+
+		/// <summary>
+		/// Indicates whether item shortcut is displayed in Tooltips.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DefaultValue(false),System.ComponentModel.Category("Run-time Behavior"),System.ComponentModel.Description("Indicates whether item shortcut is displayed in Tooltips.")]
+		public bool ShowShortcutKeysInToolTips
+		{
+			get
+			{
+				return m_ShowShortcutKeysInToolTips;
+			}
+			set
+			{
+				m_ShowShortcutKeysInToolTips=value;
+			}
+		}
+
+		/// <summary>
+		/// Specifies the pop-up animation style.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DefaultValue(ePopupAnimation.SystemDefault),System.ComponentModel.Category("Run-time Behavior"),System.ComponentModel.Description("Specifies the pop-up animation style.")]
+		public ePopupAnimation PopupAnimation
+		{
+			get
+			{
+				return m_PopupAnimation;
+			}
+			set
+			{
+				m_PopupAnimation=value;
+			}
+		}
+
+		/// <summary>
+		/// Specifies whether the MDI system buttons are displayed in menu bar when MDI Child window is maximized.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DefaultValue(true),System.ComponentModel.Category("Run-time Behavior"),System.ComponentModel.Description("Specifies whether the MDI system buttons are displayed in menu bar when MDI Child window is maximized.")]
+		public bool MdiSystemItemVisible
+		{
+			get
+			{
+				return m_MdiSystemItemVisible;
+			}
+			set
+			{
+				m_MdiSystemItemVisible=value;
+				if(!this.DesignMode)
+				{
+					Bar bar=GetMenuBar();
+					if(bar==null)
+						return;
+					if(m_MdiSystemItemVisible)
+					{
+						if(m_ParentForm!=null && m_ParentForm.IsMdiContainer && m_ParentForm.ActiveMdiChild!=null && m_ParentForm.ActiveMdiChild.WindowState==FormWindowState.Maximized)
+						{
+							bar.ShowMDIChildSystemItems(m_ParentForm.ActiveMdiChild,true);
+							m_MdiChildMaximized=true;
+						}
+					}
+					else
+						bar.ClearMDIChildSystemItems(true);
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets whether MDI Child form System Menu is hidden. System menu is displayed in MDI form menu area when form is maximized. Default value is false.
+		/// </summary>
+		[Browsable(true),DefaultValue(false),Category("Run-time Behavior"),Description("Indicates whether MDI Child form System Menu is hidden. Default value is false.")]
+		public bool HideMdiSystemMenu
+		{
+			get {return m_HideMdiSystemMenu;}
+			set {m_HideMdiSystemMenu=value;}
+		}
+
+
+		System.Windows.Forms.MdiClient IOwner.GetMdiClient(System.Windows.Forms.Form MdiForm)
+		{
+			return BarFunctions.GetMdiClient(MdiForm);
+		}
+
+        /// <summary>
+        /// Informs the DotNetBarManager that Mdi Child for has been activated. Calling this method is needed only under special
+        /// conditions where MDI child system items do not show.
+        /// </summary>
+        public void MdiChildActivated()
+        {
+            OnMdiChildActivate(this.ParentForm, new EventArgs());
+        }
+
+        private Timer _DelayCheckTimer = null;
+        private void DelayCheckMaximizedState()
+        {
+            if (_DelayCheckTimer == null)
+            {
+                _DelayCheckTimer = new Timer();
+                _DelayCheckTimer.Interval = 200;
+                _DelayCheckTimer.Tick += new EventHandler(DelayCheckTimerTick);
+            }
+            _DelayCheckTimer.Start();
+        }
+
+        private void DelayCheckTimerTick(object sender, EventArgs e)
+        {
+            Timer timer = _DelayCheckTimer;
+            _DelayCheckTimer = null;
+            timer.Stop();
+            timer.Tick -= new EventHandler(DelayCheckTimerTick);
+            timer.Dispose();
+            if (m_ActiveMdiChild != null && m_ActiveMdiChild.WindowState == FormWindowState.Maximized)
+                MdiChildActivated();
+        }
+
+        private void OnMdiChildActivate(object sender,System.EventArgs e)
+		{
+			if(m_ActiveMdiChild!=null)
+			{
+				m_ActiveMdiChild.Resize-=new EventHandler(this.OnMdiChildResize);
+				m_ActiveMdiChild.VisibleChanged-=new EventHandler(this.OnMdiChildVisibleChanged);
+			}
+			m_ActiveMdiChild=null;
+
+			if(this.ParentForm.ActiveMdiChild!=null)
+			{
+				if(GetMenuBar()!=null)
+				{
+					m_ActiveMdiChild=this.ParentForm.ActiveMdiChild;
+					m_ActiveMdiChild.Resize+=new EventHandler(this.OnMdiChildResize);
+					m_ActiveMdiChild.VisibleChanged+=new EventHandler(this.OnMdiChildVisibleChanged);
+                    if (m_ActiveMdiChild.WindowState == System.Windows.Forms.FormWindowState.Maximized || m_MdiChildMaximized)
+                    {
+                        this.OnMdiChildResize(m_ActiveMdiChild, null);
+                    }
+                    else
+                        DelayCheckMaximizedState();
+				}
+			}
+			else if(m_MdiChildMaximized)
+			{
+				DevComponents.DotNetBar.Bar bar=GetMenuBar();
+				if(bar!=null)
+					bar.ClearMDIChildSystemItems(true);
+			}
+		}
+
+		private void OnMdiChildVisibleChanged(object sender, System.EventArgs e)
+		{
+			if(m_ActiveMdiChild!=null && !m_ActiveMdiChild.Visible && m_MdiChildMaximized)
+			{
+				Bar bar=GetMenuBar();
+				if(bar!=null)
+					bar.ClearMDIChildSystemItems(true);
+				m_MdiChildMaximized=false;
+			}
+		}
+		private void OnMdiChildResize(object sender, System.EventArgs e)
+		{
+			DevComponents.DotNetBar.Bar bar=GetMenuBar();
+
+			bool bRecalcLayout=false;
+			
+			if(m_ActiveMdiChild!=null && m_ActiveMdiChild.WindowState!=FormWindowState.Maximized)
+			{
+				if(m_MdiChildMaximized)
+				{
+					if(m_MdiSystemItemVisible)
+					{
+						if(e==null)
+						{
+							// Call from MDI Child Activate
+							m_MdiChildMaximized=false;
+							return;
+						}
+						if(bar!=null)
+							bar.ClearMDIChildSystemItems(false);
+						bRecalcLayout=true;
+					}
+				}
+				m_MdiChildMaximized=false;
+				if(bar!=null)
+					bar.Refresh();
+				return;
+			}
+
+			if(!m_MdiChildMaximized)
+			{
+				if(m_MdiSystemItemVisible)
+				{
+					if(bar==null)
+						return;
+
+					bar.ShowMDIChildSystemItems(m_ActiveMdiChild,false);
+					bRecalcLayout=true;
+				}
+				m_MdiChildMaximized=true;
+			}
+
+			if(bar!=null)
+			{
+				if(bRecalcLayout) bar.RecalcLayout();
+			}
+		}
+
+		bool IOwner.DesignMode
+		{
+			get {return this.DesignMode;}
+		}
+
+		Form IOwner.ActiveMdiChild
+		{
+			get
+			{
+				return m_ActiveMdiChild;
+			}
+		}
+
+		private DevComponents.DotNetBar.Bar GetMenuBar()
+		{
+			if(m_Bars==null)
+				return null;
+			try
+			{
+				foreach(DevComponents.DotNetBar.Bar bar in m_Bars)
+					if(bar.MenuBar && bar.Visible)
+						return bar;
+			}
+			catch(Exception){}
+
+			return null;
+		}
+
+		private void OnMdiSetMenu(object sender, System.EventArgs e)
+		{
+            MDIClientMsgHandler m=sender as MDIClientMsgHandler;
+			if(this.GetMenuBar()!=null || m_HideMdiSystemMenu)
+				m.EatMessage=true;
+		}
+
+		internal Bar FocusedBar
+		{
+			get {return m_FocusedBar;}
+			set {m_FocusedBar=value;}
+		}
+
+        bool IMessageHandlerClient.OnSysKeyDown(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+            if (!m_ParentActivated && !(Form.ActiveForm is FloatingContainer) || this.DesignMode)
+                return false;
+
+            if (m_ParentForm != null && m_ParentForm.IsMdiChild && m_ParentForm.MdiParent != null && !m_ParentForm.MdiParent.Focused)
+                return false;
+
+            DevComponents.DotNetBar.Bar bar = GetMenuBar();
+            int wParamInt = WinApi.ToInt(wParam);
+            if (bar != null && bar.ItemsContainer != null && !bar.ItemsContainer.DesignMode)
+            {
+                GenericItemContainer cont = bar.ItemsContainer;
+                if (cont == null)
+                    return false;
+                if (wParamInt== 18 || (wParamInt== 121 && !m_IgnoreF10Key && (System.Windows.Forms.Control.ModifierKeys == System.Windows.Forms.Keys.None || System.Windows.Forms.Control.ModifierKeys == System.Windows.Forms.Keys.Alt)))
+                {
+                    if (cont.ExpandedItem() != null && (bar.Focused || bar.MenuFocus))
+                    {
+                        bar.ReleaseFocus();
+                        bar.MenuFocus = false;
+                        m_IgnoreSysKeyUp = true;
+                        return true;
+                    }
+                }
+                else
+                {
+                    // Check Shortcuts
+                    if (System.Windows.Forms.Control.ModifierKeys != Keys.None || wParamInt>= (int)eShortcut.F1 && wParamInt<= (int)eShortcut.F12)
+                    {
+                        int i = (int)System.Windows.Forms.Control.ModifierKeys | wParamInt;
+                        if (ProcessShortcut((eShortcut)i))
+                            return true;
+                    }
+                    m_IgnoreSysKeyUp = true;
+                    if (wParamInt>= 27 && wParamInt<= 111) // VK_ESC - VK_DIVIDE range
+                    {
+                        int key = (int)NativeFunctions.MapVirtualKey((uint)wParam, 2);
+                        if (key == 0)
+                            key = wParamInt;
+                        if (cont.SysKeyDown(key))
+                            return true;
+                    }
+                    //return true;
+                }
+            }
+            else if (bar == null && !this.DesignMode)
+            {
+                // Check Shortcuts
+                if (System.Windows.Forms.Control.ModifierKeys != Keys.None || wParamInt>= (int)eShortcut.F1 && wParamInt<= (int)eShortcut.F12)
+                {
+                    int i = (int)System.Windows.Forms.Control.ModifierKeys | wParamInt;
+                    if (ProcessShortcut((eShortcut)i))
+                        return true;
+                }
+            }
+
+            if ((System.Windows.Forms.Control.ModifierKeys & Keys.Alt) == Keys.Alt && wParamInt> 0x1B && m_Bars != null)
+            {
+                m_IgnoreSysKeyUp = true;
+                int key = 0;
+                if ((Control.ModifierKeys & Keys.Shift) == Keys.Shift)
+                {
+                    try
+                    {
+                        byte[] keyState = new byte[256];
+                        if (NativeFunctions.GetKeyboardState(keyState))
+                        {
+                            byte[] chars = new byte[2];
+                            if (NativeFunctions.ToAscii((uint)wParam, 0, keyState, chars, 0) != 0)
+                            {
+                                key = chars[0];
+                            }
+                        }
+                    }
+                    catch (Exception)
+                    {
+                        key = 0;
+                    }
+                }
+
+                if (key == 0)
+                    key = (int)NativeFunctions.MapVirtualKey((uint)wParam, 2);
+
+                if (key != 0)
+                {
+                    foreach (Bar b in m_Bars)
+                    {
+                        if (b.ItemsContainer != null && !b.ItemsContainer.DesignMode && b.Enabled && b.Visible)
+                        {
+                            if (b.ItemsContainer.SysKeyDown(key))
+                                return true;
+                        }
+                    }
+                }
+            }
+
+            if (wParamInt == 18)
+                _AltKeyDown = true;
+
+            return false;
+        }
+        private bool _AltKeyDown = false;
+        bool IMessageHandlerClient.OnSysKeyUp(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+            if (!m_ParentActivated && !(Form.ActiveForm is FloatingContainer) || this.DesignMode)
+                return false;
+            if (m_ParentForm != null && m_ParentForm.IsMdiChild && m_ParentForm.MdiParent != null && !m_ParentForm.MdiParent.Focused)
+                return false;
+
+            int wParamInt = WinApi.ToInt(wParam);
+            if (wParamInt == 18 && _AltKeyDown || wParamInt == 121)
+            {
+                _AltKeyDown = false;
+                if (m_IgnoreSysKeyUp)
+                {
+                    m_IgnoreSysKeyUp = false;
+                    return false;
+                }
+                if (m_EatSysKeyUp)
+                {
+                    m_EatSysKeyUp = false;
+                    return true;
+                }
+                foreach (Bar b in this.Bars)
+                {
+                    if (b.Visible) b.HideAllToolTips();
+                }
+                if (wParamInt== 18 || wParamInt== 121 && !m_IgnoreF10Key)
+                {
+                    DevComponents.DotNetBar.Bar bar = GetMenuBar();
+                    if (bar != null && !bar.ItemsContainer.DesignMode)
+                    {
+                        //						if(bar.Focused)
+                        //							bar.ReleaseFocus();
+                        //						else
+                        //							bar.SetSystemFocus();
+                        if (bar.MenuFocus)
+                            bar.MenuFocus = false;
+                        else
+                        {
+                            if (!m_ParentActivated)
+                                m_ParentForm.Activate();
+                            bar.MenuFocus = true;
+                        }
+                        return true;
+                    }
+                }
+            }
+            return false;
+        }
+
+		bool IMessageHandlerClient.IsModal
+		{
+			get
+			{
+                if (m_ParentForm != null && m_ParentActivated)
+					return m_ParentForm.Modal;
+				return false;
+			}
+		}
+        bool IMessageHandlerClient.OnMouseWheel(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+            return false;
+        }
+        bool IMessageHandlerClient.OnKeyDown(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+            bool designMode = this.DesignMode;
+
+            int wParamInt = WinApi.ToInt(wParam);
+            if (m_RegisteredPopups.Count > 0)
+            {
+                if (((BaseItem)m_RegisteredPopups[m_RegisteredPopups.Count - 1]).Parent == null)
+                {
+                    PopupItem objItem = (PopupItem)m_RegisteredPopups[m_RegisteredPopups.Count - 1];
+
+                    Control ctrl = objItem.PopupControl as Control;
+                    Control ctrl2 = Control.FromChildHandle(hWnd);
+
+                    if (ctrl2 != null)
+                    {
+                        while (ctrl2.Parent != null)
+                            ctrl2 = ctrl2.Parent;
+                    }
+
+                    bool bIsOnHandle = false;
+                    if (ctrl2 != null && objItem != null)
+                        bIsOnHandle = objItem.IsAnyOnHandle(ctrl2.Handle);
+
+                    bool bNoEat = ctrl != null && ctrl2 != null && ctrl.Handle == ctrl2.Handle || bIsOnHandle;
+
+                    if (!bIsOnHandle)
+                    {
+                        Keys key = (Keys)NativeFunctions.MapVirtualKey((uint)wParam, 2);
+                        if (key == Keys.None)
+                            key = (Keys)wParamInt;
+                        objItem.InternalKeyDown(new KeyEventArgs(key));
+                    }
+
+                    // Don't eat the message if the pop-up window has focus
+                    if (bNoEat)
+                        return false;
+                    return true && !designMode;
+                }
+            }
+
+            if (this.FocusedBar != null && !designMode)
+            {
+                bool bPassToMenu = true;
+                Control ctrl2 = Control.FromChildHandle(hWnd);
+                if (ctrl2 != null)
+                {
+                    while (ctrl2.Parent != null)
+                        ctrl2 = ctrl2.Parent;
+                    if ((ctrl2 is MenuPanel || ctrl2 is Bar || ctrl2 is PopupContainer || ctrl2 is PopupContainerControl) && ctrl2.Handle != hWnd)
+                        bPassToMenu = false;
+                }
+
+                if (bPassToMenu)
+                {
+                    Keys key = (Keys)NativeFunctions.MapVirtualKey((uint)wParam, 2);
+                    if (key == Keys.None)
+                        key = (Keys)wParamInt;
+                    this.FocusedBar.ExKeyDown(new KeyEventArgs(key));
+                    return true;
+                }
+            }
+            else if (wParamInt== 27) // Escape key
+            {
+                foreach (Bar bar in this.Bars)
+                {
+                    if (bar.IsBarMoving)
+                    {
+                        bar.OnEscapeKey();
+                        break;
+                    }
+                }
+            }
+
+            if (!m_ParentActivated && !(Form.ActiveForm is FloatingContainer) || designMode)
+                return false;
+            if (wParamInt>= 0x70 || System.Windows.Forms.Control.ModifierKeys != Keys.None || (WinApi.ToInt(lParam) & 0x1000000000) != 0 || wParamInt== 0x2E || wParamInt== 0x2D) // 2E=VK_DELETE, 2D=VK_INSERT
+            {
+                int i = (int)System.Windows.Forms.Control.ModifierKeys | wParamInt;
+                return ProcessShortcut((eShortcut)i);
+            }
+            return false;
+        }
+
+		private bool ProcessShortcut(eShortcut key)
+		{
+			bool eat=BarFunctions.ProcessItemsShortcuts(key,m_ShortcutTable);
+			if(m_AutoDispatchShortcuts!=null && m_AutoDispatchShortcuts.Contains(key))
+				eat=false;
+			return !m_DispatchShortcuts && eat; // True will eat the key, false will pass it through
+
+//			if(m_ShortcutTable.Contains(key))
+//			{
+//				ShortcutTableEntry objEntry=(ShortcutTableEntry)m_ShortcutTable[key];
+//				// Must convert to independable array, since if this is for example
+//				// close command first Click will destroy the collection we are
+//				// iterating through and exception will be raised.
+//				BaseItem[] arr=new BaseItem[objEntry.Items.Values.Count];
+//				objEntry.Items.Values.CopyTo(arr,0);
+//				Hashtable hnames=new Hashtable(arr.Length);
+//				
+//				bool eat=false;
+//
+//				foreach(BaseItem objItem in arr)
+//				{
+//					if(objItem.CanRaiseClick && (objItem.Name=="" || !hnames.Contains(objItem.Name)))
+//					{
+//						eat=true;
+//						objItem.RaiseClick();
+//						if(objItem.Name!="")
+//							hnames.Add(objItem.Name,"");
+//					}
+//				}
+//				
+//				if(m_AutoDispatchShortcuts!=null && m_AutoDispatchShortcuts.Contains(key))
+//					eat=false;
+//				return !m_DispatchShortcuts && eat; // True will eat the key, false will pass it through
+//			}
+//			return false;
+		}
+
+		bool IMessageHandlerClient.OnMouseDown(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+		{
+            if (_AltKeyDown)
+                m_IgnoreSysKeyUp = true;
+
+            if (m_RegisteredPopups == null || this.DesignMode)
+                return false;
+
+			if(m_RegisteredPopups.Count==0)
+			{
+				Bar menuBar=this.GetMenuBar();
+				if(menuBar!=null && menuBar.MenuFocus)
+				{
+					if(hWnd!=menuBar.Handle)
+						menuBar.MenuFocus=false;
+				}
+				return false;
+			}
+
+			//foreach(PopupItem objPopup in m_RegisteredPopups)
+			for(int i=m_RegisteredPopups.Count-1;i>=0;i--)
+			{
+				PopupItem objPopup=m_RegisteredPopups[i] as PopupItem;
+				System.Windows.Forms.Control objCtrl=objPopup.ContainerControl as System.Windows.Forms.Control;
+				bool bChildHandle=objPopup.IsAnyOnHandle(hWnd);
+
+				if(!bChildHandle)
+				{
+                    System.Windows.Forms.Control cTmp = System.Windows.Forms.Control.FromChildHandle(hWnd);
+                    if (cTmp != null)
+                    {
+                        if (cTmp is MenuPanel)
+                        {
+                            bChildHandle = true;
+                        }
+                        else
+                        {
+                            while (cTmp.Parent != null)
+                            {
+                                cTmp = cTmp.Parent;
+                                if (cTmp.GetType().FullName.IndexOf("DropDownHolder") >= 0 || cTmp is MenuPanel || cTmp is PopupContainerControl)
+                                {
+                                    bChildHandle = true;
+                                    break;
+                                }
+                            }
+                        }
+                        if (!bChildHandle)
+                            bChildHandle = objPopup.IsAnyOnHandle(cTmp.Handle);
+                    }
+                    else
+                    {
+                        string s = NativeFunctions.GetClassName(hWnd);
+                        s=s.ToLower();
+                        if (s.IndexOf("combolbox") >= 0)
+                            bChildHandle = true;
+                    }
+				}
+
+                if (!bChildHandle)
+                {
+                    Control popupContainer = objPopup.PopupControl;
+                    if (popupContainer != null)
+                        while (popupContainer.Parent != null) popupContainer = popupContainer.Parent;
+                    if (popupContainer != null && popupContainer.Bounds.Contains(Control.MousePosition))
+                        bChildHandle = true;
+                }
+
+				if(bChildHandle)
+					break;
+
+				if(objCtrl!=null && hWnd!=objCtrl.Handle && !bChildHandle)
+				{
+					if(objPopup.Parent!=null && !this.DesignMode)
+					{
+						/*if(objPopup.Expanded)
+						{
+							objPopup.Parent.AutoExpand=false;
+						}
+						else
+						{
+							objPopup.Parent.AutoExpand=true;
+						}*/
+					}
+					objPopup.Expanded=!objPopup.Expanded;
+					if(!objPopup.Expanded && objPopup.Parent!=null)
+					{
+						objPopup.Parent.AutoExpand=false;
+					}
+				}
+				else if(objCtrl==null && !bChildHandle)
+				{
+					objPopup.ClosePopup();
+				}
+
+				if(m_RegisteredPopups.Count==0)
+					break;
+			}
+			return false;
+		}
+
+		bool IMessageHandlerClient.OnMouseMove(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+		{
+			if(m_RegisteredPopups.Count>0)
+			{
+				bool eatMessage=true;
+				// This passes all messages to the registered popups and no mouse move message to anybody else
+				foreach(BaseItem item in m_RegisteredPopups)
+				{
+					Control ctrl=((PopupItem)item).PopupControl;
+					Control ctrlParent=null;
+					if(item.Parent!=null)
+						ctrlParent=item.Parent.ContainerControl as Control;
+
+					Control c=Control.FromChildHandle(hWnd);
+					if(c is MenuPanel && c.Parent!=null)
+						c=c.Parent;
+					else if(c!=null)
+					{
+						Control topParent=c;
+						while(topParent.Parent!=null)
+							topParent=topParent.Parent;
+						if(topParent is Bar || topParent is PopupContainerControl || topParent is PopupContainer)
+							c=topParent;
+					}
+					if(ctrl!=null && c!=null && ctrl!=c && !item.IsAnyOnHandle(c.Handle) && (ctrlParent==null || ctrlParent!=null && ctrlParent!=c))
+						eatMessage=eatMessage && true;
+					else
+					{
+						eatMessage=false;
+						break;
+					}
+				}
+				return eatMessage;
+			}
+			return false;
+		}
+
+		void IOwnerBarSupport.BarContextMenu(Control bar, MouseEventArgs e)
+		{
+			if(!ShowCustomizeContextMenu || m_frmCustomize!=null || this.DesignMode)
+				return;
+
+			// Create popup menu that lets users hide/show bars...
+			m_ContextMenu=new ButtonItem("sys_customizecontextnmenu");
+			ButtonItem btn;
+			eDotNetBarStyle style=eDotNetBarStyle.OfficeXP;
+			if(m_Bars.Count>0)
+				style=m_Bars[0].Style;
+			m_ContextMenu.Style=style;
+			foreach(Bar b in m_Bars)
+			{
+                if (b.LayoutType == eLayoutType.DockContainer && b.Items.Count == 0) continue;
+				// TODO: Menu Merge implementation
+				//if(b.CanHide && (!m_ParentForm.IsMdiChild || !b.MergeEnabled ))
+				if(b.CanHide && (b.LayoutType==eLayoutType.DockContainer && b.CanCustomize || b.LayoutType!=eLayoutType.DockContainer) && b.Text!="")
+				{
+					btn=new ButtonItem();
+					btn.Text=b.Text;
+					btn.Checked=b.Visible || b.AutoHide;
+					btn.SetSystemItem(true);
+					btn.Tag=b;
+					btn.Click+=new System.EventHandler(this.CustomizeItemClick);
+					m_ContextMenu.SubItems.Add(btn);
+				}
+			}
+			btn=new ButtonItem("customize");
+			if(m_ContextMenu.SubItems.Count>0)
+				btn.BeginGroup=true;
+			using(LocalizationManager lm=new LocalizationManager(this))
+			{
+				btn.Text=lm.GetLocalizedString(LocalizationKeys.CustomizeItemCustomize);
+			}
+			btn.SetSystemItem(true);
+			btn.Style=style;
+			btn.Click+=new System.EventHandler(this.CustomizeItemClick);
+			m_ContextMenu.SubItems.Add(btn);
+            OnCustomizeContextMenu(this, (ButtonItem)m_ContextMenu);
+			this.RegisterPopup(m_ContextMenu);
+			m_ContextMenu.PopupMenu(bar.PointToScreen(new Point(e.X,e.Y)));
+		}
+
+		private void CustomizeItemClick(object sender, System.EventArgs e)
+		{
+			BaseItem objItem=sender as BaseItem;
+			m_ContextMenu.Expanded=false;
+			if(objItem.Name=="customize")
+			{
+				this.Customize();
+			}
+			else
+			{
+				Bar bar=objItem.Tag as Bar;
+				if(bar.AutoHide)
+					bar.AutoHide=false;
+                if (!bar.Visible && bar.LayoutType == eLayoutType.DockContainer && bar.VisibleItemCount == 0 && bar.Items.Count > 0)
+                    bar.Items[0].Visible = true;
+				bar.Visible=!bar.Visible;
+				//if(!bar.Visible)
+				bar.RecalcLayout();
+				bar.InvokeUserVisibleChanged();
+			}
+			m_ContextMenu.Dispose();
+			m_ContextMenu=null;
+		}
+
+		/// <summary>
+		/// Resets all usage data collected by DotNetBar in relation to the Personalized menus.
+		/// </summary>
+		public void ResetUsageData()
+		{
+			foreach(Bar bar in m_Bars)
+			{
+				foreach(BaseItem item in bar.Items)
+				{
+					IPersonalizedMenuItem ipm=item as IPersonalizedMenuItem;
+					if(ipm!=null && ipm.MenuVisibility==eMenuVisibility.VisibleIfRecentlyUsed)
+						ipm.RecentlyUsed=false;
+					if(item.SubItems.Count>0)
+						ResetItemUsageData(item);
+				}
+			}
+		}
+
+		private void ResetItemUsageData(BaseItem item)
+		{
+			foreach(BaseItem child in item.SubItems)
+			{
+				IPersonalizedMenuItem ipm=child as IPersonalizedMenuItem;
+				if(ipm!=null && ipm.MenuVisibility==eMenuVisibility.VisibleIfRecentlyUsed)
+					ipm.RecentlyUsed=false;
+				if(child.SubItems.Count>0)
+					ResetItemUsageData(child);
+			}
+				
+		}
+
+		/// <summary>
+		/// Gets or sets whether customize context menu is shown on all bars or dock sites.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DefaultValue(true),System.ComponentModel.Category("Run-time Behavior"),System.ComponentModel.Description("Gets or sets whether customize context menu is shown on all bars or dock sites.")]
+		public bool ShowCustomizeContextMenu
+		{
+			get
+			{
+				return m_ShowCustomizeContextMenu;
+			}
+			set
+			{
+				m_ShowCustomizeContextMenu=value;
+			}
+		}
+
+		[Browsable(false),DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden),EditorBrowsable(EditorBrowsableState.Never)]
+		public bool PersonalizedAllVisible
+		{
+			get
+			{
+				return m_PersonalizedAllVisible;
+			}
+			set
+			{
+				m_PersonalizedAllVisible=value;
+			}
+		}
+
+        void IOwnerMenuSupport.ClosePopups()
+        {
+            ClosePopups();
+        }
+
+        private void ClosePopups()
+        {
+            ArrayList popupList = new ArrayList(m_RegisteredPopups);
+            foreach (PopupItem objPopup in popupList)
+                objPopup.ClosePopup();
+        }
+
+		void IOwnerItemEvents.InvokeItemTextChanged(BaseItem item, EventArgs e)
+		{
+			if(ItemTextChanged!=null)
+				ItemTextChanged(item,e);
+		}
+
+		void IOwner.InvokeResetDefinition(BaseItem item,EventArgs e)
+		{
+			if(ResetDefinition!=null)
+				ResetDefinition(item,e);
+		}
+
+		void IOwnerMenuSupport.InvokePopupContainerLoad(PopupItem item,EventArgs e)
+		{
+			if(PopupContainerLoad!=null)
+				PopupContainerLoad(item,e);
+		}
+
+		void IOwnerMenuSupport.InvokePopupContainerUnload(PopupItem item,EventArgs e)
+		{
+			if(PopupContainerUnload!=null)
+				PopupContainerUnload(item,e);
+		}
+
+		void IOwnerMenuSupport.InvokePopupOpen(PopupItem item,PopupOpenEventArgs e)
+		{
+			if(PopupOpen!=null)
+				PopupOpen(item,e);
+			#if TRIAL
+			iCount++;
+			#endif
+		}
+
+		void IOwnerMenuSupport.InvokePopupClose(PopupItem item,EventArgs e)
+		{
+			if(PopupClose!=null)
+				PopupClose(item,e);
+			#if TRIAL
+			if(iCount>iMaxCount || iMaxCount<=0)
+			{
+				iCount=0;
+				RemindForm f=new RemindForm();
+				f.ShowDialog();
+			}
+			#endif
+		}
+
+		void IOwnerMenuSupport.InvokePopupShowing(PopupItem item,EventArgs e)
+		{
+			if(PopupShowing!=null)
+				PopupShowing(item,e);
+		}
+
+		void IOwnerItemEvents.InvokeExpandedChange(BaseItem item,EventArgs e)
+		{
+			if(ExpandedChange!=null)
+				ExpandedChange(item,e);
+		}
+
+		void IOwnerBarSupport.InvokeBarDock(Bar bar,EventArgs e)
+		{
+			if(BarDock!=null)
+				BarDock(bar,e);
+		}
+
+		void IOwnerBarSupport.InvokeBarUndock(Bar bar,EventArgs e)
+		{
+			if(BarUndock!=null)
+				BarUndock(bar,e);
+		}
+
+		void IOwnerBarSupport.InvokeBeforeDockTabDisplay(BaseItem item,EventArgs e)
+		{
+			if(BeforeDockTabDisplay!=null)
+				BeforeDockTabDisplay(item,e);
+		}
+
+		void IOwnerItemEvents.InvokeMouseDown(BaseItem item, MouseEventArgs e)
+		{
+			if(MouseDown!=null)
+				MouseDown(item,e);
+			if(item.ClickAutoRepeat && e.Button==MouseButtons.Left)
+			{
+				m_ClickRepeatItem=item;
+				if(m_ClickTimer==null)
+					m_ClickTimer=new Timer();
+				m_ClickTimer.Interval=item.ClickRepeatInterval;
+				m_ClickTimer.Tick+=new EventHandler(this.ClickTimerTick);
+				m_ClickTimer.Start();
+			}
+		}
+
+		void IOwnerItemEvents.InvokeMouseEnter(BaseItem item,EventArgs e)
+		{
+			if(MouseEnter!=null)
+				MouseEnter(item,e);
+		}
+
+		void IOwnerItemEvents.InvokeMouseLeave(BaseItem item,EventArgs e)
+		{
+			if(MouseLeave!=null)
+				MouseLeave(item,e);
+		}
+
+		void IOwnerItemEvents.InvokeMouseHover(BaseItem item,EventArgs e)
+		{
+			if(MouseHover!=null)
+				MouseHover(item,e);
+		}
+
+//		void IOwnerItemEvents.InvokeItemDisplayedChanged(BaseItem item,EventArgs e)
+//		{
+//			if(ItemDisplayedChanged!=null)
+//				ItemDisplayedChanged(item,e);
+//		}
+
+		void IOwnerItemEvents.InvokeMouseMove(BaseItem item, MouseEventArgs e)
+		{
+			if(MouseMove!=null)
+				MouseMove(item,e);
+		}
+
+		private void ClickTimerTick(object sender, EventArgs e)
+		{
+			if(m_ClickRepeatItem!=null)
+				m_ClickRepeatItem.RaiseClick();
+			else
+				m_ClickTimer.Stop();
+		}
+
+		void IOwnerItemEvents.InvokeMouseUp(BaseItem item, MouseEventArgs e)
+		{
+			if(MouseUp!=null)
+				MouseUp(item,e);
+			if(m_ClickTimer!=null && m_ClickTimer.Enabled)
+			{
+				m_ClickTimer.Stop();
+				m_ClickTimer.Enabled=false;
+			}
+		}
+
+		void IOwnerItemEvents.InvokeGotFocus(BaseItem item,EventArgs e)
+		{
+			if(GotFocus!=null)
+				GotFocus(item,e);
+		}
+
+		void IOwnerItemEvents.InvokeLostFocus(BaseItem item,EventArgs e)
+		{
+			if(LostFocus!=null)
+				LostFocus(item,e);
+		}
+
+		void IOwner.InvokeUserCustomize(object sender,EventArgs e)
+		{
+			if(UserCustomize!=null)
+				UserCustomize(sender,e);
+		}
+
+		void IOwner.InvokeEndUserCustomize(object sender,EndUserCustomizeEventArgs e)
+		{
+			if(EndUserCustomize!=null)
+				EndUserCustomize(sender,e);
+		}
+
+		void IOwner.InvokeDefinitionLoaded(object sender,EventArgs e)
+		{
+			if(DefinitionLoaded!=null)
+				DefinitionLoaded(sender,e);
+		}
+
+		void IOwnerItemEvents.InvokeItemRemoved(BaseItem item, BaseItem parent, int itemIndex)
+		{
+			if(ItemRemoved!=null)
+			{
+                ItemRemoved(item, new ItemRemovedEventArgs(parent, itemIndex));
+			}
+		}
+
+		void IOwnerItemEvents.InvokeItemAdded(BaseItem item,EventArgs e)
+		{
+			if(ItemAdded!=null)
+				ItemAdded(item,e);
+		}
+
+		void IOwnerItemEvents.InvokeContainerLoadControl(BaseItem item,EventArgs e)
+		{
+			if(ContainerLoadControl!=null)
+				ContainerLoadControl(item,e);
+		}
+
+		void IOwnerItemEvents.InvokeContainerControlDeserialize(BaseItem item,ControlContainerSerializationEventArgs e)
+		{
+			if(ContainerControlDeserialize!=null)
+				ContainerControlDeserialize(item,e);
+		}
+
+		void IOwnerItemEvents.InvokeContainerControlSerialize(BaseItem item,ControlContainerSerializationEventArgs e)
+		{
+			if(ContainerControlSerialize!=null)
+				ContainerControlSerialize(item,e);
+		}
+
+		void IOwnerItemEvents.InvokeOptionGroupChanging(BaseItem item, OptionGroupChangingEventArgs e)
+		{
+			if(OptionGroupChanging!=null)
+				OptionGroupChanging(item,e);
+		}
+
+        void IOwnerItemEvents.InvokeCheckedChanged(ButtonItem item, EventArgs e)
+        {
+            if (ButtonCheckedChanged != null)
+                ButtonCheckedChanged(item, e);
+        }
+
+		void IOwnerItemEvents.InvokeToolTipShowing(object item, EventArgs e)
+		{
+			if(ToolTipShowing!=null)
+				ToolTipShowing(item,e);
+		}
+
+		void IOwnerBarSupport.InvokeDockTabChange(Bar bar,DockTabChangeEventArgs e)
+		{
+			if(DockTabChange!=null)
+				DockTabChange(bar,e);
+		}
+
+		void IOwnerBarSupport.InvokeBarClosing(Bar bar,BarClosingEventArgs e)
+		{
+			if(BarClosing!=null)
+				BarClosing(bar,e);
+		}
+
+		void IOwnerBarSupport.InvokeBarTearOff(Bar bar, EventArgs e)
+		{
+			if(BarTearOff!=null)
+                BarTearOff(bar,e);
+		}
+
+		void IOwnerBarSupport.InvokeAutoHideChanged(Bar bar,EventArgs e)
+		{
+			if(AutoHideChanged!=null)
+				AutoHideChanged(bar,e);
+		}
+
+		void IOwnerBarSupport.InvokeAutoHideDisplay(Bar bar,AutoHideDisplayEventArgs e)
+		{
+			if(AutoHideDisplay!=null)
+				AutoHideDisplay(bar,e);
+		}
+
+		internal bool IsHandleOwnedByPopup(IntPtr handle)
+		{
+			if(m_RegisteredPopups.Count>0)
+			{
+				foreach(BaseItem item in m_RegisteredPopups)
+				{
+					Control ctrl=((PopupItem)item).PopupControl;
+					if(ctrl!=null && ctrl.Handle==handle || item.IsAnyOnHandle(handle))
+						return true;
+				}
+			}
+			return false;
+		}
+
+		void IOwnerLocalize.InvokeLocalizeString(LocalizeEventArgs e)
+		{
+			if(LocalizeString!=null)
+				LocalizeString(this,e);
+		}
+
+		// *********************************************************************
+		//
+		// Extended Property ContextMenuEx implementation code
+		//
+		// *********************************************************************
+		//private delegate void WmContextEventHandler(object sender, WmContextEventArgs e);
+		//[DefaultValue(""),Editor(typeof(ContextExMenuTypeEditor), typeof(System.Drawing.Design.UITypeEditor))]
+		public string GetContextMenuEx(Control control) 
+		{
+			string text = (string)m_ContextExMenus[control];
+			if (text == null) 
+			{
+				text = string.Empty;
+			}
+			return text;
+		}
+		public void SetContextMenuEx(Control control, string value)
+		{
+			if (value == null) 
+			{
+				value = string.Empty;
+			}
+
+			if(value.Length == 0) 
+			{
+				if(m_ContextExMenus.Contains(control))
+				{
+					m_ContextExMenus.Remove(control);
+                    //control.MouseUp-=new MouseEventHandler(this.ContextExMouseUp);
+                    //try
+                    //{control.HandleDestroyed-=new EventHandler(this.ContextExHandleDestroy);}
+                    //catch{}
+                    //try
+                    //{control.HandleCreated-=new EventHandler(this.ContextExHandleCreate);}
+                    //catch{}
+				}
+			}
+			else 
+			{
+				if(m_ContextExMenus.Contains(control))
+				{
+					m_ContextExMenus[control] = value;
+				}
+				else
+				{
+					m_ContextExMenus[control] = value;
+				}
+			}
+		}
+
+        private bool _ActivateOnLayoutLoad= true;
+        /// <summary>
+        /// Gets or sets whether parent form is activated when dock window layout is loaded.
+        /// </summary>
+        [Browsable(false), DefaultValue(true)]
+        public bool ActivateOnLayoutLoad
+        {
+            get { return _ActivateOnLayoutLoad; }
+            set
+            {
+                _ActivateOnLayoutLoad = value;
+            }
+        }
+        
+    }
+	
+	internal class ShortcutTableEntry
+	{
+		public eShortcut Shortcut;
+		public Hashtable Items;
+		public ShortcutTableEntry(eShortcut key)
+		{
+			Shortcut=key;
+			Items=new Hashtable();
+		}
+		public override int GetHashCode()
+		{
+			return (int)Shortcut;
+		}
+	}
+
+	internal class ParentMsgHandler:NativeWindow
+	{
+		const int WM_WINDOWPOSCHANGING=0x0046;
+		//private DotNetBarManager m_BarControl;
+		private ArrayList m_Managers=new ArrayList();
+		private ArrayList m_Owners=new ArrayList();
+		private bool m_DesignMode=false;
+		public ParentMsgHandler(bool designmode):base()
+		{
+			//m_Managers.Add(objBarControl);
+			m_DesignMode=designmode;
+		}
+		public void Register(IOwner manager)
+		{
+			m_Managers.Add(manager);
+		}
+		public void Unregister(IOwner manager)
+		{
+			m_Managers.Remove(manager);
+		}
+		public bool IsRegistered(IOwner manager)
+		{
+			return m_Managers.Contains(manager);
+		}
+		public int RegisteredCount
+		{
+			get
+			{
+				return m_Managers.Count;
+			}
+		}
+		public void RegisterOwner(IOwner owner)
+		{
+			m_Owners.Add(owner);
+		}
+		public void UnregisterOwner(IOwner owner)
+		{
+			m_Owners.Remove(owner);
+		}
+		public bool IsOwnerRegistered(IOwner owner)
+		{
+			return m_Owners.Contains(owner);
+		}
+		public int RegisteredOwnersCount
+		{
+			get
+			{
+				return m_Owners.Count;
+			}
+		}
+        
+		public void ApplicationActivate()
+		{
+			if(m_Managers.Count>0)
+			{
+				IOwner[] managers;
+				lock(this)
+				{
+					managers=(IOwner[])m_Managers.ToArray(typeof(IOwner));
+				}
+                foreach (IOwner manager in managers)
+                {
+                    if (manager is Control && ((Control)manager).InvokeRequired)
+                    {
+                        ((Control)manager).BeginInvoke(new InvokeActivateDelegate(manager.OnApplicationActivate));
+                    }
+                    else
+                        manager.OnApplicationActivate();
+                }
+			}
+		}
+
+		public void ApplicationDeactivate()
+		{
+			if(m_Managers.Count>0)
+			{
+				IOwner[] managers;
+				lock(this)
+				{
+					managers=(IOwner[])m_Managers.ToArray(typeof(IOwner));
+				}
+                foreach (IOwner manager in managers)
+                {
+                    if (manager is Control && ((Control)manager).InvokeRequired)
+                    {
+                        ((Control)manager).BeginInvoke(new InvokeActivateDelegate(manager.OnApplicationDeactivate));
+                    }
+                    else
+                        manager.OnApplicationDeactivate();
+                }
+			}	
+		}
+
+        protected override void WndProc(ref Message m)
+        {
+            if (m.Msg == WM_WINDOWPOSCHANGING)
+            {
+                NativeFunctions.WINDOWPOS pos = new NativeFunctions.WINDOWPOS();
+                pos = (NativeFunctions.WINDOWPOS)m.GetLParam(pos.GetType());
+                if (pos.hwndInsertAfter != 0)
+                {
+                    if (m_Managers.Count > 0)
+                    {
+                        IOwner[] managers;
+                        lock (this)
+                        {
+                            managers = (IOwner[])m_Managers.ToArray(typeof(IOwner));
+                        }
+                        foreach (IOwner manager in managers)
+                            manager.OnParentPositionChanging();
+                    }
+                }
+            }
+            else
+            {
+                int wParamInt = WinApi.ToInt(m.WParam);
+                if (m.Msg == NativeFunctions.WM_ACTIVATEAPP)
+                {
+                    if (wParamInt!= 0)
+                    {
+                        DotNetBarManager.RelayApplicationActivate(true);
+                        //ApplicationActivate();
+                    }
+                    else
+                    {
+                        DotNetBarManager.RelayApplicationActivate(false);
+                        //ApplicationDeactivate();				
+                    }
+                }
+                else if (m.Msg == NativeFunctions.WM_ACTIVATE)
+                {
+                    if ((wParamInt & 0xFF) == NativeFunctions.WA_INACTIVE)
+                    {
+                        // Ignore if it is our Bar window that is being activated...
+                        Control ctrl = Control.FromChildHandle(m.LParam);
+                        bool customizing = false;
+                        foreach (IOwner manager in m_Managers)
+                        {
+                            if (manager is DotNetBarManager && ((DotNetBarManager)manager).IsCustomizing)
+                            {
+                                customizing = true;
+                                break;
+                            }
+                        }
+                        if (ctrl != null && !customizing)
+                        {
+                            while (ctrl.Parent != null)
+                                ctrl = ctrl.Parent;
+                            if (!(ctrl is DevComponents.DotNetBar.Bar || ctrl is DevComponents.DotNetBar.MenuPanel || ctrl is DevComponents.DotNetBar.PopupContainerControl || ctrl is DevComponents.DotNetBar.PopupContainer))
+                            {
+                                if (m_Managers.Count > 0)
+                                {
+                                    IOwner[] managers;
+                                    lock (this)
+                                    {
+                                        managers = (IOwner[])m_Managers.ToArray(typeof(IOwner));
+                                    }
+                                    foreach (IOwner manager in managers)
+                                        manager.SetExpandedItem(null);
+                                }
+                            }
+                        }
+                    }
+                }
+                else if (m.Msg == NativeFunctions.WM_DISPLAYCHANGE)
+                {
+                    NativeFunctions.OnDisplayChange();
+                }
+                else if (m.Msg == NativeFunctions.WM_NCACTIVATE && m_DesignMode && m.WParam == IntPtr.Zero)
+                {
+                    // THIS IS POSSIBLE TO USE ONLY WHILE WINDOW IS IN DESIGN MODE!!!
+                    if (m_Managers.Count > 0)
+                    {
+                        IOwner[] managers;
+                        lock (this)
+                        {
+                            managers = (IOwner[])m_Managers.ToArray(typeof(IOwner));
+                        }
+                        foreach (IOwner manager in managers)
+                            manager.SetExpandedItem(null);
+                        IOwner[] owners;
+                        lock (this)
+                        {
+                            owners = (IOwner[])m_Owners.ToArray(typeof(IOwner));
+                        }
+                        foreach (IOwner owner in owners)
+                            owner.SetExpandedItem(null);
+                    }
+                }
+            }
+
+            base.WndProc(ref m);
+        }
+	}
+
+	internal class MDIClientMsgHandler:NativeWindow
+	{
+		const int WM_MDISETMENU=0x230;
+        const int WM_MDIREFRESHMENU = 0x234;
+		public event EventHandler MdiSetMenu;
+		public bool EatMessage=false;
+		protected override void WndProc(ref Message m)
+		{
+            if (m.Msg == WM_MDISETMENU || m.Msg == WM_MDIREFRESHMENU)
+			{
+				if(MdiSetMenu!=null)
+					MdiSetMenu(this, new EventArgs());
+				if(EatMessage)
+				{
+					EatMessage=false;
+					return;
+				}
+			}
+			base.WndProc(ref m);
+		}
+	}
+
+	public class ItemRemovedEventArgs : EventArgs 
+	{
+		private readonly BaseItem parent;
+	    public readonly int ItemIndex;
+		public ItemRemovedEventArgs(BaseItem parentItem, int itemIndex)
+		{
+		    this.ItemIndex = itemIndex;
+			this.parent=parentItem;
+		}
+		public BaseItem Parent
+		{
+			get{return this.parent;}
+		}
+	}
+	public class CustomizeContextMenuEventArgs : EventArgs 
+	{
+		private readonly BaseItem parent;
+		public CustomizeContextMenuEventArgs(BaseItem parentItem) 
+		{
+			this.parent=parentItem;
+		}
+		public BaseItem Parent
+		{
+			get{return this.parent;}
+		}
+	}
+
+	public class DockTabChangeEventArgs : EventArgs 
+	{
+		public readonly BaseItem OldTab;
+		public readonly BaseItem NewTab;
+		public bool Cancel=false;
+		public DockTabChangeEventArgs(BaseItem oldtab,BaseItem newtab) 
+		{
+			this.OldTab=oldtab;
+			this.NewTab=newtab;
+		}
+	}
+
+	public class BarClosingEventArgs : EventArgs 
+	{
+		public bool Cancel=false;
+		public BarClosingEventArgs() 
+		{
+		}
+	}
+
+	public class AutoHideDisplayEventArgs : EventArgs
+	{
+        /// <summary>
+        /// Gets or sets the display rectangle for popup auto-hide bar.
+        /// </summary>
+		public Rectangle DisplayRectangle=Rectangle.Empty;
+		public AutoHideDisplayEventArgs(Rectangle displayRectangle)
+		{
+			this.DisplayRectangle=displayRectangle;
+		}
+	}
+
+	public class PopupOpenEventArgs : EventArgs
+	{
+		public bool Cancel=false;
+		public PopupOpenEventArgs() {}
+	}
+
+	/// <summary>
+	/// Event arguments for LocalizeString event.
+	/// </summary>
+	public class LocalizeEventArgs : EventArgs
+	{
+		/// <summary>
+		/// Indicates that event has been handled and that LocalizedValue should be used.
+		/// </summary>
+		public bool Handled=false;
+		/// <summary>
+		/// Indicates the string key for the text that needs to be localized.
+		/// </summary>
+		public string Key="";
+		/// <summary>
+		/// Indicates the localized text value. If you are performing custom string localization
+		/// you need to set this value to the translated text for current locale and you need to set
+		/// Handled property to true.
+		/// </summary>
+		public string LocalizedValue="";
+		/// <summary>
+		/// Default constructor.
+		/// </summary>
+		public LocalizeEventArgs() {}
+	}
+
+	/// <summary>
+	/// Event arguments for EndUserCustomize event.
+	/// </summary>
+	public class EndUserCustomizeEventArgs:EventArgs
+	{
+		/// <summary>
+		/// Indicates the customize action that user executed.
+		/// </summary>
+		public readonly eEndUserCustomizeAction Action;
+		/// <summary>
+		/// Default constructor.
+		/// </summary>
+		/// <param name="action">Indicates action user executed.</param>
+		public EndUserCustomizeEventArgs(eEndUserCustomizeAction action)
+		{
+			this.Action=action;
+		}
+        /// <summary>
+        /// Initializes a new instance of the EndUserCustomizeEventArgs class.
+        /// </summary>
+        /// <param name="action"></param>
+        /// <param name="actionData"></param>
+        public EndUserCustomizeEventArgs(eEndUserCustomizeAction action, object actionData)
+        {
+            Action = action;
+            ActionData = actionData;
+        }
+        /// <summary>
+        /// Gets any action data, might be null/nothing.
+        /// </summary>
+        public object ActionData;
+	}
+	
+	/// <summary>
+	/// Delegate for EndUserCustomize event.
+	/// </summary>
+	public delegate void EndUserCustomizeEventHandler(object sender, EndUserCustomizeEventArgs e);
+
+    public class ToolboxIconResFinder { }
+
+    internal delegate void InvokeActivateDelegate();
+
+    /// <summary>
+    /// Defines delegate for ActiveDockContainerChanged event.
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    public delegate void ActiveDockContainerChangedEventHandler(object sender, ActiveDockContainerChangedEventArgs e);
+    /// <summary>
+    /// Provides event arguments for ActiveDockContainerChanged event.
+    /// </summary>
+    public class ActiveDockContainerChangedEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets the DockContainerItem that has been activate or deactivated.
+        /// </summary>
+        public readonly DockContainerItem Item;
+
+        public readonly bool IsActive;
+
+        /// <summary>
+        /// Initializes a new instance of the ActiveDockContainerChangedEventArgs class.
+        /// </summary>
+        /// <param name="item"></param>
+        public ActiveDockContainerChangedEventArgs(DockContainerItem item, bool isActive)
+        {
+            Item = item;
+            IsActive = isActive;
+        }
+    }
+}
+ 
diff --git a/PROMS/DotNetBar Source Code/DotNetBarManager.ico b/PROMS/DotNetBar Source Code/DotNetBarManager.ico
new file mode 100644
index 00000000..153531ef
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DotNetBarManager.ico differ
diff --git a/PROMS/DotNetBar Source Code/DotNetBarManagerDesigner.cs b/PROMS/DotNetBar Source Code/DotNetBarManagerDesigner.cs
new file mode 100644
index 00000000..b3f81fc8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarManagerDesigner.cs	
@@ -0,0 +1,628 @@
+using System;
+using System.ComponentModel;
+using System.ComponentModel.Design;
+using System.Reflection;
+using System.Collections;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Summary description for DotNetBarDesigner.
+	/// </summary>
+	public class DotNetBarManagerDesigner:System.ComponentModel.Design.ComponentDesigner,IDesignerServices
+	{
+		private bool m_PopupProvider=false;
+		private bool m_Selected=false;
+		
+		public override DesignerVerbCollection Verbs 
+		{
+			get 
+			{
+				DesignerVerb[] verbs = new DesignerVerb[] {new DesignerVerb("Edit DotNetBar", new EventHandler(OnEditDotNetBar))															  ,
+					new DesignerVerb("Enable Document Docking", new EventHandler(OnEnableDocumentDocking))};
+				return new DesignerVerbCollection(verbs);
+			}
+		}
+
+		public override void DoDefaultAction()
+		{
+			DotNetBarManager dbm=this.Component as DotNetBarManager;
+			if(dbm!=null)
+			{
+				dbm.Customize(this);
+			}
+		}
+
+		protected override void Dispose(bool disposing) 
+		{
+			// Unhook events
+			if(disposing)
+			{
+				IComponentChangeService cc=(IComponentChangeService)GetService(typeof(IComponentChangeService));
+				if(cc!=null)
+					cc.ComponentRemoving-=new ComponentEventHandler(this.OnComponentRemoving);
+				ISelectionService ss = (ISelectionService)GetService(typeof(ISelectionService));
+				if (ss!=null)
+					ss.SelectionChanged-=new EventHandler(OnSelectionChanged);
+			}
+
+			base.Dispose(disposing);
+		}
+
+		private void ComponentRenamed(object sender, ComponentRenameEventArgs e)
+		{
+			IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+			if(dh==null)
+				return;
+
+			if(e.Component==dh.RootComponent || e.Component==this.Component)
+			{
+				DotNetBarManager m=this.Component as DotNetBarManager;
+				if(m!=null && m.DefinitionName!="")
+				{
+					if(DesignTimeDte.DeleteFromProject(m.DefinitionName, this.Component.Site))
+					{
+						m.DefinitionName="";
+						m.SaveDesignDefinition();
+					}
+				}
+			}
+		}
+		public override void Initialize(IComponent component) 
+		{
+			base.Initialize(component);
+			if(!component.Site.DesignMode)
+				return;
+
+			// If our component is removed we need to clean-up
+			IComponentChangeService cc=(IComponentChangeService)GetService(typeof(IComponentChangeService));
+			if(cc!=null)
+			{
+				cc.ComponentRemoving+=new ComponentEventHandler(this.OnComponentRemoving);
+				cc.ComponentRename+=new ComponentRenameEventHandler(this.ComponentRenamed);
+			}
+
+			ISelectionService ss =(ISelectionService)GetService(typeof(ISelectionService));
+			if(ss!=null)
+				ss.SelectionChanged+=new EventHandler(OnSelectionChanged);
+
+			IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+			if(dh==null)
+				return;
+
+			if(dh.Loading)
+			{
+				dh.LoadComplete+=new EventHandler(this.LoadComplete);
+				return;
+			}
+			
+		}
+
+#if FRAMEWORK20
+        public override void InitializeNewComponent(IDictionary defaultValues)
+        {
+            base.InitializeNewComponent(defaultValues);
+            SetDesignTimeDefaults();
+        }
+#else
+		public override void OnSetComponentDefaults()
+		{
+			base.OnSetComponentDefaults();
+			SetDesignTimeDefaults();
+		}
+#endif
+
+        private void SetDesignTimeDefaults()
+        {
+            SetupDockSites();
+
+            // Set auto shortcuts that are automatically dispatched...
+            DotNetBarManager m = this.Component as DotNetBarManager;
+            m.AutoDispatchShortcuts.Add(eShortcut.F1);
+            m.AutoDispatchShortcuts.Add(eShortcut.CtrlC);
+            m.AutoDispatchShortcuts.Add(eShortcut.CtrlA);
+            m.AutoDispatchShortcuts.Add(eShortcut.CtrlV);
+            m.AutoDispatchShortcuts.Add(eShortcut.CtrlX);
+            m.AutoDispatchShortcuts.Add(eShortcut.CtrlZ);
+            m.AutoDispatchShortcuts.Add(eShortcut.CtrlY);
+            m.AutoDispatchShortcuts.Add(eShortcut.Del);
+            m.AutoDispatchShortcuts.Add(eShortcut.Ins);
+            m.Style = eDotNetBarStyle.Office2003;
+        }
+
+		private void LoadComplete(object sender, EventArgs e)
+		{
+			IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+			if(dh!=null && e!=null)
+				dh.LoadComplete-=new EventHandler(this.LoadComplete);
+			LoadDefinition();
+		}
+
+		private void LoadDefinition()
+		{
+			// Make sure at-least this property is set
+			DotNetBarManager m=this.Component as DotNetBarManager;
+
+			if(m!=null && !m.IsDisposed && (m.LeftDockSite==null && m.RightDockSite==null && m.TopDockSite==null && m.BottomDockSite==null))
+			{
+				m_PopupProvider=true;
+				m.BarStreamLoad(true);
+			}
+			else
+			{
+				m_PopupProvider=false;
+				//m.BarStreamLoad(true);
+			}
+		}
+
+		private void OnEditDotNetBar(object sender, EventArgs e) 
+		{
+			DotNetBarManager dbm=this.Component as DotNetBarManager;
+			if(dbm!=null)
+				dbm.Customize(this);
+		}
+
+		private void OnEnableDocumentDocking(object sender, EventArgs e)
+		{
+			DotNetBarManager m=this.Component as DotNetBarManager;
+			if(m.FillDockSite==null)
+			{
+				IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+				if(dh==null)
+					return;
+
+				System.Windows.Forms.Control parent=dh.RootComponent as System.Windows.Forms.Control;
+				if(parent==null)
+					return;
+
+				IComponentChangeService cc=(IComponentChangeService)GetService(typeof(IComponentChangeService));
+				if(cc==null)
+					return;
+
+				DesignerTransaction trans=dh.CreateTransaction("Document Docking Enabled");
+				
+                DockSite fillDock=dh.CreateComponent(typeof(DockSite)) as DockSite;
+                fillDock.Dock=System.Windows.Forms.DockStyle.Fill;
+
+				cc.OnComponentChanging(parent,TypeDescriptor.GetProperties(typeof(System.Windows.Forms.Control))["Controls"]);
+				parent.Controls.Add(fillDock);
+				fillDock.BringToFront();
+				cc.OnComponentChanged(parent,TypeDescriptor.GetProperties(typeof(System.Windows.Forms.Control))["Controls"],null,null);
+
+				cc.OnComponentChanging(m,TypeDescriptor.GetProperties(typeof(DotNetBarManager))["FillDockSite"]);
+				m.FillDockSite=fillDock;
+				cc.OnComponentChanged(m,TypeDescriptor.GetProperties(typeof(DotNetBarManager))["FillDockSite"],null,fillDock);
+
+				DocumentDockContainer dockContainer=new DocumentDockContainer();
+				cc.OnComponentChanging(fillDock,TypeDescriptor.GetProperties(typeof(DockSite))["DocumentDockContainer"]);
+				fillDock.DocumentDockContainer=dockContainer;
+				cc.OnComponentChanged(fillDock,TypeDescriptor.GetProperties(typeof(DockSite))["DocumentDockContainer"],null,dockContainer);
+				
+				Bar bar=dh.CreateComponent(typeof(Bar)) as Bar;
+				BarUtilities.InitializeDocumentBar(bar);
+//				bar.LayoutType=eLayoutType.DockContainer;
+//				bar.DockTabAlignment=eTabStripAlignment.Top;
+//				bar.AlwaysDisplayDockTab=true;
+//				bar.Stretch=true;
+//				bar.GrabHandleStyle=eGrabHandleStyle.None;
+				TypeDescriptor.GetProperties(bar)["Style"].SetValue(bar,m.Style);
+//				bar.Style=m.Style;
+//				bar.CanDockBottom=false;
+//				bar.CanDockTop=false;
+//				bar.CanDockLeft=false;
+//				bar.CanDockRight=false;
+//				bar.CanDockDocument=true;
+//				bar.CanUndock=false;
+//				bar.CanHide=true;
+//				bar.CanCustomize=false;
+
+				DockContainerItem item=dh.CreateComponent(typeof(DockContainerItem)) as DockContainerItem;
+				item.Text=item.Name;
+				cc.OnComponentChanging(bar,TypeDescriptor.GetProperties(typeof(Bar))["Items"]);
+				bar.Items.Add(item);
+				PanelDockContainer panel=dh.CreateComponent(typeof(PanelDockContainer)) as PanelDockContainer;
+				cc.OnComponentChanging(bar, TypeDescriptor.GetProperties(typeof(Bar))["Controls"]);
+				item.Control=panel;                
+				cc.OnComponentChanged(bar, TypeDescriptor.GetProperties(typeof(Bar))["Controls"], null, null);
+                //bar.Controls.Add(panel);
+				panel.ColorSchemeStyle=m.Style;
+				panel.ApplyLabelStyle();
+				cc.OnComponentChanged(bar,TypeDescriptor.GetProperties(typeof(Bar))["Items"],null,null);
+
+				DocumentBarContainer doc=new DocumentBarContainer(bar);
+				dockContainer.Documents.Add(doc);
+                
+				cc.OnComponentChanging(fillDock,TypeDescriptor.GetProperties(typeof(DockSite))["Controls"]);
+				fillDock.Controls.Add(bar);
+				cc.OnComponentChanged(fillDock,TypeDescriptor.GetProperties(typeof(DockSite))["Controls"],null,null);
+
+				fillDock.RecalcLayout();
+				
+				trans.Commit();
+			}
+		}
+
+		#region IDesignerServices Implementation
+		public object CreateComponent(System.Type componentClass)
+		{
+			IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+			if(dh==null)
+				return null;
+			return dh.CreateComponent(componentClass);
+		}
+
+		public void DestroyComponent(IComponent c)
+		{
+			IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+			if(dh==null)
+				return;
+			dh.DestroyComponent(c);
+		}
+
+		object IDesignerServices.GetService(Type serviceType)
+		{
+			return this.GetService(serviceType);
+		}
+		#endregion
+
+		private void OnComponentRemoving(object sender,ComponentEventArgs e)
+		{
+			
+			if(e.Component!=this.Component)
+			{
+				return;
+			}
+			// Unhook events
+			IComponentChangeService cc=(IComponentChangeService)GetService(typeof(IComponentChangeService));
+			if(cc!=null)
+				cc.ComponentRemoving-=new ComponentEventHandler(this.OnComponentRemoving);
+            
+			DotNetBarManager m=this.Component as DotNetBarManager;
+			IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+			if(dh==null || m==null)
+				return;
+
+			if(m.TopDockSite!=null)
+				dh.DestroyComponent(m.TopDockSite);
+			if(m.BottomDockSite!=null)
+				dh.DestroyComponent(m.BottomDockSite);
+			if(m.LeftDockSite!=null)
+				dh.DestroyComponent(m.LeftDockSite);
+			if(m.RightDockSite!=null)
+				dh.DestroyComponent(m.RightDockSite);
+
+			if(m.DefinitionName!=null)
+			{
+				DesignTimeDte.DeleteFromProject(m.DefinitionName, this.Component.Site);
+				m.DefinitionName="";
+			}
+		}
+
+		protected override void PreFilterProperties(System.Collections.IDictionary properties) 
+		{
+			// Always call base first in PreFilter* methods, and last in PostFilter*
+			// methods.
+			base.PreFilterProperties(properties);
+
+			properties["ProvidePopupsOnly"] = TypeDescriptor.CreateProperty(
+				this.GetType(),		// the type this property is defined on
+				"ProvidePopupsOnly",	// the name of the property
+				typeof(bool),		// the type of the property
+				new Attribute[] {CategoryAttribute.Design,System.ComponentModel.DesignerSerializationVisibilityAttribute.Hidden,new DescriptionAttribute("When set to True DotNetBar provides Popups only without Toolbars or Menu Bars. Use on child forms to provide Context Menus.")});	// attributes
+
+			properties["Style"] = TypeDescriptor.CreateProperty(
+				this.GetType(),		// the type this property is defined on
+				"Style",	// the name of the property
+				typeof(eDotNetBarStyle),		// the type of the property
+				new Attribute[0]);
+
+			properties["ThemeAware"] = TypeDescriptor.CreateProperty(
+				this.GetType(),		// the type this property is defined on
+				"ThemeAware",	// the name of the property
+				typeof(bool),		// the type of the property
+				new Attribute[0]);
+		}
+
+		// Popup Provider is design-time only property that determines whether current DotNetBar provides
+		// Popup Context Menu only or is full blown Toolbar/Menu bar component
+		[DefaultValue(false)]
+		protected bool ProvidePopupsOnly
+		{
+			get 
+			{
+				return m_PopupProvider;
+			}
+			set 
+			{
+				if(m_PopupProvider==value)
+					return;
+				
+				m_PopupProvider=value;
+
+				DotNetBarManager m=this.Component as DotNetBarManager;
+				IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+
+				if(m_PopupProvider)
+				{
+					RemoveDockSites();
+					if(m!=null && dh!=null && dh.RootComponent is System.Windows.Forms.UserControl)
+					{
+						m.ParentUserControl=dh.RootComponent as System.Windows.Forms.UserControl;
+						IComponentChangeService cc=(IComponentChangeService)GetService(typeof(IComponentChangeService));
+						cc.OnComponentChanged(m,(TypeDescriptor.GetProperties(m)["ParentUserControl"]),null,null);
+					}
+				}
+				else
+				{
+					SetupDockSites();
+					if(m!=null)
+					{
+						m.ParentUserControl=null;
+						IComponentChangeService cc=(IComponentChangeService)GetService(typeof(IComponentChangeService));
+						cc.OnComponentChanged(m,(TypeDescriptor.GetProperties(m)["ParentUserControl"]),null,null);
+					}
+				}
+			}
+		}
+		public override System.Collections.ICollection AssociatedComponents
+		{
+			get
+			{
+				DotNetBarManager m=this.Component as DotNetBarManager;
+				if(m==null)
+					return base.AssociatedComponents;
+				System.Collections.ArrayList list=new System.Collections.ArrayList(4);
+				if(m.TopDockSite!=null)
+					list.Add(m.TopDockSite);
+				if(m.BottomDockSite!=null)
+					list.Add(m.BottomDockSite);
+				if(m.LeftDockSite!=null)
+					list.Add(m.LeftDockSite);
+				if(m.RightDockSite!=null)
+					list.Add(m.RightDockSite);
+				if(m.DefinitionName=="")
+				{
+					list.AddRange(m.Bars);
+					foreach(Bar bar in m.Bars)
+						AddItems(bar.ItemsContainer,list);
+					foreach(BaseItem item in m.Items)
+					{
+						list.Add(item);
+						AddItems(item,list);
+					}
+					foreach(BaseItem item in m.ContextMenus)
+					{
+						list.Add(item);
+						AddItems(item,list);
+					}
+				}
+				return list;
+			}
+		}
+		private void AddItems(BaseItem parent,System.Collections.ArrayList list)
+		{
+			foreach(BaseItem item in parent.SubItems)
+			{
+				if(!item.SystemItem)
+				{
+					list.Add(item);
+					if(item.SubItems.Count>0)
+						AddItems(item,list);
+				}
+			}
+		}
+		private void RemoveDockSites()
+		{
+			IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+			if(dh==null)
+				return;		
+
+			DotNetBarManager m=this.Component as DotNetBarManager;
+
+			if(m.LeftDockSite!=null)
+				dh.DestroyComponent(m.LeftDockSite);
+			if(m.RightDockSite!=null)
+				dh.DestroyComponent(m.RightDockSite);
+			if(m.TopDockSite!=null)
+				dh.DestroyComponent(m.TopDockSite);
+			if(m.BottomDockSite!=null)
+				dh.DestroyComponent(m.BottomDockSite);
+
+			m.LeftDockSite=null;
+			m.TopDockSite=null;
+			m.BottomDockSite=null;
+			m.RightDockSite=null;
+		}
+
+		private void SetupDockSites()
+		{
+			IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+			if(dh==null)
+			{
+				return;
+			}
+
+			if(dh.Loading)
+			{
+				dh.LoadComplete+=new EventHandler(this.LoadComplete);
+				return;
+			}
+
+			IComponentChangeService cc=(IComponentChangeService)GetService(typeof(IComponentChangeService));
+
+			// Set default properties for this control and add default dependent controls
+			DotNetBarManager m=this.Component as DotNetBarManager;
+			System.Windows.Forms.Form form=dh.RootComponent as System.Windows.Forms.Form;
+			System.Windows.Forms.UserControl parentControl=dh.RootComponent as System.Windows.Forms.UserControl;
+			if(m==null || (form==null && parentControl==null))
+			{
+				return;
+			}
+
+			if(form!=null)
+			{
+				try
+				{
+					m.ParentForm=form;
+
+					// Left Dock Site
+					DockSite ds=(DockSite)dh.CreateComponent(typeof(DockSite),"barLeftDockSite");
+					form.Controls.Add(ds);
+					m.LeftDockSite=ds;
+					ds.Dock=System.Windows.Forms.DockStyle.Left;
+
+					// Right Dock Site
+					ds=(DockSite)dh.CreateComponent(typeof(DockSite),"barRightDockSite");
+					form.Controls.Add(ds);
+					m.RightDockSite=ds;
+					ds.Dock=System.Windows.Forms.DockStyle.Right;
+
+					// Top Dock Site
+					ds=(DockSite)dh.CreateComponent(typeof(DockSite),"barTopDockSite");
+					form.Controls.Add(ds);
+					m.TopDockSite=ds;
+					ds.Dock=System.Windows.Forms.DockStyle.Top;
+					// Bottom Dock Site
+					ds=(DockSite)dh.CreateComponent(typeof(DockSite),"barBottomDockSite");
+					form.Controls.Add(ds);
+					m.BottomDockSite=ds;
+					ds.Dock=System.Windows.Forms.DockStyle.Bottom;
+
+					if(cc!=null)
+					{
+						cc.OnComponentChanging(form,TypeDescriptor.GetProperties(form).Find("Controls",true));
+						cc.OnComponentChanged(form,TypeDescriptor.GetProperties(form).Find("Controls",true),null,null);
+					}
+				}
+				catch(Exception e)
+				{
+					// DEBUG
+					System.Windows.Forms.MessageBox.Show("Error setting up dock sites: " + e.ToString());
+				}
+			}
+			else if(parentControl!=null)
+			{
+				try
+				{
+					// Left Dock Site
+					DockSite ds=(DockSite)dh.CreateComponent(typeof(DockSite),"barLeftDockSite");
+					parentControl.Controls.Add(ds);
+					m.LeftDockSite=ds;
+					ds.Dock=System.Windows.Forms.DockStyle.Left;
+
+					// Right Dock Site
+					ds=(DockSite)dh.CreateComponent(typeof(DockSite),"barRightDockSite");
+					parentControl.Controls.Add(ds);
+					m.RightDockSite=ds;
+					ds.Dock=System.Windows.Forms.DockStyle.Right;
+
+					// Top Dock Site
+					ds=(DockSite)dh.CreateComponent(typeof(DockSite),"barTopDockSite");
+					parentControl.Controls.Add(ds);
+					m.TopDockSite=ds;
+					ds.Dock=System.Windows.Forms.DockStyle.Top;
+					// Bottom Dock Site
+					ds=(DockSite)dh.CreateComponent(typeof(DockSite),"barBottomDockSite");
+					parentControl.Controls.Add(ds);
+					m.BottomDockSite=ds;
+					ds.Dock=System.Windows.Forms.DockStyle.Bottom;
+
+					if(cc!=null)
+					{
+						cc.OnComponentChanging(parentControl,TypeDescriptor.GetProperties(parentControl).Find("Controls",true));
+						cc.OnComponentChanged(parentControl,TypeDescriptor.GetProperties(parentControl).Find("Controls",true),null,null);
+					}
+				}
+				catch(Exception e)
+				{
+					// DEBUG
+					System.Windows.Forms.MessageBox.Show("Error setting up dock sites on UserControl: " + e.ToString());
+				}
+			}
+		}
+
+		private void OnSelectionChanged(object sender, EventArgs e) 
+		{
+			ISelectionService ss = (ISelectionService)sender;
+			if(ss!=null && ss.PrimarySelection==this.Component)
+			{
+				IOwner manager=this.Component as IOwner;
+				manager.OnApplicationActivate();
+				m_Selected=true;
+			}
+			else if(m_Selected)
+			{
+				IOwner manager=this.Component as IOwner;
+				manager.OnApplicationDeactivate();
+				m_Selected=false;
+			}
+		}
+		
+		public static bool OpenDesignerEditor(DotNetBarManager manager, Bar bar, IDesignerServices designerServices)
+		{
+			DevComponents.DotNetBar.Design.DotNetBarDesigner designer=new DevComponents.DotNetBar.Design.DotNetBarDesigner();
+			if(manager!=null)
+				designer.ExternalManager=manager;
+			else if(bar!=null)
+				designer.ExternalBar=bar;
+
+            if(designerServices!=null)
+				designer.DesignerServices=designerServices;
+
+			System.Windows.Forms.DialogResult dr=designer.ShowDialog();
+
+			if(dr==System.Windows.Forms.DialogResult.Yes)
+				return true;
+
+			return false;
+		}
+
+		/// <summary>
+		/// Sets the style of all items in DotNetBar Manager.
+		/// </summary>
+		public eDotNetBarStyle Style
+		{
+			set
+			{
+				DotNetBarManager manager=this.Component as DotNetBarManager;
+				if(manager.Style!=value)
+				{
+					manager.Style=value;
+					IDesignerHost dh=this.GetService(typeof(IDesignerHost)) as IDesignerHost;
+					if(dh!=null && !dh.Loading)
+						manager.SaveDesignDefinition();
+				}
+			}
+			get
+			{
+				DotNetBarManager manager=this.Component as DotNetBarManager;
+				return manager.Style;
+			}
+		}
+
+		/// <summary>
+		/// Specifies whether new bars created are drawn using Themes when running on OS that supports themes like Windows XP. Note this setting
+		/// applies to new bars created.
+		/// </summary>
+		public bool ThemeAware
+		{
+			set
+			{
+				DotNetBarManager manager=this.Component as DotNetBarManager;
+				if(manager.ThemeAware!=value)
+				{
+					manager.ThemeAware=value;
+					IDesignerHost dh=this.GetService(typeof(IDesignerHost)) as IDesignerHost;
+					if(dh!=null && !dh.Loading)
+						manager.SaveDesignDefinition();
+				}
+			}
+			get
+			{
+				DotNetBarManager manager=this.Component as DotNetBarManager;
+				return manager.ThemeAware;
+			}
+		}
+   
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarResourcesAttribute.cs b/PROMS/DotNetBar Source Code/DotNetBarResourcesAttribute.cs
new file mode 100644
index 00000000..53679778
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarResourcesAttribute.cs	
@@ -0,0 +1,22 @@
+using System;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Summary description for DotNetBarResourcesAttribute.
+	/// </summary>
+	[AttributeUsage(AttributeTargets.Assembly)]
+	public class DotNetBarResourcesAttribute:System.Attribute
+	{
+		private string m_NamespacePrefix="";
+		public DotNetBarResourcesAttribute(string namespacePrefix)
+		{
+			m_NamespacePrefix=namespacePrefix;
+		}
+
+		public virtual string NamespacePrefix
+		{
+			get {return m_NamespacePrefix;}
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarSourceDistribution.zip b/PROMS/DotNetBar Source Code/DotNetBarSourceDistribution.zip
new file mode 100644
index 00000000..12f55972
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DotNetBarSourceDistribution.zip differ
diff --git a/PROMS/DotNetBar Source Code/DotNetBarStreamer.cs b/PROMS/DotNetBar Source Code/DotNetBarStreamer.cs
new file mode 100644
index 00000000..58f81ddd
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarStreamer.cs	
@@ -0,0 +1,92 @@
+using System;
+using System.Runtime.Serialization;
+using System.Xml;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Summary description for DotNetBarStreamer.
+	/// </summary>
+	[Serializable()]
+	public sealed class DotNetBarStreamer:IDisposable,ISerializable
+	{
+		private XmlDocument m_XmlDoc=null;
+		private DotNetBarManager m_Owner=null;
+
+		private DotNetBarStreamer(){}
+		private DotNetBarStreamer(SerializationInfo info, StreamingContext c)
+		{
+			SerializationInfoEnumerator en=info.GetEnumerator();
+			while(en.MoveNext())
+			{
+				//System.Windows.Forms.MessageBox.Show("Read stream: "+en.Name);
+				if(en.Name=="dotnetbardata")
+				{
+					string s=(string)en.Value;
+					m_XmlDoc=new XmlDocument();
+                    m_XmlDoc.LoadXml(s);
+					break;
+				}
+			}
+		}
+		public DotNetBarStreamer(DotNetBarManager owner)
+		{
+			m_Owner=owner;
+		}
+
+		void ISerializable.GetObjectData (SerializationInfo info, StreamingContext context)
+		{
+			/*if(m_Owner==null)
+			{
+				if(m_XmlDoc!=null)
+                    System.Windows.Forms.MessageBox.Show("XML DOC IS not NULL !!!!");
+				else
+					System.Windows.Forms.MessageBox.Show("Serializing: NULL");
+			}
+			else
+				System.Windows.Forms.MessageBox.Show("Serializing VALUE");*/
+			if(m_Owner==null && m_XmlDoc==null)
+				return;
+
+			// Very important to set the type to string, if type is not set then
+			// complete assembly version is written to the file, probably becouse type is
+			// binary and when new version is compiled the old stream could not be loaded again.
+			string s=info.AssemblyName;
+			string[] sarr=s.Split(',');
+			s="";
+			for(int i=0;i<sarr.Length;i++)
+			{
+				if(!((string)sarr.GetValue(i)).ToLower().Trim().StartsWith("version"))
+				{
+					if(s!="") s+=",";
+					s+=sarr.GetValue(i);
+				}
+			}
+			info.AssemblyName=s;
+			//System.Reflection.AssemblyName name=System.Reflection.Assembly.GetExecutingAssembly().GetName();
+			
+			if(m_Owner!=null)
+			{
+				XmlDocument xml=new XmlDocument();
+				m_Owner.SaveDefinition(xml);
+				
+				info.AddValue("dotnetbardata",xml.OuterXml);
+			}
+			else
+				info.AddValue("dotnetbardata",m_XmlDoc.OuterXml);
+		}
+
+		internal XmlDocument Data
+		{
+			get
+			{
+				return m_XmlDoc;
+			}
+		}
+
+		void IDisposable.Dispose()
+		{
+			m_Owner=null;
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/DotNetBarWinFormsLicense.rtf b/PROMS/DotNetBar Source Code/DotNetBarWinFormsLicense.rtf
new file mode 100644
index 00000000..66e2f419
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DotNetBarWinFormsLicense.rtf	
@@ -0,0 +1,39 @@
+{\rtf1\ansi\ansicpg1252\deff0\deflang1033\deflangfe1033{\fonttbl{\f0\fswiss\fprq2\fcharset0 Calibri;}}
+{\colortbl ;\red255\green0\blue0;}
+{\*\generator Msftedit 5.41.15.1515;}\viewkind4\uc1\pard\sa200\sl276\slmult1\f0\fs18 This license agreement covers all existing versions of DotNetBar Component.\par
+DevComponents reserves all rights not expressly granted here.\par
+IF YOU PURCHASE THE SOURCE CODE THE SALE IS FINAL. A SOURCE CODE LICENSE INCLUDES 1 (ONE) DOTNETBAR DESIGN-TIME LICENSE.\par
+You will need one license of DotNetBar for each developer on your project. DotNetBar is run-time royalty free. Site license provides design-time license for all developers employed by the company within 1 miles radius of one department/address within company or for up to 20 developers employed by the company at separate geographic locations. Enterprise world-wide license provides design-time license for all developers employed by the company world-wide.\par
+Microsoft Office 2007 adds new User Interface capabilities for organizing and navigating applications. DotNetBar installs these UI capabilities as part of its component suite. The Office 2007 User Interface capabilities include:\par
+\pard\fi-360\li720\sa200\sl276\slmult1 a)\tab The Ribbon \par
+b)\tab Application Menu \par
+c)\tab Contextual Tabs \par
+d)\tab Keytips \par
+e)\tab Galleries\par
+\pard\sa200\sl276\slmult1 When using the Microsoft Office 2007 UI capabilities provided as part of DotNetBar Suite for Windows Forms, be aware that the DotNetBar Suite license grants you no rights to the Microsoft office 2007 UI. For more information and to obtain such license visit http://msdn.microsoft.com/officeui\par
+The product in this package (libraries and object code) is proprietary to DevComponents and is protected by Federal Copyright Law. DevComponents retains the title to and ownership of the Product. You are licensed to use this Product on the following terms and conditions:\par
+LICENSE - The licensee is defined as a single company site/office utilizing the Product. This license is not for an entire company but for a single physical site/office within the company. DevComponents hereby grants the licensee a nonexclusive license authorizing the licensee to use the enclosed Product on any computer at single company site for development purposes. Please contact DevComponents if you require additional licenses. You may incorporate the sample code into your applications. Use of this product by anyone other than the licensee terminates, without notification, this license and the right to use this product.\par
+YOU MAY NOT: Distribute, rent, sub-license or otherwise make available to others the software or documentation or copies thereof, except as expressly permitted in this License without prior written consent from DevComponents.  In the case of an authorized transfer, the transferee must agree to be bound by the terms and conditions of this License Agreement.\par
+RESTRICTIONS: - You may use this Product in your business application for sale or distribution as long as: \par
+The product that you produce and/or distribute is NOT a product that is similar or only extends DotNetBar Component functionality in any way. Please contact DevComponents for special commercial licensing provisions in these circumstances. The software serial number and user must be registered with DevComponents in order to receive support or distribution rights. You may not remove any proprietary notices, labels, and trademarks on the software or documentation. DotNetBar may not be distributed for any other purpose than to accompany software that you have developed using DotNetBar. You many not remove the licensing code from DotNetBar if you are compiling the custom versions using source code license.\par
+You may not modify, decompile, disassemble, reverse engineer or translate the software.\par
+SOURCE CODE: If you have purchased a license to the source code, you may make modifications, enhancements, derivative works and/or extensions to that licensed source code provided to you under the terms set forth as follows:\par
+\pard\fi-360\li720\sa200\sl276\slmult1 a)\tab While DevComponents does not claim any ownership rights in applications, frameworks or components developed using the SOFTWARE, in the event you develop any modifications, enhancements, derivative works and/or extensions to the licensed source code, either independently or jointly with DevComponents, such modifications, enhancements, derivative works and/or extensions and all rights associated therewith will be the exclusive property of DevComponents. You will not grant, either expressly or impliedly, any rights, title, interest, or licenses to any such modifications, enhancements, derivative works and/or extensions to any third party. You will, however, be entitled to use such modifications, enhancements, derivative works and/or extensions under the terms set forth in this agreement. You hereby assign all rights, title and interest in and to such modifications, enhancements, derivative works and/or extensions to the licensed source code to DevComponents. You also agree to execute, acknowledge and deliver to DevComponents all documents and do all things DevComponents deems necessary or desirable, at no cost to you but at DevComponents expense, to enable DevComponents to obtain and secure such modifications, enhancements, derivative works and/or extensions anywhere in the World. You agree to secure all necessary rights and obligations from relevant employees or third parties in order to satisfy the above obligations.\par
+b)\tab You may not distribute the DevComponents source code, or any modification, enhancement, derivative work and/or extension thereto, in source code form.\par
+c)\tab The source code contained herein and in related files is provided to the registered developer for the sole purposes of education and troubleshooting. Under no circumstances may any portion of the source code be distributed, disclosed or otherwise made available to any third party without the express, prior written consent of DevComponents.\par
+d)\tab Under no circumstances may the source code be used in whole or in part, as the basis for creating a product that provides the same, or substantially the same, functionality as any DevComponents product. You will not take any action, or assist or otherwise aid anyone else in taking any action which would limit DevComponents\rquote  independent development, sale, assignment, licensing or use of its own software or any modification, enhancement, derivative work and/or extension thereto.\par
+e)\tab You will not modify or delete, in whole or part, any copyright, trade secret, proprietary, confidential or other notice thereon or therein without the express, prior written consent of DevComponents.\par
+f)\tab If you purchased the source code and you make your own builds you must change the assembly file name.\par
+g)\tab YOU UNDERSTAND AND ACKNOWLEDGE THAT SOURCE CODE IS LICENSED AS IS, AND THAT DevComponents DOES NOT PROVIDE ANY TECHNICAL SUPPORT FOR SOURCE CODE.\par
+\pard\sa200\sl276\slmult1\cf1 REDISTRIBUTABLE COMPONENTS: FILES THAT MAY BE DISTRIBUTED WITH YOUR APPLICATION: \b DEVCOMPONENTS.DOTNETBAR.DLL, DEVCOMPONENTS.DOTNETBAR2.DLL, DEVCOMPONENTS.INSTRUMENTATION.DLL, DEVCOMPONENTS.DOTNETBAR.SCHEDULE.DLL, DEVCOMPONENTS.DOTNETBAR.KEYBOARD.DLL, DevComponents.TreeGX.dllm DevComponents.DotNetBar.SuperGrid.dll\par
+\cf0\b0 In addition to the other requirements in this license, you hereby agree to indemnify, hold harmless, and defend DevComponents from and against any and all liabilities, damages, losses, costs and expenses (including reasonable attorneys' fees) arising from or related to any claim, action, proceeding or allegation that arises or results, either directly or indirectly, from the use and distribution of any of your software application product(s) or components.\par
+US GOVERNMENT RESTRICTED RIGHTS - Use, duplication or disclosure by the United States Government is subject to restrictions as set forth under DFARS 252.227-7013 or in FARS 52.227-19 Commercial Computer Software - Restricted Rights.\par
+TERM - You may terminate your License and this Agreement at anytime by destroying all copies of the Product and Product Documentation.  They will also terminate automatically if you fail to comply with any term or condition in this Agreement.\par
+LIMITED WARRANTY - THIS SOFTWARE AND DOCUMENTATION ARE SOLD "AS IS" WITHOUT ANY WARRANTY AS TO THEIR PERFORMANCE, MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE.  THE LICENSEE ASSUMES THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE SOFTWARE. YOU USE "DOTNETBAR" AT YOUR OWN RISK. THE AUTHOR WILL NOT BE LIABLE FOR DATA LOSS, DAMAGES, LOSS OF PROFITS OR ANY OTHER KIND OF LOSS WHILE USING OR MISUSING THIS SOFTWARE. DEVCOMPONENTS WARRANTS THAT THE DISKETTES ON WHICH THE PROGRAM IS FURNISHED WILL BE FREE FROM ANY DEFECTS IN MATERIALS.  EXCLUSIVE REMEDY IN THE EVENT OF A DEFECT IS EXPRESSLY LIMITED TO THE REPLACEMENTS OF DISKETTES.  IN NO EVENT SHALL DEVCOMPONENTS OR ANYONE ELSE WHO HAS BEEN INVOLVED IN THE CREATION, DEVELOPMENT, PRODUCTION, OR DELIVERY OF THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INCIDENTAL OR CONSEQUENTIAL DAMAGES, SUCH AS, BUT NOT LIMITED TO, LOSS OF ANTICIPATED PROFITS, BENEFITS, USE, OR DATA RESULTING FROM THE USE OF THIS SOFTWARE, OR ARISING OUT OF ANY BREACH OF WARRANTY.\par
+LIMITATION OF LIABILITIES: DevComponents' liability, whether in contract, tort, or otherwise, arising out of Licensee's use of, or in connection with, the SOFTWARE, or otherwise under this Agreement, shall not exceed the amount of the license fee paid by you to DevComponents. IN NO EVENT SHALL DEVCOMPONENTS OR ITS SUPPLIERS BE LIABLE FOR ANY SPECIAL, INCIDENTAL, INDIRECT, OR CONSEQUENTIAL DAMAGES WHATSOEVER (INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF BUSINESS PROFITS, BUSINESS INTERRUPTION, LOSS OF BUSINESS INFORMATION, OR ANY OTHER PECUNIARY LOSS) ARISING OUT OF THE USE OF OR INABILITY TO USE THE SOFTWARE, EVEN IF DEVCOMPONENTS HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.\par
+Some states and jurisdictions do not allow the exclusion or limitation of liability for consequential or incidental damages, or the exclusion of implied warranties or limitations on how long a warranty may last, so the limitations in Sections XI and XII may not apply to you.\par
+INSTALLING AND USING DOTNETBAR SIGNIFIES ACCEPTANCE OF THESE TERMS AND CONDITIONS OF THE LICENSE.\par
+THE TERMS OF THIS LICENSE, AS WELL AS THE DOTNETBAR INTERFACE DESIGN AND FILE FORMATS ARE SUBJECTS OF CHANGES IN FUTURE VERSIONS OF DOTNETBAR.\par
+If you do not agree with the terms of this license you must remove DotNetBar files from your storage devices and cease to use the product.\par
+}
+
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/DoubleInput.ico b/PROMS/DotNetBar Source Code/DoubleInput.ico
new file mode 100644
index 00000000..b9942fbd
Binary files /dev/null and b/PROMS/DotNetBar Source Code/DoubleInput.ico differ
diff --git a/PROMS/DotNetBar Source Code/Dpi.cs b/PROMS/DotNetBar Source Code/Dpi.cs
new file mode 100644
index 00000000..f8ff7630
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Dpi.cs	
@@ -0,0 +1,324 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Drawing;
+using System.Text;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Provides High DPI support for DotNetBar controls.
+    /// </summary>
+    public static class Dpi
+    {
+        private static SizeF _Factor = new SizeF(1f, 1f);
+        private static bool _UseFactor = false;
+        private static bool _NormalizeScaleFactor = false;
+
+        static Dpi()
+        {
+            //Debug.WriteLine("Static constructor");
+        }
+
+        private static bool _RecordScalePerControl = false;
+        /// <summary>
+        /// Indicates whether static scale factor is set when child controls get ScaleControl call. When set to false 
+        /// this is done only from parent OfficeForm or RibbonForm.
+        /// </summary>
+        public static bool RecordScalePerControl
+        {
+            get { return _RecordScalePerControl; }
+            set { _RecordScalePerControl = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether scale factor when set is normalized so both Width and Height values are the same. Default value is false.
+        /// If using ScaleMode=font the scale factor might not be same for Width and Height so this allows opportunity to keep existing size ratios on the DotNetBar sized controls.
+        /// When set to true the scale factor Height will always be set to scale factor Width.
+        /// </summary>
+        public static bool NormalizeScaleFactor
+        {
+            get { return _NormalizeScaleFactor; }
+            set { _NormalizeScaleFactor = value; }
+        }
+
+        public static SizeF Factor
+        {
+            get { return _Factor; }
+        }
+
+        public static bool UseFactor
+        {
+            get { return (_UseFactor); }
+        }
+
+        public static Size Size(Size size)
+        {
+            if (!_UseFactor) return size;
+            size.Width = (int)(size.Width * _Factor.Width);
+            size.Height = (int)(size.Height * _Factor.Height);
+            return size;
+        }
+
+        public static Size Size(Size size, SizeF factor)
+        {
+            size.Width = (int)(size.Width * factor.Width);
+            size.Height = (int)(size.Height * factor.Height);
+            return size;
+        }
+
+        public static Size ImageSize(Size size)
+        {
+            if (!_UseFactor || !_AutoScaleImages) return size;
+            size.Width = (int)(size.Width * _Factor.Width);
+            size.Height = (int)(size.Height * _Factor.Height);
+            return size;
+        }
+
+        public static Size Size(int width, int height)
+        {
+            if (!_UseFactor)
+                return (new Size(width, height));
+
+            Size size = new Size(
+                (int)(width * _Factor.Width),
+                (int)(height * _Factor.Height));
+
+            return (size);
+        }
+
+        public static Rectangle Size(Rectangle r)
+        {
+            if (!_UseFactor) return r;
+            r.Width = (int)(r.Width * _Factor.Width);
+            r.Height = (int)(r.Height * _Factor.Height);
+            return r;
+        }
+
+        public static Point Size(Point p)
+        {
+            if (!_UseFactor) return p;
+            p.X = (int)(p.X * _Factor.Width);
+            p.Y = (int)(p.Y * _Factor.Height);
+            return p;
+        }
+
+        public static DevComponents.DotNetBar.Padding Size(DevComponents.DotNetBar.Padding padding)
+        {
+            if (!_UseFactor) return padding;
+            return new Padding((int)(padding.Left * _Factor.Width), (int)(padding.Right * _Factor.Width), (int)(padding.Top * _Factor.Height), (int)(padding.Bottom * _Factor.Height));
+        }
+
+        public static int DescaleWidth(int width)
+        {
+            if (!_UseFactor) return width;
+            return (int)(width / _Factor.Width);
+        }
+        public static int DescaleHeight(int height)
+        {
+            if (!_UseFactor) return height;
+            return (int)(height / _Factor.Height);
+        }
+
+        internal static System.Drawing.Size Descale(System.Drawing.Size size)
+        {
+            if (!_UseFactor) return size;
+            size.Width = (int)(size.Width / _Factor.Width);
+            size.Height = (int)(size.Height / _Factor.Height);
+            return size;
+        }
+
+        public static int Width(int width)
+        {
+            if (!_UseFactor) return width;
+            return (int)(width * _Factor.Width);
+        }
+        public static int ImageWidth(int width)
+        {
+            if (!_UseFactor || !_AutoScaleImages) return width;
+            return (int)(width * _Factor.Width);
+        }
+
+        public static int Height(int height)
+        {
+            if (!_UseFactor) return height;
+            return (int)(height * _Factor.Height);
+        }
+        public static int ImageHeight(int height)
+        {
+            if (!_UseFactor || !_AutoScaleImages) return height;
+            return (int)(height * _Factor.Height);
+        }
+
+        public static float Height(float height)
+        {
+            if (!_UseFactor) return height;
+            return (height * _Factor.Height);
+        }
+
+        private static int _CaptionVerticalPadding = 10;
+        public static int CaptionVerticalPadding
+        {
+            get
+            {
+                if (!_UseFactor) return 0;
+                return _CaptionVerticalPadding;
+            }
+        }
+
+        public static void SetScaling(SizeF factor)
+        {
+            if (factor.Width < 1f) factor.Width = 1f;
+            if (factor.Height < 1f) factor.Height = 1f;
+            
+            if (factor == _Factor) return;
+
+            if (_NormalizeScaleFactor)
+                factor.Height = factor.Width;
+
+            if (factor.Width == 1f && factor.Height == 1f)
+            {
+                _UseFactor = false;
+                _Factor = factor;
+            }
+            else
+            {
+                _UseFactor = true;
+                _Factor = factor;
+            }
+
+            UpdateStaticSizes();
+        }
+
+        private static bool _AutoScaleImages=true;
+        /// <summary>
+        /// Indicates whether controls will automatically scale current images based on the current DPI. Depending on scaling this may result in pixalted images.
+        /// Best policy is to provide separate images for each DPI level Windows runs on and if you do that you need to set this property to false to disable
+        /// automatic size scaling for the images. Default value is true which causes the images to be upscaled.
+        /// </summary>
+        public static bool AutoScaleImages
+        {
+            get { return _AutoScaleImages; }
+            set { _AutoScaleImages = value; }
+        }
+
+        private static void UpdateStaticSizes()
+        {
+            Width1 = Dpi.Width(1);
+            Width2 = Dpi.Width(2);
+            Width3 = Dpi.Width(3);
+            Width4 = Dpi.Width(4);
+            Width5 = Dpi.Width(5);
+            Width6 = Dpi.Width(6);
+            Width7 = Dpi.Width(7);
+            Width8 = Dpi.Width(8);
+            Width9 = Dpi.Width(9);
+            Width10 = Dpi.Width(10);
+            Width11 = Dpi.Width(11);
+            Width12 = Dpi.Width(12);
+            Width13 = Dpi.Width(13);
+            Width14 = Dpi.Width(14);
+            Width15 = Dpi.Width(15);
+            Width16 = Dpi.Width(16);
+            Width17 = Dpi.Width(17);
+            Width18 = Dpi.Width(18);
+            Width20 = Dpi.Width(20);
+            Width22 = Dpi.Width(22);
+            Width24 = Dpi.Width(24);
+            Width25 = Dpi.Width(25);
+            Width26 = Dpi.Width(26);
+            Width28 = Dpi.Width(28);
+            Width32 = Dpi.Width(32);
+            Width34 = Dpi.Width(34);
+            Width80 = Dpi.Width(80);
+            Width100 = Dpi.Width(100);
+
+            Height1 = Dpi.Height(1);
+            Height2 = Dpi.Height(2);
+            Height3 = Dpi.Height(3);
+            Height4 = Dpi.Height(4);
+            Height5 = Dpi.Height(5);
+            Height6 = Dpi.Height(6);
+            Height7 = Dpi.Height(7);
+            Height8 = Dpi.Height(8);
+            Height9 = Dpi.Height(9);
+            Height10 = Dpi.Height(10);
+            Height11 = Dpi.Height(11);
+            Height12 = Dpi.Height(12);
+            Height13 = Dpi.Height(13);
+            Height14 = Dpi.Height(14);
+            Height15 = Dpi.Height(15);
+            Height16 = Dpi.Height(16);
+            Height17 = Dpi.Height(17);
+            Height18 = Dpi.Height(18);
+            Height20 = Dpi.Height(20);
+            Height22 = Dpi.Height(22);
+            Height23 = Dpi.Height(23);
+            Height24 = Dpi.Height(24);
+            Height25 = Dpi.Height(25);
+            Height28 = Dpi.Height(28);
+            Height32 = Dpi.Height(32);
+            Height50 = Dpi.Height(50);
+        }
+
+        #region Static Sizes
+
+        public static int Width1 = 1;
+        public static int Width2 = 2;
+        public static int Width3 = 3;
+        public static int Width5 = 5;
+        public static int Width4 = 4;
+        public static int Width6 = 6;
+        public static int Width7 = 7;
+        public static int Width8 = 8;
+        public static int Width9 = 9;
+        public static int Width10 = 10;
+        public static int Width11 = 11;
+        public static int Width12 = 12;
+        public static int Width13 = 13;
+        public static int Width14 = 14;
+        public static int Width15 = 15;
+        public static int Width16 = 16;
+        public static int Width17 = 17;
+        public static int Width18 = 18;
+        public static int Width20 = 20;
+        public static int Width22 = 22;
+        public static int Width24 = 24;
+        public static int Width25 = 25;
+        public static int Width26 = 26;
+        public static int Width28 = 28;
+        public static int Width32 = 32;
+        public static int Width34 = 34;
+        public static int Width80 = 80;
+        public static int Width100 = 100;
+        
+        public static int Height1 = 1;
+        public static int Height2 = 2;
+        public static int Height3 = 3;
+        public static int Height4 = 4;
+        public static int Height5 = 5;
+        public static int Height6 = 6;
+        public static int Height7 = 7;
+        public static int Height8 = 8;
+        public static int Height9 = 9;
+        public static int Height10 = 10;
+        public static int Height11 = 11;
+        public static int Height12 = 12;
+        public static int Height13 = 13;
+        public static int Height14 = 14;
+        public static int Height15 = 15;
+        public static int Height16 = 16;
+        public static int Height17 = 17;
+        public static int Height18 = 18;
+        public static int Height20 = 20;
+        public static int Height22 = 22;
+        public static int Height23 = 23;
+        public static int Height24 = 24;
+        public static int Height25 = 25;
+        public static int Height28 = 28;
+        public static int Height32 = 32;
+        public static int Height50 = 50;
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/DualButton.cs b/PROMS/DotNetBar Source Code/DualButton.cs
new file mode 100644
index 00000000..bb5701ab
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/DualButton.cs	
@@ -0,0 +1,516 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.ComponentModel;
+using DevComponents.DotNetBar.Rendering;
+
+namespace DevComponents.DotNetBar
+{
+    public class DualButton : BaseItem
+    {
+        #region Constructor
+        /// <summary>
+        /// Initializes a new instance of the DualButton class.
+        /// </summary>
+        public DualButton()
+        {
+            RecreatePaths(_ButtonSize);
+        }
+        protected override void Dispose(bool disposing)
+        {
+            if (_TopPartPath != null)
+            {
+                _TopPartPath.Dispose();
+                _TopPartPath = null;
+            }
+            if (_BottomPartPath != null)
+            {
+                _BottomPartPath.Dispose();
+                _BottomPartPath = null;
+            }
+
+            base.Dispose(disposing);
+        }
+        #endregion
+
+        #region Implementation
+        public override BaseItem Copy()
+        {
+            DualButton button = new DualButton();
+            CopyToItem(button);
+            return button;
+        }
+        protected override void CopyToItem(BaseItem objCopy)
+        {
+            DualButton button = (DualButton)objCopy;
+            button.ButtonSize = _ButtonSize;
+            button.Text2 = _Text2;
+            base.CopyToItem(objCopy);
+        }
+        private Size _ButtonSize = new Size(38, 24);
+        public Size ButtonSize
+        {
+            get { return _ButtonSize; }
+            set
+            {
+                if (value.IsEmpty)
+                    throw new ArgumentException("Empty size is not valid size");
+                if (value.Width < 1 || value.Width < 1)
+                    throw new ArgumentException("Width or Height cannot be less than 1");
+                if (value != _ButtonSize)
+                {
+                    Size oldValue = _ButtonSize;
+                    _ButtonSize = value;
+                    OnButtonSizeChanged(oldValue, value);
+                }
+            }
+        }
+        private void RecreatePaths(Size buttonSize)
+        {
+            if (_TopPartPath != null) _TopPartPath.Dispose();
+            if (_BottomPartPath != null) _BottomPartPath.Dispose();
+            _TopPartPath = new GraphicsPath();
+            _TopPartPath.AddLines(new PointF[] { new PointF(0, buttonSize.Height - 3), new PointF(0, 0), new PointF(buttonSize.Width - 2, 0) });
+            _TopPartPath.CloseAllFigures();
+
+            _BottomPartPath = new GraphicsPath();
+            _BottomPartPath.AddLines(new PointF[] { new PointF(2, buttonSize.Height - 1), new PointF(buttonSize.Width - 1, buttonSize.Height - 1), new PointF(buttonSize.Width - 1, 2) });
+            _BottomPartPath.CloseAllFigures();
+        }
+        /// <summary>
+        /// Called when ButtonSize property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnButtonSizeChanged(Size oldValue, Size newValue)
+        {
+            RecreatePaths(newValue);
+            //OnPropertyChanged(new PropertyChangedEventArgs("ButtonSize"));
+        }
+        private GraphicsPath _TopPartPath = null, _BottomPartPath = null;
+
+        public override void RecalcSize()
+        {
+            m_Rect.Size = _ButtonSize;
+            base.RecalcSize();
+        }
+
+        public override void Paint(ItemPaintArgs p)
+        {
+            Graphics g = p.Graphics;
+            Matrix oldMatrix = g.Transform;
+            g.TranslateTransform(m_Rect.X, m_Rect.Y, MatrixOrder.Append);
+            LinearGradientColorTable border = null, back = null, back2 = null;
+            Color textColor = Color.Empty;
+
+
+
+            if (_TopPartPath != null)
+            {
+                Office2007ButtonItemStateColorTable table = GetOffice2007StateColorTable(p, eDualButtonPart.Up);
+                if (table != null)
+                {
+                    if (table.Background != null)
+                        back = table.Background;
+                    else
+                    {
+                        back = table.TopBackground;
+                        back2 = table.BottomBackground;
+                    }
+                    border = table.OuterBorder;
+                    textColor = table.Text;
+                }
+                DrawBackground(g, _TopPartPath, border, back, back2);
+                //g.FillPath(_LeftMouseButtonDown == eDualButtonPart.Up ? Brushes.Blue : (_MouseOverPart == eDualButtonPart.Up ? Brushes.Yellow : Brushes.Red), _TopPartPath);
+                Rectangle textBounds = Rectangle.Round(_TopPartPath.GetBounds());
+                textBounds.Offset(0, -1);
+                textBounds.Width = textBounds.Width / 2;
+                TextDrawing.DrawString(g, Text, _Font ?? p.Font, textColor, textBounds, eTextFormat.HorizontalCenter | eTextFormat.Top);
+            }
+            if (_BottomPartPath != null)
+            {
+                Office2007ButtonItemStateColorTable table = GetOffice2007StateColorTable(p, eDualButtonPart.Down);
+                back2 = null;
+                if (table != null)
+                {
+                    if (table.Background != null)
+                        back = table.Background;
+                    else
+                    {
+                        back = table.TopBackground;
+                        back2 = table.BottomBackground;
+                    }
+                    border = table.OuterBorder;
+                    textColor = table.Text;
+                }
+                DrawBackground(g, _BottomPartPath, border, back, back2);
+                //g.FillPath(_LeftMouseButtonDown == eDualButtonPart.Down ? Brushes.Blue : (_MouseOverPart == eDualButtonPart.Down ? Brushes.Yellow : Brushes.Green), _BottomPartPath);
+                Rectangle textBounds = Rectangle.Round(_BottomPartPath.GetBounds());
+                textBounds.Offset(textBounds.Width / 2, 1);
+                textBounds.Width = textBounds.Width / 2;
+                TextDrawing.DrawString(g, Text2, _Font ?? p.Font, textColor, textBounds, eTextFormat.HorizontalCenter | eTextFormat.Bottom);
+            }
+            g.Transform = oldMatrix;
+
+        }
+
+        private Office2007ButtonItemStateColorTable GetOffice2007StateColorTable(ItemPaintArgs p, eDualButtonPart part)
+        {
+            if (BarFunctions.IsOffice2007Style(EffectiveStyle))
+            {
+                if (p.Renderer is Office2007Renderer)
+                {
+                    Office2007ColorTable ct = ((Office2007Renderer)p.Renderer).ColorTable;
+                    Office2007ButtonItemColorTable buttonColorTable = ct.ButtonItemColors[Enum.GetName(typeof(eButtonColor), eButtonColor.OrangeWithBackground)];
+                    if (!this.Enabled)
+                        return buttonColorTable.Disabled;
+                    else if (_LeftMouseButtonDown == part)
+                        return buttonColorTable.Pressed;
+                    else if (_MouseOverPart == part)
+                        return buttonColorTable.MouseOver;
+                    else if (this.IsSelected == part)
+                        return buttonColorTable.Checked;
+                    else
+                        return buttonColorTable.Default;
+                }
+            }
+
+            return null;
+        }
+
+        private void DrawBackground(Graphics g, GraphicsPath path, LinearGradientColorTable border, LinearGradientColorTable back, LinearGradientColorTable back2)
+        {
+            if (back != null && !back.IsEmpty)
+            {
+                if (back2 != null && !back2.IsEmpty)
+                {
+                    using (LinearGradientBrush brush = new LinearGradientBrush(path.GetBounds(), back.Start, back2.End, 90))
+                    {
+                        ColorBlend cb = new ColorBlend(4);
+                        cb.Colors = new Color[] { back.Start, back.End, back2.Start, back2.End };
+                        cb.Positions = new float[] { 0f, .5f, .5f, 1f };
+                        brush.InterpolationColors = cb;
+                        g.FillPath(brush, path);
+                    }
+                }
+                else
+                    DisplayHelp.FillPath(g, path, back);
+            }
+            if (border != null && !border.IsEmpty)
+            {
+                using (Brush brush = DisplayHelp.CreateBrush(Rectangle.Round(path.GetBounds()), border))
+                {
+                    using (Pen pen = new Pen(brush, 1))
+                        g.DrawPath(pen, path);
+                }
+                //DisplayHelp.DrawGradientPathBorder(g, path, border, 1);
+            }
+        }
+
+        public override void InternalMouseDown(System.Windows.Forms.MouseEventArgs objArg)
+        {
+            if (objArg.Button == System.Windows.Forms.MouseButtons.Left)
+            {
+                this.LeftMouseButtonDown = HitTest(objArg.X, objArg.Y);
+            }
+            base.InternalMouseDown(objArg);
+        }
+
+        public override void InternalMouseUp(System.Windows.Forms.MouseEventArgs objArg)
+        {
+            if (objArg.Button == System.Windows.Forms.MouseButtons.Left)
+            {
+                if (LeftMouseButtonDown != eDualButtonPart.None && MouseOverPart == LeftMouseButtonDown)
+                {
+                    if (LeftMouseButtonDown == eDualButtonPart.Up)
+                        ExecuteCommand();
+                    else
+                        ExecuteCommand2();
+                }
+                LeftMouseButtonDown = eDualButtonPart.None;
+            }
+            base.InternalMouseUp(objArg);
+        }
+
+        public override void InternalMouseMove(System.Windows.Forms.MouseEventArgs objArg)
+        {
+            this.MouseOverPart = HitTest(objArg.X, objArg.Y);
+            //if (objArg.Button == System.Windows.Forms.MouseButtons.Left && LeftMouseButtonDownPart == eDualButtonPart.None && _MouseOverPart != eDualButtonPart.None)
+            //    LeftMouseButtonDownPart = _MouseOverPart;
+            if (_LeftMouseButtonDown != eDualButtonPart.None && _MouseOverPart != _LeftMouseButtonDown)
+                LeftMouseButtonDown = eDualButtonPart.None;
+            base.InternalMouseMove(objArg);
+        }
+
+        public eDualButtonPart HitTest(Point clientPoint)
+        {
+            return HitTest(clientPoint.X, clientPoint.Y);
+        }
+        public eDualButtonPart HitTest(int x, int y)
+        {
+            Point p = new Point(x - m_Rect.X, y - m_Rect.Y);
+            if (_TopPartPath.IsVisible(p))
+                return eDualButtonPart.Up;
+            else if (_BottomPartPath.IsVisible(p))
+                return eDualButtonPart.Down;
+
+            return eDualButtonPart.None;
+        }
+
+        public override void InternalMouseLeave()
+        {
+            this.MouseOverPart = eDualButtonPart.None;
+            LeftMouseButtonDown = eDualButtonPart.None;
+            base.InternalMouseLeave();
+        }
+
+        private string _Text2 = string.Empty;
+        /// <summary>
+        /// Gets or sets the second button part text.
+        /// </summary>
+        [DefaultValue(""), Category("Appearance"), Description("Indicates second button part text."), Localizable(true)]
+        public string Text2
+        {
+            get { return _Text2; }
+            set
+            {
+                if (value == null) value = string.Empty;
+                if (value != _Text2)
+                {
+                    string oldValue = _Text2;
+                    _Text2 = value;
+                    OnText2Changed(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when Text2 property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnText2Changed(string oldValue, string newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("Text2"));
+            this.Refresh();
+        }
+
+        private eDualButtonPart _MouseOverPart;
+        public eDualButtonPart MouseOverPart
+        {
+            get { return _MouseOverPart; }
+            private set
+            {
+                if (value != _MouseOverPart)
+                {
+                    eDualButtonPart oldValue = _MouseOverPart;
+                    _MouseOverPart = value;
+                    OnMouseOverPartChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when MouseOverPart property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnMouseOverPartChanged(eDualButtonPart oldValue, eDualButtonPart newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("MouseOverPart"));
+            this.Refresh();
+        }
+
+        private eDualButtonPart _LeftMouseButtonDown = eDualButtonPart.None;
+        public eDualButtonPart LeftMouseButtonDown
+        {
+            get { return _LeftMouseButtonDown; }
+            private set
+            {
+                if (value != _LeftMouseButtonDown)
+                {
+                    eDualButtonPart oldValue = _LeftMouseButtonDown;
+                    _LeftMouseButtonDown = value;
+                    OnLeftMouseButtonDownChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when LeftMouseButtonDownPart property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnLeftMouseButtonDownChanged(eDualButtonPart oldValue, eDualButtonPart newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("LeftMouseButtonDownPart"));
+            this.Refresh();
+        }
+
+        protected virtual void ExecuteCommand2()
+        {
+            if (_Command2 == null) return;
+            CommandManager.ExecuteCommand(new ExtraCommandSource(_Command2, _Command2Parameter));
+        }
+
+        internal void ExecuteCommand2Internal()
+        {
+            ExecuteCommand2();
+        }
+
+        private ICommand _Command2 = null;
+        /// <summary>
+        /// Gets or sets the command assigned to the item. Default value is null.
+        /// <remarks>Note that for ButtonItem instances if this property is set to null and command was assigned previously, Enabled property will be set to false automatically to disable the item.</remarks>
+        /// </summary>
+        [DefaultValue(null), Category("Commands"), Description("Indicates the command assigned to the item.")]
+        public virtual ICommand Command2
+        {
+            get
+            {
+                return _Command2;
+            }
+            set
+            {
+                bool changed = false;
+                if (_Command2 != value)
+                    changed = true;
+
+                if (_Command2 != null)
+                    CommandManager.UnRegisterCommandSource(this, _Command2);
+                _Command2 = value;
+                if (value != null)
+                    CommandManager.RegisterCommand(this, value);
+                if (changed)
+                    OnCommand2Changed();
+            }
+        }
+        /// <summary>
+        /// Called when Command property value changes.
+        /// </summary>
+        protected virtual void OnCommand2Changed()
+        {
+        }
+
+        private object _Command2Parameter = null;
+        /// <summary>
+        /// Gets or sets user defined data value that can be passed to the command when it is executed.
+        /// </summary>
+        [Browsable(true), DefaultValue(null), Category("Commands"), Description("Indicates user defined data value that can be passed to the command when it is executed."), System.ComponentModel.TypeConverter(typeof(System.ComponentModel.StringConverter)), System.ComponentModel.Localizable(true)]
+        public virtual object Command2Parameter
+        {
+            get
+            {
+                return _Command2Parameter;
+            }
+            set
+            {
+                _Command2Parameter = value;
+            }
+        }
+
+        private eDualButtonPart _IsSelected = eDualButtonPart.None;
+        /// <summary>
+        /// Gets or sets the selected part of button.
+        /// </summary>
+        [DefaultValue(eDualButtonPart.None), Category("Behavior"), Description("Indicates selected part of button.")]
+        public eDualButtonPart IsSelected
+        {
+            get { return _IsSelected; }
+            set
+            {
+                if (value != _IsSelected)
+                {
+                    eDualButtonPart oldValue = _IsSelected;
+                    _IsSelected = value;
+                    OnIsSelectedChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when IsSelected property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnIsSelectedChanged(eDualButtonPart oldValue, eDualButtonPart newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("IsSelected"));
+
+        }
+
+        private Font _Font = null;
+        /// <summary>
+        /// Gets or sets the text font.
+        /// </summary>
+        [DefaultValue(null), Category("Appearance"), Description("Gets or sets the text font.")]
+        public Font Font
+        {
+            get { return _Font; }
+            set
+            {
+                if (value != _Font)
+                {
+                    Font oldValue = _Font;
+                    _Font = value;
+                    OnFontChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when Font property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnFontChanged(Font oldValue, Font newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("Font"));
+            
+        }
+        #endregion
+
+        #region ExtraCommandSource
+        public class ExtraCommandSource : ICommandSource
+        {
+            public ExtraCommandSource(ICommand command, object commandParam)
+            {
+                _Command = command;
+                _CommandParameter = commandParam;
+            }
+
+            #region ICommandSource Members
+            private ICommand _Command;
+            public ICommand Command
+            {
+                get
+                {
+                    return _Command;
+                }
+                set
+                {
+                    _Command = value;
+                }
+            }
+            private object _CommandParameter = null;
+            public object CommandParameter
+            {
+                get
+                {
+                    return _CommandParameter;
+                }
+                set
+                {
+                    _CommandParameter = value;
+                }
+            }
+            #endregion
+
+            #endregion
+        }
+    }
+
+    public enum eDualButtonPart
+    {
+        None,
+        Up,
+        Down
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Editors/Calculator/Calculator.Designer.cs b/PROMS/DotNetBar Source Code/Editors/Calculator/Calculator.Designer.cs
new file mode 100644
index 00000000..0b178209
Binary files /dev/null and b/PROMS/DotNetBar Source Code/Editors/Calculator/Calculator.Designer.cs differ
diff --git a/PROMS/DotNetBar Source Code/Editors/Calculator/Calculator.cs b/PROMS/DotNetBar Source Code/Editors/Calculator/Calculator.cs
new file mode 100644
index 00000000..62856ede
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Editors/Calculator/Calculator.cs	
@@ -0,0 +1,1333 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Media;
+using System.Windows.Forms;
+using DevComponents.DotNetBar;
+using System.Globalization;
+
+namespace DevComponents.Editors
+{
+    /// <summary>
+    /// Standalone Calculator control.
+    /// </summary>
+    [ToolboxBitmap(typeof(DotNetBarManager), "Calculator.ico"), DefaultEvent("ValueChanged"), DefaultProperty("Value"), ToolboxItem(true), Designer("DevComponents.DotNetBar.Design.CalculatorDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+    public partial class Calculator : Control
+    {
+        #region Events
+
+        #region ButtonClick
+
+        /// <summary>
+        /// Occurs when a calc button has been clicked
+        /// </summary>
+        [Description("Occurs when a calc button has been clicked.")]
+        public event EventHandler<ButtonClickEventArgs> ButtonClick;
+
+        #endregion
+
+        #region ValueChanged
+
+        /// <summary>
+        /// Occurs when the calculator value has changed
+        /// </summary>
+        [Description("Occurs when the calculator value has changed.")]
+        public event EventHandler<ValueChangedEventArgs> ValueChanged;
+
+        #endregion
+
+        public event EventHandler CalculatorDisplayChanged;
+        /// <summary>
+        /// Raises CalculatorDisplayChanged event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnCalculatorDisplayChanged(EventArgs e)
+        {
+            EventHandler handler = CalculatorDisplayChanged;
+            if (handler != null)
+                handler(this, e);
+        }
+        #endregion
+
+        #region Private variables
+
+        private string _StringValue = null;
+
+        private double _Value;
+        private double _LValue;
+        private double _MemValue;
+
+        private Operators _Operator;
+        private Operators _LastOp;
+
+        private bool _IsIntValue;
+        private bool _ShowMemKeys;
+
+        private DecimalKeyVisibility _DecimalKeyVisibility;
+
+        private Timer _KeyTimer;
+        private string _NumberDecimalSeparator;
+        #endregion
+
+        public Calculator()
+        {
+            InitializeComponent();
+
+            _ShowMemKeys = true;
+            _DecimalKeyVisibility = DecimalKeyVisibility.Auto;
+            this.SetStyle(DisplayHelp.DoubleBufferFlag | ControlStyles.AllPaintingInWmPaint | ControlStyles.Opaque, true);
+            labelValue.BackColor = Color.White;
+            pnlCalc.BackColor = Color.White;
+            pnlPad.BackColor = Color.White;
+            _NumberDecimalSeparator = CultureInfo.CurrentCulture.NumberFormat.NumberDecimalSeparator;
+            BtnDecimal.Text = _NumberDecimalSeparator;
+        }
+
+        #region Public properties
+
+        #region DisplayValue
+        [Browsable(false)]
+        public double DisplayValue
+        {
+            get
+            {
+                if (string.IsNullOrEmpty(_StringValue) == true)
+                    return (_Value);
+
+                return (double.Parse(_StringValue));
+            }
+        }
+
+        #endregion
+
+        #region UpdateDisplay
+        private void UpdateDisplay()
+        {
+            labelValue.Text = DisplaySValue;
+        }
+        #endregion
+
+        #region DisplaySValue
+        [Browsable(false)]
+        public string DisplaySValue
+        {
+            get
+            {
+                if (string.IsNullOrEmpty(_StringValue) == false)
+                    return (_StringValue);
+
+                return (_Value.ToString());
+            }
+        }
+
+        #endregion
+
+        #region IsIntValue
+        /// <summary>
+        /// Indicates whether calculator displays only Integer values.
+        /// </summary>
+        [DefaultValue(false), Category("Behavior"), Description("Indicates whether calculator displays only Integer values.")]
+        public bool IsIntValue
+        {
+            get { return (_IsIntValue); }
+
+            set
+            {
+                if (_IsIntValue != value)
+                {
+                    _IsIntValue = value;
+
+                    UpdateLayout();
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowMemKeys
+        /// <summary>
+        /// Gets or sets whether memory keys are visible. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance"), Description("Indicates whether memory keys are visible.")]
+        public bool ShowMemKeys
+        {
+            get { return (_ShowMemKeys); }
+
+            set
+            {
+                if (_ShowMemKeys != value)
+                {
+                    _ShowMemKeys = value;
+
+                    if (_ShowMemKeys == true)
+                    {
+                        pnlCalc.Height += (pnlMem.Height - 1);
+                        pnlPad.Location = new Point(1, pnlMem.Bottom);
+                    }
+                    else
+                    {
+                        pnlCalc.Height -= (pnlMem.Height - 1);
+                        if(_DisplayVisible)
+                            pnlPad.Location = new Point(1, labelValue.Bottom);
+                        else
+                            pnlPad.Location = new Point(1, labelValue.Top);
+                    }
+
+                    InvalidateAutoSize();
+                    //Size = pnlCalc.Size;
+                }
+            }
+        }
+
+        #endregion
+
+        #region DecimalKeyVisibility
+        /// <summary>
+        /// Gets or sets visibility of the decimal calculator key.
+        /// </summary>
+        [DefaultValue(DecimalKeyVisibility.Auto), Category("Appearance"), Description("Indicates visibility of the decimal calculator key.")]
+        public DecimalKeyVisibility DecimalKeyVisibility
+        {
+            get { return (_DecimalKeyVisibility); }
+
+            set
+            {
+                if (_DecimalKeyVisibility != value)
+                {
+                    _DecimalKeyVisibility = value;
+
+                    UpdateLayout();
+                }
+            }
+        }
+
+        #endregion
+
+        #region SValue
+        [DefaultValue(null), Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public string StringValue
+        {
+            get { return (_StringValue); }
+
+            set
+            {
+                _StringValue = value;
+                OnValueChanged();
+            }
+        }
+
+        #endregion
+
+        #region Value
+        [DefaultValue(0d), Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public double Value
+        {
+            get { return (_Value); }
+
+            set
+            {
+                _Value = value;
+
+                OnValueChanged();
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Keyboard Support
+
+        internal void ProcessKeyPress(KeyPressEventArgs e)
+        {
+            ButtonX btn = null;
+            switch (e.KeyChar)
+            {
+                case '0': btn = OnDigitSelect(BtnDigit0); break;
+                case '1': btn = OnDigitSelect(BtnDigit1); break;
+                case '2': btn = OnDigitSelect(BtnDigit2); break;
+                case '3': btn = OnDigitSelect(BtnDigit3); break;
+                case '4': btn = OnDigitSelect(BtnDigit4); break;
+                case '5': btn = OnDigitSelect(BtnDigit5); break;
+                case '6': btn = OnDigitSelect(BtnDigit6); break;
+                case '7': btn = OnDigitSelect(BtnDigit7); break;
+                case '8': btn = OnDigitSelect(BtnDigit8); break;
+                case '9': btn = OnDigitSelect(BtnDigit9); break;
+                case '+': btn = OnOperatorSelect(BtnAdd, Operators.Add); break;
+                case '-': btn = OnOperatorSelect(BtnSubtract, Operators.Subtract); break;
+                case '*': btn = OnOperatorSelect(BtnMultiply, Operators.Multiply); break;
+                case '/': btn = OnOperatorSelect(BtnDivide, Operators.Divide); break;
+
+                case '%': btn = OnPercentSelect(); break;
+                case 'r': btn = OnReciprocalSelect(); break;
+                case '@': btn = OnSqrtSelect(); break;
+                case 'n': btn = OnNegateSelect(); break;
+
+                case 'c': btn = OnClearSelect(); break;
+                case 'e': btn = OnClearEntrySelect(); break;
+                case '=': btn = OnEqualsSelect(); break;
+                case '\b': btn = OnBackSelect(); break;
+
+                case '\r':
+                    btn = ((ModifierKeys & Keys.Control) == Keys.Control)
+                        ? OnMemStoreSelect() : OnEqualsSelect();
+                    break;
+
+                case (char)18: btn = OnMemRestoreSelect(); break;
+                case (char)16: btn = OnMemAddSelect(); break;
+                case (char)17: btn = OnMemSubtractSelect(); break;
+                case (char)12: btn = OnMemClearSelect(); break;
+            }
+            if (btn == null && e.KeyChar.ToString() == _NumberDecimalSeparator)
+                btn = OnDecimalSelect();
+
+            if (btn != null)
+            {
+                FlashKey(btn);
+                e.Handled = true;
+            }
+        }
+        protected override void OnKeyPress(KeyPressEventArgs e)
+        {
+            base.OnKeyPress(e);
+
+            if (e.Handled == false)
+            {
+                ProcessKeyPress(e);
+            }
+        }
+
+        #endregion
+
+        #region Button Support
+
+        #region BtnDigitClick
+
+        private void BtnDigitClick(object sender, EventArgs e)
+        {
+            if (OnButtonClick(sender) == false)
+                OnDigitSelect((ButtonX)sender);
+            if (_FocusButtonsOnMouseDown)
+                Focus();
+        }
+
+        private ButtonX OnDigitSelect(ButtonX btn)
+        {
+            AddDigit(btn);
+
+            OnValueChanged();
+
+            return (btn);
+        }
+
+        #region AddDigit
+
+        private void AddDigit(object sender)
+        {
+            ButtonX btn = sender as ButtonX;
+
+            if (btn != null)
+            {
+                char c = btn.Name[8];
+
+                if (_StringValue == null || _LastOp == Operators.Set)
+                {
+                    _StringValue = "";
+
+                    if (_LastOp == Operators.Calc || _LastOp == Operators.Set)
+                        SetOperator(Operators.None);
+                }
+
+                _StringValue += c;
+                UpdateDisplay();
+                OnCalculatorDisplayChanged(EventArgs.Empty);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region BtnDecimalClick
+
+        private void BtnDecimalClick(object sender, EventArgs e)
+        {
+            if (OnButtonClick(BtnDecimal) == false)
+                OnDecimalSelect();
+
+            if (_FocusButtonsOnMouseDown)
+                Focus();
+        }
+
+        private ButtonX OnDecimalSelect()
+        {
+            if (_IsIntValue == false)
+            {
+                if (_StringValue == null || _LastOp == Operators.Set)
+                {
+                    _StringValue = "0" + _NumberDecimalSeparator;
+
+                    if (_LastOp == Operators.Calc || _LastOp == Operators.Set)
+                        SetOperator(Operators.None);
+                }
+                else if (_StringValue.Contains(_NumberDecimalSeparator) == false)
+                {
+                    _StringValue += _NumberDecimalSeparator;
+                }
+            }
+
+            OnValueChanged();
+
+            return (BtnDecimal);
+        }
+
+        #endregion
+
+        #region BtnBackClick
+
+        private void BtnBackClick(object sender, EventArgs e)
+        {
+            if (OnButtonClick(BtnBack) == false)
+                OnBackSelect();
+            if (_FocusButtonsOnMouseDown)
+                Focus();
+        }
+
+        private ButtonX OnBackSelect()
+        {
+            if (string.IsNullOrEmpty(_StringValue) == false)
+            {
+                _StringValue = _StringValue.Substring(0, _StringValue.Length - 1);
+
+                if (_StringValue.Length == 0 ||
+                    (_StringValue.Length == 1 && _StringValue[0] == '-'))
+                {
+                    _StringValue = "0";
+                }
+            }
+            else
+            {
+                SystemSounds.Beep.Play();
+            }
+
+            OnValueChanged();
+
+            return (BtnBack);
+        }
+
+        #endregion
+
+        #region BtnAddClick
+
+        private void BtnAddClick(object sender, EventArgs e)
+        {
+            if (OnButtonClick(sender) == false)
+                OnOperatorSelect(BtnAdd, Operators.Add);
+            if (_FocusButtonsOnMouseDown)
+                Focus();
+        }
+
+        #endregion
+
+        #region BtnSubtractClick
+
+        private void BtnSubtractClick(object sender, EventArgs e)
+        {
+            if (OnButtonClick(sender) == false)
+                OnOperatorSelect(BtnSubtract, Operators.Subtract);
+            if (_FocusButtonsOnMouseDown)
+                Focus();
+        }
+
+        #endregion
+
+        #region BtnMultiplyClick
+
+        private void BtnMultiplyClick(object sender, EventArgs e)
+        {
+            if (OnButtonClick(sender) == false)
+                OnOperatorSelect(BtnMultiply, Operators.Multiply);
+
+            if (_FocusButtonsOnMouseDown)
+                Focus();
+        }
+
+        #endregion
+
+        #region BtnDivideClick
+
+        private void BtnDivideClick(object sender, EventArgs e)
+        {
+            if (OnButtonClick(sender) == false)
+                OnOperatorSelect(BtnDivide, Operators.Divide);
+
+            if (_FocusButtonsOnMouseDown)
+                Focus();
+        }
+
+        #endregion
+
+        #region BtnNegateClick
+
+        private void BtnNegateClick(object sender, EventArgs e)
+        {
+            if (OnButtonClick(sender) == false)
+                OnNegateSelect();
+            if (_FocusButtonsOnMouseDown)
+                Focus();
+        }
+
+        private ButtonX OnNegateSelect()
+        {
+            if (string.IsNullOrEmpty(_StringValue) == false)
+            {
+                _StringValue = '-' + _StringValue;
+                _StringValue = _StringValue.Replace("--", "");
+            }
+            else
+            {
+                _Value = -_Value;
+            }
+            OnValueChanged();
+
+            return (BtnNegate);
+        }
+
+        #endregion
+
+        #region BtnSqrtClick
+
+        private void BtnSqrtClick(object sender, EventArgs e)
+        {
+            if (OnButtonClick(sender) == false)
+                OnSqrtSelect();
+            if (_FocusButtonsOnMouseDown)
+                Focus();
+        }
+
+        private ButtonX OnSqrtSelect()
+        {
+            if (string.IsNullOrEmpty(_StringValue) == false)
+            {
+                double d = double.Parse(_StringValue);
+
+                if (d > 0)
+                {
+                    d = Math.Sqrt(d);
+
+                    if (IsIntValue == true)
+                        d = Math.Round(d);
+
+                    _StringValue = d.ToString();
+                }
+                else
+                    SystemSounds.Beep.Play();
+            }
+            else
+            {
+                if (_Value > 0)
+                    _Value = Math.Sqrt(_Value);
+                else
+                    SystemSounds.Beep.Play();
+            }
+
+            _LastOp = Operators.Set;
+
+            OnValueChanged();
+
+            return (BtnSqrt);
+        }
+
+        #endregion
+
+        #region BtnReciprocalClick
+
+        private void BtnReciprocalClick(object sender, EventArgs e)
+        {
+            if (OnButtonClick(BtnReciprocal) == false)
+                OnReciprocalSelect();
+            if (_FocusButtonsOnMouseDown)
+                Focus();
+        }
+
+        private ButtonX OnReciprocalSelect()
+        {
+            if (string.IsNullOrEmpty(_StringValue) == false)
+            {
+                double d = double.Parse(_StringValue);
+
+                if (d != 0)
+                {
+                    d = 1 / d;
+
+                    if (IsIntValue == true)
+                        d = Math.Round(d);
+
+                    _StringValue = d.ToString();
+                }
+                else
+                {
+                    SystemSounds.Beep.Play();
+                }
+            }
+            else
+            {
+                if (_Value != 0)
+                    _Value = 1 / _Value;
+                else
+                    SystemSounds.Beep.Play();
+            }
+
+            _LastOp = Operators.Set;
+
+            OnValueChanged();
+
+            return (BtnReciprocal);
+        }
+
+        #endregion
+
+        #region BtnPercentClick
+
+        private void BtnPercentClick(object sender, EventArgs e)
+        {
+            if (OnButtonClick(BtnPercent) == false)
+                OnPercentSelect();
+            if (_FocusButtonsOnMouseDown)
+                Focus();
+        }
+
+        private ButtonX OnPercentSelect()
+        {
+            if (string.IsNullOrEmpty(_StringValue) == false)
+            {
+                double d = double.Parse(_StringValue);
+
+                d = (_Value * d) / 100;
+
+                if (IsIntValue == true)
+                    d = Math.Round(d);
+
+                _StringValue = d.ToString();
+            }
+            else
+            {
+                _Value = 0;
+            }
+
+            OnValueChanged();
+
+            return (BtnPercent);
+        }
+
+        #endregion
+
+        #region BtnEqualsClick
+
+        private void BtnEqualsClick(object sender, EventArgs e)
+        {
+            if (OnButtonClick(sender) == false)
+                OnEqualsSelect();
+            if (_FocusButtonsOnMouseDown)
+                Focus();
+        }
+
+        private ButtonX OnEqualsSelect()
+        {
+            UpdateTotal();
+
+            _LastOp = Operators.Calc;
+            lbxOperator.Text = "";
+
+            OnValueChanged();
+
+            return (BtnEquals);
+        }
+
+        #endregion
+
+        #region BtnClearEntryClick
+
+        private void BtnClearEntryClick(object sender, EventArgs e)
+        {
+            if (OnButtonClick(sender) == false)
+                OnClearEntrySelect();
+
+            if (_FocusButtonsOnMouseDown)
+                Focus();
+        }
+
+        private ButtonX OnClearEntrySelect()
+        {
+            if (string.IsNullOrEmpty(_StringValue) == false)
+                _StringValue = "0";
+            else
+                _Value = 0;
+            OnValueChanged();
+
+            return (BtnClearEntry);
+        }
+
+        #endregion
+
+        #region BtnClearClick
+
+        private void BtnClearClick(object sender, EventArgs e)
+        {
+            if (OnButtonClick(sender) == false)
+                OnClearSelect();
+            if (_FocusButtonsOnMouseDown)
+                Focus();
+        }
+
+        private ButtonX OnClearSelect()
+        {
+            _Value = 0;
+            _LValue = 0;
+            _StringValue = null;
+
+            SetOperator(Operators.None);
+            OnValueChanged();
+
+            return (BtnClear);
+        }
+
+        #endregion
+
+        #region BtnMemStoreClick
+
+        private void BtnMemStoreClick(object sender, EventArgs e)
+        {
+            if (OnButtonClick(sender) == false)
+                OnMemStoreSelect();
+            if (_FocusButtonsOnMouseDown)
+                Focus();
+        }
+
+        private ButtonX OnMemStoreSelect()
+        {
+            StoreToMem(DisplayValue);
+
+            return (BtnMemStore);
+        }
+
+        #endregion
+
+        #region BtnMemRestoreClick
+
+        private void BtnMemRestoreClick(object sender, EventArgs e)
+        {
+            if (OnButtonClick(sender) == false)
+                OnMemRestoreSelect();
+            if (_FocusButtonsOnMouseDown)
+                Focus();
+        }
+
+        private ButtonX OnMemRestoreSelect()
+        {
+            _StringValue = _MemValue.ToString();
+            OnValueChanged();
+
+            return (BtnMemRestore);
+        }
+
+        #endregion
+
+        #region BtnMemClearClick
+
+        private void BtnMemClearClick(object sender, EventArgs e)
+        {
+            if (OnButtonClick(sender) == false)
+                OnMemClearSelect();
+            if (_FocusButtonsOnMouseDown)
+                Focus();
+        }
+
+        private ButtonX OnMemClearSelect()
+        {
+            StoreToMem(0);
+
+            return (BtnMemClear);
+        }
+
+        #endregion
+
+        #region BtnMemAddClick
+
+        private void BtnMemAddClick(object sender, EventArgs e)
+        {
+            if (OnButtonClick(sender) == false)
+                OnMemAddSelect();
+            if (_FocusButtonsOnMouseDown)
+                Focus();
+        }
+
+        private ButtonX OnMemAddSelect()
+        {
+            StoreToMem(_MemValue + DisplayValue);
+
+            return (BtnMemAdd);
+        }
+
+        #endregion
+
+        #region BtnMemSubtractClick
+
+        private void BtnMemSubtractClick(object sender, EventArgs e)
+        {
+            if (OnButtonClick(sender) == false)
+                OnMemSubtractSelect();
+            if (_FocusButtonsOnMouseDown)
+                Focus();
+        }
+
+        private ButtonX OnMemSubtractSelect()
+        {
+            StoreToMem(_MemValue - DisplayValue);
+
+            return (BtnMemSubtract);
+        }
+
+        #endregion
+
+        #region StoreToMem
+
+        private void StoreToMem(double value)
+        {
+            _MemValue = value;
+
+            lbxMemory.Text = (value == 0) ? "" : "M";
+        }
+
+        #endregion
+
+        #endregion
+
+        #region SetOperator
+
+        private void SetOperator(Operators op)
+        {
+            _Operator = op;
+            _LastOp = op;
+
+            lbxOperator.Text = ((char)op).ToString();
+        }
+
+        #endregion
+
+        #region OnOperatorSelect
+
+        private ButtonX OnOperatorSelect(ButtonX btn, Operators op)
+        {
+            if (string.IsNullOrEmpty(_StringValue) == false)
+                UpdateTotal();
+
+            SetOperator(op);
+            OnValueChanged();
+
+            return (btn);
+        }
+
+        #endregion
+
+        #region UpdateTotal
+
+        private void UpdateTotal()
+        {
+            if (string.IsNullOrEmpty(_StringValue) == false)
+                _LValue = double.Parse(_StringValue);
+
+            switch (_Operator)
+            {
+                case Operators.None:
+                    _Value = _LValue;
+                    break;
+
+                case Operators.Add:
+                    _Value += _LValue;
+                    break;
+
+                case Operators.Subtract:
+                    _Value -= _LValue;
+                    break;
+
+                case Operators.Multiply:
+                    _Value *= _LValue;
+                    break;
+
+                case Operators.Divide:
+                    if (_LValue > 0)
+                        _Value /= _LValue;
+                    else
+                        SystemSounds.Beep.Play();
+                    break;
+            }
+
+            _StringValue = null;
+            OnValueChanged();
+        }
+
+        #endregion
+
+        #region UpdateLayout
+
+        private void UpdateLayout()
+        {
+            bool showDecimal;
+
+            switch (_DecimalKeyVisibility)
+            {
+                case DecimalKeyVisibility.Always:
+                    showDecimal = true;
+                    break;
+
+                case DecimalKeyVisibility.Auto:
+                    showDecimal = (IsIntValue == false);
+                    break;
+
+                default:
+                    showDecimal = false;
+                    break;
+            }
+
+            if (showDecimal == true)
+            {
+                BtnDecimal.Visible = true;
+                BtnDigit0.Width = BtnDigit2.Bounds.Right - BtnDigit0.Bounds.X;
+            }
+            else
+            {
+                BtnDecimal.Visible = false;
+                BtnDigit0.Width = BtnDecimal.Bounds.Right - BtnDigit0.Bounds.X;
+            }
+            InvalidateAutoSize();
+        }
+
+        #endregion
+
+        #region OnButtonClick
+
+        private bool OnButtonClick(object button)
+        {
+            if (ButtonClick != null)
+            {
+                ButtonClickEventArgs e =
+                    new ButtonClickEventArgs(button);
+
+                ButtonClick(this, e);
+
+                return (e.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region OnValueChanged
+
+        public void OnValueChanged()
+        {
+            if (ValueChanged != null)
+            {
+                ValueChanged(this,
+                    new ValueChangedEventArgs(DisplaySValue, DisplayValue));
+            }
+
+            UpdateDisplay();
+            OnCalculatorDisplayChanged(EventArgs.Empty);
+        }
+
+        #endregion
+
+        #region OnVisibleChanged
+
+        protected override void OnVisibleChanged(EventArgs e)
+        {
+            if (Visible == true)
+            {
+                _StringValue = null;
+                _LValue = 0;
+
+                StoreToMem(0);
+                SetOperator(Operators.Set);
+                OnValueChanged();
+            }
+
+            base.OnVisibleChanged(e);
+        }
+
+        #endregion
+
+        #region FlashKey
+
+        public void FlashKey(ButtonX keyButton)
+        {
+            if (_KeyTimer == null)
+            {
+                _KeyTimer = new Timer();
+
+                _KeyTimer.Interval = 125;
+                _KeyTimer.Tick += KeyTimerTick;
+            }
+
+            ButtonX btn = _KeyTimer.Tag as ButtonX;
+
+            if (btn != null)
+            {
+                _KeyTimer.Stop();
+
+                DoKeyTimerUp(btn);
+            }
+
+            DoKeyTimerDown(keyButton);
+
+            _KeyTimer.Tag = keyButton;
+
+            _KeyTimer.Start();
+        }
+
+        #region DoKeyTimerDown
+
+        private void DoKeyTimerDown(ButtonX btn)
+        {
+            MouseEventArgs args = new MouseEventArgs(
+                MouseButtons.Left, 1, btn.Location.X, btn.Location.Y, 0);
+
+            btn.InternalItem.InternalMouseDown(args);
+        }
+
+        #endregion
+
+        #region DoKeyTimerUp
+
+        private void DoKeyTimerUp(ButtonX btn)
+        {
+            MouseEventArgs args = new MouseEventArgs(
+                MouseButtons.Left, 1, btn.Location.X, btn.Location.Y, 0);
+
+            btn.InternalItem.InternalMouseUp(args);
+        }
+
+        #endregion
+
+        #region KeyTimerTick
+
+        void KeyTimerTick(object sender, EventArgs e)
+        {
+            ButtonX btn = _KeyTimer.Tag as ButtonX;
+
+            if (btn != null)
+                DoKeyTimerUp(btn);
+
+            _KeyTimer.Stop();
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Auto-Sizing
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            using(SolidBrush brush=new SolidBrush(this.BackColor))
+                e.Graphics.FillRectangle(brush, this.ClientRectangle);
+            base.OnPaint(e);
+        }
+        private Size _PreferredSize = Size.Empty;
+        /// <summary>
+        /// Invalidates control auto-size and resizes the control if AutoSize is set to true.
+        /// </summary>
+        public void InvalidateAutoSize()
+        {
+            _PreferredSize = Size.Empty;
+            AdjustSize();
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the control is automatically resized to display its entire contents. You can set MaximumSize.Width property to set the maximum width used by the control.
+        /// </summary>
+        [Browsable(true), DefaultValue(false), EditorBrowsable(EditorBrowsableState.Always), DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
+        public override bool AutoSize
+        {
+            get
+            {
+                return base.AutoSize;
+            }
+            set
+            {
+                if (this.AutoSize != value)
+                {
+                    base.AutoSize = value;
+                    AdjustSize();
+                }
+            }
+        }
+
+        private void AdjustSize()
+        {
+            if (this.AutoSize)
+            {
+                this.Size = base.PreferredSize;
+            }
+        }
+
+        private bool _FocusButtonsOnMouseDown = true;
+        internal bool FocusButtonsOnMouseDown
+        {
+            get { return _FocusButtonsOnMouseDown; }
+            set
+            {
+                if (value != _FocusButtonsOnMouseDown)
+                {
+                    bool oldValue = _FocusButtonsOnMouseDown;
+                    _FocusButtonsOnMouseDown = value;
+                    OnFocusButtonsOnMouseDownChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when FocusButtonsOnMouseDown property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnFocusButtonsOnMouseDownChanged(bool oldValue, bool newValue)
+        {
+            this.BtnBack.FocusOnLeftMouseButtonDown = newValue;
+            this.BtnDigit8.FocusOnLeftMouseButtonDown = newValue;
+            this.BtnReciprocal.FocusOnLeftMouseButtonDown = newValue;
+            this.BtnDigit5.FocusOnLeftMouseButtonDown = newValue;
+            this.BtnSqrt.FocusOnLeftMouseButtonDown = newValue;
+            this.BtnDivide.FocusOnLeftMouseButtonDown = newValue;
+            this.BtnDigit9.FocusOnLeftMouseButtonDown = newValue;
+            this.BtnClearEntry.FocusOnLeftMouseButtonDown = newValue;
+            this.BtnDecimal.FocusOnLeftMouseButtonDown = newValue;
+            this.BtnAdd.FocusOnLeftMouseButtonDown = newValue;
+            this.BtnEquals.FocusOnLeftMouseButtonDown = newValue;
+            this.BtnDigit4.FocusOnLeftMouseButtonDown = newValue;
+            this.BtnSubtract.FocusOnLeftMouseButtonDown = newValue;
+            this.BtnMultiply.FocusOnLeftMouseButtonDown = newValue;
+            this.BtnDigit6.FocusOnLeftMouseButtonDown = newValue;
+            this.BtnClear.FocusOnLeftMouseButtonDown = newValue;
+            this.BtnDigit1.FocusOnLeftMouseButtonDown = newValue;
+            this.BtnDigit2.FocusOnLeftMouseButtonDown = newValue;
+            this.BtnNegate.FocusOnLeftMouseButtonDown = newValue;
+            this.BtnDigit0.FocusOnLeftMouseButtonDown = newValue;
+            this.BtnDigit3.FocusOnLeftMouseButtonDown = newValue;
+            this.BtnPercent.FocusOnLeftMouseButtonDown = newValue;
+            this.BtnDigit7.FocusOnLeftMouseButtonDown = newValue;
+            this.BtnMemStore.FocusOnLeftMouseButtonDown = newValue;
+            this.BtnMemRestore.FocusOnLeftMouseButtonDown = newValue;
+            this.BtnMemAdd.FocusOnLeftMouseButtonDown = newValue;
+            this.BtnMemClear.FocusOnLeftMouseButtonDown = newValue;
+            this.BtnMemSubtract.FocusOnLeftMouseButtonDown = newValue;
+        }
+
+        protected override void OnFontChanged(EventArgs e)
+        {
+            InvalidateAutoSize();
+            BtnMemAdd.Font = new Font(this.Font.FontFamily, BtnMemAdd.Font.SizeInPoints);
+            BtnMemClear.Font = new Font(this.Font.FontFamily, BtnMemClear.Font.SizeInPoints);
+            BtnMemRestore.Font = new Font(this.Font.FontFamily, BtnMemRestore.Font.SizeInPoints);
+            BtnMemStore.Font = new Font(this.Font.FontFamily, BtnMemStore.Font.SizeInPoints);
+            BtnMemSubtract.Font = new Font(this.Font.FontFamily, BtnMemSubtract.Font.SizeInPoints);
+
+            BtnDigit0.Font = new Font(this.Font.FontFamily, BtnDigit0.Font.SizeInPoints);
+            BtnDigit1.Font = new Font(this.Font.FontFamily, BtnDigit1.Font.SizeInPoints);
+            BtnDigit2.Font = new Font(this.Font.FontFamily, BtnDigit2.Font.SizeInPoints);
+            BtnDigit3.Font = new Font(this.Font.FontFamily, BtnDigit3.Font.SizeInPoints);
+            BtnDigit4.Font = new Font(this.Font.FontFamily, BtnDigit4.Font.SizeInPoints);
+            BtnDigit5.Font = new Font(this.Font.FontFamily, BtnDigit5.Font.SizeInPoints);
+            BtnDigit6.Font = new Font(this.Font.FontFamily, BtnDigit6.Font.SizeInPoints);
+            BtnDigit7.Font = new Font(this.Font.FontFamily, BtnDigit7.Font.SizeInPoints);
+            BtnDigit8.Font = new Font(this.Font.FontFamily, BtnDigit8.Font.SizeInPoints);
+            BtnDigit9.Font = new Font(this.Font.FontFamily, BtnDigit9.Font.SizeInPoints);
+
+            labelValue.Font = new Font(this.Font.FontFamily, labelValue.Font.SizeInPoints);
+
+            base.OnFontChanged(e);
+        }
+
+        public override Size GetPreferredSize(Size proposedSize)
+        {
+            if (!_PreferredSize.IsEmpty) return _PreferredSize;
+
+            if (!BarFunctions.IsHandleValid(this))
+                return base.GetPreferredSize(proposedSize);
+
+            _PreferredSize = pnlCalc.Size;
+            return _PreferredSize;
+        }
+
+        protected override void SetBoundsCore(int x, int y, int width, int height, BoundsSpecified specified)
+        {
+            if (this.AutoSize)
+            {
+                Size preferredSize = base.PreferredSize;
+                width = preferredSize.Width;
+                height = preferredSize.Height;
+            }
+            base.SetBoundsCore(x, y, width, height, specified);
+        }
+
+        protected override void OnHandleCreated(EventArgs e)
+        {
+            if (this.AutoSize)
+                this.AdjustSize();
+            base.OnHandleCreated(e);
+        }
+        #endregion
+
+        #region DisplayVisible
+        private bool _DisplayVisible = true;
+        /// <summary>
+        /// Gets or sets whether calculator display is visible. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance"), Description("Indicates whether calculator display is visible.")]
+        public bool DisplayVisible
+        {
+            get { return _DisplayVisible; }
+            set
+            {
+                if (value != _DisplayVisible)
+                {
+                    bool oldValue = _DisplayVisible;
+                    _DisplayVisible = value;
+                    OnDisplayVisibleChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when DisplayVisible property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnDisplayVisibleChanged(bool oldValue, bool newValue)
+        {
+            labelValue.Visible = newValue;
+            if (newValue)
+            {
+                pnlPad.Top += labelValue.Height;
+                pnlMem.Top += labelValue.Height;
+                pnlCalc.Height += labelValue.Height;
+            }
+            else
+            {
+                pnlPad.Top -= labelValue.Height;
+                pnlMem.Top -= labelValue.Height;
+                pnlCalc.Height -= labelValue.Height;
+            }
+            _PreferredSize = Size.Empty;
+            AdjustSize();
+        }        
+        #endregion
+    }
+
+    #region Enums
+
+    public enum Operators
+    {
+        None = ' ',
+        Calc = '=',
+        Set = '\t',
+
+        Add = '+',
+        Subtract = '-',
+        Multiply = '*',
+        Divide = '/',
+    }
+
+    public enum DecimalKeyVisibility
+    {
+        Auto,
+        Always,
+        Never
+    }
+
+    #endregion
+
+    #region ButtonClickEventArgs
+
+    /// <summary>
+    /// ButtonClickEventArgs
+    /// </summary>
+    public class ButtonClickEventArgs : CancelEventArgs
+    {
+        #region Private variables
+
+        private object _Button;
+
+        #endregion
+
+        ///<summary>
+        /// ButtonClickEventArgs
+        ///</summary>
+        public ButtonClickEventArgs(object button)
+        {
+            _Button = button;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the calc button that was clicked
+        /// </summary>
+        public object Button
+        {
+            get { return (_Button); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region ValueChangedEventArgs
+
+    /// <summary>
+    /// ValueChangedEventArgs
+    /// </summary>
+    public class ValueChangedEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private double _Value;
+        private string _SValue;
+
+        #endregion
+
+        ///<summary>
+        /// ValueChangedEventArgs
+        ///</summary>
+        ///<param name="svalue"></param>
+        ///<param name="value"></param>
+        public ValueChangedEventArgs(string svalue, double value)
+        {
+            _Value = value;
+            _SValue = svalue;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the input string value
+        /// </summary>
+        public string SValue
+        {
+            get { return (_SValue); }
+        }
+
+        /// <summary>
+        /// Gets or sets calculator value
+        /// </summary>
+        public double Value
+        {
+            get { return (_Value); }
+            set { _Value = value; }
+        }
+
+        #endregion
+    }
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/Editors/Calculator/Calculator.resx b/PROMS/DotNetBar Source Code/Editors/Calculator/Calculator.resx
new file mode 100644
index 00000000..4dd8a5bc
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Editors/Calculator/Calculator.resx	
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="BtnBack.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAGYktHRAD/AP8A/6C9p5MAAAC5SURBVEhL7ZNLCsIwFEWrxQ8Ff6goFGelilPnTt2Qi3AFXYbr
+        05GeW5KiGVWaCmICB9IS7nnvpY2isP5+Ap2fnkDr1Utg8TqpGWkXeMAY+kbUWJKQcIa7CZdgB3PoQfwB
+        XbeoiROs8CYoT0VV9yjjAQq4vYSfzHt1ktck41wKmkgl0GYIazjC1Ui038IKljVYcEa8dWAt6mIAU9jA
+        HrzdAVnlksyKRuy9fkVW4spa/+FccXgOE/jyBJ539CM3bmc40AAAAABJRU5ErkJggg==
+</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/Editors/DateTimeAdv/CalendarBase.cs b/PROMS/DotNetBar Source Code/Editors/DateTimeAdv/CalendarBase.cs
new file mode 100644
index 00000000..9ab771f2
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Editors/DateTimeAdv/CalendarBase.cs	
@@ -0,0 +1,381 @@
+#if FRAMEWORK20
+using System;
+using System.Text;
+using DevComponents.DotNetBar;
+using System.Drawing;
+using System.ComponentModel;
+using System.Drawing.Drawing2D;
+
+namespace DevComponents.Editors.DateTimeAdv
+{
+    /// <summary>
+    /// Represents base class for the CalendarMonth and MultiMonthCalendar controls. This class is used internally by DotNetBar and is not intended for public use.
+    /// </summary>
+    public class CalendarBase : ImageItem, IDesignTimeProvider
+    {
+        #region Private Variables
+        private ElementStyle _BackgroundStyle = new ElementStyle();
+        #endregion
+
+        #region Events
+        #endregion
+
+        #region Constructor
+        /// <summary>
+        /// Initializes a new instance of the MultiMonthCalendar class.
+        /// </summary>
+        public CalendarBase()
+        {
+            m_IsContainer = true;
+            this.AutoCollapseOnClick = true;
+            this.AccessibleRole = System.Windows.Forms.AccessibleRole.Grouping;
+            _BackgroundStyle.StyleChanged += BackgroundStyleChanged;
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            _BackgroundStyle.StyleChanged -= BackgroundStyleChanged;
+            _BackgroundStyle.Dispose();
+            base.Dispose(disposing);
+        }
+        #endregion
+
+        #region Internal Implementation
+        /// <summary>
+        /// Must be overridden by class that is inheriting to provide the painting for the item.
+        /// </summary>
+        public override void Paint(ItemPaintArgs p)
+        {
+            Graphics g = p.Graphics;
+            Region oldClip = null;
+            bool clipSet = false;
+
+            PaintBackground(p);
+
+            Rectangle clip = GetClipRectangle();
+            oldClip = g.Clip;
+            g.SetClip(clip, CombineMode.Intersect);
+            clipSet = true;
+
+            ItemDisplay display = GetItemDisplay();
+            display.Paint(this, p);
+
+            if (clipSet)
+            {
+                if (oldClip != null)
+                    g.Clip = oldClip;
+                else
+                    g.ResetClip();
+            }
+
+            if (oldClip != null)
+                oldClip.Dispose();
+
+            this.DrawInsertMarker(p.Graphics);
+        }
+
+        protected virtual Rectangle GetClipRectangle()
+        {
+            Rectangle clip = this.DisplayRectangle;
+            bool disposeStyle = false;
+            ElementStyle style = ElementStyleDisplay.GetElementStyle(_BackgroundStyle, out disposeStyle);
+            clip.X += ElementStyleLayout.LeftWhiteSpace(style);
+            clip.Width -= ElementStyleLayout.HorizontalStyleWhiteSpace(style);
+            clip.Y += ElementStyleLayout.TopWhiteSpace(style);
+            clip.Height -= ElementStyleLayout.VerticalStyleWhiteSpace(style);
+            if (disposeStyle) style.Dispose();
+            return clip;
+        }
+
+        /// <summary>
+        /// Paints background of the item.
+        /// </summary>
+        /// <param name="p">Provides painting arguments</param>
+        protected virtual void PaintBackground(ItemPaintArgs p)
+        {
+            _BackgroundStyle.SetColorScheme(p.Colors);
+            bool disposeStyle = false;
+            ElementStyle style = GetRenderBackgroundStyle(out disposeStyle);
+            Graphics g = p.Graphics;
+            ElementStyleDisplay.Paint(new ElementStyleDisplayInfo(style, g, this.DisplayRectangle));
+            if(disposeStyle)
+                style.Dispose();
+        }
+
+        protected virtual ElementStyle GetRenderBackgroundStyle(out bool disposeStyle)
+        {
+            disposeStyle = false;
+            return ElementStyleDisplay.GetElementStyle(_BackgroundStyle, out disposeStyle);
+        }
+
+        private ItemDisplay _ItemDisplay = null;
+        internal ItemDisplay GetItemDisplay()
+        {
+            if (_ItemDisplay == null)
+                _ItemDisplay = new ItemDisplay();
+            return _ItemDisplay;
+        }
+
+        private void BackgroundStyleChanged(object sender, EventArgs e)
+        {
+            this.OnAppearanceChanged();
+        }
+
+        /// <summary>
+        /// Specifies the container background style. Default value is an empty style which means that container does not display any background.
+        /// BeginGroup property set to true will override this style on some styles.
+        /// </summary>
+        [Browsable(true), Category("Style"), Description("Gets or sets container background style."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ElementStyle BackgroundStyle
+        {
+            get { return _BackgroundStyle; }
+        }
+
+        /// <summary>
+        /// Returns copy of the item.
+        /// </summary>
+        public override BaseItem Copy()
+        {
+            CalendarBase objCopy = new CalendarBase();
+            this.CopyToItem(objCopy);
+            return objCopy;
+        }
+        /// <summary>
+        /// Copies the CalendarMonth specific properties to new instance of the item.
+        /// </summary>
+        /// <param name="c">New ButtonItem instance.</param>
+        protected override void CopyToItem(BaseItem c)
+        {
+            CalendarBase copy = c as CalendarBase;
+            copy.BackgroundStyle.ApplyStyle(_BackgroundStyle);
+
+            base.CopyToItem(copy);
+        }
+
+        #endregion
+
+        #region Property Hiding
+        /// <summary>
+        /// Returns name of the item that can be used to identify item from the code.
+        /// </summary>
+        [DefaultValue(""), Category("Design"), Description("Indicates the name used to identify item.")]
+        public override string Name
+        {
+            get
+            {
+                return base.Name;
+            }
+            set
+            {
+                base.Name = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the accessible role of the item.
+        /// </summary>
+        [DevCoBrowsable(true), Browsable(true), Category("Accessibility"), Description("Gets or sets the accessible role of the item."), DefaultValue(System.Windows.Forms.AccessibleRole.Grouping)]
+        public override System.Windows.Forms.AccessibleRole AccessibleRole
+        {
+            get { return base.AccessibleRole; }
+            set { base.AccessibleRole = value; }
+        }
+
+        // <summary>
+        /// Gets or sets the Key Tips access key or keys for the item when on Ribbon Control or Ribbon Bar. Use KeyTips property
+        /// when you want to assign the one or more letters to be used to access an item. For example assigning the FN to KeyTips property
+        /// will require the user to press F then N keys to select an item. Pressing the F letter will show only keytips for the items that start with letter F.
+        /// </summary>
+        [Browsable(false), Category("Appearance"), DefaultValue(""), Description("Indicates the Key Tips access key or keys for the item when on Ribbon Control or Ribbon Bar.")]
+        public override string KeyTips
+        {
+            get { return base.KeyTips; }
+            set { base.KeyTips = value; }
+        }
+
+        /// <summary>
+        /// Indicates whether the item will auto-collapse (fold) when clicked. 
+        /// When item is on popup menu and this property is set to false, menu will not
+        /// close when item is clicked.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), DevCoBrowsable(false), System.ComponentModel.Category("Behavior"), System.ComponentModel.DefaultValue(true), System.ComponentModel.Description("Indicates whether the item will auto-collapse (fold) when clicked.")]
+        public override bool AutoCollapseOnClick
+        {
+            get { return base.AutoCollapseOnClick; }
+            set { base.AutoCollapseOnClick = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether item can be customized by end user.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), System.ComponentModel.DefaultValue(true), System.ComponentModel.Category("Behavior"), System.ComponentModel.Description("Indicates whether item can be customized by user.")]
+        public override bool CanCustomize
+        {
+            get { return base.CanCustomize; }
+            set { base.CanCustomize = value; }
+        }
+
+        /// <summary>
+        /// Returns category for this item. If item cannot be customzied using the
+        /// customize dialog category is empty string.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), DevCoBrowsable(false), System.ComponentModel.DefaultValue(""), System.ComponentModel.Category("Design"), System.ComponentModel.Description("Indicates item category used to group similar items at design-time.")]
+        public override string Category
+        {
+            get { return base.Category; }
+            set { base.Category = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether Click event will be auto repeated when mouse button is kept pressed over the item.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), DevCoBrowsable(false), System.ComponentModel.DefaultValue(false), System.ComponentModel.Category("Behavior"), System.ComponentModel.Description("Gets or sets whether Click event will be auto repeated when mouse button is kept pressed over the item.")]
+        public override bool ClickAutoRepeat
+        {
+            get { return base.ClickAutoRepeat; }
+            set { base.ClickAutoRepeat = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the auto-repeat interval for the click event when mouse button is kept pressed over the item.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), DevCoBrowsable(false), System.ComponentModel.DefaultValue(600), System.ComponentModel.Category("Behavior"), System.ComponentModel.Description("Gets or sets the auto-repeat interval for the click event when mouse button is kept pressed over the item.")]
+        public override int ClickRepeatInterval
+        {
+            get { return base.ClickRepeatInterval; }
+            set { base.ClickRepeatInterval = value; }
+        }
+
+        /// <summary>
+        /// Specifies the mouse cursor displayed when mouse is over the item.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), DevCoBrowsable(false), System.ComponentModel.DefaultValue(null), System.ComponentModel.Category("Appearance"), System.ComponentModel.Description("Specifies the mouse cursor displayed when mouse is over the item.")]
+        public override System.Windows.Forms.Cursor Cursor
+        {
+            get { return base.Cursor; }
+            set { base.Cursor = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets item description. This description is displayed in
+        /// Customize dialog to describe the item function in an application.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), DevCoBrowsable(false), System.ComponentModel.DefaultValue(""), System.ComponentModel.Category("Design"), System.ComponentModel.Description("Indicates description of the item that is displayed during design.")]
+        public override string Description
+        {
+            get { return base.Description; }
+            set { base.Description = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether item is global or not.
+        /// This flag is used to propagate property changes to all items with the same name.
+        /// Setting for example Visible property on the item that has GlobalItem set to true will
+        /// set visible property to the same value on all items with the same name.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), DevCoBrowsable(false), System.ComponentModel.DefaultValue(true), System.ComponentModel.Category("Behavior"), System.ComponentModel.Description("Indicates whether certain global properties are propagated to all items with the same name when changed.")]
+        public override bool GlobalItem
+        {
+            get { return base.GlobalItem; }
+            set { base.GlobalItem = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets item alignment inside the container.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), DevCoBrowsable(false), System.ComponentModel.DefaultValue(DevComponents.DotNetBar.eItemAlignment.Near), System.ComponentModel.Category("Appearance"), System.ComponentModel.Description("Determines alignment of the item inside the container.")]
+        public override DevComponents.DotNetBar.eItemAlignment ItemAlignment
+        {
+            get { return base.ItemAlignment; }
+            set { base.ItemAlignment = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the collection of shortcut keys associated with the item.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), DevCoBrowsable(false), System.ComponentModel.Category("Design"), System.ComponentModel.Description("Indicates list of shortcut keys for this item."), System.ComponentModel.Editor("DevComponents.DotNetBar.Design.ShortcutsDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), System.ComponentModel.TypeConverter("DevComponents.DotNetBar.Design.ShortcutsConverter, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf"), System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Content)]
+        public override ShortcutsCollection Shortcuts
+        {
+            get { return base.Shortcuts; }
+            set { base.Shortcuts = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether item will display sub items.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), DevCoBrowsable(false), System.ComponentModel.DefaultValue(true), System.ComponentModel.Category("Behavior"), System.ComponentModel.Description("Determines whether sub-items are displayed.")]
+        public override bool ShowSubItems
+        {
+            get { return base.ShowSubItems; }
+            set { base.ShowSubItems = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether the item expands automatically to fill out the remaining space inside the container. Applies to Items on stretchable, no-wrap Bars only.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), DevCoBrowsable(false), System.ComponentModel.DefaultValue(false), System.ComponentModel.Category("Appearance"), System.ComponentModel.Description("Indicates whether item will stretch to consume empty space. Items on stretchable, no-wrap Bars only.")]
+        public override bool Stretch
+        {
+            get { return base.Stretch; }
+            set { base.Stretch = value; }
+        }
+
+        /// <summary>
+        /// Specifies whether item is drawn using Themes when running on OS that supports themes like Windows XP.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), DevCoBrowsable(false), System.ComponentModel.DefaultValue(false), System.ComponentModel.Category("Appearance"), System.ComponentModel.Description("Specifies whether item is drawn using Themes when running on OS that supports themes like Windows XP.")]
+        public override bool ThemeAware
+        {
+            get { return base.ThemeAware; }
+            set { base.ThemeAware = value; }
+        }
+
+        /// <summary>
+        /// Gets/Sets informational text (tooltip) for the item.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), DevCoBrowsable(false), System.ComponentModel.DefaultValue(""), System.ComponentModel.Category("Appearance"), System.ComponentModel.Description("Indicates the text that is displayed when mouse hovers over the item."), System.ComponentModel.Localizable(true)]
+        public override string Tooltip
+        {
+            get { return base.Tooltip; }
+            set { base.Tooltip = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the text associated with this item.
+        /// </summary>
+        [Browsable(false)]
+        public override string Text
+        {
+            get
+            {
+                return base.Text;
+            }
+            set
+            {
+                base.Text = value;
+            }
+        }
+        #endregion
+
+        #region IDesignTimeProvider Implementation
+        protected virtual InsertPosition GetContainerInsertPosition(Point pScreen, BaseItem dragItem)
+        {
+            return DesignTimeProviderContainer.GetInsertPosition(this, pScreen, dragItem);
+        }
+        InsertPosition IDesignTimeProvider.GetInsertPosition(Point pScreen, BaseItem dragItem)
+        {
+            return GetContainerInsertPosition(pScreen, dragItem);
+        }
+        void IDesignTimeProvider.DrawReversibleMarker(int iPos, bool Before)
+        {
+            DesignTimeProviderContainer.DrawReversibleMarker(this, iPos, Before);
+        }
+        void IDesignTimeProvider.InsertItemAt(BaseItem objItem, int iPos, bool Before)
+        {
+            DesignTimeProviderContainer.InsertItemAt(this, objItem, iPos, Before);
+        }
+
+        #endregion
+    }
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/Editors/DateTimeAdv/DateAppearanceDescription.cs b/PROMS/DotNetBar Source Code/Editors/DateTimeAdv/DateAppearanceDescription.cs
new file mode 100644
index 00000000..14e87de0
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Editors/DateTimeAdv/DateAppearanceDescription.cs	
@@ -0,0 +1,253 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel;
+using System.Drawing;
+using DevComponents.DotNetBar;
+
+namespace DevComponents.Editors.DateTimeAdv
+{
+    /// <summary>
+    /// Defines the visual marking applied to dates through month calendar control.
+    /// </summary>
+    [System.ComponentModel.ToolboxItem(false), System.ComponentModel.DesignTimeVisible(false), TypeConverter(typeof(System.ComponentModel.ExpandableObjectConverter))]
+    public class DateAppearanceDescription
+    {
+        #region Private Variables
+        private BaseItem _Parent = null;
+        #endregion
+
+        #region Events
+        #endregion
+
+        #region Constructor
+        /// <summary>
+        /// Initializes a new instance of the DateAppearanceDescription class.
+        /// </summary>
+        public DateAppearanceDescription()
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the DateAppearanceDescription class.
+        /// </summary>
+        /// <param name="parent"></param>
+        public DateAppearanceDescription(BaseItem parent)
+        {
+            _Parent = parent;
+        }
+        #endregion
+
+        #region Internal Implementation
+        /// <summary>
+        /// Applies all settings from this object to specified object.
+        /// </summary>
+        /// <param name="desc">Reference to object.</param>
+        public void ApplyTo(DateAppearanceDescription desc)
+        {
+            desc.BackColor = this.BackColor;
+            desc.BackColor2 = this.BackColor2;
+            desc.BackColorGradientAngle = this.BackColorGradientAngle;
+            desc.BorderColor = this.BorderColor;
+            desc.IsBold = this.IsBold;
+            desc.Selectable = this.Selectable;
+            desc.TextColor = this.TextColor;
+        }
+
+        private void Refresh()
+        {
+            if (_Parent != null)
+                _Parent.Refresh();
+        }
+
+        private bool _IsBold = false;
+        /// <summary>
+        /// Gets or sets whether text is drawn using bold font.
+        /// </summary>
+        [DefaultValue(false), Description("Indicates whether text is drawn using bold font.")]
+        public bool IsBold
+        {
+            get { return _IsBold; }
+            set
+            {
+                if (_IsBold != value)
+                {
+                    _IsBold = value;
+                    this.Refresh();
+                }
+            }
+        }
+
+        private Color _BackColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets the background color for the marked day.
+        /// </summary>
+        [Category("Colors"), Description("Indicates background color for the marked day.")]
+        public Color BackColor
+        {
+            get { return _BackColor; }
+            set
+            {
+                _BackColor = value;
+                this.Refresh();
+            }
+        }
+        /// <summary>Gets whether property should be serialized. Provided for WinForms designer support.</summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeBackColor()
+        {
+            return !BackColor.IsEmpty;
+        }
+        /// <summary>Resets property to its default value. Provided for WinForms designer support.</summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetBackColor()
+        {
+            BackColor = Color.Empty;
+        }
+
+        private Color _BackColor2 = Color.Empty;
+        /// <summary>
+        /// Gets or sets the background target gradient color for the marked date.
+        /// </summary>
+        [Category("Colors"), Description("Indicates background target gradient color for the marked date.")]
+        public Color BackColor2
+        {
+            get { return _BackColor2; }
+            set
+            {
+                _BackColor2 = value;
+                this.Refresh();
+            }
+        }
+        /// <summary>Gets whether property should be serialized. Provided for WinForms designer support.</summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeBackColor2()
+        {
+            return !BackColor2.IsEmpty;
+        }
+        /// <summary>Resets property to its default value. Provided for WinForms designer support.</summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetBackColor2()
+        {
+            BackColor2 = Color.Empty;
+        }
+
+        private int _BackColorGradientAngle = 90;
+        /// <summary>
+        /// Gets or sets the background gradient fill angle. Default value is 90.
+        /// </summary>
+        [DefaultValue(90), Description("Indicates background gradient fill angle.")]
+        public int BackColorGradientAngle
+        {
+            get { return _BackColorGradientAngle; }
+            set
+            {
+                if (_BackColorGradientAngle != value)
+                {
+                    _BackColorGradientAngle = value;
+                    this.Refresh();
+                }
+            }
+        }
+
+        private Color _TextColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets the text color for the marked date.
+        /// </summary>
+        [Category("Colors"), Description("Indicates text color for the marked date.")]
+        public Color TextColor
+        {
+            get { return _TextColor; }
+            set
+            {
+                _TextColor = value;
+                this.Refresh();
+            }
+        }
+        /// <summary>Gets whether property should be serialized. Provided for WinForms designer support.</summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeTextColor()
+        {
+            return !TextColor.IsEmpty;
+        }
+        /// <summary>Resets property to its default value. Provided for WinForms designer support.</summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetTextColor()
+        {
+            TextColor = Color.Empty;
+        }
+
+        /// <summary>
+        /// Gets whether any of the appearance values have been changed.
+        /// </summary>
+        [Browsable(false)]
+        public bool IsCustomized
+        {
+            get
+            {
+                return !_BackColor.IsEmpty || !_BackColor2.IsEmpty || !_TextColor.IsEmpty || _IsBold || !_BorderColor.IsEmpty;
+            }
+        }
+
+        internal BaseItem Parent
+        {
+            get { return _Parent; }
+            set
+            {
+                if (_Parent != value)
+                {
+                    _Parent = value;
+                }
+            }
+        }
+
+        private Color _BorderColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets the border color.
+        /// </summary>
+        [Category("Colors"), Description("Indicates borderColor color.")]
+        public Color BorderColor
+        {
+            get { return _BorderColor; }
+            set
+            {
+                _BorderColor = value;
+                this.Refresh();
+            }
+        }
+        /// <summary>Gets whether property should be serialized. Provided for WinForms designer support.</summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeBorderColor()
+        {
+            return !BorderColor.IsEmpty;
+        }
+        /// <summary>Resets property to its default value. Provided for WinForms designer support.</summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetBorderColor()
+        {
+            BorderColor = Color.Empty;
+        }
+
+        private bool _Selectable = true;
+        /// <summary>
+        /// Gets or sets whether day marked is selectable by end user. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Description("Indicates whether day marked is selectable by end user.")]
+        public bool Selectable
+        {
+            get { return _Selectable; }
+            set
+            {
+                if (_Selectable != value)
+                {
+                    _Selectable = value;
+                }
+            }
+        }
+        #endregion
+
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/Editors/DateTimeAdv/DateTimeGroup.cs b/PROMS/DotNetBar Source Code/Editors/DateTimeAdv/DateTimeGroup.cs
new file mode 100644
index 00000000..f7679542
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Editors/DateTimeAdv/DateTimeGroup.cs	
@@ -0,0 +1,788 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel;
+using System.Globalization;
+
+namespace DevComponents.Editors.DateTimeAdv
+{
+    public class DateTimeGroup : VisualInputGroup
+    {
+        #region Private Variables
+        private IDateTimePartInput _DayInput = null;
+        private IDateTimePartInput _MonthInput = null;
+        private IDateTimePartInput _YearInput = null;
+        private IDateTimePartInput _HourInput = null;
+        private IDateTimePartInput _MinuteInput = null;
+        private IDateTimePartInput _SecondInput = null;
+        private IDateTimePartInput _DayOfYearInput = null;
+        /// <summary>
+        /// Gets the minimum date value of the DateTimePicker control. 
+        /// </summary>
+        public static readonly System.DateTime MinDateTime = new System.DateTime(1753, 1, 1);
+        /// <summary>
+        /// Specifies the maximum date value of the DateTimePicker control. This field is read-only.
+        /// </summary>
+        public static readonly System.DateTime MaxDateTime = new System.DateTime(9998, 12, 31);
+        #endregion
+
+        #region Events
+        /// <summary>
+        /// Occurs when Value or IsEmpty property has changed.
+        /// </summary>
+        public event EventHandler ValueChanged;
+        #endregion
+
+        #region Constructor
+        #endregion
+
+        #region Internal Implementation
+        protected override void OnItemsCollectionChanged(CollectionChangedInfo collectionChangedInfo)
+        {
+            if (collectionChangedInfo.ChangeType == eCollectionChangeType.Cleared)
+            {
+                _DayInput = null;
+                _MonthInput = null;
+                _YearInput = null;
+                _HourInput = null;
+                _MinuteInput = null;
+                _SecondInput = null;
+                _DayOfYearInput = null;
+            }
+
+            if (collectionChangedInfo.Removed != null)
+            {
+                foreach (VisualItem item in collectionChangedInfo.Removed)
+                {
+                    if (item == _DayInput)
+                        _DayInput = null;
+                    else if (item == _MonthInput)
+                        _MonthInput = null;
+                    else if (item == _YearInput)
+                        _YearInput = null;
+                    else if (item == _HourInput)
+                        _HourInput = null;
+                    else if (item == _MinuteInput)
+                        _MinuteInput = null;
+                    else if (item == _SecondInput)
+                        _SecondInput = null;
+                    else if (item == _DayOfYearInput)
+                        _DayOfYearInput = null;
+                }
+            }
+
+            if (collectionChangedInfo.Added != null)
+            {
+                List<VisualItem> hourLabels = new List<VisualItem>();
+                foreach (VisualItem item in collectionChangedInfo.Added)
+                {
+                    if (item is HourPeriodLabel)
+                    {
+                        if (_HourInput != null && _HourInput is NumericHourInput)
+                            ((HourPeriodLabel)item).HourInput = (NumericHourInput)_HourInput;
+                    }
+                    else if (item is HourPeriodInput)
+                    {
+                        if (_HourInput != null && _HourInput is NumericHourInput)
+                            ((HourPeriodInput)item).HourInput = (NumericHourInput)_HourInput;
+                    }
+
+                    IDateTimePartInput idp = item as IDateTimePartInput;
+                    if (idp == null)
+                        continue;
+                    if (idp.Part == eDateTimePart.Day)
+                        _DayInput = idp;
+                    else if (idp.Part == eDateTimePart.Hour)
+                    {
+                        _HourInput = idp;
+                        if (_HourInput is NumericHourInput)
+                        {
+                            foreach (VisualItem vi in this.Items)
+                            {
+                                if (vi is HourPeriodLabel)
+                                    ((HourPeriodLabel)vi).HourInput = (NumericHourInput)_HourInput;
+                                else if (vi is HourPeriodInput)
+                                    ((HourPeriodInput)vi).HourInput = (NumericHourInput)_HourInput;
+                            }
+                        }
+                    }
+                    else if (idp.Part == eDateTimePart.Minute)
+                        _MinuteInput = idp;
+                    else if (idp.Part == eDateTimePart.Month)
+                        _MonthInput = idp;
+                    else if (idp.Part == eDateTimePart.Second)
+                        _SecondInput = idp;
+                    else if (idp.Part == eDateTimePart.Year)
+                        _YearInput = idp;
+                    else if (idp.Part == eDateTimePart.DayOfYear)
+                        _DayOfYearInput = idp;
+
+                }
+            }
+
+            UpdateInnerDateTimeGroupMinMax();
+            UpdateInputItems();
+
+            base.OnItemsCollectionChanged(collectionChangedInfo);
+        }
+
+        private bool _ProcessingInputChanged = false;
+
+        protected override void OnInputChanged(VisualInputBase input)
+        {
+            if (!_ProcessingInputChanged && !_ResettingDateValue)
+            {
+                try
+                {
+                    _ProcessingInputChanged = true;
+
+                    if (input == _MonthInput || input == _YearInput)
+                    {
+                        if (_DayInput != null)
+                        {
+                            // Assign day min max values
+                            UpdateDayMaxValue();
+                        }
+                    }
+                    if (input == _YearInput && _DayOfYearInput != null)
+                        UpdateDayOfYearMaxValue();
+
+                    if (input != _YearInput && _YearInput != null && _YearInput.IsEmpty && _DefaultInputValues)
+                        _YearInput.Value = Math.Min(System.DateTime.Now.Year, _MaxDate.Year);
+                    if (input != _MonthInput && _MonthInput != null && _MonthInput.IsEmpty)
+                    {
+                        if (_DefaultInputValues)
+                        {
+                            if (_YearInput != null && _YearInput.Value == _MaxDate.Year)
+                                _MonthInput.Value = _MaxDate.Month;
+                            else
+                                _MonthInput.Value = System.DateTime.Now.Month;
+                        }
+                        // Assign day min max values
+                        UpdateDayMaxValue();
+                    }
+                    if (input != _DayInput && _DayInput != null && _DayInput.IsEmpty && _DefaultInputValues)
+                    {
+                        if (_YearInput != null && _YearInput.Value == _MaxDate.Year && _MonthInput != null && _MonthInput.Value == _MaxDate.Month)
+                            _DayInput.Value = _MaxDate.Day;
+                        else
+                            _DayInput.Value = System.DateTime.Now.Day;
+                    }
+                    if (input != _HourInput && _HourInput != null && _HourInput.IsEmpty && _DefaultInputValues)
+                    {
+                        _HourInput.Value = 0; // System.DateTime.Now.Hour;
+                    }
+                    if (input != _MinuteInput && _MinuteInput != null && _MinuteInput.IsEmpty && _DefaultInputValues)
+                    {
+                        _MinuteInput.Value = 0; // System.DateTime.Now.Minute;
+                    }
+                    if (input != _SecondInput && _SecondInput != null && _SecondInput.IsEmpty && _DefaultInputValues)
+                    {
+                        _SecondInput.Value = 0;
+                    }
+
+                    // Reset empty flag
+                    if (_YearInput != null && !_YearInput.IsEmpty || _MonthInput != null && !_MonthInput.IsEmpty || _DayInput != null && !_DayInput.IsEmpty
+                        || _HourInput != null && !_HourInput.IsEmpty || _MinuteInput != null && !_MinuteInput.IsEmpty || _SecondInput != null && !_SecondInput.IsEmpty)
+                        this.IsEmpty = false;
+                    SyncValues(input);
+                }
+                finally
+                {
+                    _ProcessingInputChanged = false;
+                }
+                if (IsUserInput && IsCurrentInputValid()) OnValueChanged();
+            }
+
+            base.OnInputChanged(input);
+        }
+
+        private void UpdateDayOfYearMaxValue()
+        {
+            if (_YearInput != null && !_YearInput.IsEmpty && _DayOfYearInput != null)
+            {
+                _DayOfYearInput.MaxValue = DateTimeInput.GetActiveCulture().Calendar.GetDaysInYear(_YearInput.Value);
+            }
+        }
+
+        protected override void OnFocusedItemChanged(VisualItem previousFocus)
+        {
+            if (this.FocusedItem == _DayInput && _DayInput is NumericDayInput)
+            {
+                UpdateDayMaxValue();
+            }
+            else if (previousFocus == _YearInput || previousFocus == _DayInput)
+            {
+                UpdateDayMaxValue();
+            }
+            else
+            {
+                SyncValues(previousFocus);
+            }
+
+            base.OnFocusedItemChanged(previousFocus);
+        }
+
+        private void UpdateDayMaxValue()
+        {
+            if (_DayInput != null && (this.FocusedItem == _DayInput || this.FocusedItem == _MonthInput) && _DayInput is NumericDayInput)
+                _DayInput.MaxValue = 31;
+            else if (_YearInput != null && _MonthInput != null && !_MonthInput.IsEmpty && _DayInput != null)
+            {
+                // Assign day min max values
+                _DayInput.MaxValue = System.DateTime.DaysInMonth(_YearInput.IsEmpty ? System.DateTime.Now.Year : _YearInput.Value, _MonthInput.Value);
+            }
+        }
+
+        protected override void OnInputComplete()
+        {
+            SyncValues(this.FocusedItem);
+            base.OnInputComplete();
+        }
+
+        //private bool _Validating = false;
+        //protected override bool ValidateInput(VisualItem inputItem)
+        //{
+        //    if (!_Validating && inputItem is IDateTimePartInput && !this.IsEmpty)
+        //    {
+        //        IDateTimePartInput input = (IDateTimePartInput)inputItem;
+        //        System.DateTime v = GetCurrentInputValue();
+        //        if (v < _MinDate || v > _MaxDate)
+        //        {
+        //            try
+        //            {
+        //                _Validating = true;
+        //                input.UndoInput();
+        //            }
+        //            finally
+        //            {
+        //                _Validating = false;
+        //            }
+        //            return false;
+        //        }
+        //    }
+        //    return base.ValidateInput(inputItem);
+        //}
+
+        private void SyncValues(VisualItem visualItem)
+        {
+            IDateTimePartInput inputPart = visualItem as IDateTimePartInput;
+            if (inputPart == null)
+                return;
+            for (int i = 0; i < this.Items.Count; i++)
+            {
+                IDateTimePartInput part = this.Items[i] as IDateTimePartInput;
+                if (part == null) continue;
+
+                if (part.Part == inputPart.Part && part != inputPart)
+                    part.Value = inputPart.Value;
+                else if (part != inputPart && inputPart.Part == eDateTimePart.DayOfYear && (part.Part == eDateTimePart.Day || part.Part == eDateTimePart.Month))
+                {
+                    if (_YearInput != null && !_YearInput.IsEmpty)
+                    {
+                        System.DateTime d = CreateDateTime(_YearInput.Value, inputPart.Value);
+                        if (part.Part == eDateTimePart.Day)
+                            part.Value = d.Day;
+                        else if (part.Part == eDateTimePart.Month)
+                            part.Value = d.Month;
+                    }
+                }
+                else if (part.Part == eDateTimePart.DayName)
+                {
+                    if (_YearInput != null && !_YearInput.IsEmpty &&
+                        (_MonthInput != null && !_MonthInput.IsEmpty && _DayInput != null && !_DayInput.IsEmpty ||
+                        _DayOfYearInput != null && !_DayOfYearInput.IsEmpty))
+                    {
+                        try
+                        {
+                            System.DateTime date;
+                            if (_DayOfYearInput != null)
+                                date = CreateDateTime(_YearInput.Value, _DayOfYearInput.Value);
+                            else
+                                date = new System.DateTime(_YearInput.Value, _MonthInput.Value, _DayInput.Value);
+                            part.Value = (int)date.DayOfWeek;
+                        }
+                        catch
+                        {
+                            part.IsEmpty = true;
+                        }
+                    }
+                    else
+                        part.IsEmpty = true;
+                }
+            }
+
+
+        }
+
+        internal static System.DateTime CreateDateTime(int year, int dayOfYear)
+        {
+            System.DateTime d = new System.DateTime(year, 1, 1);
+            if (dayOfYear > 0)
+            {
+                d.AddDays(dayOfYear - 1);
+            }
+
+            return d;
+        }
+
+        protected override void OnLostFocus()
+        {
+            UpdateValue(false);
+
+            base.OnLostFocus();
+        }
+
+        protected override void OnGroupInputComplete()
+        {
+            UpdateValue(false);
+            base.OnGroupInputComplete();
+        }
+
+        protected internal void UpdateValue(bool updateDirect)
+        {
+            // Validate Complete Input
+            System.DateTime v = System.DateTime.Now;
+
+            if (_YearInput != null && _YearInput.IsEmpty || _MonthInput != null && _MonthInput.IsEmpty ||
+                _DayInput != null && _DayInput.IsEmpty || _HourInput != null && _HourInput.IsEmpty ||
+                _MinuteInput != null && _MinuteInput.IsEmpty || _SecondInput != null && _SecondInput.IsEmpty)
+            {
+                if (HasNestedGroups)
+                    UpdateIsEmpty();
+                else
+                {
+                    if (!this.IsFocused || _DefaultInputValues)
+                        this.IsEmpty = true;
+                }
+            }
+            else
+            {
+                v = GetCurrentInputValue();
+
+                if (v > _MaxDate)
+                    v = _MaxDate;
+                else if (v < _MinDate)
+                    v = _MinDate;
+
+                if (updateDirect)
+                    _Value = v;
+                else
+                    Value = v;
+            }
+        }
+
+        private bool IsCurrentInputValid()
+        {
+            DateTime d = GetCurrentInputValue();
+            if (d < _MinDate || d > _MaxDate) return false;
+            return true;
+        }
+
+        private bool HasNestedGroups
+        {
+            get
+            {
+                foreach (VisualItem item in this.Items)
+                {
+                    if (item is VisualGroup)
+                        return true;
+                }
+                return false;
+            }
+        }
+
+        private System.DateTime GetCurrentInputValue()
+        {
+            System.DateTime v = System.DateTime.Now;
+            if (_Value != DateTime.MinValue) v = _Value;
+            if (v < _MinDate)
+                v = _MinDate;
+            else if (v > _MaxDate)
+                v = _MaxDate;
+
+            int year = v.Year, month = v.Month, day = v.Day, hour = v.Hour, minute = v.Minute, second = v.Second, dayOfYear = v.DayOfYear;
+
+            if (_YearInput != null)
+            {
+                year = _YearInput.Value;
+                if (year < 30)
+                    year += 2000;
+                else if (year < 100)
+                    year += 1900;
+            }
+            else if (_Value != DateTime.MinValue)
+                year = _Value.Year;
+
+            if (_MonthInput != null)
+                month = _MonthInput.Value;
+            else if (_Value != DateTime.MinValue)
+                month = _Value.Month;
+
+            if (_DayInput != null)
+            {
+                day = _DayInput.Value;
+                if (_YearInput != null && _MonthInput != null)
+                    day = Math.Min(day, System.DateTime.DaysInMonth(_YearInput.IsEmpty ? System.DateTime.Now.Year : _YearInput.Value, _MonthInput.Value));
+            }
+            else if (_Value != DateTime.MinValue)
+                day = _Value.Day;
+
+            if (_HourInput != null)
+            {
+                hour = _HourInput.Value;
+                if (hour == 12 && _HourInput is NumericHourInput && ((NumericHourInput)_HourInput).Period == eHourPeriod.AM && !((NumericHourInput)_HourInput).Is24HourFormat)
+                    hour = 0;
+                else if (hour < 12 && _HourInput is NumericHourInput && ((NumericHourInput)_HourInput).Period == eHourPeriod.PM && !((NumericHourInput)_HourInput).Is24HourFormat)
+                {
+                    hour += 12;
+                }
+            }
+            else if (_Value != DateTime.MinValue)
+                hour = _Value.Hour;
+
+            if (_MinuteInput != null)
+                minute = _MinuteInput.Value;
+            else if (_Value != DateTime.MinValue)
+                minute = _Value.Minute;
+
+            if (_SecondInput != null)
+                second = _SecondInput.Value;
+            else if (_Value != DateTime.MinValue)
+                second = _Value.Second;
+            else
+                second = 0;
+
+            if (_DayOfYearInput != null)
+            {
+                dayOfYear = _DayOfYearInput.Value;
+                if (dayOfYear > 0)
+                {
+                    System.DateTime d = CreateDateTime(year, dayOfYear);
+                    month = d.Month;
+                    day = d.Day;
+                }
+            }
+
+            // Correct day for leap year etc. case
+            if (System.DateTime.DaysInMonth(year, month) < day)
+                day = System.DateTime.DaysInMonth(year, month);
+
+            if (_HourInput != null || _MinuteInput != null || _SecondInput != null || _Value != DateTime.MinValue)
+                v = new System.DateTime(year, month, day, hour, minute, second);
+            else
+                v = new System.DateTime(year, month, day);
+
+            return v;
+        }
+
+        private System.DateTime _Value;
+        /// <summary>
+        /// Gets or sets the date time.
+        /// </summary>
+        public System.DateTime Value
+        {
+            get
+            {
+                if (this.IsFocused) this.UpdateValue(true);
+                return _Value;
+            }
+            set
+            {
+                bool changed = _Value != value;
+                _Value = value;
+                this.IsEmpty = false;
+                UpdateInputItems();
+                if(changed)
+                    OnValueChanged();
+            }
+        }
+
+        private bool _InValueChanged = false;
+        /// <summary>
+        /// Raises the ValueChanged event.
+        /// </summary>
+        protected virtual void OnValueChanged()
+        {
+            if (_InValueChanged) return;
+            try
+            {
+                _InValueChanged = true;
+                if (ValueChanged != null)
+                    ValueChanged(this, new EventArgs());
+                if (this.Parent is DateTimeGroup)
+                    ((DateTimeGroup)this.Parent).OnValueChanged();
+                this.InvalidateArrange();
+            }
+            finally
+            {
+                _InValueChanged = false;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the values of the nested DateTimeGroup items.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public System.DateTime[] Values
+        {
+            get
+            {
+                if (HasNestedGroups)
+                {
+                    List<System.DateTime> dates = new List<System.DateTime>();
+                    foreach (VisualItem item in this.Items)
+                    {
+                        DateTimeGroup group = item as DateTimeGroup;
+                        if (group != null)
+                        {
+                            dates.Add(group.Value);
+                        }
+                    }
+
+                    return dates.ToArray();
+                }
+
+                return new System.DateTime[] { this.Value };
+            }
+            set
+            {
+                if (value == null || value.Length == 0) return;
+
+                if (HasNestedGroups)
+                {
+                    int i = 0;
+                    foreach (VisualItem item in this.Items)
+                    {
+                        DateTimeGroup group = item as DateTimeGroup;
+                        if (group != null)
+                        {
+                            group.Value = value[i];
+                            i++;
+                            if (i >= value.Length) break;
+                        }
+                    }
+                }
+                else
+                    this.Value = value[0];
+            }
+        }
+
+        private void UpdateInputItems()
+        {
+            System.DateTime d = _Value;
+            if (_YearInput != null)
+            {
+                if (this.IsEmpty)
+                    _YearInput.IsEmpty = true;
+                else
+                    _YearInput.Value = d.Year;
+            }
+            if (_MonthInput != null)
+            {
+                if (this.IsEmpty)
+                    _MonthInput.IsEmpty = true;
+                else
+                    _MonthInput.Value = d.Month;
+            }
+            if (_DayInput != null)
+            {
+                if (this.IsEmpty)
+                    _DayInput.IsEmpty = true;
+                else if (!(this.FocusedItem == _DayInput && _DayInput is NumericDayInput && _ProcessingInputChanged))
+                    _DayInput.Value = d.Day;
+            }
+            if (_HourInput != null)
+            {
+                if (this.IsEmpty)
+                    _HourInput.IsEmpty = true;
+                else
+                {
+                    if (_HourInput is NumericHourInput)
+                        ((NumericHourInput)_HourInput).Period = eHourPeriod.AM;
+                    _HourInput.Value = d.Hour;
+                    if (_HourInput is NumericHourInput && !((NumericHourInput)_HourInput).Is24HourFormat && d.Hour >= 12)
+                        ((NumericHourInput)_HourInput).Period = eHourPeriod.PM;
+                }
+            }
+            if (_MinuteInput != null)
+            {
+                if (this.IsEmpty)
+                    _MinuteInput.IsEmpty = true;
+                else
+                    _MinuteInput.Value = d.Minute;
+            }
+            if (_SecondInput != null)
+            {
+                if (this.IsEmpty)
+                    _SecondInput.IsEmpty = true;
+                else
+                    _SecondInput.Value = d.Second;
+            }
+
+            for (int i = 0; i < this.Items.Count; i++)
+            {
+                IDateTimePartInput part = this.Items[i] as IDateTimePartInput;
+                if (part == null) continue;
+                if (part.Part == eDateTimePart.DayName)
+                    part.Value = this.IsEmpty ? -1 : (int)_Value.DayOfWeek;
+                else if (part.Part == eDateTimePart.DayOfYear)
+                {
+                    if (this.IsEmpty)
+                        part.IsEmpty = true;
+                    else
+                        part.Value = _Value.DayOfYear;
+                }
+            }
+            
+            InvalidateArrange();
+        }
+
+
+        private bool _ResettingDateValue = false;
+        protected override void ResetValue()
+        {
+            _ResettingDateValue = true;
+            try
+            {
+                if (this.AllowEmptyState)
+                {
+                    if (_DayInput != null) _DayInput.IsEmpty = true;
+                    if (_MonthInput != null) _MonthInput.IsEmpty = true;
+                    if (_YearInput != null) _YearInput.IsEmpty = true;
+                    if (_HourInput != null) _HourInput.IsEmpty = true;
+                    if (_MinuteInput != null) _MinuteInput.IsEmpty = true;
+                    if (_SecondInput != null) _SecondInput.IsEmpty = true;
+
+                    foreach (VisualItem item in this.Items)
+                    {
+                        if (item is DateTimeGroup)
+                            ((DateTimeGroup)item).IsEmpty = true;
+                        else if (item is IDateTimePartInput && !((IDateTimePartInput)item).IsEmpty)
+                            ((IDateTimePartInput)item).IsEmpty = true;
+                    }
+                    _Value = DateTime.MinValue;
+                }
+                else
+                {
+                    SetNonEmptyValue();
+                }
+            }
+            finally
+            {
+                _ResettingDateValue = false;
+            }
+
+            OnValueChanged();
+        }
+
+        private System.DateTime _MinDate = MinDateTime;
+        /// <summary>
+        /// Gets or sets the minimum value represented by the group.
+        /// </summary>
+        public System.DateTime MinDate
+        {
+            get { return _MinDate; }
+            set { _MinDate = value; OnMinDateChanged(); }
+        }
+
+        private void OnMinDateChanged()
+        {
+            UpdateInnerDateTimeGroupMinMax();
+        }
+
+        private System.DateTime _MaxDate = MaxDateTime;
+        /// <summary>
+        /// Gets or sets maximum value represented by the group.
+        /// </summary>
+        public System.DateTime MaxDate
+        {
+            get { return _MaxDate; }
+            set { _MaxDate = value; OnMaxDateChanged(); }
+        }
+
+        private void OnMaxDateChanged()
+        {
+            UpdateInnerDateTimeGroupMinMax();
+        }
+
+        private void UpdateInnerDateTimeGroupMinMax()
+        {
+            foreach (VisualItem  item in this.Items)
+            {
+                DateTimeGroup dg = item as DateTimeGroup;
+                if (dg != null)
+                {
+                    dg.MinDate = _MinDate;
+                    dg.MaxDate = _MaxDate;
+                }
+            }
+        }
+
+        protected override void OnAllowEmptyStateChanged()
+        {
+            if (!this.AllowEmptyState && this.IsEmpty)
+            {
+                SetNonEmptyValue();
+            }
+            base.OnAllowEmptyStateChanged();
+        }
+
+        private void SetNonEmptyValue()
+        {
+            if (this.MinDate > MinDateTime)
+                this.Value = this.MinDate;
+            else
+                this.Value = DateTime.Now;
+        }
+
+        internal override void ProcessKeyDown(System.Windows.Forms.KeyEventArgs e)
+        {
+            if (e.KeyCode != System.Windows.Forms.Keys.Back && e.KeyCode != System.Windows.Forms.Keys.Delete)
+                IsUserInput = true;
+            base.ProcessKeyDown(e);
+            IsUserInput = false;
+        }
+
+        internal override void ProcessKeyPress(System.Windows.Forms.KeyPressEventArgs e)
+        {
+            IsUserInput = true;
+            base.ProcessKeyPress(e);
+            IsUserInput = false;
+        }
+
+        internal override bool ProcessCmdKey(ref System.Windows.Forms.Message msg, System.Windows.Forms.Keys keyData)
+        {
+            IsUserInput = true;
+            bool b = base.ProcessCmdKey(ref msg, keyData);
+            IsUserInput = false;
+            return b;
+        }
+
+        internal override void ProcessMouseWheel(System.Windows.Forms.MouseEventArgs e)
+        {
+            IsUserInput = true;
+            base.ProcessMouseWheel(e);
+            IsUserInput = false;
+        }
+
+        private bool _DefaultInputValues = true;
+        /// <summary>
+        /// Gets or sets whether input values are set to defaults while user is entering data. Default value is true.
+        /// </summary>
+        public bool DefaultInputValues
+        {
+            get { return _DefaultInputValues; }
+            set
+            {
+                _DefaultInputValues = value;
+            }
+        }
+        
+        #endregion
+
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/Editors/DateTimeAdv/DateTimeInput.cs b/PROMS/DotNetBar Source Code/Editors/DateTimeAdv/DateTimeInput.cs
new file mode 100644
index 00000000..adc21b5d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Editors/DateTimeAdv/DateTimeInput.cs	
@@ -0,0 +1,1942 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel;
+using System.Globalization;
+using System.Collections;
+using System.Net;
+using DevComponents.DotNetBar;
+using System.Drawing;
+using System.Windows.Forms;
+
+namespace DevComponents.Editors.DateTimeAdv
+{
+    [ToolboxBitmap(typeof(DotNetBarManager), "DateTimeInput.ico"), ToolboxItem(true), Designer("DevComponents.DotNetBar.Design.DateTimeInputDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+    [DefaultBindingProperty("ValueObject"), DefaultProperty("ValueObject")]
+    public class DateTimeInput : VisualControlBase, ICommandSource
+    {
+        #region Private Variables
+        private DateTimeGroup _DateInputGroup = null;
+        private ButtonItem _PopupItem = null;
+        private MonthCalendarItem _MonthCalendar = null;
+        private TimeSelectorItem _TimeSelector = null;
+        private LabelItem _Spacer = null;
+        #endregion
+
+        #region Events
+        /// <summary>
+        /// Occurs when the Value or IsEmpty property changes.
+        /// <remarks>
+        /// This event is not raised when the entered date is earlier than MinDateTime or later than MaxDateTime.
+        /// </remarks>
+        /// </summary>
+        public event EventHandler ValueChanged;
+        /// <summary>
+        /// Occurs when the Value or IsEmpty property changes. This event occurs at the same time and has same function as ValueChanged event. It is provided for binding support.
+        /// </summary>
+        public event EventHandler ValueObjectChanged;
+        /// <summary>
+        /// Occurs when the Format property value has changed. 
+        /// </summary>
+        public event EventHandler FormatChanged;
+        /// <summary>
+        /// Occurs when Clear button is clicked and allows you to cancel the default action performed by the button.
+        /// </summary>
+        public event CancelEventHandler ButtonClearClick;
+        /// <summary>
+        /// Occurs when Drop-Down button that shows calendar is clicked and allows you to cancel showing of the popup.
+        /// </summary>
+        public event CancelEventHandler ButtonDropDownClick;
+        /// <summary>
+        /// Occurs when ValueObject property is set and it allows you to provide custom parsing for the values.
+        /// </summary>
+        public event ParseDateTimeValueEventHandler ParseValue;
+        /// <summary>
+        /// Occurs when ShowCheckBox property is set to true and user changes the lock status of the control by clicking the check-box.
+        /// </summary>
+        public event EventHandler LockUpdateChanged;
+        #endregion
+
+        #region Constructor
+        /// <summary>
+        /// Initializes a new instance of the DateTimeInput class.
+        /// </summary>
+        public DateTimeInput()
+        {
+        }
+        #endregion
+
+        #region Internal Implementation
+        /// <summary>
+        /// Copies the current value in the control to the Clipboard.
+        /// </summary>
+        public virtual void Copy()
+        {
+            if (_DateInputGroup != null) Clipboard.SetText(this.Text);
+        }
+        /// <summary>
+        /// Pastes the current Clipboard content if possible as the value into the control.
+        /// </summary>
+        public virtual void Paste()
+        {
+            if (_DateInputGroup != null) Text = Clipboard.GetText();
+        }
+        /// <summary>
+        /// Moves the current control value to the Clipboard.
+        /// </summary>
+        public virtual void Cut()
+        {
+            if (_DateInputGroup != null)
+            {
+                Copy();
+                if(this.AllowEmptyState)
+                    ValueObject = null;
+            }
+        }
+
+        protected override PopupItem CreatePopupItem()
+        {
+            ButtonItem button = new ButtonItem("sysPopupProvider");
+            button.PopupClose += new EventHandler(DropDownPopupClose);
+
+            ItemContainer container = new ItemContainer();
+            container.LayoutOrientation = eOrientation.Horizontal;
+            container.BackgroundStyle.Padding = 4;
+
+            MonthCalendarItem mc = new MonthCalendarItem();
+            mc.CalendarDimensions = new Size(1, 1);
+            //mc.DayClickAutoClosePopup = false;
+            //mc.BackgroundStyle.BackColor = SystemColors.Window;
+            mc.DateChanged += new EventHandler(PopupSelectedDateChanged);
+            container.SubItems.Add(mc);
+            button.SubItems.Add(container);
+
+            LabelItem sep = new LabelItem();
+            sep.Width = 8;
+            sep.AutoCollapseOnClick = false;
+            sep.Visible = false;
+            container.SubItems.Add(sep);
+            TimeSelectorItem timeSelector = new TimeSelectorItem();
+            timeSelector.SelectorType = _TimeSelectorType;
+            timeSelector.SelectedTimeChanged += new EventHandler(TimeSelectorChanged);
+            timeSelector.TimeFormat = _TimeSelectorTimeFormat;
+            timeSelector.Visible = false;
+            container.SubItems.Add(timeSelector);
+
+            _PopupItem = button;
+            _MonthCalendar = mc;
+            _TimeSelector = timeSelector;
+            _Spacer = sep;
+            UpdateTimeSelectorItemSize();
+            return button;
+        }
+
+        protected override void ScaleControl(SizeF factor, BoundsSpecified specified)
+        {
+            base.ScaleControl(factor, specified);
+            _PopupItem.NotifyScaleItem(factor);
+            UpdateTimeSelectorItemSize();
+        }
+
+        private void UpdateTimeSelectorItemSize()
+        {
+            if (_TimeSelector == null) return;
+            _TimeSelector.HourMinuteButtonSize = new Size(_TimeSelector.HourMinuteButtonSize.Width, this.Font.Height <= 15 ? 15 : Dpi.DescaleHeight(this.Font.Height) + 1);
+        }
+        protected override void OnFontChanged(EventArgs e)
+        {
+            UpdateTimeSelectorItemSize();
+            base.OnFontChanged(e);
+        }
+
+        /// <summary>
+        /// Gets whether popup calendar is open.
+        /// </summary>
+        [Browsable(false)]
+        public bool IsPopupCalendarOpen
+        {
+            get
+            {
+                return _PopupItem.Expanded;
+            }
+            set
+            {
+                if (_PopupItem.Expanded != value)
+                    ToggleCalendarPopup();
+            }
+        }
+
+        private bool _PopupCalendarKeyboardNavigationEnabled = true;
+        /// <summary>
+        /// Gets or sets whether selected date on popup calendar can be changed using keyboard arrow keys.
+        /// </summary>
+        [Browsable(false), DefaultValue(true)]
+        public bool PopupCalendarKeyboardNavigationEnabled
+        {
+            get { return _PopupCalendarKeyboardNavigationEnabled; }
+            set
+            {
+                _PopupCalendarKeyboardNavigationEnabled = value;
+            }
+        }
+        
+
+        protected override bool OnKeyDown(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+            if (IsPopupCalendarOpen)
+            {
+                int days = 0;
+                int wParamInt = WinApi.ToInt(wParam);
+                if (_PopupCalendarKeyboardNavigationEnabled)
+                {
+                    if (wParamInt == 37) // Left Arrow
+                        days = -1;
+                    else if (wParamInt == 39) // Right Arrow
+                        days = 1;
+                    else if (wParamInt == 40) // Down Arrow
+                        days = 7;
+                    else if (wParamInt == 38) // Up Arrow
+                        days = -7;
+                }
+                else if (wParamInt == 13 && _MonthCalendar.SelectedDate != DateTime.MinValue) // Enter
+                {
+                    ToggleCalendarPopup();
+                    return true;
+                }
+
+                if (days != 0)
+                {
+                    if (_MonthCalendar.SelectedDate == DateTime.MinValue)
+                        _MonthCalendar.SelectedDate = DateTime.Today;
+                    else
+                        _MonthCalendar.SelectedDate = _MonthCalendar.SelectedDate.AddDays(days);
+                    if (_MonthCalendar.DisplayMonth.Month != _MonthCalendar.SelectedDate.Month)
+                        _MonthCalendar.DisplayMonth = _MonthCalendar.SelectedDate;
+                    return true;
+                }
+            }
+            return base.OnKeyDown(hWnd, wParam, lParam);
+        }
+        /// <summary>
+        /// Gets or sets the default date-time values that are used by the control.
+        /// </summary>
+        public static DateTime DateTimeDefaults = DateTime.Today;
+
+        private void TimeSelectorChanged(object sender, EventArgs e)
+        {
+            DateTime date = this.Value;
+            if (date == DateTime.MinValue) date = DateTimeDefaults;
+            if (date != DateTime.MinValue && date != DateTime.MaxValue)
+                date = new DateTime(date.Year, date.Month, date.Day, _TimeSelector.SelectedTime.Hours, _TimeSelector.SelectedTime.Minutes, _TimeSelector.SelectedTime.Seconds);
+            if (this.MinDate != DateTime.MinValue && date < this.MinDate) date = this.MinDate;
+            _DateInputGroup.Value = date;
+        }
+        private void PopupSelectedDateChanged(object sender, EventArgs e)
+        {
+            if (_MonthCalendar.SelectedDate == DateTime.MinValue)
+                this.IsEmpty = true;
+            else
+            {
+                DateTime date = _MonthCalendar.SelectedDate;
+                DateTime value = this.Value;
+                if (value != DateTime.MinValue && value != DateTime.MaxValue)
+                    date = new DateTime(date.Year, date.Month, date.Day, value.Hour, value.Minute, value.Second);
+                if (this.MinDate != DateTime.MinValue && date < this.MinDate) date = this.MinDate;
+                _DateInputGroup.Value = date;
+            }
+        }
+
+        protected override VisualItem CreateRootVisual()
+        {
+            _ButtonClear = new InputButtonSettings(this);
+            _ButtonDropDown = new InputButtonSettings(this);
+            _ButtonFreeText = new InputButtonSettings(this);
+
+            _DateInputGroup = new DateTimeGroup();
+            _DateInputGroup.IsRootVisual = true;
+            _DateInputGroup.ValueChanged += new EventHandler(InputGroup_ValueChanged);
+            FormatToDateTimeGroup();
+            return _DateInputGroup;
+        }
+
+        private void InputGroup_ValueChanged(object sender, EventArgs e)
+        {
+            if (!IsPopupCalendarOpen)
+                OnValueChanged(e);
+            else
+                _FireValueChangedOnPopupClose = true;
+        }
+
+        protected override bool IsWatermarkRendered
+        {
+            get
+            {
+                return !(this.Focused || _FreeTextEntryBox != null && _FreeTextEntryBox.Focused) && _DateInputGroup.IsEmpty;
+            }
+        }
+
+        private bool _ShowCheckBox = false;
+        /// <summary>
+        /// Gets or sets a value indicating whether a check box is displayed to the left of the selected date.
+        /// Set to true if a check box is displayed to the left of the selected date; otherwise, false. The default is false.
+        /// <remarks>
+        /// When the ShowCheckBox property is set to true, a check box is displayed to the left of the date in the control. When the check box is selected, the date/time value can be updated. When the check box is cleared, the date/time value is unable to be changed.
+        /// You can handle the LockUpdateChanged event to be notified when this check box is checked and unchecked. Use LockUpdateChecked property 
+        /// to get or sets whether check box is checked.
+        /// </remarks>
+        /// </summary>
+        [DefaultValue(false), Description("Indicates whether a check box is displayed to the left of the input value which allows locking of the control.")]
+        public bool ShowCheckBox
+        {
+            get { return _ShowCheckBox; }
+            set
+            {
+                _ShowCheckBox = value;
+                OnFormatChanged();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether a spin button control (up-down control) is used to adjust the date/time value. The default is false. 
+        /// <remarks>
+        /// When the ShowUpDown property is set to true, a spin button control is shown to adjust value of currently focused input item. 
+        /// The date and time can be adjusted by selecting each element individually and using the up and down buttons to change the value.
+        /// </remarks>
+        /// </summary>
+        private bool _ShowUpDown = false;
+        [DefaultValue(false)]
+        public bool ShowUpDown
+        {
+            get { return _ShowUpDown; }
+            set
+            {
+                _ShowUpDown = value;
+                OnFormatChanged();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the date time value of the control. You can use IsEmpty property to check whether control holds an empty value.
+        /// Setting this property to System.DateTime(0) will also make the control Empty if AllowEmptyState=true.
+        /// </summary>
+        [Description("Indicates date time value of the control"), Bindable(BindableSupport.Yes)]
+        public System.DateTime Value
+        {
+            get { return _DateInputGroup.Value; }
+            set 
+            {
+                if (this.AllowEmptyState && value.Equals(new System.DateTime(((long)(0)))))
+                    this.IsEmpty = true;
+                else
+                    _DateInputGroup.Value = value; 
+            }
+        }
+        /// <summary>
+        /// Gets whether Value property should be serialized by Windows Forms designer.
+        /// </summary>
+        /// <returns>true if value serialized otherwise false.</returns>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeValue()
+        {
+            if (!this.AllowEmptyState && this.Value.Date == DateTime.Today) return false;
+
+            return !_DateInputGroup.IsEmpty;
+        }
+        /// <summary>
+        /// Resets Value property to default value. Used by Windows Forms designer.
+        /// </summary>
+        public void ResetValue()
+        {
+            if (this.AllowEmptyState)
+                this.IsEmpty = true;
+            else
+                this.Value = DateTime.Now;
+        }
+
+        public override string Text
+        {
+            get
+            {
+                return base.Text;
+            }
+            set
+            {
+                this.ValueObject = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the date/time value of the control as an object. This property allows you to bind to the database fields and supports
+        /// null values. Expected value is DateTime object or null to indicate no date selected.
+        /// </summary>
+        [Bindable(true), RefreshProperties(RefreshProperties.All), TypeConverter(typeof(DateTimeConverter)), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public object ValueObject
+        {
+            get
+            {
+                if (this.IsEmpty)
+                    return null;
+                return Value;
+            }
+            set
+            {
+                if (AcceptCustomValueObject(value))
+                    return;
+                else if (IsNull(value) || value is string && value=="")
+                    this.IsEmpty = true;
+                else if (value is System.DateTime)
+                {
+                    this.Value = (System.DateTime)value;
+                }
+                else if (value is string)
+                {
+                    System.DateTime d = new System.DateTime();
+                    if (System.DateTime.TryParse(value.ToString(), out d))
+                        this.Value = d;
+                    else
+                        throw new ArgumentException("ValueObject property expects either null/nothing value or DateTime type.");
+                }
+                else
+                    throw new ArgumentException("ValueObject property expects either null/nothing value or DateTime type.");
+            }
+        }
+
+        private bool AcceptCustomValueObject(object value)
+        {
+            ParseDateTimeValueEventArgs e = new ParseDateTimeValueEventArgs(value);
+            OnParseValue(e);
+            if (e.IsParsed)
+            {
+                this.Value = e.ParsedValue;
+            }
+
+            return e.IsParsed;
+        }
+
+        /// <summary>
+        /// Raises the ParseValue event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnParseValue(ParseDateTimeValueEventArgs e)
+        {
+            if (ParseValue != null)
+                ParseValue(this, e);
+        }
+
+        /// <summary>
+        /// Gets or sets the values of the nested DateTimeGroup items.
+        /// <remarks>
+        /// When nested date-time groups are used note that some of the features of the control are disabled, notably minimum and maximum values
+        /// for nested date-times.
+        /// </remarks>
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public System.DateTime[] Values
+        {
+            get { return _DateInputGroup.Values; }
+            set
+            {
+                _DateInputGroup.Values = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether empty null/nothing state of the control is allowed. Default value is true which means that IsEmpty property
+        /// may return true if input value is resets or ValueObject set to null/nothing.
+        /// </summary>
+        [DefaultValue(true), Description("Indicates whether empty null/nothing state of the control is allowed.")]
+        public bool AllowEmptyState
+        {
+            get { return _DateInputGroup.AllowEmptyState; }
+            set { _DateInputGroup.AllowEmptyState = value; this.Invalidate(); }
+        }
+
+        /// <summary>
+        /// Gets or sets whether control is empty i.e. it does not hold a valid DateTime value.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsEmpty
+        {
+            get { return _DateInputGroup.IsEmpty; }
+            set { _DateInputGroup.IsEmpty = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the minimum date and time that can be selected in the control.
+        /// </summary>
+        [Description("Indicates minimum date and time that can be selected in the control.")]
+        public System.DateTime MinDate
+        {
+            get { return _DateInputGroup.MinDate; }
+            set
+            {
+                _DateInputGroup.MinDate = value;
+            }
+        }
+        /// <summary>
+        /// Gets whether Value property should be serialized by Windows Forms designer.
+        /// </summary>
+        /// <returns>true if value serialized otherwise false.</returns>
+        public bool ShouldSerializeMinDate()
+        {
+            return !MinDate.Equals(DateTimeGroup.MinDateTime);
+        }
+        /// <summary>
+        /// Reset the MinDate property to its default value.
+        /// </summary>
+        public void ResetMinDate()
+        {
+            MinDate = DateTimeGroup.MinDateTime;
+        }
+
+        /// <summary>
+        /// Gets or sets the maximum date and time that can be selected in the control.
+        /// </summary>
+        [Description("Indicates maximum date and time that can be selected in the control.")]
+        public System.DateTime MaxDate
+        {
+            get { return _DateInputGroup.MaxDate; }
+            set { _DateInputGroup.MaxDate = value; }
+        }
+        /// <summary>
+        /// Gets whether Value property should be serialized by Windows Forms designer.
+        /// </summary>
+        /// <returns>true if value serialized otherwise false.</returns>
+        public bool ShouldSerializeMaxDate()
+        {
+            return !_DateInputGroup.MaxDate.Equals(DateTimeGroup.MaxDateTime);
+        }
+        /// <summary>
+        /// Reset the MaxDate property to its default value.
+        /// </summary>
+        public void ResetMaxDate()
+        {
+            MaxDate = DateTimeGroup.MaxDateTime;
+        }
+
+        private eDateTimePickerFormat _Format = eDateTimePickerFormat.Short;
+        /// <summary>
+        /// Gets or sets the format date/time is displayed in. To specify custom format set this value to Custom and specify custom format using CustomFormat property.
+        /// </summary>
+        [DefaultValue(eDateTimePickerFormat.Short)]
+        public eDateTimePickerFormat Format
+        {
+            get { return _Format; }
+            set
+            {
+                if (_Format != value)
+                {
+                    _Format = value;
+                    OnFormatChanged();
+                }
+            }
+        }
+
+        private string _CustomFormat = "";
+        /// <summary>
+        /// Gets or sets the custom date/time format string. 
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// To display string literals that contain date and time separators or format strings listed below, 
+        /// you must use escape characters in the substring. For example, to display the date as "June 15 at 12:00 PM", 
+        /// set the CustomFormat property to "MMMM dd 'at' t:mm tt". If the "at" substring is not enclosed by escape characters,
+        /// the result is "June 15 aP 12:00PM" because the "t" character is read as the one-letter A.M./P.M. format string (see the format string table below).
+        /// </para>
+        /// <para>
+        /// To display single quote in custom format use two single quotes characters like so '' after each other and they will be displayed as single quote.
+        /// </para>
+        /// The following list shows all the valid format strings and their descriptions:
+        /// <list type="table">
+        /// <listheader>
+        /// <term>Format String</term>
+        /// <description>Description</description>
+        /// </listheader>
+        /// <item>
+        /// <term>d</term>
+        /// <description>The one- or two-digit day.</description>
+        /// </item>
+        /// <item>
+        /// <term>dd</term>
+        /// <description>The two-digit day. Single-digit day values are preceded by a 0. </description>
+        /// </item>
+        /// <item>
+        /// <term>ddd</term>
+        /// <description>The three-character day-of-week abbreviation.</description>
+        /// </item>
+        /// <item>
+        /// <term>dddd</term>
+        /// <description>The full day-of-week name.</description>
+        /// </item>
+        /// <item>
+        /// <term>jjj</term>
+        /// <description>The three-digit day-of-year day. Single and two-digit values are preceded by 0.</description>
+        /// </item>
+        /// <item>
+        /// <term>j</term>
+        /// <description>The three-digit day-of-year day.</description>
+        /// </item>
+        /// <item>
+        /// <term>h</term>
+        /// <description>The one- or two-digit hour in 12-hour format.</description>
+        /// </item>
+        /// <item>
+        /// <term>hh</term>
+        /// <description>The two-digit hour in 12-hour format. Single digit values are preceded by a 0. </description>
+        /// </item>
+        /// <item>
+        /// <term>H</term>
+        /// <description>The one- or two-digit hour in 24-hour format. </description>
+        /// </item>
+        /// <item>
+        /// <term>HH</term>
+        /// <description>The two-digit hour in 24-hour format. Single digit values are preceded by a 0.</description>
+        /// </item>
+        /// <item>
+        /// <term>m</term>
+        /// <description>The one- or two-digit minute.</description>
+        /// </item>
+        /// <item>
+        /// <term>mm</term>
+        /// <description>The two-digit minute. Single digit values are preceded by a 0.</description>
+        /// </item>
+        /// <item>
+        /// <term>M</term>
+        /// <description>The one- or two-digit month number.</description>
+        /// </item>
+        /// <item>
+        /// <term>MM</term>
+        /// <description>The two-digit month number. Single digit values are preceded by a 0.</description>
+        /// </item>
+        /// <item>
+        /// <term>MMM</term>
+        /// <description>The three-character month abbreviation.</description>
+        /// </item>
+        /// <item>
+        /// <term>MMMM</term>
+        /// <description>The full month name.</description>
+        /// </item>
+        /// <item>
+        /// <term>s</term>
+        /// <description>The one- or two-digit seconds.</description>
+        /// </item>
+        /// <item>
+        /// <term>ss</term>
+        /// <description>The two-digit seconds. Single digit values are preceded by a 0.</description>
+        /// </item>
+        /// <item>
+        /// <term>t</term>
+        /// <description>The one-letter A.M./P.M. abbreviation (A.M. is displayed as "A").</description>
+        /// </item>
+        /// <item>
+        /// <term>tt</term>
+        /// <description>The two-letter A.M./P.M. abbreviation (A.M. is displayed as "AM").</description>
+        /// </item>
+        /// <item>
+        /// <term>y</term>
+        /// <description>The one-digit year (2001 is displayed as "1").</description>
+        /// </item>
+        /// <item>
+        /// <term>yy</term>
+        /// <description>The last two digits of the year (2001 is displayed as "01").</description>
+        /// </item>
+        /// <item>
+        /// <term>yyyy</term>
+        /// <description>The full year (2001 is displayed as "2001").</description>
+        /// </item>
+        /// <item>
+        /// <term>{</term>
+        /// <description>Starts the nested date-time group inside of the control. Note that nested groups must always be closed. 
+        /// Nested date-time groups can be used to represent range of input date/time values in the control
+        /// To access nested values use Values property. For example to have control represent the input from two time values you could set
+        /// CustomFormat to 'from' {HH:mm} 'to' {HH:mm} which will create two nested date/time groups that represent the time value. Entered
+        /// time values can be accessed through Values property which return an array of all input values.</description>
+        /// </item>
+        /// <item>
+        /// <term>}</term>
+        /// <description>Ends the nested date-time input group.</description>
+        /// </item>
+        /// </list>
+        /// </remarks>
+        [DefaultValue(""), Description("Indicates the custom date/time format string. "), Localizable(true)]
+        public string CustomFormat
+        {
+            get { return _CustomFormat; }
+            set
+            {
+                if (value == null) value = "";
+                if (value != _CustomFormat)
+                {
+                    _CustomFormat = value;
+                    OnFormatChanged();
+                }
+            }
+        }
+
+        private void OnFormatChanged()
+        {
+            FormatToDateTimeGroup();
+            Invalidate();
+            UpdateSelectorVisibility();
+            if (FormatChanged != null)
+                FormatChanged(this, new EventArgs());
+        }
+
+        private void FormatToDateTimeGroup()
+        {
+            if (_CustomFormat.Length > 0 && _Format == eDateTimePickerFormat.Custom)
+                ParseFormat(this.CustomFormat);
+            else if (_Format != eDateTimePickerFormat.Custom)
+                ParseFormat(GetSystemFormatString(_Format));
+            else
+                _DateInputGroup.Items.Clear();
+        }
+
+        private string GetSystemFormatString(eDateTimePickerFormat format)
+        {
+            if (format == eDateTimePickerFormat.Long)
+                return DateTimeInput.GetActiveCulture().DateTimeFormat.LongDatePattern;
+            else if (format == eDateTimePickerFormat.Short)
+                return DateTimeInput.GetActiveCulture().DateTimeFormat.ShortDatePattern;
+            else if (format == eDateTimePickerFormat.ShortTime)
+                return DateTimeInput.GetActiveCulture().DateTimeFormat.ShortTimePattern;
+            else if (format == eDateTimePickerFormat.LongTime)
+                return DateTimeInput.GetActiveCulture().DateTimeFormat.LongTimePattern;
+
+            return "";
+        }
+
+        private static CultureInfo _CurrentCulture = null;
+        /// <summary>
+        /// Gets or sets the CultureInfo for the culture used by the DateTime Input controls and Month Calendar controls.
+        /// Default value is null which indicates that controls will use CurrentUICulture.
+        /// </summary>
+        public static CultureInfo CurrentCulture
+        {
+            get
+            {
+                return _CurrentCulture;
+            }
+            set
+            {
+                _CurrentCulture = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the Culture used by the date time input and month calendar controls
+        /// </summary>
+        /// <returns>reference to CultureInfo</returns>
+        public static CultureInfo GetActiveCulture()
+        {
+            return _CurrentCulture != null ? _CurrentCulture : CultureInfo.CurrentCulture;
+        }
+
+        /// <summary>
+        /// Gets or sets whether auto-overwrite functionality for input is enabled. When in auto-overwrite mode input field will erase existing entry
+        /// and start new one if typing is continued after InputComplete method is called.
+        /// </summary>
+        [DefaultValue(true), Description("Indicates whether auto-overwrite functionality for input is enabled.")]
+        public bool AutoOverwrite
+        {
+            get { return _DateInputGroup.AutoOverwrite; }
+            set { _DateInputGroup.AutoOverwrite = value; }
+        }
+
+        private void ParseFormat(string format)
+        {
+            _DateInputGroup.Items.Clear();
+
+            if (_ShowCheckBox)
+            {
+                LockUpdateCheckBox checkBox = new LockUpdateCheckBox();
+                _DateInputGroup.Items.Add(checkBox);
+                checkBox.CheckedChanged += new EventHandler(LockCheckedChanged);
+            }
+
+            if (format.Length == 0) return;
+
+            StringBuilder inputStack = new StringBuilder(format.Length);
+            bool quote = false;
+            Stack<VisualGroup> groupStack = new Stack<VisualGroup>();
+            VisualGroup currentGroup = _DateInputGroup;
+
+            for (int i = 0; i < format.Length; i++)
+            {
+                if (format[i] == '\'') // Trigger/Exit quote mode
+                {
+                    if (quote)
+                        quote = false;
+                    else
+                        quote = true;
+                    continue;
+                }
+
+                if (quote) // Quote mode adds everything under the quotes
+                {
+                    inputStack.Append(format[i]);
+                    continue;
+                }
+
+                string s = format.Substring(i, Math.Min(4, format.Length - i));
+                bool match = false;
+                if (s == "dddd") // The full day-of-week name or three-character day-of-week abbreviation.
+                {
+                    DayLabelItem dayLabel = new DayLabelItem();
+                    currentGroup.Items.Add(dayLabel);
+                    i += 3;
+                    match = true;
+                }
+                else if (s == "MMMM") // Full month name
+                {
+                    MonthNameInput month = new MonthNameInput();
+                    currentGroup.Items.Add(month);
+                    i += 3;
+                    match = true;
+                }
+                else if (s == "yyyy") // 4 digit year
+                {
+                    NumericYearInput year = new NumericYearInput();
+                    currentGroup.Items.Add(year);
+                    i += 3;
+                    match = true;
+                }
+
+                if (!match)
+                {
+                    s = format.Substring(i, Math.Min(3, format.Length - i));
+                    if (s == "ddd") // The three-character day-of-week abbreviation.
+                    {
+                        DayLabelItem dayLabel = new DayLabelItem();
+                        dayLabel.UseAbbreviatedNames = true;
+                        currentGroup.Items.Add(dayLabel);
+                        i += 2;
+                        match = true;
+                    }
+                    else if (s == "MMM") // The three-character month abbreviation.
+                    {
+                        MonthNameInput month = new MonthNameInput();
+                        month.UseAbbreviatedNames = true;
+                        currentGroup.Items.Add(month);
+                        i += 2;
+                        match = true;
+                    }
+                    else if (s == "jjj") // The three-digit day of year...
+                    {
+                        NumericDayOfYearInput day = new NumericDayOfYearInput();
+                        day.DisplayFormat = "000";
+                        currentGroup.Items.Add(day);
+                        i += 2;
+                        match = true;
+                    }
+                }
+
+                if (!match)
+                {
+                    s = format.Substring(i, Math.Min(2, format.Length - i));
+                    if (s == "dd") // The two-digit day. Single-digit day values are preceded by a 0.
+                    {
+                        NumericDayInput day = new NumericDayInput();
+                        day.DisplayFormat = "00";
+                        currentGroup.Items.Add(day);
+                        i += 1;
+                        match = true;
+                    }
+                    else if (s == "hh") // The two-digit hour in 12-hour format. Single digit values are preceded by a 0. 
+                    {
+                        NumericHourInput hour = new NumericHourInput();
+                        hour.DisplayFormat = "00";
+                        hour.Is24HourFormat = false;
+                        currentGroup.Items.Add(hour);
+                        i += 1;
+                        match = true;
+                    }
+                    else if (s == "HH") // The two-digit hour in 24-hour format. Single digit values are preceded by a 0.
+                    {
+                        NumericHourInput hour = new NumericHourInput();
+                        hour.DisplayFormat = "00";
+                        hour.Is24HourFormat = true;
+                        currentGroup.Items.Add(hour);
+                        i += 1;
+                        match = true;
+                    }
+                    else if (s == "mm") // The two-digit minute. Single digit values are preceded by a 0. 
+                    {
+                        NumericMinuteInput minute = new NumericMinuteInput();
+                        minute.DisplayFormat = "00";
+                        currentGroup.Items.Add(minute);
+                        i += 1;
+                        match = true;
+                    }
+                    else if (s == "MM") // The two-digit month number. Single digit values are preceded by a 0. 
+                    {
+                        NumericMonthInput month = new NumericMonthInput();
+                        month.DisplayFormat = "00";
+                        currentGroup.Items.Add(month);
+                        i += 1;
+                        match = true;
+                    }
+                    else if (s == "ss") // The two-digit seconds. Single digit values are preceded by a 0. 
+                    {
+                        NumericSecondInput second = new NumericSecondInput();
+                        second.DisplayFormat = "00";
+                        currentGroup.Items.Add(second);
+                        i += 1;
+                        match = true;
+                    }
+                    else if (s == "tt") // The two-letter A.M./P.M. abbreviation (A.M. is displayed as "AM").
+                    {
+                        HourPeriodInput period = new HourPeriodInput();
+                        currentGroup.Items.Add(period);
+                        i += 1;
+                        match = true;
+                    }
+                    else if (s == "yy") // The last two digits of the year (2001 is displayed as "01"). 
+                    {
+                        NumericYearInput year = new NumericYearInput();
+                        year.YearDisplayFormat = eYearDisplayFormat.TwoDigit;
+                        currentGroup.Items.Add(year);
+                        i += 1;
+                        match = true;
+                    }
+                }
+
+                if (!match)
+                {
+                    s = format[i].ToString();
+                    if (s == "d") // The one- or two-digit day. 
+                    {
+                        NumericDayInput day = new NumericDayInput();
+                        currentGroup.Items.Add(day);
+                        match = true;
+                    }
+                    else if (s == "h") // The one- or two-digit hour in 12-hour format.
+                    {
+                        NumericHourInput hour = new NumericHourInput();
+                        hour.Is24HourFormat = false;
+                        currentGroup.Items.Add(hour);
+                        match = true;
+                    }
+                    else if (s == "H") //The one- or two-digit hour in 24-hour format. 
+                    {
+                        NumericHourInput hour = new NumericHourInput();
+                        hour.Is24HourFormat = true;
+                        currentGroup.Items.Add(hour);
+                        match = true;
+                    }
+                    else if (s == "m") // The one- or two-digit minute. 
+                    {
+                        NumericMinuteInput minute = new NumericMinuteInput();
+                        currentGroup.Items.Add(minute);
+                        match = true;
+                    }
+                    else if (s == "M") // The one- or two-digit month number. 
+                    {
+                        NumericMonthInput month = new NumericMonthInput();
+                        currentGroup.Items.Add(month);
+                        match = true;
+                    }
+                    else if (s == "s") // The one- or two-digit seconds. 
+                    {
+                        NumericSecondInput second = new NumericSecondInput();
+                        currentGroup.Items.Add(second);
+                        match = true;
+                    }
+                    else if (s == "t") // The one-letter A.M./P.M. abbreviation (A.M. is displayed as "A"). 
+                    {
+                        HourPeriodInput period = new HourPeriodInput();
+                        period.UseSingleLetterLabel = true;
+                        currentGroup.Items.Add(period);
+                        match = true;
+                    }
+                    else if (s == "y") // The one-digit year (2001 is displayed as "1"). 
+                    {
+                        NumericYearInput year = new NumericYearInput();
+                        year.YearDisplayFormat = eYearDisplayFormat.OneDigit;
+                        currentGroup.Items.Add(year);
+                        match = true;
+                    }
+                    else if (s == "j") // The three-digit day of year...
+                    {
+                        NumericDayOfYearInput day = new NumericDayOfYearInput();
+                        currentGroup.Items.Add(day);
+                        match = true;
+                    }
+                    else if (s == "{") // Begins the group of data entries
+                    {
+                        if (inputStack.Length > 0)
+                        {
+                            VisualLabel label = new VisualLabel();
+                            label.Text = inputStack.ToString();
+                            currentGroup.Items.Add(label);
+                            inputStack = new StringBuilder(format.Length);
+                        }
+                        DateTimeGroup group = new DateTimeGroup();
+                        currentGroup.Items.Add(group);
+                        groupStack.Push(currentGroup);
+                        currentGroup = group;
+                        match = true;
+                    }
+                    else if (s == "}") // Ends the group of data entries
+                    {
+                        currentGroup = groupStack.Pop();
+                        match = true;
+                    }
+                }
+
+                if (match)
+                {
+                    if (inputStack.Length > 0)
+                    {
+                        VisualLabel label = new VisualLabel();
+                        label.Text = inputStack.ToString();
+                        //label.TextPadding = new DevComponents.DotNetBar.Padding(0, 1, 0, 0);
+                        currentGroup.Items.Insert(currentGroup.Items.Count - 1, label);
+                        inputStack = new StringBuilder(format.Length);
+                    }
+                }
+                else
+                    inputStack.Append(format[i]);
+            }
+
+            if (inputStack.Length > 0)
+            {
+                VisualLabel label = new VisualLabel();
+                label.Text = inputStack.ToString();
+                currentGroup.Items.Add(label);
+            }
+
+            if (_ShowUpDown)
+            {
+                VisualUpDownButton upDownButton = new VisualUpDownButton();
+                upDownButton.Alignment = eItemAlignment.Right;
+                upDownButton.AutoChange = eUpDownButtonAutoChange.FocusedItem;
+                _DateInputGroup.Items.Add(upDownButton);
+            }
+
+            RecreateButtons();
+
+            if (_ShowCheckBox)
+                this.LockUpdateCheckBox.Checked = _LockUpdateChecked;
+        }
+
+        private LockUpdateCheckBox LockUpdateCheckBox
+        {
+            get
+            {
+                if (_DateInputGroup.Items[0] is LockUpdateCheckBox)
+                    return (LockUpdateCheckBox)_DateInputGroup.Items[0];
+                return null;
+            }
+        }
+
+        private void LockCheckedChanged(object sender, EventArgs e)
+        {
+            LockUpdateCheckBox checkBox = LockUpdateCheckBox;
+            if (checkBox != null)
+                _LockUpdateChecked = checkBox.Checked;
+
+            OnLockUpdateChanged(e);
+        }
+
+        private bool _LockUpdateChecked = true;
+        /// <summary>
+        /// Gets or sets whether check box shown using ShowCheckBox property which locks/unlocks the control update is checked.
+        /// </summary>
+        [DefaultValue(true), Description("Indicates whether check box shown using ShowCheckBox property which locks/unlocks the control update is checked.")]
+        public bool LockUpdateChecked
+        {
+            get { return _LockUpdateChecked; }
+            set
+            {
+                if (_LockUpdateChecked != value)
+                {
+                    _LockUpdateChecked = value;
+                    LockUpdateCheckBox checkBox = LockUpdateCheckBox;
+                    if (checkBox != null)
+                        checkBox.Checked = _LockUpdateChecked;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Raises the LockUpdateChanged event.
+        /// </summary>
+        /// <param name="e">Provides event data./</param>
+        protected virtual void OnLockUpdateChanged(EventArgs e)
+        {
+            if (LockUpdateChanged != null)
+                LockUpdateChanged(this, e);
+        }
+
+        /// <summary>
+        /// Raises the ValueChanged event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnValueChanged(EventArgs e)
+        {
+            if (IsInitializing) return;
+
+            if (ValueChanged != null)
+                ValueChanged(this, e);
+            if (ValueObjectChanged != null)
+                ValueObjectChanged(this, e);
+            if (this.IsEmpty)
+            {
+                base.Text = "";
+            }
+            else
+            {
+                string format = "";
+                if (this.Format == eDateTimePickerFormat.Custom)
+                    format = this.CustomFormat;
+                else
+                    format = GetSystemFormatString(this.Format);
+                if (format == "")
+                    format = GetSystemFormatString(eDateTimePickerFormat.Short);
+                if (format == "")
+                    base.Text = this.Value.ToString();
+                else
+                {
+                    try
+                    {
+                        base.Text = this.Value.ToString(format);
+                    }
+                    catch
+                    {
+                        base.Text = "";
+                    }
+                }
+            }
+            if (FreeTextEntryMode && _FreeTextEntryBox != null)
+                _FreeTextEntryBox.Text = this.Text;
+
+            ExecuteCommand();
+        }
+
+        protected override void OnValidating(CancelEventArgs e)
+        {
+            _DateInputGroup.UpdateValue(false);
+            base.OnValidating(e);
+        }
+
+        private InputButtonSettings _ButtonDropDown = null;
+        /// <summary>
+        /// Gets the object that describes the settings for the button that shows drop-down calendar when clicked.
+        /// </summary>
+        [Category("Buttons"), Description("Describes the settings for the button that shows drop-down calendar when clicked."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public InputButtonSettings ButtonDropDown
+        {
+            get
+            {
+                return _ButtonDropDown;
+            }
+        }
+
+        private InputButtonSettings _ButtonClear = null;
+        /// <summary>
+        /// Gets the object that describes the settings for the button that clears the content of the control when clicked.
+        /// </summary>
+        [Category("Buttons"), Description("Describes the settings for the button that clears the content of the control when clicked."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public InputButtonSettings ButtonClear
+        {
+            get
+            {
+                return _ButtonClear;
+            }
+        }
+
+        protected override System.Collections.SortedList CreateSortedButtonList()
+        {
+            SortedList list = base.CreateSortedButtonList();
+            if (_ButtonClear.Visible)
+            {
+                VisualItem button = CreateButton(_ButtonClear);
+                if (_ButtonClear.ItemReference != null)
+                    _ButtonClear.ItemReference.Click -= new EventHandler(ClearButtonClick);
+                _ButtonClear.ItemReference = button;
+                button.Click += new EventHandler(ClearButtonClick);
+                list.Add(_ButtonClear, button);
+            }
+            if (_ButtonDropDown.Visible)
+            {
+                VisualItem button = CreateButton(_ButtonDropDown);
+                if (_ButtonDropDown.ItemReference != null)
+                {
+                    _ButtonDropDown.ItemReference.MouseDown -= new MouseEventHandler(DropDownButtonMouseDown);
+                    _ButtonDropDown.ItemReference.Click -= new EventHandler(DropDownButtonClick);
+                }
+                _ButtonDropDown.ItemReference = button;
+                button.MouseDown += new MouseEventHandler(DropDownButtonMouseDown);
+                button.Click += new EventHandler(DropDownButtonClick);
+                list.Add(_ButtonDropDown, button);
+            }
+            if (_ButtonFreeText.Visible)
+            {
+                VisualItem button = CreateButton(_ButtonFreeText);
+                if (_ButtonFreeText.ItemReference != null)
+                    _ButtonFreeText.ItemReference.Click -= new EventHandler(FreeTextButtonClick);
+                _ButtonFreeText.ItemReference = button;
+                button.Click += FreeTextButtonClick;
+                list.Add(_ButtonFreeText, button);
+            }
+
+            return list;
+        }
+
+        private void DropDownButtonClick(object sender, EventArgs e)
+        {
+            if (e is KeyEventArgs)
+            {
+                ToggleCalendarPopup();
+            }
+        }
+
+        private void DropDownButtonMouseDown(object sender, MouseEventArgs e)
+        {
+            if (e.Button != MouseButtons.Left || _CloseTime != DateTime.MinValue && DateTime.Now.Subtract(_CloseTime).TotalMilliseconds < 150)
+            {
+                _CloseTime = DateTime.MinValue;
+                return;
+            }
+
+            ToggleCalendarPopup();
+        }
+
+        private void ToggleCalendarPopup()
+        {
+            CancelEventArgs cancelArgs = new CancelEventArgs();
+            OnButtonDropDownClick(cancelArgs);
+            if (cancelArgs.Cancel) return;
+
+            _PopupItem.SetDisplayRectangle(this.ClientRectangle);
+
+            _MonthCalendar.ReloadLocalizedStrings();
+
+            // Check the day size in case larger font is applied to the control
+            if (this.Font.Height > Dpi.Height(_MonthCalendar.DaySize.Height))
+            {
+                _MonthCalendar.DaySize = new Size((int)Math.Ceiling(this.Font.Height * 1.6f), this.Font.Height + 1);
+            }
+
+            if (this.RightToLeft == RightToLeft.No)
+                _PopupItem.PopupLocation = new Point(this.Width - _PopupItem.PopupSize.Width, this.Height);
+
+            if (this.MinDate != DateTime.MinValue)
+                _MonthCalendar.MinDate = this.MinDate.Date; //.AddDays(-(this.MinDate.Day - 1));
+            else
+                _MonthCalendar.MinDate = this.MinDate;
+
+            _MonthCalendar.MaxDate = this.MaxDate.Date;
+            if (!this.IsEmpty)
+            {
+                _MonthCalendar.SelectedDate = this.Value;
+                _TimeSelector.SelectedDateTime = this.Value;
+            }
+            else
+            {
+                _MonthCalendar.SelectedDate = DateTime.MinValue;
+                _TimeSelector.SelectedTime = TimeSpan.Zero;
+            }
+
+            if (_MonthCalendar.SelectedDate != DateTime.MinValue)
+                _MonthCalendar.DisplayMonth = _MonthCalendar.SelectedDate;
+            else
+                _MonthCalendar.DisplayMonth = DateTime.Today;
+            _PopupItem.Expanded = !_PopupItem.Expanded;
+        }
+        private bool _FireValueChangedOnPopupClose = false;
+        private DateTime _CloseTime = DateTime.MinValue;
+        private void DropDownPopupClose(object sender, EventArgs e)
+        {
+            if (_FireValueChangedOnPopupClose)
+                OnValueChanged(EventArgs.Empty);
+            _FireValueChangedOnPopupClose = false;
+            _CloseTime = DateTime.Now;
+            if (_MonthCalendar != null)
+                _MonthCalendar.DropDownClosed();
+            if (_TimeSelector != null)
+                _TimeSelector.DropDownClosed();
+        }
+
+        //protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
+        //{
+        //    if ((keyData & Keys.Down) == Keys.Down && Control.ModifierKeys == Keys.Alt)
+        //    {
+        //        if (_PopupItem != null && !_PopupItem.Expanded)
+        //            ToggleCalendarPopup();
+
+        //    }
+        //    return base.ProcessCmdKey(ref msg, keyData);
+        //}
+
+        private void ClearButtonClick(object sender, EventArgs e)
+        {
+            CancelEventArgs cancelArgs = new CancelEventArgs();
+            OnButtonClearClick(cancelArgs);
+            if (cancelArgs.Cancel) return;
+            this.IsEmpty = true;
+        }
+
+        private InputButtonSettings _ButtonFreeText = null;
+        /// <summary>
+        /// Gets the object that describes the settings for the button that switches the control into the free-text entry mode when clicked.
+        /// </summary>
+        [Category("Buttons"), Description("Describes the settings for the button that switches the control into the free-text entry mode when clicked."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public InputButtonSettings ButtonFreeText
+        {
+            get
+            {
+                return _ButtonFreeText;
+            }
+        }
+
+        protected override VisualItem CreateButton(InputButtonSettings buttonSettings)
+        {
+            VisualItem item = null;
+            if (buttonSettings == _ButtonDropDown)
+            {
+                item = new VisualDropDownButton();
+                ApplyButtonSettings(buttonSettings, item as VisualButton);
+            }
+            else
+                item = base.CreateButton(buttonSettings);
+            VisualButton button = item as VisualButton;
+            button.ClickAutoRepeat = false;
+
+            if (buttonSettings == _ButtonClear)
+            {
+                if (buttonSettings.Image == null && string.IsNullOrEmpty(buttonSettings.Text))
+                {
+                    //if (Dpi.Factor.Width > 1)
+                        button.Symbol = "\uf00d";
+                    //else
+                    //    button.Image = DevComponents.DotNetBar.BarFunctions.LoadBitmap("SystemImages.DateReset.png");
+                }
+            }
+            else if (buttonSettings == _ButtonFreeText)
+            {
+                if (buttonSettings.Image == null && string.IsNullOrEmpty(buttonSettings.Text))
+                {
+                    //if (Dpi.Factor.Width > 1)
+                        button.Symbol = "\uf040";
+                    //else
+                    //    button.Image = DevComponents.DotNetBar.BarFunctions.LoadBitmap("SystemImages.FreeText.png");
+                }
+                button.Checked = buttonSettings.Checked;
+            }
+
+            return item;
+        }
+
+        /// <summary>
+        /// Raises the ButtonClearClick event.
+        /// </summary>
+        /// <param name="e"></param>
+        protected virtual void OnButtonClearClick(CancelEventArgs e)
+        {
+            if (ButtonClearClick != null)
+                ButtonClearClick(this, e);
+        }
+
+        /// <summary>
+        /// Raises the ButtonDropDownClick event.
+        /// </summary>
+        /// <param name="e"></param>
+        protected virtual void OnButtonDropDownClick(CancelEventArgs e)
+        {
+            if (ButtonDropDownClick != null)
+                ButtonDropDownClick(this, e);
+        }
+
+        /// <summary>
+        /// Gets or sets whether input part of the control is read-only. When set to true the input part of the control becomes
+        /// read-only and does not allow the typing. However, drop-down part if visible still allows user to change the value of the control
+        /// Use this property to allow change of the value through drop-down picker only.
+        /// </summary>
+        [DefaultValue(false), Description("Indicates whether input part of the control is read-only.")]
+        public bool IsInputReadOnly
+        {
+            get { return _DateInputGroup.IsReadOnly; }
+            set
+            {
+                _DateInputGroup.IsReadOnly = value;
+                if (_FreeTextEntryBox != null)
+                    _FreeTextEntryBox.ReadOnly = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether empty input values (year, month or day) are set to defaults while user is entering data. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether empty input values (year, month or day) are set to defaults while user is entering data")]
+        public bool DefaultInputValues
+        {
+            get { return _DateInputGroup.DefaultInputValues; }
+            set
+            {
+                _DateInputGroup.DefaultInputValues = value;
+            }
+        }
+        
+
+        /// <summary>
+        /// Gets the reference to the internal MonthCalendarItem control which is used to display calendar when drop-down is open.
+        /// </summary>
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content), Description("Gets the reference to the internal MonthCalendarAdv control which is used to display calendar when drop-down is open.")]
+        public MonthCalendarItem MonthCalendar
+        {
+            get
+            {
+                return _MonthCalendar;
+            }
+        }
+
+        protected override Size DefaultSize
+        {
+            get
+            {
+                return new Size(200, base.DefaultSize.Height);
+            }
+        }
+
+        private bool _AutoSelectDate = false;
+        /// <summary>
+        /// Gets or sets whether first day in month is automatically selected on popup date picker when month or year is changed.
+        /// </summary>
+        [Browsable(true), DefaultValue(false), Category("Behavior"), Description("Indicates whether first day in month is automatically selected on popup date picker when month or year is changed.")]
+        public bool AutoSelectDate
+        {
+            get { return _AutoSelectDate; }
+            set
+            {
+                _AutoSelectDate = value;
+            }
+        }
+
+        private bool _AutoAdvance = false;
+        /// <summary>
+        /// Gets or sets whether input focus is automatically advanced to next input field when input is complete in current one.
+        /// </summary>
+        [DefaultValue(false), Category("Behavior"), Description("Indicates whether input focus is automatically advanced to next input field when input is complete in current one.")]
+        public bool AutoAdvance
+        {
+            get { return _DateInputGroup.AutoAdvance; }
+            set
+            {
+                if (_DateInputGroup.AutoAdvance != value)
+                {
+                    _DateInputGroup.AutoAdvance = value;
+                }
+            }
+        }
+
+        /// <summary>
+        /// List of characters that when pressed would select next input field. For example if you are
+        /// allowing time input you could set this property to : so when user presses the : character,
+        /// the input is forwarded to the next input field.
+        /// </summary>
+        [DefaultValue(""), Category("Behavior"), Description("List of characters that when pressed would select next input field.")]
+        public string SelectNextInputCharacters
+        {
+            get { return _DateInputGroup.SelectNextInputCharacters; }
+            set
+            {
+                if (_DateInputGroup.SelectNextInputCharacters != value)
+                {
+                    _DateInputGroup.SelectNextInputCharacters = value;
+                }
+            }
+        }
+
+        private eDateTimeSelectorVisibility _DateTimeSelectorVisibility = eDateTimeSelectorVisibility.Auto;
+        /// <summary>
+        /// Gets or sets the date-time selectors visibility on popup. Default value is Auto which will select selector visibility based on Format property setting.
+        /// </summary>
+        [DefaultValue(eDateTimeSelectorVisibility.Auto), Category("Behavior"), Description("")]
+        public eDateTimeSelectorVisibility DateTimeSelectorVisibility
+        {
+            get { return _DateTimeSelectorVisibility; }
+            set
+            {
+                if (value != _DateTimeSelectorVisibility)
+                {
+                    eDateTimeSelectorVisibility oldValue = _DateTimeSelectorVisibility;
+                    _DateTimeSelectorVisibility = value;
+                    OnDateTimeSelectorVisibilityChanged(oldValue, value);
+                }
+            }
+        }
+        private void UpdateSelectorVisibility()
+        {
+            bool timeSelectorVisible = false;
+            bool dateSelectorVisible = true;
+            if (_DateTimeSelectorVisibility == eDateTimeSelectorVisibility.Auto)
+            {
+                if (_Format == eDateTimePickerFormat.LongTime || _Format == eDateTimePickerFormat.ShortTime)
+                {
+                    timeSelectorVisible = true;
+                    dateSelectorVisible = false;
+                }
+            }
+            else if (_DateTimeSelectorVisibility == eDateTimeSelectorVisibility.TimeSelector)
+            {
+                timeSelectorVisible = true;
+                dateSelectorVisible = false;
+            }
+            else if (_DateTimeSelectorVisibility == eDateTimeSelectorVisibility.Both)
+                timeSelectorVisible = true;
+            _MonthCalendar.Visible = dateSelectorVisible;
+            _TimeSelector.Visible = timeSelectorVisible;
+            if (dateSelectorVisible && timeSelectorVisible)
+            {
+                _Spacer.Visible = true;
+                //_MonthCalendar.DaySize = new Size(28, 19);
+                _MonthCalendar.DayClickAutoClosePopup = false;
+            }
+            else
+            {
+                _Spacer.Visible = false;
+                //_MonthCalendar.ResetDaySize();
+                _MonthCalendar.DayClickAutoClosePopup = true;
+            }
+        }
+        /// <summary>
+        /// Returns reference to internal time selector item which is used on drop-down to select time when control is used in time entry mode.
+        /// </summary>
+        [Browsable(false)]
+        public TimeSelectorItem TimeSelectorItem
+        {
+            get { return _TimeSelector; }
+        }
+        /// <summary>
+        /// Called when DateTimeSelectorVisibility property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnDateTimeSelectorVisibilityChanged(eDateTimeSelectorVisibility oldValue, eDateTimeSelectorVisibility newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("DateTimeSelectorVisibility"));
+            UpdateSelectorVisibility();
+        }
+
+        private eTimeSelectorFormat _TimeSelectorTimeFormat = eTimeSelectorFormat.System;
+        /// <summary>
+        /// Gets or sets the popup time selector time format used to present time by the selector i.e. 12H or 24H format.
+        /// </summary>
+        [DefaultValue(eTimeSelectorFormat.System), Category("Appearance"), Description("Indicates popup time selector time format used to present time by the selector i.e. 12H or 24H format."), Localizable(true)]
+        public eTimeSelectorFormat TimeSelectorTimeFormat
+        {
+            get { return _TimeSelectorTimeFormat; }
+            set
+            {
+                if (value != _TimeSelectorTimeFormat)
+                {
+                    eTimeSelectorFormat oldValue = _TimeSelectorTimeFormat;
+                    _TimeSelectorTimeFormat = value;
+                    OnTimeSelectorTimeFormatChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when TimeFormat property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnTimeSelectorTimeFormatChanged(eTimeSelectorFormat oldValue, eTimeSelectorFormat newValue)
+        {
+            if (_TimeSelector != null)
+                _TimeSelector.TimeFormat = _TimeSelectorTimeFormat;
+        }
+
+        private eTimeSelectorType _TimeSelectorType = eTimeSelectorType.MonthCalendarStyle;
+        /// <summary>
+        /// Indicates the type of popup time selector used.
+        /// </summary>
+        [DefaultValue(eTimeSelectorType.MonthCalendarStyle), Category("Appearance"), Description("Indicates the type of popup time selector used.")]
+        public eTimeSelectorType TimeSelectorType
+        {
+            get { return _TimeSelectorType; }
+            set
+            {
+                if (value != _TimeSelectorType)
+                {
+                    eTimeSelectorType oldValue = _TimeSelectorType;
+                    _TimeSelectorType = value;
+                    OnTimeSelectorTypeChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when TimeSelectorType property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnTimeSelectorTypeChanged(eTimeSelectorType oldValue, eTimeSelectorType newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("TimeSelectorType"));
+            if (_TimeSelector != null)
+                _TimeSelector.SelectorType = _TimeSelectorType;
+        }
+        #endregion
+
+        #region ICommandSource Members
+        protected virtual void ExecuteCommand()
+        {
+            if (_Command == null) return;
+            CommandManager.ExecuteCommand(this);
+        }
+
+        /// <summary>
+        /// Gets or sets the command assigned to the item. Default value is null.
+        /// <remarks>Note that if this property is set to null Enabled property will be set to false automatically to disable the item.</remarks>
+        /// </summary>
+        [DefaultValue(null), Category("Commands"), Description("Indicates the command assigned to the item.")]
+        public Command Command
+        {
+            get { return (Command)((ICommandSource)this).Command; }
+            set
+            {
+                ((ICommandSource)this).Command = value;
+            }
+        }
+
+        private ICommand _Command = null;
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        ICommand ICommandSource.Command
+        {
+            get
+            {
+                return _Command;
+            }
+            set
+            {
+                bool changed = false;
+                if (_Command != value)
+                    changed = true;
+
+                if (_Command != null)
+                    CommandManager.UnRegisterCommandSource(this, _Command);
+                _Command = value;
+                if (value != null)
+                    CommandManager.RegisterCommand(this, value);
+                if (changed)
+                    OnCommandChanged();
+            }
+        }
+
+        /// <summary>
+        /// Called when Command property value changes.
+        /// </summary>
+        protected virtual void OnCommandChanged()
+        {
+        }
+
+        private object _CommandParameter = null;
+        /// <summary>
+        /// Gets or sets user defined data value that can be passed to the command when it is executed.
+        /// </summary>
+        [Browsable(true), DefaultValue(null), Category("Commands"), Description("Indicates user defined data value that can be passed to the command when it is executed."), System.ComponentModel.TypeConverter(typeof(System.ComponentModel.StringConverter)), System.ComponentModel.Localizable(true)]
+        public object CommandParameter
+        {
+            get
+            {
+                return _CommandParameter;
+            }
+            set
+            {
+                _CommandParameter = value;
+            }
+        }
+
+        #endregion
+
+        #region Free-Text Entry Support
+        /// <summary>
+        /// Occurs if Free-Text entry value is not natively recognized by the control and provides you with opportunity to convert that value to the
+        /// value control expects.
+        /// </summary>
+        [Description("Occurs if Free-Text entry value is not natively recognized by the control and provides you with opportunity to convert that value to the value control expects."), Category("Free-Text")]
+        public event FreeTextEntryConversionEventHandler ConvertFreeTextEntry;
+        /// <summary>
+        /// Occurs when Free-Text button is clicked and allows you to cancel its default action.
+        /// </summary>
+        public event CancelEventHandler ButtonFreeTextClick;
+
+        private void FreeTextButtonClick(object sender, EventArgs e)
+        {
+            CancelEventArgs cancelArgs = new CancelEventArgs();
+            OnButtonFreeTextClick(cancelArgs);
+            if (cancelArgs.Cancel) return;
+
+            FreeTextEntryMode = !FreeTextEntryMode;
+            _ButtonFreeText.Checked = FreeTextEntryMode;
+            if (FreeTextEntryMode && _FreeTextEntryBox != null && !_FreeTextEntryBox.Focused)
+                _FreeTextEntryBox.Focus();
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="e"></param>
+        protected virtual void OnButtonFreeTextClick(CancelEventArgs e)
+        {
+            CancelEventHandler handler = ButtonFreeTextClick;
+            if (handler != null) handler(this, e);
+        }
+
+        private bool _AutoResolveFreeTextEntries = true;
+        /// <summary>
+        /// Gets or sets whether free text entries are attempted to be auto-resolved to dates like Today to today's date or Now to date and time now etc. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Free-Text"), Description("Indicates whether free text entries are attempted to be auto-resolved to dates like Today to today's date or Now to date and time now etc.")]
+        public bool AutoResolveFreeTextEntries
+        {
+            get { return _AutoResolveFreeTextEntries; }
+            set
+            {
+                _AutoResolveFreeTextEntries = value;
+            }
+        }
+
+        private bool _AutoOffFreeTextEntry = false;
+        /// <summary>
+        /// Gets or sets whether free-text entry is automatically turned off when control loses input focus. Default value is false.
+        /// </summary>
+        [DefaultValue(false), Category("Free-Text"), Description("Indicates whether free-text entry is automatically turned off when control loses input focus.")]
+        public bool AutoOffFreeTextEntry
+        {
+            get { return _AutoOffFreeTextEntry; }
+            set
+            {
+                _AutoOffFreeTextEntry = value;
+            }
+        }
+
+        private bool _FreeTextEntryMode = false;
+        /// <summary>
+        /// Gets or sets whether control input is in free-text input mode. Default value is false.
+        /// </summary>
+        [DefaultValue(false), Category("Free-Text"), Description("Indicates whether control input is in free-text input mode.")]
+        public bool FreeTextEntryMode
+        {
+            get { return _FreeTextEntryMode; }
+            set
+            {
+                _FreeTextEntryMode = value;
+                OnFreeTextEntryModeChanged();
+            }
+        }
+
+        private void OnFreeTextEntryModeChanged()
+        {
+            if (!_FreeTextEntryMode)
+            {
+                if (_FreeTextEntryBox != null)
+                {
+                    _FreeTextEntryBox.ApplyValue -= ApplyFreeTextValue;
+                    _FreeTextEntryBox.RevertValue -= RevertFreeTextValue;
+                    _FreeTextEntryBox.LostFocus -= FreeTextLostFocus;
+                    this.Controls.Remove(_FreeTextEntryBox);
+                    _FreeTextEntryBox.Dispose();
+                    _FreeTextEntryBox = null;
+                }
+            }
+            else
+            {
+                UpdateFreeTextBoxVisibility();
+            }
+            if (_ButtonFreeText != null) _ButtonFreeText.Checked = _FreeTextEntryMode;
+        }
+
+        protected override void OnIsKeyboardFocusWithinChanged()
+        {
+            if (_FreeTextEntryMode)
+            {
+                UpdateFreeTextBoxVisibility();
+                if (this.IsKeyboardFocusWithin)
+                {
+                    Control textBox = GetFreeTextBox();
+                    if (!textBox.Focused)
+                        textBox.Focus();
+                    if (FocusHighlightEnabled)
+                        textBox.BackColor = this.FocusHighlightColor;
+                }
+                else if (FocusHighlightEnabled)
+                {
+                    Control textBox = GetFreeTextBox();
+                    textBox.BackColor = SystemColors.Window;
+                }
+            }
+            base.OnIsKeyboardFocusWithinChanged();
+        }
+
+        private void UpdateFreeTextBoxVisibility()
+        {
+            FreeTextEntryBox textBox = (FreeTextEntryBox)GetFreeTextBox();
+            if (this.IsKeyboardFocusWithin)
+            {
+                textBox.Visible = true;
+                textBox.Text = this.Text;
+                RootVisualItem.InvalidateArrange();
+                this.Invalidate();
+            }
+            else
+            {
+                if (textBox.Visible)
+                {
+                    if (textBox.Focused)
+                        textBox.HideOnLostFocus();
+                    else
+                        textBox.Visible = false;
+                    RootVisualItem.InvalidateArrange();
+                    this.Invalidate();
+                }
+            }
+        }
+
+        protected override bool SupportsFreeTextEntry
+        {
+            get
+            {
+                return true;
+            }
+        }
+
+        private FreeTextEntryBox _FreeTextEntryBox = null;
+        protected override Control GetFreeTextBox()
+        {
+            if (_FreeTextEntryBox == null)
+            {
+                _FreeTextEntryBox = new FreeTextEntryBox();
+                _FreeTextEntryBox.ApplyValue += ApplyFreeTextValue;
+                _FreeTextEntryBox.RevertValue += RevertFreeTextValue;
+                _FreeTextEntryBox.LostFocus += FreeTextLostFocus;
+                _FreeTextEntryBox.BorderStyle = BorderStyle.None;
+                _FreeTextEntryBox.ReadOnly = this.IsInputReadOnly;
+                this.Controls.Add(_FreeTextEntryBox);
+            }
+
+            return _FreeTextEntryBox;
+        }
+
+        private void RevertFreeTextValue(object sender, EventArgs e)
+        {
+            if (_FreeTextEntryBox != null) _FreeTextEntryBox.Text = this.Text;
+        }
+
+        protected virtual void OnConvertFreeTextEntry(FreeTextEntryConversionEventArgs e)
+        {
+            FreeTextEntryConversionEventHandler handler = this.ConvertFreeTextEntry;
+            if (handler != null) handler(this, e);
+        }
+
+        private bool ParseFreeTextValue(out DateTime date)
+        {
+            try
+            {
+                return (this.Format == eDateTimePickerFormat.Custom && DateTime.TryParseExact(_FreeTextEntryBox.Text, this.CustomFormat, null, DateTimeStyles.None, out date) ||
+                                    DateTime.TryParse(_FreeTextEntryBox.Text, out date)) && _AutoResolveFreeTextEntries;
+            }
+            catch
+            {
+                date = DateTime.MinValue;
+                return false;
+            }
+        }
+        private void ApplyFreeTextValue(object sender, EventArgs e)
+        {
+            if (_FreeTextEntryBox == null) return;
+            if (string.IsNullOrEmpty(_FreeTextEntryBox.Text))
+                this.ValueObject = null;
+            else
+            {
+                DateTime date;
+                if (ParseFreeTextValue(out date))
+                {
+                    this.Value = date;
+                }
+                else
+                {
+                    FreeTextEntryConversionEventArgs eventArgs = new FreeTextEntryConversionEventArgs(_FreeTextEntryBox.Text);
+                    OnConvertFreeTextEntry(eventArgs);
+                    if (eventArgs.IsValueConverted)
+                    {
+                        if (eventArgs.ControlValue is DateTime)
+                            this.Value = (DateTime)eventArgs.ControlValue;
+                        else if (eventArgs.ControlValue == null)
+                            this.ValueObject = null;
+                        else
+                            throw new ArgumentException("ControlValue assigned is not DateTime type.");
+                    }
+                    else
+                    {
+                        if (_AutoResolveFreeTextEntries)
+                        {
+                            date=DateTime.MinValue;
+                            string text = _FreeTextEntryBox.Text.ToLower();
+                            if (text == "now")
+                                date = DateTime.Now;
+                            else if (text == "today")
+                                date = DateTime.Today;
+                            else if (text == "tomorrow")
+                                date = DateTime.Today.AddDays(1);
+                            else if (text == "yesterday")
+                                date = DateTime.Today.AddDays(-1);
+                            if (date == DateTime.MinValue)
+                                this.ValueObject = null;
+                            else
+                                this.Value = date;
+                        }
+                    }
+                }
+            }
+        }
+
+        private void FreeTextLostFocus(object sender, EventArgs e)
+        {
+            if (_AutoOffFreeTextEntry && !this.IsKeyboardFocusWithin)
+                this.FreeTextEntryMode = false;
+        }
+
+        protected override void HideFreeTextBoxEntry()
+        {
+            if (_FreeTextEntryBox != null) _FreeTextEntryBox.Visible = false;
+        }
+
+        protected override bool IsFreeTextEntryVisible
+        {
+            get
+            {
+                return _FreeTextEntryMode && this.IsKeyboardFocusWithin;
+            }
+        }
+        #endregion
+
+    }
+    /// <summary>
+    /// Defines the date-time selector visibility for DateTimeInput control popup.
+    /// </summary>
+    public enum eDateTimeSelectorVisibility
+    {
+        /// <summary>
+        /// Depending on DateTimeInput.Format property setting either date or time selector is used.
+        /// </summary>
+        Auto,
+        /// <summary>
+        /// Only date selector is visible.
+        /// </summary>
+        DateSelector,
+        /// <summary>
+        /// Only time selector is visible on popup.
+        /// </summary>
+        TimeSelector,
+        /// <summary>
+        /// Both date and time selectors are visible.
+        /// </summary>
+        Both
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/Editors/DateTimeAdv/DayLabel.cs b/PROMS/DotNetBar Source Code/Editors/DateTimeAdv/DayLabel.cs
new file mode 100644
index 00000000..04c57026
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Editors/DateTimeAdv/DayLabel.cs	
@@ -0,0 +1,160 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Globalization;
+using System.ComponentModel;
+
+namespace DevComponents.Editors.DateTimeAdv
+{
+    public class DayLabelItem : VisualLabel, IDateTimePartInput
+    {
+        #region Private Variables
+
+        #endregion
+
+        #region Events
+        #endregion
+
+        #region Constructor
+        #endregion
+
+        #region Internal Implementation
+        private int _Day = -1;
+        /// <summary>
+        /// Gets or sets the day in numeric format to display. Allowed values are from -1 to 6. -1 represents an empty state.
+        /// 0 represents Sunday and 6 Represents Saturday.
+        /// </summary>
+        [DefaultValue(-1)]
+        public int Day
+        {
+            get { return _Day; }
+            set
+            {
+                if (_Day != value)
+                {
+                    if (_Day < -1 || _Day > 6)
+                        throw new ArgumentException("Day must be value between -1 and 6");
+                    _Day = value;
+                    OnDayChanged();
+                }
+            }
+        }
+
+        private void OnDayChanged()
+        {
+            UpdateLabelText();
+        }
+
+        private void UpdateLabelText()
+        {
+            if (_Day == -1)
+                Text = "";
+            else if (_DayNames != null)
+                Text = _DayNames[_Day];
+            else if (_UseAbbreviatedNames)
+                Text = DateTimeInput.GetActiveCulture().DateTimeFormat.AbbreviatedDayNames[_Day];
+            else
+                Text = DateTimeInput.GetActiveCulture().DateTimeFormat.DayNames[_Day];
+        }
+
+        private List<string> _DayNames = null;
+
+        /// <summary>
+        /// Gets or sets the array of custom names for days. The array must have exactly 7 elements representing day names from 0 to 6.
+        /// </summary>
+        public List<string> DayNames
+        {
+            get { return _DayNames; }
+            set
+            {
+                if (value != null && value.Count != 7)
+                    throw new ArgumentException("DayNames must have exactly 7 items in collection.");
+                _DayNames = value;
+            }
+        }
+
+        private bool _UseAbbreviatedNames = false;
+        /// <summary>
+        /// Gets or sets whether abbreviated day names are used for display instead of full day names. Default value is false.
+        /// </summary>
+        [DefaultValue(false)]
+        public bool UseAbbreviatedNames
+        {
+            get { return _UseAbbreviatedNames; }
+            set
+            {
+                if (_UseAbbreviatedNames != value)
+                {
+                    _UseAbbreviatedNames = value;
+                    UpdateLabelText();
+                }
+            }
+        }
+        #endregion
+
+
+        #region IDateTimePartInput Members
+
+        int IDateTimePartInput.Value
+        {
+            get
+            {
+                return _Day;
+            }
+            set
+            {
+                Day = value;
+            }
+        }
+
+        int IDateTimePartInput.MinValue
+        {
+            get
+            {
+                return 0;
+            }
+            set
+            {
+                throw new Exception("The method or operation is not implemented.");
+            }
+        }
+
+        int IDateTimePartInput.MaxValue
+        {
+            get
+            {
+                return 6;
+            }
+            set
+            {
+                throw new Exception("The method or operation is not implemented.");
+            }
+        }
+
+        eDateTimePart IDateTimePartInput.Part
+        {
+            get { return eDateTimePart.DayName; }
+        }
+
+        bool IDateTimePartInput.IsEmpty
+        {
+            get
+            {
+                return _Day == -1;
+            }
+            set
+            {
+                this.Day = -1;
+            }
+        }
+
+        void IDateTimePartInput.UndoInput()
+        {
+
+        }
+        #endregion
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/Editors/DateTimeAdv/DayLabelItem.cs b/PROMS/DotNetBar Source Code/Editors/DateTimeAdv/DayLabelItem.cs
new file mode 100644
index 00000000..60ca97b3
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Editors/DateTimeAdv/DayLabelItem.cs	
@@ -0,0 +1,970 @@
+#if FRAMEWORK20
+using System;
+using System.Text;
+using System.Data;
+using System.Drawing;
+using System.ComponentModel;
+using System.Drawing.Drawing2D;
+using DevComponents.DotNetBar;
+using DevComponents.DotNetBar.Rendering;
+
+namespace DevComponents.Editors.DateTimeAdv
+{
+    public class DayLabel : PopupItem
+    {
+        #region Private Variables
+        private ElementStyle _BackgroundStyle = new ElementStyle();
+        private Rectangle _ImageRenderBounds = Rectangle.Empty;
+        #endregion
+
+        #region Events
+
+        /// <summary>
+        /// Occurs when label is rendered and it allows you to override default rendering.
+        /// </summary>
+        public event DayPaintEventHandler PaintLabel;
+        #endregion
+
+        #region Constructor
+        /// <summary>
+        /// Initializes a new instance of the DayLabel class.
+        /// </summary>
+        public DayLabel()
+        {
+            _BackgroundStyle.StyleChanged += new EventHandler(BackgroundStyleChanged);
+            MouseUpNotification = true;
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            if (BarUtilities.DisposeItemImages && !this.DesignMode)
+            {
+                BarUtilities.DisposeImage(ref _Image);
+            }
+            _BackgroundStyle.StyleChanged -= BackgroundStyleChanged;
+            _BackgroundStyle.Dispose();
+            base.Dispose(disposing);
+        }
+        #endregion
+
+        #region Internal Implementation
+        public override void Paint(ItemPaintArgs p)
+        {
+            DayPaintEventArgs e = new DayPaintEventArgs(p, this);
+            OnPaintLabel(e);
+            if (e.RenderParts == eDayPaintParts.None) return;
+            SingleMonthCalendar month = this.Parent as SingleMonthCalendar;
+            if (month != null)
+            {
+                month.OnPaintLabel(this, e);
+            }
+            if (e.RenderParts == eDayPaintParts.None) return;
+
+            if (this.Enabled && (e.RenderParts & eDayPaintParts.Background) == eDayPaintParts.Background)
+                PaintBackground(p);
+
+            if ((e.RenderParts & eDayPaintParts.Text) == eDayPaintParts.Text)
+                PaintText(p, null, Color.Empty, _TextAlign);
+
+            if ((e.RenderParts & eDayPaintParts.Image) == eDayPaintParts.Image)
+                PaintImage(p, _Image, _ImageAlign);
+        }
+
+        internal void PaintImage(ItemPaintArgs p, Image image, eLabelPartAlignment imageAlign)
+        {
+            if (image == null) return;
+            Graphics g = p.Graphics;
+
+            Rectangle imageRect = GetAlignedRect(this.DisplayRectangle, image.Size, imageAlign);
+            CompositeImage ci = new CompositeImage(image, false);
+            ci.DrawImage(g, imageRect);
+            ci.Dispose();
+            _ImageRenderBounds = imageRect;
+        }
+
+        private Rectangle GetAlignedRect(Rectangle bounds, Size innerSize, eLabelPartAlignment partAlign)
+        {
+            Rectangle innerRect = new Rectangle(bounds.Right - innerSize.Width, bounds.Y, innerSize.Width, innerSize.Height);
+            if (partAlign == eLabelPartAlignment.BottomCenter)
+                innerRect.Location = new Point(bounds.X + (bounds.Width - innerSize.Width) / 2, bounds.Bottom - innerSize.Height);
+            else if (partAlign == eLabelPartAlignment.BottomLeft)
+                innerRect.Location = new Point(bounds.X, bounds.Bottom - innerSize.Height);
+            else if (partAlign == eLabelPartAlignment.BottomRight)
+                innerRect.Location = new Point(bounds.Right - innerSize.Width, bounds.Bottom - innerSize.Height);
+            else if (partAlign == eLabelPartAlignment.MiddleCenter)
+                innerRect.Location = new Point(bounds.X + (bounds.Width - innerSize.Width) / 2, bounds.Y + (bounds.Height - innerSize.Height) / 2);
+            else if (partAlign == eLabelPartAlignment.MiddleLeft)
+                innerRect.Location = new Point(bounds.X, bounds.Y + (bounds.Height - innerSize.Height) / 2);
+            else if (partAlign == eLabelPartAlignment.MiddleRight)
+                innerRect.Location = new Point(bounds.Right - innerSize.Width, bounds.Y + (bounds.Height - innerSize.Height) / 2);
+            else if (partAlign == eLabelPartAlignment.TopCenter)
+                innerRect.Location = new Point(bounds.X + (bounds.Width - innerSize.Width) / 2, bounds.Y);
+            else if (partAlign == eLabelPartAlignment.TopLeft)
+                innerRect.Location = new Point(bounds.X, bounds.Y);
+
+            return innerRect;
+        }
+
+        /// <summary>
+        /// Raises the PaintLabel event.
+        /// </summary>
+        /// <param name="e">Provides event data.</param>
+        protected virtual void OnPaintLabel(DayPaintEventArgs e)
+        {
+            if (PaintLabel != null)
+                PaintLabel(this, e);
+        }
+
+        internal void PaintBackground(ItemPaintArgs p)
+        {
+            Graphics g = p.Graphics;
+            Rectangle r = this.DisplayRectangle;
+            Color backColor = Color.Empty, backColor2 = Color.Empty, borderColor = Color.Empty;
+
+            if (_BackgroundStyle.Custom && (!this.IsMouseOver && !this.IsMouseDown || !_TrackMouse))
+            {
+                _BackgroundStyle.SetColorScheme(p.Colors);
+                bool disposeStyle = false;
+                ElementStyle style = ElementStyleDisplay.GetElementStyle(_BackgroundStyle, out disposeStyle);
+                ElementStyleDisplay.Paint(new ElementStyleDisplayInfo(style, g, r));
+                if(disposeStyle) style.Dispose();
+            }
+            bool customColors = false;
+            SingleMonthCalendar month = this.Parent as SingleMonthCalendar;
+            MonthCalendarColors colors = null;
+            if (month != null) colors = month.GetColors();
+
+            if (this.IsMouseDown && _TrackMouse)
+            {
+                backColor = p.Colors.ItemPressedBackground;
+                backColor2 = p.Colors.ItemPressedBackground2;
+                borderColor = p.Colors.ItemPressedBorder;
+            }
+            else if (this.IsMouseOver && _TrackMouse)
+            {
+                backColor = p.Colors.ItemHotBackground;
+                backColor2 = p.Colors.ItemHotBackground2;
+                borderColor = p.Colors.ItemHotBorder;
+            }
+            else if (this.IsSelected)
+            {
+                backColor = p.Colors.ItemCheckedBackground;
+                if (colors != null && colors.Selection.IsCustomized)
+                {
+                    if (!colors.Selection.BackColor.IsEmpty)
+                    {
+                        backColor = colors.Selection.BackColor;
+                        if (!colors.Selection.BackColor2.IsEmpty)
+                            backColor2 = colors.Selection.BackColor2;
+                    }
+                    if (!colors.Selection.BorderColor.IsEmpty)
+                        borderColor = colors.Selection.BorderColor;
+                    customColors = true;
+                }
+            }
+            else if (_IsToday)
+            {
+                borderColor = p.Colors.ItemCheckedBorder;
+                if (colors != null && colors.Today.IsCustomized)
+                {
+                    if (!colors.Today.BorderColor.IsEmpty)
+                        borderColor = colors.Today.BorderColor;
+                    if (!colors.Today.BackColor.IsEmpty)
+                    {
+                        backColor = colors.Today.BackColor;
+                        if (!colors.Today.BackColor2.IsEmpty)
+                            backColor2 = colors.Today.BackColor2;
+                    }
+                    customColors = true;
+                }
+            }
+            else if (this.IsWeekOfYear)
+            {
+                backColor = Color.LightGray;
+                if (colors != null && colors.WeekOfYear.IsCustomized)
+                {
+                    if (!colors.WeekOfYear.BorderColor.IsEmpty)
+                        borderColor = colors.WeekOfYear.BorderColor;
+                    if (!colors.WeekOfYear.BackColor.IsEmpty)
+                    {
+                        backColor = colors.WeekOfYear.BackColor;
+                        if (!colors.WeekOfYear.BackColor2.IsEmpty)
+                            backColor2 = colors.WeekOfYear.BackColor2;
+                    }
+                    customColors = true;
+                }
+            }
+
+            else if (this.IsTrailing)
+            {
+                if (colors != null && colors.TrailingDay.IsCustomized)
+                {
+                    if (!colors.TrailingDay.BackColor.IsEmpty)
+                    {
+                        backColor = colors.TrailingDay.BackColor;
+                        if (!colors.TrailingDay.BackColor2.IsEmpty)
+                            backColor2 = colors.TrailingDay.BackColor2;
+                    }
+                    if (!colors.TrailingDay.BorderColor.IsEmpty)
+                        borderColor = colors.TrailingDay.BorderColor;
+                    customColors = true;
+                }
+                if (IsWeekend(Date) && colors != null && colors.TrailingWeekend.IsCustomized)
+                {
+                    if (!colors.TrailingWeekend.BackColor.IsEmpty)
+                    {
+                        backColor = colors.TrailingWeekend.BackColor;
+                        if (!colors.TrailingWeekend.BackColor2.IsEmpty)
+                            backColor2 = colors.TrailingWeekend.BackColor2;
+                    }
+                    if (!colors.TrailingWeekend.BorderColor.IsEmpty)
+                        borderColor = colors.TrailingWeekend.BorderColor;
+                    customColors = true;
+                }
+            }
+            else if (this.IsDayLabel)
+            {
+                if (colors != null && colors.DayLabel.IsCustomized)
+                {
+                    if (!colors.DayLabel.BackColor.IsEmpty)
+                    {
+                        backColor = colors.DayLabel.BackColor;
+                        if (!colors.DayLabel.BackColor2.IsEmpty)
+                            backColor2 = colors.DayLabel.BackColor2;
+                    }
+                    if (!colors.DayLabel.BorderColor.IsEmpty)
+                        borderColor = colors.DayLabel.BorderColor;
+                    customColors = true;
+                }
+            }
+            else if (this.Date != DateTime.MinValue)
+            {
+                if (colors != null && colors.Day.IsCustomized)
+                {
+                    if (!colors.Day.BackColor.IsEmpty)
+                    {
+                        backColor = colors.Day.BackColor;
+                        if (!colors.Day.BackColor2.IsEmpty)
+                            backColor2 = colors.Day.BackColor2;
+                    }
+                    if (!colors.Day.BorderColor.IsEmpty)
+                        borderColor = colors.Day.BorderColor;
+                    customColors = true;
+                }
+
+                if (IsWeekend(Date) && colors != null && colors.Weekend.IsCustomized)
+                {
+                    if (!colors.Weekend.BackColor.IsEmpty)
+                    {
+                        backColor = colors.Weekend.BackColor;
+                        if (!colors.Weekend.BackColor2.IsEmpty)
+                            backColor2 = colors.Weekend.BackColor2;
+                    }
+                    if (!colors.Weekend.BorderColor.IsEmpty)
+                        borderColor = colors.Weekend.BorderColor;
+                    customColors = true;
+                }
+            }
+
+            if (BarFunctions.IsOffice2007Style(EffectiveStyle) && !this.FlatOffice2007Style && !customColors)
+            {
+                Office2007ButtonItemStateColorTable ct = GetOffice2007StateColorTable(p);
+                if (ct != null)
+                {
+                    Office2007ButtonItemPainter.PaintBackground(g, ct, r, RoundRectangleShapeDescriptor.RectangleShape);
+                    backColor = Color.Empty;
+                    backColor2 = Color.Empty;
+                    borderColor = Color.Empty;
+                }
+            }
+
+            SmoothingMode sm = g.SmoothingMode;
+            g.SmoothingMode = SmoothingMode.None;
+
+            if (!backColor.IsEmpty)
+                DisplayHelp.FillRectangle(g, r, backColor, backColor2);
+
+            if (!borderColor.IsEmpty)
+                DisplayHelp.DrawRectangle(g, borderColor, r);
+
+            if (this.IsDayLabel)
+            {
+                borderColor = p.Colors.BarDockedBorder;
+                if (colors != null && !colors.DaysDividerBorderColors.IsEmpty)
+                    borderColor = colors.DaysDividerBorderColors;
+                if (!borderColor.IsEmpty)
+                    DisplayHelp.DrawLine(g, r.X, r.Bottom - 1, r.Right, r.Bottom - 1, borderColor, 1);
+            }
+
+            g.SmoothingMode = sm;
+        }
+
+        protected Office2007ButtonItemStateColorTable GetOffice2007StateColorTable(ItemPaintArgs p)
+        {
+            if (BarFunctions.IsOffice2007Style(EffectiveStyle) && !this.FlatOffice2007Style)
+            {
+                if (p.Renderer is Office2007Renderer)
+                {
+                    Office2007ColorTable ct = ((Office2007Renderer)p.Renderer).ColorTable;
+                    Office2007ButtonItemColorTable buttonColorTable = ct.ButtonItemColors[Enum.GetName(typeof(eButtonColor), eButtonColor.Orange)];
+                    if (!this.Enabled)
+                        return buttonColorTable.Disabled;
+                    else if (this.IsMouseDown && _TrackMouse)
+                        return buttonColorTable.Pressed;
+                    else if (this.IsMouseOver && _TrackMouse)
+                        return buttonColorTable.MouseOver;
+                    else if (this.IsSelected)
+                        return buttonColorTable.Checked;
+                }
+            }
+
+            return null;
+        }
+
+        internal static bool IsWeekend(DateTime d)
+        {
+            return d.DayOfWeek == DayOfWeek.Saturday || d.DayOfWeek == DayOfWeek.Sunday;
+        }
+
+        internal void PaintText(ItemPaintArgs p, Font textFont, Color textColor, eLabelPartAlignment textAlign)
+        {
+            Graphics g = p.Graphics;
+            string text = this.Text;
+
+            if (_Date != DateTime.MinValue)
+                text = _Date.Day.ToString();
+            bool isBold = _IsBold;
+            if (textColor.IsEmpty)
+            {
+                if (!_TextColor.IsEmpty)
+                    textColor = _TextColor;
+                else if (!this.Enabled)
+                {
+                    textColor = p.Colors.ItemDisabledText;
+                }
+                else
+                {
+                    textColor = _IsTrailing ? p.Colors.ItemDisabledText : p.Colors.ItemText;
+
+                    SingleMonthCalendar month = this.Parent as SingleMonthCalendar;
+                    MonthCalendarColors colors = null;
+                    if (month != null) colors = month.GetColors();
+
+                    if (colors != null)
+                    {
+                        if (_Date != DateTime.MinValue)
+                        {
+                            if (_IsSelected && colors.Selection.IsCustomized)
+                            {
+                                if (!colors.Selection.TextColor.IsEmpty)
+                                    textColor = colors.Selection.TextColor;
+                                if (colors.Selection.IsBold)
+                                    isBold = colors.Selection.IsBold;
+                            }
+                            else
+                            {
+                                if (_IsTrailing)
+                                {
+                                    if (!colors.TrailingDay.TextColor.IsEmpty)
+                                        textColor = colors.TrailingDay.TextColor;
+                                    if (colors.TrailingDay.IsBold)
+                                        isBold = colors.TrailingDay.IsBold;
+                                }
+                                else if (colors.Day.IsCustomized)
+                                {
+                                    if (!colors.Day.TextColor.IsEmpty)
+                                        textColor = colors.Day.TextColor;
+                                    if (colors.Day.IsBold)
+                                        isBold = colors.Day.IsBold;
+                                }
+
+                                if (IsWeekend(_Date))
+                                {
+                                    if (_IsTrailing)
+                                    {
+                                        if (!colors.TrailingWeekend.TextColor.IsEmpty)
+                                            textColor = colors.TrailingWeekend.TextColor;
+                                        if (colors.TrailingWeekend.IsBold)
+                                            isBold = colors.TrailingWeekend.IsBold;
+                                    }
+                                    else
+                                    {
+                                        if (!colors.Weekend.TextColor.IsEmpty)
+                                            textColor = colors.Weekend.TextColor;
+                                        if (colors.Weekend.IsBold)
+                                            isBold = colors.Weekend.IsBold;
+                                    }
+                                }
+                            }
+                        }
+                        else if (IsWeekOfYear)
+                        {
+                            if (colors.WeekOfYear.IsCustomized)
+                            {
+                                if (!colors.WeekOfYear.TextColor.IsEmpty)
+                                    textColor = colors.WeekOfYear.TextColor;
+                                if (colors.WeekOfYear.IsBold)
+                                    isBold = colors.WeekOfYear.IsBold;
+                            }
+                        }
+                        else if (IsDayLabel)
+                        {
+                            if (!colors.DayLabel.TextColor.IsEmpty)
+                                textColor = colors.DayLabel.TextColor;
+                            if (colors.DayLabel.IsBold)
+                                isBold = colors.DayLabel.IsBold;
+                        }
+                    }
+                }
+            }
+
+            if (_IsMouseOver && TrackMouse && StyleManager.IsMetro(EffectiveStyle))
+            {
+                textColor = p.Colors.ItemHotText;
+            }
+
+            bool disposeFont = false;
+            if (textFont == null)
+            {
+                if (isBold)
+                {
+                    textFont = new Font(p.Font, FontStyle.Bold);
+                    disposeFont = true;
+                }
+                else
+                    textFont = p.Font;
+            }
+
+            if (_Date != DateTime.MinValue)
+            {
+                Size size = TextDrawing.MeasureString(g, "32", textFont);
+                Rectangle r = GetAlignedRect(this.DisplayRectangle, size, textAlign);
+                eTextFormat format = eTextFormat.Right | eTextFormat.VerticalCenter;
+                TextDrawing.DrawString(g, text, textFont, textColor,
+                    r, format);
+            }
+            else
+            {
+                eTextFormat format = eTextFormat.HorizontalCenter | eTextFormat.VerticalCenter;
+                if (textAlign == eLabelPartAlignment.BottomCenter)
+                    format = eTextFormat.Bottom | eTextFormat.HorizontalCenter;
+                else if (textAlign == eLabelPartAlignment.BottomLeft)
+                    format = eTextFormat.Left | eTextFormat.Bottom;
+                else if (textAlign == eLabelPartAlignment.BottomRight)
+                    format = eTextFormat.Bottom | eTextFormat.Right;
+                else if (textAlign == eLabelPartAlignment.MiddleLeft)
+                    format = eTextFormat.Left | eTextFormat.VerticalCenter;
+                else if (textAlign == eLabelPartAlignment.MiddleRight)
+                    format = eTextFormat.Right | eTextFormat.VerticalCenter;
+                else if (textAlign == eLabelPartAlignment.TopCenter)
+                    format = eTextFormat.Top | eTextFormat.VerticalCenter;
+                else if (textAlign == eLabelPartAlignment.TopLeft)
+                    format = eTextFormat.Top | eTextFormat.Left;
+                else if (textAlign == eLabelPartAlignment.TopRight)
+                    format = eTextFormat.Top | eTextFormat.Right;
+
+                TextDrawing.DrawString(g, text, textFont, textColor,
+                    this.Bounds, format);
+            }
+
+            if (disposeFont) textFont.Dispose();
+        }
+
+        public override void RecalcSize()
+        {
+            this.Bounds = new Rectangle(this.Bounds.Location, SingleMonthCalendar._DefaultDaySize);
+            base.RecalcSize();
+        }
+
+        /// <summary>
+        /// Returns copy of the item.
+        /// </summary>
+        public override BaseItem Copy()
+        {
+            DayLabel objCopy = new DayLabel();
+            this.CopyToItem(objCopy);
+            return objCopy;
+        }
+        /// <summary>
+        /// Copies the DayLabel specific properties to new instance of the item.
+        /// </summary>
+        /// <param name="c">New ButtonItem instance.</param>
+        protected override void CopyToItem(BaseItem c)
+        {
+            DayLabel copy = c as DayLabel;
+
+            base.CopyToItem(copy);
+        }
+
+        private DateTime _Date = DateTime.MinValue;
+        /// <summary>
+        /// Gets or sets the date represented by this label. DateTime.MinValue indicates that label is either used as textual day representation
+        /// or the week number as specified by the IsWeekOfYear property.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public DateTime Date
+        {
+            get { return _Date; }
+            set
+            {
+                if (_Date != value)
+                {
+                    _Date = value;
+                }
+            }
+        }
+
+        private bool _IsDayLabel = false;
+        /// <summary>
+        /// Gets or sets whether this label is used as the label that displays the day name.
+        /// </summary>
+        [Browsable(false), DefaultValue(false)]
+        public bool IsDayLabel
+        {
+            get { return _IsDayLabel; }
+            set
+            {
+                if (_IsDayLabel != value)
+                {
+                    _IsDayLabel = value;
+                    this.Refresh();
+                }
+            }
+        }
+
+        private bool _IsWeekOfYear = false;
+        /// <summary>
+        /// Gets or sets whether this label is used as the week of year label.
+        /// </summary>
+        [Browsable(false), DefaultValue(false)]
+        public bool IsWeekOfYear
+        {
+            get { return _IsWeekOfYear; }
+            set
+            {
+                if (_IsWeekOfYear != value)
+                {
+                    _IsWeekOfYear = value;
+                    this.Refresh();
+                }
+            }
+        }
+
+        private bool _IsTrailing = false;
+        /// <summary>
+        /// Gets whether the label for date represents the trailing date, i.e. date that is from next or previous month for the month displayed.
+        /// </summary>
+        [Browsable(false), DefaultValue(false)]
+        public bool IsTrailing
+        {
+            get { return _IsTrailing; }
+            set
+            {
+                if (_IsTrailing != value)
+                {
+                    _IsTrailing = value;
+                    this.Refresh();
+                }
+            }
+        }
+
+        private bool _IsMouseOver = false;
+        /// <summary>
+        /// Gets or sets whether mouse is over the item.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsMouseOver
+        {
+            get { return _IsMouseOver; }
+            set
+            {
+                _IsMouseOver = value;
+                this.Refresh();
+            }
+        }
+
+        private bool _IsMouseDown = false;
+        /// <summary>
+        /// Gets or sets whether left-mouse button is pressed over the item.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsMouseDown
+        {
+            get { return _IsMouseDown; }
+            set
+            {
+                _IsMouseDown = value;
+                this.Refresh();
+            }
+        }
+
+        /// <summary>
+        /// Occurs when the mouse pointer enters the item. This is used by internal implementation only.
+        /// </summary>
+        public override void InternalMouseEnter()
+        {
+            this.IsMouseOver = true;
+            base.InternalMouseEnter();
+
+            SingleMonthCalendar month = this.Parent as SingleMonthCalendar;
+            if (month != null) month.OnLabelMouseEnter(this, new EventArgs());
+        }
+
+        /// <summary>
+        /// Occurs when the mouse pointer leaves the item. This is used by internal implementation only.
+        /// </summary>
+        public override void InternalMouseLeave()
+        {
+            this.IsMouseOver = false;
+            base.InternalMouseLeave();
+
+            SingleMonthCalendar month = this.Parent as SingleMonthCalendar;
+            if (month != null) month.OnLabelMouseLeave(this, new EventArgs());
+        }
+
+        /// <summary>
+        /// Occurs when the mouse pointer is over the item and a mouse button is pressed. This is used by internal implementation only.
+        /// </summary>
+        public override void InternalMouseDown(System.Windows.Forms.MouseEventArgs objArg)
+        {
+            if (objArg.Button == System.Windows.Forms.MouseButtons.Left)
+                this.IsMouseDown = true;
+            if (this.IsMouseDown && this.SubItems.Count > 0 && this.ShowSubItems &&
+                (_ImageRenderBounds.Contains(objArg.X, objArg.Y) || _ExpandOnMouseDown))
+            {
+                this.Expanded = !this.Expanded;
+            }
+            base.InternalMouseDown(objArg);
+
+            SingleMonthCalendar month = this.Parent as SingleMonthCalendar;
+            if (month != null) month.OnLabelMouseDown(this, objArg);
+        }
+
+        /// <summary>
+        /// Occurs when the mouse pointer is over the item and a mouse button is released. This is used by internal implementation only.
+        /// </summary>
+        public override void InternalMouseUp(System.Windows.Forms.MouseEventArgs objArg)
+        {
+            if (objArg.Button == System.Windows.Forms.MouseButtons.Left)
+                this.IsMouseDown = false;
+            base.InternalMouseUp(objArg);
+
+            SingleMonthCalendar month = this.Parent as SingleMonthCalendar;
+            if (month != null) month.OnLabelMouseUp(this, objArg);
+        }
+
+        protected override void OnClick()
+        {
+            SingleMonthCalendar month = this.Parent as SingleMonthCalendar;
+            if (month != null) month.DayLabelClick(this);
+            base.OnClick();
+        }
+
+        public override void InternalMouseMove(System.Windows.Forms.MouseEventArgs objArg)
+        {
+            base.InternalMouseMove(objArg);
+            SingleMonthCalendar month = this.Parent as SingleMonthCalendar;
+            if (month != null) month.OnLabelMouseMove(this, objArg);
+        }
+
+        public override void InternalMouseHover()
+        {
+            base.InternalMouseHover();
+            SingleMonthCalendar month = this.Parent as SingleMonthCalendar;
+            if (month != null) month.OnLabelMouseHover(this, new EventArgs());
+        }
+
+        private void BackgroundStyleChanged(object sender, EventArgs e)
+        {
+            this.OnAppearanceChanged();
+        }
+
+        /// <summary>
+        /// Specifies the item background style. Default value is an empty style which means that container does not display any background.
+        /// BeginGroup property set to true will override this style on some styles.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Category("Style"), Description("Gets or sets container background style."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ElementStyle BackgroundStyle
+        {
+            get { return _BackgroundStyle; }
+        }
+
+        private bool _IsSelected = false;
+        /// <summary>
+        /// Gets or sets whether label appears as selected.
+        /// </summary>
+        [DefaultValue(false), Browsable(false)]
+        public bool IsSelected
+        {
+            get { return _IsSelected; }
+            set
+            {
+                if (_IsSelected != value)
+                {
+                    _IsSelected = value;
+                    this.Refresh();
+                }
+            }
+        }
+
+        private bool _TrackMouse = true;
+        /// <summary>
+        /// Gets or sets whether label provides visual indicator when mouse is over the label or pressed while over the label. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Description("Indicates whether label provides visual indicator when mouse is over the label or pressed while over the label.")]
+        public bool TrackMouse
+        {
+            get { return _TrackMouse; }
+            set
+            {
+                if (_TrackMouse != value)
+                {
+                    _TrackMouse = value;
+                    this.Refresh();
+                }
+            }
+        }
+
+        private bool _Selectable = true;
+        /// <summary>
+        /// Gets or sets whether label is selectable. IsSelected property returns whether label is selected. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Description("Indicates whether label is selectable.")]
+        public bool Selectable
+        {
+            get { return _Selectable; }
+            set
+            {
+                if (_Selectable != value)
+                {
+                    _Selectable = value;
+                    this.Refresh();
+                }
+            }
+        }
+
+        private Color _TextColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets the label text color. Default value is an empty color.
+        /// </summary>
+        [Category("Colors"), Description("Indicates label text color.")]
+        public Color TextColor
+        {
+            get { return _TextColor; }
+            set
+            {
+                _TextColor = value;
+                this.Refresh();
+            }
+        }
+        /// <summary>Gets whether property should be serialized. Provided for WinForms designer support.</summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeTextColor()
+        {
+            return !TextColor.IsEmpty;
+        }
+        /// <summary>Resets property to its default value. Provided for WinForms designer support.</summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetTextColor()
+        {
+            TextColor = Color.Empty;
+        }
+
+        private bool _IsBold = false;
+        /// <summary>
+        /// Gets or sets whether text is drawn using Bold font. Default value is false.
+        /// </summary>
+        [DefaultValue(false), Description("Indicates whether text is drawn using Bold font.")]
+        public bool IsBold
+        {
+            get { return _IsBold; }
+            set
+            {
+                if (_IsBold != value)
+                {
+                    _IsBold = value;
+                    this.Refresh();
+                }
+            }
+        }
+
+        //private Color _BorderColor = Color.Empty;
+        ///// <summary>
+        ///// Gets or sets the label border color. Default value is an empty color.
+        ///// </summary>
+        //[Category("Colors"), Description("Indicates label border color.")]
+        //public Color BorderColor
+        //{
+        //    get { return _BorderColor; }
+        //    set
+        //    {
+        //        _BorderColor = value;
+        //        this.Refresh();
+        //    }
+        //}
+        ///// <summary>Gets whether property should be serialized. Provided for WinForms designer support.</summary>
+        //[EditorBrowsable(EditorBrowsableState.Never)]
+        //public bool ShouldSerializeBorderColor()
+        //{
+        //    return !BorderColor.IsEmpty;
+        //}
+        ///// <summary>Resets property to its default value. Provided for WinForms designer support.</summary>
+        //[EditorBrowsable(EditorBrowsableState.Never)]
+        //public void ResetBorderColor()
+        //{
+        //    BorderColor = Color.Empty;
+        //}
+
+        //private Color _BackColor = Color.Empty;
+        ///// <summary>
+        ///// Gets or sets the label back color.
+        ///// </summary>
+        //[Category("Colors"), Description("Indicates label back color.")]
+        //public Color BackColor
+        //{
+        //    get { return _BackColor; }
+        //    set
+        //    {
+        //        _BackColor = value;
+        //        this.Refresh();
+        //    }
+        //}
+        ///// <summary>Gets whether property should be serialized. Provided for WinForms designer support.</summary>
+        //[EditorBrowsable(EditorBrowsableState.Never)]
+        //public bool ShouldSerializeBackColor()
+        //{
+        //    return !BackColor.IsEmpty;
+        //}
+        ///// <summary>Resets property to its default value. Provided for WinForms designer support.</summary>
+        //[EditorBrowsable(EditorBrowsableState.Never)]
+        //public void ResetBackColor()
+        //{
+        //    BackColor = Color.Empty;
+        //}
+
+        private eLabelPartAlignment _TextAlign = eLabelPartAlignment.MiddleCenter;
+        /// <summary>
+        /// Gets or sets the text alignment.
+        /// </summary>
+        [DefaultValue(eLabelPartAlignment.MiddleCenter), Description("Indicates text alignment.")]
+        public eLabelPartAlignment TextAlign
+        {
+            get { return _TextAlign; }
+            set
+            {
+                if (_TextAlign != value)
+                {
+                    _TextAlign = value;
+                    this.Refresh();
+                }
+            }
+        }
+
+        private eLabelPartAlignment _ImageAlign = eLabelPartAlignment.MiddleRight;
+        /// <summary>
+        /// Gets or sets the image alignment.
+        /// </summary>
+        [DefaultValue(eLabelPartAlignment.MiddleRight), Description("Indicates image alignment.")]
+        public eLabelPartAlignment ImageAlign
+        {
+            get { return _ImageAlign; }
+            set
+            {
+                if (_ImageAlign != value)
+                {
+                    _ImageAlign = value;
+                    this.Refresh();
+                }
+            }
+        }
+
+        private Image _Image = null;
+        /// <summary>
+        /// Gets or sets the image displayed on the label.
+        /// </summary>
+        [DefaultValue(null), Description("Indicates image displayed on the label.")]
+        public Image Image
+        {
+            get { return _Image; }
+            set
+            {
+                if (_Image != value)
+                {
+                    _Image = value;
+                    _ImageRenderBounds = Rectangle.Empty;
+                    this.Refresh();
+                }
+            }
+        }
+
+        private bool _FlatOffice2007Style = false;
+        /// <summary>
+        /// Gets or sets whether flat Office 2007 style is used to render the item. Default value is false.
+        /// </summary>
+        [DefaultValue(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), Browsable(false)]
+        public bool FlatOffice2007Style
+        {
+            get { return _FlatOffice2007Style; }
+            set
+            {
+                _FlatOffice2007Style = value;
+                this.Refresh();
+            }
+        }
+
+        private bool _IsToday = false;
+        /// <summary>
+        /// Gets or sets whether date represented by label is marked as todays date.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsToday
+        {
+            get { return _IsToday; }
+            set
+            {
+                if (_IsToday != value)
+                {
+                    _IsToday = value;
+                    this.Refresh();
+                }
+            }
+        }
+
+        private bool _ExpandOnMouseDown = false;
+        /// <summary>
+        /// Gets or sets whether popup is displayed when mouse is pressed anywhere over the item. Default value is false which indicates
+        /// that popup is displayed only if image assigned to the item and mouse is pressed over image.
+        /// </summary>
+        [DefaultValue(false), Description("Indicates whether popup is displayed when mouse is pressed anywhere over the item.")]
+        public bool ExpandOnMouseDown
+        {
+            get { return _ExpandOnMouseDown; }
+            set
+            {
+                if (_ExpandOnMouseDown != value)
+                {
+                    _ExpandOnMouseDown = value;
+                }
+            }
+        }
+        #endregion
+    }
+
+    /// <summary>
+    /// Indicates the alignment of the DayLabel part like text or image.
+    /// </summary>
+    public enum eLabelPartAlignment
+    {
+        TopLeft,
+        TopCenter,
+        TopRight,
+        MiddleLeft,
+        MiddleCenter,
+        MiddleRight,
+        BottomLeft,
+        BottomCenter,
+        BottomRight
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/Editors/DateTimeAdv/DayPaintEventArgs.cs b/PROMS/DotNetBar Source Code/Editors/DateTimeAdv/DayPaintEventArgs.cs
new file mode 100644
index 00000000..4638c457
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Editors/DateTimeAdv/DayPaintEventArgs.cs	
@@ -0,0 +1,140 @@
+#if FRAMEWORK20
+using System;
+using System.Text;
+using System.Drawing;
+using DevComponents.DotNetBar;
+
+namespace DevComponents.Editors.DateTimeAdv
+{
+    /// <summary>
+    /// Provides data for DayLabel painting events.
+    /// </summary>
+    public class DayPaintEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets the graphics canvas for rendering.
+        /// </summary>
+        public readonly Graphics Graphics;
+
+        /// <summary>
+        /// Gets or sets which parts of the item will be drawn by the system. You can set this to None to completely disable system rendering.
+        /// </summary>
+        public eDayPaintParts RenderParts = eDayPaintParts.All;
+
+        internal DayLabel _Item = null;
+
+        internal ItemPaintArgs _ItemPaintArgs = null;
+        /// <summary>
+        /// Initializes a new instance of the DayPaintEventArgs class.
+        /// </summary>
+        /// <param name="graphics">Reference to Graphics canvas.</param>
+        /// <param name="item">Reference to item being rendered.</param>
+        public DayPaintEventArgs(ItemPaintArgs p, DayLabel item)
+        {
+            Graphics = p.Graphics;
+            _ItemPaintArgs = p;
+            _Item = item;
+        }
+
+        /// <summary>
+        /// Renders the background of the item.
+        /// </summary>
+        public void PaintBackground()
+        {
+            _Item.PaintBackground(_ItemPaintArgs);
+        }
+
+        /// <summary>
+        /// Renders the item text.
+        /// </summary>
+        public void PaintText()
+        {
+            _Item.PaintText(_ItemPaintArgs, null, Color.Empty, _Item.TextAlign);
+        }
+
+        /// <summary>
+        /// Renders the item text.
+        /// </summary>
+        public void PaintText(Color textColor)
+        {
+            _Item.PaintText(_ItemPaintArgs, null, textColor, _Item.TextAlign);
+        }
+
+        /// <summary>
+        /// Renders the item text.
+        /// </summary>
+        public void PaintText(Color textColor, eLabelPartAlignment textAlign)
+        {
+            _Item.PaintText(_ItemPaintArgs, null, textColor, textAlign);
+        }
+
+        /// <summary>
+        /// Renders the item text.
+        /// </summary>
+        public void PaintText(Color textColor, Font textFont)
+        {
+            _Item.PaintText(_ItemPaintArgs, textFont, textColor, _Item.TextAlign);
+        }
+
+        /// <summary>
+        /// Renders the item text.
+        /// </summary>
+        public void PaintText(Color textColor, Font textFont, eLabelPartAlignment textAlign)
+        {
+            _Item.PaintText(_ItemPaintArgs, textFont, textColor, textAlign);
+        }
+
+        /// <summary>
+        /// Renders items image.
+        /// </summary>
+        public void PaintImage()
+        {
+            _Item.PaintImage(_ItemPaintArgs, _Item.Image, _Item.ImageAlign);
+        }
+
+        /// <summary>
+        /// Renders items image.
+        /// </summary>
+        public void PaintImage(eLabelPartAlignment imageAlign)
+        {
+            _Item.PaintImage(_ItemPaintArgs, _Item.Image, imageAlign);
+        }
+    }
+
+    /// <summary>
+    /// Defines delegate for DayLabel painting events.
+    /// </summary>
+    /// <param name="sender">Source of the event.</param>
+    /// <param name="e">Provides event data.</param>
+    public delegate void DayPaintEventHandler(object sender, DayPaintEventArgs e);
+
+    /// <summary>
+    /// Specifies the parts of DayLabel control. Members of this enum are intended to be used as flags (combined).
+    /// </summary>
+    [Flags()]
+    public enum eDayPaintParts
+    {
+        /// <summary>
+        /// Specifies no part.
+        /// </summary>
+        None = 0,
+        /// <summary>
+        /// Specifies the label background.
+        /// </summary>
+        Background = 1,
+        /// <summary>
+        /// Specifies the label text.
+        /// </summary>
+        Text = 2,
+        /// <summary>
+        /// Specifies the label image.
+        /// </summary>
+        Image = 4,
+        /// <summary>
+        /// Specifies all parts.
+        /// </summary>
+        All = Background | Text | Image
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/Editors/DateTimeAdv/HourPeriodInput.cs b/PROMS/DotNetBar Source Code/Editors/DateTimeAdv/HourPeriodInput.cs
new file mode 100644
index 00000000..bee5d0cb
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Editors/DateTimeAdv/HourPeriodInput.cs	
@@ -0,0 +1,148 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel;
+using System.Globalization;
+
+namespace DevComponents.Editors.DateTimeAdv
+{
+    public class HourPeriodInput : VisualStringListInput
+    {
+        #region Private Variables
+        #endregion
+
+        #region Events
+        #endregion
+
+        #region Constructor
+        #endregion
+
+        #region Internal Implementation
+        private NumericHourInput _HourInput;
+        public NumericHourInput HourInput
+        {
+            get { return _HourInput; }
+            set
+            {
+                if (_HourInput != null)
+                {
+                    _HourInput.ValueChanged -= new EventHandler(HourChanged);
+                    _HourInput.IsEmptyChanged -= new EventHandler(HourIsEmptyChanged);
+                }
+                _HourInput = value;
+                if (_HourInput != null)
+                {
+                    _HourInput.ValueChanged += new EventHandler(HourChanged);
+                    _HourInput.IsEmptyChanged += new EventHandler(HourIsEmptyChanged);
+                }
+            }
+        }
+
+        private void HourIsEmptyChanged(object sender, EventArgs e)
+        {
+            if (_HourInput != null && _HourInput.IsEmpty)
+                this.IsEmpty = true;
+        }
+        private void HourChanged(object sender, EventArgs e)
+        {
+            if (_HourInput == null) return;
+            if (!_HourInput.IsEmpty)
+            {
+                if (_HourInput.Period == eHourPeriod.AM)
+                {
+                    this.SelectedIndex = 0;
+                }
+                else
+                {
+                    this.SelectedIndex = 1;
+                }
+            }
+            else
+                this.SelectedIndex = -1;
+        }
+
+        protected override List<string> GetItems()
+        {
+            List<string> items = new List<string>(2);
+            items.Add(GetAMLabel());
+            items.Add(GetPMLabel());
+            return items;
+        }
+
+        private string GetPMLabel()
+        {
+            string s = "";
+            if (_PMText != null && _PMText.Length > 0)
+                s = _PMText;
+            else
+                s = DateTimeInput.GetActiveCulture().DateTimeFormat.PMDesignator;
+            if (_UseSingleLetterLabel && s.Length > 0)
+                s = s[0].ToString();
+            return s;
+        }
+
+        private string GetAMLabel()
+        {
+            string s = "";
+            if (_AMText != null && _AMText.Length > 0)
+                s = _AMText;
+            else
+                s = DateTimeInput.GetActiveCulture().DateTimeFormat.AMDesignator;
+            if (_UseSingleLetterLabel && s.Length > 0)
+                s = s[0].ToString();
+            return s;
+        }
+
+        private bool _UseSingleLetterLabel = false;
+        public bool UseSingleLetterLabel
+        {
+            get { return _UseSingleLetterLabel; }
+            set
+            {
+                if (_UseSingleLetterLabel != value)
+                {
+                    _UseSingleLetterLabel = value;
+                    this.InvalidateArrange();
+                }
+            }
+        }
+
+        private string _AMText = "";
+        /// <summary>
+        /// Gets or sets custom AM text used.
+        /// </summary>
+        [DefaultValue("")]
+        public string AMText
+        {
+            get { return _AMText; }
+            set { _AMText = value; InvalidateArrange(); }
+        }
+
+        private string _PMText = "";
+        /// <summary>
+        /// Gets or sets custom PM text used.
+        /// </summary>
+        [DefaultValue("")]
+        public string PMText
+        {
+            get { return _PMText; }
+            set { _PMText = value; InvalidateArrange(); }
+        }
+
+        protected override void OnSelectedIndexChanged(EventArgs eventArgs)
+        {
+            if (_HourInput != null && !_HourInput.IsEmpty)
+            {
+                eHourPeriod period = this.SelectedIndex == 1 ? eHourPeriod.PM : eHourPeriod.AM;
+                if (_HourInput.Period != period)
+                    _HourInput.Period = period;
+            }
+            base.OnSelectedIndexChanged(eventArgs);
+        }
+        #endregion
+
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/Editors/DateTimeAdv/HourPeriodLabel.cs b/PROMS/DotNetBar Source Code/Editors/DateTimeAdv/HourPeriodLabel.cs
new file mode 100644
index 00000000..d27e4f6d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Editors/DateTimeAdv/HourPeriodLabel.cs	
@@ -0,0 +1,105 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel;
+using System.Globalization;
+
+namespace DevComponents.Editors.DateTimeAdv
+{
+    /// <summary>
+    /// Represents a label for the NumericHourInput control that shows whether time is AM or PM.
+    /// </summary>
+    public class HourPeriodLabel : VisualLabel
+    {
+        #region Private Variables
+        #endregion
+
+        #region Events
+        #endregion
+
+        #region Constructor
+        #endregion
+
+        #region Internal Implementation
+        private NumericHourInput _HourInput;
+        public NumericHourInput HourInput
+        {
+            get { return _HourInput; }
+            set
+            {
+                if (_HourInput != null)
+                    _HourInput.ValueChanged -= new EventHandler(HourChanged);
+                _HourInput = value;
+                if (_HourInput != null)
+                    _HourInput.ValueChanged += new EventHandler(HourChanged);
+            }
+        }
+
+        private void HourChanged(object sender, EventArgs e)
+        {
+            if (_HourInput == null) return;
+            string s = "";
+            if (!_HourInput.IsEmpty)
+            {
+                if (_HourInput.Period == eHourPeriod.AM)
+                {
+                    if (_AMText != null && _AMText.Length > 0)
+                        s = _AMText;
+                    else
+                        s = DateTimeInput.GetActiveCulture().DateTimeFormat.AMDesignator;
+                }
+                else
+                {
+                    if (_PMText != null && _PMText.Length > 0)
+                        s = _PMText;
+                    else
+                        s = DateTimeInput.GetActiveCulture().DateTimeFormat.PMDesignator;
+                }
+                if (_UseSingleLetterLabel && s.Length > 0)
+                    s = s[0].ToString();
+            }
+            this.Text = s;
+        }
+
+        private string _AMText = "";
+        /// <summary>
+        /// Gets or sets custom AM text used.
+        /// </summary>
+        [DefaultValue("")]
+        public string AMText
+        {
+            get { return _AMText; }
+            set { _AMText = value; InvalidateArrange(); }
+        }
+
+        private string _PMText = "";
+        /// <summary>
+        /// Gets or sets custom PM text used.
+        /// </summary>
+        [DefaultValue("")]
+        public string PMText
+        {
+            get { return _PMText; }
+            set { _PMText = value; InvalidateArrange(); }
+        }
+
+        private bool _UseSingleLetterLabel = false;
+        public bool UseSingleLetterLabel
+        {
+            get { return _UseSingleLetterLabel; }
+            set
+            {
+                if (_UseSingleLetterLabel != value)
+                {
+                    _UseSingleLetterLabel = value;
+                    this.InvalidateArrange();
+                }
+            }
+        }
+        #endregion
+
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/Editors/DateTimeAdv/IDateTimePartInput.cs b/PROMS/DotNetBar Source Code/Editors/DateTimeAdv/IDateTimePartInput.cs
new file mode 100644
index 00000000..85bc8b57
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Editors/DateTimeAdv/IDateTimePartInput.cs	
@@ -0,0 +1,44 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace DevComponents.Editors.DateTimeAdv
+{
+    /// <summary>
+    /// Defines an interface for the DateTime Part interaction.
+    /// </summary>
+    public interface IDateTimePartInput
+    {
+        /// <summary>
+        /// Gets or sets the date/time part value.
+        /// </summary>
+        int Value { get;set;}
+        /// <summary>
+        /// Gets or sets the minimum value for the date/time part entry.
+        /// </summary>
+        int MinValue { get;set;}
+
+        /// <summary>
+        /// Gets or sets the maximum value for the date/time part entry.
+        /// </summary>
+        int MaxValue { get;set;}
+
+        /// <summary>
+        /// Gets the date time part control represents.
+        /// </summary>
+        eDateTimePart Part { get;}
+
+        /// <summary>
+        /// Gets or sets whether input part is empty.
+        /// </summary>
+        bool IsEmpty { get; set;}
+
+        /// <summary>
+        /// Reverts to the last input value control held.
+        /// </summary>
+        void UndoInput();
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/Editors/DateTimeAdv/MonthCalendarAdv.cs b/PROMS/DotNetBar Source Code/Editors/DateTimeAdv/MonthCalendarAdv.cs
new file mode 100644
index 00000000..94356c4b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Editors/DateTimeAdv/MonthCalendarAdv.cs	
@@ -0,0 +1,1087 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel;
+using DevComponents.DotNetBar;
+using System.Windows.Forms;
+using System.Drawing;
+using System.Globalization;
+
+namespace DevComponents.Editors.DateTimeAdv
+{
+    /// <summary>
+    /// Represents a control that enables the user to select a date using a visual monthly calendar display. 
+    /// </summary>
+    [ToolboxBitmap(typeof(DotNetBarManager), "MonthCalendarAdv.ico"), ToolboxItem(true), Designer("DevComponents.DotNetBar.Design.MonthCalendarAdvDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+    public class MonthCalendarAdv : ItemControl
+    {
+        #region Private Variables
+        private MonthCalendarItem _MonthCalendar = null;
+        #endregion
+
+        #region Events
+        /// <summary>
+        /// Occurs when month displayed by the item has changed.
+        /// </summary>
+        public event EventHandler MonthChanged;
+
+        /// <summary>
+        /// Occurs before the month that is displayed is changed.
+        /// </summary>
+        public event EventHandler MonthChanging;
+
+
+        /// <summary>
+        /// Occurs when child label representing days is rendered and it allows you to override default rendering.
+        /// </summary>
+        public event DayPaintEventHandler PaintLabel;
+
+        /// <summary>
+        /// Occurs when mouse button is pressed over the day/week label inside of the calendar.
+        /// </summary>
+        [System.ComponentModel.Description("Occurs when mouse button is pressed over the day/week label inside of the calendar.")]
+        public event System.Windows.Forms.MouseEventHandler LabelMouseDown;
+
+        /// <summary>
+        /// Occurs when mouse button is released over day/week label inside of the calendar.
+        /// </summary>
+        [System.ComponentModel.Description("Occurs when mouse button is released over day/week label inside of the calendar.")]
+        public event System.Windows.Forms.MouseEventHandler LabelMouseUp;
+
+        /// <summary>
+        /// Occurs when mouse enters the day/week label inside of the calendar.
+        /// </summary>
+        [System.ComponentModel.Description("Occurs when mouse enters the day/week label inside of the calendar.")]
+        public event EventHandler LabelMouseEnter;
+
+        /// <summary>
+        /// Occurs when mouse leaves the day/week label inside of the calendar.
+        /// </summary>
+        [System.ComponentModel.Description("Occurs when mouse leaves the day/week label inside of the calendar.")]
+        public event EventHandler LabelMouseLeave;
+
+        /// <summary>
+        /// Occurs when mouse moves over the day/week label inside of the calendar.
+        /// </summary>
+        [System.ComponentModel.Description("Occurs when mouse moves over the day/week label inside of the calendar.")]
+        public event System.Windows.Forms.MouseEventHandler LabelMouseMove;
+
+        /// <summary>
+        /// Occurs when mouse remains still inside an day/week label of the calendar for an amount of time.
+        /// </summary>
+        [System.ComponentModel.Description("Occurs when mouse remains still inside an day/week label of the calendar for an amount of time.")]
+        public event EventHandler LabelMouseHover;
+
+        /// <summary>
+        /// Occurs when SelectedDate property has changed.
+        /// </summary>
+        [System.ComponentModel.Description("Occurs when SelectedDate property has changed.")]
+        public event EventHandler DateChanged;
+
+        /// <summary>
+        /// Occurs when the user makes an explicit date selection using the mouse. 
+        /// <remarks>
+        /// </remarks>
+        /// This event is similar to the DateChanged event, but it occurs at the end of a date selection made using the mouse.
+        /// The DateChanged event occurs during any date selection, whether by mouse, keyboard, or code. You should handle this event
+        /// when you enable multiple date selection through MultiSelect property and want to be notified after the date selection has been
+        /// made. DateChanged event would fire each time selection changes during the selection of multiple dates.
+        /// </summary>
+        [Description("Occurs when the user makes an explicit date selection using the mouse.")]
+        public event DateRangeEventHandler DateSelected;
+        #endregion
+
+        #region Constructor
+        /// <summary>
+        /// Initializes a new instance of the MonthCalendarAdv class.
+        /// </summary>
+        public MonthCalendarAdv()
+        {
+            _MonthCalendar = new MonthCalendarItem();
+            _MonthCalendar.GlobalItem = false;
+            _MonthCalendar.ContainerControl = this;
+            _MonthCalendar.Stretch = false;
+            _MonthCalendar.Displayed = true;
+            _MonthCalendar.Style = eDotNetBarStyle.StyleManagerControlled;
+            this.ColorScheme.Style = eDotNetBarStyle.StyleManagerControlled;
+            _MonthCalendar.SetOwner(this);
+
+            _MonthCalendar.MonthChanged += new EventHandler(MonthCalendar_MonthChanged);
+            _MonthCalendar.MonthChanging += new EventHandler(MonthCalendar_MonthChanging);
+            _MonthCalendar.PaintLabel += new DayPaintEventHandler(MonthCalendar_PaintLabel);
+            _MonthCalendar.LabelMouseDown += new MouseEventHandler(MonthCalendar_LabelMouseDown);
+            _MonthCalendar.LabelMouseUp += new MouseEventHandler(MonthCalendar_LabelMouseUp);
+            _MonthCalendar.LabelMouseEnter += new EventHandler(MonthCalendar_LabelMouseEnter);
+            _MonthCalendar.LabelMouseLeave += new EventHandler(MonthCalendar_LabelMouseLeave);
+            _MonthCalendar.LabelMouseMove += new MouseEventHandler(MonthCalendar_LabelMouseMove);
+            _MonthCalendar.LabelMouseHover += new EventHandler(MonthCalendar_LabelMouseHover);
+            _MonthCalendar.DateChanged += new EventHandler(MonthCalendar_DateChanged);
+            _MonthCalendar.DateSelected += new DateRangeEventHandler(MonthCalendar_DateSelected);
+            this.SetBaseItemContainer(_MonthCalendar);
+        }
+        #endregion
+
+        #region Internal Implementation
+        protected override void ScaleControl(SizeF factor, BoundsSpecified specified)
+        {
+            if (Dpi.RecordScalePerControl)
+                Dpi.SetScaling(factor);
+            base.ScaleControl(factor, specified);
+
+            AdjustSize();
+        }
+        private void MonthCalendar_DateSelected(object sender, DateRangeEventArgs e)
+        {
+            OnDateSelected(e);
+        }
+
+        private void MonthCalendar_DateChanged(object sender, EventArgs e)
+        {
+            OnDateChanged(e);
+        }
+        private void MonthCalendar_LabelMouseHover(object sender, EventArgs e)
+        {
+            OnLabelMouseHover(sender, e);
+        }
+
+        private void MonthCalendar_LabelMouseMove(object sender, MouseEventArgs e)
+        {
+            OnLabelMouseMove(sender, e);
+        }
+
+        private void MonthCalendar_LabelMouseLeave(object sender, EventArgs e)
+        {
+            OnLabelMouseLeave(sender, e);
+        }
+
+        private void MonthCalendar_LabelMouseEnter(object sender, EventArgs e)
+        {
+            OnLabelMouseEnter(sender, e);
+        }
+
+        private void MonthCalendar_LabelMouseUp(object sender, MouseEventArgs e)
+        {
+            OnLabelMouseUp(sender, e);
+        }
+
+        private void MonthCalendar_LabelMouseDown(object sender, MouseEventArgs e)
+        {
+            OnLabelMouseDown(sender, e);
+        }
+
+        private void MonthCalendar_PaintLabel(object sender, DayPaintEventArgs e)
+        {
+            OnPaintLabel(sender, e);
+        }
+        private void MonthCalendar_MonthChanging(object sender, EventArgs e)
+        {
+            OnMonthChanging(e);
+        }
+        private void MonthCalendar_MonthChanged(object sender, EventArgs e)
+        {
+            OnMonthChanged(e);
+        }
+
+        //protected override Rectangle GetItemContainerRectangle()
+        //{
+        //    Rectangle r = base.GetItemContainerRectangle();
+        //    ElementStyle style = GetBackgroundStyle();
+        //    if (style != null)
+        //    {
+        //        if (style.PaintBorder && (style.CornerType == eCornerType.Rounded || style.CornerType == eCornerType.Diagonal))
+        //            r.Inflate(-style.BorderWidth / 2, -style.BorderWidth / 2);
+        //    }
+
+        //    return r;
+        //}
+
+        /// <summary>
+        /// Returns the DayLabel at given client coordinates or null/nothing if there is no label at give location.
+        /// </summary>
+        /// <param name="x">X - position in client coordinates.</param>
+        /// <param name="y">Y - position in client coordinates.</param>
+        /// <returns>DayLabel at given coordinates or null/nothing.</returns>
+        public DayLabel GetDayAt(int x, int y)
+        {
+            return _MonthCalendar.GetDayAt(x, y);
+        }
+
+        /// <summary>
+        /// Returns the DayLabel that represents the date.
+        /// </summary>
+        /// <param name="date">Date to find label for.</param>
+        /// <returns>DayLabel object or nothing if date cannot be founds.</returns>
+        public DayLabel GetDay(DateTime date)
+        {
+            return _MonthCalendar.GetDay(date);
+        }
+
+        /// <summary>
+        /// Gets or sets the array of DateTime objects that determine which monthly days to mark using Colors.MonthlyMarker settings. 
+        /// Make sure to call UpdateMarkedDates() method to update calendar display with marked dates.
+        /// </summary>
+        [Localizable(true), Description("Indicates array of DateTime objects that determine which monthly days to mark using Colors.MonthlyMarker settings. ")]
+        public DateTime[] MonthlyMarkedDates
+        {
+            get { return _MonthCalendar.MonthlyMarkedDates; }
+            set { _MonthCalendar.MonthlyMarkedDates = value; }
+        }
+        /// <summary>
+        /// Returns whether property should be serialized. Provided for Windows Forms designer support.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeMonthlyMarkedDates()
+        {
+            return _MonthCalendar.ShouldSerializeMonthlyMarkedDates();
+        }
+        /// <summary>
+        /// Resets property to its default value. Provided for Windows Forms designer support.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetMonthlyMarkedDates()
+        {
+            _MonthCalendar.ResetMonthlyMarkedDates();
+        }
+
+        /// <summary>
+        /// Removes all monthly marked dates. Note that you must call UpdateMarkedDates method to reflect these changes on calendar.
+        /// </summary>
+        public void RemoveAllMonthlyMarkedDates()
+        {
+            _MonthCalendar.RemoveAllMonthlyMarkedDates();
+        }
+
+        /// <summary>
+        /// Removes the date from the MonthlyMarkedDates. Note that you must call UpdateMarkedDates method to reflect these changes on calendar.
+        /// </summary>
+        /// <param name="dt"></param>
+        public void RemoveMonthlyMarkedDate(DateTime dt)
+        {
+            _MonthCalendar.RemoveMonthlyMarkedDate(dt);
+        }
+
+        /// <summary>
+        /// Gets or sets the array of DayOfWeek members that determine which days of week to mark using Colors.WeeklyMarker settings. 
+        /// </summary>
+        [Localizable(true), Description("Indicates array of DateTime objects that determine which monthly days to mark using Colors.MonthlyMarker settings. ")]
+        public DayOfWeek[] WeeklyMarkedDays
+        {
+            get { return _MonthCalendar.WeeklyMarkedDays; }
+            set { _MonthCalendar.WeeklyMarkedDays = value; }
+        }
+        /// <summary>
+        /// Returns whether property should be serialized. Provided for Windows Forms designer support.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeWeeklyMarkedDays()
+        {
+            return _MonthCalendar.ShouldSerializeWeeklyMarkedDays();
+        }
+        /// <summary>
+        /// Resets property to its default value. Provided for Windows Forms designer support.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetWeeklyMarkedDays()
+        {
+            _MonthCalendar.ResetWeeklyMarkedDays();
+        }
+
+        /// <summary>
+        /// Removes all weekly marked dates. Note that you must call UpdateMarkedDates method to reflect these changes on calendar.
+        /// </summary>
+        public void RemoveAllWeeklyMarkedDays()
+        {
+            _MonthCalendar.RemoveAllWeeklyMarkedDays();
+        }
+
+        /// <summary>
+        /// Removes the day from the WeeklyMarkedDays. Note that you must call UpdateMarkedDates method to reflect these changes on calendar.
+        /// </summary>
+        /// <param name="dt"></param>
+        public void RemoveWeeklyMarkedDay(DayOfWeek dt)
+        {
+            _MonthCalendar.RemoveWeeklyMarkedDay(dt);
+        }
+
+        /// <summary>
+        /// Gets or sets the array of DateTime objects that determines which annual days are marked using Colors.AnnualMarker settings.
+        /// Make sure to call UpdateMarkedDates() method to update calendar display with marked dates.
+        /// </summary>
+        [Localizable(true), Description("Indicates array of DateTime objects that determines which annual days are marked using Colors.AnnualMarker settings.")]
+        public DateTime[] AnnuallyMarkedDates
+        {
+            get { return _MonthCalendar.AnnuallyMarkedDates; }
+            set { _MonthCalendar.AnnuallyMarkedDates = value; }
+        }
+        /// <summary>
+        /// Returns whether property should be serialized. Provided for Windows Forms designer support.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeAnnuallyMarkedDates()
+        {
+            return _MonthCalendar.ShouldSerializeAnnuallyMarkedDates();
+        }
+        /// <summary>
+        /// Resets property to its default value. Provided for Windows Forms designer support.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetAnnuallyMarkedDates()
+        {
+            _MonthCalendar.ResetAnnuallyMarkedDates();
+        }
+
+        /// <summary>
+        /// Removes all annually marked dates. Note that you must call UpdateMarkedDates method to reflect these changes on calendar.
+        /// </summary>
+        public void RemoveAllAnnuallyMarkedDates()
+        {
+            _MonthCalendar.RemoveAllAnnuallyMarkedDates();
+        }
+
+        /// <summary>
+        /// Removes the date from the AnnuallyMarkedDates. Note that you must call UpdateMarkedDates method to reflect these changes on calendar.
+        /// </summary>
+        /// <param name="dt"></param>
+        public void RemoveAnnuallyMarkedDate(DateTime dt)
+        {
+            _MonthCalendar.RemoveAnnuallyMarkedDate(dt);
+        }
+
+        /// <summary>
+        /// Gets or sets the array of DateTime objects that determines which non-recurring dates are marked using Colors.DayMarker settings. 
+        /// Make sure to call UpdateMarkedDates() method to update calendar display with marked dates.
+        /// </summary>
+        [Localizable(true), Description("Indicates array of DateTime objects that determines which non-recurring dates are marked using Colors.DayMarker settings.")]
+        public DateTime[] MarkedDates
+        {
+            get { return _MonthCalendar.MarkedDates; }
+            set { _MonthCalendar.MarkedDates = value; }
+        }
+        /// <summary>
+        /// Returns whether property should be serialized. Provided for Windows Forms designer support.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeMarkedDates()
+        {
+            return _MonthCalendar.ShouldSerializeMarkedDates();
+        }
+        /// <summary>
+        /// Resets property to its default value. Provided for Windows Forms designer support.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetMarkedDates()
+        {
+            _MonthCalendar.ResetMarkedDates();
+        }
+
+        /// <summary>
+        /// Removes all marked dates set through MarkedDates property. Note that you must call UpdateMarkedDates method to reflect these changes on calendar.
+        /// </summary>
+        public void RemoveAllMarkedDates()
+        {
+            _MonthCalendar.RemoveAllMarkedDates();
+        }
+
+        /// <summary>
+        /// Removes the date from the MarkedDates collection. Note that you must call UpdateMarkedDates method to reflect these changes on calendar.
+        /// </summary>
+        /// <param name="dt"></param>
+        public void RemoveMarkedDate(DateTime dt)
+        {
+            _MonthCalendar.RemoveMarkedDate(dt);
+        }
+
+        /// <summary>
+        /// Repaints the marked dates to reflect the dates set in the lists of marked dates.
+        /// Use this method to reflect the changes made to the AnnuallyMarkedDates, MonthlyMarkedDates or MarkedDates properties as well
+        /// as change to the marked Colors properties.
+        /// </summary>
+        public void UpdateMarkedDates()
+        {
+            _MonthCalendar.UpdateMarkedDates();
+        }
+
+        internal bool GetDesignModeInternal()
+        {
+            return DesignMode;
+        }
+
+        /// <summary>
+        /// Gets or sets the first month displayed by the control.
+        /// </summary>
+        [Description("Indicates the first month displayed on the control.")]
+        public DateTime DisplayMonth
+        {
+            get { return _MonthCalendar.DisplayMonth; }
+            set { _MonthCalendar.DisplayMonth = value; }
+        }
+
+        /// <summary>
+        /// Gets number of months displayed on the control.
+        /// </summary>
+        [Browsable(false)]
+        public int DisplayedMonthCount
+        {
+            get
+            {
+                return _MonthCalendar.DisplayedMonthCount;
+            }
+        }
+
+        /// <summary>
+        /// Gets the calendar colors used by the control.
+        /// </summary>
+        [NotifyParentPropertyAttribute(true), Category("Appearance"), Description("Gets colors used by control."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public MonthCalendarColors Colors
+        {
+            get { return _MonthCalendar.Colors; }
+        }
+
+        /// <summary>
+        /// Raises the DateChanged event.
+        /// </summary>
+        /// <param name="e">Provides event data.</param>
+        protected virtual void OnDateChanged(EventArgs e)
+        {
+            if (DateChanged != null)
+                DateChanged(this, e);
+        }
+
+        /// <summary>
+        /// Raises the DateSelected event.
+        /// </summary>
+        /// <param name="e">Provides event data.</param>
+        protected virtual void OnDateSelected(DateRangeEventArgs e)
+        {
+            if (DateSelected != null)
+                DateSelected(this, e);
+        }
+
+        /// <summary>
+        /// Raises the MonthChanged event.
+        /// </summary>
+        /// <param name="e">Provides additional event data.</param>
+        protected virtual void OnMonthChanged(EventArgs e)
+        {
+            if (MonthChanged != null)
+                MonthChanged(this, e);
+        }
+
+        /// <summary>
+        /// Raises the MonthChanging event.
+        /// </summary>
+        /// <param name="e">Provides additional event data.</param>
+        protected virtual void OnMonthChanging(EventArgs e)
+        {
+            if (MonthChanging != null)
+                MonthChanging(this, e);
+        }
+
+        /// <summary>
+        /// Raises the PaintLabel event.
+        /// </summary>
+        /// <param name="e">Provides event data.</param>
+        protected virtual void OnPaintLabel(object label, DayPaintEventArgs e)
+        {
+            if (PaintLabel != null)
+                PaintLabel(label, e);
+        }
+
+        /// <summary>
+        /// Raises the LabelMouseDown event.
+        /// </summary>
+        /// <param name="e">Provides event data.</param>
+        protected virtual void OnLabelMouseDown(object sender, MouseEventArgs e)
+        {
+            if (LabelMouseDown != null)
+                LabelMouseDown(sender, e);
+        }
+
+        /// <summary>
+        /// Raises the LabelMouseUp event.
+        /// </summary>
+        /// <param name="e">Provides event data.</param>
+        protected virtual void OnLabelMouseUp(object sender, MouseEventArgs e)
+        {
+            if (LabelMouseUp != null)
+                LabelMouseUp(sender, e);
+        }
+
+        /// <summary>
+        /// Raises the LabelMouseEnter event.
+        /// </summary>
+        /// <param name="e">Provides event data.</param>
+        protected virtual void OnLabelMouseEnter(object sender, EventArgs e)
+        {
+            if (LabelMouseEnter != null)
+                LabelMouseEnter(sender, e);
+        }
+
+        /// <summary>
+        /// Raises the LabelMouseLeave event.
+        /// </summary>
+        /// <param name="e">Provides event data.</param>
+        protected virtual void OnLabelMouseLeave(object sender, EventArgs e)
+        {
+            if (LabelMouseLeave != null)
+                LabelMouseLeave(sender, e);
+        }
+
+        /// <summary>
+        /// Raises the LabelMouseMove event.
+        /// </summary>
+        /// <param name="e">Provides event data.</param>
+        protected virtual void OnLabelMouseMove(object sender, MouseEventArgs e)
+        {
+            if (LabelMouseMove != null)
+                LabelMouseMove(sender, e);
+        }
+
+        /// <summary>
+        /// Raises the LabelMouseHover event.
+        /// </summary>
+        /// <param name="e">Provides event data.</param>
+        protected virtual void OnLabelMouseHover(object sender, EventArgs e)
+        {
+            if (LabelMouseHover != null)
+                LabelMouseHover(sender, e);
+        }
+
+        /// <summary>
+        /// Gets or sets the size of each day item on the calendar. Default value is 24, 15.
+        /// </summary>
+        [Description("Indicate size of each day item on the calendar.")]
+        public Size DaySize
+        {
+            get { return _MonthCalendar.DaySize; }
+            set
+            {
+                _MonthCalendar.DaySize = value;
+                InvalidateAutoSize();
+            }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized. Provided for designer support.
+        /// </summary>
+        /// <returns></returns>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeDaySize()
+        {
+            return _MonthCalendar.ShouldSerializeDaySize();
+        }
+        /// <summary>
+        /// Reset property to default value. Provided for designer support.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetDaySize()
+        {
+            _MonthCalendar.ResetDaySize();
+        }
+
+        /// <summary>
+        /// Gets or sets the size of date navigation buttons on the calendar. Default value is 13, 18. If you increase size of the navigation
+        /// buttons change DaySize as well so everything fits.
+        /// </summary>
+        [Description("Indicate size of date navigation buttons on the calendar. If you increase size of the navigation buttons change DaySize as well so everything fits.")]
+        public Size NavigationButtonSize
+        {
+            get { return _MonthCalendar.NavigationButtonSize; }
+            set
+            {
+                _MonthCalendar.NavigationButtonSize = value;
+                InvalidateAutoSize();
+            }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized. Provided for designer support.
+        /// </summary>
+        /// <returns></returns>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeNavigationButtonSize()
+        {
+            return _MonthCalendar.ShouldSerializeNavigationButtonSize();
+        }
+        /// <summary>
+        /// Reset property to default value. Provided for designer support.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetNavigationButtonSize()
+        {
+            _MonthCalendar.ResetNavigationButtonSize();
+        }
+
+        /// <summary>
+        /// Gets or sets the minimum date and time that can be selected in the control.
+        /// </summary>
+        [Description("Indicates minimum date and time that can be selected in the control.")]
+        public System.DateTime MinDate
+        {
+            get { return _MonthCalendar.MinDate; }
+            set { _MonthCalendar.MinDate = value; }
+        }
+        /// <summary>
+        /// Gets whether Value property should be serialized by Windows Forms designer.
+        /// </summary>
+        /// <returns>true if value serialized otherwise false.</returns>
+        public bool ShouldSerializeMinDate()
+        {
+            return _MonthCalendar.ShouldSerializeMinDate();
+        }
+        /// <summary>
+        /// Reset the MinDate property to its default value.
+        /// </summary>
+        public void ResetMinDate()
+        {
+            _MonthCalendar.ResetMinDate();
+        }
+
+        /// <summary>
+        /// Gets or sets the maximum date and time that can be selected in the control.
+        /// </summary>
+        [Description("Indicates maximum date and time that can be selected in the control.")]
+        public System.DateTime MaxDate
+        {
+            get { return _MonthCalendar.MaxDate; }
+            set { _MonthCalendar.MaxDate = value; }
+        }
+        /// <summary>
+        /// Gets whether Value property should be serialized by Windows Forms designer.
+        /// </summary>
+        /// <returns>true if value serialized otherwise false.</returns>
+        public bool ShouldSerializeMaxDate()
+        {
+            return _MonthCalendar.ShouldSerializeMaxDate();
+        }
+        /// <summary>
+        /// Reset the MaxDate property to its default value.
+        /// </summary>
+        public void ResetMaxDate()
+        {
+            _MonthCalendar.ResetMaxDate();
+        }
+
+        /// <summary>
+        /// Specifies the commands container background style. Commands container displays Today and Clear buttons if they are visible.
+        /// </summary>
+        [Browsable(true), Category("Style"), Description("Specifies the commands container background style. Commands container displays Today and Clear buttons if they are visible."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ElementStyle CommandsBackgroundStyle
+        {
+            get { return _MonthCalendar.CommandsBackgroundStyle; }
+        }
+
+        /// <summary>
+        /// Specifies the navigation container background style. Navigation container displays month, year and optional buttons. Default value is an empty style which means that container does not display any background.
+        /// BeginGroup property set to true will override this style on some styles.
+        /// </summary>
+        [Browsable(true), Category("Style"), Description("Indicates navigation container background style."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ElementStyle NavigationBackgroundStyle
+        {
+            get { return _MonthCalendar.NavigationBackgroundStyle; }
+        }
+
+        /// <summary>
+        /// Gets or sets the number of columns and rows of months displayed on control. Default value is 0,0 which indicates that
+        /// calendar will display as many columns and rows as it is possible to fit into container space available.
+        /// </summary>
+        [Description("Indicates number of columns and rows of months displayed on control.")]
+        public Size CalendarDimensions
+        {
+            get { return _MonthCalendar.CalendarDimensions; }
+            set { _MonthCalendar.CalendarDimensions = value; InvalidateAutoSize(); }
+        }
+        /// <summary>
+        /// Resets property to its default value. Provided for design-time support.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetCalendarDimensions()
+        {
+            _MonthCalendar.ResetCalendarDimensions();
+            InvalidateAutoSize();
+        }
+        /// <summary>
+        /// Gets whether property should be serialized. Provided for design-time support.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeCalendarDimensions()
+        {
+            return _MonthCalendar.ShouldSerializeCalendarDimensions();
+        }
+
+        /// <summary>
+        /// Sets the number of columns and rows of months to display. 
+        /// </summary>
+        /// <param name="columns">The number of columns. </param>
+        /// <param name="rows">The number of rows. </param>
+        /// <remarks>ArgumentOutOfRangeException will be raised if any value is less than zero or one value is grater than zero and other is zero.</remarks>
+        public void SetCalendarDimensions(int columns, int rows)
+        {
+            _MonthCalendar.SetCalendarDimensions(columns, rows);
+        }
+
+        /// <summary>
+        /// Gets or sets whether weekend days can be selected. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Description("Indicates whether weekend days can be selected.")]
+        public bool WeekendDaysSelectable
+        {
+            get { return _MonthCalendar.WeekendDaysSelectable; }
+            set { _MonthCalendar.WeekendDaysSelectable = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the rule used to determine first week of the year for week of year display on calendar. Default value is first-day.
+        /// </summary>
+        [DefaultValue(CalendarWeekRule.FirstDay), Description("Indicates rule used to determine first week of the year for week of year display on calendar.")]
+        public CalendarWeekRule WeekOfYearRule
+        {
+            get { return _MonthCalendar.WeekOfYearRule; }
+            set { _MonthCalendar.WeekOfYearRule = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the value that is used by calendar as today's date.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public DateTime TodayDate
+        {
+            get { return _MonthCalendar.TodayDate; }
+            set { _MonthCalendar.TodayDate = value; }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether the TodayDate property has been explicitly set. 
+        /// </summary>
+        [Browsable(false)]
+        public bool TodayDateSet
+        {
+            get { return _MonthCalendar.TodayDateSet; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether today marker that indicates TodayDate is visible on the calendar. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Description("Indicates whether today marker that indicates TodayDate is visible on the calendar.")]
+        public bool ShowTodayMarker
+        {
+            get { return _MonthCalendar.ShowTodayMarker; }
+            set { _MonthCalendar.ShowTodayMarker = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether week of year is visible. Default value is false.
+        /// </summary>
+        [DefaultValue(false), Description("Indicates whether week of year is visible.")]
+        public bool ShowWeekNumbers
+        {
+            get { return _MonthCalendar.ShowWeekNumbers; }
+            set { _MonthCalendar.ShowWeekNumbers = value; InvalidateAutoSize(); }
+        }
+
+        /// <summary>
+        /// Gets or sets the array of custom names for days displayed on calendar header. The array must have exactly 7 elements representing day names from 0 to 6.
+        /// </summary>
+        [DefaultValue(null), Description("Indicates array of custom names for days displayed on calendar header."), Localizable(true)]
+        public string[] DayNames
+        {
+            get { return _MonthCalendar.DayNames; }
+            set { _MonthCalendar.DayNames = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the first day of week displayed on the calendar. Default value is Sunday.
+        /// </summary>
+        [DefaultValue(DayOfWeek.Sunday), Description("Indicates first day of week displayed on the calendar.")]
+        public DayOfWeek FirstDayOfWeek
+        {
+            get { return _MonthCalendar.FirstDayOfWeek; }
+            set { _MonthCalendar.FirstDayOfWeek = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether control uses the two letter day names. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Description("Indicates whether control uses the two letter day names.")]
+        public bool TwoLetterDayName
+        {
+            get { return _MonthCalendar.TwoLetterDayName; }
+            set
+            {
+                _MonthCalendar.TwoLetterDayName = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the calendar selected date. Note that SelectedDate property should be used only when MultiSelect property is set to false.
+        /// When multiple dates can be selected use range selection properties: SelectionStart, SelectionEnd and SelectionRange.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public DateTime SelectedDate
+        {
+            get
+            {
+                return _MonthCalendar.SelectedDate;
+            }
+            set
+            {
+                _MonthCalendar.SelectedDate = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether selection of multiple dates up to the MaxSelectionCount is enabled. Default value is false which indicates that only
+        /// single day can be selected.
+        /// </summary>
+        [DefaultValue(false), Description("Indicates whether selection of multiple dates up to the MaxSelectionCount is enabled.")]
+        public bool MultiSelect
+        {
+            get { return _MonthCalendar.MultiSelect; }
+            set { _MonthCalendar.MultiSelect = value; }
+        }
+
+        /// <summary>
+        /// Gets the reference to the bottom container that parents the Today, and Clear system buttons.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public ItemContainer BottomContainer
+        {
+            get
+            {
+                return _MonthCalendar.BottomContainer;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether Today button displayed at the bottom of the calendar is visible. Default value is false.
+        /// </summary>
+        [DefaultValue(false), Description("Indicates whether Today button displayed at the bottom of the calendar is visible.")]
+        public bool TodayButtonVisible
+        {
+            get { return _MonthCalendar.TodayButtonVisible; }
+            set { _MonthCalendar.TodayButtonVisible = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether Clear button displayed at the bottom of the calendar is visible. Clear button clears the currently selected date. Default value is false.
+        /// </summary>
+        [DefaultValue(false), Description("Indicates whether Clear button displayed at the bottom of the calendar is visible. Clear button clears the currently selected date.")]
+        public bool ClearButtonVisible
+        {
+            get { return _MonthCalendar.ClearButtonVisible; }
+            set { _MonthCalendar.ClearButtonVisible = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the maximum number of days that can be selected in a month calendar control. 
+        /// </summary>
+        [DefaultValue(7), Description("Gets or sets the maximum number of days that can be selected in a month calendar control.")]
+        public int MaxSelectionCount
+        {
+            get { return _MonthCalendar.MaxSelectionCount; }
+            set { _MonthCalendar.MaxSelectionCount = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the start date of the selected range of dates. 
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public DateTime SelectionStart
+        {
+            get { return _MonthCalendar.SelectionStart; }
+            set
+            {
+                _MonthCalendar.SelectionStart = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the end date of the selected range of dates. 
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public DateTime SelectionEnd
+        {
+            get { return _MonthCalendar.SelectionEnd; }
+            set
+            {
+                _MonthCalendar.SelectionEnd = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the selected range of dates for a month calendar control. 
+        /// <remarks>
+        /// Setting this property is functionally equivalent to using the SetSelectionRange method. You can set the start and end dates separately by setting either the SelectionStart or SelectionEnd properties. You cannot change the start and end dates by setting the SelectionRange.Start or SelectionRange.End property values of the SelectionRange property. You should use SelectionStart, SelectionEnd, or SetSelectionRange.
+        /// If the Start property value of the SelectionRange is greater than its End property value, the dates are swapped; the End property value becomes the starting date, and Start property value becomes the end date.</remarks>
+        /// </summary>
+        [Bindable(true), Description("Indicates selected range of dates for a month calendar control. ")]
+        public SelectionRange SelectionRange
+        {
+            get
+            {
+                return _MonthCalendar.SelectionRange;
+            }
+            set
+            {
+                _MonthCalendar.SelectionRange = value;
+            }
+        }
+        /// <summary>
+        /// Returns whether property should be serialized by Windows Forms designer.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeSelectionRange()
+        {
+            return _MonthCalendar.ShouldSerializeSelectionRange();
+        }
+
+        /// <summary>
+        /// Sets the selected dates in a month calendar control to the specified date range. 
+        /// </summary>
+        /// <param name="startDate">The beginning date of the selection range.</param>
+        /// <param name="endDate">The end date of the selection range.</param>
+        /// <exception cref="ArgumentOutOfRangeException">startDate is less than the minimum date allowable for a month calendar control.<br />
+        /// -or- <br />
+        /// startDate is greater than the maximum allowable date for a month calendar control.<br />
+        /// -or- <br />
+        /// endDate is less than the minimum date allowable for a month calendar control.<br />
+        /// -or- endDate is greater than the maximum allowable date for a month calendar control. <br />
+        /// </exception>
+        /// <remarks>
+        /// If the startDate value is greater than endDate property value, the dates are swapped; the endDate value becomes the starting date, and startDate value becomes the end date.
+        /// </remarks>
+        public void SetSelectionRange(DateTime startDate, DateTime endDate)
+        {
+            _MonthCalendar.SetSelectionRange(startDate, endDate);
+        }
+
+        /// <summary>
+        /// Gets or sets whether Year/Century selection is enabled when calendar is displaying single month.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether Year/Century selection is enabled when calendar is displaying single month.")]
+        public bool YearSelectionEnabled
+        {
+            get { return _MonthCalendar.YearSelectionEnabled; }
+            set { _MonthCalendar.YearSelectionEnabled = value; }
+        }
+
+        /// <summary>
+        /// Indicates whether month selector which is displayed when month label is clicked is using abbreviated month names instead of month number.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether month selector which is displayed when month label is clicked is using abbreviated month names instead of month number.")]
+        public bool MonthSelectorShortMonthNames
+        {
+            get { return _MonthCalendar.MonthSelectorShortMonthNames; }
+            set { _MonthCalendar.MonthSelectorShortMonthNames = value; }
+        }
+
+        /// <summary>
+        /// Indicates whether calendar is used in month selection mode which shows only month and year.
+        /// </summary>
+        [DefaultValue(false), Category("Behavior"), Description("Indicates whether calendar is used in month selection mode which shows only month and year.")]
+        public bool MonthSelectionMode
+        {
+            get { return _MonthCalendar.MonthSelectionMode; }
+            set { _MonthCalendar.MonthSelectionMode = value; InvalidateAutoSize(); }
+        }
+
+        private Size _PreferredSize = Size.Empty;
+        /// <summary>
+        /// Invalidates control auto-size and resizes the control if AutoSize is set to true.
+        /// </summary>
+        public void InvalidateAutoSize()
+        {
+            _PreferredSize = Size.Empty;
+            AdjustSize();
+        }
+#if FRAMEWORK20
+        /// <summary>
+        /// Gets or sets a value indicating whether the control is automatically resized to display its entire contents. You can set MaximumSize.Width property to set the maximum width used by the control.
+        /// </summary>
+        [Browsable(true), DefaultValue(false), EditorBrowsable(EditorBrowsableState.Always), DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
+        public override bool AutoSize
+        {
+            get
+            {
+                return base.AutoSize;
+            }
+            set
+            {
+                if (this.AutoSize != value)
+                {
+                    base.AutoSize = value;
+                    AdjustSize();
+                }
+            }
+        }
+
+        private void AdjustSize()
+        {
+            if (this.AutoSize)
+            {
+                this.Size = base.PreferredSize;
+            }
+        }
+
+        protected override void OnFontChanged(EventArgs e)
+        {
+            InvalidateAutoSize();
+            base.OnFontChanged(e);
+        }
+
+        public override Size GetPreferredSize(Size proposedSize)
+        {
+            if (!_PreferredSize.IsEmpty) return _PreferredSize;
+
+            if (!BarFunctions.IsHandleValid(this))
+                return base.GetPreferredSize(proposedSize);
+
+            ElementStyle style = this.GetBackgroundStyle();
+
+            _MonthCalendar.RecalcSize();
+            _PreferredSize = _MonthCalendar.Size;
+            if (style != null)
+            {
+                _PreferredSize.Width += ElementStyleLayout.HorizontalStyleWhiteSpace(style);
+                _PreferredSize.Height += ElementStyleLayout.VerticalStyleWhiteSpace(style);
+            }
+
+            return _PreferredSize;
+        }
+
+        protected override void SetBoundsCore(int x, int y, int width, int height, BoundsSpecified specified)
+        {
+            if (this.AutoSize)
+            {
+                Size preferredSize = base.PreferredSize;
+                width = preferredSize.Width;
+                height = preferredSize.Height;
+            }
+            base.SetBoundsCore(x, y, width, height, specified);
+        }
+
+        protected override void OnHandleCreated(EventArgs e)
+        {
+            if (this.AutoSize)
+                this.AdjustSize();
+            base.OnHandleCreated(e);
+        }
+
+        [Browsable(false)]
+        public override bool ThemeAware
+        {
+            get
+            {
+                return base.ThemeAware;
+            }
+            set
+            {
+                base.ThemeAware = value;
+            }
+        }
+#endif
+        #endregion
+
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/Editors/DateTimeAdv/MonthCalendarColors.cs b/PROMS/DotNetBar Source Code/Editors/DateTimeAdv/MonthCalendarColors.cs
new file mode 100644
index 00000000..4395ba21
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Editors/DateTimeAdv/MonthCalendarColors.cs	
@@ -0,0 +1,277 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+using System.ComponentModel;
+using DevComponents.DotNetBar;
+
+namespace DevComponents.Editors.DateTimeAdv
+{
+    /// <summary>
+    /// Defines the MonthCalendar and SingleMonthCalendar colors for customization.
+    /// </summary>
+    [System.ComponentModel.ToolboxItem(false), System.ComponentModel.DesignTimeVisible(false), TypeConverter(typeof(System.ComponentModel.ExpandableObjectConverter))]
+    public class MonthCalendarColors
+    {
+        private void Refresh()
+        {
+            if (_Parent != null)
+            {
+                _Parent.NeedRecalcSize = true;
+                _Parent.Refresh();
+            }
+        }
+
+        private BaseItem _Parent;
+        internal BaseItem Parent
+        {
+            get { return _Parent; }
+            set
+            {
+                _Parent = value;
+                _WeekOfYear.Parent = value;
+                _Day.Parent = value;
+                _Weekend.Parent = value;
+                _TrailingDay.Parent = value;
+                _Today.Parent = value;
+                _TrailingWeekend.Parent = value;
+                _DayLabel.Parent = value;
+                _DayMarker.Parent = value;
+                _MonthlyMarker.Parent = value;
+                _AnnualMarker.Parent = value;
+                _Selection.Parent = value;
+            }
+        }
+
+        private DateAppearanceDescription _Today = new DateAppearanceDescription();
+        /// <summary>
+        /// Gets the appearance settings for the todays date.
+        /// </summary>
+        [NotifyParentPropertyAttribute(true), Description("Indicates appearance settings for the todays date."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public DateAppearanceDescription Today
+        {
+            get { return _Today; }
+        }
+        /// <summary>
+        /// Resets property to its default value. Provided for Windows Forms designer support.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetToday()
+        {
+            _Today = new DateAppearanceDescription();
+            _Today.Parent = _Parent;
+            this.Refresh();
+        }
+
+        private DateAppearanceDescription _Selection = new DateAppearanceDescription();
+        /// <summary>
+        /// Gets the appearance settings for selected days.
+        /// </summary>
+        [NotifyParentPropertyAttribute(true), Description("Indicates appearance settings for selected days."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public DateAppearanceDescription Selection
+        {
+            get { return _Selection; }
+        }
+        /// <summary>
+        /// Resets property to its default value. Provided for Windows Forms designer support.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetSelection()
+        {
+            _Selection = new DateAppearanceDescription();
+            _Selection.Parent = _Parent;
+            this.Refresh();
+        }
+
+        private DateAppearanceDescription _TrailingDay = new DateAppearanceDescription();
+        /// <summary>
+        /// Gets the appearance settings for the trailing days on calendar.
+        /// </summary>
+        [NotifyParentPropertyAttribute(true), Description("Indicates appearance settings for the trailing days on calendar."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public DateAppearanceDescription TrailingDay
+        {
+            get { return _TrailingDay; }
+        }
+        /// <summary>
+        /// Resets property to its default value. Provided for Windows Forms designer support.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetTrailingDay()
+        {
+            _TrailingDay = new DateAppearanceDescription();
+            _TrailingDay.Parent = _Parent;
+            this.Refresh();
+        }
+
+        private DateAppearanceDescription _WeekOfYear = new DateAppearanceDescription();
+        /// <summary>
+        /// Gets or sets the appearance settings for the labels that show week of year number.
+        /// </summary>
+        [NotifyParentPropertyAttribute(true), Description("Indicates appearance settings for the labels that show week of year number."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public DateAppearanceDescription WeekOfYear
+        {
+            get { return _WeekOfYear; }
+        }
+        /// <summary>
+        /// Resets property to its default value. Provided for Windows Forms designer support.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetWeekOfYear()
+        {
+            _WeekOfYear = new DateAppearanceDescription();
+            _WeekOfYear.Parent = _Parent;
+            this.Refresh();
+        }
+
+        private Color _DaysDividerBorderColors = Color.Empty;
+        /// <summary>
+        /// Gets or sets the days divider line color.
+        /// </summary>
+        [Category("Colors"), Description("Indicates days divider line color.")]
+        public Color DaysDividerBorderColors
+        {
+            get { return _DaysDividerBorderColors; }
+            set
+            {
+                _DaysDividerBorderColors = value;
+                this.Refresh();
+            }
+        }
+        /// <summary>Gets whether property should be serialized. Provided for WinForms designer support.</summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeDaysDividerBorderColors()
+        {
+            return !DaysDividerBorderColors.IsEmpty;
+        }
+        /// <summary>Resets property to its default value. Provided for WinForms designer support.</summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetDaysDividerBorderColors()
+        {
+            DaysDividerBorderColors = Color.Empty;
+        }
+
+        private DateAppearanceDescription _Day = new DateAppearanceDescription();
+        /// <summary>
+        /// Gets the appearance settings for the numeric day of month label.
+        /// </summary>
+        [NotifyParentPropertyAttribute(true), Description("Indicates appearance settings for the numeric day of month label."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public DateAppearanceDescription Day
+        {
+            get { return _Day; }
+        }
+        /// <summary>
+        /// Resets property to its default value. Provided for Windows Forms designer support.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetDay()
+        {
+            _Day = new DateAppearanceDescription();
+            _Day.Parent = _Parent;
+            this.Refresh();
+        }
+
+        private DateAppearanceDescription _Weekend = new DateAppearanceDescription();
+        /// <summary>
+        /// Gets the appearance settings for the weekend days on calendar (Saturday and Sunday).
+        /// </summary>
+        [NotifyParentPropertyAttribute(true), Description("Indicates appearance settings for the weekend days on calendar (Saturday and Sunday)."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public DateAppearanceDescription Weekend
+        {
+            get { return _Weekend; }
+        }
+        /// <summary>
+        /// Resets property to its default value. Provided for Windows Forms designer support.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetWeekend()
+        {
+            _Weekend = new DateAppearanceDescription();
+            _Weekend.Parent = _Parent;
+            this.Refresh();
+        }
+
+        private DateAppearanceDescription _TrailingWeekend = new DateAppearanceDescription();
+        /// <summary>
+        /// Gets the appearance settings for the trailing weekend days on calendar (Saturday and Sunday).
+        /// </summary>
+        [NotifyParentPropertyAttribute(true), Description("Indicates appearance settings for the trailing weekend days on calendar (Saturday and Sunday)."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public DateAppearanceDescription TrailingWeekend
+        {
+            get { return _TrailingWeekend; }
+        }
+        /// <summary>
+        /// Resets property to its default value. Provided for Windows Forms designer support.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetTrailingWeekend()
+        {
+            _TrailingWeekend = new DateAppearanceDescription();
+            _TrailingWeekend.Parent = _Parent;
+            this.Refresh();
+        }
+
+        private DateAppearanceDescription _DayLabel = new DateAppearanceDescription();
+        /// <summary>
+        /// Gets the appearance settings for the labels that display day name in calendar header.
+        /// </summary>
+        [NotifyParentPropertyAttribute(true), Description("Indicates appearance settings for the labels that display day name in calendar header."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public DateAppearanceDescription DayLabel
+        {
+            get { return _DayLabel; }
+        }
+        /// <summary>
+        /// Resets property to its default value. Provided for Windows Forms designer support.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetDayLabel()
+        {
+            _DayLabel = new DateAppearanceDescription();
+            _DayLabel.Parent = _Parent;
+            this.Refresh();
+        }
+
+
+        private DateAppearanceDescription _MonthlyMarker = new DateAppearanceDescription();
+        /// <summary>
+        /// Gets or sets the marker settings for days specified by MonthCalendarItem.MonthlyMarkedDates property.
+        /// </summary>
+        [NotifyParentPropertyAttribute(true), Description("Gets marker settings for days specified by MonthCalendarAdv.MonthlyMarkedDates property."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public DateAppearanceDescription MonthlyMarker
+        {
+            get { return _MonthlyMarker; }
+        }
+
+        private DateAppearanceDescription _AnnualMarker = new DateAppearanceDescription();
+        /// <summary>
+        /// Gets or sets the marker settings for days specified by MonthCalendarItem.AnnuallyMarkedDates property.
+        /// </summary>
+        [NotifyParentPropertyAttribute(true), Description("Gets marker settings for days specified by MonthCalendarAdv.AnnuallyMarkedDates property."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public DateAppearanceDescription AnnualMarker
+        {
+            get { return _AnnualMarker; }
+        }
+
+        private DateAppearanceDescription _DayMarker = new DateAppearanceDescription();
+        /// <summary>
+        /// Gets or sets the marker settings for days specified by MonthCalendarItem.MarkedDates property.
+        /// </summary>
+        [NotifyParentPropertyAttribute(true), Description("Gets marker settings for days specified by MonthCalendarAdv.MarkedDates property."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public DateAppearanceDescription DayMarker
+        {
+            get { return _DayMarker; }
+        }
+
+        private DateAppearanceDescription _WeeklyMarker = new DateAppearanceDescription();
+        /// <summary>
+        /// Gets or sets the marker settings for days specified by MonthCalendarItem.WeeklyMarkedDays property.
+        /// </summary>
+        [NotifyParentPropertyAttribute(true), Description("Gets marker settings for days specified by MonthCalendarAdv.WeeklyMarkedDays property."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public DateAppearanceDescription WeeklyMarker
+        {
+            get { return _WeeklyMarker; }
+        }
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/Editors/DateTimeAdv/MonthCalendarItem.cs b/PROMS/DotNetBar Source Code/Editors/DateTimeAdv/MonthCalendarItem.cs
new file mode 100644
index 00000000..ae0718a0
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Editors/DateTimeAdv/MonthCalendarItem.cs	
@@ -0,0 +1,1907 @@
+#if FRAMEWORK20
+using System;
+using System.Drawing;
+using System.Text;
+using DevComponents.DotNetBar;
+using System.ComponentModel;
+using System.Collections.Generic;
+using System.Windows.Forms;
+using System.Globalization;
+
+namespace DevComponents.Editors.DateTimeAdv
+{
+    public class MonthCalendarItem : CalendarBase
+    {
+        #region Private Variables
+        private Size _Spacing = new Size(10, 8);
+        private List<DateTime> _AnnuallyMarkedDates = new List<DateTime>();
+        private List<DateTime> _MonthlyMarkedDates = new List<DateTime>();
+        private List<DateTime> _MarkedDates = new List<DateTime>();
+        private static string _BottomContainerName = "sysCalBottomContainer";
+        private static string _TodayButtonName = "sysTodayButton";
+        private static string _ClearButtonName = "sysClearSelectionButton";
+        private ItemContainer _BottomContainer = null;
+        private ButtonItem _TodayButton = null;
+        private ButtonItem _ClearButton = null;
+        #endregion
+
+        #region Events
+        /// <summary>
+        /// Occurs when month displayed by the item has changed.
+        /// </summary>
+        public event EventHandler MonthChanged;
+
+        /// <summary>
+        /// Occurs before the month that is displayed is changed.
+        /// </summary>
+        public event EventHandler MonthChanging;
+
+
+        /// <summary>
+        /// Occurs when child label representing days is rendered and it allows you to override default rendering.
+        /// </summary>
+        public event DayPaintEventHandler PaintLabel;
+
+        /// <summary>
+        /// Occurs when mouse button is pressed over the day/week label inside of the calendar.
+        /// </summary>
+        [System.ComponentModel.Description("Occurs when mouse button is pressed over the day/week label inside of the calendar.")]
+        public event System.Windows.Forms.MouseEventHandler LabelMouseDown;
+
+        /// <summary>
+        /// Occurs when mouse button is released over day/week label inside of the calendar.
+        /// </summary>
+        [System.ComponentModel.Description("Occurs when mouse button is released over day/week label inside of the calendar.")]
+        public event System.Windows.Forms.MouseEventHandler LabelMouseUp;
+
+        /// <summary>
+        /// Occurs when mouse enters the day/week label inside of the calendar.
+        /// </summary>
+        [System.ComponentModel.Description("Occurs when mouse enters the day/week label inside of the calendar.")]
+        public event EventHandler LabelMouseEnter;
+
+        /// <summary>
+        /// Occurs when mouse leaves the day/week label inside of the calendar.
+        /// </summary>
+        [System.ComponentModel.Description("Occurs when mouse leaves the day/week label inside of the calendar.")]
+        public event EventHandler LabelMouseLeave;
+
+        /// <summary>
+        /// Occurs when mouse moves over the day/week label inside of the calendar.
+        /// </summary>
+        [System.ComponentModel.Description("Occurs when mouse moves over the day/week label inside of the calendar.")]
+        public event System.Windows.Forms.MouseEventHandler LabelMouseMove;
+
+        /// <summary>
+        /// Occurs when mouse remains still inside an day/week label of the calendar for an amount of time.
+        /// </summary>
+        [System.ComponentModel.Description("Occurs when mouse remains still inside an day/week label of the calendar for an amount of time.")]
+        public event EventHandler LabelMouseHover;
+
+        /// <summary>
+        /// Occurs when SelectedDate property has changed.
+        /// </summary>
+        [System.ComponentModel.Description("Occurs when SelectedDate property has changed.")]
+        public event EventHandler DateChanged;
+
+        /// <summary>
+        /// Occurs when the user makes an explicit date selection using the mouse. 
+        /// <remarks>
+        /// </remarks>
+        /// This event is similar to the DateChanged event, but it occurs at the end of a date selection made using the mouse.
+        /// The DateChanged event occurs during any date selection, whether by mouse, keyboard, or code. You should handle this event
+        /// when you enable multiple date selection through MultiSelect property and want to be notified after the date selection has been
+        /// made. DateChanged event would fire each time selection changes during the selection of multiple dates.
+        /// </summary>
+        [Description("Occurs when the user makes an explicit date selection using the mouse.")]
+        public event DateRangeEventHandler DateSelected;
+        #endregion
+
+        #region Constructor
+        /// <summary>
+        /// Initializes a new instance of the MonthCalendarItem class.
+        /// </summary>
+        public MonthCalendarItem()
+        {
+            _Colors.Parent = this;
+
+            // At least one month is always visible
+            SingleMonthCalendar m = new SingleMonthCalendar();
+            m.MonthChanging += new EventHandler(FirstCalendarMonthChanging);
+            m.MonthChanged += new EventHandler(FirstCalendarMonthChanged);
+            m.PaintLabel += new DayPaintEventHandler(InternalPaintLabel);
+            m.LabelMouseDown += new System.Windows.Forms.MouseEventHandler(InternalLabelMouseDown);
+            m.LabelMouseEnter += new EventHandler(InternalLabelMouseEnter);
+            m.LabelMouseHover += new EventHandler(InternalLabelMouseHover);
+            m.LabelMouseLeave += new EventHandler(InternalLabelMouseLeave);
+            m.LabelMouseMove += new System.Windows.Forms.MouseEventHandler(InternalLabelMouseMove);
+            m.LabelMouseUp += new System.Windows.Forms.MouseEventHandler(InternalLabelMouseUp);
+            m.NavigationBackgroundStyle.StyleChanged += new EventHandler(FirstCalendarBackStyleChanged);
+            m.DateChanged += new EventHandler(SingleMonthSelectedDateChanged);
+            this.SubItems.Add(m);
+
+            _BottomContainer = new ItemContainer();
+            _BottomContainer.AutoCollapseOnClick = false;
+            _BottomContainer.Visible = false;
+            _BottomContainer.HorizontalItemAlignment = eHorizontalItemsAlignment.Center;
+            _BottomContainer.LayoutOrientation = eOrientation.Horizontal;
+            _BottomContainer.ItemSpacing = 6;
+            _BottomContainer.Name = _BottomContainerName;
+
+            _TodayButton = CreateTodayButton();
+            _BottomContainer.SubItems.Add(_TodayButton);
+            _ClearButton = CreateClearButton();
+            _BottomContainer.SubItems.Add(_ClearButton);
+
+            this.SubItems.Add(_BottomContainer);
+
+            UpdateSystemButtonsVisibility();
+        }
+        #endregion
+
+        #region Internal Implementation
+        internal void DropDownClosed()
+        {
+            foreach (BaseItem item in this.SubItems)
+            {
+                SingleMonthCalendar m = item as SingleMonthCalendar;
+                if (m == null) continue;
+                m.DropDownClosed();
+            }
+        }
+
+        public override void RecalcSize()
+        {
+            SingleMonthCalendar m = this.SubItems[0] as SingleMonthCalendar;
+            if (m == null)
+                return;
+            _UpdatingSelectedDate = true;
+            int index = 1;
+            int monthsVisible = 1;
+            DateTime currentMonth = _DisplayMonth;
+            Size newSize = Size.Empty;
+            bool disposeStyle = false;
+            ElementStyle backStyle = GetRenderBackgroundStyle(out disposeStyle);
+            Rectangle bounds = ElementStyleLayout.GetInnerRect(backStyle, this.Bounds);
+            SingleMonthCalendar firstCalendarMonth = m;
+            SingleMonthCalendar lastCalendarMonth = null;
+            m.TrailingDaysVisible = false;
+            m.DisplayMonth = currentMonth;
+            m.LeftInternal = bounds.X;
+            m.TopInternal = bounds.Y;
+            m.RecalcSize();
+            m.Displayed = true;
+            m.MouseSelectionEnabled = !_MultiSelect;
+            if (!_MultiSelect)
+                UpdateSelectedDates(m);
+            else
+                m.SelectedDate = DateTime.MinValue;
+            newSize = m.Size;
+            Size defaultSize = m.Size;
+
+            Point location = bounds.Location;
+            location.X += defaultSize.Width + _Spacing.Width;
+            int lineWidth = newSize.Width;
+            Size columnRows = new Size(1, 1);
+            while (location.Y < bounds.Bottom && _CalendarDimensions.IsEmpty || !_CalendarDimensions.IsEmpty && _CalendarDimensions.Height + 1 > columnRows.Height)
+            {
+                if (index < this.SubItems.Count && this.SubItems[index] == _BottomContainer)
+                    index++;
+
+                if (location.X + defaultSize.Width > bounds.Right && _CalendarDimensions.IsEmpty || !_CalendarDimensions.IsEmpty && columnRows.Width >= _CalendarDimensions.Width)
+                {
+                    location.Y += defaultSize.Height + _Spacing.Height;
+                    location.X = bounds.X;
+
+                    if (lineWidth > newSize.Width)
+                        newSize.Width = lineWidth - (columnRows.Height > 1 ? _Spacing.Width : 0);
+                    lineWidth = 0;
+                    columnRows.Height++;
+                    columnRows.Width = 0;
+                    if (location.Y + defaultSize.Height > bounds.Bottom && _CalendarDimensions.IsEmpty ||
+                        !_CalendarDimensions.IsEmpty && columnRows.Height > _CalendarDimensions.Height)
+                        break;
+                    newSize.Height += defaultSize.Height + _Spacing.Height;
+                }
+
+                if (this.SubItems.Count == index)
+                {
+                    m = new SingleMonthCalendar();
+                    m.DaySize = firstCalendarMonth.DaySize;
+                    m.Visible = true;
+                    m.Displayed = true;
+                    m.TrailingDaysVisible = false;
+                    m.HeaderNavigationEnabled = false;
+                    m.PaintLabel += new DayPaintEventHandler(InternalPaintLabel);
+                    m.LabelMouseDown += new System.Windows.Forms.MouseEventHandler(InternalLabelMouseDown);
+                    m.LabelMouseEnter += new EventHandler(InternalLabelMouseEnter);
+                    m.LabelMouseHover += new EventHandler(InternalLabelMouseHover);
+                    m.LabelMouseLeave += new EventHandler(InternalLabelMouseLeave);
+                    m.LabelMouseMove += new System.Windows.Forms.MouseEventHandler(InternalLabelMouseMove);
+                    m.LabelMouseUp += new System.Windows.Forms.MouseEventHandler(InternalLabelMouseUp);
+                    m.NavigationBackgroundStyle.ApplyStyle(firstCalendarMonth.NavigationBackgroundStyle);
+                    m.DateChanged += new EventHandler(SingleMonthSelectedDateChanged);
+                    ApplyCommonProperties(m);
+                    if (this.SubItems[this.SubItems.Count - 1] == _BottomContainer)
+                        this.SubItems.Insert(this.SubItems.Count - 1, m);
+                    else
+                        this.SubItems.Add(m);
+                }
+                else
+                    m = (SingleMonthCalendar)this.SubItems[index];
+                m.TwoLetterDayName = this.TwoLetterDayName;
+                m.MinDate = this.MinDate;
+                m.MaxDate = this.MaxDate;
+                m.WeekOfYearRule = this.WeekOfYearRule;
+                m.WeekendDaysSelectable = this.WeekendDaysSelectable;
+                m.TodayDate = this.TodayDate;
+                m.ShowTodayMarker = this.ShowTodayMarker;
+                m.ShowWeekNumbers = this.ShowWeekNumbers;
+                m.FirstDayOfWeek = this.FirstDayOfWeek;
+                m.DayNames = this.DayNames;
+                m.TrailingDaysVisible = false;
+                m.MouseSelectionEnabled = !_MultiSelect;
+                if (!_MultiSelect)
+                    UpdateSelectedDates(m);
+                else
+                    m.SelectedDate = DateTime.MinValue;
+
+                index++;
+                monthsVisible++;
+                columnRows.Width++;
+
+                lineWidth += _Spacing.Width;
+                m.TopInternal = location.Y;
+                m.LeftInternal = location.X;
+                currentMonth = currentMonth.AddMonths(1);
+                m.DisplayMonth = currentMonth;
+                m.RecalcSize();
+                lastCalendarMonth = m;
+                lineWidth += m.WidthInternal;
+                location.X += m.WidthInternal + _Spacing.Width;
+            }
+
+            for (int i = index; i < this.SubItems.Count; i++)
+            {
+                m = this.SubItems[i] as SingleMonthCalendar;
+                if (m != null)
+                {
+                    m.PaintLabel -= new DayPaintEventHandler(InternalPaintLabel);
+                    m.LabelMouseDown -= new System.Windows.Forms.MouseEventHandler(InternalLabelMouseDown);
+                    m.LabelMouseEnter -= new EventHandler(InternalLabelMouseEnter);
+                    m.LabelMouseHover -= new EventHandler(InternalLabelMouseHover);
+                    m.LabelMouseLeave -= new EventHandler(InternalLabelMouseLeave);
+                    m.LabelMouseMove -= new System.Windows.Forms.MouseEventHandler(InternalLabelMouseMove);
+                    m.LabelMouseUp -= new System.Windows.Forms.MouseEventHandler(InternalLabelMouseUp);
+                    m.DateChanged -= new EventHandler(SingleMonthSelectedDateChanged);
+                }
+                if (this.SubItems[i] != _BottomContainer)
+                    this.SubItems.Remove(i);
+            }
+
+            // Bottom container
+            if (_BottomContainerName != null && _BottomContainer.Visible)
+            {
+                ItemContainer cont = _BottomContainer;
+                cont.Displayed = true;
+                cont.TopInternal = location.Y;
+                cont.LeftInternal = location.X;
+                cont.WidthInternal = newSize.Width;
+                cont.RecalcSize();
+                cont.WidthInternal = newSize.Width;
+                newSize.Height += cont.HeightInternal + _Spacing.Height;
+            }
+
+            newSize.Width += ElementStyleLayout.HorizontalStyleWhiteSpace(backStyle);
+            newSize.Height += ElementStyleLayout.VerticalStyleWhiteSpace(backStyle);
+
+            if (this.SubItems.Count == 1 || this.SubItems.Count == 2 && _BottomContainer != null)
+            {
+                firstCalendarMonth._TrailingDaysAfterVisible = true;
+                firstCalendarMonth._TrailingDaysBeforeVisible = true;
+                firstCalendarMonth.TrailingDaysVisible = true;
+            }
+            else
+            {
+                firstCalendarMonth._TrailingDaysAfterVisible = false;
+                firstCalendarMonth._TrailingDaysBeforeVisible = true;
+                firstCalendarMonth.TrailingDaysVisible = true;
+                lastCalendarMonth._TrailingDaysAfterVisible = true;
+                lastCalendarMonth._TrailingDaysBeforeVisible = false;
+                lastCalendarMonth.TrailingDaysVisible = true;
+            }
+            firstCalendarMonth.NavigationMonthsAheadVisibility = monthsVisible;
+            this.Bounds = new Rectangle(this.Bounds.Location, newSize);
+            base.RecalcSize();
+            ApplySelection();
+            OnMonthChanged(new EventArgs());
+            _UpdatingSelectedDate = false;
+
+            if(disposeStyle) backStyle.Dispose();
+        }
+
+        private void ApplyCommonProperties(SingleMonthCalendar m)
+        {
+            m.DisplayMonth = DateTime.Today;
+            m.DayClickAutoClosePopup = _DayClickAutoClosePopup;
+            m.YearSelectionEnabled = _YearSelectionEnabled;
+            m.MonthSelectionMode = _MonthSelectionMode;
+            m.MonthSelectorShortMonthNames = _MonthSelectorShortMonthNames;
+        }
+
+        protected internal override void OnItemAdded(BaseItem item)
+        {
+            if (!(item is SingleMonthCalendar) && item != _BottomContainer)
+                throw new InvalidOperationException("MultiMonthCalendar can only accept CalendarMonth items.");
+            base.OnItemAdded(item);
+        }
+
+        /// <summary>
+        /// Returns copy of the item.
+        /// </summary>
+        public override BaseItem Copy()
+        {
+            MonthCalendarItem objCopy = new MonthCalendarItem();
+            this.CopyToItem(objCopy);
+            return objCopy;
+        }
+
+        /// <summary>
+        /// Copies the CalendarMonth specific properties to new instance of the item.
+        /// </summary>
+        /// <param name="c">New ButtonItem instance.</param>
+        internal void InternalCopyToItem(MonthCalendarItem copy)
+        {
+            CopyToItem(copy);
+        }
+
+        /// <summary>
+        /// Copies the CalendarMonth specific properties to new instance of the item.
+        /// </summary>
+        /// <param name="c">New ButtonItem instance.</param>
+        protected override void CopyToItem(BaseItem c)
+        {
+            MonthCalendarItem copy = c as MonthCalendarItem;
+            copy.AnnuallyMarkedDates = this.AnnuallyMarkedDates;
+            copy.CalendarDimensions = this.CalendarDimensions;
+            copy.ClearButtonVisible = this.ClearButtonVisible;
+            copy.CommandsBackgroundStyle.ApplyStyle(this.CommandsBackgroundStyle);
+            copy.DayNames = this.DayNames;
+            copy.DaySize = this.DaySize;
+            copy.DisplayMonth = this.DisplayMonth;
+            copy.FirstDayOfWeek = this.FirstDayOfWeek;
+            copy.MarkedDates = this.MarkedDates;
+            copy.MaxDate = this.MaxDate;
+            copy.MaxSelectionCount = this.MaxSelectionCount;
+            copy.MinDate = this.MinDate;
+            copy.MonthlyMarkedDates = this.MonthlyMarkedDates;
+            copy.MultiSelect=this.MultiSelect;
+            copy.NavigationBackgroundStyle.ApplyStyle(this.NavigationBackgroundStyle);
+            copy.SelectedDate = this.SelectedDate;
+            copy.SelectionRange = this.SelectionRange;
+            copy.ShowTodayMarker = this.ShowTodayMarker;
+            copy.ShowWeekNumbers=this.ShowWeekNumbers;
+            copy.TodayButtonVisible = this.TodayButtonVisible;
+            copy.TodayDate = this.TodayDate;
+            copy.TwoLetterDayName = this.TwoLetterDayName;
+            copy.WeekendDaysSelectable = this.WeekendDaysSelectable;
+            copy.WeeklyMarkedDays = this.WeeklyMarkedDays;
+            copy.WeekOfYearRule=this.WeekOfYearRule;
+
+            this.Colors.AnnualMarker.ApplyTo(copy.Colors.AnnualMarker);
+            this.Colors.Day.ApplyTo(copy.Colors.Day);
+            this.Colors.DayLabel.ApplyTo(copy.Colors.DayLabel);
+            this.Colors.DayMarker.ApplyTo(copy.Colors.DayMarker);
+            copy.Colors.DaysDividerBorderColors = this.Colors.DaysDividerBorderColors;
+            this.Colors.MonthlyMarker.ApplyTo(copy.Colors.MonthlyMarker);
+            this.Colors.Selection.ApplyTo(copy.Colors.Selection);
+            this.Colors.Today.ApplyTo(copy.Colors.Today);
+            this.Colors.TrailingDay.ApplyTo(copy.Colors.TrailingDay);
+            this.Colors.TrailingWeekend.ApplyTo(copy.Colors.TrailingWeekend);
+            this.Colors.Weekend.ApplyTo(copy.Colors.Weekend);
+            this.Colors.WeeklyMarker.ApplyTo(copy.Colors.WeeklyMarker);
+            this.Colors.WeekOfYear.ApplyTo(copy.Colors.WeekOfYear);
+            
+            //base.CopyToItem(copy);
+        }
+
+        private int _MaxSelectionCount = 7;
+        /// <summary>
+        /// Gets or sets the maximum number of days that can be selected in a month calendar control. 
+        /// </summary>
+        [DefaultValue(7), Description("Gets or sets the maximum number of days that can be selected in a month calendar control.")]
+        public int MaxSelectionCount
+        {
+            get { return _MaxSelectionCount; }
+            set
+            {
+                _MaxSelectionCount = value;
+            }
+        }
+
+        private DateTime _SelectionStart = DateTime.MinValue;
+        /// <summary>
+        /// Gets or sets the start date of the selected range of dates. 
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public DateTime SelectionStart
+        {
+            get { return _SelectionStart; }
+            set
+            {
+                if (_SelectionStart != value)
+                {
+                    SetSelectionRange(value, (this.SelectionEnd == DateTime.MinValue ? value : this.SelectionEnd));
+                }
+            }
+        }
+
+        private DateTime _SelectionEnd = DateTime.MinValue;
+        /// <summary>
+        /// Gets or sets the end date of the selected range of dates. 
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public DateTime SelectionEnd
+        {
+            get { return _SelectionEnd; }
+            set
+            {
+                if (_SelectionEnd != value)
+                {
+                    SetSelectionRange((this.SelectionStart == DateTime.MinValue ? value : this.SelectionStart), value);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the selected range of dates for a month calendar control. 
+        /// <remarks>
+        /// Setting this property is functionally equivalent to using the SetSelectionRange method. You can set the start and end dates separately by setting either the SelectionStart or SelectionEnd properties. You cannot change the start and end dates by setting the SelectionRange.Start or SelectionRange.End property values of the SelectionRange property. You should use SelectionStart, SelectionEnd, or SetSelectionRange.
+        /// If the Start property value of the SelectionRange is greater than its End property value, the dates are swapped; the End property value becomes the starting date, and Start property value becomes the end date.</remarks>
+        /// </summary>
+        [Bindable(true), Description("Indicates selected range of dates for a month calendar control.")]
+        public SelectionRange SelectionRange
+        {
+            get
+            {
+                return new SelectionRange(this.SelectionStart, this.SelectionEnd);
+            }
+            set
+            {
+                this.SetSelectionRange(value.Start, value.End);
+            }
+        }
+        /// <summary>
+        /// Returns whether property should be serialized by Windows Forms desginer.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeSelectionRange()
+        {
+            return !DateTime.Equals(this.SelectionEnd, this.SelectionStart);
+        }
+
+        /// <summary>
+        /// Sets the selected dates in a month calendar control to the specified date range. 
+        /// </summary>
+        /// <param name="startDate">The beginning date of the selection range.</param>
+        /// <param name="endDate">The end date of the selection range.</param>
+        /// <exception cref="ArgumentOutOfRangeException">startDate is less than the minimum date allowable for a month calendar control.<br />
+        /// -or- <br />
+        /// startDate is greater than the maximum allowable date for a month calendar control.<br />
+        /// -or- <br />
+        /// endDate is less than the minimum date allowable for a month calendar control.<br />
+        /// -or- endDate is greater than the maximum allowable date for a month calendar control. <br />
+        /// </exception>
+        /// <remarks>
+        /// If the startDate value is greater than endDate property value, the dates are swapped; the endDate value becomes the starting date, and startDate value becomes the end date.
+        /// </remarks>
+        public void SetSelectionRange(DateTime startDate, DateTime endDate)
+        {
+            if (_SelectionStart != DateTime.MinValue || _SelectionEnd != DateTime.MinValue)
+            {
+                if (startDate > endDate)
+                {
+                    DateTime d = startDate;
+                    startDate = endDate;
+                    endDate = d;
+                }
+
+                // Validate dates
+                if (startDate < this.MinDate)
+                    throw new ArgumentOutOfRangeException(
+                        "startDate is less than the minimum date allowable for a month calendar control");
+                else if (startDate > this.MaxDate)
+                    throw new ArgumentOutOfRangeException(
+                        "startDate is greater than the maximum allowable date for a month calendar control");
+                else if (endDate < this.MinDate)
+                    throw new ArgumentOutOfRangeException(
+                        "endDate is less than the minimum date allowable for a month calendar control");
+                else if (endDate > this.MaxDate)
+                    throw new ArgumentOutOfRangeException(
+                        "endDate is greater than the maximum allowable date for a month calendar control");
+            }
+
+            _SelectionStart = startDate;
+            _SelectionEnd = endDate;
+
+            ApplySelection();
+
+            OnDateChanged(new EventArgs());
+        }
+
+        /// <summary>
+        /// Applies current date selection to the control. You are usually not required to make calls to this method directly since it is automatically
+        /// done by the control when selection changes. This method returns immediately if MultiSelect
+        /// property is set to false or SelectionStart or SelectionEnd properties have DateTime.MinValue.
+        /// </summary>
+        public void ApplySelection()
+        {
+            if (!_MultiSelect || _SelectionStart == DateTime.MinValue || _SelectionEnd == DateTime.MinValue) return;
+
+            DateTime start = _SelectionStart, end = _SelectionEnd;
+
+            foreach (BaseItem item in this.SubItems)
+            {
+                SingleMonthCalendar m = item as SingleMonthCalendar;
+                if (m == null) continue;
+                foreach (BaseItem item2 in m.SubItems)
+                {
+                    DayLabel day = item2 as DayLabel;
+                    if (day == null || !day.Selectable || day.Date == DateTime.MinValue) continue;
+                    if (day.Date >= start && day.Date <= end)
+                        day.IsSelected = true;
+                    else
+                        day.IsSelected = false;
+                }
+            }
+        }
+
+        private bool _MultiSelect = false;
+        /// <summary>
+        /// Gets or sets whether selection of multiple dates up to the MaxSelectionCount is enabled. Default value is false which indicates that only
+        /// single day can be selected.
+        /// </summary>
+        [DefaultValue(false), Description("Indicates whether selection of multiple dates up to the MaxSelectionCount is enabled.")]
+        public bool MultiSelect
+        {
+            get { return _MultiSelect; }
+            set
+            {
+                if (_MultiSelect != value)
+                {
+                    _MultiSelect = value;
+                    OnMultiSelectChanged();
+                }
+            }
+        }
+
+        private void OnMultiSelectChanged()
+        {
+            foreach (BaseItem item in this.SubItems)
+            {
+                SingleMonthCalendar m = item as SingleMonthCalendar;
+                if (m != null)
+                {
+                    m.MouseSelectionEnabled = !_MultiSelect;
+                    if (_MultiSelect)
+                        m.SelectedDate = DateTime.MinValue;
+                }
+            }
+        }
+
+        Point _MouseDownLocation = Point.Empty;
+        DateTime _MouseDownDate = DateTime.MinValue;
+        public override void InternalMouseDown(MouseEventArgs objArg)
+        {
+            base.InternalMouseDown(objArg);
+            if (!_MultiSelect || objArg.Button != MouseButtons.Left) return;
+            int x = objArg.X, y = objArg.Y;
+            _MouseDownLocation = new Point(x, y);
+
+            DayLabel day = GetDayAt(x, y);
+            if (day != null && day.Date > this.MinDate && day.Date < this.MaxDate)
+            {
+                _MouseDownDate = day.Date;
+                SetSelectionRange(day.Date, day.Date);
+            }
+        }
+
+        /// <summary>
+        /// Returns the DayLabel at given client coordinates or null/nothing if there is no label at give location.
+        /// </summary>
+        /// <param name="x">X - position in client coordinates.</param>
+        /// <param name="y">Y - position in client coordinates.</param>
+        /// <returns>DayLabel at given coordinates or null/nothing.</returns>
+        public DayLabel GetDayAt(int x, int y)
+        {
+            BaseItem item = ItemAtLocation(x, y);
+            if (item != null && item is SingleMonthCalendar)
+            {
+                DayLabel day = item.ItemAtLocation(x, y) as DayLabel;
+                if (day != null && day.Date > DateTime.MinValue)
+                {
+                    return day;
+                }
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Returns the DayLabel that represents the date.
+        /// </summary>
+        /// <param name="date">Date to find label for.</param>
+        /// <returns>DayLabel object or nothing if date cannot be founds.</returns>
+        public DayLabel GetDay(DateTime date)
+        {
+            foreach (BaseItem item in this.SubItems)
+            {
+                SingleMonthCalendar mc = item as SingleMonthCalendar;
+                if (mc != null)
+                {
+                    DayLabel day = mc.GetDayLabel(date);
+                    if (day != null) return day;
+                }
+            }
+
+            return null;
+        }
+
+        public override void InternalMouseMove(MouseEventArgs objArg)
+        {
+            base.InternalMouseMove(objArg);
+            if (!_MultiSelect || objArg.Button != MouseButtons.Left) return;
+
+            DayLabel day = GetDayAt(objArg.X, objArg.Y);
+            if (day != null && this.SelectionStart > DateTime.MinValue)
+            {
+                DateTime end = day.Date;
+                DateTime start = _MouseDownDate;
+                if (Math.Abs(start.Subtract(end).TotalDays) > this.MaxSelectionCount)
+                    end = start.AddDays((this.MaxSelectionCount - 1) * Math.Sign(end.Subtract(start).TotalDays));
+
+                if (start < MinDate) start = MinDate;
+                if (start > MaxDate) start = MaxDate;
+                if (end > MaxDate) end = MaxDate;
+                if (end < MinDate) end = MinDate;
+
+                this.SetSelectionRange(start, end);
+            }
+        }
+
+        public override void InternalMouseUp(MouseEventArgs objArg)
+        {
+            base.InternalMouseUp(objArg);
+            if (objArg.Button == MouseButtons.Left && _MouseDownDate > DateTime.MinValue)
+            {
+                _MouseDownDate = DateTime.MinValue;
+                OnDateSelected(new DateRangeEventArgs(this.SelectionStart, this.SelectionEnd));
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the array of DateTime objects that determine which monthly days to mark using Colors.MonthlyMarker settings. 
+        /// </summary>
+        [Localizable(true), Description("Indicates array of DateTime objects that determine which monthly days to mark using Colors.MonthlyMarker settings. ")]
+        public DateTime[] MonthlyMarkedDates
+        {
+            get { return _MonthlyMarkedDates.ToArray(); }
+            set
+            {
+                OnMonthlyMarkedDatesChanged(value);
+            }
+        }
+        /// <summary>
+        /// Returns whether property should be serialized. Provided for Windows Forms designer support.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeMonthlyMarkedDates()
+        {
+            return _MonthlyMarkedDates.Count > 0;
+        }
+        /// <summary>
+        /// Resets property to its default value. Provided for Windows Forms designer support.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetMonthlyMarkedDates()
+        {
+            MonthlyMarkedDates = null;
+        }
+
+        private void OnMonthlyMarkedDatesChanged(DateTime[] dates)
+        {
+            _MonthlyMarkedDates.Clear();
+            if (dates != null)
+                _MonthlyMarkedDates.AddRange(dates);
+            if (this.GetDesignMode())
+                UpdateMarkedDates();
+        }
+
+        /// <summary>
+        /// Removes all monthly marked dates. Note that you must call UpdateMarkedDates method to reflect these changes on calendar.
+        /// </summary>
+        public void RemoveAllMonthlyMarkedDates()
+        {
+            MonthlyMarkedDates = null;
+        }
+
+        /// <summary>
+        /// Removes the date from the MonthlyMarkedDates. Note that you must call UpdateMarkedDates method to reflect these changes on calendar.
+        /// </summary>
+        /// <param name="dt"></param>
+        public void RemoveMonthlyMarkedDate(DateTime dt)
+        {
+            DateTime[] dates = this.MonthlyMarkedDates;
+            foreach (DateTime d in dates)
+            {
+                if (d.Day == dt.Day)
+                    _MonthlyMarkedDates.Remove(d);
+            }
+        }
+
+        private List<DayOfWeek> _WeeklyMarkedDays = new List<DayOfWeek>();
+        /// <summary>
+        /// Gets or sets the array of DayOfWeek members that determine which days of week to mark using Colors.WeeklyMarker settings. 
+        /// </summary>
+        [Localizable(true), Description("Indicates array of DayOfWeek members that determine which days of week to mark using Colors.WeeklyMarker settings. ")]
+        public DayOfWeek[] WeeklyMarkedDays
+        {
+            get { return _WeeklyMarkedDays.ToArray(); }
+            set
+            {
+                OnWeeklyMarkedDaysChanged(value);
+            }
+        }
+        /// <summary>
+        /// Returns whether property should be serialized. Provided for Windows Forms designer support.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeWeeklyMarkedDays()
+        {
+            return _WeeklyMarkedDays.Count > 0;
+        }
+        /// <summary>
+        /// Resets property to its default value. Provided for Windows Forms designer support.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetWeeklyMarkedDays()
+        {
+            MonthlyMarkedDates = null;
+        }
+
+        private void OnWeeklyMarkedDaysChanged(DayOfWeek[] days)
+        {
+            _WeeklyMarkedDays.Clear();
+            if (days != null)
+                _WeeklyMarkedDays.AddRange(days);
+            if (this.GetDesignMode())
+                UpdateMarkedDates();
+        }
+
+        /// <summary>
+        /// Removes all weekly marked days. Note that you must call UpdateMarkedDates method to reflect these changes on calendar.
+        /// </summary>
+        public void RemoveAllWeeklyMarkedDays()
+        {
+            WeeklyMarkedDays = null;
+        }
+
+        /// <summary>
+        /// Removes the date from the MonthlyMarkedDates. Note that you must call UpdateMarkedDates method to reflect these changes on calendar.
+        /// </summary>
+        /// <param name="dt"></param>
+        public void RemoveWeeklyMarkedDay(DayOfWeek day)
+        {
+            DayOfWeek[] dates = this.WeeklyMarkedDays;
+            foreach (DayOfWeek d in dates)
+            {
+                if (d == day)
+                    _WeeklyMarkedDays.Remove(d);
+            }
+        }
+
+
+        /// <summary>
+        /// Gets or sets the array of DateTime objects that determines which annual days are marked using Colors.AnnualMarker settings.
+        /// </summary>
+        [Localizable(true), Description("Indicates array of DateTime objects that determines which annual days are marked using Colors.AnnualMarker settings.")]
+        public DateTime[] AnnuallyMarkedDates
+        {
+            get { return _AnnuallyMarkedDates.ToArray(); }
+            set
+            {
+                OnAnnuallyMarkedDatesChanged(value);
+            }
+        }
+        /// <summary>
+        /// Returns whether property should be serialized. Provided for Windows Forms designer support.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeAnnuallyMarkedDates()
+        {
+            return _AnnuallyMarkedDates.Count > 0;
+        }
+        /// <summary>
+        /// Resets property to its default value. Provided for Windows Forms designer support.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetAnnuallyMarkedDates()
+        {
+            AnnuallyMarkedDates = null;
+        }
+
+        private void OnAnnuallyMarkedDatesChanged(DateTime[] dates)
+        {
+            _AnnuallyMarkedDates.Clear();
+            if (dates != null)
+                _AnnuallyMarkedDates.AddRange(dates);
+            if (this.GetDesignMode())
+                UpdateMarkedDates();
+        }
+
+        /// <summary>
+        /// Removes all annually marked dates. Note that you must call UpdateMarkedDates method to reflect these changes on calendar.
+        /// </summary>
+        public void RemoveAllAnnuallyMarkedDates()
+        {
+            AnnuallyMarkedDates = null;
+        }
+
+        /// <summary>
+        /// Removes the date from the AnnuallyMarkedDates. Note that you must call UpdateMarkedDates method to reflect these changes on calendar.
+        /// </summary>
+        /// <param name="dt"></param>
+        public void RemoveAnnuallyMarkedDate(DateTime dt)
+        {
+            DateTime[] dates = this.AnnuallyMarkedDates;
+            foreach (DateTime d in dates)
+            {
+                if (d.Month == dt.Month && dt.Day == d.Day)
+                    _AnnuallyMarkedDates.Remove(d);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the array of DateTime objects that determines which nonrecurring dates are marked using Colors.DayMarker settings. 
+        /// </summary>
+        [Localizable(true), Description("Indicates array of DateTime objects that determines which nonrecurring dates are marked using Colors.DayMarker settings.")]
+        public DateTime[] MarkedDates
+        {
+            get { return _MarkedDates.ToArray(); }
+            set
+            {
+                OnMarkedDatesChanged(value);
+            }
+        }
+        /// <summary>
+        /// Returns whether property should be serialized. Provided for Windows Forms designer support.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeMarkedDates()
+        {
+            return _MarkedDates.Count > 0;
+        }
+        /// <summary>
+        /// Resets property to its default value. Provided for Windows Forms designer support.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetMarkedDates()
+        {
+            MarkedDates = null;
+        }
+
+        private void OnMarkedDatesChanged(DateTime[] dates)
+        {
+            _MarkedDates.Clear();
+            if (dates != null)
+                _MarkedDates.AddRange(dates);
+            if (this.GetDesignMode())
+                UpdateMarkedDates();
+        }
+
+        /// <summary>
+        /// Removes all marked dates set through MarkedDates property. Note that you must call UpdateMarkedDates method to reflect these changes on calendar.
+        /// </summary>
+        public void RemoveAllMarkedDates()
+        {
+            MarkedDates = null;
+        }
+
+        /// <summary>
+        /// Removes the date from the MarkedDates collection. Note that you must call UpdateMarkedDates method to reflect these changes on calendar.
+        /// </summary>
+        /// <param name="dt"></param>
+        public void RemoveMarkedDate(DateTime dt)
+        {
+            DateTime[] dates = this.MarkedDates;
+            foreach (DateTime d in dates)
+            {
+                if (d == dt)
+                    _MarkedDates.Remove(d);
+            }
+        }
+
+        /// <summary>
+        /// Repaints the marked dates to reflect the dates set in the lists of marked dates.
+        /// Use this method to reflect the changes made to the AnnuallyMarkedDates, MonthlyMarkedDates or MarkedDates properties as well
+        /// as change to the marked Colors properties.
+        /// </summary>
+        public void UpdateMarkedDates()
+        {
+            this.DisplayMonth = _DisplayMonth;
+        }
+
+        private bool GetDesignMode()
+        {
+            if (this.DesignMode) return true;
+            if(this.ContainerControl is MonthCalendarAdv)
+                return ((MonthCalendarAdv)this.ContainerControl).GetDesignModeInternal();
+            return false;
+        }
+
+        private DateTime _DisplayMonth = new DateTime(DateTime.Now.Year, DateTime.Now.Month, 1);
+        /// <summary>
+        /// Gets or sets the first month displayed by the control.
+        /// </summary>
+        [Description("Indicates the first month displayed on the control.")]
+        public DateTime DisplayMonth
+        {
+            get { return _DisplayMonth; }
+            set
+            {
+                _DisplayMonth = value.Date;
+                m_NeedRecalcSize = true;
+
+                if(this.ContainerControl is Control)
+                    BarFunctions.InvokeRecalcLayout((Control)this.ContainerControl, true);
+                ApplySelection();
+                this.Refresh();
+            }
+        }
+
+        /// <summary>
+        /// Gets number of months displayed on the control.
+        /// </summary>
+        [Browsable(false)]
+        public int DisplayedMonthCount
+        {
+            get 
+            {
+                int c = 0;
+                foreach (BaseItem item in this.SubItems)
+                {
+                    if (item is SingleMonthCalendar)
+                        c++;
+                }
+                return c;
+            }
+        }
+        
+
+        private void FirstCalendarMonthChanging(object sender, EventArgs e)
+        {
+            OnMonthChanging(e);
+        }
+
+        private void FirstCalendarMonthChanged(object sender, EventArgs e)
+        {
+            DevComponents.DotNetBar.Events.EventSourceArgs source = e as DevComponents.DotNetBar.Events.EventSourceArgs;
+            if (source != null && source.Source == eEventSource.Mouse)
+            {
+                SingleMonthCalendar m = this.SubItems[0] as SingleMonthCalendar;
+                _DisplayMonth = m.DisplayMonth;
+                DateTime currentMonth = _DisplayMonth.AddMonths(1);
+                _UpdatingSelectedDate = true;
+                for (int i = 1; i < this.SubItems.Count; i++)
+                {
+                    SingleMonthCalendar month = this.SubItems[i] as SingleMonthCalendar;
+                    if (month != null)
+                    {
+                        month.DisplayMonth = currentMonth;
+                        currentMonth = currentMonth.AddMonths(1);
+                        UpdateSelectedDates(month);
+                    }
+                }
+                _UpdatingSelectedDate = false;
+                this.NeedRecalcSize = false;
+
+                ApplySelection();
+            }
+            if (!this.NeedRecalcSize)
+                OnMonthChanged(e);
+        }
+
+        private MonthCalendarColors _Colors = new MonthCalendarColors();
+        /// <summary>
+        /// Gets the calendar colors used by the control.
+        /// </summary>
+        [NotifyParentPropertyAttribute(true), Category("Appearance"), Description("Gets colors used by control."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public MonthCalendarColors Colors
+        {
+            get { return _Colors; }
+        }
+
+        /// <summary>
+        /// Raises the MonthChanged event.
+        /// </summary>
+        /// <param name="e">Provides additional event data.</param>
+        protected virtual void OnMonthChanged(EventArgs e)
+        {
+            if (MonthChanged != null)
+            {
+                bool b = this.NeedRecalcSize;
+                MonthChanged(this, e);
+                if (this.NeedRecalcSize != b)
+                    this.NeedRecalcSize = false;
+            }
+        }
+
+        /// <summary>
+        /// Raises the MonthChanging event.
+        /// </summary>
+        /// <param name="e">Provides additional event data.</param>
+        protected virtual void OnMonthChanging(EventArgs e)
+        {
+            if (MonthChanging != null)
+                MonthChanging(this, e);
+        }
+
+
+        private void InternalPaintLabel(object sender, DayPaintEventArgs e)
+        {
+            OnPaintLabel(e._Item, e);
+        }
+
+        /// <summary>
+        /// Raises the PaintLabel event.
+        /// </summary>
+        /// <param name="e">Provides event data.</param>
+        protected virtual void OnPaintLabel(DayLabel label, DayPaintEventArgs e)
+        {
+            if (PaintLabel != null)
+                PaintLabel(label, e);
+        }
+
+        private void InternalLabelMouseUp(object sender, System.Windows.Forms.MouseEventArgs e)
+        {
+            OnLabelMouseUp(sender, e);
+        }
+
+        private void InternalLabelMouseMove(object sender, System.Windows.Forms.MouseEventArgs e)
+        {
+            OnLabelMouseMove(sender, e);
+        }
+
+        private void InternalLabelMouseLeave(object sender, EventArgs e)
+        {
+            OnLabelMouseLeave(sender, e);
+        }
+
+        private void InternalLabelMouseHover(object sender, EventArgs e)
+        {
+            OnLabelMouseHover(sender, e);
+        }
+
+        private void InternalLabelMouseEnter(object sender, EventArgs e)
+        {
+            OnLabelMouseEnter(sender, e);
+        }
+
+        private void InternalLabelMouseDown(object sender, System.Windows.Forms.MouseEventArgs e)
+        {
+            OnLabelMouseDown(sender, e);
+        }
+
+        /// <summary>
+        /// Raises the LabelMouseDown event.
+        /// </summary>
+        /// <param name="e">Provides event data.</param>
+        protected virtual void OnLabelMouseDown(object sender, MouseEventArgs e)
+        {
+            if (LabelMouseDown != null)
+                LabelMouseDown(sender, e);
+        }
+
+        /// <summary>
+        /// Raises the LabelMouseUp event.
+        /// </summary>
+        /// <param name="e">Provides event data.</param>
+        protected virtual void OnLabelMouseUp(object sender, MouseEventArgs e)
+        {
+            if (LabelMouseUp != null)
+                LabelMouseUp(sender, e);
+        }
+
+        /// <summary>
+        /// Raises the LabelMouseEnter event.
+        /// </summary>
+        /// <param name="e">Provides event data.</param>
+        protected virtual void OnLabelMouseEnter(object sender, EventArgs e)
+        {
+            if (LabelMouseEnter != null)
+                LabelMouseEnter(sender, e);
+        }
+
+        /// <summary>
+        /// Raises the LabelMouseLeave event.
+        /// </summary>
+        /// <param name="e">Provides event data.</param>
+        protected virtual void OnLabelMouseLeave(object sender, EventArgs e)
+        {
+            if (LabelMouseLeave != null)
+                LabelMouseLeave(sender, e);
+        }
+
+        /// <summary>
+        /// Raises the LabelMouseMove event.
+        /// </summary>
+        /// <param name="e">Provides event data.</param>
+        protected virtual void OnLabelMouseMove(object sender, MouseEventArgs e)
+        {
+            if (LabelMouseMove != null)
+                LabelMouseMove(sender, e);
+        }
+
+        /// <summary>
+        /// Raises the LabelMouseHover event.
+        /// </summary>
+        /// <param name="e">Provides event data.</param>
+        protected virtual void OnLabelMouseHover(object sender, EventArgs e)
+        {
+            if (LabelMouseHover != null)
+                LabelMouseHover(sender, e);
+        }
+
+        private SingleMonthCalendar FirstCalendar
+        {
+            get
+            {
+                return ((SingleMonthCalendar)this.SubItems[0]);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the size of each day item on the calendar. Default value is 24, 15.
+        /// </summary>
+        [Description("Indicate size of each day item on the calendar.")]
+        public Size DaySize
+        {
+            get { return FirstCalendar.DaySize; }
+            set
+            {
+                foreach (BaseItem item in this.SubItems)
+                {
+                    SingleMonthCalendar m = item as SingleMonthCalendar;
+                    if (m != null)
+                        m.DaySize = value;
+                }
+                this.NeedRecalcSize = true;
+                OnAppearanceChanged();
+                this.Refresh();
+            }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized. Provided for designer support.
+        /// </summary>
+        /// <returns></returns>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeDaySize()
+        {
+            return DaySize.Width != SingleMonthCalendar._DefaultDaySize.Width || DaySize.Height != SingleMonthCalendar._DefaultDaySize.Height;
+        }
+        /// <summary>
+        /// Reset property to default value. Provided for designer support.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetDaySize()
+        {
+            this.DaySize = SingleMonthCalendar._DefaultDaySize;
+        }
+
+        /// <summary>
+        /// Gets or sets the size of date navigation buttons on the calendar. Default value is 13, 18. If you increase size of the navigation
+        /// buttons change DaySize as well so everything fits.
+        /// </summary>
+        [Description("Indicate size of date navigation buttons on the calendar. If you increase size of the navigation buttons change DaySize as well so everything fits.")]
+        public Size NavigationButtonSize
+        {
+            get { return FirstCalendar.NavigationButtonSize; }
+            set
+            {
+                foreach (BaseItem item in this.SubItems)
+                {
+                    SingleMonthCalendar m = item as SingleMonthCalendar;
+                    if (m != null)
+                        m.NavigationButtonSize = value;
+                }
+                this.NeedRecalcSize = true;
+                OnAppearanceChanged();
+                this.Refresh();
+            }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized. Provided for designer support.
+        /// </summary>
+        /// <returns></returns>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeNavigationButtonSize()
+        {
+            return NavigationButtonSize.Width != SingleMonthCalendar._DefaultNavigationButtonSize.Width || NavigationButtonSize.Height != SingleMonthCalendar._DefaultNavigationButtonSize.Height;
+        }
+        /// <summary>
+        /// Reset property to default value. Provided for designer support.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetNavigationButtonSize()
+        {
+            this.NavigationButtonSize = SingleMonthCalendar._DefaultNavigationButtonSize;
+        }
+
+        /// <summary>
+        /// Gets or sets the minimum date and time that can be selected in the control.
+        /// </summary>
+        [Description("Indicates minimum date and time that can be selected in the control.")]
+        public System.DateTime MinDate
+        {
+            get { return FirstCalendar.MinDate; }
+            set
+            {
+                foreach (BaseItem item in this.SubItems)
+                {
+                    SingleMonthCalendar m = item as SingleMonthCalendar;
+                    if (m != null)
+                        m.MinDate = value;
+                }
+            }
+        }
+        /// <summary>
+        /// Gets whether Value property should be serialized by Windows Forms designer.
+        /// </summary>
+        /// <returns>true if value serialized otherwise false.</returns>
+        public bool ShouldSerializeMinDate()
+        {
+            return !MinDate.Equals(DateTimeGroup.MinDateTime);
+        }
+        /// <summary>
+        /// Reset the MinDate property to its default value.
+        /// </summary>
+        public void ResetMinDate()
+        {
+            MinDate = DateTimeGroup.MinDateTime;
+        }
+
+        /// <summary>
+        /// Gets or sets the maximum date and time that can be selected in the control.
+        /// </summary>
+        [Description("Indicates maximum date and time that can be selected in the control.")]
+        public System.DateTime MaxDate
+        {
+            get { return FirstCalendar.MaxDate; }
+            set
+            {
+                foreach (BaseItem item in this.SubItems)
+                {
+                    SingleMonthCalendar m = item as SingleMonthCalendar;
+                    if (m != null)
+                        m.MaxDate = value;
+                }
+            }
+        }
+        /// <summary>
+        /// Gets whether Value property should be serialized by Windows Forms designer.
+        /// </summary>
+        /// <returns>true if value serialized otherwise false.</returns>
+        public bool ShouldSerializeMaxDate()
+        {
+            return !MaxDate.Equals(DateTimeGroup.MaxDateTime);
+        }
+        /// <summary>
+        /// Reset the MaxDate property to its default value.
+        /// </summary>
+        public void ResetMaxDate()
+        {
+            MaxDate = DateTimeGroup.MaxDateTime;
+        }
+
+        /// <summary>
+        /// Specifies the commands container background style. Commands container displays Today and Clear buttons if they are visible.
+        /// </summary>
+        [Browsable(true), Category("Style"), Description("Specifies the commands container background style. Commands container displays Today and Clear buttons if they are visible."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ElementStyle CommandsBackgroundStyle
+        {
+            get { return _BottomContainer.BackgroundStyle; }
+        }
+
+        /// <summary>
+        /// Specifies the navigation container background style. Navigation container displays month, year and optional buttons. Default value is an empty style which means that container does not display any background.
+        /// BeginGroup property set to true will override this style on some styles.
+        /// </summary>
+        [Browsable(true), Category("Style"), Description("Indicates navigation container background style."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ElementStyle NavigationBackgroundStyle
+        {
+            get { return FirstCalendar.NavigationBackgroundStyle; }
+        }
+
+        private void FirstCalendarBackStyleChanged(object sender, EventArgs e)
+        {
+            SingleMonthCalendar firstMonth = FirstCalendar;
+            foreach (BaseItem item in this.SubItems)
+            {
+                SingleMonthCalendar m = item as SingleMonthCalendar;
+                if (m != null && m != firstMonth)
+                {
+                    m.NavigationBackgroundStyle.Reset();
+                    m.NavigationBackgroundStyle.ApplyStyle(firstMonth.NavigationBackgroundStyle);
+                }
+            }
+        }
+
+        private Size _CalendarDimensions = Size.Empty;
+        /// <summary>
+        /// Gets or sets the number of columns and rows of months displayed on control. Default value is 0,0 which indicates that
+        /// calendar will display as many columns and rows as it is possible to fit into container space available.
+        /// </summary>
+        [Description("Indicates number of columns and rows of months displayed on control.")]
+        public Size CalendarDimensions
+        {
+            get { return _CalendarDimensions; }
+            set
+            {
+                if (value.Width < 0 || value.Height < 0)
+                    throw new ArgumentOutOfRangeException("Calendar dimension values must be greater or equal to zero.");
+                if (value.Width == 0 && value.Height > 0 || value.Width > 0 && value.Height == 0)
+                    throw new ArgumentOutOfRangeException("Calendar dimension values must be both set to values grater than zero.");
+                if (_CalendarDimensions != value)
+                {
+                    _CalendarDimensions = value;
+                    NeedRecalcSize = true;
+                    OnAppearanceChanged();
+                    this.Refresh();
+                }
+            }
+        }
+        /// <summary>
+        /// Resets property to its default value. Provided for design-time support.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetCalendarDimensions()
+        {
+            CalendarDimensions = Size.Empty;
+        }
+        /// <summary>
+        /// Gets whether property should be serialized. Provided for design-time support.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeCalendarDimensions()
+        {
+            return CalendarDimensions != Size.Empty;
+        }
+
+        /// <summary>
+        /// Sets the number of columns and rows of months to display. 
+        /// </summary>
+        /// <param name="columns">The number of columns. </param>
+        /// <param name="rows">The number of rows. </param>
+        /// <remarks>ArgumentOutOfRangeException will be raised if any value is less than zero or one value is grater than zero and other is zero.</remarks>
+        public void SetCalendarDimensions(int columns, int rows)
+        {
+            this.CalendarDimensions = new Size(columns, rows);
+        }
+
+        /// <summary>
+        /// Gets or sets whether weekend days can be selected. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Description("Indicates whether weekend days can be selected.")]
+        public bool WeekendDaysSelectable
+        {
+            get { return FirstCalendar.WeekendDaysSelectable; }
+            set
+            {
+                if (WeekendDaysSelectable != value)
+                {
+                    foreach (BaseItem item in this.SubItems)
+                    {
+                        SingleMonthCalendar m = item as SingleMonthCalendar;
+                        if (m != null)
+                            m.WeekendDaysSelectable = value;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the rule used to determine first week of the year for week of year display on calendar. Default value is first-day.
+        /// </summary>
+        [DefaultValue(CalendarWeekRule.FirstDay), Description("Indicates rule used to determine first week of the year for week of year display on calendar.")]
+        public CalendarWeekRule WeekOfYearRule
+        {
+            get { return FirstCalendar.WeekOfYearRule; }
+            set
+            {
+                if (WeekOfYearRule != value)
+                {
+                    foreach (BaseItem item in this.SubItems)
+                    {
+                        SingleMonthCalendar m = item as SingleMonthCalendar;
+                        if (m != null)
+                            m.WeekOfYearRule = value;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the value that is used by calendar as today's date.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public DateTime TodayDate
+        {
+            get { return FirstCalendar.TodayDate; }
+            set
+            {
+                value = value.Date;
+                if (TodayDate != value)
+                {
+                    foreach (BaseItem item in this.SubItems)
+                    {
+                        SingleMonthCalendar m = item as SingleMonthCalendar;
+                        if (m != null)
+                            m.TodayDate = value;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether the TodayDate property has been explicitly set. 
+        /// </summary>
+        [Browsable(false)]
+        public bool TodayDateSet
+        {
+            get { return FirstCalendar.TodayDateSet; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether today marker that indicates TodayDate is visible on the calendar. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Description("Indicates whether today marker that indicates TodayDate is visible on the calendar.")]
+        public bool ShowTodayMarker
+        {
+            get { return FirstCalendar.ShowTodayMarker; }
+            set
+            {
+                if (ShowTodayMarker != value)
+                {
+                    foreach (BaseItem item in this.SubItems)
+                    {
+                        SingleMonthCalendar m = item as SingleMonthCalendar;
+                        if (m != null)
+                            m.ShowTodayMarker = value;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether week of year is visible. Default value is false.
+        /// </summary>
+        [DefaultValue(false), Description("Indicates whether week of year is visible.")]
+        public bool ShowWeekNumbers
+        {
+            get { return FirstCalendar.ShowWeekNumbers; }
+            set
+            {
+                if (ShowWeekNumbers != value)
+                {
+                    FirstCalendar.ShowWeekNumbers = value;
+                    NeedRecalcSize = true;
+                    this.OnAppearanceChanged();
+                    this.Refresh();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether control uses the two letter day names. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Description("Indicates whether control uses the two letter day names.")]
+        public bool TwoLetterDayName
+        {
+            get { return FirstCalendar.TwoLetterDayName; }
+            set
+            {
+                FirstCalendar.TwoLetterDayName = value;
+                NeedRecalcSize = true;
+                this.OnAppearanceChanged();
+                this.Refresh();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the array of custom names for days displayed on calendar header. The array must have exactly 7 elements representing day names from 0 to 6.
+        /// </summary>
+        [DefaultValue(null), Description("Indicates array of custom names for days displayed on calendar header."), Localizable(true)]
+        public string[] DayNames
+        {
+            get { return FirstCalendar.DayNames; }
+            set
+            {
+                if (value != null && value.Length != 7)
+                    throw new ArgumentException("DayNames must have exactly 7 items in collection.");
+                foreach (BaseItem item in this.SubItems)
+                {
+                    SingleMonthCalendar m = item as SingleMonthCalendar;
+                    if (m != null)
+                        m.DayNames = value;
+                }
+                NeedRecalcSize = true;
+                this.OnAppearanceChanged();
+                this.Refresh();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the first day of week displayed on the calendar. Default value is Sunday.
+        /// </summary>
+        [DefaultValue(DayOfWeek.Sunday), Description("Indicates first day of week displayed on the calendar.")]
+        public DayOfWeek FirstDayOfWeek
+        {
+            get { return FirstCalendar.FirstDayOfWeek; }
+            set
+            {
+                if (FirstDayOfWeek != value)
+                {
+                    foreach (BaseItem item in this.SubItems)
+                    {
+                        SingleMonthCalendar m = item as SingleMonthCalendar;
+                        if (m != null)
+                            m.FirstDayOfWeek = value;
+                    }
+                }
+                this.OnAppearanceChanged();
+                this.Refresh();
+            }
+        }
+
+        private bool _UpdatingSelectedDate = false;
+        private DateTime _SelectedDate = DateTime.MinValue;
+        /// <summary>
+        /// Gets or sets the calendar selected date. Note that SelectedDate property should be used only when MultiSelect property is set to false.
+        /// When multiple dates can be selected use range selection properties: SelectionStart, SelectionEnd and SelectionRange.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public DateTime SelectedDate
+        {
+            get
+            {
+                return _SelectedDate;
+            }
+            set
+            {
+                if (_SelectedDate != value)
+                {
+                    _SelectedDate = value;
+                    try
+                    {
+                        _UpdatingSelectedDate = true;
+                        foreach (BaseItem item in this.SubItems)
+                        {
+                            SingleMonthCalendar m = item as SingleMonthCalendar;
+                            if (m != null)
+                                UpdateSelectedDates(m);
+                        }
+                        OnDateChanged(new EventArgs());
+                        OnDateSelected(new DateRangeEventArgs(value, value));
+                    }
+                    finally
+                    {
+                        _UpdatingSelectedDate = false;
+                    }
+                }
+            }
+        }
+
+        private void UpdateSelectedDates(SingleMonthCalendar m)
+        {
+            if (m.MonthSelectionMode)
+                m.SelectedDate = _SelectedDate;
+            else if (m.DisplayMonth.Month == _SelectedDate.Month && m.DisplayMonth.Year == _SelectedDate.Year ||
+                m.TrailingDaysVisible && m.GetDayLabel(_SelectedDate) != null)
+                m.SelectedDate = _SelectedDate;
+            else if (m.SelectedDate != DateTime.MinValue)
+                m.SelectedDate = DateTime.MinValue;
+        }
+
+        /// <summary>
+        /// Raises the DateChanged event.
+        /// </summary>
+        /// <param name="e">Provides event data.</param>
+        protected virtual void OnDateChanged(EventArgs e)
+        {
+            if (DateChanged != null)
+                DateChanged(this, e);
+        }
+
+        /// <summary>
+        /// Raises the DateSelected event.
+        /// </summary>
+        /// <param name="e">Provides event data.</param>
+        protected virtual void OnDateSelected(DateRangeEventArgs e)
+        {
+            if (DateSelected != null)
+                DateSelected(this, e);
+        }
+
+        private void SingleMonthSelectedDateChanged(object sender, EventArgs e)
+        {
+            if (_UpdatingSelectedDate) return;
+            SingleMonthCalendar m = sender as SingleMonthCalendar;
+            this.SelectedDate = m.SelectedDate;
+        }
+
+        /// <summary>
+        /// Gets the reference to the bottom container that parents the Today, and Clear system buttons.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public ItemContainer BottomContainer
+        {
+            get
+            {
+                return _BottomContainer;
+            }
+        }
+
+        private ButtonItem CreateTodayButton()
+        {
+            ButtonItem b = new ButtonItem(_TodayButtonName);
+            b.GlobalItem = false;
+            b.Text = GetTodayButtonText();
+            b.AutoCollapseOnClick = false;
+            b._FadeEnabled = false;
+            b.Click += new EventHandler(TodayButtonClick);
+            return b;
+        }
+
+        /// <summary>
+        /// Gets reference to internal Today button on calendar.
+        /// </summary>
+        [Browsable(false)]
+        public ButtonItem TodayButton
+        {
+            get
+            {
+                return _TodayButton;
+            }
+        }
+
+        private void TodayButtonClick(object sender, EventArgs e)
+        {
+            DateTime d = TodayDateSet ? TodayDate : DateTime.Today;
+            this.DisplayMonth = d;
+            this.SelectedDate = d;
+        }
+
+        private string GetTodayButtonText()
+        {
+            string s = "";
+            using (LocalizationManager lm = new LocalizationManager(this.GetOwner() as IOwnerLocalize))
+                s = lm.GetLocalizedString(LocalizationKeys.MonthCalendarTodayButtonText);
+            if (s == "") s = "Today";
+            return s;
+        }
+
+        /// <summary>
+        /// Reloads the localized strings for Today and Clear buttons.
+        /// </summary>
+        public void ReloadLocalizedStrings()
+        {
+            if (_TodayButton != null) _TodayButton.Text = GetTodayButtonText();
+            if (_ClearButton != null) _ClearButton.Text = GetClearButtonText();
+        }
+
+        private ButtonItem CreateClearButton()
+        {
+            ButtonItem b = new ButtonItem(_ClearButtonName);
+            b.GlobalItem = false;
+            b.Text = GetClearButtonText();
+            b.AutoCollapseOnClick = false;
+            b._FadeEnabled = false;
+            b.Click += new EventHandler(ClearButtonClick);
+            return b;
+        }
+
+        private void ClearButtonClick(object sender, EventArgs e)
+        {
+            this.SelectedDate = DateTime.MinValue;
+        }
+
+        private string GetClearButtonText()
+        {
+            string s = "";
+            using (LocalizationManager lm = new LocalizationManager(this.GetOwner() as IOwnerLocalize))
+                s = lm.GetLocalizedString(LocalizationKeys.MonthCalendarClearButtonText);
+            if (s == "") s = "Clear";
+            return s;
+        }
+
+        private bool _TodayButtonVisible = false;
+        /// <summary>
+        /// Gets or sets whether Today button displayed at the bottom of the calendar is visible. Default value is false.
+        /// </summary>
+        [DefaultValue(false), Description("Indicates whether Today button displayed at the bottom of the calendar is visible.")]
+        public bool TodayButtonVisible
+        {
+            get { return _TodayButtonVisible; }
+            set
+            {
+                if (_TodayButtonVisible != value)
+                {
+                    _TodayButtonVisible = value;
+                    NeedRecalcSize = true;
+                    UpdateSystemButtonsVisibility();
+                    OnAppearanceChanged();
+                    Refresh();
+                }
+            }
+        }
+
+        private bool _ClearButtonVisible = false;
+        /// <summary>
+        /// Gets or sets whether Clear button displayed at the bottom of the calendar is visible. Clear button clears the currently selected date. Default value is false.
+        /// </summary>
+        [DefaultValue(false), Description("Indicates whether Clear button displayed at the bottom of the calendar is visible. Clear button clears the currently selected date.")]
+        public bool ClearButtonVisible
+        {
+            get { return _ClearButtonVisible; }
+            set
+            {
+                if (_ClearButtonVisible != value)
+                {
+                    _ClearButtonVisible = value;
+                    NeedRecalcSize = true;
+                    UpdateSystemButtonsVisibility();
+                    OnAppearanceChanged();
+                    Refresh();
+                }
+            }
+        }
+
+        private void UpdateSystemButtonsVisibility()
+        {
+            if (_TodayButtonVisible != _TodayButton.Visible)
+                _TodayButton.Visible = _TodayButtonVisible;
+            if (_ClearButtonVisible != _ClearButton.Visible)
+                _ClearButton.Visible = _ClearButtonVisible;
+
+            bool b = _ClearButtonVisible | _TodayButtonVisible;
+            if (b != _BottomContainer.Visible)
+                _BottomContainer.Visible = b;
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the item is expanded or not. For Popup items this would indicate whether the item is popped up or not.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), System.ComponentModel.DefaultValue(false), System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
+        public override bool Expanded
+        {
+            get
+            {
+                return m_Expanded;
+            }
+            set
+            {
+                base.Expanded = value;
+                if (!value)
+                    BaseItem.CollapseSubItems(this);
+            }
+        }
+
+        private bool _DayClickAutoClosePopup = true;
+        /// <summary>
+        /// Gets or sets whether clicking the day closes the parent popup if item is on popup.
+        /// </summary>
+        [Browsable(false), DefaultValue(true)]
+        public bool DayClickAutoClosePopup
+        {
+            get { return _DayClickAutoClosePopup; }
+            set
+            {
+                if (value != _DayClickAutoClosePopup)
+                {
+                    bool oldValue = _DayClickAutoClosePopup;
+                    _DayClickAutoClosePopup = value;
+                    OnDayClickAutoClosePopupChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when DayClickAutoClosePopup property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnDayClickAutoClosePopupChanged(bool oldValue, bool newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("DayClickAutoClosePopup"));
+            foreach (BaseItem item in this.SubItems)
+            {
+                if (item is SingleMonthCalendar)
+                    ((SingleMonthCalendar)item).DayClickAutoClosePopup = newValue;
+            }
+        }
+
+        private bool _YearSelectionEnabled = true;
+        /// <summary>
+        /// Gets or sets whether Year/Century selection is enabled when calendar is displaying single month.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether Year/Century selection is enabled when calendar is displaying single month.")]
+        public bool YearSelectionEnabled
+        {
+            get { return _YearSelectionEnabled; }
+            set
+            {
+                if (_YearSelectionEnabled != value)
+                {
+                    _YearSelectionEnabled = value;
+                    foreach (BaseItem item in this.SubItems)
+                    {
+                        SingleMonthCalendar mc = item as SingleMonthCalendar;
+                        if (mc != null)
+                            mc.YearSelectionEnabled = _YearSelectionEnabled;
+                    }
+                }
+            }
+        }
+
+        private bool _MonthSelectorShortMonthNames = true;
+        /// <summary>
+        /// Indicates whether month selector which is displayed when month label is clicked is using abbreviated month names instead of month number.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether month selector which is displayed when month label is clicked is using abbreviated month names instead of month number.")]
+        public bool MonthSelectorShortMonthNames
+        {
+            get { return _MonthSelectorShortMonthNames; }
+            set
+            {
+                if (_MonthSelectorShortMonthNames != value)
+                {
+                    _MonthSelectorShortMonthNames = value;
+                    foreach (BaseItem item in this.SubItems)
+                    {
+                        SingleMonthCalendar mc = item as SingleMonthCalendar;
+                        if (mc != null)
+                            mc.MonthSelectorShortMonthNames = _MonthSelectorShortMonthNames;
+                    }
+                }
+            }
+        }
+
+        private bool _MonthSelectionMode = false;
+        /// <summary>
+        /// Indicates whether calendar is used in month selection mode which shows only month and year.
+        /// </summary>
+        [DefaultValue(false), Category("Behavior"), Description("Indicates whether calendar is used in month selection mode which shows only month and year.")]
+        public bool MonthSelectionMode
+        {
+            get { return _MonthSelectionMode; }
+            set
+            {
+                if (value != _MonthSelectionMode)
+                {
+                    _MonthSelectionMode = value;
+                    foreach (BaseItem item in this.SubItems)
+                    {
+                        SingleMonthCalendar mc = item as SingleMonthCalendar;
+                        if (mc != null)
+                            mc.MonthSelectionMode = _MonthSelectionMode;
+                    }
+                    NeedRecalcSize = true;
+                    OnAppearanceChanged();
+                }
+            }
+        }
+        #endregion
+
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/Editors/DateTimeAdv/MonthNameInput.cs b/PROMS/DotNetBar Source Code/Editors/DateTimeAdv/MonthNameInput.cs
new file mode 100644
index 00000000..a4b76dfd
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Editors/DateTimeAdv/MonthNameInput.cs	
@@ -0,0 +1,150 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Globalization;
+using System.ComponentModel;
+
+namespace DevComponents.Editors.DateTimeAdv
+{
+    public class MonthNameInput : VisualStringListInput, IDateTimePartInput
+    {
+        #region Private Variables
+        private List<string> _Months = null;
+        private int _MinValue = 1;
+        private int _MaxValue = 12;
+        #endregion
+
+        #region Events
+        #endregion
+
+        #region Constructor
+        #endregion
+
+        #region Internal Implementation
+        protected override List<string> GetItems()
+        {
+            if (this.Items.Count != 12)
+            {
+                if (_Months == null)
+                {
+                    _Months = new List<string>(12);
+                    if (_UseAbbreviatedNames)
+                        _Months.AddRange(DateTimeInput.GetActiveCulture().DateTimeFormat.AbbreviatedMonthNames);
+                    else
+                        _Months.AddRange(DateTimeInput.GetActiveCulture().DateTimeFormat.MonthNames);
+                    if (_Months.Count == 13 && _Months[12] == "") _Months.RemoveAt(12);
+                }
+                return _Months;
+            }
+            return base.GetItems();
+        }
+
+        protected override bool ValidateNewInputStack(string s)
+        {
+            if (s.Length > 0)
+            {
+                // Parse also numeric input and map it to the month name
+                int month = 0;
+                int.TryParse(s, out month);
+                if (month > 0 && month >= _MinValue && month <= _MaxValue)
+                {
+                    List<string> items = GetItems();
+                    this.LastMatch = items[month - 1];
+                    this.LastValidatedInputStack = s;
+                    if (month > 1)
+                        this.LastMatchComplete = true;
+                    return true;
+                }
+            }
+
+            bool b = base.ValidateNewInputStack(s);
+            if (b && LastValidatedInputStack.Length > 0)
+            {
+                List<string> items = GetItems();
+                int index = items.IndexOf(LastMatch) + 1;
+                if (index < _MinValue || index > _MaxValue)
+                    return false;
+            }
+
+            return b;
+        }
+        #endregion
+
+
+        #region IDateTimePartInput Members
+
+        int IDateTimePartInput.Value
+        {
+            get
+            {
+                return this.SelectedIndex + 1;
+            }
+            set
+            {
+                this.SelectedIndex = value - 1;
+            }
+        }
+
+        int IDateTimePartInput.MinValue
+        {
+            get
+            {
+                return _MinValue;
+            }
+            set
+            {
+                if (_MinValue != value)
+                {
+                    _MinValue = value;
+                    if (!this.IsEmpty && SelectedIndex < _MinValue)
+                        this.SelectedIndex = _MinValue;
+                }
+            }
+        }
+
+        int IDateTimePartInput.MaxValue
+        {
+            get
+            {
+                return _MaxValue;
+            }
+            set
+            {
+                if (_MaxValue != value)
+                {
+                    _MaxValue = value;
+                    if (!this.IsEmpty && SelectedIndex > _MaxValue)
+                        this.SelectedIndex = _MaxValue;
+                }
+            }
+        }
+
+        eDateTimePart IDateTimePartInput.Part
+        {
+            get { return eDateTimePart.Month; }
+        }
+
+        private bool _UseAbbreviatedNames = false;
+        /// <summary>
+        /// Gets or sets whether abbreviated month names are used for display instead of full month names. Default value is false.
+        /// </summary>
+        [DefaultValue(false)]
+        public bool UseAbbreviatedNames
+        {
+            get { return _UseAbbreviatedNames; }
+            set
+            {
+                if (_UseAbbreviatedNames != value)
+                {
+                    _UseAbbreviatedNames = value;
+                    _Months = null;
+                    InvalidateArrange();
+                }
+            }
+        }
+        #endregion
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/Editors/DateTimeAdv/NumericDayInput.cs b/PROMS/DotNetBar Source Code/Editors/DateTimeAdv/NumericDayInput.cs
new file mode 100644
index 00000000..0770f88f
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Editors/DateTimeAdv/NumericDayInput.cs	
@@ -0,0 +1,43 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace DevComponents.Editors.DateTimeAdv
+{
+    public class NumericDayInput : VisualIntegerInput, IDateTimePartInput
+    {
+        #region Private Variables
+        #endregion
+
+        #region Events
+        #endregion
+
+        #region Constructor
+        /// <summary>
+        /// Initializes a new instance of the NumericDayInput class.
+        /// </summary>
+        public NumericDayInput()
+        {
+            this.MinValue = 1;
+            this.MaxValue = 31;
+        }
+        #endregion
+
+        #region Internal Implementation
+        #endregion
+
+
+        #region IDateTimePartInput Members
+
+
+        public eDateTimePart Part
+        {
+            get { return eDateTimePart.Day; }
+        }
+
+        #endregion
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/Editors/DateTimeAdv/NumericDayOfYearInput.cs b/PROMS/DotNetBar Source Code/Editors/DateTimeAdv/NumericDayOfYearInput.cs
new file mode 100644
index 00000000..d8a25f77
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Editors/DateTimeAdv/NumericDayOfYearInput.cs	
@@ -0,0 +1,44 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace DevComponents.Editors.DateTimeAdv
+{
+    public class NumericDayOfYearInput : VisualIntegerInput, IDateTimePartInput
+    {
+        #region Private Variables
+        #endregion
+
+        #region Events
+        #endregion
+
+        #region Constructor
+        /// <summary>
+        /// Initializes a new instance of the NumericDayOfYearInput class.
+        /// </summary>
+        public NumericDayOfYearInput()
+        {
+            this.MinValue = 1;
+            this.MaxValue = 366;
+        }
+        #endregion
+
+        #region Internal Implementation
+        #endregion
+
+
+
+        #region IDateTimePartInput Members
+
+
+        eDateTimePart IDateTimePartInput.Part
+        {
+            get { return eDateTimePart.DayOfYear; }
+        }
+
+        #endregion
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/Editors/DateTimeAdv/NumericHourInput.cs b/PROMS/DotNetBar Source Code/Editors/DateTimeAdv/NumericHourInput.cs
new file mode 100644
index 00000000..f620e0ce
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Editors/DateTimeAdv/NumericHourInput.cs	
@@ -0,0 +1,174 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace DevComponents.Editors.DateTimeAdv
+{
+    public class NumericHourInput : VisualIntegerInput, IDateTimePartInput
+    {
+        #region Private Variables
+        #endregion
+
+        #region Events
+        #endregion
+
+        #region Constructor
+        /// <summary>
+        /// Initializes a new instance of the NumericHourInput class.
+        /// </summary>
+        public NumericHourInput()
+        {
+            UpdateRange();
+        }
+        #endregion
+
+        #region Internal Implementation
+        private bool _Is24HourFormat = true;
+        public bool Is24HourFormat
+        {
+            get { return _Is24HourFormat; }
+            set
+            {
+                if (_Is24HourFormat != value)
+                {
+                    _Is24HourFormat = value;
+                    OnIs24HourFormatChanged();
+                }
+            }
+        }
+
+        private void OnIs24HourFormatChanged()
+        {
+            if (!_Is24HourFormat && this.Value > 12)
+            {
+                this.Value = Value;
+            }
+
+            UpdateRange();
+        }
+
+        private void UpdateRange()
+        {
+            if (_Is24HourFormat)
+            {
+                this.MinValue = 0;
+                this.MaxValue = 23;
+            }
+            else
+            {
+                if (_Period == eHourPeriod.AM)
+                {
+                    this.MinValue = 1;
+                    this.MaxValue = 12;
+                }
+                else
+                {
+                    this.MinValue = 1;
+                    this.MaxValue = 12;
+                }
+                //if (this.Value > this.MaxValue) this.Value = this.MaxValue;
+                //if (this.Value < this.MinValue) this.Value = this.MinValue;
+            }
+        }
+
+        protected override void OnValueChanged()
+        {
+            if (_Is24HourFormat)
+            {
+                if (Value >= 0 && Value <= 12)
+                    this.Period = eHourPeriod.AM;
+                else
+                    this.Period = eHourPeriod.PM;
+            }
+            base.OnValueChanged();
+        }
+
+        private eHourPeriod _Period;
+        public eHourPeriod Period
+        {
+            get { return _Period; }
+            set
+            {
+                if (_Period != value)
+                {
+                    _Period = value;
+                    if (!_Is24HourFormat)
+                    {
+                        UpdateRange();
+                        this.Value = this.Value;
+                    }
+                }
+            }
+        }
+
+        public override int Value
+        {
+            get { return base.Value; }
+            set
+            {
+                if (!_Is24HourFormat)
+                {
+                    if (value == 0)
+                    {
+                        value = 12;
+                        _Period = eHourPeriod.AM;
+                    }
+                    else if (value > 12)
+                    {
+                        _Period = eHourPeriod.PM;
+                        value = value - 12;
+                    }
+                    //else
+                    //    _Period = eHourPeriod.AM;
+                    UpdateRange();
+                }
+                base.Value = value;
+            }
+        }
+
+        protected override bool ValidateNewInputStack(string s)
+        {
+            if (!_Is24HourFormat && s.Length > 0)
+            {
+                int value = 0;
+                if (int.TryParse(s, out value))
+                {
+                    if (value > 12 && value < 24 /*|| value == 12 && _Period == eHourPeriod.AM*/)
+                    {
+                        SetInputStack("");
+                        SetInputPosition(0);
+                        this.Value = value;
+                        return false;
+                    }
+                }
+            }
+            return base.ValidateNewInputStack(s);
+        }
+
+        protected override void OnIsEmptyChanged()
+        {
+            if (this.IsEmpty)
+            {
+                _Period = eHourPeriod.AM;
+                UpdateRange();
+            }
+            base.OnIsEmptyChanged();
+        }
+        #endregion
+
+
+        #region IDateTimePartInput Members
+        #region IDateTimePartInput Members
+        eDateTimePart IDateTimePartInput.Part
+        {
+            get { return eDateTimePart.Hour; }
+        }
+
+        #endregion
+
+        #endregion
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/Editors/DateTimeAdv/NumericMinuteInput.cs b/PROMS/DotNetBar Source Code/Editors/DateTimeAdv/NumericMinuteInput.cs
new file mode 100644
index 00000000..944a75da
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Editors/DateTimeAdv/NumericMinuteInput.cs	
@@ -0,0 +1,40 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace DevComponents.Editors.DateTimeAdv
+{
+    public class NumericMinuteInput : VisualIntegerInput, IDateTimePartInput
+    {
+        #region Private Variables
+        #endregion
+
+        #region Events
+        #endregion
+
+        #region Constructor
+        /// <summary>
+        /// Initializes a new instance of the NumericMinuteInput class.
+        /// </summary>
+        public NumericMinuteInput()
+        {
+            this.MinValue = 0;
+            this.MaxValue = 59;
+        }
+        #endregion
+
+        #region Internal Implementation
+        #endregion
+
+        #region IDateTimePartInput Members
+        eDateTimePart IDateTimePartInput.Part
+        {
+            get { return eDateTimePart.Minute; }
+        }
+
+        #endregion
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/Editors/DateTimeAdv/NumericMonthInput.cs b/PROMS/DotNetBar Source Code/Editors/DateTimeAdv/NumericMonthInput.cs
new file mode 100644
index 00000000..beb508f7
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Editors/DateTimeAdv/NumericMonthInput.cs	
@@ -0,0 +1,41 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace DevComponents.Editors.DateTimeAdv
+{
+    public class NumericMonthInput : VisualIntegerInput, IDateTimePartInput
+    {
+        #region Private Variables
+        #endregion
+
+        #region Events
+        #endregion
+
+        #region Constructor
+        /// <summary>
+        /// Initializes a new instance of the NumericMonthInput class.
+        /// </summary>
+        public NumericMonthInput()
+        {
+            this.MinValue = 1;
+            this.MaxValue = 12;
+        }
+        #endregion
+
+        #region Internal Implementation
+        #endregion
+
+
+        #region IDateTimePartInput Members
+        eDateTimePart IDateTimePartInput.Part
+        {
+            get { return eDateTimePart.Month; }
+        }
+
+        #endregion
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/Editors/DateTimeAdv/NumericSecondInput.cs b/PROMS/DotNetBar Source Code/Editors/DateTimeAdv/NumericSecondInput.cs
new file mode 100644
index 00000000..3d629eff
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Editors/DateTimeAdv/NumericSecondInput.cs	
@@ -0,0 +1,40 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace DevComponents.Editors.DateTimeAdv
+{
+    public class NumericSecondInput : VisualIntegerInput, IDateTimePartInput
+    {
+        #region Private Variables
+        #endregion
+
+        #region Events
+        #endregion
+
+        #region Constructor
+        /// <summary>
+        /// Initializes a new instance of the NumericSecondInput class.
+        /// </summary>
+        public NumericSecondInput()
+        {
+            this.MinValue = 0;
+            this.MaxValue = 59;
+        }
+        #endregion
+
+        #region Internal Implementation
+        #endregion
+
+        #region IDateTimePartInput Members
+        eDateTimePart IDateTimePartInput.Part
+        {
+            get { return eDateTimePart.Second; }
+        }
+
+        #endregion
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/Editors/DateTimeAdv/NumericYearInput.cs b/PROMS/DotNetBar Source Code/Editors/DateTimeAdv/NumericYearInput.cs
new file mode 100644
index 00000000..dbb054ac
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Editors/DateTimeAdv/NumericYearInput.cs	
@@ -0,0 +1,94 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel;
+
+namespace DevComponents.Editors.DateTimeAdv
+{
+    public class NumericYearInput : VisualIntegerInput, IDateTimePartInput
+    {
+        #region Private Variables
+        #endregion
+
+        #region Events
+        #endregion
+
+        #region Constructor
+        /// <summary>
+        /// Initializes a new instance of the NumericYearInput class.
+        /// </summary>
+        public NumericYearInput()
+        {
+            this.MinValue = System.DateTime.MinValue.Year;
+            this.MaxValue = System.DateTime.MaxValue.Year;
+        }
+        #endregion
+
+        #region Internal Implementation
+        private eYearDisplayFormat _YearDisplayFormat = eYearDisplayFormat.FourDigit;
+        /// <summary>
+        /// Gets or sets the year display format. Default value is four digit format.
+        /// </summary>
+        [DefaultValue(eYearDisplayFormat.FourDigit)]
+        public eYearDisplayFormat YearDisplayFormat
+        {
+            get { return _YearDisplayFormat; }
+            set
+            {
+                if (_YearDisplayFormat != value)
+                {
+                    _YearDisplayFormat = value;
+                    InvalidateArrange();
+                }
+            }
+        }
+
+        protected override string GetMeasureString()
+        {
+            return GetFormattedYear(base.GetMeasureString());
+        }
+
+        protected override string GetRenderString()
+        {
+            return GetFormattedYear(base.GetRenderString());
+        }
+
+        private string GetFormattedYear(string s)
+        {
+            if (this.IsFocused || s.Length < 4 || _YearDisplayFormat == eYearDisplayFormat.FourDigit) return s;
+            if (_YearDisplayFormat == eYearDisplayFormat.TwoDigit)
+                return s.Substring(2);
+            return s.Substring(3);
+        }
+
+        protected override void InputComplete(bool sendNotification)
+        {
+            UpdateYearValue();
+            base.InputComplete(sendNotification);
+        }
+
+        protected override void OnInputLostFocus()
+        {
+            UpdateYearValue();
+            base.OnInputLostFocus();
+        }
+
+        private void UpdateYearValue()
+        {
+            if (!this.IsEmpty && this.Value < 100)
+                this.Value = int.Parse(System.DateTime.Now.Year.ToString().Substring(0, 2) + this.Value.ToString("00"));
+        }
+        #endregion
+
+        #region IDateTimePartInput Members
+        eDateTimePart IDateTimePartInput.Part
+        {
+            get { return eDateTimePart.Year; }
+        }
+
+        #endregion
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/Editors/DateTimeAdv/ParseDateTimeValueEventArgs.cs b/PROMS/DotNetBar Source Code/Editors/DateTimeAdv/ParseDateTimeValueEventArgs.cs
new file mode 100644
index 00000000..d12202f8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Editors/DateTimeAdv/ParseDateTimeValueEventArgs.cs	
@@ -0,0 +1,58 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace DevComponents.Editors.DateTimeAdv
+{
+    /// <summary>
+    /// Defines data for the ParseValue event that allows you to provide custom parsing for values set to ValueObject property.
+    /// </summary>
+    public class ParseDateTimeValueEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Get the value that was set to the ValueObject property and which should be converted to ParsedValue DateTime.
+        /// </summary>
+        public readonly object ValueObject = null;
+
+        /// <summary>
+        /// Gets or sets whether you have provided ParsedValue.
+        /// </summary>
+        public bool IsParsed = false;
+
+        /// <summary>
+        /// Initializes a new instance of the ParseDateTimeValueEventArgs class.
+        /// </summary>
+        /// <param name="valueObject">Indicates the value object.</param>
+        public ParseDateTimeValueEventArgs(object valueObject)
+        {
+            ValueObject = valueObject;
+        }
+
+        private System.DateTime _ParsedValue = DateTimeGroup.MinDateTime;
+
+        /// <summary>
+        /// /// <summary>
+        /// Gets or sets the parsed value from ValueObject property.
+        /// </summary>
+        /// </summary>
+        public System.DateTime ParsedValue
+        {
+            get { return _ParsedValue; }
+            set
+            {
+                _ParsedValue = value;
+                IsParsed = true;
+            }
+        }
+    }
+
+    /// <summary>
+    /// Defines delegate for ParseDateTimeValue event.
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    public delegate void ParseDateTimeValueEventHandler(object sender, ParseDateTimeValueEventArgs e);
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/Editors/DateTimeAdv/SingleMonthCalendar.cs b/PROMS/DotNetBar Source Code/Editors/DateTimeAdv/SingleMonthCalendar.cs
new file mode 100644
index 00000000..5545f725
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Editors/DateTimeAdv/SingleMonthCalendar.cs	
@@ -0,0 +1,2686 @@
+#if FRAMEWORK20
+using System;
+using System.Text;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Globalization;
+using System.Data;
+using System.Windows.Forms;
+using DevComponents.DotNetBar;
+using DevComponents.DotNetBar.Animation;
+using DevComponents.DotNetBar.Rendering;
+
+namespace DevComponents.Editors.DateTimeAdv
+{
+    /// <summary>
+    /// Represents the container that presents single calendar month.
+    /// </summary>
+    [ToolboxItem(false), DesignTimeVisible(false), Designer("DevComponents.DotNetBar.Design.ItemContainerDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+    public class SingleMonthCalendar : CalendarBase
+    {
+        private const string NavigationContainerName = "navigationContainer";
+        #region Private Variables
+        internal static readonly Size _DefaultDaySize = new Size(24, 15);
+        internal static readonly Size _DefaultNavigationButtonSize = new Size(13, 18);
+        private const string NavMonthLabel = "monthLabel";
+        private const string NavYearLabel = "yearLabel";
+        private const string NavDecreaseMonth = "decreaseMonth";
+        private const string NavIncreaseMonth = "increaseMonth";
+        private const string NavDecreaseYear = "decreaseYear";
+        private const string NavIncreaseYear = "increaseYear";
+        //private const string MonthsPopupMenu = "monthsPopupMenu";
+        //private ButtonItem _MonthsPopupMenu = null;
+        private YearSelectorControl _YearSelector = null;
+        private MonthSelectorControl _MonthSelector = null;
+        private YearSelectorContainer _YearSelectionItem = null;
+        private MonthSelectorContainer _MonthSelectionItem = null;
+        #endregion
+
+        #region Events
+        /// <summary>
+        /// Occurs when month displayed by the item has changed.
+        /// </summary>
+        public event EventHandler MonthChanged;
+
+        /// <summary>
+        /// Occurs before the month that is displayed is changed.
+        /// </summary>
+        public event EventHandler MonthChanging;
+
+
+        /// <summary>
+        /// Occurs when child label representing days is rendered and it allows you to override default rendering.
+        /// </summary>
+        public event DayPaintEventHandler PaintLabel;
+
+        /// <summary>
+        /// Occurs when mouse button is pressed over the day/week label inside of the calendar.
+        /// </summary>
+        [System.ComponentModel.Description("Occurs when mouse button is pressed over the day/week label inside of the calendar.")]
+        public event System.Windows.Forms.MouseEventHandler LabelMouseDown;
+
+        /// <summary>
+        /// Occurs when mouse button is released over day/week label inside of the calendar.
+        /// </summary>
+        [System.ComponentModel.Description("Occurs when mouse button is released over day/week label inside of the calendar.")]
+        public event System.Windows.Forms.MouseEventHandler LabelMouseUp;
+
+        /// <summary>
+        /// Occurs when mouse enters the day/week label inside of the calendar.
+        /// </summary>
+        [System.ComponentModel.Description("Occurs when mouse enters the day/week label inside of the calendar.")]
+        public event EventHandler LabelMouseEnter;
+
+        /// <summary>
+        /// Occurs when mouse leaves the day/week label inside of the calendar.
+        /// </summary>
+        [System.ComponentModel.Description("Occurs when mouse leaves the day/week label inside of the calendar.")]
+        public event EventHandler LabelMouseLeave;
+
+        /// <summary>
+        /// Occurs when mouse moves over the day/week label inside of the calendar.
+        /// </summary>
+        [System.ComponentModel.Description("Occurs when mouse moves over the day/week label inside of the calendar.")]
+        public event System.Windows.Forms.MouseEventHandler LabelMouseMove;
+
+        /// <summary>
+        /// Occurs when mouse remains still inside an day/week label of the calendar for an amount of time.
+        /// </summary>
+        [System.ComponentModel.Description("Occurs when mouse remains still inside an day/week label of the calendar for an amount of time.")]
+        public event EventHandler LabelMouseHover;
+
+        /// <summary>
+        /// Occurs when SelectedDate property has changed.
+        /// </summary>
+        [System.ComponentModel.Description("Occurs when SelectedDate property has changed.")]
+        public event EventHandler DateChanged;
+        #endregion
+
+        #region Constructor
+        /// <summary>
+        /// Initializes a new instance of the CalendarMonth class.
+        /// </summary>
+        public SingleMonthCalendar()
+        {
+            _FirstDayOfWeek = DateTimeInput.GetActiveCulture().DateTimeFormat.FirstDayOfWeek;
+            m_IsContainer = true;
+            this.AutoCollapseOnClick = true;
+            this.MouseUpNotification = true;
+            this.AccessibleRole = System.Windows.Forms.AccessibleRole.Grouping;
+            _Colors.Parent = this;
+            for (int i = 0; i < 49; i++)
+            {
+                DayLabel day = new DayLabel();
+                day.Visible = false;
+                this.SubItems.Add(day);
+            }
+
+            // Add navigation container
+            Size fixedButtonSize = _DefaultNavigationButtonSize;
+            ItemContainer cont = new ItemContainer();
+            cont.Name = NavigationContainerName;
+            cont.AutoCollapseOnClick = false;
+            cont.MinimumSize = new Size(0, fixedButtonSize.Height + 3);
+            cont.LayoutOrientation = eOrientation.Horizontal;
+            cont.HorizontalItemAlignment = eHorizontalItemsAlignment.Center;
+            cont.VerticalItemAlignment = eVerticalItemsAlignment.Middle;
+            cont.ItemSpacing = 2;
+            ButtonItem nav = new ButtonItem(NavDecreaseMonth);
+            nav.GlobalItem = false;
+            nav._FadeEnabled = false;
+            nav.Text = "<expand direction=\"left\"/>";
+            nav.Click += new EventHandler(MonthNavigationDecreaseClick);
+            nav.AutoCollapseOnClick = false;
+            nav.FixedSize = fixedButtonSize;
+            nav._FixedSizeCenterText = true;
+            nav.ClickAutoRepeat = true;
+            cont.SubItems.Add(nav);
+            LabelItem label = new LabelItem(NavMonthLabel);
+            label.AutoCollapseOnClick = false;
+            label.GlobalItem = false;
+            label.TextAlignment = StringAlignment.Center;
+            label.TextLineAlignment = StringAlignment.Center;
+            label.PaddingBottom = 2;
+            label.Click += new EventHandler(ShowMonthSelection);
+            label.Cursor = Cursors.Hand;
+            cont.SubItems.Add(label);
+            nav = new ButtonItem(NavIncreaseMonth);
+            nav.GlobalItem = false;
+            nav._FadeEnabled = false;
+            nav.Text = "<expand direction=\"right\"/>";
+            nav.Click += new EventHandler(MonthNavigationIncreaseClick);
+            nav.AutoCollapseOnClick = false;
+            nav.FixedSize = fixedButtonSize;
+            nav._FixedSizeCenterText = true;
+            nav.ClickAutoRepeat = true;
+            cont.SubItems.Add(nav);
+
+            // Year Navigation
+            nav = new ButtonItem(NavDecreaseYear);
+            nav.GlobalItem = false;
+            nav._FadeEnabled = false;
+            nav.Text = "<expand direction=\"left\"/>";
+            nav.Click += new EventHandler(YearNavigationDecreaseClick);
+            nav.AutoCollapseOnClick = false;
+            nav.FixedSize = fixedButtonSize;
+            nav._FixedSizeCenterText = true;
+            nav.ClickAutoRepeat = true;
+            cont.SubItems.Add(nav);
+            label = new LabelItem(NavYearLabel);
+            label.AutoCollapseOnClick = false;
+            label.GlobalItem = false;
+            label.TextAlignment = StringAlignment.Center;
+            label.TextLineAlignment = StringAlignment.Center;
+            label.PaddingBottom = 2;
+            label.Click += ShowYearSelection;
+            label.Cursor = Cursors.Hand;
+            cont.SubItems.Add(label);
+            nav = new ButtonItem(NavIncreaseYear);
+            nav.GlobalItem = false;
+            nav._FadeEnabled = false;
+            nav.Text = "<expand direction=\"right\"/>";
+            nav.Click += new EventHandler(YearNavigationIncreaseClick);
+            nav.AutoCollapseOnClick = false;
+            nav.FixedSize = fixedButtonSize;
+            nav._FixedSizeCenterText = true;
+            nav.ClickAutoRepeat = true;
+            cont.SubItems.Add(nav);
+
+            //_MonthsPopupMenu = new ButtonItem(MonthsPopupMenu);
+            //_MonthsPopupMenu.Visible = false;
+            //cont.SubItems.Add(_MonthsPopupMenu);
+
+            this.SubItems.Add(cont);
+        }
+        #endregion
+
+        #region Internal Implementation
+        private bool _MonthSelectionMode = false;
+        /// <summary>
+        /// Indicates whether calendar is used in month selection mode which shows only month and year.
+        /// </summary>
+        [DefaultValue(false), Category("Behavior"), Description("Indicates whether calendar is used in month selection mode which shows only month and year.")]
+        public bool MonthSelectionMode
+        {
+            get { return _MonthSelectionMode; }
+            set
+            {
+                if (value != _MonthSelectionMode)
+                {
+                    bool oldValue = _MonthSelectionMode;
+                    _MonthSelectionMode = value;
+                    OnMonthSelectionModeChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when MonthSelectionMode property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnMonthSelectionModeChanged(bool oldValue, bool newValue)
+        {
+            if (newValue)
+            {
+                _MonthSelectionItem = new MonthSelectorContainer();
+                _MonthSelectionItem.FixedSize = new Size(162, 140);
+                if (_SelectedDate != DateTime.MinValue)
+                    _MonthSelectionItem.SelectedMonth = this.SelectedDate.Month;
+                _MonthSelectionItem.SelectedMonthChanged += new EventHandler(MonthSelectionItemSelectedMonthChanged);
+                _MonthSelectionItem.UseMonthNames = _MonthSelectorShortMonthNames;
+                this.SubItems.Add(_MonthSelectionItem);
+                _YearSelectionItem = new YearSelectorContainer();
+                _YearSelectionItem.FixedSize = new Size(162, 140);
+                if (_SelectedDate != DateTime.MinValue)
+                    _YearSelectionItem.SelectedYear = this.SelectedDate.Year;
+                _YearSelectionItem.SelectedYearChanged += new EventHandler(YearSelectionItemSelectedYearChanged);
+                this.SubItems.Add(_YearSelectionItem);
+            }
+            else
+            {
+                this.SubItems.Remove(_MonthSelectionItem);
+                this.SubItems.Remove(_YearSelectionItem);
+                _MonthSelectionItem.Dispose();
+                _MonthSelectionItem = null;
+                _YearSelectionItem.Dispose();
+                _YearSelectionItem = null;
+                this.DisplayMonth = _DisplayMonth;
+            }
+            NeedRecalcSize = true;
+            OnAppearanceChanged();
+            //OnPropertyChanged(new PropertyChangedEventArgs("MonthSelectionMode"));
+        }
+        internal void DropDownClosed()
+        {
+            if (_YearSelectionItem != null)
+                _YearSelectionItem.RemoveCenturySelector();
+        }
+        void YearSelectionItemSelectedYearChanged(object sender, EventArgs e)
+        {
+            if (_SelectedDate != DateTime.MinValue)
+            {
+                DateTime dt=new DateTime(_YearSelectionItem.SelectedYear, _SelectedDate.Month, _SelectedDate.Day, _SelectedDate.Hour, _SelectedDate.Minute, _SelectedDate.Second, _SelectedDate.Kind);
+                DisplayMonth = dt;
+                this.SelectedDate = dt;
+            }
+            else if (!_MonthSelectionItem.IsEmpty)
+            {
+                DateTime dt = new DateTime(_YearSelectionItem.SelectedYear, _MonthSelectionItem.SelectedMonth, 1);
+                DisplayMonth = dt;
+                this.SelectedDate = dt;
+            }
+            //else 
+            //    this.SelectedDate = new DateTime(_YearSelectionItem.SelectedYear, DateTime.Now.Month, 1);
+        }
+
+        void MonthSelectionItemSelectedMonthChanged(object sender, EventArgs e)
+        {
+            if (_SelectedDate != DateTime.MinValue)
+            {
+                int selectedDay = Math.Min(_SelectedDate.Day,
+                    DateTimeInput.GetActiveCulture()
+                        .Calendar.GetDaysInMonth(_SelectedDate.Year, _MonthSelectionItem.SelectedMonth));
+                DateTime dt = new DateTime(_SelectedDate.Year, _MonthSelectionItem.SelectedMonth, selectedDay, _SelectedDate.Hour, _SelectedDate.Minute, _SelectedDate.Second, _SelectedDate.Kind);
+                DisplayMonth = dt;
+                this.SelectedDate = dt;
+            }
+            else if (_YearSelectionItem.SelectedYear > 0)
+            {
+                DateTime dt = new DateTime(_YearSelectionItem.SelectedYear, _MonthSelectionItem.SelectedMonth, 1);
+                DisplayMonth = dt;
+                this.SelectedDate = dt;
+            }
+        }
+        private bool _YearSelectionEnabled = true;
+        /// <summary>
+        /// Gets or sets whether Year/Century selection is enabled.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether Year/Century selection is enabled.")]
+        public bool YearSelectionEnabled
+        {
+            get { return _YearSelectionEnabled; }
+            set
+            {
+                if (_YearSelectionEnabled != value)
+                {
+                    _YearSelectionEnabled = value;
+                    ItemContainer nav = GetNavigationContainer();
+                    if (nav != null)
+                    {
+                        LabelItem label = nav.SubItems[NavYearLabel] as LabelItem;
+                        if (label != null)
+                        {
+                            label.Cursor = _YearSelectionEnabled ? Cursors.Hand : null;
+                        }
+                    }
+                }
+            }
+        }
+
+        private bool _MonthSelectorShortMonthNames = true;
+        /// <summary>
+        /// Indicates whether month selector which is displayed when month label is clicked is using abbreviated month names instead of month number.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether month selector which is displayed when month label is clicked is using abbreviated month names instead of month number.")]
+        public bool MonthSelectorShortMonthNames
+        {
+            get { return _MonthSelectorShortMonthNames; }
+            set
+            {
+                _MonthSelectorShortMonthNames = value;
+                if (_MonthSelectionItem != null)
+                    _MonthSelectionItem.UseMonthNames = _MonthSelectorShortMonthNames;
+            }
+        }
+
+        private eCurrentSingleMonthCalendarOperation _CurrentOperation = eCurrentSingleMonthCalendarOperation.None;
+        private void ShowYearSelection(object sender, EventArgs e)
+        {
+            if (_YearSelector != null || !_YearSelectionEnabled || _CurrentOperation != eCurrentSingleMonthCalendarOperation.None || this.Parent is MonthCalendarItem && (((MonthCalendarItem)this.Parent).CalendarDimensions.Width > 1 || ((MonthCalendarItem)this.Parent).CalendarDimensions.Height > 1))
+                return;
+            _CurrentOperation = eCurrentSingleMonthCalendarOperation.AnimatingShowYearSelector;
+            _YearSelector = new YearSelectorControl();
+            _YearSelector.Size = new Size(8, 8);
+            _YearSelector.Location = new Point(this.LeftInternal + (this.WidthInternal - 8) / 2, this.TopInternal + (this.HeightInternal - 8) / 2);
+            _YearSelector.Visible = true;
+            _YearSelector.Style = eDotNetBarStyle.StyleManagerControlled;
+
+            if (BarFunctions.IsOffice2007Style(this.Style))
+            {
+                Office2007ColorTable table = ((Office2007Renderer)GlobalManager.Renderer).ColorTable;
+                ElementStyle es = (ElementStyle)table.StyleClasses[ElementStyleClassKeys.ItemPanelKey];
+                _YearSelector.BackgroundStyle.BackColor = es.BackColor;
+                _YearSelector.BackgroundStyle.BackColor2 = es.BackColor2;
+            }
+            else
+                _YearSelector.BackgroundStyle.BackColor = SystemColors.Window;
+            ItemContainer nav = GetNavigationContainer();
+            LabelItem label = nav.SubItems[NavMonthLabel] as LabelItem;
+
+            if (!StyleManager.IsMetro(this.EffectiveStyle))
+                _YearSelector.YearSelector.TextColor = label.ForeColor;
+
+            Control cc = (Control)this.ContainerControl;
+            cc.Controls.Add(_YearSelector);
+            _YearSelector.YearSelector.CenturyYearStart = (this.DisplayMonth.Year / 10) * 10;
+            _YearSelector.YearSelector.SelectedYear = this.DisplayMonth.Year;
+            Rectangle targetBounds = this.Bounds;
+
+            _YearSelector.YearSelector.SelectedYearChanged += YearSelectorSelectedYearChanged;
+
+            DevComponents.DotNetBar.Animation.AnimationRectangle anim = new DevComponents.DotNetBar.Animation.AnimationRectangle(
+                new AnimationRequest(_YearSelector, "Bounds", targetBounds),
+                DevComponents.DotNetBar.Animation.AnimationEasing.EaseInOutQuad, 200);
+            anim.AutoDispose = true;
+            anim.AnimationCompleted += ShowAnimationCompleted;
+            anim.Start();
+
+        }
+        private void ShowAnimationCompleted(object sender, EventArgs e)
+        {
+            _CurrentOperation = eCurrentSingleMonthCalendarOperation.None;
+        }
+        private void YearSelectorSelectedYearChanged(object sender, EventArgs e)
+        {
+            if (_CurrentOperation != eCurrentSingleMonthCalendarOperation.None)
+                return;
+            RemoveYearSelector(true);
+
+            DateTime newDisplayMonth = new DateTime(_YearSelector.YearSelector.SelectedYear, this.DisplayMonth.Month, this.DisplayMonth.Day);
+            if (newDisplayMonth < MinDate)
+                newDisplayMonth = MinDate;
+            else if (newDisplayMonth > MaxDate)
+                newDisplayMonth = MaxDate;
+            SetDisplayMonth(newDisplayMonth.Month, newDisplayMonth.Year, eEventSource.Mouse);
+        }
+        private void RemoveYearSelector(bool animate)
+        {
+            if (_CurrentOperation == eCurrentSingleMonthCalendarOperation.AnimatingHideYearSelector) return;
+            if (animate)
+            {
+                _CurrentOperation = eCurrentSingleMonthCalendarOperation.AnimatingHideYearSelector;
+                Rectangle targetBounds = new Rectangle(this.LeftInternal + (this.WidthInternal - 8) / 2, this.TopInternal + (this.HeightInternal - 8) / 2, 8, 8);
+                DevComponents.DotNetBar.Animation.AnimationRectangle anim = new DevComponents.DotNetBar.Animation.AnimationRectangle(
+                    new AnimationRequest(_YearSelector, "Bounds", targetBounds),
+                    DevComponents.DotNetBar.Animation.AnimationEasing.EaseInOutQuad, 200);
+                anim.AnimationCompleted += AnimationCompleted;
+                anim.Start();
+            }
+            else
+            {
+                if (_YearSelector.Parent != null)
+                    _YearSelector.Parent.Controls.Remove(_YearSelector);
+                _YearSelector.YearSelector.SelectedYearChanged -= YearSelectorSelectedYearChanged;
+                _YearSelector.Dispose();
+                _YearSelector = null;
+            }
+        }
+        void AnimationCompleted(object sender, EventArgs e)
+        {
+            DevComponents.DotNetBar.Animation.AnimationRectangle anim = (DevComponents.DotNetBar.Animation.AnimationRectangle)sender;
+            anim.Dispose();
+            if (_YearSelector.Parent != null)
+                _YearSelector.Parent.Controls.Remove(_YearSelector);
+            _YearSelector.YearSelector.SelectedYearChanged -= YearSelectorSelectedYearChanged;
+            _YearSelector.Dispose();
+            _YearSelector = null;
+            _CurrentOperation = eCurrentSingleMonthCalendarOperation.None;
+        }
+        private void ShowMonthSelection(object sender, EventArgs e)
+        {
+            if (_MonthSelector != null || _CurrentOperation != eCurrentSingleMonthCalendarOperation.None || this.Parent is MonthCalendarItem && (((MonthCalendarItem)this.Parent).CalendarDimensions.Width > 1 || ((MonthCalendarItem)this.Parent).CalendarDimensions.Height > 1))
+                return;
+            if (!HeaderNavigationEnabled) return;
+
+            _CurrentOperation = eCurrentSingleMonthCalendarOperation.AnimatingShowMonthSelector;
+            _MonthSelector = new MonthSelectorControl();
+            _MonthSelector.Size = new Size(8, 8);
+            _MonthSelector.Location = new Point(this.LeftInternal + (this.WidthInternal - 8) / 2, this.TopInternal + (this.HeightInternal - 8) / 2);
+            _MonthSelector.MonthSelector.UseMonthNames = _MonthSelectorShortMonthNames;
+            _MonthSelector.Visible = true;
+            _MonthSelector.Style = eDotNetBarStyle.StyleManagerControlled;
+
+            if (BarFunctions.IsOffice2007Style(this.Style))
+            {
+                Office2007ColorTable table = ((Office2007Renderer)GlobalManager.Renderer).ColorTable;
+                ElementStyle es = (ElementStyle)table.StyleClasses[ElementStyleClassKeys.ItemPanelKey];
+                _MonthSelector.BackgroundStyle.BackColor = es.BackColor;
+                _MonthSelector.BackgroundStyle.BackColor2 = es.BackColor2;
+            }
+            else
+                _MonthSelector.BackgroundStyle.BackColor = SystemColors.Window;
+            ItemContainer nav = GetNavigationContainer();
+            LabelItem label = nav.SubItems[NavMonthLabel] as LabelItem;
+
+            if (!StyleManager.IsMetro(this.EffectiveStyle))
+                _MonthSelector.MonthSelector.TextColor = label.ForeColor;
+
+            Control cc = (Control)this.ContainerControl;
+            cc.Controls.Add(_MonthSelector);
+            _MonthSelector.MonthSelector.SelectedMonth = this.DisplayMonth.Month;
+            Rectangle targetBounds = this.Bounds;
+
+            _MonthSelector.MonthSelector.SelectedMonthChanged += MonthSelectorSelectedMonthChanged;
+
+            DevComponents.DotNetBar.Animation.AnimationRectangle anim = new DevComponents.DotNetBar.Animation.AnimationRectangle(
+                new AnimationRequest(_MonthSelector, "Bounds", targetBounds),
+                DevComponents.DotNetBar.Animation.AnimationEasing.EaseInOutQuad, 200);
+            anim.AutoDispose = true;
+            anim.AnimationCompleted += ShowAnimationCompleted;
+            anim.Start();
+
+        }
+        private void MonthSelectorSelectedMonthChanged(object sender, EventArgs e)
+        {
+            if (_CurrentOperation != eCurrentSingleMonthCalendarOperation.None)
+                return;
+            RemoveMonthSelector(true);
+
+            DateTime newDisplayMonth = new DateTime(this.DisplayMonth.Year, _MonthSelector.MonthSelector.SelectedMonth, this.DisplayMonth.Day);
+            if (newDisplayMonth < MinDate)
+                newDisplayMonth = MinDate;
+            else if (newDisplayMonth > MaxDate)
+                newDisplayMonth = MaxDate;
+            SetDisplayMonth(newDisplayMonth.Month, newDisplayMonth.Year, eEventSource.Mouse);
+        }
+        private void RemoveMonthSelector(bool animate)
+        {
+            if (_CurrentOperation == eCurrentSingleMonthCalendarOperation.AnimatingHideMonthSelector) return;
+            if (animate)
+            {
+                _CurrentOperation = eCurrentSingleMonthCalendarOperation.AnimatingHideMonthSelector;
+                Rectangle targetBounds = new Rectangle(this.LeftInternal + (this.WidthInternal - 8) / 2, this.TopInternal + (this.HeightInternal - 8) / 2, 8, 8);
+                DevComponents.DotNetBar.Animation.AnimationRectangle anim = new DevComponents.DotNetBar.Animation.AnimationRectangle(
+                    new AnimationRequest(_MonthSelector, "Bounds", targetBounds),
+                    DevComponents.DotNetBar.Animation.AnimationEasing.EaseInOutQuad, 200);
+                anim.AnimationCompleted += MonthSelectorAnimationCompleted;
+                anim.Start();
+            }
+            else
+            {
+                if (_MonthSelector.Parent != null)
+                    _MonthSelector.Parent.Controls.Remove(_MonthSelector);
+                _MonthSelector.MonthSelector.SelectedMonthChanged -= MonthSelectorSelectedMonthChanged;
+                _MonthSelector.Dispose();
+                _MonthSelector = null;
+            }
+        }
+        void MonthSelectorAnimationCompleted(object sender, EventArgs e)
+        {
+            DevComponents.DotNetBar.Animation.AnimationRectangle anim = (DevComponents.DotNetBar.Animation.AnimationRectangle)sender;
+            anim.Dispose();
+            if (_MonthSelector.Parent != null)
+                _MonthSelector.Parent.Controls.Remove(_MonthSelector);
+            _MonthSelector.MonthSelector.SelectedMonthChanged -= MonthSelectorSelectedMonthChanged;
+            _MonthSelector.Dispose();
+            _MonthSelector = null;
+            _CurrentOperation = eCurrentSingleMonthCalendarOperation.None;
+        }
+
+        //private void ShowMonthSelectionPopupMenu(object sender, EventArgs e)
+        //{
+        //    if (!HeaderNavigationEnabled) return;
+
+        //    ButtonItem parent = _MonthsPopupMenu;
+        //    foreach (BaseItem item in parent.SubItems)
+        //    {
+        //        item.Click -= new EventHandler(PopupMonthSelectionClick);
+        //    }
+        //    parent.SubItems.Clear();
+
+        //    string[] months = DateTimeInput.GetActiveCulture().DateTimeFormat.MonthNames;
+        //    for (int i = 0; i < months.Length; i++)
+        //    {
+        //        if (months[i] == null || months[i].Length == 0) continue;
+
+        //        ButtonItem m = new ButtonItem((i + 1).ToString(), months[i]);
+        //        m.AutoCollapseOnClick = false;
+        //        parent.SubItems.Add(m);
+        //        m.Click += new EventHandler(PopupMonthSelectionClick);
+        //    }
+
+        //    parent.Popup(Control.MousePosition);
+        //}
+
+        private void PopupMonthSelectionClick(object sender, EventArgs e)
+        {
+            ButtonItem b = sender as ButtonItem;
+            if (b == null) return;
+            int month = int.Parse(b.Name);
+            ((PopupItem)b.Parent).Expanded = false;
+            SetDisplayMonth(month, this.DisplayMonth.Year, eEventSource.Mouse);
+        }
+
+        public override void RecalcSize()
+        {
+            Point innerLocation = m_Rect.Location;
+            bool disposeStyle = false;
+            ElementStyle style = ElementStyleDisplay.GetElementStyle(this.BackgroundStyle, out disposeStyle);
+            innerLocation.X += ElementStyleLayout.LeftWhiteSpace(style); // m_BackgroundStyle.PaddingLeft + m_BackgroundStyle.MarginLeft;
+            innerLocation.Y += ElementStyleLayout.TopWhiteSpace(style);
+
+            if (_MonthSelectionMode)
+            {
+                foreach (BaseItem item in this.SubItems)
+                {
+                    item.Displayed = false;
+                }
+
+                _MonthSelectionItem.LeftInternal = innerLocation.X;
+                _MonthSelectionItem.TopInternal = innerLocation.Y + 22;
+                _MonthSelectionItem.RecalcSize();
+                _MonthSelectionItem.Displayed = true;
+                _YearSelectionItem.LeftInternal = innerLocation.X + _MonthSelectionItem.WidthInternal;
+                _YearSelectionItem.TopInternal = innerLocation.Y;
+                _YearSelectionItem.RecalcSize();
+                _YearSelectionItem.Displayed = true;
+                m_Rect.Width = _MonthSelectionItem.WidthInternal + _YearSelectionItem.WidthInternal;
+                m_Rect.Height = Math.Max(_MonthSelectionItem.HeightInternal, _YearSelectionItem.HeightInternal);
+                m_Rect.Width += ElementStyleLayout.HorizontalStyleWhiteSpace(style);
+                m_Rect.Height += ElementStyleLayout.VerticalStyleWhiteSpace(style);
+            }
+            else
+            {
+                int c = 49;
+                int itemsInLine = 0;
+                int lineHeight = 0;
+                int daysSpacing = 2;
+
+                Point weekStartPoint = innerLocation;
+                Point daysStartPoint = innerLocation;
+
+                Size daySize = Dpi.Size(_DaySize);
+                if (_ShowWeekNumbers)
+                {
+                    daysStartPoint.X += daySize.Width;
+                }
+
+                ItemContainer nav = GetNavigationContainer();
+                nav.LeftInternal = innerLocation.X;
+                nav.TopInternal = innerLocation.Y;
+                nav.WidthInternal = daySize.Width * (_ShowWeekNumbers ? 8 : 7);
+                nav.RecalcSize();
+                nav.WidthInternal = daySize.Width * (_ShowWeekNumbers ? 8 : 7);
+                weekStartPoint.Y += nav.HeightInternal + 1;
+                daysStartPoint.Y += nav.HeightInternal + 1;
+
+                Point p = daysStartPoint;
+                int line = 0;
+                for (int i = 0; i < c; i++)
+                {
+                    BaseItem item = this.SubItems[i];
+                    if (item is YearSelectorContainer) continue;
+                    DayLabel day = item as DayLabel;
+                    if (day != null)
+                    {
+                        day.RecalcSize();
+                        day.Bounds = new Rectangle(p, daySize);
+                    }
+                    else
+                    {
+                        item.RecalcSize();
+                    }
+
+                    if (item.Visible)
+                    {
+                        if (item.HeightInternal > lineHeight)
+                            lineHeight = item.HeightInternal;
+                        p.X += item.WidthInternal;
+                    }
+                    itemsInLine++;
+                    if (itemsInLine == 7)
+                    {
+                        if (_ShowWeekNumbers)
+                        {
+                            if (line > 0)
+                            {
+                                DayLabel weekLabel = this.SubItems[c + line - 1] as DayLabel;
+                                weekLabel.RecalcSize();
+                                weekLabel.Bounds = new Rectangle(weekStartPoint, daySize);
+                                weekStartPoint.Y += lineHeight;
+                            }
+                            else
+                                weekStartPoint.Y += lineHeight + daysSpacing;
+                        }
+
+                        itemsInLine = 0;
+                        p.Y += lineHeight;
+                        if (line == 0) p.Y += daysSpacing;
+                        p.X = daysStartPoint.X;
+                        lineHeight = 0;
+                        line++;
+                    }
+                }
+                m_Rect.Width = daySize.Width * 7;
+                m_Rect.Height = daySize.Height * 7 + daysSpacing;
+                if (_ShowWeekNumbers)
+                    m_Rect.Width += daySize.Width;
+
+                m_Rect.Width += ElementStyleLayout.HorizontalStyleWhiteSpace(style);
+                m_Rect.Height += ElementStyleLayout.VerticalStyleWhiteSpace(style) + nav.HeightInternal + 1;
+            }
+
+            if (disposeStyle) style.Dispose();
+
+            base.RecalcSize();
+        }
+
+        /// <summary>
+        /// Must be overridden by class that is inheriting to provide the painting for the item.
+        /// </summary>
+        public override void Paint(ItemPaintArgs p)
+        {
+            ItemContainer nav = GetNavigationContainer();
+            LabelItem label = nav.SubItems[NavMonthLabel] as LabelItem;
+            label.ForeColor = p.Colors.ItemText;
+            label = nav.SubItems[NavYearLabel] as LabelItem;
+            label.ForeColor = p.Colors.ItemText;
+
+            base.Paint(p);
+        }
+
+        /// <summary>
+        /// Returns copy of the item.
+        /// </summary>
+        public override BaseItem Copy()
+        {
+            SingleMonthCalendar objCopy = new SingleMonthCalendar();
+            this.CopyToItem(objCopy);
+            return objCopy;
+        }
+        /// <summary>
+        /// Copies the CalendarMonth specific properties to new instance of the item.
+        /// </summary>
+        /// <param name="c">New ButtonItem instance.</param>
+        protected override void CopyToItem(BaseItem c)
+        {
+            SingleMonthCalendar copy = c as SingleMonthCalendar;
+            base.CopyToItem(copy);
+        }
+
+        private void SetDisplayMonth(DateTime date, eEventSource source)
+        {
+            SetDisplayMonth(date.Month, date.Year, source);
+        }
+
+        private void SetDisplayMonth(int month, int year, eEventSource source)
+        {
+            DateTime d = new DateTime(year, month, 1);
+            bool monthChanged = d != _DisplayMonth;
+
+            if (_MonthSelectionMode)
+            {
+                _DisplayMonth = d;
+                if (monthChanged)
+                    OnMonthChanged(new DevComponents.DotNetBar.Events.EventSourceArgs(source));
+                return;
+            }
+
+            if (monthChanged)
+                OnMonthChanging(new DevComponents.DotNetBar.Events.EventSourceArgs(source));
+
+            _DisplayMonth = d;
+            // Initialize days
+            string[] dayNames = DateTimeInput.GetActiveCulture().DateTimeFormat.AbbreviatedDayNames;
+            string[] shortestDayNames = DateTimeInput.GetActiveCulture().DateTimeFormat.ShortestDayNames;
+            if (_DayNames != null)
+                dayNames = _DayNames;
+            int firstDay = (int)_FirstDayOfWeek, currentDay = firstDay;
+            for (int i = 0; i < 7; i++)
+            {
+                DayLabel day = this.SubItems[i] as DayLabel;
+                day.Text = _TwoLetterDayName ? GetTwoLetterDayName(shortestDayNames[currentDay]) : dayNames[currentDay];
+                day.Visible = true;
+                day.Displayed = true;
+                day.TrackMouse = false;
+                day.Selectable = false;
+                day.IsDayLabel = true;
+                ApplyDayOfWeekMarker(day);
+                currentDay++;
+                if (currentDay > 6)
+                    currentDay = 0;
+            }
+
+            // Recurring monthly markers
+            bool[] monthlyMarkers = GetMonthlyMarkers();
+            bool[] weeklyMarkers = GetWeeklyMarkers();
+            bool[] annualMarkers = GetAnnualMarkers(month);
+            bool[] markedDays = GetMarkedDays(month, year);
+
+            DateTime today = _ShowTodayMarker ? (_TodayDate == DateTime.MinValue ? DateTime.Today : _TodayDate) : DateTime.MinValue;
+            bool markToday = today != DateTime.MinValue;
+
+            // Initialize days, If Visible=true, but Displayed=False item not displayed but takes space in layout. 
+            // If Visible=false item not visible and does not take space in layout.
+            int firstDayOfMonth = (int)d.DayOfWeek - firstDay;
+            if (firstDayOfMonth < 0) firstDayOfMonth = 7 + firstDayOfMonth;
+            int startIndex = 7;
+            if (firstDayOfMonth > 0)
+            {
+                DateTime dt = d;
+                dt = dt.AddDays(-firstDayOfMonth);
+
+                annualMarkers = GetAnnualMarkers(dt.Month);
+                markedDays = GetMarkedDays(dt.Month, dt.Year);
+
+                for (int i = startIndex; i < startIndex + firstDayOfMonth; i++)
+                {
+                    DayLabel day = this.SubItems[i] as DayLabel;
+                    day.Date = dt;
+                    day.Visible = true;
+                    ResetDayLabel(day);
+
+                    if (weeklyMarkers[(int)dt.DayOfWeek])
+                        ApplyWeeklyMarker(day);
+                    if (monthlyMarkers[dt.Day - 1])
+                        ApplyMonthlyMarker(day);
+                    if (annualMarkers[dt.Day - 1])
+                        ApplyAnnualMarker(day);
+                    if (markedDays[dt.Day - 1])
+                        ApplyDayMarker(day);
+
+                    if (markToday && today == dt) day.IsToday = true;
+
+                    if (!_WeekendDaysSelectable && DayLabel.IsWeekend(dt))
+                    {
+                        day.Selectable = false;
+                        day.TrackMouse = false;
+                    }
+                    day.Enabled = CanSelect(dt);
+                    day.Displayed = _TrailingDaysVisible && _TrailingDaysBeforeVisible;
+                    day.IsTrailing = true;
+                    dt = dt.AddDays(1);
+                }
+                startIndex += firstDayOfMonth;
+            }
+
+            annualMarkers = GetAnnualMarkers(month);
+            markedDays = GetMarkedDays(month, year);
+            bool newMonthFirstSwitch = true;
+
+            int runningWeek = 0, dayCount = startIndex % 7;
+            for (int i = startIndex; i < 49; i++)
+            {
+                DayLabel day = this.SubItems[i] as DayLabel;
+                day.Date = d;
+                ResetDayLabel(day);
+
+                if (d.Month != month && newMonthFirstSwitch)
+                {
+                    annualMarkers = GetAnnualMarkers(d.Month);
+                    markedDays = GetMarkedDays(d.Month, d.Year);
+                    newMonthFirstSwitch = false;
+                }
+
+                if (weeklyMarkers[(int)d.DayOfWeek])
+                    ApplyWeeklyMarker(day);
+                if (monthlyMarkers[d.Day - 1])
+                    ApplyMonthlyMarker(day);
+                if (annualMarkers[d.Day - 1])
+                    ApplyAnnualMarker(day);
+                if (markedDays[d.Day - 1])
+                    ApplyDayMarker(day);
+
+                if (markToday && today == d) day.IsToday = true;
+
+                if (!_WeekendDaysSelectable && DayLabel.IsWeekend(d))
+                {
+                    day.Selectable = false;
+                    day.TrackMouse = false;
+                }
+                day.Enabled = CanSelect(d);
+
+                day.Visible = true;
+                if (d.Month != month)
+                {
+                    day.IsTrailing = true;
+                    day.Displayed = _TrailingDaysVisible && _TrailingDaysAfterVisible;
+                }
+                else
+                {
+                    day.Displayed = true;
+                    day.IsTrailing = false;
+                    if (day.Date == _SelectedDate) day.IsSelected = true;
+                }
+
+                if (dayCount == 6)
+                {
+                    if (_ShowWeekNumbers)
+                    {
+                        DayLabel week = this.SubItems[49 + runningWeek] as DayLabel;
+                        week.Text = DateTimeInput.GetActiveCulture().Calendar.GetWeekOfYear(d, _WeekOfYearRule, _FirstDayOfWeek).ToString();
+                        week.Visible = true;
+                        week.TrackMouse = false;
+                        week.Selectable = false;
+                        if (d.Month != month && d.AddDays(-dayCount).Month != month)
+                            week.Displayed = _TrailingDaysVisible;
+                        else
+                            week.Displayed = true;
+                        ApplyWeekOfYearMarker(week);
+                    }
+                    runningWeek++;
+                    dayCount = -1;
+                }
+
+                d = d.AddDays(1);
+                dayCount++;
+            }
+
+            // Update Navigation Container
+            ItemContainer nav = GetNavigationContainer();
+            nav.Visible = true;
+            nav.Displayed = true;
+            LabelItem label = nav.SubItems[NavMonthLabel] as LabelItem;
+            //Size daySize = Dpi.Size(_DaySize);
+            label.Width = _DaySize.Width * 3;
+            label.Text = DateTimeInput.GetActiveCulture().DateTimeFormat.MonthNames[month - 1];
+            label = nav.SubItems[NavYearLabel] as LabelItem;
+            label.Text = year.ToString();
+            label.Width = (int)(_DaySize.Width * 1.4);
+
+            // Enable/disable navigation buttons
+            UpdateNavigationButtonsEnabled();
+
+            this.OnAppearanceChanged();
+            this.Refresh();
+
+            if (monthChanged)
+            {
+                OnMonthChanged(new DevComponents.DotNetBar.Events.EventSourceArgs(source));
+                if (_YearSelector != null)
+                    RemoveYearSelector(false);
+                if (_MonthSelector != null)
+                    RemoveMonthSelector(false);
+            }
+        }
+
+        private void UpdateNavigationButtonsEnabled()
+        {
+            // Enable/disable navigation buttons
+            ItemContainer nav = GetNavigationContainer();
+            DateTime d = _DisplayMonth.AddMonths(_NavigationMonthsAheadVisibility);
+            if (d > this.MaxDate)
+            {
+                nav.SubItems[NavIncreaseMonth].Enabled = false;
+                nav.SubItems[NavIncreaseYear].Enabled = false;
+            }
+            else
+            {
+                nav.SubItems[NavIncreaseMonth].Enabled = true;
+                d = _DisplayMonth.AddYears(1);
+                nav.SubItems[NavIncreaseYear].Enabled = (MaxDate > d);
+            }
+            d = _DisplayMonth.AddMonths(-1);
+            if (d < GetBeginningOfTheMonth(this.MinDate))
+            {
+                nav.SubItems[NavDecreaseMonth].Enabled = false;
+                nav.SubItems[NavDecreaseYear].Enabled = false;
+            }
+            else
+            {
+                nav.SubItems[NavDecreaseMonth].Enabled = true;
+                d = _DisplayMonth.AddYears(-1);
+                nav.SubItems[NavDecreaseYear].Enabled = (d > MinDate);
+            }
+            d = _DisplayMonth;
+            if (this.MinDate != DateTimeGroup.MinDateTime && d.Year > this.MinDate.Year && d.Month>=this.MinDate.Month)
+                nav.SubItems[NavDecreaseYear].Enabled = true;
+        }
+
+        private DateTime GetBeginningOfTheMonth(DateTime date)
+        {
+            if (date.Day > 1)
+                date = date.AddDays(-date.Day);
+            return date;
+        }
+
+        private bool CanSelect(DateTime d)
+        {
+            if (d > MaxDate || d < MinDate)
+                return false;
+            return true;
+        }
+
+        private void ApplyWeekOfYearMarker(DayLabel day)
+        {
+            MonthCalendarColors c = GetColors();
+            if (c == null || !c.WeekOfYear.IsCustomized) return;
+
+            ApplyMarker(day, c.WeekOfYear);
+        }
+
+        private void ApplyDayOfWeekMarker(DayLabel day)
+        {
+            MonthCalendarColors c = GetColors();
+            if (c == null || !c.DayLabel.IsCustomized) return;
+
+            ApplyMarker(day, c.DayLabel);
+        }
+
+        private void ApplyDayMarker(DayLabel day)
+        {
+            MonthCalendarColors c = GetColors();
+            if (c == null || !c.DayMarker.IsCustomized) return;
+
+            ApplyMarker(day, c.DayMarker);
+        }
+
+        private bool[] GetMarkedDays(int month, int year)
+        {
+            bool[] markers = new bool[31];
+            if (this.Parent is MonthCalendarItem)
+            {
+                MonthCalendarItem mc = this.Parent as MonthCalendarItem;
+                DateTime[] dates = mc.MarkedDates;
+                foreach (DateTime d in dates)
+                {
+                    if (d.Month == month && d.Year == year)
+                    {
+                        markers[d.Day - 1] = true;
+                    }
+                }
+            }
+
+            return markers;
+        }
+
+        private void ApplyAnnualMarker(DayLabel day)
+        {
+            MonthCalendarColors c = GetColors();
+            if (c == null || !c.AnnualMarker.IsCustomized) return;
+
+            ApplyMarker(day, c.AnnualMarker);
+        }
+
+        internal MonthCalendarColors GetColors()
+        {
+            MonthCalendarItem mc = this.Parent as MonthCalendarItem;
+            MonthCalendarColors c = null;
+            if (mc != null)
+                c = mc.Colors;
+            else
+                c = _Colors;
+
+            return c;
+        }
+
+        private void ApplyWeeklyMarker(DayLabel day)
+        {
+            MonthCalendarColors c = GetColors();
+            if (c == null || !c.WeeklyMarker.IsCustomized) return;
+
+            ApplyMarker(day, c.WeeklyMarker);
+        }
+
+        private void ApplyMonthlyMarker(DayLabel day)
+        {
+            MonthCalendarColors c = GetColors();
+            if (c == null || !c.MonthlyMarker.IsCustomized) return;
+
+            ApplyMarker(day, c.MonthlyMarker);
+        }
+
+        private void ApplyMarker(DayLabel day, DateAppearanceDescription c)
+        {
+            day.BackgroundStyle.BackColor = c.BackColor;
+            day.BackgroundStyle.BackColor2 = c.BackColor2;
+            day.BackgroundStyle.BackColorGradientAngle = c.BackColorGradientAngle;
+            if (!c.BorderColor.IsEmpty)
+            {
+                day.BackgroundStyle.Border = eStyleBorderType.Solid;
+                day.BackgroundStyle.BorderColor = c.BorderColor;
+                day.BackgroundStyle.BorderWidth = 1;
+            }
+            day.IsBold = c.IsBold;
+            if (!c.TextColor.IsEmpty)
+                day.TextColor = c.TextColor;
+            day.Selectable = c.Selectable;
+            if (!c.Selectable)
+                day.TrackMouse = false;
+        }
+
+        private bool[] GetMonthlyMarkers()
+        {
+            bool[] markers = new bool[31];
+            if (this.Parent is MonthCalendarItem)
+            {
+                MonthCalendarItem mc = this.Parent as MonthCalendarItem;
+                DateTime[] dates = mc.MonthlyMarkedDates;
+                foreach (DateTime d in dates)
+                {
+                    markers[d.Day - 1] = true;
+                }
+            }
+
+            return markers;
+        }
+
+        private bool[] GetAnnualMarkers(int month)
+        {
+            bool[] markers = new bool[31];
+            if (this.Parent is MonthCalendarItem)
+            {
+                MonthCalendarItem mc = this.Parent as MonthCalendarItem;
+                DateTime[] dates = mc.AnnuallyMarkedDates;
+                foreach (DateTime d in dates)
+                {
+                    if (d.Month == month)
+                    {
+                        markers[d.Day - 1] = true;
+                    }
+                }
+            }
+
+            return markers;
+        }
+
+        private bool[] GetWeeklyMarkers()
+        {
+            bool[] markers = new bool[7];
+            if (this.Parent is MonthCalendarItem)
+            {
+                MonthCalendarItem mc = this.Parent as MonthCalendarItem;
+                DayOfWeek[] days = mc.WeeklyMarkedDays;
+                foreach (DayOfWeek d in days)
+                {
+                    markers[(int)d] = true;
+                }
+            }
+
+            return markers;
+        }
+
+        private ItemContainer GetNavigationContainer()
+        {
+            return this.SubItems[NavigationContainerName] as ItemContainer;
+        }
+
+        private void ResetDayLabel(DayLabel day)
+        {
+            day.IsSelected = false;
+            day.Selectable = true;
+            day.TrackMouse = true;
+            day.IsToday = false;
+            day.IsBold = false;
+            day.Image = null;
+            day.ImageAlign = eLabelPartAlignment.MiddleRight;
+            day.TextAlign = _DefaultDayLabelTextAlign;
+            day.TextColor = Color.Empty;
+            day.Tooltip = "";
+            day.ExpandOnMouseDown = false;
+            day.SubItems.Clear();
+            day.BackgroundStyle. Reset();
+        }
+
+        /// <summary>
+        /// Raises the MonthChanged event.
+        /// </summary>
+        /// <param name="e">Provides additional event data.</param>
+        protected virtual void OnMonthChanged(EventArgs e)
+        {
+            if (MonthChanged != null)
+                MonthChanged(this, e);
+        }
+
+        /// <summary>
+        /// Raises the MonthChanging event.
+        /// </summary>
+        /// <param name="e">Provides additional event data.</param>
+        protected virtual void OnMonthChanging(EventArgs e)
+        {
+            if (MonthChanging != null)
+                MonthChanging(this, e);
+        }
+
+        private DateTime _DisplayMonth = new DateTime(DateTime.Now.Year, DateTime.Now.Month, 1);
+        [Description("")]
+        public DateTime DisplayMonth
+        {
+            get { return _DisplayMonth; }
+            set
+            {
+                if (value < MinDate)
+                    value = MinDate;
+                else if (value > MaxDate)
+                    value = MaxDate;
+                //if (value > MaxDate || value < MinDate)
+                //{
+                //    throw new ArgumentException("DisplayMonth must be less than MaxDate and greater than MinDate");
+                //}
+
+                SetDisplayMonth(value.Month, value.Year, eEventSource.Code);
+            }
+        }
+
+        private string GetTwoLetterDayName(string s)
+        {
+            if (s.Length > 2)
+                return s.Substring(0, 2);
+            return s;
+        }
+
+        private DayOfWeek _FirstDayOfWeek = DayOfWeek.Sunday;
+        /// <summary>
+        /// Gets or sets the first day of week displayed on the calendar. Default value is Sunday.
+        /// </summary>
+        [DefaultValue(DayOfWeek.Sunday), Description("Indicates first day of week displayed on the calendar.")]
+        public DayOfWeek FirstDayOfWeek
+        {
+            get { return _FirstDayOfWeek; }
+            set
+            {
+                if (_FirstDayOfWeek != value)
+                {
+                    _FirstDayOfWeek = value;
+                    SetDisplayMonth(_DisplayMonth.Month, _DisplayMonth.Year, eEventSource.Code);
+                }
+            }
+        }
+
+        internal bool _TrailingDaysVisible = true;
+        /// <summary>
+        /// Gets or sets whether trailing days outside of the current displayed month are visible on calendar.
+        /// </summary>
+        [DefaultValue(true)]
+        public bool TrailingDaysVisible
+        {
+            get { return _TrailingDaysVisible; }
+            set
+            {
+                if (_TrailingDaysVisible != value)
+                {
+                    _TrailingDaysVisible = value;
+                    OnTrailingDaysVisibleChanged();
+                }
+            }
+        }
+
+        internal bool _TrailingDaysBeforeVisible = true;
+        internal bool TrailingDaysBeforeVisible
+        {
+            get { return _TrailingDaysBeforeVisible; }
+            set
+            {
+                if (_TrailingDaysBeforeVisible != value)
+                {
+                    _TrailingDaysBeforeVisible = value;
+                    OnTrailingDaysVisibleChanged();
+                }
+            }
+        }
+
+        internal bool _TrailingDaysAfterVisible = true;
+        internal bool TrailingDaysAfterVisible
+        {
+            get { return _TrailingDaysAfterVisible; }
+            set
+            {
+                if (_TrailingDaysAfterVisible != value)
+                {
+                    _TrailingDaysAfterVisible = value;
+                    OnTrailingDaysVisibleChanged();
+                }
+            }
+        }
+        private void OnTrailingDaysVisibleChanged()
+        {
+            if (_MonthSelectionMode) return;
+            foreach (BaseItem item in this.SubItems)
+            {
+                DayLabel day = item as DayLabel;
+                if (day != null && day.IsTrailing)
+                {
+                    bool visible = _TrailingDaysVisible;
+                    if (day.Date < this.DisplayMonth)
+                        visible &= _TrailingDaysBeforeVisible;
+                    else
+                        visible &= _TrailingDaysAfterVisible;
+                    day.Displayed = visible;
+                }
+            }
+            this.Refresh();
+        }
+
+        private bool _ShowWeekNumbers = false;
+        /// <summary>
+        /// Gets or sets whether week of year is visible. Default value is false.
+        /// </summary>
+        [DefaultValue(false), Description("Indicates whether week of year is visible.")]
+        public bool ShowWeekNumbers
+        {
+            get { return _ShowWeekNumbers; }
+            set
+            {
+                if (_ShowWeekNumbers != value)
+                {
+                    _ShowWeekNumbers = value;
+                    OnShowWeekNumbersChanged();
+                    NeedRecalcSize = true;
+                    OnAppearanceChanged();
+                }
+            }
+        }
+
+        private void OnShowWeekNumbersChanged()
+        {
+            if (_ShowWeekNumbers)
+            {
+                // Add week of year labels, always after the days 
+                for (int i = 0; i < 6; i++)
+                {
+                    DayLabel week = new DayLabel();
+                    week.IsWeekOfYear = true;
+                    this.SubItems.Insert(49 + i, week);
+                }
+            }
+            else
+            {
+                // Remove week of year labels
+                for (int i = 0; i < 7; i++)
+                {
+                    DayLabel week = this.SubItems[49] as DayLabel;
+                    if (week != null && week.IsWeekOfYear)
+                        this.SubItems.Remove(49);
+                }
+            }
+        }
+
+        private CalendarWeekRule _WeekOfYearRule = CalendarWeekRule.FirstDay;
+        /// <summary>
+        /// Gets or sets the rule used to determine first week of the year for week of year display on calendar. Default value is first-day.
+        /// </summary>
+        [DefaultValue(CalendarWeekRule.FirstDay), Description("Indicates rule used to determine first week of the year for week of year display on calendar.")]
+        public CalendarWeekRule WeekOfYearRule
+        {
+            get { return _WeekOfYearRule; }
+            set
+            {
+                _WeekOfYearRule = value;
+                if (_ShowWeekNumbers)
+                    this.OnAppearanceChanged();
+            }
+        }
+
+        /// <summary>
+        /// Returns the collection of sub items.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override SubItemsCollection SubItems
+        {
+            get
+            {
+                return base.SubItems;
+            }
+        }
+
+        private Size _DaySize = _DefaultDaySize;
+        /// <summary>
+        /// Gets or sets the size of each day item on the calendar. Default value is 24, 15.
+        /// </summary>
+        [Description("Indicate size of each day item on the calendar.")]
+        public Size DaySize
+        {
+            get { return _DaySize; }
+            set
+            {
+                _DaySize = value;
+                OnDaySizeChanged();
+            }
+        }
+
+        private void OnDaySizeChanged()
+        {
+            ItemContainer ic = GetNavigationContainer();
+            Size daySize = _DaySize;
+            if (ic.MinimumSize.Height < daySize.Height)
+                ic.MinimumSize = new Size(ic.MinimumSize.Width, daySize.Height);
+            OnAppearanceChanged();
+        }
+        /// <summary>
+        /// Gets whether property should be serialized. Provided for designer support.
+        /// </summary>
+        /// <returns></returns>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeDaySize()
+        {
+            return _DaySize.Width != _DefaultDaySize.Width || _DaySize.Height != _DefaultDaySize.Height;
+        }
+        /// <summary>
+        /// Reset property to default value. Provided for designer support.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetDaySize()
+        {
+            this.DaySize = _DefaultDaySize;
+        }
+
+        private Size _NavigationButtonSize = _DefaultNavigationButtonSize;
+        /// <summary>
+        /// Gets or sets the size of date navigation buttons on the calendar. Default value is 13, 18. If you increase size of the navigation
+        /// buttons change DaySize as well so everything fits.
+        /// </summary>
+        [Description("Indicate size of date navigation buttons on the calendar. If you increase size of the navigation buttons change DaySize as well so everything fits.")]
+        public Size NavigationButtonSize
+        {
+            get { return _NavigationButtonSize; }
+            set
+            {
+                _NavigationButtonSize = value;
+                OnNavigationButtonSizeChanged();
+            }
+        }
+
+        protected override void ScaleItem(SizeF factor)
+        {
+            base.ScaleItem(factor);
+            OnNavigationButtonSizeChanged();
+        }
+
+        private void OnNavigationButtonSizeChanged()
+        {
+            Size fixedButtonSize = _NavigationButtonSize;
+            ItemContainer cont = GetNavigationContainer();
+            cont.MinimumSize = new Size(0, fixedButtonSize.Height + 3);
+
+            ButtonItem nav = (ButtonItem)cont.SubItems[NavDecreaseMonth];
+            nav.FixedSize = fixedButtonSize;
+
+            nav = (ButtonItem)cont.SubItems[NavIncreaseMonth];
+            nav.FixedSize = fixedButtonSize;
+
+            nav = (ButtonItem)cont.SubItems[NavDecreaseYear];
+            nav.FixedSize = fixedButtonSize;
+
+            nav = (ButtonItem)cont.SubItems[NavIncreaseYear];
+            nav.FixedSize = fixedButtonSize;
+
+            OnAppearanceChanged();
+        }
+        /// <summary>
+        /// Gets whether property should be serialized. Provided for designer support.
+        /// </summary>
+        /// <returns></returns>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeNavigationButtonSize()
+        {
+            return _NavigationButtonSize.Width != _DefaultNavigationButtonSize.Width || _NavigationButtonSize.Height != _DefaultNavigationButtonSize.Height;
+        }
+        /// <summary>
+        /// Reset property to default value. Provided for designer support.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetNavigationButtonSize()
+        {
+            this.NavigationButtonSize = _DefaultNavigationButtonSize;
+        }
+
+        /// <summary>
+        /// Raises the PaintLabel event.
+        /// </summary>
+        /// <param name="e">Provides event data.</param>
+        internal void OnPaintLabel(DayLabel label, DayPaintEventArgs e)
+        {
+            if (PaintLabel != null)
+                PaintLabel(label, e);
+        }
+
+        private MonthCalendarColors _Colors = new MonthCalendarColors();
+        /// <summary>
+        /// Gets the calendar colors used by the control.
+        /// </summary>
+        [NotifyParentPropertyAttribute(true), Category("Appearance"), Description("Gets colors used by control."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public MonthCalendarColors Colors
+        {
+            get { return _Colors; }
+        }
+
+        internal void DayLabelClick(DayLabel day)
+        {
+            if (!_MouseSelectionEnabled) return;
+
+            if (day.Selectable && day.Date != DateTime.MinValue)
+            {
+                if (!_WeekendDaysSelectable && DayLabel.IsWeekend(day.Date))
+                    return;
+
+                if (MultiSelect)
+                {
+                    if (_SelectedDate == DateTime.MinValue)
+                        _SelectedDate = day.Date;
+                    day.IsSelected = !day.IsSelected;
+                }
+                else
+                {
+                    SelectedDate = day.Date;
+                }
+            }
+        }
+
+        private bool _MultiSelect = false;
+        /// <summary>
+        /// Gets or sets whether multiple days can be selected by clicking each day. Default value is false.
+        /// </summary>
+        [DefaultValue(false), Description("Indicates whether multiple days can be selected by clicking each day.")]
+        public bool MultiSelect
+        {
+            get { return _MultiSelect; }
+            set
+            {
+                if (_MultiSelect != value)
+                {
+                    _MultiSelect = value;
+                }
+            }
+        }
+
+        private bool _MouseSelectionEnabled = true;
+        /// <summary>
+        /// Gets or sets whether selection of dates using mouse is enabled. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Description("Indicates whether selection of dates using mouse is enabled.")]
+        public bool MouseSelectionEnabled
+        {
+            get { return _MouseSelectionEnabled; }
+            set
+            {
+                if (_MouseSelectionEnabled != value)
+                {
+                    _MouseSelectionEnabled = value;
+                }
+            }
+        }
+
+        private DateTime _SelectedDate = DateTime.MinValue;
+        /// <summary>
+        /// Gets or sets the calendar selected date.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public DateTime SelectedDate
+        {
+            get { return _SelectedDate; }
+            set
+            {
+                _SelectedDate = value;
+                foreach (BaseItem item in this.SubItems)
+                {
+                    DayLabel day = item as DayLabel;
+                    if (day == null || day.Date == DateTime.MinValue) continue;
+                    if (day.Date == _SelectedDate.Date)
+                    {
+                        day.IsSelected = true;
+                    }
+                    else
+                    {
+                        day.IsSelected = false;
+                    }
+                }
+                if (_MonthSelectionMode)
+                {
+                    if (value != DateTime.MinValue && value != DateTime.MaxValue)
+                    {
+                        _MonthSelectionItem.SelectedMonth = _SelectedDate.Month;
+                        _YearSelectionItem.SelectedYear = _SelectedDate.Year;
+                    }
+                    else
+                    {
+                        _MonthSelectionItem.IsEmpty = true;
+                        _YearSelectionItem.SelectedYear = 0;
+                    }
+                }
+                OnSelectedDateChanged(new EventArgs());
+            }
+        }
+
+        /// <summary>
+        /// Raises the DateChanged event.
+        /// </summary>
+        /// <param name="e">Provides event data.</param>
+        protected virtual void OnSelectedDateChanged(EventArgs e)
+        {
+            if (DateChanged != null)
+                DateChanged(this, e);
+        }
+
+        private bool _WeekendDaysSelectable = true;
+        /// <summary>
+        /// Gets or sets whether weekend days can be selected. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Description("Indicates whether weekend days can be selected.")]
+        public bool WeekendDaysSelectable
+        {
+            get { return _WeekendDaysSelectable; }
+            set
+            {
+                if (_WeekendDaysSelectable != value)
+                {
+                    _WeekendDaysSelectable = value;
+                    SetDisplayMonth(_DisplayMonth.Month, _DisplayMonth.Year, eEventSource.Code);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets the DayLabel item assigned to the given date. Returns null if there is no label displayed for the date.
+        /// </summary>
+        /// <param name="date">Date to return label for.</param>
+        /// <returns>DayLabel instance or null if date is not displayed on this calendar.</returns>
+        public DayLabel GetDayLabel(DateTime date)
+        {
+            foreach (BaseItem item in this.SubItems)
+            {
+                DayLabel day = item as DayLabel;
+                if (day != null && day.Date.Date == date.Date && day.Visible && day.Displayed)
+                    return day;
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the item is expanded or not. For Popup items this would indicate whether the item is popped up or not.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), System.ComponentModel.DefaultValue(false), System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
+        public override bool Expanded
+        {
+            get
+            {
+                return m_Expanded;
+            }
+            set
+            {
+                base.Expanded = value;
+                if (!value)
+                    BaseItem.CollapseSubItems(this);
+            }
+        }
+
+        /// <summary>
+        /// Occurs when sub item expanded state has changed.
+        /// </summary>
+        /// <param name="item">Sub item affected.</param>
+        protected internal override void OnSubItemExpandChange(BaseItem item)
+        {
+            base.OnSubItemExpandChange(item);
+            if (item.Expanded)
+                this.Expanded = true;
+        }
+
+        private eLabelPartAlignment _DefaultDayLabelTextAlign = eLabelPartAlignment.MiddleCenter;
+        /// <summary>
+        /// Gets or sets default text alignment for the DayLabel items representing calendar days.
+        /// </summary>
+        [DefaultValue(eLabelPartAlignment.MiddleCenter), Description("Indicates default text alignment for the DayLabel items representing calendar days.")]
+        public eLabelPartAlignment DefaultDayLabelTextAlign
+        {
+            get { return _DefaultDayLabelTextAlign; }
+            set
+            {
+                if (_DefaultDayLabelTextAlign != value)
+                {
+                    _DefaultDayLabelTextAlign = value;
+                    SetDisplayMonth(_DisplayMonth.Month, _DisplayMonth.Year, eEventSource.Code);
+                    this.Refresh();
+                }
+            }
+        }
+
+        internal void OnLabelMouseDown(DayLabel sender, MouseEventArgs e)
+        {
+            if (LabelMouseDown != null)
+                LabelMouseDown(sender, e);
+        }
+
+        internal void OnLabelMouseUp(DayLabel sender, MouseEventArgs e)
+        {
+            if (LabelMouseUp != null)
+                LabelMouseUp(sender, e);
+        }
+
+        internal void OnLabelMouseEnter(DayLabel sender, EventArgs e)
+        {
+            if (LabelMouseEnter != null)
+                LabelMouseEnter(sender, e);
+        }
+
+        internal void OnLabelMouseLeave(DayLabel sender, EventArgs e)
+        {
+            if (LabelMouseLeave != null)
+                LabelMouseLeave(sender, e);
+        }
+
+        internal void OnLabelMouseMove(DayLabel sender, MouseEventArgs e)
+        {
+            if (LabelMouseMove != null)
+                LabelMouseMove(sender, e);
+        }
+
+        internal void OnLabelMouseHover(DayLabel sender, EventArgs e)
+        {
+            if (LabelMouseHover != null)
+                LabelMouseHover(sender, e);
+        }
+
+        private bool _TwoLetterDayName = true;
+        /// <summary>
+        /// Gets or sets whether control uses the two letter day names. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Description("Indicates whether control uses the two letter day names.")]
+        public bool TwoLetterDayName
+        {
+            get { return _TwoLetterDayName; }
+            set
+            {
+                if (_TwoLetterDayName != value)
+                {
+                    _TwoLetterDayName = value;
+                    SetDisplayMonth(_DisplayMonth.Month, _DisplayMonth.Year, eEventSource.Code);
+                    this.Refresh();
+                }
+            }
+        }
+
+        private string[] _DayNames = null;
+        /// <summary>
+        /// Gets or sets the array of custom names for days displayed on calendar header. The array must have exactly 7 elements representing day names from 0 to 6.
+        /// </summary>
+        [DefaultValue(null), Description("Indicates array of custom names for days displayed on calendar header."), Localizable(true)]
+        public string[] DayNames
+        {
+            get { return _DayNames; }
+            set
+            {
+                if (value != null && value.Length != 7)
+                    throw new ArgumentException("DayNames must have exactly 7 items in collection.");
+                _DayNames = value;
+            }
+        }
+
+        private void MonthNavigationDecreaseClick(object sender, EventArgs e)
+        {
+            SetDisplayMonth(_DisplayMonth.AddMonths(-1), eEventSource.Mouse);
+            if (AutoSelectDate())
+                this.SelectedDate = this.DisplayMonth;
+        }
+
+        private bool AutoSelectDate()
+        {
+            BaseItem parent = this.Parent;
+            while (parent != null)
+            {
+                parent = parent.Parent;
+                if (parent != null && parent.Name == "sysPopupProvider")
+                {
+                    DateTimeInput dt = parent.ContainerControl as DateTimeInput;
+                    if (dt != null)
+                        return dt.AutoSelectDate;
+                }
+            }
+
+            return false;
+        }
+
+        private void MonthNavigationIncreaseClick(object sender, EventArgs e)
+        {
+            SetDisplayMonth(_DisplayMonth.AddMonths(1), eEventSource.Mouse);
+            if (AutoSelectDate())
+                this.SelectedDate = this.DisplayMonth;
+        }
+
+        private void YearNavigationDecreaseClick(object sender, EventArgs e)
+        {
+            SetDisplayMonth(_DisplayMonth.AddMonths(-12), eEventSource.Mouse);
+            if (AutoSelectDate())
+                this.SelectedDate = this.DisplayMonth;
+        }
+
+        private void YearNavigationIncreaseClick(object sender, EventArgs e)
+        {
+            SetDisplayMonth(_DisplayMonth.AddMonths(12), eEventSource.Mouse);
+            if (AutoSelectDate())
+                this.SelectedDate = this.DisplayMonth;
+        }
+
+        private bool _HeaderNavigationEnabled = true;
+        /// <summary>
+        /// Gets or sets whether header navigation buttons for month and year are visible. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Description("Indicates whether header navigation buttons for month and year are visible.")]
+        public bool HeaderNavigationEnabled
+        {
+            get { return _HeaderNavigationEnabled; }
+            set
+            {
+                if (_HeaderNavigationEnabled != value)
+                {
+                    _HeaderNavigationEnabled = value;
+                    OnHeaderNavigationEnabledChanged();
+                }
+            }
+        }
+
+        private void OnHeaderNavigationEnabledChanged()
+        {
+            ItemContainer nav = GetNavigationContainer();
+            bool b = _HeaderNavigationEnabled;
+            nav.SubItems[NavDecreaseMonth].Visible = b;
+            nav.SubItems[NavIncreaseMonth].Visible = b;
+            nav.SubItems[NavDecreaseYear].Visible = b;
+            nav.SubItems[NavIncreaseYear].Visible = b;
+            nav.NeedRecalcSize = true;
+            this.OnAppearanceChanged();
+            this.Refresh();
+        }
+
+        /// <summary>
+        /// Specifies the navigation container background style. Navigation container displays month, year and optional buttons. Default value is an empty style which means that container does not display any background.
+        /// BeginGroup property set to true will override this style on some styles.
+        /// </summary>
+        [Browsable(true), Category("Style"), Description("Indicates navigation container background style."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ElementStyle NavigationBackgroundStyle
+        {
+            get { return GetNavigationContainer().BackgroundStyle; }
+        }
+
+        private bool _ShowTodayMarker = true;
+        /// <summary>
+        /// Gets or sets whether today marker that indicates TodayDate is visible on the calendar. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Description("Indicates whether today marker that indicates TodayDate is visible on the calendar.")]
+        public bool ShowTodayMarker
+        {
+            get { return _ShowTodayMarker; }
+            set
+            {
+                if (_ShowTodayMarker != value)
+                {
+                    _ShowTodayMarker = value;
+                    UpdateTodayMarker();
+                }
+            }
+        }
+
+        private DateTime _TodayDate = DateTime.MinValue;
+        /// <summary>
+        /// Gets or sets the value that is used by calendar as today's date.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public DateTime TodayDate
+        {
+            get { return _TodayDate; }
+            set
+            {
+                value = value.Date;
+                if (_TodayDate != value)
+                {
+                    _TodayDate = value;
+                    if (_ShowTodayMarker)
+                        UpdateTodayMarker();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether the TodayDate property has been explicitly set. 
+        /// </summary>
+        [Browsable(false)]
+        public bool TodayDateSet
+        {
+            get { return _TodayDate != DateTime.MinValue; }
+        }
+
+        private void UpdateTodayMarker()
+        {
+            DateTime today = _ShowTodayMarker ? (_TodayDate == DateTime.MinValue ? DateTime.Today : DateTime.MinValue) : DateTime.MinValue;
+            bool noMarker = today == DateTime.MinValue;
+            foreach (BaseItem item in this.SubItems)
+            {
+                DayLabel day = item as DayLabel;
+                if (day != null)
+                {
+                    if (noMarker)
+                        day.IsToday = false;
+                    else
+                        day.IsToday = (day.Date == today);
+                }
+            }
+        }
+
+        private System.DateTime _MinDate = DateTimeGroup.MinDateTime;
+        /// <summary>
+        /// Gets or sets the minimum date and time that can be selected in the control.
+        /// </summary>
+        [Description("Indicates minimum date and time that can be selected in the control.")]
+        public System.DateTime MinDate
+        {
+            get { return _MinDate; }
+            set { _MinDate = value;
+                UpdateNavigationButtonsEnabled();
+            }
+        }
+        /// <summary>
+        /// Gets whether Value property should be serialized by Windows Forms designer.
+        /// </summary>
+        /// <returns>true if value serialized otherwise false.</returns>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeMinDate()
+        {
+            return !MinDate.Equals(DateTimeGroup.MinDateTime);
+        }
+        /// <summary>
+        /// Reset the MinDate property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetMinDate()
+        {
+            MinDate = DateTimeGroup.MinDateTime;
+        }
+
+        private System.DateTime _MaxDate = DateTimeGroup.MaxDateTime;
+        /// <summary>
+        /// Gets or sets the maximum date and time that can be selected in the control.
+        /// </summary>
+        [Description("Indicates maximum date and time that can be selected in the control.")]
+        public System.DateTime MaxDate
+        {
+            get { return _MaxDate; }
+            set { _MaxDate = value;
+                UpdateNavigationButtonsEnabled();
+            }
+        }
+        /// <summary>
+        /// Gets whether Value property should be serialized by Windows Forms designer.
+        /// </summary>
+        /// <returns>true if value serialized otherwise false.</returns>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeMaxDate()
+        {
+            return !_MaxDate.Equals(DateTimeGroup.MaxDateTime);
+        }
+        /// <summary>
+        /// Reset the MaxDate property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetMaxDate()
+        {
+            MaxDate = DateTimeGroup.MaxDateTime;
+        }
+
+        private int _NavigationMonthsAheadVisibility = 1;
+        internal int NavigationMonthsAheadVisibility
+        {
+            get { return _NavigationMonthsAheadVisibility; }
+            set
+            {
+                if (_NavigationMonthsAheadVisibility != value)
+                {
+                    _NavigationMonthsAheadVisibility = value;
+                    UpdateNavigationButtonsEnabled();
+                }
+            }
+        }
+
+        private bool _DayClickAutoClosePopup = true;
+        /// <summary>
+        /// Gets or sets whether clicking the day closes the parent popup if item is on popup.
+        /// </summary>
+        [Browsable(false), DefaultValue(true)]
+        public bool DayClickAutoClosePopup
+        {
+            get { return _DayClickAutoClosePopup; }
+            set
+            {
+                if (value != _DayClickAutoClosePopup)
+                {
+                    bool oldValue = _DayClickAutoClosePopup;
+                    _DayClickAutoClosePopup = value;
+                    OnDayClickAutoClosePopupChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when DayClickAutoClosePopup property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnDayClickAutoClosePopupChanged(bool oldValue, bool newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("DayClickAutoClosePopup"));
+            foreach (BaseItem item in this.SubItems)
+            {
+                if (item is DayLabel)
+                    item.AutoCollapseOnClick = newValue;
+            }
+        }
+        #endregion
+    }
+
+    #region Year Selector
+    internal class YearSelectorControl : BaseItemControl
+    {
+        /// <summary>
+        /// Initializes a new instance of the YearSelectoControl class.
+        /// </summary>
+        public YearSelectorControl()
+        {
+            _YearSelector = new YearSelectorContainer();
+            this.HostItem = _YearSelector;
+            this.FocusCuesEnabled = false;
+        }
+
+        protected override void OnResize(EventArgs e)
+        {
+            _YearSelector.FixedSize = Dpi.Descale(this.Size);
+            base.OnResize(e);
+        }
+
+        private YearSelectorContainer _YearSelector;
+        public YearSelectorContainer YearSelector
+        {
+            get { return _YearSelector; }
+        }
+    }
+    internal class CenturySelectorControl : BaseItemControl
+    {
+        /// <summary>
+        /// Initializes a new instance of the CenturySelectorControl class.
+        /// </summary>
+        public CenturySelectorControl()
+        {
+            _CenturySelector = new CenturySelectorContainer();
+            this.HostItem = _CenturySelector;
+            this.FocusCuesEnabled = false;
+        }
+
+        protected override void OnResize(EventArgs e)
+        {
+            _CenturySelector.FixedSize = Dpi.Descale(this.Size);
+            base.OnResize(e);
+        }
+
+        private CenturySelectorContainer _CenturySelector;
+        public CenturySelectorContainer CenturySelector
+        {
+            get { return _CenturySelector; }
+        }
+    }
+    internal class YearSelectorContainer : ItemContainer
+    {
+        private Size _FixedButtonSize = new Size(13, 18);
+        private ItemContainer _YearsContainer = null;
+        private LabelItem _CenturyLabel = null;
+        /// <summary>
+        /// Initializes a new instance of the YearSelectorContainer class.
+        /// </summary>
+        public YearSelectorContainer()
+        {
+            this.LayoutOrientation = eOrientation.Vertical;
+
+            // Add navigation container
+            ItemContainer cont = new ItemContainer();
+            cont.Name = "yearSelectonContainerHeader";
+            cont.AutoCollapseOnClick = false;
+            cont.MinimumSize = new Size(0, _FixedButtonSize.Height + 3);
+            cont.LayoutOrientation = eOrientation.Horizontal;
+            cont.HorizontalItemAlignment = eHorizontalItemsAlignment.Center;
+            cont.VerticalItemAlignment = eVerticalItemsAlignment.Middle;
+            cont.ItemSpacing = 2;
+            ButtonItem nav = new ButtonItem("NavDecreaseYears");
+            nav.GlobalItem = false;
+            nav._FadeEnabled = false;
+            nav.Text = "<expand direction=\"left\"/>";
+            nav.Click += YearsDecreaseClick;
+            nav.AutoCollapseOnClick = false;
+            nav.FixedSize = _FixedButtonSize;
+            nav._FixedSizeCenterText = true;
+            nav.ClickAutoRepeat = true;
+            cont.SubItems.Add(nav);
+            LabelItem label = new LabelItem("CenturyLabel");
+            label.AutoCollapseOnClick = false;
+            label.GlobalItem = false;
+            label.TextAlignment = StringAlignment.Center;
+            label.TextLineAlignment = StringAlignment.Center;
+            label.PaddingBottom = 2;
+            label.Text = "2010-2019";
+            label.Click += ShowCenturySelector;
+            label.Cursor = Cursors.Hand;
+            _CenturyLabel = label;
+            cont.SubItems.Add(label);
+            nav = new ButtonItem("NavIncreaseYears");
+            nav.GlobalItem = false;
+            nav._FadeEnabled = false;
+            nav.Text = "<expand direction=\"right\"/>";
+            nav.Click += YearsIncreaseClick;
+            nav.AutoCollapseOnClick = false;
+            nav.FixedSize = _FixedButtonSize;
+            nav._FixedSizeCenterText = true;
+            nav.ClickAutoRepeat = true;
+            cont.SubItems.Add(nav);
+            this.SubItems.Add(cont);
+
+            cont = new ItemContainer();
+            cont.LayoutOrientation = eOrientation.Horizontal;
+            cont.MultiLine = true;
+            this.SubItems.Add(cont);
+            for (int i = 0; i < 12; i++)
+            {
+                ButtonItem by = new ButtonItem("yearSelector" + i.ToString());
+                by.Text = (2009 + i).ToString();
+                by.FixedSize = new Size(54, 35);
+                by._FixedSizeCenterText = true;
+                by.OptionGroup = "year";
+                by.AutoCheckOnClick = true;
+                by.AutoCollapseOnClick = false;
+                by.Click += YearClick;
+                cont.SubItems.Add(by);
+            }
+            _YearsContainer = cont;
+            CenturyYearStart = (DateTime.Today.Year / 10) * 10;
+        }
+
+        private void YearClick(object sender, EventArgs e)
+        {
+            ButtonItem button = (ButtonItem)sender;
+            int year = int.Parse(button.Text);
+            this.SelectedYear = year;
+            OnSelectedYearChanged(EventArgs.Empty);
+        }
+
+        public event EventHandler SelectedYearChanged;
+        /// <summary>
+        /// Raises SelectedYearChanged event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnSelectedYearChanged(EventArgs e)
+        {
+            EventHandler handler = SelectedYearChanged;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        private Color _TextColor = Color.Empty;
+        public Color TextColor
+        {
+            get { return _TextColor; }
+            set { _TextColor = value; OnTextColorChanged(); }
+        }
+        private void OnTextColorChanged()
+        {
+            SetTextColor(this.SubItems);
+        }
+
+        private void SetTextColor(SubItemsCollection subItems)
+        {
+            foreach (BaseItem item in subItems)
+            {
+                if (item is ButtonItem)
+                {
+                    ((ButtonItem)item).ForeColor = _TextColor;
+                    ((ButtonItem)item).HotForeColor = _TextColor;
+                }
+                else if (item is LabelItem)
+                    ((LabelItem)item).ForeColor = _TextColor;
+                else if (item is ItemContainer)
+                    SetTextColor(item.SubItems);
+            }
+        }
+
+        private int _CenturyYearStart;
+        public int CenturyYearStart
+        {
+            get { return _CenturyYearStart; }
+            set { _CenturyYearStart = value; UpdateYears(); }
+        }
+        private int _SelectedYear;
+        public int SelectedYear
+        {
+            get { return _SelectedYear; }
+            set
+            {
+                _SelectedYear = value;
+                foreach (BaseItem item in _YearsContainer.SubItems)
+                {
+                    if (item.Name.StartsWith("yearSelector"))
+                    {
+                        ButtonItem by = (ButtonItem)item;
+                        if (by.Text == _SelectedYear.ToString())
+                        {
+                            by.Checked = true;
+                            break;
+                        }
+                        else if (by.Checked)
+                            by.Checked = false;
+                    }
+                }
+            }
+        }
+        private void UpdateYears()
+        {
+            // Assumes this indicates century start
+            int y = _CenturyYearStart - 1;
+            foreach (BaseItem item in _YearsContainer.SubItems)
+            {
+                if (item.Name.StartsWith("yearSelector"))
+                {
+                    ButtonItem by = (ButtonItem)item;
+                    by.Text = y.ToString();
+                    if (y == _SelectedYear)
+                        by.Checked = true;
+                    else if (by.Checked)
+                        by.Checked = false;
+                    y++;
+                }
+            }
+            _CenturyLabel.Text = string.Format("{0}-{1}", _CenturyYearStart, _CenturyYearStart + 10);
+            NeedRecalcSize = true;
+            this.Refresh();
+        }
+        protected override void OnFixedSizeChanged(Size oldValue, Size newValue)
+        {
+            base.OnFixedSizeChanged(oldValue, newValue);
+            // Update buttons size
+            Size size = newValue;
+            size.Height -= _FixedButtonSize.Height + 4;
+            size.Width -= 4;
+            Size sb = new Size(size.Width / 4, size.Height / 3);
+            //sb.Width = (int)(sb.Width / Dpi.Factor.Width);
+            //sb.Height = (int)(sb.Height / Dpi.Factor.Height);
+            foreach (BaseItem item in _YearsContainer.SubItems)
+            {
+                if (item.Name.StartsWith("yearSelector"))
+                {
+                    ButtonItem by = (ButtonItem)item;
+                    by.FixedSize = sb;
+                }
+            }
+        }
+        private void YearsDecreaseClick(object sender, EventArgs e)
+        {
+            if (CenturyYearStart - 10 > 1760)
+                CenturyYearStart -= 10;
+        }
+        private void YearsIncreaseClick(object sender, EventArgs e)
+        {
+            CenturyYearStart += 10;
+        }
+        private CenturySelectorControl _CenturySelector = null;
+        private void ShowCenturySelector(object sender, EventArgs e)
+        {
+            if (_CenturySelector != null) return;
+            _CenturySelector = new CenturySelectorControl();
+            Control parent = (Control)this.ContainerControl;
+
+            _CenturySelector.Size = new Size(8, 8);
+            _CenturySelector.Location = new Point(this.LeftInternal + (this.WidthInternal - 8) / 2, this.TopInternal + (this.HeightInternal - 8) / 2);
+            _CenturySelector.Style = eDotNetBarStyle.StyleManagerControlled;
+            if (BarFunctions.IsOffice2007Style(this.Style))
+            {
+                Office2007ColorTable table = ((Office2007Renderer)GlobalManager.Renderer).ColorTable;
+                ElementStyle es = (ElementStyle)table.StyleClasses[ElementStyleClassKeys.ItemPanelKey];
+                _CenturySelector.BackgroundStyle.BackColor = es.BackColor;
+                _CenturySelector.BackgroundStyle.BackColor2 = es.BackColor2;
+            }
+            else
+                _CenturySelector.BackgroundStyle.BackColor = SystemColors.Window;
+            _CenturySelector.CenturySelector.TextColor = this.TextColor;
+            parent.Controls.Add(_CenturySelector);
+
+            Rectangle targetBounds = this.Bounds;
+            DevComponents.DotNetBar.Animation.AnimationRectangle anim = new DevComponents.DotNetBar.Animation.AnimationRectangle(
+                new AnimationRequest(_CenturySelector, "Bounds", targetBounds),
+                DevComponents.DotNetBar.Animation.AnimationEasing.EaseInOutQuad, 200);
+            anim.AutoDispose = true;
+            anim.Start();
+
+            _CenturySelector.CenturySelector.SelectedCenturyChanged += SelectedCenturyChanged;
+        }
+        private void SelectedCenturyChanged(object sender, EventArgs e)
+        {
+            this.CenturyYearStart = _CenturySelector.CenturySelector.SelectedCentury;
+            Rectangle targetBounds = this.Bounds;
+            DevComponents.DotNetBar.Animation.AnimationRectangle anim = new DevComponents.DotNetBar.Animation.AnimationRectangle(
+                new AnimationRequest(_CenturySelector, "Bounds", new Rectangle(this.LeftInternal + (this.WidthInternal - 8) / 2, this.TopInternal + (this.HeightInternal - 8) / 2, 8, 8)),
+                DevComponents.DotNetBar.Animation.AnimationEasing.EaseInOutQuad, 200);
+            anim.AutoDispose = true;
+            anim.AnimationCompleted += new EventHandler(AnimationCompleted);
+            anim.Start();
+        }
+        public void RemoveCenturySelector()
+        {
+            if (_CenturySelector == null) return;
+            Control parent = (Control)this.ContainerControl;
+            parent.Controls.Remove(_CenturySelector);
+            _CenturySelector.CenturySelector.SelectedCenturyChanged -= SelectedCenturyChanged;
+            _CenturySelector.Dispose();
+            _CenturySelector = null;
+        }
+        void AnimationCompleted(object sender, EventArgs e)
+        {
+            RemoveCenturySelector();
+        }
+
+    }
+    #endregion
+
+    #region Century Selector
+    internal class CenturySelectorContainer : ItemContainer
+    {
+        private Size _FixedButtonSize = new Size(13, 18);
+        private ItemContainer _YearsContainer = null;
+        private LabelItem _CenturyLabel = null;
+        /// <summary>
+        /// Initializes a new instance of the YearSelectorContainer class.
+        /// </summary>
+        public CenturySelectorContainer()
+        {
+            this.LayoutOrientation = eOrientation.Vertical;
+
+            // Add navigation container
+            ItemContainer cont = new ItemContainer();
+            cont.AutoCollapseOnClick = false;
+            cont.MinimumSize = new Size(0, _FixedButtonSize.Height + 3);
+            cont.LayoutOrientation = eOrientation.Horizontal;
+            cont.HorizontalItemAlignment = eHorizontalItemsAlignment.Center;
+            cont.VerticalItemAlignment = eVerticalItemsAlignment.Middle;
+            cont.ItemSpacing = 2;
+            ButtonItem nav = new ButtonItem("NavDecreaseYears");
+            nav.GlobalItem = false;
+            nav._FadeEnabled = false;
+            nav.Text = "<expand direction=\"left\"/>";
+            nav.Click += YearsDecreaseClick;
+            nav.AutoCollapseOnClick = false;
+            nav.FixedSize = _FixedButtonSize;
+            nav._FixedSizeCenterText = true;
+            nav.ClickAutoRepeat = true;
+            cont.SubItems.Add(nav);
+            LabelItem label = new LabelItem("CenturyLabel");
+            label.AutoCollapseOnClick = false;
+            label.GlobalItem = false;
+            label.TextAlignment = StringAlignment.Center;
+            label.TextLineAlignment = StringAlignment.Center;
+            label.PaddingBottom = 2;
+            label.Text = "2000-2099";
+            _CenturyLabel = label;
+            cont.SubItems.Add(label);
+            nav = new ButtonItem("NavIncreaseYears");
+            nav.GlobalItem = false;
+            nav._FadeEnabled = false;
+            nav.Text = "<expand direction=\"right\"/>";
+            nav.Click += YearsIncreaseClick;
+            nav.AutoCollapseOnClick = false;
+            nav.FixedSize = _FixedButtonSize;
+            nav._FixedSizeCenterText = true;
+            nav.ClickAutoRepeat = true;
+            cont.SubItems.Add(nav);
+            this.SubItems.Add(cont);
+
+            cont = new ItemContainer();
+            cont.LayoutOrientation = eOrientation.Horizontal;
+            cont.MultiLine = true;
+            this.SubItems.Add(cont);
+            for (int i = 0; i < 12; i++)
+            {
+                ButtonItem by = new ButtonItem("centurySelector" + i.ToString());
+                by.Text = (2009 + i).ToString();
+                by.FixedSize = new Size(54, 35);
+                by._FixedSizeCenterText = true;
+                by.OptionGroup = "century";
+                by.AutoCheckOnClick = true;
+                by.Click += CenturyClick;
+                cont.SubItems.Add(by);
+            }
+            _YearsContainer = cont;
+            CenturyYearStart = (DateTime.Today.Year / 100) * 100;
+        }
+
+        private void CenturyClick(object sender, EventArgs e)
+        {
+            ButtonItem button = (ButtonItem)sender;
+            int year = (int)button.Tag;
+            this.SelectedCentury = year;
+        }
+
+        public event EventHandler SelectedCenturyChanged;
+        /// <summary>
+        /// Raises SelectedYearChanged event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnSelectedCenturyChanged(EventArgs e)
+        {
+            EventHandler handler = SelectedCenturyChanged;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        private Color _TextColor = Color.Empty;
+        public Color TextColor
+        {
+            get { return _TextColor; }
+            set { _TextColor = value; OnTextColorChanged(); }
+        }
+        private void OnTextColorChanged()
+        {
+            SetTextColor(this.SubItems);
+        }
+
+        private void SetTextColor(SubItemsCollection subItems)
+        {
+            foreach (BaseItem item in subItems)
+            {
+                if (item is ButtonItem)
+                {
+                    ((ButtonItem)item).ForeColor = _TextColor;
+                    ((ButtonItem)item).HotForeColor = _TextColor;
+                }
+                else if (item is LabelItem)
+                    ((LabelItem)item).ForeColor = _TextColor;
+                else if (item is ItemContainer)
+                    SetTextColor(item.SubItems);
+            }
+        }
+
+        private int _CenturyYearStart;
+        public int CenturyYearStart
+        {
+            get { return _CenturyYearStart; }
+            set { _CenturyYearStart = value; UpdateYears(); }
+        }
+        private int _SelectedYear;
+        public int SelectedCentury
+        {
+            get { return _SelectedYear; }
+            set
+            {
+                _SelectedYear = value;
+                foreach (BaseItem item in _YearsContainer.SubItems)
+                {
+                    if (item.Name.StartsWith("centurySelector"))
+                    {
+                        ButtonItem by = (ButtonItem)item;
+                        if ((int)by.Tag == _SelectedYear)
+                        {
+                            by.Checked = true;
+                            break;
+                        }
+                    }
+                }
+                OnSelectedCenturyChanged(EventArgs.Empty);
+            }
+        }
+        private void UpdateYears()
+        {
+            // Assumes this indicates century start
+            int y = _CenturyYearStart - 10;
+            foreach (BaseItem item in _YearsContainer.SubItems)
+            {
+                if (item.Name.StartsWith("centurySelector"))
+                {
+                    ButtonItem by = (ButtonItem)item;
+                    by.Text = string.Format("<div>{0}-<br/>{1}</div>", y, y + 9);
+                    by.Tag = y;
+                    if (y == _SelectedYear)
+                        by.Checked = true;
+                    else if (by.Checked)
+                        by.Checked = false;
+                    y += 10;
+                }
+            }
+            _CenturyLabel.Text = string.Format("{0}-{1}", _CenturyYearStart, _CenturyYearStart + 99);
+            NeedRecalcSize = true;
+            this.Refresh();
+        }
+        protected override void OnFixedSizeChanged(Size oldValue, Size newValue)
+        {
+            base.OnFixedSizeChanged(oldValue, newValue);
+            // Update buttons size
+            Size size = newValue;
+            size.Height -= _FixedButtonSize.Height + 4;
+            size.Width -= 4;
+            Size sb = new Size(size.Width / 4, size.Height / 3);
+            //sb.Width = (int)(sb.Width / Dpi.Factor.Width);
+            //sb.Height = (int)(sb.Height / Dpi.Factor.Height);
+            foreach (BaseItem item in _YearsContainer.SubItems)
+            {
+                if (item.Name.StartsWith("centurySelector"))
+                {
+                    ButtonItem by = (ButtonItem)item;
+                    by.FixedSize = sb;
+                }
+            }
+        }
+        private void YearsDecreaseClick(object sender, EventArgs e)
+        {
+            if (CenturyYearStart - 100 > 1760)
+                CenturyYearStart -= 100;
+        }
+        private void YearsIncreaseClick(object sender, EventArgs e)
+        {
+            CenturyYearStart += 100;
+        }
+    }
+    #endregion
+
+    #region MonthSelector
+    internal class MonthSelectorControl : BaseItemControl
+    {
+        /// <summary>
+        /// Initializes a new instance of the CenturySelectorControl class.
+        /// </summary>
+        public MonthSelectorControl()
+        {
+            _MonthSelector = new MonthSelectorContainer();
+            this.HostItem = _MonthSelector;
+            this.FocusCuesEnabled = false;
+        }
+
+        protected override void OnResize(EventArgs e)
+        {
+            _MonthSelector.FixedSize = Dpi.Descale(this.Size);
+            base.OnResize(e);
+        }
+
+        private MonthSelectorContainer _MonthSelector;
+        public MonthSelectorContainer MonthSelector
+        {
+            get { return _MonthSelector; }
+        }
+    }
+    internal class MonthSelectorContainer : ItemContainer
+    {
+        private const string STR_MonthSelector = "monthSelector";
+        private Size _FixedButtonSize = new Size(13, 18);
+        private ItemContainer _MonthsContainer = null;
+        /// <summary>
+        /// Initializes a new instance of the YearSelectorContainer class.
+        /// </summary>
+        public MonthSelectorContainer()
+        {
+            this.LayoutOrientation = eOrientation.Vertical;
+
+            // Add navigation container
+            ItemContainer cont = new ItemContainer();
+            cont.LayoutOrientation = eOrientation.Horizontal;
+            cont.MultiLine = true;
+            cont.AutoCollapseOnClick = false;
+            this.SubItems.Add(cont);
+
+            for (int i = 1; i <= 12; i++)
+            {
+                ButtonItem by = new ButtonItem(STR_MonthSelector + i.ToString());
+                by.Text = i.ToString();
+                by.Tag = i;
+                by.FixedSize = new Size(54, 35);
+                by._FixedSizeCenterText = true;
+                by.OptionGroup = "month";
+                by.AutoCheckOnClick = true;
+                by.Click += MonthClick;
+                by.AutoCollapseOnClick = false;
+                cont.SubItems.Add(by);
+            }
+            _MonthsContainer = cont;
+        }
+
+        public bool IsEmpty
+        {
+            get
+            {
+                foreach (BaseItem item in _MonthsContainer.SubItems)
+                {
+                    if(item is ButtonItem && item.Name.StartsWith(STR_MonthSelector) && ((ButtonItem)item).Checked)
+                        return false;
+                }
+                return true;
+            }
+            set
+            {
+                if (value)
+                {
+                    _SelectedMonth = 1;
+                    foreach (BaseItem item in _MonthsContainer.SubItems)
+                    {
+                        if (item is ButtonItem && item.Name.StartsWith(STR_MonthSelector) && ((ButtonItem)item).Checked)
+                            ((ButtonItem)item).Checked = false;
+                    }
+                }
+            }
+        }
+
+        private void MonthClick(object sender, EventArgs e)
+        {
+            ButtonItem button = (ButtonItem)sender;
+            int month = (int)button.Tag;
+            this.SelectedMonth = month;
+            OnSelectedMonthChanged(EventArgs.Empty);
+        }
+
+        public event EventHandler SelectedMonthChanged;
+        /// <summary>
+        /// Raises SelectedYearChanged event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnSelectedMonthChanged(EventArgs e)
+        {
+            EventHandler handler = SelectedMonthChanged;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        private Color _TextColor = Color.Empty;
+        public Color TextColor
+        {
+            get { return _TextColor; }
+            set { _TextColor = value; OnTextColorChanged(); }
+        }
+        private void OnTextColorChanged()
+        {
+            SetTextColor(this.SubItems);
+        }
+
+        private void SetTextColor(SubItemsCollection subItems)
+        {
+            foreach (BaseItem item in subItems)
+            {
+                if (item is ButtonItem)
+                {
+                    ((ButtonItem)item).ForeColor = _TextColor;
+                    ((ButtonItem)item).HotForeColor = _TextColor;
+                }
+                else if (item is LabelItem)
+                    ((LabelItem)item).ForeColor = _TextColor;
+                else if (item is ItemContainer)
+                    SetTextColor(item.SubItems);
+            }
+        }
+
+        private int _SelectedMonth = 1;
+        public int SelectedMonth
+        {
+            get { return _SelectedMonth; }
+            set
+            {
+                if (value <= 0) value = 1;
+                if (value > 12) value = 12;
+                _SelectedMonth = value;
+
+                ButtonItem month = (ButtonItem)_MonthsContainer.SubItems[STR_MonthSelector + _SelectedMonth.ToString()];
+                if (month != null)
+                {
+                    month.Checked = true;
+                }
+            }
+        }
+
+        private bool _UseMonthNames = false;
+        public bool UseMonthNames
+        {
+            get { return _UseMonthNames; }
+            set
+            {
+                _UseMonthNames = value;
+                UpdateMonthText();
+            }
+        }
+
+        private void UpdateMonthText()
+        {
+            string[] monthNames = new string[0];
+            if (_UseMonthNames)
+            {
+                CultureInfo ci = DateTimeInput.GetActiveCulture();
+                monthNames = ci.DateTimeFormat.AbbreviatedMonthNames;
+            }
+            foreach (BaseItem item in _MonthsContainer.SubItems)
+            {
+                if (item.Name.StartsWith(STR_MonthSelector))
+                {
+                    ButtonItem by = (ButtonItem)item;
+                    int month = (int)by.Tag;
+                    if (_UseMonthNames)
+                    {
+                        by.Text = monthNames[month - 1];
+                    }
+                    else
+                    {
+                        by.Text = month.ToString();
+                    }
+                    //if (month == _SelectedMonth)
+                    //    by.Checked = true;
+                    //else if (by.Checked)
+                    //    by.Checked = false;
+                }
+            }
+            NeedRecalcSize = true;
+            this.Refresh();
+        }
+        protected override void OnFixedSizeChanged(Size oldValue, Size newValue)
+        {
+            base.OnFixedSizeChanged(oldValue, newValue);
+            // Update buttons size
+            Size size = newValue;
+            size.Height -= _FixedButtonSize.Height + 4;
+            size.Width -= 4;
+            Size sb = new Size(size.Width / 4, size.Height / 3);
+            //sb.Width = (int)(sb.Width/Dpi.Factor.Width);
+            //sb.Height = (int)(sb.Height/Dpi.Factor.Height);
+            foreach (BaseItem item in _MonthsContainer.SubItems)
+            {
+                if (item.Name.StartsWith(STR_MonthSelector))
+                {
+                    ButtonItem by = (ButtonItem)item;
+                    by.FixedSize = sb;
+                }
+            }
+        }
+    }
+    #endregion
+
+    internal enum eCurrentSingleMonthCalendarOperation
+    {
+        None,
+        AnimatingShowYearSelector,
+        AnimatingHideYearSelector,
+        AnimatingShowMonthSelector,
+        AnimatingHideMonthSelector
+    }
+}
+#endif
diff --git a/PROMS/DotNetBar Source Code/Editors/DateTimeAdv/TimeSelector.cs b/PROMS/DotNetBar Source Code/Editors/DateTimeAdv/TimeSelector.cs
new file mode 100644
index 00000000..53500db8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Editors/DateTimeAdv/TimeSelector.cs	
@@ -0,0 +1,353 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel;
+using DevComponents.DotNetBar;
+using System.Windows.Forms;
+using System.Drawing;
+using System.Globalization;
+
+namespace DevComponents.Editors.DateTimeAdv
+{
+    /// <summary>
+    /// Represents a control that enables the user to select time using visual time display. 
+    /// </summary>
+    [ToolboxBitmap(typeof(DotNetBarManager), "TimeSelector.ico"), ToolboxItem(true), Designer("DevComponents.DotNetBar.Design.TimeSelectorDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+    [DefaultEvent("SelectedTimeChanged"), DefaultProperty("SelectedTime")]
+    public class TimeSelector : ItemControl
+    {
+         #region Private Variables
+        private TimeSelectorItem _TimeSelector = null;
+        #endregion
+
+        #region Events
+        /// <summary>
+        /// Occurs after SelectedTime changes.
+        /// </summary>
+        [Description("Occurs after SelectedTime changes.")]
+        public event EventHandler SelectedTimeChanged;
+        /// <summary>
+        /// Raises SelectedTimeChanged event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnSelectedTimeChanged(EventArgs e)
+        {
+            EventHandler handler = SelectedTimeChanged;
+            if (handler != null)
+                handler(this, e);
+        }
+        /// <summary>
+        /// Occurs when OK button is clicked.
+        /// </summary>
+        [Description("Occurs when OK button is clicked.")]
+        public event EventHandler OkClick;
+        /// <summary>
+        /// Raises OkClick event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnOkClick(EventArgs e)
+        {
+            EventHandler handler = OkClick;
+            if (handler != null)
+                handler(this, e);
+        }
+        #endregion
+
+        #region Constructor
+        /// <summary>
+        /// Initializes a new instance of the MonthCalendarAdv class.
+        /// </summary>
+        public TimeSelector()
+        {
+            this.SetStyle(ControlStyles.Selectable, false);
+
+            _TimeSelector = new TimeSelectorItem();
+            _TimeSelector.GlobalItem = false;
+            _TimeSelector.ContainerControl = this;
+            _TimeSelector.Stretch = false;
+            _TimeSelector.Displayed = true;
+            _TimeSelector.Style = eDotNetBarStyle.StyleManagerControlled;
+            this.ColorScheme.Style = eDotNetBarStyle.StyleManagerControlled;
+            _TimeSelector.SetOwner(this);
+
+            _TimeSelector.SelectedTimeChanged += new EventHandler(TimeSelector_SelectedTimeChanged);
+            _TimeSelector.OkClick += new EventHandler(TimeSelector_OkClick);
+            this.SetBaseItemContainer(_TimeSelector);
+        }
+        #endregion
+
+        #region Internal Implementation
+        void TimeSelector_OkClick(object sender, EventArgs e)
+        {
+            OnOkClick(e);
+        }
+
+        void TimeSelector_SelectedTimeChanged(object sender, EventArgs e)
+        {
+            OnSelectedTimeChanged(e);
+        }
+
+        internal bool GetDesignModeInternal()
+        {
+            return DesignMode;
+        }
+
+        /// <summary>
+        /// Gets or sets the text displayed on OK button.
+        /// </summary>
+        [DefaultValue("OK"), Category("Appearance"), Description("Indicates text displayed on OK button."), Localizable(true)]
+        public string OkText
+        {
+            get { return _TimeSelector.OkText; }
+            set { _TimeSelector.OkText = value; }
+        }
+        /// <summary>
+        /// Gets or sets whether Ok button is visible.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance"), Description("Indicates whether Ok button is visible.")]
+        public bool OkButtonVisible
+        {
+            get { return _TimeSelector.OkButtonVisible; }
+            set
+            {
+                _TimeSelector.OkButtonVisible = value;
+            }
+        }
+        /// <summary>
+        /// Gets or sets the selected date time.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public DateTime SelectedDateTime
+        {
+            get
+            {
+                return _TimeSelector.SelectedDateTime;
+            }
+            set
+            {
+                _TimeSelector.SelectedDateTime = value;
+            }
+        }
+        /// <summary>
+        /// Gets or sets selected time. Returns TimeSpan.Zero if there is no time selected.
+        /// </summary>
+        [Category("Data"), Description("Indicates selected time.")]
+        public TimeSpan SelectedTime
+        {
+            get { return _TimeSelector.SelectedTime; }
+            set
+            {
+                _TimeSelector.SelectedTime = value;
+            }
+        }
+        /// <summary>
+        /// Returns whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeSelectedTime()
+        {
+            return _TimeSelector.ShouldSerializeSelectedTime();
+        }
+        /// <summary>
+        /// Resets property to default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetSelectedTime()
+        {
+            _TimeSelector.ResetSelectedTime();
+        }
+        /// <summary>
+        /// Gets or sets the time format used to present time by the selector.
+        /// </summary>
+        [DefaultValue(eTimeSelectorFormat.System), Category("Appearance"), Description("Indicates time format used to present time by the selector."), Localizable(true)]
+        public eTimeSelectorFormat TimeFormat
+        {
+            get { return _TimeSelector.TimeFormat; }
+            set
+            {
+                _TimeSelector.TimeFormat = value;
+                _PreferredSize = Size.Empty;
+                AdjustSize();
+            }
+        }
+        /// <summary>
+        /// Gets or sets the format for the 12 Hour Time Display.
+        /// </summary>
+        [DefaultValue(TimeSelectorItem.DefaultTimeFormat12H), Category("Data"), Description("Indicates format for the 12 Hour Time Display."), Localizable(true)]
+        public string TimeFormat12H
+        {
+            get { return _TimeSelector.TimeFormat12H; }
+            set
+            {
+                _TimeSelector.TimeFormat12H = value;
+            }
+        }
+        /// <summary>
+        /// Gets or sets the format for the 24 Hour Time Display.
+        /// </summary>
+        [DefaultValue(TimeSelectorItem.DefaultTimeFormat24H), Category("Data"), Description("Indicates format for the 24 Hour Time Display."), Localizable(true)]
+        public string TimeFormat24H
+        {
+            get { return _TimeSelector.TimeFormat24H; }
+            set
+            {
+                _TimeSelector.TimeFormat24H = value;
+            }
+        }
+
+        private Size _PreferredSize = Size.Empty;
+        /// <summary>
+        /// Invalidates control auto-size and resizes the control if AutoSize is set to true.
+        /// </summary>
+        public void InvalidateAutoSize()
+        {
+            _PreferredSize = Size.Empty;
+            AdjustSize();
+        }
+
+        [Browsable(false)]
+        public override string Text
+        {
+            get
+            {
+                return base.Text;
+            }
+            set
+            {
+                base.Text = value;
+            }
+        }
+#if FRAMEWORK20
+        /// <summary>
+        /// Gets or sets a value indicating whether the control is automatically resized to display its entire contents. You can set MaximumSize.Width property to set the maximum width used by the control.
+        /// </summary>
+        [Browsable(true), DefaultValue(false), EditorBrowsable(EditorBrowsableState.Always), DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
+        public override bool AutoSize
+        {
+            get
+            {
+                return base.AutoSize;
+            }
+            set
+            {
+                if (this.AutoSize != value)
+                {
+                    base.AutoSize = value;
+                    AdjustSize();
+                }
+            }
+        }
+
+        private void AdjustSize()
+        {
+            if (this.AutoSize)
+            {
+                this.Size = base.PreferredSize;
+            }
+        }
+
+        protected override void OnFontChanged(EventArgs e)
+        {
+            InvalidateAutoSize();
+            base.OnFontChanged(e);
+        }
+
+        public override Size GetPreferredSize(Size proposedSize)
+        {
+            if (!_PreferredSize.IsEmpty) return _PreferredSize;
+
+            if (!BarFunctions.IsHandleValid(this))
+                return base.GetPreferredSize(proposedSize);
+
+            ElementStyle style = this.GetBackgroundStyle();
+
+            _TimeSelector.RecalcSize();
+            _PreferredSize = _TimeSelector.Size;
+            if (style != null)
+            {
+                _PreferredSize.Width += ElementStyleLayout.HorizontalStyleWhiteSpace(style);
+                _PreferredSize.Height += ElementStyleLayout.VerticalStyleWhiteSpace(style);
+            }
+
+            return _PreferredSize;
+        }
+
+        protected override void SetBoundsCore(int x, int y, int width, int height, BoundsSpecified specified)
+        {
+            if (this.AutoSize)
+            {
+                Size preferredSize = base.PreferredSize;
+                width = preferredSize.Width;
+                height = preferredSize.Height;
+            }
+            base.SetBoundsCore(x, y, width, height, specified);
+        }
+
+        protected override void OnHandleCreated(EventArgs e)
+        {
+            if (this.AutoSize)
+                this.AdjustSize();
+            base.OnHandleCreated(e);
+        }
+
+        [Browsable(false)]
+        public override bool ThemeAware
+        {
+            get
+            {
+                return base.ThemeAware;
+            }
+            set
+            {
+                base.ThemeAware = value;
+            }
+        }
+#endif
+
+        /// <summary>
+        /// Indicates the type of the selector used to select time.
+        /// </summary>
+        [DefaultValue(eTimeSelectorType.TouchStyle), Category("Appearance"), Description("Indicates the type of the selector used to select time.")]
+        public eTimeSelectorType SelectorType
+        {
+            get { return _TimeSelector.SelectorType; }
+            set
+            {
+                _TimeSelector.SelectorType = value;
+                _PreferredSize = Size.Empty;
+                AdjustSize();
+            }
+        }
+        /// <summary>
+        /// Gets or sets the text displayed on Clear button only when MonthCalendarStyle is used.
+        /// </summary>
+        [DefaultValue("Clear"), Category("Appearance"), Description("Indicates text displayed on Clear button only when MonthCalendarStyle is used."), Localizable(true)]
+        public string ClearText
+        {
+            get { return _TimeSelector.ClearText; }
+            set { _TimeSelector.ClearText = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the text displayed on Hour label.
+        /// </summary>
+        [DefaultValue("Hour"), Category("Appearance"), Description("Indicates text displayed on Hour label."), Localizable(true)]
+        public string HourText
+        {
+            get { return _TimeSelector.HourText; }
+            set { _TimeSelector.HourText = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the text displayed on Minute label.
+        /// </summary>
+        [DefaultValue("Minute"), Category("Appearance"), Description("Indicates text displayed on Minute label."), Localizable(true)]
+        public string MinuteText
+        {
+            get { return _TimeSelector.MinuteText; }
+            set { _TimeSelector.MinuteText = value; }
+        }
+        #endregion
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Editors/DateTimeAdv/TimeSelectorItem.cs b/PROMS/DotNetBar Source Code/Editors/DateTimeAdv/TimeSelectorItem.cs
new file mode 100644
index 00000000..29b8fcb1
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Editors/DateTimeAdv/TimeSelectorItem.cs	
@@ -0,0 +1,1567 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+using System.ComponentModel;
+using DevComponents.DotNetBar;
+
+namespace DevComponents.Editors.DateTimeAdv
+{
+    /// <summary>
+    /// Represents the Time selector item.
+    /// </summary>
+    public class TimeSelectorItem : BaseItem
+    {
+        #region Constructor
+        private Command _HourCommand = null;
+        private Command _MinuteCommand = null;
+        private Command _MinuteChangeCommand = null;
+        private Command _ClearCommand = null;
+        private Command _AmPmCommand = null;
+        private Command _OkCommand = null;
+        private Font _DualButtonFont = null;
+        private ItemContainer _InnerContainer = null;
+        private LabelItem _AmPmLabel = null;
+        private LabelItem _HourLabel = null, _MinuteLabel = null;
+        /// <summary>
+        /// Initializes a new instance of the TimeSelectionItem class.
+        /// </summary>
+        public TimeSelectorItem()
+        {
+            m_IsContainer = true;
+            this.AutoCollapseOnClick = false;
+
+            _InnerContainer = new ItemContainer();
+            _InnerContainer.ItemSpacing = 3;
+            _InnerContainer.LayoutOrientation = eOrientation.Vertical;
+            _InnerContainer.AutoCollapseOnClick = false;
+            this.SubItems.Add(_InnerContainer);
+
+            _HourCommand = new Command();
+            _HourCommand.Executed += new EventHandler(HourCommandExecuted);
+            _MinuteCommand = new Command();
+            _MinuteCommand.Executed += new EventHandler(MinuteCommandExecuted);
+            _MinuteChangeCommand = new Command();
+            _MinuteChangeCommand.Executed += new EventHandler(MinuteChangeCommandExecuted);
+            _ClearCommand = new Command();
+            _ClearCommand.Executed += new EventHandler(ClearCommandExecuted);
+            _AmPmCommand = new Command();
+            _AmPmCommand.Executed += new EventHandler(AmPmCommandExecuted);
+            _OkCommand = new Command();
+            _OkCommand.Executed += new EventHandler(OkCommandExecuted);
+
+            RecreateItems();
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            if (_HourCommand != null)
+            {
+                _HourCommand.Dispose();
+                _HourCommand = null;
+            }
+            if (_MinuteCommand != null)
+            {
+                _MinuteCommand.Dispose();
+                _MinuteCommand = null;
+            }
+            if (_MinuteChangeCommand != null)
+            {
+                _MinuteChangeCommand.Dispose();
+                _MinuteChangeCommand = null;
+            }
+            if (_ClearCommand != null)
+            {
+                _ClearCommand.Dispose();
+                _ClearCommand = null;
+            }
+            if (_AmPmCommand != null)
+            {
+                _AmPmCommand.Dispose();
+                _AmPmCommand = null;
+            }
+            if (_OkCommand != null)
+            {
+                _OkCommand.Dispose();
+                _OkCommand = null;
+            }
+            if (_DualButtonFont != null)
+            {
+                _DualButtonFont.Dispose();
+                _DualButtonFont = null;
+            }
+            base.Dispose(disposing);
+        }
+        #endregion
+
+        #region Events
+        /// <summary>
+        /// Occurs after SelectedTime changes.
+        /// </summary>
+        [Description("Occurs after SelectedTime changes.")]
+        public event EventHandler SelectedTimeChanged;
+        /// <summary>
+        /// Raises SelectedTimeChanged event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnSelectedTimeChanged(EventArgs e)
+        {
+            EventHandler handler = SelectedTimeChanged;
+            if (handler != null)
+                handler(this, e);
+        }
+        /// <summary>
+        /// Occurs when OK button is clicked.
+        /// </summary>
+        [Description("Occurs when OK button is clicked.")]
+        public event EventHandler OkClick;
+        /// <summary>
+        /// Raises OkClick event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnOkClick(EventArgs e)
+        {
+            EventHandler handler = OkClick;
+            if (handler != null)
+                handler(this, e);
+        }
+        #endregion
+
+        #region Implementation
+        internal void DropDownClosed()
+        {
+        }
+
+        public override void RecalcSize()
+        {
+            _InnerContainer.SetDisplayRectangle(new Rectangle(m_Rect.X, m_Rect.Y, 300, 300));
+
+            if (_SelectorType == eTimeSelectorType.MonthCalendarStyle) // Adjust button size based on selected font
+            {
+            }
+
+            _InnerContainer.Displayed = true;
+            _InnerContainer.RecalcSize();
+            m_Rect.Width = _InnerContainer.WidthInternal;
+            m_Rect.Height = _InnerContainer.HeightInternal;
+
+            base.RecalcSize();
+        }
+
+        public override void Paint(ItemPaintArgs p)
+        {
+            _InnerContainer.Paint(p);
+        }
+
+        public override BaseItem Copy()
+        {
+            throw new Exception("The method or operation is not implemented.");
+        }
+
+        private void OkCommandExecuted(object sender, EventArgs e)
+        {
+            OnOkClick(EventArgs.Empty);
+        }
+        private void AmPmCommandExecuted(object sender, EventArgs e)
+        {
+            bool isAm = false;
+
+            if (_SelectorType == eTimeSelectorType.TouchStyle)
+            {
+                if (sender == _ButtonAm)
+                {
+                    if (_ButtonPm != null)
+                        _ButtonPm.Checked = false;
+                    _ButtonAm.Checked = true;
+                    isAm = true;
+                }
+                else
+                {
+                    if (_ButtonAm != null)
+                        _ButtonAm.Checked = false;
+                    _ButtonPm.Checked = true;
+                }
+            }
+            else
+            {
+                if (_SelectedTime != TimeSpan.Zero && _SelectedTime.Hours >= 12)
+                    isAm = true;
+            }
+
+            if (isAm)
+            {
+                if (_SelectedTime != TimeSpan.Zero && _SelectedTime.Hours >= 12)
+                {
+                    int hour = _SelectedTime.Hours - 12;
+                    int min = _SelectedTime.Minutes;
+                    int sec = _SelectedTime.Seconds;
+                    if (hour == 0 && min == 0 && sec == 0) sec = 1;
+                    SelectedTime = new TimeSpan(hour, min, sec);
+                }
+            }
+            else
+            {
+                if (_SelectedTime != TimeSpan.Zero && _SelectedTime.Hours < 12)
+                    SelectedTime = new TimeSpan(_SelectedTime.Hours + 12, _SelectedTime.Minutes, _SelectedTime.Seconds);
+            }
+        }
+        private void ClearCommandExecuted(object sender, EventArgs e)
+        {
+            SelectedTime = TimeSpan.Zero;
+        }
+        private void MinuteChangeCommandExecuted(object sender, EventArgs e)
+        {
+            if (_SelectedTime == TimeSpan.Zero) return;
+            int offset = (int)((ICommandSource)sender).CommandParameter;
+            if (offset<0 && (_SelectedTime.Hours > 0 || _SelectedTime.Minutes > 0) || offset>0)
+                SelectedTime = new TimeSpan(_SelectedTime.Hours, _SelectedTime.Minutes + offset, _SelectedTime.Seconds);
+        }
+        private void HourCommandExecuted(object sender, EventArgs e)
+        {
+            int hour = (int)((ICommandSource)sender).CommandParameter;
+            if (!IsZuluTime)
+            {
+                bool isAm = false;
+                if (_SelectorType == eTimeSelectorType.TouchStyle)
+                    isAm = _ButtonAm.Checked;
+                else
+                {
+                    if (_SelectedTime != TimeSpan.Zero && _SelectedTime.Hours < 12)
+                        isAm = true;
+                }
+
+                if (!isAm && hour < 12)
+                    hour += 12;
+                else if (isAm && hour == 12)
+                    hour = 0;
+            }
+            int minute = _SelectedTime == TimeSpan.Zero ? DateTimeInput.DateTimeDefaults.Minute : _SelectedTime.Minutes;
+            int second = _SelectedTime == TimeSpan.Zero ? DateTimeInput.DateTimeDefaults.Second : _SelectedTime.Seconds;
+            if (hour == 0 && minute == 0 && second == 0) second = 1;
+            SelectedTime = new TimeSpan(hour, minute, second);
+        }
+        void MinuteCommandExecuted(object sender, EventArgs e)
+        {
+            int minute = (int)((ICommandSource)sender).CommandParameter;
+            int hour = _SelectedTime == TimeSpan.Zero ? DateTimeInput.DateTimeDefaults.Hour : _SelectedTime.Hours;
+            int second = _SelectedTime == TimeSpan.Zero ? DateTimeInput.DateTimeDefaults.Second : _SelectedTime.Seconds;
+            if (hour == 0 && minute == 0 && second == 0) second = 1;
+            SelectedTime = new TimeSpan(hour, minute, second);
+        }
+
+        private LabelItem _CurrentTimeLabel = null;
+        private ButtonItem _ButtonAm = null;
+        private ButtonItem _ButtonPm = null;
+        private void RecreateItems()
+        {
+            _AmPmLabel = null;
+            _HourLabel = null;
+            _MinuteLabel = null;
+            if (_InnerContainer.SubItems.Count > 0)
+            {
+                BaseItem[] list = new BaseItem[_InnerContainer.SubItems.Count];
+                _InnerContainer.SubItems.CopyTo(list, 0);
+                _InnerContainer.SubItems.Clear();
+                foreach (BaseItem item in list)
+                {
+                    item.Dispose();
+                }
+            }
+            if (_SelectorType == eTimeSelectorType.MonthCalendarStyle)
+                RecreateItemsMonthCalendarStyle();
+            else if (_SelectorType == eTimeSelectorType.TouchStyle)
+                RecreateItemsTouchStyle();
+            else
+                throw new NotImplementedException("Selector type '" + _SelectorType.ToString() + "' not implemented");
+
+            UpdateSelectedTimeText();
+        }
+        private void RecreateItemsTouchStyle()
+        {
+            if (_InnerContainer.SubItems.Count > 0)
+            {
+                BaseItem[] list = new BaseItem[_InnerContainer.SubItems.Count];
+                _InnerContainer.SubItems.CopyTo(list, 0);
+                _InnerContainer.SubItems.Clear();
+                foreach (BaseItem item in list)
+                {
+                    item.Dispose();
+                }
+            }
+            _InnerContainer.ResizeItemsToFit = false;
+            _CurrentTimeLabel = new DevComponents.DotNetBar.LabelItem();
+            ItemContainer itemContainer1 = new DevComponents.DotNetBar.ItemContainer();
+            ItemContainer itemContainer2 = new DevComponents.DotNetBar.ItemContainer();
+            ItemContainer itemContainer6 = new DevComponents.DotNetBar.ItemContainer();
+            ButtonItem buttonMinuteUp = new DevComponents.DotNetBar.ButtonItem();
+            ButtonItem buttonMinuteDown = new DevComponents.DotNetBar.ButtonItem();
+            LabelItem labelSpacerTop = new DevComponents.DotNetBar.LabelItem();
+            ButtonItem buttonClearTime = new DevComponents.DotNetBar.ButtonItem();
+            ItemContainer itemContainer3 = new DevComponents.DotNetBar.ItemContainer();
+            ItemContainer itemContainer4 = new DevComponents.DotNetBar.ItemContainer();
+            LabelItem labelHour = new DevComponents.DotNetBar.LabelItem();
+            ItemContainer hourRow1 = new DevComponents.DotNetBar.ItemContainer();
+            ItemContainer hourRow2 = new DevComponents.DotNetBar.ItemContainer();
+            ItemContainer hourRow3 = new DevComponents.DotNetBar.ItemContainer();
+            ItemContainer hourRow4 = new DevComponents.DotNetBar.ItemContainer();
+            ItemContainer itemContainer5 = new DevComponents.DotNetBar.ItemContainer();
+            ItemContainer itemContainer10 = new DevComponents.DotNetBar.ItemContainer();
+            LabelItem labelMinute = new DevComponents.DotNetBar.LabelItem();
+            ItemContainer minuteRow1 = new DevComponents.DotNetBar.ItemContainer();
+            ItemContainer minuteRow2 = new DevComponents.DotNetBar.ItemContainer();
+            ItemContainer minuteRow3 = new DevComponents.DotNetBar.ItemContainer();
+            ItemContainer minuteRow4 = new DevComponents.DotNetBar.ItemContainer();
+            ItemContainer itemContainer15 = new DevComponents.DotNetBar.ItemContainer();
+            LabelItem labelSpacerAm = new DevComponents.DotNetBar.LabelItem();
+            _ButtonAm = new DevComponents.DotNetBar.ButtonItem();
+            _ButtonPm = new DevComponents.DotNetBar.ButtonItem();
+            LabelItem labelSpacerBottom = new DevComponents.DotNetBar.LabelItem();
+            ButtonItem buttonOk = new DevComponents.DotNetBar.ButtonItem();
+
+            _InnerContainer.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+            itemContainer1,
+            itemContainer3,
+            itemContainer15});
+            _InnerContainer.ItemSpacing = 3;
+            _InnerContainer.LayoutOrientation = DevComponents.DotNetBar.eOrientation.Vertical;
+
+            itemContainer1.ItemSpacing = 3;
+            itemContainer1.Name = "itemContainer1";
+            itemContainer1.AutoCollapseOnClick = false;
+            itemContainer1.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+            itemContainer2});
+
+            itemContainer2.HorizontalItemAlignment = DevComponents.DotNetBar.eHorizontalItemsAlignment.Center;
+            itemContainer2.ItemSpacing = 4;
+            itemContainer2.Name = "itemContainer2";
+            itemContainer2.AutoCollapseOnClick = false;
+            itemContainer2.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+            _CurrentTimeLabel,
+            itemContainer6,
+            labelSpacerTop,
+            buttonClearTime});
+
+            _CurrentTimeLabel.Font = new System.Drawing.Font("Segoe UI", 18F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            _CurrentTimeLabel.Name = "labelCurrentTime";
+            //_CurrentTimeLabel.Text = "1:00 AM";
+            _CurrentTimeLabel.TextAlignment = System.Drawing.StringAlignment.Far;
+            _CurrentTimeLabel.Width = 150;
+            _CurrentTimeLabel.AutoCollapseOnClick = false;
+
+            itemContainer6.LayoutOrientation = DevComponents.DotNetBar.eOrientation.Vertical;
+            itemContainer6.Name = "itemContainer6";
+            itemContainer6.AutoCollapseOnClick = false;
+            itemContainer6.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+            buttonMinuteUp,
+            buttonMinuteDown});
+
+            buttonMinuteUp.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.TextOnlyAlways;
+            buttonMinuteUp.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+            buttonMinuteUp.FixedSize = new System.Drawing.Size(24, 14);
+            buttonMinuteUp.Name = "buttonMinuteUp";
+            buttonMinuteUp.Text = "<div width=\"20\" align=\"center\"><expand direction=\"top\"/></div>";
+            buttonMinuteUp.Command = _MinuteChangeCommand;
+            buttonMinuteUp.CommandParameter = 1;
+            buttonMinuteUp.ClickAutoRepeat = true;
+            buttonMinuteUp.AutoCollapseOnClick = false;
+
+            buttonMinuteDown.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.TextOnlyAlways;
+            buttonMinuteDown.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+            buttonMinuteDown.FixedSize = new System.Drawing.Size(24, 14);
+            buttonMinuteDown.Name = "buttonMinuteDown";
+            buttonMinuteDown.Text = "<div width=\"20\" align=\"center\"><expand direction=\"bottom\"/></div>";
+            buttonMinuteDown.Command = _MinuteChangeCommand;
+            buttonMinuteDown.CommandParameter = -1;
+            buttonMinuteDown.ClickAutoRepeat = true;
+            buttonMinuteDown.AutoCollapseOnClick = false;
+
+            labelSpacerTop.Name = "labelSpacerTop";
+            labelSpacerTop.Width = 4;
+            labelSpacerTop.AutoCollapseOnClick = false;
+
+            buttonClearTime.Name = "buttonClearTime";
+            //buttonClearTime.Text = "<symbol/>";
+            buttonClearTime.Symbol = "\ue5c9";
+            buttonClearTime.SymbolSet = eSymbolSet.Material;
+            buttonClearTime.Command = _ClearCommand;
+            buttonClearTime.Visible = _ClearButtonVisible;
+            buttonClearTime.AutoCollapseOnClick = false;
+
+            itemContainer3.ItemSpacing = 8;
+            itemContainer3.Name = "itemContainer3";
+            itemContainer3.AutoCollapseOnClick = false;
+            itemContainer3.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+            itemContainer4,
+            itemContainer5});
+
+            itemContainer4.ItemSpacing = 3;
+            itemContainer4.LayoutOrientation = DevComponents.DotNetBar.eOrientation.Vertical;
+            itemContainer4.MultiLine = false;
+            itemContainer4.Name = "itemContainer4";
+            itemContainer4.AutoCollapseOnClick = false;
+            itemContainer4.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+            labelHour,
+            hourRow1,
+            hourRow2,
+            hourRow3,
+            hourRow4});
+
+            labelHour.Font = new System.Drawing.Font("Segoe UI", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            labelHour.Name = "labelHour";
+            labelHour.Text = GetHourText();
+            labelHour.TextAlignment = System.Drawing.StringAlignment.Center;
+            labelHour.AutoCollapseOnClick = false;
+            _HourLabel = labelHour;
+
+            hourRow1.ItemSpacing = 3;
+            hourRow1.Name = "hourRow1";
+            hourRow1.AutoCollapseOnClick = false;
+            hourRow1.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+                CreateHourItem(1, eTimeSelectorType.TouchStyle),
+                CreateHourItem(2, eTimeSelectorType.TouchStyle),
+                CreateHourItem(3, eTimeSelectorType.TouchStyle)});
+
+            hourRow2.ItemSpacing = 3;
+            hourRow2.Name = "hourRow2";
+            hourRow2.AutoCollapseOnClick = false;
+            hourRow2.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+            CreateHourItem(4, eTimeSelectorType.TouchStyle),
+            CreateHourItem(5, eTimeSelectorType.TouchStyle),
+            CreateHourItem(6, eTimeSelectorType.TouchStyle)});
+
+            hourRow3.ItemSpacing = 3;
+            hourRow3.Name = "hourRow3";
+            hourRow3.AutoCollapseOnClick = false;
+            hourRow3.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+            CreateHourItem(7, eTimeSelectorType.TouchStyle),
+            CreateHourItem(8, eTimeSelectorType.TouchStyle),
+            CreateHourItem(9, eTimeSelectorType.TouchStyle)});
+
+            hourRow4.ItemSpacing = 3;
+            hourRow4.Name = "hourRow4";
+            hourRow4.AutoCollapseOnClick = false;
+            hourRow4.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+            CreateHourItem(10, eTimeSelectorType.TouchStyle),
+            CreateHourItem(11, eTimeSelectorType.TouchStyle),
+            CreateHourItem(12, eTimeSelectorType.TouchStyle)});
+
+            itemContainer5.LayoutOrientation = DevComponents.DotNetBar.eOrientation.Vertical;
+            itemContainer5.Name = "itemContainer5";
+            itemContainer5.AutoCollapseOnClick = false;
+            itemContainer5.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+            itemContainer10});
+
+            itemContainer10.ItemSpacing = 3;
+            itemContainer10.LayoutOrientation = DevComponents.DotNetBar.eOrientation.Vertical;
+            itemContainer10.MultiLine = false;
+            itemContainer10.Name = "itemContainer10";
+            itemContainer10.AutoCollapseOnClick = false;
+            itemContainer10.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+            labelMinute,
+            minuteRow1,
+            minuteRow2,
+            minuteRow3,
+            minuteRow4});
+
+            labelMinute.Font = new System.Drawing.Font("Segoe UI", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            labelMinute.Name = "labelMinute";
+            labelMinute.Text = GetMinuteText();
+            labelMinute.TextAlignment = System.Drawing.StringAlignment.Center;
+            labelMinute.AutoCollapseOnClick = false;
+            _MinuteLabel = labelMinute;
+
+            minuteRow1.ItemSpacing = 3;
+            minuteRow1.Name = "minuteRow1";
+            minuteRow1.AutoCollapseOnClick = false;
+            minuteRow1.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+            CreateMinuteItem(0, eTimeSelectorType.TouchStyle),
+            CreateMinuteItem(5, eTimeSelectorType.TouchStyle),
+            CreateMinuteItem(10, eTimeSelectorType.TouchStyle)});
+
+            minuteRow2.ItemSpacing = 3;
+            minuteRow2.Name = "minuteRow2";
+            minuteRow2.AutoCollapseOnClick = false;
+            minuteRow2.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+            CreateMinuteItem(15, eTimeSelectorType.TouchStyle),
+            CreateMinuteItem(20, eTimeSelectorType.TouchStyle),
+            CreateMinuteItem(25, eTimeSelectorType.TouchStyle)});
+
+            minuteRow3.ItemSpacing = 3;
+            minuteRow3.Name = "minuteRow3";
+            minuteRow3.AutoCollapseOnClick = false;
+            minuteRow3.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+            CreateMinuteItem(30, eTimeSelectorType.TouchStyle),
+            CreateMinuteItem(35, eTimeSelectorType.TouchStyle),
+            CreateMinuteItem(40, eTimeSelectorType.TouchStyle)});
+
+            minuteRow4.ItemSpacing = 3;
+            minuteRow4.Name = "minuteRow4";
+            minuteRow4.AutoCollapseOnClick = false;
+            minuteRow4.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+            CreateMinuteItem(45, eTimeSelectorType.TouchStyle),
+            CreateMinuteItem(50, eTimeSelectorType.TouchStyle),
+            CreateMinuteItem(55, eTimeSelectorType.TouchStyle)});
+
+            itemContainer15.Name = "itemContainer15";
+            itemContainer15.AutoCollapseOnClick = false;
+            itemContainer15.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+            labelSpacerAm,
+            _ButtonAm,
+            _ButtonPm,
+            labelSpacerBottom,
+            buttonOk});
+
+            labelSpacerAm.Name = "labelSpacerAm";
+            labelSpacerAm.Width = IsZuluTime ? 84 : 36;
+            labelSpacerAm.AutoCollapseOnClick = false;
+
+            _ButtonAm.Checked = true;
+            _ButtonAm.Name = "buttonAm";
+            _ButtonAm.Text = "AM";
+            _ButtonAm.Visible = !IsZuluTime;
+            _ButtonAm.Command = _AmPmCommand;
+            _ButtonAm.CommandParameter = "AM";
+            _ButtonAm.AutoCollapseOnClick = false;
+            _ButtonPm.Name = "buttonPm";
+            _ButtonPm.Text = "PM";
+            _ButtonPm.Visible = !IsZuluTime;
+            _ButtonPm.Command = _AmPmCommand;
+            _ButtonPm.CommandParameter = "PM";
+            _ButtonPm.AutoCollapseOnClick = false;
+
+            if (_SelectedTime != TimeSpan.Zero)
+            {
+                _ButtonAm.Checked = _SelectedTime.Hours <= 12;
+                _ButtonPm.Checked = _SelectedTime.Hours > 12;
+            }
+
+            labelSpacerBottom.Name = "labelSpacerBottom";
+            labelSpacerBottom.Width = 124;
+            labelSpacerBottom.AutoCollapseOnClick = false;
+
+            buttonOk.ColorTable = DevComponents.DotNetBar.eButtonColor.BlueWithBackground;
+            buttonOk.Name = "buttonOk";
+            buttonOk.Text = "<div align=\"center\" width=\"32\"><b>" + GetOkText() + "</b></div>";
+            buttonOk.Visible = _OkButtonVisible;
+            buttonOk.Command = _OkCommand;
+
+        }
+
+        private void RecreateItemsMonthCalendarStyle()
+        {
+            Size fixedButtonSize = new Size(13, 18);
+            bool isZuluTime = IsZuluTime;
+
+            ItemContainer itemContainer2 = new ItemContainer();
+            ItemContainer itemContainer3 = new ItemContainer();
+
+            // 
+            // buttonMinuteDown
+            // 
+            ButtonItem buttonMinuteDown = new ButtonItem();
+            buttonMinuteDown.FixedSize = fixedButtonSize;
+            buttonMinuteDown.Name = "buttonMinuteDown";
+            buttonMinuteDown.Text = "<expand direction=\"left\"/>";
+            buttonMinuteDown.AutoCollapseOnClick = false;
+            buttonMinuteDown._FixedSizeCenterText = true;
+            buttonMinuteDown.ClickAutoRepeat = true;
+            buttonMinuteDown.Command = _MinuteChangeCommand;
+            buttonMinuteDown.CommandParameter = -1;
+            // 
+            // _CurrentTimeLabel
+            // 
+            _CurrentTimeLabel = new LabelItem();
+            _CurrentTimeLabel.Name = "_CurrentTimeLabel";
+            _CurrentTimeLabel.Text = "03:45";
+            _CurrentTimeLabel.TextAlignment = System.Drawing.StringAlignment.Center;
+            _CurrentTimeLabel.Width = 64;
+            _CurrentTimeLabel.AutoCollapseOnClick = false;
+            // 
+            // buttonMinuteUp
+            // 
+            ButtonItem buttonMinuteUp = new ButtonItem();
+            buttonMinuteUp.FixedSize = fixedButtonSize;
+            buttonMinuteUp.Name = "buttonMinuteUp";
+            buttonMinuteUp.Text = "<expand direction=\"right\"/>";
+            buttonMinuteUp.AutoCollapseOnClick = false;
+            buttonMinuteUp._FixedSizeCenterText = true;
+            buttonMinuteUp.ClickAutoRepeat = true;
+            buttonMinuteUp.Command = _MinuteChangeCommand;
+            buttonMinuteUp.CommandParameter = 1;
+            // 
+            // labelSpacerLine1
+            // 
+            LabelItem labelSpacerLine1 = new LabelItem();
+            labelSpacerLine1.Name = "labelSpacerLine1";
+            labelSpacerLine1.Width = 10;
+            labelSpacerLine1.AutoCollapseOnClick = false;
+            // 
+            // _ButtonAm
+            // 
+            ButtonItem _ButtonAm = new ButtonItem();
+            _ButtonAm.FixedSize = fixedButtonSize;
+            _ButtonAm.Name = "_ButtonAm";
+            _ButtonAm.Text = "<expand direction=\"left\"/>";
+            _ButtonAm.AutoCollapseOnClick = false;
+            _ButtonAm._FixedSizeCenterText = true;
+            _ButtonAm.Visible = !isZuluTime;
+            _ButtonAm.Command = _AmPmCommand;
+            _ButtonAm.CommandParameter = "AM";
+            // 
+            // labelItem2
+            // 
+            _AmPmLabel = new LabelItem();
+            _AmPmLabel.Name = "labelItem2";
+            _AmPmLabel.Text = "PM";
+            _AmPmLabel.TextAlignment = System.Drawing.StringAlignment.Center;
+            _AmPmLabel.Width = 28;
+            _AmPmLabel.AutoCollapseOnClick = false;
+            _AmPmLabel.Visible = !isZuluTime;
+            // 
+            // _ButtonPm
+            // 
+            _ButtonPm = new ButtonItem();
+            _ButtonPm.FixedSize = fixedButtonSize;
+            _ButtonPm.Name = "_ButtonPm";
+            _ButtonPm.Text = "<expand direction=\"right\"/>";
+            _ButtonPm.AutoCollapseOnClick = false;
+            _ButtonPm._FixedSizeCenterText = true;
+            _ButtonPm.Command = _AmPmCommand;
+            _ButtonPm.CommandParameter = "PM";
+            _ButtonPm.Visible = !isZuluTime;
+
+            itemContainer2.AutoCollapseOnClick = false;
+            //itemContainer2.BackgroundStyle.PaddingTop = 2;
+            //itemContainer2.BackgroundStyle.PaddingBottom = 1;
+            itemContainer2.BackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground2;
+            itemContainer2.BackgroundStyle.BackColorGradientAngle = 90;
+            itemContainer2.BackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground;
+            itemContainer2.BackgroundStyle.Class = "";
+            itemContainer2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            itemContainer2.Name = "itemContainer2";
+            itemContainer2.MinimumSize = new Size(0, fixedButtonSize.Height + 3);
+            itemContainer2.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+            buttonMinuteDown,
+            _CurrentTimeLabel,
+            buttonMinuteUp,
+            labelSpacerLine1,
+            _ButtonAm,
+            _AmPmLabel,
+            _ButtonPm});
+
+            // 
+            // labelHour
+            // 
+            LabelItem labelHour = new LabelItem();
+            labelHour.Name = "labelHour";
+            labelHour.Text = GetHourText();
+            labelHour.ForeColorColorSchemePart = eColorSchemePart.ItemText;
+            labelHour.TextAlignment = System.Drawing.StringAlignment.Center;
+            labelHour.Width = isZuluTime ? (_HourMinuteButtonSize.Width * 4 + 3) : (_HourMinuteButtonSize.Width * 3 + 2);
+            labelHour.Height = _HourMinuteButtonSize.Height - 3;
+            labelHour.AutoCollapseOnClick = false;
+            labelHour.PaddingBottom = 1;
+            _HourLabel = labelHour;
+            // 
+            // labelMinute
+            // 
+            LabelItem labelMinute = new LabelItem();
+            labelMinute.Name = "labelMinute";
+            labelMinute.Text = GetMinuteText();
+            labelMinute.ForeColorColorSchemePart = eColorSchemePart.ItemText;
+            labelMinute.TextAlignment = System.Drawing.StringAlignment.Center;
+            labelMinute.Width = (_HourMinuteButtonSize.Width * 3 + 2);
+            labelMinute.Height = _HourMinuteButtonSize.Height - 3;
+            labelMinute.AutoCollapseOnClick = false;
+            labelMinute.PaddingBottom = 1;
+            _MinuteLabel = labelMinute;
+            LabelItem labelHMSpacer = new LabelItem();
+            labelHMSpacer.Height = _HourMinuteButtonSize.Height - 3;
+            labelHMSpacer.Width = isZuluTime ? 2 : 18;
+            // 
+            // hourMinLabelRow
+            // 
+            // 
+            // 
+            // 
+            ItemContainer hourMinLabelRow = new ItemContainer();
+            hourMinLabelRow.AutoCollapseOnClick = false;
+            hourMinLabelRow.BackgroundStyle.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            hourMinLabelRow.BackgroundStyle.BorderBottomColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+            hourMinLabelRow.BackgroundStyle.BorderBottomWidth = 1;
+            hourMinLabelRow.BackgroundStyle.Class = "";
+            hourMinLabelRow.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            hourMinLabelRow.Name = "hourMinLabelRow";
+            hourMinLabelRow.BackgroundStyle.MarginBottom = 2;
+            hourMinLabelRow.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+            labelHour,
+            labelHMSpacer,
+            labelMinute});
+
+            LabelItem labelSpacerLine3 = new LabelItem();
+            labelSpacerLine3.Name = "labelSpacerLine3";
+            labelSpacerLine3.Width = 18;
+            labelSpacerLine3.AutoCollapseOnClick = false;
+            // 
+            // hourMinRow1
+            // 
+            // 
+            // 
+            // 
+            ItemContainer hourMinRow1 = new ItemContainer();
+            hourMinRow1.AutoCollapseOnClick = false;
+            hourMinRow1.BackgroundStyle.Class = "";
+            hourMinRow1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            hourMinRow1.Name = "hourMinRow1";
+            if (isZuluTime)
+            {
+                labelSpacerLine3.Width -= 12;
+                hourMinRow1.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+                    CreateHourItem(0, eTimeSelectorType.MonthCalendarStyle),
+                    CreateHourItem(1, eTimeSelectorType.MonthCalendarStyle),
+                    CreateHourItem(2, eTimeSelectorType.MonthCalendarStyle),
+                    CreateHourItem(3, eTimeSelectorType.MonthCalendarStyle),
+                    labelSpacerLine3,
+                    CreateMinuteItem(0, eTimeSelectorType.MonthCalendarStyle),
+                    CreateMinuteItem(5, eTimeSelectorType.MonthCalendarStyle),
+                    CreateMinuteItem(10, eTimeSelectorType.MonthCalendarStyle)});
+            }
+            else
+            {
+                hourMinRow1.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+                    CreateHourItem(1, eTimeSelectorType.MonthCalendarStyle),
+                    CreateHourItem(2, eTimeSelectorType.MonthCalendarStyle),
+                    CreateHourItem(3, eTimeSelectorType.MonthCalendarStyle),
+                    labelSpacerLine3,
+                    CreateMinuteItem(0, eTimeSelectorType.MonthCalendarStyle),
+                    CreateMinuteItem(5, eTimeSelectorType.MonthCalendarStyle),
+                    CreateMinuteItem(10, eTimeSelectorType.MonthCalendarStyle)});
+            }
+
+            // 
+            // labelItem5
+            // 
+            LabelItem labelItem5 = new LabelItem();
+            labelItem5.Name = "labelItem5";
+            labelItem5.Width = 18;
+            labelItem5.AutoCollapseOnClick = false;
+            // 
+            // hourMinRow2
+            // 
+            // 
+            // 
+            // 
+            ItemContainer hourMinRow2 = new ItemContainer();
+            hourMinRow2.AutoCollapseOnClick = false;
+            hourMinRow2.BackgroundStyle.Class = "";
+            hourMinRow2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            hourMinRow2.Name = "hourMinRow2";
+            if (isZuluTime)
+            {
+                labelItem5.Width -= 12;
+                hourMinRow2.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+                    CreateHourItem(4, eTimeSelectorType.MonthCalendarStyle),
+                    CreateHourItem(5, eTimeSelectorType.MonthCalendarStyle),
+                    CreateHourItem(6, eTimeSelectorType.MonthCalendarStyle),
+                    CreateHourItem(7, eTimeSelectorType.MonthCalendarStyle),
+                    labelItem5,
+                    CreateMinuteItem(15, eTimeSelectorType.MonthCalendarStyle),
+                    CreateMinuteItem(20, eTimeSelectorType.MonthCalendarStyle),
+                    CreateMinuteItem(25, eTimeSelectorType.MonthCalendarStyle)});
+            }
+            else
+            {
+                hourMinRow2.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+                    CreateHourItem(4, eTimeSelectorType.MonthCalendarStyle),
+                    CreateHourItem(5, eTimeSelectorType.MonthCalendarStyle),
+                    CreateHourItem(6, eTimeSelectorType.MonthCalendarStyle),
+                    labelItem5,
+                    CreateMinuteItem(15, eTimeSelectorType.MonthCalendarStyle),
+                    CreateMinuteItem(20, eTimeSelectorType.MonthCalendarStyle),
+                    CreateMinuteItem(25, eTimeSelectorType.MonthCalendarStyle)});
+            }
+            // 
+            // labelItem6
+            // 
+            LabelItem labelItem6 = new LabelItem();
+            labelItem6.Name = "labelItem6";
+            labelItem6.Width = 18;
+            labelItem6.AutoCollapseOnClick = false;
+            // 
+            // hourMinRow3
+            // 
+            // 
+            // 
+            // 
+            ItemContainer hourMinRow3 = new ItemContainer();
+            hourMinRow3.AutoCollapseOnClick = false;
+            hourMinRow3.BackgroundStyle.Class = "";
+            hourMinRow3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            hourMinRow3.Name = "hourMinRow3";
+            if (isZuluTime)
+            {
+                labelItem6.Width -= 12;
+                hourMinRow3.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+                    CreateHourItem(8, eTimeSelectorType.MonthCalendarStyle),
+                    CreateHourItem(9, eTimeSelectorType.MonthCalendarStyle),
+                    CreateHourItem(10, eTimeSelectorType.MonthCalendarStyle),
+                    CreateHourItem(11, eTimeSelectorType.MonthCalendarStyle),
+                    labelItem6,
+                    CreateMinuteItem(30, eTimeSelectorType.MonthCalendarStyle),
+                    CreateMinuteItem(35, eTimeSelectorType.MonthCalendarStyle),
+                    CreateMinuteItem(40, eTimeSelectorType.MonthCalendarStyle)});
+            }
+            else
+            {
+                hourMinRow3.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+                    CreateHourItem(7, eTimeSelectorType.MonthCalendarStyle),
+                    CreateHourItem(8, eTimeSelectorType.MonthCalendarStyle),
+                    CreateHourItem(9, eTimeSelectorType.MonthCalendarStyle),
+                    labelItem6,
+                    CreateMinuteItem(30, eTimeSelectorType.MonthCalendarStyle),
+                    CreateMinuteItem(35, eTimeSelectorType.MonthCalendarStyle),
+                    CreateMinuteItem(40, eTimeSelectorType.MonthCalendarStyle)});
+            }
+            // 
+            // labelItem7
+            // 
+            LabelItem labelItem7 = new LabelItem();
+            labelItem7.Name = "labelItem7";
+            labelItem7.Width = 18;
+            labelItem7.AutoCollapseOnClick = false;
+            // 
+            // hourMinRow4
+            // 
+            // 
+            // 
+            // 
+            ItemContainer hourMinRow4 = new ItemContainer();
+            hourMinRow4.AutoCollapseOnClick = false;
+            hourMinRow4.BackgroundStyle.Class = "";
+            hourMinRow4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            hourMinRow4.Name = "hourMinRow4";
+            if (isZuluTime)
+            {
+                labelItem7.Width -= 12;
+                hourMinRow4.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+                    CreateHourItem(12, eTimeSelectorType.MonthCalendarStyle),
+                    CreateHourItem(13, eTimeSelectorType.MonthCalendarStyle),
+                    CreateHourItem(14, eTimeSelectorType.MonthCalendarStyle),
+                    CreateHourItem(15, eTimeSelectorType.MonthCalendarStyle),
+                    labelItem7,
+                    CreateMinuteItem(45, eTimeSelectorType.MonthCalendarStyle),
+                    CreateMinuteItem(50, eTimeSelectorType.MonthCalendarStyle),
+                    CreateMinuteItem(55, eTimeSelectorType.MonthCalendarStyle)});
+            }
+            else
+            {
+                hourMinRow4.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+                    CreateHourItem(10, eTimeSelectorType.MonthCalendarStyle),
+                    CreateHourItem(11, eTimeSelectorType.MonthCalendarStyle),
+                    CreateHourItem(12, eTimeSelectorType.MonthCalendarStyle),
+                    labelItem7,
+                    CreateMinuteItem(45, eTimeSelectorType.MonthCalendarStyle),
+                    CreateMinuteItem(50, eTimeSelectorType.MonthCalendarStyle),
+                    CreateMinuteItem(55, eTimeSelectorType.MonthCalendarStyle)});
+            }
+            // 
+            // hourMinRow4
+            // 
+            // 
+            // 
+            // 
+            ItemContainer hourMinRow5 = null, hourMinRow6 = null; ;
+            if (isZuluTime)
+            {
+                hourMinRow5 = new ItemContainer();
+                hourMinRow5.AutoCollapseOnClick = false;
+                hourMinRow5.BackgroundStyle.Class = "";
+                hourMinRow5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+                hourMinRow5.Name = "hourMinRow5";
+                hourMinRow5.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+                CreateHourItem(16, eTimeSelectorType.MonthCalendarStyle),
+                CreateHourItem(17, eTimeSelectorType.MonthCalendarStyle),
+                CreateHourItem(18, eTimeSelectorType.MonthCalendarStyle),
+                CreateHourItem(19, eTimeSelectorType.MonthCalendarStyle)});
+
+                hourMinRow6 = new ItemContainer();
+                hourMinRow6.AutoCollapseOnClick = false;
+                hourMinRow6.BackgroundStyle.Class = "";
+                hourMinRow6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+                hourMinRow6.Name = "hourMinRow6";
+                hourMinRow6.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+                CreateHourItem(20, eTimeSelectorType.MonthCalendarStyle),
+                CreateHourItem(21, eTimeSelectorType.MonthCalendarStyle),
+                CreateHourItem(22, eTimeSelectorType.MonthCalendarStyle),
+                CreateHourItem(23, eTimeSelectorType.MonthCalendarStyle)});
+
+            }
+            //
+            // itemContainer3
+            // 
+            // 
+            // 
+            // 
+            itemContainer3.AutoCollapseOnClick = false;
+            itemContainer3.BackgroundStyle.Class = "";
+            itemContainer3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            itemContainer3.LayoutOrientation = DevComponents.DotNetBar.eOrientation.Vertical;
+            itemContainer3.Name = "itemContainer3";
+            itemContainer3.ItemSpacing = 0;
+            itemContainer3.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+            hourMinLabelRow,
+            hourMinRow1,
+            hourMinRow2,
+            hourMinRow3,
+            hourMinRow4});
+            if (hourMinRow5 != null)
+                itemContainer3.SubItems.Add(hourMinRow5);
+            if (hourMinRow6 != null)
+                itemContainer3.SubItems.Add(hourMinRow6);
+
+            // 
+            // buttonItem29
+            // 
+            ButtonItem buttonClearTime = new ButtonItem("buttonClearTime");
+            buttonClearTime.Text = "<div align=\"center\" width=\"32\">" + GetClearText() + "</div>";
+            buttonClearTime.Command = _ClearCommand;
+            buttonClearTime.Visible = _ClearButtonVisible;
+            buttonClearTime.AutoCollapseOnClick = false;
+            // 
+            // buttonItem30
+            // 
+            ButtonItem buttonOk = new ButtonItem("buttonOk");
+            buttonOk.Text = "<div align=\"center\" width=\"32\">" + GetOkText() + "</div>";
+            buttonOk.Visible = _OkButtonVisible;
+            buttonOk.Command = _OkCommand;
+            // 
+            // commandRow
+            // 
+            // 
+            // 
+            // 
+            ItemContainer commandRow = new ItemContainer();
+            commandRow.AutoCollapseOnClick = false;
+            commandRow.BackgroundStyle.MarginTop = isZuluTime ? 2 : 35 + 2 * (_HourMinuteButtonSize.Height - DefaultHourMinuteButtonSize.Height);
+            commandRow.BackgroundStyle.Border = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            commandRow.BackgroundStyle.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+            commandRow.BackgroundStyle.BorderTopWidth = 1;
+            commandRow.BackgroundStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground;
+            commandRow.BackgroundStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground2;
+            commandRow.BackgroundStyle.BackColorGradientAngle = 90;
+            commandRow.HorizontalItemAlignment = DevComponents.DotNetBar.eHorizontalItemsAlignment.Center;
+            commandRow.ItemAlignment = DevComponents.DotNetBar.eItemAlignment.Center;
+            commandRow.Name = "commandRow";
+            commandRow.ItemSpacing = 5;
+            commandRow.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+            buttonClearTime,
+            buttonOk});
+
+            _InnerContainer.ResizeItemsToFit = true;
+            _InnerContainer.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+            itemContainer2,
+            itemContainer3,
+            commandRow});
+        }
+
+        private BaseItem CreateMinuteItem(int minute, eTimeSelectorType style)
+        {
+            BaseItem item = null;
+            if (style == eTimeSelectorType.TouchStyle)
+            {
+                ButtonItem button = new ButtonItem();
+                button.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+                button.Text = "<div align=\"center\" width=\"32\"><font face=\"Segoe UI\" size=\"10\"><b>" + minute.ToString("##00") + "</b></font></div>";
+                button.Command = _MinuteCommand;
+                button.CommandParameter = minute;
+                item = button;
+            }
+            else
+            {
+                ButtonItem button = new ButtonItem();
+                button.Shape = new DevComponents.DotNetBar.RoundRectangleShapeDescriptor();
+                button.Text = minute.ToString("##00");
+                button.Command = _MinuteCommand;
+                button.CommandParameter = minute;
+                button.FixedSize = HourMinuteButtonSize;
+                button._FixedSizeCenterText = true;
+                button.ForeColorColorSchemePart = eColorSchemePart.ItemText;
+                item = button;
+            }
+
+            item.AutoCollapseOnClick = false;
+            return item;
+        }
+        private static readonly Size DefaultHourMinuteButtonSize = new Size(24, 15);
+        private BaseItem CreateHourItem(int hour, eTimeSelectorType style)
+        {
+            BaseItem item = null;
+            if (style == eTimeSelectorType.TouchStyle)
+            {
+                if (IsZuluTime)
+                {
+                    DualButton button = new DualButton();
+                    button.Text = hour.ToString();
+                    if (hour + 12 == 24)
+                        button.Text2 = "0";
+                    else
+                        button.Text2 = (hour + 12).ToString();
+                    button.Command = _HourCommand;
+                    button.CommandParameter = hour;
+                    button.Command2 = _HourCommand;
+                    button.Command2Parameter = hour + 12;
+                    item = button;
+                    if (_DualButtonFont == null) CreateDualButtonFont();
+                    button.Font = _DualButtonFont;
+                }
+                else
+                {
+                    ButtonItem button = new ButtonItem();
+                    button.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+                    button.Text = "<div align=\"center\" width=\"32\"><font face=\"Segoe UI\" size=\"10\"><b>" + hour.ToString() + "</b></font></div>";
+                    button.Command = _HourCommand;
+                    button.CommandParameter = hour;
+                    item = button;
+                }
+            }
+            else
+            {
+                ButtonItem button = new ButtonItem();
+                button.Shape = new DevComponents.DotNetBar.RoundRectangleShapeDescriptor();
+                button.Text = hour.ToString("##00");
+                button.Command = _HourCommand;
+                button.CommandParameter = hour;
+                button.FixedSize = HourMinuteButtonSize;
+                button._FixedSizeCenterText = true;
+                button.ForeColorColorSchemePart = eColorSchemePart.ItemText;
+                item = button;
+            }
+
+            item.AutoCollapseOnClick = false;
+            return item;
+        }
+        private void CreateDualButtonFont()
+        {
+            if (_DualButtonFont != null) _DualButtonFont.Dispose();
+            _DualButtonFont = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+        }
+        private bool IsZuluTime
+        {
+            get
+            {
+                if (GetEffectiveTimeFormat() == eTimeSelectorFormat.Time24H)
+                    return true;
+                return false;
+            }
+        }
+
+        private eTimeSelectorFormat GetEffectiveTimeFormat()
+        {
+            eTimeSelectorFormat timeFormat = _TimeFormat;
+            if (timeFormat == eTimeSelectorFormat.System)
+            {
+                if (System.Globalization.CultureInfo.CurrentCulture.DateTimeFormat.ShortTimePattern.Contains("H"))
+                    return eTimeSelectorFormat.Time24H;
+                return eTimeSelectorFormat.Time12H;
+            }
+            return timeFormat;
+        }
+
+        private TimeSpan _SelectedTime = TimeSpan.Zero;
+        /// <summary>
+        /// Gets or sets selected time. Returns TimeSpan.Zero if there is no time selected.
+        /// </summary>
+        [Category("Data"), Description("Indicates selected time.")]
+        public TimeSpan SelectedTime
+        {
+            get { return _SelectedTime; }
+            set
+            {
+                if (value != _SelectedTime)
+                {
+                    TimeSpan oldValue = _SelectedTime;
+                    _SelectedTime = value;
+                    OnSelectedTimeChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Returns whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeSelectedTime()
+        {
+            return !_SelectedTime.Equals(TimeSpan.Zero);
+        }
+        /// <summary>
+        /// Resets property to default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetSelectedTime()
+        {
+            SelectedTime = TimeSpan.Zero;
+        }
+        /// <summary>
+        /// Called when SelectedTime property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnSelectedTimeChanged(TimeSpan oldValue, TimeSpan newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("SelectedTime"));
+            UpdateSelectedTimeText();
+            OnSelectedTimeChanged(EventArgs.Empty);
+        }
+
+        internal const string DefaultTimeFormat24H = "HH:mm";
+        private string _TimeFormat24H = DefaultTimeFormat24H;
+        /// <summary>
+        /// Gets or sets the format for the 24 Hour Time Display.
+        /// </summary>
+        [DefaultValue(DefaultTimeFormat24H), Category("Data"), Description("Indicates format for the 24 Hour Time Display."), Localizable(true)]
+        public string TimeFormat24H
+        {
+            get { return _TimeFormat24H; }
+            set
+            {
+                if (value != _TimeFormat24H)
+                {
+                    string oldValue = _TimeFormat24H;
+                    _TimeFormat24H = value;
+                    OnTimeFormat24HChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when TimeFormat24H property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnTimeFormat24HChanged(string oldValue, string newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("TimeFormat24H"));
+            UpdateSelectedTimeText();
+        }
+
+        internal const string DefaultTimeFormat12H = "hh:mm tt";
+        private string _TimeFormat12H = DefaultTimeFormat12H;
+        /// <summary>
+        /// Gets or sets the format for the 12 Hour Time Display.
+        /// </summary>
+        [DefaultValue(DefaultTimeFormat12H), Category("Data"), Description("Indicates format for the 12 Hour Time Display."), Localizable(true)]
+        public string TimeFormat12H
+        {
+            get { return _TimeFormat12H; }
+            set
+            {
+                if (value != _TimeFormat12H)
+                {
+                    string oldValue = _TimeFormat12H;
+                    _TimeFormat12H = value;
+                    OnTimeFormat12HChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when TimeFormat12H property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnTimeFormat12HChanged(string oldValue, string newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("TimeFormat12H"));
+            UpdateSelectedTimeText();
+        }
+        private void UpdateSelectedTimeText()
+        {
+            if (_SelectedTime == TimeSpan.Zero)
+            {
+                _CurrentTimeLabel.Text = "--:--";
+                if (_AmPmLabel != null)
+                    _AmPmLabel.Text = "--";
+            }
+            else
+            {
+                if (IsZuluTime)
+                {
+                    _CurrentTimeLabel.Text = SelectedDateTime.ToString(_TimeFormat24H);
+                }
+                else
+                {
+                    _CurrentTimeLabel.Text = SelectedDateTime.ToString(_TimeFormat12H);
+                }
+                if (_SelectorType == eTimeSelectorType.TouchStyle)
+                {
+                    _ButtonAm.Checked = _SelectedTime.Hours < 12;
+                    _ButtonPm.Checked = _SelectedTime.Hours >= 12;
+                }
+                else
+                {
+                    _ButtonAm.Checked = false;
+                    _ButtonPm.Checked = false;
+                }
+                if (_AmPmLabel != null)
+                    _AmPmLabel.Text = (_SelectedTime.Hours < 12) ? "AM" : "PM";
+            }
+        }
+
+        private DateTime _SelectedDateTime = DateTime.MinValue;
+        /// <summary>
+        /// Gets or sets the selected date time.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public DateTime SelectedDateTime
+        {
+            get
+            {
+                if (_SelectedTime == TimeSpan.Zero)
+                    return DateTime.MinValue;
+
+                return new DateTime(_SelectedDateTime.Year, _SelectedDateTime.Month, _SelectedDateTime.Day,
+                    _SelectedTime.Hours, _SelectedTime.Minutes, _SelectedTime.Seconds);
+            }
+            set
+            {
+                if (value != _SelectedDateTime)
+                {
+                    DateTime oldValue = _SelectedDateTime;
+                    _SelectedDateTime = value;
+                    OnSelectedDateTimeChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when SelectedDateTime property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnSelectedDateTimeChanged(DateTime oldValue, DateTime newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("SelectedDateTime"));
+            if (newValue == DateTime.MinValue)
+                SelectedTime = TimeSpan.Zero;
+            else
+                SelectedTime = newValue.TimeOfDay;
+        }
+
+        private string _OkText = "OK";
+        /// <summary>
+        /// Gets or sets the text displayed on OK button.
+        /// </summary>
+        [DefaultValue("OK"), Category("Appearance"), Description("Indicates text displayed on OK button."), Localizable(true)]
+        public string OkText
+        {
+            get { return _OkText; }
+            set
+            {
+                if (value != _OkText)
+                {
+                    string oldValue = _OkText;
+                    _OkText = value;
+                    OnOkTextChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when OkText property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnOkTextChanged(string oldValue, string newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("OkText"));
+            if (_OkCommand != null) _OkCommand.Text = GetOkText();
+        }
+        private string GetOkText()
+        {
+            using (LocalizationManager lm = new LocalizationManager(this.GetOwner() as IOwnerLocalize))
+            {
+                string s = lm.GetLocalizedString(LocalizationKeys.TimeSelectorOkButton);
+                if (s != "") return s;
+            }
+            return _OkText;
+        }
+
+        private string _ClearText = "Clear";
+        /// <summary>
+        /// Gets or sets the text displayed on Clear button only when MonthCalendarStyle is used.
+        /// </summary>
+        [DefaultValue("Clear"), Category("Appearance"), Description("Indicates text displayed on Clear button only when MonthCalendarStyle is used."), Localizable(true)]
+        public string ClearText
+        {
+            get { return _ClearText; }
+            set
+            {
+                if (value != _ClearText)
+                {
+                    string oldValue = _ClearText;
+                    _ClearText = value;
+                    OnClearTextChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when ClearText property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnClearTextChanged(string oldValue, string newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("ClearText"));
+            if (_ClearCommand != null) _ClearCommand.Text = GetClearText();
+        }
+        private string GetClearText()
+        {
+            using (LocalizationManager lm = new LocalizationManager(this.GetOwner() as IOwnerLocalize))
+            {
+                string s = lm.GetLocalizedString(LocalizationKeys.TimeSelectorClearButton);
+                if (s != "") return s;
+            }
+            return _ClearText;
+        }
+
+        private eTimeSelectorFormat _TimeFormat = eTimeSelectorFormat.System;
+        /// <summary>
+        /// Gets or sets the time format used to present time by the selector.
+        /// </summary>
+        [DefaultValue(eTimeSelectorFormat.System), Category("Appearance"), Description("Indicates time format used to present time by the selector."), Localizable(true)]
+        public eTimeSelectorFormat TimeFormat
+        {
+            get { return _TimeFormat; }
+            set
+            {
+                if (value != _TimeFormat)
+                {
+                    eTimeSelectorFormat oldValue = _TimeFormat;
+                    _TimeFormat = value;
+                    OnTimeFormatChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when TimeFormat property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnTimeFormatChanged(eTimeSelectorFormat oldValue, eTimeSelectorFormat newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("TimeFormat"));
+            RecreateItems();
+        }
+
+        private bool _OkButtonVisible = true;
+        /// <summary>
+        /// Gets or sets whether Ok button is visible.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance"), Description("Indicates whether Ok button is visible.")]
+        public bool OkButtonVisible
+        {
+            get { return _OkButtonVisible; }
+            set
+            {
+                if (value != _OkButtonVisible)
+                {
+                    bool oldValue = _OkButtonVisible;
+                    _OkButtonVisible = value;
+                    OnOkButtonVisibleChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when OkButtonVisible property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnOkButtonVisibleChanged(bool oldValue, bool newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("OkButtonVisible"));
+            if (_OkCommand != null) _OkCommand.Visible = newValue;
+        }
+
+        private bool _ClearButtonVisible = true;
+        /// <summary>
+        /// Gets or sets whether Ok button is visible.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance"), Description("Indicates whether Ok button is visible.")]
+        public bool ClearButtonVisible
+        {
+            get { return _ClearButtonVisible; }
+            set
+            {
+                if (value != _ClearButtonVisible)
+                {
+                    bool oldValue = _ClearButtonVisible;
+                    _ClearButtonVisible = value;
+                    OnClearButtonVisibleChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when ClearButtonVisible property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnClearButtonVisibleChanged(bool oldValue, bool newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("ClearButtonVisible"));
+            if (_ClearCommand != null) _ClearCommand.Visible = newValue;
+        }
+
+        private eTimeSelectorType _SelectorType = eTimeSelectorType.TouchStyle;
+        /// <summary>
+        /// Indicates the type of the selector used to select time.
+        /// </summary>
+        [DefaultValue(eTimeSelectorType.TouchStyle), Category("Appearance"), Description("Indicates the type of the selector used to select time.")]
+        public eTimeSelectorType SelectorType
+        {
+            get { return _SelectorType; }
+            set
+            {
+                if (value != _SelectorType)
+                {
+                    eTimeSelectorType oldValue = _SelectorType;
+                    _SelectorType = value;
+                    OnSelectorTypeChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when SelectorType property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnSelectorTypeChanged(eTimeSelectorType oldValue, eTimeSelectorType newValue)
+        {
+            RecreateItems();
+        }
+
+        private string _HourText = "Hour";
+        /// <summary>
+        /// Gets or sets the text displayed on Hour label.
+        /// </summary>
+        [DefaultValue("Hour"), Category("Appearance"), Description("Indicates text displayed on Hour label."), Localizable(true)]
+        public string HourText
+        {
+            get { return _HourText; }
+            set
+            {
+                if (value != _HourText)
+                {
+                    string oldValue = _HourText;
+                    _HourText = value;
+                    OnHourTextChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when HourText property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnHourTextChanged(string oldValue, string newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("HourText"));
+            if (_HourLabel != null) _HourLabel.Text = GetHourText();
+        }
+        private string GetHourText()
+        {
+            using (LocalizationManager lm = new LocalizationManager(this.GetOwner() as IOwnerLocalize))
+            {
+                string s = lm.GetLocalizedString(LocalizationKeys.TimeSelectorHourLabel);
+                if (s != "") return s;
+            }
+            return _HourText;
+        }
+
+        private string _MinuteText = "Minute";
+        /// <summary>
+        /// Gets or sets the text displayed on Minute label.
+        /// </summary>
+        [DefaultValue("Minute"), Category("Appearance"), Description("Indicates text displayed on Minute label."), Localizable(true)]
+        public string MinuteText
+        {
+            get { return _MinuteText; }
+            set
+            {
+                if (value != _MinuteText)
+                {
+                    string oldValue = _MinuteText;
+                    _MinuteText = value;
+                    OnMinuteTextChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when MinuteText property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnMinuteTextChanged(string oldValue, string newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("MinuteText"));
+            if (_MinuteLabel != null) _MinuteLabel.Text = GetMinuteText();
+        }
+        private string GetMinuteText()
+        {
+            using (LocalizationManager lm = new LocalizationManager(this.GetOwner() as IOwnerLocalize))
+            {
+                string s = lm.GetLocalizedString(LocalizationKeys.TimeSelectorMinuteLabel);
+                if (s != "") return s;
+            }
+            return _MinuteText;
+        }
+
+
+        private Size _HourMinuteButtonSize = DefaultHourMinuteButtonSize;
+        internal Size HourMinuteButtonSize
+        {
+            get
+            {
+                return _HourMinuteButtonSize;
+            }
+            set
+            {
+                if (_HourMinuteButtonSize != value)
+                {
+                    _HourMinuteButtonSize = value;
+                    RecreateItems();
+                }
+            }
+        }
+        #endregion
+    }
+
+    /// <summary>
+    /// Defines time selector format.
+    /// </summary>
+    public enum eTimeSelectorFormat
+    {
+        /// <summary>
+        /// Selector uses system format.
+        /// </summary>
+        System,
+        /// <summary>
+        /// Selector uses 24-hour time format.
+        /// </summary>
+        Time24H,
+        /// <summary>
+        /// Selector uses 12-hour time format.
+        /// </summary>
+        Time12H
+    }
+
+    /// <summary>
+    /// Defines the TimeSelector styles.
+    /// </summary>
+    public enum eTimeSelectorType
+    {
+        /// <summary>
+        /// Time selector uses style similar to MonthCalendarStyle.
+        /// </summary>
+        MonthCalendarStyle,
+        /// <summary>
+        /// Time selector uses the touch style.
+        /// </summary>
+        TouchStyle
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Editors/DoubleInput.cs b/PROMS/DotNetBar Source Code/Editors/DoubleInput.cs
new file mode 100644
index 00000000..eba803fb
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Editors/DoubleInput.cs	
@@ -0,0 +1,358 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel;
+using System.Drawing;
+using DevComponents.DotNetBar;
+
+namespace DevComponents.Editors
+{
+    /// <summary>
+    /// Control for input of the integer value.
+    /// </summary>
+    [ToolboxBitmap(typeof(DotNetBarManager), "DoubleInput.ico"), ToolboxItem(true), Designer("DevComponents.DotNetBar.Design.NumericInputBaseDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+    [DefaultBindingProperty("ValueObject"), DefaultProperty("ValueObject")]
+    public class DoubleInput : NumericInputBase
+    {
+        #region Private Variables
+        private VisualDoubleInput _DoubleInput = null;
+        private VisualInputGroup _InputGroup = null;
+        #endregion
+
+        #region Events
+        /// <summary>
+        /// Occurs when ValueObject property is set and it allows you to provide custom parsing for the values.
+        /// </summary>
+        public event ParseDoubleValueEventHandler ParseValue;
+
+        #endregion
+
+        #region Constructor
+        #endregion
+
+        #region Internal Implementation
+        /// <summary>
+        /// Copies the current value in the control to the Clipboard.
+        /// </summary>
+        public virtual void Copy()
+        {
+            if (_DoubleInput != null) _DoubleInput.ProcessClipboardCopy();
+        }
+        /// <summary>
+        /// Pastes the current Clipboard content if possible as the value into the control.
+        /// </summary>
+        public virtual void Paste()
+        {
+            if (_DoubleInput != null) _DoubleInput.ProcessClipboardPaste();
+        }
+        /// <summary>
+        /// Moves the current control value to the Clipboard.
+        /// </summary>
+        public virtual void Cut()
+        {
+            if (_DoubleInput != null) _DoubleInput.ProcessClipboardCut();
+        }
+
+        internal VisualInputGroup InputGroup
+        {
+            get { return (_InputGroup); }
+        }
+
+        protected override VisualItem CreateRootVisual()
+        {
+            VisualInputGroup g = new VisualInputGroup();
+            VisualDoubleInput i = new VisualDoubleInput();
+            i.ValueChanged += new EventHandler(InputItemValueChanged);
+            g.Items.Add(i);
+            _InputGroup = g;
+            _DoubleInput = i;
+            return g;
+        }
+
+        /// <summary>
+        /// Gets or sets whether mouse wheel increases or decreases the input value when used.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether mouse wheel increases or decreases the input value when used.")]
+        public bool MouseWheelValueChangeEnabled
+        {
+            get { return _DoubleInput.MouseWheelValueChangeEnabled; }
+            set
+            {
+                _DoubleInput.MouseWheelValueChangeEnabled = value;
+            }
+        }
+
+        protected override void UpdateInputFieldAlignment()
+        {
+            if (this.InputHorizontalAlignment == eHorizontalAlignment.Right)
+            {
+                if (!ButtonClear.Visible && !ButtonDropDown.Visible && !ButtonFreeText.Visible && !ButtonCustom.Visible && !ButtonCustom2.Visible && !ButtonCalculator.Visible && !ShowUpDown)
+                    _DoubleInput.Alignment = eItemAlignment.Right;
+                else
+                    _DoubleInput.Alignment = eItemAlignment.Left;
+            }
+            else
+            {
+                _DoubleInput.Alignment = eItemAlignment.Left;
+            }
+            base.UpdateInputFieldAlignment();
+        }
+
+        private void InputItemValueChanged(object sender, EventArgs e)
+        {
+            OnValueChanged(e);
+            if (this.FreeTextEntryMode && _FreeTextEntryBox != null && _FreeTextEntryBox.Text != this.Text)
+                _FreeTextEntryBox.Text = this.Text;
+        }
+
+        protected override void OnDisplayFormatChanged()
+        {
+            _DoubleInput.DisplayFormat = this.DisplayFormat;
+        }
+
+        /// <summary>
+        /// Gets or sets the value displayed in the control.
+        /// </summary>
+        [DefaultValue(0d), Description("Indicates value displayed in the control.")]
+        public double Value
+        {
+            get { return _DoubleInput.Value; }
+            set
+            {
+                if (Value != value || _DoubleInput.IsEmpty)
+                {
+                    _DoubleInput.Value = value;
+                    //OnValueChanged(new EventArgs());
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the value of the control as an object. This property allows you to bind to the database fields and supports
+        /// null values. Expected value is int type or null.
+        /// </summary>
+        [Bindable(true), RefreshProperties(RefreshProperties.All), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), System.ComponentModel.TypeConverter(typeof(System.ComponentModel.StringConverter))]
+        public object ValueObject
+        {
+            get
+            {
+                if (this.IsEmpty)
+                    return null;
+                return Value;
+            }
+            set
+            {
+                if (AcceptCustomValueObject(value))
+                    return;
+                else if (IsNull(value) || value is string && string.IsNullOrEmpty((string)value))
+                    this.IsEmpty = true;
+                else if (value is double)
+                {
+                    this.Value = (double)value;
+                }
+                else if (value is int)
+                {
+                    this.Value = (double)(int)value;
+                }
+                else if (value is float)
+                {
+                    this.Value = (double)(float)value;
+                }
+                else if (value is decimal)
+                {
+                    this.Value = decimal.ToDouble((decimal)value);
+                }
+                else if (value is long)
+                {
+                    string t = value.ToString();
+                    this.Value = double.Parse(t);
+                }
+                else if (value is string)
+                {
+                    double i = 0;
+                    if (double.TryParse(value.ToString(), out i))
+                        this.Value = i;
+                    else
+                        throw new ArgumentException("ValueObject property expects either null/nothing value or double type.");
+                }
+                else
+                    throw new ArgumentException("ValueObject property expects either null/nothing value or double type.");
+            }
+        }
+
+        private bool AcceptCustomValueObject(object value)
+        {
+            ParseDoubleValueEventArgs e = new ParseDoubleValueEventArgs(value);
+            OnParseValue(e);
+            if (e.IsParsed)
+            {
+                this.Value = e.ParsedValue;
+            }
+
+            return e.IsParsed;
+        }
+
+        /// <summary>
+        /// Raises the ParseValue event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnParseValue(ParseDoubleValueEventArgs e)
+        {
+            if (ParseValue != null)
+                ParseValue(this, e);
+        }
+
+        /// <summary>
+        /// Gets or sets the maximum value that can be entered.
+        /// </summary>
+        [DefaultValue(double.MaxValue), Description("Indicates maximum value that can be entered.")]
+        public double MaxValue
+        {
+            get { return _DoubleInput.MaxValue; }
+            set
+            {
+                _DoubleInput.MaxValue = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the minimum value that can be entered.
+        /// </summary>
+        [DefaultValue(double.MinValue), Description("Indicates minimum value that can be entered.")]
+        public double MinValue
+        {
+            get { return _DoubleInput.MinValue; }
+            set
+            {
+                _DoubleInput.MinValue = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the value to increment or decrement the value of the control when the up or down buttons are clicked. 
+        /// </summary>
+        [DefaultValue(1), Description("Indicates value to increment or decrement the value of the control when the up or down buttons are clicked. ")]
+        public double Increment
+        {
+            get { return _DoubleInput.Increment; }
+            set { _DoubleInput.Increment = value; }
+        }
+
+        protected override bool IsWatermarkRendered
+        {
+            get
+            {
+                return !(this.Focused || _FreeTextEntryBox != null && _FreeTextEntryBox.Focused) && _DoubleInput.IsEmpty;
+            }
+        }
+
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override string Text
+        {
+            get
+            {
+                return _DoubleInput.Text;
+            }
+            set
+            {
+                ValueObject = value;
+            }
+        }
+
+        /// <summary>
+        /// Decreases value of the control.
+        /// </summary>
+        public override void DecreaseValue()
+        {
+            if (this.FreeTextEntryMode)
+                ApplyFreeTextValue();
+            _DoubleInput.DecreaseValue();
+            if (this.FreeTextEntryMode && _FreeTextEntryBox != null)
+                _FreeTextEntryBox.Text = this.Text;
+        }
+
+        /// <summary>
+        /// Increases the value of the control.
+        /// </summary>
+        public override void IncreaseValue()
+        {
+            if (this.FreeTextEntryMode)
+                ApplyFreeTextValue();
+            _DoubleInput.IncreaseValue();
+            if (this.FreeTextEntryMode && _FreeTextEntryBox != null)
+                _FreeTextEntryBox.Text = this.Text;
+        }
+
+        internal VisualDoubleInput VisualDoubleInput
+        {
+            get { return (_DoubleInput); }
+        }
+
+        protected override void DropDownCalculatorValueChanged(object sender, ValueChangedEventArgs e)
+        {
+            this.Value = e.Value;
+            base.DropDownCalculatorValueChanged(sender, e);
+        }
+
+        protected override void UpdateCalculatorValue(Calculator calculator)
+        {
+            calculator.Value = this.Value;
+        }
+        #endregion
+
+        #region Free Text Entry Support
+        protected override void ApplyFreeTextValue()
+        {
+            if (_FreeTextEntryBox == null) return;
+            if (string.IsNullOrEmpty(_FreeTextEntryBox.Text))
+                this.ValueObject = null;
+            else
+            {
+                double value;
+                if (double.TryParse(_FreeTextEntryBox.Text, out value) && AutoResolveFreeTextEntries)
+                {
+                    this.Value = value;
+                }
+                else
+                {
+                    FreeTextEntryConversionEventArgs eventArgs = new FreeTextEntryConversionEventArgs(_FreeTextEntryBox.Text);
+                    OnConvertFreeTextEntry(eventArgs);
+                    if (eventArgs.IsValueConverted)
+                    {
+                        if (eventArgs.ControlValue is double)
+                            this.Value = (double)eventArgs.ControlValue;
+                        else if (eventArgs.ControlValue == null)
+                            this.ValueObject = null;
+                        else
+                            throw new ArgumentException("ControlValue assigned is not double type.");
+                    }
+                    else
+                    {
+                        //if (_AutoResolveFreeTextEntries)
+                        //{
+                        //    value = DateTime.MinValue;
+                        //    string text = _FreeTextEntryBox.Text.ToLower();
+                        //    if (text == "now")
+                        //        value = DateTime.Now;
+                        //    else if (text == "today")
+                        //        value = DateTime.Today;
+                        //    else if (text == "tomorrow")
+                        //        value = DateTime.Today.AddDays(1);
+                        //    else if (text == "yesterday")
+                        //        value = DateTime.Today.AddDays(-1);
+                        //    if (value == DateTime.MinValue)
+                        //        this.ValueObject = null;
+                        //    else
+                        //        this.Value = value;
+                        //}
+                        this.Value = 0;
+                    }
+                }
+            }
+        }
+        #endregion
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/Editors/Enums.cs b/PROMS/DotNetBar Source Code/Editors/Enums.cs
new file mode 100644
index 00000000..5aa54771
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Editors/Enums.cs	
@@ -0,0 +1,181 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace DevComponents.Editors
+{
+    public enum eCollectionChangeType
+    {
+        Removing,
+        Removed,
+        Clearing,
+        Cleared,
+        Adding,
+        Added
+    }
+
+    /// <summary>
+    /// Indicates the hour format.
+    /// </summary>
+    public enum eHourPeriod
+    {
+        /// <summary>
+        /// Indicates Ante Meridiem period, before the middle day.
+        /// </summary>
+        AM,
+        /// <summary>
+        /// Indicates Post Meridiem after the middle day".
+        /// </summary>
+        PM
+    }
+
+    /// <summary>
+    /// Identifies the date time part.
+    /// </summary>
+    public enum eDateTimePart
+    {
+        Year,
+        Month,
+        Day,
+        DayName,
+        DayOfYear,
+        Hour,
+        Minute,
+        Second
+    }
+
+    /// <summary>
+    /// Specifies the input fields alignment inside of the control.
+    /// </summary>
+    public enum eHorizontalAlignment
+    {
+        Left,
+        Center,
+        Right
+    }
+
+    /// <summary>
+    /// Specifies the text alignment.
+    /// </summary>
+    public enum eTextAlignment
+    {
+        Left,
+        Center,
+        Right
+    }
+
+    /// <summary>
+    /// Specifies the format of the date time picker.
+    /// </summary>
+    public enum eDateTimePickerFormat
+    {
+        /// <summary>
+        /// Indicates that custom format specified by CustomFormat property is used.
+        /// </summary>
+        Custom,
+        /// <summary>
+        /// The DateTimePicker control displays the date/time value in the long date format set by the user's operating system. 
+        /// </summary>
+        Long,
+        /// <summary>
+        /// The DateTimePicker control displays the date/time value in the short date format set by the user's operating system. 
+        /// </summary>
+        Short,
+        /// <summary>
+        /// The DateTimePicker control displays the date/time value in the time format set by the user's operating system. 
+        /// </summary>
+        LongTime,
+        /// <summary>
+        /// The DateTimePicker control displays the date/time value in the short time format set by the user's operating system. 
+        /// </summary>
+        ShortTime
+    }
+
+    /// <summary>
+    /// Specifies the display format of the year in input control.
+    /// </summary>
+    public enum eYearDisplayFormat
+    {
+        FourDigit,
+        TwoDigit,
+        OneDigit
+    }
+
+    /// <summary>
+    /// Specifies the visual item alignment inside the parent group.
+    /// </summary>
+    public enum eItemAlignment
+    {
+        Left,
+        Right
+    }
+
+    /// <summary>
+    /// Specifies the vertical alignment.
+    /// </summary>
+    public enum eVerticalAlignment
+    {
+        Top,
+        Middle,
+        Bottom
+    }
+
+    internal enum eSystemItemType
+    {
+        Default,
+        /// <summary>
+        /// Describes the system button item type. System buttons are buttons created internally by controls.
+        /// </summary>
+        SystemButton
+    }
+
+    /// <summary>
+    /// Specifies the auto-change item when VisualUpDownButton control is clicked.
+    /// </summary>
+    public enum eUpDownButtonAutoChange
+    {
+        /// <summary>
+        /// No item is automatically changed.
+        /// </summary>
+        None,
+        /// <summary>
+        /// Auto-change focused item in parent group
+        /// </summary>
+        FocusedItem,
+        /// <summary>
+        /// Auto change first input item before the Up/Down button in parent group.
+        /// </summary>
+        PreviousInputItem
+    }
+
+    /// <summary>
+    /// Specifies the keys used for navigation between input fields.
+    /// </summary>
+    [Flags()]
+    public enum eInputFieldNavigation
+    {
+        /// <summary>
+        /// No key is used for the navigation.
+        /// </summary>
+        None = 0,
+        /// <summary>
+        /// Tab key is used to advance to the next input field.
+        /// </summary>
+        Tab = 1,
+        /// <summary>
+        /// Arrow keys are used to advance to the next input field.
+        /// </summary>
+        Arrows = 2,
+        /// <summary>
+        /// Enter key is used to advance to the next input field.
+        /// </summary>
+        Enter = 4,
+        /// <summary>
+        /// Tab, Arrows and Enter keys are used to advance to the next input field.
+        /// </summary>
+        All = Tab | Arrows | Enter
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/Editors/IPAddressGroup.cs b/PROMS/DotNetBar Source Code/Editors/IPAddressGroup.cs
new file mode 100644
index 00000000..789fd219
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Editors/IPAddressGroup.cs	
@@ -0,0 +1,250 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace DevComponents.Editors
+{
+    public class IpAddressGroup : VisualInputGroup
+    {
+        #region Events
+        public event EventHandler ValueChanged;
+        #endregion
+
+        #region Constructors
+        /// <summary>
+        /// Initializes a new instance of the IPAddressGroup class.
+        /// </summary>
+        public IpAddressGroup()
+        {
+            // Create IP4 default items
+            for (int i = 0; i < 4; i++)
+            {
+                VisualIntegerInput input = new VisualIntegerInput();
+                input.MaxValue = 255;
+                input.MinValue = 0;
+                this.Items.Add(input);
+                if (i < 3)
+                {
+                    VisualLabel label = new VisualLabel();
+                    label.Text = ".";
+                    this.Items.Add(label);
+                }
+            }
+        }
+        #endregion
+
+        #region Internal Implementation
+        private string _Value;
+        public string Value
+        {
+            get 
+            {
+                if (this.IsFocused)
+                {
+                    if (IsInputValid())
+                        return GetCurrentInputValue();
+                }
+                return _Value; 
+            }
+            set
+            {
+                bool valueChanged = _Value != value;
+                if (!string.IsNullOrEmpty(value))
+                {
+                    if (!IsValueValid(value))
+                        throw new ArgumentException("Value is not valid IP value");
+                }
+                _Value = value;
+                UpdateInputItems();
+                if(valueChanged)
+                    OnValueChanged(EventArgs.Empty);
+            }
+        }
+
+        bool _UpdatingInputItems = false;
+        private void UpdateInputItems()
+        {
+            if (_UpdatingInputItems) return;
+
+            _UpdatingInputItems = true;
+            try
+            {
+                if (string.IsNullOrEmpty(_Value))
+                {
+                    // Clear all input
+                    for (int i = 0; i < this.Items.Count; i++)
+                    {
+                        if (this.Items[i] is VisualIntegerInput)
+                        {
+                            VisualIntegerInput input = this.Items[i] as VisualIntegerInput;
+                            input.IsEmpty = true;
+                        }
+                    }
+                }
+                else
+                {
+                    int[] value = ParseIPv4Value(_Value);
+                    int index = 0;
+                    for (int i = 0; i < this.Items.Count; i++)
+                    {
+                        if (this.Items[i] is VisualIntegerInput)
+                        {
+                            VisualIntegerInput input = this.Items[i] as VisualIntegerInput;
+                            input.Value = value[index];
+                            index++;
+                        }
+                    }
+                }
+            }
+            finally
+            {
+                _UpdatingInputItems = false;
+            }
+        }
+
+        private void OnValueChanged(EventArgs e)
+        {
+            EventHandler handler = ValueChanged;
+            if (handler != null) ValueChanged(this, e);
+        }
+
+        internal bool IsValueValid(string ipValue)
+        {
+            int[] value = ParseIPv4Value(ipValue);
+            return value != null;
+        }
+
+        private int[] ParseIPv4Value(string ipValue)
+        {
+            if (string.IsNullOrEmpty(ipValue)) return null;
+            string[] parts = ipValue.Split('.');
+            if (parts.Length != 4) return null;
+
+            int[] value = new int[4];
+
+            for (int i = 0; i < parts.Length; i++)
+            {
+                int partValue = 0;
+                if (int.TryParse(parts[i], out partValue))
+                {
+                    if (partValue < 0 || partValue > 255) return null;
+                    value[i] = partValue;
+                }
+                else return null;
+            }
+
+            return value;
+        }
+
+        private bool IsInputValid()
+        {
+            bool allEmpty = true;
+            for (int i = 0; i < this.Items.Count; i++)
+            {
+                VisualIntegerInput input = this.Items[i] as VisualIntegerInput;
+                if (input != null)
+                {
+                    if (input.IsEmpty)
+                    {
+                        if (!allEmpty && AllowEmptyState) return false;
+                    }
+                    else
+                    {
+                        if (allEmpty && i > 0) return false;
+                        allEmpty = false;
+                    }
+                }
+            }
+
+            return true;
+        }
+
+        protected override void OnLostFocus()
+        {
+            UpdateValue();
+            base.OnLostFocus();
+        }
+
+        protected override void OnInputChanged(VisualInputBase input)
+        {
+            if (!_UpdatingInputItems && GetCurrentInputValue() != null)
+            {
+                _UpdatingInputItems = true; // Stop update of UI items
+                try
+                {
+                    UpdateValue();
+                }
+                finally
+                {
+                    _UpdatingInputItems = false;
+                }
+            }
+            base.OnInputChanged(input);
+        }
+
+        private string GetCurrentInputValue()
+        {
+            int[] value = new int[4];
+            int index = 0;
+            bool isInvalid = false;
+            for (int i = 0; i < this.Items.Count; i++)
+            {
+                VisualIntegerInput input = this.Items[i] as VisualIntegerInput;
+                if (input != null)
+                {
+                    if (input.IsEmpty)
+                    {
+                        if (!this.AllowEmptyState)
+                            value[index] = 0;
+                        else
+                        {
+                            isInvalid = true;
+                            break;
+                        }
+                    }
+                    value[index] = input.Value;
+                    index++;
+                }
+            }
+
+            if (isInvalid)
+                return null;
+            else
+            {
+                string s = "";
+                for (int i = 0; i < value.Length; i++)
+                {
+                    s += value[i].ToString();
+                    if (i < value.Length - 1)
+                        s += ".";
+
+                }
+                return s;
+            }
+        }
+
+        private void UpdateValue()
+        {
+            Value = GetCurrentInputValue();
+        }
+
+        private bool _ResettingValue = false;
+        protected override void ResetValue()
+        {
+            _ResettingValue = true;
+            try
+            {
+                this.Value = null;
+            }
+            finally
+            {
+                _ResettingValue = false;
+            }
+        }
+        #endregion
+
+
+    }
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/Editors/InputButtonSettings.cs b/PROMS/DotNetBar Source Code/Editors/InputButtonSettings.cs
new file mode 100644
index 00000000..c25400ae
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Editors/InputButtonSettings.cs	
@@ -0,0 +1,347 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel;
+using System.Drawing;
+using DevComponents.DotNetBar;
+
+namespace DevComponents.Editors
+{
+    /// <summary>
+    /// Describes input button settings.
+    /// </summary>
+    [System.ComponentModel.ToolboxItem(false), System.ComponentModel.DesignTimeVisible(false), TypeConverter(typeof(System.ComponentModel.ExpandableObjectConverter))]
+    public class InputButtonSettings : IComparable
+    {
+        #region Private Variables
+        private IInputButtonControl _Parent = null;
+        #endregion
+
+        #region Constructor
+        /// <summary>
+        /// Initializes a new instance of the InputButtonSettings class.
+        /// </summary>
+        public InputButtonSettings()
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the InputButtonSettings class.
+        /// </summary>
+        /// <param name="parent"></param>
+        public InputButtonSettings(IInputButtonControl parent)
+        {
+            _Parent = parent;
+        }
+        #endregion
+
+        #region Internal Implementation
+        private bool _Visible = false;
+        /// <summary>
+        /// Gets or sets whether button is visible.
+        /// </summary>
+        [DefaultValue(false), Description("Indicates whether button is visible.")]
+        public bool Visible
+        {
+            get { return _Visible; }
+            set
+            {
+                if (_Visible != value)
+                {
+                    _Visible = value;
+                    OnVisibleChanged();
+                }
+            }
+        }
+
+        private void OnVisibleChanged()
+        {
+            NotifyParent();
+        }
+
+        private bool _Enabled = true;
+        /// <summary>
+        /// Gets or sets whether button is enabled.
+        /// </summary>
+        [DefaultValue(true), Description("Indicates whether button is enabled.")]
+        public bool Enabled
+        {
+            get { return _Enabled; }
+            set
+            {
+                if (_Enabled != value)
+                {
+                    _Enabled = value;
+                    NotifyParent();
+                }
+            }
+        }
+
+        private int _DisplayPosition = 0;
+        /// <summary>
+        /// Gets or sets the display position index of the button. Buttons are ordered from left to right with button with lowest index appearing as left-most button.
+        /// </summary>
+        [DefaultValue(0), Description("Indicates display position index of the button."), Localizable(true)]
+        public int DisplayPosition
+        {
+            get { return _DisplayPosition; }
+            set
+            {
+                if (_DisplayPosition != value)
+                {
+                    _DisplayPosition = value;
+                    OnDisplayPositionChanged();
+                }
+            }
+        }
+
+        private void OnDisplayPositionChanged()
+        {
+            NotifyParent();
+        }
+
+        private Image _Image = null;
+        /// <summary>
+        /// Gets or sets the image displayed on the face of the button.
+        /// </summary>
+        [DefaultValue(null), Description("Indicates image displayed on the face of the button."), Localizable(true)]
+        public Image Image
+        {
+            get { return _Image; }
+            set
+            {
+                if (_Image != value)
+                {
+                    _Image = value;
+                    OnImageChanged();
+                }
+            }
+        }
+
+        private void OnImageChanged()
+        {
+            NotifyParent();
+        }
+
+        private string _Text = "";
+        /// <summary>
+        /// Gets or sets the text displayed on the input button face.
+        /// </summary>
+        [DefaultValue(""), Description("Input text displayed on the input button face."), Localizable(true)]
+        public string Text
+        {
+            get { return _Text; }
+            set
+            {
+                if (value == null) value = "";
+                if (_Text != value)
+                {
+                    _Text = value;
+                    OnTextChanged();
+                }
+            }
+        }
+
+        private void OnTextChanged()
+        {
+            NotifyParent();
+        }
+
+        private bool _Checked = false;
+        [DefaultValue(false), Description("Gets or sets whether button is checked.")]
+        public bool Checked
+        {
+            get { return _Checked; }
+            set
+            {
+                if (_Checked!=value)
+                {
+                    _Checked = value;
+                    OnCheckedChanged();
+                }
+                
+            }
+        }
+
+        private void OnCheckedChanged()
+        {
+            NotifyParent();
+        }
+        
+
+        private void NotifyParent()
+        {
+            if (_Parent != null)
+                _Parent.InputButtonSettingsChanged(this);
+        }
+
+        private VisualItem _ItemReference = null;
+        /// <summary>
+        /// Gets or sets the visual item button references for its action.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public VisualItem ItemReference
+        {
+            get { return _ItemReference; }
+            set { _ItemReference = value; }
+        }
+
+        private eShortcut _Shortcut = eShortcut.None;
+        /// <summary>
+        /// Gets or sets the shortcut key which when pressed triggers button click event or its default function.
+        /// </summary>
+        [DefaultValue(eShortcut.None), Description("Indicates shortcut key which when pressed triggers button click event or its default function.")]
+        public eShortcut Shortcut
+        {
+            get { return _Shortcut; }
+            set 
+            {
+                if (_Shortcut != value)
+                {
+                    _Shortcut = value;
+                    NotifyParent();
+                }
+            }
+        }
+
+        private string _Tooltip = "";
+        /// <summary>
+        /// Gets or sets tooltip displayed for the button when mouse hovers over it.
+        /// </summary>
+        [DefaultValue(""), Category("Appearance"), Description("Indicates tooltip displayed for the button when mouse hovers over it."), Localizable(true)]
+        public string Tooltip
+        {
+            get { return _Tooltip; }
+            set
+            {
+                if (value == null) value = "";
+                _Tooltip = value;
+            }
+        }
+
+        private string _Symbol = "";
+        /// <summary>
+        /// Indicates the symbol displayed on face of the button instead of the image. Setting the symbol overrides the image setting.
+        /// </summary>
+        [DefaultValue(""), Category("Appearance"), Description("Indicates the symbol displayed on face of the button instead of the image. Setting the symbol overrides the image setting.")]
+        [Editor("DevComponents.DotNetBar.Design.SymbolTypeEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor))]
+        public string Symbol
+        {
+            get { return _Symbol; }
+            set
+            {
+                if (value != _Symbol)
+                {
+                    string oldValue = _Symbol;
+                    _Symbol = value;
+                    OnSymbolChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when Symbol property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnSymbolChanged(string oldValue, string newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("Symbol"));
+            NotifyParent();
+        }
+        private eSymbolSet _SymbolSet = eSymbolSet.Awesome;
+        /// <summary>
+        /// Gets or sets the symbol set used to represent the Symbol.
+        /// </summary>
+        [Browsable(false), DefaultValue(eSymbolSet.Awesome)]
+        public eSymbolSet SymbolSet
+        {
+            get { return _SymbolSet; }
+            set
+            {
+                if (_SymbolSet != value)
+                {
+                    eSymbolSet oldValue = _SymbolSet;
+                    _SymbolSet = value;
+                    OnSymbolSetChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when SymbolSet property value changes.
+        /// </summary>
+        /// <param name="oldValue">Indciates old value</param>
+        /// <param name="newValue">Indicates new value</param>
+        protected virtual void OnSymbolSetChanged(eSymbolSet oldValue, eSymbolSet newValue)
+        {
+            NotifyParent();
+        }
+
+        private Color _SymbolColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets the color of the Symbol.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates color of the Symbol.")]
+        public Color SymbolColor
+        {
+            get { return _SymbolColor; }
+            set { _SymbolColor = value; NotifyParent(); }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeSymbolColor()
+        {
+            return !_SymbolColor.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetSymbolColor()
+        {
+            this.SymbolColor = Color.Empty;
+        }
+        #endregion
+
+        /// <summary>
+        /// Copies properties to new instance of the item.
+        /// </summary>
+        /// <param name="copy">New InputButtonSettings instance</param>
+        internal void CopyToItem(InputButtonSettings copy)
+        {
+            copy.Visible = Visible;
+            copy.Enabled = Enabled;
+            copy.DisplayPosition = DisplayPosition;
+            copy.Image = Image;
+            copy.Text = Text;
+            copy.Checked = Checked;
+            copy.Shortcut = Shortcut;
+        }
+
+        #region IComparable Members
+
+        int IComparable.CompareTo(object obj)
+        {
+            if (obj is InputButtonSettings)
+            {
+                int pos = ((InputButtonSettings)obj).DisplayPosition - this.DisplayPosition;
+                if (pos == 0)
+                {
+                    if (obj != this) pos = -1;
+                }
+                return pos;
+            }
+            return 0;
+        }
+        #endregion
+    }
+
+    public interface IInputButtonControl
+    {
+        void InputButtonSettingsChanged(InputButtonSettings button);
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/Editors/InputControlColors.cs b/PROMS/DotNetBar Source Code/Editors/InputControlColors.cs
new file mode 100644
index 00000000..e9536e5c
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Editors/InputControlColors.cs	
@@ -0,0 +1,95 @@
+#if FRAMEWORK20
+using System;
+using System.Text;
+using System.Drawing;
+using System.ComponentModel;
+
+namespace DevComponents.Editors
+{
+    /// <summary>
+    /// Defines the system colors used by the input controls.
+    /// </summary>
+   [System.ComponentModel.ToolboxItem(false), System.ComponentModel.DesignTimeVisible(false), TypeConverter(typeof(System.ComponentModel.ExpandableObjectConverter))]
+    public class InputControlColors
+    {
+        /// <summary>
+        /// Occurs when color has changed.
+        /// </summary>
+        public event EventHandler ColorChanged;
+
+        private Color _Highlight = Color.Empty;
+        /// <summary>
+        /// Gets or sets the background color of input item part when part has input focus. Default value is Color.Empty which indicates that system Highlight color is used.
+        /// </summary>
+        public Color Highlight
+        {
+            get { return _Highlight; }
+            set
+            {
+                if (_Highlight != value)
+                {
+                    _Highlight = value;
+                    OnColorChanged();
+                }
+            }
+        }
+        /// <summary>
+        /// Resets property to its default value. Provided for design-time support.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetHighlight()
+        {
+            Highlight = Color.Empty;
+        }
+        /// <summary>
+        /// Returns whether property should be serialized. Provided for design-time support.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeHighlight()
+        {
+            return !Highlight.IsEmpty;
+        }
+
+
+
+        private Color _HighlightText = Color.Empty;
+        /// <summary>
+        /// Gets or sets the text color of input item part when part has input focus. Default value is Color.Empty which indicates that system HighlightText color is used.
+        /// </summary>
+        public Color HighlightText
+        {
+            get { return _HighlightText; }
+            set
+            {
+                if (_HighlightText != value)
+                {
+                    _HighlightText = value;
+                    OnColorChanged();
+                }
+            }
+        }
+        /// <summary>
+        /// Resets property to its default value. Provided for design-time support.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetHighlightText()
+        {
+            HighlightText = Color.Empty;
+        }
+        /// <summary>
+        /// Returns whether property should be serialized. Provided for design-time support.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeHighlightText()
+        {
+            return !HighlightText.IsEmpty;
+        }
+
+        private void OnColorChanged()
+        {
+            if (ColorChanged != null)
+                ColorChanged(this, new EventArgs());
+        }
+    }
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/Editors/InputValidationEventArgs.cs b/PROMS/DotNetBar Source Code/Editors/InputValidationEventArgs.cs
new file mode 100644
index 00000000..0f2d70a3
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Editors/InputValidationEventArgs.cs	
@@ -0,0 +1,31 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace DevComponents.Editors
+{
+    public class InputValidationEventArgs : EventArgs
+    {
+        public readonly string Input = "";
+        public bool AcceptInput = true;
+
+        /// <summary>
+        /// Initializes a new instance of the InputValidationEventArgs class.
+        /// </summary>
+        /// <param name="input">Indicates current input.</param>
+        public InputValidationEventArgs(string input)
+        {
+            Input = input;
+        }
+    }
+
+    /// <summary>
+    /// Defines delegate for input validation event.
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    public delegate void InputValidationEventHandler(object sender, InputValidationEventArgs e);
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/Editors/IntegerInput.cs b/PROMS/DotNetBar Source Code/Editors/IntegerInput.cs
new file mode 100644
index 00000000..89741104
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Editors/IntegerInput.cs	
@@ -0,0 +1,342 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel;
+using System.Drawing;
+using DevComponents.DotNetBar;
+
+namespace DevComponents.Editors
+{
+    /// <summary>
+    /// Control for input of the integer value.
+    /// </summary>
+    [ToolboxBitmap(typeof(DotNetBarManager), "IntegerInput.ico"), ToolboxItem(true), Designer("DevComponents.DotNetBar.Design.NumericInputBaseDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+    [DefaultBindingProperty("ValueObject"), DefaultProperty("ValueObject")]
+    public class IntegerInput : NumericInputBase
+    {
+        #region Private Variables
+        private VisualIntegerInput _IntegerInput = null;
+        private VisualInputGroup _InputGroup = null;
+        #endregion
+
+        #region Events
+        /// <summary>
+        /// Occurs when ValueObject property is set and it allows you to provide custom parsing for the values.
+        /// </summary>
+        public event ParseIntegerValueEventHandler ParseValue;
+
+        #endregion
+
+        #region Constructor
+        #endregion
+
+        #region Internal Implementation
+        /// <summary>
+        /// Decreases value of the control.
+        /// </summary>
+        public override void DecreaseValue()
+        {
+            if (this.FreeTextEntryMode)
+                ApplyFreeTextValue();
+            _IntegerInput.DecreaseValue();
+            if (this.FreeTextEntryMode && _FreeTextEntryBox != null)
+                _FreeTextEntryBox.Text = this.Text;
+        }
+
+        /// <summary>
+        /// Increases the value of the control.
+        /// </summary>
+        public override void IncreaseValue()
+        {
+            if (this.FreeTextEntryMode)
+                ApplyFreeTextValue();
+            _IntegerInput.IncreaseValue();
+            if (this.FreeTextEntryMode && _FreeTextEntryBox != null)
+                _FreeTextEntryBox.Text = this.Text;
+        }
+
+        /// <summary>
+        /// Copies the current value in the control to the Clipboard.
+        /// </summary>
+        public virtual void Copy()
+        {
+            if (_IntegerInput != null) _IntegerInput.ProcessClipboardCopy();
+        }
+        /// <summary>
+        /// Pastes the current Clipboard content if possible as the value into the control.
+        /// </summary>
+        public virtual void Paste()
+        {
+            if (_IntegerInput != null) _IntegerInput.ProcessClipboardPaste();
+        }
+        /// <summary>
+        /// Moves the current control value to the Clipboard.
+        /// </summary>
+        public virtual void Cut()
+        {
+            if (_IntegerInput != null) _IntegerInput.ProcessClipboardCut();
+        }
+
+        protected override VisualItem CreateRootVisual()
+        {
+            VisualInputGroup g = new VisualInputGroup();
+            VisualIntegerInput i = new VisualIntegerInput();
+            i.ValueChanged += new EventHandler(InputItemValueChanged);
+            g.Items.Add(i);
+            _InputGroup = g;
+            _IntegerInput = i;
+            return g;
+        }
+
+        /// <summary>
+        /// Gets or sets whether mouse wheel increases or decreases the input value when used.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether mouse wheel increases or decreases the input value when used.")]
+        public bool MouseWheelValueChangeEnabled
+        {
+            get { return _IntegerInput.MouseWheelValueChangeEnabled; }
+            set
+            {
+                _IntegerInput.MouseWheelValueChangeEnabled = value;
+            }
+        }
+
+        protected override void UpdateInputFieldAlignment()
+        {
+            if (this.InputHorizontalAlignment == eHorizontalAlignment.Right)
+            {
+                if (!ButtonClear.Visible && !ButtonDropDown.Visible && !ButtonFreeText.Visible && !ButtonCustom.Visible && !ButtonCustom2.Visible && !ButtonCalculator.Visible && !ShowUpDown)
+                    _IntegerInput.Alignment = eItemAlignment.Right;
+                else
+                    _IntegerInput.Alignment = eItemAlignment.Left;
+            }
+            else
+            {
+                _IntegerInput.Alignment = eItemAlignment.Left;
+            }
+            base.UpdateInputFieldAlignment();
+        }
+
+        private void InputItemValueChanged(object sender, EventArgs e)
+        {
+            OnValueChanged(e);
+            if (this.FreeTextEntryMode && _FreeTextEntryBox != null && _FreeTextEntryBox.Text != this.Text)
+                _FreeTextEntryBox.Text = this.Text;
+        }
+
+        protected override void OnDisplayFormatChanged()
+        {
+            _IntegerInput.DisplayFormat = this.DisplayFormat;
+        }
+
+        /// <summary>
+        /// Gets or sets the value displayed in the control.
+        /// </summary>
+        [DefaultValue(0), Description("Indicates value displayed in the control.")]
+        public int Value
+        {
+            get { return _IntegerInput.Value; }
+            set
+            {
+                if (Value != value || _IntegerInput.IsEmpty)
+                {
+                    _IntegerInput.Value = value;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the value of the control as an object. This property allows you to bind to the database fields and supports
+        /// null values. Expected value is int type or null.
+        /// </summary>
+        [Bindable(true), RefreshProperties(RefreshProperties.All), DefaultValue(null), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), System.ComponentModel.TypeConverter(typeof(System.ComponentModel.StringConverter))]
+        public object ValueObject
+        {
+            get
+            {
+                if (this.IsEmpty)
+                    return null;
+                return Value;
+            }
+            set
+            {
+                if (AcceptCustomValueObject(value))
+                    return;
+                else if (IsNull(value) || value is string && string.IsNullOrEmpty((string)value))
+                    this.IsEmpty = true;
+                else if (value is int)
+                {
+                    this.Value = (int)value;
+                }
+                else if (value is byte || value is Int16)
+                {
+                    this.Value = (int)value;
+                }
+                else if (value is string)
+                {
+                    int i = 0;
+                    if (int.TryParse(value.ToString(), out i))
+                        this.Value = i;
+                    else
+                        throw new ArgumentException("ValueObject property expects either null/nothing value or int type.");
+                }
+                else
+                    throw new ArgumentException("ValueObject property expects either null/nothing value or int type.");
+            }
+        }
+
+        private bool AcceptCustomValueObject(object value)
+        {
+            ParseIntegerValueEventArgs e = new ParseIntegerValueEventArgs(value);
+            OnParseValue(e);
+            if (e.IsParsed)
+            {
+                this.Value = e.ParsedValue;
+            }
+
+            return e.IsParsed;
+        }
+
+        /// <summary>
+        /// Raises the ParseValue event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnParseValue(ParseIntegerValueEventArgs e)
+        {
+            if (ParseValue != null)
+                ParseValue(this, e);
+        }
+
+        /// <summary>
+        /// Gets or sets the maximum value that can be entered.
+        /// </summary>
+        [DefaultValue(int.MaxValue), Description("Indicates maximum value that can be entered.")]
+        public int MaxValue
+        {
+            get { return _IntegerInput.MaxValue; }
+            set
+            {
+                _IntegerInput.MaxValue = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the minimum value that can be entered.
+        /// </summary>
+        [DefaultValue(int.MinValue), Description("Indicates minimum value that can be entered.")]
+        public int MinValue
+        {
+            get { return _IntegerInput.MinValue; }
+            set
+            {
+                _IntegerInput.MinValue = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the value to increment or decrement the value of the control when the up or down buttons are clicked. 
+        /// </summary>
+        [DefaultValue(1), Description("Indicates value to increment or decrement the value of the control when the up or down buttons are clicked. ")]
+        public int Increment
+        {
+            get { return _IntegerInput.Increment; }
+            set { _IntegerInput.Increment = value; }
+        }
+
+        protected override bool IsWatermarkRendered
+        {
+            get
+            {
+                return !(this.Focused || _FreeTextEntryBox != null && _FreeTextEntryBox.Focused) && _IntegerInput.IsEmpty;
+            }
+        }
+
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override string Text
+        {
+            get
+            {
+                return _IntegerInput.Text;
+            }
+            set
+            {
+                ValueObject = value;
+            }
+        }
+
+        protected override void OnDropDownCalculatorCreated(Calculator calculator)
+        {
+            base.OnDropDownCalculatorCreated(calculator);
+            calculator.IsIntValue = true;
+        }
+
+        protected override void DropDownCalculatorValueChanged(object sender, ValueChangedEventArgs e) 
+        {
+            this.Value = (int)e.Value;
+            base.DropDownCalculatorValueChanged(sender, e);
+        }
+
+        protected override void UpdateCalculatorValue(Calculator calculator) 
+        {
+            calculator.Value = this.Value;
+        }
+        #endregion
+
+        #region Free Text Entry Support
+
+        protected override void ApplyFreeTextValue()
+        {
+            if (_FreeTextEntryBox == null) return;
+            if (string.IsNullOrEmpty(_FreeTextEntryBox.Text))
+                this.ValueObject = null;
+            else
+            {
+                int value;
+                if (int.TryParse(_FreeTextEntryBox.Text, out value) && AutoResolveFreeTextEntries)
+                {
+                    this.Value = value;
+                }
+                else
+                {
+                    FreeTextEntryConversionEventArgs eventArgs = new FreeTextEntryConversionEventArgs(_FreeTextEntryBox.Text);
+                    OnConvertFreeTextEntry(eventArgs);
+                    if (eventArgs.IsValueConverted)
+                    {
+                        if (eventArgs.ControlValue is int)
+                            this.Value = (int)eventArgs.ControlValue;
+                        else if (eventArgs.ControlValue == null)
+                            this.ValueObject = null;
+                        else
+                            throw new ArgumentException("ControlValue assigned is not int type.");
+                    }
+                    else
+                    {
+                        //if (_AutoResolveFreeTextEntries)
+                        //{
+                        //    value = DateTime.MinValue;
+                        //    string text = _FreeTextEntryBox.Text.ToLower();
+                        //    if (text == "now")
+                        //        value = DateTime.Now;
+                        //    else if (text == "today")
+                        //        value = DateTime.Today;
+                        //    else if (text == "tomorrow")
+                        //        value = DateTime.Today.AddDays(1);
+                        //    else if (text == "yesterday")
+                        //        value = DateTime.Today.AddDays(-1);
+                        //    if (value == DateTime.MinValue)
+                        //        this.ValueObject = null;
+                        //    else
+                        //        this.Value = value;
+                        //}
+                        this.Value = 0;
+                    }
+                }
+            }
+        }
+        #endregion
+
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/Editors/IpAddressInput.cs b/PROMS/DotNetBar Source Code/Editors/IpAddressInput.cs
new file mode 100644
index 00000000..599a8277
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Editors/IpAddressInput.cs	
@@ -0,0 +1,873 @@
+#if FRAMEWORK20
+using System;
+using System.Text;
+using System.ComponentModel;
+using DevComponents.DotNetBar;
+using System.Windows.Forms;
+using System.Drawing;
+using System.Collections;
+
+namespace DevComponents.Editors
+{
+    /// <summary>
+    /// Control for input of the integer value.
+    /// </summary>
+    [ToolboxBitmap(typeof(DotNetBarManager), "IpAddressInput.ico"), ToolboxItem(true), Designer("DevComponents.DotNetBar.Design.IpAddressInputDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+    public class IpAddressInput : VisualControlBase, ICommandSource
+    {
+        #region Events
+        /// <summary>
+        /// Occurs when Clear button is clicked and allows you to cancel the default action performed by the button.
+        /// </summary>
+        public event CancelEventHandler ButtonClearClick;
+        /// <summary>
+        /// Occurs when Drop-Down button that shows calendar is clicked and allows you to cancel showing of the popup.
+        /// </summary>
+        public event CancelEventHandler ButtonDropDownClick;
+
+        /// <summary>
+        /// Occurs when ShowCheckBox property is set to true and user changes the lock status of the control by clicking the check-box.
+        /// </summary>
+        public event EventHandler LockUpdateChanged;
+
+        /// <summary>
+        /// Occurs when Value property has changed.
+        /// </summary>
+        public event EventHandler ValueChanged;
+        #endregion
+
+        #region Constructors
+        /// <summary>
+        /// Initializes a new instance of the IpAddressInput class.
+        /// </summary>
+        public IpAddressInput():base()
+        {
+            _ButtonClear = new InputButtonSettings(this);
+            _ButtonDropDown = new InputButtonSettings(this);
+            _ButtonFreeText = new InputButtonSettings(this);
+            _IpGroup = this.RootVisualItem as IpAddressGroup;
+        }
+        #endregion
+
+        #region Internal Implementation
+        private IpAddressGroup _IpGroup = null;
+
+        protected override VisualItem CreateRootVisual()
+        {
+            IpAddressGroup group = new IpAddressGroup();
+            group.SelectNextInputCharacters = ".";
+            group.ValueChanged += new EventHandler(InputItemValueChanged);
+            return group;
+        }
+
+        private void InputItemValueChanged(object sender, EventArgs e)
+        {
+            if (_Value != _IpGroup.Value)
+                this.Value = _IpGroup.Value;
+        }
+
+        /// <summary>
+        /// Copies the current value in the control to the Clipboard.
+        /// </summary>
+        public virtual void Copy()
+        {
+            if (_IpGroup != null) Clipboard.SetText(this.Text);
+        }
+        /// <summary>
+        /// Pastes the current Clipboard content if possible as the value into the control.
+        /// </summary>
+        public virtual void Paste()
+        {
+            if (_IpGroup != null) Text = Clipboard.GetText();
+        }
+        /// <summary>
+        /// Moves the current control value to the Clipboard.
+        /// </summary>
+        public virtual void Cut()
+        {
+            if (_IpGroup != null)
+            {
+                Copy();
+                if (this.AllowEmptyState)
+                    Text = null;
+            }
+        }
+
+        private InputButtonSettings _ButtonDropDown = null;
+        /// <summary>
+        /// Gets the object that describes the settings for the button that shows drop-down when clicked.
+        /// </summary>
+        [Category("Buttons"), Description("Describes the settings for the button that shows drop-down when clicked."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public InputButtonSettings ButtonDropDown
+        {
+            get
+            {
+                return _ButtonDropDown;
+            }
+        }
+
+        private InputButtonSettings _ButtonClear = null;
+        /// <summary>
+        /// Gets the object that describes the settings for the button that clears the content of the control when clicked.
+        /// </summary>
+        [Category("Buttons"), Description("Describes the settings for the button that clears the content of the control when clicked."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public InputButtonSettings ButtonClear
+        {
+            get
+            {
+                return _ButtonClear;
+            }
+        }
+
+        private InputButtonSettings _ButtonFreeText = null;
+        /// <summary>
+        /// Gets the object that describes the settings for the button that switches the control into the free-text entry mode when clicked.
+        /// </summary>
+        [Category("Buttons"), Description("Describes the settings for the button that switches the control into the free-text entry mode when clicked."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public InputButtonSettings ButtonFreeText
+        {
+            get
+            {
+                return _ButtonFreeText;
+            }
+        }
+
+
+        protected override VisualItem CreateButton(InputButtonSettings buttonSettings)
+        {
+            VisualItem item = null;
+            if (buttonSettings == _ButtonDropDown)
+            {
+                item = new VisualDropDownButton();
+                ApplyButtonSettings(buttonSettings, item as VisualButton);
+            }
+            else
+                item = base.CreateButton(buttonSettings);
+
+            VisualButton button = item as VisualButton;
+            button.ClickAutoRepeat = false;
+
+            if (buttonSettings == _ButtonClear)
+            {
+                if (buttonSettings.Image == null && string.IsNullOrEmpty(buttonSettings.Text))
+                {
+                    //if (Dpi.Factor.Width > 1)
+                        button.Symbol = "\uf00d";
+                    //else
+                    //    button.Image = DevComponents.DotNetBar.BarFunctions.LoadBitmap("SystemImages.DateReset.png");
+                }
+            }
+            else if (buttonSettings == _ButtonFreeText)
+            {
+                if (buttonSettings.Image == null && string.IsNullOrEmpty(buttonSettings.Text))
+                {
+                    //if (Dpi.Factor.Width > 1)
+                        button.Symbol = "\uf040";
+                    //else
+                    //    button.Image = DevComponents.DotNetBar.BarFunctions.LoadBitmap("SystemImages.FreeText.png");
+                }
+                button.Checked = buttonSettings.Checked;
+            }
+
+            return item;
+        }
+
+        /// <summary>
+        /// Gets or sets whether auto-overwrite functionality for input is enabled. When in auto-overwrite mode input field will erase existing entry
+        /// and start new one if typing is continued after InputComplete method is called.
+        /// </summary>
+        [DefaultValue(false), Description("Indicates whether auto-overwrite functionality for input is enabled.")]
+        public bool AutoOverwrite
+        {
+            get { return _IpGroup.AutoOverwrite; }
+            set { _IpGroup.AutoOverwrite = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether empty null/nothing state of the control is allowed. Default value is true which means that Text property
+        /// may return null if there is no input value.
+        /// </summary>
+        [DefaultValue(true), Description("Indicates whether empty null/nothing state of the control is allowed.")]
+        public bool AllowEmptyState
+        {
+            get { return _IpGroup.AllowEmptyState; }
+            set { _IpGroup.AllowEmptyState = value; this.Invalidate(); }
+        }
+
+        private Control _DropDownControl = null;
+        /// <summary>
+        /// Gets or sets the reference of the control that will be displayed on popup that is shown when drop-down button is clicked.
+        /// </summary>
+        [DefaultValue(null), Description("Indicates reference of the control that will be displayed on popup that is shown when drop-down button is clicked.")]
+        public Control DropDownControl
+        {
+            get { return _DropDownControl; }
+            set
+            {
+                _DropDownControl = value;
+            }
+        }
+
+        private ButtonItem _PopupItem = null;
+        protected override PopupItem CreatePopupItem()
+        {
+            ButtonItem button = new ButtonItem("sysPopupProvider");
+            button.PopupFinalized += new EventHandler(DropDownPopupClose);
+            _PopupItem = button;
+            return button;
+        }
+
+        /// <summary>
+        /// Gets the collection of BaseItem derived items displayed on popup menu.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public SubItemsCollection DropDownItems
+        {
+            get { return _PopupItem.SubItems; }
+        }
+
+        protected override System.Collections.SortedList CreateSortedButtonList()
+        {
+            SortedList list = base.CreateSortedButtonList();
+            if (_ButtonClear.Visible)
+            {
+                VisualItem button = CreateButton(_ButtonClear);
+                if (_ButtonClear.ItemReference != null)
+                    _ButtonClear.ItemReference.Click -= new EventHandler(ClearButtonClick);
+                _ButtonClear.ItemReference = button;
+                button.Click += new EventHandler(ClearButtonClick);
+                list.Add(_ButtonClear, button);
+            }
+            if (_ButtonDropDown.Visible)
+            {
+                VisualItem button = CreateButton(_ButtonDropDown);
+                if (_ButtonDropDown.ItemReference != null)
+                {
+                    _ButtonDropDown.ItemReference.MouseDown -= new MouseEventHandler(DropDownButtonMouseDown);
+                }
+                _ButtonDropDown.ItemReference = button;
+                button.MouseDown += new MouseEventHandler(DropDownButtonMouseDown);
+                list.Add(_ButtonDropDown, button);
+            }
+            if (_ButtonFreeText.Visible)
+            {
+                VisualItem button = CreateButton(_ButtonFreeText);
+                if (_ButtonFreeText.ItemReference != null)
+                    _ButtonFreeText.ItemReference.Click -= new EventHandler(FreeTextButtonClick);
+                _ButtonFreeText.ItemReference = button;
+                button.Click += FreeTextButtonClick;
+                list.Add(_ButtonFreeText, button);
+            }
+
+            return list;
+        }
+
+        private Control _PreviousDropDownControlParent = null;
+        private void DropDownButtonMouseDown(object sender, MouseEventArgs e)
+        {
+            if (e.Button != MouseButtons.Left || _CloseTime != DateTime.MinValue && DateTime.Now.Subtract(_CloseTime).TotalMilliseconds < 150)
+            {
+                _CloseTime = DateTime.MinValue;
+                return;
+            }
+
+            ShowDropDown();
+        }
+
+        private static string _DropDownControlContainerName = "sysPopupControlContainer";
+        private static string _DropDownItemContainerName = "sysPopupItemContainer";
+
+        /// <summary>
+        /// Shows drop-down popup. Note that popup will be shown only if there is a DropDownControl assigned or DropDownItems collection has at least one item.
+        /// </summary>
+        public void ShowDropDown()
+        {
+            if (_DropDownControl == null && _PopupItem.SubItems.Count == 0)
+                return;
+            if (_PopupItem.Expanded)
+            {
+                _PopupItem.Expanded = false;
+                return;
+            }
+
+            ControlContainerItem cc = null;
+            ItemContainer ic = null;
+            if (_DropDownControl != null)
+            {
+                ic = new ItemContainer();
+                ic.Name = _DropDownItemContainerName;
+                cc = new ControlContainerItem(_DropDownControlContainerName);
+                ic.SubItems.Add(cc);
+                _PopupItem.SubItems.Insert(0, ic);
+            }
+
+            CancelEventArgs cancelArgs = new CancelEventArgs();
+            OnButtonDropDownClick(cancelArgs);
+            if (cancelArgs.Cancel || _PopupItem.SubItems.Count == 0)
+            {
+                if (ic != null)
+                    _PopupItem.SubItems.Remove(ic);
+                return;
+            }
+
+            _PreviousDropDownControlParent = _DropDownControl.Parent;
+            cc.Control = _DropDownControl;
+
+            _PopupItem.SetDisplayRectangle(this.ClientRectangle);
+            if (this.RightToLeft == RightToLeft.No)
+            {
+                Point pl = new Point(this.Width - _PopupItem.PopupSize.Width, this.Height);
+                ScreenInformation screen = BarFunctions.ScreenFromControl(this);
+                Point ps = PointToScreen(pl);
+                if (screen != null && screen.WorkingArea.X > ps.X)
+                {
+                    pl.X = 0;
+                }
+                _PopupItem.PopupLocation = pl;
+            }
+
+            _PopupItem.Expanded = !_PopupItem.Expanded;
+        }
+
+        /// <summary>
+        /// Closes the drop-down popup if it is open.
+        /// </summary>
+        public void CloseDropDown()
+        {
+            if (_PopupItem.Expanded) _PopupItem.Expanded = false;
+        }
+
+        private DateTime _CloseTime = DateTime.MinValue;
+        private void DropDownPopupClose(object sender, EventArgs e)
+        {
+            _CloseTime = DateTime.Now;
+            ItemContainer ic = _PopupItem.SubItems[_DropDownItemContainerName] as ItemContainer;
+            if (ic != null)
+            {
+                ControlContainerItem cc = ic.SubItems[_DropDownControlContainerName] as ControlContainerItem;
+                if (cc != null)
+                {
+                    cc.Control = null;
+                    ic.SubItems.Remove(cc);
+                    if (_DropDownControl != null)
+                    {
+                        _DropDownControl.Parent = _PreviousDropDownControlParent;
+                        _PreviousDropDownControlParent = null;
+                    }
+                }
+                _PopupItem.SubItems.Remove(ic);
+            }
+        }
+
+        private void ClearButtonClick(object sender, EventArgs e)
+        {
+            CancelEventArgs cancelArgs = new CancelEventArgs();
+            OnButtonClearClick(cancelArgs);
+            if (cancelArgs.Cancel) return;
+            _IpGroup.Value = null;
+        }
+
+        /// <summary>
+        /// Raises the ButtonClearClick event.
+        /// </summary>
+        /// <param name="e"></param>
+        protected virtual void OnButtonClearClick(CancelEventArgs e)
+        {
+            if (ButtonClearClick != null)
+                ButtonClearClick(this, e);
+        }
+
+        /// <summary>
+        /// Raises the ButtonDropDownClick event.
+        /// </summary>
+        /// <param name="e"></param>
+        protected virtual void OnButtonDropDownClick(CancelEventArgs e)
+        {
+            if (ButtonDropDownClick != null)
+                ButtonDropDownClick(this, e);
+        }
+        /// <summary>
+        /// Gets or sets whether input part of the control is read-only. When set to true the input part of the control becomes
+        /// read-only and does not allow the typing. However, drop-down part if visible still allows user to possibly change the value of the control
+        /// through the method you can provide on drop-down.
+        /// Use this property to allow change of the value through drop-down button only.
+        /// </summary>
+        [DefaultValue(false), Description("Indicates whether input part of the control is read-only.")]
+        public bool IsInputReadOnly
+        {
+            get { return _IpGroup.IsReadOnly; }
+            set
+            {
+                _IpGroup.IsReadOnly = value;
+                if (_FreeTextEntryBox != null)
+                    _FreeTextEntryBox.ReadOnly = value;
+            }
+        }
+
+        private bool _ShowCheckBox = false;
+        /// <summary>
+        /// Gets or sets a value indicating whether a check box is displayed to the left of the input value.
+        /// Set to true if a check box is displayed to the left of the input value; otherwise, false. The default is false.
+        /// <remarks>
+        /// When the ShowCheckBox property is set to true, a check box is displayed to the left of the input in the control. When the check box is selected, the value can be updated. When the check box is cleared, the value is unable to be changed.
+        /// You can handle the LockUpdateChanged event to be notified when this check box is checked and unchecked. Use LockUpdateChecked property 
+        /// to get or sets whether check box is checked.
+        /// </remarks>
+        /// </summary>
+        [DefaultValue(false), Description("Indicates whether a check box is displayed to the left of the input value which allows locking of the control.")]
+        public bool ShowCheckBox
+        {
+            get { return _ShowCheckBox; }
+            set
+            {
+                _ShowCheckBox = value;
+                OnShowCheckBoxChanged();
+            }
+        }
+
+        protected virtual void OnShowCheckBoxChanged()
+        {
+            LockUpdateCheckBox checkBox = LockUpdateCheckBox;
+            if (checkBox != null)
+            {
+                _IpGroup.Items.Remove(checkBox);
+                checkBox.CheckedChanged -= new EventHandler(LockCheckedChanged);
+            }
+
+            if (this.ShowCheckBox)
+            {
+                if (!(_IpGroup.Items[0] is LockUpdateCheckBox))
+                {
+                    checkBox = new LockUpdateCheckBox();
+                    checkBox.CheckedChanged += new EventHandler(LockCheckedChanged);
+                    _IpGroup.Items.Insert(0, checkBox);
+                    checkBox.Checked = _LockUpdateChecked;
+                }
+            }
+        }
+
+        private LockUpdateCheckBox LockUpdateCheckBox
+        {
+            get
+            {
+                if (_IpGroup.Items[0] is LockUpdateCheckBox)
+                    return (LockUpdateCheckBox)_IpGroup.Items[0];
+                return null;
+            }
+        }
+
+        private void LockCheckedChanged(object sender, EventArgs e)
+        {
+            LockUpdateCheckBox checkBox = LockUpdateCheckBox;
+            if (checkBox != null)
+                _LockUpdateChecked = checkBox.Checked;
+
+            OnLockUpdateChanged(e);
+        }
+
+        private bool _LockUpdateChecked = false;
+        /// <summary>
+        /// Gets or sets whether check box shown using ShowCheckBox property which locks/unlocks the control update is checked.
+        /// </summary>
+        [DefaultValue(false), Description("Indicates whether check box shown using ShowCheckBox property which locks/unlocks the control update is checked.")]
+        public bool LockUpdateChecked
+        {
+            get { return _LockUpdateChecked; }
+            set
+            {
+                if (_LockUpdateChecked != value)
+                {
+                    _LockUpdateChecked = value;
+                    LockUpdateCheckBox checkBox = LockUpdateCheckBox;
+                    if (checkBox != null)
+                        checkBox.Checked = _LockUpdateChecked;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Raises the LockUpdateChanged event.
+        /// </summary>
+        /// <param name="e">Provides event data./</param>
+        protected virtual void OnLockUpdateChanged(EventArgs e)
+        {
+            if (LockUpdateChanged != null)
+                LockUpdateChanged(this, e);
+        }
+
+        /// <summary>
+        /// List of characters that when pressed would select next input field. For example if you are
+        /// allowing time input you could set this property to : so when user presses the : character,
+        /// the input is forwarded to the next input field.
+        /// </summary>
+        [DefaultValue("."), Category("Behavior"), Description("List of characters that when pressed would select next input field.")]
+        public string SelectNextInputCharacters
+        {
+            get { return _IpGroup.SelectNextInputCharacters; }
+            set
+            {
+                if (_IpGroup.SelectNextInputCharacters != value)
+                {
+                    _IpGroup.SelectNextInputCharacters = value;
+                }
+            }
+        }
+
+        private string _Value = null;
+        /// <summary>
+        /// Gets or sets the IP Address value represented by the control.
+        /// </summary>
+        [DefaultValue(null), Description("Gets or sets the IP Address value."), Bindable(true)]
+        public string Value
+        {
+            get { return _IpGroup.Value; }
+            set
+            {
+                _Value = value;
+                InternalValueChanged();
+            }
+        }
+
+        private void InternalValueChanged()
+        {
+            if (_Value != _IpGroup.Value)
+            {
+                _IpGroup.Value = _Value;
+                ExecuteCommand();
+            }
+            this.Text = _Value;
+            if (FreeTextEntryMode && _FreeTextEntryBox != null)
+                _FreeTextEntryBox.Text = _Value;
+            OnValueChanged(EventArgs.Empty);
+        }
+
+        /// <summary>
+        /// Raises ValueChanged event.
+        /// </summary>
+        /// <param name="eventArgs">Provides event arguments.</param>
+        protected virtual void OnValueChanged(EventArgs eventArgs)
+        {
+            EventHandler handler = ValueChanged;
+            if (handler != null) handler(this, eventArgs);
+        }
+        #endregion
+
+        #region Free-Text Entry Support
+        /// <summary>
+        /// Occurs if Free-Text entry value is not natively recognized by the control and provides you with opportunity to convert that value to the
+        /// value control expects.
+        /// </summary>
+        [Description("Occurs if Free-Text entry value is not natively recognized by the control and provides you with opportunity to convert that value to the value control expects."), Category("Free-Text")]
+        public event FreeTextEntryConversionEventHandler ConvertFreeTextEntry;
+        /// <summary>
+        /// Occurs when Free-Text button is clicked and allows you to cancel its default action.
+        /// </summary>
+        public event CancelEventHandler ButtonFreeTextClick;
+
+        private void FreeTextButtonClick(object sender, EventArgs e)
+        {
+            CancelEventArgs cancelArgs = new CancelEventArgs();
+            OnButtonFreeTextClick(cancelArgs);
+            if (cancelArgs.Cancel) return;
+
+            FreeTextEntryMode = !FreeTextEntryMode;
+            _ButtonFreeText.Checked = FreeTextEntryMode;
+            if (FreeTextEntryMode && _FreeTextEntryBox != null && !_FreeTextEntryBox.Focused)
+                _FreeTextEntryBox.Focus();
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="e"></param>
+        protected virtual void OnButtonFreeTextClick(CancelEventArgs e)
+        {
+            CancelEventHandler handler = ButtonFreeTextClick;
+            if (handler != null) handler(this, e);
+        }
+
+        protected override bool IsWatermarkRendered
+        {
+            get
+            {
+                return !(this.Focused || _FreeTextEntryBox != null && _FreeTextEntryBox.Focused) && _IpGroup.IsEmpty;
+            }
+        }
+
+        private bool _AutoResolveFreeTextEntries = true;
+        /// <summary>
+        /// Gets or sets whether free text entries are attempted to be auto-resolved to IP address as host/domain names. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Free-Text"), Description("Indicates whether free text entries are attempted to be auto-resolved to IP address as host/domain names.")]
+        public bool AutoResolveFreeTextEntries
+        {
+            get { return _AutoResolveFreeTextEntries; }
+            set
+            {
+                _AutoResolveFreeTextEntries = value;
+            }
+        }
+        
+
+        private bool _AutoOffFreeTextEntry = false;
+        /// <summary>
+        /// Gets or sets whether free-text entry is automatically turned off when control loses input focus. Default value is false.
+        /// </summary>
+        [DefaultValue(false), Category("Free-Text"), Description("Indicates whether free-text entry is automatically turned off when control loses input focus.")]
+        public bool AutoOffFreeTextEntry
+        {
+            get { return _AutoOffFreeTextEntry; }
+            set
+            {
+                _AutoOffFreeTextEntry = value;
+            }
+        }
+        
+        private bool _FreeTextEntryMode = false;
+        /// <summary>
+        /// Gets or sets whether control input is in free-text input mode. Default value is false.
+        /// </summary>
+        [DefaultValue(false), Category("Free-Text"), Description("Indicates whether control input is in free-text input mode.")]
+        public bool FreeTextEntryMode
+        {
+            get { return _FreeTextEntryMode; }
+            set
+            {
+                _FreeTextEntryMode = value;
+                OnFreeTextEntryModeChanged();
+            }
+        }
+
+        private void OnFreeTextEntryModeChanged()
+        {
+            if (!_FreeTextEntryMode)
+            {
+                if (_FreeTextEntryBox != null)
+                {
+                    _FreeTextEntryBox.ApplyValue -= ApplyFreeTextValue;
+                    _FreeTextEntryBox.RevertValue -= RevertFreeTextValue;
+                    _FreeTextEntryBox.LostFocus -= FreeTextLostFocus;
+                    this.Controls.Remove(_FreeTextEntryBox);
+                    _FreeTextEntryBox.Dispose();
+                    _FreeTextEntryBox = null;
+                }
+            }
+            else
+            {
+                UpdateFreeTextBoxVisibility();
+            }
+            if (_ButtonFreeText != null) _ButtonFreeText.Checked = _FreeTextEntryMode;
+        }
+
+        protected override void OnIsKeyboardFocusWithinChanged()
+        {
+            if (_FreeTextEntryMode)
+            {
+                UpdateFreeTextBoxVisibility();
+                if (this.IsKeyboardFocusWithin)
+                {
+                    Control textBox = GetFreeTextBox();
+                    if (!textBox.Focused)
+                        textBox.Focus();
+                }
+            }
+            base.OnIsKeyboardFocusWithinChanged();
+        }
+
+        private void UpdateFreeTextBoxVisibility()
+        {
+            FreeTextEntryBox textBox = (FreeTextEntryBox)GetFreeTextBox();
+            if (this.IsKeyboardFocusWithin)
+            {
+                textBox.Visible = true;
+                textBox.Text = this.Value;
+                RootVisualItem.InvalidateArrange();
+                this.Invalidate();
+            }
+            else
+            {
+                if (textBox.Visible)
+                {
+                    if (textBox.Focused)
+                        textBox.HideOnLostFocus();
+                    else
+                        textBox.Visible = false;
+                    RootVisualItem.InvalidateArrange();
+                    this.Invalidate();
+                }
+            }
+        }
+
+        protected override bool SupportsFreeTextEntry
+        {
+            get
+            {
+                return true;
+            }
+        }
+
+        private FreeTextEntryBox _FreeTextEntryBox = null;
+        protected override Control GetFreeTextBox()
+        {
+            if (_FreeTextEntryBox == null)
+            {
+                _FreeTextEntryBox = new FreeTextEntryBox();
+                _FreeTextEntryBox.ApplyValue += ApplyFreeTextValue;
+                _FreeTextEntryBox.RevertValue += RevertFreeTextValue;
+                _FreeTextEntryBox.LostFocus += FreeTextLostFocus;
+                _FreeTextEntryBox.BorderStyle = BorderStyle.None;
+                _FreeTextEntryBox.ReadOnly = this.IsInputReadOnly;
+                this.Controls.Add(_FreeTextEntryBox);
+            }
+            
+            return _FreeTextEntryBox;
+        }
+
+        private void RevertFreeTextValue(object sender, EventArgs e)
+        {
+            if (_FreeTextEntryBox != null) _FreeTextEntryBox.Text = this.Value;
+        }
+
+        protected virtual void OnConvertFreeTextEntry(FreeTextEntryConversionEventArgs e)
+        {
+            FreeTextEntryConversionEventHandler handler = this.ConvertFreeTextEntry;
+            if (handler != null) handler(this, e);
+        }
+
+        private void ApplyFreeTextValue(object sender, EventArgs e)
+        {
+            if (_FreeTextEntryBox == null) return;
+            if (string.IsNullOrEmpty(_FreeTextEntryBox.Text))
+                this.Value = null;
+            else if (_IpGroup.IsValueValid(_FreeTextEntryBox.Text) && _AutoResolveFreeTextEntries)
+                this.Value = _FreeTextEntryBox.Text;
+            else
+            {
+                FreeTextEntryConversionEventArgs eventArgs = new FreeTextEntryConversionEventArgs(_FreeTextEntryBox.Text);
+                OnConvertFreeTextEntry(eventArgs);
+                if (eventArgs.IsValueConverted)
+                {
+                    if (eventArgs.ControlValue is string && _IpGroup.IsValueValid((string)eventArgs.ControlValue))
+                        this.Value = (string)eventArgs.ControlValue;
+                    else
+                        throw new ArgumentException("ControlValue assigned is not recognized as valid IP value.");
+                }
+                else
+                {
+                    string ipValue = null;
+                    if (_AutoResolveFreeTextEntries)
+                    {
+                        try
+                        {
+                            System.Net.IPAddress[] addresses = System.Net.Dns.GetHostAddresses(_FreeTextEntryBox.Text);
+                            if (addresses != null && addresses.Length > 0)
+                            {
+                                ipValue = addresses[0].ToString();
+                                if (!_IpGroup.IsValueValid(ipValue))
+                                    ipValue = null;
+                            }
+                        }
+                        catch
+                        {
+                            ipValue = null;
+                        }
+                    }
+                    this.Value = ipValue;
+                }
+            }
+        }
+
+        private void FreeTextLostFocus(object sender, EventArgs e)
+        {
+            if (_AutoOffFreeTextEntry && !this.IsKeyboardFocusWithin)
+                this.FreeTextEntryMode = false;
+        }
+
+        protected override void HideFreeTextBoxEntry()
+        {
+            if (_FreeTextEntryBox != null) _FreeTextEntryBox.Visible = false;
+        }
+
+        protected override bool IsFreeTextEntryVisible
+        {
+            get
+            {
+                return _FreeTextEntryMode && this.IsKeyboardFocusWithin;
+            }
+        }
+        #endregion
+
+        #region ICommandSource Members
+        protected virtual void ExecuteCommand()
+        {
+            if (_Command == null) return;
+            CommandManager.ExecuteCommand(this);
+        }
+
+        /// <summary>
+        /// Gets or sets the command assigned to the item. Default value is null.
+        /// <remarks>Note that if this property is set to null Enabled property will be set to false automatically to disable the item.</remarks>
+        /// </summary>
+        [DefaultValue(null), Category("Commands"), Description("Indicates the command assigned to the item.")]
+        public Command Command
+        {
+            get { return (Command)((ICommandSource)this).Command; }
+            set
+            {
+                ((ICommandSource)this).Command = value;
+            }
+        }
+
+        private ICommand _Command = null;
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        ICommand ICommandSource.Command
+        {
+            get
+            {
+                return _Command;
+            }
+            set
+            {
+                bool changed = false;
+                if (_Command != value)
+                    changed = true;
+
+                if (_Command != null)
+                    CommandManager.UnRegisterCommandSource(this, _Command);
+                _Command = value;
+                if (value != null)
+                    CommandManager.RegisterCommand(this, value);
+                if (changed)
+                    OnCommandChanged();
+            }
+        }
+
+        /// <summary>
+        /// Called when Command property value changes.
+        /// </summary>
+        protected virtual void OnCommandChanged()
+        {
+        }
+
+        private object _CommandParameter = null;
+        /// <summary>
+        /// Gets or sets user defined data value that can be passed to the command when it is executed.
+        /// </summary>
+        [Browsable(true), DefaultValue(null), Category("Commands"), Description("Indicates user defined data value that can be passed to the command when it is executed."), System.ComponentModel.TypeConverter(typeof(System.ComponentModel.StringConverter)), System.ComponentModel.Localizable(true)]
+        public object CommandParameter
+        {
+            get
+            {
+                return _CommandParameter;
+            }
+            set
+            {
+                _CommandParameter = value;
+            }
+        }
+
+        #endregion
+
+    }
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/Editors/LockUpdateCheckBox.cs b/PROMS/DotNetBar Source Code/Editors/LockUpdateCheckBox.cs
new file mode 100644
index 00000000..6c38ce92
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Editors/LockUpdateCheckBox.cs	
@@ -0,0 +1,53 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace DevComponents.Editors
+{
+    public class LockUpdateCheckBox : VisualCheckBox
+    {
+        #region Private Variables
+        #endregion
+
+        #region Events
+        #endregion
+
+        #region Constructor
+        /// <summary>
+        /// Initializes a new instance of the LockUpdateCheckBox class.
+        /// </summary>
+        public LockUpdateCheckBox()
+        {
+            this.Checked = true;
+        }
+        #endregion
+
+        #region Internal Implementation
+        public override void PerformLayout(PaintInfo pi)
+        {
+            base.PerformLayout(pi);
+            this.Size = new System.Drawing.Size(this.Size.Width + 4, this.Size.Height);
+        }
+
+        protected override void OnCheckedChanged(EventArgs e)
+        {
+            if (this.Parent is VisualGroup)
+            {
+                VisualGroup g = this.Parent as VisualGroup;
+                for (int i = 0; i < g.Items.Count; i++)
+                {
+                    VisualItem item = g.Items[i];
+                    if (item == this) continue;
+                    item.Enabled = this.Checked;
+                }
+            }
+
+            base.OnCheckedChanged(e);
+        }
+        #endregion
+
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/Editors/NumericInputBase.cs b/PROMS/DotNetBar Source Code/Editors/NumericInputBase.cs
new file mode 100644
index 00000000..e6e24c72
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Editors/NumericInputBase.cs	
@@ -0,0 +1,1120 @@
+#if FRAMEWORK20
+using System;
+using System.ComponentModel;
+using System.Text;
+using System.Windows.Forms;
+using System.Collections;
+using DevComponents.DotNetBar;
+using System.Drawing;
+
+namespace DevComponents.Editors
+{
+    /// <summary>
+    /// Represents an control that allows numeric input.
+    /// </summary>
+    [ToolboxItem(false), DefaultEvent("ValueChanged")]
+    public abstract class NumericInputBase : VisualControlBase, ICommandSource
+    {
+        #region Private Variables
+        private VisualInputGroup _InputGroup = null;
+        private ButtonItem _PopupItem = null;
+        private static string _DropDownControlContainerName = "sysPopupControlContainer";
+        private static string _DropDownItemContainerName = "sysPopupItemContainer";
+        #endregion
+
+        #region Events
+        /// <summary>
+        /// Occurs when the Value or IsEmpty property changes.
+        /// <remarks>
+        /// This event is not raised when the entered date is earlier than MinDateTime or later than MaxDateTime.
+        /// </remarks>
+        /// </summary>
+        public event EventHandler ValueChanged;
+        /// <summary>
+        /// Occurs when the Value or IsEmpty property changes. This event occurs at the same time and has same function as ValueChanged event. It is provided for binding support.
+        /// </summary>
+        public event EventHandler ValueObjectChanged;
+        /// <summary>
+        /// Occurs when Clear button is clicked and allows you to cancel the default action performed by the button.
+        /// </summary>
+        public event CancelEventHandler ButtonClearClick;
+        /// <summary>
+        /// Occurs when Drop-Down button that shows calendar is clicked and allows you to cancel showing of the popup.
+        /// </summary>
+        public event CancelEventHandler ButtonDropDownClick;
+
+        /// <summary>
+        /// Occurs when ShowCheckBox property is set to true and user changes the lock status of the control by clicking the check-box.
+        /// </summary>
+        public event EventHandler LockUpdateChanged;
+        #endregion
+
+        #region Constructor
+        /// <summary>
+        /// Initializes a new instance of the NumericInputBase class.
+        /// </summary>
+        public NumericInputBase()
+            : base()
+        {
+            _ButtonClear = new InputButtonSettings(this);
+            _ButtonDropDown = new InputButtonSettings(this);
+            _ButtonFreeText = new InputButtonSettings(this);
+            _ButtonCalculator = new InputButtonSettings(this);
+
+            _InputGroup = this.RootVisualItem as VisualInputGroup;
+            _InputGroup.AutoOverwrite = false;
+            this.InputHorizontalAlignment = eHorizontalAlignment.Right;
+        }
+        #endregion
+
+        #region Internal Implementation
+        protected virtual void UpdateInputFieldAlignment()
+        {
+            
+        }
+        protected override void OnInputButtonSettingsChanged(InputButtonSettings inputButtonSettings)
+        {
+            UpdateInputFieldAlignment();
+            base.OnInputButtonSettingsChanged(inputButtonSettings);
+        }
+        protected override void OnInputHorizontalAlignmentChanged(eHorizontalAlignment oldValue, eHorizontalAlignment newValue)
+        {
+            UpdateInputFieldAlignment();
+            base.OnInputHorizontalAlignmentChanged(oldValue, newValue);
+        }
+        /// <summary>
+        /// Gets or sets whether input part of the control is read-only. When set to true the input part of the control becomes read-only and does not allow the typing. However, drop-down and up/down buttons part if visible still allows user to possibly change the value of the control through the method you can provide on drop-down or through up/down buttons. Use this property to allow change of the value through drop-down or up/down buttons only.
+        /// </summary>
+        [DefaultValue(false), Description("Indicates whether input part of the control is read-only. When set to true the input part of the control becomes read-only and does not allow the typing. However, drop-down and up/down buttons part if visible still allows user to possibly change the value of the control through the method you can provide on drop-down or through up/down buttons. Use this property to allow change of the value through drop-down or up/down buttons only.")]
+        public bool IsInputReadOnly
+        {
+            get { return _InputGroup.IsReadOnly; }
+            set
+            {
+                _InputGroup.IsReadOnly = value;
+                if (_FreeTextEntryBox != null)
+                    _FreeTextEntryBox.ReadOnly = value || !this.LockUpdateChecked;
+            }
+        }
+
+        private bool _ShowCheckBox = false;
+        /// <summary>
+        /// Gets or sets a value indicating whether a check box is displayed to the left of the input value.
+        /// Set to true if a check box is displayed to the left of the input value; otherwise, false. The default is false.
+        /// <remarks>
+        /// When the ShowCheckBox property is set to true, a check box is displayed to the left of the input in the control. When the check box is selected, the value can be updated. When the check box is cleared, the value is unable to be changed.
+        /// You can handle the LockUpdateChanged event to be notified when this check box is checked and unchecked. Use LockUpdateChecked property 
+        /// to get or sets whether check box is checked.
+        /// </remarks>
+        /// </summary>
+        [DefaultValue(false), Description("Indicates whether a check box is displayed to the left of the input value which allows locking of the control.")]
+        public bool ShowCheckBox
+        {
+            get { return _ShowCheckBox; }
+            set
+            {
+                _ShowCheckBox = value;
+                OnShowCheckBoxChanged();
+            }
+        }
+
+        protected virtual void OnShowCheckBoxChanged()
+        {
+            UpdateInputFieldAlignment();
+
+            LockUpdateCheckBox checkBox = LockUpdateCheckBox;
+            if (checkBox != null)
+            {
+                _InputGroup.Items.Remove(checkBox);
+                checkBox.CheckedChanged -= new EventHandler(LockCheckedChanged);
+            }
+
+            if (this.ShowCheckBox)
+            {
+                if (!(_InputGroup.Items[0] is LockUpdateCheckBox))
+                {
+                    checkBox = new LockUpdateCheckBox();
+                    checkBox.ItemType = eSystemItemType.SystemButton;
+                    checkBox.CheckedChanged += new EventHandler(LockCheckedChanged);
+                    _InputGroup.Items.Insert(0, checkBox);
+                    checkBox.Checked = _LockUpdateChecked;
+                }
+            }
+        }
+
+        private LockUpdateCheckBox LockUpdateCheckBox
+        {
+            get
+            {
+                if (_InputGroup.Items[0] is LockUpdateCheckBox)
+                    return (LockUpdateCheckBox)_InputGroup.Items[0];
+                return null;
+            }
+        }
+
+        private void LockCheckedChanged(object sender, EventArgs e)
+        {
+            LockUpdateCheckBox checkBox = LockUpdateCheckBox;
+            if (checkBox != null)
+                _LockUpdateChecked = checkBox.Checked;
+
+            OnLockUpdateChanged(e);
+        }
+
+        private bool _LockUpdateChecked = true;
+        /// <summary>
+        /// Gets or sets whether check box shown using ShowCheckBox property which locks/unlocks the control update is checked.
+        /// </summary>
+        [DefaultValue(true), Description("Indicates whether check box shown using ShowCheckBox property which locks/unlocks the control update is checked.")]
+        public bool LockUpdateChecked
+        {
+            get { return _LockUpdateChecked; }
+            set
+            {
+                if (_LockUpdateChecked != value)
+                {
+                    _LockUpdateChecked = value;
+                    LockUpdateCheckBox checkBox = LockUpdateCheckBox;
+                    if (checkBox != null)
+                        checkBox.Checked = _LockUpdateChecked;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Raises the LockUpdateChanged event.
+        /// </summary>
+        /// <param name="e">Provides event data./</param>
+        protected virtual void OnLockUpdateChanged(EventArgs e)
+        {
+            if (LockUpdateChanged != null)
+                LockUpdateChanged(this, e);
+            if (_FreeTextEntryBox != null) _FreeTextEntryBox.ReadOnly = !this.LockUpdateChecked;
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether a spin button control (up-down control) is used to adjust the current value. The default is false. 
+        /// <remarks>
+        /// When the ShowUpDown property is set to true, a spin button control is shown to adjust value of currently focused input item. 
+        /// The value can be adjusted by using the up and down buttons to change the value.
+        /// </remarks>
+        /// </summary>
+        private bool _ShowUpDown = false;
+        [DefaultValue(false)]
+        public bool ShowUpDown
+        {
+            get { return _ShowUpDown; }
+            set
+            {
+                _ShowUpDown = value;
+                OnShowUpDownChanged();
+            }
+        }
+
+        protected override void RecreateButtons()
+        {
+            base.RecreateButtons();
+            OnShowUpDownChanged();
+            OnShowCheckBoxChanged();
+        }
+
+        protected virtual void OnShowUpDownChanged()
+        {
+            UpdateInputFieldAlignment();
+
+            for (int i = _InputGroup.Items.Count - 1; i >= 0; i--)
+            {
+                if (_InputGroup.Items[i] is VisualUpDownButton)
+                {
+                    VisualUpDownButton upDownButton = (VisualUpDownButton)_InputGroup.Items[i];
+                    _InputGroup.Items.RemoveAt(i);
+                    //upDownButton.UpClick -= new EventHandler(UpDownButtonUpClick);
+                    //upDownButton.DownClick -= new EventHandler(UpDownButtonDownClick);
+                    break;
+                }
+            }
+
+            if (this.ShowUpDown)
+            {
+                VisualUpDownButton upDownButton = new VisualUpDownButton();
+                upDownButton.Alignment = eItemAlignment.Right;
+                upDownButton.AutoChange = eUpDownButtonAutoChange.FocusedItem;
+                upDownButton.ItemType = eSystemItemType.SystemButton;
+                //upDownButton.UpClick += new EventHandler(UpDownButtonUpClick);
+                //upDownButton.DownClick += new EventHandler(UpDownButtonDownClick);
+                upDownButton.Enabled = this.LockUpdateChecked;
+                _InputGroup.Items.Add(upDownButton);
+            }
+        }
+
+        //private void UpDownButtonDownClick(object sender, EventArgs e)
+        //{
+        //    if (this.FreeTextEntryMode && _FreeTextEntryBox.Focused)
+        //        DecreaseValue();
+        //}
+        //private void UpDownButtonUpClick(object sender, EventArgs e)
+        //{
+        //    if (this.FreeTextEntryMode && _FreeTextEntryBox.Focused)
+        //        IncreaseValue();
+        //}
+
+        /// <summary>
+        /// Decreases value of the control.
+        /// </summary>
+        public abstract void DecreaseValue();
+        /// <summary>
+        /// Increases the value of the control.
+        /// </summary>
+        public abstract void IncreaseValue();
+
+        private InputButtonSettings _ButtonDropDown = null;
+        /// <summary>
+        /// Gets the object that describes the settings for the button that shows drop-down when clicked.
+        /// </summary>
+        [Category("Buttons"), Description("Describes the settings for the button that shows drop-down when clicked."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public InputButtonSettings ButtonDropDown
+        {
+            get
+            {
+                return _ButtonDropDown;
+            }
+        }
+
+        private InputButtonSettings _ButtonClear = null;
+        /// <summary>
+        /// Gets the object that describes the settings for the button that clears the content of the control when clicked.
+        /// </summary>
+        [Category("Buttons"), Description("Describes the settings for the button that clears the content of the control when clicked."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public InputButtonSettings ButtonClear
+        {
+            get
+            {
+                return _ButtonClear;
+            }
+        }
+
+        private InputButtonSettings _ButtonFreeText = null;
+        /// <summary>
+        /// Gets the object that describes the settings for the button that switches the control into the free-text entry mode when clicked.
+        /// </summary>
+        [Category("Buttons"), Description("Describes the settings for the button that switches the control into the free-text entry mode when clicked."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public InputButtonSettings ButtonFreeText
+        {
+            get
+            {
+                return _ButtonFreeText;
+            }
+        }
+
+        private InputButtonSettings _ButtonCalculator = null;
+        /// <summary>
+        /// Gets the object that describes the settings for the button that displays popup calculator.
+        /// </summary>
+        [Category("Buttons"), Description("Describes the settings for the button that displays popup calculator."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public InputButtonSettings ButtonCalculator
+        {
+            get
+            {
+                return _ButtonCalculator;
+            }
+        }
+
+
+        protected override VisualItem CreateButton(InputButtonSettings buttonSettings)
+        {
+            VisualItem item = null;
+            if (buttonSettings == _ButtonDropDown)
+            {
+                item = new VisualDropDownButton();
+                ApplyButtonSettings(buttonSettings, item as VisualButton);
+            }
+            else
+                item = base.CreateButton(buttonSettings);
+
+            VisualButton button = item as VisualButton;
+            button.ClickAutoRepeat = false;
+
+            if (buttonSettings == _ButtonClear)
+            {
+                if (buttonSettings.Image == null && string.IsNullOrEmpty(buttonSettings.Text))
+                {
+                    //if (Dpi.Factor.Width > 1)
+                        button.Symbol = "\uf00d";
+                    //else
+                    //    button.Image = DevComponents.DotNetBar.BarFunctions.LoadBitmap("SystemImages.DateReset.png");
+                }
+            }
+            else if (buttonSettings == _ButtonFreeText)
+            {
+                if (buttonSettings.Image == null && string.IsNullOrEmpty(buttonSettings.Text))
+                {
+                    //if (Dpi.Factor.Width > 1)
+                        button.Symbol = "\uf040";
+                    //else
+                    //    button.Image = DevComponents.DotNetBar.BarFunctions.LoadBitmap("SystemImages.FreeText.png");
+                }
+                button.Checked = buttonSettings.Checked;
+            }
+            else if (buttonSettings == _ButtonCalculator)
+            {
+                if (buttonSettings.Image == null && string.IsNullOrEmpty(buttonSettings.Text))
+                {
+                    //if (Dpi.Factor.Width > 1)
+                        button.Symbol = "\uf1ec";
+                    //else
+                    //    button.Image = DevComponents.DotNetBar.BarFunctions.LoadBitmap("SystemImages.Calculator.png");
+                }
+                button.Checked = buttonSettings.Checked;
+            }
+
+            return item;
+        }
+
+        private string _DisplayFormat = "";
+        /// <summary>
+        /// Gets or sets the Numeric String Format that is used to format the numeric value entered for display purpose. Read more about
+        /// available formats in MSDN under "Standard Numeric Format Strings" and "Custom Numeric Format Strings" topics.
+        /// <remarks>
+        /// The format specified here indicates the format for display purpose only, not for the input purpose.
+        /// For example to display the number in system Currency format set the DisplayFormat to 'C'.
+        /// </remarks>
+        /// </summary>
+        [DefaultValue(""), Description("Indicates Numeric String Format that is used to format the numeric value entered for display purpose.")]
+        public string DisplayFormat
+        {
+            get { return _DisplayFormat; }
+            set
+            {
+                if (value != null)
+                {
+                    int i = 12;
+                    string s = i.ToString(value);
+                    _DisplayFormat = value;
+                    OnDisplayFormatChanged();
+                    this.Invalidate();
+                    RootVisualItem.InvalidateArrange();   
+                }
+            }
+        }
+
+        protected abstract void OnDisplayFormatChanged();
+
+        /// <summary>
+        /// Gets or sets whether empty null/nothing state of the control is allowed. Default value is true which means that IsEmpty property
+        /// may return true if input value is resets or ValueObject set to null/nothing.
+        /// </summary>
+        [DefaultValue(true), Description("Indicates whether empty null/nothing state of the control is allowed.")]
+        public bool AllowEmptyState
+        {
+            get { return _InputGroup.AllowEmptyState; }
+            set { _InputGroup.AllowEmptyState = value; this.Invalidate(); }
+        }
+
+        /// <summary>
+        /// Gets or sets whether control is empty i.e. it does not hold a valid value.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsEmpty
+        {
+            get { return _InputGroup.IsEmpty; }
+            set
+            {
+                bool changed = _InputGroup.IsEmpty != value;
+                _InputGroup.IsEmpty = value;
+                if (changed)
+                {
+                    OnValueObjectChanged(EventArgs.Empty);
+                    ExecuteCommand();
+                }
+            }
+        }
+
+        protected override System.Collections.SortedList CreateSortedButtonList()
+        {
+            SortedList list = base.CreateSortedButtonList();
+            if (_ButtonClear.Visible)
+            {
+                VisualItem button = CreateButton(_ButtonClear);
+                if (_ButtonClear.ItemReference != null)
+                    _ButtonClear.ItemReference.Click -= new EventHandler(ClearButtonClick);
+                _ButtonClear.ItemReference = button;
+                button.Click += new EventHandler(ClearButtonClick);
+                list.Add(_ButtonClear, button);
+            }
+            if (_ButtonDropDown.Visible)
+            {
+                VisualItem button = CreateButton(_ButtonDropDown);
+                if (_ButtonDropDown.ItemReference != null)
+                {
+                    _ButtonDropDown.ItemReference.MouseDown -= new MouseEventHandler(DropDownButtonMouseDown);
+                }
+                _ButtonDropDown.ItemReference = button;
+                button.MouseDown += new MouseEventHandler(DropDownButtonMouseDown);
+                list.Add(_ButtonDropDown, button);
+            }
+            if (_ButtonFreeText.Visible)
+            {
+                VisualItem button = CreateButton(_ButtonFreeText);
+                if (_ButtonFreeText.ItemReference != null)
+                    _ButtonFreeText.ItemReference.Click -= new EventHandler(FreeTextButtonClick);
+                _ButtonFreeText.ItemReference = button;
+                button.Click += FreeTextButtonClick;
+                list.Add(_ButtonFreeText, button);
+            }
+            if (_ButtonCalculator.Visible)
+            {
+                VisualItem button = CreateButton(_ButtonCalculator);
+                if (_ButtonCalculator.ItemReference != null)
+                    _ButtonCalculator.ItemReference.Click -= CalculatorButtonClick;
+                _ButtonCalculator.ItemReference = button;
+                button.Click += CalculatorButtonClick;
+                list.Add(_ButtonCalculator, button);
+            }
+
+            return list;
+        }
+
+        protected override void OnKeyPress(KeyPressEventArgs e)
+        {
+            if (_IsCalculatorDisplayed && _DropDownCalculator != null)
+                _DropDownCalculator.ProcessKeyPress(e);
+            base.OnKeyPress(e);
+        }
+
+        protected override bool EatMenuFilterKeyDown
+        {
+            get
+            {
+                if (_IsCalculatorDisplayed && _DropDownCalculator != null) return false;
+                return base.EatMenuFilterKeyDown;
+            }
+        }
+        
+        private Calculator _DropDownCalculator = null;
+        private bool _IsCalculatorDisplayed = false;
+        private void CalculatorButtonClick(object sender, EventArgs e)
+        {
+            if (_CloseTime != DateTime.MinValue && DateTime.Now.Subtract(_CloseTime).TotalMilliseconds < 150)
+            {
+                _CloseTime = DateTime.MinValue;
+                return;
+            }
+            if (_DropDownCalculator == null)
+            {
+                _DropDownCalculator = new Calculator();
+                _DropDownCalculator.AutoSize = true;
+                _DropDownCalculator.FocusButtonsOnMouseDown = false;
+                _DropDownCalculator.DisplayVisible = false;
+                _DropDownCalculator.ValueChanged += new EventHandler<ValueChangedEventArgs>(DropDownCalculatorValueChanged);
+                _DropDownCalculator.Scale(Dpi.Factor);
+                OnDropDownCalculatorCreated(_DropDownCalculator);
+            }
+            UpdateCalculatorValue(_DropDownCalculator);
+            _IsCalculatorDisplayed = true;
+            ShowDropDown(_DropDownCalculator);
+        }
+
+        protected bool IsCalculatorDisplayed
+        {
+            get { return (_IsCalculatorDisplayed); }
+        }
+
+        protected virtual void UpdateCalculatorValue(Calculator calculator) { }
+        protected virtual void OnDropDownCalculatorCreated(Calculator calculator){}
+        protected virtual void DropDownCalculatorValueChanged(object sender, ValueChangedEventArgs e) { }
+
+        private Control _PreviousDropDownControlParent = null;
+        private void DropDownButtonMouseDown(object sender, MouseEventArgs e)
+        {
+            if (e.Button != MouseButtons.Left || _CloseTime != DateTime.MinValue && DateTime.Now.Subtract(_CloseTime).TotalMilliseconds < 150)
+            {
+                _CloseTime = DateTime.MinValue;
+                return;
+            }
+
+            ShowDropDown();
+        }
+
+        /// <summary>
+        /// Shows drop-down popup. Note that popup will be shown only if there is a DropDownControl assigned or DropDownItems collection has at least one item.
+        /// </summary>
+        public void ShowDropDown()
+        {
+            ShowDropDown(_DropDownControl);
+        }
+
+        private void ShowDropDown(Control dropDownControl)
+        {
+            if (dropDownControl == null && _PopupItem.SubItems.Count == 0)
+                return;
+            if (_PopupItem.Expanded)
+            {
+                _PopupItem.Expanded = false;
+                return;
+            }
+
+            ControlContainerItem cc = null;
+            ItemContainer ic = null;
+            if (dropDownControl != null)
+            {
+                ic = new ItemContainer();
+                ic.Name = _DropDownItemContainerName;
+                cc = new ControlContainerItem(_DropDownControlContainerName);
+                ic.SubItems.Add(cc);
+                _PopupItem.SubItems.Insert(0, ic);
+            }
+
+            CancelEventArgs cancelArgs = new CancelEventArgs();
+            OnButtonDropDownClick(cancelArgs);
+            if (cancelArgs.Cancel || _PopupItem.SubItems.Count == 0)
+            {
+                if (ic != null)
+                    _PopupItem.SubItems.Remove(ic);
+                return;
+            }
+
+            _PreviousDropDownControlParent = dropDownControl.Parent;
+            cc.Control = dropDownControl;
+
+            _PopupItem.SetDisplayRectangle(this.ClientRectangle);
+            if (this.RightToLeft == RightToLeft.No)
+            {
+                Point pl = new Point(this.Width - _PopupItem.PopupSize.Width, this.Height);
+                ScreenInformation screen = BarFunctions.ScreenFromControl(this);
+                Point ps = PointToScreen(pl);
+                if (screen != null && screen.WorkingArea.X > ps.X)
+                {
+                    pl.X = 0;
+                }
+                _PopupItem.PopupLocation = pl;
+            }
+
+            _PopupItem.Expanded = !_PopupItem.Expanded;
+        }
+
+
+        /// <summary>
+        /// Closes the drop-down popup if it is open.
+        /// </summary>
+        public void CloseDropDown()
+        {
+            if (_PopupItem.Expanded) _PopupItem.Expanded = false;
+        }
+
+        private DateTime _CloseTime = DateTime.MinValue;
+        private void DropDownPopupClose(object sender, EventArgs e)
+        {
+            _CloseTime = DateTime.Now;
+            ItemContainer ic = _PopupItem.SubItems[_DropDownItemContainerName] as ItemContainer;
+            if (ic != null)
+            {
+                ControlContainerItem cc = ic.SubItems[_DropDownControlContainerName] as ControlContainerItem;
+                if (cc != null)
+                {
+                    Control dropDownControl = cc.Control;
+                    cc.Control = null;
+                    ic.SubItems.Remove(cc);
+                    if (dropDownControl != null)
+                    {
+                        dropDownControl.Parent = _PreviousDropDownControlParent;
+                        _PreviousDropDownControlParent = null;
+                    }
+                }
+                _PopupItem.SubItems.Remove(ic);
+            }
+            _IsCalculatorDisplayed = false;
+        }
+
+        private void ClearButtonClick(object sender, EventArgs e)
+        {
+            CancelEventArgs cancelArgs = new CancelEventArgs();
+            OnButtonClearClick(cancelArgs);
+            if (cancelArgs.Cancel) return;
+            this.IsEmpty = true;
+        }
+
+        /// <summary>
+        /// Raises the ButtonClearClick event.
+        /// </summary>
+        /// <param name="e"></param>
+        protected virtual void OnButtonClearClick(CancelEventArgs e)
+        {
+            if (ButtonClearClick != null)
+                ButtonClearClick(this, e);
+        }
+
+        /// <summary>
+        /// Raises the ButtonDropDownClick event.
+        /// </summary>
+        /// <param name="e"></param>
+        protected virtual void OnButtonDropDownClick(CancelEventArgs e)
+        {
+            if (ButtonDropDownClick != null)
+                ButtonDropDownClick(this, e);
+        }
+
+        /// <summary>
+        /// Raises the ValueChanged event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnValueChanged(EventArgs e)
+        {
+            if (_ValueChangedTrigger == eTriggerType.Immediate)
+                OnValueChangedDirect(e);
+            else
+                _IsValueChanged = true;
+        }
+
+        /// <summary>
+        /// Raises the ValueChanged event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnValueChangedDirect(EventArgs e)
+        {
+            if (IsInitializing) return;
+
+            if (ValueChanged != null)
+                ValueChanged(this, e);
+            OnValueObjectChanged(e);
+            ExecuteCommand();
+
+            _IsValueChanged = false;
+        }
+
+        protected virtual void OnValueObjectChanged(EventArgs e)
+        {
+            if (ValueObjectChanged != null)
+                ValueObjectChanged(this, e);
+        }
+
+        private bool _IsValueChanged = false;
+        private eTriggerType _ValueChangedTrigger = eTriggerType.Immediate;
+        /// <summary>
+        /// Specifies the behavior of ValueChanged event triggering.
+        /// </summary>
+        [DefaultValue(eTriggerType.Immediate), Category("Behavior"), Description("Specifies the behavior of ValueChanged event triggering.")]
+        public eTriggerType ValueChangedTrigger
+        {
+            get
+            {
+                return _ValueChangedTrigger;
+            }
+            set
+            {
+            	_ValueChangedTrigger = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the input field alignment inside the control
+        /// </summary>
+        [Browsable(true), DefaultValue(eHorizontalAlignment.Right), Category("Appearance"), Description("Indicates alignment of input fields inside of the control.")]
+        public override eHorizontalAlignment InputHorizontalAlignment
+        {
+            get
+            {
+                return base.InputHorizontalAlignment;
+            }
+            set
+            {
+                base.InputHorizontalAlignment = value;
+            }
+        }
+
+        private Control _DropDownControl = null;
+        /// <summary>
+        /// Gets or sets the reference of the control that will be displayed on popup that is shown when drop-down button is clicked.
+        /// </summary>
+        [DefaultValue(null), Description("Indicates reference of the control that will be displayed on popup that is shown when drop-down button is clicked.")]
+        public Control DropDownControl
+        {
+            get { return _DropDownControl; }
+            set
+            {
+                _DropDownControl = value;
+            }
+        }
+
+        protected override PopupItem CreatePopupItem()
+        {
+            ButtonItem button = new ButtonItem("sysPopupProvider");
+            button.PopupFinalized += new EventHandler(DropDownPopupClose);
+            _PopupItem = button;
+            return button;
+        }
+
+        /// <summary>
+        /// Gets the collection of BaseItem derived items displayed on popup menu.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public SubItemsCollection DropDownItems
+        {
+            get { return _PopupItem.SubItems; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether auto-overwrite functionality for input is enabled. When in auto-overwrite mode input field will erase existing entry
+        /// and start new one if typing is continued after InputComplete method is called.
+        /// </summary>
+        [DefaultValue(false), Description("Indicates whether auto-overwrite functionality for input is enabled.")]
+        public bool AutoOverwrite
+        {
+            get { return _InputGroup.AutoOverwrite; }
+            set { _InputGroup.AutoOverwrite = value; }
+        }
+        #endregion
+
+        #region ICommandSource Members
+        protected virtual void ExecuteCommand()
+        {
+            if (_Command == null) return;
+            CommandManager.ExecuteCommand(this);
+        }
+
+        /// <summary>
+        /// Gets or sets the command assigned to the item. Default value is null.
+        /// <remarks>Note that if this property is set to null Enabled property will be set to false automatically to disable the item.</remarks>
+        /// </summary>
+        [DefaultValue(null), Category("Commands"), Description("Indicates the command assigned to the item.")]
+        public Command Command
+        {
+            get { return (Command)((ICommandSource)this).Command; }
+            set
+            {
+                ((ICommandSource)this).Command = value;
+            }
+        }
+
+        private ICommand _Command = null;
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        ICommand ICommandSource.Command
+        {
+            get
+            {
+                return _Command;
+            }
+            set
+            {
+                bool changed = false;
+                if (_Command != value)
+                    changed = true;
+
+                if (_Command != null)
+                    CommandManager.UnRegisterCommandSource(this, _Command);
+                _Command = value;
+                if (value != null)
+                    CommandManager.RegisterCommand(this, value);
+                if (changed)
+                    OnCommandChanged();
+            }
+        }
+
+        /// <summary>
+        /// Called when Command property value changes.
+        /// </summary>
+        protected virtual void OnCommandChanged()
+        {
+        }
+
+        private object _CommandParameter = null;
+        /// <summary>
+        /// Gets or sets user defined data value that can be passed to the command when it is executed.
+        /// </summary>
+        [Browsable(true), DefaultValue(null), Category("Commands"), Description("Indicates user defined data value that can be passed to the command when it is executed."), System.ComponentModel.TypeConverter(typeof(System.ComponentModel.StringConverter)), System.ComponentModel.Localizable(true)]
+        public object CommandParameter
+        {
+            get
+            {
+                return _CommandParameter;
+            }
+            set
+            {
+                _CommandParameter = value;
+            }
+        }
+
+        #endregion
+
+
+        #region Free-Text Entry Support
+        private Keys _FreeTextEntryToggleKey = Keys.None;
+        /// <summary>
+        /// Gets or sets the keyboard key that will toggle FreeTextEntryMode. Default value is Keys.None.
+        /// </summary>
+        [DefaultValue(Keys.None), Category("Free-Text"), Description("")]
+        public Keys FreeTextEntryToggleKey
+        {
+            get { return _FreeTextEntryToggleKey; }
+            set { _FreeTextEntryToggleKey = value; }
+        }
+        protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
+        {
+            if (_FreeTextEntryToggleKey != Keys.None && keyData == _FreeTextEntryToggleKey)
+            {
+                this.FreeTextEntryMode = !this.FreeTextEntryMode;
+                if (this.FreeTextEntryMode && _FreeTextEntryBox != null) _FreeTextEntryBox.Focus();
+                return true;
+            }
+            else if (keyData == Keys.Enter && _ValueChangedTrigger == eTriggerType.LostFocusAndEnterKey && _IsValueChanged)
+            {
+                OnValueChangedDirect(EventArgs.Empty);
+                return true;
+            }
+            return base.ProcessCmdKey(ref msg, keyData);
+        }
+
+        /// <summary>
+        /// Occurs if Free-Text entry value is not natively recognized by the control and provides you with opportunity to convert that value to the
+        /// value control expects.
+        /// </summary>
+        [Description("Occurs if Free-Text entry value is not natively recognized by the control and provides you with opportunity to convert that value to the value control expects."), Category("Free-Text")]
+        public event FreeTextEntryConversionEventHandler ConvertFreeTextEntry;
+        /// <summary>
+        /// Occurs when Free-Text button is clicked and allows you to cancel its default action.
+        /// </summary>
+        public event CancelEventHandler ButtonFreeTextClick;
+
+        private void FreeTextButtonClick(object sender, EventArgs e)
+        {
+            CancelEventArgs cancelArgs = new CancelEventArgs();
+            OnButtonFreeTextClick(cancelArgs);
+            if (cancelArgs.Cancel) return;
+
+            FreeTextEntryMode = !FreeTextEntryMode;
+            _ButtonFreeText.Checked = FreeTextEntryMode;
+            if (FreeTextEntryMode && _FreeTextEntryBox != null && !_FreeTextEntryBox.Focused)
+                _FreeTextEntryBox.Focus();
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="e"></param>
+        protected virtual void OnButtonFreeTextClick(CancelEventArgs e)
+        {
+            CancelEventHandler handler = ButtonFreeTextClick;
+            if (handler != null) handler(this, e);
+        }
+
+        private bool _AutoResolveFreeTextEntries = true;
+        /// <summary>
+        /// Gets or sets whether free text entries are attempted to be auto-resolved to dates like Today to today's date or Now to date and time now etc. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Free-Text"), Description("Indicates whether free text entries are attempted to be auto-resolved to dates like Today to today's date or Now to date and time now etc.")]
+        public bool AutoResolveFreeTextEntries
+        {
+            get { return _AutoResolveFreeTextEntries; }
+            set
+            {
+                _AutoResolveFreeTextEntries = value;
+            }
+        }
+
+        private bool _AutoOffFreeTextEntry = false;
+        /// <summary>
+        /// Gets or sets whether free-text entry is automatically turned off when control loses input focus. Default value is false.
+        /// </summary>
+        [DefaultValue(false), Category("Free-Text"), Description("Indicates whether free-text entry is automatically turned off when control loses input focus.")]
+        public bool AutoOffFreeTextEntry
+        {
+            get { return _AutoOffFreeTextEntry; }
+            set
+            {
+                _AutoOffFreeTextEntry = value;
+            }
+        }
+
+        private bool _FreeTextEntryMode = false;
+        /// <summary>
+        /// Gets or sets whether control input is in free-text input mode. Default value is false.
+        /// </summary>
+        [DefaultValue(false), Category("Free-Text"), Description("Indicates whether control input is in free-text input mode.")]
+        public bool FreeTextEntryMode
+        {
+            get { return _FreeTextEntryMode; }
+            set
+            {
+                _FreeTextEntryMode = value;
+                OnFreeTextEntryModeChanged();
+            }
+        }
+
+        private void OnFreeTextEntryModeChanged()
+        {
+            if (!_FreeTextEntryMode)
+            {
+                if (_FreeTextEntryBox != null)
+                {
+                    _FreeTextEntryBox.ApplyValue -= ApplyFreeTextValue;
+                    _FreeTextEntryBox.RevertValue -= RevertFreeTextValue;
+                    _FreeTextEntryBox.LostFocus -= FreeTextLostFocus;
+                    this.Controls.Remove(_FreeTextEntryBox);
+                    _FreeTextEntryBox.Dispose();
+                    _FreeTextEntryBox = null;
+                }
+            }
+            else
+            {
+                UpdateFreeTextBoxVisibility();
+            }
+            if (_ButtonFreeText != null) _ButtonFreeText.Checked = _FreeTextEntryMode;
+        }
+
+        protected override void OnIsKeyboardFocusWithinChanged()
+        {
+            if (_FreeTextEntryMode)
+            {
+                UpdateFreeTextBoxVisibility();
+                if (this.IsKeyboardFocusWithin)
+                {
+                    Control textBox = GetFreeTextBox();
+                    if (!textBox.Focused)
+                        textBox.Focus();
+                    if (FocusHighlightEnabled)
+                        textBox.BackColor = this.FocusHighlightColor;
+                }
+                else if(FocusHighlightEnabled)
+                {
+                    Control textBox = GetFreeTextBox();
+                    textBox.BackColor = SystemColors.Window;
+                }
+            }
+
+            if (_IsValueChanged && !IsKeyboardFocusWithin)
+                OnValueChangedDirect(EventArgs.Empty);
+            base.OnIsKeyboardFocusWithinChanged();
+        }
+
+        private void UpdateFreeTextBoxVisibility()
+        {
+            FreeTextEntryBox textBox = (FreeTextEntryBox)GetFreeTextBox();
+            if (this.IsKeyboardFocusWithin)
+            {
+                textBox.Visible = true;
+                textBox.Text = this.Text;
+                RootVisualItem.InvalidateArrange();
+                this.Invalidate();
+            }
+            else
+            {
+                if (textBox.Visible)
+                {
+                    if (textBox.Focused)
+                        textBox.HideOnLostFocus();
+                    else
+                        textBox.Visible = false;
+                    RootVisualItem.InvalidateArrange();
+                    this.Invalidate();
+                }
+            }
+        }
+
+        protected override bool SupportsFreeTextEntry
+        {
+            get
+            {
+                return true;
+            }
+        }
+
+        internal FreeTextEntryBox _FreeTextEntryBox = null;
+        protected override Control GetFreeTextBox()
+        {
+            if (_FreeTextEntryBox == null)
+            {
+                _FreeTextEntryBox = new FreeTextEntryBox();
+                _FreeTextEntryBox.ApplyValue += ApplyFreeTextValue;
+                _FreeTextEntryBox.RevertValue += RevertFreeTextValue;
+                _FreeTextEntryBox.LostFocus += FreeTextLostFocus;
+                _FreeTextEntryBox.IncreaseValue += FreeTextIncreaseValue;
+                _FreeTextEntryBox.DecreaseValue += new EventHandler(FreeTextDecreaseValue);
+                _FreeTextEntryBox.BorderStyle = BorderStyle.None;
+                _FreeTextEntryBox.ReadOnly = !this.LockUpdateChecked || IsInputReadOnly;
+                if (this.InputHorizontalAlignment == eHorizontalAlignment.Right)
+                    _FreeTextEntryBox.TextAlign = HorizontalAlignment.Right;
+                else if (this.InputHorizontalAlignment == eHorizontalAlignment.Center)
+                    _FreeTextEntryBox.TextAlign = HorizontalAlignment.Center;
+                else if (this.InputHorizontalAlignment == eHorizontalAlignment.Left)
+                    _FreeTextEntryBox.TextAlign = HorizontalAlignment.Left;
+
+                this.Controls.Add(_FreeTextEntryBox);
+            }
+
+            return _FreeTextEntryBox;
+        }
+
+        void FreeTextDecreaseValue(object sender, EventArgs e)
+        {
+            ApplyFreeTextValue();
+            DecreaseValue();
+        }
+
+        void FreeTextIncreaseValue(object sender, EventArgs e)
+        {
+            ApplyFreeTextValue();
+            IncreaseValue();
+        }
+
+        private void RevertFreeTextValue(object sender, EventArgs e)
+        {
+            if (_FreeTextEntryBox != null) _FreeTextEntryBox.Text = this.Text;
+        }
+
+        protected virtual void OnConvertFreeTextEntry(FreeTextEntryConversionEventArgs e)
+        {
+            FreeTextEntryConversionEventHandler handler = this.ConvertFreeTextEntry;
+            if (handler != null) handler(this, e);
+        }
+
+        private void ApplyFreeTextValue(object sender, EventArgs e)
+        {
+            ApplyFreeTextValue();
+        }
+
+        protected virtual void ApplyFreeTextValue()
+        {
+            
+        }
+
+        private void FreeTextLostFocus(object sender, EventArgs e)
+        {
+            if (_AutoOffFreeTextEntry && !this.IsKeyboardFocusWithin)
+                this.FreeTextEntryMode = false;
+        }
+
+        protected override void HideFreeTextBoxEntry()
+        {
+            if (_FreeTextEntryBox != null) _FreeTextEntryBox.Visible = false;
+        }
+
+        protected override bool IsFreeTextEntryVisible
+        {
+            get
+            {
+                return _FreeTextEntryMode && this.IsKeyboardFocusWithin;
+            }
+        }
+        #endregion
+    }
+
+    /// <summary>
+    /// Specifies trigger types for the value changed events on editor controls.
+    /// </summary>
+    public enum eTriggerType
+    {
+        /// <summary>
+        /// ValueChanged event is fired as soon as user types in the value.
+        /// </summary>
+        Immediate,
+        /// <summary>
+        /// ValueChanged event is fired after control loses input focus.
+        /// </summary>
+        LostFocus,
+        /// <summary>
+        /// ValueChanged event is fired after control loses input focus or user presses the Enter key.
+        /// </summary>
+        LostFocusAndEnterKey
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/Editors/PaintInfo.cs b/PROMS/DotNetBar Source Code/Editors/PaintInfo.cs
new file mode 100644
index 00000000..ccf12145
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Editors/PaintInfo.cs	
@@ -0,0 +1,119 @@
+#if FRAMEWORK20
+using System;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.Editors
+{
+    public class PaintInfo
+    {
+        private Graphics _Graphics;
+        public Graphics Graphics
+        {
+            get { return _Graphics; }
+            set { _Graphics = value; }
+        }
+
+        private Point _RenderOffset;
+        public Point RenderOffset
+        {
+            get { return _RenderOffset; }
+            set { _RenderOffset = value; }
+        }
+
+        private Font _DefaultFont = null;
+        public Font DefaultFont
+        {
+            get { return _DefaultFont; }
+            set { _DefaultFont = value; }
+        }
+
+        private Color _ForeColor = SystemColors.ControlText;
+        public Color ForeColor
+        {
+            get { return _ForeColor; }
+            set { _ForeColor = value; }
+        }
+
+        private Color _DisabledForeColor = SystemColors.ControlDark;
+        public Color DisabledForeColor
+        {
+            get { return _DisabledForeColor; }
+            set { _DisabledForeColor = value; }
+        }
+
+        private bool _WatermarkEnabled = false;
+        public bool WatermarkEnabled
+        {
+            get { return _WatermarkEnabled; }
+            set { _WatermarkEnabled = value; }
+        }
+
+        private Font _WatermarkFont = null;
+        public Font WatermarkFont
+        {
+            get { return _WatermarkFont; }
+            set { _WatermarkFont = value; }
+        }
+
+        private Color _WatermarkColor = Color.Empty;
+        public Color WatermarkColor
+        {
+            get { return _WatermarkColor; }
+            set { _WatermarkColor = value; }
+        }
+
+        private Size _AvailableSize;
+        /// <summary>
+        /// Gets or sets the size available for the item currently being arranged.
+        /// </summary>
+        public Size AvailableSize
+        {
+            get { return _AvailableSize; }
+            set { _AvailableSize = value; }
+        }
+
+        private bool _ParentEnabled = true;
+        public bool ParentEnabled
+        {
+            get { return _ParentEnabled; }
+            set
+            {
+                _ParentEnabled = value;
+            }
+        }
+
+        private bool _MouseOver = false;
+        /// <summary>
+        /// Gets or sets whether mouse is over the host control.
+        /// </summary>
+        public bool MouseOver
+        {
+            get { return _MouseOver; }
+            set { _MouseOver = value; }
+        }
+
+        private InputControlColors _Colors;
+        /// <summary>
+        /// Gets or sets system colors used by the control.
+        /// </summary>
+        public InputControlColors Colors
+        {
+            get { return _Colors; }
+            set { _Colors = value; }
+        }
+
+        private bool _RenderSystemItemsOnly = false;
+        public bool RenderSystemItemsOnly
+        {
+            get { return _RenderSystemItemsOnly; }
+            set
+            {
+                _RenderSystemItemsOnly = value;
+            }
+        }
+        
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/Editors/ParseDoubleValueEventArgs.cs b/PROMS/DotNetBar Source Code/Editors/ParseDoubleValueEventArgs.cs
new file mode 100644
index 00000000..bc2d40f7
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Editors/ParseDoubleValueEventArgs.cs	
@@ -0,0 +1,55 @@
+using System;
+using System.Text;
+
+namespace DevComponents.Editors
+{
+    /// <summary>
+    /// Defines data for the ParseValue event that allows you to provide custom parsing for values set to ValueObject property.
+    /// </summary>
+    public class ParseDoubleValueEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Get the value that was set to the ValueObject property and which should be converted to ParsedValue DateTime.
+        /// </summary>
+        public readonly object ValueObject = null;
+
+        /// <summary>
+        /// Gets or sets whether you have provided ParsedValue.
+        /// </summary>
+        public bool IsParsed = false;
+
+        /// <summary>
+        /// Initializes a new instance of the ParseDateTimeValueEventArgs class.
+        /// </summary>
+        /// <param name="valueObject">Indicates the value object.</param>
+        public ParseDoubleValueEventArgs(object valueObject)
+        {
+            ValueObject = valueObject;
+        }
+
+        private double _ParsedValue = 0;
+
+        /// <summary>
+        /// /// <summary>
+        /// Gets or sets the parsed value from ValueObject property.
+        /// </summary>
+        /// </summary>
+        public double ParsedValue
+        {
+            get { return _ParsedValue; }
+            set
+            {
+                _ParsedValue = value;
+                IsParsed = true;
+            }
+        }
+    }
+
+    /// <summary>
+    /// Defines delegate for ParseValue event.
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    public delegate void ParseDoubleValueEventHandler(object sender, ParseDoubleValueEventArgs e);
+}
+
diff --git a/PROMS/DotNetBar Source Code/Editors/ParseIntegerValueEventArgs.cs b/PROMS/DotNetBar Source Code/Editors/ParseIntegerValueEventArgs.cs
new file mode 100644
index 00000000..7b861a3f
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Editors/ParseIntegerValueEventArgs.cs	
@@ -0,0 +1,54 @@
+using System;
+using System.Text;
+
+namespace DevComponents.Editors
+{
+    /// <summary>
+    /// Defines data for the ParseValue event that allows you to provide custom parsing for values set to ValueObject property.
+    /// </summary>
+    public class ParseIntegerValueEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Get the value that was set to the ValueObject property and which should be converted to ParsedValue DateTime.
+        /// </summary>
+        public readonly object ValueObject = null;
+
+        /// <summary>
+        /// Gets or sets whether you have provided ParsedValue.
+        /// </summary>
+        public bool IsParsed = false;
+
+        /// <summary>
+        /// Initializes a new instance of the ParseDateTimeValueEventArgs class.
+        /// </summary>
+        /// <param name="valueObject">Indicates the value object.</param>
+        public ParseIntegerValueEventArgs(object valueObject)
+        {
+            ValueObject = valueObject;
+        }
+
+        private int _ParsedValue = 0;
+
+        /// <summary>
+        /// /// <summary>
+        /// Gets or sets the parsed value from ValueObject property.
+        /// </summary>
+        /// </summary>
+        public int ParsedValue
+        {
+            get { return _ParsedValue; }
+            set
+            {
+                _ParsedValue = value;
+                IsParsed = true;
+            }
+        }
+    }
+
+    /// <summary>
+    /// Defines delegate for ParseValue event.
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    public delegate void ParseIntegerValueEventHandler(object sender, ParseIntegerValueEventArgs e);
+}
diff --git a/PROMS/DotNetBar Source Code/Editors/Primitives/StartsWithPredicate.cs b/PROMS/DotNetBar Source Code/Editors/Primitives/StartsWithPredicate.cs
new file mode 100644
index 00000000..0b85db6b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Editors/Primitives/StartsWithPredicate.cs	
@@ -0,0 +1,77 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace DevComponents.Editors.Primitives
+{
+    internal class StartsWithPredicate
+    {
+        private string _Prefix;
+        private int _MaxMatches = 0;
+        private int _MatchCount = 0;
+
+        // Initializes with prefix we want to match.
+        public StartsWithPredicate(string prefix)
+        {
+            _Prefix = prefix;
+        }
+
+        // Initializes with prefix we want to match.
+        public StartsWithPredicate(string prefix, int maxMatches)
+        {
+            _Prefix = prefix;
+            _MaxMatches = maxMatches;
+        }
+
+        // Sets a different prefix to match.
+        public string Prefix
+        {
+            get { return _Prefix; }
+            set { _Prefix = value; }
+        }
+
+        public void ResetMatchCount()
+        {
+            _MatchCount = 0;
+        }
+
+        public int MaxMatches
+        {
+            get { return _MaxMatches; }
+            set
+            {
+                _MaxMatches = value;
+            }
+        }
+
+        // Gets the predicate.
+        public Predicate<string> Match
+        {
+            get { return IsMatch; }
+        }
+
+        private bool IsMatch(string s)
+        {
+            return s.ToLower().StartsWith(_Prefix);
+        }
+
+        public Predicate<string> MatchTop
+        {
+            get
+            {
+                return IsMatchTop;
+            }
+        }
+
+        private bool IsMatchTop(string s)
+        {
+            if (_MatchCount > _MaxMatches) return false;
+            bool b = s.ToLower().StartsWith(_Prefix);
+            if (b && _MaxMatches > 0) _MatchCount++;
+            return b;
+        }
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/Editors/SystemOptions.cs b/PROMS/DotNetBar Source Code/Editors/SystemOptions.cs
new file mode 100644
index 00000000..27b620f9
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Editors/SystemOptions.cs	
@@ -0,0 +1,24 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace DevComponents.Editors
+{
+    public class SystemOptions
+    {
+        internal static System.Windows.Forms.ControlStyles DoubleBufferFlag
+        {
+            get
+            {
+#if FRAMEWORK20
+                return System.Windows.Forms.ControlStyles.OptimizedDoubleBuffer;
+#else
+                    return System.Windows.Forms.ControlStyles.DoubleBuffer;
+#endif
+            }
+        }
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/Editors/VisualButton.cs b/PROMS/DotNetBar Source Code/Editors/VisualButton.cs
new file mode 100644
index 00000000..caf6af88
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Editors/VisualButton.cs	
@@ -0,0 +1,368 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+using System.ComponentModel;
+using System.Collections;
+using DevComponents.DotNetBar;
+using DevComponents.DotNetBar.Rendering;
+
+namespace DevComponents.Editors
+{
+    public class VisualButton : VisualButtonBase
+    {
+        #region Private Variables
+
+        #endregion
+
+        #region Events
+        #endregion
+
+        #region Constructor
+        #endregion
+
+        #region Internal Implementation
+        public override void PerformLayout(PaintInfo pi)
+        {
+            Size size = new Size(0, (_Height > 0 ? Dpi.Height(_Height) : pi.AvailableSize.Height));
+            Graphics g = pi.Graphics;
+
+            size.Width += Dpi.Width6; // Border 2 pixels on each side and 1 pixels of padding between border and content
+
+            if (_Text.Length > 0)
+            {
+                Size textSize = TextDrawing.MeasureString(g, _Text, pi.DefaultFont);
+                size.Width += textSize.Width;
+                if (_Image != null)
+                    size.Width += Dpi.Width4; // Padding between text and image
+            }
+
+            if (!string.IsNullOrEmpty(_SymbolRealized))
+            {
+                size.Width += size.Height;
+            }
+            else if (_Image != null)
+            {
+                size.Width += Dpi.Width(_Image.Width);
+            }
+
+            if (_Text.Length == 0 && _Image == null && string.IsNullOrEmpty(_SymbolRealized))
+                size.Width += Dpi.Width9;
+
+            this.Size = size;
+            this.CalculatedSize = size;
+            base.PerformLayout(pi);
+        }
+
+        private int _Height = 0;
+        /// <summary>
+        /// Gets or sets the fixed button height.
+        /// </summary>
+        public int Height
+        {
+            get { return _Height; }
+            set { _Height = value; }
+        }
+
+        protected override void OnPaint(PaintInfo p)
+        {
+            Graphics g = p.Graphics;
+            Rectangle r = this.RenderBounds;
+            PaintButtonBackground(p);
+
+            Rectangle contentRect = r;
+            contentRect.Inflate(-3, -3); // Two pixels border + 1 pixels padding for content
+            if (!string.IsNullOrEmpty(_Text))
+            {
+                TextDrawing.DrawString(g, _Text, p.DefaultFont, GetIsEnabled(p) ? p.ForeColor : p.DisabledForeColor, contentRect, eTextFormat.Default | eTextFormat.VerticalCenter);
+            }
+
+            if (!string.IsNullOrEmpty(_SymbolRealized))
+            {
+                Office2007ButtonItemStateColorTable ct = GetOffice2007StateColorTable(p);
+                Color symbolColor=(GetIsEnabled(p) ? p.ForeColor : p.DisabledForeColor);
+                if (!_SymbolColor.IsEmpty)
+                    symbolColor = _SymbolColor;
+                else if (!ct.Text.IsEmpty)
+                    symbolColor = ct.Text;
+                float symbolSize = Math.Max(1, Math.Min(r.Width, r.Height) * 72 / g.DpiX - 1.5f);
+                Rectangle sr = contentRect;
+                if (!string.IsNullOrEmpty(_Text))
+                    sr = new Rectangle(contentRect.Right - contentRect.Height, contentRect.Y, contentRect.Height, contentRect.Height);
+                sr.Inflate(3, 3);
+                TextDrawing.DrawStringLegacy(g, _SymbolRealized, Symbols.GetFont(symbolSize, _SymbolSet),
+                    symbolColor, sr, eTextFormat.HorizontalCenter | eTextFormat.VerticalCenter);
+            }
+            else if (_Image != null)
+            {
+                Image image = GetIsEnabled(p) ? _Image : GetDisabledImage();
+                Size imageSize = Dpi.ImageSize(image.Size);
+                g.DrawImage(image, new Rectangle(contentRect.Right - (imageSize.Width + (string.IsNullOrEmpty(_Text)?(contentRect.Width - imageSize.Width) / 2:0)), 
+                    contentRect.Y + (contentRect.Height - imageSize.Height) / 2, imageSize.Width, imageSize.Height));
+            }
+
+            base.OnPaint(p);
+        }
+
+        protected virtual void PaintButtonBackground(PaintInfo p)
+        {
+            PaintButtonBackground(p, GetOffice2007StateColorTable(p));
+        }
+
+        protected virtual void PaintButtonBackground(PaintInfo p, Office2007ButtonItemStateColorTable ct)
+        {
+            Graphics g = p.Graphics;
+            Rectangle r = this.RenderBounds;
+            if (RenderBackground(p))
+                Office2007ButtonItemPainter.PaintBackground(g, ct, r, RoundRectangleShapeDescriptor.RectangleShape);
+        }
+
+        private bool RenderBackground(PaintInfo p)
+        {
+            if (RenderDefaultBackground) return true;
+
+            if (!p.MouseOver && !this.IsMouseDown && !this.IsMouseOver && !this.Checked || !this.GetIsEnabled())
+                return false;
+
+            return true;
+        }
+
+        protected Office2007ButtonItemStateColorTable GetOffice2007StateColorTable(PaintInfo p)
+        {
+            if (GlobalManager.Renderer is Office2007Renderer)
+            {
+                Office2007ColorTable ct = ((Office2007Renderer)GlobalManager.Renderer).ColorTable;
+                Office2007ButtonItemColorTable buttonColorTable = ct.ButtonItemColors[Enum.GetName(typeof(eButtonColor), eButtonColor.OrangeWithBackground)];
+                if (!this.GetIsEnabled(p))
+                    return buttonColorTable.Disabled;
+                else if (this.IsMouseDown)
+                    return buttonColorTable.Pressed;
+                else if (this.IsMouseOver)
+                    return buttonColorTable.MouseOver;
+                else if (this.Checked)
+                    return buttonColorTable.Checked;
+                else
+                    return buttonColorTable.Default;
+            }
+
+            return null;
+        }
+
+        protected override void OnMouseEnter()
+        {
+            if (this.GetIsEnabled())
+                this.IsMouseOver = true;
+            base.OnMouseEnter();
+        }
+
+        protected override void OnMouseLeave()
+        {
+            this.IsMouseOver = false;
+            base.OnMouseLeave();
+        }
+
+        protected override void OnMouseDown(System.Windows.Forms.MouseEventArgs e)
+        {
+            if (e.Button == System.Windows.Forms.MouseButtons.Left)
+            {
+                this.IsMouseDown = true;
+            }
+            base.OnMouseDown(e);
+        }
+
+        protected override void OnMouseUp(System.Windows.Forms.MouseEventArgs e)
+        {
+            if (e.Button == System.Windows.Forms.MouseButtons.Left)
+                this.IsMouseDown = false;
+            base.OnMouseUp(e);
+        }
+
+        private bool _IsMouseOver = false;
+        /// <summary>
+        /// Gets whether mouse is over the control.
+        /// </summary>
+        public bool IsMouseOver
+        {
+            get { return _IsMouseOver; }
+            internal set
+            {
+                if (_IsMouseOver != value)
+                {
+                    _IsMouseOver = value;
+                    this.InvalidateRender();
+                }
+            }
+        }
+
+        private bool _IsMouseDown = false;
+        /// <summary>
+        /// Gets whether mouse is pressed on the control.
+        /// </summary>
+        public bool IsMouseDown
+        {
+            get { return _IsMouseDown; }
+            internal set
+            {
+                if (_IsMouseDown != value)
+                {
+                    _IsMouseDown = value;
+                    this.InvalidateRender();
+                }
+            }
+        }
+
+        private bool _Checked;
+        public bool Checked
+        {
+            get { return _Checked; }
+            set
+            {
+                if (_Checked != value)
+                {
+                    _Checked = value;
+                    this.InvalidateRender();
+                }
+            }
+        }
+
+
+        private string _Text = "";
+        /// <summary>
+        /// Gets or sets the text displayed on the face of the button.
+        /// </summary>
+        [DefaultValue("")]
+        public string Text
+        {
+            get { return _Text; }
+            set
+            {
+                if (value == null) value = "";
+                if (_Text != value)
+                {
+                    _Text = value;
+                    this.InvalidateArrange();
+                }
+            }
+        }
+
+        private Image GetDisabledImage()
+        {
+            if (_DisabledImage == null && _Image != null)
+            {
+                _DisabledImage = ImageHelper.CreateGrayScaleImage(_Image as Bitmap);
+            }
+
+            return _DisabledImage;
+        }
+
+        private Image _DisabledImage = null;
+        private Image _Image = null;
+        /// <summary>
+        /// Gets or sets the image displayed on the face of the button.
+        /// </summary>
+        [DefaultValue(null)]
+        public Image Image
+        {
+            get { return _Image; }
+            set
+            {
+                if (_Image != value)
+                {
+                    _Image = value;
+                    if (_DisabledImage != null)
+                    {
+                        _DisabledImage.Dispose();
+                        _DisabledImage = null;
+                    }
+                    this.InvalidateArrange();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets the realized symbol string.
+        /// </summary>
+        [Browsable(false)]
+        public string SymbolRealized
+        {
+            get { return _SymbolRealized; }
+        }
+        private string _Symbol = "", _SymbolRealized = "";
+        /// <summary>
+        /// Indicates the symbol displayed on face of the button instead of the image. Setting the symbol overrides the image setting.
+        /// </summary>
+        [DefaultValue(""), Category("Appearance"), Description("Indicates the symbol displayed on face of the button instead of the image. Setting the symbol overrides the image setting.")]
+        [Editor("DevComponents.DotNetBar.Design.SymbolTypeEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor))]
+        public string Symbol
+        {
+            get { return _Symbol; }
+            set
+            {
+                if (value != _Symbol)
+                {
+                    string oldValue = _Symbol;
+                    _Symbol = value;
+                    OnSymbolChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when Symbol property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnSymbolChanged(string oldValue, string newValue)
+        {
+            if (string.IsNullOrEmpty(newValue))
+                _SymbolRealized = "";
+            else
+                _SymbolRealized = Symbols.GetSymbol(newValue);
+            //OnPropertyChanged(new PropertyChangedEventArgs("Symbol"));
+            this.InvalidateArrange();
+        }
+
+        private eSymbolSet _SymbolSet = eSymbolSet.Awesome;
+        /// <summary>
+        /// Gets or sets the symbol set used to represent the Symbol.
+        /// </summary>
+        [Browsable(false), DefaultValue(eSymbolSet.Awesome)]
+        public eSymbolSet SymbolSet
+        {
+            get { return _SymbolSet; }
+            set
+            {
+                if (_SymbolSet != value)
+                {
+                    eSymbolSet oldValue = _SymbolSet;
+                    _SymbolSet = value;
+                    OnSymbolSetChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when SymbolSet property value changes.
+        /// </summary>
+        /// <param name="oldValue">Indciates old value</param>
+        /// <param name="newValue">Indicates new value</param>
+        protected virtual void OnSymbolSetChanged(eSymbolSet oldValue, eSymbolSet newValue)
+        {
+            this.InvalidateArrange();
+        }
+
+        private Color _SymbolColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets the color of the Symbol.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates color of the Symbol.")]
+        public Color SymbolColor
+        {
+            get { return _SymbolColor; }
+            set { _SymbolColor = value; this.InvalidateRender(); }
+        }
+        #endregion
+
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/Editors/VisualButtonBase.cs b/PROMS/DotNetBar Source Code/Editors/VisualButtonBase.cs
new file mode 100644
index 00000000..656d1012
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Editors/VisualButtonBase.cs	
@@ -0,0 +1,201 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows.Forms;
+using System.ComponentModel;
+
+namespace DevComponents.Editors
+{
+    public class VisualButtonBase : VisualItem
+    {
+        #region Private Variables
+        #endregion
+
+        #region Events
+
+        #endregion
+
+        #region Constructor
+        #endregion
+
+        #region Internal Implementation
+        private bool _ClickAutoRepeat = false;
+        /// <summary>
+        /// Gets or sets whether button automatically gets Click events repeated when mouse is kept pressed on the button. Default value is false.
+        /// </summary>
+        [DefaultValue(false)]
+        public bool ClickAutoRepeat
+        {
+            get { return _ClickAutoRepeat; }
+            set
+            {
+                _ClickAutoRepeat = value;
+            }
+        }
+
+        private Timer _ClickTimer = null;
+        protected override void OnMouseDown(MouseEventArgs e)
+        {
+            if (e.Button == MouseButtons.Left && this.GetIsEnabled() && _ClickAutoRepeat)
+            {
+                if (_ClickTimer == null)
+                    _ClickTimer = new Timer();
+                _ClickTimer.Interval = ClickRepeatInterval;
+                _ClickTimer.Tick += new EventHandler(this.ClickTimerTick);
+                _ClickTimer.Start();
+            }
+            base.OnMouseDown(e);
+        }
+
+        protected override void OnMouseUp(MouseEventArgs e)
+        {
+            DisposeAutoClickTimer();
+            base.OnMouseUp(e);
+        }
+
+        protected override void OnMouseLeave()
+        {
+            HideTooltip();
+            DisposeAutoClickTimer();
+            base.OnMouseLeave();
+        }
+
+        private void DisposeAutoClickTimer()
+        {
+            if (_ClickTimer != null)
+            {
+                Timer t = _ClickTimer;
+                _ClickTimer = null;
+                t.Stop();
+                t.Tick -= new EventHandler(this.ClickTimerTick);
+                t.Dispose();
+            }
+        }
+        private void ClickTimerTick(object sender, EventArgs e)
+        {
+            this.ProcessClick();
+            this.OnClickAutoRepeat();
+        }
+
+        protected virtual void OnClickAutoRepeat()
+        {
+
+        }
+
+        private int _ClickRepeatInterval = 300;
+        /// <summary>
+        /// Gets or sets the auto-repeat interval for the click event when mouse button is kept pressed over the item.
+        /// </summary>
+        [Browsable(true), DefaultValue(300), Category("Behavior"), Description("Gets or sets the auto-repeat interval for the click event when mouse button is kept pressed over the item.")]
+        public virtual int ClickRepeatInterval
+        {
+            get
+            {
+                return _ClickRepeatInterval;
+            }
+            set
+            {
+                _ClickRepeatInterval = value;
+            }
+        }
+
+        private bool _RenderDefaultBackground = true;
+        /// <summary>
+        /// Gets or sets whether default button background is rendered when mouse is not over the host control. Default value is true.
+        /// </summary>
+        public bool RenderDefaultBackground
+        {
+            get { return _RenderDefaultBackground; }
+            set
+            {
+                if (_RenderDefaultBackground != value)
+                {
+                    _RenderDefaultBackground = value;
+                    this.InvalidateRender();
+                }
+            }
+        }
+
+        private DevComponents.DotNetBar.eShortcut _Shortcut = DevComponents.DotNetBar.eShortcut.None;
+        /// <summary>
+        /// Gets or sets the shortcut key which when pressed triggers button click event or its default function.
+        /// </summary>
+        [DefaultValue(DevComponents.DotNetBar.eShortcut.None), Description("Indicates shortcut key which when pressed triggers button click event or its default function.")]
+        public DevComponents.DotNetBar.eShortcut Shortcut
+        {
+            get { return _Shortcut; }
+            set
+            {
+                _Shortcut = value;
+            }
+        }
+
+        protected override bool OnCmdKey(ref Message msg, Keys keyData)
+        {
+            if (_Shortcut != DevComponents.DotNetBar.eShortcut.None)
+            {
+                if (keyData == (Keys)_Shortcut)
+                {
+                    OnClick(new KeyEventArgs(keyData));
+                    return true;
+                }
+            }
+            return base.OnCmdKey(ref msg, keyData);
+        }
+
+        private string _Tooltip = "";
+        /// <summary>
+        /// Gets or sets the button tooltip.
+        /// </summary>
+        public string Tooltip
+        {
+            get { return _Tooltip; }
+            set
+            {
+                _Tooltip = value;
+            }
+        }
+
+        private DevComponents.DotNetBar.ToolTip _TooltipWnd = null;
+        protected override void OnMouseHover(EventArgs e)
+        {
+            ShowTooltip();
+            base.OnMouseHover(e);
+        }
+
+
+        private void ShowTooltip()
+        {
+            if (!string.IsNullOrEmpty(_Tooltip))
+            {
+                if (_TooltipWnd == null)
+                    _TooltipWnd = new DevComponents.DotNetBar.ToolTip();
+                _TooltipWnd.Style = DevComponents.DotNetBar.StyleManager.GetEffectiveStyle();
+                _TooltipWnd.Text = _Tooltip;
+                _TooltipWnd.ShowToolTip();
+            }
+        }
+        private void HideTooltip()
+        {
+            if (_TooltipWnd != null)
+            {
+                try
+                {
+                    if (_TooltipWnd != null)
+                    {
+                        _TooltipWnd.Hide();
+                        _TooltipWnd.Dispose();
+                        _TooltipWnd = null;
+                        ResetHover();
+                    }
+                }
+                catch { }
+            }
+        }
+        #endregion
+
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/Editors/VisualCheckBox.cs b/PROMS/DotNetBar Source Code/Editors/VisualCheckBox.cs
new file mode 100644
index 00000000..c0599b78
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Editors/VisualCheckBox.cs	
@@ -0,0 +1,77 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+using DevComponents.DotNetBar.Rendering;
+using System.Windows.Forms;
+using DevComponents.DotNetBar;
+
+namespace DevComponents.Editors
+{
+    public class VisualCheckBox : VisualToggleButton
+    {
+        #region Private Variables
+        private Size _DefaultSize = new Size(13, 13);
+        #endregion
+
+        #region Events
+        #endregion
+
+        #region Constructor
+        #endregion
+
+        #region Internal Implementation
+        public override void PerformLayout(PaintInfo pi)
+        {
+            this.Size = new System.Drawing.Size(Dpi.Width(_DefaultSize.Width + 2), Dpi.Height(_DefaultSize.Height));
+            this.CalculatedSize = this.Size;
+            base.PerformLayout(pi);
+        }
+
+        protected override void OnPaint(PaintInfo p)
+        {
+            Graphics g = p.Graphics;
+            Size defaultSize = Dpi.Size(_DefaultSize);
+            Rectangle r = new Rectangle(RenderBounds.X + 1, RenderBounds.Y + (RenderBounds.Height - defaultSize.Height) / 2,
+                defaultSize.Width, defaultSize.Height);
+
+
+            Office2007CheckBoxItemPainter painter = PainterFactory.CreateCheckBoxItemPainter(null);
+            Office2007CheckBoxColorTable ctt = GetCheckBoxColorTable();
+            Office2007CheckBoxStateColorTable ct = ctt.Default;
+            if (!this.GetIsEnabled(p))
+                ct = ctt.Disabled;
+            else if (this.IsMouseDown)
+                ct = ctt.Pressed;
+            else if (this.IsMouseOver)
+                ct = ctt.MouseOver;
+
+            painter.PaintCheckBox(g, r,
+                ct, this.Checked ? CheckState.Checked : CheckState.Unchecked);
+
+            base.OnPaint(p);
+        }
+
+        private Office2007CheckBoxColorTable GetCheckBoxColorTable()
+        {
+            Office2007Renderer r = this.GetRenderer() as Office2007Renderer;
+            if (r != null)
+            {
+                return r.ColorTable.CheckBoxItem;
+            }
+
+            return null;
+        }
+
+        private DevComponents.DotNetBar.Rendering.BaseRenderer GetRenderer()
+        {
+            return DevComponents.DotNetBar.Rendering.GlobalManager.Renderer;
+
+        }
+        #endregion
+
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/Editors/VisualControlBase.cs b/PROMS/DotNetBar Source Code/Editors/VisualControlBase.cs
new file mode 100644
index 00000000..e1f7c052
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Editors/VisualControlBase.cs	
@@ -0,0 +1,1458 @@
+#if FRAMEWORK20
+using System;
+using System.Text;
+using System.Windows.Forms;
+using System.ComponentModel;
+using System.Drawing;
+using System.Collections;
+using DevComponents.DotNetBar;
+using DevComponents.DotNetBar.Rendering;
+
+namespace DevComponents.Editors
+{
+    [ToolboxItem(false)]
+    public class VisualControlBase : PopupItemControl, IInputButtonControl, ISupportInitialize
+    {
+        #region Private Variables
+        private VisualItem _RootVisual = null;
+        private bool _FocusHighlightEnabled = false;
+        private Color _LastBackColor = Color.Empty;
+        private static Color _DefaultHighlightColor = Color.FromArgb(0xFF, 0xFF, 0x88);
+        private Color _FocusHighlightColor = _DefaultHighlightColor;
+        private bool _MouseOver = false;
+        #endregion
+
+        #region Events
+        /// <summary>
+        /// Occurs when ButtonCustom control is clicked.
+        /// </summary>
+        public event EventHandler ButtonCustomClick;
+
+        /// <summary>
+        /// Occurs when ButtonCustom2 control is clicked.
+        /// </summary>
+        public event EventHandler ButtonCustom2Click;
+        #endregion
+
+        #region Constructor
+        /// <summary>
+        /// Creates new instance of the class.
+        /// </summary>
+        public VisualControlBase()
+        {
+            this.SetStyle(ControlStyles.UserPaint, true);
+            this.SetStyle(ControlStyles.AllPaintingInWmPaint, true);
+            this.SetStyle(ControlStyles.Opaque, true);
+            this.SetStyle(ControlStyles.ResizeRedraw, true);
+            this.SetStyle(SystemOptions.DoubleBufferFlag, true);
+            this.SetStyle(ControlStyles.SupportsTransparentBackColor, true);
+            this.SetStyle(ControlStyles.Selectable, true);
+
+            this.IsAccessible = true;
+
+            _Colors = new InputControlColors();
+            _Colors.ColorChanged += new EventHandler(ColorsColorChanged);
+
+            _ButtonCustom = new InputButtonSettings(this);
+            _ButtonCustom2 = new InputButtonSettings(this);
+            _RootVisual = CreateRootVisual();
+            _RootVisual.ArrangeInvalid += new EventHandler(VisualArrangeInvalid);
+            _RootVisual.RenderInvalid += new EventHandler(VisualRenderInvalid);
+            _RootVisual.ResetMouseHover += VisualResetMouseHover;
+
+            _BackgroundStyle.Class = ElementStyleClassKeys.DateTimeInputBackgroundKey;
+            _BackgroundStyle.SetColorScheme(this.ColorScheme);
+            _BackgroundStyle.StyleChanged += new EventHandler(this.VisualPropertyChanged);
+
+            ApplyFieldNavigation();
+        }
+        #endregion
+
+        #region Internal Implementation
+
+        private void VisualResetMouseHover(object sender, EventArgs e)
+        {
+            DevComponents.AdvTree.Interop.WinApi.ResetHover(this);
+        }
+        /// <summary>
+        /// Resets the input position so the new input overwrites current value.
+        /// </summary>
+        public void ResetInputPosition()
+        {
+            if (_RootVisual is VisualInputBase)
+                ((VisualInputBase)_RootVisual).ResetInputPosition();
+            else if (_RootVisual is VisualInputGroup)
+                ((VisualInputGroup)_RootVisual).ResetInputPosition();
+        }
+
+        private void ColorsColorChanged(object sender, EventArgs e)
+        {
+            this.Invalidate();
+        }
+
+        protected virtual PaintInfo CreatePaintInfo(PaintEventArgs e)
+        {
+            PaintInfo p = new PaintInfo();
+            p.Graphics = e.Graphics;
+            p.DefaultFont = this.Font;
+            p.ForeColor = this.ForeColor;
+            p.RenderOffset = new System.Drawing.Point();
+            p.WatermarkColor = _WatermarkColor;
+            p.WatermarkEnabled = _WatermarkEnabled;
+            p.WatermarkFont = _WatermarkFont;
+            p.AvailableSize = this.ClientRectangle.Size;
+            p.ParentEnabled = this.Enabled;
+            p.MouseOver = _MouseOver || this.Focused;
+            p.Colors = _Colors;
+            if (!_DisabledForeColor.IsEmpty) p.DisabledForeColor = _DisabledForeColor;
+            return p;
+        }
+
+        private bool _RenderControlButtons = true;
+        /// <summary>
+        /// Gets or sets whether control system buttons are rendered. Default value is true.
+        /// </summary>
+        internal bool RenderControlButtons
+        {
+            get { return _RenderControlButtons; }
+            set
+            {
+                _RenderControlButtons = value;
+                OnRenderControlButtonsChanged();
+
+            }
+        }
+        private void OnRenderControlButtonsChanged()
+        {
+            // Update IsRendered on system items.
+            if (_RootVisual is VisualGroup)
+            {
+                VisualGroup group = (VisualGroup)_RootVisual;
+                VisualItem[] items = new VisualItem[group.Items.Count];
+                group.Items.CopyTo(items);
+                foreach (VisualItem item in items)
+                {
+                    if (item.ItemType == eSystemItemType.SystemButton || item is VisualUpDownButton || item is LockUpdateCheckBox)
+                    {
+                        item.IsRendered = _RenderControlButtons;
+                    }
+                }
+            }
+            this.Invalidate();
+        }
+
+        private bool _CallBasePaintBackground = true;
+        /// <summary>
+        /// Gets or sets whether during painting OnPaintBackground on base control is called when BackColor=Transparent.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        internal bool CallBasePaintBackground
+        {
+            get { return _CallBasePaintBackground; }
+            set
+            {
+                _CallBasePaintBackground = value;
+            }
+        }
+
+        internal void InternalPaint(PaintEventArgs e)
+        {
+            OnPaint(e);
+        }
+
+        private void PerformRootVisualLayout()
+        {
+            if (this.InvokeRequired)
+            {
+                this.BeginInvoke(new MethodInvoker(delegate { this.PerformRootVisualLayout(); }));
+                return;
+            }
+            using (Graphics g = this.CreateGraphics())
+            {
+                PaintEventArgs e = new PaintEventArgs(g, Rectangle.Empty);
+                PaintInfo p = CreatePaintInfo(e);
+                Rectangle clientRect = this.ClientRectangle;
+                bool disposeStyle = false;
+                ElementStyle style = GetBackgroundStyle(out disposeStyle);
+                if (style.Custom)
+                {
+                    ElementStyleDisplayInfo displayInfo = new ElementStyleDisplayInfo(style, e.Graphics, clientRect);
+                    clientRect.X += ElementStyleLayout.LeftWhiteSpace(style);
+                    clientRect.Y += ElementStyleLayout.TopWhiteSpace(style);
+                    clientRect.Width -= ElementStyleLayout.HorizontalStyleWhiteSpace(style);
+                    clientRect.Height -= ElementStyleLayout.VerticalStyleWhiteSpace(style);
+                    p.RenderOffset = clientRect.Location;
+                    p.AvailableSize = clientRect.Size;
+                }
+                _RootVisual.PerformLayout(p);
+                e.Dispose();
+                if (disposeStyle) style.Dispose();
+            }
+        }
+
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            Rectangle clientRect = this.ClientRectangle;
+
+            PaintInfo p = CreatePaintInfo(e);
+            bool enabled = this.Enabled;
+
+            if (!enabled)
+            {
+                Color c = _DisabledBackColor;
+                if (c.IsEmpty) c = SystemColors.Control;
+                using (SolidBrush brush = new SolidBrush(c))
+                    e.Graphics.FillRectangle(brush, clientRect);
+            }
+            else if (this.BackColor != Color.Transparent)
+                e.Graphics.FillRectangle(SystemBrushes.Window, clientRect);
+            else if (this.BackColor == Color.Transparent && _CallBasePaintBackground)
+                base.OnPaintBackground(e);
+
+            bool disposeStyle = false;
+            ElementStyle style = GetBackgroundStyle(out disposeStyle);
+            if (style.Custom)
+            {
+                ElementStyleDisplayInfo displayInfo = new ElementStyleDisplayInfo(style, e.Graphics, clientRect);
+                if (!enabled)
+                {
+                    ElementStyleDisplay.PaintBorder(displayInfo);
+                }
+                else
+                    ElementStyleDisplay.Paint(displayInfo);
+                clientRect.X += ElementStyleLayout.LeftWhiteSpace(style);
+                clientRect.Y += ElementStyleLayout.TopWhiteSpace(style);
+                clientRect.Width -= ElementStyleLayout.HorizontalStyleWhiteSpace(style);
+                clientRect.Height -= ElementStyleLayout.VerticalStyleWhiteSpace(style);
+                p.RenderOffset = clientRect.Location;
+                p.AvailableSize = clientRect.Size;
+            }
+
+            if (_FocusHighlightEnabled && this.Focused && !_FocusHighlightColor.IsEmpty)
+            {
+                using (SolidBrush brush = new SolidBrush(_FocusHighlightColor))
+                    e.Graphics.FillRectangle(brush, clientRect);
+            }
+
+            if (!_RootVisual.IsLayoutValid)
+            {
+                if (_RootVisual is VisualGroup)
+                    ((VisualGroup)_RootVisual).HorizontalItemAlignment = _InputHorizontalAlignment;
+                _RootVisual.PerformLayout(p);
+            }
+
+            if (SupportsFreeTextEntry)
+            {
+                if (!IsFreeTextEntryVisible)
+                    HideFreeTextBoxEntry();
+                else
+                {
+                    Control textBox = GetFreeTextBox();
+                    Rectangle r = GetFreeTextBounds(textBox.PreferredSize, clientRect);
+                    if (textBox.Bounds != r)
+                        textBox.Bounds = r;
+                    p.RenderSystemItemsOnly = true;
+                }
+            }
+
+            if (_InputHorizontalAlignment != eHorizontalAlignment.Left)
+            {
+                if (_InputHorizontalAlignment == eHorizontalAlignment.Right)
+                    p.RenderOffset = new Point(clientRect.Width - _RootVisual.Size.Width,
+                        (clientRect.Height - _RootVisual.Size.Height) / 2);
+                else
+                    p.RenderOffset = new Point((clientRect.Width - _RootVisual.Size.Width) / 2,
+                        (clientRect.Height - _RootVisual.Size.Height) / 2);
+            }
+            else
+                p.RenderOffset = new Point(0, (clientRect.Height - _RootVisual.Size.Height) / 2);
+
+            if (this.WatermarkEnabled && this.WatermarkText.Length > 0 && this.IsWatermarkRendered)
+            {
+                Rectangle watermarkBounds = clientRect;
+                watermarkBounds.Inflate(-1, -1);
+                DrawWatermark(p, watermarkBounds);
+            }
+            else
+                _RootVisual.ProcessPaint(p);
+
+            base.OnPaint(e);
+
+            if (disposeStyle) style.Dispose();
+        }
+
+        private ElementStyle GetBackgroundStyle(out bool disposeStyle)
+        {
+            disposeStyle = false;
+            _BackgroundStyle.SetColorScheme(this.ColorScheme);
+            return ElementStyleDisplay.GetElementStyle(_BackgroundStyle, out disposeStyle);
+        }
+
+        protected virtual void DrawWatermark(PaintInfo p, Rectangle r)
+        {
+            if (this.WatermarkText.Length == 0) return;
+            Font font = p.DefaultFont;
+            if (this.WatermarkFont != null) font = this.WatermarkFont;
+
+            eTextFormat format = eTextFormat.Default;
+            if (_WatermarkAlignment == eTextAlignment.Center)
+                format |= eTextFormat.HorizontalCenter;
+            else if (_WatermarkAlignment == eTextAlignment.Right)
+                format |= eTextFormat.Right;
+
+            TextDrawing.DrawString(p.Graphics, this.WatermarkText, font, this.WatermarkColor, r, format);
+        }
+
+        /// <summary>
+        /// Gets whether watermark text should be rendered.
+        /// </summary>
+        protected virtual bool IsWatermarkRendered
+        {
+            get
+            {
+                return false;
+            }
+        }
+
+        protected override bool IsInputChar(char charCode)
+        {
+            return true;
+        }
+
+        protected override void OnKeyDown(KeyEventArgs e)
+        {
+            base.OnKeyDown(e);
+            if(!e.Handled)
+                _RootVisual.ProcessKeyDown(e);
+        }
+
+        protected override void OnKeyPress(KeyPressEventArgs e)
+        {
+            base.OnKeyPress(e);
+            if(!e.Handled)
+                _RootVisual.ProcessKeyPress(e);
+        }
+
+        protected override void OnKeyUp(KeyEventArgs e)
+        {
+            base.OnKeyUp(e);
+            if(!e.Handled)
+                _RootVisual.ProcessKeyUp(e);        
+        }
+
+        protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
+        {
+            if (!IsFreeTextEntryVisible && _RootVisual.ProcessCmdKey(ref msg, keyData))
+                return true;
+            return base.ProcessCmdKey(ref msg, keyData);
+        }
+
+        protected override void OnMouseDown(MouseEventArgs e)
+        {
+            if (!this.Focused)
+            {
+                if (this.Parent is MenuPanel)
+                    this.Focus();
+                else
+                    this.Select();
+            }
+            _RootVisual.ProcessMouseDown(e);
+            base.OnMouseDown(e);
+        }
+
+        private bool _InputMouseWheelEnabled = true;
+        /// <summary>
+        /// Gets or sets whether mouse wheel affects the input control. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether mouse wheel affects the input control.")]
+        public bool InputMouseWheelEnabled
+        {
+            get { return _InputMouseWheelEnabled; }
+            set
+            {
+                _InputMouseWheelEnabled = value;
+            }
+        }
+
+
+        protected override void OnMouseWheel(MouseEventArgs e)
+        {
+            if (_InputMouseWheelEnabled)
+                _RootVisual.ProcessMouseWheel(e);
+            base.OnMouseWheel(e);
+        }
+
+        protected override void OnMouseMove(MouseEventArgs e)
+        {
+            _RootVisual.ProcessMouseMove(e);
+            base.OnMouseMove(e);
+        }
+
+        protected override void OnMouseUp(MouseEventArgs e)
+        {
+            _RootVisual.ProcessMouseUp(e);
+            base.OnMouseUp(e);
+        }
+
+        protected override void OnMouseEnter(EventArgs e)
+        {
+            _MouseOver = true;
+            this.Invalidate();
+            base.OnMouseEnter(e);
+        }
+
+        protected override void OnMouseLeave(EventArgs e)
+        {
+            _MouseOver = false;
+            _RootVisual.ProcessMouseLeave();
+            this.Invalidate();
+            base.OnMouseLeave(e);
+        }
+
+        protected override void OnMouseHover(EventArgs e)
+        {
+            _RootVisual.ProcessMouseHover(e);
+            base.OnMouseHover(e);
+        }
+
+        protected override void OnClick(EventArgs e)
+        {
+            _RootVisual.ProcessClick();
+            base.OnClick(e);
+        }
+
+        protected override void OnMouseClick(MouseEventArgs e)
+        {
+            _RootVisual.ProcessMouseClick(e);
+            base.OnMouseClick(e);
+        }
+
+        protected override void OnGotFocus(EventArgs e)
+        {
+            _RootVisual.ProcessGotFocus();
+            base.OnGotFocus(e);
+        }
+
+        protected override void OnLostFocus(EventArgs e)
+        {
+            _RootVisual.ProcessLostFocus();
+            base.OnLostFocus(e);
+        }
+
+        protected override bool ProcessDialogKey(Keys keyData)
+        {
+            if (SupportsFreeTextEntry && (keyData & (Keys.Alt | Keys.Control)) == Keys.None && (keyData & Keys.Shift) == Keys.Shift && IsFreeTextEntryVisible)
+            {
+                Keys keys = keyData & Keys.KeyCode;
+                switch (keys)
+                {
+                    case Keys.Tab:
+                        if (this.ProcessTabKey(false))
+                        {
+                            return true;
+                        }
+                        break;
+                }
+            }
+
+            return base.ProcessDialogKey(keyData);
+        }
+        protected virtual bool ProcessTabKey(bool forward)
+        {
+            return Parent.SelectNextControl(this, forward, true, false, false);
+        }
+
+
+        private bool _IsKeyboardFocusWithin = false;
+        /// <summary>
+        /// Gets whether keyboard focus is within the control.
+        /// </summary>
+        [Browsable(false)]
+        public bool IsKeyboardFocusWithin
+        {
+            get { return _IsKeyboardFocusWithin; }
+            internal set
+            {
+                _IsKeyboardFocusWithin = value;
+                OnIsKeyboardFocusWithinChanged();
+            }
+        }
+
+        protected virtual void OnIsKeyboardFocusWithinChanged()
+        {
+            if (SupportsFreeTextEntry)
+            {
+                if (!IsKeyboardFocusWithin) _RootVisual.ProcessLostFocus();
+            }
+            if (FocusHighlightEnabled) this.Invalidate();
+
+        }
+
+
+        protected override void OnEnter(EventArgs e)
+        {
+            this.IsKeyboardFocusWithin = true;
+            base.OnEnter(e);
+        }
+        protected override void OnLeave(EventArgs e)
+        {
+            this.IsKeyboardFocusWithin = false;
+            base.OnLeave(e);
+        }
+
+        protected virtual VisualItem CreateRootVisual()
+        {
+            return null;
+        }
+
+        /// <summary>
+        /// Gets the reference to internal visual item used as the root visual for the control. Using this property is in all cases not necessary except for some
+        /// very advanced usage scenarios.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public virtual VisualItem RootVisualItem
+        {
+            get { return _RootVisual; }
+        }
+
+        private void VisualArrangeInvalid(object sender, EventArgs e)
+        {
+            this.Invalidate();
+        }
+
+        private void VisualRenderInvalid(object sender, EventArgs e)
+        {
+            this.Invalidate();
+        }
+
+        private eHorizontalAlignment _InputHorizontalAlignment = eHorizontalAlignment.Left;
+        /// <summary>
+        /// Gets or sets the input field alignment inside the control
+        /// </summary>
+        [Browsable(true), DefaultValue(eHorizontalAlignment.Left), Category("Appearance"), Description("Indicates alignment of input fields inside of the control.")]
+        public virtual eHorizontalAlignment InputHorizontalAlignment
+        {
+            get { return _InputHorizontalAlignment; }
+            set
+            {
+                if (_InputHorizontalAlignment != value)
+                {
+                    eHorizontalAlignment oldValue = _InputHorizontalAlignment;
+                    _InputHorizontalAlignment = value;
+                    _RootVisual.InvalidateArrange();
+                    OnInputHorizontalAlignmentChanged(oldValue, value);
+                    this.Invalidate();
+                }
+            }
+        }
+        /// <summary>
+        /// Called when InputHorizontalAlignment property value has changed.
+        /// </summary>
+        /// <param name="oldValue">Old value.</param>
+        /// <param name="newValue">New Value.</param>
+        protected virtual void OnInputHorizontalAlignmentChanged(eHorizontalAlignment oldValue, eHorizontalAlignment newValue)
+        {
+        }
+
+        private Font _WatermarkFont = null;
+        /// <summary>
+        /// Gets or sets the watermark font.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), Description("Indicates watermark font."), DefaultValue(null)]
+        public virtual Font WatermarkFont
+        {
+            get { return _WatermarkFont; }
+            set { _WatermarkFont = value; this.Invalidate(); }
+        }
+
+        private Color _WatermarkColor = SystemColors.GrayText;
+        /// <summary>
+        /// Gets or sets the watermark text color.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), Description("Indicates watermark text color.")]
+        public virtual Color WatermarkColor
+        {
+            get { return _WatermarkColor; }
+            set { _WatermarkColor = value; this.Invalidate(); }
+        }
+        /// <summary>
+        /// Indicates whether property should be serialized by Windows Forms designer.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeWatermarkColor()
+        {
+            return _WatermarkColor != SystemColors.GrayText;
+        }
+        /// <summary>
+        /// Resets the property to default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetWatermarkColor()
+        {
+            this.WatermarkColor = SystemColors.GrayText;
+        }
+
+        private bool _WatermarkEnabled = true;
+        /// <summary>
+        /// Gets or sets whether watermark text is displayed if set for the input items. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Description("Indicates whether watermark text is displayed if set for the input items.")]
+        public virtual bool WatermarkEnabled
+        {
+            get { return _WatermarkEnabled; }
+            set { _WatermarkEnabled = value; this.Invalidate(); }
+        }
+
+        private string _WatermarkText = "";
+        /// <summary>
+        /// Gets or sets the watermark text displayed on the input control when control is empty.
+        /// </summary>
+        [DefaultValue(""), Description("Indicates watermark text displayed on the input control when control is empty."), Category("Watermark"), Localizable(true)]
+        public string WatermarkText
+        {
+            get { return _WatermarkText; }
+            set
+            {
+                if (value != null)
+                {
+                    _WatermarkText = value;
+                    this.Invalidate();
+                }
+            }
+        }
+
+        private eTextAlignment _WatermarkAlignment = eTextAlignment.Left;
+        /// <summary>
+        /// Gets or sets the watermark text alignment. Default value is left.
+        /// </summary>
+        [Browsable(true), DefaultValue(eTextAlignment.Left), Description("Indicates watermark text alignment."), Category("Watermark")]
+        public eTextAlignment WatermarkAlignment
+        {
+            get { return _WatermarkAlignment; }
+            set
+            {
+                if (_WatermarkAlignment != value)
+                {
+                    _WatermarkAlignment = value;
+                    this.Invalidate();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether FocusHighlightColor is used as background color to highlight text box when it has input focus. Default value is false.
+        /// </summary>
+        [DefaultValue(false), Browsable(true), Category("Appearance"), Description("Indicates whether FocusHighlightColor is used as background color to highlight text box when it has input focus.")]
+        public virtual bool FocusHighlightEnabled
+        {
+            get { return _FocusHighlightEnabled; }
+            set
+            {
+                if (_FocusHighlightEnabled != value)
+                {
+                    _FocusHighlightEnabled = value;
+                    if (this.Focused)
+                        this.Invalidate();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the color used as background color to highlight text box when it has input focus and focus highlight is enabled.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), Description("Indicates color used as background color to highlight text box when it has input focus and focus highlight is enabled.")]
+        public virtual Color FocusHighlightColor
+        {
+            get { return _FocusHighlightColor; }
+            set
+            {
+                if (_FocusHighlightColor != value)
+                {
+                    _FocusHighlightColor = value;
+                    if (this.Focused)
+                        this.Invalidate();
+                }
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeFocusHighlightColor()
+        {
+            return !_FocusHighlightColor.Equals(_DefaultHighlightColor);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetFocusHighlightColor()
+        {
+            FocusHighlightColor = _DefaultHighlightColor;
+        }
+
+        private InputButtonSettings _ButtonCustom = null;
+        /// <summary>
+        /// Gets the object that describes the settings for the custom button that can execute an custom action of your choosing when clicked.
+        /// </summary>
+        [Category("Buttons"), Description("Describes the settings for the custom button that can execute an custom action of your choosing when clicked."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public InputButtonSettings ButtonCustom
+        {
+            get
+            {
+                return _ButtonCustom;
+            }
+        }
+
+        private InputButtonSettings _ButtonCustom2 = null;
+        /// <summary>
+        /// Gets the object that describes the settings for the custom button that can execute an custom action of your choosing when clicked.
+        /// </summary>
+        [Category("Buttons"), Description("Describes the settings for the custom button that can execute an custom action of your choosing when clicked."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public InputButtonSettings ButtonCustom2
+        {
+            get
+            {
+                return _ButtonCustom2;
+            }
+        }
+
+
+        void IInputButtonControl.InputButtonSettingsChanged(InputButtonSettings inputButtonSettings)
+        {
+            OnInputButtonSettingsChanged(inputButtonSettings);
+        }
+
+        protected virtual void OnInputButtonSettingsChanged(InputButtonSettings inputButtonSettings)
+        {
+            RecreateButtons();
+        }
+
+        protected virtual void RecreateButtons()
+        {
+            VisualItem[] buttons = CreateOrderedButtonList();
+            if (_RootVisual is VisualGroup)
+            {
+                // Remove all system buttons that are already in the list
+                VisualGroup group = _RootVisual as VisualGroup;
+                VisualItem[] items = new VisualItem[group.Items.Count];
+                group.Items.CopyTo(items);
+                foreach (VisualItem item in items)
+                {
+                    if (item.ItemType == eSystemItemType.SystemButton)
+                    {
+                        group.Items.Remove(item);
+                        if (item == _ButtonCustom.ItemReference)
+                            item.Click -= new EventHandler(CustomButtonClick);
+                        else if (item == _ButtonCustom2.ItemReference)
+                            item.Click -= new EventHandler(CustomButton2Click);
+                        item.IsRendered = _RenderControlButtons;
+                    }
+                }
+
+                // Add new buttons to the list
+                group.Items.AddRange(buttons);
+            }
+        }
+
+        protected override void ScaleControl(SizeF factor, BoundsSpecified specified)
+        {
+            if (Dpi.RecordScalePerControl)
+                Dpi.SetScaling(factor);
+            _RootVisual.InvalidateArrange();
+            RecreateButtons();
+            base.ScaleControl(factor, specified);
+        }
+
+        private void CustomButtonClick(object sender, EventArgs e)
+        {
+            OnButtonCustomClick(e);
+        }
+
+        protected virtual void OnButtonCustomClick(EventArgs e)
+        {
+            if (ButtonCustomClick != null)
+                ButtonCustomClick(this, e);
+        }
+
+        private void CustomButton2Click(object sender, EventArgs e)
+        {
+            OnButtonCustom2Click(e);
+        }
+
+        protected virtual void OnButtonCustom2Click(EventArgs e)
+        {
+            if (ButtonCustom2Click != null)
+                ButtonCustom2Click(this, e);
+        }
+
+        private VisualItem[] CreateOrderedButtonList()
+        {
+            SortedList list = CreateSortedButtonList();
+
+            VisualItem[] items = new VisualItem[list.Count];
+            list.Values.CopyTo(items, 0);
+
+            return items;
+        }
+
+        protected virtual SortedList CreateSortedButtonList()
+        {
+            SortedList list = new SortedList(4);
+            if (_ButtonCustom.Visible)
+            {
+                VisualItem button = CreateButton(_ButtonCustom);
+                if (_ButtonCustom.ItemReference != null)
+                    _ButtonCustom.ItemReference.Click -= new EventHandler(CustomButtonClick);
+                _ButtonCustom.ItemReference = button;
+                button.Click += new EventHandler(CustomButtonClick);
+                button.Enabled = _ButtonCustom.Enabled;
+                list.Add(_ButtonCustom, button);
+            }
+
+            if (_ButtonCustom2.Visible)
+            {
+                VisualItem button = CreateButton(_ButtonCustom2);
+                if (_ButtonCustom.ItemReference != null)
+                    _ButtonCustom.ItemReference.Click -= new EventHandler(CustomButton2Click);
+                _ButtonCustom2.ItemReference = button;
+                button.Click += new EventHandler(CustomButton2Click);
+                button.Enabled = _ButtonCustom2.Enabled;
+                list.Add(_ButtonCustom2, button);
+            }
+
+            return list;
+        }
+
+        protected virtual VisualItem CreateButton(InputButtonSettings buttonSettings)
+        {
+            VisualCustomButton button = new VisualCustomButton();
+            ApplyButtonSettings(buttonSettings, button);
+            return button;
+        }
+
+        protected virtual void ApplyButtonSettings(InputButtonSettings buttonSettings, VisualButton button)
+        {
+            button.Text = buttonSettings.Text;
+            button.Image = buttonSettings.Image;
+            button.Alignment = eItemAlignment.Right;
+            button.ItemType = eSystemItemType.SystemButton;
+            button.Enabled = buttonSettings.Enabled;
+            button.Shortcut = buttonSettings.Shortcut;
+            button.Tooltip = buttonSettings.Tooltip;
+            button.Symbol = buttonSettings.Symbol;
+            button.SymbolSet = buttonSettings.SymbolSet;
+            button.SymbolColor = buttonSettings.SymbolColor;
+        }
+
+        protected override void OnResize(EventArgs e)
+        {
+            AutoAdjustHeight();
+            _RootVisual.InvalidateArrange();
+            base.OnResize(e);
+        }
+
+        protected override PopupItem CreatePopupItem()
+        {
+            return new ButtonItem();
+        }
+
+        protected override void RecalcSize()
+        {
+        }
+
+        public override void PerformClick()
+        {
+        }
+
+        private ElementStyle _BackgroundStyle = new ElementStyle();
+        /// <summary>
+        /// Specifies the background style of the control.
+        /// </summary>
+        [Category("Style"), Description("Gets or sets control background style."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ElementStyle BackgroundStyle
+        {
+            get { return _BackgroundStyle; }
+        }
+
+        /// <summary>
+        /// Resets style to default value. Used by windows forms designer.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetBackgroundStyle()
+        {
+            _BackgroundStyle.StyleChanged -= new EventHandler(this.VisualPropertyChanged);
+            _BackgroundStyle = new ElementStyle();
+            _BackgroundStyle.StyleChanged += new EventHandler(this.VisualPropertyChanged);
+            this.Invalidate();
+        }
+
+        private void VisualPropertyChanged(object sender, EventArgs e)
+        {
+            OnVisualPropertyChanged();
+        }
+
+        protected virtual void OnVisualPropertyChanged()
+        {
+            _RootVisual.InvalidateArrange();
+            this.Invalidate();
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            if (_BackgroundStyle != null) _BackgroundStyle.StyleChanged -= VisualPropertyChanged;
+            _BackgroundStyle.Dispose();
+            base.Dispose(disposing);
+        }
+
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override string Text
+        {
+            get
+            {
+                return base.Text;
+            }
+            set
+            {
+                base.Text = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the preferred height of the control.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public int PreferredHeight
+        {
+            get
+            {
+                return GetPreferredHeight();
+            }
+        }
+
+        private int _PreferredHeight = -1;
+        protected virtual int GetPreferredHeight()
+        {
+            if (_PreferredHeight > -1)
+            {
+                return _PreferredHeight;
+            }
+            bool disposeStyle = false;
+            ElementStyle style = GetBackgroundStyle(out disposeStyle);
+            int h = 0;
+            if (_AutoBorderSize != 0 || style.BorderTopWidth == 0 && style.BorderBottomWidth == 0)
+            {
+                h = this.Font.Height + ((_AutoBorderSize != 0) ? _AutoBorderSize : ((SystemInformation.BorderSize.Height * 4) + 3));
+            }
+            else
+            {
+                h = this.Font.Height + (style.BorderTopWidth * 2 + style.BorderBottomWidth * 2) + 3;
+            }
+            _PreferredHeight = h;
+            if (disposeStyle) style.Dispose();
+            return h;
+        }
+        private int _AutoBorderSize;
+        internal int AutoBorderSize
+        {
+            get { return _AutoBorderSize; }
+            set
+            {
+                _AutoBorderSize = value;
+                _PreferredHeight = -1;
+            }
+        }
+
+        protected override void OnFontChanged(EventArgs e)
+        {
+            _PreferredHeight = -1;
+            this.Height = PreferredHeight;
+            base.OnFontChanged(e);
+        }
+
+        protected override Size DefaultSize
+        {
+            get
+            {
+                return new Size(80, GetPreferredHeight());
+            }
+        }
+
+        public override Size GetPreferredSize(Size proposedSize)
+        {
+            // Calculate preferred size
+            Size size = new Size(0, GetPreferredHeight());
+            if (!_RootVisual.IsLayoutValid)
+                PerformRootVisualLayout();
+            size.Width = _RootVisual.CalculatedSize.Width + 4; // borders and padding
+            return size;
+            //Size size = this.DefaultSize;
+            //if (proposedSize.Width > 0 && proposedSize.Width < size.Width)
+            //    size.Width = proposedSize.Width;
+            //return this.DefaultSize;
+        }
+
+        protected override void OnHandleCreated(EventArgs e)
+        {
+            AutoAdjustHeight();
+            base.OnHandleCreated(e);
+        }
+
+        private void AutoAdjustHeight()
+        {
+            if (this.Height != PreferredHeight)
+                this.Height = PreferredHeight;
+        }
+
+        private eInputFieldNavigation _FieldNavigation = eInputFieldNavigation.All;
+        /// <summary>
+        /// Gets or sets the keys used to navigate between the input fields provided by this control.
+        /// </summary>
+        [DefaultValue(eInputFieldNavigation.All), Description("Indicates keys used to navigate between the input fields provided by this control")]
+        public eInputFieldNavigation FieldNavigation
+        {
+            get { return _FieldNavigation; }
+            set
+            {
+                if (_FieldNavigation != value)
+                {
+                    _FieldNavigation = value;
+                    ApplyFieldNavigation();
+                }
+            }
+        }
+
+        protected virtual void ApplyFieldNavigation()
+        {
+            if (_RootVisual is VisualInputGroup)
+            {
+                VisualInputGroup group = _RootVisual as VisualInputGroup;
+                group.ArrowNavigationEnabled = ((_FieldNavigation & eInputFieldNavigation.Arrows) == eInputFieldNavigation.Arrows);
+                group.TabNavigationEnabled = ((_FieldNavigation & eInputFieldNavigation.Tab) == eInputFieldNavigation.Tab);
+                group.EnterNavigationEnabled = ((_FieldNavigation & eInputFieldNavigation.Enter) == eInputFieldNavigation.Enter);
+            }
+        }
+
+        protected virtual bool IsNull(object value)
+        {
+            if (value == null || value is DBNull) return true;
+            return false;
+        }
+
+        private Color _DisabledBackColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets the control background color when control is disabled. Default value is an empty color which indicates that background is not changed when control is disabled.
+        /// </summary>
+        [Description("Indicates control background color when control is disabled"), Category("Appearance")]
+        public Color DisabledBackColor
+        {
+            get { return _DisabledBackColor; }
+            set
+            {
+                if (_DisabledBackColor != value)
+                {
+                    _DisabledBackColor = value;
+                    if (!this.Enabled) this.Invalidate();
+                }
+            }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeDisabledBackColor()
+        {
+            return !_DisabledBackColor.IsEmpty;
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetDisabledBackColor()
+        {
+            DisabledBackColor = Color.Empty;
+        }
+
+        private Color _DisabledForeColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets the control text color when control is disabled. Default value is an empty color which indicates that background is not changed when control is disabled.
+        /// </summary>
+        [Description("Indicates control background color when control is disabled"), Category("Appearance")]
+        public Color DisabledForeColor
+        {
+            get { return _DisabledForeColor; }
+            set
+            {
+                if (_DisabledForeColor != value)
+                {
+                    _DisabledForeColor = value;
+                    if (!this.Enabled) this.Invalidate();
+                }
+            }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeDisabledForeColor()
+        {
+            return !_DisabledForeColor.IsEmpty;
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetDisabledForeColor()
+        {
+            DisabledForeColor = Color.Empty;
+        }
+
+
+        private InputControlColors _Colors = null;
+        /// <summary>
+        /// Gets the system colors used by the control.
+        /// </summary>
+        [Category("Colors"), Description("System colors used by the control."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public InputControlColors Colors
+        {
+            get { return _Colors; }
+        }
+
+        /// <summary>
+        /// Selects next input field if possible.
+        /// </summary>
+        /// <returns>true if next input field was selected otherwise false.</returns>
+        public bool SelectNextInputField()
+        {
+            VisualInputGroup group = _RootVisual as VisualInputGroup;
+            if (group != null) return group.SelectNextInput();
+            return false;
+        }
+        /// <summary>
+        /// Selects previous input field if possible.
+        /// </summary>
+        /// <returns>true if previous input field was selected otherwise false.</returns>
+        public bool SelectPreviousInputField()
+        {
+            VisualInputGroup group = _RootVisual as VisualInputGroup;
+            if (group != null) return group.SelectPreviousInput();
+            return false;
+        }
+        #endregion
+
+        #region Free-Text Entry Support
+        protected virtual Rectangle GetFreeTextBounds(Size preferedSize, Rectangle clientRect)
+        {
+            Rectangle r = Rectangle.Empty;
+            if (_RootVisual == null) return r;
+
+            r = clientRect; // _RootVisual.RenderBounds;
+            VisualGroup group = _RootVisual as VisualGroup;
+            foreach (VisualItem item in group.Items)
+            {
+                if (item.ItemType == eSystemItemType.SystemButton)
+                {
+                    DisplayHelp.ExcludeEdgeRect(ref r, item.RenderBounds);
+                }
+            }
+
+            if (r.Width != clientRect.Width)
+            {
+                r.Inflate(-1, 0);
+            }
+
+            if (preferedSize.Height > 0 && preferedSize.Height < r.Height)
+            {
+                r.Y += (r.Height - preferedSize.Height) / 2;
+                r.Height = preferedSize.Height;
+            }
+
+            return r;
+        }
+
+        protected virtual bool SupportsFreeTextEntry
+        {
+            get
+            {
+                return false;
+            }
+        }
+
+        protected virtual Control GetFreeTextBox()
+        {
+            throw new Exception("The method or operation is not implemented.");
+        }
+
+        protected virtual bool IsFreeTextEntryVisible
+        {
+            get
+            {
+                return false;
+            }
+        }
+
+        protected virtual void HideFreeTextBoxEntry()
+        {
+
+        }
+        #endregion
+
+        #region Property Hiding
+        [Browsable(false)]
+        public override Color BackColor
+        {
+            get
+            {
+                return base.BackColor;
+            }
+            set
+            {
+                base.BackColor = value;
+            }
+        }
+        [Browsable(false)]
+        public override Image BackgroundImage
+        {
+            get
+            {
+                return base.BackgroundImage;
+            }
+            set
+            {
+                base.BackgroundImage = value;
+            }
+        }
+
+        [Browsable(false)]
+        public override ImageLayout BackgroundImageLayout
+        {
+            get
+            {
+                return base.BackgroundImageLayout;
+            }
+            set
+            {
+                base.BackgroundImageLayout = value;
+            }
+        }
+
+        [Browsable(false)]
+        public override bool DisabledImagesGrayScale
+        {
+            get
+            {
+                return base.DisabledImagesGrayScale;
+            }
+            set
+            {
+                base.DisabledImagesGrayScale = value;
+            }
+        }
+
+        [Browsable(false)]
+        public new System.Windows.Forms.Padding Padding
+        {
+            get
+            {
+                return base.Padding;
+            }
+            set
+            {
+                base.Padding = value;
+            }
+        }
+
+        [Browsable(false)]
+        public override eDotNetBarStyle Style
+        {
+            get
+            {
+                return base.Style;
+            }
+            set
+            {
+                base.Style = value;
+            }
+        }
+
+        [Browsable(false)]
+        public override bool ThemeAware
+        {
+            get
+            {
+                return base.ThemeAware;
+            }
+            set
+            {
+                base.ThemeAware = value;
+            }
+        }
+        #endregion
+
+        #region ISupportInitialize
+        private bool _Initializing = false;
+        protected virtual bool IsInitializing
+        {
+            get
+            {
+                return _Initializing;
+            }
+        }
+        /// <summary>
+        /// ISupportInitialize.BeginInit implementation. While initialization is in progress ValueChanged events will not be fired.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Advanced)]
+        public void BeginInit()
+        {
+            _Initializing = true;
+        }
+
+        /// <summary>
+        /// ISupportInitialize.EndInit implementation.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Advanced)]
+        public void EndInit()
+        {
+            _Initializing = false;
+        }
+        #endregion
+    }
+
+    #region Free Text Box Entry
+    internal class FreeTextEntryBox : TextBox
+    {
+        private bool _HideOnLostFocus;
+        public event EventHandler RevertValue;
+        public event EventHandler ApplyValue;
+        public event EventHandler IncreaseValue;
+        public event EventHandler DecreaseValue;
+        /// <summary>
+        /// Raises DecreaseValue event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnDecreaseValue(EventArgs e)
+        {
+            EventHandler handler = DecreaseValue;
+            if (handler != null)
+                handler(this, e);
+        }
+        /// <summary>
+        /// Raises IncreaseValue event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnIncreaseValue(EventArgs e)
+        {
+            EventHandler handler = IncreaseValue;
+            if (handler != null)
+                handler(this, e);
+        }
+        public FreeTextEntryBox()
+        {
+            //this.MaxLength = 15;
+        }
+
+        private void OnApplyValue(EventArgs e)
+        {
+            if (ApplyValue != null) ApplyValue(this, e);
+        }
+
+        private void OnRevertValue(EventArgs e)
+        {
+            if (RevertValue != null) RevertValue(this, e);
+        }
+
+        public void HideOnLostFocus()
+        {
+            if (this.Focused)
+                _HideOnLostFocus = true;
+        }
+        protected override void OnLostFocus(EventArgs e)
+        {
+            if (_HideOnLostFocus)
+            {
+                this.Visible = false;
+                _HideOnLostFocus = false;
+            }
+            base.OnLostFocus(e);
+        }
+        protected override void OnKeyDown(KeyEventArgs e)
+        {
+            if (e.KeyCode == Keys.Enter)
+            {
+                OnApplyValue(e);
+            }
+            else if (e.KeyCode == Keys.Escape)
+            {
+                OnRevertValue(e);
+            }
+            else if (e.KeyCode == Keys.Up)
+            {
+                OnIncreaseValue(e);
+            }
+            else if (e.KeyCode == Keys.Down)
+            {
+                OnDecreaseValue(e);
+            }
+            //else
+            //{
+            //    char c = BarFunctions.GetCharForKeyValue(e.KeyValue);
+
+            //    if (c != '.' && !char.IsDigit(c) && !char.IsControl(c))
+            //        e.SuppressKeyPress = true;
+            //}
+
+            base.OnKeyDown(e);
+        }
+
+        protected override void OnMouseWheel(MouseEventArgs e)
+        {
+            if (!this.ReadOnly)
+            {
+                if (!(this.Parent is VisualControlBase) || ((VisualControlBase)this.Parent).InputMouseWheelEnabled)
+                {
+                    if (e.Delta > 0)
+                    {
+                        OnIncreaseValue(EventArgs.Empty);
+                    }
+                    else
+                    {
+                        OnDecreaseValue(EventArgs.Empty);
+                    }
+                }
+            }
+            base.OnMouseWheel(e);
+        }
+
+        protected override void OnLeave(EventArgs e)
+        {
+            OnApplyValue(e);
+            base.OnLeave(e);
+        }
+
+    }
+    #endregion
+
+    #region FreeTextEntryConversion Event Handler and Arguments
+    /// <summary>
+    /// Defines data for ConvertFreeTextEntry event.
+    /// </summary>
+    public class FreeTextEntryConversionEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets the string value that was entered by the user.
+        /// </summary>
+        public readonly string ValueEntered;
+
+        /// <summary>
+        /// Gets or sets the converted ValueEntered into the control's value type. For example for IpAddressInput the value set here
+        /// must be of string type and in IP address format. For IntegerInput control the value set here must be an int type. For DateTimeInput
+        /// control value set here must be DateTime type.
+        /// If you provide ControlValue set ValueConverted=true to indicate so.
+        /// </summary>
+        public object ControlValue = null;
+
+        /// <summary>
+        /// Gets or sets whether ValueEntered has been converted to ControlValue. Set to true to indicate that you have performed conversion.
+        /// </summary>
+        public bool IsValueConverted = false;
+
+
+        public FreeTextEntryConversionEventArgs(string valueEntered)
+        {
+            this.ValueEntered = valueEntered;
+        }
+    }
+    /// <summary>
+    /// Defines delegate for ConvertFreeTextEntry event.
+    /// </summary>
+    /// <param name="sender">Source of event.</param>
+    /// <param name="ea">Provides event data.</param>
+    public delegate void FreeTextEntryConversionEventHandler(object sender, FreeTextEntryConversionEventArgs e);
+    #endregion
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/Editors/VisualCustomButton.cs b/PROMS/DotNetBar Source Code/Editors/VisualCustomButton.cs
new file mode 100644
index 00000000..3e0bbfad
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Editors/VisualCustomButton.cs	
@@ -0,0 +1,46 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+using DevComponents.DotNetBar;
+
+namespace DevComponents.Editors
+{
+    public class VisualCustomButton : VisualButton
+    {
+        #region Private Variables
+        #endregion
+
+        #region Events
+        #endregion
+
+        #region Constructor
+        #endregion
+
+        #region Internal Implementation
+        protected override void PaintButtonBackground(PaintInfo p, DevComponents.DotNetBar.Rendering.Office2007ButtonItemStateColorTable ct)
+        {
+            base.PaintButtonBackground(p, ct);
+
+            if (this.Text.Length == 0 && this.Image == null && string.IsNullOrEmpty(this.Symbol))
+            {
+                Point pt = new Point(RenderBounds.X + (RenderBounds.Width - Dpi.Width7) / 2, RenderBounds.Bottom - Dpi.Height6);
+                using (SolidBrush brush = new SolidBrush(ct.Text))
+                {
+                    Size rs = new Size(Dpi.Width2, Dpi.Height2);
+                    for (int i = 0; i < 3; i++)
+                    {
+                        //p.Graphics.FillRectangle(brush, new Rectangle(pt, rs));
+                        p.Graphics.FillEllipse(brush, new Rectangle(pt, rs));
+                        pt.X += rs.Width + Dpi.Width1;
+                    }
+                }
+            }
+        }
+        #endregion
+
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/Editors/VisualDoubleInput.cs b/PROMS/DotNetBar Source Code/Editors/VisualDoubleInput.cs
new file mode 100644
index 00000000..005a9997
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Editors/VisualDoubleInput.cs	
@@ -0,0 +1,563 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel;
+using System.Globalization;
+using System.Windows.Forms;
+
+namespace DevComponents.Editors
+{
+    public class VisualDoubleInput : VisualNumericInput
+    {
+        #region Private Variables
+        private double _Value = 0;
+        private double _MinValue = double.MinValue;
+        private double _MaxValue = double.MaxValue;
+        #endregion
+
+        #region Events
+        #endregion
+
+        #region Constructor
+        #endregion
+
+        #region Internal Implementation
+        protected override void OnLostFocus()
+        {
+            ValidateValue();
+            base.OnLostFocus();
+        }
+
+        protected virtual void ValidateValue()
+        {
+            if (_Value < _MinValue)
+                Value = _MinValue;
+            else if (_Value > _MaxValue)
+                Value = _MaxValue;
+        }
+
+        protected override bool AcceptKeyPress(System.Windows.Forms.KeyPressEventArgs e)
+        {
+            string decimalSeparator = NumberDecimalSeparator;
+            if (e.KeyChar.ToString() == decimalSeparator)
+            {
+                if (!this.InputStack.Contains(decimalSeparator))
+                    return true;
+                else
+                    return false;
+            }
+
+            return base.AcceptKeyPress(e);
+        }
+
+        protected override string ProcessNewInputStack(string s)
+        {
+            if (this.InputStack == "0" && s != "0" && s.StartsWith("0") && s.EndsWith(NumberDecimalSeparator))
+                return s;
+            return base.ProcessNewInputStack(s);
+        }
+
+        protected override void OnInputStackChanged()
+        {
+            if (this.InputStack.Length > 0)
+            {
+                this.IsEmpty = false;
+
+                if (this.InputStack == "-")
+                {
+                    SetValue(0, true);
+                    return;
+                }
+                else if (this.InputStack == NumberDecimalSeparator || this.InputStack == "-" + NumberDecimalSeparator)
+                {
+                    SetValue(0, true);
+                    return;
+                }
+
+                SetValue(Parse(this.InputStack), true);
+            }
+            else
+            {
+                if (this.AllowEmptyState)
+                    this.IsEmpty = true;
+                SetValue(0);
+            }
+
+            base.OnInputStackChanged();
+        }
+
+        private double Parse(string s)
+        {
+            CultureInfo ci = DevComponents.Editors.DateTimeAdv.DateTimeInput.GetActiveCulture();
+            IFormatProvider formatProvider = ci.GetFormat(typeof(NumberFormatInfo)) as IFormatProvider;
+            if (formatProvider != null)
+                return double.Parse(s, formatProvider);
+            return double.Parse(s);
+        }
+
+        protected override void OnInputKeyAccepted()
+        {
+            CheckInputComplete(true);
+            base.OnInputKeyAccepted();
+        }
+
+        private void CheckInputComplete(bool sendNotification)
+        {
+            string predictedStack1 = "", predictedStack2 = "";
+            if (this.InputStack.Length > 0)
+            {
+                if (this.InputStack.Contains(NumberDecimalSeparator))
+                {
+                    predictedStack1 = this.InputStack + "1";
+                    predictedStack2 = predictedStack1;
+                }
+                else
+                {
+                    predictedStack1 = this.InputStack + NumberDecimalSeparator;
+                    predictedStack2 = this.InputStack + "0";
+                }
+            }
+
+            if (this.InputStack == "-" || this.InputStack.StartsWith(NumberDecimalSeparator) || this.InputStack == "-" + NumberDecimalSeparator)
+                return;
+
+            if (_Value == _MaxValue ||
+                !ValidateNewInputStack(predictedStack1) && !ValidateNewInputStack(predictedStack2))
+                InputComplete(sendNotification);
+        }
+
+        private void SetValue(double i, bool raiseValueChanged)
+        {
+            bool changed = _Value != i || raiseValueChanged;
+            _Value = i;
+            
+            if (changed)
+                OnValueChanged();
+
+            InvalidateArrange();
+        }
+
+        private void SetValue(double i)
+        {
+            SetValue(i, false);
+        }
+
+        protected override string GetMeasureString()
+        {
+            string s = GetRenderString();
+            if (this.IsEmpty && this.AllowEmptyState)
+                s = "T";
+            else if (this.InputStack == "-" && _Value == 0)
+                s = "-";
+            else if ((this.InputStack == NumberDecimalSeparator || this.InputStack == "-" + NumberDecimalSeparator) && _Value == 0)
+                return this.InputStack;
+
+            return s;
+        }
+
+        protected override string GetRenderString()
+        {
+            if (this.InputStack == "-" && _Value == 0)
+                return "-";
+            else if ((this.InputStack == NumberDecimalSeparator || this.InputStack == "-" + NumberDecimalSeparator) && _Value == 0)
+                return this.InputStack;
+            else if (this.IsFocused && this.InputStack.Length > 0)
+                return this.InputStack;
+
+            string text = "";
+
+            text = ConvertToString(_Value, true);
+
+            return text;
+        }
+
+        protected override void NegateValue()
+        {
+            if (_MaxValue < 0) return;
+            double newValue = -_Value;
+            SetValueDirect(FormatNumber(newValue));
+        }
+
+        protected override void ResetValue()
+        {
+            ResetInputStack();
+            double v = 0;
+            if (_MinValue > v) v = _MinValue;
+            if (v > _MaxValue) v = _MaxValue;
+            SetValue(v);
+            InvalidateArrange();
+        }
+
+        public double MinValue
+        {
+            get { return _MinValue; }
+            set 
+            {
+                if (_MinValue != value)
+                {
+                    _MinValue = value;
+                    if (_MinValue >= 0)
+                        this.AllowsNegativeValue = false;
+                    else
+                        this.AllowsNegativeValue = true;
+                    ValidateValue();
+                }
+            }
+        }
+
+        public double MaxValue
+        {
+            get { return _MaxValue; }
+            set 
+            {
+                if (_MaxValue != value)
+                {
+                    _MaxValue = value;
+                    ValidateValue();
+                }
+            }
+        }
+
+        private bool TryParse(string s, out double value)
+        {
+            CultureInfo ci = DevComponents.Editors.DateTimeAdv.DateTimeInput.GetActiveCulture();
+            IFormatProvider formatProvider = ci.GetFormat(typeof(NumberFormatInfo)) as IFormatProvider;
+            if (formatProvider != null)
+                return double.TryParse(s, NumberStyles.Number, formatProvider, out value);
+            return double.TryParse(s, out value);
+        }
+
+        protected override void OnClipboardPaste()
+        {
+            if (Clipboard.ContainsText())
+            {
+                string s = Clipboard.GetText().Replace(" ", "");
+                s = StripNonNumeric(s);
+                double value = 0;
+                if (TryParse(s, out value))
+                {
+                    if (value > _MaxValue || value < _MinValue) return;
+                    if (SetInputStack(value.ToString()))
+                    {
+                        SetInputPosition(InputStack.Length);
+                        OnInputKeyAccepted();
+                    }
+                    return;
+                }
+                else
+                    return;
+            }
+            base.OnClipboardPaste();
+        }
+
+        protected override bool ValidateNewInputStack(string s)
+        {
+            if (s.Length > 0)
+            {
+                if (s == "-" && this.AllowsNegativeValue)
+                    return true;
+                else if (s == NumberDecimalSeparator || s == "-" + NumberDecimalSeparator)
+                    return true;
+                
+                double value = 0;
+                if (TryParse(s, out value))
+                {
+                    if (value > _MaxValue && _MaxValue >= 0 || value < _MinValue && _MinValue < 0)
+                        return false;
+                    // Check number of decimal places, do not allow entry of more decimals than needed
+                    string formattedValue = ConvertToString(value, true, true);
+                    if (s.Contains(NumberDecimalSeparator) && formattedValue.Contains(NumberDecimalSeparator))
+                    {
+                        int decimalPlaces = GetNumberOfDecimalPlaces(); // formattedValue.Substring(formattedValue.IndexOf(NumberDecimalSeparator) + 1).Length;
+                        int inputDecimalPlaces = s.Substring(s.IndexOf(NumberDecimalSeparator) + 1).Length;
+                        if (decimalPlaces > 0 && inputDecimalPlaces > decimalPlaces /*&& !s.EndsWith("0")*/)
+                            return false;
+                    }
+                    else if (s.Contains(NumberDecimalSeparator) && GetNumberOfDecimalPlaces() == 0)
+                        return false;
+
+                    return true;
+                }
+                else
+                    return false;
+            }
+            return base.ValidateNewInputStack(s);
+        }
+
+        private int GetNumberOfDecimalPlaces()
+        {
+            if (this.DisplayFormat == null || this.DisplayFormat.Length == 0)
+            {
+                CultureInfo ci = DevComponents.Editors.DateTimeAdv.DateTimeInput.GetActiveCulture();
+                IFormatProvider formatProvider = ci.GetFormat(typeof(NumberFormatInfo)) as IFormatProvider;
+                if (formatProvider != null && formatProvider is NumberFormatInfo)
+                {
+                    NumberFormatInfo nfi = (NumberFormatInfo)formatProvider;
+                    return nfi.NumberDecimalDigits;
+                }
+            }
+            else
+            {
+                string s = ConvertToString(11.111111111111d, true, true);
+                int sepIndex = s.IndexOf(NumberDecimalSeparator);
+                if (sepIndex < 0) return 0;
+                return s.Substring(sepIndex + 1).Length;
+            }
+
+            return 2;
+        }
+
+        public override void IncreaseValue()
+        {
+            if (_Increment > 0)
+            {
+                double newValue = _Value + _Increment;
+
+                if (newValue > _MaxValue)
+                    newValue = _MaxValue;
+                else if (newValue < _MinValue)
+                    newValue = _MinValue;
+
+                if (_Value < _MaxValue && newValue > _MaxValue) newValue = _MaxValue;
+                if (newValue <= _MaxValue)
+                {
+                    if (this.IsEmpty && this.AllowEmptyState) newValue = Math.Max(0, _MinValue);
+
+                    SetValueDirect(StripNonNumeric(FormatNumber(newValue)));
+                    CheckInputComplete(false);
+                }
+            }
+
+            base.IncreaseValue();
+        }
+
+        public override void DecreaseValue()
+        {
+            if (_Increment > 0)
+            {
+                double newValue = _Value - _Increment;
+
+                if (newValue > _MaxValue)
+                    newValue = _MaxValue;
+                else if (newValue < _MinValue)
+                    newValue = _MinValue;
+
+                if (_Value > _MinValue && newValue < _MinValue) newValue = _MinValue;
+                if (newValue >= _MinValue)
+                {
+                    SetValueDirect(StripNonNumeric(FormatNumber(newValue)));
+                    CheckInputComplete(false);
+                }
+            }
+
+            base.DecreaseValue();
+        }
+
+        private double _Increment = 1;
+        /// <summary>
+        /// Gets or sets the value to increment or decrement the value of the control when the up or down buttons are clicked. 
+        /// </summary>
+        [DefaultValue(1)]
+        public double Increment
+        {
+            get { return _Increment; }
+            set
+            {
+                value = Math.Abs(value);
+                if (_Increment != value)
+                {
+                    _Increment = value;
+                }
+            }
+        }
+
+        private void SetValueDirect(string s)
+        {
+            string formattedValue = s;
+            if (s.Contains(NumberDecimalSeparator) && formattedValue.Contains(NumberDecimalSeparator))
+            {
+                int decimalPlaces = GetNumberOfDecimalPlaces(); // formattedValue.Substring(formattedValue.IndexOf(NumberDecimalSeparator) + 1).Length;
+                int inputDecimalPlaces = s.Substring(s.IndexOf(NumberDecimalSeparator) + 1).Length;
+                if (decimalPlaces > 0 && inputDecimalPlaces > decimalPlaces)
+                    s = s.Substring(0, s.IndexOf(NumberDecimalSeparator) + 1 + decimalPlaces);
+            }
+
+            if (SetInputStack(s))
+            {
+                SetInputPosition(InputStack.Length);
+            }
+        }
+
+        private string ConvertToString(double d)
+        {
+            return ConvertToString(d, false, false);
+        }
+
+        private string ConvertToString(double d, bool useFormat)
+        {
+            return ConvertToString(d, useFormat, false);
+        }
+
+        private string ConvertToString(double d, bool useFormat, bool forceDisplayFormat)
+        {
+            string s = FormatNumber(d);
+            if (!forceDisplayFormat && (_DisplayFormat.Length == 0 || this.IsFocused || !useFormat))
+            {
+                if (this.InputStack.Contains(NumberDecimalSeparator))
+                {
+                    if (!s.Contains(NumberDecimalSeparator))
+                        s += this.InputStack.Substring(this.InputStack.IndexOf(NumberDecimalSeparator));
+                    else if (s.Substring(s.IndexOf(NumberDecimalSeparator)) != this.InputStack.Substring(this.InputStack.IndexOf(NumberDecimalSeparator)))
+                        s = s.Substring(0, s.IndexOf(NumberDecimalSeparator)) + this.InputStack.Substring(this.InputStack.IndexOf(NumberDecimalSeparator));
+                }
+            }
+            else if (_DisplayFormat.Length > 0)
+            {
+                try
+                {
+                    CultureInfo ci = DevComponents.Editors.DateTimeAdv.DateTimeInput.GetActiveCulture();
+                    IFormatProvider formatProvider = ci.GetFormat(typeof(NumberFormatInfo)) as IFormatProvider;
+                    if (formatProvider != null)
+                        s = d.ToString(_DisplayFormat, formatProvider);
+                    else
+                        s = d.ToString(_DisplayFormat);
+                }
+                catch
+                {
+                    s = d.ToString();
+                }
+            }
+
+            return s;
+        }
+
+        private string FormatNumber(double d)
+        {
+            string format = null;
+            CultureInfo ci = DevComponents.Editors.DateTimeAdv.DateTimeInput.GetActiveCulture();
+            
+            if (!string.IsNullOrEmpty(DisplayFormat) && DisplayFormat.ToLower()!="p" && this.IsFocused)
+                format = DisplayFormat;
+            else
+            {
+                format = "n";
+                int places = ci.NumberFormat.NumberDecimalDigits; // GetDecimalPlaces(d);
+                if (places > 0)
+                    format += places.ToString();
+            }
+
+            
+            IFormatProvider formatProvider = ci.GetFormat(typeof(NumberFormatInfo)) as IFormatProvider;
+            if (formatProvider != null)
+            {
+                if (format != null) return d.ToString(format, formatProvider);
+                return d.ToString(formatProvider);
+            }
+
+            if (format != null) return d.ToString(format);
+            return d.ToString();
+        }
+
+        private int GetDecimalPlaces(double d)
+        {
+            double dec = d - Math.Truncate(d);
+            if (dec == 0) return 0;
+            int places = 0;
+            while (dec < 1)
+            {
+                dec *= 10;
+                places++;
+            }
+            return places;
+        }
+
+        public double Value
+        {
+            get
+            {
+                if (_Value < _MinValue)
+                    return _MinValue;
+                else if (_Value > _MaxValue)
+                    return _MaxValue;
+
+                return _Value;
+            }
+            set
+            {
+                //if (_Value != value)
+                {
+                    if (value < _MinValue) value = _MinValue;
+                    if (value > _MaxValue) value = _MaxValue;
+                    if (this.IsFocused)
+                    {
+                        SetValueDirect(StripNonNumeric(FormatNumber(value)));
+                        if (this.IsFocused)
+                            InputComplete(false);
+                    }
+                    else
+                    {
+                        IsEmpty = false;
+                        SetValue(value, true);
+                    }
+                }
+            }
+        }
+
+        private string StripNonNumeric(string p)
+        {
+            string s = "";
+            for (int i = 0; i < p.Length; i++)
+            {
+                if (p[i].ToString() == NumberDecimalSeparator || p[i] >= '0' && p[i] <= '9' || i == 0 && p[i] == '-')
+                    s += p[i];
+                else if (s.Length > 0 && p[i].ToString() != NumberThousandsSeparator) break;
+            }
+            return s;
+        }
+
+        private string _DisplayFormat = "";
+        /// <summary>
+        /// Gets or sets the Numeric String Format that is used to format the numeric value entered for display purpose.
+        /// </summary>
+        [DefaultValue("")]
+        public string DisplayFormat
+        {
+            get { return _DisplayFormat; }
+            set
+            {
+                if (value != null)
+                    _DisplayFormat = value;
+            }
+        }
+
+        private string NumberDecimalSeparator
+        {
+            get { return DevComponents.Editors.DateTimeAdv.DateTimeInput.GetActiveCulture().NumberFormat.NumberDecimalSeparator; }
+        }
+
+        private string NumberThousandsSeparator
+        {
+            get { return DevComponents.Editors.DateTimeAdv.DateTimeInput.GetActiveCulture().NumberFormat.NumberGroupSeparator; }
+        }
+
+        protected override string GetInputStringValue()
+        {
+            return ConvertToString(_Value);
+        }
+
+        [Browsable(false)]
+        public virtual string Text
+        {
+            get
+            {
+                if (this.IsEmpty && this.AllowEmptyState) return "";
+                return ConvertToString(_Value, true, true);
+            }
+        }
+        #endregion
+
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/Editors/VisualDropDownButton.cs b/PROMS/DotNetBar Source Code/Editors/VisualDropDownButton.cs
new file mode 100644
index 00000000..84996aed
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Editors/VisualDropDownButton.cs	
@@ -0,0 +1,37 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+using DevComponents.DotNetBar;
+using System.Drawing;
+
+namespace DevComponents.Editors
+{
+    public class VisualDropDownButton : VisualButton
+    {
+        #region Private Variables
+        #endregion
+
+        #region Events
+        #endregion
+
+        #region Constructor
+        #endregion
+
+        #region Internal Implementation
+        protected override void PaintButtonBackground(PaintInfo p, DevComponents.DotNetBar.Rendering.Office2007ButtonItemStateColorTable ct)
+        {
+            base.PaintButtonBackground(p, ct);
+
+            if (this.Text.Length == 0 && this.Image == null)
+            {
+                using (SolidBrush brush = new SolidBrush(ct.Text))
+                    p.Graphics.FillPolygon(brush, Office2007ButtonItemPainter.GetExpandPolygon(this.RenderBounds, ePopupSide.Default));
+            }
+        }
+        #endregion
+
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/Editors/VisualGroup.cs b/PROMS/DotNetBar Source Code/Editors/VisualGroup.cs
new file mode 100644
index 00000000..d41c9b39
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Editors/VisualGroup.cs	
@@ -0,0 +1,623 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.ComponentModel;
+
+namespace DevComponents.Editors
+{
+    public class VisualGroup : VisualItem
+    {
+        #region Private Variables
+        private VisualItem _MouseDownItem = null;
+        private VisualItem _MouseOverItem = null;
+        #endregion
+
+        #region Events
+        #endregion
+
+        #region Constructor
+        public VisualGroup()
+            : base()
+        {
+            _Items = new VisualItemCollection(this);
+        }
+        #endregion
+
+        #region Internal Implementation
+
+        internal virtual void ProcessItemsCollectionChanged(CollectionChangedInfo collectionChangedInfo)
+        {
+            OnItemsCollectionChanged(collectionChangedInfo);
+        }
+
+        protected virtual void OnItemsCollectionChanged(CollectionChangedInfo collectionChangedInfo)
+        {
+            if (collectionChangedInfo.ChangeType == eCollectionChangeType.Adding || collectionChangedInfo.ChangeType == eCollectionChangeType.Removing ||
+                collectionChangedInfo.ChangeType == eCollectionChangeType.Clearing)
+            {
+                if (collectionChangedInfo.Removed != null)
+                {
+                    foreach (VisualItem item in collectionChangedInfo.Removed)
+                        item.Parent = null;
+                }
+                if (collectionChangedInfo.ChangeType == eCollectionChangeType.Clearing)
+                {
+                    foreach (VisualItem item in this.Items)
+                        item.Parent = null;
+                }
+
+                if (collectionChangedInfo.Added != null)
+                {
+                    foreach (VisualItem item in collectionChangedInfo.Added)
+                    {
+                        if (item.Parent != null && item.Parent != this)
+                        {
+                            item.Parent.Items.Remove(item);
+                        }
+                        item.Parent = this;
+                    }
+                }
+            }
+            this.InvalidateArrange();
+        }
+
+        private VisualItemCollection _Items;
+        public virtual VisualItemCollection Items
+        {
+            get { return _Items; }
+        }
+
+        internal void OnChildItemVisibleChanged(VisualItem visualItem)
+        {
+            InvalidateArrange();
+        }
+
+        private VisualItem _FocusedItem;
+        public VisualItem FocusedItem
+        {
+            get { return _FocusedItem; }
+            internal set
+            {
+                if (_FocusedItem == value) return;
+                if (_FocusedItem != null)
+                    _FocusedItem.ProcessLostFocus();
+                VisualItem oldFocus = _FocusedItem;
+                _FocusedItem = value;
+                if (_FocusedItem != null)
+                    _FocusedItem.ProcessGotFocus();
+                OnFocusedItemChanged(oldFocus);
+                this.InvalidateArrange();
+            }
+        }
+
+        protected virtual void OnFocusedItemChanged(VisualItem previousFocus)
+        {
+
+        }
+
+        protected override void OnPaint(PaintInfo p)
+        {
+            if (!IsLayoutValid)
+                PerformLayout(p);
+
+            Point renderOffset = p.RenderOffset;
+            Point pr = p.RenderOffset;
+            pr.Offset(this.RenderBounds.Location);
+            p.RenderOffset = pr;
+
+            Graphics g = p.Graphics;
+            Region oldClip = null;
+            bool clipSet = false;
+            oldClip = g.Clip;
+            Rectangle renderBounds = this.RenderBounds;
+            renderBounds.Offset(renderOffset);
+            g.SetClip(renderBounds, CombineMode.Intersect);
+            clipSet = true;
+
+            bool parentEnabled = p.ParentEnabled;
+            p.ParentEnabled = p.ParentEnabled && this.Enabled;
+            bool renderSystemItemsOnly = p.RenderSystemItemsOnly;
+
+            foreach (VisualItem v in _Items)
+            {
+                if (renderSystemItemsOnly && v.ItemType != eSystemItemType.SystemButton) continue;
+                if (_VerticalItemAlignment == eVerticalAlignment.Middle)
+                {
+                    if(_Orientation == DotNetBar.eOrientation.Horizontal)
+                        v.RenderBounds = new Rectangle(p.RenderOffset.X + v.Location.X, p.RenderOffset.Y + v.Location.Y + (this.Size.Height - v.Size.Height) / 2, v.Size.Width, v.Size.Height);
+                    else
+                        v.RenderBounds = new Rectangle(p.RenderOffset.X + v.Location.X + (this.Size.Width - v.Size.Width) / 2, p.RenderOffset.Y + v.Location.Y, v.Size.Width, v.Size.Height);
+                }
+                else if (_VerticalItemAlignment == eVerticalAlignment.Bottom)
+                {
+                    if(_Orientation == DotNetBar.eOrientation.Horizontal)
+                        v.RenderBounds = new Rectangle(p.RenderOffset.X + v.Location.X, p.RenderOffset.Y + v.Location.Y + (this.Size.Height - v.Size.Height), v.Size.Width, v.Size.Height);
+                    else
+                        v.RenderBounds = new Rectangle(p.RenderOffset.X + v.Location.X + (this.Size.Width - v.Size.Width), p.RenderOffset.Y + v.Location.Y, v.Size.Width, v.Size.Height);
+                }
+                else
+                    v.RenderBounds = new Rectangle(p.RenderOffset.X + v.Location.X, p.RenderOffset.Y + v.Location.Y, v.Size.Width, v.Size.Height);
+                if (v.RenderBounds.IntersectsWith(renderBounds))
+                {
+                    p.RenderOffset = Point.Empty;
+                    v.ProcessPaint(p);
+                    p.RenderOffset = pr;
+                }
+            }
+            p.ParentEnabled = parentEnabled;
+
+            if (clipSet)
+            {
+                if (oldClip != null)
+                    g.Clip = oldClip;
+                else
+                    g.ResetClip();
+            }
+
+            if(oldClip!=null) oldClip.Dispose();
+
+            p.RenderOffset = renderOffset;
+
+            base.OnPaint(p);
+        }
+
+        protected override void OnIsRightToLeftChanged()
+        {
+            foreach (VisualItem vi in _Items)
+                vi.IsRightToLeft = this.IsRightToLeft;
+            base.OnIsRightToLeftChanged();
+        }
+
+        public override void PerformLayout(PaintInfo pi)
+        {
+            if (_Orientation == DotNetBar.eOrientation.Horizontal)
+            {
+                Point p = Point.Empty;
+                Size size = Size.Empty;
+                Size availableSize = pi.AvailableSize;
+                Size containerSize = availableSize;
+                bool usesFullWidth = false;
+                Size calcSize = Size.Empty;
+                foreach (VisualItem v in new VisualCollectionEnumerator(_Items, this.IsRightToLeft))
+                {
+                    if (v.Visible)
+                    {
+                        v.Location = p;
+                        pi.AvailableSize = new Size(availableSize.Width - p.X, availableSize.Height);
+                        v.PerformLayout(pi);
+                        if (v.Alignment == eItemAlignment.Right)
+                        {
+                            v.Location = new Point(containerSize.Width - v.Size.Width, p.Y);
+                            containerSize.Width -= v.Size.Width + _HorizontalItemSpacing;
+                            calcSize.Width += v.Size.Width + _HorizontalItemSpacing;
+                            usesFullWidth = true;
+                        }
+                        else
+                        {
+                            p.X += v.Size.Width + _HorizontalItemSpacing;
+                            size.Width += v.Size.Width + _HorizontalItemSpacing;
+                            calcSize.Width += v.Size.Width + _HorizontalItemSpacing;
+                        }
+                        if (v.Size.Height > size.Height)
+                            size.Height = v.Size.Height;
+                    }
+                }
+                if (size.Width > 0)
+                    size.Width -= +_HorizontalItemSpacing;
+
+                if (usesFullWidth && _HorizontalItemAlignment != eHorizontalAlignment.Left)
+                {
+                    if (_HorizontalItemAlignment == eHorizontalAlignment.Right)
+                    {
+                        if (containerSize.Width < availableSize.Width) containerSize.Width--;
+                        foreach (VisualItem v in new VisualCollectionEnumerator(_Items, !this.IsRightToLeft))
+                        {
+                            if (!v.Visible || v.Alignment == eItemAlignment.Right || v is LockUpdateCheckBox) continue;
+                            v.Location = new Point(containerSize.Width - v.Size.Width, p.Y);
+                            containerSize.Width -= v.Size.Width + _HorizontalItemSpacing;
+                        }
+                    }
+                    else
+                    {
+                        int offset = (containerSize.Width - size.Width) / 2;
+                        foreach (VisualItem v in new VisualCollectionEnumerator(_Items, this.IsRightToLeft))
+                        {
+                            if (!v.Visible || v.Alignment == eItemAlignment.Right || v is LockUpdateCheckBox) continue;
+                            v.Location = new Point(v.Location.X + offset, v.Location.Y);
+                        }
+                    }
+                }
+
+                this.CalculatedSize = calcSize;
+
+                if (usesFullWidth)
+                    size.Width = availableSize.Width;
+
+                pi.AvailableSize = availableSize;
+                this.Size = size;
+                this.RenderBounds = new Rectangle(pi.RenderOffset, size);
+            }
+            else
+                PerformVerticalLayout(pi);
+            base.PerformLayout(pi);
+        }
+
+        private void PerformVerticalLayout(PaintInfo pi)
+        {
+            Point p = Point.Empty;
+            Size size = Size.Empty;
+            Size availableSize = pi.AvailableSize;
+            Size containerSize = availableSize;
+            bool usesFullWidth = false;
+            Size calcSize = Size.Empty;
+            foreach (VisualItem v in new VisualCollectionEnumerator(_Items, this.IsRightToLeft))
+            {
+                if (v.Visible)
+                {
+                    v.Location = p;
+                    pi.AvailableSize = new Size(availableSize.Width, availableSize.Height - p.Y);
+                    v.PerformLayout(pi);
+                    if (v.Alignment == eItemAlignment.Right)
+                    {
+                        v.Location = new Point(p.X, containerSize.Height - v.Size.Height);
+                        containerSize.Height -= v.Size.Height + _HorizontalItemSpacing;
+                        calcSize.Height += v.Size.Height + _HorizontalItemSpacing;
+                        usesFullWidth = true;
+                    }
+                    else
+                    {
+                        p.Y += v.Size.Height + _HorizontalItemSpacing;
+                        size.Height += v.Size.Height + _HorizontalItemSpacing;
+                        calcSize.Height += v.Size.Height + _HorizontalItemSpacing;
+                    }
+                    if (v.Size.Width > size.Width)
+                        size.Width = v.Size.Width;
+                }
+            }
+            if (size.Height > 0)
+                size.Height -= +_HorizontalItemSpacing;
+
+            if (usesFullWidth && _HorizontalItemAlignment != eHorizontalAlignment.Left)
+            {
+                if (_HorizontalItemAlignment == eHorizontalAlignment.Right)
+                {
+                    if (containerSize.Height < availableSize.Height) containerSize.Height--;
+                    foreach (VisualItem v in new VisualCollectionEnumerator(_Items, !this.IsRightToLeft))
+                    {
+                        if (!v.Visible || v.Alignment == eItemAlignment.Right || v is LockUpdateCheckBox) continue;
+                        v.Location = new Point(p.X, containerSize.Height - v.Size.Height);
+                        containerSize.Height -= v.Size.Height + _HorizontalItemSpacing;
+                    }
+                }
+                else
+                {
+                    int offset = (containerSize.Height - size.Height) / 2;
+                    foreach (VisualItem v in new VisualCollectionEnumerator(_Items, this.IsRightToLeft))
+                    {
+                        if (!v.Visible || v.Alignment == eItemAlignment.Right || v is LockUpdateCheckBox) continue;
+                        v.Location = new Point(v.Location.X, v.Location.Y + offset);
+                    }
+                }
+            }
+
+            this.CalculatedSize = calcSize;
+
+            if (usesFullWidth)
+                size.Height = availableSize.Height;
+
+            pi.AvailableSize = availableSize;
+            this.Size = size;
+            this.RenderBounds = new Rectangle(pi.RenderOffset, size);
+        }
+
+        private DevComponents.DotNetBar.eOrientation _Orientation=DevComponents.DotNetBar.eOrientation.Horizontal;
+        internal DevComponents.DotNetBar.eOrientation Orientation
+        {
+            get
+            {
+                return _Orientation;
+            }
+            set
+            {
+                _Orientation = value;
+                this.InvalidateArrange();
+                this.InvalidateRender();
+            }
+        }
+
+        protected override void OnMouseDown(System.Windows.Forms.MouseEventArgs e)
+        {
+            VisualItem item = GetItemAt(e.X, e.Y);
+            if (item != null)
+            {
+                _MouseDownItem = item;
+                _MouseOverItem = item;
+                item.ProcessMouseDown(e);
+                if (_MouseDownItem == item && CanFocus(item))
+                    this.FocusedItem = item;
+            }
+            else if (item == null && this.IsFocused)
+            {
+                // Find first available input and focus it instead
+                foreach (VisualItem visual in _Items)
+                {
+                    if (visual is VisualInputBase && CanFocus(visual))
+                    {
+                        this.FocusedItem = visual;
+                        break;
+                    }
+                }
+            }
+
+            base.OnMouseDown(e);
+        }
+
+        protected override void OnMouseWheel(System.Windows.Forms.MouseEventArgs e)
+        {
+            if (this.FocusedItem != null)
+                this.FocusedItem.ProcessMouseWheel(e);
+            base.OnMouseWheel(e);
+        }
+
+        protected virtual bool CanFocus(VisualItem v)
+        {
+            return v != null && v.Visible && (v.Focusable || v is VisualInputGroup) && v.Enabled;
+        }
+
+        protected override void OnClick(EventArgs e)
+        {
+            if (_MouseDownItem != null)
+            {
+                _MouseDownItem.ProcessClick();
+            }
+            base.OnClick(EventArgs.Empty);
+        }
+
+        protected override void OnMouseClick(System.Windows.Forms.MouseEventArgs e)
+        {
+            if (_MouseDownItem != null)
+            {
+                _MouseDownItem.ProcessMouseClick(e);
+            }
+            base.OnMouseClick(e);
+        }
+
+        protected override void OnMouseUp(System.Windows.Forms.MouseEventArgs e)
+        {
+            if (_MouseDownItem != null)
+            {
+                _MouseDownItem.ProcessMouseUp(e);
+                _MouseDownItem = null;
+            }
+            base.OnMouseUp(e);
+        }
+
+        protected override void OnMouseMove(System.Windows.Forms.MouseEventArgs e)
+        {
+            if (_MouseDownItem != null)
+                _MouseDownItem.ProcessMouseMove(e);
+            else
+            {
+                VisualItem item = GetItemAt(e.X, e.Y);
+                if (item != _MouseOverItem && _MouseOverItem != null)
+                {
+                    _MouseOverItem.ProcessMouseLeave();
+                    _MouseOverItem = null;
+                }
+
+                if (item != null && _MouseOverItem == null)
+                {
+                    _MouseOverItem = item;
+                    _MouseOverItem.ProcessMouseEnter();
+                }
+
+                if (_MouseOverItem != null)
+                    _MouseOverItem.ProcessMouseMove(e);
+            }
+            base.OnMouseMove(e);
+        }
+
+        protected override void OnMouseHover(EventArgs e)
+        {
+             if (_MouseOverItem != null)
+                _MouseOverItem.ProcessMouseHover(e);
+            base.OnMouseHover(e);
+        }
+
+        protected override void OnMouseLeave()
+        {
+            if (_MouseDownItem != null)
+                _MouseDownItem.ProcessMouseLeave();
+            else
+            {
+                if (_MouseOverItem != null)
+                {
+                    _MouseOverItem.ProcessMouseLeave();
+                    _MouseOverItem = null;
+                }
+            }
+            base.OnMouseLeave();
+        }
+
+        protected override void OnKeyDown(System.Windows.Forms.KeyEventArgs e)
+        {
+            if (_FocusedItem != null)
+                _FocusedItem.ProcessKeyDown(e);
+            base.OnKeyDown(e);
+        }
+
+        protected override void OnKeyUp(System.Windows.Forms.KeyEventArgs e)
+        {
+            if (_FocusedItem != null)
+                _FocusedItem.ProcessKeyUp(e);
+            base.OnKeyUp(e);
+        }
+
+        protected override void OnKeyPress(System.Windows.Forms.KeyPressEventArgs e)
+        {
+            if (_FocusedItem != null)
+                _FocusedItem.ProcessKeyPress(e);
+            base.OnKeyPress(e);
+        }
+
+        protected override bool OnCmdKey(ref System.Windows.Forms.Message msg, System.Windows.Forms.Keys keyData)
+        {
+            if (_FocusedItem != null)
+                if (_FocusedItem.ProcessCmdKey(ref msg, keyData)) return true;
+            foreach (VisualItem item in this.Items)
+            {
+                if (item is VisualButtonBase)
+                {
+                    if (item.ProcessCmdKey(ref msg, keyData)) return true;
+                }
+            }
+            return base.OnCmdKey(ref msg, keyData);
+        }
+
+        public VisualItem GetItemAt(int x, int y)
+        {
+            for (int i = _Items.Count - 1; i >= 0 ; i--)
+            {
+                VisualItem item = _Items[i];
+                if (!item.Visible) continue;
+
+                if (item.RenderBounds.Contains(x, y))
+                    return item;
+            }
+
+            return null;
+        }
+
+        private VisualItem GetFirstVisibleItem()
+        {
+            foreach (VisualItem item in new VisualCollectionEnumerator(_Items, this.IsRightToLeft))
+            {
+                if (item.Visible) return item;
+            }
+            return null;
+        }
+
+        protected override void OnGotFocus()
+        {
+            OnGroupFocused();
+            base.OnGotFocus();
+        }
+
+        protected virtual void OnGroupFocused()
+        {
+            if (this.FocusedItem == null)
+            {
+                VisualItem item = GetFirstVisibleItem();
+                if (item != null) this.FocusedItem = item;
+            }
+        }
+
+        protected override void OnLostFocus()
+        {
+            this.FocusedItem = null;
+            base.OnLostFocus();
+        }
+
+        internal virtual void ProcessInputComplete()
+        {
+            OnInputComplete();
+        }
+
+        /// <summary>
+        /// Occurs when child item input is complete. Method should be used to forward the input focus onto the different field if desired.
+        /// </summary>
+        protected virtual void OnInputComplete()
+        {
+        }
+
+        /// <summary>
+        /// Occurs when input stack on the child control has changed.
+        /// </summary>
+        /// <param name="input">Control on which input has changed</param>
+        internal void ProcessInputChanged(VisualInputBase input)
+        {
+            OnInputChanged(input);
+        }
+
+        /// <summary>
+        /// Occurs when input stack on the child control has changed.
+        /// </summary>
+        /// <param name="input">Control on which input has changed</param>
+        protected virtual void OnInputChanged(VisualInputBase input)
+        {
+
+        }
+
+        private int _HorizontalItemSpacing = 0;
+        /// <summary>
+        /// Gets or sets the horizontal spacing in pixels between the items.
+        /// </summary>
+        [DefaultValue(0)]
+        public int HorizontalItemSpacing
+        {
+            get { return _HorizontalItemSpacing; }
+            set
+            {
+                if (_HorizontalItemSpacing != value)
+                {
+                    _HorizontalItemSpacing = value;
+                    this.InvalidateArrange();
+                }
+            }
+        }
+
+        private bool _IsRootVisual = false;
+        /// <summary>
+        /// Gets or sets whether visual is root visual directly parented to the control.
+        /// </summary>
+        [DefaultValue(false)]
+        public bool IsRootVisual
+        {
+            get { return _IsRootVisual; }
+            set { _IsRootVisual = value; }
+        }
+
+        private eVerticalAlignment _VerticalItemAlignment = eVerticalAlignment.Middle;
+        /// <summary>
+        /// Gets or sets group vertical alignment. Default value is middle.
+        /// </summary>
+        [DefaultValue(eVerticalAlignment.Middle)]
+        public eVerticalAlignment VerticalItemAlignment
+        {
+            get { return _VerticalItemAlignment; }
+            set
+            {
+                if (_VerticalItemAlignment != value)
+                {
+                    _VerticalItemAlignment = value;
+                    OnArrangeInvalid();
+                }
+            }
+        }
+
+        private eHorizontalAlignment _HorizontalItemAlignment = eHorizontalAlignment.Left;
+        /// <summary>
+        /// Gets or sets input group horizontal alignment. Default value is left.
+        /// </summary>
+        [DefaultValue(eHorizontalAlignment.Left)]
+        public eHorizontalAlignment HorizontalItemAlignment
+        {
+            get { return _HorizontalItemAlignment; }
+            set
+            {
+                if (_HorizontalItemAlignment != value)
+                {
+                    _HorizontalItemAlignment = value;
+                    OnArrangeInvalid();
+                }
+            }
+        }
+        #endregion
+
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/Editors/VisualInputBase.cs b/PROMS/DotNetBar Source Code/Editors/VisualInputBase.cs
new file mode 100644
index 00000000..37169211
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Editors/VisualInputBase.cs	
@@ -0,0 +1,481 @@
+#if FRAMEWORK20
+using System;
+using System.Text;
+using System.Windows.Forms;
+using System.Drawing;
+using System.ComponentModel;
+using DevComponents.DotNetBar;
+
+namespace DevComponents.Editors
+{
+    public class VisualInputBase : VisualItem
+    {
+        #region Private Variables
+        private int _InputPosition = 0;
+        private string _InputStack = "";
+        private bool _InsertMode = true;
+        private string _UndoInputStack = "";
+        #endregion
+
+        #region Events
+        /// <summary>
+        /// Occurs when input on the control has changed.
+        /// </summary>
+        public event EventHandler InputChanged;
+        /// <summary>
+        /// Occurs when validation of the input is performed and it allows you to deny the input.
+        /// </summary>
+        public event InputValidationEventHandler ValidateInput;
+        /// <summary>
+        /// Occurs when IsEmpty property has changed.
+        /// </summary>
+        public event EventHandler IsEmptyChanged;
+        #endregion
+
+        #region Constructor
+        public VisualInputBase()
+        {
+            this.Focusable = true;
+        }
+        #endregion
+
+        #region Internal Implementation
+        internal override void ProcessKeyDown(KeyEventArgs e)
+        {
+            if (!_IsReadOnly || (e.KeyCode == Keys.C && e.Modifiers == Keys.Control))
+                base.ProcessKeyDown(e);
+        }
+        internal override void ProcessKeyPress(KeyPressEventArgs e)
+        {
+            if (!_IsReadOnly)
+                base.ProcessKeyPress(e);
+        }
+        internal override void ProcessKeyUp(KeyEventArgs e)
+        {
+            if (!_IsReadOnly)
+                base.ProcessKeyUp(e);
+        }
+        internal override bool ProcessCmdKey(ref Message msg, Keys keyData)
+        {
+            if (!_IsReadOnly)
+                return base.ProcessCmdKey(ref msg, keyData);
+            return false;
+        }
+
+        protected override void OnKeyDown(System.Windows.Forms.KeyEventArgs e)
+        {
+            OnInputKeyDown(e);
+            base.OnKeyDown(e);
+        }
+
+        protected virtual void OnInputKeyDown(System.Windows.Forms.KeyEventArgs e)
+        {
+            if (e.KeyCode == System.Windows.Forms.Keys.Back)
+                ProcessBackSpace(e);
+            else if (e.KeyCode == System.Windows.Forms.Keys.Delete)
+                ProcessDelete(e);
+            else if (e.KeyCode == Keys.C && e.Modifiers == Keys.Control)
+            {
+                ProcessClipboardCopy();
+                e.Handled = true;
+            }
+            else if (e.KeyCode == Keys.X && e.Modifiers == Keys.Control)
+            {
+                ProcessClipboardCut();
+                e.Handled = true;
+            }
+            else if (e.KeyCode == Keys.V && e.Modifiers == Keys.Control)
+            {
+                ProcessClipboardPaste();
+                e.Handled = true;
+            }
+            else if (e.KeyCode == Keys.Z && e.Modifiers == Keys.Control)
+            {
+                ProcessUndo();
+                e.Handled = true;
+            }
+        }
+
+        internal virtual void ProcessClear()
+        {
+            OnClear();
+        }
+
+        internal virtual void ProcessClipboardCopy()
+        {
+            OnClipboardCopy();
+        }
+
+        internal virtual void ProcessClipboardCut()
+        {
+            OnClipboardCut();
+        }
+
+        internal virtual void ProcessClipboardPaste()
+        {
+            OnClipboardPaste();
+        }
+
+        internal virtual void ProcessUndo()
+        {
+            OnUndo();
+        }
+
+        protected virtual void OnUndo()
+        {
+            if (SetInputStack(_UndoInputStack))
+            {
+                _InputPosition = _InputStack.Length;
+                OnInputKeyAccepted();
+            }
+        }
+
+        /// <summary>
+        /// Reverts the input to the last stored value.
+        /// </summary>
+        public void UndoInput()
+        {
+            ProcessUndo();
+        }
+
+        protected virtual void OnClear()
+        {
+            if (SetInputStack(""))
+            {
+                _InputPosition = 0;
+            }
+        }
+
+        protected virtual void OnClipboardCut()
+        {
+            OnClipboardCopy();
+            OnClear();
+        }
+
+        protected virtual void OnClipboardPaste()
+        {
+            if (Clipboard.ContainsText())
+            {
+                if (SetInputStack(Clipboard.GetText()))
+                {
+                    _InputPosition = _InputStack.Length;
+                    OnInputKeyAccepted();
+                }
+            }
+        }
+
+        protected virtual void OnClipboardCopy()
+        {
+            Clipboard.SetText(GetInputStringValue());
+        }
+
+        protected virtual string GetInputStringValue()
+        {
+            return _InputStack;
+        }
+
+        protected virtual void ProcessDelete(System.Windows.Forms.KeyEventArgs e)
+        {
+            OnClear();
+            e.Handled = true;
+        }
+
+        protected virtual void ProcessBackSpace(System.Windows.Forms.KeyEventArgs e)
+        {
+            if (_InputStack.Length > 0 && _InputPosition > 0)
+            {
+                string s = _InputStack.Substring(0, _InputPosition - 1) + _InputStack.Substring(_InputPosition);
+                if (SetInputStack(s))
+                {
+                    _InputPosition = Math.Max(0, _InputPosition - 1);
+                }
+            }
+            else
+                OnClear();
+            e.Handled = true;
+        }
+
+        protected virtual void ResetValue() { }
+
+        protected override void OnKeyPress(System.Windows.Forms.KeyPressEventArgs e)
+        {
+            OnInputKeyPress(e);
+            base.OnKeyPress(e);
+        }
+
+        protected virtual void OnInputKeyPress(System.Windows.Forms.KeyPressEventArgs e)
+        {
+            if (AcceptKeyPress(e))
+                UpdateInputStack(e.KeyChar);
+        }
+
+        protected virtual void UpdateInputStack(char c)
+        {
+            string s = _InputStack;
+            if (_InputPosition >= _InputStack.Length)
+            {
+                if (_InputPosition > _InputStack.Length)
+                    _InputPosition = _InputStack.Length;
+                s += c.ToString();
+
+            }
+            else if (_InsertMode)
+                s.Insert(_InputPosition, c.ToString());
+            else
+                s = _InputStack.Substring(0, _InputPosition - 1) + c.ToString() + _InputStack.Substring(_InputPosition + 1);
+
+            if (SetInputStack(s))
+            {
+                _InputPosition++;
+                OnInputKeyAccepted();
+            }
+        }
+
+        protected virtual void OnInputKeyAccepted()
+        {
+        }
+
+        protected virtual bool SetInputStack(string s)
+        {
+            if (ValidateNewInputStack(s))
+            {
+                _InputStack = s;
+
+                OnInputStackChanged();
+
+                return true;
+            }
+
+            return false;
+        }
+
+        protected virtual bool ValidateNewInputStack(string s)
+        {
+            if (ValidateInput != null)
+            {
+                InputValidationEventArgs e = new InputValidationEventArgs(s);
+                ValidateInput(this, e);
+                return e.AcceptInput;
+            }
+
+            return true;
+        }
+
+        protected virtual void OnInputStackChanged()
+        {
+            OnInputChanged();
+        }
+
+        protected virtual void OnInputChanged()
+        {
+            if (this.Parent != null)
+                this.Parent.ProcessInputChanged(this);
+
+            if (InputChanged != null)
+                InputChanged(this, new EventArgs());
+        }
+
+        protected virtual bool AcceptKeyPress(System.Windows.Forms.KeyPressEventArgs e)
+        {
+            e.Handled = true;
+            return true;
+        }
+
+        protected override void OnGotFocus()
+        {
+            OnInputGotFocus();
+            base.OnGotFocus();
+        }
+
+        protected override void OnLostFocus()
+        {
+            OnInputLostFocus();
+            base.OnLostFocus();
+        }
+
+        protected virtual void OnInputGotFocus()
+        {
+            ResetInputStack();
+            _UndoInputStack = GetInputStringValue();
+            this.InvalidateArrange();
+        }
+
+        protected virtual void OnInputLostFocus()
+        {
+            this.InvalidateArrange();
+        }
+
+        protected string InputStack
+        {
+            get
+            {
+                return _InputStack;
+            }
+        }
+
+        protected void SetInputPosition(int position)
+        {
+            _InputPosition = position;
+        }
+
+        public int InputPosition
+        {
+            get { return _InputPosition; }
+        }
+
+        //private bool _IsInputStackEmpty = true;
+        protected bool IsInputStackEmpty
+        {
+            get
+            {
+                return _InputStack.Length == 0;
+            }
+        }
+        /// <summary>
+        /// Called when input field is full, i.e. it has an complete entry. If auto-overwrite is enabled the continued typing after input is complete
+        /// will erase the existing entry and start new one.
+        /// </summary>
+        protected virtual void InputComplete(bool sendNotification)
+        {
+            if (_AutoOverwrite)
+            {
+                ResetInputStack();
+            }
+            if (sendNotification && this.Parent != null)
+            {
+                this.Parent.ProcessInputComplete();
+            }
+        }
+
+        /// <summary>
+        /// Resets the input position so the new input overwrites current value.
+        /// </summary>
+        public void ResetInputPosition()
+        {
+            ResetInputStack();
+        }
+
+        protected virtual void ResetInputStack()
+        {
+            _InputStack = "";
+            _InputPosition = 0;
+        }
+
+        public override void PerformLayout(PaintInfo p)
+        {
+            if (p.WatermarkEnabled && this.DrawWatermark)
+            {
+                Font font = p.DefaultFont;
+                if (p.WatermarkFont != null) font = p.WatermarkFont;
+                System.Drawing.Size size = TextDrawing.MeasureString(p.Graphics, this.WatermarkText, font, 0, eTextFormat.Default | eTextFormat.NoPadding);
+                this.Size = size;
+            }
+            base.PerformLayout(p);
+        }
+
+        protected override void OnPaint(PaintInfo p)
+        {
+            if (p.WatermarkEnabled && this.DrawWatermark)
+            {
+                Font font = p.DefaultFont;
+                if (p.WatermarkFont != null) font = p.WatermarkFont;
+                TextDrawing.DrawString(p.Graphics, this.WatermarkText, font, p.WatermarkColor, this.RenderBounds, eTextFormat.Default);
+            }
+
+            base.OnPaint(p);
+        }
+
+        /// <summary>
+        /// Gets whether watermark will be drawn in current control state.
+        /// </summary>
+        protected virtual bool DrawWatermark
+        {
+            get
+            {
+                return this.WatermarkEnabled && this.IsEmpty && this.WatermarkText.Length > 0 && !this.IsFocused;
+            }
+        }
+
+        private bool _IsEmpty = true;
+        /// <summary>
+        /// Gets or sets whether control is empty.
+        /// </summary>
+        public virtual bool IsEmpty
+        {
+            get { return _IsEmpty; }
+            set
+            {
+                if (value != _IsEmpty)
+                {
+                    _IsEmpty = value;
+                    InvalidateArrange();
+                    if (this.Parent is VisualInputGroup)
+                        ((VisualInputGroup)this.Parent).UpdateIsEmpty();
+                    if (value)
+                        ResetValue();
+                    OnIsEmptyChanged();
+                }
+            }
+        }
+
+        protected virtual void OnIsEmptyChanged() 
+        {
+            if (IsEmptyChanged != null)
+                IsEmptyChanged(this, new EventArgs());
+        }
+
+        private bool _AutoOverwrite = true;
+        /// <summary>
+        /// Gets or sets whether auto-overwrite functionality for input is enabled. When in auto-overwrite mode input field will erase existing entry
+        /// and start new one if typing is continued after InputComplete method is called.
+        /// </summary>
+        public bool AutoOverwrite
+        {
+            get { return _AutoOverwrite; }
+            set { _AutoOverwrite = value; }
+        }
+
+        private string _WatermarkText = "";
+        /// <summary>
+        /// Gets or sets the watermark text displayed on the input control when control is empty.
+        /// </summary>
+        [Localizable(true)]
+        public string WatermarkText
+        {
+            get { return _WatermarkText; }
+            set
+            {
+                if (value != null)
+                    _WatermarkText = value;
+            }
+        }
+
+        private bool _WatermarkEnabled = true;
+        /// <summary>
+        /// Gets or sets whether watermark text is displayed if set. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Description("Indicates whether watermark text is displayed if set.")]
+        public virtual bool WatermarkEnabled
+        {
+            get { return _WatermarkEnabled; }
+            set { _WatermarkEnabled = value; }
+        }
+
+        private bool _IsReadOnly = false;
+        /// <summary>
+        /// Gets or sets whether input item is read-only.
+        /// </summary>
+        public virtual bool IsReadOnly
+        {
+            get { return _IsReadOnly; }
+            set
+            {
+                _IsReadOnly = value;
+            }
+        }
+        #endregion
+
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/Editors/VisualInputGroup.cs b/PROMS/DotNetBar Source Code/Editors/VisualInputGroup.cs
new file mode 100644
index 00000000..d0631401
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Editors/VisualInputGroup.cs	
@@ -0,0 +1,422 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel;
+using System.Windows.Forms;
+
+namespace DevComponents.Editors
+{
+    /// <summary>
+    /// Represents the group of the input items with automatic and manual item focus change.
+    /// </summary>
+    public class VisualInputGroup : VisualGroup
+    {
+        #region Private Variables
+        #endregion
+
+        #region Events
+        #endregion
+
+        #region Constructor
+        #endregion
+
+        #region Internal Implementation
+        /// <summary>
+        /// Resets the input position so the new input overwrites current value.
+        /// </summary>
+        public void ResetInputPosition()
+        {
+            foreach (VisualItem item in this.Items)
+            {
+                VisualInputBase input = item as VisualInputBase;
+                if (input != null)
+                    input.ResetInputPosition();
+            }
+        }
+
+        protected override bool OnCmdKey(ref System.Windows.Forms.Message msg, System.Windows.Forms.Keys keyData)
+        {
+            if (keyData == Keys.Tab && (Control.ModifierKeys & Keys.Shift) != Keys.Shift && this.TabNavigationEnabled ||
+                keyData == Keys.Enter && this.EnterNavigationEnabled ||
+                keyData == Keys.Right && this.ArrowNavigationEnabled)
+            {
+                ValidateInput(this.FocusedItem);
+                if (SelectNextInput())
+                    return true;
+            }
+            else if (keyData == Keys.Left && this.ArrowNavigationEnabled ||
+                (keyData & Keys.Tab) == Keys.Tab && (keyData & Keys.Shift) == Keys.Shift && this.TabNavigationEnabled)
+            {
+                ValidateInput(this.FocusedItem);
+                if (SelectPreviousInput())
+                    return true;
+            }
+
+            return base.OnCmdKey(ref msg, keyData);
+        }
+
+        private bool _TabNavigationEnabled = true;
+        /// <summary>
+        /// Gets or sets whether Tab key is used to navigate between the fields. Default value is true.
+        /// </summary>
+        [DefaultValue(true)]
+        public bool TabNavigationEnabled
+        {
+            get
+            {
+                return _TabNavigationEnabled;
+            }
+            set
+            {
+                _TabNavigationEnabled = value;
+            }
+        }
+
+        private bool _EnterNavigationEnabled = true;
+        /// <summary>
+        /// Gets or sets whether Enter key is used to navigate between input fields. Default value is true.
+        /// </summary>
+        [DefaultValue(true)]
+        public bool EnterNavigationEnabled
+        {
+            get
+            {
+                return _EnterNavigationEnabled;
+            }
+            set
+            {
+                _EnterNavigationEnabled = value;
+            }
+        }
+
+        private bool _ArrowNavigationEnabled = true;
+        /// <summary>
+        /// Gets or sets whether Arrow keys are used to navigate between input fields. Default value is true.
+        /// </summary>
+        [DefaultValue(true)]
+        public bool ArrowNavigationEnabled
+        {
+            get
+            {
+                return _ArrowNavigationEnabled;
+            }
+            set
+            {
+                _ArrowNavigationEnabled = value;
+            }
+        }
+
+        private bool _AutoAdvance = false;
+        /// <summary>
+        /// Gets or sets whether input focus is automatically advanced to next input field when input is complete in current one.
+        /// </summary>
+        [DefaultValue(false)]
+        public bool AutoAdvance
+        {
+            get { return _AutoAdvance; }
+            set { _AutoAdvance = value; }
+        }
+
+        protected override void OnInputComplete()
+        {
+            if (ValidateInput(this.FocusedItem))
+            {
+                if (_AutoAdvance)
+                {
+                    if (!this.SelectNextInput())
+                    {
+                        OnGroupInputComplete();
+                    }
+                }
+            }
+
+            base.OnInputComplete();
+        }
+
+        protected virtual bool ValidateInput(VisualItem inputItem)
+        {
+            return true;
+        }
+
+        protected virtual void OnGroupInputComplete()
+        {
+            if (this.Parent != null)
+            {
+                this.Parent.ProcessInputComplete();
+            }
+        }
+
+        internal bool SelectNextInput()
+        {
+            return SelectInputItem(true);
+        }
+
+        internal bool SelectPreviousInput()
+        {
+            return SelectInputItem(false);
+        }
+
+        internal bool SelectInputItem(bool moveForward)
+        {
+            if (this.FocusedItem is VisualInputGroup)
+            {
+                VisualInputGroup group = this.FocusedItem as VisualInputGroup;
+                if (group.SelectInputItem(moveForward))
+                    return true;
+            }
+
+            VisualCollectionEnumerator enumerator = new VisualCollectionEnumerator(this.Items, !moveForward || this.IsRightToLeft);
+            enumerator.CurrentIndex = this.Items.IndexOf(this.FocusedItem);
+
+            while (enumerator.MoveNext())
+            {
+                VisualInputBase vi = enumerator.Current as VisualInputBase;
+                if (vi != null && CanFocus(vi))
+                {
+                    this.FocusedItem = vi;
+                    return true;
+                }
+                else if (enumerator.Current is VisualInputGroup)
+                {
+                    VisualInputGroup group = enumerator.Current as VisualInputGroup;
+                    if (group.SelectInputItem(moveForward))
+                    {
+                        this.FocusedItem = group;
+                        return true;
+                    }
+                }
+            }
+
+            return false;
+        }
+
+        protected override void OnGroupFocused()
+        {
+            if (this.FocusedItem == null)
+                SelectInputItem(true);
+        }
+
+        private bool _IsReadOnly = false;
+        /// <summary>
+        /// Gets or sets whether input items are read-only.
+        /// </summary>
+        public bool IsReadOnly
+        {
+            get { return _IsReadOnly; }
+            set
+            {
+                if (_IsReadOnly != value)
+                {
+                    _IsReadOnly = value;
+                    OnIsReadOnlyChanged();
+                }
+            }
+        }
+
+        private void OnIsReadOnlyChanged()
+        {
+            for (int i = 0; i < this.Items.Count; i++)
+            {
+                VisualInputBase v = this.Items[i] as VisualInputBase;
+                if (v != null) v.IsReadOnly = this.IsReadOnly;
+            }
+        }
+
+        protected override void OnItemsCollectionChanged(CollectionChangedInfo collectionChangedInfo)
+        {
+            if (collectionChangedInfo.ChangeType == eCollectionChangeType.Adding || collectionChangedInfo.ChangeType == eCollectionChangeType.Removing ||
+                collectionChangedInfo.ChangeType == eCollectionChangeType.Clearing)
+            {
+                if (collectionChangedInfo.Added != null)
+                {
+                    foreach (VisualItem item in collectionChangedInfo.Added)
+                    {
+                        VisualInputBase v = item as VisualInputBase;
+                        if (v != null)
+                        {
+                            v.IsReadOnly = this.IsReadOnly;
+                            v.AutoOverwrite = _AutoOverwrite;
+                        }
+                    }
+                }
+            }
+
+            base.OnItemsCollectionChanged(collectionChangedInfo);
+        }
+
+        private bool _AllowEmptyState = true;
+        [DefaultValue(true)]
+        public bool AllowEmptyState
+        {
+            get { return _AllowEmptyState; }
+            set
+            {
+                if (_AllowEmptyState != value)
+                {
+                    _AllowEmptyState = value;
+                    OnAllowEmptyStateChanged();
+                    InvalidateArrange();
+                }
+            }
+        }
+
+        protected virtual void OnAllowEmptyStateChanged()
+        {
+            foreach (VisualItem item in this.Items)
+            {
+                if (item is VisualNumericInput) ((VisualNumericInput)item).AllowEmptyState = this.AllowEmptyState;
+            }
+        }
+
+        private bool _IsEmpty = true;
+        /// <summary>
+        /// Gets or sets whether input group is empty i.e. it does not hold any value.
+        /// </summary>
+        [DefaultValue(true), Browsable(false)]
+        public bool IsEmpty
+        {
+            get { return _IsEmpty; }
+            set
+            {
+                if (_IsEmpty != value)
+                {
+                    _IsEmpty = value;
+                    if (_IsEmpty)
+                    {
+                        ResetValue();
+                    }
+                    if (this.Parent is VisualInputGroup)
+                        ((VisualInputGroup)this.Parent).UpdateIsEmpty();
+                }
+            }
+        }
+
+        protected override void OnInputChanged(VisualInputBase input)
+        {
+            UpdateIsEmpty();
+            base.OnInputChanged(input);
+        }
+
+        /// <summary>
+        /// Updates the IsEmpty property value based on the contained input controls.
+        /// </summary>
+        public virtual void UpdateIsEmpty()
+        {
+            bool empty = true;
+            foreach (VisualItem item in this.Items)
+            {
+                if (item is VisualInputBase && !((VisualInputBase)item).IsEmpty)
+                {
+                    empty = false;
+                    break;
+                }
+                else if (item is VisualInputGroup && !((VisualInputGroup)item).IsEmpty)
+                {
+                    empty = false;
+                    break;
+                }
+
+            }
+            this.IsEmpty = empty;
+        }
+
+        private bool _ResettingValue = false;
+        protected virtual void ResetValue()
+        {
+            _ResettingValue = true;
+
+            try
+            {
+                VisualItem[] items = new VisualItem[this.Items.Count];
+                this.Items.CopyTo(items);
+                foreach (VisualItem item in items)
+                {
+                    if (item is VisualInputGroup)
+                        ((VisualInputGroup)item).IsEmpty = true;
+                    else if (item is VisualInputBase)
+                        ((VisualInputBase)item).IsEmpty = true;
+                }
+            }
+            finally
+            {
+                _ResettingValue = false;
+            }
+        }
+
+        private bool _AutoOverwrite = true;
+        /// <summary>
+        /// Gets or sets whether auto-overwrite functionality for input is enabled. When in auto-overwrite mode input field will erase existing entry
+        /// and start new one if typing is continued after InputComplete method is called.
+        /// </summary>
+        public bool AutoOverwrite
+        {
+            get { return _AutoOverwrite; }
+            set 
+            {
+                if (_AutoOverwrite != value)
+                {
+                    _AutoOverwrite = value;
+                    OnAutoOverwriteChanged();
+                }
+            }
+        }
+
+        private void OnAutoOverwriteChanged()
+        {
+            foreach (VisualItem item in this.Items)
+            {
+                VisualInputBase input = item as VisualInputBase;
+                if (input != null && input.AutoOverwrite != _AutoOverwrite)
+                    input.AutoOverwrite = _AutoOverwrite;
+            }
+        }
+
+        private bool _IsUserInput = false;
+        /// <summary>
+        /// Gets or sets whether current input is the user input.
+        /// </summary>
+        public bool IsUserInput
+        {
+            get { return _IsUserInput; }
+            set
+            {
+                _IsUserInput = value;
+            }
+        }
+
+        private string _SelectNextInputCharacters = "";
+        /// <summary>
+        /// List of characters that when pressed would select next input field.
+        /// </summary>
+        public string SelectNextInputCharacters
+        {
+            get { return _SelectNextInputCharacters; }
+            set
+            {
+                if (value == null) value = "";
+                if (_SelectNextInputCharacters != value)
+                {
+                    _SelectNextInputCharacters = value;
+                }
+            }
+        }
+
+        protected override void OnKeyPress(System.Windows.Forms.KeyPressEventArgs e)
+        {
+            if (_SelectNextInputCharacters.Length > 0 && _SelectNextInputCharacters.Contains(e.KeyChar.ToString()))
+            {
+                if (SelectNextInput())
+                {
+                    e.Handled = true;
+                    return;
+                }
+            }
+            base.OnKeyPress(e);
+        }
+        #endregion
+
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/Editors/VisualIntegerInput.cs b/PROMS/DotNetBar Source Code/Editors/VisualIntegerInput.cs
new file mode 100644
index 00000000..91073475
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Editors/VisualIntegerInput.cs	
@@ -0,0 +1,421 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel;
+using System.Globalization;
+using System.Windows.Forms;
+
+namespace DevComponents.Editors
+{
+    public class VisualIntegerInput : VisualNumericInput
+    {
+        #region Private Variables
+        private int _Value = 0;
+        private int _MinValue = int.MinValue;
+        private int _MaxValue = int.MaxValue;
+        #endregion
+
+        #region Events
+        #endregion
+
+        #region Constructor
+        #endregion
+
+        #region Internal Implementation
+        protected override void OnInputStackChanged()
+        {
+            if (this.InputStack.Length > 0)
+            {
+                this.IsEmpty = false;
+
+                if (this.InputStack == "-")
+                {
+                    SetValue(0, true);
+                    return;
+                }
+
+                int newValue = int.Parse(this.InputStack);
+                SetValue(newValue, true);
+            }
+            else
+            {
+                if (this.AllowEmptyState)
+                    this.IsEmpty = true;
+                SetValue(0, true);
+            }
+
+            base.OnInputStackChanged();
+        }
+
+        protected override void OnInputKeyAccepted()
+        { 
+            CheckInputComplete(true);
+            base.OnInputKeyAccepted();
+        }
+
+        private void CheckInputComplete(bool sendNotification)
+        {
+            int predictedValue = GetNextPredictedValue(_Value);
+
+            if (_Value == _MaxValue || (ConvertToString(_Value).Length >= ConvertToString(_MaxValue).Length && ConvertToString(_Value).Length >= ConvertToString(_MinValue).Length) ||
+                predictedValue > _MaxValue)
+                InputComplete(sendNotification);
+            else if (IsLeadingZero && ConvertToString(_Value).Length + 1 >= ConvertToString(_MaxValue).Length)
+                InputComplete(sendNotification);
+        }
+
+        private int GetNextPredictedValue(int value)
+        {
+            string s = "";
+            if (value == 0)
+                s = "1";
+            else
+                s = ConvertToString(value) + "0";
+            int i = value;
+            int.TryParse(s, out i);
+            return i;
+        }
+
+        protected override void OnLostFocus()
+        {
+            ValidateValue();
+            base.OnLostFocus();
+        }
+
+        protected virtual void ValidateValue()
+        {
+            if (_Value < _MinValue && !this.IsEmpty)
+                Value = _MinValue;
+            else if (_Value > _MaxValue && !this.IsEmpty)
+                Value = _MaxValue;
+        }
+
+        private void SetValue(int i, bool raiseValueChanged)
+        {
+            bool changed = _Value != i || raiseValueChanged;
+            _Value = i;
+            if (changed)
+                OnValueChanged();
+            InvalidateArrange();
+        }
+
+        private void SetValue(int i)
+        {
+            SetValue(i, false);
+        }
+
+        protected override string GetMeasureString()
+        {
+            string s = ConvertToString(_Value, true);
+            if (this.IsEmpty && this.AllowEmptyState)
+                s = "T";
+            else if (this.InputStack == "-" && _Value == 0)
+                s = "-";
+            return s;
+        }
+
+        protected override string GetRenderString()
+        {
+            if (this.InputStack == "-" && _Value == 0)
+                return "-";
+
+            if (this.IsEmpty && this.AllowEmptyState)
+                return "";
+
+            string text = ConvertToString(_Value, true);
+
+            return text;
+        }
+
+        protected override void NegateValue()
+        {
+            if (!this.IsEmpty && _MaxValue >= 0)
+            {
+                int newValue = -_Value;
+                SetValueDirect(FormatNumber(newValue));
+            }
+        }
+
+        protected override void ResetValue()
+        {
+            ResetInputStack();
+            int i = 0;
+            if (_MinValue > i) i = _MinValue;
+            if (i > _MaxValue) i = _MaxValue;
+            SetValue(i);
+            InvalidateArrange();
+        }
+
+        public int MinValue
+        {
+            get { return _MinValue; }
+            set
+            {
+                if (_MinValue != value)
+                {
+                    _MinValue = value;
+
+                    if (_MinValue >= 0)
+                        this.AllowsNegativeValue = false;
+                    else
+                        this.AllowsNegativeValue = true;
+                    if (_Value < _MinValue && (!this.IsEmpty || this.IsEmpty && !this.AllowEmptyState))
+                    {
+                        if (this.IsFocused)
+                            SetValueDirect(FormatNumber(_MinValue));
+                        else
+                            SetValue(_MinValue);
+                    }
+                }
+            }
+        }
+
+        private string FormatNumber(int i)
+        {
+            CultureInfo ci = DevComponents.Editors.DateTimeAdv.DateTimeInput.GetActiveCulture();
+            IFormatProvider formatProvider = ci.GetFormat(typeof(NumberFormatInfo)) as IFormatProvider;
+            if (formatProvider != null)
+                return i.ToString(formatProvider);
+
+            return i.ToString();
+        }
+
+        public int MaxValue
+        {
+            get { return _MaxValue; }
+            set
+            {
+                if (_MaxValue != value)
+                {
+                    _MaxValue = value;
+                    if (_Value > _MaxValue && (!this.IsEmpty || this.IsEmpty && !this.AllowEmptyState))
+                    {
+                        if (this.IsFocused)
+                            SetValueDirect(FormatNumber(_MaxValue));
+                        else
+                            SetValue(_MaxValue);
+                    }
+                }
+            }
+        }
+
+        protected override void OnClipboardPaste()
+        {
+            if (Clipboard.ContainsText())
+            {
+                string s = StripNonNumeric(Clipboard.GetText().Replace(" ", ""));
+                int value = 0;
+                if (int.TryParse(s, out value))
+                {
+                    if (value > _MaxValue || value < _MinValue) return;
+                    if (SetInputStack(value.ToString()))
+                    {
+                        SetInputPosition(InputStack.Length);
+                        OnInputKeyAccepted();
+                    }
+                    return;
+                }
+                else
+                    return;
+            }
+            base.OnClipboardPaste();
+        }
+        private string StripNonNumeric(string p)
+        {
+            string s = "";
+            for (int i = 0; i < p.Length; i++)
+            {
+                if (p[i].ToString() == NumberDecimalSeparator)
+                    break;
+                else if (p[i] >= '0' && p[i] <= '9' || i == 0 && p[i] == '-')
+                    s += p[i];
+                else if (s.Length > 0 && p[i].ToString() != NumberThousandsSeparator) break;
+            }
+            return s;
+        }
+        private string NumberDecimalSeparator
+        {
+            get { return DevComponents.Editors.DateTimeAdv.DateTimeInput.GetActiveCulture().NumberFormat.NumberDecimalSeparator; }
+        }
+
+        private string NumberThousandsSeparator
+        {
+            get { return DevComponents.Editors.DateTimeAdv.DateTimeInput.GetActiveCulture().NumberFormat.NumberGroupSeparator; }
+        }
+
+        protected override bool ValidateNewInputStack(string s)
+        {
+            if (s.Length > 0)
+            {
+                if (s == "-" && this.AllowsNegativeValue)
+                    return true;
+                int value = 0;
+                if (int.TryParse(s, out value))
+                {
+                    if (value > _MaxValue && _MaxValue >= 0 || value < _MinValue && _MinValue < 0)
+                        return false;
+                    return true;
+                }
+                else
+                    return false;
+            }
+            return base.ValidateNewInputStack(s);
+        }
+
+        public override void IncreaseValue()
+        {
+            if (_Increment > 0)
+            {
+                int newValue = _Value + _Increment;
+
+                if (newValue > _MaxValue)
+                    newValue = _MaxValue;
+                else if (newValue < _MinValue)
+                    newValue = _MinValue;
+
+                if (_Value < _MaxValue && newValue > _MaxValue) newValue = _MaxValue;
+
+                if (newValue <= _MaxValue)
+                {
+                    if (this.IsEmpty && this.AllowEmptyState) newValue = Math.Max(0, _MinValue);
+
+                    SetValueDirect(FormatNumber(newValue));
+                    CheckInputComplete(false);
+                }
+            }
+
+            base.IncreaseValue();
+        }
+
+        public override void DecreaseValue()
+        {
+            if (_Increment > 0)
+            {
+                int newValue = _Value - _Increment;
+
+                if (newValue > _MaxValue)
+                    newValue = _MaxValue;
+                else if (newValue < _MinValue)
+                    newValue = _MinValue;
+
+                if (_Value > _MinValue && newValue < _MinValue) newValue = _MinValue;
+                if (newValue >= _MinValue)
+                {
+                    SetValueDirect(FormatNumber(newValue));
+                    CheckInputComplete(false);
+                }
+            }
+                
+            base.DecreaseValue();
+        }
+
+        private int _Increment = 1;
+        /// <summary>
+        /// Gets or sets the value to increment or decrement the value of the control when the up or down buttons are clicked. 
+        /// </summary>
+        [DefaultValue(1)]
+        public int Increment
+        {
+            get { return _Increment; }
+            set
+            {
+                value = Math.Abs(value);
+                if (_Increment != value)
+                {
+                    _Increment = value;
+                }
+            }
+        }
+
+        private void SetValueDirect(string s)
+        {
+            if (SetInputStack(s))
+            {
+                SetInputPosition(InputStack.Length);
+            }
+        }
+
+        private string ConvertToString(int i)
+        {
+            return ConvertToString(i, false);
+        }
+        private string ConvertToString(int i, bool useFormat)
+        {
+            return ConvertToString(i, useFormat, false);
+        }
+
+        private string ConvertToString(int i, bool useFormat, bool forceFormat)
+        {
+            if (!forceFormat && (!useFormat || this.IsFocused) || _DisplayFormat.Length == 0)
+                return FormatNumber(i);
+            else
+            {
+                CultureInfo ci = DevComponents.Editors.DateTimeAdv.DateTimeInput.GetActiveCulture();
+                IFormatProvider formatProvider = ci.GetFormat(typeof(NumberFormatInfo)) as IFormatProvider;
+                if (formatProvider != null)
+                    return i.ToString(_DisplayFormat, formatProvider);
+                
+                return i.ToString(_DisplayFormat);
+            }
+        }
+
+        [Browsable(false)]
+        public virtual string Text
+        {
+            get
+            {
+                if (this.IsEmpty && this.AllowEmptyState) return "";
+                return ConvertToString(_Value, true, true);
+            }
+        }
+
+        public virtual int Value
+        {
+            get
+            {
+                if (_Value < _MinValue)
+                    return _MinValue;
+                if (_Value > _MaxValue)
+                    return _MaxValue;
+                return _Value;
+            }
+            set
+            {
+                //if (_Value != value)
+                {
+                    if (value < _MinValue) value = _MinValue;
+                    if (value > _MaxValue) value = _MaxValue;
+                    SetValueDirect(ConvertToString(value));
+                    if (this.IsFocused)
+                        InputComplete(false);
+                }
+            }
+        }
+
+        protected override string GetInputStringValue()
+        {
+            return ConvertToString(_Value);
+        }
+
+        private string _DisplayFormat = "";
+        /// <summary>
+        /// Gets or sets the Numeric String Format that is used to format the numeric value entered for display purpose.
+        /// </summary>
+        [Description("Indicates Numeric String Format that is used to format the numeric value entered for display purpose.")]
+        public string DisplayFormat
+        {
+            get { return _DisplayFormat; }
+            set
+            {
+                if (value != null)
+                    _DisplayFormat = value;
+            }
+        }
+
+        #endregion
+
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/Editors/VisualItem.cs b/PROMS/DotNetBar Source Code/Editors/VisualItem.cs
new file mode 100644
index 00000000..bf0e7f48
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Editors/VisualItem.cs	
@@ -0,0 +1,501 @@
+#if FRAMEWORK20
+using System;
+using System.Text;
+using System.Windows.Forms;
+using System.Drawing;
+using System.ComponentModel;
+
+namespace DevComponents.Editors
+{
+    public class VisualItem
+    {
+        #region Private Variables
+        #endregion
+
+        #region Events
+        /// <summary>
+        /// Occurs when item arrange becomes invalid.
+        /// </summary>
+        public event EventHandler ArrangeInvalid;
+
+        /// <summary>
+        /// Occurs when item appearance becomes invalid and items needs to be repainted.
+        /// </summary>
+        public event EventHandler RenderInvalid;
+        /// <summary>
+        /// Occurs when item needs to signal to parent control that MouseHover needs to be reset usually in response to tooltip hiding.
+        /// </summary>
+        public event EventHandler ResetMouseHover;
+
+        /// <summary>
+        /// Occurs when item is clicked.
+        /// </summary>
+        public event EventHandler Click;
+        /// <summary>
+        /// Occurs when item is clicked using mouse.
+        /// </summary>
+        public event MouseEventHandler MouseClick;
+        /// <summary>
+        /// Occurs when mouse button is pressed over the item.
+        /// </summary>
+        public event MouseEventHandler MouseDown;
+        /// <summary>
+        /// Occurs when mouse button is pressed over the item.
+        /// </summary>
+        public event MouseEventHandler MouseUp;
+        /// <summary>
+        /// Occurs when mouse hovers over the item.
+        /// </summary>
+        public event EventHandler MouseHover;
+        #endregion
+
+        #region Constructor
+        #endregion
+
+        #region Internal Implementation
+
+        internal virtual void ProcessMouseEnter()
+        {
+            if (this.GetIsEnabled())
+                OnMouseEnter();
+        }
+
+        protected virtual void OnMouseEnter()
+        {
+
+        }
+
+        internal virtual void ProcessMouseLeave()
+        {
+            if (this.GetIsEnabled())
+                OnMouseLeave();
+        }
+
+        protected virtual void OnMouseLeave()
+        {
+
+        }
+
+        internal virtual void ProcessMouseMove(MouseEventArgs e)
+        {
+            if (this.GetIsEnabled())
+                OnMouseMove(e);
+        }
+
+        protected virtual void OnMouseMove(MouseEventArgs e)
+        {
+
+        }
+
+        internal virtual void ProcessMouseWheel(MouseEventArgs e)
+        {
+            if (this.GetIsEnabled())
+                OnMouseWheel(e);
+        }
+
+        protected virtual void OnMouseWheel(MouseEventArgs e)
+        {
+        }
+
+        internal virtual void ProcessMouseDown(MouseEventArgs e)
+        {
+            if (this.GetIsEnabled())
+                OnMouseDown(e);
+        }
+
+        protected virtual void OnMouseDown(MouseEventArgs e)
+        {
+            if (MouseDown != null)
+                MouseDown(this, e);
+        }
+
+        internal virtual void ProcessMouseUp(MouseEventArgs e)
+        {
+            if (this.GetIsEnabled())
+                OnMouseUp(e);
+        }
+
+        protected virtual void OnMouseUp(MouseEventArgs e)
+        {
+            if (MouseUp != null)
+                MouseUp(this, e);
+        }
+
+        internal virtual void ProcessMouseHover(EventArgs e)
+        {
+            if (this.GetIsEnabled())
+                OnMouseHover(e);
+        }
+        protected virtual void OnMouseHover(EventArgs e)
+        {
+            if (MouseHover != null)
+                MouseHover(this, e);
+        }
+
+        internal virtual void ProcessClick()
+        {
+            if (this.GetIsEnabled())
+                OnClick(EventArgs.Empty);
+        }
+
+        protected virtual void OnClick(EventArgs e)
+        {
+            if (Click != null)
+                Click(this, e);
+        }
+
+        internal virtual void ProcessMouseClick(MouseEventArgs e)
+        {
+            if (this.GetIsEnabled())
+                OnMouseClick(e);
+        }
+
+        protected virtual void OnMouseClick(MouseEventArgs e)
+        {
+            if (MouseClick != null)
+                MouseClick(this, e);
+        }
+
+        internal virtual void ProcessKeyDown(KeyEventArgs e)
+        {
+            OnKeyDown(e);
+        }
+
+        protected virtual void OnKeyDown(KeyEventArgs e)
+        {
+
+        }
+
+        internal virtual void ProcessKeyUp(KeyEventArgs e)
+        {
+            OnKeyUp(e);
+        }
+
+        protected virtual void OnKeyUp(KeyEventArgs e)
+        {
+
+        }
+
+        internal virtual void ProcessKeyPress(KeyPressEventArgs e)
+        {
+            OnKeyPress(e);
+        }
+
+        protected virtual void OnKeyPress(KeyPressEventArgs e)
+        {
+
+        }
+
+        internal virtual bool ProcessCmdKey(ref Message msg, Keys keyData)
+        {
+            return OnCmdKey(ref msg, keyData);
+        }
+
+        protected virtual bool OnCmdKey(ref Message msg, Keys keyData)
+        {
+            return false;
+        }
+
+        internal virtual void ProcessGotFocus()
+        {
+            OnGotFocus();
+        }
+
+        protected virtual void OnGotFocus()
+        {
+            _IsFocused = true;
+            OnFocusChanged();
+        }
+
+        internal virtual void ProcessLostFocus()
+        {
+            OnLostFocus();
+        }
+
+        protected virtual void OnLostFocus()
+        {
+            _IsFocused = false;
+            OnFocusChanged();
+        }
+
+        protected virtual void OnFocusChanged()
+        {
+
+        }
+
+        internal virtual void ProcessPaint(PaintInfo p)
+        {
+            if (!IsRendered) return;
+            OnPaint(p);
+        }
+
+        protected virtual void OnPaint(PaintInfo p)
+        {
+        }
+
+        private bool _Focusable = false;
+        public bool Focusable
+        {
+            get { return _Focusable; }
+            set
+            {
+                if (_Focusable != value)
+                {
+                    _Focusable = value;
+                    OnFocusableChanged();
+                }
+            }
+        }
+
+        protected virtual void OnFocusableChanged()
+        {
+
+        }
+
+        private bool _Enabled = true;
+        /// <summary>
+        /// Gets or sets whether item is Enabled.
+        /// </summary>
+        [DefaultValue(true)]
+        public bool Enabled
+        {
+            get { return _Enabled; }
+            set
+            {
+                if (_Enabled != value)
+                {
+                    _Enabled = value;
+                    OnRenderInvalid();
+                }
+            }
+        }
+
+        protected virtual bool GetIsEnabled()
+        {
+            if (!_Enabled) return _Enabled;
+            VisualItem p = this.Parent;
+            while (p != null)
+            {
+                if (!p.Enabled) return false;
+                p = p.Parent;
+            }
+
+            return _Enabled;
+        }
+
+        protected virtual bool GetIsEnabled(PaintInfo p)
+        {
+            return p.ParentEnabled && _Enabled;
+        }
+
+        private bool _Visible = true;
+        public bool Visible
+        {
+            get { return _Visible; }
+            set
+            {
+                if (_Visible != value)
+                {
+                    _Visible = value;
+                    OnVisibleChanged();
+                }
+            }
+        }
+
+        protected virtual void OnVisibleChanged()
+        {
+            if (_Parent != null)
+            {
+                _Parent.OnChildItemVisibleChanged(this);
+            }
+        }
+
+        private bool _IsRendered = true;
+        /// <summary>
+        /// Gets or sets whether visual is rendered. Default value is true.
+        /// </summary>
+        public virtual bool IsRendered
+        {
+            get { return _IsRendered; }
+            set
+            {
+                _IsRendered = value;
+            }
+        }
+
+        public virtual void InvalidateArrange()
+        {
+            _RenderBounds = Rectangle.Empty;
+            _Location = Point.Empty;
+            _IsLayoutValid = false;
+            if (_Parent != null)
+                _Parent.InvalidateArrange();
+            OnArrangeInvalid();
+        }
+
+        public virtual void InvalidateRender()
+        {
+            if (_Parent != null)
+                _Parent.InvalidateRender();
+            OnRenderInvalid();
+        }
+
+        /// <summary>
+        /// Raises the RenderInvalid event.
+        /// </summary>
+        protected virtual void OnRenderInvalid()
+        {
+            if (RenderInvalid != null)
+                RenderInvalid(this, new EventArgs());
+        }
+
+        /// <summary>
+        /// Raises the ArrangeInvalid event.
+        /// </summary>
+        protected virtual void OnArrangeInvalid()
+        {
+            if (ArrangeInvalid != null)
+                ArrangeInvalid(this, new EventArgs());
+        }
+
+        private VisualGroup _Parent;
+        /// <summary>
+        /// Gets the parent of the item.
+        /// </summary>
+        public VisualGroup Parent
+        {
+            get { return _Parent; }
+            internal set
+            {
+                if (_Parent != value)
+                {
+                    _Parent = value;
+                    OnParentChanged();
+                }
+            }
+        }
+
+        protected virtual void OnParentChanged()
+        {
+
+        }
+
+        private Size _ItemSize = Size.Empty;
+        public Size Size
+        {
+            get { return _ItemSize; }
+            internal set
+            {
+                _ItemSize = value;
+            }
+        }
+
+        private Rectangle _RenderBounds = Rectangle.Empty;
+        public Rectangle RenderBounds
+        {
+            get { return _RenderBounds; }
+            internal set
+            {
+                _RenderBounds = value;
+            }
+        }
+
+        private Point _Location;
+        /// <summary>
+        /// Gets the relative location of the element inside of its parent item.
+        /// </summary>
+        public Point Location
+        {
+            get { return _Location; }
+            internal set { _Location = value; }
+        }
+
+        private bool _IsRightToLeft;
+        public bool IsRightToLeft
+        {
+            get { return _IsRightToLeft; }
+            set
+            {
+                if (_IsRightToLeft != value)
+                {
+                    _IsRightToLeft = value;
+                    OnIsRightToLeftChanged();
+                }
+            }
+        }
+
+        protected virtual void OnIsRightToLeftChanged()
+        {
+            InvalidateArrange();
+        }
+
+        private bool _IsLayoutValid = false;
+        public virtual bool IsLayoutValid
+        {
+            get { return _IsLayoutValid; }
+        }
+
+        public virtual void PerformLayout(PaintInfo pi) { _IsLayoutValid = true; }
+
+        private bool _IsFocused = false;
+        public bool IsFocused
+        {
+            get { return _IsFocused; }
+        }
+
+        private eItemAlignment _Alignment = eItemAlignment.Left;
+        /// <summary>
+        /// Gets or sets the item horizontal alignment inside of the parent group. Default value is left.
+        /// </summary>
+        [DefaultValue(eItemAlignment.Left)]
+        public eItemAlignment Alignment
+        {
+            get { return _Alignment; }
+            set
+            {
+                if (_Alignment != value)
+                {
+                    _Alignment = value;
+                    this.InvalidateArrange();
+                }
+            }
+        }
+
+        private eSystemItemType _ItemType = eSystemItemType.Default;
+        internal eSystemItemType ItemType
+        {
+            get { return _ItemType; }
+            set
+            {
+                _ItemType = value;
+            }
+        }
+
+        private Size _CalculatedSize;
+        public Size CalculatedSize
+        {
+            get { return _CalculatedSize; }
+            internal set { _CalculatedSize = value; }
+        }
+
+        public virtual void ResetHover()
+        {
+            if (_Parent != null)
+                _Parent.ResetHover();
+            OnResetMouseHover();
+        }
+
+        /// <summary>
+        /// Raises the ResetMouseHover event.
+        /// </summary>
+        protected virtual void OnResetMouseHover()
+        {
+            if (ResetMouseHover != null)
+                ResetMouseHover(this, new EventArgs());
+        }
+        #endregion
+
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/Editors/VisualItemCollection.cs b/PROMS/DotNetBar Source Code/Editors/VisualItemCollection.cs
new file mode 100644
index 00000000..0cddd2bb
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Editors/VisualItemCollection.cs	
@@ -0,0 +1,305 @@
+#if FRAMEWORK20
+using System;
+using System.Text;
+using System.Collections;
+
+namespace DevComponents.Editors
+{
+    public class VisualItemCollection : CollectionBase
+    {
+        #region Internal Implementation
+        /// <summary>Creates new instance of the class.</summary>
+        public VisualItemCollection() { }
+
+        /// <summary>Creates new instance of the class.</summary>
+        public VisualItemCollection(VisualGroup parent)
+        {
+            _Parent = parent;
+        }
+
+        private VisualGroup _Parent = null;
+        internal VisualGroup Parent
+        {
+            get { return _Parent; }
+            set { _Parent = value; }
+        }
+
+        /// <summary>
+        /// Adds new object to the collection.
+        /// </summary>
+        /// <param name="item">Object to add.</param>
+        /// <returns>Index of newly added object.</returns>
+        public int Add(VisualItem item)
+        {
+            return List.Add(item);
+        }
+
+        /// <summary>
+        /// Adds array of new objects to the collection.
+        /// </summary>
+        /// <param name="items">Array of object to add.</param>
+        public void AddRange(VisualItem[] items)
+        {
+            foreach (VisualItem item in items)
+                this.Add(item);
+        }
+
+        /// <summary>
+        /// Adds array of new objects to the collection.
+        /// </summary>
+        /// <param name="items">Array of object to add.</param>
+        public void AddRange(IList items)
+        {
+            for (int i = 0; i < items.Count; i++)
+            {
+                this.Add((VisualItem)items[i]);
+            }
+        }
+
+        /// <summary>
+        /// Returns reference to the object in collection based on it's index.
+        /// </summary>
+        public VisualItem this[int index]
+        {
+            get { return (VisualItem)(List[index]); }
+            set { List[index] = value; }
+        }
+
+        /// <summary>
+        /// Inserts new object into the collection.
+        /// </summary>
+        /// <param name="index">Position of the object.</param>
+        /// <param name="value">Object to insert.</param>
+        public void Insert(int index, VisualItem value)
+        {
+            List.Insert(index, value);
+        }
+
+        /// <summary>
+        /// Returns index of the object inside of the collection.
+        /// </summary>
+        /// <param name="value">Reference to the object.</param>
+        /// <returns>Index of the object.</returns>
+        public int IndexOf(VisualItem value)
+        {
+            return List.IndexOf(value);
+        }
+
+        /// <summary>
+        /// Returns whether collection contains specified object.
+        /// </summary>
+        /// <param name="value">Object to look for.</param>
+        /// <returns>true if object is part of the collection, otherwise false.</returns>
+        public bool Contains(VisualItem value)
+        {
+            return List.Contains(value);
+        }
+
+        /// <summary>
+        /// Removes specified object from the collection.
+        /// </summary>
+        /// <param name="value"></param>
+        public void Remove(VisualItem value)
+        {
+            List.Remove(value);
+        }
+
+        protected override void OnRemove(int index, object value)
+        {
+            if (_Parent != null)
+            {
+                _Parent.ProcessItemsCollectionChanged(new CollectionChangedInfo(null, new VisualItem[] { (VisualItem)value }, eCollectionChangeType.Removing));
+            }
+            base.OnRemove(index, value);
+        }
+        protected override void OnRemoveComplete(int index, object value)
+        {
+            if (_Parent != null)
+            {
+                _Parent.ProcessItemsCollectionChanged(new CollectionChangedInfo(null, new VisualItem[] { (VisualItem)value }, eCollectionChangeType.Removed));
+            }
+            base.OnRemoveComplete(index, value);
+        }
+
+        protected override void OnInsert(int index, object value)
+        {
+            if (_Parent != null)
+            {
+                _Parent.ProcessItemsCollectionChanged(new CollectionChangedInfo(new VisualItem[] { (VisualItem)value }, null, eCollectionChangeType.Adding));
+            }
+            base.OnInsert(index, value);
+        }
+        protected override void OnInsertComplete(int index, object value)
+        {
+            if (_Parent != null)
+            {
+                _Parent.ProcessItemsCollectionChanged(new CollectionChangedInfo(new VisualItem[] { (VisualItem)value }, null, eCollectionChangeType.Added));
+            }
+            base.OnInsertComplete(index, value);
+        }
+
+        protected override void OnClear()
+        {
+            if (_Parent != null)
+            {
+                _Parent.ProcessItemsCollectionChanged(new CollectionChangedInfo(null, null, eCollectionChangeType.Clearing));
+            }
+            base.OnClear();
+        }
+
+        protected override void OnClearComplete()
+        {
+            if (_Parent != null)
+            {
+                _Parent.ProcessItemsCollectionChanged(new CollectionChangedInfo(null, null, eCollectionChangeType.Cleared));
+            }
+            base.OnClearComplete();
+        }
+
+        protected override void OnSet(int index, object oldValue, object newValue)
+        {
+            if (_Parent != null)
+            {
+                _Parent.ProcessItemsCollectionChanged(new CollectionChangedInfo(new VisualItem[] { (VisualItem)oldValue },
+                    new VisualItem[] { (VisualItem)newValue }, eCollectionChangeType.Removing));
+            }
+            base.OnSet(index, oldValue, newValue);
+        }
+
+        protected override void OnSetComplete(int index, object oldValue, object newValue)
+        {
+            if (_Parent != null)
+            {
+                _Parent.ProcessItemsCollectionChanged(new CollectionChangedInfo(new VisualItem[] { (VisualItem)oldValue },
+                    new VisualItem[] { (VisualItem)newValue }, eCollectionChangeType.Removed));
+            }
+            base.OnSetComplete(index, oldValue, newValue);
+        }
+
+        /// <summary>
+        /// Copies collection into the specified array.
+        /// </summary>
+        /// <param name="array">Array to copy collection to.</param>
+        /// <param name="index">Starting index.</param>
+        public void CopyTo(VisualItem[] array, int index)
+        {
+            List.CopyTo(array, index);
+        }
+
+        /// <summary>
+        /// Copies contained items to the VisualItem array.
+        /// </summary>
+        /// <param name="array">Array to copy to.</param>
+        internal void CopyTo(VisualItem[] array)
+        {
+            List.CopyTo(array, 0);
+        }
+
+        #endregion
+    }
+
+    public class CollectionChangedInfo
+    {
+        public CollectionChangedInfo(VisualItem[] added, VisualItem[] removed, eCollectionChangeType changeType)
+        {
+            _Added = added;
+            _Removed = removed;
+            _ChangeType = changeType;
+        }
+
+        private VisualItem[] _Added;
+        public VisualItem[] Added
+        {
+            get { return _Added; }
+        }
+
+        private VisualItem[] _Removed;
+        public VisualItem[] Removed
+        {
+            get { return _Removed; }
+        }
+
+        private eCollectionChangeType _ChangeType;
+        public eCollectionChangeType ChangeType
+        {
+            get { return _ChangeType; }
+        }
+    }
+
+    internal class VisualCollectionEnumerator : IEnumerable, IEnumerator
+    {
+        private IList _ParentCollection = null;
+        private int _CurrentIndex = -1;
+        private int _Direction = 1, _Start = -1, _End = -1;
+
+        public VisualCollectionEnumerator(VisualItemCollection parentCollection, bool rightToLeft)
+        {
+            _ParentCollection = parentCollection;
+            if (rightToLeft)
+            {
+                _Direction = -1;
+                _Start = parentCollection.Count - 1;
+                _End = -1;
+            }
+            else
+            {
+                _Start = 0;
+                _End = parentCollection.Count;
+            }
+        }
+
+        #region IEnumerable Members
+
+        public IEnumerator GetEnumerator()
+        {
+            return this;
+        }
+
+        #endregion
+
+        #region IEnumerator Members
+
+        public object Current
+        {
+            get
+            {
+                if (_CurrentIndex < 0)
+                    throw new InvalidOperationException("IEnumerator Pointer is invalid. Use MoveNext to advance enumerator.");
+                return _ParentCollection[_CurrentIndex];
+            }
+        }
+
+        internal int CurrentIndex
+        {
+            get
+            {
+                return _CurrentIndex;
+            }
+            set
+            {
+                _CurrentIndex = value;
+            }
+        }
+
+        public bool MoveNext()
+        {
+            if (_CurrentIndex == _End && _CurrentIndex >= 0)
+                throw new InvalidOperationException("Enumerator cannot advance beyond the boundaries of array. Use Reset to reset enumerator");
+
+            if (_CurrentIndex == -1) _CurrentIndex = _Start - _Direction;
+
+            _CurrentIndex += _Direction;
+            if (_CurrentIndex == _End) return false;
+
+            return true;
+        }
+
+        public void Reset()
+        {
+            _CurrentIndex = -1;
+        }
+        #endregion
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/Editors/VisualLabel.cs b/PROMS/DotNetBar Source Code/Editors/VisualLabel.cs
new file mode 100644
index 00000000..730eb5dc
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Editors/VisualLabel.cs	
@@ -0,0 +1,93 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+using DevComponents.DotNetBar;
+
+namespace DevComponents.Editors
+{
+    public class VisualLabel : VisualItem
+    {
+        #region Private Variables
+        #endregion
+
+        #region Events
+        #endregion
+
+        #region Constructor
+        #endregion
+
+        #region Internal Implementation
+        private Padding _TextPadding = new Padding(0);
+        /// <summary>
+        /// Gets or sets the amount of padding added to text.
+        /// </summary>
+        public Padding TextPadding
+        {
+            get { return _TextPadding; }
+            set { _TextPadding = value; InvalidateArrange(); }
+        }
+
+        private string _Text = "";
+        /// <summary>
+        /// Gets or sets the text displayed by the label.
+        /// </summary>
+        public string Text
+        {
+            get { return _Text; }
+            set
+            {
+                if (value == null) value = "";
+                if (_Text != value)
+                {
+                    _Text = value;
+                    InvalidateArrange();
+                }
+            }
+        }
+
+        public override void PerformLayout(PaintInfo p)
+        {
+            Size size = Size.Empty;
+            Graphics g = p.Graphics;
+            Font font = p.DefaultFont;
+            eTextFormat textFormat = eTextFormat.Default | eTextFormat.GlyphOverhangPadding | eTextFormat.LeftAndRightPadding;
+            if (_Text.Length > 0)
+            {
+                if (Text.Trim().Length == 0)
+                {
+                    size = TextDrawing.MeasureString(g, Text.Replace(' ', '-'), font, 0, textFormat);
+                    size.Width = (int)(size.Width);
+                }
+                else
+                    size = TextDrawing.MeasureString(g, Text, font, 0, textFormat);
+            }
+            size.Height += _TextPadding.Vertical;
+            size.Width += _TextPadding.Horizontal;
+            this.Size = size;
+            base.PerformLayout(p);
+        }
+
+        protected override void OnPaint(PaintInfo p)
+        {
+
+            Graphics g = p.Graphics;
+            Font font = p.DefaultFont;
+            Rectangle r = this.RenderBounds;
+            eTextFormat textFormat = eTextFormat.Default | eTextFormat.NoPadding;
+            Color color = p.ForeColor;
+            r.X += _TextPadding.Left;
+            r.Y += _TextPadding.Top;
+            if (!GetIsEnabled(p))
+                color = p.DisabledForeColor;
+            if (_Text.Length > 0)
+                TextDrawing.DrawString(g, _Text, font, color, r, textFormat);
+
+            base.OnPaint(p);
+        }
+        #endregion
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/Editors/VisualListInput.cs b/PROMS/DotNetBar Source Code/Editors/VisualListInput.cs
new file mode 100644
index 00000000..d10143f9
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Editors/VisualListInput.cs	
@@ -0,0 +1,207 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+using DevComponents.DotNetBar;
+
+namespace DevComponents.Editors
+{
+    public class VisualListInput : VisualInputBase
+    {
+        #region Private Variables
+        #endregion
+
+        #region Events
+        #endregion
+
+        #region Constructor
+        #endregion
+
+        #region Internal Implementation
+        protected override bool OnCmdKey(ref System.Windows.Forms.Message msg, System.Windows.Forms.Keys keyData)
+        {
+            if (keyData == System.Windows.Forms.Keys.Up)
+            {
+                SelectPrevious();
+                return true;
+            }
+            else if (keyData == System.Windows.Forms.Keys.Down)
+            {
+                SelectNext();
+                return true;
+            }
+            return base.OnCmdKey(ref msg, keyData);
+        }
+
+        protected override void OnMouseWheel(System.Windows.Forms.MouseEventArgs e)
+        {
+            if (!this.IsReadOnly)
+            {
+                if (e.Delta > 0)
+                {
+                    SelectNext();
+                }
+                else
+                {
+                    SelectPrevious();
+                }
+            }
+
+            base.OnMouseWheel(e);
+        }
+
+        protected override bool ValidateNewInputStack(string s)
+        {
+            if (s.Length == 0 && !_AllowEmptyState)
+                return false;
+            return base.ValidateNewInputStack(s);
+        }
+
+        public virtual void SelectNext()
+        {
+            if (this.IsReadOnly) return;
+            ResetInputStack();
+            InputComplete(false);
+        }
+
+        public virtual void SelectPrevious()
+        {
+            if (this.IsReadOnly) return;
+
+            ResetInputStack();
+            InputComplete(false);
+        }
+
+        protected override void ResetValue()
+        {
+            if (SetInputStack(""))
+            {
+                SetInputPosition(InputStack.Length);
+            }
+            base.ResetValue();
+        }
+
+        public override void PerformLayout(PaintInfo p)
+        {
+            Size size = Size.Empty;
+            Graphics g = p.Graphics;
+            Font font = p.DefaultFont;
+            eTextFormat textFormat = eTextFormat.Default | eTextFormat.NoPadding;
+
+            string s = GetMeasureString();
+
+            size = TextDrawing.MeasureString(g, s, font, 0, textFormat);
+            size.Width++; // Additional pixel for selection
+            this.Size = size;
+
+            base.PerformLayout(p);
+        }
+
+        protected virtual string GetMeasureString()
+        {
+            string s = GetRenderString();
+            if (s.Length == 0) s = "T";
+            return s;
+        }
+
+        protected override void OnPaint(PaintInfo p)
+        {
+            Graphics g = p.Graphics;
+            Font font = p.DefaultFont;
+            Color color = p.ForeColor;
+            if (!GetIsEnabled(p))
+                color = p.DisabledForeColor;
+            eTextFormat textFormat = eTextFormat.Default | eTextFormat.NoPadding;
+
+            string text = GetRenderString();
+            Rectangle selectionBounds = this.RenderBounds;
+            Region oldClip = null;
+
+            if (this.IsFocused && this.InputStack.Length > 0 && this.InputStack.Length < text.Length)
+            {
+                // Render partial selection based on the input stack
+                Size inputSize = TextDrawing.MeasureString(g, text.Substring(0, this.InputStack.Length), font);
+                oldClip = g.Clip;
+                Rectangle newClip = selectionBounds;
+                if (this.IsRightToLeft)
+                {
+                    newClip.X += newClip.Width - inputSize.Width;
+                    newClip.Width = inputSize.Width;
+                    selectionBounds.Width -= inputSize.Width;
+                }
+                else
+                {
+                    newClip.Width = inputSize.Width;
+                    selectionBounds.X += inputSize.Width;
+                    selectionBounds.Width -= inputSize.Width;
+                }
+                g.SetClip(newClip, System.Drawing.Drawing2D.CombineMode.Intersect);
+                TextDrawing.DrawString(g, text, font, color, RenderBounds, textFormat);
+                g.Clip = oldClip;
+                g.SetClip(selectionBounds, System.Drawing.Drawing2D.CombineMode.Intersect);
+            }
+
+
+            if (this.IsFocused)
+            {
+                if (p.Colors.Highlight.IsEmpty)
+                    g.FillRectangle(SystemBrushes.Highlight, selectionBounds);
+                else
+                {
+                    using (SolidBrush brush = new SolidBrush(p.Colors.Highlight))
+                        g.FillRectangle(brush, selectionBounds);
+                }
+                color = p.Colors.HighlightText.IsEmpty ? SystemColors.HighlightText : p.Colors.HighlightText;
+            }
+
+            if (!this.IsEmpty)
+            {
+                TextDrawing.DrawString(g, text, font, color, RenderBounds, textFormat);
+            }
+
+            if (oldClip != null)
+                g.Clip = oldClip;
+
+            base.OnPaint(p);
+        }
+
+        protected virtual string GetRenderString()
+        {
+            return GetInputStringValue();
+        }
+
+        public override bool IsEmpty
+        {
+            get
+            {
+                return GetInputStringValue().Length == 0;
+            }
+            set
+            {
+                if (value != IsEmpty)
+                {
+                    if (value && _AllowEmptyState)
+                    {
+                        ResetValue();
+                    }
+                }
+            }
+        }
+
+
+        private bool _AllowEmptyState = true;
+        /// <summary>
+        /// Gets or sets whether control allows empty input state i.e. does not have an text entered. Default value is true.
+        /// </summary>
+        public bool AllowEmptyState
+        {
+            get { return _AllowEmptyState; }
+            set { _AllowEmptyState = value; }
+        }
+        #endregion
+
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/Editors/VisualNumericInput.cs b/PROMS/DotNetBar Source Code/Editors/VisualNumericInput.cs
new file mode 100644
index 00000000..ae6a3045
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Editors/VisualNumericInput.cs	
@@ -0,0 +1,240 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+using DevComponents.DotNetBar;
+using System.ComponentModel;
+
+namespace DevComponents.Editors
+{
+    public class VisualNumericInput : VisualInputBase
+    {
+        #region Private Variables
+        #endregion
+
+        #region Events
+        /// <summary>
+        /// Occurs when Value property has changed.
+        /// </summary>
+        public event EventHandler ValueChanged;
+        #endregion
+
+        #region Constructor
+        #endregion
+
+        #region Internal Implementation
+        protected override void OnKeyDown(System.Windows.Forms.KeyEventArgs e)
+        {
+            if ((e.KeyCode == System.Windows.Forms.Keys.Subtract || e.KeyCode == System.Windows.Forms.Keys.OemMinus) && AllowsNegativeValue && this.InputStack.Length>0)
+            {
+                if (!this.IsEmpty)
+                    NegateValue();
+                e.Handled = true;
+            }
+
+            base.OnKeyDown(e);
+        }
+
+        protected override bool OnCmdKey(ref System.Windows.Forms.Message msg, System.Windows.Forms.Keys keyData)
+        {
+            if (!this.IsReadOnly)
+            {
+                if (keyData == System.Windows.Forms.Keys.Up)
+                {
+                    IncreaseValue();
+                    return true;
+                }
+                else if (keyData == System.Windows.Forms.Keys.Down)
+                {
+                    DecreaseValue();
+                    return true;
+                }
+            }
+            return base.OnCmdKey(ref msg, keyData);
+        }
+
+        private bool _MouseWheelValueChangeEnabled = true;
+        /// <summary>
+        /// Gets or sets whether mouse wheel increases or decreases the input value when used.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether mouse wheel increases or decreases the input value when used.")]
+        public bool MouseWheelValueChangeEnabled
+        {
+            get { return _MouseWheelValueChangeEnabled; }
+            set
+            {
+                _MouseWheelValueChangeEnabled = value;
+            }
+        }
+        
+
+        protected override void OnMouseWheel(System.Windows.Forms.MouseEventArgs e)
+        {
+            if (_MouseWheelValueChangeEnabled && !this.IsReadOnly)
+            {
+                if (e.Delta > 0)
+                {
+                    IncreaseValue();
+                }
+                else
+                {
+                    DecreaseValue();
+                }
+            }
+
+            base.OnMouseWheel(e);
+        }
+
+        public virtual void DecreaseValue()
+        {
+            InputComplete(false);
+            ResetInputPosition();
+        }
+
+        public virtual void IncreaseValue()
+        {
+            InputComplete(false);
+            ResetInputPosition();
+        }
+
+        protected virtual void NegateValue()
+        {
+        }
+
+        protected override bool AcceptKeyPress(System.Windows.Forms.KeyPressEventArgs e)
+        {
+            if (e.KeyChar >= 48 && e.KeyChar <= 57 || 
+                this.AllowsNegativeValue && e.KeyChar == '-' && (this.IsEmpty || !this.IsEmpty && (this.InputStack=="" || this.InputStack=="0")))
+            {
+                e.Handled = true;
+                return true;
+            }
+            return false;
+        }
+
+        public override void PerformLayout(PaintInfo p)
+        {
+            Size size = Size.Empty;
+            Graphics g = p.Graphics;
+            Font font = p.DefaultFont;
+            eTextFormat textFormat = eTextFormat.Default | eTextFormat.NoPadding;
+
+            string s = GetMeasureString();
+
+            size = TextDrawing.MeasureString(g, s, font, 0, textFormat);
+            //size.Width++;
+            this.Size = size;
+
+            base.PerformLayout(p);
+        }
+
+        protected virtual string GetMeasureString()
+        {
+            return "";
+        }
+
+        protected override void OnPaint(PaintInfo p)
+        {
+            Graphics g = p.Graphics;
+            Font font = p.DefaultFont;
+            Color color = p.ForeColor;
+            if (!this.GetIsEnabled(p))
+                color = p.DisabledForeColor;
+            eTextFormat textFormat = eTextFormat.Default | eTextFormat.NoPadding;
+            if (this.IsFocused)
+            {
+                if (p.Colors.Highlight.IsEmpty)
+                    g.FillRectangle(SystemBrushes.Highlight, this.RenderBounds);
+                else
+                {
+                    using (SolidBrush brush = new SolidBrush(p.Colors.Highlight))
+                        g.FillRectangle(brush, this.RenderBounds);
+                }
+                color = p.Colors.HighlightText.IsEmpty ? SystemColors.HighlightText : p.Colors.HighlightText;
+            }
+
+            if (!(this.IsEmpty && this.AllowEmptyState))
+            {
+         
+                string text = GetRenderString();
+                TextDrawing.DrawString(g, text, font, color, RenderBounds, textFormat);
+            }
+
+            base.OnPaint(p);
+        }
+
+        protected virtual string GetRenderString()
+        {
+            return "";
+        }
+
+        private bool _AllowEmptyState = true;
+        /// <summary>
+        /// Gets or sets whether control allows empty input state i.e. does not have an number entered. Default value is true. When control is empty
+        /// IsEmpty property returns true and control does not display number. Set to false to always force control to have number displayed.
+        /// </summary>
+        public bool AllowEmptyState
+        {
+            get { return _AllowEmptyState; }
+            set { _AllowEmptyState = value; }
+        }
+
+        private bool _AllowsNegativeValue = true;
+        public bool AllowsNegativeValue
+        {
+            get { return _AllowsNegativeValue; }
+            set { _AllowsNegativeValue = value; }
+        }
+
+        protected override bool SetInputStack(string s)
+        {
+            s = ProcessNewInputStack(s);
+            return base.SetInputStack(s);
+        }
+        private bool _LeadingZero = false;
+        protected virtual string ProcessNewInputStack(string s)
+        {
+            if (this.InputStack == "0" && s != "0" && s.StartsWith("0"))
+            {
+                s = s.Substring(1);
+                this.SetInputPosition(this.InputPosition - 1);
+                _LeadingZero = true;
+            }
+            else
+                _LeadingZero = false;
+            return s;
+        }
+        protected virtual bool IsLeadingZero
+        { 
+            get
+            {
+                return _LeadingZero;
+            }
+        }
+        protected override void ResetInputStack()
+        {
+            _LeadingZero = false;
+            base.ResetInputStack();
+        }
+
+        protected virtual void OnValueChanged()
+        {
+            if (ValueChanged != null)
+                ValueChanged(this, new EventArgs());
+        }
+
+        protected override void OnInputLostFocus()
+        {
+            if (this.InputStack == "-")
+                OnClear();
+            else
+                ResetInputStack();
+            base.OnInputLostFocus();
+        }
+        #endregion
+
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/Editors/VisualStringListInput.cs b/PROMS/DotNetBar Source Code/Editors/VisualStringListInput.cs
new file mode 100644
index 00000000..d699d8c2
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Editors/VisualStringListInput.cs	
@@ -0,0 +1,242 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+using DevComponents.Editors.Primitives;
+using System.ComponentModel;
+
+namespace DevComponents.Editors
+{
+    public class VisualStringListInput : VisualListInput
+    {
+        #region Private Variables
+        private List<string> _Items = new List<string>();
+        private string _Text = "";
+        private string _LastValidatedInputStack = "", _LastMatch = "";
+        private bool _LastMatchComplete = false;
+        #endregion
+
+        #region Events
+        /// <summary>
+        /// Occurs when SelectedIndex property has changed.
+        /// </summary>
+        public event EventHandler SelectedIndexChanged;
+        #endregion
+
+        #region Constructor
+        public VisualStringListInput()
+        {
+
+        }
+        #endregion
+
+        #region Internal Implementation
+        public List<String> Items
+        {
+            get
+            {
+                return _Items;
+            }
+        }
+
+        protected virtual List<String> GetItems()
+        {
+            return _Items;
+        }
+
+        protected override bool ValidateNewInputStack(string s)
+        {
+            _LastValidatedInputStack = "";
+            _LastMatch = "";
+            _LastMatchComplete = false;
+
+            if (s.Length > 0)
+            {
+                List<String> items = GetItems();
+                StartsWithPredicate p = new StartsWithPredicate(s.ToLower(), 2);
+                List<string> match = items.FindAll(p.MatchTop);
+                if (match == null || match.Count == 0)
+                    return false;
+
+                _LastMatch = match[0];
+                _LastValidatedInputStack = s;
+                _LastMatchComplete = match.Count == 1;
+                return true;
+            }
+
+            return base.ValidateNewInputStack(s);
+        }
+
+        protected string LastValidatedInputStack
+        {
+            get
+            {
+                return _LastValidatedInputStack;
+            }
+            set
+            {
+                _LastValidatedInputStack = value;
+            }
+        }
+
+        protected string LastMatch
+        {
+            get
+            {
+                return _LastMatch;
+            }
+            set
+            {
+                _LastMatch = value;
+            }
+        }
+
+        protected bool LastMatchComplete
+        {
+            get
+            {
+                return _LastMatchComplete;
+            }
+            set
+            {
+                _LastMatchComplete = value;
+            }
+        }
+
+        protected override void OnInputStackChanged()
+        {
+            bool changed = false;
+            if (_LastValidatedInputStack.Length > 0 && this.InputStack == _LastValidatedInputStack)
+            {
+                changed = _Text != _LastMatch;
+                _Text = _LastMatch;
+            }
+            else if (this.InputStack.Length == 0)
+            {
+                changed = _Text != "";
+                _Text = "";
+            }
+
+            InvalidateArrange();
+
+            if (changed)
+                OnSelectedIndexChanged(new EventArgs());
+
+            base.OnInputStackChanged();
+        }
+
+        protected override void OnInputKeyAccepted()
+        {
+            if (_LastMatchComplete)
+            {
+                InputComplete(true);
+                _LastMatchComplete = false;
+            }
+            base.OnInputKeyAccepted();
+        }
+
+        /// <summary>
+        /// Gets or sets the text that is selected by the control.
+        /// </summary>
+        [DefaultValue("")]
+        public string Text
+        {
+            get
+            {
+                return GetInputStringValue();
+            }
+            set
+            {
+                if (_Text != value)
+                {
+                    List<String> items = GetItems();
+                    if (value == "" && !AllowEmptyState && items.Count > 0)
+                        value = items[0];
+                    else if (value != null && value.Length > 0)
+                    {
+                        if (!items.Contains(value))
+                        {
+                            if (!AllowEmptyState && items.Count > 0)
+                                value = items[0];
+                            else
+                                value = "";
+                        }
+                    }
+
+                    _Text = value;
+                    ResetInputStack();
+                    OnInputChanged();
+                    OnSelectedIndexChanged(new EventArgs());
+
+                    InvalidateArrange();
+                    if (this.IsEmpty) this.IsEmpty = false;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Raises SelectedIndexChanged event
+        /// </summary>
+        protected virtual void OnSelectedIndexChanged(EventArgs e)
+        {
+            if (SelectedIndexChanged != null)
+                SelectedIndexChanged(this, e);
+        }
+
+        /// <summary>
+        /// Gets or sets the currently selected index. -1 is returned if nothing is selected.
+        /// </summary>
+        [DefaultValue(-1), Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public int SelectedIndex
+        {
+            get
+            {
+                if (this.IsEmpty || _Text == "") return -1;
+                List<string> items = GetItems();
+                return items.IndexOf(this.Text);
+            }
+            set
+            {
+                if (value >= 0)
+                {
+                    List<string> items = GetItems();
+                    this.Text = items[value];
+                }
+                else
+                    this.Text = "";
+            }
+        }
+
+        protected override string GetInputStringValue()
+        {
+            if (_Text == null) return "";
+            return _Text;
+        }
+
+        public override void SelectNext()
+        {
+            int index = this.SelectedIndex + 1;
+            List<string> items = GetItems();
+            if (index >= items.Count)
+                index = 0;
+            this.SelectedIndex = index;
+            base.SelectNext();
+        }
+
+        public override void SelectPrevious()
+        {
+            int index = this.SelectedIndex - 1;
+            if (index < 0)
+            {
+                List<string> items = GetItems();
+                index = items.Count - 1;
+            }
+            this.SelectedIndex = index;
+            base.SelectPrevious();
+        }
+        #endregion
+
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/Editors/VisualToggleButton.cs b/PROMS/DotNetBar Source Code/Editors/VisualToggleButton.cs
new file mode 100644
index 00000000..b6fdbc36
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Editors/VisualToggleButton.cs	
@@ -0,0 +1,147 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel;
+using System.Drawing;
+
+namespace DevComponents.Editors
+{
+    public class VisualToggleButton : VisualItem
+    {
+        #region Private Variables
+
+        #endregion
+
+        #region Events
+        /// <summary>
+        /// Occurs when Checked property has changed.
+        /// </summary>
+        public event EventHandler CheckedChanged;
+        #endregion
+
+        #region Constructor
+        /// <summary>
+        /// Initializes a new instance of the VisualToggleButton class.
+        /// </summary>
+        public VisualToggleButton()
+        {
+            this.Focusable = true;
+        }
+
+        #endregion
+
+        #region Internal Implementation
+        protected override void OnMouseDown(System.Windows.Forms.MouseEventArgs e)
+        {
+            if (e.Button == System.Windows.Forms.MouseButtons.Left && GetIsEnabled())
+            {
+                ToggleChecked();
+                IsMouseDown = true;
+            }
+            base.OnMouseDown(e);
+        }
+
+        protected override void OnMouseUp(System.Windows.Forms.MouseEventArgs e)
+        {
+            if (e.Button == System.Windows.Forms.MouseButtons.Left)
+                IsMouseDown = false;
+            base.OnMouseUp(e);
+        }
+
+        protected override void OnMouseEnter()
+        {
+            this.IsMouseOver = true;
+            base.OnMouseEnter();
+        }
+
+        protected override void OnMouseLeave()
+        {
+            this.IsMouseOver = false;
+            base.OnMouseLeave();
+        }
+
+        protected override void OnKeyDown(System.Windows.Forms.KeyEventArgs e)
+        {
+            if (e.KeyCode == System.Windows.Forms.Keys.Space && GetIsEnabled())
+            {
+                ToggleChecked();
+                e.Handled = true;
+            }
+            base.OnKeyDown(e);
+        }
+
+        private void ToggleChecked()
+        {
+            this.Checked = !this.Checked;
+        }
+
+        /// <summary>
+        /// Raises the CheckedChanged event.
+        /// </summary>
+        protected virtual void OnCheckedChanged(EventArgs e)
+        {
+            if (CheckedChanged != null)
+                CheckedChanged(this, e);
+        }
+
+        private bool _Checked = false;
+        /// <summary>
+        /// Gets or sets whether item is checked.
+        /// </summary>
+        [DefaultValue(false)]
+        public virtual bool Checked
+        {
+            get { return _Checked; }
+            set
+            {
+                if (_Checked != value)
+                {
+                    _Checked = value;
+                    InvalidateRender();
+                    OnCheckedChanged(new EventArgs());
+                }
+            }
+        }
+
+        private bool _IsMouseDown;
+        /// <summary>
+        /// Gets whether left mouse button is pressed over the item.
+        /// </summary>
+        [Browsable(false)]
+        public bool IsMouseDown
+        {
+            get { return _IsMouseDown; }
+            internal set
+            {
+                if (value != _IsMouseDown)
+                {
+                    _IsMouseDown = value;
+                    this.InvalidateRender();
+                }
+            }
+        }
+
+        private bool _IsMouseOver = false;
+        /// <summary>
+        /// Gets whether mouse is over the item.
+        /// </summary>
+        [Browsable(false)]
+        public bool IsMouseOver
+        {
+            get { return _IsMouseOver; }
+            internal set
+            {
+                if (value != _IsMouseOver)
+                {
+                    _IsMouseOver = value;
+                    this.InvalidateRender();
+                }
+            }
+        }
+        #endregion
+
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/Editors/VisualUpDownButton.cs b/PROMS/DotNetBar Source Code/Editors/VisualUpDownButton.cs
new file mode 100644
index 00000000..2fdfe63a
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Editors/VisualUpDownButton.cs	
@@ -0,0 +1,497 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+using System.ComponentModel;
+using DevComponents.DotNetBar.Rendering;
+using DevComponents.DotNetBar;
+
+namespace DevComponents.Editors
+{
+    /// <summary>
+    /// Represents the up down button which allows change of the value in currently focused input control.
+    /// </summary>
+    public class VisualUpDownButton : VisualButtonBase
+    {
+        #region Private Variables
+        private bool _MouseOverButtonUp = false;
+        private bool _MouseOverButtonDown = false;
+        private bool _MouseDownButtonUp = false;
+        private bool _MouseDownButtonDown = false;
+        private Rectangle _DownButtonRectangle = Rectangle.Empty;
+        private Rectangle _UpButtonRectangle = Rectangle.Empty;
+        #endregion
+
+        #region Events
+        /// <summary>
+        /// Occurs when Up part of the button has been clicked.
+        /// </summary>
+        public event EventHandler UpClick;
+        /// <summary>
+        /// Occurs when Down part of the button has been clicked.
+        /// </summary>
+        public event EventHandler DownClick;
+        #endregion
+
+        #region Constructor
+        /// <summary>
+        /// Initializes a new instance of the VisualUpDownButton class.
+        /// </summary>
+        public VisualUpDownButton()
+        {
+            this.Focusable = false;
+            this.ClickAutoRepeat = true;
+        }
+        #endregion
+
+        #region Internal Implementation
+        public override void PerformLayout(PaintInfo pi)
+        {
+            int height = pi.AvailableSize.Height;
+            if (height % 2 != 0)
+                height++;
+            Size size = new Size(Dpi.Width(_ButtonWidth), height);
+
+            if (_UpImage != null && _DownImage != null)
+                size.Width = Math.Max(Dpi.Width(_UpImage.Width), Dpi.Width(_DownImage.Width));
+
+            this.Size = size;
+            this.CalculatedSize = size;
+            base.PerformLayout(pi);
+        }
+
+        protected override void OnPaint(PaintInfo p)
+        {
+            Graphics g = p.Graphics;
+            Rectangle r = this.RenderBounds;
+            if (r.Width <= 0 || r.Height <= 0)
+                return;
+
+            Rectangle buttonRect = new Rectangle(r.X, r.Y, r.Width, r.Height / 2);
+            if (_UpImage != null)
+                g.DrawImage(_UpImage, buttonRect.Location);
+            else
+            {
+                Office2007ButtonItemStateColorTable ct = GetOffice2007StateColorTableButtonUp(p);
+                PaintButtonBackground(p, ct, buttonRect);
+                using (SolidBrush brush = new SolidBrush(ct.Text))
+                    p.Graphics.FillPolygon(brush, Office2007ButtonItemPainter.GetExpandPolygon(buttonRect, ePopupSide.Top));
+            }
+            _UpButtonRectangle = buttonRect;
+
+
+            buttonRect = new Rectangle(r.X, buttonRect.Bottom, r.Width, r.Height - buttonRect.Height);
+            if (_DownImage != null)
+                g.DrawImage(_DownImage, buttonRect.Location);
+            else
+            {
+                Office2007ButtonItemStateColorTable ct = GetOffice2007StateColorTableButtonDown(p);
+                PaintButtonBackground(p, ct, buttonRect);
+                using (SolidBrush brush = new SolidBrush(ct.Text))
+                    p.Graphics.FillPolygon(brush, Office2007ButtonItemPainter.GetExpandPolygon(buttonRect, ePopupSide.Bottom));
+            }
+            _DownButtonRectangle = buttonRect;
+
+            base.OnPaint(p);
+        }
+
+        protected override void OnMouseMove(System.Windows.Forms.MouseEventArgs e)
+        {
+            if (this.GetIsEnabled())
+            {
+                if (_DownButtonRectangle.Contains(e.X, e.Y))
+                {
+                    this.MouseOverButtonDown = true;
+                    this.MouseOverButtonUp = false;
+                }
+                else if (_UpButtonRectangle.Contains(e.X, e.Y))
+                {
+                    this.MouseOverButtonUp = true;
+                    this.MouseOverButtonDown = false;
+                }
+                else
+                {
+                    this.MouseOverButtonUp = false;
+                    this.MouseOverButtonDown = false;
+                }
+            }
+            base.OnMouseMove(e);
+        }
+
+        protected override void OnMouseDown(System.Windows.Forms.MouseEventArgs e)
+        {
+            if (e.Button == System.Windows.Forms.MouseButtons.Left && this.GetIsEnabled())
+            {
+                if (this.MouseOverButtonUp)
+                    this.MouseDownButtonUp = true;
+                else if (this.MouseOverButtonDown)
+                    this.MouseDownButtonDown = true;
+
+                ExecuteClickAction();
+            }
+            base.OnMouseDown(e);
+        }
+
+        private void ExecuteClickAction()
+        {
+            if (this.MouseOverButtonUp)
+            {
+                if (_AutoChange != eUpDownButtonAutoChange.None || _AutoChangeItem != null)
+                    UpClickFocusedInputValue();
+                OnUpClick(new EventArgs());
+            }
+            else if (this.MouseOverButtonDown)
+            {
+                if (_AutoChange != eUpDownButtonAutoChange.None || _AutoChangeItem != null)
+                    DownClickFocusedInputValue();
+                OnDownClick(new EventArgs());
+            }
+        }
+
+        protected override void OnClickAutoRepeat()
+        {
+            ExecuteClickAction();
+            base.OnClickAutoRepeat();
+        }
+
+        protected override void OnMouseUp(System.Windows.Forms.MouseEventArgs e)
+        {
+            this.MouseDownButtonDown = false;
+            this.MouseDownButtonUp = false;
+            base.OnMouseUp(e);
+        }
+
+        protected override void OnMouseLeave()
+        {
+            this.MouseOverButtonDown = false;
+            this.MouseOverButtonUp = false;
+            base.OnMouseLeave();
+        }
+
+        private void DownClickFocusedInputValue()
+        {
+            VisualItem focusedItem = GetAutoChangeItem();
+            if (focusedItem == null) return;
+
+            VisualInputGroup parent = null;
+            if (focusedItem.Parent is VisualInputGroup && !((VisualInputGroup)this.Parent).IsUserInput)
+            {
+                parent = (VisualInputGroup)this.Parent;
+                parent.IsUserInput = true;
+            }
+
+            if (focusedItem is VisualNumericInput)
+                ((VisualNumericInput)focusedItem).DecreaseValue();
+            else if (focusedItem is VisualListInput)
+                ((VisualListInput)focusedItem).SelectNext();
+
+            if (parent != null)
+                parent.IsUserInput = false;
+        }
+
+        private void UpClickFocusedInputValue()
+        {
+            VisualItem focusedItem = GetAutoChangeItem();
+            if (focusedItem == null) return;
+
+            VisualInputGroup parent=null;
+            if (focusedItem.Parent is VisualInputGroup && !((VisualInputGroup)this.Parent).IsUserInput)
+            {
+                parent = (VisualInputGroup)this.Parent;
+                parent.IsUserInput = true;
+            }
+
+            if (focusedItem is VisualNumericInput)
+                ((VisualNumericInput)focusedItem).IncreaseValue();
+            else if (focusedItem is VisualListInput)
+                ((VisualListInput)focusedItem).SelectPrevious();
+
+            if (parent != null)
+                parent.IsUserInput = false;
+        }
+
+        private VisualItem GetAutoChangeItem()
+        {
+            if (_AutoChangeItem != null) return _AutoChangeItem;
+
+            if (_AutoChange == eUpDownButtonAutoChange.None || this.Parent == null || !(this.Parent is VisualGroup))
+                return null;
+            VisualGroup group = this.Parent as VisualGroup;
+            if (_AutoChange == eUpDownButtonAutoChange.FocusedItem)
+            {
+                if (group.FocusedItem is VisualInputGroup)
+                {
+                    VisualInputGroup g = group.FocusedItem as VisualInputGroup;
+                    while (g.FocusedItem is VisualInputGroup)
+                        g = g.FocusedItem as VisualInputGroup;
+                    return g.FocusedItem;
+                }
+                if (!(group.FocusedItem is VisualInputBase))
+                {
+                    foreach (VisualItem item in group.Items)
+                    {
+                        if (item is VisualInputBase && item.Enabled && item.Visible && item.Focusable)
+                            return item;
+                    }
+                }
+
+                return group.FocusedItem;
+            }
+            int start = group.Items.IndexOf(this);
+            for (int i = start; i >= 0; i--)
+            {
+                VisualItem item = group.Items[i];
+                if (item is VisualInputBase && item.Visible)
+                    return item;
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Raises the UpClick event.
+        /// </summary>
+        /// <param name="e">Provides event data.</param>
+        protected virtual void OnUpClick(EventArgs e)
+        {
+            if (UpClick != null)
+                UpClick(this, e);
+        }
+
+        /// <summary>
+        /// Raises the DownClick event.
+        /// </summary>
+        /// <param name="e">Provides event data.</param>
+        protected virtual void OnDownClick(EventArgs e)
+        {
+            if (DownClick != null)
+                DownClick(this, e);
+        }
+
+        private Image _UpImage = null;
+        /// <summary>
+        /// Gets or sets the image displayed on the face of the button.
+        /// </summary>
+        [DefaultValue(null)]
+        public Image UpImage
+        {
+            get { return _UpImage; }
+            set
+            {
+                if (_UpImage != value)
+                {
+                    _UpImage = value;
+                    this.InvalidateArrange();
+                }
+            }
+        }
+
+        private Image _DownImage = null;
+        /// <summary>
+        /// Gets or sets the image displayed on the face of the button.
+        /// </summary>
+        [DefaultValue(null)]
+        public Image DownImage
+        {
+            get { return _DownImage; }
+            set
+            {
+                if (_DownImage != value)
+                {
+                    _DownImage = value;
+                    this.InvalidateArrange();
+                }
+            }
+        }
+
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool MouseOverButtonUp
+        {
+            get { return _MouseOverButtonUp; }
+            set
+            {
+                if (_MouseOverButtonUp != value)
+                {
+                    _MouseOverButtonUp = value;
+                    this.InvalidateRender();
+                }
+            }
+        }
+
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool MouseOverButtonDown
+        {
+            get { return _MouseOverButtonDown; }
+            set
+            {
+                if (_MouseOverButtonDown != value)
+                {
+                    _MouseOverButtonDown = value;
+                    this.InvalidateRender();
+                }
+            }
+        }
+
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool MouseDownButtonDown
+        {
+            get { return _MouseDownButtonDown; }
+            set
+            {
+                if (_MouseDownButtonDown != value)
+                {
+                    _MouseDownButtonDown = value;
+                    this.InvalidateRender();
+                }
+            }
+        }
+
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool MouseDownButtonUp
+        {
+            get { return _MouseDownButtonUp; }
+            set
+            {
+                if (_MouseDownButtonUp != value)
+                {
+                    _MouseDownButtonUp = value;
+                    this.InvalidateRender();
+                }
+            }
+        }
+
+        private int _ButtonWidth = 15;
+        /// <summary>
+        /// Gets or sets the default width of the buttons.
+        /// </summary>
+        [DefaultValue(15)]
+        public int ButtonWidth
+        {
+            get { return _ButtonWidth; }
+            set
+            {
+                if (_ButtonWidth != value)
+                {
+                    _ButtonWidth = value;
+                    this.InvalidateArrange();
+                }
+            }
+        }
+
+        private eUpDownButtonAutoChange _AutoChange = eUpDownButtonAutoChange.None;
+        /// <summary>
+        /// Gets or sets whether control automatically tries to increase/decrease the value of the item that has input focus in the same
+        /// parent group as the button. Default value is false.
+        /// </summary>
+        [DefaultValue(eUpDownButtonAutoChange.None)]
+        public eUpDownButtonAutoChange AutoChange
+        {
+            get { return _AutoChange; }
+            set
+            {
+                _AutoChange = value;
+            }
+        }
+
+        private VisualItem _AutoChangeItem;
+        /// <summary>
+        /// Gets or sets the item that is automatically changed when buttons are pressed.
+        /// </summary>
+        [DefaultValue(null)]
+        public VisualItem AutoChangeItem
+        {
+            get { return _AutoChangeItem; }
+            set { _AutoChangeItem = value; }
+        }
+
+        private bool RenderBackground(PaintInfo p)
+        {
+            if (RenderDefaultBackground) return true;
+
+            if (!p.MouseOver && !(this.MouseDownButtonUp || this.MouseDownButtonDown) && !(this.MouseOverButtonUp || this.MouseOverButtonDown) || !this.GetIsEnabled())
+                return false;
+
+            return true;
+        }
+
+        protected virtual void PaintButtonBackground(PaintInfo p, Office2007ButtonItemStateColorTable ct, Rectangle r)
+        {
+            Graphics g = p.Graphics;
+            if(RenderBackground(p))
+                Office2007ButtonItemPainter.PaintBackground(g, ct, r, RoundRectangleShapeDescriptor.RectangleShape);
+        }
+
+        protected Office2007ButtonItemStateColorTable GetOffice2007StateColorTableButtonUp(PaintInfo p)
+        {
+            if (GlobalManager.Renderer is Office2007Renderer)
+            {
+                Office2007ColorTable ct = ((Office2007Renderer)GlobalManager.Renderer).ColorTable;
+                Office2007ButtonItemColorTable buttonColorTable = ct.ButtonItemColors[Enum.GetName(typeof(eButtonColor), eButtonColor.OrangeWithBackground)];
+                if (!this.GetIsEnabled(p) || !_UpEnabled)
+                    return buttonColorTable.Disabled;
+                else if (this.MouseDownButtonUp)
+                    return buttonColorTable.Pressed;
+                else if (this.MouseOverButtonUp)
+                    return buttonColorTable.MouseOver;
+                else
+                    return buttonColorTable.Default;
+            }
+
+            return null;
+        }
+
+        protected Office2007ButtonItemStateColorTable GetOffice2007StateColorTableButtonDown(PaintInfo p)
+        {
+            if (GlobalManager.Renderer is Office2007Renderer)
+            {
+                Office2007ColorTable ct = ((Office2007Renderer)GlobalManager.Renderer).ColorTable;
+                Office2007ButtonItemColorTable buttonColorTable = ct.ButtonItemColors[Enum.GetName(typeof(eButtonColor), eButtonColor.OrangeWithBackground)];
+                if (!this.GetIsEnabled(p) || !_DownEnabled)
+                    return buttonColorTable.Disabled;
+                else if (this.MouseDownButtonDown)
+                    return buttonColorTable.Pressed;
+                else if (this.MouseOverButtonDown)
+                    return buttonColorTable.MouseOver;
+                else
+                    return buttonColorTable.Default;
+            }
+
+            return null;
+        }
+
+        private bool _UpEnabled = true;
+        [DefaultValue(true)]
+        public bool UpEnabled
+        {
+            get { return _UpEnabled; }
+            set
+            {
+                if (_UpEnabled != value)
+                {
+                    _UpEnabled = value;
+                    this.InvalidateRender();
+                }
+            }
+        }
+
+        private bool _DownEnabled = true;
+        [DefaultValue(true)]
+        public bool DownEnabled
+        {
+            get { return _DownEnabled; }
+            set
+            {
+                if (_DownEnabled != value)
+                {
+                    _DownEnabled = value;
+                    this.InvalidateRender();
+                }
+            }
+        }
+        #endregion
+
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/ElementSerializer.cs b/PROMS/DotNetBar Source Code/ElementSerializer.cs
new file mode 100644
index 00000000..4c2698db
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/ElementSerializer.cs	
@@ -0,0 +1,368 @@
+using System;
+using System.Text;
+using System.Xml;
+using System.Reflection;
+using System.Drawing;
+using System.ComponentModel;
+
+#if DOTNETBAR
+namespace DevComponents.DotNetBar
+#else
+namespace DevComponents.Tree
+#endif
+{
+    [AttributeUsage(AttributeTargets.Property | AttributeTargets.Method | AttributeTargets.Field)]
+    public class DevCoSerialize : Attribute
+    {
+        public DevCoSerialize(){}
+    }
+
+	/// <summary>
+	/// Represents class that can serialize compatible marked properties.
+	/// </summary>
+    public class ElementSerializer
+    {
+        private static string XmlImageName="image";
+        private static string XmlIconName="icon";
+        private static string XmlAttributeName="name";
+//    	private static string XmlCollectionName="collection";
+//    	private static string XmlTypeName="type";
+//    	private static string XmlObjectName="object";
+
+        public static void Serialize(object element, XmlElement xmlElem)
+        {
+            PropertyInfo[] propInfo = element.GetType().GetProperties(BindingFlags.DeclaredOnly | BindingFlags.Instance | BindingFlags.Public);
+            foreach (PropertyInfo prop in propInfo)
+            {
+                if (prop.GetCustomAttributes(typeof(DevCoSerialize), true).Length > 0)
+                {
+                	// Check whether property needs to be serialized
+                	object[] attributesDefaultValue=prop.GetCustomAttributes(typeof(DefaultValueAttribute), true);
+                	if (attributesDefaultValue.Length > 0)
+                	{
+                		DefaultValueAttribute att=attributesDefaultValue[0] as DefaultValueAttribute;
+                		object propertyValue = prop.GetValue(element, null);
+                		if(propertyValue==att.Value)
+                			continue;
+                		if(propertyValue!=null && att.Value!=null && propertyValue.Equals(att.Value))
+                			continue;
+                	}
+                	else if(element.GetType().GetMethod("ShouldSerialize" + prop.Name,BindingFlags.Default | BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance)!=null)
+                	{
+                		MethodInfo mi=element.GetType().GetMethod("ShouldSerialize" + prop.Name,BindingFlags.Default | BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance);
+                		object result=mi.Invoke(element,null);
+                		if(result is bool && !((bool)result))
+                			continue;
+                	}
+                	
+                    string attributeName=XmlConvert.EncodeName(prop.Name);
+                    Type t=prop.PropertyType;
+                    if (t.IsPrimitive || t == typeof(string) || t.IsEnum)
+                    {
+                        if (t == typeof(string))
+                            xmlElem.SetAttribute(attributeName, prop.GetValue(element, null).ToString());
+                        else if (t.IsEnum)
+                        {
+                            xmlElem.SetAttribute(attributeName, Enum.Format(t, prop.GetValue(element, null), "g"));
+                        }
+                        else if (t == typeof(bool))
+                            xmlElem.SetAttribute(attributeName, XmlConvert.ToString((bool)prop.GetValue(element, null)));
+                        else if (t == typeof(Int32))
+                            xmlElem.SetAttribute(attributeName, XmlConvert.ToString((Int32)prop.GetValue(element, null)));
+                        else if (t == typeof(double))
+                            xmlElem.SetAttribute(attributeName, XmlConvert.ToString((double)prop.GetValue(element, null)));
+                        else if (t == typeof(float))
+                            xmlElem.SetAttribute(attributeName, XmlConvert.ToString((float)prop.GetValue(element, null)));
+                        else if (t == typeof(Int16))
+                            xmlElem.SetAttribute(attributeName, XmlConvert.ToString((Int16)prop.GetValue(element, null)));
+                        else if (t == typeof(Int64))
+                            xmlElem.SetAttribute(attributeName, XmlConvert.ToString((Int64)prop.GetValue(element, null)));
+                        else if (t == typeof(byte))
+                            xmlElem.SetAttribute(attributeName, XmlConvert.ToString((byte)prop.GetValue(element, null)));
+                        else if (t == typeof(char))
+                            xmlElem.SetAttribute(attributeName, XmlConvert.ToString((char)prop.GetValue(element, null)));
+                        else if (t == typeof(decimal))
+                            xmlElem.SetAttribute(attributeName, XmlConvert.ToString((decimal)prop.GetValue(element, null)));
+                        else if (t == typeof(Guid))
+                            xmlElem.SetAttribute(attributeName, XmlConvert.ToString((Guid)prop.GetValue(element, null)));
+                        else if (t == typeof(sbyte))
+                            xmlElem.SetAttribute(attributeName, XmlConvert.ToString((sbyte)prop.GetValue(element, null)));
+                        else if (t == typeof(TimeSpan))
+                            xmlElem.SetAttribute(attributeName, XmlConvert.ToString((TimeSpan)prop.GetValue(element, null)));
+                        else if (t == typeof(ushort))
+                            xmlElem.SetAttribute(attributeName, XmlConvert.ToString((ushort)prop.GetValue(element, null)));
+                        else if (t == typeof(uint))
+                            xmlElem.SetAttribute(attributeName, XmlConvert.ToString((uint)prop.GetValue(element, null)));
+                        else if (t == typeof(ulong))
+                            xmlElem.SetAttribute(attributeName, XmlConvert.ToString((ulong)prop.GetValue(element, null)));
+                        else
+                            throw new ApplicationException("Unsupported serialization type '" + t.ToString() + "' on property '" + attributeName + "'");
+                    }
+                    else if (t == typeof(Color))
+                        xmlElem.SetAttribute(attributeName, ColorToString((Color)prop.GetValue(element, null)));
+                    else if (t == typeof(Image))
+                    {
+                        XmlElement imageXmlElement = xmlElem.OwnerDocument.CreateElement(XmlImageName);
+                        imageXmlElement.SetAttribute(XmlAttributeName, attributeName);
+                        xmlElem.AppendChild(imageXmlElement);
+                        SerializeImage((Image)prop.GetValue(element, null), imageXmlElement);
+                    }
+                    else if (t == typeof(Icon))
+                    {
+                        XmlElement imageXmlElement = xmlElem.OwnerDocument.CreateElement(XmlIconName);
+                        imageXmlElement.SetAttribute(XmlAttributeName, attributeName);
+                        xmlElem.AppendChild(imageXmlElement);
+                        SerializeIcon((Icon)prop.GetValue(element, null), imageXmlElement);
+                    }
+                    else if (t == typeof(Font))
+                    {
+                        xmlElem.SetAttribute(attributeName, FontToString((Font)prop.GetValue(element, null)));
+                    }
+                    else
+                        throw new ApplicationException("Unsupported serialization type '" + t.ToString() + "'" + "' on property '" + attributeName + "'");
+                }
+            }
+        }
+
+        private static string ColorToString(Color clr)
+        {
+            if (clr.IsSystemColor || clr.IsNamedColor || clr.IsKnownColor)
+                return ("." + clr.Name);
+            else
+                return clr.ToArgb().ToString();
+        }
+
+        private static Color ColorFromString(string sclr)
+        {
+            if (sclr == "")
+                return Color.Empty;
+            if (sclr[0] == '.')
+                return Color.FromName(sclr.Substring(1));
+            else
+                return Color.FromArgb(System.Xml.XmlConvert.ToInt32(sclr));
+        }
+
+        private static string FontToString(Font font)
+        {
+            if (font == null)
+                return "";
+
+            string s = font.Name + "," + XmlConvert.ToString(font.Size) + "," + XmlConvert.ToString(font.Bold) + "," + XmlConvert.ToString(font.Italic) + "," +
+                XmlConvert.ToString(font.Underline) + "," + XmlConvert.ToString(font.Strikeout);
+
+            return s;
+        }
+
+        private static Font FontFromString(string fontString)
+        {
+            if(fontString=="")
+                return null;
+
+            string[] options=fontString.Split(',');
+            FontStyle fontStyle = FontStyle.Regular;
+            if (XmlConvert.ToBoolean(options[2]))
+                fontStyle |= FontStyle.Bold;
+            if (XmlConvert.ToBoolean(options[3]))
+                fontStyle |= FontStyle.Italic;
+            if (XmlConvert.ToBoolean(options[4]))
+                fontStyle |= FontStyle.Underline;
+            if (XmlConvert.ToBoolean(options[5]))
+                fontStyle |= FontStyle.Strikeout;
+            Font font = new Font(options[0], XmlConvert.ToSingle(options[1]), fontStyle);
+            return font;
+        }
+
+        public static void Deserialize(object element, XmlElement xmlElem)
+        {
+            Type type=element.GetType();
+            foreach(XmlAttribute att in xmlElem.Attributes)
+            {
+                string name=XmlConvert.DecodeName(att.Name);
+                PropertyInfo prop=type.GetProperty(name);
+                if(prop!=null)
+                {
+                    Type t=prop.PropertyType;
+
+                    if (t.IsPrimitive)
+                    {
+                        if(t==typeof(bool))
+                            prop.SetValue(element, XmlConvert.ToBoolean(att.Value), null);
+                        else if (t == typeof(Int32))
+                            prop.SetValue(element, XmlConvert.ToInt32(att.Value), null);
+                        else if (t == typeof(double))
+                            prop.SetValue(element, XmlConvert.ToDouble(att.Value), null);
+                        else if (t == typeof(float))
+                            prop.SetValue(element, XmlConvert.ToSingle(att.Value), null);
+                        else if (t == typeof(Int16))
+                            prop.SetValue(element, XmlConvert.ToInt16(att.Value), null);
+                        else if (t == typeof(Int64))
+                            prop.SetValue(element, XmlConvert.ToInt64(att.Value), null);
+                        else if (t == typeof(byte))
+                            prop.SetValue(element, XmlConvert.ToByte(att.Value), null);
+                        else if (t == typeof(char))
+                            prop.SetValue(element, XmlConvert.ToChar(att.Value), null);
+                        else if (t == typeof(decimal))
+                            prop.SetValue(element, XmlConvert.ToDecimal(att.Value), null);
+                        else if (t == typeof(Guid))
+                            prop.SetValue(element, XmlConvert.ToGuid(att.Value), null);
+                        else if (t == typeof(sbyte))
+                            prop.SetValue(element, XmlConvert.ToSByte(att.Value), null);
+                        else if (t == typeof(TimeSpan))
+                            prop.SetValue(element, XmlConvert.ToTimeSpan(att.Value), null);
+                        else if (t == typeof(ushort))
+                            prop.SetValue(element, XmlConvert.ToUInt16(att.Value), null);
+                        else if (t == typeof(uint))
+                            prop.SetValue(element, XmlConvert.ToUInt32(att.Value), null);
+                        else if (t == typeof(ulong))
+                            prop.SetValue(element, XmlConvert.ToUInt64(att.Value), null);
+                    }
+                    else if (t == typeof(string))
+                        prop.SetValue(element, att.Value, null);
+                    else if (t.IsEnum)
+                        prop.SetValue(element, Enum.Parse(t, att.Value), null);
+                    else if (t == typeof(Color))
+                        prop.SetValue(element, ColorFromString(att.Value), null);
+                    else if (t == typeof(Font))
+                        prop.SetValue(element, FontFromString(att.Value), null);
+                }
+            }
+
+            foreach(XmlElement childElem in xmlElem.ChildNodes)
+            {
+                if (childElem.Name == XmlImageName)
+                {
+                    string name = XmlConvert.DecodeName(childElem.GetAttribute(XmlAttributeName));
+                    PropertyInfo prop = type.GetProperty(name);
+                    if (prop != null)
+                    {
+                        prop.SetValue(element, DeserializeImage(childElem), null);
+                    }
+                }
+                else if (childElem.Name == XmlIconName)
+                {
+                    string name = XmlConvert.DecodeName(childElem.GetAttribute(XmlAttributeName));
+                    PropertyInfo prop = type.GetProperty(name);
+                    if (prop != null)
+                    {
+                        prop.SetValue(element, DeserializeIcon(childElem), null);
+                    }
+                }
+            }
+        }
+
+		public static void SerializeImage(System.Drawing.Image image,XmlElement xml)
+		{
+			if(image==null)
+				return;
+
+			System.IO.MemoryStream mem=new System.IO.MemoryStream(1024);
+			// TODO: Beta 2 issue with the ImageFormat. RawFormat on image object does not return the actual image format
+			// Right now it is hard coded to PNG but in final version we should get the original image format
+			image.Save(mem,System.Drawing.Imaging.ImageFormat.Png);
+
+			System.Text.StringBuilder sb=new System.Text.StringBuilder();
+			System.IO.StringWriter sw=new System.IO.StringWriter(sb);
+				
+			System.Xml.XmlTextWriter xt=new System.Xml.XmlTextWriter(sw);
+			xt.WriteBase64(mem.GetBuffer(),0,(int)mem.Length);
+
+			xml.InnerText=sb.ToString();
+		}
+
+		public static void SerializeIcon(System.Drawing.Icon icon, XmlElement xml)
+		{
+			if(icon==null)
+				return;
+
+			System.IO.MemoryStream mem=new System.IO.MemoryStream(1024);
+			// TODO: Beta 2 issue with the ImageFormat. RawFormat on image object does not return the actual image format
+			// Right now it is hard coded to PNG but in final version we should get the original image format
+			icon.Save(mem);
+
+			System.Text.StringBuilder sb=new System.Text.StringBuilder();
+			System.IO.StringWriter sw=new System.IO.StringWriter(sb);
+				
+			System.Xml.XmlTextWriter xt=new System.Xml.XmlTextWriter(sw);
+
+			xml.SetAttribute("encoding","binhex");
+			//xt.WriteBase64(mem.GetBuffer(),0,(int)mem.Length);
+			xt.WriteBinHex(mem.GetBuffer(),0,(int)mem.Length);
+
+			xml.InnerText=sb.ToString();
+		}
+
+		/// <summary>
+		/// XML element is expected to be something like <image>Image data Base64 encoded</image>
+		/// </summary>
+		/// <param name="xml">Image data</param>
+		/// <returns></returns>
+		public static System.Drawing.Image DeserializeImage(XmlElement xml)
+		{
+			System.Drawing.Image img=null;
+			if(xml==null || xml.InnerText=="")
+				return null;
+
+			System.IO.StringReader sr=new System.IO.StringReader(xml.OuterXml);
+			System.Xml.XmlTextReader xr= new System.Xml.XmlTextReader(sr);
+			System.IO.MemoryStream mem=new System.IO.MemoryStream(1024);
+			// Skip <image> to data
+			xr.Read();
+				
+			byte[] base64 = new byte[1024];
+			int base64len = 0;
+			do
+			{
+				base64len = xr.ReadBase64(base64, 0, 1024);
+				if(base64len>0)
+					mem.Write(base64,0,base64len);
+
+			} while (base64len!=0);
+
+			img=System.Drawing.Image.FromStream(mem);
+
+			return img;
+		}
+
+		public static System.Drawing.Icon DeserializeIcon(XmlElement xml)
+		{
+			System.Drawing.Icon img=null;
+			if(xml==null || xml.InnerText=="")
+				return null;
+			bool bDecodeBinHex=false;
+			if(xml.HasAttribute("encoding") && xml.GetAttribute("encoding")=="binhex")
+				bDecodeBinHex=true;
+			System.IO.StringReader sr=new System.IO.StringReader(xml.OuterXml);
+			System.Xml.XmlTextReader xr= new System.Xml.XmlTextReader(sr);
+			System.IO.MemoryStream mem=new System.IO.MemoryStream(1024);
+			// Skip <image> to data
+			xr.Read();
+				
+			byte[] base64 = new byte[1024];
+			int base64len = 0;
+			if(bDecodeBinHex)
+			{
+				do
+				{
+					base64len = xr.ReadBinHex(base64, 0, 1024);
+					if(base64len>0)
+						mem.Write(base64,0,base64len);
+
+				} while (base64len!=0);
+			}
+			else
+			{
+				do
+				{
+					base64len = xr.ReadBase64(base64, 0, 1024);
+					if(base64len>0)
+						mem.Write(base64,0,base64len);
+
+				} while (base64len!=0);
+			}
+			mem.Position=0;
+			img=new System.Drawing.Icon(mem);
+
+			return img;
+		}
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/ElementStyle.cs b/PROMS/DotNetBar Source Code/ElementStyle.cs
new file mode 100644
index 00000000..9194d7ab
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/ElementStyle.cs	
@@ -0,0 +1,2695 @@
+using System;
+using System.Data;
+using System.Drawing;
+using System.ComponentModel;
+
+#if AdvTree
+using DevComponents.Tree.Design;
+namespace DevComponents.Tree
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar
+#endif
+{
+	/// <summary>
+	/// Represents visual style of an User Interface Element.
+	/// </summary>
+	[System.ComponentModel.ToolboxItem(false),System.ComponentModel.DesignTimeVisible(false),TypeConverter(typeof(System.ComponentModel.ExpandableObjectConverter))]
+	public class ElementStyle:System.ComponentModel.IComponent
+	{
+		#region Events
+		/// <summary>
+		/// Occurs when appearance property of the style has changed.
+		/// </summary>
+		public event EventHandler StyleChanged;
+		/// <summary>
+		/// Occurs when component is Disposed.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when component is Disposed.")]
+		public event EventHandler Disposed;
+		#endregion
+
+		#region Private Variables
+		const int DEFAULT_CORNER_DIAMETER=8;
+
+		private Color m_BackColor=Color.Empty;
+		private eColorSchemePart m_BackColorSchemePart=eColorSchemePart.None;
+		private Color m_BackColor2=Color.Empty;
+		private eColorSchemePart m_BackColor2SchemePart=eColorSchemePart.None;
+		private int m_BackColorGradientAngle=0;
+		private Image m_BackgroundImage=null;
+		private eStyleBackgroundImage m_BackgroundImagePosition=eStyleBackgroundImage.Stretch;
+		private byte m_BackgroundImageAlpha=255;
+        private eGradientType m_BackColorGradientType = eGradientType.Linear;
+
+		// Font
+		private Font m_Font=null;
+
+		// Text Formating
+		private bool m_WordWrap=false;
+		private eStyleTextAlignment m_TextAlignment=eStyleTextAlignment.Near;
+		private eStyleTextAlignment m_TextLineAlignment=eStyleTextAlignment.Center;
+		private eStyleTextTrimming m_TextTrimming=eStyleTextTrimming.EllipsisCharacter;
+		//private string m_TextFormat="";
+
+		private Color m_TextColor=Color.Empty;
+		private eColorSchemePart m_TextColorSchemePart=eColorSchemePart.None;
+		private Color m_TextShadowColor=Color.Empty;
+		private eColorSchemePart m_TextShadowColorSchemePart=eColorSchemePart.None;
+		private Point m_TextShadowOffset=Point.Empty;
+
+		// Style margins
+		private int m_MarginLeft=0;
+		private int m_MarginRight=0;
+		private int m_MarginTop=0;
+		private int m_MarginBottom=0;
+
+		// Style inside padding
+		private int m_PaddingLeft=0;
+		private int m_PaddingRight=0;
+		private int m_PaddingTop=0;
+		private int m_PaddingBottom=0;
+
+		// Border
+		private eStyleBorderType m_BorderLeft=eStyleBorderType.None;
+		private eStyleBorderType m_BorderRight=eStyleBorderType.None;
+		private eStyleBorderType m_BorderTop=eStyleBorderType.None;
+		private eStyleBorderType m_BorderBottom=eStyleBorderType.None;
+
+		private Color m_BorderColor=Color.Empty;
+		private eColorSchemePart m_BorderColorSchemePart=eColorSchemePart.None;
+        private Color m_BorderColor2 = Color.Empty;
+        private eColorSchemePart m_BorderColor2SchemePart = eColorSchemePart.None;
+        private int m_BorderGradientAngle = 90;
+
+        private Color m_BorderColorLight = Color.Empty;
+        private eColorSchemePart m_BorderColorLightSchemePart = eColorSchemePart.None;
+        private Color m_BorderColorLight2 = Color.Empty;
+        private eColorSchemePart m_BorderColorLight2SchemePart = eColorSchemePart.None;
+        private int m_BorderLightGradientAngle = 90;
+
+		private Color m_BorderLeftColor=Color.Empty;
+		private eColorSchemePart m_BorderLeftColorSchemePart=eColorSchemePart.None;
+		private Color m_BorderRightColor=Color.Empty;
+		private eColorSchemePart m_BorderRightColorSchemePart=eColorSchemePart.None;
+		private Color m_BorderTopColor=Color.Empty;
+		private eColorSchemePart m_BorderTopColorSchemePart=eColorSchemePart.None;
+		private Color m_BorderBottomColor=Color.Empty;
+		private eColorSchemePart m_BorderBottomColorSchemePart=eColorSchemePart.None;
+
+		private int m_BorderLeftWidth=0;
+		private int m_BorderRightWidth=0;
+		private int m_BorderTopWidth=0;
+		private int m_BorderBottomWidth=0;
+
+		private eCornerType m_CornerType=eCornerType.Square;
+		private eCornerType m_CornerTypeTopLeft=eCornerType.Inherit;
+		private eCornerType m_CornerTypeTopRight=eCornerType.Inherit;
+		private eCornerType m_CornerTypeBottomLeft=eCornerType.Inherit;
+		private eCornerType m_CornerTypeBottomRight=eCornerType.Inherit;
+		private int m_CornerDiameter=DEFAULT_CORNER_DIAMETER;
+
+		private Size m_Size=Size.Empty;
+		private bool m_SizeChanged=true;
+
+		private string m_Name="";
+		private string m_Description="";
+
+		private int m_MaximumHeight=0;
+		private System.ComponentModel.ISite m_ComponentSite=null;
+		private bool m_DesignMode=false;
+		#if AdvTree
+		private ElementStyleCollection m_Parent=null;
+        private int m_MaximumWidth=0;
+        #endif
+        private ColorScheme m_ColorScheme=null;
+        private BackgroundColorBlendCollection m_BackColorBlend = new BackgroundColorBlendCollection();
+        private string m_Class = "";
+        private bool m_FreezeEvents = false;
+		#endregion
+
+		/// <summary>Creates new instance of the class.</summary>
+		public ElementStyle()
+		{
+            m_BackColorBlend.Parent = this;
+        }
+        /// <summary>
+        /// Initializes a new instance of the ElementStyle class.
+        /// </summary>
+        /// <param name="styleClass"></param>
+        public ElementStyle(string styleClass)
+        {
+            m_Class = styleClass;
+        }
+        /// <summary>Creates new instance of the class.</summary>
+        public ElementStyle(Color textColor)
+        {
+            m_BackColorBlend.Parent = this;
+            TextColor = textColor;
+        }
+
+        /// <summary>Creates new instance of the class.</summary>
+        public ElementStyle(Color textColor, Color backColor)
+        {
+            m_BackColorBlend.Parent = this;
+            TextColor = textColor;
+            BackColor = backColor;
+        }
+        /// <summary>Creates new instance of the class.</summary>
+        public ElementStyle(Color textColor, Color backColor1, Color backColor2)
+        {
+            m_BackColorBlend.Parent = this;
+            TextColor = textColor;
+            BackColor = backColor1;
+            BackColor2 = backColor2;
+            BackColorGradientAngle = 90;
+        }
+
+        #region Properties
+        /// <summary>
+        /// Gets the collection that defines the multicolor gradient background.
+        /// </summary>
+        [Browsable(true), DesignerSerializationVisibility(DesignerSerializationVisibility.Content), Description("Collection that defines the multicolor gradient background.")]
+        public BackgroundColorBlendCollection BackColorBlend
+        {
+            get { return m_BackColorBlend; }
+        }
+
+		/// <summary>
+		/// Gets or sets the background color for UI element. If used in combination with
+		/// BackgroundColor2 is specifies starting gradient color.
+		/// </summary>
+		[DevCoSerialize(),Browsable(true),Category("Background"),Description("Gets or sets the background color for UI element."),Editor(typeof(ColorTypeEditor), typeof(System.Drawing.Design.UITypeEditor)),TypeConverter("DevComponents.DotNetBar.Design.ColorSchemeColorConverter, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+		public Color BackColor
+		{
+			get
+			{
+				return GetColor(m_BackColor,m_BackColorSchemePart);
+			}
+			set
+			{
+				if(value!=this.BackColor && (m_BackColorSchemePart!=eColorSchemePart.None && !value.IsEmpty || value.IsEmpty))
+					this.BackColorSchemePart=eColorSchemePart.None;
+				m_BackColor=value;
+				this.OnStyleChanged();
+			}
+		}
+		/// <summary>
+		/// Indicates whether BackgroundColor should be serialized. Used by windows forms designer design-time support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeBackColor()
+		{return (!m_BackColor.IsEmpty && m_BackColorSchemePart==eColorSchemePart.None);}
+		/// <summary>
+		/// Resets BackgroundColor to it's default value. Used by windows forms designer design-time support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetBackColor()
+		{
+			m_BackColor=Color.Empty;
+            this.OnStyleChanged();
+		}
+
+		/// <summary>
+		/// Gets or sets the color scheme color that is used as background color. Setting
+		/// this property overrides the setting of the corresponding BackColor property.
+		/// Color scheme colors are automatically managed and are based on current system colors.
+		/// That means if colors on the system change the color scheme will ensure that it's colors
+		/// are changed as well to fit in the color scheme of target system. Set this property to
+		/// <a href="AdvTree~DevComponents.Tree.eColorSchemePart.html">eColorSchemePart.None</a> to
+		/// specify explicit color to use through BackColor property.
+		/// </summary>
+        [DevCoSerialize(), Browsable(false), DefaultValue(eColorSchemePart.None)]
+		public eColorSchemePart BackColorSchemePart
+		{
+			get {return m_BackColorSchemePart;}
+			set
+			{
+				m_BackColorSchemePart=value;
+				this.OnStyleChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the target gradient background color for UI element.
+		/// </summary>
+        [DevCoSerialize(), Browsable(true), Category("Background"), Editor(typeof(ColorTypeEditor), typeof(System.Drawing.Design.UITypeEditor)), Description("Gets or sets the target gradient background color for UI element."), TypeConverter("DevComponents.DotNetBar.Design.ColorSchemeColorConverter, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+		public Color BackColor2
+		{
+			get {return GetColor(m_BackColor2,m_BackColor2SchemePart);}
+			set
+			{
+				if(value!=this.BackColor2 && (m_BackColor2SchemePart!=eColorSchemePart.None && !value.IsEmpty || value.IsEmpty))
+					this.BackColor2SchemePart=eColorSchemePart.None;
+				m_BackColor2=value;
+				this.OnStyleChanged();
+			}
+		}
+		/// <summary>
+		/// Indicates whether BackgroundColor2 should be serialized. Used by windows forms designer design-time support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeBackColor2()
+		{return (!m_BackColor2.IsEmpty && m_BackColor2SchemePart==eColorSchemePart.None);}
+		/// <summary>
+		/// Resets BackgroundColor2 to it's default value. Used by windows forms designer design-time support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetBackColor2()
+		{
+			m_BackColor2=Color.Empty;
+		}
+
+		/// <summary>
+		/// Gets or sets the color scheme color that is used as target gradient background color. Setting
+		/// this property overrides the setting of the corresponding BackColor2 property.
+		/// Color scheme colors are automatically managed and are based on current system colors.
+		/// That means if colors on the system change the color scheme will ensure that it's colors
+		/// are changed as well to fit in the color scheme of target system. Set this property to
+		/// <a href="AdvTree~DevComponents.Tree.eColorSchemePart.html">eColorSchemePart.None</a> to
+		/// specify explicit color to use through BackColor2 property.
+		/// </summary>
+        [DevCoSerialize(), Browsable(false), DefaultValue(eColorSchemePart.None)]
+		public eColorSchemePart BackColor2SchemePart
+		{
+			get {return m_BackColor2SchemePart;}
+			set
+			{
+				m_BackColor2SchemePart=value;
+				this.OnStyleChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the background gradient angle.
+		/// </summary>
+        [DevCoSerialize(), Browsable(true), Category("Background"), DefaultValue(0), Description("Gets or sets the background gradient angle.")]
+		public int BackColorGradientAngle
+		{
+			get
+			{
+				return m_BackColorGradientAngle;
+			}
+			set
+			{
+				if(m_BackColorGradientAngle!=value)
+				{
+					m_BackColorGradientAngle=value;
+					this.OnStyleChanged();
+
+				}
+			}
+		}
+
+        /// <summary>
+        /// Gets or sets the background gradient fill type. Default value is Linear.
+        /// </summary>
+        [DevCoSerialize(), Browsable(true), Category("Background"), DefaultValue(eGradientType.Linear), Description("Indicates background gradient fill type.")]
+        public eGradientType BackColorGradientType
+        {
+            get { return m_BackColorGradientType; }
+            set
+            {
+                if (m_BackColorGradientType != value)
+                {
+                    m_BackColorGradientType = value;
+                    this.OnStyleChanged();
+                }
+            }
+        }
+
+		/// <summary>
+		/// Specifies background image.
+		/// </summary>
+        [DevCoSerialize(), Browsable(true), Category("Background"), DefaultValue(null), Description("Specifies background image."), DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
+		public Image BackgroundImage
+		{
+			get {return m_BackgroundImage;}
+			set
+			{
+				m_BackgroundImage=value;
+				this.OnStyleChanged();
+			}
+		}
+		/// <summary>
+		/// Resets BackgroundImage to it's default value null (VB Nothing). Used by windows forms designer design-time support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetBackgroundImage()
+		{
+			m_BackgroundImage=null;
+		}
+
+		/// <summary>
+		/// Specifies background image position when container is larger than image.
+		/// </summary>
+        [DevCoSerialize(), Browsable(true), Category("Background"), DefaultValue(eStyleBackgroundImage.Stretch), Description("Specifies background image position when container is larger than image.")]
+		public eStyleBackgroundImage BackgroundImagePosition
+		{
+			get {return m_BackgroundImagePosition;}
+			set
+			{
+				if(m_BackgroundImagePosition!=value)
+				{
+					m_BackgroundImagePosition=value;
+					this.OnStyleChanged();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Specifies the transparency of background image.
+		/// </summary>
+        [DevCoSerialize(), Browsable(true), Category("Background"), DefaultValue((byte)255), Description("Specifies the transparency of background image.")]
+		public byte BackgroundImageAlpha
+		{
+			get {return m_BackgroundImageAlpha;}
+			set
+			{
+				if(m_BackgroundImageAlpha!=value)
+				{
+					m_BackgroundImageAlpha=value;
+					this.OnStyleChanged();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the text color displayed in this UI element.
+		/// </summary>
+        [DevCoSerialize(), Browsable(true), Category("Text Properties"), Editor(typeof(ColorTypeEditor), typeof(System.Drawing.Design.UITypeEditor)), Description("Gets or sets the text color displayed in this UI element."), TypeConverter("DevComponents.DotNetBar.Design.ColorSchemeColorConverter, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+		public Color TextColor
+		{
+			get {return GetColor(m_TextColor,m_TextColorSchemePart);}
+			set
+			{
+				if(value!=this.TextColor && (m_TextColorSchemePart!=eColorSchemePart.None && !value.IsEmpty || value.IsEmpty))
+					this.TextColorSchemePart=eColorSchemePart.None;
+				m_TextColor=value;
+				this.OnStyleChanged();
+			}
+		}
+		/// <summary>
+		/// Indicates whether TextColor should be serialized. Used by windows forms designer design-time support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeTextColor()
+		{return (!m_TextColor.IsEmpty && m_TextColorSchemePart==eColorSchemePart.None);}
+		/// <summary>
+		/// Resets TextColor to it's default value. Used by windows forms designer design-time support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetTextColor()
+		{
+			m_TextColor=Color.Empty;
+		}
+
+		/// <summary>
+		/// Gets or sets the color scheme color that is used as text color. Setting
+		/// this property overrides the setting of the corresponding TextColor property.
+		/// Color scheme colors are automatically managed and are based on current system colors.
+		/// That means if colors on the system change the color scheme will ensure that it's colors
+		/// are changed as well to fit in the color scheme of target system. Set this property to
+		/// <a href="AdvTree~DevComponents.Tree.eColorSchemePart.html">eColorSchemePart.None</a> to
+		/// specify explicit color to use through TextColor property.
+		/// </summary>
+        [DevCoSerialize(), Browsable(false), DefaultValue(eColorSchemePart.None)]
+		public eColorSchemePart TextColorSchemePart
+		{
+			get {return m_TextColorSchemePart;}
+			set
+			{
+				m_TextColorSchemePart=value;
+				this.OnStyleChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the text shadow color.
+		/// </summary>
+		[DevCoSerialize(), Browsable(true),Category("Text Properties"),Editor(typeof(ColorTypeEditor), typeof(System.Drawing.Design.UITypeEditor)),Description("Indicates text shadow color."),TypeConverter(typeof(ColorConverter))]
+		public Color TextShadowColor
+		{
+			get {return GetColor(m_TextShadowColor,m_TextShadowColorSchemePart);}
+			set
+			{
+				if(m_TextShadowColorSchemePart!=eColorSchemePart.None && !value.IsEmpty || value.IsEmpty)
+					this.TextShadowColorSchemePart=eColorSchemePart.None;
+				m_TextShadowColor=value;
+				this.OnStyleChanged();
+			}
+		}
+		/// <summary>
+		/// Indicates whether TextShadowColor should be serialized. Used by windows forms designer design-time support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeTextShadowColor()
+		{return (!m_TextShadowColor.IsEmpty && m_TextShadowColorSchemePart==eColorSchemePart.None);}
+		/// <summary>
+		/// Resets TextColor to it's default value. Used by windows forms designer design-time support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetTextShadowColor()
+		{
+			m_TextShadowColor=Color.Empty;
+		}
+
+		/// <summary>
+		/// Gets or sets the color scheme color that is used as text shadow color. Setting
+		/// this property overrides the setting of the corresponding TextShadowColor property.
+		/// Color scheme colors are automatically managed and are based on current system colors.
+		/// That means if colors on the system change the color scheme will ensure that it's colors
+		/// are changed as well to fit in the color scheme of target system. Set this property to
+		/// <a href="AdvTree~DevComponents.Tree.eColorSchemePart.html">eColorSchemePart.None</a> to
+		/// specify explicit color to use through TextColor property.
+		/// </summary>
+		[DevCoSerialize(), Browsable(false),DefaultValue(eColorSchemePart.None)]
+		public eColorSchemePart TextShadowColorSchemePart
+		{
+			get {return m_TextShadowColorSchemePart;}
+			set
+			{
+				m_TextShadowColorSchemePart=value;
+				this.OnStyleChanged();
+			}
+		}
+
+		/// <summary>
+		/// Indicates text shadow offset in pixels
+		/// </summary>
+		[DevCoSerialize(), Browsable(true),Category("Text Properties"),Description("Indicates text shadow offset in pixels.")]
+		public Point TextShadowOffset
+		{
+			get { return m_TextShadowOffset; }
+			set
+			{
+				m_TextShadowOffset=value;
+				OnStyleChanged();
+			}
+		}
+		/// <summary>
+		/// Indicates whether TextShadowOffset should be serialized. Used by windows forms designer design-time support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeTextShadowOffset()
+		{return (!m_TextShadowOffset.IsEmpty);}
+		/// <summary>
+		/// Resets TextShadowOffset to it's default value. Used by windows forms designer design-time support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetTextShadowOffset()
+		{
+			m_TextShadowOffset=Point.Empty;
+		}
+
+		/// <summary>
+		/// Gets or sets the Font used to draw this the text.
+		/// </summary>
+        [DevCoSerialize(), Browsable(true), Category("Text Properties"), DefaultValue(null), Description("Gets or sets the Font used to draw this the text.")]
+		public System.Drawing.Font Font
+		{
+			get
+			{
+				return m_Font;
+			}
+			set
+			{
+				m_Font=value;
+				this.OnStyleChanged();
+				this.OnSizePropertyChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets a value that determines whether text is displayed in multiple lines or one long line.
+		/// </summary>
+        [DevCoSerialize(), Browsable(true), Category("Text Formatting"), DefaultValue(false), Description("Gets or sets a value that determines whether text is displayed in multiple lines or one long line.")]
+		public bool WordWrap
+		{
+			get {return m_WordWrap;}
+			set
+			{
+				m_WordWrap=value;
+				this.OnStyleChanged();
+				this.OnSizePropertyChanged();
+			}
+		}
+
+		/// <summary>
+		/// Specifies alignment of the text.
+		/// </summary>
+        [DevCoSerialize(), Browsable(true), Category("Text Formatting"), DefaultValue(eStyleTextAlignment.Near), Description("Specifies alignment of the text.")]
+		public eStyleTextAlignment TextAlignment
+		{
+			get {return m_TextAlignment;}
+			set
+			{
+				m_TextAlignment=value;
+				this.OnStyleChanged();
+			}
+		}
+
+		/// <summary>
+		/// Specifies alignment of the text.
+		/// </summary>
+        [DevCoSerialize(), Browsable(true), Category("Text Formatting"), DefaultValue(eStyleTextAlignment.Center), Description("Specifies alignment of the text.")]
+		public eStyleTextAlignment TextLineAlignment
+		{
+			get {return m_TextLineAlignment;}
+			set
+			{
+				m_TextLineAlignment=value;
+				this.OnStyleChanged();
+			}
+		}
+
+		/// <summary>
+		/// Specifies how to trim characters when text does not fit.
+		/// </summary>
+        [DevCoSerialize(), Browsable(true), Category("Text Formatting"), DefaultValue(eStyleTextTrimming.EllipsisCharacter), Description("Specifies how to trim characters when text does not fit.")]
+		public eStyleTextTrimming TextTrimming
+		{
+			get {return m_TextTrimming;}
+			set
+			{
+				if(m_TextTrimming!=value)
+				{
+					m_TextTrimming=value;
+					this.OnStyleChanged();
+				}
+			}
+		}
+
+//		/// <summary>
+//		/// Gets or sets the text formatting options.
+//		/// </summary>
+//		[Browsable(true),Category("Text Formatting"),DefaultValue(""),Description("Gets or sets the text formatting options.")]
+//		public string TextFormat
+//		{
+//			get {return m_TextFormat;}
+//			set
+//			{
+//				m_TextFormat=value;
+//				this.OnStyleChanged();
+//			}
+//		}
+
+        /// <summary>
+        /// Gets the total horizontal margin (Left + Right)
+        /// </summary>
+        [Browsable(false)]
+        public int MarginHorizontal
+        {
+            get { return m_MarginLeft + m_MarginRight; }
+        }
+
+        /// <summary>
+        /// Gets the total vertical margin (Top + Bottom)
+        /// </summary>
+        [Browsable(false)]
+        public int MarginVertical
+        {
+            get { return m_MarginTop + m_MarginBottom; }
+        }
+
+
+		/// <summary>
+		/// Gets or sets the left margin.
+		/// </summary>
+        [DevCoSerialize(), Browsable(true), Category("Margins"), DefaultValue(0), Description("Specifies left margin.")]
+		public int MarginLeft
+		{
+			get {return m_MarginLeft;}
+			set 
+			{
+				m_MarginLeft=value;
+				this.OnStyleChanged();
+				this.OnSizePropertyChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the right margin.
+		/// </summary>
+        [DevCoSerialize(), Browsable(true), Category("Margins"), DefaultValue(0), Description("Specifies right margin.")]
+		public int MarginRight
+		{
+			get {return m_MarginRight;}
+			set 
+			{
+				m_MarginRight=value;
+				this.OnStyleChanged();
+				this.OnSizePropertyChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the top margin.
+		/// </summary>
+        [DevCoSerialize(), Browsable(true), Category("Margins"), DefaultValue(0), Description("Specifies top margin.")]
+		public int MarginTop
+		{
+			get {return m_MarginTop;}
+			set 
+			{
+				m_MarginTop=value;
+				this.OnStyleChanged();
+				this.OnSizePropertyChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the bottom margin.
+		/// </summary>
+        [DevCoSerialize(), Browsable(true), Category("Margins"), DefaultValue(0), Description("Specifies bottom margin.")]
+		public int MarginBottom
+		{
+			get {return m_MarginBottom;}
+			set 
+			{
+				m_MarginBottom=value;
+				this.OnStyleChanged();
+				this.OnSizePropertyChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets whether any style property has changed which could influence the size of the style.
+		/// </summary>
+		internal bool SizeChanged
+		{
+			get {return m_SizeChanged;}
+			set {m_SizeChanged=value;}
+		}
+
+		/// <summary>
+		/// Gets the calcuated size of the element style.
+		/// </summary>
+		[Browsable(false)]
+		public System.Drawing.Size Size
+		{
+			get {return m_Size;}
+		}
+		/// <summary>
+		/// Sets size of the element style.
+		/// </summary>
+		/// <param name="size">Indicates new size.</param>
+		internal void SetSize(Size size)
+		{
+			m_Size=size;
+		}
+
+		/// <summary>
+		/// Gets or sets the border type for all sides of the element.
+		/// </summary>
+		[DefaultValue(eStyleBorderType.None),Browsable(true),Category("Border"),DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden),Description("Indicates the border type for all sides of the element.")]
+		public eStyleBorderType Border
+		{
+			get {return m_BorderTop;}
+			set
+			{
+                if (this.DesignMode)
+                {
+                    TypeDescriptor.GetProperties(this)["BorderLeft"].SetValue(this, value);
+                    TypeDescriptor.GetProperties(this)["BorderRight"].SetValue(this, value);
+                    TypeDescriptor.GetProperties(this)["BorderTop"].SetValue(this, value);
+                    TypeDescriptor.GetProperties(this)["BorderBottom"].SetValue(this, value);
+                }
+                else
+                {
+                    this.BorderLeft = value;
+                    this.BorderRight = value;
+                    this.BorderTop = value;
+                    this.BorderBottom = value;
+                }
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets border width in pixels.
+		/// </summary>
+		[Browsable(true),DefaultValue(0),DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden),Category("Border"),Description("Indicates border width in pixels.")]
+		public int BorderWidth
+		{
+			get {return m_BorderTopWidth;}
+			set
+			{
+                if (this.DesignMode)
+                {
+                    TypeDescriptor.GetProperties(this)["BorderLeftWidth"].SetValue(this, value);
+                    TypeDescriptor.GetProperties(this)["BorderRightWidth"].SetValue(this, value);
+                    TypeDescriptor.GetProperties(this)["BorderTopWidth"].SetValue(this, value);
+                    TypeDescriptor.GetProperties(this)["BorderBottomWidth"].SetValue(this, value);
+                }
+                else
+                {
+                    this.BorderLeftWidth = value;
+                    this.BorderRightWidth = value;
+                    this.BorderTopWidth = value;
+                    this.BorderBottomWidth = value;
+                }
+				this.OnStyleChanged();
+				this.OnSizePropertyChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the border type for top side of the element.
+		/// </summary>
+        [DevCoSerialize(), DefaultValue(eStyleBorderType.None), Browsable(true), Category("Border"), Description("Indicates the border type for top side of the element.")]
+		public eStyleBorderType BorderTop
+		{
+			get {return m_BorderTop;}
+			set
+			{
+				if(m_BorderTop!=value)
+				{
+					m_BorderTop=value;
+					this.OnStyleChanged();
+					this.OnSizePropertyChanged();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the border type for bottom side of the element.
+		/// </summary>
+        [DevCoSerialize(), DefaultValue(eStyleBorderType.None), Browsable(true), Category("Border"), Description("Indicates the border type for bottom side of the element.")]
+		public eStyleBorderType BorderBottom
+		{
+			get {return m_BorderBottom;}
+			set
+			{
+				if(m_BorderBottom!=value)
+				{
+					m_BorderBottom=value;
+					this.OnStyleChanged();
+					this.OnSizePropertyChanged();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the border type for left side of the element.
+		/// </summary>
+        [DevCoSerialize(), DefaultValue(eStyleBorderType.None), Browsable(true), Category("Border"), Description("Indicates the border type for left side of the element.")]
+		public eStyleBorderType BorderLeft
+		{
+			get {return m_BorderLeft;}
+			set
+			{
+				if(m_BorderLeft!=value)
+				{
+					m_BorderLeft=value;
+					this.OnStyleChanged();
+					this.OnSizePropertyChanged();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the border type for right side of the element.
+		/// </summary>
+        [DevCoSerialize(), DefaultValue(eStyleBorderType.None), Browsable(true), Category("Border"), Description("Indicates the border type for right side of the element.")]
+		public eStyleBorderType BorderRight
+		{
+			get {return m_BorderRight;}
+			set
+			{
+				if(m_BorderRight!=value)
+				{
+					m_BorderRight=value;
+					this.OnStyleChanged();
+					this.OnSizePropertyChanged();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets border width in pixels.
+		/// </summary>
+        [DevCoSerialize(), Browsable(true), DefaultValue(0), Category("Border"), Description("Indicates border width in pixels.")]
+		public int BorderTopWidth
+		{
+			get {return m_BorderTopWidth;}
+			set
+			{
+				if(m_BorderTopWidth!=value)
+				{
+					m_BorderTopWidth=value;
+					this.OnStyleChanged();
+					this.OnSizePropertyChanged();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets border width in pixels.
+		/// </summary>
+        [DevCoSerialize(), Browsable(true), DefaultValue(0), Category("Border"), Description("Indicates border width in pixels.")]
+		public int BorderBottomWidth
+		{
+			get {return m_BorderBottomWidth;}
+			set
+			{
+				if(m_BorderBottomWidth!=value)
+				{
+					m_BorderBottomWidth=value;
+					this.OnStyleChanged();
+					this.OnSizePropertyChanged();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets border width in pixels.
+		/// </summary>
+        [DevCoSerialize(), Browsable(true), DefaultValue(0), Category("Border"), Description("Indicates border width in pixels.")]
+		public int BorderLeftWidth
+		{
+			get {return m_BorderLeftWidth;}
+			set
+			{
+				if(m_BorderLeftWidth!=value)
+				{
+					m_BorderLeftWidth=value;
+					this.OnStyleChanged();
+					this.OnSizePropertyChanged();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets border width in pixels.
+		/// </summary>
+        [DevCoSerialize(), Browsable(true), DefaultValue(0), Category("Border"), Description("Indicates border width in pixels.")]
+		public int BorderRightWidth
+		{
+			get {return m_BorderRightWidth;}
+			set
+			{
+				if(m_BorderRightWidth!=value)
+				{
+					m_BorderRightWidth=value;
+					this.OnStyleChanged();
+					this.OnSizePropertyChanged();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the border color for all sides. Specifing the color for the side will override this value.
+		/// </summary>
+        [DevCoSerialize(), Browsable(true), Category("Border"), Editor(typeof(ColorTypeEditor), typeof(System.Drawing.Design.UITypeEditor)), Description("Indicates border color for all sides. Specifing the color for the side will override this value."), TypeConverter("DevComponents.DotNetBar.Design.ColorSchemeColorConverter, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+		public Color BorderColor
+		{
+			get {return GetColor(m_BorderColor,m_BorderColorSchemePart);}
+			set
+			{
+				if(value!=this.BorderColor && (m_BorderColorSchemePart!=eColorSchemePart.None && !value.IsEmpty || value.IsEmpty))
+					this.BorderColorSchemePart=eColorSchemePart.None;
+				m_BorderColor=value;
+				this.OnStyleChanged();
+			}
+		}
+		/// <summary>
+		/// Indicates whether BorderColor should be serialized. Used by windows forms designer design-time support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeBorderColor()
+		{return (!m_BorderColor.IsEmpty && m_BorderColorSchemePart==eColorSchemePart.None);}
+		/// <summary>
+		/// Resets BorderColor to it's default value. Used by windows forms designer design-time support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetBorderColor()
+		{
+			m_BorderColor=Color.Empty;
+		}
+
+		/// <summary>
+		/// Gets or sets the color scheme color that is used as border color. Setting
+		/// this property overrides the setting of the corresponding BorderColor property.
+		/// Color scheme colors are automatically managed and are based on current system colors.
+		/// That means if colors on the system change the color scheme will ensure that it's colors
+		/// are changed as well to fit in the color scheme of target system. Set this property to
+		/// <a href="AdvTree~DevComponents.Tree.eColorSchemePart.html">eColorSchemePart.None</a> to
+		/// specify explicit color to use through BorderColor property.
+		/// </summary>
+        [DevCoSerialize(), Browsable(false), DefaultValue(eColorSchemePart.None)]
+		public eColorSchemePart BorderColorSchemePart
+		{
+			get {return m_BorderColorSchemePart;}
+			set
+			{
+				m_BorderColorSchemePart=value;
+				this.OnStyleChanged();
+			}
+		}
+
+        /// <summary>
+        /// Gets or sets the target background gradient color for border on all sides. Specifing the color for the side will override this value. Gradient border colors
+        /// be employed only when per side border color is not specified.
+        /// </summary>
+        [DevCoSerialize(), Browsable(true), Category("Border"), Editor(typeof(ColorTypeEditor), typeof(System.Drawing.Design.UITypeEditor)), Description("Indicates target background gradient color for border on all sides. "), TypeConverter("DevComponents.DotNetBar.Design.ColorSchemeColorConverter, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+        public Color BorderColor2
+        {
+            get { return GetColor(m_BorderColor2, m_BorderColor2SchemePart); }
+            set
+            {
+                if (value != this.BorderColor2 && (m_BorderColor2SchemePart != eColorSchemePart.None && !value.IsEmpty || value.IsEmpty))
+                    this.BorderColor2SchemePart = eColorSchemePart.None;
+                m_BorderColor2 = value;
+                this.OnStyleChanged();
+            }
+        }
+        /// <summary>
+        /// Indicates whether BorderColor3 should be serialized. Used by windows forms designer design-time support.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeBorderColor2()
+        { return (!m_BorderColor2.IsEmpty && m_BorderColor2SchemePart == eColorSchemePart.None); }
+        /// <summary>
+        /// Resets BorderColor to it's default value. Used by windows forms designer design-time support.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetBorderColor2()
+        {
+            m_BorderColor2 = Color.Empty;
+        }
+
+        /// <summary>
+        /// Gets or sets the color scheme color that is used as taget gradient border color. Setting
+        /// this property overrides the setting of the corresponding BorderColor property.
+        /// Color scheme colors are automatically managed and are based on current system colors.
+        /// That means if colors on the system change the color scheme will ensure that it's colors
+        /// are changed as well to fit in the color scheme of target system. Set this property to
+        /// <a href="AdvTree~DevComponents.Tree.eColorSchemePart.html">eColorSchemePart.None</a> to
+        /// specify explicit color to use through BorderColor property.
+        /// </summary>
+        [DevCoSerialize(), Browsable(false), DefaultValue(eColorSchemePart.None)]
+        public eColorSchemePart BorderColor2SchemePart
+        {
+            get { return m_BorderColor2SchemePart; }
+            set
+            {
+                m_BorderColor2SchemePart = value;
+                this.OnStyleChanged();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the border gradient angle. Default value is 90.
+        /// </summary>
+        [DevCoSerialize(), Browsable(true), Category("Background"), DefaultValue(90), Description("Gets or sets the border gradient angle.")]
+        public int BorderGradientAngle
+        {
+            get
+            {
+                return m_BorderGradientAngle;
+            }
+            set
+            {
+                if (m_BorderGradientAngle != value)
+                {
+                    m_BorderGradientAngle = value;
+                    this.OnStyleChanged();
+
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the color for light border part when etched border is used.
+        /// </summary>
+        [DevCoSerialize(), Browsable(true), Category("Border"), Editor(typeof(ColorTypeEditor), typeof(System.Drawing.Design.UITypeEditor)), Description("Indicates color for light border part when etched border is used."), TypeConverter("DevComponents.DotNetBar.Design.ColorSchemeColorConverter, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+        public Color BorderColorLight
+        {
+            get { return GetColor(m_BorderColorLight, m_BorderColorLightSchemePart); }
+            set
+            {
+                if (value != this.BorderColorLight && (m_BorderColorLightSchemePart != eColorSchemePart.None && !value.IsEmpty || value.IsEmpty))
+                    this.BorderColorLightSchemePart = eColorSchemePart.None;
+                m_BorderColorLight = value;
+                this.OnStyleChanged();
+            }
+        }
+        /// <summary>
+        /// Indicates whether BorderColorLight should be serialized. Used by windows forms designer design-time support.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeBorderColorLight()
+        { return (!m_BorderColorLight.IsEmpty && m_BorderColorLightSchemePart == eColorSchemePart.None); }
+        /// <summary>
+        /// Resets BorderColor to it's default value. Used by windows forms designer design-time support.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetBorderColorLight()
+        {
+            m_BorderColorLight = Color.Empty;
+        }
+
+        /// <summary>
+        /// Gets or sets the color scheme color that is used as border light color for etched border style. Setting
+        /// this property overrides the setting of the corresponding BorderColor property.
+        /// Color scheme colors are automatically managed and are based on current system colors.
+        /// That means if colors on the system change the color scheme will ensure that it's colors
+        /// are changed as well to fit in the color scheme of target system. Set this property to
+        /// <a href="AdvTree~DevComponents.Tree.eColorSchemePart.html">eColorSchemePart.None</a> to
+        /// specify explicit color to use through BorderColor property.
+        /// </summary>
+        [DevCoSerialize(), Browsable(false), DefaultValue(eColorSchemePart.None)]
+        public eColorSchemePart BorderColorLightSchemePart
+        {
+            get { return m_BorderColorLightSchemePart; }
+            set
+            {
+                m_BorderColorLightSchemePart = value;
+                this.OnStyleChanged();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the target background gradient color for border on all sides. Specifing the color for the side will override this value. Gradient border colors
+        /// be employed only when per side border color is not specified.
+        /// </summary>
+        [DevCoSerialize(), Browsable(true), Category("Border"), Editor(typeof(ColorTypeEditor), typeof(System.Drawing.Design.UITypeEditor)), Description("Indicates target background gradient color for border on all sides. "), TypeConverter("DevComponents.DotNetBar.Design.ColorSchemeColorConverter, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+        public Color BorderColorLight2
+        {
+            get { return GetColor(m_BorderColorLight2, m_BorderColorLight2SchemePart); }
+            set
+            {
+                if (value != this.BorderColorLight2 && (m_BorderColorLight2SchemePart != eColorSchemePart.None && !value.IsEmpty || value.IsEmpty))
+                    this.BorderColorLight2SchemePart = eColorSchemePart.None;
+                m_BorderColorLight2 = value;
+                this.OnStyleChanged();
+            }
+        }
+        /// <summary>
+        /// Indicates whether BorderColor2 should be serialized. Used by windows forms designer design-time support.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeBorderColorLight2()
+        { return (!m_BorderColorLight2.IsEmpty && m_BorderColorLight2SchemePart == eColorSchemePart.None); }
+        /// <summary>
+        /// Resets BorderColorLight2 to it's default value. Used by windows forms designer design-time support.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetBorderColorLight2()
+        {
+            m_BorderColorLight2 = Color.Empty;
+        }
+
+        /// <summary>
+        /// Gets or sets the color scheme color that is used as taget gradient border light color for etched border style. Setting
+        /// this property overrides the setting of the corresponding BorderColor property.
+        /// Color scheme colors are automatically managed and are based on current system colors.
+        /// That means if colors on the system change the color scheme will ensure that it's colors
+        /// are changed as well to fit in the color scheme of target system. Set this property to
+        /// <a href="AdvTree~DevComponents.Tree.eColorSchemePart.html">eColorSchemePart.None</a> to
+        /// specify explicit color to use through BorderColor property.
+        /// </summary>
+        [DevCoSerialize(), Browsable(false), DefaultValue(eColorSchemePart.None)]
+        public eColorSchemePart BorderColorLight2SchemePart
+        {
+            get { return m_BorderColorLight2SchemePart; }
+            set
+            {
+                m_BorderColorLight2SchemePart = value;
+                this.OnStyleChanged();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the light border gradient angle. Default value is 90.
+        /// </summary>
+        [DevCoSerialize(), Browsable(true), Category("Background"), DefaultValue(90), Description("Gets or sets the border gradient angle.")]
+        public int BorderLightGradientAngle
+        {
+            get
+            {
+                return m_BorderLightGradientAngle;
+            }
+            set
+            {
+                if (m_BorderLightGradientAngle != value)
+                {
+                    m_BorderLightGradientAngle = value;
+                    this.OnStyleChanged();
+
+                }
+            }
+        }
+
+		/// <summary>
+		/// Gets or sets the background color for the left side border.
+		/// </summary>
+        [DevCoSerialize(), Browsable(true), Category("Border"), Editor(typeof(ColorTypeEditor), typeof(System.Drawing.Design.UITypeEditor)), Description("Indicates background color for the left side border."), TypeConverter("DevComponents.DotNetBar.Design.ColorSchemeColorConverter, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+		public Color BorderLeftColor
+		{
+			get {return GetColor(m_BorderLeftColor,m_BorderLeftColorSchemePart);}
+			set
+			{
+				if(value!=this.BorderLeftColor && (m_BorderLeftColorSchemePart!=eColorSchemePart.None && !value.IsEmpty || value.IsEmpty))
+					this.BorderLeftColorSchemePart=eColorSchemePart.None;
+				m_BorderLeftColor=value;
+				this.OnStyleChanged();
+			}
+		}
+		/// <summary>
+		/// Indicates whether property should be serialized. Used by windows forms designer design-time support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeBorderLeftColor()
+		{return (!m_BorderLeftColor.IsEmpty && m_BorderLeftColorSchemePart==eColorSchemePart.None);}
+		/// <summary>
+		/// Resets property to it's default value. Used by windows forms designer design-time support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetBorderLeftColor()
+		{
+			m_BorderLeftColor=Color.Empty;
+		}
+
+		/// <summary>
+		/// Gets or sets the color scheme color that is used as left border color. Setting
+		/// this property overrides the setting of the corresponding BorderLeftColor property.
+		/// Color scheme colors are automatically managed and are based on current system colors.
+		/// That means if colors on the system change the color scheme will ensure that it's colors
+		/// are changed as well to fit in the color scheme of target system. Set this property to
+		/// <a href="AdvTree~DevComponents.Tree.eColorSchemePart.html">eColorSchemePart.None</a> to
+		/// specify explicit color to use through BorderLeftColor property.
+		/// </summary>
+        [DevCoSerialize(), Browsable(false), DefaultValue(eColorSchemePart.None)]
+		public eColorSchemePart BorderLeftColorSchemePart
+		{
+			get {return m_BorderLeftColorSchemePart;}
+			set
+			{
+				m_BorderLeftColorSchemePart=value;
+				this.OnStyleChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the background color for the right side border.
+		/// </summary>
+        [DevCoSerialize(), Browsable(true), Category("Border"), Editor(typeof(ColorTypeEditor), typeof(System.Drawing.Design.UITypeEditor)), Description("Indicates background color for the right side border."), TypeConverter("DevComponents.DotNetBar.Design.ColorSchemeColorConverter, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+		public Color BorderRightColor
+		{
+			get {return GetColor(m_BorderRightColor,m_BorderRightColorSchemePart);}
+			set
+			{
+				if(value!=this.BorderRightColor && (m_BorderRightColorSchemePart!=eColorSchemePart.None && !value.IsEmpty || value.IsEmpty))
+					this.BorderRightColorSchemePart=eColorSchemePart.None;
+				m_BorderRightColor=value;
+				this.OnStyleChanged();
+			}
+		}
+		/// <summary>
+		/// Indicates whether property should be serialized. Used by windows forms designer design-time support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeBorderRightColor()
+		{return (!m_BorderRightColor.IsEmpty && m_BorderRightColorSchemePart==eColorSchemePart.None);}
+		/// <summary>
+		/// Resets property to it's default value. Used by windows forms designer design-time support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetBorderRightColor()
+		{
+			m_BorderRightColor=Color.Empty;
+		}
+
+		/// <summary>
+		/// Gets or sets the color scheme color that is used as right border color. Setting
+		/// this property overrides the setting of the corresponding BorderRightColor property.
+		/// Color scheme colors are automatically managed and are based on current system colors.
+		/// That means if colors on the system change the color scheme will ensure that it's colors
+		/// are changed as well to fit in the color scheme of target system. Set this property to
+		/// <a href="AdvTree~DevComponents.Tree.eColorSchemePart.html">eColorSchemePart.None</a> to
+		/// specify explicit color to use through BorderRightColor property.
+		/// </summary>
+        [DevCoSerialize(), Browsable(false), DefaultValue(eColorSchemePart.None)]
+		public eColorSchemePart BorderRightColorSchemePart
+		{
+			get {return m_BorderRightColorSchemePart;}
+			set
+			{
+				m_BorderRightColorSchemePart=value;
+				this.OnStyleChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the background color for the top side border.
+		/// </summary>
+        [DevCoSerialize(), Browsable(true), Category("Border"), Editor(typeof(ColorTypeEditor), typeof(System.Drawing.Design.UITypeEditor)), Description("Indicates background color for the top side border."), TypeConverter("DevComponents.DotNetBar.Design.ColorSchemeColorConverter, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+		public Color BorderTopColor
+		{
+			get {return GetColor(m_BorderTopColor,m_BorderTopColorSchemePart);}
+			set
+			{
+				if(value!=this.BorderTopColor && (m_BorderTopColorSchemePart!=eColorSchemePart.None && !value.IsEmpty || value.IsEmpty))
+					this.BorderTopColorSchemePart=eColorSchemePart.None;
+				m_BorderTopColor=value;
+				this.OnStyleChanged();
+			}
+		}
+		/// <summary>
+		/// Indicates whether property should be serialized. Used by windows forms designer design-time support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeBorderTopColor()
+		{return (!m_BorderTopColor.IsEmpty && m_BorderTopColorSchemePart==eColorSchemePart.None);}
+		/// <summary>
+		/// Resets property to it's default value. Used by windows forms designer design-time support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetBorderTopColor()
+		{
+			m_BorderTopColor=Color.Empty;
+		}
+
+		/// <summary>
+		/// Gets or sets the color scheme color that is used as top border color. Setting
+		/// this property overrides the setting of the corresponding BorderTopColor property.
+		/// Color scheme colors are automatically managed and are based on current system colors.
+		/// That means if colors on the system change the color scheme will ensure that it's colors
+		/// are changed as well to fit in the color scheme of target system. Set this property to
+		/// <a href="AdvTree~DevComponents.Tree.eColorSchemePart.html">eColorSchemePart.None</a> to
+		/// specify explicit color to use through BorderTopColor property.
+		/// </summary>
+        [DevCoSerialize(), Browsable(false), DefaultValue(eColorSchemePart.None)]
+		public eColorSchemePart BorderTopColorSchemePart
+		{
+			get {return m_BorderTopColorSchemePart;}
+			set
+			{
+				m_BorderTopColorSchemePart=value;
+				this.OnStyleChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the background color for the bottom side border.
+		/// </summary>
+        [DevCoSerialize(), Browsable(true), Category("Border"), Editor(typeof(ColorTypeEditor), typeof(System.Drawing.Design.UITypeEditor)), Description("Indicates background color for the bottom side border."), TypeConverter("DevComponents.DotNetBar.Design.ColorSchemeColorConverter, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+		public Color BorderBottomColor
+		{
+			get {return GetColor(m_BorderBottomColor,m_BorderBottomColorSchemePart);}
+			set
+			{
+				if(value!=this.BorderBottomColor && (m_BorderBottomColorSchemePart!=eColorSchemePart.None && !value.IsEmpty || value.IsEmpty))
+					this.BorderBottomColorSchemePart=eColorSchemePart.None;
+				m_BorderBottomColor=value;
+				this.OnStyleChanged();
+			}
+		}
+		/// <summary>
+		/// Indicates whether property should be serialized. Used by windows forms designer design-time support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeBorderBottomColor()
+		{return (!m_BorderBottomColor.IsEmpty && m_BorderBottomColorSchemePart==eColorSchemePart.None);}
+		/// <summary>
+		/// Resets property to it's default value. Used by windows forms designer design-time support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetBorderBottomColor()
+		{
+			m_BorderBottomColor=Color.Empty;
+		}
+
+		/// <summary>
+		/// Gets or sets the color scheme color that is used as bottom border color. Setting
+		/// this property overrides the setting of the corresponding BorderBottomColor property.
+		/// Color scheme colors are automatically managed and are based on current system colors.
+		/// That means if colors on the system change the color scheme will ensure that it's colors
+		/// are changed as well to fit in the color scheme of target system. Set this property to
+		/// <a href="AdvTree~DevComponents.Tree.eColorSchemePart.html">eColorSchemePart.None</a> to
+		/// specify explicit color to use through BorderBottomColor property.
+		/// </summary>
+        [DevCoSerialize(), Browsable(false), DefaultValue(eColorSchemePart.None)]
+		public eColorSchemePart BorderBottomColorSchemePart
+		{
+			get {return m_BorderBottomColorSchemePart;}
+			set
+			{
+				m_BorderBottomColorSchemePart=value;
+				this.OnStyleChanged();
+			}
+		}
+
+        /// <summary>
+        /// Gets the total horizontal padding (Left + Right)
+        /// </summary>
+        [Browsable(false)]
+        public int PaddingHorizontal
+        {
+            get { return m_PaddingLeft + m_PaddingRight; }
+        }
+
+        /// <summary>
+        /// Gets the total vertical padding (Top + Bottom)
+        /// </summary>
+        [Browsable(false)]
+        public int PaddingVertical
+        {
+            get { return m_PaddingTop + m_PaddingBottom; }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding space in pixels for all 4 sides of the box.
+        /// </summary>
+        [Browsable(true), DefaultValue(0), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), Category("PaddingTop"), Description("Indicates padding space in pixels for all 4 sides of the box.")]
+        public int Padding
+        {
+            get { return m_PaddingTop; }
+            set
+            {
+                if (this.DesignMode)
+                {
+                    TypeDescriptor.GetProperties(this)["PaddingLeft"].SetValue(this, value);
+                    TypeDescriptor.GetProperties(this)["PaddingRight"].SetValue(this, value);
+                    TypeDescriptor.GetProperties(this)["PaddingTop"].SetValue(this, value);
+                    TypeDescriptor.GetProperties(this)["PaddingBottom"].SetValue(this, value);
+                }
+                else
+                {
+                    this.PaddingLeft = value;
+                    this.PaddingRight = value;
+                    this.PaddingTop = value;
+                    this.PaddingBottom = value;
+                }
+                this.OnStyleChanged();
+                this.OnSizePropertyChanged();
+            }
+        }
+
+		/// <summary>
+		/// Gets or sets the amount of space to insert between the top border of the element and the content. 
+		/// </summary>
+        [DevCoSerialize(), Browsable(true), Category("Padding"), DefaultValue(0), Description("Indicates the amount of space to insert between the top border of the element and the content.")]
+		public int PaddingTop
+		{
+			get {return m_PaddingTop;}
+			set 
+			{
+				m_PaddingTop=value;
+				this.OnStyleChanged();
+				this.OnSizePropertyChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the amount of space to insert between the bottom border of the element and the content. 
+		/// </summary>
+        [DevCoSerialize(), Browsable(true), Category("Padding"), DefaultValue(0), Description("Indicates the amount of space to insert between the bottom border of the element and the content.")]
+		public int PaddingBottom
+		{
+			get {return m_PaddingBottom;}
+			set 
+			{
+				m_PaddingBottom=value;
+				this.OnStyleChanged();
+				this.OnSizePropertyChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the amount of space to insert between the left border of the element and the content. 
+		/// </summary>
+        [DevCoSerialize(), Browsable(true), Category("Padding"), DefaultValue(0), Description("Indicates the amount of space to insert between the left border of the element and the content.")]
+		public int PaddingLeft
+		{
+			get {return m_PaddingLeft;}
+			set 
+			{
+				m_PaddingLeft=value;
+				this.OnStyleChanged();
+				this.OnSizePropertyChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the amount of space to insert between the right border of the element and the content. 
+		/// </summary>
+        [DevCoSerialize(), Browsable(true), Category("Padding"), DefaultValue(0), Description("Indicates the amount of space to insert between the right border of the element and the content.")]
+		public int PaddingRight
+		{
+			get {return m_PaddingRight;}
+			set 
+			{
+				m_PaddingRight=value;
+				this.OnStyleChanged();
+				this.OnSizePropertyChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the name of the style.
+		/// </summary>
+        [DevCoSerialize(), Browsable(true), DefaultValue(""), Category("Design"), Description("Indicates name of the style.")]
+		public string Name
+		{
+			get
+			{
+				if(m_ComponentSite!=null)
+					m_Name=m_ComponentSite.Name;
+				return m_Name;
+			}
+			set
+			{
+				if(m_ComponentSite!=null)
+					m_ComponentSite.Name=value;
+				if(value==null)
+					m_Name="";
+				else
+					m_Name=value;
+			}
+		}
+
+        /// <summary>
+        /// Gets or sets the class style belongs to. The Class styles are used to apply predefined values to the styles that belong to the same class.
+        /// This feature is used to manage color schemes/tables per class style.
+        /// </summary>
+        [DevCoSerialize(), Browsable(true), Category("Design"), Description("Indicates the class style belongs to."), Localizable(false), DefaultValue("")]
+#if DOTNETBAR
+        [Editor("DevComponents.DotNetBar.Design.ElementStyleClassTypeEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor))]
+#endif
+        public string Class
+        {
+            get { return m_Class; }
+            set
+            {
+                if (value == null)
+                    throw new NullReferenceException("null is not valid value for this property");
+
+                if (m_Class != value)
+                {
+                    m_Class = value;
+                    OnStyleChanged();
+                }
+            }
+        }
+		
+		/// <summary>
+		/// Gets or sets the description of the style.
+		/// </summary>
+		[DevCoSerialize(), Browsable(true), DefaultValue(""), Category("Design"), Description("Indicates description of the style.")]
+		public string Description
+		{
+			get
+			{
+				return m_Description;
+			}
+			set
+			{
+				m_Description=value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the Site associated with this component. Used by Windows forms designer.
+		/// </summary>
+		[System.ComponentModel.Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public virtual System.ComponentModel.ISite Site
+		{
+			get
+			{
+				return m_ComponentSite;
+			}
+			set
+			{
+				m_ComponentSite = value;
+			}
+		}
+
+
+		/// <summary>
+		/// Gets or sets the maximum height of the element. This property should be used in
+		/// conjunction with the <see cref="WordWrap">WordWrap</see> property to limit the size of
+		/// text bounding box.
+		/// </summary>
+		/// <remarks>Default value is 0 which indicates that height of the style is unlimited.</remarks>
+        [DevCoSerialize(), Browsable(true), Category("Text Formatting"), DefaultValue(0), Description("Indicates the maximum height of the element. This property should be used in conjunction with the WordWrap property to limit the size of text bounding box.")]
+		public int MaximumHeight
+		{
+			get {return m_MaximumHeight;}
+			set
+			{
+				if(m_MaximumHeight!=value)
+				{
+					m_MaximumHeight=value;
+					this.OnStyleChanged();
+					this.OnSizePropertyChanged();
+				}
+			}
+        }
+
+#if AdvTree
+		/// <summary>
+		/// Gets or sets the maximum width of the element. This property should be used in
+		/// conjunction with the <see cref="WordWrap">WordWrap</see> property to limit the size of
+		/// text bounding box.
+		/// </summary>
+		/// <remarks>Default value is 0 which indicates that width of the style is not limited.</remarks>
+		[DevCoSerialize(), Browsable(true), Category("Text Formatting"), DefaultValue(0), Description("Indicates the maximum width of the element. This property should be used in conjunction with the WordWrap property to limit the size of text bounding box.")]
+		public int MaximumWidth
+		{
+			get {return m_MaximumWidth;}
+			set
+			{
+				if(m_MaximumWidth!=value)
+				{
+					m_MaximumWidth=value;
+					this.OnStyleChanged();
+					this.OnSizePropertyChanged();
+				}
+			}
+		}
+#endif
+
+        /// <summary>
+		/// Returns System.Drawing.StringFormat constructed from current style settings.
+		/// </summary>
+		internal System.Drawing.StringFormat StringFormat
+		{
+			get
+			{
+				System.Drawing.StringFormat format=new System.Drawing.StringFormat(System.Drawing.StringFormat.GenericDefault);
+				format.Alignment=(StringAlignment)m_TextAlignment;
+				format.LineAlignment=(StringAlignment)m_TextLineAlignment;
+				format.Trimming=(StringTrimming)m_TextTrimming;
+				if(m_WordWrap)
+					format.FormatFlags=format.FormatFlags & ~(format.FormatFlags & StringFormatFlags.NoWrap);
+				else
+					format.FormatFlags=format.FormatFlags | StringFormatFlags.NoWrap;
+				return format;
+			}
+		}
+
+        private eOrientation m_TextOrientation = eOrientation.Horizontal;
+        [DefaultValue(eOrientation.Horizontal)]
+        internal eOrientation TextOrientation
+        {
+            get { return m_TextOrientation; }
+            set
+            {
+                if (m_TextOrientation != value)
+                {
+                    m_TextOrientation = value;
+                    this.OnStyleChanged();
+                }
+            }
+        }
+
+        private bool _UseMnemonic = false;
+        /// <summary>
+        /// Gets or sets a value indicating whether the control interprets an ampersand character (&amp;) in the control's Text property to be an access key prefix character. Default value is false.
+        /// </summary>
+        [DefaultValue(false), Category("Appearance"), Description("Indicates whether the control interprets an ampersand character (&amp;) in the control's Text property to be an access key prefix character.")]
+        public bool UseMnemonic
+        {
+            get { return _UseMnemonic; }
+            set
+            {
+                _UseMnemonic = value;
+                this.OnStyleChanged();
+            }
+        }
+
+        private bool _HideMnemonic = false;
+        /// <summary>
+        /// Indicates whether control hides the underlines of the letter prefixed by ampersand character when UseMnemonic=true
+        /// </summary>
+        [DefaultValue(false),Category("Appearance"), Description("Indicates whether control hides the underline of the letter prefixed by ampersand character when UseMnemonic=true")]
+        public bool HideMnemonic
+        {
+            get { return _HideMnemonic; }
+            set
+            {
+                _HideMnemonic = value;
+            }
+        }
+        
+        
+
+        /// <summary>
+        /// Returns eTextFormat constructed from current style settings.
+        /// </summary>
+        internal eTextFormat TextFormat
+        {
+            get
+            {
+                eTextFormat format = eTextFormat.Default;
+                if (m_TextAlignment == eStyleTextAlignment.Center)
+                    format |= eTextFormat.HorizontalCenter;
+                else if (m_TextAlignment == eStyleTextAlignment.Far)
+                    format |= eTextFormat.Right;
+
+                if (m_TextLineAlignment == eStyleTextAlignment.Center)
+                    format |= eTextFormat.VerticalCenter;
+                else if (m_TextLineAlignment == eStyleTextAlignment.Far)
+                    format |= eTextFormat.Bottom;
+
+                if (m_WordWrap)
+                    format |= eTextFormat.WordBreak;
+                else
+                    format |= eTextFormat.SingleLine;
+
+                if (m_TextTrimming != eStyleTextTrimming.None)
+                    format |= eTextFormat.EndEllipsis;
+                if (_HideMnemonic)
+                    format |= eTextFormat.HidePrefix;
+                if(!_UseMnemonic && !_HideMnemonic)
+                    format |= eTextFormat.NoPrefix;
+
+                if (m_TextOrientation == eOrientation.Vertical)
+                    format |= eTextFormat.Vertical;
+
+                return format;
+            }
+        }
+
+		/// <summary>
+		/// Gets or sets the border corner type for all 4 sides. Default corner type is Square.
+		/// </summary>
+        [DevCoSerialize(), Browsable(true), Category("Border"), Description("Indicates border corner type.")]
+		public eCornerType CornerType
+		{
+			get {return m_CornerType;}
+			set
+			{
+				if(m_CornerType!=value)
+				{
+					m_CornerType=value;
+					if(m_CornerType==eCornerType.Inherit)
+						m_CornerType=eCornerType.Square;
+					this.OnStyleChanged();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the border corner type for top left corner. Default value is Inherit which means that setting from CornerType property is used.
+		/// </summary>
+        [DevCoSerialize(), DefaultValue(eCornerType.Inherit), Browsable(true), Category("Border"), Description("Indicates top left border corner type.")]
+		public eCornerType CornerTypeTopLeft
+		{
+			get {return m_CornerTypeTopLeft;}
+			set
+			{
+				if(m_CornerTypeTopLeft!=value)
+				{
+					m_CornerTypeTopLeft=value;
+					this.OnStyleChanged();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the border corner type for top right corner. Default value is Inherit which means that setting from CornerType property is used.
+		/// </summary>
+        [DevCoSerialize(), DefaultValue(eCornerType.Inherit), Browsable(true), Category("Border"), Description("Indicates top right border corner type.")]
+		public eCornerType CornerTypeTopRight
+		{
+			get {return m_CornerTypeTopRight;}
+			set
+			{
+				if(m_CornerTypeTopRight!=value)
+				{
+					m_CornerTypeTopRight=value;
+					this.OnStyleChanged();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the border corner type for bottom left corner. Default value is Inherit which means that setting from CornerType property is used.
+		/// </summary>
+        [DevCoSerialize(), DefaultValue(eCornerType.Inherit), Browsable(true), Category("Border"), Description("Indicates bottom left border corner type.")]
+		public eCornerType CornerTypeBottomLeft
+		{
+			get {return m_CornerTypeBottomLeft;}
+			set
+			{
+				if(m_CornerTypeBottomLeft!=value)
+				{
+					m_CornerTypeBottomLeft=value;
+					this.OnStyleChanged();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the border corner type for bottom right corner. Default value is Inherit which means that setting from CornerType property is used.
+		/// </summary>
+        [DevCoSerialize(), DefaultValue(eCornerType.Inherit), Browsable(true), Category("Border"), Description("Indicates bottom right border corner type.")]
+		public eCornerType CornerTypeBottomRight
+		{
+			get {return m_CornerTypeBottomRight;}
+			set
+			{
+				if(m_CornerTypeBottomRight!=value)
+				{
+					m_CornerTypeBottomRight=value;
+					this.OnStyleChanged();
+				}
+			}
+		}
+
+
+		/// <summary>
+		/// Gets or sets the diameter in pixels of the corner type rounded or diagonal.
+		/// </summary>
+        [DevCoSerialize(), Browsable(true), Category("Border"), DefaultValue(DEFAULT_CORNER_DIAMETER), Description("Indicates diameter in pixels of the corner type rounded or diagonal.")]
+		public int CornerDiameter
+		{
+			get {return m_CornerDiameter;}
+			set
+			{
+				if(m_CornerDiameter!=value)
+				{
+					m_CornerDiameter=value;
+					OnStyleChanged();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets whether to paint left border for the style.
+		/// </summary>
+		internal bool PaintLeftBorder
+		{
+			get
+			{
+				if(this.BorderLeft!=eStyleBorderType.None && this.BorderLeftWidth>0 &&
+                    (!this.BorderColor.IsEmpty || !this.BorderLeftColor.IsEmpty || BorderColorSchemePart != eColorSchemePart.None || BorderLeftColorSchemePart != eColorSchemePart.None))
+					return true;
+				return false;
+			}
+		}
+
+		/// <summary>
+		/// Gets whether to paint right border for the style.
+		/// </summary>
+		internal bool PaintRightBorder
+		{
+			get
+			{
+                if (this.BorderRight != eStyleBorderType.None && this.BorderRightWidth > 0 &&
+                    (!this.BorderColor.IsEmpty || !this.BorderRightColor.IsEmpty || BorderColorSchemePart != eColorSchemePart.None || BorderRightColorSchemePart != eColorSchemePart.None))
+                    return true;
+				return false;
+			}
+		}
+
+		/// <summary>
+		/// Gets whether to paint top border for the style.
+		/// </summary>
+		internal bool PaintTopBorder
+		{
+			get
+			{
+				if(this.BorderTop!=eStyleBorderType.None && this.BorderTopWidth>0 &&
+                    (!this.BorderColor.IsEmpty || !this.BorderTopColor.IsEmpty || BorderColorSchemePart != eColorSchemePart.None || BorderTopColorSchemePart != eColorSchemePart.None))
+					return true;
+				return false;
+			}
+		}
+
+		/// <summary>
+		/// Gets whether to paint bottom border for the style.
+		/// </summary>
+		internal bool PaintBottomBorder
+		{
+			get
+			{
+				if(this.BorderBottom!=eStyleBorderType.None && this.BorderBottomWidth>0 &&
+                    (!this.BorderColor.IsEmpty || !this.BorderBottomColor.IsEmpty || BorderColorSchemePart != eColorSchemePart.None || BorderBottomColorSchemePart != eColorSchemePart.None))
+					return true;
+				return false;
+			}
+		}
+
+		/// <summary>
+		/// Gets whether to paint any border for the style.
+		/// </summary>
+		internal bool PaintBorder
+		{
+			get
+			{
+				return PaintTopBorder | PaintBottomBorder | PaintLeftBorder | PaintRightBorder;
+			}
+		}
+
+        /// <summary>
+        /// Gets whether to paint any border for the style.
+        /// </summary>
+        internal bool PaintAllBorders
+        {
+            get
+            {
+                return PaintTopBorder && PaintBottomBorder && PaintLeftBorder && PaintRightBorder;
+            }
+        }
+		#endregion
+
+		#region Methods
+        internal bool _DisposeBackgroundImage = false;
+		/// <summary>
+		/// Releases all resources used in this control. After calling Dispose()
+		/// object is not in valid state and cannot be recovered to the valid state.
+		/// Recreation of the object is required.
+		/// </summary>
+		public virtual void Dispose()
+		{
+			if(Disposed != null)
+				Disposed(this,EventArgs.Empty);
+            if (BarUtilities.DisposeItemImages && !this.DesignMode || _DisposeBackgroundImage)
+            {
+                BarUtilities.DisposeImage(ref m_BackgroundImage);
+            }
+            m_BackColorBlend.Parent = null;
+		}
+
+        /// <summary>
+        /// Applies a "child/inherited" style text and box properties but not any background or border properties to this style. 
+        /// Use this method to create style hierarchies.
+        /// </summary>
+        /// <param name="style">Style to apply to this style</param>
+        /// <seealso cref="ApplyStyle"/>
+        public void ApplyFontStyle(ElementStyle style)
+        {
+            // TODO: Verify that ALL properties are applied!
+            if (style.Font != null)
+                this.Font = style.Font;
+            if (style.MarginBottom != 0)
+                this.MarginBottom = style.MarginBottom;
+            if (style.MarginLeft != 0)
+                this.MarginLeft = style.MarginLeft;
+            if (style.MarginRight != 0)
+                this.MarginRight = style.MarginRight;
+            if (style.MarginTop != 0)
+                this.MarginTop = style.MarginTop;
+            if (style.MaximumHeight != 0)
+                this.MaximumHeight = style.MaximumHeight;
+            if (style.MaximumWidth != 0)
+                this.MaximumWidth = style.MaximumWidth;
+            if (style.PaddingBottom != 0)
+                this.PaddingBottom = style.PaddingBottom;
+            if (style.PaddingLeft != 0)
+                this.PaddingLeft = style.PaddingLeft;
+            if (style.PaddingRight != 0)
+                this.PaddingRight = style.PaddingRight;
+            if (style.PaddingTop != 0)
+                this.PaddingTop = style.PaddingTop;
+            if (style.TextAlignment != this.TextAlignment)
+                this.TextAlignment = style.TextAlignment;
+            if (!style.TextColor.IsEmpty)
+                this.TextColor = style.TextColor;
+            else if (style.TextColorSchemePart != eColorSchemePart.None)
+                this.TextColorSchemePart = style.TextColorSchemePart;
+            if (style.TextLineAlignment != this.TextLineAlignment)
+                this.TextLineAlignment = style.TextLineAlignment;
+            if (style.TextTrimming == eStyleTextTrimming.EllipsisCharacter)
+                this.TextTrimming = style.TextTrimming;
+            if (style.WordWrap != false)
+                this.WordWrap = style.WordWrap;
+            if (!style.TextShadowColor.IsEmpty)
+                this.TextShadowColor = style.TextShadowColor;
+            if (!style.TextShadowOffset.IsEmpty)
+                this.TextShadowOffset = style.TextShadowOffset;
+        }
+
+		/// <summary>
+		/// Applies a "child/inherited" style to this style. Use this method to create style
+		/// hierarchies.
+		/// </summary>
+		/// <remarks>
+		/// This method is used to support style hierarchies where a base style is defined
+		/// and inherited/child styles are derived and based on it. By using this method on the
+		/// base style you can apply only style changes defined by the child style. For example if
+		/// you defined a base style for normal user interface element then in most cases you do
+		/// not want to redefine the styling for the case when same user interface element is
+		/// selected. You will just defined the behavior of the selected state and then apply it to
+		/// the base normal style using ApplyStyle method.
+		/// </remarks>
+		/// <param name="style">Style to apply to current style.</param>
+		public virtual void ApplyStyle(ElementStyle style)
+		{
+			// TODO: Verify that ALL properties are applied!
+            if (!style.BackColor.IsEmpty)
+                this.BackColor = style.BackColor;
+            else if (style.BackColorSchemePart != eColorSchemePart.None)
+                this.BackColorSchemePart = style.BackColorSchemePart;
+			if(!style.BackColor2.IsEmpty)
+				this.BackColor2=style.BackColor2;
+            else if (style.BackColor2SchemePart != eColorSchemePart.None)
+                this.BackColor2SchemePart = style.BackColor2SchemePart;
+			if(style.BackColorGradientAngle!=0)
+				this.BackColorGradientAngle=style.BackColorGradientAngle;
+            this.BackColorGradientType=style.BackColorGradientType;
+			if(style.BackgroundImage!=null)
+				this.BackgroundImage=style.BackgroundImage;
+			if(style.BackgroundImageAlpha!=255)
+				this.BackgroundImageAlpha=style.BackgroundImageAlpha;
+			if(style.BackgroundImagePosition!=eStyleBackgroundImage.Stretch)
+				this.BackgroundImagePosition=style.BackgroundImagePosition;
+			if(style.BorderBottom!=eStyleBorderType.None)
+				this.BorderBottom=style.BorderBottom;
+			if(!style.BorderBottomColor.IsEmpty)
+				this.BorderBottomColor=style.BorderBottomColor;
+            else if (style.BorderBottomColorSchemePart != eColorSchemePart.None)
+                this.BorderBottomColorSchemePart = style.BorderBottomColorSchemePart;
+			if(style.BorderBottomWidth!=0)
+				this.BorderBottomWidth=style.BorderBottomWidth;
+			
+            if(!style.BorderColor.IsEmpty)
+				this.BorderColor=style.BorderColor;
+            else if (style.BorderColorSchemePart != eColorSchemePart.None)
+                this.BorderColorSchemePart = style.BorderColorSchemePart;
+            if (!style.BorderColor2.IsEmpty || !style.BorderColor.IsEmpty)
+                this.BorderColor2 = style.BorderColor2;
+            else if (style.BorderColor2SchemePart != eColorSchemePart.None)
+                this.BorderColor2SchemePart = style.BorderColor2SchemePart;
+            if (style.BorderGradientAngle != 90)
+                this.BorderGradientAngle = style.BorderGradientAngle;
+
+            if (!style.BorderColorLight.IsEmpty)
+                this.BorderColorLight = style.BorderColorLight;
+            else if (style.BorderColorLightSchemePart != eColorSchemePart.None)
+                this.BorderColorLightSchemePart = style.BorderColorLightSchemePart;
+            if (!style.BorderColorLight2.IsEmpty || !style.BorderColorLight.IsEmpty)
+                this.BorderColorLight2 = style.BorderColorLight2;
+            else if (style.BorderColorLight2SchemePart != eColorSchemePart.None)
+                this.BorderColorLight2SchemePart = style.BorderColorLight2SchemePart;
+            if (style.BorderLightGradientAngle != 90)
+                this.BorderLightGradientAngle = style.BorderLightGradientAngle;
+
+			if(style.BorderLeft!=eStyleBorderType.None)
+				this.BorderLeft=style.BorderLeft;
+			if(!style.BorderLeftColor.IsEmpty)
+				this.BorderLeftColor=style.BorderLeftColor;
+            else if (style.BorderLeftColorSchemePart != eColorSchemePart.None)
+                this.BorderLeftColorSchemePart = style.BorderLeftColorSchemePart;
+			if(style.BorderLeftWidth!=0)
+				this.BorderLeftWidth=style.BorderLeftWidth;
+			if(style.BorderTop!=eStyleBorderType.None)
+				this.BorderTop=style.BorderTop;
+            else if (style.BorderTopColorSchemePart != eColorSchemePart.None)
+                this.BorderTopColorSchemePart = style.BorderTopColorSchemePart;
+			if(!style.BorderTopColor.IsEmpty)
+				this.BorderTopColor=style.BorderTopColor;
+			if(style.BorderTopWidth!=0)
+				this.BorderTopWidth=style.BorderTopWidth;
+			if(style.BorderRight!=eStyleBorderType.None)
+				this.BorderRight=style.BorderRight;
+            else if (style.BorderRightColorSchemePart != eColorSchemePart.None)
+                this.BorderRightColorSchemePart = style.BorderRightColorSchemePart;
+			if(!style.BorderRightColor.IsEmpty)
+				this.BorderRightColor=style.BorderRightColor;
+			if(style.BorderRightWidth!=0)
+				this.BorderRightWidth=style.BorderRightWidth;
+			if(style.CornerDiameter!=DEFAULT_CORNER_DIAMETER)
+				this.CornerDiameter=style.CornerDiameter;
+			if(style.CornerType!=eCornerType.Square)
+				this.CornerType=style.CornerType;
+			if(style.CornerTypeTopLeft!=eCornerType.Inherit)
+				this.CornerTypeTopLeft=style.CornerTypeTopLeft;
+			if(style.CornerTypeTopRight!=eCornerType.Inherit)
+				this.CornerTypeTopRight=style.CornerTypeTopRight;
+			if(style.CornerTypeBottomLeft!=eCornerType.Inherit)
+				this.CornerTypeBottomLeft=style.CornerTypeBottomLeft;
+			if(style.CornerTypeBottomRight!=eCornerType.Inherit)
+				this.CornerTypeBottomRight=style.CornerTypeBottomRight;
+			if(style.Font!=null)
+				this.Font=style.Font;
+			if(style.MarginBottom!=0)
+				this.MarginBottom=style.MarginBottom;
+			if(style.MarginLeft!=0)
+				this.MarginLeft=style.MarginLeft;
+			if(style.MarginRight!=0)
+				this.MarginRight=style.MarginRight;
+			if(style.MarginTop!=0)
+				this.MarginTop=style.MarginTop;
+            if (style.MaximumWidth != 0)
+                this.MaximumWidth = style.MaximumWidth;
+			if(style.MaximumHeight!=0)
+				this.MaximumHeight=style.MaximumHeight;
+            if(style.PaddingBottom!=0)
+				this.PaddingBottom=style.PaddingBottom;
+			if(style.PaddingLeft!=0)
+				this.PaddingLeft=style.PaddingLeft;
+			if(style.PaddingRight!=0)
+				this.PaddingRight=style.PaddingRight;
+			if(style.PaddingTop!=0)
+				this.PaddingTop=style.PaddingTop;
+			if(style.TextAlignment!=this.TextAlignment)
+				this.TextAlignment=style.TextAlignment;
+			if(!style.TextColor.IsEmpty)
+				this.TextColor=style.TextColor;
+            else if (style.TextColorSchemePart != eColorSchemePart.None)
+                this.TextColorSchemePart = style.TextColorSchemePart;
+//			if(style.TextFormat!="")
+//				this.TextFormat=style.TextFormat;
+            if (style.TextLineAlignment != this.TextLineAlignment)
+                this.TextLineAlignment=style.TextLineAlignment;
+			if(style.TextTrimming!=eStyleTextTrimming.EllipsisCharacter)
+				this.TextTrimming=style.TextTrimming;
+			if(style.WordWrap!=false)
+				this.WordWrap=style.WordWrap;
+            if (!style.TextShadowColor.IsEmpty)
+                this.TextShadowColor = style.TextShadowColor;
+            if (!style.TextShadowOffset.IsEmpty)
+                this.TextShadowOffset = style.TextShadowOffset;
+            if (style.UseMnemonic)
+                this.UseMnemonic = style.UseMnemonic;
+            if (style.HideMnemonic)
+                this.HideMnemonic = style.HideMnemonic;
+
+            if (style.BackColorBlend.Count > 0)
+            {
+                this.BackColorBlend.Clear();
+                foreach (BackgroundColorBlend b in style.BackColorBlend)
+                    this.BackColorBlend.Add(new BackgroundColorBlend(b.Color, b.Position));
+            }
+            else if (!style.BackColor.IsEmpty || !style.BackColor2.IsEmpty)
+                this.BackColorBlend.Clear();
+            if (style.GetColorScheme() != null)
+                this.SetColorScheme(style.GetColorScheme());
+		}
+
+        /// <summary>
+        /// Gets whether custom has any of properties changed.
+        /// </summary>
+        [Browsable(false),DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public virtual bool Custom
+        {
+            get
+            {
+                // TODO: Verify that ALL properties are applied!
+                if (!this.BackColor.IsEmpty)
+                    return true;
+                if (!this.BackColor2.IsEmpty)
+                    return true;
+                if (this.BackColorBlend.Count > 0)
+                    return true;
+                if (this.BackColorGradientAngle != 0)
+                    return true;
+                if (this.BackColorGradientType != eGradientType.Linear)
+                    return true;
+                if (this.BackgroundImage != null)
+                    return true;
+                if (this.BackgroundImageAlpha != 255)
+                    return true;
+                if (this.BackgroundImagePosition != eStyleBackgroundImage.Stretch)
+                    return true;
+                if (this.BorderBottom != eStyleBorderType.None)
+                    return true;
+                if (!this.BorderBottomColor.IsEmpty)
+                    return true;
+                if (this.BorderBottomWidth != 0)
+                    return true;
+                if (!this.BorderColor.IsEmpty)
+                    return true;
+                if (this.BorderLeft != eStyleBorderType.None)
+                    return true;
+                if (!this.BorderLeftColor.IsEmpty)
+                    return true;
+                if (this.BorderLeftWidth != 0)
+                    return true;
+                if (this.BorderTop != eStyleBorderType.None)
+                    return true;
+                if (!this.BorderTopColor.IsEmpty)
+                    return true;
+                if (this.BorderTopWidth != 0)
+                    return true;
+                if (this.BorderRight != eStyleBorderType.None)
+                    return true;
+                if (!this.BorderRightColor.IsEmpty)
+                    return true;
+                if (this.BorderRightWidth != 0)
+                    return true;
+                if (this.CornerDiameter != DEFAULT_CORNER_DIAMETER)
+                    return true;
+                if (this.CornerType != eCornerType.Square)
+                    return true;
+                if (this.CornerTypeTopLeft != eCornerType.Inherit)
+                    return true;
+                if (this.CornerTypeTopRight != eCornerType.Inherit)
+                    return true;
+                if (this.CornerTypeBottomLeft != eCornerType.Inherit)
+                    return true;
+                if (this.CornerTypeBottomRight != eCornerType.Inherit)
+                    return true;
+                if (this.Font != null)
+                    return true;
+                if (this.MarginBottom != 0)
+                    return true;
+                if (this.MarginLeft != 0)
+                    return true;
+                if (this.MarginRight != 0)
+                    return true;
+                if (this.MarginTop != 0)
+                    return true;
+                if (this.MaximumHeight != 0)
+                    return true;
+                if (this.PaddingBottom != 0)
+                    return true;
+                if (this.PaddingLeft != 0)
+                    return true;
+                if (this.PaddingRight != 0)
+                    return true;
+                if (this.PaddingTop != 0)
+                    return true;
+                if (this.TextAlignment != eStyleTextAlignment.Near)
+                    return true;
+                if (!this.TextColor.IsEmpty)
+                    return true;
+                if (this.TextLineAlignment != eStyleTextAlignment.Center)
+                    return true;
+                if (this.TextTrimming != eStyleTextTrimming.EllipsisCharacter)
+                    return true;
+                if (this.WordWrap != false)
+                    return true;
+                if (!this.TextShadowColor.IsEmpty)
+                    return true;
+                if (!this.TextShadowOffset.IsEmpty)
+                    return true;
+//#if AdvTree
+				if (this.MaximumWidth!=0)
+					return true;
+                if (!string.IsNullOrEmpty(this.Class)) return true;
+//#endif
+                return false;
+            }
+        }
+
+		/// <summary>
+		/// Makes an exact copy of the style.
+		/// </summary>
+		/// <returns>New copy of ElementStyle object.</returns>
+		public ElementStyle Copy()
+		{
+			ElementStyle style=new ElementStyle();
+			style.BackColor=this.BackColor;
+			style.BackColorSchemePart=this.BackColorSchemePart;
+			style.BackColor2=this.BackColor2;
+			style.BackColor2SchemePart=this.BackColor2SchemePart;
+			style.BackColorGradientAngle=this.BackColorGradientAngle;
+            style.BackColorGradientType = this.BackColorGradientType;
+            if (this.BackgroundImage != null)
+            {
+                style.BackgroundImage = (Image)this.BackgroundImage.Clone();
+                style._DisposeBackgroundImage = true;
+            }
+			style.BackgroundImageAlpha=this.BackgroundImageAlpha;
+			style.BackgroundImagePosition=this.BackgroundImagePosition;
+			style.BorderColor=this.BorderColor;
+			style.BorderColorSchemePart=this.BorderColorSchemePart;
+            style.BorderColor2 = this.BorderColor2;
+            style.BorderColor2SchemePart = this.BorderColor2SchemePart;
+            style.BorderGradientAngle = this.BorderGradientAngle;
+
+            style.BorderColorLight = this.BorderColorLight;
+            style.BorderColorLightSchemePart = this.BorderColorLightSchemePart;
+            style.BorderColorLight2 = this.BorderColorLight2;
+            style.BorderColorLight2SchemePart = this.BorderColorLight2SchemePart;
+            style.BorderLightGradientAngle = this.BorderLightGradientAngle;
+
+			style.BorderBottom=this.BorderBottom;
+			style.BorderBottomColor=this.BorderBottomColor;
+			style.BorderBottomColorSchemePart=this.BorderBottomColorSchemePart;
+			style.BorderBottomWidth=this.BorderBottomWidth;
+			style.BorderLeft=this.BorderLeft;
+			style.BorderLeftWidth=this.BorderLeftWidth;
+			style.BorderLeftColor=this.BorderLeftColor;
+			style.BorderLeftColorSchemePart=this.BorderLeftColorSchemePart;
+			style.BorderRight=this.BorderRight;
+			style.BorderRightWidth=this.BorderRightWidth;
+			style.BorderRightColor=this.BorderRightColor;
+			style.BorderRightColorSchemePart=this.BorderRightColorSchemePart;
+			style.BorderTop=this.BorderTop;
+			style.BorderTopWidth=this.BorderTopWidth;
+			style.BorderBottomColor=this.BorderBottomColor;
+			style.BorderBottomColorSchemePart=this.BorderBottomColorSchemePart;
+			style.CornerDiameter=this.CornerDiameter;
+			style.CornerType=this.CornerType;
+			style.CornerTypeTopLeft=this.CornerTypeTopLeft;
+			style.CornerTypeTopRight=this.CornerTypeTopRight;
+			style.CornerTypeBottomLeft=this.CornerTypeBottomLeft;
+			style.CornerTypeBottomRight=this.CornerTypeBottomRight;
+			style.Font=this.Font;
+			style.MarginBottom=this.MarginBottom;
+			style.MarginLeft=this.MarginLeft;
+			style.MarginRight=this.MarginRight;
+			style.MarginTop=this.MarginTop;
+			style.PaddingBottom=this.PaddingBottom;
+			style.PaddingLeft=this.PaddingLeft;
+			style.PaddingRight=this.PaddingRight;
+			style.PaddingTop=this.PaddingTop;
+			style.TextAlignment=this.TextAlignment;
+			style.TextColor=this.TextColor;
+			style.TextColorSchemePart=this.TextColorSchemePart;
+			style.TextLineAlignment=this.TextLineAlignment;
+			style.TextTrimming=this.TextTrimming;
+			style.WordWrap=this.WordWrap;
+			style.Description=this.Description;
+            style.TextShadowColor = this.TextShadowColor;
+            style.TextShadowColorSchemePart = this.TextShadowColorSchemePart;
+            style.TextShadowOffset = this.TextShadowOffset;
+            style.Class = m_Class;
+            style.UseMnemonic = _UseMnemonic;
+            style.HideMnemonic = _HideMnemonic;
+//#if AdvTree
+			style.MaximumWidth = this.MaximumWidth;
+            style.MaximumHeight = this.MaximumHeight;
+//#endif
+            foreach (BackgroundColorBlend b in m_BackColorBlend)
+                style.BackColorBlend.Add(new BackgroundColorBlend(b.Color, b.Position));
+
+			return style;
+		}
+
+        /// <summary>
+        /// Reset all style properties to default values.
+        /// </summary>
+        public void Reset()
+        {
+            m_BackColor=Color.Empty;
+		    m_BackColorSchemePart=eColorSchemePart.None;
+		    m_BackColor2=Color.Empty;
+		    m_BackColor2SchemePart=eColorSchemePart.None;
+		    m_BackColorGradientAngle=0;
+            m_BackColorGradientType = eGradientType.Linear;
+		    m_BackgroundImage=null;
+		    m_BackgroundImagePosition=eStyleBackgroundImage.Stretch;
+		    m_BackgroundImageAlpha=255;
+            m_BackColorBlend.Clear();
+
+		    // Font
+		    m_Font=null;
+
+		    // Text Formating
+		    m_WordWrap=false;
+		    m_TextAlignment=eStyleTextAlignment.Near;
+		    m_TextLineAlignment=eStyleTextAlignment.Center;
+		    m_TextTrimming=eStyleTextTrimming.EllipsisCharacter;
+		
+            m_TextColor=Color.Empty;
+		    m_TextColorSchemePart=eColorSchemePart.None;
+            m_TextShadowColor = Color.Empty;
+            m_TextShadowColorSchemePart = eColorSchemePart.None;
+            m_TextShadowOffset = Point.Empty;
+
+		    // Style margins
+		    m_MarginLeft=0;
+		    m_MarginRight=0;
+		    m_MarginTop=0;
+		    m_MarginBottom=0;
+
+		    // Style inside padding
+		    m_PaddingLeft=0;
+		    m_PaddingRight=0;
+		    m_PaddingTop=0;
+		    m_PaddingBottom=0;
+
+		    // Border
+		    m_BorderLeft=eStyleBorderType.None;
+		    m_BorderRight=eStyleBorderType.None;
+		    m_BorderTop=eStyleBorderType.None;
+		    m_BorderBottom=eStyleBorderType.None;
+
+		    m_BorderColor=Color.Empty;
+		    m_BorderColorSchemePart=eColorSchemePart.None;
+            m_BorderColor2 = Color.Empty;
+            m_BorderColor2SchemePart = eColorSchemePart.None;
+            m_BorderGradientAngle = 90;
+            m_BorderColorLight = Color.Empty;
+            m_BorderColorLightSchemePart = eColorSchemePart.None;
+            m_BorderColorLight2 = Color.Empty;
+            m_BorderColorLight2SchemePart = eColorSchemePart.None;
+            m_BorderLightGradientAngle = 90;
+
+		    m_BorderLeftColor=Color.Empty;
+		    m_BorderLeftColorSchemePart=eColorSchemePart.None;
+		    m_BorderRightColor=Color.Empty;
+		    m_BorderRightColorSchemePart=eColorSchemePart.None;
+		    m_BorderTopColor=Color.Empty;
+		    m_BorderTopColorSchemePart=eColorSchemePart.None;
+		    m_BorderBottomColor=Color.Empty;
+		    m_BorderBottomColorSchemePart=eColorSchemePart.None;
+
+		    m_BorderLeftWidth=0;
+		    m_BorderRightWidth=0;
+		    m_BorderTopWidth=0;
+		    m_BorderBottomWidth=0;
+
+		    m_CornerType=eCornerType.Square;
+		    m_CornerTypeTopLeft=eCornerType.Inherit;
+		    m_CornerTypeTopRight=eCornerType.Inherit;
+		    m_CornerTypeBottomLeft=eCornerType.Inherit;
+		    m_CornerTypeBottomRight=eCornerType.Inherit;
+		    m_CornerDiameter=DEFAULT_CORNER_DIAMETER;
+            m_Class = "";
+		    m_MaximumHeight=0;
+            m_MaximumWidth = 0;
+        }
+
+		/// <summary>Returns default style for the Cell object.</summary>
+		/// <param name="defaultNodeStyle">
+		/// Reference to the default style for the Node. Cell style is based on the given
+		/// node style.
+		/// </param>
+		public static ElementStyle GetDefaultCellStyle(ElementStyle defaultNodeStyle)
+		{
+			ElementStyle es=new ElementStyle();
+			if(defaultNodeStyle!=null)
+			{
+				es.TextColor=defaultNodeStyle.TextColor;
+				es.Font=defaultNodeStyle.Font;
+				es.TextAlignment=defaultNodeStyle.TextAlignment;
+//				es.TextFormat=defaultNodeStyle.TextFormat;
+				es.TextLineAlignment=defaultNodeStyle.TextLineAlignment;
+				es.TextTrimming=defaultNodeStyle.TextTrimming;
+				es.WordWrap=defaultNodeStyle.WordWrap;
+			}
+			if(es.TextColor.IsEmpty)
+				es.TextColor=SystemColors.ControlText;
+			return es;
+		}
+
+		/// <summary>Returns default style for disabled cells.</summary>
+		/// <returns>Returns new instance of ElementStyle object.</returns>
+		public static ElementStyle GetDefaultDisabledCellStyle()
+		{
+			ElementStyle es=new ElementStyle();
+			es.TextColor=SystemColors.GrayText;
+			return es;
+		}
+
+		/// <summary>Returns default style for the selected cell object.</summary>
+		/// <returns>New instance of the ElementStyle object.</returns>
+		public static ElementStyle GetDefaultSelectedCellStyle()
+		{
+			ElementStyle es=new ElementStyle();
+//			es.TextColor=SystemColors.HighlightText;
+//			es.BackgroundColor=SystemColors.Highlight;
+			return es;
+		}
+
+		/// <summary>
+		/// Sets Alpha value for all colors defined by style to specified value.
+		/// </summary>
+		/// <param name="style">Style to change.</param>		
+		/// <param name="alpha">Alpha value for the colors.</param>
+		public static void SetColorsAlpha(ElementStyle style, int alpha)
+		{
+			if(!style.TextColor.IsEmpty)
+				style.TextColor=Color.FromArgb(alpha,style.TextColor);
+			if(!style.BackColor.IsEmpty)
+				style.BackColor=Color.FromArgb(alpha,style.BackColor);
+			if(!style.BackColor2.IsEmpty)
+				style.BackColor2=Color.FromArgb(alpha,style.BackColor2);
+			if(!style.BorderColor.IsEmpty)
+				style.BorderColor=Color.FromArgb(alpha,style.BorderColor);
+			if(!style.BorderBottomColor.IsEmpty)
+				style.BorderBottomColor=Color.FromArgb(alpha,style.BorderBottomColor);
+			if(!style.BorderLeftColor.IsEmpty)
+				style.BorderLeftColor=Color.FromArgb(alpha,style.BorderLeftColor);
+			if(!style.BorderRightColor.IsEmpty)
+				style.BorderRightColor=Color.FromArgb(alpha,style.BorderRightColor);
+			if(!style.BorderRightColor.IsEmpty)
+				style.BorderRightColor=Color.FromArgb(alpha,style.BorderRightColor);
+			if(!style.BorderTopColor.IsEmpty)
+				style.BorderTopColor=Color.FromArgb(alpha,style.BorderTopColor);
+		}
+		
+
+		#endregion
+
+		#region Private Implementation
+        internal bool FreezeEvents
+        {
+            get { return m_FreezeEvents; }
+            set { m_FreezeEvents = value; }
+        }
+
+		private void OnStyleChanged()
+		{
+            if (m_FreezeEvents) return;
+			if(StyleChanged!=null)
+				StyleChanged(this,new EventArgs());
+		}
+		private void OnSizePropertyChanged()
+		{
+			m_SizeChanged=true;
+		}
+
+		/// <summary>
+		/// Gets or sets whether ElementStyle is in design mode.
+		/// </summary>
+		internal bool DesignMode
+		{
+			get {return m_DesignMode;}
+			set {m_DesignMode=value;}
+		}
+
+		private Color GetColor(Color color, eColorSchemePart p)
+		{
+			if(p==eColorSchemePart.None)
+				return color;
+			ColorScheme cs=this.GetColorScheme();
+			if(cs==null)
+				return color;
+            switch (p)
+            {
+                case eColorSchemePart.PanelBackground:
+                    return cs.PanelBackground;
+                case eColorSchemePart.PanelBackground2:
+                    return cs.PanelBackground2;
+                case eColorSchemePart.PanelBorder:
+                    return cs.PanelBorder;
+                case eColorSchemePart.PanelText:
+                    return cs.PanelText;
+                case eColorSchemePart.BarBackground:
+                    return cs.BarBackground;
+                case eColorSchemePart.BarBackground2:
+                    return cs.BarBackground2;
+                case eColorSchemePart.BarCaptionBackground:
+                    return cs.BarCaptionBackground;
+                    case eColorSchemePart.BarCaptionBackground2:
+                    return cs.BarCaptionBackground2;
+                case eColorSchemePart.BarCaptionInactiveBackground:
+                    return cs.BarCaptionInactiveBackground;
+                case eColorSchemePart.BarCaptionInactiveBackground2:
+                    return cs.BarCaptionInactiveBackground2;
+                case eColorSchemePart.BarCaptionInactiveText:
+                    return cs.BarCaptionInactiveText;
+                case eColorSchemePart.BarCaptionText:
+                    return cs.BarCaptionText;
+                case eColorSchemePart.BarDockedBorder:
+                    return cs.BarDockedBorder;
+                case eColorSchemePart.BarFloatingBorder:
+                    return cs.BarFloatingBorder;
+                case eColorSchemePart.BarPopupBackground:
+                    return cs.BarPopupBackground;
+                case eColorSchemePart.BarPopupBorder:
+                    return cs.BarPopupBorder;
+                case eColorSchemePart.BarStripeColor:
+                    return cs.BarStripeColor;
+                case eColorSchemePart.CustomizeBackground:
+                    return cs.CustomizeBackground;
+                case eColorSchemePart.CustomizeBackground2:
+                    return cs.CustomizeBackground2;
+                case eColorSchemePart.CustomizeText:
+                    return cs.CustomizeText;
+                case eColorSchemePart.DockSiteBackColor:
+                    return cs.DockSiteBackColor;
+                case eColorSchemePart.DockSiteBackColor2:
+                    return cs.DockSiteBackColor2;
+                case eColorSchemePart.ExplorerBarBackground:
+                    return cs.ExplorerBarBackground;
+                case eColorSchemePart.ExplorerBarBackground2:
+                    return cs.ExplorerBarBackground2;
+                case eColorSchemePart.ItemBackground:
+                    return cs.ItemBackground;
+                case eColorSchemePart.ItemBackground2:
+                    return cs.ItemBackground2;
+                case eColorSchemePart.ItemCheckedBackground:
+                    return cs.ItemCheckedBackground;
+                case eColorSchemePart.ItemCheckedBackground2:
+                    return cs.ItemCheckedBackground2;
+                case eColorSchemePart.ItemCheckedBorder:
+                    return cs.ItemCheckedBorder;
+                case eColorSchemePart.ItemCheckedText:
+                    return cs.ItemCheckedText;
+                case eColorSchemePart.ItemDesignTimeBorder:
+                    return cs.ItemDesignTimeBorder;
+                case eColorSchemePart.ItemDisabledBackground:
+                    return cs.ItemDisabledBackground;
+                case eColorSchemePart.ItemDisabledText:
+                    return cs.ItemDisabledText;
+                case eColorSchemePart.ItemExpandedBackground:
+                    return cs.ItemExpandedBackground;
+                case eColorSchemePart.ItemExpandedBackground2:
+                    return cs.ItemExpandedBackground2;
+                case eColorSchemePart.ItemExpandedBorder:
+                    return cs.ItemExpandedBorder;
+                case eColorSchemePart.ItemExpandedShadow:
+                    return cs.ItemExpandedShadow;
+                case eColorSchemePart.ItemExpandedText:
+                    return cs.ItemExpandedText;
+                case eColorSchemePart.ItemHotBackground:
+                    return cs.ItemHotBackground;
+                case eColorSchemePart.ItemHotBackground2:
+                    return cs.ItemHotBackground2;
+                case eColorSchemePart.ItemHotBorder:
+                    return cs.ItemHotBorder;
+                case eColorSchemePart.ItemHotText:
+                    return cs.ItemHotText;
+                case eColorSchemePart.ItemPressedBackground:
+                    return cs.ItemPressedBackground;
+                case eColorSchemePart.ItemPressedBackground2:
+                    return cs.ItemPressedBackground2;
+                case eColorSchemePart.ItemPressedBorder:
+                    return cs.ItemPressedBorder;
+                case eColorSchemePart.ItemPressedText:
+                    return cs.ItemPressedText;
+                case eColorSchemePart.ItemSeparator:
+                    return cs.ItemSeparator;
+                case eColorSchemePart.ItemSeparatorShade:
+                    return cs.ItemSeparatorShade;
+                case eColorSchemePart.ItemText:
+                    return cs.ItemText;
+                case eColorSchemePart.MenuBackground:
+                    return cs.MenuBackground;
+                case eColorSchemePart.MenuBackground2:
+                    return cs.MenuBackground2;
+                case eColorSchemePart.MenuBarBackground:
+                    return cs.MenuBarBackground;
+                case eColorSchemePart.MenuBarBackground2:
+                    return cs.MenuBarBackground2;
+                case eColorSchemePart.MenuBorder:
+                    return cs.MenuBorder;
+                case eColorSchemePart.MenuSide:
+                    return cs.MenuSide;
+                case eColorSchemePart.MenuSide2:
+                    return cs.MenuSide2;
+                case eColorSchemePart.MenuUnusedBackground:
+                    return cs.MenuUnusedBackground;
+                case eColorSchemePart.MenuUnusedSide:
+                    return cs.MenuUnusedSide;
+                case eColorSchemePart.MenuUnusedSide2:
+                    return cs.MenuUnusedSide2;
+            }
+			return (Color)cs.GetType().GetProperty(p.ToString()).GetValue(cs,null);
+		}
+		
+		public override string ToString()
+		{
+			string s=this.Name;
+			if(this.Description!="")
+				s+=" "+this.Description;
+			return s;
+		}
+
+
+		#if !NOTREE
+        private int m_MaximumWidth=0;
+		/// <summary>
+		/// Gets or sets the maximum width of the element. This property should be used in
+		/// conjunction with the <see cref="WordWrap">WordWrap</see> property to limit the size of
+		/// text bounding box.
+		/// </summary>
+		/// <remarks>Default value is 0 which indicates that width of the style is not limited.</remarks>
+		[DevCoSerialize(), Browsable(true), Category("Text Formatting"), DefaultValue(0), Description("Indicates the maximum width of the element. This property should be used in conjunction with the WordWrap property to limit the size of text bounding box.")]
+		public int MaximumWidth
+		{
+			get {return m_MaximumWidth;}
+			set
+			{
+				if(m_MaximumWidth!=value)
+				{
+					m_MaximumWidth=value;
+					this.OnStyleChanged();
+					this.OnSizePropertyChanged();
+				}
+			}
+		}
+        /// <summary>
+		/// Returns reference to ColorScheme object used by this style.
+		/// </summary>
+		/// <returns>Instance of ColorScheme object or null if object could not be obtained.</returns>
+		internal ColorScheme GetColorScheme()
+		{
+			if(m_Parent!=null && m_Parent.TreeControl!=null)
+				return m_Parent.TreeControl.ColorScheme;
+			else if(m_TreeControl!=null)
+				return m_TreeControl.ColorScheme;
+			return m_ColorScheme;
+		}
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void SetColorScheme(ColorScheme cs)
+        {
+            m_ColorScheme = cs;
+        }
+
+        private DevComponents.AdvTree.ElementStyleCollection m_Parent = null;
+		/// <summary>
+		/// Gets or sets the reference to the parent collection.
+		/// </summary>
+        internal DevComponents.AdvTree.ElementStyleCollection Parent
+		{
+			get {return m_Parent;}
+			set {m_Parent=value;}
+		}
+
+		private DevComponents.AdvTree.AdvTree m_TreeControl;
+		/// <summary>
+		/// Gets or sets the tree control style is assigned to.
+		/// </summary>
+        internal DevComponents.AdvTree.AdvTree TreeControl
+		{
+			get {return m_TreeControl;}
+			set {m_TreeControl=value;}
+		}
+
+		#else
+		/// <summary>
+		/// Returns reference to ColorScheme object used by this style.
+		/// </summary>
+		/// <returns>Instance of ColorScheme object or null if object could not be obtained.</returns>
+        [EditorBrowsable(EditorBrowsableState.Never), Browsable(false)]
+		public ColorScheme GetColorScheme()
+		{
+			return m_ColorScheme;
+		}
+		internal void SetColorScheme(ColorScheme cs)
+		{
+			m_ColorScheme=cs;
+		}
+		#endif
+
+		#endregion
+    }
+
+    #region eGradientType
+    /// <summary>
+    /// Specifies the type of the gradient fill.
+    /// </summary>
+    public enum eGradientType
+    {
+        /// <summary>
+        /// Represents linear gradient fill.
+        /// </summary>
+        Linear,
+        /// <summary>
+        /// Represents radial gradient fill.
+        /// </summary>
+        Radial
+    }
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/ElementStyle/BackgroundColorBlend.cs b/PROMS/DotNetBar Source Code/ElementStyle/BackgroundColorBlend.cs
new file mode 100644
index 00000000..95aed158
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/ElementStyle/BackgroundColorBlend.cs	
@@ -0,0 +1,87 @@
+using System;
+using System.Text;
+using System.Drawing;
+using System.ComponentModel;
+
+#if AdvTree
+namespace DevComponents.Tree
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar
+#endif
+{
+    /// <summary>
+    /// Defines single color blend point for the multicolor gradient fills.
+    /// </summary>
+    [ToolboxItem(false),DesignTimeVisible(false),TypeConverter(typeof(BackgroundColorBlendConverter))]
+    public class BackgroundColorBlend
+    {
+        #region Private Variables
+        private Color m_Color = Color.Empty;
+        private float m_Position = 0;
+        #endregion
+
+        #region Internal Implementation
+        /// <summary>
+        /// Creates new instance of the class. When defining multicolor gradinet blends and using the percentage positions the positions created
+        /// must start with 0f and end with 1f.
+        /// </summary>
+        public BackgroundColorBlend() {}
+
+        /// <summary>
+        /// Creates new instance of the class and initialize it with default values.
+        /// </summary>
+        public BackgroundColorBlend(Color color, float position)
+        {
+            m_Color=color;
+            m_Position=position;
+        }
+
+        /// <summary>
+        /// Creates new instance of the class and initialize it with default values.
+        /// </summary>
+        public BackgroundColorBlend(int color, float position)
+        {
+            m_Color = ColorScheme.GetColor(color);
+            m_Position = position;
+        }
+
+        /// <summary>
+        /// Gets or sets Color to use in multicolor gradient blend at specified position.
+        /// </summary>
+        [Browsable(true), Description("Indicates the Color to use in multicolor gradient blend at specified position.")]
+        public Color Color
+        {
+            get { return m_Color; }
+            set
+            {
+                m_Color = value;
+                OnColorBlendChanged();
+            }
+        }
+        private bool ShouldSerializeColor()
+        {
+            return !m_Color.IsEmpty;
+        }
+
+        /// <summary>
+        /// Gets or sets the color position in multicolor gradient blend. Values less or equal to 1 are used as percentage specifing percentages of distance along the gradient line.
+        /// Values greater than 1 are used as absolute pixel values of distance along the gradient line.
+        /// </summary>
+        [Browsable(true), DefaultValue(0f), Description("")]
+        public float Position
+        {
+            get { return m_Position; }
+            set
+            {
+                m_Position = value;
+                OnColorBlendChanged();
+            }
+        }
+
+        private void OnColorBlendChanged()
+        {
+        }
+        #endregion
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/ElementStyle/BackgroundColorBlendCollection.cs b/PROMS/DotNetBar Source Code/ElementStyle/BackgroundColorBlendCollection.cs
new file mode 100644
index 00000000..3fb1aba3
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/ElementStyle/BackgroundColorBlendCollection.cs	
@@ -0,0 +1,258 @@
+using System;
+using System.Collections;
+using System.Text;
+using System.Drawing.Drawing2D;
+using System.Drawing;
+
+#if AdvTree
+namespace DevComponents.Tree
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar
+#endif
+{
+    /// <summary>
+    /// Represents Collection for the BackgroundColorBlend objects.
+    /// </summary>
+    public class BackgroundColorBlendCollection : CollectionBase
+    {
+        #region Private Variables
+        private ElementStyle m_Parent = null; 
+        #endregion
+
+        #region Internal Implementation
+        /// <summary>Creates new instance of the class.</summary>
+        public BackgroundColorBlendCollection() {}
+
+        internal ElementStyle Parent
+        {
+            get { return m_Parent; }
+            set { m_Parent = value; }
+        }
+
+        /// <summary>
+		/// Adds new object to the collection.
+		/// </summary>
+        /// <param name="item">Object to add.</param>
+		/// <returns>Index of newly added object.</returns>
+		public int Add(BackgroundColorBlend item)
+		{
+			return List.Add(item);
+		}
+
+        /// <summary>
+        /// Adds array of new objects to the collection.
+        /// </summary>
+        /// <param name="items">Array of object to add.</param>
+        public void AddRange(BackgroundColorBlend[] items)
+        {
+            foreach (BackgroundColorBlend item in items)
+                this.Add(item);
+        }
+
+		/// <summary>
+		/// Returns reference to the object in collection based on it's index.
+		/// </summary>
+		public BackgroundColorBlend this[int index]
+		{
+			get {return (BackgroundColorBlend)(List[index]);}
+			set {List[index] = value;}
+		}
+
+		/// <summary>
+		/// Inserts new object into the collection.
+		/// </summary>
+		/// <param name="index">Position of the object.</param>
+		/// <param name="value">Object to insert.</param>
+		public void Insert(int index, BackgroundColorBlend value) 
+		{
+			List.Insert(index, value);
+		}
+
+		/// <summary>
+		/// Returns index of the object inside of the collection.
+		/// </summary>
+		/// <param name="value">Reference to the object.</param>
+		/// <returns>Index of the object.</returns>
+		public int IndexOf(BackgroundColorBlend value) 
+		{
+			return List.IndexOf(value);
+		}
+
+		/// <summary>
+		/// Returns whether collection contains specified object.
+		/// </summary>
+		/// <param name="value">Object to look for.</param>
+		/// <returns>true if object is part of the collection, otherwise false.</returns>
+		public bool Contains(BackgroundColorBlend value) 
+		{
+			return List.Contains(value);
+		}
+
+		/// <summary>
+		/// Removes specified object from the collection.
+		/// </summary>
+		/// <param name="value"></param>
+		public void Remove(BackgroundColorBlend value) 
+		{
+			List.Remove(value);
+		}
+
+        //protected override void OnRemoveComplete(int index,object value)
+        //{
+        //    base.OnRemoveComplete(index,value);
+        //    BackgroundColorBlend me=value as BackgroundColorBlend;
+        //}
+        //protected override void OnInsertComplete(int index,object value)
+        //{
+        //    base.OnInsertComplete(index,value);
+        //    BackgroundColorBlend me=value as BackgroundColorBlend;
+        //}
+
+		/// <summary>
+		/// Copies collection into the specified array.
+		/// </summary>
+		/// <param name="array">Array to copy collection to.</param>
+		/// <param name="index">Starting index.</param>
+		public void CopyTo(BackgroundColorBlend[] array, int index) 
+		{
+			List.CopyTo(array, index);
+		}
+
+		/// <summary>
+		/// Copies contained items to the BackgroundColorBlend array.
+		/// </summary>
+		/// <param name="array">Array to copy to.</param>
+		internal void CopyTo(BackgroundColorBlend[] array)
+		{
+			List.CopyTo(array,0);
+		}
+
+        /// <summary>
+        /// Creates ColorBlend object based on the members of the collection. ColorBlend object will be valid only if all members of the collection
+        /// represents relative/percentage based color blends.
+        /// </summary>
+        /// <returns></returns>
+        public ColorBlend GetColorBlend()
+        {
+            ColorBlend blend = new ColorBlend();
+            Color[] colors = new Color[this.Count];
+            float[] positions = new float[this.Count];
+
+            for(int i=0; i<this.Count; i++)
+            {
+                BackgroundColorBlend b = this[i];
+                colors[i] = b.Color;
+                positions[i] = b.Position;
+            }
+
+            blend.Colors = colors;
+            blend.Positions = positions;
+            
+            return blend;
+        }
+
+        /// <summary>
+        /// Adds the BackgroundColorBlend objects from the collection.
+        /// </summary>
+        /// <param name="col">Collection to copy objects from</param>
+        public void CopyFrom(BackgroundColorBlendCollection col)
+        {
+            foreach (BackgroundColorBlend b in col)
+                this.Add(b);
+        }
+
+        internal eBackgroundColorBlendType GetBlendType()
+        {
+            BackgroundColorBlendCollection c = this;
+            if (c.Count == 1)
+                return eBackgroundColorBlendType.SolidColor;
+            if (c.Count <= 1)
+                return eBackgroundColorBlendType.Invalid;
+
+            eBackgroundColorBlendType t = eBackgroundColorBlendType.Invalid;
+
+            foreach (BackgroundColorBlend b in c)
+            {
+                if (b.Position == 0 || b.Position == 1f)
+                    continue;
+                if (b.Position <= 1f)
+                {
+                    if (t == eBackgroundColorBlendType.Invalid)
+                        t = eBackgroundColorBlendType.Relative;
+                    else if (t == eBackgroundColorBlendType.Absolute)
+                    {
+                        t = eBackgroundColorBlendType.Invalid;
+                        break;
+                    }
+                }
+                else
+                {
+                    if (t == eBackgroundColorBlendType.Invalid)
+                        t = eBackgroundColorBlendType.Absolute;
+                    else if (t == eBackgroundColorBlendType.Relative)
+                    {
+                        t = eBackgroundColorBlendType.Invalid;
+                        break;
+                    }
+                }
+            }
+
+            if (c.Count == 2 && c[0].Position == 0f && c[1].Position == 1f)
+                return eBackgroundColorBlendType.Relative;
+
+            if (t == eBackgroundColorBlendType.Invalid)
+                return t;
+
+            if (t == eBackgroundColorBlendType.Relative && c[0].Position != 0f && c[c.Count - 1].Position != 1f)
+                return eBackgroundColorBlendType.Invalid;
+            else if (t == eBackgroundColorBlendType.Absolute && ((c.Count / 2) * 2 != c.Count))
+                return eBackgroundColorBlendType.Invalid;
+
+            return t;
+        }
+
+        /// <summary>
+        /// Initializes the collection with the two color blend.
+        /// </summary>
+        /// <param name="collection">Collection to initialize.</param>
+        /// <param name="backColor1">Start color.</param>
+        /// <param name="backColor2">End color.</param>
+        public static void InitializeCollection(BackgroundColorBlendCollection collection, int backColor1, int backColor2)
+        {
+            InitializeCollection(collection, ColorScheme.GetColor(backColor1), ColorScheme.GetColor(backColor2));
+        }
+
+        /// <summary>
+        /// Initializes the collection with the two color blend.
+        /// </summary>
+        /// <param name="collection">Collection to initialize.</param>
+        /// <param name="backColor1">Start color.</param>
+        /// <param name="backColor2">End color.</param>
+        public static void InitializeCollection(BackgroundColorBlendCollection collection, Color backColor1, Color backColor2)
+        {
+            collection.Clear();
+            collection.Add(new BackgroundColorBlend(backColor1, 0f));
+            collection.Add(new BackgroundColorBlend(backColor2, 1f));
+        }
+
+        /// <summary>
+        /// Initializes the collection with the two color blend.
+        /// </summary>
+        /// <param name="collection">Collection to initialize.</param>
+        /// <param name="backColor1">Solid Color</param>
+        public static void InitializeCollection(BackgroundColorBlendCollection collection, Color backColor)
+        {
+            collection.Clear();
+            collection.Add(new BackgroundColorBlend(backColor, 0f));
+        }
+		#endregion
+    }
+
+    internal enum eBackgroundColorBlendType
+    {
+        Invalid,
+        Relative,
+        Absolute,
+        SolidColor
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/ElementStyle/BackgroundColorBlendConverter.cs b/PROMS/DotNetBar Source Code/ElementStyle/BackgroundColorBlendConverter.cs
new file mode 100644
index 00000000..d347822a
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/ElementStyle/BackgroundColorBlendConverter.cs	
@@ -0,0 +1,53 @@
+using System;
+using System.ComponentModel;
+using System.ComponentModel.Design.Serialization;
+using System.Globalization;
+using System.Reflection;
+using System.Drawing;
+
+#if AdvTree
+namespace DevComponents.Tree
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar
+#endif
+{
+    /// <summary>
+    /// Represents BackgroundColorBlend object converter.
+    /// </summary>
+    public class BackgroundColorBlendConverter : TypeConverter
+    {
+        public BackgroundColorBlendConverter() { }
+
+		public override bool CanConvertTo(ITypeDescriptorContext context, Type destinationType)
+		{
+			if(destinationType==typeof(InstanceDescriptor))
+				return true;
+			return base.CanConvertTo(context, destinationType);
+		}
+
+		public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+		{
+			if(destinationType==null)
+				throw new ArgumentNullException("destinationType");
+
+			if((destinationType==typeof(InstanceDescriptor)) && (value is BackgroundColorBlend))
+			{
+                BackgroundColorBlend doc = (BackgroundColorBlend)value;
+                Type[] constructorParams = null;
+                MemberInfo constructorMemberInfo = null;
+                object[] constructorValues = null;
+
+                constructorParams = new Type[2] { typeof(Color), typeof(float) };
+                constructorMemberInfo = typeof(BackgroundColorBlend).GetConstructor(constructorParams);
+                constructorValues = new object[2] { doc.Color, doc.Position };
+
+                if (constructorMemberInfo != null)
+                {
+                    return new InstanceDescriptor(constructorMemberInfo, constructorValues);
+                }
+			}
+
+			return base.ConvertTo(context, culture, value, destinationType);
+		}
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/ElementStyle/IElementStyleClassProvider.cs b/PROMS/DotNetBar Source Code/ElementStyle/IElementStyleClassProvider.cs
new file mode 100644
index 00000000..992f7a67
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/ElementStyle/IElementStyleClassProvider.cs	
@@ -0,0 +1,23 @@
+using System;
+using System.Text;
+
+#if AdvTree
+namespace DevComponents.Tree
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar
+#endif
+
+{
+    /// <summary>
+    /// Defines the provider for the element style classes support.
+    /// </summary>
+    public interface IElementStyleClassProvider
+    {
+        /// <summary>
+        /// Returns the instance of the ElementStyle with given class name or null if there is no class with that name defined.
+        /// </summary>
+        /// <param name="className">Class name. See static members of ElementStyleClassKeys class for the list of available keys.</param>
+        /// <returns>Instance of ElementStyle for given class name or null if class cannot be found.</returns>
+        ElementStyle GetClass(string className);
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/ElementStyleDisplay.cs b/PROMS/DotNetBar Source Code/ElementStyleDisplay.cs
new file mode 100644
index 00000000..4a6d307d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/ElementStyleDisplay.cs	
@@ -0,0 +1,1544 @@
+using System;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Drawing.Imaging;
+
+#if AdvTree
+namespace DevComponents.Tree
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar
+#endif
+{
+    /// <summary>
+    /// Paints the ElementStyle
+    /// </summary>
+    public class ElementStyleDisplay
+    {
+        /// <summary>Creates new instance of the object.</summary>
+        public ElementStyleDisplay()
+        {
+        }
+
+        /// <summary>
+        /// Paints text for given style.
+        /// </summary>
+        /// <param name="e">Display information.</param>
+        /// <param name="text">Text to paint.</param>
+        /// <param name="defaultFont">Default font if no font by style is specified.</param>
+        public static void PaintText(ElementStyleDisplayInfo e, string text, Font defaultFont)
+        {
+            PaintText(e, text, defaultFont, false);
+        }
+
+        /// <summary>
+        /// Paints text for given style.
+        /// </summary>
+        /// <param name="e">Display information.</param>
+        /// <param name="text"><Text to paint./param>
+        /// <param name="defaultFont">Default font if no font by style is specified.</param>
+        /// <param name="useDefaultFont">Specifies whether to use default font for painting regardless of style settings.</param>
+        public static void PaintText(ElementStyleDisplayInfo e, string text, Font defaultFont, bool useDefaultFont)
+        {
+            PaintText(e, text, defaultFont, useDefaultFont, e.Style.TextFormat);
+        }
+
+        /// <summary>
+        /// Paints text for given style.
+        /// </summary>
+        /// <param name="e">Display information.</param>
+        /// <param name="text"><Text to paint./param>
+        /// <param name="defaultFont">Default font if no font by style is specified.</param>
+        /// <param name="useDefaultFont">Specifies whether to use default font for painting regardless of style settings.</param>
+        public static void PaintText(ElementStyleDisplayInfo e, string text, Font defaultFont, bool useDefaultFont, eTextFormat textFormat)
+        {
+            Rectangle textBounds = e.Bounds;
+            bool disposeStyle = false;
+            ElementStyle style = GetElementStyle(e.Style, out disposeStyle);
+
+            if (text == "" || textBounds.IsEmpty)
+            {
+                if (disposeStyle) style.Dispose();
+                return;
+            }
+
+            Font font = style.Font;
+            if (font == null || useDefaultFont)
+                font = defaultFont;
+
+            textBounds.X += style.MarginLeft + style.PaddingLeft;
+            textBounds.Width -= (style.MarginLeft + style.MarginRight + style.PaddingLeft + style.PaddingRight);
+            textBounds.Y += style.MarginTop + style.PaddingTop;
+            textBounds.Height -= (style.MarginTop + style.MarginBottom + style.PaddingTop + style.PaddingBottom);
+
+            if (!style.TextShadowColor.IsEmpty && Math.Abs(style.TextShadowColor.GetBrightness() - style.TextColor.GetBrightness()) > .2)
+            {
+                using (SolidBrush brush = new SolidBrush(style.TextShadowColor))
+                {
+                    Rectangle r = textBounds;
+                    r.Offset(style.TextShadowOffset);
+                    TextDrawing.DrawString(e.Graphics, text, font, style.TextShadowColor, r, textFormat);
+                    //e.Graphics.DrawString(text,font,brush,r,style.StringFormat);
+                }
+            }
+            Color textColor = style.TextColor;
+            if (textColor.IsEmpty && style.TextShadowColor.IsEmpty)
+                textColor = SystemColors.ControlText;
+            if (!textColor.IsEmpty)
+                TextDrawing.DrawString(e.Graphics, text, font, textColor, textBounds, textFormat);
+
+            if (disposeStyle) style.Dispose();
+        }
+
+        /// <summary>Returns new Region object for given ElementStyle.</summary>
+        /// <returns>New instance of Region object.</returns>
+        /// <param name="e">Information to describe ElementStyle.</param>
+        public static Region GetStyleRegion(ElementStyleDisplayInfo e)
+        {
+            Rectangle rectPath = e.Bounds;
+            if (e.Style.PaintBorder && e.Style.CornerType != eCornerType.Square)
+            {
+                rectPath.Width--;
+                rectPath.Height--;
+            }
+
+            Region r = new Region();
+            using (GraphicsPath path = ElementStyleDisplay.GetBackgroundPath(e.Style, rectPath))
+            {
+                r.MakeEmpty();
+                r.Union(path);
+                // Widen path for the border...
+                if (e.Style.PaintBorder && (e.Style.CornerType == eCornerType.Rounded || e.Style.CornerType == eCornerType.Diagonal ||
+                    e.Style.CornerTypeTopLeft == eCornerType.Rounded || e.Style.CornerTypeTopLeft == eCornerType.Diagonal ||
+                    e.Style.CornerTypeTopRight == eCornerType.Rounded || e.Style.CornerTypeTopRight == eCornerType.Diagonal ||
+                    e.Style.CornerTypeBottomLeft == eCornerType.Rounded || e.Style.CornerTypeBottomLeft == eCornerType.Diagonal ||
+                    e.Style.CornerTypeBottomRight == eCornerType.Rounded || e.Style.CornerTypeBottomRight == eCornerType.Diagonal))
+                {
+                    using (Pen pen = new Pen(Color.Black, (e.Style.BorderTopWidth > 0 ? e.Style.BorderTopWidth : 1)))
+                    {
+                        path.Widen(pen);
+                    }
+                    //Region r2 = new Region(path);
+                    r.Union(path);
+                }
+            }
+
+            return r;
+            //GraphicsPath path=ElementStyleDisplay.GetBackgroundPath(e.Style,e.Bounds,false);
+            //return new Region(path);
+        }
+
+        /// <summary>
+        /// Returns the clipping for the content of the element style.
+        /// </summary>
+        /// <param name="e"></param>
+        /// <returns></returns>
+        public static GraphicsPath GetInsideClip(ElementStyleDisplayInfo e)
+        {
+            Rectangle rectPath = e.Bounds;
+            // GDI bug
+            if (e.Style.PaintBorder)
+            {
+                if (e.Style.PaintTopBorder)
+                {
+                    rectPath.Y += e.Style.BorderTopWidth;
+                    rectPath.Height -= e.Style.BorderTopWidth;
+
+                    if (e.Style.BorderTop == eStyleBorderType.Etched || e.Style.BorderTop == eStyleBorderType.Double)
+                    {
+                        rectPath.Y += e.Style.BorderTopWidth;
+                        rectPath.Height -= e.Style.BorderTopWidth;
+                    }
+                }
+
+                if (e.Style.PaintBottomBorder)
+                {
+                    rectPath.Height -= e.Style.BorderBottomWidth;
+                    if (e.Style.BorderBottom == eStyleBorderType.Etched || e.Style.BorderBottom == eStyleBorderType.Double)
+                        rectPath.Height -= e.Style.BorderBottomWidth;
+                }
+
+                if (e.Style.PaintLeftBorder)
+                {
+                    rectPath.X += e.Style.BorderLeftWidth;
+                    rectPath.Width -= e.Style.BorderLeftWidth;
+                    if (e.Style.BorderLeft == eStyleBorderType.Etched || e.Style.BorderLeft == eStyleBorderType.Double)
+                    {
+                        rectPath.X += e.Style.BorderLeftWidth;
+                        rectPath.Width -= e.Style.BorderLeftWidth;
+                    }
+                }
+
+                if (e.Style.PaintRightBorder)
+                {
+                    rectPath.Width -= e.Style.BorderRightWidth;
+                    if (e.Style.BorderRight == eStyleBorderType.Etched || e.Style.BorderRight == eStyleBorderType.Double)
+                        rectPath.Width -= e.Style.BorderRightWidth;
+                }
+            }
+
+            GraphicsPath path = ElementStyleDisplay.GetBackgroundPath(e.Style, rectPath);
+
+            return path;
+        }
+
+        /// <summary>
+        /// Paints the element style on the canvas.
+        /// </summary>
+        /// <param name="e">Holds information necessary to paint style on canvas.</param>
+        public static void Paint(ElementStyleDisplayInfo e)
+        {
+            ElementStyleDisplay.PaintBackground(e);
+            ElementStyleDisplay.PaintBackgroundImage(e);
+            ElementStyleDisplay.PaintBorder(e);
+        }
+
+        private static eCornerType GetCornerType(eCornerType baseType, eCornerType specificType)
+        {
+            if (specificType != eCornerType.Inherit)
+                return specificType;
+            return baseType;
+        }
+
+        /// <summary>
+        /// Paint style border.
+        /// </summary>
+        /// <param name="e">Style display information.</param>
+        public static void PaintBorder(ElementStyleDisplayInfo e)
+        {
+            bool disposeStyle = false;
+            ElementStyle style = GetElementStyle(e.Style, out disposeStyle);
+            Rectangle backBounds = GetBackgroundRectangle(style, e.Bounds);
+            Rectangle bounds = ElementStyleDisplay.GetBorderRectangle(style, backBounds);
+            try
+            {
+                if (bounds.Width < 2 || bounds.Height < 2)
+                {
+                    return;
+                }
+
+                eCornerType cornerTopLeft = GetCornerType(style.CornerType, style.CornerTypeTopLeft);
+                eCornerType cornerTopRight = GetCornerType(style.CornerType, style.CornerTypeTopRight);
+                eCornerType cornerBottomLeft = GetCornerType(style.CornerType, style.CornerTypeBottomLeft);
+                eCornerType cornerBottomRight = GetCornerType(style.CornerType, style.CornerTypeBottomRight);
+
+                if (style.PaintBorder && style.Border == eStyleBorderType.Solid && cornerTopLeft == eCornerType.Rounded &&
+                    cornerTopRight == eCornerType.Rounded &&
+                    cornerBottomLeft == eCornerType.Rounded && cornerBottomRight == eCornerType.Rounded &&
+                    style.BorderLeftWidth == style.BorderWidth && style.BorderRightWidth == style.BorderWidth
+                    && style.BorderTopWidth == style.BorderWidth && style.BorderBottomWidth == style.BorderWidth)
+                {
+                    if (style.BorderWidth == 1)
+                    {
+                        bounds.Width++;
+                        bounds.Height++;
+                    }
+                    DisplayHelp.DrawRoundGradientRectangle(e.Graphics, bounds, style.BorderColor, style.BorderColor2,
+                                                           style.BorderGradientAngle, style.BorderWidth,
+                                                           style.CornerDiameter);
+                    return;
+                }
+                else if (style.PaintAllBorders && style.Border == eStyleBorderType.Solid &&
+                         cornerTopLeft == eCornerType.Square && cornerTopRight == eCornerType.Square &&
+                         cornerBottomLeft == eCornerType.Square && cornerBottomRight == eCornerType.Square &&
+                         style.BorderLeftWidth == style.BorderWidth && style.BorderRightWidth == style.BorderWidth
+                         && style.BorderTopWidth == style.BorderWidth && style.BorderBottomWidth == style.BorderWidth)
+                {
+                    if (style.BorderWidth == 1)
+                    {
+                        bounds.Width++;
+                        bounds.Height++;
+                    }
+                    DisplayHelp.DrawGradientRectangle(e.Graphics, bounds, style.BorderColor, style.BorderColor2,
+                                                      style.BorderGradientAngle, style.BorderWidth);
+                    return;
+                }
+                else if (style.Border == eStyleBorderType.None && style.BorderRight == eStyleBorderType.Etched &&
+                         style.BorderLeft == eStyleBorderType.None &&
+                         style.BorderTop == eStyleBorderType.None && style.BorderBottom == eStyleBorderType.None)
+                {
+                    DisplayHelp.DrawGradientRectangle(e.Graphics,
+                                                      new Rectangle(bounds.Right - 2, bounds.Y, 3,
+                                                                    bounds.Height + 1),
+                                                      style.BorderColorLight,
+                                                      style.BorderColorLight2,
+                                                      90,
+                                                      1);
+                    DisplayHelp.DrawGradientLine(e.Graphics,
+                                                 new Point(bounds.Right, bounds.Y),
+                                                 new Point(bounds.Right, bounds.Bottom + 1),
+                                                 style.BorderColor,
+                                                 style.BorderColor2,
+                                                 90,
+                                                 1);
+                    return;
+                }
+
+                if (!style.BorderColor2.IsEmpty || !style.BorderColorLight.IsEmpty)
+                {
+                    if (style.Border == eStyleBorderType.Solid)
+                    {
+                        using (
+                            GraphicsPath path = DisplayHelp.GetRoundedRectanglePath(bounds, style.CornerDiameter,
+                                                                                    eStyleBackgroundPathPart.Complete,
+                                                                                    cornerTopLeft, cornerTopRight,
+                                                                                    cornerBottomLeft, cornerBottomRight)
+                            )
+                        {
+                            DisplayHelp.DrawGradientPathBorder(e.Graphics, path, style.BorderColor, style.BorderColor2,
+                                                               style.BorderGradientAngle, style.BorderWidth);
+                        }
+                        return;
+                    }
+                    else if (style.Border == eStyleBorderType.Etched)
+                    {
+                        Rectangle r = bounds;
+
+                        r.Width -= style.BorderWidth;
+                        r.Height -= style.BorderWidth;
+                        r.Offset(style.BorderWidth, style.BorderWidth);
+                        if (r.Width > 2 && r.Height > 2)
+                        {
+                            using (
+                                GraphicsPath path = DisplayHelp.GetRoundedRectanglePath(r, style.CornerDiameter,
+                                                                                        eStyleBackgroundPathPart.
+                                                                                            Complete,
+                                                                                        cornerTopLeft, cornerTopRight,
+                                                                                        cornerBottomLeft,
+                                                                                        cornerBottomRight)
+                                )
+                            {
+                                DisplayHelp.DrawGradientPathBorder(e.Graphics, path, style.BorderColorLight,
+                                                                   style.BorderColorLight2,
+                                                                   style.BorderLightGradientAngle,
+                                                                   style.BorderWidth);
+                            }
+                            r.Offset(-style.BorderWidth, -style.BorderWidth);
+                            using (
+                                GraphicsPath path = DisplayHelp.GetRoundedRectanglePath(r, style.CornerDiameter,
+                                                                                        eStyleBackgroundPathPart.
+                                                                                            Complete,
+                                                                                        cornerTopLeft, cornerTopRight,
+                                                                                        cornerBottomLeft,
+                                                                                        cornerBottomRight)
+                                )
+                            {
+                                DisplayHelp.DrawGradientPathBorder(e.Graphics, path, style.BorderColor,
+                                                                   style.BorderColor2,
+                                                                   style.BorderGradientAngle, style.BorderWidth);
+                            }
+                        }
+                        return;
+                    }
+                    else if ((style.BorderTop == eStyleBorderType.Double && style.BorderLeft == eStyleBorderType.Double &&
+                              style.BorderRight == eStyleBorderType.Double &&
+                              style.BorderBottom == eStyleBorderType.Double) ||
+                             (style.BorderTop == eStyleBorderType.None && style.BorderLeft == eStyleBorderType.Double &&
+                              style.BorderRight == eStyleBorderType.Double &&
+                              style.BorderBottom == eStyleBorderType.Double))
+                    {
+                        Rectangle r = bounds;
+                        Region oldClip = null;
+                        bool clipSet = false;
+                        if (style.BorderTop == eStyleBorderType.None)
+                        {
+                            Rectangle clipRect = r;
+                            clipRect.Width++;
+                            clipRect.Height++;
+                            e.Graphics.SetClip(clipRect);
+                            r.Y -= 3;
+                            r.Height += 3;
+                        }
+                        using (
+                            GraphicsPath path = DisplayHelp.GetBorderPath(r, style.CornerDiameter,
+                                                                          eStyleBackgroundPathPart.Complete,
+                                                                          cornerTopLeft, cornerTopRight,
+                                                                          cornerBottomLeft,
+                                                                          cornerBottomRight, style.PaintLeftBorder,
+                                                                          style.PaintRightBorder,
+                                                                          style.PaintTopBorder,
+                                                                          style.PaintBottomBorder))
+                        {
+                            using (Pen pen = new Pen(style.BorderColor, style.BorderWidth))
+                                path.Widen(pen);
+                            DisplayHelp.FillPath(e.Graphics, path, style.BorderColor, style.BorderColor2);
+                        }
+                        r.Inflate(-style.BorderWidth, -style.BorderWidth);
+                        using (
+                            GraphicsPath path = DisplayHelp.GetBorderPath(r, style.CornerDiameter,
+                                                                          eStyleBackgroundPathPart.Complete,
+                                                                          cornerTopLeft, cornerTopRight,
+                                                                          cornerBottomLeft,
+                                                                          cornerBottomRight, style.PaintLeftBorder,
+                                                                          style.PaintRightBorder,
+                                                                          style.PaintTopBorder,
+                                                                          style.PaintBottomBorder))
+                        {
+                            using (Pen pen = new Pen(style.BorderColor, style.BorderWidth))
+                                path.Widen(pen);
+                            DisplayHelp.FillPath(e.Graphics, path, style.BorderColorLight, style.BorderColorLight2);
+                        }
+
+                        if (clipSet)
+                            e.Graphics.Clip = oldClip;
+
+                        return;
+                    }
+                }
+
+
+                Color colorStart = style.BorderColor;
+                Color colorEnd = style.BorderColor2;
+                Color colorLightStart = style.BorderColorLight;
+                Color colorLightEnd = style.BorderColorLight2;
+                BorderDrawInfo borderDrawInfo = new BorderDrawInfo(style.PaintLeftBorder, style.PaintRightBorder,
+                                                                   style.PaintTopBorder, style.PaintBottomBorder,
+                                                                   e.IsTwistedDoubleBorder);
+
+                if (style.PaintLeftBorder)
+                {
+                    Color color = style.BorderColor;
+                    if (!style.BorderLeftColor.IsEmpty)
+                        color = style.BorderLeftColor;
+                    Point[] p = new Point[2];
+
+                    // Corner type square is default setting
+                    p[0] = bounds.Location;
+                    p[1].X = bounds.X;
+                    p[1].Y = bounds.Bottom;
+
+                    if (cornerTopLeft != eCornerType.Square)
+                    {
+                        p[0].Y += style.CornerDiameter;
+                    }
+                    if (cornerBottomLeft != eCornerType.Square)
+                    {
+                        p[1].Y -= style.CornerDiameter;
+                    }
+
+                    ElementStyleDisplay.DrawBorderLine(e.Graphics, p, style.BorderLeft, style.BorderLeftWidth, color,
+                                                       colorEnd, colorLightStart, colorLightEnd, eBorderSide.Left,
+                                                       borderDrawInfo);
+
+                    if (style.PaintTopBorder && cornerTopLeft != eCornerType.Square)
+                    {
+                        if (cornerTopLeft == eCornerType.Diagonal)
+                        {
+                            p[0].X = bounds.X;
+                            p[0].Y = bounds.Y + style.CornerDiameter;
+                            p[1].X = bounds.X + style.CornerDiameter;
+                            p[1].Y = bounds.Y;
+                            ElementStyleDisplay.DrawBorderLine(e.Graphics, p, style.BorderLeft, style.BorderLeftWidth, color,
+                                                               colorEnd, colorLightStart, colorLightEnd, eBorderSide.TopLeft,
+                                                               borderDrawInfo);
+                        }
+                        else if (cornerTopLeft == eCornerType.Rounded)
+                        {
+                            ArcData a = GetCornerArc(bounds, style.CornerDiameter, eCornerArc.TopLeft);
+                            // new ArcData(bounds.X,bounds.Y,style.CornerDiameter*2,style.CornerDiameter*2,180,90);
+                            ElementStyleDisplay.DrawCornerArc(e.Graphics, a, style.BorderLeft, style.BorderLeftWidth, color);
+                        }
+                    }
+
+                    if (style.PaintBottomBorder && cornerBottomLeft != eCornerType.Square)
+                    {
+                        if (cornerBottomLeft == eCornerType.Diagonal)
+                        {
+                            p[0].X = bounds.X;
+                            p[0].Y = bounds.Bottom - style.CornerDiameter;
+                            p[1].X = bounds.X + style.CornerDiameter;
+                            p[1].Y = bounds.Bottom;
+                            ElementStyleDisplay.DrawBorderLine(e.Graphics, p, style.BorderLeft, style.BorderLeftWidth, color,
+                                                               colorEnd, colorLightStart, colorLightEnd,
+                                                               eBorderSide.BottomLeft, borderDrawInfo);
+                        }
+                        else if (cornerBottomLeft == eCornerType.Rounded)
+                        {
+                            ArcData a = GetCornerArc(bounds, style.CornerDiameter, eCornerArc.BottomLeft);
+                            // new ArcData(bounds.X,bounds.Y,style.CornerDiameter*2,style.CornerDiameter*2,180,90);
+                            ElementStyleDisplay.DrawCornerArc(e.Graphics, a, style.BorderLeft, style.BorderLeftWidth, color);
+                        }
+                    }
+                }
+
+                if (style.PaintTopBorder)
+                {
+                    Color color = style.BorderColor;
+                    if (!style.BorderTopColor.IsEmpty)
+                        color = style.BorderTopColor;
+                    Point[] p = new Point[2];
+                    // Default setting for Square corner type on both sides
+                    p[0] = bounds.Location;
+                    p[1].X = bounds.Right;
+                    p[1].Y = bounds.Y;
+
+                    if (cornerTopLeft != eCornerType.Square)
+                    {
+                        p[0].X += style.CornerDiameter;
+                    }
+                    if (cornerTopRight != eCornerType.Square)
+                    {
+                        p[1].X -= style.CornerDiameter;
+                    }
+                    ElementStyleDisplay.DrawBorderLine(e.Graphics, p, style.BorderTop, style.BorderTopWidth, color, colorEnd,
+                                                       colorLightStart, colorLightEnd, eBorderSide.Top, borderDrawInfo);
+                }
+
+                if (style.PaintBottomBorder)
+                {
+                    Color color = style.BorderColor;
+                    if (!style.BorderBottomColor.IsEmpty)
+                        color = style.BorderBottomColor;
+                    Point[] p = new Point[2];
+                    // Default for Square corner type on both sides
+                    p[0].X = bounds.X;
+                    p[0].Y = bounds.Bottom;
+                    p[1].X = bounds.Right;
+                    p[1].Y = bounds.Bottom;
+
+                    if (cornerBottomLeft != eCornerType.Square)
+                    {
+                        p[0].X += style.CornerDiameter;
+                    }
+                    if (cornerBottomRight != eCornerType.Square)
+                    {
+                        p[1].X -= style.CornerDiameter;
+                    }
+
+                    ElementStyleDisplay.DrawBorderLine(e.Graphics, p, style.BorderBottom, style.BorderBottomWidth, color,
+                                                       colorEnd, colorLightStart, colorLightEnd, eBorderSide.Bottom,
+                                                       borderDrawInfo);
+                }
+
+                if (style.PaintRightBorder)
+                {
+                    Color color = style.BorderColor;
+                    if (!style.BorderRightColor.IsEmpty)
+                        color = style.BorderRightColor;
+                    Point[] p = new Point[2];
+                    // Default for Square corner type on both sides
+                    p[0].X = bounds.Right;
+                    p[0].Y = bounds.Y;
+                    p[1].X = bounds.Right;
+                    p[1].Y = bounds.Bottom;
+
+                    if (cornerTopRight != eCornerType.Square)
+                    {
+                        p[0].Y += style.CornerDiameter;
+                    }
+                    if (cornerBottomRight != eCornerType.Square)
+                    {
+                        p[1].Y -= style.CornerDiameter;
+                    }
+
+                    ElementStyleDisplay.DrawBorderLine(e.Graphics, p, style.BorderRight, style.BorderRightWidth, color,
+                                                       colorEnd, colorLightStart, colorLightEnd, eBorderSide.Right,
+                                                       borderDrawInfo);
+
+                    if (style.PaintTopBorder && cornerTopRight != eCornerType.Square)
+                    {
+                        if (cornerTopRight == eCornerType.Diagonal)
+                        {
+                            p[0].X = bounds.Right - style.CornerDiameter;
+                            p[0].Y = bounds.Y;
+                            p[1].X = bounds.Right;
+                            p[1].Y = bounds.Y + style.CornerDiameter;
+                            ElementStyleDisplay.DrawBorderLine(e.Graphics, p, style.BorderLeft, style.BorderRightWidth,
+                                                               color, colorEnd, colorLightStart, colorLightEnd,
+                                                               eBorderSide.TopRight, borderDrawInfo);
+                        }
+                        else if (cornerTopRight == eCornerType.Rounded)
+                        {
+                            ArcData a = GetCornerArc(bounds, style.CornerDiameter, eCornerArc.TopRight);
+                            // new ArcData(bounds.X,bounds.Y,style.CornerDiameter*2,style.CornerDiameter*2,180,90);
+                            ElementStyleDisplay.DrawCornerArc(e.Graphics, a, style.BorderLeft, style.BorderLeftWidth, color);
+                        }
+                    }
+
+                    if (style.PaintBottomBorder && cornerBottomRight != eCornerType.Square)
+                    {
+                        if (cornerBottomRight == eCornerType.Diagonal)
+                        {
+                            p[0].X = bounds.Right;
+                            p[0].Y = bounds.Bottom - style.CornerDiameter;
+                            p[1].X = bounds.Right - style.CornerDiameter;
+                            p[1].Y = bounds.Bottom;
+                            ElementStyleDisplay.DrawBorderLine(e.Graphics, p, style.BorderLeft, style.BorderRightWidth,
+                                                               color, colorEnd, colorLightStart, colorLightEnd,
+                                                               eBorderSide.BottomRight, borderDrawInfo);
+                        }
+                        else if (cornerBottomRight == eCornerType.Rounded)
+                        {
+                            ArcData a = GetCornerArc(bounds, style.CornerDiameter, eCornerArc.BottomRight);
+                            // new ArcData(bounds.X,bounds.Y,style.CornerDiameter*2,style.CornerDiameter*2,180,90);
+                            ElementStyleDisplay.DrawCornerArc(e.Graphics, a, style.BorderLeft, style.BorderLeftWidth, color);
+                        }
+                    }
+                }
+            }
+            finally
+            {
+                if (disposeStyle) style.Dispose();
+            }
+        }
+
+        private static Pen CreatePen(eStyleBorderType border, int lineWidth, Color color)
+        {
+            Pen pen = new Pen(color, lineWidth);
+            pen.Alignment = PenAlignment.Inset;
+            pen.DashStyle = ElementStyleDisplay.GetDashStyle(border);
+            return pen;
+        }
+
+        private static void DrawBorderLine(Graphics g, Point[] p, eStyleBorderType border, int lineWidth, Color colorStart, Color colorEnd, Color colorLightStart, Color colorLightEnd, eBorderSide side, BorderDrawInfo drawInfo)
+        {
+            if (border == eStyleBorderType.Etched || border == eStyleBorderType.Double)
+            {
+                if (colorLightStart.IsEmpty)
+                {
+                    colorLightStart = System.Windows.Forms.ControlPaint.Light(colorStart);
+                    colorStart = System.Windows.Forms.ControlPaint.Dark(colorStart);
+                }
+
+                if (drawInfo.IsTwistedDoubleBorder && (side == eBorderSide.Bottom || side == eBorderSide.Right))
+                {
+                    Color ct1 = colorStart;
+                    Color ct2 = colorEnd;
+                    colorStart = colorLightStart;
+                    colorEnd = colorLightEnd;
+                    colorLightStart = ct1;
+                    colorLightEnd = ct2;
+                }
+
+                DisplayHelp.DrawGradientLine(g, p[0], p[1], colorStart, colorEnd, 90, lineWidth);
+
+                if (side == eBorderSide.Top)
+                {
+                    p[0].Y += lineWidth;
+                    p[1].Y += lineWidth;
+                    if (drawInfo.HasLeftBorder)
+                        p[0].X += 1;
+                    if (drawInfo.HasRightBorder)
+                        p[1].X -= 1;
+                }
+                else if (side == eBorderSide.Bottom)
+                {
+                    p[0].Y -= lineWidth;
+                    p[1].Y -= lineWidth;
+                    if (!drawInfo.IsTwistedDoubleBorder)
+                    {
+                        if (drawInfo.HasLeftBorder)
+                            p[0].X += 1;
+                        if (drawInfo.HasRightBorder)
+                            p[1].X -= 1;
+                    }
+                }
+                else if (side == eBorderSide.Left || side == eBorderSide.BottomLeft || side == eBorderSide.TopLeft)
+                {
+                    p[0].X += lineWidth;
+                    p[1].X += lineWidth;
+                    if (drawInfo.HasTopBorder)
+                        p[0].Y += 1;
+                    if (drawInfo.HasBottomBorder)
+                        p[1].Y -= 1;
+                }
+                else if (side == eBorderSide.Right || side == eBorderSide.BottomRight || side == eBorderSide.TopRight)
+                {
+                    p[0].X -= lineWidth;
+                    p[1].X -= lineWidth;
+                    if (!drawInfo.IsTwistedDoubleBorder)
+                    {
+                        if (drawInfo.HasTopBorder)
+                            p[0].Y += 1;
+                        if (drawInfo.HasBottomBorder)
+                            p[1].Y -= 1;
+                    }
+                }
+
+                DisplayHelp.DrawGradientLine(g, p[0], p[1], colorLightStart, colorLightEnd, 90, lineWidth);
+            }
+            else
+            {
+                if (colorEnd.IsEmpty)
+                {
+                    SmoothingMode sm = g.SmoothingMode;
+                    g.SmoothingMode = SmoothingMode.None;
+                    using (Pen pen = CreatePen(border, lineWidth, colorStart))
+                        g.DrawLine(pen, p[0], p[1]);
+                    g.SmoothingMode = sm;
+                }
+                else
+                    DisplayHelp.DrawGradientLine(g, p[0], p[1], colorStart, colorEnd, 90, lineWidth);
+            }
+        }
+
+        private static void DrawCornerArc(Graphics g, ArcData arc, eStyleBorderType border, int lineWidth, Color color)
+        {
+            SmoothingMode sm = g.SmoothingMode;
+            if (sm == SmoothingMode.None) g.SmoothingMode = SmoothingMode.HighQuality;
+            using (Pen pen = CreatePen(border, lineWidth, color))
+            {
+                g.DrawArc(pen, arc.X, arc.Y, arc.Width, arc.Height, arc.StartAngle, arc.SweepAngle);
+            }
+            if (sm == SmoothingMode.None) g.SmoothingMode = sm;
+        }
+
+        private static DashStyle GetDashStyle(eStyleBorderType border)
+        {
+            DashStyle style = DashStyle.Solid;
+            switch (border)
+            {
+                case eStyleBorderType.Dash:
+                    style = DashStyle.Dash;
+                    break;
+                case eStyleBorderType.DashDot:
+                    style = DashStyle.DashDot;
+                    break;
+                case eStyleBorderType.DashDotDot:
+                    style = DashStyle.DashDotDot;
+                    break;
+                case eStyleBorderType.Dot:
+                    style = DashStyle.Dot;
+                    break;
+            }
+            return style;
+        }
+
+        internal static ElementStyle GetElementStyle(ElementStyle style, out bool dispose)
+        {
+            dispose = false;
+            if (style.Class == "")
+                return style;
+            IElementStyleClassProvider provider = GetIElementStyleClassProvider();
+            if (provider != null)
+            {
+                ElementStyle baseStyle = provider.GetClass(style.Class);
+                if (baseStyle != null)
+                {
+                    if (style.Custom)
+                    {
+                        ElementStyle copy = baseStyle.Copy();
+                        copy.ApplyStyle(style);
+                        dispose = true;
+                        return copy;
+                    }
+                    return baseStyle;
+                }
+            }
+
+            return style;
+        }
+
+        private static IElementStyleClassProvider GetIElementStyleClassProvider()
+        {
+#if DOTNETBAR
+            if (Rendering.GlobalManager.Renderer is Rendering.Office2007Renderer)
+            {
+                return ((Rendering.Office2007Renderer)Rendering.GlobalManager.Renderer).ColorTable as IElementStyleClassProvider;
+            }
+#endif
+            return null;
+        }
+
+        /// <summary>
+        /// Paints style background.
+        /// </summary>
+        /// <param name="e">Style display information.</param>
+        public static void PaintBackground(ElementStyleDisplayInfo e)
+        {
+            PaintBackground(e, true);
+        }
+
+        /// <summary>
+        /// Paints style background.
+        /// </summary>
+        /// <param name="e">Style display information.</param>
+        public static void PaintBackground(ElementStyleDisplayInfo e, bool shapeBackground)
+        {
+            Region oldClip = e.Graphics.Clip;
+            if (oldClip != null)
+                e.Graphics.SetClip(e.Bounds, CombineMode.Intersect);
+            else
+                e.Graphics.SetClip(e.Bounds, CombineMode.Replace);
+
+            bool disposeStyle = false;
+            ElementStyle style = GetElementStyle(e.Style, out disposeStyle);
+
+            SmoothingMode sm = e.Graphics.SmoothingMode;
+            e.Graphics.SmoothingMode = SmoothingMode.Default;
+
+            // Paint Background
+            Rectangle bounds = DisplayHelp.GetDrawRectangle(ElementStyleDisplay.GetBackgroundRectangle(style, e.Bounds));
+
+            GraphicsPath path = null;
+            if (shapeBackground && !IsSquareCornerType(style))
+            {
+                path = ElementStyleDisplay.GetBackgroundPath(style, GetBorderRectangle(e.Style, e.Bounds));
+            }
+            else
+            {
+                path = new GraphicsPath();
+                path.AddRectangle(ElementStyleDisplay.GetBackgroundRectangle(style, e.Bounds));
+            }
+
+            eBackgroundColorBlendType blendType = style.BackColorBlend.GetBlendType();
+            if (blendType != eBackgroundColorBlendType.Invalid)
+            {
+                if (blendType == eBackgroundColorBlendType.Relative)
+                {
+                    try
+                    {
+                        if (style.BackColorGradientType == eGradientType.Linear)
+                        {
+                            Rectangle rb = bounds;
+                            rb.Inflate(1, 1);
+                            using (LinearGradientBrush brush = DisplayHelp.CreateLinearGradientBrush(rb, style.BackColor, style.BackColor2, style.BackColorGradientAngle))
+                            {
+                                brush.InterpolationColors = style.BackColorBlend.GetColorBlend();
+                                e.Graphics.FillPath(brush, path);
+                            }
+                        }
+                        else if (style.BackColorGradientType == eGradientType.Radial)
+                        {
+                            int d = (int)Math.Sqrt(bounds.Width * bounds.Width + bounds.Height * bounds.Height) + 4;
+                            GraphicsPath fillPath = new GraphicsPath();
+                            fillPath.AddEllipse(bounds.X - (d - bounds.Width) / 2, bounds.Y - (d - bounds.Height) / 2, d, d);
+                            using (PathGradientBrush brush = new PathGradientBrush(fillPath))
+                            {
+                                brush.CenterColor = style.BackColor;
+                                brush.SurroundColors = new Color[] { style.BackColor2 };
+                                brush.InterpolationColors = style.BackColorBlend.GetColorBlend();
+                                e.Graphics.FillPath(brush, path);
+                            }
+                            fillPath.Dispose();
+                        }
+                    }
+                    catch
+                    {
+                        blendType = eBackgroundColorBlendType.Invalid;
+                    }
+                }
+                else
+                {
+                    Graphics g = e.Graphics;
+                    bounds = e.Bounds;
+                    if (oldClip != null)
+                    {
+                        e.Graphics.SetClip(oldClip, CombineMode.Replace);
+                        e.Graphics.SetClip(path, CombineMode.Intersect);
+                    }
+                    else
+                        e.Graphics.SetClip(path, CombineMode.Replace);
+                    BackgroundColorBlendCollection bc = style.BackColorBlend;
+                    for (int i = 0; i < bc.Count; i += 2)
+                    {
+                        BackgroundColorBlend b1 = bc[i];
+                        BackgroundColorBlend b2 = null;
+                        if (i + 1 < bc.Count)
+                            b2 = bc[i + 1];
+                        if (b1 != null && b2 != null)
+                        {
+                            Rectangle rb = new Rectangle(bounds.X, bounds.Y + (int)b1.Position, bounds.Width,
+                                (b2.Position == 1f ? bounds.Height : (int)b2.Position) - (int)b1.Position);
+                            using (LinearGradientBrush brush = DisplayHelp.CreateLinearGradientBrush(rb, b1.Color, b2.Color, style.BackColorGradientAngle))
+                                g.FillRectangle(brush, rb);
+                        }
+                    }
+                }
+            }
+
+            if (blendType == eBackgroundColorBlendType.Invalid)
+            {
+                if (style.BackColor2.IsEmpty)
+                {
+                    if (!style.BackColor.IsEmpty)
+                    {
+                        using (SolidBrush brush = new SolidBrush(style.BackColor))
+                            e.Graphics.FillPath(brush, path);
+                        //if(e.Style.BackColor.A==255)
+                        //{
+                        //    // Correct problems with FillPath where path was not filled properly...
+                        //    using(Pen pen=new Pen(e.Style.BackColor,1))
+                        //        e.Graphics.DrawPath(pen,path);
+                        //}
+                    }
+                }
+                else if (!style.BackColor.IsEmpty)
+                {
+                    if (style.BackColorGradientType == eGradientType.Linear)
+                    {
+                        Rectangle rb = bounds;
+                        rb.X--;
+                        rb.Height++;
+                        rb.Width += 2;
+                        using (LinearGradientBrush brush = DisplayHelp.CreateLinearGradientBrush(rb, style.BackColor, style.BackColor2, style.BackColorGradientAngle))
+                        {
+                            e.Graphics.FillPath(brush, path);
+                        }
+                    }
+                    else if (style.BackColorGradientType == eGradientType.Radial)
+                    {
+                        int d = (int)Math.Sqrt(bounds.Width * bounds.Width + bounds.Height * bounds.Height) + 4;
+                        GraphicsPath fillPath = new GraphicsPath();
+                        fillPath.AddEllipse(bounds.X - (d - bounds.Width) / 2, bounds.Y - (d - bounds.Height) / 2, d, d);
+                        using (PathGradientBrush brush = new PathGradientBrush(fillPath))
+                        {
+                            brush.CenterColor = style.BackColor;
+                            brush.SurroundColors = new Color[] { style.BackColor2 };
+                            e.Graphics.FillPath(brush, path);
+                        }
+                        fillPath.Dispose();
+                    }
+                }
+            }
+            if (path != null) path.Dispose();
+
+            e.Graphics.SmoothingMode = sm;
+
+            if (oldClip != null)
+            {
+                e.Graphics.Clip = oldClip;
+                oldClip.Dispose();
+                oldClip = null;
+            }
+            else
+                e.Graphics.ResetClip();
+
+            if (disposeStyle) style.Dispose();
+        }
+
+        private static bool IsSquareCornerType(ElementStyle style)
+        {
+            return (style.CornerType == eCornerType.Square || style.CornerType == eCornerType.Inherit) &&
+                   (style.CornerTypeTopLeft == eCornerType.Square || style.CornerTypeTopLeft == eCornerType.Inherit) &&
+                   (style.CornerTypeTopRight == eCornerType.Square || style.CornerTypeTopRight == eCornerType.Inherit);
+        }
+
+        /// <summary>
+        /// Paints style background image.
+        /// </summary>
+        /// <param name="e">Style display information.</param>
+        public static void PaintBackgroundImage(ElementStyleDisplayInfo e)
+        {
+            bool disposeStyle = false;
+            ElementStyle style = GetElementStyle(e.Style, out disposeStyle);
+            GraphicsPath path = null;
+            try
+            {
+                if (style.BackgroundImage == null)
+                    return;
+
+                Rectangle bounds = ElementStyleDisplay.GetBackgroundRectangle(style, e.Bounds);
+                if (e.Graphics.SmoothingMode == SmoothingMode.AntiAlias)
+                {
+                    Rectangle r = e.Bounds;
+                    //r.Width--;
+                    //r.Height--;
+                    path = ElementStyleDisplay.GetBackgroundPath(style, r);
+                }
+                else
+                    path = ElementStyleDisplay.GetBackgroundPath(style, e.Bounds);
+
+                ImageAttributes imageAtt = null;
+
+                if (style.BackgroundImageAlpha != 255)
+                {
+                    //ColorMatrix colorMatrix = new ColorMatrix();
+                    //colorMatrix.Matrix33 = 255 - style.BackgroundImageAlpha;
+                    float[][] matrixItems ={ 
+                       new float[] {1, 0, 0, 0, 0},
+                       new float[] {0, 1, 0, 0, 0},
+                       new float[] {0, 0, 1, 0, 0},
+                       new float[] {0, 0, 0, (float)style.BackgroundImageAlpha/255, 0}, 
+                       new float[] {0, 0, 0, 0, 1}};
+                    System.Drawing.Imaging.ColorMatrix colorMatrix = new System.Drawing.Imaging.ColorMatrix(matrixItems);
+                    imageAtt = new ImageAttributes();
+                    imageAtt.SetColorMatrix(colorMatrix, ColorMatrixFlag.Default, ColorAdjustType.Bitmap);
+                }
+
+                Region clip = e.Graphics.Clip;
+                e.Graphics.SetClip(path, CombineMode.Intersect);
+
+                eStyleBackgroundImage imagePosition = style.BackgroundImagePosition;
+                bool transform = false;
+                Image backgroundImage = style.BackgroundImage;
+
+                if (e.RightToLeft)
+                {
+                    if (imagePosition == eStyleBackgroundImage.TopLeft)
+                    {
+                        imagePosition = eStyleBackgroundImage.TopRight;
+                        transform = true;
+                    }
+                    else if (imagePosition == eStyleBackgroundImage.TopRight)
+                        imagePosition = eStyleBackgroundImage.TopLeft;
+                    else if (imagePosition == eStyleBackgroundImage.BottomLeft)
+                        imagePosition = eStyleBackgroundImage.BottomRight;
+                    else if (imagePosition == eStyleBackgroundImage.BottomRight)
+                        imagePosition = eStyleBackgroundImage.BottomLeft;
+                }
+
+                if (transform)
+                {
+                    backgroundImage = backgroundImage.Clone() as Image;
+                    backgroundImage.RotateFlip(RotateFlipType.RotateNoneFlipX);
+                }
+
+                switch (imagePosition)
+                {
+                    case eStyleBackgroundImage.Stretch:
+                        {
+                            if (imageAtt != null)
+                                e.Graphics.DrawImage(backgroundImage, bounds, 0, 0, backgroundImage.Width,
+                                                     backgroundImage.Height, GraphicsUnit.Pixel, imageAtt);
+                            else
+                                e.Graphics.DrawImage(backgroundImage, bounds, 0, 0, backgroundImage.Width,
+                                                     backgroundImage.Height, GraphicsUnit.Pixel);
+                            break;
+                        }
+                    case eStyleBackgroundImage.Zoom:
+                        {
+                            Size backImageSize = backgroundImage.Size;
+                            Rectangle newImageBounds = Rectangle.Empty;
+                            float horizontalRatio = ((float)bounds.Width) / ((float)backImageSize.Width);
+                            float verticalRatio = ((float)bounds.Height) / ((float)backImageSize.Height);
+                            if (horizontalRatio >= verticalRatio)
+                            {
+                                newImageBounds.Height = bounds.Height;
+                                newImageBounds.Width = (int)((backImageSize.Width * verticalRatio) + 0.5);
+                                if (bounds.X >= 0)
+                                {
+                                    newImageBounds.X = (bounds.Width - newImageBounds.Width) / 2;
+                                }
+                            }
+                            else
+                            {
+                                newImageBounds.Width = bounds.Width;
+                                newImageBounds.Height = (int)((backImageSize.Height * horizontalRatio) + 0.5);
+                                if (bounds.Y >= 0)
+                                {
+                                    newImageBounds.Y = (bounds.Height - newImageBounds.Height) / 2;
+                                }
+                            }
+                            bounds = newImageBounds;
+
+                            if (imageAtt != null)
+                            {
+
+                                e.Graphics.DrawImage(backgroundImage, bounds, 0, 0, backgroundImage.Width,
+                                                     backgroundImage.Height, GraphicsUnit.Pixel, imageAtt);
+                            }
+                            else
+                                e.Graphics.DrawImage(backgroundImage, bounds, 0, 0, backgroundImage.Width,
+                                                     backgroundImage.Height, GraphicsUnit.Pixel);
+                            break;
+                        }
+                    case eStyleBackgroundImage.Center:
+                        {
+                            Rectangle destRect = new Rectangle(bounds.X, bounds.Y, Dpi.Width(backgroundImage.Width),
+                                                               Dpi.Height(backgroundImage.Height));
+                            if (bounds.Width > destRect.Width)
+                                destRect.X += (bounds.Width - destRect.Width) / 2;
+                            if (bounds.Height > destRect.Height)
+                                destRect.Y += (bounds.Height - destRect.Height) / 2;
+                            if (imageAtt != null)
+                                e.Graphics.DrawImage(backgroundImage, destRect, 0, 0, backgroundImage.Width,
+                                                     backgroundImage.Height, GraphicsUnit.Pixel, imageAtt);
+                            else
+                                e.Graphics.DrawImage(backgroundImage, destRect, 0, 0, backgroundImage.Width,
+                                                     backgroundImage.Height, GraphicsUnit.Pixel);
+
+                            break;
+                        }
+                    case eStyleBackgroundImage.TopLeft:
+                    case eStyleBackgroundImage.TopRight:
+                    case eStyleBackgroundImage.BottomLeft:
+                    case eStyleBackgroundImage.BottomRight:
+                        {
+                            Rectangle destRect = new Rectangle(bounds.X, bounds.Y, Dpi.Width(backgroundImage.Width),
+                                                               Dpi.Height(backgroundImage.Height));
+                            if (imagePosition == eStyleBackgroundImage.TopRight)
+                                destRect.X = bounds.Right - destRect.Width;
+                            else if (imagePosition == eStyleBackgroundImage.BottomLeft)
+                                destRect.Y = bounds.Bottom - destRect.Height;
+                            else if (imagePosition == eStyleBackgroundImage.BottomRight)
+                            {
+                                destRect.Y = bounds.Bottom - destRect.Height;
+                                destRect.X = bounds.Right - destRect.Width;
+                            }
+
+                            if (imageAtt != null)
+                                e.Graphics.DrawImage(backgroundImage, destRect, 0, 0, backgroundImage.Width,
+                                                     backgroundImage.Height, GraphicsUnit.Pixel, imageAtt);
+                            else
+                                e.Graphics.DrawImage(backgroundImage, destRect, 0, 0, backgroundImage.Width,
+                                                     backgroundImage.Height, GraphicsUnit.Pixel);
+                            break;
+                        }
+                    case eStyleBackgroundImage.Tile:
+                        {
+                            if (imageAtt != null)
+                            {
+                                if (bounds.Width > backgroundImage.Width || bounds.Height > backgroundImage.Height)
+                                {
+                                    int x = bounds.X, y = bounds.Y;
+                                    while (y < bounds.Bottom)
+                                    {
+                                        while (x < bounds.Right)
+                                        {
+                                            Rectangle destRect = new Rectangle(x, y, Dpi.Width(backgroundImage.Width),
+                                                                               Dpi.Height(backgroundImage.Height));
+                                            if (destRect.Right > bounds.Right)
+                                                destRect.Width = destRect.Width - (destRect.Right - bounds.Right);
+                                            if (destRect.Bottom > bounds.Bottom)
+                                                destRect.Height = destRect.Height - (destRect.Bottom - bounds.Bottom);
+                                            e.Graphics.DrawImage(backgroundImage, destRect, 0, 0, destRect.Width,
+                                                                 destRect.Height, GraphicsUnit.Pixel, imageAtt);
+                                            x += Dpi.Width(backgroundImage.Width);
+                                        }
+                                        x = bounds.X;
+                                        y += Dpi.Height(backgroundImage.Height);
+                                    }
+                                }
+                                else
+                                {
+                                    e.Graphics.DrawImage(backgroundImage,
+                                                         new Rectangle(0, 0, Dpi.Width(backgroundImage.Width),
+                                                                       Dpi.Height(backgroundImage.Height)), 0, 0,
+                                                         backgroundImage.Width, backgroundImage.Height,
+                                                         GraphicsUnit.Pixel, imageAtt);
+                                }
+                            }
+                            else
+                            {
+                                TextureBrush brush = new TextureBrush(backgroundImage);
+                                brush.WrapMode = WrapMode.Tile;
+                                e.Graphics.FillPath(brush, path);
+                                brush.Dispose();
+                            }
+                            break;
+                        }
+                }
+                if (transform)
+                {
+                    backgroundImage.Dispose();
+                }
+
+                if (clip != null)
+                {
+                    e.Graphics.Clip = clip;
+                    clip.Dispose();
+                }
+                else
+                    e.Graphics.ResetClip();
+            }
+            finally
+            {
+                if (path != null) path.Dispose();
+                if (disposeStyle) style.Dispose();
+            }
+        }
+
+        /// <summary>
+        /// Returns background rectangle for given style by taking in account margins.
+        /// </summary>
+        /// <param name="style">Reference to style object.</param>
+        /// <param name="bounds">Style bounds</param>
+        /// <returns>Background rectangle.</returns>
+        public static Rectangle GetBackgroundRectangle(ElementStyle style, Rectangle bounds)
+        {
+            // Reduce the bounds rectangle size by the margin size
+            bounds.X += style.MarginLeft;
+            bounds.Width -= (style.MarginLeft + style.MarginRight);
+            bounds.Y += style.MarginTop;
+            bounds.Height -= (style.MarginTop + style.MarginBottom);
+            return bounds;
+        }
+
+        private static Rectangle GetBorderRectangle(ElementStyle style, Rectangle bounds)
+        {
+            if (style.PaintRightBorder)
+            {
+                if (style.BorderRightWidth <= 1)
+                    bounds.Width -= style.BorderRightWidth;
+                else
+                    bounds.Width -= style.BorderRightWidth / 2;
+            }
+
+            if (style.PaintBottomBorder)
+            {
+                if (style.BorderBottomWidth <= 1)
+                    bounds.Height -= style.BorderBottomWidth;
+                else
+                    bounds.Height -= style.BorderBottomWidth / 2;
+            }
+
+            if (style.PaintLeftBorder && style.BorderLeftWidth > 1)
+            {
+                bounds.X += style.BorderLeftWidth / 2;
+                bounds.Width -= style.BorderLeftWidth / 2;
+            }
+
+            if (style.PaintTopBorder && style.BorderTopWidth > 1)
+            {
+                bounds.Y += style.BorderTopWidth / 2;
+                bounds.Height -= style.BorderTopWidth / 2;
+            }
+
+            return bounds;
+        }
+
+        private static Rectangle GetTextRectangle(ElementStyle style, Rectangle bounds)
+        {
+            bounds = ElementStyleDisplay.GetBackgroundRectangle(style, bounds);
+
+            // Reduce the bounds rectangle size by the padding size
+            bounds.X += style.PaddingLeft;
+            bounds.Width -= (style.PaddingLeft + style.PaddingRight);
+            bounds.Y += style.PaddingTop;
+            bounds.Height -= (style.PaddingTop + style.PaddingBottom);
+            return bounds;
+        }
+
+        /// <summary>
+        /// Returns GraphicsPath for given style.
+        /// </summary>
+        /// <param name="style">Reference to style.</param>
+        /// <param name="bounds">Style bounds.</param>
+        /// <returns>New instance of GraphicsPath</returns>
+        public static GraphicsPath GetBackgroundPath(ElementStyle style, Rectangle bounds)
+        {
+            return GetBackgroundPath(style, bounds, eStyleBackgroundPathPart.Complete);
+        }
+
+        /// <summary>
+        /// Returns GraphicsPath for given style.
+        /// </summary>
+        /// <param name="style">Reference to style.</param>
+        /// <param name="bounds">Style bounds.</param>
+        /// <returns>New instance of GraphicsPath</returns>
+        public static GraphicsPath GetBackgroundPath(ElementStyle style, Rectangle bounds, eStyleBackgroundPathPart pathPart)
+        {
+            GraphicsPath path = new GraphicsPath();
+
+            Rectangle clientRectangle;
+            //if(drawPath)
+            clientRectangle =/*DisplayHelp.GetDrawRectangle*/(ElementStyleDisplay.GetBackgroundRectangle(style, bounds));
+            //else
+            //   clientRectangle =/*DisplayHelp.GetDrawRectangle*/(ElementStyleDisplay.GetBackgroundRectangle(style, bounds));
+
+            if (pathPart == eStyleBackgroundPathPart.Complete && style.CornerTypeBottomLeft == eCornerType.Inherit && style.CornerTypeBottomRight == eCornerType.Inherit &&
+                style.CornerTypeTopLeft == eCornerType.Inherit && style.CornerTypeTopRight == eCornerType.Inherit)
+            {
+                switch (style.CornerType)
+                {
+                    case eCornerType.Square:
+                        {
+                            path.AddRectangle(clientRectangle);
+                            break;
+                        }
+                    case eCornerType.Rounded:
+                        {
+                            ArcData ad = GetCornerArc(clientRectangle, style.CornerDiameter, eCornerArc.TopLeft);
+                            path.AddArc(ad.X, ad.Y, ad.Width, ad.Height, ad.StartAngle, ad.SweepAngle);
+                            ad = GetCornerArc(clientRectangle, style.CornerDiameter, eCornerArc.TopRight);
+                            path.AddArc(ad.X, ad.Y, ad.Width, ad.Height, ad.StartAngle, ad.SweepAngle);
+                            ad = GetCornerArc(clientRectangle, style.CornerDiameter, eCornerArc.BottomRight);
+                            path.AddArc(ad.X, ad.Y, ad.Width, ad.Height, ad.StartAngle, ad.SweepAngle);
+                            ad = GetCornerArc(clientRectangle, style.CornerDiameter, eCornerArc.BottomLeft);
+                            path.AddArc(ad.X, ad.Y, ad.Width, ad.Height, ad.StartAngle, ad.SweepAngle);
+                            path.CloseAllFigures();
+                            break;
+                        }
+                    case eCornerType.Diagonal:
+                        {
+                            path.AddLine(clientRectangle.X, clientRectangle.Bottom - style.CornerDiameter - 1, clientRectangle.X, clientRectangle.Y + style.CornerDiameter);
+                            path.AddLine(clientRectangle.X + style.CornerDiameter, clientRectangle.Y, clientRectangle.Right - style.CornerDiameter, clientRectangle.Y);
+                            path.AddLine(clientRectangle.Right, clientRectangle.Y + style.CornerDiameter, clientRectangle.Right, clientRectangle.Bottom - style.CornerDiameter - 1);
+                            path.AddLine(clientRectangle.Right - style.CornerDiameter - 1, clientRectangle.Bottom, clientRectangle.X + style.CornerDiameter, clientRectangle.Bottom);
+                            path.CloseAllFigures();
+                            break;
+                        }
+                }
+            }
+            else
+            {
+                if (pathPart == eStyleBackgroundPathPart.TopHalf)
+                    clientRectangle.Height = clientRectangle.Height / 2;
+                else if (pathPart == eStyleBackgroundPathPart.BottomHalf)
+                {
+                    int h = clientRectangle.Height;
+                    clientRectangle.Height = clientRectangle.Height / 2;
+                    clientRectangle.Y += (h - clientRectangle.Height - 1);
+                }
+
+                eCornerType corner = style.CornerTypeTopLeft;
+                if (corner == eCornerType.Inherit)
+                    corner = style.CornerType;
+
+                if (pathPart == eStyleBackgroundPathPart.BottomHalf)
+                    corner = eCornerType.Square;
+
+                if (corner == eCornerType.Rounded)
+                {
+                    ArcData ad = GetCornerArc(clientRectangle, style.CornerDiameter, eCornerArc.TopLeft);
+                    path.AddArc(ad.X, ad.Y, ad.Width, ad.Height, ad.StartAngle, ad.SweepAngle);
+                }
+                else if (corner == eCornerType.Diagonal)
+                {
+                    path.AddLine(clientRectangle.X, clientRectangle.Y + style.CornerDiameter, clientRectangle.X + style.CornerDiameter, clientRectangle.Y);
+                }
+                else
+                {
+                    path.AddLine(clientRectangle.X, clientRectangle.Y + 2, clientRectangle.X, clientRectangle.Y);
+                    path.AddLine(clientRectangle.X, clientRectangle.Y, clientRectangle.X + 2, clientRectangle.Y);
+                }
+
+                corner = style.CornerTypeTopRight;
+                if (corner == eCornerType.Inherit)
+                    corner = style.CornerType;
+                if (pathPart == eStyleBackgroundPathPart.BottomHalf)
+                    corner = eCornerType.Square;
+                if (corner == eCornerType.Rounded)
+                {
+                    ArcData ad = GetCornerArc(clientRectangle, style.CornerDiameter, eCornerArc.TopRight);
+                    path.AddArc(ad.X, ad.Y, ad.Width, ad.Height, ad.StartAngle, ad.SweepAngle);
+                }
+                else if (corner == eCornerType.Diagonal)
+                {
+                    path.AddLine(clientRectangle.Right - style.CornerDiameter - 1, clientRectangle.Y, clientRectangle.Right, clientRectangle.Y + style.CornerDiameter);
+                }
+                else
+                {
+                    path.AddLine(clientRectangle.Right - 2, clientRectangle.Y, clientRectangle.Right, clientRectangle.Y);
+                    path.AddLine(clientRectangle.Right, clientRectangle.Y, clientRectangle.Right, clientRectangle.Y + 2);
+                }
+
+                corner = style.CornerTypeBottomRight;
+                if (corner == eCornerType.Inherit)
+                    corner = style.CornerType;
+                if (pathPart == eStyleBackgroundPathPart.TopHalf)
+                    corner = eCornerType.Square;
+                if (corner == eCornerType.Rounded)
+                {
+                    ArcData ad = GetCornerArc(clientRectangle, style.CornerDiameter, eCornerArc.BottomRight);
+                    path.AddArc(ad.X, ad.Y, ad.Width, ad.Height, ad.StartAngle, ad.SweepAngle);
+                }
+                else if (corner == eCornerType.Diagonal)
+                {
+                    path.AddLine(clientRectangle.Right, clientRectangle.Bottom - style.CornerDiameter - 1, clientRectangle.Right - style.CornerDiameter - 1, clientRectangle.Bottom);
+                }
+                else
+                {
+                    path.AddLine(clientRectangle.Right, clientRectangle.Bottom - 2, clientRectangle.Right, clientRectangle.Bottom);
+                    path.AddLine(clientRectangle.Right, clientRectangle.Bottom, clientRectangle.Right - 2, clientRectangle.Bottom);
+                }
+
+                corner = style.CornerTypeBottomLeft;
+                if (corner == eCornerType.Inherit)
+                    corner = style.CornerType;
+                if (pathPart == eStyleBackgroundPathPart.TopHalf)
+                    corner = eCornerType.Square;
+                if (corner == eCornerType.Rounded)
+                {
+                    ArcData ad = GetCornerArc(clientRectangle, style.CornerDiameter, eCornerArc.BottomLeft);
+                    path.AddArc(ad.X, ad.Y, ad.Width, ad.Height, ad.StartAngle, ad.SweepAngle);
+                }
+                else if (corner == eCornerType.Diagonal)
+                {
+                    path.AddLine(clientRectangle.X + 2, clientRectangle.Bottom, clientRectangle.X, clientRectangle.Bottom - style.CornerDiameter - 1);
+                }
+                else
+                {
+                    path.AddLine(clientRectangle.X + 2, clientRectangle.Bottom, clientRectangle.X, clientRectangle.Bottom);
+                    path.AddLine(clientRectangle.X, clientRectangle.Bottom, clientRectangle.X, clientRectangle.Bottom - 2);
+                }
+            }
+
+            return path;
+        }
+
+        public static void AddCornerArc(GraphicsPath path, Rectangle bounds, int cornerDiameter, eCornerArc corner)
+        {
+            if (cornerDiameter > 0)
+            {
+                ArcData a = GetCornerArc(bounds, cornerDiameter, corner);
+                path.AddArc(a.X, a.Y, a.Width, a.Height, a.StartAngle, a.SweepAngle);
+            }
+            else
+            {
+                if (corner == eCornerArc.TopLeft)
+                {
+                    path.AddLine(bounds.X, bounds.Y + 2, bounds.X, bounds.Y);
+                }
+                else if (corner == eCornerArc.BottomLeft)
+                {
+                    path.AddLine(bounds.X + 2, bounds.Bottom, bounds.X, bounds.Bottom);
+                }
+                else if (corner == eCornerArc.TopRight)
+                {
+                    path.AddLine(bounds.Right - 2, bounds.Y, bounds.Right, bounds.Y);
+                }
+                else if (corner == eCornerArc.BottomRight)
+                {
+                    path.AddLine(bounds.Right, bounds.Bottom - 2, bounds.Right, bounds.Bottom);
+                }
+            }
+        }
+
+        internal static ArcData GetCornerArc(Rectangle bounds, int cornerDiameter, eCornerArc corner)
+        {
+            ArcData a;
+            if (cornerDiameter == 0) cornerDiameter = 1;
+            int diameter = cornerDiameter * 2;
+            switch (corner)
+            {
+                case eCornerArc.TopLeft:
+                    a = new ArcData(bounds.X, bounds.Y, diameter, diameter, 180, 90);
+                    break;
+                case eCornerArc.TopRight:
+                    a = new ArcData(bounds.Right - diameter, bounds.Y, diameter, diameter, 270, 90);
+                    break;
+                case eCornerArc.BottomLeft:
+                    a = new ArcData(bounds.X, bounds.Bottom - diameter, diameter, diameter, 90, 90);
+                    break;
+                default: // eCornerArc.BottomRight:
+                    a = new ArcData(bounds.Right - diameter, bounds.Bottom - diameter, diameter, diameter, 0, 90);
+                    break;
+            }
+            return a;
+        }
+
+        enum eBorderSide
+        {
+            Top,
+            Bottom,
+            Left,
+            Right,
+            TopLeft,
+            TopRight,
+            BottomLeft,
+            BottomRight
+        }
+
+        internal struct BorderDrawInfo
+        {
+            public bool HasLeftBorder;
+            public bool HasRightBorder;
+            public bool HasTopBorder;
+            public bool HasBottomBorder;
+            public bool IsTwistedDoubleBorder;
+            /// <summary>
+            /// Initializes a new instance of the BorderDrawInfo structure.
+            /// </summary>
+            /// <param name="hasLeftBorder"></param>
+            /// <param name="hasRightBorder"></param>
+            /// <param name="hasTopBorder"></param>
+            /// <param name="hasBottomBorder"></param>
+            /// <param name="isTwistedDoubleBorder"></param>
+            public BorderDrawInfo(bool hasLeftBorder, bool hasRightBorder, bool hasTopBorder, bool hasBottomBorder, bool isTwistedDoubleBorder)
+            {
+                HasLeftBorder = hasLeftBorder;
+                HasRightBorder = hasRightBorder;
+                HasTopBorder = hasTopBorder;
+                HasBottomBorder = hasBottomBorder;
+                IsTwistedDoubleBorder = isTwistedDoubleBorder;
+            }
+        }
+    }
+
+    public enum eCornerArc
+    {
+        TopLeft,
+        TopRight,
+        BottomLeft,
+        BottomRight
+    }
+
+    /// <summary>
+    /// Represents information necessary to paint the style on canvas.
+    /// </summary>
+    public class ElementStyleDisplayInfo
+    {
+        /// <summary>Reference to ElementStyle object.</summary>
+        public ElementStyle Style = null;
+        /// <summary>Reference to Graphics object.</summary>
+        public Graphics Graphics = null;
+        /// <summary>ElementStyle bounds.</summary>
+        public Rectangle Bounds = Rectangle.Empty;
+        /// <summary>Get or sets whether layout is right-to-left.</summary>
+        public bool RightToLeft = false;
+        /// <summary>
+        /// Gets or sets whether bottom and right border is "twisted" giving beveled look when double border is used.
+        /// </summary>
+        public bool IsTwistedDoubleBorder = false;
+
+        /// <summary>Creates new instance of the object.</summary>
+        public ElementStyleDisplayInfo()
+        {
+        }
+
+        /// <summary>Creates new instance of the object and initializes it with default values.</summary>
+        /// <param name="style">Style to initialize object with.</param>
+        /// <param name="g">Graphics object to initialize object with.</param>
+        /// <param name="bounds">Bounds to initialize object with.</param>
+        public ElementStyleDisplayInfo(ElementStyle style, Graphics g, Rectangle bounds)
+        {
+            this.Style = style;
+            this.Graphics = g;
+            this.Bounds = bounds;
+        }
+        /// <summary>Creates new instance of the object and initializes it with default values.</summary>
+        /// <param name="style">Style to initialize object with.</param>
+        /// <param name="g">Graphics object to initialize object with.</param>
+        /// <param name="bounds">Bounds to initialize object with.</param>
+        public ElementStyleDisplayInfo(ElementStyle style, Graphics g, Rectangle bounds, bool isTwistedDoubleBorder)
+        {
+            this.Style = style;
+            this.Graphics = g;
+            this.Bounds = bounds;
+            this.IsTwistedDoubleBorder = isTwistedDoubleBorder;
+        }
+    }
+
+    #region eStyleBackgroundPathPart
+    /// <summary>
+    /// Specifies part of the background path.
+    /// </summary>
+    public enum eStyleBackgroundPathPart
+    {
+        /// <summary>
+        /// Indicates complete background path
+        /// </summary>
+        Complete,
+        /// <summary>
+        /// Indicates Top half of background path
+        /// </summary>
+        TopHalf,
+        /// <summary>
+        /// Indicates Bottom half of background path
+        /// </summary>
+        BottomHalf
+    }
+    #endregion
+
+    #region ArcData
+    internal struct ArcData
+    {
+        public int X;
+        public int Y;
+        public int Width;
+        public int Height;
+        public float StartAngle;
+        public float SweepAngle;
+        public ArcData(int x, int y, int width, int height, float startAngle, float sweepAngle)
+        {
+            this.X = x;
+            this.Y = y;
+            this.Width = width;
+            this.Height = height;
+            this.StartAngle = startAngle;
+            this.SweepAngle = sweepAngle;
+        }
+    }
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/ElementStyleLayout.cs b/PROMS/DotNetBar Source Code/ElementStyleLayout.cs
new file mode 100644
index 00000000..a87c78bd
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/ElementStyleLayout.cs	
@@ -0,0 +1,259 @@
+using System;
+using System.Drawing;
+using System.Collections;
+
+#if AdvTree
+namespace DevComponents.Tree
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar
+#endif
+{
+	/// <summary>
+	/// Represents the layout for the element style.
+	/// </summary>
+	internal class ElementStyleLayout
+	{
+		public ElementStyleLayout()
+		{
+		}
+
+		/// <summary>
+		/// Calculates size of an style element.
+		/// </summary>
+		/// <param name="style">Style to calculate size for.</param>
+		/// <param name="defaultFont">Default font that will be used by style if style does not uses it's own font.</param>
+		/// <returns>Size of the style element. At this time only Height member will be calculated.</returns>
+		public static void CalculateStyleSize(ElementStyle style, Font defaultFont)
+		{
+			int height=defaultFont.Height;
+		    bool disposeStyle = false;
+            ElementStyle s = ElementStyleDisplay.GetElementStyle(style, out disposeStyle);
+			if(s.Font!=null)
+				height=s.Font.Height;
+			
+			if(s.PaintTopBorder)
+			{
+				height+=s.BorderTopWidth;
+			}
+
+			if(s.PaintBottomBorder)
+			{
+				height+=s.BorderBottomWidth;
+			}
+			
+			height+=(s.MarginTop+style.MarginBottom);
+			height+=(s.PaddingTop+s.PaddingBottom);
+			
+			style.SetSize(new Size(0,height));
+		}
+
+		/// <summary>
+		/// Returns the total white space for a style. Whitespace is the space between the edge of the element and inner content of the element.
+		/// </summary>
+		/// <param name="es">Style to return white space for</param>
+		/// <returns></returns>
+		public static int HorizontalStyleWhiteSpace(ElementStyle es)
+		{
+			return LeftWhiteSpace(es)+RightWhiteSpace(es);
+		}
+
+		/// <summary>
+		/// Returns the total white space for a style. Whitespace is the space between the edge of the element and inner content of the element.
+		/// </summary>
+		/// <param name="es">Style to return white space for.</param>
+		/// <returns></returns>
+		public static int VerticalStyleWhiteSpace(ElementStyle es)
+		{
+			return TopWhiteSpace(es)+BottomWhiteSpace(es);
+		}
+
+        private static readonly eSpacePart LeftWhiteSpaceParts = eSpacePart.Border | eSpacePart.Margin | eSpacePart.Padding;
+		/// <summary>
+		/// Returns total white space for left side of the style. Whitespace is the space between the edge of the element and inner content of the element.
+		/// </summary>
+		/// <param name="es">Style to return white space for.</param>
+		/// <returns></returns>
+		public static int LeftWhiteSpace(ElementStyle es)
+		{
+			return ElementStyleLayout.StyleSpacing(es,LeftWhiteSpaceParts,eStyleSide.Left);
+		}
+
+        /// <summary>
+        /// Returns total white space for left side of the style. Whitespace is the space between the edge of the element and inner content of the element.
+        /// </summary>
+        /// <param name="es">Style to return white space for.</param>
+        /// <returns></returns>
+        public static int LeftWhiteSpace(ElementStyle es, eSpacePart parts)
+        {
+            return ElementStyleLayout.StyleSpacing(es, parts, eStyleSide.Left);
+        }
+
+        private static readonly eSpacePart RightWhiteSpaceParts = eSpacePart.Border | eSpacePart.Margin | eSpacePart.Padding;
+		/// <summary>
+		/// Returns total white space for right side of the style. Whitespace is the space between the edge of the element and inner content of the element.
+		/// </summary>
+		/// <param name="es">Style to return white space for.</param>
+		/// <returns></returns>
+		public static int RightWhiteSpace(ElementStyle es)
+		{
+			return ElementStyleLayout.StyleSpacing(es,RightWhiteSpaceParts,eStyleSide.Right);
+		}
+
+        /// <summary>
+        /// Returns total white space for right side of the style. Whitespace is the space between the edge of the element and inner content of the element.
+        /// </summary>
+        /// <param name="es">Style to return white space for.</param>
+        /// <returns></returns>
+        public static int RightWhiteSpace(ElementStyle es, eSpacePart parts)
+        {
+            return ElementStyleLayout.StyleSpacing(es, parts, eStyleSide.Right);
+        }
+
+		/// <summary>
+		/// Returns total white space for top side of the style. Whitespace is the space between the edge of the element and inner content of the element.
+		/// </summary>
+		/// <param name="es">Style to return white space for.</param>
+		/// <returns></returns>
+		public static int TopWhiteSpace(ElementStyle es)
+		{
+			return ElementStyleLayout.StyleSpacing(es,eSpacePart.Border | eSpacePart.Margin | eSpacePart.Padding,eStyleSide.Top);
+		}
+
+        /// <summary>
+        /// Returns total white space for top side of the style. Whitespace is the space between the edge of the element and inner content of the element.
+        /// </summary>
+        /// <param name="es">Style to return white space for.</param>
+        /// <returns></returns>
+        public static int TopWhiteSpace(ElementStyle es, eSpacePart parts)
+        {
+            return ElementStyleLayout.StyleSpacing(es, parts, eStyleSide.Top);
+        }
+
+		/// <summary>
+		/// Returns total white space for top side of the style. Whitespace is the space between the edge of the element and inner content of the element.
+		/// </summary>
+		/// <param name="es">Style to return white space for.</param>
+		/// <returns></returns>
+		public static int BottomWhiteSpace(ElementStyle es)
+		{
+			return ElementStyleLayout.StyleSpacing(es,eSpacePart.Border | eSpacePart.Margin | eSpacePart.Padding,eStyleSide.Bottom);
+		}
+
+        /// <summary>
+        /// Returns total white space for top side of the style. Whitespace is the space between the edge of the element and inner content of the element.
+        /// </summary>
+        /// <param name="es">Style to return white space for.</param>
+        /// <returns></returns>
+        public static int BottomWhiteSpace(ElementStyle es, eSpacePart parts)
+        {
+            return ElementStyleLayout.StyleSpacing(es, parts, eStyleSide.Bottom);
+        }
+
+		/// <summary>
+		/// Returns amount of spacing for specified style parts.
+		/// </summary>
+		/// <param name="es">Style to calculate spacing for.</param>
+		/// <param name="part">Part of the style spacing is calculated for. Values can be combined.</param>
+		/// <param name="side">Side of the style to use for calculation.</param>
+		/// <returns></returns>
+		public static int StyleSpacing(ElementStyle style, eSpacePart part, eStyleSide side)
+		{
+            bool disposeStyle = false;
+            ElementStyle es = ElementStyleDisplay.GetElementStyle(style, out disposeStyle);
+			int space=0;
+			if((part & eSpacePart.Margin)==eSpacePart.Margin)
+			{
+				switch(side)
+				{
+					case eStyleSide.Bottom:
+						space+=es.MarginBottom;
+						break;
+					case eStyleSide.Left:
+						space+=es.MarginLeft;
+						break;
+					case eStyleSide.Right:
+						space+=es.MarginRight;
+						break;
+					case eStyleSide.Top:
+						space+=es.MarginTop;
+						break;
+				}
+			}
+
+			if((part & eSpacePart.Padding)==eSpacePart.Padding)
+			{
+				switch(side)
+				{
+					case eStyleSide.Bottom:
+						space+=es.PaddingBottom;
+						break;
+					case eStyleSide.Left:
+						space+=es.PaddingLeft;
+						break;
+					case eStyleSide.Right:
+						space+=es.PaddingRight;
+						break;
+					case eStyleSide.Top:
+						space+=es.PaddingTop;
+						break;
+				}
+			}
+
+			if((part & eSpacePart.Border)==eSpacePart.Border)
+			{
+				switch(side)
+				{
+					case eStyleSide.Bottom:
+					{
+						if(es.PaintBottomBorder)
+							space+=es.BorderBottomWidth;
+                        if (es.BorderBottom == eStyleBorderType.Etched || es.BorderBottom == eStyleBorderType.Double)
+                            space += es.BorderBottomWidth;
+						break;
+					}
+					case eStyleSide.Left:
+					{
+						if(es.PaintLeftBorder)
+							space+=es.BorderLeftWidth;
+                        if (es.BorderLeft == eStyleBorderType.Etched || es.BorderLeft == eStyleBorderType.Double)
+                            space += es.BorderLeftWidth;
+						break;
+					}
+					case eStyleSide.Right:
+					{
+						if(es.PaintRightBorder)
+							space+=es.BorderRightWidth;
+                        if (es.BorderRight == eStyleBorderType.Etched || es.BorderRight == eStyleBorderType.Double)
+                            space += es.BorderRightWidth;
+						break;
+					}
+					case eStyleSide.Top:
+					{
+						if(es.PaintTopBorder)
+							space+=es.BorderTopWidth;
+                        if (es.BorderTop == eStyleBorderType.Etched || es.BorderTop == eStyleBorderType.Double)
+                            space += es.BorderTopWidth;
+						break;
+					}
+				}
+			}
+
+            if (disposeStyle) es.Dispose();
+
+			return space;
+		}
+
+        /// <summary>
+        /// Gets inner rectangle taking in account style padding, margins and border.
+        /// </summary>
+        public static Rectangle GetInnerRect(ElementStyle style, Rectangle bounds)
+        {
+            bounds.X += LeftWhiteSpace(style);
+            bounds.Width -= HorizontalStyleWhiteSpace(style);
+            bounds.Y += TopWhiteSpace(style);
+            bounds.Height -= VerticalStyleWhiteSpace(style);
+
+            return bounds;
+        }
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/EllipticalShapeDescriptor.cs b/PROMS/DotNetBar Source Code/EllipticalShapeDescriptor.cs
new file mode 100644
index 00000000..6c354ea2
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/EllipticalShapeDescriptor.cs	
@@ -0,0 +1,76 @@
+using System;
+using System.Text;
+using System.ComponentModel;
+using System.Globalization;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.ComponentModel.Design.Serialization;
+using System.Reflection;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Describes the Elliptical Shape.
+    /// </summary>
+    [System.ComponentModel.ToolboxItem(false), System.ComponentModel.DesignTimeVisible(false), TypeConverter(typeof(EllipticalShapeDescriptorConverter))]
+    public class EllipticalShapeDescriptor : ShapeDescriptor
+    {
+        public override System.Drawing.Drawing2D.GraphicsPath GetShape(Rectangle bounds)
+        {
+            GraphicsPath path = new GraphicsPath();
+            path.AddEllipse(bounds);
+            return path;
+        }
+
+        public override System.Drawing.Drawing2D.GraphicsPath GetInnerShape(Rectangle bounds, int borderSize)
+        {
+            return GetShape(bounds);
+        }
+
+        public override bool CanDrawShape(Rectangle bounds)
+        {
+            return bounds.Width > 2 && bounds.Height > 2;
+        }
+    }
+
+    /// <summary>
+    /// Represents EllipticalShapeDescriptor object converter.
+    /// </summary>
+    public class EllipticalShapeDescriptorConverter : TypeConverter
+    {
+        public EllipticalShapeDescriptorConverter() { }
+
+        public override bool CanConvertTo(ITypeDescriptorContext context, Type destinationType)
+        {
+            if (destinationType == typeof(InstanceDescriptor))
+                return true;
+            return base.CanConvertTo(context, destinationType);
+        }
+
+        public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+        {
+            if (destinationType == null)
+                throw new ArgumentNullException("destinationType");
+
+            if ((destinationType == typeof(InstanceDescriptor)) && (value is EllipticalShapeDescriptor))
+            {
+                EllipticalShapeDescriptor doc = (EllipticalShapeDescriptor)value;
+                Type[] constructorParams = null;
+                MemberInfo constructorMemberInfo = null;
+                object[] constructorValues = null;
+
+                constructorParams = new Type[0];
+                constructorMemberInfo = typeof(EllipticalShapeDescriptor).GetConstructor(constructorParams);
+                constructorValues = new object[0];
+
+                if (constructorMemberInfo != null)
+                {
+                    return new InstanceDescriptor(constructorMemberInfo, constructorValues);
+                }
+            }
+
+            return base.ConvertTo(context, culture, value, destinationType);
+        }
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Enums.cs b/PROMS/DotNetBar Source Code/Enums.cs
new file mode 100644
index 00000000..50c419cc
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Enums.cs	
@@ -0,0 +1,1603 @@
+using System;
+using System.Drawing;
+using System.Windows.Forms;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Specifies the appearance of a item.
+	/// </summary>
+    public enum eDotNetBarStyle : int
+    {
+        OfficeXP = 0,
+        Office2000 = 1,
+        Office2003 = 2,
+        VS2005 = 3,
+        Office2007 = 4,
+        Office2010 = 5,
+        Windows7 = 6,
+        Metro = 7,
+        Office2013 = Metro,
+        OfficeMobile2014 = 8,
+        StyleManagerControlled = 9
+    }
+
+    /// <summary>
+    /// Specifies the CrumbBar control style.
+    /// </summary>
+    public enum eCrumbBarStyle : int
+    {
+        Office2007 = 4, // Same as eDotNetBarStyle
+        Vista = 5
+    }
+
+	/// <summary>
+	/// Specifies the Bar state.
+	/// </summary>
+	public enum eBarState:int
+	{
+		Popup=0,
+		Floating=1,
+		Docked=2,
+		AutoHide=3
+	}
+
+	/// <summary>
+	/// Specifies the Bar grab handle style.
+	/// </summary>
+	public enum eGrabHandleStyle:int
+	{
+		None=0,
+		Single=1,
+		Dotted=2,
+		Double=3,
+		DoubleThin=4,
+		DoubleFlat=5,
+		Stripe=6,
+		StripeFlat=7,
+		Caption=8,
+		ResizeHandle=9,
+		Office2003=10,
+		Office2003SingleDot=11,
+		CaptionTaskPane=12,
+        CaptionDotted = 13
+	}
+
+	/// <summary>
+	/// Specifies the Orientation of the item within container.
+	/// </summary>
+	public enum eOrientation:int
+	{
+		Horizontal=0,
+		Vertical=1
+	}
+
+    /// <summary>
+    /// Specifies the design-marker orientation for the item.
+    /// </summary>
+    public enum eDesignMarkerOrientation
+    {
+        NotSet,
+        Horizontal,
+        Vertical
+    }
+
+	/// <summary>
+	/// Specifies the supported orientations by the item.
+	/// </summary>
+	public enum eSupportedOrientation:int
+	{
+		Both=0,
+		Horizontal=1,
+		Vertical=2
+	}
+
+	/// <summary>
+	/// Specifies the docked Bar border type.
+	/// </summary>
+	public enum eBorderType:int
+	{
+		None=0,
+		SingleLine	=1,
+		DoubleLine	=2,
+		Sunken		=3,
+		Raised		=4,
+        RaisedInner =7,
+		Etched		=5,
+		Bump		=6
+	}
+
+	/// <summary>
+	/// Specifes vertical alignment.
+	/// </summary>
+	public enum eAlignment:int
+	{
+		Top=0,
+		Middle=1,
+		Bottom=2
+	}
+
+	/// <summary>
+	/// Specifies item alignment.
+	/// </summary>
+	public enum eItemAlignment:int
+	{
+		Near=0,
+		Far=1,
+        Center=2
+	}
+
+	/// <summary>
+	/// Specifies the popup type.
+	/// </summary>
+	public enum ePopupType:int
+	{
+		Menu=0,
+		ToolBar=1,
+		Container=2
+	}
+
+	/// <summary>
+	/// Specifies the dock side.
+	/// </summary>
+	public enum eDockSide:int
+	{
+		None=0,
+		Left=1,
+		Right=2,
+		Top=3,
+		Bottom=4,
+		Document=5
+	}
+
+	/// <summary>
+	/// Specifies the item shortcut.
+	/// </summary>
+	public enum eShortcut:int
+	{
+		AltBksp = (System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.Back),// 0x00040008,
+		AltF1 = 0x00040070,
+		AltF10 = 0x00040079,
+		AltF11 = 0x0004007A,
+		AltF12 = 0x0004007B,
+		AltF2 = 0x00040071,
+		AltF3 = 0x00040072,
+		AltF4 = 0x00040073,
+		AltF5 = 0x00040074,
+		AltF6 = 0x00040075,
+		AltF7 = 0x00040076,
+		AltF8 = 0x00040077,
+		AltF9 = 0x00040078,
+		AltLeft = System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.Left,
+		AltRight = System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.Right,
+		AltUp = System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.Up,
+		AltDown = System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.Down,
+		CtrlA = 0x00020041,
+		CtrlB = 0x00020042,
+		CtrlC = 0x00020043,
+		CtrlD = 0x00020044,
+		CtrlDel = 0x0002002E,
+		CtrlE = 0x00020045,
+		CtrlF = 0x00020046,
+		CtrlF1 = 0x00020070,
+		CtrlF11 = 0x0002007A,
+		CtrlF12 = 0x0002007B,
+		CtrlF2 = 0x00020071,
+		CtrlF3 = 0x00020072,
+		CtrlF4 = 0x00020073,
+		CtrlF5 = 0x00020074,
+		CtrlF6 = 0x00020075,
+		CtrlF7 = 0x00020076,
+		CtrlF8 = 0x00020077,
+		CtrlF9 = 0x00020078,
+		CtrlG = 0x00020047,
+		CtrlH = 0x00020048,
+		CtrlI = 0x00020049,
+		CtrlIns = 0x0002002D,
+		CtrlJ = 0x0002004A,
+		CtrlK = 0x0002004B,
+		CtrlL = 0x0002004C,
+		CtrlM = 0x0002004D,
+		CtrlN = 0x0002004E,
+		CtrlO = 0x0002004F,
+		CtrlP = 0x00020050,
+		CtrlQ = 0x00020051,
+		CtrlR = 0x00020052,
+		CtrlS = 0x00020053,
+		CtrlShiftA = 0x00030041,
+		CtrlShiftB = 0x00030042,
+		CtrlShiftC = 0x00030043,
+		CtrlShiftD = 0x00030044,
+		CtrlShiftE = 0x00030045,
+		CtrlShiftF = 0x00030046,
+		CtrlShiftF1 = 0x00030070,
+		CtrlShiftF11 = 0x0003007A,
+		CtrlShiftF12 = 0x0003007B,
+		CtrlShiftF2 = 0x00030071,
+		CtrlShiftF3 = 0x00030072,
+		CtrlShiftF4 = 0x00030073,
+		CtrlShiftF5 = 0x00030074,
+		CtrlShiftF6 = 0x00030075,
+		CtrlShiftF7 = 0x00030076,
+		CtrlShiftF8 = 0x00030077,
+		CtrlShiftF9 = 0x00030078,
+		CtrlShiftG = 0x00030047,
+		CtrlShiftH = 0x00030048,
+		CtrlShiftI = 0x00030049,
+		CtrlShiftJ = 0x0003004A,
+		CtrlShiftK = 0x0003004B,
+		CtrlShiftL = 0x0003004C,
+		CtrlShiftM = 0x0003004D,
+		CtrlShiftN = 0x0003004E,
+		CtrlShiftO = 0x0003004F,
+		CtrlShiftP = 0x00030050,
+		CtrlShiftQ = 0x00030051,
+		CtrlShiftR = 0x00030052,
+		CtrlShiftS = 0x00030053,
+		CtrlShiftT = 0x00030054,
+		CtrlShiftU = 0x00030055,
+		CtrlShiftV = 0x00030056,
+		CtrlShiftW = 0x00030057,
+		CtrlShiftX = 0x00030058,
+		CtrlShiftY = 0x00030059,
+		CtrlShiftZ = 0x0003005A,
+		CtrlLeft = System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Left,
+		CtrlRight = System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Right,
+		CtrlUp = System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Up,
+		CtrlDown = System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Down,
+        CtrlEnter = System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Enter,
+		CtrlT = 0x00020054,
+		CtrlU = 0x00020055,
+		CtrlV = 0x00020056,
+		CtrlW = 0x00020057,
+		CtrlX = 0x00020058,
+		CtrlY = 0x00020059,
+		CtrlZ = 0x0002005A,
+        Ctrl0 = Keys.Control | Keys.D0,
+        Ctrl1 = Keys.Control | Keys.D1,
+        Ctrl2 = Keys.Control | Keys.D2,
+        Ctrl3 = Keys.Control | Keys.D3,
+        Ctrl4 = Keys.Control | Keys.D4,
+        Ctrl5 = Keys.Control | Keys.D5,
+        Ctrl6 = Keys.Control | Keys.D6,
+        Ctrl7 = Keys.Control | Keys.D7,
+        Ctrl8 = Keys.Control | Keys.D8,
+        Ctrl9 = Keys.Control | Keys.D9,
+		Del = 0x0000002E,
+		F1 = 0x00000070,
+		F11 = 0x0000007A,
+		F12 = 0x0000007B,
+		F2 = 0x00000071,
+		F3 = 0x00000072,
+		F4 = 0x00000073,
+		F5 = 0x00000074,
+		F6 = 0x00000075,
+		F7 = 0x00000076,
+		F8 = 0x00000077,
+		F9 = 0x00000078,
+		F10 = System.Windows.Forms.Keys.F10,
+		Ins = 0x0000002D,
+		None = 0x00000000,
+		ShiftDel = 0x0001002E,
+		ShiftF1 = 0x00010070,
+		ShiftF11 = 0x0001007A,
+		ShiftF12 = 0x0001007B,
+		ShiftF2 = 0x00010071,
+		ShiftF3 = 0x00010072,
+		ShiftF4 = 0x00010073,
+		ShiftF5 = 0x00010074,
+		ShiftF6 = 0x00010075,
+		ShiftF7 = 0x00010076,
+		ShiftF8 = 0x00010077,
+		ShiftF9 = 0x00010078,
+		ShiftIns = 0x0001002D,
+		ShiftAltA = System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.A,
+		ShiftAltB = System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.B,
+		ShiftAltC = System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.C,
+		ShiftAltD = System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.D,
+		ShiftAltE = System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.E,
+		ShiftAltF = System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F,
+		ShiftAltF1 = System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F1,
+		ShiftAltF11 = System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F11,
+		ShiftAltF12 = System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F12,
+		ShiftAltF2 = System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F2,
+		ShiftAltF3 = System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F3,
+		ShiftAltF4 = System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F4,
+		ShiftAltF5 = System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F5,
+		ShiftAltF6 = System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F6,
+		ShiftAltF7 = System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F7,
+		ShiftAltF8 = System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F8,
+		ShiftAltF9 = System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F9,
+		ShiftAltG = System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.G,
+		ShiftAltH = System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.H,
+		ShiftAltI = System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.I,
+		ShiftAltJ = System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.J,
+		ShiftAltK = System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.K,
+		ShiftAltL = System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.L,
+		ShiftAltM = System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.M,
+		ShiftAltN = System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.N,
+		ShiftAltO = System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.O,
+		ShiftAltP = System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.P,
+		ShiftAltQ = System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.Q,
+		ShiftAltR = System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.R,
+		ShiftAltS = System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.S,
+		ShiftAltT = System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.T,
+		ShiftAltU = System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.U,
+		ShiftAltV = System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.V,
+		ShiftAltW = System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.W,
+		ShiftAltX = System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.X,
+		ShiftAltY = System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.Y,
+		ShiftAltZ = System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.Z,
+		AltEnter= System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.Enter
+	}
+
+	internal enum SystemButton:int
+	{
+		None=-1,
+		Minimize=System.Windows.Forms.CaptionButton.Minimize,
+		Restore=System.Windows.Forms.CaptionButton.Restore,
+		Close=System.Windows.Forms.CaptionButton.Close,
+		Help=System.Windows.Forms.CaptionButton.Help,
+		Maximize=System.Windows.Forms.CaptionButton.Maximize,
+		NextWindow=10
+	}
+
+	/// <summary>
+	/// Specifies the item menu visibility.
+	/// </summary>
+	public enum eMenuVisibility:int
+	{
+		VisibleAlways=0,
+		VisibleIfRecentlyUsed=1
+	}
+
+	/// <summary>
+	/// Specifies the item behavior personalized menus.
+	/// </summary>
+	public enum ePersonalizedMenus:int
+	{
+		Disabled=0,
+		DisplayOnHover=1,
+		DisplayOnClick=2,
+		Both=3
+	}
+
+	/// <summary>
+	/// Specifies the popup animation.
+	/// </summary>
+	public enum ePopupAnimation:int
+	{
+		None=0,
+		ManagerControlled=1,
+		Slide=2,
+		Unfold=3,
+		Fade=4,
+		Random=5,
+		SystemDefault=6
+	}
+
+	/// <summary>
+	/// Specifies ButtonItem style.
+	/// </summary>
+	public enum eButtonStyle:int
+	{
+		Default=0,				// Default style, Image and Text on menus, Image on Bar
+		TextOnlyAlways=1,		// Text always everywhere
+		ImageAndText=2			// Always display Image and text
+	}
+
+	/// <summary>
+	/// Specifies the image position.
+	/// </summary>
+	public enum eImagePosition:int
+	{
+		Left=0,
+		Right=1,
+		Top=2,
+		Bottom=3
+	}
+
+	/// <summary>
+	/// Specifies the hot tracking style for buttons.
+	/// </summary>
+	public enum eHotTrackingStyle:int
+	{
+		Default=0,
+		Color=1,
+		None=2,
+		Image=3
+	}
+
+	/// <summary>
+	/// Specifies the menu drop shadow.
+	/// </summary>
+	public enum eMenuDropShadow:int
+	{
+		SystemDefault=0,
+		Show=1,
+		Hide=2
+	}
+
+	/// <summary>
+	/// Specifies the image size for the items on the Bar.
+	/// </summary>
+	public enum eBarImageSize:int
+	{
+		Default=0,
+		Medium=1,
+		Large=2
+	}
+    /// <summary>
+    /// Specifies button image list selection.
+    /// </summary>
+    public enum eButtonImageListSelection:int
+    {
+        NotSet = -1,
+        Default = 0,
+        Medium = 1,
+        Large = 2
+    }
+
+
+	internal enum eDesignInsertPosition
+	{
+		None=0,
+		Before=1,
+		After=2
+	}
+
+	public enum eLayoutType:int
+	{
+		Toolbar=0,
+		TaskList=1,
+		DockContainer=2
+	}
+
+	public enum eBackgroundImagePosition:int
+	{
+		/// <summary>
+		/// Indicates that image is stretched to fill the container space.
+		/// </summary>
+		Stretch=0,
+		/// <summary>
+		/// Image is centered inside of container space.
+		/// </summary>
+		Center=1,
+		/// <summary>
+		/// Image is tiled to fill container space.
+		/// </summary>
+		Tile=2,
+		/// <summary>
+		/// Image is drawn in top left corner of container space.
+		/// </summary>
+		TopLeft=3,
+		/// <summary>
+		/// Image is drawn in top right corner of container space.
+		/// </summary>
+		TopRight=4,
+		/// <summary>
+		/// Image is drawn in bottom left corner of container space.
+		/// </summary>
+		BottomLeft=5,
+		/// <summary>
+		/// Image is drawn in bottom right corner of container space.
+		/// </summary>
+		BottomRight=6,
+        /// <summary>
+        /// Image is drawn on the left side in the middle of the container space.
+        /// </summary>
+        CenterLeft = 7,
+        /// <summary>
+        /// Image is drawn on the right side in the middle of the container space.
+        /// </summary>
+        CenterRight = 8,
+	}
+
+	public enum eExplorerBarStockStyle:int
+	{
+		Blue=0,
+		BlueSpecial=1,
+		OliveGreen=2,
+		OliveGreenSpecial=3,
+		Silver=4,
+		SilverSpecial=5,
+        SystemColors = 98,
+		Custom=99
+	}
+
+	public enum eMouseState:int
+	{
+		None=0,
+		Hot=1,
+		Down=2
+	}
+
+	internal enum ImageState:int
+	{
+		Default=0,
+		Disabled=1,
+		Hover=2,
+		Pressed=3
+	}
+	
+	/// <summary>
+	/// Specifies the sides of a rectangle to apply a border to.
+	/// </summary>
+	[System.Flags()]
+	public enum eBorderSide
+	{
+		/// <summary>
+		/// No Border.
+		/// </summary>
+		None=0,
+		/// <summary>
+		/// Border on the Left edge.
+		/// </summary>
+		Left=1,
+		/// <summary>
+		/// Border on the Right edge.
+		/// </summary>
+		Right=2,
+		/// <summary>
+		/// Border on the Top edge.
+		/// </summary>
+		Top=4,
+		/// <summary>
+		/// Border on the Bottom edge.
+		/// </summary>
+		Bottom=8,
+		/// <summary>
+		/// Border on all 4 sides.
+		/// </summary>
+		All=(Left | Right | Top | Bottom)
+	}
+
+	/// <summary>
+	/// Specifies appearance type of the Side Bar control.
+	/// </summary>
+	public enum eSideBarAppearance
+	{
+		/// <summary>
+		/// Traditional Side Bar appearance with 3D panels.
+		/// </summary>
+		Traditional,
+		/// <summary>
+		/// Improved Flat Side Bar appearance with extended appearance options.
+		/// </summary>
+		Flat
+	}
+
+	/// <summary>
+	/// Specifies predefined side bar color scheme.
+	/// </summary>
+	public enum eSideBarColorScheme
+	{
+		SystemColors,
+		Blue,
+		Silver,
+		Green,
+		Orange,
+		Red,
+		LightBlue,
+		Money,
+		Brick,
+		Wheat,
+		Storm,
+		Spruce,
+		Slate,
+		Rose,
+		Fire,
+		Pumpkin,
+		Plum,
+		Marine,
+		Sunset
+	}
+
+	/// <summary>
+	/// Specifies the side popup is displayed in relation to it's parent.
+	/// </summary>
+	public enum ePopupSide
+	{
+		Default=0,
+		Left=1,
+		Right=2,
+		Top=3,
+		Bottom=4
+	}
+
+	/// <summary>
+	/// Indicates layout type used for items within side bar panel.
+	/// </summary>
+	public enum eSideBarLayoutType
+	{
+		/// <summary>
+		/// Default layout all items arranged in one column.
+		/// </summary>
+		Default=0,
+		/// <summary>
+		/// Items arranged in multiple columns determined by the width of the panel.
+		/// </summary>
+		MultiColumn=1
+	}
+
+	/// <summary>
+	/// Indicates color scheme assigned to the tab item.
+	/// </summary>
+    public enum eTabItemColor
+    {
+        Default = 0,
+
+        Blue = 1,
+        Yellow = 2,
+        Green = 3,
+        Red = 4,
+        Purple = 5,
+        Cyan = 6,
+        Orange = 7,
+        Magenta = 8,
+        BlueMist = 9,
+        PurpleMist = 10,
+        Tan = 11,
+        Lemon = 12,
+        Apple = 13,
+        Teal = 14,
+        Silver = 15,
+
+        OfficeMobile2014Teal = 16,
+        OfficeMobile2014Blue = 17,
+        OfficeMobile2014Gold = 18,
+        OfficeMobile2014Green = 19,
+        OfficeMobile2014Coral = 20,
+        OfficeMobile2014Lilac = 21,
+        OfficeMobile2014Orange = 22,
+        OfficeMobile2014Pink = 23,
+    }
+
+	/// <summary>
+	/// Indicates the action end user took during toolbar/menubar customization.
+	/// </summary>
+	public enum eEndUserCustomizeAction
+	{
+		/// <summary>
+		/// User has changed the visibility of the bar.
+		/// </summary>
+		BarVisibilityChanged,
+		/// <summary>
+		/// Indicates that item visibility has changed i.e. it's visible property.
+		/// </summary>
+		ItemVisibilityChanged,
+		/// <summary>
+		/// Indicates that an item has been moved to different location.
+		/// </summary>
+		ItemMoved,
+		/// <summary>
+		/// Indicates that an item has been removed from the bar.
+		/// </summary>
+		ItemDeleted,
+		/// <summary>
+		/// Indicates that item's text has been changed.
+		/// </summary>
+		ItemTextChanged,
+		/// <summary>
+		/// Indicates that style of the button i.e. ButtonStyle property has changed.
+		/// </summary>
+		ItemStyleChanged,
+		/// <summary>
+		/// Indicates that item's BeginGroup property has changed.
+		/// </summary>
+		ItemBeginGroupChanged,
+		/// <summary>
+		/// Indicates that user has created a new bar.
+		/// </summary>
+		NewBarCreated,
+		/// <summary>
+		/// Indicates that user has renamed the bar i.e. changed it's Text property.
+		/// </summary>
+		BarRenamed,
+		/// <summary>
+		/// Indicates that user has deleted the bar.
+		/// </summary>
+		BarDeleted
+	}
+
+	/// <summary>
+	/// Specifies the type of the layout for tabs.
+	/// </summary>
+	public enum eTabLayoutType
+	{
+		/// <summary>
+		/// Tabs are auto-sized to fit the width of the container.
+		/// </summary>
+		FitContainer,
+		/// <summary>
+		/// Tab's width is calculated based on the image and text and navigation box is displayed
+		/// when tabs cannot fit the container.
+		/// </summary>
+		FixedWithNavigationBox,
+		/// <summary>
+		/// Tab are wrapping on multiple lines based on the width and navigation box is displayed.
+		/// </summary>
+		MultilineWithNavigationBox,
+		/// <summary>
+		/// Tab are wrapping on multiple lines based on the width and NO navigation box is displayed.
+		/// </summary>
+		MultilineNoNavigationBox
+	}
+
+	/// <summary>
+	/// Indicates the corner type.
+	/// </summary>
+	public enum eCornerType
+	{
+		/// <summary>
+		/// Inherits setting if applies.
+		/// </summary>
+		Inherit,
+		/// <summary>
+		/// Specifies square corner.
+		/// </summary>
+		Square,
+		/// <summary>
+		/// Specifies rounded corner.
+		/// </summary>
+		Rounded,
+		/// <summary>
+		/// Specifies diagonal corner.
+		/// </summary>
+		Diagonal
+	}
+
+	/// <summary>
+	/// Specifies the action that raised a event
+	/// </summary>
+	public enum eEventSource
+	{
+		/// <summary>
+		/// The event was caused by a keystroke.
+		/// </summary>
+		Keyboard,
+		/// <summary>
+		/// The event was caused by a mouse operation.
+		/// </summary>
+		Mouse,
+		/// <summary>
+		/// The event is caused programmatically from user code.
+		/// </summary>
+		Code
+	}
+
+	/// <summary>
+	/// Specifies the button alignment inside of the BubbleBar.
+	/// </summary>
+	public enum eBubbleButtonAlignment
+	{
+		/// <summary>
+		/// Buttons are aligned to the top and arranged horizontally.
+		/// </summary>
+		Top,
+		/// <summary>
+		/// Buttons are aligned to the bottom and arranged horizontally.
+		/// </summary>
+		Bottom,
+//		/// <summary>
+//		/// Buttons are aligned to the left and arranged vertically.
+//		/// </summary>
+//		Left,
+//		/// <summary>
+//		/// Buttons are aligned to the right and arranged vertically.
+//		/// </summary>
+//		Right
+	}
+
+	/// <summary>Specifies the way background image is displayed on background.</summary>
+	public enum eStyleBackgroundImage:int
+	{
+		/// <summary>Image is stretched to fill the background</summary>
+		Stretch=0,
+		/// <summary>Image is centered inside the background</summary>
+		Center=1,
+		/// <summary>Image is tiled inside the background</summary>
+		Tile=2,
+		/// <summary>
+		/// Image is drawn in top left corner of container space.
+		/// </summary>
+		TopLeft=3,
+		/// <summary>
+		/// Image is drawn in top right corner of container space.
+		/// </summary>
+		TopRight=4,
+		/// <summary>
+		/// Image is drawn in bottom left corner of container space.
+		/// </summary>
+		BottomLeft=5,
+		/// <summary>
+		/// Image is drawn in bottom right corner of container space.
+		/// </summary>
+		BottomRight=6,
+        /// <summary>
+        /// Imaged is centered and fills the control but aspect ratio is unchanged.
+        /// </summary>
+        Zoom
+	}
+
+	/// <summary>
+	/// Specifies the border type for style element.
+	/// </summary>
+	public enum eStyleBorderType:int
+	{
+		/// <summary>Indicates no border</summary>
+		None,
+		/// <summary>Border is a solid line</summary>
+		Solid,
+		/// <summary>Border is a solid dash line</summary>
+		Dash,
+		/// <summary>Border is solid dash-dot line</summary>
+		DashDot,
+		/// <summary>Border is solid dash-dot-dot line</summary>
+		DashDotDot,
+		/// <summary>Border consists of dots</summary>
+		Dot,
+        /// <summary>Border consists light and dark part creating an etched effect</summary>
+        Etched,
+        /// <summary>Border consists dark and light part. Light part is the inside border.</summary>
+        Double
+	}
+
+	/// <summary>
+	/// Specifies the alignment of a text string relative to its element's rectangle.
+	/// </summary>
+	public enum eStyleTextAlignment
+	{
+		/// <summary>
+		/// Specifies the text be aligned near from the origin position of the element's rectangle. In a left-to-right layout, the near position is left. In a right-to-left layout, the near position is right.
+		/// </summary>
+		Near=System.Drawing.StringAlignment.Near,
+		/// <summary>
+		/// Specifies that text is aligned in the center of the element's rectangle.
+		/// </summary>
+		Center=System.Drawing.StringAlignment.Center,
+		/// <summary>
+		/// Specifies that text is aligned far from the origin position of the element's rectangle. In a left-to-right layout, the far position is right. In a right-to-left layout, the far position is left.
+		/// </summary>
+		Far=System.Drawing.StringAlignment.Far
+	}
+
+	/// <summary>
+	/// Specifies how to trim characters from a text that does not completely fit into a element's shape.
+	/// </summary>
+	public enum eStyleTextTrimming
+	{
+		/// <summary>
+		/// Specifies that the text is trimmed to the nearest character.
+		/// </summary>
+		Character=System.Drawing.StringTrimming.Character,
+		/// <summary>
+		/// Specifies that the text is trimmed to the nearest character, and an ellipsis is inserted at the end of a trimmed line.
+		/// </summary>
+		EllipsisCharacter=System.Drawing.StringTrimming.EllipsisCharacter,
+		/// <summary>
+		/// The center is removed from trimmed lines and replaced by an ellipsis. The algorithm keeps as much of the last slash-delimited segment of the line as possible.
+		/// </summary>
+		EllipsisPath=System.Drawing.StringTrimming.EllipsisPath,
+		/// <summary>
+		/// Specifies that text is trimmed to the nearest word, and an ellipsis is inserted at the end of a trimmed line.
+		/// </summary>
+		EllipsisWord=System.Drawing.StringTrimming.EllipsisWord,
+		/// <summary>
+		/// Specifies no trimming.
+		/// </summary>
+		None=System.Drawing.StringTrimming.None,
+		/// <summary>
+		/// Specifies that text is trimmed to the nearest word.
+		/// </summary>
+		Word=System.Drawing.StringTrimming.Word
+	}
+
+    /// <summary>
+    /// Specifies the alignment of buttons in title bar.
+    /// </summary>
+    public enum eTitleButtonAlignment
+    {
+        /// <summary>
+        /// Buttons are left aligned.
+        /// </summary>
+        Left=0,
+        /// <summary>
+        /// Buttons are right aligned.
+        /// </summary>
+        Right=1
+    }
+
+	/// <summary>
+	/// Indicates white-space part of the style.
+	/// </summary>
+	[Flags()]
+	public enum eSpacePart
+	{
+		/// <summary>
+		/// Represents style padding.
+		/// </summary>
+		Padding=1,
+		/// <summary>
+		/// Represents style border.
+		/// </summary>
+		Border=2,
+		/// <summary>
+		/// Represents style margin.
+		/// </summary>
+		Margin=4
+	}
+	
+	/// <summary>
+	/// Indicates the style side.
+	/// </summary>
+	public enum eStyleSide
+	{
+		/// <summary>
+		/// Specifies left side of the style.
+		/// </summary>
+		Left,
+		/// <summary>
+		/// Specifies right side of the style.
+		/// </summary>
+		Right,
+		/// <summary>
+		/// Specifies top side of the style.
+		/// </summary>
+		Top,
+		/// <summary>
+		/// Specifies bottom side of the style.
+		/// </summary>
+		Bottom
+	}
+
+	/// <summary>
+	/// Specifies the button state.
+	/// </summary>
+	public enum eButtonState
+	{
+		/// <summary>
+		/// Button is in it's default state.
+		/// </summary>
+		Normal,
+		/// <summary>
+		/// Button is disabled
+		/// </summary>
+		Disabled,
+		/// <summary>
+		/// Mouse is over the button
+		/// </summary>
+		MouseOver,
+		/// <summary>
+		/// Left mouse button is pressed
+		/// </summary>
+		MouseDownLeft,
+		/// <summary>
+		/// Right mouse button is pressed
+		/// </summary>
+		MouseDownRight,
+        /// <summary>
+        /// Button is hidden.
+        /// </summary>
+        Hidden
+	}
+
+    /// <summary>
+    /// Indicates predefined color scheme assigned to super tooltip.
+    /// </summary>
+    public enum eTooltipColor
+    {
+        Default,
+        Blue,
+        Yellow,
+        Green,
+        Red,
+        Purple,
+        Cyan,
+        Orange,
+        Magenta,
+        BlueMist,
+        PurpleMist,
+        Tan,
+        Lemon,
+        Apple,
+        Teal,
+        Silver,
+        Office2003,
+        Gray,
+        System
+    }
+
+    /// <summary>
+    /// Specifies predefined color assigned to ribbon items.
+    /// </summary>
+    public enum eRibbonTabColor
+    {
+        Default,
+        Magenta,
+        Orange,
+        Green
+    }
+
+    /// <summary>
+    /// Specifies predefined color assigned to ribbon tab groups.
+    /// </summary>
+    public enum eRibbonTabGroupColor
+    {
+        Default,
+        Magenta,
+        Orange,
+        Green
+    }
+
+    /// <summary>
+    /// Specifies the state of the Wizard button.
+    /// </summary>
+    public enum eWizardButtonState
+    {
+        True,
+        False,
+        Auto
+    }
+
+    /// <summary>
+    /// Specifies the button that caused the wizard page change.
+    /// </summary>
+    public enum eWizardPageChangeSource
+    {
+        /// <summary>
+        /// Page change was started using Wizard Back button.
+        /// </summary>
+        BackButton,
+        /// <summary>
+        /// Page change was started using Wizard Next button.
+        /// </summary>
+        NextButton,
+        /// <summary>
+        /// Page change was started from code.
+        /// </summary>
+        Code
+    }
+
+    /// <summary>
+    /// Specifies wizard button that is clicked when the user presses the ENTER key.
+    /// </summary>
+    public enum eWizardFormAcceptButton
+    {
+        /// <summary>
+        /// If finish button is enabled and visible it will be clicked otherwise click next button
+        /// </summary>
+        FinishAndNext,
+        /// <summary>
+        /// Click finish button
+        /// </summary>
+        Finish,
+        /// <summary>
+        /// Click next button
+        /// </summary>
+        Next,
+        /// <summary>
+        /// No button will be clicked
+        /// </summary>
+        None
+    }
+
+    /// <summary>
+    /// Specifies wizard button that is clicked when the user presses the Escape key.
+    /// </summary>
+    public enum eWizardFormCancelButton
+    {
+        /// <summary>
+        /// Cancel button will be clicked
+        /// </summary>
+        Cancel,
+        /// <summary>
+        /// No button will be clicked
+        /// </summary>
+        None
+    }
+
+    /// <summary>
+    /// Specifies border around ColorItem.
+    /// </summary>
+    [System.Flags()]
+	public enum eColorItemBorder
+	{
+		/// <summary>
+		/// No Border.
+		/// </summary>
+		None=0,
+		/// <summary>
+		/// Border on the Left edge.
+		/// </summary>
+		Left=1,
+		/// <summary>
+		/// Border on the Right edge.
+		/// </summary>
+		Right=2,
+		/// <summary>
+		/// Border on the Top edge.
+		/// </summary>
+		Top=4,
+		/// <summary>
+		/// Border on the Bottom edge.
+		/// </summary>
+		Bottom=8,
+		/// <summary>
+		/// Border on all 4 sides.
+		/// </summary>
+		All=(Left | Right | Top | Bottom)
+	}
+
+    /// <summary>
+    /// Specifies the line alignment of the items inside of the container.
+    /// </summary>
+    public enum eContainerVerticalAlignment
+    {
+        /// <summary>
+        /// Items are aligned to the top.
+        /// </summary>
+        Top,
+        /// <summary>
+        /// Items are aligned to the middle point of the line.
+        /// </summary>
+        Middle,
+        /// <summary>
+        /// Items are aligned to the bottom.
+        /// </summary>
+        Bottom
+    }
+
+    /// <summary>
+    /// Specifies the alignment of the items inside of the container in horizontal layout.
+    /// </summary>
+    public enum eHorizontalItemsAlignment
+    {
+        /// <summary>
+        /// Items are left aligned.
+        /// </summary>
+        Left,
+        /// <summary>
+        /// Items are centered.
+        /// </summary>
+        Center,
+        /// <summary>
+        /// Items are right aligned.
+        /// </summary>
+        Right
+    }
+
+    /// <summary>
+    /// Specifies the alignment of the items inside of the container in vertical layout.
+    /// </summary>
+    public enum eVerticalItemsAlignment
+    {
+        /// <summary>
+        /// Items are top aligned.
+        /// </summary>
+        Top,
+        /// <summary>
+        /// Items are in the middle.
+        /// </summary>
+        Middle,
+        /// <summary>
+        /// Items are Bottom aligned.
+        /// </summary>
+        Bottom
+    }
+
+    /// <summary>
+    /// Specifies the rendering mode used by a user interface element.
+    /// </summary>
+    public enum eRenderMode
+    {
+        /// <summary>
+        /// Indicates that rendering on user interface element instance set through Renderer property is used.
+        /// </summary>
+        Instance,
+        /// <summary>
+        /// Indicates that global application wide renderer is used as specified by GlobalManager.Renderer property.
+        /// </summary>
+        Global,
+        /// <summary>
+        /// Indicates that custom rendered will be used for an user interface element. Renderer property must be set when using this value to the renderer
+        /// that will be used.
+        /// </summary>
+        Custom
+    }
+
+    /// <summary>
+    /// Specifies the predefined color table for button.
+    /// </summary>
+    public enum eButtonColor
+    {
+        Blue,
+        BlueWithBackground,
+        Orange,
+        OrangeWithBackground,
+        Magenta,
+        MagentaWithBackground,
+        Office2007WithBackground,
+        BlueOrb,
+        Flat
+    }
+
+    /// <summary>
+    /// Specifies the color table used to render ProgressBarItem in Office 2007 style.
+    /// </summary>
+    public enum eProgressBarItemColor
+    {
+        /// <summary>
+        /// Indicates default Normal color table, usually green.
+        /// </summary>
+        Normal,
+        /// <summary>
+        /// Indicates Pause state color table, usually yellow.
+        /// </summary>
+        Paused,
+        /// <summary>
+        /// Indicates Error state color table, usually red.
+        /// </summary>
+        Error
+    }
+
+    /// <summary>
+    /// Specifies the position of ribbon title.
+    /// </summary>
+    public enum eRibbonTitlePosition
+    {
+        /// <summary>
+        /// Title is positioned on the top of the ribbon.
+        /// </summary>
+        Top,
+        /// <summary>
+        /// Title is positioned on the bottom of the ribbon.
+        /// </summary>
+        Bottom
+    }
+
+    /// <summary>
+    /// Specifies text alignment on the button.
+    /// </summary>
+    public enum eButtonTextAlignment
+    {
+        /// <summary>
+        /// Specifies the left aligned text.
+        /// </summary>
+        Left,
+        /// <summary>
+        /// Specifies the center aligned text.
+        /// </summary>
+        Center,
+        /// <summary>
+        /// Specifies the right aligned text.
+        /// </summary>
+        Right
+    }
+
+    /// <summary>
+    /// Specifies the position of the tab close button.
+    /// </summary>
+    public enum eTabCloseButtonPosition
+    {
+        /// <summary>
+        /// Close button is on the left side of the tab.
+        /// </summary>
+        Left,
+        /// <summary>
+        /// Close button is on the right side of the tab.
+        /// </summary>
+        Right
+    }
+
+    /// <summary>
+    /// Describes the bar type.
+    /// </summary>
+    public enum eBarType
+    {
+        /// <summary>
+        /// Indicates that bar is toolbar.
+        /// </summary>
+        Toolbar,
+        /// <summary>
+        /// Indicates that bar is menu bar.
+        /// </summary>
+        MenuBar,
+        /// <summary>
+        /// Indicates that bar is status bar.
+        /// </summary>
+        StatusBar,
+        /// <summary>
+        /// Indicates that bar is dock window.
+        /// </summary>
+        DockWindow
+    }
+
+    /// <summary>
+    /// Describes the categorization mode used to categorize items on the Customize Ribbon dialog.
+    /// </summary>
+    public enum eCategorizeMode
+    {
+        /// <summary>
+        /// Items are automatically categorized by the ribbon bar they appear on.
+        /// </summary>
+        RibbonBar,
+        /// <summary>
+        /// Items are categorized by the Category property on each item. Category property should be set on each item.
+        /// </summary>
+        Categories
+    }
+
+    /// <summary>
+    /// Describes the check-box item appearance style
+    /// </summary>
+    public enum eCheckBoxStyle
+    {
+        /// <summary>
+        /// Standard check-box style.
+        /// </summary>
+        CheckBox,
+        /// <summary>
+        /// Radio button style. Only one button can be selected/checked in given container.
+        /// </summary>
+        RadioButton
+    }
+
+    /// <summary>
+    /// Indicates the position of the check box sign related to the text for CheckBoxItem.
+    /// </summary>
+    public enum eCheckBoxPosition
+    {
+        /// <summary>
+        /// Check box sign is positioned on the left side of the text.
+        /// </summary>
+        Left,
+        /// <summary>
+        /// Check box sign is positioned on the right side of the text.
+        /// </summary>
+        Right,
+        /// <summary>
+        /// Check box sign is positioned above the text.
+        /// </summary>
+        Top,
+        /// <summary>
+        /// Check box sing is positioned below the text
+        /// </summary>
+        Bottom
+    }
+
+    /// <summary>
+    /// Indicates the type of the progress bar.
+    /// </summary>
+    public enum eProgressItemType
+    {
+        /// <summary>
+        /// Standard step based progress bar.
+        /// </summary>
+        Standard,
+        /// <summary>
+        /// The automatically moving progress bar.
+        /// </summary>
+        Marquee
+    }
+
+    /// <summary>
+    /// Defines the direction of collapsing/expanding 
+    /// </summary>
+    public enum eCollapseDirection
+    {
+        /// <summary>
+        /// Control is collapsed from bottom to top.
+        /// </summary>
+        BottomToTop,
+        /// <summary>
+        /// Control is collapsed from top to bottom.
+        /// </summary>
+        TopToBottom,
+        /// <summary>
+        /// Control is collapsed from right to left.
+        /// </summary>
+        RightToLeft,
+        /// <summary>
+        /// Control is collapsed from left to right.
+        /// </summary>
+        LeftToRight
+    }
+
+    /// <summary>
+    /// Describes the scroll bar skinning applied to the controls.
+    /// </summary>
+    public enum eScrollBarSkin
+    {
+        /// <summary>
+        /// No scrollbar skinning is applied to the control.
+        /// </summary>
+        None,
+        /// <summary>
+        /// Optimized scrollbar skinning algorithm is used. Might provide better appearance in certain scenarios.
+        /// </summary>
+        Optimized,
+        /// <summary>
+        /// Unoptimized scrollbar skinning algorithm is used. Might provide better appearance in certain scenarios.
+        /// </summary>
+        Unoptimized
+    }
+
+    /// <summary>
+    /// Indicates the position of the slider label text related to the slider part.
+    /// </summary>
+    public enum eSliderLabelPosition
+    {
+        /// <summary>
+        /// Label is positioned on the left side of the slider.
+        /// </summary>
+        Left,
+        /// <summary>
+        /// Label is positioned on the right side of the slider.
+        /// </summary>
+        Right,
+        /// <summary>
+        /// Label is positioned above the slider.
+        /// </summary>
+        Top,
+        /// <summary>
+        /// Label is positioned below the slider.
+        /// </summary>
+        Bottom
+    }
+
+    /// <summary>
+    /// Defines the slider item parts.
+    /// </summary>
+    public enum eSliderPart
+    {
+        /// <summary>
+        /// Indicates no part.
+        /// </summary>
+        None,
+        /// <summary>
+        /// Indicates the increase button of slider control.
+        /// </summary>
+        IncreaseButton,
+        /// <summary>
+        /// Indicates the decrease button of slider control.
+        /// </summary>
+        DecreaseButton,
+        /// <summary>
+        /// Indicates the label part of slider control.
+        /// </summary>
+        Label,
+        /// <summary>
+        /// Indicates the track area part of the control.
+        /// </summary>
+        TrackArea
+    }
+
+    /// <summary>
+    /// Specifies the position of the title image.
+    /// </summary>
+    public enum eTitleImagePosition
+    {
+        /// <summary>
+        /// Image is positioned on the left side.
+        /// </summary>
+        Left,
+        /// <summary>
+        /// Image is centered.
+        /// </summary>
+        Center,
+        /// <summary>
+        /// Image is positioned on the right side.
+        /// </summary>
+        Right
+    }
+
+    /// <summary>
+    /// Specifies the Wizard control Appearance.
+    /// </summary>
+    public enum eWizardStyle
+    {
+        /// <summary>
+        /// Indicates default Wizard 97 style.
+        /// </summary>
+        Default,
+        /// <summary>
+        /// Indicates the Office 2007 Style Wizard Appearance.
+        /// </summary>
+        Office2007
+    }
+
+    /// <summary>
+    /// Specifies wizard title image alignment
+    /// </summary>
+    public enum eWizardTitleImageAlignment
+    {
+        /// <summary>
+        /// Image is aligned to left
+        /// </summary>
+        Left,
+        /// <summary>
+        /// Image is aligned to right
+        /// </summary>
+        Right
+    }
+
+    /// <summary>
+    /// Specifies the behaviour used to hide watermark.
+    /// </summary>
+    public enum eWatermarkBehavior
+    {
+        /// <summary>
+        /// Watermark for control is hidden when control receives the input focus.
+        /// </summary>
+        HideOnFocus,
+        /// <summary>
+        /// Watermark for control is hidden when control has non-empty input value.
+        /// </summary>
+        HideNonEmpty
+    }
+
+    /// <summary>
+    /// Specifies the advanced ScrollBar appearance.
+    /// </summary>
+    public enum eScrollBarAppearance
+    {
+        /// <summary>
+        /// Default scroll bar appearance.
+        /// </summary>
+        Default,
+        /// <summary>
+        /// Office 2007 style Application scroll bar appearance.
+        /// </summary>
+        ApplicationScroll
+    }
+
+    /// <summary>
+    /// Defines text position in relation to the content of the item..
+    /// </summary>
+    public enum eTextPosition
+    {
+        /// <summary>
+        /// Text is positioned to the left of the content.
+        /// </summary>
+        Left,
+        /// <summary>
+        /// Text is positioned to the right of the content.
+        /// </summary>
+        Right,
+        /// <summary>
+        /// Text is positioned on top of the content.
+        /// </summary>
+        Top,
+        /// <summary>
+        /// Text is positioned on bottom of the content.
+        /// </summary>
+        Bottom
+    }
+    /// <summary>
+    /// Defines position for the notification mark
+    /// </summary>
+    public enum eNotificationMarkPosition
+    {
+        TopLeft,
+        TopRight,
+        BottomLeft,
+        BottomRight
+    }
+
+    /// <summary>
+    /// Defines available symbol sets.
+    /// </summary>
+    public enum eSymbolSet
+    {
+        /// <summary>
+        /// FontAwesome Symbol Set.
+        /// </summary>
+        Awesome,
+        /// <summary>
+        /// Android Material Symbol Set.
+        /// </summary>
+        Material
+    }
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/Events/CancelIntValueEventArgs.cs b/PROMS/DotNetBar Source Code/Events/CancelIntValueEventArgs.cs
new file mode 100644
index 00000000..818118b8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Events/CancelIntValueEventArgs.cs	
@@ -0,0 +1,26 @@
+using System;
+using System.Text;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represents the cancelable event arguments with integer value.
+    /// </summary>
+    public class CancelIntValueEventArgs : CancelEventArgs
+    {
+        /// <summary>
+        /// Gets or sets the new value that will be used if event is not canceled.
+        /// </summary>
+        public int NewValue = 0;
+        /// <summary>
+        /// Indicates the source of the event.
+        /// </summary>
+        public eEventSource EventSource = eEventSource.Code;
+    }
+
+    /// <summary>
+    /// Defines delegate for cancelable events.
+    /// </summary>
+    public delegate void CancelIntValueEventHandler(object sender, CancelIntValueEventArgs e);
+}
diff --git a/PROMS/DotNetBar Source Code/Events/CancelObjectValueEventArgs.cs b/PROMS/DotNetBar Source Code/Events/CancelObjectValueEventArgs.cs
new file mode 100644
index 00000000..e73c604a
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Events/CancelObjectValueEventArgs.cs	
@@ -0,0 +1,31 @@
+using System;
+using System.Text;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represents the cancelable event arguments with object value.
+    /// </summary>
+    public class CancelObjectValueEventArgs : CancelEventArgs
+    {
+        /// <summary>
+        /// Initializes a new instance of the CancelObjectValueEventArgs class.
+        /// </summary>
+        /// <param name="o"></param>
+        public CancelObjectValueEventArgs(object o)
+        {
+            this.Data = o;
+        }
+
+        /// <summary>
+        /// Gets or sets the data connected to this event.
+        /// </summary>
+        public object Data = null;
+    }
+
+    /// <summary>
+    /// Defines delegate for cancelable events.
+    /// </summary>
+    public delegate void CancelObjectValueEventHandler(object sender, CancelObjectValueEventArgs e);
+}
diff --git a/PROMS/DotNetBar Source Code/Events/CheckBoxItemRenderEventArgs.cs b/PROMS/DotNetBar Source Code/Events/CheckBoxItemRenderEventArgs.cs
new file mode 100644
index 00000000..721e00d7
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Events/CheckBoxItemRenderEventArgs.cs	
@@ -0,0 +1,60 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Provides data for CheckBoxItem rendering events.
+    /// </summary>
+    public class CheckBoxItemRenderEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets or sets Graphics object group is rendered on.
+        /// </summary>
+        public Graphics Graphics = null;
+
+        /// <summary>
+        /// Gets or sets the reference to CheckBoxItem being rendered.
+        /// </summary>
+        public CheckBoxItem CheckBoxItem = null;
+
+        /// <summary>
+        /// ColorScheme object that is used to provide colors for rendering check box item in legacy styles like Office 2003. Office 2007 style
+        /// uses color tables provided by renderers.
+        /// </summary>
+        public ColorScheme ColorScheme = null;
+
+        /// <summary>
+        /// Indicates whether item is in Right-To-Left environment.
+        /// </summary>
+        public bool RightToLeft = false;
+
+        /// <summary>
+        /// Gets or sets the text font.
+        /// </summary>
+        public Font Font = null;
+
+        /// <summary>
+        /// Gets or sets the ItemPaintArgs reference.
+        /// </summary>
+        internal ItemPaintArgs ItemPaintArgs;
+
+        /// <summary>
+        /// Creates new instance of the object and provides default values.
+        /// </summary>
+        /// <param name="g">Reference to Graphics object</param>
+        /// <param name="item">Reference to CheckBoxItem</param>
+        /// <param name="cs">Reference to legacy ColorScheme</param>
+        /// <param name="f">Indicates the font for the text.</param>
+        /// <param name="rtl">Indicates whether item is in Right-To-Left environment.</param>
+        public CheckBoxItemRenderEventArgs(Graphics g, CheckBoxItem item, ColorScheme cs, Font f, bool rtl)
+        {
+            this.Graphics = g;
+            this.CheckBoxItem = item;
+            this.ColorScheme = cs;
+            this.RightToLeft = rtl;
+            this.Font = f;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Events/ColorItemRendererEventArgs.cs b/PROMS/DotNetBar Source Code/Events/ColorItemRendererEventArgs.cs
new file mode 100644
index 00000000..4db14de0
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Events/ColorItemRendererEventArgs.cs	
@@ -0,0 +1,29 @@
+using System;
+using System.Drawing;
+using System.Text;
+
+namespace DevComponents.DotNetBar
+{
+    public class ColorItemRendererEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets or sets Graphics object group is rendered on.
+        /// </summary>
+        public Graphics Graphics = null;
+        /// <summary>
+        /// Gets the reference to ButtonItem instance being rendered.
+        /// </summary>
+        public ColorItem ColorItem = null;
+
+        /// <summary>
+        /// Creates new instance of the object and initializes it with default values
+        /// </summary>
+        /// <param name="g">Reference to Graphics object.</param>
+        /// <param name="item">Reference to ColorItem object.</param>
+        public ColorItemRendererEventArgs(Graphics g, ColorItem item)
+        {
+            this.Graphics = g;
+            this.ColorItem = item;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Events/ColorPreviewEventArgs.cs b/PROMS/DotNetBar Source Code/Events/ColorPreviewEventArgs.cs
new file mode 100644
index 00000000..e70b6316
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Events/ColorPreviewEventArgs.cs	
@@ -0,0 +1,38 @@
+using System;
+using System.Drawing;
+using System.Text;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Defines the event arguments class for ColorPickerDropDown ColorPreview event.
+    /// </summary>
+    public class ColorPreviewEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets the color that is being previewed.
+        /// </summary>
+        public Color Color = Color.Empty;
+
+        /// <summary>
+        /// Gets the ColorItem if available for the color being previewed. This property can be null if there is no ColorItem connected with the color.
+        /// </summary>
+        public ColorItem ColorItem = null;
+
+        /// <summary>
+        /// Creates new instance of the object.
+        /// </summary>
+        /// <param name="c">Color being previewed.</param>
+        /// <param name="ci">ColorItem connected with the color.</param>
+        public ColorPreviewEventArgs(Color c, ColorItem ci)
+        {
+            this.Color = c;
+            this.ColorItem = ci;
+        }
+    }
+
+    /// <summary>
+    /// Defines delegate for ColorPreview event.
+    /// </summary>
+    public delegate void ColorPreviewEventHandler(object sender, ColorPreviewEventArgs e);
+}
diff --git a/PROMS/DotNetBar Source Code/Events/DockTabClosingEventHandler.cs b/PROMS/DotNetBar Source Code/Events/DockTabClosingEventHandler.cs
new file mode 100644
index 00000000..f2b97e6c
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Events/DockTabClosingEventHandler.cs	
@@ -0,0 +1,43 @@
+using System;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Represents event arguments for DockTabClosing event.
+	/// </summary>
+	public class DockTabClosingEventArgs:EventArgs
+	{
+		/// <summary>
+		/// Indicates the DockContainerItem that is about to close.
+		/// </summary>
+		public readonly DockContainerItem DockContainerItem;
+		/// <summary>
+		/// Provides ability to cancel closing of the DockContainerItem. Default value is false.
+		/// </summary>
+		public bool Cancel=false;
+		/// <summary>
+		/// Set to true to automatically remove DockContainerItem from the Bar.Items collection after it is closed. Default value is false
+		/// which means that DockContainerItem will be kept in collection but it will be hidden after this event is complete.
+		/// </summary>
+		public bool RemoveDockTab=false;
+		/// <summary>
+		/// Returns source of the event: keyboard, mouse or code.
+		/// </summary>
+		public readonly eEventSource Source;
+
+		/// <summary>
+		/// Creates new instance of the class.
+		/// </summary>
+		/// <param name="item">Reference to DockContainerItem that is about to close</param>
+		public DockTabClosingEventArgs(DockContainerItem item, eEventSource source)
+		{
+			this.DockContainerItem=item;
+			this.Source=source;
+		}
+	}
+
+	/// <summary>
+	/// Delegate for DockTabClosing event.
+	/// </summary>
+	public delegate void DockTabClosingEventHandler(object sender, DockTabClosingEventArgs e);
+}
diff --git a/PROMS/DotNetBar Source Code/Events/EventSourceArgs.cs b/PROMS/DotNetBar Source Code/Events/EventSourceArgs.cs
new file mode 100644
index 00000000..6b94f8dc
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Events/EventSourceArgs.cs	
@@ -0,0 +1,59 @@
+using System;
+using System.Text;
+
+namespace DevComponents.DotNetBar.Events
+{
+    /// <summary>
+    /// Represents event arguments that provide information on source of action.
+    /// </summary>
+    public class EventSourceArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets the source of the event.
+        /// </summary>
+        public readonly eEventSource Source = eEventSource.Code;
+
+        /// <summary>
+        /// Initializes a new instance of the EventSourceArgs class.
+        /// </summary>
+        /// <param name="source"></param>
+        public EventSourceArgs(eEventSource source)
+        {
+            Source = source;
+        }
+    }
+
+    /// <summary>
+    /// Delegate for the CancelableEventSource event.
+    /// </summary>
+    public delegate void CancelableEventSourceHandler(object sender, CancelableEventSourceArgs e);    
+    /// <summary>
+    /// Represents event arguments that provide information on source of action and allow canceling of action.
+    /// </summary>
+    public class CancelableEventSourceArgs : EventSourceArgs
+    {
+        /// <summary>
+        /// Gets or sets whether event action will be canceled.
+        /// </summary>
+        public bool Cancel = false;
+
+        /// <summary>
+        /// Initializes a new instance of the EventSourceArgs class.
+        /// </summary>
+        /// <param name="source"></param>
+        public CancelableEventSourceArgs(eEventSource source)
+            : base(source)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the CancelableEventSourceArgs class.
+        /// </summary>
+        /// <param name="cancel"></param>
+        public CancelableEventSourceArgs(eEventSource source, bool cancel)
+            : base(source)
+        {
+            Cancel = cancel;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Events/MarkupLinkClickEventArgs.cs b/PROMS/DotNetBar Source Code/Events/MarkupLinkClickEventArgs.cs
new file mode 100644
index 00000000..17b1dc42
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Events/MarkupLinkClickEventArgs.cs	
@@ -0,0 +1,37 @@
+using System;
+using System.Text;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Provides more information about MarkupLinkClick event.
+    /// </summary>
+    public class MarkupLinkClickEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets the value of href attribute from the markup link that was clicked.
+        /// </summary>
+        public readonly string HRef = "";
+
+        /// <summary>
+        /// Gets the value of name attribute from the markup link that was clicked.
+        /// </summary>
+        public readonly string Name = "";
+
+        /// <summary>
+        /// Creates new instance of the object.
+        /// </summary>
+        /// <param name="name">Value of name attribute.</param>
+        /// <param name="href">Value of href attribute.</param>
+        public MarkupLinkClickEventArgs(string name, string href)
+        {
+            this.HRef = href;
+            this.Name = name;
+        }
+    }
+
+    /// <summary>
+    /// Defines delegate for MarkupLinkClick event.
+    /// </summary>
+    public delegate void MarkupLinkClickEventHandler(object sender, MarkupLinkClickEventArgs e);
+}
diff --git a/PROMS/DotNetBar Source Code/Events/MdiSystemItemRendererEventArgs.cs b/PROMS/DotNetBar Source Code/Events/MdiSystemItemRendererEventArgs.cs
new file mode 100644
index 00000000..2df2f102
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Events/MdiSystemItemRendererEventArgs.cs	
@@ -0,0 +1,33 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Provides data for the RenderMdiSystemitem event.
+    /// </summary>
+    public class MdiSystemItemRendererEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets or sets Graphics object group is rendered on.
+        /// </summary>
+        public Graphics Graphics = null;
+
+        /// <summary>
+        /// Gets or sets the reference to MdiSystemItem being rendered.
+        /// </summary>
+        public MDISystemItem MdiSystemItem = null;
+
+        /// <summary>
+        /// Creates new instance of the class and initializes it with default values.
+        /// </summary>
+        /// <param name="g">Reference to graphics object.</param>
+        /// <param name="mdi">Reference to MdiSystemItem being rendered.</param>
+        public MdiSystemItemRendererEventArgs(Graphics g, MDISystemItem mdi)
+        {
+            this.Graphics = g;
+            this.MdiSystemItem = mdi;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Events/NavPaneRenderEventArgs.cs b/PROMS/DotNetBar Source Code/Events/NavPaneRenderEventArgs.cs
new file mode 100644
index 00000000..d03ba146
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Events/NavPaneRenderEventArgs.cs	
@@ -0,0 +1,31 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Provides data for the Navigation Pane rendering events.
+    /// </summary>
+    public class NavPaneRenderEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets or sets Graphics object group is rendered on.
+        /// </summary>
+        public Graphics Graphics = null;
+
+        /// <summary>
+        /// Gets or sets the rendering bounds.
+        /// </summary>
+        public Rectangle Bounds = Rectangle.Empty;
+
+        /// <summary>
+        /// Creates new instance of the objects and initializes it with default values.
+        /// </summary>
+        public NavPaneRenderEventArgs(Graphics g, Rectangle bounds)
+        {
+            this.Graphics = g;
+            this.Bounds = bounds;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Events/ProgressBarItemRenderEventArgs.cs b/PROMS/DotNetBar Source Code/Events/ProgressBarItemRenderEventArgs.cs
new file mode 100644
index 00000000..bfdc0bab
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Events/ProgressBarItemRenderEventArgs.cs	
@@ -0,0 +1,47 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Provides data for the ProgressBarItem rendering events.
+    /// </summary>
+    public class ProgressBarItemRenderEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets or sets Graphics object group is rendered on.
+        /// </summary>
+        public Graphics Graphics = null;
+
+        /// <summary>
+        /// Gets or sets the reference to ProgressBarItem being rendered.
+        /// </summary>
+        public ProgressBarItem ProgressBarItem = null;
+
+        /// <summary>
+        /// Indicates whether item is in Right-To-Left environment.
+        /// </summary>
+        public bool RightToLeft = false;
+
+        /// <summary>
+        /// Gets or sets the text font.
+        /// </summary>
+        public Font Font = null;
+
+        /// <summary>
+        /// Creates new instance of the object and provides default values.
+        /// </summary>
+        /// <param name="g">Reference to Graphics object</param>
+        /// <param name="item">Reference to ProgressBarItem</param>
+        /// <param name="f">Indicates the font for the text.</param>
+        /// <param name="rtl">Indicates whether item is in Right-To-Left environment.</param>
+        public ProgressBarItemRenderEventArgs(Graphics g, ProgressBarItem item, Font f, bool rtl)
+        {
+            this.Graphics = g;
+            this.ProgressBarItem = item;
+            this.RightToLeft = rtl;
+            this.Font = f;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Events/QatCustomizeDialogEventArgs.cs b/PROMS/DotNetBar Source Code/Events/QatCustomizeDialogEventArgs.cs
new file mode 100644
index 00000000..b01ae455
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Events/QatCustomizeDialogEventArgs.cs	
@@ -0,0 +1,32 @@
+using System;
+using System.Text;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Provides data for the Quick Access Toolbar Customize dialog events.
+    /// </summary>
+    public class QatCustomizeDialogEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets or sets whether to cancel the current operation. When showing the dialog this allows to cancel the showing. When dialog is closed
+        /// it allows to cancel the changes made on customize dialog.
+        /// </summary>
+        public bool Cancel = false;
+
+        /// <summary>
+        /// Gets or sets the reference to the form that is acting as dialog. You can set this value to your custom form to display it instead of
+        /// built-in dialog.
+        /// </summary>
+        public System.Windows.Forms.Form Dialog = null;
+
+        /// <summary>
+        /// Creates new instance of the object and initializes it with default values.
+        /// </summary>
+        /// <param name="dialog">Reference to the dialog being used for customization.</param>
+        public QatCustomizeDialogEventArgs(System.Windows.Forms.Form dialog)
+        {
+            this.Dialog = dialog;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Events/QatCustomizeItemRendererEventArgs.cs b/PROMS/DotNetBar Source Code/Events/QatCustomizeItemRendererEventArgs.cs
new file mode 100644
index 00000000..5618b2f5
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Events/QatCustomizeItemRendererEventArgs.cs	
@@ -0,0 +1,32 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Provides data for the Quick Access Toolbar Customize Item rendering events.
+    /// </summary>
+    public class QatCustomizeItemRendererEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets or sets the reference to the item being rendered.
+        /// </summary>
+        public QatCustomizeItem CustomizeItem = null;
+        /// <summary>
+        /// Gets or sets the reference to graphics object.
+        /// </summary>
+        public Graphics Graphics = null;
+
+        /// <summary>
+        /// Creates new instance of the object and initializes it with default values.
+        /// </summary>
+        /// <param name="overflowItem">Reference to the customize item being rendered.</param>
+        /// <param name="g">Reference to the graphics object.</param>
+        public QatCustomizeItemRendererEventArgs(QatCustomizeItem customizeItem, Graphics g)
+        {
+            this.CustomizeItem = customizeItem;
+            this.Graphics = g;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Events/QatOverflowItemRendererEventArgs.cs b/PROMS/DotNetBar Source Code/Events/QatOverflowItemRendererEventArgs.cs
new file mode 100644
index 00000000..a297ce20
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Events/QatOverflowItemRendererEventArgs.cs	
@@ -0,0 +1,32 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Provides data for the Quick Access Toolbar Overflow item rendering events.
+    /// </summary>
+    public class QatOverflowItemRendererEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets or sets the reference to the item being rendered.
+        /// </summary>
+        public QatOverflowItem OverflowItem = null;
+        /// <summary>
+        /// Gets or sets the reference to graphics object.
+        /// </summary>
+        public Graphics Graphics = null;
+
+        /// <summary>
+        /// Creates new instance of the object and initializes it with default values.
+        /// </summary>
+        /// <param name="overflowItem">Reference to the overflow item being rendered.</param>
+        /// <param name="g">Reference to the graphics object.</param>
+        public QatOverflowItemRendererEventArgs(QatOverflowItem overflowItem, Graphics g)
+        {
+            this.OverflowItem = overflowItem;
+            this.Graphics = g;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Events/RibbonControlRendererEventArgs.cs b/PROMS/DotNetBar Source Code/Events/RibbonControlRendererEventArgs.cs
new file mode 100644
index 00000000..5c07a9c0
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Events/RibbonControlRendererEventArgs.cs	
@@ -0,0 +1,40 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represents events arguments for the Ribbon Control rendering events.
+    /// </summary>
+    public class RibbonControlRendererEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets or sets Graphics control is rendered on.
+        /// </summary>
+        public Graphics Graphics = null;
+        /// <summary>
+        /// Gets the reference to RibbonControl instance being rendered.
+        /// </summary>
+        public RibbonControl RibbonControl = null;
+
+        /// <summary>
+        /// Gets whether Windows Vista Glass is enabled.
+        /// </summary>
+        public bool GlassEnabled = false;
+
+        internal ItemPaintArgs ItemPaintArgs = null;
+
+        /// <summary>
+        /// Creates new instance and initializes it with the default values.
+        /// </summary>
+        /// <param name="g">Reference to Graphics object</param>
+        /// <param name="rc">Reference to RibbonControl</param>
+        public RibbonControlRendererEventArgs(Graphics g, RibbonControl rc, bool glassEnabled)
+        {
+            this.Graphics = g;
+            this.RibbonControl = rc;
+            this.GlassEnabled = glassEnabled;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Events/RibbonCustomizeEventArgs.cs b/PROMS/DotNetBar Source Code/Events/RibbonCustomizeEventArgs.cs
new file mode 100644
index 00000000..76a80770
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Events/RibbonCustomizeEventArgs.cs	
@@ -0,0 +1,39 @@
+using System;
+using System.Text;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Provides information for ribbon customization events.
+    /// </summary>
+    public class RibbonCustomizeEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets or sets whether the menu popup will be cancelled. Default value is false.
+        /// </summary>
+        public bool Cancel = false;
+
+        /// <summary>
+        /// Gets or sets the reference to the object customize menu will be acting on. This could be an ButtonItem or any
+        /// BaseItem derived class as well as RibbonBar object.
+        /// </summary>
+        public object ContextObject = null;
+
+        /// <summary>
+        /// Gets or sets the reference to the popup menu that will be displayed. You can change the members of SubItems collection to add/remove/change
+        /// the context menu items that will be displayed.
+        /// </summary>
+        public BaseItem PopupMenu = null;
+
+        /// <summary>
+        /// Creates new instance of the object and initializes it with default values.
+        /// </summary>
+        /// <param name="contextObject">Reference to context object.</param>
+        /// <param name="popupMenuItem">Reference to popup menu item if any.</param>
+        public RibbonCustomizeEventArgs(object contextObject, BaseItem popupMenuItem)
+        {
+            this.ContextObject = contextObject;
+            this.PopupMenu = popupMenuItem;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Events/RibbonPopupCloseEventArgs.cs b/PROMS/DotNetBar Source Code/Events/RibbonPopupCloseEventArgs.cs
new file mode 100644
index 00000000..cf2abcc4
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Events/RibbonPopupCloseEventArgs.cs	
@@ -0,0 +1,48 @@
+using System;
+using System.Text;
+
+namespace DevComponents.DotNetBar
+{
+    public class RibbonPopupCloseEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets or sets whether the closing of the ribbon menu is canceled.
+        /// </summary>
+        public bool Cancel = false;
+
+        /// <summary>
+        /// Gets or sets the source object that was cause of the menu closing. For example this could be reference to an item that was clicked.
+        /// Default value is null which indicates that there is no information about the object that caused closing available.
+        /// </summary>
+        /// <remarks>
+        /// 	<para>Following is the possible list of types that this property could be set to
+        ///     and causes for closing:</para>
+        /// 	<list type="bullet">
+        /// 		<item>BaseItem - when an item is clicked the Source will be set to the instance
+        ///         of the item that was clicked.</item>
+        /// 		<item>RibbonControl - when parent form RibbonControl is on loses the input
+        ///         focus the Source will be set to the RibbonControl</item>
+        /// 		<item>RibbonTabItem - when tab menu is displayed and user clicks the same tab
+        ///         to close the menu. The RibbonTabItem with EventSource=Code will be also set as
+        ///         source when user double-clicks the tab to maximize the ribbon.</item>
+        /// 		<item>Any other type if RibbonControl.PopupRibbon method is called by your
+        ///         code.</item>
+        /// 	</list>
+        /// </remarks>
+        public object Source = null;
+
+        /// <summary>
+        /// Gets or sets the source of the event.
+        /// </summary>
+        public eEventSource EventSource = eEventSource.Code;
+
+        /// <summary>
+        /// Creates new instance of the object.
+        /// </summary>
+        public RibbonPopupCloseEventArgs(object source, eEventSource eventSource)
+        {
+            this.Source = source;
+            this.EventSource = eventSource;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Events/SerializeItemEventArgs.cs b/PROMS/DotNetBar Source Code/Events/SerializeItemEventArgs.cs
new file mode 100644
index 00000000..10bc3518
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Events/SerializeItemEventArgs.cs	
@@ -0,0 +1,39 @@
+using System;
+using System.Text;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represents arguments for SerializeItem event which allows you to add custom serialization data to definitions saved by control.
+    /// </summary>
+    public class SerializeItemEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets reference to item being serialized or de-serialized.
+        /// </summary>
+        public BaseItem Item = null;
+
+        /// <summary>
+        /// Gets reference to instance of XmlElement that item is serialized to or is being de-serialized from. You should not change any data directly on this element.
+        /// </summary>
+        public System.Xml.XmlElement ItemXmlElement = null;
+
+        /// <summary>
+        /// Gets the reference to XmlElement that you can serialize to or de-serialize any custom data from. You can add child elements or set the attributes on
+        /// this XmlElement when handling SerializeItem event. When handling DeserializeItem event you can load same data from this element.
+        /// </summary>
+        public System.Xml.XmlElement CustomXmlElement = null;
+
+        public SerializeItemEventArgs(BaseItem item, System.Xml.XmlElement itemXmlElement, System.Xml.XmlElement customXmlElement)
+        {
+            this.Item = item;
+            this.ItemXmlElement = itemXmlElement;
+            this.CustomXmlElement = customXmlElement;
+        }
+    }
+
+    /// <summary>
+    /// Defines delegate for SerializeItem event.
+    /// </summary>
+    public delegate void SerializeItemEventHandler(object sender, SerializeItemEventArgs e);
+}
diff --git a/PROMS/DotNetBar Source Code/Events/SideBarPanelItemRendererEventArgs.cs b/PROMS/DotNetBar Source Code/Events/SideBarPanelItemRendererEventArgs.cs
new file mode 100644
index 00000000..d6721097
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Events/SideBarPanelItemRendererEventArgs.cs	
@@ -0,0 +1,28 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar
+{
+    public class SideBarPanelItemRendererEventArgs : EventArgs
+    {
+        public readonly SideBarPanelItem SideBarPanelItem = null;
+        /// <summary>
+        /// Gets or sets the reference to graphics object.
+        /// </summary>
+        public Graphics Graphics = null;
+
+        internal ItemPaintArgs ItemPaintArgs = null;
+
+        /// <summary>
+        /// Initializes a new instance of the SideBarPanelItemRendererEventArgs class.
+        /// </summary>
+        /// <param name="sideBarPanelItem"></param>
+        /// <param name="graphics"></param>
+        public SideBarPanelItemRendererEventArgs(SideBarPanelItem sideBarPanelItem, Graphics graphics)
+        {
+            SideBarPanelItem = sideBarPanelItem;
+            Graphics = graphics;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Events/SideBarRendererEventArgs.cs b/PROMS/DotNetBar Source Code/Events/SideBarRendererEventArgs.cs
new file mode 100644
index 00000000..5d2fbd6e
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Events/SideBarRendererEventArgs.cs	
@@ -0,0 +1,29 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar
+{
+    public class SideBarRendererEventArgs : EventArgs
+    {
+        public readonly SideBar SideBar = null;
+
+        /// <summary>
+        /// Gets or sets the reference to graphics object.
+        /// </summary>
+        public Graphics Graphics = null;
+
+        internal ItemPaintArgs ItemPaintArgs = null;
+
+        /// <summary>
+        /// Initializes a new instance of the SideBarRendererEventArgs class.
+        /// </summary>
+        /// <param name="sideBar"></param>
+        /// <param name="graphics"></param>
+        public SideBarRendererEventArgs(SideBar sideBar, Graphics graphics)
+        {
+            SideBar = sideBar;
+            Graphics = graphics;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Events/SliderItemRendererEventArgs.cs b/PROMS/DotNetBar Source Code/Events/SliderItemRendererEventArgs.cs
new file mode 100644
index 00000000..d7e824df
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Events/SliderItemRendererEventArgs.cs	
@@ -0,0 +1,35 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Provides data for the Slider item rendering events.
+    /// </summary>
+    public class SliderItemRendererEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets or sets the reference to the item being rendered.
+        /// </summary>
+        public SliderItem SliderItem = null;
+        
+        /// <summary>
+        /// Gets or sets the reference to graphics object.
+        /// </summary>
+        public Graphics Graphics = null;
+
+        internal ItemPaintArgs ItemPaintArgs = null;
+
+        /// <summary>
+        /// Creates new instance of the object and initializes it with default values.
+        /// </summary>
+        /// <param name="overflowItem">Reference to the Slider item being rendered.</param>
+        /// <param name="g">Reference to the graphics object.</param>
+        public SliderItemRendererEventArgs(SliderItem item, Graphics g)
+        {
+            this.SliderItem = item;
+            this.Graphics = g;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/ExpandablePanel.cs b/PROMS/DotNetBar Source Code/ExpandablePanel.cs
new file mode 100644
index 00000000..ce5bf315
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/ExpandablePanel.cs	
@@ -0,0 +1,759 @@
+using System;
+using System.Text;
+using System.ComponentModel;
+using System.Drawing;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Panel control with title bar that can be expanded or collapsed.
+    /// </summary>
+    [ToolboxItem(true), Designer("DevComponents.DotNetBar.Design.ExpandablePanelDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf"), ToolboxBitmap(typeof(ExpandablePanel), "ExpandablePanel.ico")]
+    public class ExpandablePanel : PanelEx
+    {
+        #region Private Variables, Events & Constructor
+        /// <summary>
+        /// Occurs before Expanded property is changed. You can cancel change of this property by setting Cancel=true on the event arguments.
+        /// </summary>
+        public event ExpandChangeEventHandler ExpandedChanging;
+        /// <summary>
+        /// Occurs after Expanded property has changed. You can handle ExpandedChanging event and have opportunity to cancel the change.
+        /// </summary>
+        public event ExpandChangeEventHandler ExpandedChanged;
+
+        private PanelExTitle m_TitleBar = new PanelExTitle();
+        private bool m_Expanded = true;
+        private int m_AnimationTime = 100;
+        private Rectangle m_ExpandedBounds = Rectangle.Empty;
+        private Image m_ButtonImageExpand = null;
+        private Image m_ButtonImageCollapse = null;
+        private eCollapseDirection m_CollapseDirection = eCollapseDirection.BottomToTop;
+        private Image m_Office2007ButtonImageExpand = null;
+        private Image m_Office2007ButtonImageCollapse = null;
+        private Image m_Office2007ButtonImageExpandMouseOver = null;
+        private Image m_Office2007ButtonImageCollapseMouseOver = null;
+        private PanelEx m_VerticalExpandPane = null;
+        private bool m_ExpandOnTitleClick = false;
+
+        public ExpandablePanel()
+        {
+            m_TitleBar.Text = "Title Bar";
+            m_TitleBar.Location = new Point(0, 0);
+            m_TitleBar.Size = new Size(24, 26);
+            m_TitleBar.Dock = DockStyle.Top;
+            this.Controls.Add(m_TitleBar);
+            //m_TitleBar.ApplyPanelStyle();
+            m_TitleBar.ColorScheme = this.ColorScheme;
+            m_TitleBar.ExpandedClick += new EventHandler(m_TitleBar_ExpandedClick);
+            m_TitleBar.Click += new EventHandler(TitleBarClick);
+            this.BackColor = SystemColors.Control;
+            UpdateExpandButtonImage();
+        }
+
+        #endregion
+
+        #region Internal Implementation
+
+        private void TitleBarClick(object sender, EventArgs e)
+        {
+            Point p = m_TitleBar.PointToClient(Control.MousePosition);
+            if (m_ExpandOnTitleClick && (!m_TitleBar.ExpandChangeButton.DisplayRectangle.Contains(p) ))
+            {
+                SetExpanded(!this.Expanded, eEventSource.Mouse);
+            }
+        }
+
+        protected override void OnControlAdded(ControlEventArgs e)
+        {
+            base.OnControlAdded(e);
+            m_TitleBar.SendToBack();
+        }
+
+        void m_TitleBar_ExpandedClick(object sender, EventArgs e)
+        {
+            SetExpanded(!this.Expanded, eEventSource.Mouse);
+        }
+
+        private void SetExpanded(bool expanded, eEventSource action)
+        {
+            ExpandedChangeEventArgs e = new ExpandedChangeEventArgs(action, expanded);
+            InvokeExpandedChanging(e);
+            if (e.Cancel)
+                return;
+            m_Expanded = expanded;
+            OnExpandedChanged();
+            InvokeExpandedChanged(e);
+        }
+
+        private DockStyle GetControlDock(Control c)
+        {
+            if (c.Dock == DockStyle.None || c.Dock == DockStyle.Fill)
+            {
+                return DockStyle.Top;
+            }
+            return c.Dock;
+        }
+
+        private Rectangle GetExpandedBounds()
+        {
+            Rectangle r = m_ExpandedBounds;
+            DockStyle dock = GetControlDock(m_TitleBar);
+            if (dock == DockStyle.Left)
+            {
+                r = new Rectangle(this.Bounds.Location, m_ExpandedBounds.Size);
+            }
+            else if (dock == DockStyle.Right)
+            {
+                r = new Rectangle(this.Bounds.X - (m_ExpandedBounds.Width - this.Width), this.Bounds.Y, m_ExpandedBounds.Width, m_ExpandedBounds.Height);
+            }
+            else if (dock == DockStyle.Top)
+            {
+                if (m_CollapseDirection == eCollapseDirection.LeftToRight)
+                    r = new Rectangle(this.Bounds.X - (m_ExpandedBounds.Width - this.Bounds.Width), this.Bounds.Y, m_ExpandedBounds.Width, m_ExpandedBounds.Height);
+                else if (m_CollapseDirection == eCollapseDirection.TopToBottom)
+                    r = new Rectangle(this.Bounds.X, m_ExpandedBounds.Y, m_ExpandedBounds.Width, m_ExpandedBounds.Height);
+                else
+                    r = new Rectangle(this.Bounds.Location, m_ExpandedBounds.Size);
+            }
+            else if (dock == DockStyle.Bottom)
+            {
+                r = new Rectangle(this.Bounds.X, this.Bounds.Y - (m_ExpandedBounds.Height - this.Height), m_ExpandedBounds.Width, m_ExpandedBounds.Height);
+            }
+
+            return r;
+        }
+
+        private void OnExpandedChanged()
+        {
+            if (this.Expanded)
+            {
+                m_TitleBar.RenderText = true;
+                this.RenderText = true;
+                if (!m_ExpandedBounds.IsEmpty)
+                {
+                    if (m_VerticalExpandPane != null)
+                        DisposeVerticalExpandPane();
+
+                    if (_HideControlsWhenCollapsed)
+                    {
+                        // Show internal controls
+                        this.SuspendLayout();
+                        foreach (Control c in this.Controls)
+                        {
+                            if (c is ContextMenuBar) continue;
+                            if (c != this.TitlePanel)
+                                c.Visible = true;
+                        }
+                        this.ResumeLayout();
+                    }
+
+                    Rectangle targetRect = GetExpandedBounds();
+                    if (this.AnimationTime == 0 || this.DesignMode)
+                    {
+                        TypeDescriptor.GetProperties(this)["Bounds"].SetValue(this, targetRect);
+                    }
+                    else
+                    {
+                        Rectangle controlRect = this.Bounds;
+                        BarFunctions.AnimateControl(this, true, m_AnimationTime, controlRect, targetRect);
+                    }
+                    TypeDescriptor.GetProperties(this)["ExpandedBounds"].SetValue(this, Rectangle.Empty);
+                }
+            }
+            else
+            {
+                TypeDescriptor.GetProperties(this)["ExpandedBounds"].SetValue(this, this.Bounds);
+                Point p = this.PointToScreen(Point.Empty);
+                if (this.Parent != null)
+                    p = this.Parent.PointToClient(p);
+                else
+                    p = Point.Empty;
+
+                Rectangle targetRect = new Rectangle(p, new Size(m_TitleBar.Width + this.DockPadding.Left + this.DockPadding.Right,
+                    Math.Max(m_TitleBar.Height + this.DockPadding.Top + this.DockPadding.Bottom, m_TitleBar.ExpandChangeButton.HeightInternal)));
+                if (m_CollapseDirection == eCollapseDirection.RightToLeft)
+                {
+                    targetRect = new Rectangle(p, new Size(Math.Max(m_TitleBar.Height + this.DockPadding.Top + this.DockPadding.Bottom, m_TitleBar.ExpandChangeButton.WidthInternal + 6), this.Height));
+                }
+                else if (m_CollapseDirection == eCollapseDirection.LeftToRight)
+                {
+                    Size s = new Size(Math.Max(m_TitleBar.Height + this.DockPadding.Top + this.DockPadding.Bottom, m_TitleBar.ExpandChangeButton.WidthInternal + 6), this.Height);
+                    if (!p.IsEmpty) p.X += this.Width - s.Width;
+                    targetRect = new Rectangle(p, s);
+                }
+                else if (m_CollapseDirection == eCollapseDirection.TopToBottom)
+                {
+                    Size s = new Size(m_TitleBar.Width + this.DockPadding.Left + this.DockPadding.Right,
+                        Math.Max(m_TitleBar.Height + this.DockPadding.Top + this.DockPadding.Bottom, m_TitleBar.ExpandChangeButton.HeightInternal));
+                    if (!p.IsEmpty) p.Y += this.Height - s.Height;
+                    targetRect = new Rectangle(p, s);
+                }
+
+                if (this.AnimationTime == 0 || this.DesignMode)
+                {
+                    TypeDescriptor.GetProperties(this)["Bounds"].SetValue(this, targetRect);
+                }
+                else
+                {
+                    Rectangle controlRect = this.Bounds;
+                    BarFunctions.AnimateControl(this, true, m_AnimationTime, controlRect, targetRect);
+                }
+                if (m_CollapseDirection == eCollapseDirection.LeftToRight || m_CollapseDirection == eCollapseDirection.RightToLeft)
+                {
+                    m_TitleBar.RenderText = false;
+                    this.RenderText = false;
+                }
+
+                if (_HideControlsWhenCollapsed)
+                {
+                    // Hide internal controls
+                    this.SuspendLayout();
+                    foreach (Control c in this.Controls)
+                    {
+                        if (c is ContextMenuBar) continue;
+                        if (c != this.TitlePanel)
+                            c.Visible = false;
+                    }
+                    this.ResumeLayout();
+                }
+
+                m_TitleBar.SendToBack();
+                if (m_CollapseDirection == eCollapseDirection.LeftToRight || m_CollapseDirection == eCollapseDirection.RightToLeft)
+                    SetupExpandVerticalPane();
+            }
+            UpdateExpandButtonImage();
+            this.Refresh();
+        }
+
+        private void DisposeVerticalExpandPane()
+        {
+            if (m_VerticalExpandPane != null)
+            {
+                this.Controls.Remove(m_VerticalExpandPane);
+                m_VerticalExpandPane.Dispose();
+                m_VerticalExpandPane = null;
+            }
+        }
+
+        private bool _HideControlsWhenCollapsed = false;
+        /// <summary>
+        /// Indicates whether panel will hide the controls it contains when its collapsed and show them when its expanded. Default value is false.
+        /// </summary>
+        [DefaultValue(false), Category("Behavior"), Description("Indicates whether panel will hide the controls it contains when its collapsed and show them when its expanded")]
+        public bool HideControlsWhenCollapsed
+        {
+            get { return _HideControlsWhenCollapsed; }
+            set
+            {
+                _HideControlsWhenCollapsed = value;
+            }
+        }
+
+        private void UpdateExpandButtonImage()
+        {
+            Image img = null;
+            Image imgMouseOver = null;
+
+            if (this.Expanded)
+            {
+                if (m_ButtonImageCollapse != null)
+                    img = m_ButtonImageCollapse;
+                else
+                {
+                    if (BarFunctions.IsOffice2007Style(this.ColorSchemeStyle))
+                    {
+                        if (m_CollapseDirection == eCollapseDirection.BottomToTop ||
+                            m_CollapseDirection == eCollapseDirection.RightToLeft)
+                        {
+                            img = m_Office2007ButtonImageCollapse;
+                            imgMouseOver = m_Office2007ButtonImageCollapseMouseOver;
+                        }
+                        else
+                        {
+                            img = m_Office2007ButtonImageExpand;
+                            imgMouseOver = m_Office2007ButtonImageExpandMouseOver;
+                        }
+                    }
+                    else
+                    {
+                        if (m_CollapseDirection == eCollapseDirection.BottomToTop)
+                            img = BarFunctions.LoadBitmap("SystemImages.ExpandTitle.png");
+                        else if (m_CollapseDirection == eCollapseDirection.TopToBottom)
+                            img = BarFunctions.LoadBitmap("SystemImages.CollapseTitle.png");
+                        else if (m_CollapseDirection == eCollapseDirection.LeftToRight)
+                        {
+                            Bitmap b = BarFunctions.LoadBitmap("SystemImages.ExpandTitle.png");
+                            b.RotateFlip(RotateFlipType.Rotate270FlipNone);
+                            img = b;
+                        }
+                        else if (m_CollapseDirection == eCollapseDirection.RightToLeft)
+                        {
+                            Bitmap b = BarFunctions.LoadBitmap("SystemImages.ExpandTitle.png");
+                            b.RotateFlip(RotateFlipType.Rotate90FlipNone);
+                            img = b;
+                        }
+                    }
+                }
+            }
+            else
+            {
+                if (m_ButtonImageExpand != null)
+                    img = m_ButtonImageExpand;
+                else
+                {
+                    if (BarFunctions.IsOffice2007Style(this.ColorSchemeStyle))
+                    {
+                        if (m_CollapseDirection == eCollapseDirection.BottomToTop ||
+                            m_CollapseDirection == eCollapseDirection.RightToLeft)
+                        {
+                            img = m_Office2007ButtonImageExpand;
+                            imgMouseOver = m_Office2007ButtonImageExpandMouseOver;
+                        }
+                        else
+                        {
+                            img = m_Office2007ButtonImageCollapse;
+                            imgMouseOver = m_Office2007ButtonImageCollapseMouseOver;
+                        }
+                    }
+                    else
+                    {
+                        if (m_CollapseDirection == eCollapseDirection.BottomToTop)
+                            img = BarFunctions.LoadBitmap("SystemImages.CollapseTitle.png");
+                        else if (m_CollapseDirection == eCollapseDirection.TopToBottom)
+                            img = BarFunctions.LoadBitmap("SystemImages.ExpandTitle.png");
+                        else if (m_CollapseDirection == eCollapseDirection.LeftToRight)
+                        {
+                            Bitmap b = BarFunctions.LoadBitmap("SystemImages.CollapseTitle.png");
+                            b.RotateFlip(RotateFlipType.Rotate270FlipNone);
+                            img = b;
+                        }
+                        else if (m_CollapseDirection == eCollapseDirection.RightToLeft)
+                        {
+                            Bitmap b = BarFunctions.LoadBitmap("SystemImages.CollapseTitle.png");
+                            b.RotateFlip(RotateFlipType.Rotate90FlipNone);
+                            img = b;
+                        }
+                    }
+                }
+            }
+
+            m_TitleBar.ExpandChangeButton.Image = img;
+            m_TitleBar.ExpandChangeButton.HoverImage = imgMouseOver;
+
+            if (BarFunctions.IsHandleValid(this))
+            {
+                m_TitleBar.UpdateButtonPosition();
+                m_TitleBar.Invalidate();
+            }
+
+        }
+
+        private void UpdateOffice2007Images()
+        {
+            if (m_Office2007ButtonImageCollapse != null)
+                m_Office2007ButtonImageCollapse.Dispose();
+            if (m_Office2007ButtonImageExpand != null)
+                m_Office2007ButtonImageExpand.Dispose();
+            if (m_Office2007ButtonImageCollapseMouseOver != null)
+                m_Office2007ButtonImageCollapseMouseOver.Dispose();
+            if (m_Office2007ButtonImageExpandMouseOver != null)
+                m_Office2007ButtonImageExpandMouseOver.Dispose();
+
+            bool vertImage = (m_CollapseDirection == eCollapseDirection.TopToBottom) || (m_CollapseDirection == eCollapseDirection.BottomToTop);
+
+            m_Office2007ButtonImageCollapse = UIGraphics.CreateExpandButtonImage(true, this.ColorScheme.PanelText, vertImage);
+            m_Office2007ButtonImageCollapseMouseOver = UIGraphics.CreateExpandButtonImage(true, this.ColorScheme.ItemHotText, vertImage);
+            m_Office2007ButtonImageExpand = UIGraphics.CreateExpandButtonImage(false, this.ColorScheme.PanelText, vertImage);
+            m_Office2007ButtonImageExpandMouseOver = UIGraphics.CreateExpandButtonImage(false, this.ColorScheme.ItemHotText, vertImage);
+        }
+
+        private void InvokeExpandedChanging(ExpandedChangeEventArgs e)
+        {
+            if (ExpandedChanging != null)
+                ExpandedChanging(this, e);
+        }
+        private void InvokeExpandedChanged(ExpandedChangeEventArgs e)
+        {
+            if (ExpandedChanged != null)
+                ExpandedChanged(this, e);
+        }
+
+        /// <summary>
+        /// Called after either ColorScheme or ColorSchemeStyle has changed. If you override make sure that you call base implementation so default
+        /// processing can occur.
+        /// </summary>
+        protected override void OnColorSchemeChanged()
+        {
+            base.OnColorSchemeChanged();
+            m_TitleBar.ColorScheme = GetColorScheme();
+            UpdateAutoGeneratedImages();
+        }
+
+        private void UpdateAutoGeneratedImages()
+        {
+            DisposeAutoGeneratedImages();
+            if (BarFunctions.IsOffice2007Style(this.ColorSchemeStyle))
+                UpdateOffice2007Images();
+
+            UpdateExpandButtonImage();
+        }
+
+        private void DisposeAutoGeneratedImages()
+        {
+            if (m_Office2007ButtonImageCollapse != null)
+            {
+                m_Office2007ButtonImageCollapse.Dispose();
+                m_Office2007ButtonImageCollapse = null;
+            }
+            if (m_Office2007ButtonImageCollapseMouseOver != null)
+            {
+                m_Office2007ButtonImageCollapseMouseOver.Dispose();
+                m_Office2007ButtonImageCollapseMouseOver = null;
+            }
+            if (m_Office2007ButtonImageExpand != null)
+            {
+                m_Office2007ButtonImageExpand.Dispose();
+                m_Office2007ButtonImageExpand = null;
+            }
+            if (m_Office2007ButtonImageExpandMouseOver != null)
+            {
+                m_Office2007ButtonImageExpandMouseOver.Dispose();
+                m_Office2007ButtonImageExpandMouseOver = null;
+            }
+        }
+
+        private int GetTitleHeight()
+        {
+            if (m_TitleBar.Dock == DockStyle.Left || m_TitleBar.Dock == DockStyle.Right)
+                return m_TitleBar.Width;
+            else
+                return m_TitleBar.Height;
+        }
+
+        private void SetTitleHeight(int value)
+        {
+            //if(m_CollapseDirection == eCollapseDirection.LeftToRight || m_CollapseDirection == eCollapseDirection.RightToLeft)
+            if (m_TitleBar.Dock == DockStyle.Left || m_TitleBar.Dock == DockStyle.Right)
+            {
+                m_TitleBar.Width = value;
+                //if (!this.Expanded)
+                //    TypeDescriptor.GetProperties(this)["Width"].SetValue(this, value);
+            }
+            else
+            {
+                m_TitleBar.Height = value;
+                //if (!this.Expanded)
+                //    TypeDescriptor.GetProperties(this)["Height"].SetValue(this, value);
+            }
+        }
+
+        private void OnCollapseDirectionChanged()
+        {
+            UpdateAutoGeneratedImages();
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            DisposeAutoGeneratedImages();
+            if (BarUtilities.DisposeItemImages && !this.DesignMode)
+            {
+                BarUtilities.DisposeImage(ref m_ButtonImageCollapse);
+                BarUtilities.DisposeImage(ref m_ButtonImageExpand);
+            }
+            base.Dispose(disposing);
+        }
+
+        private void SetupExpandVerticalPane()
+        {
+            m_VerticalExpandPane = new PanelEx();
+            m_VerticalExpandPane.ColorSchemeStyle = this.ColorSchemeStyle;
+            m_VerticalExpandPane.ColorScheme = this.ColorScheme;
+            m_VerticalExpandPane.ApplyButtonStyle();
+            m_VerticalExpandPane.Style.VerticalText = true;
+            m_VerticalExpandPane.Style.ForeColor.ColorSchemePart = eColorSchemePart.PanelText;
+            m_VerticalExpandPane.Style.BackColor1.ColorSchemePart = eColorSchemePart.PanelBackground;
+            m_VerticalExpandPane.Style.ResetBackColor2();
+            m_VerticalExpandPane.StyleMouseOver.VerticalText = true;
+            m_VerticalExpandPane.StyleMouseDown.VerticalText = true;
+            m_VerticalExpandPane.Dock = DockStyle.Fill;
+            m_VerticalExpandPane.Text = TitlePanel.Text;
+
+            this.Controls.Add(m_VerticalExpandPane);
+            if (this.TitleStyle.Font != null)
+                m_VerticalExpandPane.Font = this.TitleStyle.Font;
+            else if (TitlePanel.Font != null)
+                m_VerticalExpandPane.Font = TitlePanel.Font;
+            m_VerticalExpandPane.Click += new EventHandler(VerticalExpandPaneClick);
+            m_VerticalExpandPane.BringToFront();
+        }
+
+        private void VerticalExpandPaneClick(object sender, EventArgs e)
+        {
+            this.Expanded = !this.Expanded;
+        }
+        #endregion
+
+        #region Properties
+        /// <summary>
+        /// Gets or sets whether the panel is collapsed/expanded when title bar is clicked. Default value is false.
+        /// </summary>
+        [DefaultValue(false), Browsable(true), Category("Expand"), Description("Indicates whether panel is collapsed/expanded when title bar is clicked.")]
+        public bool ExpandOnTitleClick
+        {
+            get { return m_ExpandOnTitleClick; }
+            set { m_ExpandOnTitleClick = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the collapse/expand direction for the control. Default value causes the control to collapse from bottom to top.
+        /// </summary>
+        [Browsable(true), DefaultValue(eCollapseDirection.BottomToTop), Category("Expand"), Description("Indicates collapse/expand direction for the control.")]
+        public eCollapseDirection CollapseDirection
+        {
+            get { return m_CollapseDirection; }
+            set
+            {
+                m_CollapseDirection = value;
+                OnCollapseDirectionChanged();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether panel is expanded or not. Default value is true.
+        /// </summary>
+        [Browsable(true), Category("Expand"), DefaultValue(true), Description("Indicates whether panel is expaned or not. Default value is true.")]
+        public bool Expanded
+        {
+            get { return m_Expanded; }
+            set
+            {
+                if (m_Expanded != value)
+                    SetExpanded(value, eEventSource.Code);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets animation time in milliseconds. Default value is 100 miliseconds. You can set this to 0 (zero) to disable animation.
+        /// </summary>
+        [Browsable(true), DefaultValue(100), Category("Expand"), Description("Indicates animation time in milliseconds, set to 0 to disable animation.")]
+        public int AnimationTime
+        {
+            get { return m_AnimationTime; }
+            set
+            {
+                if (m_AnimationTime >= 0)
+                    m_AnimationTime = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the bounds of panel when expanded. This value is managed automatically by control based on the starting designer size and value
+        /// of Expanded property.
+        /// </summary>
+        [Browsable(false)]
+        public Rectangle ExpandedBounds
+        {
+            get { return m_ExpandedBounds; }
+            set { m_ExpandedBounds = value; }
+        }
+
+        /// <summary>
+        /// Used for design time support.
+        /// </summary>
+        /// <returns>true if property should be serialized.</returns>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeExpandedBounds()
+        {
+            return !m_ExpandedBounds.IsEmpty;
+        }
+
+        /// <summary>
+        /// Gets or sets whether expand button is visible or not. Default value is true.
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Expand Button"), Description("Indicates whether expand button is visible or not.")]
+        public bool ExpandButtonVisible
+        {
+            get { return m_TitleBar.ExpandButtonVisible; }
+            set
+            {
+                m_TitleBar.ExpandButtonVisible = value;
+            }
+        }
+
+        /// <summary>
+        /// Returns bounds of expand button. Bounds are relative to the TitlePanel coordinates.
+        /// </summary>
+        [Browsable(false)]
+        public Rectangle ExpandButtonBounds
+        {
+            get
+            {
+                return m_TitleBar.ExpandChangeButton.DisplayRectangle;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets image that is used on title bar button to collapse panel. Default value is null which indicates
+        /// that system default image is used.
+        /// </summary>
+        [Browsable(true), DefaultValue(null), Category("Title"), Description("Indicates image used on title bar to collapse panel.")]
+        public Image ButtonImageCollapse
+        {
+            get { return m_ButtonImageCollapse; }
+            set
+            {
+                m_ButtonImageCollapse = value;
+                this.UpdateExpandButtonImage();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets image that is used on title bar button to expand panel. Default value is null which indicates
+        /// that system default image is used.
+        /// </summary>
+        [Browsable(true), DefaultValue(null), Category("Title"), Description("Indicates image used on title bar to expand panel.")]
+        public Image ButtonImageExpand
+        {
+            get { return m_ButtonImageExpand; }
+            set
+            {
+                m_ButtonImageExpand = value;
+                this.UpdateExpandButtonImage();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the text for the title of the panel.
+        /// </summary>
+        [Browsable(true), DefaultValue(""), Category("Title"), Description("Indicates text for the title of the panel."), Localizable(true), Editor("DevComponents.DotNetBar.Design.TextMarkupUIEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor))]
+        public string TitleText
+        {
+            get { return m_TitleBar.Text; }
+            set
+            {
+                m_TitleBar.Text = value;
+                if (m_VerticalExpandPane != null)
+                    m_VerticalExpandPane.Text = value;
+
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the title style.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), NotifyParentPropertyAttribute(true), Category("Title"), Description("Gets or sets title style."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ItemStyle TitleStyle
+        {
+            get
+            {
+                return m_TitleBar.Style;
+            }
+        }
+        /// <summary>
+        ///     Resets the style to it's default value.
+        /// </summary>
+        public void ResetTitleStyle()
+        {
+
+            m_TitleBar.ResetStyle();
+        }
+
+        /// <summary>
+        /// Gets or sets the title style when mouse hovers over the title.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), NotifyParentPropertyAttribute(true), Category("Title"), Description("Gets or sets the title style when mouse hovers over the title."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ItemStyle TitleStyleMouseOver
+        {
+            get
+            {
+                return m_TitleBar.StyleMouseOver;
+            }
+        }
+        /// <summary>
+        ///     Resets the style to it's default value.
+        /// </summary>
+        public void ResetTitleStyleMouseOver()
+        {
+            m_TitleBar.ResetStyleMouseOver();
+        }
+
+        /// <summary>
+        /// Gets or sets the title style when mouse button is pressed on the title.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), NotifyParentPropertyAttribute(true), Category("Title"), Description("Gets or sets the Title style when mouse button is pressed on the title."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ItemStyle TitleStyleMouseDown
+        {
+            get
+            {
+                return m_TitleBar.StyleMouseDown;
+            }
+        }
+        /// <summary>
+        ///     Resets the style to it's default value.
+        /// </summary>
+        public void ResetTitleStyleMouseDown()
+        {
+            m_TitleBar.ResetStyleMouseDown();
+        }
+
+        /// <summary>
+        /// Gets or sets the height of the title portion of the panel. Height must be greater than 0. Default is 26.
+        /// </summary>
+        [Browsable(true), DefaultValue(26), Category("Title"), Description("Indicates height of the title portion of the panel.")]
+        public int TitleHeight
+        {
+            get { return GetTitleHeight(); }
+            set { SetTitleHeight(value); }
+        }
+
+        /// <summary>
+        /// Gets reference to Panel control used as title bar.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public PanelEx TitlePanel
+        {
+            get { return m_TitleBar; }
+        }
+
+        /// <summary>
+        /// Gets reference to the title bar expand button.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public ButtonItem ExpandButton
+        {
+            get { return m_TitleBar.ExpandChangeButton; }
+        }
+        /// <summary>
+        /// Gets or sets alignment of the expand button.
+        /// </summary>
+        [DefaultValue(eTitleButtonAlignment.Right), Category("Expand Button"), Description("Indicates the alignment of expand button.")]
+        public eTitleButtonAlignment ExpandButtonAlignment
+        {
+            get { return m_TitleBar.ButtonAlignment; }
+            set
+            {
+                m_TitleBar.ButtonAlignment = value;
+            }
+        }
+
+
+        /// <summary>
+        /// Gets the reference to the panel used as button when control is collapsed to the left or right.
+        /// </summary>
+        [Browsable(false)]
+        public PanelEx VerticalExpandPanel
+        {
+            get { return m_VerticalExpandPane; }
+        }
+
+        /// <summary>
+        /// Called when AntiAlias property has changed.
+        /// </summary>
+        protected override void OnAntiAliasChanged()
+        {
+            m_TitleBar.AntiAlias = this.AntiAlias;
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/ExpandablePanel.ico b/PROMS/DotNetBar Source Code/ExpandablePanel.ico
new file mode 100644
index 00000000..7cf68f72
Binary files /dev/null and b/PROMS/DotNetBar Source Code/ExpandablePanel.ico differ
diff --git a/PROMS/DotNetBar Source Code/ExpandableSplitter.bmp b/PROMS/DotNetBar Source Code/ExpandableSplitter.bmp
new file mode 100644
index 00000000..09e25baf
Binary files /dev/null and b/PROMS/DotNetBar Source Code/ExpandableSplitter.bmp differ
diff --git a/PROMS/DotNetBar Source Code/ExpandableSplitter.cs b/PROMS/DotNetBar Source Code/ExpandableSplitter.cs
new file mode 100644
index 00000000..7ccc93fb
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/ExpandableSplitter.cs	
@@ -0,0 +1,1308 @@
+using System;
+using System.ComponentModel;
+using System.ComponentModel.Design;
+using System.Drawing;
+using System.Windows.Forms;
+using System.Windows.Forms.Design;
+using DevComponents.DotNetBar.Rendering;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Represents multi-functional splitter control.
+	/// </summary>
+    [ToolboxItem(true), Designer("DevComponents.DotNetBar.Design.ExpandableSplitterDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf"), System.Runtime.InteropServices.ComVisible(false), DefaultEvent("ExpandedChanged")]
+	public class ExpandableSplitter:Splitter, IMessageHandlerClient
+	{
+		#region Private Variables
+		private int m_AnimationTime=100;
+		private Control m_ExpandableControl=null;
+		private bool m_Expanded=true;
+		private eSplitterStyle m_Style=eSplitterStyle.Office2003;
+		private bool m_Expandable=true;
+		private eShortcut m_Shortcut=eShortcut.None;
+		private bool m_FilterInstalled=false;
+		private bool m_MouseOver=false;
+		private bool m_MouseDown=false;
+		private bool m_Resized=false;
+		private Point m_MouseDownPoint=Point.Empty;
+
+		private ColorScheme m_ColorScheme=null;
+		private eColorSchemePart m_BackColorSchemePart=eColorSchemePart.None;
+		private Color m_BackColor2=Color.Empty;
+		private eColorSchemePart m_BackColor2SchemePart=eColorSchemePart.None;
+		private int m_BackColorGradientAngle=0;
+		private Color m_ExpandFillColor=Color.Empty;
+		private eColorSchemePart m_ExpandFillColorSchemePart=eColorSchemePart.None;
+		private Color m_ExpandLineColor=Color.Empty;
+		private eColorSchemePart m_ExpandLineColorSchemePart=eColorSchemePart.None;
+		private Color m_GripDarkColor=Color.Empty;
+		private eColorSchemePart m_GripDarkColorSchemePart=eColorSchemePart.None;
+		private Color m_GripLightColor=Color.Empty;
+		private eColorSchemePart m_GripLightColorSchemePart=eColorSchemePart.None;
+		// Hot colors
+		private Color m_HotBackColor=Color.Empty;
+		private eColorSchemePart m_HotBackColorSchemePart=eColorSchemePart.None;
+		private Color m_HotBackColor2=Color.Empty;
+		private eColorSchemePart m_HotBackColor2SchemePart=eColorSchemePart.None;
+		private int m_HotBackColorGradientAngle=0;
+		private Color m_HotExpandFillColor=Color.Empty;
+		private eColorSchemePart m_HotExpandFillColorSchemePart=eColorSchemePart.None;
+		private Color m_HotExpandLineColor=Color.Empty;
+		private eColorSchemePart m_HotExpandLineColorSchemePart=eColorSchemePart.None;
+		private Color m_HotGripDarkColor=Color.Empty;
+		private eColorSchemePart m_HotGripDarkColorSchemePart=eColorSchemePart.None;
+		private Color m_HotGripLightColor=Color.Empty;
+		private eColorSchemePart m_HotGripLightColorSchemePart=eColorSchemePart.None;
+
+		private SplitterPainter m_Painter=null;
+		private SplitterPaintInfo m_SplitterPaintInfo=new SplitterPaintInfo();
+		private bool m_ExpandActionClick=true;
+		private bool m_ExpandActionDoubleClick=false;
+		#endregion
+
+		#region Events
+		public event ExpandChangeEventHandler ExpandedChanging;
+		public event ExpandChangeEventHandler ExpandedChanged;
+		#endregion
+
+		#region Constructor
+		/// <summary>
+		/// Creates new instance of the object.
+		/// </summary>
+		public ExpandableSplitter():base()
+		{
+			this.SetStyle(ControlStyles.UserPaint,true);
+			this.SetStyle(ControlStyles.AllPaintingInWmPaint,true);
+			this.SetStyle(ControlStyles.Opaque,true);
+			this.SetStyle(ControlStyles.ResizeRedraw,true);
+			this.SetStyle(DisplayHelp.DoubleBufferFlag,true);
+
+			if(!ColorFunctions.ColorsLoaded)
+			{
+				NativeFunctions.RefreshSettings();
+				NativeFunctions.OnDisplayChange();
+				ColorFunctions.LoadColors();
+			}
+			m_ColorScheme=new ColorScheme(eDotNetBarStyle.Office2003);
+			this.ApplyStyle(eSplitterStyle.Office2003);
+            StyleManager.Register(this);
+		}
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing) StyleManager.Unregister(this);
+            base.Dispose(disposing);
+        }
+		#endregion
+
+		#region Display Support
+		private SplitterPainter GetPainter()
+		{
+			if(m_Painter==null)
+			{
+				switch(m_Style)
+				{
+					case eSplitterStyle.Office2003:
+                    case eSplitterStyle.Office2007:
+					{
+						m_Painter=new SplitterOffice2003Painter();
+						break;
+					}
+					case eSplitterStyle.Mozilla:
+					{
+						m_Painter=new SplitterMozillaPainter();
+						break;
+					}
+				}
+			}
+			return m_Painter;
+		}
+
+		private SplitterPaintInfo GetSplitterPaintInfo(Graphics g)
+		{
+			m_SplitterPaintInfo.Graphics=g;
+			m_SplitterPaintInfo.Colors=this.GetColors();
+			m_SplitterPaintInfo.Expandable=m_Expandable;
+			m_SplitterPaintInfo.Expanded=m_Expanded;
+			m_SplitterPaintInfo.Dock=this.Dock;
+			m_SplitterPaintInfo.DisplayRectangle=this.DisplayRectangle;
+			return m_SplitterPaintInfo;
+		}
+
+		/// <summary>
+		/// This member overrides Control.OnPaint.
+		/// </summary>
+		/// <param name="e">Event arguments.</param>
+		protected override void OnPaint(PaintEventArgs e)
+		{
+//			if(m_AntiAlias)
+//			{
+//				e.Graphics.SmoothingMode=System.Drawing.Drawing2D.SmoothingMode.AntiAlias;
+//				e.Graphics.TextRenderingHint = System.Drawing.Text.TextRenderingHint.ClearTypeGridFit;
+//			}
+
+			this.GetPainter().Paint(this.GetSplitterPaintInfo(e.Graphics));
+		}
+		
+		#endregion
+
+		#region Properties
+//		/// <summary>
+//		/// Gets or sets whether anti-alias smoothing is used while painting.
+//		/// </summary>
+//		[DefaultValue(false),Browsable(true),Category("Appearance"),Description("Gets or sets whether anti-aliasing is used while painting.")]
+//		public bool AntiAlias
+//		{
+//			get {return m_AntiAlias;}
+//			set
+//			{
+//				if(m_AntiAlias!=value)
+//				{
+//					m_AntiAlias=value;
+//					this.Refresh();
+//				}
+//			}
+//		}
+
+		/// <summary>
+		/// Gets or sets whether expandable control ExpandableControl assigned to this splitter is expaned or not. Default value is true.
+		/// </summary>
+		[Browsable(true),Category("Expand"),DefaultValue(true),Description("Indicates whether expandable control ExpandableControl assigned to this splitter is expaned or not. Default value is true.")]
+		public bool Expanded
+		{
+			get {return m_Expanded;}
+			set
+			{
+				if(m_Expanded!=value)
+					SetExpanded(value,eEventSource.Code);
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets whether Click event is triggering expand/collapse of the splitter. Default value is true.
+		/// </summary>
+		[Browsable(true),Category("Expand"),DefaultValue(true),Description("Indicates whether Click event is triggering expand/collapse of the splitter. Default value is true.")]
+		public bool ExpandActionClick
+		{
+			get {return m_ExpandActionClick;}
+			set {m_ExpandActionClick=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets whether DoubleClick event is triggering expand/collapse of the splitter. Default value is false.
+		/// </summary>
+		[Browsable(true),Category("Expand"),DefaultValue(false),Description("Indicates whether DoubleClick event is triggering expand/collapse of the splitter. Default value is false.")]
+		public bool ExpandActionDoubleClick
+		{
+			get {return m_ExpandActionDoubleClick;}
+			set {m_ExpandActionDoubleClick=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets whether splitter will act as expandable splitter. Default value is true. When set to true ExpandableControl property should be set to the control that should be expanded/collapsed.
+		/// </summary>
+		[Browsable(true),Category("Expand"),DefaultValue(true),Description("Indicates whether splitter will act as expandable splitter. Default value is true.")]
+		public bool Expandable
+		{
+			get {return m_Expandable;}
+			set
+			{
+				m_Expandable=value;
+				this.Refresh();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the control that will be expanded/collapsed by the splitter. Default value is null. Expandable property should be also set to true (default) to enable expand/collapse functionality.
+		/// </summary>
+		[Browsable(true),Category("Expand"),DefaultValue(null),Description("Indicates control that will be expanded/collapsed by the splitter.")]
+		public Control ExpandableControl
+		{
+			get {return m_ExpandableControl;}
+			set
+			{
+				if(value==this)
+					return;
+				m_ExpandableControl=value;
+				this.OnExpandableControlChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets visual style of the control. Default value is eSplitterStyle.Office2003.
+		/// </summary>
+		[Browsable(true),Category("Appearance"),DefaultValue(eSplitterStyle.Office2003),Description("Indicates visual style of the control.")]
+		public eSplitterStyle Style
+		{
+			get {return m_Style;}
+			set
+			{
+				m_Style=value;
+				OnStyleChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets animation time in milliseconds. Default value is 100 miliseconds. You can set this to 0 (zero) to disable animation.
+		/// </summary>
+		[Browsable(true),DefaultValue(100),Category("Expand"),Description("Indicates animation time in milliseconds, default value is 100.")]
+		public int AnimationTime
+		{
+			get {return m_AnimationTime;}
+			set
+			{
+				if(m_AnimationTime>=0)
+					m_AnimationTime=value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the shortcut key to expand/collapse splitter.
+		/// </summary>
+		[Browsable(true),Category("Expand"),DefaultValue(eShortcut.None),Description("Indicates shortcut key to expand/collapse splitter."),]
+		public eShortcut Shortcut
+		{
+			get {return m_Shortcut;}
+			set
+			{
+				m_Shortcut=value;
+				if(m_Shortcut!=eShortcut.None && this.IsHandleCreated)
+					InstallIMessageHandlerClient();
+			}
+		}
+		#endregion
+
+		#region Private Implementation
+		private void OnExpandedChanged()
+		{
+			if(this.ExpandableControl==null)
+				return;
+			
+			if(this.Expanded)
+			{
+				if(!this.ExpandableControl.Visible)
+				{
+					if(this.AnimationTime==0 || this.DesignMode)
+					{
+						if(this.DesignMode)
+							TypeDescriptor.GetProperties(this.ExpandableControl)["Visible"].SetValue(this.ExpandableControl,true);
+						this.ExpandableControl.Visible=true;
+					}
+					else
+					{
+						Rectangle controlRect=GetAnimationTarget(this.ExpandableControl,false);
+						Rectangle targetRect=this.ExpandableControl.Bounds;
+						BarFunctions.AnimateControl(this.ExpandableControl,true,m_AnimationTime,controlRect,targetRect);
+					}
+				}
+			}
+			else
+			{
+				if(this.ExpandableControl.Visible || !this.IsHandleCreated)
+				{
+					if(this.AnimationTime==0 || this.DesignMode || !this.IsHandleCreated)
+					{
+						if(this.DesignMode)
+							TypeDescriptor.GetProperties(this.ExpandableControl)["Visible"].SetValue(this.ExpandableControl,false);
+						this.ExpandableControl.Visible=false;
+					}
+					else
+					{
+						Rectangle controlRect=this.ExpandableControl.Bounds;
+						Rectangle targetRect=GetAnimationTarget(this.ExpandableControl,false);
+						BarFunctions.AnimateControl(this.ExpandableControl,false,m_AnimationTime,controlRect,targetRect);
+						this.ExpandableControl.Visible=false;
+						this.ExpandableControl.Bounds=controlRect;
+					}
+				}
+			}
+			this.Refresh();
+		}
+
+		private Rectangle GetAnimationTarget(Control c, bool showControl)
+		{
+			Rectangle r=Rectangle.Empty;
+			DockStyle dock=GetControlDock(c);
+			if(!showControl)
+			{
+				if(dock==DockStyle.Left)
+				{
+					r=new Rectangle(c.Left,c.Top,0,c.Height);
+				}
+				else if(dock==DockStyle.Right)
+				{
+					r=new Rectangle(c.Right,c.Top,0,c.Height);
+				}
+				else if(dock==DockStyle.Top)
+				{
+					r=new Rectangle(c.Left,c.Top,c.Width,0);
+				}
+				else if(dock==DockStyle.Bottom)
+				{
+					r=new Rectangle(c.Left,c.Bottom,c.Width,0);
+				}
+			}
+			else
+			{
+				if(dock==DockStyle.Left)
+				{
+					r=new Rectangle(c.Left,c.Top,c.Width,c.Height);
+				}
+				else if(dock==DockStyle.Right)
+				{
+					r=new Rectangle(c.Left-c.Width,c.Top,c.Width,c.Height);
+				}
+				else if(dock==DockStyle.Top)
+				{
+					r=new Rectangle(c.Left,c.Top,c.Width,c.Height);
+				}
+				else if(dock==DockStyle.Bottom)
+				{
+					r=new Rectangle(c.Left,c.Top-c.Height,c.Width,c.Height);
+				}
+			}
+
+			return r;
+		}
+
+		private DockStyle GetControlDock(Control c)
+		{
+			if(c.Dock==DockStyle.None)
+			{
+				if(c.Right<this.Left)
+					return DockStyle.Left;
+				else if(c.Left>this.Right)
+					return DockStyle.Right;
+				else if(c.Bottom<this.Top)
+					return DockStyle.Top;
+				else if(c.Top>this.Bottom)
+					return DockStyle.Bottom;
+				return DockStyle.Left;
+			}
+			else if(c.Dock==DockStyle.Fill)
+				return DockStyle.Left;
+			return c.Dock;
+		}
+
+		private void OnExpandableControlChanged()
+		{
+			
+		}
+
+		protected override void OnHandleCreated(EventArgs e)
+		{
+			base.OnHandleCreated(e);
+			InstallIMessageHandlerClient();
+		}
+
+		protected override void OnHandleDestroyed(EventArgs e)
+		{
+			base.OnHandleDestroyed(e);
+			UninstallIMessageHandlerClient();			
+		}
+
+		protected override void OnClick(EventArgs e)
+		{
+			base.OnClick(e);
+			if(this.Expandable && m_MouseOver && !m_Resized && m_ExpandActionClick)
+			{
+				SetExpanded(!this.Expanded,eEventSource.Mouse);
+			}
+			m_Resized=false;
+		}
+
+		protected override void OnDoubleClick(EventArgs e)
+		{
+			base.OnDoubleClick(e);
+			if(this.Expandable && m_MouseOver && m_ExpandActionDoubleClick)
+			{
+				SetExpanded(!this.Expanded,eEventSource.Mouse);
+			}
+		}
+
+		protected override void OnMouseDown(MouseEventArgs e)
+		{
+			if(m_MouseDown)
+			{
+				base.OnMouseDown(e);
+			}
+			else
+			{
+				m_Resized=false;
+				m_MouseDownPoint=new Point(e.X,e.Y);
+			}
+		}
+
+		protected override void OnMouseUp(MouseEventArgs e)
+		{
+			m_MouseDown=false;
+			base.OnMouseUp(e);
+		}
+
+		protected override void OnMouseEnter(EventArgs e)
+		{
+			base.OnMouseEnter(e);
+			m_MouseOver=true;
+			this.Refresh();
+		}
+
+		protected override void OnMouseLeave(EventArgs e)
+		{
+			base.OnMouseLeave(e);
+			m_MouseOver=false;
+			this.Refresh();
+		}
+
+		protected override void OnMouseMove(MouseEventArgs e)
+		{
+			base.OnMouseMove(e);
+			if(!this.DisplayRectangle.Contains(e.X,e.Y) && !m_MouseDown && e.Button==MouseButtons.Left)
+			{
+				m_MouseDown=true;
+				m_Resized=true;
+				this.OnMouseDown(new MouseEventArgs(e.Button,1,m_MouseDownPoint.X,m_MouseDownPoint.Y,e.Delta));
+			}
+		}
+
+		private void InvokeExpandedChanging(ExpandedChangeEventArgs e)
+		{
+			if(ExpandedChanging!=null)
+				ExpandedChanging(this,e);
+		}
+		private void InvokeExpandedChanged(ExpandedChangeEventArgs e)
+		{
+			if(ExpandedChanged!=null)
+				ExpandedChanged(this,e);
+		}
+
+		private void SetExpanded(bool expanded, eEventSource action)
+		{
+			ExpandedChangeEventArgs e=new ExpandedChangeEventArgs(action,expanded);
+			InvokeExpandedChanging(e);
+			if(e.Cancel)
+				return;
+			m_Expanded=expanded;
+			OnExpandedChanged();
+			InvokeExpandedChanged(e);
+		}
+
+		private void OnStyleChanged()
+		{
+			m_Painter=null;
+			this.Invalidate();
+		}
+		#endregion
+
+		#region Color Support
+		/// <summary>
+		/// Gets or sets the background color for UI element. If used in combination with
+		/// BackgroundColor2 is specifies starting gradient color.
+		/// </summary>
+		[Browsable(true),Category("Colors"),Description("Gets or sets the background color for UI element."),Editor(typeof(ColorTypeEditor), typeof(System.Drawing.Design.UITypeEditor))]
+		public new Color BackColor
+		{
+			get
+			{
+				return GetColor(base.BackColor,m_BackColorSchemePart);
+			}
+			set
+			{
+				if(m_BackColorSchemePart!=eColorSchemePart.None && !value.IsEmpty)
+					this.BackColorSchemePart=eColorSchemePart.None;
+				base.BackColor=value;
+				this.OnStyleChanged();
+			}
+		}
+		/// <summary>
+		/// Resets BackgroundColor to it's default value. Used by windows forms designer design-time support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public new void ResetBackColor()
+		{
+			base.BackColor=Color.Empty;
+		}
+
+		/// <summary>
+		/// Gets or sets the color scheme color that is used as background color. Setting
+		/// this property overrides the setting of the corresponding BackColor property.
+		/// Color scheme colors are automatically managed and are based on current system colors.
+		/// That means if colors on the system change the color scheme will ensure that it's colors
+		/// are changed as well to fit in the color scheme of target system. Set this property to
+		/// eColorSchemePart.None to
+		/// specify explicit color to use through BackColor property.
+		/// </summary>
+		[Browsable(false)]
+		public eColorSchemePart BackColorSchemePart
+		{
+			get {return m_BackColorSchemePart;}
+			set
+			{
+				m_BackColorSchemePart=value;
+				this.OnStyleChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the target gradient background color for UI element.
+		/// </summary>
+		[Browsable(true),Category("Colors"),Description("Gets or sets the target gradient background color for UI element.")]
+		public Color BackColor2
+		{
+			get {return GetColor(m_BackColor2,m_BackColor2SchemePart);}
+			set
+			{
+				if(m_BackColor2SchemePart!=eColorSchemePart.None && !value.IsEmpty)
+					this.BackColor2SchemePart=eColorSchemePart.None;
+				m_BackColor2=value;
+				this.OnStyleChanged();
+			}
+		}
+		/// <summary>
+		/// Resets BackgroundColor2 to it's default value. Used by windows forms designer design-time support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetBackColor2()
+		{
+			m_BackColor2=Color.Empty;
+		}
+
+		/// <summary>
+		/// Gets or sets the color scheme color that is used as target gradient background color. Setting
+		/// this property overrides the setting of the corresponding BackColor2 property.
+		/// Color scheme colors are automatically managed and are based on current system colors.
+		/// That means if colors on the system change the color scheme will ensure that it's colors
+		/// are changed as well to fit in the color scheme of target system. Set this property to
+		/// eColorSchemePart.None to
+		/// specify explicit color to use through BackColor2 property.
+		/// </summary>
+		[Browsable(false)]
+		public eColorSchemePart BackColor2SchemePart
+		{
+			get {return m_BackColor2SchemePart;}
+			set
+			{
+				m_BackColor2SchemePart=value;
+				this.OnStyleChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the background gradient angle.
+		/// </summary>
+		[Browsable(true),Category("Background"),DefaultValue(0),Description("Gets or sets the background gradient angle.")]
+		public int BackColorGradientAngle
+		{
+			get
+			{
+				return m_BackColorGradientAngle;
+			}
+			set
+			{
+				if(m_BackColorGradientAngle!=value)
+				{
+					m_BackColorGradientAngle=value;
+					this.OnStyleChanged();
+
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the expand part fill color.
+		/// </summary>
+		[Browsable(true),Category("Colors"),Description("Indicates expand part fill color.")]
+		public Color ExpandFillColor
+		{
+			get {return GetColor(m_ExpandFillColor,m_ExpandFillColorSchemePart);}
+			set
+			{
+				if(m_ExpandFillColorSchemePart!=eColorSchemePart.None && !value.IsEmpty)
+					this.ExpandFillColorSchemePart=eColorSchemePart.None;
+				m_ExpandFillColor=value;
+				this.OnStyleChanged();
+			}
+		}
+		/// <summary>
+		/// Resets BackgroundColor2 to it's default value. Used by windows forms designer design-time support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetExpandFillColor()
+		{
+			m_ExpandFillColor=Color.Empty;
+		}
+		/// <summary>
+		/// Gets or sets the color scheme color that is used expand part fill color. Setting
+		/// this property overrides the setting of the corresponding ExpandFillColor property.
+		/// Color scheme colors are automatically managed and are based on current system colors.
+		/// That means if colors on the system change the color scheme will ensure that it's colors
+		/// are changed as well to fit in the color scheme of target system. Set this property to
+		/// eColorSchemePart.None to
+		/// specify explicit color to use through ExpandFillColor property.
+		/// </summary>
+		[Browsable(false)]
+		public eColorSchemePart ExpandFillColorSchemePart
+		{
+			get {return m_ExpandFillColorSchemePart;}
+			set
+			{
+				m_ExpandFillColorSchemePart=value;
+				this.OnStyleChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the expand part line color.
+		/// </summary>
+		[Browsable(true),Category("Colors"),Description("Indicates expand part line color.")]
+		public Color ExpandLineColor
+		{
+			get {return GetColor(m_ExpandLineColor,m_ExpandLineColorSchemePart);}
+			set
+			{
+				if(m_ExpandLineColorSchemePart!=eColorSchemePart.None && !value.IsEmpty)
+					this.ExpandLineColorSchemePart=eColorSchemePart.None;
+				m_ExpandLineColor=value;
+				this.OnStyleChanged();
+			}
+		}
+		/// <summary>
+		/// Resets BackgroundColor2 to it's default value. Used by windows forms designer design-time support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetExpandLineColor()
+		{
+			m_ExpandLineColor=Color.Empty;
+		}
+		/// <summary>
+		/// Gets or sets the color scheme color that is used expand part line color. Setting
+		/// this property overrides the setting of the corresponding ExpandLineColor property.
+		/// Color scheme colors are automatically managed and are based on current system colors.
+		/// That means if colors on the system change the color scheme will ensure that it's colors
+		/// are changed as well to fit in the color scheme of target system. Set this property to
+		/// eColorSchemePart.None to
+		/// specify explicit color to use through ExpandLineColor property.
+		/// </summary>
+		[Browsable(false)]
+		public eColorSchemePart ExpandLineColorSchemePart
+		{
+			get {return m_ExpandLineColorSchemePart;}
+			set
+			{
+				m_ExpandLineColorSchemePart=value;
+				this.OnStyleChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the grip part dark color.
+		/// </summary>
+		[Browsable(true),Category("Colors"),Description("Indicates expand part line color.")]
+		public Color GripDarkColor
+		{
+			get {return GetColor(m_GripDarkColor,m_GripDarkColorSchemePart);}
+			set
+			{
+				if(m_GripDarkColorSchemePart!=eColorSchemePart.None && !value.IsEmpty)
+					this.GripDarkColorSchemePart=eColorSchemePart.None;
+				m_GripDarkColor=value;
+				this.OnStyleChanged();
+			}
+		}
+		/// <summary>
+		/// Resets BackgroundColor2 to it's default value. Used by windows forms designer design-time support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetGripDarkColor()
+		{
+			m_GripDarkColor=Color.Empty;
+		}
+		/// <summary>
+		/// Gets or sets the color scheme color that is used grip part dark color. Setting
+		/// this property overrides the setting of the corresponding GripDarkColor property.
+		/// Color scheme colors are automatically managed and are based on current system colors.
+		/// That means if colors on the system change the color scheme will ensure that it's colors
+		/// are changed as well to fit in the color scheme of target system. Set this property to
+		/// eColorSchemePart.None to
+		/// specify explicit color to use through GripDarkColor property.
+		/// </summary>
+		[Browsable(false)]
+		public eColorSchemePart GripDarkColorSchemePart
+		{
+			get {return m_GripDarkColorSchemePart;}
+			set
+			{
+				m_GripDarkColorSchemePart=value;
+				this.OnStyleChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the expand part line color.
+		/// </summary>
+		[Browsable(true),Category("Colors"),Description("Indicates expand part line color.")]
+		public Color GripLightColor
+		{
+			get {return GetColor(m_GripLightColor,m_GripLightColorSchemePart);}
+			set
+			{
+				if(m_GripLightColorSchemePart!=eColorSchemePart.None && !value.IsEmpty)
+					this.GripLightColorSchemePart=eColorSchemePart.None;
+				m_GripLightColor=value;
+				this.OnStyleChanged();
+			}
+		}
+		/// <summary>
+		/// Resets BackgroundColor2 to it's default value. Used by windows forms designer design-time support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetGripLightColor()
+		{
+			m_GripLightColor=Color.Empty;
+		}
+		/// <summary>
+		/// Gets or sets the color scheme color that is used expand part line color. Setting
+		/// this property overrides the setting of the corresponding GripLightColor property.
+		/// Color scheme colors are automatically managed and are based on current system colors.
+		/// That means if colors on the system change the color scheme will ensure that it's colors
+		/// are changed as well to fit in the color scheme of target system. Set this property to
+		/// eColorSchemePart.None to
+		/// specify explicit color to use through GripLightColor property.
+		/// </summary>
+		[Browsable(false)]
+		public eColorSchemePart GripLightColorSchemePart
+		{
+			get {return m_GripLightColorSchemePart;}
+			set
+			{
+				m_GripLightColorSchemePart=value;
+				this.OnStyleChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the background color for UI element when mouse is over the element. If used in combination with
+		/// BackgroundColor2 is specifies starting gradient color.
+		/// </summary>
+		[Browsable(true),Category("Colors"),Description("Gets or sets the background color for UI element when mouse is over the element."),Editor(typeof(ColorTypeEditor), typeof(System.Drawing.Design.UITypeEditor))]
+		public Color HotBackColor
+		{
+			get
+			{
+				return GetColor(m_HotBackColor,m_HotBackColorSchemePart);
+			}
+			set
+			{
+				if(m_HotBackColorSchemePart!=eColorSchemePart.None && !value.IsEmpty)
+					this.HotBackColorSchemePart=eColorSchemePart.None;
+				m_HotBackColor=value;
+				this.OnStyleChanged();
+			}
+		}
+		/// <summary>
+		/// Resets BackgroundColor to it's default value. Used by windows forms designer design-time support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetHotBackColor()
+		{
+			m_HotBackColor=Color.Empty;
+		}
+
+		/// <summary>
+		/// Gets or sets the color scheme color that is used as background color when mouse is over the element. Setting
+		/// this property overrides the setting of the corresponding HotBackColor property.
+		/// Color scheme colors are automatically managed and are based on current system colors.
+		/// That means if colors on the system change the color scheme will ensure that it's colors
+		/// are changed as well to fit in the color scheme of target system. Set this property to
+		/// eColorSchemePart.None to
+		/// specify explicit color to use through HotBackColor property.
+		/// </summary>
+		[Browsable(false)]
+		public eColorSchemePart HotBackColorSchemePart
+		{
+			get {return m_HotBackColorSchemePart;}
+			set
+			{
+				m_HotBackColorSchemePart=value;
+				this.OnStyleChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the target gradient background color for UI element when mouse is over the element.
+		/// </summary>
+		[Browsable(true),Category("Colors"),Description("Gets or sets the target gradient background color for UI element when mouse is over the element.")]
+		public Color HotBackColor2
+		{
+			get {return GetColor(m_HotBackColor2,m_HotBackColor2SchemePart);}
+			set
+			{
+				if(m_HotBackColor2SchemePart!=eColorSchemePart.None && !value.IsEmpty)
+					this.HotBackColor2SchemePart=eColorSchemePart.None;
+				m_HotBackColor2=value;
+				this.OnStyleChanged();
+			}
+		}
+		/// <summary>
+		/// Resets BackgroundColor2 to it's default value. Used by windows forms designer design-time support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetHotBackColor2()
+		{
+			m_HotBackColor2=Color.Empty;
+		}
+
+		/// <summary>
+		/// Gets or sets the color scheme color that is used as target gradient background color when mouse is over the element. Setting
+		/// this property overrides the setting of the corresponding HotBackColor2 property.
+		/// Color scheme colors are automatically managed and are based on current system colors.
+		/// That means if colors on the system change the color scheme will ensure that it's colors
+		/// are changed as well to fit in the color scheme of target system. Set this property to
+		/// eColorSchemePart.None to
+		/// specify explicit color to use through HotBackColor2 property.
+		/// </summary>
+		[Browsable(false)]
+		public eColorSchemePart HotBackColor2SchemePart
+		{
+			get {return m_HotBackColor2SchemePart;}
+			set
+			{
+				m_HotBackColor2SchemePart=value;
+				this.OnStyleChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the background gradient angle when mouse is over the element.
+		/// </summary>
+		[Browsable(true),Category("Background"),DefaultValue(0),Description("Gets or sets the background gradient angle when mouse is over the element.")]
+		public int HotBackColorGradientAngle
+		{
+			get
+			{
+				return m_HotBackColorGradientAngle;
+			}
+			set
+			{
+				if(m_HotBackColorGradientAngle!=value)
+				{
+					m_HotBackColorGradientAngle=value;
+					this.OnStyleChanged();
+
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the expand part fill color when mouse is over the element.
+		/// </summary>
+		[Browsable(true),Category("Colors"),Description("Indicates expand part fill color when mouse is over the element.")]
+		public Color HotExpandFillColor
+		{
+			get {return GetColor(m_HotExpandFillColor,m_HotExpandFillColorSchemePart);}
+			set
+			{
+				if(m_HotExpandFillColorSchemePart!=eColorSchemePart.None && !value.IsEmpty)
+					this.HotExpandFillColorSchemePart=eColorSchemePart.None;
+				m_HotExpandFillColor=value;
+				this.OnStyleChanged();
+			}
+		}
+		/// <summary>
+		/// Resets BackgroundColor2 to it's default value. Used by windows forms designer design-time support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetHotExpandFillColor()
+		{
+			m_HotExpandFillColor=Color.Empty;
+		}
+		/// <summary>
+		/// Gets or sets the color scheme color that is used expand part fill color when mouse is over the element. Setting
+		/// this property overrides the setting of the corresponding HotExpandFillColor property.
+		/// Color scheme colors are automatically managed and are based on current system colors.
+		/// That means if colors on the system change the color scheme will ensure that it's colors
+		/// are changed as well to fit in the color scheme of target system. Set this property to
+		/// eColorSchemePart.None to
+		/// specify explicit color to use through HotExpandFillColor property.
+		/// </summary>
+		[Browsable(false)]
+		public eColorSchemePart HotExpandFillColorSchemePart
+		{
+			get {return m_HotExpandFillColorSchemePart;}
+			set
+			{
+				m_HotExpandFillColorSchemePart=value;
+				this.OnStyleChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the expand part line color when mouse is over the element.
+		/// </summary>
+		[Browsable(true),Category("Colors"),Description("Indicates expand part line color when mouse is over the element.")]
+		public Color HotExpandLineColor
+		{
+			get {return GetColor(m_HotExpandLineColor,m_HotExpandLineColorSchemePart);}
+			set
+			{
+				if(m_HotExpandLineColorSchemePart!=eColorSchemePart.None && !value.IsEmpty)
+					this.HotExpandLineColorSchemePart=eColorSchemePart.None;
+				m_HotExpandLineColor=value;
+				this.OnStyleChanged();
+			}
+		}
+		/// <summary>
+		/// Resets BackgroundColor2 to it's default value. Used by windows forms designer design-time support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetHotExpandLineColor()
+		{
+			m_HotExpandLineColor=Color.Empty;
+		}
+		/// <summary>
+		/// Gets or sets the color scheme color that is used expand part line color when mouse is over the element. Setting
+		/// this property overrides the setting of the corresponding HotExpandLineColor property.
+		/// Color scheme colors are automatically managed and are based on current system colors.
+		/// That means if colors on the system change the color scheme will ensure that it's colors
+		/// are changed as well to fit in the color scheme of target system. Set this property to
+		/// eColorSchemePart.None to
+		/// specify explicit color to use through HotExpandLineColor property.
+		/// </summary>
+		[Browsable(false)]
+		public eColorSchemePart HotExpandLineColorSchemePart
+		{
+			get {return m_HotExpandLineColorSchemePart;}
+			set
+			{
+				m_HotExpandLineColorSchemePart=value;
+				this.OnStyleChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the grip part dark color when mouse is over the element.
+		/// </summary>
+		[Browsable(true),Category("Colors"),Description("Indicates expand part line color when mouse is over the element.")]
+		public Color HotGripDarkColor
+		{
+			get {return GetColor(m_HotGripDarkColor,m_HotGripDarkColorSchemePart);}
+			set
+			{
+				if(m_HotGripDarkColorSchemePart!=eColorSchemePart.None && !value.IsEmpty)
+					this.HotGripDarkColorSchemePart=eColorSchemePart.None;
+				m_HotGripDarkColor=value;
+				this.OnStyleChanged();
+			}
+		}
+		/// <summary>
+		/// Resets BackgroundColor2 to it's default value. Used by windows forms designer design-time support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetHotGripDarkColor()
+		{
+			m_HotGripDarkColor=Color.Empty;
+		}
+		/// <summary>
+		/// Gets or sets the color scheme color that is used grip part dark color when mouse is over the element. Setting
+		/// this property overrides the setting of the corresponding HotGripDarkColor property.
+		/// Color scheme colors are automatically managed and are based on current system colors.
+		/// That means if colors on the system change the color scheme will ensure that it's colors
+		/// are changed as well to fit in the color scheme of target system. Set this property to
+		/// eColorSchemePart.None to
+		/// specify explicit color to use through HotGripDarkColor property.
+		/// </summary>
+		[Browsable(false)]
+		public eColorSchemePart HotGripDarkColorSchemePart
+		{
+			get {return m_HotGripDarkColorSchemePart;}
+			set
+			{
+				m_HotGripDarkColorSchemePart=value;
+				this.OnStyleChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the grip part light color when mouse is over the element.
+		/// </summary>
+		[Browsable(true),Category("Colors"),Description("Indicates grip part light color when mouse is over the element.")]
+		public Color HotGripLightColor
+		{
+			get {return GetColor(m_HotGripLightColor,m_HotGripLightColorSchemePart);}
+			set
+			{
+				if(m_HotGripLightColorSchemePart!=eColorSchemePart.None && !value.IsEmpty)
+					this.HotGripLightColorSchemePart=eColorSchemePart.None;
+				m_HotGripLightColor=value;
+				this.OnStyleChanged();
+			}
+		}
+		/// <summary>
+		/// Resets BackgroundColor2 to it's default value. Used by windows forms designer design-time support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetHotGripLightColor()
+		{
+			m_HotGripLightColor=Color.Empty;
+		}
+		/// <summary>
+		/// Gets or sets the color scheme color that is used grip part light color when mouse is over the element. Setting
+		/// this property overrides the setting of the corresponding HotGripLightColor property.
+		/// Color scheme colors are automatically managed and are based on current system colors.
+		/// That means if colors on the system change the color scheme will ensure that it's colors
+		/// are changed as well to fit in the color scheme of target system. Set this property to
+		/// eColorSchemePart.None to
+		/// specify explicit color to use through HotGripLightColor property.
+		/// </summary>
+		[Browsable(false)]
+		public eColorSchemePart HotGripLightColorSchemePart
+		{
+			get {return m_HotGripLightColorSchemePart;}
+			set
+			{
+				m_HotGripLightColorSchemePart=value;
+				this.OnStyleChanged();
+			}
+		}
+
+		private Color GetColor(Color color, eColorSchemePart p)
+		{
+			if(p==eColorSchemePart.None || p==eColorSchemePart.Custom)
+				return color;
+			ColorScheme cs=this.GetColorScheme();
+			if(cs==null)
+				return color;
+			return (Color)cs.GetType().GetProperty(p.ToString()).GetValue(cs,null);
+		}
+
+		private ColorScheme GetColorScheme()
+		{
+            if (this.Style == eSplitterStyle.Office2007 && GlobalManager.Renderer is Office2007Renderer)
+            {
+                return ((Office2007Renderer)GlobalManager.Renderer).ColorTable.LegacyColors;
+            }
+
+			return m_ColorScheme;
+		}
+
+		private SplitterColors GetColors()
+		{
+			SplitterColors colors=new SplitterColors();
+			if(m_MouseOver && !this.HotBackColor.IsEmpty)
+			{
+				colors.BackColor=this.HotBackColor;
+				colors.BackColor2=this.HotBackColor2;
+				colors.BackColorGradientAngle=this.HotBackColorGradientAngle;
+				colors.ExpandFillColor=this.HotExpandFillColor;
+				colors.ExpandLineColor=this.HotExpandLineColor;
+				colors.GripDarkColor=this.HotGripDarkColor;
+				colors.GripLightColor=this.HotGripLightColor;
+			}
+			else
+			{
+				colors.BackColor=this.BackColor;
+				colors.BackColor2=this.BackColor2;
+				colors.BackColorGradientAngle=this.BackColorGradientAngle;
+				colors.ExpandFillColor=this.ExpandFillColor;
+				colors.ExpandLineColor=this.ExpandLineColor;
+				colors.GripDarkColor=this.GripDarkColor;
+				colors.GripLightColor=this.GripLightColor;
+			}
+
+			return colors;
+		}
+
+		/// <summary>
+		/// Apply default splitter style colors.
+		/// </summary>
+		/// <param name="style">Style colors to apply.</param>
+		public void ApplyStyle(eSplitterStyle style)
+		{
+			if(style==eSplitterStyle.Office2003)
+			{
+				m_ColorScheme=new ColorScheme(eDotNetBarStyle.Office2003);
+				this.BackColorSchemePart=eColorSchemePart.PanelBackground;
+				this.BackColor2SchemePart=eColorSchemePart.PanelBorder;
+				this.GripLightColorSchemePart=eColorSchemePart.BarBackground;
+				this.GripDarkColorSchemePart=eColorSchemePart.ItemText;
+				this.ExpandFillColorSchemePart=eColorSchemePart.PanelBorder;
+				this.ExpandLineColorSchemePart=eColorSchemePart.ItemText;
+				
+				this.HotBackColorSchemePart=eColorSchemePart.ItemPressedBackground;
+				this.HotBackColor2SchemePart=eColorSchemePart.ItemPressedBackground2;
+				this.HotGripLightColorSchemePart=eColorSchemePart.BarBackground;
+				this.HotGripDarkColorSchemePart=eColorSchemePart.PanelBorder;
+				this.HotExpandFillColorSchemePart=eColorSchemePart.PanelBorder;
+				this.HotExpandLineColorSchemePart=eColorSchemePart.ItemText;
+			}
+            else if (style == eSplitterStyle.Office2007)
+            {
+                m_ColorScheme = new ColorScheme(eDotNetBarStyle.Office2007);
+                this.BackColorSchemePart = eColorSchemePart.PanelBackground;
+                this.BackColor2SchemePart = eColorSchemePart.PanelBorder;
+                this.GripLightColorSchemePart = eColorSchemePart.BarBackground;
+                this.GripDarkColorSchemePart = eColorSchemePart.ItemText;
+                this.ExpandFillColorSchemePart = eColorSchemePart.PanelBorder;
+                this.ExpandLineColorSchemePart = eColorSchemePart.ItemText;
+
+                this.HotBackColorSchemePart = eColorSchemePart.ItemPressedBackground;
+                this.HotBackColor2SchemePart = eColorSchemePart.ItemPressedBackground2;
+                this.HotGripLightColorSchemePart = eColorSchemePart.BarBackground;
+                this.HotGripDarkColorSchemePart = eColorSchemePart.PanelBorder;
+                this.HotExpandFillColorSchemePart = eColorSchemePart.PanelBorder;
+                this.HotExpandLineColorSchemePart = eColorSchemePart.ItemText;
+            }
+			else if(style==eSplitterStyle.Mozilla)
+			{
+				m_ColorScheme=new ColorScheme(eDotNetBarStyle.VS2005);
+				this.BackColorSchemePart=eColorSchemePart.None;
+				this.BackColor=SystemColors.ControlLight;
+				this.BackColor2SchemePart=eColorSchemePart.None;
+				this.BackColor2=Color.Empty;
+				this.GripLightColorSchemePart=eColorSchemePart.MenuBackground;
+				this.GripDarkColorSchemePart=eColorSchemePart.ItemPressedBorder;
+				this.ExpandFillColorSchemePart=eColorSchemePart.ItemPressedBackground;
+				this.ExpandLineColorSchemePart=eColorSchemePart.ItemPressedBorder;
+				
+				this.HotBackColorSchemePart=eColorSchemePart.ItemCheckedBackground;
+				this.HotBackColor2=Color.Empty;
+				this.HotBackColor2SchemePart=eColorSchemePart.None;
+				this.HotGripLightColorSchemePart=eColorSchemePart.MenuBackground;
+				this.HotGripDarkColorSchemePart=eColorSchemePart.ItemPressedBorder;
+				this.HotExpandFillColorSchemePart=eColorSchemePart.ItemPressedBackground;
+				this.HotExpandLineColorSchemePart=eColorSchemePart.ItemPressedBorder;
+			}
+		}
+		#endregion
+
+		#region IMessageHandlerClient Implementation
+        
+		bool IMessageHandlerClient.IsModal
+		{
+			get
+			{
+				Form form=this.FindForm();
+				if(form!=null)
+					return form.Modal;
+				return false;
+			}
+		}
+        bool IMessageHandlerClient.OnMouseWheel(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+            return false;
+        }
+        bool IMessageHandlerClient.OnKeyDown(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+            // Check Shortcuts
+            int wParamInt = WinApi.ToInt(wParam);
+            if (System.Windows.Forms.Control.ModifierKeys != Keys.None || wParamInt>= (int)eShortcut.F1 && wParamInt<= (int)eShortcut.F12)
+            {
+                int i = (int)System.Windows.Forms.Control.ModifierKeys | wParamInt;
+                if (ProcessShortcut((eShortcut)i))
+                    return true;
+            }
+            return false;
+        }
+		private bool ProcessShortcut(eShortcut key)
+		{
+			if(key==m_Shortcut && this.Expandable)
+			{
+				SetExpanded(!this.Expanded,eEventSource.Keyboard);
+			}
+			return false;
+		}
+		bool IMessageHandlerClient.OnMouseDown(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+		{
+			return false;
+		}
+		bool IMessageHandlerClient.OnMouseMove(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+		{
+			return false;
+		}
+        bool IMessageHandlerClient.OnSysKeyDown(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+            if (!this.DesignMode)
+            {
+                // Check Shortcuts
+                int wParamInt = WinApi.ToInt(wParam);
+                if (System.Windows.Forms.Control.ModifierKeys != Keys.None || wParamInt>= (int)eShortcut.F1 && wParamInt<= (int)eShortcut.F12)
+                {
+                    int i = (int)System.Windows.Forms.Control.ModifierKeys | wParamInt;
+                    if (ProcessShortcut((eShortcut)i))
+                        return true;
+                }
+            }
+            return false;
+        }
+		bool IMessageHandlerClient.OnSysKeyUp(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+		{
+			return false;
+		}
+		private void InstallIMessageHandlerClient()
+		{
+			if(!m_FilterInstalled && !this.DesignMode && m_Shortcut!=eShortcut.None)
+			{
+				MessageHandler.RegisterMessageClient(this);
+				m_FilterInstalled=true;
+			}
+		}
+		private void UninstallIMessageHandlerClient()
+		{
+			if(m_FilterInstalled)
+			{
+				MessageHandler.UnregisterMessageClient(this);
+				m_FilterInstalled=false;
+			}
+		}
+		#endregion
+	}
+
+	#region Enums
+	/// <summary>
+	/// Indicates the style of mutli-functional splitter control.
+	/// </summary>
+	public enum eSplitterStyle
+	{
+		/// <summary>
+		/// Specifies Office 2003 like splitter style and color scheme.
+		/// </summary>
+		Office2003,
+		/// <summary>
+		/// Specifies Mozilla like splitter style and color scheme.
+		/// </summary>
+		Mozilla,
+        /// <summary>
+        /// Specifies Office 2007 like splitter style and color scheme.
+        /// </summary>
+        Office2007
+	}
+	#endregion
+
+	#region Event Arguments and delegates
+	public delegate void ExpandChangeEventHandler(object sender, ExpandedChangeEventArgs e);
+
+	/// <summary>
+	/// Represents event arguments for ExpandedChanging and ExpandedChanged events.
+	/// </summary>
+	public class ExpandedChangeEventArgs:EventArgs
+	{
+		/// <summary>
+		/// Gets the action that caused the event, event source.
+		/// </summary>
+		public readonly eEventSource EventSource=eEventSource.Code;
+		/// <summary>
+		/// Gets or sets whether execution Expand event should be canceled. Applies only to ExpandedChanging event. Default is false.
+		/// </summary>
+		public bool Cancel=false;
+		/// <summary>
+		/// Indicates new value for the Expanded property.
+		/// </summary>
+		public readonly bool NewExpandedValue=false;
+
+		public ExpandedChangeEventArgs(eEventSource action, bool newExpandedValue)
+		{
+			this.EventSource=action;
+			this.NewExpandedValue=newExpandedValue;
+		}
+	}
+	#endregion
+}
diff --git a/PROMS/DotNetBar Source Code/ExpandableSplitter.resx b/PROMS/DotNetBar Source Code/ExpandableSplitter.resx
new file mode 100644
index 00000000..7e323966
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/ExpandableSplitter.resx	
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<root>
+	<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+		<xsd:element name="root" msdata:IsDataSet="true">
+			<xsd:complexType>
+				<xsd:choice maxOccurs="unbounded">
+					<xsd:element name="data">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+								<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" />
+							<xsd:attribute name="type" type="xsd:string" />
+							<xsd:attribute name="mimetype" type="xsd:string" />
+						</xsd:complexType>
+					</xsd:element>
+					<xsd:element name="resheader">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" use="required" />
+						</xsd:complexType>
+					</xsd:element>
+				</xsd:choice>
+			</xsd:complexType>
+		</xsd:element>
+	</xsd:schema>
+	<resheader name="ResMimeType">
+		<value>text/microsoft-resx</value>
+	</resheader>
+	<resheader name="Version">
+		<value>1.0.0.0</value>
+	</resheader>
+	<resheader name="Reader">
+		<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.3102.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+	<resheader name="Writer">
+		<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.3102.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+</root>
diff --git a/PROMS/DotNetBar Source Code/ExplorerBar.bmp b/PROMS/DotNetBar Source Code/ExplorerBar.bmp
new file mode 100644
index 00000000..52123027
Binary files /dev/null and b/PROMS/DotNetBar Source Code/ExplorerBar.bmp differ
diff --git a/PROMS/DotNetBar Source Code/ExplorerBar.cs b/PROMS/DotNetBar Source Code/ExplorerBar.cs
new file mode 100644
index 00000000..33cf702d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/ExplorerBar.cs	
@@ -0,0 +1,3139 @@
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.Drawing;
+using System.Data;
+using System.Windows.Forms;
+using System.Drawing.Drawing2D;
+using System.Drawing.Text;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Represents the Outlook like Explorer-bar Control.
+	/// </summary>
+    [ToolboxItem(true), System.Runtime.InteropServices.ComVisible(false), Designer("DevComponents.DotNetBar.Design.ExplorerBarDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+	public class ExplorerBar : System.Windows.Forms.Control,
+		IOwnerItemEvents, IOwner, IThemeCache, IMessageHandlerClient, IOwnerMenuSupport,
+        ISupportInitialize, IBarDesignerServices, ICustomSerialization, IAccessibilitySupport
+	{
+		// Events
+		#region Event Definition
+        /// <summary>
+        /// Occurs when Checked property of an button has changed.
+        /// </summary>
+        public event EventHandler ButtonCheckedChanged;
+
+		/// <summary>
+		/// Represents the method that will handle the ItemRemoved event.
+		/// </summary>
+		public delegate void ItemRemovedEventHandler(object sender, ItemRemovedEventArgs e);
+
+		/// <summary>
+		/// Occurs when Item is clicked.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when Item is clicked.")]
+		public event EventHandler ItemClick;
+
+        /// <summary>
+        /// Occurs when Item is clicked.
+        /// </summary>
+        [Description("Occurs when Item is double-clicked.")]
+        public event MouseEventHandler ItemDoubleClick;
+
+		/// <summary>
+		/// Occurs when popup of type container is loading.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when popup of type container is loading.")]
+		public event EventHandler PopupContainerLoad;
+
+		/// <summary>
+		/// Occurs when popup of type container is unloading.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when popup of type container is unloading.")]
+		public event EventHandler PopupContainerUnload;
+
+		/// <summary>
+		/// Occurs when popup item is about to open.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when popup item is about to open.")]
+		public event EventHandler PopupOpen;
+
+		/// <summary>
+		/// Occurs when popup item is closing.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when popup item is closing.")]
+		public event EventHandler PopupClose;
+
+		/// <summary>
+		/// Occurs just before popup window is shown.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs just before popup window is shown.")]
+		public event EventHandler PopupShowing;
+
+		/// <summary>
+		/// Occurs when Item Expanded property has changed.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when Item Expanded property has changed.")]
+		public event EventHandler ExpandedChange;
+
+		private MouseEventHandler EventMouseDown;
+		/// <summary>
+		/// Occurs when mouse button is pressed.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when mouse button is pressed.")]
+		new public event MouseEventHandler MouseDown 
+		{
+			add { EventMouseDown += value; }
+			remove { EventMouseDown -= value; }
+		}
+
+		private MouseEventHandler EventMouseUp;
+		/// <summary>
+		/// Occurs when mouse button is released.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when mouse button is released.")]
+		new public event MouseEventHandler MouseUp
+		{
+			add { EventMouseUp += value; }
+			remove { EventMouseUp -= value; }
+		}
+
+		private EventHandler EventMouseEnter;
+		/// <summary>
+		/// Occurs when mouse enters the item.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when mouse enters the item.")]
+		new public event EventHandler MouseEnter
+		{
+			add { EventMouseEnter += value; }
+			remove { EventMouseEnter -= value; }
+		}
+		
+		private EventHandler EventMouseLeave;
+		/// <summary>
+		/// Occurs when mouse leaves the item.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when mouse leaves the item.")]
+		new public event EventHandler MouseLeave
+		{
+			add { EventMouseLeave += value; }
+			remove { EventMouseLeave -= value; }
+		}
+
+		private MouseEventHandler EventMouseMove;
+		/// <summary>
+		/// Occurs when mouse moves over the item.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when mouse moves over the item.")]
+		new public event MouseEventHandler MouseMove
+		{
+			add { EventMouseMove += value; }
+			remove { EventMouseMove -= value; }
+		}
+		
+		private EventHandler EventMouseHover;
+		/// <summary>
+		/// Occurs when mouse remains still inside an item for an amount of time.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when mouse remains still inside an item for an amount of time.")]
+		new public event EventHandler MouseHover
+		{
+			add { EventMouseHover += value; }
+			remove { EventMouseHover -= value; }
+		}
+		
+		private EventHandler EventLostFocus;
+		/// <summary>
+		/// Occurs when item loses input focus.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when item loses input focus.")]
+		new public event EventHandler LostFocus
+		{
+			add { EventLostFocus += value; }
+			remove { EventLostFocus -= value; }
+		}
+		
+		private EventHandler EventGotFocus;
+		/// <summary>
+		/// Occurs when item receives input focus.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when item receives input focus.")]
+		new public event EventHandler GotFocus
+		{
+			add { EventGotFocus += value; }
+			remove { EventGotFocus -= value; }
+		}
+		
+		/// <summary>
+		/// Occurs when user changes the item position, removes the item, adds new item or creates new bar.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when user changes the item position.")]
+		public event EventHandler UserCustomize;
+
+		/// <summary>
+		/// Occurs after an Item is removed from SubItemsCollection.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs after an Item is removed from SubItemsCollection.")]
+		public event ItemRemovedEventHandler ItemRemoved;
+
+		/// <summary>
+		/// Occurs after an Item has been added to the SubItemsCollection.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs after an Item has been added to the SubItemsCollection.")]
+		public event EventHandler ItemAdded;
+
+		/// <summary>
+		/// Occurs when ControlContainerControl is created and contained control is needed.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when ControlContainerControl is created and contained control is needed.")]
+		public event EventHandler ContainerLoadControl;
+
+		/// <summary>
+		/// Occurs when Text property of an Item has changed.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when Text property of an Item has changed.")]
+		public event EventHandler ItemTextChanged;
+
+		/// <summary>
+		/// Use this event if you want to serialize the hosted control state directly into the DotNetBar definition file.
+		/// </summary>
+		public event ControlContainerItem.ControlContainerSerializationEventHandler ContainerControlSerialize;
+		/// <summary>
+		/// Use this event if you want to deserialize the hosted control state directly from the DotNetBar definition file.
+		/// </summary>
+		public event ControlContainerItem.ControlContainerSerializationEventHandler ContainerControlDeserialize;
+
+		/// <summary>
+		/// Occurs after DotNetBar definition is loaded.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs after DotNetBar definition is loaded.")]
+		public event EventHandler DefinitionLoaded;
+
+		/// <summary>
+		/// Occurs before an item in option group is checked and provides opportunity to cancel that.
+		/// </summary>
+		public event OptionGroupChangingEventHandler OptionGroupChanging;
+
+		/// <summary>
+		/// Occurs before tooltip for an item is shown. Sender could be the BaseItem or derived class for which tooltip is being displayed or it could be a ToolTip object itself it tooltip is not displayed for any item in particular.
+		/// </summary>
+		public event EventHandler ToolTipShowing;
+
+        /// <summary>
+        /// Occurs after an item has been serialized to XmlElement and provides you with opportunity to add any custom data
+        /// to serialized XML. This allows you to serialize any data with the item and load it back up in DeserializeItem event.
+        /// </summary>
+        /// <remarks>
+        /// 	<para>To serialize custom data to XML definition control creates handle this event and use CustomXmlElement
+        /// property on SerializeItemEventArgs to add new nodes or set attributes with custom data you want saved.</para>
+        /// </remarks>
+        public event SerializeItemEventHandler SerializeItem;
+
+        /// <summary>
+        /// Occurs after an item has been de-serialized (load) from XmlElement and provides you with opportunity to load any custom data
+        /// you have serialized during SerializeItem event.
+        /// </summary>
+        /// <remarks>
+        /// 	<para>To de-serialize custom data from XML definition handle this event and use CustomXmlElement
+        /// property on SerializeItemEventArgs to retrive any data you saved in SerializeItem event.</para>
+        /// </remarks>
+        public event SerializeItemEventHandler DeserializeItem;
+		#endregion
+
+		#region Private Variables
+		private ExplorerBarContainerItem m_ItemContainer=null;
+
+		private System.Windows.Forms.Timer m_ClickTimer=null;
+		private BaseItem m_ClickRepeatItem=null;
+		private BaseItem m_ExpandedItem=null;
+		private BaseItem m_FocusItem=null;
+
+		private System.Windows.Forms.ImageList m_ImageList;
+		private System.Windows.Forms.ImageList m_ImageListMedium=null;
+		private System.Windows.Forms.ImageList m_ImageListLarge=null;
+
+		private bool m_ShowToolTips=true;
+		private bool m_ShowShortcutKeysInToolTips=false;
+
+		private Hashtable m_ShortcutTable=new Hashtable();
+		private eBorderType m_BorderStyle=eBorderType.None;
+
+		private ExplorerBarGroupItem m_DelayedExpandedPanel=null;
+
+		private BaseItem m_DragItem=null;
+		private bool m_DragInProgress=false;
+		private Cursor m_MoveCursor, m_CopyCursor, m_NACursor;
+		private IDesignTimeProvider m_DesignTimeProvider=null;
+		private int m_InsertPosition;
+		private bool m_InsertBefore;
+		private bool m_AllowUserCustomize=true;
+		private bool m_ThemeAware=false;
+
+		// Theme Caching Support
+		private ThemeWindow m_ThemeWindow=null;
+		private ThemeRebar m_ThemeRebar=null;
+		private ThemeToolbar m_ThemeToolbar=null;
+		private ThemeHeader m_ThemeHeader=null;
+		private ThemeScrollBar m_ThemeScrollBar=null;
+		private ThemeExplorerBar m_ThemeExplorerBar=null;
+		private ThemeProgress m_ThemeProgress=null;
+        private ThemeButton m_ThemeButton = null;
+
+		private bool m_UseNativeDragDrop=false;
+		private bool m_AllowExternalDrop=false;
+		private bool m_ExternalDragInProgress=false;
+		private bool m_DragLeft=false;
+		private VScrollBar m_ScrollBar=null;
+		private int m_Margin=4;
+		private ItemStyleMapper m_BackgroundStyle=null;
+        private ElementStyle m_BackStyle = new ElementStyle();
+		private eExplorerBarStockStyle m_StockStyle=eExplorerBarStockStyle.Custom;
+		private bool m_AnimationEnabled=true;
+		private int m_AnimationTime=100;
+		private bool m_DispatchShortcuts=false;
+		private bool m_FilterInstalled=false;
+
+		private const string INFO_EMPTYEXPLORERBAR="Right-click and choose Add New Group or use Groups collection to create new groups.";
+
+		private bool m_MenuEventSupport=false;
+		private bool m_VisualPropertyChanged=false;
+
+		private ColorScheme m_ColorScheme=null;
+		private bool m_AntiAlias=true;
+
+		private IBarItemDesigner m_BarDesigner=null;
+		private bool m_SuspendLayout=false;
+
+        private Image m_GroupButtonExpandNormal = null;
+        private Image m_GroupButtonExpandHot = null;
+        private Image m_GroupButtonExpandPressed = null;
+        private Image m_GroupButtonCollapseNormal = null;
+        private Image m_GroupButtonCollapseHot = null;
+        private Image m_GroupButtonCollapsePressed = null;
+        private BaseItem m_DoDefaultActionItem = null;
+        private bool m_DesignerSelection = false;
+		#endregion
+
+		/// <summary>
+		/// Creates new instance of side bar control.
+		/// </summary>
+		public ExplorerBar()
+		{
+			if(!ColorFunctions.ColorsLoaded)
+			{
+				NativeFunctions.RefreshSettings();
+				NativeFunctions.OnDisplayChange();
+				ColorFunctions.LoadColors();
+			}
+			m_ColorScheme=new ColorScheme(eDotNetBarStyle.Office2003);
+
+			m_ItemContainer=new ExplorerBarContainerItem();
+			m_ItemContainer.GlobalItem=false;
+			m_ItemContainer.ContainerControl=this;
+			m_ItemContainer.Stretch=false;
+			m_ItemContainer.Displayed=true;
+			m_ItemContainer.SetOwner(this);
+
+			//this.SetStyle(ControlStyles.Selectable,false);
+			this.SetStyle(ControlStyles.UserPaint,true);
+			this.SetStyle(ControlStyles.AllPaintingInWmPaint,true);
+			this.SetStyle(ControlStyles.Opaque,true);
+			this.SetStyle(ControlStyles.ResizeRedraw,true);
+			this.SetStyle(DisplayHelp.DoubleBufferFlag,true);
+			this.SetStyle(ControlStyles.ContainerControl,true);
+			this.SetStyle(ControlStyles.SupportsTransparentBackColor,true);
+
+			this.TabStop=true;
+
+			#if TRIAL
+				RemindForm frm=new RemindForm();
+				frm.ShowDialog();
+			#endif
+
+			try
+			{
+				m_MoveCursor=new Cursor(typeof(DevComponents.DotNetBar.DotNetBarManager),"DRAGMOVE.CUR");
+				m_CopyCursor=new Cursor(typeof(DevComponents.DotNetBar.DotNetBarManager),"DRAGCOPY.CUR");
+				m_NACursor=new Cursor(typeof(DevComponents.DotNetBar.DotNetBarManager),"DRAGNONE.CUR");
+			}
+			catch(Exception)
+			{
+				m_MoveCursor=null;
+				m_CopyCursor=null;
+				m_NACursor=null;
+			}
+
+			ApplyDefaultSettings();
+			m_BackStyle.StyleChanged+=new EventHandler(this.VisualPropertyChanged);
+
+			this.AccessibleRole=AccessibleRole.ToolBar;
+
+            m_BackgroundStyle = new ItemStyleMapper(m_BackStyle);
+		}
+
+		/// <summary> 
+		/// Clean up any resources being used.
+		/// </summary>
+		protected override void Dispose( bool disposing )
+		{
+			if( disposing )
+			{
+				if(m_ClickTimer!=null)
+				{
+					m_ClickTimer.Stop();
+					m_ClickTimer.Dispose();
+					m_ClickTimer=null;
+				}
+                if (m_ItemContainer != null)
+                    m_ItemContainer.Dispose();
+                m_ItemContainer = null;
+
+                DisposeCursor(ref m_MoveCursor);
+                DisposeCursor(ref m_CopyCursor);
+                DisposeCursor(ref m_NACursor);
+			}
+            if (BarUtilities.DisposeItemImages && !this.DesignMode)
+            {
+                BarUtilities.DisposeImage(ref m_GroupButtonCollapseHot);
+                BarUtilities.DisposeImage(ref m_GroupButtonCollapseNormal);
+                BarUtilities.DisposeImage(ref m_GroupButtonCollapsePressed);
+                BarUtilities.DisposeImage(ref m_GroupButtonExpandHot);
+                BarUtilities.DisposeImage(ref m_GroupButtonExpandNormal);
+                BarUtilities.DisposeImage(ref m_GroupButtonExpandPressed);
+            }
+			base.Dispose( disposing );
+		}
+
+	    protected override void ScaleControl(SizeF factor, BoundsSpecified specified)
+	    {
+            if (Dpi.RecordScalePerControl)
+                Dpi.SetScaling(factor);
+            if (m_ItemContainer!=null) m_ItemContainer.NotifyScaleItem(factor);
+	        base.ScaleControl(factor, specified);
+	    }
+
+	    private void DisposeCursor(ref Cursor cursor)
+        {
+            if (cursor != null)
+            {
+                cursor.Dispose();
+                cursor = null;
+            }
+        }
+
+#if FRAMEWORK20
+        protected override void OnBindingContextChanged(EventArgs e)
+        {
+            base.OnBindingContextChanged(e);
+            if (m_ItemContainer != null)
+                m_ItemContainer.UpdateBindings();
+        }
+#endif
+        [EditorBrowsable(EditorBrowsableState.Never), Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool DesignerSelection
+        {
+            get { return m_DesignerSelection; }
+            set
+            {
+                if (m_DesignerSelection != value)
+                {
+                    m_DesignerSelection = value;
+                    this.Refresh();
+                }
+            }
+        }
+
+		/// <summary>
+		/// Suspends the layout and painting of the control. When you want to perform multiple operations on the explorer bar and you want to ensure
+		/// that layout of the items on it and painting is not performed for performance and appearance reasons set this property to true. Once you
+		/// want to enable layout and painting set the property back to false and call RecalcLayout method. Default value is false.
+		/// </summary>
+		[Browsable(false),DefaultValue(false)]
+		public bool SuspendLayoutDisplay
+		{
+			get
+			{
+				return m_SuspendLayout;
+			}
+			set
+			{
+				m_SuspendLayout=value;
+			}
+		}
+
+		protected override AccessibleObject CreateAccessibilityInstance()
+		{
+			return new ExplorerBarAccessibleObject(this);
+		}
+
+		private void VisualPropertyChanged(object sender, EventArgs e)
+		{
+			m_VisualPropertyChanged=true;
+			ColorScheme cs=this.ColorScheme;
+			m_BackStyle.SetColorScheme(cs);
+			if(this.IsTransparentBackground)
+				this.BackColor=Color.Transparent;
+			else
+				this.BackColor=SystemColors.Control;
+
+			if(this.DesignMode)
+			{
+				this.Refresh();
+			}
+		}
+
+		protected override void OnClick(EventArgs e)
+		{
+			m_ItemContainer.InternalClick(Control.MouseButtons,Control.MousePosition);
+			base.OnClick(e);
+		}
+
+		protected override void OnDoubleClick(EventArgs e)
+		{
+			m_ItemContainer.InternalDoubleClick(Control.MouseButtons,Control.MousePosition);
+			base.OnDoubleClick(e);
+		}
+
+		protected override void OnKeyDown(KeyEventArgs e)
+		{
+			ExKeyDown(e);
+			base.OnKeyDown(e);
+		}
+
+		internal void ExKeyDown(KeyEventArgs e)
+		{
+			m_ItemContainer.InternalKeyDown(e);
+		}
+
+		protected override void OnLostFocus(EventArgs e)
+		{
+			base.OnLostFocus(e);
+            ((IOwner)this).SetFocusItem(null);			
+		}
+
+		protected override void OnGotFocus(EventArgs e)
+		{
+			base.OnGotFocus(e);
+			if(m_ItemContainer!=null)
+				m_ItemContainer.FocusNextItem();
+		}
+
+		protected override bool ProcessDialogKey(Keys keyData)
+		{
+			if(this.Focused)
+			{
+				if(keyData==Keys.Down)
+				{
+					if(m_ItemContainer!=null)
+						m_ItemContainer.FocusNextItem();
+					if(((IOwner)this).GetFocusItem()!=null)
+						return true;
+				}
+				else if(keyData==Keys.Up)
+				{
+					if(m_ItemContainer!=null)
+						m_ItemContainer.FocusPreviousItem();
+					if(((IOwner)this).GetFocusItem()!=null)
+						return true;
+				}
+				else if(keyData==Keys.Enter)
+				{
+					if(((IOwner)this).GetFocusItem()!=null)
+					{
+						BaseItem item=((IOwner)this).GetFocusItem();
+                        if(item is ExplorerBarGroupItem)
+							item.Expanded=!item.Expanded;
+						else
+							item.RaiseClick();
+						return true;
+					}
+				}
+			}
+			return base.ProcessDialogKey(keyData);
+		}
+
+		protected override void OnMouseDown(MouseEventArgs e)
+		{
+			m_ItemContainer.InternalMouseDown(e);
+			base.OnMouseDown(e);
+		}
+
+		protected override void OnMouseHover(EventArgs e)
+		{
+			base.OnMouseHover(e);
+			m_ItemContainer.InternalMouseHover();
+		}
+
+		protected override void OnMouseLeave(EventArgs e)
+		{
+			// If we had hot sub item pass the mouse leave message to it...
+			if(this.Cursor!=System.Windows.Forms.Cursors.Arrow)
+				this.Cursor=System.Windows.Forms.Cursors.Arrow;
+			m_ItemContainer.InternalMouseLeave();
+			base.OnMouseLeave(e);
+		}
+
+		protected override void OnMouseMove(MouseEventArgs e)
+		{
+			base.OnMouseMove(e);
+			if(m_DragInProgress)
+			{
+				if(!m_UseNativeDragDrop)
+					MouseDragOver(e.X,e.Y,null);
+			}
+			else
+				m_ItemContainer.InternalMouseMove(e);
+//			if(EventMouseMove!=null)
+//				EventMouseMove(this,e);
+		}
+
+		protected override void OnMouseWheel(MouseEventArgs e)
+		{
+			base.OnMouseWheel(e);
+			if(m_ScrollBar!=null)
+			{
+				int change=(Math.Abs(e.Delta)/120)*m_ScrollBar.SmallChange;
+				if(e.Delta<0)
+				{
+					int val=m_ScrollBar.Value+change;
+					if(val>m_ScrollBar.Maximum)
+						val=m_ScrollBar.Maximum;
+					m_ScrollBar.Value=val;
+				}
+				else
+				{
+					int val=m_ScrollBar.Value-change;
+					if(val<0) val=0;
+					m_ScrollBar.Value=val;
+				}
+				UpdateScrollValue(m_ScrollBar.Value);
+			}
+		}
+
+		protected override void OnDragOver(DragEventArgs e)
+		{
+			if(m_DragInProgress || m_ExternalDragInProgress)
+			{
+				Point p=this.PointToClient(new Point(e.X,e.Y));
+				MouseDragOver(p.X,p.Y,e);
+				m_DragLeft=false;
+			}
+			base.OnDragOver(e);
+		}
+
+		protected override void OnDragLeave(EventArgs e)
+		{
+			if(m_DragInProgress || m_ExternalDragInProgress)
+				MouseDragOver(-1,-1,null);
+			m_DragLeft=true;
+			m_ExternalDragInProgress=false;
+			base.OnDragLeave(e);
+		}
+
+		protected override void OnDragEnter(DragEventArgs e)
+		{
+			base.OnDragEnter(e);
+			if(m_DragInProgress || !m_AllowExternalDrop)
+				return;
+			if(e.Data.GetData(typeof(ButtonItem))==null)
+			{
+				if(e.Effect!=DragDropEffects.None)
+					m_ExternalDragInProgress=true;
+				return;
+			}
+			if((e.AllowedEffect & DragDropEffects.Move)==DragDropEffects.Move)
+				e.Effect=DragDropEffects.Move;
+			else if((e.AllowedEffect & DragDropEffects.Copy)==DragDropEffects.Copy)
+				e.Effect=DragDropEffects.Move;
+			else if((e.AllowedEffect & DragDropEffects.Link)==DragDropEffects.Link)
+				e.Effect=DragDropEffects.Move;
+			else
+				return;
+			m_ExternalDragInProgress=true;
+		}
+
+		protected override void OnDragDrop(DragEventArgs e)
+		{
+			if(m_DragInProgress)
+			{
+				Point p=this.PointToClient(new Point(e.X,e.Y));
+				MouseDragDrop(p.X,p.Y,null);
+			}
+			else if(m_ExternalDragInProgress)
+			{
+				Point p=this.PointToClient(new Point(e.X,e.Y));
+				MouseDragDrop(p.X,p.Y,e);
+			}
+			base.OnDragDrop(e);
+		}
+
+		protected override void OnQueryContinueDrag(QueryContinueDragEventArgs e)
+		{
+			if(m_DragInProgress)
+			{
+				if(m_DragLeft && e.Action==DragAction.Drop || e.Action==DragAction.Cancel)
+					MouseDragDrop(-1,-1,null);
+			}
+			base.OnQueryContinueDrag(e);
+		}
+
+		private void MouseDragOver(int x, int y, DragEventArgs dragArgs)
+		{
+			if(!m_DragInProgress && !m_ExternalDragInProgress)
+				return;
+			BaseItem dragItem=m_DragItem;
+			
+			if(m_ExternalDragInProgress && dragArgs!=null)
+				dragItem=dragArgs.Data.GetData(typeof(ButtonItem)) as BaseItem;
+
+			if(m_DesignTimeProvider!=null)
+			{
+				m_DesignTimeProvider.DrawReversibleMarker(m_InsertPosition,m_InsertBefore);
+				m_DesignTimeProvider=null;
+			}
+
+			if(m_ExternalDragInProgress && dragItem==null)
+                return;
+
+			Point pScreen=this.PointToScreen(new Point(x,y));
+			foreach(ExplorerBarGroupItem panel in m_ItemContainer.SubItems)
+			{
+				if(!panel.Visible)
+					continue;
+				InsertPosition pos=((IDesignTimeProvider)panel).GetInsertPosition(pScreen, dragItem);
+				
+				if(pos!=null)
+				{
+					if(pos.TargetProvider==null)
+					{
+						// Cursor is over drag item
+						if(!m_UseNativeDragDrop)
+						{
+							if(m_NACursor!=null)
+								System.Windows.Forms.Cursor.Current=m_NACursor;
+							else
+								System.Windows.Forms.Cursor.Current=System.Windows.Forms.Cursors.No;
+						}
+						break;
+					}
+					pos.TargetProvider.DrawReversibleMarker(pos.Position,pos.Before);
+					m_InsertPosition=pos.Position;
+					m_InsertBefore=pos.Before;
+					m_DesignTimeProvider=pos.TargetProvider;
+					if(!m_UseNativeDragDrop)
+					{
+						if(m_MoveCursor!=null)
+							System.Windows.Forms.Cursor.Current=m_MoveCursor;
+						else
+							System.Windows.Forms.Cursor.Current=System.Windows.Forms.Cursors.Hand;
+					}
+					else if(dragArgs!=null)
+						dragArgs.Effect=DragDropEffects.Move;
+					break;
+				}
+				else
+				{
+					if(!m_UseNativeDragDrop)
+					{
+						if(m_NACursor!=null)
+							System.Windows.Forms.Cursor.Current=m_NACursor;
+						else
+							System.Windows.Forms.Cursor.Current=System.Windows.Forms.Cursors.No;
+					}
+					else if(dragArgs!=null)
+						dragArgs.Effect=DragDropEffects.None;
+				}
+			}
+		}
+
+		protected override void OnMouseUp(MouseEventArgs e)
+		{
+			base.OnMouseUp(e);
+			if(!m_UseNativeDragDrop)
+				MouseDragDrop(e.X,e.Y,null);
+
+			m_ItemContainer.InternalMouseUp(e);
+		}
+
+		private void MouseDragDrop(int x, int y, DragEventArgs dragArgs)
+		{
+			if(!m_DragInProgress && !m_ExternalDragInProgress)
+				return;
+			BaseItem dragItem=m_DragItem;
+			if(m_ExternalDragInProgress)
+				dragItem=dragArgs.Data.GetData(typeof(ButtonItem)) as BaseItem;
+
+			if(dragItem!=null)
+				dragItem.InternalMouseLeave();
+
+			if(m_DesignTimeProvider!=null)
+			{
+				if(x==-1 && y==-1)
+				{
+					// Cancel state
+					m_DesignTimeProvider.DrawReversibleMarker(m_InsertPosition, m_InsertBefore);
+				}
+				else
+				{
+					m_DesignTimeProvider.DrawReversibleMarker(m_InsertPosition, m_InsertBefore);
+					if(dragItem!=null)
+					{
+						BaseItem objParent=dragItem.Parent;
+						if(objParent!=null)
+						{
+							if(objParent==(BaseItem)m_DesignTimeProvider && m_InsertPosition>0)
+							{
+								if(objParent.SubItems.IndexOf(dragItem)<m_InsertPosition)
+									m_InsertPosition--;
+							}
+							objParent.SubItems.Remove(dragItem);
+							//Control ctrl=objParent.ContainerControl as Control;
+							//objParent.Refresh();
+						}
+						m_DesignTimeProvider.InsertItemAt(dragItem,m_InsertPosition,m_InsertBefore);
+						m_DesignTimeProvider=null;
+						((IOwner)this).InvokeUserCustomize(dragItem,new EventArgs());
+					}
+				}
+			}
+			m_DesignTimeProvider=null;
+			m_DragInProgress=false;
+			m_ExternalDragInProgress=false;
+			if(!m_UseNativeDragDrop)
+				System.Windows.Forms.Cursor.Current=System.Windows.Forms.Cursors.Default;
+			this.Capture=false;
+			if(dragItem!=null)
+				dragItem._IgnoreClick=true;
+			m_ItemContainer.InternalMouseUp(new MouseEventArgs(MouseButtons.Left,0,x,y,0));
+			if(dragItem!=null)
+				dragItem._IgnoreClick=false;
+
+			m_DragItem=null;
+			this.RecalcLayout();
+		}
+		/// <summary>
+		/// Gets or sets Bar Color Scheme.
+		/// </summary>
+		[System.ComponentModel.Editor(typeof(ColorSchemeVSEditor), typeof(System.Drawing.Design.UITypeEditor)),System.ComponentModel.Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Appearance"),System.ComponentModel.Description("Gets or sets Color Scheme."),DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+		public DevComponents.DotNetBar.ColorScheme ColorScheme
+		{
+			get {return m_ColorScheme;}
+			set
+			{
+				if(value==null)
+					throw new ArgumentException("NULL is not a valid value for this property.");
+				m_ColorScheme=value;
+				m_VisualPropertyChanged=true;
+				foreach(ExplorerBarGroupItem item in this.Groups)
+					item.VisualPropertyChanged();
+				if(this.Visible)
+					this.Refresh();
+			}
+		}
+		/// <summary>
+		/// Returns true if color scheme has changed.
+		/// </summary>
+		[Browsable(false),EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeColorScheme()
+		{
+			return m_ColorScheme.SchemeChanged;
+		}
+		/// <summary>
+		/// Resets color scheme to it's default value.
+		/// </summary>
+		public void ResetColorScheme()
+		{
+			m_ColorScheme=new ColorScheme(eDotNetBarStyle.Office2003);
+		}
+
+		private bool IsTransparentBackground
+		{
+			get
+			{
+				if((m_BackStyle.BackColor.IsEmpty && m_BackStyle.BackColor2.IsEmpty) || 
+					(m_BackStyle.BackColor==Color.Transparent && m_BackStyle.BackColor2==Color.Transparent))
+                    return true;
+				return false;
+			}
+		}
+
+        /// <summary>
+        /// Creates the Graphics object for the control.
+        /// </summary>
+        /// <returns>The Graphics object for the control.</returns>
+        public new Graphics CreateGraphics()
+        {
+            Graphics g = base.CreateGraphics();
+            if(m_AntiAlias)
+            {
+                g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.AntiAlias;
+				#if FRAMEWORK20
+                if (!SystemInformation.IsFontSmoothingEnabled)
+                #endif
+                    g.TextRenderingHint = DisplayHelp.AntiAliasTextRenderingHint;
+            }
+            return g;
+        }
+
+		protected override void OnPaint(PaintEventArgs e)
+		{
+			if(m_ItemContainer==null || this.IsDisposed || m_SuspendLayout)
+				return;
+
+			using(SolidBrush brush=new SolidBrush(Color.White))
+				e.Graphics.FillRectangle(brush,this.DisplayRectangle);
+            
+            Graphics g = e.Graphics;
+
+            SmoothingMode sm = g.SmoothingMode;
+            TextRenderingHint th = g.TextRenderingHint;
+
+			if(m_AntiAlias)
+			{
+				e.Graphics.SmoothingMode=System.Drawing.Drawing2D.SmoothingMode.AntiAlias;
+                e.Graphics.TextRenderingHint = DisplayHelp.AntiAliasTextRenderingHint;
+			}
+            
+			g.PageUnit=GraphicsUnit.Pixel;
+
+			Rectangle r=this.ClientRectangle;
+			
+			ColorScheme cs=this.ColorScheme;
+			if(m_VisualPropertyChanged)
+			{
+				m_BackStyle.SetColorScheme(cs);
+				m_VisualPropertyChanged=false;
+			}
+
+            Rectangle rBack = r;
+            rBack.Inflate(1, 1);
+            ElementStyleDisplayInfo info = new ElementStyleDisplayInfo(m_BackStyle, g, rBack);
+            ElementStyleDisplay.Paint(info);
+			
+			if(m_BorderStyle==eBorderType.SingleLine)
+			{
+				r.Inflate(-1,-1);
+			}
+			else if(m_BorderStyle!=eBorderType.None)
+			{
+				r.Inflate(-2,-2);
+			}
+			
+			if(this.IsTransparentBackground)
+				base.OnPaintBackground(e);
+
+			//g.FillRectangle(new SolidBrush(this.BackColor),r);
+			Region oldClip=e.Graphics.Clip;
+			e.Graphics.SetClip(r);
+			
+			ItemPaintArgs pa=new ItemPaintArgs(this as IOwner,this,e.Graphics,cs); // TODO: ADD SUPPORT FOR GRAPHICS
+            pa.Renderer = GetRenderer();
+            pa.DesignerSelection = m_DesignerSelection;
+            pa.GlassEnabled = !this.DesignMode && WinApi.IsGlassEnabled;
+			m_ItemContainer.Paint(pa);
+			if(oldClip!=null)
+				e.Graphics.SetClip(oldClip,System.Drawing.Drawing2D.CombineMode.Replace);
+			else
+				e.Graphics.ResetClip();
+            oldClip.Dispose();
+
+			if(m_ItemContainer.SubItems.Count==0 && this.DesignMode)
+			{
+				string infoText=INFO_EMPTYEXPLORERBAR;
+				Rectangle rText=this.ClientRectangle;
+				r.Inflate(-2,-2);
+                eTextFormat format = eTextFormat.Default | eTextFormat.HorizontalCenter | eTextFormat.VerticalCenter | eTextFormat.WordBreak;
+				Font font=new Font(this.Font.FontFamily,7);
+                TextDrawing.DrawString(g, infoText, font, SystemColors.ControlText, rText, format);
+				font.Dispose();
+			}
+
+            g.SmoothingMode = sm;
+            g.TextRenderingHint = th;
+		}
+
+        /// <summary>
+        /// Returns the renderer control will be rendered with.
+        /// </summary>
+        /// <returns>The current renderer.</returns>
+        private Rendering.BaseRenderer GetRenderer()
+        {
+            return Rendering.GlobalManager.Renderer;
+        }
+
+		protected bool IsThemed
+		{
+			get
+			{
+                if (m_ThemeAware && (m_ItemContainer.EffectiveStyle == eDotNetBarStyle.OfficeXP || m_ItemContainer.EffectiveStyle == eDotNetBarStyle.Office2003) && BarFunctions.ThemedOS && Themes.ThemesActive)
+					return true;
+				return false;
+			}
+		}
+
+		/// <summary>
+		/// Specifies whether ExplorerBar is drawn using Themes when running on OS that supports themes like Windows XP.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DevCoBrowsable(true),System.ComponentModel.DefaultValue(false),System.ComponentModel.Category("Appearance"),System.ComponentModel.Description("Specifies whether ExplorerBar is drawn using Themes when running on OS that supports themes like Windows XP.")]
+		public virtual bool ThemeAware
+		{
+			get
+			{
+				return m_ThemeAware;
+			}
+			set
+			{
+				m_ThemeAware=value;
+				m_ItemContainer.ThemeAware=value;
+				if(this.DesignMode)
+					this.Refresh();
+			}
+		}
+
+        /// <summary>
+        /// Specifies the background style of the Explorer Bar.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Category("Style"), Description("Gets or sets bar background style."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ElementStyle BackStyle
+        {
+            get { return m_BackStyle; }
+        }
+
+        [Browsable(false), DevCoBrowsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), Obsolete("This property is obsolete. Use BackStyle property instead"), EditorBrowsable(EditorBrowsableState.Never)]
+		public ItemStyleMapper BackgroundStyle
+		{
+			get {return m_BackgroundStyle;}
+		}
+        [EditorBrowsable(EditorBrowsableState.Never)]
+		public void ApplyDefaultSettings()
+		{
+			ColorScheme cs=this.ColorScheme;
+			m_BackStyle.BackColorSchemePart=eColorSchemePart.ExplorerBarBackground;
+			m_BackStyle.BackColor2SchemePart=eColorSchemePart.ExplorerBarBackground2;
+			m_BackStyle.BackColorGradientAngle=cs.ExplorerBarBackgroundGradientAngle;
+			m_BackStyle.SetColorScheme(cs);
+		}
+
+		/// <summary>
+		/// Gets or sets the vertical spacing between the group items.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),Category("Appearance"),Description("Specifies the vertical spacing between the group items."),DefaultValue(15)]
+		public int GroupSpacing
+		{
+			get {return m_ItemContainer.m_ItemSpacing;}
+			set
+			{
+				m_ItemContainer.m_ItemSpacing=value;
+				this.RecalcLayout();
+			}
+		}
+
+		protected override void OnSystemColorsChanged(EventArgs e)
+		{
+			base.OnSystemColorsChanged(e);
+			Application.DoEvents();
+			this.RefreshThemes();
+			this.ColorScheme.Refresh(null,true);
+		}
+
+		private void RefreshThemes()
+		{
+			if(m_ThemeWindow!=null)
+			{
+				m_ThemeWindow.Dispose();
+				m_ThemeWindow=new ThemeWindow(this);
+			}
+			if(m_ThemeRebar!=null)
+			{
+				m_ThemeRebar.Dispose();
+				m_ThemeRebar=new ThemeRebar(this);
+			}
+			if(m_ThemeToolbar!=null)
+			{
+				m_ThemeToolbar.Dispose();
+				m_ThemeToolbar=new ThemeToolbar(this);
+			}
+			if(m_ThemeHeader!=null)
+			{
+				m_ThemeHeader.Dispose();
+				m_ThemeHeader=new ThemeHeader(this);
+			}
+			if(m_ThemeScrollBar!=null)
+			{
+				m_ThemeScrollBar.Dispose();
+				m_ThemeScrollBar=new ThemeScrollBar(this);
+			}
+			if(m_ThemeExplorerBar!=null)
+			{
+				m_ThemeExplorerBar.Dispose();
+				m_ThemeExplorerBar=new ThemeExplorerBar(this);
+			}
+			if(m_ThemeProgress!=null)
+			{
+				m_ThemeProgress.Dispose();
+				m_ThemeProgress=new ThemeProgress(this);
+			}
+            if (m_ThemeButton != null)
+            {
+                m_ThemeButton.Dispose();
+                m_ThemeButton = new ThemeButton(this);
+            }
+			
+			SyncGroupColors();
+		}
+		private void DisposeThemes()
+		{
+			if(m_ThemeWindow!=null)
+			{
+				m_ThemeWindow.Dispose();
+				m_ThemeWindow=null;
+			}
+			if(m_ThemeRebar!=null)
+			{
+				m_ThemeRebar.Dispose();
+				m_ThemeRebar=null;
+			}
+			if(m_ThemeToolbar!=null)
+			{
+				m_ThemeToolbar.Dispose();
+				m_ThemeToolbar=null;
+			}
+			if(m_ThemeHeader!=null)
+			{
+				m_ThemeHeader.Dispose();
+				m_ThemeHeader=null;
+			}
+			if(m_ThemeScrollBar!=null)
+			{
+				m_ThemeScrollBar.Dispose();
+				m_ThemeScrollBar=null;
+			}
+            if (m_ThemeProgress != null)
+            {
+                m_ThemeProgress.Dispose();
+                m_ThemeProgress = null;
+            }
+            if (m_ThemeButton != null)
+            {
+                m_ThemeButton.Dispose();
+                m_ThemeButton = null;
+            }
+		}
+		private void SyncGroupColors()
+		{
+            //eExplorerBarStockStyle stock=eExplorerBarStockStyle.Blue;
+            //eExplorerBarStockStyle special=eExplorerBarStockStyle.BlueSpecial;
+            //eExplorerBarStockStyle thisSpecial=GetSpecialStyle(m_StockStyle);
+
+            //if(SystemColors.Control.ToArgb()==Color.FromArgb(224,223,227).ToArgb() && SystemColors.Highlight.ToArgb()==Color.FromArgb(178,180,191).ToArgb())
+            //{
+            //    stock=eExplorerBarStockStyle.Silver;
+            //    special=eExplorerBarStockStyle.SilverSpecial;
+            //}
+            //else if(SystemColors.Control.ToArgb()==Color.FromArgb(236,233,216).ToArgb() && SystemColors.Highlight.ToArgb()==Color.FromArgb(147,160,112).ToArgb())
+            //{
+            //    stock=eExplorerBarStockStyle.OliveGreen;
+            //    special=eExplorerBarStockStyle.OliveGreenSpecial;
+            //}
+
+			foreach(BaseItem item in m_ItemContainer.SubItems)
+			{
+				ExplorerBarGroupItem group=item as ExplorerBarGroupItem;
+				if(group==null)
+					continue;
+				if(group.StockStyle==eExplorerBarStockStyle.SystemColors)
+				{
+					group.StockStyle = eExplorerBarStockStyle.SystemColors;
+				}
+			}
+		}
+		private eExplorerBarStockStyle GetSpecialStyle(eExplorerBarStockStyle style)
+		{
+			eExplorerBarStockStyle special=eExplorerBarStockStyle.Custom;
+			switch(style)
+			{
+				case eExplorerBarStockStyle.Blue:
+                    special=eExplorerBarStockStyle.BlueSpecial;
+					break;
+				case eExplorerBarStockStyle.OliveGreen:
+					special=eExplorerBarStockStyle.OliveGreenSpecial;
+					break;
+				case eExplorerBarStockStyle.Silver:
+					special=eExplorerBarStockStyle.SilverSpecial;
+					break;
+				case eExplorerBarStockStyle.BlueSpecial:
+				case eExplorerBarStockStyle.OliveGreenSpecial:
+				case eExplorerBarStockStyle.SilverSpecial:
+					special=style;
+					break;
+			}
+			return special;
+		}
+		private bool IsStyleSpecial(eExplorerBarStockStyle style)
+		{
+			if(style==eExplorerBarStockStyle.BlueSpecial || style==eExplorerBarStockStyle.OliveGreenSpecial || style==eExplorerBarStockStyle.SilverSpecial)
+				return true;
+			return false;
+		}
+
+		protected override void OnHandleDestroyed(EventArgs e)
+		{
+			DisposeThemes();
+			MenuEventSupportUnhook();
+			base.OnHandleDestroyed(e);
+
+			if(m_FilterInstalled)
+			{
+				MessageHandler.UnregisterMessageClient(this);
+				m_FilterInstalled=false;
+			}
+		}
+		DevComponents.DotNetBar.ThemeWindow IThemeCache.ThemeWindow
+		{
+			get
+			{
+				if(m_ThemeWindow==null)
+					m_ThemeWindow=new ThemeWindow(this);
+				return m_ThemeWindow;
+			}
+		}
+		DevComponents.DotNetBar.ThemeRebar IThemeCache.ThemeRebar
+		{
+			get
+			{
+				if(m_ThemeRebar==null)
+					m_ThemeRebar=new ThemeRebar(this);
+				return m_ThemeRebar;
+			}
+		}
+		DevComponents.DotNetBar.ThemeToolbar IThemeCache.ThemeToolbar
+		{
+			get
+			{
+				if(m_ThemeToolbar==null)
+					m_ThemeToolbar=new ThemeToolbar(this);
+				return m_ThemeToolbar;
+			}
+		}
+		DevComponents.DotNetBar.ThemeHeader IThemeCache.ThemeHeader
+		{
+			get
+			{
+				if(m_ThemeHeader==null)
+					m_ThemeHeader=new ThemeHeader(this);
+				return m_ThemeHeader;
+			}
+		}
+		DevComponents.DotNetBar.ThemeScrollBar IThemeCache.ThemeScrollBar
+		{
+			get
+			{
+				if(m_ThemeScrollBar==null)
+					m_ThemeScrollBar=new ThemeScrollBar(this);
+				return m_ThemeScrollBar;
+			}
+		}
+		DevComponents.DotNetBar.ThemeExplorerBar IThemeCache.ThemeExplorerBar
+		{
+			get
+			{
+				if(m_ThemeExplorerBar==null)
+					m_ThemeExplorerBar=new ThemeExplorerBar(this);
+				return m_ThemeExplorerBar;
+			}
+		}
+		DevComponents.DotNetBar.ThemeProgress IThemeCache.ThemeProgress
+		{
+			get
+			{
+				if(m_ThemeProgress==null)
+					m_ThemeProgress=new ThemeProgress(this);
+				return m_ThemeProgress;
+			}
+		}
+        DevComponents.DotNetBar.ThemeButton IThemeCache.ThemeButton
+        {
+            get
+            {
+                if (m_ThemeButton == null)
+                    m_ThemeButton = new ThemeButton(this);
+                return m_ThemeButton;
+            }
+        }
+
+		protected override void OnVisibleChanged(EventArgs e)
+		{
+			base.OnVisibleChanged(e);
+			if(this.Visible)
+				SyncGroupColors();
+		}
+
+		protected override void OnResize(EventArgs e)
+		{
+			base.OnResize(e);
+            if (this.Width == 0 || this.Height == 0)
+                return;
+			this.RecalcSize();
+		}
+
+		protected virtual void RecalcSize()
+		{
+			if(m_SuspendLayout)
+				return;
+			if(!BarFunctions.IsHandleValid(this))
+				return;
+            if(this.RightToLeft == RightToLeft.Yes)
+                m_ItemContainer.IsRightToLeft = (this.RightToLeft == RightToLeft.Yes);
+			if(m_BorderStyle==eBorderType.None)
+			{
+				m_ItemContainer.LeftInternal=m_Margin;
+				m_ItemContainer.TopInternal=m_Margin;
+				m_ItemContainer.WidthInternal =this.Width-m_Margin*2;
+				m_ItemContainer.HeightInternal=this.Height-m_Margin;
+			}
+			else
+			{
+				m_ItemContainer.LeftInternal=m_Margin;
+				m_ItemContainer.TopInternal=m_Margin;
+				m_ItemContainer.WidthInternal =this.Width-4-m_Margin*2;
+				m_ItemContainer.HeightInternal=this.Height-m_Margin-2;
+			}
+			m_ItemContainer.RecalcSize();
+			if(m_ItemContainer.HeightInternal>this.ClientRectangle.Height || m_ItemContainer.HeightInternal<=this.ClientRectangle.Height && m_ScrollBar!=null)
+			{
+				this.ContainerSizeChanged();
+			}
+
+            OnItemLayoutUpdated(EventArgs.Empty);
+		}
+
+        /// <summary>
+        /// Occurs after internal item layout has been updated and items have valid bounds assigned.
+        /// </summary>
+        public event EventHandler ItemLayoutUpdated;
+        /// <summary>
+        /// Raises ItemLayoutUpdated event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnItemLayoutUpdated(EventArgs e)
+        {
+            EventHandler handler = ItemLayoutUpdated;
+            if (handler != null)
+                handler(this, e);
+        }
+
+		internal void ContainerSizeChanged()
+		{
+			if(m_ItemContainer.HeightInternal>this.ClientRectangle.Height)
+			{
+				CreateScrollBar();
+				if(m_BorderStyle==eBorderType.None)
+				{
+					m_ItemContainer.LeftInternal=m_Margin;
+					m_ItemContainer.TopInternal=m_Margin;
+					m_ItemContainer.WidthInternal =this.Width-m_ScrollBar.Width-m_Margin*2;
+					m_ItemContainer.HeightInternal=this.Height-m_Margin;
+				}
+				else
+				{
+					m_ItemContainer.LeftInternal=m_Margin;
+					m_ItemContainer.TopInternal=m_Margin;
+					m_ItemContainer.WidthInternal =this.Width-4-m_ScrollBar.Width-m_Margin*2;
+					m_ItemContainer.HeightInternal=this.Height-m_Margin-2;
+				}
+				m_ItemContainer.RecalcSize();
+				CreateScrollBar();
+				m_ItemContainer.TopInternal=-m_ScrollBar.Value+m_Margin;
+			}
+			else if(m_ScrollBar!=null)
+			{
+				this.Controls.Remove(m_ScrollBar);
+				m_ScrollBar.Dispose();
+				m_ScrollBar=null;
+
+				if(m_BorderStyle==eBorderType.None)
+				{
+					m_ItemContainer.LeftInternal=m_Margin;
+					m_ItemContainer.TopInternal=m_Margin;
+					m_ItemContainer.WidthInternal =this.Width-m_Margin*2;
+					m_ItemContainer.HeightInternal=this.Height-m_Margin;
+				}
+				else
+				{
+					m_ItemContainer.LeftInternal=m_Margin;
+					m_ItemContainer.TopInternal=m_Margin;
+					m_ItemContainer.WidthInternal =this.Width-4-m_Margin*2;
+					m_ItemContainer.HeightInternal=this.Height-m_Margin-2;
+				}
+				m_ItemContainer.RecalcSize();
+			}
+		}
+
+		private void CreateScrollBar()
+		{
+			if(m_ScrollBar==null)
+			{
+				m_ScrollBar=new VScrollBar();
+				m_ScrollBar.Width=SystemInformation.VerticalScrollBarWidth;
+				m_ScrollBar.Dock=DockStyle.Right;
+				m_ScrollBar.Visible=true;
+				this.Controls.Add(m_ScrollBar);
+				m_ScrollBar.Scroll+=new ScrollEventHandler(this.ScrollBarValueChanged);
+				m_ScrollBar.Site=null; // Make it not in design mode.
+			}
+            m_ScrollBar.Maximum = m_ItemContainer.HeightInternal;
+			m_ScrollBar.LargeChange=this.Height/2;
+			m_ScrollBar.SmallChange=m_ScrollBar.LargeChange/5;
+            int maximum=(m_ItemContainer.HeightInternal-this.Height)+m_ScrollBar.LargeChange+m_ScrollBar.SmallChange;
+			if(m_ScrollBar.SmallChange>0 && Math.Ceiling((float)maximum/(float)m_ScrollBar.SmallChange)>maximum/m_ScrollBar.SmallChange)
+				maximum=(int)Math.Ceiling((float)maximum/(float)m_ScrollBar.SmallChange)*m_ScrollBar.SmallChange;
+			if(m_ScrollBar.Maximum!=maximum)
+			{
+				m_ScrollBar.Maximum=maximum;
+				//m_ScrollBar.Value=0;
+			}
+		}
+
+		private void ScrollBarValueChanged(object sender, ScrollEventArgs e)
+		{
+			UpdateScrollValue(e.NewValue);
+		}
+
+		private void UpdateScrollValue(int iScrollValue)
+		{
+			m_ItemContainer.TopInternal=-iScrollValue+m_Margin;
+			this.Invalidate(this.ClientRectangle,false);
+		}
+
+		/// <summary>
+		/// Applies any layout changes and repaint the control.
+		/// </summary>
+		public void RecalcLayout()
+		{
+			if(m_SuspendLayout)
+				return;
+			this.RecalcSize();
+			this.Refresh();
+		}
+
+		/// <summary>
+		/// Gets or sets whether anti-alias smoothing is used while painting.
+		/// </summary>
+		[DefaultValue(true),Browsable(true),Category("Appearance"),Description("Gets or sets whether anti-aliasing is used while painting.")]
+		public bool AntiAlias
+		{
+			get {return m_AntiAlias;}
+			set
+			{
+				if(m_AntiAlias!=value)
+				{
+					m_AntiAlias=value;
+					this.Refresh();
+				}
+			}
+		}
+        [EditorBrowsable(EditorBrowsableState.Never)]
+		public void SetDesignMode()
+		{
+			m_ItemContainer.SetDesignMode(true);
+		}
+
+		protected override void OnHandleCreated(EventArgs e)
+		{
+			base.OnHandleCreated(e);
+			if(this.DesignMode)
+				SetDesignMode();
+			if(!m_FilterInstalled && !this.DesignMode)
+			{
+				MessageHandler.RegisterMessageClient(this);
+				m_FilterInstalled=true;
+			}
+			this.RecalcLayout();
+		}
+
+		protected override void OnParentChanged(EventArgs e)
+		{
+			base.OnParentChanged(e);
+			if(m_DelayedExpandedPanel!=null)
+			{
+				if(m_ItemContainer.SubItems.Contains(m_DelayedExpandedPanel))
+					m_DelayedExpandedPanel.Expanded=true;
+				m_DelayedExpandedPanel=null;
+			}
+			if(this.Images!=null || ((IOwner)this).ImagesLarge!=null || ((IOwner)this).ImagesMedium!=null)
+			{
+				foreach(ExplorerBarGroupItem panel in m_ItemContainer.SubItems)
+				{
+					foreach(BaseItem item in panel.SubItems)
+					{
+						if(item is ImageItem)
+							((ImageItem)item).OnImageChanged();
+					}
+				}
+			}
+			this.RecalcLayout();
+		}
+
+		/// <summary>
+		/// Returns the collection of Explorer Bar Groups.
+		/// </summary>
+		[System.ComponentModel.Editor("DevComponents.DotNetBar.Design.ExplorerBarPanelsEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)),DesignerSerializationVisibility(DesignerSerializationVisibility.Content),System.ComponentModel.Category("Data"),System.ComponentModel.Description("Returns the collection of Explorer Bar Groups.")]
+		public SubItemsCollection Groups
+		{
+			get
+			{
+				return m_ItemContainer.SubItems;
+			}
+		}
+
+		void IOwnerItemEvents.InvokeItemAdded(BaseItem item,EventArgs e)
+		{
+			if(ItemAdded!=null)
+				ItemAdded(item,e);
+		}
+		void IOwnerItemEvents.InvokeItemRemoved(BaseItem item, BaseItem parent, int itemIndex)
+		{
+			if(ItemRemoved!=null)
+			{
+                ItemRemoved(item, new ItemRemovedEventArgs(parent, itemIndex));
+			}
+		}
+		void IOwnerItemEvents.InvokeMouseEnter(BaseItem item,EventArgs e)
+		{
+			if(EventMouseEnter!=null)
+				EventMouseEnter.Invoke(item,e);
+		}
+		void IOwnerItemEvents.InvokeMouseHover(BaseItem item,EventArgs e)
+		{
+			if(EventMouseHover!=null)
+				EventMouseHover.Invoke(item,e);
+		}
+		void IOwnerItemEvents.InvokeMouseLeave(BaseItem item,EventArgs e)
+		{
+			if(EventMouseLeave!=null)
+				EventMouseLeave.Invoke(item,e);
+		}
+		void IOwnerItemEvents.InvokeMouseDown(BaseItem item, System.Windows.Forms.MouseEventArgs e)
+		{
+			if (EventMouseDown!= null)
+	 			EventMouseDown.Invoke(item, e);
+			//if(this.MouseDown!=null)
+			//	this.MouseDown(item,e);
+			if(item.ClickAutoRepeat && e.Button==MouseButtons.Left)
+			{
+				m_ClickRepeatItem=item;
+				if(m_ClickTimer==null)
+					m_ClickTimer=new Timer();
+				m_ClickTimer.Interval=item.ClickRepeatInterval;
+				m_ClickTimer.Tick+=new EventHandler(this.ClickTimerTick);
+				m_ClickTimer.Start();
+			}
+		}
+		void IOwnerItemEvents.InvokeMouseUp(BaseItem item, System.Windows.Forms.MouseEventArgs e)
+		{
+			if(EventMouseUp!=null)
+				EventMouseUp.Invoke(item, e);
+
+			if(m_ClickTimer!=null && m_ClickTimer.Enabled)
+			{
+				m_ClickTimer.Stop();
+				m_ClickTimer.Enabled=false;
+			}
+		}
+		void IOwnerItemEvents.InvokeMouseMove(BaseItem item, System.Windows.Forms.MouseEventArgs e)
+		{
+			if(EventMouseMove!=null)
+				EventMouseMove.Invoke(item,e);
+		}
+        void IOwnerItemEvents.InvokeItemDoubleClick(BaseItem objItem, MouseEventArgs e)
+        {
+            OnItemDoubleClick(objItem, e);
+        }
+        /// <summary>
+        /// Invokes ItemDoubleClick event.
+        /// </summary>
+        /// <param name="objItem">Reference to item double-clicked</param>
+        /// <param name="e">Event arguments</param>
+        protected virtual void OnItemDoubleClick(BaseItem objItem, MouseEventArgs e)
+        {
+            MouseEventHandler handler = ItemDoubleClick;
+            if (handler != null)
+                handler(objItem, e);
+        }
+		void IOwnerItemEvents.InvokeItemClick(BaseItem objItem)
+		{
+			if(ItemClick!=null)
+				ItemClick(objItem,new EventArgs());
+		}
+		void IOwnerItemEvents.InvokeGotFocus(BaseItem item,EventArgs e)
+		{
+			if(EventGotFocus!=null)
+				EventGotFocus.Invoke(item,e);
+		}
+		void IOwnerItemEvents.InvokeLostFocus(BaseItem item,EventArgs e)
+		{
+			if(EventLostFocus!=null)
+				EventLostFocus.Invoke(item,e);
+		}
+		void IOwnerItemEvents.InvokeExpandedChange(BaseItem item,EventArgs e)
+		{
+			if(ExpandedChange!=null)
+				ExpandedChange(item,e);
+		}
+		void IOwnerItemEvents.InvokeItemTextChanged(BaseItem item, EventArgs e)
+		{
+			if(ItemTextChanged!=null)
+				ItemTextChanged(item,e);
+		}
+
+		void IOwnerItemEvents.InvokeContainerControlDeserialize(BaseItem item,ControlContainerSerializationEventArgs e)
+		{
+			if(ContainerControlDeserialize!=null)
+				ContainerControlDeserialize(item,e);
+		}
+		void IOwnerItemEvents.InvokeContainerControlSerialize(BaseItem item,ControlContainerSerializationEventArgs e)
+		{
+			if(ContainerControlSerialize!=null)
+				ContainerControlSerialize(item,e);
+		}
+		void IOwnerItemEvents.InvokeContainerLoadControl(BaseItem item,EventArgs e)
+		{
+			if(ContainerLoadControl!=null)
+				ContainerLoadControl(item,e);
+		}
+
+		void IOwnerItemEvents.InvokeOptionGroupChanging(BaseItem item, OptionGroupChangingEventArgs e)
+		{
+			if(OptionGroupChanging!=null)
+				OptionGroupChanging(item,e);
+		}
+
+		void IOwnerItemEvents.InvokeToolTipShowing(object item, EventArgs e)
+		{
+			if(ToolTipShowing!=null)
+				ToolTipShowing(item,e);
+		}
+
+        void IOwnerItemEvents.InvokeCheckedChanged(ButtonItem item, EventArgs e)
+        {
+            if (ButtonCheckedChanged != null)
+                ButtonCheckedChanged(item, e);
+        }
+//		void IOwnerItemEvents.InvokeItemDisplayedChanged(BaseItem item,EventArgs e)
+//		{
+////			if(ItemDisplayedChanged!=null)
+////				ItemDisplayedChanged(item,e);
+//		}
+
+		private void ClickTimerTick(object sender, EventArgs e)
+		{
+			if(m_ClickRepeatItem!=null)
+				m_ClickRepeatItem.RaiseClick();
+			else
+				m_ClickTimer.Stop();
+		}
+
+		/// <summary>
+		/// Gets or sets the form ExplorerBar is attached to.
+		/// </summary>
+		Form IOwner.ParentForm
+		{
+			get
+			{
+				return base.FindForm();
+			}
+			set
+			{
+			}
+		}
+
+		/// <summary>
+		/// Returns the collection of items with the specified name.
+		/// </summary>
+		/// <param name="ItemName">Item name to look for.</param>
+		/// <returns></returns>
+		public ArrayList GetItems(string ItemName)
+		{
+			ArrayList list=new ArrayList(15);
+			BarFunctions.GetSubItemsByName(m_ItemContainer,ItemName,list);
+			return list;
+		}
+
+		/// <summary>
+		/// Returns the collection of items with the specified name and type.
+		/// </summary>
+		/// <param name="ItemName">Item name to look for.</param>
+		/// <param name="itemType">Item type to look for.</param>
+		/// <returns></returns>
+		public ArrayList GetItems(string ItemName, Type itemType)
+		{
+			ArrayList list=new ArrayList(15);
+			BarFunctions.GetSubItemsByNameAndType(m_ItemContainer,ItemName,list,itemType);
+			return list;
+		}
+
+        /// <summary>
+        /// Returns the collection of items with the specified name and type.
+        /// </summary>
+        /// <param name="ItemName">Item name to look for.</param>
+        /// <param name="itemType">Item type to look for.</param>
+        /// <returns></returns>
+        public ArrayList GetItems(string ItemName, Type itemType, bool useGlobalName)
+        {
+            ArrayList list = new ArrayList(15);
+            BarFunctions.GetSubItemsByNameAndType(m_ItemContainer, ItemName, list, itemType, useGlobalName);
+            return list;
+        }
+
+		/// <summary>
+		/// Returns the first item that matches specified name.
+		/// </summary>
+		/// <param name="ItemName">Item name to look for.</param>
+		/// <returns></returns>
+		public BaseItem GetItem(string ItemName)
+		{
+			BaseItem item=BarFunctions.GetSubItemByName(m_ItemContainer,ItemName);
+			if(item!=null)
+				return item;
+			return null;
+		}
+
+		// Only one Popup Item can be expanded at a time. This is used
+		// to track the currently expanded popup item and to close the popup item
+		// if another item is expanding.
+		void IOwner.SetExpandedItem(BaseItem objItem)
+		{
+			if(objItem!=null && objItem.Parent is PopupItem)
+				return;
+			if(m_ExpandedItem!=null)
+			{
+				if(m_ExpandedItem.Expanded)
+					m_ExpandedItem.Expanded=false;
+				m_ExpandedItem=null;
+			}
+			m_ExpandedItem=objItem;
+		}
+
+		BaseItem IOwner.GetExpandedItem()
+		{
+			return m_ExpandedItem;
+		}
+
+		// Currently we are using this to communicate "focus" when control is in
+		// design mode. This can be used later if we decide to add focus
+		// handling to our BaseItem class.
+		void IOwner.SetFocusItem(BaseItem objFocusItem)
+		{
+			if(m_FocusItem!=null && m_FocusItem!=objFocusItem)
+			{
+				m_FocusItem.OnLostFocus();
+			}
+			if(this.DesignMode && this.Groups.Contains(objFocusItem))
+			{
+				foreach(BaseItem panel in this.Groups)
+					BaseItem.CollapseSubItems(panel);
+			}
+			m_FocusItem=objFocusItem;
+			if(m_FocusItem!=null)
+				m_FocusItem.OnGotFocus();
+			
+			if(!this.DesignMode)
+				EnsureVisible(m_FocusItem);
+		}
+
+		BaseItem IOwner.GetFocusItem()
+		{
+			return m_FocusItem;
+		}
+
+		bool IOwner.AlwaysDisplayKeyAccelerators
+		{
+			get {return false;}
+			set {}
+		}
+
+		void IOwner.DesignTimeContextMenu(BaseItem objItem)
+		{
+		}
+
+		void IOwner.RemoveShortcutsFromItem(BaseItem objItem)
+		{
+			ShortcutTableEntry objEntry=null;
+			if(objItem.ShortcutString!="")
+			{
+				foreach(eShortcut key in objItem.Shortcuts)
+				{
+					if(m_ShortcutTable.ContainsKey(key))
+					{
+						objEntry=(ShortcutTableEntry)m_ShortcutTable[key];
+						try
+						{
+							objEntry.Items.Remove(objItem.Id);
+							if(objEntry.Items.Count==0)
+								m_ShortcutTable.Remove(objEntry.Shortcut);
+						}
+						catch(System.ArgumentException)	{}
+					}
+				}
+			}
+			IOwner owner=this as IOwner;
+			foreach(BaseItem objTmp in objItem.SubItems)
+				owner.RemoveShortcutsFromItem(objTmp);
+		}
+
+		void IOwner.AddShortcutsFromItem(BaseItem objItem)
+		{
+			ShortcutTableEntry objEntry=null;
+			//bool bAdded=false;
+			if(objItem.ShortcutString!="")
+			{
+				foreach(eShortcut key in objItem.Shortcuts)
+				{
+					if(m_ShortcutTable.ContainsKey(key))
+						objEntry=(ShortcutTableEntry)m_ShortcutTable[objItem.Shortcuts[0]];
+					else
+					{
+						objEntry=new ShortcutTableEntry(key);
+						m_ShortcutTable.Add(objEntry.Shortcut,objEntry);
+					}
+					try
+					{
+						objEntry.Items.Add(objItem.Id,objItem);
+					}
+					catch(System.ArgumentException)	{}
+				}
+			}
+			IOwner owner=this as IOwner;
+			foreach(BaseItem objTmp in objItem.SubItems)
+				owner.AddShortcutsFromItem(objTmp);
+		}
+
+		void IOwner.OnApplicationActivate(){}
+		void IOwner.OnApplicationDeactivate()
+		{
+            ClosePopups();
+		}
+		void IOwner.OnParentPositionChanging(){}
+
+
+		/// <summary>
+		/// Ensures that item is displayed on the screen. Item needs to have it's Visible property set to true. This method will expand the group if needed or it will scroll control to display an item.
+		/// </summary>
+		/// <param name="item">Item to display.</param>
+		public void EnsureVisible(BaseItem item)
+		{
+			if(item==null)
+				return;
+			if(item.ContainerControl!=this)
+				return;
+			if(item.Parent is ExplorerBarGroupItem)
+			{
+				if(item.Parent.Visible)
+				{
+					if(!item.Parent.Expanded)
+                        item.Parent.Expanded=true;
+				}
+				else
+					return;
+			}
+
+			if(m_ScrollBar==null || !m_ScrollBar.Visible)
+				return;
+
+			Rectangle r=this.ClientRectangle;
+			Rectangle rItem=item.DisplayRectangle;
+			if(item is ExplorerBarGroupItem)
+			{
+				rItem=((ExplorerBarGroupItem)item).PanelRect;
+				rItem.Y=item.TopInternal;
+			}
+			
+			if(!r.Contains(rItem))
+			{
+				int scroll=0;
+				// Ensure that rItem is visible
+				if(rItem.Top<0)
+				{
+					scroll=m_ScrollBar.Value+rItem.Top-m_Margin;
+					if(scroll<0)
+						scroll=0;
+				}
+				else
+				{
+					scroll=Math.Abs(m_ItemContainer.TopInternal)+rItem.Bottom-r.Height+m_Margin;
+					
+				}
+				m_ScrollBar.Value=scroll;
+				UpdateScrollValue(m_ScrollBar.Value);
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the margin in pixels between the explorer bar groups and the edge of the control.
+		/// </summary>
+		[Browsable(true),DefaultValue(4),Category("Layout"),Description("Indicates margin in pixels between the explorer bar groups and the edge of the control.")]
+		public int ContentMargin
+		{
+			get {return m_Margin;}
+			set 
+			{
+				m_Margin=value;
+				this.RecalcLayout();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets whether end-user can rearrange the items inside the panels.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),System.ComponentModel.DefaultValue(true),System.ComponentModel.Category("Behavior"),System.ComponentModel.Description("Specifies whether end-user can rearrange the items inside the panels.")]
+		public bool AllowUserCustomize
+		{
+			get{return m_AllowUserCustomize;}
+			set{m_AllowUserCustomize=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets whether animation is enabled.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),System.ComponentModel.DefaultValue(true),System.ComponentModel.Category("Behavior"),System.ComponentModel.Description("Specifies whether animation is enabled.")]
+		public bool AnimationEnabled
+		{
+			get{return m_AnimationEnabled;}
+			set{m_AnimationEnabled=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets maximum animation time in milliseconds.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),DefaultValue(100),Category("Behavior"),Description("Indicates maximum animation time in milliseconds, default value is 100.")]
+		public int AnimationTime
+		{
+			get {return m_AnimationTime;}
+			set
+			{
+				if(m_AnimationTime>0)
+					m_AnimationTime=value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets whether native .NET Drag and Drop is used by side-bar to perform drag and drop operations. AllowDrop must be set to true to allow drop of the items on control.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),System.ComponentModel.DefaultValue(false),System.ComponentModel.Category("Behavior"),System.ComponentModel.Description("Specifies whether native .NET Drag and Drop is used by side-bar to perform drag and drop operations.")]
+		public bool UseNativeDragDrop
+		{
+			get{return m_UseNativeDragDrop;}
+			set{m_UseNativeDragDrop=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets whether external ButtonItem object is accepted in drag and drop operation. UseNativeDragDrop must be set to true in order for this property to be effective.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),System.ComponentModel.DefaultValue(false),System.ComponentModel.Category("Behavior"),System.ComponentModel.Description("Gets or sets whether external ButtonItem object is accepted in drag and drop operation.")]
+		public bool AllowExternalDrop
+		{
+			get{return m_AllowExternalDrop;}
+			set{m_AllowExternalDrop=value;}
+		}
+
+		/// <summary>
+		/// Applies the stock style to the object.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),Category("Style"),DefaultValue(eExplorerBarStockStyle.Custom),Description("Applies the stock style to the object.")/*,DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)*/]
+		public eExplorerBarStockStyle StockStyle
+		{
+			get {return m_StockStyle;}
+			set
+			{
+				BarFunctions.SetExplorerBarStyle(this,m_StockStyle);
+				foreach(BaseItem item in m_ItemContainer.SubItems)
+				{
+					if(item is ExplorerBarGroupItem && ((ExplorerBarGroupItem)item).StockStyle != eExplorerBarStockStyle.Custom)
+					{
+						((ExplorerBarGroupItem)item).StockStyle=value;
+					}
+                }
+				m_StockStyle=value;
+				this.Refresh();
+			}
+		}
+
+		private bool m_DisabledImagesGrayScale=true;
+		/// <summary>
+		/// Gets or sets whether gray-scale algorithm is used to create automatic gray-scale images. Default is true.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DefaultValue(true),System.ComponentModel.Category("Appearance"),Description("Gets or sets whether gray-scale algorithm is used to create automatic gray-scale images.")]
+		public bool DisabledImagesGrayScale
+		{
+			get
+			{
+				return m_DisabledImagesGrayScale;
+			}
+			set
+			{
+				m_DisabledImagesGrayScale=value;
+			}
+		}
+
+        /// <summary>
+        /// Specifies custom image to be used as button on ExplorerBarGroup item to expand the group. Default value is null
+        /// which indicates that default button is used.
+        /// </summary>
+        [Browsable(true), Category("Group Expand Button"), DefaultValue(null), Description("Specifies custom image to be used as button on ExplorerBarGroup item to expand the group.")]
+        public Image GroupButtonExpandNormal
+        {
+            get { return m_GroupButtonExpandNormal; }
+            set
+            {
+                m_GroupButtonExpandNormal = value;
+                this.Refresh();
+            }
+        }
+
+        /// <summary>
+        /// Specifies custom image to be used as button on ExplorerBarGroup item to expand the group. This image is used when mouse is over the button. Default value is null
+        /// which indicates that default button is used.
+        /// </summary>
+        [Browsable(true), Category("Group Expand Button"), DefaultValue(null), Description("Specifies custom image to be used as button on ExplorerBarGroup item to expand the group.")]
+        public Image GroupButtonExpandHot
+        {
+            get { return m_GroupButtonExpandHot; }
+            set
+            {
+                m_GroupButtonExpandHot = value;
+            }
+        }
+
+        /// <summary>
+        /// Specifies custom image to be used as button on ExplorerBarGroup item to expand the group. This image is used when user presses left mouse button while cursor is positioned over the button. Default value is null
+        /// which indicates that default button is used.
+        /// </summary>
+        [Browsable(true), Category("Group Expand Button"), DefaultValue(null), Description("Specifies custom image to be used as button on ExplorerBarGroup item to expand the group.")]
+        public Image GroupButtonExpandPressed
+        {
+            get { return m_GroupButtonExpandPressed; }
+            set
+            {
+                m_GroupButtonExpandPressed = value;
+            }
+        }
+
+        /// <summary>
+        /// Specifies custom image to be used as button on ExplorerBarGroup item to collapse the group. Default value is null
+        /// which indicates that default button is used.
+        /// </summary>
+        [Browsable(true), Category("Group Expand Button"), DefaultValue(null), Description("Specifies custom image to be used as button on ExplorerBarGroup item to collapse the group.")]
+        public Image GroupButtonCollapseNormal
+        {
+            get { return m_GroupButtonCollapseNormal; }
+            set
+            {
+                m_GroupButtonCollapseNormal = value;
+                this.Refresh();
+            }
+        }
+
+        /// <summary>
+        /// Specifies custom image to be used as button on ExplorerBarGroup item to collapse the group. 
+        /// This Image is used when mouse is over the button. Default value is null
+        /// which indicates that default button is used.
+        /// </summary>
+        [Browsable(true), Category("Group Expand Button"), DefaultValue(null), Description("Specifies custom image to be used as button on ExplorerBarGroup item to collapse the group.")]
+        public Image GroupButtonCollapseHot
+        {
+            get { return m_GroupButtonCollapseHot; }
+            set {m_GroupButtonCollapseHot = value;}
+        }
+
+        /// <summary>
+        /// Specifies custom image to be used as button on ExplorerBarGroup item to collapse the group. 
+        /// This Image is used when left mouse button is pressed while cursor is over the button. Default value is null
+        /// which indicates that default button is used.
+        /// </summary>
+        [Browsable(true), Category("Group Expand Button"), DefaultValue(null), Description("Specifies custom image to be used as button on ExplorerBarGroup item to collapse the group.")]
+        public Image GroupButtonCollapsePressed
+        {
+            get { return m_GroupButtonCollapsePressed; }
+            set { m_GroupButtonCollapsePressed = value; }
+        }
+
+		/// <summary>
+		/// ImageList for images used on Items. Images specified here will always be used on menu-items and are by default used on all Bars.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),System.ComponentModel.Category("Data"),System.ComponentModel.Description("ImageList for images used on Items. Images specified here will always be used on menu-items and are by default used on all Bars.")]
+		public System.Windows.Forms.ImageList Images
+		{
+			get
+			{
+				return m_ImageList;
+			}
+			set
+			{
+				if(m_ImageList!=null)
+					m_ImageList.Disposed-=new EventHandler(this.ImageListDisposed);
+				m_ImageList=value;
+				if(m_ImageList!=null)
+					m_ImageList.Disposed+=new EventHandler(this.ImageListDisposed);
+			}
+		}
+
+		//private bool m_Initializing=false;
+		void ISupportInitialize.BeginInit()
+		{
+			//m_Initializing=true;
+		}
+		void ISupportInitialize.EndInit()
+		{
+			//m_Initializing=false;
+			if(this.Images!=null)
+			{
+				foreach(BaseItem item in m_ItemContainer.SubItems)
+					FireOnImageChanged(item as ImageItem);
+			}
+			this.RecalcLayout();
+		}
+
+		private void FireOnImageChanged(ImageItem item)
+		{
+			if(item==null)
+				return;
+
+			item.OnImageChanged();
+			foreach(BaseItem child in item.SubItems)
+				FireOnImageChanged(child as ImageItem);
+		}
+
+		/// <summary>
+		/// ImageList for images displayed on the Group Item.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),System.ComponentModel.Category("Data"),System.ComponentModel.Description("ImageList for images displayed on the Group Item.")]
+		public System.Windows.Forms.ImageList GroupImages
+		{
+			get
+			{
+				return m_ImageListMedium;
+			}
+			set
+			{
+				if(m_ImageListMedium!=null)
+					m_ImageListMedium.Disposed-=new EventHandler(this.ImageListDisposed);
+				m_ImageListMedium=value;
+				if(m_ImageListMedium!=null)
+					m_ImageListMedium.Disposed+=new EventHandler(this.ImageListDisposed);
+			}
+		}
+
+		System.Windows.Forms.ImageList IOwner.ImagesMedium
+		{
+			get
+			{
+				return m_ImageListMedium;
+			}
+			set
+			{
+				if(m_ImageListMedium!=null)
+					m_ImageListMedium.Disposed-=new EventHandler(this.ImageListDisposed);
+				m_ImageListMedium=value;
+				if(m_ImageListMedium!=null)
+					m_ImageListMedium.Disposed+=new EventHandler(this.ImageListDisposed);
+			}
+		}
+
+		/// <summary>
+		/// ImageList for large-sized images used on Items.
+		/// </summary>
+		//[System.ComponentModel.Browsable(true),System.ComponentModel.Category("Data"),System.ComponentModel.Description("ImageList for large-sized images used on Items.")]
+		System.Windows.Forms.ImageList IOwner.ImagesLarge
+		{
+			get
+			{
+				return m_ImageListLarge;
+			}
+			set
+			{
+				if(m_ImageListLarge!=null)
+					m_ImageListLarge.Disposed-=new EventHandler(this.ImageListDisposed);
+				m_ImageListLarge=value;
+				if(m_ImageListLarge!=null)
+					m_ImageListLarge.Disposed+=new EventHandler(this.ImageListDisposed);
+			}
+		}
+
+		private void ImageListDisposed(object sender, EventArgs e)
+		{
+			if(sender==m_ImageList)
+			{
+				m_ImageList=null;
+			}
+			else if(sender==m_ImageListLarge)
+			{
+				m_ImageListLarge=null;
+			}
+			else if(sender==m_ImageListMedium)
+			{
+				m_ImageListMedium=null;
+			}
+		}
+
+		void IOwner.StartItemDrag(BaseItem item)
+		{
+			if(m_DragItem==null)
+			{
+				m_DragItem=item;
+				if(!m_UseNativeDragDrop)
+				{
+					this.Capture=true;
+					if(m_MoveCursor!=null)
+						System.Windows.Forms.Cursor.Current=m_MoveCursor;
+					else
+						System.Windows.Forms.Cursor.Current=System.Windows.Forms.Cursors.Hand;
+					m_DragInProgress=true;
+				}
+				else
+				{
+					m_DragInProgress=true;
+					this.DoDragDrop(item,DragDropEffects.All);
+					if(m_DragInProgress)
+						MouseDragDrop(-1,-1,null);
+				}
+					
+			}
+		}
+
+		bool IOwner.DragInProgress
+		{
+			get{ return m_DragInProgress;}
+		}
+
+		BaseItem IOwner.DragItem
+		{
+			get {return m_DragItem;}
+		}
+
+		void IOwner.InvokeUserCustomize(object sender,EventArgs e)
+		{
+			if(UserCustomize!=null)
+				UserCustomize(sender,e);
+		}
+		void IOwner.InvokeEndUserCustomize(object sender,EndUserCustomizeEventArgs e){}
+
+		/// <summary>
+		/// Indicates whether Tooltips are shown on Bars and menus.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DefaultValue(true),System.ComponentModel.Category("Run-time Behavior"),System.ComponentModel.Description("Indicates whether Tooltips are shown on Bars and menus.")]
+		public bool ShowToolTips
+		{
+			get
+			{
+				return m_ShowToolTips;
+			}
+			set
+			{
+				m_ShowToolTips=value;
+			}
+		}
+
+		/// <summary>
+		/// Indicates whether item shortcut is displayed in Tooltips.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DefaultValue(false),System.ComponentModel.Category("Run-time Behavior"),System.ComponentModel.Description("Indicates whether item shortcut is displayed in Tooltips.")]
+		public bool ShowShortcutKeysInToolTips
+		{
+			get
+			{
+				return m_ShowShortcutKeysInToolTips;
+			}
+			set
+			{
+				m_ShowShortcutKeysInToolTips=value;
+			}
+		}
+
+		/// <summary>
+		/// Returns the item located at specific client coordinates.
+		/// </summary>
+		/// <param name="clientX">X Coordinate</param>
+		/// <param name="clientY">Y Coordinate</param>
+		/// <returns></returns>
+		public BaseItem HitTest(int clientX, int clientY)
+		{
+			BaseItem ret=null;
+			foreach(BaseItem item in m_ItemContainer.SubItems)
+			{
+				if(item.DisplayRectangle.Contains(clientX,clientY))
+				{
+					ret=item;
+					foreach(BaseItem child in item.SubItems)
+					{
+						if(child.DisplayRectangle.Contains(clientX,clientY))
+						{
+							ret=child;
+							break;
+						}
+					}
+				}
+			}
+			return ret;
+		}
+        
+        /// <summary>
+        /// Gets or sets the item default accesibility action will be performed on.
+        /// </summary>
+        BaseItem IAccessibilitySupport.DoDefaultActionItem
+        {
+            get { return m_DoDefaultActionItem; }
+            set { m_DoDefaultActionItem = value; }
+        }
+
+        protected override void WndProc(ref Message m)
+        {
+            if (m.Msg == NativeFunctions.WM_USER + 107)
+            {
+                if (m_DoDefaultActionItem != null)
+                {
+                    m_DoDefaultActionItem.DoAccesibleDefaultAction();
+                    m_DoDefaultActionItem = null;
+                }
+
+            }
+            base.WndProc(ref m);
+        }
+
+		// Menu Support Code START
+		private void MenuEventSupportHook()
+		{
+			if(m_MenuEventSupport)
+				return;
+			m_MenuEventSupport=true;
+			
+			Form parentForm=this.FindForm();
+			if(parentForm==null)
+			{
+				m_MenuEventSupport=false;
+				return;
+			}
+
+			parentForm.Resize+=new System.EventHandler(this.ParentResize);
+			parentForm.Deactivate+=new System.EventHandler(this.ParentDeactivate);
+
+			DotNetBarManager.RegisterParentMsgHandler(this,parentForm);
+		}
+
+		private void MenuEventSupportUnhook()
+		{
+			if(!m_MenuEventSupport)
+				return;
+			m_MenuEventSupport=false;
+
+			Form parentForm=this.FindForm();
+			if(parentForm==null)
+				return;
+            DotNetBarManager.UnRegisterParentMsgHandler(this, parentForm);
+			parentForm.Resize-=new System.EventHandler(this.ParentResize);
+			parentForm.Deactivate-=new System.EventHandler(this.ParentDeactivate);
+		}
+		private void ParentResize(object sender, System.EventArgs e)
+		{
+			Form parentForm=this.FindForm();
+			if(parentForm!=null && parentForm.WindowState==FormWindowState.Minimized)
+				((IOwner)this).OnApplicationDeactivate();
+		}
+		private void ParentDeactivate(object sender, System.EventArgs e)
+		{
+			Form parentForm=this.FindForm();
+			if(parentForm!=null && parentForm.WindowState==FormWindowState.Minimized)
+				((IOwner)this).OnApplicationDeactivate();
+		}
+		// IOwnerMenuSupport
+        private Hook m_Hook = null;
+		private ArrayList m_RegisteredPopups=new ArrayList();
+		bool IOwnerMenuSupport.PersonalizedAllVisible {get{return false;}set{}}
+		bool IOwnerMenuSupport.ShowFullMenusOnHover {get{return true;}set{}}
+		bool IOwnerMenuSupport.AlwaysShowFullMenus {get{return false;}set{}}
+
+		void IOwnerMenuSupport.RegisterPopup(PopupItem objPopup)
+		{
+			if(m_RegisteredPopups.Contains(objPopup))
+				return;
+			
+			if(!this.DesignMode)
+			{
+				if(!m_FilterInstalled)
+				{
+					//System.Windows.Forms.Application.AddMessageFilter(this);
+					MessageHandler.RegisterMessageClient(this);
+					m_FilterInstalled=true;
+				}
+				
+			}
+            else
+            {
+                if (m_Hook == null)
+                {
+                    m_Hook = new Hook(this);
+                }
+            }
+
+			if(!m_MenuEventSupport)
+				MenuEventSupportHook();
+
+            if (m_RegisteredPopups.Count == 0)
+                PopupManager.RegisterPopup((IOwnerMenuSupport)this);
+
+			m_RegisteredPopups.Add(objPopup);
+			if(objPopup.GetOwner()!=this)
+				objPopup.SetOwner(this);
+		}
+		void IOwnerMenuSupport.UnregisterPopup(PopupItem objPopup)
+		{
+			if(m_RegisteredPopups.Contains(objPopup))
+				m_RegisteredPopups.Remove(objPopup);
+            if (m_RegisteredPopups.Count == 0)
+            {
+                MenuEventSupportUnhook();
+                if (m_Hook != null)
+                {
+                    m_Hook.Dispose();
+                    m_Hook = null;
+                }
+                
+                PopupManager.UnregisterPopup((IOwnerMenuSupport)this);
+            }
+		}
+		bool IOwnerMenuSupport.RelayMouseHover()
+		{
+			foreach(PopupItem popup in m_RegisteredPopups)
+			{
+				Control ctrl=popup.PopupControl;
+				if(ctrl!=null && ctrl.DisplayRectangle.Contains(Control.MousePosition))
+				{
+					if(ctrl is MenuPanel)
+						((MenuPanel)ctrl).InternalMouseHover();
+					else if(ctrl is Bar)
+						((Bar)ctrl).InternalMouseHover();
+					return true;
+				}
+			}
+			return false;
+		}
+
+        void IOwnerMenuSupport.ClosePopups()
+        {
+            ClosePopups();
+        }
+
+        private void ClosePopups()
+        {
+            ArrayList popupList = new ArrayList(m_RegisteredPopups);
+            foreach (PopupItem objPopup in popupList)
+                objPopup.ClosePopup();
+        }
+
+		// Events
+		void IOwnerMenuSupport.InvokePopupClose(PopupItem item,EventArgs e)
+		{
+			if(PopupClose!=null)
+				PopupClose(item,e);
+		}
+		void IOwnerMenuSupport.InvokePopupContainerLoad(PopupItem item,EventArgs e)
+		{
+			if(PopupContainerLoad!=null)
+				PopupContainerLoad(item,e);
+		}
+		void IOwnerMenuSupport.InvokePopupContainerUnload(PopupItem item,EventArgs e)
+		{
+			if(PopupContainerUnload!=null)
+				PopupContainerUnload(item,e);
+		}
+		void IOwnerMenuSupport.InvokePopupOpen(PopupItem item,PopupOpenEventArgs e)
+		{
+			if(PopupOpen!=null)
+				PopupOpen(item,e);
+		}
+		void IOwnerMenuSupport.InvokePopupShowing(PopupItem item,EventArgs e)
+		{
+			if(PopupShowing!=null)
+				PopupShowing(item,e);
+		}
+		bool IOwnerMenuSupport.ShowPopupShadow {get{return false;}}
+		eMenuDropShadow IOwnerMenuSupport.MenuDropShadow{get{return eMenuDropShadow.Hide;}set{}}
+		ePopupAnimation IOwnerMenuSupport.PopupAnimation{get {return ePopupAnimation.SystemDefault;}set{}}
+		bool IOwnerMenuSupport.AlphaBlendShadow{get {return true;}set{}}
+		// Menu Support Code END
+
+		bool IOwner.DesignMode
+		{
+			get {return this.DesignMode;}
+		}
+		Form IOwner.ActiveMdiChild
+		{
+			get
+			{
+				Form form=base.FindForm();
+				if(form==null)
+					return null;
+				if(form.IsMdiContainer)
+				{
+					return form.ActiveMdiChild;
+				}
+				return null;
+			}
+		}
+
+		System.Windows.Forms.MdiClient IOwner.GetMdiClient(System.Windows.Forms.Form MdiForm)
+		{
+			return BarFunctions.GetMdiClient(MdiForm);
+		}
+
+		/// <summary>
+		/// Invokes the DotNetBar Customize dialog.
+		/// </summary>
+		void IOwner.Customize()
+		{
+		}
+
+		void IOwner.InvokeResetDefinition(BaseItem item,EventArgs e)
+		{
+		}
+
+		/// <summary>
+		/// Indicates whether Reset buttons is shown that allows end-user to reset the toolbar state.
+		/// </summary>
+		bool IOwner.ShowResetButton
+		{
+			get{return false;}
+			set {}
+		}
+
+		/// <summary>
+		/// Returns the reference to the container that containing the sub-items.
+		/// </summary>
+		[System.ComponentModel.Browsable(false)]
+		public ExplorerBarContainerItem ItemsContainer
+		{
+			get
+			{
+				return m_ItemContainer;
+			}
+		}
+
+//		/// <summary>
+//		/// Gets/Sets border style when Bar is docked.
+//		/// </summary>
+//		[System.ComponentModel.Browsable(true),System.ComponentModel.DefaultValue(eBorderType.None),System.ComponentModel.Category("Appearance"),System.ComponentModel.Description("Indicates border style when Bar is docked.")]
+//		public eBorderType BorderStyle
+//		{
+//			get
+//			{
+//				return m_BorderStyle;
+//			}
+//			set
+//			{
+//				if(m_BorderStyle==value)
+//					return;
+//				if(m_BorderStyle==eBorderType.None)
+//				{
+//					m_BorderStyle=value;
+//					this.RecalcSize();
+//				}
+//				else
+//					m_BorderStyle=value;
+//				this.Refresh();
+//			}
+//		}
+
+		[System.ComponentModel.Browsable(false),System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+		public override Image BackgroundImage
+		{
+			get{return base.BackgroundImage;}
+			set{base.BackgroundImage=value;}
+		}
+
+		[System.ComponentModel.Browsable(false),System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+		public override Color BackColor
+		{
+			get{return base.BackColor;}
+			set{base.BackColor=value;}
+		}
+		[System.ComponentModel.Browsable(false),System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+		public override Color ForeColor
+		{
+			get{return base.ForeColor;}
+			set{base.ForeColor=value;}
+		}
+
+        #region ICustomSerialization Implementation
+        /// <summary>
+        /// Invokes SerializeItem event.
+        /// </summary>
+        /// <param name="e">Provides data for the event.</param>
+        void ICustomSerialization.InvokeSerializeItem(SerializeItemEventArgs e)
+        {
+            if (SerializeItem != null)
+                SerializeItem(this, e);
+        }
+
+        /// <summary>
+        /// Invokes DeserializeItem event.
+        /// </summary>
+        /// <param name="e">Provides data for the event.</param>
+        void ICustomSerialization.InvokeDeserializeItem(SerializeItemEventArgs e)
+        {
+            if (DeserializeItem != null)
+                DeserializeItem(this, e);
+        }
+
+        /// <summary>
+        /// Gets whether any handlers have been defined for SerializeItem event. If no handles have been defined to optimize performance SerializeItem event will not be attempted to fire.
+        /// </summary>
+        bool ICustomSerialization.HasSerializeItemHandlers
+        {
+            get
+            {
+                return SerializeItem != null;
+            }
+        }
+
+        /// <summary>
+        /// Gets whether any handlers have been defined for DeserializeItem event. If no handles have been defined to optimize performance DeserializeItem event will not be attempted to fire.
+        /// </summary>
+        bool ICustomSerialization.HasDeserializeItemHandlers
+        {
+            get
+            {
+                return DeserializeItem != null;
+            }
+        }
+        #endregion
+
+		/// <summary>
+		/// Gets/Sets Bar definition as XML string.
+		/// </summary>
+		[System.ComponentModel.Browsable(false),System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
+		public string Definition
+		{
+			get
+			{
+				System.Xml.XmlDocument xmlDoc=new System.Xml.XmlDocument();
+				SaveDefinition(xmlDoc);
+				return xmlDoc.OuterXml;
+			}
+			set
+			{
+				System.Xml.XmlDocument xmlDoc=new System.Xml.XmlDocument();
+				xmlDoc.LoadXml(value);
+				LoadDefinition(xmlDoc);
+				this.Refresh();
+			}
+		}
+
+		internal void SaveDefinition(System.Xml.XmlDocument xmlDoc)
+		{
+			System.Xml.XmlElement xmlBar=xmlDoc.CreateElement("ExplorerBar");
+			xmlDoc.AppendChild(xmlBar);
+			this.Serialize(xmlBar);
+		}
+
+		internal void Serialize(System.Xml.XmlElement xmlThisBar)
+		{
+            // Creates serialization context
+            ItemSerializationContext context = new ItemSerializationContext();
+            context.Serializer = this;
+            context.HasDeserializeItemHandlers = ((ICustomSerialization)this).HasDeserializeItemHandlers;
+            context.HasSerializeItemHandlers = ((ICustomSerialization)this).HasSerializeItemHandlers;
+
+			xmlThisBar.SetAttribute("name",this.Name);
+			
+			// Save Font information if needed
+			if(this.Font!=null)
+			{
+				if(this.Font.Name!=System.Windows.Forms.SystemInformation.MenuFont.Name || this.Font.Size!=System.Windows.Forms.SystemInformation.MenuFont.Size || this.Font.Style!=System.Windows.Forms.SystemInformation.MenuFont.Style)
+				{
+					xmlThisBar.SetAttribute("fontname",this.Font.Name);
+					xmlThisBar.SetAttribute("fontemsize",System.Xml.XmlConvert.ToString(this.Font.Size));
+					xmlThisBar.SetAttribute("fontstyle",System.Xml.XmlConvert.ToString((int)this.Font.Style));
+				}
+			}
+
+//			if(this.BackColor!=SystemColors.Control)
+//				xmlThisBar.SetAttribute("backcolor",BarFunctions.ColorToString(this.BackColor));
+//			if(this.ForeColor!=SystemColors.ControlText)
+//				xmlThisBar.SetAttribute("forecolor",BarFunctions.ColorToString(this.ForeColor));
+
+			//xmlThisBar.SetAttribute("x",System.Xml.XmlConvert.ToString(this.Location.X));
+			//xmlThisBar.SetAttribute("y",System.Xml.XmlConvert.ToString(this.Location.Y));
+			xmlThisBar.SetAttribute("width",System.Xml.XmlConvert.ToString(this.Width));
+			xmlThisBar.SetAttribute("height",System.Xml.XmlConvert.ToString(this.Height));
+			if(!m_AnimationEnabled)
+				xmlThisBar.SetAttribute("animate",System.Xml.XmlConvert.ToString(m_AnimationEnabled));
+			System.Xml.XmlElement xmlItems=xmlThisBar.OwnerDocument.CreateElement("items");
+			xmlThisBar.AppendChild(xmlItems);
+			foreach(BaseItem objItem in m_ItemContainer.SubItems)
+			{
+				if(objItem.ShouldSerialize)
+				{
+					System.Xml.XmlElement xmlItem=xmlThisBar.OwnerDocument.CreateElement("item");
+					xmlItems.AppendChild(xmlItem);
+                    context.ItemXmlElement = xmlItem;
+					objItem.Serialize(context);
+				}
+			}
+
+			System.Xml.XmlElement xmlStyle=xmlThisBar.OwnerDocument.CreateElement("backstyle");
+			xmlThisBar.AppendChild(xmlStyle);
+            SerializeElementStyle(m_BackStyle,xmlStyle);
+		}
+
+        private void SerializeElementStyle(ElementStyle style, System.Xml.XmlElement xmlElement)
+        {
+            ElementSerializer.Serialize(style, xmlElement);
+        }
+
+        private void DeserializeElementStyle(ElementStyle style, System.Xml.XmlElement xmlElement)
+        {
+            ElementSerializer.Deserialize(style, xmlElement);
+        }
+
+		private bool ProcessShortcut(eShortcut key)
+		{
+			bool eat=BarFunctions.ProcessItemsShortcuts(key,m_ShortcutTable);
+			return !m_DispatchShortcuts && eat;
+
+//			if(m_ShortcutTable.Contains(key))
+//			{
+//				ShortcutTableEntry objEntry=(ShortcutTableEntry)m_ShortcutTable[key];
+//				// Must convert to independable array, since if this is for example
+//				// close command first Click will destroy the collection we are
+//				// iterating through and exception will be raised.
+//				BaseItem[] arr=new BaseItem[objEntry.Items.Values.Count];
+//				objEntry.Items.Values.CopyTo(arr,0);
+//				Hashtable hnames=new Hashtable(arr.Length);
+//
+//				bool eat=false;
+//
+//				foreach(BaseItem objItem in arr)
+//				{
+//					if(objItem.CanRaiseClick && (objItem.Name=="" || !hnames.Contains(objItem.Name)))
+//					{
+//						eat=true;
+//						objItem.RaiseClick();
+//						if(objItem.Name!="")
+//							hnames.Add(objItem.Name,"");
+//					}
+//				}
+//				return !m_DispatchShortcuts && eat; // True will eat the key, false will pass it through
+//			}
+//			return false;
+		}
+
+		/// <summary>
+		/// Indicates whether shortucts handled by items are dispatched to the next handler or control.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DefaultValue(false),System.ComponentModel.Category("Behavior"),System.ComponentModel.Description("Indicates whether shortucts handled by items are dispatched to the next handler or control.")]
+		public bool DispatchShortcuts
+		{
+			get {return m_DispatchShortcuts;}
+			set {m_DispatchShortcuts=value;}
+		}
+
+		private bool IsParentFormActive
+		{
+			get
+			{
+				// Process only if parent form is active
+				Form form=this.FindForm();
+				if(form==null)
+					return false;
+				if(form.IsMdiChild)
+				{
+					if(form.MdiParent==null)
+						return false;
+					if(form.MdiParent.ActiveMdiChild!=form)
+						return false;
+				}
+				else if(form!=Form.ActiveForm)
+					return false;
+				return true;
+			}
+		}
+
+		bool IMessageHandlerClient.IsModal
+		{
+			get
+			{
+				Form form=this.FindForm();
+				if(form!=null)
+					return form.Modal;
+				return false;
+			}
+		}
+
+        bool IMessageHandlerClient.OnMouseWheel(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+            return false;
+        }
+
+        bool IMessageHandlerClient.OnKeyDown(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+            int wParamInt = WinApi.ToInt(wParam);
+            if (m_RegisteredPopups.Count > 0)
+            {
+                if (((BaseItem)m_RegisteredPopups[m_RegisteredPopups.Count - 1]).Parent == null)
+                {
+                    PopupItem objItem = (PopupItem)m_RegisteredPopups[m_RegisteredPopups.Count - 1];
+
+                    Control ctrl = objItem.PopupControl as Control;
+                    Control ctrl2 = Control.FromChildHandle(hWnd);
+
+                    if (ctrl2 != null)
+                    {
+                        while (ctrl2.Parent != null)
+                            ctrl2 = ctrl2.Parent;
+                    }
+
+                    bool bIsOnHandle = false;
+                    if (ctrl2 != null && objItem != null)
+                        bIsOnHandle = objItem.IsAnyOnHandle(ctrl2.Handle);
+
+                    bool bNoEat = ctrl != null && ctrl2 != null && ctrl.Handle == ctrl2.Handle || bIsOnHandle;
+
+                    if (!bIsOnHandle)
+                    {
+                        Keys key = (Keys)NativeFunctions.MapVirtualKey((uint)wParam, 2);
+                        if (key == Keys.None)
+                            key = (Keys)wParamInt;
+                        objItem.InternalKeyDown(new KeyEventArgs(key));
+                    }
+
+                    // Don't eat the message if the pop-up window has focus
+                    if (bNoEat)
+                        return false;
+                    return true;
+                }
+            }
+
+            if (!this.IsParentFormActive)
+                return false;
+
+            if (wParamInt>= 0x70 || System.Windows.Forms.Control.ModifierKeys != Keys.None || (WinApi.ToInt(lParam) & 0x1000000000) != 0 || wParamInt== 0x2E || wParamInt== 0x2D) // 2E=VK_DELETE, 2D=VK_INSERT
+            {
+                int i = (int)System.Windows.Forms.Control.ModifierKeys | wParamInt;
+                return ProcessShortcut((eShortcut)i);
+            }
+            return false;
+        }
+		bool IMessageHandlerClient.OnMouseDown(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+		{
+			if(m_RegisteredPopups.Count==0)
+				return false;
+
+			for(int i=m_RegisteredPopups.Count-1;i>=0;i--)
+			{
+				PopupItem objPopup=m_RegisteredPopups[i] as PopupItem;
+				bool bChildHandle=objPopup.IsAnyOnHandle(hWnd);
+
+				if(!bChildHandle)
+				{
+                    System.Windows.Forms.Control cTmp = System.Windows.Forms.Control.FromChildHandle(hWnd);
+                    if (cTmp != null)
+                    {
+                        if (cTmp is MenuPanel)
+                        {
+                            bChildHandle = true;
+                        }
+                        else
+                        {
+                            while (cTmp.Parent != null)
+                            {
+                                cTmp = cTmp.Parent;
+                                if (cTmp.GetType().FullName.IndexOf("DropDownHolder") >= 0 || cTmp is MenuPanel || cTmp is PopupContainerControl)
+                                {
+                                    bChildHandle = true;
+                                    break;
+                                }
+                            }
+                        }
+                        if (!bChildHandle)
+                            bChildHandle = objPopup.IsAnyOnHandle(cTmp.Handle);
+                    }
+                    else
+                    {
+                        string s = NativeFunctions.GetClassName(hWnd);
+                        s = s.ToLower();
+                        if (s.IndexOf("combolbox") >= 0)
+                            bChildHandle = true;
+                    }
+				}
+
+                if (!bChildHandle)
+                {
+                    Control popupContainer = objPopup.PopupControl;
+                    if (popupContainer != null)
+                        while (popupContainer.Parent != null) popupContainer = popupContainer.Parent;
+                    if (popupContainer != null && popupContainer.Bounds.Contains(Control.MousePosition))
+                        bChildHandle = true;
+                }
+
+				if(bChildHandle)
+					break;
+
+				if(objPopup.Displayed)
+				{
+					// Do not close if mouse is inside the popup parent button
+					Point p=this.PointToClient(Control.MousePosition);
+					if(objPopup.DisplayRectangle.Contains(p))
+						break;
+				}
+				
+				objPopup.ClosePopup();
+
+				if(m_RegisteredPopups.Count==0)
+					break;
+			}
+			return false;
+		}
+		bool IMessageHandlerClient.OnMouseMove(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+		{
+			if(m_RegisteredPopups.Count>0)
+			{
+				foreach(BaseItem item in m_RegisteredPopups)
+				{
+					if(item.Parent==null)
+					{
+						Control ctrl=((PopupItem)item).PopupControl;
+						if(ctrl!=null && ctrl.Handle!=hWnd && !item.IsAnyOnHandle(hWnd) && !(ctrl.Parent!=null && ctrl.Parent.Handle!=hWnd))
+							return true;
+					}
+				}
+			}
+			return false;
+		}
+        bool IMessageHandlerClient.OnSysKeyDown(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+            if (!this.DesignMode)
+            {
+                // Check Shortcuts
+                int wParamInt = WinApi.ToInt(wParam);
+                if (System.Windows.Forms.Control.ModifierKeys != Keys.None || wParamInt>= (int)eShortcut.F1 && wParamInt<= (int)eShortcut.F12)
+                {
+                    int i = (int)System.Windows.Forms.Control.ModifierKeys | wParamInt;
+                    if (ProcessShortcut((eShortcut)i))
+                        return true;
+                }
+            }
+            return false;
+        }
+		bool IMessageHandlerClient.OnSysKeyUp(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+		{
+			return false;
+		}
+
+		internal void Deserialize(System.Xml.XmlElement xmlThisBar)
+		{
+            // Creates serialization context
+            ItemSerializationContext context = new ItemSerializationContext();
+            context.Serializer = this;
+            context.HasDeserializeItemHandlers = ((ICustomSerialization)this).HasDeserializeItemHandlers;
+            context.HasSerializeItemHandlers = ((ICustomSerialization)this).HasSerializeItemHandlers;
+
+			m_ShortcutTable.Clear();
+
+			this.Name=xmlThisBar.GetAttribute("name");
+			//m_ItemContainer.Style=(eDotNetBarStyle)System.Xml.XmlConvert.ToInt32(xmlThisBar.GetAttribute("style"));
+			
+//			if(xmlThisBar.HasAttribute("backcolor"))
+//				this.BackColor=BarFunctions.ColorFromString(xmlThisBar.GetAttribute("backcolor"));
+//			if(xmlThisBar.HasAttribute("forecolor"))
+//				this.ForeColor=BarFunctions.ColorFromString(xmlThisBar.GetAttribute("forecolor"));
+
+			//this.Location=new Point(System.Xml.XmlConvert.ToInt32(xmlThisBar.GetAttribute("x")),System.Xml.XmlConvert.ToInt32(xmlThisBar.GetAttribute("y")));
+			this.Size=new Size(System.Xml.XmlConvert.ToInt32(xmlThisBar.GetAttribute("width")),System.Xml.XmlConvert.ToInt32(xmlThisBar.GetAttribute("height")));
+			
+			if(xmlThisBar.HasAttribute("animate"))
+				m_AnimationEnabled=System.Xml.XmlConvert.ToBoolean(xmlThisBar.GetAttribute("animate"));
+			else
+				m_AnimationEnabled=true;
+
+			// Load font information if it exists
+			if(xmlThisBar.HasAttribute("fontname"))
+			{
+				string FontName=xmlThisBar.GetAttribute("fontname");
+				float FontSize=System.Xml.XmlConvert.ToSingle(xmlThisBar.GetAttribute("fontemsize"));
+				System.Drawing.FontStyle FontStyle=(System.Drawing.FontStyle)System.Xml.XmlConvert.ToInt32(xmlThisBar.GetAttribute("fontstyle"));
+				try
+				{
+					this.Font=new Font(FontName,FontSize,FontStyle);
+				}
+				catch(Exception)
+				{
+                    this.Font = SystemFonts.DefaultFont;
+				}
+			}
+
+			foreach(System.Xml.XmlElement xmlElem in xmlThisBar.ChildNodes)
+			{
+				switch(xmlElem.Name)
+				{
+					case "items":
+					{
+						foreach(System.Xml.XmlElement xmlItem in xmlElem.ChildNodes)
+						{
+							BaseItem objItem=BarFunctions.CreateItemFromXml(xmlItem);
+							m_ItemContainer.SubItems.Add(objItem);
+                            context.ItemXmlElement = xmlItem;
+							objItem.Deserialize(context);
+						}
+						break;
+					}
+					case "backstyle":
+                        DeserializeElementStyle(m_BackStyle, xmlElem);
+						m_VisualPropertyChanged=true;
+						break;
+				}
+			}
+		}
+
+		/// <summary>
+		/// Loads the Side bar definition from file.
+		/// </summary>
+		/// <param name="FileName">Definition file name.</param>
+		public void LoadDefinition(string FileName)
+		{
+			System.Xml.XmlDocument xmlDoc=new System.Xml.XmlDocument();
+			xmlDoc.Load(FileName);
+			this.LoadDefinition(xmlDoc);
+			this.Refresh();
+		}
+
+		internal void LoadDefinition(System.Xml.XmlDocument xmlDoc)
+		{
+			if(xmlDoc.FirstChild.Name!="ExplorerBar")
+				throw(new System.InvalidOperationException("XML Format not recognized"));
+
+			m_ItemContainer.SubItems.Clear();
+			this.Deserialize(xmlDoc.FirstChild as System.Xml.XmlElement);
+
+			IOwner owner=this as IOwner;
+			if(owner!=null)
+				owner.AddShortcutsFromItem(m_ItemContainer);
+
+			((IOwner)this).InvokeDefinitionLoaded(this,new EventArgs());
+			this.RecalcSize();
+		}
+
+		/// <summary>
+		/// Saves the Side bar definition to file.
+		/// </summary>
+		/// <param name="FileName">Definition file name.</param>
+		public void SaveDefinition(string FileName)
+		{
+			System.Xml.XmlDocument xmlDoc=new System.Xml.XmlDocument();
+			
+			this.SaveDefinition(xmlDoc);
+
+			xmlDoc.Save(FileName);
+		}
+
+		void IOwner.InvokeDefinitionLoaded(object sender,EventArgs e)
+		{
+			if(DefinitionLoaded!=null)
+				DefinitionLoaded(sender,e);
+		}
+
+		#region IBarDesignerServices
+		IBarItemDesigner IBarDesignerServices.Designer
+		{
+			get {return m_BarDesigner;}
+			set {m_BarDesigner=value;}
+		}
+		#endregion
+
+		public class ExplorerBarAccessibleObject : System.Windows.Forms.AccessibleObject
+		{
+			ExplorerBar m_Owner = null;
+			public ExplorerBarAccessibleObject(ExplorerBar owner)
+			{
+				m_Owner = owner;
+			}
+
+			internal void GenerateEvent(BaseItem sender, System.Windows.Forms.AccessibleEvents e)
+			{
+				int	iChild = m_Owner.Groups.IndexOf(sender);
+				if(iChild>=0)
+					m_Owner.AccessibilityNotifyClients(e,iChild);
+			}
+
+			public override string Name 
+			{
+				get { return m_Owner.AccessibleName; }
+				set { m_Owner.AccessibleName = value; }
+			}
+
+			public override string Description
+			{
+				get { return m_Owner.AccessibleDescription; }
+			}
+
+			public override AccessibleRole Role
+			{
+				get { return m_Owner.AccessibleRole; }
+			}
+
+			/*			public override AccessibleStates State
+						{
+							get { return m_owner; }
+							set { m_owner.AccessibleRole = value; }
+						}*/
+
+			/*			public override string Value
+						{
+							get { return m_owner.AccessibleRole; }
+							set { m_owner.AccessibleRole = value; }
+						}*/
+
+			public override AccessibleObject Parent 
+			{
+				get
+				{
+					if(m_Owner.Parent!=null)
+						return m_Owner.Parent.AccessibilityObject;
+					return null;
+				}
+			}
+
+			public override Rectangle Bounds 
+			{
+				get
+				{
+					if(m_Owner.Parent!=null)
+						return this.m_Owner.Parent.RectangleToScreen(m_Owner.Bounds);
+					return m_Owner.DisplayRectangle;
+				}
+			}
+
+			public override int GetChildCount()
+			{
+				return m_Owner.Groups.Count;
+			}
+
+			public override System.Windows.Forms.AccessibleObject GetChild(int iIndex)
+			{
+				return m_Owner.Groups[iIndex].AccessibleObject;
+			}
+
+			public override AccessibleStates State
+			{
+				get
+				{
+					AccessibleStates state=AccessibleStates.Default;
+					if(m_Owner.Focused)
+					{
+						state=AccessibleStates.Focused;
+					}
+					return state;
+				}
+			}
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/ExplorerBarContainerItem.cs b/PROMS/DotNetBar Source Code/ExplorerBarContainerItem.cs
new file mode 100644
index 00000000..badc38c7
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/ExplorerBarContainerItem.cs	
@@ -0,0 +1,483 @@
+using System;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Provides layout for Explorer-Bar control.
+	/// </summary>
+	[System.ComponentModel.ToolboxItem(false),System.ComponentModel.DesignTimeVisible(false)]
+	public class ExplorerBarContainerItem:ImageItem,IDesignTimeProvider
+	{
+		#region Internal Implementation
+		internal int m_ItemSpacing=15;
+		/// <summary>
+		/// Creates new instance of ExplorerBarContainerItem class.
+		/// </summary>
+		public ExplorerBarContainerItem()
+		{
+			m_IsContainer=true;
+			m_SystemItem=true;
+			m_SupportedOrientation=eSupportedOrientation.Horizontal;
+			m_AllowOnlyOneSubItemExpanded=false;
+		}
+		/// <summary>
+		/// Returns copy of ExplorerBarContainerItem item
+		/// </summary>
+		public override BaseItem Copy()
+		{
+			ExplorerBarContainerItem objCopy=new ExplorerBarContainerItem();
+			this.CopyToItem(objCopy);
+			return objCopy;
+		}
+		protected override void CopyToItem(BaseItem copy)
+		{
+			ExplorerBarContainerItem objCopy=copy as ExplorerBarContainerItem;
+			base.CopyToItem(objCopy);
+		}
+
+		/// <summary>
+		/// Gets or sets a value indicating whether the item is expanded or not. For Popup items this would indicate whether the item is popped up or not.
+		/// </summary>
+		[System.ComponentModel.Browsable(false),System.ComponentModel.DefaultValue(false),System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
+		public override bool Expanded
+		{
+			get
+			{
+				return base.Expanded;
+			}
+			set
+			{
+				if(!value)
+				{
+					foreach(BaseItem item in m_SubItems)
+					{
+						if(item is ExplorerBarGroupItem)
+						{
+							foreach(BaseItem popup in item.SubItems)
+							{
+								if(popup is PopupItem && item.Expanded)
+									popup.Expanded=false;
+							}
+						}
+					}
+				}
+				base.Expanded=value;
+			}
+		}
+
+		/// <summary>
+		/// Recalculates the size of the item
+		/// </summary>
+		public override void RecalcSize()
+		{
+			// Explorer Container can have none or one or more panels expanded at a time
+			// The Control itself is displaying the scroll-bars and handling the
+			// case when this container is oversized. It is only possible to have
+			// vertical oversize. The items are always made to fit horizontally
+			int iY=m_Rect.Top;
+			if(m_SubItems!=null)
+			{
+				foreach(BaseItem item in m_SubItems)
+				{
+					if(item.Visible)
+					{
+						// Give it our maximum size
+						item.WidthInternal=this.WidthInternal;
+						item.HeightInternal=0;
+						// Set item position
+						item.LeftInternal=m_Rect.Left;
+						item.TopInternal=iY;
+
+						item.RecalcSize();
+						if(item.WidthInternal!=this.WidthInternal)
+							item.WidthInternal=this.WidthInternal;
+						
+						iY+=(item.HeightInternal+m_ItemSpacing);
+
+						item.Displayed=true;
+					}
+				}
+			}
+			iY-=m_ItemSpacing;
+			this.HeightInternal=iY;
+			base.RecalcSize();
+		}
+
+		protected override void OnTopLocationChanged(int oldValue)
+		{
+			int iDiff=m_Rect.Top-oldValue;
+			if(m_SubItems!=null)
+			{
+				foreach(BaseItem item in m_SubItems)
+				{
+					if(item.Visible)
+					{
+						// Set item position
+						item.TopInternal+=iDiff;
+					}
+				}
+			}
+		}
+
+		/// <summary>
+		/// Paints this base container
+		/// </summary>
+		public override void Paint(ItemPaintArgs pa)
+		{
+			if(this.SuspendLayout)
+				return;
+			System.Drawing.Graphics g=pa.Graphics;
+			if(m_NeedRecalcSize)
+				RecalcSize();
+
+			if(m_SubItems==null)
+				return;
+
+			foreach(BaseItem item in m_SubItems)
+			{
+				if(item.Visible && item.Displayed)
+				{
+                    if (item is ExplorerBarGroupItem)
+                    {
+                        if (((ExplorerBarGroupItem)item).WordWrapSubItems)
+                        {
+                            pa.ButtonStringFormat = pa.ButtonStringFormat & ~(pa.ButtonStringFormat & eTextFormat.SingleLine);
+                            pa.ButtonStringFormat |= eTextFormat.WordBreak;
+                        }
+                        else
+                        {
+                            pa.ButtonStringFormat |= eTextFormat.SingleLine;
+                            pa.ButtonStringFormat = pa.ButtonStringFormat & ~(pa.ButtonStringFormat & eTextFormat.WordBreak);
+                        }
+                    }
+                    else
+                    {
+                        pa.ButtonStringFormat = pa.ButtonStringFormat & ~(pa.ButtonStringFormat & eTextFormat.SingleLine);
+                        pa.ButtonStringFormat |= eTextFormat.WordBreak;
+                    }
+					item.Paint(pa);
+				}
+			}
+		}
+
+		[System.ComponentModel.Browsable(false)]
+		public override eOrientation Orientation
+		{
+			get
+			{
+				return eOrientation.Horizontal;
+			}
+			set
+			{
+				return;
+			}
+		}
+
+		/// <summary>
+		/// Occurs when the mouse pointer is over the item and a mouse button is pressed. This is used by internal implementation only.
+		/// </summary>
+		[System.ComponentModel.Browsable(false),System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+		public override void InternalMouseDown(System.Windows.Forms.MouseEventArgs objArg)
+		{
+			base.InternalMouseDown(objArg);
+			if(this.DesignMode)
+			{
+				if(this.ItemAtLocation(objArg.X,objArg.Y)==null)
+				{
+					IOwner owner=this.GetOwner() as IOwner;
+					if(owner!=null)
+						owner.SetFocusItem(null);
+				}
+			}
+		}
+
+		/// <summary>
+		/// Occurs when the mouse pointer is over the item and a mouse button is released. This is used by internal implementation only.
+		/// </summary>
+		[System.ComponentModel.Browsable(false),System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+		public override void InternalMouseUp(System.Windows.Forms.MouseEventArgs objArg)
+		{
+			if(m_HotSubItem!=null)
+			{
+				m_HotSubItem.InternalMouseUp(objArg);
+			}
+			else
+				base.InternalMouseUp(objArg);
+		}
+
+		/// <summary>
+		/// Sets input focus to next visible item in Explorer Bar.
+		/// </summary>
+		/// <returns>True if focus was set to next visible item otherwise false.</returns>
+		public bool FocusNextItem()
+		{
+			bool bBaseCall=true;
+			
+			BaseItem focusItem=((IOwner)this.GetOwner()).GetFocusItem();
+			bool bFocusNext=false;
+			if(focusItem==null)
+				bFocusNext=true;
+			int iLoopCount=0;
+			while(iLoopCount<2)
+			{
+				foreach(BaseItem item in this.SubItems)
+				{
+					if(item==focusItem)
+						bFocusNext=true;
+					else if(item.Visible && bFocusNext) 
+					{
+						((IOwner)this.GetOwner()).SetFocusItem(item);
+						iLoopCount=2;
+						bBaseCall=false;
+						break;
+					}
+					if(item.Expanded && item.Visible)
+					{
+						foreach(BaseItem child in item.SubItems)
+						{
+							if(child==focusItem)
+								bFocusNext=true;
+							else if(item.Visible && bFocusNext) 
+							{
+								((IOwner)this.GetOwner()).SetFocusItem(child);
+								iLoopCount=2;
+								bBaseCall=false;
+								break;
+							}
+						}
+						if(iLoopCount==2)
+							break;
+					}
+				}
+				iLoopCount++;
+			}				
+
+			return bBaseCall;
+		}
+
+		/// <summary>
+		/// Sets input focus to previous visible item in Explorer Bar.
+		/// </summary>
+		/// <returns>True if focus was set to previous visible item otherwise false.</returns>
+		public bool FocusPreviousItem()
+		{
+			bool bBaseCall=true;
+			
+			BaseItem focusItem=((IOwner)this.GetOwner()).GetFocusItem();
+			bool bFocusNext=false;
+			if(focusItem==null)
+				bFocusNext=true;
+			int iLoopCount=0;
+			while(iLoopCount<2)
+			{
+				for(int groupIndex=this.SubItems.Count-1;groupIndex>=0;groupIndex--)
+				{
+					BaseItem item=this.SubItems[groupIndex];
+					
+					if(item.Expanded && item.Visible)
+					{
+						for(int index=item.SubItems.Count-1;index>=0;index--)
+						{
+							BaseItem child=item.SubItems[index];
+							if(child==focusItem)
+								bFocusNext=true;
+							else if(item.Visible && bFocusNext) 
+							{
+								((IOwner)this.GetOwner()).SetFocusItem(child);
+								iLoopCount=2;
+								bBaseCall=false;
+								break;
+							}
+						}
+						if(iLoopCount==2)
+							break;
+					}
+
+					if(item==focusItem)
+						bFocusNext=true;
+					else if(item.Visible && bFocusNext) 
+					{
+						((IOwner)this.GetOwner()).SetFocusItem(item);
+						iLoopCount=2;
+						bBaseCall=false;
+						break;
+					}
+				}
+				iLoopCount++;
+			}				
+
+			return bBaseCall;
+		}
+
+		protected internal override void OnItemAdded(BaseItem item)
+		{
+			base.OnItemAdded(item);
+			NeedRecalcSize=true;
+			if(item is ExplorerBarGroupItem)
+				((ExplorerBarGroupItem)item).VisualPropertyChanged();
+			if(this.DesignMode)
+			{
+				//ExplorerBar bar=this.ContainerControl as ExplorerBar; 
+				//this.Refresh();
+				ExplorerBar bar=this.ContainerControl as ExplorerBar; 
+				if(bar!=null)
+					bar.RecalcLayout();
+			}
+		}
+
+        protected internal override void OnAfterItemRemoved(BaseItem item, int itemIndex)
+		{
+			base.OnAfterItemRemoved(item, itemIndex);
+			NeedRecalcSize=true;
+			if(this.DesignMode)
+			{
+				ExplorerBar bar=this.ContainerControl as ExplorerBar; 
+				if(bar!=null)
+					bar.RecalcLayout();
+				//this.Refresh();
+			}
+		}
+
+		protected internal override void OnSubItemsClear()
+		{
+			base.OnSubItemsClear();
+			NeedRecalcSize=true;
+			if(this.DesignMode)
+			{
+				//this.Refresh();
+				ExplorerBar bar=this.ContainerControl as ExplorerBar; 
+				if(bar!=null)
+					bar.RecalcLayout();
+			}
+		}
+		internal bool _Animating=false;
+		protected internal override void OnSubItemExpandChange(BaseItem objChildItem)
+		{
+			base.OnSubItemExpandChange(objChildItem);
+			ExplorerBar exbar=this.ContainerControl as ExplorerBar;
+			try
+			{
+				if(exbar!=null && exbar.AnimationEnabled)
+				{
+					TimeSpan totalAnimationTime = new TimeSpan(0, 0, 0, 0, exbar.AnimationTime);
+					_Animating=true;
+					int iStep=1;
+					DateTime startTime=DateTime.Now;
+					if(objChildItem.Expanded)
+					{
+						int initalHeight=objChildItem.HeightInternal;
+						objChildItem.RecalcSize();
+						int targetHeight=objChildItem.HeightInternal;
+						for(int i=initalHeight;i<targetHeight;i+=iStep)
+						{
+							DateTime startPerMove = DateTime.Now;
+							objChildItem.HeightInternal=i;
+							foreach(BaseItem item in objChildItem.SubItems)
+							{
+								if(!objChildItem.DisplayRectangle.Contains(item.DisplayRectangle))
+									item.Displayed=false;
+								else
+									item.Displayed=true;
+							}
+							for(int pos=this.SubItems.IndexOf(objChildItem)+1;pos<this.SubItems.Count;pos++)
+								this.SubItems[pos].TopInternal+=iStep;
+							
+//							float perc=(float)i/targetHeight+1;
+//							iStep=(int)Math.Exp(perc);
+							exbar.Refresh();
+
+							TimeSpan elapsedPerMove = DateTime.Now - startPerMove;
+							TimeSpan elapsedTime = DateTime.Now - startTime;
+                            int totalMs = (int)(totalAnimationTime - elapsedTime).TotalMilliseconds;
+							if (totalMs <= 0)
+							{
+								iStep=targetHeight-i;
+							}
+                            else if (totalMs == 0)
+								iStep=1;
+							else
+							{
+								iStep=(targetHeight-i)*(int)elapsedPerMove.TotalMilliseconds / totalMs;
+								if(iStep<=0) iStep=1;
+
+							}
+							if(iStep<=0)
+								iStep=targetHeight-i;
+						}
+					}
+					else
+					{
+						int initalHeight=objChildItem.HeightInternal;
+						objChildItem.RecalcSize();
+						int targetHeight=objChildItem.HeightInternal;
+						for(int i=initalHeight;i>targetHeight;i-=iStep)
+						{
+							DateTime startPerMove = DateTime.Now;
+							objChildItem.HeightInternal=i;
+							foreach(BaseItem item in objChildItem.SubItems)
+							{
+								if(!objChildItem.DisplayRectangle.Contains(item.DisplayRectangle))
+									item.Displayed=false;
+								else
+									item.Displayed=true;
+							}
+							for(int pos=this.SubItems.IndexOf(objChildItem)+1;pos<this.SubItems.Count;pos++)
+								this.SubItems[pos].TopInternal-=iStep;
+//							float perc=(float)targetHeight/i+1;
+//							iStep=(int)Math.Exp(perc);
+							exbar.Refresh();
+
+							TimeSpan elapsedPerMove = DateTime.Now - startPerMove;
+							TimeSpan elapsedTime = DateTime.Now - startTime;
+							if ((totalAnimationTime - elapsedTime).TotalMilliseconds <= 0)
+							{
+								iStep=i-targetHeight;
+							}
+							else if((totalAnimationTime - elapsedTime).TotalMilliseconds==0)
+								iStep=1;
+							else
+							{
+								iStep=(i-targetHeight)*(int)elapsedPerMove.TotalMilliseconds / Math.Max(1,(int)((totalAnimationTime - elapsedTime).TotalMilliseconds));
+								if(iStep<=0) iStep=1;
+							}
+							if(iStep<=0)
+								iStep=i-targetHeight;
+						}
+					}
+				}
+			}
+			finally
+			{
+				_Animating=false;
+			}
+			if(exbar!=null)
+				exbar.RecalcLayout();
+		}
+		#endregion
+
+		#region IDesignTimeProvider Implementation
+		
+		InsertPosition IDesignTimeProvider.GetInsertPosition(Point pScreen, BaseItem dragItem)
+		{
+			foreach(BaseItem panel in this.SubItems)
+			{
+				if(!panel.Visible)
+					continue;
+				if(panel is IDesignTimeProvider)
+				{
+					InsertPosition pos=((IDesignTimeProvider)panel).GetInsertPosition(pScreen, dragItem);
+					if(pos!=null)
+					{
+						return pos;
+					}
+				}
+			}
+			return null;
+		}
+		void IDesignTimeProvider.DrawReversibleMarker(int iPos, bool Before){}
+		void IDesignTimeProvider.InsertItemAt(BaseItem objItem, int iPos, bool Before){}
+
+		#endregion
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/ExplorerBarDesigner.cs b/PROMS/DotNetBar Source Code/ExplorerBarDesigner.cs
new file mode 100644
index 00000000..eceef175
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/ExplorerBarDesigner.cs	
@@ -0,0 +1,215 @@
+using System;
+using System.ComponentModel;
+using System.ComponentModel.Design;
+using System.Windows.Forms;
+using System.ComponentModel.Design.Serialization;
+using System.CodeDom;
+using System.Drawing;
+using System.Collections;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Summary description for ExplorerBarDesigner.
+	/// </summary>
+	public class ExplorerBarDesigner:BarBaseControlDesigner
+	{
+		#region Internal Implementation
+		public ExplorerBarDesigner():base()
+		{
+			this.EnableItemDragDrop=true;
+		}
+
+		public override void Initialize(IComponent component) 
+		{
+			base.Initialize(component);
+			if(!component.Site.DesignMode)
+				return;
+			ExplorerBar bar=this.Control as ExplorerBar;
+			if(bar!=null)
+				bar.SetDesignMode();
+		}
+
+		public override DesignerVerbCollection Verbs 
+		{
+			get 
+			{
+				DesignerVerb[] verbs = new DesignerVerb[]
+					{
+						new DesignerVerb("Create Group", new EventHandler(OnAddGroup)),
+						new DesignerVerb("Create Button", new EventHandler(OnAddButton))
+					};
+				return new DesignerVerbCollection(verbs);
+			}
+		}
+
+#if FRAMEWORK20
+        public override void InitializeNewComponent(IDictionary defaultValues)
+        {
+            base.InitializeNewComponent(defaultValues);
+            SetDesignTimeDefaults();
+        }
+#else
+		public override void OnSetComponentDefaults()
+		{
+			base.OnSetComponentDefaults();
+			SetDesignTimeDefaults();
+		}
+#endif
+        private void SetDesignTimeDefaults()
+        {
+            if (this.Control is ExplorerBar)
+            {
+                ExplorerBar eb = this.Control as ExplorerBar;
+                eb.ApplyDefaultSettings();
+                eb.ThemeAware = true;
+            }
+        }
+
+		protected override BaseItem GetItemContainer()
+		{
+			ExplorerBar bar=this.Control as ExplorerBar;
+			if(bar!=null)
+				return bar.ItemsContainer;
+			return null;
+		}
+
+		protected override void RecalcLayout()
+		{
+			ExplorerBar bar=this.GetItemContainerControl() as ExplorerBar;
+			if(bar!=null)
+				bar.RecalcLayout();
+		}
+
+		protected override void OnSubItemsChanging()
+		{
+			base.OnSubItemsChanging();
+			IComponentChangeService change=this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+			if(change!=null)
+			{
+				ExplorerBar bar=this.GetItemContainerControl() as ExplorerBar;
+				change.OnComponentChanging(this.Component,TypeDescriptor.GetProperties(bar).Find("Groups",true));
+			}
+		}
+
+		protected override void OnSubItemsChanged()
+		{
+			base.OnSubItemsChanged();
+			IComponentChangeService change=this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+			if(change!=null)
+			{
+				ExplorerBar bar=this.GetItemContainerControl() as ExplorerBar;
+				change.OnComponentChanged(this.Component,TypeDescriptor.GetProperties(bar).Find("Groups",true),null,null);
+			}
+		}
+
+//		/// <summary>
+//		/// Triggered when some other component on the form is removed.
+//		/// </summary>
+//		protected override void ComponentRemoved(object sender, ComponentEventArgs e)
+//		{
+//			base.ComponentRemoved(sender,e);
+//			if(e.Component is ExplorerBarGroupItem)
+//			{
+//				ExplorerBar bar=this.GetItemContainerControl() as ExplorerBar;
+//				if(bar.Groups.Contains(e.Component as BaseItem))
+//					bar.Groups.Remove(e.Component as BaseItem);
+//				DestroySubItems(e.Component as BaseItem);
+//				bar.RecalcLayout();
+//			}
+//		}
+		#endregion
+
+		#region Design-Time Item Creation
+		private void OnAddGroup(object sender, EventArgs e)
+		{
+			CreateGroup();
+		}
+
+		private ExplorerBarGroupItem CreateGroup()
+		{
+			ExplorerBar bar=this.Component as ExplorerBar;
+			ExplorerBarGroupItem item=null;
+			IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+
+			if(bar!=null && dh!=null)
+			{
+				OnSubItemsChanging();
+				item=dh.CreateComponent(typeof(ExplorerBarGroupItem)) as ExplorerBarGroupItem;
+				if(item==null)
+					return null;
+				item.SetDefaultAppearance();
+				item.Text="New Group";
+				item.Expanded=true;
+				bar.Groups.Add(item);
+				OnSubItemsChanged();
+			}
+
+			return item;
+		}
+
+		private void OnAddButton(object sender, EventArgs e)
+		{
+			ExplorerBar bar=this.Component as ExplorerBar;
+			ExplorerBarGroupItem group=null;
+
+			IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+			ISelectionService selection = (ISelectionService) this.GetService(typeof(ISelectionService));
+			
+			if(selection!=null && selection.PrimarySelection is ExplorerBarGroupItem)
+			{
+				group=selection.PrimarySelection as ExplorerBarGroupItem;
+			}
+			else if(bar.Groups.Count>0)
+			{
+				System.Drawing.Point point=bar.PointToClient(Form.MousePosition);
+				if(bar.Bounds.Contains(point))
+				{
+					foreach(BaseItem item in bar.Groups)
+					{
+						if(item.DisplayRectangle.Contains(point))
+						{
+							group=item as ExplorerBarGroupItem;
+							break;
+						}
+					}
+				}
+				if(group==null)
+				{
+					foreach(BaseItem item in bar.Groups)
+					{
+						if(item.Visible)
+						{
+							group=item as ExplorerBarGroupItem;
+							break;
+						}
+					}
+				}
+			}
+
+			if(group==null)
+				group=CreateGroup();
+
+			IComponentChangeService change=this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+			if(change!=null)
+				change.OnComponentChanging(this.Component,TypeDescriptor.GetProperties(group).Find("SubItems",true));
+			ButtonItem button=dh.CreateComponent(typeof(ButtonItem)) as ButtonItem;
+			if(button==null)
+				return;
+			ExplorerBarGroupItem.SetDesignTimeDefaults(button,group.StockStyle); 
+			group.SubItems.Add(button);
+			if(change!=null)
+				change.OnComponentChanged(this.Component,TypeDescriptor.GetProperties(group).Find("SubItems",true),null,null);
+
+			this.RecalcLayout();
+		}
+
+		protected override bool CanDragItem(BaseItem item)
+		{
+			if(item is ExplorerBarGroupItem)
+				return false;
+			return base.CanDragItem(item);
+		}
+		#endregion
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/ExplorerBarGroupItem.cs b/PROMS/DotNetBar Source Code/ExplorerBarGroupItem.cs
new file mode 100644
index 00000000..5a39c6d3
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/ExplorerBarGroupItem.cs	
@@ -0,0 +1,2056 @@
+using System;
+using System.Drawing;
+using System.Drawing.Design;
+using System.ComponentModel;
+using System.ComponentModel.Design;
+using System.Collections;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Represents the Explorer-Bar Group item.
+	/// </summary>
+    [System.ComponentModel.ToolboxItem(false), Designer("DevComponents.DotNetBar.Design.ExplorerBarGroupItemDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+	public class ExplorerBarGroupItem:ImageItem,IDesignTimeProvider
+	{
+		#region Private Variables
+		private Rectangle m_ExpandButtonRect=Rectangle.Empty;
+		private bool m_ExpandButtonHot=false;
+		private int m_Margin=2;
+		private bool m_MouseOver=false;
+		private bool m_MouseDown=false;
+		private Rectangle m_PanelRect=Rectangle.Empty;
+
+		private ItemStyleMapper m_HeaderStyle=null;
+        private ItemStyleMapper m_HeaderHotStyle=null;
+		private ItemStyleMapper m_BackgroundStyle=null;
+
+        private ElementStyle m_TitleStyle = null;
+        private ElementStyle m_TitleHotStyle = null;
+        private ElementStyle m_BackStyle = null;
+		private eExplorerBarStockStyle m_StockStyle=eExplorerBarStockStyle.Custom;
+
+		private bool m_ExpandButtonVisible=true;
+
+		//private eBarImageSize m_ItemImageSize=eBarImageSize.Default;
+		private System.Drawing.Point m_MouseDownPt;
+
+		// Used to host items that have windows associated with them....
+		//private ExplorerBarPanelControlHost m_ControlHost=null;
+
+		private const int EXPAND_MARGIN=25;
+
+		private System.Drawing.Image m_Image=null;
+		private int m_ImageIndex=-1; // Image index if image from ImageList is used
+		private System.Drawing.Image m_ImageCachedIdx=null;
+		private int m_SubItemsMargin=4;
+		private bool m_XPSpecialGroup=false;
+
+		// Expand Button Colors
+		private Color m_ExpandBorderColor=Color.DarkGray;
+		private Color m_ExpandBackColor=Color.White;
+		private Color m_ExpandForeColor=SystemColors.ActiveCaption;
+		private Color m_ExpandHotBorderColor=Color.DarkGray;
+		private Color m_ExpandHotBackColor=Color.White;
+		private Color m_ExpandHotForeColor=SystemColors.ActiveCaption;
+
+		private bool m_HeaderExpands=true;
+		private bool m_WordWrapSubItems=true;
+
+		private const string INFO_EMPTYPANEL="Right-click header and choose one of Create commands or use SubItems collection to create new buttons. You can also drag & drop controls on this panel.";
+
+		private bool m_DropShadow=true;
+		private ShadowPaintInfo m_ShadowPaintInfo=null;
+		#endregion
+
+		/// <summary>
+		/// Creates new instance of ExplorerBarGroupItem.
+		/// </summary>
+		public ExplorerBarGroupItem():this("","") {}
+		/// <summary>
+		/// Creates new instance of ExplorerBarGroupItem and assigns the name to it.
+		/// </summary>
+		/// <param name="sItemName">Item name.</param>
+		public ExplorerBarGroupItem(string sItemName):this(sItemName,"") {}
+		/// <summary>
+		/// Creates new instance of ExplorerBarGroupItem and assigns the name and text to it.
+		/// </summary>
+		/// <param name="sItemName">Item name.</param>
+		/// <param name="ItemText">item text.</param>
+		public ExplorerBarGroupItem(string sItemName, string ItemText):base(sItemName,ItemText)
+		{
+			m_IsContainer=true;
+			m_AllowOnlyOneSubItemExpanded=false;
+
+            m_TitleStyle = new ElementStyle();
+            m_TitleStyle.StyleChanged += new EventHandler(this.VisualPropertyChanged);
+            m_TitleHotStyle = new ElementStyle();
+            m_TitleHotStyle.StyleChanged += new EventHandler(this.VisualPropertyChanged);
+            m_BackStyle = new ElementStyle();
+            m_BackStyle.StyleChanged += new EventHandler(this.VisualPropertyChanged);
+
+            m_HeaderStyle = new ItemStyleMapper(m_TitleStyle);
+            m_HeaderHotStyle = new ItemStyleMapper(m_TitleHotStyle);
+            m_BackgroundStyle = new ItemStyleMapper(m_BackStyle);
+
+            SubItemsImageSize = new Size(12, 12);
+            ImageSize = new Size(12, 12);
+
+            //try
+            //{
+            //    m_HeaderStyle.Font=new Font(System.Windows.Forms.SystemInformation.MenuFont,FontStyle.Bold);
+            //    m_HeaderHotStyle.Font=new Font(System.Windows.Forms.SystemInformation.MenuFont,FontStyle.Bold);
+            //}
+            //catch
+            //{
+            //    m_HeaderStyle.Font=System.Windows.Forms.SystemInformation.MenuFont.Clone() as Font;
+            //    m_HeaderHotStyle.Font=System.Windows.Forms.SystemInformation.MenuFont.Clone() as Font;
+            //}
+
+			BarFunctions.SetExplorerBarStyle(this,m_StockStyle);
+
+            //m_BackgroundStyle.VisualPropertyChanged+=new EventHandler(this.VisualPropertyChanged);
+            //m_HeaderStyle.VisualPropertyChanged+=new EventHandler(this.VisualPropertyChanged);
+            //m_HeaderHotStyle.VisualPropertyChanged+=new EventHandler(this.VisualPropertyChanged);
+		}
+
+        protected override void Dispose(bool disposing)
+        {
+            if (BarUtilities.DisposeItemImages && !this.DesignMode)
+            {
+                BarUtilities.DisposeImage(ref m_Image);
+                BarUtilities.DisposeImage(ref m_ImageCachedIdx);
+
+            }
+            base.Dispose(disposing);
+        }
+
+		/// <summary>
+		/// Returns copy of ExplorerBarGroupItem item.
+		/// </summary>
+		public override BaseItem Copy()
+		{
+			ExplorerBarGroupItem objCopy=new ExplorerBarGroupItem();
+			this.CopyToItem(objCopy);
+			return objCopy;
+		}
+		protected override void CopyToItem(BaseItem copy)
+		{
+			ExplorerBarGroupItem objCopy=copy as ExplorerBarGroupItem;
+			
+			base.CopyToItem(objCopy);
+
+			//objCopy.ItemImageSize=m_ItemImageSize;
+		}
+		private void VisualPropertyChanged(object sender, EventArgs e)
+		{
+			VisualPropertyChanged();
+		}
+		internal void VisualPropertyChanged()
+		{
+            //ExplorerBar eb=this.ContainerControl as ExplorerBar;
+            //if(eb!=null)
+            //{
+            //    ColorScheme cs=eb.ColorScheme;
+            //    m_BackgroundStyle.ApplyColorScheme(cs);
+            //    m_HeaderHotStyle.ApplyColorScheme(cs);
+            //    m_HeaderStyle.ApplyColorScheme(cs);
+            //}
+			OnAppearanceChanged();
+		}
+		public override void RecalcSize()
+		{
+			System.Windows.Forms.Control objCtrl=this.ContainerControl as System.Windows.Forms.Control;
+			if(!IsHandleValid(objCtrl))
+				return;
+			
+			Graphics g=Graphics.FromHwnd(objCtrl.Handle);
+			SizeF objStringSize=SizeF.Empty;
+			System.Drawing.Image image=this.GetImage();
+
+			string text=m_Text;
+			if(text=="")
+				text=" ";
+		    int margin = Dpi.Width(m_Margin);
+		    int textArea=m_Rect.Width-margin*2;
+		    int expandMargin = Dpi.Width(EXPAND_MARGIN);
+		    if(m_ExpandButtonVisible)
+				textArea-=expandMargin;
+			if(image!=null)
+				textArea-=(image.Width+margin*2);
+			if(textArea<=0)
+				textArea=1;
+            bool disposeFont = false;
+            Font font = this.GetFont(out disposeFont);
+            objStringSize = TextDrawing.MeasureString(g, text, font, textArea, m_TitleStyle.TextFormat);
+            if (disposeFont) font.Dispose();
+			g.Dispose();
+
+			m_Rect.Height=Dpi.Height23;
+			if(m_Rect.Height<(int)objStringSize.Height+margin*2)
+				m_Rect.Height=(int)objStringSize.Height+margin*2;
+			
+			if(image!=null)
+			{
+				int h=m_Rect.Height;
+				if(image.Height>m_Rect.Height)
+					m_Rect.Height=image.Height+margin*2;
+				m_PanelRect=new Rectangle(0,m_Rect.Height-h,m_Rect.Width,h);
+			}
+			else
+				m_PanelRect=new Rectangle(0,0,m_Rect.Width,m_Rect.Height);
+
+			if(m_ExpandButtonVisible)
+			{
+				m_ExpandButtonRect=new Rectangle(m_PanelRect.Right-expandMargin,m_PanelRect.Y,expandMargin,m_PanelRect.Height);
+			}
+			
+			if(this.Expanded)
+			{
+				if(m_SubItems!=null)
+				{
+					int iTop=m_Rect.Bottom+1;
+					int iLeft=m_Rect.Left+m_SubItemsMargin;
+//					if(m_ControlHost!=null)
+//					{
+//						iTop=0;
+//						iLeft=0;
+//					}
+					int iIndex=-1;
+					foreach(BaseItem item in m_SubItems)
+					{
+						iIndex++;
+						if(!item.Visible)
+						{
+							item.Displayed=false;
+							continue;
+						}
+						item.WidthInternal=m_Rect.Width-m_SubItemsMargin*2;
+                        item.RecalcSize();
+						item.WidthInternal=m_Rect.Width-m_SubItemsMargin*2;
+						if(item.BeginGroup)
+						{
+							iTop+=Dpi.Height3;
+						}
+						item.TopInternal=iTop;
+						item.LeftInternal=iLeft;
+						iTop+=item.HeightInternal;
+						item.Displayed=true;
+					}
+					m_Rect.Height=iTop-m_Rect.Top+Dpi.Height2;
+				}
+			}
+			else
+			{
+				foreach(BaseItem item in m_SubItems)
+				{
+					item.Displayed=false;
+				}
+			}
+
+			if(this.Expanded && this.DesignMode && this.SubItems.Count==0 && this.Parent!=null && this.Parent.SubItems.Count==1)
+			{
+				m_Rect.Height+=64;
+			}
+
+			base.RecalcSize();
+		}
+		private Image GetImage()
+		{
+			if(m_Image!=null)
+				return m_Image;
+			if(m_ImageIndex>=0)
+			{
+				return GetImageFromImageList(m_ImageIndex);
+			}
+			return null;
+		}
+
+		private Image GetImageFromImageList(int ImageIndex)
+		{
+			if(ImageIndex>=0)
+			{
+				IOwner owner=null;
+				Bar bar=null;
+				if(owner==null) owner=this.GetOwner() as IOwner;
+				if(bar==null) bar=this.ContainerControl as Bar; 
+
+				if(owner!=null)
+				{
+					try
+					{
+						if(owner.ImagesMedium!=null)
+						{
+							if(m_ImageCachedIdx==null)
+								m_ImageCachedIdx=owner.ImagesMedium.Images[ImageIndex];
+							return m_ImageCachedIdx;
+						}
+					}
+					catch(Exception)
+					{
+						return null;
+					}
+				}
+			}
+			return null;
+		}
+
+		private ShadowPaintInfo GetShadowPaintInfo()
+		{
+			if(m_ShadowPaintInfo==null)
+				m_ShadowPaintInfo=new ShadowPaintInfo();
+			m_ShadowPaintInfo.Size=3;
+			return m_ShadowPaintInfo;
+		}
+
+        private bool m_IsPainting = false;
+		public override void Paint(ItemPaintArgs pa)
+		{
+			if(this.DisplayRectangle.Width<=0 || this.DisplayRectangle.Height<=0 || m_IsPainting)
+				return;
+
+            m_IsPainting = true;
+            try
+            {
+                if (this.IsThemed)
+                {
+                    PaintThemed(pa);
+                    this.DrawInsertMarker(pa.Graphics);
+                    return;
+                }
+
+                if (this.SuspendLayout)
+                    return;
+                System.Drawing.Graphics g = pa.Graphics;
+                if (m_NeedRecalcSize)
+                    RecalcSize();
+
+                Rectangle r = m_PanelRect;
+                r.Offset(m_Rect.X, m_Rect.Y);
+                bool disposeFont = false;
+                Font font = this.GetFont(out disposeFont);
+                System.Windows.Forms.Control ctrl = this.ContainerControl as System.Windows.Forms.Control;
+
+                System.Drawing.Image image = this.GetImage();
+                Rectangle rText = r;
+                int margin = Dpi.Width(m_Margin);
+                rText.X += margin;
+                // This is left margin of the text
+                rText.X += margin * 2;
+                rText.Width -= (margin * 3);
+                if (image != null)
+                {
+                    rText.Width -= (image.Width + margin);
+                    rText.X += (image.Width + margin);
+                }
+                if (m_ExpandButtonVisible)
+                    rText.Width -= Dpi.Width(EXPAND_MARGIN);
+
+                ElementStyleDisplayInfo info = new ElementStyleDisplayInfo();
+                info.Bounds = r;
+                info.Graphics = g;
+                if (m_MouseOver)
+                    info.Style = m_TitleHotStyle;
+                else
+                    info.Style = m_TitleStyle;
+                ElementStyleDisplay.Paint(info);
+                if (info.Style.Font != null)
+                    font = info.Style.Font;
+                if (pa.RightToLeft)
+                {
+                    TextDrawing.DrawString(g, m_Text, font, info.Style.TextColor, GetRtlRectangle(m_PanelRect, rText), info.Style.TextFormat | eTextFormat.RightToLeft);
+                }
+                else
+                    TextDrawing.DrawString(g, m_Text, font, info.Style.TextColor, rText, info.Style.TextFormat);
+
+                //g.ResetClip();
+                //g.Clip=oldClip;
+
+                if (m_ExpandButtonVisible)
+                {
+                    Rectangle expandedRect = m_ExpandButtonRect;
+                    expandedRect.Offset(m_Rect.X, m_Rect.Y);
+                    if (pa.RightToLeft)
+                        PaintExpandButton(pa, GetRtlRectangle(m_Rect, expandedRect), m_MouseOver, m_MouseDown, m_Expanded);
+                    else
+                        PaintExpandButton(pa, expandedRect, m_MouseOver, m_MouseDown, m_Expanded);
+                }
+
+                int cornerSize = m_TitleStyle.CornerDiameter;
+                // Paint Background
+                Rectangle backRect = new Rectangle(m_Rect.X, m_PanelRect.Bottom + m_Rect.Y, m_Rect.Width, m_Rect.Height - m_PanelRect.Bottom);
+                if (backRect.Width > 0 && backRect.Height > 0)
+                {
+                    //g.Clip=new Region(backRect);
+                    info.Style = m_BackStyle;
+                    info.Bounds = backRect;
+                    ElementStyleDisplay.Paint(info);
+                    //m_BackgroundStyle.Paint(g,backRect,"",Rectangle.Empty,this.GetFont(),new Point[]{new Point(backRect.X,backRect.Y),new Point(backRect.X,backRect.Bottom-1),new Point(backRect.X,backRect.Bottom-1),new Point(backRect.Right-1,backRect.Bottom-1),new Point(backRect.Right-1,backRect.Bottom-1),new Point(backRect.Right-1,backRect.Y)});
+                    //g.ResetClip();
+                    //g.Clip=oldClip;
+                    if (m_DropShadow)
+                    {
+                        ShadowPaintInfo shadowInfo = GetShadowPaintInfo();
+                        shadowInfo.Rectangle = new Rectangle(m_Rect.X, m_Rect.Y + m_PanelRect.Top + cornerSize, m_Rect.Width, m_Rect.Height - m_PanelRect.Top - cornerSize);
+                        shadowInfo.Graphics = g;
+                        ShadowPainter.Paint(shadowInfo);
+                    }
+                }
+                else
+                {
+                    if (m_DropShadow)
+                    {
+                        r.Y += cornerSize;
+                        r.Height -= cornerSize;
+                        ShadowPaintInfo shadowInfo = GetShadowPaintInfo();
+                        shadowInfo.Rectangle = r;
+                        shadowInfo.Graphics = g;
+                        ShadowPainter.Paint(shadowInfo);
+                    }
+                }
+
+                // Draw Image
+                if (image != null)
+                {
+                    if (pa.RightToLeft)
+                        g.DrawImage(image, GetRtlRectangle(m_PanelRect, new Rectangle(r.Left + margin, r.Bottom - margin - image.Height, image.Width, image.Height)));
+                    else
+                        g.DrawImage(image, r.Left + margin, r.Bottom - margin - image.Height, image.Width, image.Height);
+                }
+
+                if (this.Focused)
+                {
+                    if (this.DesignMode)
+                    {
+                        Rectangle rFocus = r;
+                        rFocus.Inflate(-1, -1);
+                        if (pa.RightToLeft) rFocus = GetRtlRectangle(m_PanelRect, rFocus);
+                        DesignTime.DrawDesignTimeSelection(g, r, pa.Colors.ItemDesignTimeBorder);
+                    }
+                    else
+                    {
+                        Rectangle rFocus = rText;
+                        rFocus.Inflate(0, -1);
+                        rFocus.Width -= 2;
+                        rFocus.X -= 2;
+                        if (pa.RightToLeft) rFocus = GetRtlRectangle(m_PanelRect, rFocus);
+                        System.Windows.Forms.ControlPaint.DrawFocusRectangle(g, rFocus);
+                    }
+                }
+
+                if ((this.Expanded || this.Parent is ExplorerBarContainerItem && ((ExplorerBarContainerItem)this.Parent)._Animating) && m_SubItems != null) // && m_ControlHost==null)
+                {
+                    r = new Rectangle(m_Rect.X, m_Rect.Y + r.Height + 1, m_Rect.Width, m_Rect.Height - r.Height - 1);
+                    for (int i = 0; i < m_SubItems.Count; i++)
+                    {
+                        BaseItem item = m_SubItems[i];
+                        if (!item.Displayed || !item.Visible)
+                            continue;
+                        if (item.BeginGroup)
+                        {
+                            using (Pen line = new Pen(pa.Colors.ItemSeparator, 1))
+                                g.DrawLine(line, item.LeftInternal + 2, item.TopInternal - 2, item.DisplayRectangle.Right - 4, item.TopInternal - 2);
+                        }
+                        item.Paint(pa);
+                    }
+                }
+
+                if (disposeFont)
+                    font.Dispose();
+
+                this.DrawInsertMarker(pa.Graphics);
+
+                PaintInfoText(pa);
+            }
+            finally
+            {
+                m_IsPainting = false;
+            }
+		}
+
+        private Rectangle GetRtlRectangle(Rectangle bounds, Rectangle r)
+        {
+            return new Rectangle(bounds.Right - (r.Width + (r.X - bounds.X)), r.Y, r.Width, r.Height);
+        }
+
+		private void PaintThemed(ItemPaintArgs pa)
+		{
+			if(this.SuspendLayout)
+				return;
+			System.Drawing.Graphics g;
+			if(m_NeedRecalcSize)
+				RecalcSize();
+
+			Bitmap bmp=new Bitmap(this.DisplayRectangle.Width,this.DisplayRectangle.Height,pa.Graphics);
+			g=Graphics.FromImage(bmp);
+
+			ThemeExplorerBar theme=pa.ThemeExplorerBar;
+			Rectangle r=m_PanelRect;
+
+			ThemeExplorerBarParts part=ThemeExplorerBarParts.NormalGroupHead;
+			ThemeExplorerBarStates state=ThemeExplorerBarStates.NormalGroupHeadNormal;
+			if(m_XPSpecialGroup)
+				part=ThemeExplorerBarParts.SpecialGroupHead;
+			theme.DrawBackground(g,part,state,r);
+
+			// Paint Background
+			Rectangle backRect=new Rectangle(0,m_PanelRect.Bottom,m_Rect.Width+(m_XPSpecialGroup?0:0),m_Rect.Height-m_PanelRect.Bottom);
+			if(backRect.Width>0 && backRect.Height>0)
+			{
+				ThemeExplorerBarParts partBack;
+				ThemeExplorerBarStates stateBack;
+				if(m_XPSpecialGroup)
+				{
+					partBack=ThemeExplorerBarParts.SpecialGroupBackground;
+					stateBack=ThemeExplorerBarStates.SpecialGroupBackgroundNormal;
+				}
+				else
+				{
+					partBack=ThemeExplorerBarParts.NormalGroupBackground;
+					stateBack=ThemeExplorerBarStates.NormalGroupBackgroundNormal;
+				}
+				theme.DrawBackground(g,partBack,stateBack,backRect);
+			}
+
+			System.Drawing.Image image=this.GetImage();
+			Rectangle rText=r;
+		    int margin = Dpi.Width(m_Margin);
+		    rText.X+=margin;
+			// This is left margin of the text
+			rText.X+=margin*2;
+			rText.Width-=(margin*5);
+			if(image!=null)
+			{
+				rText.Width-=(image.Width+margin);
+				rText.X+=(image.Width+margin);
+			}
+			if(m_ExpandButtonVisible)
+				rText.Width-=Dpi.Width(EXPAND_MARGIN);
+
+            bool disposeFont = false;
+			Font font=this.GetFont(out disposeFont);
+            ElementStyle style = m_TitleStyle;
+            if (m_MouseOver)
+                style = m_TitleHotStyle;
+            if (style.Font != null)
+                font = style.Font;
+
+            if (pa.RightToLeft)
+            {
+                TextDrawing.DrawStringLegacy(g, m_Text, font, style.TextColor, GetRtlRectangle(m_PanelRect, rText), style.TextFormat | eTextFormat.RightToLeft);
+            }
+            else
+                TextDrawing.DrawStringLegacy(g, m_Text, font, style.TextColor, rText, style.TextFormat);
+
+			if(m_ExpandButtonVisible)
+			{
+				ThemeExplorerBarParts part2=part;
+				Rectangle expandedRect=m_ExpandButtonRect;
+				if(m_XPSpecialGroup)
+				{
+					if(this.Expanded)
+					{
+						part=ThemeExplorerBarParts.SpecialGroupCollapse;
+						if(m_ExpandButtonHot)
+							state=ThemeExplorerBarStates.SpecialGroupCollapseHot;
+						else
+							state=ThemeExplorerBarStates.SpecialGroupCollapseNormal;
+					}
+					else
+					{
+						part=ThemeExplorerBarParts.SpecialGroupExpand;
+						if(m_ExpandButtonHot)
+							state=ThemeExplorerBarStates.SpecialGroupExpandHot;
+						else
+							state=ThemeExplorerBarStates.SpecialGroupExpandNormal;
+					}
+				}
+				else
+				{
+					if(this.Expanded)
+					{
+						part=ThemeExplorerBarParts.NormalGroupCollapse;
+						if(m_ExpandButtonHot)
+							state=ThemeExplorerBarStates.NormalGroupCollapseHot;
+						else
+							state=ThemeExplorerBarStates.NormalGroupCollapseNormal;
+					}
+					else
+					{
+						part=ThemeExplorerBarParts.NormalGroupExpand;
+						if(m_ExpandButtonHot)
+							state=ThemeExplorerBarStates.NormalGroupExpandHot;
+						else
+							state=ThemeExplorerBarStates.NormalGroupExpandNormal;
+					}
+				}
+                if(pa.RightToLeft)
+                    theme.DrawBackground(g, part, state, GetRtlRectangle(m_Rect, expandedRect));
+                else
+				    theme.DrawBackground(g,part,state, expandedRect);
+			}
+			
+			// Draw Image
+			if(image!=null)
+			{
+                if(pa.RightToLeft)
+                    g.DrawImage(image, GetRtlRectangle(m_PanelRect, new Rectangle(r.Left + margin, r.Bottom - margin - image.Height, image.Width, image.Height)));
+                else
+				    g.DrawImage(image,r.Left+margin,r.Bottom-margin-image.Height,image.Width,image.Height);
+			}
+
+			if(this.Focused)
+			{
+				if(this.DesignMode)
+				{
+					Rectangle rFocus=r;
+					rFocus.Inflate(-1,-1);
+                    if (pa.RightToLeft) rFocus = GetRtlRectangle(m_PanelRect, rFocus);
+					DesignTime.DrawDesignTimeSelection(g,r,pa.Colors.ItemDesignTimeBorder);
+				}
+				else
+				{
+					Rectangle rFocus=rText;
+					rFocus.Inflate(0,-1);
+					rFocus.Width-=2;
+					rFocus.X-=2;
+                    if (pa.RightToLeft) rFocus = GetRtlRectangle(m_PanelRect, rFocus);
+					System.Windows.Forms.ControlPaint.DrawFocusRectangle(g,rFocus);
+				}
+			}
+
+			g.Dispose();
+			g=pa.Graphics;
+			g.DrawImage(bmp,this.DisplayRectangle.X,this.DisplayRectangle.Y,bmp.Width,bmp.Height);
+			bmp.Dispose();
+
+            if (disposeFont) font.Dispose();
+
+			if((this.Expanded || this.Parent is ExplorerBarContainerItem && ((ExplorerBarContainerItem)this.Parent)._Animating) && m_SubItems!=null) // && m_ControlHost==null)
+			{
+				r=new Rectangle(m_Rect.X,m_Rect.Y+r.Height+1,m_Rect.Width,m_Rect.Height-r.Height-1);
+				for(int i=0;i<m_SubItems.Count;i++)
+				{
+					BaseItem item=m_SubItems[i];
+					if(!item.Displayed || !item.Visible)
+						continue;
+					item.Paint(pa);
+				}
+			}
+			PaintInfoText(pa);
+		}
+
+		private void PaintInfoText(ItemPaintArgs pa)
+		{
+			if(m_SubItems!=null && m_SubItems.Count==0 && this.DesignMode)
+			{
+				Rectangle rInfoText=m_Rect;
+				if(!m_PanelRect.IsEmpty)
+				{
+					rInfoText.Y+=m_PanelRect.Height;
+					rInfoText.Height-=m_PanelRect.Height;
+				}
+				string info=INFO_EMPTYPANEL;
+				rInfoText.Inflate(-1,-1);
+                eTextFormat format = eTextFormat.Default | eTextFormat.HorizontalCenter | eTextFormat.VerticalCenter | eTextFormat.WordBreak;
+                Font font = new Font(SystemFonts.DefaultFont.FontFamily, 7);
+				TextDrawing.DrawString(pa.Graphics,info,font,SystemColors.ControlText,rInfoText,format);
+				font.Dispose();
+			}
+		}
+
+		/// <summary>
+		/// Specifies whether item is drawn using Themes when running on OS that supports themes like Windows XP.
+		/// </summary>
+		[Browsable(false),DevCoBrowsable(false),DefaultValue(false),DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden),Category("Appearance"),Description("Specifies whether item is drawn using Themes when running on OS that supports themes like Windows XP.")]
+		public override bool ThemeAware
+		{
+			get
+			{
+				return base.ThemeAware;
+			}
+			set
+			{
+				m_ThemeAware=value;
+				if(m_SubItems!=null)
+				{
+					foreach(BaseItem item in m_SubItems)
+					{
+						if(!(item is ButtonItem))
+							item.ThemeAware=value;
+					}
+				}
+			}
+		}
+
+		private void PaintThemeExpandButton()
+		{
+			if(!m_ExpandButtonVisible)
+				return;
+
+            System.Windows.Forms.Control container=this.ContainerControl as System.Windows.Forms.Control;
+			if(!IsHandleValid(container))
+				return;
+
+			Graphics g=BarFunctions.CreateGraphics(container);
+			try
+			{
+				ThemeExplorerBar theme=null;
+				bool bDisposeTheme=false;
+				if(container is IThemeCache)
+					theme=((IThemeCache)container).ThemeExplorerBar;
+				else
+				{
+					bDisposeTheme=true;
+					theme=new ThemeExplorerBar(container);
+				}
+				ThemeExplorerBarParts part=ThemeExplorerBarParts.NormalGroupCollapse;
+				ThemeExplorerBarStates state=ThemeExplorerBarStates.NormalGroupCollapseNormal;
+
+				Rectangle expandedRect=m_ExpandButtonRect;
+				expandedRect.Offset(m_Rect.X,m_Rect.Y);
+
+				if(m_XPSpecialGroup)
+				{
+					if(this.Expanded)
+					{
+						part=ThemeExplorerBarParts.SpecialGroupCollapse;
+						if(m_ExpandButtonHot)
+							state=ThemeExplorerBarStates.SpecialGroupCollapseHot;
+						else
+							state=ThemeExplorerBarStates.SpecialGroupCollapseNormal;
+					}
+					else
+					{
+						part=ThemeExplorerBarParts.SpecialGroupExpand;
+						if(m_ExpandButtonHot)
+							state=ThemeExplorerBarStates.SpecialGroupExpandHot;
+						else
+							state=ThemeExplorerBarStates.SpecialGroupExpandNormal;
+					}
+				}
+				else
+				{
+					if(this.Expanded)
+					{
+						part=ThemeExplorerBarParts.NormalGroupCollapse;
+						if(m_ExpandButtonHot)
+							state=ThemeExplorerBarStates.NormalGroupCollapseHot;
+						else
+							state=ThemeExplorerBarStates.NormalGroupCollapseNormal;
+					}
+					else
+					{
+						part=ThemeExplorerBarParts.NormalGroupExpand;
+						if(m_ExpandButtonHot)
+							state=ThemeExplorerBarStates.NormalGroupExpandHot;
+						else
+							state=ThemeExplorerBarStates.NormalGroupExpandNormal;
+					}
+				}
+				theme.DrawBackground(g,part,state,expandedRect);
+				
+				if(bDisposeTheme)
+					theme.Dispose();
+			}
+			finally
+			{
+                if (g != null)
+                {
+                    g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.Default;
+                    g.TextRenderingHint = System.Drawing.Text.TextRenderingHint.SystemDefault;
+                    g.Dispose();
+                }
+			}
+		}
+
+		private void PaintExpandButton()
+		{
+			if(!m_ExpandButtonVisible)
+				return;
+
+			Rectangle r=m_ExpandButtonRect;
+			r.Offset(m_Rect.X,m_Rect.Y);
+			System.Windows.Forms.Control control=this.ContainerControl as System.Windows.Forms.Control;
+			if(control==null)
+				return;
+			control.Invalidate(r);
+			control.Update();
+			return;
+		}
+		private void PaintExpandButton(ItemPaintArgs pa, Rectangle r, bool bHot, bool bPressed, bool bExpanded)
+		{
+            Graphics g = pa.Graphics;
+            ExplorerBar bar = pa.ContainerControl as ExplorerBar;
+            if (bar != null && (bar.GroupButtonExpandNormal != null && !bExpanded || bar.GroupButtonCollapseNormal != null && bExpanded))
+            {
+                Image image = bar.GroupButtonExpandNormal;
+                if (bExpanded)
+                    image = bar.GroupButtonCollapseNormal;
+                if (bPressed)
+                {
+                    if (!bExpanded && bar.GroupButtonExpandPressed!=null)
+                        image = bar.GroupButtonExpandPressed;
+                    else if(bExpanded && bar.GroupButtonCollapsePressed!=null)
+                        image = bar.GroupButtonCollapsePressed;
+                }
+                else if (bHot)
+                {
+                    if (!bExpanded && bar.GroupButtonExpandHot != null)
+                        image = bar.GroupButtonExpandHot;
+                    else if(bExpanded && bar.GroupButtonCollapseHot!=null)
+                        image = bar.GroupButtonCollapseHot;
+                }
+
+                Rectangle imageRect = r;
+                imageRect.Y += (imageRect.Height - image.Height) / 2;
+
+                g.DrawImageUnscaled(image, imageRect);
+                return;
+            }
+
+			int EXPAND_SIZE=Dpi.Width16;
+			using(Pen p=new Pen((bHot?m_ExpandHotBorderColor:m_ExpandBorderColor),1))
+			{
+				if(r.Width>EXPAND_SIZE)
+					r.Offset((r.Width-EXPAND_SIZE)/2,0);
+				if(r.Height>EXPAND_SIZE)
+					r.Offset(0,(r.Height-EXPAND_SIZE)/2);
+				r.Width=EXPAND_SIZE;
+				r.Height=EXPAND_SIZE;
+				Brush brush=new SolidBrush((bHot?m_ExpandHotBackColor:m_ExpandBackColor));
+				g.FillEllipse(brush,r);
+				brush.Dispose();
+				g.DrawEllipse(p,r);
+			}
+
+			using(Pen p=new Pen((bHot?m_ExpandHotForeColor:m_ExpandForeColor),Dpi.Width1))
+			{
+				if(bExpanded)
+				{
+					Point midPoint=new Point(r.X+EXPAND_SIZE/2,r.Y+Dpi.Height4);
+					g.DrawLine(p,midPoint.X,midPoint.Y,midPoint.X-Dpi.Width3,midPoint.Y+Dpi.Height3);
+                    g.DrawLine(p, midPoint.X, midPoint.Y, midPoint.X + Dpi.Width3, midPoint.Y + Dpi.Height3);
+                    g.DrawLine(p, midPoint.X, midPoint.Y + Dpi.Height1, midPoint.X - Dpi.Width3, midPoint.Y + Dpi.Height4);
+                    g.DrawLine(p, midPoint.X, midPoint.Y + Dpi.Height1, midPoint.X + Dpi.Width3, midPoint.Y + Dpi.Height4);
+
+                    midPoint.Y += Dpi.Height4;
+                    g.DrawLine(p, midPoint.X, midPoint.Y, midPoint.X - Dpi.Width3, midPoint.Y + Dpi.Height3);
+                    g.DrawLine(p, midPoint.X, midPoint.Y, midPoint.X + Dpi.Width3, midPoint.Y + Dpi.Height3);
+                    g.DrawLine(p, midPoint.X, midPoint.Y + Dpi.Height1, midPoint.X - Dpi.Width3, midPoint.Y + Dpi.Height4);
+                    g.DrawLine(p, midPoint.X, midPoint.Y + Dpi.Height1, midPoint.X + Dpi.Width3, midPoint.Y + Dpi.Height4);
+				}
+				else
+				{
+                    Point midPoint = new Point(r.X + EXPAND_SIZE / 2, r.Y + Dpi.Height8);
+                    g.DrawLine(p, midPoint.X, midPoint.Y, midPoint.X - Dpi.Width3, midPoint.Y - Dpi.Height3);
+                    g.DrawLine(p, midPoint.X, midPoint.Y, midPoint.X + Dpi.Width3, midPoint.Y - Dpi.Height3);
+                    g.DrawLine(p, midPoint.X, midPoint.Y - Dpi.Height1, midPoint.X - Dpi.Width3, midPoint.Y - Dpi.Height4);
+                    g.DrawLine(p, midPoint.X, midPoint.Y - Dpi.Height1, midPoint.X + Dpi.Width3, midPoint.Y - Dpi.Height4);
+
+                    midPoint.Y += Dpi.Height4;
+                    g.DrawLine(p, midPoint.X, midPoint.Y, midPoint.X - Dpi.Width3, midPoint.Y - Dpi.Height3);
+                    g.DrawLine(p, midPoint.X, midPoint.Y, midPoint.X + Dpi.Width3, midPoint.Y - Dpi.Height3);
+                    g.DrawLine(p, midPoint.X, midPoint.Y - Dpi.Height1, midPoint.X - Dpi.Width3, midPoint.Y - Dpi.Height4);
+                    g.DrawLine(p, midPoint.X, midPoint.Y - Dpi.Height1, midPoint.X + Dpi.Width3, midPoint.Y - Dpi.Height4);
+				}
+			}
+		}
+
+		public override void SubItemSizeChanged(BaseItem objChildItem)
+		{
+			NeedRecalcSize=true;
+		}
+
+		private void PaintArrow(Graphics g, Rectangle rect, Color c, bool up)
+		{
+			Point[] p=new Point[3];
+			if(up)
+			{
+				p[0].X=rect.Left+(rect.Width-9)/2;
+				p[0].Y=rect.Top+rect.Height/2+1;
+				p[1].X=p[0].X+8;
+				p[1].Y=p[0].Y;
+				p[2].X=p[0].X+4;
+				p[2].Y=p[0].Y-5;
+			}
+			else
+			{
+				p[0].X=rect.Left+(rect.Width-7)/2;
+				p[0].Y=rect.Top+(rect.Height-4)/2;
+				p[1].X=p[0].X+7;
+				p[1].Y=p[0].Y;
+				p[2].X=p[0].X+3;
+				p[2].Y=p[0].Y+4;
+			}
+			g.FillPolygon(new SolidBrush(c),p);
+		}
+
+		/// <summary>
+		/// Returns the Font object to be used for drawing the item text.
+		/// </summary>
+		/// <returns>Font object.</returns>
+		protected virtual Font GetFont(out bool disposeFont)
+		{
+            disposeFont=false;
+            if (this.TitleStyle.Font != null)
+                return this.TitleStyle.Font;
+            System.Drawing.Font font = null; // System.Windows.Forms.SystemInformation.MenuFont;
+			System.Windows.Forms.Control ctrl=this.ContainerControl as System.Windows.Forms.Control;
+            if (ctrl != null)
+                font = ctrl.Font;
+            else
+            {
+                font = SystemFonts.DefaultFont;
+                disposeFont = true;
+            }
+            if (!font.Bold)
+            {
+                font = new Font(font, FontStyle.Bold);
+                disposeFont = true;
+            }
+			return font;
+		}
+
+		/// <summary>
+		/// Occurs when the mouse pointer is moved over the item. This is used by internal implementation only.
+		/// </summary>
+		[System.ComponentModel.Browsable(false),System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+		public override void InternalMouseMove(System.Windows.Forms.MouseEventArgs objArg)
+		{
+			if(objArg.Button==System.Windows.Forms.MouseButtons.Left && (Math.Abs(objArg.X-m_MouseDownPt.X)>=4 || Math.Abs(objArg.Y-m_MouseDownPt.Y)>=4))
+			{
+				ExplorerBar explorerBar=this.ContainerControl as ExplorerBar;
+				if(explorerBar!=null && explorerBar.AllowUserCustomize && this.CanCustomize)
+				{
+					BaseItem active=m_HotSubItem;
+					if(active!=null && active.CanCustomize && !active.SystemItem)
+					{
+						IOwner owner=this.GetOwner() as IOwner;
+						if(owner!=null && owner.DragItem==null)
+						{
+							owner.StartItemDrag(active);
+							return;
+						}
+					}
+				}
+			}
+
+			Rectangle r=m_PanelRect;
+			r.Offset(m_Rect.Location);
+			if(r.Contains(objArg.X,objArg.Y))
+			{
+				if(!m_MouseOver)
+				{
+					m_MouseOver=true;
+					if(m_HeaderExpands)
+						this.Cursor=System.Windows.Forms.Cursors.Hand;
+					this.Refresh();
+				}
+			}
+			else if(m_MouseOver)
+			{
+				if(m_HeaderExpands)
+					this.Cursor=System.Windows.Forms.Cursors.Default;
+				m_MouseOver=false;
+				this.Refresh();
+			}
+
+			Rectangle rExpand=m_ExpandButtonRect;
+			rExpand.Offset(m_Rect.Location);
+			if(m_ExpandButtonVisible && rExpand.Contains(objArg.X,objArg.Y))
+			{
+				if(m_HotSubItem!=null)
+				{
+					m_HotSubItem.InternalMouseLeave();
+					m_HotSubItem=null;
+				}
+				m_ExpandButtonHot=true;
+				PaintExpandButton();
+				return;
+			}
+			else if(m_ExpandButtonHot)
+			{
+				m_ExpandButtonHot=false;
+				PaintExpandButton();
+			}
+			base.InternalMouseMove(objArg);
+		}
+
+		[System.ComponentModel.Browsable(false),System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+		public override void InternalMouseLeave()
+		{
+			this.Cursor=System.Windows.Forms.Cursors.Default;
+			base.InternalMouseLeave();
+			m_MouseOver=false;
+			m_MouseDown=false;
+			if(m_ExpandButtonHot)
+				m_ExpandButtonHot=false;
+			this.Refresh();
+		}
+
+		/// <summary>
+		/// Occurs when the mouse pointer is over the item and a mouse button is pressed. This is used by internal implementation only.
+		/// </summary>
+		[System.ComponentModel.Browsable(false),System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+		public override void InternalMouseDown(System.Windows.Forms.MouseEventArgs objArg)
+		{
+			Rectangle r=m_PanelRect;
+			r.Offset(m_Rect.Location);
+			m_MouseDownPt=new System.Drawing.Point(objArg.X,objArg.Y);
+
+			if(this.DesignMode)
+			{
+				if(this.ItemAtLocation(objArg.X,objArg.Y)==null && !r.Contains(objArg.X,objArg.Y) && this.Expanded)
+				{
+					IOwner owner=this.GetOwner() as IOwner;
+					if(owner!=null)
+						owner.SetFocusItem(null);
+				}
+				else if(!r.Contains(objArg.X,objArg.Y))
+					base.InternalMouseDown(objArg);
+				return;
+			}
+
+            Rectangle rExpand=m_ExpandButtonRect;
+			rExpand.Offset(m_Rect.X,m_Rect.Y);
+			if(m_ExpandButtonVisible && objArg.Button==System.Windows.Forms.MouseButtons.Left && rExpand.Contains(objArg.X,objArg.Y))
+			{
+				ExpandButtonClick();
+				return;
+			}
+
+			base.InternalMouseDown(objArg);
+
+			if(objArg.Button == System.Windows.Forms.MouseButtons.Left && r.Contains(objArg.X,objArg.Y))
+			{
+				m_MouseDown=true;
+				if(m_HeaderExpands)
+					this.Expanded=!this.Expanded;
+				else
+					this.Refresh();
+			}
+		}
+
+		internal void ExpandButtonClick()
+		{
+            this.Expanded=!this.Expanded;
+		}
+
+        protected internal override void OnExpandChange()
+        {
+            base.OnExpandChange();
+            foreach (BaseItem item in this.SubItems)
+            {
+                if (item.Visible) item.Displayed = this.Expanded;
+            }
+        }
+
+		[System.ComponentModel.Browsable(false),System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+		public override void InternalMouseUp(System.Windows.Forms.MouseEventArgs objArg)
+		{
+			if(objArg.Button==System.Windows.Forms.MouseButtons.Left)
+			{
+				m_MouseDown=false;
+				this.Refresh();
+			}
+
+			base.InternalMouseUp(objArg);
+		}
+
+		/// <summary>
+		/// Occurs when the item is clicked. This is used by internal implementation only.
+		/// </summary>
+		[System.ComponentModel.Browsable(false),System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+		public override void InternalClick(System.Windows.Forms.MouseButtons mb, System.Drawing.Point mpos)
+		{
+			base.InternalClick(mb,mpos);
+			if((this.GetOwner() as IOwner)!=null && ((IOwner)this.GetOwner()).DragInProgress)
+				return;
+		}
+
+		protected internal override void OnSubItemsClear()
+		{
+			base.OnSubItemsClear();
+			NeedRecalcSize=true;
+			if(this.DesignMode)
+				this.Refresh();
+		}
+
+		protected override void OnTopLocationChanged(int oldValue)
+		{
+			int iDiff=m_Rect.Top-oldValue;
+			if(m_SubItems!=null)
+			{
+				foreach(BaseItem item in m_SubItems)
+				{
+					if(item.Visible)
+					{
+						// Set item position
+						item.TopInternal+=iDiff;
+					}
+				}
+			}
+		}
+
+        protected internal override void OnContainerChanged(object objOldContainer)
+        {
+            base.OnContainerChanged(objOldContainer);
+            if (this.ContainerControl is ExplorerBar)
+            {
+                ExplorerBar bar = this.ContainerControl as ExplorerBar;
+                m_TitleStyle.SetColorScheme(bar.ColorScheme);
+                m_TitleHotStyle.SetColorScheme(bar.ColorScheme);
+                m_BackStyle.SetColorScheme(bar.ColorScheme);
+            }
+        }
+
+		/// <summary>
+		/// Called when Visibility of the items has changed.
+		/// </summary>
+		/// <param name="newValue">New Visible state.</param>
+		protected internal override void OnVisibleChanged(bool bVisible)
+		{
+			base.OnVisibleChanged(bVisible);
+			if(!bVisible)
+			{
+				foreach(BaseItem item in this.SubItems)
+					item.Displayed=false;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets whether expand button is visible.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),System.ComponentModel.DefaultValue(true),DevCoBrowsable(true),System.ComponentModel.Category("Behavior"),System.ComponentModel.Description("Gets or sets whether expand button is visible.")]
+		public bool ExpandButtonVisible
+		{
+			get
+			{
+				return m_ExpandButtonVisible;
+			}
+			set
+			{
+				m_ExpandButtonVisible=value;
+				NeedRecalcSize=true;
+				OnAppearanceChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets a value indicating whether the item is expanded or not. For Popup items this would indicate whether the item is popped up or not.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DevCoBrowsable(true),Category("Behavior"),System.ComponentModel.DefaultValue(false),Description("Gets or sets a value indicating whether group is expanded or not."),DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
+		public override bool Expanded
+		{
+			get
+			{
+				return base.Expanded;
+			}
+			set
+			{
+				base.Expanded=value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets whether drop shadow is displayed when non-themed display is used.
+		/// </summary>
+		[Browsable(true),Category("Appearance"),DefaultValue(true),Description("Indicates whether drop shadow is displayed when non-themed display is used.")]
+		public bool DropShadow
+		{
+			get {return m_DropShadow;}
+			set {m_DropShadow=value;}
+		}
+
+        /// <summary>
+        /// Gets the reference to ElementStyle object which describes visual appearance of the explorer group item title.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Category("Style"), Description("Gets or sets a normal item style."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ElementStyle TitleStyle
+        {
+            get { return m_TitleStyle; }
+        }
+
+        /// <summary>
+        /// Gets the reference to ElementStyle object which describes visual appearance of the explorer group item title while mouse is over the title bar.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Category("Style"), Description("Gets or sets a mouse over item style."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ElementStyle TitleHotStyle
+        {
+            get { return m_TitleHotStyle; }
+        }
+
+        /// <summary>
+        /// Gets or sets the item background style.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Category("Style"), Description("Gets or sets group background style."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ElementStyle BackStyle
+        {
+            get { return m_BackStyle; }
+        }
+
+		[Browsable(false),DevCoBrowsable(false),DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden),Obsolete("This property is obsolete. Use TitleStyle property instead"),EditorBrowsable(EditorBrowsableState.Never)]
+		public ItemStyleMapper HeaderStyle
+		{
+			get {return m_HeaderStyle;}
+		}
+
+        [Browsable(false), DevCoBrowsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), Obsolete("This property is obsolete. Use TitleHotStyle property instead"), EditorBrowsable(EditorBrowsableState.Never)]
+        public ItemStyleMapper HeaderHotStyle
+		{
+			get {return m_HeaderHotStyle;}
+		}
+
+        [Browsable(false), DevCoBrowsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), Obsolete("This property is obsolete. Use BackStyle property instead"), EditorBrowsable(EditorBrowsableState.Never)]
+        public ItemStyleMapper BackgroundStyle
+		{
+			get {return m_BackgroundStyle;}
+		}
+
+		/// <summary>
+		/// Gets or sets whether clicking the header of the control expands the item.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),DefaultValue(true),Category("Behavior"),Description("Determines whether clicking the header of the control expands the item.")]
+		public bool HeaderExpands
+		{
+			get {return m_HeaderExpands;}
+			set {m_HeaderExpands=value;}
+		}
+
+		/// <summary>
+		/// Applies the stock style to the object.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),Category("Style"),Description("Applies the stock style to the object."),DefaultValue(eExplorerBarStockStyle.Custom),DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
+		public eExplorerBarStockStyle StockStyle
+		{
+			get {return m_StockStyle;}
+			set
+			{
+				m_StockStyle=value;
+				if(m_StockStyle==eExplorerBarStockStyle.Custom)
+					return;
+				BarFunctions.SetExplorerBarStyle(this,m_StockStyle);
+				foreach(BaseItem item in this.SubItems)
+				{
+					if(item is ButtonItem)
+						BarFunctions.SetExplorerBarStyle(item as ButtonItem,m_StockStyle);
+				}
+                if (m_StockStyle == eExplorerBarStockStyle.BlueSpecial || m_StockStyle == eExplorerBarStockStyle.OliveGreenSpecial || m_StockStyle == eExplorerBarStockStyle.SilverSpecial)
+                    this.XPSpecialGroup = true;
+                else if (m_StockStyle != eExplorerBarStockStyle.SystemColors)
+                    this.XPSpecialGroup = false;
+				this.Refresh();
+			}
+		}
+
+		/// <summary>
+		/// Applies new visual style to this the item and all of its sub-items.
+		/// </summary>
+		[System.ComponentModel.Browsable(false),DevCoBrowsable(false),System.ComponentModel.DefaultValue(eDotNetBarStyle.OfficeXP),System.ComponentModel.Category("Appearance"),System.ComponentModel.Description("Determines the display of the item when shown.")]
+		public override eDotNetBarStyle Style
+		{
+			get{return base.Style;}
+			set{base.Style=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets expand button border color.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),Category("Style"),Description("Specifies expand button border color.") ]
+		public Color ExpandBorderColor
+		{
+			get {return m_ExpandBorderColor;}
+			set
+			{
+				m_ExpandBorderColor=value;
+				OnAppearanceChanged();
+			}
+		}
+		[Browsable(false),DevCoBrowsable(false),EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeExpandBorderColor()
+		{
+			return (m_ExpandBorderColor!=Color.DarkGray && m_StockStyle==eExplorerBarStockStyle.Custom);
+		}
+
+		/// <summary>
+		/// Gets or sets expand button back color.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),Category("Style"),Description("Specifies expand button back color.") ]
+		public Color ExpandBackColor
+		{
+			get {return m_ExpandBackColor;}
+			set
+			{
+				m_ExpandBackColor=value;
+				OnAppearanceChanged();
+			}
+		}
+		[Browsable(false),DevCoBrowsable(false),EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeExpandBackColor()
+		{
+			return (m_ExpandBackColor!=Color.White && m_StockStyle==eExplorerBarStockStyle.Custom);
+		}
+
+		/// <summary>
+		/// Gets or sets expand button fore color.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),Category("Style"),Description("Specifies expand button fore color.") ]
+		public Color ExpandForeColor
+		{
+			get {return m_ExpandForeColor;}
+			set
+			{
+				m_ExpandForeColor=value;
+				OnAppearanceChanged();
+			}
+		}
+		[Browsable(false),DevCoBrowsable(false),EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeExpandForeColor()
+		{
+			return (m_ExpandForeColor!=SystemColors.ActiveCaption && m_StockStyle==eExplorerBarStockStyle.Custom);
+		}
+
+		/// <summary>
+		/// Gets or sets hot expand button border color.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),Category("Style"),Description("Specifies hot expand button border color.") ]
+		public Color ExpandHotBorderColor
+		{
+			get {return m_ExpandHotBorderColor;}
+			set
+			{
+				m_ExpandHotBorderColor=value;
+				OnAppearanceChanged();
+			}
+		}
+		[Browsable(false),DevCoBrowsable(false),EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeExpandHotBorderColor()
+		{
+			return (m_ExpandHotBorderColor!=Color.DarkGray && m_StockStyle==eExplorerBarStockStyle.Custom);
+		}
+
+		/// <summary>
+		/// Gets or sets hot expand button back color.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),Category("Style"),Description("Specifies hot expand button back color.") ]
+		public Color ExpandHotBackColor
+		{
+			get {return m_ExpandHotBackColor;}
+			set
+			{
+				m_ExpandHotBackColor=value;
+				OnAppearanceChanged();
+			}
+		}
+		[Browsable(false),DevCoBrowsable(false),EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeExpandHotBackColor()
+		{
+			return (m_ExpandHotBackColor!=Color.White && m_StockStyle==eExplorerBarStockStyle.Custom);
+		}
+
+		/// <summary>
+		/// Gets or sets hot expand button fore color.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),Category("Style"),Description("Specifies hot expand button fore color.")]
+		public Color ExpandHotForeColor
+		{
+			get {return m_ExpandHotForeColor;}
+			set
+			{
+				m_ExpandHotForeColor=value;
+				OnAppearanceChanged();
+			}
+		}
+		[Browsable(false),DevCoBrowsable(false),EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeExpandHotForeColor()
+		{
+			return (m_ExpandHotForeColor!=SystemColors.ActiveCaption && m_StockStyle==eExplorerBarStockStyle.Custom);
+		}
+
+		/// <summary>
+		/// Overloaded. Serializes the item and all sub-items into the XmlElement.
+		/// </summary>
+		/// <param name="ThisItem">XmlElement to serialize the item to.</param>
+		protected internal override void Serialize(ItemSerializationContext context)
+		{
+			base.Serialize(context);
+
+            System.Xml.XmlElement groupItem = context.ItemXmlElement;
+
+			groupItem.SetAttribute("stockstyle",System.Xml.XmlConvert.ToString((int)m_StockStyle));
+			groupItem.SetAttribute("expvisible",System.Xml.XmlConvert.ToString(m_ExpandButtonVisible));
+			groupItem.SetAttribute("subitemsmargin",System.Xml.XmlConvert.ToString(m_SubItemsMargin));
+			groupItem.SetAttribute("xpspecial",System.Xml.XmlConvert.ToString(m_XPSpecialGroup));
+			
+			groupItem.SetAttribute("expborder",BarFunctions.ColorToString(m_ExpandBorderColor));
+			groupItem.SetAttribute("expbc",BarFunctions.ColorToString(m_ExpandBackColor));
+			groupItem.SetAttribute("expfc",BarFunctions.ColorToString(m_ExpandForeColor));
+			groupItem.SetAttribute("exphborder",BarFunctions.ColorToString(m_ExpandHotBorderColor));
+			groupItem.SetAttribute("exphbc",BarFunctions.ColorToString(m_ExpandHotBackColor));
+			groupItem.SetAttribute("exphfc",BarFunctions.ColorToString(m_ExpandHotForeColor));
+
+			groupItem.SetAttribute("headerexp",System.Xml.XmlConvert.ToString(m_HeaderExpands));
+
+			groupItem.SetAttribute("expanded",System.Xml.XmlConvert.ToString(m_Expanded));
+
+			if(m_StockStyle==eExplorerBarStockStyle.Custom)
+			{
+				System.Xml.XmlElement style=groupItem.OwnerDocument.CreateElement("backstyle");
+				groupItem.AppendChild(style);
+				//m_BackgroundStyle.Serialize(style);
+                SerializeElementStyle(m_BackStyle, style);
+			}
+
+			if(m_StockStyle==eExplorerBarStockStyle.Custom)
+			{
+				System.Xml.XmlElement style=groupItem.OwnerDocument.CreateElement("headerhotstyle");
+				groupItem.AppendChild(style);
+				//m_HeaderHotStyle.Serialize(style);
+                SerializeElementStyle(m_TitleHotStyle, style);
+			}
+
+			if(m_StockStyle==eExplorerBarStockStyle.Custom)
+			{
+				System.Xml.XmlElement style=groupItem.OwnerDocument.CreateElement("headerstyle");
+				groupItem.AppendChild(style);
+				//m_HeaderStyle.Serialize(style);
+                SerializeElementStyle(m_TitleStyle, style);
+			}
+
+			if(m_ImageIndex!=-1)
+			{
+				groupItem.SetAttribute("imageindex",System.Xml.XmlConvert.ToString(m_ImageIndex));
+			}
+			else if(m_Image!=null)
+			{
+                System.Xml.XmlElement image=groupItem.OwnerDocument.CreateElement("image");
+				groupItem.AppendChild(image);
+                BarFunctions.SerializeImage(m_Image,image);
+			}
+		}
+
+        private void SerializeElementStyle(ElementStyle style, System.Xml.XmlElement xmlElement)
+        {
+            ElementSerializer.Serialize(style, xmlElement);
+        }
+
+        private void DeserializeElementStyle(ElementStyle style, System.Xml.XmlElement xmlElement)
+        {
+            ElementSerializer.Deserialize(style, xmlElement);
+        }
+
+		/// <summary>
+		/// Overloaded. Deserializes the Item from the XmlElement.
+		/// </summary>
+		/// <param name="ItemXmlSource">Source XmlElement.</param>
+		public override void Deserialize(ItemSerializationContext context)
+		{
+			base.Deserialize(context);
+
+            System.Xml.XmlElement groupItem = context.ItemXmlElement;
+
+			m_StockStyle=(eExplorerBarStockStyle)System.Xml.XmlConvert.ToInt32(groupItem.GetAttribute("stockstyle"));
+			m_ExpandButtonVisible=System.Xml.XmlConvert.ToBoolean(groupItem.GetAttribute("expvisible"));
+			m_SubItemsMargin=System.Xml.XmlConvert.ToInt32(groupItem.GetAttribute("subitemsmargin"));
+			m_XPSpecialGroup=System.Xml.XmlConvert.ToBoolean(groupItem.GetAttribute("xpspecial"));
+
+		
+			m_ExpandBorderColor=BarFunctions.ColorFromString(groupItem.GetAttribute("expborder"));
+			m_ExpandBackColor=BarFunctions.ColorFromString(groupItem.GetAttribute("expbc"));
+			m_ExpandForeColor=BarFunctions.ColorFromString(groupItem.GetAttribute("expfc"));
+			m_ExpandHotBorderColor=BarFunctions.ColorFromString(groupItem.GetAttribute("exphborder"));
+			m_ExpandHotBackColor=BarFunctions.ColorFromString(groupItem.GetAttribute("exphbc"));
+			m_ExpandHotForeColor=BarFunctions.ColorFromString(groupItem.GetAttribute("exphfc"));
+			
+			m_HeaderExpands=System.Xml.XmlConvert.ToBoolean(groupItem.GetAttribute("headerexp"));
+
+			foreach(System.Xml.XmlElement xmlElem in groupItem.ChildNodes)
+			{
+				switch(xmlElem.Name)
+				{
+					case "backstyle":
+						DeserializeElementStyle(m_BackStyle,xmlElem);
+						break;
+					case "headerhotstyle":
+                        DeserializeElementStyle(m_TitleHotStyle, xmlElem);
+						break;
+					case "headerstyle":
+                        DeserializeElementStyle(m_TitleStyle, xmlElem);
+						break;
+					case "image":
+						m_Image=BarFunctions.DeserializeImage(xmlElem);
+						break;
+				}
+			}
+
+			if(groupItem.HasAttribute("imageindex"))
+			{
+				this.ImageIndex=System.Xml.XmlConvert.ToInt32(groupItem.GetAttribute("imageindex"));
+			}
+
+			this.RefreshImageSize();
+			
+			this.Expanded=System.Xml.XmlConvert.ToBoolean(groupItem.GetAttribute("expanded"));
+		}
+
+		protected internal override void OnItemAdded(BaseItem item)
+		{
+			NeedRecalcSize=true;
+			if(item is ButtonItem)
+				((ButtonItem)item)._FitContainer=m_WordWrapSubItems;
+			base.OnItemAdded(item);
+			if(!this.Expanded)
+			{
+				if(!item.Displayed)
+					item.Displayed=true;
+				item.Displayed=false;
+			}
+			if(item is ButtonItem)
+			{
+				ButtonItem btn=item as ButtonItem;
+				btn.ThemeAware=false;
+				if(btn.ForeColor.IsEmpty && btn.HotForeColor.IsEmpty)
+					BarFunctions.SetExplorerBarStyle(item as ButtonItem,m_StockStyle);
+				//btn.PopupSide=ePopupSide.Left;
+			}
+			item.NeedRecalcSize=true;
+
+			if(this.DesignMode)
+				this.Refresh();
+		}
+
+		protected internal override void OnBeforeItemRemoved(BaseItem item)
+		{
+			if(item is ButtonItem)
+				((ButtonItem)item)._FitContainer=false;
+			base.OnBeforeItemRemoved(item);
+		}
+
+		[System.ComponentModel.Browsable(false),DevCoBrowsable(false),System.ComponentModel.DefaultValue(eItemAlignment.Near),System.ComponentModel.Category("Appearance"),System.ComponentModel.Description("Determines alignment of the item inside the container.")]
+		public override eItemAlignment ItemAlignment
+		{
+			get{return base.ItemAlignment;}
+			set{base.ItemAlignment=value;}
+		}
+		[System.ComponentModel.Browsable(false),DevCoBrowsable(false),System.ComponentModel.DefaultValue(false),System.ComponentModel.Category("Appearance"),System.ComponentModel.Description("Indicates whether item will stretch to consume empty space. Items on stretchable, no-wrap Bars only.")]
+		public override bool Stretch
+		{
+			get {return base.Stretch;}
+			set {base.Stretch=value;}
+		}
+		[System.ComponentModel.Browsable(false),DevCoBrowsable(false),System.ComponentModel.Category("Behavior"),System.ComponentModel.DefaultValue(true),System.ComponentModel.Description("Indicates whether the item will auto-collapse (fold) when clicked.")]
+		public override bool AutoCollapseOnClick
+		{
+			get {return base.AutoCollapseOnClick;}
+			set {base.AutoCollapseOnClick=value;}
+		}
+		[System.ComponentModel.Browsable(false),DevCoBrowsable(false),System.ComponentModel.DefaultValue(true),System.ComponentModel.Category("Behavior"),System.ComponentModel.Description("Determines whether sub-items are displayed.")]
+		public override bool ShowSubItems
+		{
+			get {return base.ShowSubItems;}
+			set {base.ShowSubItems=value;}
+		}
+		[System.ComponentModel.Browsable(false),DevCoBrowsable(false),System.ComponentModel.DefaultValue(""),System.ComponentModel.Category("Design"),System.ComponentModel.Description("Indicates item category used to group similar items at design-time.")]
+		public override string Category
+		{
+			get {return base.Category;}
+			set {base.Category=value;}
+		}
+		[System.ComponentModel.Browsable(false),DevCoBrowsable(false),System.ComponentModel.DefaultValue(""),System.ComponentModel.Category("Design"),System.ComponentModel.Description("Indicates description of the item that is displayed during design.")]
+		public override string Description
+		{
+			get {return base.Description;}
+			set {base.Description=value;}
+		}
+		[System.ComponentModel.Browsable(false),DevCoBrowsable(false),System.ComponentModel.DefaultValue(false),System.ComponentModel.Category("Appearance"),System.ComponentModel.Description("Indicates whether this item is beginning of the group.")]
+		public override bool BeginGroup
+		{
+			get {return base.BeginGroup;}
+			set {base.BeginGroup=value;}
+		}
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the item is enabled.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), DefaultValue(true), Category("Behavior"), Description("Indicates whether is item enabled.")]
+        public override bool Enabled
+        {
+            get { return base.Enabled; }
+            set { base.Enabled = value; }
+        }
+
+		[System.ComponentModel.Browsable(true),DevCoBrowsable(false),System.ComponentModel.Editor("DevComponents.DotNetBar.Design.ExplorerBarGroupItemEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)),System.ComponentModel.Category("Data"),System.ComponentModel.Description("Collection of sub items."),System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Content)]
+		public override SubItemsCollection SubItems
+		{
+			get
+			{
+				return base.SubItems;
+			}
+		}
+
+		/// <summary>
+		/// Gets the rectangle of the panel item Button.
+		/// </summary>
+		[System.ComponentModel.Browsable(false),System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
+		public Rectangle PanelRect
+		{
+			get
+			{
+				return m_PanelRect;
+			}
+		}
+
+		/// <summary>
+		/// Shows tooltip for this item.
+		/// </summary>
+		public override void ShowToolTip()
+		{
+			if(this.DesignMode)
+				return;
+
+			if(this.Visible && this.Displayed)
+			{
+				IOwner owner=this.GetOwner() as IOwner;
+				if(owner!=null && !owner.ShowToolTips)
+					return;
+				System.Windows.Forms.Control ctrl=this.ContainerControl as System.Windows.Forms.Control;
+				if(ctrl==null)
+					return;
+				Rectangle r=m_PanelRect;
+				r.Offset(m_Rect.X,m_Rect.Y);
+				if(!r.Contains(ctrl.PointToClient(System.Windows.Forms.Control.MousePosition)))
+					return;
+
+				OnTooltip(true);
+				if(m_Tooltip!="")
+				{
+					if(m_ToolTipWnd==null)
+						m_ToolTipWnd=new ToolTip();
+					m_ToolTipWnd.Text=m_Tooltip;
+					if(owner!=null && owner.ShowShortcutKeysInToolTips && this.Shortcuts.Count>0)
+						m_ToolTipWnd.Text+=(" ("+this.ShortcutString+")");
+					IOwnerItemEvents ownerEvents=this.GetIOwnerItemEvents();
+					if(ownerEvents!=null)
+						ownerEvents.InvokeToolTipShowing(this,new EventArgs());
+					m_ToolTipWnd.ShowToolTip();
+				}
+			}
+		}
+
+		internal bool UseThemes
+		{
+			get {return this.IsThemed;}
+		}
+
+		/// <summary>
+		/// Forces the repaint the item.
+		/// </summary>
+		public override void Refresh()
+		{
+			if(this.SuspendLayout)
+				return;
+
+			if(!this.Expanded)
+				base.Refresh();
+			else
+			{
+				if((this.Visible || this.IsOnCustomizeMenu) && this.Displayed)
+				{
+					System.Windows.Forms.Control objCtrl=this.ContainerControl as System.Windows.Forms.Control;
+					if(objCtrl!=null && IsHandleValid(objCtrl) && !(objCtrl is ItemsListBox))
+					{
+						if(m_NeedRecalcSize)
+						{
+							RecalcSize();
+							if(m_Parent!=null)
+								m_Parent.SubItemSizeChanged(this);
+						}
+						Rectangle r=m_PanelRect;
+						r.Inflate(4,4);
+						objCtrl.Invalidate(m_Rect,false);
+					}
+				}
+			}
+		}
+
+		// Property Editor support for ImageIndex selection
+		[System.ComponentModel.Browsable(false),System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+		public System.Windows.Forms.ImageList ImageList
+		{
+			get
+			{
+				IOwner owner=this.GetOwner() as IOwner;
+				if(owner!=null)
+					return owner.ImagesMedium;
+				return null;
+			}
+		}
+
+		/// <summary>
+		/// Specifies the image.
+        /// </summary>
+        [System.ComponentModel.Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Appearance"),System.ComponentModel.Description("The image that will be displayed on the face of the item."),System.ComponentModel.DefaultValue(null)]
+		public System.Drawing.Image Image
+		{
+			get
+			{
+				return m_Image;
+			}
+			set
+			{
+				NeedRecalcSize=true;
+				m_Image=value;
+				this.OnImageChanged();
+				this.Refresh();
+			}
+		}
+
+		/// <summary>
+		/// Indicates whether XP themed special group colors are used for drawing.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Appearance"),System.ComponentModel.Description("Indicates whether XP themed special group colors are used for drawing."),System.ComponentModel.DefaultValue(false)]
+		public bool XPSpecialGroup
+		{
+			get {return m_XPSpecialGroup;}
+			set
+			{
+				m_XPSpecialGroup=value;
+				this.Refresh();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the margin in pixels between the edge of the container and the items contained inside of it. Default value is 4.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),Category("Appearance"),DefaultValue(4),Description("Indicates margin in pixels between the edge of the container and the items contained inside of it")]
+		public int SubItemsMargin
+		{
+			get {return m_SubItemsMargin;}
+			set {m_SubItemsMargin=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets whether text on sub items is wrapped on new line if it cannot fit the space available.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Behavior"),System.ComponentModel.Description("Indicates whether text on sub items is wrapped on new line if it cannot fit the space available."),System.ComponentModel.DefaultValue(true)]
+		public bool WordWrapSubItems
+		{
+			get {return m_WordWrapSubItems;}
+			set
+			{
+				m_WordWrapSubItems=value;
+				foreach(BaseItem item in this.SubItems)
+				{
+					if(item is ButtonItem)
+						((ButtonItem)item)._FitContainer=m_WordWrapSubItems;
+				}
+				NeedRecalcSize=true;
+				OnAppearanceChanged();
+			}
+		}
+
+		/// <summary>
+		/// Specifies the index of the image if ImageList is used.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Appearance"),System.ComponentModel.Description("The image list image index of the image that will be displayed on the face of the item."),System.ComponentModel.Editor("DevComponents.DotNetBar.Design.ImageIndexEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)),System.ComponentModel.TypeConverter(typeof(System.Windows.Forms.ImageIndexConverter)),System.ComponentModel.DefaultValue(-1)]
+		public int ImageIndex
+		{
+			get
+			{
+				return m_ImageIndex;
+			}
+			set
+			{
+				m_ImageCachedIdx=null;
+				if(m_ImageIndex!=value)
+				{
+					m_ImageIndex=value;
+                    if(ShouldSyncProperties)
+                        BarFunctions.SyncProperty(this, "ImageIndex");
+					if(m_Parent!=null)
+					{
+						OnImageChanged();
+						NeedRecalcSize=true;
+						this.Refresh();
+					}
+				}
+			}
+		}
+
+		//***********************************************
+		// IDesignTimeProvider Implementation
+		//***********************************************
+        protected virtual InsertPosition GetContainerInsertPosition(Point pScreen, BaseItem dragItem)
+        {
+            return DesignTimeProviderContainer.GetInsertPosition(this, pScreen, dragItem);
+        }
+        InsertPosition IDesignTimeProvider.GetInsertPosition(Point pScreen, BaseItem dragItem)
+        {
+            return GetContainerInsertPosition(pScreen, dragItem);
+        }
+        void IDesignTimeProvider.DrawReversibleMarker(int iPos, bool Before)
+        {
+            DesignTimeProviderContainer.DrawReversibleMarker(this, iPos, Before);
+        }
+        void IDesignTimeProvider.InsertItemAt(BaseItem objItem, int iPos, bool Before)
+        {
+            DesignTimeProviderContainer.InsertItemAt(this, objItem, iPos, Before);
+        }
+        //InsertPosition IDesignTimeProvider.GetInsertPosition(Point pScreen, BaseItem DragItem)
+        //{
+        //    InsertPosition objInsertPos=null;
+        //    System.Windows.Forms.Control objContainer=this.ContainerControl as System.Windows.Forms.Control;
+        //    if(objContainer==null || !this.CanCustomize)
+        //        return null;
+        //    Point pClient=objContainer.PointToClient(pScreen);
+        //    Rectangle thisRect=this.DisplayRectangle;
+        //    if(thisRect.Contains(pClient))
+        //    {
+        //        Rectangle r=thisRect;
+        //        r.Size=m_PanelRect.Size;
+        //        r.X+=m_PanelRect.Left;
+        //        r.Y+=m_PanelRect.Top;
+        //        if(r.Contains(pClient) && !this.Expanded)
+        //        {
+        //            this.Expanded=true;
+        //            objInsertPos=new InsertPosition();
+        //            objInsertPos.TargetProvider=this;
+        //            if(this.SubItems.Count==0)
+        //                objInsertPos.Position=-1;
+        //            else
+        //            {
+        //                objInsertPos.Position=0;
+        //                objInsertPos.Before=true;
+        //            }
+        //            return objInsertPos;
+        //        }
+				
+        //        BaseItem objItem;
+        //        // Check first inside any expanded items
+        //        objItem=this.ExpandedItem();
+        //        if(objItem!=null)
+        //        {
+        //            IDesignTimeProvider provider=objItem as IDesignTimeProvider;
+        //            if(provider!=null)
+        //            {
+        //                objInsertPos=provider.GetInsertPosition(pScreen, DragItem);
+        //                if(objInsertPos!=null)
+        //                    return objInsertPos;
+        //            }
+        //        }
+
+        //        for(int i=0;i<this.SubItems.Count;i++)
+        //        {
+        //            objItem=this.SubItems[i];
+        //            r=objItem.DisplayRectangle;
+        //            r.Inflate(2,2);
+        //            if(objItem.Visible && objItem.Displayed && r.Contains(pClient))
+        //            {
+        //                if(objItem.SystemItem && this.SubItems.Count!=1)
+        //                {
+        //                    return null;
+        //                }
+        //                if(objItem==DragItem)
+        //                    return new InsertPosition();
+        //                objInsertPos=new InsertPosition();
+        //                objInsertPos.TargetProvider=this;
+        //                objInsertPos.Position=i;
+        //                if(pClient.Y<=objItem.TopInternal+objItem.HeightInternal/2 || objItem.SystemItem)
+        //                    objInsertPos.Before=true;
+
+        //                // We need to collapse any expanded items that are not on this bar
+        //                IOwner owner=this.GetOwner() as IOwner;
+        //                if(owner!=null)
+        //                {
+        //                    BaseItem objExp=owner.GetExpandedItem();
+        //                    if(objExp!=null)
+        //                    {
+        //                        while(objExp.Parent!=null)
+        //                            objExp=objExp.Parent;
+        //                        BaseItem objParent=objItem;
+        //                        while(objParent.Parent!=null)
+        //                            objParent=objParent.Parent;
+        //                        if(objExp!=objParent)
+        //                            owner.SetExpandedItem(null);
+        //                    }
+        //                }
+
+        //                if(objItem is PopupItem && (objItem.SubItems.Count>0 || objItem.IsOnMenuBar))
+        //                {
+        //                    if(!objItem.Expanded)
+        //                        objItem.Expanded=true;
+        //                }
+        //                else
+        //                {
+        //                    CollapseSubItems(this);
+        //                }
+        //                break;
+        //            }
+        //        }
+        //        if(objInsertPos==null)
+        //        {
+        //            // Container is empty but it can contain the items
+        //            if(this.SubItems.Count>1 && this.SubItems[this.SubItems.Count-1].SystemItem)
+        //                objInsertPos=new InsertPosition(this.SubItems.Count-2,true,this);
+        //            else
+        //                objInsertPos=new InsertPosition(this.SubItems.Count-1,false,this);
+        //        }
+        //    }
+        //    else
+        //    {
+        //        foreach(BaseItem objItem in this.SubItems)
+        //        {
+        //            if(objItem==DragItem)
+        //                continue;
+        //            IDesignTimeProvider provider=objItem as IDesignTimeProvider;
+        //            if(provider!=null)
+        //            {
+        //                objInsertPos=provider.GetInsertPosition(pScreen, DragItem);
+        //                if(objInsertPos!=null)
+        //                    break;
+        //            }
+        //        }				
+        //    }
+        //    return objInsertPos;
+        //}
+        //void IDesignTimeProvider.DrawReversibleMarker(int iPos, bool Before)
+        //{
+        //    System.Windows.Forms.Control objCtrl=this.ContainerControl as System.Windows.Forms.Control;
+        //    if(objCtrl==null)
+        //        return;
+
+        //    BaseItem objItem=null;
+        //    if(iPos>=0)
+        //        objItem=this.SubItems[iPos];
+        //    Rectangle r, rl,rr;
+        //    if(objItem!=null)
+        //    {
+        //        if(objItem.DesignInsertMarker!=eDesignInsertPosition.None)
+        //            objItem.DesignInsertMarker=eDesignInsertPosition.None;
+        //        else if(Before)
+        //            objItem.DesignInsertMarker=eDesignInsertPosition.Before;
+        //        else
+        //            objItem.DesignInsertMarker=eDesignInsertPosition.After;
+        //        return;
+        //    }
+        //    else
+        //    {
+        //        Rectangle rTmp=this.DisplayRectangle;
+        //        rTmp.Inflate(-1,-1);
+        //        rTmp.Offset(m_PanelRect.X,m_PanelRect.Bottom);
+        //        r=new Rectangle(rTmp.Left+2,rTmp.Top+2,rTmp.Width-4,1);
+        //        rl=new Rectangle(rTmp.Left+1,rTmp.Top,1,5);
+        //        rr=new Rectangle(rTmp.Right-2,rTmp.Top,1,5);
+        //    }
+        //    //r.Location=objCtrl.PointToScreen(r.Location);
+        //    //rl.Location=objCtrl.PointToScreen(rl.Location);
+        //    //rr.Location=objCtrl.PointToScreen(rr.Location);
+        //    //System.Windows.Forms.ControlPaint.DrawReversibleFrame(r,SystemColors.Control,System.Windows.Forms.FrameStyle.Thick);
+        //    //System.Windows.Forms.ControlPaint.DrawReversibleFrame(rl,SystemColors.Control,System.Windows.Forms.FrameStyle.Thick);
+        //    //System.Windows.Forms.ControlPaint.DrawReversibleFrame(rr,SystemColors.Control,System.Windows.Forms.FrameStyle.Thick);
+        //}
+
+        //void IDesignTimeProvider.InsertItemAt(BaseItem objItem, int iPos, bool Before)
+        //{
+        //    if(this.ExpandedItem()!=null)
+        //    {
+        //        this.ExpandedItem().Expanded=false;
+        //    }
+        //    if(!Before)
+        //    {
+        //        //objItem.BeginGroup=!objItem.BeginGroup;
+        //        if(iPos+1>=this.SubItems.Count)
+        //        {
+        //            this.SubItems.Add(objItem,GetAppendPosition(this));
+        //        }
+        //        else
+        //        {
+        //            this.SubItems.Add(objItem,iPos+1);
+        //        }
+        //    }
+        //    else
+        //    {
+        //        if(iPos>=this.SubItems.Count)
+        //        {
+        //            this.SubItems.Add(objItem, GetAppendPosition(this));
+        //        }
+        //        else
+        //        {
+        //            this.SubItems.Add(objItem,iPos);
+        //        }
+        //    }
+        //    if(this.ContainerControl is Bar)
+        //        ((Bar)this.ContainerControl).RecalcLayout();
+        //    else if(this.ContainerControl is MenuPanel)
+        //        ((MenuPanel)this.ContainerControl).RecalcSize();
+        //    else
+        //    {
+        //        this.RecalcSize();
+        //        this.Refresh();
+        //    }
+        //}
+
+		private int GetAppendPosition(BaseItem objParent)
+		{
+			int iPos=-1;
+			for(int i=objParent.SubItems.Count-1;i>=0;i--)
+			{
+				if(objParent.SubItems[i].SystemItem)
+					iPos=i;
+				else
+					break;
+			}
+			return iPos;
+		}
+        [EditorBrowsable(EditorBrowsableState.Never)]
+		public static void SetDesignTimeDefaults(ButtonItem button, eExplorerBarStockStyle e)
+		{
+			BarFunctions.SetExplorerBarStyle(button,e);
+			button.Text="New Button";
+			button.ButtonStyle = eButtonStyle.ImageAndText;
+			button.ImagePosition=eImagePosition.Left;
+			button.HotTrackingStyle=eHotTrackingStyle.None;
+			button.HotFontUnderline=true;
+			button.Cursor=System.Windows.Forms.Cursors.Hand;
+		}
+
+		/// <summary>
+		/// Applies default appearance to ExplorerBarGroupItem.
+		/// </summary>
+		public void SetDefaultAppearance()
+		{
+			this.StockStyle = eExplorerBarStockStyle.SystemColors;
+			this.BackStyle.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground;
+			this.BackStyle.BorderLeft =eStyleBorderType.Solid;
+			this.BackStyle.BorderRight =eStyleBorderType.Solid;
+			this.BackStyle.BorderTop =eStyleBorderType.Solid;
+			this.BackStyle.BorderBottom =eStyleBorderType.Solid;
+			this.BackStyle.BorderLeftColor =SystemColors.Window;
+			this.BackStyle.BorderRightColor =SystemColors.Window;
+			this.BackStyle.BorderTopColor =SystemColors.Window;
+			this.BackStyle.BorderBottomColor =SystemColors.Window;
+			this.BackStyle.BorderLeftWidth = 1;
+			this.BackStyle.BorderRightWidth = 1;
+			this.BackStyle.BorderTopWidth = 1;
+			this.BackStyle.BorderBottomWidth = 1;
+			
+			this.ExpandBackColor=SystemColors.Window;
+			this.ExpandBorderColor = SystemColors.InactiveCaption;
+			this.ExpandForeColor = SystemColors.Highlight;
+			this.ExpandHotBackColor=SystemColors.Window;
+			this.ExpandHotForeColor = SystemColors.ActiveCaption;
+			this.ExpandHotBorderColor=SystemColors.ActiveCaption;
+
+			this.TitleHotStyle.BackColor = SystemColors.Window;
+			this.TitleHotStyle.BackColor2 = SystemColors.InactiveCaption;
+			this.TitleHotStyle.TextColor = SystemColors.ActiveCaption;
+			this.TitleStyle.BackColor = SystemColors.Window;
+			this.TitleStyle.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground2;
+			this.TitleStyle.TextColor = SystemColors.ControlText;
+
+			this.ThemeAware=true;
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/ExplorerBarPanelControlHost.cs b/PROMS/DotNetBar Source Code/ExplorerBarPanelControlHost.cs
new file mode 100644
index 00000000..6049247d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/ExplorerBarPanelControlHost.cs	
@@ -0,0 +1,512 @@
+using System;
+using System.Windows.Forms;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Summary description for ExplorerBarPanelControl.
+	/// </summary>
+	[System.ComponentModel.ToolboxItem(false),System.ComponentModel.DesignTimeVisible(false),System.Runtime.InteropServices.ComVisible(false)]
+	public class ExplorerBarPanelControlHost:Control,IThemeCache
+	{
+		private ExplorerBarGroupItem m_ParentPanel=null;
+		private BaseItem m_HotSubItem=null;
+		private Point m_MouseDownPt=Point.Empty;
+
+		// Theme Caching Support
+		private ThemeWindow m_ThemeWindow=null;
+		private ThemeRebar m_ThemeRebar=null;
+		private ThemeToolbar m_ThemeToolbar=null;
+		private ThemeHeader m_ThemeHeader=null;
+		private ThemeScrollBar m_ThemeScrollBar=null;
+		private ThemeExplorerBar m_ThemeExplorerBar=null;
+		private ScrollButton m_TopScrollButton=null;
+		private ScrollButton m_BottomScrollButton=null;
+
+		public ExplorerBarPanelControlHost(ExplorerBarGroupItem parentPanel)
+		{
+			this.SetStyle(ControlStyles.UserPaint,true);
+			this.SetStyle(ControlStyles.AllPaintingInWmPaint,true);
+			this.SetStyle(ControlStyles.Opaque,true);
+			this.SetStyle(ControlStyles.ResizeRedraw,true);
+			this.SetStyle(ControlStyles.DoubleBuffer,true);
+			this.TabStop=false;
+			
+			m_TopScrollButton=new ScrollButton();
+			m_TopScrollButton.UseTimer=false;
+			m_TopScrollButton.StandardButton=true;
+			m_TopScrollButton.Visible=false;
+			m_TopScrollButton.Orientation=eOrientation.Vertical;
+			m_TopScrollButton.ButtonAlignment=eItemAlignment.Near;
+			m_TopScrollButton.Size=new Size(16,16);
+			this.Controls.Add(m_TopScrollButton);
+			m_BottomScrollButton=new ScrollButton();
+			m_BottomScrollButton.UseTimer=false;
+			m_BottomScrollButton.StandardButton=true;
+			m_BottomScrollButton.Visible=false;
+			m_BottomScrollButton.Orientation=eOrientation.Vertical;
+			m_BottomScrollButton.ButtonAlignment=eItemAlignment.Far;
+			m_BottomScrollButton.Size=new Size(16,16);
+			this.Controls.Add(m_BottomScrollButton);
+
+			m_BottomScrollButton.MouseDown+=new MouseEventHandler(ScrollButtonClick);
+			m_TopScrollButton.MouseDown+=new MouseEventHandler(ScrollButtonClick);
+
+			m_ParentPanel=parentPanel;
+			foreach(BaseItem item in  m_ParentPanel.SubItems)
+				item.ContainerControl=this;
+		}
+
+		public void SetupScrollButtons()
+		{
+			// Setup scroll buttons
+			if(m_ParentPanel.ExpandButtonVisible)
+			{
+				m_TopScrollButton.Location=new Point(this.Width-18,4);
+				m_TopScrollButton.UseThemes=m_ParentPanel.UseThemes;
+				m_TopScrollButton.BringToFront();
+				if(!m_TopScrollButton.Visible)
+				{
+					m_TopScrollButton.Visible=true;
+				}
+			}
+			else
+				m_TopScrollButton.Visible=false;
+		}
+
+		private void ScrollButtonClick(object sender, MouseEventArgs e)
+		{
+			if(e.Button!=MouseButtons.Left)
+				return;
+			if(sender==m_TopScrollButton)
+			{
+				// Scroll up
+				m_ParentPanel.ExpandButtonClick();
+			}
+			else
+			{
+				m_ParentPanel.ExpandButtonClick();
+			}
+		}
+
+		protected override void OnPaint(PaintEventArgs e)
+		{
+			if(m_ParentPanel==null || this.IsDisposed)
+				return;
+
+			//SetupScrollButtons();
+
+			ItemPaintArgs pa=new ItemPaintArgs(m_ParentPanel.GetOwner() as IOwner,this,e.Graphics,new ColorScheme(e.Graphics));
+
+			if(m_ParentPanel.UseThemes)
+			{
+				((IThemeCache)this).ThemeRebar.DrawBackground(e.Graphics,ThemeRebarParts.Background,ThemeRebarStates.Normal,this.DisplayRectangle);
+			}
+			else
+			{
+				//e.Graphics.Clear(m_ParentPanel.BackColor);
+			}
+			for(int i=0;i<m_ParentPanel.SubItems.Count;i++)
+			{
+				BaseItem item=m_ParentPanel.SubItems[i];
+				if(!item.Displayed || !item.Visible)
+					continue;
+				item.Paint(pa);
+			}
+		}
+
+		private void InternalClick(System.Windows.Forms.MouseButtons mb, System.Drawing.Point mpos)
+		{
+			if(m_HotSubItem!=null)
+			{
+				m_HotSubItem.InternalClick(mb,mpos);
+				return;
+			}
+		}
+
+		private void InternalDoubleClick(System.Windows.Forms.MouseButtons mb, System.Drawing.Point mpos)
+		{
+			if(m_HotSubItem!=null)
+			{
+				m_HotSubItem.InternalDoubleClick(mb,mpos);
+			}
+		}
+
+		private void InternalKeyDown(System.Windows.Forms.KeyEventArgs objArg)
+		{
+			if(m_ParentPanel.DesignMode)
+			{
+				objArg.Handled=true;
+				return;
+			}
+			if(m_HotSubItem!=null)
+			{
+				m_HotSubItem.InternalKeyDown(objArg);
+			}
+		}
+
+		private void InternalMouseDown(System.Windows.Forms.MouseEventArgs objArg)
+		{
+			IOwner owner=null;
+
+			// Colapse any item if expanded
+			m_MouseDownPt=new System.Drawing.Point(objArg.X,objArg.Y);
+			BaseItem objItem=m_ParentPanel.ExpandedItem();
+			if(objItem!=null && objItem!=m_HotSubItem && !m_ParentPanel.DesignMode)
+			{
+				objItem.Expanded=false;
+				m_ParentPanel.AutoExpand=false;
+			}
+
+			if(m_ParentPanel.DesignMode && m_ParentPanel.CanCustomize)
+			{
+				if(m_ParentPanel.IsContainer && m_ParentPanel.SubItems.Count>0)
+				{
+					BaseItem objNew=ItemAtLocation(objArg.X,objArg.Y);
+					if(objNew!=null && objNew.CanCustomize)
+					{
+						owner=m_ParentPanel.GetOwner() as IOwner;
+						if(owner!=null)
+							owner.SetFocusItem(objNew);
+					}
+					if(objNew!=null)
+						objNew.InternalMouseDown(objArg);
+				}
+				
+				if(objArg.Button==System.Windows.Forms.MouseButtons.Right && !m_ParentPanel.IsContainer)
+				{
+					owner=m_ParentPanel.GetOwner() as IOwner;
+					if(owner!=null)
+						owner.DesignTimeContextMenu(m_ParentPanel);
+				}
+			}
+
+			if(!m_ParentPanel.DesignMode)
+			{
+				owner=m_ParentPanel.GetOwner() as IOwner;
+				if(owner!=null && owner.GetFocusItem()!=null)
+				{
+					BaseItem objNew=ItemAtLocation(objArg.X,objArg.Y);
+					if(objNew!=owner.GetFocusItem())
+						owner.GetFocusItem().ReleaseFocus();
+				}
+			}
+
+			if(m_HotSubItem!=null)
+			{
+				m_HotSubItem.InternalMouseDown(objArg);
+			}
+		}
+
+		private void InternalMouseHover()
+		{
+			if(m_ParentPanel.DesignMode)
+				return;
+
+			if(m_HotSubItem!=null)
+			{
+				if(!m_ParentPanel.AutoExpand)
+				{
+					BaseItem objItem=m_ParentPanel.ExpandedItem();
+					if(objItem!=null && m_HotSubItem!=objItem && (m_ParentPanel.IsOnMenu || m_ParentPanel.ContainerControl is Bar))
+						objItem.Expanded=false;
+				}
+				// Changing the Expanded of the item can cause hot sub item to be set to null
+				if(m_HotSubItem!=null)
+					m_HotSubItem.InternalMouseHover();
+			}
+		}
+
+		public virtual void InternalMouseLeave()
+		{
+			if(m_ParentPanel.DesignMode)
+				return;
+
+			// If we had hot sub item pass the mouse leave message to it...
+			if(m_HotSubItem!=null)
+			{
+				m_HotSubItem.InternalMouseLeave();
+				m_HotSubItem=null;
+			}
+		}
+
+		private void InternalMouseMove(System.Windows.Forms.MouseEventArgs objArg)
+		{
+			if(m_ParentPanel.DesignMode && objArg.Button==System.Windows.Forms.MouseButtons.Left && (Math.Abs(objArg.X-m_MouseDownPt.X)>=2 || Math.Abs(objArg.Y-m_MouseDownPt.Y)>=2))
+			{
+				BaseItem objFocus=m_ParentPanel.FocusedItem();
+				if(objFocus!=null && objFocus.CanCustomize)
+				{
+					if(!objFocus.SystemItem)
+					{
+						IOwner owner=m_ParentPanel.GetOwner() as IOwner;
+						if(owner!=null)
+							owner.StartItemDrag(objFocus);
+					}
+				}
+				else if(!m_ParentPanel.IsContainer)
+				{
+					if(!m_ParentPanel.SystemItem && m_ParentPanel.CanCustomize)
+					{
+						IOwner owner=m_ParentPanel.GetOwner() as IOwner;
+						if(owner!=null)
+							owner.StartItemDrag(m_ParentPanel);
+					}
+				}
+				return;
+			}
+
+			// If item is container and not in design time...
+			if(m_ParentPanel.IsContainer && !m_ParentPanel.DesignMode)
+			{
+				BaseItem objNew=ItemAtLocation(objArg.X,objArg.Y);
+				if(objNew!=m_HotSubItem)
+				{
+					if(m_HotSubItem!=null)
+					{
+						m_HotSubItem.InternalMouseLeave();
+						if(objNew!=null && m_HotSubItem.Expanded && (m_ParentPanel.IsOnMenu || m_ParentPanel.ContainerControl is Bar))
+							m_HotSubItem.Expanded=false;
+					}
+					
+					if(objNew!=null)
+					{
+						if(m_ParentPanel.AutoExpand)
+						{
+							BaseItem objItem=m_ParentPanel.ExpandedItem();
+							if(objItem!=null && objItem!=objNew)
+								objItem.Expanded=false;
+						}
+						objNew.InternalMouseEnter();
+						objNew.InternalMouseMove(objArg);
+						if(m_ParentPanel.AutoExpand && objNew.Enabled && objNew.ShowSubItems)
+						{
+							if(objNew is PopupItem)
+							{
+								PopupItem pi=objNew as PopupItem;
+								ePopupAnimation oldAnim=pi.PopupAnimation;
+								pi.PopupAnimation=ePopupAnimation.None;
+								if(objNew.SubItems.Count>0)
+									objNew.Expanded=true;
+								pi.PopupAnimation=oldAnim;
+							}
+							else
+								objNew.Expanded=true;
+						}
+						m_HotSubItem=objNew;
+						ResetHover();
+					}
+					else
+						m_HotSubItem=null;
+				}
+				else if(m_HotSubItem!=null)
+				{
+					m_HotSubItem.InternalMouseMove(objArg);
+				}
+			}
+		}
+
+		private BaseItem ItemAtLocation(int x, int y)
+		{
+			foreach(BaseItem objSub in m_ParentPanel.SubItems)
+			{
+				if((objSub.Visible || m_ParentPanel.IsOnCustomizeMenu) && objSub.Displayed && objSub.DisplayRectangle.Contains(x,y))
+				{
+					return objSub;
+				}
+			}
+			return null;
+		}
+
+		private void ResetHover()
+		{
+			// We need to reset hover thing since it is fired only first time mouse hovers inside the window and we need it for each of our items
+			NativeFunctions.TRACKMOUSEEVENT tme=new NativeFunctions.TRACKMOUSEEVENT();
+			tme.dwFlags=NativeFunctions.TME_QUERY;
+			tme.hwndTrack=(int)this.Handle;
+			tme.cbSize=System.Runtime.InteropServices.Marshal.SizeOf(tme);
+			NativeFunctions.TrackMouseEvent(ref tme);
+			tme.dwFlags=tme.dwFlags | NativeFunctions.TME_HOVER;
+			NativeFunctions.TrackMouseEvent(ref tme);
+		}
+
+		protected override void OnClick(EventArgs e)
+		{
+			InternalClick(Control.MouseButtons,Control.MousePosition);
+			base.OnClick(e);
+		}
+
+		protected override void OnDoubleClick(EventArgs e)
+		{
+			InternalDoubleClick(Control.MouseButtons,Control.MousePosition);
+			base.OnDoubleClick(e);
+		}
+
+		protected override void OnKeyDown(KeyEventArgs e)
+		{
+			InternalKeyDown(e);
+			base.OnKeyDown(e);
+		}
+
+		protected override void OnMouseDown(MouseEventArgs e)
+		{
+			InternalMouseDown(e);
+			base.OnMouseDown(e);
+		}
+
+		protected override void OnMouseHover(EventArgs e)
+		{
+			base.OnMouseHover(e);
+			InternalMouseHover();
+		}
+
+		protected override void OnMouseLeave(EventArgs e)
+		{
+			if(this.Cursor!=System.Windows.Forms.Cursors.Arrow)
+				this.Cursor=System.Windows.Forms.Cursors.Arrow;
+			InternalMouseLeave();
+			base.OnMouseLeave(e);
+		}
+
+		protected override void OnMouseMove(MouseEventArgs e)
+		{
+			base.OnMouseMove(e);
+			InternalMouseMove(e);
+		}
+
+		protected override void OnMouseUp(MouseEventArgs e)
+		{
+			base.OnMouseUp(e);
+			if(m_HotSubItem!=null)
+				m_HotSubItem.InternalMouseUp(e);
+		}
+
+		DevComponents.DotNetBar.ThemeWindow IThemeCache.ThemeWindow
+		{
+			get
+			{
+				if(m_ThemeWindow==null)
+					m_ThemeWindow=new ThemeWindow(this);
+				return m_ThemeWindow;
+			}
+		}
+		DevComponents.DotNetBar.ThemeRebar IThemeCache.ThemeRebar
+		{
+			get
+			{
+				if(m_ThemeRebar==null)
+					m_ThemeRebar=new ThemeRebar(this);
+				return m_ThemeRebar;
+			}
+		}
+		DevComponents.DotNetBar.ThemeToolbar IThemeCache.ThemeToolbar
+		{
+			get
+			{
+				if(m_ThemeToolbar==null)
+					m_ThemeToolbar=new ThemeToolbar(this);
+				return m_ThemeToolbar;
+			}
+		}
+		DevComponents.DotNetBar.ThemeHeader IThemeCache.ThemeHeader
+		{
+			get
+			{
+				if(m_ThemeHeader==null)
+					m_ThemeHeader=new ThemeHeader(this);
+				return m_ThemeHeader;
+			}
+		}
+		DevComponents.DotNetBar.ThemeScrollBar IThemeCache.ThemeScrollBar
+		{
+			get
+			{
+				if(m_ThemeScrollBar==null)
+					m_ThemeScrollBar=new ThemeScrollBar(this);
+				return m_ThemeScrollBar;
+			}
+		}
+		DevComponents.DotNetBar.ThemeExplorerBar IThemeCache.ThemeExplorerBar
+		{
+			get
+			{
+				if(m_ThemeExplorerBar==null)
+					m_ThemeExplorerBar=new ThemeExplorerBar(this);
+				return m_ThemeExplorerBar;
+			}
+		}
+
+		protected override void OnHandleDestroyed(EventArgs e)
+		{
+			DisposeThemes();
+			base.OnHandleDestroyed(e);
+		}
+
+		private void DisposeThemes()
+		{
+			if(m_ThemeWindow!=null)
+			{
+				m_ThemeWindow.Dispose();
+				m_ThemeWindow=null;
+			}
+			if(m_ThemeRebar!=null)
+			{
+				m_ThemeRebar.Dispose();
+				m_ThemeRebar=null;
+			}
+			if(m_ThemeToolbar!=null)
+			{
+				m_ThemeToolbar.Dispose();
+				m_ThemeToolbar=null;
+			}
+			if(m_ThemeHeader!=null)
+			{
+				m_ThemeHeader.Dispose();
+				m_ThemeHeader=null;
+			}
+			if(m_ThemeScrollBar!=null)
+			{
+				m_ThemeScrollBar.Dispose();
+				m_ThemeScrollBar=null;
+			}
+		}
+		protected override void WndProc(ref Message m)
+		{
+			if(m.Msg==NativeFunctions.WM_THEMECHANGED)
+			{
+				this.RefreshThemes();
+			}
+			base.WndProc(ref m);
+		}
+
+		private void RefreshThemes()
+		{
+			if(m_ThemeWindow!=null)
+			{
+				m_ThemeWindow.Dispose();
+				m_ThemeWindow=new ThemeWindow(this);
+			}
+			if(m_ThemeRebar!=null)
+			{
+				m_ThemeRebar.Dispose();
+				m_ThemeRebar=new ThemeRebar(this);
+			}
+			if(m_ThemeToolbar!=null)
+			{
+				m_ThemeToolbar.Dispose();
+				m_ThemeToolbar=new ThemeToolbar(this);
+			}
+			if(m_ThemeHeader!=null)
+			{
+				m_ThemeHeader.Dispose();
+				m_ThemeHeader=new ThemeHeader(this);
+			}
+			if(m_ThemeScrollBar!=null)
+			{
+				m_ThemeScrollBar.Dispose();
+				m_ThemeScrollBar=new ThemeScrollBar(this);
+			}
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/Form1.dotNetBarManager1.xml b/PROMS/DotNetBar Source Code/Form1.dotNetBarManager1.xml
new file mode 100644
index 00000000..2834197c
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Form1.dotNetBarManager1.xml	
@@ -0,0 +1,5 @@
+<dotnetbar fullmenus="false" fullmenushover="true" tooltips="true" scintooltip="false" animation="6">
+  <items />
+  <bars />
+  <popups />
+</dotnetbar>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/FormatHelper.cs b/PROMS/DotNetBar Source Code/FormatHelper.cs
new file mode 100644
index 00000000..ad93ee3b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/FormatHelper.cs	
@@ -0,0 +1,195 @@
+#if FRAMEWORK20
+using System;
+using System.Text;
+using System.ComponentModel;
+using System.Globalization;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar
+{
+    internal class FormatHelper
+    {
+        private static Type stringType;
+        private static Type checkStateType;
+        private static Type booleanType;
+ 
+        /// <summary>
+        /// Initializes FormatHelper class.
+        /// </summary>
+        static FormatHelper()
+        {
+            stringType = typeof(string);
+            booleanType = typeof(bool);
+            checkStateType = typeof(CheckState);
+            //parseMethodNotFound = new object();
+            //defaultDataSourceNullValue = DBNull.Value;
+        }
+        internal static object FormatObject(object value, Type targetType, TypeConverter sourceConverter, TypeConverter targetConverter, string formatString, IFormatProvider formatInfo, object formattedNullValue, object dataSourceNullValue)
+        {
+            if (IsNullData(value, dataSourceNullValue))
+            {
+                value = DBNull.Value;
+            }
+            Type type = targetType;
+            targetType = NullableUnwrap(targetType);
+            sourceConverter = NullableUnwrap(sourceConverter);
+            targetConverter = NullableUnwrap(targetConverter);
+            bool flag = targetType != type;
+            object obj2 = FormatObjectInternal(value, targetType, sourceConverter, targetConverter, formatString, formatInfo, formattedNullValue);
+            if ((type.IsValueType && (obj2 == null)) && !flag)
+            {
+                throw new FormatException(GetCantConvertMessage(value, targetType));
+            }
+            return obj2;
+        }
+
+        private static string GetCantConvertMessage(object value, Type targetType)
+        {
+            string name = (value == null) ? "Can't convert null value" : "Specified format cannot be converted";
+            return string.Format(CultureInfo.CurrentCulture, name, new object[] { value, targetType.Name });
+        }
+
+ 
+        private static object FormatObjectInternal(object value, Type targetType, TypeConverter sourceConverter, TypeConverter targetConverter, string formatString, IFormatProvider formatInfo, object formattedNullValue)
+        {
+            if ((value == DBNull.Value) || (value == null))
+            {
+                if (formattedNullValue != null)
+                {
+                    return formattedNullValue;
+                }
+                if (targetType == stringType)
+                {
+                    return string.Empty;
+                }
+                if (targetType == checkStateType)
+                {
+                    return CheckState.Indeterminate;
+                }
+                return null;
+            }
+            if (((targetType == stringType) && (value is IFormattable)) && !string.IsNullOrEmpty(formatString))
+            {
+                return (value as IFormattable).ToString(formatString, formatInfo);
+            }
+            Type type = value.GetType();
+            TypeConverter converter = TypeDescriptor.GetConverter(type);
+            if (((sourceConverter != null) && (sourceConverter != converter)) && sourceConverter.CanConvertTo(targetType))
+            {
+                return sourceConverter.ConvertTo(null, GetFormatterCulture(formatInfo), value, targetType);
+            }
+            TypeConverter converter2 = TypeDescriptor.GetConverter(targetType);
+            if (((targetConverter != null) && (targetConverter != converter2)) && targetConverter.CanConvertFrom(type))
+            {
+                return targetConverter.ConvertFrom(null, GetFormatterCulture(formatInfo), value);
+            }
+            if (targetType == checkStateType)
+            {
+                if (type == booleanType)
+                {
+                    return (((bool)value) ? CheckState.Checked : CheckState.Unchecked);
+                }
+                if (sourceConverter == null)
+                {
+                    sourceConverter = converter;
+                }
+                if ((sourceConverter != null) && sourceConverter.CanConvertTo(booleanType))
+                {
+                    return (((bool)sourceConverter.ConvertTo(null, GetFormatterCulture(formatInfo), value, booleanType)) ? CheckState.Checked : CheckState.Unchecked);
+                }
+            }
+            if (targetType.IsAssignableFrom(type))
+            {
+                return value;
+            }
+            if (sourceConverter == null)
+            {
+                sourceConverter = converter;
+            }
+            if (targetConverter == null)
+            {
+                targetConverter = converter2;
+            }
+            if ((sourceConverter != null) && sourceConverter.CanConvertTo(targetType))
+            {
+                return sourceConverter.ConvertTo(null, GetFormatterCulture(formatInfo), value, targetType);
+            }
+            if ((targetConverter != null) && targetConverter.CanConvertFrom(type))
+            {
+                return targetConverter.ConvertFrom(null, GetFormatterCulture(formatInfo), value);
+            }
+            if (!(value is IConvertible))
+            {
+                throw new FormatException(GetCantConvertMessage(value, targetType));
+            }
+            return ChangeType(value, targetType, formatInfo);
+        }
+        private static CultureInfo GetFormatterCulture(IFormatProvider formatInfo)
+        {
+            if (formatInfo is CultureInfo)
+            {
+                return (formatInfo as CultureInfo);
+            }
+            return CultureInfo.CurrentCulture;
+        }
+        private static object ChangeType(object value, Type type, IFormatProvider formatInfo)
+        {
+            object obj2;
+            try
+            {
+                if (formatInfo == null)
+                {
+                    formatInfo = CultureInfo.CurrentCulture;
+                }
+                obj2 = Convert.ChangeType(value, type, formatInfo);
+            }
+            catch (InvalidCastException exception)
+            {
+                throw new FormatException(exception.Message, exception);
+            }
+            return obj2;
+        }
+
+        private static Type NullableUnwrap(Type type)
+        {
+            if (type == stringType)
+            {
+                return stringType;
+            }
+            return (Nullable.GetUnderlyingType(type) ?? type);
+        }
+
+        private static TypeConverter NullableUnwrap(TypeConverter typeConverter)
+        {
+            NullableConverter converter = typeConverter as NullableConverter;
+            if (converter == null)
+            {
+                return typeConverter;
+            }
+            return converter.UnderlyingTypeConverter;
+        }
+
+        internal static bool IsNullData(object value, object dataSourceNullValue)
+        {
+            if ((value != null) && (value != DBNull.Value))
+            {
+                return object.Equals(value, NullData(value.GetType(), dataSourceNullValue));
+            }
+            return true;
+        }
+
+        internal static object NullData(Type type, object dataSourceNullValue)
+        {
+            if (!type.IsGenericType || (type.GetGenericTypeDefinition() != typeof(Nullable<>)))
+            {
+                return dataSourceNullValue;
+            }
+            if ((dataSourceNullValue != null) && (dataSourceNullValue != DBNull.Value))
+            {
+                return dataSourceNullValue;
+            }
+            return null;
+        }
+    }
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/GenericItemContainer.cs b/PROMS/DotNetBar Source Code/GenericItemContainer.cs
new file mode 100644
index 00000000..b254094b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/GenericItemContainer.cs	
@@ -0,0 +1,2581 @@
+namespace DevComponents.DotNetBar
+{
+    using System;
+	using System.Drawing;
+	using System.Collections;
+    using System.Windows.Forms;
+	
+	/// <summary>
+    ///  Defines the generic container item that is used by toolbar, menu bar and other control for item layout.
+    /// </summary>
+    [System.ComponentModel.ToolboxItem(false),System.ComponentModel.DesignTimeVisible(false)]
+    public class GenericItemContainer:ImageItem, IDesignTimeProvider
+    {
+        #region Private Variables
+        protected int m_PaddingLeft, m_PaddingTop, m_PaddingBottom, m_PaddingRight, m_ItemSpacing;
+        private int m_FirstItemSpacing = 0;
+		protected eBorderType m_BorderType;
+		protected internal Color m_BackgroundColor;
+		protected bool m_WrapItems;
+		protected DisplayMoreItem m_MoreItems;
+		private bool m_MoreItemsOnMenu;
+		private bool m_EqualButtonSize;
+		private int m_DisplayedItems=0;
+
+		//private bool m_Stretch;
+		private bool m_SystemContainer;
+		private bool m_HaveCustomizeItem=false;
+
+		private eLayoutType m_LayoutType=eLayoutType.Toolbar;
+
+		private bool m_Scroll=false;  // Indicates whether we use scrolling in container. Applies only to the "Task List" container.
+		private int m_ScrollTopPosition=0; // Indicates the first visible item from the top when scroll is used.
+		private bool m_TopScroll=false, m_BottomScroll=false;
+		private ScrollButton m_TopScrollButton=null,m_BottomScrollButton=null;
+
+		// Used to eat the mouse move messages when user is using the keyboard to browse through the
+		// top level menus. The problem was that on each repaint the mouse move was fired even though the
+		// mouse did not move at all. So if mouse was over an menu item it was not possible to switch to the
+		// new menu item becouse mouse was "holding" the focus.
+		private bool m_IgnoreDuplicateMouseMove=false;
+		private System.Windows.Forms.MouseEventArgs m_LastMouseMoveEvent=null;
+		private int m_MinWidth=0, m_MinHeight=0;
+		private bool m_Painting=false;
+		private bool m_EventHeight=true;
+		private bool m_UseMoreItemsButton=true;
+        private eContainerVerticalAlignment m_ToolbarItemsAlign = eContainerVerticalAlignment.Bottom;
+        private bool m_TrackSubItemsImageSize = true;
+        internal bool OverflowEnabled = true;
+        #endregion
+
+        #region Events
+        /// <summary>
+        /// Occurs when new item is added to the container.
+        /// </summary>
+        internal EventHandler ItemAdded;
+        #endregion
+
+        public GenericItemContainer()
+        {
+			// We contain other controls
+			m_IsContainer=true;
+			m_PaddingLeft=1;
+			m_PaddingTop=1;
+			m_PaddingBottom=1;
+			m_PaddingRight=1;
+			m_ItemSpacing=0;
+			m_BackgroundColor=Color.Empty;
+			m_BorderType=eBorderType.None;
+			m_WrapItems=false;
+			m_MoreItems=null;
+			m_EqualButtonSize=false;
+			//m_Stretch=false;
+			m_MoreItemsOnMenu=false;
+			m_SystemContainer=false;
+			this.AccessibleRole=System.Windows.Forms.AccessibleRole.Grouping;
+        }
+
+        protected override void Dispose(bool disposing)
+		{
+			if(m_TopScrollButton!=null)
+			{
+				if(m_TopScrollButton.Parent!=null)
+					m_TopScrollButton.Parent.Controls.Remove(m_TopScrollButton);
+				m_TopScrollButton.Dispose();
+				m_TopScrollButton=null;
+			}
+
+			if(m_BottomScrollButton!=null)
+			{
+				if(m_BottomScrollButton.Parent!=null)
+					m_BottomScrollButton.Parent.Controls.Remove(m_BottomScrollButton);
+				m_BottomScrollButton.Dispose();
+				m_BottomScrollButton=null;
+			}
+			
+			base.Dispose(disposing);
+		}
+
+		internal int MinHeight
+		{
+			get {return m_MinHeight;}
+			set {m_MinHeight=value;}
+		}
+		internal int MinWidth
+		{
+			get {return m_MinWidth;}
+			set {m_MinWidth=value;}
+		}
+
+		/// <summary>
+		/// Returns copy of GenericItemContainer item
+		/// </summary>
+		public override BaseItem Copy()
+		{
+			GenericItemContainer objCopy=new GenericItemContainer();
+			this.CopyToItem(objCopy);
+			
+			return objCopy;
+		}
+		protected override void CopyToItem(BaseItem copy)
+		{
+			GenericItemContainer objCopy=copy as GenericItemContainer;
+			base.CopyToItem(objCopy);
+
+			objCopy.WrapItems=m_WrapItems;
+			objCopy.EqualButtonSize=m_EqualButtonSize;
+		}
+
+		/// <summary>
+		/// Paints this base container
+		/// </summary>
+        public override void Paint(ItemPaintArgs pa)
+        {
+            if (this.SuspendLayout || m_Painting)
+                return;
+            eDotNetBarStyle effectiveStyle = EffectiveStyle;
+            m_Painting = true;
+            try
+            {
+                System.Drawing.Graphics g = pa.Graphics;
+
+                if (m_NeedRecalcSize)
+                {
+                    RecalcSize();
+                }
+                int x = m_Rect.Left, y = m_Rect.Top;
+                Rectangle thisRect = new Rectangle(m_Rect.Left, m_Rect.Top, m_Rect.Width, m_Rect.Height);
+
+                switch (m_BorderType)
+                {
+                    case eBorderType.Bump:
+                        System.Windows.Forms.ControlPaint.DrawBorder3D(g, m_Rect, System.Windows.Forms.Border3DStyle.Bump, System.Windows.Forms.Border3DSide.All);
+                        thisRect.Inflate(-2, -2);
+                        break;
+                    case eBorderType.Etched:
+                        System.Windows.Forms.ControlPaint.DrawBorder3D(g, m_Rect, System.Windows.Forms.Border3DStyle.Etched, System.Windows.Forms.Border3DSide.All);
+                        thisRect.Inflate(-2, -2);
+                        break;
+                    case eBorderType.Raised:
+                        System.Windows.Forms.ControlPaint.DrawBorder3D(g, m_Rect, System.Windows.Forms.Border3DStyle.RaisedInner, System.Windows.Forms.Border3DSide.All);
+                        thisRect.Inflate(-2, -2);
+                        break;
+                    case eBorderType.Sunken:
+                        System.Windows.Forms.ControlPaint.DrawBorder3D(g, m_Rect, System.Windows.Forms.Border3DStyle.SunkenOuter, System.Windows.Forms.Border3DSide.All);
+                        thisRect.Inflate(-2, -2);
+                        break;
+                    case eBorderType.SingleLine:
+                        // TODO: Beta 2 fix --> g.DrawRectangle(new Pen(SystemBrushes.ControlDark,1),m_Rect);
+                        Pen pen = new Pen(SystemBrushes.ControlDark, 1);
+                        NativeFunctions.DrawRectangle(g, pen, m_Rect);
+                        pen.Dispose();
+                        thisRect.Inflate(-1, -1);
+                        break;
+                    default:
+                        break;
+                }
+
+                if (!m_BackgroundColor.IsEmpty)
+                {
+                    SolidBrush brush = new SolidBrush(m_BackgroundColor);
+                    g.FillRectangle(brush, thisRect);
+                    brush.Dispose();
+                }
+                //else if(m_Style==eDotNetBarStyle.Office2000 || this.IsOnMenuBar)
+                //	g.FillRectangle(SystemBrushes.Control,thisRect);
+                //else
+                //	g.FillRectangle(new SolidBrush(ColorFunctions.ToolMenuFocusBackColor(g)),thisRect);
+                g.SetClip(thisRect);
+                if (m_SubItems != null)
+                {
+                    BaseItem objItem = null;
+                    int iDisplayed = 0;
+                    ThemeToolbar theme = null;
+                    ThemeToolbarParts part = ThemeToolbarParts.Separator;
+                    ThemeToolbarStates state = ThemeToolbarStates.Normal;
+                    if (this.IsThemed)
+                        theme = pa.ThemeToolbar;
+
+                    for (int iCurrentItem = 0; iCurrentItem < m_SubItems.Count; iCurrentItem++)
+                    {
+                        objItem = m_SubItems[iCurrentItem] as BaseItem;
+                        if (objItem.Visible && objItem.Displayed)
+                        {
+                            if (objItem.BeginGroup && iDisplayed > 0 && m_LayoutType != eLayoutType.DockContainer && !(objItem is ItemContainer && BarFunctions.IsOffice2007Style(objItem.EffectiveStyle)))
+                            {
+                                if (m_Orientation == eOrientation.Vertical || m_LayoutType == eLayoutType.TaskList)
+                                {
+                                    if (objItem.TopInternal == m_PaddingTop + m_Rect.Top || objItem.LeftInternal > m_PaddingLeft + m_Rect.Left)
+                                    {
+                                        // Vertical line on the left side
+                                        if (effectiveStyle == eDotNetBarStyle.Office2000)
+                                            System.Windows.Forms.ControlPaint.DrawBorder3D(g, objItem.LeftInternal - 4, objItem.TopInternal + 1, 2, m_Rect.Height - m_PaddingTop - m_PaddingBottom - 4, System.Windows.Forms.Border3DStyle.Etched, System.Windows.Forms.Border3DSide.Left);
+                                        else
+                                        {
+                                            if (theme != null)
+                                            {
+                                                part = ThemeToolbarParts.Separator;
+                                                theme.DrawBackground(g, part, state, new Rectangle(objItem.LeftInternal - 4, objItem.TopInternal + 1, 6, m_Rect.Height - m_PaddingBottom - 2));
+                                            }
+                                            else
+                                            {
+                                                using (Pen pen = new Pen(pa.Colors.ItemSeparator))
+                                                {
+                                                    if (effectiveStyle == eDotNetBarStyle.OfficeXP)
+                                                        g.DrawLine(pen, objItem.LeftInternal - 2, objItem.TopInternal + 1, objItem.LeftInternal - 2, m_Rect.Bottom - m_PaddingBottom - 2);
+                                                    else
+                                                    {
+                                                        g.DrawLine(pen, objItem.LeftInternal - 2, objItem.TopInternal + 2, objItem.LeftInternal - 2, m_Rect.Bottom - m_PaddingBottom - 4);
+                                                        Pen penLight = new Pen(pa.Colors.ItemSeparatorShade, 1);
+                                                        g.DrawLine(penLight, objItem.LeftInternal - 1, objItem.TopInternal + 3, objItem.LeftInternal - 1, m_Rect.Bottom - m_PaddingBottom - 5);
+                                                        penLight.Dispose();
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                    else
+                                    {
+                                        Point start = new Point(objItem.LeftInternal + m_PaddingLeft, objItem.TopInternal - 2);
+                                        Point end = new Point(objItem.DisplayRectangle.Right - m_PaddingRight, objItem.TopInternal - 2);
+                                        if (this.LayoutType == eLayoutType.TaskList)
+                                        {
+                                            start.X = this.LeftInternal + 1;
+                                            end.X = this.DisplayRectangle.Right - 2;
+                                        }
+
+                                        // Horizontal line
+                                        if (effectiveStyle == eDotNetBarStyle.Office2000)
+                                            System.Windows.Forms.ControlPaint.DrawBorder3D(g, m_Rect.Left + m_PaddingLeft + 2, objItem.TopInternal - 4, objItem.WidthInternal - 2, 2, System.Windows.Forms.Border3DStyle.Etched, System.Windows.Forms.Border3DSide.Top);
+                                        else
+                                        {
+                                            if (theme != null)
+                                            {
+                                                part = ThemeToolbarParts.SeparatorVert;
+                                                theme.DrawBackground(g, part, state, new Rectangle(start.X, start.Y, end.X - start.X, 6));
+                                            }
+                                            else
+                                            {
+                                                using (Pen pen = new Pen(pa.Colors.ItemSeparator))
+                                                {
+                                                    if (effectiveStyle == eDotNetBarStyle.OfficeXP)
+                                                        g.DrawLine(pen, start, end);
+                                                    else
+                                                    {
+                                                        g.DrawLine(pen, start, end);
+                                                        start.Offset(0, 1);
+                                                        end.Offset(0, 1);
+                                                        using (Pen penLight = new Pen(pa.Colors.ItemSeparatorShade, 1))
+                                                            g.DrawLine(penLight, start, end);
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                                else
+                                {
+                                    if (objItem.TopInternal == m_PaddingTop + m_Rect.Top || objItem.LeftInternal > m_PaddingLeft + m_Rect.Left)
+                                    {
+                                        // Vertical line on the left side
+                                        if (effectiveStyle == eDotNetBarStyle.Office2000)
+                                            System.Windows.Forms.ControlPaint.DrawBorder3D(g, objItem.LeftInternal - 4, objItem.TopInternal + 1, 2, objItem.HeightInternal - 2, System.Windows.Forms.Border3DStyle.Etched, System.Windows.Forms.Border3DSide.Left);
+                                        else
+                                        {
+                                            if (theme != null)
+                                            {
+                                                part = ThemeToolbarParts.Separator;
+                                                theme.DrawBackground(g, part, state, new Rectangle(objItem.LeftInternal - 4, objItem.TopInternal + 1, 6, objItem.HeightInternal - 3));
+                                            }
+                                            else
+                                            {
+                                                using (Pen pen = new Pen(pa.Colors.ItemSeparator))
+                                                {
+                                                    if (effectiveStyle == eDotNetBarStyle.OfficeXP)
+                                                        g.DrawLine(pen, objItem.LeftInternal - 2, objItem.TopInternal + 1, objItem.LeftInternal - 2, objItem.TopInternal + 1 + objItem.HeightInternal - 3);
+                                                    else
+                                                    {
+                                                        g.DrawLine(pen, objItem.LeftInternal - 2, objItem.TopInternal + 4, objItem.LeftInternal - 2, objItem.TopInternal + 4 + objItem.HeightInternal - 8);
+                                                        Pen penLight = new Pen(pa.Colors.ItemSeparatorShade, 1);
+                                                        g.DrawLine(penLight, objItem.LeftInternal - 1, objItem.TopInternal + 5, objItem.LeftInternal - 1, objItem.TopInternal + 5 + objItem.HeightInternal - 8);
+                                                        penLight.Dispose();
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                    else
+                                    {
+                                        // Horizontal line
+                                        if (effectiveStyle == eDotNetBarStyle.Office2000)
+                                            System.Windows.Forms.ControlPaint.DrawBorder3D(g, m_Rect.Left + m_PaddingLeft + 2, objItem.TopInternal - 4, m_Rect.Width - m_PaddingLeft - m_PaddingRight - 4, 2, System.Windows.Forms.Border3DStyle.Etched, System.Windows.Forms.Border3DSide.Top);
+                                        else
+                                        {
+                                            if (theme != null)
+                                            {
+                                                part = ThemeToolbarParts.SeparatorVert;
+                                                theme.DrawBackground(g, part, state, new Rectangle(m_Rect.Left + m_PaddingLeft + 2, objItem.TopInternal - 4, m_Rect.Width - m_PaddingRight - 2, 6));
+                                            }
+                                            else
+                                            {
+                                                using (Pen pen = new Pen(pa.Colors.ItemSeparator))
+                                                {
+                                                    if (effectiveStyle == eDotNetBarStyle.OfficeXP)
+                                                        g.DrawLine(pen, m_Rect.Left + m_PaddingLeft + 2, objItem.TopInternal - 2, m_Rect.Right - m_PaddingRight - 2, objItem.TopInternal - 2);
+                                                    else
+                                                    {
+                                                        g.DrawLine(pen, m_Rect.Left + m_PaddingLeft + 2, objItem.TopInternal - 2, m_Rect.Right - m_PaddingRight - 2, objItem.TopInternal - 2);
+                                                        Pen penLight = new Pen(pa.Colors.ItemSeparatorShade, 1);
+                                                        g.DrawLine(penLight, m_Rect.Left + m_PaddingLeft + 6, objItem.TopInternal - 1, m_Rect.Right - m_PaddingRight - 4, objItem.TopInternal - 1);
+                                                        penLight.Dispose();
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                            if (g.ClipBounds.IntersectsWith(objItem.DisplayRectangle))
+                                objItem.Paint(pa);
+                            iDisplayed++;
+                        }
+
+                        // Paint the Display More Items button if needed
+                        if (m_MoreItems != null)
+                        {
+                            //Point loc = GetMoreItemsLocation();
+                            //m_MoreItems.LeftInternal = loc.X;
+                            //m_MoreItems.TopInternal = loc.Y;
+
+                            //if(m_Orientation==eOrientation.Vertical)
+                            //{
+                            //    m_MoreItems.LeftInternal=m_Rect.Left+m_PaddingLeft;
+                            //    m_MoreItems.TopInternal=m_Rect.Bottom-m_MoreItems.HeightInternal-m_PaddingBottom;
+                            //}
+                            //else
+                            //{
+                            //    m_MoreItems.LeftInternal=m_Rect.Right-m_MoreItems.WidthInternal-m_PaddingRight;
+                            //    m_MoreItems.TopInternal=m_Rect.Top+m_PaddingTop;
+                            //}
+                            m_MoreItems.Paint(pa);
+                        }
+
+                        //					if(m_LayoutType==eLayoutType.TaskList && m_Scroll)
+                        //					{
+                        //
+                        //					}
+                    }
+                }
+                g.ResetClip();
+            }
+            finally
+            {
+                m_Painting = false;
+            }
+        }
+
+		public eBorderType BorderType
+		{
+			get
+			{
+				return m_BorderType;
+			}
+			set
+			{
+				m_BorderType=value;
+			}
+		}
+		
+		/// <summary>
+		/// Set/Get does container wraps item into the new line when they exceed the container size
+		/// </summary>
+		public bool WrapItems
+		{
+			get
+			{
+				return m_WrapItems;
+			}
+			set
+			{
+				m_WrapItems=value;
+			}
+		}
+
+		public int ItemSpacing
+		{
+			get
+			{
+				return m_ItemSpacing;
+			}
+			set
+			{
+				if(m_ItemSpacing==value)
+					return;
+				m_ItemSpacing=value;
+				NeedRecalcSize=true;
+			}
+		}
+
+        protected virtual int FirstItemSpacing
+        {
+            get { return m_FirstItemSpacing; }
+            set { m_FirstItemSpacing = value; }
+        }
+
+		/// <summary>
+		/// Specifies whether to display more items on popup menu or Bar.
+		/// </summary>
+		public bool MoreItemsOnMenu
+		{
+			get
+			{
+				return m_MoreItemsOnMenu;
+			}
+			set
+			{
+				m_MoreItemsOnMenu=value;
+			}
+		}
+
+		internal DisplayMoreItem MoreItems
+		{
+			get
+			{
+				return m_MoreItems;
+			}
+		}
+
+		public override void RecalcSize()
+		{
+			if(this.SuspendLayout)
+				return;
+		    this.IsLayoutPass = true;
+			m_RecalculatingSize=true;
+
+			switch(m_LayoutType)
+			{
+				case eLayoutType.Toolbar:
+                    RecalcSizeToolbar();
+					break;
+				case eLayoutType.TaskList:
+					RecalcSizeTaskList();
+					break;
+				case eLayoutType.DockContainer:
+					RecalcSizeDockContainer(false);
+					break;
+			}
+			base.RecalcSize();
+			m_RecalculatingSize=false;
+		    this.IsLayoutPass = false;
+		}
+
+		private void RecalcSizeDockContainer(bool bFitContainer)
+		{
+			int iX=0, iY=0, iMaxWidth=0, iMaxHeight=0;
+			bool bOneDisplayed=false;
+			if(this.SuspendLayout)
+				return;
+
+			m_DisplayedItems=0;
+
+		    int paddingLeft = Dpi.Width(m_PaddingLeft);
+		    iX=paddingLeft+m_Rect.Left;
+		    int paddingTop = Dpi.Height(m_PaddingTop);
+		    iY=paddingTop+m_Rect.Top;
+			if(m_SubItems!=null)
+			{
+				for(int itemIndex=0;itemIndex<this.SubItems.Count;itemIndex++)
+				{
+					BaseItem item=this.SubItems[itemIndex];
+					item.RecalcSize();
+                    if(item.WidthInternal>iMaxWidth)
+						iMaxWidth=item.WidthInternal;
+					if(item.HeightInternal>iMaxHeight)
+						iMaxHeight=item.HeightInternal;
+					
+					item.LeftInternal=iX;
+					item.TopInternal=iY;
+
+					if(!item.Visible)
+					{
+						item.Displayed=false;
+						continue;
+					}
+					else
+						m_DisplayedItems++;
+					if(!bOneDisplayed && (item.Displayed || itemIndex==this.SubItems.Count-1))
+					{
+						item.Displayed=true;
+						bOneDisplayed=true;
+					}
+					else
+					{
+						item.Displayed=false;
+					}
+				}
+
+				if(!bOneDisplayed)
+				{
+					foreach(BaseItem item in m_SubItems)
+						if(item.Visible)
+						{
+							item.Displayed=true;
+							break;
+						}
+				}
+			}
+
+		    int paddingRight = Dpi.Width(m_PaddingRight);
+		    int paddingBottom = Dpi.Height(m_PaddingBottom);
+		    if((bFitContainer || this.Stretch))
+			{
+				if(iMaxWidth+paddingLeft+paddingRight<m_Rect.Width || iMaxHeight+paddingTop+paddingBottom<m_Rect.Height)
+				{
+					if(iMaxWidth+paddingLeft+paddingRight<m_Rect.Width)
+						iMaxWidth=m_Rect.Width-paddingLeft-paddingRight;
+					if(iMaxHeight+paddingTop+paddingBottom<m_Rect.Height)
+						iMaxHeight=m_Rect.Height-paddingTop-paddingBottom;
+				}
+				Bar bar=this.ContainerControl as Bar;
+				// Following code lets us resized Dockable Bars when docked...
+				if(bar!=null && (bar.BarState==eBarState.Docked || bar.BarState==eBarState.AutoHide))
+				{
+					if(MinWidth>0 && iMaxWidth+paddingLeft+paddingRight<MinWidth && this.Orientation==eOrientation.Vertical)
+						iMaxWidth=MinWidth-(paddingLeft+paddingRight);
+					else if(MinHeight>0 && iMaxHeight+paddingTop+paddingBottom<MinHeight && this.Orientation==eOrientation.Horizontal)
+						iMaxHeight=MinHeight-(paddingTop+paddingBottom);
+				}
+			}
+
+            Size newSize = new Size(iMaxWidth, iMaxHeight);
+			foreach(BaseItem item in m_SubItems)
+                item.Size = newSize;
+
+			if(this.Stretch)
+			{
+				if(m_Orientation==eOrientation.Horizontal)
+				{
+					m_Rect.Height=paddingTop+iMaxHeight+paddingBottom;
+					// Only if suggested Width is less than our width change it
+					if(m_Rect.Width<iMaxWidth+paddingLeft+paddingRight)
+						m_Rect.Width=paddingLeft+iMaxWidth+paddingRight;
+				}
+				else if(m_Orientation==eOrientation.Vertical)
+				{
+					m_Rect.Width=paddingLeft+iMaxWidth+paddingRight;
+					// Only if suggested Height is less than our height change it
+					if(m_Rect.Height<iMaxHeight+paddingBottom+paddingTop)
+						m_Rect.Height=paddingTop+iMaxHeight+paddingBottom;
+				}
+			}
+			else
+			{
+				m_Rect.Width=paddingLeft+iMaxWidth+paddingRight;
+				m_Rect.Height=paddingTop+iMaxHeight+paddingBottom;
+			}
+		}
+
+		/// <summary>
+		/// Recalculate Size of this item
+		/// </summary>
+		private void RecalcSizeToolbar()
+		{
+			if(this.SuspendLayout)
+				return;
+
+            bool isRightToLeft = false;
+            Control containerControl = this.ContainerControl as Control;
+            if (containerControl != null)
+                isRightToLeft = (containerControl.RightToLeft == RightToLeft.Yes);
+
+			// This object for now have only border but it will have more potentially
+			int iX=0, iY=0, iMaxItem=0, iMaxItemWidth=0, iMaxItemHeight=0;
+			int iWidth=0, iHeight=0;
+			int iGroupLineSize=3;
+			int iLines=0;
+			bool bDisplayed=true;
+			bool bAdjustSize=false, bSetSize=false;  // If horizontal orientation we need to make sure that Height of all items is same
+			int iDisplayed=0;
+			BaseItem objItem=null;
+			ArrayList FarAlignLines=null;
+			Stack FarAlignItems=null;
+			ArrayList StretchLines=null;
+			ArrayList StretchLinesISCount=null;  // Holds the count of number of items stretched per line
+			ArrayList ItemsToStretch=null;
+
+			if(m_MoreItems!=null && m_MoreItems.Expanded)
+				m_MoreItems.Expanded=false;
+
+            if (EffectiveStyle == eDotNetBarStyle.Office2000)
+				iGroupLineSize=6;
+
+		    int paddingLeft = Dpi.Width(m_PaddingLeft);
+		    iX=paddingLeft+m_Rect.Left;
+		    int paddingTop = Dpi.Height(m_PaddingTop);
+		    iY=paddingTop+m_Rect.Top;
+
+			int iVisibleCount=this.VisibleSubItems;
+			int iVisible=0;
+
+		    int paddingRight = Dpi.Width(m_PaddingRight);
+		    int paddingBottom = Dpi.Height(m_PaddingBottom);
+		    if(m_SubItems!=null)
+			{
+				bool bRepeat=false;
+				int iRepeatCount=0;
+				
+				if(m_WrapItems || this.Stretch)
+					FarAlignLines=new ArrayList(3);
+
+				if(this.Stretch)
+				{
+					StretchLines=new ArrayList(3);
+					StretchLinesISCount=new ArrayList(3);
+				}
+
+                bool callRecalcSize = OnBeforeLayout();
+                int mItemSpacing = Dpi.Width(m_ItemSpacing);
+                int firstItemSpacing = Dpi.Width(m_FirstItemSpacing);
+				do
+				{
+					iDisplayed=0;
+					for (int iCurrentItem=0;iCurrentItem<m_SubItems.Count;iCurrentItem++)
+					{
+						objItem=m_SubItems[iCurrentItem] as BaseItem;
+						if(objItem!=null && objItem.Visible)
+						{
+							iVisible++;
+							if((objItem.SupportedOrientation==eSupportedOrientation.Horizontal && m_Orientation==eOrientation.Vertical) || (objItem.SupportedOrientation==eSupportedOrientation.Vertical && m_Orientation==eOrientation.Horizontal))
+							{
+								objItem.Displayed=false;
+								continue;
+							}
+
+						    int itemSpacing = (iDisplayed > 1 || firstItemSpacing == 0) ? mItemSpacing : firstItemSpacing;
+
+                            if(callRecalcSize)
+							    objItem.RecalcSize();
+							if(bSetSize)
+							{
+								if(m_Orientation==eOrientation.Vertical)
+									objItem.WidthInternal=iMaxItemWidth;
+								else
+									objItem.HeightInternal=iMaxItemHeight;
+							}
+
+							switch(m_Orientation)
+							{
+								case eOrientation.Horizontal:
+								{
+									// Wrap to next line if needed
+									if(m_WrapItems)
+									{
+										if(objItem.BeginGroup && iDisplayed>0)
+											iX+=iGroupLineSize;
+                                        if (iX + objItem.WidthInternal + itemSpacing > m_Rect.Right && iX > paddingLeft + m_Rect.Left)
+										{
+                                            iY += (iMaxItem + itemSpacing);
+											if(objItem.BeginGroup)
+												iY+=iGroupLineSize;
+											iX=paddingLeft+m_Rect.Left;
+											iMaxItem=0;
+											iLines++;
+
+											if(FarAlignItems!=null)
+												FarAlignItems=null;
+											if(ItemsToStretch!=null)
+												ItemsToStretch=null;
+										}
+									}
+									else if(bDisplayed)
+									{
+										if(objItem.BeginGroup && iDisplayed>0)
+											iX+=iGroupLineSize;
+										// If not wrapping then make sure that items fits into one line, otherwise we need to display the mark that lets them see the rest
+                                        if (OverflowEnabled && (iX + objItem.WidthInternal + itemSpacing > m_Rect.Right - paddingRight && iX > paddingLeft + m_Rect.Left || (iX + objItem.WidthInternal + itemSpacing + DisplayMoreItem.FixedSize > m_Rect.Right && iCurrentItem + 1 < m_SubItems.Count && iVisible < iVisibleCount)))
+										{
+											if(iCurrentItem==0)
+												iMaxItem=objItem.HeightInternal;
+											// Items don't fit any more the rest won't be visible
+                                            iX += (itemSpacing + DisplayMoreItem.FixedSize);
+					                        bDisplayed=false;
+										}
+									}
+									
+									if(bDisplayed)
+									{
+										if(iDisplayed>0)
+                                            iX += itemSpacing;
+                                        objItem.LeftInternal = GetItemLayoutX(objItem, iX);
+                                        objItem.TopInternal = GetItemLayoutY(objItem, iY);
+										//iX+=objItem.WidthInternal+m_ItemSpacing;
+										iX+=GetItemLayoutWidth(objItem);
+										if(objItem.HeightInternal>iMaxItem)
+										{
+											iMaxItem=objItem.HeightInternal;
+										}
+									}
+									break;
+								}
+								case eOrientation.Vertical:
+								{
+									// Wrap to next line if needed
+									if(m_WrapItems)
+									{
+										if(objItem.BeginGroup && iDisplayed>0)
+											iY+=iGroupLineSize;
+                                        if (iY + objItem.HeightInternal + itemSpacing > m_Rect.Bottom && iY > paddingTop + m_Rect.Top)
+										{
+                                            iX += (iMaxItem + itemSpacing);
+											if(objItem.BeginGroup)
+												iX+=iGroupLineSize;
+											iY=paddingTop+m_Rect.Top;
+											iMaxItem=0;
+											iLines++;
+
+											if(FarAlignItems!=null)
+												FarAlignItems=null;
+											if(ItemsToStretch!=null)
+												ItemsToStretch=null;
+										}
+									}
+									else if(bDisplayed)
+									{
+										if(objItem.BeginGroup && iDisplayed>0)
+											iY+=iGroupLineSize;
+										// If not wrapping then make sure that items fits into one line, otherwise we need to display the mark that lets them see the rest
+                                        if (iY + objItem.HeightInternal + itemSpacing > m_Rect.Bottom && iY > paddingTop + m_Rect.Top || (iY + objItem.HeightInternal + itemSpacing + DisplayMoreItem.FixedSize > m_Rect.Bottom && iCurrentItem + 1 < m_SubItems.Count && iVisible < iVisibleCount))
+										{
+											if(iCurrentItem==0)
+												iMaxItem=objItem.WidthInternal;
+											// Items don't fit any more the rest won't be visible
+                                            iY += (itemSpacing + DisplayMoreItem.FixedSize);
+					                        bDisplayed=false;
+										}
+									}
+									if(bDisplayed)
+									{
+										if(iDisplayed>0)
+                                            iY += itemSpacing;
+										objItem.LeftInternal=iX;
+										objItem.TopInternal=iY;
+										iY+=GetItemLayoutHeight(objItem);
+										if(objItem.WidthInternal>iMaxItem)
+										{
+											iMaxItem=objItem.WidthInternal;
+										}
+									}
+									break;
+								}
+								default:
+									break;
+							}
+
+							if(bDisplayed)
+							{
+								if(objItem.WidthInternal!=iMaxItemWidth)
+								{
+									if(m_Orientation==eOrientation.Vertical && iMaxItemWidth!=0 && !bSetSize)
+										bAdjustSize=true;
+									if(objItem.WidthInternal>iMaxItemWidth)
+										iMaxItemWidth=objItem.WidthInternal;
+								}
+								if(objItem.HeightInternal!=iMaxItemHeight)
+								{
+									if(m_Orientation==eOrientation.Horizontal && iMaxItemHeight!=0 && !bSetSize)
+										bAdjustSize=true;
+									if(objItem.HeightInternal>iMaxItemHeight)
+										iMaxItemHeight=objItem.HeightInternal;
+								}
+								iDisplayed++;
+							}
+
+							objItem.Displayed=bDisplayed;
+
+							// Save right (Far) aligned items so we can adjust thiere position at the end
+							if(bDisplayed && FarAlignLines!=null && objItem.ItemAlignment==eItemAlignment.Far || FarAlignItems!=null)
+							{
+								if(FarAlignItems==null)
+								{
+									FarAlignItems=new Stack();
+									FarAlignLines.Add(FarAlignItems);
+								}
+								FarAlignItems.Push(objItem);
+								// no stretch after item has been far aligned
+								StretchLines=null;
+							}
+
+							// Save Items that we need to stretch
+							if(bDisplayed && objItem.Stretch && StretchLines!=null || ItemsToStretch!=null)
+							{
+								if(ItemsToStretch==null)
+								{
+									ItemsToStretch=new ArrayList(5);
+									StretchLines.Add(ItemsToStretch);
+									StretchLinesISCount.Add(0);
+								}
+								ItemsToStretch.Add(objItem);
+								if(objItem.Stretch)
+									StretchLinesISCount[StretchLinesISCount.Count-1]=(int)StretchLinesISCount[StretchLinesISCount.Count-1]+1;
+							}
+
+
+							// Track the size if this container
+							if(iX>iWidth)
+								iWidth=iX;
+							if(iY>iHeight)
+								iHeight=iY;
+						}
+						else if(objItem!=null)
+							objItem.Displayed=false;
+					}
+					// Check do we have to repeat the process
+					// This is needed if container is in wrap mode and some items do not fit
+					// This is done to ensure the minimum size of the container for example
+					// if container with is smaller than width of one single item inside the
+					// container width has to be set to widest item in the list and then the
+					// size has to be recalculated again.
+					if(m_WrapItems && iLines>0 && iRepeatCount<1)
+					{
+						if(m_Orientation==eOrientation.Horizontal && (iWidth>m_Rect.Width || bAdjustSize))
+						{
+							bRepeat=true;
+							m_Rect.Width=iWidth+paddingLeft+paddingRight;
+							iX=paddingLeft+m_Rect.Left;
+							iY=paddingTop+m_Rect.Top;
+							iWidth=0;
+							iHeight=0;
+						}
+						else if(m_Orientation==eOrientation.Vertical && (iHeight>m_Rect.Height || bAdjustSize))
+						{
+							bRepeat=true;
+							m_Rect.Height=iHeight+paddingTop+paddingBottom;
+							iX=paddingLeft+m_Rect.Left;
+							iY=paddingTop+m_Rect.Top;
+							iWidth=0;
+							iHeight=0;
+						}
+						if(bAdjustSize)
+						{
+							if(m_EventHeight)
+								bSetSize=true;
+							bAdjustSize=false;
+						}
+						// Reset alignment collections since new iteration can cause different lines
+						if(bRepeat && iRepeatCount+1<2)
+						{
+							if(FarAlignLines!=null && FarAlignLines.Count>0)
+								FarAlignLines=new ArrayList(3);
+							// Reset stretch collection for same reason
+							if(StretchLines!=null && StretchLines.Count>0)
+							{
+								StretchLines=new ArrayList(3);
+								StretchLinesISCount=new ArrayList(3);
+							}
+						}
+					}
+					iRepeatCount++;
+				} while (bRepeat && iRepeatCount<2);
+			}
+
+			if(m_EqualButtonSize)
+			{
+				// Make all buttons same width, do the same thing as loop above
+				iX=paddingLeft+m_Rect.Left;
+				iY=paddingTop+m_Rect.Top;
+				iWidth=0;
+				iHeight=0;
+				bDisplayed=true;
+				iLines=0;
+				bAdjustSize=false;  // Size will be adjusted reset
+				iDisplayed=0;
+
+				// Reset alignment collections since new iteration can cause different lines
+				if(FarAlignLines!=null && FarAlignLines.Count>0)
+					FarAlignLines=new ArrayList(3);
+				// Reset stretch collection for same reason
+				if(StretchLines!=null && StretchLines.Count>0)
+				{
+					StretchLines=new ArrayList(3);
+					StretchLinesISCount=new ArrayList(3);
+				}
+
+				for (int iCurrentItem=0;iCurrentItem<m_SubItems.Count;iCurrentItem++)
+				{
+					objItem=m_SubItems[iCurrentItem] as BaseItem;
+					if(objItem!=null && objItem.Visible)
+					{
+						if((objItem.SupportedOrientation==eSupportedOrientation.Horizontal && m_Orientation==eOrientation.Vertical) || (objItem.SupportedOrientation==eSupportedOrientation.Vertical && m_Orientation==eOrientation.Horizontal))
+						{
+							objItem.Displayed=false;
+							continue;
+						}
+                        int itemSpacing = (iDisplayed > 1 || m_FirstItemSpacing == 0) ? m_ItemSpacing : m_FirstItemSpacing;
+						if(objItem.SystemItem)
+						{
+							if(m_Orientation==eOrientation.Vertical)
+								objItem.WidthInternal=iMaxItemWidth;
+							else
+								objItem.HeightInternal=iMaxItemHeight;
+						}
+						else
+						{
+							objItem.WidthInternal=iMaxItemWidth;
+							objItem.HeightInternal=iMaxItemHeight;
+						}
+
+						switch(m_Orientation)
+						{
+							case eOrientation.Horizontal:
+							{
+								// Wrap to next line if needed
+								if(m_WrapItems)
+								{
+									if(objItem.BeginGroup)
+										iX+=iGroupLineSize;
+                                    if (iX + objItem.WidthInternal + itemSpacing > m_Rect.Right && iX > paddingLeft + paddingRight)
+									{
+                                        iY += (iMaxItem + itemSpacing);
+										if(objItem.BeginGroup)
+											iY+=iGroupLineSize;
+										iX=paddingLeft+m_Rect.Left;
+										iMaxItem=0;
+										iLines++;
+
+										if(FarAlignItems!=null)
+											FarAlignItems=null;
+										if(ItemsToStretch!=null)
+											ItemsToStretch=null;
+									}
+								}
+								else if(bDisplayed)
+								{
+									if(objItem.BeginGroup)
+										iX+=iGroupLineSize;
+									// If not wrapping then make sure that items fits into one line, otherwise we need to display the mark that lets them see the rest
+                                    if (iX + objItem.WidthInternal + itemSpacing > m_Rect.Right && iX > paddingLeft + m_Rect.Left || (iX + objItem.WidthInternal + itemSpacing + DisplayMoreItem.FixedSize > m_Rect.Right && iCurrentItem + 1 < m_SubItems.Count && iVisible < iVisibleCount))
+									{
+										// Items don't fit any more the rest won't be visible
+                                        iX += (itemSpacing + DisplayMoreItem.FixedSize);
+                                        bDisplayed=false;
+									}
+								}
+								
+								if(bDisplayed)
+								{
+									objItem.LeftInternal=iX;
+									objItem.TopInternal=iY;
+                                    iX += objItem.WidthInternal + itemSpacing;
+									if(objItem.HeightInternal>iMaxItem)
+									{
+										iMaxItem=objItem.HeightInternal;
+									}
+								}
+								break;
+							}
+							case eOrientation.Vertical:
+							{
+								// Wrap to next line if needed
+								if(m_WrapItems)
+								{
+                                    if (iY + objItem.HeightInternal + itemSpacing > m_Rect.Bottom && iY > paddingTop + paddingBottom)
+									{
+                                        iX += (iMaxItem + itemSpacing);
+										iY=paddingTop+m_Rect.Top;
+										iMaxItem=0;
+										iLines++;
+
+										if(FarAlignItems!=null)
+											FarAlignItems=null;
+										if(ItemsToStretch!=null)
+											ItemsToStretch=null;
+									}
+								}
+								else if(bDisplayed)
+								{
+									// If not wrapping then make sure that items fits into one line, otherwise we need to display the mark that lets them see the rest
+                                    if (iY + objItem.HeightInternal + itemSpacing > m_Rect.Bottom && iY > paddingTop + m_Rect.Top || (iY + objItem.HeightInternal + itemSpacing + DisplayMoreItem.FixedSize > m_Rect.Bottom && iCurrentItem + 1 < m_SubItems.Count && iVisible < iVisibleCount))
+									{
+										// Items don't fit any more the rest won't be visible
+                                        iY += (itemSpacing + DisplayMoreItem.FixedSize);
+                                        bDisplayed=false;
+									}
+								}
+								
+								if(bDisplayed)
+								{
+									objItem.LeftInternal=iX;
+									objItem.TopInternal=iY;
+                                    iY += objItem.HeightInternal + itemSpacing;
+									if(objItem.WidthInternal>iMaxItem)
+									{
+										iMaxItem=objItem.WidthInternal;
+									}
+								}
+								break;
+							}
+							default:
+								break;
+						}
+						objItem.Displayed=bDisplayed;
+						if(bDisplayed)
+							iDisplayed++;
+
+						// Save right (Far) aligned items so we can adjust thiere position at the end
+						if(bDisplayed && FarAlignLines!=null && objItem.ItemAlignment==eItemAlignment.Far || FarAlignItems!=null)
+						{
+							if(FarAlignItems==null)
+							{
+								FarAlignItems=new Stack();
+								FarAlignLines.Add(FarAlignItems);
+							}
+							FarAlignItems.Push(objItem);
+							// no stretch after item has been far aligned
+							StretchLines=null;
+						}
+
+						// Save Items that we need to stretch, but not after item is far aligned
+						if(bDisplayed && objItem.Stretch && StretchLines!=null || ItemsToStretch!=null)
+						{
+							if(ItemsToStretch==null)
+							{
+								ItemsToStretch=new ArrayList(5);
+								StretchLines.Add(ItemsToStretch);
+								StretchLinesISCount.Add(0);
+							}
+							ItemsToStretch.Add(objItem);
+							if(objItem.Stretch)
+								StretchLinesISCount[StretchLinesISCount.Count-1]=(int)StretchLinesISCount[StretchLinesISCount.Count-1]+1;
+						}
+
+						// Track the size if this container
+						if(iX>iWidth)
+							iWidth=iX;
+						if(iY>iHeight)
+							iHeight=iY;
+					}
+				}
+			}
+
+			m_DisplayedItems=iDisplayed;
+
+            if (_FillsContainerControl)
+            {
+                if (m_Orientation == eOrientation.Vertical)
+                    iMaxItemWidth = m_Rect.Width - paddingLeft;
+                else
+                    iMaxItemHeight = m_Rect.Height - paddingTop;
+                bAdjustSize = true;
+            }
+
+            if (bAdjustSize)
+			{
+				if(m_Orientation==eOrientation.Vertical)
+				{
+					foreach(BaseItem objTmp in this.SubItems)
+					{
+						if(m_EventHeight)
+							objTmp.WidthInternal=iMaxItemWidth;
+                        else if (m_ToolbarItemsAlign == eContainerVerticalAlignment.Bottom)
+							objTmp.LeftInternal+=(iMaxItemWidth-objTmp.WidthInternal);
+                        else if (m_ToolbarItemsAlign == eContainerVerticalAlignment.Middle)
+                            objTmp.LeftInternal += (iMaxItemWidth - objTmp.WidthInternal) / 2;
+					}
+				}
+				else
+				{
+					foreach(BaseItem objTmp in this.SubItems)
+					{
+                        if (m_EventHeight)
+                            objTmp.HeightInternal = iMaxItemHeight;
+                        else if (m_ToolbarItemsAlign == eContainerVerticalAlignment.Bottom)
+                            objTmp.TopInternal += (iMaxItemHeight - objTmp.HeightInternal);
+                        else if (m_ToolbarItemsAlign == eContainerVerticalAlignment.Middle && iMaxItemHeight != objTmp.HeightInternal)
+                            objTmp.TopInternal += (int)Math.Ceiling((float)(iMaxItemHeight - objTmp.HeightInternal) / 2) /*+ 1*/;
+					}
+				}
+			}
+
+			// Add max width or height depending on arrange type...
+			switch(m_Orientation)
+			{
+				case eOrientation.Horizontal:
+				{
+					iHeight+=iMaxItem;
+					break;
+				}
+				case eOrientation.Vertical:
+				{
+					iWidth+=iMaxItem;
+					break;
+				}
+				default:
+					break;
+			}
+
+			if(this.Stretch)
+			{
+				if(m_Orientation==eOrientation.Horizontal)
+				{
+					m_Rect.Height=iHeight+paddingBottom-m_Rect.Top;
+
+					// Only if suggested Width is less than our width change it
+					// This will disable stretchable items support for wrapable containers, every line width
+					// would have to be tracked so stretchable items can work
+					if(StretchLines!=null && StretchLines.Count>0)
+						StretchItems(StretchLines,StretchLinesISCount,iWidth+paddingRight-m_Rect.Left);
+					if(m_Rect.Width<iWidth+ paddingRight -m_Rect.Left)
+						m_Rect.Width=iWidth+ paddingRight -m_Rect.Left;
+					//else if(StretchLines!=null && StretchLines.Count>0)
+					//	StretchItems(StretchLines,StretchLinesISCount,iWidth+m_PaddingRight-m_Rect.Left);
+				}
+				else if(m_Orientation==eOrientation.Vertical)
+				{
+					m_Rect.Width=iWidth+paddingRight-m_Rect.Left;
+
+					if(StretchLines!=null && StretchLines.Count>0)
+						StretchItems(StretchLines,StretchLinesISCount,iHeight+paddingBottom-m_Rect.Top);
+					// Only if suggested Height is less than our height change it
+					if(m_Rect.Height<iHeight+paddingBottom-m_Rect.Top)
+						m_Rect.Height=iHeight+paddingBottom-m_Rect.Top;
+					//else if(StretchLines!=null && StretchLines.Count>0)
+					//	StretchItems(StretchLines,StretchLinesISCount,iHeight+m_PaddingBottom-m_Rect.Top);
+				}
+				else
+				{
+					m_Rect.Width=iWidth+paddingRight-m_Rect.Left;
+					m_Rect.Height=iHeight+paddingBottom-m_Rect.Top;
+				}
+			}
+			else
+			{
+				// If all items did not fit and we are not wrapping take suggested sizes
+				if(!m_WrapItems && !bDisplayed)
+				{
+					// Horizontal, just adjust Height, we will honor width
+					if(m_Orientation==eOrientation.Horizontal)
+						m_Rect.Height=iHeight+paddingBottom-m_Rect.Top;
+					else if(m_Orientation==eOrientation.Vertical)
+						m_Rect.Width=iWidth+paddingRight-m_Rect.Left;
+				}
+				else
+				{
+					// If there are no items take suggested width by container control
+					if(m_DisplayedItems>0)
+					{
+						m_Rect.Width=iWidth+paddingRight-m_Rect.Left;
+						m_Rect.Height=iHeight+paddingBottom-m_Rect.Top;
+					}
+					/*else
+					{
+						m_Rect.Width=m_PaddingLeft+m_PaddingRight;
+						m_Rect.Height=m_PaddingTop+m_PaddingBottom;
+					}*/
+				}
+			}
+
+			// If we don't wrap and there are items left to display
+			if(!m_WrapItems && !bDisplayed && m_UseMoreItemsButton)
+				CreateMoreItemsButton(isRightToLeft);
+			else if(m_MoreItems!=null)
+			{
+				// Clean up, we don't need this anymore
+				m_MoreItems.Dispose();
+				m_MoreItems=null;
+			}
+
+			// Align Items if needed
+			if(FarAlignLines!=null && FarAlignLines.Count>0)
+				AlignItemsFar(FarAlignLines);
+
+            if (isRightToLeft && m_Orientation == eOrientation.Horizontal)
+                MirrorPositionItems();
+			
+			m_NeedRecalcSize=false;
+			if(m_Parent!=null)
+			{
+				m_Parent.SubItemSizeChanged(this);
+			}
+		}
+
+        protected virtual int GetItemLayoutX(BaseItem objItem, int iX)
+        {
+            return iX;
+        }
+
+        protected virtual int GetItemLayoutY(BaseItem objItem, int iY)
+        {
+            return iY;
+        }
+
+        protected virtual int GetItemLayoutHeight(BaseItem objItem)
+        {
+            return objItem.HeightInternal;
+        }
+
+        protected virtual int GetItemLayoutWidth(BaseItem objItem)
+        {
+            return objItem.WidthInternal;
+        }
+
+        protected virtual bool OnBeforeLayout()
+        {
+            return true;
+        }
+
+        protected void MirrorPositionItems()
+        {
+            Rectangle bounds = this.DisplayRectangle;
+            foreach (BaseItem item in this.SubItems)
+            {
+                item.LeftInternal = bounds.Right - ((item.DisplayRectangle.X-bounds.X) + item.DisplayRectangle.Width);
+            }
+        }
+
+		private void RecalcSizeTaskList()
+		{
+		    int paddingTop = Dpi.Width(m_PaddingTop);
+		    int paddingLeft = Dpi.Height(m_PaddingLeft);
+		    int iX=m_Rect.Left+paddingLeft, iY=m_Rect.Top+paddingTop, iMaxItemWidth=0, iMaxItemHeight=0;
+			int iWidth=0, iHeight=0;
+			int iGroupLineSize=3;
+			bool bDisplayed=true;
+			int iDisplayed=0;
+			Stack FarAlignItems=null;
+
+            if (EffectiveStyle == eDotNetBarStyle.Office2000)
+				iGroupLineSize=6;
+
+			if(m_EqualButtonSize)
+			{
+				foreach(BaseItem item in m_SubItems)
+				{
+					item.Orientation=eOrientation.Horizontal;
+					item.RecalcSize();
+					if(item.WidthInternal>iMaxItemWidth)
+						iMaxItemWidth=item.WidthInternal;
+					if(item.HeightInternal>iMaxItemHeight)
+						iMaxItemHeight=item.HeightInternal;
+				}
+			}
+
+            for(int iCurrentItem=0;iCurrentItem<m_SubItems.Count;iCurrentItem++)
+			{
+				BaseItem objItem=m_SubItems[iCurrentItem] as BaseItem;
+				objItem.Orientation=eOrientation.Horizontal;
+				if(objItem==null || !objItem.Visible)
+					continue;
+
+				if(!m_EqualButtonSize)
+					objItem.RecalcSize();
+				
+				if(objItem.BeginGroup && iDisplayed>0)
+					iY+=iGroupLineSize;
+
+				if(!m_EqualButtonSize)
+				{
+					if(objItem.WidthInternal>iMaxItemWidth)
+						iMaxItemWidth=objItem.WidthInternal;
+					if(objItem.HeightInternal>iMaxItemHeight)
+						iMaxItemHeight=objItem.HeightInternal;
+				}
+				else
+				{
+					objItem.WidthInternal=iMaxItemWidth;
+					objItem.HeightInternal=iMaxItemHeight;
+				}
+
+				objItem.TopInternal=iY;
+				objItem.LeftInternal=iX;
+				iY+=objItem.HeightInternal;
+				objItem.Displayed=bDisplayed;
+				if(!bDisplayed)
+					continue;
+
+				if(iY>m_Rect.Bottom)
+				{
+					bDisplayed=false;
+					FarAlignItems=null;
+					objItem.Displayed=false;
+					continue;
+				}
+
+				if(FarAlignItems!=null && FarAlignItems.Count>0)
+					FarAlignItems.Push(objItem);
+
+				iDisplayed++;
+				if(objItem.ItemAlignment==eItemAlignment.Far)
+				{
+					if(FarAlignItems==null)
+						FarAlignItems=new Stack(10);
+					FarAlignItems.Push(objItem);
+				}
+			}
+		    int paddingRight = Dpi.Width(m_PaddingRight);
+		    iWidth=iMaxItemWidth+paddingLeft+paddingRight;
+		    int paddingBottom = Dpi.Width(m_PaddingBottom);
+		    iHeight=iY+paddingBottom-m_Rect.Top;
+			m_DisplayedItems=iDisplayed;
+			if(this.Stretch)
+			{
+				if(bDisplayed && FarAlignItems!=null && FarAlignItems.Count>0)
+				{
+					// We need to move "far" align items to the appropriate position at the bottom
+					AlignItemsFar(FarAlignItems, eOrientation.Vertical); // Vertical becouse this is "vertical layout"
+				}
+				Bar bar=this.ContainerControl as Bar;
+				if(bar==null || bar!=null && bar.DockSide!=eDockSide.Top && bar.DockSide!=eDockSide.Bottom)
+					m_Rect.Width=iWidth;
+				if(m_Rect.Height<iHeight)
+				{
+					if(m_Rect.Height<36)
+						m_Rect.Height=36;
+					// We need to scroll content
+					m_Scroll=true;
+					RepositionItems();
+				}
+				else
+				{
+					m_Scroll=false;
+					m_ScrollTopPosition=0;
+				}
+			}
+			else
+			{
+				m_Rect.Width=iWidth;
+				if(m_Rect.Height>iHeight && bDisplayed)
+					m_Rect.Height=iHeight;
+				if(!bDisplayed)
+				{
+					if(m_Rect.Height<36)
+						m_Rect.Height=36;
+					// We need to scroll content
+					m_Scroll=true;
+					RepositionItems();
+				}
+				else
+				{
+					m_Scroll=false;
+					m_ScrollTopPosition=0;
+				}
+			}
+
+			if(m_MoreItems!=null)
+			{
+				m_MoreItems.Dispose();
+				m_MoreItems=null;
+			}
+            
+			SetupScrollButtons();
+		}
+		private int GroupLineSize
+		{
+			get
+			{
+                if (EffectiveStyle == eDotNetBarStyle.Office2000)
+					return 6;
+				return 3;
+			}
+		}
+		private void RepositionItems()
+		{
+			int iTop=0;
+			int iDisplayed=0;
+			int iGroupLineSize=this.GroupLineSize;
+			bool bDisplayed=true;
+			m_TopScroll=false;
+			m_BottomScroll=false;
+
+			// Move "invisible" items up
+			for(int i=m_ScrollTopPosition-1;i>=0;i--)
+			{
+				BaseItem objItem=m_SubItems[i];
+				if(!objItem.Visible)
+					continue;
+				iTop-=objItem.HeightInternal;
+				objItem.TopInternal=iTop;
+				objItem.Displayed=false;
+				if(objItem.BeginGroup && i>0)
+					iTop-=iGroupLineSize;
+			}
+			// Move visible items down
+			iTop=m_Rect.Top;
+			for(int i=m_ScrollTopPosition;i<m_SubItems.Count;i++)
+			{
+                BaseItem objItem=m_SubItems[i];
+				if(!objItem.Visible)
+					continue;
+				objItem.Displayed=bDisplayed;
+				if(!bDisplayed)
+					continue;
+				if(objItem.BeginGroup && iDisplayed>0)
+					iTop+=iGroupLineSize;
+				objItem.TopInternal=iTop;
+				iTop+=objItem.HeightInternal;
+				if(iTop>m_Rect.Bottom)
+				{
+					objItem.Displayed=false;
+					bDisplayed=false;
+					continue;
+				}
+				iDisplayed++;
+			}
+
+			m_DisplayedItems=iDisplayed;
+
+			if(!bDisplayed)
+				m_BottomScroll=true;
+			if(m_ScrollTopPosition>0)
+				m_TopScroll=true;
+		}
+
+		private void SetupScrollButtons()
+		{
+			bool bDestroyTop=false,bDestroyBottom=false;
+			if(!m_Scroll)
+			{
+				bDestroyTop=true;
+				bDestroyBottom=true;
+			}
+			else
+			{
+				if(!m_TopScroll)
+					bDestroyTop=true;
+				if(!m_BottomScroll)
+					bDestroyBottom=true;
+			}
+			if(bDestroyTop)
+			{
+				if(m_TopScrollButton!=null)
+				{
+					if(m_TopScrollButton.Parent!=null)
+						m_TopScrollButton.Parent.Controls.Remove(m_TopScrollButton);
+					m_TopScrollButton.Dispose();
+					m_TopScrollButton=null;
+				}
+			}
+			else
+			{
+				if(m_TopScrollButton==null)
+				{
+					System.Windows.Forms.Control ctrl=this.ContainerControl as System.Windows.Forms.Control;
+					if(ctrl!=null)
+					{
+						m_TopScrollButton=new ScrollButton();
+						m_TopScrollButton.Orientation=eOrientation.Vertical;
+						m_TopScrollButton.ButtonAlignment=eItemAlignment.Near;
+						ctrl.Controls.Add(m_TopScrollButton);
+						m_TopScrollButton.Click+=new EventHandler(ScrollClick);
+					}
+				}
+				if(m_TopScrollButton!=null)
+				{
+					m_TopScrollButton.Location=m_Rect.Location;
+					m_TopScrollButton.Size=new Size(m_Rect.Width,10);
+					m_TopScrollButton.BringToFront();
+				}
+			}
+
+			if(bDestroyBottom)
+			{
+				if(m_BottomScrollButton!=null)
+				{
+					if(m_BottomScrollButton.Parent!=null)
+						m_BottomScrollButton.Parent.Controls.Remove(m_BottomScrollButton);
+					m_BottomScrollButton.Dispose();
+					m_BottomScrollButton=null;
+				}
+			}
+			else
+			{
+				if(m_BottomScrollButton==null)
+				{
+					System.Windows.Forms.Control ctrl=this.ContainerControl as System.Windows.Forms.Control;
+					if(ctrl!=null)
+					{
+						m_BottomScrollButton=new ScrollButton();
+						m_BottomScrollButton.Orientation=eOrientation.Vertical;
+						m_BottomScrollButton.ButtonAlignment=eItemAlignment.Far;
+						ctrl.Controls.Add(m_BottomScrollButton);
+						m_BottomScrollButton.Click+=new EventHandler(ScrollClick);
+					}
+				}
+				if(m_BottomScrollButton!=null)
+				{
+					m_BottomScrollButton.Location=new Point(m_Rect.X,m_Rect.Bottom-10);
+					m_BottomScrollButton.Size=new Size(m_Rect.Width,10);
+					m_BottomScrollButton.BringToFront();
+				}
+			}
+		}
+
+		private void ScrollClick(object sender, EventArgs e)
+		{
+			if(sender==m_TopScrollButton)
+			{
+				m_ScrollTopPosition--;
+			}
+			else
+			{
+				m_ScrollTopPosition++;
+			}
+			RepositionItems();
+			SetupScrollButtons();
+			this.Refresh();
+		}
+
+		private void AlignItemsFar(Stack FarAlignItems, eOrientation orientation)
+		{
+			int iPos=0;
+			int iGroupLineSize=this.GroupLineSize;
+			if(orientation==eOrientation.Horizontal)
+			{
+			    int paddingRight = Dpi.Width(m_PaddingRight);
+			    iPos=m_Rect.Right-paddingRight;
+				if(m_MoreItems!=null)
+					iPos-=m_MoreItems.WidthInternal;
+				while(FarAlignItems.Count>0)
+				{
+					BaseItem objItem=FarAlignItems.Pop() as BaseItem;
+					if(objItem.Displayed && objItem.Visible)
+					{
+						objItem.LeftInternal=iPos- GetItemLayoutWidth(objItem);
+						iPos=objItem.LeftInternal-m_ItemSpacing;
+						if(objItem.BeginGroup)
+							iPos-=iGroupLineSize;
+					}
+				}
+			}
+			else
+			{
+			    int paddingBottom = Dpi.Height(m_PaddingBottom);
+			    iPos=m_Rect.Bottom-paddingBottom;
+				if(m_MoreItems!=null)
+					iPos-=m_MoreItems.HeightInternal;
+				while(FarAlignItems.Count>0)
+				{
+					BaseItem objItem=FarAlignItems.Pop() as BaseItem;
+					if(objItem.Displayed && objItem.Visible)
+					{
+						objItem.TopInternal=iPos-GetItemLayoutHeight(objItem);
+						iPos=objItem.TopInternal-m_ItemSpacing;
+						if(objItem.BeginGroup)
+							iPos-=iGroupLineSize;
+					}
+				}
+			}
+		}
+		private void AlignItemsFar(ArrayList FarAlignLines, eOrientation orientation)
+		{
+			if(orientation==eOrientation.Horizontal)
+			{
+				foreach(Stack FarAlignItems in FarAlignLines)
+					AlignItemsFar(FarAlignItems,orientation);
+			}
+			else
+			{
+				foreach(Stack FarAlignItems in FarAlignLines)
+					AlignItemsFar(FarAlignItems,orientation);
+			}
+		}
+		private void AlignItemsFar(ArrayList FarAlignLines)
+		{
+			AlignItemsFar(FarAlignLines, this.Orientation);
+		}
+
+		private void StretchItems(ArrayList StretchLines, ArrayList StretchLinesISCount, int CalculatedSize)
+		{
+            int iOffset=0;
+            int iStretch=0;
+			for(int i=0;i<StretchLines.Count;i++)
+			{
+				ArrayList StretchLine=StretchLines[i] as ArrayList;
+				if(m_Orientation==eOrientation.Horizontal)
+					iStretch=(this.WidthInternal-CalculatedSize)/(int)StretchLinesISCount[i];
+				else
+					iStretch=(this.HeightInternal-CalculatedSize)/(int)StretchLinesISCount[i];
+
+				foreach(BaseItem objItem in StretchLine)
+				{
+					if(objItem.Stretch)
+					{
+						if(m_Orientation==eOrientation.Horizontal)
+						{
+							objItem.LeftInternal+=iOffset;
+							objItem.WidthInternal+=iStretch;
+						}
+						else
+						{
+							objItem.TopInternal+=iOffset;
+							objItem.HeightInternal+=iStretch;
+						}
+						iOffset+=iStretch;
+					}
+					else
+					{
+						if(m_Orientation==eOrientation.Horizontal)
+							objItem.LeftInternal+=iOffset;
+						else
+							objItem.TopInternal+=iOffset;
+					}
+				}
+			}
+		}
+
+        protected virtual void CreateMoreItemsButton(bool isRightToLeft)
+		{
+			if(m_MoreItems==null)
+			{
+				m_MoreItems=new DisplayMoreItem();
+				m_MoreItems.Style=m_Style;
+				m_MoreItems.SetParent(this);
+				m_MoreItems.ThemeAware=this.ThemeAware;
+			}
+			if(m_MoreItemsOnMenu)
+				m_MoreItems.PopupType=ePopupType.Menu;
+			else
+                m_MoreItems.PopupType=ePopupType.ToolBar;
+			m_MoreItems.Orientation=m_Orientation;
+			m_MoreItems.Displayed=true;
+
+			if(m_Orientation==eOrientation.Vertical)
+			{
+			    int paddingLeft = Dpi.Width(m_PaddingLeft);
+			    int paddingRight = Dpi.Width(m_PaddingRight);
+			    m_MoreItems.WidthInternal=m_Rect.Width-(paddingLeft+paddingRight);
+				m_MoreItems.RecalcSize();
+			}
+			else
+			{
+			    int paddingTop = Dpi.Width(m_PaddingTop);
+			    int paddingBottom = Dpi.Height(m_PaddingBottom);
+			    m_MoreItems.HeightInternal=m_Rect.Height-(paddingTop+paddingBottom);
+				m_MoreItems.RecalcSize();
+			}
+
+            Point loc = GetMoreItemsLocation(isRightToLeft);
+            m_MoreItems.LeftInternal = loc.X;
+            m_MoreItems.TopInternal = loc.Y;
+		}
+
+        protected virtual Point GetMoreItemsLocation(bool isRightToLeft)
+        {
+            if (m_MoreItems == null)
+                return Point.Empty;
+            Point p = Point.Empty;
+            int paddingLeft = Dpi.Width(m_PaddingLeft);
+            if (m_Orientation == eOrientation.Vertical)
+            {
+                p.X = m_Rect.Left + paddingLeft;
+                int paddingBottom = Dpi.Height(m_PaddingBottom);
+                p.Y = m_Rect.Bottom - m_MoreItems.HeightInternal - paddingBottom;
+            }
+            else
+            {
+                if (isRightToLeft)
+                {
+                    p.X = m_Rect.X + paddingLeft;
+                }
+                else
+                {
+                    int paddingRight = Dpi.Width(m_PaddingRight);
+                    p.X = m_Rect.Right - m_MoreItems.WidthInternal - paddingRight;
+                }
+                p.Y = m_Rect.Top + Dpi.Height(m_PaddingTop);
+            }
+
+            return p;
+        }
+
+		/// <summary>
+		/// This must be called by child item to let the parent know that its size
+		/// has been changed.
+		/// </summary>
+		public override void SubItemSizeChanged(BaseItem objChildItem)
+		{
+			//if(!objChildItem.Visible || !objChildItem.Displayed)
+			//{
+			//	return;
+			//}
+			NeedRecalcSize=true;
+			if(this.Displayed)
+			{
+				if(m_Parent==null)
+				{
+					if(this.ContainerControl is Bar)
+						((Bar)this.ContainerControl).RecalcLayout();
+					else if(this.ContainerControl is MenuPanel)
+						((MenuPanel)this.ContainerControl).RecalcSize();
+				}
+				else
+					m_Parent.SubItemSizeChanged(this);
+			}
+			else
+			{
+				if(m_Parent==null)
+					this.RecalcSize();
+				else
+					m_Parent.SubItemSizeChanged(this);
+			}
+		}
+
+		public override void InternalMouseHover()
+		{
+			if(m_MoreItems!=null && m_MoreItems.Expanded && m_HotSubItem!=m_MoreItems && this.DesignMode)
+			{
+				m_MoreItems.Expanded=false;
+			}
+			base.InternalMouseHover();
+		}
+
+		public override void InternalMouseDown(System.Windows.Forms.MouseEventArgs objArg)
+		{
+			if(m_MoreItems!=null && m_MoreItems.Expanded && m_HotSubItem!=m_MoreItems && !this.DesignMode)
+			{
+				m_MoreItems.Expanded=false;
+			}
+			base.InternalMouseDown(objArg);
+		}
+
+		/// <summary>
+		/// Occurs when the mouse pointer is over the item and a mouse button is released. This is used by internal implementation only.
+		/// </summary>
+		[System.ComponentModel.Browsable(false),System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+		public override void InternalMouseUp(System.Windows.Forms.MouseEventArgs objArg)
+		{
+			base.InternalMouseUp(objArg);
+			if(m_HotSubItem==null && (this.IsOnMenuBar || this.LayoutType==eLayoutType.Toolbar))
+			{
+				BaseItem expanded=this.ExpandedItem();
+				if(expanded!=null && expanded is PopupItem)
+					expanded.InternalMouseUp(objArg);
+			}
+		}
+
+		public override void InternalMouseMove(System.Windows.Forms.MouseEventArgs objArg)
+		{
+			if(m_IgnoreDuplicateMouseMove)
+			{
+				if(m_LastMouseMoveEvent==null)
+				{
+					m_LastMouseMoveEvent=new System.Windows.Forms.MouseEventArgs(objArg.Button,objArg.Clicks,objArg.X,objArg.Y,objArg.Delta);
+					return;
+				}
+				if(m_LastMouseMoveEvent.X!=objArg.X || m_LastMouseMoveEvent.Y!=objArg.Y ||
+					m_LastMouseMoveEvent.Button!=objArg.Button)
+				{
+					m_IgnoreDuplicateMouseMove=false;
+					m_LastMouseMoveEvent=null;
+				}
+				else
+					return;
+			}
+
+			//DotNetBarManager owner=this.GetOwner();
+			//if(!this.DesignMode && owner!=null && owner.GetFocusItem()!=null)
+			//	return;
+
+			// Call base implementation if we don't have the more items button
+			if(m_MoreItems==null || !m_MoreItems.DisplayRectangle.Contains(objArg.X,objArg.Y) || this.DesignMode)
+			{
+				bool bMenuBar=this.IsOnMenuBar;
+                if (bMenuBar || this.LayoutType == eLayoutType.Toolbar)
+                {
+                    BaseItem expanded = this.ExpandedItem();
+                    if (expanded != null)
+                        expanded.InternalMouseMove(objArg);
+                    m_CheckMouseMovePressed = true;
+                }
+                else
+                    m_CheckMouseMovePressed = false;
+				
+				if(objArg.Button==System.Windows.Forms.MouseButtons.None || this.DesignMode || (bMenuBar || this.LayoutType==eLayoutType.Toolbar))
+					base.InternalMouseMove(objArg);
+
+				return;
+			}
+			// Mouse is over our more items button
+			BaseItem objNew=m_MoreItems;
+			if(objNew!=m_HotSubItem)
+			{
+				if(m_HotSubItem!=null)
+				{
+					m_HotSubItem.InternalMouseLeave();
+					//if(objNew!=null && m_AutoExpand && m_HotSubItem.Expanded)
+					if(objNew!=null && m_HotSubItem.Expanded)
+						m_HotSubItem.Expanded=false;
+				}
+				
+				if(objNew!=null)
+				{
+					if(m_AutoExpand)
+					{
+						BaseItem objItem=ExpandedItem();
+						if(objItem!=null && objItem!=objNew)
+							objItem.Expanded=false;
+					}
+					objNew.InternalMouseEnter();
+					objNew.InternalMouseMove(objArg);
+                    if (m_AutoExpand && objNew.GetEnabled() && objNew.ShowSubItems)
+					{
+						if(objNew is PopupItem)
+						{
+							PopupItem pi=objNew as PopupItem;
+							ePopupAnimation oldAnim=pi.PopupAnimation;
+							pi.PopupAnimation=ePopupAnimation.None;
+							objNew.Expanded=true;
+                            pi.PopupAnimation=oldAnim;
+						}
+						else
+							objNew.Expanded=true;
+					}
+					m_HotSubItem=objNew;
+				}
+				else
+					m_HotSubItem=null;
+			}
+			else if(m_HotSubItem!=null)
+			{
+				m_HotSubItem.InternalMouseMove(objArg);
+			}
+		}
+
+		public override void InternalKeyDown(System.Windows.Forms.KeyEventArgs objArg)
+		{
+			base.InternalKeyDown(objArg);
+			if(SubItems.Count==0 || objArg.Handled)
+				return;
+
+			BaseItem objExpanded=this.ExpandedItem();
+
+			if(objExpanded!=null)
+			{
+				objExpanded.InternalKeyDown(objArg);
+				if(objArg.Handled)
+					return;
+			}
+			
+			if(objArg.KeyCode==System.Windows.Forms.Keys.Right || objArg.KeyCode==System.Windows.Forms.Keys.Tab || objArg.KeyCode==System.Windows.Forms.Keys.Left)
+			{
+				m_IgnoreDuplicateMouseMove=true;
+				// Select next object
+				if(m_HotSubItem!=null)
+				{
+					m_HotSubItem.InternalMouseLeave();
+					if(m_AutoExpand && m_HotSubItem.Expanded)
+					{
+						m_HotSubItem.Expanded=false;
+					}
+				}
+				if(objArg.KeyCode==System.Windows.Forms.Keys.Left)
+				{
+					int iIndex=0;
+					if(m_HotSubItem!=null)
+						iIndex=this.SubItems.IndexOf(m_HotSubItem)-1;
+					if(iIndex<0)
+						iIndex=this.SubItems.Count-1;
+					BaseItem objNew=null;
+					bool bRepeat=false;
+					do
+					{
+						for(int i=iIndex;i>=0;i--)
+						{
+							objNew=this.SubItems[i];
+                            if (objNew.Visible && objNew.GetEnabled())
+							{
+								iIndex=i;
+								break;
+							}
+						}
+                        if (!this.SubItems[iIndex].Visible || !this.SubItems[iIndex].GetEnabled())
+						{
+							if(!bRepeat)
+							{
+								iIndex=this.SubItems.Count-1;
+								bRepeat=true;
+							}
+							else
+								bRepeat=false;
+						}
+						else
+							bRepeat=false;
+					} while(bRepeat);
+					m_HotSubItem=this.SubItems[iIndex];
+				}
+				else
+				{
+					int iIndex=0;
+					if(m_HotSubItem!=null)
+						iIndex=this.SubItems.IndexOf(m_HotSubItem)+1;
+                    while (iIndex < this.SubItems.Count && (!this.SubItems[iIndex].Visible || !this.SubItems[iIndex].GetEnabled()))
+						iIndex++;
+					if(iIndex>=this.SubItems.Count)
+						iIndex=0;
+					BaseItem objNew=null;
+					for(int i=iIndex;i<this.SubItems.Count;i++)
+					{
+						objNew=this.SubItems[i];
+                        if (objNew.Visible && objNew.GetEnabled())
+						{
+							iIndex=i;
+							break;
+						}
+					}
+					m_HotSubItem=this.SubItems[iIndex];
+				}
+
+				m_HotSubItem.InternalMouseEnter();
+                m_HotSubItem.InternalMouseMove(new MouseEventArgs(MouseButtons.None, 0, m_HotSubItem.LeftInternal + 2, m_HotSubItem.TopInternal + 2, 0));
+                //if(m_AutoExpand)
+                //{
+					BaseItem objItem=this.ExpandedItem();
+					if(objItem!=null && objItem!=m_HotSubItem)
+						objItem.Expanded=false;
+				//}
+				if(m_AutoExpand && m_HotSubItem.ShowSubItems && (this.IsOnMenuBar || this.IsOnMenu && m_HotSubItem.SubItems.Count>0))
+				{
+					m_HotSubItem.Expanded=true;
+					if(m_HotSubItem is PopupItem && ((PopupItem)m_HotSubItem).PopupControl is MenuPanel)
+						((MenuPanel)((PopupItem)m_HotSubItem).PopupControl).SelectFirstItem();
+				}
+
+				objArg.Handled=true;
+			}
+            if (objArg.KeyCode == System.Windows.Forms.Keys.Down && this.IsOnMenuBar)
+            {
+                m_IgnoreDuplicateMouseMove = true;
+                // Select next object
+                if (m_HotSubItem != null && !m_HotSubItem.Expanded && m_HotSubItem.VisibleSubItems > 0)
+                    m_HotSubItem.Expanded = true;
+                
+            }
+            else if (objArg.KeyCode == System.Windows.Forms.Keys.Escape)
+            {
+                if (objExpanded != null)
+                {
+                    objExpanded.Expanded = false;
+                    objArg.Handled = true;
+                }
+                else
+                {
+                    Control cc = this.ContainerControl as Control;
+                    if (cc is Bar)
+                    {
+                        Bar bar = cc as Bar;
+                        if (bar.BarState == eBarState.Popup)
+                        {
+                            bar.ParentItem.Expanded = false;
+                        }
+                        else
+                        {
+                            if (this.AutoExpand)
+                                this.AutoExpand = false;
+                            else if (bar.Focused || bar.MenuFocus)
+                            {
+                                bar.MenuFocus = false;
+                                bar.ReleaseFocus();
+                            }
+                        }
+                        objArg.Handled = true;
+                    }
+                    else if (cc is ItemControl)
+                    {
+                        ItemControl ic = cc as ItemControl;
+                        if (this.AutoExpand)
+                            this.AutoExpand = false;
+                        else if (ic.Focused || ic.MenuFocus)
+                        {
+                            ic.MenuFocus = false;
+                            ic.ReleaseFocus();
+                        }
+                    }
+                }
+            }
+            else
+            {
+                BaseItem objItem = this.ExpandedItem();
+                if (objItem != null)
+                    objItem.InternalKeyDown(objArg);
+                else
+                {
+                    int key = 0;
+                    if (objArg.Shift)
+                    {
+                        try
+                        {
+                            byte[] keyState = new byte[256];
+                            if (NativeFunctions.GetKeyboardState(keyState))
+                            {
+                                byte[] chars = new byte[2];
+                                if (NativeFunctions.ToAscii((uint)objArg.KeyValue, 0, keyState, chars, 0) != 0)
+                                {
+                                    key = chars[0];
+                                }
+                            }
+                        }
+                        catch (Exception)
+                        {
+                            key = 0;
+                        }
+                    }
+
+                    if (key == 0)
+                        key = (int)NativeFunctions.MapVirtualKey((uint)objArg.KeyValue, 2);
+
+                    bool b = false;
+                    if (key > 0)
+                        b = AccessKeyDown(key);
+                    if (b)
+                        objArg.Handled = true;
+                    if (!b && m_HotSubItem != null)
+                        m_HotSubItem.InternalKeyDown(objArg);
+                }
+            }
+		}
+
+		// Checks whether Access key is pressed and expands item if it was. Applies to menu bar items only
+		// Assumes that NO item is expanded when call is made
+		private bool AccessKeyDown(int KeyCode)
+		{
+			char[] ch=new char[1];
+			byte[] by=new byte[1];
+			try
+			{
+				by[0]=System.Convert.ToByte(KeyCode);
+				System.Text.Encoding.Default.GetDecoder().GetChars(by,0,1,ch,0);
+			}
+			catch(Exception)
+			{
+				return false;
+			}
+			string s=ch[0].ToString();
+			if(s=="")
+				return false;
+			ch[0]=(s.ToLower())[0];
+			BaseItem expandedItem=this.ExpandedItem();
+			if(expandedItem!=null && expandedItem is PopupItem && ((PopupItem)expandedItem).PopupType==ePopupType.Menu)
+			{
+				System.Windows.Forms.KeyEventArgs ke=new System.Windows.Forms.KeyEventArgs((System.Windows.Forms.Keys)KeyCode);
+				expandedItem.InternalKeyDown(ke);
+				if(ke.Handled)
+				{
+					m_IgnoreDuplicateMouseMove=true;
+					return true;
+				}
+			}
+
+			foreach(BaseItem objItem in this.SubItems)
+			{
+                if (objItem.Visible && objItem.GetEnabled() && objItem.Displayed && objItem.AccessKey == ch[0])
+				{
+					if(objItem is ButtonItem && ((ButtonItem)objItem).ButtonStyle==eButtonStyle.Default && !this.IsOnMenuBar && !this.IsOnMenu)
+						continue;
+                    if (objItem.SubItems.Count > 0 && objItem.ShowSubItems && objItem.GetEnabled())
+					{
+						if(objItem.Expanded)
+						{
+							objItem.InternalKeyDown(new System.Windows.Forms.KeyEventArgs((System.Windows.Forms.Keys)KeyCode));
+						}
+						else
+							ExpandItem(objItem);
+					}
+					else
+						objItem.RaiseClick();
+					m_IgnoreDuplicateMouseMove=true;
+					return true;
+				}
+			}
+			return false;
+		}
+
+		internal bool SysKeyDown(int KeyCode)
+		{
+			return AccessKeyDown(KeyCode);
+//			char[] ch=new char[1];
+//			byte[] by=new byte[1];
+//			by[0]=System.Convert.ToByte(KeyCode);
+//			System.Text.Encoding.Default.GetDecoder().GetChars(by,0,1,ch,0);
+//			string s=ch[0].ToString();
+//			ch[0]=(s.ToLower())[0];
+//			foreach(BaseItem objItem in this.SubItems)
+//			{
+//				if(objItem.Displayed && objItem.AccessKey==ch[0])
+//				{
+//					if(!objItem.Expanded)
+//					{
+//						ExpandItem(objItem);
+////						// Set the focus here so it can be properly released...
+////						Bar bar=this.ContainerControl as Bar;
+////						if(bar!=null)
+////							bar.Focus();
+////						if(m_HotSubItem!=null)
+////							m_HotSubItem.InternalMouseLeave();
+////						m_HotSubItem=objItem;
+////						objItem.InternalMouseEnter();
+////						objItem.Expanded=true;
+////						if(objItem is PopupItem)
+////							this.AutoExpand=true;
+//					}
+//					return true;
+//				}
+//			}
+//			return false;
+		}
+
+		private void ExpandItem(BaseItem objItem)
+		{
+			// Set the focus here so it can be properly released...
+            Control cc = this.ContainerControl as Control;
+			//if(bar!=null && !bar.Focused) // Commented out to fix menu bar taking the focus
+			//	bar.Focus();
+            if (cc is Bar && !cc.Focused)
+                ((Bar)cc).MenuFocus = true;
+
+			if(m_HotSubItem!=null)
+				m_HotSubItem.InternalMouseLeave();
+			m_HotSubItem=objItem;
+			objItem.InternalMouseEnter();
+            objItem.InternalMouseMove(new MouseEventArgs(MouseButtons.None, 0, objItem.LeftInternal + 2, objItem.TopInternal + 2, 0));
+			objItem.Expanded=true;
+			if(objItem is PopupItem)
+			{
+				this.AutoExpand=true;
+				// If it is a menu select first menu item inside...
+				PopupItem popup=objItem as PopupItem;
+				if(popup.PopupType==ePopupType.Menu && popup.PopupControl is MenuPanel)
+				{
+					((MenuPanel)popup.PopupControl).SelectFirstItem();
+				}
+			}
+		}
+
+		public bool EqualButtonSize
+		{
+			get
+			{
+				return m_EqualButtonSize;
+			}
+			set
+			{
+				if(m_EqualButtonSize!=value)
+				{
+					m_EqualButtonSize=value;
+					NeedRecalcSize=true;
+				}
+			}
+		}
+
+		/*public bool Stretch
+		{
+			get
+			{
+				return m_Stretch;
+			}
+			set
+			{
+				if(m_Stretch!=value)
+				{
+					m_Stretch=value;
+					m_NeedRecalcSize=true;
+				}
+			}
+		}*/
+
+		public override void ContainerLostFocus(bool appLostFocus)
+		{
+            base.ContainerLostFocus(appLostFocus);
+			if(m_MoreItems!=null)
+                m_MoreItems.ContainerLostFocus(appLostFocus);
+			IOwnerMenuSupport ownersupport=this.GetOwner() as IOwnerMenuSupport;
+			if(this.IsOnMenuBar && ownersupport!=null)
+				ownersupport.PersonalizedAllVisible=false;
+				
+		}
+
+		/// <summary>
+		/// Called when item owner has changed.
+		/// </summary>
+		protected override void OnOwnerChanged()
+		{
+			base.OnOwnerChanged();
+			if(this.GetOwner() is Bar)
+			{
+				this.RefreshImageSize();
+			}
+		}
+
+		protected internal override void OnSubItemExpandChange(BaseItem objItem)
+		{
+			base.OnSubItemExpandChange(objItem);
+			if(objItem.Expanded)
+			{
+				foreach(BaseItem objExp in this.SubItems)
+				{
+					if(objExp!=objItem && objExp is PopupItem && objExp.Expanded)
+						objExp.Expanded=false;
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets a value indicating whether the item is expanded or not. For Popup items this would indicate whether the item is popped up or not.
+		/// </summary>
+		[System.ComponentModel.Browsable(false),System.ComponentModel.DefaultValue(false),System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
+		public override bool Expanded
+		{
+			get
+			{
+				return m_Expanded;
+			}
+			set
+			{
+				base.Expanded=value;
+				if(!value && this.ContainerControl is ItemControl)
+					BaseItem.CollapseSubItems(this);
+			}
+		}
+
+		internal void SetSystemFocus()
+		{
+			if(m_HotSubItem!=null || this.SubItems.Count==0)
+				return;
+
+            BaseItem exp = this.ExpandedItem();
+            if (exp != null)
+            {
+                m_HotSubItem = exp;
+                m_HotSubItem.InternalMouseEnter();
+                m_HotSubItem.InternalMouseMove(new MouseEventArgs(MouseButtons.None, 0, m_HotSubItem.LeftInternal + 2, m_HotSubItem.TopInternal + 2, 0));
+                return;
+            }
+
+			foreach(BaseItem objItem in this.SubItems)
+			{
+				if(!objItem.SystemItem && objItem.Displayed && objItem.Visible)
+				{
+					m_HotSubItem=objItem;
+					m_HotSubItem.InternalMouseEnter();
+                    m_HotSubItem.InternalMouseMove(new MouseEventArgs(MouseButtons.None, 0, m_HotSubItem.LeftInternal + 2, m_HotSubItem.TopInternal + 2, 0));
+					break;
+				}
+			}
+		}
+
+		internal void ReleaseSystemFocus()
+		{
+			CollapseSubItems(this);
+			if(m_HotSubItem!=null)
+			{
+                Control c = this.ContainerControl as Control;
+                if (c != null)
+                {
+                    Point p = c.PointToClient(Control.MousePosition);
+                    if (m_HotSubItem.DisplayRectangle.Contains(p))
+                        return;
+                }
+				m_HotSubItem.InternalMouseLeave();
+				m_HotSubItem=null;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets whether container is system container used internally by DotNetBar.
+		/// </summary>
+		[System.ComponentModel.Browsable(false),DevCoBrowsable(false),System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden),System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+		public bool SystemContainer
+		{
+			get
+			{
+				return m_SystemContainer;
+			}
+			set
+			{
+				m_SystemContainer=value;
+			}
+		}
+
+		public bool HaveCustomizeItem
+		{
+			get
+			{
+				return m_HaveCustomizeItem;
+			}
+		}
+
+		protected internal override void OnItemAdded(BaseItem objItem)
+		{
+			base.OnItemAdded(objItem);
+            if (ItemAdded != null)
+                ItemAdded(objItem, new EventArgs());
+			if(objItem is CustomizeItem)
+				m_HaveCustomizeItem=true;
+			else if(this.SystemContainer && objItem is DockContainerItem)
+			{
+				Bar bar=this.ContainerControl as Bar;
+				if(bar!=null && bar.LayoutType==eLayoutType.DockContainer)
+				{
+					if(this.VisibleSubItems>1)
+					{
+						objItem.Displayed=false;
+					}
+					bar.RefreshDockTab(true);
+				}
+			}
+		}
+        protected internal override void OnAfterItemRemoved(BaseItem objItem, int itemIndex)
+		{
+			base.OnAfterItemRemoved(objItem, itemIndex);
+			if(objItem is CustomizeItem)
+				m_HaveCustomizeItem=false;
+			else if(this.SystemContainer)
+			{
+				Bar bar=this.ContainerControl as Bar;
+				if(bar!=null)
+					bar.OnSubItemRemoved(objItem);
+			}
+		}
+
+		protected internal override bool IsAnyOnHandle(IntPtr iHandle)
+		{
+			if(m_MoreItems!=null)
+			{
+				if(m_MoreItems.IsAnyOnHandle(iHandle))
+					return true;
+			}
+			return base.IsAnyOnHandle(iHandle);
+		}
+
+        /// <summary>
+        /// Return Sub Item at specified location
+        /// </summary>
+        public override BaseItem ItemAtLocation(int x, int y)
+        {
+            if (m_SubItems != null)
+            {
+                foreach (BaseItem objSub in m_SubItems)
+                {
+                    if (objSub.IsContainer)
+                    {
+                        BaseItem item = objSub.ItemAtLocation(x, y);
+                        if (item != null)
+                            return item;
+                    }
+                    else
+                    {
+                        if ((objSub.Visible || this.IsOnCustomizeMenu) && objSub.Displayed && objSub.DisplayRectangle.Contains(x, y))
+                        {
+                            return objSub;
+                        }
+                    }
+                }
+            }
+
+            return null;
+        }
+
+
+		public override bool AutoExpand
+		{
+			get
+			{
+				return base.AutoExpand;
+			}
+			set
+			{
+				base.AutoExpand=value;
+				if(this.SystemContainer)
+				{
+					Bar bar=this.ContainerControl as Bar;
+					if(bar!=null)
+					{
+						// TODO: To fix the focus menu expand comment this out
+//						if(this.AutoExpand && !bar.Focused)
+//                            bar.Focus();
+//						else if(!this.AutoExpand && bar.Focused)
+//							bar.ReleaseFocus();
+						if(this.AutoExpand && !bar.MenuFocus)
+						    bar.MenuFocus=true;
+						else if(!this.AutoExpand && bar.MenuFocus)
+							bar.MenuFocus=false;
+					}
+				}
+			}
+		}
+
+		internal bool EventHeight
+		{
+			get {return m_EventHeight;}
+			set {m_EventHeight=value;}
+		}
+
+		internal bool UseMoreItemsButton
+		{
+			get {return m_UseMoreItemsButton;}
+			set {m_UseMoreItemsButton=value;}
+		}
+
+        internal eContainerVerticalAlignment ToolbarItemsAlign
+        {
+            get { return m_ToolbarItemsAlign; }
+            set { m_ToolbarItemsAlign = value; }
+        }
+
+		public virtual eLayoutType LayoutType
+		{
+			get
+			{
+				return m_LayoutType;
+			}
+			set
+			{
+				if(m_LayoutType==value)
+					return;
+				m_LayoutType=value;
+				NeedRecalcSize=true;
+				if(m_LayoutType==eLayoutType.TaskList)
+				{
+					base.Orientation=eOrientation.Horizontal;
+				}
+				else
+				{
+					if(this.ContainerControl!=null && this.ContainerControl is Bar)
+					{
+						Bar bar=this.ContainerControl as Bar;
+						if(bar.DockedSite!=null && bar.DockedSite is DockSite)
+                            base.Orientation=((DockSite)bar.DockedSite).DockOrientation;
+					}
+				}
+			}
+		}
+
+		[System.ComponentModel.Browsable(false)]
+		public override eOrientation Orientation
+		{
+			get
+			{
+				if(m_LayoutType==eLayoutType.TaskList)
+					return eOrientation.Vertical;
+				return base.Orientation;
+			}
+			set
+			{
+				if(m_LayoutType==eLayoutType.TaskList)
+					return;
+				base.Orientation=value;
+			}
+		}
+
+		public Color BackColor
+		{
+			get
+			{
+				if(!m_BackgroundColor.IsEmpty)
+					return m_BackgroundColor;
+                else if (EffectiveStyle == eDotNetBarStyle.Office2000 || this.IsOnMenuBar)
+					return SystemColors.Control;
+				else
+					return ColorFunctions.ToolMenuFocusBackColor();
+			}
+			set
+			{
+				if(m_BackgroundColor!=value)
+				{
+					m_BackgroundColor=value;
+					this.Refresh();
+				}
+			}
+		}
+
+        /// <summary>
+        /// When parent items does recalc size for its sub-items it should query
+        /// image size and store biggest image size into this property.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden), System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+        public override System.Drawing.Size SubItemsImageSize
+        {
+            get
+            {
+                return base.SubItemsImageSize;
+            }
+            set
+            {
+                if(m_TrackSubItemsImageSize)
+                    base.SubItemsImageSize = value;
+            }
+        }
+
+        internal bool TrackSubItemsImageSize
+        {
+            get { return m_TrackSubItemsImageSize; }
+            set
+            {
+                m_TrackSubItemsImageSize = value;
+                if (!m_TrackSubItemsImageSize)
+                    base.SubItemsImageSize = new Size(16, 16);
+            }
+        }
+
+		//***********************************************
+		// IDesignTimeProvider Implementation
+		//***********************************************
+		public InsertPosition GetInsertPosition(Point pScreen, BaseItem DragItem)
+		{
+            return DesignTimeProviderContainer.GetInsertPosition(this, pScreen, DragItem);
+		}
+		public void DrawReversibleMarker(int iPos, bool Before)
+		{
+            DesignTimeProviderContainer.DrawReversibleMarker(this, iPos, Before);
+            return;
+		}
+
+		public void InsertItemAt(BaseItem objItem, int iPos, bool Before)
+		{
+            DesignTimeProviderContainer.InsertItemAt(this, objItem, iPos, Before);
+            return;
+		}
+
+		private int GetAppendPosition(BaseItem objParent)
+		{
+			int iPos=-1;
+			for(int i=objParent.SubItems.Count-1;i>=0;i--)
+			{
+				if(objParent.SubItems[i].SystemItem)
+					iPos=i;
+				else
+					break;
+			}
+			return iPos;
+		}
+
+		public int PaddingLeft
+		{
+			get{return m_PaddingLeft;}
+			set{m_PaddingLeft=value;}
+		}
+		public int PaddingRight
+		{
+			get{return m_PaddingRight;}
+			set{m_PaddingRight=value;}
+		}
+		public int PaddingTop
+		{
+			get{return m_PaddingTop;}
+			set{m_PaddingTop=value;}
+		}
+		public int PaddingBottom
+		{
+			get{return m_PaddingBottom;}
+			set{m_PaddingBottom=value;}
+		}
+
+        private bool _FillsContainerControl = false;
+        /// <summary>
+        /// Gets or sets whether item container fills the container control completely.
+        /// </summary>
+        public bool FillsContainerControl
+        {
+            get { return _FillsContainerControl; }
+            set { _FillsContainerControl = value; }
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/GroupItem.cs b/PROMS/DotNetBar Source Code/GroupItem.cs
new file mode 100644
index 00000000..180165cb
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/GroupItem.cs	
@@ -0,0 +1,352 @@
+//using System;
+//using System.ComponentModel;
+//using System.Drawing;
+//
+//namespace DevComponents.DotNetBar
+//{
+//	/// <summary>
+//	/// Represents container item which contains it's subitems and arranges them vertically.
+//	/// </summary>
+//	public class GroupItem:ImageItem,IContainerWordWrap
+//	{
+//		#region Private Variables
+//		private bool m_WordWrapSubItems=false;
+//		private int m_ContentLeftIndentation=0;
+//		private int m_ContentRightIndentation=0;
+//		private int m_ItemSpacing=0;
+//		private Rectangle m_HeaderRect=Rectangle.Empty;
+//
+//		// Expand/Collapse button image
+//		private Image m_ButtonExpand=null;
+//		private Image m_ButtonCollapse=null;
+//		private eItemAlignment m_ExpandButtonAlignment=eItemAlignment.Near;
+//		private bool m_ExpandButtonVisible=true;
+//
+//		// Image support
+//		private System.Drawing.Image m_Image=null;
+//		private int m_ImageIndex=-1; // Image index if image from ImageList is used
+//		private System.Drawing.Image m_ImageCachedIdx=null;
+//		#endregion
+//
+//		#region Constructor
+//		/// <summary>
+//		/// Creates new instance of VerticalGroupItem.
+//		/// </summary>
+//		public GroupItem():this("","") {}
+//		/// <summary>
+//		/// Creates new instance of VerticalGroupItem and assigns the name to it.
+//		/// </summary>
+//		/// <param name="sItemName">Item name.</param>
+//		public GroupItem(string sItemName):this(sItemName,"") {}
+//		/// <summary>
+//		/// Creates new instance of VerticalGroupItem and assigns the name and text to it.
+//		/// </summary>
+//		/// <param name="sItemName">Item name.</param>
+//		/// <param name="ItemText">item text.</param>
+//		public GroupItem(string sItemName, string ItemText):base(sItemName,ItemText)
+//		{
+//			m_IsContainer=true;
+//			m_AllowOnlyOneSubItemExpanded=false;
+////			try
+////			{
+////				m_HeaderStyle.Font=new Font(System.Windows.Forms.SystemInformation.MenuFont,FontStyle.Bold);
+////				m_HeaderHotStyle.Font=new Font(System.Windows.Forms.SystemInformation.MenuFont,FontStyle.Bold);
+////			}
+////			catch(Exception e)
+////			{
+////				#if DEBUG
+////				throw(e);
+////				#endif
+////				m_HeaderStyle.Font=System.Windows.Forms.SystemInformation.MenuFont.Clone() as Font;
+////				m_HeaderHotStyle.Font=System.Windows.Forms.SystemInformation.MenuFont.Clone() as Font;
+////			}
+////
+////			BarFunctions.SetExplorerBarStyle(this,m_StockStyle);
+////
+////			m_BackgroundStyle.VisualPropertyChanged+=new EventHandler(this.VisualPropertyChanged);
+////			m_HeaderStyle.VisualPropertyChanged+=new EventHandler(this.VisualPropertyChanged);
+////			m_HeaderHotStyle.VisualPropertyChanged+=new EventHandler(this.VisualPropertyChanged);
+//		}
+//		#endregion
+//
+//		#region Internal Implementation
+//		/// <summary>
+//		/// Returns copy of ExplorerBarGroupItem item.
+//		/// </summary>
+//		public override BaseItem Copy()
+//		{
+//			VerticalGroupItem objCopy=new VerticalGroupItem();
+//			this.CopyToItem(objCopy);
+//			return objCopy;
+//		}
+//		/// <summary>
+//		/// Copies the VerticalGroupItem to different instance of the same type.
+//		/// </summary>
+//		/// <param name="copy">Destination VerticalGroupItem.</param>
+//		protected override void CopyToItem(BaseItem copy)
+//		{
+//			VerticalGroupItem objCopy=copy as VerticalGroupItem;
+//						
+//			base.CopyToItem(objCopy);
+//		}
+//		private void VisualPropertyChanged(object sender, EventArgs e)
+//		{
+//			VisualPropertyChanged();
+//		}
+//		/// <summary>
+//		/// Refreshes the display and applies any color scheme changes to the styles used by the item.
+//		/// </summary>
+//		internal void VisualPropertyChanged()
+//		{
+//			BarBaseControl eb=this.ContainerControl as BarBaseControl;
+//			if(eb!=null)
+//			{
+//				ColorScheme cs=eb.ColorScheme;
+//				m_BackgroundStyle.ApplyColorScheme(cs);
+//				m_HeaderHotStyle.ApplyColorScheme(cs);
+//				m_HeaderStyle.ApplyColorScheme(cs);
+//			}
+//			if(this.DesignMode)
+//			{
+//				m_NeedRecalcSize=true;
+//				this.Refresh();
+//			}
+//		}
+//		private Image GetImage()
+//		{
+//			if(m_Image!=null)
+//				return m_Image;
+//			if(m_ImageIndex>=0)
+//			{
+//				return GetImageFromImageList(m_ImageIndex);
+//			}
+//			return null;
+//		}
+//
+//		private Image GetImageFromImageList(int ImageIndex)
+//		{
+//			if(ImageIndex>=0)
+//			{
+//				IOwner owner=null;
+//				BarBaseControl bar=null;
+//				if(owner==null) owner=this.GetOwner() as IOwner;
+//				if(bar==null) bar=this.ContainerControl as BarBaseControl; 
+//
+//				if(owner!=null)
+//				{
+//					try
+//					{
+//						if(owner.ImagesMedium!=null)
+//						{
+//							if(m_ImageCachedIdx==null)
+//								m_ImageCachedIdx=owner.ImagesMedium.Images[ImageIndex];
+//							return m_ImageCachedIdx;
+//						}
+//					}
+//					catch(Exception)
+//					{
+//						return null;
+//					}
+//				}
+//			}
+//			return null;
+//		}
+//
+//		// Property Editor support for ImageIndex selection
+//		[System.ComponentModel.Browsable(false),System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+//		public System.Windows.Forms.ImageList ImageList
+//		{
+//			get
+//			{
+//				IOwner owner=this.GetOwner() as IOwner;
+//				if(owner!=null)
+//					return owner.ImagesMedium;
+//				return null;
+//			}
+//		}
+//
+//		/// <summary>
+//		/// Specifies the image for the group.
+//		/// </summary>
+//		[System.ComponentModel.Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Appearance"),System.ComponentModel.Description("The image that will be displayed on the face of the item."),System.ComponentModel.DefaultValue(null),System.ComponentModel.Editor(typeof(DevComponents.DotNetBar.ImageUITypeEditor), typeof(System.Drawing.Design.UITypeEditor)),System.ComponentModel.TypeConverter(typeof(ImageConverter2))]
+//		public System.Drawing.Image Image
+//		{
+//			get
+//			{
+//				return m_Image;
+//			}
+//			set
+//			{
+//				m_NeedRecalcSize=true;
+//				m_Image=value;
+//				this.OnImageChanged();
+//				this.Refresh();
+//			}
+//		}
+//
+//		/// <summary>
+//		/// Specifies the index of the image if ImageList is used. Note that GroupItem is using the image list specified in ImagesMedium property of control it belongs to.
+//		/// </summary>
+//		[System.ComponentModel.Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Appearance"),System.ComponentModel.Description("The image list image index of the image that will be displayed on the face of the item."),System.ComponentModel.Editor(typeof(DevComponents.Editors.ImageIndexEditor), typeof(System.Drawing.Design.UITypeEditor)),System.ComponentModel.TypeConverter(typeof(System.Windows.Forms.ImageIndexConverter)),System.ComponentModel.DefaultValue(-1)]
+//		public int ImageIndex
+//		{
+//			get
+//			{
+//				return m_ImageIndex;
+//			}
+//			set
+//			{
+//				m_ImageCachedIdx=null;
+//				if(m_ImageIndex!=value)
+//				{
+//					m_ImageIndex=value;
+//					if(m_Name!="" && this.GlobalItem)
+//					{
+//						BarFunctions.SetProperty(this.GetOwner(),this.GetType(),m_Name,System.ComponentModel.TypeDescriptor.GetProperties(this)["ImageIndex"],m_ImageIndex);
+//					}
+//					if(m_Parent!=null)
+//					{
+//						OnImageChanged();
+//						m_NeedRecalcSize=true;
+//						this.Refresh();
+//					}
+//				}
+//			}
+//		}
+//		#endregion
+//
+//		#region Sizing and Painting
+//		public override void RecalcSize()
+//		{
+//			System.Windows.Forms.Control objCtrl=this.ContainerControl as System.Windows.Forms.Control;
+//			if(!IsHandleValid(objCtrl))
+//				return;
+//			
+//			bool bLeft=(objCtrl.RightToLeft==System.Windows.Forms.RightToLeft.No);
+//			Graphics g=Graphics.FromHwnd(objCtrl.Handle);
+//			SizeF objStringSize=SizeF.Empty;
+//			System.Drawing.Size expandButtonSize=this.GetExpandButtonSize();
+//			System.Drawing.Image image=this.GetImage();
+//
+//			string text=m_Text;
+//			if(text=="")
+//				text=" ";
+//			int textArea=m_Rect.Width-m_Margin*2;
+//			if(m_ExpandButtonVisible)
+//				textArea-=expandButtonSize.Width;
+//			if(image!=null)
+//				textArea-=(image.Width+m_Margin*2);
+//			if(textArea<=0)
+//				textArea=1;
+//			objStringSize=g.MeasureString(text,this.GetFont(),textArea,m_HeaderStyle.StringFormat);
+//			g.Dispose();
+//
+//			m_Rect.Height=expandButtonSize.Height+m_Margin*2;
+//			if(m_Rect.Height<(int)objStringSize.Height+m_Margin*2)
+//				m_Rect.Height=(int)objStringSize.Height+m_Margin*2;
+//			
+//			if(image!=null)
+//			{
+//				int h=m_Rect.Height;
+//				if(image.Height>m_Rect.Height)
+//					m_Rect.Height=image.Height+m_Margin*2;
+//			}
+//			m_HeaderRect=new Rectangle(0,0,m_Rect.Width,m_Rect.Height);
+//
+//			if(m_ExpandButtonVisible)
+//			{
+//				if(m_ExpandButtonAlignment==eItemAlignment.Near && bLeft || m_ExpandButtonAlignment==eItemAlignment.Far && !bLeft)
+//					m_ExpandButtonRect=new Rectangle(0,0,expandButtonSize.Width,m_HeaderRect.Height);
+//				else
+//					m_ExpandButtonRect=new Rectangle(m_HeaderRect.Right-expandButtonSize.Width,m_HeaderRect.Y,expandButtonSize.Width,m_HeaderRect.Height);
+//			}
+//			
+//			if(this.Expanded)
+//			{
+//				if(m_SubItems!=null)
+//				{
+//					int iTop=m_Rect.Bottom+1;
+//					int iLeft=m_Rect.Left+m_LeftIndentation;
+//
+//					int iIndex=-1;
+//					foreach(BaseItem item in m_SubItems)
+//					{
+//						iIndex++;
+//						if(!item.Visible)
+//						{
+//							item.Displayed=false;
+//							continue;
+//						}
+//						item.WidthInternal=m_Rect.Width-(m_LeftIndentation+m_RightIndentation);
+//						item.RecalcSize();
+//						item.WidthInternal=m_Rect.Width-(m_LeftIndentation+m_RightIndentation);
+//						if(item.BeginGroup)
+//						{
+//							iTop+=3;
+//						}
+//						item.TopInternal=iTop;
+//						item.LeftInternal=iLeft;
+//						iTop+=(item.HeightInternal+m_ItemSpacing);;
+//						item.Displayed=true;
+//					}
+//					m_Rect.Height=iTop-m_Rect.Top+2;
+//				}
+//			}
+//			else
+//			{
+//				foreach(BaseItem item in m_SubItems)
+//				{
+//					item.Displayed=false;
+//				}
+//			}
+//
+//			if(this.Expanded && this.DesignMode && this.SubItems.Count==0 && this.Parent!=null && this.Parent.SubItems.Count==1)
+//			{
+//				// Empty space to display instruction text that tells user what to do...
+//				m_Rect.Height+=64;
+//			}
+//
+//			base.RecalcSize();
+//		}
+//
+//		private Size GetExpandButtonSize()
+//		{
+//			Size size=Size.Empty;
+//			if(m_ButtonExpand!=null)
+//				size=m_ButtonExpand.Size;
+//			if(m_ButtonCollapse!=null)
+//			{
+//				if(m_ButtonCollapse.Height>size.Height)
+//					size.Height=m_ButtonCollapse.Height;
+//				if(m_ButtonCollapse.Width>size.Width)
+//					size.Width=m_ButtonCollapse.Width;
+//			}
+//
+//			return size;
+//		}
+//
+//		#endregion
+//
+//		#region IContainerWordWrap
+//		/// <summary>
+//		/// Gets or sets whether items hosted inside of the container will word-wrap the text.
+//		/// </summary>
+//		[Browsable(true),DevCoBrowsable(true),DefaultValue(false),Category("Appearance"),Description("Indicates whether items hosted inside of the container will word-wrap the text.")]
+//		public bool WordWrapSubItems
+//		{
+//			get {return m_WordWrapSubItems;}
+//			set
+//			{
+//				m_WordWrapSubItems=value;
+//				m_NeedRecalcSize=true;
+//				if(this.DesignMode)
+//				{
+//					BarBaseControl bar=this.ContainerControl as BarBaseControl;
+//					if(bar!=null)
+//						bar.RecalcLayout();
+//				}
+//			}
+//		}
+//		#endregion
+//	}
+//}
diff --git a/PROMS/DotNetBar Source Code/HTMLHelp.cs b/PROMS/DotNetBar Source Code/HTMLHelp.cs
new file mode 100644
index 00000000..f03a4d11
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/HTMLHelp.cs	
@@ -0,0 +1,102 @@
+using System;
+using System.Windows.Forms;
+using System.Runtime.InteropServices;
+using System.IO;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Summary description for HTMLHelp.
+	/// </summary>
+	internal class HTMLHelp
+	{
+		#region API_Declaration
+		// HH_DISPLAY_SEARCH Command Related Structure
+		[StructLayout(LayoutKind.Sequential)]
+			public struct tagHH_FTS_QUERY
+		{
+			long cbStruct;
+			long fUniCodeStrings;
+			string pszSearchQuery;
+			long iProximity;
+			long fStemmedSearch;
+			long fTitleOnly;
+			long fExecute;
+			string pszWindow;
+		}
+		[DllImport("hhctrl.ocx",SetLastError=true, CharSet=CharSet.Ansi, EntryPoint="HtmlHelpA")]
+		private static extern IntPtr HtmlHelp(IntPtr hwnd, string lpHelpFile, int wCommand, int dwData);
+		[DllImport("hhctrl.ocx",SetLastError=true, CharSet=CharSet.Auto, EntryPoint="HtmlHelp")]
+        private static extern IntPtr HTMLHelpFtsQuery (IntPtr hwnd, string lpHelpFile, int wCommand, ref tagHH_FTS_QUERY dwData );
+        private const int HH_DISPLAY_TOPIC = 0x0;
+        private const int HH_DISPLAY_TOC = 0x1;
+        private const int HH_DISPLAY_INDEX = 0x2;
+        private const int HH_DISPLAY_SEARCH = 0x3;
+        private const int HH_HELP_CONTEXT = 0xF;   // display mapped numeric value in dwData
+
+		[DllImport("user32")]
+		private static extern bool PostMessage(IntPtr hWnd, int Msg, int wParam, int lParam);
+		[DllImport("user32")]
+		private static extern bool IsWindow(IntPtr hWnd);
+
+		public const int WM_CLOSE=0x10;
+
+        #endregion
+		
+		private Control m_ParentWindow=null;
+		private string m_HelpFile="";
+		private IntPtr m_HtmlHelpWindowHandle=IntPtr.Zero;
+
+		public HTMLHelp()
+		{}
+		public HTMLHelp(Control parent, string helpfile)
+		{
+			m_ParentWindow=parent;
+			m_HelpFile=helpfile;
+		}
+		public Control Parent
+		{
+			get {return m_ParentWindow;}
+			set {m_ParentWindow=value;}
+		}
+		public string HelpFile
+		{
+			get {return m_HelpFile;}
+			set {m_HelpFile=value;}
+		}
+
+		public void ShowContents()
+		{
+			// Display Table Of Contents tab in HTML Help
+			if(File.Exists(m_HelpFile))
+				m_HtmlHelpWindowHandle=HtmlHelp(m_ParentWindow.Handle,m_HelpFile,HH_DISPLAY_TOC,0);
+			else
+				throw new InvalidOperationException("Help file could not be found.");
+		}
+
+		public void ShowIndex()
+		{
+			// Display Table Of Contents tab in HTML Help
+			if(File.Exists(m_HelpFile))
+				m_HtmlHelpWindowHandle=HtmlHelp(m_ParentWindow.Handle,m_HelpFile,HH_DISPLAY_INDEX,0);
+			else
+				throw new InvalidOperationException("Help file could not be found.");
+		}
+
+		public void ShowSearch()
+		{
+			// Display Table Of Contents tab in HTML Help
+			if(File.Exists(m_HelpFile))
+				m_HtmlHelpWindowHandle=HtmlHelp(m_ParentWindow.Handle,m_HelpFile,HH_DISPLAY_SEARCH,0);
+			else
+				throw new InvalidOperationException("Help file could not be found.");
+		}
+
+		public void CloseHelpWindow()
+		{
+			if(m_HtmlHelpWindowHandle!=IntPtr.Zero && IsWindow(m_HtmlHelpWindowHandle))
+				PostMessage(m_HtmlHelpWindowHandle,WM_CLOSE,0,0);
+			m_HtmlHelpWindowHandle=IntPtr.Zero;
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/Hook.cs b/PROMS/DotNetBar Source Code/Hook.cs
new file mode 100644
index 00000000..d27486e6
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Hook.cs	
@@ -0,0 +1,192 @@
+#define NO_UNSAFE
+using System;
+using System.ComponentModel;
+using System.Runtime.InteropServices;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Summary description for Hook.
+	/// </summary>
+	internal class Hook : IDisposable
+	{
+		private const int WH_MOUSE = 7;
+		private const int HC_ACTION = 0;
+		private const int WM_MOUSEMOVE = 0x0200;
+		private const int WH_KEYBOARD = 2;
+
+		private const int KF_EXTENDED=0x0100;
+		private const int KF_DLGMODE=0x0800;
+		private const int KF_MENUMODE=0x1000;
+		private const int KF_ALTDOWN=0x2000;
+		private const int KF_REPEAT=0x4000;
+		private const int KF_UP=0x8000;
+
+		private IntPtr m_hMouseHook=IntPtr.Zero;
+		private IntPtr m_hKeyboardHook=IntPtr.Zero;
+		private MouseProc m_mouseHook;
+		private KeyboardProc m_keyboardHook;
+		private IMessageHandlerClient m_Client=null;
+
+		public Hook(IMessageHandlerClient client)
+		{
+			m_Client=client;
+			m_mouseHook = new MouseProc(OnMouseHook);
+			m_keyboardHook=new KeyboardProc(OnKeyboardHook);
+			m_hMouseHook = SetWindowsHookEx(WH_MOUSE, m_mouseHook, IntPtr.Zero, GetCurrentThreadId());
+			m_hKeyboardHook=SetWindowsHookExKeyboard(WH_KEYBOARD,m_keyboardHook,IntPtr.Zero,GetCurrentThreadId());
+			if (m_hMouseHook == IntPtr.Zero || m_hKeyboardHook==IntPtr.Zero)
+			{
+				throw new Win32Exception();
+			}
+		}
+
+		public void Dispose() 
+		{
+			if (m_hMouseHook != IntPtr.Zero)
+			{
+				IntPtr h = m_hMouseHook;
+				m_hMouseHook = IntPtr.Zero;
+				UnhookWindowsHookEx(h);
+			}
+			if (m_hKeyboardHook != IntPtr.Zero)
+			{
+				IntPtr h = m_hKeyboardHook;
+				m_hKeyboardHook = IntPtr.Zero;
+				UnhookWindowsHookEx(h);
+			}
+		}
+
+		// A note on using unsafe code:
+		//
+		// When taking a native pointer and converting it into a structure pointer,
+		// if you only need to examine the contents of the structure then it is very
+		// wasteful to use Marshal.PtrToStructure.  Structures are very efficient
+		// because they are stack allocated, but by converting them to an object
+		// to be returned, Marshal causes a boxing operation to happen which
+		// allocates an object on the heap.  This normally isn't a big deal
+		// but for window messages that occur with a high frequency you can
+		// see a spike of many hundreds of objects being allocated.  Using
+		// unsafe blocks are great when you are writing an EXE that runs on a 
+		// user's local machine.  If you are writing a library that can be downloaded
+		// over the internet you should not use them, because they require elevated
+		// security permissions.  That's not a big deal for this sample because
+		// we already need unmanaged code permission to create the hook.
+
+#if NO_UNSAFE
+		private IntPtr OnMouseHook(int nCode, IntPtr wParam, IntPtr lParam)
+		{
+			if (nCode == HC_ACTION)
+			{
+				int msg=WinApi.ToInt(wParam);
+				if(msg == NativeFunctions.WM_LBUTTONDOWN || msg==NativeFunctions.WM_NCLBUTTONDOWN ||
+							msg==NativeFunctions.WM_RBUTTONDOWN || msg==NativeFunctions.WM_MBUTTONDOWN || 
+							msg==NativeFunctions.WM_NCMBUTTONDOWN || msg==NativeFunctions.WM_NCRBUTTONDOWN)
+				{
+					MOUSEHOOKSTRUCT mhs = (MOUSEHOOKSTRUCT)Marshal.PtrToStructure(lParam, typeof(MOUSEHOOKSTRUCT));
+
+					m_Client.OnMouseDown(mhs.hwnd,IntPtr.Zero,lParam);
+				}
+			}
+
+			return CallNextHookEx(m_hMouseHook, nCode, wParam, lParam);
+		}
+		private IntPtr OnKeyboardHook(int nCode, IntPtr wParam, IntPtr lParam)
+		{
+			if (nCode == HC_ACTION)
+			{
+                int ilParam=WinApi.ToInt(lParam);
+				int iwParam=WinApi.ToInt(wParam);
+				int iCode=ilParam>>16;
+				if((iCode & KF_ALTDOWN)!=0)
+				{
+					if((iCode & KF_UP)!=0)
+					{
+						if(m_Client.OnSysKeyUp(IntPtr.Zero,wParam,lParam))
+							return (IntPtr)1;
+					}
+					else //if((ilParam & KF_REPEAT)==0)
+					{
+						if(m_Client.OnSysKeyDown(IntPtr.Zero,wParam,lParam))
+							return (IntPtr)1;
+					}
+				}
+				else
+				{
+					if((iCode & KF_UP)==0)
+					{
+						if(m_Client.OnKeyDown(IntPtr.Zero,wParam,lParam))
+							return (IntPtr)1;
+					}
+					else if(iwParam==18 || iwParam==121)
+					{
+						if(m_Client.OnSysKeyUp(IntPtr.Zero,wParam,lParam))
+							return (IntPtr)1;
+					}
+				}
+			}
+			return CallNextHookEx(m_hKeyboardHook, nCode, wParam, lParam);
+		}
+#else
+		private unsafe IntPtr OnMouseHook(int nCode, IntPtr wParam, IntPtr lParam)
+		{
+			if (nCode == HC_ACTION && MouseEvent != null)
+			{
+				if (wParam == (IntPtr)WM_MOUSEMOVE)
+				{
+					MOUSEHOOKSTRUCT* pmhs = (MOUSEHOOKSTRUCT*)lParam;
+					MouseEventArgs e = new MouseEventArgs(MouseButtons.None, 0, pmhs->pt.x, pmhs->pt.y, 0);
+					MouseEvent(this, e);
+				}
+			}
+
+			return CallNextHookEx(_hHook, nCode, wParam, lParam);
+		}
+#endif
+
+		private delegate IntPtr MouseProc(int nCode, IntPtr wParam, IntPtr lParam);
+		private delegate IntPtr KeyboardProc(int nCode, IntPtr wParam, IntPtr lParam);
+
+		[DllImport("user32.dll", CharSet=CharSet.Auto, SetLastError=true)]
+		private static extern IntPtr SetWindowsHookEx(int hookid, MouseProc pfnhook, IntPtr hinst, int threadid);
+
+		[DllImport("user32.dll", CharSet=CharSet.Auto, SetLastError=true, EntryPoint="SetWindowsHookEx")]
+		private static extern IntPtr SetWindowsHookExKeyboard(int hookid, KeyboardProc pfnhook, IntPtr hinst, int threadid);
+
+		[DllImport("user32.dll", ExactSpelling=true, CharSet=CharSet.Auto)]
+		private static extern bool UnhookWindowsHookEx(IntPtr hhook);
+
+		[DllImport("user32.dll", ExactSpelling=true, CharSet=CharSet.Auto)]
+		private static extern IntPtr CallNextHookEx(IntPtr hhook, int code, IntPtr wparam, IntPtr lparam);
+
+		[DllImport("kernel32.dll", ExactSpelling=true, CharSet=CharSet.Auto)]
+		private static extern int GetCurrentThreadId();
+
+		private struct POINT
+		{
+			public POINT(int x, int y)
+			{
+				this.x=x;
+				this.y=y;
+			}
+			public int x;
+			public int y;
+		}
+
+		private struct MOUSEHOOKSTRUCT 
+		{
+			public MOUSEHOOKSTRUCT(POINT pt, IntPtr hwnd, ushort wHitTestCode, IntPtr dwExtraInfo)
+			{
+				this.pt=pt;
+				this.hwnd=hwnd;
+				this.wHitTestCode=wHitTestCode;
+				this.dwExtraInfo=dwExtraInfo;
+			}
+			public POINT   pt;
+			public IntPtr    hwnd;
+			public ushort    wHitTestCode;
+			public IntPtr dwExtraInfo;
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/ICommand.cs b/PROMS/DotNetBar Source Code/ICommand.cs
new file mode 100644
index 00000000..61ae9945
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/ICommand.cs	
@@ -0,0 +1,905 @@
+using System;
+using System.Text;
+using System.ComponentModel;
+using System.Drawing;
+using System.Collections;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar
+{
+    #region ICommand
+    /// <summary>
+    /// Defines an interface that represents the Command associated with an BaseItem instance.
+    /// </summary>
+    public interface ICommand
+    {
+        /// <summary>
+        /// Executes the command without specifying the source of the command.
+        /// </summary>
+        void Execute();
+        /// <summary>
+        /// Executes the command and specifies the source of the command.
+        /// </summary>
+        void Execute(ICommandSource commandSource);
+        /// <summary>
+        /// Executes the code associated with the command.
+        /// </summary>
+        event EventHandler Executed;
+        /// <summary>
+        /// Provides the opportunity to cancel the execution of the command. This event occurs before the Executed event.
+        /// </summary>
+        event CancelEventHandler PreviewExecuted;
+        /// <summary>
+        /// Gets or sets the text associated with the items that are using command.
+        /// </summary>
+        string Text { get; set; }
+        /// <summary>
+        /// Gets or sets the value of Checked property if item associated with the command support it.
+        /// </summary>
+        bool Checked { get; set; }
+        /// <summary>
+        /// Gets or sets the value of Visible property if item associated with the command support it.
+        /// </summary>
+        bool Visible { get; set; }
+        /// <summary>
+        /// Gets or sets the value of Image property if item associated with the command support it.
+        /// </summary>
+        Image Image { get; set; }
+        /// <summary>
+        /// Gets or sets the value of small image (ImageSmall) property if item associated with the command support it.
+        /// </summary>
+        Image ImageSmall { get; set; }
+        /// <summary>
+        /// Gets or sets the value of Enabled property for items associated with the command.
+        /// </summary>
+        bool Enabled { get; set; }
+        /// <summary>
+        /// Called when CommandSource is registered for the command.
+        /// </summary>
+        /// <param name="source">CommandSource registered.</param>
+        void CommandSourceRegistered(ICommandSource source);
+        /// <summary>
+        /// Called when CommandSource is unregistered for the command.
+        /// </summary>
+        /// <param name="source">CommandSource unregistered.</param>
+        void CommandSourceUnregistered(ICommandSource source);
+        /// <summary>
+        /// Sets an property value on the subscribers through the reflection. If subscriber does not have
+        /// specified property with value type its value is not set.
+        /// </summary>
+        /// <param name="propertyName">Property name to set.</param>
+        /// <param name="value">Property value.</param>
+        void SetValue(string propertyName, object value);
+    }
+    #endregion
+
+    #region ICommandSource
+    /// <summary>
+    /// Defines an interface for the object that knows how to invoke a command.
+    /// </summary>
+    public interface ICommandSource
+    {
+        /// <summary>
+        /// Gets or sets the command that will be executed when the command source is invoked.
+        /// </summary>
+        ICommand Command { get;set;}
+        /// <summary>
+        /// Gets or sets user defined data value that can be passed to the command when it is executed.
+        /// </summary>
+        object CommandParameter { get;set;}
+    }
+    #endregion
+
+    #region Command
+    /// <summary>
+    /// Defines an command that is associated with an instance of BaseItem
+    /// </summary>
+    [ToolboxItem(true), DesignTimeVisible(true), ToolboxBitmap(typeof(Command), "Command.ico"), DefaultEvent("Executed")]
+    public class Command : Component, ICommand
+    {
+        #region ICommand Members
+        /// <summary>
+        /// Initializes a new instance of the Command class with the specified container.
+        /// </summary>
+        /// <param name="container">An IContainer that represents the container for the command.</param>
+        public Command(IContainer container)
+            : this()
+        {
+            container.Add(this);
+        }
+        /// <summary>
+        /// Initializes a new instance of the Command class with the specified container.
+        /// </summary>
+        /// <param name="container">An IContainer that represents the container for the command.</param>
+        public Command(IContainer container, EventHandler commandExecutedEventHandler)
+            : this()
+        {
+            container.Add(this);
+            Executed += commandExecutedEventHandler;
+        }
+        /// <summary>
+        /// Initializes a new instance of the Command class with the specified execute event handler.
+        /// </summary>
+        public Command(EventHandler commandExecutedEventHandler)
+            : this()
+        {
+            Executed += commandExecutedEventHandler;
+        }
+        /// <summary>
+        /// Initializes a new instance of the Command class.
+        /// </summary>
+        public Command()
+        {
+        }
+
+        /// <summary>
+        /// Executes the command.
+        /// </summary>
+        public virtual void Execute()
+        {
+            Execute(null);
+        }
+
+        /// <summary>
+        /// Executes the command.
+        /// </summary>
+        public virtual void Execute(ICommandSource commandSource)
+        {
+            CancelEventArgs e = new CancelEventArgs();
+            OnPreviewExecuted(commandSource, e);
+            if (e.Cancel) return;
+
+            OnExecuted(commandSource, new EventArgs());
+        }
+
+        /// <summary>
+        /// Executes the code associated with the command when an instance of BaseItem is clicked.
+        /// </summary>
+        public event EventHandler Executed;
+        /// <summary>
+        /// Raises the Execute event.
+        /// </summary>
+        /// <param name="e">Provides event data.</param>
+        protected virtual void OnExecuted(ICommandSource commandSource, EventArgs e)
+        {
+            EventHandler eh = Executed;
+            if (eh != null)
+                eh(commandSource, e);
+        }
+
+        /// <summary>
+        /// Occurs before the Executed event and allows you to cancel the firing of Executed event.
+        /// </summary>
+        public event CancelEventHandler PreviewExecuted;
+        /// <summary>
+        /// Raises the PreviewExecuted event.
+        /// </summary>
+        /// <param name="e">Provides event data.</param>
+        protected virtual void OnPreviewExecuted(ICommandSource commandSource, CancelEventArgs e)
+        {
+            CancelEventHandler eh = PreviewExecuted;
+            if (eh != null)
+                eh(commandSource, e);
+        }
+
+        private string _Text = null;
+        private bool _TextSet = false;
+        /// <summary>
+        /// Gets or sets the Text that is assigned to all command sources that are using this command and have Text property.
+        /// </summary>
+        [Localizable(true), Description("Indicates Text that is assigned to all command sources that are using this command and have Text property.")]
+        [Editor("DevComponents.DotNetBar.Design.TextMarkupUIEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor))]
+        public string Text
+        {
+            get
+            {
+                return _Text;
+            }
+            set
+            {
+                _Text = value;
+                _TextSet = true;
+                OnTextChanged();
+            }
+        }
+
+        /// <summary>
+        /// Called when Text property is set.
+        /// </summary>
+        protected virtual void OnTextChanged()
+        {
+            SetTextProperty();
+        }
+
+        /// <summary>
+        /// Sets the Text property on all subscribers to the command Text.
+        /// </summary>
+        protected virtual void SetTextProperty()
+        {
+            IsSyncingCommand = true;
+            try
+            {
+                ArrayList list = GetSubscribers();
+                ArrayList removeList = new ArrayList(list.Count);
+                string text = _Text;
+                if (this.GetDesignMode())
+                {
+                    foreach (object item in list)
+                    {
+                        if (IsTextPropertyChanged(item, text))
+                            SetPropertyValue(item, "Text", text);
+                        else
+                            removeList.Add(item);
+                    }
+                }
+                else
+                {
+                    foreach (object item in list)
+                    {
+                        if (IsTextPropertyChanged(item, text))
+                            SetTextProperty(item, text);
+                        else
+                            removeList.Add(item);
+                    }
+                }
+                foreach (object item in removeList)
+                    list.Remove(item);
+                RecalcLayout(list);
+            }
+            finally
+            {
+                IsSyncingCommand = false;
+            }
+        }
+
+        private bool IsTextPropertyChanged(object item, string text)
+        {
+            if (item is ComboBoxItem)
+            {
+                ComboBoxItem cb = item as ComboBoxItem;
+                if (cb.DropDownStyle == ComboBoxStyle.DropDownList)
+                {
+                    if (cb.SelectedItem is ComboBoxItem)
+                        return ((ComboBoxItem)cb.SelectedItem).Text != text;
+                    else if (cb.SelectedItem != null)
+                        return cb.SelectedItem.ToString() != text;
+                    return cb.ComboBoxEx.Text != text;
+                }
+                else
+                    return cb.Text != text;
+            }
+            else if (item is BaseItem)
+                return ((BaseItem)item).Text != text;
+            else if (item is TabItem)
+                return ((TabItem)item).Text != text;
+            else if (item is Control)
+                return ((Control)item).Text != text;
+            else
+                return GetPropertyValue(item, "Text") != text;
+            return true;
+        }
+
+        protected virtual void SetTextProperty(object item, string text)
+        {
+            if (item is ComboBoxItem)
+            {
+                ComboBoxItem cb = item as ComboBoxItem;
+                if (cb.DropDownStyle == ComboBoxStyle.DropDownList)
+                {
+                    if (cb.ComboBoxEx.Text != text)
+                    {
+                        if (text == "" || text == null)
+                            cb.SelectedIndex = -1;
+                        else
+                            cb.SelectedIndex = cb.ComboBoxEx.FindString(text);
+                    }
+                }
+                else
+                    cb.Text = text;
+            }
+            else if (item is BaseItem)
+                ((BaseItem)item).Text = text;
+            else if (item is TabItem)
+                ((TabItem)item).Text = text;
+            else if (item is Control)
+                ((Control)item).Text = text;
+            else
+                SetPropertyValue(item, "Text", text);
+        }
+
+        private void RecalcLayout(ArrayList list)
+        {
+            if (!CommandManager.AutoUpdateLayout)
+                return;
+            ArrayList processedControls = new ArrayList(list.Count);
+            foreach (object item in list)
+            {
+                if (item is BaseItem)
+                {
+                    Control c = ((BaseItem)item).ContainerControl as Control;
+                    if (BarFunctions.IsHandleValid(c) && !processedControls.Contains(c))
+                    {
+                        InvokeRecalcLayout(c);
+                        processedControls.Add(c);
+                    }
+                }
+            }
+        }
+
+        private void InvokeRecalcLayout(Control control)
+        {
+            if (control is Bar)
+                ((Bar)control).RecalcLayout();
+            else if (control is RibbonBar && ((RibbonBar)control).Parent is RibbonPanel && !((RibbonPanel)((RibbonBar)control).Parent).DefaultLayout)
+            {
+                ((RibbonBar)control).RecalcLayout();
+                ((RibbonPanel)((RibbonBar)control).Parent).PerformLayout();
+            }
+            else if (control is ItemControl)
+                ((ItemControl)control).RecalcLayout();
+            else if (control is BaseItemControl)
+                ((BaseItemControl)control).RecalcLayout();
+            else if (control is MenuPanel)
+                ((MenuPanel)control).RecalcLayout();
+            else if (control is ExplorerBar)
+                ((ExplorerBar)control).RecalcLayout();
+            else if (control is SideBar)
+                ((SideBar)control).RecalcLayout();
+        }
+
+        private bool GetDesignMode()
+        {
+            if (this.Site != null) return this.Site.DesignMode;
+            return false;
+        }
+
+        protected virtual void SetPropertyValue(object item, string propertyName, object value)
+        {
+            if (!CommandManager.UseReflection) return;
+
+            PropertyDescriptorCollection properties = TypeDescriptor.GetProperties(item);
+            PropertyDescriptor prop = properties.Find(propertyName, false);
+            if (prop != null) prop.SetValue(item, value);
+        }
+
+        protected virtual object GetPropertyValue(object item, string propertyName)
+        {
+            if (!CommandManager.UseReflection) return null;
+
+            PropertyDescriptorCollection properties = TypeDescriptor.GetProperties(item);
+            PropertyDescriptor prop = properties.Find(propertyName, false);
+            if (prop != null) return prop.GetValue(item);
+            return null;
+        }
+
+        /// <summary>
+        /// Sets an property value on the subscribers through the reflection. If subscriber does not have
+        /// specified property with value type its value is not set.
+        /// </summary>
+        /// <param name="propertyName">Property name to set.</param>
+        /// <param name="value">Property value.</param>
+        public void SetValue(string propertyName, object value)
+        {
+            IsSyncingCommand = true;
+
+            try
+            {
+                ArrayList list = GetSubscribers();
+                Type valueType = null;
+                if (value != null)
+                    valueType = value.GetType();
+                ArrayList processedControls = new ArrayList(list.Count);
+
+                foreach (object item in list)
+                {
+                    PropertyDescriptorCollection properties = TypeDescriptor.GetProperties(item);
+                    PropertyDescriptor prop = properties.Find(propertyName, false);
+                    if (prop != null && (valueType == null || prop.PropertyType == valueType))
+                    {
+                        prop.SetValue(item, value);
+                        processedControls.Add(item);
+                    }
+                }
+
+                RecalcLayout(processedControls);
+            }
+            finally
+            {
+                IsSyncingCommand = false;
+            }
+        }
+
+        private ArrayList GetSubscribers()
+        {
+            return CommandManager.GetSubscribers(this);
+        }
+
+        /// <summary>
+        /// Gets whether property is set and whether it will be applied to items associated with the command.
+        /// </summary>
+        /// <returns></returns>
+        public bool ShouldSerializeText()
+        {
+            return _TextSet;
+        }
+        /// <summary>
+        /// Resets the property to its default value and disables its propagation to items that are associated with command.
+        /// </summary>
+        public void ResetText()
+        {
+            _TextSet = false;
+            _Text = null;
+        }
+
+        private bool _Checked = false;
+        private bool _CheckedSet = false;
+        /// <summary>
+        /// Gets or sets the value for the Checked property that is assigned to the command subscribers using this command and have Checked property.
+        /// </summary>
+        [Description("Indicates value for the Checked property that is assigned to the command subscribers using this command and have Checked property.")]
+        public bool Checked
+        {
+            get
+            {
+                return _Checked;
+            }
+            set
+            {
+                _Checked = value;
+                _CheckedSet = true;
+                OnCheckedChanged();
+            }
+        }
+
+        protected virtual void OnCheckedChanged()
+        {
+            SetCheckedProperty();
+        }
+
+        protected virtual void SetCheckedProperty()
+        {
+            IsSyncingCommand = true;
+            try
+            {
+                ArrayList list = GetSubscribers();
+                bool check = _Checked;
+                foreach (object item in list)
+                {
+                    SetCheckedProperty(item, check);
+                }
+            }
+            finally
+            {
+                IsSyncingCommand = false;
+            }
+        }
+
+        private bool _IsSyncingCommand = false;
+        /// <summary>
+        /// Gets whether the command is in process of syncing its state to all subscribers.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsSyncingCommand
+        {
+            get { return _IsSyncingCommand; }
+            private set
+            {
+                _IsSyncingCommand = value;
+            }
+        }
+        
+
+        protected virtual void SetCheckedProperty(object item, bool check)
+        {
+            if (item is ButtonItem)
+                ((ButtonItem)item).Checked = check;
+            else if (item is ButtonX)
+                ((ButtonX)item).Checked = check;
+            else if (item is CheckBoxItem)
+                ((CheckBoxItem)item).Checked = check;
+            else if (item is SwitchButtonItem)
+                ((SwitchButtonItem)item).Value = check;
+            else
+                SetPropertyValue(item, "Checked", check);
+        }
+        /// <summary>
+        /// Gets whether property is set and whether it will be applied to items associated with the command.
+        /// </summary>
+        /// <returns></returns>
+        public bool ShouldSerializeChecked()
+        {
+            return _CheckedSet;
+        }
+        /// <summary>
+        /// Resets the property to its default value and disables its propagation to items that are associated with command.
+        /// </summary>
+        public void ResetChecked()
+        {
+            _CheckedSet = false;
+            _Checked = false;
+        }
+
+        private bool _Visible = false;
+        private bool _VisibleSet = false;
+        /// <summary>
+        /// Gets or sets the value for the Visible property that is assigned to the command subscribers using this command and have Visible property.
+        /// </summary>
+        [Description("Indicates value for the Visible property that is assigned to the command subscribers using this command and have Visible property.")]
+        public bool Visible
+        {
+            get
+            {
+                return _Visible;
+            }
+            set
+            {
+                _Visible = value;
+                _VisibleSet = true;
+                OnVisibleChanged();
+            }
+        }
+        protected virtual void OnVisibleChanged()
+        {
+            SetVisibleProperty();
+        }
+        protected virtual void SetVisibleProperty()
+        {
+            ArrayList list = GetSubscribers();
+            bool visible = _Visible;
+            foreach (object item in list)
+            {
+                SetVisibleProperty(item, visible);
+            }
+        }
+        protected virtual void SetVisibleProperty(object item, bool visible)
+        {
+            ArrayList list = GetSubscribers();
+            if (this.DesignMode)
+                SetPropertyValue(item, "Visible", visible);
+            else
+            {
+                if (item is BaseItem)
+                    ((BaseItem)item).Visible = visible;
+                else if (item is Control)
+                    ((Control)item).Visible = visible;
+                else
+                    SetPropertyValue(item, "Visible", visible);
+            }
+            RecalcLayout(list);
+        }
+        /// <summary>
+        /// Gets whether property is set and whether it will be applied to items associated with the command.
+        /// </summary>
+        /// <returns></returns>
+        public bool ShouldSerializeVisible()
+        {
+            return _VisibleSet;
+        }
+        /// <summary>
+        /// Resets the property to its default value and disables its propagation to items that are associated with command.
+        /// </summary>
+        public void ResetVisible()
+        {
+            _VisibleSet = false;
+            _Visible = false;
+        }
+
+        private Image _Image = null;
+        private bool _ImageSet = false;
+        /// <summary>
+        /// Gets or sets the image that is assigned to the command subscribers using this command and have Image property.
+        /// </summary>
+        [Description("Indicates image that is assigned to the command subscribers using this command and have Image property."), Localizable(true)]
+        public Image Image
+        {
+            get
+            {
+                return _Image;
+            }
+            set
+            {
+                _Image = value;
+                _ImageSet = true;
+                OnImageChanged();
+            }
+        }
+
+        protected virtual void OnImageChanged()
+        {
+            SetImageProperty();
+        }
+
+        protected virtual void SetImageProperty()
+        {
+            IsSyncingCommand = true;
+
+            try
+            {
+                ArrayList list = GetSubscribers();
+                Image image = _Image;
+
+                if (this.GetDesignMode())
+                {
+                    foreach (object item in list)
+                    {
+                        if (item is ButtonItem)
+                        {
+                            ButtonItem button = item as ButtonItem;
+                            bool qatButton = false;
+                            if (button.ContainerControl is RibbonStrip)
+                            {
+                                RibbonStrip rs = button.ContainerControl as RibbonStrip;
+                                if (rs.Parent is RibbonControl && ((RibbonControl)rs.Parent).QuickToolbarItems.Contains(button))
+                                    qatButton = true;
+                            }
+                            else if (button.ContainerControl is Ribbon.QatToolbar)
+                                qatButton = true;
+                            if (qatButton && image != null && (image.Width > 16 || image.Height > 16))
+                            {
+                                button.UseSmallImage = true;
+                                if (button.ImageSmall == null)
+                                    TypeDescriptor.GetProperties(button)["ImageFixedSize"].SetValue(button, new Size(16, 16));
+                            }
+                        }
+
+                        SetPropertyValue(item, "Image", image);
+                    }
+                }
+                else
+                {
+                    foreach (object item in list)
+                    {
+                        SetImageProperty(item, image);
+                    }
+                }
+                RecalcLayout(list);
+            }
+            finally
+            {
+                IsSyncingCommand = false;
+            }
+        }
+
+        protected virtual void SetImageProperty(object item, Image image)
+        {
+            if (item is ButtonItem)
+                ((ButtonItem)item).Image = image;
+            else if (item is ExplorerBarGroupItem)
+                ((ExplorerBarGroupItem)item).Image = image;
+            else if (item is LabelItem)
+                ((LabelItem)item).Image = image;
+            else if (item is SideBarPanelItem)
+                ((SideBarPanelItem)item).Image = image;
+            else if (item is TabItem)
+                ((TabItem)item).Image = image;
+            else if (item is ButtonX)
+                ((ButtonX)item).Image = image;
+            else if (item is LabelX)
+                ((LabelX)item).Image = image;
+            else if (item is DevComponents.DotNetBar.Controls.ReflectionImage)
+                ((DevComponents.DotNetBar.Controls.ReflectionImage)item).Image = image;
+            else if (item is BubbleButton)
+                ((BubbleButton)item).Image = image;
+            else
+                SetPropertyValue(item, "Image", image);
+        }
+        /// <summary>
+        /// Gets whether property is set and whether it will be applied to items associated with the command.
+        /// </summary>
+        /// <returns></returns>
+        public bool ShouldSerializeImage()
+        {
+            return _ImageSet;
+        }
+        /// <summary>
+        /// Resets the property to its default value and disables its propagation to items that are associated with command.
+        /// </summary>
+        public void ResetImage()
+        {
+            _ImageSet = false;
+            _Image = null;
+        }
+
+        private Image _ImageSmall = null;
+        private bool _ImageSmallSet = false;
+        /// <summary>
+        /// Gets or sets the small image that is assigned to the command subscribers using this command and have ImageSmall property.
+        /// </summary>
+        [Description("Indicates small image that is assigned to the command subscribers using this command and have ImageSmall property."), Localizable(true)]
+        public Image ImageSmall
+        {
+            get
+            {
+                return _ImageSmall;
+            }
+            set
+            {
+                _ImageSmall = value;
+                _ImageSmallSet = true;
+                OnImageSmallChanged();
+            }
+        }
+
+        protected virtual void OnImageSmallChanged()
+        {
+            SetImageSmallProperty();
+        }
+
+        protected virtual void SetImageSmallProperty()
+        {
+            IsSyncingCommand = true;
+            try
+            {
+                ArrayList list = GetSubscribers();
+                Image image = _ImageSmall;
+                foreach (object item in list)
+                {
+                    SetImageSmallProperty(item, image);
+                }
+                RecalcLayout(list);
+            }
+            finally
+            {
+                IsSyncingCommand = false;
+            }
+        }
+
+        protected virtual void SetImageSmallProperty(object item, Image image)
+        {
+            if (item is ButtonItem)
+                ((ButtonItem)item).ImageSmall = image;
+            else
+                SetPropertyValue(item, "ImageSmall", image);
+        }
+        /// <summary>
+        /// Gets whether property is set and whether it will be applied to items associated with the command.
+        /// </summary>
+        /// <returns></returns>
+        public bool ShouldSerializeImageSmall()
+        {
+            return _ImageSmallSet;
+        }
+        /// <summary>
+        /// Resets the property to its default value and disables its propagation to items that are associated with command.
+        /// </summary>
+        public void ResetImageSmall()
+        {
+            _ImageSmallSet = false;
+            _ImageSmall = null;
+        }
+
+        private bool _Enabled = true;
+        private bool _EnabledSet = false;
+        /// <summary>
+        /// Gets or sets the value for Enabled property assigned to the command subscribers using this command and have Enabled property.
+        /// </summary>
+        [Description("Indicates value for Enabled property assigned to the command subscribers using this command and have Enabled property.")]
+        public bool Enabled
+        {
+            get
+            {
+                return _Enabled;
+            }
+            set
+            {
+                _Enabled = value;
+                _EnabledSet = true;
+                OnEnabledChanged();
+            }
+        }
+
+        protected virtual void OnEnabledChanged()
+        {
+            SetEnabledProperty();
+        }
+
+        protected virtual void SetEnabledProperty()
+        {
+            IsSyncingCommand = true;
+            try
+            {
+                ArrayList list = GetSubscribers();
+                bool enabled = _Enabled;
+                foreach (object item in list)
+                {
+                    SetEnabledProperty(item, enabled);
+                }
+            }
+            finally
+            {
+                IsSyncingCommand = false;
+            }
+        }
+
+        protected virtual void SetEnabledProperty(object item, bool enabled)
+        {
+            if (item is BaseItem)
+                ((BaseItem)item).Enabled = enabled;
+            else if (item is Control)
+                ((Control)item).Enabled = enabled;
+            else
+                SetPropertyValue(item, "Enabled", enabled);
+        }
+        /// <summary>
+        /// Gets whether property is set and whether it will be applied to items associated with the command.
+        /// </summary>
+        /// <returns></returns>
+        public bool ShouldSerializeEnabled()
+        {
+            return _EnabledSet;
+        }
+        /// <summary>
+        /// Resets the property to its default value and disables its propagation to items that are associated with command.
+        /// </summary>
+        public void ResetEnabled()
+        {
+            _EnabledSet = false;
+            _Enabled = false;
+        }
+
+        /// <summary>
+        /// Called when CommandSource is registered for the command.
+        /// </summary>
+        /// <param name="source">CommandSource registered.</param>
+        public virtual void CommandSourceRegistered(ICommandSource source)
+        {
+            if (source == null || this.GetDesignMode()) return;
+
+            if (_EnabledSet)
+                SetEnabledProperty(source, _Enabled);
+            if (_CheckedSet)
+                SetCheckedProperty(source, _Checked);
+            if(_ImageSet)
+                SetImageProperty(source, _Image);
+            if(_ImageSmallSet)
+                SetImageSmallProperty(source, _ImageSmall);
+            if(_TextSet)
+                SetTextProperty(source, _Text);
+            if (_VisibleSet)
+                SetVisibleProperty(source, _Visible);
+        }
+
+        /// <summary>
+        /// Called when CommandSource is unregistered for the command.
+        /// </summary>
+        /// <param name="source">CommandSource unregistered.</param>
+        public virtual void CommandSourceUnregistered(ICommandSource source)
+        {
+        }
+        #endregion
+
+        #region Component Implementation
+        protected override void Dispose(bool disposing)
+        {
+            if(disposing)
+                CommandManager.UnRegisterCommand(this);
+            base.Dispose(disposing);
+        }
+
+        private string _Name = "";
+        /// <summary>
+        /// Returns name of the node that can be used to identify it from the code.
+        /// </summary>
+        [Browsable(false), Category("Design"), Description("Indicates the name used to identify node.")]
+        public string Name
+        {
+            get
+            {
+                if (this.Site != null)
+                    _Name = this.Site.Name;
+                return _Name;
+            }
+            set
+            {
+                if (this.Site != null)
+                    this.Site.Name = value;
+                if (value == null)
+                    _Name = "";
+                else
+                    _Name = value;
+            }
+        }
+        #endregion
+    }
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/IShapeDescriptor.cs b/PROMS/DotNetBar Source Code/IShapeDescriptor.cs
new file mode 100644
index 00000000..346034a3
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/IShapeDescriptor.cs	
@@ -0,0 +1,31 @@
+using System;
+using System.Text;
+using System.Drawing.Drawing2D;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar
+{
+    public interface IShapeDescriptor
+    {
+        /// <summary>
+        /// Returns the shape that fits given bounds.
+        /// </summary>
+        /// <param name="bounds">Bounds to fit shape in.</param>
+        /// <returns>GraphicsPath representing shape or null if shape cannot be created.</returns>
+        GraphicsPath GetShape(Rectangle bounds);
+
+        /// <summary>
+        /// Returns the inner shape based on the specified border size.
+        /// </summary>
+        /// <param name="bounds">Bounds to fit shape in.</param>
+        /// <returns>GraphicsPath representing shape or null if shape cannot be created.</returns>
+        GraphicsPath GetInnerShape(Rectangle bounds, int borderSize);
+
+        /// <summary>
+        /// Returns whether shape can be drawn given the bounds.
+        /// </summary>
+        /// <param name="bounds">Bounds to test.</param>
+        /// <returns>true if shape can be drawn inside of bounds otherwise false.</returns>
+        bool CanDrawShape(Rectangle bounds);
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/ISimpleTab.cs b/PROMS/DotNetBar Source Code/ISimpleTab.cs
new file mode 100644
index 00000000..1a97714d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/ISimpleTab.cs	
@@ -0,0 +1,104 @@
+using System.ComponentModel;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Represents interface for simple text only tab.
+	/// </summary>
+	public interface ISimpleTab
+	{
+		/// <summary>
+		/// Gets or sets the text displayed on the tab.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),Category("Appearance"),Description("Indicates the text displayed on the tab.")]
+		string Text{get;set;}
+
+		/// <summary>
+		/// Gets or sets whether tab is visible.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),DefaultValue(true),Category("Behavior"),Description("Indicates whether the tab is visible.")]
+		bool Visible{get;set;}
+
+		/// <summary>
+		/// Gets the display bounds of the tab.
+		/// </summary>
+		[Browsable(false)]
+		Rectangle DisplayRectangle{get;}
+
+		/// <summary>
+		/// Gets or sets the background color of the tab when inactive.
+		/// </summary>
+		[Browsable(true),Description("Indicates the inactive tab background color."),Category("Style")]
+		Color BackColor{get;set;}
+
+		/// <summary>
+		/// Gets or sets the target gradient background color of the tab when inactive.
+		/// </summary>
+		[Browsable(true),Description("Indicates the inactive tab target gradient background color."),Category("Style")]
+		Color BackColor2{get;set;}
+
+		/// <summary>
+		/// Gets or sets the gradient angle.
+		/// </summary>
+		[Browsable(true),Description("Indicates the gradient angle."),Category("Style"),DefaultValue(90)]
+		int BackColorGradientAngle{get;set;}
+
+		/// <summary>
+		/// Gets or sets the light border color when tab is inactive.
+		/// </summary>
+		[Browsable(true),Description("Indicates the inactive tab light border color."),Category("Style")]
+		Color LightBorderColor{get;set;}
+
+		/// <summary>
+		/// Gets or sets the dark border color when tab is inactive.
+		/// </summary>
+		[Browsable(true),Description("Indicates the inactive tab dark border color."),Category("Style")]
+		Color DarkBorderColor{get;set;}
+
+		/// <summary>
+		/// Gets or sets the border color when tab is inactive.
+		/// </summary>
+		[Browsable(true),Description("Indicates the inactive tab border color."),Category("Style")]
+		Color BorderColor{get;set;}
+
+		/// <summary>
+		/// Gets or sets the text color when tab is inactive.
+		/// </summary>
+		[Browsable(true),Description("Indicates the inactive tab text color."),Category("Style")]
+		Color TextColor{get;set;}
+
+		/// <summary>
+		/// Gets or sets name of the tab item that can be used to identify item from the code.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),Category("Design"),Description("Indicates the name used to identify item.")]
+		string Name{get;set;}
+
+		/// <summary>
+		/// Gets or sets the predefined tab color.
+		/// </summary>
+		[Browsable(true),DefaultValue(eTabItemColor.Default),Category("Style"),Description("Applies predefined color to tab.")]
+		eTabItemColor PredefinedColor{get;set;}
+
+		/// <summary>
+		/// Returns the font used for tab text.
+		/// </summary>
+		/// <returns>Reference to font object.</returns>
+		Font GetTabFont();
+
+		/// <summary>
+		/// Returns true if tab is selected tab.
+		/// </summary>
+		bool IsSelected{get;}
+
+		/// <summary>
+		/// Returns true if mouse is over the tab.
+		/// </summary>
+		bool IsMouseOver{get;}
+
+		/// <summary>
+		/// Gets the tab alignment.
+		/// </summary>
+		eTabStripAlignment TabAlignment{get;}
+	}
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/ImageHelper.cs b/PROMS/DotNetBar Source Code/ImageHelper.cs
new file mode 100644
index 00000000..cfa58649
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/ImageHelper.cs	
@@ -0,0 +1,127 @@
+using System;
+using System.Text;
+using System.Drawing;
+using System.Drawing.Imaging;
+
+namespace DevComponents.DotNetBar
+{
+    internal static class ImageHelper
+    {
+        public static void DrawImageCenteredDpiAware(Graphics g, Image image, Rectangle r)
+        {
+            if (g.DpiX != 96f || g.DpiY != 96f)
+            {
+                float scaleX = g.DpiX / 96f;
+                float scaleY = g.DpiY / 96f;
+                g.DrawImage(image, r.X + (r.Width - image.Width * scaleX) / 2, r.Y + (r.Height - image.Height * scaleY) / 2,
+                    image.Width * scaleX, image.Height * scaleY);
+            }
+            else
+                g.DrawImage(image, r.X + (r.Width - image.Width) / 2, r.Y + (r.Height - image.Height) / 2);
+        }
+
+        public static Bitmap CreateReflectionImage(Image inputImage)
+        {
+            if (inputImage == null) return null;
+            Bitmap tmp = new Bitmap(inputImage.Width, inputImage.Height, PixelFormat.Format32bppArgb);
+            using (Graphics g = Graphics.FromImage(tmp))
+                g.DrawImage(inputImage, 0, 0, inputImage.Width, inputImage.Height);
+            Bitmap image = tmp;
+            image.RotateFlip(RotateFlipType.Rotate180FlipX);
+
+            Bitmap returnMap = new Bitmap(image.Width, image.Height,
+                                   PixelFormat.Format32bppArgb);
+            BitmapData bitmapData1 = image.LockBits(new Rectangle(0, 0,
+                                     image.Width, image.Height),
+                                     ImageLockMode.ReadOnly,
+                                     PixelFormat.Format32bppArgb);
+            BitmapData bitmapData2 = returnMap.LockBits(new Rectangle(0, 0,
+                                     returnMap.Width, returnMap.Height),
+                                     ImageLockMode.ReadOnly,
+                                     PixelFormat.Format32bppArgb);
+            unsafe
+            {
+                byte* imagePointer1 = (byte*)bitmapData1.Scan0;
+                byte* imagePointer2 = (byte*)bitmapData2.Scan0;
+                int strideOffset = bitmapData1.Stride - (bitmapData1.Width * 4);
+                int height = bitmapData1.Height, width = bitmapData1.Width;
+                for (int i = 0; i < height; i++)
+                {
+                    int alpha = Math.Max(195, (int)(265 * ((i + bitmapData1.Height * .4) / (float)bitmapData1.Height)));
+                    for (int j = 0; j < width; j++)
+                    {
+                        imagePointer2[0] = imagePointer1[0];
+                        imagePointer2[1] = imagePointer1[1];
+                        imagePointer2[2] = imagePointer1[2];
+                        imagePointer2[3] = (byte)(Math.Max(0, imagePointer1[3] - alpha));
+                        //4 bytes per pixel
+                        imagePointer1 += 4;
+                        imagePointer2 += 4;
+                    }
+                    //4 bytes per pixel
+                    imagePointer1 += strideOffset;
+                    imagePointer2 += strideOffset;
+                }
+            }
+            returnMap.UnlockBits(bitmapData2);
+            image.UnlockBits(bitmapData1);
+            return returnMap;
+        }
+
+        public static Bitmap CreateGrayScaleImage(Image inputImage)
+        {
+            if (inputImage == null) return null;
+            Bitmap image = inputImage as Bitmap;
+            if (inputImage.PixelFormat != PixelFormat.Format32bppArgb || image == null)
+            {
+                Bitmap tmp = new Bitmap(inputImage.Width, inputImage.Height, PixelFormat.Format32bppArgb);
+                using (Graphics g = Graphics.FromImage(tmp))
+                    g.DrawImage(inputImage, 0, 0, inputImage.Width, inputImage.Height);
+                image = tmp;
+            }
+
+            Bitmap returnMap = new Bitmap(image.Width, image.Height,
+                                   PixelFormat.Format32bppArgb);
+            BitmapData bitmapData1 = image.LockBits(new Rectangle(0, 0,
+                                     image.Width, image.Height),
+                                     ImageLockMode.ReadOnly,
+                                     PixelFormat.Format32bppArgb);
+            BitmapData bitmapData2 = returnMap.LockBits(new Rectangle(0, 0,
+                                     returnMap.Width, returnMap.Height),
+                                     ImageLockMode.ReadOnly,
+                                     PixelFormat.Format32bppArgb);
+            unsafe
+            {
+                byte* imagePointer1 = (byte*)bitmapData1.Scan0;
+                byte* imagePointer2 = (byte*)bitmapData2.Scan0;
+                int strideOffset = bitmapData1.Stride - (bitmapData1.Width * 4);
+                int height = bitmapData1.Height, width = bitmapData1.Width;
+                for (int i = 0; i < height; i++)
+                {
+                    for (int j = 0; j < width; j++)
+                    {
+                        byte nB = (byte)((imagePointer1[2] + 255) / 2);
+                        byte nG = (byte)((imagePointer1[1] + 255) / 2);
+                        byte nR = (byte)((imagePointer1[0] + 255) / 2);
+                        nR = nG = nB = (byte)(nR * 0.299 + nG * 0.587 + nB * 0.114);
+
+                        imagePointer2[0] = nR;
+                        imagePointer2[1] = nG;
+                        imagePointer2[2] = nB;
+                        imagePointer2[3] = imagePointer1[3];
+
+                        //4 bytes per pixel
+                        imagePointer1 += 4;
+                        imagePointer2 += 4;
+                    }
+                    //4 bytes per pixel
+                    imagePointer1 += strideOffset;
+                    imagePointer2 += strideOffset;
+                }
+            }
+            returnMap.UnlockBits(bitmapData2);
+            image.UnlockBits(bitmapData1);
+            return returnMap;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/ImageItem.cs b/PROMS/DotNetBar Source Code/ImageItem.cs
new file mode 100644
index 00000000..1e3d4a67
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/ImageItem.cs	
@@ -0,0 +1,194 @@
+namespace DevComponents.DotNetBar
+{
+    using System;
+    using System.Drawing;
+
+    /// <summary>
+    /// Adds neccessary functions to base item so it supports images properly.
+    /// If your item implements images you should derive from this class instead of BaseItem
+    /// </summary>
+    [System.ComponentModel.ToolboxItem(false),System.ComponentModel.DesignTimeVisible(false)]
+    public abstract class ImageItem:BaseItem
+    {
+		private System.Drawing.Size m_SubItemsImageSize;  // Biggest Image size for the sub items, they would access this property so they know how to draw themself
+		private System.Drawing.Size m_ImageSize;
+		internal static System.Drawing.Size _InitalImageSize=new System.Drawing.Size(16,16);
+		/// <summary>
+		/// Create new instance of ImageItem.
+		/// </summary>
+		public ImageItem():this("","") {}
+		/// <summary>
+		/// Create new instance of ImageItem and assigns the item name.
+		/// </summary>
+		/// <param name="sName">Item name.</param>
+		public ImageItem(string sName):this(sName,"") {}
+		/// <summary>
+		/// Create new instance of ImageItem and assigns the item name and text.
+		/// </summary>
+		/// <param name="sName">Item name.</param>
+		/// <param name="ItemText">Item text.</param>
+        public ImageItem(string sName, string ItemText):base(sName, ItemText)
+        {
+			m_SubItemsImageSize=_InitalImageSize;
+			m_ImageSize=_InitalImageSize;
+        }
+
+		[System.ComponentModel.Browsable(false),System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden),System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+		public virtual System.Drawing.Size ImageSize
+		{
+			get
+			{
+				return m_ImageSize;
+			}
+			set
+			{
+				m_ImageSize=value;
+			}
+		}
+
+		/// <summary>
+		/// When parent items does recalc size for its sub-items it should query
+		/// image size and store biggest image size into this property.
+		/// </summary>
+		[System.ComponentModel.Browsable(false),System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden),System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+		public virtual System.Drawing.Size SubItemsImageSize
+		{
+			get
+			{
+				return m_SubItemsImageSize;
+			}
+			set
+			{
+				m_SubItemsImageSize=value;
+			}
+		}
+
+		protected internal override void OnItemAdded(BaseItem objItem)
+		{
+			base.OnItemAdded(objItem);
+			ImageItem objImageItem=objItem as ImageItem;
+			if(objImageItem!=null)
+			{
+                Size newSize = m_SubItemsImageSize;
+				if(objImageItem.ImageSize.Width>m_SubItemsImageSize.Width)
+                    newSize.Width = objImageItem.ImageSize.Width;
+				if(objImageItem.ImageSize.Height>m_SubItemsImageSize.Height)
+                    newSize.Height = objImageItem.ImageSize.Height;
+                this.SubItemsImageSize = newSize;
+			}
+		}
+
+		/*public override void AddSubItem(BaseItem objItem, int Position)
+		{
+			base.AddSubItem(objItem, Position);
+			ImageItem objImageItem=objItem as ImageItem;
+			if(objImageItem!=null)
+			{
+				if(objImageItem.ImageSize.Width>m_SubItemsImageSize.Width)
+					m_SubItemsImageSize.Width=objImageItem.ImageSize.Width;
+				if(objImageItem.ImageSize.Height>m_SubItemsImageSize.Height)
+					m_SubItemsImageSize.Height=objImageItem.ImageSize.Height;
+			}
+		}*/
+
+		/// <summary>
+		/// Must be called by any sub item that implements the image when image has changed
+		/// </summary>
+		public virtual void OnSubItemImageSizeChanged(BaseItem objItem)
+		{
+			ImageItem objImageItem=objItem as ImageItem;
+			if(objImageItem==null)
+				return;
+			if(this.SubItems.Count==1)
+			{
+                this.SubItemsImageSize = new Size(objImageItem.ImageSize.Width, objImageItem.ImageSize.Height);
+			}
+			else
+			{
+                Size newSize = m_SubItemsImageSize;
+				if(objImageItem.ImageSize.Width>m_SubItemsImageSize.Width)
+					newSize.Width=objImageItem.ImageSize.Width;
+				if(objImageItem.ImageSize.Height>m_SubItemsImageSize.Height)
+                    newSize.Height = objImageItem.ImageSize.Height;
+                this.SubItemsImageSize = newSize;
+			}
+		}
+
+		protected override void OnIsOnCustomizeDialogChanged()
+		{
+			if(this.IsOnCustomizeDialog && m_ImageSize.Width==_InitalImageSize.Width && m_ImageSize.Height==_InitalImageSize.Height)
+                m_ImageSize=new System.Drawing.Size(16,16);
+			base.OnIsOnCustomizeDialogChanged();
+		}
+
+		/// <summary>
+		/// Called after image on an item has changed.
+		/// </summary>
+		[System.ComponentModel.Browsable(false),System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+		public virtual void OnImageChanged(){}
+
+		/// <summary>
+		/// Refreshes internal image size structure.
+		/// </summary>
+		[System.ComponentModel.Browsable(false),System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+		public virtual void RefreshImageSize()
+		{
+			this.SubItemsImageSize=Dpi.Size(_InitalImageSize);
+			m_ImageSize=_InitalImageSize;
+			this.OnImageChanged();
+			if(m_SubItems!=null)
+			{
+				foreach(BaseItem item in this.SubItems)
+				{
+					if(item is ImageItem)
+						((ImageItem)item).RefreshImageSize();
+				}
+			}
+		}
+
+        /// <summary>
+        /// Occurs after an item has been removed.
+        /// </summary>
+        /// <param name="item">Item being removed.</param>
+        protected internal override void OnAfterItemRemoved(BaseItem item, int itemIndex)
+        {
+            base.OnAfterItemRemoved(item, itemIndex);
+            if (item != null)
+                this.RefreshSubItemImageSize();
+        }
+
+		/// <summary>
+		/// Refreshes internal image size structure.
+		/// </summary>
+		[System.ComponentModel.Browsable(false),System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+		public virtual void RefreshSubItemImageSize()
+		{
+			this.SubItemsImageSize=System.Drawing.Size.Empty;
+			if(m_SubItems!=null)
+			{
+				foreach(BaseItem item in this.SubItems)
+				{
+					ImageItem objImageItem=item as ImageItem;
+					if(objImageItem!=null)
+					{
+                        Size newSize = m_SubItemsImageSize;
+						if(objImageItem.ImageSize.Width>m_SubItemsImageSize.Width)
+							newSize.Width=objImageItem.ImageSize.Width;
+						if(objImageItem.ImageSize.Height>m_SubItemsImageSize.Height)
+							newSize.Height=objImageItem.ImageSize.Height;
+                        this.SubItemsImageSize = newSize;
+					}
+				}
+			}
+
+            if (this.SubItemsImageSize.IsEmpty)
+                this.SubItemsImageSize = Dpi.Size(_InitalImageSize);
+		}
+
+        protected override void ScaleItem(SizeF factor)
+        {
+            base.ScaleItem(factor); // Notify children first so they can update image size and so we can pick it up next
+            RefreshSubItemImageSize();
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Images.resx b/PROMS/DotNetBar Source Code/Images.resx
new file mode 100644
index 00000000..750b5f1b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Images.resx	
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <xsd:schema id="root" targetNamespace="" xmlns="" xmlns:xsd="http://www.w3.org/2000/10/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="data">
+      <xsd:complexType mixed="true">
+        <xsd:all>
+          <xsd:element name="value" minOccurs="0" type="xsd:string"/>
+        </xsd:all>
+        <xsd:attribute name="name" type="xsd:string"/>
+        <xsd:attribute name="type" type="xsd:string"/>
+        <xsd:attribute name="mimetype" type="xsd:string"/>
+      </xsd:complexType>
+    </xsd:element>
+    <xsd:element name="resheader">
+      <xsd:complexType mixed="true">
+        <xsd:all>
+          <xsd:element name="value" minOccurs="0" type="xsd:string"/>
+        </xsd:all>
+        <xsd:attribute name="name" use="required" type="xsd:string"/>
+      </xsd:complexType>
+    </xsd:element>
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element ref="data"/>
+          <xsd:element ref="resheader"/>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <data name="Sample">
+    <value>Add your resources here</value>
+  </data>
+  <resheader name="ResMimeType">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="Version">
+    <value>1.0.0.0</value>
+  </resheader>
+  <resheader name="Reader">
+    <value>System.Resources.ResXResourceReader</value>
+  </resheader>
+  <resheader name="Writer">
+    <value>System.Resources.ResXResourceWriter</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/DevComponents.Instrumentation.csproj b/PROMS/DotNetBar Source Code/InstrumentationControls/DevComponents.Instrumentation.csproj
new file mode 100644
index 00000000..ac3934cb
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/DevComponents.Instrumentation.csproj	
@@ -0,0 +1,224 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{3084E369-3D7B-4918-958F-2776DA03E6BC}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>DevComponents.Instrumentation</RootNamespace>
+    <AssemblyName>DevComponents.Instrumentation</AssemblyName>
+    <StartupObject>
+    </StartupObject>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>DotNetBarKnobControl.snk</AssemblyOriginatorKeyFile>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>2.0</OldToolsVersion>
+    <UpgradeBackupLocation />
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;/define:TRIAL</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseTrial|AnyCPU' ">
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release2005|AnyCPU' ">
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <DocumentationFile>bin\Release\DevComponents.Instrumentation.XML</DocumentationFile>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseTrial2005|AnyCPU' ">
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE;TRIAL</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <DocumentationFile>bin\Release\DevComponents.Instrumentation.XML</DocumentationFile>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Gauges\GaugeControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Gauges\GaugeControl.Designer.cs">
+      <DependentUpon>GaugeControl.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Gauges\GaugeFrame\GaugeFrameCircularRenderer.cs" />
+    <Compile Include="Gauges\GaugeFrame\GaugeFrameRectangularRenderer.cs" />
+    <Compile Include="Gauges\GaugeFrame\GaugeFrameRenderer.cs" />
+    <Compile Include="Gauges\GaugeFrame\GaugeFrameRoundRectRenderer.cs" />
+    <Compile Include="Gauges\GaugeIndicator\DigitalElement.cs" />
+    <Compile Include="Gauges\GaugeIndicator\GaugeIndicator.cs" />
+    <Compile Include="Gauges\GaugeIndicator\IndicatorRange.cs" />
+    <Compile Include="Gauges\GaugeIndicator\MechanicalElement.cs" />
+    <Compile Include="Gauges\GaugeIndicator\NumericElement.cs" />
+    <Compile Include="Gauges\GaugeIndicator\NumericIndicator.cs" />
+    <Compile Include="Gauges\GaugeIndicator\NumericRange.cs" />
+    <Compile Include="Gauges\GaugeIndicator\Seg16Element.cs" />
+    <Compile Include="Gauges\GaugeIndicator\Seg7Element.cs" />
+    <Compile Include="Gauges\GaugeIndicator\StateIndicator.cs" />
+    <Compile Include="Gauges\GaugeIndicator\StateRange.cs" />
+    <Compile Include="Gauges\GaugeLabel\GaugeCustomLabel.cs" />
+    <Compile Include="Gauges\GaugeLabel\GaugeBaseLabel.cs" />
+    <Compile Include="Gauges\GaugePin\GaugePinLabel.cs" />
+    <Compile Include="Gauges\GaugeScale\GaugeCircularScale.cs" />
+    <Compile Include="Gauges\GaugeScale\GaugeLinearScale.cs" />
+    <Compile Include="Gauges\GaugeTickMark\GaugeTickMarkLabel.cs" />
+    <Compile Include="Gauges\GaugeLabel\LabelLayout.cs" />
+    <Compile Include="Gauges\GaugeLabel\LabelPoint.cs" />
+    <Compile Include="Gauges\GaugeItem\GaugeMarker.cs" />
+    <Compile Include="Gauges\GaugePointers\GaugeBarRenderer.cs" />
+    <Compile Include="Gauges\GaugePointers\GaugeNeedleRenderer.cs" />
+    <Compile Include="Gauges\GaugePointers\GaugePointer.cs" />
+    <Compile Include="Gauges\GaugePointers\GaugeMarkerRenderer.cs" />
+    <Compile Include="Gauges\GaugeItem\GaugeItem.cs" />
+    <Compile Include="Gauges\GaugeLabel\GaugeIntervalLabel.cs" />
+    <Compile Include="Gauges\GaugePin\GaugePin.cs" />
+    <Compile Include="Gauges\GaugePointers\GaugePointerRenderer.cs" />
+    <Compile Include="Gauges\GaugePointers\GaugeThermoRenderer.cs" />
+    <Compile Include="Gauges\GaugeStrip\GaugeRange.cs" />
+    <Compile Include="Gauges\GaugeStrip\GaugeSection.cs" />
+    <Compile Include="Gauges\GaugeStrip\GaugeStrip.cs" />
+    <Compile Include="Gauges\GaugeItem\GaugeText.cs" />
+    <Compile Include="Gauges\GaugeTickMark\GaugeTickMark.cs" />
+    <Compile Include="Gauges\GaugeFrame\GaugeFrame.cs" />
+    <Compile Include="Gauges\GaugeItem\GaugeImage.cs">
+    </Compile>
+    <Compile Include="Gauges\GaugeScale\GaugeScale.cs" />
+    <Compile Include="Gauges\GaugeTickMark\GaugeTickMarkBase.cs" />
+    <Compile Include="Gauges\GaugeTickMark\TickMarkLayout.cs" />
+    <Compile Include="Gauges\GaugeTickMark\TickPoint.cs" />
+    <Compile Include="Gauges\GaugeItem\GradientFillColor.cs" />
+    <Compile Include="Gauges\Licensing.cs" />
+    <Compile Include="Gauges\PointFConverter.cs" />
+    <Compile Include="Gauges\RemindForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Knobs\BaseKnob.cs" />
+    <Compile Include="Primitives\GenericCollection.cs" />
+    <Compile Include="Primitives\ColorFactory.cs" />
+    <Compile Include="Knobs\KnobColorTable.cs" />
+    <Compile Include="Knobs\KnobControl.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Knobs\KnobControl.Designer.cs">
+      <DependentUpon>KnobControl.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Knobs\KnobStyle1.cs" />
+    <Compile Include="Knobs\KnobStyle2.cs" />
+    <Compile Include="Knobs\KnobStyle3.cs" />
+    <Compile Include="Knobs\KnobStyle4.cs" />
+    <Compile Include="Primitives\LinearGradientColorTable.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+      <DesignTime>True</DesignTime>
+    </Compile>
+    <None Include="app.config" />
+    <None Include="DotNetBarKnobControl.snk" />
+    <None Include="Properties\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
+    <Compile Include="Properties\Settings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Gauges\RemindForm.resx">
+      <DependentUpon>RemindForm.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="KnobControl.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="GaugeControl.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+      <Visible>False</Visible>
+      <ProductName>Windows Installer 3.1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/DotNetBarKnobControl.snk b/PROMS/DotNetBar Source Code/InstrumentationControls/DotNetBarKnobControl.snk
new file mode 100644
index 00000000..203eadb4
Binary files /dev/null and b/PROMS/DotNetBar Source Code/InstrumentationControls/DotNetBarKnobControl.snk differ
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/GaugeControl.ico b/PROMS/DotNetBar Source Code/InstrumentationControls/GaugeControl.ico
new file mode 100644
index 00000000..6a10d590
Binary files /dev/null and b/PROMS/DotNetBar Source Code/InstrumentationControls/GaugeControl.ico differ
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeControl.Designer.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeControl.Designer.cs
new file mode 100644
index 00000000..0ee21766
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeControl.Designer.cs	
@@ -0,0 +1,36 @@
+namespace DevComponents.Instrumentation
+{
+    partial class GaugeControl
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #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();
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeControl.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeControl.cs
new file mode 100644
index 00000000..3a81e1bc
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeControl.cs	
@@ -0,0 +1,3516 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Drawing.Drawing2D;
+using System.Drawing.Text;
+using System.Threading;
+using System.Windows.Forms;
+
+namespace DevComponents.Instrumentation
+{
+    /// <summary>
+    /// Represents the Gauge control.
+    /// </summary>
+    [ToolboxItem(true), Designer("DevComponents.Instrumentation.Design.GaugeControlDesigner, DevComponents.Instrumentation.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=76cb4c6eb576bca5")]
+    public partial class GaugeControl : Control, IDisposable, ISupportInitialize
+    {
+        #region Events
+
+        #region Gauge events
+
+        [Description("Occurs before any Gauge content is rendered.")]
+        public event EventHandler<RenderGaugeContentEventArgs> PreRenderGaugeContent;
+
+        [Description("Occurs after all Gauge content is rendered.")]
+        public event EventHandler<RenderGaugeContentEventArgs> PostRenderGaugeContent;
+
+        [Description("Occurs when GaugeItem DisplayTemplate text is needed.")]
+        public event EventHandler<GetDisplayTemplateTextEventArgs> GetDisplayTemplateText;
+
+        [Description("Occurs when Dampened Pointer Value needs updated.")]
+        internal event EventHandler<EventArgs> DampeningUpdate;
+
+        #endregion
+
+        #region Scale events
+
+        [Description("Occurs before each Scale is rendered.")]
+        public event EventHandler<PreRenderScaleEventArgs> PreRenderScale;
+
+        [Description("Occurs after each Scale is rendered.")]
+        public event EventHandler<PostRenderScaleEventArgs> PostRenderScale;
+
+        #endregion
+
+        #region Range events
+
+        [Description("Occurs before any Scale Range is rendered.")]
+        public event EventHandler<PreRenderScaleEventArgs> PreRenderScaleRanges;
+
+        [Description("Occurs after every Scale Range has been rendered.")]
+        public event EventHandler<PostRenderScaleEventArgs> PostRenderScaleRanges;
+
+        [Description("Occurs before each Scale Range is rendered.")]
+        public event EventHandler<PreRenderScaleRangeEventArgs> PreRenderScaleRange;
+
+        [Description("Occurs after each Scale Range is rendered.")]
+        public event EventHandler<PostRenderScaleRangeEventArgs> PostRenderScaleRange;
+
+        #endregion
+
+        #region Section Events
+
+        [Description("Occurs before any Scale Section is rendered.")]
+        public event EventHandler<PreRenderScaleEventArgs> PreRenderScaleSections;
+
+        [Description("Occurs after every Scale Section has been rendered.")]
+        public event EventHandler<PostRenderScaleEventArgs> PostRenderScaleSections;
+
+        [Description("Occurs before each Scale Section is rendered.")]
+        public event EventHandler<PreRenderScaleSectionEventArgs> PreRenderScaleSection;
+
+        [Description("Occurs after each Scale Section is rendered.")]
+        public event EventHandler<PostRenderScaleSectionEventArgs> PostRenderScaleSection;
+
+        #endregion
+
+        #region Pointer Events
+
+        [Description("Occurs before any Scale Pointer is rendered.")]
+        public event EventHandler<PreRenderScaleEventArgs> PreRenderScalePointers;
+
+        [Description("Occurs after every Scale Pointer has been rendered.")]
+        public event EventHandler<EventArgs> PostRenderScalePointers;
+
+        [Description("Occurs before each Scale Pointer is rendered.")]
+        public event EventHandler<PreRenderScalePointerEventArgs> PreRenderScalePointer;
+
+        [Description("Occurs after each Scale Pointer is rendered.")]
+        public event EventHandler<PostRenderScalePointerEventArgs> PostRenderScalePointer;
+
+        [Description("Occurs when a Pointer enters a Scale.")]
+        public event EventHandler<ScaleEnterEventArgs> ScaleEnter;
+
+        [Description("Occurs when a Pointer leaves a Scale.")]
+        public event EventHandler<ScaleLeaveEventArgs> ScaleLeave;
+
+        [Description("Occurs when a Pointer enters a Range.")]
+        public event EventHandler<RangeEnterEventArgs> RangeEnter;
+
+        [Description("Occurs when a Pointer leaves a Range.")]
+        public event EventHandler<RangeLeaveEventArgs> RangeLeave;
+
+        [Description("Occurs when a Pointer enters a Section.")]
+        public event EventHandler<SectionEnterEventArgs> SectionEnter;
+
+        [Description("Occurs when a Pointer leaves a Section.")]
+        public event EventHandler<SectionLeaveEventArgs> SectionLeave;
+
+        [Description("Occurs when a Pointer's Value is interactively changing.")]
+        public event EventHandler<PointerChangingEventArgs> PointerChanging;
+
+        [Description("Occurs when a Pointer's Value has been interactively changed.")]
+        public event EventHandler<PointerChangedEventArgs> PointerChanged;
+
+        [Description("Occurs when a Pointer's Value has been changed.")]
+        public event EventHandler<PointerChangedEventArgs> PointerValueChanged;
+
+        [Description("Occurs when a Pointer's GraphicsPath is needed.")]
+        public event EventHandler<GetPointerPathEventArgs> GetPointerPath;
+
+        #endregion
+
+        #region TickMark events
+
+        [Description("Occurs before Scale TickMaks are rendered.")]
+        public event EventHandler<PreRenderScaleEventArgs> PreRenderScaleTickMarks;
+
+        [Description("Occurs after Scale TickMaks are rendered.")]
+        public event EventHandler<PostRenderScaleEventArgs> PostRenderScaleTickMarks;
+
+        #endregion
+
+        #region GaugePin events
+
+        [Description("Occurs before each Scale Min/Max Pin is rendered.")]
+        public event EventHandler<PreRenderScaleGaugePinEventArgs> PreRenderScaleGaugePin;
+
+        [Description("Occurs after each Scale Min/Max Pin has been rendered.")]
+        public event EventHandler<PostRenderScaleGaugePinEventArgs> PostRenderScaleGaugePin;
+
+        #endregion
+
+        #region TickMarkLabel events
+
+        [Description("Occurs before Scale TickMaks Labels are rendered.")]
+        public event EventHandler<PreRenderScaleEventArgs> PreRenderScaleTickMarkLabels;
+
+        [Description("Occurs after Scale TickMaks Labels are rendered.")]
+        public event EventHandler<PostRenderScaleEventArgs> PostRenderScaleTickMarkLabels;
+
+        #endregion
+
+        #region CustomLabel events
+
+        [Description("Occurs before each Scale Custom Label is rendered.")]
+        public event EventHandler<PreRenderScaleCustomLabelEventArgs> PreRenderScaleCustomLabel;
+
+        [Description("Occurs after each Scale Custom Label is rendered.")]
+        public event EventHandler<PostRenderScaleCustomLabelEventArgs> PostRenderScaleCustomLabel;
+
+        #endregion
+
+        #region Indicator events
+
+        [Description("Occurs before each Indicator is rendered.")]
+        public event EventHandler<PreRenderIndicatorEventArgs> PreRenderIndicator;
+
+        [Description("Occurs after each Indicator is rendered.")]
+        public event EventHandler<PostRenderIndicatorEventArgs> PostRenderIndicator;
+
+        [Description("Occurs before each Indicator Digit is rendered.")]
+        public event EventHandler<PreRenderIndicatorDigitEventArgs> PreRenderIndicatorDigit;
+
+        [Description("Occurs after each Indicator Digit is rendered.")]
+        public event EventHandler<PostRenderIndicatorDigitEventArgs> PostRenderIndicatorDigit;
+
+        [Description("Occurs when an Indicator's digit segment pattern is needed.")]
+        public event EventHandler<GetDigitSegmentsEventArgs> GetDigitSegments;
+
+        #endregion
+
+        #endregion
+
+        #region Private variables
+
+        private GaugeFrame _Frame;
+
+        private GaugeCircularScaleCollection _CircularScales;
+        private GaugeLinearScaleCollection _LinearScales;
+        private GaugeItemCollection _GaugeItems;
+
+        private ToolTip _ToolTip;
+        private bool _ShowToolTips;
+        private bool _AntiAlias;
+
+        private GaugeItem _HotItem;
+
+        private bool _MouseDown;
+        private bool _InitComplete;
+        private bool _NeedRecalcLayout;
+
+        private int _SuspendCount;
+        private int _DampCount;
+        private bool _DValueChange;
+        private BackgroundWorker _DampWorker;
+
+        #endregion
+
+        public GaugeControl()
+        {
+            // Initialize our control
+
+            InitializeComponent();
+
+            SetStyle(ControlStyles.UserPaint, true);
+            SetStyle(ControlStyles.AllPaintingInWmPaint, true);
+            SetStyle(ControlStyles.ResizeRedraw, true);
+            SetStyle(ControlStyles.StandardDoubleClick, true);
+            SetStyle(ControlStyles.OptimizedDoubleBuffer, true);
+            SetStyle(ControlStyles.SupportsTransparentBackColor, true);
+            SetStyle(ControlStyles.Selectable, true);
+
+            _Frame = new GaugeFrame(this);
+
+            _CircularScales = new GaugeCircularScaleCollection();
+            _LinearScales = new GaugeLinearScaleCollection();
+            _GaugeItems = new GaugeItemCollection();
+
+            _ToolTip = new ToolTip();
+            _ShowToolTips = true;
+            _AntiAlias = true;
+
+            NeedRecalcLayout = true;
+
+            HookEvents(true);
+        }
+
+        #region DefaultSize
+
+        protected override Size DefaultSize
+        {
+            get { return new Size(250, 250); }
+        }
+
+        #endregion
+
+        #region Licensing
+
+#if !TRIAL
+        private string _LicenseKey = "";
+        private bool _DialogDisplayed;
+
+        [Browsable(false), DefaultValue("")]
+        public string LicenseKey
+        {
+            get { return _LicenseKey; }
+
+            set
+            {
+                if (Licensing.ValidateLicenseKey(value) == false)
+                    _LicenseKey = (!Licensing.CheckLicenseKey(value) ? "9dsjkhds7" : value);
+            }
+        }
+#endif
+        #endregion
+
+        #region Public properties
+
+        #region AntiAlias
+
+        [Browsable(true), DefaultValue(true), Category("Appearance")]
+        [Description("Gets or sets whether anti-aliasing is used while painting.")]
+        public bool AntiAlias
+        {
+            get { return (_AntiAlias); }
+
+            set
+            {
+                if (_AntiAlias != value)
+                {
+                    _AntiAlias = value;
+
+                    OnGaugeChanged();
+                }
+            }
+        }
+
+        #endregion
+
+        #region Frame
+
+        /// <summary>
+        /// Gets the gauge Frame.
+        /// </summary>
+        [Browsable(true), Category("Appearance")]
+        [Description("Indicates the gauge Frame.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public GaugeFrame Frame
+        {
+            get { return (_Frame); }
+        }
+
+        #endregion
+
+        #region GaugeItems
+
+        /// <summary>
+        /// Gets the collection og GaugeItems (Text, Image, etc)
+        /// </summary>
+        [Browsable(true), Category("Appearance")]
+        [Description("Indicates the collection root Gauge Items contained within the gauge.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        [Editor("DevComponents.Instrumentation.Design.GaugeItemCollectionEditor, DevComponents.Instrumentation.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=76cb4c6eb576bca5", typeof(UITypeEditor))]
+        public GaugeItemCollection GaugeItems
+        {
+            get { return (_GaugeItems); }
+        }
+
+        #endregion
+
+        #region CircularScales
+
+        /// <summary>
+        /// Gets the collection of Circular Scales contained within the gauge.
+        /// </summary>
+        [Browsable(true), Category("Appearance")]
+        [Description("Indicates the collection Circular Scales contained within the gauge.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        [Editor("DevComponents.Instrumentation.Design.GaugeCollectionEditor, DevComponents.Instrumentation.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=76cb4c6eb576bca5", typeof(UITypeEditor))]
+        public GaugeCircularScaleCollection CircularScales
+        {
+            get { return (_CircularScales); }
+        }
+
+        #endregion
+
+        #region LinearScales
+
+        /// <summary>
+        /// Gets the collection of Linear Scales contained within the gauge.
+        /// </summary>
+        [Browsable(true), Category("Appearance")]
+        [Description("Indicates the collection Linear Scales contained within the gauge.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        [Editor("DevComponents.Instrumentation.Design.GaugeCollectionEditor, DevComponents.Instrumentation.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=76cb4c6eb576bca5", typeof(UITypeEditor))]
+        public GaugeLinearScaleCollection LinearScales
+        {
+            get { return (_LinearScales); }
+        }
+
+        #endregion
+
+        #region ShowToolTips
+
+        /// <summary>
+        /// Gets or sets whether to display ToolTips
+        /// </summary>
+        [Browsable(true)]
+        [Category("Behavior"), DefaultValue(true)]
+        [Description("Determines whether to display ToolTips.")]
+        public bool ShowToolTips
+        {
+            get { return (_ShowToolTips); }
+            set { _ShowToolTips = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region DValueChange
+
+        internal bool DValueChange
+        {
+            set { _DValueChange = value; }
+        }
+
+        #endregion
+
+        #region HasGetDigitSegments
+
+        internal bool HasGetDigitSegments
+        {
+            get { return (GetDigitSegments != null); }
+        }
+
+        #endregion
+
+        #region InitComplete
+
+        internal bool InitComplete
+        {
+            get { return (_InitComplete); }
+        }
+
+        #endregion
+
+        #region InDesignMode
+
+        internal bool InDesignMode
+        {
+            get { return (DesignMode); }
+        }
+
+        #endregion
+
+        #region IsSuspended
+
+        internal bool IsSuspended
+        {
+            get { return (_SuspendCount > 0); }
+        }
+
+        #endregion
+
+        #region NeedRecalcLayout
+
+        internal bool NeedRecalcLayout
+        {
+            get { return (_NeedRecalcLayout); }
+
+            set
+            {
+                _NeedRecalcLayout = value;
+
+                if (_NeedRecalcLayout == true)
+                    OnLayoutChanged();
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region HookEvents
+
+        private void HookEvents(bool hook)
+        {
+            if (hook == true)
+            {
+                _Frame.GaugeFrameChanged += GaugeFrameGaugeFrameChanged;
+                _CircularScales.CollectionChanged += GaugeCircularScaleItemsCollectionChanged;
+                _LinearScales.CollectionChanged += GaugeLinearScaleItemsCollectionChanged;
+                _GaugeItems.CollectionChanged += GaugeItemsCollectionChanged;
+            }
+            else
+            {
+                _Frame.GaugeFrameChanged -= GaugeFrameGaugeFrameChanged;
+                _CircularScales.CollectionChanged -= GaugeCircularScaleItemsCollectionChanged;
+                _LinearScales.CollectionChanged -= GaugeLinearScaleItemsCollectionChanged;
+                _GaugeItems.CollectionChanged -= GaugeItemsCollectionChanged;
+            }
+        }
+
+        #endregion
+
+        #region Event processing
+
+        #region GaugeFrame_GaugeFrameChanged
+
+        void GaugeFrameGaugeFrameChanged(object sender, EventArgs e)
+        {
+            OnGaugeChanged();
+        }
+
+        #endregion
+
+        #region GaugeItems_CollectionChanged
+
+        void GaugeItemsCollectionChanged(object sender, EventArgs e)
+        {
+            foreach (GaugeItem item in _GaugeItems)
+            {
+                if (item is GaugeImage)
+                {
+                    GaugeImage gi = item as GaugeImage;
+
+                    gi.GaugeControl = this;
+
+                    if (gi.Name == null)
+                        gi.Name = GetItemName("Image");
+                }
+                else if (item is GaugeText)
+                {
+                    GaugeText gt = item as GaugeText;
+
+                    gt.GaugeControl = this;
+
+                    if (gt.Name == null)
+                        gt.Name = GetItemName("Text");
+                }
+                else if (item is NumericIndicator)
+                {
+                    NumericIndicator gt = item as NumericIndicator;
+
+                    gt.GaugeControl = this;
+
+                    if (gt.Name == null)
+                        gt.Name = GetItemName("NumericIndicator");
+                }
+                else if (item is StateIndicator)
+                {
+                    StateIndicator gt = item as StateIndicator;
+
+                    gt.GaugeControl = this;
+
+                    if (gt.Name == null)
+                        gt.Name = GetItemName("StateIndicator");
+                }
+
+                item.NeedRecalcLayout = true;
+
+                item.GaugeItemChanged -= GaugeGaugeItemChanged;
+                item.GaugeItemChanged += GaugeGaugeItemChanged;
+            }
+
+            OnGaugeChanged();
+        }
+
+        #endregion
+
+        #region Gauge_GaugeItemChanged
+
+        void GaugeGaugeItemChanged(object sender, EventArgs e)
+        {
+            OnGaugeChanged();
+        }
+
+        #endregion
+
+        #region GaugeCircularScaleItems_CollectionChanged
+
+        void GaugeCircularScaleItemsCollectionChanged(object sender, EventArgs e)
+        {
+            foreach (GaugeCircularScale scale in _CircularScales)
+            {
+                scale.GaugeControl = this;
+                scale.NeedRecalcLayout = true;
+
+                scale.GaugeItemChanged -= GaugeGaugeCircularItemChanged;
+                scale.GaugeItemChanged += GaugeGaugeCircularItemChanged;
+
+                scale.UpdateValueData();
+            }
+
+            OnGaugeChanged();
+        }
+
+        #endregion
+
+        #region GaugeLinearScaleItems_CollectionChanged
+
+        void GaugeLinearScaleItemsCollectionChanged(object sender, EventArgs e)
+        {
+            foreach (GaugeLinearScale scale in _LinearScales)
+            {
+                scale.GaugeControl = this;
+                scale.NeedRecalcLayout = true;
+
+                scale.GaugeItemChanged -= GaugeGaugeLinearItemChanged;
+                scale.GaugeItemChanged += GaugeGaugeLinearItemChanged;
+            }
+
+            OnGaugeChanged();
+        }
+
+        #endregion
+
+        #region Gauge_GaugeCircularItemChanged
+
+        void GaugeGaugeCircularItemChanged(object sender, EventArgs e)
+        {
+            GaugeCircularScale scale = sender as GaugeCircularScale;
+
+            if (scale != null)
+                Invalidate();
+        }
+
+        #endregion
+
+        #region Gauge_GaugeLinearItemChanged
+
+        void GaugeGaugeLinearItemChanged(object sender, EventArgs e)
+        {
+            GaugeLinearScale scale = sender as GaugeLinearScale;
+
+            if (scale != null)
+                Invalidate();
+        }
+
+        #endregion
+
+        #region GetItemName
+
+        private string GetItemName(string s)
+        {
+            for (int i = 1; i < 100; i++)
+            {
+                string name = s + i;
+
+                if (_GaugeItems[name] == null)
+                    return (name);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region BeginUpdate
+
+        /// <summary>
+        /// Disables any redrawing of the Gauge control. To maintain performance while items
+        /// are added one at a time to the control, call the BeginUpdate method. The BeginUpdate
+        /// method prevents the control from painting until the
+        /// <see cref="EndUpdate">EndUpdate</see> method is called.
+        /// </summary>
+        public void BeginUpdate()
+        {
+            _SuspendCount++;
+        }
+
+        #endregion
+
+        #region EndUpdate
+
+        /// <summary>
+        /// Enables the redrawing of the Gauge control. To maintain performance while items are
+        /// added one at a time to the control, call the <see cref="BeginUpdate">BeginUpdate</see>
+        /// method. The BeginUpdate method prevents the control from painting until the EndUpdate
+        /// method is called.
+        /// </summary>
+        public void EndUpdate()
+        {
+            EndUpdate(true);
+        }
+
+        internal void EndUpdate(bool refresh)
+        {
+            if (_SuspendCount > 0)
+            {
+                _SuspendCount--;
+
+                if (_SuspendCount == 0 && refresh == true)
+                    Refresh();
+            }
+        }
+
+        #endregion
+
+        #region RecalcLayout
+
+        private void RecalcLayout()
+        {
+            if (_NeedRecalcLayout == true)
+                NeedRecalcLayout = false;
+        }
+
+        #endregion
+
+        #region Refresh
+
+        public override void Refresh()
+        {
+            NeedRecalcLayout = true;
+
+            base.Refresh();
+        }
+
+        #endregion
+
+        #region OnPaint
+
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            base.OnPaint(e);
+
+            if (_SuspendCount == 0)
+            {
+                RecalcLayout();
+
+                Graphics g = e.Graphics;
+                Region rgn = g.Clip;
+
+                if (_AntiAlias == true)
+                {
+                    g.SmoothingMode = SmoothingMode.AntiAlias;
+                    g.TextRenderingHint = TextRenderingHint.AntiAlias;
+                }
+
+                PaintGauge(e, rgn);
+
+                g.Clip = rgn;
+            }
+        }
+
+        #endregion
+
+        #region PaintGauge
+
+        private void PaintGauge(PaintEventArgs e, Region rgn)
+        {
+            if (_AntiAlias == true)
+                e.Graphics.SmoothingMode = SmoothingMode.AntiAlias;
+
+            e.Graphics.CompositingQuality = CompositingQuality.HighQuality;
+
+            _Frame.OnPaint(e);
+#if TRIAL
+            if (Licensing.ColorExpAlt())
+            {
+                e.Graphics.Clip = rgn;
+
+                PaintLicenseText(e.Graphics,
+                    "Thank you very much for trying GaugeControl. Unfortunately your trial period has expired. " +
+                    "To continue using GaugeControl you should purchase a license at http://www.devcomponents.com",
+                    10, Color.Gray, Color.Red, 255);
+
+                return;
+            }
+#endif
+            if (_Frame.Renderer != null)
+                _Frame.Renderer.SetBackClipRegion(e);
+
+            OnPreContentRender(e);
+
+            PaintGaugeItems(e, true);
+            PaintScaleItems(e);
+            PaintGaugeItems(e, false);
+            PaintPointerItems(e, false);
+
+            OnPostContentRender(e);
+
+#if TRIAL
+            e.Graphics.Clip = rgn;
+
+            PaintLicenseText(e.Graphics,
+                "DotNetBar\nGaugeControl\nTrial Version.\nEvaluation only.",
+                8, Color.LightGray, Color.Gray, 150);
+#else
+            if (Licensing.KeyValidated2 != 114)
+            {
+                e.Graphics.Clip = rgn;
+
+                PaintLicenseText(e.Graphics,
+                    "DotNetBar GaugeControl license not found. Please purchase a license at http://www.devcomponents.com",
+                    10, Color.Gray, Color.Red, 255);
+            }
+#endif
+        }
+
+        #endregion
+
+        #region PaintLicenseText
+
+        private void PaintLicenseText(Graphics g,
+            string text, int fontSize, Color c1, Color c2, int alpha)
+        {
+            using (StringFormat sf = new StringFormat(StringFormat.GenericDefault))
+            {
+                sf.Alignment = StringAlignment.Center;
+                sf.LineAlignment = StringAlignment.Center;
+
+                Rectangle r = ClientRectangle;
+
+                using (Font font = new Font(Font.FontFamily, fontSize))
+                {
+                    using (Brush br = new SolidBrush(Color.FromArgb(alpha, c1)))
+                        g.DrawString(text, font, br, r, sf);
+
+                    r.X -= 1;
+                    r.Y -= 1;
+
+                    using (Brush br = new SolidBrush(Color.FromArgb(alpha, c2)))
+                        g.DrawString(text, font, br, r, sf);
+                }
+            }
+        }
+
+        #endregion
+
+        #region PaintScaleItems
+
+        private void PaintScaleItems(PaintEventArgs e)
+        {
+            if (_CircularScales != null)
+            {
+                foreach (GaugeCircularScale scale in _CircularScales)
+                {
+                    if (scale.Visible == true)
+                        scale.OnPaint(e);
+                }
+            }
+
+            if (_LinearScales != null)
+            {
+                foreach (GaugeLinearScale scale in _LinearScales)
+                {
+                    if (scale.Visible == true)
+                        scale.OnPaint(e);
+                }
+            }
+        }
+
+        #endregion
+
+        #region PaintGaugeItems
+
+        private void PaintGaugeItems(PaintEventArgs e, bool under)
+        {
+            if (_GaugeItems != null)
+            {
+                foreach (GaugeItem item in _GaugeItems)
+                {
+                    if (item.Visible == true)
+                    {
+                        if (item is GaugeText)
+                        {
+                            if (((GaugeText) item).UnderScale == under)
+                                item.OnPaint(e);
+                        }
+                        else if (item is GaugeImage)
+                        {
+                            if (((GaugeImage) item).UnderScale == under)
+                                item.OnPaint(e);
+                        }
+                        else if (item is GaugeIndicator)
+                        {
+                            if (((GaugeIndicator)item).UnderScale == under)
+                                item.OnPaint(e);
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region PaintPointerItems
+
+        private void PaintPointerItems(PaintEventArgs e, bool under)
+        {
+            if (_CircularScales != null)
+            {
+                foreach (GaugeCircularScale scale in _CircularScales)
+                {
+                    if (scale.Visible == true)
+                        scale.PaintPointers(e, under);
+                }
+            }
+
+            if (_LinearScales != null)
+            {
+                foreach (GaugeLinearScale scale in _LinearScales)
+                {
+                    if (scale.Visible == true)
+                        scale.PaintPointers(e, under);
+                }
+            }
+        }
+
+        #endregion
+
+        #region OnEvent processing
+
+        #region Gauge events
+
+        #region OnResize
+
+        protected override void OnResize(EventArgs e)
+        {
+            base.OnResize(e);
+
+            NeedRecalcLayout = true;
+
+            _Frame.RecalcLayout();
+        }
+
+        #endregion
+
+        #region OnGaugeChanged
+
+        protected void OnGaugeChanged()
+        {
+            Invalidate();
+        }
+
+        #endregion
+
+        #region OnLayoutChanged
+
+        private void OnLayoutChanged()
+        {
+            _Frame.NeedRecalcLayout = true;
+
+            if (_CircularScales != null)
+            {
+                foreach (GaugeCircularScale item in _CircularScales)
+                    item.NeedRecalcLayout = true;
+            }
+
+            if (_LinearScales != null)
+            {
+                foreach (GaugeLinearScale item in _LinearScales)
+                    item.NeedRecalcLayout = true;
+            }
+
+            if (_GaugeItems != null)
+            {
+                foreach (GaugeItem item in _GaugeItems)
+                    item.NeedRecalcLayout = true;
+            }
+        }
+
+        #endregion
+
+        #region OnPreContentRender
+
+        private void OnPreContentRender(PaintEventArgs e)
+        {
+            if (PreRenderGaugeContent != null)
+            {
+                RenderGaugeContentEventArgs args =
+                    new RenderGaugeContentEventArgs(e.Graphics, _Frame.BackBounds);
+
+                PreRenderGaugeContent(this, args);
+
+                if (args.Cancel == true)
+                    return;
+            }
+
+            _Frame.PreRenderContent(e);
+        }
+
+        #endregion
+
+        #region OnPostContentRender
+
+        private void OnPostContentRender(PaintEventArgs e)
+        {
+            if (PostRenderGaugeContent != null)
+            {
+                RenderGaugeContentEventArgs args =
+                    new RenderGaugeContentEventArgs(e.Graphics, _Frame.BackBounds);
+
+                PostRenderGaugeContent(this, args);
+
+                if (args.Cancel == true)
+                    return;
+            }
+
+            _Frame.PostRenderContent(e);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Scale events
+
+        #region OnPreRenderScale
+
+        internal bool OnPreRenderScale(PaintEventArgs e, GaugeScale scale)
+        {
+            if (PreRenderScale != null)
+            {
+                PreRenderScaleEventArgs args =
+                    new PreRenderScaleEventArgs(e.Graphics, scale);
+
+                PreRenderScale(this, args);
+
+                if (args.Cancel == true)
+                    return (true);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region OnPostRenderScale
+
+        internal void OnPostRenderScale(PaintEventArgs e, GaugeScale scale)
+        {
+            if (PostRenderScale != null)
+            {
+                PostRenderScaleEventArgs args =
+                    new PostRenderScaleEventArgs(e.Graphics, scale);
+
+                PostRenderScale(this, args);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Range events
+
+        #region OnPreRenderScaleRanges
+
+        internal bool OnPreRenderScaleRanges(PaintEventArgs e, GaugeScale scale)
+        {
+            if (PreRenderScaleRanges != null)
+            {
+                PreRenderScaleEventArgs args =
+                    new PreRenderScaleEventArgs(e.Graphics, scale);
+
+                PreRenderScaleRanges(this, args);
+
+                if (args.Cancel == true)
+                    return (true);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region OnPostRenderScaleRanges
+
+        internal void OnPostRenderScaleRanges(PaintEventArgs e, GaugeScale scale)
+        {
+            if (PostRenderScaleRanges != null)
+            {
+                PostRenderScaleEventArgs args =
+                    new PostRenderScaleEventArgs(e.Graphics, scale);
+
+                PostRenderScaleRanges(this, args);
+            }
+        }
+
+        #endregion
+
+        #region OnPreRenderScaleRange
+
+        internal bool OnPreRenderScaleRange(PaintEventArgs e, GaugeRange range)
+        {
+            if (PreRenderScaleRange != null)
+            {
+                PreRenderScaleRangeEventArgs args =
+                    new PreRenderScaleRangeEventArgs(e.Graphics, range);
+
+                PreRenderScaleRange(this, args);
+
+                if (args.Cancel == true)
+                    return (true);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region OnPostRenderScaleRange
+
+        internal void OnPostRenderScaleRange(PaintEventArgs e, GaugeRange range)
+        {
+            if (PostRenderScaleRange != null)
+            {
+                PostRenderScaleRangeEventArgs args =
+                    new PostRenderScaleRangeEventArgs(e.Graphics, range);
+
+                PostRenderScaleRange(this, args);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Section events
+
+        #region OnPreRenderScaleSections
+
+        internal bool OnPreRenderScaleSections(PaintEventArgs e, GaugeScale scale)
+        {
+            if (PreRenderScaleSections != null)
+            {
+                PreRenderScaleEventArgs args =
+                    new PreRenderScaleEventArgs(e.Graphics, scale);
+
+                PreRenderScaleSections(this, args);
+
+                if (args.Cancel == true)
+                    return (true);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region OnPostRenderScaleSections
+
+        internal void OnPostRenderScaleSections(PaintEventArgs e, GaugeScale scale)
+        {
+            if (PostRenderScaleSections != null)
+            {
+                PostRenderScaleEventArgs args =
+                    new PostRenderScaleEventArgs(e.Graphics, scale);
+
+                PostRenderScaleSections(this, args);
+            }
+        }
+
+        #endregion
+
+        #region OnPreRenderScaleSection
+
+        internal bool OnPreRenderScaleSection(PaintEventArgs e, GaugeSection section)
+        {
+            if (PreRenderScaleSection != null)
+            {
+                PreRenderScaleSectionEventArgs args =
+                    new PreRenderScaleSectionEventArgs(e.Graphics, section);
+
+                PreRenderScaleSection(this, args);
+
+                if (args.Cancel == true)
+                    return (true);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region OnPostRenderScaleSection
+
+        internal void OnPostRenderScaleSection(PaintEventArgs e, GaugeSection section)
+        {
+            if (PostRenderScaleSection != null)
+            {
+                PostRenderScaleSectionEventArgs args =
+                    new PostRenderScaleSectionEventArgs(e.Graphics, section);
+
+                PostRenderScaleSection(this, args);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Pointer events
+
+        #region OnPreRenderScalePointers
+
+        internal bool OnPreRenderScalePointers(PaintEventArgs e, GaugeScale scale)
+        {
+            if (PreRenderScalePointers != null)
+            {
+                PreRenderScaleEventArgs args =
+                    new PreRenderScaleEventArgs(e.Graphics, scale);
+
+                PreRenderScalePointers(this, args);
+
+                if (args.Cancel == true)
+                    return (true);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region OnPostRenderScalePointers
+
+        internal void OnPostRenderScalePointers(PaintEventArgs e, GaugeScale scale)
+        {
+            if (PostRenderScalePointers != null)
+            {
+                PostRenderScaleEventArgs args =
+                    new PostRenderScaleEventArgs(e.Graphics, scale);
+
+                PostRenderScalePointers(this, args);
+            }
+        }
+
+        #endregion
+
+        #region OnPreRenderScalePointer
+
+        internal bool OnPreRenderScalePointer(PaintEventArgs e, GaugePointer pointer)
+        {
+            if (PreRenderScalePointer != null)
+            {
+                PreRenderScalePointerEventArgs args =
+                    new PreRenderScalePointerEventArgs(e.Graphics, pointer);
+
+                PreRenderScalePointer(this, args);
+
+                if (args.Cancel == true)
+                    return (true);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region OnPostRenderScalePointer
+
+        internal void OnPostRenderScalePointer(PaintEventArgs e, GaugePointer pointer)
+        {
+            if (PostRenderScalePointer != null)
+            {
+                PostRenderScalePointerEventArgs args =
+                    new PostRenderScalePointerEventArgs(e.Graphics, pointer);
+
+                PostRenderScalePointer(this, args);
+            }
+        }
+
+        #endregion
+
+        #region OnScaleEnter
+
+        internal void OnScaleEnter(GaugePointer pointer, GaugeScale scale)
+        {
+            if (ScaleEnter != null)
+                ScaleEnter(this, new ScaleEnterEventArgs(pointer, scale));
+        }
+
+        #endregion
+
+        #region OnScaleExit
+
+        internal void OnScaleExit(GaugePointer pointer, GaugeScale scale)
+        {
+            if (ScaleLeave != null)
+                ScaleLeave(this, new ScaleLeaveEventArgs(pointer, scale));
+        }
+
+        #endregion
+
+        #region OnSectionEnter
+
+        internal void OnSectionEnter(GaugePointer pointer, GaugeSection section)
+        {
+            if (SectionEnter != null)
+                SectionEnter(this, new SectionEnterEventArgs(pointer, section));
+        }
+
+        #endregion
+
+        #region OnSectionExit
+
+        internal void OnSectionExit(GaugePointer pointer, GaugeSection section)
+        {
+            if (SectionLeave != null)
+                SectionLeave(this, new SectionLeaveEventArgs(pointer, section));
+        }
+
+        #endregion
+
+        #region OnRangeEnter
+
+        internal void OnRangeEnter(GaugePointer pointer, GaugeRange range)
+        {
+            if (RangeEnter != null)
+                RangeEnter(this, new RangeEnterEventArgs(pointer, range));
+        }
+
+        #endregion
+
+        #region OnRangeExit
+
+        internal void OnRangeExit(GaugePointer pointer, GaugeRange range)
+        {
+            if (RangeLeave != null)
+                RangeLeave(this, new RangeLeaveEventArgs(pointer, range));
+        }
+
+        #endregion
+
+        #region OnPointerChanging
+
+        internal bool OnPointerChanging(GaugePointer pointer, double oldValue, ref double newValue)
+        {
+            if (PointerChanging != null)
+            {
+                PointerChangingEventArgs args =
+                    new PointerChangingEventArgs(pointer, oldValue, newValue);
+
+                PointerChanging(this, args);
+
+                newValue = args.NewValue;
+
+                return (args.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region OnPointerChanged
+
+        internal void OnPointerChanged(GaugePointer pointer, double oldValue, double newValue)
+        {
+            if (PointerChanged != null)
+            {
+                PointerChangedEventArgs args =
+                    new PointerChangedEventArgs(pointer, oldValue, newValue);
+
+                PointerChanged(this, args);
+            }
+        }
+
+        #endregion
+
+        #region OnPointerValueChanged
+
+        internal void OnPointerValueChanged(GaugePointer pointer, double oldValue, double newValue)
+        {
+            if (PointerValueChanged != null)
+            {
+                PointerChangedEventArgs args =
+                    new PointerChangedEventArgs(pointer, oldValue, newValue);
+
+                PointerValueChanged(this, args);
+            }
+        }
+
+        #endregion
+
+        #region OnGetPointerPath
+
+        internal GraphicsPath OnGetPointerPath(GaugePointer pointer, Rectangle bounds)
+        {
+            if (GetPointerPath != null)
+            {
+                GetPointerPathEventArgs e =
+                    new GetPointerPathEventArgs(pointer, bounds);
+
+                GetPointerPath(this, e);
+
+                return (e.Path);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region TickMark events
+
+        #region OnPreRenderScaleTickMarks
+
+        internal bool OnPreRenderScaleTickMarks(PaintEventArgs e, GaugeScale scale)
+        {
+            if (PreRenderScaleTickMarks != null)
+            {
+                PreRenderScaleEventArgs args =
+                    new PreRenderScaleEventArgs(e.Graphics, scale);
+
+                PreRenderScaleTickMarks(this, args);
+
+                if (args.Cancel == true)
+                    return (true);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region OnPostRenderScaleTickMarks
+
+        internal void OnPostRenderScaleTickMarks(PaintEventArgs e, GaugeScale scale)
+        {
+            if (PostRenderScaleTickMarks != null)
+            {
+                PostRenderScaleEventArgs args =
+                    new PostRenderScaleEventArgs(e.Graphics, scale);
+
+                PostRenderScaleTickMarks(this, args);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GaugePin events
+
+        #region OnPreRenderScaleGaugePin
+
+        internal bool OnPreRenderScaleGaugePin(PaintEventArgs e, GaugePin gaugePin)
+        {
+            if (PreRenderScaleGaugePin != null)
+            {
+                PreRenderScaleGaugePinEventArgs args =
+                    new PreRenderScaleGaugePinEventArgs(e.Graphics, gaugePin);
+
+                PreRenderScaleGaugePin(this, args);
+
+                if (args.Cancel == true)
+                    return (true);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region OnPostRenderScaleGaugePin
+
+        internal void OnPostRenderScaleGaugePin(PaintEventArgs e, GaugePin gaugePin)
+        {
+            if (PostRenderScaleGaugePin != null)
+            {
+                PostRenderScaleGaugePinEventArgs args =
+                    new PostRenderScaleGaugePinEventArgs(e.Graphics, gaugePin);
+
+                PostRenderScaleGaugePin(this, args);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region TickMarkLabels events
+
+        #region OnPreRenderScaleTickMarkLabels
+
+        internal bool OnPreRenderScaleTickMarkLabels(PaintEventArgs e, GaugeScale scale)
+        {
+            if (PreRenderScaleTickMarkLabels != null)
+            {
+                PreRenderScaleEventArgs args =
+                    new PreRenderScaleEventArgs(e.Graphics, scale);
+
+                PreRenderScaleTickMarkLabels(this, args);
+
+                if (args.Cancel == true)
+                    return (true);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region OnPostRenderScaleTickMarkLabels
+
+        internal void OnPostRenderScaleTickMarkLabels(PaintEventArgs e, GaugeScale scale)
+        {
+            if (PostRenderScaleTickMarkLabels != null)
+            {
+                PostRenderScaleEventArgs args =
+                    new PostRenderScaleEventArgs(e.Graphics, scale);
+
+                PostRenderScaleTickMarkLabels(this, args);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region CustomLabel events
+
+        #region OnPreRenderScaleCustomLabel
+
+        internal bool OnPreRenderScaleCustomLabel(PaintEventArgs e, GaugeCustomLabel customLabel)
+        {
+            if (PreRenderScaleCustomLabel != null)
+            {
+                PreRenderScaleCustomLabelEventArgs args =
+                    new PreRenderScaleCustomLabelEventArgs(e.Graphics, customLabel);
+
+                PreRenderScaleCustomLabel(this, args);
+
+                if (args.Cancel == true)
+                    return (true);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region OnPostRenderScaleCustomLabel
+
+        internal void OnPostRenderScaleCustomLabel(PaintEventArgs e, GaugeCustomLabel customLabel)
+        {
+            if (PostRenderScaleCustomLabel != null)
+            {
+                PostRenderScaleCustomLabelEventArgs args =
+                    new PostRenderScaleCustomLabelEventArgs(e.Graphics, customLabel);
+
+                PostRenderScaleCustomLabel(this, args);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetDisplayTemplateText
+
+        internal string OnGetDisplayTemplateText(
+            GaugeItem item, string displayTemplate, string displayFormat)
+        {
+            if (GetDisplayTemplateText != null)
+            {
+                GetDisplayTemplateTextEventArgs e =
+                    new GetDisplayTemplateTextEventArgs(item, displayTemplate, displayFormat);
+
+                GetDisplayTemplateText(this, e);
+
+                return (e.DisplayText);
+            }
+
+            return (displayTemplate);
+        }
+
+        #endregion
+
+        #region Indicator events
+
+        #region OnPreRenderIndicator
+
+        internal bool OnPreRenderIndicator(PaintEventArgs e, GaugeIndicator indicator)
+        {
+            if (PreRenderIndicator != null)
+            {
+                PreRenderIndicatorEventArgs args =
+                    new PreRenderIndicatorEventArgs(e.Graphics, indicator);
+
+                PreRenderIndicator(this, args);
+
+                if (args.Cancel == true)
+                    return (true);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region OnPostRenderIndicator
+
+        internal void OnPostRenderIndicator(PaintEventArgs e, GaugeIndicator indicator)
+        {
+            if (PostRenderIndicator != null)
+            {
+                PostRenderIndicatorEventArgs args =
+                    new PostRenderIndicatorEventArgs(e.Graphics, indicator);
+
+                PostRenderIndicator(this, args);
+            }
+        }
+
+        #endregion
+
+        #region OnPreRenderIndicatorDigit
+
+        internal bool OnPreRenderIndicatorDigit(
+            PaintEventArgs e, NumericIndicator indicator, NumericElement digit, int index)
+        {
+            if (PreRenderIndicatorDigit != null)
+            {
+                PreRenderIndicatorDigitEventArgs args =
+                    new PreRenderIndicatorDigitEventArgs(e.Graphics, indicator, digit, index);
+
+                try
+                {
+                    digit.InRenderCallout = true;
+
+                    PreRenderIndicatorDigit(this, args);
+                }
+                finally
+                {
+                    digit.InRenderCallout = false;
+                }
+
+                if (args.Cancel == true)
+                    return (true);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region OnPostRenderIndicatorDigit
+
+        internal void OnPostRenderIndicatorDigit(
+            PaintEventArgs e, NumericIndicator indicator, NumericElement digit, int index)
+        {
+            if (PostRenderIndicatorDigit != null)
+            {
+                PostRenderIndicatorDigitEventArgs args =
+                    new PostRenderIndicatorDigitEventArgs(e.Graphics, indicator, digit, index);
+
+                try
+                {
+                    digit.InRenderCallout = true;
+
+                    PostRenderIndicatorDigit(this, args);
+                }
+                finally
+                {
+                    digit.InRenderCallout = false;
+                }
+            }
+        }
+
+        #endregion
+
+        #region OnGetDigitSegments
+
+        internal int OnGetDigitSegments(NumericIndicator indicator, char digit, int segments)
+        {
+            if (GetDigitSegments != null)
+            {
+                GetDigitSegmentsEventArgs e =
+                    new GetDigitSegmentsEventArgs(indicator, digit, segments);
+
+                GetDigitSegments(this, e);
+
+                return (e.Segments);
+            }
+
+            return (segments);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region Pointer Dampening support
+
+        #region StartDampening
+
+        internal void StartDampening()
+        {
+            if (_DampWorker == null)
+            {
+                _DampWorker = new BackgroundWorker();
+
+                _DampWorker.WorkerSupportsCancellation = true;
+                _DampWorker.DoWork += DampWorkerDoWork;
+
+                _DampWorker.RunWorkerAsync();
+            }
+
+            _DampCount++;
+        }
+
+        #endregion
+
+        #region StopDampening
+
+        public void StopDampening()
+        {
+            if (_DampCount > 0)
+            {
+                _DampCount--;
+
+                if (_DampCount == 0)
+                {
+                    if (_DampWorker != null)
+                    {
+                        BackgroundWorker worker = _DampWorker;
+                        _DampWorker = null;
+
+                        worker.CancelAsync();
+                        worker.DoWork -= DampWorkerDoWork;
+                        worker.Dispose();
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region DampWorkerDoWork
+
+        void DampWorkerDoWork(object sender, DoWorkEventArgs e)
+        {
+            BackgroundWorker worker = (BackgroundWorker)sender;
+
+            while (!worker.CancellationPending)
+            {
+                EventHandler<EventArgs> eh = DampeningUpdate;
+                if (eh != null)
+                {
+                    this.Invoke(new MethodInvoker(delegate
+                    {
+                        BeginUpdate();
+                        eh(this, EventArgs.Empty);
+                        EndUpdate(_DValueChange);
+                    }
+                    ));
+
+                    _DValueChange = false;
+                }
+
+                Thread.Sleep(20);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Mouse processing
+
+        #region OnMouseMove
+
+        protected override void OnMouseMove(MouseEventArgs e)
+        {
+            base.OnMouseMove(e);
+
+            if (_MouseDown == true)
+            {
+                if (_HotItem != null)
+                    _HotItem.OnMouseMove(e, true);
+            }
+            else
+            {
+                GaugeItem item = GetGaugeItemFromPoint(e.Location);
+
+                if (item != null)
+                {
+                    if (_HotItem != item)
+                    {
+                        if (_HotItem != null)
+                            _HotItem.OnMouseLeave();
+
+                        Cursor = Cursors.Default;
+
+                        item.OnMouseEnter();
+
+                        if (_ShowToolTips == true)
+                            _ToolTip.SetToolTip(this, item.GetitemTemplateText(this));
+                    }
+
+                    item.OnMouseMove(e, false);
+                }
+                else
+                {
+                    if (_HotItem != null)
+                    {
+                        _HotItem.OnMouseLeave();
+
+                        _ToolTip.SetToolTip(this, "");
+                    }
+
+                    Cursor = Cursors.Default;
+                }
+
+                _HotItem = item;
+            }
+        }
+
+        #endregion
+
+        #region OnMouseDown
+
+        protected override void OnMouseDown(MouseEventArgs e)
+        {
+            base.OnMouseDown(e);
+
+            _MouseDown = true;
+
+            if (_HotItem != null)
+                _HotItem.OnMouseDown(e);
+
+#if !TRIAL
+            if (Licensing.KeyValidated2 != 114 && _DialogDisplayed == false)
+            {
+                RemindForm f = new RemindForm();
+
+                f.ShowDialog();
+                f.Dispose();
+
+                _DialogDisplayed = true;
+            }
+#endif
+        }
+
+        #endregion
+
+        #region OnMouseUp
+
+        protected override void OnMouseUp(MouseEventArgs e)
+        {
+            base.OnMouseUp(e);
+
+            if (_MouseDown == true)
+            {
+                _MouseDown = false;
+
+                if (_HotItem != null)
+                {
+                    if (_ShowToolTips == true)
+                        _ToolTip.SetToolTip(this, _HotItem.GetitemTemplateText(this));
+
+                    _HotItem.OnMouseUp(e);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetAbsPoint
+
+        internal Point GetAbsPoint(PointF ptf, bool minSize)
+        {
+            int width = Width;
+            int height = Height;
+
+            Point pt = Point.Empty;
+
+            if (minSize == true)
+            {
+                if (width > height)
+                {
+                    pt.X = (width - height) / 2;
+                    width = height;
+                }
+                else
+                {
+                    pt.Y = (height - width) / 2;
+                    height = width;
+                }
+            }
+
+            pt.X += (int)(width * ptf.X);
+            pt.Y += (int)(height * ptf.Y);
+
+            return (pt);
+        }
+
+        #endregion
+
+        #region GetAbsSize
+
+        internal Size GetAbsSize(SizeF sf, bool minSize)
+        {
+            if (NeedRecalcLayout == true)
+                throw new Exception();
+
+            int width = Width;
+            int height = Height;
+
+            if (minSize == true)
+            {
+                if (width > height)
+                    width = height;
+                else
+                    height = width;
+            }
+
+            Size size = new Size((int)(width * sf.Width), (int)(height * sf.Height));
+
+            if (size.Width <= 0)
+                size.Width = 1;
+
+            if (size.Height <= 0)
+                size.Height = 1;
+
+            return (size);
+        }
+
+        #endregion
+
+        #region GetPointerValue
+
+        /// <summary>
+        /// Gets the named Pointer Value.
+        /// If the Pointer is not defined, an exception is thrown.
+        /// </summary>
+        /// <param name="pointerName">Pointer Name</param>
+        /// <returns>Value</returns>
+        public double GetPointerValue(string pointerName)
+        {
+            GaugePointer pointer = GetPointer(pointerName);
+
+            if (pointer != null)
+                return (pointer.Value);
+
+            throw new Exception("Pointer (" + pointerName + ") is not defined.");
+        }
+
+        /// <summary>
+        /// Gets the named Scale:Pointer Value.
+        /// If either the Scale or the Pointer is not defined,
+        /// an exception is thrown.
+        /// </summary>
+        /// <param name="scaleName">Scale Name</param>
+        /// <param name="pointerName">Pointer Name</param>
+        /// <returns></returns>
+        public double GetPointerValue(string scaleName, string pointerName)
+        {
+            GaugePointer pointer = GetPointer(scaleName, pointerName);
+
+            if (pointer != null)
+                return (pointer.Value);
+
+            throw new Exception("Scale/Pointer (" + scaleName + "/" + pointerName + ") is not defined.");
+        }
+
+        #endregion
+
+        #region SetPointerValue
+
+        #region SetPointerValue (pointerName, value[, dampen])
+
+        /// <summary>
+        /// Sets the named Pointer Value to the given value.
+        /// An exception is thrown if the Pointer is not defined.
+        /// </summary>
+        /// <param name="pointerName">Pointer Name</param>
+        /// <param name="value">Value to set</param>
+        public void SetPointerValue(string pointerName, double value)
+        {
+            SetPointerValue(pointerName, value, true);
+        }
+
+        /// <summary>
+        /// Sets the named Pointer Value to the given value.
+        /// An exception is thrown if the Pointer is not defined.
+        /// </summary>
+        /// <param name="pointerName">Pointer Name</param>
+        /// <param name="value">Value to set</param>
+        /// <param name="dampen">Indicates whether to dampen the resultant output</param>
+        public void SetPointerValue(string pointerName, double value, bool dampen)
+        {
+            GaugePointer pointer = GetPointer(pointerName);
+
+            if (pointer != null)
+            {
+                if (dampen == true)
+                    pointer.Value = value;
+                else
+                    pointer.ValueEx = value;
+            }
+            else
+            {
+                throw new Exception("Pointer (" + pointerName + ") is not defined.");
+            }
+        }
+
+        #endregion
+
+        #region SetPointerValue (scaleName, pointerName[, dampen])
+
+        /// <summary>
+        /// Sets the named Scale:Pointer Value to the given value.
+        /// An exception is thrown if the Scale or Pointer is not defined.
+        /// </summary>
+        /// <param name="scaleName">Scale name</param>
+        /// <param name="pointerName">Pointer name</param>
+        /// <param name="value">Value to set</param>
+        public void SetPointerValue(string scaleName, string pointerName, double value)
+        {
+            SetPointerValue(scaleName, pointerName, value, true);
+        }
+
+        /// <summary>
+        /// Sets the named Scale:Pointer Value to the given value.
+        /// An exception is thrown if the Scale or Pointer is not defined.
+        /// </summary>
+        /// <param name="scaleName">Scale name</param>
+        /// <param name="pointerName">Pointer name</param>
+        /// <param name="value">Value to set</param>
+        /// <param name="dampen">Indicates whether to dampen the resultant output</param>
+        public void SetPointerValue(string scaleName, string pointerName, double value, bool dampen)
+        {
+            GaugePointer pointer = GetPointer(scaleName, pointerName);
+
+            if (pointer != null)
+            {
+                if (dampen == true)
+                    pointer.Value = value;
+                else
+                    pointer.ValueEx = value;
+            }
+            else
+            {
+                throw new Exception("Scale/Pointer (" + scaleName + "/" + pointerName + ") is not defined.");
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetPointer
+
+        #region GetPointer (pointerName)
+
+        /// <summary>
+        /// Gets the named Pointer.
+        /// </summary>
+        /// <param name="pointerName">Pointer name</param>
+        /// <returns>Pointer, or null</returns>
+        public GaugePointer GetPointer(string pointerName)
+        {
+            if (_CircularScales != null)
+            {
+                foreach (GaugeCircularScale scale in _CircularScales)
+                {
+                    GaugePointer pointer = scale.Pointers[pointerName];
+
+                    if (pointer != null)
+                        return (pointer);
+                }
+            }
+
+            if (_LinearScales != null)
+            {
+                foreach (GaugeLinearScale scale in _LinearScales)
+                {
+                    GaugePointer pointer = scale.Pointers[pointerName];
+
+                    if (pointer != null)
+                        return (pointer);
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetPointer (scaleName, pointerName)
+
+        /// <summary>
+        /// Gets the named Scale:Pointer.
+        /// </summary>
+        /// <param name="scaleName">Scale name</param>
+        /// <param name="pointerName">Pointer name</param>
+        /// <returns>Pointer, or null</returns>
+        public GaugePointer GetPointer(string scaleName, string pointerName)
+        {
+            if (_CircularScales != null)
+            {
+                GaugeScale scale = _CircularScales[scaleName];
+
+                if (scale != null)
+                {
+                    GaugePointer pointer = scale.Pointers[pointerName];
+
+                    if (pointer != null)
+                        return (pointer);
+                }
+            }
+
+            if (_LinearScales != null)
+            {
+                GaugeScale scale = _LinearScales[scaleName];
+
+                if (scale != null)
+                {
+                    GaugePointer pointer = scale.Pointers[pointerName];
+
+                    if (pointer != null)
+                        return (pointer);
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetGaugeItemFromPoint
+
+        /// <summary>
+        /// Gets the GaugeItem from the given Point
+        /// </summary>
+        /// <param name="pt">Point</param>
+        /// <returns>GaugeItem, or null</returns>
+        public GaugeItem GetGaugeItemFromPoint(Point pt)
+        {
+            GaugeItem item;
+
+            if ((item = FindCircularPointer(pt)) != null)
+                return (item);
+
+            if ((item = FindLinearPointer(pt)) != null)
+                return (item);
+
+            if ((item = FindCircularItem(pt)) != null)
+                return (item);
+
+            if ((item = FindLinearItem(pt)) != null)
+                return (item);
+
+            if ((item = FindGaugeItem(pt)) != null)
+                return (item);
+
+            return (null);
+        }
+
+        #region FindCircularPointer
+
+        private GaugeItem FindCircularPointer(Point pt)
+        {
+            if (_CircularScales != null)
+            {
+                for (int i = _CircularScales.Count - 1; i >= 0; i--)
+                {
+                    GaugeCircularScale scale = _CircularScales[i];
+
+                    if (scale.Visible == true)
+                    {
+                        GaugeItem item = scale.FindPointerItem(pt);
+
+                        if (item != null)
+                            return (item);
+                    }
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region FindLinearPointer
+
+        private GaugeItem FindLinearPointer(Point pt)
+        {
+            if (_LinearScales != null)
+            {
+                for (int i = _LinearScales.Count - 1; i >= 0; i--)
+                {
+                    GaugeLinearScale scale = _LinearScales[i];
+
+                    if (scale.Visible == true)
+                    {
+                        GaugeItem item = scale.FindPointerItem(pt);
+
+                        if (item != null)
+                            return (item);
+                    }
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region FindCircularItem
+
+        private GaugeItem FindCircularItem(Point pt)
+        {
+            if (_CircularScales != null)
+            {
+                for (int i = _CircularScales.Count - 1; i >= 0; i--)
+                {
+                    GaugeCircularScale scale = _CircularScales[i];
+
+                    if (scale.Visible == true)
+                    {
+                        GaugeItem item = scale.FindItem(pt);
+
+                        if (item != null)
+                            return (item);
+                    }
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region FindLinearItem
+
+        private GaugeItem FindLinearItem(Point pt)
+        {
+            if (_LinearScales != null)
+            {
+                for (int i = _LinearScales.Count - 1; i >= 0; i--)
+                {
+                    GaugeLinearScale scale = _LinearScales[i];
+
+                    if (scale.Visible == true)
+                    {
+                        GaugeItem item = scale.FindItem(pt);
+
+                        if (item != null)
+                            return (item);
+                    }
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region FindGaugeItem
+
+        private GaugeItem FindGaugeItem(Point pt)
+        {
+            if (_GaugeItems != null)
+            {
+                for (int i = _GaugeItems.Count - 1; i >= 0; i--)
+                {
+                    GaugeItem item = _GaugeItems[i];
+
+                    if (item.Visible == true)
+                    {
+                        if (item is GaugeText)
+                        {
+                            if (((GaugeText) item).Contains(pt))
+                                return (item);
+                        }
+
+                        if (item is GaugeImage)
+                        {
+                            if (((GaugeImage) item).Contains(pt))
+                                return (item);
+                        }
+
+                        if (item is GaugeIndicator)
+                        {
+                            if (((GaugeIndicator)item).Contains(pt))
+                                return (item);
+                        }
+                    }
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IDisposable Members
+
+        void IDisposable.Dispose()
+        {
+            HookEvents(false);
+
+            Dispose();
+        }
+
+        #endregion
+
+        #region ISupportInitialize Members
+
+        public void BeginInit()
+        {
+            _InitComplete = false;
+        }
+
+        public void EndInit()
+        {
+            if (_CircularScales != null)
+            {
+                foreach (GaugeCircularScale scale in _CircularScales)
+                {
+                    if (scale.Visible == true)
+                        scale.UpdateValueData();
+                }
+            }
+
+            if (_LinearScales != null)
+            {
+                foreach (GaugeLinearScale scale in _LinearScales)
+                {
+                    if (scale.Visible == true)
+                        scale.UpdateValueData();
+                }
+            }
+
+            _InitComplete = true;
+        }
+
+        #endregion
+    }
+
+    #region RenderGaugeContentEventArgs
+
+    /// <summary>
+    /// RenderGaugeContentEventArgs
+    /// </summary>
+    public class RenderGaugeContentEventArgs : CancelEventArgs
+    {
+        #region Private variables
+
+        private Graphics _Graphics;
+        private Rectangle _Bounds;
+
+        #endregion
+
+        public RenderGaugeContentEventArgs(Graphics graphics, Rectangle bounds)
+        {
+            _Graphics = graphics;
+            _Bounds = bounds;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Graphics
+        /// </summary>
+        public Graphics Graphics
+        {
+            get { return (_Graphics); }
+        }
+
+        /// <summary>
+        /// Gauge Bounds
+        /// </summary>
+        public Rectangle Bounds
+        {
+            get { return (_Bounds); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region PreRenderScaleEventArgs
+
+    /// <summary>
+    /// PreRenderScaleEventArgs
+    /// </summary>
+    public class PreRenderScaleEventArgs : PostRenderScaleEventArgs
+    {
+        #region Private variables
+
+        private bool _Cancel;
+
+        #endregion
+
+        public PreRenderScaleEventArgs(Graphics graphics, GaugeScale scale)
+            : base(graphics, scale)
+        {
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Cancel
+        /// </summary>
+        public bool Cancel
+        {
+            get { return (_Cancel); }
+            set { _Cancel = value; }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region PostRenderScaleEventArgs
+
+    /// <summary>
+    /// PostRenderScaleEventArgs
+    /// </summary>
+    public class PostRenderScaleEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private Graphics _Graphics;
+        private GaugeScale _Scale;
+
+        #endregion
+
+        public PostRenderScaleEventArgs(Graphics graphics, GaugeScale scale)
+        {
+            _Graphics = graphics;
+            _Scale = scale;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Graphics
+        /// </summary>
+        public Graphics Graphics
+        {
+            get { return (_Graphics); }
+        }
+
+        /// <summary>
+        /// GaugeScale
+        /// </summary>
+        public GaugeScale Scale
+        {
+            get { return (_Scale); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region PreRenderScaleRangeEventArgs
+
+    /// <summary>
+    /// PreRenderScaleRangeEventArgs
+    /// </summary>
+    public class PreRenderScaleRangeEventArgs : PostRenderScaleRangeEventArgs
+    {
+        #region Private variables
+
+        private bool _Cancel;
+
+        #endregion
+
+        public PreRenderScaleRangeEventArgs(Graphics graphics, GaugeRange range)
+            : base(graphics, range)
+        {
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Cancel
+        /// </summary>
+        public bool Cancel
+        {
+            get { return (_Cancel); }
+            set { _Cancel = value; }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region PostRenderScaleRangeEventArgs
+
+    /// <summary>
+    /// PostRenderScaleRangeEventArgs
+    /// </summary>
+    public class PostRenderScaleRangeEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private Graphics _Graphics;
+
+        private GaugeRange _Range;
+        private Rectangle _Bounds;
+
+        private float _StartAngle;
+        private float _SweepAngle;
+
+        #endregion
+        
+        public PostRenderScaleRangeEventArgs(Graphics graphics, GaugeRange range)
+        {
+            _Graphics = graphics;
+
+            _Range = range;
+            _Bounds = range.Bounds;
+
+            _StartAngle = range.StartAngle;
+            _SweepAngle = range.SweepAngle;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Graphics
+        /// </summary>
+        public Graphics Graphics
+        {
+            get { return (_Graphics); }
+        }
+
+        /// <summary>
+        /// GaugeRange
+        /// </summary>
+        public GaugeRange Range
+        {
+            get { return (_Range); }
+        }
+
+        /// <summary>
+        /// GaugeRange Bounds
+        /// </summary>
+        public Rectangle Bounds
+        {
+            get { return (_Bounds); }
+        }
+
+        /// <summary>
+        /// Range StartAngle
+        /// </summary>
+        public float StartAngle
+        {
+            get { return (_StartAngle); }
+        }
+
+        /// <summary>
+        /// Range SweepAngle
+        /// </summary>
+        public float SweepAngle
+        {
+            get { return (_SweepAngle); }
+        }
+
+        #endregion
+
+    }
+
+    #endregion
+
+    #region PreRenderScaleSectionEventArgs
+
+    /// <summary>
+    /// PreRenderScaleSectionEventArgs
+    /// </summary>
+    public class PreRenderScaleSectionEventArgs : PostRenderScaleSectionEventArgs
+    {
+        #region Private variables
+
+        private bool _Cancel;
+
+        #endregion
+
+        public PreRenderScaleSectionEventArgs(Graphics graphics, GaugeSection section)
+            : base(graphics, section)
+        {
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Cancel
+        /// </summary>
+        public bool Cancel
+        {
+            get { return (_Cancel); }
+            set { _Cancel = value; }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region PostRenderScaleSectionEventArgs
+
+    /// <summary>
+    /// PostRenderScaleSectionEventArgs
+    /// </summary>
+    public class PostRenderScaleSectionEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private Graphics _Graphics;
+
+        private GaugeSection _Section;
+        private Rectangle _Bounds;
+
+        private float _StartAngle;
+        private float _SweepAngle;
+
+        #endregion
+
+        public PostRenderScaleSectionEventArgs(Graphics graphics, GaugeSection section)
+        {
+            _Graphics = graphics;
+
+            _Section = section;
+            _Bounds = section.Bounds;
+
+            _StartAngle = section.StartAngle;
+            _SweepAngle = section.SweepAngle;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Graphics
+        /// </summary>
+        public Graphics Graphics
+        {
+            get { return (_Graphics); }
+        }
+
+        /// <summary>
+        /// GaugeSection
+        /// </summary>
+        public GaugeSection Section
+        {
+            get { return (_Section); }
+        }
+
+        /// <summary>
+        /// Section Bounds
+        /// </summary>
+        public Rectangle Bounds
+        {
+            get { return (_Bounds); }
+        }
+
+        /// <summary>
+        /// Section StartAngle
+        /// </summary>
+        public float StartAngle
+        {
+            get { return (_StartAngle); }
+        }
+
+        /// <summary>
+        /// Section SweepAngle
+        /// </summary>
+        public float SweepAngle
+        {
+            get { return (_SweepAngle); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region PreRenderScalePointerEventArgs
+
+    /// <summary>
+    /// PreRenderScalePointerEventArgs
+    /// </summary>
+    public class PreRenderScalePointerEventArgs : PostRenderScalePointerEventArgs
+    {
+        #region Private variables
+
+        private bool _Cancel;
+
+        #endregion
+
+        public PreRenderScalePointerEventArgs(Graphics graphics, GaugePointer pointer)
+            : base(graphics, pointer)
+        {
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Cancel
+        /// </summary>
+        public bool Cancel
+        {
+            get { return (_Cancel); }
+            set { _Cancel = value; }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region PostRenderScalePointerEventArgs
+
+    /// <summary>
+    /// PostRenderScalePointerEventArgs
+    /// </summary>
+    public class PostRenderScalePointerEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private Graphics _Graphics;
+        private GaugePointer _Pointer;
+
+        #endregion
+        
+        public PostRenderScalePointerEventArgs(Graphics graphics, GaugePointer pointer)
+        {
+            _Graphics = graphics;
+
+            _Pointer = pointer;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Graphics
+        /// </summary>
+        public Graphics Graphics
+        {
+            get { return (_Graphics); }
+        }
+
+        /// <summary>
+        /// GaugePointer
+        /// </summary>
+        public GaugePointer Pointer
+        {
+            get { return (_Pointer); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region PreRenderScaleGaugePinEventArgs
+
+    /// <summary>
+    /// PreRenderScaleGaugePinEventArgs
+    /// </summary>
+    public class PreRenderScaleGaugePinEventArgs : PostRenderScaleGaugePinEventArgs
+    {
+        #region Private variables
+
+        private bool _Cancel;
+
+        #endregion
+
+        public PreRenderScaleGaugePinEventArgs(Graphics graphics, GaugePin gaugePin)
+            : base(graphics, gaugePin)
+        {
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Cancel
+        /// </summary>
+        public bool Cancel
+        {
+            get { return (_Cancel); }
+            set { _Cancel = value; }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region PostRenderScaleGaugePinEventArgs
+
+    /// <summary>
+    /// PostRenderScaleGaugePinEventArgs
+    /// </summary>
+    public class PostRenderScaleGaugePinEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private Graphics _Graphics;
+        private GaugePin _GaugePin;
+
+        #endregion
+        
+        public PostRenderScaleGaugePinEventArgs(Graphics graphics, GaugePin gaugePin)
+        {
+            _Graphics = graphics;
+            _GaugePin = gaugePin;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Graphics
+        /// </summary>
+        public Graphics Graphics
+        {
+            get { return (_Graphics); }
+        }
+
+        /// <summary>
+        /// GaugePin
+        /// </summary>
+        public GaugePin GaugePin
+        {
+            get { return (_GaugePin); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region PreRenderScaleCustomLabelEventArgs
+
+    /// <summary>
+    /// PreRenderScaleCustomLabelEventArgs
+    /// </summary>
+    public class PreRenderScaleCustomLabelEventArgs : PostRenderScaleCustomLabelEventArgs
+    {
+        #region Private variables
+
+        private bool _Cancel;
+
+        #endregion
+
+        public PreRenderScaleCustomLabelEventArgs(Graphics graphics, GaugeCustomLabel customLabel)
+            : base(graphics, customLabel)
+        {
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Cancel
+        /// </summary>
+        public bool Cancel
+        {
+            get { return (_Cancel); }
+            set { _Cancel = value; }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region PostRenderScaleCustomLabelEventArgs
+
+    /// <summary>
+    /// PostRenderScaleCustomLabelEventArgs
+    /// </summary>
+    public class PostRenderScaleCustomLabelEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private Graphics _Graphics;
+        private GaugeCustomLabel _CustomLabel;
+
+        #endregion
+
+        public PostRenderScaleCustomLabelEventArgs(Graphics graphics, GaugeCustomLabel customLabel)
+        {
+            _Graphics = graphics;
+            _CustomLabel = customLabel;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Graphics
+        /// </summary>
+        public Graphics Graphics
+        {
+            get { return (_Graphics); }
+        }
+
+        /// <summary>
+        /// CustomLabel
+        /// </summary>
+        public GaugeCustomLabel CustomLabel
+        {
+            get { return (_CustomLabel); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region PreRenderIndicatorEventArgs
+
+    /// <summary>
+    /// PreRenderIndicatorEventArgs
+    /// </summary>
+    public class PreRenderIndicatorEventArgs : PostRenderIndicatorEventArgs
+    {
+        #region Private variables
+
+        private bool _Cancel;
+
+        #endregion
+
+        public PreRenderIndicatorEventArgs(Graphics graphics, GaugeIndicator indicator)
+            : base(graphics, indicator)
+        {
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Cancel
+        /// </summary>
+        public bool Cancel
+        {
+            get { return (_Cancel); }
+            set { _Cancel = value; }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region PostRenderIndicatorEventArgs
+
+    /// <summary>
+    /// PostRenderIndicatorEventArgs
+    /// </summary>
+    public class PostRenderIndicatorEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private Graphics _Graphics;
+        private GaugeIndicator _Indicator;
+
+        #endregion
+
+        public PostRenderIndicatorEventArgs(Graphics graphics, GaugeIndicator indicator)
+        {
+            _Graphics = graphics;
+            _Indicator = indicator;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Graphics
+        /// </summary>
+        public Graphics Graphics
+        {
+            get { return (_Graphics); }
+        }
+
+        /// <summary>
+        /// GaugeIndicator
+        /// </summary>
+        public GaugeIndicator Indicator
+        {
+            get { return (_Indicator); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region PreRenderIndicatorDigitEventArgs
+
+    /// <summary>
+    /// PreRenderIndicatorDigitEventArgs
+    /// </summary>
+    public class PreRenderIndicatorDigitEventArgs : PostRenderIndicatorDigitEventArgs
+    {
+        #region Private variables
+
+        private bool _Cancel;
+
+        #endregion
+
+        public PreRenderIndicatorDigitEventArgs(
+            Graphics graphics, NumericIndicator indicator, NumericElement digit, int index)
+            : base(graphics, indicator, digit, index)
+        {
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Cancel
+        /// </summary>
+        public bool Cancel
+        {
+            get { return (_Cancel); }
+            set { _Cancel = value; }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region PostRenderIndicatorEventArgs
+
+    /// <summary>
+    /// PostRenderIndicatorDigitEventArgs
+    /// </summary>
+    public class PostRenderIndicatorDigitEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private Graphics _Graphics;
+        private NumericIndicator _Indicator;
+        private NumericElement _Digit;
+        private int _Index;
+
+        #endregion
+
+        public PostRenderIndicatorDigitEventArgs(
+            Graphics graphics, NumericIndicator indicator, NumericElement digit, int index)
+        {
+            _Graphics = graphics;
+            _Indicator = indicator;
+            _Digit = digit;
+            _Index = index;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Graphics
+        /// </summary>
+        public Graphics Graphics
+        {
+            get { return (_Graphics); }
+        }
+
+        /// <summary>
+        /// GaugeIndicator
+        /// </summary>
+        public NumericIndicator Indicator
+        {
+            get { return (_Indicator); }
+        }
+
+        /// <summary>
+        /// NumericElement / digit
+        /// </summary>
+        public NumericElement Digit
+        {
+            get { return (_Digit); }
+        }
+
+        /// <summary>
+        /// NumericElement / digit index (from left to right)
+        /// </summary>
+        public int Index
+        {
+            get { return (_Index); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region ScaleEnterEventArgs
+
+    /// <summary>
+    /// ScaleEnterEventArgs
+    /// </summary>
+    public class ScaleEnterEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private GaugePointer _Pointer;
+        private GaugeScale _Scale;
+
+        #endregion
+
+        public ScaleEnterEventArgs(GaugePointer pointer, GaugeScale scale)
+        {
+            _Pointer = pointer;
+            _Scale = scale;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// GaugePointer
+        /// </summary>
+        public GaugePointer Pointer
+        {
+            get { return (_Pointer); }
+        }
+
+        /// <summary>
+        /// GaugeScale
+        /// </summary>
+        public GaugeScale Scale
+        {
+            get { return (_Scale); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region ScaleLeaveEventArgs
+
+    /// <summary>
+    /// ScaleLeaveEventArgs
+    /// </summary>
+    public class ScaleLeaveEventArgs : ScaleEnterEventArgs
+    {
+        public ScaleLeaveEventArgs(GaugePointer pointer, GaugeScale scale)
+            : base(pointer, scale)
+        {
+        }
+    }
+
+    #endregion
+
+    #region SectionEnterEventArgs
+
+    /// <summary>
+    /// SectionEnterEventArgs
+    /// </summary>
+    public class SectionEnterEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private GaugePointer _Pointer;
+        private GaugeSection _Section;
+
+        #endregion
+
+        public SectionEnterEventArgs(GaugePointer pointer, GaugeSection section)
+        {
+            _Pointer = pointer;
+            _Section = section;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// GaugePointer
+        /// </summary>
+        public GaugePointer Pointer
+        {
+            get { return (_Pointer); }
+        }
+
+        /// <summary>
+        /// GaugeSection
+        /// </summary>
+        public GaugeSection Section
+        {
+            get { return (_Section); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region SectionLeaveEventArgs
+
+    /// <summary>
+    /// SectionLeaveEventArgs
+    /// </summary>
+    public class SectionLeaveEventArgs : SectionEnterEventArgs
+    {
+        public SectionLeaveEventArgs(GaugePointer pointer, GaugeSection section)
+            : base(pointer, section)
+        {
+        }
+    }
+
+    #endregion
+
+    #region RangeEnterEventArgs
+
+    /// <summary>
+    /// RangeEnterEventArgs
+    /// </summary>
+    public class RangeEnterEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private GaugePointer _Pointer;
+        private GaugeRange _Range;
+
+        #endregion
+
+        public RangeEnterEventArgs(GaugePointer pointer, GaugeRange range)
+        {
+            _Pointer = pointer;
+            _Range = range;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// GaugePointer
+        /// </summary>
+        public GaugePointer Pointer
+        {
+            get { return (_Pointer); }
+        }
+
+        /// <summary>
+        /// GaugeRange
+        /// </summary>
+        public GaugeRange Range
+        {
+            get { return (_Range); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region RangeLeaveEventArgs
+
+    /// <summary>
+    /// RangeLeaveEventArgs
+    /// </summary>
+    public class RangeLeaveEventArgs : RangeEnterEventArgs
+    {
+        public RangeLeaveEventArgs(GaugePointer pointer, GaugeRange range)
+            : base(pointer, range)
+        {
+        }
+    }
+
+    #endregion
+
+    #region PointerChangingEventArgs
+
+    /// <summary>
+    /// PointerChangingEventArgs
+    /// </summary>
+    public class PointerChangingEventArgs : CancelEventArgs
+    {
+        #region Private variables
+
+        private GaugePointer _Pointer;
+
+        private double _OldValue;
+        private double _NewValue;
+
+        #endregion
+
+        public PointerChangingEventArgs(
+            GaugePointer pointer, double oldValue, double newValue)
+        {
+            _Pointer = pointer;
+
+            _OldValue = oldValue;
+            _NewValue = newValue;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// GaugePointer
+        /// </summary>
+        public GaugePointer Pointer
+        {
+            get { return (_Pointer); }
+        }
+
+        /// <summary>
+        /// OldValue
+        /// </summary>
+        public double OldValue
+        {
+            get { return (_OldValue); }
+        }
+
+        /// <summary>
+        /// NewValue
+        /// </summary>
+        public double NewValue
+        {
+            get { return (_NewValue); }
+            set { _NewValue = value; }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region PointerChangedEventArgs
+
+    /// <summary>
+    /// PointerChangedEventArgs
+    /// </summary>
+    public class PointerChangedEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private GaugePointer _Pointer;
+
+        private double _OldValue;
+        private double _NewValue;
+
+        #endregion
+
+        public PointerChangedEventArgs(
+            GaugePointer pointer, double oldValue, double newValue)
+        {
+            _Pointer = pointer;
+
+            _OldValue = oldValue;
+            _NewValue = newValue;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// GaugePointer
+        /// </summary>
+        public GaugePointer Pointer
+        {
+            get { return (_Pointer); }
+        }
+
+        /// <summary>
+        /// OldValue
+        /// </summary>
+        public double OldValue
+        {
+            get { return (_OldValue); }
+        }
+
+        /// <summary>
+        /// NewValue
+        /// </summary>
+        public double NewValue
+        {
+            get { return (_NewValue); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GetPointerPathEventArgs
+
+    /// <summary>
+    /// GetPointerPathEventArgs
+    /// </summary>
+    public class GetPointerPathEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private GaugePointer _Pointer;
+        private GraphicsPath _Path;
+        private Rectangle _Bounds;
+
+        #endregion
+
+        public GetPointerPathEventArgs(
+            GaugePointer pointer, Rectangle bounds)
+        {
+            _Pointer = pointer;
+            _Bounds = bounds;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Bounds
+        /// </summary>
+        public Rectangle Bounds
+        {
+            get { return (_Bounds); }
+        }
+
+        /// <summary>
+        /// GraphicsPath
+        /// </summary>
+        public GraphicsPath Path
+        {
+            get { return (_Path); }
+            set { _Path = value; }
+        }
+
+        /// <summary>
+        /// GaugePointer
+        /// </summary>
+        public GaugePointer Pointer
+        {
+            get { return (_Pointer); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GetDisplayTemplateTextEventArgs
+
+    /// <summary>
+    /// GetDisplayTemplateTextEventArgs
+    /// </summary>
+    public class GetDisplayTemplateTextEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private GaugeItem _GaugeItem;
+
+        private string _DisplayText;
+        private string _DisplayTemplate;
+        private string _DisplayFormat;
+
+        #endregion
+
+        public GetDisplayTemplateTextEventArgs(GaugeItem gaugeItem,
+            string displayTemplate, string displayFormat)
+        {
+            _GaugeItem = gaugeItem;
+
+            _DisplayText = displayTemplate;
+            _DisplayTemplate = displayTemplate;
+            _DisplayFormat = displayFormat;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the GaugeItem
+        /// </summary>
+        public GaugeItem GaugeItem
+        {
+            get { return (_GaugeItem); }
+        }
+
+        /// <summary>
+        /// Gets or sets the Display Text for the given DisplayTemplate
+        /// </summary>
+        public string DisplayText
+        {
+            get { return (_DisplayText); }
+            set { _DisplayText = value; }
+        }
+
+        /// <summary>
+        /// Gets the Display Template
+        /// </summary>
+        public string DisplayTemplate
+        {
+            get { return (_DisplayTemplate); }
+        }
+
+        /// <summary>
+        /// Gets the Display Format for the given DisplayTemplate
+        /// </summary>
+        public string DisplayFormat
+        {
+            get { return (_DisplayFormat); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region GetDigitSegmentsEventArgs
+
+    /// <summary>
+    /// GetDigitSegmentsEventArgs
+    /// </summary>
+    public class GetDigitSegmentsEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private NumericIndicator _Indicator;
+        private char _Digit;
+        private int _Segments;
+
+        #endregion
+
+        public GetDigitSegmentsEventArgs(
+            NumericIndicator indicator, char digit, int segments)
+        {
+            _Indicator = indicator;
+            _Digit = digit;
+            _Segments = segments;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Digit
+        /// </summary>
+        public char Digit
+        {
+            get { return (_Digit); }
+        }
+
+        /// <summary>
+        /// NumericIndicator
+        /// </summary>
+        public NumericIndicator Indicator
+        {
+            get { return (_Indicator); }
+        }
+
+        /// <summary>
+        /// Segments pattern
+        /// </summary>
+        public int Segments
+        {
+            get { return (_Segments); }
+            set { _Segments = value; }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+}
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeControlItem.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeControlItem.cs
new file mode 100644
index 00000000..b7d58871
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeControlItem.cs	
@@ -0,0 +1,543 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Windows.Forms;
+
+namespace DevComponents.Instrumentation
+{
+    public class GaugeControlItem
+    {
+        #region Private variables
+
+        private GaugeControl _GaugeControl;
+        private GaugeControlItem _Parent;
+
+        private GaugeFrame _GaugeFrame;
+
+        private GaugeScaleCollection _GaugeScaleItems;
+        private GaugeImageCollection _GaugeImageItems;
+        private GaugeTextCollection _GaugeTextItems;
+
+        private int _SuspendCount;
+        private bool _NeedRecalcLayout;
+
+        private float _Height;
+        private float _Width;
+        private PointF _Location;
+
+        private PointF _PivotPoint;
+        private float _Radius;
+
+        private Rectangle _AbsBounds;
+
+        private bool _Visible;
+
+        #endregion
+
+        public GaugeControlItem()
+        {
+            _GaugeFrame = new GaugeFrame(this);
+            _GaugeScaleItems = new GaugeScaleCollection();
+
+            _Width = 1;
+            _Height = 1;
+
+            _PivotPoint = new PointF(.5f, .5f);
+            _Radius = .5f;
+
+            NeedRecalcLayout = true;
+
+            HookEvents(true);
+        }
+
+        #region Public properties
+
+        #region GaugeFrame
+
+        /// <summary>
+        /// Gets the Gauge Frame.
+        /// </summary>
+        [Browsable(true), Category("Appearance")]
+        [Description("Indicates the Gauge Frame.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public GaugeFrame GaugeFrame
+        {
+            get { return (_GaugeFrame); }
+        }
+
+        #endregion
+
+        #region GaugeScaleItems
+
+        /// <summary>
+        /// Gets the collection GaugeScaleItems contained within the gauge.
+        /// </summary>
+        [Browsable(true), Category("Appearance")]
+        [Description("Indicates the collection GaugeScaleItems contained within the gauge.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public GaugeScaleCollection GaugeScaleItems
+        {
+            get { return (_GaugeScaleItems); }
+        }
+
+        #endregion
+
+        #region Location
+
+        public PointF Location
+        {
+            get { return (_Location); }
+
+            set
+            {
+                if (_Location != value)
+                {
+                    _Location = value;
+
+                    OnGaugeChanged();
+                }
+            }
+        }
+
+        #endregion
+
+        #region Height
+
+        public float Height
+        {
+            get { return (_Height); }
+
+            set
+            {
+                if (_Height != value)
+                {
+                    _Height = value;
+
+                    OnResize(EventArgs.Empty);
+                }
+            }
+        }
+
+        #endregion
+
+        #region PivotPoint
+
+        public PointF PivotPoint
+        {
+            get { return (_PivotPoint); }
+
+            set
+            {
+                if (_PivotPoint.Equals(value) == false)
+                {
+                    _PivotPoint = value;
+
+                    OnGaugeChanged();
+                }
+            }
+        }
+
+        #endregion
+
+        #region Radius
+
+        public float Radius
+        {
+            get { return (_Radius); }
+
+            set
+            {
+                if (_Radius != value)
+                {
+                    _Radius = value;
+
+                    OnGaugeChanged();
+                }
+            }
+        }
+
+        #endregion
+
+        #region Visible
+
+        public bool Visible
+        {
+            get { return (_Visible); }
+
+            set
+            {
+                if (_Visible != value)
+                {
+                    _Visible = value;
+
+                    Refresh();
+                }
+            }
+        }
+
+        #endregion
+
+        #region Width
+
+        public float Width
+        {
+            get { return (_Width); }
+
+            set
+            {
+                if (_Width != value)
+                {
+                    _Width = value;
+
+                    OnResize(EventArgs.Empty);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region AbsBounds
+
+        internal Rectangle AbsBounds
+        {
+            get { return (_AbsBounds); }
+        }
+
+        #endregion
+
+        #region AbsHeight
+
+        internal int AbsHeight
+        {
+            get { return (_AbsBounds.Height); }
+        }
+
+        #endregion
+
+        #region AbsWidth
+
+        internal int AbsWidth
+        {
+            get { return (_AbsBounds.Width); }
+        }
+
+        #endregion
+
+        #region GaugeControl
+
+        internal GaugeControl GaugeControl
+        {
+            get { return (_GaugeControl);  }
+            set { _GaugeControl = value; }
+        }
+
+        #endregion
+
+        #region NeedRecalcLayout
+
+        internal bool NeedRecalcLayout
+        {
+            get { return (_NeedRecalcLayout); }
+
+            set
+            {
+                _NeedRecalcLayout = value;
+
+                if (_NeedRecalcLayout == true)
+                    OnLayoutChanged();
+            }
+        }
+
+        #endregion
+
+        #region Parent
+
+        internal GaugeControlItem Parent
+        {
+            get { return (_Parent); }
+            set { _Parent = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region HookEvents
+
+        private void HookEvents(bool hook)
+        {
+            if (hook == true)
+            {
+                _GaugeFrame.GaugeFrameChanged += GaugeFrame_GaugeFrameChanged;
+            }
+            else
+            {
+                _GaugeFrame.GaugeFrameChanged -= GaugeFrame_GaugeFrameChanged;
+            }
+        }
+
+        #endregion
+
+        #region Event processing
+
+        void GaugeFrame_GaugeFrameChanged(object sender, EventArgs e)
+        {
+            OnGaugeChanged();
+        }
+
+        #endregion
+
+        #region BeginUpdate
+
+        /// <summary>
+        /// Disables any redrawing of the Gauge control. To maintain performance while items
+        /// are added one at a time to the control, call the BeginUpdate method. The BeginUpdate
+        /// method prevents the control from painting until the
+        /// <see cref="EndUpdate">EndUpdate</see> method is called.
+        /// </summary>
+        public void BeginUpdate()
+        {
+            _SuspendCount++;
+        }
+
+        #endregion
+
+        #region EndUpdate
+
+        /// <summary>
+        /// Enables the redrawing of the Gauge control. To maintain performance while items are
+        /// added one at a time to the control, call the <see cref="BeginUpdate">BeginUpdate</see>
+        /// method. The BeginUpdate method prevents the control from painting until the EndUpdate
+        /// method is called.
+        /// </summary>
+        public void EndUpdate()
+        {
+            if (_SuspendCount > 0)
+                _SuspendCount--;
+
+            if (_SuspendCount == 0)
+                Refresh();
+        }
+
+        #endregion
+
+        #region Refresh
+
+        private void Refresh()
+        {
+            if (_GaugeControl != null)
+                _GaugeControl.Invalidate(_GaugeFrame.Bounds);
+        }
+
+        #endregion
+
+        #region RecalcLayout
+
+        private void RecalcLayout()
+        {
+            if (_NeedRecalcLayout == true)
+            {
+                NeedRecalcLayout = false;
+
+                _AbsBounds = GetItemBounds();
+            }
+        }
+
+        #endregion
+
+        #region GetItemBounds
+
+        private Rectangle GetItemBounds()
+        {
+            Rectangle r;
+
+            if (_Parent != null)
+            {
+                if (_Parent.NeedRecalcLayout == true)
+                    throw new Exception();
+
+                r = _Parent.AbsBounds;
+            }
+            else
+            {
+                if (_GaugeControl == null)
+                    throw new Exception();
+
+                r = _GaugeControl.Bounds;
+            }
+
+            if (_GaugeFrame.Style == GaugeFrameStyle.Circular)
+            {
+                int n = Math.Min(r.Width, r.Height);
+
+                int x = (r.Width - n) / 2;
+                int y = (r.Height - n) / 2;
+
+                n = Math.Max(n, 1);
+
+                r = new Rectangle(x, y, n, n);
+            }
+            else
+            {
+                r.X = (int)(r.Width * _Location.X);
+                r.Y = (int)(r.Height * _Location.Y);
+
+                r.Width = (int)(r.Width * _Width);
+                r.Height = (int)(r.Height * _Height);
+            }
+
+
+            return (r);
+        }
+
+        #endregion
+
+        #region OnLayoutChanged
+
+        private void OnLayoutChanged()
+        {
+            GaugeFrame.NeedRecalcLayout = true;
+
+            if (_GaugeScaleItems != null)
+            {
+                foreach (GaugeScale item in _GaugeScaleItems)
+                    item.NeedRecalcLayout = true;
+            }
+
+            if (_GaugeImageItems != null)
+            {
+                foreach (GaugeImage item in _GaugeImageItems)
+                    item.NeedRecalcLayout = true;
+            }
+
+            if (_GaugeTextItems != null)
+            {
+                foreach (GaugeText item in _GaugeTextItems)
+                    item.NeedRecalcLayout = true;
+            }
+        }
+
+        #endregion
+
+        #region OnPaint
+
+        public void OnPaint(PaintEventArgs e)
+        {
+            RecalcLayout();
+
+            GaugeFrame.OnPaint(e);
+
+            PaintScaleItems(e);
+            PaintImageItems(e);
+            PaintTextItems(e);
+        }
+
+        #region PaintScaleItems
+
+        private void PaintScaleItems(PaintEventArgs e)
+        {
+            if (_GaugeScaleItems != null)
+            {
+                foreach (GaugeScale scale in _GaugeScaleItems)
+                {
+                    if (scale.Visible == true)
+                        scale.OnPaint(e);
+                }
+            }
+        }
+
+        #endregion
+
+        #region PaintImageItems
+
+        private void PaintImageItems(PaintEventArgs e)
+        {
+            if (_GaugeImageItems != null)
+            {
+                foreach (GaugeImage scale in _GaugeImageItems)
+                {
+                    if (scale.Visible == true)
+                        scale.OnPaint(e);
+                }
+            }
+        }
+
+        #endregion
+
+        #region PaintTextItems
+
+        private void PaintTextItems(PaintEventArgs e)
+        {
+            if (_GaugeTextItems != null)
+            {
+                foreach (GaugeText scale in _GaugeTextItems)
+                {
+                    if (scale.Visible == true)
+                        scale.OnPaint(e);
+                }
+            }
+        }
+
+        #endregion
+
+        #region GetAbsPoint
+
+        internal Point GetAbsPoint(PointF ptf)
+        {
+            if (NeedRecalcLayout == true)
+                throw new Exception();
+
+            return (new Point((int) (AbsWidth*ptf.X), (int) (AbsHeight*ptf.Y)));
+        }
+
+        #endregion
+
+        #region GetAbsSize
+
+        internal Size GetAbsSize(SizeF sf, bool useMin)
+        {
+            if (NeedRecalcLayout == true)
+                throw new Exception();
+
+            int width = AbsWidth;
+            int height = AbsHeight;
+
+            if (useMin == true)
+            {
+                if (width > height)
+                    width = height;
+                else
+                    height = width;
+            }
+
+            return (new Size((int)(width * sf.Width), (int)(height * sf.Height)));
+        }
+
+        #endregion
+
+        #endregion
+
+        #region OnResize
+
+        public void OnResize(EventArgs e)
+        {
+            NeedRecalcLayout = true;
+        }
+
+        #endregion
+
+        #region OnGaugeChanged
+
+        protected void OnGaugeChanged()
+        {
+            Refresh();
+        }
+
+        #endregion
+    }
+}
+
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeFrame/GaugeFrame.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeFrame/GaugeFrame.cs
new file mode 100644
index 00000000..5c6f45d3
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeFrame/GaugeFrame.cs	
@@ -0,0 +1,1031 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Globalization;
+using System.Windows.Forms;
+
+namespace DevComponents.Instrumentation
+{
+    [TypeConverter(typeof(GaugeFrameConvertor))]
+    public class GaugeFrame : IDisposable
+    {
+        #region Events
+
+        [Description("Occurs when the Gauge Frame is changed.")]
+        public event EventHandler<EventArgs> GaugeFrameChanged;
+
+        [Description("Occurs before the Gauge Frame is rendered.")]
+        public event EventHandler<PreRenderFrameEventArgs> PreRenderFrame;
+
+        [Description("Occurs after the Gauge Frame has been rendered.")]
+        public event EventHandler<PostRenderFrameEventArgs> PostRenderFrame;
+
+        [Description("Occurs when the Gauge Frame Region should be set.")]
+        public event EventHandler<SetFrameRegionEventArgs> SetGaugeFrameRegion;
+
+        #endregion
+
+        #region Private variables
+
+        private GaugeFrameStyle _Style;
+
+        private float _InnerBevel;
+        private float _OuterBevel;
+        private float _RoundRectangleArc;
+
+        private float _BackSigmaFocus;
+        private float _BackSigmaScale;
+        private float _FrameSigmaFocus;
+        private float _FrameSigmaScale;
+
+        private GradientFillColor _BackColor;
+        private GradientFillColor _FrameColor;
+
+        private bool _ClipOuterFrame;
+        private bool _AddGlassEffect;
+
+        private Image _Image;
+
+        private GaugeControl _GaugeControl;
+
+        private bool _AutoCenter;
+        private bool _NeedRecalcLayout;
+
+        private Rectangle _Bounds;
+        private Rectangle _BackBounds;
+        private PointF _Center;
+
+        private GaugeFrameRenderer _Renderer;
+
+        #endregion
+
+        public GaugeFrame(GaugeControl gaugeControl)
+        {
+            _GaugeControl = gaugeControl;
+
+            Style = GaugeFrameStyle.None;
+
+            _InnerBevel = .035f;
+            _OuterBevel = .05f;
+            _RoundRectangleArc = .125f;
+
+            _BackSigmaFocus = 1;
+            _BackSigmaScale = 1;
+            _FrameSigmaFocus = .15f;
+            _FrameSigmaScale = 1;
+
+            BackColor = new GradientFillColor(Color.Silver, Color.Gray, 45);
+            FrameColor = new GradientFillColor(Color.Gainsboro, Color.Gray, 45);
+        }
+
+        #region Public properties
+
+        #region AbsBevelInside
+
+        /// <summary>
+        /// Gets the calculated inside bevel dimension for the frame
+        /// </summary>
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public int AbsBevelInside
+        {
+            get
+            {
+                int n = MinDimension;
+
+                return (_InnerBevel < .5f) ?
+                    (int)(n * _InnerBevel) : n / 2;
+            }
+        }
+
+        #endregion
+
+        #region AbsBevelOutside
+
+        /// <summary>
+        /// Gets the calculated outside bevel dimension for the frame
+        /// </summary>
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public int AbsBevelOutside
+        {
+            get
+            {
+                int n = MinDimension;
+
+                return (_OuterBevel < .5f) ?
+                    (int)(n * _OuterBevel) : n / 2;
+            }
+        }
+
+        #endregion
+
+        #region AddGlassEffect
+
+        /// <summary>
+        /// Gets or sets whether to add a Glass Effect to the frame
+        /// </summary>
+        [Browsable(true)]
+        [Category("Appearance"), DefaultValue(false)]
+        [Description("Indicates whether to add a Glass Effect to the frame.")]
+        public bool AddGlassEffect
+        {
+            get { return (_AddGlassEffect); }
+
+            set
+            {
+                if (_AddGlassEffect != value)
+                {
+                    _AddGlassEffect = value;
+
+                    OnGaugeFrameChanged();
+                }
+            }
+        }
+
+        #endregion
+
+        #region BackBounds
+
+        /// <summary>
+        /// Gets the background bounding rectangle
+        /// </summary>
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public Rectangle BackBounds
+        {
+            get { return (_BackBounds); }
+            internal set { _BackBounds = value; }
+        }
+
+        #endregion
+
+        #region BackColor
+
+        /// <summary>
+        /// Gets or sets the background Color of the Gauge.
+        /// </summary>
+        [Browsable(true),Category("Appearance")]
+        [Description("Indicates the background Color of the Gauge.")]
+        public GradientFillColor BackColor
+        {
+            get
+            {
+                if (_BackColor == null)
+                {
+                    _BackColor = new GradientFillColor();
+                    _BackColor.ColorTableChanged += BackColor_ColorTableChanged;
+                }
+
+                return (_BackColor);
+            }
+
+            set
+            {
+                if (_BackColor != null)
+                    _BackColor.ColorTableChanged -= BackColor_ColorTableChanged;
+
+                _BackColor = value;
+
+                if (_BackColor != null)
+                    _BackColor.ColorTableChanged += BackColor_ColorTableChanged;
+
+                OnGaugeFrameChanged();
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        internal virtual bool ShouldSerializeBackColor()
+        {
+            return (BackColor.IsEqualTo(Color.Silver,
+                Color.Gray, 45, GradientFillType.Auto, Color.Empty, 0) == false);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        internal virtual void ResetBackColor()
+        {
+            BackColor = new GradientFillColor(Color.Silver, Color.Gray, 45);
+        }
+
+        #endregion
+
+        #region BackSigmaFocus
+
+        /// <summary>
+        /// Gets or sets the SigmaBellShape Focus used when Center filling the frame.
+        /// </summary>
+        [Browsable(true)]
+        [Category("Appearance"), DefaultValue(1f)]
+        [Description("Indicates the SigmaBellShape Focus used when Center filling the frame.")]
+        [Editor("DevComponents.Instrumentation.Design.WidthMaxRangeValueEditor, DevComponents.Instrumentation.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=76cb4c6eb576bca5", typeof(UITypeEditor))]
+        public float BackSigmaFocus
+        {
+            get { return (_BackSigmaFocus); }
+
+            set
+            {
+                if (value < 0 || value > 1)
+                    throw new ArgumentException("Value must be between 0 and 1.");
+
+                if (_BackSigmaFocus != value)
+                {
+                    _BackSigmaFocus = value;
+
+                    OnGaugeFrameChanged();
+                }
+            }
+        }
+
+        #endregion
+
+        #region BackSigmaScale
+
+        /// <summary>
+        /// Gets or sets the SigmaBellShape Scale used when Center filling the frame.
+        /// </summary>
+        [Browsable(true)]
+        [Category("Appearance"), DefaultValue(1f)]
+        [Description("Indicates the SigmaBellShape Scale used when Center filling the frame.")]
+        [Editor("DevComponents.Instrumentation.Design.WidthMaxRangeValueEditor, DevComponents.Instrumentation.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=76cb4c6eb576bca5", typeof(UITypeEditor))]
+        public float BackSigmaScale
+        {
+            get { return (_BackSigmaScale); }
+
+            set
+            {
+                if (value < 0 || value > 1)
+                    throw new ArgumentException("Value must be between 0 and 1.");
+
+                if (_BackSigmaScale != value)
+                {
+                    _BackSigmaScale = value;
+
+                    OnGaugeFrameChanged();
+                }
+            }
+        }
+
+        #endregion
+
+        #region Bounds
+
+        /// <summary>
+        /// Gets the bounding frame rectangle
+        /// </summary>
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public Rectangle Bounds
+        {
+            get { return (_Bounds); }
+            internal set { _Bounds = value; }
+        }
+
+        #endregion
+
+        #region Center
+
+        /// <summary>
+        /// Gets the center of the gauge frame
+        /// </summary>
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public PointF Center
+        {
+            get { return (_Center); }
+            internal set { _Center = value; }
+        }
+
+        #endregion
+
+        #region InnerBevel
+
+        /// <summary>
+        /// Gets or sets the inner frame bevel width, measured as a percentage of the width/height.
+        /// </summary>
+        [Browsable(true)]
+        [Category("Appearance"), DefaultValue(.035f)]
+        [Description("Indicates the inner frame bevel width, measured as a percentage of the width/height.")]
+        [Editor("DevComponents.Instrumentation.Design.HalfRadiusRangeValueEditor, DevComponents.Instrumentation.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=76cb4c6eb576bca5", typeof(UITypeEditor))]
+        public float InnerBevel
+        {
+            get { return (_InnerBevel); }
+
+            set
+            {
+                if (_InnerBevel != value)
+                {
+                    if (value < 0 || value > .5f)
+                        throw new ArgumentException("Value must be between 0 and .5");
+
+                    _InnerBevel = value;
+
+                    OnGaugeFrameChanged();
+                }
+            }
+        }
+
+        #endregion
+
+        #region OuterBevel
+
+        /// <summary>
+        /// Gets or sets the outer frame bevel width, measured as a percentage of the width/height.
+        /// </summary>
+        [Browsable(true)]
+        [Category("Appearance"), DefaultValue(.05f)]
+        [Description("Indicates the outer frame bevel width, measured as a percentage of the width/height.")]
+        [Editor("DevComponents.Instrumentation.Design.HalfRadiusRangeValueEditor, DevComponents.Instrumentation.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=76cb4c6eb576bca5", typeof(UITypeEditor))]
+        public float OuterBevel
+        {
+            get { return (_OuterBevel); }
+
+            set
+            {
+                if (value < 0 || value > .5f)
+                    throw new ArgumentException("Value must be between 0 and .5");
+
+                if (_OuterBevel != value)
+                {
+                    _OuterBevel = value;
+
+                    OnGaugeFrameChanged();
+                }
+            }
+        }
+
+        #endregion
+
+        #region ClipOuterFrame
+
+        /// <summary>
+        /// Gets and sets whether the frame exterior is clipped.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), DefaultValue(false)]
+        [Description("Indicates whether the frame exterior is clipped.")]
+        public bool ClipOuterFrame
+        {
+            get { return (_ClipOuterFrame); }
+
+            set
+            {
+                if (_ClipOuterFrame != value)
+                {
+                    _ClipOuterFrame = value;
+
+                    OnGaugeFrameChanged();
+                }
+            }
+        }
+
+        #endregion
+
+        #region FrameColor
+
+        /// <summary>
+        /// Gets or sets the Frame Color of the Gauge.
+        /// </summary>
+        [Browsable(true), Category("Appearance")]
+        [Description("Indicates the Frame Color of the Gauge.")]
+        public GradientFillColor FrameColor
+        {
+            get
+            {
+                if (_FrameColor == null)
+                {
+                    _FrameColor = new GradientFillColor();
+                    _FrameColor.ColorTableChanged += FrameColor_ColorTableChanged;
+                }
+
+                return (_FrameColor);
+            }
+
+            set
+            {
+                if (_FrameColor != null)
+                    _FrameColor.ColorTableChanged -= FrameColor_ColorTableChanged;
+
+                _FrameColor = value;
+
+                if (_FrameColor != null)
+                    _FrameColor.ColorTableChanged += FrameColor_ColorTableChanged;
+
+                OnGaugeFrameChanged();
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        internal virtual bool ShouldSerializeFrameColor()
+        {
+            return (FrameColor.IsEqualTo(Color.Gainsboro,
+                Color.Gray, 45, GradientFillType.Auto, Color.Empty, 0) == false);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        internal void ResetFrameColor()
+        {
+            FrameColor = new GradientFillColor(Color.Gainsboro, Color.Gray, 45);
+        }
+
+        #endregion
+
+        #region Image
+
+        /// <summary>
+        /// Gets of sets the Image to use for the Gauge Frame
+        /// </summary>
+        [Browsable(true)]
+        [Category("Appearance"), DefaultValue(null)]
+        [Description("Indicates the Image to use for the Gauge Frame.")]
+        public Image Image
+        {
+            get { return (_Image); }
+
+            set
+            {
+                if (_Image != value)
+                {
+                    _Image = value;
+
+                    OnGaugeFrameChanged();
+                }
+            }
+        }
+
+        #endregion
+
+        #region FrameSigmaFocus
+
+        /// <summary>
+        /// Gets or sets the SigmaBellShape.Focus used when Center filling the frame.
+        /// </summary>
+        [Browsable(true)]
+        [Category("Appearance"), DefaultValue(.15f)]
+        [Description("Indicates the SigmaBellShape.Focus used when Center filling the frame.")]
+        [Editor("DevComponents.Instrumentation.Design.WidthMaxRangeValueEditor, DevComponents.Instrumentation.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=76cb4c6eb576bca5", typeof(UITypeEditor))]
+        public float FrameSigmaFocus
+        {
+            get { return (_FrameSigmaFocus); }
+
+            set
+            {
+                if (value < 0 || value > 1)
+                    throw new ArgumentException("Value must be between 0 and 1.");
+
+                if (_FrameSigmaFocus != value)
+                {
+                    _FrameSigmaFocus = value;
+
+                    OnGaugeFrameChanged();
+                }
+            }
+        }
+
+        #endregion
+
+        #region FrameSigmaScale
+
+        /// <summary>
+        /// Gets or sets the SigmaBellShape.Scale used when Center filling the frame.
+        /// </summary>
+        [Browsable(true)]
+        [Category("Appearance"), DefaultValue(1f)]
+        [Description("Indicates the SigmaBellShape.Scale used when Center filling the frame.")]
+        [Editor("DevComponents.Instrumentation.Design.WidthMaxRangeValueEditor, DevComponents.Instrumentation.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=76cb4c6eb576bca5", typeof(UITypeEditor))]
+        public float FrameSigmaScale
+        {
+            get { return (_FrameSigmaScale); }
+
+            set
+            {
+                if (value < 0 || value > 1)
+                    throw new ArgumentException("Value must be between 0 and 1.");
+
+                if (_FrameSigmaScale != value)
+                {
+                    _FrameSigmaScale = value;
+
+                    OnGaugeFrameChanged();
+                }
+            }
+        }
+
+        #endregion
+
+        #region GaugeControl
+
+        /// <summary>
+        /// Gets the parent GaugeControl.
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public GaugeControl GaugeControl
+        {
+            get { return (_GaugeControl); }
+        }
+
+        #endregion
+
+        #region RoundRectangleArc
+
+        /// <summary>
+        /// Gets or sets the arc radius used when drawing RoundRectangle
+        /// frames, measured as a percentage of the width/height.
+        /// </summary>
+        [Browsable(true)]
+        [Category("Appearance"), DefaultValue(.125f)]
+        [Description("Indicates the arc radius used when drawing RoundRectangle frames, measured as a percentage of the width/height.")]
+        [Editor("DevComponents.Instrumentation.Design.WidthMaxRangeValueEditor, DevComponents.Instrumentation.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=76cb4c6eb576bca5", typeof(UITypeEditor))]
+        public float RoundRectangleArc
+        {
+            get { return (_RoundRectangleArc); }
+
+            set
+            {
+                if (_RoundRectangleArc != value)
+                {
+                    if (value < 0 || value > 1f)
+                        throw new ArgumentException("Radius must be between 0 and 1");
+
+                    _RoundRectangleArc = value;
+
+                    OnGaugeFrameChanged();
+                }
+            }
+        }
+
+        #endregion
+
+        #region Style
+
+        /// <summary>
+        /// Gets or sets the frame Style.
+        /// </summary>
+        [Browsable(true)]
+        [Category("Appearance"), DefaultValue(GaugeFrameStyle.None)]
+        [Description("Indicates the frame Style.")]
+        public GaugeFrameStyle Style
+        {
+            get { return (_Style); }
+
+            set
+            {
+                if (_Style != value)
+                {
+                    _Style = value;
+                    _AutoCenter = false;
+
+                    switch (_Style)
+                    {
+                        case GaugeFrameStyle.Circular:
+                            _AutoCenter = true;
+                            _Renderer = new GaugeFrameCircularRenderer(this);
+                            break;
+
+                        case GaugeFrameStyle.Rectangular:
+                            _Renderer = new GaugeFrameRectangularRenderer(this);
+                            break;
+
+                        case GaugeFrameStyle.RoundedRectangular:
+                            _Renderer = new GaugeFrameRoundRectRenderer(this);
+                            break;
+
+                        default:
+                            _Renderer = null;
+                            break;
+                    }
+
+                    OnGaugeFrameChanged();
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region AutoCenter
+
+        internal bool AutoCenter
+        {
+            get { return (_AutoCenter); }
+        }
+
+        #endregion
+
+        #region Renderer
+
+        internal GaugeFrameRenderer Renderer
+        {
+            get { return (_Renderer); }
+            set { _Renderer = value; }
+        }
+
+        #endregion
+
+        #region MinDimension
+
+        internal int MinDimension
+        {
+            get { return (Math.Min(_Bounds.Width, _Bounds.Height)); }
+        }
+
+        #endregion
+
+        #region NeedRecalcLayout
+
+        internal bool NeedRecalcLayout
+        {
+            get { return (_NeedRecalcLayout); }
+            set { _NeedRecalcLayout = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Event processing
+
+        #region BackColor_ColorTableChanged
+
+        void BackColor_ColorTableChanged(object sender, EventArgs e)
+        {
+            OnGaugeFrameChanged();
+        }
+
+        #endregion
+
+        #region FrameColor_ColorTableChanged
+
+        void FrameColor_ColorTableChanged(object sender, EventArgs e)
+        {
+            OnGaugeFrameChanged();
+        }
+
+        #endregion
+
+        #endregion
+
+        #region OnGaugeFrameChanged
+
+        private void OnGaugeFrameChanged()
+        {
+            _NeedRecalcLayout = true;
+
+            if (GaugeFrameChanged != null)
+                GaugeFrameChanged(this, EventArgs.Empty);
+        }
+
+        #endregion
+
+        #region RecalcLayout
+
+        internal void RecalcLayout()
+        {
+            if (_NeedRecalcLayout == true)
+            {
+                int n = Math.Min(_GaugeControl.Width, _GaugeControl.Height);
+
+                if (_Style == GaugeFrameStyle.Circular)
+                {
+                    // Allow a couple of extra pixels 
+                    // for better antialiasing with dark back colors...
+
+                    n -= 2;
+
+                    int x = (_GaugeControl.Width - n) / 2;
+                    int y = (_GaugeControl.Height - n) / 2;
+
+                    n = Math.Max(n, 1);
+
+                    _Bounds = new Rectangle(x, y, n, n);
+                }
+                else
+                {
+                    _Bounds = new Rectangle(Point.Empty, _GaugeControl.Bounds.Size);
+                }
+
+                _Center = new PointF(_Bounds.X + _Bounds.Width / 2, _Bounds.Y + _Bounds.Height / 2);
+
+                int m = AbsBevelInside + AbsBevelOutside;
+
+                _BackBounds = _Bounds;
+                _BackBounds.Inflate(-m, -m);
+
+                if (_ClipOuterFrame == true)
+                    OnSetFrameRegion();
+                else
+                    _GaugeControl.Region = null;
+
+                _NeedRecalcLayout = false;
+            }
+        }
+
+        #endregion
+
+        #region OnPaint
+
+        internal void OnPaint(PaintEventArgs e)
+        {
+            RecalcLayout();
+
+            if (OnPreRenderFrame(e) == false)
+            {
+                if (_Image != null)
+                {
+                    e.Graphics.DrawImage(_Image, _Bounds);
+                }
+                else
+                {
+                    if (_Renderer != null)
+                        _Renderer.RenderFrame(e);
+                }
+            }
+
+            OnPostRenderFrame(e);
+        }
+
+        #region OnPreRenderFrame
+
+        private bool OnPreRenderFrame(PaintEventArgs e)
+        {
+            if (PreRenderFrame != null)
+            {
+                PreRenderFrameEventArgs args =
+                    new PreRenderFrameEventArgs(e.Graphics, _Bounds);
+
+                PreRenderFrame(this, args);
+
+                return (args.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region OnPostRenderFrame
+
+        private void OnPostRenderFrame(PaintEventArgs e)
+        {
+            if (PostRenderFrame != null)
+            {
+                PostRenderFrameEventArgs args =
+                    new PostRenderFrameEventArgs(e.Graphics, _Bounds);
+
+                PostRenderFrame(this, args);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region OnSetFrameRegion
+
+        private void OnSetFrameRegion()
+        {
+            if (SetGaugeFrameRegion != null)
+            {
+                SetFrameRegionEventArgs args =
+                    new SetFrameRegionEventArgs(_Bounds);
+
+                SetGaugeFrameRegion(this, args);
+
+                if (args.Cancel == true)
+                    return;
+            }
+
+            if (_Renderer != null)
+                _Renderer.SetFrameRegion();
+            else
+                _GaugeControl.Region = null;
+        }
+
+        #endregion
+
+        #region PreRenderContent
+
+        internal void PreRenderContent(PaintEventArgs e)
+        {
+            if (_Renderer != null)
+                _Renderer.PreRenderContent(e);
+        }
+
+        #endregion
+
+        #region PostRenderContent
+
+        internal void PostRenderContent(PaintEventArgs e)
+        {
+            if (_Renderer != null)
+                _Renderer.PostRenderContent(e);
+        }
+
+        #endregion
+
+        #region IDisposable Members
+
+        public void Dispose()
+        {
+            if (_BackColor != null)
+                _BackColor.ColorTableChanged -= BackColor_ColorTableChanged;
+
+            if (_FrameColor != null)
+                _FrameColor.ColorTableChanged -= FrameColor_ColorTableChanged;
+        }
+
+        #endregion
+    }
+
+    #region GaugeFrameConvertor
+
+    public class GaugeFrameConvertor : ExpandableObjectConverter
+    {
+        public override object ConvertTo(
+            ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+        {
+            if (destinationType == typeof(string))
+            {
+                GaugeFrame gf = value as GaugeFrame;
+
+                if (gf != null)
+                {
+                    switch (gf.Style)
+                    {
+                        case GaugeFrameStyle.Circular:
+                            return ("Circular");
+
+                        case GaugeFrameStyle.Rectangular:
+                            return ("Rectangular");
+
+                        case GaugeFrameStyle.RoundedRectangular:
+                            return ("Rounded Rectangular");
+
+                        default:
+                            return ("None");
+                    }
+                }
+            }
+
+            return (base.ConvertTo(context, culture, value, destinationType));
+        }
+    }
+
+    #endregion
+
+    #region Enums
+
+    public enum GaugeFrameStyle
+    {
+        None,
+
+        Circular,
+        Rectangular,
+        RoundedRectangular,
+    }
+
+    #endregion
+
+    #region EventArgs
+
+    #region GetFrameRegionEventArgs
+
+    /// <summary>
+    /// SetFrameRegionEventArgs
+    /// </summary>
+    public class SetFrameRegionEventArgs : CancelEventArgs
+    {
+        #region Private variables
+
+        private Region _Region;
+        private Rectangle _Bounds;
+
+        #endregion
+
+        public SetFrameRegionEventArgs(Rectangle bounds)
+        {
+            _Bounds = bounds;
+        }
+
+        #region Public properties
+
+        #region Bounds
+
+        /// <summary>
+        /// Gets the Region Bounds
+        /// </summary>
+        public Rectangle Bounds
+        {
+            get { return (_Bounds); }
+        }
+
+        #endregion
+
+        #region Region
+
+        /// <summary>
+        /// Gets or sets the frame Region
+        /// </summary>
+        public Region Region
+        {
+            get { return (_Region); }
+            set { _Region = value; }
+        }
+
+        #endregion
+
+        #endregion
+    }
+
+    #endregion
+
+    #region PostRenderFrameEventArgs
+
+    /// <summary>
+    /// PostRenderFrameEventArgs
+    /// </summary>
+    public class PostRenderFrameEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private Graphics _Graphics;
+        private Rectangle _Bounds;
+
+        #endregion
+
+        public PostRenderFrameEventArgs(Graphics graphics, Rectangle bounds)
+        {
+            _Graphics = graphics;
+            _Bounds = bounds;
+        }
+
+        #region Public properties
+
+        #region Bounds
+
+        /// <summary>
+        /// Gets the Frame Bounds
+        /// </summary>
+        public Rectangle Bounds
+        {
+            get { return (_Bounds); }
+        }
+
+        #endregion
+
+        #region Graphics
+
+        /// <summary>
+        /// Gets the Graphics object to use for the render
+        /// </summary>
+        public Graphics Graphics
+        {
+            get { return (_Graphics); }
+        }
+
+        #endregion
+
+        #endregion
+    }
+
+    #endregion
+
+    #region PreRenderFrameEventArgs
+
+    public class PreRenderFrameEventArgs : CancelEventArgs
+    {
+        #region Private variables
+
+        private Graphics _Graphics;
+        private Rectangle _Bounds;
+
+        #endregion
+
+        public PreRenderFrameEventArgs(Graphics graphics, Rectangle bounds)
+        {
+            _Graphics = graphics;
+            _Bounds = bounds;
+        }
+
+        #region Public properties
+
+        public Graphics Graphics
+        {
+            get { return (_Graphics); }
+        }
+
+        public Rectangle Bounds
+        {
+            get { return (_Bounds); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeFrame/GaugeFrameCircularRenderer.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeFrame/GaugeFrameCircularRenderer.cs
new file mode 100644
index 00000000..57c35e15
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeFrame/GaugeFrameCircularRenderer.cs	
@@ -0,0 +1,360 @@
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Windows.Forms;
+
+namespace DevComponents.Instrumentation
+{
+    internal class GaugeFrameCircularRenderer : GaugeFrameRenderer
+    {
+        public GaugeFrameCircularRenderer(GaugeFrame gaugeFrame)
+            : base(gaugeFrame)
+        {
+        }
+
+        #region SetFrameRegion
+
+        internal override void SetFrameRegion()
+        {
+            if (GaugeFrame.GaugeControl != null)
+            {
+                using (GraphicsPath path = new GraphicsPath())
+                {
+                    path.AddEllipse(GaugeFrame.Bounds);
+
+                    GaugeFrame.GaugeControl.Region = new Region(path);
+                }
+            }
+        }
+
+        #endregion
+
+        #region SetBackClipRegion
+
+        internal override void SetBackClipRegion(PaintEventArgs e)
+        {
+            int inside = GaugeFrame.AbsBevelInside;
+            int outside = GaugeFrame.AbsBevelOutside;
+
+            Rectangle r = GaugeFrame.Bounds;
+            r.Inflate(-outside -inside, -outside -inside);
+
+            using (GraphicsPath path = new GraphicsPath())
+            {
+                path.AddEllipse(r);
+
+                e.Graphics.SetClip(path, CombineMode.Intersect);
+            }
+        }
+
+        #endregion
+
+        #region RenderFrame
+
+        #region RenderFrameByAngle
+
+        protected override void RenderFrameByAngle(PaintEventArgs e, Rectangle r)
+        {
+            Graphics g = e.Graphics;
+
+            Matrix myMatrix = new Matrix();
+            myMatrix.RotateAt(GaugeFrame.FrameColor.GradientAngle, GaugeFrame.Center);
+
+            e.Graphics.Transform = myMatrix;
+
+            using (Brush br = GaugeFrame.FrameColor.GetBrush(GaugeFrame.Bounds, 0))
+                g.FillEllipse(br, GaugeFrame.Bounds);
+
+            RenderFrameBorder(g);
+
+            using (Brush br = GaugeFrame.FrameColor.GetBrush(r, 180))
+                g.FillEllipse(br, r);
+
+            g.ResetTransform();
+        }
+
+        #endregion
+
+        #region RenderFrameByCenter
+
+        protected override void RenderFrameByCenter(PaintEventArgs e, Rectangle r)
+        {
+            Graphics g = e.Graphics;
+
+            using (GraphicsPath path = new GraphicsPath())
+            {
+                path.AddEllipse(GaugeFrame.Bounds);
+
+                using (PathGradientBrush br = new PathGradientBrush(path))
+                {
+                    br.CenterPoint = GaugeFrame.Center;
+                    br.CenterColor = GaugeFrame.FrameColor.Start;
+                    br.SurroundColors = new Color[] { GaugeFrame.FrameColor.End };
+
+                    br.SetSigmaBellShape(GaugeFrame.FrameSigmaFocus, GaugeFrame.FrameSigmaScale);
+
+                    g.FillEllipse(br, GaugeFrame.Bounds);
+                }
+
+                path.AddEllipse(r);
+
+                using (PathGradientBrush br = new PathGradientBrush(path))
+                {
+                    br.CenterPoint = GaugeFrame.Center;
+                    br.CenterColor = GaugeFrame.FrameColor.End;
+                    br.SurroundColors = new Color[] { GaugeFrame.FrameColor.Start };
+
+                    g.FillEllipse(br, r);
+                }
+            }
+
+            RenderFrameBorder(g);
+        }
+
+        #endregion
+
+        #region PaintCircularFrameByHvCenter
+
+        protected override void RenderFrameByHorizontalCenter(PaintEventArgs e, Rectangle r)
+        {
+            RenderFrameByHvCenter(e, r, 90);
+        }
+
+        protected override void RenderFrameByVerticalCenter(PaintEventArgs e, Rectangle r)
+        {
+            RenderFrameByHvCenter(e, r, 0);
+        }
+
+        private void RenderFrameByHvCenter(PaintEventArgs e, Rectangle r, int angle)
+        {
+            Graphics g = e.Graphics;
+
+            Rectangle t = GaugeFrame.Bounds;
+            t.Height /= 2;
+            t.Width /= 2;
+
+            using (Brush br = GaugeFrame.FrameColor.GetBrush(t, angle))
+            {
+                if (br is LinearGradientBrush)
+                    ((LinearGradientBrush)br).WrapMode = WrapMode.TileFlipXY;
+
+                g.FillEllipse(br, GaugeFrame.Bounds);
+            }
+
+            t = r;
+            t.Height /= 2;
+            t.Width /= 2;
+
+            using (Brush br = GaugeFrame.FrameColor.GetBrush(t, angle + 180))
+            {
+                if (br is LinearGradientBrush)
+                    ((LinearGradientBrush)br).WrapMode = WrapMode.TileFlipXY;
+
+                g.FillEllipse(br, r);
+            }
+
+            RenderFrameBorder(g);
+        }
+
+        #endregion
+
+        #region RenderFrameByNone
+
+        protected override void RenderFrameByNone(PaintEventArgs e, Rectangle r)
+        {
+            Graphics g = e.Graphics;
+
+            using (Brush br = new SolidBrush(GaugeFrame.FrameColor.Start))
+                g.FillEllipse(br, GaugeFrame.Bounds);
+
+            if (GaugeFrame.FrameColor.End.IsEmpty == false)
+            {
+                using (Brush br = new SolidBrush(GaugeFrame.FrameColor.End))
+                    g.FillEllipse(br, r);
+            }
+
+            RenderFrameBorder(g);
+        }
+
+        #endregion
+
+        #region RenderFrameBorder
+
+        private void RenderFrameBorder(Graphics g)
+        {
+            if (GaugeFrame.FrameColor.BorderWidth > 0)
+            {
+                using (Pen pen = new Pen(
+                    GaugeFrame.FrameColor.BorderColor, GaugeFrame.FrameColor.BorderWidth))
+                {
+                    pen.Alignment = PenAlignment.Inset;
+
+                    g.DrawEllipse(pen, GaugeFrame.Bounds);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderrBack
+
+        #region RenderBackByAngle
+
+        protected override void RenderBackByAngle(PaintEventArgs e, Rectangle r)
+        {
+            Graphics g = e.Graphics;
+
+            Matrix myMatrix = new Matrix();
+            myMatrix.RotateAt(GaugeFrame.BackColor.GradientAngle, GaugeFrame.Center);
+
+            e.Graphics.Transform = myMatrix;
+
+            using (Brush br = GaugeFrame.BackColor.GetBrush(r, 0))
+                g.FillEllipse(br, r);
+
+            g.ResetTransform();
+
+            RenderBackBorder(g, r);
+        }
+
+        #endregion
+
+        #region RenderBackByCenter
+
+        protected override void RenderBackByCenter(PaintEventArgs e, Rectangle r)
+        {
+            Graphics g = e.Graphics;
+
+            using (GraphicsPath path = new GraphicsPath())
+            {
+                path.AddEllipse(r);
+
+                using (PathGradientBrush br = new PathGradientBrush(path))
+                {
+                    br.CenterColor = GaugeFrame.BackColor.Start;
+                    br.SurroundColors = new Color[] { GaugeFrame.BackColor.End };
+                    br.CenterPoint = GaugeFrame.Center;
+
+                    br.SetSigmaBellShape(GaugeFrame.BackSigmaFocus, GaugeFrame.BackSigmaScale);
+
+                    g.FillRectangle(br, r);
+                }
+            }
+
+            RenderBackBorder(g, r);
+        }
+
+        #endregion
+
+        #region RenderBackByHvCenter
+
+        protected override void RenderBackByHorizontalCenter(PaintEventArgs e, Rectangle r)
+        {
+            RenderBackByHvCenter(e, r, 90);
+        }
+
+        protected override void RenderBackByVerticalCenter(PaintEventArgs e, Rectangle r)
+        {
+            RenderBackByHvCenter(e, r, 0);
+        }
+
+        private void RenderBackByHvCenter(PaintEventArgs e, Rectangle r, int angle)
+        {
+            Graphics g = e.Graphics;
+
+            Rectangle t = r;
+            t.Height /= 2;
+            t.Width /= 2;
+
+            using (Brush br = GaugeFrame.BackColor.GetBrush(t, angle))
+            {
+                if (br is LinearGradientBrush)
+                    ((LinearGradientBrush)br).WrapMode = WrapMode.TileFlipXY;
+
+                g.FillEllipse(br, r);
+            }
+
+            RenderBackBorder(g, r);
+        }
+
+        #endregion
+
+        #region RenderBackByNone
+
+        protected override void RenderBackByNone(PaintEventArgs e, Rectangle r)
+        {
+            Graphics g = e.Graphics;
+
+            using (Brush br = new SolidBrush(GaugeFrame.BackColor.Start))
+                g.FillEllipse(br, r);
+
+            RenderBackBorder(g, r);
+        }
+
+        #endregion
+
+        #region RenderBackBorder
+
+        private void RenderBackBorder(Graphics g, Rectangle r)
+        {
+            if (GaugeFrame.BackColor.BorderWidth > 0)
+            {
+                using (Pen pen = new Pen(
+                    GaugeFrame.BackColor.BorderColor, GaugeFrame.BackColor.BorderWidth))
+                {
+                    pen.Alignment = PenAlignment.Inset;
+
+                    g.DrawEllipse(pen, r);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region PreRenderContent
+
+        internal override void PreRenderContent(PaintEventArgs e)
+        {
+            if (GaugeFrame.AddGlassEffect == true)
+                AddGlassEffect(e, 45);
+        }
+
+        #endregion
+
+        #region PostRenderContent
+
+        internal override void PostRenderContent(PaintEventArgs e)
+        {
+            if (GaugeFrame.AddGlassEffect == true)
+                AddGlassEffect(e, 90);
+        }
+
+        #endregion
+
+        #region AddGlassEffect
+
+        private void AddGlassEffect(PaintEventArgs e, float angle)
+        {
+            Graphics g = e.Graphics;
+
+            Rectangle r = GaugeFrame.BackBounds;
+            r.Height /= 2;
+
+            if (r.Height > 0)
+            {
+                Color color1 = Color.FromArgb(100, Color.White);
+
+                using (LinearGradientBrush br =
+                    new LinearGradientBrush(r, color1, Color.Transparent, angle))
+                {
+                    g.FillEllipse(br, r);
+                }
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeFrame/GaugeFrameRectangularRenderer.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeFrame/GaugeFrameRectangularRenderer.cs
new file mode 100644
index 00000000..27b69e0c
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeFrame/GaugeFrameRectangularRenderer.cs	
@@ -0,0 +1,345 @@
+using System;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Windows.Forms;
+
+namespace DevComponents.Instrumentation
+{
+    internal class GaugeFrameRectangularRenderer : GaugeFrameRenderer
+    {
+        public GaugeFrameRectangularRenderer(GaugeFrame gaugeFrame)
+            : base(gaugeFrame)
+        {
+        }
+
+        #region SetBackClipRegion
+
+        internal override void SetBackClipRegion(PaintEventArgs e)
+        {
+            int inside = GaugeFrame.AbsBevelInside;
+            int outside = GaugeFrame.AbsBevelOutside;
+
+            Rectangle r = GaugeFrame.Bounds;
+            r.Inflate(-outside - inside, -outside - inside);
+
+            e.Graphics.SetClip(r, CombineMode.Intersect);
+        }
+
+        #endregion
+
+        #region RenderFrame
+
+        #region RenderFrameByAngle
+
+        protected override void RenderFrameByAngle(PaintEventArgs e, Rectangle r)
+        {
+            Graphics g = e.Graphics;
+
+            using (Brush br = GaugeFrame.FrameColor.GetBrush(GaugeFrame.Bounds))
+                g.FillRectangle(br, GaugeFrame.Bounds);
+
+            using (Brush br = GaugeFrame.FrameColor.GetBrush(r, GaugeFrame.FrameColor.GradientAngle + 180))
+                g.FillRectangle(br, r);
+
+            RenderFrameBorder(g, GaugeFrame.Bounds);
+        }
+
+        #endregion
+
+        #region RenderFrameByCenter
+
+        protected override void RenderFrameByCenter(PaintEventArgs e, Rectangle r)
+        {
+            Graphics g = e.Graphics;
+
+            using (GraphicsPath path = new GraphicsPath())
+            {
+                path.AddRectangle(GaugeFrame.Bounds);
+
+                using (PathGradientBrush br = new PathGradientBrush(path))
+                {
+                    br.CenterPoint = GaugeFrame.Center;
+                    br.CenterColor = GaugeFrame.FrameColor.Start;
+                    br.SurroundColors = new Color[] { GaugeFrame.FrameColor.End };
+
+                    br.SetSigmaBellShape(GaugeFrame.FrameSigmaFocus, GaugeFrame.FrameSigmaScale);
+
+                    g.FillRectangle(br, GaugeFrame.Bounds);
+                }
+
+                path.AddRectangle(r);
+
+                using (PathGradientBrush br = new PathGradientBrush(path))
+                {
+                    br.CenterPoint = GaugeFrame.Center;
+                    br.CenterColor = GaugeFrame.FrameColor.End;
+                    br.SurroundColors = new Color[] { GaugeFrame.FrameColor.Start };
+
+                    g.FillRectangle(br, r);
+                }
+            }
+
+            RenderFrameBorder(g, GaugeFrame.Bounds);
+        }
+
+        #endregion
+
+        #region PaintCircularFrameByHvCenter
+
+        protected override void RenderFrameByHorizontalCenter(PaintEventArgs e, Rectangle r)
+        {
+            RenderFrameByHvCenter(e, r, 90);
+        }
+
+        protected override void RenderFrameByVerticalCenter(PaintEventArgs e, Rectangle r)
+        {
+            RenderFrameByHvCenter(e, r, 0);
+        }
+
+        private void RenderFrameByHvCenter(PaintEventArgs e, Rectangle r, int angle)
+        {
+            Graphics g = e.Graphics;
+
+            Rectangle t = GaugeFrame.Bounds;
+            t.Height /= 2;
+            t.Width /= 2;
+
+            using (Brush br = GaugeFrame.FrameColor.GetBrush(t, angle))
+            {
+                if (br is LinearGradientBrush)
+                    ((LinearGradientBrush)br).WrapMode = WrapMode.TileFlipXY;
+
+                g.FillRectangle(br, GaugeFrame.Bounds);
+            }
+
+            t = r;
+            t.Height /= 2;
+            t.Width /= 2;
+
+            using (Brush br = GaugeFrame.FrameColor.GetBrush(t, angle + 180))
+            {
+                if (br is LinearGradientBrush)
+                    ((LinearGradientBrush)br).WrapMode = WrapMode.TileFlipXY;
+
+                g.FillRectangle(br, r);
+            }
+
+            RenderFrameBorder(g, GaugeFrame.Bounds);
+        }
+
+        #endregion
+
+        #region RenderFrameByNone
+
+        protected override void RenderFrameByNone(PaintEventArgs e, Rectangle r)
+        {
+            Graphics g = e.Graphics;
+
+            using (Brush br = new SolidBrush(GaugeFrame.FrameColor.Start))
+                g.FillRectangle(br, GaugeFrame.Bounds);
+
+            if (GaugeFrame.FrameColor.End.IsEmpty == false)
+            {
+                using (Brush br = new SolidBrush(GaugeFrame.FrameColor.End))
+                    g.FillRectangle(br, r);
+            }
+
+            RenderFrameBorder(g, GaugeFrame.Bounds);
+        }
+
+        #endregion
+
+        #region RenderFrameBorder
+
+        private void RenderFrameBorder(Graphics g, Rectangle r)
+        {
+            if (GaugeFrame.FrameColor.BorderWidth > 0)
+            {
+                using (Pen pen = new Pen(
+                    GaugeFrame.FrameColor.BorderColor, GaugeFrame.FrameColor.BorderWidth))
+                {
+                    pen.Alignment = PenAlignment.Inset;
+
+                    r.Width--;
+                    r.Height--;
+
+                    g.DrawRectangle(pen, r);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderrBack
+
+        #region RenderBackByAngle
+
+        protected override void RenderBackByAngle(PaintEventArgs e, Rectangle r)
+        {
+            Graphics g = e.Graphics;
+
+            using (Brush br = GaugeFrame.BackColor.GetBrush(r))
+            {
+                if (br is LinearGradientBrush)
+                    ((LinearGradientBrush)br).WrapMode = WrapMode.TileFlipXY;
+
+                g.FillRectangle(br, r);
+            }
+
+            RenderBackBorder(g, r);
+        }
+
+        #endregion
+
+        #region RenderBackByCenter
+
+        protected override void RenderBackByCenter(PaintEventArgs e, Rectangle r)
+        {
+            Graphics g = e.Graphics;
+
+            using (GraphicsPath path = new GraphicsPath())
+            {
+                path.AddRectangle(r);
+
+                using (PathGradientBrush br = new PathGradientBrush(path))
+                {
+                    br.CenterColor = GaugeFrame.BackColor.Start;
+                    br.SurroundColors = new Color[] { GaugeFrame.BackColor.End };
+                    br.CenterPoint = GaugeFrame.Center;
+
+                    br.SetSigmaBellShape(GaugeFrame.BackSigmaFocus, GaugeFrame.BackSigmaScale);
+
+                    g.FillRectangle(br, r);
+                }
+            }
+
+            RenderBackBorder(g, r);
+        }
+
+        #endregion
+
+        #region RenderBackByHvCenter
+
+        protected override void RenderBackByHorizontalCenter(PaintEventArgs e, Rectangle r)
+        {
+            RenderBackByHvCenter(e, r, 90);
+        }
+
+        protected override void RenderBackByVerticalCenter(PaintEventArgs e, Rectangle r)
+        {
+            RenderBackByHvCenter(e, r, 0);
+        }
+
+        private void RenderBackByHvCenter(PaintEventArgs e, Rectangle r, int angle)
+        {
+            Graphics g = e.Graphics;
+
+            Rectangle t = r;
+            t.Height /= 2;
+            t.Width /= 2;
+
+            using (Brush br = GaugeFrame.BackColor.GetBrush(t, angle))
+            {
+                if (br is LinearGradientBrush)
+                    ((LinearGradientBrush)br).WrapMode = WrapMode.TileFlipXY;
+
+                g.FillRectangle(br, r);
+            }
+
+            RenderBackBorder(g, r);
+        }
+
+        #endregion
+
+        #region RenderBackByNone
+
+        protected override void RenderBackByNone(PaintEventArgs e, Rectangle r)
+        {
+            Graphics g = e.Graphics;
+
+            using (Brush br = new SolidBrush(GaugeFrame.BackColor.Start))
+                g.FillRectangle(br, r);
+
+            RenderBackBorder(g, r);
+        }
+
+        #endregion
+
+        #region RenderBackBorder
+
+        private void RenderBackBorder(Graphics g, Rectangle r)
+        {
+            if (GaugeFrame.BackColor.BorderWidth > 0)
+            {
+                using (Pen pen = new Pen(
+                    GaugeFrame.BackColor.BorderColor, GaugeFrame.BackColor.BorderWidth))
+                {
+                    pen.Alignment = PenAlignment.Inset;
+
+                    r.Width--;
+                    r.Height--;
+
+                    g.DrawRectangle(pen, r);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region PreRenderContent
+
+        internal override void PreRenderContent(PaintEventArgs e)
+        {
+            if (GaugeFrame.AddGlassEffect == true)
+                AddGlassEffect(e, 2.5f, 45);
+        }
+
+        #endregion
+
+        #region PostRenderContent
+
+        internal override void PostRenderContent(PaintEventArgs e)
+        {
+            if (GaugeFrame.AddGlassEffect == true)
+                AddGlassEffect(e, 2, 90);
+        }
+
+        #endregion
+
+        #region AddGlassEffect
+
+        private void AddGlassEffect(PaintEventArgs e, float f, float angle)
+        {
+            Graphics g = e.Graphics;
+
+            Rectangle r = GaugeFrame.BackBounds;
+
+            float x = Math.Max(r.Height, r.Width);
+
+            using (GraphicsPath path = new GraphicsPath())
+            {
+                path.AddLines(new Point[] {
+                    new Point(r.X, r.Y),
+                    new Point(r.X, (int)(r.Y + x / f)),
+                    new Point(r.X + (int)(x / f), r.Y)});
+
+                path.CloseFigure();
+
+                Color color1 = Color.FromArgb(40, Color.White);
+
+                using (LinearGradientBrush br =
+                    new LinearGradientBrush(r, color1, Color.Transparent, angle))
+                {
+                    g.FillPath(br, path);
+                }
+            }
+        }
+
+        #endregion
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeFrame/GaugeFrameRenderer.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeFrame/GaugeFrameRenderer.cs
new file mode 100644
index 00000000..a43958fe
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeFrame/GaugeFrameRenderer.cs	
@@ -0,0 +1,129 @@
+using System.Drawing;
+using System.Windows.Forms;
+
+namespace DevComponents.Instrumentation
+{
+    internal abstract class GaugeFrameRenderer
+    {
+        #region Private variables
+
+        private GaugeFrame _GaugeFrame;
+
+        #endregion
+
+        protected GaugeFrameRenderer(GaugeFrame gaugeFrame)
+        {
+            _GaugeFrame = gaugeFrame;
+        }
+
+        #region Abstract methods
+
+        internal abstract void SetBackClipRegion(PaintEventArgs e);
+        internal abstract void PreRenderContent(PaintEventArgs e);
+        internal abstract void PostRenderContent(PaintEventArgs e);
+
+        protected abstract void RenderFrameByAngle(PaintEventArgs e, Rectangle r);
+        protected abstract void RenderFrameByCenter(PaintEventArgs e, Rectangle r);
+        protected abstract void RenderFrameByHorizontalCenter(PaintEventArgs e, Rectangle r);
+        protected abstract void RenderFrameByVerticalCenter(PaintEventArgs e, Rectangle r);
+        protected abstract void RenderFrameByNone(PaintEventArgs e, Rectangle r);
+
+        protected abstract void RenderBackByAngle(PaintEventArgs e, Rectangle r);
+        protected abstract void RenderBackByCenter(PaintEventArgs e, Rectangle r);
+        protected abstract void RenderBackByHorizontalCenter(PaintEventArgs e, Rectangle r);
+        protected abstract void RenderBackByVerticalCenter(PaintEventArgs e, Rectangle r);
+        protected abstract void RenderBackByNone(PaintEventArgs e, Rectangle r);
+
+        #endregion
+
+        #region Protected properties
+
+        protected GaugeFrame GaugeFrame
+        {
+            get { return (_GaugeFrame); }
+        }
+
+        #endregion
+
+        #region SetFrameRegion
+
+        internal virtual void SetFrameRegion()
+        {
+            if (GaugeFrame.GaugeControl != null)
+                GaugeFrame.GaugeControl.Region = null;
+        }
+
+        #endregion
+
+        #region RenderFrame
+
+        internal void RenderFrame(PaintEventArgs e)
+        {
+            int inside = _GaugeFrame.AbsBevelInside;
+            int outside = _GaugeFrame.AbsBevelOutside;
+
+            Rectangle r = _GaugeFrame.Bounds;
+            r.Inflate(-outside, -outside);
+
+            if (r.Width > 0 && r.Height > 0)
+            {
+                switch (_GaugeFrame.FrameColor.GradientFillType)
+                {
+                    case GradientFillType.Auto:
+                    case GradientFillType.Angle:
+                    case GradientFillType.StartToEnd:
+                        RenderFrameByAngle(e, r);
+                        break;
+
+                    case GradientFillType.Center:
+                        RenderFrameByCenter(e, r);
+                        break;
+
+                    case GradientFillType.HorizontalCenter:
+                        RenderFrameByHorizontalCenter(e, r);
+                        break;
+
+                    case GradientFillType.VerticalCenter:
+                        RenderFrameByVerticalCenter(e, r);
+                        break;
+
+                    default:
+                        RenderFrameByNone(e, r);
+                        break;
+                }
+
+                r.Inflate(-inside, -inside);
+
+                if (r.Width > 0 && r.Height > 0)
+                {
+                    switch (_GaugeFrame.BackColor.GradientFillType)
+                    {
+                        case GradientFillType.Auto:
+                        case GradientFillType.Angle:
+                        case GradientFillType.StartToEnd:
+                            RenderBackByAngle(e, r);
+                            break;
+
+                        case GradientFillType.Center:
+                            RenderBackByCenter(e, r);
+                            break;
+
+                        case GradientFillType.HorizontalCenter:
+                            RenderBackByHorizontalCenter(e, r);
+                            break;
+
+                        case GradientFillType.VerticalCenter:
+                            RenderBackByVerticalCenter(e, r);
+                            break;
+
+                        default:
+                            RenderBackByNone(e, r);
+                            break;
+                    }
+                }
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeFrame/GaugeFrameRoundRectRenderer.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeFrame/GaugeFrameRoundRectRenderer.cs
new file mode 100644
index 00000000..8a04e043
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeFrame/GaugeFrameRoundRectRenderer.cs	
@@ -0,0 +1,409 @@
+using System;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Windows.Forms;
+
+namespace DevComponents.Instrumentation
+{
+    internal class GaugeFrameRoundRectRenderer : GaugeFrameRenderer
+    {
+        public GaugeFrameRoundRectRenderer(GaugeFrame gaugeFrame)
+            : base(gaugeFrame)
+        {
+        }
+
+        #region SetFrameRegion
+
+        internal override void SetFrameRegion()
+        {
+            if (GaugeFrame.GaugeControl != null)
+            {
+                using (GraphicsPath path = GetRoundRectPath(GaugeFrame.Bounds))
+                    GaugeFrame.GaugeControl.Region = new Region(path);
+            }
+        }
+
+        #endregion
+
+        #region SetBackClipRegion
+
+        internal override void SetBackClipRegion(PaintEventArgs e)
+        {
+            int inside = GaugeFrame.AbsBevelInside;
+            int outside = GaugeFrame.AbsBevelOutside;
+
+            Rectangle r = GaugeFrame.Bounds;
+            r.Inflate(-outside - inside, -outside - inside);
+
+            if (r.Width > 0 && r.Height > 0)
+            {
+                using (GraphicsPath path = GetRoundRectPath(r))
+                    e.Graphics.SetClip(path, CombineMode.Intersect);
+            }
+        }
+
+        #endregion
+
+        #region RenderFrame
+
+        #region RenderFrameByAngle
+
+        protected override void RenderFrameByAngle(PaintEventArgs e, Rectangle r)
+        {
+            Graphics g = e.Graphics;
+
+            using (GraphicsPath path = GetRoundRectPath(GaugeFrame.Bounds))
+            {
+                using (Brush br = GaugeFrame.FrameColor.GetBrush(GaugeFrame.Bounds))
+                    g.FillPath(br, path);
+
+                RenderFrameBorder(g, path);
+            }
+
+            using (GraphicsPath path = GetRoundRectPath(r))
+            {
+                using (Brush br = GaugeFrame.FrameColor.GetBrush(r, GaugeFrame.FrameColor.GradientAngle + 180))
+                    g.FillPath(br, path);
+            }
+        }
+
+        #endregion
+
+        #region RenderFrameByCenter
+
+        protected override void RenderFrameByCenter(PaintEventArgs e, Rectangle r)
+        {
+            Graphics g = e.Graphics;
+
+            using (GraphicsPath path = GetRoundRectPath(GaugeFrame.Bounds))
+            {
+                using (PathGradientBrush br = new PathGradientBrush(path))
+                {
+                    br.CenterPoint = GaugeFrame.Center;
+                    br.CenterColor = GaugeFrame.FrameColor.Start;
+                    br.SurroundColors = new Color[] { GaugeFrame.FrameColor.End };
+
+                    br.SetSigmaBellShape(GaugeFrame.FrameSigmaFocus, GaugeFrame.FrameSigmaScale);
+
+                    g.FillRectangle(br, GaugeFrame.Bounds);
+                }
+
+                RenderFrameBorder(g, path);
+            }
+
+            using (GraphicsPath path = GetRoundRectPath(r))
+            {
+                using (PathGradientBrush br = new PathGradientBrush(path))
+                {
+                    br.CenterPoint = GaugeFrame.Center;
+                    br.CenterColor = GaugeFrame.FrameColor.End;
+                    br.SurroundColors = new Color[] { GaugeFrame.FrameColor.Start };
+
+                    g.FillRectangle(br, r);
+                }
+            }
+        }
+
+        #endregion
+
+        #region PaintCircularFrameByHvCenter
+
+        protected override void RenderFrameByHorizontalCenter(PaintEventArgs e, Rectangle r)
+        {
+            RenderFrameByHvCenter(e, r, 90);
+        }
+
+        protected override void RenderFrameByVerticalCenter(PaintEventArgs e, Rectangle r)
+        {
+            RenderFrameByHvCenter(e, r, 0);
+        }
+
+        private void RenderFrameByHvCenter(PaintEventArgs e, Rectangle r, int angle)
+        {
+            Graphics g = e.Graphics;
+
+            Rectangle t = GaugeFrame.Bounds;
+            t.Height /= 2;
+            t.Width /= 2;
+
+            using (GraphicsPath path = GetRoundRectPath(GaugeFrame.Bounds))
+            {
+                using (Brush br = GaugeFrame.FrameColor.GetBrush(t, angle))
+                {
+                    if (br is LinearGradientBrush)
+                        ((LinearGradientBrush)br).WrapMode = WrapMode.TileFlipXY;
+
+                    g.FillPath(br, path);
+                }
+
+                RenderFrameBorder(g, path);
+            }
+
+            t = r;
+            t.Height /= 2;
+            t.Width /= 2;
+
+            using (GraphicsPath path = GetRoundRectPath(r))
+            {
+                using (Brush br = GaugeFrame.FrameColor.GetBrush(t, angle + 180))
+                {
+                    if (br is LinearGradientBrush)
+                        ((LinearGradientBrush)br).WrapMode = WrapMode.TileFlipXY;
+
+                    g.FillPath(br, path);
+                }
+            }
+        }
+
+        #endregion
+
+        #region RenderFrameByNone
+
+        protected override void RenderFrameByNone(PaintEventArgs e, Rectangle r)
+        {
+            Graphics g = e.Graphics;
+
+            using (GraphicsPath path = GetRoundRectPath(GaugeFrame.Bounds))
+            {
+                using (Brush br = new SolidBrush(GaugeFrame.FrameColor.Start))
+                    g.FillPath(br, path);
+
+                RenderFrameBorder(g, path);
+            }
+
+            if (GaugeFrame.FrameColor.End.IsEmpty == false)
+            {
+                using (GraphicsPath path = GetRoundRectPath(r))
+                {
+                    using (Brush br = new SolidBrush(GaugeFrame.FrameColor.End))
+                        g.FillPath(br, path);
+                }
+            }
+        }
+
+        #endregion
+
+        #region RenderFrameBorder
+
+        private void RenderFrameBorder(Graphics g, GraphicsPath path)
+        {
+            if (GaugeFrame.FrameColor.BorderWidth > 0)
+            {
+                using (Pen pen = new Pen(
+                    GaugeFrame.FrameColor.BorderColor, GaugeFrame.FrameColor.BorderWidth))
+                {
+                    pen.Alignment = PenAlignment.Inset;
+
+                    g.DrawPath(pen, path);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderBack
+
+        #region RenderBackByAngle
+
+        protected override void RenderBackByAngle(PaintEventArgs e, Rectangle r)
+        {
+            Graphics g = e.Graphics;
+
+            using (GraphicsPath path = GetRoundRectPath(r))
+            {
+                using (Brush br = GaugeFrame.BackColor.GetBrush(r))
+                {
+                    if (br is LinearGradientBrush)
+                        ((LinearGradientBrush)br).WrapMode = WrapMode.TileFlipXY;
+
+                    g.FillPath(br, path);
+
+                    RenderBackBorder(g, path);
+                }
+            }
+        }
+
+        #endregion
+
+        #region RenderBackByCenter
+
+        protected override void RenderBackByCenter(PaintEventArgs e, Rectangle r)
+        {
+            Graphics g = e.Graphics;
+
+            using (GraphicsPath path = GetRoundRectPath(r))
+            {
+                using (PathGradientBrush br = new PathGradientBrush(path))
+                {
+                    br.CenterColor = GaugeFrame.BackColor.Start;
+                    br.SurroundColors = new Color[] { GaugeFrame.BackColor.End };
+                    br.CenterPoint = GaugeFrame.Center;
+
+                    br.SetSigmaBellShape(GaugeFrame.BackSigmaFocus, GaugeFrame.BackSigmaScale);
+
+                    g.FillRectangle(br, r);
+                }
+
+                RenderBackBorder(g, path);
+            }
+        }
+
+        #endregion
+
+        #region RenderBackByHvCenter
+
+        protected override void RenderBackByHorizontalCenter(PaintEventArgs e, Rectangle r)
+        {
+            RenderBackByHvCenter(e, r, 90);
+        }
+
+        protected override void RenderBackByVerticalCenter(PaintEventArgs e, Rectangle r)
+        {
+            RenderBackByHvCenter(e, r, 0);
+        }
+
+        private void RenderBackByHvCenter(PaintEventArgs e, Rectangle r, int angle)
+        {
+            Graphics g = e.Graphics;
+
+            Rectangle t = r;
+            t.Height /= 2;
+            t.Width /= 2;
+
+            using (GraphicsPath path = GetRoundRectPath(r))
+            {
+                using (Brush br = GaugeFrame.BackColor.GetBrush(t, angle))
+                {
+                    if (br is LinearGradientBrush)
+                        ((LinearGradientBrush)br).WrapMode = WrapMode.TileFlipXY;
+
+                    g.FillPath(br, path);
+                }
+
+                RenderBackBorder(g, path);
+            }
+        }
+
+        #endregion
+
+        #region RenderBackByNone
+
+        protected override void RenderBackByNone(PaintEventArgs e, Rectangle r)
+        {
+            Graphics g = e.Graphics;
+
+            using (GraphicsPath path = GetRoundRectPath(r))
+            {
+                using (Brush br = new SolidBrush(GaugeFrame.BackColor.Start))
+                    g.FillPath(br, path);
+
+                RenderBackBorder(g, path);
+            }
+        }
+
+        #endregion
+
+        #region RenderBackBorder
+
+        private void RenderBackBorder(Graphics g, GraphicsPath path)
+        {
+            if (GaugeFrame.BackColor.BorderWidth > 0)
+            {
+                using (Pen pen = new Pen(
+                    GaugeFrame.BackColor.BorderColor, GaugeFrame.BackColor.BorderWidth))
+                {
+                    pen.Alignment = PenAlignment.Inset;
+
+                    g.DrawPath(pen, path);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetRoundRectPath
+
+        private GraphicsPath GetRoundRectPath(Rectangle r)
+        {
+            GraphicsPath path = new GraphicsPath();
+
+            int m = Math.Min(r.Width, r.Height);
+            int n = (int)(m * GaugeFrame.RoundRectangleArc) + 1;
+
+            Rectangle t = new Rectangle(r.Right - n, r.Bottom - n, n, n);
+            path.AddArc(t, 0, 90);
+
+            t.X = r.X;
+            path.AddArc(t, 90, 90);
+
+            t.Y = r.Y;
+            path.AddArc(t, 180, 90);
+
+            t.X = r.Right - n;
+            path.AddArc(t, 270, 90);
+
+            path.CloseAllFigures();
+
+            return (path);
+        }
+
+        #endregion
+
+        #region PreRenderContent
+
+        internal override void PreRenderContent(PaintEventArgs e)
+        {
+            if (GaugeFrame.AddGlassEffect == true)
+                AddGlassEffect(e, 2.5f, 45);
+        }
+
+        #endregion
+
+        #region PostRenderContent
+
+        internal override void PostRenderContent(PaintEventArgs e)
+        {
+            if (GaugeFrame.AddGlassEffect == true)
+                AddGlassEffect(e, 2, 90);
+        }
+
+        #endregion
+
+        #region AddGlassEffect
+
+        private void AddGlassEffect(PaintEventArgs e, float f, float angle)
+        {
+            Graphics g = e.Graphics;
+
+            Rectangle r = GaugeFrame.BackBounds;
+
+            float x = Math.Max(r.Height, r.Width);
+
+            using (GraphicsPath path = new GraphicsPath())
+            {
+                path.AddLines(new Point[] {
+                    new Point(r.X, r.Y),
+                    new Point(r.X, (int)(r.Y + x / f)),
+                    new Point(r.X + (int)(x / f), r.Y)});
+
+                path.CloseFigure();
+
+                Color color1 = Color.FromArgb(40, Color.White);
+
+                using (LinearGradientBrush br =
+                    new LinearGradientBrush(r, color1, Color.Transparent, angle))
+                {
+                    g.FillPath(br, path);
+                }
+            }
+        }
+
+        #endregion
+
+    }
+}
+
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeIndicator/DigitalElement.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeIndicator/DigitalElement.cs
new file mode 100644
index 00000000..1595e15a
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeIndicator/DigitalElement.cs	
@@ -0,0 +1,367 @@
+using System;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Windows.Forms;
+
+namespace DevComponents.Instrumentation
+{
+    public class DigitalElement : NumericElement
+    {
+        #region Private variables
+
+        private int _ElemWidth;
+        private int _ElemHeight;
+        private int _ElemWidthHalf;
+        private int _ElemHeightHalf;
+
+        private int _SegStep;
+        private int _SegWidth;
+        private int _SegWidthHalf;
+
+        private bool _NeedRecalcSegments;
+        private bool _NeedSegments;
+
+        private Point[][] _SegPoints;
+        private int _Segments;
+
+        #endregion
+
+        public DigitalElement(NumericIndicator numIndicator, int segments, int points)
+            : base(numIndicator)
+        {
+            _SegPoints = new Point[segments][];
+
+            for (int i = 0; i < segments; i++)
+                _SegPoints[i] = new Point[points];
+
+            _NeedRecalcSegments = true;
+            _NeedSegments = true;
+        }
+
+        #region Public properties
+
+        #region Value
+
+        public override char Value
+        {
+            get { return (base.Value); }
+
+            set
+            {
+                if (base.Value != value)
+                {
+                    base.Value = value;
+
+                    _NeedSegments = true;
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region ElemWidth
+
+        internal int ElemWidth
+        {
+            get { return (_ElemWidth); }
+        }
+
+        #endregion
+
+        #region ElemWidthHalf
+
+        internal int ElemWidthHalf
+        {
+            get { return (_ElemWidthHalf); }
+        }
+
+        #endregion
+
+        #region ElemHeight
+
+        internal int ElemHeight
+        {
+            get { return (_ElemHeight); }
+        }
+
+        #endregion
+
+        #region ElemHeightHalf
+
+        internal int ElemHeightHalf
+        {
+            get { return (_ElemHeightHalf); }
+        }
+
+        #endregion
+
+        #region NeedRecalcSegments
+
+        internal bool NeedRecalcSegments
+        {
+            get { return (_NeedRecalcSegments); }
+            set { _NeedRecalcSegments = value; }
+        }
+
+        #endregion
+
+        #region Segments
+
+        internal int Segments
+        {
+            get { return (_Segments); }
+
+            set
+            {
+                if (_Segments != value)
+                {
+                    _Segments = value;
+
+                    NumIndicator.Refresh();
+                }
+            }
+        }
+
+        #endregion
+
+        #region SegPoints
+
+        internal Point[][] SegPoints
+        {
+            get { return (_SegPoints); }
+        }
+
+        #endregion
+
+        #region SegStep
+
+        internal int SegStep
+        {
+            get { return (_SegStep); }
+        }
+
+        #endregion
+
+        #region SegWidth
+
+        internal int SegWidth
+        {
+            get { return (_SegWidth); }
+        }
+
+        #endregion
+
+        #region SegWidthHalf
+
+        internal int SegWidthHalf
+        {
+            get { return (_SegWidthHalf); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RecalcLayout
+
+        public override void RecalcLayout()
+        {
+            if (NeedRecalcLayout == true)
+            {
+                base.RecalcLayout();
+
+                if (_NeedRecalcSegments == true)
+                {
+                    _NeedRecalcSegments = false;
+
+                    _ElemWidth = 50;
+                    _ElemHeight = 100;
+
+                    _ElemWidthHalf = _ElemWidth / 2;
+                    _ElemHeightHalf = _ElemHeight / 2;
+
+                    _SegWidth = (int)(_ElemWidth * NumIndicator.SegmentWidth / 4);
+                    _SegWidth = Math.Max(2, _SegWidth);
+
+                    _SegWidthHalf = _SegWidth / 2;
+                    _SegStep = _SegWidth / 3;
+
+                    RecalcSegments();
+                }
+            }
+
+            if (_NeedSegments == true)
+            {
+                _NeedSegments = false;
+
+                _Segments = NumIndicator.GaugeControl.
+                    OnGetDigitSegments(NumIndicator, Value, GetDigitSegments(Value));
+            }
+        }
+
+        #region RecalcSegments
+
+        public virtual void RecalcSegments()
+        {
+        }
+
+        #endregion
+
+        #endregion
+
+        #region OnGetDigitSegments
+
+        public virtual int GetDigitSegments(char value)
+        {
+            return (0);
+        }
+
+        #endregion
+
+        #region RefreshElements
+
+        internal override void RefreshElements()
+        {
+            _NeedSegments = true;
+
+            NeedRecalcLayout = true;
+        }
+
+        #endregion
+
+        #region OnPaint
+
+        public override void OnPaint(PaintEventArgs e)
+        {
+            base.OnPaint(e);
+
+            Graphics g = e.Graphics;
+
+            if (Bounds.Width > 0 && Bounds.Height > 0)
+            {
+                RenderBackground(g, Bounds);
+
+                int dx = (int)(Bounds.Width * .2f);
+                int dy = (int)(Bounds.Height * .2f);
+
+                Rectangle r = Bounds;
+                r.Inflate(-dx, -dy);
+
+                Rectangle srcRect = new Rectangle(0, 0, _ElemWidth, _ElemHeight);
+                GraphicsContainer containerState = g.BeginContainer(r, srcRect, GraphicsUnit.Pixel);
+
+                g.SmoothingMode = SmoothingMode.AntiAlias;
+                g.PixelOffsetMode = PixelOffsetMode.Default;
+
+                if (NumIndicator.ShearFactor != 0)
+                {
+                    Matrix trans = new Matrix();
+                    trans.Shear(NumIndicator.ShearFactor, 0.0F);
+
+                    g.Transform = trans;
+                }
+
+                Brush brushOn = BrushOn;
+                Brush brushOff = BrushOff;
+
+                RenderSegments(g, brushOn, brushOff);
+                RenderPoints(g, brushOn, brushOff);
+
+                g.EndContainer(containerState);
+            }
+        }
+
+        #region RenderBackground
+
+        private void RenderBackground(Graphics g, Rectangle r)
+        {
+            if (NumIndicator.ShearFactor == 0)
+            {
+                if (BackColor != null && BackColor.IsEmpty == false)
+                {
+                    using (Brush br = BackColor.GetBrush(r))
+                        g.FillRectangle(br, r);
+                }
+            }
+        }
+
+        #endregion
+
+        #region RenderSegments
+
+        private void RenderSegments(Graphics g, Brush brushOn, Brush brushOff)
+        {
+            for (int i = 0; i < _SegPoints.Length; i++)
+            {
+                if ((_Segments & (1 << i)) != 0)
+                {
+                    if (brushOn != null)
+                        g.FillPolygon(brushOn, _SegPoints[i]);
+                }
+                else if (ShowDimSegments == true)
+                {
+                    if (brushOff != null)
+                        g.FillPolygon(brushOff, _SegPoints[i]);
+                }
+            }
+        }
+
+        #endregion
+
+        #region RenderPoints
+
+        private void RenderPoints(Graphics g, Brush brushOn, Brush brushOff)
+        {
+            int dpWidth = (_SegWidth * 3) / 2;
+
+            if (ColonPointsOn == true)
+                RenderColonPoints(g, brushOn, dpWidth);
+
+            else if (ShowDimColonPoints == true)
+                RenderColonPoints(g, brushOff, dpWidth);
+
+            if (DecimalPointOn == true)
+                RenderDecimalPoint(g, brushOn, dpWidth);
+
+            else if (ShowDimDecimalPoint == true)
+                RenderDecimalPoint(g, brushOff, dpWidth);
+        }
+
+        #endregion
+
+        #region RenderDecimalPoint
+
+        private void RenderDecimalPoint(Graphics g, Brush br, int dpWidth)
+        {
+            if (br != null)
+            {
+                g.FillEllipse(br, _ElemWidth + _SegWidth,
+                    _ElemHeight - dpWidth, dpWidth, dpWidth);
+            }
+        }
+
+        #endregion
+
+        #region RenderColonPoints
+
+        private void RenderColonPoints(Graphics g, Brush br, int dpWidth)
+        {
+            if (br != null)
+            {
+                g.FillEllipse(br, _ElemWidth + _SegWidth,
+                    _ElemHeightHalf - _SegWidth * 3, dpWidth, dpWidth);
+
+                g.FillEllipse(br, _ElemWidth + _SegWidth,
+                    _ElemHeightHalf + _SegWidth * 2, dpWidth, dpWidth);
+            }
+        }
+
+        #endregion
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeIndicator/GaugeIndicator.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeIndicator/GaugeIndicator.cs
new file mode 100644
index 00000000..19ce7994
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeIndicator/GaugeIndicator.cs	
@@ -0,0 +1,847 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Text;
+using DevComponents.Instrumentation.Primitives;
+
+namespace DevComponents.Instrumentation
+{
+    public class GaugeIndicator : GaugeItem
+    {
+        #region Private variables
+
+        private bool _AutoSize;
+        private bool _UnderScale;
+        private int _RefreshRate;
+
+        private double _MinValue;
+        private double _MaxValue;
+        private double _Value;
+
+        private GradientFillColor _BackColor;
+
+        private SizeF _Size;
+        private PointF _Location;
+        private Rectangle _Bounds;
+        private Point _Center;
+
+        private Font _Font;
+        private string _Text;
+        private string _EmptyString;
+        private string _OverRangeString;
+        private string _UnderRangeString;
+
+        private bool _Dampening;
+        private double _DampeningSweepTime;
+
+        private double _DValue;
+        private double _DeltaValue;
+        private double _DStartValue;
+        private double _DEndValue;
+
+        private long _DStartTicks;
+        private long _DRefreshTicks;
+
+        private GaugeControl _GaugeControl;
+
+        #endregion
+
+        public GaugeIndicator()
+        {
+            _AutoSize = true;
+
+            BackColor.BorderColor = Color.Black;
+
+            _Size = new SizeF(.07f, .07f);
+            _Location = new PointF(.5f, .7f);
+
+            _UnderScale = true;
+            _RefreshRate = 10;
+
+            _EmptyString = "-";
+            _OverRangeString = "Error";
+            _UnderRangeString = "Error";
+
+            _MinValue = 0;
+            _MaxValue = 100;
+            _Value = double.NaN;
+        }
+
+        #region Public properties
+
+        #region AutoSize
+
+        /// <summary>
+        /// Gets or sets whether the indicator contents are auto sized
+        /// </summary>
+        [Browsable(true)]
+        [Category("Behavior"), DefaultValue(true)]
+        [Editor("DevComponents.Instrumentation.Design.AngleRangeValueEditor, DevComponents.Instrumentation.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=76cb4c6eb576bca5", typeof(UITypeEditor))]
+        [Description("Indicates whether the indicator contents are auto sized.")]
+        public bool AutoSize
+        {
+            get { return (_AutoSize); }
+
+            set
+            {
+                if (_AutoSize != value)
+                {
+                    _AutoSize = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region BackColor
+
+        /// <summary>
+        /// Gets or sets the BackColor
+        /// </summary>
+        [Browsable(true), Category("Appearance")]
+        [Description("Indicates the BackColor.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public GradientFillColor BackColor
+        {
+            get
+            {
+                if (_BackColor == null)
+                {
+                    _BackColor = new GradientFillColor();
+                    _BackColor.ColorTableChanged += BackColorColorTableChanged;
+                }
+
+                return (_BackColor);
+            }
+
+            set
+            {
+                if (_BackColor != null)
+                    _BackColor.ColorTableChanged -= BackColorColorTableChanged;
+
+                _BackColor = value;
+
+                if (_BackColor != null)
+                    _BackColor.ColorTableChanged += BackColorColorTableChanged;
+
+                OnGaugeItemChanged();
+            }
+        }
+
+        #endregion
+
+        #region Bounds
+
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public Rectangle Bounds
+        {
+            get { return (_Bounds); }
+            internal set { _Bounds = value; }
+        }
+
+        #endregion
+
+        #region DampeningSweepTime
+
+        /// <summary>
+        /// Gets or sets the time it takes for the indicator to
+        /// change from its minimum to maximum value, measured in seconds
+        /// </summary>
+        [Browsable(true)]
+        [Category("Behavior"), DefaultValue(0d)]
+        [Description("Indicates the time it takes for the indicator to change from its minimum to maximum value, measured in seconds.")]
+        public double DampeningSweepTime
+        {
+            get { return (_DampeningSweepTime); }
+
+            set
+            {
+                if (_DampeningSweepTime != value)
+                {
+                    _DampeningSweepTime = value;
+
+                    OnGaugeItemChanged();
+                }
+            }
+        }
+
+        #endregion
+
+        #region EmptyString
+
+        /// <summary>
+        /// Gets or sets the text string to display when the Indicator Value is empty (double.NaN)
+        /// </summary>
+        [Browsable(true), Category("Behavior"), DefaultValue("-")]
+        [Description("Indicates the text string to display when the Indicator Value is empty (double.NaN).")]
+        public string EmptyString
+        {
+            get { return (_EmptyString); }
+
+            set
+            {
+                if (_EmptyString != value)
+                {
+                    _EmptyString = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region Font
+
+        /// <summary>
+        /// Gets or sets the text Font
+        /// </summary>
+        [Browsable(true), Category("Appearance")]
+        [Description("Indicates the text Font.")]
+        public Font Font
+        {
+            get
+            {
+                if (_Font == null)
+                    _Font = new Font("Microsoft SanSerif", 12);
+
+                return (_Font);
+            }
+
+            set
+            {
+                if (_Font != null)
+                    _Font.Dispose();
+
+                _Font = value;
+
+                AbsFont = null;
+
+                OnGaugeItemChanged(true);
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        internal virtual bool ShouldSerializeFont()
+        {
+            if (_Font == null)
+                return (false);
+
+            using (Font font = new Font("Microsoft SanSerif", 12))
+                return (_Font.Equals(font) == false);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        internal virtual void ResetFont()
+        {
+            Font = new Font("Microsoft SanSerif", 12);
+        }
+
+        #endregion
+
+        #region GaugeControl
+
+        /// <summary>
+        /// Gets or sets the owning GaugeControl
+        /// </summary>
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public GaugeControl GaugeControl
+        {
+            get { return (_GaugeControl); }
+            internal set { _GaugeControl = value; }
+        }
+
+        #endregion
+
+        #region Location
+
+        /// <summary>
+        /// Gets or sets the location of the image area, specified as a percentage
+        /// </summary>
+        [Browsable(true), Category("Layout")]
+        [Editor("DevComponents.Instrumentation.Design.LocationEditor, DevComponents.Instrumentation.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=76cb4c6eb576bca5", typeof(UITypeEditor))]
+        [Description("Indicates the location of the image area, specified as a percentage.")]
+        [TypeConverter(typeof(PointFConverter))]
+        public PointF Location
+        {
+            get { return (_Location); }
+
+            set
+            {
+                if (_Location != value)
+                {
+                    _Location = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeLocation()
+        {
+            return (_Location.X != .5f || _Location.Y != .7f);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetLocation()
+        {
+            _Location = new PointF(.5f, .7f);
+        }
+
+        #endregion
+
+        #region MaxValue
+
+        /// <summary>
+        /// Gets or sets the Maximum value for the Indicator
+        /// </summary>
+        [Browsable(true), Category("Behavior"), DefaultValue(100d)]
+        [Description("Indicates the Maximum value for the Indicator.")]
+        public double MaxValue
+        {
+            get { return (_MaxValue); }
+
+            set
+            {
+                if (_MaxValue != value)
+                {
+                    _MaxValue = value;
+
+                    DValue = _Value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region MinValue
+
+        /// <summary>
+        /// Gets or sets the Minimum value for the Indicator
+        /// </summary>
+        [Browsable(true), Category("Behavior"), DefaultValue(0d)]
+        [Description("Indicates the Minimum value for the Indicator.")]
+        public double MinValue
+        {
+            get { return (_MinValue); }
+
+            set
+            {
+                if (_MinValue != value)
+                {
+                    _MinValue = value;
+
+                    DValue = _Value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region OverRangeString
+
+        /// <summary>
+        /// Gets or sets the text string to display when the Indicator Value is over the set MaxValue range
+        /// </summary>
+        [Browsable(true), Category("Behavior"), DefaultValue("Error")]
+        [Description("Indicates the text string to display when the Indicator Value is over the set MaxValue range.")]
+        public string OverRangeString
+        {
+            get { return (_OverRangeString); }
+
+            set
+            {
+                if (_OverRangeString != value)
+                {
+                    _OverRangeString = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region RefreshRate
+
+        /// <summary>
+        /// Gets or sets how often the indicator is refreshed per second
+        /// </summary>
+        [Browsable(true)]
+        [Category("Behavior"), DefaultValue(10)]
+        [Editor("DevComponents.Instrumentation.Design.AngleRangeValueEditor, DevComponents.Instrumentation.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=76cb4c6eb576bca5", typeof(UITypeEditor))]
+        [Description("Indicates how often the indicator is refreshed per second.")]
+        public int RefreshRate
+        {
+            get { return (_RefreshRate); }
+
+            set
+            {
+                if (_RefreshRate != value)
+                {
+                    if (value <= 0 || value > 1000)
+                        throw new ArgumentException("Value must be between 1 and 100");
+
+                    _RefreshRate = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region Size
+
+        /// <summary>
+        /// Gets or sets the size of the indicator, specified as a percentage
+        /// </summary>
+        [Browsable(true), Category("Layout")]
+        [Editor("DevComponents.Instrumentation.Design.SizeEditor, DevComponents.Instrumentation.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=76cb4c6eb576bca5", typeof(UITypeEditor))]
+        [Description("Determines the size of the indicator, specified as a percentage.")]
+        public SizeF Size
+        {
+            get { return (_Size); }
+
+            set
+            {
+                if (_Size != value)
+                {
+                    _Size = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeSize()
+        {
+            return (_Size.Width != .07f || _Size.Height != .07f);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetSize()
+        {
+            _Size = new SizeF(.07f, .07f);
+        }
+
+        #endregion
+
+        #region Text
+
+        /// <summary>
+        /// Gets or sets the text to be displayed
+        /// </summary>
+        [Browsable(true), Category("Behavior"), DefaultValue(null)]
+        [Description("Indicates the text to be displayed.")]
+        public string Text
+        {
+            get { return (_Text); }
+
+            set
+            {
+                if (_Text != value)
+                {
+                    _Text = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region UnderRangeString
+
+        /// <summary>
+        /// Gets or sets the text string to display when the Indicator Value is under the set MinValue range
+        /// </summary>
+        [Browsable(true), Category("Behavior"), DefaultValue("Error")]
+        [Description("Indicates the text string to display when the Indicator Value is under the set MinValue range.")]
+        public string UnderRangeString
+        {
+            get { return (_UnderRangeString); }
+
+            set
+            {
+                if (_UnderRangeString != value)
+                {
+                    _UnderRangeString = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region UnderScale
+
+        /// <summary>
+        /// Gets or sets whether the indicator is displayed under the scale
+        /// </summary>
+        [Browsable(true)]
+        [Category("Layout"), DefaultValue(true)]
+        [Editor("DevComponents.Instrumentation.Design.AngleRangeValueEditor, DevComponents.Instrumentation.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=76cb4c6eb576bca5", typeof(UITypeEditor))]
+        [Description("Indicates whether the indicator is displayed under the scale.")]
+        public bool UnderScale
+        {
+            get { return (_UnderScale); }
+
+            set
+            {
+                if (_UnderScale != value)
+                {
+                    _UnderScale = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region Value
+
+        /// <summary>
+        /// Gets or sets the indicator value
+        /// </summary>
+        [Browsable(true)]
+        [Category("Behavior"), DefaultValue(double.NaN)]
+        [Description("Indicates the indicator value.")]
+        public double Value
+        {
+            get { return (_Value); }
+
+            set
+            {
+                if (_Value != value)
+                {
+                    _Value = value;
+
+                    OnValueChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ValueEx
+
+        /// <summary>
+        /// Gets or sets the value of the indicator - but with no dampening
+        /// </summary>
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public double ValueEx
+        {
+            get { return (_Value); }
+
+            set
+            {
+                if (_Value != value)
+                {
+                    _Value = value;
+
+                    OnValueChanged(false);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region AbsFont
+
+        // ReSharper disable ValueParameterNotUsed
+        internal virtual Font AbsFont
+        {
+            get { return (Font); }
+            set { }
+        }
+        // ReSharper restore ValueParameterNotUsed
+
+        #endregion
+
+        #region Center
+
+        internal Point Center
+        {
+            get { return (_Center); }
+        }
+
+        #endregion
+
+        #region DValue
+
+        internal double DValue
+        {
+            get { return (_DValue); }
+
+            set
+            {
+                _DValue = value;
+
+                if (GaugeControl != null)
+                    GaugeControl.DValueChange = true;
+
+                OnGaugeItemChanged(true);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Event processing
+
+        #region BackColor processing
+
+        void BackColorColorTableChanged(object sender, EventArgs e)
+        {
+            OnGaugeItemChanged(true);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region OnValueChanged
+
+        internal virtual void OnValueChanged(bool dampen)
+        {
+            if (GaugeControl != null && Visible == true)
+            {
+                if (GaugeControl.InDesignMode == false)
+                {
+                    if (_DValue < _Value)
+                    {
+                        double start = Math.Max(_MinValue, _DValue);
+
+                        if (start < _MaxValue)
+                        {
+                            if (StartDampening(dampen, start, Math.Min(_MaxValue, _Value)))
+                                return;
+                        }
+                    }
+                    else if (_DValue > _Value)
+                    {
+                        double start = Math.Min(_MaxValue, _DValue);
+
+                        if (start > _MinValue)
+                        {
+                            if (StartDampening(dampen, start, Math.Max(_MinValue, _Value)))
+                                return;
+                        }
+                    }
+                }
+            }
+
+            DValue = _Value;
+        }
+
+        #endregion
+
+        #region Dampening support
+
+        #region StartDampening
+
+        private bool StartDampening(bool dampen, double start, double end)
+        {
+            double dampenTime = _DampeningSweepTime;
+
+            if (GaugeControl.IsHandleCreated &&
+                dampen == true && dampenTime > 0)
+            {
+                _DStartValue = start;
+                _DEndValue = end;
+                _DeltaValue = (_MaxValue - _MinValue) / (dampenTime * 1000);
+
+                _DStartTicks = DateTime.Now.Ticks;
+
+                if (_Dampening == false)
+                {
+                    _Dampening = true;
+                    _DRefreshTicks = _DStartTicks;
+
+                    _GaugeControl.DampeningUpdate += DampeningUpdate;
+                    _GaugeControl.StartDampening();
+                }
+
+                return (true);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region DampeningUpdate
+
+        void DampeningUpdate(object sender, EventArgs e)
+        {
+            SetIndicatorValue();
+
+            if (_DValue == _DEndValue)
+            {
+                if (_Dampening == true)
+                {
+                    _GaugeControl.DampeningUpdate -= DampeningUpdate;
+                    _GaugeControl.StopDampening();
+
+                    _Dampening = false;
+                }
+            }
+        }
+
+        #endregion
+
+        #region SetIndicatorValue
+
+        private void SetIndicatorValue()
+        {
+            long now = DateTime.Now.Ticks;
+
+            double ms = new TimeSpan(now - _DStartTicks).TotalMilliseconds;
+            double delta = _DeltaValue * ms;
+
+            if (delta > 0)
+            {
+                double n = (_DValue <= _Value)
+                               ? Math.Min(_DStartValue + delta, _DEndValue)
+                               : Math.Max(_DStartValue - delta, _DEndValue);
+
+                if (n == _DEndValue ||
+                    new TimeSpan(now - _DRefreshTicks).TotalMilliseconds > 1000 / _RefreshRate)
+                {
+                    _DRefreshTicks = now;
+
+                    DValue = n;
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RecalcLayout
+
+        public override void RecalcLayout()
+        {
+            base.RecalcLayout();
+
+            bool autoCenter = _GaugeControl.Frame.AutoCenter;
+            _Center = _GaugeControl.GetAbsPoint(_Location, autoCenter);
+
+            Size size = _GaugeControl.GetAbsSize(_Size, autoCenter);
+
+            _Bounds = new Rectangle(
+                _Center.X - size.Width / 2, _Center.Y - size.Height / 2,
+                size.Width, size.Height);
+        }
+
+        #endregion
+
+        #region Contains
+
+        internal virtual bool Contains(Point pt)
+        {
+            return (Bounds.Contains(pt));
+        }
+
+        #endregion
+
+        #region GetOverrideString
+
+        protected string GetOverrideString()
+        {
+            string s = null;
+
+            if (String.IsNullOrEmpty(Text) == false)
+                s = Text;
+
+            else if (Value.Equals(double.NaN) == true)
+                s = _EmptyString ?? "";
+
+            else if (Value < MinValue)
+                s = _UnderRangeString;
+
+            else if (Value > MaxValue)
+                s = _OverRangeString ?? "";
+
+            return (s);
+        }
+
+        #endregion
+
+        #region ProcessTemplateText
+
+        protected override void ProcessTemplateText(
+            GaugeControl gauge, StringBuilder sb, string key, string data)
+        {
+            if (key.Equals("Value") == true)
+            {
+                sb.Append(string.IsNullOrEmpty(data)
+                              ? _Value.ToString()
+                              : String.Format("{0:" + data + "}", _Value));
+            }
+            else
+            {
+                base.ProcessTemplateText(gauge, sb, key, data);
+            }
+        }
+
+        #endregion
+
+        #region CopyToItem
+
+        public override void CopyToItem(GaugeItem copy)
+        {
+            GaugeIndicator c = copy as GaugeIndicator;
+
+            if (c != null)
+            {
+                base.CopyToItem(c);
+
+                c.AutoSize = _AutoSize;
+
+                if (_BackColor != null)
+                    c.BackColor = (GradientFillColor)_BackColor.Clone();
+
+                c.DampeningSweepTime = _DampeningSweepTime;
+                c.EmptyString = _EmptyString;
+
+                if (_Font != null)
+                    c.Font = (Font)_Font.Clone();
+
+                c.Location = _Location;
+                c.MaxValue = _MaxValue;
+                c.MinValue = _MinValue;
+                c.OverRangeString = _OverRangeString;
+                c.RefreshRate = _RefreshRate;
+                c.Size = _Size;
+                c.Text = _Text;
+                c.UnderRangeString = _UnderRangeString;
+                c.UnderScale = _UnderScale;
+                c.Value = _Value;
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeIndicator/IndicatorRange.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeIndicator/IndicatorRange.cs
new file mode 100644
index 00000000..c556f519
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeIndicator/IndicatorRange.cs	
@@ -0,0 +1,231 @@
+using System;
+using System.ComponentModel;
+using DevComponents.Instrumentation.Primitives;
+
+namespace DevComponents.Instrumentation
+{
+    public class IndicatorRangeCollection : GenericCollection<IndicatorRange>
+    {
+        #region ICloneable Members
+
+        public override object Clone()
+        {
+            IndicatorRangeCollection copy = new IndicatorRangeCollection();
+
+            CopyToItem(copy);
+
+            return (copy);
+        }
+
+        #endregion
+
+        #region CopyToItem
+
+        internal void CopyToItem(IndicatorRangeCollection copy)
+        {
+            foreach (IndicatorRange item in this)
+            {
+                IndicatorRange ic = new IndicatorRange();
+
+                item.CopyToItem(ic);
+
+                copy.Add(ic);
+            }
+        }
+
+        #endregion
+    }
+
+    public class IndicatorRange : GaugeItem
+    {
+        #region Events
+
+        [Description("Occurs when the IndicatorRange changes.")]
+        public event EventHandler<EventArgs> IndicatorRangeChanged;
+
+        #endregion
+
+        #region Private variables
+
+        private double _StartValue;
+        private double _EndValue;
+
+        private GradientFillColor _BackColor;
+
+        #endregion
+
+        #region Hidden properties
+
+        #region Tooltip
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public new string Tooltip
+        {
+            get { return (base.Tooltip); }
+            set { base.Tooltip = value; }
+        }
+
+        #endregion
+
+        #region Visible
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public new bool Visible
+        {
+            get { return (base.Visible); }
+            set { base.Visible = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Public properties
+
+        #region BackColor
+
+        /// <summary>
+        /// Gets or sets the BackColor
+        /// </summary>
+        [Browsable(true), Category("Appearance")]
+        [Description("Indicates the BackColor.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public GradientFillColor BackColor
+        {
+            get
+            {
+                if (_BackColor == null)
+                {
+                    _BackColor = new GradientFillColor();
+                    _BackColor.ColorTableChanged += BackColor_ColorTableChanged;
+                }
+
+                return (_BackColor);
+            }
+
+            set
+            {
+                if (_BackColor != null)
+                    _BackColor.ColorTableChanged -= BackColor_ColorTableChanged;
+
+                _BackColor = value;
+
+                if (_BackColor != null)
+                    _BackColor.ColorTableChanged += BackColor_ColorTableChanged;
+
+                OnIndicatorRangeChanged();
+            }
+        }
+
+        #endregion
+
+        #region EndValue
+
+        /// <summary>
+        /// Gets or sets the Ending range value
+        /// </summary>
+        [Browsable(true), Category("Behavior"), DefaultValue(double.NaN)]
+        [Description("Indicates the Ending range value.")]
+        public double EndValue
+        {
+            get { return (_EndValue); }
+
+            set
+            {
+                if (_EndValue != value)
+                {
+                    _EndValue = value;
+
+                    OnIndicatorRangeChanged();
+                }
+            }
+        }
+
+        #endregion
+
+        #region StartValue
+
+        /// <summary>
+        /// Gets or sets the Starting range value
+        /// </summary>
+        [Browsable(true), Category("Behavior"), DefaultValue(double.NaN)]
+        [Description("Indicates the Starting range value.")]
+        public double StartValue
+        {
+            get { return (_StartValue); }
+
+            set
+            {
+                if (_StartValue != value)
+                {
+                    _StartValue = value;
+
+                    OnIndicatorRangeChanged();
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Event processing
+
+        #region BackColor processing
+
+        void BackColor_ColorTableChanged(object sender, EventArgs e)
+        {
+            OnIndicatorRangeChanged();
+        }
+
+        #endregion
+
+        #region OnIndicatorRangeChanged
+
+        internal void OnIndicatorRangeChanged()
+        {
+            if (IndicatorRangeChanged != null)
+                IndicatorRangeChanged(this, EventArgs.Empty);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ICloneable Members
+
+        public override object Clone()
+        {
+            IndicatorRange copy = new IndicatorRange();
+
+            CopyToItem(copy);
+
+            return (copy);
+        }
+
+        #endregion
+
+        #region CopyToItem
+
+        public override void CopyToItem(GaugeItem copy)
+        {
+            IndicatorRange c = copy as IndicatorRange;
+
+            if (c != null)
+            {
+                base.CopyToItem(c);
+
+                c.EndValue = _EndValue;
+                c.StartValue = _StartValue;
+
+                if (_BackColor != null)
+                    c.BackColor = (GradientFillColor) _BackColor.Clone();
+            }
+        }
+
+        #endregion
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeIndicator/MechanicalElement.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeIndicator/MechanicalElement.cs
new file mode 100644
index 00000000..154fdc3c
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeIndicator/MechanicalElement.cs	
@@ -0,0 +1,69 @@
+using System.Drawing;
+using System.Windows.Forms;
+
+namespace DevComponents.Instrumentation
+{
+    public class MechanicalElement : NumericElement
+    {
+        #region Private variables
+
+        private int _Descent;
+
+        #endregion
+
+        public MechanicalElement(NumericIndicator numIndicator)
+            : base(numIndicator)
+        {
+        }
+
+        #region RecalcLayout
+
+        public override void RecalcLayout()
+        {
+            base.RecalcLayout();
+
+            Font font = NumIndicator.AbsFont;
+            FontFamily family = new FontFamily(font.Name);
+
+            int descent = family.GetCellDescent(font.Style);
+            float descentPixel = font.Size * descent / family.GetEmHeight(font.Style);
+
+            _Descent = (int)(descentPixel / 2) + 1;
+        }
+
+        #endregion
+
+        #region OnPaint
+
+        public override void OnPaint(PaintEventArgs e)
+        {
+            base.OnPaint(e);
+
+            if (Bounds.Width > 0 && Bounds.Height > 0)
+            {
+                Graphics g = e.Graphics;
+
+                if (BackColor != null && BackColor.IsEmpty == false)
+                {
+                    Rectangle r = GetPaddedRect(Bounds);
+
+                    using (Brush br = BackColor.GetBrush(r))
+                        g.FillRectangle(br, r);
+                }
+
+                using (StringFormat sf = new StringFormat())
+                {
+                    sf.Alignment = StringAlignment.Center;
+                    sf.LineAlignment = StringAlignment.Center;
+
+                    Rectangle r = Bounds;
+                    r.Y += _Descent;
+
+                    g.DrawString(Value.ToString(), NumIndicator.AbsFont, BrushOn, r, sf);
+                }
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeIndicator/NumericElement.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeIndicator/NumericElement.cs
new file mode 100644
index 00000000..bbb7ee49
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeIndicator/NumericElement.cs	
@@ -0,0 +1,441 @@
+using System;
+using System.Drawing;
+using System.Windows.Forms;
+
+namespace DevComponents.Instrumentation
+{
+    public class NumericElement : IDisposable
+    {
+        #region Private variables
+
+        private Rectangle _Bounds;
+        private NumericIndicator _NumIndicator;
+
+        private char _Value;
+        private bool _ColonPointsOn;
+        private bool _DecimalPointOn;
+        private bool _ShowDimColonPoints;
+        private bool _ShowDimDecimalPoint;
+        private bool _ShowDimSegments;
+
+        private Color _DigitColor;
+        private Color _DigitDimColor;
+        private GradientFillColor _BackColor;
+
+        private Brush _BrushOn;
+        private Brush _BrushOff;
+
+        private bool _NeedRecalcLayout;
+
+        private bool _InRender;
+
+        #endregion
+
+        public NumericElement(NumericIndicator numIndicator)
+        {
+            _NumIndicator = numIndicator;
+
+            _ShowDimColonPoints = true;
+            _ShowDimDecimalPoint = true;
+            _ShowDimSegments = true;
+        }
+
+        #region Public properties
+
+        #region BackColor
+
+        public GradientFillColor BackColor
+        {
+            get { return (_BackColor); }
+
+            set
+            {
+                _BackColor = value;
+
+                Refresh();
+            }
+        }
+
+        #endregion
+
+        #region Bounds
+
+        public Rectangle Bounds
+        {
+            get { return (_Bounds); }
+
+            internal set
+            {
+                if (_Bounds.Equals(value) == false)
+                {
+                    _Bounds = value;
+
+                    _NeedRecalcLayout = true;
+                }
+            }
+        }
+
+        #endregion
+
+        #region ColonPointsOn
+
+        public bool ColonPointsOn
+        {
+            get { return (_ColonPointsOn); }
+
+            set
+            {
+                if (_ColonPointsOn != value)
+                {
+                    _ColonPointsOn = value;
+
+                    Refresh();
+                }
+            }
+        }
+
+        #endregion
+
+        #region DecimalPointOn
+
+        public bool DecimalPointOn
+        {
+            get { return (_DecimalPointOn); }
+
+            set
+            {
+                if (_DecimalPointOn != value)
+                {
+                    _DecimalPointOn = value;
+
+                    Refresh();
+                }
+            }
+        }
+
+        #endregion
+
+        #region DigitColor
+
+        /// <summary>
+        /// Gets or sets the Digit Color
+        /// </summary>
+        public Color DigitColor
+        {
+            get { return (_DigitColor); }
+
+            set
+            {
+                if (_DigitColor != value)
+                {
+                    BrushOn = null;
+                    _DigitColor = value;
+
+                    Refresh();
+                }
+            }
+        }
+
+        #endregion
+
+        #region DigitDimColor
+
+        /// <summary>
+        /// Gets or sets the default Digit Dim Color (Dim LED color)
+        /// </summary>
+        public Color DigitDimColor
+        {
+            get { return (_DigitDimColor); }
+
+            set
+            {
+                if (_DigitDimColor != value)
+                {
+                    BrushOff = null;
+                    _DigitDimColor = value;
+
+                    Refresh();
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowDimColonPoints
+
+        public bool ShowDimColonPoints
+        {
+            get { return (_ShowDimColonPoints); }
+
+            set
+            {
+                if (_ShowDimColonPoints != value)
+                {
+                    _ShowDimColonPoints = value;
+
+                    Refresh();
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowDimDecimalPoint
+
+        public bool ShowDimDecimalPoint
+        {
+            get { return (_ShowDimDecimalPoint); }
+
+            set
+            {
+                if (_ShowDimDecimalPoint != value)
+                {
+                    _ShowDimDecimalPoint = value;
+
+                    Refresh();
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowDimSegments
+
+        /// <summary>
+        /// Gets or sets the whether dim segments are displayed
+        /// </summary>
+        public bool ShowDimSegments
+        {
+            get { return (_ShowDimSegments); }
+
+            set
+            {
+                if (_ShowDimSegments != value)
+                {
+                    BrushOff = null;
+                    _ShowDimSegments = value;
+
+                    Refresh();
+                }
+            }
+        }
+
+        #endregion
+
+        #region Value
+
+        public virtual char Value
+        {
+            get { return (_Value); }
+
+            set
+            {
+                if (_Value != value)
+                {
+                    _Value = value;
+
+                    Refresh();
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region AbsSegmentWidth
+
+        internal int AbsSegmentWidth
+        {
+            get { return ((int)(Bounds.Width * _NumIndicator.SegmentWidth)); }
+        }
+
+        #endregion
+
+        #region BrushOn
+
+        internal Brush BrushOn
+        {
+            get
+            {
+                if (_BrushOn == null)
+                {
+                    if (_DigitColor.IsEmpty == false)
+                        _BrushOn = new SolidBrush(_DigitColor);
+                }
+
+                return (_BrushOn);
+            }
+
+            set
+            {
+                if (_BrushOn != null)
+                    _BrushOn.Dispose();
+
+                _BrushOn = value;
+            }
+        }
+
+        #endregion
+
+        #region BrushOff
+
+        internal Brush BrushOff
+        {
+            get
+            {
+                if (_BrushOff == null)
+                {
+                    if (DigitDimColor.IsEmpty == false)
+                        _BrushOff = new SolidBrush(_DigitDimColor);
+                }
+
+                return (_BrushOff);
+            }
+
+            set
+            {
+                if (_BrushOff != null)
+                    _BrushOff.Dispose();
+
+                _BrushOff = value;
+            }
+        }
+
+        #endregion
+
+        #region CanRefresh
+
+        internal bool CanRefresh
+        {
+            get { return (_InRender == false); }
+        }
+
+        #endregion
+
+        #region InPaint
+
+        internal bool InRenderCallout
+        {
+            get { return (_InRender); }
+            set { _InRender = value; }
+        }
+
+        #endregion
+
+        #region NeedRecalcLayout
+
+        internal bool NeedRecalcLayout
+        {
+            get { return (_NeedRecalcLayout); }
+            set { _NeedRecalcLayout = value; }
+        }
+
+        #endregion
+
+        #region NumIndicator
+
+        /// <summary>
+        /// Gets or sets the owning NumericIndicator
+        /// </summary>
+        internal NumericIndicator NumIndicator
+        {
+            get { return (_NumIndicator); }
+            set { _NumIndicator = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RecalcLayout
+
+        public virtual void RecalcLayout()
+        {
+            if (_NeedRecalcLayout == true)
+                _NeedRecalcLayout = false;
+        }
+
+        #endregion
+
+        #region OnPaint
+
+        public virtual void OnPaint(PaintEventArgs e)
+        {
+            RecalcLayout();
+        }
+
+        #endregion
+
+        #region Refresh
+
+        internal void Refresh()
+        {
+            if (CanRefresh == true)
+                NumIndicator.Refresh();
+        }
+
+        #endregion
+
+        #region RefreshElements
+
+        internal virtual void RefreshElements()
+        {
+        }
+
+        #endregion
+
+        #region GetPaddedRect
+
+        internal Rectangle GetPaddedRect(Rectangle r)
+        {
+            Padding padding = _NumIndicator.Padding;
+
+            r.Y -= padding.Top;
+            r.Height += (padding.Top + padding.Bottom);
+
+            if (_NumIndicator.Digits[0] == this)
+            {
+                r.X -= padding.Left;
+                r.Width += padding.Left;
+            }
+
+            if (_NumIndicator.Digits[_NumIndicator.Digits.Length - 1] == this)
+                r.Width += padding.Right;
+
+            return (r);
+        }
+
+        #endregion
+
+        #region IDisposable Members
+
+        public virtual void Dispose()
+        {
+            BrushOn = null;
+            BrushOff = null;
+        }
+
+        #endregion
+
+        #region CopyToItem
+
+        public virtual void CopyToItem(NumericElement copy)
+        {
+            copy.BackColor = _BackColor;
+            copy.Bounds = _Bounds;
+            copy.DigitDimColor = _DigitDimColor;
+            copy.ColonPointsOn = _ColonPointsOn;
+            copy.DigitColor = _DigitColor;
+            copy.DigitDimColor = _DigitDimColor;
+            copy.ShowDimColonPoints = _ShowDimColonPoints;
+            copy.ShowDimDecimalPoint = _ShowDimDecimalPoint;
+            copy.ShowDimSegments = _ShowDimSegments;
+            copy.Value = _Value;
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeIndicator/NumericIndicator.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeIndicator/NumericIndicator.cs
new file mode 100644
index 00000000..fdd935ea
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeIndicator/NumericIndicator.cs	
@@ -0,0 +1,1580 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Drawing.Drawing2D;
+using System.Windows.Forms;
+
+namespace DevComponents.Instrumentation
+{
+    public class NumericIndicator : GaugeIndicator
+    {
+        #region Private variables
+
+        private NumericIndicatorStyle _Style;
+
+        private int _NumberOfDigits;
+        private int _NumberOfDecimals;
+        private NumericElement[] _Digits;
+
+        private Color _DigitColor;
+        private Color _DigitDimColor;
+        private Color _DecimalColor;
+        private Color _DecimalDimColor;
+
+        private float _SegmentWidth;
+        private float _SeparatorWidth;
+        private GradientFillColor _SeparatorColor;
+
+        private DisplayPlacement _DigitPlacement;
+
+        private string _FormatString;
+        private Font _AbsFont;
+
+        private bool _ShowDecimalPoint;
+        private bool _ShowLeadingZeros;
+        private bool _ShowDimColonPoints;
+        private bool _ShowDimDecimalPoint;
+        private bool _ShowDimSegments;
+
+        private SignVisibility _SignVisibility;
+
+        private float _ShearFactor;
+        private Padding _Padding;
+
+        private NumericRangeCollection _Ranges;
+
+        #endregion
+
+        public NumericIndicator()
+        {
+            InitIndicator();
+        }
+
+        #region InitIndicator
+
+        private void InitIndicator()
+        {
+            _NumberOfDigits = 6;
+            _NumberOfDecimals = 2;
+            _DecimalColor = Color.Firebrick;
+            _DigitColor = Color.SteelBlue;
+            _DigitPlacement = DisplayPlacement.Far;
+            _Padding = new Padding(0);
+            _SegmentWidth = .5f;
+            _SeparatorWidth = .01f;
+            _ShearFactor = -0.1f;
+            _ShowDimColonPoints = true;
+            _ShowDimDecimalPoint = true;
+            _ShowDimSegments = true;
+            _SignVisibility = SignVisibility.WhenNegative;
+            _Style = NumericIndicatorStyle.Mechanical;
+
+            AllocateElements();
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region DecimalColor
+
+        /// <summary>
+        /// Gets or sets the default Decimal Color
+        /// </summary>
+        [Browsable(true), Category("Appearance"), DefaultValue(typeof(Color), "FireBrick")]
+        [Description("Indicates the default Decimal Color.")]
+        public Color DecimalColor
+        {
+            get { return (_DecimalColor); }
+
+            set
+            {
+                if (_DecimalColor != value)
+                {
+                    _DecimalColor = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region DecimalDimColor
+
+        /// <summary>
+        /// Gets or sets the default Decimal Dim Color (Dim LED color)
+        /// </summary>
+        [Browsable(true), Category("Appearance")]
+        [Description("Indicates the default Decimal Dim Color (Dim LED color).")]
+        public Color DecimalDimColor
+        {
+            get { return (_DecimalDimColor); }
+
+            set
+            {
+                if (_DecimalDimColor != value)
+                {
+                    _DecimalDimColor = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        internal bool ShouldSerializeDecimalDimColor()
+        {
+            return (_DecimalDimColor.IsEmpty == false);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        internal void ResetDecimalDimColor()
+        {
+            _DecimalDimColor = Color.Empty;
+        }
+        #endregion
+
+        #region DigitColor
+
+        /// <summary>
+        /// Gets or sets the default Digit Color
+        /// </summary>
+        [Browsable(true), Category("Appearance"), DefaultValue(typeof(Color), "SteelBlue")]
+        [Description("Indicates the default Digit Color.")]
+        public Color DigitColor
+        {
+            get { return (_DigitColor); }
+
+            set
+            {
+                if (_DigitColor != value)
+                {
+                    _DigitColor = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region DigitDimColor
+
+        /// <summary>
+        /// Gets or sets the default Digit Dim Color (Dim LED color)
+        /// </summary>
+        [Browsable(true), Category("Appearance")]
+        [Description("Indicates the default Digit Dim Color (Dim LED color).")]
+        public Color DigitDimColor
+        {
+            get { return (_DigitDimColor); }
+
+            set
+            {
+                if (_DigitDimColor != value)
+                {
+                    _DigitDimColor = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        internal bool ShouldSerializeDigitDimColor()
+        {
+            return (_DigitDimColor.IsEmpty == false);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        internal void ResetDigitDimColor()
+        {
+            _DigitDimColor = Color.Empty;
+        }
+
+        #endregion
+
+        #region DigitPlacement
+
+        /// <summary>
+        /// Gets or sets the Placement of the digits within the indicator
+        /// </summary>
+        [Browsable(true)]
+        [Category("Appearance"), DefaultValue(DisplayPlacement.Far)]
+        [Description("Indicates the Alignment of the digits.")]
+        public DisplayPlacement DigitPlacement
+        {
+            get { return (_DigitPlacement); }
+
+            set
+            {
+                if (_DigitPlacement != value)
+                {
+                    _DigitPlacement = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region Digits
+
+        /// <summary>
+        /// Gets the array of defined digits (units and decimals).
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public NumericElement[] Digits
+        {
+            get { return (_Digits); }
+        }
+
+        #endregion
+
+        #region FormatString
+
+        /// <summary>
+        /// Gets or sets the .Net format string to use when displaying the indicator value.
+        /// </summary>
+        [Browsable(true), Category("Behavior"), DefaultValue(null)]
+        [Description("Indicates the .Net format string to use when displaying the indicator value.")]
+        [Editor("DevComponents.Instrumentation.Design.FormatStringEditor, DevComponents.Instrumentation.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=76cb4c6eb576bca5", typeof(UITypeEditor))]
+        public string FormatString
+        {
+            get { return (_FormatString); }
+
+            set
+            {
+                if (_FormatString != value)
+                {
+                    _FormatString = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region NumberOfDecimals
+
+        /// <summary>
+        /// Gets or sets the number of decimals to display.
+        /// </summary>
+        [Browsable(true)]
+        [Category("Appearance"), DefaultValue(2)]
+        [Description("Determines the number of decimals to display.")]
+        public int NumberOfDecimals
+        {
+            get { return (_NumberOfDecimals); }
+
+            set
+            {
+                if (_NumberOfDecimals != value)
+                {
+                    if (value > _NumberOfDigits)
+                        throw new ArgumentException("Number of decimals can not exceed NumberOfDigits.");
+
+                    _NumberOfDecimals = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region NumberOfDigits
+
+        /// <summary>
+        /// Gets or sets the number of total digits to display (units and decimals).
+        /// </summary>
+        [Browsable(true)]
+        [Category("Appearance"), DefaultValue(6)]
+        [Description("Determines the number of total digits to display (units and decimals).")]
+        public int NumberOfDigits
+        {
+            get { return (_NumberOfDigits); }
+
+            set
+            {
+                if (_NumberOfDigits != value)
+                {
+                    if (value < _NumberOfDecimals)
+                        throw new ArgumentException("Number of digits can not be less than NumberOfDecimals.");
+
+                    _NumberOfDigits = value;
+
+                    AbsFont = null;
+
+                    AllocateElements();
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region Padding
+
+        /// <summary>
+        /// Gets or sets the indicator padding.
+        /// </summary>
+        [Browsable(true), Category("Layout")]
+        [Description("Indicates the indicator padding.")]
+        public Padding Padding
+        {
+            get { return (_Padding); }
+
+            set
+            {
+                if (_Padding != value)
+                {
+                    _Padding = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        internal bool ShouldSerializePadding()
+        {
+            return (_Padding.All != 0);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        internal void ResetPadding()
+        {
+            _Padding = new Padding(0);
+        }
+
+        #endregion
+
+        #region Ranges
+
+        /// <summary>
+        /// Gets the collection of Ranges associated with the Indicator
+        /// </summary>
+        [Browsable(true), Category("Behavior")]
+        [Description("Indicates the collection of Ranges associated with the Indicator.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        [Editor("DevComponents.Instrumentation.Design.GaugeCollectionEditor, DevComponents.Instrumentation.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=76cb4c6eb576bca5", typeof(UITypeEditor))]
+        public NumericRangeCollection Ranges
+        {
+            get
+            {
+                if (_Ranges == null)
+                {
+                    _Ranges = new NumericRangeCollection();
+                    _Ranges.CollectionChanged += NumericRanges_CollectionChanged;
+                }
+
+                return (_Ranges);
+            }
+
+            set
+            {
+                if (_Ranges != null)
+                    _Ranges.CollectionChanged -= NumericRanges_CollectionChanged;
+
+                _Ranges = value;
+
+                if (_Ranges != null)
+                    _Ranges.CollectionChanged += NumericRanges_CollectionChanged;
+
+                OnGaugeItemChanged(true);
+            }
+        }
+
+        #endregion
+
+        #region SegmentWidth
+
+        /// <summary>
+        /// Gets or sets the Digital segment width, specified as a percentage
+        /// </summary>
+        [Browsable(true), Category("Layout"), DefaultValue(.5f)]
+        [Editor("DevComponents.Instrumentation.Design.RangeValueEditor, DevComponents.Instrumentation.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=76cb4c6eb576bca5", typeof(UITypeEditor))]
+        [Description("Indicates the Digital element width, specified as a percentage.")]
+        public float SegmentWidth
+        {
+            get { return (_SegmentWidth); }
+
+            set
+            {
+                if (_SegmentWidth != value)
+                {
+                    if (value < 0 || value > 1)
+                        throw new ArgumentException("Value must be between 0 and +1.");
+
+                    _SegmentWidth = value;
+
+                    if (_Style != NumericIndicatorStyle.Mechanical)
+                        SetRecalcSegments();
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region SeparatorColor
+
+        /// <summary>
+        /// Gets or sets the Digit Separator Color
+        /// </summary>
+        [Browsable(true), Category("Appearance")]
+        [Description("Indicates the Digit Separator Color.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public GradientFillColor SeparatorColor
+        {
+            get
+            {
+                if (_SeparatorColor == null)
+                {
+                    _SeparatorColor = new GradientFillColor();
+                    _SeparatorColor.ColorTableChanged += Color_ColorTableChanged;
+                }
+
+                return (_SeparatorColor);
+            }
+
+            set
+            {
+                if (_SeparatorColor != null)
+                    _SeparatorColor.ColorTableChanged -= Color_ColorTableChanged;
+
+                _SeparatorColor = value;
+
+                if (_SeparatorColor != null)
+                    _SeparatorColor.ColorTableChanged += Color_ColorTableChanged;
+
+                OnGaugeItemChanged();
+            }
+        }
+
+        #endregion
+
+        #region SeparatorWidth
+
+        /// <summary>
+        /// Gets or sets the Length of the Pin, specified as a percentage
+        /// </summary>
+        [Browsable(true), Category("Layout"), DefaultValue(.01f)]
+        [Editor("DevComponents.Instrumentation.Design.RangeValueEditor, DevComponents.Instrumentation.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=76cb4c6eb576bca5", typeof(UITypeEditor))]
+        [Description("Indicates the width of the Mechanical Style Digits Separator, specified as a percentage.")]
+        public float SeparatorWidth
+        {
+            get { return (_SeparatorWidth); }
+
+            set
+            {
+                if (_SeparatorWidth != value)
+                {
+                    if (value < 0 || value > 1)
+                        throw new ArgumentException("Value must be between 0 and +1.");
+
+                    _SeparatorWidth = value;
+
+                    AbsFont = null;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShearFactor
+
+        /// <summary>
+        /// Gets or Sets the shear coefficient for italicizing the Digits display
+        /// </summary>
+        [Browsable(true), Category("Appearance"), DefaultValue(-0.1F)]
+        [Description("Indicates the shear coefficient for italicizing the Digits display. Default is -0.1")]
+        public float ShearFactor
+        {
+            get { return (_ShearFactor); }
+
+            set
+            {
+                if (_ShearFactor != value)
+                {
+                    _ShearFactor = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowDecimalPoint
+
+        /// <summary>
+        /// Gets or sets whether the decimal point should be displayed
+        /// </summary>
+        [Browsable(true), Category("Appearance"), DefaultValue(false)]
+        [Description("Indicates whether the decimal point should be displayed.")]
+        public bool ShowDecimalPoint
+        {
+            get { return (_ShowDecimalPoint); }
+
+            set
+            {
+                if (_ShowDecimalPoint != value)
+                {
+                    _ShowDecimalPoint = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowDimColonPoints
+
+        /// <summary>
+        /// Gets or sets whether dim colon points should be displayed
+        /// </summary>
+        [Browsable(true), Category("Appearance"), DefaultValue(true)]
+        [Description("Indicates whether dim colon points should be displayed.")]
+        public bool ShowDimColonPoints
+        {
+            get { return (_ShowDimColonPoints); }
+
+            set
+            {
+                if (_ShowDimColonPoints != value)
+                {
+                    _ShowDimColonPoints = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowDimDecimalPoint
+
+        /// <summary>
+        /// Gets or sets whether dim decimal points should be displayed
+        /// </summary>
+        [Browsable(true), Category("Appearance"), DefaultValue(true)]
+        [Description("Indicates whether dim decimal points should be displayed.")]
+        public bool ShowDimDecimalPoint
+        {
+            get { return (_ShowDimDecimalPoint); }
+
+            set
+            {
+                if (_ShowDimDecimalPoint != value)
+                {
+                    _ShowDimDecimalPoint = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowDimSegments
+
+        /// <summary>
+        /// Gets or sets whether dim segments should be displayed
+        /// </summary>
+        [Browsable(true), Category("Appearance"), DefaultValue(true)]
+        [Description("Indicates whether dim segments should be displayed.")]
+        public bool ShowDimSegments
+        {
+            get { return (_ShowDimSegments); }
+
+            set
+            {
+                if (_ShowDimSegments != value)
+                {
+                    _ShowDimSegments = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowLeadingZeros
+
+        /// <summary>
+        /// Gets or sets whether leading zeros should be displayed
+        /// </summary>
+        [Browsable(true), Category("Appearance"), DefaultValue(false)]
+        [Description("Indicates whether leading zeros should be displayed.")]
+        public bool ShowLeadingZeros
+        {
+            get { return (_ShowLeadingZeros); }
+
+            set
+            {
+                if (_ShowLeadingZeros != value)
+                {
+                    _ShowLeadingZeros = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region SignVisibility
+
+        /// <summary>
+        /// Gets or sets when the +/- sign should be displayed
+        /// </summary>
+        [Browsable(true), Category("Appearance"), DefaultValue(SignVisibility.WhenNegative)]
+        [Description("Indicates when the +/- sign should be displayed.")]
+        public SignVisibility SignVisibility
+        {
+            get { return (_SignVisibility); }
+
+            set
+            {
+                if (_SignVisibility != value)
+                {
+                    _SignVisibility = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region Style
+
+        /// <summary>
+        /// Gets or sets the Indicator Style
+        /// </summary>
+        [Browsable(true), Category("Behavior"), DefaultValue(NumericIndicatorStyle.Mechanical)]
+        [Description("Indicates the Indicator Style.")]
+        public NumericIndicatorStyle Style
+        {
+            get { return (_Style); }
+
+            set
+            {
+                if (_Style != value)
+                {
+                    _Style = value;
+
+                    OnGaugeItemChanged(true);
+
+                    AllocateElements();
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region AbsFont
+
+        internal override Font AbsFont
+        {
+            get
+            {
+                if (AutoSize == false || _NumberOfDigits <= 0)
+                    return (Font);
+
+                if (_AbsFont == null)
+                    AbsFont = GetNewAbsFont();
+
+                return (_AbsFont);
+            }
+
+            set
+            {
+                if (_AbsFont != null)
+                    _AbsFont.Dispose();
+
+                _AbsFont = value;
+            }
+        }
+
+        #region GetNewAbsFont
+
+        private Font GetNewAbsFont()
+        {
+            int sepWidth = AbsSeparatorWidth;
+            int width = (Bounds.Width - (_Padding.Left + _Padding.Right + BackColor.BorderWidth * 2));
+            int height = (Bounds.Height - (_Padding.Top + _Padding.Bottom + BackColor.BorderWidth * 2));
+
+            int n = (width - (_NumberOfDigits - 1) * sepWidth) / _NumberOfDigits;
+
+            if (n <= 0)
+                n = 2;
+
+            int low = 2;
+            int high = 128;
+
+            while (low <= high)
+            {
+                int mid = (low + high) / 2;
+
+                using (Font font = new Font(Font.FontFamily, mid, Font.Style))
+                {
+                    Size size = TextRenderer.MeasureText(
+                        string.IsNullOrEmpty(Text) ? "8" : "M", font);
+
+                    if (size.Height > height || size.Width > n)
+                        high = mid - 1;
+
+                    else if (size.Height < height && size.Width < n)
+                        low = mid + 1;
+
+                    else
+                    {
+                        low = mid;
+                        break;
+                    }
+                }
+            }
+
+            return (new Font(Font.FontFamily, low, Font.Style));
+        }
+
+        #endregion
+
+        #endregion
+
+        #region AbsSeparatorWidth
+
+        internal int AbsSeparatorWidth
+        {
+            get { return ((int)(Bounds.Width * _SeparatorWidth)); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Event processing
+
+        #region Color_ColorTableChanged processing
+
+        void Color_ColorTableChanged(object sender, EventArgs e)
+        {
+            OnGaugeItemChanged(true);
+        }
+
+        #endregion
+
+        #region NumericRange processing
+
+        void NumericRanges_CollectionChanged(object sender, EventArgs e)
+        {
+            foreach (NumericRange range in _Ranges)
+            {
+                range.NumericIndicator = this;
+
+                range.IndicatorRangeChanged -= NumericRange_ItemChanged;
+                range.IndicatorRangeChanged += NumericRange_ItemChanged;
+            }
+        }
+
+        void NumericRange_ItemChanged(object sender, EventArgs e)
+        {
+            OnGaugeItemChanged(true);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region SetRecalcSegments
+
+        private void SetRecalcSegments()
+        {
+            if (_Digits != null)
+            {
+                foreach (DigitalElement item in _Digits)
+                {
+                    if (item != null)
+                    {
+                        item.NeedRecalcLayout = true;
+                        item.NeedRecalcSegments = true;
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region RecalcLayout
+
+        public override void RecalcLayout()
+        {
+            if (NeedRecalcLayout == true)
+            {
+                base.RecalcLayout();
+
+                NeedRecalcLayout = true;
+
+                AbsFont = null;
+
+                if (_NumberOfDigits > 0)
+                {
+                    LayoutElements();
+                    UpdateElements();
+                }
+
+                NeedRecalcLayout = false;
+            }
+        }
+
+        #region AllocateElements
+
+        private void AllocateElements()
+        {
+            NumericElement[] digit = new NumericElement[_NumberOfDigits];
+
+            for (int i = 0; i < _NumberOfDigits; i++)
+            {
+                NumericElement d;
+
+                switch (_Style)
+                {
+                    case NumericIndicatorStyle.Mechanical:
+                        d = new MechanicalElement(this);
+                        break;
+
+                    case NumericIndicatorStyle.Digital7Segment:
+                        d = new Seg7Element(this);
+                        break;
+
+                    default:
+                        d = new Seg16Element(this);
+                        break;
+                }
+
+                digit[i] = d;
+
+                if (_Digits != null)
+                {
+                    if (i < _Digits.Length)
+                        _Digits[i].CopyToItem(d);
+                }
+            }
+
+            if (_Digits != null)
+            {
+                for (int i = _NumberOfDigits; i < _Digits.Length; i++)
+                    _Digits[i].Dispose();
+            }
+
+            _Digits = digit;
+        }
+
+        #endregion
+
+        #region LayoutElements
+
+        private void LayoutElements()
+        {
+            if (_NumberOfDigits > 0)
+            {
+                int sepWidth = AbsSeparatorWidth;
+
+                int width = Bounds.Width - (_Padding.Left + _Padding.Right + BackColor.BorderWidth * 2);
+                int height = Bounds.Height - (_Padding.Top + _Padding.Bottom + BackColor.BorderWidth * 2);
+
+                int shear = 0;
+
+                if (Style != NumericIndicatorStyle.Mechanical)
+                {
+                    int w = width / _NumberOfDigits;
+
+                    if (ShearFactor > 0)
+                        width -= (int)(w * _SegmentWidth);
+
+                    if (ShearFactor != 0)
+                    {
+                        shear = (int)(w * ShearFactor);
+                        width -= Math.Abs(shear);
+                    }
+
+                }
+
+                int ewidth = (width - (_NumberOfDigits - 1) * sepWidth) / _NumberOfDigits;
+                int espread = width - ((ewidth + sepWidth) * _NumberOfDigits - sepWidth);
+
+                Rectangle r = new Rectangle(
+                    Bounds.X + BackColor.BorderWidth + _Padding.Left,
+                    Bounds.Y + BackColor.BorderWidth + _Padding.Top, ewidth, height);
+
+                if (shear < 0)
+                    r.X += -shear;
+
+                for (int i = 0; i < _NumberOfDigits; i++)
+                {
+                    r.Width = (ewidth + (i < espread ? 1 : 0));
+
+                    _Digits[i].Bounds = r;
+
+                    r.X += (r.Width + sepWidth);
+                }
+            }
+        }
+
+        #endregion
+
+        #region UpdateElements
+
+        private void UpdateElements()
+        {
+            bool numeric;
+            string s = GetOutputString(out numeric);
+
+            if (s != null)
+            {
+                if (_Style == NumericIndicatorStyle.Mechanical)
+                    UpdateMechanicalElements(s, numeric);
+                else
+                    UpdateSegmentedElements(s, numeric);
+            }
+        }
+
+        #region GetOutputString
+
+        private string GetOutputString(out bool numeric)
+        {
+            numeric = false;
+
+            string s = GetOverrideString();
+
+            int nDigits;
+
+            if (s != null)
+                return (AlignOutputString(s, false, out nDigits));
+
+            numeric = true;
+
+            return (GetValueString());
+        }
+
+        #region GetValueString
+
+        private string GetValueString()
+        {
+            int n = _NumberOfDigits;
+
+            if ((_Style != NumericIndicatorStyle.Mechanical) || _ShowDecimalPoint == false)
+                n++;
+
+            string s = "";
+
+            if (String.IsNullOrEmpty(_FormatString) == false)
+            {
+                try
+                {
+                    switch (_FormatString[0])
+                    {
+                        case 'X':
+                        case 'x':
+                            s = String.Format("{0:" + _FormatString + "}", (int)DValue);
+                            break;
+
+                        default:
+                            s = String.Format("{0:" + _FormatString + "}", DValue);
+                            break;
+                    }
+                }
+                catch
+                {
+                }
+            }
+            else
+            {
+                string t = ".".PadLeft(Math.Max(1, n - _NumberOfDecimals),
+                                       _ShowLeadingZeros ? '0' : '#') + "".PadLeft(_NumberOfDecimals, '0');
+
+                s = String.Format("{0:" + t + "}", Math.Abs(DValue));
+
+                s = ProcessSign(s);
+            }
+
+            int nDigits;
+
+            s = AlignOutputString(s, _ShowDecimalPoint == false, out nDigits);
+
+            if (s.Length > nDigits)
+                return ("".PadRight(_NumberOfDigits, '-'));
+
+            return (s);
+        }
+
+        #endregion
+
+        #region ProcessSign
+
+        private string ProcessSign(string s)
+        {
+            char sign = '\0';
+
+            if (Value < 0)
+            {
+                if (_SignVisibility == SignVisibility.Always ||
+                    _SignVisibility == SignVisibility.WhenNegative)
+                {
+                    sign = '-';
+                }
+            }
+            else
+            {
+                if (_SignVisibility == SignVisibility.Always ||
+                    _SignVisibility == SignVisibility.WhenPositive)
+                {
+                    sign = '+';
+                }
+            }
+
+            if (sign != '\0')
+            {
+                if (_ShowLeadingZeros == true)
+                {
+                    if (s[0] != '0')
+                        return ("".PadRight(_NumberOfDigits, '-'));
+
+                    return (sign + s.Substring(1));
+                }
+
+                return (sign + s);
+            }
+
+            return (s);
+        }
+
+        #endregion
+
+        #region AlignOutputString
+
+        private string AlignOutputString(
+            string s, bool removeDp, out int nDigits)
+        {
+            nDigits = _NumberOfDigits;
+
+            if (string.IsNullOrEmpty(s) == false)
+            {
+                if (Style != NumericIndicatorStyle.Mechanical && removeDp == false)
+                {
+                    removeDp = true;
+
+                    if (s[0] == '.' || s[0] == ':')
+                        s = " " + s;
+                }
+
+                if (removeDp == true)
+                {
+                    foreach (char c in s)
+                    {
+                        if (c == '.' || c == ':')
+                            nDigits++;
+                    }
+                }
+
+                switch (_DigitPlacement)
+                {
+                    case DisplayPlacement.Center:
+                        int n = (nDigits - s.Length)/2;
+
+                        if (n > 0)
+                            s = s.PadLeft(s.Length + n, ' ');
+                        break;
+
+                    case DisplayPlacement.Far:
+                        if (s.Length < nDigits)
+                            s = s.PadLeft(nDigits, ' ');
+                        break;
+                }
+            }
+
+            return (s);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region UpdateMechanicalElements
+
+        private void UpdateMechanicalElements(string s, bool numeric)
+        {
+            Color color, decimalColor;
+            GetIndColors(out color, out decimalColor);
+
+            int index = 0;
+
+            for (int i = 0; i < s.Length; i++)
+            {
+                if (index >= _NumberOfDigits)
+                    break;
+
+                if (numeric == true && s[i] == '.')
+                {
+                    color = decimalColor;
+
+                    if (_ShowDecimalPoint == false)
+                        continue;
+                }
+
+                NumericElement element = _Digits[index++];
+
+                element.Value = s[i];
+                element.DigitColor = color;
+            }
+
+            for (int i = index; i < _NumberOfDigits; i++)
+            {
+                _Digits[i].Value = ' ';
+                _Digits[i].DigitColor = color;
+            }
+        }
+
+        #endregion
+
+        #region UpdateSegmentedElements
+
+        private void UpdateSegmentedElements(string s, bool numeric)
+        {
+            Color color, dimColor;
+            Color decimalColor, decimalDimColor;
+            GetIndColors(out color, out dimColor, out decimalColor, out decimalDimColor);
+
+            int index = 0;
+
+            for (int i = 0; i < s.Length; i++)
+            {
+                if (s[i] == '.')
+                {
+                    if (numeric == true)
+                    {
+                        color = decimalColor;
+                        dimColor = decimalDimColor;
+
+                        if (_ShowDecimalPoint == false)
+                            continue;
+                    }
+
+                    if (index > 0)
+                        _Digits[index - 1].DecimalPointOn = true;
+                }
+                else if (s[i] == ':')
+                {
+                    if (index > 0)
+                        _Digits[index - 1].ColonPointsOn = true;
+                }
+                else
+                {
+                    if (index >= _NumberOfDigits)
+                        break;
+
+                    InitElement(_Digits[index++], s[i], color, dimColor);
+                }
+            }
+
+            for (int i = index; i < _NumberOfDigits; i++)
+                InitElement(_Digits[i], ' ', color, dimColor);
+        }
+
+        #region InitElement
+
+        private void InitElement(NumericElement element,
+            char value, Color color, Color dimColor)
+        {
+            element.Value = value;
+
+            element.DigitColor = color;
+            element.DigitDimColor = dimColor;
+
+            element.ColonPointsOn = false;
+            element.DecimalPointOn = false;
+
+            element.ShowDimColonPoints = _ShowDimColonPoints;
+            element.ShowDimDecimalPoint = _ShowDimDecimalPoint;
+            element.ShowDimSegments = _ShowDimSegments;
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region OnPaint
+
+        public override void OnPaint(PaintEventArgs e)
+        {
+            Graphics g = e.Graphics;
+
+            RecalcLayout();
+
+            Region rgn = g.Clip;
+
+            Rectangle r = Bounds;
+            r.Width++;
+            r.Height++;
+
+            g.SetClip(r, CombineMode.Intersect);
+
+            if (GaugeControl.OnPreRenderIndicator(e, this) == false)
+            {
+                FillBackground(g, Bounds, GetBackColor());
+
+                DrawElements(e);
+                DrawBorder(e);
+
+                GaugeControl.OnPostRenderIndicator(e, this);
+            }
+
+            g.Clip = rgn;
+        }
+
+        #region FillBackground
+
+        private void FillBackground(Graphics g,
+            Rectangle bounds, GradientFillColor fillColor)
+        {
+            Rectangle r = bounds;
+
+            GradientFillType fillType =
+                fillColor.End.IsEmpty ? GradientFillType.None : fillColor.GradientFillType;
+
+            switch (fillType)
+            {
+                case GradientFillType.Angle:
+                    using (Brush br = fillColor.GetBrush(r))
+                    {
+                        if (br is LinearGradientBrush)
+                            ((LinearGradientBrush)br).WrapMode = WrapMode.TileFlipXY;
+
+                        g.FillRectangle(br, r);
+                    }
+                    break;
+
+                case GradientFillType.StartToEnd:
+                    using (Brush br = fillColor.GetBrush(r, 90))
+                    {
+                        if (br is LinearGradientBrush)
+                            ((LinearGradientBrush)br).WrapMode = WrapMode.TileFlipXY;
+
+                        g.FillRectangle(br, r);
+                    }
+                    break;
+
+                case GradientFillType.HorizontalCenter:
+                    r.Height /= 2;
+
+                    if (r.Height <= 0)
+                        r.Height = 1;
+
+                    using (LinearGradientBrush br = new
+                        LinearGradientBrush(r, fillColor.Start, fillColor.End, 90))
+                    {
+                        br.WrapMode = WrapMode.TileFlipXY;
+
+                        g.FillRectangle(br, bounds);
+                    }
+                    break;
+
+                case GradientFillType.VerticalCenter:
+                    r.Width /= 2;
+
+                    if (r.Width <= 0)
+                        r.Width = 1;
+
+                    using (LinearGradientBrush br = new
+                        LinearGradientBrush(r, fillColor.Start, fillColor.End, 0f))
+                    {
+                        br.WrapMode = WrapMode.TileFlipXY;
+
+                        g.FillRectangle(br, bounds);
+                    }
+                    break;
+
+                case GradientFillType.Center:
+                    using (GraphicsPath path = new GraphicsPath())
+                    {
+                        path.AddRectangle(r);
+
+                        using (PathGradientBrush br = new PathGradientBrush(path))
+                        {
+                            br.CenterColor = fillColor.Start;
+                            br.SurroundColors = new Color[] { fillColor.End };
+
+                            g.FillRectangle(br, r);
+                        }
+                    }
+                    break;
+
+                default:
+                    using (Brush br = new SolidBrush(fillColor.Start))
+                        g.FillRectangle(br, r);
+
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region DrawElements
+
+        private void DrawElements(PaintEventArgs e)
+        {
+            if (_Digits != null)
+            {
+                for (int i = 0; i < _Digits.Length; i++)
+                {
+                    if (GaugeControl.OnPreRenderIndicatorDigit(e, this, _Digits[i], i) == false)
+                    {
+                        _Digits[i].OnPaint(e);
+
+                        GaugeControl.OnPostRenderIndicatorDigit(e, this, _Digits[i], i);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region DrawBorder
+
+        private void DrawBorder(PaintEventArgs e)
+        {
+            Graphics g = e.Graphics;
+
+            if (_Digits != null && _Style == NumericIndicatorStyle.Mechanical)
+            {
+                int sepWidth = AbsSeparatorWidth;
+
+                if (sepWidth > 0 && _SeparatorColor != null)
+                {
+                    for (int i = 0; i < _Digits.Length - 1; i++)
+                    {
+                        Rectangle r = _Digits[i].Bounds;
+
+                        r.X = r.Right + 1;
+                        r.Y = Bounds.Y + BackColor.BorderWidth;
+
+                        r.Width = sepWidth;
+                        r.Height = Bounds.Height - (BackColor.BorderWidth * 2);
+
+                        FillBackground(g, r, _SeparatorColor);
+
+                        if (_SeparatorColor.BorderWidth > 0)
+                        {
+                            using (Pen pen = new Pen(_SeparatorColor.BorderColor, _SeparatorColor.BorderWidth))
+                            {
+                                pen.Alignment = PenAlignment.Inset;
+
+                                g.DrawLine(pen, r.X, r.Y, r.X, r.Bottom);
+                                g.DrawLine(pen, r.Right, r.Y, r.Right, r.Bottom);
+                            }
+                        }
+                    }
+                }
+            }
+
+            if (BackColor.BorderWidth > 0)
+            {
+                using (Pen pen = new Pen(BackColor.BorderColor, BackColor.BorderWidth))
+                {
+                    pen.Alignment = PenAlignment.Inset;
+
+                    g.DrawRectangle(pen, Bounds);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetBackColor
+
+        private GradientFillColor GetBackColor()
+        {
+            if (_Ranges != null)
+            {
+                NumericRange range = _Ranges.GetValueRange(Value);
+
+                if (range != null && (range.BackColor.IsEmpty == false))
+                    return (range.BackColor);
+            }
+
+            return (BackColor);
+        }
+
+        #endregion
+
+        #region GetIndColors
+
+        private void GetIndColors(out Color digitColor, out Color decimalColor)
+        {
+            digitColor = _DigitColor;
+            decimalColor = _DecimalColor;
+
+            if (_Ranges != null)
+            {
+                foreach (NumericRange range in _Ranges)
+                {
+                    if (Value >= range.StartValue && Value <= range.EndValue)
+                    {
+                        if (range.DigitColor.IsEmpty == false)
+                            digitColor = range.DigitColor;
+
+                        if (range.DecimalColor.IsEmpty == false)
+                            decimalColor = range.DecimalColor;
+
+                        break;
+                    }
+                }
+            }
+        }
+
+        private void GetIndColors(out Color digitColor, out Color digitDimColor, 
+            out Color decimalColor,out Color decimalDimColor)
+        {
+            digitColor = _DigitColor;
+            decimalColor = _DecimalColor;
+            digitDimColor = _DigitDimColor;
+            decimalDimColor = _DecimalDimColor;
+
+            if (_Ranges != null)
+            {
+                foreach (NumericRange range in _Ranges)
+                {
+                    if (Value >= range.StartValue && Value <= range.EndValue)
+                    {
+                        if (range.DigitColor.IsEmpty == false)
+                            digitColor = range.DigitColor;
+
+                        if (range.DecimalColor.IsEmpty == false)
+                            decimalColor = range.DecimalColor;
+
+                        if (range.DigitDimColor.IsEmpty == false)
+                            digitDimColor = range.DigitDimColor;
+
+                        if (range.DecimalDimColor.IsEmpty == false)
+                            decimalDimColor = range.DecimalDimColor;
+
+                        break;
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region Refresh
+
+        internal void Refresh()
+        {
+            if (NeedRecalcLayout == false)
+                OnGaugeItemChanged(false);
+        }
+
+        #endregion
+
+        #region RefreshElements
+
+        public void RefreshElements()
+        {
+            if (_Digits != null)
+            {
+                foreach (NumericElement item in _Digits)
+                    item.RefreshElements();
+
+                Refresh();
+            }
+        }
+
+        #endregion
+
+        #region CopyToItem
+
+        public override void CopyToItem(GaugeItem copy)
+        {
+            NumericIndicator c = copy as NumericIndicator;
+
+            if (c != null)
+            {
+                base.CopyToItem(c);
+
+                c.DecimalColor = _DecimalColor;
+                c.DecimalDimColor = _DecimalDimColor;
+                c.DigitColor = _DigitColor;
+                c.DigitDimColor = _DigitDimColor;
+                c.DigitPlacement = _DigitPlacement;
+                c.FormatString = _FormatString;
+                c.NumberOfDecimals = _NumberOfDecimals;
+                c.NumberOfDigits = _NumberOfDigits;
+                c.Padding = _Padding;
+
+                if (_Ranges != null)
+                    c.Ranges = (NumericRangeCollection)_Ranges.Clone();
+
+                c.SegmentWidth = _SegmentWidth;
+
+                if (_SeparatorColor != null)
+                    c.SeparatorColor = (GradientFillColor)_SeparatorColor.Clone();
+
+                c.SeparatorWidth = _SeparatorWidth;
+                c.ShearFactor = _ShearFactor;
+                c.ShowDecimalPoint = _ShowDecimalPoint;
+                c.ShowDimColonPoints = _ShowDimColonPoints;
+                c.ShowDimDecimalPoint = _ShowDimDecimalPoint;
+                c.ShowDimSegments = _ShowDimSegments;
+                c.ShowLeadingZeros = _ShowLeadingZeros;
+                c.SignVisibility = _SignVisibility;
+                c.Style = _Style;
+            }
+        }
+
+        #endregion
+    }
+
+    #region Enums
+
+    public enum NumericIndicatorStyle
+    {
+        Mechanical,
+        Digital7Segment,
+        Digital16Segment
+    }
+
+    public enum SignVisibility
+    {
+        Never,
+        WhenNegative,
+        WhenPositive,
+        Always
+    }
+
+    #endregion
+
+}
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeIndicator/NumericRange.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeIndicator/NumericRange.cs
new file mode 100644
index 00000000..6f01cd61
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeIndicator/NumericRange.cs	
@@ -0,0 +1,215 @@
+using System.ComponentModel;
+using System.Drawing;
+using DevComponents.Instrumentation.Primitives;
+
+namespace DevComponents.Instrumentation
+{
+    public class NumericRangeCollection : GenericCollection<NumericRange>
+    {
+        #region GetValueRange
+
+        public NumericRange GetValueRange(double value)
+        {
+            foreach (NumericRange range in this)
+            {
+                if (value >= range.StartValue && value <= range.EndValue)
+                    return (range);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region ICloneable Members
+
+        public override object Clone()
+        {
+            NumericRangeCollection copy = new NumericRangeCollection();
+
+            CopyToItem(copy);
+
+            return (copy);
+        }
+
+        #endregion
+
+        #region CopyToItem
+
+        internal void CopyToItem(NumericRangeCollection copy)
+        {
+            foreach (NumericRange item in this)
+            {
+                NumericRange ic = new NumericRange();
+
+                item.CopyToItem(ic);
+
+                copy.Add(ic);
+            }
+        }
+
+        #endregion
+    }
+
+    public class NumericRange : IndicatorRange
+    {
+        #region Private variables
+
+        private Color _DigitColor;
+        private Color _DigitDimColor;
+        private Color _DecimalColor;
+        private Color _DecimalDimColor;
+
+        private NumericIndicator _NumericIndicator;
+
+        #endregion
+
+        #region Public properties
+
+        #region DecimalColor
+
+        /// <summary>
+        /// Gets or sets the default Decimal Color
+        /// </summary>
+        [Browsable(true), Category("Appearance"), DefaultValue(typeof(Color), "FireBrick")]
+        [Description("Indicates the default Decimal Color.")]
+        public Color DecimalColor
+        {
+            get { return (_DecimalColor); }
+
+            set
+            {
+                if (_DecimalColor != value)
+                {
+                    _DecimalColor = value;
+
+                    OnIndicatorRangeChanged();
+                }
+            }
+        }
+
+        #endregion
+
+        #region DecimalDimColor
+
+        /// <summary>
+        /// Gets or sets the default Decimal Dim Color (Dim LED color)
+        /// </summary>
+        [Browsable(true), Category("Appearance"), DefaultValue(typeof(Color), "Empty")]
+        [Description("Indicates the default Decimal Dim Color (Dim LED color).")]
+        public Color DecimalDimColor
+        {
+            get { return (_DecimalDimColor); }
+
+            set
+            {
+                if (_DecimalDimColor != value)
+                {
+                    _DecimalDimColor = value;
+
+                    OnIndicatorRangeChanged();
+                }
+            }
+        }
+
+        #endregion
+
+        #region DigitColor
+
+        /// <summary>
+        /// Gets or sets the default Digit Color
+        /// </summary>
+        [Browsable(true), Category("Appearance"), DefaultValue(typeof(Color), "SteelBlue")]
+        [Description("Indicates the default Digit Color.")]
+        public Color DigitColor
+        {
+            get { return (_DigitColor); }
+
+            set
+            {
+                if (_DigitColor != value)
+                {
+                    _DigitColor = value;
+
+                    OnIndicatorRangeChanged();
+                }
+            }
+        }
+
+        #endregion
+
+        #region DigitDimColor
+
+        /// <summary>
+        /// Gets or sets the default Digit Dim Color (Dim LED color)
+        /// </summary>
+        [Browsable(true), Category("Appearance"), DefaultValue(typeof(Color), "Empty")]
+        [Description("Indicates the default Digit Dim Color (Dim LED color).")]
+        public Color DigitDimColor
+        {
+            get { return (_DigitDimColor); }
+
+            set
+            {
+                if (_DigitDimColor != value)
+                {
+                    _DigitDimColor = value;
+
+                    OnIndicatorRangeChanged();
+                }
+            }
+        }
+
+        #endregion
+
+        #region NumericIndicator
+
+        /// <summary>
+        /// Gets or sets the NumericIndicator
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public NumericIndicator NumericIndicator
+        {
+            get { return (_NumericIndicator); }
+            internal set { _NumericIndicator = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ICloneable Members
+
+        public override object Clone()
+        {
+            NumericRange copy = new NumericRange();
+
+            CopyToItem(copy);
+
+            return (copy);
+        }
+
+        #endregion
+
+        #region CopyToItem
+
+        public override void CopyToItem(GaugeItem copy)
+        {
+            NumericRange c = copy as NumericRange;
+
+            if (c != null)
+            {
+                base.CopyToItem(c);
+
+                c.DecimalColor = _DecimalColor;
+                c.DecimalDimColor = _DecimalDimColor;
+                c.DigitColor = _DigitColor;
+                c.DigitDimColor = _DigitDimColor;
+            }
+        }
+
+        #endregion
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeIndicator/Seg16Element.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeIndicator/Seg16Element.cs
new file mode 100644
index 00000000..55c39bfe
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeIndicator/Seg16Element.cs	
@@ -0,0 +1,572 @@
+using System;
+using System.Drawing;
+
+namespace DevComponents.Instrumentation
+{
+    public class Seg16Element : DigitalElement
+    {
+        #region Private variables
+
+        private int _DiagSlant;
+        private int _DiagWidth;
+
+        #endregion
+
+        public Seg16Element(NumericIndicator numIndicator)
+            : base(numIndicator, 16, 6)
+        {
+        }
+
+        #region RecalcSegments
+
+        public override void RecalcSegments()
+        {
+            double d = (ElemWidth * NumIndicator.SegmentWidth) / 8;
+
+            _DiagWidth = (int)(Math.Sqrt((d * d) * 2));
+            _DiagWidth = Math.Max(1, _DiagWidth);
+
+            d = Math.Sqrt(ElemHeight * ElemHeight + ElemWidth * ElemWidth) / 2;
+
+            _DiagSlant = (int)((SegWidth  * d) / ElemWidthHalf);
+
+            CalcSegment0();
+            CalcSegment1();
+            CalcSegment2();
+            CalcSegment3();
+            CalcSegment4();
+            CalcSegment5();
+            CalcSegment6();
+            CalcSegment7();
+            CalcSegment8();
+            CalcSegment9();
+            CalcSegment10();
+            CalcSegment11();
+            CalcSegment12();
+            CalcSegment13();
+            CalcSegment14();
+            CalcSegment15();
+        }
+
+        #region CalcSegment0
+
+        private void CalcSegment0()
+        {
+            Point[] pts = SegPoints[0];
+
+            pts[0].X = SegWidth + 1; pts[0].Y = 0;
+            pts[1].X = ElemWidthHalf - 1; pts[1].Y = 0;
+            pts[2].X = ElemWidthHalf - 1; pts[2].Y = SegStep;
+            pts[3].X = ElemWidthHalf - SegWidthHalf - 1; pts[3].Y = SegWidth;
+            pts[4].X = SegWidth + 1; pts[4].Y = SegWidth;
+            pts[5].X = SegWidthHalf + 1; pts[5].Y = SegWidthHalf;
+        }
+
+        #endregion
+
+        #region CalcSegment1
+
+        private void CalcSegment1()
+        {
+            Point[] pts = SegPoints[1];
+
+            pts[0].X = ElemWidthHalf + 1; pts[0].Y = 0;
+            pts[1].X = ElemWidth - SegWidth - 1; pts[1].Y = 0;
+            pts[2].X = ElemWidth - SegWidthHalf - 1; pts[2].Y = SegWidthHalf;
+            pts[3].X = ElemWidth - SegWidth - 1; pts[3].Y = SegWidth;
+            pts[4].X = ElemWidthHalf + SegWidthHalf + 1; pts[4].Y = SegWidth;
+            pts[5].X = ElemWidthHalf + 1; pts[5].Y = SegStep;
+        }
+
+        #endregion
+
+        #region CalcSegment2
+
+        private void CalcSegment2()
+        {
+            Point[] pts = SegPoints[2];
+
+            pts[0].X = 0; pts[0].Y = SegWidth + 1;
+            pts[1].X = SegWidthHalf; pts[1].Y = SegWidthHalf + 1;
+            pts[2].X = SegWidth; pts[2].Y = pts[0].Y;
+            pts[3].X = pts[2].X; pts[3].Y = ElemHeightHalf - SegWidthHalf - 1;
+            pts[4].X = SegStep; pts[4].Y = ElemHeightHalf - 1;
+            pts[5].X = 0; pts[5].Y = pts[4].Y;
+        }
+
+        #endregion
+
+        #region CalcSegment3
+
+        private void CalcSegment3()
+        {
+            Point[] pts = SegPoints[3];
+
+            pts[0].X = SegWidth + 1; pts[0].Y = pts[0].X;
+            pts[1].X = pts[0].X + _DiagWidth; pts[1].Y = pts[0].Y;
+            pts[2].X = ElemWidthHalf - SegWidthHalf - 1; pts[2].Y = ElemHeightHalf - SegWidthHalf - _DiagSlant;
+            pts[3].X = pts[2].X; pts[3].Y = pts[2].Y + _DiagSlant;
+            pts[4].X = pts[0].X; pts[4].Y = pts[0].Y + _DiagWidth;
+            pts[5].X = pts[0].X; pts[5].Y = pts[0].Y;
+        }
+
+        #endregion
+
+        #region CalcSegment4
+
+        private void CalcSegment4()
+        {
+            Point[] pts = SegPoints[4];
+
+            pts[0].X = ElemWidthHalf - SegWidthHalf; pts[0].Y = SegWidth + 1;
+            pts[1].X = ElemWidthHalf; pts[1].Y = SegStep + 1;
+            pts[2].X = ElemWidthHalf + SegWidthHalf; pts[2].Y = pts[0].Y;
+            pts[3].X = pts[2].X; pts[3].Y = ElemHeightHalf - SegWidthHalf - 1;
+            pts[4].X = pts[1].X; pts[4].Y = ElemHeightHalf - 1;
+            pts[5].X = pts[0].X; pts[5].Y = pts[3].Y;
+        }
+
+        #endregion
+
+        #region CalcSegment5
+
+        private void CalcSegment5()
+        {
+            Point[] pts = SegPoints[5];
+
+            pts[0].X = ElemWidth - SegWidth - _DiagWidth - 1; pts[0].Y = SegWidth + 1;
+            pts[1].X = pts[0].X + _DiagWidth; pts[1].Y = pts[0].Y;
+            pts[2].X = pts[1].X; pts[2].Y = pts[1].Y + _DiagWidth;
+            pts[3].X = ElemWidthHalf + SegWidthHalf + 1; pts[3].Y = ElemHeightHalf - SegWidthHalf;
+            pts[4].X = pts[3].X; pts[4].Y = pts[3].Y - _DiagSlant;
+            pts[5].X = pts[0].X; pts[5].Y = pts[0].Y;
+        }
+
+        #endregion
+
+        #region CalcSegment6
+
+        private void CalcSegment6()
+        {
+            Point[] pts = SegPoints[6];
+
+            pts[0].X = ElemWidth - SegWidth; pts[0].Y = SegWidth + 1;
+            pts[1].X = pts[0].X + SegWidthHalf; pts[1].Y = SegWidthHalf + 1;
+            pts[2].X = ElemWidth; pts[2].Y = pts[0].Y;
+            pts[3].X = pts[2].X; pts[3].Y = ElemHeightHalf - 1;
+            pts[4].X = pts[3].X - SegStep; pts[4].Y = pts[3].Y;
+            pts[5].X = ElemWidth - SegWidth; pts[5].Y = pts[3].Y - SegWidthHalf;
+        }
+
+        #endregion
+
+        #region CalcSegment7
+
+        private void CalcSegment7()
+        {
+            Point[] pts = SegPoints[7];
+
+            pts[0].X = SegWidth + 1; pts[0].Y = ElemHeightHalf - SegWidthHalf;
+            pts[1].X = ElemWidthHalf - SegWidthHalf - 1; pts[1].Y = pts[0].Y;
+            pts[2].X = ElemWidthHalf - 1; pts[2].Y = ElemHeightHalf;
+            pts[3].X = pts[1].X; pts[3].Y = ElemHeightHalf + SegWidthHalf;
+            pts[4].X = pts[0].X; pts[4].Y = pts[3].Y;
+            pts[5].X = SegStep + 1; pts[5].Y = pts[2].Y;
+        }
+
+        #endregion
+
+        #region CalcSegment8
+
+        private void CalcSegment8()
+        {
+            Point[] pts = SegPoints[8];
+
+            pts[0].X = ElemWidthHalf + SegWidthHalf + 1; pts[0].Y = ElemHeightHalf - SegWidthHalf;
+            pts[1].X = ElemWidth - SegWidth - 1; pts[1].Y = pts[0].Y;
+            pts[2].X = ElemWidth - SegStep - 1; pts[2].Y = ElemHeightHalf;
+            pts[3].X = pts[1].X; pts[3].Y = ElemHeightHalf + SegWidthHalf;
+            pts[4].X = pts[0].X; pts[4].Y = pts[3].Y;
+            pts[5].X = ElemWidthHalf + 1; pts[5].Y = pts[2].Y;
+        }
+
+        #endregion
+
+        #region CalcSegment9
+
+        private void CalcSegment9()
+        {
+            Point[] pts = SegPoints[9];
+
+            pts[0].X = 0; pts[0].Y = ElemHeightHalf + 1;
+            pts[1].X = SegStep; pts[1].Y = pts[0].Y;
+            pts[2].X = SegWidth; pts[2].Y = pts[1].Y + SegWidthHalf;
+            pts[3].X = pts[2].X; pts[3].Y = ElemHeight - SegWidth - 1;
+            pts[4].X = SegWidthHalf; pts[4].Y = ElemHeight - SegWidthHalf - 1;
+            pts[5].X = 0; pts[5].Y = pts[3].Y;
+        }
+
+        #endregion
+
+        #region CalcSegment10
+
+        private void CalcSegment10()
+        {
+            Point[] pts = SegPoints[10];
+
+            pts[0].X = ElemWidthHalf - SegWidthHalf - 1; pts[0].Y = ElemHeightHalf + SegWidthHalf;
+            pts[1].X = pts[0].X; pts[1].Y = pts[0].Y + _DiagSlant;
+            pts[2].X = SegWidth + _DiagWidth + 1; pts[2].Y = ElemHeight - SegWidth - 1;
+            pts[3].X = SegWidth + 1; pts[3].Y = ElemHeight - SegWidth - 1;
+            pts[4].X = pts[3].X; pts[4].Y = pts[3].Y - _DiagWidth;
+            pts[5].X = pts[0].X; pts[5].Y = pts[0].Y;
+        }
+
+        #endregion
+
+        #region CalcSegment11
+
+        private void CalcSegment11()
+        {
+            Point[] pts = SegPoints[11];
+
+            pts[0].X = ElemWidthHalf - SegWidthHalf; pts[0].Y = ElemHeightHalf + SegWidthHalf + 1;
+            pts[1].X = ElemWidthHalf; pts[1].Y = ElemHeightHalf + 1;
+            pts[2].X = ElemWidthHalf + SegWidthHalf; pts[2].Y = pts[0].Y;
+            pts[3].X = pts[2].X; pts[3].Y = ElemHeight - SegWidth - 1;
+            pts[4].X = pts[1].X; pts[4].Y = ElemHeight - SegStep - 1;
+            pts[5].X = pts[0].X; pts[5].Y = pts[3].Y;
+        }
+
+        #endregion
+
+        #region CalcSegment12
+
+        private void CalcSegment12()
+        {
+            Point[] pts = SegPoints[12];
+
+            pts[0].X = ElemWidthHalf + SegWidthHalf + 1; pts[0].Y = ElemHeightHalf + SegWidthHalf;
+            pts[1].X = ElemWidth - SegWidth - 1; pts[1].Y = ElemHeight - SegWidth - _DiagWidth - 1;
+            pts[2].X = pts[1].X; pts[2].Y = pts[1].Y + _DiagWidth;
+            pts[3].X = pts[2].X - _DiagWidth; pts[3].Y = pts[2].Y;
+            pts[4].X = pts[0].X; pts[4].Y = pts[0].Y + _DiagSlant;
+            pts[5].X = pts[0].X; pts[5].Y = pts[0].Y;
+        }
+
+        #endregion
+
+        #region CalcSegment13
+
+        private void CalcSegment13()
+        {
+            Point[] pts = SegPoints[13];
+
+            pts[0].X = ElemWidth - SegStep; pts[0].Y = ElemHeightHalf + 1;
+            pts[1].X = ElemWidth; pts[1].Y = pts[0].Y;
+            pts[2].X = pts[1].X; pts[2].Y = ElemHeight - SegWidth - 1;
+            pts[3].X = ElemWidth - SegWidthHalf; pts[3].Y = ElemHeight - SegWidthHalf - 1;
+            pts[4].X = ElemWidth - SegWidth; pts[4].Y = pts[2].Y;
+            pts[5].X = pts[4].X; pts[5].Y = ElemHeightHalf + SegWidthHalf + 1;
+        }
+
+        #endregion
+
+        #region CalcSegment14
+
+        private void CalcSegment14()
+        {
+            Point[] pts = SegPoints[14];
+
+            pts[0].X = SegWidth + 1; pts[0].Y = ElemHeight - SegWidth;
+            pts[1].X = ElemWidthHalf - SegWidthHalf - 1; pts[1].Y = pts[0].Y;
+            pts[2].X = ElemWidthHalf - 1; pts[2].Y = ElemHeight - SegStep;
+            pts[3].X = pts[2].X; pts[3].Y = ElemHeight;
+            pts[4].X = pts[0].X; pts[4].Y = pts[3].Y;
+            pts[5].X = SegWidthHalf + 1; pts[5].Y = ElemHeight - SegWidthHalf;
+        }
+
+        #endregion
+
+        #region CalcSegment15
+
+        private void CalcSegment15()
+        {
+            Point[] pts = SegPoints[15];
+
+            pts[0].X = ElemWidthHalf + SegWidthHalf + 1; pts[0].Y = ElemHeight - SegWidth;
+            pts[1].X = ElemWidth - SegWidth - 1; pts[1].Y = pts[0].Y;
+            pts[2].X = ElemWidth - SegWidthHalf - 1; pts[2].Y = ElemHeight - SegWidthHalf;
+            pts[3].X = pts[1].X; pts[3].Y = ElemHeight;
+            pts[4].X = ElemWidthHalf + 1; pts[4].Y = ElemHeight;
+            pts[5].X = pts[4].X; pts[5].Y = ElemHeight - SegStep;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetDigitSegments
+
+        public override int GetDigitSegments(char digit)
+        {
+            switch (digit)
+            {
+                #region Numeric
+
+                case '0': return ((int)Seg16Segments.Zero);
+                case '1': return ((int)Seg16Segments.One);
+                case '2': return ((int)Seg16Segments.Two);
+                case '3': return ((int)Seg16Segments.Three);
+                case '4': return ((int)Seg16Segments.Four);
+                case '5': return ((int)Seg16Segments.Five);
+                case '6': return ((int)Seg16Segments.Six);
+                case '7': return ((int)Seg16Segments.Seven);
+                case '8': return ((int)Seg16Segments.Eight);
+                case '9': return ((int)Seg16Segments.Nine);
+
+                #endregion
+
+                #region Lowercase Alpha
+
+                case 'a': return ((int)Seg16Segments.a);
+                case 'b': return ((int)Seg16Segments.b);
+                case 'c': return ((int)Seg16Segments.c);
+                case 'd': return ((int)Seg16Segments.d);
+                case 'e': return ((int)Seg16Segments.e);
+                case 'f': return ((int)Seg16Segments.f);
+                case 'g': return ((int)Seg16Segments.g);
+                case 'h': return ((int)Seg16Segments.h);
+                case 'i': return ((int)Seg16Segments.i);
+                case 'j': return ((int)Seg16Segments.j);
+                case 'k': return ((int)Seg16Segments.k);
+                case 'l': return ((int)Seg16Segments.l);
+                case 'm': return ((int)Seg16Segments.m);
+                case 'n': return ((int)Seg16Segments.n);
+                case 'o': return ((int)Seg16Segments.o);
+                case 'p': return ((int)Seg16Segments.p);
+                case 'q': return ((int)Seg16Segments.q);
+                case 'r': return ((int)Seg16Segments.r);
+                case 's': return ((int)Seg16Segments.s);
+                case 't': return ((int)Seg16Segments.t);
+                case 'u': return ((int)Seg16Segments.u);
+                case 'v': return ((int)Seg16Segments.v);
+                case 'w': return ((int)Seg16Segments.w);
+                case 'x': return ((int)Seg16Segments.x);
+                case 'y': return ((int)Seg16Segments.y);
+                case 'z': return ((int)Seg16Segments.z);
+
+                #endregion
+
+                #region Uppercase alpha
+
+                case 'A': return ((int)Seg16Segments.A);
+                case 'B': return ((int)Seg16Segments.B);
+                case 'C': return ((int)Seg16Segments.C);
+                case 'D': return ((int)Seg16Segments.D);
+                case 'E': return ((int)Seg16Segments.E);
+                case 'F': return ((int)Seg16Segments.F);
+                case 'G': return ((int)Seg16Segments.G);
+                case 'H': return ((int)Seg16Segments.H);
+                case 'I': return ((int)Seg16Segments.I);
+                case 'J': return ((int)Seg16Segments.J);
+                case 'K': return ((int)Seg16Segments.K);
+                case 'L': return ((int)Seg16Segments.L);
+                case 'M': return ((int)Seg16Segments.M);
+                case 'N': return ((int)Seg16Segments.N);
+                case 'O': return ((int)Seg16Segments.O);
+                case 'P': return ((int)Seg16Segments.P);
+                case 'Q': return ((int)Seg16Segments.Q);
+                case 'R': return ((int)Seg16Segments.R);
+                case 'S': return ((int)Seg16Segments.S);
+                case 'T': return ((int)Seg16Segments.T);
+                case 'U': return ((int)Seg16Segments.U);
+                case 'V': return ((int)Seg16Segments.V);
+                case 'W': return ((int)Seg16Segments.W);
+                case 'X': return ((int)Seg16Segments.X);
+                case 'Y': return ((int)Seg16Segments.Y);
+                case 'Z': return ((int)Seg16Segments.Z);
+
+                #endregion
+
+                #region Extended chars
+
+                case ' ': return ((int)Seg16Segments.Space);
+                case '!': return ((int)Seg16Segments.ExPoint);
+                case '"': return ((int)Seg16Segments.DQuote);
+                case '#': return ((int)Seg16Segments.PoundSign);
+                case '$': return ((int)Seg16Segments.DollarSign);
+                case '%': return ((int)Seg16Segments.PercentSign);
+                case '&': return ((int)Seg16Segments.Ampersand);
+                case '\'': return ((int)Seg16Segments.SQuote);
+                case '(': return ((int)Seg16Segments.LParen);
+                case ')': return ((int)Seg16Segments.RParen);
+                case '*': return ((int)Seg16Segments.Asterisk);
+                case '+': return ((int)Seg16Segments.PlusSign);
+                case ',': return ((int)Seg16Segments.Comma);
+                case '-': return ((int)Seg16Segments.Dash);
+                case '/': return ((int)Seg16Segments.FSlash);
+                case ':': return ((int)Seg16Segments.Colon);
+                case ';': return ((int)Seg16Segments.Semicolon);
+                case '<': return ((int)Seg16Segments.LessThan);
+                case '=': return ((int)Seg16Segments.Equals);
+                case '>': return ((int)Seg16Segments.GreaterThan);
+                case '?': return ((int)Seg16Segments.QuestionMark);
+                case '@': return ((int)Seg16Segments.Atsign);
+                case '[': return ((int)Seg16Segments.LBracket);
+                case '\\': return ((int)Seg16Segments.BackSlash);
+                case ']': return ((int)Seg16Segments.RBracket);
+                case '^': return ((int)Seg16Segments.Caret);
+                case '_': return ((int)Seg16Segments.Underline);
+                case '`': return ((int)Seg16Segments.Apostrophe);
+                case '{': return ((int)Seg16Segments.LBrace);
+                case '|': return ((int)Seg16Segments.Pipe);
+                case '}': return ((int)Seg16Segments.RBrace);
+                case '~': return ((int)Seg16Segments.Tilde);
+                case '�': return ((int)Seg16Segments.Pound);
+                case '�': return ((int)Seg16Segments.Degree);
+                case '�': return ((int)Seg16Segments.PlusMinus);
+
+                #endregion
+
+                default: return ((int)Seg16Segments.None);
+            }
+        }
+
+        #endregion
+    }
+
+    #region Enums
+
+    #region Seg16Segments
+
+    // ReSharper disable InconsistentNaming
+
+    public enum Seg16Segments : int
+    {
+        None = 0,
+
+        #region Numeric
+
+        Zero = 0xE667,
+        One = 0x810,
+        Two = 0xC3C3,
+        Three = 0xE1C3,
+        Four = 0x21C4,
+        Five = 0xE187,
+        Six = 0xE387,
+        Seven = 0x2043,
+        Eight = 0xE3C7,
+        Nine = 0xE1C7,
+
+        #endregion
+
+        #region Lowercase alpha
+
+        a = 0xCA80,
+        b = 0xA910,
+        c = 0x8900,
+        d = 0xA940,
+        e = 0x4680,
+        f = 0x912,
+        g = 0xB100,
+        h = 0x2910,
+        i = 0x8820,
+        j = 0xA840,
+        k = 0x1830,
+        l = 0x8810,
+        m = 0x2B80,
+        n = 0x2900,
+        o = 0xA900,
+        p = 0x28C,
+        q = 0x8895,
+        r = 0x900,
+        s = 0x9100,
+        t = 0x8990,
+        u = 0xA800,
+        v = 0x3000,
+        w = 0x3600,
+        x = 0x1580,
+        y = 0xB000,
+        z = 0x4480,
+
+        #endregion
+
+        #region Uppercase alpha
+
+        A = 0x23C7,
+        B = 0xE953,
+        C = 0xC207,
+        D = 0xE853,
+        E = 0xC387,
+        F = 0x387,
+        G = 0xE307,
+        H = 0x23C4,
+        I = 0xC813,
+        J = 0xE240,
+        K = 0x12A4,
+        L = 0xC204,
+        M = 0x226C,
+        N = 0x324C,
+        O = 0xE247,
+        P = 0x3C7,
+        Q = 0xF247,
+        R = 0x13C7,
+        S = 0xE187,
+        T = 0x813,
+        U = 0xE244,
+        V = 0x3048,
+        W = 0xEA44,
+        X = 0x1428,
+        Y = 0x828,
+        Z = 0xC423,
+
+        #endregion
+
+        #region Extended chars
+
+        Space = 0x00,
+        ExPoint = 0x8152,
+        DQuote = 0x50,
+        PoundSign = 0xE9D0,
+        DollarSign = 0xE997,
+        PercentSign = 0xADB5,
+        Ampersand = 0xD299,
+        SQuote = 0x10,
+        LParen = 0x4205,
+        RParen = 0xA042,
+        Asterisk = 0x1DB8,
+        PlusSign = 0x990,
+        Comma = 0x400,
+        Dash = 0x180,
+        FSlash = 0x420,
+        Colon = 0x810,
+        Semicolon = 0x410,
+        LessThan = 0x1020,
+        Equals = 0xC180,
+        GreaterThan = 0x408,
+        QuestionMark = 0x943,
+        Atsign = 0xAB47,
+        LBracket = 0x4205,
+        BackSlash = 0x1008,
+        RBracket = 0xA042,
+        Caret = 0x1400,
+        Underline = 0xC000,
+        Apostrophe = 0x8,
+        LBrace = 0x8892,
+        Pipe = 0x810,
+        RBrace = 0x4911,
+        Tilde = 0x2C,
+        Pound = 0xAB14,
+        Degree = 0x152,
+        PlusMinus = 0xC990,
+
+        #endregion
+    }
+
+    // ReSharper restore InconsistentNaming
+
+    #endregion
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeIndicator/Seg7Element.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeIndicator/Seg7Element.cs
new file mode 100644
index 00000000..3b971dcf
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeIndicator/Seg7Element.cs	
@@ -0,0 +1,318 @@
+using System.Drawing;
+
+namespace DevComponents.Instrumentation
+{
+    public class Seg7Element : DigitalElement
+    {
+        public Seg7Element(NumericIndicator numIndicator)
+            : base(numIndicator, 7, 6)
+        {
+        }
+
+        #region RecalcSegments
+
+        public override void RecalcSegments()
+        {
+            CalcSegment0();
+            CalcSegment1();
+            CalcSegment2();
+            CalcSegment3();
+            CalcSegment4();
+            CalcSegment5();
+            CalcSegment6();
+        }
+
+        #region CalcSegment0
+
+        private void CalcSegment0()
+        {
+            Point[] pts = SegPoints[0];
+
+            pts[0].X = SegWidth + 1; pts[0].Y = 0;
+            pts[1].X = ElemWidth - SegWidth - 1; pts[1].Y = 0;
+            pts[2].X = ElemWidth - SegWidthHalf - 1; pts[2].Y = SegWidthHalf;
+            pts[3].X = pts[1].X; pts[3].Y = SegWidth;
+            pts[4].X = pts[0].X; pts[4].Y = SegWidth;
+            pts[5].X = SegWidthHalf + 1; pts[5].Y = pts[2].Y;
+        }
+
+        #endregion
+
+        #region CalcSegment1
+
+        private void CalcSegment1()
+        {
+            Point[] pts = SegPoints[1];
+
+            pts[0].X = 0; pts[0].Y = SegWidth + 1;
+            pts[1].X = SegWidthHalf; pts[1].Y = SegWidthHalf + 1;
+            pts[2].X = SegWidth; pts[2].Y = SegWidth + 1;
+            pts[3].X = SegWidth; pts[3].Y = ElemHeightHalf - SegWidthHalf - 1;
+            pts[4].X = 4; pts[4].Y = ElemHeightHalf - 1;
+            pts[5].X = 0; pts[5].Y = ElemHeightHalf - 1;
+        }
+
+        #endregion
+
+        #region CalcSegment2
+
+        private void CalcSegment2()
+        {
+            Point[] pts = SegPoints[2];
+
+            pts[0].X = ElemWidth - SegWidth; pts[0].Y = SegWidth + 1;
+            pts[1].X = ElemWidth - SegWidthHalf; pts[1].Y = SegWidthHalf + 1;
+            pts[2].X = ElemWidth; pts[2].Y = SegWidth + 1;
+            pts[3].X = ElemWidth; pts[3].Y = ElemHeightHalf - 1;
+            pts[4].X = ElemWidth - 4; pts[4].Y = ElemHeightHalf - 1;
+            pts[5].X = ElemWidth - SegWidth; pts[5].Y = ElemHeightHalf - SegWidthHalf - 1;
+        }
+
+        #endregion
+
+        #region CalcSegment3
+
+        private void CalcSegment3()
+        {
+            Point[] pts = SegPoints[3];
+
+            pts[0].X = SegWidth + 1; pts[0].Y = ElemHeightHalf - SegWidthHalf;
+            pts[1].X = ElemWidth - SegWidth - 1; pts[1].Y = ElemHeightHalf - SegWidthHalf;
+            pts[2].X = ElemWidth - 5; pts[2].Y = ElemHeightHalf;
+            pts[3].X = ElemWidth - SegWidth - 1; pts[3].Y = ElemHeightHalf + SegWidthHalf;
+            pts[4].X = SegWidth + 1; pts[4].Y = ElemHeightHalf + SegWidthHalf;
+            pts[5].X = 5; pts[5].Y = ElemHeightHalf;
+        }
+
+        #endregion
+
+        #region CalcSegment4
+
+        private void CalcSegment4()
+        {
+            Point[] pts = SegPoints[4];
+
+            pts[0].X = 0; pts[0].Y = ElemHeightHalf + 1;
+            pts[1].X = 4; pts[1].Y = ElemHeightHalf + 1;
+            pts[2].X = SegWidth; pts[2].Y = ElemHeightHalf + SegWidthHalf + 1;
+            pts[3].X = SegWidth; pts[3].Y = ElemHeight - SegWidth - 1;
+            pts[4].X = SegWidthHalf; pts[4].Y = ElemHeight - SegWidthHalf - 1;
+            pts[5].X = 0; pts[5].Y = ElemHeight - SegWidth - 1;
+        }
+
+        #endregion
+
+        #region CalcSegment5
+
+        private void CalcSegment5()
+        {
+            Point[] pts = SegPoints[5];
+
+            pts[0].X = ElemWidth - SegWidth; pts[0].Y = ElemHeightHalf + SegWidthHalf + 1;
+            pts[1].X = ElemWidth - 4; pts[1].Y = ElemHeightHalf + 1;
+            pts[2].X = ElemWidth; pts[2].Y = ElemHeightHalf + 1;
+            pts[3].X = ElemWidth; pts[3].Y = ElemHeight - SegWidth - 1;
+            pts[4].X = ElemWidth - SegWidthHalf; pts[4].Y = ElemHeight - SegWidthHalf - 1;
+            pts[5].X = ElemWidth - SegWidth; pts[5].Y = ElemHeight - SegWidth - 1;
+        }
+
+        #endregion
+
+        #region CalcSegment6
+
+        private void CalcSegment6()
+        {
+            Point[] pts = SegPoints[6];
+
+            pts[0].X = SegWidth + 1; pts[0].Y = ElemHeight - SegWidth;
+            pts[1].X = ElemWidth - SegWidth - 1; pts[1].Y = ElemHeight - SegWidth;
+            pts[2].X = ElemWidth - SegWidthHalf - 1; pts[2].Y = ElemHeight - SegWidthHalf;
+            pts[3].X = ElemWidth - SegWidth - 1; pts[3].Y = ElemHeight;
+            pts[4].X = SegWidth + 1; pts[4].Y = ElemHeight;
+            pts[5].X = SegWidthHalf + 1; pts[5].Y = ElemHeight - SegWidthHalf;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetCharSegments
+
+        public override int GetDigitSegments(char value)
+        {
+            switch (value)
+            {
+                case '0': return ((int)Seg7Segments.Zero);
+                case '1': return ((int)Seg7Segments.One);
+                case '2': return ((int)Seg7Segments.Two);
+                case '3': return ((int)Seg7Segments.Three);
+                case '4': return ((int)Seg7Segments.Four);
+                case '5': return ((int)Seg7Segments.Five);
+                case '6': return ((int)Seg7Segments.Six);
+                case '7': return ((int)Seg7Segments.Seven);
+                case '8': return ((int)Seg7Segments.Eight);
+                case '9': return ((int)Seg7Segments.Nine);
+
+                case 'a': return ((int)Seg7Segments.a);
+                case 'b': return ((int)Seg7Segments.b);
+                case 'c': return ((int)Seg7Segments.c);
+                case 'd': return ((int)Seg7Segments.d);
+                case 'e': return ((int)Seg7Segments.e);
+                case 'f': return ((int)Seg7Segments.f);
+                case 'g': return ((int)Seg7Segments.g);
+                case 'h': return ((int)Seg7Segments.h);
+                case 'i': return ((int)Seg7Segments.i);
+                case 'j': return ((int)Seg7Segments.j);
+                case 'k': return ((int)Seg7Segments.k);
+                case 'l': return ((int)Seg7Segments.l);
+                case 'm': return ((int)Seg7Segments.m);
+                case 'n': return ((int)Seg7Segments.n);
+                case 'o': return ((int)Seg7Segments.o);
+                case 'p': return ((int)Seg7Segments.p);
+                case 'q': return ((int)Seg7Segments.q);
+                case 'r': return ((int)Seg7Segments.r);
+                case 's': return ((int)Seg7Segments.s);
+                case 't': return ((int)Seg7Segments.t);
+                case 'u': return ((int)Seg7Segments.u);
+                case 'v': return ((int)Seg7Segments.v);
+                case 'w': return ((int)Seg7Segments.w);
+                case 'x': return ((int)Seg7Segments.x);
+                case 'y': return ((int)Seg7Segments.y);
+                case 'z': return ((int)Seg7Segments.z);
+
+                case 'A': return ((int)Seg7Segments.A);
+                case 'B': return ((int)Seg7Segments.B);
+                case 'C': return ((int)Seg7Segments.C);
+                case 'D': return ((int)Seg7Segments.D);
+                case 'E': return ((int)Seg7Segments.E);
+                case 'F': return ((int)Seg7Segments.F);
+                case 'G': return ((int)Seg7Segments.G);
+                case 'H': return ((int)Seg7Segments.H);
+                case 'I': return ((int)Seg7Segments.I);
+                case 'J': return ((int)Seg7Segments.J);
+                case 'K': return ((int)Seg7Segments.K);
+                case 'L': return ((int)Seg7Segments.L);
+                case 'M': return ((int)Seg7Segments.M);
+                case 'N': return ((int)Seg7Segments.N);
+                case 'O': return ((int)Seg7Segments.O);
+                case 'P': return ((int)Seg7Segments.P);
+                case 'Q': return ((int)Seg7Segments.Q);
+                case 'R': return ((int)Seg7Segments.R);
+                case 'S': return ((int)Seg7Segments.S);
+                case 'T': return ((int)Seg7Segments.T);
+                case 'U': return ((int)Seg7Segments.U);
+                case 'V': return ((int)Seg7Segments.V);
+                case 'W': return ((int)Seg7Segments.W);
+                case 'X': return ((int)Seg7Segments.X);
+                case 'Y': return ((int)Seg7Segments.Y);
+                case 'Z': return ((int)Seg7Segments.Z);
+
+                case ' ': return ((int)Seg7Segments.Space);
+                case '-': return ((int)Seg7Segments.Dash);
+                case '=': return ((int)Seg7Segments.Equals);
+                case '(': return ((int)Seg7Segments.LParen);
+                case '}': return ((int)Seg7Segments.RParen);
+                case '[': return ((int)Seg7Segments.LBracket);
+                case ']': return ((int)Seg7Segments.RBracket);
+                case '_': return ((int)Seg7Segments.Underline);
+
+                // Add callout code to get pattern
+
+                default: return ((int)Seg7Segments.None);
+            }
+        }
+
+        #endregion
+    }
+
+    #region Enums
+
+    #region Seg7Segments
+
+    // ReSharper disable InconsistentNaming
+
+    public enum Seg7Segments : int
+    {
+        None = 0x0,
+
+        Zero = 0x77,
+        One = 0x24,
+        Two = 0x5D,
+        Three = 0x6D,
+        Four = 0x2E,
+        Five = 0x6B,
+        Six = 0x7B,
+        Seven = 0x25,
+        Eight = 0x7F,
+        Nine = 0x6F,
+
+        a = 0x7D,
+        b = 0x7A,
+        c = 0x58,
+        d = 0x7C,
+        e = 0x5F,
+        f = 0x1B,
+        g = 0x6F,
+        h = 0x3A,
+        i = 0x51,
+        j = 0x61,
+        k = 0x3E,
+        l = 0x50,
+        m = 0x31,
+        n = 0x38,
+        o = 0x78,
+        p = 0x1F,
+        q = 0x2F,
+        r = 0x18,
+        s = 0x6B,
+        t = 0x5A,
+        u = 0x70,
+        v = 0x70,
+        w = 0x46,
+        x = 0x3E,
+        y = 0x6E,
+        z = 0x5D,
+
+        A = 0x3F,
+        B = 0x7F,
+        C = 0x53,
+        D = 0x77,
+        E = 0x5B,
+        F = 0x1B,
+        G = 0x73,
+        H = 0x3E,
+        I = 0x24,
+        J = 0x74,
+        K = 0x3E,
+        L = 0x52,
+        M = 0x31,
+        N = 0x38,
+        O = 0x77,
+        P = 0x1F,
+        Q = 0x2F,
+        R = 0x13,
+        S = 0x6B,
+        T = 0x13,
+        U = 0x76,
+        V = 0x76,
+        W = 0x46,
+        X = 0x3E,
+        Y = 0x6E,
+        Z = 0x5D,
+
+        Space = 0x00,
+        Dash = 0x08,
+        Equals = 0x48,
+        LParen = 0x63,
+        RParen = 0x65,
+        LBracket = 0x63,
+        RBracket = 0x65,
+        Underline = 0x40,
+    }
+
+    // ReSharper restore InconsistentNaming
+
+    #endregion
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeIndicator/StateIndicator.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeIndicator/StateIndicator.cs
new file mode 100644
index 00000000..9f6373aa
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeIndicator/StateIndicator.cs	
@@ -0,0 +1,797 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Drawing.Drawing2D;
+using System.Windows.Forms;
+
+namespace DevComponents.Instrumentation
+{
+    public class StateIndicator : GaugeIndicator
+    {
+        #region Private variables
+
+        private StateIndicatorStyle _Style;
+        private StateRangeCollection _Ranges;
+
+        private Image _Image;
+        private float _Angle;
+        private float _RoundRectangleArc;
+
+        private Color _TextColor;
+        private TextAlignment _TextAlignment;
+        private float _TextVerticalOffset;
+        private float _TextHorizontalOffset;
+
+        private Font _AbsFont;
+
+        #endregion
+
+        public StateIndicator()
+        {
+            InitIndicator();
+        }
+
+        #region InitIndicator
+
+        private void InitIndicator()
+        {
+            _Style = StateIndicatorStyle.Circular;
+
+            _RoundRectangleArc = .75f;
+
+            _TextColor = Color.Black;
+            _TextAlignment = TextAlignment.MiddleCenter;
+
+            BackColor.Color1 = Color.PaleGreen;
+            BackColor.Color2 = Color.DarkGreen;
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region Angle
+
+        /// <summary>
+        /// Gets or sets the amount to rotate the indicator, specified in degrees.
+        /// </summary>
+        [Browsable(true)]
+        [Category("Layout"), DefaultValue(0f)]
+        [Editor("DevComponents.Instrumentation.Design.AngleRangeValueEditor, DevComponents.Instrumentation.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=76cb4c6eb576bca5", typeof(UITypeEditor))]
+        [Description("Determines the amount to rotate the indicator, specified in degrees.")]
+        public float Angle
+        {
+            get { return (_Angle); }
+
+            set
+            {
+                if (_Angle != value)
+                {
+                    _Angle = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region Image
+
+        /// <summary>
+        /// Gets or sets the Image to use
+        /// </summary>
+        [Browsable(true), Category("Appearance"), DefaultValue(null)]
+        [Description("Indicates the Image to use.")]
+        public Image Image
+        {
+            get { return (_Image); }
+
+            set
+            {
+                if (_Image != value)
+                {
+                    _Image = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region Ranges
+
+        /// <summary>
+        /// Gets the collection of Ranges associated with the Indicator
+        /// </summary>
+        [Browsable(true), Category("Behavior")]
+        [Description("Indicates the collection of Ranges associated with the Indicator.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        [Editor("DevComponents.Instrumentation.Design.GaugeCollectionEditor, DevComponents.Instrumentation.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=76cb4c6eb576bca5", typeof(UITypeEditor))]
+        public StateRangeCollection Ranges
+        {
+            get
+            {
+                if (_Ranges == null)
+                {
+                    _Ranges = new StateRangeCollection();
+                    _Ranges.CollectionChanged += StateRanges_CollectionChanged;
+                }
+
+                return (_Ranges);
+            }
+
+            set
+            {
+                if (_Ranges != null)
+                    _Ranges.CollectionChanged -= StateRanges_CollectionChanged;
+
+                _Ranges = value;
+
+                if (_Ranges != null)
+                    _Ranges.CollectionChanged += StateRanges_CollectionChanged;
+
+                OnGaugeItemChanged(true);
+            }
+        }
+
+        #endregion
+
+        #region RoundRectangleArc
+
+        /// <summary>
+        /// Gets or sets the RoundRectangle corner radius,
+        /// measured as a percentage of the width/height.
+        /// </summary>
+        [Browsable(true)]
+        [Category("Appearance"), DefaultValue(.75f)]
+        [Description("Indicates the RoundRectangle corner radius, measured as a percentage of the width/height.")]
+        [Editor("DevComponents.Instrumentation.Design.WidthMaxRangeValueEditor, DevComponents.Instrumentation.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=76cb4c6eb576bca5", typeof(UITypeEditor))]
+        public float RoundRectangleArc
+        {
+            get { return (_RoundRectangleArc); }
+
+            set
+            {
+                if (_RoundRectangleArc != value)
+                {
+                    if (value < 0 || value > 1f)
+                        throw new ArgumentException("Radius must be between 0 and 1");
+
+                    _RoundRectangleArc = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region Style
+
+        /// <summary>
+        /// Gets or sets the Indicator Style
+        /// </summary>
+        [Browsable(true), Category("Behavior"), DefaultValue(StateIndicatorStyle.Circular)]
+        [Description("Indicates the Indicator Style.")]
+        public StateIndicatorStyle Style
+        {
+            get { return (_Style); }
+
+            set
+            {
+                if (_Style != value)
+                {
+                    _Style = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region TextAlignment
+
+        /// <summary>
+        /// Gets or sets the alignment of the text
+        /// </summary>
+        [Browsable(true)]
+        [Category("Layout"), DefaultValue(TextAlignment.MiddleCenter)]
+        [Description("Indicates the alignment of the text.")]
+        public TextAlignment TextAlignment
+        {
+            get { return (_TextAlignment); }
+
+            set
+            {
+                if (_TextAlignment != value)
+                {
+                    _TextAlignment = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region TextColor
+
+        /// <summary>
+        /// Gets or sets the text Color
+        /// </summary>
+        [Browsable(true), Category("Appearance"), DefaultValue(typeof(Color), "Black")]
+        [Description("Indicates the text Color.")]
+        public Color TextColor
+        {
+            get { return (_TextColor); }
+
+            set
+            {
+                if (_TextColor != value)
+                {
+                    _TextColor = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region TextHorizontalOffset
+
+        /// <summary>
+        /// Gets or sets the horizontal distance to offset the Indicator Text, measured as a percentage
+        /// </summary>
+        [Browsable(true)]
+        [Category("Layout"), DefaultValue(0f)]
+        [Editor("DevComponents.Instrumentation.Design.OffsetRangeValueEditor, DevComponents.Instrumentation.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=76cb4c6eb576bca5", typeof(UITypeEditor))]
+        [Description("Indicates the horizontal distance to offset the Indicator Text, measured as a percentage.")]
+        public float TextHorizontalOffset
+        {
+            get { return (_TextHorizontalOffset); }
+
+            set
+            {
+                if (_TextHorizontalOffset != value)
+                {
+                    _TextHorizontalOffset = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region TextVerticalOffset
+
+        /// <summary>
+        /// Gets or sets the vertical distance to offset the Indicator Text, measured as a percentage
+        /// </summary>
+        [Browsable(true)]
+        [Category("Layout"), DefaultValue(0f)]
+        [Editor("DevComponents.Instrumentation.Design.OffsetRangeValueEditor, DevComponents.Instrumentation.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=76cb4c6eb576bca5", typeof(UITypeEditor))]
+        [Description("Indicates the vertical distance to offset the Indicator Text, measured as a percentage.")]
+        public float TextVerticalOffset
+        {
+            get { return (_TextVerticalOffset); }
+
+            set
+            {
+                if (_TextVerticalOffset != value)
+                {
+                    _TextVerticalOffset = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region AbsFont
+
+        internal override Font AbsFont
+        {
+            get
+            {
+                if (AutoSize == false)
+                    return (Font);
+
+                if (_AbsFont == null)
+                {
+                    int n = Math.Min(Bounds.Width, Bounds.Height);
+
+                    float emSize = Font.SizeInPoints;
+                    emSize = (emSize / 40) * n;
+
+                    AbsFont = new Font(Font.FontFamily, emSize, Font.Style);
+                }
+
+                return (_AbsFont);
+            }
+
+            set
+            {
+                if (_AbsFont != null)
+                    _AbsFont.Dispose();
+
+                _AbsFont = value;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Event processing
+
+        #region StateRange processing
+
+        void StateRanges_CollectionChanged(object sender, EventArgs e)
+        {
+            foreach (StateRange range in _Ranges)
+            {
+                range.StateIndicator = this;
+
+                range.IndicatorRangeChanged -= StateRange_ItemChanged;
+                range.IndicatorRangeChanged += StateRange_ItemChanged;
+            }
+        }
+
+        void StateRange_ItemChanged(object sender, EventArgs e)
+        {
+            OnGaugeItemChanged(true);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RecalcLayout
+
+        public override void RecalcLayout()
+        {
+            if (NeedRecalcLayout == true)
+            {
+                Size size = Bounds.Size;
+                
+                base.RecalcLayout();
+
+                if (size.Equals(Bounds.Size) == false)
+                    AbsFont = null;
+            }
+        }
+
+        #endregion
+
+        #region OnPaint
+
+        #region OnPaint
+
+        public override void OnPaint(PaintEventArgs e)
+        {
+            Graphics g = e.Graphics;
+
+            RecalcLayout();
+
+            if (GaugeControl.OnPreRenderIndicator(e, this) == false)
+            {
+                InterpolationMode im = g.InterpolationMode;
+                g.InterpolationMode = InterpolationMode.HighQualityBicubic;
+
+                g.TranslateTransform(Center.X, Center.Y);
+                g.RotateTransform(_Angle % 360);
+
+                Rectangle r = new Rectangle(0, 0, Bounds.Width, Bounds.Height);
+
+                r.X -= Bounds.Width / 2;
+                r.Y -= Bounds.Height / 2;
+
+                StateRange range = GetStateRange();
+
+                DrawStateImage(g, r, range);
+                DrawStateText(g, r, range);
+
+                GaugeControl.OnPostRenderIndicator(e, this);
+
+                g.ResetTransform();
+
+                g.InterpolationMode = im;
+            }
+        }
+
+        #region GetStateRange
+
+        private StateRange GetStateRange()
+        {
+            return (_Ranges != null ? _Ranges.GetValueRange(DValue) : null);
+        }
+
+        #endregion
+
+        #region DrawStateImage
+
+        private void DrawStateImage(Graphics g, Rectangle r, StateRange range)
+        {
+            Image image = (range != null) ? range.Image : _Image;
+
+            if (image != null)
+            {
+                if (AutoSize == true)
+                {
+                    g.DrawImage(image, r);
+                }
+                else
+                {
+                    r.X += (r.Width - image.Width) / 2;
+                    r.Y += (r.Height - image.Height) / 2;
+
+                    g.DrawImageUnscaled(image, r);
+                }
+            }
+            else
+            {
+                GradientFillColor fillColor =
+                    (range != null) ? range.BackColor : BackColor;
+
+                using (GraphicsPath path = GetStatePath(r))
+                    RenderBackPath(g, path, r, fillColor);
+            }
+        }
+
+        #region GetStatePath
+
+        private GraphicsPath GetStatePath(Rectangle r)
+        {
+            switch (_Style)
+            {
+                case StateIndicatorStyle.Circular:
+                    return (GetCircularState(r));
+
+                case StateIndicatorStyle.Rectangular:
+                    return (GetRectState(r));
+
+                default:
+                    return (GetRoundRectState(r));
+            }
+        }
+
+        #endregion
+
+        #region GetCircularState
+
+        private GraphicsPath GetCircularState(Rectangle bounds)
+        {
+            GraphicsPath path = new GraphicsPath();
+
+            path.AddEllipse(bounds);
+
+            return (path);
+        }
+
+        #endregion
+
+        #region GetRectState
+
+        private GraphicsPath GetRectState(Rectangle bounds)
+        {
+            GraphicsPath path = new GraphicsPath();
+
+            path.AddRectangle(bounds);
+
+            return (path);
+        }
+
+        #endregion
+
+        #region GetRoundRectState
+
+        private GraphicsPath GetRoundRectState(Rectangle bounds)
+        {
+            GraphicsPath path = new GraphicsPath();
+
+            int m = Math.Min(bounds.Width, bounds.Height);
+            int n = (int)(m * _RoundRectangleArc) + 1;
+
+            Rectangle t = new Rectangle(bounds.Right - n, bounds.Bottom - n, n, n);
+            path.AddArc(t, 0, 90);
+
+            t.X = bounds.X;
+            path.AddArc(t, 90, 90);
+
+            t.Y = bounds.Y;
+            path.AddArc(t, 180, 90);
+
+            t.X = bounds.Right - n;
+            path.AddArc(t, 270, 90);
+
+            path.CloseAllFigures();
+
+            return (path);
+        }
+
+        #endregion
+
+        #region RenderBackPath
+
+        private void RenderBackPath(Graphics g,
+            GraphicsPath path, Rectangle bounds, GradientFillColor fillColor)
+        {
+            Rectangle r = bounds;
+            GradientFillType fillType = fillColor.GradientFillType;
+
+            if (fillColor.End.IsEmpty)
+            {
+                fillType = GradientFillType.None;
+            }
+            else
+            {
+                if (fillColor.GradientFillType == GradientFillType.Auto)
+                    fillType = GradientFillType.Center;
+            }
+
+            switch (fillType)
+            {
+                case GradientFillType.Angle:
+                    using (Brush br = fillColor.GetBrush(r))
+                    {
+                        if (br is LinearGradientBrush)
+                            ((LinearGradientBrush)br).WrapMode = WrapMode.TileFlipXY;
+
+                        g.FillPath(br, path);
+                    }
+                    break;
+
+                case GradientFillType.StartToEnd:
+                    using (Brush br = fillColor.GetBrush(r, 90))
+                    {
+                        if (br is LinearGradientBrush)
+                            ((LinearGradientBrush)br).WrapMode = WrapMode.TileFlipXY;
+
+                        g.FillPath(br, path);
+                    }
+                    break;
+
+                case GradientFillType.HorizontalCenter:
+                    r.Height /= 2;
+
+                    if (r.Height <= 0)
+                        r.Height = 1;
+
+                    using (LinearGradientBrush br = new
+                        LinearGradientBrush(r, fillColor.Start, fillColor.End, 90))
+                    {
+                        br.WrapMode = WrapMode.TileFlipXY;
+
+                        g.FillPath(br, path);
+                    }
+                    break;
+
+                case GradientFillType.VerticalCenter:
+                    r.Width /= 2;
+
+                    if (r.Width <= 0)
+                        r.Width = 1;
+
+                    using (LinearGradientBrush br = new
+                        LinearGradientBrush(r, fillColor.Start, fillColor.End, 0f))
+                    {
+                        br.WrapMode = WrapMode.TileFlipXY;
+
+                        g.FillPath(br, path);
+                    }
+                    break;
+
+                case GradientFillType.Center:
+                    using (PathGradientBrush br = new PathGradientBrush(path))
+                    {
+                        br.CenterPoint = new PointF(bounds.X + bounds.Width / 2, bounds.Y + bounds.Height / 2);
+                        br.CenterColor = fillColor.Start;
+                        br.SurroundColors = new Color[] { fillColor.End };
+
+                        g.FillPath(br, path);
+                    }
+                    break;
+
+                default:
+                    using (Brush br = new SolidBrush(fillColor.Start))
+                        g.FillPath(br, path);
+
+                    break;
+            }
+
+            if (fillColor.BorderWidth > 0 && fillColor.BorderColor.IsEmpty == false)
+            {
+                using (Pen pen = new Pen(fillColor.BorderColor, fillColor.BorderWidth))
+                    g.DrawPath(pen, path);
+            }
+            else
+            {
+                if (fillType == GradientFillType.Center)
+                {
+                    using (Pen pen = new Pen(fillColor.End))
+                        g.DrawPath(pen, path);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region DrawStateText
+
+        private void DrawStateText(Graphics g, Rectangle r, StateRange range)
+        {
+            string text = (range != null)
+                ? range.Text : GetOverrideString();
+
+            if (string.IsNullOrEmpty(text) == false)
+            {
+                using (StringFormat sf = new StringFormat())
+                {
+                    SetStringAlignment(sf);
+
+                    Color color = _TextColor;
+
+                    if (range != null)
+                    {
+                        color = range.TextColor;
+
+                        int dx = (int)(r.Width * range.TextHorizontalOffset);
+                        int dy = (int)(r.Height * range.TextVerticalOffset);
+
+                        r.Offset(dx, dy);
+                    }
+                    else
+                    {
+                        int dx = (int)(r.Width * _TextHorizontalOffset);
+                        int dy = (int)(r.Height * _TextVerticalOffset);
+
+                        r.Offset(dx, dy);
+                    }
+
+                    using (Brush br = new SolidBrush(color))
+                        g.DrawString(text, AbsFont, br, r, sf);
+                }
+            }
+        }
+
+        #region SetStringAlignment
+
+        private void SetStringAlignment(StringFormat sf)
+        {
+            switch (_TextAlignment)
+            {
+                case TextAlignment.TopLeft:
+                    sf.LineAlignment = StringAlignment.Near;
+                    sf.Alignment = StringAlignment.Near;
+                    break;
+
+                case TextAlignment.TopCenter:
+                    sf.LineAlignment = StringAlignment.Near;
+                    sf.Alignment = StringAlignment.Center;
+                    break;
+
+                case TextAlignment.TopRight:
+                    sf.LineAlignment = StringAlignment.Near;
+                    sf.Alignment = StringAlignment.Far;
+                    break;
+
+                case TextAlignment.MiddleLeft:
+                    sf.LineAlignment = StringAlignment.Center;
+                    sf.Alignment = StringAlignment.Near;
+                    break;
+
+                case TextAlignment.MiddleCenter:
+                    sf.LineAlignment = StringAlignment.Center;
+                    sf.Alignment = StringAlignment.Center;
+                    break;
+
+                case TextAlignment.MiddleRight:
+                    sf.LineAlignment = StringAlignment.Center;
+                    sf.Alignment = StringAlignment.Far;
+                    break;
+
+                case TextAlignment.BottomLeft:
+                    sf.LineAlignment = StringAlignment.Far;
+                    sf.Alignment = StringAlignment.Near;
+                    break;
+
+                case TextAlignment.BottomCenter:
+                    sf.LineAlignment = StringAlignment.Far;
+                    sf.Alignment = StringAlignment.Center;
+                    break;
+
+                case TextAlignment.BottomRight:
+                    sf.LineAlignment = StringAlignment.Far;
+                    sf.Alignment = StringAlignment.Far;
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region Refresh
+
+        internal void Refresh()
+        {
+            if (NeedRecalcLayout == false)
+                OnGaugeItemChanged(false);
+        }
+
+        #endregion
+
+        #region Contains
+
+        internal override bool Contains(Point pt)
+        {
+            using (GraphicsPath path = GetStatePath(Bounds))
+            {
+                Matrix matrix = new Matrix();
+                matrix.RotateAt(_Angle, Center);
+
+                path.Transform(matrix);
+
+                return (path.IsVisible(pt));
+            }
+        }
+
+        #endregion
+
+        #region CopyToItem
+
+        public override void CopyToItem(GaugeItem copy)
+        {
+            StateIndicator c = copy as StateIndicator;
+
+            if (c != null)
+            {
+                base.CopyToItem(c);
+
+                c.Angle = _Angle;
+                c.Image = _Image;
+
+                if (_Ranges != null)
+                    c.Ranges = (StateRangeCollection)_Ranges.Clone();
+
+                c.RoundRectangleArc = _RoundRectangleArc;
+                c.Style = _Style;
+                c.TextAlignment = _TextAlignment;
+                c.TextColor = _TextColor;
+                c.TextHorizontalOffset = _TextHorizontalOffset;
+                c.TextVerticalOffset = _TextVerticalOffset;
+            }
+        }
+
+        #endregion
+    }
+
+    #region Enums
+
+    public enum StateIndicatorStyle
+    {
+        Rectangular,
+        RoundedRectangular,
+        Circular
+    }
+
+    #endregion
+
+}
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeIndicator/StateRange.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeIndicator/StateRange.cs
new file mode 100644
index 00000000..8bd47525
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeIndicator/StateRange.cs	
@@ -0,0 +1,251 @@
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using DevComponents.Instrumentation.Primitives;
+
+namespace DevComponents.Instrumentation
+{
+    public class StateRangeCollection : GenericCollection<StateRange>
+    {
+        #region GetValueRange
+
+        public StateRange GetValueRange(double value)
+        {
+            foreach (StateRange range in this)
+            {
+                if (value >= range.StartValue && value <= range.EndValue)
+                    return (range);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region ICloneable Members
+
+        public override object Clone()
+        {
+            StateRangeCollection copy = new StateRangeCollection();
+
+            CopyToItem(copy);
+
+            return (copy);
+        }
+
+        #endregion
+
+        #region CopyToItem
+
+        internal void CopyToItem(StateRangeCollection copy)
+        {
+            foreach (StateRange item in this)
+            {
+                StateRange ic = new StateRange();
+
+                item.CopyToItem(ic);
+
+                copy.Add(ic);
+            }
+        }
+
+        #endregion
+    }
+
+    public class StateRange : IndicatorRange
+    {
+        #region Private variables
+
+        private Image _Image;
+        private StateIndicator _StateIndicator;
+
+        private string _Text;
+        private Color _TextColor;
+        private float _TextVerticalOffset;
+        private float _TextHorizontalOffset;
+
+        #endregion
+
+        public StateRange()
+        {
+            TextColor = Color.Black;
+        }
+
+        #region Public properties
+
+        #region Image
+
+        /// <summary>
+        /// Gets or sets the Image to use
+        /// </summary>
+        [Browsable(true), Category("Appearance"), DefaultValue(null)]
+        [Description("Indicates the Image to use.")]
+        public Image Image
+        {
+            get { return (_Image); }
+
+            set
+            {
+                if (_Image != value)
+                {
+                    _Image = value;
+
+                    OnIndicatorRangeChanged();
+                }
+            }
+        }
+
+        #endregion
+
+        #region StateIndicator
+
+        /// <summary>
+        /// Gets or sets the StateIndicator
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public StateIndicator StateIndicator
+        {
+            get { return (_StateIndicator); }
+            internal set { _StateIndicator = value; }
+        }
+
+        #endregion
+
+        #region Text
+
+        /// <summary>
+        /// Gets or sets the text to be displayed
+        /// </summary>
+        [Browsable(true), Category("Behavior"), DefaultValue(null)]
+        [Description("Indicates the text to be displayed.")]
+        public string Text
+        {
+            get { return (_Text); }
+
+            set
+            {
+                if (_Text != value)
+                {
+                    _Text = value;
+
+                    OnIndicatorRangeChanged();
+                }
+            }
+        }
+
+        #endregion
+
+        #region TextColor
+
+        /// <summary>
+        /// Gets or sets the text Color
+        /// </summary>
+        [Browsable(true), Category("Appearance"), DefaultValue(typeof(Color), "Black")]
+        [Description("Indicates the text Color.")]
+        public Color TextColor
+        {
+            get { return (_TextColor); }
+
+            set
+            {
+                if (_TextColor != value)
+                {
+                    _TextColor = value;
+
+                    OnIndicatorRangeChanged();
+                }
+            }
+        }
+
+        #endregion
+
+        #region TextHorizontalOffset
+
+        /// <summary>
+        /// Gets or sets the horizontal distance to offset the Indicator Text, measured as a percentage
+        /// </summary>
+        [Browsable(true)]
+        [Category("Layout"), DefaultValue(0f)]
+        [Editor("DevComponents.Instrumentation.Design.OffsetRangeValueEditor, DevComponents.Instrumentation.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=76cb4c6eb576bca5", typeof(UITypeEditor))]
+        [Description("Indicates the horizontal distance to offset the Indicator Text, measured as a percentage.")]
+        public float TextHorizontalOffset
+        {
+            get { return (_TextHorizontalOffset); }
+
+            set
+            {
+                if (_TextHorizontalOffset != value)
+                {
+                    _TextHorizontalOffset = value;
+
+                    OnIndicatorRangeChanged();
+                }
+            }
+        }
+
+        #endregion
+
+        #region TextVerticalOffset
+
+        /// <summary>
+        /// Gets or sets the vertical distance to offset the Indicator Text, measured as a percentage
+        /// </summary>
+        [Browsable(true)]
+        [Category("Layout"), DefaultValue(0f)]
+        [Editor("DevComponents.Instrumentation.Design.OffsetRangeValueEditor, DevComponents.Instrumentation.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=76cb4c6eb576bca5", typeof(UITypeEditor))]
+        [Description("Indicates the vertical distance to offset the Indicator Text, measured as a percentage.")]
+        public float TextVerticalOffset
+        {
+            get { return (_TextVerticalOffset); }
+
+            set
+            {
+                if (_TextVerticalOffset != value)
+                {
+                    _TextVerticalOffset = value;
+
+                    OnIndicatorRangeChanged();
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ICloneable Members
+
+        public override object Clone()
+        {
+            StateRange copy = new StateRange();
+
+            CopyToItem(copy);
+
+            return (copy);
+        }
+
+        #endregion
+
+        #region CopyToItem
+
+        public override void CopyToItem(GaugeItem copy)
+        {
+            StateRange c = copy as StateRange;
+
+            if (c != null)
+            {
+                base.CopyToItem(c);
+
+                c.Image = _Image;
+                c.Text = _Text;
+                c.TextColor = _TextColor;
+                c.TextHorizontalOffset = _TextHorizontalOffset;
+                c.TextVerticalOffset = _TextVerticalOffset;
+            }
+        }
+
+        #endregion
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeItem/GaugeImage.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeItem/GaugeImage.cs
new file mode 100644
index 00000000..0c11cdfe
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeItem/GaugeImage.cs	
@@ -0,0 +1,394 @@
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Drawing.Drawing2D;
+using System.Windows.Forms;
+using DevComponents.Instrumentation.Primitives;
+
+namespace DevComponents.Instrumentation
+{
+    /// <summary>
+    /// Collection of GaugeImages
+    /// </summary>
+    public class GaugeImageCollection : GenericCollection<GaugeImage>
+    {
+    }
+
+    public class GaugeImage : GaugeItem
+    {
+        #region Private variables
+
+        private Image _Image;
+
+        private SizeF _Size;
+        private PointF _Location;
+        private float _Angle;
+
+        private bool _AutoFit;
+
+        private Rectangle _Bounds;
+        private Point _Center;
+
+        private bool _UnderScale;
+
+        private GaugeControl _GaugeControl;
+
+        #endregion
+
+        public GaugeImage(GaugeControl gaugeControl)
+            : this()
+        {
+            _GaugeControl = gaugeControl;
+
+            InitGagueImage();
+        }
+
+        public GaugeImage()
+        {
+            InitGagueImage();
+        }
+
+        #region InitGagueImage
+
+        private void InitGagueImage()
+        {
+            _Size = new SizeF(.1f, .1f);
+            _Location = new PointF(.3f, .5f);
+
+            _UnderScale = true;
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region Angle
+
+        /// <summary>
+        /// Gets or sets the amount to rotate the image, specified in degrees
+        /// </summary>
+        [Browsable(true)]
+        [Category("Layout"), DefaultValue(0f)]
+        [Editor("DevComponents.Instrumentation.Design.AngleRangeValueEditor, DevComponents.Instrumentation.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=76cb4c6eb576bca5", typeof(UITypeEditor))]
+        [Description("Determines the amount to rotate the image, specified in degrees.")]
+        public float Angle
+        {
+            get { return (_Angle); }
+
+            set
+            {
+                if (_Angle != value)
+                {
+                    _Angle = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region AutoFit
+
+        /// <summary>
+        /// Gets or sets whether the image will be stretched to fit the given area
+        /// </summary>
+        [Browsable(true)]
+        [Category("Layout"), DefaultValue(false)]
+        [Editor("DevComponents.Instrumentation.Design.AngleRangeValueEditor, DevComponents.Instrumentation.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=76cb4c6eb576bca5", typeof(UITypeEditor))]
+        [Description("Determines whether the image will be stretched to fit the given area.")]
+        public bool AutoFit
+        {
+            get { return (_AutoFit); }
+
+            set
+            {
+                if (_AutoFit != value)
+                {
+                    _AutoFit = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region Image
+
+        /// <summary>
+        /// Gets or sets the Image to be displayed
+        /// </summary>
+        [Browsable(true), Category("Appearance"), DefaultValue(null)]
+        [Description("Indicates the Image to be displayed.")]
+        public Image Image
+        {
+            get { return (_Image); }
+
+            set
+            {
+                if (_Image != value)
+                {
+                    _Image = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region Location
+
+        /// <summary>
+        /// Gets or sets the location of the image area, specified as a percentage
+        /// </summary>
+        [Browsable(true), Category("Layout")]
+        [Editor("DevComponents.Instrumentation.Design.LocationEditor, DevComponents.Instrumentation.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=76cb4c6eb576bca5", typeof(UITypeEditor))]
+        [Description("Indicates the location of the image area, specified as a percentage.")]
+        [TypeConverter(typeof(PointFConverter))]
+        public PointF Location
+        {
+            get { return (_Location); }
+
+            set
+            {
+                if (_Location != value)
+                {
+                    _Location = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeLocation()
+        {
+            return (_Location.X != .3f || _Location.Y != .5f);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetLocation()
+        {
+            _Location = new PointF(.3f, .5f);
+        }
+
+        #endregion
+
+        #region Size
+
+        /// <summary>
+        /// Gets or sets the size of the image, specified as a percentage
+        /// </summary>
+        [Browsable(true), Category("Layout")]
+        [Editor("DevComponents.Instrumentation.Design.SizeEditor, DevComponents.Instrumentation.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=76cb4c6eb576bca5", typeof(UITypeEditor))]
+        [Description("Determines the size of the image, specified as a percentage.")]
+        public SizeF Size
+        {
+            get { return (_Size); }
+
+            set
+            {
+                if (_Size != value)
+                {
+                    _Size = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeSize()
+        {
+            return (_Size.Width != .2f || _Size.Height != .2f);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetSize()
+        {
+            _Size = new SizeF(.2f, .2f);
+        }
+
+        #endregion
+
+        #region UnderScale
+
+        /// <summary>
+        /// Gets or sets whether the image is displayed under the scale
+        /// </summary>
+        [Browsable(true)]
+        [Category("Layout"), DefaultValue(true)]
+        [Editor("DevComponents.Instrumentation.Design.AngleRangeValueEditor, DevComponents.Instrumentation.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=76cb4c6eb576bca5", typeof(UITypeEditor))]
+        [Description("Indicates whether the image is displayed under the scale.")]
+        public bool UnderScale
+        {
+            get { return (_UnderScale); }
+
+            set
+            {
+                if (_UnderScale != value)
+                {
+                    _UnderScale = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region Bounds
+
+        internal Rectangle Bounds
+        {
+            get { return (_Bounds); }
+            set { _Bounds = value; }
+        }
+
+        #endregion
+
+        #region GaugeControl
+
+        internal GaugeControl GaugeControl
+        {
+            get { return (_GaugeControl); }
+            set { _GaugeControl = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RecalcLayout
+
+        public override void RecalcLayout()
+        {
+            if (NeedRecalcLayout == true)
+            {
+                base.RecalcLayout();
+
+                bool autoCenter = _GaugeControl.Frame.AutoCenter;
+                Size size = _GaugeControl.GetAbsSize(_Size, autoCenter);
+
+                _Center = _GaugeControl.GetAbsPoint(_Location, autoCenter);
+
+                _Bounds = new Rectangle(
+                    _Center.X - size.Width / 2, _Center.Y - size.Height / 2,
+                    size.Width, size.Height);
+            }
+        }
+
+        #endregion
+
+        #region OnPaint
+
+        public override void OnPaint(PaintEventArgs e)
+        {
+            RecalcLayout();
+
+            Graphics g = e.Graphics;
+
+            if (_Bounds.Width > 0 && _Bounds.Height > 0)
+            {
+                g.TranslateTransform(_Center.X, _Center.Y);
+                g.RotateTransform(_Angle % 360);
+
+                Rectangle r = new Rectangle(0, 0, _Bounds.Width, _Bounds.Height);
+
+                r.X -= _Bounds.Width / 2;
+                r.Y -= _Bounds.Height / 2;
+
+                if (Image != null)
+                {
+                    if (_AutoFit == false)
+                    {
+                        r = new Rectangle(0, 0, _Image.Width, _Image.Height);
+
+                        r.X -= _Image.Width / 2;
+                        r.Y -= _Image.Height / 2;
+                    }
+
+                    g.DrawImage(_Image, r);
+                }
+                else
+                {
+                    g.FillRectangle(Brushes.White, r);
+
+                    g.DrawLine(Pens.Red, new Point(r.X, r.Y), new Point(r.Right, r.Bottom));
+                    g.DrawLine(Pens.Red, new Point(r.X, r.Bottom), new Point(r.Right, r.Y));
+
+                    g.DrawRectangle(Pens.Black, r);
+                }
+
+                g.ResetTransform();
+            }
+        }
+
+        #endregion
+
+        #region Contains
+
+        internal bool Contains(Point pt)
+        {
+            if (Angle == 0)
+            {
+                return (_Bounds.Contains(pt));
+            }
+
+            using (GraphicsPath path = new GraphicsPath())
+            {
+                path.AddRectangle(Bounds);
+
+                Matrix matrix = new Matrix();
+                matrix.RotateAt(_Angle, _Center);
+
+                path.Transform(matrix);
+
+                return (path.IsVisible(pt));
+            }
+        }
+
+        #endregion
+
+        #region ICloneable Members
+
+        public override object Clone()
+        {
+            GaugeImage copy = new GaugeImage();
+
+            CopyToItem(copy);
+
+            return (copy);
+        }
+
+        #endregion
+
+        #region CopyToItem
+
+        public override void CopyToItem(GaugeItem copy)
+        {
+            GaugeImage c = copy as GaugeImage;
+
+            if (c != null)
+            {
+                base.CopyToItem(c);
+
+                c.Angle = _Angle;
+                c.AutoFit = _AutoFit;
+                c.Image = _Image;
+                c.Location = _Location;
+                c.Size = _Size;
+                c.UnderScale = _UnderScale;
+            }
+        }
+
+        #endregion
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeItem/GaugeItem.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeItem/GaugeItem.cs
new file mode 100644
index 00000000..7c081e1f
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeItem/GaugeItem.cs	
@@ -0,0 +1,366 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Windows.Forms;
+using DevComponents.Instrumentation.Primitives;
+
+namespace DevComponents.Instrumentation
+{
+    public class GaugeItemCollection : GenericCollection<GaugeItem>
+    {
+    }
+
+    public class GaugeItem : IDisposable, ICloneable
+    {
+        #region Events
+
+        public event EventHandler<EventArgs> GaugeItemChanged;
+
+        #endregion
+
+        #region Private variables
+
+        private string _Name;
+        private string _Tooltip;
+
+        private object _Tag;
+
+        private bool _NeedRecalcLayout;
+        private bool _Visible;
+
+        #endregion
+
+        public GaugeItem()
+        {
+            _NeedRecalcLayout = true;
+            _Visible = true;
+        }
+
+        #region Public properties
+
+        #region Name
+
+        /// <summary>
+        /// Gets or sets the Name associated with the item
+        /// </summary>
+        [Browsable(true), Category("Misc."), DefaultValue(null)]
+        [Description("Indicates the Name associated with the item.")]
+        [ParenthesizePropertyName(true)]
+        public string Name
+        {
+            get { return (_Name); }
+            set { _Name = value; }
+        }
+
+        #endregion
+
+        #region Tag
+
+        /// <summary>
+        /// Gets or sets the user defined Tag associated with the item
+        /// </summary>
+        [Browsable(false), DefaultValue(0)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public object Tag
+        {
+            get { return (_Tag); }
+            set { _Tag = value; }
+        }
+
+        #endregion
+
+        #region Tooltip
+
+        /// <summary>
+        /// Gets or sets the Tooltip associated with the item
+        /// </summary>
+        [Browsable(true), Category("Appearance"), DefaultValue(null)]
+        [Description("Indicates the Tooltip associated with the item.")]
+        public string Tooltip
+        {
+            get { return (_Tooltip); }
+            set { _Tooltip = value; }
+        }
+
+        #endregion
+
+        #region Visible
+
+        /// <summary>
+        /// Gets or sets the item Visibility state.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), DefaultValue(true)]
+        [Description("Indicates the item Visibility state.")]
+        [ParenthesizePropertyName(true)]
+        public virtual bool Visible
+        {
+            get { return (_Visible); }
+
+            set
+            {
+                if (_Visible != value)
+                {
+                    _Visible = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region NeedRecalcLayout
+
+        internal virtual bool NeedRecalcLayout
+        {
+            get { return (_NeedRecalcLayout); }
+            set { _NeedRecalcLayout = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RecalcLayout
+
+        public virtual void RecalcLayout()
+        {
+            _NeedRecalcLayout = false;
+        }
+
+        #endregion
+
+        #region PerformLayout
+
+        /// <summary>
+        /// Causes the item to recalculate its layout
+        /// </summary>
+        public virtual void PerformLayout()
+        {
+            _NeedRecalcLayout = true;
+
+            RecalcLayout();
+        }
+
+        #endregion
+
+        #region OnPaint
+
+        public virtual void OnPaint(PaintEventArgs e)
+        {
+            if (_NeedRecalcLayout == true)
+                RecalcLayout();
+        }
+
+        #endregion
+
+        #region OnGaugeItemChanged
+
+        protected virtual void OnGaugeItemChanged()
+        {
+            if (GaugeItemChanged != null)
+                GaugeItemChanged(this, EventArgs.Empty);
+        }
+
+        protected virtual void OnGaugeItemChanged(bool recalc)
+        {
+            if (recalc == true)
+                NeedRecalcLayout = true;
+
+            if (GaugeItemChanged != null)
+                GaugeItemChanged(this, EventArgs.Empty);
+        }
+
+        #endregion
+
+        #region FindItem
+
+        internal virtual GaugeItem FindItem(Point pt)
+        {
+            return (null);
+        }
+
+        #endregion
+
+        #region OnMouseMove
+
+        internal virtual void OnMouseMove(MouseEventArgs e, bool mouseDown)
+        {
+        }
+
+        #endregion
+
+        #region OnMouseEnter
+
+        internal virtual void OnMouseEnter()
+        {
+        }
+
+        #endregion
+
+        #region OnMouseLeave
+
+        internal virtual void OnMouseLeave()
+        {
+        }
+
+        #endregion
+
+        #region OnMouseDown
+
+        internal virtual void OnMouseDown(MouseEventArgs e)
+        {
+        }
+
+        #endregion
+
+        #region OnMouseUp
+
+        internal virtual void OnMouseUp(MouseEventArgs e)
+        {
+        }
+
+        #endregion
+
+        #region GetDisplayTemplateText
+
+        internal string GetitemTemplateText(GaugeControl gauge)
+        {
+            string s = _Tooltip;
+
+            if (String.IsNullOrEmpty(s) == true)
+                return (s);
+
+            Regex r = new Regex(
+                @"\[(?<key>[^\{\]]+)" +
+                @"(\{(?<data>[^\}\]]+)\})*" +
+                @"\]");
+
+            MatchCollection mc = r.Matches(s);
+
+            if (mc.Count <= 0)
+                return (s);
+
+            int index = 0;
+            StringBuilder sb = new StringBuilder();
+
+            for (int i = 0; i < mc.Count; i++)
+            {
+                Match ma = mc[i];
+
+                if (ma.Index > index)
+                    sb.Append(s.Substring(index, ma.Index - index));
+
+                string t1 = mc[i].Groups["key"].Value;
+                string t2 = mc[i].Groups["data"].Value;
+
+                ProcessTemplateText(gauge, sb, t1, t2);
+
+                index = ma.Index + ma.Length;
+            }
+
+            if (s.Length > index)
+                sb.Append(s.Substring(index));
+
+            return (sb.ToString());
+        }
+
+        #endregion
+
+        #region AppendTemplateText
+
+        protected virtual void ProcessTemplateText(
+            GaugeControl gauge, StringBuilder sb, string key, string data)
+        {
+            switch (key)
+            {
+                case "Name":
+                    sb.Append(string.IsNullOrEmpty(data)
+                        ? _Name
+                        : String.Format("{0:" + data + "}", _Name));
+                    break;
+
+                case "Tag":
+                    sb.Append(string.IsNullOrEmpty(data)
+                        ? Tag.ToString()
+                        : String.Format("{0:" + data + "}", Tag));
+                    break;
+
+                default:
+                    sb.Append(gauge.OnGetDisplayTemplateText(this, key, data));
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region IDisposable Members
+
+        public void Dispose()
+        {
+            OnDispose();
+        }
+
+        protected virtual void OnDispose()
+        {
+        }
+
+        #endregion
+
+        #region ICloneable Members
+
+        public virtual object Clone()
+        {
+            GaugeItem copy = new GaugeItem();
+
+            CopyToItem(copy);
+
+            return (copy);
+        }
+
+        #endregion
+
+        #region CopyToItem
+
+        public virtual void CopyToItem(GaugeItem copy)
+        {
+            copy.Name = _Name;
+            copy.Tag = _Tag;
+            copy.Tooltip = _Tooltip;
+            copy.Visible = _Visible;
+        }
+
+        #endregion
+    }
+
+    #region Enums
+
+    public enum DisplayPlacement
+    {
+        Near,
+        Center,
+        Far
+    }
+
+    public enum DisplayLevel
+    {
+        Top,
+        Bottom
+    }
+
+    public enum ColorSourceFillEntry
+    {
+        MajorTickMark,
+        MinorTickMark,
+        Pointer,
+        Cap
+    }
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeItem/GaugeMarker.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeItem/GaugeMarker.cs
new file mode 100644
index 00000000..8ef23a69
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeItem/GaugeMarker.cs	
@@ -0,0 +1,521 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+
+namespace DevComponents.Instrumentation
+{
+    internal class GaugeMarker : IDisposable
+    {
+        #region Private variables
+
+        private List<BitmapEntry> _Bitmaps;
+
+        #endregion
+
+        public GaugeMarker()
+        {
+            _Bitmaps = new List<BitmapEntry>();
+        }
+
+        #region Clear
+
+        public void Clear()
+        {
+            foreach (BitmapEntry entry in _Bitmaps)
+                entry.Bitmap.Dispose();
+
+            _Bitmaps.Clear();
+        }
+
+        #endregion
+
+        #region FindBitmap
+
+        public Bitmap FindBitmap(GradientFillColor fillColor)
+        {
+            foreach (BitmapEntry entry in _Bitmaps)
+            {
+                if (entry.FillColor.IsEqualTo(fillColor) == true)
+                    return (entry.Bitmap);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetMarkerBitmap
+
+        public Bitmap GetMarkerBitmap(Graphics g,
+            GaugeMarkerStyle style, GradientFillColor fillColor, int width, int length)
+        {
+            Bitmap bitmap = FindBitmap(fillColor);
+
+            if (bitmap == null)
+            {
+                width = Math.Max(width, 3);
+                length = Math.Max(length, 3);
+
+                bitmap = new Bitmap(width, length, g);
+
+                _Bitmaps.Add(new BitmapEntry(fillColor, bitmap));
+
+                using (Graphics gBmp = Graphics.FromImage(bitmap))
+                {
+                    gBmp.SmoothingMode = SmoothingMode.AntiAlias;
+
+                    Rectangle r = new Rectangle();
+                    r.Height = length;
+                    r.Width = width;
+
+                    using (GraphicsPath path = GetMarkerPath(style, r))
+                        FillMarkerPath(gBmp, path, r, style, fillColor);
+                }
+            }
+
+            return (bitmap);
+        }
+
+        #endregion
+
+        #region FillMarkerPath
+
+        internal void FillMarkerPath(Graphics g, GraphicsPath path,
+            Rectangle r, GaugeMarkerStyle style, GradientFillColor fillColor)
+        {
+            GradientFillType fillType = GetMarkerFillType(style, fillColor);
+
+            switch (fillType)
+            {
+                case GradientFillType.Angle:
+                    using (Brush br = fillColor.GetBrush(r))
+                    {
+                        if (br is LinearGradientBrush)
+                            ((LinearGradientBrush)br).WrapMode = WrapMode.TileFlipXY;
+
+                        g.FillPath(br, path);
+                    }
+                    break;
+
+                case GradientFillType.StartToEnd:
+                    using (Brush br = fillColor.GetBrush(r, 90))
+                    {
+                        if (br is LinearGradientBrush)
+                            ((LinearGradientBrush)br).WrapMode = WrapMode.TileFlipXY;
+
+                        g.FillPath(br, path);
+                    }
+                    break;
+
+                case GradientFillType.HorizontalCenter:
+                    r.Height /= 2;
+
+                    if (r.Height <= 0)
+                        r.Height = 1;
+
+                    using (LinearGradientBrush br = new
+                        LinearGradientBrush(r, fillColor.Start, fillColor.End, 90))
+                    {
+                        br.WrapMode = WrapMode.TileFlipXY;
+
+                        g.FillPath(br, path);
+                    }
+                    break;
+
+                case GradientFillType.VerticalCenter:
+                    r.Width /= 2;
+
+                    if (r.Width <= 0)
+                        r.Width = 1;
+
+                    using (LinearGradientBrush br = new
+                        LinearGradientBrush(r, fillColor.Start, fillColor.End, 0f))
+                    {
+                        br.WrapMode = WrapMode.TileFlipXY;
+
+                        g.FillPath(br, path);
+                    }
+                    break;
+
+                case GradientFillType.Center:
+                    using (PathGradientBrush br = new PathGradientBrush(path))
+                    {
+                        br.CenterColor = fillColor.Start;
+                        br.SurroundColors = new Color[] { fillColor.End };
+
+                        g.FillPath(br, path);
+                    }
+                    break;
+
+                default:
+                    using (Brush br = new SolidBrush(fillColor.Start))
+                        g.FillPath(br, path);
+
+                    break;
+            }
+
+            if (fillColor.BorderWidth > 0)
+            {
+                using (Pen pen = new Pen(fillColor.BorderColor, fillColor.BorderWidth))
+                {
+                    pen.Alignment = PenAlignment.Inset;
+
+                    g.DrawPath(pen, path);
+                }
+            }
+        }
+
+        #endregion
+
+        #region GetMarkerFillType
+
+        private GradientFillType GetMarkerFillType(GaugeMarkerStyle style, GradientFillColor fillColor)
+        {
+            if (fillColor.End.IsEmpty == true)
+                return (GradientFillType.None);
+
+            if (fillColor.GradientFillType == GradientFillType.Auto)
+            {
+                switch (style)
+                {
+                    case GaugeMarkerStyle.Circle:
+                    case GaugeMarkerStyle.Star5:
+                    case GaugeMarkerStyle.Star7:
+                        return (GradientFillType.Center);
+
+                    default:
+                        return (GradientFillType.VerticalCenter);
+                }
+            }
+
+            return (fillColor.GradientFillType);
+        }
+
+        #endregion
+
+        #region GetMarkerPath
+
+        internal GraphicsPath GetMarkerPath(GaugeMarkerStyle style, Rectangle r)
+        {
+            r.Inflate(-1, -1);
+
+            if (r.Width > 0 && r.Height > 0)
+            {
+                switch (style)
+                {
+                    case GaugeMarkerStyle.Circle:
+                        return (GetCirclePath(r));
+
+                    case GaugeMarkerStyle.Diamond:
+                        return (GetDiamondPath(r));
+
+                    case GaugeMarkerStyle.Hexagon:
+                        return (GetPolygonPath(r, 6, 90));
+
+                    case GaugeMarkerStyle.Pentagon:
+                        return (GetPolygonPath(r, 5, 90));
+
+                    case GaugeMarkerStyle.Rectangle:
+                        return (GetRectanglePath(r));
+
+                    case GaugeMarkerStyle.Star5:
+                        return (GetStarPath(r, 5));
+
+                    case GaugeMarkerStyle.Star7:
+                        return (GetStarPath(r, 7));
+
+                    case GaugeMarkerStyle.Trapezoid:
+                        return (GetTrapezoidPath(r));
+
+                    case GaugeMarkerStyle.Triangle:
+                        return (GetTrianglePath(r));
+
+                    case GaugeMarkerStyle.Wedge:
+                        return (GetWedgePath(r));
+
+                    default:
+                        return (GetRectanglePath(r));
+                }
+            }
+
+            return (null);
+        }
+
+        #region GetCirclePath
+
+        private GraphicsPath GetCirclePath(Rectangle r)
+        {
+            GraphicsPath path = new GraphicsPath();
+
+            path.AddEllipse(r);
+
+            return (path);
+        }
+
+        #endregion
+
+        #region GetDiamondPath
+
+        private GraphicsPath GetDiamondPath(Rectangle r)
+        {
+            GraphicsPath path = new GraphicsPath();
+
+            int dx = r.Width / 2;
+            int dy = r.Height / 2;
+
+            Point[] pts = {
+                new Point(r.Left + dx, r.Top), 
+                new Point(r.Right, r.Top + dy),
+                new Point(r.Left + dx, r.Bottom),
+                new Point(r.Left, r.Top + dy),
+            };
+
+            path.AddPolygon(pts);
+
+            path.CloseAllFigures();
+
+            return (path);
+        }
+
+        #endregion
+
+        #region GetPolygonPath
+
+        private GraphicsPath GetPolygonPath(Rectangle r, int sides, float angle)
+        {
+            GraphicsPath path = new GraphicsPath();
+
+            double dx = (double)r.Width / 2;
+            double radians = GetRadians(angle);
+            double delta = GetRadians((float)360 / sides);
+
+            Point[] pts = new Point[sides];
+
+            for (int i = 0; i < sides; i++)
+            {
+                pts[i] = new Point(
+                  (int)(dx * Math.Cos(radians) + dx + r.X),
+                  (int)(dx * Math.Sin(radians) + dx + r.Y));
+
+                radians += delta;
+            }
+
+            path.AddPolygon(pts);
+
+            path.CloseAllFigures();
+
+            return (path);
+        }
+
+        #endregion
+
+        #region GetRectanglePath
+
+        private GraphicsPath GetRectanglePath(Rectangle r)
+        {
+            GraphicsPath path = new GraphicsPath();
+
+            path.AddRectangle(r);
+
+            return (path);
+        }
+
+        #endregion
+
+        #region GetStarPath
+
+        private GraphicsPath GetStarPath(Rectangle r, int points)
+        {
+            GraphicsPath path = new GraphicsPath();
+
+            PointF[] pts = new PointF[2 * points];
+
+            double rx1 = r.Width / 2;
+            double ry1 = r.Height / 2;
+
+            if (rx1 < 2)
+                rx1 = 2;
+
+            if (ry1 < 2)
+                ry1 = 2;
+
+            double rx2 = rx1 / 2;
+            double ry2 = ry1 / 2;
+
+            double cx = r.X + rx1;
+            double cy = r.Y + ry1;
+
+            double theta = GetRadians(90);
+            double dtheta = Math.PI / points;
+
+            for (int i = 0; i < 2 * points; i += 2)
+            {
+                pts[i] = new PointF(
+                    (float)(cx + rx1 * Math.Cos(theta)),
+                    (float)(cy + ry1 * Math.Sin(theta)));
+
+                theta += dtheta;
+
+                pts[i + 1] = new PointF(
+                    (float)(cx + rx2 * Math.Cos(theta)),
+                    (float)(cy + ry2 * Math.Sin(theta)));
+
+                theta += dtheta;
+            }
+
+            path.AddPolygon(pts);
+
+            path.CloseAllFigures();
+
+            return (path);
+        }
+
+        #endregion
+
+        #region GetTrianglePath
+
+        private GraphicsPath GetTrianglePath(Rectangle r)
+        {
+            GraphicsPath path = new GraphicsPath();
+
+            int dx = r.Width / 2;
+
+            Point[] pts = {
+                new Point(r.Left, r.Top), 
+                new Point(r.Right, r.Top),
+                new Point(r.Left + dx, r.Bottom),
+            };
+
+            path.AddPolygon(pts);
+
+            path.CloseAllFigures();
+
+            return (path);
+        }
+
+        #endregion
+
+        #region GetTrapezoidPath
+
+        private GraphicsPath GetTrapezoidPath(Rectangle r)
+        {
+            GraphicsPath path = new GraphicsPath();
+
+            int dx = (int)(r.Width * .28f);
+
+            if (dx <= 0)
+                dx = 1;
+
+            Point[] pts = {
+                new Point(r.Left, r.Top), 
+                new Point(r.Right, r.Top),
+                new Point(r.Right - dx, r.Bottom),
+                new Point(r.Left + dx, r.Bottom),
+            };
+
+            path.AddPolygon(pts);
+
+            path.CloseAllFigures();
+
+            return (path);
+        }
+
+        #endregion
+
+        #region GetWedgePath
+
+        private GraphicsPath GetWedgePath(Rectangle r)
+        {
+            GraphicsPath path = new GraphicsPath();
+
+            int dx = r.Width / 2;
+
+            if ((r.Width % 2) == 1)
+                dx++;
+
+            if (dx <= 0)
+                dx = 1;
+
+            int dy = (int)Math.Sqrt((r.Width * r.Width) - (dx * dx));
+
+            int y = Math.Max(r.Y, r.Bottom - dy);
+
+            Point[] pts = {
+                new Point(r.X, r.Top), 
+                new Point(r.Right, r.Top),
+                new Point(r.Right, y),
+                new Point(r.X + dx, r.Bottom),
+                new Point(r.X, y)
+            };
+
+            path.AddPolygon(pts);
+
+            path.CloseAllFigures();
+
+            return (path);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetRadians
+
+        /// <summary>
+        /// Converts Degrees to Radians
+        /// </summary>
+        /// <param name="theta">Degrees</param>
+        /// <returns>Radians</returns>
+        internal double GetRadians(float theta)
+        {
+            return (theta * Math.PI / 180);
+        }
+
+        #endregion
+
+        #region BitmapEntry
+
+        private class BitmapEntry
+        {
+            public GradientFillColor FillColor;
+            public Bitmap Bitmap;
+
+            public BitmapEntry(GradientFillColor fillColor, Bitmap bitmap)
+            {
+                FillColor = (GradientFillColor)fillColor.Clone();
+                Bitmap = bitmap;
+            }
+        }
+
+        #endregion
+
+        #region IDisposable Members
+
+        public void Dispose()
+        {
+            Clear();
+        }
+
+        #endregion
+    }
+
+    #region Enums
+
+    public enum GaugeMarkerStyle
+    {
+        Circle,
+        Diamond,
+        Hexagon,
+        Pentagon,
+        Rectangle,
+        Star5,
+        Star7,
+        Trapezoid,
+        Triangle,
+        Wedge,
+        None
+    }
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeItem/GaugeText.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeItem/GaugeText.cs
new file mode 100644
index 00000000..34129bf8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeItem/GaugeText.cs	
@@ -0,0 +1,757 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Drawing.Drawing2D;
+using System.Windows.Forms;
+using DevComponents.Instrumentation.Primitives;
+
+namespace DevComponents.Instrumentation
+{
+    /// <summary>
+    /// Collection of GaugeText items
+    /// </summary>
+    public class GaugeTextCollection : GenericCollection<GaugeText>
+    {
+    }
+
+    public class GaugeText : GaugeItem
+    {
+        #region Private variables
+
+        private string _Text;
+
+        private SizeF _Size;
+        private PointF _Location;
+        private float _Angle;
+
+        private Font _Font;
+        private Font _AbsFont;
+
+        private bool _AutoSize;
+
+        private TextAlignment _TextAlignment;
+
+        private Color _ForeColor;
+        private GradientFillColor _BackColor;
+
+        private Rectangle _Bounds;
+        private Point _Center;
+
+        private bool _UnderScale;
+
+        private GaugeControl _GaugeControl;
+
+        #endregion
+
+        public GaugeText(GaugeControl gaugeControl)
+            : this()
+        {
+            _GaugeControl = gaugeControl;
+
+            InitGaugeText();
+        }
+
+        public GaugeText()
+        {
+            InitGaugeText();
+        }
+
+        #region InitGagueText
+
+        private void InitGaugeText()
+        {
+            _Text = "Text";
+
+            BackColor.BorderColor = Color.Black;
+
+            _ForeColor = Color.Black;
+
+            _Size = new SizeF(.2f, .2f);
+            _Location = new PointF(.3f, .5f);
+
+            _AutoSize = true;
+            _TextAlignment = TextAlignment.MiddleCenter;
+
+            _UnderScale = true;
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region Angle
+
+        /// <summary>
+        /// Gets or sets the amount to rotate the text, specified in degrees.
+        /// </summary>
+        [Browsable(true)]
+        [Category("Layout"), DefaultValue(0f)]
+        [Editor("DevComponents.Instrumentation.Design.AngleRangeValueEditor, DevComponents.Instrumentation.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=76cb4c6eb576bca5", typeof(UITypeEditor))]
+        [Description("Determines the amount to rotate the text, specified in degrees.")]
+        public float Angle
+        {
+            get { return (_Angle); }
+
+            set
+            {
+                if (_Angle != value)
+                {
+                    _Angle = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region AutoSize
+
+        /// <summary>
+        /// Gets or sets whether the text Font size is auto sized
+        /// </summary>
+        [Browsable(true)]
+        [Category("Layout"), DefaultValue(true)]
+        [Editor("DevComponents.Instrumentation.Design.AngleRangeValueEditor, DevComponents.Instrumentation.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=76cb4c6eb576bca5", typeof(UITypeEditor))]
+        [Description("Indicates whether the text Font size is auto sized.")]
+        public bool AutoSize
+        {
+            get { return (_AutoSize); }
+
+            set
+            {
+                if (_AutoSize != value)
+                {
+                    _AutoSize = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region BackColor
+
+        /// <summary>
+        /// Gets or sets the text BackColor
+        /// </summary>
+        [Browsable(true), Category("Appearance")]
+        [Description("Indicates the BackColor.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public GradientFillColor BackColor
+        {
+            get
+            {
+                if (_BackColor == null)
+                {
+                    _BackColor = new GradientFillColor();
+                    _BackColor.ColorTableChanged += BackColor_ColorTableChanged;
+                }
+
+                return (_BackColor);
+            }
+
+            set
+            {
+                if (_BackColor != null)
+                    _BackColor.ColorTableChanged -= BackColor_ColorTableChanged;
+
+                _BackColor = value;
+
+                if (_BackColor != null)
+                    _BackColor.ColorTableChanged += BackColor_ColorTableChanged;
+
+                OnGaugeItemChanged();
+            }
+        }
+
+        #endregion
+
+        #region Font
+
+        /// <summary>
+        /// Gets or sets the text Font
+        /// </summary>
+        [Browsable(true), Category("Appearance")]
+        [Description("Indicates the text Font.")]
+        public Font Font
+        {
+            get
+            {
+                if (_Font == null)
+                    _Font = new Font("Microsoft SanSerif", 12);
+
+                return (_Font);
+            }
+
+            set
+            {
+                if (_Font != null)
+                    _Font.Dispose();
+
+                _Font = value;
+                AbsFont = null;
+
+                OnGaugeItemChanged(true);
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        internal virtual bool ShouldSerializeFont()
+        {
+            if (_Font == null)
+                return (false);
+
+            using (Font font = new Font("Microsoft SanSerif", 12))
+                return (_Font.Equals(font) == false);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        internal virtual void ResetFont()
+        {
+            Font = new Font("Microsoft SanSerif", 12);
+        }
+
+        #endregion
+
+        #region ForeColor
+
+        /// <summary>
+        /// Gets or sets the text ForeColor
+        /// </summary>
+        [Browsable(true), Category("Appearance"), DefaultValue(typeof(Color), "Black")]
+        [Description("Indicates the text ForeColor.")]
+        public Color ForeColor
+        {
+            get { return (_ForeColor); }
+
+            set
+            {
+                if (_ForeColor != value)
+                {
+                    _ForeColor = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region Location
+
+        /// <summary>
+        /// Gets or sets the center location of the text area, specified as a percentage
+        /// </summary>
+        [Browsable(true), Category("Layout")]
+        [Editor("DevComponents.Instrumentation.Design.LocationEditor, DevComponents.Instrumentation.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=76cb4c6eb576bca5", typeof(UITypeEditor))]
+        [Description("Indicates the center location of the text area, specified as a percentage.")]
+        [TypeConverter(typeof(PointFConverter))]
+        public PointF Location
+        {
+            get { return (_Location); }
+
+            set
+            {
+                if (_Location != value)
+                {
+                    _Location = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeLocation()
+        {
+            return (_Location.X != .3f || _Location.Y != .5f);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetLocation()
+        {
+            _Location = new PointF(.3f, .5f);
+        }
+
+        #endregion
+
+        #region Size
+
+        /// <summary>
+        /// Gets or sets the size of the text area, specified as a percentage
+        /// </summary>
+        [Browsable(true), Category("Layout")]
+        [Editor("DevComponents.Instrumentation.Design.SizeEditor, DevComponents.Instrumentation.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=76cb4c6eb576bca5", typeof(UITypeEditor))]
+        [Description("Indicates the size of the text area, specified as a percentage.")]
+        public SizeF Size
+        {
+            get { return (_Size); }
+
+            set
+            {
+                if (_Size != value)
+                {
+                    _Size = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeSize()
+        {
+            return (_Size.Width != .2f || _Size.Height != .2f);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetSize()
+        {
+            _Size = new SizeF(.2f, .2f);
+        }
+        #endregion
+
+        #region Text
+
+        /// <summary>
+        /// Gets or sets the text to be displayed
+        /// </summary>
+        [Browsable(true), Category("Appearance"), DefaultValue("Text")]
+        [Description("Indicates the text to be displayed.")]
+        public string Text
+        {
+            get { return (_Text); }
+
+            set
+            {
+                if (_Text != value)
+                {
+                    _Text = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region TextAlignment
+
+        /// <summary>
+        /// Gets or sets the alignment of the text
+        /// </summary>
+        [Browsable(true)]
+        [Category("Layout"), DefaultValue(TextAlignment.MiddleCenter)]
+        [Description("Indicates the alignment of the text.")]
+        public TextAlignment TextAlignment
+        {
+            get { return (_TextAlignment); }
+
+            set
+            {
+                if (_TextAlignment != value)
+                {
+                    _TextAlignment = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region UnderScale
+
+        /// <summary>
+        /// Gets or sets whether the text is displayed under the scale
+        /// </summary>
+        [Browsable(true)]
+        [Category("Layout"), DefaultValue(true)]
+        [Editor("DevComponents.Instrumentation.Design.AngleRangeValueEditor, DevComponents.Instrumentation.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=76cb4c6eb576bca5", typeof(UITypeEditor))]
+        [Description("Indicates whether the text is displayed under the scale.")]
+        public bool UnderScale
+        {
+            get { return (_UnderScale); }
+
+            set
+            {
+                if (_UnderScale != value)
+                {
+                    _UnderScale = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region AbsFont
+
+        internal Font AbsFont
+        {
+            get
+            {
+                if (_AutoSize == false)
+                    return (Font);
+
+                if (_AbsFont == null)
+                {
+                    int n = (_GaugeControl.Frame.AutoCenter == true)
+                        ? Math.Min(_GaugeControl.Width, _GaugeControl.Height) / 2
+                        : Math.Max(_GaugeControl.Width, _GaugeControl.Height) / 3;
+
+                    float emSize = Font.SizeInPoints;
+                    emSize = (emSize / 170) * n;
+
+                    AbsFont = new Font(_Font.FontFamily, emSize, _Font.Style);
+                }
+
+                return (_AbsFont);
+            }
+
+            set
+            {
+                if (_AbsFont != null)
+                    _AbsFont.Dispose();
+
+                _AbsFont = value;
+            }
+        }
+
+        #endregion
+
+        #region Bounds
+
+        internal Rectangle Bounds
+        {
+            get { return (_Bounds); }
+            set { _Bounds = value; }
+        }
+
+        #endregion
+
+        #region GaugeControl
+
+        internal GaugeControl GaugeControl
+        {
+            get { return (_GaugeControl); }
+            set { _GaugeControl = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Event processing
+
+        void BackColor_ColorTableChanged(object sender, EventArgs e)
+        {
+            OnGaugeItemChanged(true);
+        }
+
+        #endregion
+
+        #region RecalcLayout
+
+        public override void RecalcLayout()
+        {
+            if (NeedRecalcLayout == true)
+            {
+                base.RecalcLayout();
+
+                bool autoCenter = _GaugeControl.Frame.AutoCenter;
+                Size size = _GaugeControl.GetAbsSize(_Size, autoCenter);
+
+                if (size.Equals(_Bounds.Size) == false)
+                    AbsFont = null;
+
+                _Center = _GaugeControl.GetAbsPoint(_Location, autoCenter);
+
+                _Bounds = new Rectangle(
+                    _Center.X - size.Width / 2, _Center.Y - size.Height / 2,
+                    size.Width, size.Height);
+            }
+        }
+
+        #endregion
+
+        #region OnPaint
+
+        public override void OnPaint(PaintEventArgs e)
+        {
+            RecalcLayout();
+
+            Graphics g = e.Graphics;
+
+            if (_Bounds.Width > 0 && _Bounds.Height > 0)
+            {
+                g.TranslateTransform(_Center.X, _Center.Y);
+                g.RotateTransform(_Angle % 360);
+
+                Rectangle r = new Rectangle(0, 0, _Bounds.Width, _Bounds.Height);
+
+                r.X -= _Bounds.Width / 2;
+                r.Y -= _Bounds.Height / 2;
+
+                if (_BackColor.Color1.IsEmpty == false)
+                    PaintBackColor(e, r);
+
+                if (_BackColor.BorderWidth > 0)
+                {
+                    using (Pen pen = new Pen(_BackColor.BorderColor, _BackColor.BorderWidth))
+                        g.DrawRectangle(pen, r);
+                }
+
+                if (string.IsNullOrEmpty(_Text) == false)
+                {
+                    using (StringFormat sf = new StringFormat())
+                    {
+                        SetStringAlignment(sf);
+
+                        if (_BackColor.BorderWidth > 0)
+                            r.Inflate(-(_BackColor.BorderWidth + 1), -(_BackColor.BorderWidth + 1));
+
+                        using (Brush br = new SolidBrush(_ForeColor))
+                            g.DrawString(_Text, AbsFont, br, r, sf);
+                    }
+                }
+
+                g.ResetTransform();
+            }
+        }
+
+        #region PaintBackColor
+
+        private void PaintBackColor(PaintEventArgs e, Rectangle r)
+        {
+            Graphics g = e.Graphics;
+
+            GradientFillType fillType = _BackColor.GradientFillType;
+            
+            if (_BackColor.End.IsEmpty == true || (_BackColor.Color1 == _BackColor.Color2))
+                fillType = GradientFillType.None;
+
+            switch (fillType)
+            {
+                case GradientFillType.Auto:
+                case GradientFillType.Angle:
+                    using (Brush br = _BackColor.GetBrush(r))
+                    {
+                        if (br is LinearGradientBrush)
+                            ((LinearGradientBrush)br).WrapMode = WrapMode.TileFlipXY;
+
+                        g.FillRectangle(br, r);
+                    }
+                    break;
+
+                case GradientFillType.StartToEnd:
+                    using (Brush br = _BackColor.GetBrush(r, 90))
+                    {
+                        if (br is LinearGradientBrush)
+                            ((LinearGradientBrush)br).WrapMode = WrapMode.TileFlipXY;
+
+                        g.FillRectangle(br, r);
+                    }
+                    break;
+
+                case GradientFillType.HorizontalCenter:
+                    Rectangle t1 = r;
+                    t1.Height /= 2;
+
+                    using (LinearGradientBrush br = new
+                        LinearGradientBrush(t1, _BackColor.Start, _BackColor.End, 90))
+                    {
+                        br.WrapMode = WrapMode.TileFlipXY;
+
+                        g.FillRectangle(br, r);
+                    }
+                    break;
+
+                case GradientFillType.VerticalCenter:
+                    Rectangle t2 = r;
+                    t2.Width /= 2;
+
+                    using (LinearGradientBrush br = new
+                        LinearGradientBrush(t2, _BackColor.Start, _BackColor.End, 0f))
+                    {
+                        br.WrapMode = WrapMode.TileFlipXY;
+
+                        g.FillRectangle(br, r);
+                    }
+                    break;
+
+                case GradientFillType.Center:
+                    using (GraphicsPath path = new GraphicsPath())
+                    {
+                        path.AddRectangle(r);
+
+                        using (PathGradientBrush br = new PathGradientBrush(path))
+                        {
+                            br.CenterColor = _BackColor.Start;
+                            br.SurroundColors = new Color[] {_BackColor.End};
+
+                            g.FillRectangle(br, r);
+                        }
+                    }
+                    break;
+
+                default:
+                    using (Brush br = new SolidBrush(_BackColor.Start))
+                        g.FillRectangle(br, r);
+
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region SetStringAlignment
+
+        private void SetStringAlignment(StringFormat sf)
+        {
+            switch (_TextAlignment)
+            {
+                case TextAlignment.TopLeft:
+                    sf.LineAlignment = StringAlignment.Near;
+                    sf.Alignment = StringAlignment.Near;
+                    break;
+
+                case TextAlignment.TopCenter:
+                    sf.LineAlignment = StringAlignment.Near;
+                    sf.Alignment = StringAlignment.Center;
+                    break;
+
+                case TextAlignment.TopRight:
+                    sf.LineAlignment = StringAlignment.Near;
+                    sf.Alignment = StringAlignment.Far;
+                    break;
+
+                case TextAlignment.MiddleLeft:
+                    sf.LineAlignment = StringAlignment.Center;
+                    sf.Alignment = StringAlignment.Near;
+                    break;
+
+                case TextAlignment.MiddleCenter:
+                    sf.LineAlignment = StringAlignment.Center;
+                    sf.Alignment = StringAlignment.Center;
+                    break;
+
+                case TextAlignment.MiddleRight:
+                    sf.LineAlignment = StringAlignment.Center;
+                    sf.Alignment = StringAlignment.Far;
+                    break;
+
+                case TextAlignment.BottomLeft:
+                    sf.LineAlignment = StringAlignment.Far;
+                    sf.Alignment = StringAlignment.Near;
+                    break;
+
+                case TextAlignment.BottomCenter:
+                    sf.LineAlignment = StringAlignment.Far;
+                    sf.Alignment = StringAlignment.Center;
+                    break;
+
+                case TextAlignment.BottomRight:
+                    sf.LineAlignment = StringAlignment.Far;
+                    sf.Alignment = StringAlignment.Far;
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Contains
+
+        internal bool Contains(Point pt)
+        {
+            if (Angle == 0)
+            {
+                return (_Bounds.Contains(pt));
+            }
+            
+            using (GraphicsPath path = new GraphicsPath())
+            {
+                path.AddRectangle(Bounds);
+
+                Matrix matrix = new Matrix();
+                matrix.RotateAt(_Angle, _Center);
+
+                path.Transform(matrix);
+
+                return (path.IsVisible(pt));
+            }
+        }
+
+        #endregion
+
+        #region ICloneable Members
+
+        public override object Clone()
+        {
+            GaugeText copy = new GaugeText();
+
+            CopyToItem(copy);
+
+            return (copy);
+        }
+
+        #endregion
+
+        #region CopyToItem
+
+        public override void CopyToItem(GaugeItem copy)
+        {
+            GaugeText c = copy as GaugeText;
+
+            if (c != null)
+            {
+                base.CopyToItem(c);
+
+                c.Angle = _Angle;
+                c.AutoSize = _AutoSize;
+
+                if (_BackColor != null)
+                    c.BackColor = (GradientFillColor)_BackColor.Clone();
+
+                if (_Font != null)
+                    c.Font = (Font)_Font.Clone();
+
+                c.ForeColor = _ForeColor;
+                c.Location = _Location;
+                c.Size = _Size;
+                c.Text = _Text;
+                c.TextAlignment = _TextAlignment;
+                c.UnderScale = _UnderScale;
+            }
+        }
+
+        #endregion
+    }
+
+    #region Enums
+
+    public enum TextAlignment
+    {
+        TopLeft,
+        TopCenter,
+        TopRight,
+        MiddleLeft,
+        MiddleCenter,
+        MiddleRight,
+        BottomLeft,
+        BottomCenter,
+        BottomRight,
+    }
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeItem/GradientFillColor.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeItem/GradientFillColor.cs
new file mode 100644
index 00000000..720ae177
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeItem/GradientFillColor.cs	
@@ -0,0 +1,472 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Drawing.Drawing2D;
+using System.Globalization;
+using DevComponents.Instrumentation.Primitives;
+
+namespace DevComponents.Instrumentation
+{
+    [TypeConverter(typeof(GradientFillColorConvertor))]
+    [Editor(typeof(GradientFillColorEditor), typeof(UITypeEditor))]
+    public class GradientFillColor : LinearGradientColorTable, ICloneable
+    {
+        #region Private properties
+
+        private int _BorderWidth;
+        private Color _BorderColor;
+        private GradientFillType _GradientFillType = GradientFillType.Auto;
+
+        #endregion
+
+        #region Constructors
+
+        /// <summary>
+        /// Creates new instance of the object.
+        /// </summary>
+        public GradientFillColor() { }
+        /// <summary>
+        /// Creates new instance of the object.
+        /// </summary>
+        /// <param name="color">Beginning color.</param>
+        public GradientFillColor(Color color)
+        {
+            Color1 = color;
+        }
+
+        /// <summary>
+        /// Creates new instance of the object.
+        /// </summary>
+        /// <param name="color1">Begin color.</param>
+        /// <param name="color2">End color.</param>
+        public GradientFillColor(Color color1, Color color2)
+        {
+            Color1 = color1;
+            Color2 = color2;
+        }
+
+        /// <summary>
+        /// Creates new instance of the object.
+        /// </summary>
+        /// <param name="color1">Beginning color in hexadecimal representation like FFFFFF.</param>
+        /// <param name="color2">End color in hexadecimal representation like FFFFFF.</param>
+        public GradientFillColor(string color1, string color2)
+        {
+            Color1 = ColorFactory.GetColor(color1);
+            Color2 = ColorFactory.GetColor(color2);
+        }
+
+        /// <summary>
+        /// Creates new instance of the object.
+        /// </summary>
+        /// <param name="color1">Beginning color in 32-bit RGB representation.</param>
+        /// <param name="color2">End color in 32-bit RGB representation.</param>
+        public GradientFillColor(int color1, int color2)
+        {
+            Color1 = ColorFactory.GetColor(color1);
+            Color2 = ColorFactory.GetColor(color2);
+        }
+
+        /// <summary>
+        /// Creates new instance of the object.
+        /// </summary>
+        /// <param name="color1">Beginning color in 32-bit RGB representation.</param>
+        /// <param name="color2">End color in 32-bit RGB representation.</param>
+        /// <param name="gradientAngle">Gradient angle.</param>
+        public GradientFillColor(int color1, int color2, int gradientAngle)
+        {
+            Color1 = ColorFactory.GetColor(color1);
+            Color2 = ColorFactory.GetColor(color2);
+            GradientAngle = gradientAngle;
+        }
+
+        /// <summary>
+        /// Creates new instance of the object.
+        /// </summary>
+        /// <param name="color1">Beginning color.</param>
+        /// <param name="color2">End color.</param>
+        /// <param name="gradientAngle">Gradient angle.</param>
+        public GradientFillColor(Color color1, Color color2, int gradientAngle)
+        {
+            Color1 = color1;
+            Color2 = color2;
+            GradientAngle = gradientAngle;
+        }
+
+        #endregion
+
+        #region Hidden properties
+
+// ReSharper disable UnusedMember.Local
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public new Color Start
+// ReSharper restore UnusedMember.Local
+        {
+            get { return (base.Start); }
+            set { base.Start = value; }
+        }
+
+        // ReSharper disable UnusedMember.Local
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public new Color End
+        // ReSharper restore UnusedMember.Local
+        {
+            get { return (base.End); }
+            set { base.End = value; }
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region Color1
+
+        /// <summary>
+        /// Gets or sets the beginning gradient Color
+        /// </summary>
+        [Browsable(true), Category("Appearance")]
+        [Description("Indicates the beginning gradient Color.")]
+        public Color Color1
+        {
+            get { return (base.Start); }
+            set { base.Start = value; }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        internal bool ShouldSerializeColor1()
+        {
+            return (Color1.IsEmpty == false);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        internal void ResetColor1()
+        {
+            Color1 = Color.Empty;
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        internal override bool ShouldSerializeStart()
+        {
+            return (false);
+        }
+
+        #endregion
+
+        #region Color2
+
+        /// <summary>
+        /// Gets or sets the ending gradient Color
+        /// </summary>
+        /// <returns></returns>
+        [Browsable(true), Category("Appearance")]
+        [Description("Indicates the ending gradient Color.")]
+        public Color Color2
+        {
+            get { return (base.End); }
+            set { base.End = value; }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        internal bool ShouldSerializeColor2()
+        {
+            return (Color2.IsEmpty == false);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        internal void ResetColor2()
+        {
+            Color2 = Color.Empty;
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        internal override bool ShouldSerializeEnd()
+        {
+            return (false);
+        }
+
+        #endregion
+
+        #region BorderColor
+
+        /// <summary>
+        /// Gets or sets the border Color
+        /// </summary>
+        [Browsable(true), Category("Appearance")]
+        [Description("Indicates the border Color.")]
+        public Color BorderColor
+        {
+            get { return (_BorderColor); }
+
+            set
+            {
+                if (_BorderColor != value)
+                {
+                    _BorderColor = value;
+
+                    OnColorTableChanged();
+                }
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        internal bool ShouldSerializeBorderColor()
+        {
+            return (_BorderColor.IsEmpty == false);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        internal void ResetBorderColor()
+        {
+            BorderColor = Color.Empty;
+        }
+
+        #endregion
+
+        #region BorderWidth
+
+        /// <summary>
+        /// Gets or sets the border width
+        /// </summary>
+        [Browsable(true)]
+        [Category("Appearance"), DefaultValue(0)]
+        [Description("Indicates the border width.")]
+        public int BorderWidth
+        {
+            get { return (_BorderWidth); }
+
+            set
+            {
+                if (_BorderWidth != value)
+                {
+                    _BorderWidth = value;
+
+                    OnColorTableChanged();
+                }
+            }
+        }
+
+        #endregion
+
+        #region GradientFillType
+
+        /// <summary>
+        /// Gets or sets the Gradient FillType
+        /// </summary>
+        [Browsable(true)]
+        [Category("Appearance"), DefaultValue(GradientFillType.Auto)]
+        [Description("Indicates the Gradient FillType.")]
+        public GradientFillType GradientFillType
+        {
+            get { return (_GradientFillType); }
+
+            set
+            {
+                if (_GradientFillType != value)
+                {
+                    _GradientFillType = value;
+
+                    OnColorTableChanged();
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IsEqualTo
+
+        /// <summary>
+        /// Determines if the fillcolor is equal to the given one
+        /// </summary>
+        /// <param name="fillColor">FillColor to compare</param>
+        /// <returns>true if equal</returns>
+        public bool IsEqualTo(GradientFillColor fillColor)
+        {
+            return (Color1 == fillColor.Color1 && Color2 == fillColor.Color2 &&
+                GradientAngle == fillColor.GradientAngle && GradientFillType == fillColor.GradientFillType &&
+                BorderColor == fillColor.BorderColor && BorderWidth == fillColor._BorderWidth);
+        }
+
+        /// <summary>
+        /// Determines if the fillcolor is equal to the given one
+        /// </summary>
+        /// <param name="begin"></param>
+        /// <param name="end"></param>
+        /// <param name="angle"></param>
+        /// <param name="gradientFill"></param>
+        /// <param name="borderColor"></param>
+        /// <param name="borderWidth"></param>
+        /// <returns></returns>
+        public bool IsEqualTo(Color begin, Color end, float angle,
+            GradientFillType gradientFill, Color borderColor, int borderWidth)
+        {
+            return (Color1 == begin && End == end &&
+                GradientAngle == angle && GradientFillType == gradientFill &&
+                borderColor == BorderColor && borderWidth == BorderWidth);
+        }
+
+        #endregion
+
+        #region ICloneable Members
+
+        public object Clone()
+        {
+            GradientFillColor fillColor = new GradientFillColor();
+
+            fillColor.Color1 = Color1;
+            fillColor.Color2 = Color2;
+            fillColor.BorderColor = BorderColor;
+            fillColor.BorderWidth = BorderWidth;
+            fillColor.GradientFillType = GradientFillType;
+            fillColor.GradientAngle = GradientAngle;
+
+            return (fillColor);
+        }
+
+        #endregion
+    }
+
+    #region Enums
+
+    public enum GradientFillType
+    {
+        Auto,
+        Angle,
+        Center,
+        HorizontalCenter,
+        None,
+        VerticalCenter,
+        StartToEnd,
+    }
+
+    #endregion
+
+    #region GradientFillColorConvertor
+
+    public class GradientFillColorConvertor : ExpandableObjectConverter
+    {
+        public override object ConvertTo(
+            ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+        {
+            if (destinationType == typeof(string))
+            {
+                GradientFillColor gc = value as GradientFillColor;
+
+                if (gc != null)
+                {
+                    ColorConverter cvt = new ColorConverter();
+
+                    string s = gc.Start.IsEmpty ? "(Empty)" : cvt.ConvertToString(gc.Start);
+
+                    if (gc.End != Color.Empty)
+                        s += ", " + cvt.ConvertToString(gc.End);
+
+                    return (s);
+                }
+            }
+
+            return (base.ConvertTo(context, culture, value, destinationType));
+        }
+    }
+
+    #endregion
+
+    #region GradientFillColorEditor
+
+    public class GradientFillColorEditor : UITypeEditor
+    {
+        #region GetPaintValueSupported
+
+        public override bool GetPaintValueSupported(ITypeDescriptorContext context)
+        {
+            return (true);
+        }
+
+        #endregion
+
+        #region PaintValue
+
+        public override void PaintValue(PaintValueEventArgs e)
+        {
+            GradientFillColor fc = e.Value as GradientFillColor;
+
+            if (fc != null)
+            {
+                GradientFillType fillType = GetGradientFillType(fc);
+
+                switch (fillType)
+                {
+                    case GradientFillType.None:
+                        using (Brush br = new SolidBrush(fc.Start))
+                            e.Graphics.FillRectangle(br, e.Bounds);
+                        break;
+
+                    case GradientFillType.Auto:
+                    case GradientFillType.Angle:
+                        using (Brush br = fc.GetBrush(e.Bounds))
+                            e.Graphics.FillRectangle(br, e.Bounds);
+                        break;
+                        
+                    case GradientFillType.Center:
+                        using (GraphicsPath path = new GraphicsPath())
+                        {
+                            path.AddRectangle(e.Bounds);
+
+                            using (PathGradientBrush br = new PathGradientBrush(path))
+                            {
+                                br.CenterColor = fc.Start;
+                                br.SurroundColors = new Color[] {fc.End};
+
+                                e.Graphics.FillPath(br, path);
+                            }
+                        }
+                        break;
+
+                    case GradientFillType.HorizontalCenter:
+                        Rectangle t1 = e.Bounds;
+                        t1.Height /= 2;
+
+                        using (LinearGradientBrush br = new LinearGradientBrush(t1, fc.End, fc.Color1, 90))
+                        {
+                            br.WrapMode = WrapMode.TileFlipXY;
+
+                            e.Graphics.FillRectangle(br, e.Bounds);
+                        }
+                        break;
+
+                    case GradientFillType.StartToEnd:
+                        using (Brush br = fc.GetBrush(e.Bounds, 0))
+                            e.Graphics.FillRectangle(br, e.Bounds);
+                        break;
+
+                    case GradientFillType.VerticalCenter:
+                        Rectangle t2 = e.Bounds;
+                        t2.Width /= 2;
+
+                        using (LinearGradientBrush br = new LinearGradientBrush(t2, fc.End, fc.Color1, 0f))
+                        {
+                            br.WrapMode = WrapMode.TileFlipXY;
+
+                            e.Graphics.FillRectangle(br, e.Bounds);
+                        }
+                        break;
+                }
+            }
+        }
+
+        #endregion
+
+        #region GetGradientFillType
+
+        private GradientFillType GetGradientFillType(GradientFillColor fc)
+        {
+            return (fc.End.IsEmpty ? GradientFillType.None : fc.GradientFillType);
+        }
+
+        #endregion
+    }
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeLabel/GaugeBaseLabel.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeLabel/GaugeBaseLabel.cs
new file mode 100644
index 00000000..06a488ce
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeLabel/GaugeBaseLabel.cs	
@@ -0,0 +1,644 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Globalization;
+using System.Windows.Forms;
+
+namespace DevComponents.Instrumentation
+{
+    [TypeConverter(typeof(GaugeBaseLabelConvertor))]
+    public class GaugeBaseLabel : GaugeItem
+    {
+        #region Private variables
+
+        private int _Radius;
+        private int _Offset;
+
+        private LabelLayout _Layout;
+        private GaugeScale _Scale;
+
+        #endregion
+
+        public GaugeBaseLabel()
+        {
+            _Layout = new LabelLayout();
+
+            HookEvents(true);
+        }
+
+        #region Hidden properties
+
+        #region Tooltip
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public new string Tooltip
+        {
+            get { return (base.Tooltip); }
+            set { base.Tooltip = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Public properties
+
+        #region Layout
+
+        /// <summary>
+        /// Gets the label Layout
+        /// </summary>
+        [Browsable(true), Category("Appearance")]
+        [Description("Contains the Label layout properties.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public LabelLayout Layout
+        {
+            get { return (_Layout); }
+        }
+
+        #endregion
+
+        #region Scale
+
+        /// <summary>
+        /// Gets the associated Scale
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public virtual GaugeScale Scale
+        {
+            get { return (_Scale); }
+
+            internal set
+            {
+                _Scale = value;
+
+                OnGaugeItemChanged(true);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region AbsFont
+
+        internal Font AbsFont
+        {
+            get
+            {
+                if (_Layout.AutoSize == false)
+                    return (_Layout.Font);
+
+                if (_Layout.AbsFont == null)
+                {
+                    if (Scale is GaugeCircularScale)
+                        _Layout.AbsFont = GetAbsFont(Scale as GaugeCircularScale);
+
+                    else if (Scale is GaugeLinearScale)
+                        _Layout.AbsFont = GetAbsFont(Scale as GaugeLinearScale);
+                }
+
+                return (_Layout.AbsFont);
+            }
+
+            set { _Layout.AbsFont = value; }
+        }
+
+        private Font GetAbsFont(GaugeCircularScale scale)
+        {
+            float emSize = _Layout.Font.SizeInPoints;
+            emSize = (emSize / 120) * scale.AbsRadius;
+
+            if (emSize <= 0)
+                emSize = 1;
+
+            return (new Font(_Layout.Font.FontFamily, emSize, _Layout.Font.Style));
+        }
+
+        private Font GetAbsFont(GaugeLinearScale scale)
+        {
+            float emSize = _Layout.Font.SizeInPoints;
+
+            emSize = (emSize / 120) * scale.AbsWidth;
+
+            return (new Font(_Layout.Font.FontFamily, emSize, _Layout.Font.Style));
+        }
+
+        #endregion
+
+        #region Offset
+
+        internal int Offset
+        {
+            get { return (_Offset); }
+            set { _Offset = value; }
+        }
+
+        #endregion
+
+        #region Radius
+
+        internal int Radius
+        {
+            get { return (_Radius); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region HookEvents
+
+        private void HookEvents(bool hook)
+        {
+            if (hook == true)
+            {
+                _Layout.LabelLayoutChanged += Layout_LabelLayoutChanged;
+            }
+            else
+            {
+                _Layout.LabelLayoutChanged -= Layout_LabelLayoutChanged;
+            }
+        }
+
+        #endregion
+
+        #region Event handling
+
+        void Layout_LabelLayoutChanged(object sender, EventArgs e)
+        {
+            OnGaugeItemChanged(true);
+        }
+
+        #endregion
+
+        #region RecalcLayout
+
+        public override void RecalcLayout()
+        {
+            if (NeedRecalcLayout == true)
+            {
+                base.RecalcLayout();
+
+                CalcLabelMetrics();
+
+                AbsFont = null;
+                _Layout.AbsFont = null;
+            }
+        }
+
+        #region CalcLabelMetrics
+
+        private void CalcLabelMetrics()
+        {
+            if (Scale is GaugeCircularScale)
+                CalcCircularMetrics(Scale as GaugeCircularScale);
+
+            else if (Scale is GaugeLinearScale)
+                CalcLinearMetrics(Scale as GaugeLinearScale);
+        }
+
+        #region CalcCircularMetrics
+
+        private void CalcCircularMetrics(GaugeCircularScale scale)
+        {
+            _Radius = scale.AbsRadius;
+
+            if (_Radius > 0)
+            {
+                int offset = (int)(_Radius * _Layout.ScaleOffset);
+
+                switch (_Layout.Placement)
+                {
+                    case DisplayPlacement.Near:
+                        _Radius = scale.GetNearLabelRadius() - offset;
+                        break;
+
+                    case DisplayPlacement.Center:
+                        _Radius += offset;
+                        break;
+
+                    case DisplayPlacement.Far:
+                        _Radius = scale.GetFarLabelRadius() + offset;
+                        break;
+                }
+            }
+        }
+
+        #endregion
+
+        #region CalcLinearMetrics
+
+        private void CalcLinearMetrics(GaugeLinearScale scale)
+        {
+            int width = scale.AbsWidth;
+            int offset = (int)(width * _Layout.ScaleOffset);
+
+            switch (_Layout.Placement)
+            {
+                case DisplayPlacement.Near:
+                    _Offset = GetNearLabelOffset(scale) - offset;
+                    break;
+
+                case DisplayPlacement.Center:
+                    _Offset = scale.AbsScaleWidth / 2 - offset;
+                    break;
+
+                case DisplayPlacement.Far:
+                    _Offset = GetFarLabelOffset(scale) + offset;
+                    break;
+            }
+        }
+
+        #region GetNearLabelOffset
+
+        private int GetNearLabelOffset(GaugeLinearScale scale)
+        {
+            int offset = 0;
+
+            if (scale.MajorTickMarks.Visible &&
+                scale.MajorTickMarks.Layout.Placement == DisplayPlacement.Near
+                && scale.MajorTickMarks.Offset < offset)
+            {
+                offset = scale.MajorTickMarks.Offset;
+            }
+
+            if (scale.MinorTickMarks.Visible &&
+                scale.MinorTickMarks.Layout.Placement == DisplayPlacement.Near &&
+                scale.MinorTickMarks.Offset < offset)
+            {
+                offset = scale.MinorTickMarks.Offset;
+            }
+
+            return (offset);
+        }
+
+        #endregion
+
+        #region GetFarLabelOffset
+
+        private int GetFarLabelOffset(GaugeLinearScale scale)
+        {
+            int offset = scale.AbsScaleWidth;
+
+            if (scale.MajorTickMarks.Visible &&
+                scale.MajorTickMarks.Layout.Placement == DisplayPlacement.Far)
+            {
+                int n = scale.MajorTickMarks.Offset + scale.MajorTickMarks.Length;
+
+                if (n > offset)
+                    offset = n;
+            }
+
+            if (scale.MinorTickMarks.Visible &&
+                scale.MinorTickMarks.Layout.Placement == DisplayPlacement.Far)
+            {
+                int n = scale.MinorTickMarks.Offset + scale.MinorTickMarks.Length;
+
+                if (n > offset)
+                    offset = n;
+            }
+
+            return (offset);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region PaintLabel
+
+        internal void PaintLabel(Graphics g,
+            string text, Brush br, LabelPoint lp, Font font)
+        {
+            if (Scale.Style == GaugeScaleStyle.Circular)
+            {
+                if (Layout.AdaptiveLabel == true)
+                {
+                    PaintAdaptiveLabel(g, text, br, lp, font);
+                }
+                else
+                {
+                    if (Layout.RotateLabel == true)
+                        PaintRotatedLabel(g, text, br, lp, font);
+                    else
+                        PaintNonRotatedLabel(g, text, br, lp, font);
+                }
+            }
+            else
+            {
+                PaintRotatedLabel(g, text, br, lp, font);
+            }
+        }
+
+        #endregion
+
+        #region PaintRotatedLabel
+
+        internal void PaintRotatedLabel(Graphics g,
+            string text, Brush br, LabelPoint lp, Font font)
+        {
+            if (Scale is GaugeCircularScale)
+                PaintCircularRotatedLabel(g, text, br, lp, font);
+
+            else if (Scale is GaugeLinearScale)
+                PaintLinearRotatedLabel(g, text, br, lp, font, Scale as GaugeLinearScale);
+        }
+
+        #region PaintCircularRotatedLabel
+
+        private void PaintCircularRotatedLabel(
+            Graphics g, string text, Brush br, LabelPoint lp, Font font)
+        {
+            SizeF sz = g.MeasureString(text, font);
+            Size size = sz.ToSize();
+
+            float fontAngle = Layout.Angle;
+
+            if (Layout.AutoOrientLabel == true)
+            {
+                if (((fontAngle + lp.Angle) % 360) < 180)
+                    fontAngle += 180;
+            }
+
+            g.TranslateTransform(lp.Point.X, lp.Point.Y);
+            g.RotateTransform((lp.Angle + 90) % 360);
+
+            g.TranslateTransform(0, GetRadiusDelta(size.Width, size.Height, fontAngle));
+            g.RotateTransform(fontAngle % 360);
+
+            g.DrawString(text, font, br,
+                new Point(-size.Width / 2, -size.Height / 2));
+
+            g.ResetTransform();
+        }
+
+        #endregion
+
+        #region PaintLinearRotatedLabel
+
+        private void PaintLinearRotatedLabel(Graphics g, string text,
+            Brush br, LabelPoint lp, Font font, GaugeLinearScale scale)
+        {
+            SizeF sz = g.MeasureString(text, font);
+            Size size = sz.ToSize();
+
+            float fontAngle = Layout.Angle;
+
+            g.TranslateTransform(lp.Point.X, lp.Point.Y);
+
+            if (scale.Orientation == Orientation.Horizontal)
+                g.TranslateTransform(0, -GetRadiusDelta(size.Width, size.Height, fontAngle));
+            else
+                g.TranslateTransform(-GetRadiusDelta(size.Height, size.Width, fontAngle), 0);
+
+            g.RotateTransform(fontAngle % 360);
+
+            g.DrawString(text, font, br,
+                         new Point(-size.Width / 2, -size.Height / 2));
+
+            g.ResetTransform();
+        }
+
+        #endregion
+
+        #region GetRadiusDelta
+
+        private int GetRadiusDelta(int width, int height, float fontAngle)
+        {
+            if (Layout.Placement == DisplayPlacement.Center)
+                return (0);
+
+            float spd = (float)((width / 2) - (height / 2)) / 90;
+            float angle = fontAngle % 180;
+
+            int delta = (int)((height / 2) + 
+                ((angle > 90) ? (180 - angle) : angle) * spd) + 2;
+
+            return (Layout.Placement == DisplayPlacement.Near ? delta : - delta);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region PaintNonRotatedLabel
+
+        internal void PaintNonRotatedLabel(Graphics g,
+            string text, Brush br, LabelPoint lp, Font font)
+        {
+            SizeF sz = g.MeasureString(text, font);
+            Size size = sz.ToSize();
+
+            float fontAngle = 360 - ((lp.Angle + Layout.Angle + 90) % 360);
+
+            g.TranslateTransform(lp.Point.X, lp.Point.Y);
+            g.RotateTransform((lp.Angle + 90) % 360);
+
+            g.TranslateTransform(0, GetRadiusDelta(size.Width, size.Height, fontAngle));
+            g.RotateTransform(fontAngle % 360);
+
+            g.DrawString(text, font, br,
+                new Point(-size.Width / 2, -size.Height / 2));
+
+            g.ResetTransform();
+        }
+
+        #endregion
+
+        #region PaintAdaptiveLabel
+
+        internal void PaintAdaptiveLabel(Graphics g,
+            string text, Brush br, LabelPoint lp, Font font)
+        {
+            SizeF tw = g.MeasureString(text, font);
+
+            if (Layout.Placement == DisplayPlacement.Near)
+                tw.Width += text.Length;
+
+            float c = (float)(Math.PI * _Radius * 2);
+
+            if (c > 0)
+            {
+                float radians = (float)GetRadians(lp.Angle);
+                float radOffset = (float)GetRadians((180 * tw.Width) / c);
+                float radCenter = radians;
+
+                radians -= radOffset;
+
+                bool flip = false;
+
+                if (_Layout.AutoOrientLabel == true)
+                {
+                    flip = ((GetDegrees(radCenter) % 360) < 180);
+
+                    if (flip == true)
+                        radians += (radOffset * 2);
+                }
+
+                int n = (int)Math.Ceiling((double)text.Length / 32);
+
+                for (int i = 0; i < n; i++)
+                {
+                    int len = Math.Min(text.Length - (i * 32), 32);
+
+                    radians = PaintAdaptiveText(g,
+                        text.Substring(i * 32, len), br, font, radians, flip);
+                }
+            }
+        }
+
+        #endregion
+
+        #region PaintAdaptiveText
+
+        private float PaintAdaptiveText(Graphics g,
+            string text, Brush br, Font font, float radians, bool flip)
+        {
+            CharacterRange[] crs = new CharacterRange[text.Length];
+
+            for (int j = 0; j < text.Length; j++)
+                crs[j] = new CharacterRange(j, 1);
+
+            using (StringFormat sf = new StringFormat())
+            {
+                sf.FormatFlags = StringFormatFlags.NoClip | StringFormatFlags.MeasureTrailingSpaces;
+                sf.SetMeasurableCharacterRanges(crs);
+
+                Rectangle r = new Rectangle(0, 0, 1000, 1000);
+                Region[] rgns = g.MeasureCharacterRanges(text, font, r, sf);
+
+                for (int j = 0; j < text.Length; j++)
+                {
+                    RectangleF t = rgns[j].GetBounds(g);
+
+                    float z = (flip ? _Radius - t.Height / 2 : _Radius + t.Height / 2);
+
+                    switch (Layout.Placement)
+                    {
+                        case DisplayPlacement.Near:
+                            t.Width += 1;
+                            z -= t.Height/2;
+                            break;
+
+                        case DisplayPlacement.Far:
+                            z += t.Height/2;
+                            break;
+                    }
+
+                    float y = (float)(_Scale.Center.Y + z * Math.Sin(radians));
+                    float x = (float)(_Scale.Center.X + z * Math.Cos(radians));
+
+                    float rad = (float)Math.Asin(t.Width / (_Radius * 2));
+
+                    radians += (flip ? -rad : rad);
+
+                    g.TranslateTransform(x, y);
+                    g.RotateTransform((flip ? -90 : 90) + (float)GetDegrees(radians));
+
+                    g.DrawString(text[j].ToString(), font, br, 0, 0);
+
+                    g.ResetTransform();
+
+                    radians += (flip ? -rad : rad);
+                }
+            }
+
+            return (radians);
+        }
+
+        #endregion
+
+        #region GetDegrees
+
+        internal double GetDegrees(float radians)
+        {
+            return (radians * 180 / Math.PI);
+        }
+
+        #endregion
+
+        #region GetRadians
+
+        /// <summary>
+        /// Converts Degrees to Radians
+        /// </summary>
+        /// <param name="theta">Degrees</param>
+        /// <returns>Radians</returns>
+        internal double GetRadians(float theta)
+        {
+            return (theta * Math.PI / 180);
+        }
+
+        #endregion
+
+        #region OnDispose
+
+        protected override void OnDispose()
+        {
+            HookEvents(false);
+
+            base.OnDispose();
+        }
+
+        #endregion
+
+        #region ICloneable Members
+
+        public override object Clone()
+        {
+            GaugeBaseLabel copy = new GaugeBaseLabel();
+
+            CopyToItem(copy);
+
+            return (copy);
+        }
+
+        #endregion
+
+        #region CopyToItem
+
+        public override void CopyToItem(GaugeItem copy)
+        {
+            GaugeBaseLabel c = copy as GaugeBaseLabel;
+
+            if (c != null)
+            {
+                base.CopyToItem(c);
+
+                _Layout.CopyToItem(c.Layout);
+            }
+        }
+
+        #endregion
+    }
+
+    #region GaugeBaseLabelConvertor
+
+    public class GaugeBaseLabelConvertor : ExpandableObjectConverter
+    {
+        public override object ConvertTo(
+            ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+        {
+            if (destinationType == typeof(string))
+            {
+                GaugeBaseLabel label = value as GaugeBaseLabel;
+
+                if (label != null)
+                    return (String.Empty);
+            }
+
+            return (base.ConvertTo(context, culture, value, destinationType));
+        }
+    }
+
+    #endregion
+
+}
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeLabel/GaugeCustomLabel.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeLabel/GaugeCustomLabel.cs
new file mode 100644
index 00000000..312b0d48
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeLabel/GaugeCustomLabel.cs	
@@ -0,0 +1,352 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Windows.Forms;
+using DevComponents.Instrumentation.Primitives;
+
+namespace DevComponents.Instrumentation
+{
+    public class GaugeCustomLabelCollection : GenericCollection<GaugeCustomLabel>
+    {
+        #region ICloneable Members
+
+        public override object Clone()
+        {
+            GaugeCustomLabelCollection copy = new GaugeCustomLabelCollection();
+
+            CopyToItem(copy);
+
+            return (copy);
+        }
+
+        #endregion
+
+        #region CopyToItem
+
+        internal void CopyToItem(GaugeCustomLabelCollection copy)
+        {
+            foreach (GaugeCustomLabel item in this)
+            {
+                GaugeCustomLabel ic = new GaugeCustomLabel();
+
+                item.CopyToItem(ic);
+
+                copy.Add(ic);
+            }
+        }
+
+        #endregion
+    }
+
+    public class GaugeCustomLabel : GaugeBaseLabel
+    {
+        #region Private variables
+
+        private string _Text;
+        private double _Value;
+
+        private GaugeTickMarkLabel _TickMark;
+        private LabelPoint _LabelPoint;
+
+        #endregion
+
+        public GaugeCustomLabel()
+        {
+            _Text = "Text";
+            _Value = double.NaN;
+
+            _TickMark = new GaugeTickMarkLabel(
+                Scale, GaugeTickMarkRank.Custom, GaugeMarkerStyle.Trapezoid, .09f, .14f, double.NaN);
+
+            HookEvents(true);
+        }
+
+        #region Public properties
+
+        #region Scale
+
+        /// <summary>
+        /// Gets the label's associated Scale
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override GaugeScale Scale
+        {
+            get { return (base.Scale); }
+
+            internal set
+            {
+                base.Scale = value;
+
+                _TickMark.Scale = value;
+            }
+        }
+
+        #endregion
+
+        #region Text
+
+        /// <summary>
+        /// Gets or sets the Label text
+        /// </summary>
+        [Browsable(true)]
+        [Category("Behavior"), DefaultValue("Text")]
+        [Description("Indicates the Label text.")]
+        public string Text
+        {
+            get { return (_Text); }
+
+            set
+            {
+                if (value != null && value.Equals(_Text) == false)
+                {
+                    _Text = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region TickMark
+
+        /// <summary>
+        /// Gets the Label Tickmark definition
+        /// </summary>
+        [Browsable(true), Category("Appearance")]
+        [Description("Contains the Label TickMark layout properties.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public GaugeTickMarkLabel TickMark
+        {
+            get { return (_TickMark); }
+        }
+
+        #endregion
+
+        #region Value
+
+        /// <summary>
+        /// Gets or sets the Label scale value
+        /// </summary>
+        [Browsable(true)]
+        [Category("Behavior"), DefaultValue(double.NaN)]
+        [Description("Indicates the Label scale value.")]
+        public double Value
+        {
+            get { return (_Value); }
+
+            set
+            {
+                if (_Value != value)
+                {
+                    _Value = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region NeedRecalcLayout
+
+        internal override bool NeedRecalcLayout
+        {
+            get { return (base.NeedRecalcLayout); }
+
+            set
+            {
+                base.NeedRecalcLayout = value;
+
+                if (value == true)
+                    _TickMark.NeedRecalcLayout = true;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region HookEvents
+
+        private void HookEvents(bool hook)
+        {
+            if (hook == true)
+            {
+                _TickMark.GaugeItemChanged += LabelTickMark_GaugeItemChanged;
+            }
+            else
+            {
+                _TickMark.GaugeItemChanged -= LabelTickMark_GaugeItemChanged;
+            }
+        }
+
+        #endregion
+
+        #region Event processing
+
+        void LabelTickMark_GaugeItemChanged(object sender, EventArgs e)
+        {
+            OnGaugeItemChanged(true);
+        }
+
+        #endregion
+
+        #region RecalcLayout
+
+        public override void RecalcLayout()
+        {
+            if (NeedRecalcLayout == true)
+            {
+                base.RecalcLayout();
+
+                if (_Value >= Scale.MinValue && _Value <= Scale.MaxValue)
+                {
+                    if (Scale is GaugeCircularScale)
+                        CalcCircularLabelPoint(Scale as GaugeCircularScale);
+
+                    else if (Scale is GaugeLinearScale)
+                        CalcLinearLabelPoint(Scale as GaugeLinearScale);
+
+                    _TickMark.Interval = _Value - Scale.MinValue;
+                    _TickMark.NeedRecalcLayout = true;
+
+                    _TickMark.RecalcLayout();
+                }
+                else
+                {
+                    _LabelPoint = null;
+                    _TickMark.TickPoint = null;
+                }
+            }
+        }
+
+        #region CalcCircularLabelPoint
+
+        private void CalcCircularLabelPoint(GaugeCircularScale scale)
+        {
+            double spread = scale.MaxValue - scale.MinValue;
+            double dpt = scale.SweepAngle / spread;
+            double interval = _Value - scale.MinValue;
+
+            double n = interval * dpt;
+            
+            _LabelPoint = new LabelPoint();
+
+            _LabelPoint.Angle = (float)(scale.StartAngle + (scale.Reversed ? scale.SweepAngle - n : n));
+            _LabelPoint.Point = scale.GetPoint(Radius, _LabelPoint.Angle);
+            _LabelPoint.Interval = interval;
+        }
+
+        #endregion
+
+        #region CalcLinearLabelPoint
+
+        private void CalcLinearLabelPoint(GaugeLinearScale scale)
+        {
+            double ticks = scale.MaxValue - scale.MinValue;
+
+            _LabelPoint = new LabelPoint();
+
+            if (scale.Orientation == Orientation.Horizontal)
+            {
+                double dpt = scale.ScaleBounds.Width / ticks;
+                int dx = (int)((_Value - Scale.MinValue) * dpt);
+
+                int x = (scale.Reversed == true)
+                    ? Scale.Bounds.Right - dx : Scale.Bounds.X + dx;
+
+                _LabelPoint.Point = new Point(x, scale.ScaleBounds.Y + Offset);
+            }
+            else
+            {
+                double dpt = scale.ScaleBounds.Height / ticks;
+                int dy = (int)((_Value - Scale.MinValue) * dpt);
+
+                int y = (scale.Reversed == true)
+                    ? Scale.Bounds.Top + dy : Scale.Bounds.Bottom - dy;
+
+                _LabelPoint.Point = new Point(scale.ScaleBounds.X + Offset, y);
+            }
+
+            _LabelPoint.Interval = _Value;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region OnPaint
+
+        public override void OnPaint(PaintEventArgs e)
+        {
+            Graphics g = e.Graphics;
+
+            RecalcLayout();
+
+            if (_LabelPoint != null)
+            {
+                if (_LabelPoint.Visible == true)
+                {
+                    if (Scale.GaugeControl.OnPreRenderScaleCustomLabel(e, this) == false)
+                    {
+                        using (Brush br = new SolidBrush(Layout.ForeColor))
+                            PaintLabel(g, _Text, br, _LabelPoint, AbsFont);
+
+                        Scale.GaugeControl.OnPostRenderScaleCustomLabel(e, this);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region OnDispose
+
+        protected override void OnDispose()
+        {
+            HookEvents(false);
+
+            base.OnDispose();
+        }
+
+        #endregion
+
+        #region ICloneable Members
+
+        public override object Clone()
+        {
+            GaugeCustomLabel copy = new GaugeCustomLabel();
+
+            CopyToItem(copy);
+
+            return (copy);
+        }
+
+        #endregion
+
+        #region CopyToItem
+
+        public override void CopyToItem(GaugeItem copy)
+        {
+            GaugeCustomLabel c = copy as GaugeCustomLabel;
+
+            if (c != null)
+            {
+                base.CopyToItem(c);
+
+                c.Text = _Text;
+                c.Value = _Value;
+
+                _TickMark.CopyToItem(c.TickMark);
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeLabel/GaugeIntervalLabel.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeLabel/GaugeIntervalLabel.cs
new file mode 100644
index 00000000..9b28f7e0
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeLabel/GaugeIntervalLabel.cs	
@@ -0,0 +1,585 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Globalization;
+using System.Windows.Forms;
+
+namespace DevComponents.Instrumentation
+{
+    [TypeConverter(typeof(GaugeLabelConvertor))]
+    public class GaugeIntervalLabel : GaugeBaseLabel
+    {
+        #region Private variables
+
+        private double _Interval;
+        private double _IntervalOffset;
+
+        private LabelPoint[] _LabelPoints;
+
+        private bool _ShowMaxLabel;
+        private bool _ShowMinLabel;
+
+        private string _FormatString;
+
+        #endregion
+
+        public GaugeIntervalLabel(GaugeScale scale)
+        {
+            Scale = scale;
+
+            _Interval = double.NaN;
+            _IntervalOffset = double.NaN;
+
+            _ShowMinLabel = true;
+            _ShowMaxLabel = true;
+        }
+
+        #region Hidden properties
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public new string Name
+        {
+            get { return (base.Name); }
+            set { base.Name = value; }
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region FormatString
+
+        /// <summary>
+        /// Gets or sets the .Net format string used to display all non-custom defined labels.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), DefaultValue(null)]
+        [Description("Indicates the .Net format string used to display all non-custom defined labels.")]
+        [Editor("DevComponents.Instrumentation.Design.FormatStringEditor, DevComponents.Instrumentation.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=76cb4c6eb576bca5", typeof(UITypeEditor))]
+        public string FormatString
+        {
+            get { return (_FormatString); }
+
+            set
+            {
+                if (_FormatString != value)
+                {
+                    _FormatString = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region Interval
+
+        /// <summary>
+        /// Gets or sets the Label Interval
+        /// </summary>
+        [Browsable(true), Category("Appearance"), DefaultValue(double.NaN)]
+        [Description("Indicates the Label Interval.")]
+        public double Interval
+        {
+            get { return (_Interval); }
+
+            set
+            {
+                if (value < 0)
+                    throw new ArgumentException("Value can not be less than zero.");
+
+                if (_Interval != value)
+                {
+                    _Interval = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region IntervalOffset
+
+        /// <summary>
+        /// Gets or sets the Label Interval Offset
+        /// </summary>
+        [Browsable(true), Category("Appearance"), DefaultValue(double.NaN)]
+        [Description("Indicates the Label Interval Offset.")]
+        public double IntervalOffset
+        {
+            get { return (_IntervalOffset); }
+
+            set
+            {
+                if (value < 0)
+                    throw new ArgumentException("Value can not be less than zero.");
+
+                if (_IntervalOffset != value)
+                {
+                    _IntervalOffset = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowMaxLabel
+
+        /// <summary>
+        /// Gets or sets whether to show the Maximum Scale label
+        /// </summary>
+        [Browsable(true), Category("Appearance"), DefaultValue(true)]
+        [Description("Indicates whether to show the Maximum Scale label.")]
+        public bool ShowMaxLabel
+        {
+            get { return (_ShowMaxLabel); }
+
+            set
+            {
+                if (_ShowMaxLabel != value)
+                {
+                    _ShowMaxLabel = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowMinLabel
+
+        /// <summary>
+        /// Gets or sets whether to show the Minimum Scale label
+        /// </summary>
+        [Browsable(true), Category("Appearance"), DefaultValue(true)]
+        [Description("Indicates whether to show the Minimum Scale label.")]
+        public bool ShowMinLabel
+        {
+            get { return (_ShowMinLabel); }
+
+            set
+            {
+                if (_ShowMinLabel != value)
+                {
+                    _ShowMinLabel = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RecalcLayout
+
+        public override void RecalcLayout()
+        {
+            if (NeedRecalcLayout == true)
+            {
+                base.RecalcLayout();
+
+                CalcLabelPoints();
+            }
+        }
+
+        #region CalcLabelPoints
+
+        private void CalcLabelPoints()
+        {
+            if (Scale is GaugeCircularScale)
+                CalcCircularLabelPoints(Scale as GaugeCircularScale);
+
+            else if (Scale is GaugeLinearScale)
+                CalcLinearLabelPoints(Scale as GaugeLinearScale);
+        }
+
+        #region CalcCircularLabelPoints
+
+        private void CalcCircularLabelPoints(GaugeCircularScale scale)
+        {
+            double labelInterval = (_Interval.Equals(double.NaN) ?
+                scale.MajorTickMarks.Interval : _Interval);
+
+            double labelIntervalOffset = (_IntervalOffset.Equals(double.NaN) ?
+                scale.MajorTickMarks.IntervalOffset : _IntervalOffset);
+
+            double spread = scale.MaxValue - scale.MinValue;
+            double dpt = scale.SweepAngle / spread;
+
+            int n = GetPointCount(spread, labelInterval, labelIntervalOffset);
+
+            if (n > 0)
+            {
+                double startAngle = scale.StartAngle;
+                double interval = (_ShowMinLabel == true ? 0 : labelIntervalOffset > 0 ? labelIntervalOffset : labelInterval);
+
+                int dir = (scale.Reversed ? -1 : 1);
+
+                if (scale.Reversed == true)
+                    startAngle += scale.SweepAngle;
+
+                _LabelPoints = new LabelPoint[n];
+
+                for (int i = 0; i < n; i++)
+                {
+                    _LabelPoints[i] = new LabelPoint();
+
+                    if (interval + scale.MinValue > scale.MaxValue)
+                        interval = scale.MaxValue - scale.MinValue;
+
+                    _LabelPoints[i].Angle = (float)(startAngle + (interval * dpt) * dir);
+                    _LabelPoints[i].Point = scale.GetPoint(Radius, _LabelPoints[i].Angle);
+                    _LabelPoints[i].Interval = interval;
+
+                    if (interval >= labelIntervalOffset)
+                        interval += labelInterval;
+                    else
+                        interval = labelIntervalOffset;
+                }
+            }
+            else
+            {
+                _LabelPoints = null;
+            }
+        }
+
+        #endregion
+
+        #region CalcLinearLabelPoints
+
+        private void CalcLinearLabelPoints(GaugeLinearScale scale)
+        {
+            double labelInterval = (_Interval.Equals(double.NaN) ?
+                scale.MajorTickMarks.Interval : _Interval);
+
+            double labelIntervalOffset = (_IntervalOffset.Equals(double.NaN) ?
+                scale.MajorTickMarks.IntervalOffset : _IntervalOffset);
+
+            double spread = Math.Abs(scale.MaxValue - scale.MinValue);
+            double dpt = scale.AbsScaleLength / spread;
+
+            int n = GetPointCount(spread, labelInterval, labelIntervalOffset);
+
+            if (n > 0)
+            {
+                if (scale.Orientation == Orientation.Horizontal)
+                    CalcHorizontalLabelPoints(scale, n, dpt, labelInterval, labelIntervalOffset);
+                else
+                    CalcVerticalLabelPoints(scale, n, dpt, labelInterval, labelIntervalOffset);
+            }
+            else
+            {
+                _LabelPoints = null;
+            }
+        }
+
+        #region CalcHorizontalLabelPoints
+
+        private void CalcHorizontalLabelPoints(GaugeLinearScale scale,
+            int n, double dpt, double labelInterval, double labelIntervalOffset)
+        {
+            double interval = (_ShowMinLabel == true ?
+                0 : labelIntervalOffset > 0 ? labelIntervalOffset : labelInterval);
+
+            int y = scale.ScaleBounds.Y + Offset;
+
+            _LabelPoints = new LabelPoint[n];
+
+            for (int i = 0; i < n; i++)
+            {
+                _LabelPoints[i] = new LabelPoint();
+
+                if (interval + Scale.MinValue > Scale.MaxValue)
+                    interval = Scale.MaxValue - Scale.MinValue;
+
+                int x = (scale.Reversed == true)
+                             ? (int)(Scale.Bounds.Right - dpt * interval)
+                             : (int)(Scale.Bounds.X + dpt * interval);
+
+                _LabelPoints[i].Point = new Point(x, y);
+                _LabelPoints[i].Interval = interval;
+
+                if (interval >= labelIntervalOffset)
+                    interval += labelInterval;
+                else
+                    interval = labelIntervalOffset;
+            }
+        }
+
+        #endregion
+
+        #region CalcVerticalLabelPoints
+
+        private void CalcVerticalLabelPoints(GaugeLinearScale scale,
+            int n, double dpt, double labelInterval, double labelIntervalOffset)
+        {
+            double interval = (_ShowMinLabel == true ?
+                0 : labelIntervalOffset > 0 ? labelIntervalOffset : labelInterval);
+
+            int x = scale.ScaleBounds.X + Offset;
+
+            _LabelPoints = new LabelPoint[n];
+
+            for (int i = 0; i < n; i++)
+            {
+                _LabelPoints[i] = new LabelPoint();
+
+                if (interval + Scale.MinValue > Scale.MaxValue)
+                    interval = Scale.MaxValue - Scale.MinValue;
+
+                int y = (scale.Reversed == true)
+                     ? (int)(Scale.Bounds.Top + dpt * interval)
+                     : (int)(Scale.Bounds.Bottom - dpt * interval);
+
+                _LabelPoints[i].Point = new Point(x, y);
+                _LabelPoints[i].Interval = interval;
+
+                if (interval >= labelIntervalOffset)
+                    interval += labelInterval;
+                else
+                    interval = labelIntervalOffset;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetPointCount
+
+        private int GetPointCount(double spread,
+            double labelInterval, double labelIntervalOffset)
+        {
+            int n = (int)Math.Ceiling((spread - labelIntervalOffset) / labelInterval) + 1;
+
+            if (labelIntervalOffset == 0)
+            {
+                if (_ShowMinLabel == false)
+                    n--;
+            }
+            else
+            {
+                if (_ShowMinLabel == true)
+                    n++;
+            }
+
+            if (_ShowMaxLabel == false)
+                n--;
+
+            return (n);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region OnPaint
+
+        public override void OnPaint(PaintEventArgs e)
+        {
+            Graphics g = e.Graphics;
+
+            RecalcLayout();
+
+            if (Scale.GaugeControl.OnPreRenderScaleTickMarkLabels(e, Scale) == false)
+            {
+                if (_LabelPoints != null)
+                {
+                    Font font = AbsFont;
+                    SolidBrush br = null;
+
+                    try
+                    {
+                        foreach (LabelPoint lp in _LabelPoints)
+                        {
+                            if (CanDisplayLabel(lp) == true)
+                            {
+                                br = GetLabelBrush(br, lp);
+
+                                PaintLabel(g, GetLabelText(lp), br, lp, font);
+                            }
+                        }
+                    }
+                    finally
+                    {
+                        if (br != null)
+                            br.Dispose();
+                    }
+                }
+
+                Scale.GaugeControl.OnPostRenderScaleTickMarkLabels(e, Scale);
+            }
+        }
+
+        #region GetLabelText
+
+        private string GetLabelText(LabelPoint labelPoint)
+        {
+            double n = Scale.GetIntervalValue(labelPoint.Interval);
+
+            if (String.IsNullOrEmpty(_FormatString) == false)
+            {
+                try
+                {
+                    switch (_FormatString[0])
+                    {
+                        case 'X':
+                        case 'x':
+                            return (String.Format("{0:" + _FormatString + "}", (int) n));
+
+                        default:
+                            return (String.Format("{0:" + _FormatString + "}", n));
+                    }
+                }
+                catch
+                {
+                }
+            }
+
+            return (n.ToString());
+        }
+
+        #endregion
+
+        #region GetLabelBrush
+
+        private SolidBrush GetLabelBrush(SolidBrush br, LabelPoint lp)
+        {
+            Color color = GetLabelColor(lp);
+
+            if (br == null || br.Color != color)
+            {
+                if (br != null)
+                    br.Dispose();
+
+                br = new SolidBrush(color);
+            }
+
+            return (br);
+        }
+
+        #endregion
+
+        #region GetLabelColor
+
+        private Color GetLabelColor(LabelPoint lp)
+        {
+            Color labelColor = Scale.GetRangeLabelColor(lp.Interval);
+
+            if (labelColor.IsEmpty == true)
+                labelColor = Scale.GetSectionLabelColor(lp.Interval);
+
+            if (labelColor.IsEmpty == true)
+                labelColor = Layout.ForeColor;
+
+            return (labelColor);
+        }
+
+        #endregion
+
+        #region CanDisplayLabel
+
+        private bool CanDisplayLabel(LabelPoint labelPoint)
+        {
+            if (labelPoint.Visible == false)
+                return (false);
+
+            if (Scale.HasCustomLabels == true)
+            {
+                foreach (GaugeCustomLabel label in Scale.CustomLabels)
+                {
+                    if (label.Visible == true)
+                    {
+                        if (label.Layout.Placement == Layout.Placement)
+                        {
+                            if (label.Value == Scale.MinValue + labelPoint.Interval)
+                                return (false);
+                        }
+                    }
+                }
+            }
+
+            return (true);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ICloneable Members
+
+        public override object Clone()
+        {
+            GaugeIntervalLabel copy = new GaugeIntervalLabel(Scale);
+
+            CopyToItem(copy);
+
+            return (copy);
+        }
+
+        #endregion
+
+        #region CopyToItem
+
+        public override void CopyToItem(GaugeItem copy)
+        {
+            GaugeIntervalLabel c = copy as GaugeIntervalLabel;
+
+            if (c != null)
+            {
+                base.CopyToItem(c);
+
+                c.FormatString = _FormatString;
+                c.Interval = _Interval;
+                c.IntervalOffset = _IntervalOffset;
+                c.ShowMaxLabel = _ShowMaxLabel;
+                c.ShowMinLabel = _ShowMinLabel;
+            }
+        }
+
+        #endregion
+    }
+
+    #region GaugeLabelConvertor
+
+    public class GaugeLabelConvertor : ExpandableObjectConverter
+    {
+        public override object ConvertTo(
+            ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+        {
+            if (destinationType == typeof(string))
+            {
+                GaugeIntervalLabel label = value as GaugeIntervalLabel;
+
+                if (label != null)
+                {
+                    //ColorConverter cvt = new ColorConverter();
+
+                    //if (lct.Start != Color.Empty)
+                    //    return (cvt.ConvertToString(lct.Start));
+
+                    //if (lct.End != Color.Empty)
+                    //    return (cvt.ConvertToString(lct.End));
+
+                    //if (lct.GradientAngle != 90)
+                    //    return (lct.GradientAngle.ToString());
+
+                    return (String.Empty);
+                }
+            }
+
+            return (base.ConvertTo(context, culture, value, destinationType));
+        }
+    }
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeLabel/LabelLayout.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeLabel/LabelLayout.cs
new file mode 100644
index 00000000..5713bd93
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeLabel/LabelLayout.cs	
@@ -0,0 +1,409 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Globalization;
+
+namespace DevComponents.Instrumentation
+{
+    [TypeConverter(typeof(LabelLayoutConvertor))]
+    public class LabelLayout : IDisposable, ICloneable
+    {
+        #region Events
+
+        public event EventHandler<EventArgs> LabelLayoutChanged;
+
+        #endregion
+
+        #region Private variables
+
+        private DisplayPlacement _Placement;
+        private float _ScaleOffset;
+
+        private Font _Font;
+        private Font _AbsFont;
+        private float _Angle;
+
+        private bool _AutoSize;
+        private bool _RotateLabel;
+        private bool _AdaptiveLabel;
+        private bool _AutoOrientLabel;
+
+        private Color _ForeColor;
+
+        #endregion
+
+        public LabelLayout()
+        {
+            _ForeColor = Color.Black;
+
+            _Placement = DisplayPlacement.Near;
+
+            _AutoSize = true;
+            _AutoOrientLabel = true;
+            _RotateLabel = true;
+        }
+
+        #region Public properties
+
+        #region AdaptiveLabel
+
+        /// <summary>
+        /// Gets or sets whether labels are to adapt to the scale shape
+        /// </summary>
+        [Browsable(true)]
+        [Category("Behavior"), DefaultValue(false)]
+        [Description("Indicates whether labels are to adapt to the scale shape.")]
+        public bool AdaptiveLabel
+        {
+            get { return (_AdaptiveLabel); }
+
+            set
+            {
+                if (_AdaptiveLabel != value)
+                {
+                    _AdaptiveLabel = value;
+
+                    OnLabelLayoutChanged();
+                }
+            }
+        }
+
+                #endregion
+
+        #region Angle
+
+        /// <summary>
+        /// Gets or sets the additional number of degrees the label will be rotated
+        /// </summary>
+        [Browsable(true), Category("Appearance"), DefaultValue(0f)]
+        [Description("Indicates the additional number of degrees the label will be rotated.")]
+        [Editor("DevComponents.Instrumentation.Design.AngleRangeValueEditor, DevComponents.Instrumentation.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=76cb4c6eb576bca5", typeof(UITypeEditor))]
+        [NotifyParentProperty(true)]
+        public float Angle
+        {
+            get { return (_Angle); }
+
+            set
+            {
+                if (_Angle != value)
+                {
+                    _Angle = value;
+
+                    OnLabelLayoutChanged();
+                }
+            }
+        }
+
+        #endregion
+
+        #region AutoOrientLabel
+
+        /// <summary>
+        /// Gets or sets whether the label will be auto oriented away from being upside down
+        /// </summary>
+        [Browsable(true)]
+        [Category("Behavior"), DefaultValue(true)]
+        [Description("Indicates whether the label will be auto oriented away from being upside down.")]
+        public bool AutoOrientLabel
+        {
+            get { return (_AutoOrientLabel); }
+
+            set
+            {
+                if (_AutoOrientLabel != value)
+                {
+                    _AutoOrientLabel = value;
+
+                    OnLabelLayoutChanged();
+                }
+            }
+        }
+
+        #endregion
+
+        #region AutoSize
+
+        /// <summary>
+        /// Gets or sets whether the label Font size is auto sized
+        /// </summary>
+        [Browsable(true)]
+        [Category("Behavior"), DefaultValue(true)]
+        [Description("Indicates whether the label Font size is auto sized.")]
+        public bool AutoSize
+        {
+            get { return (_AutoSize); }
+
+            set
+            {
+                if (_AutoSize != value)
+                {
+                    _AutoSize = value;
+                    AbsFont = null;
+
+                    OnLabelLayoutChanged();
+                }
+            }
+        }
+
+        #endregion
+
+        #region Font
+
+        /// <summary>
+        /// Gets or sets the Font to use for the label
+        /// </summary>
+        [Browsable(true)]
+        [Category("Appearance")]
+        [Description("Indicates the Font to use for the label.")]
+        public Font Font
+        {
+            get
+            {
+                if (_Font == null)
+                    _Font = new Font("Microsoft SanSerif", 12);
+
+                return (_Font);
+            }
+
+            set
+            {
+                if (_Font != null)
+                    _Font.Dispose();
+
+                _Font = value;
+                AbsFont = null;
+
+                OnLabelLayoutChanged();
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        internal virtual bool ShouldSerializeFont()
+        {
+            if (_Font == null)
+                return (false);
+
+            using (Font font = new Font("Microsoft SanSerif", 12))
+                return (_Font.Equals(font) == false);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        internal virtual void ResetFont()
+        {
+            Font = new Font("Microsoft SanSerif", 12);
+        }
+
+        #endregion
+
+        #region ForeColor
+
+        /// <summary>
+        /// Gets or sets the Label text Color
+        /// </summary>
+        [Browsable(true), Category("Appearance"), DefaultValue(typeof(Color), "Black")]
+        [Description("Indicates the Label text Color.")]
+        public Color ForeColor
+        {
+            get { return (_ForeColor); }
+
+            set
+            {
+                if (_ForeColor != value)
+                {
+                    _ForeColor = value;
+
+                    OnLabelLayoutChanged();
+                }
+            }
+        }
+
+        #endregion
+
+        #region Placement
+
+        /// <summary>
+        /// Gets or sets the Placement of the Label with respect to the Scale
+        /// </summary>
+        [Browsable(true)]
+        [Category("Layout"), DefaultValue(DisplayPlacement.Near)]
+        [Description("Indicates the Placement of the Label with respect to the Scale.")]
+        public DisplayPlacement Placement
+        {
+            get { return (_Placement); }
+
+            set
+            {
+                if (_Placement != value)
+                {
+                    _Placement = value;
+
+                    OnLabelLayoutChanged();
+                }
+            }
+        }
+
+        #endregion
+
+        #region RotateLabel
+
+        /// <summary>
+        /// Gets or sets whether labels are rotated along the scale
+        /// </summary>
+        [Browsable(true)]
+        [Category("Behavior"), DefaultValue(true)]
+        [Description("Indicates whether labels are rotated along the scale.")]
+        public bool RotateLabel
+        {
+            get { return (_RotateLabel); }
+
+            set
+            {
+                if (_RotateLabel != value)
+                {
+                    _RotateLabel = value;
+
+                    OnLabelLayoutChanged();
+                }
+            }
+        }
+
+        #endregion
+
+        #region ScaleOffset
+
+        /// <summary>
+        /// Gets or sets the distance from the Label to the Scale, measured as a percentage
+        /// </summary>
+        [Browsable(true)]
+        [Category("Layout"), DefaultValue(0f)]
+        [Editor("DevComponents.Instrumentation.Design.OffsetRangeValueEditor, DevComponents.Instrumentation.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=76cb4c6eb576bca5", typeof(UITypeEditor))]
+        [Description("Indicates the distance from the Label to the Scale, measured as a percentage.")]
+        public float ScaleOffset
+        {
+            get { return (_ScaleOffset); }
+
+            set
+            {
+                if (_ScaleOffset != value)
+                {
+                    _ScaleOffset = value;
+
+                    OnLabelLayoutChanged();
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region AbsFont
+
+        internal Font AbsFont
+        {
+            get { return (_AbsFont); }
+
+            set
+            {
+                if (_AbsFont != null)
+                    _AbsFont.Dispose();
+
+                _AbsFont = value;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region OnLabelLayoutChanged
+
+        private void OnLabelLayoutChanged()
+        {
+            if (LabelLayoutChanged != null)
+                LabelLayoutChanged(this, EventArgs.Empty);
+        }
+
+        #endregion
+
+        #region IDisposable Members
+
+        public void Dispose()
+        {
+            Font = null;
+            AbsFont = null;
+        }
+
+        #endregion
+
+        #region ICloneable Members
+
+        public virtual object Clone()
+        {
+            LabelLayout copy = new LabelLayout();
+
+            CopyToItem(copy);
+
+            return (copy);
+        }
+
+        #endregion
+
+        #region CopyToItem
+
+        internal virtual void CopyToItem(LabelLayout copy)
+        {
+            copy.AdaptiveLabel = _AdaptiveLabel;
+            copy.Angle = _Angle;
+            copy.AutoOrientLabel = _AutoOrientLabel;
+            copy.AutoSize = _AutoSize;
+
+            if (_Font != null)
+                copy.Font = (Font)_Font.Clone();
+
+            copy.ForeColor = _ForeColor;
+            copy.Placement = _Placement;
+            copy.RotateLabel = _RotateLabel;
+            copy.ScaleOffset = _ScaleOffset;
+        }
+
+        #endregion
+    }
+
+    #region LabelLayoutConvertor
+
+    public class LabelLayoutConvertor : ExpandableObjectConverter
+    {
+        public override object ConvertTo(
+            ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+        {
+            if (destinationType == typeof(string))
+            {
+                LabelLayout ll = value as LabelLayout;
+
+                if (ll != null)
+                {
+                    //ColorConverter cvt = new ColorConverter();
+
+                    //if (lct.Start != Color.Empty)
+                    //    return (cvt.ConvertToString(lct.Start));
+
+                    //if (lct.End != Color.Empty)
+                    //    return (cvt.ConvertToString(lct.End));
+
+                    //if (lct.GradientAngle != 90)
+                    //    return (lct.GradientAngle.ToString());
+
+                    return (String.Empty);
+                }
+            }
+
+            return (base.ConvertTo(context, culture, value, destinationType));
+        }
+    }
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeLabel/LabelPoint.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeLabel/LabelPoint.cs
new file mode 100644
index 00000000..0b43e9fa
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeLabel/LabelPoint.cs	
@@ -0,0 +1,152 @@
+using System.Drawing;
+
+namespace DevComponents.Instrumentation
+{
+    internal class LabelPoint
+    {
+        #region Private variables
+
+        private Point _Point;
+        private float _Angle;
+        private double _Interval;
+
+        private bool _Visible = true;
+
+        #endregion
+
+        #region Public properties
+
+        #region Angle
+
+        public float Angle
+        {
+            get { return (_Angle); }
+            set { _Angle = value; }
+        }
+
+        #endregion
+
+        #region Point
+
+        public Point Point
+        {
+            get { return (_Point); }
+            set { _Point = value; }
+        }
+
+        #endregion
+
+        #region Interval
+
+        public double Interval
+        {
+            get { return (_Interval); }
+            set { _Interval = value; }
+        }
+
+        #endregion
+
+        #region Visible
+
+        public bool Visible
+        {
+            get { return (_Visible); }
+            set { _Visible = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region PaintRotatedLabel
+
+        public void PaintRotatedLabel(Graphics g,
+            string text, LabelLayout layout, int height, Brush br, Font font)
+        {
+            SizeF sz = g.MeasureString(text, font);
+            Size size = sz.ToSize();
+
+            Point pt = new Point(0, 0);
+
+            switch (layout.Placement)
+            {
+                case DisplayPlacement.Far:
+                    pt.Y = -height / 2;
+                    break;
+
+                case DisplayPlacement.Near:
+                    pt.Y = height / 2;
+                    break;
+            }
+
+            g.TranslateTransform(_Point.X, _Point.Y);
+            g.RotateTransform((_Angle + 90) % 360);
+            g.TranslateTransform(pt.X, pt.Y);
+
+            float fontAngle = layout.Angle;
+
+            if (layout.AutoOrientLabel == true)
+            {
+                if (((_Angle + layout.Angle) % 360) < 180)
+                    fontAngle += 180;
+            }
+
+            g.RotateTransform(fontAngle);
+
+            g.DrawString(text, font, br,
+                new Point(-size.Width / 2, -size.Height / 2));
+
+            g.ResetTransform();
+        }
+
+        #endregion
+
+        #region PaintNonRotatedLabel
+
+        public void PaintNonRotatedLabel(Graphics g, string text,
+            LabelLayout layout, Point center, int radius, Brush br, Font font)
+        {
+            SizeF sz = g.MeasureString(text, font);
+
+            int x = _Point.X - center.X;
+            int y = _Point.Y - center.Y;
+
+            Point pt = new Point();
+
+            switch (layout.Placement)
+            {
+                case DisplayPlacement.Far:
+                    {
+                        int dx = (int)(((float)(x - radius) / (radius * 2)) * sz.Width);
+                        int dy = (int)(((float)(y - radius) / (radius * 2)) * sz.Height);
+
+                        pt = new Point(_Point.X + dx, _Point.Y + dy);
+                    }
+                    break;
+
+                case DisplayPlacement.Near:
+                    {
+                        int dx = (int)(((float)(x + radius) / (radius * 2)) * sz.Width);
+                        int dy = (int)(((float)(y + radius) / (radius * 2)) * sz.Height);
+
+                        pt = new Point(_Point.X - dx, _Point.Y - dy);
+                    }
+                    break;
+
+                case DisplayPlacement.Center:
+                    {
+                        int dx = (int)(sz.Width / 2);
+                        int dy = (int)(sz.Height / 2);
+
+                        pt = new Point(_Point.X - dx, _Point.Y - dy);
+                    }
+                    break;
+            }
+
+            g.DrawString(text, font, br, pt);
+        }
+
+        #endregion
+    }
+
+}
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugePin/GaugePin.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugePin/GaugePin.cs
new file mode 100644
index 00000000..4eb63346
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugePin/GaugePin.cs	
@@ -0,0 +1,742 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Globalization;
+using System.Windows.Forms;
+
+namespace DevComponents.Instrumentation
+{
+    [TypeConverter(typeof(GaugePinConvertor))]
+    public class GaugePin : GaugeItem
+    {
+        #region Private variables
+
+        private GaugeMarkerStyle _Style = GaugeMarkerStyle.Circle;
+        private DisplayPlacement _Placement = DisplayPlacement.Center;
+
+        private float _ScaleOffset;         // Relative distance from scale
+        private float _EndOffset;           // Relative distance or degrees from end
+
+        private GradientFillColor _FillColor;
+
+        private Image _Image;
+
+        private int _Radius;
+        private float _Angle;
+        private Rectangle _Bounds;
+
+        private float _Width;
+        private float _Length;
+        private bool _IsMaxPin;
+
+        private GaugeMarker _GaugeMarker;
+        private GaugePinLabel _Label;
+
+        private GaugeScale _Scale;
+
+        #endregion
+
+        public GaugePin(GaugeScale scale, bool isMmaxPin, string name)
+        {
+            _Scale = scale;
+            _IsMaxPin = isMmaxPin;
+
+            Name = name;
+
+            _GaugeMarker = new GaugeMarker();
+            _Label = new GaugePinLabel(this);
+
+            FillColor = new GradientFillColor(Color.WhiteSmoke);
+            FillColor.BorderColor = Color.DimGray;
+            FillColor.BorderWidth = 1;
+
+            Length = .06f;
+            Width = .06f;
+
+            _EndOffset = .02f;
+
+            HookEvents(true);
+        }
+
+        #region Public properties
+
+        #region EndOffset
+
+        /// <summary>
+        /// Gets or sets the offset from the end of the scale, specified as a percentage
+        /// </summary>
+        [Browsable(true), Category("Layout"), DefaultValue(.02f)]
+        [Editor("DevComponents.Instrumentation.Design.OffsetRangeValueEditor, DevComponents.Instrumentation.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=76cb4c6eb576bca5", typeof(UITypeEditor))]
+        [Description("Indicates the offset from the end of the scale, specified as a percentage.")]
+        public float EndOffset
+        {
+            get { return (_EndOffset); }
+
+            set
+            {
+                if (_EndOffset != value)
+                {
+                    if (value < -1 || value > 1)
+                        throw new ArgumentException("Value must be between -1 and +1.");
+
+                    _EndOffset = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region FillColor
+
+        /// <summary>
+        /// Gets or sets Indicates the Pin FillColor
+        /// </summary>
+        [Browsable(true), Category("Appearance")]
+        [Description("Indicates the Pin FillColor.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public GradientFillColor FillColor
+        {
+            get
+            {
+                if (_FillColor == null)
+                {
+                    _FillColor = new GradientFillColor();
+                    _FillColor.ColorTableChanged += FillColor_ColorTableChanged;
+                }
+
+                return (_FillColor);
+            }
+
+            set
+            {
+                if (_FillColor != null)
+                    _FillColor.ColorTableChanged -= FillColor_ColorTableChanged;
+
+                _FillColor = value;
+
+                if (_FillColor != null)
+                    _FillColor.ColorTableChanged += FillColor_ColorTableChanged;
+
+                OnGaugeItemChanged(true);
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        internal bool ShouldSerializeFillColor()
+        {
+            return (FillColor.IsEqualTo(Color.WhiteSmoke,
+                Color.Empty, 90, GradientFillType.Auto, Color.DimGray, 1) == false);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        internal void ResetFillColor()
+        {
+            FillColor = new GradientFillColor(Color.WhiteSmoke);
+            FillColor.BorderColor = Color.DimGray;
+            FillColor.BorderWidth = 1;
+        }
+
+        #endregion
+
+        #region Image
+
+        /// <summary>
+        /// Gets or sets the Image to use for the Pin
+        /// </summary>
+        [Browsable(true), Category("Appearance"), DefaultValue(null)]
+        [Description("Indicates the Image to use for the Pin.")]
+        public Image Image
+        {
+            get { return (_Image); }
+
+            set
+            {
+                if (_Image != value)
+                {
+                    _Image = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region IsMaxPin
+
+        /// <summary>
+        /// Gets whether the pin is the Maximum Pin
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsMaxPin
+        {
+            get { return (_IsMaxPin); }
+            internal set { _IsMaxPin = value; }
+        }
+
+        #endregion
+
+        #region Label
+
+        /// <summary>
+        /// Gets or sets the Label associated with the Pin
+        /// </summary>
+        [Browsable(true), Category("Appearance")]
+        [Description("Indicates the Label associated with the Pin.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public GaugePinLabel Label
+        {
+            get { return (_Label); }
+            internal set { _Label = value; }
+        }
+
+        #endregion
+
+        #region Length
+
+        /// <summary>
+        /// Gets or sets the Length of the Pin, specified as a percentage
+        /// </summary>
+        [Browsable(true), Category("Layout"), DefaultValue(.06f)]
+        [Editor("DevComponents.Instrumentation.Design.RangeValueEditor, DevComponents.Instrumentation.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=76cb4c6eb576bca5", typeof(UITypeEditor))]
+        [Description("Indicates the Length of the Pin, specified as a percentage.")]
+        public float Length
+        {
+            get { return (_Length); }
+
+            set
+            {
+                if (_Length != value)
+                {
+                    if (value < 0 || value > 1)
+                        throw new ArgumentException("Value must be between 0 and +1.");
+
+                    _Length = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region Placement
+
+        /// <summary>
+        /// Gets or sets the Placement of the Pin with respect to the Scale
+        /// </summary>
+        [Browsable(true)]
+        [Category("Layout"), DefaultValue(DisplayPlacement.Center)]
+        [Description("Indicates the Placement of the Pin with respect to the Scale.")]
+        public DisplayPlacement Placement
+        {
+            get { return (_Placement); }
+
+            set
+            {
+                if (_Placement != value)
+                {
+                    _Placement = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region Scale
+
+        /// <summary>
+        /// Gets the pin's associated Scale
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public GaugeScale Scale
+        {
+            get { return (_Scale); }
+
+            internal set
+            {
+                _Scale = value;
+                _Label.Scale = value;
+
+                OnGaugeItemChanged(true);
+            }
+        }
+
+        #endregion
+
+        #region ScaleOffset
+
+        /// <summary>
+        /// Gets or sets the distance from the Pin to the Scale, measured as a percentage
+        /// </summary>
+        [Browsable(true)]
+        [Category("Layout"), DefaultValue(0f)]
+        [Editor("DevComponents.Instrumentation.Design.OffsetRangeValueEditor, DevComponents.Instrumentation.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=76cb4c6eb576bca5", typeof(UITypeEditor))]
+        [Description("Indicates the distance from the Pin to the Scale, measured as a percentage.")]
+        public float ScaleOffset
+        {
+            get { return (_ScaleOffset); }
+
+            set
+            {
+                if (_ScaleOffset != value)
+                {
+                    _ScaleOffset = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+        
+        #region Style
+
+        /// <summary>
+        /// Gets or sets the Pin display style
+        /// </summary>
+        [Browsable(true)]
+        [Category("Appearance"), DefaultValue(GaugeMarkerStyle.Circle)]
+        [Description("Indicates the Pin display style.")]
+        public GaugeMarkerStyle Style
+        {
+            get { return (_Style); }
+
+            set
+            {
+                if (_Style != value)
+                {
+                    _Style = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region Width
+
+        /// <summary>
+        /// Gets or sets the Width of the Pin, specified as a percentage
+        /// </summary>
+        [Browsable(true), Category("Layout"), DefaultValue(.06f)]
+        [Editor("DevComponents.Instrumentation.Design.WidthRangeValueEditor, DevComponents.Instrumentation.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=76cb4c6eb576bca5", typeof(UITypeEditor))]
+        [Description("Indicates the Width of the Pin, specified as a percentage.")]
+        public float Width
+        {
+            get { return (_Width); }
+
+            set
+            {
+                if (_Width != value)
+                {
+                    if (value < 0 || value > 1)
+                        throw new ArgumentException("Value must be between 0 and +1.");
+
+                    _Width = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region Angle
+
+        internal float Angle
+        {
+            get { return (_Angle); }
+        }
+
+        #endregion
+
+        #region Bounds
+
+        internal Rectangle Bounds
+        {
+            get { return (_Bounds); }
+            set { _Bounds = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region HookEvents
+
+        private void HookEvents(bool hook)
+        {
+            if (hook == true)
+                _Label.GaugeItemChanged += GaugePinLabel_GaugeItemChanged;
+            else
+                _Label.GaugeItemChanged -= GaugePinLabel_GaugeItemChanged;
+        }
+
+        #endregion
+
+        #region Event processing
+
+        void FillColor_ColorTableChanged(object sender, EventArgs e)
+        {
+            OnGaugeItemChanged(true);
+        }
+
+        void GaugePinLabel_GaugeItemChanged(object sender, EventArgs e)
+        {
+            OnGaugeItemChanged(true);
+        }
+
+        #endregion
+
+        #region RecalcLayout
+
+        public override void RecalcLayout()
+        {
+            if (NeedRecalcLayout == true)
+            {
+                base.RecalcLayout();
+
+                CalcPinMetrics();
+
+                _GaugeMarker.Clear();
+                _Label.NeedRecalcLayout = true;
+            }
+        }
+
+        #region CalcPinMetrics
+
+        private void CalcPinMetrics()
+        {
+            if (Scale is GaugeCircularScale)
+                CalcCircularMetrics(Scale as GaugeCircularScale);
+
+            else if (Scale is GaugeLinearScale)
+                CalcLinearMetrics(Scale as GaugeLinearScale);
+        }
+
+        #region CalcCircularMetrics
+
+        private void CalcCircularMetrics(GaugeCircularScale scale)
+        {
+            _Radius = scale.AbsRadius;
+            _Bounds = new Rectangle(0, 0, (int)(_Radius * _Width), (int)(_Radius * _Length));
+
+            int m = scale.AbsScaleWidth;
+            int offset = (int)(scale.AbsRadius * _ScaleOffset);
+
+            switch (_Placement)
+            {
+                case DisplayPlacement.Near:
+                    _Radius -= ((_Bounds.Height + m) / 2 + offset);
+                    break;
+
+                case DisplayPlacement.Center:
+                    _Radius += (offset);
+                    break;
+
+                case DisplayPlacement.Far:
+                    _Radius += ((_Bounds.Height + m) / 2 + offset);
+                    break;
+            }
+
+            float angle = _EndOffset * 360;
+
+            if (_IsMaxPin != scale.Reversed)
+                _Angle = scale.StartAngle + scale.SweepAngle + angle;
+            else
+                _Angle = scale.StartAngle - angle;
+
+            Point pt = scale.GetPoint(_Radius, _Angle);
+
+            _Bounds.Location = new Point(pt.X - _Bounds.Width / 2, pt.Y - _Bounds.Height / 2);
+
+        }
+
+        #endregion
+
+        #region CalcLinearMetrics
+
+        private void CalcLinearMetrics(GaugeLinearScale scale)
+        {
+            if (scale.Orientation == Orientation.Horizontal)
+                CalcHorizontalMetrics(scale);
+            else
+                CalcVerticalMetrics(scale);
+        }
+
+        #region CalcHorizontalMetrics
+
+        private void CalcHorizontalMetrics(GaugeLinearScale scale)
+        {
+            int width = scale.AbsWidth;
+            int offset = (int)(width * _ScaleOffset);
+            int m = scale.AbsScaleWidth;
+
+            _Bounds = new Rectangle(0, 0, (int)(width * _Width), (int)(width * _Length));
+
+            int x = (int)(_EndOffset * scale.AbsLength);
+
+            if (_IsMaxPin != scale.Reversed)
+                x += scale.ScaleBounds.Right;
+            else
+                x = scale.ScaleBounds.Left - x;
+
+            x -= _Bounds.Width / 2;
+
+            int y = scale.ScaleBounds.Y;
+
+            switch (_Placement)
+            {
+                case DisplayPlacement.Near:
+                    y -= (_Bounds.Height + offset);
+                    break;
+
+                case DisplayPlacement.Center:
+                    y -= ((_Bounds.Height - m) / 2 + offset);
+                    break;
+
+                case DisplayPlacement.Far:
+                    y += (m + offset);
+                    break;
+            }
+
+            _Bounds.Location = new Point(x, y);
+        }
+
+        #endregion
+
+        #region CalcVerticalMetrics
+
+        private void CalcVerticalMetrics(GaugeLinearScale scale)
+        {
+            int width = scale.AbsWidth;
+            int offset = (int)(width * _ScaleOffset);
+            int m = scale.AbsScaleWidth;
+
+            _Bounds = new Rectangle(0, 0, (int)(width * _Width), (int)(width * _Length));
+
+            int y = (int)(_EndOffset * scale.AbsLength);
+
+            if (_IsMaxPin != scale.Reversed)
+                y = scale.ScaleBounds.Top - y;
+            else
+                y += scale.ScaleBounds.Bottom;
+
+            y -= _Bounds.Height / 2;
+
+            int x = scale.ScaleBounds.X;
+
+            switch (_Placement)
+            {
+                case DisplayPlacement.Near:
+                    x -= (_Bounds.Width + offset);
+                    break;
+
+                case DisplayPlacement.Center:
+                    x -= ((_Bounds.Width - m ) / 2 + offset);
+                    break;
+
+                case DisplayPlacement.Far:
+                    x += (m + offset);
+                    break;
+            }
+
+            _Bounds.Location = new Point(x, y);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region OnPaint
+
+        public override void OnPaint(PaintEventArgs e)
+        {
+            RecalcLayout();
+
+            if (Scale.GaugeControl.OnPreRenderScaleGaugePin(e, this) == false)
+            {
+                Graphics g = e.Graphics;
+
+                if (_Bounds.Width > 0 && _Bounds.Height > 0)
+                {
+                    Image image = _Image ?? GetPinBitmap(g);
+
+                    if (image != null)
+                    {
+                        if (Scale is GaugeCircularScale)
+                            PaintCircularPin(g, image);
+
+                        else if (Scale is GaugeLinearScale)
+                            PaintLinearPin(g, image);
+                    }
+
+                    if (_Label.Visible)
+                        _Label.OnPaint(e);
+                }
+
+                Scale.GaugeControl.OnPostRenderScaleGaugePin(e, this);
+            }
+        }
+
+        #region PaintCircularPin
+
+        private void PaintCircularPin(Graphics g, Image image)
+        {
+            Rectangle r = new Rectangle(0, 0, _Bounds.Width, _Bounds.Height);
+
+            float angle = _Angle + 90;
+
+            if (_Placement == DisplayPlacement.Near)
+                angle += 180;
+
+            g.TranslateTransform(_Bounds.X + _Bounds.Width / 2, _Bounds.Y + _Bounds.Height / 2);
+            g.RotateTransform(angle % 360);
+
+            r.X -= _Bounds.Width / 2;
+            r.Y -= _Bounds.Height / 2;
+
+            g.DrawImage(image, r);
+            g.ResetTransform();
+        }
+
+        #endregion
+
+        #region PaintLinearPin
+
+        #region PaintLinearPin
+
+        private void PaintLinearPin(Graphics g, Image image)
+        {
+            g.DrawImage(image, _Bounds);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetPinBitmap
+
+        internal Bitmap GetPinBitmap(Graphics g)
+        {
+            if (_Style != GaugeMarkerStyle.None)
+                return (_GaugeMarker.GetMarkerBitmap(g, _Style, _FillColor, _Bounds.Width, _Bounds.Height));
+
+            return (null);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region OnDispose
+
+        protected override void OnDispose()
+        {
+            HookEvents(false);
+
+            _GaugeMarker.Dispose();
+
+            base.OnDispose();
+        }
+
+        #endregion
+
+        #region ICloneable Members
+
+        public override object Clone()
+        {
+            GaugePin copy = new
+                GaugePin(_Scale, _IsMaxPin, Name);
+
+            CopyToItem(copy);
+
+            return (copy);
+        }
+
+        #endregion
+
+        #region CopyToItem
+
+        public override void CopyToItem(GaugeItem copy)
+        {
+            GaugePin c = copy as GaugePin;
+
+            if (c != null)
+            {
+                base.CopyToItem(c);
+
+                c.EndOffset = _EndOffset;
+
+                if (_FillColor != null)
+                    c.FillColor = (GradientFillColor)_FillColor.Clone();
+
+                c.Image = _Image;
+                c.IsMaxPin = _IsMaxPin;
+                c.Length = _Length;
+                c.Placement = _Placement;
+                c.Scale = _Scale;
+                c.ScaleOffset = _ScaleOffset;
+                c.Style = _Style;
+                c.Width = _Width;
+
+                c.Label = new GaugePinLabel(c);
+                _Label.CopyToItem(c.Label);
+            }
+        }
+
+        #endregion
+    }
+
+    #region GaugePinConvertor
+
+    public class GaugePinConvertor : ExpandableObjectConverter
+    {
+        public override object ConvertTo(
+            ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+        {
+            if (destinationType == typeof(string))
+            {
+                GaugePin pin = value as GaugePin;
+
+                if (pin != null)
+                {
+                    //ColorConverter cvt = new ColorConverter();
+
+                    //if (lct.Start != Color.Empty)
+                    //    return (cvt.ConvertToString(lct.Start));
+
+                    //if (lct.End != Color.Empty)
+                    //    return (cvt.ConvertToString(lct.End));
+
+                    //if (lct.GradientAngle != 90)
+                    //    return (lct.GradientAngle.ToString());
+
+                    return (String.Empty);
+                }
+            }
+
+            return (base.ConvertTo(context, culture, value, destinationType));
+        }
+    }
+
+    #endregion
+
+}
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugePin/GaugePinLabel.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugePin/GaugePinLabel.cs
new file mode 100644
index 00000000..1f55c25a
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugePin/GaugePinLabel.cs	
@@ -0,0 +1,183 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Windows.Forms;
+
+namespace DevComponents.Instrumentation
+{
+    public class GaugePinLabel : GaugeBaseLabel
+    {
+        #region Private variables
+
+        private string _Text;
+
+        private GaugePin _GaugePin;
+        private LabelPoint _LabelPoint;
+
+        #endregion
+
+        public GaugePinLabel(GaugePin gaugePin)
+        {
+            _Text = "";
+
+            _GaugePin = gaugePin;
+
+            Scale = gaugePin.Scale;
+        }
+
+        #region Public properties
+
+        #region Text
+
+        /// <summary>
+        /// Gets or sets the Label text
+        /// </summary>
+        [Browsable(true)]
+        [Category("Appearance"), DefaultValue("")]
+        [Description("Indicates the Label text.")]
+        public string Text
+        {
+            get { return (_Text); }
+
+            set
+            {
+                if (value != null && value.Equals(_Text) == false)
+                {
+                    _Text = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region GaugePin
+
+        internal GaugePin GaugePin
+        {
+            get { return (_GaugePin); }
+
+            set
+            {
+                _GaugePin = value;
+
+                OnGaugeItemChanged(true);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RecalcLayout
+
+        public override void RecalcLayout()
+        {
+            if (NeedRecalcLayout == true)
+            {
+                base.RecalcLayout();
+
+                _LabelPoint = null;
+
+                if (String.IsNullOrEmpty(_Text) == false)
+                {
+                    if (Scale is GaugeCircularScale)
+                        CalcCircularLabelPoint(Scale as GaugeCircularScale);
+
+                    else if (Scale is GaugeLinearScale)
+                        CalcLinearLabelPoint(Scale as GaugeLinearScale);
+                }
+            }
+        }
+
+        #region CalcCircularLabelPoint
+
+        private void CalcCircularLabelPoint(GaugeCircularScale scale)
+        {
+            if (Radius > 0)
+            {
+                _LabelPoint = new LabelPoint();
+
+                _LabelPoint.Angle = _GaugePin.Angle;
+                _LabelPoint.Point = scale.GetPoint(Radius, _LabelPoint.Angle);
+            }
+        }
+
+        #endregion
+
+        #region CalcLinearLabelPoint
+
+        private void CalcLinearLabelPoint(GaugeLinearScale scale)
+        {
+            _LabelPoint = new LabelPoint();
+
+            if (scale.Orientation == Orientation.Horizontal)
+            {
+                _LabelPoint.Point = new Point(
+                    _GaugePin.Bounds.X + _GaugePin.Bounds.Width / 2,
+                    scale.ScaleBounds.Y + Offset);
+            }
+            else
+            {
+                _LabelPoint.Point = new Point(
+                   scale.ScaleBounds.X + Offset,
+                   _GaugePin.Bounds.Y + _GaugePin.Bounds.Height / 2);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region OnPaint
+
+        public override void OnPaint(PaintEventArgs e)
+        {
+            Graphics g = e.Graphics;
+
+            RecalcLayout();
+
+            if (_LabelPoint != null && _LabelPoint.Visible == true)
+            {
+                using (Brush br = new SolidBrush(Layout.ForeColor))
+                    PaintLabel(g, _Text, br, _LabelPoint, AbsFont);
+            }
+        }
+
+        #endregion
+
+        #region ICloneable Members
+
+        public override object Clone()
+        {
+            GaugePinLabel copy = new GaugePinLabel(_GaugePin);
+
+            CopyToItem(copy);
+
+            return (copy);
+        }
+
+        #endregion
+
+        #region CopyToItem
+
+        public override void CopyToItem(GaugeItem copy)
+        {
+            GaugePinLabel c = copy as GaugePinLabel;
+
+            if (c != null)
+            {
+                base.CopyToItem(c);
+
+                c.Text = _Text;
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugePointers/GaugeBarRenderer.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugePointers/GaugeBarRenderer.cs
new file mode 100644
index 00000000..444ed354
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugePointers/GaugeBarRenderer.cs	
@@ -0,0 +1,784 @@
+using System;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Windows.Forms;
+
+namespace DevComponents.Instrumentation
+{
+    internal class GaugeBarRenderer : GaugePointerRenderer
+    {
+        #region Private variables
+
+        private float _StartAngle;
+        private float _SweepAngle;
+        private float _RoundAngle;
+
+        private double _Marker;
+        private double _Origin;
+
+        private Rectangle _Bounds;
+
+        #endregion
+
+        internal GaugeBarRenderer(GaugePointer gaugePointer)
+            : base(gaugePointer)
+        {
+        }
+
+        #region Internal properties
+
+        #region Bounds
+
+        internal Rectangle Bounds
+        {
+            get { return (_Bounds); }
+            set { _Bounds = value; }
+        }
+
+        #endregion
+
+        #region Marker
+
+        internal double Marker
+        {
+            get { return (_Marker); }
+        }
+
+        #endregion
+
+        #region Origin
+
+        internal double Origin
+        {
+            get { return (_Origin); }
+        }
+
+        #endregion
+
+        #region RoundAngle
+
+        internal float RoundAngle
+        {
+            get { return (_RoundAngle); }
+            set { _RoundAngle = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RecalcLayout
+
+        public override void RecalcLayout()
+        {
+            base.RecalcLayout();
+
+            if (Scale is GaugeCircularScale)
+                CalcCircularMarkerPoint(Scale as GaugeCircularScale);
+
+            else if (Scale is GaugeLinearScale)
+                CalcLinearMarkerPoint(Scale as GaugeLinearScale);
+        }
+
+        #region CalcCircularMarkerPoint
+
+        private void CalcCircularMarkerPoint(GaugeCircularScale scale)
+        {
+            int radius = Radius;
+
+            switch (GaugePointer.Placement)
+            {
+                case DisplayPlacement.Near:
+                    radius -= (Width / 2);
+                    break;
+
+                case DisplayPlacement.Far:
+                    radius += (Width / 2);
+                    break;
+            }
+
+            _Bounds.Size = new Size(radius * 2, radius * 2);
+            _Bounds.Location = new Point(scale.Center.X - radius, scale.Center.Y - radius);
+
+            Dpt = scale.SweepAngle / scale.Spread;
+
+            _Origin = GetOriginInterval() - scale.MinValue;
+            _Marker = GetInterval(Value) - scale.MinValue;
+
+            if (scale.Reversed == true)
+            {
+                IntervalAngle = (float)(scale.StartAngle + scale.SweepAngle  - (_Marker * Dpt));
+                _StartAngle = (float)(scale.StartAngle + scale.SweepAngle - (_Origin * Dpt));
+            }
+            else
+            {
+                IntervalAngle = (float)(scale.StartAngle + _Marker * Dpt);
+                _StartAngle = (float)(scale.StartAngle + _Origin * Dpt);
+            }
+
+            IntervalPoint = scale.GetPoint(radius, IntervalAngle);
+            _SweepAngle = IntervalAngle - _StartAngle;
+
+            if (GaugePointer.BarStyle != BarPointerStyle.Square)
+            {
+                _RoundAngle = 0;
+
+                if (_SweepAngle != 0)
+                {
+                    float x = (float)((360 * Width / 2) / (radius * 2 * Math.PI));
+
+                    _RoundAngle = (_SweepAngle > 0)
+                        ? Math.Min(x, _SweepAngle) : Math.Max(-x, _SweepAngle);
+
+                    _SweepAngle -= _RoundAngle;
+                }
+            }
+        }
+
+        #endregion
+
+        #region CalcLinearMarkerPoint
+
+        protected virtual void CalcLinearMarkerPoint(GaugeLinearScale scale)
+        {
+            if (scale.Orientation == Orientation.Horizontal)
+                CalcHorizontalMarkerPoint(scale);
+            else
+                CalcVerticalMarkerPoint(scale);
+        }
+
+        #region  CalcHorizontalMarkerPoint
+
+        protected virtual void CalcHorizontalMarkerPoint(GaugeLinearScale scale)
+        {
+            int offset = GaugePointer.Offset;
+
+            int y = scale.ScaleBounds.Y + scale.ScaleBounds.Height / 2 + offset;
+
+            switch (GaugePointer.Placement)
+            {
+                case DisplayPlacement.Near:
+                    y -= Width;
+                    break;
+
+                case DisplayPlacement.Center:
+                    y -= (Width / 2);
+                    break;
+
+                case DisplayPlacement.Far:
+                    break;
+            }
+
+            Dpt = scale.ScaleBounds.Width / scale.Spread;
+
+            _Origin = GetOriginInterval() - scale.MinValue;
+            _Marker = GetInterval(Value) - scale.MinValue;
+
+            CalcHorizontalMarkerBounds(scale, y);
+        }
+
+        #region CalcHorizontalMarkerBounds
+
+        protected virtual void CalcHorizontalMarkerBounds(GaugeLinearScale scale, int y)
+        {
+            double origin = _Origin;
+            double marker = _Marker;
+
+            _RoundAngle = 0;
+
+            if (marker < origin)
+            {
+                _RoundAngle += 180;
+
+                SwapDoubles(ref marker, ref origin);
+            }
+
+            int len = (int)((marker - origin) * Dpt);
+
+            int x = (scale.Reversed == true)
+                ? scale.ScaleBounds.Right - (int)(origin * Dpt) - len
+                : scale.ScaleBounds.X + (int)(origin * Dpt);
+
+            _Bounds = new Rectangle(0, 0, len, Width);
+            _Bounds.Location = new Point(x, y);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region CalcVerticalMarkerPoint
+
+        protected virtual void CalcVerticalMarkerPoint(GaugeLinearScale scale)
+        {
+            int offset = GaugePointer.Offset;
+
+            int x = scale.ScaleBounds.X + scale.ScaleBounds.Width / 2 + offset;
+
+            switch (GaugePointer.Placement)
+            {
+                case DisplayPlacement.Near:
+                    x -= Width;
+                    break;
+
+                case DisplayPlacement.Center:
+                    x -= (Width / 2);
+                    break;
+
+                case DisplayPlacement.Far:
+                    break;
+            }
+
+            Dpt = scale.ScaleBounds.Height / scale.Spread;
+
+            _Origin = GetOriginInterval() - scale.MinValue;
+            _Marker = GetInterval(Value) - scale.MinValue;
+
+            CalcVerticalMarkerBounds(scale, x);
+        }
+
+        #region CalcVerticalMarkerBounds
+
+        protected virtual void CalcVerticalMarkerBounds(GaugeLinearScale scale, int x)
+        {
+            double origin = _Origin;
+            double marker = _Marker;
+
+            _RoundAngle = -90;
+
+            if (marker < origin)
+            {
+                _RoundAngle += 180;
+
+                SwapDoubles(ref marker, ref origin);
+            }
+
+            int len = (int)((marker - origin) * Dpt);
+
+            int y = (scale.Reversed == true)
+                ? scale.ScaleBounds.Top + (int)(marker * Dpt) - len
+                : scale.ScaleBounds.Bottom - (int)(marker * Dpt);
+
+            _Bounds = new Rectangle(0, 0, Width, len);
+            _Bounds.Location = new Point(x, y);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region GetOriginInterval
+
+        private double GetOriginInterval()
+        {
+            switch (GaugePointer.Origin)
+            {
+                case PointerOrigin.Minimum:
+                    return (GetInterval(double.MinValue));
+
+                case PointerOrigin.Maximum:
+                    return (GetInterval(double.MaxValue));
+
+                default:
+                    return (GetInterval(GaugePointer.OriginInterval));
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderCircular
+
+        public override void RenderCircular(PaintEventArgs e)
+        {
+            Graphics g = e.Graphics;
+
+            GaugeCircularScale scale = Scale as GaugeCircularScale;
+
+            if (scale != null)
+            {
+                if (Width > 0 && Radius > 0 && (_SweepAngle != 0 || _RoundAngle != 0))
+                {
+                    using (GraphicsPath path = GetCircularBarPath(scale))
+                        RenderBar(g, path);
+                }
+            }
+        }
+
+        #region GetCircularBarPath
+
+        private GraphicsPath GetCircularBarPath(GaugeCircularScale scale)
+        {
+            GraphicsPath path = new GraphicsPath();
+
+            Rectangle r = _Bounds;
+            r.Inflate(Width / 2, Width / 2);
+
+            path.AddArc(r, _StartAngle, _SweepAngle);
+
+            if (_RoundAngle != 0)
+            {
+                if (GaugePointer.BarStyle != BarPointerStyle.Square)
+                {
+                    Point pt = scale.GetPoint(_Bounds.Width/2, _StartAngle + _SweepAngle);
+                    Point pt2 = scale.GetPoint(_Bounds.Width/2, _StartAngle + _SweepAngle + _RoundAngle);
+
+                    int dx = pt2.X - pt.X;
+                    int dy = pt2.Y - pt.Y;
+
+                    double n = Math.Max(1, Math.Sqrt((dx * dx) + (dy * dy)));
+
+                    float angle = (_StartAngle + _SweepAngle) % 360;
+
+                    using (GraphicsPath path2 = new GraphicsPath())
+                    {
+                        Matrix matrix = new Matrix();
+                        matrix.RotateAt(angle, pt);
+
+                        r.X = pt.X - Width/2 + 1;
+                        r.Y = pt.Y - (int) n;
+                        r.Width = Width - 1;
+                        r.Height = (int) (n*2);
+
+                        if (GaugePointer.BarStyle == BarPointerStyle.Rounded)
+                        {
+                            path2.AddArc(r, 0, _SweepAngle + _RoundAngle > 0 ? 180 : -180);
+                        }
+                        else
+                        {
+                            path2.AddLine(new Point(r.Right, r.Y + r.Height/2),
+                                new Point(r.X + Width/2, _SweepAngle + _RoundAngle > 0 ? r.Bottom : r.Y));
+                        }
+
+                        path2.Transform(matrix);
+
+                        path.AddPath(path2, true);
+                    }
+                }
+            }
+
+            r = _Bounds;
+            r.Inflate(-Width / 2, -Width / 2);
+
+            path.AddArc(r, _StartAngle + _SweepAngle, -_SweepAngle);
+
+            path.CloseFigure();
+
+            return (path);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderLinear
+
+        public override void RenderLinear(PaintEventArgs e)
+        {
+            Graphics g = e.Graphics;
+
+            GaugeLinearScale scale = Scale as GaugeLinearScale;
+
+            if (scale != null)
+            {
+                if (_Bounds.Width > 0 && _Bounds.Height > 0)
+                {
+                    using (GraphicsPath path = GetLinearBarPath(scale, _Bounds))
+                        RenderBar(g, path);
+                }
+            }
+        }
+
+        #region GetLinearBarPath
+
+        private GraphicsPath GetLinearBarPath(GaugeLinearScale scale, Rectangle b)
+        {
+            GraphicsPath path = new GraphicsPath();
+
+            if (GaugePointer.BarStyle == BarPointerStyle.Square)
+            {
+                path.AddRectangle(b);
+            }
+            else
+            {
+                return ((scale.Orientation == Orientation.Horizontal)
+                            ? GetHorizontalBarPath(path, b)
+                            : GetVerticalBarPath(path, b));
+            }
+
+            return (path);
+        }
+
+        #endregion
+
+        #region GetHorizontalBarPath
+
+        private GraphicsPath GetHorizontalBarPath(GraphicsPath path, Rectangle b)
+        {
+            if (_Marker < _Origin != Scale.Reversed)
+            {
+                int x = Math.Min(b.X + Width / 2, b.Right);
+
+                Point[] pts = new Point[] {
+                        new Point(x, b.Y),
+                        new Point (b.Right, b.Y),
+                        new Point (b.Right, b.Bottom),
+                        new Point (x, b.Bottom)};
+
+                path.AddLines(pts);
+
+                Rectangle r = new Rectangle(b.X, b.Y, (x - b.X) * 2, Width);
+
+                if (GaugePointer.BarStyle == BarPointerStyle.Rounded)
+                {
+                    path.AddArc(r, 90, 180);
+                }
+                else
+                {
+                    path.AddLine(new Point(r.X + r.Width/2, r.Bottom),
+                                 new Point(r.X, r.Y + r.Height/2));
+                }
+
+                path.CloseAllFigures();
+            }
+            else
+            {
+                int x = Math.Max(b.Right - Width / 2, b.X);
+
+                Point[] pts = new Point[] {
+                        new Point(x, b.Bottom),
+                        new Point (b.X, b.Bottom),
+                        new Point (b.X, b.Y),
+                        new Point (x, b.Y)};
+
+                path.AddLines(pts);
+
+                int n = b.Right - x;
+
+                Rectangle r = new Rectangle(x - n, b.Y, n * 2, Width);
+
+                if (GaugePointer.BarStyle == BarPointerStyle.Rounded)
+                {
+                    path.AddArc(r, 270, 180);
+                }
+                else
+                {
+                    path.AddLine(new Point(r.X + r.Width / 2, r.Y),
+                                 new Point(r.Right, r.Y + r.Height / 2));
+                }
+
+                path.CloseAllFigures();
+            }
+
+            return (path);
+        }
+
+        #endregion
+
+        #region GetVerticalBarPath
+
+        private GraphicsPath GetVerticalBarPath(GraphicsPath path, Rectangle b)
+        {
+            if (_Marker < _Origin != Scale.Reversed)
+            {
+                int y = Math.Max(b.Bottom - Width / 2, b.Y);
+
+                Point[] pts = new Point[] {
+                        new Point(b.X, y),
+                        new Point (b.X, b.Y),
+                        new Point (b.Right, b.Y),
+                        new Point (b.Right, y)};
+
+                path.AddLines(pts);
+
+                int n = b.Bottom - y;
+
+                Rectangle r = new Rectangle(b.X, y - n, Width, n * 2);
+
+                if (GaugePointer.BarStyle == BarPointerStyle.Rounded)
+                {
+                    path.AddArc(r, 0, 180);
+                }
+                else
+                {
+                    path.AddLine(new Point(r.Right, r.Y + r.Height / 2),
+                                 new Point(r.X + r.Width / 2, r.Bottom ));
+                }
+            }
+            else
+            {
+                int y = Math.Min(b.Y + Width / 2, b.Bottom);
+
+                Point[] pts = new Point[] {
+                        new Point(b.Right, y),
+                        new Point (b.Right, b.Bottom),
+                        new Point (b.X, b.Bottom),
+                        new Point (b.X, y)};
+
+                path.AddLines(pts);
+
+                Rectangle r = new Rectangle(b.X, b.Y, Width, (y - b.Y) * 2);
+
+                if (GaugePointer.BarStyle == BarPointerStyle.Rounded)
+                {
+                    path.AddArc(r, 180, 180);
+                }
+                else
+                {
+                    path.AddLine(new Point(r.X, r.Y + r.Height / 2),
+                                 new Point(r.X + r.Width / 2, r.Y));
+                }
+            }
+
+            path.CloseAllFigures();
+
+            return (path);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderBar
+
+        #region RenderBar
+
+        protected void RenderBar(Graphics g, GraphicsPath path)
+        {
+            RenderBar(g, path, GetPointerFillColor(GaugePointer.Value));
+        }
+
+        protected void RenderBar(Graphics g, GraphicsPath path, GradientFillColor fillColor)
+        {
+
+            if (fillColor.End.IsEmpty == true || fillColor.Color1 == fillColor.Color2 ||
+                fillColor.GradientFillType == GradientFillType.None)
+            {
+                using (Brush br = new SolidBrush(fillColor.Color1))
+                    g.FillPath(br, path);
+            }
+            else
+            {
+                GradientFillType fillType = (fillColor.GradientFillType == GradientFillType.Auto)
+                                                ? GradientFillType.Center
+                                                : fillColor.GradientFillType;
+                switch (fillType)
+                {
+                    case GradientFillType.Auto:
+                    case GradientFillType.StartToEnd:
+                        RenderBarStartToEnd(g, path, fillColor);
+                        break;
+
+                    case GradientFillType.Angle:
+                        RenderBarByAngle(g, path, fillColor);
+                        break;
+
+                    case GradientFillType.Center:
+                        RenderBarByCenter(g, path, fillColor);
+                        break;
+
+                    case GradientFillType.HorizontalCenter:
+                        RenderBarByHc(g, path, fillColor);
+                        break;
+
+                    case GradientFillType.VerticalCenter:
+                        RenderBarByVc(g, path, fillColor);
+                        break;
+                }
+            }
+
+            if (fillColor.BorderWidth > 0)
+            {
+                using (Pen pen = new Pen(fillColor.BorderColor, fillColor.BorderWidth))
+                    g.DrawPath(pen, path);
+            }
+        }
+
+        #endregion
+
+        #region RenderBarStartToEnd
+
+        private void RenderBarStartToEnd(Graphics g,
+            GraphicsPath path, GradientFillColor fillColor)
+        {
+            if (Scale is GaugeCircularScale)
+            {
+                using (PathGradientBrush br = ((GaugeCircularScale)Scale).CreateGradient(
+                    Scale.GaugeControl.Frame.Bounds, _StartAngle, _SweepAngle, fillColor, Width * 2))
+                {
+                    if (GaugePointer.BarStyle == BarPointerStyle.Rounded)
+                    {
+                        using (Brush br2 = new SolidBrush(fillColor.Color2))
+                            g.FillPath(br2, path);
+                    }
+
+                    g.FillPath(br, path);
+                }
+            }
+            else
+            {
+                Rectangle t = Rectangle.Round(path.GetBounds());
+
+                float angle = _RoundAngle + (Scale.Reversed ? 180 : 0);
+
+                using (Brush br = fillColor.GetBrush(t, (int)angle))
+                    g.FillPath(br, path);
+            }
+        }
+
+        #endregion
+
+        #region RenderBarByAngle
+
+        private void RenderBarByAngle(Graphics g, GraphicsPath path, GradientFillColor fillColor)
+        {
+            int n = Width / 2;
+
+            Rectangle t = Rectangle.Round(path.GetBounds());
+            t.Inflate(n, n);
+
+            using (Brush br = fillColor.GetBrush(t))
+                g.FillPath(br, path);
+        }
+
+        #endregion
+
+        #region RenderBarByCenter
+
+        protected virtual void RenderBarByCenter(Graphics g, GraphicsPath path, GradientFillColor fillColor)
+        {
+            using (PathGradientBrush br = new PathGradientBrush(path))
+            {
+                br.WrapMode = WrapMode.TileFlipXY;
+
+                br.CenterColor = fillColor.Color1;
+                br.SurroundColors = new Color[] {fillColor.Color2};
+
+                if (Scale is GaugeCircularScale)
+                {
+                    br.CenterPoint = Scale.Center;
+
+                    float m = (float)Width / (_Bounds.Width / 2);
+
+                    Blend blnd = new Blend();
+                    blnd.Positions = new float[] { 0f, m, 1f };
+                    blnd.Factors = new float[] { 1f, 0f, 0f };
+                    br.Blend = blnd;
+                }
+
+                g.FillPath(br, path);
+            }
+        }
+
+        #endregion
+
+        #region RenderBarByHc
+
+        private void RenderBarByHc(Graphics g, GraphicsPath path, GradientFillColor fillColor)
+        {
+            Rectangle t = Rectangle.Round(path.GetBounds());
+            t.Height /= 2;
+
+            using (LinearGradientBrush br = new
+                LinearGradientBrush(t, fillColor.Color1, fillColor.Color2, 90))
+            {
+                br.WrapMode = WrapMode.TileFlipXY;
+
+                g.FillPath(br, path);
+            }
+        }
+
+        #endregion
+
+        #region RenderBarByVc
+
+        private void RenderBarByVc(Graphics g, GraphicsPath path, GradientFillColor fillColor)
+        {
+            Rectangle t = Rectangle.Round(path.GetBounds());
+            t.Width /= 2;
+
+            using (LinearGradientBrush br = new
+                LinearGradientBrush(t, fillColor.Color1, fillColor.Color2, 0f))
+            {
+                br.WrapMode = WrapMode.TileFlipXY;
+
+                g.FillPath(br, path);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetPointerPath
+
+        public override GraphicsPath GetPointerPath()
+        {
+            if (PointerPath == null)
+            {
+                if (Width > 0)
+                {
+                    PointerPath = Scale.GaugeControl.OnGetPointerPath(GaugePointer, Scale.Bounds);
+
+                    if (PointerPath == null)
+                    {
+                        if (Scale is GaugeCircularScale)
+                            GetCPointerPath(Scale as GaugeCircularScale);
+                        else
+                            GetLPointerPath(Scale as GaugeLinearScale);
+                    }
+
+                }
+            }
+
+            return (PointerPath);
+        }
+
+        #endregion
+
+        #region GetCPointerPath
+
+        private void GetCPointerPath(GaugeCircularScale scale)
+        {
+            if (Radius > 0 && (_SweepAngle != 0 || _RoundAngle != 0))
+                PointerPath = GetCircularBarPath(scale);
+        }
+
+        #endregion
+
+        #region GetLPointerPath
+
+        private void GetLPointerPath(GaugeLinearScale scale)
+        {
+            if (_Bounds.Width > 0 && _Bounds.Height > 0)
+                PointerPath = GetLinearBarPath(scale, _Bounds);
+        }
+
+        #endregion
+
+        #region OnMouseDown
+
+        internal override void OnMouseDown(MouseEventArgs e)
+        {
+            base.OnMouseDown(e);
+
+            GaugePointer.ValueEx = GetValueFromPoint(e.Location);
+        }
+
+        #endregion
+    }
+
+    #region Enums
+
+    public enum BarPointerStyle
+    {
+        Square,
+        Rounded,
+        Pointed
+    }
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugePointers/GaugeMarkerRenderer.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugePointers/GaugeMarkerRenderer.cs
new file mode 100644
index 00000000..703a6fc9
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugePointers/GaugeMarkerRenderer.cs	
@@ -0,0 +1,417 @@
+using System;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Windows.Forms;
+
+namespace DevComponents.Instrumentation
+{
+    internal class GaugeMarkerRenderer : GaugePointerRenderer, IDisposable
+    {
+        #region Private variables
+
+        private int _LastWidth;
+        private int _LastLength;
+        private GaugeMarkerStyle _LastMarkerStyle;
+
+        private Rectangle _Bounds;
+
+        private GaugeMarker _GaugeMarker;
+
+        #endregion
+
+        internal GaugeMarkerRenderer(GaugePointer gaugePointer)
+            : base(gaugePointer)
+        {
+            _GaugeMarker = new GaugeMarker();
+        }
+
+        #region Internal properties
+
+        #region Bounds
+
+        internal Rectangle Bounds
+        {
+            get { return (_Bounds); }
+            set { _Bounds = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RecalcLayout
+
+        public override void RecalcLayout()
+        {
+            base.RecalcLayout();
+
+            if (Scale is GaugeCircularScale)
+                CalcCircularMarkerPoint(Scale as GaugeCircularScale);
+
+            else if (Scale is GaugeLinearScale)
+                CalcLinearMarkerPoint(Scale as GaugeLinearScale);
+
+            if ((Width != _LastWidth || Length != _LastLength) ||
+                (GaugePointer.MarkerStyle != _LastMarkerStyle))
+            {
+                _GaugeMarker.Clear();
+
+                _LastWidth = Width;
+                _LastLength = Length;
+                _LastMarkerStyle = GaugePointer.MarkerStyle;
+            }
+        }
+
+        #region CalcCircularMarkerPoint
+
+        private void CalcCircularMarkerPoint(GaugeCircularScale scale)
+        {
+            int radius = Radius;
+
+            switch (GaugePointer.Placement)
+            {
+                case DisplayPlacement.Near:
+                    radius -= Length;
+                    break;
+
+                case DisplayPlacement.Center:
+                    radius += (Length / 2);
+                    break;
+
+                case DisplayPlacement.Far:
+                    radius += Length;
+                    break;
+            }
+
+            Dpt = scale.SweepAngle / scale.Spread;
+
+            double marker = GetInterval(Value) - scale.MinValue;
+
+            IntervalAngle = (float)(scale.Reversed
+                ? scale.StartAngle + scale.SweepAngle - (marker * Dpt)
+                : scale.StartAngle + (marker * Dpt));
+
+            IntervalPoint = scale.GetPoint(radius, IntervalAngle);
+        }
+
+        #endregion
+
+        #region CalcLinearMarkerPoint
+
+        private void CalcLinearMarkerPoint(GaugeLinearScale scale)
+        {
+            if (scale.Orientation == Orientation.Horizontal)
+                CalcHorizontalMarkerPoint(scale);
+            else
+                CalcVerticalMarkerPoint(scale);
+        }
+
+        #region  CalcHorizontalMarkerPoint
+
+        private void CalcHorizontalMarkerPoint(GaugeLinearScale scale)
+        {
+            int offset = GaugePointer.Offset;
+
+            _Bounds = new Rectangle(0, 0, Width, Length);
+
+            int y = scale.ScaleBounds.Y + scale.ScaleBounds.Height / 2 + offset;
+
+            switch (GaugePointer.Placement)
+            {
+                case DisplayPlacement.Near:
+                    y -= Length;
+                    break;
+
+                case DisplayPlacement.Center:
+                    y -= (Length / 2);
+                    break;
+
+                case DisplayPlacement.Far:
+                    break;
+            }
+
+            Dpt = scale.ScaleBounds.Width / scale.Spread;
+
+            double marker = GetInterval(Value) - scale.MinValue;
+
+            int n = _Bounds.Width / 2;
+
+            int x = (scale.Reversed == true)
+                ? scale.ScaleBounds.Right - (int)(marker * Dpt) - n
+                : scale.ScaleBounds.X + (int)(marker * Dpt) - n;
+
+            _Bounds.Location = new Point(x, y);
+
+            IntervalPoint = new Point(_Bounds.X + n, _Bounds.Y + _Bounds.Height / 2);
+        }
+
+        #endregion
+
+        #region CalcVerticalMarkerPoint
+
+        private void CalcVerticalMarkerPoint(GaugeLinearScale scale)
+        {
+            int offset = GaugePointer.Offset;
+
+            _Bounds = new Rectangle(0, 0, Width, Length);
+
+            int x = scale.ScaleBounds.X + scale.ScaleBounds.Width / 2 + offset;
+
+            switch (GaugePointer.Placement)
+            {
+                case DisplayPlacement.Near:
+                    x -= Width;
+                    break;
+
+                case DisplayPlacement.Center:
+                    x -= (Width / 2);
+                    break;
+
+                case DisplayPlacement.Far:
+                    break;
+            }
+
+            Dpt = scale.ScaleBounds.Height / scale.Spread;
+
+            double marker = GetInterval(Value) - scale.MinValue;
+
+            int n = _Bounds.Height / 2;
+
+            int y = (scale.Reversed == true)
+                ? scale.ScaleBounds.Top + (int)(marker * Dpt) - n
+                : scale.ScaleBounds.Bottom - (int)(marker * Dpt) - n;
+
+            _Bounds.Location = new Point(x, y);
+
+            IntervalPoint = new Point(_Bounds.X + _Bounds.Width / 2, _Bounds.Y + n);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region RenderCircular
+
+        public override void RenderCircular(PaintEventArgs e)
+        {
+            if (IntervalPoint.IsEmpty == false &&
+                (Width > 0 && Length > 0 && Radius > 0))
+            {
+                Graphics g = e.Graphics;
+
+                Rectangle r = new Rectangle(0, 0, Width, Length);
+                r.X -= Width / 2;
+
+                float angle = IntervalAngle + 90;
+
+                if (GaugePointer.Placement == DisplayPlacement.Near)
+                    angle += 180;
+
+                g.TranslateTransform(IntervalPoint.X, IntervalPoint.Y);
+                g.RotateTransform(angle % 360);
+
+                if (GaugePointer.Image != null)
+                {
+                    g.DrawImage(GaugePointer.Image, r);
+                }
+                else
+                {
+                    GraphicsPath path = GetMarkerPath(r);
+
+                    if (path != null)
+                    {
+                        GradientFillColor fillColor =
+                            GetPointerFillColor(GaugePointer.Value);
+
+                        _GaugeMarker.FillMarkerPath(g, path, r, MarkerStyle, fillColor);
+                    }
+                }
+
+                g.ResetTransform();
+            }
+        }
+
+        #endregion
+
+        #region RenderLinear
+
+        public override void RenderLinear(PaintEventArgs e)
+        {
+            if (_Bounds.Width > 0 && _Bounds.Height > 0)
+            {
+                Graphics g = e.Graphics;
+
+                Rectangle r = new Rectangle(0, 0, Width, Length);
+                r.X -= Width / 2;
+                r.Y -= Length / 2;
+
+                g.TranslateTransform(IntervalPoint.X, IntervalPoint.Y);
+
+                if (((GaugeLinearScale)Scale).Orientation == Orientation.Horizontal)
+                {
+                    if (GaugePointer.Placement == DisplayPlacement.Far)
+                        g.RotateTransform(180);
+                }
+                else
+                {
+                    int angle = (GaugePointer.Placement == DisplayPlacement.Far) ? 90 : -90;
+
+                    g.RotateTransform(angle);
+                }
+
+                if (GaugePointer.Image != null)
+                {
+                    g.DrawImage(GaugePointer.Image, r);
+                }
+                else
+                {
+                    GraphicsPath path = GetMarkerPath(r);
+
+                    if (path != null)
+                    {
+                        GradientFillColor fillColor =
+                            GetPointerFillColor(GaugePointer.Value);
+
+                        _GaugeMarker.FillMarkerPath(g, path, r, MarkerStyle, fillColor);
+                    }
+               }
+
+                g.ResetTransform();
+            }
+        }
+
+        #endregion
+
+        #region GetPointerPath
+
+        public override GraphicsPath GetPointerPath()
+        {
+            if (PointerPath == null)
+            {
+                if (MarkerStyle != GaugeMarkerStyle.None)
+                {
+                    if (Width > 0 && Length > 0)
+                    {
+                        if (Scale is GaugeCircularScale)
+                            GetCPointerPath();
+                        else
+                            GetLPointerPath();
+                    }
+                }
+            }
+
+            return (PointerPath);
+        }
+
+        #region GetCPointerPath
+
+        private void GetCPointerPath()
+        {
+            Rectangle r = new Rectangle(IntervalPoint.X, IntervalPoint.Y, Width, Length);
+            r.X -= Width / 2;
+
+            PointerPath = GetMarkerPath(r);
+
+            if (PointerPath != null)
+            {
+                float angle = IntervalAngle + 90;
+
+                if (GaugePointer.Placement == DisplayPlacement.Near)
+                    angle += 180;
+
+                Matrix matrix = new Matrix();
+                matrix.RotateAt(angle % 360, IntervalPoint);
+
+                PointerPath.Transform(matrix);
+            }
+        }
+
+        #endregion
+
+        #region GetLPointerPath
+
+        private void GetLPointerPath()
+        {
+            if (((GaugeLinearScale)Scale).Orientation == Orientation.Horizontal)
+                GetLhPointerPath();
+            else
+                GetLvPointerPath();
+        }
+
+        #region GetLhPointerPath
+
+        private void GetLhPointerPath()
+        {
+            Rectangle r = new Rectangle(IntervalPoint.X, IntervalPoint.Y, Width, Length);
+
+            r.X -= Width / 2;
+            r.Y -= Length / 2;
+
+            PointerPath = GetMarkerPath(r);
+
+            if (GaugePointer.Placement == DisplayPlacement.Far)
+            {
+                Matrix matrix = new Matrix();
+                matrix.RotateAt(180, IntervalPoint);
+
+                PointerPath.Transform(matrix);
+            }
+        }
+
+        #endregion
+
+        #region GetLvPointerPath
+
+        private void GetLvPointerPath()
+        {
+            Rectangle r = new Rectangle(IntervalPoint.X, IntervalPoint.Y, Width, Length);
+
+            r.X -= Width / 2;
+            r.Y -= Length / 2;
+
+            PointerPath = GetMarkerPath(r);
+
+            int angle = (GaugePointer.Placement == DisplayPlacement.Far) ? 90 : -90;
+
+            Matrix matrix = new Matrix();
+            matrix.RotateAt(angle, IntervalPoint);
+
+            PointerPath.Transform(matrix);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetMarkerPath
+
+        private GraphicsPath GetMarkerPath(Rectangle r)
+        {
+            GraphicsPath path = GaugePointer.Scale.GaugeControl.OnGetPointerPath(GaugePointer, r);
+
+            if (path == null)
+                path = _GaugeMarker.GetMarkerPath(MarkerStyle, r);
+            else
+                PointerPath = null;
+
+            return (path);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IDisposable Members
+
+        public void Dispose()
+        {
+            PointerPath = null;
+
+            _GaugeMarker.Dispose();
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugePointers/GaugeNeedleRenderer.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugePointers/GaugeNeedleRenderer.cs
new file mode 100644
index 00000000..370610de
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugePointers/GaugeNeedleRenderer.cs	
@@ -0,0 +1,707 @@
+using System;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Windows.Forms;
+
+namespace DevComponents.Instrumentation
+{
+    internal class GaugeNeedleRenderer : GaugePointerRenderer, IDisposable
+    {
+        #region Private variables
+
+        private int _CapWidth;
+        private Rectangle _CapBounds;
+
+        #endregion
+
+        internal GaugeNeedleRenderer(GaugePointer gaugePointer)
+            : base(gaugePointer)
+        {
+        }
+
+        #region Public properties
+
+        #region CapBounds
+
+        public Rectangle CapBounds
+        {
+            get { return (_CapBounds); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RecalcLayout
+
+        public override void RecalcLayout()
+        {
+            base.RecalcLayout();
+
+            CalcMarkerPoint();
+        }
+
+        #region CalcMarkerPoint
+
+        private void CalcMarkerPoint()
+        {
+            if (Scale is GaugeCircularScale)
+                CalcCircularMarkerPoint(Scale as GaugeCircularScale);
+        }
+
+        #region CalcCircularMarkerPoint
+
+        private void CalcCircularMarkerPoint(GaugeCircularScale scale)
+        {
+            Dpt = scale.SweepAngle / scale.Spread;
+
+            double marker = GetInterval(Value) - scale.MinValue;
+
+            IntervalAngle = (float)(scale.Reversed
+                ? scale.StartAngle + scale.SweepAngle - (marker * Dpt)
+                : scale.StartAngle + (marker * Dpt));
+
+            IntervalPoint = scale.GetPoint(Radius, IntervalAngle);
+
+            _CapWidth = (int)(scale.AbsRadius * GaugePointer.CapWidth);
+
+            if (_CapWidth % 2 != 0)
+                _CapWidth++;
+
+            int n = _CapWidth / 2;
+
+            _CapBounds = new Rectangle(
+                scale.Center.X - n, scale.Center.Y - n, _CapWidth, _CapWidth);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region RenderCircular
+
+        public override void RenderCircular(PaintEventArgs e)
+        {
+            if (IntervalPoint.IsEmpty == false && Radius > 0)
+            {
+                Graphics g = e.Graphics;
+
+                if (GaugePointer.CapOnTop == false)
+                    RenderCap(g);
+
+                RenderNeedle(g);
+
+                if (GaugePointer.CapOnTop == true)
+                    RenderCap(g);
+            }
+        }
+
+        #region RenderNeedle
+
+        #region RenderNeedle
+
+        private void RenderNeedle(Graphics g)
+        {
+            if (GaugePointer.NeedleStyle != NeedlePointerStyle.None)
+            {
+                g.TranslateTransform(IntervalPoint.X, IntervalPoint.Y);
+                g.RotateTransform((IntervalAngle + 90) % 360);
+
+                int length = Math.Max(Radius, Radius + Length);
+
+                if (Width > 0 && length > 0)
+                {
+                    Rectangle r = new Rectangle(0, 0, Width, length);
+                    r.X -= Width/2;
+
+                    if (GaugePointer.Image != null)
+                    {
+                        g.DrawImage(GaugePointer.Image, r);
+                    }
+                    else
+                    {
+                        GradientFillColor fillColor = GaugePointer.FillColorEx;
+
+                        if (fillColor != null)
+                        {
+                            GradientFillType fillType = (fillColor.GradientFillType == GradientFillType.Auto)
+                                                            ? GradientFillType.Center
+                                                            : fillColor.GradientFillType;
+
+                            using (GraphicsPath path = GetNeedlePath(r))
+                            {
+                                RenderFill(g, r, path, fillColor, fillType, 0, false);
+                                RenderBorder(g, path, fillColor);
+                            }
+                        }
+                    }
+                }
+
+                g.ResetTransform();
+            }
+        }
+
+        #endregion
+
+        #region GetNeedlePath
+
+        private GraphicsPath GetNeedlePath(Rectangle r)
+        {
+            GaugeControl gc = GaugePointer.Scale.GaugeControl;
+
+            return (gc.OnGetPointerPath(GaugePointer, r) ?? GetNeedlePathEx(r));
+        }
+
+        private GraphicsPath GetNeedlePathEx(Rectangle r)
+        {
+            switch (GaugePointer.NeedleStyle)
+            {
+                case NeedlePointerStyle.Style1:
+                    return (GetNeedlePathStyle1(r));
+
+                case NeedlePointerStyle.Style2:
+                    return (GetNeedlePathStyle2(r));
+
+                case NeedlePointerStyle.Style3:
+                    return (GetNeedlePathStyle3(r));
+
+                case NeedlePointerStyle.Style4:
+                    return (GetNeedlePathStyle4(r));
+
+                case NeedlePointerStyle.Style5:
+                    return (GetNeedlePathStyle5(r));
+
+                case NeedlePointerStyle.Style6:
+                    return (GetNeedlePathStyle6(r));
+
+                case NeedlePointerStyle.Style7:
+                    return (GetNeedlePathStyle7(r));
+
+                case NeedlePointerStyle.Style8:
+                    return (GetNeedlePathStyle8(r));
+
+                default:
+                    return (GetNeedlePathStyle1(r));
+            }
+        }
+
+        #region GetNeedlePathStyle1
+
+        private GraphicsPath GetNeedlePathStyle1(Rectangle r)
+        {
+            Point[] pts = new Point[]
+            {
+                new Point(r.Left, r.Bottom),
+                new Point(r.Left + (r.Width / 2), r.Top),
+                new Point(r.Right, r.Bottom),
+            };
+
+            GraphicsPath path = new GraphicsPath();
+
+            path.AddLines(pts);
+            path.CloseFigure();
+
+            return (path);
+        }
+
+        #endregion
+
+        #region GetNeedlePathStyle2
+
+        private GraphicsPath GetNeedlePathStyle2(Rectangle r)
+        {
+            GraphicsPath path = new GraphicsPath();
+
+            path.AddRectangle(r);
+
+            return (path);
+        }
+
+        #endregion
+
+        #region GetNeedlePathStyle3
+
+        private GraphicsPath GetNeedlePathStyle3(Rectangle r)
+        {
+            GraphicsPath path = new GraphicsPath();
+            Rectangle t = r;
+
+            t.Height = t.Width;
+            path.AddArc(t, 180, 180);
+
+            t.Y = r.Bottom - t.Height;
+            path.AddArc(t, 0, 180);
+
+            path.CloseFigure();
+
+            return (path);
+        }
+
+        #endregion
+
+        #region GetNeedlePathStyle4
+
+        private GraphicsPath GetNeedlePathStyle4(Rectangle r)
+        {
+            GraphicsPath path = new GraphicsPath();
+
+            Rectangle t = r;
+            t.Width = t.Width / 2;
+            t.Height = t.Width;
+            t.X += t.Width / 2;
+
+            path.AddArc(t, 180, 180);
+            path.AddLine(r.Right, r.Bottom, r.Left, r.Bottom);
+
+            path.CloseFigure();
+
+            return (path);
+        }
+
+        #endregion
+
+        #region GetNeedlePathStyle5
+
+        private GraphicsPath GetNeedlePathStyle5(Rectangle r)
+        {
+            int n = r.Width / 4;
+
+            Point[] pts = new Point[]
+            {
+                new Point(r.Left + n, r.Top + r.Width),
+                new Point(r.Left + r.Width / 2, r.Top),
+                new Point(r.Right - n, r.Top + r.Width)
+            };
+
+            GraphicsPath path = new GraphicsPath();
+
+            path.AddLines(pts);
+            path.AddLine(r.Right, r.Bottom, r.Left, r.Bottom);
+
+            path.CloseFigure();
+
+            return (path);
+        }
+
+        #endregion
+
+        #region GetNeedlePathStyle6
+
+        private GraphicsPath GetNeedlePathStyle6(Rectangle r)
+        {
+            if (r.Height <= Radius)
+                return (GetNeedlePathStyle1(r));
+
+            GraphicsPath path = new GraphicsPath();
+
+            Point[] pts = new Point[]
+            {
+                new Point(r.Left, r.Y + Radius),
+                new Point(r.Left + (r.Width / 2), r.Top),
+                new Point(r.Right, r.Y + Radius),
+                new Point(r.Left + (r.Width / 2), r.Bottom),
+                new Point(r.Left, r.Y + Radius),
+            };
+
+            path.AddLines(pts);
+
+            return (path);
+        }
+
+        #endregion
+
+        #region GetNeedlePathStyle7
+
+        private GraphicsPath GetNeedlePathStyle7(Rectangle r)
+        {
+            if (r.Height <= Radius)
+                return (GetNeedlePathStyle1(r));
+
+            GraphicsPath path = new GraphicsPath();
+
+            Point[] pts = 
+            {
+                new Point(r.X + r.Width / 2, r.Y),
+                new Point(r.Right, r.Y + (r.Height / 3)),
+                new Point(r.Right - (r.Width / 4), r.Y + (r.Height / 3)),
+                new Point(r.Right, r.Bottom),
+                new Point(r.X + r.Width / 2, r.Bottom - r.Width / 2),
+                new Point(r.X, r.Bottom),
+                new Point(r.X + r.Width / 2, r.Y),
+            };
+
+            path.AddLines(pts);
+
+            return (path);
+        }
+
+        #endregion
+
+        #region GetNeedlePathStyle8
+
+        private GraphicsPath GetNeedlePathStyle8(Rectangle r)
+        {
+            if (r.Height <= Radius)
+                return (GetNeedlePathStyle1(r));
+
+            GraphicsPath path = new GraphicsPath();
+
+            Point[] pts = {
+                    new Point(r.X + r.Width / 2, r.Y),
+                    new Point(r.Right, r.Y + (r.Height / 3)),
+                    new Point(r.Right - (r.Width / 4), r.Y + (r.Height / 3)),
+                    new Point(r.Right, r.Bottom),
+                    new Point(r.X + r.Width / 2, r.Bottom - r.Width / 2),
+                    new Point(r.X, r.Bottom),
+                    new Point(r.X + (r.Width / 4), r.Y + (r.Height / 3)),
+                    new Point(r.X, r.Y + (r.Height / 3)),
+                };
+
+            path.AddLines(pts);
+
+            return (path);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region RenderCap
+
+        #region RenderCap
+
+        public void RenderCap(Graphics g)
+        {
+            if (_CapWidth > 2)
+            {
+                if (GaugePointer.CapImage != null)
+                    RenderCapImage(g);
+                else
+                    RenderCapStyle(g);
+            }
+        }
+
+        #region RenderCapStyle
+
+        private void RenderCapStyle(Graphics g)
+        {
+            if (GaugePointer.CapStyle != NeedlePointerCapStyle.None)
+            {
+                GradientFillColor fillColor = GaugePointer.CapFillColorEx;
+
+                if (fillColor != null)
+                {
+                    GradientFillType fillType = (fillColor.GradientFillType == GradientFillType.Auto)
+                                                    ? GradientFillType.Angle
+                                                    : fillColor.GradientFillType;
+
+                    if (fillType == GradientFillType.Angle && fillColor.GradientAngle % 90 != 0)
+                    {
+                        Matrix myMatrix = new Matrix();
+                        myMatrix.RotateAt(fillColor.GradientAngle, Scale.Center);
+
+                        g.Transform = myMatrix;
+                    }
+
+                    switch (GaugePointer.CapStyle)
+                    {
+                        case NeedlePointerCapStyle.Style1:
+                            RenderCapPathSytle1(g, _CapBounds, fillColor, fillType);
+                            break;
+
+                        case NeedlePointerCapStyle.Style2:
+                            RenderCapPathSytle2(g, _CapBounds, fillColor, fillType);
+                            break;
+                    }
+
+                    g.ResetTransform();
+                }
+            }
+        }
+
+        #endregion
+
+        #region RenderCapImage
+
+        private void RenderCapImage(Graphics g)
+        {
+            if (GaugePointer.RotateCap == true)
+            {
+                g.TranslateTransform(Scale.Center.X, Scale.Center.Y);
+                g.RotateTransform((IntervalAngle + 90) % 360);
+
+                Rectangle r = _CapBounds;
+                r.Location = new Point(-_CapBounds.Width / 2, -_CapBounds.Height / 2);
+
+                g.DrawImage(GaugePointer.CapImage, r);
+
+                g.ResetTransform();
+            }
+            else
+            {
+                g.DrawImage(GaugePointer.CapImage, _CapBounds);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderCapPathSytle1
+
+        private void RenderCapPathSytle1(Graphics g,
+            Rectangle r, GradientFillColor fillColor, GradientFillType fillType)
+        {
+            using (GraphicsPath path = new GraphicsPath())
+            {
+                path.AddEllipse(r);
+
+                RenderFill(g, r, path, fillColor, fillType, 0, true);
+                RenderBorder(g, path, fillColor);
+            }
+        }
+
+        #endregion
+
+        #region RenderCapPathSytle2
+
+        private void RenderCapPathSytle2(Graphics g,
+            Rectangle r, GradientFillColor fillColor, GradientFillType fillType)
+        {
+            using (GraphicsPath path = new GraphicsPath())
+            {
+                path.AddEllipse(r);
+
+                RenderFill(g, r, path, fillColor, fillType, 0, true);
+                RenderBorder(g, path, fillColor);
+
+                path.Reset();
+
+                int angle = 180;
+                int outer = (int)(r.Width * GaugePointer.CapOuterBevel);
+
+                if (outer > 0)
+                {
+                    r.Inflate(-outer, -outer);
+
+                    if (r.Width >= 2)
+                    {
+                        path.AddEllipse(r);
+                        RenderFill(g, r, path, fillColor, fillType, 180, true);
+
+                        path.Reset();
+
+                        angle = 0;
+                    }
+                }
+
+                int inner = (int) (r.Width*GaugePointer.CapInnerBevel);
+
+                if (inner > 0)
+                {
+                    r.Inflate(-inner, -inner);
+
+                    if (r.Width >= 2)
+                    {
+                        path.AddEllipse(r);
+                        RenderFill(g, r, path, fillColor, fillType, angle, true);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderFill
+
+        private void RenderFill(Graphics g, Rectangle r, GraphicsPath path,
+            GradientFillColor fillColor, GradientFillType fillType, int angle, bool offset)
+        {
+            if (fillColor.Color2.IsEmpty)
+                fillType = GradientFillType.None;
+
+            switch (fillType)
+            {
+                case GradientFillType.Auto:
+                case GradientFillType.Angle:
+                    if (offset == false)
+                        angle += fillColor.GradientAngle;
+
+                    using (Brush br = fillColor.GetBrush(r, angle))
+                    {
+                        if (br is LinearGradientBrush)
+                            ((LinearGradientBrush)br).WrapMode = WrapMode.TileFlipXY;
+
+                        g.FillPath(br, path);
+                    }
+                    break;
+
+                case GradientFillType.StartToEnd:
+                    using (Brush br = fillColor.GetBrush(r, 90 + angle))
+                    {
+                        if (br is LinearGradientBrush)
+                            ((LinearGradientBrush)br).WrapMode = WrapMode.TileFlipXY;
+
+                        g.FillPath(br, path);
+                    }
+                    break;
+
+                case GradientFillType.HorizontalCenter:
+                    if (r.Height >= 2)
+                        r.Height /= 2;
+
+                    using (LinearGradientBrush br = new
+                        LinearGradientBrush(r, fillColor.Start, fillColor.End, 90 + angle))
+                    {
+                        br.WrapMode = WrapMode.TileFlipXY;
+
+                        g.FillPath(br, path);
+                    }
+                    break;
+
+                case GradientFillType.VerticalCenter:
+                    if (r.Width >= 2)
+                        r.Width /= 2;
+
+                    using (LinearGradientBrush br = new
+                        LinearGradientBrush(r, fillColor.Start, fillColor.End, 0f + angle))
+                    {
+                        br.WrapMode = WrapMode.TileFlipXY;
+
+                        g.FillPath(br, path);
+                    }
+                    break;
+
+                case GradientFillType.Center:
+                    using (PathGradientBrush br = new PathGradientBrush(path))
+                    {
+                        if (offset == true && Scale is GaugeCircularScale)
+                            br.CenterPoint = ((GaugeCircularScale)Scale).GetPoint((int) (r.Width * .45f), 180 + 45 + angle);
+
+                        br.CenterColor = fillColor.Start;
+                        br.SurroundColors = new Color[] { fillColor.End };
+
+                        g.FillPath(br, path);
+                    }
+                    break;
+
+                default:
+                    using (Brush br = new SolidBrush(fillColor.Start))
+                        g.FillPath(br, path);
+
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region RenderBorder
+
+        private void RenderBorder(
+            Graphics g, GraphicsPath path, GradientFillColor fillColor)
+        {
+            if (fillColor.BorderWidth > 0)
+            {
+                using (Pen pen = new Pen(fillColor.BorderColor, fillColor.BorderWidth))
+                {
+                    pen.Alignment = PenAlignment.Inset;
+
+                    g.DrawPath(pen, path);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderLinear
+
+        public override void RenderLinear(PaintEventArgs e)
+        {
+        }
+
+        #endregion
+
+        #region GetPointerPath
+
+        public override GraphicsPath GetPointerPath()
+        {
+            if (PointerPath == null)
+            {
+                if (GaugePointer.NeedleStyle != NeedlePointerStyle.None)
+                {
+                    int length = Math.Max(Radius, Radius + Length);
+
+                    if (Width > 0 && length > 0)
+                    {
+                        Rectangle r = new Rectangle(IntervalPoint.X, IntervalPoint.Y, Width, length);
+                        r.X -= Width / 2;
+
+                        PointerPath = GetNeedlePath(r);
+
+                        Matrix matrix = new Matrix();
+                        matrix.RotateAt((IntervalAngle + 90) % 360, IntervalPoint);
+
+                        PointerPath.Transform(matrix);
+                    }
+                }
+            }
+
+            return (PointerPath);
+        }
+
+        #endregion
+
+        #region OnMouseDown
+
+        internal override void OnMouseDown(MouseEventArgs e)
+        {
+            base.OnMouseDown(e);
+
+            GaugePointer.MouseDownAngle = IntervalAngle;
+            GaugePointer.MouseDownRadians = GetPointRadians(e.Location);
+        }
+
+        #endregion
+
+        #region IDisposable Members
+
+        public void Dispose()
+        {
+            PointerPath = null;
+        }
+
+        #endregion
+    }
+
+    #region Enums
+
+    public enum NeedlePointerStyle
+    {
+        None,
+        Style1,
+        Style2,
+        Style3,
+        Style4,
+        Style5,
+        Style6,
+        Style7,
+        Style8
+    }
+
+    public enum NeedlePointerCapStyle
+    {
+        None,
+        Style1,
+        Style2,
+    }
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugePointers/GaugePointer.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugePointers/GaugePointer.cs
new file mode 100644
index 00000000..12807bb8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugePointers/GaugePointer.cs	
@@ -0,0 +1,2187 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Drawing.Drawing2D;
+using System.Text;
+using System.Windows.Forms;
+using DevComponents.Instrumentation.Primitives;
+
+namespace DevComponents.Instrumentation
+{
+    /// <summary>
+    /// Collection of GaugePointers
+    /// </summary>
+    public class GaugePointerCollection : GenericCollection<GaugePointer>
+    {
+        #region ICloneable Members
+
+        public override object Clone()
+        {
+            GaugePointerCollection copy = new GaugePointerCollection();
+
+            CopyToItem(copy);
+
+            return (copy);
+        }
+
+        #endregion
+
+        #region CopyToItem
+
+        internal void CopyToItem(GaugePointerCollection copy)
+        {
+            foreach (GaugePointer item in this)
+            {
+                GaugePointer ic = new GaugePointer();
+
+                item.CopyToItem(ic);
+
+                copy.Add(ic);
+            }
+        }
+
+        #endregion
+    }
+
+    public class GaugePointer : GaugeItem
+    {
+        #region Private variables
+
+        private PointerStyle _Style;
+
+        private BarPointerStyle _BarStyle;
+        private GaugeMarkerStyle _MarkerStyle;
+        private NeedlePointerStyle _NeedleStyle;
+        private NeedlePointerCapStyle _CapStyle;
+        private BulbStyle _BulbStyle;
+
+        private DisplayPlacement _Placement;
+        private float _ScaleOffset;
+
+        private int _Radius;
+        private int _Offset;
+        private float _Width;
+        private float _Length;
+
+        private bool _UnderTickMarks;
+
+        private GradientFillColor _FillColor;
+        private GradientFillColor _FillColorEx;
+        private GradientFillColor _CapFillColor;
+        private GradientFillColor _CapFillColorEx;
+
+        private bool _AllowUserChange;
+        private Cursor _ChangeCursor;
+
+        private double _Value;
+        private double _DValue;
+        private double _SnapInterval;
+        private double _DampeningSweepTime;
+
+        private Image _Image;
+
+        private GradientFillColor _ThermoBackColor;
+        private PointerOrigin _Origin;
+        private double _OriginInterval;
+
+        private float _BulbSize;
+        private float _BulbOffset;
+
+        private Image _CapImage;
+        private bool _CapOnTop;
+        private float _CapWidth;
+        private float _CapOuterBevel;
+        private float _CapInnerBevel;
+        private bool _RotateCap;
+
+        private bool _HonorMinPin;
+        private bool _HonorMaxPin;
+
+        private bool _Dampening;
+        private double _DeltaValue;
+        private long _DStartTicks;
+        private double _DStartValue;
+        private double _DEndValue;
+        private bool _DShowMinLabel;
+        private bool _DShowMaxLabel;
+        private bool _DSlideScale;
+
+        private GaugePointerRenderer _Renderer;
+
+        private GaugeScale _Scale;
+
+        private List<GaugeStrip> _RangeList;
+        private List<GaugeStrip> _SectionList;
+        private bool _InScale;
+
+        private double _MouseDownAngle;
+        private double _MouseDownRadians;
+
+        #endregion
+
+        public GaugePointer(GaugeScale scale)
+            : this()
+        {
+            _Scale = scale;
+
+            InitGaugePointer();
+        }
+
+        public GaugePointer()
+        {
+            InitGaugePointer();
+        }
+
+        #region InitGaugePointer
+
+        private void InitGaugePointer()
+        {
+            Style = PointerStyle.Marker;
+
+            FillColor = new GradientFillColor();
+
+            _BarStyle = BarPointerStyle.Square;
+            _Origin = PointerOrigin.Minimum;
+            _OriginInterval = double.NaN;
+
+            _BulbSize = .14f;
+            _BulbStyle = BulbStyle.Bulb;
+
+            _CapInnerBevel = .14f;
+            _CapOuterBevel = .1f;
+            _CapOnTop = true;
+            _CapStyle = NeedlePointerCapStyle.Style2;
+            _CapWidth = .3f;
+
+            _ChangeCursor = Cursors.Hand;
+            _DampeningSweepTime = 1;
+
+            _HonorMaxPin = true;
+            _HonorMinPin = true;
+
+            _MarkerStyle = GaugeMarkerStyle.Triangle;
+            _NeedleStyle = NeedlePointerStyle.Style1;
+
+            _Placement = DisplayPlacement.Center;
+            _Value = double.NaN;
+            _Length = .14f;
+            _Width = .14f;
+
+            _DValue = double.NaN;
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region AllowUserChange
+
+        /// <summary>
+        /// Gets or sets whether the user can change the pointer interactively by the mouse
+        /// </summary>
+        [Browsable(true)]
+        [Category("Behavior"), DefaultValue(false)]
+        [Description("Indicates whether the user can change the pointer interactively by the mouse.")]
+        public bool AllowUserChange
+        {
+            get { return (_AllowUserChange); }
+
+            set
+            {
+                if (_AllowUserChange != value)
+                {
+                    _AllowUserChange = value;
+
+                    OnGaugeItemChanged();
+                }
+            }
+        }
+
+        #endregion
+
+        #region BarStyle
+
+        /// <summary>
+        /// Gets or sets the Bar Style
+        /// </summary>
+        [Browsable(true), Category("Style Specific"), DefaultValue(BarPointerStyle.Square)]
+        [Description("Indicates the Bar Style.")]
+        public BarPointerStyle BarStyle
+        {
+            get { return (_BarStyle); }
+
+            set
+            {
+                if (_BarStyle != value)
+                {
+                    _BarStyle = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region BulbOffset
+
+        /// <summary>
+        /// Gets or sets the distance of the thermometer bulb from the start of the scale, measured as a percentage
+        /// </summary>
+        [Browsable(true)]
+        [Category("Style Specific"), DefaultValue(0f)]
+        [Editor("DevComponents.Instrumentation.Design.WidthMaxRangeValueEditor, DevComponents.Instrumentation.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=76cb4c6eb576bca5", typeof(UITypeEditor))]
+        [Description("Indicates the distance of the thermometer bulb from the start of the scale, measured as a percentage.")]
+        public float BulbOffset
+        {
+            get { return (_BulbOffset); }
+
+            set
+            {
+                if (_BulbOffset != value)
+                {
+                    if (value < 0 || value > 1)
+                        throw new ArgumentException("Value must be betweel 0 and +1.");
+
+                    _BulbOffset = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region BulbSize
+
+        /// <summary>
+        /// Gets or sets the size of the thermometer bulb, measured as a percentage
+        /// </summary>
+        [Browsable(true)]
+        [Category("Style Specific"), DefaultValue(.14f)]
+        [Editor("DevComponents.Instrumentation.Design.OffsetPosRangeValueEditor, DevComponents.Instrumentation.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=76cb4c6eb576bca5", typeof(UITypeEditor))]
+        [Description("Indicates the size of the thermometer bulb, measured as a percentage.")]
+        public float BulbSize
+        {
+            get { return (_BulbSize); }
+
+            set
+            {
+                if (_BulbSize != value)
+                {
+                    _BulbSize = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region BulbStyle
+
+        /// <summary>
+        /// Gets or sets the Thermometer Bulb Style
+        /// </summary>
+        [Browsable(true), Category("Style Specific"), DefaultValue(BulbStyle.Bulb)]
+        [Description("Indicates the Thermometer Bulb Style.")]
+        public BulbStyle BulbStyle
+        {
+            get { return (_BulbStyle); }
+
+            set
+            {
+                if (_BulbStyle != value)
+                {
+                    _BulbStyle = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region CapBounds
+
+        /// <summary>
+        /// Gets the CapBounds
+        /// </summary>
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public Rectangle CapBounds
+        {
+            get
+            {
+                if (_Renderer != null && _Renderer is GaugeNeedleRenderer)
+                    return (((GaugeNeedleRenderer)_Renderer).CapBounds);
+
+                return (Rectangle.Empty);
+            }
+        }
+
+        #endregion
+
+        #region CapFillColor
+
+        /// <summary>
+        /// Gets or sets the Needle Cap Fill Color
+        /// </summary>
+        [Browsable(true), Category("Needle Cap")]
+        [Description("Indicates the Needle Cap Fill Color.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public GradientFillColor CapFillColor
+        {
+            get
+            {
+                if (_CapFillColor == null)
+                {
+                    _CapFillColor = new GradientFillColor(Color.WhiteSmoke, Color.DimGray, 90);
+                    _CapFillColor.BorderColor = Color.DimGray;
+                    _CapFillColor.BorderWidth = 1;
+
+                    _CapFillColor.ColorTableChanged += FillColorColorTableChanged;
+                }
+
+                return (_CapFillColor);
+            }
+
+            set
+            {
+                if (_CapFillColor != null)
+                    _CapFillColor.ColorTableChanged -= FillColorColorTableChanged;
+
+                _CapFillColor = value;
+
+                if (_CapFillColor != null)
+                    _CapFillColor.ColorTableChanged += FillColorColorTableChanged;
+
+                UpdateFillColors();
+
+                OnGaugeItemChanged(true);
+            }
+        }
+
+        #endregion
+
+        #region CapFillColorEx
+
+        /// <summary>
+        /// Gets the range/section adjusted Pointer CapFillColor
+        /// </summary>
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public GradientFillColor CapFillColorEx
+        {
+            get { return (_CapFillColorEx ?? _CapFillColor); }
+        }
+
+        #endregion
+
+        #region CapImage
+
+        /// <summary>
+        /// Gets or sets the Image to use for the Needle Cap
+        /// </summary>
+        [Browsable(true), Category("Needle Cap"), DefaultValue(null)]
+        [Description("Indicates the Image to use for the Needle Cap.")]
+        public Image CapImage
+        {
+            get { return (_CapImage); }
+
+            set
+            {
+                if (_CapImage != value)
+                {
+                    _CapImage = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region CapInnerBevel
+
+        /// <summary>
+        /// Gets or sets the width of the needle cap's inner bevel, measured as a percentage of the cap width
+        /// </summary>
+        [Browsable(true), Category("Needle Cap"), DefaultValue(.14f)]
+        [Description("Indicates the width of the needle cap's inner bevel, measured as a percentage of the cap width.")]
+        [Editor("DevComponents.Instrumentation.Design.HalfRadiusRangeValueEditor, DevComponents.Instrumentation.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=76cb4c6eb576bca5", typeof(UITypeEditor))]
+        public float CapInnerBevel
+        {
+            get { return (_CapInnerBevel); }
+
+            set
+            {
+                if (_CapInnerBevel != value)
+                {
+                    if (value < 0 || value > .5f)
+                        throw new ArgumentException("Value must be between 0 and .5");
+
+                    _CapInnerBevel = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region CapOnTop
+
+        /// <summary>
+        /// Gets or sets whether the cap is ontop of the needle
+        /// </summary>
+        [Browsable(true), Category("Needle Cap"), DefaultValue(true)]
+        [Description("Indicates whether the cap is ontop of the needle.")]
+        public bool CapOnTop
+        {
+            get { return (_CapOnTop); }
+
+            set
+            {
+                if (_CapOnTop != value)
+                {
+                    _CapOnTop = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region CapOuterBevel
+
+        /// <summary>
+        /// Gets or sets the width of the needle cap's outer bevel, measured as a percentage of the cap width
+        /// </summary>
+        [Browsable(true), Category("Needle Cap"), DefaultValue(.1f)]
+        [Description("Indicates the width of the needle cap's outer bevel, measured as a percentage of the cap width.")]
+        [Editor("DevComponents.Instrumentation.Design.HalfRadiusRangeValueEditor, DevComponents.Instrumentation.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=76cb4c6eb576bca5", typeof(UITypeEditor))]
+        public float CapOuterBevel
+        {
+            get { return (_CapOuterBevel); }
+
+            set
+            {
+                if (_CapOuterBevel != value)
+                {
+                    if (value < 0 || value > .5f)
+                        throw new ArgumentException("Value must be between 0 and .5");
+
+                    _CapOuterBevel = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region CapStyle
+
+        /// <summary>
+        /// Gets or sets the style of the needle cap
+        /// </summary>
+        [Browsable(true), Category("Needle Cap"), DefaultValue(NeedlePointerCapStyle.Style2)]
+        [Description("Indicates the style of the needle cap.")]
+        [ParenthesizePropertyName(true)]
+        public NeedlePointerCapStyle CapStyle
+        {
+            get { return (_CapStyle); }
+
+            set
+            {
+                if (_CapStyle != value)
+                {
+                    _CapStyle = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region CapWidth
+
+        /// <summary>
+        /// Gets or sets the width of the needle cap
+        /// </summary>
+        [Browsable(true), Category("Needle Cap"), DefaultValue(.3f)]
+        [Description("Indicates the width of the needle cap.")]
+        [Editor("DevComponents.Instrumentation.Design.CapWidthRangeValueEditor, DevComponents.Instrumentation.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=76cb4c6eb576bca5", typeof(UITypeEditor))]
+        public float CapWidth
+        {
+            get { return (_CapWidth); }
+
+            set
+            {
+                if (_CapWidth != value)
+                {
+                    _CapWidth = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ChangeCursor
+
+        /// <summary>
+        /// Gets or sets the Cursor displayed when the user can change the Pointer
+        /// </summary>
+        [Browsable(true), Category("Behavior")]
+        [Description("Indicates the Cursor displayed when the user can change the Pointer.")]
+        public Cursor ChangeCursor
+        {
+            get { return (_ChangeCursor); }
+
+            set
+            {
+                if (_ChangeCursor != value)
+                {
+                    _ChangeCursor = value;
+
+                    OnGaugeItemChanged();
+                }
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        internal bool ShouldSerializeChangeCursor()
+        {
+            return (_ChangeCursor != Cursors.Hand);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        internal void ResetChangeCursor()
+        {
+            _ChangeCursor = Cursors.Hand;
+        }
+
+        #endregion
+
+        #region DampeningSweepTime
+
+        /// <summary>
+        /// Gets or sets the time it takes for the pointer to travel the entire scale, measured in seconds
+        /// </summary>
+        [Browsable(true)]
+        [Category("Behavior"), DefaultValue(1d)]
+        [Description("Indicates the time it takes for the pointer to travel the entire scale, measured in seconds.")]
+        public double DampeningSweepTime
+        {
+            get { return (_DampeningSweepTime); }
+
+            set
+            {
+                if (_DampeningSweepTime != value)
+                {
+                    _DampeningSweepTime = value;
+
+                    OnGaugeItemChanged();
+                }
+            }
+        }
+
+        #endregion
+
+        #region FillColor
+
+        /// <summary>
+        /// Gets or sets the Pointer FillColor
+        /// </summary>
+        [Browsable(true), Category("Appearance")]
+        [Description("Indicates the Pointer FillColor.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public GradientFillColor FillColor
+        {
+            get
+            {
+                if (_FillColor == null)
+                {
+                    _FillColor = new GradientFillColor();
+                    _FillColor.ColorTableChanged += FillColorColorTableChanged;
+                }
+
+                return (_FillColor);
+            }
+
+            set
+            {
+                if (_FillColor != null)
+                    _FillColor.ColorTableChanged -= FillColorColorTableChanged;
+
+                _FillColor = value;
+
+                if (_FillColor != null)
+                    _FillColor.ColorTableChanged += FillColorColorTableChanged;
+
+                UpdateFillColors();
+
+                OnGaugeItemChanged(true);
+            }
+        }
+
+        #endregion
+
+        #region FillColorEx
+
+        /// <summary>
+        /// Gets the range/section adjusted Pointer FillColor
+        /// </summary>
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public GradientFillColor FillColorEx
+        {
+            get { return (_FillColorEx ?? _FillColor); }
+        }
+
+        #endregion
+
+        #region HonorMaxPin
+
+        /// <summary>
+        /// Gets or sets whether the pointer honors the Maximum Pin
+        /// </summary>
+        [Browsable(true), Category("Behavior"), DefaultValue(true)]
+        [Description("Indicates whether the pointer honors the Maximum Pin.")]
+        public bool HonorMaxPin
+        {
+            get { return (_HonorMaxPin); }
+
+            set
+            {
+                if (_HonorMaxPin != value)
+                {
+                    _HonorMaxPin = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region HonorMinPin
+
+        /// <summary>
+        /// Gets or sets whether the pointer honors the Minimum Pin
+        /// </summary>
+        [Browsable(true), Category("Behavior"), DefaultValue(true)]
+        [Description("Indicates whether the pointer honors the Minimum Pin.")]
+        public bool HonorMinPin
+        {
+            get { return (_HonorMinPin); }
+
+            set
+            {
+                if (_HonorMinPin != value)
+                {
+                    _HonorMinPin = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region Image
+
+        /// <summary>
+        /// Gets or sets the Image to use for the Pointer
+        /// </summary>
+        [Browsable(true), Category("Appearance"), DefaultValue(null)]
+        [Description("Indicates the Image to use for the Pointer.")]
+        public Image Image
+        {
+            get { return (_Image); }
+
+            set
+            {
+                if (_Image != value)
+                {
+                    _Image = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region IntervalPoint
+
+        /// <summary>
+        /// Gets the Pointer Interval Point for the current Value
+        /// </summary>
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public Point IntervalPoint
+        {
+            get
+            {
+                if (NeedRecalcLayout == true)
+                    RecalcLayout();
+
+                return (_Renderer.IntervalPoint);
+            }
+        }
+
+        #endregion
+
+        #region IntervalAngle
+
+        /// <summary>
+        /// Gets the Pointer Interval Angle for the current Value
+        /// </summary>
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public float IntervalAngle
+        {
+            get
+            {
+                if (NeedRecalcLayout == true)
+                    RecalcLayout();
+
+                return (_Renderer.IntervalAngle);
+            }
+        }
+
+        #endregion
+
+        #region Length
+
+        /// <summary>
+        /// Gets or sets the Pointer length, specified as a percentage
+        /// </summary>
+        [Browsable(true)]
+        [Category("Layout"), DefaultValue(.14f)]
+        [Editor("DevComponents.Instrumentation.Design.WidthMaxRangeValueEditor, DevComponents.Instrumentation.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=76cb4c6eb576bca5", typeof(UITypeEditor))]
+        [Description("Indicates the Pointer length, specified as a percentage.")]
+        public float Length
+        {
+            get { return (_Length); }
+
+            set
+            {
+                if (_Length != value)
+                {
+                    _Length = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region MarkerStyle
+
+        /// <summary>
+        /// Gets or sets the Marker style
+        /// </summary>
+        [Browsable(true), Category("Style Specific"), DefaultValue(GaugeMarkerStyle.Triangle)]
+        [Description("Indicates the Marker style.")]
+        public GaugeMarkerStyle MarkerStyle
+        {
+            get { return (_MarkerStyle); }
+
+            set
+            {
+                if (_MarkerStyle != value)
+                {
+                    _MarkerStyle = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region NeedleStyle
+
+        /// <summary>
+        /// Gets or sets the width of the needle cap
+        /// </summary>
+        [Browsable(true), Category("Style Specific"), DefaultValue(NeedlePointerStyle.Style1)]
+        [Description("Indicates the width of the needle cap.")]
+        public NeedlePointerStyle NeedleStyle
+        {
+            get { return (_NeedleStyle); }
+
+            set
+            {
+                if (_NeedleStyle != value)
+                {
+                    _NeedleStyle = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region Origin
+
+        /// <summary>
+        /// Gets or sets the Bar/Thermometer Pointer origin
+        /// </summary>
+        [Browsable(true)]
+        [Category("Style Specific"), DefaultValue(PointerOrigin.Minimum)]
+        [Description("Indicates the Bar/Thermometer Pointer origin.")]
+        public PointerOrigin Origin
+        {
+            get { return (_Origin); }
+
+            set
+            {
+                if (_Origin != value)
+                {
+                    _Origin = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region OriginInterval
+
+        /// <summary>
+        /// Gets or sets the custom Bar/Thermometer origin interval
+        /// </summary>
+        [Browsable(true)]
+        [Category("Style Specific"), DefaultValue(double.NaN)]
+        [Description("Indicates the custom Bar/Thermometer origin interval.")]
+        public double OriginInterval
+        {
+            get { return (_OriginInterval); }
+
+            set
+            {
+                if (_OriginInterval != value)
+                {
+                    _OriginInterval = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region Placement
+
+        /// <summary>
+        /// Gets or sets the Placement of the pointer with respect to the Scale
+        /// </summary>
+        [Browsable(true)]
+        [Category("Layout"), DefaultValue(DisplayPlacement.Center)]
+        [Description("Indicates the Placement of the pointer with respect to the Scale.")]
+        public DisplayPlacement Placement
+        {
+            get { return (_Placement); }
+
+            set
+            {
+                if (_Placement != value)
+                {
+                    _Placement = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region RotateCapImage
+
+        /// <summary>
+        /// Gets or sets whether the needle cap is rotated to match the needle angle
+        /// </summary>
+        [Browsable(true)]
+        [Category("Needle Cap"), DefaultValue(false)]
+        [Description("Indicates whether the needle cap is rotated to match the needle angle.")]
+        public bool RotateCap
+        {
+            get { return (_RotateCap); }
+
+            set
+            {
+                if (_RotateCap != value)
+                {
+                    _RotateCap = value;
+
+                    OnGaugeItemChanged();
+                }
+            }
+        }
+
+        #endregion
+
+        #region Scale
+
+        /// <summary>
+        /// Gets the pointer's associated Scale
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public GaugeScale Scale
+        {
+            get { return (_Scale); }
+
+            internal set
+            {
+                _Scale = value;
+
+                UpdateStripData();
+                OnGaugeItemChanged(true);
+            }
+        }
+
+        #endregion
+
+        #region ScaleOffset
+
+        /// <summary>
+        /// Gets or sets the distance from the Pointer to the Scale, measured as a percentage
+        /// </summary>
+        [Browsable(true)]
+        [Category("Layout"), DefaultValue(0f)]
+        [Editor("DevComponents.Instrumentation.Design.OffsetRangeValueEditor, DevComponents.Instrumentation.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=76cb4c6eb576bca5", typeof(UITypeEditor))]
+        [Description("Indicates the distance from the Pointer to the Scale, measured as a percentage.")]
+        public float ScaleOffset
+        {
+            get { return (_ScaleOffset); }
+
+            set
+            {
+                if (_ScaleOffset != value)
+                {
+                    _ScaleOffset = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region SnapInterval
+
+        /// <summary>
+        /// Gets or sets the interval to use to Snap user input values to
+        /// </summary>
+        [Browsable(true)]
+        [Category("Behavior"), DefaultValue(0d)]
+        [Description("Indicates the interval to use to Snap user input values to.")]
+        public double SnapInterval
+        {
+            get { return (_SnapInterval); }
+
+            set
+            {
+                if (_SnapInterval != value)
+                {
+                    _SnapInterval = value;
+
+                    OnGaugeItemChanged();
+                }
+            }
+        }
+
+        #endregion
+
+        #region Style
+
+        /// <summary>
+        /// Gets or sets the Pointer style
+        /// </summary>
+        [Browsable(true), Category("Style Specific"), DefaultValue(PointerStyle.Marker)]
+        [Description("Indicates the Pointer style.")]
+        [ParenthesizePropertyName(true)]
+        public PointerStyle Style
+        {
+            get { return (_Style); }
+
+            set
+            {
+                if (_Style != value)
+                {
+                    _Style = value;
+
+                    SetPointerRenderer();
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #region SetPointerRenderer
+
+        private void SetPointerRenderer()
+        {
+            switch (_Style)
+            {
+                case PointerStyle.Bar:
+                    _Renderer = new GaugeBarRenderer(this);
+                    break;
+
+                case PointerStyle.Marker:
+                    _Renderer = new GaugeMarkerRenderer(this);
+                    break;
+
+                case PointerStyle.Needle:
+                    _Renderer = new GaugeNeedleRenderer(this);
+                    break;
+
+                case PointerStyle.Thermometer:
+                    _Renderer = new GaugeThermoRenderer(this);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ThermoBackColor
+
+        /// <summary>
+        /// Gets or sets the Thermometers's Background "tube" Color
+        /// </summary>
+        [Browsable(true), Category("Appearance")]
+        [Description("Indicates the Thermometers's Background \"tube\" Color.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public GradientFillColor ThermoBackColor
+        {
+            get
+            {
+                if (_ThermoBackColor == null)
+                {
+                    _ThermoBackColor = new GradientFillColor();
+                    _ThermoBackColor.ColorTableChanged += FillColorColorTableChanged;
+                }
+
+                return (_ThermoBackColor);
+            }
+
+            set
+            {
+                if (_ThermoBackColor != null)
+                    _ThermoBackColor.ColorTableChanged -= FillColorColorTableChanged;
+
+                _ThermoBackColor = value;
+
+                if (_ThermoBackColor != null)
+                    _ThermoBackColor.ColorTableChanged += FillColorColorTableChanged;
+
+                OnGaugeItemChanged(true);
+            }
+        }
+
+        #endregion
+
+        #region UnderTickMarks
+
+        /// <summary>
+        /// Gets or sets whether the marker is under all TickMarks
+        /// </summary>
+        [Browsable(true), Category("Appearance"), DefaultValue(false)]
+        [Description("Indicates whether the marker is under all TickMarks.")]
+        public bool UnderTickMarks
+        {
+            get { return (_UnderTickMarks); }
+
+            set
+            {
+                if (_UnderTickMarks != value)
+                {
+                    _UnderTickMarks = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region Value
+
+        /// <summary>
+        /// Gets or sets the Pointer value
+        /// </summary>
+        [Browsable(true)]
+        [Category("Behavior"), DefaultValue(double.NaN)]
+        [Description("Indicates the Pointer value.")]
+        public double Value
+        {
+            get { return (_Value); }
+
+            set
+            {
+                if (_Value != value)
+                {
+                    double oldValue = _Value;
+                    _Value = value;
+
+                    OnValueChanged(oldValue, true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ValueEx
+
+        /// <summary>
+        /// Gets or sets the value of the pointer - but with no dampening
+        /// </summary>
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public double ValueEx
+        {
+            get { return (_Value); }
+
+            set
+            {
+                if (_Value != value)
+                {
+                    double oldValue = _Value;
+                    _Value = value;
+
+                    OnValueChanged(oldValue, false);
+                }
+            }
+        }
+
+        #endregion
+
+        #region Width
+
+        /// <summary>
+        /// Gets or sets the Pointer width, specified as a percentage
+        /// </summary>
+        [Browsable(true)]
+        [Category("Layout"), DefaultValue(.14f)]
+        [Editor("DevComponents.Instrumentation.Design.WidthRangeValueEditor, DevComponents.Instrumentation.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=76cb4c6eb576bca5", typeof(UITypeEditor))]
+        [Description("Indicates the Pointer width, specified as a percentage.")]
+        public float Width
+        {
+            get { return (_Width); }
+
+            set
+            {
+                if (_Width != value)
+                {
+                    _Width = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region AbsScaleOffset
+
+        internal int AbsScaleOffset
+        {
+            get
+            {
+                if (Scale is GaugeCircularScale)
+                    return (GetAbsScaleOffset(Scale as GaugeCircularScale));
+
+                return (GetAbsScaleOffset(Scale as GaugeLinearScale));
+            }
+        }
+
+        #region GetAbsScaleOffset
+
+        private int GetAbsScaleOffset(GaugeCircularScale scale)
+        {
+            return ((int)(scale.AbsRadius * ScaleOffset));
+        }
+
+        #endregion
+
+        #region GetAbsScaleOffset
+
+        private int GetAbsScaleOffset(GaugeLinearScale scale)
+        {
+            return ((int)(scale.AbsWidth * ScaleOffset));
+        }
+
+        #endregion
+
+        #endregion
+
+        #region DValue
+
+        internal double DValue
+        {
+            get { return (_DValue); }
+
+            set
+            {
+                _DValue = value;
+
+                if (_Scale != null)
+                    _Scale.GaugeControl.DValueChange = true;
+
+                OnGaugeItemChanged(true);
+            }
+        }
+
+            #endregion
+
+        #region MouseDownAngle
+
+        internal double MouseDownAngle
+        {
+            get { return (_MouseDownAngle); }
+            set { _MouseDownAngle = value; }
+        }
+
+        #endregion
+
+        #region MouseDownRadians
+
+        internal double MouseDownRadians
+        {
+            get { return (_MouseDownRadians); }
+            set { _MouseDownRadians = value; }
+        }
+
+        #endregion
+
+        #region Offset
+
+        internal int Offset
+        {
+            get { return (_Offset); }
+        }
+
+        #endregion
+
+        #region Radius
+
+        internal int Radius
+        {
+            get { return (_Radius); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Event processing
+
+        void FillColorColorTableChanged(object sender, EventArgs e)
+        {
+            OnGaugeItemChanged(true);
+        }
+
+        #endregion
+
+        #region RecalcLayout
+
+        public override void RecalcLayout()
+        {
+            if (NeedRecalcLayout == true)
+            {
+                base.RecalcLayout();
+
+                if (Scale is GaugeCircularScale)
+                    CalcCircularMetrics(Scale as GaugeCircularScale);
+
+                else if (Scale is GaugeLinearScale)
+                    CalcLinearMetrics(Scale as GaugeLinearScale);
+
+                if (_Renderer != null)
+                    _Renderer.RecalcLayout();
+            }
+        }
+
+        #region CalcCircularMetrics
+
+        private void CalcCircularMetrics(GaugeCircularScale scale)
+        {
+            int radius = scale.AbsRadius;
+            int offset = AbsScaleOffset;
+            int scaleWidth = (int)(radius * scale.Width);
+
+            switch (_Placement)
+            {
+                case DisplayPlacement.Near:
+                    _Radius = radius - (scaleWidth / 2) + offset;
+                    break;
+
+                case DisplayPlacement.Center:
+                    _Radius = radius + offset;
+                    break;
+
+                case DisplayPlacement.Far:
+                    _Radius = radius + (scaleWidth / 2) + offset;
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region CalcLinearMetrics
+
+        private void CalcLinearMetrics(GaugeLinearScale scale)
+        {
+            int n = scale.AbsWidth;
+            int offset = AbsScaleOffset;
+            int scaleWidth = (int)(n * scale.Width);
+
+            switch (_Placement)
+            {
+                case DisplayPlacement.Near:
+                    _Offset = (-scaleWidth / 2) - offset;
+                    break;
+
+                case DisplayPlacement.Center:
+                    _Offset = -offset;
+                    break;
+
+                case DisplayPlacement.Far:
+                    _Offset = (scaleWidth / 2) + offset;
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region OnPaint
+
+        public override void OnPaint(PaintEventArgs e)
+        {
+            RecalcLayout();
+
+            if (Scale.GaugeControl.OnPreRenderScalePointer(e, this) == false)
+            {
+                if (_Renderer != null)
+                {
+                    switch (_Scale.Style)
+                    {
+                        case GaugeScaleStyle.Circular:
+                            _Renderer.RenderCircular(e);
+                            break;
+
+                        case GaugeScaleStyle.Linear:
+                            _Renderer.RenderLinear(e);
+                            break;
+                    }
+                }
+
+                Scale.GaugeControl.OnPostRenderScalePointer(e, this);
+            }
+        }
+
+        #endregion
+
+        #region OnValueChanged
+
+        private void OnValueChanged(double oldValue, bool canDampen)
+        {
+            if (_Scale != null)
+            {
+                _Scale.GaugeControl.OnPointerValueChanged(this, oldValue, _Value);
+
+                if (_Scale.Visible == true)
+                {
+                    UpdateStripData();
+
+                    if (InitiateDampening(canDampen) == true)
+                        return;
+                }
+            }
+
+            SetFinalOffsets();
+
+            DValue = _Value;
+        }
+
+        #endregion
+
+        #region Dampening support
+
+        #region InitiateDampening
+
+        private bool InitiateDampening(bool canDampen)
+        {
+            if (_Scale.GaugeControl.IsHandleCreated &&
+                _Scale.GaugeControl.InDesignMode == false)
+            {
+                if (_Renderer != null)
+                {
+                    double min, max;
+
+                    _Renderer.GetRangeEx(out min, out max);
+
+                    if (_DValue < _Value)
+                    {
+                        double start = Math.Max(min, _DValue);
+
+                        if (start < max)
+                        {
+                            if (StartDampening(canDampen, start, Math.Min(max, _Value)))
+                                return (true);
+                        }
+                    }
+                    else if (_DValue > _Value)
+                    {
+                        double start = Math.Min(max, _DValue);
+
+                        if (start > min)
+                        {
+                            if (StartDampening(canDampen, start, Math.Max(min, _Value)))
+                                return (true);
+                        }
+                    }
+                }
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region StartDampening
+
+        private bool StartDampening(bool canDampen, double start, double end)
+        {
+            double dampenTime = _DampeningSweepTime;
+
+            if (ValueInView(end) == false)
+            {
+                canDampen = true;
+
+                dampenTime = (_MouseDown == true || dampenTime <= 0)
+                    ? 2 : dampenTime;
+            }
+
+            if (canDampen == true && dampenTime > 0)
+            {
+                _DStartValue = start;
+                _DEndValue = end;
+
+                _DeltaValue = Scale.Spread / (dampenTime * 1000);
+                _DStartTicks = DateTime.Now.Ticks;
+
+                if (_Dampening == false)
+                {
+                    _Dampening = true;
+                    _DSlideScale = false;
+
+                    _DShowMinLabel = _Scale.Labels.ShowMinLabel;
+                    _DShowMaxLabel = _Scale.Labels.ShowMaxLabel;
+
+                    _Scale.GaugeControl.DampeningUpdate += DampeningUpdate;
+                    _Scale.GaugeControl.StartDampening();
+                }
+
+                return (true);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region DampeningUpdate
+
+        void DampeningUpdate(object sender, EventArgs e)
+        {
+            SetScaleValue();
+            SetInterimOffsets();
+
+            if (_DValue == _DEndValue)
+            {
+                if (_MouseDown == true && _AllowUserChange == true)
+                {
+                    if (_Renderer != null)
+                    {
+                        Point pt = Control.MousePosition;
+                        Point pt2 = Scale.GaugeControl.PointToClient(pt);
+
+                        ValueEx = _Renderer.GetValueFromPoint(pt2);
+                    }
+                }
+                else
+                {
+                    SetFinalOffsets();
+                }
+            }
+        }
+
+        #endregion
+
+        #region SetScaleValue
+
+        private void SetScaleValue()
+        {
+            double ms = new TimeSpan(DateTime.Now.Ticks - _DStartTicks).TotalMilliseconds;
+            double delta = _DeltaValue * ms;
+
+            double n = _DValue;
+
+            if (n < _Value)
+                n = Math.Min(_DStartValue + delta, _DEndValue);
+
+            else if (n > _Value)
+                n = Math.Max(_DStartValue - delta, _DEndValue);
+
+            SetScaleValue(n);
+        }
+
+        private void SetScaleValue(double n)
+        {
+            if (_DValue != _Value)
+            {
+                double spread = _Scale.Spread;
+
+                if (n > _Scale.MaxValue)
+                {
+                    _Scale.MaxValue = Math.Min(n, _Scale.AbsMaxLimit);
+                    _Scale.MinValue = _Scale.MaxValue - spread;
+
+                    _DSlideScale = true;
+                }
+                else if (n < _Scale.MinValue)
+                {
+                    _Scale.MinValue = Math.Max(n, _Scale.AbsMinLimit);
+                    _Scale.MaxValue = _Scale.MinValue + spread;
+
+                    _DSlideScale = true;
+                }
+            }
+
+            DValue = n;
+        }
+
+        #endregion
+
+        #region SetInterimOffsets
+
+        private void SetInterimOffsets()
+        {
+            if (_DSlideScale == true)
+            {
+                GaugeTickMark major = _Scale.MajorTickMarks;
+                GaugeTickMark minor = _Scale.MinorTickMarks;
+
+                major.IntervalOffset = GetIntervalOffset(major.Interval);
+                minor.IntervalOffset = GetIntervalOffset(minor.Interval);
+
+                if (_DShowMinLabel == true)
+                {
+                    if (minor.Visible && minor.Interval > 0)
+                    {
+                        _Scale.Labels.ShowMinLabel =
+                            (minor.IntervalOffset == 0);
+                    }
+                    else if (major.Visible && major.Interval > 0)
+                    {
+                        _Scale.Labels.ShowMinLabel =
+                            (major.IntervalOffset == 0);
+                    }
+                }
+
+                if (_DShowMaxLabel == true)
+                {
+                    if (minor.Visible && minor.Interval > 0)
+                    {
+                        _Scale.Labels.ShowMaxLabel =
+                            (_Scale.MaxValue % minor.Interval == 0);
+                    }
+                    else if (major.Visible && major.Interval > 0)
+                    {
+                        _Scale.Labels.ShowMaxLabel =
+                            (_Scale.MaxValue % major.Interval == 0);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region SetFinalOffsets
+
+        private void SetFinalOffsets()
+        {
+            if (_DSlideScale == true)
+            {
+                GaugeTickMark major = _Scale.MajorTickMarks;
+                GaugeTickMark minor = _Scale.MinorTickMarks;
+
+                double interval;
+
+                if (_SnapInterval > 0)
+                {
+                    interval = _SnapInterval;
+                }
+                else
+                {
+                    interval = ((minor.Visible && minor.Interval > 0)
+                        ? minor.Interval : (major.Visible && major.Interval > 0)
+                              ? major.Interval : 1);
+
+                    if ((int)interval == interval)
+                        interval = 1;
+                }
+
+                double minLimit = _Scale.AbsMinLimit;
+                double k = (int)((_Scale.MinValue - minLimit) / interval) * interval + minLimit;
+                double spread = _Scale.Spread;
+
+                if (_DStartValue < _DEndValue && (k + spread < _Scale.MaxValue))
+                    k += interval;
+
+                _Scale.MinValue = k;
+                _Scale.MaxValue = k + spread;
+
+                if (minor.Visible && minor.Interval > 0)
+                    minor.IntervalOffset = GetIntervalOffset(minor.Interval);
+
+                if (major.Visible && major.Interval > 0)
+                    major.IntervalOffset = GetIntervalOffset(major.Interval);
+
+                _Scale.Labels.ShowMinLabel = _DShowMinLabel;
+                _Scale.Labels.ShowMaxLabel = _DShowMaxLabel;
+            }
+
+            if (_Dampening == true)
+            {
+                _Scale.GaugeControl.StopDampening();
+                _Scale.GaugeControl.DampeningUpdate -= DampeningUpdate;
+
+                _Dampening = false;
+            }
+        }
+
+        #endregion
+
+        #region GetIntervalOffset
+
+        private double GetIntervalOffset(double interval)
+        {
+            double n = _Scale.MinValue - _Scale.AbsMinLimit;
+
+            return (Math.Ceiling(n / interval) * interval - n);
+        }
+
+        #endregion
+
+        #region ValueInView
+
+        private bool ValueInView(double value)
+        {
+            return ((_Scale.MinValue <= _Scale.AbsMinLimit || value >= _Scale.MinValue) &&
+                 ((_Scale.MaxValue >= _Scale.AbsMaxLimit || value <= _Scale.MaxValue)));
+        }
+
+        #endregion
+
+        #endregion
+
+        #region UpdateStripData
+
+        #region UpdateStripData
+
+        internal void UpdateStripData()
+        {
+            if (_Scale != null)
+            {
+                ProcessScaleChanges();
+                ProcessSectionChanges();
+                ProcessRangeChanges();
+            }
+                
+            UpdateFillColors();
+        }
+
+        #endregion
+
+        #region ProcessScaleChanges
+
+        private void ProcessScaleChanges()
+        {
+            bool oldInScale = _InScale;
+
+            _InScale = (_Value >= Scale.MinValue && _Value <= Scale.MaxValue);
+
+            if (_Scale.GaugeControl != null)
+            {
+                if (_InScale != oldInScale)
+                {
+                    if (_InScale == true)
+                        Scale.GaugeControl.OnScaleEnter(this, Scale);
+                    else
+                        Scale.GaugeControl.OnScaleExit(this, Scale);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ProcessSectionChanges
+
+        private void ProcessSectionChanges()
+        {
+            if (Scale.HasSections == true)
+            {
+                List<GaugeStrip> list = new List<GaugeStrip>();
+
+                foreach (GaugeSection section in Scale.Sections)
+                {
+                    if (section.Visible == true)
+                    {
+                        if (section.ValueInRange(_Value) == true)
+                            list.Add(section);
+                    }
+                }
+
+                if (_Scale.GaugeControl != null)
+                {
+                    if (_SectionList != null)
+                    {
+                        foreach (GaugeSection section in _SectionList)
+                        {
+                            if (list.Contains(section) == false)
+                                Scale.GaugeControl.OnSectionExit(this, section);
+                        }
+                    }
+
+                    foreach (GaugeSection section in list)
+                    {
+                        if (_SectionList == null || _SectionList.Contains(section) == false)
+                            Scale.GaugeControl.OnSectionEnter(this, section);
+                    }
+                }
+
+                _SectionList = list;
+            }
+        }
+
+        #endregion
+
+        #region ProcessRangeChanges
+
+        private void ProcessRangeChanges()
+        {
+            if (Scale.HasRanges == true)
+            {
+                List<GaugeStrip> list = new List<GaugeStrip>();
+
+                foreach (GaugeRange range in Scale.Ranges)
+                {
+                    if (range.Visible == true)
+                    {
+                        if (range.ValueInRange(_Value) == true)
+                            list.Add(range);
+                    }
+                }
+
+                if (_Scale.GaugeControl != null)
+                {
+                    if (_RangeList != null)
+                    {
+                        foreach (GaugeRange range in _RangeList)
+                        {
+                            if (list.Contains(range) == false)
+                                Scale.GaugeControl.OnRangeExit(this, range);
+                        }
+                    }
+
+                    foreach (GaugeRange range in list)
+                    {
+                        if (_RangeList == null || _RangeList.Contains(range) == false)
+                            Scale.GaugeControl.OnRangeEnter(this, range);
+                    }
+                }
+
+                _RangeList = list;
+            }
+        }
+
+        #endregion
+
+        #region UpdateFillColors
+
+        #region UpdateFillColors
+
+        private void UpdateFillColors()
+        {
+            _FillColorEx = GetFillColorEx(_RangeList)
+                ?? (GetFillColorEx(_SectionList) ?? FillColor);
+
+            if (_Style == PointerStyle.Needle)
+            {
+                _CapFillColorEx = (GetCapFillColorEx(_RangeList)
+                    ?? GetCapFillColorEx(_SectionList)) ?? CapFillColor;
+            }
+        }
+
+        #endregion
+
+        #region GetFillColorEx
+
+        private GradientFillColor GetFillColorEx(List<GaugeStrip> list)
+        {
+            if (list != null)
+            {
+                for (int i = list.Count - 1; i >= 0; i--)
+                {
+                    if (list[i].HasPointerFillColor == true)
+                        return (list[i].PointerFillColor);
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetCapFillColorEx
+
+        private GradientFillColor GetCapFillColorEx(List<GaugeStrip> list)
+        {
+            if (list != null)
+            {
+                for (int i = list.Count - 1; i >= 0; i--)
+                {
+                    if (list[i].HasCapFillColor == true)
+                        return (list[i].CapFillColor);
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region EndInit
+
+        internal void EndInit()
+        {
+            UpdateStripData();
+        }
+
+        #endregion
+
+        #region FindItem
+
+        internal override GaugeItem FindItem(Point pt)
+        {
+            if (_Renderer != null)
+            {
+                GraphicsPath path = _Renderer.GetPointerPath();
+
+                if (path != null)
+                {
+                    if (path.IsVisible(pt) == true)
+                        return (this);
+                }
+                else
+                {
+                    GaugeBarRenderer bar = _Renderer as GaugeBarRenderer;
+
+                    if (bar != null)
+                    {
+                        Rectangle r;
+
+                        if (Scale is GaugeCircularScale)
+                        {
+                            r = new Rectangle(
+                                bar.IntervalPoint.X - 5, bar.IntervalPoint.Y - 5, 10, 10);
+                        }
+                        else
+                        {
+                            r = bar.Bounds;
+
+                            if (r.Width < 10)
+                            {
+                                r.X -= 5;
+                                r.Width = 10;
+                            }
+
+                            if (r.Height < 10)
+                            {
+                                r.Y -= 5;
+                                r.Height = 10;
+                            }
+                        }
+
+                        if (r.Contains(pt) == true)
+                            return (this);
+                    }
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetPointerPath
+
+        /// <summary>
+        /// Gets the Pointers GraphicsPath
+        /// </summary>
+        /// <returns>Pointers GraphicsPath</returns>
+        public GraphicsPath GetPointerPath()
+        {
+            if (_Renderer != null)
+                return (_Renderer.GetPointerPath());
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetCapBounds
+
+        /// <summary>
+        /// Gets the Pointer's Needle Cap bounds
+        /// </summary>
+        /// <returns></returns>
+        public Rectangle GetCapBounds()
+        {
+            if (_Renderer != null && _Renderer is GaugeNeedleRenderer)
+                return (((GaugeNeedleRenderer)_Renderer).CapBounds);
+
+            return (Rectangle.Empty);
+        }
+
+        #endregion
+
+        #region GetValueFromPoint
+
+        /// <summary>
+        /// Gets the value of the pointer from the given Point
+        /// </summary>
+        /// <param name="point">Point</param>
+        /// <returns>Value</returns>
+        public double GetValueFromPoint(Point point)
+        {
+            if (_Renderer != null)
+                return (_Renderer.GetValueFromPoint(point));
+
+            return (double.NaN);
+        }
+
+        #endregion
+
+        #region AppendTemplateText
+
+        protected override void ProcessTemplateText(
+            GaugeControl gauge, StringBuilder sb, string key, string data)
+        {
+            if (key.Equals("Value") == true)
+            {
+                sb.Append(string.IsNullOrEmpty(data)
+                              ? _Value.ToString()
+                              : String.Format("{0:" + data + "}", _Value));
+            }
+            else
+            {
+                base.ProcessTemplateText(gauge, sb, key, data);
+            }
+        }
+
+        #endregion
+
+        #region Mouse processing
+
+        #region OnMouseEnter
+
+        internal override void OnMouseEnter()
+        {
+            base.OnMouseEnter();
+
+            if (_AllowUserChange == true)
+                Scale.GaugeControl.Cursor = _ChangeCursor;
+        }
+
+        #endregion
+
+        #region OnMouseMove
+
+        internal override void OnMouseMove(MouseEventArgs e, bool mouseDown)
+        {
+            base.OnMouseMove(e, mouseDown);
+
+            if (mouseDown == true)
+            {
+                if (_AllowUserChange == true)
+                {
+                    if (_Renderer != null)
+                    {
+                        double oldValue = Value;
+                        double newValue = _Renderer.GetValueFromPoint(e.Location);
+
+                        if (newValue != oldValue)
+                        {
+                            if (Scale.GaugeControl.OnPointerChanging(this, oldValue, ref newValue) == false)
+                            {
+                                ValueEx = newValue;
+
+                                Scale.GaugeControl.OnPointerChanged(this, oldValue, newValue);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region OnMouseDown
+
+        private bool _MouseDown;
+
+        internal override void OnMouseDown(MouseEventArgs e)
+        {
+            base.OnMouseDown(e);
+
+            if (_AllowUserChange == true)
+            {
+                _MouseDown = true;
+
+                if (_Renderer != null)
+                    _Renderer.OnMouseDown(e);
+            }
+        }
+
+        #endregion
+
+        #region OnMouseUp
+
+        internal override void OnMouseUp(MouseEventArgs e)
+        {
+            base.OnMouseUp(e);
+
+            _MouseDown = false;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ICloneable Members
+
+        public override object Clone()
+        {
+            GaugePointer copy = new GaugePointer();
+
+            CopyToItem(copy);
+
+            return (copy);
+        }
+
+        #endregion
+
+        #region CopyToItem
+
+        public override void CopyToItem(GaugeItem copy)
+        {
+            GaugePointer c = copy as GaugePointer;
+
+            if (c != null)
+            {
+                base.CopyToItem(c);
+
+                c.AllowUserChange = _AllowUserChange;
+                c.BarStyle = _BarStyle;
+                c.BulbOffset = _BulbOffset;
+                c.BulbSize = _BulbSize;
+
+                if (_CapFillColor != null)
+                    c.CapFillColor = (GradientFillColor) _CapFillColor.Clone();
+
+                c.CapImage = _CapImage;
+                c.CapInnerBevel = _CapInnerBevel;
+                c.CapOnTop = _CapOnTop;
+                c.CapOuterBevel = _CapOuterBevel;
+                c.CapStyle = _CapStyle;
+                c.CapWidth = _CapWidth;
+                c.ChangeCursor = _ChangeCursor;
+                c.DampeningSweepTime = _DampeningSweepTime;
+
+                if (_FillColor != null)
+                    c.FillColor = (GradientFillColor)_FillColor.Clone();
+
+                c.HonorMaxPin = _HonorMaxPin;
+                c.HonorMinPin = _HonorMinPin;
+                c.Image = _Image;
+                c.Length = _Length;
+                c.MarkerStyle = _MarkerStyle;
+                c.NeedleStyle = _NeedleStyle;
+                c.Origin = _Origin;
+                c.OriginInterval = _OriginInterval;
+                c.Placement = _Placement;
+                c.RotateCap = _RotateCap;
+                c.ScaleOffset = _ScaleOffset;
+                c.SnapInterval = _SnapInterval;
+                c.Style = _Style;
+
+                if (_ThermoBackColor != null)
+                    c.ThermoBackColor = (GradientFillColor)_ThermoBackColor.Clone();
+
+                c.UnderTickMarks = _UnderTickMarks;
+                c.Value = _Value;
+                c.Width = _Width;
+            }
+        }
+
+        #endregion
+    }
+
+    #region Enums
+
+    public enum PointerStyle
+    {
+        Bar,
+        Marker,
+        Needle,
+        Thermometer
+    }
+
+    public enum PointerOrigin
+    {
+        Minimum,
+        Maximum,
+        Custom
+    }
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugePointers/GaugePointerRenderer.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugePointers/GaugePointerRenderer.cs
new file mode 100644
index 00000000..92c32421
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugePointers/GaugePointerRenderer.cs	
@@ -0,0 +1,563 @@
+using System;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Windows.Forms;
+
+namespace DevComponents.Instrumentation
+{
+    internal abstract class GaugePointerRenderer
+    {
+        #region Private variables
+
+        private GaugePointer _GaugePointer;
+
+        private int _Width;
+        private int _Length;
+
+        private float _IntervalAngle;
+        private Point _IntervalPoint;
+
+        private double _Dpt;
+
+        private GraphicsPath _PointerPath;
+
+        #endregion
+
+        protected GaugePointerRenderer(GaugePointer gaugePointer)
+        {
+            _GaugePointer = gaugePointer;
+        }
+
+        #region Abstract methods
+
+        public abstract void RenderCircular(PaintEventArgs e);
+        public abstract void RenderLinear(PaintEventArgs e);
+        public abstract GraphicsPath GetPointerPath();
+
+        #endregion
+
+        #region Protected properties
+
+        #region GaugePointer
+
+        protected GaugePointer GaugePointer
+        {
+            get { return (_GaugePointer); }
+        }
+
+        #endregion
+
+        #region IntervalAngle
+
+        internal float IntervalAngle
+        {
+            get { return (_IntervalAngle); }
+            set { _IntervalAngle = value; }
+        }
+
+        #endregion
+
+        #region IntervalPoint
+
+        internal Point IntervalPoint
+        {
+            get { return (_IntervalPoint); }
+            set { _IntervalPoint = value; }
+        }
+
+        #endregion
+
+        #region Length
+
+        protected int Length
+        {
+            get { return (_Length); }
+            set { _Length = value; }
+        }
+
+        #endregion
+
+        #region MarkerStyle
+        
+        protected GaugeMarkerStyle MarkerStyle
+        {
+            get { return (_GaugePointer.MarkerStyle); }
+        }
+
+        #endregion
+
+        #region PointerPath
+
+        internal GraphicsPath PointerPath
+        {
+            get { return (_PointerPath); }
+            
+            set
+            {
+                if (_PointerPath != value)
+                {
+                    if (_PointerPath != null)
+                        _PointerPath.Dispose();
+
+                    _PointerPath = value;
+                }
+            }
+        }
+
+        #endregion
+
+        #region Radius
+
+        protected int Radius
+        {
+            get { return (_GaugePointer.Radius); }
+        }
+
+        #endregion
+
+        #region Scale
+
+        protected GaugeScale Scale
+        {
+            get { return (_GaugePointer.Scale); }
+        }
+
+        #endregion
+
+        #region Value
+
+        protected double Value
+        {
+            get { return (_GaugePointer.DValue); }
+        }
+
+        #endregion
+
+        #region Width
+
+        protected int Width
+        {
+            get { return (_Width); }
+            set { _Width = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region Dpt
+
+        internal double Dpt
+        {
+            get { return (_Dpt > 0 ? _Dpt : 1); }
+            set { _Dpt = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetCapFillColor
+
+        protected GradientFillColor GetCapFillColor(double interval)
+        {
+            const ColorSourceFillEntry entry = ColorSourceFillEntry.Cap;
+
+            GradientFillColor fillColor = (Scale.GetRangeFillColor(interval, entry) ??
+                                           Scale.GetSectionFillColor(interval, entry)) ?? GaugePointer.CapFillColor;
+
+            return (fillColor);
+        }
+
+        #endregion
+
+        #region GetPointerFillColor
+
+        protected GradientFillColor GetPointerFillColor(double interval)
+        {
+            const ColorSourceFillEntry entry = ColorSourceFillEntry.Pointer;
+
+            GradientFillColor fillColor = (Scale.GetRangeFillColor(interval, entry) ??
+                                           Scale.GetSectionFillColor(interval, entry)) ?? GaugePointer.FillColor;
+
+            return (fillColor);
+        }
+
+        #endregion
+
+        #region GetInterval
+
+        internal double GetInterval(double interval)
+        {
+            bool pegged;
+
+            return (GetIntervalEx(interval, out pegged));
+        }
+
+        internal double GetInterval(double interval, out bool pegged)
+        {
+            double min, max;
+            GetRange(out min, out max);
+
+            pegged = true;
+
+            if (interval.Equals(double.NaN))
+                return (min);
+
+            if (interval < min)
+                interval = min;
+
+            else if (interval > max)
+                interval = max;
+            else
+                pegged = false;
+
+            return (interval);
+        }
+
+        internal double GetIntervalEx(double interval, out bool pegged)
+        {
+            int n = (GaugePointer.Scale is GaugeLinearScale)
+                        ? ((GaugeLinearScale) Scale).AbsLength
+                        : 360;
+
+            double minPinValue = GaugePointer.HonorMinPin ? (Scale.MinPinEndOffset*n)/Dpt : 0;
+            double maxPinValue = GaugePointer.HonorMaxPin ? (Scale.MaxPinEndOffset*n)/Dpt : 0;
+
+            double min = Scale.MinValue;
+            double max = Scale.MaxValue;
+
+            if (Scale.MinValue <= Scale.AbsMinLimit)
+                min -= minPinValue;
+
+            if (Scale.MaxValue >= Scale.AbsMaxLimit)
+                max += maxPinValue;
+
+            pegged = true;
+
+            if (interval.Equals(double.NaN))
+                return (min);
+
+            if (interval < min)
+            {
+                interval = Scale.MinValue > Scale.AbsMinLimit
+                               ? Math.Max(min - 1, Scale.AbsMinLimit)
+                               : min;
+            }
+            else if (interval > max)
+            {
+                interval = Scale.MaxValue < Scale.AbsMaxLimit
+                               ? Math.Min(max + 1, Scale.AbsMaxLimit)
+                               : max;
+            }
+            else
+            {
+                pegged = false;
+            }
+
+            return (interval);
+        }
+
+        #endregion
+
+        #region GetRange
+
+        internal void GetRange(out double min, out double max)
+        {
+            int n = (GaugePointer.Scale is GaugeLinearScale)
+                        ? ((GaugeLinearScale) Scale).AbsLength
+                        : 360;
+
+            double minPinValue = GaugePointer.HonorMinPin ? (Scale.MinPinEndOffset * n) / Dpt : 0;
+            double maxPinValue = GaugePointer.HonorMaxPin ? (Scale.MaxPinEndOffset * n) / Dpt : 0;
+
+            min = Scale.MinValue - minPinValue;
+            max = Scale.MaxValue + maxPinValue;
+         }
+
+        #endregion
+
+        #region GetRangeEx
+
+        internal void GetRangeEx(out double min, out double max)
+        {
+            int n = (GaugePointer.Scale is GaugeLinearScale)
+                        ? ((GaugeLinearScale)Scale).AbsLength
+                        : 360;
+
+            double minPinValue = GaugePointer.HonorMinPin ? (Scale.MinPinEndOffset * n) / Dpt : 0;
+            double maxPinValue = GaugePointer.HonorMaxPin ? (Scale.MaxPinEndOffset * n) / Dpt : 0;
+
+            min = Scale.AbsMinLimit - minPinValue;
+            max = Scale.AbsMaxLimit + maxPinValue;
+        }
+
+        #endregion
+
+        #region SwapDoubles
+
+        protected void SwapDoubles(ref double marker, ref double origin)
+        {
+            double temp = marker;
+
+            marker = origin;
+            origin = temp;
+        }
+
+        #endregion
+
+        #region RecalcLayout
+
+        public virtual void RecalcLayout()
+        {
+            PointerPath = null;
+
+            if (Scale is GaugeCircularScale)
+                CalcCircularMetrics(Scale as GaugeCircularScale);
+
+            else if (Scale is GaugeLinearScale)
+                CalcLinearMetrics(Scale as GaugeLinearScale);
+        }
+
+        #region CalcCircularMetrics
+
+        private void CalcCircularMetrics(GaugeCircularScale scale)
+        {
+            _Width = (int)(scale.AbsRadius * GaugePointer.Width);
+            _Length = (int)(scale.AbsRadius * GaugePointer.Length);
+
+            if (_Width % 2 != 0)
+                _Width++;
+        }
+
+        #endregion
+
+        #region CalcLinearMetrics
+
+        private void CalcLinearMetrics(GaugeLinearScale scale)
+        {
+            int n = scale.AbsWidth;
+
+            _Width = (int)(n * GaugePointer.Width);
+            _Length = (int)(n * GaugePointer.Length);
+
+            if (_Width % 2 != 0)
+                _Width++;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetValueFromPoint
+
+        public virtual double GetValueFromPoint(Point pt)
+        {
+            if (Scale is GaugeCircularScale)
+                return (GetCValueFromPoint(Scale as GaugeCircularScale, pt));
+
+            return (GetLValueFromPoint(Scale as GaugeLinearScale, pt));
+        }
+
+        #region GetCValueFromPoint
+
+        private double GetCValueFromPoint(GaugeCircularScale scale, Point pt)
+        {
+            double minValue = scale.MinValue;
+            double maxValue = scale.MaxValue;
+
+            double startAngle = scale.StartAngle;
+            double sweepAngle = scale.SweepAngle;
+
+            double radians = GetPointRadians(pt);
+
+            double spread = scale.MaxValue - scale.MinValue;
+            double dpt = spread / scale.SweepAngle;
+
+            if (minValue <= scale.AbsMinLimit)
+                minValue -= GetCMinPinOffset(dpt, ref startAngle, ref sweepAngle);
+
+            if (maxValue >= scale.AbsMaxLimit)
+                maxValue += GetCMaxPinOffset(dpt, ref startAngle, ref sweepAngle);
+
+            double angle = (GaugePointer.MouseDownAngle +
+                scale.GetDegrees(radians - GaugePointer.MouseDownRadians) - startAngle) % 360;
+
+            if (angle < 0)
+                angle += 360;
+
+            if (scale.Reversed == true)
+            {
+                angle = sweepAngle - angle;
+
+                if (angle < 0)
+                    angle += 360;
+            }
+
+            if (angle < sweepAngle)
+            {
+                double value = angle * dpt + minValue;
+
+                if (GaugePointer.SnapInterval > 0)
+                    value = (int)(value / GaugePointer.SnapInterval) * GaugePointer.SnapInterval;
+
+                return (value);
+            }
+
+            if (angle > sweepAngle + (360 - sweepAngle) / 2)
+            {
+                double limit = minValue;
+
+                if (limit > scale.AbsMinLimit)
+                    limit = Math.Max(limit - 1, scale.AbsMinLimit);
+
+                return (limit);
+            }
+
+            double limit2 = maxValue;
+
+            if (limit2 < scale.AbsMaxLimit)
+                limit2 = Math.Min(limit2 + 1, scale.AbsMaxLimit);
+
+            return (limit2);
+        }
+
+        #region GetCMinPinOffset
+
+        private double GetCMinPinOffset(
+            double dpt, ref double startAngle, ref double sweepAngle)
+        {
+            if (GaugePointer.HonorMinPin == true)
+            {
+                double d = Scale.MinPinEndOffset * 360;
+
+                if (Scale.Reversed == false)
+                    startAngle -= d;
+
+                sweepAngle += d;
+
+                return (d * dpt);
+            }
+
+            return (0);
+        }
+
+        #endregion
+
+        #region GetCMaxPinOffset
+
+        private double GetCMaxPinOffset(
+            double dpt, ref double startAngle, ref double sweepAngle)
+        {
+            if (GaugePointer.HonorMaxPin == true)
+            {
+                double d = Scale.MaxPinEndOffset * 360;
+
+                if (Scale.Reversed == true)
+                    startAngle -= d;
+
+                sweepAngle += d;
+
+                return (d * dpt);
+            }
+
+            return (0);
+        }
+
+        #endregion
+
+        #region GetPointRadians
+
+        internal double GetPointRadians(Point pt)
+        {
+            int dx = pt.X - Scale.Center.X;
+            int dy = pt.Y - Scale.Center.Y;
+
+            if (dx >= 0)
+            {
+                if (dy >= 0)
+                    return (Math.Atan((double)dy / dx));
+
+                return (-Math.Atan((double)dx / dy) + Math.PI * 1.5);
+            }
+
+            if (dy >= 0)
+                return (-Math.Atan((double)dx / dy) + Math.PI / 2);
+
+            return (Math.Atan((double)dy / dx) + Math.PI);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetLValueFromPoint
+
+        private double GetLValueFromPoint(GaugeLinearScale scale, Point pt)
+        {
+            bool pegged;
+
+            double value = (scale.Orientation == Orientation.Horizontal)
+                               ? GetLhValueFromPoint(scale, pt, out pegged)
+                               : GetLvValueFromPoint(scale, pt, out pegged);
+
+            if (GaugePointer.SnapInterval > 0)
+            {
+                if (pegged == false)
+                    value = (int)(value / GaugePointer.SnapInterval) * GaugePointer.SnapInterval;
+            }
+
+            return (value);
+        }
+
+        #region GetLhValueFromPoint
+
+        private double GetLhValueFromPoint(GaugeLinearScale scale, Point pt, out bool pegged)
+        {
+            double spread = scale.MaxValue - scale.MinValue;
+            double tpd = spread / scale.ScaleBounds.Width;
+
+            double interval = (pt.X - scale.ScaleBounds.X) * tpd;
+
+            if (scale.Reversed == true)
+                return (GetIntervalEx(scale.MaxValue - interval, out pegged));
+
+            return (GetIntervalEx(scale.MinValue + interval, out pegged));
+        }
+
+        #endregion
+
+        #region GetLvValueFromPoint
+
+        private double GetLvValueFromPoint(GaugeLinearScale scale, Point pt, out bool pegged)
+        {
+            double spread = scale.MaxValue - scale.MinValue;
+            double tpd = spread / scale.ScaleBounds.Height;
+
+            double interval = (pt.Y - scale.ScaleBounds.Y) * tpd;
+
+            if (scale.Reversed == true)
+                return (GetIntervalEx(scale.MinValue + interval, out pegged));
+
+            return (GetIntervalEx(scale.MaxValue - interval, out pegged));
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region OnMouseDown
+
+        internal virtual void OnMouseDown(MouseEventArgs e)
+        {
+            GaugePointer.MouseDownAngle = 0;
+            GaugePointer.MouseDownRadians = 0;
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugePointers/GaugeThermoRenderer.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugePointers/GaugeThermoRenderer.cs
new file mode 100644
index 00000000..12f8916e
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugePointers/GaugeThermoRenderer.cs	
@@ -0,0 +1,636 @@
+using System;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Windows.Forms;
+
+namespace DevComponents.Instrumentation
+{
+    internal class GaugeThermoRenderer : GaugeBarRenderer
+    {
+        #region Private variables
+
+        private Rectangle _BackBounds;
+        private Rectangle _BulbBounds;
+
+        #endregion
+
+        internal GaugeThermoRenderer(GaugePointer gaugePointer)
+            : base(gaugePointer)
+        {
+        }
+
+        #region RecalcLayout
+
+        #region  CalcHorizontalMarkerBounds
+
+        protected override void CalcHorizontalMarkerBounds(GaugeLinearScale scale, int y)
+        {
+            int n = (int)(GaugePointer.BulbOffset * scale.ScaleBounds.Width);
+
+            if (Marker < Origin)
+            {
+                RoundAngle = 180;
+
+                int len = Math.Max(1, (int)((Origin - Marker) * Dpt) + n);
+                int x;
+
+                if (scale.Reversed == true)
+                {
+                    x = scale.ScaleBounds.Right - (int)(Origin * Dpt) - n;
+                }
+                else
+                {
+                    x = scale.ScaleBounds.X + (int)(Marker * Dpt);
+                    int x2 = scale.ScaleBounds.X + (int)(Origin * Dpt) + n;
+
+                    len = Math.Max(1, x2 - x + 1);
+                }
+
+                Bounds = new Rectangle(x, y, len, Width);
+
+                double maxMarker = GetInterval(double.MinValue) - scale.MinValue;
+
+                _BackBounds = Bounds;
+                _BackBounds.Width = (int)((Origin - maxMarker) * Dpt + n);
+
+                if (scale.Reversed == false)
+                    _BackBounds.X = scale.ScaleBounds.Left + (int)(maxMarker * Dpt);
+            }
+            else
+            {
+                RoundAngle = 0;
+
+                int len = Math.Max(1, (int)((Marker - Origin) * Dpt) + n);
+                int x;
+                
+                if (scale.Reversed == true)
+                    x = scale.ScaleBounds.Right - (int)(Origin * Dpt) - len + n;
+                else
+                    x = scale.ScaleBounds.X + (int)(Origin * Dpt) - n;
+
+                Bounds = new Rectangle(x, y, len, Width);
+
+                double maxMarker = GetInterval(double.MaxValue) - scale.MinValue;
+
+                _BackBounds = Bounds;
+                _BackBounds.Width = (int)((maxMarker - Origin) * Dpt + n);
+
+                if (scale.Reversed == true)
+                    _BackBounds.X = scale.ScaleBounds.Right - (int)(maxMarker * Dpt) + 1;
+            }
+        }
+
+        #endregion
+
+        #region CalcVerticalMarkerBounds
+
+        protected override void CalcVerticalMarkerBounds(GaugeLinearScale scale, int x)
+        {
+            int n = (int)(GaugePointer.BulbOffset * scale.ScaleBounds.Height);
+
+            if (Marker < Origin)
+            {
+                RoundAngle = 90;
+
+                int len = Math.Max(1, (int)((Origin - Marker) * Dpt) + n);
+                int y;
+
+                if (scale.Reversed == true)
+                {
+                    y = scale.ScaleBounds.Y + (int)(Marker * Dpt);
+                    int y2 = scale.ScaleBounds.Y + (int)(Origin * Dpt) + n;
+
+                    len = Math.Max(1, y2 - y);
+                }
+                else
+                {
+                    y = scale.ScaleBounds.Bottom - (int)(Origin * Dpt) - n;
+                }
+
+                Bounds = new Rectangle(x, y, Width, len);
+
+                _BackBounds = Bounds;
+
+                double minMarker = GetInterval(double.MinValue) - scale.MinValue;
+
+                if (scale.Reversed == true)
+                {
+                    _BackBounds.Y = scale.ScaleBounds.Top + (int)(minMarker * Dpt);
+                    _BackBounds.Height = Bounds.Bottom - _BackBounds.Y;
+                }
+                else
+                {
+                    _BackBounds.Height = (int)((Origin - minMarker) * Dpt + n);
+                }
+            }
+            else
+            {
+                RoundAngle = -90;
+
+                int len = Math.Max(1, (int)((Marker - Origin) * Dpt) + n);
+                int y;
+
+                if (scale.Reversed == true)
+                {
+                    y = scale.ScaleBounds.Top + (int)(Origin * Dpt) - n;
+                }
+                else
+                {
+                    y = scale.ScaleBounds.Bottom - (int)(Marker * Dpt);
+                    int y2 = scale.ScaleBounds.Bottom - (int)(Origin * Dpt) + n;
+
+                    len = Math.Max(1, y2 - y);
+                }
+
+                Bounds = new Rectangle(x, y, Width, len);
+
+                _BackBounds = Bounds;
+
+                double maxMarker = GetInterval(double.MaxValue) - scale.MinValue;
+
+                if (scale.Reversed == false)
+                {
+                    _BackBounds.Y = scale.ScaleBounds.Bottom - (int)(maxMarker * Dpt);
+                    _BackBounds.Height = Bounds.Bottom - _BackBounds.Y;
+                }
+                else
+                {
+                    _BackBounds.Height = (int)((maxMarker - Origin) * Dpt + n);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderLinear
+
+        public override void RenderLinear(PaintEventArgs e)
+        {
+            Graphics g = e.Graphics;
+
+            GaugeLinearScale scale = Scale as GaugeLinearScale;
+
+            if (scale != null)
+            {
+                if (Bounds.Width > 0 && Bounds.Height > 0)
+                {
+                    using (GraphicsPath path = GetBulbBackPath(scale))
+                        RenderBar(g, path, GaugePointer.ThermoBackColor);
+
+                    using (GraphicsPath path = GetBulbFillPath(scale))
+                        RenderBar(g, path);
+                }
+            }
+        }
+
+        #region GetBulbBackPath
+
+        private GraphicsPath GetBulbBackPath(GaugeLinearScale scale)
+        {
+            return (GetBulbPath(scale, _BackBounds, 1));
+        }
+
+        #endregion
+
+        #region GetBulbFillPath
+
+        private GraphicsPath GetBulbFillPath(GaugeLinearScale scale)
+        {
+            return (GetBulbPath(scale, Bounds, 0));
+        }
+
+        #endregion
+
+        #region GetBulbPath
+
+        private GraphicsPath GetBulbPath(
+            GaugeLinearScale scale, Rectangle r, int inf)
+        {
+            GraphicsPath path = new GraphicsPath();
+
+            r.Inflate(inf, inf);
+
+            if (scale.Orientation == Orientation.Horizontal)
+            {
+                if (Marker < Origin != scale.Reversed)
+                    return (GetHorizontalRightBulbPath(scale, path, r, inf));
+
+                return (GetHorizontalLeftBulbPath(scale, path, r, inf));
+            }
+
+            if (Marker < Origin != scale.Reversed)
+                return (GetVerticalTopBulbPath(scale, path, r, inf));
+
+            return (GetVerticalBottomBulbPath(scale, path, r, inf));
+        }
+
+        #region GetHorizontalLeftBulbPath
+
+        private GraphicsPath GetHorizontalLeftBulbPath(
+            GaugeLinearScale scale, GraphicsPath path, Rectangle t, int inflate)
+        {
+            AddLeftTube(path, t, inflate);
+            AddLeftBulb(scale, path, t, inflate);
+
+            path.CloseAllFigures();
+
+            return (path);
+        }
+
+        #region AddLeftTube
+
+        private void AddLeftTube(GraphicsPath path, Rectangle t, int inflate)
+        {
+            if (GaugePointer.BarStyle == BarPointerStyle.Square || inflate > 0)
+            {
+                Point[] pts = new Point[] {
+                    new Point(t.X, t.Y),
+                    new Point(t.Right, t.Y),
+                    new Point(t.Right, t.Bottom),
+                    new Point(t.X, t.Bottom) };
+
+                path.AddLines(pts);
+            }
+            else
+            {
+                int x = Math.Max(t.Right - Width / 2, t.X);
+                int n = t.Right - x;
+
+                Rectangle r = new Rectangle(x - n, t.Y, n * 2, t.Height);
+
+                Point[] pts = new Point[] {
+                    new Point(t.X, t.Y),
+                    new Point (x, t.Y)};
+
+                path.AddLines(pts);
+
+                if (GaugePointer.BarStyle == BarPointerStyle.Rounded)
+                {
+                    path.AddArc(r, 270, 180);
+                }
+                else
+                {
+                    path.AddLine(new Point(r.X + r.Width / 2, r.Y),
+                                 new Point(r.Right, r.Y + r.Height / 2));
+                }
+
+                pts = new Point[] {
+                    new Point(x, t.Bottom),
+                    new Point (t.X, t.Bottom)};
+
+                path.AddLines(pts);
+            }
+        }
+
+        #endregion
+
+        #region AddLeftBulb
+
+        private void AddLeftBulb(GaugeLinearScale scale, GraphicsPath path, Rectangle t, int inflate)
+        {
+            int bulbRadius = (int)(GaugePointer.BulbSize * scale.Bounds.Height);
+
+            if (bulbRadius * 2 < t.Height)
+                bulbRadius = t.Height / 2;
+
+            int m = (int)Math.Sqrt((bulbRadius * bulbRadius) - (t.Height * t.Height / 4)) + 4;
+
+            _BulbBounds = new Rectangle(
+                t.X - m - bulbRadius,
+                t.Y - bulbRadius + t.Height / 2, bulbRadius * 2, bulbRadius * 2);
+
+            if (inflate > 0)
+                _BulbBounds.Inflate(inflate, inflate);
+
+            float angle = (GaugePointer.BulbStyle == BulbStyle.Flask)
+                ? 90 : (float)(Math.Asin((double)(Width / 2) / bulbRadius) * 180 / Math.PI);
+
+            path.AddArc(_BulbBounds, angle, 360 - (angle * 2));
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetHorizontalRightBulbPath
+
+        private GraphicsPath GetHorizontalRightBulbPath(
+            GaugeLinearScale scale, GraphicsPath path, Rectangle t, int inflate)
+        {
+            AddRightTube(path, t, inflate);
+            AddRightBulb(scale, path, t, inflate);
+
+            path.CloseAllFigures();
+
+            return (path);
+        }
+
+        #region AddRightTube
+
+        private void AddRightTube(GraphicsPath path, Rectangle t, int inflate)
+        {
+            if (GaugePointer.BarStyle == BarPointerStyle.Square || inflate > 0)
+            {
+                Point[] pts = new Point[] {
+                      new Point(t.Right, t.Bottom),
+                      new Point(t.X, t.Bottom),
+                      new Point(t.X, t.Y),
+                      new Point(t.Right, t.Y) };
+
+                path.AddLines(pts);
+            }
+            else
+            {
+                int x = Math.Min(t.X + Width / 2, t.Right);
+                int n = x - t.X;
+
+                Rectangle r = new Rectangle(t.X, t.Y, n * 2, t.Height);
+
+                Point[] pts = new Point[] {
+                    new Point(t.Right, t.Bottom),
+                    new Point (x, t.Bottom)};
+
+                path.AddLines(pts);
+
+                if (GaugePointer.BarStyle == BarPointerStyle.Rounded)
+                {
+                    path.AddArc(r, 90, 180);
+                }
+                else
+                {
+                    path.AddLine(new Point(r.X + r.Width / 2, r.Bottom),
+                                 new Point(r.X, r.Y + r.Height / 2));
+                }
+
+                pts = new Point[] {
+                    new Point(x, t.Y),
+                    new Point (t.Right, t.Y)};
+
+                path.AddLines(pts);
+            }
+        }
+
+        #endregion
+
+        #region AddRightBulb
+
+        private void AddRightBulb(GaugeLinearScale scale, GraphicsPath path, Rectangle t, int inflate)
+        {
+            int bulbRadius = (int)(GaugePointer.BulbSize * scale.Bounds.Height);
+
+            if (bulbRadius * 2 < t.Height)
+                bulbRadius = t.Height / 2;
+
+            int m = (int)Math.Sqrt((bulbRadius * bulbRadius) - (t.Height * t.Height / 4));
+
+            _BulbBounds = new Rectangle(
+                t.Right - bulbRadius + m,
+                t.Y - bulbRadius + t.Height / 2, bulbRadius * 2, bulbRadius * 2);
+
+            if (inflate > 0)
+                _BulbBounds.Inflate(inflate, inflate);
+
+            float angle = (GaugePointer.BulbStyle == BulbStyle.Flask)
+                              ? 90 : (float)(Math.Asin((double)(Width / 2) / bulbRadius) * 180 / Math.PI);
+
+            path.AddArc(_BulbBounds, angle + 180, 360 - (angle * 2));
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetVerticalBottomBulbPath
+
+        private GraphicsPath GetVerticalBottomBulbPath(
+            GaugeLinearScale scale, GraphicsPath path, Rectangle t, int inflate)
+        {
+            AddBottomTube(path, t, inflate);
+            AddBottomBulb(scale, path, t, inflate);
+
+            path.CloseAllFigures();
+
+            return (path);
+        }
+
+        #region AddBottomTube
+
+        private void AddBottomTube(GraphicsPath path, Rectangle t, int inflate)
+        {
+            if (GaugePointer.BarStyle == BarPointerStyle.Square || inflate > 0)
+            {
+                Point[] pts = new Point[] {
+                    new Point(t.X, t.Bottom),
+                    new Point(t.X, t.Y),
+                    new Point(t.Right, t.Y),
+                    new Point(t.Right, t.Bottom) };
+
+                path.AddLines(pts);
+            }
+            else
+            {
+                int y = Math.Min(t.Y + t.Width / 2, t.Bottom);
+                int n = y - t.Y;
+
+                Rectangle r = new Rectangle(t.X, y - n, t.Width, n * 2);
+
+                Point[] pts = new Point[] {
+                    new Point(t.X, t.Bottom),
+                    new Point (t.X, y)};
+
+                path.AddLines(pts);
+
+                if (GaugePointer.BarStyle == BarPointerStyle.Rounded)
+                {
+                    path.AddArc(r, 180, 180);
+                }
+                else
+                {
+                    path.AddLine(new Point(r.X, r.Y + r.Height / 2),
+                                 new Point(r.X + r.Width / 2, r.Y));
+                }
+
+                pts = new Point[] {
+                    new Point(t.Right, y),
+                    new Point (t.Right, t.Bottom)};
+
+                path.AddLines(pts);
+            }
+        }
+
+        #endregion
+
+        #region AddBottomBulb
+
+        private void AddBottomBulb(GaugeLinearScale scale, GraphicsPath path, Rectangle t, int inflate)
+        {
+            int bulbRadius = (int)(GaugePointer.BulbSize * scale.Bounds.Width);
+
+            if (bulbRadius * 2 < t.Width)
+                bulbRadius = t.Width / 2;
+
+            int m = (int)Math.Sqrt((bulbRadius * bulbRadius) - (Width * Width / 4)) + 4;
+
+            _BulbBounds = new Rectangle(
+                t.X - bulbRadius + t.Width / 2,
+                t.Bottom - bulbRadius + m - inflate, bulbRadius * 2, bulbRadius * 2);
+
+            if (inflate > 0)
+                _BulbBounds.Inflate(inflate, inflate);
+
+            float angle = ((GaugePointer.BulbStyle == BulbStyle.Flask)
+                              ? 90 : (float)(Math.Asin((double)(Width / 2) / bulbRadius) * 180 / Math.PI));
+
+            path.AddArc(_BulbBounds, angle + 270, 360 - (angle * 2));
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetVerticalTopBulbPath
+
+        private GraphicsPath GetVerticalTopBulbPath(
+            GaugeLinearScale scale, GraphicsPath path, Rectangle t, int inflate)
+        {
+            AddTopTube(path, t, inflate);
+            AddTopBulb(scale, path, t, inflate);
+
+            path.CloseAllFigures();
+
+            return (path);
+        }
+
+        #region AddTopTube
+
+        private void AddTopTube(GraphicsPath path, Rectangle t, int inflate)
+        {
+            if (GaugePointer.BarStyle == BarPointerStyle.Square || inflate > 0)
+            {
+                Point[] pts = new Point[] {
+                    new Point(t.Right, t.Y),
+                    new Point(t.Right, t.Bottom),
+                    new Point(t.X, t.Bottom),
+                    new Point(t.X, t.Y) };
+
+                path.AddLines(pts);
+            }
+            else
+            {
+                int y = Math.Max(t.Bottom - t.Width / 2, t.Y);
+                int n = t.Bottom - y;
+
+                Rectangle r = new Rectangle(t.X, y - n, t.Width, n * 2);
+
+                Point[] pts = new Point[] {
+                    new Point(t.Right, t.Y),
+                    new Point(t.Right, y)};
+
+                path.AddLines(pts);
+
+                if (GaugePointer.BarStyle == BarPointerStyle.Rounded)
+                {
+                    path.AddArc(r, 0, 180);
+                }
+                else
+                {
+                    path.AddLine(new Point(r.Right, r.Y + r.Height / 2),
+                                 new Point(r.X + r.Width / 2, r.Bottom));
+                }
+
+                pts = new Point[] {
+                    new Point(t.X, y),
+                    new Point (t.X, t.Y)};
+
+                path.AddLines(pts);
+            }
+        }
+
+        #endregion
+
+        #region AddTopBulb
+
+        private void AddTopBulb(GaugeLinearScale scale, GraphicsPath path, Rectangle t, int inflate)
+        {
+            int bulbRadius = (int)(GaugePointer.BulbSize * scale.Bounds.Width);
+
+            if (bulbRadius * 2 < t.Width)
+                bulbRadius = t.Width / 2;
+
+            int m = (int)Math.Sqrt((bulbRadius * bulbRadius) - (Width * Width / 4));
+
+            _BulbBounds = new Rectangle(
+                t.X - bulbRadius + t.Width / 2,
+                t.Y - (bulbRadius + m) + inflate, bulbRadius * 2, bulbRadius * 2);
+
+            if (inflate > 0)
+                _BulbBounds.Inflate(inflate, inflate);
+
+            float angle = (GaugePointer.BulbStyle == BulbStyle.Flask)
+                ? 90 : (float)(Math.Asin((double)(t.Width / 2) / bulbRadius) * 180 / Math.PI);
+
+            path.AddArc(_BulbBounds, angle + 90, 360 - (angle * 2));
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region RenderBarByCenter
+
+        protected override void RenderBarByCenter(
+            Graphics g, GraphicsPath path, GradientFillColor fillColor)
+        {
+            using (PathGradientBrush br = new PathGradientBrush(path))
+            {
+                br.WrapMode = WrapMode.TileFlipXY;
+
+                br.CenterColor = fillColor.Color1;
+                br.SurroundColors = new Color[] { fillColor.Color2 };
+
+                br.CenterPoint = new PointF(
+                    _BulbBounds.X + _BulbBounds.Width / 2, _BulbBounds.Y + _BulbBounds.Height / 2);
+
+                g.FillPath(br, path);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetPointerPath
+
+        public override GraphicsPath GetPointerPath()
+        {
+            if (PointerPath == null)
+            {
+                GaugeLinearScale scale = Scale as GaugeLinearScale;
+
+                if (scale != null)
+                {
+                    if (Bounds.Width > 0 && Bounds.Height > 0)
+                        PointerPath = GetBulbBackPath(scale);
+                }
+            }
+
+            return (PointerPath);
+        }
+
+        #endregion
+    }
+
+    #region Enums
+
+    public enum BulbStyle
+    {
+        Bulb,
+        Flask,
+    }
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeScale/GaugeCircularScale.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeScale/GaugeCircularScale.cs
new file mode 100644
index 00000000..53d0f4ba
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeScale/GaugeCircularScale.cs	
@@ -0,0 +1,590 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Drawing.Drawing2D;
+using System.Windows.Forms;
+using DevComponents.Instrumentation.Primitives;
+
+namespace DevComponents.Instrumentation
+{
+    /// <summary>
+    /// Collection of GaugeCircularScales
+    /// </summary>
+    public class GaugeCircularScaleCollection : GenericCollection<GaugeCircularScale>
+    {
+    }
+
+    [TypeConverter(typeof(GaugeScaleConvertor))]
+    public class GaugeCircularScale : GaugeScale
+    {
+        #region Private variables
+
+        private float _StartAngle;
+        private float _SweepAngle;
+        private float _Radius;
+
+        private PointF _PivotPoint;
+        private int _SquareSize;
+
+        #endregion
+
+        public GaugeCircularScale(GaugeControl gaugeControl)
+            : base(gaugeControl)
+        {
+            InitGaugeScale();
+        }
+
+        public GaugeCircularScale()
+        {
+            InitGaugeScale();
+        }
+
+        #region InitGaugeScale
+
+        private void InitGaugeScale()
+        {
+            Style = GaugeScaleStyle.Circular;
+
+            _PivotPoint = new PointF(.5f, .5f);
+
+            Radius = .38f;
+            StartAngle = 110;
+            SweepAngle = 320;
+
+            Width = .065f;
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region PivotPoint
+
+        /// <summary>
+        /// Gets or sets the Scale pivot point, specified as a percentage
+        /// </summary>
+        [Browsable(true), Category("Layout")]
+        [Editor("DevComponents.Instrumentation.Design.PivotPointEditor, DevComponents.Instrumentation.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=76cb4c6eb576bca5", typeof(UITypeEditor))]
+        [Description("Indicates the Scale pivot point, specified as a percentage.")]
+        [TypeConverter(typeof(PointFConverter))]
+        public PointF PivotPoint
+        {
+            get { return (_PivotPoint); }
+
+            set
+            {
+                if (_PivotPoint.Equals(value) == false)
+                {
+                    _PivotPoint = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        internal bool ShouldSerializePivotPoint()
+        {
+            return (_PivotPoint.X != .5f || _PivotPoint.Y != .5f);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        internal void ResetPivotPoint()
+        {
+            _PivotPoint = new PointF(.5f, .5f);
+        }
+
+        #endregion
+
+        #region Radius
+
+        /// <summary>
+        /// Gets or sets the Radius of Scale, specified as a percentage
+        /// </summary>
+        [Browsable(true)]
+        [Category("Layout"), DefaultValue(.38f)]
+        [Editor("DevComponents.Instrumentation.Design.RadiusRangeValueEditor, DevComponents.Instrumentation.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=76cb4c6eb576bca5", typeof(UITypeEditor))]
+        [Description("Indicates the Radius of Scale, specified as a percentage.")]
+        [NotifyParentProperty(true)]
+        public float Radius
+        {
+            get { return (_Radius); }
+
+            set
+            {
+                if (value < 0)
+                    throw new ArgumentException("Value can not be less than zero.");
+
+                if (_Radius != value)
+                {
+                    _Radius = value;
+
+                    NeedLabelRecalcLayout = true;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region StartAngle
+
+        /// <summary>
+        /// Gets and sets the angle measured from the x-axis to the starting point of the scale
+        /// </summary>
+        [Browsable(true)]
+        [Category("Layout"), DefaultValue(110f)]
+        [Description("Indicates the angle measured from the x-axis to the starting point of the scale.")]
+        [Editor("DevComponents.Instrumentation.Design.AngleRangeValueEditor, DevComponents.Instrumentation.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=76cb4c6eb576bca5", typeof(UITypeEditor))]
+        public float StartAngle
+        {
+            get { return (_StartAngle); }
+
+            set
+            {
+                if (value < 0 || value > 360)
+                    throw new ArgumentException("Value must be between 0 and 360 degrees.");
+
+                if (_StartAngle != value)
+                {
+                    _StartAngle = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region SweepAngle
+
+        /// <summary>
+        /// Get and sets the angle measured from the StartAngle to the ending point of the scale.
+        /// </summary>
+        [Browsable(true)]
+        [Category("Layout"), DefaultValue(320f)]
+        [Description("Indicates the angle measured from the StartAngle to the ending point of the scale.")]
+        [Editor("DevComponents.Instrumentation.Design.AngleRangeValueEditor, DevComponents.Instrumentation.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=76cb4c6eb576bca5", typeof(UITypeEditor))]
+        public float SweepAngle
+        {
+            get { return (_SweepAngle); }
+
+            set
+            {
+                if (value < 0 || value > 360)
+                    throw new ArgumentException("Value must be between -0 and +360.");
+
+                if (_SweepAngle != value)
+                {
+                    _SweepAngle = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region AbsRadius
+
+        internal int AbsRadius
+        {
+            get { return (int)(SquareSize * _Radius); }
+        }
+
+        #endregion
+
+        #region AbsScaleWidth
+
+        internal int AbsScaleWidth
+        {
+            get { return (int)(AbsRadius * Width); }
+        }
+
+        #endregion
+
+        #region SquareSize
+
+        internal int SquareSize
+        {
+            get { return (_SquareSize); }
+            set { _SquareSize = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RecalcLayout
+
+        public override void RecalcLayout()
+        {
+            if (NeedRecalcLayout == true)
+            {
+                RecalcMetrics();
+
+                NeedLabelRecalcLayout = true;
+                NeedSectionRecalcLayout = true;
+                NeedRangeRecalcLayout = true;
+                NeedTickMarkRecalcLayout = true;
+                NeedPointerRecalcLayout = true;
+                NeedPinRecalcLayout = true;
+
+                base.RecalcLayout();
+            }
+        }
+
+        #region RecalcMetrics
+
+        private void RecalcMetrics()
+        {
+            base.RecalcLayout();
+
+            bool autoCenter = GaugeControl.Frame.AutoCenter;
+
+            _SquareSize = GaugeControl.GetAbsSize(new SizeF(1, 1), true).Width;
+            Center = GaugeControl.GetAbsPoint(_PivotPoint, autoCenter);
+
+            int radius = (int)(_Radius * _SquareSize);
+
+            Rectangle r = new Rectangle();
+            r.Size = new Size(radius * 2, radius * 2);
+            r.Location = new Point(Center.X - r.Size.Width / 2, Center.Y - r.Size.Height / 2);
+
+            Bounds = r;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region PaintBorder
+
+        protected override void PaintBorder(PaintEventArgs e)
+        {
+            Graphics g = e.Graphics;
+
+            if (BorderWidth > 0)
+            {
+                int radius = AbsRadius;
+                int n = (int) (radius*Width);
+
+                if (radius > 0 && n > 0)
+                {
+                    using (GraphicsPath path = new GraphicsPath())
+                    {
+                        Rectangle r = Bounds;
+                        r.Inflate(n/2, n/2);
+
+                        path.AddArc(r, _StartAngle, _SweepAngle);
+
+                        r.Inflate(-n, -n);
+
+                        path.AddArc(r, _StartAngle + _SweepAngle, -_SweepAngle);
+
+                        path.CloseAllFigures();
+
+                        using (Pen pen = new Pen(BorderColor, BorderWidth))
+                            g.DrawPath(pen, path);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region GetPoint
+
+        internal Point GetPoint(int radius, float angle)
+        {
+            Point pt = new Point();
+
+            // Normalize the angle and calculate some
+            // working vars
+
+            if (angle < 0)
+                angle += 360;
+
+            angle = angle % 360;
+
+            // Determine the angle quadrant, and then calculate
+            // the intersecting coordinate accordingly
+
+            double radians = GetRadians(angle % 90);
+
+            if (angle < 90)
+            {
+                pt.X = (int)(Math.Cos(radians) * radius);
+                pt.Y = (int)(Math.Sin(radians) * radius);
+            }
+            else if (angle < 180)
+            {
+                pt.X = -(int)(Math.Sin(radians) * radius);
+                pt.Y = (int)(Math.Cos(radians) * radius);
+            }
+            else if (angle < 270)
+            {
+                pt.X = -(int)(Math.Cos(radians) * radius);
+                pt.Y = -(int)(Math.Sin(radians) * radius);
+            }
+            else
+            {
+                pt.X = (int)(Math.Sin(radians) * radius);
+                pt.Y = -(int)(Math.Cos(radians) * radius);
+            }
+
+            pt.X += Center.X;
+            pt.Y += Center.Y;
+
+            return (pt);
+        }
+
+        #endregion
+
+        #region GetRadians
+
+        /// <summary>
+        /// Converts Degrees to Radians
+        /// </summary>
+        /// <param name="theta">Degrees</param>
+        /// <returns>Radians</returns>
+        private double GetRadians(float theta)
+        {
+            return (theta * Math.PI / 180);
+        }
+
+        #endregion
+
+        #region GetDegrees
+
+        internal double GetDegrees(double radians)
+        {
+            return (radians * 180 / Math.PI);
+        }
+
+        #endregion
+
+        #region GetRadiansFromPoint
+
+        /// <summary>
+        /// Gets the angle (in radians) of the given point on the scale.
+        /// </summary>
+        /// <param name="pt"></param>
+        /// <returns>Angle, in radians</returns>
+        public double GetRadiansFromPoint(Point pt)
+        {
+            double radians = GetPointRadians(pt);
+
+            return (radians);
+        }
+
+        #endregion
+
+        #region GetDegreesFromPoint
+
+        /// <summary>
+        /// Gets the angle (in degrees) of the given point on the scale.
+        /// </summary>
+        /// <param name="pt"></param>
+        /// <returns>Angle, in degrees</returns>
+        public double GetDegreesFromPoint(Point pt)
+        {
+            return (GetDegrees(GetRadiansFromPoint(pt)));
+        }
+
+        #endregion
+
+        #region GetPointRadians
+
+        internal double GetPointRadians(Point pt)
+        {
+            int dx = pt.X - Center.X;
+            int dy = pt.Y - Center.Y;
+
+            if (dx >= 0)
+            {
+                if (dy >= 0)
+                    return (Math.Atan((double)dy / dx));
+
+                return (-Math.Atan((double)dx / dy) + Math.PI * 1.5);
+            }
+
+            if (dy >= 0)
+                return (-Math.Atan((double)dx / dy) + Math.PI / 2);
+
+            return (Math.Atan((double)dy / dx) + Math.PI);
+        }
+
+        #endregion
+
+        #region GetNearLabelRadius
+
+        internal int GetNearLabelRadius()
+        {
+            int scaleRadius = AbsRadius;
+            int scaleWidth = AbsScaleWidth;
+
+            int radius = scaleRadius - scaleWidth / 2;
+
+            radius = GetNearLabelRadius(MajorTickMarks, scaleRadius, radius);
+            radius = GetNearLabelRadius(MinorTickMarks, scaleRadius, radius);
+
+            return (radius);
+        }
+
+        private int GetNearLabelRadius(GaugeTickMark tickMarks, int scaleRadius, int radius)
+        {
+            if (tickMarks.Visible == true)
+            {
+                int tickMarkRadius = tickMarks.Radius;
+
+                if (tickMarks.Layout.Placement != DisplayPlacement.Near)
+                    tickMarkRadius -= (int)(tickMarks.Layout.Length * scaleRadius);
+
+                if (tickMarkRadius < radius)
+                    radius = tickMarkRadius;
+            }
+
+            return (radius);
+        }
+
+        #endregion
+
+        #region GetFarLabelRadius
+
+        internal int GetFarLabelRadius()
+        {
+            int scaleRadius = AbsRadius;
+            int scaleWidth = AbsScaleWidth;
+
+            int radius = scaleRadius + scaleWidth / 2;
+
+            radius = GetFarLabelRadius(MajorTickMarks, scaleRadius, radius);
+            radius = GetFarLabelRadius(MinorTickMarks, scaleRadius, radius);
+
+            return (radius);
+        }
+
+        private int GetFarLabelRadius(GaugeTickMark tickMarks, int scaleRadius, int radius)
+        {
+            if (tickMarks.Visible == true)
+            {
+                int tickMarkRadius = tickMarks.Radius;
+
+                if (tickMarks.Layout.Placement == DisplayPlacement.Near)
+                    tickMarkRadius += (int)(tickMarks.Layout.Length * scaleRadius);
+
+                if (tickMarkRadius > radius)
+                    radius = tickMarkRadius;
+            }
+
+            return (radius);
+        }
+
+        #endregion
+
+        #region CreateGradient
+
+        internal PathGradientBrush CreateGradient(Rectangle r,
+            float startAngle, float sweepAngle, GradientFillColor fillColor, int n)
+        {
+            r.Inflate(n, n);
+
+            const int count = 15;
+
+            int k = (sweepAngle > 0 ? -1 : 1);
+
+            float sa = startAngle + k;
+            float ea = sa + sweepAngle;
+
+            float n1 = (sweepAngle - k) / count;
+
+            PointF[] pts = new PointF[count + 1];
+            Color[] cls = new Color[count + 1];
+
+            Color c1 = fillColor.Start;
+            Color c2 = fillColor.End.IsEmpty == false ? fillColor.End : fillColor.Start;
+
+            // Calculate the RGB color deltas
+
+            float dr = (float)(c2.R - c1.R) / count;
+            float dg = (float)(c2.G - c1.G) / count;
+            float db = (float)(c2.B - c1.B) / count;
+
+            int radius = r.Width / 2;
+
+            for (int i = 0; i < count; i++)
+            {
+                pts[i] = GetPoint(radius, sa + i * n1);
+
+                Color c3 = Color.FromArgb(
+                    (int)(c1.R + dr * i),
+                    (int)(c1.G + dg * i),
+                    (int)(c1.B + db * i));
+
+                cls[i] = c3;
+            }
+
+            float d = Math.Abs(sweepAngle);
+            float delta = (d < 180 ? (180 - d) : 2);
+
+            pts[count] = GetPoint(radius, ea + (sweepAngle < 0 ? -delta : delta));
+            cls[count] = c2;
+
+            PathGradientBrush pgb = new PathGradientBrush(pts);
+
+            pgb.CenterColor = Color.White;
+            pgb.CenterPoint = Center;
+            pgb.SurroundColors = cls;
+
+            pgb.FocusScales = new PointF(0f, 0f);
+
+            Blend blnd = new Blend();
+            blnd.Positions = new float[] { 0f, 1f };
+            blnd.Factors = new float[] { 1f, 1f };
+            pgb.Blend = blnd;
+
+            return (pgb);
+        }
+
+        #endregion
+
+        #region ICloneable Members
+
+        public override object Clone()
+        {
+            GaugeCircularScale copy = new GaugeCircularScale();
+
+            CopyToItem(copy);
+
+            return (copy);
+        }
+
+        #endregion
+
+        #region CopyToItem
+
+        public override void CopyToItem(GaugeItem copy)
+        {
+            GaugeCircularScale c = copy as GaugeCircularScale;
+
+            if (c != null)
+            {
+                base.CopyToItem(c);
+
+                c.PivotPoint = _PivotPoint;
+                c.Radius = _Radius;
+                c.StartAngle = _StartAngle;
+                c.SweepAngle = _SweepAngle;
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeScale/GaugeLinearScale.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeScale/GaugeLinearScale.cs
new file mode 100644
index 00000000..403f0a35
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeScale/GaugeLinearScale.cs	
@@ -0,0 +1,357 @@
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Windows.Forms;
+using DevComponents.Instrumentation.Primitives;
+
+namespace DevComponents.Instrumentation
+{
+    /// <summary>
+    /// Collection of GaugeLinearScales
+    /// </summary>
+    public class GaugeLinearScaleCollection : GenericCollection<GaugeLinearScale>
+    {
+    }
+
+    [TypeConverter(typeof(GaugeScaleConvertor))]
+    public class GaugeLinearScale : GaugeScale
+    {
+        #region Private variables
+
+        private SizeF _Size;
+        private PointF _Location;
+        private Orientation _Orientation;
+
+        private Rectangle _ScaleBounds;
+
+        #endregion
+
+        public GaugeLinearScale(GaugeControl gaugeControl)
+            : base(gaugeControl)
+        {
+            InitGaugeScale();
+        }
+
+        public GaugeLinearScale()
+        {
+            InitGaugeScale();
+        }
+
+        #region InitGaugeScale
+
+        private void InitGaugeScale()
+        {
+            Style = GaugeScaleStyle.Linear;
+
+            _Location = new PointF(.5f, .5f);
+            _Size = new SizeF(.8f, .8f);
+
+            _Orientation = Orientation.Horizontal;
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region Location
+
+        /// <summary>
+        /// Gets or sets the Scale location, specified as a percentage
+        /// </summary>
+        [Browsable(true), Category("Layout")]
+        [Editor("DevComponents.Instrumentation.Design.LocationEditor, DevComponents.Instrumentation.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=76cb4c6eb576bca5", typeof(UITypeEditor))]
+        [Description("Indicates the Scale location, specified as a percentage.")]
+        [TypeConverter(typeof(PointFConverter))]
+        public PointF Location
+        {
+            get { return (_Location); }
+
+            set
+            {
+                if (_Location.Equals(value) == false)
+                {
+                    _Location = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializePivotPoint()
+        {
+            return (_Location.X != .5f || _Location.Y != .5f);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetPivotPoint()
+        {
+            _Location = new PointF(.5f, .5f);
+        }
+
+        #endregion
+
+        #region Orientation
+
+        /// <summary>
+        /// Gets or sets the Scale display orientation
+        /// </summary>
+        [Browsable(true)]
+        [Category("Layout"), DefaultValue(Orientation.Horizontal)]
+        [Description("Indicates the Scale display orientation.")]
+        public Orientation Orientation
+        {
+            get { return (_Orientation); }
+
+            set
+            {
+                if (_Orientation != value)
+                {
+                    _Orientation = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ReverseScalingAxis
+
+        private bool _ReverseScalingAxis;
+
+        /// <summary>
+        /// Gets or sets whether linear scales are scaled
+        /// using the default axis or not.
+        /// </summary>
+        [Browsable(true)]
+        [Category("Layout"), DefaultValue(false)]
+        [Description("Indicates whether linear scales are scaled using the default axis or not.")]
+        public bool ReverseScalingAxis
+        {
+            get { return (_ReverseScalingAxis); }
+
+            set
+            {
+                if (_ReverseScalingAxis != value)
+                {
+                    _ReverseScalingAxis = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region Size
+
+        /// <summary>
+        /// Gets or sets the bounding size of the Scale, specified as a percentage
+        /// </summary>
+        [Browsable(true), Category("Layout")]
+        [Editor("DevComponents.Instrumentation.Design.SizeEditor, DevComponents.Instrumentation.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=76cb4c6eb576bca5", typeof(UITypeEditor))]
+        [Description("Determines the bounding size of the Scale, specified as a percentage.")]
+        public SizeF Size
+        {
+            get { return (_Size); }
+
+            set
+            {
+                if (_Size != value)
+                {
+                    _Size = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        internal bool ShouldSerializeSize()
+        {
+            return (_Size.Width != .8f || _Size.Height != .8f);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        internal void ResetSize()
+        {
+            _Size = new SizeF(.8f, .8f);
+        }
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region AbsLength
+
+        internal int AbsLength
+        {
+            get
+            {
+                if (_Orientation == Orientation.Horizontal)
+                    return (Bounds.Width);
+
+                return (Bounds.Height);
+            }
+        }
+
+        #endregion
+
+        #region AbsWidth
+
+        internal int AbsWidth
+        {
+            get
+            {
+                if (_Orientation == Orientation.Horizontal)
+                    return (_ReverseScalingAxis ? Bounds.Width : Bounds.Height);
+
+                return (_ReverseScalingAxis ? Bounds.Height : Bounds.Width);
+            }
+        }
+
+        #endregion
+
+        #region AbsScaleLength
+
+        internal int AbsScaleLength
+        {
+            get
+            {
+                if (_Orientation == Orientation.Horizontal)
+                    return (_ScaleBounds.Width);
+
+                return (_ScaleBounds.Height);
+            }
+        }
+
+        #endregion
+
+        #region AbsScaleWidth
+
+        internal int AbsScaleWidth
+        {
+            get
+            {
+                if (_Orientation == Orientation.Horizontal)
+                    return (_ScaleBounds.Height);
+
+                return (_ScaleBounds.Width);
+            }
+        }
+
+        #endregion
+
+        #region ScaleBounds
+
+        internal Rectangle ScaleBounds
+        {
+            get { return (_ScaleBounds); }
+            set { _ScaleBounds = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RecalcLayout
+
+        public override void RecalcLayout()
+        {
+            if (NeedRecalcLayout == true)
+            {
+                base.RecalcLayout();
+
+                RecalcMetrics();
+            }
+        }
+
+        #region RecalcMetrics
+
+        private void RecalcMetrics()
+        {
+            Center = GaugeControl.GetAbsPoint(_Location, false);
+
+            Rectangle r = new Rectangle();
+
+            r.Size = GaugeControl.GetAbsSize(_Size, false);
+            r.Location = new Point(Center.X - r.Size.Width / 2, Center.Y - r.Size.Height / 2);
+
+            Bounds = r;
+
+            _ScaleBounds = new Rectangle();
+
+            if (Orientation == Orientation.Horizontal)
+            {
+                if (ReverseScalingAxis == true)
+                    _ScaleBounds.Size = new Size(r.Width, (int)(r.Width * Width));
+                else
+                    _ScaleBounds.Size = new Size(r.Width, (int)(r.Height * Width));
+
+                _ScaleBounds.Location = new Point(r.X, Center.Y - _ScaleBounds.Size.Height / 2);
+            }
+            else
+            {
+                if (ReverseScalingAxis == true)
+                    _ScaleBounds.Size = new Size((int)(r.Height * Width), r.Height);
+                else
+                    _ScaleBounds.Size = new Size((int)(r.Width * Width), r.Height);
+
+                _ScaleBounds.Location = new Point(Center.X - _ScaleBounds.Size.Width / 2, r.Y);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region PaintBorder
+
+        protected override void PaintBorder(PaintEventArgs e)
+        {
+            if (BorderWidth > 0)
+            {
+                if (Bounds.Width > 0 && Bounds.Height > 0)
+                {
+                    using (Pen pen = new Pen(BorderColor, BorderWidth))
+                        e.Graphics.DrawRectangle(pen, _ScaleBounds);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ICloneable Members
+
+        public override object Clone()
+        {
+            GaugeLinearScale copy = new GaugeLinearScale();
+
+            CopyToItem(copy);
+
+            return (copy);
+        }
+
+        #endregion
+
+        #region CopyToItem
+
+        public override void CopyToItem(GaugeItem copy)
+        {
+            GaugeLinearScale c = copy as GaugeLinearScale;
+
+            if (c != null)
+            {
+                base.CopyToItem(c);
+
+                c.Location = _Location;
+                c.Orientation = _Orientation;
+                c.Size = _Size;
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeScale/GaugeScale.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeScale/GaugeScale.cs
new file mode 100644
index 00000000..c996b058
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeScale/GaugeScale.cs	
@@ -0,0 +1,1894 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Globalization;
+using System.Windows.Forms;
+using DevComponents.Instrumentation.Primitives;
+
+namespace DevComponents.Instrumentation
+{
+    public class GaugeScaleCollection : GenericCollection<GaugeScale>
+    {
+    }
+
+    public class GaugeScale : GaugeItem
+    {
+        #region Private variables
+
+        private GaugeScaleStyle _Style;
+
+        private float _Width;
+
+        private double _MinValue;
+        private double _MaxValue;
+
+        private double _MaxLimit;
+        private double _MinLimit;
+
+        private Color _BorderColor;
+        private int _BorderWidth;
+
+        private GaugeIntervalLabel _Labels;
+        private GaugeCustomLabelCollection _CustomLabels;
+        private GaugePointerCollection _Pointers;
+        private GaugeRangeCollection _Ranges;
+        private GaugeSectionCollection _Sections;
+
+        private GaugeTickMark _MajorTickMarks;
+        private GaugeTickMark _MinorTickMarks;
+
+        private List<TickPoint> _TickMarkList;
+
+        private GaugePin _MaxPin;
+        private GaugePin _MinPin;
+
+        private bool _Reversed;
+
+        private GaugeControl _GaugeControl;
+
+        private Rectangle _Bounds;
+        private Point _Center;
+
+        #endregion
+
+        public GaugeScale(GaugeControl gaugeControl)
+            : this()
+        {
+            _GaugeControl = gaugeControl;
+        }
+
+        public GaugeScale()
+        {
+            _Style = GaugeScaleStyle.Circular;
+
+            InitGaugeScale();
+
+            HookEvents(true);
+        }
+
+        #region InitGaugeScale
+
+        private void InitGaugeScale()
+        {
+            _Labels = new GaugeIntervalLabel(this);
+
+            _MajorTickMarks = new GaugeTickMark(this,
+                GaugeTickMarkRank.Major, GaugeMarkerStyle.Trapezoid, .09f, .14f, 10);
+
+            _MinorTickMarks = new GaugeTickMark(this,
+                GaugeTickMarkRank.Minor, GaugeMarkerStyle.Rectangle, .045f, .1f, 2);
+
+            _MaxPin = new GaugePin(this, true, "MaxPin");
+            _MinPin = new GaugePin(this, false, "MinPin");
+
+            _BorderColor = Color.Black;
+            _BorderWidth = 0;
+
+            _MinValue = 0;
+            _MaxValue = 100;
+
+            _MinLimit = double.NaN;
+            _MaxLimit = double.NaN;
+
+            _Width = .065f;
+        }
+
+        #endregion
+
+        #region Hidden properties
+
+        #region Tooltip
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public new string Tooltip
+        {
+            get { return (base.Tooltip); }
+            set { base.Tooltip = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Public properties
+
+        #region BorderColor
+
+        /// <summary>
+        /// Gets or sets the Color of the Border
+        /// </summary>
+        [Browsable(true), Category("Appearance"), DefaultValue(typeof(Color), "Black")]
+        [Description("Indicates the Color of the Border.")]
+        public Color BorderColor
+        {
+            get { return (_BorderColor); }
+
+            set
+            {
+                if (_BorderColor != value)
+                {
+                    _BorderColor = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region BorderWidth
+
+        /// <summary>
+        /// Gets or sets the width of the Border, specified as pixels
+        /// </summary>
+        [Browsable(true), Category("Appearance"), DefaultValue(0)]
+        [Description("Indicates the width of the Border, specified as pixels.")]
+        public int BorderWidth
+        {
+            get { return (_BorderWidth); }
+
+            set
+            {
+                if (value < 0)
+                    throw new ArgumentException("Value can not be less than zero.");
+
+                if (_BorderWidth != value)
+                {                    
+                    _BorderWidth = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region Bounds
+
+        /// <summary>
+        /// Gets the Bounds of the scale
+        /// </summary>
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public Rectangle Bounds
+        {
+            get { return (_Bounds); }
+            internal set { _Bounds = value; }
+        }
+
+        #endregion
+
+        #region CustomLabels
+
+        /// <summary>
+        /// Gets or sets the collection of Custom Labels
+        /// </summary>
+        [Browsable(true), Category("Appearance")]
+        [Description("Indicates the collection of Custom Labels associated with the Scale.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        [Editor("DevComponents.Instrumentation.Design.GaugeCollectionEditor, DevComponents.Instrumentation.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=76cb4c6eb576bca5", typeof(UITypeEditor))]
+        public GaugeCustomLabelCollection CustomLabels
+        {
+            get
+            {
+                if (_CustomLabels == null)
+                {
+                    _CustomLabels = new GaugeCustomLabelCollection();
+                    _CustomLabels.CollectionChanged += CustomLabels_CollectionChanged;
+                }
+
+                return (_CustomLabels);
+            }
+
+            set
+            {
+                if (_CustomLabels != null)
+                    _CustomLabels.CollectionChanged -= CustomLabels_CollectionChanged;
+
+                _CustomLabels = value;
+
+                if (_CustomLabels != null)
+                    _CustomLabels.CollectionChanged += CustomLabels_CollectionChanged;
+
+                OnGaugeItemChanged(true);
+            }
+        }                
+
+        #endregion
+
+        #region GaugeControl
+
+        /// <summary>
+        /// Gets the associated GaugeControl
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public GaugeControl GaugeControl
+        {
+            get { return (_GaugeControl); }
+            internal set { _GaugeControl = value; }
+        }
+
+        #endregion
+
+        #region Labels
+
+        /// <summary>
+        /// Gets the default Scale Label properties
+        /// </summary>
+        [Browsable(true), Category("Appearance")]
+        [Description("Indicates the default Scale Label properties.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public GaugeIntervalLabel Labels
+        {
+            get { return (_Labels); }
+        }
+
+        #endregion
+
+        #region MajorTickMarks
+
+        /// <summary>
+        ///  Gets the Scale MajorTickMarks
+        /// </summary>
+        [Browsable(true), Category("Appearance")]
+        [Description("Indicates the Scale MajorTickMarks.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public GaugeTickMark MajorTickMarks
+        {
+            get { return (_MajorTickMarks); }
+        }
+
+        #endregion
+
+        #region MinorTickMarks
+
+        /// <summary>
+        /// Gets the Scale MinorTickMarks
+        /// </summary>
+        [Browsable(true), Category("Appearance")]
+        [Description("Indicates the Scale MinorTickMarks.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public GaugeTickMark MinorTickMarks
+        {
+            get { return (_MinorTickMarks); }
+        }
+
+        #endregion
+
+        #region MaxPin
+
+        /// <summary>
+        /// Gets the properties for the Scale Maximum Pin
+        /// </summary>
+        [Browsable(true), Category("Layout")]
+        [Description("Specifies properties for the Scale Maximum Pin.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public GaugePin MaxPin
+        {
+            get { return (_MaxPin); }
+        }
+
+        #endregion
+
+        #region MinPin
+
+        /// <summary>
+        /// Gets the properties for the Scale Minimum Pin
+        /// </summary>
+        [Browsable(true), Category("Layout")]
+        [Description("Specifies properties for the Scale Minimum Pin.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public GaugePin MinPin
+        {
+            get { return (_MinPin); }
+        }
+
+        #endregion
+
+        #region MinLimit
+
+        /// <summary>
+        /// Gets or sets the absolute minimum value for the scale.
+        /// Setting this values will permit the scale to scroll beyond the
+        /// current MinValue range.
+        /// 
+        /// Both MinLimit and MaxLimit values must both be set to 
+        /// valid min/max values, or both reset to their defaults (double.NaN)
+        /// </summary>
+        [Browsable(true), Category("Layout"), DefaultValue(double.NaN)]
+        [Description("Indicates the absolute minimum value for the scale. Setting this values will permit the scale to scroll beyond the current MinValue range.")]
+
+        public double MinLimit
+        {
+            get { return (_MinLimit); }
+
+            set
+            {
+                if (_MinLimit != value)
+                {
+                    if (value.Equals(double.NaN) == false)
+                    {
+                        if (_MaxLimit.Equals(double.NaN) && value >= _MaxLimit)
+                            throw new ArgumentException("MinLimit must be less than MaxLimit."); 
+
+                        if (value > _MinValue)
+                            throw new ArgumentException("MinLimit must be less or equal to MinValue.");
+                    }
+
+                    _MinLimit = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region MaxLimit
+
+        /// <summary>
+        /// Gets or sets the absolute maximum value for the scale.
+        /// Setting this values will permit the scale to scroll beyond the
+        /// current MaxValue range.
+        /// 
+        /// Both MinLimit and MaxLimit values must both be set to 
+        /// valid min/max values, or both reset to their defaults (double.NaN)
+        /// </summary>
+        [Browsable(true), Category("Layout"), DefaultValue(double.NaN)]
+        [Description("Indicates the absolute minimum value for the scale. Setting this values will permit the scale to scroll beyond the current MinValue range.")]
+
+        public double MaxLimit
+        {
+            get { return (_MaxLimit); }
+
+            set
+            {
+                if (_MaxLimit != value)
+                {
+                    if (value.Equals(double.NaN) == false)
+                    {
+                        if (_MinLimit.Equals(double.NaN) && value <= _MinLimit)
+                            throw new ArgumentException("MaxLimit must be greater than MinLimit.");
+
+                        if (value < _MaxValue)
+                            throw new ArgumentException("MaxLimit must be greater or equal to MaxValue.");
+                    }
+
+                    _MaxLimit = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region MaxValue
+
+        /// <summary>
+        /// Gets or sets the Maximum value for the Scale
+        /// </summary>
+        [Browsable(true), Category("Layout"), DefaultValue(100d)]
+        [Description("Indicates the Maximum value for the Scale.")]
+        public double MaxValue
+        {
+            get { return (_MaxValue); }
+
+            set
+            {
+                if (_MaxValue != value)
+                {
+                    if (_MaxLimit.Equals(double.NaN) == false && value > _MaxLimit)
+                        throw new ArgumentException("Value must be less than or equal to MaxLimit.");
+                    
+                    _MaxValue = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region MinValue
+
+        /// <summary>
+        /// Gets or sets the Minimum value for the Scale
+        /// </summary>
+        [Browsable(true), Category("Layout"), DefaultValue(0d)]
+        [Description("Indicates the Minimum value for the Scale.")]
+        public double MinValue
+        {
+            get { return (_MinValue); }
+
+            set
+            {
+                if (_MinValue != value)
+                {
+                    if (_MinLimit.Equals(double.NaN) == false && value < _MinLimit)
+                        throw new ArgumentException("Value must be less than or equal to MinLimit.");
+
+                    _MinValue = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region Pointers
+
+        /// <summary>
+        /// Gets the collection of Pointers associated with the Scale
+        /// </summary>
+        [Browsable(true), Category("Appearance")]
+        [Description("Indicates the collection of Pointers associated with the Scale.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        [Editor("DevComponents.Instrumentation.Design.GaugeCollectionEditor, DevComponents.Instrumentation.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=76cb4c6eb576bca5", typeof(UITypeEditor))]
+        public GaugePointerCollection Pointers
+        {
+            get
+            {
+                if (_Pointers == null)
+                {
+                    _Pointers = new GaugePointerCollection();
+                    _Pointers.CollectionChanged += Pointers_CollectionChanged;
+                }
+
+                return (_Pointers);
+            }
+
+            set
+            {
+                if (_Pointers != null)
+                    _Pointers.CollectionChanged -= Pointers_CollectionChanged;
+
+                _Pointers = value;
+
+                if (_Pointers != null)
+                    _Pointers.CollectionChanged += Pointers_CollectionChanged;
+
+                OnGaugeItemChanged(true);
+            }
+        }
+
+        #endregion
+
+        #region Ranges
+
+        /// <summary>
+        /// Gets the collection of Ranges associated with the Scale
+        /// </summary>
+        [Browsable(true), Category("Appearance")]
+        [Description("Indicates the collection of Ranges associated with the Scale.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        [Editor("DevComponents.Instrumentation.Design.GaugeCollectionEditor, DevComponents.Instrumentation.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=76cb4c6eb576bca5", typeof(UITypeEditor))]
+        public GaugeRangeCollection Ranges
+        {
+            get
+            {
+                if (_Ranges == null)
+                {
+                    _Ranges = new GaugeRangeCollection();
+                    _Ranges.CollectionChanged += Ranges_CollectionChanged;
+                }
+
+                return (_Ranges);
+            }
+
+            set
+            {
+                if (_Ranges != null)
+                    _Ranges.CollectionChanged -= Ranges_CollectionChanged;
+
+                _Ranges = value;
+
+                if (_Ranges != null)
+                    _Ranges.CollectionChanged += Ranges_CollectionChanged;
+
+                OnGaugeItemChanged(true);
+            }
+        }
+
+        #endregion
+
+        #region Reversed
+
+        /// <summary>
+        /// Gets or sets whether the Scale min/max direction is reversed
+        /// </summary>
+        [Browsable(true), Category("Layout"), DefaultValue(false)]
+        [Description("Indicates that the Scale min/max direction is reversed.")]
+        public bool Reversed
+        {
+            get { return (_Reversed); }
+
+            set
+            {
+                if (_Reversed != value)
+                {
+                    _Reversed = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region Sections
+
+        /// <summary>
+        /// Gets the collection of Sections associated with the Scale
+        /// </summary>
+        [Browsable(true), Category("Appearance")]
+        [Description("Indicates the collection of Sections associated with the Scale.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        [Editor("DevComponents.Instrumentation.Design.GaugeCollectionEditor, DevComponents.Instrumentation.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=76cb4c6eb576bca5", typeof(UITypeEditor))]
+        [NotifyParentProperty(true)]
+        public GaugeSectionCollection Sections
+        {
+            get
+            {
+                if (_Sections == null)
+                {
+                    _Sections = new GaugeSectionCollection();
+                    _Sections.CollectionChanged += Sections_CollectionChanged;
+                }
+
+                return (_Sections);
+            }
+
+            set
+            {
+                if (_Sections != null)
+                    _Sections.CollectionChanged -= Sections_CollectionChanged;
+
+                _Sections = value;
+
+                if (_Sections != null)
+                    _Sections.CollectionChanged += Sections_CollectionChanged;
+
+                OnGaugeItemChanged(true);
+            }
+        }
+
+        #endregion
+
+        #region Width
+
+        /// <summary>
+        /// Gets or sets the Width of the Scale, specified as a percentage
+        /// </summary>
+        [Browsable(true)]
+        [Category("Layout"), DefaultValue(.065f)]
+        [Editor("DevComponents.Instrumentation.Design.WidthRangeValueEditor, DevComponents.Instrumentation.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=76cb4c6eb576bca5", typeof(UITypeEditor))]
+        [Description("Indicates the Width of the Scale, specified as a percentage.")]
+        public float Width
+        {
+            get { return (_Width); }
+
+            set
+            {
+                if (value < 0)
+                    throw new ArgumentException("Value can not be less than zero.");
+
+                if (_Width != value)
+                {
+                    _Width = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region AbsMaxLimit
+
+        internal double AbsMaxLimit
+        {
+            get { return (_MaxLimit.Equals(double.NaN) ? _MaxValue : _MaxLimit); }
+        }
+
+        #endregion
+
+        #region AbsMinLimit
+
+        internal double AbsMinLimit
+        {
+            get { return (_MinLimit.Equals(double.NaN) ? _MinValue : _MinLimit); }
+        }
+
+        #endregion
+
+        #region Center
+
+        internal Point Center
+        {
+            get { return (_Center); }
+            set { _Center = value; }
+        }
+
+        #endregion
+
+        #region HasCustomLabels
+
+        internal bool HasCustomLabels
+        {
+            get { return (_CustomLabels != null); }
+        }
+
+        #endregion
+
+        #region HasPointers
+
+        internal bool HasPointers
+        {
+            get { return (_Pointers != null); }
+        }
+
+        #endregion
+
+        #region HasRanges
+
+        internal bool HasRanges
+        {
+            get { return (_Ranges != null); }
+        }
+
+        #endregion
+
+        #region HasSections
+
+        internal bool HasSections
+        {
+            get { return (_Sections != null); }
+        }
+
+        #endregion
+
+        #region MaxPinEndOffset
+
+        internal float MaxPinEndOffset
+        {
+            get
+            {
+                if (_MaxPin != null && _MaxPin.Visible == true)
+                    return (_MaxPin.EndOffset);
+
+                return (0);
+            }
+        }
+
+        #endregion
+
+        #region MinPinEndOffset
+
+        internal float MinPinEndOffset
+        {
+            get
+            {
+                if (_MinPin != null && _MinPin.Visible == true)
+                    return (_MinPin.EndOffset);
+
+                return (0);
+            }
+        }
+
+        #endregion
+
+        #region NeedLabelRecalcLayout
+
+        internal bool NeedLabelRecalcLayout
+        {
+            set
+            {
+                if (value == true)
+                {
+                    _Labels.NeedRecalcLayout = true;
+
+                    if (_CustomLabels != null)
+                    {
+                        for (int i = 0; i < _CustomLabels.Count; i++)
+                        {
+                            GaugeCustomLabel label = _CustomLabels[i];
+
+                            if (label.Visible == true)
+                                label.NeedRecalcLayout = true;
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region NeedPinRecalcLayout
+
+        internal bool NeedPinRecalcLayout
+        {
+            set
+            {
+                if (value == true)
+                {
+                    if (_MinPin != null)
+                        _MinPin.NeedRecalcLayout = true;
+
+                    if (_MaxPin != null)
+                        _MaxPin.NeedRecalcLayout = true;
+                }
+            }
+        }
+
+        #endregion
+
+        #region NeedPointerRecalcLayout
+
+        internal bool NeedPointerRecalcLayout
+        {
+            set
+            {
+                if (value == true)
+                {
+                    if (_Pointers != null)
+                    {
+                        for (int i = 0; i < _Pointers.Count; i++)
+                        {
+                            GaugePointer pointer = _Pointers[i];
+
+                            if (pointer.Visible == true)
+                                pointer.NeedRecalcLayout = true;
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region NeedRangeRecalcLayout
+
+        internal bool NeedRangeRecalcLayout
+        {
+            set
+            {
+                if (value == true)
+                {
+                    if (_Ranges != null)
+                    {
+                        for (int i = 0; i < _Ranges.Count; i++)
+                        {
+                            GaugeRange range = _Ranges[i];
+
+                            if (range.Visible == true)
+                                range.NeedRecalcLayout = true;
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region NeedSectionRecalcLayout
+
+        internal bool NeedSectionRecalcLayout
+        {
+            set
+            {
+                if (value == true)
+                {
+                    if (_Sections != null)
+                    {
+                        for (int i = 0; i < _Sections.Count; i++)
+                        {
+                            GaugeSection section = _Sections[i];
+
+                            if (section.Visible == true)
+                                section.NeedRecalcLayout = true;
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region NeedTickMarkRecalcLayout
+
+        internal bool NeedTickMarkRecalcLayout
+        {
+            set
+            {
+                if (value == true)
+                {
+                    _MajorTickMarks.NeedRecalcLayout = true;
+                    _MinorTickMarks.NeedRecalcLayout = true;
+                }
+            }
+        }
+
+        #endregion
+
+        #region Spread
+
+        internal double Spread
+        {
+            get { return (_MaxValue - _MinValue); }
+        }
+
+        #endregion
+
+        #region Style
+
+        internal GaugeScaleStyle Style
+        {
+            get { return (_Style); }
+
+            set
+            {
+                if (_Style != value)
+                {
+                    _Style = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region HookEvents
+
+        private void HookEvents(bool hook)
+        {
+            if (hook == true)
+            {
+                _MajorTickMarks.GaugeItemChanged += MajorTickMarks_GaugeItemChanged;
+                _MinorTickMarks.GaugeItemChanged += MinorTickMarks_GaugeItemChanged;
+
+                _MinPin.GaugeItemChanged += MinPin_GaugeItemChanged;
+                _MaxPin.GaugeItemChanged += MaxPin_GaugeItemChanged;
+
+                _Labels.GaugeItemChanged += Labels_GaugeItemChanged;
+            }
+            else
+            {
+                _MajorTickMarks.GaugeItemChanged -= MajorTickMarks_GaugeItemChanged;
+                _MinorTickMarks.GaugeItemChanged -= MinorTickMarks_GaugeItemChanged;
+
+                if (_Sections != null)
+                {
+                    foreach (GaugeSection section in _Sections)
+                        section.GaugeItemChanged -= Section_GaugeItemChanged;
+
+                    _Sections.CollectionChanged -= Sections_CollectionChanged;
+                }
+
+                if (_Ranges != null)
+                    _Ranges.CollectionChanged -= Ranges_CollectionChanged;
+
+                if (_Pointers != null)
+                    _Pointers.CollectionChanged -= Pointers_CollectionChanged;
+
+                _Labels.GaugeItemChanged -= Labels_GaugeItemChanged;
+
+                if (_CustomLabels != null)
+                    _CustomLabels.CollectionChanged -= CustomLabels_CollectionChanged;
+
+                _MinPin.GaugeItemChanged -= MinPin_GaugeItemChanged;
+                _MaxPin.GaugeItemChanged -= MaxPin_GaugeItemChanged;
+            }
+        }
+
+        #endregion
+
+        #region Event processing
+
+        #region Section processing
+
+        void Sections_CollectionChanged(object sender, EventArgs e)
+        {
+            foreach (GaugeSection section in _Sections)
+            {
+                section.Scale = this;
+                section.NeedRecalcLayout = true;
+
+                if (section.FillColor.IsEmpty)
+                    section.FillColor = new GradientFillColor(Color.Lime);
+
+                section.GaugeItemChanged -= Section_GaugeItemChanged;
+                section.GaugeItemChanged += Section_GaugeItemChanged;
+
+                section.StripCoverChanged -= StripCoverChanged;
+                section.StripCoverChanged += StripCoverChanged;
+            }
+
+            OnStripCoverChanged();
+        }
+
+        void Section_GaugeItemChanged(object sender, EventArgs e)
+        {
+            OnGaugeItemChanged();
+        }
+
+        #endregion
+
+        #region Range processing
+
+        void Ranges_CollectionChanged(object sender, EventArgs e)
+        {
+            foreach (GaugeRange range in _Ranges)
+            {
+                range.Scale = this;
+                range.NeedRecalcLayout = true;
+
+                if (range.FillColor.IsEmpty)
+                {
+                    range.FillColor = new GradientFillColor(Color.Lime, Color.Red);
+                    range.FillColor.BorderColor = Color.Black;
+                    range.FillColor.BorderWidth = 1;
+                }
+
+                range.GaugeItemChanged -= Range_GaugeItemChanged;
+                range.GaugeItemChanged += Range_GaugeItemChanged;
+
+                range.StripCoverChanged -= StripCoverChanged;
+                range.StripCoverChanged += StripCoverChanged;
+            }
+
+            OnStripCoverChanged();
+        }
+
+        void Range_GaugeItemChanged(object sender, EventArgs e)
+        {
+            OnGaugeItemChanged();
+        }
+
+        #endregion
+
+        #region StripCoverChanged
+
+        void StripCoverChanged(object sender, EventArgs e)
+        {
+            OnStripCoverChanged();
+        }
+
+        private void OnStripCoverChanged()
+        {
+            if (_GaugeControl != null && _GaugeControl.InitComplete == true)
+            {
+                UpdateValueData();
+                OnGaugeItemChanged();
+            }
+        }
+
+        #endregion
+
+        #region Pointer processing
+
+        void Pointers_CollectionChanged(object sender, EventArgs e)
+        {
+            foreach (GaugePointer pointer in _Pointers)
+            {
+                pointer.Scale = this;
+                pointer.NeedRecalcLayout = true;
+
+                if (pointer.FillColor.IsEmpty)
+                {
+                    pointer.FillColor = new GradientFillColor(Color.WhiteSmoke, Color.Red);
+                    pointer.FillColor.BorderColor = Color.Black;
+                    pointer.FillColor.BorderWidth = 1;
+                }
+
+                pointer.GaugeItemChanged -= Pointer_GaugeItemChanged;
+                pointer.GaugeItemChanged += Pointer_GaugeItemChanged;
+            }
+
+            OnGaugeItemChanged();
+        }
+
+        void Pointer_GaugeItemChanged(object sender, EventArgs e)
+        {
+            OnGaugeItemChanged();
+        }
+
+        #endregion
+
+        #region Label processing
+
+        void Labels_GaugeItemChanged(object sender, EventArgs e)
+        {
+            OnGaugeItemChanged();
+        }
+
+        void CustomLabels_CollectionChanged(object sender, EventArgs e)
+        {
+            if (_CustomLabels != null)
+            {
+                foreach (GaugeCustomLabel label in _CustomLabels)
+                {
+                    label.Scale = this;
+                    label.NeedRecalcLayout = true;
+
+                    label.GaugeItemChanged -= CustomLabel_GaugeItemChanged;
+                    label.GaugeItemChanged += CustomLabel_GaugeItemChanged;
+                }
+
+                OnGaugeItemChanged();
+            }
+        }
+
+        #endregion
+
+        #region TickMark processing
+
+        void CustomLabel_GaugeItemChanged(object sender, EventArgs e)
+        {
+            OnGaugeItemChanged();
+        }
+
+        void MajorTickMarks_GaugeItemChanged(object sender, EventArgs e)
+        {
+            OnGaugeItemChanged();
+        }
+
+        void MinorTickMarks_GaugeItemChanged(object sender, EventArgs e)
+        {
+            OnGaugeItemChanged();
+        }
+
+        #endregion
+
+        #region Pin processing
+
+        void MaxPin_GaugeItemChanged(object sender, EventArgs e)
+        {
+            OnGaugeItemChanged(true);
+        }
+
+        void MinPin_GaugeItemChanged(object sender, EventArgs e)
+        {
+            OnGaugeItemChanged(true);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RecalcLayout
+
+        public override void RecalcLayout()
+        {
+            if (NeedRecalcLayout == true)
+            {
+                base.RecalcLayout();
+
+                NeedLabelRecalcLayout = true;
+                NeedSectionRecalcLayout = true;
+                NeedRangeRecalcLayout = true;
+                NeedTickMarkRecalcLayout = true;
+                NeedPointerRecalcLayout = true;
+                NeedPinRecalcLayout = true;
+            }
+        }
+
+        #endregion
+
+        #region GetIntervalValue
+
+        internal double GetIntervalValue(double interval)
+        {
+            return (Math.Round(_MinValue + interval, 10));
+        }
+
+        #endregion
+
+        #region GetSectionFillColor
+
+        internal GradientFillColor GetSectionFillColor(double interval, ColorSourceFillEntry entry)
+        {
+            if (_Sections != null)
+            {
+                if (interval.Equals(double.NaN) == true)
+                    interval = 0;
+
+                double value = GetIntervalValue(interval);
+
+                for (int i = _Sections.Count - 1; i >= 0; i--)
+                {
+                    GaugeSection section = _Sections[i];
+
+                    if (section.Visible == true)
+                    {
+                        GradientFillColor fillColor = GetStripFillColor(value, entry, section);
+
+                        if (fillColor != null)
+                            return (fillColor);
+                    }
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetRangeFillColor
+
+        internal GradientFillColor GetRangeFillColor(double interval, ColorSourceFillEntry entry)
+        {
+            if (_Ranges != null)
+            {
+                if (interval.Equals(double.NaN) == true)
+                    interval = 0;
+
+                double value = _MinValue + interval;
+
+                for (int i = _Ranges.Count - 1; i >= 0; i--)
+                {
+                    GaugeRange range = _Ranges[i];
+
+                    if (range.Visible == true)
+                    {
+                        GradientFillColor fillColor = GetStripFillColor(value, entry, range);
+
+                        if (fillColor != null)
+                            return (fillColor);
+                    }
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetStripFillColor
+
+        internal GradientFillColor GetStripFillColor(
+            double value, ColorSourceFillEntry entry, GaugeStrip strip)
+        {
+            if (strip.ValueInRange(value) == true)
+            {
+                switch (entry)
+                {
+                    case ColorSourceFillEntry.MajorTickMark:
+                        if (strip.HasMajorTickMarkFillColor)
+                            return (strip.MajorTickMarkFillColor);
+                        break;
+
+                    case ColorSourceFillEntry.MinorTickMark:
+                        if (strip.HasMinorTickMarkFillColor)
+                            return (strip.MinorTickMarkFillColor);
+                        break;
+
+                    case ColorSourceFillEntry.Pointer:
+                        if (strip.HasPointerFillColor)
+                            return (strip.PointerFillColor);
+                        break;
+
+                    case ColorSourceFillEntry.Cap:
+                        if (strip.HasCapFillColor)
+                            return (strip.CapFillColor);
+                        break;
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetSectionLabelColor
+
+        internal Color GetSectionLabelColor(double interval)
+        {
+            if (_Sections != null)
+            {
+                double value = _MinValue + interval;
+
+                for (int i = _Sections.Count - 1; i >= 0; i--)
+                {
+                    GaugeSection section = _Sections[i];
+
+                    if (section.Visible == true)
+                    {
+                        Color labelColor = GetStripLabelColor(value, section);
+
+                        if (labelColor != Color.Empty)
+                            return (labelColor);
+                    }
+                }
+            }
+
+            return (Color.Empty);
+        }
+
+        #endregion
+
+        #region GetRangeLabelColor
+
+        internal Color GetRangeLabelColor(double interval)
+        {
+            if (_Ranges != null)
+            {
+                double value = _MinValue + interval;
+
+                for (int i = _Ranges.Count - 1; i >= 0; i--)
+                {
+                    GaugeRange range = _Ranges[i];
+
+                    if (range.Visible == true)
+                    {
+                        Color labelColor = GetStripLabelColor(value, range);
+
+                        if (labelColor != Color.Empty)
+                            return (labelColor);
+                    }
+                }
+            }
+
+            return (Color.Empty);
+        }
+
+        #endregion
+
+        #region GetStripLabelColor
+
+        internal Color GetStripLabelColor(double value, GaugeStrip strip)
+        {
+            if (strip.ValueInRange(value) == true)
+                return (strip.LabelColor);
+
+            return (Color.Empty);
+        }
+
+        #endregion
+
+        #region FindItem
+
+        internal override GaugeItem FindItem(Point pt)
+        {
+            GaugeItem item;
+
+            if ((item = FindPointerItem(pt)) != null)
+                return (item);
+
+            if ((item = FindRangeItem(pt)) != null)
+                return (item);
+
+            if ((item = FindSectionItem(pt)) != null)
+                return (item);
+
+            if (_MinPin.Visible == true)
+            {
+                if (_MinPin.Bounds.Contains(pt))
+                    return (_MinPin);
+            }
+
+            if (_MaxPin.Visible == true)
+            {
+                if (_MaxPin.Bounds.Contains(pt))
+                    return (_MaxPin);
+            }
+
+            return (null);
+        }
+
+        #region FindPointerItem
+
+        internal GaugeItem FindPointerItem(Point pt)
+        {
+            if (HasPointers == true)
+            {
+                for (int i = Pointers.Count - 1; i >= 0; i--)
+                {
+                    GaugePointer pointer = Pointers[i];
+
+                    if (pointer.Visible == true)
+                    {
+                        if (pointer.UnderTickMarks == false)
+                        {
+                            if (pointer.FindItem(pt) != null)
+                                return (pointer);
+                        }
+                    }
+                }
+
+                for (int i = Pointers.Count - 1; i >= 0; i--)
+                {
+                    GaugePointer pointer = Pointers[i];
+
+                    if (pointer.Visible == true)
+                    {
+                        if (pointer.UnderTickMarks == true)
+                        {
+                            if (pointer.FindItem(pt) != null)
+                                return (pointer);
+                        }
+                    }
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region FindRangeItem
+
+        internal GaugeItem FindRangeItem(Point pt)
+        {
+            if (HasRanges == true)
+            {
+                for (int i = Ranges.Count - 1; i >= 0; i--)
+                {
+                    GaugeRange range = Ranges[i];
+
+                    if (range.Visible == true)
+                    {
+                        if (range.FindItem(pt) != null)
+                            return (range);
+                    }
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region FindSectionItem
+
+        internal GaugeItem FindSectionItem(Point pt)
+        {
+            if (HasSections == true)
+            {
+                for (int i = Sections.Count - 1; i >= 0; i--)
+                {
+                    GaugeSection section = Sections[i];
+
+                    if (section.Visible == true)
+                    {
+                        if (section.FindItem(pt) != null)
+                            return (section);
+                    }
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region UpdateValueData
+
+        internal void UpdateValueData()
+        {
+            bool minNan = _MinLimit.Equals(double.NaN);
+            bool maxNan = _MaxLimit.Equals(double.NaN);
+
+            if (minNan != maxNan)
+            {
+                throw new Exception("MinLimit and MaxLimit must both either be set to " +
+                    "valid min/max values, or both reset to their default values (double.NaN).");
+            }
+
+            if (_Pointers != null)
+            {
+                for (int i = 0; i < _Pointers.Count; i++)
+                {
+                    GaugePointer pointer = _Pointers[i];
+
+                    if (pointer.Visible == true)
+                        pointer.UpdateStripData();
+                }
+            }
+        }
+
+        #endregion
+
+        #region OnPaint
+
+        public override void OnPaint(PaintEventArgs e)
+        {
+            if (_MaxValue > _MinValue)
+            {
+                RecalcLayout();
+
+                if (GaugeControl.OnPreRenderScale(e, this) == false)
+                {
+                    PaintRanges(e);
+                    PaintSections(e);
+                    PaintPointers(e, true);
+                    PaintTickMarks(e);
+                    PaintPins(e);
+                    PaintLabels(e);
+
+                    GaugeControl.OnPostRenderScale(e, this);
+                }
+            }
+        }
+
+        #region PaintRanges
+
+        private void PaintRanges(PaintEventArgs e)
+        {
+            if (GaugeControl.OnPreRenderScaleRanges(e, this) == false)
+            {
+                if (_Ranges != null)
+                {
+                    for (int i = 0; i < _Ranges.Count; i++)
+                    {
+                        GaugeRange range = _Ranges[i];
+
+                        if (range.Visible == true)
+                            range.OnPaint(e);
+                    }
+                }
+
+                GaugeControl.OnPostRenderScaleRanges(e, this);
+            }
+        }
+
+        #endregion
+
+        #region PaintSections
+
+        private void PaintSections(PaintEventArgs e)
+        {
+            if (GaugeControl.OnPreRenderScaleSections(e, this) == false)
+            {
+                if (_Sections != null)
+                {
+                    for (int i = 0; i < _Sections.Count; i++)
+                    {
+                        GaugeSection section = _Sections[i];
+
+                        if (section.Visible == true)
+                            section.OnPaint(e);
+                    }
+                }
+
+                GaugeControl.OnPostRenderScaleSections(e, this);
+            }
+
+            PaintBorder(e);
+        }
+
+        #endregion
+
+        #region PaintBorder
+
+        protected virtual void PaintBorder(PaintEventArgs e)
+        {
+        }
+
+        #endregion
+
+        #region PaintTickMarks
+
+        private void PaintTickMarks(PaintEventArgs e)
+        {
+            Graphics g = e.Graphics;
+
+            if (GaugeControl.OnPreRenderScaleTickMarks(e, this) == false)
+            {
+                BuildTickMarkList();
+
+                if (_TickMarkList != null)
+                {
+                    foreach (TickPoint tp in _TickMarkList)
+                    {
+                        if (tp.TickMark.Visible == true)
+                            tp.TickMark.PaintTickPoint(g, tp);
+                    }
+                }
+
+                GaugeControl.OnPostRenderScaleTickMarks(e, this);
+            }
+        }
+
+        #region BuildTickMarkList
+
+        private void BuildTickMarkList()
+        {
+            if (TickMarkListIsValid() == false)
+            {
+                if (_TickMarkList != null)
+                    _TickMarkList.Clear();
+                else
+                    _TickMarkList = new List<TickPoint>();
+
+                AddMinorTickMarks();
+                AddMajorTickMarks();
+                AddCustomLabelTickMarks();
+            }
+        }
+
+        #endregion
+
+        #region AddMinorTickMarks
+
+        private void AddMinorTickMarks()
+        {
+            if (_MinorTickMarks.Visible == true)
+                _MinorTickMarks.RecalcLayout();
+
+            if (_MinorTickMarks.TickPoints != null)
+                _TickMarkList.AddRange(_MinorTickMarks.TickPoints);
+        }
+
+        #endregion
+
+        #region AddMajorTickMarks
+
+        private void AddMajorTickMarks()
+        {
+            if (_MajorTickMarks.Visible == true)
+            {
+                _MajorTickMarks.RecalcLayout();
+
+                if (_MajorTickMarks.TickPoints != null)
+                {
+                    if (_MajorTickMarks.Layout.Overlap == GaugeTickMarkOverlap.ReplaceNone)
+                    {
+                        _TickMarkList.AddRange(_MajorTickMarks.TickPoints);
+                    }
+                    else
+                    {
+                        foreach (TickPoint tp in _MajorTickMarks.TickPoints)
+                        {
+                            if (tp.Visible == true)
+                            {
+                                int n = GetTickPointIndex(tp, _MajorTickMarks.Layout.Overlap);
+
+                                if (n >= 0)
+                                    _TickMarkList[n] = tp;
+                                else
+                                    _TickMarkList.Add(tp);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region AddCustomLabelTickMarks
+
+        private void AddCustomLabelTickMarks()
+        {
+            if (_CustomLabels != null)
+            {
+                foreach (GaugeCustomLabel label in _CustomLabels)
+                {
+                    label.RecalcLayout();
+
+                    if (label.Visible == true)
+                    {
+                        TickPoint tp = label.TickMark.TickPoint;
+
+                        if (tp != null && label.TickMark.Visible == true)
+                        {
+                            int n = -1;
+
+                            if (tp.TickMark.Layout.Overlap != GaugeTickMarkOverlap.ReplaceNone)
+                                n = GetTickPointIndex(tp, tp.TickMark.Layout.Overlap);
+
+                            if (n >= 0)
+                                _TickMarkList[n] = tp;
+                            else
+                                _TickMarkList.Add(tp);
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region GetTickPointIndex
+
+        private int GetTickPointIndex(TickPoint tp, GaugeTickMarkOverlap overlap)
+        {
+            int n = -1;
+            double interval = GetIntervalValue(tp.Interval);
+
+            for (int i = _TickMarkList.Count - 1; i >= 0; i--)
+            {
+                if (GetIntervalValue(_TickMarkList[i].Interval) == interval)
+                {
+                    if (overlap == GaugeTickMarkOverlap.ReplaceLast)
+                        return (i);
+
+                    if (n == -1)
+                    {
+                        n = i;
+                    }
+                    else
+                    {
+                        _TickMarkList.RemoveAt(n);
+                        n = i;
+                    }
+                }
+            }
+
+            return (n);
+        }
+
+        #endregion
+
+        #region TickMarkListIsValid
+
+        private bool TickMarkListIsValid()
+        {
+            if (_TickMarkList == null)
+                return (false);
+
+            if ((_MajorTickMarks.Visible == true && _MajorTickMarks.NeedRecalcLayout) ||
+                (_MinorTickMarks.Visible == true && _MinorTickMarks.NeedRecalcLayout))
+            {
+                return (false);
+            }
+
+            if (_CustomLabels != null)
+            {
+                for (int i = 0; i < _CustomLabels.Count; i++)
+                {
+                    GaugeCustomLabel label = _CustomLabels[i];
+
+                    if (label.NeedRecalcLayout)
+                        return (false);
+                }
+            }
+
+            return (true);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region PaintPointers
+
+        internal void PaintPointers(PaintEventArgs e, bool under)
+        {
+            if (_MaxValue > _MinValue)
+            {
+                if (GaugeControl.OnPreRenderScalePointers(e, this) == false)
+                {
+                    if (_Pointers != null)
+                    {
+                        for (int i = 0; i < _Pointers.Count; i++)
+                        {
+                            GaugePointer pointer = _Pointers[i];
+
+                            if (pointer.Visible == true)
+                            {
+                                if (pointer.UnderTickMarks == under)
+                                    pointer.OnPaint(e);
+                            }
+                        }
+                    }
+                }
+
+                GaugeControl.OnPostRenderScalePointers(e, this);
+            }
+        }
+
+        #endregion
+
+        #region PaintPins
+
+        private void PaintPins(PaintEventArgs e)
+        {
+            if (_MinPin.Visible == true)
+                _MinPin.OnPaint(e);
+
+            if (_MaxPin.Visible == true)
+                _MaxPin.OnPaint(e);
+        }
+
+        #endregion
+
+        #region PaintLabels
+
+        private void PaintLabels(PaintEventArgs e)
+        {
+            if (_Labels.Visible == true)
+                _Labels.OnPaint(e);
+
+            if (_CustomLabels != null)
+            {
+                for (int i = 0; i < _CustomLabels.Count; i++)
+                {
+                    GaugeCustomLabel label = _CustomLabels[i];
+
+                    if (label.Visible == true)
+                        label.OnPaint(e);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region OnDispose
+
+        protected override void OnDispose()
+        {
+            HookEvents(false);
+
+            base.OnDispose();
+        }
+
+        #endregion
+
+        #region ICloneable Members
+
+        public override object Clone()
+        {
+            GaugeScale copy = new GaugeScale();
+
+            CopyToItem(copy);
+
+            return (copy);
+        }
+
+        #endregion
+
+        #region CopyToItem
+
+        public override void CopyToItem(GaugeItem copy)
+        {
+            GaugeScale c = copy as GaugeScale;
+
+            if (c != null)
+            {
+                base.CopyToItem(c);
+
+                c.BorderColor = _BorderColor;
+                c.BorderWidth = _BorderWidth;
+
+                c.MaxLimit = _MaxLimit;
+                c.MinLimit = _MinLimit;
+                c.MaxValue = _MaxValue;
+                c.MinValue = _MinValue;
+
+                c.Reversed = _Reversed;
+                c.Width = _Width;
+
+                _Labels.CopyToItem(c.Labels);
+                c.Labels.Scale = c;
+
+                _MajorTickMarks.CopyToItem(c.MajorTickMarks);
+                c.MajorTickMarks.Scale = c;
+
+                _MinorTickMarks.CopyToItem(c.MinorTickMarks);
+                c.MinorTickMarks.Scale = c;
+
+                _MaxPin.CopyToItem(c.MaxPin);
+                c.MaxPin.Scale = c;
+
+                _MinPin.CopyToItem(c.MinPin);
+                c.MinPin.Scale = c;
+
+                if (_CustomLabels != null)
+                {
+                    c.CustomLabels = new GaugeCustomLabelCollection();
+                    c.CustomLabels.CollectionChanged += CustomLabels_CollectionChanged;
+
+                    _CustomLabels.CopyToItem(c.CustomLabels);
+                }
+
+                if (_Pointers != null)
+                {
+                    c.Pointers = new GaugePointerCollection();
+                    c.Pointers.CollectionChanged += Pointers_CollectionChanged;
+
+                    _Pointers.CopyToItem(c.Pointers);
+                }
+
+                if (_Ranges != null)
+                {
+                    c.Ranges = new GaugeRangeCollection();
+                    c.Ranges.CollectionChanged += Ranges_CollectionChanged;
+
+                    _Ranges.CopyToItem(c.Ranges);
+                }
+
+                if (_Sections != null)
+                {
+                    c.Sections = new GaugeSectionCollection();
+                    c.Sections.CollectionChanged += Sections_CollectionChanged;
+
+                    _Sections.CopyToItem(c.Sections);
+                }
+            }
+        }
+
+        #endregion
+    }
+
+    #region Enums
+
+    public enum GaugeScaleStyle
+    {
+        Circular,
+        Linear
+    }
+
+    #endregion
+
+    #region GaugeScaleConvertor
+
+    public class GaugeScaleConvertor : ExpandableObjectConverter
+    {
+        public override object ConvertTo(
+            ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+        {
+            if (destinationType == typeof(string))
+            {
+                GaugeScale scale = value as GaugeScale;
+
+                if (scale != null)
+                {
+                    //ColorConverter cvt = new ColorConverter();
+
+                    //if (lct.Start != Color.Empty)
+                    //    return (cvt.ConvertToString(lct.Start));
+
+                    //if (lct.End != Color.Empty)
+                    //    return (cvt.ConvertToString(lct.End));
+
+                    //if (lct.GradientAngle != 90)
+                    //    return (lct.GradientAngle.ToString());
+
+                    return (String.Empty);
+                }
+            }
+
+            return (base.ConvertTo(context, culture, value, destinationType));
+        }
+    }
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeStrip/GaugeRange.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeStrip/GaugeRange.cs
new file mode 100644
index 00000000..ce7254de
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeStrip/GaugeRange.cs	
@@ -0,0 +1,1070 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Drawing.Drawing2D;
+using System.Windows.Forms;
+using DevComponents.Instrumentation.Primitives;
+
+namespace DevComponents.Instrumentation
+{
+    /// <summary>
+    /// Collection of GaugeRanges
+    /// </summary>
+    public class GaugeRangeCollection : GenericCollection<GaugeRange>
+    {
+        #region ICloneable Members
+
+        public override object Clone()
+        {
+            GaugeRangeCollection copy = new GaugeRangeCollection();
+
+            CopyToItem(copy);
+
+            return (copy);
+        }
+
+        #endregion
+
+        #region CopyToItem
+
+        internal void CopyToItem(GaugeRangeCollection copy)
+        {
+            foreach (GaugeRange item in this)
+            {
+                GaugeRange ic = new GaugeRange();
+
+                item.CopyToItem(ic);
+
+                copy.Add(ic);
+            }
+        }
+
+        #endregion
+    }
+
+    public class GaugeRange : GaugeStrip
+    {
+        #region Private variables
+
+        private DisplayPlacement _Placement;
+
+        private float _StartWidth;
+        private float _EndWidth;
+        private int _Radius;
+
+        #endregion
+
+        public GaugeRange(GaugeScale scale)
+            : base(scale)
+        {
+            InitGaugeRange();
+        }
+
+        public GaugeRange()
+        {
+            InitGaugeRange();
+        }
+
+        #region InitGaugeRange
+
+        private void InitGaugeRange()
+        {
+            _Placement = DisplayPlacement.Near;
+
+            _StartWidth = .15f;
+            _EndWidth = .30f;
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region EndWidth
+
+        /// <summary>
+        /// Gets or sets the End Width of the Range, specified as a percentage
+        /// </summary>
+        [Browsable(true)]
+        [Category("Layout"), DefaultValue(.3f)]
+        [Editor("DevComponents.Instrumentation.Design.WidthMaxRangeValueEditor, DevComponents.Instrumentation.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=76cb4c6eb576bca5", typeof(UITypeEditor))]
+        [Description("Indicates the End Width of the Range, specified as a percentage.")]
+        public float EndWidth
+        {
+            get { return (_EndWidth); }
+
+            set
+            {
+                if (_EndWidth != value)
+                {
+                    if (value < 0 || value > 1)
+                        throw new ArgumentException("Width must be bwtween 0 and 1");
+
+                    _EndWidth = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region Placement
+
+        /// <summary>
+        /// Gets or sets the Placement of the Range with respect to the Scale
+        /// </summary>
+        [Browsable(true)]
+        [Category("Layout"), DefaultValue(DisplayPlacement.Near)]
+        [Description("Indicates the Placement of the Range with respect to the Scale.")]
+        public DisplayPlacement Placement
+        {
+            get { return (_Placement); }
+
+            set
+            {
+                if (_Placement != value)
+                {
+                    _Placement = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region StartWidth
+
+        /// <summary>
+        /// Gets or sets the Start Width of the Range, specified as a percentage
+        /// </summary>
+        [Browsable(true)]
+        [Category("Layout"), DefaultValue(.15f)]
+        [Editor("DevComponents.Instrumentation.Design.WidthMaxRangeValueEditor, DevComponents.Instrumentation.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=76cb4c6eb576bca5", typeof(UITypeEditor))]
+        [Description("Indicates the Start Width of the Range, specified as a percentage.")]
+        public float StartWidth
+        {
+            get { return (_StartWidth); }
+
+            set
+            {
+                if (_StartWidth != value)
+                {
+                    if (value < 0 || value > 1)
+                        throw new ArgumentException("Width must be bwtween 0 and 1");
+
+                    _StartWidth = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region AbsScaleOffset
+
+        internal int AbsScaleOffset
+        {
+            get
+            {
+                if (Scale is GaugeCircularScale)
+                    return ((int)(((GaugeCircularScale)Scale).AbsRadius * ScaleOffset));
+
+                return ((int)(((GaugeLinearScale)Scale).AbsScaleWidth * ScaleOffset));
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RecalcLayout
+
+        public override void RecalcLayout()
+        {
+            if (NeedRecalcLayout == true)
+            {
+                base.RecalcLayout();
+
+                if (Scale is GaugeCircularScale)
+                    RecalcCircularLayout(Scale as GaugeCircularScale);
+
+                else if (Scale is GaugeLinearScale)
+                    RecalcLinearLayout(Scale as GaugeLinearScale);
+            }
+        }
+
+        #region RecalcCircularLayout
+
+        private void RecalcCircularLayout(GaugeCircularScale scale)
+        {
+            _Radius = scale.AbsRadius;
+
+            Point center = Scale.Center;
+            int offset = AbsScaleOffset;
+            int scaleWidth = (int)(_Radius * scale.Width);
+
+            switch (_Placement)
+            {
+                case DisplayPlacement.Near:
+                    _Radius -= ((scaleWidth / 2) + offset);
+                    break;
+
+                case DisplayPlacement.Center:
+                    _Radius += offset;
+
+                    break;
+
+                case DisplayPlacement.Far:
+                    _Radius += ((scaleWidth / 2) + offset);
+                    break;
+            }
+
+            Bounds = new Rectangle(center.X - _Radius,
+                                   center.Y - _Radius, _Radius * 2, _Radius * 2);
+        }
+
+        #endregion
+
+        #region RecalcLinearLayout
+
+        private void RecalcLinearLayout(GaugeLinearScale scale)
+        {
+            float spread = (float)Math.Abs(scale.MaxValue - scale.MinValue);
+
+            if (spread == 0)
+                spread = 1;
+
+            if (scale.Orientation == Orientation.Horizontal)
+                CalcHorizontalMetrics(scale, spread);
+            else
+                CalcVerticalMetrics(scale, spread);
+        }
+
+        #region CalcHorizontalMetrics
+
+        private void CalcHorizontalMetrics(GaugeLinearScale scale, float spread)
+        {
+            int length = scale.ScaleBounds.Width;
+            int width = scale.Bounds.Height;
+            int scaleWidth = scale.ScaleBounds.Height;
+
+            float dl = length / spread;
+
+            int start = (int)(dl * MinValue);
+            int len = (int)(dl * (MaxValue - MinValue));
+            int offset = (int)(width * ScaleOffset);
+
+            int y = 0;
+
+            switch (_Placement)
+            {
+                case DisplayPlacement.Near:
+                    y -= ((scaleWidth / 2) + offset);
+                    break;
+
+                case DisplayPlacement.Center:
+                    y += offset;
+                    break;
+
+                case DisplayPlacement.Far:
+                    y += ((scaleWidth / 2) + offset);
+                    break;
+            }
+
+            Rectangle r = scale.Bounds;
+
+            if (scale.Reversed == true)
+                r.X = r.Right - (start + len);
+            else
+                r.X += start;
+
+            r.Width = len;
+            r.Y = scale.Center.Y + y;
+            r.Height = 0;
+
+            Bounds = r;
+        }
+
+        #endregion
+
+        #region CalcVerticalMetrics
+
+        private void CalcVerticalMetrics(GaugeLinearScale scale, float spread)
+        {
+            int length = scale.ScaleBounds.Height;
+            int width = scale.Bounds.Width;
+            int scaleWidth = scale.ScaleBounds.Width;
+
+            float dl = length / spread;
+
+            int start = (int)(dl * MinValue);
+            int len = (int)(dl * (MaxValue - MinValue));
+            int offset = (int)(width * ScaleOffset);
+
+            int x = 0;
+
+            switch (_Placement)
+            {
+                case DisplayPlacement.Near:
+                    x -= ((scaleWidth / 2) + offset);
+                    break;
+
+                case DisplayPlacement.Center:
+                    x += offset;
+                    break;
+
+                case DisplayPlacement.Far:
+                    x += ((scaleWidth / 2) + offset);
+                    break;
+            }
+
+            Rectangle r = scale.Bounds;
+
+            if (scale.Reversed == true)
+                r.Y += start;
+            else
+                r.Y = r.Bottom - (start + len);
+
+            r.X = scale.Center.X + x;
+            r.Width = 0;
+            r.Height = len;
+
+            Bounds = r;
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region OnPaint
+
+        public override void OnPaint(PaintEventArgs e)
+        {
+            RecalcLayout();
+
+            if (Scale.GaugeControl.OnPreRenderScaleRange(e, this) == false)
+            {
+                if (Scale is GaugeCircularScale)
+                    PaintCircularRange(e, Scale as GaugeCircularScale);
+
+                else if (Scale is GaugeLinearScale)
+                    PaintLinearRange(e, Scale as GaugeLinearScale);
+
+                Scale.GaugeControl.OnPostRenderScaleRange(e, this);
+            }
+        }
+
+        #endregion
+
+        #region PaintCircularRange
+
+        private void PaintCircularRange(PaintEventArgs e, GaugeCircularScale scale)
+        {
+            GraphicsPath path = GetRangePath();
+
+            if (path != null)
+            {
+                if (SweepAngle != 0 && _Radius > 1)
+                {
+                    int radius = scale.AbsRadius;
+
+                    int n1 = (int)(radius * _StartWidth);
+                    int n2 = (int)(radius * _EndWidth);
+
+                    if (_Radius - n1 <= 0)
+                        n1 = _Radius - 1;
+
+                    if (_Radius - n2 <= 0)
+                        n2 = _Radius - 1;
+
+                    PaintRange(e.Graphics, path, n1, n2);
+                }
+            }
+        }
+
+        #region GetCircularRangePath
+
+        private GraphicsPath GetCircularRangePath(int n1, int n2)
+        {
+            switch (_Placement)
+            {
+                case DisplayPlacement.Near:
+                    return (GetNearCircularRangePath(n1, n2));
+
+                case DisplayPlacement.Center:
+                    return (GetCenterCircularRangePath(n1, n2));
+
+                default:
+                    return (GetFarCircularRangePath(n1, n2));
+            }
+        }
+
+        #region GetNearCircularRangePath
+
+        private GraphicsPath GetNearCircularRangePath(int n1, int n2)
+        {
+            GraphicsPath path = new GraphicsPath();
+
+            float angle = StartAngle + SweepAngle;
+
+            path.AddArc(Bounds, StartAngle, SweepAngle);
+
+            if (n1 == n2)
+            {
+                Rectangle r = Bounds;
+                r.Inflate(-n1, -n1);
+
+                path.AddArc(r, angle, -SweepAngle);
+            }
+            else
+            {
+                int n = path.PointCount;
+
+                float dx = SweepAngle / n;
+                float dy = (float)(n2 - n1) / n;
+                float radius = _Radius - n2;
+
+                PointF[] pts = new PointF[n + 1];
+
+                for (int i = 0; i < n; i++)
+                {
+                    pts[i] = GetPoint(radius, angle);
+
+                    radius += dy;
+                    angle -= dx;
+                }
+
+                pts[n] = GetPoint(_Radius - n1, StartAngle);
+
+                path.AddCurve(pts);
+            }
+
+            path.CloseFigure();
+
+            return (path);
+        }
+
+        #endregion
+
+        #region GetCenterCircularRangePath
+
+        private GraphicsPath GetCenterCircularRangePath(int n1, int n2)
+        {
+            GraphicsPath path = new GraphicsPath();
+
+            Rectangle r = Bounds;
+            r.Inflate(n1 / 2, n1 / 2);
+
+            path.AddArc(r, StartAngle, SweepAngle);
+
+            if (n1 == n2)
+            {
+                r.Inflate(-n1, -n1);
+
+                path.AddArc(r, StartAngle + SweepAngle, -SweepAngle);
+            }
+            else
+            {
+                int n = path.PointCount;
+                path.Reset();
+
+                float angle = StartAngle;
+                float radius = _Radius + (n1 / 2);
+
+                float dx = SweepAngle / n;
+                float dy = (float)(n2 - n1) / n / 2;
+
+                PointF[] pts = new PointF[n + 1];
+
+                for (int i = 0; i < n; i++)
+                {
+                    pts[i] = GetPoint(radius, angle);
+
+                    radius += dy;
+                    angle += dx;
+                }
+
+                pts[n] = GetPoint(radius, angle);
+
+                path.AddCurve(pts);
+
+                radius = _Radius - (n2 / 2);
+
+                for (int i = 0; i < n; i++)
+                {
+                    pts[i] = GetPoint(radius, angle);
+
+                    radius += dy;
+                    angle -= dx;
+                }
+
+                pts[n] = GetPoint(radius, angle);
+
+                path.AddCurve(pts);
+            }
+
+            path.CloseFigure();
+
+            return (path);
+        }
+
+        #endregion
+
+        #region GetFarCircularRangePath
+
+        private GraphicsPath GetFarCircularRangePath(int n1, int n2)
+        {
+            GraphicsPath path = new GraphicsPath();
+
+            float angle = StartAngle + SweepAngle;
+
+            path.AddArc(Bounds, StartAngle, SweepAngle);
+
+            if (n1 == n2)
+            {
+                Rectangle r = Bounds;
+                r.Inflate(n1, n1);
+
+                path.AddArc(r, angle, -SweepAngle);
+            }
+            else
+            {
+                int n = path.PointCount;
+
+                float radius = _Radius + n2;
+                float dx = SweepAngle/n;
+                float dy = (float)(n2 - n1) / n;
+
+                PointF[] pts = new PointF[n + 1];
+
+                for (int i = 0; i < n; i++)
+                {
+                    pts[i] = GetPoint(radius, angle);
+
+                    radius -= dy;
+                    angle -= dx;
+                }
+
+                pts[n] = GetPoint(_Radius + n1, StartAngle);
+
+                path.AddCurve(pts);
+            }
+
+            path.CloseFigure();
+
+            return (path);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region PaintLinearRange
+
+        private void PaintLinearRange(PaintEventArgs e, GaugeLinearScale scale)
+        {
+            GraphicsPath path = GetRangePath();
+
+            if (path != null)
+            {
+                int width = scale.AbsWidth;
+
+                int n1 = (int)(width * _StartWidth);
+                int n2 = (int)(width * _EndWidth);
+
+                if (n1 > 0 || n2 > 0)
+                    PaintRange(e.Graphics, path, n1, n2);
+            }
+        }
+
+        #region GetLinearRangePath
+
+        private GraphicsPath GetLinearRangePath(
+            int n1, int n2, Orientation orientation)
+        {
+            if (Scale.Reversed == true)
+            {
+                int n3 = n1;
+
+                n1 = n2;
+                n2 = n3;
+            }
+
+            switch (_Placement)
+            {
+                case DisplayPlacement.Near:
+                    return (GetNearLinearRangePath(n1, n2, orientation));
+
+                case DisplayPlacement.Center:
+                    return (GetCenterLinearRangePath(n1, n2, orientation));
+
+                default:
+                    return (GetFarLinearRangePath(n1, n2, orientation));
+            }
+        }
+
+        #region GetNearLinearRangePath
+
+        private GraphicsPath GetNearLinearRangePath(
+            int n1, int n2, Orientation orientation)
+        {
+            GraphicsPath path = new GraphicsPath();
+
+            if (orientation == Orientation.Horizontal)
+            {
+                Point[] pts = new Point[] {
+                    new Point(Bounds.X, Bounds.Y),
+                    new Point(Bounds.Right, Bounds.Y),
+                    new Point(Bounds.Right, Bounds.Y - n2),
+                    new Point(Bounds.X, Bounds.Y - n1),
+                    new Point(Bounds.X, Bounds.Y),
+                };
+
+                path.AddLines(pts);
+            }
+            else
+            {
+                Point[] pts = new Point[] {
+                    new Point(Bounds.X, Bounds.Y),
+                    new Point(Bounds.X, Bounds.Bottom),
+                    new Point(Bounds.X - n1, Bounds.Bottom),
+                    new Point(Bounds.X - n2, Bounds.Y),
+                    new Point(Bounds.X, Bounds.Y),
+                };
+
+                path.AddLines(pts);
+            }
+
+            return (path);
+        }
+
+        #endregion
+
+        #region GetCenterLinearRangePath
+
+        private GraphicsPath GetCenterLinearRangePath(
+            int n1, int n2, Orientation orientation)
+        {
+            GraphicsPath path = new GraphicsPath();
+
+            int dn1 = n1 / 2;
+            int dn2 = n2 / 2;
+
+            if (orientation == Orientation.Horizontal)
+            {
+                Point[] pts = new Point[] {
+                    new Point(Bounds.X, Bounds.Y + dn1),
+                    new Point(Bounds.Right, Bounds.Y + dn2),
+                    new Point(Bounds.Right, Bounds.Y - dn2),
+                    new Point(Bounds.X, Bounds.Y - dn1),
+                    new Point(Bounds.X, Bounds.Y + dn1),
+                };
+
+                path.AddLines(pts);
+            }
+            else
+            {
+                Point[] pts = new Point[] {
+                    new Point(Bounds.X + dn2, Bounds.Y),
+                    new Point(Bounds.Right + dn1, Bounds.Bottom),
+                    new Point(Bounds.Right - dn1, Bounds.Bottom),
+                    new Point(Bounds.X - dn2, Bounds.Y),
+                    new Point(Bounds.X + dn2, Bounds.Y),
+                };
+
+                path.AddLines(pts);
+            }
+
+            return (path);
+        }
+
+        #endregion
+
+        #region GetFarLinearRangePath
+
+        private GraphicsPath GetFarLinearRangePath(
+            int n1, int n2, Orientation orientation)
+        {
+            GraphicsPath path = new GraphicsPath();
+
+            if (orientation == Orientation.Horizontal)
+            {
+                Point[] pts = new Point[] {
+                    new Point(Bounds.X, Bounds.Y),
+                    new Point(Bounds.Right, Bounds.Y),
+                    new Point(Bounds.Right, Bounds.Y + n2),
+                    new Point(Bounds.X, Bounds.Y + n1),
+                    new Point(Bounds.X, Bounds.Y),
+                };
+
+                path.AddLines(pts);
+            }
+            else
+            {
+                Point[] pts = new Point[] {
+                    new Point(Bounds.X, Bounds.Y),
+                    new Point(Bounds.X, Bounds.Bottom),
+                    new Point(Bounds.Right + n1, Bounds.Bottom),
+                    new Point(Bounds.Right + n2 , Bounds.Y),
+                    new Point(Bounds.X, Bounds.Y),
+                };
+
+                path.AddLines(pts);
+            }
+            
+            return (path);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region PaintRange
+
+        #region PaintRange
+
+        private void PaintRange(Graphics g, GraphicsPath path, int n1, int n2)
+        {
+            if (FillColor.End.IsEmpty == true || FillColor.Color1 == FillColor.Color2 ||
+                FillColor.GradientFillType == GradientFillType.None)
+            {
+                using (Brush br = new SolidBrush(FillColor.Color1))
+                    g.FillPath(br, path);
+            }
+            else
+            {
+                switch (FillColor.GradientFillType)
+                {
+                    case GradientFillType.Auto:
+                    case GradientFillType.StartToEnd:
+                        PaintRangeStartToEnd(g, path, n1, n2);
+                        break;
+
+                    case GradientFillType.Angle:
+                        PaintRangeByAngle(g, path);
+                        break;
+
+                    case GradientFillType.Center:
+                        PaintRangeByCenter(g, path, n1, n2);
+                        break;
+
+                    case GradientFillType.HorizontalCenter:
+                        PaintRangeByHc(g, path);
+                        break;
+
+                    case GradientFillType.VerticalCenter:
+                        PaintRangeByVc(g, path);
+                        break;
+                }
+            }
+
+            if (FillColor.BorderWidth > 0)
+            {
+                using (Pen pen = new Pen(FillColor.BorderColor, FillColor.BorderWidth))
+                {
+                    pen.Alignment = PenAlignment.Inset;
+
+                    g.DrawPath(pen, path);
+                }
+            }
+        }
+
+        #endregion
+
+        #region PaintRangeStartToEnd
+
+        private void PaintRangeStartToEnd(
+            Graphics g, GraphicsPath path, int n1, int n2)
+        {
+            if (Scale is GaugeCircularScale)
+                PaintCircularRangeStartToEnd(g, path, n1, n2, Scale as GaugeCircularScale);
+            else
+                PaintLinearRangeStartToEnd(g, path, Scale as GaugeLinearScale);
+        }
+
+        #region PaintCircularRangeStartToEnd
+
+        private void PaintCircularRangeStartToEnd(Graphics g,
+            GraphicsPath path, int n1, int n2, GaugeCircularScale scale)
+        {
+            if (FillColor.Color2.IsEmpty == true || (FillColor.Color1 == FillColor.Color2))
+            {
+                using (Brush br = new SolidBrush(FillColor.Color1))
+                    g.FillPath(br, path);
+            }
+            else
+            {
+                int n = Math.Max(n1, n2) * 3;
+
+                if (n > 0)
+                {
+                    using (PathGradientBrush br =
+                        scale.CreateGradient(Bounds, StartAngle, SweepAngle, FillColor, n))
+                    {
+                        g.FillPath(br, path);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region PaintLinearRangeStartToEnd
+
+        private void PaintLinearRangeStartToEnd(Graphics g, GraphicsPath path, GaugeLinearScale scale)
+        {
+            if (FillColor.Color2.IsEmpty == true || (FillColor.Color1 == FillColor.Color2))
+            {
+                using (Brush br = new SolidBrush(FillColor.Color1))
+                    g.FillPath(br, path);
+            }
+            else
+            {
+                int angle = (scale.Orientation == Orientation.Horizontal ? 0 : -90);
+
+                if (Scale.Reversed == true)
+                    angle += 180;
+
+                Rectangle r = Rectangle.Round(path.GetBounds());
+                r.Inflate(1, 1);
+
+                using (Brush br = FillColor.GetBrush(r, angle))
+                    g.FillPath(br, path);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region PaintRangeByAngle
+
+        private void PaintRangeByAngle(Graphics g, GraphicsPath path)
+        {
+            Rectangle r = Rectangle.Round(path.GetBounds());
+            r.Inflate(1, 1);
+
+            using (Brush br = FillColor.GetBrush(r))
+                g.FillPath(br, path);
+        }
+
+        #endregion
+
+        #region PaintRangeByCenter
+
+        private void PaintRangeByCenter(Graphics g, GraphicsPath path, int n1, int n2)
+        {
+            if (Scale is GaugeCircularScale)
+                PaintCircularRangeByCenter(g, path, n1, n2);
+            else
+                PaintLinearRangeByCenter(g, path);
+        }
+
+        #region PaintCircularRangeByCenter
+
+        private void PaintCircularRangeByCenter(
+            Graphics g, GraphicsPath path, int n1, int n2)
+        {
+            using (PathGradientBrush br = new PathGradientBrush(path))
+            {
+                br.CenterColor = FillColor.Color1;
+                br.SurroundColors = new Color[] { FillColor.Color2 };
+                br.CenterPoint = Scale.Center;
+
+                float m = (float)Math.Max(n1, n2) / _Radius;
+
+                Blend blnd = new Blend();
+                blnd.Positions = new float[] { 0f, m, 1f };
+                blnd.Factors = new float[] { 1f, 0f, 0f };
+                br.Blend = blnd;
+
+                g.FillPath(br, path);
+            }
+        }
+
+        #endregion
+
+        #region PaintLinearRangeByCenter
+
+        private void PaintLinearRangeByCenter(Graphics g, GraphicsPath path)
+        {
+            using (PathGradientBrush br = new PathGradientBrush(path))
+            {
+                br.CenterColor = FillColor.Color1;
+                br.SurroundColors = new Color[] { FillColor.Color2 };
+
+                g.FillPath(br, path);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region PaintRangeByHc
+
+        private void PaintRangeByHc(Graphics g, GraphicsPath path)
+        {
+            Rectangle r = Rectangle.Round(path.GetBounds());
+            r.Height /= 2;
+
+            using (LinearGradientBrush br = new
+                LinearGradientBrush(r, FillColor.Color1, FillColor.Color2, 90))
+            {
+                br.WrapMode = WrapMode.TileFlipXY;
+
+                g.FillPath(br, path);
+            }
+        }
+
+        #endregion
+
+        #region PaintRangeByVc
+
+        private void PaintRangeByVc(Graphics g, GraphicsPath path)
+        {
+            Rectangle r = Rectangle.Round( path.GetBounds());
+            r.Width /= 2;
+
+            using (LinearGradientBrush br = new
+                LinearGradientBrush(r, FillColor.Color1, FillColor.Color2, 0f))
+            {
+                br.WrapMode = WrapMode.TileFlipXY;
+
+                g.FillPath(br, path);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region FindItem
+
+        #region FindItem
+
+        internal override GaugeItem FindItem(Point pt)
+        {
+            GraphicsPath path = GetRangePath();
+
+            if (path != null)
+            {
+                if (path.IsVisible(pt) == true)
+                    return (this);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetRangePath
+
+        public GraphicsPath GetRangePath()
+        {
+            if (StripePath == null)
+            {
+                if (Scale is GaugeCircularScale)
+                    StripePath = GetCRangePathEx(Scale as GaugeCircularScale);
+                else
+                    StripePath = GetLRangePathEx(Scale as GaugeLinearScale);
+            }
+
+            return (StripePath);
+        }
+
+        #endregion
+
+        #region GetCRangePathEx
+
+        private GraphicsPath GetCRangePathEx(GaugeCircularScale scale)
+        {
+            if (SweepAngle != 0 && _Radius > 1)
+            {
+                int radius = scale.AbsRadius;
+
+                int n1 = (int)(radius * _StartWidth);
+                int n2 = (int)(radius * _EndWidth);
+
+                if (_Radius - n1 <= 0)
+                    n1 = _Radius - 1;
+
+                if (_Radius - n2 <= 0)
+                    n2 = _Radius - 1;
+
+                return (GetCircularRangePath(n1, n2));
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetLRangePathEx
+
+        private GraphicsPath GetLRangePathEx(GaugeLinearScale scale)
+        {
+            if ((scale.Orientation == Orientation.Horizontal && Bounds.Width > 0) ||
+                (scale.Orientation == Orientation.Vertical && Bounds.Height > 0))
+            {
+                int width = scale.AbsWidth;
+
+                int n1 = (int)(width * _StartWidth);
+                int n2 = (int)(width * _EndWidth);
+
+                if (n1 > 0 || n2 > 0)
+                    return (GetLinearRangePath(n1, n2, scale.Orientation));
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ICloneable Members
+
+        public override object Clone()
+        {
+            GaugeRange copy = new GaugeRange();
+
+            CopyToItem(copy);
+
+            return (copy);
+        }
+
+        #endregion
+
+        #region CopyToItem
+
+        public override void CopyToItem(GaugeItem copy)
+        {
+            GaugeRange c = copy as GaugeRange;
+
+            if (c != null)
+            {
+                base.CopyToItem(c);
+
+                c.EndWidth = _EndWidth;
+                c.Placement = _Placement;
+                c.StartWidth = _StartWidth;
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeStrip/GaugeSection.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeStrip/GaugeSection.cs
new file mode 100644
index 00000000..bfa8eef2
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeStrip/GaugeSection.cs	
@@ -0,0 +1,674 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Drawing.Drawing2D;
+using System.Globalization;
+using System.Windows.Forms;
+using DevComponents.Instrumentation.Primitives;
+
+namespace DevComponents.Instrumentation
+{
+    /// <summary>
+    /// Collection of GaugeSections
+    /// </summary>
+    public class GaugeSectionCollection : GenericCollection<GaugeSection>
+    {
+        #region ICloneable Members
+
+        public override object Clone()
+        {
+            GaugeSectionCollection copy = new GaugeSectionCollection();
+
+            CopyToItem(copy);
+
+            return (copy);
+        }
+
+        #endregion
+
+        #region CopyToItem
+
+        internal void CopyToItem(GaugeSectionCollection copy)
+        {
+            foreach (GaugeSection item in this)
+            {
+                GaugeSection ic = new GaugeSection();
+
+                item.CopyToItem(ic);
+
+                copy.Add(ic);
+            }
+        }
+
+        #endregion
+    }
+
+    [TypeConverter(typeof(GaugeSectionConvertor))]
+    public class GaugeSection : GaugeStrip
+    {
+        #region Private variables
+
+        private float _Width;
+        private int _AbsWidth;
+
+        #endregion
+
+        public GaugeSection(GaugeScale scale)
+            : base(scale)
+        {
+        }
+
+        public GaugeSection()
+        {
+        }
+
+        #region Public properties
+
+        #region Width
+
+        /// <summary>
+        /// Gets or sets the Width of the Section, specified as a percentage
+        /// </summary>
+        [Browsable(true)]
+        [Category("Layout"), DefaultValue(.0f)]
+        [Editor("DevComponents.Instrumentation.Design.WidthRangeValueEditor, DevComponents.Instrumentation.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=76cb4c6eb576bca5", typeof(UITypeEditor))]
+        [Description("Indicates the Width of the Section, specified as a percentage.")]
+        public float Width
+        {
+            get { return (_Width); }
+
+            set
+            {
+                if (value < 0 || value > 1)
+                    throw new ArgumentException("Width must be between 0 and 1.");
+
+                if (_Width != value)
+                {
+                    _Width = value;
+
+                    OnGaugeItemChanged();
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RecalcLayout
+
+        public override void RecalcLayout()
+        {
+            base.RecalcLayout();
+
+            if (Scale is GaugeCircularScale)
+                CalcCircularLayout(Scale as GaugeCircularScale);
+
+            else if (Scale is GaugeLinearScale)
+                CalcLinearLayout(Scale as GaugeLinearScale);
+        }
+
+        #region CalcCircularLayout
+
+        private void CalcCircularLayout(GaugeCircularScale scale)
+        {
+            int radius = scale.AbsRadius;
+            int scaleOffset = (int)(radius * ScaleOffset);
+
+            _AbsWidth = (int)(radius * (_Width > 0 ? _Width : scale.Width));
+
+            Rectangle r = scale.Bounds;
+            r.Inflate(scaleOffset, scaleOffset);
+
+            Bounds = r;
+        }
+
+        #endregion
+
+        #region CalcLinearLayout
+
+        #region CalcLinearLayout
+
+        private void CalcLinearLayout(GaugeLinearScale scale)
+        {
+            float spread = (float)(scale.MaxValue - scale.MinValue);
+
+            if (spread == 0)
+                spread = 1;
+
+            if (scale.Orientation == Orientation.Horizontal)
+                CalcHorizontalLayout(scale, spread);
+            else
+                CalcVerticalLayout(scale, spread);
+        }
+
+        #endregion
+
+        #region CalcHorizontalLayout
+
+        private void CalcHorizontalLayout(GaugeLinearScale scale, float spread)
+        {
+            int length = scale.ScaleBounds.Width;
+            int width = scale.ScaleBounds.Height;
+
+            float dl = length / spread;
+
+            int start = (int)(dl * MinValue);
+            int len = (int)(dl * (MaxValue - MinValue));
+            int offset = (int)(width * ScaleOffset);
+
+            _AbsWidth = (int)(_Width > 0 ? width * _Width : width);
+
+            Rectangle r = scale.Bounds;
+
+            if (scale.Reversed == true)
+                r.X = r.Right - (start + len);
+            else
+                r.X += start;
+
+            r.Width = len;
+            r.Y = scale.Center.Y - (_AbsWidth / 2) + offset;
+            r.Height = _AbsWidth;
+
+            Bounds = r;
+        }
+
+        #endregion
+
+        #region CalcVerticalLayout
+
+        private void CalcVerticalLayout(GaugeLinearScale scale, float spread)
+        {
+            int length =  scale.ScaleBounds.Height;
+            int width = scale.ScaleBounds.Width;
+
+            int n = width;
+
+            float dl = length / spread;
+
+            int start = (int)(dl * MinValue);
+            int len = (int)(dl * (MaxValue - MinValue));
+            int offset = (int)(length * ScaleOffset);
+
+            _AbsWidth = (int)(_Width > 0 ? n * _Width : n);
+
+            Rectangle r = scale.Bounds;
+
+            if (scale.Reversed == true)
+                r.Y += start;
+            else
+                r.Y = r.Bottom - (start + len);
+
+            r.X = scale.Center.X - (_AbsWidth / 2) + offset;
+            r.Width = _AbsWidth;
+            r.Height = len;
+
+            Bounds = r;
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region OnPaint
+
+        public override void OnPaint(PaintEventArgs e)
+        {
+            RecalcLayout();
+
+            if (Scale.GaugeControl.OnPreRenderScaleSection(e, this) == false)
+            {
+                if (Scale is GaugeCircularScale)
+                {
+                    if (SweepAngle != 0)
+                        PaintCircularSection(e, Scale as GaugeCircularScale);
+                }
+                else if (Scale is GaugeLinearScale)
+                {
+                    PaintLinearSection(e, Scale as GaugeLinearScale);
+                }
+
+                Scale.GaugeControl.OnPostRenderScaleSection(e, this);
+            }
+        }
+
+        #endregion
+
+        #region PaintCircularSection
+
+        #region PaintCircularSection
+
+        private void PaintCircularSection(PaintEventArgs e, GaugeCircularScale scale)
+        {
+            Graphics g = e.Graphics;
+
+            int radius = scale.AbsRadius;
+            int n = (int)(radius * (_Width > 0 ? _Width : scale.Width));
+
+            if (n > 0 && Bounds.Width > 0 && Bounds.Height > 0 && Math.Abs(SweepAngle) > .05)
+            {
+                if (FillColor.End.IsEmpty == true || FillColor.Color1 == FillColor.Color2 ||
+                    FillColor.GradientFillType == GradientFillType.None)
+                {
+                    using (Pen pen = new Pen(FillColor.Color1, n))
+                        g.DrawArc(pen, Bounds, StartAngle, SweepAngle);
+                }
+                else
+                {
+                    switch (FillColor.GradientFillType)
+                    {
+                        case GradientFillType.Auto:
+                        case GradientFillType.StartToEnd:
+                            PaintCircularStartToEnd(g, Bounds, n, scale);
+                            break;
+
+                        case GradientFillType.Angle:
+                            PaintCircularByAngle(g, Bounds, n);
+                            break;
+
+                        case GradientFillType.Center:
+                            PaintCircularByCenter(g, Bounds, n);
+                            break;
+
+                        case GradientFillType.HorizontalCenter:
+                            PaintCircularByHc(g, Bounds, n);
+                            break;
+
+                        case GradientFillType.VerticalCenter:
+                            PaintCircularByVc(g, Bounds, n);
+                            break;
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region PaintCircularStartToEnd
+
+        private void PaintCircularStartToEnd(Graphics g,
+            Rectangle r, int n, GaugeCircularScale scale)
+        {
+            using (PathGradientBrush br = scale.CreateGradient(
+                Scale.GaugeControl.Frame.Bounds, StartAngle, SweepAngle, FillColor, 10))
+            {
+                using (Pen pen = new Pen(br, n))
+                    g.DrawArc(pen, r, StartAngle, SweepAngle);
+            }
+        }
+
+        #endregion
+
+        #region PaintCircularByAngle
+
+        private void PaintCircularByAngle(Graphics g, Rectangle r, int n)
+        {
+            Rectangle t = r;
+            t.Inflate(10, 10);
+
+            using (Brush br = FillColor.GetBrush(t))
+            {
+                using (Pen pen = new Pen(br, n))
+                    g.DrawArc(pen, r, StartAngle, SweepAngle);
+            }
+        }
+
+        #endregion
+
+        #region PaintCircularByCenter
+
+        private void PaintCircularByCenter(Graphics g, Rectangle r, int n)
+        {
+            using (GraphicsPath path = new GraphicsPath())
+            {
+                path.AddArc(r, StartAngle, SweepAngle);
+
+                using (Pen pen = new Pen(Color.Black, n))
+                    path.Widen(pen);
+
+                using (PathGradientBrush br = new PathGradientBrush(path))
+                {
+                    br.CenterColor = FillColor.Color1;
+                    br.SurroundColors = new Color[] {FillColor.Color2};
+                    br.CenterPoint = Scale.Center;
+
+                    float m = (float)n / (r.Width / 2);
+
+                    Blend blnd = new Blend();
+                    blnd.Positions = new float[] { 0f, m, 1f };
+                    blnd.Factors = new float[] { 1f, 0f, 0f };
+                    br.Blend = blnd;
+
+                    g.FillPath(br, path);
+                }
+            }
+        }
+
+        #endregion
+
+        #region PaintCircularByHc
+
+        private void PaintCircularByHc(Graphics g, Rectangle r, int n)
+        {
+            Rectangle t = r;
+            t.Height /= 2;
+
+            using (LinearGradientBrush br = new
+                LinearGradientBrush(t, FillColor.Color1, FillColor.Color2, 90))
+            {
+                br.WrapMode = WrapMode.TileFlipXY;
+
+                using (Pen pen = new Pen(br, n))
+                    g.DrawArc(pen, r, StartAngle, SweepAngle);
+            }
+        }
+
+        #endregion
+
+        #region PaintCircularByVc
+
+        private void PaintCircularByVc(Graphics g, Rectangle r, int n)
+        {
+            Rectangle t = r;
+            t.Width /= 2;
+
+            using (LinearGradientBrush br = new
+                LinearGradientBrush(t, FillColor.Color1, FillColor.Color2, 0f))
+            {
+                br.WrapMode = WrapMode.TileFlipXY;
+
+                using (Pen pen = new Pen(br, n))
+                    g.DrawArc(pen, r, StartAngle, SweepAngle);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region PaintLinearSection
+
+        #region PaintLinearSection
+
+        private void PaintLinearSection(PaintEventArgs e, GaugeLinearScale scale)
+        {
+            Graphics g = e.Graphics;
+
+            if (Bounds.Width > 0 && Bounds.Height > 0)
+            {
+                if (FillColor.End.IsEmpty == true || FillColor.Color1 == FillColor.Color2 ||
+                    FillColor.GradientFillType == GradientFillType.None)
+                {
+                    using (Brush br = new SolidBrush(FillColor.Color1))
+                        g.FillRectangle(br, Bounds);
+                }
+                else
+                {
+                    switch (FillColor.GradientFillType)
+                    {
+                        case GradientFillType.Auto:
+                        case GradientFillType.StartToEnd:
+                            PaintLinearStartToEnd(g, Bounds, scale);
+                            break;
+
+                        case GradientFillType.Angle:
+                            PaintLinearByAngle(g, Bounds);
+                            break;
+
+                        case GradientFillType.Center:
+                            PaintLinearByCenter(g, Bounds);
+                            break;
+
+                        case GradientFillType.HorizontalCenter:
+                            PaintLinearByHc(g, Bounds);
+                            break;
+
+                        case GradientFillType.VerticalCenter:
+                            PaintLinearByVc(g, Bounds);
+                            break;
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region PaintLinearStartToEnd
+
+        private void PaintLinearStartToEnd(
+            Graphics g, Rectangle r, GaugeLinearScale scale)
+        {
+            int angle = scale.Orientation == Orientation.Horizontal ? 0 : -90;
+
+            if (scale.Reversed == true)
+                angle += 180;
+
+            using (Brush br = FillColor.GetBrush(r, angle))
+                g.FillRectangle(br, r);
+        }
+
+        #endregion
+
+        #region PaintLinearByAngle
+
+        private void PaintLinearByAngle(Graphics g, Rectangle r)
+        {
+            using (Brush br = FillColor.GetBrush(r))
+                g.FillRectangle(br, r);
+        }
+
+        #endregion
+
+        #region PaintLinearByCenter
+
+        private void PaintLinearByCenter(Graphics g, Rectangle r)
+        {
+            using (GraphicsPath path = new GraphicsPath())
+            {
+                path.AddRectangle(r);
+
+                using (PathGradientBrush br = new PathGradientBrush(path))
+                {
+                    Point pt = new Point(r.X + r.Width / 2, r.Y + r.Height / 2);
+
+                    br.CenterColor = FillColor.Color1;
+                    br.SurroundColors = new Color[] { FillColor.Color2 };
+                    br.CenterPoint = pt;
+
+                    g.FillPath(br, path);
+                }
+            }
+        }
+
+        #endregion
+
+        #region PaintLinearByHc
+
+        private void PaintLinearByHc(Graphics g, Rectangle r)
+        {
+            Rectangle t = r;
+
+            if (r.Height >= 2)
+                t.Height /= 2;
+
+            using (LinearGradientBrush br = new
+                LinearGradientBrush(t, FillColor.Color1, FillColor.Color2, 90))
+            {
+                br.WrapMode = WrapMode.TileFlipXY;
+
+                g.FillRectangle(br, r);
+            }
+        }
+
+        #endregion
+
+        #region PaintLinearByVc
+
+        private void PaintLinearByVc(Graphics g, Rectangle r)
+        {
+            Rectangle t = r;
+
+            if (t.Width >= 2)
+                t.Width /= 2;
+
+            using (LinearGradientBrush br = new
+                LinearGradientBrush(t, FillColor.Color1, FillColor.Color2, 0f))
+            {
+                br.WrapMode = WrapMode.TileFlipXY;
+
+                g.FillRectangle(br, r);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region FindItem
+
+        internal override GaugeItem FindItem(Point pt)
+        {
+            GraphicsPath path = GetSectionPath();
+
+            if (path != null)
+            {
+                if (path.IsVisible(pt) == true)
+                    return (this);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetSectionPath
+
+        public GraphicsPath GetSectionPath()
+        {
+            if (StripePath == null)
+            {
+                if (Scale is GaugeCircularScale)
+                    StripePath = GetCSectionPath(Scale as GaugeCircularScale);
+                else
+                    StripePath = GetLSectionPath();
+            }
+
+            return (StripePath);
+        }
+
+        #endregion
+
+        #region GetCSectionPath
+
+        private GraphicsPath GetCSectionPath(GaugeCircularScale scale)
+        {
+            int radius = scale.AbsRadius;
+            int n = (int)(radius * (_Width > 0 ? _Width : scale.Width));
+
+            if (n > 0 && Bounds.Width > 0 && Bounds.Height > 0)
+            {
+                GraphicsPath path = new GraphicsPath();
+
+                Rectangle r = Bounds;
+
+                r.Inflate(n / 2, n / 2);
+                path.AddArc(r, StartAngle, SweepAngle);
+
+                r.Inflate(-n, -n);
+                path.AddArc(r, StartAngle + SweepAngle, -SweepAngle);
+
+                path.CloseAllFigures();
+
+                return (path);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetLSectionPath
+
+        private GraphicsPath GetLSectionPath()
+        {
+            if (Bounds.Width > 0 && Bounds.Height > 0)
+            {
+                GraphicsPath path = new GraphicsPath();
+
+                path.AddRectangle(Bounds);
+
+                return (path);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region ICloneable Members
+
+        public override object Clone()
+        {
+            GaugeSection copy = new GaugeSection();
+
+            CopyToItem(copy);
+
+            return (copy);
+        }
+
+        #endregion
+
+        #region CopyToItem
+
+        public override void CopyToItem(GaugeItem copy)
+        {
+            GaugeSection c = copy as GaugeSection;
+
+            if (c != null)
+            {
+                base.CopyToItem(c);
+
+                c.Width = _Width;
+            }
+        }
+
+        #endregion
+    }
+
+    #region GaugeScaleConvertor
+
+    public class GaugeSectionConvertor : ExpandableObjectConverter
+    {
+        public override object ConvertTo(
+            ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+        {
+            if (destinationType == typeof(string))
+            {
+                GaugeSection section = value as GaugeSection;
+
+                if (section != null)
+                {
+                    //ColorConverter cvt = new ColorConverter();
+
+                    //if (lct.Start != Color.Empty)
+                    //    return (cvt.ConvertToString(lct.Start));
+
+                    //if (lct.End != Color.Empty)
+                    //    return (cvt.ConvertToString(lct.End));
+
+                    //if (lct.GradientAngle != 90)
+                    //    return (lct.GradientAngle.ToString());
+
+                    return (String.Empty);
+                }
+            }
+
+            return (base.ConvertTo(context, culture, value, destinationType));
+        }
+    }
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeStrip/GaugeStrip.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeStrip/GaugeStrip.cs
new file mode 100644
index 00000000..b5822b3f
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeStrip/GaugeStrip.cs	
@@ -0,0 +1,776 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Drawing.Drawing2D;
+using System.Text;
+
+namespace DevComponents.Instrumentation
+{
+    public class GaugeStrip : GaugeItem, IDisposable
+    {
+        #region Events
+
+        [Description("Occurs when the coverage of a Strip changes.")]
+        public event EventHandler<EventArgs> StripCoverChanged;
+
+        #endregion
+
+        #region Private variables
+
+        private double _StartValue;
+        private double _EndValue;
+        private float _ScaleOffset;
+
+        private GradientFillColor _FillColor;
+
+        private Color _LabelColor;
+        private GradientFillColor _CapFillColor;
+        private GradientFillColor _PointerFillColor;
+        private GradientFillColor _MajorTickMarkFillColor;
+        private GradientFillColor _MinorTickMarkFillColor;
+        private GaugeScale _Scale;
+
+        private float _StartAngle;
+        private float _SweepAngle;
+
+        private double _MinValue;
+        private double _MaxValue;
+        private Rectangle _Bounds;
+
+        private GraphicsPath _StripePath;
+
+        #endregion
+
+        public GaugeStrip(GaugeScale scale)
+            : this()
+        {
+            _Scale = scale;
+        }
+
+        public GaugeStrip()
+        {
+            FillColor = new GradientFillColor();
+
+            _StartValue = double.NaN;
+            _EndValue = double.NaN;
+        }
+
+        #region Public properties
+
+        #region CapFillColor
+
+        /// <summary>
+        /// Gets or sets the Cap Fill Color
+        /// </summary>
+        [Browsable(true), Category("Appearance")]
+        [Description("Indicates the Cap Fill Color.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public GradientFillColor CapFillColor
+        {
+            get
+            {
+                if (_CapFillColor == null)
+                {
+                    _CapFillColor = new GradientFillColor();
+                    _CapFillColor.ColorTableChanged += PointerFillColor_ColorTableChanged;
+                }
+
+                return (_CapFillColor);
+            }
+
+            set
+            {
+                if (_CapFillColor != null)
+                    _CapFillColor.ColorTableChanged -= PointerFillColor_ColorTableChanged;
+
+                _CapFillColor = value;
+
+                if (_CapFillColor != null)
+                    _CapFillColor.ColorTableChanged += PointerFillColor_ColorTableChanged;
+
+                OnGaugeItemChanged(true);
+            }
+        }
+
+        #endregion
+
+        #region EndValue
+
+        /// <summary>
+        /// Gets or sets the Ending value for the area
+        /// </summary>
+        [Browsable(true), Category("Layout"), DefaultValue(double.NaN)]
+        [Description("Indicates the Ending value for the area.")]
+        public double EndValue
+        {
+            get { return (_EndValue); }
+
+            set
+            {
+                if (_EndValue != value)
+                {
+                    _EndValue = value;
+
+                    OnStripCoverChanged();
+                }
+            }
+        }
+
+        #endregion
+
+        #region PointerFillColor
+
+        /// <summary>
+        /// Gets or sets the Pointer Fill Color
+        /// </summary>
+        [Browsable(true), Category("Appearance")]
+        [Description("Indicates the Pointer Fill Color.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public GradientFillColor PointerFillColor
+        {
+            get
+            {
+                if (_PointerFillColor == null)
+                {
+                    _PointerFillColor = new GradientFillColor();
+                    _PointerFillColor.ColorTableChanged += PointerFillColor_ColorTableChanged;
+                }
+
+                return (_PointerFillColor);
+            }
+
+            set
+            {
+                if (_PointerFillColor != null)
+                    _PointerFillColor.ColorTableChanged -= PointerFillColor_ColorTableChanged;
+
+                _PointerFillColor = value;
+
+                if (_PointerFillColor != null)
+                    _PointerFillColor.ColorTableChanged += PointerFillColor_ColorTableChanged;
+
+                OnGaugeItemChanged(true);
+            }
+        }
+
+        #endregion
+
+        #region FillColor
+
+        /// <summary>
+        /// Gets or sets the area Fill Color
+        /// </summary>
+        [Browsable(true), Category("Appearance")]
+        [Description("Indicates the area Fill Color.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public GradientFillColor FillColor
+        {
+            get
+            {
+                if (_FillColor == null)
+                {
+                    _FillColor = new GradientFillColor();
+                    _FillColor.ColorTableChanged += FillColor_ColorTableChanged;
+                }
+
+                return (_FillColor);
+            }
+
+            set
+            {
+                if (_FillColor != null)
+                    _FillColor.ColorTableChanged -= FillColor_ColorTableChanged;
+
+                _FillColor = value;
+
+                if (_FillColor != null)
+                    _FillColor.ColorTableChanged += FillColor_ColorTableChanged;
+
+                OnGaugeItemChanged();
+            }
+        }
+
+        #endregion
+
+        #region LabelColor
+
+        /// <summary>
+        /// Gets or sets the Section Label Color
+        /// </summary>
+        [Browsable(true), Category("Appearance")]
+        [Description("Indicates the Section Label Color.")]
+        public Color LabelColor
+        {
+            get { return (_LabelColor); }
+
+            set
+            {
+                if (_LabelColor != value)
+                {
+                    _LabelColor = value;
+
+                    OnGaugeItemChanged();
+                }
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        internal virtual bool ShouldSerializeLabelColor()
+        {
+            return (_LabelColor.IsEmpty == false);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        internal virtual void ResetLabelColor()
+        {
+            LabelColor = Color.Empty;
+        }
+
+        #endregion
+
+        #region MajorTickMarkFillColor
+
+        /// <summary>
+        /// Gets or sets the MajorTickMark Fill Color
+        /// </summary>
+        [Browsable(true), Category("Appearance")]
+        [Description("Indicates the MajorTickMark Fill Color.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public GradientFillColor MajorTickMarkFillColor
+        {
+            get
+            {
+                if (_MajorTickMarkFillColor == null)
+                {
+                    _MajorTickMarkFillColor = new GradientFillColor();
+                    _MajorTickMarkFillColor.ColorTableChanged += TickMarkFillColor_ColorTableChanged;
+                }
+
+                return (_MajorTickMarkFillColor);
+            }
+
+            set
+            {
+                if (_MajorTickMarkFillColor != null)
+                    _MajorTickMarkFillColor.ColorTableChanged -= TickMarkFillColor_ColorTableChanged;
+
+                _MajorTickMarkFillColor = value;
+
+                if (_MajorTickMarkFillColor != null)
+                    _MajorTickMarkFillColor.ColorTableChanged += TickMarkFillColor_ColorTableChanged;
+
+                OnGaugeItemChanged(true);
+            }
+        }
+
+        #endregion
+
+        #region MinorTickMarkFillColor
+
+        /// <summary>
+        /// Gets or sets the MinorTickMark Fill Color
+        /// </summary>
+        [Browsable(true), Category("Appearance")]
+        [Description("Indicates the MinorTickMark Fill Color.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public GradientFillColor MinorTickMarkFillColor
+        {
+            get
+            {
+                if (_MinorTickMarkFillColor == null)
+                {
+                    _MinorTickMarkFillColor = new GradientFillColor();
+                    _MinorTickMarkFillColor.ColorTableChanged += TickMarkFillColor_ColorTableChanged;
+                }
+
+                return (_MinorTickMarkFillColor);
+            }
+
+            set
+            {
+                if (_MinorTickMarkFillColor != null)
+                    _MinorTickMarkFillColor.ColorTableChanged -= TickMarkFillColor_ColorTableChanged;
+
+                _MinorTickMarkFillColor = value;
+
+                if (_MinorTickMarkFillColor != null)
+                    _MinorTickMarkFillColor.ColorTableChanged += TickMarkFillColor_ColorTableChanged;
+
+                OnGaugeItemChanged(true);
+            }
+        }
+
+        #endregion
+
+        #region Scale
+
+        /// <summary>
+        /// Gets the associated Scale
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public GaugeScale Scale
+        {
+            get { return (_Scale); }
+            internal set { _Scale = value; }
+        }
+
+        #endregion
+
+        #region ScaleOffset
+
+        /// <summary>
+        /// Gets or sets the distance from the Scale, measured as a percentage
+        /// </summary>
+        [Browsable(true)]
+        [Category("Layout"), DefaultValue(0f)]
+        [Editor("DevComponents.Instrumentation.Design.OffsetRangeValueEditor, DevComponents.Instrumentation.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=76cb4c6eb576bca5", typeof(UITypeEditor))]
+        [Description("Indicates the distance from the Scale, measured as a percentage.")]
+        public float ScaleOffset
+        {
+            get { return (_ScaleOffset); }
+
+            set
+            {
+                if (_ScaleOffset != value)
+                {
+                    if (value < -1 || value > 1)
+                        throw new ArgumentException("Scale Offset must be bwtween -1 and +1");
+
+                    _ScaleOffset = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #region StartValue
+
+        /// <summary>
+        /// Gets or sets the Starting value for the area
+        /// </summary>
+        [Browsable(true), Category("Layout"), DefaultValue(double.NaN)]
+        [Description("Indicates the Starting value for the area.")]
+        public double StartValue
+        {
+            get { return (_StartValue); }
+
+            set
+            {
+                if (_StartValue != value)
+                {
+                    _StartValue = value;
+
+                    OnStripCoverChanged();
+                }
+            }
+        }
+
+        private void OnStripCoverChanged()
+        {
+            if (StripCoverChanged != null)
+                StripCoverChanged(this, EventArgs.Empty);
+
+            OnGaugeItemChanged(true);
+        }
+
+        #endregion
+
+        #region Visible
+
+        /// <summary>
+        /// Gets or sets the item Visibility state.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), DefaultValue(true)]
+        [Description("Indicates the item Visibility state.")]
+        [ParenthesizePropertyName(true)]
+        public override bool Visible
+        {
+            get { return (base.Visible); }
+
+            set
+            {
+                if (base.Visible != value)
+                {
+                    base.Visible = value;
+
+                    OnStripCoverChanged();
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region Bounds
+
+        internal Rectangle Bounds
+        {
+            get { return (_Bounds); }
+            set { _Bounds = value; }
+        }
+
+        #endregion
+
+        #region HasCapFillColor
+
+        internal bool HasCapFillColor
+        {
+            get { return (_CapFillColor != null && _CapFillColor.IsEmpty == false); }
+        }
+
+        #endregion
+
+        #region HasMajorTickMarkFillColor
+
+        internal bool HasMajorTickMarkFillColor
+        {
+            get { return (_MajorTickMarkFillColor != null &&
+                _MajorTickMarkFillColor.IsEmpty == false); }
+        }
+
+        #endregion
+
+        #region HasMinorTickMarkFillColor
+
+        internal bool HasMinorTickMarkFillColor
+        {
+            get { return (_MinorTickMarkFillColor != null && _MinorTickMarkFillColor.IsEmpty == false); }
+        }
+
+        #endregion
+
+        #region HasPointerFillColor
+
+        internal bool HasPointerFillColor
+        {
+            get { return (_PointerFillColor != null && _PointerFillColor.IsEmpty == false); }
+        }
+
+        #endregion
+
+        #region MaxValue
+
+        internal double MaxValue
+        {
+            get { return (_MaxValue); }
+            set { _MaxValue = value; }
+        }
+
+        #endregion
+
+        #region MinValue
+
+        internal double MinValue
+        {
+            get { return (_MinValue); }
+            set { _MinValue = value; }
+        }
+
+        #endregion
+
+        #region StartAngle
+
+        internal float StartAngle
+        {
+            get { return (_StartAngle); }
+        }
+
+        #endregion
+
+        #region StripePath
+
+        internal GraphicsPath StripePath
+        {
+            get { return (_StripePath); }
+
+            set
+            {
+                if (_StripePath != value)
+                {
+                    if (_StripePath != null)
+                        _StripePath.Dispose();
+
+                    _StripePath = value;
+                }
+            }
+        }
+
+        #endregion
+
+        #region SweepAngle
+
+        internal float SweepAngle
+        {
+            get { return (_SweepAngle); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Event processing
+
+        void FillColor_ColorTableChanged(object sender, EventArgs e)
+        {
+            OnGaugeItemChanged(true);
+        }
+
+        void TickMarkFillColor_ColorTableChanged(object sender, EventArgs e)
+        {
+            OnGaugeItemChanged(true);
+        }
+
+        void PointerFillColor_ColorTableChanged(object sender, EventArgs e)
+        {
+            OnGaugeItemChanged(true);
+        }
+
+        #endregion
+
+        #region RecalcLayout
+
+        public override void RecalcLayout()
+        {
+            if (NeedRecalcLayout == true)
+            {
+                base.RecalcLayout();
+
+                CalcStripMetrics();
+
+                _Scale.NeedTickMarkRecalcLayout = true;
+                _Scale.NeedPointerRecalcLayout = true;
+
+                StripePath = null;
+            }
+        }
+
+        #region CalcStripMetrics
+
+        private void CalcStripMetrics()
+        {
+            _MinValue = (_StartValue.Equals(double.NaN) ? _Scale.MinValue : _StartValue);
+            _MaxValue = (_EndValue.Equals(double.NaN) ? _Scale.MaxValue : _EndValue);
+
+            if (_MinValue > _Scale.MaxValue)
+                _MinValue = _Scale.MaxValue;
+
+            _MinValue -= _Scale.MinValue;
+
+            if (_MinValue < 0)
+                _MinValue = 0;
+
+            if (_MaxValue < _Scale.MinValue)
+                _MaxValue = _Scale.MinValue;
+
+            _MaxValue -= _Scale.MinValue;
+
+            if (_MaxValue > _Scale.MaxValue - _Scale.MinValue)
+                _MaxValue = _Scale.MaxValue - _Scale.MinValue;
+
+            if (Scale is GaugeCircularScale)
+                CalcCircularMetrics(Scale as GaugeCircularScale);
+        }
+
+        #region CalcCircularMetrics
+
+        private void CalcCircularMetrics(GaugeCircularScale scale)
+        {
+            float spread = (float)Math.Abs(scale.MaxValue - scale.MinValue);
+
+            if (spread == 0)
+                spread = 1;
+
+            float dv = scale.SweepAngle / spread;
+
+            _StartAngle = (float)(dv * _MinValue) + scale.StartAngle;
+            _SweepAngle = (float)(dv * (_MaxValue - _MinValue));
+
+            if (scale.Reversed == true)
+            {
+                _StartAngle = (scale.StartAngle + scale.SweepAngle) - (_StartAngle - scale.StartAngle);
+                _SweepAngle = -_SweepAngle;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region GetPoint
+
+        protected PointF GetPoint(float radius, float angle)
+        {
+            PointF pt = new PointF();
+
+            // Normalize the angle and calculate some
+            // working vars
+
+            if (angle < 0)
+                angle += 360;
+
+            angle = angle % 360;
+
+            // Determine the angle quadrant, and then calculate
+            // the intersecting coordinate accordingly
+
+            double radians = GetRadians(angle % 90);
+
+            if (angle < 90)
+            {
+                pt.X = (float)(Math.Cos(radians) * radius);
+                pt.Y = (float)(Math.Sin(radians) * radius);
+            }
+            else if (angle < 180)
+            {
+                pt.X = -(float)(Math.Sin(radians) * radius);
+                pt.Y = (float)(Math.Cos(radians) * radius);
+            }
+            else if (angle < 270)
+            {
+                pt.X = -(float)(Math.Cos(radians) * radius);
+                pt.Y = -(float)(Math.Sin(radians) * radius);
+            }
+            else
+            {
+                pt.X = (float)(Math.Sin(radians) * radius);
+                pt.Y = -(float)(Math.Cos(radians) * radius);
+            }
+
+            pt.X += _Scale.Center.X;
+            pt.Y += _Scale.Center.Y;
+
+            return (pt);
+        }
+
+        #endregion
+
+        #region GetRadians
+
+        /// <summary>
+        /// Converts Degrees to Radians
+        /// </summary>
+        /// <param name="theta">Degrees</param>
+        /// <returns>Radians</returns>
+        protected double GetRadians(float theta)
+        {
+            return (theta * Math.PI / 180);
+        }
+
+        #endregion
+
+        #region ValueInRange
+
+        internal bool ValueInRange(double value)
+        {
+            RecalcLayout();
+
+            double startValue = (_StartValue.Equals(double.NaN) ? MinValue : _StartValue);
+            double endValue = (_EndValue.Equals(double.NaN) ? MaxValue : _EndValue);
+
+            if (startValue > endValue)
+            {
+                double temp = startValue;
+                startValue = endValue;
+                endValue = temp;
+            }
+
+            return (value >= startValue && value <= endValue);
+        }
+
+        #endregion
+
+        #region ProcessTemplateText
+
+        protected override void ProcessTemplateText(
+            GaugeControl gauge, StringBuilder sb, string key, string data)
+        {
+            switch (key)
+            {
+                case "StartValue":
+                    sb.Append(string.IsNullOrEmpty(data)
+                        ? _StartValue.ToString()
+                        : String.Format("{0:" + data + "}", _StartValue));
+                    break;
+
+                case "EndValue":
+                    sb.Append(string.IsNullOrEmpty(data)
+                        ? _EndValue.ToString()
+                        : String.Format("{0:" + data + "}", _EndValue));
+                    break;
+
+                default:
+                    base.ProcessTemplateText(gauge, sb, key, data);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region IDisposable Members
+
+        void IDisposable.Dispose()
+        {
+            StripePath = null;
+        }
+
+        #endregion
+
+        #region ICloneable Members
+
+        public override object Clone()
+        {
+            GaugeStrip copy = new GaugeStrip();
+
+            CopyToItem(copy);
+
+            return (copy);
+        }
+
+        #endregion
+
+        #region CopyToItem
+
+        public override void CopyToItem(GaugeItem copy)
+        {
+            GaugeStrip c = copy as GaugeStrip;
+
+            if (c != null)
+            {
+                base.CopyToItem(c);
+
+                if (_CapFillColor != null)
+                    c.CapFillColor = (GradientFillColor)_CapFillColor.Clone();
+
+                c.EndValue = _EndValue;
+
+                if (_PointerFillColor != null)
+                    c.PointerFillColor = (GradientFillColor)_PointerFillColor.Clone();
+
+                if (_FillColor != null)
+                    c.FillColor = (GradientFillColor)_FillColor.Clone();
+
+                c.LabelColor = _LabelColor;
+
+                if (_MajorTickMarkFillColor != null)
+                    c.MajorTickMarkFillColor = (GradientFillColor)_MajorTickMarkFillColor.Clone();
+
+                if (_MinorTickMarkFillColor != null)
+                    c.MinorTickMarkFillColor = (GradientFillColor)_MinorTickMarkFillColor.Clone();
+
+                c.ScaleOffset = _ScaleOffset;
+                c.StartValue = _StartValue;
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeTickMark/GaugeTickMark.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeTickMark/GaugeTickMark.cs
new file mode 100644
index 00000000..98109e1d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeTickMark/GaugeTickMark.cs	
@@ -0,0 +1,327 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Globalization;
+using System.Windows.Forms;
+
+namespace DevComponents.Instrumentation
+{
+    [TypeConverter(typeof(GaugeTickMarkConvertor))]
+    public class GaugeTickMark : GaugeTickMarkBase
+    {
+        #region Private variables
+
+        private double _Interval;
+        private double _IntervalOffset;
+        private double _DefaultInterval;
+
+        private TickPoint[] _TickPoints;
+
+        #endregion
+
+        public GaugeTickMark(GaugeScale scale, GaugeTickMarkRank rank,
+            GaugeMarkerStyle style, float width, float length, double interval)
+            : base(scale, rank, style, width, length)
+        {
+            _Interval = interval;
+            _DefaultInterval = interval;
+        }
+
+        #region Public properties
+
+        #region Interval
+
+        /// <summary>
+        /// Gets or sets the TickMark Interval spacing
+        /// </summary>
+        [Browsable(true)]
+        [Category("Layout")]
+        [Description("Indicates the TickMark Interval spacing.")]
+        public double Interval
+        {
+            get { return (_Interval); }
+
+            set
+            {
+                if (value < 0)
+                    throw new ArgumentException("Value can not be less than zero.");
+                
+                if (_Interval != value)
+                {
+                    _Interval = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeInterval()
+        {
+            return (_Interval != _DefaultInterval);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetInterval()
+        {
+            Interval = _DefaultInterval;
+        }
+
+        #endregion
+
+        #region IntervalOffset
+
+        /// <summary>
+        /// Gets or sets the initial TickMark Interval Offset
+        /// </summary>
+        [Browsable(true)]
+        [Category("Layout"), DefaultValue(0d)]
+        [Description("Indicates the initial TickMark Interval Offset.")]
+        public double IntervalOffset
+        {
+            get { return (_IntervalOffset); }
+
+            set
+            {
+                if (value < 0)
+                    throw new ArgumentException("Value can not be less than zero.");
+                
+                if (_IntervalOffset != value)
+                {
+                    _IntervalOffset = value;
+
+                    OnGaugeItemChanged(true);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region TickPoints
+
+        internal TickPoint[] TickPoints
+        {
+            get { return (_TickPoints); }
+            set { _TickPoints = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RecalcLayout
+
+        public override void RecalcLayout()
+        {
+            if (NeedRecalcLayout == true)
+            {
+                base.RecalcLayout();
+
+                CalcTickPoints();
+
+                Scale.NeedLabelRecalcLayout = true;
+            }
+        }
+
+        #region CalcTickPoints
+
+        private void CalcTickPoints()
+        {
+            _TickPoints = null;
+
+            if (_Interval > 0)
+            {
+                double ticks = Scale.MaxValue - Scale.MinValue;
+
+                if (ticks > 0)
+                {
+                    int n = (int) ((ticks - _IntervalOffset)/_Interval) + 1;
+
+                    if (n > 0)
+                    {
+                        if (Scale is GaugeCircularScale)
+                            CalcCircularTickPoints(Scale as GaugeCircularScale, ticks, n);
+
+                        else if (Scale is GaugeLinearScale)
+                            CalcLinearTickPoints(Scale as GaugeLinearScale, ticks, n);
+                    }
+                }
+            }
+        }
+
+        #region CalcCircularTickPoints
+
+        private void CalcCircularTickPoints(
+            GaugeCircularScale scale, double ticks, int n)
+        {
+            double dpt = scale.SweepAngle / ticks;
+            double theta = _Interval * dpt;
+
+            double startAngle = scale.StartAngle;
+
+            if (scale.Reversed == true)
+                startAngle += scale.SweepAngle;
+
+            int dir = scale.Reversed ? -1 : 1;
+          
+            startAngle += (dpt * _IntervalOffset * dir);
+
+            _TickPoints = new TickPoint[n];
+
+            double interval = _IntervalOffset;
+
+            for (int i = 0; i < n; i++)
+            {
+                _TickPoints[i] = new TickPoint(this);
+
+                _TickPoints[i].Angle = (float)(startAngle + (i * theta * dir));
+                _TickPoints[i].Point = scale.GetPoint(Radius, _TickPoints[i].Angle);
+                _TickPoints[i].Interval = interval;
+
+                interval += _Interval;
+            }
+        }
+
+        #endregion
+
+        #region CalcLinearTickPoints
+
+        private void CalcLinearTickPoints(
+            GaugeLinearScale scale, double ticks, int n)
+        {
+            double dpt = scale.AbsScaleLength/ticks;
+
+            if (scale.Orientation == Orientation.Horizontal)
+                CalcHorizontalTickPoints(n, dpt);
+            else
+                CalcVerticalTickPoints(n, dpt);
+        }
+
+        #region CalcHorizontalTickPoints
+
+        private void CalcHorizontalTickPoints(int n, double dpt)
+        {
+            _TickPoints = new TickPoint[n];
+
+            double interval = _IntervalOffset;
+
+            for (int i = 0; i < n; i++)
+            {
+                _TickPoints[i] = new TickPoint(this);
+
+                int x = (Scale.Reversed == true)
+                    ? Bounds.Right - (int)(dpt * interval)
+                    : Bounds.X + (int)(dpt * interval);
+
+                _TickPoints[i].Point = new Point(x, Bounds.Y);
+                _TickPoints[i].Interval = interval;
+
+                interval += _Interval;
+            }
+        }
+
+        #endregion
+
+        #region CalcVerticalTickPoints
+
+        private void CalcVerticalTickPoints(int n, double dpt)
+        {
+            _TickPoints = new TickPoint[n];
+
+            double interval = _IntervalOffset;
+
+            for (int i = 0; i < n; i++)
+            {
+                _TickPoints[i] = new TickPoint(this);
+
+                int y = (Scale.Reversed == true)
+                    ? Bounds.Top + (int)(dpt * interval)
+                    : Bounds.Bottom - (int)(dpt * interval);
+
+                _TickPoints[i].Point = new Point(Bounds.X, y);
+                _TickPoints[i].Interval = interval;
+
+                interval += _Interval;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region ICloneable Members
+
+        public override object Clone()
+        {
+            GaugeTickMark copy = new
+                GaugeTickMark(Scale, Rank, Layout.Style, Width, Length, Interval);
+
+            CopyToItem(copy);
+
+            return (copy);
+        }
+
+        #endregion
+
+        #region CopyToItem
+
+        public override void CopyToItem(GaugeItem copy)
+        {
+            GaugeTickMark c = copy as GaugeTickMark;
+
+            if (c != null)
+            {
+                base.CopyToItem(c);
+
+                c.Interval = _Interval;
+                c.IntervalOffset = _IntervalOffset;
+
+                c._DefaultInterval = _DefaultInterval;
+            }
+        }
+
+        #endregion
+    }
+
+    #region GaugeTickMarkConvertor
+
+    public class GaugeTickMarkConvertor : ExpandableObjectConverter
+    {
+        public override object ConvertTo(
+            ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+        {
+            if (destinationType == typeof(string))
+            {
+                GaugeTickMark tickMark = value as GaugeTickMark;
+
+                if (tickMark != null)
+                {
+                    //ColorConverter cvt = new ColorConverter();
+
+                    //if (lct.Start != Color.Empty)
+                    //    return (cvt.ConvertToString(lct.Start));
+
+                    //if (lct.End != Color.Empty)
+                    //    return (cvt.ConvertToString(lct.End));
+
+                    //if (lct.GradientAngle != 90)
+                    //    return (lct.GradientAngle.ToString());
+
+                    return (String.Empty);
+                }
+            }
+
+            return (base.ConvertTo(context, culture, value, destinationType));
+        }
+    }
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeTickMark/GaugeTickMarkBase.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeTickMark/GaugeTickMarkBase.cs
new file mode 100644
index 00000000..ec006bde
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeTickMark/GaugeTickMarkBase.cs	
@@ -0,0 +1,596 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Globalization;
+using System.Windows.Forms;
+
+namespace DevComponents.Instrumentation
+{
+    [TypeConverter(typeof(GaugeTickMarkBaseConvertor))]
+    public class GaugeTickMarkBase : GaugeItem
+    {
+        #region Private variables
+
+        private int _Radius;
+        private int _Width;
+        private int _Length;
+
+        private int _Offset;
+        private Rectangle _Bounds;
+
+        private TickMarkLayout _Layout;
+        private GaugeTickMarkRank _Rank;
+        private GaugeMarker _GaugeMarker;
+
+        private GaugeScale _Scale;
+
+        #endregion
+
+        public GaugeTickMarkBase(GaugeScale scale,
+            GaugeTickMarkRank rank, GaugeMarkerStyle style, float width, float length)
+            : this(scale, rank, new TickMarkLayout(style, width, length))
+        {
+        }
+
+        public GaugeTickMarkBase(GaugeScale scale, GaugeTickMarkRank rank, TickMarkLayout layout)
+        {
+            _Scale = scale;
+            _Rank = rank;
+
+            _Layout = layout;
+            _GaugeMarker = new GaugeMarker();
+
+            HookEvents(true);
+        }
+
+        #region Hidden properties
+
+        #region Name
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public new string Name
+        {
+            get { return (base.Name); }
+            set { base.Name = value; }
+        }
+
+        #endregion
+
+        #region Tooltip
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public new string Tooltip
+        {
+            get { return (base.Tooltip); }
+            set { base.Tooltip = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Public properties
+
+        #region Scale
+
+        /// <summary>
+        /// Gets the associated Scale
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public GaugeScale Scale
+        {
+            get { return (_Scale); }
+            internal set { _Scale = value; }
+        }
+
+        #endregion
+
+        #region Layout
+
+        /// <summary>
+        /// Gets the Tickmark leyout
+        /// </summary>
+        [Browsable(true), Category("Layout")]
+        [Description("Specifies the TickMark layout properties.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public TickMarkLayout Layout
+        {
+            get { return (_Layout); }
+        }
+
+        #endregion
+
+        #region Visible
+
+        public override bool Visible
+        {
+            get { return (base.Visible); }
+
+            set
+            {
+                if (base.Visible != value)
+                {
+                    base.Visible = value;
+
+                    if (_Scale != null)
+                        _Scale.Labels.NeedRecalcLayout = true;
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region Bounds
+
+        internal Rectangle Bounds
+        {
+            get { return (_Bounds); }
+            set { _Bounds = value; }
+        }
+
+        #endregion
+
+        #region Length
+
+        internal int Length
+        {
+            get { return (_Length); }
+            set { _Length = value; }
+        }
+
+        #endregion
+
+        #region Offset
+
+        internal int Offset
+        {
+            get { return (_Offset); }
+            set { _Offset = value; }
+        }
+
+        #endregion
+
+        #region Radius
+
+        internal int Radius
+        {
+            get { return (_Radius); }
+        }
+
+        #endregion
+
+        #region Rank
+
+        internal GaugeTickMarkRank Rank
+        {
+            get { return (_Rank); }
+        }
+
+        #endregion
+
+        #region Width
+
+        internal int Width
+        {
+            get { return (_Width); }
+            set { _Width = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region HookEvents
+
+        private void HookEvents(bool hook)
+        {
+            if (hook == true)
+            {
+                _Layout.TickMarkLayoutChanged += TickMarkLayout_TickMarkLayoutChanged;
+            }
+            else
+            {
+                _Layout.TickMarkLayoutChanged -= TickMarkLayout_TickMarkLayoutChanged;
+            }
+        }
+
+        #endregion
+
+        #region Event processing
+
+        void TickMarkLayout_TickMarkLayoutChanged(object sender, EventArgs e)
+        {
+            OnGaugeItemChanged(true);
+        }
+
+        #endregion
+
+        #region RecalcLayout
+
+        public override void RecalcLayout()
+        {
+            if (NeedRecalcLayout == true)
+            {
+                base.RecalcLayout();
+
+                CalcTickMarkMetrics();
+
+                _GaugeMarker.Clear();
+            }
+        }
+
+        #region CalcTickMarkMetrics
+
+        private void CalcTickMarkMetrics()
+        {
+            if (Scale is GaugeCircularScale)
+                CalcCircularMetrics(Scale as GaugeCircularScale);
+
+            else if (Scale is GaugeLinearScale)
+                CalcLinearMetrics(Scale as GaugeLinearScale);
+        }
+
+        #region CalcCircularMetrics
+
+        private void CalcCircularMetrics(GaugeCircularScale scale)
+        {
+            _Radius = scale.AbsRadius;
+            _Length = (int)(_Radius * _Layout.Length);
+            _Width = (int)(_Radius * _Layout.Width);
+
+            int m = scale.AbsScaleWidth;
+            int offset = (int)(scale.AbsRadius * _Layout.ScaleOffset);
+
+            switch (_Layout.Placement)
+            {
+                case DisplayPlacement.Near:
+                    _Radius -= ((_Length + m / 2) + offset);
+                    break;
+
+                case DisplayPlacement.Center:
+                    _Radius += ((_Length / 2) + offset + 1);
+                    break;
+
+                case DisplayPlacement.Far:
+                    _Radius += ((_Length + m / 2) + offset);
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region CalcLinearMetrics
+
+        private void CalcLinearMetrics(GaugeLinearScale scale)
+        {
+            if (scale.Orientation == Orientation.Horizontal)
+                CalcHorizontalLayout(scale);
+            else
+                CalcVerticalLayout(scale);
+        }
+
+        #region CalcHorizontalLayout
+
+        private void CalcHorizontalLayout(GaugeLinearScale scale)
+        {
+            int n = scale.AbsWidth;
+
+            _Length = (int)(n * _Layout.Length);
+            _Width = (int)(n * _Layout.Width);
+
+            if (_Layout.Length > 0 && _Length < 2)
+                _Length = 2;
+
+            if (_Layout.Width > 0 && _Width < 2)
+                _Width = 2;
+
+            int offset = (int) (n * _Layout.ScaleOffset);
+
+            _Bounds = scale.ScaleBounds;
+            _Bounds.Height = _Length;
+
+            switch (_Layout.Placement)
+            {
+                case DisplayPlacement.Near:
+                    _Bounds.Y = scale.ScaleBounds.Top - _Length - offset;
+                    break;
+
+                case DisplayPlacement.Center:
+                    _Bounds.Y = scale.Center.Y - _Length / 2 - offset;
+                    break;
+
+                case DisplayPlacement.Far:
+                    _Bounds.Y = scale.ScaleBounds.Bottom + offset;
+                    break;
+            }
+
+            _Offset = _Bounds.Y - scale.ScaleBounds.Y;
+        }
+
+        #endregion
+
+        #region CalcVerticalLayout
+
+        private void CalcVerticalLayout(GaugeLinearScale scale)
+        {
+            int n = scale.AbsWidth;
+
+            _Length = (int)(n * _Layout.Length);
+            _Width = (int)(n * _Layout.Width);
+
+            if (_Layout.Length > 0 && _Length < 2)
+                _Length = 2;
+
+            if (_Layout.Width > 0 && _Width < 2)
+                _Width = 2;
+
+            int offset = (int)(n * _Layout.ScaleOffset);
+
+            _Bounds = scale.ScaleBounds;
+            _Bounds.Width = _Length;
+
+            switch (_Layout.Placement)
+            {
+                case DisplayPlacement.Near:
+                    _Bounds.X = scale.ScaleBounds.Left - _Length - offset;
+                    break;
+
+                case DisplayPlacement.Center:
+                    _Bounds.X = scale.Center.X - _Length / 2 - offset;
+                    break;
+
+                case DisplayPlacement.Far:
+                    _Bounds.X = scale.ScaleBounds.Right + offset;
+                    break;
+            }
+
+            _Offset = _Bounds.X - scale.ScaleBounds.X;
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region Paint support
+
+        #region PaintTickPoint
+
+        #region PaintTickPoint
+
+        internal void PaintTickPoint(Graphics g, TickPoint tp)
+        {
+            Image image = _Layout.Image ?? GetTickMarkBitmap(g, tp);
+
+            if (image != null)
+            {
+                if (Scale is GaugeCircularScale)
+                    PaintCircularTickPoint(g, tp, image);
+
+                else if (Scale is GaugeLinearScale)
+                    PaintLinearTickPoint(g, tp, image, Scale as GaugeLinearScale);
+            }
+        }
+
+        #endregion
+
+        #region PaintCircularTickPoint
+
+        private void PaintCircularTickPoint(Graphics g, TickPoint tp, Image image)
+        {
+            Rectangle r = new Rectangle(0, 0, _Width, _Length);
+
+            float angle = tp.Angle + 90;
+
+            if (_Layout.Placement == DisplayPlacement.Near)
+                angle += 180;
+
+            g.TranslateTransform(tp.Point.X, tp.Point.Y);
+            g.RotateTransform(angle % 360);
+
+            r.X -= _Width / 2;
+
+            g.DrawImage(image, r);
+            g.ResetTransform();
+        }
+
+        #endregion
+
+        #region PaintLinearTickPoint
+
+        private void PaintLinearTickPoint(Graphics g,
+            TickPoint tp, Image image, GaugeLinearScale scale)
+        {
+            if (scale.Orientation == Orientation.Horizontal)
+                PaintHorizontalTickPoint(g, tp, image);
+            else
+                PaintVerticalTickPoint(g, tp, image);
+        }
+
+        #region PaintHorizontalTickPoint
+
+        private void PaintHorizontalTickPoint(Graphics g, TickPoint tp, Image image)
+        {
+            if (_Layout.Placement != DisplayPlacement.Far)
+            {
+                Rectangle r = new Rectangle(tp.Point.X, tp.Point.Y, _Width, _Length);
+                r.X -= _Width / 2;
+
+                g.DrawImage(image, r);
+            }
+            else
+            {
+                Rectangle r = new Rectangle(0, 0, _Width, _Length);
+
+                g.TranslateTransform(tp.Point.X, tp.Point.Y + _Length - (_Length % 2));
+                g.RotateTransform(180);
+
+                r.X -= _Width / 2;
+
+                g.DrawImage(image, r);
+                g.ResetTransform();
+            }
+        }
+
+        #endregion
+
+        #region PaintVerticalTickPoint
+
+        private void PaintVerticalTickPoint(Graphics g, TickPoint tp, Image image)
+        {
+            Rectangle r = new Rectangle(0, 0, _Width, _Length);
+
+            if (_Layout.Placement == DisplayPlacement.Far)
+            {
+                g.TranslateTransform(tp.Point.X + _Length - (_Length % 2), tp.Point.Y);
+                g.RotateTransform(90);
+            }
+            else
+            {
+                g.TranslateTransform(tp.Point.X, tp.Point.Y);
+                g.RotateTransform(-90);
+            }
+
+            r.X -= (_Width / 2);
+
+            g.DrawImage(image, r);
+            g.ResetTransform();
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region GetTickMarkBitmap
+
+        internal Bitmap GetTickMarkBitmap(Graphics g, TickPoint tp)
+        {
+            if (_Layout.Style != GaugeMarkerStyle.None)
+            {
+                if (_Width > 0 && _Length > 0)
+                {
+                    return (_GaugeMarker.GetMarkerBitmap(g, _Layout.Style,
+                            GetTickMarkFillColor(tp), _Width, _Length));
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetTickMarkFillColor
+
+        private GradientFillColor GetTickMarkFillColor(TickPoint tp)
+        {
+            if (_Rank == GaugeTickMarkRank.Custom)
+                return (Layout.FillColor);
+
+            ColorSourceFillEntry entry = (_Rank == GaugeTickMarkRank.Major)
+                ? ColorSourceFillEntry.MajorTickMark : ColorSourceFillEntry.MinorTickMark;
+
+            GradientFillColor fillColor = (Scale.GetRangeFillColor(tp.Interval, entry) ??
+                                           Scale.GetSectionFillColor(tp.Interval, entry)) ?? Layout.FillColor;
+
+            return (fillColor);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region OnDispose
+
+        protected override void OnDispose()
+        {
+            HookEvents(false);
+
+            _GaugeMarker.Dispose();
+
+            base.OnDispose();
+        }
+
+        #endregion
+
+        #region ICloneable Members
+
+        public override object Clone()
+        {
+            GaugeTickMarkBase copy = new GaugeTickMarkBase(
+                _Scale, _Rank, _Layout.Style, _Layout.Width, _Layout.Length);
+
+            CopyToItem(copy);
+
+            return (copy);
+        }
+
+        #endregion
+
+        #region CopyToItem
+
+        public override void CopyToItem(GaugeItem copy)
+        {
+            GaugeTickMarkBase c = copy as GaugeTickMarkBase;
+
+            if (c != null)
+            {
+                base.CopyToItem(c);
+
+                _Layout.CopyToItem(c.Layout);
+            }
+        }
+
+        #endregion
+    }
+
+    #region GaugeTickMarkBaseConvertor
+
+    public class GaugeTickMarkBaseConvertor : ExpandableObjectConverter
+    {
+        public override object ConvertTo(
+            ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+        {
+            if (destinationType == typeof(string))
+            {
+                GaugeTickMarkBase tickMark = value as GaugeTickMarkBase;
+
+                if (tickMark != null)
+                {
+                    return (String.Empty);
+                }
+            }
+
+            return (base.ConvertTo(context, culture, value, destinationType));
+        }
+    }
+
+    #endregion
+
+    #region Enums
+
+    public enum GaugeTickMarkRank
+    {
+        Major,
+        Minor,
+        Custom
+    }
+
+    public enum GaugeTickMarkOverlap
+    {
+        ReplaceNone,
+        ReplaceLast,
+        ReplaceAll
+    }
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeTickMark/GaugeTickMarkLabel.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeTickMark/GaugeTickMarkLabel.cs
new file mode 100644
index 00000000..b024061b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeTickMark/GaugeTickMarkLabel.cs	
@@ -0,0 +1,171 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Globalization;
+using System.Windows.Forms;
+
+namespace DevComponents.Instrumentation
+{
+    [TypeConverter(typeof(GaugeTickMarkLabelConvertor))]
+    public class GaugeTickMarkLabel : GaugeTickMarkBase
+    {
+        #region Private properties
+
+        private TickPoint _TickPoint;
+        private double _Interval;
+
+        #endregion
+
+        public GaugeTickMarkLabel(GaugeScale scale, GaugeTickMarkRank rank,
+            GaugeMarkerStyle style, float width, float length, double interval)
+            : base(scale, rank, style, width, length)
+        {
+            _Interval = interval;
+        }
+
+        #region Internal properties
+
+        internal double Interval
+        {
+            get { return (_Interval); }
+            set { _Interval = value; }
+        }
+
+        internal TickPoint TickPoint
+        {
+            get { return (_TickPoint); }
+            set { _TickPoint = value; }
+        }
+
+        #endregion
+
+        #region RecalcLayout
+
+        public override void RecalcLayout()
+        {
+            if (NeedRecalcLayout == true)
+            {
+                base.RecalcLayout();
+
+                CalcTickPoint();
+            }
+        }
+
+        #region CalcTickPoint
+
+        private void CalcTickPoint()
+        {
+            _TickPoint = null;
+
+            if (Scale is GaugeCircularScale)
+                CalcCircularTickPoint(Scale as GaugeCircularScale);
+
+            else if (Scale is GaugeLinearScale)
+                CalcLinearTickPoint(Scale as GaugeLinearScale);
+        }
+
+        #region CalcCircularTickPoint
+
+        private void CalcCircularTickPoint(GaugeCircularScale scale)
+        {
+            double spread = Scale.MaxValue - Scale.MinValue;
+            double dpt = scale.SweepAngle / spread;
+
+            if (_Interval >= 0 && _Interval <= spread)
+            {
+                _TickPoint = new TickPoint(this);
+
+                if (scale.Reversed == true)
+                    _TickPoint.Angle = (float)(scale.StartAngle + scale.SweepAngle - (_Interval * dpt));
+                else
+                    _TickPoint.Angle = (float)(scale.StartAngle + _Interval * dpt);
+
+                _TickPoint.Point = scale.GetPoint(Radius, _TickPoint.Angle);
+                _TickPoint.Interval = _Interval;
+            }
+        }
+
+        #endregion
+
+        #region CalcLinearTickPoint
+
+        private void CalcLinearTickPoint(GaugeLinearScale scale)
+        {
+            double spread = Math.Abs(scale.MaxValue - scale.MinValue);
+            double dpt = scale.AbsScaleLength / spread;
+
+            if (_Interval >= 0 && _Interval <= spread)
+            {
+                if (scale.Orientation == Orientation.Horizontal)
+                    CalcHorizontalTickPoint(scale, dpt);
+                else
+                    CalcVerticalTickPoint(scale, dpt);
+            }
+        }
+
+        #region CalcHorizontalTickPoint
+
+        private void CalcHorizontalTickPoint(GaugeLinearScale scale, double dpt)
+        {
+            _TickPoint = new TickPoint(this);
+
+            int x = (scale.Reversed == true)
+                ? Scale.Bounds.Right - (int)(dpt * _Interval)
+                : Scale.Bounds.X + (int)(dpt * _Interval);
+
+            int y = scale.ScaleBounds.Y + Offset;
+
+            _TickPoint.Point = new Point(x, y);
+            _TickPoint.Interval = _Interval;
+        }
+
+        #endregion
+
+        #region CalcVerticalTickPoint
+
+        private void CalcVerticalTickPoint(GaugeLinearScale scale, double dpt)
+        {
+            _TickPoint = new TickPoint(this);
+
+            int x = scale.ScaleBounds.X + Offset;
+
+            int y = (scale.Reversed == true)
+                ? Scale.Bounds.Top + (int)(dpt * _Interval)
+                : Scale.Bounds.Bottom - (int)(dpt * _Interval);
+
+            _TickPoint.Point = new Point(x, y);
+            _TickPoint.Interval = _Interval;
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #endregion
+    }
+
+    #region GaugeLabelTickMarkConvertor
+
+    public class GaugeTickMarkLabelConvertor : ExpandableObjectConverter
+    {
+        public override object ConvertTo(
+            ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+        {
+            if (destinationType == typeof(string))
+            {
+                GaugeTickMarkLabel tickMark = value as GaugeTickMarkLabel;
+
+                if (tickMark != null)
+                {
+                    return (String.Empty);
+                }
+            }
+
+            return (base.ConvertTo(context, culture, value, destinationType));
+        }
+    }
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeTickMark/TickMarkLayout.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeTickMark/TickMarkLayout.cs
new file mode 100644
index 00000000..27962ac7
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeTickMark/TickMarkLayout.cs	
@@ -0,0 +1,456 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Globalization;
+
+namespace DevComponents.Instrumentation
+{
+    [TypeConverter(typeof(TickMarkLayoutConvertor))]
+    public class TickMarkLayout : IDisposable, ICloneable
+    {
+        #region Events
+
+        public event EventHandler<EventArgs> TickMarkLayoutChanged;
+
+        #endregion
+
+        #region Private variables
+
+        private GaugeMarkerStyle _Style;
+
+        private DisplayPlacement _Placement;
+        private float _ScaleOffset;
+
+        private float _Width;
+        private float _Length;
+
+        private GradientFillColor _FillColor;
+        private GaugeTickMarkOverlap _Overlap;
+
+        private Image _Image;
+        private Bitmap _Bitmap;
+
+        private float _DefaultWidth;
+        private float _DefaultLength;
+        private GaugeMarkerStyle _DefaultStyle;
+
+        #endregion
+
+        public TickMarkLayout()
+            : this(GaugeMarkerStyle.Rectangle, .045f, .09f)
+        {
+        }
+
+        public TickMarkLayout(GaugeMarkerStyle style, float width, float length)
+        {
+            _Style = style;
+            _Width = width;
+            _Length = length;
+
+            _DefaultStyle = style;
+            _DefaultWidth = width;
+            _DefaultLength = length;
+
+            _Placement = DisplayPlacement.Center;
+
+            FillColor = new GradientFillColor(Color.DarkGray, Color.White);
+            FillColor.BorderColor = Color.DimGray;
+            FillColor.BorderWidth = 1;
+
+            _Overlap = GaugeTickMarkOverlap.ReplaceAll;
+        }
+
+        #region Public properties
+
+        #region FillColor
+
+        /// <summary>
+        /// Gets or sets the TickMark Fill Color
+        /// </summary>
+        [Browsable(true), Category("Appearance")]
+        [Description("Indicates the TickMark Fill Color.")]
+        public GradientFillColor FillColor
+        {
+            get
+            {
+                if (_FillColor == null)
+                {
+                    _FillColor = new GradientFillColor();
+                    _FillColor.ColorTableChanged += FillColor_ColorTableChanged;
+                }
+
+                return (_FillColor);
+            }
+
+            set
+            {
+                if (_FillColor != null)
+                    _FillColor.ColorTableChanged -= FillColor_ColorTableChanged;
+
+                _FillColor = value;
+
+                if (_FillColor != null)
+                    _FillColor.ColorTableChanged += FillColor_ColorTableChanged;
+
+                OnTickMarkLayoutChanged();
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        internal bool ShouldSerializeFillColor()
+        {
+            return (_FillColor.IsEqualTo(Color.DarkGray,
+                Color.White, 90, GradientFillType.Auto, Color.DimGray, 1) == false);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        internal void ResetFillColor()
+        {
+            FillColor = new GradientFillColor(Color.DarkGray, Color.White);
+            FillColor.BorderColor = Color.DimGray;
+            FillColor.BorderWidth = 1;
+        }
+
+        #endregion
+
+        #region Image
+
+        /// <summary>
+        /// Gets or sets the Image to use for the TickMark
+        /// </summary>
+        [Browsable(true), Category("Appearance"), DefaultValue(null)]
+        [Description("Indicates the Image to use for the TickMark.")]
+        public Image Image
+        {
+            get { return (_Image); }
+
+            set
+            {
+                if (_Image != value)
+                {
+                    _Image = value;
+
+                    OnTickMarkLayoutChanged();
+                }
+            }
+        }
+
+        #endregion
+
+        #region Length
+
+        /// <summary>
+        /// Gets or sets the Length of the TickMark, specified as a percentage
+        /// </summary>
+        [Browsable(true), Category("Layout")]
+        [Editor("DevComponents.Instrumentation.Design.RangeValueEditor, DevComponents.Instrumentation.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=76cb4c6eb576bca5", typeof(UITypeEditor))]
+        [Description("Indicates the Length of the TickMark, specified as a percentage.")]
+        public float Length
+        {
+            get { return (_Length); }
+
+            set
+            {
+                if (value < 0)
+                    throw new ArgumentException("Value can not be less than zero.");
+
+                if (_Length != value)
+                {
+                    _Length = value;
+
+                    OnTickMarkLayoutChanged();
+                }
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeLength()
+        {
+            return (_Length != _DefaultLength);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetLength()
+        {
+            Length = _DefaultLength;
+        }
+
+        #endregion
+
+        #region Placement
+
+        /// <summary>
+        /// Gets or sets the Placement of the TickMarks with respect to the Scale
+        /// </summary>
+        [Browsable(true)]
+        [Category("Layout"), DefaultValue(DisplayPlacement.Center)]
+        [Description("Indicates the Placement of the TickMarks with respect to the Scale.")]
+        public DisplayPlacement Placement
+        {
+            get { return (_Placement); }
+
+            set
+            {
+                if (_Placement != value)
+                {
+                    _Placement = value;
+
+                    OnTickMarkLayoutChanged();
+                }
+            }
+        }
+
+        #endregion
+
+        #region ScaleOffset
+
+        /// <summary>
+        /// Gets or sets the distance from the TickMark to the Scale, measured as a percentage
+        /// </summary>
+        [Browsable(true)]
+        [Category("Layout"), DefaultValue(0f)]
+        [Editor("DevComponents.Instrumentation.Design.OffsetRangeValueEditor, DevComponents.Instrumentation.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=76cb4c6eb576bca5", typeof(UITypeEditor))]
+        [Description("Indicates the distance from the TickMark to the Scale, measured as a percentage.")]
+        public float ScaleOffset
+        {
+            get { return (_ScaleOffset); }
+
+            set
+            {
+                if (_ScaleOffset != value)
+                {
+                    _ScaleOffset = value;
+
+                    OnTickMarkLayoutChanged();
+                }
+            }
+        }
+
+        #endregion
+
+        #region Style
+
+        /// <summary>
+        /// Gets or sets the TickMark Style
+        /// </summary>
+        [Browsable(true), Category("Appearance")]
+        [Description("Indicates the TickMark Style.")]
+        public GaugeMarkerStyle Style
+        {
+            get { return (_Style); }
+
+            set
+            {
+                if (_Style != value)
+                {
+                    _Style = value;
+
+                    OnTickMarkLayoutChanged();
+                }
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeStyle()
+        {
+            return (_Style != _DefaultStyle);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetStyle()
+        {
+            Style = _DefaultStyle;
+        }
+
+        #endregion
+
+        #region Overlap
+
+        /// <summary>
+        /// Gets or sets how the TickMark overlaps previous TickMarks
+        /// </summary>
+        [Browsable(true)]
+        [Category("Behavior"), DefaultValue(GaugeTickMarkOverlap.ReplaceAll)]
+        [Description("Indicates how the TickMark overlaps previous TickMarks.")]
+        public GaugeTickMarkOverlap Overlap
+        {
+            get { return (_Overlap); }
+
+            set
+            {
+                if (_Overlap != value)
+                {
+                    _Overlap = value;
+
+                    OnTickMarkLayoutChanged();
+                }
+            }
+        }
+
+        #endregion
+
+        #region Width
+
+        /// <summary>
+        /// Gets or sets the Width of the TickMark, specified as a percentage
+        /// </summary>
+        [Browsable(true)]
+        [Category("Layout")]
+        [Editor("DevComponents.Instrumentation.Design.WidthRangeValueEditor, DevComponents.Instrumentation.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=76cb4c6eb576bca5", typeof(UITypeEditor))]
+        [Description("Indicates the Width of the TickMark, specified as a percentage.")]
+        public float Width
+        {
+            get { return (_Width); }
+
+            set
+            {
+                if (value < 0)
+                    throw new ArgumentException("Value can not be less than zero.");
+
+                if (_Width != value)
+                {
+                    _Width = value;
+
+                    OnTickMarkLayoutChanged();
+                }
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeWidth()
+        {
+            return (_Width != _DefaultWidth);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetWidth()
+        {
+            Width = _DefaultWidth;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region Bitmap
+
+        internal Bitmap Bitmap
+        {
+            get { return (_Bitmap); }
+
+            set
+            {
+                if (_Bitmap != null)
+                    _Bitmap.Dispose();
+
+                _Bitmap = value;
+            }
+        }
+
+                #endregion
+
+        #endregion
+
+        #region HookEvents
+
+        private void HookEvents(bool hook)
+        {
+            if (hook == true)
+            {
+            }
+            else
+            {
+                if (_FillColor != null)
+                    _FillColor.ColorTableChanged -= FillColor_ColorTableChanged;
+            }
+        }
+
+        #endregion
+
+        #region Event processing
+
+        void FillColor_ColorTableChanged(object sender, EventArgs e)
+        {
+            OnTickMarkLayoutChanged();
+        }
+
+        #endregion
+
+        #region OnTickMarkLayoutChanged
+
+        protected virtual void OnTickMarkLayoutChanged()
+        {
+            if (TickMarkLayoutChanged != null)
+                TickMarkLayoutChanged(this, EventArgs.Empty);
+        }
+
+        #endregion
+
+        #region IDisposable Members
+
+        public void Dispose()
+        {
+            HookEvents(false);
+        }
+
+        #endregion
+
+        #region ICloneable Members
+
+        public virtual object Clone()
+        {
+            TickMarkLayout copy = new
+                TickMarkLayout(_Style, _Width, _Length);
+
+            CopyToItem(copy);
+
+            return (copy);
+        }
+
+        #endregion
+
+        #region CopyToItem
+
+        internal virtual void CopyToItem(TickMarkLayout copy)
+        {
+            if (_FillColor != null)
+                copy.FillColor = (GradientFillColor) _FillColor.Clone();
+
+            copy.Image = _Image;
+            copy.Length = _Length;
+            copy.Placement = _Placement;
+            copy.ScaleOffset = _ScaleOffset;
+            copy.Style = _Style;
+            copy.Overlap = _Overlap;
+            copy.Width = _Width;
+        }
+
+        #endregion
+    }
+
+    #region TickMarkLayoutConvertor
+
+    public class TickMarkLayoutConvertor : ExpandableObjectConverter
+    {
+        public override object ConvertTo(
+            ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+        {
+            if (destinationType == typeof(string))
+            {
+                TickMarkLayout layout = value as TickMarkLayout;
+
+                if (layout != null)
+                {
+                    return (String.Empty);
+                }
+            }
+
+            return (base.ConvertTo(context, culture, value, destinationType));
+        }
+    }
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeTickMark/TickPoint.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeTickMark/TickPoint.cs
new file mode 100644
index 00000000..e06f959e
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/GaugeTickMark/TickPoint.cs	
@@ -0,0 +1,95 @@
+using System;
+using System.Drawing;
+
+namespace DevComponents.Instrumentation
+{
+    internal class TickPoint : ICloneable
+    {
+        #region Private variables
+
+        private Point _Point;
+        private float _Angle;
+        private double _Interval;
+
+        private GaugeTickMarkBase _TickMark;
+
+        private bool _Visible = true;
+
+        #endregion
+
+        public TickPoint(GaugeTickMarkBase tickMark)
+        {
+            _TickMark = tickMark;
+        }
+
+        #region Public properties
+
+        #region Angle
+
+        public float Angle
+        {
+            get { return (_Angle); }
+            set { _Angle = value; }
+        }
+
+        #endregion
+
+        #region Point
+
+        public Point Point
+        {
+            get { return (_Point); }
+            set { _Point = value; }
+        }
+
+        #endregion
+
+        #region Interval
+
+        public double Interval
+        {
+            get { return (_Interval); }
+            set { _Interval = value; }
+        }
+
+        #endregion
+
+        #region TickMark
+
+        public GaugeTickMarkBase TickMark
+        {
+            get { return (_TickMark); }
+            set { _TickMark = value; }
+        }
+
+        #endregion
+
+        #region Visible
+
+        public bool Visible
+        {
+            get { return (_Visible); }
+            set { _Visible = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ICloneable Members
+
+        public object Clone()
+        {
+            TickPoint tp = new TickPoint(_TickMark);
+
+            tp.Point = _Point;
+            tp.Angle = _Angle;
+            tp.Interval = _Interval;
+            tp.Visible = _Visible;
+
+            return (tp);
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/Licensing.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/Licensing.cs
new file mode 100644
index 00000000..f5dae720
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/Licensing.cs	
@@ -0,0 +1,147 @@
+using System;
+using System.Drawing;
+
+namespace DevComponents.Instrumentation
+{
+    internal class Licensing
+    {
+#if !TRIAL
+        internal static bool KeyValidated;
+        internal static int KeyValidated2;
+
+        internal static bool ValidateLicenseKey(string key)
+        {
+            string[] parts = key.Split('-');
+            int i = 10;
+
+            foreach (string s in parts)
+            {
+                if (s == "88405280")
+                    i++;
+                else if (s == "D06E")
+                    i += 10;
+                else if (s == "4617")
+                    i += 8;
+                else if (s == "8810")
+                    i += 12;
+                else if (s == "64462F60FA93")
+                    i += 3;
+            }
+
+            if (i == 29)
+                return true;
+
+            KeyValidated = true;
+
+            return (false);
+        }
+
+        internal static bool CheckLicenseKey(string key)
+        {
+            // {F962CEC7-CD8F-4911-A9E9-CAB39962FC1F}, 114
+            string[] parts = key.Split('-');
+            int test = 0;
+
+            for (int i = parts.Length - 1; i >= 0; i--)
+            {
+                if (parts[i] == "CD8F")
+                    test += 12;
+                else if (parts[i] == "CAB39962FC1F")
+                    test += 2;
+                else if (parts[i] == "A9E9")
+                    test += 3;
+                else if (parts[i] == "4911")
+                    test += 7;
+                else if (parts[i] == "F962CEC7")
+                    test += 13;
+            }
+
+            KeyValidated2 = test + 77;
+
+            if (test == 23)
+                return false;
+
+            return true;
+        }
+#endif
+
+#if TRIAL
+		private static Color m_ColorExpFlag = Color.Empty;
+		internal static int ColorCountExp;
+
+		internal static bool ColorExpAlt()
+		{
+			Color clr=SystemColors.Control;
+			Color clr2;
+			Color clr3;
+			clr2=clr;
+
+			if(clr2.ToArgb()==clr.ToArgb())
+			{
+				clr3=clr2;
+			}
+			else
+			{
+				clr3=clr;
+			}
+
+			ColorCountExp=clr.A;
+
+			if(!m_ColorExpFlag.IsEmpty)
+			{
+				return (m_ColorExpFlag==Color.Black?false:true);
+			}
+			try
+			{
+				Microsoft.Win32.RegistryKey key=Microsoft.Win32.Registry.ClassesRoot;
+				key=key.CreateSubKey("CLSID\\{542FD3B2-2F65-4290-AB4F-EBFF0444C54C}\\InprocServer32");
+			
+				try
+				{
+					if(key.GetValue("")==null || key.GetValue("").ToString()=="")
+					{
+						key.SetValue("",DateTime.Today.ToOADate().ToString());
+					}
+					else
+					{
+						if(key.GetValue("").ToString()=="windows3.dll")
+						{
+							m_ColorExpFlag=Color.White;
+							key.Close();
+							key=null;
+							return true;
+						}
+						DateTime date=DateTime.FromOADate(double.Parse(key.GetValue("").ToString()));
+						if(((TimeSpan)DateTime.Today.Subtract(date)).TotalDays>30)
+						{
+							m_ColorExpFlag=Color.White;
+							key.SetValue("","windows3.dll");
+							key.Close();
+							key=null;
+							return true;
+						}
+						if(((TimeSpan)DateTime.Today.Subtract(date)).TotalDays<0)
+						{
+							m_ColorExpFlag=Color.White;
+							key.SetValue("","windows2.dll");
+							key.Close();
+							key=null;
+							return true;
+						}
+					}
+				}
+				finally
+				{
+					if(key!=null)
+						key.Close();
+				}
+			}
+			catch{}
+
+			m_ColorExpFlag=Color.Black;
+
+			return false;
+		}
+#endif
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/PointFConverter.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/PointFConverter.cs
new file mode 100644
index 00000000..2a013289
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/PointFConverter.cs	
@@ -0,0 +1,108 @@
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.Drawing;
+using System.Globalization;
+
+namespace DevComponents.Instrumentation.Primitives
+{
+    public class PointFConverter : ExpandableObjectConverter
+    {
+        #region CanConvertTo
+
+        public override bool CanConvertTo(
+            ITypeDescriptorContext context, Type destinationType)
+        {
+            if (destinationType == typeof(string))
+                return (true);
+
+            return (base.CanConvertTo(context, destinationType));
+        }
+
+        #endregion
+
+        #region ConvertTo
+
+        public override object ConvertTo(
+            ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+        {
+            if (destinationType == typeof(string))
+            {
+                PointF pf = (PointF)value;
+
+                return (String.Format("{0:f}, {1:f}", pf.X, pf.Y));
+            }
+
+            return (base.ConvertTo(context, culture, value, destinationType));
+        }
+
+        #endregion
+
+        #region CanConvertFrom
+
+        public override bool CanConvertFrom(
+            ITypeDescriptorContext context, Type sourceType)
+        {
+            if (sourceType == typeof(string))
+                return (true);
+
+            return (base.CanConvertFrom(context, sourceType));
+        }
+
+        #endregion
+
+        #region ConvertFrom
+
+        public override object ConvertFrom(
+            ITypeDescriptorContext context, CultureInfo culture, object value)
+        {
+            if (value is string)
+            {
+                string[] values = ((string)value).Split(',');
+
+                if (values.Length != 2)
+                    throw new ArgumentException("Invalid value to convert.");
+
+                try
+                {
+                    float x = float.Parse(values[0]);
+                    float y = float.Parse(values[1]);
+
+                    PointF pf = new PointF(x, y);
+
+                    return (pf);
+                }
+                catch (Exception exp)
+                {
+                    throw new ArgumentException("Invalid value to convert.");
+                }
+            }
+
+            return base.ConvertFrom(context, culture, value);
+        }
+
+        #endregion
+
+        #region GetCreateInstanceSupported
+
+        public override bool GetCreateInstanceSupported(ITypeDescriptorContext context)
+        {
+            return (true);
+        }
+
+        #endregion
+
+        #region CreateInstance
+
+        public override object CreateInstance(
+            ITypeDescriptorContext context, IDictionary propertyValues)
+        {
+            if (propertyValues != null)
+                return (new PointF((float)propertyValues["X"], (float)propertyValues["Y"]));
+
+            return (null);
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/RemindForm.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/RemindForm.cs
new file mode 100644
index 00000000..02c4036e
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/RemindForm.cs	
@@ -0,0 +1,285 @@
+using System;
+using System.Drawing;
+using System.ComponentModel;
+using System.Windows.Forms;
+
+namespace DevComponents
+{
+	/// <summary>
+	/// Summary description for RemindForm.
+	/// </summary>
+	internal class RemindForm : Form
+	{
+		private Label label1;
+		private Label label2;
+		private Button button1;
+		private Button button2;
+		private Timer timer1;
+		private Label label3;
+		private Label label4;
+		private GroupBox groupBox1;
+		private Label label5;
+		private Label label6;
+		private LinkLabel linkOrder;
+		private Label label7;
+		private LinkLabel linkEmail;
+		private LinkLabel linkHome;
+		private IContainer components;
+
+		public RemindForm()
+		{
+			//
+			// Required for Windows Form Designer support
+			//
+			InitializeComponent();
+
+			label2.Text="(c) "+System.DateTime.Now.Year.ToString()+" by DevComponents, All Rights Reserved.";
+		}
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		protected override void Dispose( bool disposing )
+		{
+			if( disposing )
+			{
+				if(components != null)
+				{
+					components.Dispose();
+				}
+			}
+			base.Dispose( disposing );
+		}
+
+        static DateTime _LastShown = DateTime.MinValue;
+        public new void ShowDialog()
+        {
+            if (_LastShown != DateTime.MinValue)
+            {
+                if (_LastShown.Subtract(DateTime.Now).TotalMinutes < 15)
+                    return;
+            }
+            _LastShown = DateTime.Now;
+            base.ShowDialog();
+        }
+
+		#region Windows Form 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.label1 = new System.Windows.Forms.Label();
+			this.label2 = new System.Windows.Forms.Label();
+			this.button1 = new System.Windows.Forms.Button();
+			this.button2 = new System.Windows.Forms.Button();
+			this.timer1 = new System.Windows.Forms.Timer(this.components);
+			this.linkEmail = new System.Windows.Forms.LinkLabel();
+			this.label3 = new System.Windows.Forms.Label();
+			this.label4 = new System.Windows.Forms.Label();
+			this.linkHome = new System.Windows.Forms.LinkLabel();
+			this.groupBox1 = new System.Windows.Forms.GroupBox();
+			this.label7 = new System.Windows.Forms.Label();
+			this.linkOrder = new System.Windows.Forms.LinkLabel();
+			this.label6 = new System.Windows.Forms.Label();
+			this.label5 = new System.Windows.Forms.Label();
+			this.groupBox1.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// label1
+			// 
+			this.label1.AutoSize = true;
+			this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((System.Byte)(0)));
+			this.label1.Location = new System.Drawing.Point(12, 8);
+			this.label1.Name = "label1";
+			this.label1.Size = new System.Drawing.Size(252, 15);
+			this.label1.TabIndex = 0;
+			this.label1.Text = "DevComponents DotNetBar Component";
+			// 
+			// label2
+			// 
+			this.label2.AutoSize = true;
+			this.label2.Location = new System.Drawing.Point(10, 32);
+			this.label2.Name = "label2";
+			this.label2.Size = new System.Drawing.Size(307, 13);
+			this.label2.TabIndex = 1;
+			this.label2.Text = "(c) 2001-2004 by DevComponents.com, All Rights Reserved";
+			// 
+			// button1
+			// 
+			this.button1.Enabled = false;
+			this.button1.Location = new System.Drawing.Point(10, 242);
+			this.button1.Name = "button1";
+			this.button1.Size = new System.Drawing.Size(72, 24);
+			this.button1.TabIndex = 0;
+			this.button1.Text = "OK";
+			this.button1.Click += new System.EventHandler(this.button1_Click);
+			// 
+			// button2
+			// 
+			this.button2.Location = new System.Drawing.Point(89, 242);
+			this.button2.Name = "button2";
+			this.button2.Size = new System.Drawing.Size(72, 24);
+			this.button2.TabIndex = 3;
+			this.button2.Text = "Buy Now";
+			this.button2.Click += new System.EventHandler(this.button2_Click);
+			// 
+			// timer1
+			// 
+			this.timer1.Enabled = true;
+			this.timer1.Interval = 800;
+			this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
+			// 
+			// linkEmail
+			// 
+			this.linkEmail.Location = new System.Drawing.Point(52, 200);
+			this.linkEmail.Name = "linkEmail";
+			this.linkEmail.Size = new System.Drawing.Size(145, 16);
+			this.linkEmail.TabIndex = 4;
+			this.linkEmail.TabStop = true;
+			this.linkEmail.Text = "info@devcomponents.com";
+			this.linkEmail.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkEmail_LinkClicked);
+			// 
+			// label3
+			// 
+			this.label3.AutoSize = true;
+			this.label3.Location = new System.Drawing.Point(12, 201);
+			this.label3.Name = "label3";
+			this.label3.Size = new System.Drawing.Size(40, 13);
+			this.label3.TabIndex = 5;
+			this.label3.Text = "E-Mail:";
+			// 
+			// label4
+			// 
+			this.label4.AutoSize = true;
+			this.label4.Location = new System.Drawing.Point(13, 217);
+			this.label4.Name = "label4";
+			this.label4.Size = new System.Drawing.Size(31, 13);
+			this.label4.TabIndex = 7;
+			this.label4.Text = "Web:";
+			// 
+			// linkHome
+			// 
+			this.linkHome.Location = new System.Drawing.Point(53, 216);
+			this.linkHome.Name = "linkHome";
+			this.linkHome.Size = new System.Drawing.Size(145, 16);
+			this.linkHome.TabIndex = 6;
+			this.linkHome.TabStop = true;
+			this.linkHome.Text = "www.devcomponents.com";
+			this.linkHome.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkHome_LinkClicked);
+			// 
+			// groupBox1
+			// 
+			this.groupBox1.Controls.AddRange(new System.Windows.Forms.Control[] {
+																					this.label7,
+																					this.linkOrder,
+																					this.label6,
+																					this.label5});
+			this.groupBox1.Location = new System.Drawing.Point(14, 55);
+			this.groupBox1.Name = "groupBox1";
+			this.groupBox1.Size = new System.Drawing.Size(294, 135);
+			this.groupBox1.TabIndex = 8;
+			this.groupBox1.TabStop = false;
+			// 
+			// label7
+			// 
+			this.label7.Location = new System.Drawing.Point(3, 104);
+			this.label7.Name = "label7";
+			this.label7.Size = new System.Drawing.Size(285, 12);
+			this.label7.TabIndex = 3;
+			this.label7.Text = "Order at:";
+			this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+			// 
+			// linkOrder
+			// 
+			this.linkOrder.Location = new System.Drawing.Point(6, 116);
+			this.linkOrder.Name = "linkOrder";
+			this.linkOrder.Size = new System.Drawing.Size(280, 15);
+			this.linkOrder.TabIndex = 2;
+			this.linkOrder.TabStop = true;
+			this.linkOrder.Text = "http://www.devcomponents.com/dotnetbar/order.html";
+			this.linkOrder.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+			this.linkOrder.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkOrder_LinkClicked);
+			// 
+			// label6
+			// 
+			this.label6.Location = new System.Drawing.Point(9, 72);
+			this.label6.Name = "label6";
+			this.label6.Size = new System.Drawing.Size(276, 31);
+			this.label6.TabIndex = 1;
+			this.label6.Text = "For pricing and licensing information please visit our web site. ";
+			// 
+			// label5
+			// 
+			this.label5.ForeColor = System.Drawing.Color.Maroon;
+			this.label5.Location = new System.Drawing.Point(8, 20);
+			this.label5.Name = "label5";
+			this.label5.Size = new System.Drawing.Size(276, 41);
+			this.label5.TabIndex = 0;
+			this.label5.Text = "This component is not registered and it is provided for evaluation purposes only." +
+				" This message will not appear after you register the component.";
+			// 
+			// RemindForm
+			// 
+			this.BackColor=Color.WhiteSmoke;
+			this.AcceptButton = this.button1;
+			this.AutoScaleBaseSize = new System.Drawing.Size(5, 13);
+			this.ClientSize = new System.Drawing.Size(321, 273);
+			this.ControlBox = false;
+			this.Controls.AddRange(new System.Windows.Forms.Control[] {
+																		  this.groupBox1,
+																		  this.label4,
+																		  this.label3,
+																		  this.label2,
+																		  this.label1,
+																		  this.linkHome,
+																		  this.linkEmail,
+																		  this.button2,
+																		  this.button1});
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.Name = "RemindForm";
+			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+			this.Text = "Component not registered";
+			this.groupBox1.ResumeLayout(false);
+			this.ResumeLayout(false);
+
+		}
+		#endregion
+
+		private void timer1_Tick(object sender, System.EventArgs e)
+		{
+			timer1.Enabled=false;
+			button1.Enabled=true;
+			button1.Focus();
+		}
+
+		private void button2_Click(object sender, System.EventArgs e)
+		{
+			System.Diagnostics.Process.Start(linkOrder.Text);
+		}
+
+		private void button1_Click(object sender, System.EventArgs e)
+		{
+			this.Close();
+		}
+
+		private void linkHome_LinkClicked(object sender, System.Windows.Forms.LinkLabelLinkClickedEventArgs e)
+		{
+			System.Diagnostics.Process.Start("http://www.devcomponents.com");
+		}
+
+		private void linkEmail_LinkClicked(object sender, System.Windows.Forms.LinkLabelLinkClickedEventArgs e)
+		{
+			System.Diagnostics.Process.Start("mailto:info@devcomponents.com");
+		}
+
+		private void linkOrder_LinkClicked(object sender, System.Windows.Forms.LinkLabelLinkClickedEventArgs e)
+		{
+			System.Diagnostics.Process.Start(linkOrder.Text);
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/RemindForm.resx b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/RemindForm.resx
new file mode 100644
index 00000000..55578e95
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/Gauges/RemindForm.resx	
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+            Microsoft ResX Schema 
+        
+            Version 1.3
+                
+            The primary goals of this format is to allow a simple XML format 
+            that is mostly human readable. The generation and parsing of the 
+            various data types are done through the TypeConverter classes 
+            associated with the data types.
+        
+            Example:
+        
+                ... ado.net/XML headers & schema ...
+                <resheader name="resmimetype">text/microsoft-resx</resheader>
+                <resheader name="version">1.3</resheader>
+                <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+                <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+                <data name="Name1">this is my long string</data>
+                <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+                <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+                    [base64 mime encoded serialized .NET Framework object]
+                </data>
+                <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+                    [base64 mime encoded string representing a byte array form of the .NET Framework object]
+                </data>
+        
+            There are any number of "resheader" rows that contain simple 
+            name/value pairs.
+            
+            Each data row contains a name, and value. The row also contains a 
+            type or mimetype. Type corresponds to a .NET class that support 
+            text/value conversion through the TypeConverter architecture. 
+            Classes that don't support this are serialized and stored with the 
+            mimetype set.
+                     
+            The mimetype is used for serialized objects, and tells the 
+            ResXResourceReader how to depersist the object. This is currently not 
+            extensible. For a given mimetype the value must be set accordingly:
+        
+            Note - application/x-microsoft.net.object.binary.base64 is the format 
+                   that the ResXResourceWriter will generate, however the reader can 
+                   read any of the formats listed below.
+        
+            mimetype: application/x-microsoft.net.object.binary.base64
+            value   : The object must be serialized with 
+                    : System.Serialization.Formatters.Binary.BinaryFormatter
+                    : and then encoded with base64 encoding.
+        
+            mimetype: application/x-microsoft.net.object.soap.base64
+            value   : The object must be serialized with 
+                    : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+                    : and then encoded with base64 encoding.
+            mimetype: application/x-microsoft.net.object.bytearray.base64
+            value   : The object must be serialized into a byte array 
+                    : using a System.ComponentModel.TypeConverter
+                    : and then encoded with base64 encoding.
+        -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>1.3</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="timer1.Location" type="System.Drawing.Point, System.Drawing, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </data>
+  <data name="$this.Name">
+    <value>RemindForm</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControl.ico b/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControl.ico
new file mode 100644
index 00000000..482f6f20
Binary files /dev/null and b/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControl.ico differ
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/FormatStringDropDown.Designer.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/FormatStringDropDown.Designer.cs
new file mode 100644
index 00000000..94d28584
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/FormatStringDropDown.Designer.cs	
@@ -0,0 +1,178 @@
+namespace DevComponents.Instrumentation.Design
+{
+    partial class FormatStringDropDown
+    {
+        /// <summary> 
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #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._CbxFmtType = new System.Windows.Forms.ComboBox();
+            this._LbFmtType = new System.Windows.Forms.Label();
+            this._LbPrecision = new System.Windows.Forms.Label();
+            this._LbSample = new System.Windows.Forms.Label();
+            this._TbSample = new System.Windows.Forms.TextBox();
+            this._LbDescription = new System.Windows.Forms.Label();
+            this._TbCustom = new System.Windows.Forms.TextBox();
+            this._TbPrecision = new System.Windows.Forms.TextBox();
+            this._BtnOk = new System.Windows.Forms.Button();
+            this._BtnCancel = new System.Windows.Forms.Button();
+            this.SuspendLayout();
+            // 
+            // _CbxFmtType
+            // 
+            this._CbxFmtType.FormattingEnabled = true;
+            this._CbxFmtType.Location = new System.Drawing.Point(95, 17);
+            this._CbxFmtType.Name = "_CbxFmtType";
+            this._CbxFmtType.Size = new System.Drawing.Size(223, 21);
+            this._CbxFmtType.TabIndex = 0;
+            this._CbxFmtType.SelectedIndexChanged += new System.EventHandler(this.CbxFmtType_SelectedIndexChanged);
+            this._CbxFmtType.PreviewKeyDown += new System.Windows.Forms.PreviewKeyDownEventHandler(this.MyPreviewKeyDown);
+            // 
+            // _LbFmtType
+            // 
+            this._LbFmtType.AutoSize = true;
+            this._LbFmtType.Location = new System.Drawing.Point(20, 20);
+            this._LbFmtType.Name = "_LbFmtType";
+            this._LbFmtType.Size = new System.Drawing.Size(69, 13);
+            this._LbFmtType.TabIndex = 1;
+            this._LbFmtType.Text = "Format Type:";
+            // 
+            // _LbPrecision
+            // 
+            this._LbPrecision.AutoSize = true;
+            this._LbPrecision.Location = new System.Drawing.Point(20, 44);
+            this._LbPrecision.Name = "_LbPrecision";
+            this._LbPrecision.Size = new System.Drawing.Size(53, 13);
+            this._LbPrecision.TabIndex = 2;
+            this._LbPrecision.Text = "Precision:";
+            // 
+            // _LbSample
+            // 
+            this._LbSample.AutoSize = true;
+            this._LbSample.Location = new System.Drawing.Point(20, 70);
+            this._LbSample.Name = "_LbSample";
+            this._LbSample.Size = new System.Drawing.Size(45, 13);
+            this._LbSample.TabIndex = 4;
+            this._LbSample.Text = "Sample:";
+            // 
+            // _TbSample
+            // 
+            this._TbSample.BackColor = System.Drawing.SystemColors.Info;
+            this._TbSample.ForeColor = System.Drawing.Color.Black;
+            this._TbSample.Location = new System.Drawing.Point(95, 70);
+            this._TbSample.Name = "_TbSample";
+            this._TbSample.Size = new System.Drawing.Size(223, 20);
+            this._TbSample.TabIndex = 5;
+            this._TbSample.Text = "1234.56";
+            this._TbSample.PreviewKeyDown += new System.Windows.Forms.PreviewKeyDownEventHandler(this.MyPreviewKeyDown);
+            this._TbSample.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.TextBoxKeyPress);
+            // 
+            // _LbDescription
+            // 
+            this._LbDescription.Location = new System.Drawing.Point(15, 97);
+            this._LbDescription.Name = "_LbDescription";
+            this._LbDescription.Size = new System.Drawing.Size(391, 125);
+            this._LbDescription.TabIndex = 6;
+            this._LbDescription.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // _TbCustom
+            // 
+            this._TbCustom.Location = new System.Drawing.Point(95, 44);
+            this._TbCustom.Name = "_TbCustom";
+            this._TbCustom.Size = new System.Drawing.Size(223, 20);
+            this._TbCustom.TabIndex = 7;
+            this._TbCustom.Visible = false;
+            this._TbCustom.TextChanged += new System.EventHandler(this.MyTextChanged);
+            this._TbCustom.PreviewKeyDown += new System.Windows.Forms.PreviewKeyDownEventHandler(this.MyPreviewKeyDown);
+            // 
+            // _TbPrecision
+            // 
+            this._TbPrecision.Location = new System.Drawing.Point(95, 44);
+            this._TbPrecision.Name = "_TbPrecision";
+            this._TbPrecision.Size = new System.Drawing.Size(223, 20);
+            this._TbPrecision.TabIndex = 8;
+            this._TbPrecision.Visible = false;
+            this._TbPrecision.TextChanged += new System.EventHandler(this.MyTextChanged);
+            this._TbPrecision.PreviewKeyDown += new System.Windows.Forms.PreviewKeyDownEventHandler(this.MyPreviewKeyDown);
+            // 
+            // _BtnOk
+            // 
+            this._BtnOk.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this._BtnOk.Location = new System.Drawing.Point(336, 26);
+            this._BtnOk.Name = "_BtnOk";
+            this._BtnOk.Size = new System.Drawing.Size(61, 23);
+            this._BtnOk.TabIndex = 9;
+            this._BtnOk.Text = "Ok";
+            this._BtnOk.UseVisualStyleBackColor = true;
+            this._BtnOk.PreviewKeyDown += new System.Windows.Forms.PreviewKeyDownEventHandler(this.MyPreviewKeyDown);
+            this._BtnOk.Click += new System.EventHandler(this.BtnOk_Click);
+            // 
+            // _BtnCancel
+            // 
+            this._BtnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+            this._BtnCancel.Location = new System.Drawing.Point(336, 55);
+            this._BtnCancel.Name = "_BtnCancel";
+            this._BtnCancel.Size = new System.Drawing.Size(61, 23);
+            this._BtnCancel.TabIndex = 10;
+            this._BtnCancel.Text = "Cancel";
+            this._BtnCancel.UseVisualStyleBackColor = true;
+            this._BtnCancel.PreviewKeyDown += new System.Windows.Forms.PreviewKeyDownEventHandler(this.MyPreviewKeyDown);
+            this._BtnCancel.Click += new System.EventHandler(this.BtnCancel_Click);
+            // 
+            // FormatStringDropDown
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.Controls.Add(this._BtnCancel);
+            this.Controls.Add(this._BtnOk);
+            this.Controls.Add(this._TbPrecision);
+            this.Controls.Add(this._LbDescription);
+            this.Controls.Add(this._TbSample);
+            this.Controls.Add(this._LbSample);
+            this.Controls.Add(this._LbPrecision);
+            this.Controls.Add(this._LbFmtType);
+            this.Controls.Add(this._CbxFmtType);
+            this.Controls.Add(this._TbCustom);
+            this.Name = "FormatStringDropDown";
+            this.Size = new System.Drawing.Size(418, 222);
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.ComboBox _CbxFmtType;
+        private System.Windows.Forms.Label _LbFmtType;
+        private System.Windows.Forms.Label _LbPrecision;
+        private System.Windows.Forms.Label _LbSample;
+        private System.Windows.Forms.TextBox _TbSample;
+        private System.Windows.Forms.Label _LbDescription;
+        private System.Windows.Forms.TextBox _TbCustom;
+        private System.Windows.Forms.TextBox _TbPrecision;
+        private System.Windows.Forms.Button _BtnOk;
+        private System.Windows.Forms.Button _BtnCancel;
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/FormatStringDropDown.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/FormatStringDropDown.cs
new file mode 100644
index 00000000..bd7030ef
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/FormatStringDropDown.cs	
@@ -0,0 +1,322 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Windows.Forms;
+using System.Windows.Forms.Design;
+using DevComponents.DotNetBarKnobControl.Design.Properties;
+
+namespace DevComponents.Instrumentation.Design
+{
+    [ToolboxItem(false)]
+    public partial class FormatStringDropDown : UserControl
+    {
+        #region Private variables
+
+        private string _FormatString;
+        private bool _EscapePressed;
+
+        private IWindowsFormsEditorService _EditorService;
+        private ITypeDescriptorContext _Context;
+
+        private string[] _Items = new string[] {
+                "Custom",
+                "Currency",
+                "Decimal",
+                "Fixed-point",
+                "General",
+                "Hexadecimal",
+                "Number",
+                "Percent",
+                "Scientific"};
+
+        private Format[] _Formats = new Format[] {
+                new Format("",  (string)(Resources.ResourceManager.GetObject("CustomDesc"))),
+                new Format("C", (string)(Resources.ResourceManager.GetObject("CurrencyDesc"))),
+                new Format("D", (string)(Resources.ResourceManager.GetObject("DecimalDesc"))),
+                new Format("F", (string)(Resources.ResourceManager.GetObject("FixedPointDesc"))),
+                new Format("G", (string)(Resources.ResourceManager.GetObject("GeneralDesc"))),
+                new Format("X", (string)(Resources.ResourceManager.GetObject("HexadecimalDesc"))),
+                new Format("N", (string)(Resources.ResourceManager.GetObject("NumericDesc"))),
+                new Format("P", (string)(Resources.ResourceManager.GetObject("PercentDesc"))),
+                new Format("E", (string)(Resources.ResourceManager.GetObject("ExponentialDesc")))};
+
+        #endregion
+
+        public FormatStringDropDown()
+        {
+            InitFormatList();
+        }
+
+        public FormatStringDropDown(string formatString,
+            IWindowsFormsEditorService editorService, ITypeDescriptorContext context)
+        {
+            _FormatString = formatString;
+
+            _EditorService = editorService;
+            _Context = context;
+
+            InitFormatList();
+
+            BackColor = SystemColors.Control;
+        }
+
+        #region InitFormatList
+
+        private void InitFormatList()
+        {
+            InitializeComponent();
+
+            _CbxFmtType.DrawMode = DrawMode.OwnerDrawFixed;
+            _CbxFmtType.DrawItem += CbxFmtType_DrawItem;
+
+            _CbxFmtType.Items.AddRange(_Items);
+            _CbxFmtType.SelectedIndex = 3;
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region FormatString
+
+        public string FormatString
+        {
+            get { return (_FormatString); }
+
+            set
+            {
+                _FormatString = value;
+
+                _Context.OnComponentChanging();
+                _Context.PropertyDescriptor.SetValue(_Context.Instance, value);
+                _Context.OnComponentChanged();
+
+                Invalidate();
+            }
+        }
+
+        #endregion
+
+        #region EditorService
+
+        public IWindowsFormsEditorService EditorService
+        {
+            get { return (_EditorService); }
+            set { _EditorService = value; }
+        }
+
+        #endregion
+
+        #region EscapePressed
+
+        public bool EscapePressed
+        {
+            get { return (_EscapePressed); }
+            set { _EscapePressed = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region CbxFmtType_DrawItem
+
+        void CbxFmtType_DrawItem(object sender, DrawItemEventArgs e)
+        {
+            e.DrawBackground();
+
+            if (e.Index == 0)
+            {
+                e.Graphics.DrawLine(Pens.Gainsboro, new Point(e.Bounds.Left, e.Bounds.Bottom - 1),
+                                    new Point(e.Bounds.Right, e.Bounds.Bottom - 1));
+            }
+
+            TextRenderer.DrawText(e.Graphics, _CbxFmtType.Items[e.Index].ToString(),
+                                  _CbxFmtType.Font, e.Bounds, _CbxFmtType.ForeColor, TextFormatFlags.Left);
+
+            e.DrawFocusRectangle();
+        }
+
+        #endregion
+
+        #region TextBoxKeyPress
+
+        private void TextBoxKeyPress(object sender, KeyPressEventArgs e)
+        {
+            e.Handled = true;
+        }
+
+        #endregion
+
+        #region CbxFmtType_SelectedIndexChanged
+
+        private void CbxFmtType_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            if ((uint)_CbxFmtType.SelectedIndex < _Formats.Length)
+            {
+                Format fmt = _Formats[_CbxFmtType.SelectedIndex];
+
+                _LbDescription.Text = fmt.Description;
+
+                UpdateSample();
+            }
+            else
+            {
+                _TbSample.Text = "";
+                _LbDescription.Text = "";
+            }
+        }
+
+        #endregion
+
+        #region UpdateSample
+
+        private void UpdateSample()
+        {
+            if (_CbxFmtType.SelectedIndex == 0)
+            {
+                _TbCustom.Visible = true;
+                _TbPrecision.Visible = false;
+                _LbPrecision.Text = @"Format String:";
+
+                UpdateCustomSample();
+            }
+            else if (_CbxFmtType.SelectedIndex > 0)
+            {
+                _TbPrecision.Visible = true;
+                _TbCustom.Visible = false;
+                _LbPrecision.Text = @"Precision:";
+
+                UpdateNumericSample();
+            }
+        }
+
+        #endregion
+
+        #region UpdateCustomSample
+
+        private void UpdateCustomSample()
+        {
+            _FormatString = _TbCustom.Text;
+
+            try
+            {
+                _TbSample.Text = String.Format("{0:" + _FormatString + "}", 1234567890);
+            }
+            catch
+            {
+                _TbSample.Text = @"Invalid Format String.";
+            }
+        }
+
+        #endregion
+
+        #region UpdateNumericSample
+
+        private void UpdateNumericSample()
+        {
+            Format fmt = _Formats[_CbxFmtType.SelectedIndex];
+
+            try
+            {
+                int precision = GetPrecision();
+
+                _FormatString = fmt.FormatCode + precision.ToString();
+
+                _TbSample.Text = String.Format("{0:" + _FormatString + "}", 1234567890);
+            }
+            catch
+            {
+                _TbSample.Text = @"Invalid Format String.";
+            }
+        }
+
+        #endregion
+
+        #region GetPrecision
+
+        private int GetPrecision()
+        {
+            int precision;
+
+            if (int.TryParse(_TbPrecision.Text, out precision))
+                return (precision < 0 ? 0 : precision > 99 ? 99 : precision);
+
+            return (0);
+        }
+
+        #endregion
+
+        #region MyTextChanged
+
+        private void MyTextChanged(object sender, EventArgs e)
+        {
+            UpdateSample();
+        }
+
+        #endregion
+
+        #region BtnOk_Click
+
+        private void BtnOk_Click(object sender, EventArgs e)
+        {
+            _EditorService.CloseDropDown();
+        }
+
+        #endregion
+
+        #region BtnCancel_Click
+
+        private void BtnCancel_Click(object sender, EventArgs e)
+        {
+            _EscapePressed = true;
+            _EditorService.CloseDropDown();
+        }
+
+        #endregion
+
+        #region MyPreviewKeyDown
+
+        private void MyPreviewKeyDown(object sender, PreviewKeyDownEventArgs e)
+        {
+            if (e.KeyCode == Keys.Escape)
+                _EscapePressed = true;
+        }
+
+        #endregion
+
+        #region Format
+
+        private class Format
+        {
+            #region Private variables
+
+            private string _FormatCode;
+            private string _Description;
+
+            #endregion
+
+            public Format(string formatCode, string description)
+            {
+                _FormatCode = formatCode;
+                _Description = description;
+            }
+
+            #region Public properties
+
+            public string FormatCode
+            {
+                get { return (_FormatCode); }
+            }
+
+            public string Description
+            {
+                get { return (_Description); }
+            }
+
+            #endregion
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/FormatStringDropDown.resx b/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/FormatStringDropDown.resx
new file mode 100644
index 00000000..19dc0dd8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/FormatStringDropDown.resx	
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/FormatStringEditor.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/FormatStringEditor.cs
new file mode 100644
index 00000000..17e310c5
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/FormatStringEditor.cs	
@@ -0,0 +1,59 @@
+using System;
+using System.ComponentModel;
+using System.Drawing.Design;
+using System.Windows.Forms.Design;
+
+namespace DevComponents.Instrumentation.Design
+{
+    public class FormatStringEditor : UITypeEditor
+    {
+        #region GetEditStyle
+
+        public override UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext context)
+        {
+            return (UITypeEditorEditStyle.DropDown);
+        }
+
+        #endregion
+
+        #region GetPaintValueSupported
+
+        public override bool GetPaintValueSupported(ITypeDescriptorContext context)
+        {
+            return (false);
+        }
+
+        #endregion
+
+        #region EditValue
+
+        public override object EditValue(
+            ITypeDescriptorContext context, IServiceProvider provider, object value)
+        {
+            if (provider != null)
+            {
+                IWindowsFormsEditorService editorService =
+                    provider.GetService(typeof(IWindowsFormsEditorService)) as IWindowsFormsEditorService;
+
+                if (editorService != null)
+                {
+                    FormatStringDropDown fs = new
+                        FormatStringDropDown((string)value, editorService, context);
+
+                    fs.EscapePressed = false;
+
+                    editorService.DropDownControl(fs);
+
+                    if (fs.EscapePressed == true)
+                        context.PropertyDescriptor.SetValue(context.Instance, value);
+                    else
+                        return (fs.FormatString);
+                }
+            }
+
+            return (base.EditValue(context, provider, value));
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/GaugeCollectionEditor.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/GaugeCollectionEditor.cs
new file mode 100644
index 00000000..9ff6dcd3
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/GaugeCollectionEditor.cs	
@@ -0,0 +1,738 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.Design;
+using System.Drawing;
+using System.Reflection;
+using System.Resources;
+using System.Windows.Forms;
+using DevComponents.DotNetBarKnobControl.Design.Properties;
+
+namespace DevComponents.Instrumentation.Design
+{
+    public class GaugeCollectionEditor : CollectionEditor
+    {
+        #region Private variables
+
+        private ListBox _ListBox;
+        private GaugeItem _GaugeItem;
+        private GaugeItem _LastGaugeItem;
+        private PropertyGrid _PropertyGrid;
+
+        private Button _AddButton;
+        private Button _RemButton;
+        private Button _CopyButton;
+        private ToolTip _ToolTip;
+
+        private List<GaugeItem> _RemovedItems;
+
+        #endregion
+
+        public GaugeCollectionEditor(Type type)
+            : base(type)
+        {
+        }
+
+        #region Private properties
+
+        #region RemovedItems
+
+        private List<GaugeItem> RemovedItems
+        {
+            get
+            {
+                if (_RemovedItems == null)
+                    _RemovedItems = new List<GaugeItem>();
+
+                return (_RemovedItems);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region CreateCollectionForm
+
+        protected override CollectionForm CreateCollectionForm()
+        {
+            CollectionForm collectionForm = base.CreateCollectionForm();
+
+            _GaugeItem = null;
+
+            if (collectionForm.Controls[0] is TableLayoutPanel)
+            {
+                TableLayoutPanel tlpf = collectionForm.Controls["overArchingTableLayoutPanel"] as TableLayoutPanel;
+
+                if (tlpf != null)
+                {
+                    TableLayoutPanel tlp2 = tlpf.Controls["addRemoveTableLayoutPanel"] as TableLayoutPanel;
+
+                    if (tlp2 != null)
+                    {
+                        _RemButton = tlp2.Controls["removeButton"] as Button;
+
+                        if (_RemButton != null)
+                            _RemButton.Click += GaugeCollectionEditor_RemoveClick;
+
+                        _AddButton = tlp2.Controls["addButton"] as Button;
+
+                        if (_AddButton != null)
+                        {
+                            _AddButton.Click += GaugeCollectionEditor_AddClick;
+
+                            AddCopyButton(collectionForm);
+                        }
+                    }
+
+                    _ListBox = tlpf.Controls["listbox"] as ListBox;
+
+                    if (_ListBox != null)
+                        _ListBox.SelectedIndexChanged += ListBox_SelectedIndexChanged;
+
+                    _PropertyGrid = tlpf.Controls["propertyBrowser"] as PropertyGrid;
+
+                    if (_PropertyGrid != null)
+                        _PropertyGrid.HelpVisible = true;
+                }
+            }
+
+            return (collectionForm);
+        }
+
+        #endregion
+
+        #region CancelChanges
+
+        protected override void CancelChanges()
+        {
+            if (_RemovedItems != null)
+            {
+                foreach (GaugeItem gi in _RemovedItems)
+                    gi.Visible = true;
+            }
+
+            base.CancelChanges();
+        }
+
+        #endregion
+
+        #region CopyButton support
+
+        #region AddCopyButton
+
+        private void AddCopyButton(CollectionForm collectionForm)
+        {
+            _CopyButton = new Button();
+
+            _CopyButton.Size = new Size(23, 24);
+            _CopyButton.Enabled = false;
+            _CopyButton.Click += CopyButton_Click;
+
+            ResourceManager rm = Resources.ResourceManager;
+            _CopyButton.Image = (Image)rm.GetObject("Copy");
+
+            collectionForm.Controls.Add(_CopyButton);
+
+            _CopyButton.Location = new Point(208, 85);
+            _CopyButton.BringToFront();
+
+            _ToolTip = new ToolTip();
+            _ToolTip.SetToolTip(_CopyButton, "Clone the selected item");
+        }
+
+        #endregion
+
+        #region CopyButton_Click
+
+        #region CopyButton_Click
+
+        void CopyButton_Click(object sender, EventArgs e)
+        {
+            if (_GaugeItem != null)
+            {
+                if (_GaugeItem is GaugeCircularScale)
+                    CopyCircularScale(_GaugeItem as GaugeCircularScale);
+
+                else if (_GaugeItem is GaugeLinearScale)
+                    CopyLinearScale(_GaugeItem as GaugeLinearScale);
+
+                else if (_GaugeItem is GaugeSection)
+                    CopySection(_GaugeItem as GaugeSection);
+
+                else if (_GaugeItem is GaugeRange)
+                    CopyRange(_GaugeItem as GaugeRange);
+
+                else if (_GaugeItem is GaugeCustomLabel)
+                    CopyLabel(_GaugeItem as GaugeCustomLabel);
+
+                else if (_GaugeItem is GaugePointer)
+                    CopyPointer(_GaugeItem as GaugePointer);
+
+                else if (_GaugeItem is NumericRange)
+                    CopyNumericRange(_GaugeItem as NumericRange);
+
+                else if (_GaugeItem is StateRange)
+                    CopyStateRange(_GaugeItem as StateRange);
+            }
+        }
+
+        #endregion
+
+        #region CopyCircularScale
+
+        private void CopyCircularScale(GaugeCircularScale scale)
+        {
+            if (_AddButton != null)
+            {
+                _AddButton.PerformClick();
+
+                GaugeCircularScaleCollection css = scale.GaugeControl.CircularScales;
+                GaugeCircularScale clone = css[css.Count - 1];
+
+                scale.CopyToItem(clone);
+            }
+        }
+
+        #endregion
+
+        #region CopyLinearScale
+
+        private void CopyLinearScale(GaugeLinearScale scale)
+        {
+            if (_AddButton != null)
+            {
+                _AddButton.PerformClick();
+
+                GaugeLinearScaleCollection lss = scale.GaugeControl.LinearScales;
+                GaugeLinearScale clone = lss[lss.Count - 1];
+
+                scale.CopyToItem(clone);
+            }
+        }
+
+        #endregion
+
+        #region CopySection
+
+        private void CopySection(GaugeSection section)
+        {
+            if (_AddButton != null)
+            {
+                _AddButton.PerformClick();
+
+                GaugeSectionCollection sc = section.Scale.Sections;
+                GaugeSection clone = sc[sc.Count - 1];
+
+                section.CopyToItem(clone);
+            }
+        }
+
+        #endregion
+
+        #region CopyRange
+
+        private void CopyRange(GaugeRange range)
+        {
+            if (_AddButton != null)
+            {
+                _AddButton.PerformClick();
+
+                GaugeRangeCollection rc = range.Scale.Ranges;
+                GaugeRange clone = rc[rc.Count - 1];
+
+                range.CopyToItem(clone);
+            }
+        }
+
+        #endregion
+
+        #region CopyLabel
+
+        private void CopyLabel(GaugeCustomLabel label)
+        {
+            if (_AddButton != null)
+            {
+                _AddButton.PerformClick();
+
+                GaugeCustomLabelCollection lc = label.Scale.CustomLabels;
+                GaugeCustomLabel clone = lc[lc.Count - 1];
+
+                label.CopyToItem(clone);
+            }
+        }
+
+        #endregion
+
+        #region CopyPointer
+
+        private void CopyPointer(GaugePointer pointer)
+        {
+            if (_AddButton != null)
+            {
+                _AddButton.PerformClick();
+
+                GaugePointerCollection pc = pointer.Scale.Pointers;
+                GaugePointer clone = pc[pc.Count - 1];
+
+                pointer.CopyToItem(clone);
+            }
+        }
+
+        #endregion
+
+        #region CopyNumericRange
+
+        private void CopyNumericRange(NumericRange range)
+        {
+            if (_AddButton != null)
+            {
+                _AddButton.PerformClick();
+
+                NumericRangeCollection pc = range.NumericIndicator.Ranges;
+                NumericRange clone = pc[pc.Count - 1];
+
+                range.CopyToItem(clone);
+            }
+        }
+
+        #endregion
+
+        #region CopyStateRange
+
+        private void CopyStateRange(StateRange range)
+        {
+            if (_AddButton != null)
+            {
+                _AddButton.PerformClick();
+
+                StateRangeCollection pc = range.StateIndicator.Ranges;
+                StateRange clone = pc[pc.Count - 1];
+
+                range.CopyToItem(clone);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region ListBox_SelectedIndexChanged
+
+        void ListBox_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            if (_ListBox.SelectedItem != null)
+            {
+                PropertyInfo p = _ListBox.SelectedItem.GetType().GetProperty("Value");
+
+                _LastGaugeItem = _GaugeItem;
+                _GaugeItem = (GaugeItem)p.GetValue(_ListBox.SelectedItem, null);
+
+                _CopyButton.Enabled = true;
+            }
+            else
+            {
+                _CopyButton.Enabled = false;
+            }
+        }
+
+        #endregion
+
+        #region GaugeCollectionEditor_AddClick
+
+        void GaugeCollectionEditor_AddClick(object sender, EventArgs e)
+        {
+            if (_GaugeItem != null)
+            {
+                if (_GaugeItem is GaugeCircularScale)
+                    InitializeNewCircularScale(_GaugeItem as GaugeCircularScale);
+
+                else if (_GaugeItem is GaugeLinearScale)
+                    InitializeNewLinearScale(_GaugeItem as GaugeLinearScale);
+
+                else if (_GaugeItem is GaugeSection)
+                    InitializeNewSection(_GaugeItem as GaugeSection);
+
+                else if (_GaugeItem is GaugeRange)
+                    InitializeNewRange(_GaugeItem as GaugeRange);
+
+                else if (_GaugeItem is GaugeCustomLabel)
+                    InitializeNewCustomLabel(_GaugeItem as GaugeCustomLabel);
+
+                else if (_GaugeItem is GaugePointer)
+                    InitializeNewPointer(_GaugeItem as GaugePointer);
+
+                else if (_GaugeItem is NumericRange)
+                    InitializeNewNumericRange(_GaugeItem as NumericRange);
+
+                else if (_GaugeItem is StateRange)
+                    InitializeNewStateRange(_GaugeItem as StateRange);
+            }
+        }
+
+        #region InitializeNewScale
+
+        #region InitializeNewCircularScale
+
+        private void InitializeNewCircularScale(GaugeCircularScale scale)
+        {
+            scale.Name = GetScaleName(scale);
+
+            GaugeSection section = new GaugeSection(scale);
+            section.Name = GetSectionName(scale);
+
+            section.FillColor = new GradientFillColor(Color.CornflowerBlue);
+
+            scale.Sections.Add(section);
+        }
+
+        #region GetScaleName
+
+        private string GetScaleName(GaugeCircularScale scale)
+        {
+            for (int i = 1; i < 100; i++)
+            {
+                string s = "Scale" + i.ToString();
+
+                if (scale.GaugeControl.CircularScales[s] == null)
+                    return (s);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InitializeNewLinearScale
+
+        private void InitializeNewLinearScale(GaugeLinearScale scale)
+        {
+            scale.Orientation = GetDefaultOrientation(scale);
+
+            scale.Name = GetScaleName(scale);
+
+            GaugeSection section = new GaugeSection(scale);
+            section.Name = GetSectionName(scale);
+
+            section.FillColor = new GradientFillColor(Color.CornflowerBlue);
+
+            scale.Sections.Add(section);
+        }
+
+        #region GetDefaultOrientation
+
+        private Orientation GetDefaultOrientation(GaugeLinearScale scale)
+        {
+            foreach (GaugeLinearScale gls in scale.GaugeControl.LinearScales)
+            {
+                if (gls != scale)
+                    return (gls.Orientation);
+            }
+
+            return (scale.GaugeControl.Width > scale.GaugeControl.Height
+                ? Orientation.Horizontal : Orientation.Vertical);
+        }
+
+        #endregion
+
+        #region GetScaleName
+
+        private string GetScaleName(GaugeLinearScale scale)
+        {
+            for (int i = 1; i < 100; i++)
+            {
+                string s = "Scale" + i.ToString();
+
+                if (scale.GaugeControl.LinearScales[s] == null)
+                    return (s);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region InitializeNewSection
+
+        #region InitializeNewSection
+
+        private void InitializeNewSection(GaugeSection section)
+        {
+            section.StartValue = section.Scale.MinValue;
+            section.EndValue = section.Scale.MinValue + (section.Scale.MajorTickMarks.Interval * 2);
+
+            section.Name = GetSectionName(section.Scale);
+
+            section.FillColor = new GradientFillColor(Color.Lime);
+        }
+
+        #endregion
+
+        #region GetSectionName
+
+        private string GetSectionName(GaugeScale scale)
+        {
+            for (int i = 1; i < 100; i++)
+            {
+                string s = "Section" + i.ToString();
+
+                if (scale.Sections[s] == null)
+                    return (s);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InitializeNewRange
+
+        #region InitializeNewRange
+
+        private void InitializeNewRange(GaugeRange range)
+        {
+            range.EndValue = range.Scale.MaxValue;
+            range.StartValue = range.EndValue - range.Scale.MajorTickMarks.Interval * 3;
+
+            range.Name = GetRangeName(range.Scale);
+
+            range.FillColor = new GradientFillColor(Color.Lime, Color.Red);
+            range.FillColor.BorderColor = Color.Black;
+            range.FillColor.BorderWidth = 1;
+        }
+
+        #endregion
+
+        #region GetRangeName
+
+        private string GetRangeName(GaugeScale scale)
+        {
+            for (int i = 1; i < 100; i++)
+            {
+                string s = "Range" + i.ToString();
+
+                if (scale.Ranges[s] == null)
+                    return (s);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InitializeNewCustomLabel
+
+        #region InitializeNewCustomLabel
+
+        private void InitializeNewCustomLabel(GaugeCustomLabel label)
+        {
+            label.Value = label.Scale.MinValue;
+
+            label.Name = GetLabelName(label.Scale);
+        }
+
+        #endregion
+
+        #region GetLabelName
+
+        private string GetLabelName(GaugeScale scale)
+        {
+            for (int i = 1; i < 100; i++)
+            {
+                string s = "Label" + i.ToString();
+
+                if (scale.CustomLabels[s] == null)
+                    return (s);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InitializeNewPointer
+
+        #region InitializeNewPointer
+
+        private void InitializeNewPointer(GaugePointer pointer)
+        {
+            pointer.Style = (pointer.Scale is GaugeCircularScale)
+                ? PointerStyle.Needle : PointerStyle.Marker;
+
+            pointer.Name = GetPointerName(pointer.Scale);
+
+            pointer.FillColor = new GradientFillColor(Color.WhiteSmoke, Color.Red);
+            pointer.FillColor.BorderColor = Color.DimGray;
+            pointer.FillColor.BorderWidth = 1;
+
+            Color color1 = Color.FromArgb(100, 60, 60, 60);
+
+            pointer.ThermoBackColor = new GradientFillColor(color1);
+            pointer.ThermoBackColor.BorderColor = Color.Black;
+            pointer.ThermoBackColor.BorderWidth = 1;
+        }
+
+        #endregion
+
+        #region GetPointerName
+
+        private string GetPointerName(GaugeScale scale)
+        {
+            for (int i = 1; i < 100; i++)
+            {
+                string s = "Pointer" + i.ToString();
+
+                if (scale.Pointers[s] == null)
+                    return (s);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region InitializeNewNumericRange
+
+        #region InitializeNewNumericRange
+
+        private void InitializeNewNumericRange(NumericRange range)
+        {
+            range.StartValue = 500;
+            range.EndValue = 1000;
+
+            range.Name = GetNumericRangeName(range.NumericIndicator);
+
+            range.DigitColor = Color.Red;
+            range.DigitDimColor = Color.FromArgb(94, 0, 0);
+            range.DecimalColor = range.DigitColor;
+            range.DecimalDimColor = range.DigitDimColor;
+        }
+
+        #endregion
+
+        #region GetNumericRangeName
+
+        private string GetNumericRangeName(NumericIndicator indicator)
+        {
+            for (int i = 1; i < 100; i++)
+            {
+                string s = "Range" + i.ToString();
+
+                if (indicator.Ranges[s] == null)
+                    return (s);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InitializeNewStateRange
+
+        #region InitializeNewStateRange
+
+        private void InitializeNewStateRange(StateRange range)
+        {
+            range.StartValue = 500;
+            range.EndValue = 1000;
+
+            range.Name = GetStateRangeName(range.StateIndicator);
+        }
+
+        #endregion
+
+        #region GetStateRangeName
+
+        private string GetStateRangeName(StateIndicator indicator)
+        {
+            for (int i = 1; i < 100; i++)
+            {
+                string s = "Range" + i.ToString();
+
+                if (indicator.Ranges[s] == null)
+                    return (s);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GaugeCollectionEditor_RemoveClick
+
+        void GaugeCollectionEditor_RemoveClick(object sender, EventArgs e)
+        {
+            if (_LastGaugeItem != null)
+            {
+                RemovedItems.Add(_LastGaugeItem);
+
+                _LastGaugeItem.Visible = false;
+                _LastGaugeItem = null;
+            }
+            else if (_GaugeItem != null)
+            {
+                RemovedItems.Add(_GaugeItem);
+
+                _GaugeItem.Visible = false;
+                _GaugeItem = null;
+            }
+        }
+
+        #endregion
+    }
+
+    #region CollectionChangedEventArgs
+
+    /// <summary>
+    /// CollectionChangedEventArgs
+    /// </summary>
+    public class CollectionChangedEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private List<object> _NewList;
+
+        #endregion
+
+        public CollectionChangedEventArgs(List<object> newList)
+        {
+            _NewList = newList;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the selected NewList
+        /// </summary>
+        public List<object> NewList
+        {
+            get { return (_NewList); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+}
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/GaugeControlActionList.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/GaugeControlActionList.cs
new file mode 100644
index 00000000..05bbaf3d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/GaugeControlActionList.cs	
@@ -0,0 +1,332 @@
+using System;
+using System.ComponentModel;
+using System.ComponentModel.Design;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Windows.Forms;
+using DevComponents.DotNetBarKnobControl.Design;
+
+namespace DevComponents.Instrumentation.Design
+{
+    public class GaugeControlActionList : DesignerActionList
+    {
+        #region Private variables
+
+        private GaugeControl _GaugeControl;
+
+        #endregion
+
+        /// <summary>
+        /// GaugeControlActionList
+        /// </summary>
+        /// <param name="gaugeControl">Associated GaugeControl</param>
+        public GaugeControlActionList(GaugeControl gaugeControl)
+            : base(gaugeControl)
+        {
+            _GaugeControl = gaugeControl;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets or sets the FrameStyle
+        /// </summary>
+        public GaugeFrameStyle FrameStyle
+        {
+            get { return (_GaugeControl.Frame.Style); }
+            set { GetFramePropertyByName("Style").SetValue(_GaugeControl.Frame, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the Glass Effect
+        /// </summary>
+        public bool AddGlassEffect
+        {
+            get { return (_GaugeControl.Frame.AddGlassEffect); }
+            set { GetFramePropertyByName("AddGlassEffect").SetValue(_GaugeControl.Frame, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the frame inner bevel size
+        /// </summary>
+        [Editor(typeof(HalfRadiusRangeValueEditor), typeof(UITypeEditor))]
+        public float InnerBevel
+        {
+            get { return (_GaugeControl.Frame.InnerBevel); }
+            set { GetFramePropertyByName("InnerBevel").SetValue(_GaugeControl.Frame, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the frame outer bevel size
+        /// </summary>
+        [Editor(typeof(HalfRadiusRangeValueEditor), typeof(UITypeEditor))]
+        public float OuterBevel
+        {
+            get { return (_GaugeControl.Frame.OuterBevel); }
+            set { GetFramePropertyByName("OuterBevel").SetValue(_GaugeControl.Frame, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the RoundRectangleArc size
+        /// </summary>
+        [Editor(typeof(HalfRadiusRangeValueEditor), typeof(UITypeEditor))]
+        public float RoundRectangleArc
+        {
+            get { return (_GaugeControl.Frame.RoundRectangleArc); }
+            set { GetFramePropertyByName("RoundRectangleArc").SetValue(_GaugeControl.Frame, value); }
+        }
+
+        #endregion
+
+        #region GetPropertyByName
+
+        /// <summary>
+        /// Gets the property via the given name
+        /// </summary>
+        /// <param name="propName">Property name</param>
+        /// <returns>PropertyDescriptor</returns>
+        private PropertyDescriptor GetPropertyByName(string propName)
+        {
+            PropertyDescriptor prop =
+                TypeDescriptor.GetProperties(_GaugeControl)[propName];
+
+            if (prop == null)
+                throw new ArgumentException("Matching property not found.", propName);
+
+            return (prop);
+        }
+
+        #endregion
+
+        #region GetFramePropertyByName
+
+        /// <summary>
+        /// Gets the Frame property via the given name
+        /// </summary>
+        /// <param name="propName">Property name</param>
+        /// <returns>PropertyDescriptor</returns>
+        private PropertyDescriptor GetFramePropertyByName(string propName)
+        {
+            PropertyDescriptor prop =
+                TypeDescriptor.GetProperties(_GaugeControl.Frame)[propName];
+
+            if (prop == null)
+                throw new ArgumentException("Matching property not found.", propName);
+
+            return (prop);
+        }
+
+        #endregion
+
+        #region GetSortedActionItems
+
+        /// <summary>
+        /// Gets the SortedActionItems
+        /// </summary>
+        /// <returns>DesignerActionItemCollection</returns>
+        public override DesignerActionItemCollection GetSortedActionItems()
+        {
+            DesignerActionItemCollection items = new DesignerActionItemCollection();
+
+            items.Add(new DesignerActionMethodItem(this, "AddCircularScale", "Add Circular Scale", "Scale"));
+            items.Add(new DesignerActionMethodItem(this, "AddHLinearScale", "Add Horizontal Linear Scale", "Scale"));
+            items.Add(new DesignerActionMethodItem(this, "AddVLinearScale", "Add Vertical Linear Scale", "Scale"));
+
+            items.Add(new DesignerActionHeaderItem("Gauge Frame"));
+
+            items.Add(new DesignerActionPropertyItem("FrameStyle", "Style",
+                "Gauge Frame", "Sets the frame Style."));
+
+            items.Add(new DesignerActionPropertyItem("InnerBevel", "Inner Bevel",
+                "Gauge Frame", "Sets the frame inner bevel size."));
+
+            items.Add(new DesignerActionPropertyItem("OuterBevel", "Outer Bevel",
+                "Gauge Frame", "Sets the frame outer bevel size."));
+
+            items.Add(new DesignerActionPropertyItem("RoundRectangleArc", "Round Rectangle Arc",
+                "Gauge Frame", "Sets the rectangle corner arc."));
+
+            items.Add(new DesignerActionTextItem(
+                "Frame sizes are measured as a\n" +
+                "percentage of the width/height of the Gauge", "Gauge Frame"));
+
+            return (items);
+        }
+
+        #endregion
+
+        #region AddCircularScale
+
+        /// <summary>
+        /// Adds a CircularScale
+        /// </summary>
+        public void AddCircularScale()
+        {
+            GaugeCircularScale scale = NewCircularScale();
+
+            _GaugeControl.CircularScales.Add(scale);
+
+            GaugePropertyGrid prop = new GaugePropertyGrid();
+
+            prop.SelectedObject = scale;
+
+            DialogResult result = prop.ShowDialog();
+
+            if (result != DialogResult.OK)
+                _GaugeControl.CircularScales.Remove(scale);
+        }
+
+        #region NewCircularScale
+
+        private GaugeCircularScale NewCircularScale()
+        {
+            GaugeCircularScale scale = new GaugeCircularScale(_GaugeControl);
+
+            scale.Name = GetScaleName(scale);
+
+            GaugeSection section = new GaugeSection(scale);
+            section.Name = GetSectionName(scale);
+
+            section.FillColor = new GradientFillColor(Color.CornflowerBlue);
+
+            scale.Sections.Add(section);
+
+            return (scale);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region AddHLinearScale
+
+        /// <summary>
+        /// Adds a Horizontal LinearScale
+        /// </summary>
+        public void AddHLinearScale()
+        {
+            GaugeLinearScale scale = NewLinearScale(Orientation.Horizontal);
+
+            _GaugeControl.LinearScales.Add(scale);
+
+            GaugePropertyGrid prop = new GaugePropertyGrid();
+
+            prop.SelectedObject = scale;
+
+            DialogResult result = prop.ShowDialog();
+
+            if (result != DialogResult.OK)
+                _GaugeControl.LinearScales.Remove(scale);
+        }
+
+        #endregion
+
+        #region AddVLinearScale
+
+        /// <summary>
+        /// Adds a Vertical LinearScale
+        /// </summary>
+        public void AddVLinearScale()
+        {
+            GaugeLinearScale scale = NewLinearScale(Orientation.Vertical);
+
+            _GaugeControl.LinearScales.Add(scale);
+
+            GaugePropertyGrid prop = new GaugePropertyGrid();
+
+            prop.SelectedObject = scale;
+
+            DialogResult result = prop.ShowDialog();
+
+            if (result != DialogResult.OK)
+                _GaugeControl.LinearScales.Remove(scale);
+        }
+
+        #endregion
+
+        #region NewLinearScale
+
+        private GaugeLinearScale NewLinearScale(Orientation orientation)
+        {
+            GaugeLinearScale scale = new GaugeLinearScale(_GaugeControl);
+            scale.Orientation = orientation;
+            scale.Name = GetScaleName(scale);
+
+            scale.MinPin.EndOffset = .028f;
+            scale.MaxPin.EndOffset = .028f;
+
+            GaugeSection section = new GaugeSection(scale);
+            section.Name = GetSectionName(scale);
+            section.FillColor = new GradientFillColor(Color.CornflowerBlue);
+
+            scale.Sections.Add(section);
+
+            return (scale);
+        }
+
+        #endregion
+
+        #region GetScaleName
+
+        private string GetScaleName(GaugeCircularScale scale)
+        {
+            for (int i = 1; i < 100; i++)
+            {
+                string s = "Scale" + i.ToString();
+
+                if (scale.GaugeControl.CircularScales[s] == null)
+                    return (s);
+            }
+
+            return (null);
+        }
+
+        private string GetScaleName(GaugeLinearScale scale)
+        {
+            for (int i = 1; i < 100; i++)
+            {
+                string s = "Scale" + i.ToString();
+
+                if (scale.GaugeControl.LinearScales[s] == null)
+                    return (s);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetSectionName
+
+        private string GetSectionName(GaugeScale scale)
+        {
+            for (int i = 1; i < 100; i++)
+            {
+                string s = "Section" + i.ToString();
+
+                if (scale.Sections[s] == null)
+                    return (s);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetDefaultOrientation
+
+        private Orientation GetDefaultOrientation(GaugeLinearScale scale)
+        {
+            foreach (GaugeLinearScale gls in scale.GaugeControl.LinearScales)
+            {
+                if (gls != scale)
+                    return (gls.Orientation);
+            }
+
+            return (scale.GaugeControl.Width > scale.GaugeControl.Height
+                ? Orientation.Horizontal : Orientation.Vertical);
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/GaugeControlDesigner.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/GaugeControlDesigner.cs
new file mode 100644
index 00000000..aa8153a7
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/GaugeControlDesigner.cs	
@@ -0,0 +1,1310 @@
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.ComponentModel.Design;
+using System.Drawing;
+using System.Windows.Forms;
+using System.Windows.Forms.Design;
+using DevComponents.DotNetBarKnobControl.Design;
+using Microsoft.Win32;
+
+namespace DevComponents.Instrumentation.Design
+{
+    /// <summary>
+    /// KnobControlDesigner
+    /// </summary>
+    public class GaugeControlDesigner : ControlDesigner
+    {
+        #region Private variables
+
+        private GaugeControl _GaugeControl;
+        private DesignerActionListCollection _ActionLists;
+
+        #endregion
+
+        #region Initialize
+
+        /// <summary>
+        /// Initializes our designer
+        /// </summary>
+        /// <param name="component"></param>
+        public override void Initialize(IComponent component)
+        {
+            base.Initialize(component);
+
+            if (component.Site.DesignMode == true)
+                _GaugeControl = component as GaugeControl;
+
+#if !TRIAL
+            IDesignerHost dh = GetService(typeof(IDesignerHost)) as IDesignerHost;
+
+            if (dh != null)
+                dh.LoadComplete += DhLoadComplete;
+#endif
+        }
+
+        #endregion
+
+        #region InitializeNewComponent
+
+        public override void InitializeNewComponent(IDictionary defaultValues)
+        {
+            base.InitializeNewComponent(defaultValues);
+
+            GaugeStyleDialog gsd = new GaugeStyleDialog();
+
+            gsd.ShowDialog();
+
+            if (Component != null && Component.Site != null && Component.Site.DesignMode == true)
+            {
+                if (_GaugeControl != null)
+                {
+                    switch (gsd.CbSelected)
+                    {
+                        case "cbCircular":
+                            SetCircularDesignTimeDefaults();
+                            break;
+
+                        case "cbC2Scales":
+                            SetC2ScalesDesignTimeDefaults();
+                            break;
+
+                        case "cbCInsetScale":
+                            SetCInsetScaleDesignTimeDefaults();
+                            break;
+
+                        case "cbCTopMeter":
+                            SetCTopMeterDesignTimeDefaults();
+                            break;
+
+                        case "cbCBottomMeter":
+                            SetCBottomMeterDesignTimeDefaults();
+                            break;
+
+                        case "cbHorizontal":
+                            SetHorizontalDesignTimeDefaults();
+                            break;
+
+                        case "cbH2Scales":
+                            SetH2ScalesDesignTimeDefaults();
+                            break;
+
+                        case "cbHMultiBars":
+                            SetHMultiBarsDesignTimeDefaults();
+                            break;
+
+                        case "cbHThermometer":
+                            SetHThermometerDesignTimeDefaults();
+                            break;
+
+                        case "cbVertical":
+                            SetVerticalDesignTimeDefaults();
+                            break;
+
+                        case "cbV2Scales":
+                            SetV2ScalesDesignTimeDefaults();
+                            break;
+
+                        case "cbVMultiBars":
+                            SetVMultiBarsDesignTimeDefaults();
+                            break;
+
+                        case "cbVThermometer":
+                            SetVThermometerDesignTimeDefaults();
+                            break;
+
+                        default:
+                            SetCircularDesignTimeDefaults();
+                            break;
+                    }
+                }
+            }
+
+#if !TRIAL
+            GaugeControl gauge = Control as GaugeControl;
+
+            if (gauge != null)
+                gauge.LicenseKey = GetLicenseKey();
+#endif
+        }
+
+        #endregion
+
+        #region SetCircularDesignTimeDefaults
+
+        private void SetCircularDesignTimeDefaults()
+        {
+            _GaugeControl.Frame.Style = GaugeFrameStyle.Circular;
+
+            SetBaseGuageColor();
+
+            GaugeCircularScale scale = new GaugeCircularScale(_GaugeControl);
+            scale.Name = "Scale1";
+            scale.Radius = .38f;
+
+            _GaugeControl.CircularScales.Add(scale);
+
+            GaugeSection section = new GaugeSection(scale);
+            section.Name = "Section1";
+            section.FillColor = new GradientFillColor(Color.CornflowerBlue, Color.Purple);
+
+            scale.Sections.Add(section);
+
+            GaugeRange range = new GaugeRange(scale);
+            range.Name = "Range1";
+
+            range.FillColor = new GradientFillColor(Color.Lime, Color.Red);
+            range.FillColor.BorderColor = Color.DimGray;
+            range.FillColor.BorderWidth = 1;
+
+            range.ScaleOffset = .28f;
+            range.StartValue = 70;
+
+            scale.Ranges.Add(range);
+
+            GaugePointer pointer = new GaugePointer(scale);
+            pointer.Name = "Pointer1";
+            pointer.Style = PointerStyle.Needle;
+            pointer.Length = 0.358F;
+
+            pointer.FillColor = new GradientFillColor(Color.WhiteSmoke, Color.Red);
+            pointer.FillColor.BorderColor = Color.DimGray;
+            pointer.FillColor.BorderWidth = 1;
+
+            pointer.CapFillColor = new GradientFillColor(Color.WhiteSmoke, Color.DimGray, 90);
+            pointer.CapFillColor.BorderColor = Color.DimGray;
+            pointer.CapFillColor.BorderWidth = 1;
+
+            scale.Pointers.Add(pointer);
+        }
+
+        #endregion
+
+        #region SetC2ScalesDesignTimeDefaults
+
+        private void SetC2ScalesDesignTimeDefaults()
+        {
+            _GaugeControl.Frame.Style = GaugeFrameStyle.Circular;
+
+            SetBaseGuageColor();
+
+            GaugeCircularScale scale1 = new GaugeCircularScale(_GaugeControl);
+
+            scale1.Name = "Scale1";
+            scale1.Radius = .38f;
+
+            _GaugeControl.CircularScales.Add(scale1);
+
+            GaugeSection section = new GaugeSection(scale1);
+
+            section.Name = "Section1";
+            section.FillColor = new GradientFillColor(Color.CornflowerBlue, Color.Purple);
+
+            scale1.Sections.Add(section);
+
+            GaugePointer pointer = new GaugePointer(scale1);
+
+            pointer.Name = "Pointer1";
+            pointer.Style = PointerStyle.Needle;
+            pointer.Length = 0.358F;
+
+            pointer.FillColor = new GradientFillColor(Color.WhiteSmoke, Color.Red);
+            pointer.FillColor.BorderColor = Color.DimGray;
+            pointer.FillColor.BorderWidth = 1;
+
+            pointer.CapFillColor = new GradientFillColor(Color.WhiteSmoke, Color.DimGray, 90);
+            pointer.CapFillColor.BorderColor = Color.DimGray;
+            pointer.CapFillColor.BorderWidth = 1;
+
+            scale1.Pointers.Add(pointer);
+
+            GaugeCircularScale scale2 = new GaugeCircularScale(_GaugeControl);
+
+            scale2.Name = "Scale2";
+            scale2.Radius = .24f;
+            scale2.MaxValue = 200;
+
+            scale2.MajorTickMarks.Interval = 20;
+            scale2.MaxValue = 200;
+            scale2.MinorTickMarks.Interval = 4;
+            scale2.Name = "Scale2";
+            scale2.Radius = 0.24F;
+
+            _GaugeControl.CircularScales.Add(scale2);
+
+            section = new GaugeSection(scale2);
+
+            section.Name = "Section1";
+            section.FillColor.Color1 = Color.CornflowerBlue;
+            section.Name = "Section1";
+            scale2.Sections.Add(section);
+        }
+
+        #endregion
+
+        #region SetCInsetScaleDesignTimeDefaults
+
+        private void SetCInsetScaleDesignTimeDefaults()
+        {
+            _GaugeControl.Frame.Style = GaugeFrameStyle.Circular;
+
+            SetBaseGuageColor();
+
+            GaugeCircularScale scale1 = new GaugeCircularScale(_GaugeControl);
+            scale1.Name = "Scale1";
+            scale1.Radius = 0.092F;
+            scale1.Width = 0.139F;
+
+            scale1.MaxValue = 10;
+            scale1.Labels.Layout.RotateLabel = false;
+            scale1.Labels.Layout.Font = new Font("Microsoft Sans Serif", 18F);
+
+            GradientFillColor fillColor = new GradientFillColor(Color.White);
+            fillColor.BorderColor = Color.DimGray;
+            fillColor.BorderWidth = 1;
+
+            scale1.MajorTickMarks.Interval = 1;
+            scale1.MajorTickMarks.Layout.FillColor = fillColor;
+            scale1.MajorTickMarks.Layout.Length = 0.263F;
+            scale1.MajorTickMarks.Layout.Style = GaugeMarkerStyle.Circle;
+            scale1.MajorTickMarks.Layout.Width = 0.263F;
+
+            scale1.MinorTickMarks.Interval = 0.5;
+            scale1.MinorTickMarks.Layout.FillColor = new GradientFillColor(Color.Black);
+            scale1.MinorTickMarks.Layout.Length = 0.2F;
+            scale1.PivotPoint = new PointF(.50f, .68f);
+
+            GaugePointer pointer = new GaugePointer(scale1);
+            pointer.Name = "Pointer1";
+            pointer.Style = PointerStyle.Needle;
+            pointer.Length = 0.54F;
+            pointer.Width = 0.2F;
+            pointer.Placement = DisplayPlacement.Near;
+            pointer.NeedleStyle = NeedlePointerStyle.Style6;
+
+            pointer.CapFillColor.BorderColor = Color.DimGray;
+            pointer.CapFillColor.BorderWidth = 1;
+            pointer.CapFillColor.Color1 = Color.WhiteSmoke;
+            pointer.CapFillColor.Color2 = Color.Brown;
+            pointer.CapFillColor.GradientFillType = GradientFillType.Center;
+
+            pointer.CapStyle = NeedlePointerCapStyle.Style1;
+            pointer.CapWidth = 0.4F;
+
+            pointer.FillColor.BorderColor = Color.DarkSlateGray;
+            pointer.FillColor.BorderWidth = 1;
+            pointer.FillColor.Color1 = Color.Turquoise;
+
+            scale1.Pointers.Add(pointer);
+
+            GaugeSection section = new GaugeSection(scale1);
+            section.FillColor.Color1 = Color.CornflowerBlue;
+            section.Name = "Section1";
+
+            scale1.Sections.Add(section);
+
+            _GaugeControl.CircularScales.Add(scale1);
+
+            GaugeCircularScale scale2 = new GaugeCircularScale(_GaugeControl);
+            scale2.Name = "Scale2";
+            scale2.Radius = .38f;
+
+            section = new GaugeSection(scale2);
+            section.Name = "Section1";
+            section.FillColor = new GradientFillColor(Color.CornflowerBlue, Color.Purple);
+
+            scale2.Sections.Add(section);
+
+            pointer = new GaugePointer(scale2);
+            pointer.Name = "Pointer1";
+            pointer.Style = PointerStyle.Needle;
+            pointer.Length = 0.358F;
+
+            pointer.FillColor = new GradientFillColor(Color.WhiteSmoke, Color.Red);
+            pointer.FillColor.BorderColor = Color.DimGray;
+            pointer.FillColor.BorderWidth = 1;
+
+            pointer.CapFillColor = new GradientFillColor(Color.WhiteSmoke, Color.DimGray, 90);
+            pointer.CapFillColor.BorderColor = Color.DimGray;
+            pointer.CapFillColor.BorderWidth = 1;
+
+            scale2.Pointers.Add(pointer);
+
+            _GaugeControl.CircularScales.Add(scale2);
+        }
+
+        #endregion
+
+        #region SetCTopMeterDesignTimeDefaults
+
+        private void SetCTopMeterDesignTimeDefaults()
+        {
+            _GaugeControl.Frame.Style = GaugeFrameStyle.Rectangular;
+            _GaugeControl.Size = new Size(_GaugeControl.Size.Width, _GaugeControl.Size.Width / 3);
+
+            SetBaseGuageColor();
+
+            GaugeCircularScale scale = new GaugeCircularScale(_GaugeControl);
+            scale.Name = "Scale1";
+            scale.Radius = 2.5F;
+
+            scale.StartAngle = 60F;
+            scale.SweepAngle = 60F;
+            scale.Width = 0.011F;
+
+            scale.MajorTickMarks.Interval = 50;
+            scale.MajorTickMarks.Layout.Length = 0.063F;
+            scale.MajorTickMarks.Layout.Width = 0.033F;
+
+            scale.MaxPin.EndOffset = 0.01F;
+            scale.MaxPin.Length = 0.026F;
+            scale.MaxPin.ScaleOffset = -0.06F;
+            scale.MaxPin.Width = 0.026F;
+
+            GradientFillColor fillColor = new GradientFillColor(Color.LightYellow);
+            fillColor.BorderColor = Color.DimGray;
+            fillColor.BorderWidth = 1;
+
+            scale.MinorTickMarks.Interval = 10;
+            scale.MinorTickMarks.Layout.FillColor = fillColor;
+            scale.MinorTickMarks.Layout.Length = 0.042F;
+            scale.MinorTickMarks.Layout.Width = 0.013F;
+
+            scale.MinPin.EndOffset = 0.01F;
+            scale.MinPin.Length = 0.026F;
+            scale.MinPin.ScaleOffset = -0.06F;
+            scale.MinPin.Width = 0.026F;
+
+            scale.PivotPoint = new PointF(.5f, -1.7f);
+
+            scale.Labels.Layout.Font = new Font("Microsoft Sans Serif", 4F);
+            scale.Labels.Layout.ScaleOffset = 0.075F;
+
+            GaugeRange range = new GaugeRange(scale);
+            range.Name = "Range1";
+            range.ScaleOffset = 0.033F;
+
+            range.StartValue = 0;
+            range.StartWidth = 0.07F;
+            range.EndValue = 100;
+            range.EndWidth = 0.07F;
+
+            range.FillColor.BorderColor = Color.Gray;
+            range.FillColor.BorderWidth = 1;
+            range.FillColor.Color1 = Color.Yellow;
+            range.FillColor.Color2 = Color.Lime;
+
+            scale.Ranges.Add(range);
+
+            GaugePointer pointer = new GaugePointer(scale);
+            pointer.Name = "Pointer1";
+
+            pointer.Style = PointerStyle.Needle;
+            pointer.ScaleOffset = -0.057F;
+            pointer.Width = 0.032F;
+
+            pointer.CapFillColor.BorderColor = Color.DimGray;
+            pointer.CapFillColor.BorderWidth = 1;
+            pointer.CapFillColor.Color1 = Color.Gainsboro;
+            pointer.CapFillColor.Color2 = Color.Silver;
+
+            pointer.FillColor.BorderColor = Color.DimGray;
+            pointer.FillColor.BorderWidth = 1;
+            pointer.FillColor.Color1 = Color.Black;
+
+            scale.Pointers.Add(pointer);
+
+            _GaugeControl.CircularScales.Add(scale);
+        }
+
+        #endregion
+
+        #region SetCBottomMeterDesignTimeDefaults
+
+        private void SetCBottomMeterDesignTimeDefaults()
+        {
+            _GaugeControl.Frame.Style = GaugeFrameStyle.Rectangular;
+            _GaugeControl.Frame.BackColor = new GradientFillColor(Color.Gainsboro, Color.DarkGray);
+            _GaugeControl.Frame.FrameColor = new GradientFillColor(Color.White, Color.DimGray);
+            _GaugeControl.Frame.FrameColor.BorderColor = Color.Gainsboro;
+            _GaugeControl.Frame.FrameColor.BorderWidth = 1;
+
+            _GaugeControl.Size = new Size(_GaugeControl.Size.Width, _GaugeControl.Size.Width / 3);
+
+            GaugeCircularScale scale = new GaugeCircularScale(_GaugeControl);
+            scale.Name = "Scale1";
+            scale.Radius = 2.5F;
+
+            scale.StartAngle = 240F;
+            scale.SweepAngle = 60F;
+            scale.Width = 0.011F;
+
+            scale.MajorTickMarks.Interval = 50;
+            scale.MajorTickMarks.Layout.Length = 0.063F;
+            scale.MajorTickMarks.Layout.Width = 0.033F;
+
+            scale.MaxPin.EndOffset = 0.01F;
+            scale.MaxPin.Length = 0.026F;
+            scale.MaxPin.ScaleOffset = -0.06F;
+            scale.MaxPin.Width = 0.026F;
+
+            GradientFillColor fillColor = new GradientFillColor(Color.LightYellow);
+            fillColor.BorderColor = Color.DimGray;
+            fillColor.BorderWidth = 1;
+
+            scale.MinorTickMarks.Interval = 10;
+            scale.MinorTickMarks.Layout.FillColor = fillColor;
+            scale.MinorTickMarks.Layout.Length = 0.042F;
+            scale.MinorTickMarks.Layout.Width = 0.013F;
+
+            scale.MinPin.EndOffset = 0.01F;
+            scale.MinPin.Length = 0.026F;
+            scale.MinPin.ScaleOffset = -0.06F;
+            scale.MinPin.Width = 0.026F;
+
+            scale.PivotPoint = new PointF(.5f, 2.7f);
+
+            scale.Labels.Layout.Font = new Font("Microsoft Sans Serif", 4F);
+            scale.Labels.Layout.ScaleOffset = 0.075F;
+
+            GaugeRange range = new GaugeRange(scale);
+            range.Name = "Range1";
+            range.ScaleOffset = 0.033F;
+
+            range.StartValue = 0;
+            range.StartWidth = 0.07F;
+            range.EndValue = 100;
+            range.EndWidth = 0.07F;
+
+            range.FillColor.BorderColor = Color.Gray;
+            range.FillColor.BorderWidth = 1;
+            range.FillColor.Color1 = Color.Yellow;
+            range.FillColor.Color2 = Color.Lime;
+
+            scale.Ranges.Add(range);
+
+            GaugePointer pointer = new GaugePointer(scale);
+            pointer.Name = "Pointer1";
+
+            pointer.Style = PointerStyle.Needle;
+            pointer.ScaleOffset = -0.057F;
+            pointer.Width = 0.032F;
+
+            pointer.CapFillColor.BorderColor = Color.DimGray;
+            pointer.CapFillColor.BorderWidth = 1;
+            pointer.CapFillColor.Color1 = Color.Gainsboro;
+            pointer.CapFillColor.Color2 = Color.Silver;
+
+            pointer.FillColor.BorderColor = Color.DimGray;
+            pointer.FillColor.BorderWidth = 1;
+            pointer.FillColor.Color1 = Color.Black;
+
+            scale.Pointers.Add(pointer);
+
+            _GaugeControl.CircularScales.Add(scale);
+        }
+
+        #endregion
+
+        #region SetHorizontalDesignTimeDefaults
+
+        private void SetHorizontalDesignTimeDefaults()
+        {
+            _GaugeControl.Frame.Style = GaugeFrameStyle.Rectangular;
+
+            SetBaseGuageColor();
+
+            GaugeLinearScale scale = new GaugeLinearScale(_GaugeControl);
+            scale.Name = "Scale1";
+            scale.MaxValue = 50;
+
+            scale.MinPin.Visible = false;
+            scale.MaxPin.Visible = false;
+
+            _GaugeControl.LinearScales.Add(scale);
+
+            GaugeSection section = new GaugeSection(scale);
+            section.Name = "Section1";
+            section.FillColor = new GradientFillColor(Color.CornflowerBlue, Color.Purple);
+
+            scale.Sections.Add(section);
+
+            GaugePointer pointer = new GaugePointer(scale);
+            pointer.Name = "Pointer1";
+            pointer.Style = PointerStyle.Marker;
+            pointer.Placement = DisplayPlacement.Far;
+            pointer.ScaleOffset = .05f;
+
+            pointer.FillColor = new GradientFillColor(Color.Red);
+            pointer.FillColor.BorderColor = Color.DimGray;
+            pointer.FillColor.BorderWidth = 1;
+
+            Color color1 = Color.FromArgb(100, 60, 60, 60);
+
+            pointer.ThermoBackColor = new GradientFillColor(color1);
+            pointer.ThermoBackColor.BorderColor = Color.Black;
+            pointer.ThermoBackColor.BorderWidth = 1;
+
+            scale.Pointers.Add(pointer);
+        }
+
+        #endregion
+
+        #region SetH2ScalesDesignTimeDefaults
+
+        private void SetH2ScalesDesignTimeDefaults()
+        {
+            _GaugeControl.Frame.Style = GaugeFrameStyle.Rectangular;
+
+            SetBaseGuageColor();
+
+            GaugeLinearScale scale = new GaugeLinearScale(_GaugeControl);
+            scale.Name = "Scale1";
+            scale.MaxValue = 50;
+            scale.Width = 0.14F;
+
+            scale.BorderColor = Color.Gray;
+            scale.BorderWidth = 1;
+            scale.Location = new PointF(.5f, .53f);
+
+            scale.MajorTickMarks.Layout.Style = GaugeMarkerStyle.Rectangle;
+            scale.MajorTickMarks.Layout.Placement = DisplayPlacement.Near;
+            scale.MajorTickMarks.Layout.Width = 0.047F;
+
+            scale.MinorTickMarks.Layout.Placement = DisplayPlacement.Near;
+
+            scale.MaxPin.Visible = false;
+            scale.MinPin.Visible = false;
+
+            GaugeSection section = new GaugeSection(scale);
+            section.Name = "Section1";
+
+            section.FillColor.Color1 = Color.CornflowerBlue;
+
+            scale.Sections.Add(section);
+
+            GaugePointer pointer = new GaugePointer(scale);
+            pointer.Name = "Pointer1";
+            pointer.Style = PointerStyle.Bar;
+
+            pointer.CapFillColor.BorderColor = Color.DimGray;
+            pointer.CapFillColor.BorderWidth = 1;
+            pointer.CapFillColor.Color1 = Color.WhiteSmoke;
+            pointer.CapFillColor.Color2 = Color.DimGray;
+
+            pointer.FillColor.BorderColor = Color.DimGray;
+            pointer.FillColor.BorderWidth = 1;
+            pointer.FillColor.Color1 = Color.Red;
+
+            pointer.Value = 15;
+
+            scale.Pointers.Add(pointer);
+
+            _GaugeControl.LinearScales.Add(scale);
+
+            scale = new GaugeLinearScale(_GaugeControl);
+            scale.Name = "Scale2";
+            scale.Width = 0.14F;
+            scale.MaxValue = 25;
+
+            scale.Location = new PointF(.5f, .53f);
+
+            scale.Labels.Layout.Placement = DisplayPlacement.Far;
+            scale.Labels.Layout.ScaleOffset = 0.054F;
+
+            scale.MajorTickMarks.Interval = 5;
+            scale.MajorTickMarks.Layout.Width = 0.047F;
+            scale.MajorTickMarks.Layout.Style = GaugeMarkerStyle.Rectangle;
+            scale.MajorTickMarks.Layout.Placement = DisplayPlacement.Far;
+
+            scale.MinorTickMarks.Interval = 1.25f;
+            scale.MinorTickMarks.Layout.Placement = DisplayPlacement.Far;
+
+            scale.MaxPin.Visible = false;
+            scale.MinPin.Visible = false;
+
+            _GaugeControl.LinearScales.Add(scale);
+        }
+
+        #endregion
+
+        #region SetHMultiBarsDesignTimeDefaults
+
+        private void SetHMultiBarsDesignTimeDefaults()
+        {
+            _GaugeControl.Frame.Style = GaugeFrameStyle.Rectangular;
+
+            SetBaseGuageColor();
+
+            GaugeLinearScale scale = new GaugeLinearScale(_GaugeControl);
+            scale.Name = "Scale1";
+            scale.MaxValue = 50;
+            scale.Width = 0;
+
+            scale.Labels.Layout.Placement = DisplayPlacement.Far;
+            scale.Labels.Layout.ScaleOffset = -0.016F;
+            scale.Location = new PointF(.5f, .68f);
+
+            scale.MajorTickMarks.Layout.Placement = DisplayPlacement.Far;
+            scale.MajorTickMarks.Layout.Style = GaugeMarkerStyle.Rectangle;
+            scale.MajorTickMarks.Layout.Width = 0.044F;
+
+            scale.MinorTickMarks.Layout.Placement = DisplayPlacement.Far;
+
+            scale.MaxPin.Visible = false;
+            scale.MinPin.Visible = false;
+
+            GaugePointer pointer = new GaugePointer(scale);
+            pointer.Name = "Pointer1";
+            pointer.Style = PointerStyle.Bar;
+            pointer.BarStyle = BarPointerStyle.Rounded;
+
+            pointer.ScaleOffset = 0.022F;
+            pointer.Placement = DisplayPlacement.Near;
+
+            pointer.FillColor.BorderColor = Color.DimGray;
+            pointer.FillColor.BorderWidth = 1;
+            pointer.FillColor.Color1 = Color.Yellow;
+
+            pointer.Value = 15;
+
+            scale.Pointers.Add(pointer);
+
+            pointer = new GaugePointer(scale);
+            pointer.Name = "Pointer2";
+            pointer.Style = PointerStyle.Bar;
+            pointer.BarStyle = BarPointerStyle.Rounded;
+
+            pointer.ScaleOffset = 0.19F;
+            pointer.Placement = DisplayPlacement.Near;
+
+            pointer.FillColor.BorderColor = Color.DimGray;
+            pointer.FillColor.BorderWidth = 1;
+            pointer.FillColor.Color1 = Color.Gold;
+
+            pointer.Value = 25;
+
+            scale.Pointers.Add(pointer);
+
+            pointer = new GaugePointer(scale);
+            pointer.Name = "Pointer3";
+            pointer.Style = PointerStyle.Bar;
+            pointer.BarStyle = BarPointerStyle.Rounded;
+
+            pointer.ScaleOffset = 0.358F;
+            pointer.Placement = DisplayPlacement.Near;
+
+            pointer.FillColor.BorderColor = Color.DimGray;
+            pointer.FillColor.BorderWidth = 1;
+            pointer.FillColor.Color1 = Color.Chartreuse;
+
+            pointer.Value = 35;
+
+            scale.Pointers.Add(pointer);
+
+            pointer = new GaugePointer(scale);
+            pointer.Name = "Pointer4";
+            pointer.Style = PointerStyle.Bar;
+            pointer.BarStyle = BarPointerStyle.Rounded;
+
+            pointer.ScaleOffset = 0.526F;
+            pointer.Placement = DisplayPlacement.Near;
+
+            pointer.FillColor.BorderColor = Color.DimGray;
+            pointer.FillColor.BorderWidth = 1;
+            pointer.FillColor.Color1 = Color.Turquoise;
+
+            pointer.Value = 50;
+
+            scale.Pointers.Add(pointer);
+
+            _GaugeControl.LinearScales.Add(scale);
+        }
+
+        #endregion
+
+        #region SetHMThermometerDesignTimeDefaults
+
+        private void SetHThermometerDesignTimeDefaults()
+        {
+            _GaugeControl.Frame.Style = GaugeFrameStyle.Rectangular;
+
+            SetBaseGuageColor();
+
+            GaugeLinearScale scale = new GaugeLinearScale(_GaugeControl);
+            scale.Name = "Scale1";
+            scale.Width = 0.1F;
+
+            scale.Location = new PointF(.55f, .51f);
+
+            scale.MinValue = -30;
+            scale.MaxValue = 40;
+
+            scale.Labels.FormatString = "0�";
+
+            scale.MajorTickMarks.Layout.Placement = DisplayPlacement.Near;
+            scale.MajorTickMarks.Layout.Style = GaugeMarkerStyle.Rectangle;
+            scale.MajorTickMarks.Layout.Width = 0.008F;
+
+            scale.MinPin.Visible = false;
+            scale.MaxPin.Visible = false;
+
+            scale.MinorTickMarks.Layout.Placement = DisplayPlacement.Near;
+            scale.MinorTickMarks.Layout.Width = 0.016F;
+
+            GaugeSection section = new GaugeSection(scale);
+            section.Name = "Section1";
+
+            section.FillColor.Color1 = Color.SteelBlue;
+            section.FillColor.Color2 = Color.LightCyan;
+            section.FillColor.GradientFillType = GradientFillType.HorizontalCenter;
+
+            scale.Sections.Add(section);
+
+            GaugePointer pointer = new GaugePointer(scale);
+            pointer.Name = "Pointer1";
+            pointer.Width = 0.1F;
+
+            pointer.Style = PointerStyle.Thermometer;
+            pointer.BulbSize = 0.132F;
+            pointer.BulbOffset = .026F;
+
+            pointer.FillColor.Color1 = Color.Red;
+            pointer.FillColor.Color2 = Color.Empty;
+            pointer.ThermoBackColor.Color1 = Color.FromArgb(100, 60, 60, 60);
+
+            pointer.Value = 12;
+
+            scale.Pointers.Add(pointer);
+
+            _GaugeControl.LinearScales.Add(scale);
+
+            scale = new GaugeLinearScale(_GaugeControl);
+            scale.Name = "Scale2";
+
+            scale.Width = 0.1F;
+            scale.Location = new PointF(.55f, .51f);
+
+            scale.MinValue = -22;
+            scale.MaxValue = 104;
+
+            scale.Labels.FormatString = "0�";
+            scale.Labels.Layout.Placement = DisplayPlacement.Far;
+            scale.Labels.ShowMaxLabel = false;
+            scale.Labels.ShowMinLabel = false;
+
+            scale.MinPin.Visible = false;
+            scale.MaxPin.Visible = false;
+
+            scale.MajorTickMarks.Interval = 20;
+            scale.MajorTickMarks.IntervalOffset = 2;
+            scale.MajorTickMarks.Layout.Placement = DisplayPlacement.Far;
+            scale.MajorTickMarks.Layout.Style = GaugeMarkerStyle.Rectangle;
+            scale.MajorTickMarks.Layout.Width = 0.008F;
+
+            scale.MinorTickMarks.Interval = 4;
+            scale.MinorTickMarks.IntervalOffset = 2;
+            scale.MinorTickMarks.Layout.Placement = DisplayPlacement.Far;
+            scale.MinorTickMarks.Layout.Width = 0.016F;
+
+            _GaugeControl.LinearScales.Add(scale);
+
+            GaugeText text = new GaugeText(_GaugeControl);
+            text.Location = new PointF(.08f, .28f);
+            text.Name = "Text1";
+            text.Text = "C�";
+
+            _GaugeControl.GaugeItems.Add(text);
+
+            text = new GaugeText(_GaugeControl);
+            text.Location = new PointF(.08f, .73f);
+            text.Name = "Text2";
+            text.Text = "F�";
+
+            _GaugeControl.GaugeItems.Add(text);
+        }
+
+        #endregion
+
+        #region SetVerticalDesignTimeDefaults
+
+        private void SetVerticalDesignTimeDefaults()
+        {
+            _GaugeControl.Frame.Style = GaugeFrameStyle.Rectangular;
+
+            SetBaseGuageColor();
+
+            GaugeLinearScale scale = new GaugeLinearScale(_GaugeControl);
+            scale.Name = "Scale1";
+            scale.Orientation = Orientation.Vertical;
+
+            scale.MaxValue = 50;
+            scale.Labels.Layout.ScaleOffset = .03f;
+
+            scale.MinPin.Visible = false;
+            scale.MaxPin.Visible = false;
+
+            _GaugeControl.LinearScales.Add(scale);
+
+            GaugeSection section = new GaugeSection(scale);
+
+            section.Name = "Section1";
+            section.FillColor = new GradientFillColor(Color.CornflowerBlue, Color.Purple);
+
+            scale.Sections.Add(section);
+
+            GaugePointer pointer = new GaugePointer(scale);
+
+            pointer.Name = "Pointer1";
+            pointer.Style = PointerStyle.Marker;
+            pointer.Placement = DisplayPlacement.Far;
+            pointer.ScaleOffset = .05f;
+
+            pointer.FillColor = new GradientFillColor(Color.Red);
+            pointer.FillColor.BorderColor = Color.DimGray;
+            pointer.FillColor.BorderWidth = 1;
+
+            Color color1 = Color.FromArgb(100, 60, 60, 60);
+
+            pointer.ThermoBackColor = new GradientFillColor(color1);
+            pointer.ThermoBackColor.BorderColor = Color.Black;
+            pointer.ThermoBackColor.BorderWidth = 1;
+
+            scale.Pointers.Add(pointer);
+        }
+
+        #endregion
+
+        #region SetV2ScalesDesignTimeDefaults
+
+        private void SetV2ScalesDesignTimeDefaults()
+        {
+            _GaugeControl.Frame.Style = GaugeFrameStyle.Rectangular;
+
+            SetBaseGuageColor();
+
+            GaugeLinearScale scale = new GaugeLinearScale(_GaugeControl);
+            scale.Name = "Scale1";
+            scale.Orientation = Orientation.Vertical;
+
+            scale.MaxValue = 50;
+            scale.Width = 0.14F;
+
+            scale.BorderColor = Color.Gray;
+            scale.BorderWidth = 1;
+            scale.Location = new PointF(.5f, .53f);
+
+            scale.MajorTickMarks.Layout.Style = GaugeMarkerStyle.Rectangle;
+            scale.MajorTickMarks.Layout.Placement = DisplayPlacement.Near;
+            scale.MajorTickMarks.Layout.Width = 0.047F;
+
+            scale.MinorTickMarks.Layout.Placement = DisplayPlacement.Near;
+
+            scale.MaxPin.Visible = false;
+            scale.MinPin.Visible = false;
+
+            GaugeSection section = new GaugeSection(scale);
+            section.Name = "Section1";
+
+            section.FillColor.Color1 = Color.CornflowerBlue;
+
+            scale.Sections.Add(section);
+
+            GaugePointer pointer = new GaugePointer(scale);
+            pointer.Name = "Pointer1";
+            pointer.Style = PointerStyle.Bar;
+
+            pointer.CapFillColor.BorderColor = Color.DimGray;
+            pointer.CapFillColor.BorderWidth = 1;
+            pointer.CapFillColor.Color1 = Color.WhiteSmoke;
+            pointer.CapFillColor.Color2 = Color.DimGray;
+
+            pointer.FillColor.BorderColor = Color.DimGray;
+            pointer.FillColor.BorderWidth = 1;
+            pointer.FillColor.Color1 = Color.Red;
+
+            pointer.Value = 15;
+
+            scale.Pointers.Add(pointer);
+
+            _GaugeControl.LinearScales.Add(scale);
+
+            scale = new GaugeLinearScale(_GaugeControl);
+            scale.Name = "Scale2";
+            scale.Orientation = Orientation.Vertical;
+            
+            scale.Width = 0.14F;
+            scale.MaxValue = 25;
+
+            scale.Location = new PointF(.5f, .53f);
+
+            scale.Labels.Layout.Placement = DisplayPlacement.Far;
+            scale.Labels.Layout.ScaleOffset = 0.054F;
+
+            scale.MajorTickMarks.Interval = 5;
+            scale.MajorTickMarks.Layout.Width = 0.047F;
+            scale.MajorTickMarks.Layout.Style = GaugeMarkerStyle.Rectangle;
+            scale.MajorTickMarks.Layout.Placement = DisplayPlacement.Far;
+
+            scale.MinorTickMarks.Interval = 1.25f;
+            scale.MinorTickMarks.Layout.Placement = DisplayPlacement.Far;
+
+            scale.MaxPin.Visible = false;
+            scale.MinPin.Visible = false;
+
+            _GaugeControl.LinearScales.Add(scale);
+        }
+
+        #endregion
+
+        #region SetVMultiBarsDesignTimeDefaults
+
+        private void SetVMultiBarsDesignTimeDefaults()
+        {
+            _GaugeControl.Frame.Style = GaugeFrameStyle.Rectangular;
+
+            SetBaseGuageColor();
+
+            GaugeLinearScale scale = new GaugeLinearScale(_GaugeControl);
+            scale.Name = "Scale1";
+            scale.Orientation = Orientation.Vertical;
+
+            scale.MaxValue = 50;
+            scale.Width = 0;
+
+            scale.Labels.Layout.Placement = DisplayPlacement.Near;
+            scale.Location = new PointF(.38f, .5f);
+
+            scale.MajorTickMarks.Layout.Placement = DisplayPlacement.Near;
+            scale.MajorTickMarks.Layout.Style = GaugeMarkerStyle.Rectangle;
+            scale.MajorTickMarks.Layout.Width = 0.044F;
+
+            scale.MinorTickMarks.Layout.Placement = DisplayPlacement.Near;
+
+            scale.MaxPin.Visible = false;
+            scale.MinPin.Visible = false;
+
+            GaugePointer pointer = new GaugePointer(scale);
+            pointer.Name = "Pointer1";
+            pointer.Style = PointerStyle.Bar;
+            pointer.BarStyle = BarPointerStyle.Rounded;
+
+            pointer.Width = .12f;
+            pointer.ScaleOffset = 0.022F;
+            pointer.Placement = DisplayPlacement.Far;
+
+            pointer.FillColor.BorderColor = Color.DimGray;
+            pointer.FillColor.BorderWidth = 1;
+            pointer.FillColor.Color1 = Color.Yellow;
+
+            pointer.Value = 15;
+
+            scale.Pointers.Add(pointer);
+
+            pointer = new GaugePointer(scale);
+            pointer.Name = "Pointer2";
+            pointer.Style = PointerStyle.Bar;
+            pointer.BarStyle = BarPointerStyle.Rounded;
+
+            pointer.Width = .12f;
+            pointer.ScaleOffset = 0.17F;
+            pointer.Placement = DisplayPlacement.Far;
+
+            pointer.FillColor.BorderColor = Color.DimGray;
+            pointer.FillColor.BorderWidth = 1;
+            pointer.FillColor.Color1 = Color.Gold;
+
+            pointer.Value = 25;
+
+            scale.Pointers.Add(pointer);
+
+            pointer = new GaugePointer(scale);
+            pointer.Name = "Pointer3";
+            pointer.Style = PointerStyle.Bar;
+            pointer.BarStyle = BarPointerStyle.Rounded;
+
+            pointer.Width = .12f;
+            pointer.ScaleOffset = 0.318F;
+            pointer.Placement = DisplayPlacement.Far;
+
+            pointer.FillColor.BorderColor = Color.DimGray;
+            pointer.FillColor.BorderWidth = 1;
+            pointer.FillColor.Color1 = Color.Chartreuse;
+
+            pointer.Value = 35;
+
+            scale.Pointers.Add(pointer);
+
+            pointer = new GaugePointer(scale);
+            pointer.Name = "Pointer4";
+            pointer.Style = PointerStyle.Bar;
+            pointer.BarStyle = BarPointerStyle.Rounded;
+
+            pointer.Width = .12f;
+            pointer.ScaleOffset = 0.46F;
+            pointer.Placement = DisplayPlacement.Far;
+
+            pointer.FillColor.BorderColor = Color.DimGray;
+            pointer.FillColor.BorderWidth = 1;
+            pointer.FillColor.Color1 = Color.Turquoise;
+
+            pointer.Value = 50;
+
+            scale.Pointers.Add(pointer);
+
+            _GaugeControl.LinearScales.Add(scale);
+        }
+
+        #endregion
+
+        #region SetVMThermometerDesignTimeDefaults
+
+        private void SetVThermometerDesignTimeDefaults()
+        {
+            _GaugeControl.Frame.Style = GaugeFrameStyle.Rectangular;
+
+            SetBaseGuageColor();
+
+            GaugeLinearScale scale = new GaugeLinearScale(_GaugeControl);
+            scale.Name = "Scale1";
+            scale.Orientation = Orientation.Vertical;
+
+            scale.Width = 0.1F;
+            scale.Size = new SizeF(.75f, .75f);
+            scale.Location = new PointF(.50f, .46f);
+
+            scale.MinValue = -30;
+            scale.MaxValue = 40;
+
+            scale.Labels.FormatString = "0�";
+
+            scale.MajorTickMarks.Layout.Placement = DisplayPlacement.Near;
+            scale.MajorTickMarks.Layout.Style = GaugeMarkerStyle.Rectangle;
+            scale.MajorTickMarks.Layout.Width = 0.008F;
+
+            scale.MinPin.Visible = false;
+            scale.MaxPin.Visible = false;
+
+            scale.MinorTickMarks.Layout.Placement = DisplayPlacement.Near;
+            scale.MinorTickMarks.Layout.Width = 0.016F;
+
+            GaugeSection section = new GaugeSection(scale);
+            section.Name = "Section1";
+
+            section.FillColor.Color1 = Color.SteelBlue;
+            section.FillColor.Color2 = Color.LightCyan;
+            section.FillColor.GradientFillType = GradientFillType.VerticalCenter;
+
+            scale.Sections.Add(section);
+
+            GaugePointer pointer = new GaugePointer(scale);
+            pointer.Name = "Pointer1";
+            pointer.Width = 0.1F;
+
+            pointer.Style = PointerStyle.Thermometer;
+            pointer.BulbSize = 0.132F;
+            pointer.BulbOffset = .026F;
+
+            pointer.FillColor.Color1 = Color.Red;
+            pointer.FillColor.Color2 = Color.Empty;
+            pointer.FillColor.BorderColor = Color.DimGray;
+            pointer.FillColor.BorderWidth = 1;
+
+            pointer.ThermoBackColor.Color1 = Color.FromArgb(100, 60, 60, 60);
+            pointer.FillColor.BorderColor = Color.Black;
+            pointer.FillColor.BorderWidth = 1;
+
+            pointer.Value = 12;
+
+            scale.Pointers.Add(pointer);
+
+            _GaugeControl.LinearScales.Add(scale);
+
+            scale = new GaugeLinearScale(_GaugeControl);
+            scale.Name = "Scale2";
+            scale.Orientation = Orientation.Vertical;
+
+            scale.Width = 0.1F;
+            scale.Size = new SizeF(.75f, .75f);
+            scale.Location = new PointF(.50f, .46f);
+
+            scale.MinValue = -22;
+            scale.MaxValue = 104;
+
+            scale.Labels.FormatString = "0�";
+            scale.Labels.Layout.Placement = DisplayPlacement.Far;
+            scale.Labels.ShowMaxLabel = false;
+            scale.Labels.ShowMinLabel = false;
+
+            scale.MinPin.Visible = false;
+            scale.MaxPin.Visible = false;
+
+            scale.MajorTickMarks.Interval = 20;
+            scale.MajorTickMarks.IntervalOffset = 2;
+            scale.MajorTickMarks.Layout.Placement = DisplayPlacement.Far;
+            scale.MajorTickMarks.Layout.Style = GaugeMarkerStyle.Rectangle;
+            scale.MajorTickMarks.Layout.Width = 0.008F;
+
+            scale.MinorTickMarks.Interval = 4;
+            scale.MinorTickMarks.IntervalOffset = 2;
+            scale.MinorTickMarks.Layout.Placement = DisplayPlacement.Far;
+            scale.MinorTickMarks.Layout.Width = 0.016F;
+
+            _GaugeControl.LinearScales.Add(scale);
+
+            GaugeText text = new GaugeText(_GaugeControl);
+            text.Location = new PointF(.26f, .9f);
+            text.Name = "Text1";
+            text.Text = "C�";
+
+            _GaugeControl.GaugeItems.Add(text);
+
+            text = new GaugeText(_GaugeControl);
+            text.Location = new PointF(.76f, .9f);
+            text.Name = "Text2";
+            text.Text = "F�";
+
+            _GaugeControl.GaugeItems.Add(text);
+        }
+
+        #endregion
+
+        #region SetBaseGuageColor
+
+        private void SetBaseGuageColor()
+        {
+            _GaugeControl.Frame.BackColor = new GradientFillColor(Color.Gainsboro, Color.DarkGray);
+
+            _GaugeControl.Frame.FrameColor = new GradientFillColor(Color.White, Color.DimGray);
+            _GaugeControl.Frame.FrameColor.BorderColor = Color.Gainsboro;
+            _GaugeControl.Frame.FrameColor.BorderWidth = 1;
+        }
+
+        #endregion
+
+        #region Verbs
+
+        /// <summary>
+        /// Creates our verb collection
+        /// </summary>
+        public override DesignerVerbCollection Verbs
+        {
+            get
+            {
+                DesignerVerb[] verbs = new DesignerVerb[]
+                {
+                    new DesignerVerb("Circular Frame", SetStyleCircular),
+                    new DesignerVerb("Rectangular Frame", SetStyleRectangular),
+                    new DesignerVerb("Rectangular Round Frame", SetStyleRoundedRectangular),
+                    new DesignerVerb("No Frame", SetStyleNone),
+                };
+
+                return (new DesignerVerbCollection(verbs));
+            }
+        }
+
+        #endregion
+
+        #region SetStyle
+
+        /// <summary>
+        /// Sets the control to Style1
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected virtual void SetStyleCircular(object sender, EventArgs e)
+        {
+            _GaugeControl.Frame.Style = GaugeFrameStyle.Circular;
+        }
+
+        /// <summary>
+        /// Sets the control to SetStyleRectangular
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected virtual void SetStyleRectangular(object sender, EventArgs e)
+        {
+            _GaugeControl.Frame.Style = GaugeFrameStyle.Rectangular;
+        }
+
+        /// <summary>
+        /// Sets the control to SetStyleRoundedRectangular
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected virtual void SetStyleRoundedRectangular(object sender, EventArgs e)
+        {
+           _GaugeControl.Frame.Style = GaugeFrameStyle.RoundedRectangular;
+        }
+
+        /// <summary>
+        /// Sets the control to None
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected virtual void SetStyleNone(object sender, EventArgs e)
+        {
+            _GaugeControl.Frame.Style = GaugeFrameStyle.None;
+        }
+
+        #endregion
+
+        #region ActionLists
+
+        public override DesignerActionListCollection ActionLists
+        {
+            get
+            {
+                if (_ActionLists == null)
+                {
+                    _ActionLists = new DesignerActionListCollection();
+
+                    _ActionLists.Add(new GaugeControlActionList(_GaugeControl));
+                }
+
+                return (_ActionLists);
+            }
+        }
+
+        #endregion
+
+        #region Licensing Stuff
+
+#if !TRIAL
+        private string GetLicenseKey()
+        {
+            string key = "";
+
+            RegistryKey regkey =
+                Registry.LocalMachine.OpenSubKey("Software\\DevComponents\\Licenses", false);
+
+            if (regkey != null)
+            {
+                object keyValue = regkey.GetValue("DevComponents.DotNetBar.DotNetBarManager2");
+
+                if (keyValue != null)
+                    key = keyValue.ToString();
+            }
+
+            return (key);
+        }
+
+        private void DhLoadComplete(object sender, EventArgs e)
+        {
+            IDesignerHost dh = GetService(typeof(IDesignerHost)) as IDesignerHost;
+
+            if (dh != null)
+                dh.LoadComplete -= DhLoadComplete;
+
+            string key = GetLicenseKey();
+
+            GaugeControl gauge = Control as GaugeControl;
+
+            if (key != "" && gauge != null && gauge.LicenseKey == "" && gauge.LicenseKey != key)
+                TypeDescriptor.GetProperties(gauge)["LicenseKey"].SetValue(gauge, key);
+        }
+#endif
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/GaugeItemCollectionEditor.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/GaugeItemCollectionEditor.cs
new file mode 100644
index 00000000..879ac8eb
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/GaugeItemCollectionEditor.cs	
@@ -0,0 +1,337 @@
+using System;
+using System.ComponentModel.Design;
+using System.Drawing;
+using System.Reflection;
+using System.Resources;
+using System.Windows.Forms;
+using DevComponents.DotNetBarKnobControl.Design.Properties;
+
+namespace DevComponents.Instrumentation.Design
+{
+    public class GaugeItemCollectionEditor : CollectionEditor
+    {
+        #region Private variables
+
+        private ListBox _ListBox;
+        private GaugeItem _CopyItem;
+        private GaugeItem _GaugeItem;
+        private GaugeItem _LastGaugeItem;
+        private PropertyGrid _PropertyGrid;
+
+        private ToolStripItem _AddTextItem;
+        private ToolStripItem _AddImageItem;
+        private ToolStripItem _AddDigitalIndicatorItem;
+        private ToolStripItem _AddMechanicalIndicatorItem;
+        private ToolStripItem _AddStateIndicatorItem;
+
+        private Button _CopyButton;
+        private ToolTip _ToolTip;
+
+        #endregion
+
+        public GaugeItemCollectionEditor(Type type)
+            : base(type)
+        {
+            _CopyItem = null;
+        }
+
+        #region CreateCollectionForm
+
+        protected override CollectionForm CreateCollectionForm()
+        {
+            CollectionForm collectionForm = base.CreateCollectionForm();
+
+            if (collectionForm.Controls[0] is TableLayoutPanel)
+            {
+                TableLayoutPanel tlpf = collectionForm.Controls["overArchingTableLayoutPanel"] as TableLayoutPanel;
+
+                if (tlpf != null)
+                {
+                    TableLayoutPanel tlp2 = tlpf.Controls["addRemoveTableLayoutPanel"] as TableLayoutPanel;
+
+                    if (tlp2 != null)
+                    {
+                        Button btn = tlp2.Controls["removeButton"] as Button;
+
+                        if (btn != null)
+                            btn.Click += GaugeCollectionEditor_RemoveClick;
+
+                        btn = tlp2.Controls["addButton"] as Button;
+
+                        if (btn != null)
+                        {
+                            _AddTextItem = btn.ContextMenuStrip.Items[0];
+                            _AddImageItem = btn.ContextMenuStrip.Items[1];
+                            _AddDigitalIndicatorItem = btn.ContextMenuStrip.Items[2];
+                            _AddMechanicalIndicatorItem = btn.ContextMenuStrip.Items[3];
+                            _AddStateIndicatorItem = btn.ContextMenuStrip.Items[4];
+
+                            AddCopyButton(collectionForm);
+                        }
+                    }
+
+                    _ListBox = tlpf.Controls["listbox"] as ListBox;
+
+                    if (_ListBox != null)
+                        _ListBox.SelectedIndexChanged += ListBox_SelectedIndexChanged;
+
+                    _PropertyGrid = tlpf.Controls["propertyBrowser"] as PropertyGrid;
+
+                    if (_PropertyGrid != null)
+                        _PropertyGrid.HelpVisible = true;
+                }
+            }
+
+            return (collectionForm);
+        }
+
+        #endregion
+
+        #region CreateInstance
+
+        protected override object CreateInstance(Type itemType)
+        {
+            if (itemType == typeof(DigitalIndicator))
+            {
+                NumericIndicator ind = (NumericIndicator)
+                    base.CreateInstance(typeof(NumericIndicator));
+
+                ind.Style = NumericIndicatorStyle.Digital16Segment;
+
+                ind.BackColor.BorderWidth = 3;
+                ind.BackColor.BorderColor = Color.Gray;
+                ind.BackColor.Color1 = Color.Black;
+
+                ind.DigitColor = Color.Red;
+                ind.DigitDimColor = Color.FromArgb(94, 0, 0);
+                ind.DecimalColor = Color.Lime;
+                ind.DecimalDimColor = Color.FromArgb(0, 94, 0);
+
+                ind.Size = new SizeF(.4f, .08f);
+
+                return (ind);
+            }
+
+            if (itemType == typeof(MechanicalIndicator))
+            {
+                NumericIndicator ind = (NumericIndicator)
+                    base.CreateInstance(typeof(NumericIndicator));
+
+                ind.BackColor.BorderWidth = 1;
+                ind.BackColor.BorderColor = Color.Black;
+                ind.BackColor.Color1 = Color.Gray;
+                ind.BackColor.Color2 = Color.White;
+                ind.BackColor.GradientFillType = GradientFillType.HorizontalCenter;
+
+                ind.SeparatorColor.BorderWidth = 1;
+                ind.SeparatorColor.BorderColor = Color.Gray;
+                ind.SeparatorColor.Color1 = Color.LightGray;
+                ind.SeparatorColor.Color2 = Color.DimGray;
+                ind.SeparatorColor.GradientFillType = GradientFillType.HorizontalCenter;
+
+                ind.Size = new SizeF(.4f, .08f);
+
+                return (ind);
+            }
+
+            if (itemType == typeof(StateIndicator))
+            {
+                StateIndicator ind = (StateIndicator)
+                    base.CreateInstance(typeof(StateIndicator));
+
+                ind.EmptyString = "";
+
+                return (ind);
+            }
+
+            return (base.CreateInstance(itemType));
+        }
+
+        #endregion
+
+        #region CopyButton support
+
+        #region AddCopyButton
+
+        private void AddCopyButton(CollectionForm collectionForm)
+        {
+            _CopyButton = new Button();
+
+            _CopyButton.Size = new Size(23, 24);
+            _CopyButton.Enabled = false;
+            _CopyButton.Click += CopyButton_Click;
+
+            ResourceManager rm = Resources.ResourceManager;
+            _CopyButton.Image = (Image)rm.GetObject("Copy");
+
+            collectionForm.Controls.Add(_CopyButton);
+
+            _CopyButton.Location = new Point(208, 85);
+            _CopyButton.BringToFront();
+
+            _ToolTip = new ToolTip();
+            _ToolTip.SetToolTip(_CopyButton, "Clone the selected item");
+        }
+
+        #endregion
+
+        #region CopyButton_Click
+
+        void CopyButton_Click(object sender, EventArgs e)
+        {
+            if (_GaugeItem != null)
+            {
+                _CopyItem = _GaugeItem;
+
+                if (_GaugeItem is GaugeText)
+                    _AddTextItem.PerformClick();
+
+                else if (_GaugeItem is GaugeImage)
+                    _AddImageItem.PerformClick();
+
+                else if (_GaugeItem is NumericIndicator)
+                {
+                    if (((NumericIndicator) _GaugeItem).Style == NumericIndicatorStyle.Mechanical)
+                        _AddMechanicalIndicatorItem.PerformClick();
+                    else
+                        _AddDigitalIndicatorItem.PerformClick();
+                }
+                else if (_GaugeItem is StateIndicator)
+                    _AddStateIndicatorItem.PerformClick();
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ListBox_SelectedIndexChanged
+
+        void ListBox_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            if (_ListBox.SelectedItem != null)
+            {
+                PropertyInfo p = _ListBox.SelectedItem.GetType().GetProperty("Value");
+
+                _LastGaugeItem = _GaugeItem;
+                _GaugeItem = (GaugeItem)p.GetValue(_ListBox.SelectedItem, null);
+
+                if (_CopyItem != null)
+                {
+                    if (_GaugeItem is GaugeText)
+                        CopyGaugeText(_LastGaugeItem as GaugeText, _GaugeItem as GaugeText);
+
+                    else if (_GaugeItem is GaugeImage)
+                        CopyGaugeImage(_LastGaugeItem as GaugeImage, _GaugeItem as GaugeImage);
+
+                    else if (_GaugeItem is NumericIndicator)
+                        CopyGaugeNumericIndicator(_LastGaugeItem as NumericIndicator, _GaugeItem as NumericIndicator);
+
+                    else if (_GaugeItem is StateIndicator)
+                        CopyGaugeStateIndicator(_LastGaugeItem as StateIndicator, _GaugeItem as StateIndicator);
+
+                    _CopyItem = null;
+                }
+
+                _CopyButton.Enabled = true;
+            }
+            else
+            {
+                _CopyButton.Enabled = false;
+            }
+        }
+
+        #endregion
+
+        #region CopyGaugeText
+
+        private void CopyGaugeText(GaugeText gt, GaugeText clone)
+        {
+            if (gt != null && clone != null)
+                gt.CopyToItem(clone);
+        }
+
+        #endregion
+
+        #region CopyGaugeImage
+
+        private void CopyGaugeImage(GaugeImage gi, GaugeImage clone)
+        {
+            if (gi != null && clone != null)
+                gi.CopyToItem(clone);
+        }
+
+        #endregion
+
+        #region CopyGaugeNumericIndicator
+
+        private void CopyGaugeNumericIndicator(NumericIndicator gi, NumericIndicator clone)
+        {
+            if (gi != null && clone != null)
+                gi.CopyToItem(clone);
+        }
+
+        #endregion
+
+        #region CopyGaugeStateIndicator
+
+        private void CopyGaugeStateIndicator(StateIndicator gi, StateIndicator clone)
+        {
+            if (gi != null && clone != null)
+                gi.CopyToItem(clone);
+        }
+
+        #endregion
+
+        #region CreateCollectionItemType
+
+        protected override Type CreateCollectionItemType()
+        {
+            return typeof(GaugeText);
+        }
+
+        #endregion
+
+        #region CreateNewItemTypes
+
+        protected override Type[] CreateNewItemTypes()
+        {
+            return new Type[]
+            {
+                typeof(GaugeText),
+                typeof(GaugeImage),
+                typeof(DigitalIndicator),
+                typeof(MechanicalIndicator),
+                typeof(StateIndicator),
+            };
+        }
+
+        private class DigitalIndicator : NumericIndicator
+        {
+        }
+
+        private class MechanicalIndicator : NumericIndicator
+        {
+        }
+
+        #endregion
+
+        #region GaugeCollectionEditor_RemoveClick
+
+        void GaugeCollectionEditor_RemoveClick(object sender, EventArgs e)
+        {
+            if (_LastGaugeItem != null)
+            {
+                _LastGaugeItem.Visible = false;
+                _LastGaugeItem = null;
+            }
+            else if (_GaugeItem != null)
+            {
+                _GaugeItem.Visible = false;
+                _GaugeItem = null;
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/GaugePropertyGrid.Designer.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/GaugePropertyGrid.Designer.cs
new file mode 100644
index 00000000..fd695dca
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/GaugePropertyGrid.Designer.cs	
@@ -0,0 +1,95 @@
+namespace DevComponents.DotNetBarKnobControl.Design
+{
+    partial class GaugePropertyGrid
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form 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.propertyGrid1 = new System.Windows.Forms.PropertyGrid();
+            this._BtnOk = new System.Windows.Forms.Button();
+            this._BtnCancel = new System.Windows.Forms.Button();
+            this.SuspendLayout();
+            // 
+            // propertyGrid1
+            // 
+            this.propertyGrid1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+                        | System.Windows.Forms.AnchorStyles.Left)
+                        | System.Windows.Forms.AnchorStyles.Right)));
+            this.propertyGrid1.Location = new System.Drawing.Point(0, 0);
+            this.propertyGrid1.Name = "propertyGrid1";
+            this.propertyGrid1.Size = new System.Drawing.Size(386, 408);
+            this.propertyGrid1.TabIndex = 0;
+            // 
+            // _BtnOk
+            // 
+            this._BtnOk.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this._BtnOk.DialogResult = System.Windows.Forms.DialogResult.OK;
+            this._BtnOk.Location = new System.Drawing.Point(214, 427);
+            this._BtnOk.Name = "_BtnOk";
+            this._BtnOk.Size = new System.Drawing.Size(75, 23);
+            this._BtnOk.TabIndex = 1;
+            this._BtnOk.Text = "Ok";
+            this._BtnOk.UseVisualStyleBackColor = true;
+            // 
+            // _BtnCancel
+            // 
+            this._BtnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this._BtnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+            this._BtnCancel.Location = new System.Drawing.Point(295, 427);
+            this._BtnCancel.Name = "_BtnCancel";
+            this._BtnCancel.Size = new System.Drawing.Size(75, 23);
+            this._BtnCancel.TabIndex = 2;
+            this._BtnCancel.Text = "Cancel";
+            this._BtnCancel.UseVisualStyleBackColor = true;
+            // 
+            // GaugePropertyGrid
+            // 
+            this.AcceptButton = this._BtnOk;
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.CancelButton = this._BtnCancel;
+            this.ClientSize = new System.Drawing.Size(384, 462);
+            this.Controls.Add(this._BtnCancel);
+            this.Controls.Add(this._BtnOk);
+            this.Controls.Add(this.propertyGrid1);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.SizableToolWindow;
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.Name = "GaugePropertyGrid";
+            this.ShowInTaskbar = false;
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+            this.Text = "GaugePropertyGrid";
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.PropertyGrid propertyGrid1;
+        private System.Windows.Forms.Button _BtnOk;
+        private System.Windows.Forms.Button _BtnCancel;
+    }
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/GaugePropertyGrid.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/GaugePropertyGrid.cs
new file mode 100644
index 00000000..f1f8a07a
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/GaugePropertyGrid.cs	
@@ -0,0 +1,22 @@
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBarKnobControl.Design
+{
+    public partial class GaugePropertyGrid : Form
+    {
+        public GaugePropertyGrid()
+        {
+            InitializeComponent();
+        }
+
+        #region Public properties
+
+        public object SelectedObject
+        {
+            get { return (propertyGrid1.SelectedObject); }
+            set { propertyGrid1.SelectedObject = value; }
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/GaugePropertyGrid.resx b/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/GaugePropertyGrid.resx
new file mode 100644
index 00000000..19dc0dd8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/GaugePropertyGrid.resx	
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/GaugeStyleDialog.Designer.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/GaugeStyleDialog.Designer.cs
new file mode 100644
index 00000000..5ab68bb9
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/GaugeStyleDialog.Designer.cs	
@@ -0,0 +1,335 @@
+namespace DevComponents.DotNetBarKnobControl.Design
+{
+    partial class GaugeStyleDialog
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form 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()
+        {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(GaugeStyleDialog));
+            this.label1 = new System.Windows.Forms.Label();
+            this.cbVThermometer = new System.Windows.Forms.CheckBox();
+            this.cbVMultiBars = new System.Windows.Forms.CheckBox();
+            this.cbV2Scales = new System.Windows.Forms.CheckBox();
+            this.cbVertical = new System.Windows.Forms.CheckBox();
+            this.cbHThermometer = new System.Windows.Forms.CheckBox();
+            this.cbHMultiBars = new System.Windows.Forms.CheckBox();
+            this.cbH2Scales = new System.Windows.Forms.CheckBox();
+            this.cbHorizontal = new System.Windows.Forms.CheckBox();
+            this.cbCTopMeter = new System.Windows.Forms.CheckBox();
+            this.cbCBottomMeter = new System.Windows.Forms.CheckBox();
+            this.cbCInsetScale = new System.Windows.Forms.CheckBox();
+            this.cbC2Scales = new System.Windows.Forms.CheckBox();
+            this.cbCircular = new System.Windows.Forms.CheckBox();
+            this.btnOk = new System.Windows.Forms.Button();
+            this.SuspendLayout();
+            // 
+            // label1
+            // 
+            this.label1.BackColor = System.Drawing.SystemColors.ControlLight;
+            this.label1.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.label1.Location = new System.Drawing.Point(0, 547);
+            this.label1.Name = "label1";
+            this.label1.Padding = new System.Windows.Forms.Padding(10, 0, 0, 0);
+            this.label1.Size = new System.Drawing.Size(736, 55);
+            this.label1.TabIndex = 4;
+            this.label1.Text = "Please select your starting Scale template";
+            this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // cbVThermometer
+            // 
+            this.cbVThermometer.Appearance = System.Windows.Forms.Appearance.Button;
+            this.cbVThermometer.AutoCheck = false;
+            this.cbVThermometer.AutoSize = true;
+            this.cbVThermometer.Image = ((System.Drawing.Image)(resources.GetObject("cbVThermometer.Image")));
+            this.cbVThermometer.ImageAlign = System.Drawing.ContentAlignment.TopLeft;
+            this.cbVThermometer.Location = new System.Drawing.Point(545, 335);
+            this.cbVThermometer.Name = "cbVThermometer";
+            this.cbVThermometer.Size = new System.Drawing.Size(164, 181);
+            this.cbVThermometer.TabIndex = 40;
+            this.cbVThermometer.Text = "Thermometer";
+            this.cbVThermometer.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.cbVThermometer.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+            this.cbVThermometer.UseVisualStyleBackColor = true;
+            this.cbVThermometer.Click += new System.EventHandler(this.CbCheckedChanged);
+            // 
+            // cbVMultiBars
+            // 
+            this.cbVMultiBars.Appearance = System.Windows.Forms.Appearance.Button;
+            this.cbVMultiBars.AutoCheck = false;
+            this.cbVMultiBars.AutoSize = true;
+            this.cbVMultiBars.Image = ((System.Drawing.Image)(resources.GetObject("cbVMultiBars.Image")));
+            this.cbVMultiBars.Location = new System.Drawing.Point(373, 335);
+            this.cbVMultiBars.Name = "cbVMultiBars";
+            this.cbVMultiBars.Size = new System.Drawing.Size(164, 181);
+            this.cbVMultiBars.TabIndex = 39;
+            this.cbVMultiBars.Text = "Multiple Bars";
+            this.cbVMultiBars.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.cbVMultiBars.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+            this.cbVMultiBars.UseVisualStyleBackColor = true;
+            this.cbVMultiBars.Click += new System.EventHandler(this.CbCheckedChanged);
+            // 
+            // cbV2Scales
+            // 
+            this.cbV2Scales.Appearance = System.Windows.Forms.Appearance.Button;
+            this.cbV2Scales.AutoCheck = false;
+            this.cbV2Scales.AutoSize = true;
+            this.cbV2Scales.Image = ((System.Drawing.Image)(resources.GetObject("cbV2Scales.Image")));
+            this.cbV2Scales.Location = new System.Drawing.Point(201, 335);
+            this.cbV2Scales.Name = "cbV2Scales";
+            this.cbV2Scales.Size = new System.Drawing.Size(164, 181);
+            this.cbV2Scales.TabIndex = 38;
+            this.cbV2Scales.Text = "2 Scales";
+            this.cbV2Scales.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.cbV2Scales.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+            this.cbV2Scales.UseVisualStyleBackColor = true;
+            this.cbV2Scales.Click += new System.EventHandler(this.CbCheckedChanged);
+            // 
+            // cbVertical
+            // 
+            this.cbVertical.Appearance = System.Windows.Forms.Appearance.Button;
+            this.cbVertical.AutoCheck = false;
+            this.cbVertical.AutoSize = true;
+            this.cbVertical.Image = ((System.Drawing.Image)(resources.GetObject("cbVertical.Image")));
+            this.cbVertical.Location = new System.Drawing.Point(29, 335);
+            this.cbVertical.Name = "cbVertical";
+            this.cbVertical.Size = new System.Drawing.Size(164, 181);
+            this.cbVertical.TabIndex = 37;
+            this.cbVertical.Text = "Vertical";
+            this.cbVertical.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.cbVertical.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+            this.cbVertical.UseVisualStyleBackColor = true;
+            this.cbVertical.Click += new System.EventHandler(this.CbCheckedChanged);
+            // 
+            // cbHThermometer
+            // 
+            this.cbHThermometer.Appearance = System.Windows.Forms.Appearance.Button;
+            this.cbHThermometer.AutoCheck = false;
+            this.cbHThermometer.AutoSize = true;
+            this.cbHThermometer.Image = ((System.Drawing.Image)(resources.GetObject("cbHThermometer.Image")));
+            this.cbHThermometer.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            this.cbHThermometer.Location = new System.Drawing.Point(545, 216);
+            this.cbHThermometer.Name = "cbHThermometer";
+            this.cbHThermometer.Size = new System.Drawing.Size(166, 113);
+            this.cbHThermometer.TabIndex = 36;
+            this.cbHThermometer.Text = "Thermometer";
+            this.cbHThermometer.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.cbHThermometer.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+            this.cbHThermometer.UseVisualStyleBackColor = true;
+            this.cbHThermometer.Click += new System.EventHandler(this.CbCheckedChanged);
+            // 
+            // cbHMultiBars
+            // 
+            this.cbHMultiBars.Appearance = System.Windows.Forms.Appearance.Button;
+            this.cbHMultiBars.AutoCheck = false;
+            this.cbHMultiBars.AutoSize = true;
+            this.cbHMultiBars.Image = ((System.Drawing.Image)(resources.GetObject("cbHMultiBars.Image")));
+            this.cbHMultiBars.Location = new System.Drawing.Point(373, 216);
+            this.cbHMultiBars.Name = "cbHMultiBars";
+            this.cbHMultiBars.Size = new System.Drawing.Size(166, 113);
+            this.cbHMultiBars.TabIndex = 35;
+            this.cbHMultiBars.Text = "Multiple Bars";
+            this.cbHMultiBars.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.cbHMultiBars.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+            this.cbHMultiBars.UseVisualStyleBackColor = true;
+            this.cbHMultiBars.Click += new System.EventHandler(this.CbCheckedChanged);
+            // 
+            // cbH2Scales
+            // 
+            this.cbH2Scales.Appearance = System.Windows.Forms.Appearance.Button;
+            this.cbH2Scales.AutoCheck = false;
+            this.cbH2Scales.AutoSize = true;
+            this.cbH2Scales.Image = ((System.Drawing.Image)(resources.GetObject("cbH2Scales.Image")));
+            this.cbH2Scales.Location = new System.Drawing.Point(201, 216);
+            this.cbH2Scales.Name = "cbH2Scales";
+            this.cbH2Scales.Size = new System.Drawing.Size(166, 113);
+            this.cbH2Scales.TabIndex = 34;
+            this.cbH2Scales.Text = "2 Scales";
+            this.cbH2Scales.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.cbH2Scales.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+            this.cbH2Scales.UseVisualStyleBackColor = true;
+            this.cbH2Scales.Click += new System.EventHandler(this.CbCheckedChanged);
+            // 
+            // cbHorizontal
+            // 
+            this.cbHorizontal.Appearance = System.Windows.Forms.Appearance.Button;
+            this.cbHorizontal.AutoCheck = false;
+            this.cbHorizontal.AutoSize = true;
+            this.cbHorizontal.Image = ((System.Drawing.Image)(resources.GetObject("cbHorizontal.Image")));
+            this.cbHorizontal.Location = new System.Drawing.Point(29, 216);
+            this.cbHorizontal.Name = "cbHorizontal";
+            this.cbHorizontal.Size = new System.Drawing.Size(166, 113);
+            this.cbHorizontal.TabIndex = 33;
+            this.cbHorizontal.Text = "Horizontal";
+            this.cbHorizontal.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.cbHorizontal.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+            this.cbHorizontal.UseVisualStyleBackColor = true;
+            this.cbHorizontal.Click += new System.EventHandler(this.CbCheckedChanged);
+            // 
+            // cbCTopMeter
+            // 
+            this.cbCTopMeter.Appearance = System.Windows.Forms.Appearance.Button;
+            this.cbCTopMeter.AutoCheck = false;
+            this.cbCTopMeter.AutoSize = true;
+            this.cbCTopMeter.Image = ((System.Drawing.Image)(resources.GetObject("cbCTopMeter.Image")));
+            this.cbCTopMeter.Location = new System.Drawing.Point(545, 27);
+            this.cbCTopMeter.Name = "cbCTopMeter";
+            this.cbCTopMeter.Size = new System.Drawing.Size(166, 88);
+            this.cbCTopMeter.TabIndex = 32;
+            this.cbCTopMeter.Text = "Top Meter";
+            this.cbCTopMeter.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.cbCTopMeter.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+            this.cbCTopMeter.UseVisualStyleBackColor = true;
+            this.cbCTopMeter.Click += new System.EventHandler(this.CbCheckedChanged);
+            // 
+            // cbCBottomMeter
+            // 
+            this.cbCBottomMeter.Appearance = System.Windows.Forms.Appearance.Button;
+            this.cbCBottomMeter.AutoCheck = false;
+            this.cbCBottomMeter.AutoSize = true;
+            this.cbCBottomMeter.Image = ((System.Drawing.Image)(resources.GetObject("cbCBottomMeter.Image")));
+            this.cbCBottomMeter.Location = new System.Drawing.Point(545, 122);
+            this.cbCBottomMeter.Name = "cbCBottomMeter";
+            this.cbCBottomMeter.Size = new System.Drawing.Size(166, 88);
+            this.cbCBottomMeter.TabIndex = 31;
+            this.cbCBottomMeter.Text = "Bottom Meter";
+            this.cbCBottomMeter.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.cbCBottomMeter.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+            this.cbCBottomMeter.UseVisualStyleBackColor = true;
+            this.cbCBottomMeter.Click += new System.EventHandler(this.CbCheckedChanged);
+            // 
+            // cbCInsetScale
+            // 
+            this.cbCInsetScale.Appearance = System.Windows.Forms.Appearance.Button;
+            this.cbCInsetScale.AutoCheck = false;
+            this.cbCInsetScale.AutoSize = true;
+            this.cbCInsetScale.Image = ((System.Drawing.Image)(resources.GetObject("cbCInsetScale.Image")));
+            this.cbCInsetScale.Location = new System.Drawing.Point(373, 27);
+            this.cbCInsetScale.Name = "cbCInsetScale";
+            this.cbCInsetScale.Size = new System.Drawing.Size(166, 183);
+            this.cbCInsetScale.TabIndex = 30;
+            this.cbCInsetScale.Text = "Inset Scale";
+            this.cbCInsetScale.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.cbCInsetScale.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+            this.cbCInsetScale.UseVisualStyleBackColor = true;
+            this.cbCInsetScale.Click += new System.EventHandler(this.CbCheckedChanged);
+            // 
+            // cbC2Scales
+            // 
+            this.cbC2Scales.Appearance = System.Windows.Forms.Appearance.Button;
+            this.cbC2Scales.AutoCheck = false;
+            this.cbC2Scales.AutoSize = true;
+            this.cbC2Scales.Image = ((System.Drawing.Image)(resources.GetObject("cbC2Scales.Image")));
+            this.cbC2Scales.Location = new System.Drawing.Point(201, 27);
+            this.cbC2Scales.Name = "cbC2Scales";
+            this.cbC2Scales.Size = new System.Drawing.Size(166, 183);
+            this.cbC2Scales.TabIndex = 29;
+            this.cbC2Scales.Text = "2 Scales";
+            this.cbC2Scales.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.cbC2Scales.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+            this.cbC2Scales.UseVisualStyleBackColor = true;
+            this.cbC2Scales.Click += new System.EventHandler(this.CbCheckedChanged);
+            // 
+            // cbCircular
+            // 
+            this.cbCircular.Appearance = System.Windows.Forms.Appearance.Button;
+            this.cbCircular.AutoCheck = false;
+            this.cbCircular.AutoSize = true;
+            this.cbCircular.Checked = true;
+            this.cbCircular.CheckState = System.Windows.Forms.CheckState.Checked;
+            this.cbCircular.Image = ((System.Drawing.Image)(resources.GetObject("cbCircular.Image")));
+            this.cbCircular.Location = new System.Drawing.Point(29, 27);
+            this.cbCircular.Name = "cbCircular";
+            this.cbCircular.Size = new System.Drawing.Size(166, 183);
+            this.cbCircular.TabIndex = 28;
+            this.cbCircular.Text = "Circular";
+            this.cbCircular.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.cbCircular.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+            this.cbCircular.UseVisualStyleBackColor = true;
+            this.cbCircular.Click += new System.EventHandler(this.CbCheckedChanged);
+            // 
+            // btnOk
+            // 
+            this.btnOk.DialogResult = System.Windows.Forms.DialogResult.OK;
+            this.btnOk.Location = new System.Drawing.Point(634, 563);
+            this.btnOk.Name = "btnOk";
+            this.btnOk.Size = new System.Drawing.Size(75, 23);
+            this.btnOk.TabIndex = 41;
+            this.btnOk.Text = "Select";
+            this.btnOk.UseVisualStyleBackColor = true;
+            // 
+            // GaugeStyleDialog
+            // 
+            this.AcceptButton = this.btnOk;
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(736, 602);
+            this.ControlBox = false;
+            this.Controls.Add(this.btnOk);
+            this.Controls.Add(this.cbVThermometer);
+            this.Controls.Add(this.cbVMultiBars);
+            this.Controls.Add(this.cbV2Scales);
+            this.Controls.Add(this.cbVertical);
+            this.Controls.Add(this.cbHThermometer);
+            this.Controls.Add(this.cbHMultiBars);
+            this.Controls.Add(this.cbH2Scales);
+            this.Controls.Add(this.cbHorizontal);
+            this.Controls.Add(this.cbCTopMeter);
+            this.Controls.Add(this.cbCBottomMeter);
+            this.Controls.Add(this.cbCInsetScale);
+            this.Controls.Add(this.cbC2Scales);
+            this.Controls.Add(this.cbCircular);
+            this.Controls.Add(this.label1);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.Name = "GaugeStyleDialog";
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+            this.Text = "Initial Gauge Style";
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.CheckBox cbVThermometer;
+        private System.Windows.Forms.CheckBox cbVMultiBars;
+        private System.Windows.Forms.CheckBox cbV2Scales;
+        private System.Windows.Forms.CheckBox cbVertical;
+        private System.Windows.Forms.CheckBox cbHThermometer;
+        private System.Windows.Forms.CheckBox cbHMultiBars;
+        private System.Windows.Forms.CheckBox cbH2Scales;
+        private System.Windows.Forms.CheckBox cbHorizontal;
+        private System.Windows.Forms.CheckBox cbCTopMeter;
+        private System.Windows.Forms.CheckBox cbCBottomMeter;
+        private System.Windows.Forms.CheckBox cbCInsetScale;
+        private System.Windows.Forms.CheckBox cbC2Scales;
+        private System.Windows.Forms.CheckBox cbCircular;
+        private System.Windows.Forms.Button btnOk;
+    }
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/GaugeStyleDialog.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/GaugeStyleDialog.cs
new file mode 100644
index 00000000..19053398
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/GaugeStyleDialog.cs	
@@ -0,0 +1,60 @@
+using System;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBarKnobControl.Design
+{
+    public partial class GaugeStyleDialog : Form
+    {
+        #region Private variables
+
+        private CheckBox _CheckedBox;
+        private DateTime _LastClick;
+
+        #endregion
+
+        public GaugeStyleDialog()
+        {
+            InitializeComponent();
+
+            _CheckedBox = cbCircular;
+        }
+
+        #region Public properties
+
+        public string CbSelected
+        {
+            get { return (_CheckedBox.Name); }
+        }
+
+        #endregion
+
+        #region CbCheckedChanged
+
+        private void CbCheckedChanged(object sender, EventArgs e)
+        {
+            CheckBox cb = sender as CheckBox;
+
+            if (cb != null)
+            {
+                if (_CheckedBox != cb)
+                {
+                    _CheckedBox.Checked = false;
+
+                    _CheckedBox = cb;
+                    _CheckedBox.Checked = true;
+                }
+                else
+                {
+                    TimeSpan ts = DateTime.Now - _LastClick;
+
+                    if (ts.TotalMilliseconds < SystemInformation.DoubleClickTime)
+                        btnOk.PerformClick();
+                }
+            }
+
+            _LastClick = DateTime.Now;
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/GaugeStyleDialog.resx b/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/GaugeStyleDialog.resx
new file mode 100644
index 00000000..7601531f
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/GaugeStyleDialog.resx	
@@ -0,0 +1,1874 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="cbVThermometer.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAJ4AAACeCAIAAABM5yQsAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAUGFpbnQuTkVUIHYzLjUuNtCDrVoAAB3dSURBVHhe7d1Z
+        vGRVdcdxXnzxwRffHD++OqJ5URyhm4/Mg4hGERyCEUW0lcYG2oaoaaMBIaKGCMhogBs0hjCjggyKDMYQ
+        o1FD1BDmeZ4h+Vb9YXtyqmpX3b7V3Z/mnPXhU5/T5fXeqv07/7X3XmvtdTa7p7dn6Qhs9iz9Xv3XuqdH
+        +6y9CTYy2vPOO2/h2WtnnXXWRrxxNjJaWJ966qknn3zyiaE9PrTHHnvs0aE98sgjDw/toYceenBoDzzw
+        wP1Du+++++69994M3N13333X0O6888477rjj9qHdNrRbb731lqHdfPPNNw3txhtvvGFo/zO066+//r+H
+        9oc//OH3Q/vd7373X0O77rrr/nNov/3tb38ztF//+tf/MbRf/epXv/zlL/99aL/4xS/+bWjXXnvtvw7t
+        5z//+b8MzbfrNNpnK9ef/exnXUcbvdLBP89mvFx+sHXR/Geuvc54kZ8ctbPPPjtvLvbikksuueaaa3q0
+        Az+MxMc+9rF9993340Pbb7/9PjG0T37ykyuG9qlPferTn/70/kNbuXLlAQcc8JmhrVq16sADDzxoaAcf
+        fPDq1as/O7Q1a9YcMrRDDz30L4b2uc997vND+8IXvvCXQ1u7du0Xv/jFvxral770pS9/+ct/PbTDDjvs
+        8MMP/8rQjjjiiCOPPPJvhvbVr371qKF97Wtf+/rQvvGNb/zt0I4++ui/G9o3v/nNY445xt3Qo13I/Aot
+        rsb320P7+2fs1FNPzaWL2GlDO/3008uFa5bV2D8MrVy4PmPEvjNi3x3aP47Y94b2T8/YmWeemUsXsVFH
+        4xNCS+VXX31111WbdZMxIlZQy+KlLGGsYmJZy5QVjUVNsaxuyhqHe49Z7MSy5MmqJ5a1T1kBWQTFshQq
+        Zk1ULIujmKm0GIEWo9djjz3W61VXXdV1tFkPF7QhuolyBRjU4447rkd7j/s6+xxoza8c7ybNlRPmiqH1
+        euWVV3Zdtdm/QmvRVNAWJ7yp+GF6xTVov/Wtb1Ftj3YhcYkm2k2Xa9Aef/zx0P70pz/tumoTb4LWPsfy
+        cpPmWtACfMUVV/RoB3FEaG1eOeRNaz1c/HC8sVUxqCeccALV9mgXEh9uoZ20z7nssstOOumkbHIEJdwN
+        4j42OUIHwhQbeJ8zyjVoTzzxRGh/8pOfdF21iftDK94Uh1zZvy5fvhxOXEWOsDS43oGWMzeg55xzzgbb
+        v47lCq3P4JMA/OMf/7hHO8jnQCuOCG2FK5lGqdB+8IMfFGUCFVpiNZrCfuuPqzjVpZdemriE6KaYqHQk
+        DyyG5VoIE1T20Y9+FFp+hWovv/zyrqNNng5aweEm2mawybWh/NCHPiRECC2ir3vd65poZ4k3CS8b+lHj
+        LT7yjIkRjsabhKlf8pKXnHLKKbgKQUNrFnjb294Grdcf/ehHfqcYsrC2DQ+0J598MtX2aBeSf3WbQyss
+        PCmOSJ1/MrSXvvSl5557LsDQIhrVjurV5rJQ3Gdo/vn1E04//ITvnPi9c866+GKvro86/jTvJ5RYiSOS
+        ZtDuueeeyAVqXonVO34JrpIKPpufhNayoOuqTV6dauVzgral12Z8GM6olgfebbfdOGGvM/pho3/gkSfv
+        e9QZR5150QXXXuvV9YFHDKjUuSJa0G6++eYFrQv/bKJFN2jdqRx419GmXgJaDk0Cp8I1EX8Dnbg/1yex
+        MyNXcf8K2qlx/6AlUxcFLahRrck1qg1aSQ6q7dEupA7GbW4Oo9r55nO45XjjOORJqi1z7Z8PzYwrq9PM
+        5xSiMrI777wzx7vTTjsFba7dZwWt3Tm05uOuqzbVQ1TbQjv3PN1U1U7K02GMU4ISzFKOcLMkhpNkC1fB
+        Raq1GHSnWl71aAd1a9BaiBaHPHeu8q91tBWuBWriTcUi02K4Mit5aKn24osv7jra1CO6zdXBBO0cucqv
+        /T+HfMT4ZVT8cFxx0w9PiktEr6Ncg9a04uv0aBdSZ0q1ipugnSPXVr3EQLUT0I6tl1gHrkHrW1DtRRdd
+        1HXVpn7YbQ6tsVh/dTBj0a46YrC4Ddol6hVXKYHzzz/ft4D2hz/8YdfRpi6catUjFrSluGmJ9U1xyFkA
+        V9AWh6weMYAXNb9mlsW1oHWn9mgXUu8PrUCgfWpq88fWrSkRlQaQ6E7dmltBYYYRVLqmjJTo63VrFbRz
+        0WtB61tQ7Q9+8IOuqzbnONzmMjkGZRJXg/WBD3wA0WXLlnlVPwwtrfgnouqqbGHdH5V6xBnRrrNeC1oh
+        M5/2+9//fo92cD4naI1Fvc7UD2BJpjBbrbjYaqutoMWVcEe5qhst4YhZ0C6RqxytudbG19fp0S7k3BXB
+        SdgV1U6qH+aB3/GOdyD62te+FlpQg3aW+uGpc+2HP/xhwaZSL1Hfvzbn1+gVV3bBBRdAS7UXXnhh11Wb
+        83Ruc4c4gnYsV5vI1IWjC6pX28eCdpa6cGith1vpgayQ6+smoUQ/49VnQFQaw9Is1U9OkUhYFa5BK4nr
+        f3XRdbQ5J1nQTtKrbSK9gsohWzrxwLvuuisn7HUs16YrLivkSWgrflgQUYgY1Ne85jWAOTsErXDEW9/6
+        VkQxVrvjU0WyQStv7+v0aBdy/pVDdu4qKdhJeXVEDaLXeGD/F8KdRa85x1FRLVcck1Ef9cNyAD4YtCS7
+        xx57yCeCGrS4KuUpXBXN8MPQugmywe30+dqca3abE0TQzp6nm53rJLSf+cqJkNfnV6pF1yu0ACtYLGgL
+        VBe4Bq0TYD3awcGQnFcvaOfLVUy4hCPGqragnRT3zwHOolceuKAd5Rq0jvJBm14OnVZt+hDwrorHqHb9
+        naeroC0O2cXee+/NLZfQv5UdvXLCXt1/PPCOO+5o9eS16YcjWWbPE7Syez3aQX8Jo6aiLGjX0znJCtr6
+        PqeUFmeTA5iI2FiuUa1ztz3agUNO35CCdr5cZ3TIJa8+Nk9X4sPN/WvQFrHmQhUjtDwQtJbWXVdt+sEY
+        Dn0IbPbX37nmumon5V8XxRVaDjloWY920OeHajWXCNr1dF4dWoumVsgiyyjzayyzbCJNk+JNk/SKa9D6
+        Lj3agUNO/6aCdr5cJemaK+RJaJfuh8M1aMPVN+q6atOXixPTD4ZqK/0l9IDR78JrKsIV3PinuU1EQpMY
+        /6zXN41V7QGHn1DqTJeoV1yVlcvlBa1v1HW06bfmHpenK2hL05AS97fsTExxl112sbvgvbE0mltuuSW0
+        utdYMQkDVeolKmiLQ9YmaN38cLgGrQVUj3bgkNNHD1rNm4J2lGuzH8xee+0FrVflvqAGLa4aPI1y5ZDL
+        nrWu2qXMr4Vr0NrRQute7Lpq0x8xaOVM6lyJlWp5YycyCtoZ60wraOfFtUf7x+ib+zp9L6HVD6yJdjQ+
+        bGYl1pzP4YFH0dbrYGZxyIJN2bw283Rj969l3RQ/HHMYhGqFGKmWa+m6atPPFFopFJPlpLy61ZP0O7qg
+        GlYemHw5Ya9j51dJ9Wb40PVU1Rao68w1aOV8oJUk6NEO+tRCKzAbtGPzOWI9palfTl/5YQenZq8zhdZ6
+        uLWvzQq5HpeQSZTxdecl3uSItw2VqZRMTSKO50avMTnHHu3ALbuv03+4oF1Unm52rjmyPgltXa9Ss6C+
+        973vhVOVD7Q2r295y1sQxVg3TlNDuDoaBK0kPNW687qu2vSVhlY/U8OxlP6Io3Uwoktxy7Y3FbR/9ow5
+        sNuK+8sEgEq1SmVJ9j3veY8CD1CDFlfCLVyD1lYbWuuGHu2gXzi0io+aaBfb93JqXfhYtCsPGzjkyroJ
+        VGjJdIcddqDaV7/61crWC9rih0GN9WifXiS7r9NKFVrNhwvauXMVaaqjHZtX54eplgemV76XXr0WtKNc
+        HbyENrFGe/Suqzb9No0FtFaV6d2/qD61Fb1yyCXSVEFbHLILzVC45ZKtA5XvBdWr/QwPTL6c8Pbbb9/0
+        w/SKa9Am1ij33KMdPLeBau1koJ0j11aeroJ2Ul69bF6hxTWbVwt15ZJjuUKr8rJH+/QKOT3AoBXiN3zz
+        0uto/nUq2tG8+qS4xCSuilihJVyqTTP1TtdGpZuQsRCUKGin9g2Z8Tzd7A6ZH2664gK1GR9u7l/Luil+
+        mOEatCwlFj3aQTchqi1oK1wndV2zutbApl4HQ7XWw62QRVbIc9Fr0MZSYtF1tOlwAK2jAHYXFa76mIzt
+        upZwBIFalFbqYGZEu856LaoN2jzpotMOOcfgjYXFJ4dcf25D6d/0vve9r9m/CdecyWnVS8i/ZoVs6TvA
+        v8+qc7bd/co/ff91++zj1fXR+3zG+/HGLHGJWCvuX5lfi1jjjTlnDtnJhh7t4Kw01TbRTsrTlf5N6bpW
+        mnJV+oaU+DCEF2698/9utlnzP+8Uh7x0veIKs2nYnWoh3XW0OZoHLcXEIVfyrwVtLgraWeoR62jnwjVo
+        6btHO0gP5JCPsRAogLaeVy9oeWDl/Om0NpZrXHEzFlFBOy+u8cbQcshyBl1XbU6CUG0L7di8erquZSWc
+        rmuz6DX51wraMteaFJp59dnn18yydrTQ+g3uVAnHHu3gJEiO06gCXFSebnaudbRT1002XfZm2b9qlcIf
+        uLH4XgU9DnEXrkHrt1Ftj3YhNeVucy40aOfYD8btUnxy3SHX18NvfvOb4YRNbxRoFbZ5B1G/XHyU8wA1
+        xq/YJUOrE2vXVZvCY6oN2jlybdXBVNBqdx/jkEfzOVhGqWT67ne/W5Wkize96U3Q4kq4hWtB607Fu0c7
+        qE6F1sqohXbp/WCacf8K2sr8SnxwKsUK2le96lXQghq0mV+bRtn+aJ5A0HW0KYZymytUa6KdC1dLs+Tp
+        2Fi0F2y9k/dLPeLouonjhZO96EUvghlgn7OgbXGV8+GQeQtfp0e7kIoZqm2inQvX1rmrCtrikF3oSCXk
+        WfKviftTalTLA2+33XacsNdRrkErSAKt09ZdV21y79AaPq9T62Ba/YdnP8dRQTu2XqKZzwHV0ike2CTq
+        LhzLFVq/ykfikPVF6DralIy7zfMc7vnqlUMue9apaCfl6ZrZurHzK6LFoHXz+To92oXkA0Btoa33C1f+
+        qGOIRXUq1lyTyKT6ptQP19HOhauqKGh9cmgVVXVdtQkaQ6sqxYjM0kfPj6XVT5o3pd+a0sN6HUwFrfk1
+        VuISzeRrlDpVr7gyKzJoOeQe7UJiFGjlYc2z9PcnVjKNWNPqR2l/abnWzKu3HLL1cCvzkxVyJNuql1iU
+        Hw7XoPUVoFVO1XXVJkZBtUE79bkNxJrHCRS0dT9cQv8QjkG7/Gm0c+Eah1zu1B7toGU4tG7zJtpKfJhS
+        C9pKn59WPqeCtjhkpXetvPqMfjiSdW6AaqGlWndq19GWJ/qCVNBOjfubZQH2Oml+lf0ta+NsWytoW/uc
+        Ur22WK5Ba4qB1tKh62jjgam2oJ3KlSvOz0+tH27WwdTRrvO6qegV16Ate7ke7eCZOVBRYXnM1TrHJbLP
+        GVvfVEH7/meMQ17UerjFFVp/GlpfxF6u62hDMZG5Ftql9yGQySlBxAraJc6v0Stz/BJaQRhfRHCtRzto
+        wUW1LbRL59rK5wzQLm9vfs5fvqP36/scbehM21pIJuTkERb+CRvJahmaBkfhGrQl29F1tKk4hFaqRJw2
+        Ip47V3uSOtpJftin2nbbbRH16ubT0QhaGao3vvGNcHIJ4mJm/XBlZgRoqVacuetoEylM7jpo58hVDicO
+        2famgrbMtRI7k+L+73rXu6wGdt99dwETeg1aXAm3cA1aaUpopZ97tIOaNKqVDYV2jlxb+ZwK2qlxRGKl
+        WkRf+cpXQgtq0BY/XOhyyIpGerSDYtW07qHaFtq59INJf4nYVLST9GpmJdYshl2rtypom3p1rUGJ76La
+        C1p3QNdVm+1KqjuLaufFlUMukaa6Q9aRqhi3XJJ0Vk+UmuiHKZYH3mabbThhr6Ncm2jdAV1Hmz0oh6wm
+        WzOtqf2H0+QnN4T2A+lGYDGsyY/D6pVzktBaD7fSA1khT9IrwHDSXywe2KIJtrFcg1ZZNdX2aBcCJicp
+        oK3rVbOBF7/4xeHqWthZQDH9JWxhXVTqJWZE28yrl3xO4sPN/WsTLaLFzC/OQ0Ar6dR11UZno2gn5XPE
+        jSN0zWByW6TPD8lyv626NfnXOGRr4Ara4or10yho14GrW9PHdooJWvdc19EGBofs1KJ7f7TPj7HmA6Vj
+        44eBDFolhglKBO3U+qapql2iXnGN1+nRPt3LIovYnDUO2pZeeTYVFObU+OGCNkSDdipX8aY62rlwDVrH
+        hanWBNF11aa8gWoNBLRT8+pBi6iZ1dKJeTrqaP1wXHGJRczukNfND0eyccjO+Vvqmx26jjaFvmn+0EQ7
+        qb8Ev12Cw1ZPzf6I9TqYimqXOL8WrohSra4rVNujXSh9PXTjKWjn2zckwaapaJeoV1ybaLmNrqs2JQ0c
+        svZodhSL6is99fyr/GvxyXW0c+EatDphufCnu442J6I4ZCdWE15v2qS8+izrplYdTAXtns+YY/Yz7l+L
+        E3YRvcaEXPQl5JB7tAuJBI1FO0eu/kQFbZHsWK6ehGlFphN34hKuzfHN+bVwRRRaDUVdiFZ2XbXpV8kh
+        ayBsZJt9L8fWwSxKr8aXQ05EYjzaZYNA42gdTAk2WbUJFyO6xRZbeNUeH1S/M2ibeoUzVSLQel/0o+to
+        cTWyVKupQEE7X73GMVTQFocs+t/K03mHTCNWASY4PR07qh3lGrQ6d7vo0Q7KUFpo1wfXOtrK/Jo4ZdCK
+        Qkzyw5Fs0Gq578K03XXVJvLOIeuY63q+XDnkEh+uqLYS96fUoOWEC9qxem2i9QPk3nW0cYAcsi5+ruvz
+        64oVKzxIQGY3ReGOM+sykZ2xCyeaK/USUx2y5oAxVJJXj5llQfU6aX4tkvUtqNazbbzTo13IgqWFdmw/
+        GFyZsdZ+AFd9xBWE2mMA7IJA9Tao1PvXVTsp/+rPCXjNoldfIWg9lApaK+quqzb6MChavcUhT+17qb8E
+        tABHr+nzQ7LotvqGtB3yspFU/HCFXOE6af9alJqLcM3BFmg5ZCUDXUcbp2dQ1DPkEGOrfti4q8TnhJNI
+        INbVq1cjKqkXtKUZzGg/mGY+Z6DaGdD+Mat+/vmL5Rq0nhIItufI9WgHIziKtuxfxdnNr1xxk2vEmnjT
+        pD4/rTzdWLTnLdvB+2WWLXEJgNeBq8UgtB7b2qMdVDRmgwitcQGj0udH/yaSTX9jUL1qoscOOuigUb3a
+        Vpa1cbatFbRxyEvUq8+fXhzQ+kaqPrqu2mwkMlEF7aR4k2pWy6VY9KpCX2F63Q+XIGId7Vy4Bq3naFOt
+        Jy33aM8ty5A055maz1m3868zOuR188ORbBzyDTfc0KMdOOTC1UVBO69+MEJCJYhYQVsku0SuVoJUCy0/
+        tHbt2q6rtmwbDEfQzotrK58zFe3SuQbtjTfe6Da1GevRDhZQAAfteuIqzgWt9XCrxLyskPcYms3opLh/
+        a/+adV8xUGPQ3nTTTT3agUM2OkbESBnTNJ2dV58fqhXtazrkSWjnolffQtRFjxJo3aZO5XZdtbnZoTXh
+        Be28+vy08jkV1U7N52RBoO2NDVV6STI3jXfy+ZXTCqQE7c033+znHRbq0Q5u9oJ2PXG1bR2PdqtByGKW
+        uH+aVanyefnLX47r1ltvLXxtrQSwcKYLcQ9fhEO+5ZZberQDh2w4gtboU+0c+/zkaHOJNFXQZqJlooN8
+        6aT4cObXN7zhDV4Bjl790+cnWXQlr6gWWr/Eab6uq9a4GBGjhkTQVvr8iD1J7yhrTdmNg5HaD6ROwwUf
+        WDl3VUFbyb+SqbJTTjhcidU5BhcveMELgvb1r3997k7fImhvvfVWN4eKqq6jNRyS8AVtnau1iZ8UNE5z
+        CQcjBRQBdmEL66JSLzEL2lG9iheaX7niJteINeumoA3XoL3tttt6tAOHjGvQEpyQ4dQ+P+imb4gTzdGr
+        3gNeSTaVTc0+BItyyJ4JH+OWm3m66HXXXXcl2ay3QfVq6cScTClcfRGt3qDlBpRQdV21hkPBWwLIBW2z
+        H4z/ScsPnWBS06pdCPPDL3zhCxOUCNqp9cN11dbnV2jFq62brJhY9OrCB2tyDdrbb7/dbzvkkEO6jhZX
+        ZapNtK0+PymfMMuimzxdHHKIBu0o16Zes5KC9tJt2iGLS98+WCFP5ZrdTolLZHJt+uH4nqC94447qLZH
+        u4Br0BJlPe6fnk0cL7SIZg3FVq1aNct5dSXE1+zQRuudFtoS+JwUb6pwDdo777wT2jVr1nRdtbhahRrH
+        plgn5ek05Urbpphrp6pn4WrnanNy2bJlrUDjFW9/uzumWbdW0I6NI9a58kBB6xf2aBdwdZDLgDYlW+kb
+        UrjOMr8mpZMqDuuvS7bcsoX28uXLPcwasNF102h8eCrXoL3rrruo1qnfrqsWV2ZkS6PEuXM1xJ4kf+Sh
+        h17/ile00N7yspcd9fnPe3qBPP8S9Yor01b17rvvhlYQo0d7hhCEYU2wYu5c/eaVK1eetmrVfc9/fotr
+        /vng8553Brb7768FzrrNr4Fa0Ork4E7t0S7g6u42pkkMNNHOpb+EKZZeJ3EN3See85zjPvtZk+66za+F
+        q3WDjrnQUq1nZnZdtb5/ai0k4Zto58LVfUOOv9lii7F6bb75+803Nztal82+z8mOvMk1aO+9915oFeP1
+        aBf0nqHaJtq5cLV60nJNVOjR5z53Klo/cMq++/rhGfevY7kG7X333edO5QO6jhZXZ1ihVcvIJyfuP6++
+        IWL0J65YMQtXP3PuXnuZlWeJS0ziCq1myNBSbY92AVfrF7e5IyHQTuUqQOEss9Nz73znO+UBXYhFTKpb
+        g8o55xnRXrXddn5V0Lb2OYJZu+yySxJ/PAFny+KKE3IpRrX3338/tD5n11WLa5amzsOba6fqVVgxFeFC
+        ieK30NqYlv1rq16Car/98Y/PiPay3XbTbX6Uq7+CqMxSQokaQzrNICg2ytUeHdoHHngAWp+qR3uqo3BU
+        C21R7aS4hM5vWJbTV1Prwh30OGz16hnRHv+JTwj8jo1LQLt8+XLCLWIdyxVaDvnBBx/s0Q6Serg6qgWt
+        tkJBW483FdXCRkOT9JrsOoWBYfU7la7dLa7OF42N+0e1o+vh4odBjRW0giRdVy2ujEPWcckieWockaMz
+        y8bqXBMZFjo45uCD7VzrdL+7334mZpulsfkcaPn/1j5nlGvQPvTQQ+4qv61H+21BPgy05WminZp/nYWr
+        X2uZZmt70V57Vehevf327hhPjRjLtbIeTm6jmIipZ0o8/PDD0PqjXUeLqyNZVNtEOy+uEa5AhIE+fcWK
+        0ZgUP3z23nuLHCnEWTrXoH3kkUf80R7tAq5y7NBqFWBru6h8zoz1w3653bPJz4JZXOKKnXcmU/+d9pGP
+        rF2zBgP7mblwhdbjQqClWtVxXVctrsxt7owbtPPVazOvbg+jNlG8yQ5H+p0Rq7UYpzovrlHto48+Cq2a
+        qR7tSRLsGEBrrp0xrz67XkN36XH/ZlyiNb8mL8mswqB97LHH3Kk92gVcrV+Mvrr7oto59g3ZkFyh5ZCh
+        pVodGrquWlzzeFMVvEG76XIN2scffxxafax6tCeobypoN2muQfvEE0/4Oj3aBVzzvGlVRTIEk56fM8dz
+        kpPqTBe1f23Or4jGyNRT16ClWtW1XVctrsKBbnNVRba26JaHb5UGunnWRHlOTHnMU56t2HoAuX/mIeXM
+        /J1n0eeCcfusXLh2S7XMJ2EC/TEBpnLhmlkrMQItF64Zrk5gPvnkkz3aQQwZVz1ogzbjmLHLSDHPMfO8
+        Kw/PYZ6z4nkcntvA9IHXL1zzYaZPrX6mTH9EzdaYvlya/DD9YDSXYPoQONTMjL7DdMy5K4c4mHp/deGK
+        TJl6RHVrgyfV3HOPegnJVyZPJ58j7s/EEcWbbF6ZfY5FEzO/EivD9amnnoJWgXTXVYsrE1JI5IhnzsUk
+        K4ck53uRdII/Ouki7xer/6StM+vRHnfsscdq1cecdXS0hjlLwwQIxYmYXJ7mtUwbTMkZJvjgBE4O4YgR
+        MpkZEXwmCqElhSNZzDk7/ZuY4jd9Q5hqZKlW5vyr4BQTxJDzYYrCmQopGQUmoCFrpFiCyasLMjMhLXH/
+        YQHk/uJNedCQfY5FE0uLMnrt0d6Tpcez1eQr49g3im22Uf5q/0c3wAj0aDfAIG+cP9Gj3TjjvgH+ao92
+        AwzyxvkTPdqNM+4b4K/+HyoTYd367nEXAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="cbVMultiBars.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAJ4AAACeCAMAAAD0W0NJAAAABGdBTUEAALGPC/xhBQAAAwBQTFRFHh4e
+        MTExOzs7PT09Pz8/QEBAQUFBQkJCQ0NDRERESEhISkpKS0tLTExMTU1NT09PUVFRU1NTVFRUVVVVV1dX
+        WlpaXFxcX19fYGBgYmJiY2NjZ2dnaWlpampqa2tra25ta29vbW5qb29rbGxsbW1tbm5ub29vbHBpcG9p
+        cHBpdn1ufXpufHxtcHBwcXFxcnJyc3NzdHR0dXV1dnZ2d3d3c3x7eHh4eXl5enp6e3t7fHx8fX19fn5+
+        f39/coZec49Xc4tbdp9OaYJ/fIR0foZ2edUeedkaeNAhe+MUfvYHf/8ATbuwTL+zZomFaIaDYpWQeYOC
+        fIWFSsK2SMq9Q9nKQODQhoBehoZej4ZXi4Nbj49Xi4tbnpFNnp5Ng4Fzg4NzhYN2hIR1h4d4gol6iIZ5
+        j49/1bge2bsa0LUh1dUe2dka0NAh48MU9tEH/9cA4+MU9vYH//8AgICAgYGBgoKCg4ODhISEhYWFhoaG
+        h4eHgImIiIiIiYmJioqKi4uLjIyMjY2Njo6Oj4+PiZKBh5KRkI6AkJCQkZGRkpKSk5OTlJSUlZWVlpaW
+        l5eXm5uSmp+WnZuUmJiYmZmZmpqam5ubnZ2Yn5+anJycnZ2dnp6en5+fn6Kdm6CgoKCgoaGhoqKio6Oj
+        oqWlpKSkpaWlpqamp6enqKioqampqqqqq6urrKysra2trq6ur6+vsLCwsbGxsrKys7OztLS0tbW1tra2
+        t7e3uLi4ubm5urq6u7u7vLy8vb29vr6+v7+/wMDAwcHBwsLCw8PDxMTExcXFxsbGx8fHyMjIycnJysrK
+        y8vLzMzMzc3Nzs7Oz8/P0NDQ0dHR0tLS09PT1NTU1dXV1tbW19fX2NjY2dnZ2tra29vb3Nzc3d3d3t7e
+        39/f4ODg4eHh4uLi4+Pj5OTk5eXl5ubm5+fn6Ojo6enp6urq6+vr7Ozs7e3t7u7u7+/v8PDw8fHx8vLy
+        8/Pz9PT09fX19vb29/f3+Pj4+fn5+vr6+/v7/Pz8/f39/v7+AAAAAAAAAAAAVZQ8ZwAAAAlwSFlzAAAO
+        vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAUGFpbnQuTkVUIHYzLjUuNtCDrVoAAA9bSURBVHhe7dx5
+        dFRXHQfw2lqxLm2tVrukVIXENUBJJUCou1Zbd637bl2r1VLKUpYCKjsqUCVBIZhlMmvm3Xvf7JPZM1uS
+        SQKEsC8hhLCFfW3/8Hdfkjsvk8dkpuF3Tv/wnjkUOBz49Ht/d3n3vXm39L2u2y2va13f/3mj6Z880rPV
+        3axGchbnwat79ZXr169du3rlyuVLly5euHD+3LmzZ/r6Tp86dfLE8eO9vcd6eo52dx/p6jp8+NDBgwf2
+        79+3d++e3bt3dXbu7OjYsX3btva2ttZUqqW5uQ6Fd7N0TTi869d3SOpGJEn58B/gxyEfMtAoIZkffxKJ
+        d016aOy4ceMLC4uKiydMnDTpkcklJY9OKS2dOm369LIZMx6bOfP5WbNemD17ztx58+YvWLhw0UuLFy9Z
+        umzZ8hUrVq5atXrNmrXr1q3fQJB4165JY+dXVVVXV9fAp6amtlYHH52urk6vh4/eoDSj0kwms9Islvr6
+        eit8rNb+4Gs20AROeteuSuOqoNih3KF1QtvJWwe0HdC2b4fy39beDiMAxgC0FG8t0JqhNUFLQiMvkzgO
+        7+oV4I1SlyQbsXhXrkjjq0eXXTJBN9IYTnpXLkuFwBtFzyYTCVpOkHiXL3He6HQJWkGiOOlduiQV1YxS
+        BzzaiMS7KBVXv/YxCz2bSMTpJoLEu3hB4b3GGaVfF6ebSQQnvQsXpAk1o9TF2WYaRuKdlybWQHaOe+5f
+        E7znHXnNxgPZxeNsCwnh8M6fkyZx3gTTzp33B4xleawVQhdjlRSJd+4cmVQLK9mE+++pvKOjozj3lSyt
+        i8lbaRAnvXNnpUdq+9fZ4js6AsArK+CteKR1Nsle/NqLlng8HosBjwRweGfPSJN1YJuwpmz1grLpm3Pd
+        BST/8+knv/Hkl//CdTG5iiLxzvSRklqendHW0SHLOeukrzzF21f/q/CqqR8nvb4+SeHlt4NKJr7+JYX3
+        zY+BLirXEB8S77T0KHRuvrrEe7+l8J4qAF3UVkMbcHinT5EpugwdHxzFWXaffMwW9OuAFwVeLUHinTol
+        leryzk7FA13UpqNenPROnSSlda9hrRDpga7RXkc9OLyTJ6SpwMt7NlbxGoFHkHgnjkvT9Pnr4mleI/D0
+        1I2T3vHjZLo+IztlaGhfk4mVTPBA12g3UBcSr5dMr8v5ijG9zqp5EbuRIPF6e6UySC+361nVLkDFi0Qc
+        RurESa/3GJmhz18XS/MiwDNRBw7vWA/w8s4uluaBLuIwEyReT4/0mCHjpEIZGsNOKlQ9C+usSA90YaeZ
+        2nHS6zlKZhpyOUcZqouqeOGw04LFO9oNvBxOeTJ0Kl4YePXUhpNed7f0PPBG3Bv3XzEqe2O+R0nzQBd2
+        1VMZiXeEzDLkrxvKc1qxeEe6gJeR3XQ+NNTnd5k9C7sAUXsQXsgpUYaTXleX9IJROV18c6vn7rs1Txc1
+        dGpeKOSSKEXiHSazjVw39Q2t7/HUlGqcfWrpVLwQ8AgW7zDnga58+ZjWManUuOEns5q6NA90IRelBCe9
+        w4ekOZw3Zvwt5WNS7nGpFl55UHuD58bauoioPdAF3ZRKOLxDB8lc4MGh9pjUnNLSjZmn2jfQqXnBoJth
+        8Q4eJPOMypm7NZWyWnPVqXhB4MnUipPewQNknumGdwRulF0kzQMdIu/AfjKf83KeURob+R4lLGoPdAG3
+        jdbjpLd/P1lgztAp0zK/nZK5kkX5zl3RqXmBgNtOLUi8fWShOe/s1LxAIOBB4+3bC7x8exYWMtG5oPN7
+        HNSMk97evWSRwst5zELPDuX5/R4nNSHx9pCXOC9PXSidnh+Tt2c3WQy8ITplaGTs71Sjgu9R0jzQ+Twu
+        asRJb/duutiSd3ZDeD6fx00NSLxdZIklj561/uIzvzDAOis61+/z+bxovF2dZGl9xt3jLPPd3z/++Ocf
+        /8SfQ0HBA12D10P1OOl1dtJlwBthbzw4G5s/+QRvn/q3mtfQ4PWyOiTeTgK8oTplaKSvelSj4rOfU3hf
+        +LCK18AbReLt7CDLrTlmFw5/4IsK74mCNI/jvA1Uh5NeRwddUa96aiHbOgtrRb/uiYKAqD2u8/pYLRJv
+        B+G8EfbGyi6ArxVaPK+3wU9rcHg7tpOV1lx1IS2eF3gBLN72bXSVNSM7PjSKlLOAYWvFYHp+0bmg8/oC
+        rBonvW3biMIz33VX0n7XXUNPKjJ16fSG8Dy+IK1C4rWT1RI8y7M+uWTru22VJepzlGE6bZ7H4wsxJF57
+        G10j8SeNlrzJfzvcTVGd8gzXBUXt+dKd6/F4/GG2FSe9tjayRuIb96TtodsTMvCmKde5RcPqDq5ntXig
+        Ax6tROK1krWc99DiklmzJk9eK07INLK7Ic8XYVtweK0puo7zEpWmRNxozK5Lp9cgOhfCc/sbKRIvlSKc
+        l+WaTNl98p6FK0ZRe2qe2+2P0s046aVayHqSq06T53a7A1G2CYfX0kw3kIzs+OAoGrieVWcX0OKBzh2I
+        USReczNReNnnO6Vn4YpRdK5X1B7oXIE4rcBJr7mJvExz1WnzXK5gnCHxmpLw6GKO2fk1eS7gJVg5Tnrw
+        XOpGmlvPwhWjRueCzhWA/0ckXoKUc97g/Qo+GytDQ9nfiRkF6g50aZ5H1B7onMEkQ+LBs4EVwFPrNMes
+        otPmOZ3BJvYyTnrxOAHeSDrz0z9+WgdXjKJzVek5gQezExIvRjaxkXT/+PZvfv2b7/61QYsHOmeomSHx
+        YjG6WeFp7I0HVrKA4XvP8vbDf92A5wi1sPU46cWiROGpdcrQUI2Kn/5K4f3+I2meWwwNp9PhCMG+AocX
+        bSRb5KzZBfwf/IPCe7bAK2pPxXM4HOEUQ+I1NtJKOVvPwoxS0K/T5oHOEW5la3HSa4yQrXKWuuPz3Yi8
+        UBsWLxKmCi995j58NtbguUTtQXj2cDtbg5NeOESrgDdEpwyNgT2KslYMdq5H1J6aZ+e81Ti8UIhU20BX
+        d+edhNz5dq2VbASeHXjb0HhBWmOD7BZGKh68V6qYOHydhbUiW3qgs0e2s1U46QXheITzIpE7V70xHH5w
+        2C7AB2vFcJ5T1B7obJEdbCUOLxAgtXauu3dB+I1h6cFQaOA6d2CPArqReDZbIx7PT3V2rptU4Z4xceLK
+        wWsylS7Nc4uhoUrPBrwOtgInPb+P1Nnh+E5XUeEO62q1dF7RuVo80NkiO+XlODwfHAtznubuk/csnH1q
+        8Byi9kAnN3YyJB6cWuuBl003Ek/mvGU46TV4icGRoZvKp2V+v0LJTpWeS9SeKj0ZeLvkpTg8uGNidGTN
+        zusRnavFA50c3c2QeJ5BXuZVj8jOMyKPRfewJTjpedzE5NS4JlPptHh2MTRkmbHYHnkxDs/tombgZclO
+        lZ5T1J6Kx4C3lyHxXApvqE4ZGv2jgp99ptPT4oGOxfaxl3DSczmJxZU1O49bDI0b8+RFODyng9Y7NdcK
+        r9fw85/8vMbj1uLZRO1BeDS2nyHxHP28wRMy5SxgYL7723ee+d0z3/+liucQtafmURo7wBbipOewU6tL
+        U6f7wXO8/eif6fQ0eZTS+AF5AQ7PbqeSKyM7ZWh4f/ZbhffHj7pE7WnxQEfjB9l8JJ6tn8fPPtU96/V8
+        6E8K77kCLZ4sag90JH4Ii2eTKXFr6TwF/bqReYQkDsnzcNKTZUrdGtnBbDecZxdDQ5UevEshcZjNReIx
+        4A3vWT4ZD/Kcova0ePxND/EuLB7oGPCG1J0yNLLzmKg90EmJLnkOTnpQ2bKb62xv8xnf+tb0SubOmp6a
+        J0mJI2w2Eo8Aj+uKbmt4l3F94eA6C5Px8M61idpT8eClE4luLB6RqM2jzCi3NdzW4H1gYBcAN1MEzyFq
+        T4sHOmuyW34BJz1JonaPspIBz2t4wOvhlQe1lzvPak0eZbOQeFbgKevsbQ2lhYVLlB0Uv0/mypoeFUND
+        gveKJHqweFYrdQAPdgFbvd7KyrROiyeL2kvzQFef7JGfx0nPWk+dHvXOfSA7V+68+vrkMTYTh1dvAd7g
+        FaMqOxXPLoaGZnrw6phkLxbPYqEu78D17KBOmZadova0eETUHugsTb3yYzjpWczUDTxxXaGMCn6fTIvH
+        RO2peRZL03E2A4dnNnGehi5nngV4J2QknslEPZq6NM8mak8rPdBZmk7KZTjpmYyUR9d/xZjuWbjXI2pP
+        iyeJ2gOduekkQ+IZDZSHN0RXyodG7jyzuemUPB0nPYOBwcAYnp1Di0fF0FClBy+maj4tT0Pi6amvQUuX
+        5smi9tI8q+hc/t6s5j6GxNPXUXioPLPu+I0yUXsj8kwtffJUnPTq6liA84aMCq6z58wzmVrOyKVIPB3l
+        vCE6ZWho8Yiovfp055qAd5ZNweHpamnQr5GdPc1jova0eKAzpc7KSLzaGhbyD+9ZuNcjOndkXss5+VGc
+        9GpqaNgn1ll+553XHb8TlZVnEZ0L4RlbzsslSLxqFob0+ncBap0WTxK1p+YZjakLWLzqKhbxZ+iUoZEz
+        D94bCLzJOOlVVdHGgJKd7i1vSfcs3OsRnUvF0NBKj7/WMHVRfgSJt5VFOc/pfKdu1djBuuN3ojR4VtG5
+        ZlF7oDO0XpIn4fC2VlLOg7K71eG4b2BUcF3uPIOh9TJD4lVuobGgMipuddTex8csrzyoPfn9yn8LCt5H
+        3zf4M6v4mfnhgd972Ahvrmy7LE/ESW/LFhYPKmO2ZOzYRcqMomTH76bwU21+ushPeeAsAK4Y4bqC7++g
+        8dnYxOuOv1iz9Yo8AYm3mcYD/TNKeflr1OlbrzIk3uZNNAHpDRmzeWan17ddlYtx0tu0iSWDo9Tp267J
+        RUi8CuCNLjtI7zpD4lVU0KaQWGfzHxXw3ll9Xft1uRAnvYpy1hwNwS1JuGkaicATI/BMSzSqPA4Zgyde
+        4YlmeOYanqmHp/75V3aampqb4TuB8KVK+FZqayt85x1eGtB+9BUsXvlG1gz/VGtbe/u27Tt2dOzs7Ny1
+        e8+evfv27T9w4OChQ4e7uo50dx/t6TnW23v8xMmTp0739Z05e/bc+QsXLl66fPnK1avXrl9/5VV5PE56
+        GzfqYHZT5jilwXR34w9MhoMfPrpVvxo3Don38oYN69etW7t2zerVq1auXLF8+bKlS5csXvzSokULF8yf
+        P2/u3DmzZ78wa9bzM2c+NmNGWdn0adOmlk6Z8mhJyeRHJk2aOGFCcVFRYeF4JJ7+Zr2JvK4a413fOf+d
+        N/EP5vGm9Jv4r+b8V/2fl3NUGn/wf0S3LDTKGYxrAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="cbV2Scales.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAJ4AAACeCAMAAAD0W0NJAAAABGdBTUEAALGPC/xhBQAAAwBQTFRFAAAA
+        BgYGBgcHCwsLDAwMDQ0NGhoaGxsbHBwcHR0dHh4eIiIiIyMjJCQkJSUlLCwsLS0tLi4uLy8vMDAwMTEx
+        MjIyODg4OTk5Ojo6Ozs7PDw8PT09Pj4+Pz8/QEBAQUFBQkJCRERERUVFR0dHSEhISUlJTExMTU1NTk5O
+        T09PUFBQU1NTVFRUVVVVVlZWWFhYWlpaW1tbXFxcXV1dXl5eX19fYGBgYmJiY2NjZGRkZWVlZmZmZ2dn
+        aGhoaWlpampqa2trbmpqb2trbGxsbW1tbm5ub29vc2dncHBwcXFxcnJyc3NzdHR0dXV1dnZ2d3d3eHh4
+        eXl5enp6e3t7fHx8fX19fn5+f39/ZJXt/wAAgICAgYGBgoKCg4ODhISEhYWFhoaGh4eHiIiIiYmJioqK
+        i4uLjIyMjY2Njo6Oj4+PioyQkJCQkZGRkpKSk5OTlJSUlZWVlpaWl5eXmJiYmZmZmpqam5ubnJycnZ2d
+        np6en5+foKCgoaGhoqKio6OjpKSkpaWlpqamp6enqKioqampqqqqq6urrKysra2trq6ur6+vsLCwsbGx
+        srKys7OztLS0tbW1tra2t7e3uLi4ubm5urq6u7u7vLy8vb29vr6+v7+/wMDAwcHBwsLCw8PDxMTExcXF
+        xsbGx8fHyMjIycnJysrKy8vLzMzMzc3Nzs7Oz8/P0NDQ0dHR0tLS09PT1NTU1dXV1tbW19fX2NjY2dnZ
+        2tra29vb3Nzc3d3d3t7e39/f4ODg4eHh4uLi4+Pj5OTk5eXl5ubm5+fn6Ojo6enp6urq6+vr7Ozs7e3t
+        7u7u7+/v8PDw8fHx8vLy8/Pz9PT09fX19vb29/f3+Pj4+fn5+vr6+/v7/Pz8/f39/v7+AAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFzrrVQAAAAlwSFlzAAAO
+        vgAADr4B6kKxwAAAABl0RVh0U29mdHdhcmUAUGFpbnQuTkVUIHYzLjUuNtCDrVoAABBQSURBVHhe7dyJ
+        cxRXfgdwb7LJejebZHftOM6xrB17bRYnuwYH20sAs+FYcSMEeCNuhDiCOIQQIIGOkTSjmZH6ve6Z0RzS
+        3Jc0ukBC3DdCXOI+vf9Nft0z8/q1mNfxFvyqXKl0TVFFFQUfvq9/r3/969a8Mf6dPt74TuvG/w/xXC2v
+        6yDfds3+lPRa/vjNixfPnz97+vTJ48ePHj58cP/+vbvj43du375188aNsbHro6PXrl69cvnypUsXL1w4
+        f+7c2TNnTp86dXJk5MTw8NDxY8cGBwb6+/p6M5kWFN7r0vXg8F68GJL4g0iS9lF/gV8NH5I7KCETP8Fu
+        JN5z6as5c+fOmz9/QVHRwkWLFy9ZumzZ8hXFxStLVq1avWbN16Wla9etW79hw8ZNmzdvKdu6tXzb9u07
+        du7aVbF79569e/dVVu6vqjpQTZB4z59Lc7Y0NDQ2NlrgY7E0NTXDp7m5pcVqhY/Vph2t2mG3O7TD6Wxr
+        a2uHT3t7NnhLNU3jpPf8mTS3AU52ON3hGIHjhHoMwzEEx/HjcPofGxyECoAagKNPPXrhyMDRA0c3HOQg
+        SeHwnj0F3ivquskhLN7Tp9K8xlfLrjtND9EkTnpPn0jzgfcKK9udTtPDBIn35LHKezVdmtaQBE56jx9L
+        Cyy6buHChcPDq4uCplWxc87OTHjOnOVqVUB2kF4NjSPxHklFjXrN/ou9dbhsdff7ZjXrnJKZ4mj4rMGR
+        16VoLUHiPXqo8XI7Svhfi44Of2Ebev9/2VE+c6yf85U7l10qRY+QGE56Dx9KCy1sv8uUDX/i+jvgme93
+        66f0VB9wv5Vd2VQqJR+hUSTeA2mRhe3GPcPDRbYijXfsR2+ox5+VZo///gvtt3+j7sZzPuvpgZX9RV6X
+        ko+SCA7vwX1pscrLXitCn7S+P3Tkk72fsGtF6R+yR6l+rdjx1pw5oXXLdvwil10qKddRJN79+2Rxk34l
+        C9mgaGWrfiXTeexKFm5oqO/udtQzXVKpp2Gc9O7fk5Y0mVxnGW/idZatbDIJPBLC4d27Ky1tNukCeB7f
+        BfC6pNJAkXh3x8mypsI9yurZs2cXcTyhLqk00iBOeuPjksYTdVCMVwTYVfkOypBdMqFYSBcS7460HBZX
+        2N8xnji7RMJloZ04vDu3yYpmk+6T5wmyA14TQeLdvi0VN5v0xhxPqEu4mmkAJ73bt0hxS+HO3VgarHOf
+        cN4lEom4u4X6cXi3bkorgSe8r2DpibOLA48g8W7ekEqsJnc9xsplPUoqBbtxMgnRJeLAs1IfTno3bpBV
+        VpN7Mi491n1Cj2LQxd026kXijZFVLSa9sc4T62LuVoLEGxuTVkN6hfq7VYarhoku5mmlHTjpjV0na6wm
+        vTFLj3XuE1c2Fot57NSDw7s+CjyT3pjn6R2UXhVx0MU8DoLEGx2VvraZTCqMlat27saqUHXRDgd146Q3
+        eo2U2kzmKHp6wuyi0Q4nFu/aVeBxUx7/4f6+4rk+dcpjLA1Ot212eSKxZBaJaysbBV4bdeGkd/WqtBZ4
+        bAb13ry+jcWx91hvzNLL3pOpK2ubnJhsLV0c+HleF/W2UQWJd4Wss+m64uK5fdMtfSov20FxPO68m2qd
+        Whv/eS47SK8di3flMvBYdtJ0y9y+ty29wMv1dzqP05VOjv8sy4OVjUYjHRKVcdK7fFla38qmi++9/faP
+        2ueqvEzmh9qN7ffyN5LZ+9y/Vq+zs6bG47NqY8DL6iJeiVIk3iWyoZWbfUJ6B6fsmsJ6Y5aevqOU/2zW
+        rMC+j8s+zusiXoLFu6Ty+MlsrLe3zaJ37hwv36N01tbWxmPNNUwX8VJKcNK7dFHaqPJEc2Odx3dQrGZh
+        ZSORsI9SCYd38QLZBDzhVJvxTHRhn4zFu3CBbG4trDNuy1z3OSG7cNin0Hac9C6cJ5vtwuy60yy9BdBe
+        lWi98Us6RN75c2SLyiv4vALuerjFzXXuL+tCPhdtw0nv3DlS5hDrOJ5YF/K5qROJd5ZsdQiz49Iz0YX8
+        aLyzZ4BXeGWNpZG9JyuwsqFQ0O+hDpz0zpwh5RpPML9j556JLujvoHYk3mmyTeWJpovGymU9irYbwxGC
+        7IKIvNOnyHbgCWefjCdc2WCwy++lrTjpnTpFtzvFuiTPE2TX1eX3URsS7yTZ4SycnVoaCzieUNcVQOOd
+        HCE72yY8PeZnUDpPrOsM+KkVJ72REboLeMLZJ+OZ6DoDAbkFiXeCAE88mTVWrtYb8zXb1dXVqR4UiXdi
+        mFS0m8yNufRynXsBXaCTNuOkNzxMd7fpby3s+KoqnV42W1HvGEsMpaH3xuGwpSPkmTGjKJjLLhDokpuQ
+        eENE5eVmn47P0pPS65Z2TWKTCpYel93CNw+GDv6muoHpOoPUgsMbOk72tHNz47pJ6Wl1qUmsNzbw8ufd
+        jIOhkhkz7NnzLhAIdIaweMeP0b3t3Nz4q1+l3srxtB6F57GqmHEwWFFh/0leF+gKyY046R07RjRedroY
+        TKdn182uS6rpvWm8z/1+9j5Xu87OqA7Cyv5TLruAvytMG5B4g2SflNelXb+qm6Tsn7xtMptq6+lxOwrw
+        ShZsVHmwsgG/vysiI/EGB2illMsOpjxKnZJK2o4ynb64/H7nhpqtP8B0/mBUrsdJb2CAVEomc2OWXqHd
+        OJudH3i0DonXT/ZrPMF0kePp/R3bUbI6f1dMPorD6++jVSqvgM64LXPd50SdLxinSLy+PqLyhJNZwzV3
+        pdYbv6TzBRP0CE56fb3kABHroozHOveXdb5QQq7F4fVmaDUxmWpzvOx9RQGdL5SkSLxMhmi8wk8Eolx6
+        Yp03lKI1OOlleshBWlhnLA0TnTeckpF4Pd3w6qIwOy494cp6vd5wWj6Mkx68l3qIilYWemNj5bIeJbvf
+        +eAAnTcE/0ckXpocVnmi6SLjCapC1XWEu2UkXhrOauAJZ58cr1DNarqOcI98ECe9VIoAr6DOWBoFd5Ss
+        riMMuxMSL0lqZZO5MUtPnF1HRyQjI/GSSXpE4wnmdxyPdZ98VUB2HZ5Ir3wAJ71kgmg80XTRWLn5DorV
+        rKbzRKCvwOEl4uSoItaFGU+cnccT7ZORePE4rVP07MpmlkWji2ZKam9sLA29N/b7jxCfb94XLWpVQHbA
+        65f346QXj5F6ha1s88exj5rXLPL9M+uNufTYys77QaVvxTzpH/I6T2QAixeLUo3HpoufNn9aEwFerjfW
+        edx590Wl998qvSpPzc7jjg7KlTjpRSO0AXhMt+aj6E8PAy/fuTMeXxXA+9vKDuBldSpvHw4vEiGNLl03
+        89No9D+AB7qC97k/1moWeF/sA15O544eQ+OFqcXFsiv76cyZ3j0fbfmI9cZcenoXALzyD9d+mNe5Y8fl
+        vTjphWE8ovKy00VfTc3hSKTpkN656zyuR5GgZmv2MZ0rNiTvweGFQqTJLXiaonbujGfooFjNuuFwueJ4
+        vCBtdhd+1qPdVxh4+f5ugs4VH5Z346QX7CIt7sJz45WG8SPXfU7UuWInlAocXheMhVWeaDJrvOZqvfFL
+        OiU+IiPxYGptBZ5wbqwvrmhlXYrK24WTXmeA2DxiXSfjmeiU+EllJw4Pnpi0ekxm7jyv8MoqipI4JSPx
+        /Hney88rjKWRvSd7+bwDnZw4Le/ASc/vI/YO0dMUuM7q6Yl1cvK0sh2H5/NSB/AKPutRu4Dfw+6iHr9X
+        38QoZj2Kthu7oCogO1lOnpGReF6NJ9T5Z/9X9pgtXFmVd1behpOet4M4vWIdzyt83oEOeEo5Dq/DQ9s6
+        Cs+NtdLQ0xPraPKcjMTzZHnCuTHjmeho8ry8FSc9j5u2e03mxjxP76D0qpBlSmnqvFKGw3O7qeQVz9x9
+        jKdW7kq1czfUrKajqQvyFiSeK8sTTRf19ITZUZK6iMVzKZT4OF290tk5/0ubOr8zlganmz59ena/y2ZH
+        SPqishknPUWh1Kdnt+DNA53F8+V/ZL0xSy97T6at7Lu7dxt0JH1J3oTEgwB83Mr+9kDg11UBjaf1KDwv
+        p2v8YPoWPjtCUpexeKCTgcdmn7+tCvykyq/ysh0Ux8tXhX2J8kG1vrLwxRTpy8pGnPTg3FF83POKL6sC
+        X+5Xeb4faA9wGS/7PPfHcJ21K8q/V7DzDnRS+oq8AYlHgMfNjYG345frf8kmZIyn7ygNH1T8vUEnpa9i
+        8YhEXX7uWY8MNXt0vz6/43n5HqW+oj5fs2p2Unv3VWU9TnqSRN1+k7kxx+M6KKOuvfuavA6J1w48k7mx
+        zhPr2tOjWLz2duoBXqHZZ7GhYzHRtXWPKmtx0mtvox3+grrsfYXhmlts3I21864dvpil+7pcisNrcwLP
+        ZG7MeKxzn3Dega6tewyL53RSb4CfG0+4n9V5ufuKAjpnz5jyNU56Tgf1AU/wRMCjL66JztlzQ16Dw3PY
+        VV5BnbE0jD1Kdr9Tz7s2p9PZc1NB4tnt1C/OzuNmiyuoClXn7LmlrMZJz95K1eiMz2e5+wpj5eb6O2N2
+        TkfPLRmJ12qjanjC2Sfjcd3nRJ2j57ayCic9m02GwhBPZg28bG/8ks6RuaOUIPGstKuzsM5YGsYehVWF
+        U/3erMy4jMSztlB4qVw8meXSE2XnsPeOKytx0mtpkUMqTzRd1Hlinb33rlKMxGumKk84+2S8+eqEqsB5
+        57Db7b335BU4vOYmGg6KdQrjCapC1dn77ilIvCaLHAkasyv9vFzr3I2lwdVsybQN2m6sVoWqs/feV5bj
+        pGex0GhX7m2Z7G7c9KHnXX1SoafHdpQj77e9Y9C19j5QliHxGuUopMdNZss/d3++h80+GU/f7zZMa5u6
+        jcuutbXvIRavsUGOBQ1T7c9VHuuNeV6uC5g2zQk8trLwvYHAW4qTXkMDjYcMU+09wNsNvL803uf+ufbb
+        v4IeZftU4PG61r5HyhIkXr2cUHlcF/Dunnf1+d1/5kbfv+M6qHe2vWPQ2fofK4txePV1VOXxs0+Lmp1Z
+        91ljzM5m638iI/HqjtJkWPA0xTBH4bpPw3nXCt9cOfBEWYST3tGjcipsNjcu3KNk9zv16zTVL9bsf6os
+        ROIdoamQ4GlKobsefjfO66z9z2Qk3pFamob0TCazguusnp3VOvBMKcJJr7ZW7g6/os468FxZgMSrAd6r
+        ZQfpvZCReDU1tCfCzY1NdxTDlSxbFfC9s9aWwRfKfJz0ag7LmUQEHknCQ9NYDN4YgXdaEgntdcgkvPEK
+        bzTDO9fwTj289a/+yE5PTyYDPxMIP1QJP5Xa3w8/8w5fGjB47Rss3uFDcgb+qf6BwcFjx4eGhk+MjJw8
+        dfr0mbNnz50/f+HixUuXL1+5evXa6Oj1sbEbN2/dun1nfPzuvXv3Hzx8+OjxkydPnz17/uLFN39U5uGk
+        d+hQM+wf2l2idsDIXfyBW/H8R72qcL+bOxeJd7C6+kBV1f79lfv27d2zZ3dFxa6dO3ds376tvHxr2ZYt
+        mzdt2rhhw/p169aWln69Zs3q1atKSlYWr1ixfNmypUsWL160cGHRggXz589D4llf1zeRtzRifNf3t/07
+        X+Of+1O+Kf01/rPf9q/6f963TarQn/uOp/c/wC73cuG/4GkAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="cbVertical.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAJ4AAACeCAMAAAD0W0NJAAAABGdBTUEAALGPC/xhBQAAAwBQTFRFHh4e
+        MDAwNzc3Ojo6Ozs7PDw8PT09Pj4+Pz8/QEBAQUFBQ0NDRkZGR0dHSEhISUlJS0tLTExMTk5OUFBQUlJS
+        U1NTVlZWWFhYW1tbXV1dXl5ee19fYGBgZWVlaGhoaWlpampqa2trb2trbGxsbW1tbm5ub29vbW5wd2tr
+        eWVlcHBwcXFxcnJyc3NzdHR0dXV1dnZ2d3d3eHh4eXl5enp6e3t7fHx8fX19fn5+f39/ZJXtn0tLgHh4
+        hXt7i39/xicn7A0N/wAAgICAgYGBgoKCg4ODhISEhYWFhoaGh4eHjICAiIiIiYmJioqKi4uLjIyMjY2N
+        jo6Oj4+PkJCQkZGRkpKSk5OTlJSUlZWVlpaWl5eXmJiYmZmZmpqam5ubnJycnZ2dnp6en5+foKCgoaGh
+        oqKio6OjpKSkpaWlpqamp6enqKioqampqqqqq6urrKysra2trq6ur6+vsLCwsbGxsrKys7OztLS0tbW1
+        tra2t7e3uLi4ubm5urq6u7u7vLy8vb29vr6+v7+/jKXRjabSjqfTj6jUkKnVkarWkqvXk6zYlK3Zla7a
+        lq/bl7DcmLHdmbLemrPfwMDAwcHBwsLCw8PDxMTExcXFxsbGx8fHyMjIycnJysrKy8vLzMzMzc3Nzs7O
+        z8/P0NDQ0dHR0tLS09PT1NTU1dXV1tbW19fX2NjY2dnZ2tra29vb3Nzc3d3d3t7e39/f4ODg4eHh4uLi
+        4+Pj5OTk5eXl5ubm5+fn6Ojo6enp6urq6+vr7Ozs7e3t7u7u7+/v8PDw8fHx8vLy8/Pz9PT09fX19vb2
+        9/f3+Pj4+fn5+vr6+/v7/Pz8/f39/v7+////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJcMU3AAAAAlwSFlzAAAO
+        vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAUGFpbnQuTkVUIHYzLjUuNtCDrVoAAA38SURBVHhe7dyJ
+        UxRXHgfw7CbZTcxmTUyy2c1mQ7IKu1FRVLyyuzm8WRVPvBEB5ZwZmKPf62ZOyH0nczD3DLcg3igioiKK
+        qIjJ/kf76zcD4ej+VSz9VaW29tWUVVZZ+vHb/d68951mnhj6RY8nftG6of8VnuGxDfYQF+xnp2f48YcH
+        D8bG7o+O3rt7987IyO3h4Vs3h4ZuDA5ev3b16sDAlf7+y319l3p7L1680NNz/ty5s2fOnD516mR394mu
+        rs7jHR3tbW2tLS3NTU0GEt7j0iVpeA8edEqTB5Mk8VJ/gV+nvFh6cMamv3wJIt6Y9OZbc+fOy8zMmj9/
+        wcLs7EWLc3KWLF22LHf5ihUrV61avWbN2nXr1m/YsHFTXt7mLVu35m/bvn3Hzl27dhcU7Nm7d9/+/QcO
+        HjxUyIh4Y2PSW5vLyysqKirhVVlZVVUNr+pqg8FohJfRJEaNGLW1ZjEsFqvVaoOXzZYKvrKQx2nSG7sv
+        zS2Hmx1udxjdME6oowtGJ4zjx+H272hvhxkAcwBGizqaYTTBSMJIwGCHWYyGd38UeI+oS7AiKt7oqDSv
+        4tGyS8R5EY/SpDd6T8oE3iNc2UQ8zo8wIt69uyrv0XRxXswiNOndvStlVT6iDng8TMS7I82v0Jyz8iuv
+        72l4+WV8zsKVjcdjvIQR8e6MCJ7GipJl7Oh4vd4wO0MdWdorSkoX46UsRJPeyIi0oFJzvct6/eXi59rb
+        fv0fdWRorndpXUwu5UEi3m1pYaXeapz5XJtnVio9rdV4XBeTj7JGGt7tYSlb5c18r8gqyC3YlJt7pPX7
+        d975HtVF5WOciDc8zLKrtN/JDLytjbHWcd70d7KJ7KJRpYwHaNIbviUtqsLfZ1PpITrgMT8N79ZNaXE1
+        vgsQPEwXVco5Ee/mEMupQvcoK2Bm/A3VRZUK7qNJb2hIEjxkBwXpfTdtBzXpvotGoxGlknmJeDekJXBx
+        sf1dijd5fzdNF6mr5A00vBuDbGk1vvsUPEwXqatiRLzBQWlZNb43/g54qC5SV83radIbvM6WGdCdu5ga
+        k3bu069sJBK2G7iHhnf9mpQLPOxckUpv/FyhoQMeI+JduyotN+KnHsHDdGG7kbtp0rt6la0w4mcylYfq
+        wnYTdxHxBtgKA35iBN636ROj1pUNh0P2GkbEGxiQVkJ6yHlWTI3UeVZHF3LUcCdNegNX2CojftoW6WG6
+        kKOWO2h4V/qBh3cB3wIP1YUcZkbE6++XVpvwpmKclzpXxGLwLgvvszDCMEIwgk4zt9Ok13+ZrTHhPUqa
+        p68LOi1UvMt9wENbHjE1dGcFZBcMOq28jia9vj5pLfA0O6hZTc6XXkomRXpIdsGgy8oVIt4lts6krVv6
+        q6Y/Ocp/nzqp6d53EF7QaaPiXeoFnmZ2hTtnJWclk+lzrt6sUHWNTonLNOn19krrazTbxVlvPVE4K2lP
+        n3N15qzQNbokzol4F9mGGp0eZVZyfU7OoQTce9+gukYXo+JdVHk6zaw5mTCbE4lvgKe93qWyg/Q4ZzTp
+        XbwgbVR5ur1xIp7mzVyNx3UBN+cSDe9CD9sEPESX5iG6gFum4vX0sLwaVCeWZY13sonsAgG3wm006fWc
+        Z3m1WHZxkR6WHSXv/Dm2WeUh/R3wvp6xC5iUXcDvruNWmvTOnWNbzKguluZN2aNM0fnddm4h4p1lW81o
+        M5vmITq/h4x39gzw0GZWTI2p+7up2fl9Hgc306R35gzLFzz9DupruPew7Hw+j5PXEvFOs20qD2nI0ryJ
+        vfH07Ch5p0+x7cDD+rsUD9F5PS5eQ5PeqVN8uwXvPgUP03k9bm4i4p1kOyxo97lcnRqozltPxjvZzXZa
+        8e4T0vtq/Ew2877zer0N9R5upEmvu5vvAh7W36V44sSorWuor5cNRLwTDHhouyh4mK6hoYET8U50sd02
+        vPv8Cni4rr6BV9Ok19XFC6xo9ymmBnJlG+DaeuUqIl4nU3ka/Z1pzpwInzMnHE6lp3ffqboGH6+k4XUe
+        Z3tsmt3ngWh+6R95yfPinJuJ6eob/FS84x18r027+8x/tuHZcDh9ztWZs2p2cG39cgVNeh0dTPC0GjL+
+        xjNh9uxEeuqZLADD7/f7fD51vYOh6jzeAC8n4rWzfZKm7o38RatXZ2fvDcG992X6xKit83gbZSJeexvf
+        L2l3n6WGcNhQHUrz9LPzeHxBuYwmPfhEeb+Ed59fqulhOuDxY0S8VnZA8PQbMpWH6jzekHyUhtfawg+q
+        PH2dWJZ1Z4UHhtsX5kS8lham8rB2MZWezqxQdW5fhJfSpNfSzA4xvPsUPEzn9kfkEhpecxMvZGgzG1R5
+        qM7tj3IiXlMTEzykIQPeF5qrsbjvYLj8MV5Mk15Tkh3mqE5MDa33igmdKxCTiXjJBDy6iHefIr2Z72Q/
+        6VyBuHyEJj14LrWI493nF8BDdS4//B+JeHF2ROUhDVmKN20XMCk7lzOQkIl48GxgMfCw/k7wMJ0zkJQP
+        06QXizHgYToxNVCdMwCrExEvykpkvPuE9D6fur+bcmWdTmdjk0zEi0Z5qeDpd1CCN3n3OV3naGyWD9Gk
+        F40wwUMaMpWH6hyNsK+g4UXC7KiC6vyfC97Ezn1Gdg5HsEUm4oXD/JiCdp+56tRAdY5gq3yAJr1wiJUp
+        mle28sUXrZYXXvD51PSw7ByOxjYqXijIBW9mQ5YXKPrLq5bC9Dk3fSbTuLIOhz3YLu+nSS/YyMuBp9nf
+        vbD7tz5f+pybOjFq61TePhpeYyOrqNPWvZrn/43PnD7nYjp7sIOMF+CVdZrZvbrgsH35/Kxd3s/eeecz
+        VGcPHZf30qQXgHpE5c1syCoOF9p9ZWXehjRP78ra7XWhTnkPDc/vZ1V2vPtM8RBdXZiO5+PVdrz7FDxM
+        Vxfukgto0vN5mcGOdp9iWUZ1daETym4anhdqYZWH9HeQ3qc6KwrcdzCUcLdMxIPW2gg8rF1M88SZDAZs
+        oJwOddhhCJ3K20WTXkM9MzlQXX2Kh+iU8EllJw0PPjGpcaDNbP2nKk/oiv6llZ2iRE7JRDzPOE+3gxJT
+        Q9UV/f0fGRpXVlHkyGl5B016HjerdeLdp5qewL3/gcqbdt+BTo6eVrbT8NwubgYe1t8J3j///P4HH6g8
+        DZ0cPSMT8VyCh7aLgmf799vvqTwtnRw9K2+jSc/lZBYX3n2qPFhQbO++/V6Gpg54Sj4Nz+ngVifafYqp
+        IdY767t/nbreqfcdDB49JxPxHCke1t9Bep9orsbjOh49L2+lSc9h5zYX3n0KnvaKIrLjPHZe2ULDs9u5
+        5MK7z0+Ah+p4rEfeTMSrS/GQhizN054VkB1nsQtUvDqFMzeqW6ZODe31TlxZ+IqC+AUljyY9ReHcrZ0d
+        n+02zp7tcon0kOyAd1HeRMSDANyaV5bPe9r9B8P+36U+kdReUUR2jMV6qXigk4Gn2d897X7K5Uqfc6fs
+        7yZWlJROivcqG2nSg/+/4tbpPp92PeUyPDOe3k+7z+k6KX5J3kDEY8DT6T6fci2dNzffCffex5P3xjN0
+        UryPisckXufR6T5LXK7iYqfzY5WHZCfZEn3Kepr0JInbPXj3qfJQnS1xWV5HxLMBD+8+07zUqWfmlYXv
+        FYn3U/FsNu4AHtLfiWV5/EymqbMm+pW1NOnZrNzpwbtPkR6SndWauCKvoeFZLcDDu0+Vh+qsiQEqnsXC
+        XfXjz6NodwHA+0j/voMvtrEkB5TVNOlZzNwNPKy/S/F0ZoWqsySvyqtoeOZalYfpxNRAdZbkNYWIV1vL
+        PajObv8I0sOyg/SuKytp0qut4Wp0WH+X5qVOPek9Cnx9Eqx34spaLObkdZmIV2PianhYf5fiITpzclBZ
+        QZOeySTDxEDbRcHDdOamG8pyIp6RextQnZgaqM7cNCQT8YwG7vPi3Sek96H+fQff6lXbPKTk0qRnMMh+
+        lYe0i2me9qxQdbXNN5VlRLxqrvKw7jPFQ3S1zbfkpTS86ioe8KE65UOVh+lqW24pRLyqSrnRh2WniKmB
+        6mqbh5UlNOlVVvKgV6dzr3j+eXW9U9PTXI3FfQejpvm2kkPEq5CDkJ7mJwKvlBe8KavhZWTMS50Yp7xX
+        TOhqWkaoeBXlcsin83nFk4rympyR+h4qTKfyFtOkV17Ow36dT1OeVMpeG08Pya6mpuWOsoiIVyZHVJ5W
+        Q7YoI2MzvqLAfQfD1HpXyabhlR3jKk+7vyss/Fk6U+s9mYh37CiPBvDuE50VkJ3J1HZPWUiT3tGjciyA
+        d5/orFB1ptZRZQERr5TH/Nqf9ejuPn9aUUR2JmPrfZmIV1rC45Ae2i7qrndpnbHtvjKfJr2SEjkReESd
+        sW1MySLiFQPv0bIzGtseyES84mKebESbWb13svErC18+2/5AyaRJr/iI3BRphI8k4UPTUAieGIFnWiIR
+        8ThkFJ54hSea4ZlreKYenvpXf2QnmWxqgp8JhB+qhJ9KbW2Fn3mHLw1ov/wDFe9IkdwE/1RrW3t7x/HO
+        zq4T3d0nT50+febs2XPnz/dcuHCxt/dSX9/l/v4rAwNXr12/PnhjaOjmrVvDt0dG7ty9d2/0/v2xBw9+
+        +FGZR5NeUVE1vDOIk44YsIHSf8H2avylnssn/W7uXCLe4cLCQwcPHjiwf9++vXv2FOzevWvnzh3bt2/L
+        z9+6ZfPmvE2bNm7YsH7durVr1qxetWrlyhXLl+cuW7p0SU7O4kXZ2QsXLJiflZWZOY+IZ3xsX0VeQfFd
+        3w/xdz7GP/qzvyn9Mf6bD/FX/Z/3EGHN+KO/8PT+C/YxodStM/yWAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="cbHThermometer.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAKAAAABaCAIAAACwpMoFAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        vgAADr4B6kKxwAAAABl0RVh0U29mdHdhcmUAUGFpbnQuTkVUIHYzLjUuNtCDrVoAABimSURBVHhe7d1Z
+        tGVVdcZxXnzyxScfZMA7jQIvDulssYpGKBrp7BBRugqWRUAIfUlboQJBIArEBEECAYIQLJEmBEJECCGk
+        QkBCCCEYQkwkCMEmREh+7G+MObZ7n7PvvgjU5XrmOOOMdW/dOnvv9V9zrrnmnGudDX48k0XdAxss6qeb
+        PdyPZ4AX+SCYAZ4BXuQ9sMgfb6bBM8CLvAcW+eP9kgbfdNNNfzyTN20PXHfddf3R+kuAPdrLL7/80ksv
+        /aKR/23kxRdf/J9Gfv7zn/+skZ/+9Kc/aeSFF17470aef/755557Lp/+7LPP/lcjzzzzzI9+9KP/bOQ/
+        GvnhD3/47408/fTT/9bIU0899a+N/KCRJ5988l8aeeKJJ/65kccff/yfGnnsscf+sZFHH330Hxp55JFH
+        vt/Iww8//NBDD/19Iw8++ODfNbJu3bq/beSBBx74m0buv//+v27kvvvu+6tG7m3knnvu+V4jd99993e/
+        +92/bOSuu+76i0buvPPOO+64488buf322/+skdtuu+3WRm655ZabG/lOIzTk242sXbv2W43ceOONf9rI
+        DY1cf/3132wEjD9p5Nprr72mkauvvjpD66qrrrryyiv/qJErrrjiG41cfvnll1122dcbufTSS/+wkT9o
+        5Gtf+9rvN+L/zg14RvdNSveSSy4ZBTi6Sycy7uaUGqGdRvvHtL2PbOQv+xKFIK9To3Su3cjlcsVpjfz+
+        VUupe6fhx/xm4h/UP2lQ+osvvngsYGYZj8MPP3z58uW/0cgRRxzx+UZWrFjxhUZWrlx55JFH/mYjRx11
+        1NFHH/3FRo455phjjz32txo57rjjjj/++BMaOfHEE09q5OSTTz6lkVWrVn2pkVNPPfW0Rk4//fQzzjjj
+        zEbOOuus1atX/3YjZ5999po1a36nkXPOOefcc8/93UbOO++8Lzdy/vnnX9DIhRde+HuNfOUrX/lqIxdd
+        dJEnJwZ47BiDFsvGxLF1hNFj/dhAwhiyijGP7KSOi9lkP1lR5pSwqwwsYWmZXML2RhNqEOj02GpGO9ab
+        GWfPCcPOwhOmns2P8TcLmAsyKZgdWBGTBTFrmDtMIsRskpnFFJO5xqST2cflxgLOvOte0dXLmQA8cySz
+        QnVBeiEdUQ3tdr9kavEeyXzTlvRaWzI5pRPbktkrfZpurUZmuL69KTPQV6/oR5EIjyCJBExJ5triFFTF
+        LFNyyLUlc3ZbQI1kUm8zhjmkM/GnEeoBH88gjYwD4DkZnsJQHqXB8ar0FMWFtlybcnD4OJF4OuXvcHlK
+        4vuUB8TgR7hCkThE8Yki8YzKP+IiReIolXiYkgzecqAM50hGd4nxXhINaHtY8bPiapXE5yrPixpFolUl
+        ccfKKat+LyQhFFqR6Gu5bAW7MwjaQyRDp3y6DKly7lxd5xi+zNUowPGZC3C4zuguTLrMidEGMA0eCzgr
+        IoDNu0zxjO6C1d3MFwCzcwBzO0ZpcNa7AHOpCnCZ5ZllroXy+rXM5RC4DfPaPAAnmtEGPKO70ObdossB
+        dG88GICtHUZpcGJVAFsRcZJndBcy3TZgS8SxgEUiAbbYZaJnPvOC8pnbupv1m9uzGKHBYwEnztwBPFsR
+        LYQVUZ8uwHxAy06AxXlGaXCyCACLVcVEz+guWLqiMQALMAAsnDcWsBwRwCKRAM/oLmS6AIvGzA9wMoAA
+        CzK3AbcDVZWnm8Wq3oBY1UTLXPFUgFGgwWLyozQ4+V0hXICFl2eRyAWy3m1HxYtuTDR9E0KXehkLWPae
+        BssRBfBMdyvIXFUAKQR4vePMw7qb4gIajBENHgs4tRkAywBKCg3Q5ZdbSkkFZg7gxfWzCDKGImIi6cki
+        CH9KIyaLoCHlV1kESUbpDdmhFGDIZflNyjCkIGUJO1kEv6kUgsymu00KQUNusVIIGrKNhx56qDhAKje0
+        jfTUb3SyCJ5XlD+xKi7IwQcfLEMFqvQll7NNV1rzc5/7nPekEMQMPvvZz0qIySJIenrkdhZBPvSggw5y
+        wykF0Qmf+cxnJNbkD2RL/VhZqWQR6JV7Dl398OlPf9pcSYPlWD1pqW9yXwVYZ47S4FTeMNGSu640LUeE
+        btBK/Hk8bd0tp9HOEaFrYtCtH/rQh9DdY489fKB0rEdyx1KziAYwlkTPbrXVVqDuvvvuluASnB5PRiuN
+        doJo2bJlG220UQBry+aKxB522GHVKMBuabfddnMP73//+/WFeSeM+3QR9ZnyxOjKXvtRv7/3ve/FFWkP
+        4paSJnJLu+yyC/X1LoUs560H9PX2228PcFi6k9T3SDbvs88+Gttttx26HtPj695tt93W5yNtOLpoO0fk
+        n0BFFwIPLkO6zTbbAHzAAQfIkeu3KgwKYCsdDWnyUYBT1EODO4A7GcC99tqrkwHs0K0MoK7Zc889qSx4
+        0d0PfvCDoBpx7jU1UyUf+MAHAN5yyy2ju370rr8kOzsZQMAC2B9Hd/0GV/0FdmUAKS6cAHuX4dcdKgho
+        6sQM4CGHHGL8Abz//vtrQBvAHoESV4lWWeZ9990XYO9uD1qAQXW3iheqeit5QLcUwGC7JWgD2N0qfGjT
+        RTRaC/BHP/pRix9oAQYVXeUSbbq4ejQJIRZ0HoBVzQHMMJaJ7ud3A3hiflfnGkoGKa11efdq6OG68cYb
+        J78bwEQvU+WYZUJxdQ20/jKZ3QAOWv2rN+X/wzWAcaV2bcCd/C6uJFobwH3drVgVTQ3gd73rXQZfAZ6Y
+        36W4NBjXd77znQEM4bT8Lk3daaedAN58883bgAtt8ruuDqrJTqfhutlmm7UBxzhXYUJK+/SwnL2GgTVK
+        g1MTCQ9jEsATs/cx0QAreWGg2paZwTEJsc9hHJUtxW0DVkbDSrtQmy7A4RrApbg60QzErhTg4pr6yGhw
+        J3vv9tqAB+jiWoA1CvBEumZcipu8vbZ7g7YAt7P3DFuy9xhDm/docIcuwH5pBJANN9wQbJgBBjUa3KeL
+        q+cFGGz1TKMAp+KVBnOCAB6ozQhaA3labQYfxIfw7gIYy9RqcUM6lvlTn/oU9Y11wtU7+0H4INNqM+AM
+        YFMvx4rwQSbWZrzvfe+ju96H6Rbg2OSPfOQjzDId7Vtm909rcSWZ/HbeeWe2x3vHMiPNmaK7oMIPAJvs
+        R8+14447dmozymcGNRpsNlm6dCmz7H0i3QBWU6wxD8DqmSkfEm7oV6y8MVA4VlV5wyDzSzt0qSw/IqVe
+        /JforgZrPFB5w2WtyhuODF9vWuWNZwF4TroAU6xaEblVBqZPl8+sr6lsJHVVXCoFFX260V2Mk8tL2Y2b
+        Yf+m0c16V4ekypohMdqm0Q1gpeMahs4oDU61OjBsbAGuoqpZXdXrUVc1Zr1bU2/VCqYRwP7VymoU4OxF
+        AJjtNfSyb2BWNff6Vc39KnRN8ADb/4H0WMDZacKs8aEAfq3o9ldE02oi+yuigZrI9opozppI3un47D3X
+        YXysKkGMkuGaSCSqJnJOuiqXp+luCoEBts0HYBP2KA3OPqIA9h9eK93lyo6seOXBjq945eaMr3jlwY7P
+        3nNzxkciOYkj6UL7yU9+srimMS3ODO3HP/7xAO5Y5irz5ogA7A+skkcBzi4xJlo0pzR4oJ5ZL1gXcQR4
+        hoabpSpfo1/PLIYAMLclkUjBqWiwRrwqjXAtwNyW6K5G/Cn6mhVRKS7AUdyKRPJfUs9MX+NYleIWYG5q
+        Ugga8arcfyKRFDdx5gBmmQVkMu/ylrMuoq9Z75biFmCubNRXIy4V3yeRyCgu+cQnPhGuiUfGWw5jkLIc
+        0gjXAJ5GF2YdYq+eP9D5YwHbA0iDbTMJ4Gl0UWFOLUw9w9dXrVordn3KKS5jXSv6qmfb1eoB7D1c0/AJ
+        cAZwcU0DV8HeANYIYI24ylHcNAJYI1xFChPN0Ajg4poGrhoBfOCBBwawRhxmjSguwJl3NcJVuCY+s0YA
+        F9c0cNUIYGoawBrhmgaiBVgjXNPAFc4ALsXVGKALk26xJXMegLPDswBPo6svgDz/7LO/v+++v3jLW/5v
+        gw3yevGtb/3Bdtt9Y80aq1hmoFZEfcDFNbGqNuDimlhVAW5zjWUuwOEawOGaBqJtwOEawOHaAVyWuQCH
+        awCHaxqItgGHawCHax9wFHci4OKaFVEB/tjHPtYG3N6Ak105ughg/8WqfZQGZ/8uNtbXFpcTd5rQRQb8
+        htWrf/L2txfadgPm761YQbmNg0y9UdnS4GmKi/RExY1lnqi4yRFNBJwZdyLg4hrLHA1uW+YALsXtAM6M
+        OxFwcY1lLg1uc41lLg2eqLixzG3AfboBbF+1vxRWGgvY7mz/U2AogPv7iMxzF6xZ8/yGG06km19S62tP
+        O804MO9KLYs3zeTV9QA9wW8i3Zho2+fnATh77wtwn65h7pKPL106QDf/ZATcs+OOdy9Zsm6PPe7dba/b
+        lu7hdevS3ae+lux+66TXLUuWTX19eNkt83zd/OHdJrx22O3mX359Z4dd87rw4KNWnnXJmNcXzrx44mvF
+        GRdNe33+9K8Ov04796uGxTS6DC0NBpi6C6CO0uCcrOB/SmPR4H6cWRCRj8cIzwl4cfzB2p32Xv7la9bX
+        a9WFl7UBtzfFZ68swI7BoMGC4WMB+w8+yLIngDs7PPnJ155wwuKAN+Yp7t3vgC/fcPv6el14xTUFuE83
+        gCnkPADnVJQC3N+/y3m+a/nyMV2zOP7msUMPvXnduvX1umrt2gCeSFfmhlsKMBNtaTpKg3PmjaHhP8jY
+        9Hdn0+BvHnPM4oA35ikWggZPoxvA3CYazOKOBczt9olsegB39t6/cgLGmWeO6ZrF8TcLYQ4uwHVGRY6s
+        IEy0Ze08AOe8qgLcP1lBhY0V1FPvfvec/H72trc9sGyZ10N7782L7jrPC9JnLud5Ti/69fCZ+x71l855
+        pZgwgPt0saDBADPRnOJRGpzTyHwWt5sGTzw3w2ddddZZ7QDWRNi3nXCCCVte+dWt/2b/Kz2gUGka3QAW
+        fKTBtG4U4Jw15xNFRgpwHYmSLIIgDnL3LV8+wJjWykfxDqpqjjHpx5mHI5EVjJwYqxoZZ26HmvuRyOFY
+        VYWrhuPM7RxRPxIpaDUQq2qHq8StsuTVKLOsxHOi7uaEIYAlh+YBOCcJ+nSxzQDu0E0KQSEOxt8+6aR+
+        tJJlvnPlSnO+GFa7Wj2AO3HmAjwxEjmcRRgZZx6ORA5nEQJ4zjhzO0cUwO1I5JxZhMQjwzWAQe0Drnm3
+        DpJS2aOHAWaihZZHaXDOiQxgh1VNpBvGukbdllTXdV/84rr99394n328vnXUUeetXi3ToKapsxdhYoJo
+        OEcE8EAWYWSceThHNJxF6ACeFmcezhEV4GlZhLbiZkVUgOluNHgi3QCWwjc+ZP9GAc4poK5hOdQG3Dqr
+        6pVmUgjsgxIyQ0GdbCYMM4FkLYvaoesvwzIanMxuZXmT+0uWt5K7nSxCP78LcHK9yex2MoBSvFXxWuUZ
+        Se6SSu62AVd+txrJ7EaDk9ltZwDbtRm12aSSuxq1zaSyQ6nQSHav0kQ6MIqrEcUN4FhmztA0ugGsyspn
+        jgWcM159unikusbX8DSyAlxokyNqS/80ssrvTtyL0D/zpjKA408jqzzgyNPIKkE0vvKmAA9n70fOuznx
+        LwKwOkkfK68zSoNzgq8rvWJ7G8ATdTcaPN+z5qo2oypeh+myBDJXYypek99t12ZMrHidWBOZCo2RdNu1
+        GeMrb6q0ajh7X4BpbdR3QHdzJnEA+9ixgHM+cwF+Dekme18yp+6+KU4SnLNqrrPTZDh7P7DejWPV1t2c
+        4gmwjQqukhq6uc+LzunbrmRS8f/bgEdWzf36nBO53ukCxIjabQSwMuexgO11AZhP0QY8ozu8FyHVVeVV
+        DexFGMjeD6x3+7obDQaY1vrMsYBzvCzAvMcC3KebfURENaQ5jAyc8WrjEAc7m01Y5uwmiolW7MFUxLeK
+        TY5w8dT3xHPmSWnbKJUSnM6pKDxPy+va3mmnNl/dnStMMJPZPTVx3pUJLVfZEoArp8KQq5wd2amrKlE2
+        ynfLPs/alC0SoG3VoBP6dPm0fDfv8ao8svW0ktNMloqI4zbHJnNN3E/oelIrafu+zL7C/tqeKHR5ajyS
+        9vnKljnQAOwq2Ykyt4nO6aOuDbAP7e8jimNVGwCzV2ygWj07w/SyjbyI2o5tK1H2a3uM2r/bpuuZd911
+        V2jtGEPUXuww7tO12rZLjG9ll5itTeYhhw7oblt1XVENl3WRbk3VXGoiI7aCgcqxspQH2PNm/64CLg9u
+        7Vd0Qc1OwL333hvUbMo2HfqlCwmN8UbtBGzrrpoI28V0uv2frp6KJeN76623diGkDUc9Frpgv+Md7zDa
+        0PWkHhOn97znPS7h3bDGVWbPIA7jApxTtQG2Z9+1spdsFGA7xl3YJX3iNMuMVs4KB9hztjeK1UaEjleV
+        7Z1bbLFFdNePtJb6Ytymm0pmz6nhnfbgSqE96sCJRvvttx/A3lkUuhvA6FLiPt2cXh/AdmQbbdAGMLqU
+        uE2X0kBLg7PSzf5djey6R5cS9y2zfxXIA5jK2v9uIa4RwOhS4nKYNay7AtghCBp0twBDYK7EVQNClw7g
+        0A1gp274cIHFUYBz8pmrCgXU1uz+iqgAT7PMetmeu9oDSHGzvdN+7UQzArhjmbMiwjX6WoCHz3iluDlT
+        wa5OgKEN4ELb1l13FagBnB3ZBbhtmTPpQguwrrDhkwb7e72cXfcD8y4NhnPJkiW6HmaAoQ3gfvY+gHHd
+        dNNNNaK7htomm2xSgDuWuQAzsQDT4LGAc26SmzD8C3B/vdveez9xp0mMcM5GKbqluAW4o7sBTGs7gAd0
+        14xLcVOtrl2AJ9KNca5N1iaL7MgO4D5dgGkwm0xlWePsva9d99O8KjaZlO6yyTqzALd1N/NuATbj4hrA
+        0OY9GtyxzG0NduwVwMLDozQ45ya5iQI8MZphVhjwqtrrXTcHcAKZAJty8vwUeiLdeFVmX5gzBw/QZe4c
+        t4Ar0d3umSozy/Zi9y1zO5oRDY5Nzo5s723L3PaZTbfQeqfB2ZTt5rMpu6S93jXI6C6t9W4OdpMazLL3
+        Pl2AcY0GK7LYYYcduEveA5hZ1jbHdyxzfecS4+rsOlfnHIwCnDMb3If7c8n5xqr60Qz+Yb7OicQm8624
+        rAN0QfXYmX2HTxKkWPlSlSgu0aHZl93xqvqxKs+YIHN8vWl0s9gFGN3YZN2dkxUm0k0ow23oQO+xyW7J
+        4JtIVycDU18w4k6obC2KTPwDdM2ATLSzRecBOFv63ZNgPVtRgLPTJDJSd2exqtCdOO+OjEROs8z1JTUF
+        2Gw4SoOz49tYawOe0R3Y4VnGeWSc+VVEM2rGLcvcBuwEaPdg1hsFONsJAWaFYqJndBcsXdOfbJAT+gF2
+        xtsowNmMxKqYdQCe0V3IdAPY12wwHmMBZ68KDe4Ans27b3ycecAy11fHqakCmAaLgo3S4OxVAdj6z2wx
+        86rWVxZhDN1osG9CAljIehTgVLoz0fz1AJ7p7sLU3XzlMMC+rI6JHgs4hdA0OIBndBcyXYDBApgGy7KM
+        0uDUyQIs1tMBPC2LMFvvvgHr3fqi8Pq68HybK16+TxRgidFRgFOE5Y4lKduAZ3TX73q3/YW89V29AewL
+        vZnosYBTo5MsdAGe0V2YdKksnwlgtycBOkqDk+EHWPhUOj3h07YJSruiNu0gu3bNWO3lo3aVL1UQP2eU
+        kAoCJzLclk6lox8rY18ZwMSc66jBOr0sjSqeTc1l59uVE+iuQpE6Ji1Jrar6q7B5YumdKcmPlVyJJvix
+        VCJOjB/Lm2mHFtJOPLhS71VkUQVxKV6uXSa1YQxde0dfeumleQBO6hfCX4dvRvew6cR0XzZDWyiK9uSI
+        P4Fb2ZekUGXK1booaSLqEpWfElXGtgoQO0Js6yJ272WPta30OQ8Dg5xdZJdYzpmzF0G1unJXoiZS1Vwq
+        MdRmSO4SGUA5onxJmUikWJXFLrEi4lIR8y7FJei+/PLLAKs0GqXBGU3GfhS3NHhio8Lo7UZp/ECjbxLm
+        9ZuqW+s0YldiYMrStE1O2Z5+oxNJbpuotKtm/TVpxPLlYyc2OqZx+C+dxU3GAm7vB2xXqFf1RVK2sW/1
+        XSQ5+K+SdLGuVb1WmwAqblAPVoOjnWCpGuAqTyk3kmfhSYgiHik88wjJWdNEhk7NRrKT8oCqq4jMI5F3
+        cyYqUUwT+2Qa4moQSwZiZSi888ohURdcIBRPZFxk/YhknxIXInErhUwk9eTyiAyxiiKl7UTq165MIict
+        uUskziWbiZo9WWRil5hiPCJDTJSjKIgk0sCyv/l+Etl7+V0iRySLIAxJxKosdokVEZeKpPaI7o4FrBPT
+        dzN5M/aAUT5H0V3/n2e/ebP3wAZv9geY3f9wD8wAL/IRMgM8A7zIe2CRP95Mg2eAF3kPLPLHm2nwIgf8
+        /xLSMboACnKwAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="cbHMultiBars.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAKAAAABaCAMAAAAIGK1gAAAABGdBTUEAALGPC/xhBQAAAwBQTFRFGhoa
+        KioqNzc3OTk5Ozs7PT09Pz8/QUFBQ0NDRERERkZGSEhISkpKS0tLTExMTU1NT09PUlJSVFRUV1dXWlpa
+        W1tbXV1dXl5eYGBgYWFhY2NjZGRkZ2dnaGhoaWlpampqa2tram9ubGxsbW1tbm5ub29vbHBpbnBsbXBv
+        bXV0cG9pcG9scHBpcHBscXdrd3Vrd3ZrdX1ueHhsfXtufn5vcHBwcXFxcnJyc3NzdHR0dXV1dnZ2d3d3
+        cXp5cX18d359eX9zf31zfn5yeHh4eXl5enp6e3t7fHx8fX19fn5+f39/drwxc49Xdp5Nd4FteNAhfOwN
+        e+MUfvYHf/8ATbuwVKujZYiFYZSPe4WESMq9RdHDQ9nKQODQgX5uvKYxvLwxj4dXn5JOn59OkJBXgoJv
+        gYh5iYd6iop70LUh0NAh7MkN48MU9tEH/9cA7OwN4+MU9vYH//8AgICAgYGBgoKCg4ODhISEhYWFhoaG
+        h4eHgoyLh46OiIiIiYmJioqKi4uLjIyMjY2Njo6Oj4+PiJCAjJKHko+Bk5ODk5KJlJSKkJCQkZGRkpKS
+        k5OTlJSUlZWVlpaWl5eXmJiYmZmZmpqampubnJycnZ2dnp6en5+fnaCboqKdpKSfoKCgoaGhoqKio6Oj
+        pKSkpaWlpqamp6enqKioqampqqqqq6urrKysra2trq6ur6+vsLCwsbGxsrKys7OztLS0tbW1tra2t7e3
+        uLi4ubm5urq6u7u7vLy8vb29vr6+v7+/wMDAwcHBwsLCw8PDxMTExcXFxsbGx8fHyMjIycnJysrKy8vL
+        zMzMzc3Nzs7Oz8/P0NDQ0dHR0tLS09PT1NTU1dXV1tbW19fX2NjY2dnZ2tra29vb3Nzc3d3d3t7e39/f
+        4ODg4eHh4uLi4+Pj5OTk5eXl5ubm5+fn6Ojo6enp6urq6+vr7Ozs7e3t7u7u7+/v8PDw8fHx8vLy8/Pz
+        9PT09fX19vb29/f3+Pj4+fn5+vr6+/v7/Pz8/f39/v7+AAAAAAAAAAAAAAAAp7X1KQAAAAlwSFlzAAAO
+        vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAUGFpbnQuTkVUIHYzLjUuNtCDrVoAAAu+SURBVGhD7Zt5
+        WFTXGcbTaIiNprHV2DTGo9W5bdMlTRcExa4MIKZL2jRd0jTpvqRN2gCKNAgiTZsoIItrWxd2Zr1n7h0G
+        lH2GZdhXEZBVRBBEEFnNP/3OnZmrZ2aAkUXmeer3nIcH/9D5zXvuOfec9/18aNDJ6yEn5xt8ADjfGXqg
+        4P+HgtoUJyyFSXvhGUz54PbU1OTkxPj42OjorZGRm8PDQzcGB68PDPRf6+vr7b3a03Olu/tyV1dnZ0d7
+        e1tr66WWluampouNjRcaGurramtrqqurKisrysvLSkuNJSXFxUWFhQZ9QUF+Xl5uTnZ21vnz5zIzM3S6
+        9HQtz3MaDWZZtVqlVCrkcllaWmpKSnJSYmJCfPzZM6dPnzp58sSJ48eOpdwN6IR8RynAqal69u6CbygM
+        8gN+UgObS4PxjAN0IkP4YR4aewWCCoODYfqV/J58hAacZDdu2rx5i0TCuLpudXN337bdw2OHp1Tq5e3j
+        s9PXd5efn39AwO49ewL3BgUF7wsJCd0fFnYg/ODBQxERkVFRh6OjY2Jj444cOXrs2PETJ06eOnX6zNmz
+        8QmJiUnJKSmpaTKZXKFQqlRq+L4AwPPa9HRdRkbmuXPns7Kzc3Lz8vIL9HpDYVFRcUmJsbS0rLycowEn
+        J9lNwfHxCQkJiTDg301KhpFM/vVUGKlpQsmEksOHkVLCJ6rUMNTwuaRAWZNCHAcMUFotgEDpdECTkQkj
+        E5hInRcqKysrG0Z2Tk5Obi6MPADNh5FfUFTBxVEKTk6wm+PhsYcHH6oR6gKpBqh6qLo6WAi1NTWwFmA1
+        QFWSqoAqhyqDKiVlhCqBKiZVBFUIZYDSkyqAgg+HdZOXCzw5sHhg+UAJsAQb+OFbZMBiKqjUxFKAE+MA
+        6Dx8On0lRwOOj7NbEpxGP51OX8XFUAqOj7ESAHSO+YVHtqDaCnBslAA6DV+6voaLphQcHWWZROfhI4CH
+        acBbrGuCuH6/ge5/PfvTs8L6hYKNSV9rBXhrRAA07y/o1ftfr/zox38X+dINdVwUpeDICLs1Udz/lgIQ
+        JPnJUbN+6VpDPRdJA95k3RLF/XmJAH/2NdP8pmu1hdaAN4dZdwJoen8sEeCryMKnLWzgIigFh4exe5L4
+        flsiwFeeNeun1Rou8IdowCF2W5L4/l0iwJffMc2vVssXNnI04NANdnuyeD5YEsCfv/x1zsJHAA9SCt4Y
+        xB5J4vnlM/d/G0Tok+9gkY8vvMiHU4CDg6wAuGTnK3H9wvxCFTVxVoDX2R0wxWa+by6wgs/9LmWW858V
+        H1fUzB2gFLw+gD2TRf3QSwtbL37/O/+Y8XxqzccVN/NhFODAACtNFud3oQHh63733zOcn234uOIWzgqw
+        H0tTxPP9IgD+4EvTn+9t+bjiS9x+SsH+a6wXAJrvH4sA+BKa9v5hhw8A+VAK8Fof650q3o8WAfDF56a7
+        H9nj0xS3cjRgXx/2SRXvb4sA+MK709zf7PJpitu4EErBvl7skyLeLxcc8IcvfC/T/v3SPp+mpI3fRwH2
+        9rI7QUHz/ffTC7wPok+9q7snPk1JOxdMA17Fvqn3/34+jX4aXNJhBXi1BwBF/+Bbc1Tw+d+n3ZN/MC0f
+        NnbwQZSCPT3srjTR30Bvzq3e+OMv/3kP/sb0fNjYye2lAa9gvzTRf5krIHytX/3HYf9lBj5c0mUFeKUb
+        AEV/aB6Af/6Ko/7QTHyssYsPpBTs7mb9AdDsX80D8E3koH81Ix9rvMztoQEv44A00V+bB+AbX3TMX5uZ
+        jzV2WwFe7gJA0f+bB+Br7znk/83Cpy7t5ndTCnZ1sbtloj85Z8C/vPaLHEf8ydn41KVXuAAasBPvkYn+
+        6efmuA+iz76XtSB8amOPFWAnAbxf/u6s+qlVpT28P6VgZwcbSABN/vO3Z1Hwy39QzMN/doBPVXqV86MA
+        O9rxXgA0++Po7ZnrrT/95l9z9scd4VOV9loBtrfjIJno388GCPi//u8c/XuH+JRlvfwuSsH2NhwkF/MF
+        BwD/+tW55QuO8SnL+jhfCrCtFQcTQFP+4QDg22hO+YeDfMqyazwN2NqK9ynEfMYBwLeen0s+4yifsqyf
+        30kp2HoJhyjE/MgBwNffn0N+5DCfoqyfowEvtQCgmG/NCvi313+bf+/5luN8irIB3odSsKUFhwqAQv72
+        hdneJJ9/P3dR+RTl13lvGrAZ7yeAi5gP3oN+CkX5IEcDNjfhMAA08ZW5QnrpStJLVxJfukJ+WcRAflnI
+        wPuDIfsfQ/RjyP2DIedTBvJLhvhXDPE3GJJfMqQJgIH8kiH5JUPse4b4pwzxTxloC2Ags9VIIOnGEtIf
+        IIEOAZVECUWSXnnFIO9FKdjUpAlTWvQrQwCICCACwGIE+WoRIm0ICPJVRPY/ROJVRPJV4XyKIF9FJF8V
+        /A1E8lUE+WomgngVkXwV3HGdDhF/EhH/D/Ech4BPg4API4iaVQj4VMjCJ6+4wUtpwIv4gNIyv6UAaCSA
+        JQBYAoAAhyD/BTgAJPufCJgPgHl5CPJfAMwGQLj+IhL/IhL/WgB1BDAdALUACPYkwAEgJN+IdBcAoFqF
+        gE8JgIJ+cnnFEOdJAV5sxOEqSz4NgCAead9ApIMDxANAEk9bAPUEsAAUzAdAOF8BYA4i+TQi/oYImAGA
+        GaAgiEfyBUT8cUT8UwGQRPMEkEWkAQQAlQBo5pNXDvE0YGOj5iAAmvJzMr1GH8jPS3xIfO5NAL0B0ACA
+        Bm+y/3mT/Nyb3N+8yfkPwfPnRfw/L+IfeJH83AsEBMCMDCnJt6QkX5AS/14KfGR6OU/gw57Ax3pCT4HS
+        E/iUyMInrxjmd1AKNl7AAGjO94Xnz06+D4D232/C82fr/xH17uSDpnyB8JmeP7I+CB/oR54/sj4IIMwv
+        9NJU3OQ9KMALDfiQ2tJ/AOrZ7T8g6tl9f3jZ93dBPbt8nNQ+n8LTwierHLECbGjQRKgWpz/invY/k34y
+        AridUrChHhNAoX8jffVqu/0bWU8Y8BMfsenfiH/8cbls1Sobf/LkypUZyStX2uFbpjnz2GM28xv14dXS
+        YytWCHyyylv8Ngqwvg5Hqs39JevSz3rY6S/JcncxrGVPuFn3lwTmHFm/RhYnsfbXQjP8D38sKWqTmL+Z
+        nj94Aj+k+eiZ8A1Wz5/iyVCFfPWxkPWEL61qlHenAOtqNVFqc//Lo6XGjXb7X1wMLnr9M7b+1arwR7Kz
+        nrbpf/Ffrlqu0z0l5m9mvuCdyzTLMF5Hrw+F4snVKwIelsvXEr60qjGOBqytxQIgWb6PGrUb7fbnuOhd
+        9OwzNv05awKzH8lKe9q2PyfpqeW6JAJ4Z/2CgMs+/lDQMnx6HbV+TfvL2oflRwEQepyqx3g3SsHaGnyY
+        NfcPBXh4xNrtH3LR+7q5RVr7a2uYOF4qkRyw7h/6hN8mD49Nm0Ks+GB7WYbdNmwIvHt/IXxrPdd7MuvX
+        +xO+tKpxfisFWFOtiWYt/U1yuf3+pmS9PjnJxv87GxfHZZ05Y9vfFHVcpzt+3JZPE4txbIw1n1weEimX
+        RUQIfKlVExwNWF2No9kF7r+a0/5i4kutnuBdKQWrq3CMALhw/WHz4UutnuQZCrAKus0IoJPwpVZPcTRg
+        ZSUmgM7Cl1IzxUsoBSsrcFziwvUnFkA/JQy9wQDnHzhEQmelULD4YIcFGUALmC+y8ZZBtyWc8+CwDDeO
+        qipwN8Aiqrly2wqwolyzkP2d8GFV1TU1tXX19Q0XGhsvNjU3t1y61NrW1t7R0dnVdbm7+0pPz9Xe3r5r
+        /f0D1wcHbwwNDd8cGbk1OjY2PjExOTV1+wN+C6VgeXnu3R2z8+uPNXXJWgpeb9MPePlZhtBUeudPmzfT
+        gAvY/3z0yJG42NiYmOjDh6MiIyMOHToYHn4gLGx/aGjIvuDgoL17A/fs2R0Q4O/nt8vXd+dOH29vL6mn
+        5w4Pj+3b3N3dtm51ZRiJZAsNKHPCRvSUhLsavef7HwIW8+8/+O8a81X3gYIPFJyvAvP9+07/DP4PO9I7
+        r249PbQAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="cbH2Scales.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAKAAAABaCAMAAAAIGK1gAAAABGdBTUEAALGPC/xhBQAAAwBQTFRFAAAA
+        BgYGBgYHCwsLDAwMDQ0NGhoaGhobHBwcHR0dHh4eLS0tOTk5Ojo6Ozs7PDw8PT09Pj4+QEBAQUFBQkJC
+        RERERkZGR0dHSEhISUlJS0tLTExMTU1NTk5OT09PUFBQUVFRUlJSU1NTVFRUVVVVVlZWWFhYWVlZW1tb
+        XFxcXl5eX19fYGBgYWFhYmJiY2NjZGRkZWVlZmZma2dnaGhoaWlpampqa2trbGxsbW1tbm5ub29vc2dn
+        cGxscHBwcXFxcnJyc3NzdHR0dXV1dnZ2d3d3f3NzeHh4eXl5enp6e3t7fHx8fX19fn5+f39/bXSAZJXt
+        /wAAgICAgYGBgoKCg4ODhISEhYWFhoaGh4eHiIiIiYmJioqKi4uLjIyMjY2Njo6Oj4+PkJCQkZGRkpKS
+        k5OTlJSUlZWVlpaWl5eXmJiYmZmZmpqam5ubnJycnZ2dnp6en5+foKCgoaGhoqKio6OjpKSkpaWlpqam
+        p6enqKioqampqqqqq6urrKysra2trq6ur6+vsLCwsbGxsrKys7OztLS0tbW1tra2t7e3uLi4ubm5urq6
+        u7u7vLy8vb29vr6+v7+/wMDAwcHBwsLCw8PDxMTExcXFxsbGx8fHyMjIycnJysrKy8vLzMzMzc3Nzs7O
+        z8/P0NDQ0dHR0tLS09PT1NTU1dXV1tbW19fX2NjY2dnZ2tra29vb3Nzc3d3d3t7e39/f4ODg4eHh4uLi
+        4+Pj5OTk5eXl5ubm5+fn6Ojo6enp6urq6+vr7Ozs7e3t7u7u7+/v8PDw8fHx8vLy8/Pz9PT09fX19vb2
+        9/f3+Pj4+fn5+vr6+/v7/Pz8/f39/v7+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdZH+hwAAAAlwSFlzAAAO
+        vQAADr0BR/uQrQAAABl0RVh0U29mdHdhcmUAUGFpbnQuTkVUIHYzLjUuNtCDrVoAAAy8SURBVGhD7ZuJ
+        V1PZHcdfWzvTZWbQGRnHsdbpzLRl1k6tT4XXggiWQMC2iCjIogICgqgwQIQEAnkv74WALGEPS8KOCMgq
+        IggiiLLN/En9/W4Wucmjx3E55Jz6O/fkRDyQD9/77r3f3+93YRY8PBgP51t4A/iyM/RGwf8TBQ2FHhha
+        Ir7tGSz88YeNjfX1tdXVladPnywvP15aWny0sPBwfn7uwezszMz96el7U1N3JycnJsbHxkZHRu4MDw8N
+        Dt4eGLjV39/X29PT3dXV2dFhtVja29paW1rM5uampsaG+vq62lpTTXV1VWXlzYqKcqOxrMwgSaJeL/C8
+        TldaUqItLi7SaNSFhQU3VKr8vLzc73Nysq9fv3btalZW4WZAD+S7QgFubPTxmwN+QzLwBV6pIdhDLwj/
+        c4BOOMiLfejlAgQlQ4Rhe4vvCzJpwHX+8JGjR339/Dh//4BjgYHHg4KDT4QoFKFhSmV4RMTJyMhTUVGn
+        o6PPnI2JiT0XFxefkJh4/sLFi0nJySmXLqWmpaVfvpyRmXklK+vqtWvXs7Nzvs/NzctXqW4UFBaqNUVF
+        xVptSWmpDn5fAJAkQ1mZsby84ubNyqrq6hpTbW1dfUNDY1Nzs7mlpbWtrd1iEWnA9XX+SGxeXn5+vgoG
+        /NwbBTAK8KerYag1JIpIFMOHYZTAJ5bqYOjgczFAWZtCoggMEAYDgEAYjUBTXgGjApgwKklUVVVVw6iu
+        qakxmWDUAmgdjLr6ZquYQSm4vsYfzYPHHh58iAGIWxj9EH0Qvb2wEHq6u2EtwGqA6MCwQlgg2iHaMFoh
+        WiDMGM0QTRCNEA0Y9RDw4bBuak3AUwOLB5YPBIFFbOCH36IcFlN9h/4yBbi2CoCew2ds6BBpwNVV3jff
+        Y/QzGhs6xXRKwdUV3g8APWN+4ZGt73IBXHmKgB7DV9bQLaZRCj59ynMqz+FDwFQa8Anvn+8R6xfmFzam
+        hh4XwCfLBHD79xcbX1ljr3iJUnB5mQ9QeQ6fobFPTKEBH/PHVB6jn8HQ5Ar4eIkPRMDtPT/s8wsnZFO/
+        mEwpuLQkBN7wHD5D4y0piQZc5I/f8Bj9DFLTgEgDLj7igwo8ZX7BdAPgRUrBRwtC8A27f6n99FNZ/9L4
+        SUfFgQNu/qV4/35J2r/fzb8U7NtXr9u3T8a/eFWp9+519S/Gqx99FqnaswceQDBqTbelCxTgwgJPANFf
+        fWPSKGX8VaNit/XLClWIq79KaPme9RFzglz91aWG2Kt/1mUFuPkrv99W/lGd7kf7K6Px65Syss/ykw8j
+        n9Q8KLoAPuRPwBQT/+fd18fJ+r/d1t1WyxF3/7c//X2zmXXzf7G7KnbV1R109X/no70qvSorv6X8H6zf
+        rz/bE/euwfAV8onNQ+J5SsGH80JIgd2fevfVcLL+FAAt5Ufc/OkXCeb3zeIhd3+qO7irrvSgqz/1+svb
+        570q1QD4zJ/a95ev3jXkI6AomoekRApwfp5XFNj98zmlMlvWP++2RoeEZLr65y+Ccmoig46nufrng7HH
+        wsMDApLc/bNXpcLXN9GV7+vIwyeDDh+ORT7RPCy6AM4JikKHvxdFeX9farGUlLj5e01OTo1ZrXb391dV
+        dXWqfBl/n1N5MzvbXb/kLIPhyhXCJ5rviAmUgnMP+FAA3Jb849n5QdYH8gGgFE8BPpjlw9Sew6c3j4g0
+        4OysoFR7jH56vXlUjKMUnJ0RlIXbkV/KzS9k1i2j0jkKcGaGDwcF7fvzb7bIf3+9Rf77qy3y37e3yH/f
+        cua/NN9b5PnD1L9lTIylAe8LEWpnfs5Aeh6O+bkS83Ml5udK3J8ZyM+VmJ8rMT9XYnoehvszA4BhmJ+H
+        YX4ehvl5GO7PDOTnoZifh2J+Hor5eSjuzwzk5wrMzxXonxVlcLwpcH0wDj6hZdwF8P40ADrPNwRksX7A
+        Yv2AxfoBi/szA9UDFusHLNYPWATEA6QJABtZrB+wWD9gsX7A4v7MQP2AxfoBi/UDFusHLO7PDNQPWOAz
+        sujvWeAzsLh+ERD1E4TWcSmGUnB6mj+pcZ5vANgJgB0IaAVAOH5Z3P8IINY3ENCMgM0A2ASAjQAI6rFY
+        32DRHwCgycRAfQMBqwCwEgFvAiBMLwPlDRb4jCzmHwgoAaCIgDY+oXVCPEsD3hMiNc7zjYH6C4v1Fxbr
+        LyzWXxCwzQHYAoAgHtZfWKy/MDC9IB4AYv0FAWtZrL8AYDUAVgEgqMdi/YXF840CNACgBICgHuPgE1om
+        XQDvTQGg8/xgYHr98fHzx/qQP/oXf1wfANjqj/Uhf6wPcehfOFwfCMghIIf1IQ79C4frg4Hnj8P6EIeP
+        H4f+hcP1AYBGDtcHBxVXA4f7M4ePH2PXT+BbJ6UzlIJTU/wpALTVr/7JPkf8PfJZ/GzT+81vf+rXf26b
+        X6iatt4Vo2nAu0KUxlFfY//zHMH++9VHpIOPb51yAbw7CYCO+t82Atr043VtU9JpSsHJSf50kaM+uX2A
+        Dj5d2z0xigacEKKLHOfHtgKifjpd67QL4AQCOuq72wlo4yttm5ZOUQpOjPNnEJDUn7cR0M5X2nZfjKQA
+        x8eEswBoq4//BMB/bVrKtvebX23/+fxfj3TwlbbNuACOjQkxRY76/T+eYxtk/0Y2PJa8vrXpve0rL/b1
+        t23zW1pa0j4jnaQUHBsVYoqd/QWG9BeIP2hnSX8BTmA4fhnSXyD+oIkl/QVywNUzpL9A/IGJJf0FlvQX
+        GNJfIP6ggiX9BTyBy8oY9C82fyCy5PxlyfplHHwl7bNiBAU4OiLEIqCt/wGADn8A7gX9FUv6HwTQ5g+a
+        wL2Af0HAegB0+gMEtNuXqkoEtPsDAoj2Bf0Lg3w2fwCAeL4hIM8zdv0gNXsg0YAjI8I5rbM/w5D6Bhy/
+        cP76k/6MP+nPICAcv6Q/w5H+DJzAcPwypL7Bkf4MR/ozHOnPAKD9+K0o55APTmD0LwgIxy/Jjzhy/vqR
+        /RkAcX4h2uekcErBkTtCnNbZP2K26B8BoGz/CAHl+keMS//I4Z8B0Jm/Of0BPH+Mg0/bPifSgHeGAdDZ
+        30JAuf4Ws0V/CwBl+1uMa/2F6GcwMPJ8Osaun1bbPi8pKQWHh4V4Akj6b7/cov+2Y4v+244t+m87XOsv
+        Nj7DDln9dLpf2OYXGpWWh1IYDTgkJCDga+wPbpG/2f2Vc/0SPq1lQaQBhwaFRAD0FL5i64IUSik4OKhP
+        LLHzlR84INtfVe/3iZfLL8s/ri35+GP3/qqw9+b1vZ9H2fqrz/TL2rMnL+/DD535kc1f6XRp3t7XUr0P
+        KEC/4mLrI0lBA94WzpfY9fvSmHdCrv97KFu2/1sesKv2T9pMzrX/K/h6VXybZu//bprfCCn5qz/kJtn2
+        P6e/0pWGlib4+CTg/BYD4KIYQgHeHhAulNr70x+0tx+R608f8vldqmx/epdpp6nmO/f+9HsV337+UTyt
+        H67fPbHviOKXLnywPrxP+/zeOwr5ijsWJRpwYEB/EQDJ/vdBu/HwFv3zQ7L9852mnTXF37n3z9/D/vk3
+        1Pwi36cR4jtiLgJu0g/4DihwffggX7F1STpBKThwSwBA2/58+kRwhlx//1BcYJxsf3+nKYzjLrj399+r
+        +ObU0VObnz/CxyYVHWcPxbjxHUxQ+Sj+GoJ8RdbHUjAFeKtfSNI5zg+tVv7+wfVC+fsHeTU1ubky9w+u
+        l5enXnPlkzKTkorEjAxXvpLUhHiVNj6F8BV1LLsA9vfrk6GA+jruR/yk/Y/ML9wsAcAgSsH+PgEBX8P9
+        jRfiK+p4Ih2nAPt6hRSd5/BpOp9KgRRgb4/+ks5j9NNoOldEGrCnRyCAr/h+zovNL9xx6lqRjlEK9nQL
+        qbzn8Gk6V6UACrC7S5/Ge4x+GnXnmkgDdnUJabynzK9Gre5ak/wpBbs6hXQC+Oruh73w8wd86q51iaMA
+        O+G2GQJ6CJ+6a0OkATs6BAT0FL7C7g3Jj1KwwypkqF7d/cR6uE8Jo6GxEfwZmFy4WUkCcleoAIAMoAXM
+        F2687XDbEnwemGXIODo7oboBJaLuez+4AFot+ld5vxM+rLOru7unt6+v/9bAwO3BoaHhO3dGRkfHxscn
+        JifvTk3dm56+PzMz+2Bubv7hwsKjxcWlx8vLT56urKyura1vbPzwo+RLKWixmDbfmH25+7G2W7KOgPR8
+        6wHFBccgl0qf/evoURrwFd5/vpKZmXH5cnp6WmrqpZSU5KSkixcunE9MTIiPjzsXGxtz9uyZ6OjTUVGn
+        IiNPRkSEhyvDwkIVISEngoODjgcGHgsI8Oc4Pz9fGrDIAy+iF+Zvuuj9sn8R8Bq//82fa7ysuG8UfKPg
+        yyrwst/v8c/gfwGGtnP5GdqdYgAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="cbHorizontal.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAKAAAABaCAMAAAAIGK1gAAAABGdBTUEAALGPC/xhBQAAAwBQTFRFGxsb
+        LCwsOTk5Ozs7PDw8PT09Pz8/QUFBQ0NDRkZGR0dHSUlJS0tLTU1NTk5OT09PUFBQUlJSU1NTVVVVWFhY
+        W1tbXV1dXl5eX19fYGBgYWFhYmJiZGRkZWVlZ2dnaGhoaWlpampqa2trbGxsbW1tbm5ub29vbW5wcWRk
+        eGpqcHBwcXFxcnJyc3NzdHR0dXV1dnZ2d3d3eXNzeHh4eXl5enp6e3t7fHx8fX19fn5+f39/ZJXtqUND
+        4xQU8QoK/wAAgICAgYGBgoKCg4ODhISEhYWFhoaGh4eHiIiIiYmJioqKi4uLjoiIjIyMjY2Njo6Oj4+P
+        kJCQkZGRkpKSk5OTlJSUlZWVlpaWl5eXmJiYmZmZmpqam5ubnpmZnpqanJycnZ2dnp6en5+foKCgoaGh
+        oqKio6OjpKSkpaWlpqamp6enqKioqampqqqqq6urrKysra2trq6ur6+vsLCwsbGxsrKys7OztLS0tbW1
+        tra2t7e3uLi4ubm5urq6u7u7vLy8vb29vr6+v7+/i6TQjKXRjabSjqfTj6jUkKnVkarWkqvXk6zYlK3Z
+        la7alq/bl7DcmLHdmbLemrPfwMDAwcHBwsLCw8PDxMTExcXFxsbGx8fHyMjIycnJysrKy8vLzMzMzc3N
+        zs7Oz8/P0NDQ0dHR0tLS09PT1NTU1dXV1tbW19fX2NjY2dnZ2tra29vb3Nzc3d3d3t7e39/f4ODg4eHh
+        4uLi4+Pj5OTk5eXl5ubm5+fn6Ojo6enp6urq6+vr7Ozs7e3t7u7u7+/v8PDw8fHx8vLy8/Pz9PT09fX1
+        9vb29/f3+Pj4+fn5+vr6+/v7/Pz8/f39/v7+////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhGZedwAAAAlwSFlzAAAO
+        vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAUGFpbnQuTkVUIHYzLjUuNtCDrVoAAAotSURBVGhD7ZuJ
+        V1NXHsedOpY61U7tjNNOZ1qfZcmIolCygHUqIrKOiKwCjgoqaxIS4N28BwGBcUHqMgiYhSWBEHbZFwFB
+        EEFktf2L5ndf4JSbxJ4AIu+c8Xdu7oF7gHzy/b1737vf+2PHFM9jB8/5pj4AbjZDHxT8/1BQysdQWrTn
+        rkHpz2+Wl5eWFhcW5ufmXs/OvpqZmX45NfVicnLi+fj42Niz0dGR4eGnQ0ODgwP9/X29vT3d3V2dnU86
+        Otrb2lpbmpubzOZGk6mhvt5oMNTV1tbUVOv1Oq1G87iqqrKipKS4qOhGYWGBWp2fn8eyjEqFaDo3Nyc7
+        W6lQZMnlMqk0MyM9PS01NeX6tWtXk5OTkq5cvixdC8hDvosE4PJyK7024BNyDXfQEw2thAqh32ygE25c
+        t9JU9gIE5RoDzfIl/jozkQRcog9+5+zs4urq5u5++IiHx9Fjnp5e3kKhSCyR+Pj6HvfzO+Xvfzog4Exg
+        UFBwSGho2Nnw8HMR589HRkVFx8TExsVdiI9PSEy8ePnylaSk5KtXr11PSUlNS0/PyJRKZfKsLIVSmZ2T
+        kwufFwBYNi8/X11QUHjjRlFxSUlFZVXVY41Wq9NXV9fU1tYZDMb6eoYEXFqivwtOTU1LS0uHBn83IxNa
+        Jv7rMmgyORdZXCjgzXBkwzvm5ELLhffFAcpaFGIYYIDIywMQCLUaaAoKoRUCE44iLoqLi0uglVRUVFRW
+        QqsC0MfQHmuqG5gEQsGlRdo5FS57uPAhOiDacbRBtEK0tMBEaG5qgrkAswHChKMBoh7CCGHAUQdRC1GD
+        oxpCD6GD0OLQQMCbw7ypqgSeCpg8MH0gOFiMDfzwKQpgMmlMqngCcHEBAPnDp9aaGBJwYYF2SeONfmq1
+        tpG5QCi4ME+7AiA/8guXrMZsBTg/hwF5w5evbWLiCAXn5mi3dP7wYcBYEvA17Z7Gi/kL+YWFSdtsBfh6
+        lgPc/vXFwpeva2FiCAVnZ+nD6fzhy9O1MtEk4Cv6SDpv9MvL01sDvpqhPTDg9t4/VvILd0h9GxNFKDgz
+        gzwy+MOXp2tnI0nAafpoBm/0y2P1HQwJOP2SPpbJl/zCQzcAnicUfDmFPDO29fnl1+sP+Fj9EzaCAJya
+        ojnAbXu+IvnY6k7GCvAF7QUp5gsfU93FnCMUfDGJvDP5w8fUdLHhBODkJC3M5I1+DFPTzVgBTiChdLue
+        762uP9jRMDU9zFlCwYnntAgAt2X/YYcPANkwAvD5OC2W8YdPVdPLkIDj40gi441+KlVNHxNKKDg+hiTS
+        7dhf2ssv7Kxr+9gQAnBsjPYBBbn9b8m+fXb3v5rPjerP/2iz/5V99pkK7d1rs/9N37OnSrlnj5397+8L
+        pZ9+atn/ruG7+IcvfFN27wbfAwP2M8Ek4DPkK1vZn/+1WCqysz/XeDkZ/5Kf4mm9Pw+rvnpgP0r2sN6f
+        R1YFJf5Zmehmsz93+V3hn6SxzlZ87FdRLLMvJZLCfKh2wArw2SgArvgHnzSZXe36B05GJ4PhoK1/sDf2
+        Y73uWxv/IGhX/q6Kir9b+wfh/jsLdxYUfE3qx7JffbE7+COG+RLzoboBNohQcHSUPi5f8Tc+MRe52vU3
+        nAxOhvyDNv7G/lD9xzr0ra2/ofxmV4UCAxL+xs6/7Ti7syDzayK/2MkBuI+Y6wAIHk/dIBNIAo4gP/mK
+        /xIoEl2x6784Gfw9PeOt/Zf9HsnFxz08Yqz9l28C3cViN7cIW/9lZ4GXs3PY2usP833pS/kePXAgCPOh
+        2iErwJFhAFz1hxCy7w8pDQalwsYfkiYnF+kyM239ocSUioqUFDv+UFJBQdIVaz6GiUxkVAkJHB9dN8Se
+        IRQcHqZPAeB79K/esr5Y+Oi6p0wACfgU+ctX+XwoH7v+moSS2PXXxJTYrr8mokR2/TUhJbTVD27A3pT3
+        Ch9dN2wF+HQIAFf1o36hTCYJ9v8k2P+TYP9PAusfjNfVSbD/J8b+nxj7f2JY/2BcqxVj/0+M/T8R9v9E
+        sP7BeEmxCPt/Iuz/ibD/J4TlD8bVaiHenwthA8cK8fwQwvoH4xb96FzDMHuaUHBoiD6dtepPwg8+ekQ9
+        Ki8vp+BVTv0XAncw/vAhtAcPqAcQ1IP79+9T+PULde8eNOh+gqB+Kisro8rK7sL43bvU3dLSUgpepdQd
+        CNzB+O3b0G7fom5BULdu3rxJ4RcHiPlyDSOMPwk4iAKyLPcPmQx+8IcfoFl372EcJcRjvty6USvAQQxo
+        8Xejo98DyNsEQCEhmC/HMMqeIhQcHKDPYEBufcEpLhfg7ArKIbMCnGLBQ8guTrEAZxd39wWQXeggsTjF
+        gnuQXQG8ygSQ4TLBXcgupLhUgLML3Z07ApxiAWSWS7EAZxd3NwWQXdz9B8a5/IIxb3jG+BGAA/0oEAAt
+        658b5WbXH4dxu/64K+Vq1x+HcTv+uFoN43DihOcHd/+A4O6/yIVyWeHLMYxZAfb3o6Cs9fj3mn9pNubf
+        //b6Z9EvJ9s4xh4nFOzvQ0GK9ZwvXPrHpQ2dLzjGl20cZ3wJwL5eFIwBHT3/0Bz656HHGzj/cJAv2/ic
+        JQF7e1GI0nE+/aUTJ09cWv/5jKN82cYJ1odQsLcHhSod1k+vOfTjyR8PVa33/MhhPqVxgiEBe7oB0NH8
+        6rGAJ0+e+Pc6z7cc51MaJ1kJoWB3NwrjAB07f/uewvH9+s7f1sGnrH/BiknALnQWAzrGt5XzF07hIeqn
+        GBKwqxOFAyBf+BQNU6yIULCzUxWezR8+RcNLVkgCPkHnsnmjn0LRMM14E4BPOlBEztadT69nfkAhiEJh
+        mmZJwI4O1XkA3KLz83XzKRpmWC9CwY52BIC84ctqeMV6EoDtbSgylz98WaZZK8C2NlVUztbUR6w/v1BZ
+        AoDHCAXbWhEG3IL6jQ3xZZles0cJwNYWFJ3LHz554xzrQQC2NKticnmjn1zeOM+QgM3NiAN8x/U5G8sv
+        1DiZ59kjhILNTSiW5g+fvHGBPUwANplVcTRv9JPLGhcZEtBsRnE0X/Irl8nMi6w7oaC5EV3gAN9dfdiG
+        rz/gk5mXWDcCsBGqzTAgT/hk5mWGBDSZEAbkC5+0aZl1JRQ0NaCE9HdXn6iBekpoWp0O6gehhhAqK7kA
+        bxEqDEEG0ALyhRdeI1RbwnMePCzDjqOxEdwNsIiaRt5YATbUq95lfSe8WaO5qam5pbW1rb2j40lnV1d3
+        T09vX1//wMDg0NDT4eGR0dFnY2PjzycmJl9MTb2cnp55NTv7em5+fmFxcWl5+c3PrAuhYH195dqK2c3V
+        x1qqZFcD7KG3NzCPVhtXVPrrd87OJOA7rH++mJiYEB9/4UJcbGxMdHRUZOT5iIhz4eFnw8JCQ4KDgwID
+        zwQEnPb3P+Xnd9zX18dHIhaLhN7eXp6ex456eBw5fNjdzc3V1YUEzOJjJXramkLvzf5DwFb+/od/19is
+        uh8U/KDgZhXY7O/z/hr8H6BreLIrlIY+AAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="cbCTopMeter.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAKAAAABBCAIAAADZtThdAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAUGFpbnQuTkVUIHYzLjUuNtCDrVoAABNsSURBVHhe7Z1/
+        dJRVesfvH/yR08M5TU9pS1vbpj1sl3ZZpEBPqbiQI1io1V0VqCfuFhEsCITfkEggmYT8/v379yQhGNjw
+        I4iwgIoYBRbWxRJdYMOSpaPiGtlYo0aNNdXbz75Pe/fdN5OZd8Jk0STPmTPnnWFm8r7v536f+9znPvei
+        3h+1YX0H1LC+utGLe38U8DBvBKOARwzg48eP7x21r+wdaGlp8dtUf61gLu2LL774/PPP/8eyvr6+zz77
+        7L8t+/TTT3st++STTz7++OOPLOvp6fnwww8/+OAD+d3u7u733nvvvyx79913u7q6fmnZjRs33rGss7Pz
+        7bff/oVlb7311nXL3nzzzTcse/31130+339adu3atZ9b1tHRcfXq1Z9ZduXKlfb29p9advny5UuXLl28
+        ePEnlr322muvvvpqm2UXLlz4D8teeeWV8+fP/9iyl19++UeWnTt37uzZsz+07MyZM6dPnz516tRLlr34
+        4outra0vWHby5Mnnn3/+hGXPPffcs5Y988wzaOCYZUePHv2BZUeOHDls2dNPP33o0KGnLDt48CC3Gztw
+        4MD+/fv3WcbtbW5u/r5le/bs2b17d1NT05OW7dq1q7GxcadlDQ0N9ZbV1dV5vd5ay2pqaqotq6qqqrSs
+        oqKivLy8zLLS0tKSkhJ+Pzhg6HIT5aTNs98D3rS/7/elvOnG5E5hcmDuXf+X5p3+H/P79aA/6Pgd+dP2
+        b5l3BjowsF1+QD5vvuU44KWbD8jHjNFKXAFGuFxwRkYGX6B9idHW7EbrE5PGaIzmiYmHkwYrB2KmIXOA
+        0bSldcuBtHeMtm83EURsbOzKlSv5GBIRQy5ioh5jpjE5IJkbIfozhiIxpGk30SuGdh0mmkbcDkPxmEhf
+        DsTEJfAshpPAjMOQA1yIGO5EPIoc4GDEjL+RAzyQGN5IDAfGBboFzM2CrrhHY/hJY+IwjdvEc4ohfWPi
+        SMWXiuFRxfCrYuJdjY/lLMVwtsZwuXhX6MbFxeF7jYkTNq4YbyyGTzYmztm4aH5HTHy18djmNpkbZ3y4
+        ubPmXsutNyQEjHASJy9miBrShr20AHv7kEZjugPTpEw7k97BmDRKMWmpXIJbwPS7iADVfknoAhgFA5ju
+        Z5SuBAEOugCmsfLsSsFEVSjYDngg7W7YsGHp0qWJiYlDp10JmggoAIzLFcAjR7tLlixZvXp1YO2KggHs
+        VsEEzHYFB/bMd99991DTBTDOGcA43hFFd+bMmYQaXPvChQuFsV/tSjxPvxMaYEIqGZ8E6HdzcnIQMZ0u
+        sc/cuXMXLFjAHwtXvyvaxeAK3SeeeGJE0aXTBbBwnTdvHvFsALqhAWa8i4sGcNCoCvlKSDVt2jQZnq5f
+        vz4sUZWhC1Q8M4AZJo4czyyxVXJyMi4awNBFPP37XdGuWAgKJpWBi7YD9hsz0/VmZ2fDFagMt+HKy+3b
+        t2dlZXE22KBjZjtdABNbAZjAcgTGzHfccQcZDAaNiNgeM5tMix2w2yDLATjoiAjnLG556tSpZGFAy4hI
+        Br6DGBE56AKYRgPgEUjX+OfAdMkEEDyHoGAykcZFB6WLgh999FEUDFcSZsCmy4Trgw8+iGsNdbzbny6A
+        oZuSkjI63rUnZ4xw8bV4uOLi4hAAk2fma/h9O11EGSCbQTaKoT2fATB0GePPmTMnLHTxzAAmUyaJ5RGb
+        zZD0XH/PjIqITkhTk8xxG0UzheAAjLDoBkjlBB0RwZU+g2eyNiHlqvxqF6jk3wFM6xmxdMHW0FCZm7ut
+        pGSHPaoy6WvJyA4eMFBJoeEHiOscmUj8Z0Zh+oFDB8g1mkwkXW9YtCs+GedMFnrE0t21qy4nN/Hos/e+
+        3xuxq2kZ2SfjnO2zGgiSntGtgpkB5At4RZmeE0O+UHTkmat3V/1L65yHjj2QnO858NR+cshhiars413o
+        pqenj0DPTBeZx109tOidnrEfa9Wr1Y3uyPz8RNA4tCveOwTAzO8SZAHY0PXrmUnHx1Vs+V2tIrX6k56x
+        gnn/U/uYJHA/izCQZxb54pnxz8wvjahZBO58ccmOhqZl17rGva/Vh1p9pNUnWn2q1bFn762vr3BoN2TA
+        zN6LggPPERXWFUxtnwhd8zCY9x3cB56gc0SB6fILtGIA05JGwhwR/SvhUm6+p6ZhRZsv6l2t3tNKAPdo
+        JSL+qG9MXl4CUy9mJtTMjaJg3nQ12UBJgB2w3xlAZrvWNK4U+ToegjkpP7HmyWqZp/Q7AxiULlBxzuvW
+        rRv2dAFTX1+TnZvY1BJzuWtcp1bvaPVLreyMjYgv/GRKZWWGKY4QwHjcEFy0HfBA87tppakTOsf3pyvv
+        /J5W43sjZp2fvq0gIbcmh6GOY37XDV24QrewsHAYz++ixeqaoszs7Qee++crPWOva/ULrfwCNiLGUVdW
+        rqOqwmhXKh1CAExdFV/mJwaie+SZI8v3Lh2IrgA2j6kdE9Y2rkzJS+ZiOAmDViqnAszv4pnxz3LqYjc5
+        ey9VTlyXTN1T7kQO6JbM3hMlUU9RUJySVxR37Pz0q31jfFq9rtWbWr2l1dsW4xtadf2miA3jNzrHFxR4
+        jHYFMHpwG0VTNccX7IDttRn0rART+OEA8jV0f1+rP9Dqj7T6Wnfk4sMLPZlJhd583Av9a9DaDGKrVatW
+        Mc0ZFroUZsyePXvFihUbN26E7qxZswDM82+5NoOMUGV1PpJtaIk5ff22K1pd1apDq2tawfgNrVyKuKp6
+        FRkCJhNNsV8IgCmIpHXQXYuCHZU3jHrpYl3K1wAeT6St1W1afat94uN7H0nOSKrYWUaLCzADWFBQsGXL
+        lnDRRbsPP/wwEyRSxhUTEwPa5cuXU7MoNVBDWnkDCW9ddVZOUklt7OG2KW19Yy5p9VOt2rX6mQ2wGxG/
+        2j6xsCiusjKXzAT9FxO1ckWDBGynyxiX292wrz6+Ysu034yfDW+7c+5P98+1itLqr7T6et+Y+W1T1u1+
+        LCXbU72rCtL8siObsWnTJgo5bt4zS1EVDgntotrJkyfzDFq4QhcbOrrotaa2DK65RXG7X5hzqjvyglZt
+        Wr2m1UWtLluM3Yv4si+qonJdWXk6PwtRkh5r164lb8ilhQaYemYUTELKoV08Gz9H/MwBY6S48s23d0xw
+        SNkl4Ala/bVWE7X6u56x952fvn73Y8mpnrzqbP4otxuoeGZKVQB/k/2u0MVIxknXi3YZfYmCqVag3ji8
+        2mVSj9+vqM5Py/AUeWP3nJtxsjvyR1r9WKtXtAoK2K+Ir3SO9zasYHAssZW4ZeZzU1NTqYOgHBoPEYKC
+        qVYXF22vzWD+gHprXByzFpKJ5AYRIa+vWzPJFxWqgg3gv9HqG1p9U6vbtZrXMWHZ8W8n5SekFaYUlRYA
+        mD8RrppImiZQeZZ+l+fMzEyew0KXhgjUGm95bmFyWkZiefPiPW1TTvRGvKTVaa1+qNVZrdwztvfElzrH
+        1zctyy/woFdHVAVUXDQjyfz8fFwdYY3bIIuFCAawlLsS8eLx6RFxbmjLPouAoLMqMwWze/l+DS+tFXT/
+        VqtJWk3Wagpq1mqaVn+v1V1d4x4pv3/55qWenO07sj2FtblcHspgVH0zFa/4MelxxdAugf2gK175Lhqq
+        qCnIzPWkZ28raV5cf25GS+f4Z7U6odVJrVq1GhxgEfGZ9omVtatBS7ztGBHJEgqMwIKqKeZ1EhISQgaM
+        tzT1zNzfoqKivLw8vL/fOSLBvLU4fmbblHF9YyAdoAP2K19D9x+0+ketvpv6nftPTp6l1T/1jF3UPnFp
+        a3SCdw1uPK0gJb8qi/MhxqbB4nulpHmo65m5m9wQbmhheUZWvodimpyq9cUtMbVtU5q7Iw9pdVirI1od
+        1eq4Vg7GZ0JR8M/7xjzfNiW/KK60PINkokFrPLOhK8tkOBOWKIQGmHVE0gcLYG5ifHw8TZ5ZZUAGyDPz
+        mfLG8qScxAUn7vnL7sg/JN2h1R9r9ada/ZlWf/H/EZYbwP++funczsho1KzVXDBrNV+re7Ra2DXuux0T
+        VrRGb26J2W4hT8nw5JanVzeUywofmqCk8ciumFJ1WYAUeERE+YQsK+K2sjSorr42vyyNR2rGr3Bmlm3K
+        a1pW1Bpd1TGhvmvcHq2atdqn1QGtDmoVGLBLL32pN+LAybuz8xIqKnOJjfvnqsyISOQryzsYLNHvcNqM
+        R9yW7LBEzAAmcgaqx+Oh3oqyDTezCIRI39+/h8zG8r2PTPVFyejIxM/QDeyfUfBd18ctS/ge8u0P+F6t
+        7tPqO1o9oNUCrRZp9XBvxDJf1Krz09e2Rq9H6C0xHm9ssjc2pTgeMA7LKEjOK0uTxw6LnLG0/K0Z3lge
+        WS0xWa3R2afvLPBFFRG49kZUa1WrVZ1WDVrt0qpJq/ACfqFjgrd5cWZWYq23TPLMtLCg2hXAsq4HC8FF
+        C2CkYK+aQ9DM7bhcaSLpKk4Uv51QHP/AC3O+0R0pAyQ3gL99cvJD3rtcAn5Iqxhculb/ptUSrZZq9ZhW
+        y7V6XKtVWsVqtVardVpt0GqTVvFd47b6orb5orb7ohJ7I5K12qFVmlYZWmVplaNVnlYFWhVpVaxVqVbl
+        5AW1GiLA57oj95+anZ23tbgsDd+DQM00EZOkA/W7Rrt2upRjhACYFZ6i4MGtI6JQWwBLrooopqm5aUde
+        8hPlm+efn/7NnrEyQLLHz44OOKZ0/r1nvz4UgLfAWKutWm3TKlGrQQBuDIeID1+cVN6wgvFxjbcMNn7n
+        d+nvB+p3HdqVhXohuGjW7xrAg6jNoM/3m2cm2COnQWZjQ+PKe9qm3N4b0T9+lghrSeqi6A9+ZyDAdv9s
+        l+9iFwq+hYBf6o04eHFSVfNixlFlldkMqwaqzRDtbtmy2ayXNOsozcpK45nNMkwAux0msTRbXPQg6DIm
+        CzqLQCxQ3lCanOHZ2LjywXMzZneOdyh4plaDkO+XE/Dx7simczNKGlakpSeVVmbLmMeg9atdAUyc5Teq
+        cnhmA5jb7jbIcgAOqd9NT08LOotg5nc5obpdtenFOxjvrm6Juf/ipG/1Rtyh1Z1fNcAtWj2l1dPWSOkH
+        PPrGNHdMqD0xL7soLjMnqbq2jMici6X1B6iaCzWqsi+hZtAIYLcKZmcFaUFuYmaza4K933W5BpD8iySq
+        GMBwusXeAsY8CdUblp6Yt+jipPndkY4xUv8Q+kviogG8v2fszouTKo/dl1O2aUeqp6gsjaQQF2XW74IW
+        DHb5+q28CanfFcayaj4EwGyaIYBD0m5Qz+yoq6IT8ptnpnaTfyrxFqTmJaPs+MbHl7VG/6sv6r7eiLAD
+        9gwcZ/WPor1a1Wu10wqyntSqsWdsnS+q/PSdpDsy8remZ/3KAzO84V4HWCVGeCz+Obx0+aMoza2LFsD0
+        wW7W3ruszehfNcdcb9A8MwMzzoR+K6c8HXEn52zf5l2z8fDCla3Ri31R3+sad5MKDgDYMVKq6htT5osq
+        Pj+9EI16Y1MzEiGaX5pa663i9AiCAqy9t1erx8VtGQq6oSmYPW/sCjZFVf13Vhg0XdDm5GS73FnBpCGZ
+        8JC6MorTQJ5eYGUpiuMTvbHbdj+2zkp0rDs3Y7UvKtYXteb6bf3HwY4o+teAe8am+aIyfFGZvqis9omZ
+        rdHkOjJ3Pp7pjSUBwh9JSfWAs7KmmMVXNH0gmc0VBC0ZpcDrd0W43Niwa1c28glBwWxnZAAPEd2g2jWb
+        ZnBAPt0wNtN/sgMSxo3mbOmKuMVYbUNVblkaj+yS1P6ZrIHeScvy/F+GqzS1qDJLinvIBEjKULZRCrxv
+        Bg4p8PrdIfLMQlcAuw2yAMxV8c0vA12pzBLA/ekK46B5ZvuuKNwF0q5mYxTZD+Xmd0XhJAOv3x0izyx0
+        QwPMbmRowg54cDWR4apWRxwu6VKFGXh+F66MWNasWUOvGXTPG6ZH3WhXPDONJvD63SHyzAYwanQbZLHX
+        nB3wraULWiZxXWp369atged3USoT24SyTOUG1S4NK6hndtPvDrV2Za+xEPbJYhtBmhu9WnijqpD63cHN
+        7zKhGXi/KramopZPqr2CembWvQ1ivyq/KzyNfG8ym2H2ijPCFboy5HHbBwNYwpZbrl2XntlUzbFBZODd
+        yABMHROxGPtMBO13Gf8IYPe7kd0quqEBZhdQUbB9r7mbGRH9FrTrsvIGwJs3byZDt23btrDvNXcL6YYG
+        mB0M7YDdr0UIV1QVxpjZbB0rYTOAqW6hc01KSgrvToK3lq4AdhtkAdi46OFEN2hU5T5mvrUjItPvSu8r
+        W7yG0Aez/xkKZsZxlK7ZI9plJnKosxkSWxmuhm5ogNn/DAXbAbufAQzXSpOvyh6vt9wzm62aCSzcumh2
+        bkDBTCwPYgYwXCtNTCZyELkqR787vD2zHbDbYZIAJqtuCkRGd9927L4tqXLZbtrsQW0OZNRgX9Ysx/bF
+        Vxybrd3MCjzxlKZnlLl2M5aRzLF9DleOpfCGUkm3gNm5AQGZTQKkQNfxUt5xvO/3kwF+xz78t2fyAhw7
+        skL9P+n4gLw0bzoOTJcZ+AP2ChuOTVWGozzD8dJ8S04ggDl+MPBL8zv9T4PFPsG3cKAP/8r+lyOjJ76X
+        FGyQ/5RjmP//QSP18kb/Y6xhTn4U8CjgYX4HhvnljSp4FPAwvwPD/PL+F8VtH+fwmYZsAAAAAElFTkSu
+        QmCC
+</value>
+  </data>
+  <data name="cbCBottomMeter.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAKAAAABBCAIAAADZtThdAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAUGFpbnQuTkVUIHYzLjUuNtCDrVoAABOWSURBVHhe7Z0N
+        dNRVdsDfOZuzpT3Zlj2lu9Ta7bTH7cZdquxZrNmKEFdbqiAfq2sLrNjdDSwfyfIpEBLyQb4nMwn5mHyH
+        JEAQELIIBRRk4wISXagBo0ah7qiorBtqVlPFkurrz/+Vt/9Okpn/hARIzD1zcv4ZZibzf79377v3vnsf
+        6nfDMqRHQA3puxu+ud8NAx7ik2AY8OcG8P79+7cNy6AdgZ07d/Y4VX+vwdzaJ5988vHHH/+vJV1dXRcv
+        XvwfSz766KMLlnz44YcffPDBf1vS2dn5/vvvv/fee/K5HR0d77777n9Zcv78+fb29t9a8s477/zGknPn
+        zr399ttvWfLmm2+eteSNN9543ZLXXnvN7/f/2pJXX331Py05c+bM6dOnX7Hk5Zdfbmtre8mSF1988YUX
+        XmhtbX3eklOnTp08ebLFkueee+4/LDlx4sTx48d/Zcmzzz77jCXNzc3Hjh172pKjR48eOXLk8OHDv7Tk
+        qaeeampq+oUlhw4devLJJw9acuDAgScsefzxx9GBfZbs3bv33y3Zs2fPbksee+yxXbt2/dySxsZGhhvZ
+        sWPHo48+ut0Shnfr1q2PWLJly5aGhobNmzdvsmTjxo319fV1ltTW1m6wpKamprq6usqSysrKCkvKy8vL
+        LCktLfX5fCWWFBcXFxUV8fmhAUOXQZQvbX72eMGT9ud7/FWedCIyUohcmLHr/qt5pvvLenx7yA8M+Bz5
+        0/Z3mWd6uzCwHb5AXm/eFXDBr05eIC8zwixxBBjF5YazsrJ4A/NLhLlmF2afiExGI0xPRCycTFi5EDET
+        mQuEqS2zWy5kviPMfbuIQqAZAYK6iIj2GDGTKQCSGQjRPyNoJIJq2kX0FUF3A0R0GuUOEDQeEdWXCxEx
+        CfwUwUggxmDIBSZEBHMiFkUuMDAixt7IBRZIBGskggHjBp0CZrCgK+bRCHbSiBhMYzaxnCKovhExpGJL
+        RbCoIthVEbGuxsbyLUUwtkbE6hrbi/kVESNsTDHWWASbbESMszHRWGkRsdXGYpthMgNnbLgZWTPWMvSG
+        hIARTmLkRQxRQ9qwlxlgnx8yacxyYKaUmWeyOhiRSSkiM5VbcAqYdRclQGuH6Q4WugBmsvLTkQbjVaHB
+        dsDDuivqe23qrmgwgJ1qMA6zXYOH6V77dEHLuhMeYFwqiU+G0rqbkpKyYMGCxMREs+hKyGREbPIgsswS
+        rYUHmHgXEw3gIUYXIwZafL1ly5YNAa/KxOJhAyaVgYm2Ax4UPjPxUkif2e12k0/IyMgQwMF1l1zFNb7u
+        2oNgTLRTJysA8NWlSxTkMCLyeDwhIyKSQagvSZ+QdEHLB17LXpWdLhF/GGswmUhjoq8uXdCSjHMY7y5e
+        vDhkvEuyhTWYjKCTdXfJkiUO411yhybBadKcEuz2e7wbYJlNCiwMwOSZMdFkqa46XQDDw2E2Y9WqVZJw
+        DpLNIFHABzJ9nXhVzBiH2YyFCxdemWxGb3TRYO7dqRfNFkIAYJOouvK5qkWLFvVvrio7O5t8kwAO7jPz
+        MskahsxVMWkMYKO4V0x3JSPbd8ADQRdmDjOR5FtkUyhkJpI8n6TusD2SP6/fVOstzfL6MgMe+b7MgEdN
+        XQXOlwgZb1ScIXNIF7SFhYVXyzKbfDvZWacazA4gGsz+gWzPDUSeOSFhtQDuQ54Z9wdLy9errCvzlGZl
+        elJF1vlWpFXH81hzcNLqppiEppg1R8Yn+F2JfleS35Xsd6X6XWl+V7rfleF3Zfld2X5Xrt/l9rs8XDRH
+        5zbFuJti8vhZNz+3Oi63fIl8bHpWSkFJhq/Swy4eWyAYycvJM2dmZvQhzxzEMpstuDAAs7/LFGYEB4gu
+        XLFpzumSZ2eHqqr+U5xp6Slp7qTkmvhlByfFHx+3wO/6acfIeVrN12qhVnFa/UyrxVot1Wq5Vg9rtUqr
+        BK0StVqrVapW67TK0CpLqxyt3Fp5tMrXar1WhVoVa+XTqkyrCq2qtKrRqlareq3qLoyo8rsqWseUNMV4
+        6+bnFK6Eurdona/Cw64tyNkzcL6LwIojgJ3vIjihi0KGAZjde9HggdBdUVxWNRyo3vaIWB2xNpsaNuaV
+        ZjGaSTXxcQcnzTs+7kd+16yuiNlaPajVHK3+TasfaxWr1YAC3qjVZq22aLVVq+1a7dCqUauGs9fXt46p
+        aIrJr45bl56Stz61orqIpYFxC75HxB7dQNAVwGizo80GSgLsgAdoB5ASBfsOIIEpi1/xhvXpmFx30qqG
+        2Ngj42f5XdO0mqHVfVr9QKt/0WqmVtcC4F1a7dZqj1Z7tdoP8nOjNx0fV7Zzpnv9yqyc5OKyHCIxhjtg
+        B5At9gGii8UNQ4PtgMOliy8X1v4u4eOmLRuzitKBuqRx1szWMfd2jPxnre7RarJW92o1KAA/odVBrQ5p
+        1cRFZ2RjW1TtvntzvAlub0pVtQ+tGqB115TQhAeYuireybIXLl3Q4j2F3L3HK2Z2l9WVrMtNSfKt+OGR
+        8fecGx2j1fe0ukurf9JqklZ3W4CnaDVVq+lafT9MJe6vNbhH+xygvobuL7R6SqvDWh3V6mmtmkHePmpb
+        c3RJ3XzMeElpNvaZGze1XUF271NTU8wuginfsRcSmaoVU8dClOHUi6ZqjrfZATuvzaDyRurfeqzN4N5K
+        60pSs5IXb3vo+y1jJ3ZG/oNWt2l1u1YTtbrDxvgylfgaAfysVr/S6gSProh9bVEbds7Mzk2ENHl++Ang
+        7rUZ/FNubm5AJjI4XfLwYQCmIJIJgmERDXZOV3Q3Pj4+gC4BZW3DhrTc1OX1C6a1jL2lK+IWrf5eq2it
+        ugOetWXCpItfGIyAsc+/1OqIpb7HtHrmEt3ntGrR6pRWrVq9iA1vi6rZOic7Z21ZhZdBDqi8gS4puXDp
+        9h1wuHRBSxGdAGZ7jgq69IK0pMJV05ujx3VG3qTVWK2+rdV3tILxrVp912I8XqsJWomVfihv2oyTf30l
+        AQeJkcIy0Q4Bv6TVy1q9cGHEEy1jfVVxue7k6mofVYWmCHDlypUGsL1G016ZaiyzqTwMQ4OpZ+azyMsb
+        ukw0vCHnVXPkIkrrfcnexAf3Tx3XPipKqxu1+pZWf6fVzaEAP7DrlpmP3NYHwAs7Ixf7XUv9rpXN0SQ6
+        1u67d111XPqlR0Z1HI9M65F16ZFdHccjx3q4d99HlsPTFFPid5X6XZXtowiCBw7waa3OaPUqat0xcs/h
+        iW5vQokvi2XRue6SqqMoWgATgIQBmGp1MdEAJh+blpZG/pa9Myc1kbiLnkr3msJVd7WM/XpXxA1a/a1W
+        vQHu0UpPfuW6n6z+Ia5WEMYPtY+ae+aGn5Gu2jkzpTr+s5RTborHl8mjpr4Sd4aoNPi6JXXqRni9FJ3n
+        l2TwyPF+liBzly/J3/wTshw1bVGbz40mCMbJMgGS3X92Yp9FfQ1dv1avafWGVm9i1duiyqoWefNTCLHM
+        HpHJRHb3qgi6cnJyEhISJL2K6+rUyaIRwQDGzCYnJ4MZwLhIvVW8krVgvLDGi+sXfPfMDX+llUurv9EK
+        wF/X6huWBn9TqzFahbTSd178wvz4efec/5Id8GwyVuQdG2KTK5Yy8Jn5afnlOUxhfDruysnufZ/rqhg7
+        jBlJq6KyHBIaSM76lQV18yubYrb5Xfu7IkyA1DfAr2t1Vqu3tDqn1W+0eunc6EfwxXKw2+VMPpOJtEdE
+        DDVQ8/LyMKsrVqwgJdUXwNyVFDOzptIiwWRhZnWvZyZZsb1xW6o35UeNs6LaR/25Vn+h1V9qZWccRIl7
+        XIYfzJw284lxs1vHxO2fmmQRJaVVv7mOG8Pt7Fs987xLgseHss6dOzcpKalv9cyMNWNCX0lBcfqnaayS
+        5RW772s4Pm7vudE9elgntXqeRRd4WrVp9col42xX37ctwO9o1a7VeRS6M3L3gbtzcpMqKgvIhgbQBTzG
+        GSJoHcUL0iwThgbTRyRrsAAGKm79mjVr+CxGxF6tvr1xO2j/dd+Mr3VGfkWr0VpdDuCYroj726Lidt+/
+        bPXSRfELi6oLWCYwG/1SrT5hwgSafBAAc83HwphdoMuvVmd8WRHKKwvzClIzstaWbZ3T2DrmyIUREiDh
+        QgcBHKC+v7Xovnvp0d4VcejYbd78hKrqEhCa9ieWamqPHn74Ya/XC37p/MCIOi3ZoUXMAJZ1l31T1Bf3
+        neHAPSYW4gVpntQH9s24rjPyy1r9qVajtOob4wmdkQ8cH7e8IZb4eH2VR9pY4uLiMLzBd++dW2YYTJky
+        BR2mPYs5CmB+Ur4D4/7tRWCIUQZfuTsjK6WoKm5Hc/SR9lEmQOq+AAcHDOkO7PaFEXsP/aM7L7Gqqlha
+        eABM4RGxMhNL6IanwQIYK2T3qjCMjAgLHnEbaB9snHVdx8g/1upPtOob4OjOyB80Ryeyx5ebUlFfxl8E
+        p9TcQI5dFwxRv+guKovrt3btWi4mT55MDvymm26CqwAeuE4TTGBFVQnZSs/6lY8cuPuZ9lEB9tkJXQDL
+        4zPM7iTWZuwQ9pmFxtBFj8Mw0XR4igYH9BHhiOeU5MxrmPuVjpEjtPojrSK1CpfxzRdGTGkZu7ImHq41
+        m6ope+ixj4hYkIW/v/qIACy79xAF8O233y6AY2Njr0AfEaNfs6ES0gUly3c3Rz/fGUl0xAIcFmDB/FZn
+        5M/3TsvzrMWxMsZZGvXCMNH07xrAAV5VfrX3W21Rf6BVHwB/ry1q0baHUnOTfbXFLIHBu8SgS81bf3WJ
+        YdZEdzHOoAUwMQbPkIe5nN17e9ehk/1dlp6KymI85PLanx5sGfvrrgi7/xywAIt97v54vWOkx5sUQFcA
+        Ow2TaM0WE93dZ0YJVpSv+MOuiN4Y/5lWX7W8reu0ul6rrxEHXxgx4/DEZHdSfpUHNwEL7KQHEPtMUQB/
+        rm8+c/d6ZqwZgBkI8apQ3ytM196winUtLc/Lzk16dO+00x0jiY4c0oV33aYfE6ybHnPTZ0s449TJCgAc
+        0OFZtaVq4rHxTpQ4qmPknN33p7qTa7dsYA/fSV2VWXR5PaWKRLpDqcMzoDaD6b5hQyWpyvqtc1rPXm/3
+        n3tT37az1xcUpHany2QFsFMN5mQFNBh70mP/LgySChO/dGFEECX+tt+1qCEWX4w/zBLrsGouwGcmDKAF
+        QU5cGHqdJvZcFVmLgvWpvrLFz7SOkRipR+PMk4XFy8S3sjfIS9d8GIA5NEMA99advW3ntvv2zegR8C1t
+        Uat8K3LKsrkBh/XMvVWrswxLsDS06ZpcFcGPrzQnz7P6aMvYHgE3n7rZV5rZI10AUwjl1EQLYNbg3moz
+        IJfiTflyZ6Sd8Tf9ruUVS71VHvJnDnsRgnea4BmxDEvvupNOk0HURxRkjwi9Ki3LA/PT/x/z+a6IPM8a
+        oHTX3bA1mDNv7Brc4+490fDchtgvagXjb/hdi2vis8uyiXkc9hGF7BLDMgOMZZiM4OeHrslVWelhNwb5
+        RFuUaPOhp28rL8/vjS7TIgwN5jgjA7i32gwsfnpR+ndaxs5riAUtAcNAnJtBJh1x0kc0iLrEQtZmmB1A
+        gt3ikkwwo8257iT78TSitcwD1m/J/QHYqZMFYL4E78fS8hEoa4+nohBBkvfgQwfuVBRS6lhp4DnpNHHY
+        R3TVu8SC7ACClhCIn/gfcqQQKy5eFZjr6j6N8UTMcUSktEhY8jM8wJxGhgbzKYwFB3GR0nLeadK/fUTc
+        DID59iH7iIYGXdDSon7jjTcSPpgD1XrzqgCE+qIDKDpDhBI6dbI4a04A8x7UlPUySB9RQUHBnDlz7rjj
+        Dmki6ltE1Fs2A2wAZs9k8J6s4LAm0tQdsPEcHR0tdMnlsUESZN01p4xJmZRTE80xgpgRPtfJeVWgFa5y
+        EVY2w0kmkjWYKr5Bem5GuHThetddd2GfoTt9+nQAs6tP/jzAMsvxiEbkVDlCnjAAo8F8qJPTyNhDJO0H
+        2vT0dHYIQvYAhrsDyCmMKDGZXjlX8ho/jcxhHxHD271qDrqgBTB0GUwuPt2lqKmZPXs2FzQrszUiq293
+        uuEB5hRQ0WCHHZ5Gd7lwkmcOa49IlmEWmyFPF8AsvYSFAIYuaLl3LtatWzdt2jQAs8kP4x7phgeYEwzt
+        gEN2eObn5/MN+B6Erf1+kiD7DQCmnmRo667xmSXPfOutt0IX+yyA77zzThQXb3nWrFkBllnsswB26mQB
+        2JjokHRl3aVUii/U73Rl6WUZhnGfq+aueu998Hpmc8Kqffde0KI2cIUuaOWCClcBbLjKBZFOGGsw55+h
+        wfw9h3T7fd0N8JllGeYOh2Q2I0B3u/vMaDP3jn0GcG90wwPM+WdMOjtgk8rox0yk810Ebg/AlPw5PPNG
+        jnm96qei9FbxaiKiHnW3ezZD0E6dOjUIXQCz9efURHNyA1+OP3+NnODL/jyAMdRDJpshvQghdTeIz2ws
+        szmLG8BOwyQBTM7MfgD38Onb9tO3xfxIfsYe+Mm1bKXYj62Wa3uSgGuz52bsolhKszLKKRcmlpF9Afse
+        rlxL4Q2lkk4Bc3IDq6D9uHQsdsCv8kzA892f6f5G++fY0+72HbQg1wE9Hd1fGfAC+dU8GXBhEhHBX2Dv
+        F+LadO4GtPAG/GpvIAv4hOAfGPD5If+ceQGlqKGPcMDQD9r/cmT4i2+jKjvEf8oxxP//oM/r7Q3/x1hD
+        nPww4GHAQ3wEhvjtDWvwMOAhPgJD/Pb+D7F4MclE9ulhAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="cbCInsetScale.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAKAAAACgCAIAAAAErfB6AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAUGFpbnQuTkVUIHYzLjUuNtCDrVoAAD+eSURBVHhe7Z0H
+        eJ3VmaDnmd3JZLNJJiGEhcmEbJLJTEIILQ0M2A4JBDKYARwngHEAF3XpXvXeqy1Z1ZIsybIsWd2SbFmW
+        LPcmV+Re6ISEkJ7ZycwQioHd99dHDifnv1W6urZZzvM/emTr6ur+5z1f/875/+rfPxjv6xn4q/f13X1w
+        c//+AeD3+SL4APAHgN/nM/A+v70PJPgDwJfaDPz+979/8cUXz549e3RiHDlyZJv7sX//fnnZ6dOn+a1f
+        /epXl9rtevm8l7wEg/PZZ5+F0I4dO+DY09PT39/PN2NjY09OjPHxcV7wzJ/H0xPjqaeeOjcx+MWDBw8e
+        OHBgz549W7ZsGRwc5B2Gh4e3bt3Kj3jZb37zm0sa+SUJWKAeOnRoZGQEnLt37z527NgLL7yACP6fifFv
+        //Zvf/jDH3gZ43e/+91vJwaofj0xENNfToxXXnnlF7/4xcsT4+c///nPJsZLL72E9J88eZIlsn379vXr
+        12/atAlBv0RhX0qAAYNUbd68GagIHEoVQv8xMf74xz8iZwGh+9OJwVphxTCef/55/hBSDuyBgYGhoSEW
+        FgviUhHrSwAwXJEnuDK5J06c4J+vvvrqf/3Xf/3nf/5nEOg+NzFEyaPb+QD79u3jk6DMse4ogIuc9MUL
+        GB2L6CA3zCZ2FAX7pz/9CbQXkK4y3ujw48ePYxo2btzIx8NAXLSm+mIEjOFEFTNxIiKvv/76a6+9dlHR
+        BfCZM2dYf6dOncKPw7/bsGEDavwidMIvLsDIweHDh0GLTkb9gnbqdHGOUADiTss3rBsGf4ivrCS8Krvd
+        NTSzLrs6XQDzUdHbCPGuXbvwyFDgF5XevlgAs/bxVEFL6IISfuONN/yliwOM2iRAwjrW1dVVVFSkpaWl
+        p6dnZGRkZmZmTYzs7OycnJzciZGXl5efn18wMQoLC1esWLFq1SoEEZ+ZqAlsyu56pQtg/jSMWS5g5gMg
+        0xeJI3bhAWNrkSoCHvxVVPGbb77pO10kj2Cms7OzpKQkKSkpOTk5JSUlNTUVtH7RLSoqKi4u5k0YS5cu
+        XbZsWWlpaU1NTXd3N8ExH49lh+C6lF2dLoBFSWCewQzsC26bLzBg9CdSiz1DXkHrI10CldbWVuQvISEh
+        cWIEnG5ZWdnyiVFeXo4yqK+vJwFC9gPJRi0rzeySrlgBTMDOnTvBDHIW8YVyti8YYDQYwoEyJOA5f/68
+        L3SZ3I6ODgQ0Li4uPj4+aHQrKyurJkZ1dXVtbS2k8e1B65kugFmI3CDLAmcb/XRBGF8AwDjJOJyjo6Nk
+        l9566y2vdFkKqErsaOzEmARdlC0iiGFm8M3KidEwMdDGhmY2ZFeny/tgqhlgbmxs7Ovr27t3r6SyRTMr
+        2RW63KbKg6KoIB18jR1swNDiPvFRQeuVLpYPEg6Hw+l0+kIXNkx9b28vyWRSXShSSTgrCypGVAZBjsQ5
+        DFwkyUXjBre3t+NtiWZ2R1cWiqwVPAAE2gNdnEccBUl8orGDLMpBBcy04uWSUPRKlxlncmNiYrzSxUyu
+        XbuWt4WWuLtq+EhX2VRMgMQ8EvbgKOFUY+zRzLrs6nTRAYgyg8/A+kBwDdlVdAmfEHfeE1FGbwfNKgcJ
+        MGqZO2SZY2s902VmcWhB64EurnJTUxOaAIRSHVI1ooDQVfaVdSYDdwmFDEiXdPkwCH1zczOrAeWhNLNB
+        FyXBgDFpV0ZwsiLBAEwmgfvh69tvv+2BLvkBBCU6OtoDXVQibwVXqf75S5fwN3xiEB+L4Io/rMuunS5r
+        Tg1Ir1u3DqJKdhVdAK9evbqlpaWrq4uXuaNL7MRPpTTJ559uz2vaASNS3A+FAQ90SVpxt1hZd3TJTlDJ
+        QQnbK7t+yS7vQ5kIDYkHPgm64k+JS4VRQC3b6a6ZGIgy5hx5Fc2sZFfoMqR6jXeNSp9WxtMLGKPLbOIn
+        e6CL3sZDjoqKckmXfBNGC64yjLq9QVcZ3VOnzm4bPr558FhyYubK8i2F8XsK43dzpTgrmVmmNcGRXxS7
+        s9C5o750c2Jc2mDXoc0bjhw5dEwiHzV02dXpStaTASqiJiW7im5bWxv48b/E3RPNrNPF4ZI2E17ACpg+
+        xtMIWCKHd955xx1dvC1mJDIy0iVdohfuX6H1TPfk8XMZ6dmVS9ctzxrLiNwTOW+bdf1wW3h4ROT81ZFz
+        t0bO3RL54JaIRxqbGlsaG5oi5ldH3b+ZK/KhZl4Tdd+Idc0ZTl0wWpq0o6KgKzUl49CBcQXYJV3xnBkQ
+        wkIbdPHGGQTuVK9ZBy7p4kagq0mOcqfT5HZNF2AsEDGJB7rIIhbRJV0MJIZWqrAeZBd5PXzwTPea8aKU
+        scgf74gISYlYnBf5o+3WpQN+rFoBjvxxb0Z6bm52UdSP294F/GglJlkBhjFXxOPZEYuTov5lU/bi0TWV
+        e3ZuOQxF0cxqKLqqeoGMYn1FdhVdhJj/JHIj7hfNrGRX6DL4EYz5iisacFEOPGBWIndCL4QHuuglQluX
+        dJkdFLtnukcOnU1LyUuIrot8eGfkQ1w7LMCP14BKAS5M3LM8cywpPisnvXJ44MnRje9ejhgnwddQ//7R
+        wSdRyzlplYlxmRXpuwodOxwPWHQtwBHIfQWAo/5lKOoH1pWwpDoxNnPz+gOqJKUAS21KcpMMgEFUZFfo
+        kqVBjTOwNar7T6crTjWGg4R8wF3rAAOGLh+ddid3dOmQIqwErZ0uuQVmTdXpDNmVMHew7/iyrAORj+yK
+        XFRr4QTwnxlnxw3HOVP7O8b37DihshnYVJXNcOdVoYeV0d297cme5rE4R2pOZL+iG/WDjfytiIeXR989
+        mP3ESHfjnkMHn8S3ULKr6ApjchrQMugixLjfeF6sADtd0LLoWQGIcmAZBxIwdPEmPNDlRxTv7HRJLHNv
+        gtal7NbU1KalFCWE7I2Yv5vLAvzILuQsduFQZcHB/s7xE8el2PNuwceeq5qEz3zk8NF1LWNV6Tti5/Va
+        i+meDQCWK/7+obTEwqXFZbrsqiwHSUoGGhuiIrtCFzuNPSYcQF5FM4vsCl0GdIkmmIoA6upAAsbuetDM
+        /AiQdroUhZTg6nSZO+z02bNPtzYddS6ZkKFHRxVg5Dg1JZvp8CUTOQm6ulcFm5Sk9Kr07c57JwB/fzDq
+        Bz2W5Z7TVpezbff2A4JWclhqSBaaT6jTFcAkyMBppwtaBj8FeaB8roABxjh58KpQlS7pkhlA8dpll/+n
+        uFtZ3p0QNhaxYE/Eo3siwuIjQnIR4ubaJ/GtVGOz1zwzdHFtsIUMNKfkMZh3hl8RkeUt7zq8evnOpLlD
+        kY9nRYQ4o+9azxV/32BT8fbBDUN40TpdyWcxUMhwlQFdtDQIpbNAl12hyyfkg/FT5DsgDldgAJMJwpK5
+        s7ssZFLKhuxSxJWqg0EXOaC/Aju9YcNgVER65GNbIhbshXFC5EDZslXglGSkX3nmO+64gyCbQakRukRl
+        aghjr/Gu7jPzCZfl12ZHtAvg6DutKy60oKx0OTlU9LBCK0IsXfVg0+nyT1jCWDSzTlcAsw5Q8lNnHADA
+        TDf34I4uMaLllP6lV4UlZrHb6eJYPXnkRHJS/p7d+wknypY1RixcixCv6zw2lSoCgFUVAcA33nijcJVv
+        /KKr+8wbe/blLhyGbsz9zeWFzaiKzo5OmkpwlVU6WgBL2lLUL0PoClTxrZTsKroi6FPPc00VMBlmgiJ3
+        uSruzU6Xxiim1SXdrZtPJ0QeiFzUm5vZ3N3dW1/XULm8Y3x8SnRBC0gY8xXBBTDfC2C+mTRdZXc7GrYl
+        /KS+raULSMuXrnA8WtZRu0PJrtBVA5w6XZFghmhmnS7ijkoHM1HAVOR4SoBx9vAU3OWZmUq7Zib1iKm2
+        02VGVtUfi3h8TK7wJ7rLlrUUFhZRlEUyplgjYuLE9IrIKsDf+c53fMxVuYuI0EOoKLoHKiuqy0vqox4p
+        if7euug7+otCN23oHzboSlUY/1lEVuhihhn8004XwCh8SE+lTXNKgDESFPBdZiLxme10qd3qLpXymQf6
+        B2OiEyIWkqyw6CLEI0PHmB1y1LRPKMB+2V29RoRRF8CCVmnmG264QQB7zkR6oAtgPAn8R8oYK2vWpM7v
+        gm70HX1R3+uKiYivLW9Rsit0FWOdLkKCSwVj5JUhsit0JdCC/aSd6skDFsfKJV3iXbvPDF2aGeyyu3/f
+        uZTYg+Fh6VYg9MRY1bLxkyferfIys1OUXSW4MMYDuv/++wH8k5/8hO8ZfDNFuuI2EwhRb8BUje07UJ+z
+        BcDWvSxMct7Z116zTdUNhS71JQZ2WmRX6EpYjKI26PLOMibtcE0SsJhel9V7clX2bAZ9qS5ld2jwdEzI
+        wYiF+60rIqogr9Zd9R5HlOwm9zm5bAZ5JYbymckjMgJC1+4zLyuqjAiPiv7OuujZ1lWTNqJkV+hKDRHR
+        V3QlvcVAgpXsClokmGQn/zk5YzwZwGJ6KeK6rN6TcTR8Zrwql3Z3Q/+piEUHrGvhgdiIg6Mj48iry/ou
+        K/2JJ54g0Pze976H3XLZVzXFbIaHKoKeiaTQe/3118+ePXv+/Pmqrc7wmcG5af32rEc2CGCupWEb9+xW
+        cC26MlTOkm+QaalDwBLNrNOVIH5yxngygPmkSLBLusy+PSJy6TOvrB8JX3xQAGenkqp/r/nGHhGhEqDL
+        KuH9b7rppoBkIidhd/nr0KXwB1oAI1tKfCUc0r2q3TvGSsKHoBszq5crN2zN7l17RXZlSJ1YBFfoMsjJ
+        IDx2uqKB0OH+etR+A8arwlq4pEtm0agRkc3Q05DKq1pRPRIVGR8eshrG0FVG1+iaQ3B5Q3wrZhbZlZ5I
+        fDdKxXpPZHBkl7jovvvugytfcalozYEunhH6yU5X2d0VqSPQjXqgPCosNjd8tUEXi8MQtEJXKseAFM0s
+        sgtaDAoVKiQb18cvxn4DZn3h0dk7Xqne4/QaNSKXuaq2NSfDlxwMD1mFJ5Kc2OaOLlyh+7nPfU7s7ty5
+        c+nYAjD3/93vftdrjcjf3gx7fdeoESG1iK94VbNmzYIujPmGrS58dRkRiektTK63EtcPlsXM7Cl3Dukd
+        PAIYqDpd6f3AhTboSo0ZI+1XKcI/wEw0t+eyn9nem0E+2e4zD208E77k0MR1MC11DVuBeE93fVUARliV
+        7KKcmVPe9vHHH1ctc/52zU1CM6sqAqaX2+czQBrAfEXmQBsaGsqnchkRoYSppuTEVkM35nbrqowfkg4e
+        GbBUzR58I//JC3hnJFjJLmiplNNNwP/wh3wXYj8AI7hoJJc7TVj+huzS+mqvIuzZfS464nB4yKGsrzy4
+        NLb/zJmnPNBFgtHGIruILNOKSNFwya6yC0IXtGhmhBWufJiwsDClnK+77jqXdMWtAhhSW+4YmgDczbWq
+        aESnqwAruryeX8RCiWZWdHHxGHhhvm9d9AMwCxn3x77TBHeamFLvqyIItlcAx8efdjq6wkMmAD/RUXv5
+        p3etWOG5J1LMLXSRXeheELtrVACVVyVqmcFWmkceeUQA69kMPSIS01vu2GgBvq079sEVfS1bRXYVXRS1
+        yK7QlbfCEht00ZTIse+1Jl8Bky3jTV3uAWRBGV1z9uo9jcwZ6dujoxPDw7OcMcA6d3j9+qoPf3hjVJSH
+        KgLOM4yxu1hfdOAFsbsuK4BwBTC3SaKNb3yhC7mdO3bnLxiIeDw5MtSZMGf18MB2na600yq68p7YZtHM
+        IrvQRXkwcLMpzPiiqH0FzOJih7V9DyDxktHPzC48e323vv5keOiR8NDdlrsRFY2ORXYtxh/60Fo8piNH
+        /K0A+tWtPhW7K4Dt2QwY33vvvT7KrkRE0EISmIGY2a0xt3blPNS3bavlNqtOaewu84zgCl3+BH+X8Neg
+        K+315C8DBpg9caxWl7uzjb0IKGfSQ0bnzY4d58LDjlhX6JF1vafY/SEJDb4K44Yvf5lG8iD0ZviYzbD3
+        ZniId71qZr0vmn3l/W1bY2d1AzhmRldNyqBOF8AMASx0WVv8EwlWsgtd0qIMH4XYJwnmhpl9++5sVK3R
+        rY4+MeiinJOTxwVwZcUJeybSYvw3f7PyYx/bN5HKmFwm0t/eDHc9kS47bwJCV/eqmgo3QTdmRidXX+uo
+        cJWBlKO3FV0A85HwtkQzK7psheJ7X4TYO2AlvvaTFYxdYvQzi+es9zPn5bWEhz/JheN17JjrTOShgYHV
+        f/d3LR/72KbkZHc7PIOWzXDnVXnIZuhVBHuuyoiIxO7m/LjPAnxLZ9Lj5Vu3WCkOoSuDN5SPAV1pMUBy
+        dLpsmWGQ9/DqTnsHzJ9BfO10JWjR9wBKWkOnOzzyZHR00sR2r+7BQavv1d0Oz4P9/e2XX77piiva77nn
+        5NGjxv7d9xld62iHnq0x91o99zhcFUm9Ol0A8wJFV5QNQiyaGdkVumx1BDlz7tkSewFM7EvjCLGv/cwb
+        EV+1f5d4xt7xmpV9PDxiPDy8JjIyGo/f8/5dYXz0859fdf3147t2XVQ+s5Fn9t3uuox34QeeyIioqHn5
+        Mbd0xNzcMdA+qsRXmuPRBIiQ0MV1QJTBqdOVEwq8CrEXwDirvLudLrNv7N819hGxJAfWnwmPHAewM/bo
+        2NhR1S/noWvuQF8fjF+68cbmyy/f294+uR2e0+Qz6503nuNd5VW5oyu5SWr+OT9aB12u4oV9AlhtfeB7
+        RZc7wnXF4irZFbpspkWmmWoPQuwFMHVKGu3tp5EZJytQ7tU1M8I6EcKWRkQNw7irywqKfOya279uHYx/
+        e/PNlsbOyAhmJtJDRBRYusqlQnBjbm63rm+3tzX0kpsUwFJi4o8iXUKXAW9wIvqKrhwjgTvtod/DE2CS
+        G6h+O11YGicr8Gn0nSbsvuUXW1u7UtNWOmMHxseP+0hXclVjvb3Q/eNtt41edVX3vHnHjhzReyKno4rg
+        LpsRcM0s+890n7n4ib6Y21fH3F+amZRPV6+iy5TyMkWXMIEbJ6dk0CXmZFkwve6E2BNg3p2ZtZ8TSYJU
+        PxWFZLpOl1IXJYTTp8/QU9bQ0FReXkuxT+9nJrdM/QARlzKRy+q9MH515szxL3yh5dZbx/ftk+abS5ru
+        j370I4MuerizZSDhR5WNFe1MEV1NABPxlV4AIjTZOsWNw4IFJ5pZZJcXc+gMetuDlvYEGDCcdGScAoo2
+        ME40ItWi787GNVhW2pKQVLOstKNseQ0vJrpXdleV7nHKyDBLJtKlz6wY/+y661ZdccW+np5Lmi6yi4Au
+        WrRIj4hIH3HWTPnyyq7Obog21DcyXYougHmxoiseCdGwTleOdcLVcldDdAuYAIvSr/2MVxaUfqIRG0yA
+        Z+zOjks+HhY9FhY10rRqixyBozKRiL70ZojsPvjggx6q9zBeOyHHf7jjjtbLLhstKfF9770v9d3ga+Zr
+        r71Wj4io/VGrKCkuWZq5Ii26KOaRnMbqNtXHI7uHERh1vB72izWhZFfokkxEpzKfLrW0W8BMEO9rP5+Z
+        tJl+Ghn6waA7PHImLOZYWPQxR/yxkyetTURGnhn9rAQXxnjjHiIiBFcYvzZv3oYrruiZP38qexHc7RIL
+        eK5KVRG4O6RWDQBTedMjImghA7mhDTEzGxzfbCuP7BOuam84HrvILrPEdOF2iWZWdNnmg95GGv0DjCml
+        P9I4fRv9TBeOftYcmsc4N6Ok7FRYzHEYNzS927Cu+pnR+WJ3AYx+pg7IIFrwXN9VjM+HhBz+3OdWz5hx
+        ZM+eqfczB8dnBi1diKJUqRkotHpERJmup3kTdLnibl47Mmx10UojLQP9p+gydUwmKlCnC2AKPO60tGsJ
+        JjQCsP1sdVaTTheDapxotG/s3ARd6zp8xNoopugClc5IuLK68exZjCwOH7MZe7u7RY7fjI9/7tprG7/2
+        tbGBgUsi3tW9Ku564cTAmdK3+ovRzZzT5fhGG1dT/gZFVxgjtUyX0GVK+R/RzKAVuhhy+ntcFhBdA+a9
+        cNjsz0UgDtNPASW3YpxXlZScGxbVHOY4Xlpx0q6ZeVtuEsb03PDVR7pid99jnJf329tvb7388tHly72e
+        m2Hvqwq+3RXGuNC33XYb+hkFe8899+jxrgBuyF7v+EZr9L8WJ0ZmCFcZ6F6yWoous4qzadAFMPExyOxa
+        2jVgQmzeyP7UC8oJ+hmvpGz008hYX/FJHFpjtfVnZOQZO00wvSK7DNCy9EiP+JWr2tPV9a4c5+e/ev/9
+        fZ/+dF9IyIWtAHrIVemyK2hVrmrevHk4wyocEq8qMyMzIjyCuYt+oKC/Y0jRBTAvUHEmKSPmHNdHyS50
+        2cEFcpLKvgJGPxMgGc804a11uvRGGScJopPDnCe4ouJpClzvub6L94FD6G8VwWL8qU9Zujo///yiRXs/
+        85k1s2cfmTgu48JWAI3eDCPeBbBOFwk26AKYPHPBohbH11u5GvMG1AEPcsYDDq8U0aGLKibjIZpZ6GLm
+        GUiOPVhyIcFigO1PrOEj6qdv89bGSYJru84I4PIVpz3QxfTiWynx9bc3Y3dnp2L8ptP51Je/jEnet3Gj
+        ADbOvAlOfdczXeYN/cyAq3jRdrriVTUXrXd8fY3jpjW5P+yUAx6ELoMbUXQp6rCADLrYdYIuuxl2ARh1
+        j4q2P22KAEk/W50MmVG9Lyg9HRZ7Msx5sm+9BXj6qvd/wTg7+1c339x82WXbVq68OOmK7GJ6Uct6JtKI
+        d60NhutHoMsV961Wvld0ASzWEH7ST0EQocsudDlKmQyX3Qy7AMyL8NnszxLj4RX6yfn8Sb2+iwqx6E5c
+        J05MI10xujrjN0pLX50zp+OTnxyIjb14vCqXEZE72VUuFbLruHEN1+ql60V2ZfACRZdNmuzOxZEWzSx0
+        SReitO17W1wARvz5fcy1/qQ4/kenS0ZNWppVFSE1NSs8MjM8ek1m/v7pk139rLldHR1KV7/R2Hj+8ce3
+        XnXV2nvvPbhv30WimY0KoFe6UCyPXxt1b1HkYwkJjlRFV04BkPPhhC5HqqKQdboAhjT7IQw/ywVgVgFm
+        2HgOILke/ZkmvLVOF4VcUTMUHlXEaRzx8RlB66vSGb/e1XU+OvrEP/1T40030TMenM4boyfS6LzRsxm+
+        0EUnxzsTw8M4dC0l9aEqASx0GSxuRRfAvFjJLnR5NgGbaCjUegfMi+xPeWRx6U+sIQI2KoClVafD4k5x
+        9W2wQvKg7fDcyZ6OP/vVrw8Pv5me/vJNN6361Ke2rloVnFyVvQJo9GZ4trt6vAuzDeuGHTe0OG5YHffN
+        Fp0ugDGdIrsMeZ6QaGZFl6y+d8DUgHkv+xNaUQj684hQBcbe+7iMU2Hx1jV2IHh0xavSGb+2b98bJSV/
+        /P732z/1qYGkJJf9zNNUvTf6quy5KrtXZdAVryrp9jUA5upds1GJLwldfHVFl3Z0kj8GXQCT1vYiwSgB
+        Pqj9+bs4gfrTpqRApHJV40fPhcWf5nKkWgnx4O/f3cGd/VmOLcb19a899NDmK69sf+AB+4lGHvYR+dgT
+        GXDNrEdEhQ93Oq5fzdVc3C+AoStHDovsQpdNCJDSZRe6dMmRAPECmKgUzWZ/ujJnXOjPEmPW9EzkyNYz
+        YQmnufLL3gUc/H1EBuPX1649HxHx5Be+YJnkrVuZJqII7oIdY4QDpP7J+7g8WUHfne2y43Va6SLBNfG9
+        juubuSpjuhVdOSxN0QUwT7QmxYHdlccCQZfUAq61F8DQRfaNZ2dzqIrxpDhkVM9E9g2+C7iqwXX13t9s
+        hjo5369M5HbOatbk+PWNG99MSnrhhhty5s1LS02lxCY7t0jbSsgHbOylfZeYL11z9t6MSfjMRjZDvCoE
+        13FdM9fSJzpFdtVReITC8phy6FKwpzSg02X54vx6ASzVR+PJ6ERg+lMeWSlGnjkxKZP8c3hEdHJqASz9
+        qiIEtr5rMH5h/fq8hISezk6cBnKBJGfYQI1YABWLiOdJcQzH5GLQzEIXMU1NTA8PjWQ+4yKTdbr8iIlV
+        dPGWqCAp2YUuA7fLJ8DGc+95X/0ZnsyLkYksrR4Lc/aHO5py86suIF3ZJaYYv5qXl5WWBkgS8VBk7WLG
+        AIy9pkLON5Rl+Ib+BSTpgmtm5TPnZRdE35cb892lKXfXK9mVs9MQBpFd6DKoAYtmFrqoJXh7ASztzVQa
+        GGxa+fXEQE/qT2hlvoxMZHHlmbBE69o0+u6zxPytIgT2RCNhvHrxYs5f5p4JMPg8fFWAsccsdm6EaJ4n
+        C6Cf7Ccr2PfvBjYi0jORekQ0tGGT82uruBK+2SxcZchRuYruK6+8QslBp0v3o0+AUfQ6XZIeJPH15+/i
+        oRi5qpTCs6FJ1rVj93vdGcGxu+7qu501NUWZmTRRILs4ny4Bs2Mfpc3yRYhJFNtPVvBaRQiU3VXhkHhV
+        8Tc2O69dxaXTBTAxocgudHGMWCJKdqHL4KRILxLMu+OqKdmFLm/EytWfrkzIZOSqEnLPCOD9B9+V4AtL
+        F2HlQ2J38aT4/B4AUz7hfvG20HUXxGc2shlidJ3XNsmlZFdOK0XSFF3Q8LuimRVdtJEXwLwRZlw0s9AV
+        wPqzs0ljGbmqhLwzoclnuQTwBacLYHQX90+kyGL1DBjlTPhIqdvH6v3kqgiqvsvxu49NDNSpS7oGYIio
+        s2hRVyK7oGHgyRt00UneARNH63R5R2u7Y857T0Yn0jCyGc64LHlkHLvRpEVb9iLguDJUPzNngTKVUz/B
+        15c8M61FRLpoYK+AqZMzp3x4debN9GnmGTNmsJJoxoAuGwBuueUWPVcl4ksrhEymY0miThcJxk9UdGHE
+        P3XZhZGvgJXsQhedAGD9ufcKsMpmJOSfCU3hOr1n33H9OYAokKuvvlqOAJURkBN8femr4laZO9wor4Bx
+        s7kjGraD4FUBVa8RYfio8RnZDNal82sNjmtXOr/aoGRXDhsmByeyC13ui+hO7C50hC6K1rsEY5NEMwtd
+        3DYBzBvxdugEpNDYi5CQfzY05RzX2AFLP6ttJmSwOZWCXxHGyK4c8BpYn9nl6dugZcsFFTCvgIkIkKf0
+        +HjjzJvp8Jm/PzEQYnmk+F133UXWxchmYHed1zTKJaeEC10GNljRxRFmrRh0WTHewyRuWKcLYEyaogst
+        Ykc9E8n8xmfvDUvaHZq4d+v2A8BTgPlMAAYt7QcczsyAdBDostLxn/mcJPMwVB5sMLk9SjTO6OiSGTO6
+        IyNVGnI66IrsIh6schksLDtdACfc1KQDFroCWGRX4li8aF12JdLxCbCSXegSWeOdi+wy0LoCWOIh7BZV
+        ptz8pbmFDem5rVXV1v5zfZcYv6JyVSjD4NCVJDP6isCXT86SdRkmcS9k1PG3k6Ki/uOxx+gXWDNnzvY/
+        P4NO3wM4lQqgHu8iuwx0MoLrji7Ov/PrNY5vVsbPqME/UHQlM6Pokozif5RmFrrevWjUFHMhmlno4lQD
+        WNHFO0X7qWgXc0i2jw4KjqivX9mUm5uPVjR2iXEzrFbEFwPMTyeXZ/bF7hrnVTGP3DPuK3LM2jISHQS+
+        rDySQUkxMSfj49+MiTkfFvbkP/7jyhtuGF23bprosheLqUAzM/ier0auiixhRWlV9uKKotjqkuzllAD4
+        hPIQFnl+g8gudEknE+KL3RW6JKO8A2bhA0CnC2CCIpFd6BIvYjz0fmYO2jl48HB711BhaWdpRRvpFdnx
+        KEN0EbujmGLeGcAMz095DGBfFd4T9wxj8vJkKOXBNvJ8OVYM/5nsdPY6nXRnQvf8woXnH3mEfoGmyy4b
+        rKkJVH1XeVXMA9LJsvvqV78qmhnGeq6KD8b+j/y8glUNzegesmz40oouPwWEokvFD8A6XdLJMPKiohEC
+        FL2SXegSNZHbUnSlfKFnIuGdW1AdmdQXlrSzqumITtfuVXEwH4GgXzWiScguy1TViIBKJhKtQ2penmPC
+        LIM2KyMjJTz8ZEKCRTciwqI7f/5bc+e+NWfOH2fNWnvZZV0OR6A0s8S7zBtoGQguR10iKnfeeaeeq+Kz
+        UfJalluxLK16dUPrut4+tKOsSHmWA/6vyC50qdmTkFCyC10GEugFMEhgLJpZ6PKmDDK3fCChSw0Sx0rP
+        ZqwfPh2a/jRX6cqzxg5PkWA5JRwPCy0tm23k6cLB6VbH7mAmWOwSYqJy0GZV+fktV15JD71Fd9Eii+68
+        edB966673po5841vfWvkyitb586dRF+VXr03+qpURARjgmAjEykPz6pMbo65fZnjvtzEiHTmXNHlR7jQ
+        ii6AgSKaWeiyjtHwXgBTaeCWDLp4oeIUCF3eBfWlx7vbd58KTX+GK7nkKQGsZzMkXOEd+CaYsuvy9G09
+        m7GpsbHtssssxgsWWHTvu8+iO3v22zff/PZNN719zTWHr7qq/vrrR9ev96uvyl0VwYh37XQlIip5ZI3z
+        n+u56lI6dbqodJ0u3xt0Mdh4G14Ao5x5I112oUsggRFVdMn/8eGMczMiMpHgZ0Iznjl05ERwclUB6bxR
+        jC26d99t0Z0xw6L71a++88UvvvPZz/7sE59ovPzywfp61RZp7N912VdldLzqnTeGV2XkqrC4GbNXCeC1
+        tb2imWUQuYlmZtA0RwutLrvQJZzB9HgBzLrAUCnNLHQZfA6RXeiiGXDfVbArPnNy/nCYYzll6qTkdAX4
+        ktjhOdTQIHL81h13WHS//nXovv2lL0H3nSuueOfjH//3v/3buo9+dPPAgI9dc1Ohm5SYRONE5NyU2Nml
+        A+veowtgfBFFF4rMrdLMQpdBZsl72yyrBkWN3VV06e9i+Si6tOPS+2KcipKYnBMelRYW11K/eldwclVT
+        P41MZTOE8Z++/W2L7te+ZtG9+mqL7ic+8X858/jjH+9OSAgCXcS3trg56gdZkY87nSGJSnblYUpIkcgu
+        CNl3gtUQu6vo0tfsvW2WX0bnEG/pdNEGRLoiu9BlkC43zrzpGDgTmvksV2nDuWBmM/w9J5KlybCf8fou
+        42uu+Qu6H/nIno9+dO2CBcGhC+CauHbnl+q4li1YowDLg9DQo4ouO8eIBQy6AEazepdgpgycopnVs8rI
+        +GDAhS6dXXzPy5TDzDdbd54QwM6CZy42zbxp6/76vtNLO59LX/PztMIGrty2n9atO9U3vP8vzryZkOPX
+        /uEf3rnySkt2P/KRox/+cMu99waNLrqz4P7VArg2qV0AC11+JKedIbvQZes2MqbLLm4sSQ9e5h0w3hO9
+        DTpdOWaFha/oklvGWTAiooTiZ0OznuPavP3ERbL3flXn1vSms87GX5V1P9M4cLJr6LBcrYPjpV1PJza/
+        wo8a+8ZVvLtx5UqO83ntk5+E7jMf+lDjjBnBpIvRjftybew/1gK4s3mdogtgVI5OF1fJoEtrA04SAaF3
+        wOJIK9kVumRV8JxFdqFLcgO/2oiIqlrOCeD6tdZhMBc2IhrediCj4Vhaac/ymmYP9d3BzXtzV4zGl+9c
+        N7hT9iII42f/+q8bvvnN0U2bpttnllSzhENN+V3Q5cqcaYWUIrsysHpKdhFf/ileFWoZ2YUug9K7/TAl
+        F5vPWALod3XyszqkAadG0QUwOXoj3t0wclIAJxYf5R2CnM3Qu+Y2bjmINu4YGqemxLr0UCPC4aDFrKJ6
+        ZXLTC20bDku8S1BE+IvbHEy6lHAKH26I/aIFuDLcyviqwWQS14hmZnB2CqvBoEvvEd0NZEK8SzCvYEbI
+        MSnZlY2EeF4k/KSQiQHge5DrEdGhw+PRKWutEzoiIlNS0oKZq9Lprh89lLL6Zeyuvb4Lb+bFvgeQRTA8
+        ujOn9cXW9dbjYmUEky7AqDKxr5DhvCdvTYX1NEoZ0OWnuFeKLqcfoUR12YUuGtu+dxSUriUYM8zsKNmV
+        XSqIP7l7RZdKKmkXIyJKSi0IT2wNyX6qrv1s0DKROt3N28cMulRj+NgqIqJ6qKoI5CxBq3aJbd6yLbn5
+        571DVk98kOmikBvzOpxfqoq+O9OxMFGnCzaybzpdYBt0WRwkNcVO+yTBmGHuXG3gV13Q2GaRXTmIi2S3
+        ERH1bToZkvN8SM4LjuLnEOggn5tBjhCXqnvTEV12yT/TBa3KfwQSyqVimuRYBZWJHBzZ6Wj45cjoe4CN
+        E418yTN7zVXpdlflqvLuaYr9wgqussdalOxCl4EqFc2M7HK4pOzVFruL7EKXBjTK8C5PM3QtwWKG+QUl
+        u9JGiW+s6FL3wAxTtDHqu6AFMNe6oRNBPhWlelV/RnEzeUHDq2LGXdZ3Cevt51WVrj1W2rxTP2tOP9Fo
+        inlmvXqv55nbanpiP18T+wXraq/vEc0sA+EGh6LL4b9k9Q26AHZpgN2qaH4AOUyskl1pwqJKSL0P2RW6
+        skfPiIhWdpwJyX2BK6/u6WCeioKCSqw+UFPf4ktP5NDwsLv9u7V19bElG3r7+oMmuyBEai3An68pmNOk
+        08W+kG/Q6VIuxNzqsgtd/kfWga8qmtcRJrFaVYO76tHhthVdAKPijIho79jRCcAvhjnLq1c0BbB6r56d
+        7XIf0cDmg8S1SKr4zKhl5U8ZXhXPVJ+18IlH01I3btok/hRJOiRApJY5zaoaWtk9NpUqAnVcqoHXXHPN
+        o48+qnfN6dV7lahaVlIaNTfJ+aUKADfmdijZ5ZMwyBmLZkZ2GUyCQZe/RXSDsvQPMHkTPoGccKroyiMc
+        1IHUfINzT1ZEj4iQ+/iUUssdjIzLKtumDnh197QpUtxz5szhAZ4entDqyw5PclVkM1REhKIWf8ruMzuK
+        i2bWVcyor3w4KUkA0/Whe1VNfUdyW5+bimaGrnS8AhjM7jSzMF4aWx2+mO2E4bEL0kgmC2ChKweWKbqc
+        vo/iVHYX2YUu+27c6WdPKpqfgYqZ1elK/pnWCGRX6GIPcFuMiKhkWWVo5v6QvBdD8n46sv2o1zNvePwf
+        gKd4sgLZR/JTCrD0xNjptnZ13RYdMeupQ7eGhbT39AhgAOgn+K7buDu26RXjrDm/akQAJikksgsAjnF0
+        KbvQ7evpT72xLvZ/VztuWJoSlanTBTDSpdOl485Ol6KhhydkuXWyAEy9gbtS3TmquoAXqugCGP8NnWn0
+        ZhSufDok/6dchQ1Pe3hSHH44T2slxzZFutjd9NUvtPVZD1v23PF6V3jYbbuHbi8rSi0rcxfvDm/eElr3
+        e5e7s41dYrKM9L4qOTmYgeDS5ySye/PNN+udN3oVodqxJvZzVVxJ165Y1/2e7EKXl+E8i2ZGdnl0FTMv
+        PrOSXVYPcY07/exFgvkxf4NASNX2JXWFV0UDG2iFLhkyPo0RESG4AphreNs46td+5g09NMgu6kUes8mD
+        HvknXvokTlbAY4pbNlxRVSt0ZQOIvWsuu6LitpL8mRu7H4yP0+nCgI4iZXSBsbja2rvnr8/8wMSg0wqi
+        pO75iuyGhITwVfeZVRWhq6U38Z9rBPCK+FalmUU/oxd1uogy5QSDLhsyZHuOSwPsHTBTj4lVsquiXuns
+        FbryRC6oGD4zsgvdsOS1PBWLl9mf4QlRsbu45TxjmQYU3oRHevpbARSpTSjfUV27ShldZMjYJdaPJD32
+        k5nHdt+2aOHg0JCezcDo6ICpqUQt3e4vXewlmlnUMpi/8pWv4IFiMgnGXNLlr0RGREbfmRl7dVXGLdZe
+        SOEqA18aPEp2eXAk6Q47XfQz+sMdXe+AyXjIvmMluxIUwZJPr+jKgxIFsPKqBjbti7QeGBwemjqwdv1J
+        dycasQChCwzhCmDeyhevyshEig0WwKQk2Yph9ETOjY+7daj71tgYXH8jVwUAfD2RYOZrRV1DdNleZXTd
+        7QE0dmczUYgsapnPj8jCz4Nmhl9rVVfMrBxrx16osz63Racrbo1OF8AivuJVMZBdemyZec8PEvZkg2Vd
+        MF9Mt5Jd5U8hxCK78jhb5hRLbPjMeUtbQwpeCil8KWrpizt3H1bPd9SfR4RaZmoU3YcffngSdJFgyn+U
+        eN2dNVdSV3d7dhrOs6OoyGsmsrn/UFbL8355VWqXGFAZBKa66TV6MyRRlXV7fexnK7mSH8016Ir4it2V
+        ZzZjJe10iQPdhb9Kpr0DFiFW6Spla1G5oBW60ibBpzSeerH/wOHEiudDCn/Glb3iOEqPdWA8bQqRZZWw
+        6mfOnDlpunClypvW8jOX3erEu6hlxBcPy04X8TUiopL2s9Vdx9x1vPqSiUTC6BGeP3++3jWnVwArFq+O
+        /WwFV9znq9pquxRgOTCd9INO9/z58+h5Q3ZxMkhIIHge9LN3Fa2EGOlUsqv0MOAVXciR02d+DZ95cHQc
+        umFZ2yPSukrL60ii4vUZPjOMGbhXk5NdZXejG34zNLpbaWYOVpd01cLMjBlNNbeFLiEHaK8ioPrQz8pn
+        HhreTDp6YGib75rZ2AOI7LLumX07Xf4QAcjK4mbn1eWx/1DBVRX9nnIWuqw2MhtKdqGL+Nrp4k6zLDw8
+        1E7YeZdgyWqhkJXsqrgWWSRziewKXVxrDKo8t1r3mTMLGrILqta0dq6obSgoLOZjBaTj1R4R1fSeXt51
+        DlTSrc7jL/iKxcXu3p6WVNbQ4LJGJIkh5TMju0jwVOi6i4hwS+HEeioIW+6YlRN7zdKc2XWG7AKYXQc6
+        XUSZfUO63ZWn+voivr4C5nXoJago2VUuMRpP0QU2g6Wg0+UG6A2DOj5RfXNffCGlml3GLjF9p4nXbnUP
+        1fst23bE1pwoW16JSInsDo+MzA5ZcktNGUkrna4wMDSzJYhDwyK+XuNdez+zyxqR3ldFlorsR3VldXdn
+        d1dTb1JEWk259dAyhsguAx2m033rrbf4kHa62GNfxNcPwLhqLGolu+oASFDxl5BdoUsfDyEHn1L3meWR
+        fD19myLT2kIKTuc2PhfAjlfDq2pcO5S2rLuj03qMJ4sPl+qWnPTbFz7BjgwFGLTswpaNl3o2g2gtu2J9
+        beeB6aArJYTCxRVZC4sH+qzsQk11DRpbp8sHIzEpXhWaGbqUFtAuymcW2aWMzUf1an39UNHyUuaLUEzJ
+        roSwCB8iBVehS+O17PGSp9CrvfeUowtLqkILzy4peZmruv3sJLIZPu7Oru/cV7j2WT7tms7OGWEhtyxe
+        uKKhAZZ6BfCHP/wh/0MGTWlmpLe4pienZvM00WVO6hLWxP39cuctOWmOzJrqFbgjOl3El74cne7bb7+N
+        +2mni573UXz9kGBeKl0AQk7RFe2KvlJ0McPoIlS6frICbFgN9d2nBPCSpS/Xdp1BG0/Rq3K3w3NFz4nM
+        NT+Nys2/8aEfp5SV6nlmlzUiHKvCtqe4uBH7qSgS79JlTh6Dr8a5GV41s8huU15b3FXLrevvl6c/UJKS
+        nIJpU5pZAl+DLr6VnS4nJniNfXW/2icnS/0CzFB9Bl04Idl8RGRX6DL4J1Dtz9/Na3oGukuW/iI0cyQ5
+        o5g02TSdE0l3VXj1qZTyjoENGz1X7+t7jlBaqO0Z9yC7eL4kp0BLGlJSGQzPNSLVdoO0pSWkO27Jjruq
+        DMCZ36jp7bLmSqeL+SOtoTQzsksNmGqYZDOUZoYuDo3n1JURNfkHmHZcbhKiKpuo+qFwXAWt0JVkm3QN
+        6D7znr37cxqeC8kYtDJcaT1rBk5MxatSDzRxWb2n/ya/8UBSweqqhm579Z61WFHTiFNW0PZM38Yddro0
+        tiGyDKqtjAULFnDvkmH2nS6T0FLa4fxehnUs0oys9Buqutp6DM2MfBPt6HRFOdvpAhhNiSr1HPtOXoL5
+        TYpLLDfRzHq3G04yc6To8qG5N0lRGT7zur6BaGdiSFrvkmWvLCl9paX/+FTOieSZU4RDt956K39aNUSq
+        bAafobG5raN3g10z4y7U1jU0t/UaERGfXGpEsn8XGNSFUKcqz8w/if590cz89abctvjPlMVdWRYzKyM6
+        xFFf0WjQlZMWDbpEKy7p4jQw7b7T9c8Gq/fl5lG/Bl3xgLhtbkDoMggSoG73mbt7B5Jrfwpducrbz6Gr
+        WSL+njUHWhrnEF8cS1a3AuxLTyR3wSc06JK7B6TkqtQGbZQzfg1cRTNTwycucFff1Rsi6+Jb4q4ojftf
+        1pV6TUXt8pV2ugiMQZdzdEhiGJqZu8Meoxo9FI5cgvdPRctbcEQL9wkMOb1T9UDh8jDXKiHHN/j9TATS
+        Y/eZt+8aS66bYFz2S67IqJjikmX+njXHg8REOZO0IvCfYj8zuRrpsxGvCq6ciIASojCFWsb4YYC5HQoJ
+        SLC7bIYAptQRFREV/+llXDBOv66yvcHKR+p2F9klAWzQ5Z/8UTtdil38UVrk/BLfSUowv0abB2vfoCv5
+        IwIPie6FLoPVwNTbsxkwzmt+FrphsUWYqKT6lzZtGfP9NDJuWB7jyZtDeop0RS0zOD2DAWAcK4iKzyx2
+        lxICdPnqmW5fT9+ye+utnqV5TgBn3lTZ1WraXeii2Ay677zzDu/ski4RM+LkL93JA+Y3wYkmVPlCdZYF
+        E41a1ukyR8yXVKXsPnNuxUCUMzlk6VNLlv8qpvrljsEjPsa7AEZwpaPq7rvv9loj8r2+K0IsPjO9RAzU
+        so8+c2tpR/ZXyhMvWxp/dWHU4piM+4vwme2yi2yQsZJsBi4VA7rMoUu65K3QCl7TzgFT0fJG4lEjQBKM
+        qgZjsX+Igsiu0GUoy23viaxr2xFW8UsALynn+nVx6zOj2/ZQbFZVBHfxLoBBi4cVQLpiffGqRHblQGav
+        dNnwAYMVi5qS/6446RMlSZ8sgXHBg+W+0yVL6JIu1hd/ELM4CfGdkgTzy2RehLFBV9rVIKrTRazR6iwF
+        lz5z98bDMTUvC+AlFb+OKtoeFWXtK3FX31V7EQKlmfXqPS4Vw14jcqeZCV2iIqMyvpuf/PFiAZz2mdKV
+        Se+WiQy7i2a2yy4bDFzS5cgpShQ4YpOjO1XA/D6dHoCU6Vb5BJX/E3eUr0KXwY94scuz1Ue37UZ2BbAV
+        Jaesymp+vm+T1a4V2POq3OWqhLG/VYTetb2VD9Y7v2/1rqRMAC74VmVnc7dRRQAzdpf4x253kRN3dKkj
+        ce+TphsAwLwFtJgyO111tIxOF+HmlTB2FxG1bzgcndMd7UxZUvkbrsVVvy1qe6a7byPpddaQUhV+RUST
+        683wkM1AG1OBp8RSv6Qp8/KStI8Upv7PwqhFMQmz02sWWpGuS7r2iAi7i+51R5eGDVbb5EyvWhOTCZPs
+        CwpmTKJqJFbBpUiwAEZ2hS4DPCxMd+czb966u6j5SQUYxuGOzLjk3I2bdylVwRsG1u76Jbv9Pf0JEQkx
+        P3Gkf7gg7X8UCODCWcvXVne4pEtigHNO7LLrgS5VaiIR+xO9/ZXmwABmlYnRFU9Vya5SevyPThdOonV1
+        h9noZ0Y5o6KhG1J6Fu23uOyp0JrfFrY90zU4hsvD/RMv8v5B2CVGfz97WyRv093QXf2vtdmfLEq7ItvS
+        yVfmADjvi6XNWVbHkku6TIg9E4nserC7eACodPtubn/pBkZFK6dacNrpircCfpFdRVftI/LQrb52w2FH
+        Zl1kcvni6t8trrGuJcufTS3rz8svJBcvpmFad4khfPLUt6rUqrLbyrP+W27Wf8/L/Ju8jA/lOx6MTbo/
+        tW5xo9HxqntVGF2jiiARkTufGa+K0gKliEm7zcYiCIwEy5uy4pRXpWRXFV5wQflPUc4MoavSk54jooae
+        QwmNPxfAoblDZSvaGxqbcS9VVwaM+UPwnkS3ut2rkiBefGbq3HImSUVaZdrVGQpw/meW1jxW19NqbSVy
+        Kbv8LgfZGBVAz/EudAmK+Iu4XZMQ1gDHwS7fTlowJTpSdVM1Wag4aaYx6OKmSc3RXbwrLhXKOXfVqZhE
+        BBeLPkqmiXdT4ktCEUXKn5hEP7OKiBA+OcJARUTEoJSSECnuKOHOxKwP5ZZ8pWxV/GpjD6DhVXEvRm+G
+        ZDPg7S5XJXSJv+mACxTdQKpo9ZmEsR5Eqr5+VYGAlpJdoUuGS3KZiLWIuMsKINkPjp6X1YBgKbpAZWrY
+        aTEVuixE1gfuOg1G+l4EYhX+n/J7dVl1bUGtFPCNXWIqV8UHMLrmVK6KKgJL0J3PjGZGdgNLd1oAi65W
+        MYZBVxQagoIyl3KFoitVRXoEwKynxvSIiMmlksNckJ4E9lR2eLqLd/l4Ol3Q0ilHnQ6fjpQhesIdXT4b
+        KXqj41XRxRi7rBFRRUB28apQFQHUzAEOk+wqBf9espXSGyyyq+hK1M//IMciu4qudN3yFfB6usqoABKD
+        8v5T2eHpe+cNfwu6iLUH2eUDMwlGt7rQpTcD7eKyvit0iQiYEL/K+L7r8EA6WcZfJTaAiju6NFRg2MDM
+        awy6AMbJlJ1OYJaqhte+qoBnM/SOV7VADc3Ma+il4saNfUSqikCBz2XnDeZW6FLP5k0CEhEFw8myM0ZG
+        EWJDdoUuA71EIhetiLpWHfNCV/rsmT6KprK/dLojIkMz6ztN7LLLi9mThyel7/DUfWamwmVPJGgVXaw7
+        tmzq2QwPAj2NEqz+KsCYLIkOEVmDrjRUowZxUzHAdrpyFBdJb36EQGOSg6OZVW+GQZfPQFrKOFnB2IvA
+        cnTZz6zo8g1hHi+bYibSq64OBmA+BG1HLHkPdOmmwFDJw1l02VV05ZGI8uRLSOOdgXmKPrOPfVWilnHv
+        OTiMQ8j0M2/smpl9YxyNb9+LIE1FIrs4a6iuqdSIvHKddifLpdsFEmZKaWYlu0KXQc8iZXz+H/cK5Wyn
+        y6TIuTBy/A/aG6GXfr/A1ohEfFltGAvklZO49bPm9HMz9B2exND2XWKyF0HRxSHnnQOVqPJKOkgSrD4H
+        0sntyU4I0cwGXQDT2I31gjcCCmYluzpdnBdyuQykiiMX2VmDZOOdoT8RNWDr9V3fK4D8LrqBhUU8apzP
+        rJ81Z9hd/i7W1L5/V+9nBjARsHQxTLda1qkHGzB/m2gPk4y69kAXwMwFiQs5O4Bl4ZkuQsaACtlBzIEM
+        RFwstzjkvAkhGfOLQ6esAAuId+Z3eZqf/kwT/Wx1d7ILJ97K5bkZ9mwGm3dwQdA9XmUusC+4AIC5AaaG
+        GUeUYaw0s5JdRRfAeCIUcxi8EpcEYHbZtdPl8DCWkTwciLyS/tx7/fm7+nMAfacLexx+Ppv9RCOXO00o
+        66KrsCP+drwGhPSFASwfnRvG1mKVYeyZrjp6jWwD7gmKFFEQzRw0urjNyD3rzH6SoDu7y/+jh3DlpiNF
+        5SP+CwlYPiK6FCVM7CSmVzSzLrs6XZqf5aBbjgPAI5OdE6hipZkDK7sIK6Ydc85ftJ/gaz/zRmlmRJkS
+        BfE9XoKPJKbpZRcesNwYuhdRxjDD2Be6FHwYeK2UHBgsC+w6mRCEDOGetGZGn/PraAjyoCwm+3MR7OdE
+        GhGRPPwZc4vtn9YMho8L4mIBLB8XWRT/C2DYXXeya9BFVqgHMKhD0CpFxYZBVQARl1Yh9RXDj09OcKX/
+        Py9AeaD87U+Ksz8XwYPd5UesCaSWRXYxoJUpvbgAy2dCraG0EQIww4mp1zWzL3TZB0C4KQ9bxH2lVCDt
+        zQQzZIbtz703nuFpPI/Ifvq2EREh6CxHNBDxVTBDIF+E+GIELJ9bzjNGIHBBEWWxuxcVXeQb5YH3gNZx
+        edq6LwCm+zUXL2C5czxtUle4OZAmJYJAK7vrUjMHQXbhii0Qruj86SsEBYT9xQ5Y3STziEOL6oY0iTBk
+        GtKG3Z0+ukBFw/NH4YoqJg4OWq5xipgvGcA6afQhKSTyJNhpFDhGGtgBp8txHNhvjCtQWVWE7OiSS4Wr
+        mq5LD7C+ohFrYJMkIpkghwsAg0ALURMFjqvl1aui+0e8MH4Fb05OgpKT1y9RqPoUXdqAp6i+/n/49Q8A
+        v88pfwD4A8Dv8xl4n9/e/wPgd/K/F+/ZIQAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="cbC2Scales.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAKAAAACgCAIAAAAErfB6AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAUGFpbnQuTkVUIHYzLjUuNtCDrVoAAETeSURBVHhe7Z0H
+        dJ3VneD3nN3Nyc7OZBNCGJIMpC0nGyC0kAwQikNJSAYIgQDBQABjqz2Vp957712yJKvLkqxmy7Lk3uXe
+        K52QgKlhdrKTSQADu79Pf+dy936v67nA4Z7v6MjW09P77u/++//e7z/922fjUz0D/+lTfXef3dy/fQb4
+        U74IPgP8GeBP+Qx8ym/v0ynBf/zjH1966aVjx47tmxm7d+9e635s27ZNXnbkyBF+6/XXX/80Mf80AAbn
+        c889B6H169fDccmSJaOjo3wzPT29Z2bs3buXFzz7t/HMzHj66aePzwx+cceOHdu3b9+8efPq1avHx8d5
+        h8nJyTVr1vAjXvbmm29+cpF/UgEL1J07d05NTYFz06ZN+/fvf/HFFxHB/z0z/vVf//Wdd97hZYy33377
+        rZkBqjdmBmL62sw4ceLEq6+++srM+MMf/vD7mfHyyy8j/YcOHWKJrFu3bunSpStWrEDQP4mwP2GAAYNU
+        rVy5EqgIHEoVQv9nZvzpT39CzoJC93czg7XCimG88MIL/CGkHNhjY2MTExMsLBbEJ0KsPxmA4Yo8wZXJ
+        PXjwIP/8j//4jz//+c///u//fgboPj8zRMmj2/kAW7du5ZOgzLHuKIBzmfQ5DRgdi+ggN8wmdhQF+5e/
+        /AW0Z5GuMt7o8AMHDmAali9fzsfDQJybpvocBYzhRBUzcSIi77777l//+tdzii6Ajx49yvo7fPgwfhz+
+        3bJly1Dj55oTfs4BRg527doFWnQy6he0s6eLc4QCEHdavmHdMPhDfGUl4VXZ7a6hmXXZ1ekCmI+K3kaI
+        N27ciEeGAj939PY5BJi1j6cKWkIXlPB7773nL10cYNQmARLWsampqbq6Oi0tLT09PSMjIzMzM2tmZGdn
+        5+Tk5M6MvLy8/Pz8gplRWFjY0NCwaNEiBBGfmagJbMrueqULYP40jFkuYOYDINPngiN2TgDG1iJVBDz4
+        q6ji999/33e6SB7BTH9/f0lJSVJSUnJyckpKSmpqKmj9oltUVFRcXMybMEpLS8vKysrLy+vr6wcHBwmO
+        +XgsOwTXpezqdAEsSgLzDGZgn13bfPYBoz+RWuwZ8gpaH+kSqHR3dyN/CQkJiTMj6HQrKioqZ0ZVVRXK
+        oLm5mQQI2Q8kG7WsNLNLumIFMAEbNmwAM8hZxGfF2T6bgNFgCAfKkIDn5MmTvtBlchcvXoyAxsXFxcfH
+        nzG6NTU1tTOjrq6usbER0vj2oPVMF8AsRG6QZYGzjX4684zPDmCcZBzOVatWkV364IMPvNJlKaAqsaOx
+        MyMAuihbRBDDzOCbhTOjZWagjQ3NbMiuTpf3wVQzwNza2joyMrJlyxZJZYtmVrIrdLlNlQdFUUH6DGvs
+        swAYWtwnPipovdLF8kEiJibG6XT6Qhc2TP3Q0BDJZFJdKFJJOCsLKkZUBkGOxDkMXCTJReMG9/X14W2J
+        ZnZHVxaKrBU8AATaA12cRxwFSXyisc+kKJ9pwEwrXi4JRa90mXEmNzo62itdzGRvby9vCy1xd9Xwka6y
+        qZgAiXkk7MFRwqnG2KOZddnV6aIDEGUGn4H1geAasqvoEj4h7rwnoozePjNW+cwBRi1zhyxzbK1nusws
+        Di1oPdDFVW5ra0MTgFCqQ6pGFBS6yr6yzmTgLqGQAemSLh8GoW9vb2c1oDyUZjbooiQYMCbtyjgDWZEz
+        BJhMAvfD1w8//NADXfIDCEpUVJQHuqhE3gquUv3zly7hb/jMID4WwRV/WJddO13WnBqQHh4ehqiSXUUX
+        wB0dHZ2dnQMDA7zMHV1iJ34qpUk+/2n1vM4EYESK+6Ew4IEuSSvuFivrji7ZCSo5KGF7Zdcv2eV9KBOh
+        IfHAA6Ar/pS4VBgF1LKdbtfMQJQx58iraGYlu0KXIdVrvGtU+uljfNoBY3SZTfxkD3TR23jIkZGRLumS
+        b8JowVWGUbc36Cqje/jwsbWTB1aO709OzFxYtbowfnNh/CauFGcNM8u0JsTkF8VuKHSuby5fmRiXNj6w
+        c+Wy3bt37pfIRw1ddnW6kvVkgIqoScmuotvT0wN+/C9x90Qz63RxuKTNhBewAk4T49MLWCKHjz76yB1d
+        vC1mxOFwuKRL9ML9K7Se6R46cDwjPbumdLgyazrDsdnxwFrr+vXa8PAIxyMdjvvXOO5f7bhvdcTc1rbW
+        ztaWtohH6iLvXcnl+E07r4m8Z8q67p5MfWxVedL66oKB1JSMndv3KsAu6YrnzIAQFtqgizfOIHCnes06
+        cEkXNwJdTXKUOz0dbtdpBIwFIibxQBdZxCK6pIuBxNBKFdaD7CKvu3YcHezaW5Qy7XhofURISsT8PMeD
+        66xLB/x4nQLseGgoIz03N7so8qGeU4AfrcEkK8Aw5op4IjtiflLkv6zInr+qq2bzhtW7oCiaWQ1FV1Uv
+        kFGsr8iuoosQ859EbsT9opmV7ApdBj+CMV9xRYMryqcFMCuRO6EXwgNd9BKhrUu6zA6K3TPd3TuPpaXk
+        JUQ1OR7e4PgN13oL8BP1oFKACxM3V2ZOJ8Vn5aTXTI7tWbX81BUT7ST4mhjdtmp8D2o5J60mMS6zOn1j
+        Ycz6mF9ZdC3AEch9NYAj/2Ui8hfWlbCgLjE2c+XS7aokpQBLbUpykwyAQVRkV+iSpUGNM7A1qvtPpytO
+        NYaDhHxwXevgA4YuH512J3d06ZAirAStnS65BWZN1ekM2ZUwd3zkQFnWdsfcjY6nGi2cAP4b4+y4yThn
+        6ujivZvXH1TZDGyqyma486rQw8roblq7Z0n7dFxMao5jVNGN/MVy/lbEw5VRd45nPzk12Lp55449+BZK
+        dhVdYUxOA1oGXYQY9xvPixVgpwtaFj0rAFEOIuMgA4Yu3oQHuvyI4p2dLoll7k3QupTd+vrGtJSihJAt
+        EY9s4rIAz92InMXOm6gp2DHav/fgASn2nCr42HNVAfjMu3ftG+6crk1fH/vAkLWYfr4MwHLF3zuRllhY
+        Wlyhy67KcpCkZKCxISqyK3Sx09hjwgHkVTSzyK7QZUCXaIKpCJauDjJg7K4HzcyPAGmnS1FICa5Ol7nD
+        Th879kx32z7nghkZenSVAowcp6ZkMx2+ZCIDoKt7VbBJSUqvTV/nvGsG8M/GI3+xxLLcd/c05azdtG67
+        oJUclhqSheYT6nQFMAkycNrpgpbBT0EeFJ8rmIAxTh68KlSlS7pkBlC8dtnl/ynu1lQNJoRNRzy2OeLR
+        zRFh8REhuQhxe+MefCvV2Ow1zwxdXBtsIQPNKXkM5p3hV0Rkecsbd3VUbki6f8LxRFZEiDPqp0u54u8Z
+        byteN75sAi9apyv5LAYKGa4yoIuWBqF0FuiyK3T5hHwwfop8z97hChpgMkFYMnd2l4VMStmQXYq4UnUw
+        6CIH9Fdgp5ctG4+MSHc8vjrisS0wTnCMVZQtAqckI/3KM996660E2QxKjdAlKlNDGHuNd3WfmU9Ylt+Y
+        HdEngKPusK640IKK8kpyqOhhhVaEWLrqwabT5Z+whLFoZp2uAGYdoORnyTg4gJlu7sEdXWJEyyn9/70q
+        LDGL3U4Xx2rP7oPJSfmbN20jnKgoa42Y14sQD/fvn00VAcCqigDgq6++WrjKN37R1X3m5Uu25s6bhG70
+        ve1Vhe2oiv7F/TSV4CqrdLQAlrSlqF+G0BWo4lsp2VV0RdBnmecKAmAyzARF7nJV3JudLo1RTKtLumtW
+        HklwbHc8NZSb2T44ONTc1FJTuXjv3lnRBS0gYcxXBBfAfC+A+SZgusruLm5Zm/Db5p7OASBVljbEPFqx
+        uHG9kl2hqwY4dboiwQzRzDpdxB2VDmaigIDleLaAcfbwFNzlmZlKu2Ym9YipttNlRhY17494Ylqu8CcH
+        K8o6CwuLKMoiGbOsETFxYnpFZBXgn/zkJz7mqtxFROghVBTdAzXVdVUlzZFzS6JuH466dbQodMWy0UmD
+        rlSF8Z9FZIUuZpjBP+10AYzCh3TAbZqzBYyRoIDvMhOJz2ynS+1Wd6mUzzw2Oh4dlRAxj2SFRRchnprY
+        z+yQo6Z9QgH2y+7qNSKMugAWtEozX3XVVQLYcybSA10A40ngP1LGWFjflfrIAHSjbh2JvH0gOiK+sapT
+        ya7QVYx1uggJLhWMkVeGyK7QlUAL9oE51bMCLI6VS7rEu3afGbo0M9hld9vW4ymxO8LD0q1A6Mnp2rK9
+        hw6eqvIys7OUXSW4MMYDuvfeewH829/+lu8ZfDNLuuI2EwhRb8BUTW/d3pyzGsDWvcxLct4x0le/VtUN
+        hS71JQZ2WmRX6EpYjKI26PLOMgJzuAIHLKbXZfWeXJU9m0FfqkvZnRg/Eh2yI2LeNuuKiCzIa3RXvccR
+        JbvJfQaWzSCvxFA+M3lERlDo2n3msqKaiPDIqJ8MR82xrvq0KSW7QldqiIi+oivpLQYSrGRX0CLBJDv5
+        zwCMcYCAxfRSxHVZvSfjaPjMeFUu7e6y0cMRT223rnnbYyN2rJrai7y6rO+y0p988kkCzdtvvx275bKv
+        apbZDA9VBD0TSaH3yiuvnDNnziOPPKLa6gyfGZwrlq7LmrtMAHOVhi3fvEnBtejKUDlLvkGmpQ4BSzSz
+        TleC+ACMcYCA+aRIsEu6zL49InLpMy9sngqfv0MAZ6eSqv+4+cYeEaESoMsq4f2vueaaoGQiA7C7/HXo
+        UvgDLYCRLSW+Eg7pXtWm9dMl4RPQjb5liCs3rGvTxi0iuzKkTiyCK3QZ5GQQHjtd0UDocL886kAA41Vh
+        LVzSJbNo1IjIZuhpSOVVNdRNRTriw0M6YAxdZXSNrjkElzfEt2JmkV3picR3o1Ss90SeGdklLrrnnnvg
+        yldcKlpzoItnhH6y01V2tyF1CrqRv6qKDIvNDe8w6GJxGIJW6ErlGJCimUV2QYtBoUKFZOP6+M44EMCs
+        Lzw6e8cr1XucXqNG5DJX1dN1KHzBjvCQRXgiyYk97ujCFbrf+MY3xO7ef//9dGwBmPu/7bbbvNaI/O3N
+        sNd3jRoRUov4ild1yy23QBfGfMNWF766jIjE9BYmN1uJ6/sqom9eUuWc0Dt4BDBQdbrS+4ELbdCVGjNG
+        2vdShN+AmWhuz2U/s703g3yy3WeeWH40fMHOmWtHWmoXW4F4T3d9VQBGWJXsopyZU972iSeeUC1z/nbN
+        BaCZVRUB08vt8xkgDWC+InOgDQ0N5VO5jIhQwlRTcmLroBt9k3XVxE9IB48MWKpmD76R/+QFvDMSrGQX
+        tFTK6Sbgf/hDPgqxf4ARXDSSy50mLH9Ddml9tVcRNm86HhWxKzzEAlxStO/o0ac90EWC0cYiu4gs04pI
+        0XDJrrLZ0KWNBE3juTfDLrsiuGhmhBWufJiwsDClnK+44gqXdMWtAhhSW7WgJ+erd0TfNMi1qGhKp6sA
+        K7q8nl/EQolmVnRx8Rh4YT5uXfQPMAsZ98e+0wR3mphS76siCLZXAPfufcYZMxAeYgFOT9lz6OAph9lD
+        t7qYW+giu0y6v3ZXT0NO7zo0sfEYV2llQ2FpzZYdB7z2ZrisACqvStQyg600c+fOFcB6NkOPiCabm+su
+        vLDy3hwL8I2Dsfc1jHSuEdlVdFHUIrtCV94KS2zQRVMixz7WmvwATLaMN3W5B5AFZXTN2av3NDJnpK+L
+        ikoMD89yRgPLk8+sKoA4zzDG7mJ90YG+291tuw+Prn8mvaC+dMkr2X2vzW98J6RkG1+5IuOzI2Iz5fuw
+        8t18Te9+rXHpS+V17Tt2ndoV6K6+q/vMAOY2SbTxjWe6w/HxVX//98vLyzes35T/2FjEE8mOUGfC3R2T
+        Y+t0utJOq+jKe2KbRTOL7EIX5cHAzaYw41VR+wGYxcUOa/seQOIlo5+ZXXj2+m5z86Hw0N3hoZssdyMy
+        Ch3rVz+zj7K7c8+hvsljQpQrPL5QvuGKyOjI6j2hLqBagNNa1Qsc0XF8n9Z1omHsxZE1R7bv3G1U7+0R
+        0V133eVZdvGPe375y8rPfQ66iCa0kARmIHpOd/SPB3J+M7J2jeU2q05p7C7zjOAKXdQDf5Tw16Ar7fXk
+        L4MGmD1xrFaXu7ONvQgoZxSj0Xmzfv3x8LDd1hW6e3joMLs/JKExmwqgsRehd/k+hDW06Y+O2HRhVjTw
+        asvyl5aseQa1vHuvlW22210kFVOybN3h5mUvpC56QcGOSi6Nbn1r0fgz23Z8vEnQXgH0YHfRsRunplqu
+        vlrRFX+KfeWjPWtibxkEcPQNA/Up4zpdADMEsNBlkfFPJFjJLnRJizJ8EWJfJZiJQG3ad2ejao1udfSJ
+        QRflnJy8VwDXVB8M1j4inElMBrFQ36rnY9rejvwb17ic5t6Vz+3Ybe0eMzKRpNhgzCck0oMru2CMKgJS
+        i+wiwY4oS5q5nKnlYJ7ebm0ERQQ9xLt6nhm6K9vbF553nmhmu8/cVrgCutE39HONdK8SrjKQctaBogtg
+        Jh9vSzSzostWKL73KsQ+AVbiaz9ZwdglRj+zeM56P3NeXmd4+B4uHK/9+11nIv3tq+LG+NMVtW0pXW8I
+        ibiWF1uXHt+y84i7+i5biSgOou6oeVCifvTRR5l38jAuu+bAObjqSHLn6yEFayz1vvCtxrHnFrYsIuRl
+        cej1XZde1dLs7PYvfrHpkktc0hW7m/PQiAX4+v6kJ6rWrLZSHEJXBm8rBgK68glZlzpdtswwyHt4dqd9
+        AsyfAYCdrgQt+h5ASWvodCen9kRFJc1s9xocH7f6XoOimbfuOppe2udIKAgpmY5b9Cb+lC+dN4899hi6
+        jiGA+fx8LHcRkeSZh1cfzux5FcahZTucmQ35RVWyq8yDV9X7wAMjX/lK2z//swe61tEOS9ZE32X13ONw
+        VScN6XQBzAsUXcnAIMSimZFdoctWR5Az5x4ssXfAxL40jhD72s+8EfFV+3eJZ+wdr1nZB8Ij9oaH1zsc
+        UXj8QaHbPP5yWPM7CyoOR5Rubl/x4t79p3YTee3NACryR8cBgJlZjCISrBxme0+k8qpGVx9IrdvkSChk
+        PTWPPe2OLrtC22+6ads3v8lXz3ThBx5HRGTkA/nR1y+Ovm7xWN8qJb7SHI+eZ/EJXSwLHw+cOl05ocCz
+        EHsHjC/Du9vp4tYa+3eNfUQsybGlR8MdewHsjN03Pb1P9csF0DUnLtW+A4cqh/8QWrwJkSobepVYyPdd
+        YkyTmF6COqSBuSMX6AtdZXcbhg6JOcjv+/2GzTuMCuCavr72r33t6BVX+EJXcpPU/HMeHIYuV/G8EQGs
+        tj7wvaKLh8jyxTAp2RW6uBHINFPtToi9A6ZOSaO9/TQy42QFyr26ZkZYZ0LY8ojISRgPDFhB0Sx95t37
+        juT3n7AC2aLJoRU79I5XDrqafeeNveMVp8bwqhBlvOuItObYtjeWr92jqvfjRUVd55//+o9+5CNd5VIh
+        uNHX9VnXP/f1tAyRmxTAUmJCVSBdQpcBb3Ai+oquHCOBO+2u38MLYJIbLHY7XVgaJyvwafSdJuy+5Re7
+        uwdS0xY6Y8f27j0wS7o4OOJPYXHXbTvGBCnAQpdEadCr98S4ACY+1L2qrOycjO5XLKvc9MfBqQMo0sHQ
+        0JELLvjTjTf6S1fsbvGTI9E3dUTfW56ZlE9Xr6LLlPICRZf7JWRA/Rh0iTlZFkyvSyH2Aph3RzHaz4kk
+        QaqfikIyXadLqYsSwpEjR+kpa2lpq6pqpNin9zOTW6Z+gIhLmchr9X5697G4ttfDkqpgjHuloyVFykTA
+        mK+k9NTubB+r9x7srpymwxTjOVNLMOxu1dDzVp6k9kT5Ndeu/8Y33p0zxxe6Dz74oBERAbi/cyzhwZrW
+        6j6mCA8fYCK+0guAHyBbp6ALCxacaGaRXV7MoTPobXda2gtgwHDSkXEKKNrAONGI2EPfnY15KyvvTEiq
+        LytfXFFZz4uJ7pXdVaV7nDIyzJKJNM680eu72/ccQWqZzZy+13bt/djocs9wpceKviq+YZEhTF53eHr2
+        mfVcFVyZTfwaOQORf5LS0e1uTdPG6i+df/jSy3yki91FQJ966ik9IkI9cNZMVWXNQP8gRFuaW5kuRRfA
+        oquErkwLhkOnKwsRV8tlDdETYAIsvBL7Ga8sKP1EIzaYAM/YnR2XfCAsajoscqpt0Wo5AkftRUD0pTdD
+        ZPe+++7zXL2Py260/Jr+E8pb1iMiNDM2iYkIouwquwtUyUQiwTg4TL3KZkzW1S0677zXb7oJuvlX3Tlc
+        UmnPZhh5ZuF6+eWX6xER6RpqFSXFJaWZDWlRRdFzc1rrelQfj+weZlEquvi2rAklu0KXlYdOZT7tWtoT
+        YEw672s/n5k4Uj+NDP1g0J2cOhoWvT8san9M/P5Dh6xNRMZOE/SzElwY4427qyK0TvzO8qqSig3ZVS4V
+        cyGCG0TZ1TtvUKFYnJCQEADzVbwqigd955335/vug27JD34W93hhXAUG0yoLqvquosvdIbVqABizokdE
+        0EIGckNbom9uiflhT5VjRLiqveH8UZFdZonpwvqIZlZ02eaD3kYa/QPMjdEfaZy+jX4mdtTPmkPzGOdm
+        lFQcDos+AOOWtlMN66qfGZ0vdhfA6GfqgAyiBZf13bENz1p2rvmdVVuP+7tLzN3ubM8VQHeZSHSMiC9V
+        +N577135T/90MiRENHNfdn58/X4+Z1b3y3a6TA5oSZGKUqVmoNDqERE51yXtK6DLFXdd79Sk1UUrjbQM
+        9J+iy9QxmahAnS6AKfC41NJuJZjQCMD2s9W5SZ0uBtU40Wjr9PEZuta1a7e1UUzRBSqdkXBldePZsxi5
+        f3eyizPlaHmbieueevHs0lV2l3NFKR7s+e5334+P1+3uynXTUS2Wl9Cz3DpL2KVmFv3MXc+bGThT+lZ/
+        MbqZdw/EXNvD1Za/TNEVxkgt0yV0mVL+RzQzaIUuhpz+HnsB0S1g3ovlbH8uAnGYfgooPohxXlVScm5Y
+        ZHtYzIHy6kN2zczbcpMwpueGr+7oYm7jMqolm3GO0J1auLDt/PNfue669/Py7F5VxzIrBwLmdRusBiuj
+        Aih0caFvvPFG9DMK9uc//7ke7wrgluylMdd2R/2yONGRIVxloHuxC4ous4rPZdAFML4IyAwt7RYwngVv
+        ZH/qBeUE/YxXPAv9NDLWV3wSh9ZYbf0ZGXnGThNMr8guA7QsPdIjSjnrO02QWquSUzikO1ZeM5G+dM25
+        3L/rtUa0LCen9/zz/3T33e/n57vzmRPbT0QlFZa1fwxYj4gErcpVPfDAAzjDKhwSryozIzMi3MqhRv2q
+        YHTxhKILYF6g4kxSRsw5ro+SXeiygwvkJJV9BYx+JkAynmnCW+t06Y0yThJEJ4c5D3JFxtMUuNRzjQjv
+        A4fQ6HjlZtau30D5D8CqhDCbHZ6+9GYY/cxG503fgw8uvfDCvz7xhAe6LNyOxeOS/Zhcs0VO01EDrgDW
+        6SLBBl0Ak2cueKoz5gfdXK15Y+qABznjAQGQIjp0UcVkPEQzC13MPAPJMYIl1xIsBtj+xBo+on76Nm9t
+        nCTYO3BUAFc1HPFAl/vHt1Liq8su7kxecXVY1uLkto9N79mS3c2rVmF0d33nO+87nZ7pit0tXmy1DGS3
+        H8Ny6XSZN/QzA67iRdvpilfVXrQ05gddMdd05f66Xw54ELoMVqqiS1GH9zfoYtcJugwz7Bow6p5VbH/a
+        FAGSfrY6GTKjel9QfiQs9lCY89DIUguwv6eiEOqQxE7IaXIkVyrxJYkhwW7QM5GeNfPqzs62r3zl5Wuv
+        fT872x1dRIcIR3lVyG5EwYrojMbM7HwcXT3ehTGmF7WsZyKNeNfaYLh0CrpccT/q5ntFF8BiDeEn/RTM
+        hi670OUoZTJchhl2DZgX4bPZnyXGXOsn5/Mn9fouKsSiO3MdPOg3XdkGSGi0oP5EdO1hsb4qyQxgVNDp
+        i3eNTOTy4uKeCy5458473ysv90D3oYcegrHuVeXWLqWqmFFhbfh0GRG5k13lUiG7MVd3cXWULhXZlcEL
+        FF02abI7F0daNLPQJV2I0jb2trgGzNLj9zHX+pPi+B+dLnGhtDSrKkJqala4IzM8qiszf5u/sit0GVJR
+        6Jp8QdldZkQ2O0mqObB+Zne7xFz2ZgzOmzfyj//457lz32ttdUeXGQetPSIamdw2v+o5OkBWr/24PcMe
+        EdllVwGuiu+NvKvI8XhCQkyqoiunAMj5cEKXI1VRyDpdAEOaGqjuZ7kGzCrADBvPASRPqz/ThLfW6aKQ
+        q+snwiOLOI0jPj4jsB2eKzYdj04pdUQnIL5idzFXqA06MSQZebrpYnTJXWz+5jdPRkW9OzDg2e4y+5hV
+        6WnRvaq4RVa/ZteyPUZ916vsilcV70wMD+PQtZTU39QKYKHL4PYVXQDzYiW70OXZBORWsXHeAfMi+1Me
+        +fP6E2vwI4wKYHntkbC4w1wjy6yQ3GuNSD8VRfYR0QTJ1NQvfVl5VUgJ5QTQUks43XTXDQ9TsX/6yivf
+        T09/d3LSF68K35j1Z/jM6QWNdHbmdj2t56p8pAuzZcOTMVd1xlzVEffDTp0ugDGdIrsMeZ6QaGZFFxfV
+        O2BqwLyX/QmtKAT9eUSoAmPvfVzG4bB465reHghdAEs/88i6p/XqPbJ7BuhO1ddTPHjr1lvfKyn569at
+        vtAV0wtgEWJVIxpfueVUvLRqgz2bYeSZ9WyG8pmTbuoCMNdQ13IlviR0sQiKLu3ozJhBF8A4fV4kGCXA
+        Z7U/fxcnUH/alBSIVK5q777jYfFHuGJSrYR4APt3UcsEkUyNy47X2dd3PfjMw9HRfV/+8p8feOC95ma/
+        6BJWkGFmuqQIqLyqtM7fcyNto/s9+8wu6SK1hQ/3x1zZwdVePCqAoStHDovsQpdNCJDSZRe6dMmRAPEC
+        GM2JS2J/ujJnXOjPEsMk65nIqTVHwxKOcOVXnALs414ElYmsrGtjb0FW14v2fuag0GWaiCK4C3aMIXaA
+        Ie9DSqLz9tvXXHTRyYiId3t7/aIrmhm0Ir66z7xw5IBV4ux90XfNrEdE9fFDMVe2c9VEDyq6cliaogtg
+        nmiNCcPuymOBoEtqAdfaC2DoMunGs7M5VMV4UhwyqmciR8ZPAa5t8VS9t9tdBVgMMF+DHu+SyMUZIclK
+        iU12bhF0wTgxISFp7tzdV1/9flLSu8uXB0DXyGYor2pwYnt4fFF0ep06ecMXzax8ZgQ35op2rtIn+0V2
+        1VF4hMLymHLoUrCnNKDTZfni/HoBLNVH48noRGD6Ux5ZKUaeOTEpk/xzeERUcmoBFH3fJaaq92KA2WYy
+        m/27kmrWT0VBAih5kZPBaSAXyDdsoOY/oY544XkmRUfv7e8PIl3rlP5VG6RdXu/N0CuAep5Zl10YI6ap
+        ienhoQ7mM86RrNPlR0ysoou3RAVJyS50GbhdPgE2nnvP++rP8GRejExked10mHM0PKYtN782ALpILQaY
+        SzYRBSsigiKKh1kmEY97ydpl9gGMJ0KFnG/w3vkmITb2jZwc3ztvjDyz0c8sdlcKiONT1tNV9Oq9O7ur
+        R0R52QVR9+RG31aacmezkl05Ow15ENmFLoMasGhmoYtagrcXwNLeTKWBwaaVN2YGVlB/QivzZWQii2uO
+        hiVa14pVp54l5te5GThWYeU7o9IbaE8JFl28KkwUk8I98z2fh68KMPaYxc6NEM2zJbxw3jxfuubsVQSX
+        dAGc3P4Hq5i9dKe/dNEuE8tWOL+/iCvhh+3CVYYclavonjhxgpKDTpdwwyfAKHqdLkkPKnH683fxUIxc
+        VUrhsdAk61q/6ePuDN+fR7R5x2FpiQ0iXVoBuVuaKJBdnE+XgNmxj9Jm+XIUblNWlo99VXrXnLtsRkJ2
+        fUjxlqahfT5qZhUOiVcVf3W78/JFXDpdACMAIrvQxTFCvSvZhS6DfRteJJh3x1VTsgtd3oiVqz9dmZDJ
+        yFUl5B4VwNt2nJJg3+minzdttwrm7NkNYjaDD4ndJb3K5/cAmPIJ94trja4zzs3w0Jth5JmpIjCz9Kuw
+        XMTu1g5ad1S6+LjRm2HUiIxclfKZnZe3yaVkV04rRdIUXdBYMdWMZlZ00UZeAPNGmHHRzEJXAOvPziaN
+        ZeSqEvKOhiYf4xLAftFFavGtrLam3hNBiYgk5EV3cf9EiixWz4DZVE/4SKnbZdecff+uvYrAHlrhSiVf
+        8sxVA0e4o8Le54zeDACzM+rxmYGCMXJVymfWAUNEnUWLCymyCxoGusSgi07yDpg4WqfLO1rbHXM+fjI6
+        kYaRzXDGZckj49iNJk28EhHhuDLUiUacBcpU2uu7M4Dfzur+vQDGtMy+a47WIiJdRMorYOrkzKxsR7Of
+        m+GL3WXFI77Q5RvRyQKYr4ZXdcMNN7CSaMaALhsArr/+ej1XJYAJrGUyYxYk6nSRYPxERRdG/FOXXRj5
+        CljJLnTRCdyk/tx7BVhlMxLyj4amcB3ZvPWAvvceBXLxxRfLEaAyXJ7g2zuxf0H1s4WLrIfWgJY1jmol
+        eNVP3/a3N4NbZe5wo7wCRua4Ixq2A6MrgsvZDDDmjwrgkt7D8xveUoCVZgaqXiPC8FHjM7IZrEvn91ti
+        Ll/ovKxFya4cNkz5S2QXutwXYYLYXegIXRStdwnGJolmFrq4bQKYN+Lt0AlIobEXISH/WGjKca7p7ZZ+
+        VuU/MtjcuWxBkAqgHPCqZzNYhslpuZHpTXGphbIHkOOoYMxf9PBME68VwOqiIvwsKmBeARMRIE9Mjeee
+        SA/1XQAzMAcKcFbDhpCa52t6txudNz+bGQixPFL8pz/9KVkXI5uB3XVe2iqXnBIudBnMj6KLI8xaMeiy
+        YryHSdywThfAmDRFF1rEjnomksRCfPaWsKRNoYlb1qzbDjwFmM8EYNDSfsDhzAxI23NV+YVlUQVjcXld
+        siOWGAYFJdvv/drhqeq7VOzLr722rb6eSAlD5cEGk9uTo61xynz3qlxWEUg7iPgy786EjOisttSMPLtX
+        hXiwymWwsOx0AZxwTZsOWOgKYJFdiWN5c112JdLxCbCSXegSWTPRIrsMtK4AlngIu0WVKTe/NLewJT23
+        u7bO2n8ugEUn8yt69d5lJnLbTqt3nEZo2b8rsivHYfurmWG8JCzMqtj/5jclCQmQ4JOzZF2GSdwLGXXQ
+        slcDTeuu49Vzbwbideedd/7617+mK0GelgKhuJzWiJzBzLxKva8K8MguA52M4Lqjy407f1Af88Oa+Bvq
+        8Q8UXcnMKLoko/gfpZmFrncvmlXMXIhmFro41Uy3oot3imFT0S6qklZ4MHBEffPCttzcfLSicU4kN8Nq
+        RXwxwPzUZa6Kfbcw3rx9v5yswG58ffu91xONRHa3btxI8WDDt751Mizs/ejoV+Lj81JTmXHkGH5GooPY
+        hpXHGuLzyxN/XfYz+9J5Q07YiHdTO162WuHHpvVMJGjZi8VUoJkZfM9XI1dFlrC6vDZ7fnVRbF1JdiWZ
+        OD6hPIRFnt8gsgtd0smE+GJ3hS7JKO+AsYgA0OkCmKBIZBe6xIsYD72fmSBhx45dfQMTheX95dU9iKDs
+        eJQhuojdUUwx7wxghj3eZcmHxRVwolHAdnf9yEj7RRcd/f73T86de3LePIux07klMbEgw+ojhwEZSnmw
+        jTxfjkXDfzLpmI/Z0HWZqwpvtlKVoxMb9L4q5gHpRHwvu+wy0cww1nNVfDCMRX5ewaKWdnQPWTbWuqLL
+        TwGh6FLxA7BOl3QyjLyoaOQAPalkF7pETeS2FF0pX+iZSHjnFtQ5kkbCkjbUtu3W6dq9KlqrcKDs8W7V
+        sLXkuyefCczurmxosLb7XXfdB3ff/cH995985BGLcUQEjJ9LTOQhp3XV1YipPMeEWQYtU0MoNUvZdUm3
+        b2QtpU9nwYBOF67MG2gZCC5HXSIqd9xxh56r4rNR8irLrS5Lq+to6R4eGkG7yIqUZzng/4rsQpeavdrd
+        iuxCl4EEegEMEhiLZha6vCmDzC0fSOhSg8Sx0rMZSyePhKY/w1W+8JiSXfGWRYKlcQ4PCy0tm20kIlKj
+        fbm11ax29KUAvKrRxEQq9n+59toPbr75g5/+1GL8wAMW46eesgq9c+a03XxzXUYGRCXEROUwI7LVOuiy
+        i06uH7TqwQU9zxpdc3r1HsYEwUYmUh6eVZPcHn1TWcw9uYkR6cy5osuPcKEVXQADRTSz0KXih4b3AphK
+        A1bHoIsXKk6B0OVdcE31eHfdpsOh6c9yJZc8rSqAKqEh4QrvwDfuclWja48yKZx94ZdXhdG1tvt99asf
+        Xnrph9dc8yESPGeOxfieeyzGjz0W3BqRKuB7rhFldVod8M1LdrvLRBp218hmlMztcn63masppV+ny2/p
+        dPneoIvBxtvwAhjlzBvpsgtdAgmMqKJLwMfSM6r3EZlI8LOhGc/u/Nspc371ZqA2ouIywlMaJzYc8nCy
+        gt55w7noHd/+9t4vf/mjiy766Dvf+fCyyyzGN9xgMb7zThifFbpIsBjgkeXr3WUijRqRkc3ImLNIAPc2
+        DolmloGyEc3MoGmOFlpddqFLOIPp8QKYdYGhUppZ6DL4ECK70EUz4L6rYFd85uT8ybCYSsrUScnpetec
+        7/XdmhFrz1nl0O989Jlbvv71lz73uY++8IWPLrgAxh9econF+Ac/sBjfeuvZotu/dGNEVFxsekVgdJMS
+        k2iccNyfEjunfGz4Y7oAZloUXSgysUozC10GmSXvbbOsGhQ1dlfRpb+L5aPokkSk90UBFp2cmJwTHpkW
+        FtfZ3LHRL9lVXhWyC2DiJTkC1GuuCsdq4ItfPPn5z3/0xS9ajC++2GL8/e/D+L3rrw9ufdf33ozq/lMG
+        2KgAGr0ZUt81ZBeHubG4PfIXWY4nnM6QRCW78jAlJllkF4TsO8HNFrur6NLX7L1tll/GCSLe0umiDVCb
+        IrvQZZAu17MZ/O3FY0dDM5/jKm85HnBfVXz765ZyW3PEK13ZA0jGauQLX/i/f/d3OuP3Lr/8bNFFaiMX
+        Wpsz2oa326sInjWzJDTq4/qclzRxlT3WpQDLg9DQo4ouO8eIBQy6AEazepdgJg6copnVs8rI+GDAhS6d
+        XXzPy5TDzDdrNhwUwM6CZwPuq6odOMC5sQVdR+xPm8L6utxpMpKQsPIf/uEU4wsvfP+ii84MXfawM6iV
+        6bmqRSM7oOtstXrLdZ/Zs1el56oK7u0QwI1JfQJY6KJW5bQzZBe6bN1GxnTZxY0l6cHLvAPGe6K3Qacr
+        x6yglhVdkgN8aCMiSih+LjTrea6V6w4G1puxbss+6Rpfv2W37+czDzz55OYZxu9/6Utnhi5KDrqgpayr
+        56riSsaiUirqBvYHRhejG/e/GmP/ZyOA+9uHFV0AYyJ1urhKBl3qbzhJJCK9AxZHWsmu0CWrgoYR2YUu
+        yQ38aiMiqu08LoCbe63DYAKr3hcPWF3jnAdpPKGVkICo39idrZ6LwMHquz//+TNDF7Rknrl96JK0UcFu
+        39JTexqWTaw2KoD2eFevEalcVVv+AHS5Mm+2QkqRXRlYPSW7iC//FK8KtYzsQpeBOjEOU3K9+YwlgH5X
+        Jz+rQxqYXEUXwCQKVBVBvKplU4cEcGLxPt7Bns3wpb6L7MoWh67BKQmK4CpHkXFelbunXtCV0XHbbV7P
+        ePWleu+1Wx3AlPz4PChJPVcV32YdcSji67JG5NKrUnQp4RQ+3BL7HQtwTbiV8VWDySSuEc3M4OwUVLFB
+        l9Q93Q1kQrxLMK9gIsgxKdmVjYR4XpQZpJDJvfE9yPWIaOeuvVEpvdYJHRGOlJQ0I1flC11RyxVdW6Pi
+        s5I6XhO7S0KO2eQbTqqSw6rUKaD2J8UF3Ffl4z4iBAWdzGwivqRdFeCCqm7oxrS8tnzFVAB0AUZWnH2F
+        DOfP87qqradRyoAuP8W9UnQ5/QglqssunweNbewdhaNbCcYMo82V7MouFcSfzgdFl0oqesaIiJJSC8IT
+        u0Oyn27qOxbwqShbt+2Q4lLHcuusAYacRgZXQnv+qP7EGv05gKebLhMt7VRGt/qSZRvQOpGptTjPgdFF
+        IbfmLXZeUht1Z2bMvESdLti4L50usA26LA6SmmKnfZJgzDBmQ23gV13QfHqRXTmIC9kyIqKRFYdCcl4I
+        yXkxpvh5BFoY+y67yu72TVo9TdG1h9rau8TuoqgffvhhMjVni67emyH9cjKwuAgunzan67mA6QI47+dt
+        sd9u4Kp4vFPJLnQZqFLRzMguh0vKXm2xu8gudKmaUIa3n2boVoLFDPMLSnaljRLfWNGl7oEZtp8kCFoA
+        cw1PHAyMrmjm+Kr1jrRmZ3LeyOhS4/TtM6+Zjc4bRddqxyzont/wJgZ4fOKU6fUl3tVrRNDtqV8S+636
+        2G9bV1/zEtHMMvgpOBRdDv8lq2/QBbDdAHtS0fyMSWSWlexKExZVQgwPsit0ZY+eEREtXHw0JPdFrrwm
+        q/YXcH23vmlRXHpVRMn6ov6Xz67ddUeXe49LzolMa4jJ6ehdstzHXJVe31WpDKTWAvyt+oK723S6VPu5
+        d50u5ULMrS670OV/ZB34qqJ5HWESlkY1uKseHe5W0QUwfRFGRLRlet8M4JfCnFV1DW2B1XfF9PYtmWAL
+        F9ovKatKHgl27sgurjIWd0HNS+FZfTkFFQZdDArVwEsvvZTWFJcRkV5FKCspj7w/yXlJNYBbcxcr2YUu
+        g5yxaGZkl8EMGHT5W0Q3KEv/AJM3YVHICaeKrjzCQR1IzTc492RF9IjI0q4p5ZY76IjLqljrtb5Livvu
+        u+8mBHKZq1q6Zl9E7jA6sGXs2DlFNyklXcK5qsX7kTkjVwVdyTMDGMx6rkqvAIoEl8bWhc9nO2F47GNp
+        JJMFsNCVA8sUXU7fR3Equ4vsQpeGMpf62YuK5sdWl9PWrTpdyT/TBYHsCl3sAflPIyIqKasJzdwWkvdS
+        SN7vptbt83rGK4//U6eqi+zq8S4n5zOPXJ3jh8+Mz0yki5S408wiu9QEw7P7Mzued6mZAUxSSGQXABzj
+        6FIzQ3dkyWjq1U2x36yLuao0JTJTpwtgpEunS8edna5EFnbx9Q6YegPehOrOUdUFOgIUXQDjaDDvxl6E
+        woXPhOT/jquw5RkP9V38cJ7WKmGuGvZsRtdyy6nmikst2LDJeji6h4iI9jFfdnjaq/f0nIAWrta+4aQk
+        clVGTySzgYRVLD71+BXoimOle1VycjADwaXPSWT3uuuuM7wqlWeui+mK/UYtV9LlDcPWNuZTsgtdXoPz
+        LJoZ2eXRVcy8+MxKdlk9xDUu9bN3wLyCv0EgpGr7krrCq6KBDbRClwwZn8aIiBBcAcw1uXYv6tdeAaSH
+        BtlFvYCWj87x6vzTODlf2d3u5Qcd6QthnNLxyuTa7e72EclxGcbJ+Z5PNCL0ksoBgKErmEErzznTc1VE
+        RKl1m8OK1vMxwGyX3V/NDDqtIErqnq/ILhE8X+2aGcU+0DmU+N16AdwQ363TZUrRizpdRJlygkGXDRmy
+        PScQCRYtjbgo2VVRr3T2Cl15IhdiZ/jMyC50w5J7eSoWL7NXAOWxJvwJ3HKesUw+kjfhkZ7ufOaJNTvl
+        FCo8L3a7uNxpAlq2jKIejXMzPJxGJk2vcEVqwcA3yAR7TOzZDMpEVv92ybr24Wl3mlnUMpi/973v4YFi
+        MqmxuqRL5cYR4Yi6IzP24tqM6629kGJ3ZYCf+Veyy4MjWdN2uuhn9IdLuj5JMBkP2XesZFeCIljy6RVd
+        eVCiERGNrdjqsB4YHB6aOta79JC7CiALELoImXAFsIdc1fqNmwv6rNM8wrIGqpc8s3qddbSr3s+sDjXy
+        pZ9ZtVYhGWgOMEgm0q6ZK9smpRGHeHdo2Vp3EREii1rm8yOy8POgmeHXXTsQfUuOtWMv1Nmc26nTFbdG
+        pwtgEV/xqhjILj22zLyHBwl7SnSoRYEooCeV7Cp/CiEW2ZXH2SI3WGLDZ84r7Q4peDmk8OXI0pc2bNql
+        Oqr0E3xRy6whRZd0lddcVXpOmXiwiHLt0PFVazfPsoqATsbuuvSqqBElLbIKXFHJJeSqvGYzgMogMNVN
+        r9GbIYmqrJuaYy+q4Up+NNegK+Irdlee2YyVtNOl3uAy/FXsfAIsQqxaq5StReWCVuhibxj2nSbbtu9K
+        rH4hpPD3XNkNB5AM1oFxPjMiyyph1d98882+0BXNPDy1K73LOiYhpHgazOUDz6xYvZnP6btm9rr3vm1g
+        Q0bHqYcK06dRvWjC90wkEkaP8COPPKLHu3oFsHp+R+xF1Vxx36rtaRxQgOXAdNIPOt2TJ0+i5w3ZRVeR
+        kEDw3Olnn1S0/DKzhnQq2VW5CyZU0YUcpQheafjM46v2Qjcsa11E2kB5VRNJVCyc4TPDmIGS9Cq7ht0d
+        mtyZkF4mDnZo45txybnsRGIZBXZOJDoJk0nvOB2vkl6m0RNVgT/lb42Idc/s2+miJwhAFha3Oy+uiv2n
+        aq7aqI+Vs9BFkZDZULILXcTXThd3mmXh7qF2As4nCZasFjevZFfFtcgimUtkV+jiWmNQ5bnVus+cWdCS
+        XVDb1d3f0NhSUFjMx/IQEQWQzeCMV04dCy3blZhdx7Qqusioj2fNcXdid6kiWIcRLVortb/yzunR5WsC
+        q+/a6eKWwglTWhBWGXNLTuylpTlzmgzZBTC7DnS6iDKBn253xc/wKr5+AOalaCeoKNlVLjHRpKILbAbT
+        odPlBugNgzrC19w+El84tWrNRns2w1/ZtZ+s0Nq+OCsnnw8gp4DywZgCGHvtVicQQnlIOITkEbzV1Td0
+        jGwLuK/Kpc+MWSWGxr2vq6kb7B8caBtKikirr7IeWsYQ2WUwDzrdDz74AIG208UeexVf/wDjqnH/SnZV
+        wxSo+EvIrtAlOUCei0+p+8zySL4lIyscaT0hBUdyW583clWzp2s/zgjGvtA1HGY8I1RRYB2v7nJVenG3
+        cH511rzisREru1BfV4/G1umyMkhMileFZoYupQVSV8pnFtll6w2BpWfr65+KllcjCoRiSnYlhMX7RZjg
+        KnRpvJY9XvxU75qjHF1YUhtaeGxByStcdX3HztkK4Gmiy5w0JXTFfa3SeX1OWkxmfV0D7ohOF/GlL0en
+        ++GHH+J+2umi530RX/8kmFdLF4CQU3SlewZvS9HFDKOLUOl61xyLgNXQPHhYAC8ofaVx4KgqEAVgd92d
+        E+lj542HPLM7zUyXORlmvtq71X2R3ba8nrivVlrX1yrTf1WSkpyCaVOaWQJfgy6+lZ0uJyZ4jn11p9pX
+        J0v9DsyYQYMunJBsPiKyK3QZ/BOoRkQE47y2Z6G7oPTV0Myp5Ixi0mSfCLp4viSnQEsaUlIZ6twMr3SR
+        trSE9Jjrs+O+WgHgzGvrhwasudLpYv5IayjNjOxSAyYikGyG0szQxaHxkLoyQia/AdOOy01CVGUT+R5I
+        DKygoBW6kmyTrgHdZ968ZVtOy/MhGeNWhittSdfYQSkQqfcJoK8KA+/XcxF8PI2MxjZElkG1lcGTBbh3
+        yTD7TpdJ6Cxf7Lw9wzoW6Yas9KtqB3qWGJqZJCXRjk5XlLOdLoDRlKhSD7HvrCSYX6a4xHITzaxTwUlG
+        uSm6fGjuTVJUhs88PDIW5UwMSRtaUHZiQfmJztEDs6HLufo8DfDHP/4xf9prx6svmplPLgkN2b8LDOpC
+        qFP+KYLLP4n+pUzkrkakHKu23J74r1fEXVgRfUtGVEhMc3WrQVdOWjToEq24pEv9g2n3ka7fNli9LzeP
+        +jXoStzCPXMDQpdB7gbqdp95cGgsufF30JWrqu84OoAl4u9Zc6ClvxDxxbFkdXuNiLzKLrl7QEoFUG3Q
+        Rjnj18BVAFPDJy7wSpdJaIrvjLugPO4frSv10urGyoV2ugiMQZdzdEhiGJqZu8MeoxrdFY5cUvdbRcu7
+        cEQL9wkMqcuq04dwfJhrlZDjGxa4HDxj95nXbZxObpphXPEalyMyurikzN+z5niQmChnjqki6vV9D6DL
+        vfcESNJnI/VduJLVQglR3EUtY/wwwNwOhQQk2LPscupUZERk/FfKuGCcfkVNX4uVj9TtLrJLAtigyz/5
+        o3a61Lj4o7TI+S6+gUswv0mbB3Nk0JUMA1IiuXWhy2A1MPX2bnUY57U/B92w2CJMVFLzyytWT/t+Ghk3
+        LI/x5M0hPUu6Ks/M6RkMAONYQVR8ZrG7lBCgy1fPdEeWjJTd1Wz1LD3gBHDmNTUD3abdhS6KzaD70Ucf
+        8c4u6RIxI05+0Z0VYH4ZnGQSVEZJPUWGiUYt63SZI+ZLqlJ2nzm3eizSmRxS+vSCytej615ZPL7bx3Mz
+        ACyHf3J2ECdVySmgLk9F8aqZjSqCCLH4zPQSMVDLnvuqlNHtLl+c/b2qxPNK4y8ujJwfnXFvET6zXXaR
+        DTJWks3ApWJAlzl0SZe8Fe/vOe0cTBUt7yUeNQIkBRwVgMoUM2Uiu0KXoSy33Wdu6lkfVv0agBdUcb1R
+        3P0sFUCKzV47bwAMWjysINIV64tXJbIrBzJ7pcuGDxg0PNWW/D+Kk75YkvSlEhgX3FflO12yhC7pYn1J
+        H2EW/RXf2Uowv0/mRRgbdMVZhahOF7FGq7MUXPrMg8t3Rde/IoAXVL8RWbQuMjJK5D6IFUAfT0XBpWKI
+        S+VLREToEumIzLgtP/kLxQI47evlC5NOlYkMu4tmtssuGwxc0mX3IiUKHLEA6AYBMG9BpwcgxRCqCqtK
+        8Io7ylehy+BHvNhl19yqtZuQXQFsRckpi7LaXxhZYbVruTs5P1h2N4C9CKprbqh3qOa+ZufPrN6VlBnA
+        BT+q6W8fNKoIYMbuEv/Y7S5y4o4udSTuPTC6wQHMu0ALfna6ahO0Thfhliqeu4iob9muqJzBKGfKgpo3
+        uebXvlXU8+zgyHLS6+A8fZlIYex5h6eqAKKNqcBTYmle0JZ5fkna3xWm/vfCyKeiE+ak18+zIl2XdO0R
+        EXYX3euOLg0bfJ4ATK9aEAGGSfYFJUesqjQC3yu6zJoARnaFrhR5WJjuzmdeuWZTUfseBRjG4TGZFPOX
+        r9yoVAVvGFy76ztdKw5cMpoQkRD925j0zxek/bcCAVx4S2Vv3WKXdImJOefELrse6NIdxh8ynujtrygH
+        DTCrTIyudCLqdGXi+B+dLpxE6+oOs9FXhXJGRUM3pPwY2m9+xdOh9W8V9jw7MD6Ny8P9Ey/y5l47b3y0
+        ux5kl/5+DqCRvM1gy2DdLxuzv1SUdkG2pZMvzAFw3nfK27OsjiWXdPkA9kwksuvB7uIBoNKN3dz+0g2a
+        ilZOtWg5O11xVcAvsqvo4j15jYh6l+2KyeSZ4FXz696eX29dCyqfS60YzcsvJBcvpsH+XASj43U2FUCE
+        T576VptaW3FjVdZ/zs36L3mZ/zUv43P5MffFJt2b2jS/1eh41b0qjK5RRZCIyJ3PjFdFaYFSRGBus7EI
+        gibB8r6sOOVVKZOmHFEMGP8pypkhdFV60nNE1LJkZ0LrHwRwaO5ERUNfS2s77iXvqejyh1Tnjd6tHgBd
+        CeIlm0GdW84kqU6rSbs4QwHO/3pp/eNNS7qtrUQuZZff5SAbowLoOd6FLkERfxG3KwB5tf9KkAHzB6QF
+        U6IjVTdVk4WKA4OEzjpd3DSpOXqOiFDOuYsORyciuFj0VWSaeDcFmIQiipQ/MRu6CJ8cYaByVcSglJIQ
+        Ke4o4Y7ErM/llnyvYlF8h7EH0PCquBejN0OyGfB2l6sSusTfdMAFhW6QVbT6TMJYDyJVj5KqQCDHSnaF
+        LhkuyWUC3kNPJNkPjp6X1YBgKbpAZWrYaTEbuixE1gfuOvVHva+KWIX/p/xeV1HXWNBo7N817C4fwOia
+        U7kqqggsQXc+M5oZ2Q0i3dMFWHS1yg8YdEWhISgocylXKLpSVaRHAMx6akyvETG5VHKYC9KTwBbA/mYi
+        PUdEfDyja45OOep0+HSkDNET7mSXz0aK3uh4VXQxxi5rRFQRkF28KlRFsDRz8MMku0rBv5dspcSOIruK
+        rkT9/A9yLLKr6ErXLV8Brze9GnlmYlDeP+h0XVYR+FvQRaw9yC4fmEkwutWFLr0ZaBeX9V2hS0TAhPhe
+        xvddgQffBut/m9gAKu7o0tyDYQMzrzHoAhgnU3Y6gVmqGkGpIviVzVC5Kr0t0ti/y2vopeKujX1EqopA
+        gc9l5w3mVuhSz+ZNZh8RuaR+egHzJ2GMjCIWhuwKXQZ6iUQuWhF1rTrmha702TN9FE1lf+npjojc9TMr
+        9aPT5cXsycOT0nd46j4zt++yJxK0ii7WHVs2y2yGB4E+7YDlbwOMRSrRISJr0JWGatQg4oUBttOVo7hI
+        evMjBBqTfGY0sxJcQzPzGUhLGScrGHsRWI4u+5kVXb4hzONls8lEetXVZwgwn4O2I5a8B7p0U2Co5OEs
+        uuwquvJIRHnyJaTxzsA8S5/Zx74qEVzcew4O4xAy/cwbu2Zm3xj7X+x7EaSpSGQXZw3VFXCNyCvXM+Fk
+        uXS7QMJMKc2sZFfoMuhZpIzP/+NeoZztdJkUORdGjv9BeyP00u8X9J0mCC6rDWOBvHISt37WnH5uhr7D
+        kxjavktM9iIoujjkvHNQElVeSZ85CVYfRZ5tJjshRDMbdAFMYzfWC94IKJiV7Op0cV7I5TKQKo5cZGcN
+        ko13hv5E1IAdWAWQ30U3sLCIR43zmfWz5gy7y9/Fmtr37+r9zAAmApYuhtOqlnXqZwEwf55oD5OMuvZA
+        F8DMBYkLOTuAZeGZLkLGgArZQcyBDERcLLc45LwJIRnzi0OnrAALiHfmd3man/5ME/1sdXeyCyfeyuW5
+        GfZsBpt3cEHQPV7FLogvODuAxbtmxhFlGCvNrGRX0QUwngjFHAavxCUBmF127XQ5PIxlJA8HIq+kP/de
+        f/6u/hxA3+nCHoefz2Y/0cjlThPKuugq7IhfHa9BwXzWAMun54axtVhlGHumq45eI9uAe4IiRRREM58x
+        urjNyD3rzH6SoDu7y/+jh3Dlgp6i8hH/WQYsnxJdihImdhLTK5pZl12dLs3PctAtO3rxyGTnBKpYaebg
+        yi7CimnHnPMX7Sf42s+8UZoZUaZEQXyPl+AjjNPxsnMCsNwYuhdRxjDD2Be6FHwYeK2UHBgsC+w6mRCE
+        DOEOWDOjz/l1NAR5UBaT/bkI9nMijYhIHv6MucX2n74Mho+r4RwCLJ8YWRT/C2DYXXeya9BFVqgHMKhD
+        0CpFxYZBVQARl1Yh9RXDj09OcKX/Py9AeaD87U+Ksz8XwYPd5UesCaSWRXbW0cp8nnOA5WOh1lDaCAGY
+        4cTU65rZF7rsAyDclIct4r5SKpD2ZoIZMsP2596r5+/anyXmi2ZG0FmOaCDiqzMWAvkixOcoYPnocp4x
+        AoELiiiL3T2n6CLfKA+8B7SO/bR1XwCc7tec04Dl5vG0SV3h5kCalAgCreyuS818BmQXrtgC4YrOP02F
+        oKCw/wQAVvfJPOLQorohTSIMmYa0YXdPH12gouH5o3BFFRMHn5lc4ywxf5IA66TRh6SQyJNgp1HgGGlg
+        B50u9hj7jXEFKquKkB1d8ongqubqEwlYX9SINbBJEpFMkMMFgEGghaiJAsfV8upV0f0jXhi/gjcnJ0HJ
+        yeufRKj6/HziAc9Sg33qf/0zwJ9yxJ8B/gzwp3wGPuW395kEf8oB/z+k1uETiaDc+AAAAABJRU5ErkJg
+        gg==
+</value>
+  </data>
+  <data name="cbCircular.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAKAAAACgCAIAAAAErfB6AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAUGFpbnQuTkVUIHYzLjUuNtCDrVoAAEH3SURBVHhe7Z0H
+        fFbV3cfv51OrlaE4i1ih1moVJ1pbRVGcdRf1RQUXMrKe7D3JTsggkxBCCJCQRUgCYYYlK4IgsnF111rt
+        fNu3S2W87/fmT4/nvfdZGSSRej73wyckT548937v7z/POdf4y1fjjL4Cxhl9dl+d3F++AnyG3wRfAf4K
+        8Bl+Bc7w0zsDFfzHP/7x5z//+dGjR9/uHHv27NnoerzxxhvyssOHD/NbH3/88RkG/EsPGJwffPABhDZv
+        3gzHpUuXtrS08EVHR8dbnWPv3r284P1/j/c6x7vvvvtO5+AXd+3atXPnzm3btq1fv76trY13WLNmzYYN
+        G/gRL/vd7373pUb+pQQsUN988821a9eCc+vWrfv27fvZz36GBP+7c/z5z3/+05/+xMsYf/jDH37fOUD1
+        SedApr/tHB999NFvfvObDzvHr3/96191jl/+8peo/+DBg9wimzZtWr58+erVqxH6lxT2lwkwYFDVunXr
+        gIrgMKoQ+p/O8de//hWd9QrdX3QO7hXuGMZPf/pT/hAqB3Zra+uqVau4sbghviyy/hIAhit6gisX98CB
+        A/z3H//4x9///ve//e1vfUD3J51DjDy2nQ+wY8cOPgnGHO+OARjgpAcuYGws0kE3XE38KAb2n//8J2j7
+        ka5y3tjw/fv34xpWrlzJx8NBDFhXPRAB4zgxxVw4kcinn376r3/9a0DRBfCRI0e4/w4dOkQcR3y3YsUK
+        zPgADMIHFmB0sHv3btBikzG/oO05XYIjDICE0/IF9w2DP8S/3ElEVXa/a7HMunZ1ugDmo2K3EfGWLVuI
+        yDDgA8puDxTA3PtEqqAldcEIf/bZZ12lSwCM2SRBwjvOnTu3sLAwPj4+ISEhMTExKSlpZudITk5OSUlJ
+        7RxpaWnp6ekZnSMzM3POnDkLFixAiMTMZE1gU37XI10A86dhzO0CZj4Amh4ggVj/A8bXoioSHuJVTPHn
+        n3/uPV2URzJTX18/a9as6OjomJiY2NjYuLg40HaJblZWVnZ2Nm/CyMnJyc3NzcvLKy0tbWxsJDnm43Hb
+        IVyn2tXpAliMBO4ZzMDud9/cz4Cxn6gWf4ZeQeslXRKV6upq9BcZGRnVOXqdbn5+/uzOUVBQgDEoLy+n
+        AEL1A2VjlpVldkpXvAAu4PXXXwczyLmJ+yvY7jfAWDDEgTEk4Tl27Jg3dLm4dXV1CDQ8PDwiIqLP6BYV
+        FRV3jpKSkrKyMkgT24PWPV0AcyNygtwWBNvYp35h3A+ACZIJONvb26kuHT9+3CNdbgVMJX40rHN0gy7G
+        FgnimBl8Ma9zVHQOrLHFMlu0q9PlfXDVDDDPnz+/ubl5+/btUsoWy6y0K3Q5TVUHxVBBuu8tdl8Dhhbn
+        SYwKWo908XyQCAkJCQ0N9YYubLj0TU1NFJMpdWFIpeCsPKg4URkkOZLnMAiRpBZNGFxbW0u0JZbZFV25
+        UeReIQJA0G7oEjwSKEjhE4vdx1LuU8BcVqJcCooe6XLFubjBwcEe6eImlyxZwttCS8JdNbykq3wqLkBy
+        Hkl7CJQIqnH2WGZduzpdbABSZvAZuD8QrkW7ii7pE3LnPZEydrvPvHIfAcYsc4bc5vha93S5sgS0oHVD
+        l1C5srISSwBC6Q6pHlGv0FX+lftMBuESBhmQTunyYRB9VVUVdwPGQ1lmC12MBAPGlF0ZfVMV6QvAVBI4
+        H/49ceKEG7rUBxBKUFCQG7qYRN4KrtL96ypd0l//zkF+LMKVeFjXrp0u95wakF62bBlElXYVXQAvXLhw
+        0aJFDQ0NvMwVXXInfiqtST7/6Y68TjtgJMX50BhwQ5eiFWeLl3VFl+oEnRyMsL2z2yXt8j60ibCQRODd
+        oCvxlIRUOAXMsp3u4s6BlHHn6FUss9Ku0GVI95roGpN+WhmfXsA4Xa4mcbIbuthtIuTAwECndKk34bTg
+        KsPSt7fQVU730KGjG9fsX9e2LyYqaV7B+syIbZkRWzliQ4u4slzWyJD0rLDXM0M3l+etiwqPb2t4c92K
+        PXve3CeZjxq6dnW6UvVkgIqsSWlX0a2pqQE/8ZeEe2KZdboEXDLNhBdwB5w+xqcRsGQOJ0+edEWXaIsr
+        4nA4nNIle+H8FVr3dA/ufycxIbkoZ9nsmR2Jjm2OiRvN4782+vsHOF5c6Hh2g+PZ9Y5n1gdMnl85f9H8
+        isqAF0sCJ6zjcLxQxWsCn1prHk+uiXu5PS96c2FGQ1xs4ps79yrATulK5MyAEB7aQpdonEHiTvea+8Ap
+        XcIIbDXFUc70NIVdpwswHoicxA1dtIhHdEoXB4mjlS6sG+2i1927jjQu3psV2+F4fnOAT2zA9DTHc5vM
+        Qwf8aokC7Hi+KTEhNTU5K/D5mlOAXyrCJSvAMOYImJIcMD068PHVydPbFxdte339biiKZVZD0VXdCzSK
+        9xXtKrqImG+SuZH3i2VW2hW6DH4EY/4lFO11Kfc+YO5EzoS5EG7oYpdIbZ3S5epg2N3T3fPm0fjYtMig
+        uY5Jrzte4NhsAp5SCioFODNq2+ykjuiImSkJRWta32pfeeoICQ4l+VrV8kZ721uY5ZT4oqjwpMKELZkh
+        m0OeNumagAPQfSGAAx9fFfiYeUTOKIkKS1q3fKdqSSnA0puS2iQDYBAV7QpdqjSYcQa+Rs3+0+lKUI3j
+        oCDf66F1LwOGLh+d6U6u6DJDirQStHa61Ba4aqpPZ9GupLltzftzZ+50TN7imFZm4gTwvxknh68JD41r
+        qdu7bfMBVc3Ap6pqhquoCjusnO7WjW8treoID4lLcbQouoGPreRvBUyaHfRIW/Jraxvnb3tz11vEFkq7
+        iq4wpqYBLQtdREz4TeTFHWCnC1pueu4ApNy7jHsTMHSJJtzQ5Uc07+x0KSxzboLWqXZLS8viY7MifbYH
+        vLiVwwQ8eQs6C5u6qihjV0v93gP7pdlzquFjr1V1I2bes/vtZYs6ihM2h01sMm+mR1cAWI6ICaviozJz
+        svN17aoqB0VKBhYboqJdoYufxh+TDqBXscyiXaHLgC7ZBJeiF211bwLG77qxzPwIkHa6NIWUcHW6XDv8
+        9NGj71VXvh06o1NDL7UrwOg4LjaZy+FNJbIbdPWoCjax0QnFCZtCn+gE/KO2wMeWmp77yZq5KRu3btop
+        aKWGpYZUofmEOl0BTIEMnHa6oGXwU5D3VszVa4BxTm6iKkylU7pUBjC8du3yfZq7RQWNkX4dAS9vC3hp
+        W4BfRIBPKiKuKnuL2EpNbPZYZ4YuoQ2+kIHllDoG153RpYzIjJa37F44+/XoZ1c5pswM8AkNeng5R8RT
+        bZXZm9pWrCKK1ulKPYuBQYarDOhipUEoMwt07QpdPiEfjJ+i714JuHoHMJUgPJkrv8uNTEnZol2auNJ1
+        sNBFB8yvwE+vWNEWGJDgeHV9wMvbYRzpaM3PXQBOKUZ2qc58//33k2QzaDVCl6xMDWHsMd/VY2Y+YW56
+        WXJArQAOesg8wn0z8vNmU0PFDiu0ImKZVQ82nS7/hSWMxTLrdAUw9wFGvueMewEwl5tzcEWXHNEMSv9/
+        VIUn5ma30yWwemvPgZjo9G1b3yCdyM+dHzB1CSJeVr+vJ10EAKsuAoDHjBkjXOWLLtHVY+aVS3ekTl0D
+        3eAJVQWZVZiK+rp6JpUQKqtytACWsqWYX4bQFagSWyntKroi9J7XuXoKmAozSZGrWhXnZqfLxCguq1O6
+        G9YdjnTsdExrSk2qamxsKp9bUTS7bu/eHtEFLSBhzL8IF8B8LYD5ott0ld+tq9gY+Up5zaIGIM3OmRPy
+        Un5d2WalXaGrBjh1uqJghlhmnS5yx6SDmSygJzruEWCCPSIFV3VmLqXdMlN6xFXb6XJFFpTvC5jSIYf/
+        a435uYsyM7NoyqKMHvaIuHDiekWyCvB9993nZa3KVUaEHcJEMXugqLCkYFZ54ORZQQ8uC7q/Jct39YqW
+        NRa60hUmfhbJCl3cMIP/2ukCGIMP6Z5M0+wRYJwEDXynlUhiZjtderd6SKVi5taWtuCgyICpFCtMuoh4
+        7ap9XB1q1EyfUIC75Hf1HhFOXQALWmWZb7nlFgHsvhLphi6AiSSIH2ljzCtdHPdiA3SD7m8OfLAhOCCi
+        rGCR0q7QVYx1uoiEkArG6JUh2hW6kmjBvttBdfcBS2DllC75rj1mhi6TGezafWPHO7Fhu/z9EsxE6LWO
+        4ty9Bw+c6vJyZXuoXSVcGBMBTZgwAcCvvPIKXzP4ood0JWwmEaLfgKvq2LGzPGU9gM1zmRod+lBzbelG
+        1TcUuvSXGPhp0a7QlbQYQ22hyzvL6HbA1U3A4nqddu+pVdmrGcxLdardVW2Hg312BUx9wzwCAjPSylx1
+        7wlEqW5ynt2rZlBXYqiYmToio1fo2mPm3KyiAP/AoPuWBY03j9L4tUq7Qld6iEhf0ZXyFgMFK+0KWhRM
+        sZNvds8ZdwewuF6auE6791QcLTEzUZVTv7ui5VDAtJ3mMXVnWMCu9rV70avT/i53+muvvUai+eCDD+K3
+        nM6r6mE1w00XQa9E0ui9+eabx48f/+KLL6ppdZaYGZyrl2+aOXmFAObI8Vu5bauCa9KVoWqWfIGmpQ8B
+        SyyzTleS+O454+4A5pOiYKd0ufr2jMhpzDyvfK3/9F0CODmOUv0Xk2/sGREmAbrcJbz/rbfe2iuVyG74
+        Xf46dGn8gRbAaEvJV9IhParaurljlv8q6Abf28SR6rd465btol0Z0icW4QpdBjUZxGOnKxYIG97ViLrL
+        gImq8BZO6VJZtPSIqGboZUgVVc0pWRvoiPD3WQhj6Cqna5k1h3B5Q2IrrizalTmRxG60ivU5kX2jXfKi
+        p556Cq78S0jF1BzoEhlhn+x0ld+dE7cWuoFPFwT6haX6L7TQxeMwBK3Qlc4xIMUyi3ZBi0OhQ4WyCX26
+        xLjLgLm/iOjsM17p3hP0WnpETmtVNYsP+s/Y5e+zgEgkJqrGFV24QnfUqFHid5999llmbAGY83/ggQc8
+        9oi6OjfD3t+19IhQLfKVqOree++FLoz5gqUu/Os0IxLXmxlTbhaun8kPvmdpQegqfQaPAAaqTlfmfhBC
+        W+hKjxkn3aVWRNcAc6E5Pafzme1zM6gn22PmVSuP+M94s/PYFR+3mKVAvKereVUARqxKuxhnrilvO2XK
+        FDVlrquz5rphmVUXAdfL6fMZIA1g/kVzoPX19eVTOc2IMMJ0U1LCSqAbPM48iiJWyQweGbBUkz34Qr7J
+        C3hnFKy0C1o65cwm4Dv8Ie9F3AXACBeL5HSlCbe/RbtMfbV3EbZtfScoYLe/jwl4VtbbR46864YuCsYa
+        i3aRLJcVSTHhklVl/UIXtFhmxApXPoyfn58yzjfddJNTuhJWAQzVFoSs6gTcyLEga61OVwFWdHk9v4iH
+        Esus6BLiMYjCvF+62AXA3MiEP/aVJoTT5JT6vCqSYHsHcO/e90JDGvx9TMAJsW8dPHAqYHYzW13cLXTR
+        LnT7xe9aOoAqqhKzzGApzeTJkwWwXs3QMyJxvQUhK03AdzeGPTOnedEG0a6ii6EW7QpdeSs8sYUulhId
+        e99r8hYw1TLe1OkaQG4oy6w5e/eeicyJCZuCgqL8/WeGBgPLXcysOoAEzzDG7+J9sYH94neddgDhCmBO
+        k0IbX3hDF3Kvb96a/nJrwJQYh29o5JML17Ru0unKdFpFV94T3yyWWbQLXYwHgzCbxow3htpbwNxcrLC2
+        rwEkX7LMZ2YVnr2/W15+0N93j7/vVjPcCAzCxnZpPvOA0q6KmZ944gkvtSsZEbRQAlcgeHx18F0NKS80
+        b9xghs1qpjR+l+uMcIUufwiDQfproSvT66lf9hpg1sRxtzpdnW1Zi4BxpjxkmXmzefM7/n57zMN3z7Km
+        Q6z+kIJGTzqA3q9F6ElUJfK116rcxMx2y6zPi2ZdeUvNhrB7GwEcPLahNLZNpwtghgAWuvx1/ouClXah
+        S1mU4aWIvVIw3hezaV+djam1zFbHnljoYpxjYvYK4KLCA32wjqjnHUBXftdNvqvXme3VDEvMXJm5GrrB
+        Y+s5mqvbhasMVI7dVnT5JFx8oi2xzIouS6H42hsRewas5GvfWcGySoz5zBI56/OZ09IW+fu/xUHgtW+f
+        80pkH8yr8rISaZ9X5aZW5TGqUtq1x8wpzzebgO+sj55SsGG9WeIQujK4XeQm4/PIFAOUo9NlyQyDuofH
+        cNozYP4MAOx0JWnR1wBKWUOnu2btW0FB0Z3LvRrb2sx5r/+BltlpRtS2dEPwE+acewKuwugmnS6AsduK
+        rlRgELFYZrQrdFnqCHKuuXtP7AEwuS8TR8h97XveiHzV+l3yGfuM15nJ+/0D9vr7lzocQUT8X9FVIRV4
+        HAGBgRPTg++sC76jrrW2XclXJsdj55GQ0MX8IGVw6nRlhwKPIvYAmFiGd7fTJay1rN+1rCPilmxdfsTf
+        sRfAoWFvd3S8rebLdWPWXJdWeA6cqMqpdoUxOOn5pzy3DLoc2VObBbBa+sDXii5nRGCBx1XaFbospkXT
+        XGo3IvYAmD4lE+3tu5FZdlag3atbZsTamcLmBQSugXFDg5kU/afFzG7oqpAK4QbfUWseP6ytqWiiNimA
+        pcWEj0ddQpcBb3AifUVXtpEgnHYz38MdYIobmH47XVhadlbg0+grTVh9yy9WVzfExc8LDWvdu3f/V3Qt
+        +a6KqrJfaw4etzB4Ql5SdDqzehVdLimvUXRpudI+oaZkoUvOyW3B5XUlYneAeXdso32fSAqk+q4oFNN1
+        urS6aCEcPnyEOWUVFZUFBWU0+/T5zNSW6R8gcWkT9WP3vs9iZqH73HPPWTIi7HD9otbI54rmF9ZyiZjV
+        BDCRr8wFIIaXpVPQhQXpk1hm0S4vZtMZ7LYbK+0OMGDY6ciyCyjWwLKjEaUWfXU2oUFu3qLI6NLcvLr8
+        2aW8mOxe+V3Vuicoo8IslUjLnjd91t893fmupRKJQKdNm6ZnRJSP2GumYHZRQ30jRCvK53O5FF0A82JF
+        Vy4L2bBOV7Z1ItRy1UN0CZgEi9avfY9Xbih9RyMWmADPsjo7PGa/X1CHX+DaygXrZQsctRYB6cvcDNHu
+        M88801/d+z6mK1xvuOEGPSOi90evYlb2rJykOfFBWcGTU+aX1Kh5PLJ6GMGo7fWIbbknlHaFLsVEbCrX
+        06mVdgkYl8772vdnpmym70aGfbDQXbP2iF/wPr+gfSER+w4eNBcRWVaaYJ+VcGFMND6gugiWmTc9qWZg
+        ljk7VKsGgOm86RkRtNBAqm9F8D0VIbfXFDiahataG07RQ7TLVeJyEXaJZVZ0WeaD3UaNXQOMK2V+pGX3
+        bewzs3D0veY4B8u+GbPyD/kF74dxReWpCetqPjM2X/wugLHP9AEZZAv91d/txTqzq5gZtMxCFKNKz0Ch
+        1TMi2nRLq1ZDlyP8jiVr15izaGUiLQP7p+hy6biYmECdLoBp8Liy0s4VTGoEYPve6txNOl0cqmVHox0d
+        73TSNY/de8yFYoouUJkZCVc8E5E9NyM3xxmsXXsXgbOe2jkIpvSl/uJ0k55sCPl+DUdl+gpFVxijWi6X
+        0OWS8h2xzKAVujhy5vc4bSA6B8x7Yansz0UgD9N3AaW2YtmvKjom1S+wyi9kf17hQbtl5m05SRgz54Z/
+        /6PoEkLffffd2GcM7KOPPqrnuwK4Inl5yPerg36cHeVIFK4ysL1UtRRdrioRtYUugMmPQWa30s4B43h4
+        I/tTL2gn6Hu8UkzXdyPj/oqIZtMac1p/YmKaZaUJrle0ywAttx7lEWWcz7xalZ4RCVpVq5o4cSLBsEqH
+        JKpKSkwK8A/g2gU9ndFSt0rRBTAvUHkmJSOuOaGP0i50WcEFcorK3gLGPpMgWZ5pwlvrdJkbZdlJEJvs
+        F3qAIzCCSYHL3feIiD4ICM/UjMiS7wJYp4uCLXQBTJ05Y9qikNuqOeantaoNHmSPBwQgTXToYoqpeIhl
+        Frq4eQbKsSdLThQsDtj+xBo+or77Nm9t2UlwScMRAVww57AbujgnYisl3zNbu8IV+8yAq0TRdroSVVVl
+        LQ+5bXHIrYtT/6teNngQugxqMoouTR1uIAtd/DpJl90NOwGMucdE2582RYKk761OhczSvc/IO+wXdtAv
+        9GDzchNwr++KMpC7CO0b25vXNHPv2mtVwhjXi1nWK5GWfNdcYLh8LXQ5wn9QzdeKLoDFG8JP5lNQjdC1
+        C122UqbCZXfDTgDzImI2+7PEeHiFvnM+f1Lv72JCTLqdx4ED/0F0V7av9J3ne17E0EuiLnZF1x4z2+mK
+        00W7IWMWcyzMWS7alcGPFF0WabI6l0BaLLPQpVyI0bavbXECmE/J7+Ou9SfF8R2dLhU1mdKsughxcTP9
+        HUn+QYuT0t/4D9HuqvWrJpVOGhI5ZFDtN87+vXFe5pCChgLL3Aw933VlmfWYuSBiSeATWY5XIyND4hRd
+        2QVA9ocTumypikHW6QIY0qyHsMRZTgBzF+CGLc8BpOqtP9OEt9bpYpALS1f5B2axG0dERGL3Vnh2dc8b
+        V3vNOd3RqNszb3jkVf2UKRUjRmxsbVXVDIX2Gy1nn/Nn49x/GoP/bpyz3ng492HL3AzvtStRVURolL8f
+        m67Fxr1QLICFLoNsWNEFMC9W2oUuzyZgEQ2NWs+AeZH9KY/8ef2JNWTAlg5gXvFhv/BDHM0rzJT8DOgR
+        bWxqWjJxYvmQITuGDFl/9tkNPj6y0qRsWdnQiKGCdtA/jCF/M877q3H+X4xhHxmDQs5du36tZW6Ge7+r
+        57swW7FsTcgti0JuWRh++yKdLoBxnaJdhjxPSCyzoktV3zNgesC8l/0JrRgE/XlEmALL2vvwxEN+EebR
+        sfNLT3ddVdXiRx8tHzx4z6WXfn7ZZSeHDfvLOeeUDB8uCxHSa9KHFg5GskP/x+R6wZ+Ni/5oXPwH49Lf
+        GRcUDUqoSrDMzfDGMusxc/S4xQDmaFq8UsmXgi5/WtFlOjoGz0IXwJS1PSgYI4CRsT9/lyBQf9qUNIhU
+        rWrv2+/4RRzmCIkzC+Jf3g7gmpKSqnHjqoYNO3TVVSduuunENdecvOKKkxdd9L+DBzcOGbIiJ4ervHjF
+        4iExgxTaS35voh3+sTHiI+Oircb1KaO76nctGVHmpPqQmxdyVGW3CGDoypbDol3osggBUrp2ocssOQog
+        HgCTlVKCtz9dmT0u9GeJ4dL0SuTaDUf8Ig9zpOefAjzQ1iJwmcgiOAtWjJEOUPqn7qPvrNCWlbVg1Kja
+        iy9+7/bbjz/00Im77jpx220nRo8++e1vnxw+/OR5531w1lkL7r5bKsxf8/vaxb81vvmJcdlvTa7f+tC4
+        4tfGyF8Z3/6Fcbbj68vXLLdXIi09Iotl1jOi0oimkJurOIqCGxVd2SxN0QUwT7SmxIHflccCQZfSAqG1
+        B8DQRfuWZ2ezqYrlSXFoVK9ENredAlxcMeC69xRyCUYostJik5VblG0l5QM2amuNjy8bNqz5m9/88P77
+        j02efPyZZ44/8sjxe+458YMfnLjxxhNXX33y8stPXnjh/w4aVHrOOeubzWR3RMzwS/d+AfXKnxvf+Zlx
+        1U+N7/7EuDBxSEljSZf8rk7XnB6b3RJyUxVHzmv1ol21FR6psDymHLo07GkN6HS5fQl+PQCW7qPlyehk
+        YPpTHrlTLHXmqOgk6s/+AUExcRnYgIHTRUABtLyoyRA0UAvkCxZQ802o4xqJPENmzKi67bY//fjHn4eG
+        HvPxOfbKK8cnTjz++OPHH3jgxNixJ2655cS1154cOfLkpZeeHDq046yz6l59FcDXJ4/+5qZTUK/+wLjm
+        feN77xnXvmtc947xzeJzQuaFdNXvqowImcZFJfj7Orie4Y4YnS4/4sIqukRLdJCUdqHLIOzyCrDlufe8
+        r/4MT66LpRKZV9LhF9riH1KZml48cOhCEcPDtaYQT3jJvYuwAEwkQoecL2jL8EVkUNAn8fGfR0QcCwg4
+        NnXqsRdeOD5hwvGHHz4xbtyJ228/cf31J6+66uSIEYRa737960UXXkiMMj77nuEtp4iOPmpcf8S44bBx
+        4yHzGL7QmDh7oj6vSu/eu7HMKmZOS84Ieio1+IGc2EfKlXZl7zSMq2gXugx6wGKZhS5mCd4eAMv0ZjoN
+        DBatfNI5yMD0J7RyvSyVyOyiI35R5rG6/dSzxAZCFwEXxUXhnEkw+Dz8qwDjj7nZORGyeZ4skBkc/Hl0
+        9OfBwcdmzDj24ovHn332+GOPHb///hN33EGo9eHIke3nnw/aebfc0pKWJoAvbzJuOmgeNx8wbtlvjNln
+        3Pq2eVy1zLgt5WZ9XpXevdd7RBbLrALmVStWh964gCPy9irhKkO2ylV0P/roI1oOOl1mP3oFGEOv06Xo
+        QUlBf/4uEYqlVhWbedQ32jw2b/1idkb/dhGYCsjZMokC7RJ8OgXMin2MNrdvRHDwjsjIz8PDj/n5HZsy
+        5dhzzx1/6qmPb7hh07BhZEflo0cvDQvD+6pK5PcSvnvNSuP7b5nH7XuMH+w2jx++aR43txuXhl/kqhJp
+        6RFZalUqZo4YUxV6wwIOnS6AmZ8l2oUugRG3iNIudBnsFOlBwdgEQjWlXejyRngd/enKpEyWWlVk6hEB
+        /MauUwruX7qIlQ+J3yWS4vO7AUz7hPMl2qoIC/s8Kgr7/IcxYzouuACuZd/9bqPDsa6+3j4348rYkTe0
+        GWPfMI+7Ok4dd+8w5DCmG97HzJZqhjjd0Bsq5VDald1KUZqiCxp+Vyyzoos18gCYN8KNi2UWugJYf3Y2
+        ZSxLrSoy7YhvzFEOAdzvdAGM7eL8yRS5Wd0DZlE96WP81Kk7L7po/uDBpSNHEkm1dz69zNVs9aFBg8au
+        NcZv+eK473VDHTpgy9wMNMf2u692DgyMU7oWwBBRe9GS44h2QcPAoljoYpM8AyaP1unyjpyn/mR0Mg1L
+        NSM0fKY8Mo7VaDJFW/ZnJnBlqB2N2AuUS3m61+92bN26PCEhzN+fTBcL7BEwfXKuKR++dvLkddXVln0z
+        7B3AFWtXfCPg6w9TeXZxKMB2umPHjmXSBJMxoMsCgDvvvFOvVYl8mQohFzNkRpROFwUTJyq6MOK/unZh
+        5C1gpV3oYhM4Sf259wqwqmZEph/xjeU4vG3Hfn3tPQZk5MiRsgWojF7ZwdfVvhmkPjw+Y+55560eMSIr
+        OJhrRxjlETD+kjNiwrZ9VxSn/d3sJdlXJAx5aqXx5L+PJ1YZ6vhRq3Gu/zmWWXOqVgVU3e/i+OjxWaoZ
+        3JehN1aE3DAv9PoKpV3ZbJg+vWgXupwXaYL4XegIXQytZwXjk8QyC13CNgHMG/F22ARUaFmLEJl+1Df2
+        HY6OnaZ9lj1eGVSw2ZWCXxHGaFc2eO31XUB5aGvd88+DdsuoUX+ZOPHz7OyGnBziLDpgHgGTEaAnLo1H
+        7UqR+a60H95RbPzXMvN4ttk8nmk5dTzdavyozrgw5Dy7diVm/lHnQMTySPGHH36YqoulmoHfDR09Xw7Z
+        JVzoMvDBii6BMG9oocsd4zlN4oR1ugDGpSm60CJ31CuRlC0jkrf7RW/1jdq+YdNO4CnAfCYAg5bpB2zO
+        zIB079Ld0tpa8/jj9Hx2X33131999bO8vE9XrvznBx9sYzVteTmZEo7KjQ+mtidbWxOUWVaaOO3eY5+H
+        Or4xqdp4sdaYXGdMqjePFxrM4/lG83i82rgw+AvAljozSJAHd7kMbiw7XQBH3lqpAxa6Ali0K3ksb65r
+        VzIdrwAr7UKXzJroXLTLwOoKYMmH6KDRZUpNz0nNrEhIrS4uMdefC2CxyfyKei4CxrAX6W6qqVl4zz2g
+        PTh69L98fT8rKflXe/u/tm//dMkSFEzCMyswkMSXT84t6zRN4lyoqIOWtRp8NjdRleoAUqW6IfGcqVXG
+        awuNKYuMVxcbr1QbL9eYx0tLTOoPzjGujb3KVb6LdhnYZITrii7Bf+htpSG3F0WMLSU+UHSlMqPoUozi
+        O8oyC13PUTR3MddCLLPQJagGsKJLdIpjU9ku7pCp8PTY2aK+fF5lamo6VtGyTyQnw92KfHHA/FQ9obXb
+        +2asLSycf+utC4cNe2/MGEqMn5WX/2vz5k8bGj7LzT3mcBx/8sn3r7xy9fnn54walRAVxbVGx/CzFDqY
+        IcWdRzGIzy9P/HUVM+v93dExV02YZfjPNfzKDZ8KY8Z8Y3qlMW2BoZDfn298P+lmp/kuaFmLxaXAMjP4
+        mn8ttSqqhIV5xcnTC7PCSmYlz6YSxyeUh7DI8xtEu9ClnEyKL35X6FKM8gyYwAwAOl0AkxSJdqFLbQzn
+        oc9nZqOdXbt21zasysyrzyusobwiKx5liC1idRSXmHcGMMP9Ux7tu4CqqGpFYuL8ESMaL7nkl2PHkrZ+
+        Vln5aVMTZpkiFPXFX1199ephwwqGDKHlRwuBJ20TPXHOXG7q8lQo5cE28nw53pNvctFxH17SpYswMmRI
+        +GwjtNAIKTKCSgzHHCOgzITtO+8U75uTvu5b6mu3zBhnrgPqRL7XX3+9WGYY67UqPhjOIj0tY0FFFbaH
+        KhuxtKLLTwGh6NLxA7BOl3IyjDyYaOI0DL3SLnTJmqhtKbrSvtArkfBOzShxRDf7Rb9eXLlHp2uPqtiY
+        j0Swq9rduX17a3T03GHDVg8f/vEDD3yekPBpTc1nhYXIl7Lih9ddt/6CC4ovuqhizBi4bmtvVzvnE2cC
+        lU4JVgeZynNMuMqg5dKwSsN77a5pXzMq9FK/ZCMuy4iZZUTlGhH5RliBCTu42IQdWGrC/lbY4MK6Qn3G
+        q5p5w3UDLQPhstUlUnnooYf0WhWfjZZXbmphbnzJworqZU3NWBe5I+VZDsS/ol3o0rOnIKG0C10GCvQA
+        GCQwFsssdHlTBpVbPpDQpQdJYKVXM5avOeyb8B5H3ryjSrsSLYuCZZdwIiysNHry+AxPNa+K/kDT9Olz
+        zz+//fLLzZ5PSgq+1mwMPPfcxzfeSCmx9LLL5l1/fUtUFJssO905nzoGfgc3AVFJMTE5WDNZau2ldtHT
+        YxkP/DjyrJRkY2aqkZhuxGd+QToyz0DWwA4sMM71O7ttdZurOrPKiGBMEmypRMrDs4piqoLH5YY8lRoV
+        kMA1V3T5ESG0ogtgoIhlFrrcx1h4D4DpNOByLHSJQiUoELq8CxGmnu9u2nrIN+F9jphZ7wpgvZoh6Qrv
+        wBfea3f7mjX1L7xA5rPjyivNzCczk36AWUq89VZKiXCde/XVy4KDNzc393CFp70SaV8DmFWTNTpoyKwY
+        IyvOSE80UmcaySlGUtop0rHZpzT9fKoxOvo7Hula/K6lmjFr8uLQ75VzzI2t1+nyWzpdvrbQxWETbXgA
+        jHHmjXTtQpdEAieq6FL/49bT812iqoAkFPy+b+L7b+450MNa1ZalS8l85px77p7vfpfM5/P4eDo8f779
+        9p0XX0wpcc6oUUtZJ9/J1ctdQO37M3uTEamZN/OWzbs6+KKMQKMw1JgdbuRGGUI6I8FISzJE08BOyDDu
+        ifra5PwX9PnMqlBlqWbYtavy3cTxCwTwkrImscwyuBHFMjOYNMcUWl270CWdwfV4AMx9gaNSllnoMrjL
+        RLvQxTIQvqtkV2LmmPQ1fiGzaVNHxyQowF1di7CxqopN1Oefdx6Zj9mdfeWVP91xx1sXX7xwyBAk2/Dy
+        yzxksnv7RHqz543TGa+Zi9Oud1yYM82o8DHm+hslQUZRiBPMoumrQobMqjYrzJYZr97TjY6KZuKE49nY
+        sPF5rcu+oAtgokJFF4pcW2WZhS6DypLnabPcNRhq/K6iy/wubh9FlxkwzH1RgMUmR8Wk+AfG+4UvKl+4
+        pRu1qjW5uWQ+NRdeSOZD1/2v48btu/TS2vPOgyslKlLe3tonskvaDZ7jN8Z36IJJRs3LxqIpxoJ/Yy4N
+        dII5INYYFTq8J3QJmMuyqwIfm+mYEhrqE6W0Kw9T4iKLdkHIuhPCAvG7ii7zmj1Pm+WXCYLIt3S6WAOi
+        HtEudBmUy/VqBn+7rvWIb9IHHHkV73SpmtGWlDTvkktaLr2UzOcf999/6LLLlp5/PiFx7dNPt5eV2Z/y
+        2DeWGbN8V9wtj08ZsvJJo/Vpo2miUTfZqH7FqJp6SsowLg42CsKM/IhTRvvG4MFJC5K6rV0paJSG14Ze
+        PZcj9+XFCrA8CA07quiycoxcwEIXwFhWzwomFgWnWGb1rDIqPjhwocvMLr7mZSpg5osNrx8QwKEZ73tj
+        mdkmtzUs7FTmM3bsocsvbzn//MKhQ/G+64qKemsH325YZtDeHXvL1dMGZzxmbHzQWPuooRjXTzKWvGSV
+        smBODjPODxjUQ7rYzowJCwVwWXStABa6/Eh2O0O70GXpNhrTtUsYS9GDl3kGTPREVKLTlW1WMMuKLsUB
+        YjFLRhSZ/YHvzJ9wrNt0AMauqhk7N29eNmNG6eDB7SNG7Bo+fMWwYcJ1dU5O7+7P7D1dliPMrp/9StEr
+        Y0KvunbK4OJxxt7bjJ13GlvvtTJueMGofdGU8sLXjMrpp9Q8x2Hc5zjHp2iaq/6uZeaNpUck2jXjqWXL
+        w68tC/tuGYDrq5YpugDGRep0CZUsdJnaQJCEA/IMWAJppV2hS1WFTynahS7FDeJqS0ZUvOgdAVy+xNwM
+        xp4R7Vi5smHSpDmDBi0ePLhl6FDs8OKHHlqdkUEdw1UHsHf3vLFnRKC9zP+Cc6Z/7c7JQ2LGGs03GD/7
+        jvHutcbBm/4f43WPGKsfN1b82Gh5xjTXFinn+BqXOIauWGU+uN3e3/WSLoAr0xugy5F0j5lSinZl4PWU
+        dpEv/5WoCrOMdqHLoPVu30zJyeIzbgHsu9r5WW3SgPNTdAFMocCS765Ye1AAR2W/zTvo1YwtdXVLnngi
+        zzA4Zp99NqEyrpcnEvTxXnNO+7vXBAzf/m3jv4cZf77A+OSbxq+v8IqxLuX7/M51lPr1kC4tnMxJFWFX
+        mYCL/M2KrxpcTPIascwM9k7hbrDQZe4RsxuohHhWMK/gQlCwVNqVhYREXhT8pJGJA+BrkOsZ0Zu79wbF
+        LjF36AhwxMbGA5g32Thv3uLx4wVt5W23rZw5U7j27hpA+9OmvOzek+w6Snz8Hv4GgLvHOPJV49boa3tI
+        F2BUxVlXyAh9NG1xofk0ShnQ5aeEV4ouux9hRHXtQheLbV87CkrnCsYNc4GUdmWVCvKndq/o0kklN7dk
+        RNFxGf5R1T7J786tPcqEqPk33ghX/l0RG9uxbp2bLkI/RlVLVy69ZNo5dsDvfc84cr1x4GbTVu+6w9hx
+        t7FlvOmSdXM9/znjyoALaltqe2KZpZoxP60u9OrioEeSQqZG6XTBRjCh0wW2hS43B0VN8dNeKRg3jOdQ
+        C/jVLGh8s2hXNuKi2G3JiJpXH/RJ+alPys8yvvPD8muuWR4ejt/Vn3s/oLSralV3hF/X/D1TwRYRe2T8
+        Q5+hiRWxPacL4LRHK8O+M4cj/9VFSrvQZWBKxTKjXTaXlLXa4nfRLnTpmtCGd7qboXMFixvmF5R2ZRol
+        sbGiS98DN0y7xtLfDcn+CYA5lq064P7Z2f0VM9vX78YviJ8wYZAC/PtLjI9GGL8a+f+c8Zs/NN4Ya2y7
+        x3j9vlM6Dn3+rAeTxvYK3ZrSpWFXloZ9xzxqy5eKZZYBe3Aoumz+S1XfQhfATh2wSxPNDyCHi1XalUlY
+        dAnp96FdoStr9CwZ0by6Iz6pP+NIm/vewNeurBJbvW71xTPO/dXFHkSsMy553Lg2aMTyleZKJ+8rkSoj
+        0rsIIES1JuArSzOerNTp0u2n3qDTpV2Iu9W1C12+I/eBtyaa15Em0RVRE9zVHB3qXIougJkXYcmItne8
+        3Qn4536hBSVzKgem37XvrPBo0ri5N38BWBexbqiFcd7jZ90UMqppRZMruvRx6QaOHj36pZde0mfN6d17
+        VajKnZUX+Gx06NWFAJ6fWqe0C10GNWOxzGiXgfAsdPlbZDcYy64Bpm7CJ5AdThVdeYSD2pCaLwjuqYro
+        GRG6j4jNM8NBR/jM/I3K6brKiChxP/nkkzzAs4+7CJYVnnm1eXdOGvKX8z0zTn/0rLER17nXLnSlmgFg
+        MOvzqiza5SLnhJX4T2c5oX/Yy/EUkwWw0JUNyxRddt/HcCq/i3ahy4QyV/bZnYnmZ6DiftHpSv2ZWRBo
+        V+jiD6h/SkakxqzcIt+kN3zSfu6T9ou1m972mBHx+D8AqyJzH/R3na7fHeF73qERhs5YpcXvX2O8c51x
+        6EYj5dFzxsfe5tEyA5iikGgXAGzj6FS70G1e2hI3Zm7Yt0tCbsmJDUzS6QIYdel0mXFnp0vT0M0TslwG
+        WQCm30DtTc3OUd0FghRFF8DEb6Shlj1vMue955P+C47MivfcVDOIw3laKzW2fqfLLK0Xsp9OHvs1CbUk
+        nNYN9aFrjWlPfePhuB+6j6pk52AGwmWek2j3jjvu0Gfe6F2EkpDFYaOKOaJvmLPMXMZ8SrvQ5WUEz2KZ
+        0S6PruLKS8ystMvdQ17jyj57UDA/5m+QCKnevpSuiKqYwAZaoUuFjE8jgFVUhXAFMMeajXsxv/aYmTk0
+        aBfzIo/Z5EGP/Jco3dXMm55UM7zZN6NyWeVVrw7SFawYV99qjJg+6LXcye7pPt05mGkFUUr3/It2fXx8
+        +NdumQmmGhY1RX2vVADPiajW6XJJsYs6XaRMO8FClwUZsjzHqQP2DJhLj4tV2lVZr8zsFbryRC6oWGJm
+        tAtdv5glPBWLl9l334ao+F3Ccp6xzAQU3oRHenbpOYBd6u963FnhhsArNn7nCwUD+Mi3jHsmDf5B+LXe
+        VDOwzGKWwXzdddcRgeIy6bE6pUvnxhHgCHooKWxkceKd5lpI8bsywA8epV0eHEm5w04X+0zFwhVdz4Cp
+        eMi6Y6VdSYpgyadXdOVBiQJYRVWtq3c4zAcG+/vGtS5ZftBVrYobELooTLgCmLdy8wxP73tE3divKmhu
+        0JRHzhERf3KhkTju7BE+Q9MXpXtZiUSymGU+P5KFnxvLDL/q4obge1PMFXu+oeWpi3S6EtbodAEs8pWo
+        ioF2mWPLlXf/IGF3PljuCyaycLmVdlU8xTmLduVxtiy1xoRaYua0nGqfjF/6ZP4yMOfnr2/drWZl6D0i
+        zDL3kKI7adKk/qJLBli/vP7yaYMItULu+zpfvJDxVFd7REBlkJjqrtcyN0MKVTPHlYddUcQR81Kqha7I
+        V/yuPLMZL2mnS7/BVfqrNO0ZsIhYlauUr8Xkglbo4m8YfEpLJfKNnbujCn/qk/krjuQ5+0msuQ8sHUAk
+        y13CXX/PPff0L12ZzDwu6uaLfAa9lv9yXWtdt/u7KIw5wi+++KI+a07vABZOXxh2RSFH+JXFNWUNCrBs
+        mE75Qad77Ngx7LxFu0wBpiCB8NzYZ88mWokYdSrtKjsMeEUXcrQikLslZm5r3wtdv5mbAuIb8grmUkQl
+        6rPEzDBmEF71o3bVWoRlbct6OK8K7XLfc/XtdEn6SUDmZVeFjiwI+1YhR3HQF8ZZ6GJIqGwo7UIX+drp
+        Ek5zW7h5qJ2w86xgqWphkJV2VV6LFqlcol2hS2iNQ5XnVusxc1JGRXJG8eLq+jllFRmZ2XysvplX1ZPd
+        yLqtXVf5LlaXsBROuNIMv9kh96aEjc5JGT/Xol0As+pAp4uUWTek+115qq838vUWMK+jjwQVpV0VElPI
+        VXSBzeBW0OlyAswNgzrhbnlVc0Tm2vYNW/pmPrPHmNmbPW96XmdWlpkqFdWPkqKSxvrGhsqm6ID40gLz
+        oWUM0S4DG6bTPX78OB/SThd/7I18uwCYUI2bWmlXTXYEFX8J7Qpd5vFQ5+JT6jGzPJJvafNqR3yNT8bh
+        1Pk/6a9aVVd3NOpFutJCyJxeOHNqdmuzWV0oLSnFYut0MekUJiWqwjJDl9YCpSsVM4t2WXpDYunR+3bB
+        RMtLESspitKupLBEv/SZ4Sp0mXgta7zkKfQMCaloR2fOKvbNPDpj1occJbVH+6ua4Wrtfc/9rqtalere
+        z41cHD5iduidKfEhSaUlcwhHdLrIl3k5Ot0TJ04QftrpYue9lG8XFMxLZRaAkFN0ZR0f0ZaiixvGFmHS
+        FV1ezE3A3VDeeEgAz8j5sKzhCIHbQIiqvFxpwixz6hj862pOpNNqhmrdV6bVhF822zxGzE54elZsTCyu
+        TVlmSXwtdImt7HTZMcFj7qvH1V4FWeoXYIZjs9CFE8rmI6Jdocvgv0C1z4lMq3wfujNyfuObtDYmMZsy
+        GYx5Bxn8t4friE6T3yXypTgFWsqQUspQ+2a4iaqELmqLj0wIuTM5/LJ8ACd9v7SpwbxWOl1uMsoayjKj
+        XXrA7E0g1QxlmaFLQOO+dGXJmroGmOm4nCQkVDVRUaFsJGiFrhTbZNaAHjNv2/5GSsVPfBLbzApX/NLF
+        rQd6ThcH39Wd852u37XUmZnYhmQZdFsZL7/8MucuFWbv6XIRFuXVhT6YaG6LNHZmwi3FDTVLLZYZ30y2
+        o9MV42ynC2AsJabUfe7bfQXzmzSXuN3EMuuaI0jmAim6fGjOTUpUlph5WXNrUGiUT3zTjNyPZuR9tKhl
+        f0+0yzOneBrgXXfdxZ/u9h6veiWSTy7L72X9LjDoC2FOVZ2Z/5L9u5qbYZnPXJlaE3F5fvjw/OB7E4N8
+        QsoL51voyk6LFrpkK07p0nbjsntPt2s+WL0vJ4/5tdCVOeWcNicgdBmcLdfOHjM3NrXGlP0CunIU1L6D
+        ZeYW6WqdGbTML0S+BJbc3T3Z41UYU7sHpKzfVQu0Mc7ENXAVy0wPn7zAo2XmIsyNWBR+aV74N80jbnRh
+        2ex5droIxkKXfXQoYlgsM2eHP8Y0umkcOQXfNRMtb8EWLZwnMMRfqn4OZSyutbqF+YK4gwtB4GqPmTdt
+        6YiZ28k4/7ccjsDg7Fm58m5e7leFU+BBYmKceRogiX9P9niFLrUamWcjaxHgyo4IGCGau5hlnB8OmNOh
+        kYCC3cfM7DoVGBAYcUkuB4wTbiqqrTDrkbrfRbsUgC10+S9/1E6X/RH4o0yR65J8u6lgfo1pHhhqC13p
+        ueLepLYudBncDVx6fd8M8bswTqv6ALp+YVm4qOjyX65e3+E9XU5YHuPJm0O6h3TVflXsnsEAMIEVRCVm
+        Fr9LCwG6/OuebvPS5twnys05SxNDAZx0a1FDtdXvQhfDZqF78uRJ3tkpXTJm5NRVut0HzG+Ck7qBWu2j
+        OupcaNSg0+Uacb2kK2WPmVMLWwNDY3xy3p0x++Pgkg/r2vZ4uW8GgBEuf459dB555JEe7uArgEW7ImKJ
+        mZlLxMAsu59XpZLd6ry65OsKoi7MiRiZGTg9OHFCFjGzXbtog4qVVDMIqRjQ5Ro6pUvdivf3WHbuNRMt
+        byQRNQKShfGq8CvVIi6WaFfoMpTntmdEc2s2+xX+FsAzCjg+ya5+v33jNprNHp8UB2DQEmH1Il3xvkRV
+        ol3ZkNkjXRZ8wGDOtMqY87Ojh82KvmAWjDOeKfCeLlVCp3TxvpSPcIvdkG+PFMwvU3kRxha6sg0YRHW6
+        yBqrzq3gNGZuXLk7uPRDATyj8JPArE2BgUGi+x4+S8ybjMiyKwohFUNCKm8yIlKXQEdg4gPpMedlC+D4
+        y/PmRZ9qE1n8LpbZrl0WGDily5ZTtCgIxLpHt6eA+X1menB1xBGqSq+6pnLh+FfoMvgRL3ZazWjfuBXt
+        CmAzS45dMLPqp82rzela3Zib4eXe6rplFktj2fPGo3abljQVPVMe+iNz7kpsJ+CMHxTVVzVaughgxu+S
+        /9j9LjpxRZc+Eufebbq9AJi3gBb87HTVpHCdLtedV8LYVUZUu2J3UEpjUGjsjKLfcUwv/n1WzfuNzSsp
+        r3MPDZAOINaYDjwtlvIZlUkXz4oflBk3ODNwWnDk+ITSqWam65SuPSPC72J7XdFlwgZ3W/dcr7onupMm
+        2W8omKFOJRrVTBUFC2C0K3QZoOLGdJURrduwNavqLQUYxv4hSeExqSvXbVGmgjfsXb/bJe22LG2JDIgM
+        fiUk4RsZ8edmCODMe2cvKalzSpecmH1O7Np1Q5flC2Qi9id6d1XNvQOYu0ycruwBprSrjB7f0enCSayu
+        HjBbVmdjnDHR0PXJO4r1m57/rm/p7zNr3m9o68Bscv7ki7x/H3QAmd/PBjRSt2msaCz5cVnyBVnxlyab
+        Nnl4CoDTrsqrmmnOWHJKlwtir0SiXTd+lwgAk25fzd1Vur1jolVQLTjtdCVUAb9oV9ElevKYES1ZsTsk
+        aa4jpmB6yR+ml5rHjNkfxOW3pKVnUosX13BaO4CIT576VhxXnH93wcyvpc48Ky3p62mJZ6eHPBMWPSFu
+        7vT5lhmvelSF07V0ESQjchUzE1XRWqAV0e2w2XIT9I6C5U2541RUpbSrAlEyY74pxpkhdFV50n1GVLH0
+        zcj5vxbAvqmr8ufUVsyvIrzkPRVd/hC8uxEz26MqSeKlmkGfW/YkKYwvih+ZqACnX55T+urcpdXmUiKn
+        2uV32cjG0gF0n+9Cl6SIv0jY1Q2x9nIe7PTtZAqmZEeqb6ouFiYODJI663QJ06Tn6D4jwjinLjgUHIVw
+        8ejtVJp4NwWYgiKGlD/hZX/XacyM+GQLA1WrIgellYSkeH3kQ1Ezz06ddV3+goiFljWAlqiKc7HMzZBq
+        Brxd1aqELvk3M+B6i25vmmj1mYSxnkSqTrjqQKBjpV2hS4VLapmAF4k77QBS/WDrebkbEJaiC1QuDSst
+        ekKXG5H7g3Cd/qPevSdX4fu030vyS8oyyizrdy1+lw9gmTWnalV0EbgFXcXMWGa027t0TwtgsdWqPmCh
+        KwYNoWDMpV2h6EpXkTkCYNZLY3qPiItLJ4drQXkS2Kdj1hwfzzI3g5ly9OmI6SgZYidcaZfPRoneMuNV
+        0cUZO+0R0UVAu0RVmIpetMy9nCbZTQrxvVQrZW6wmrmiqrJk/XwTHYt2FV2Zdcu/gNenZ1ieJUYOyvv3
+        TTWDvwVdZO1Gu3xgLoJltrrQZW4G1sVpf1fokhFwx3epje+9De/NIMvyV8kNoOKKLpN7cGxg5jUWugAm
+        yJSVTmbTqbOrocZpjZndzKtySpezYy4VJ25ZR6S6CDT4nM68wd0KXfrZvEmvZER9EWTZGaNRrpqyzFKx
+        E7oM7BKFXGSNuVYz5oWuzLPn8tE0lfWlpzsj6hJdXsyaPCIpfYWnHjNzKZzOiQStoot3x5f1vJrhRtCn
+        UcHqrwKMm1SyQztdmVCNGSRMxQHb6cpWXBS9+RGCxiX3jWVWHUCLdvkMlKUsOytY1iJwOzqdz6zo8gVp
+        Hi/rYSXSo63uC8B8CKYdccu7octsChyVPJxF166iK49ElCdfQproDMw9jJm9nFclURXhPRuHsQmZvueN
+        3TKzboyt8e1rEWRSkWiXYA3T1ZMekUeupz3Ichp2gYQrpSyz0q7QZTBnkTY+3ye8wjjb6XJRZF8Y2f4H
+        643oZb6f+7X3Xe0RiXy523AW6JWduPW95vR9M/QVnuTQ9lVishZB0SUg5517q1DlkXQfKVh9DtTJ6clK
+        CLHMFroAZmI33gveCBTMSrs6XYIXarkMVMWWi6ysQdlEZ9hPpAZsqWN0tQPI72IbuLHIRy37M+t7zVn8
+        Ln8Xb2pfv6vPZwYwGbDMYjjdZlmn3teA+dtke7hkzLUbugDmWlC4kL0DuC3c00VkDKhQHcQdyEDi4rkl
+        IOdNSMm4vgR0ygtwA/HO/C5P89OfaaLvre5Ku3DirZzum2GvZrB4hxAE2+NRc737gn4AzAlwabjiSBnG
+        yjIr7Sq6ACYSoZnD4JWEJACza9dOl83DuI3k4UDUlfTn3uvP39WfA+g9XdgT8PPZ7DsaOV1pQlsXW4Uf
+        6eqM114h3T+A5aNzwvhavDKM3dNVW69RbSA8wZAiBbHMfUaXsBndc5/ZdxJ05Xf5PnaIUO50lKi8xN+f
+        gOUjYksxwmTG4nrFMuva1eky+Vk2umU7ACIyWTmBKVaWuXe1i1hx7Thy/qJ9B1/7njfKMiNlWhTk90QJ
+        XpI4TS/rf8ByYthepIxjhrE3dGn4MIhaaTkwuC3w61RCEBni7rZlxp7z61gI6qDcTPbnItj3ibRkRPLw
+        Z9wtvv+0VjC8vCEGCmD5uGhR4i+A4XddaddCF63QD2DQh2CqFB0bBl0BJC5ThdS/OH5icpIr/fu8AOOB
+        8bc/Kc7+XAQ3fpcfcU+gWm6ygYBWLunAAiyfCbOG0UYEYIYTl163zN7QZR0A6aY8bJHwlVaBTG8mmaEy
+        bH/uveUZnpbnEdl337ZkRAid2xELRH7VlymQNyIeiIDlc8t+xgiCEBQpi98dUHTRN8aD6AGr43S3dW8A
+        nO7XDFzAcuZE2pSuCHMgTUkEQSu/69Qy94F24YovEK7Y/NPXCOoV9gMdsDpJriMBLaYb0hTC0DSkLX73
+        9NEFKhaePwpXTDF5cJ/VGnuI+UsDWCeNPaSERJ0EP40Bx0kDu9fpsh0H/hvnClTuKlJ2bMmXhau6XF8+
+        wPodjayBTZGIYoJsLgAMEi2kJgacUMtjVMXsH4nC+BWiOdkJSnZe/5JC1S/RlxtwD83Xf8KvfwX4DKf8
+        FeCvAJ/hV+AMP72vFHyGA/4/7f9VH43yUj0AAAAASUVORK5CYII=
+</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/InstrumentationDesignTime.csproj b/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/InstrumentationDesignTime.csproj
new file mode 100644
index 00000000..50eac64b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/InstrumentationDesignTime.csproj	
@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{37FBFDB8-C2D4-400F-A7EF-3CCA9258D805}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>DevComponents.DotNetBarKnobControl.Design</RootNamespace>
+    <AssemblyName>DevComponents.Instrumentation.Design</AssemblyName>
+    <StartupObject>
+    </StartupObject>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>KnobControlDesignTime.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseTrial|AnyCPU' ">
+    <OutputPath>..\bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release2005|AnyCPU' ">
+    <OutputPath>..\bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseTrial2005|AnyCPU' ">
+    <OutputPath>..\bin\Release\</OutputPath>
+    <DefineConstants>TRACE;TRIAL</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+  <ItemGroup>
+    <Compile Include="AssemblyInfo.cs" />
+    <Compile Include="GaugeControlActionList.cs" />
+    <Compile Include="GaugeControlDesigner.cs" />
+    <Compile Include="FormatStringDropDown.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="FormatStringDropDown.Designer.cs">
+      <DependentUpon>FormatStringDropDown.cs</DependentUpon>
+    </Compile>
+    <Compile Include="FormatStringEditor.cs" />
+    <Compile Include="GaugeCollectionEditor.cs" />
+    <Compile Include="GaugeItemCollectionEditor.cs" />
+    <Compile Include="LocationDropDown.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="LocationDropDown.Designer.cs">
+      <DependentUpon>LocationDropDown.cs</DependentUpon>
+    </Compile>
+    <Compile Include="LocationEditor.cs" />
+    <Compile Include="PivotPointDropDown.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="PivotPointDropDown.Designer.cs">
+      <DependentUpon>PivotPointDropDown.cs</DependentUpon>
+    </Compile>
+    <Compile Include="PivotPointEditor.cs" />
+    <Compile Include="RangeValueDropDown.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="RangeValueDropDown.Designer.cs">
+      <DependentUpon>RangeValueDropDown.cs</DependentUpon>
+    </Compile>
+    <Compile Include="RangeValueEditor.cs" />
+    <Compile Include="SizeDropDown.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="SizeDropDown.Designer.cs">
+      <DependentUpon>SizeDropDown.cs</DependentUpon>
+    </Compile>
+    <Compile Include="SizeEditor.cs" />
+    <Compile Include="GaugePropertyGrid.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="GaugePropertyGrid.Designer.cs">
+      <DependentUpon>GaugePropertyGrid.cs</DependentUpon>
+    </Compile>
+    <Compile Include="KnobControlActionList.cs" />
+    <Compile Include="KnobControlDesigner.cs" />
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="GaugeStyleDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="GaugeStyleDialog.Designer.cs">
+      <DependentUpon>GaugeStyleDialog.cs</DependentUpon>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Design" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="KnobControlDesignTime.snk" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\DevComponents.Instrumentation.csproj">
+      <Project>{3084E369-3D7B-4918-958F-2776DA03E6BC}</Project>
+      <Name>DevComponents.Instrumentation</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="FormatStringDropDown.resx">
+      <DependentUpon>FormatStringDropDown.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="LocationDropDown.resx">
+      <DependentUpon>LocationDropDown.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="PivotPointDropDown.resx">
+      <DependentUpon>PivotPointDropDown.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="RangeValueDropDown.resx">
+      <DependentUpon>RangeValueDropDown.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="SizeDropDown.resx">
+      <DependentUpon>SizeDropDown.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="GaugePropertyGrid.resx">
+      <SubType>Designer</SubType>
+      <DependentUpon>GaugePropertyGrid.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <SubType>Designer</SubType>
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+    <EmbeddedResource Include="GaugeStyleDialog.resx">
+      <SubType>Designer</SubType>
+      <DependentUpon>GaugeStyleDialog.cs</DependentUpon>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\Copy.png" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/KnobControlActionList.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/KnobControlActionList.cs
new file mode 100644
index 00000000..1956ece9
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/KnobControlActionList.cs	
@@ -0,0 +1,175 @@
+using System;
+using System.ComponentModel;
+using System.ComponentModel.Design;
+
+namespace DevComponents.Instrumentation.Design
+{
+    public class KnobControlActionList : DesignerActionList
+    {
+        #region Private variables
+
+        private KnobControl _KnobControl;
+        
+        #endregion
+
+        /// <summary>
+        /// KnobControlActionList
+        /// </summary>
+        /// <param name="knobControl">Associated KnobControl</param>
+        public KnobControlActionList(KnobControl knobControl)
+            : base(knobControl)
+        {
+            _KnobControl = knobControl;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets or sets the KnobStyle
+        /// </summary>
+        public eKnobStyle KnobStyle
+        {
+            get { return (_KnobControl.KnobStyle); }
+            set { GetPropertyByName("KnobStyle").SetValue(_KnobControl, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the MinValue
+        /// </summary>
+        public decimal MinValue
+        {
+            get { return (_KnobControl.MinValue); }
+            set { GetPropertyByName("MinValue").SetValue(_KnobControl, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the MaxValue
+        /// </summary>
+        public decimal MaxValue
+        {
+            get { return (_KnobControl.MaxValue); }
+            set { GetPropertyByName("MaxValue").SetValue(_KnobControl, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the StartAngle
+        /// </summary>
+        public int StartAngle
+        {
+            get { return (_KnobControl.StartAngle); }
+            set { GetPropertyByName("StartAngle").SetValue(_KnobControl, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the SweepAngle
+        /// </summary>
+        public int SweepAngle
+        {
+            get { return (_KnobControl.SweepAngle); }
+            set { GetPropertyByName("SweepAngle").SetValue(_KnobControl, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the MaxValue
+        /// </summary>
+        public decimal MajorTickAmount
+        {
+            get { return (_KnobControl.MajorTickAmount); }
+            set { GetPropertyByName("MajorTickAmount").SetValue(_KnobControl, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the MinorTickAmount
+        /// </summary>
+        public decimal MinorTickAmount
+        {
+            get { return (_KnobControl.MinorTickAmount); }
+            set { GetPropertyByName("MinorTickAmount").SetValue(_KnobControl, value); }
+        }
+
+        #endregion
+
+        #region GetPropertyByName
+
+        /// <summary>
+        /// Gets the property via the given name
+        /// </summary>
+        /// <param name="propName">Property name</param>
+        /// <returns>PropertyDescriptor</returns>
+        private PropertyDescriptor GetPropertyByName(string propName)
+        {
+            PropertyDescriptor prop =
+                TypeDescriptor.GetProperties(_KnobControl)[propName];
+
+            if (prop == null)
+                throw new ArgumentException("Matching property not found.", propName);
+
+            return (prop);
+        }
+
+        #endregion
+
+        #region GetSortedActionItems
+
+        /// <summary>
+        /// Gets the SortedActionItems
+        /// </summary>
+        /// <returns>DesignerActionItemCollection</returns>
+        public override DesignerActionItemCollection GetSortedActionItems()
+        {
+            DesignerActionItemCollection items = new DesignerActionItemCollection();
+
+            items.Add(new DesignerActionPropertyItem("KnobStyle", "Knob Style",
+                "", "Sets the Knob Style."));
+
+            items.Add(new DesignerActionHeaderItem("Value Range"));
+            items.Add(new DesignerActionHeaderItem("Angle Range"));
+
+            items.Add(new DesignerActionPropertyItem("MinValue", "Minimum Value",
+                "Value Range", "Sets the minimum value permitted for the Knob value."));
+
+            items.Add(new DesignerActionPropertyItem("MaxValue", "Maximum Value",
+                "Value Range", "Sets the maximum value permitted for the Knob value."));
+
+            items.Add(new DesignerActionPropertyItem("MajorTickAmount", "MajorTick Amount",
+                "Value Range", "Sets the interval amount between major tick marks."));
+
+            items.Add(new DesignerActionPropertyItem("MinorTickAmount", "MinorTick Amount",
+                "Value Range", "Sets the interval amount between minor tick marks."));
+            
+            items.Add(new DesignerActionPropertyItem("StartAngle", "Starting Angle",
+                "Angle Range", "Sets the Start angle."));
+
+            items.Add(new DesignerActionPropertyItem("SweepAngle", "Sweep Angle",
+                "Angle Range", "Sets the Sweep angle."));
+
+            items.Add(new DesignerActionMethodItem(this, "ReverseSweepAngle", "Reverse SweepAngle", "Angle Range"));
+
+            items.Add(new DesignerActionTextItem(
+                "SweepAngle can be positive or negative, denoting \n" + 
+                "clockwise or counter-clockwise rotation, respectively", "Angle Range"));
+
+            return (items);
+        }
+
+        #endregion
+
+        #region ReverseSweepAngle
+
+        /// <summary>
+        /// Reverses the start and end angles for the control
+        /// </summary>
+        public void ReverseSweepAngle()
+        {
+            int angle = (StartAngle + SweepAngle) % 360;
+
+            if (angle < 0)
+                angle += 360;
+
+            StartAngle = angle;
+            SweepAngle = -SweepAngle;
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/KnobControlDesignTime.snk b/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/KnobControlDesignTime.snk
new file mode 100644
index 00000000..8c1b1af0
Binary files /dev/null and b/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/KnobControlDesignTime.snk differ
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/KnobControlDesigner.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/KnobControlDesigner.cs
new file mode 100644
index 00000000..04897614
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/KnobControlDesigner.cs	
@@ -0,0 +1,126 @@
+using System;
+using System.ComponentModel;
+using System.ComponentModel.Design;
+using System.Windows.Forms.Design;
+using DevComponents.Instrumentation;
+
+namespace DevComponents.Instrumentation.Design
+{
+    /// <summary>
+    /// KnobControlDesigner
+    /// </summary>
+    public class KnobControlDesigner : ControlDesigner
+    {
+        #region Private variables
+
+        private KnobControl _KnobControl;
+        private DesignerActionListCollection _ActionLists;
+
+        #endregion
+
+        #region Initialize
+
+        /// <summary>
+        /// Initializes our designer
+        /// </summary>
+        /// <param name="component"></param>
+        public override void Initialize(IComponent component)
+        {
+            base.Initialize(component);
+
+            if (component.Site.DesignMode == true)
+                _KnobControl = component as KnobControl;
+        }
+
+        #endregion
+
+        #region Verbs
+
+        /// <summary>
+        /// Creates our verb collection
+        /// </summary>
+        public override DesignerVerbCollection Verbs
+        {
+            get
+            {
+                DesignerVerb[] verbs = new DesignerVerb[]
+                {
+                    new DesignerVerb("KnobStyle 1", SetStyle1),
+                    new DesignerVerb("KnobStyle 2", SetStyle2),
+                    new DesignerVerb("KnobStyle 3", SetStyle3),
+                    new DesignerVerb("KnobStyle 4", SetStyle4),
+                };
+
+                return (new DesignerVerbCollection(verbs));
+            }
+        }
+
+        #endregion
+
+        #region SetStyle
+
+        /// <summary>
+        /// Sets the control to Style1
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected virtual void SetStyle1(object sender, EventArgs e)
+        {
+            _KnobControl.KnobStyle = eKnobStyle.Style1;
+        }
+
+        /// <summary>
+        /// Sets the control to Style2
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected virtual void SetStyle2(object sender, EventArgs e)
+        {
+            _KnobControl.KnobStyle = eKnobStyle.Style2;
+        }
+
+        /// <summary>
+        /// Sets the control to Style3
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected virtual void SetStyle3(object sender, EventArgs e)
+        {
+            _KnobControl.KnobStyle = eKnobStyle.Style3;
+        }
+
+        /// <summary>
+        /// Sets the control to Style4
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected virtual void SetStyle4(object sender, EventArgs e)
+        {
+            _KnobControl.KnobStyle = eKnobStyle.Style4;
+        }
+
+        #endregion
+
+        #region ActionLists
+
+        /// <summary>
+        /// Gets our DesignerActionListCollection list
+        /// </summary>
+        public override DesignerActionListCollection ActionLists
+        {
+            get
+            {
+                if (_ActionLists == null)
+                {
+                    _ActionLists = new DesignerActionListCollection();
+
+                    _ActionLists.Add(new KnobControlActionList(_KnobControl));
+                }
+
+                return (_ActionLists);
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/LocationDropDown.Designer.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/LocationDropDown.Designer.cs
new file mode 100644
index 00000000..09630bfe
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/LocationDropDown.Designer.cs	
@@ -0,0 +1,48 @@
+namespace DevComponents.Instrumentation.Design
+{
+    partial class LocationDropDown
+    {
+        /// <summary> 
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #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.SuspendLayout();
+            // 
+            // PivotPointDropDown
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.Name = "PivotPointDropDown";
+            this.Size = new System.Drawing.Size(99, 110);
+            this.PreviewKeyDown += new System.Windows.Forms.PreviewKeyDownEventHandler(this.PivotPointDropDown_PreviewKeyDown);
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/LocationDropDown.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/LocationDropDown.cs
new file mode 100644
index 00000000..3ca13b1a
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/LocationDropDown.cs	
@@ -0,0 +1,248 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Windows.Forms;
+using System.Windows.Forms.Design;
+
+namespace DevComponents.Instrumentation.Design
+{
+    [ToolboxItem(false)]
+    public partial class LocationDropDown : UserControl
+    {
+        #region Constants
+
+        private const int DotRadius = 4;
+
+        #endregion
+
+        #region Private variables
+
+        private PointF _PivotPoint;
+        private Rectangle _DotBounds;
+        private Rectangle _FrameBounds;
+
+        private Point _Center;
+
+        private bool _InFrame;
+        private bool _InPivotDot;
+        private bool _PivotMoving;
+
+        private bool _EscapePressed;
+
+        private IWindowsFormsEditorService _EditorService;
+        private ITypeDescriptorContext _Context;
+
+        #endregion
+
+        public LocationDropDown(PointF value,
+            IWindowsFormsEditorService editorService, ITypeDescriptorContext context)
+        {
+            Initialize();
+
+            _EditorService = editorService;
+            _Context = context;
+
+            PivotPoint = value;
+        }
+
+        public LocationDropDown()
+        {
+            Initialize();
+        }
+
+        #region Initialize
+
+        private void Initialize()
+        {
+            InitializeComponent();
+
+            SetStyle(ControlStyles.UserPaint, true);
+            SetStyle(ControlStyles.AllPaintingInWmPaint, true);
+            SetStyle(ControlStyles.OptimizedDoubleBuffer, true);
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region EditorService
+
+        public IWindowsFormsEditorService EditorService
+        {
+            get { return (_EditorService); }
+            set { _EditorService = value; }
+        }
+
+        #endregion
+
+        #region EscapePressed
+
+        public bool EscapePressed
+        {
+            get { return (_EscapePressed); }
+            set { _EscapePressed = value; }
+        }
+
+        #endregion
+
+        #region PivotPoint
+
+        public PointF PivotPoint
+        {
+            get { return (_PivotPoint); }
+
+            set
+            {
+                _PivotPoint = value;
+
+                RecalcLayout();
+                Invalidate();
+
+                _Context.OnComponentChanging();
+                _Context.PropertyDescriptor.SetValue(_Context.Instance, value);
+                _Context.OnComponentChanged();
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RecalcLayout
+
+        private void RecalcLayout()
+        {
+            int n = Math.Min(Bounds.Width - 4, Bounds.Height - 4);
+
+            _FrameBounds = new Rectangle(2, 2, n, n);
+            _FrameBounds.X = (Bounds.Width - n) / 2;
+            _FrameBounds.Y = (Bounds.Height - n) / 2;
+
+            int x = _FrameBounds.X + (int)(_PivotPoint.X * _FrameBounds.Width);
+            int y = _FrameBounds.Y + (int)(_PivotPoint.Y * _FrameBounds.Height);
+
+            _DotBounds = new Rectangle(x - DotRadius, y - DotRadius,
+                DotRadius * 2, DotRadius * 2);
+
+            _Center = new Point(_FrameBounds.X + _FrameBounds.Width / 2,
+                _FrameBounds.Y + _FrameBounds.Height / 2);
+        }
+
+        #endregion
+
+        #region Paint support
+
+        #region OnPaint
+
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            base.OnPaint(e);
+
+            Graphics g = e.Graphics;
+
+            g.SmoothingMode = SmoothingMode.AntiAlias;
+
+            RecalcLayout();
+
+            g.DrawLine(Pens.Red, new Point(_FrameBounds.X, _Center.Y),
+                new Point(_FrameBounds.Right, _Center.Y));
+
+            g.DrawLine(Pens.Red, new Point(_Center.X, _FrameBounds.Y),
+                new Point(_Center.X, _FrameBounds.Bottom));
+
+            DrawPivotDot(g);
+        }
+
+        #endregion
+
+        #region DrawPivotDot
+
+        private void DrawPivotDot(Graphics g)
+        {
+            g.FillEllipse(Brushes.SkyBlue, _DotBounds);
+            g.DrawEllipse(Pens.DimGray, _DotBounds);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Mouse support
+
+        #region OnMouseMove
+
+        protected override void OnMouseMove(MouseEventArgs e)
+        {
+            base.OnMouseMove(e);
+
+            _InFrame = (_FrameBounds.Contains(e.Location) == true);
+
+            if (_PivotMoving == true && _InFrame == true)
+            {
+                PivotPoint = new PointF(
+                    (float)(e.X - _FrameBounds.X) / _FrameBounds.Width,
+                    (float)(e.Y - _FrameBounds.Y) / _FrameBounds.Height);
+            }
+
+            _InPivotDot = (_DotBounds.Contains(e.Location) == true);
+
+            Cursor = (_InPivotDot == true) ? Cursors.Hand : Cursors.Default;
+        }
+
+        #endregion
+
+        #region OnMouseLeave
+
+        protected override void OnMouseLeave(EventArgs e)
+        {
+            base.OnMouseLeave(e);
+
+            _InFrame = false;
+            _InPivotDot = false;
+        }
+
+        #endregion
+
+        #region OnMouseDown
+
+        protected override void OnMouseDown(MouseEventArgs e)
+        {
+            base.OnMouseDown(e);
+
+            if (e.Button == MouseButtons.Left)
+            {
+                if (_InPivotDot == true)
+                    _PivotMoving = true;
+            }
+        }
+
+        #endregion
+
+        #region OnMouseUp
+
+        protected override void OnMouseUp(MouseEventArgs e)
+        {
+            base.OnMouseUp(e);
+
+            _PivotMoving = false;
+
+            _InFrame = (_FrameBounds.Contains(e.Location) == true);
+            _InPivotDot = (_DotBounds.Contains(e.Location) == true);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region PivotPointDropDown_PreviewKeyDown
+
+        private void PivotPointDropDown_PreviewKeyDown(object sender, PreviewKeyDownEventArgs e)
+        {
+            if (e.KeyCode == Keys.Escape)
+                _EscapePressed = true;
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/LocationDropDown.resx b/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/LocationDropDown.resx
new file mode 100644
index 00000000..19dc0dd8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/LocationDropDown.resx	
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/LocationEditor.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/LocationEditor.cs
new file mode 100644
index 00000000..c52f9196
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/LocationEditor.cs	
@@ -0,0 +1,59 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Windows.Forms.Design;
+
+namespace DevComponents.Instrumentation.Design
+{
+    public class LocationEditor : UITypeEditor
+    {
+        #region GetEditStyle
+
+        public override UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext context)
+        {
+            return (UITypeEditorEditStyle.DropDown);
+        }
+
+        #endregion
+
+        #region GetPaintValueSupported
+
+        public override bool GetPaintValueSupported(ITypeDescriptorContext context)
+        {
+            return (false);
+        }
+
+        #endregion
+
+        #region EditValue
+
+        public override object EditValue(
+            ITypeDescriptorContext context, IServiceProvider provider, object value)
+        {
+            if (provider != null)
+            {
+                IWindowsFormsEditorService editorService =
+                    provider.GetService(typeof(IWindowsFormsEditorService)) as IWindowsFormsEditorService;
+
+                if (editorService != null)
+                {
+                    LocationDropDown pv = new LocationDropDown((PointF)value, editorService, context);
+
+                    pv.EscapePressed = false;
+
+                    editorService.DropDownControl(pv);
+
+                    if (pv.EscapePressed == true)
+                        context.PropertyDescriptor.SetValue(context.Instance, value);
+                    else
+                        return (pv.PivotPoint);
+                }
+            }
+
+            return (base.EditValue(context, provider, value));
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/PivotPointDropDown.Designer.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/PivotPointDropDown.Designer.cs
new file mode 100644
index 00000000..e7632c94
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/PivotPointDropDown.Designer.cs	
@@ -0,0 +1,48 @@
+namespace DevComponents.Instrumentation.Design
+{
+    partial class PivotPointDropDown
+    {
+        /// <summary> 
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #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.SuspendLayout();
+            // 
+            // PivotPointDropDown
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.Name = "PivotPointDropDown";
+            this.Size = new System.Drawing.Size(99, 110);
+            this.PreviewKeyDown += new System.Windows.Forms.PreviewKeyDownEventHandler(this.PivotPointDropDown_PreviewKeyDown);
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/PivotPointDropDown.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/PivotPointDropDown.cs
new file mode 100644
index 00000000..dd80ff31
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/PivotPointDropDown.cs	
@@ -0,0 +1,425 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Windows.Forms;
+using System.Windows.Forms.Design;
+
+namespace DevComponents.Instrumentation.Design
+{
+    [ToolboxItem(false)]
+    public partial class PivotPointDropDown : UserControl
+    {
+        #region Constants
+
+        private const int DotRadius = 4;
+        private const int ScaleWidth = 3;
+        private const float BevelInside = .035f;
+        private const float BevelOutside = .05f;
+        private const float RoundRectangleArc = .125f;
+
+        #endregion
+
+        #region Private variables
+
+        private GaugeFrameStyle _Style;
+
+        private PointF _PivotPoint;
+        private Rectangle _DotBounds;
+        private Rectangle _FrameBounds;
+        private Rectangle _ScaleBounds;
+
+        private float _ScaleRadius;
+        private float _StartAngle;
+        private float _SweepAngle;
+
+        private bool _InFrame;
+        private bool _InPivotDot;
+        private bool _PivotMoving;
+
+        private bool _EscapePressed;
+
+        private IWindowsFormsEditorService _EditorService;
+        private ITypeDescriptorContext _Context;
+
+        #endregion
+
+        public PivotPointDropDown(PointF value, GaugeFrameStyle style,
+            float scaleRadius, float startAngle, float sweepAngle,
+            IWindowsFormsEditorService editorService, ITypeDescriptorContext context)
+        {
+            _Style = style;
+            _ScaleRadius = scaleRadius;
+            _StartAngle = startAngle;
+            _SweepAngle = sweepAngle;
+
+            _ScaleRadius = Math.Max(_ScaleRadius, .07f);
+
+            Initialize();
+
+            _EditorService = editorService;
+            _Context = context;
+
+            PivotPoint = value;
+        }
+
+        public PivotPointDropDown()
+        {
+            Initialize();
+        }
+
+        #region Initialize
+
+        private void Initialize()
+        {
+            InitializeComponent();
+
+            SetStyle(ControlStyles.UserPaint, true);
+            SetStyle(ControlStyles.AllPaintingInWmPaint, true);
+            SetStyle(ControlStyles.OptimizedDoubleBuffer, true);
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region EditorService
+
+        public IWindowsFormsEditorService EditorService
+        {
+            get { return (_EditorService); }
+            set { _EditorService = value; }
+        }
+
+        #endregion
+
+        #region EscapePressed
+
+        public bool EscapePressed
+        {
+            get { return (_EscapePressed); }
+            set { _EscapePressed = value; }
+        }
+
+        #endregion
+
+        #region PivotPoint
+
+        public PointF PivotPoint
+        {
+            get { return (_PivotPoint); }
+
+            set
+            {
+                _PivotPoint = value;
+
+                RecalcLayout();
+                Invalidate();
+
+                _Context.OnComponentChanging();
+                _Context.PropertyDescriptor.SetValue(_Context.Instance, value);
+                _Context.OnComponentChanged();
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RecalcLayout
+
+        private void RecalcLayout()
+        {
+            int n = Math.Min(Bounds.Width - 4, Bounds.Height - 4);
+
+            _FrameBounds = new Rectangle(2, 2, n, n);
+            _FrameBounds.X = (Bounds.Width - n) / 2;
+            _FrameBounds.Y = (Bounds.Height - n) / 2;
+
+            int radius = (int)(n * _ScaleRadius);
+
+            _ScaleBounds.Width = radius * 2;
+            _ScaleBounds.Height = radius * 2;
+
+            int x = _FrameBounds.X + (int)(_PivotPoint.X * _FrameBounds.Width);
+            int y = _FrameBounds.Y + (int)(_PivotPoint.Y * _FrameBounds.Height);
+
+            _ScaleBounds.X = x - radius;
+            _ScaleBounds.Y = y - radius;
+
+            _DotBounds = new Rectangle(x - DotRadius, y - DotRadius, DotRadius * 2, DotRadius * 2);
+        }
+
+        #endregion
+
+        #region Paint support
+
+        #region OnPaint
+
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            base.OnPaint(e);
+
+            Graphics g = e.Graphics;
+
+            g.SmoothingMode = SmoothingMode.AntiAlias;
+
+            RecalcLayout();
+
+            DrawFrame(g);
+            DrawScale(g);
+            DrawPivotDot(g);
+        }
+
+        #endregion
+
+        #region DrawFrame
+
+        private void DrawFrame(Graphics g)
+        {
+            switch (_Style)
+            {
+                case GaugeFrameStyle.Circular:
+                    DrawCircularFrame(g);
+                    break;
+
+                case GaugeFrameStyle.Rectangular:
+                    DrawRectangularFrame(g);
+                    break;
+
+                case GaugeFrameStyle.RoundedRectangular:
+                    DrawRoundedRectFrame(g);
+                    break;
+
+                default:
+                    DrawBlankFrame(g);
+                    break;
+            }
+        }
+
+        #region DrawCircularFrame
+
+        private void DrawCircularFrame(Graphics g)
+        {
+            using (LinearGradientBrush br = new LinearGradientBrush(_FrameBounds, Color.WhiteSmoke, Color.Gray, 45))
+                g.FillEllipse(br, _FrameBounds);
+
+            int bevelIn = (int)(_FrameBounds.Width * BevelInside);
+            int bevelOut = (int)(_FrameBounds.Width * BevelOutside);
+
+            Rectangle r = _FrameBounds;
+            r.Inflate(-bevelOut, -bevelOut);
+
+            using (LinearGradientBrush br = new LinearGradientBrush(r, Color.Silver, Color.Gray, 45 + 180))
+                g.FillEllipse(br, r);
+
+            r.Inflate(-bevelIn, -bevelIn);
+
+            using (LinearGradientBrush br = new LinearGradientBrush(r, Color.Silver, Color.LightGray, 45))
+                g.FillEllipse(br, r);
+        }
+
+        #endregion
+
+        #region DrawRectangularFrame
+
+        private void DrawRectangularFrame(Graphics g)
+        {
+            using (LinearGradientBrush br = new LinearGradientBrush(_FrameBounds, Color.WhiteSmoke, Color.Gray, 45))
+                g.FillRectangle(br, _FrameBounds);
+
+            int bevelIn = (int)(_FrameBounds.Width * BevelInside);
+            int bevelOut = (int)(_FrameBounds.Width * BevelOutside);
+
+            Rectangle r = _FrameBounds;
+            r.Inflate(-bevelOut, -bevelOut);
+
+            using (LinearGradientBrush br = new LinearGradientBrush(r, Color.Silver, Color.Gray, 45 + 180))
+                g.FillRectangle(br, r);
+
+            r.Inflate(-bevelIn, -bevelIn);
+
+            using (LinearGradientBrush br = new LinearGradientBrush(r, Color.Silver, Color.LightGray, 45))
+                g.FillRectangle(br, r);
+        }
+
+        #endregion
+
+        #region DrawRoundedRectFrame
+
+        private void DrawRoundedRectFrame(Graphics g)
+        {
+            using (GraphicsPath path = GetRoundRectPath(_FrameBounds))
+            {
+                using (LinearGradientBrush br = new LinearGradientBrush(_FrameBounds, Color.WhiteSmoke, Color.Gray, 45))
+                    g.FillPath(br, path);
+            }
+
+            int bevelIn = (int)(_FrameBounds.Width * BevelInside);
+            int bevelOut = (int)(_FrameBounds.Width * BevelOutside);
+
+            Rectangle r = _FrameBounds;
+            r.Inflate(-bevelOut, -bevelOut);
+
+            using (GraphicsPath path = GetRoundRectPath(r))
+            {
+                using (LinearGradientBrush br = new LinearGradientBrush(r, Color.Silver, Color.Gray, 45 + 180))
+                    g.FillPath(br, path);
+            }
+
+            r.Inflate(-bevelIn, -bevelIn);
+
+            using (GraphicsPath path = GetRoundRectPath(r))
+            {
+                using (LinearGradientBrush br = new LinearGradientBrush(r, Color.Silver, Color.LightGray, 45))
+                    g.FillPath(br, path);
+            }
+        }
+
+        #region GetRoundRectPath
+
+        private GraphicsPath GetRoundRectPath(Rectangle r)
+        {
+            GraphicsPath path = new GraphicsPath();
+
+            int m = Math.Min(r.Width, r.Height);
+            int n = (int)(m * RoundRectangleArc * 2) + 1;
+
+            Rectangle t = new Rectangle(r.Right - n, r.Bottom - n, n, n);
+            path.AddArc(t, 0, 90);
+
+            t.X = r.X;
+            path.AddArc(t, 90, 90);
+
+            t.Y = r.Y;
+            path.AddArc(t, 180, 90);
+
+            t.X = r.Right - n;
+            path.AddArc(t, 270, 90);
+
+            path.CloseAllFigures();
+
+            return (path);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region DrawBlankFrame
+
+        private void DrawBlankFrame(Graphics g)
+        {
+            using (Brush br = new SolidBrush(Color.LightGray))
+                g.FillRectangle(br, _FrameBounds);
+
+            g.DrawRectangle(Pens.DimGray, _FrameBounds);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region DrawScale
+
+        private void DrawScale(Graphics g)
+        {
+            using (Brush br = new SolidBrush(Color.CornflowerBlue))
+            {
+                using (Pen pen = new Pen(br, ScaleWidth))
+                    g.DrawArc(pen, _ScaleBounds, _StartAngle, _SweepAngle);
+            }
+        }
+
+        #endregion
+
+        #region DrawPivotDot
+
+        private void DrawPivotDot(Graphics g)
+        {
+            g.FillEllipse(Brushes.SkyBlue, _DotBounds);
+            g.DrawEllipse(Pens.DimGray, _DotBounds);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Mouse support
+
+        #region OnMouseMove
+
+        protected override void OnMouseMove(MouseEventArgs e)
+        {
+            base.OnMouseMove(e);
+
+            _InFrame = (_FrameBounds.Contains(e.Location) == true);
+
+            if (_PivotMoving == true && _InFrame == true)
+            {
+                PivotPoint = new PointF(
+                    (float)(e.X - _FrameBounds.X) / _FrameBounds.Width,
+                    (float)(e.Y - _FrameBounds.Y) / _FrameBounds.Height);
+            }
+
+            _InPivotDot = (_DotBounds.Contains(e.Location) == true);
+
+            Cursor = (_InPivotDot == true) ? Cursors.Hand : Cursors.Default;
+        }
+
+        #endregion
+
+        #region OnMouseLeave
+
+        protected override void OnMouseLeave(EventArgs e)
+        {
+            base.OnMouseLeave(e);
+
+            _InFrame = false;
+            _InPivotDot = false;
+        }
+
+        #endregion
+
+        #region OnMouseDown
+
+        protected override void OnMouseDown(MouseEventArgs e)
+        {
+            base.OnMouseDown(e);
+
+            if (e.Button == MouseButtons.Left)
+            {
+                if (_InPivotDot == true)
+                    _PivotMoving = true;
+            }
+        }
+
+        #endregion
+
+        #region OnMouseUp
+
+        protected override void OnMouseUp(MouseEventArgs e)
+        {
+            base.OnMouseUp(e);
+
+            _PivotMoving = false;
+
+            _InFrame = (_FrameBounds.Contains(e.Location) == true);
+            _InPivotDot = (_DotBounds.Contains(e.Location) == true);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region PivotPointDropDown_PreviewKeyDown
+
+        private void PivotPointDropDown_PreviewKeyDown(object sender, PreviewKeyDownEventArgs e)
+        {
+            if (e.KeyCode == Keys.Escape)
+                _EscapePressed = true;
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/PivotPointDropDown.resx b/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/PivotPointDropDown.resx
new file mode 100644
index 00000000..19dc0dd8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/PivotPointDropDown.resx	
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/PivotPointEditor.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/PivotPointEditor.cs
new file mode 100644
index 00000000..ee5a50e0
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/PivotPointEditor.cs	
@@ -0,0 +1,65 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Windows.Forms.Design;
+
+namespace DevComponents.Instrumentation.Design
+{
+    public class PivotPointEditor : UITypeEditor
+    {
+        #region GetEditStyle
+
+        public override UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext context)
+        {
+            return (UITypeEditorEditStyle.DropDown);
+        }
+
+        #endregion
+
+        #region GetPaintValueSupported
+
+        public override bool GetPaintValueSupported(ITypeDescriptorContext context)
+        {
+            return (false);
+        }
+
+        #endregion
+
+        #region EditValue
+
+        public override object EditValue(
+            ITypeDescriptorContext context, IServiceProvider provider, object value)
+        {
+            if (provider != null)
+            {
+                IWindowsFormsEditorService editorService =
+                    provider.GetService(typeof(IWindowsFormsEditorService)) as IWindowsFormsEditorService;
+
+                if (editorService != null)
+                {
+                    GaugeCircularScale scale = context.Instance as GaugeCircularScale;
+
+                    if (scale != null)
+                    {
+                        PivotPointDropDown pv = new PivotPointDropDown((PointF) value, scale.GaugeControl.Frame.Style,
+                            scale.Radius, scale.StartAngle, scale.SweepAngle, editorService, context);
+
+                        pv.EscapePressed = false;
+
+                        editorService.DropDownControl(pv);
+
+                        if (pv.EscapePressed == true)
+                            context.PropertyDescriptor.SetValue(context.Instance, value);
+                        else
+                            return (pv.PivotPoint);
+                    }
+                }
+            }
+
+            return (base.EditValue(context, provider, value));
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/Properties/Resources.Designer.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/Properties/Resources.Designer.cs
new file mode 100644
index 00000000..fe9a0b0e
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/Properties/Resources.Designer.cs	
@@ -0,0 +1,171 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:2.0.50727.4952
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace DevComponents.DotNetBarKnobControl.Design.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DevComponents.DotNetBarKnobControl.Design.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        internal static System.Drawing.Bitmap Copy {
+            get {
+                object obj = ResourceManager.GetObject("Copy", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The currency (&quot;C&quot;) format specifier converts a number to a string that represents a currency amount.
+        ///
+        ///The precision specifier indicates the desired number of decimal places in the result string..
+        /// </summary>
+        internal static string CurrencyDesc {
+            get {
+                return ResourceManager.GetString("CurrencyDesc", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Characters that can be used to create custom numeric format strings:
+        ///
+        ///&apos;0&apos; - Zero placeholder, &apos;#&apos; - Digit placeholder, &apos;.&apos; - Decimal point, &apos;,&apos; - Group separator and number scaling , &apos;%&apos; - Percentage, &apos;E0&apos; - Scientific notation, &apos;\&apos; - Escape character, &apos;;&apos; - Section separator. 
+        ///
+        ///All other characters are copied to the output string as literals in the position they appear..
+        /// </summary>
+        internal static string CustomDesc {
+            get {
+                return ResourceManager.GetString("CustomDesc", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The decimal (&quot;D&quot;) format specifier converts a number to a string of decimal digits (0-9), prefixed by a minus sign if the number is negative. This format is supported only for integral types. 
+        ///
+        ///The precision specifier indicates the minimum number of digits desired in the resulting string. If required, the number is padded with zeros to its left to produce the number of digits given by the precision specifier. If no precision specifier is specified, the default is the minimum value required to represent th [rest of string was truncated]&quot;;.
+        /// </summary>
+        internal static string DecimalDesc {
+            get {
+                return ResourceManager.GetString("DecimalDesc", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The exponential or Scientific (&quot;E&quot;) format specifier converts a number to a string of the form &quot;-d.ddd…E+ddd&quot; or &quot;-d.ddd…e+ddd&quot;, where each &quot;d&quot; indicates a digit (0-9). The string starts with a minus sign if the number is negative. Exactly one digit always precedes the decimal point.
+        ///
+        ///The precision specifier indicates the desired number of digits after the decimal point. If the precision specifier is omitted, a default of six digits after the decimal point is used..
+        /// </summary>
+        internal static string ExponentialDesc {
+            get {
+                return ResourceManager.GetString("ExponentialDesc", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The fixed-point (&quot;F&quot;) format specifier converts a number to a string of the form &quot;-ddd.ddd…&quot; where each &quot;d&quot; indicates a digit (0-9). The string starts with a minus sign if the number is negative.
+        ///
+        ///The precision specifier indicates the desired number of decimal places..
+        /// </summary>
+        internal static string FixedPointDesc {
+            get {
+                return ResourceManager.GetString("FixedPointDesc", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The general (&quot;G&quot;) format specifier converts a number to the most compact of either fixed-point or scientific notation, depending on the type of the number and whether a precision specifier is present.
+        ///
+        ///The precision specifier defines the maximum number of significant digits that can appear in the result string..
+        /// </summary>
+        internal static string GeneralDesc {
+            get {
+                return ResourceManager.GetString("GeneralDesc", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The hexadecimal (&quot;X&quot;) format specifier converts a number to a string of hexadecimal digits. This format is supported only for integral types.
+        ///
+        ///The precision specifier indicates the minimum number of digits desired in the resulting string. If required, the number is padded with zeros to its left to produce the number of digits given by the precision specifier..
+        /// </summary>
+        internal static string HexadecimalDesc {
+            get {
+                return ResourceManager.GetString("HexadecimalDesc", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The numeric (&quot;N&quot;) format specifier converts a number to a string of the form &quot;-d,ddd,ddd.ddd…&quot;, where &quot;-&quot; indicates a negative number symbol if required, &quot;d&quot; indicates a digit (0-9), &quot;,&quot; indicates a group separator, and &quot;.&quot; indicates a decimal point symbol.
+        ///
+        ///The precision specifier indicates the desired number of decimal places..
+        /// </summary>
+        internal static string NumericDesc {
+            get {
+                return ResourceManager.GetString("NumericDesc", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The percent (&quot;P&quot;) format specifier multiplies a number by 100 and converts it to a string that represents a percentage.
+        ///
+        ///The precision specifier indicates the desired number of decimal places..
+        /// </summary>
+        internal static string PercentDesc {
+            get {
+                return ResourceManager.GetString("PercentDesc", resourceCulture);
+            }
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/Properties/Resources.resx b/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/Properties/Resources.resx
new file mode 100644
index 00000000..f9cbfed0
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/Properties/Resources.resx	
@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="Copy" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Copy.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="CurrencyDesc" xml:space="preserve">
+    <value>The currency ("C") format specifier converts a number to a string that represents a currency amount.
+
+The precision specifier indicates the desired number of decimal places in the result string.</value>
+  </data>
+  <data name="CustomDesc" xml:space="preserve">
+    <value>Characters that can be used to create custom numeric format strings:
+
+'0' - Zero placeholder, '#' - Digit placeholder, '.' - Decimal point, ',' - Group separator and number scaling , '%' - Percentage, 'E0' - Scientific notation, '\' - Escape character, ';' - Section separator. 
+
+All other characters are copied to the output string as literals in the position they appear.</value>
+  </data>
+  <data name="DecimalDesc" xml:space="preserve">
+    <value>The decimal ("D") format specifier converts a number to a string of decimal digits (0-9), prefixed by a minus sign if the number is negative. This format is supported only for integral types. 
+
+The precision specifier indicates the minimum number of digits desired in the resulting string. If required, the number is padded with zeros to its left to produce the number of digits given by the precision specifier. If no precision specifier is specified, the default is the minimum value required to represent the integer without leading zeros.</value>
+  </data>
+  <data name="ExponentialDesc" xml:space="preserve">
+    <value>The exponential or Scientific ("E") format specifier converts a number to a string of the form "-d.ddd…E+ddd" or "-d.ddd…e+ddd", where each "d" indicates a digit (0-9). The string starts with a minus sign if the number is negative. Exactly one digit always precedes the decimal point.
+
+The precision specifier indicates the desired number of digits after the decimal point. If the precision specifier is omitted, a default of six digits after the decimal point is used.</value>
+  </data>
+  <data name="FixedPointDesc" xml:space="preserve">
+    <value>The fixed-point ("F") format specifier converts a number to a string of the form "-ddd.ddd…" where each "d" indicates a digit (0-9). The string starts with a minus sign if the number is negative.
+
+The precision specifier indicates the desired number of decimal places.</value>
+  </data>
+  <data name="GeneralDesc" xml:space="preserve">
+    <value>The general ("G") format specifier converts a number to the most compact of either fixed-point or scientific notation, depending on the type of the number and whether a precision specifier is present.
+
+The precision specifier defines the maximum number of significant digits that can appear in the result string.</value>
+  </data>
+  <data name="HexadecimalDesc" xml:space="preserve">
+    <value>The hexadecimal ("X") format specifier converts a number to a string of hexadecimal digits. This format is supported only for integral types.
+
+The precision specifier indicates the minimum number of digits desired in the resulting string. If required, the number is padded with zeros to its left to produce the number of digits given by the precision specifier.</value>
+  </data>
+  <data name="NumericDesc" xml:space="preserve">
+    <value>The numeric ("N") format specifier converts a number to a string of the form "-d,ddd,ddd.ddd…", where "-" indicates a negative number symbol if required, "d" indicates a digit (0-9), "," indicates a group separator, and "." indicates a decimal point symbol.
+
+The precision specifier indicates the desired number of decimal places.</value>
+  </data>
+  <data name="PercentDesc" xml:space="preserve">
+    <value>The percent ("P") format specifier multiplies a number by 100 and converts it to a string that represents a percentage.
+
+The precision specifier indicates the desired number of decimal places.</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/RangeValueDropDown.Designer.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/RangeValueDropDown.Designer.cs
new file mode 100644
index 00000000..b67e82f5
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/RangeValueDropDown.Designer.cs	
@@ -0,0 +1,105 @@
+namespace DevComponents.Instrumentation.Design
+{
+    partial class RangeValueDropDown
+    {
+        /// <summary> 
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #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._TrackBar = new System.Windows.Forms.TrackBar();
+            this._LabelValue = new System.Windows.Forms.Label();
+            this._LabelMin = new System.Windows.Forms.Label();
+            this._LabelMax = new System.Windows.Forms.Label();
+            ((System.ComponentModel.ISupportInitialize)(this._TrackBar)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // _TrackBar
+            // 
+            this._TrackBar.AutoSize = false;
+            this._TrackBar.Dock = System.Windows.Forms.DockStyle.Fill;
+            this._TrackBar.Location = new System.Drawing.Point(0, 0);
+            this._TrackBar.Name = "_TrackBar";
+            this._TrackBar.Size = new System.Drawing.Size(186, 40);
+            this._TrackBar.TabIndex = 0;
+            this._TrackBar.PreviewKeyDown += new System.Windows.Forms.PreviewKeyDownEventHandler(this._TrackBar_PreviewKeyDown);
+            this._TrackBar.ValueChanged += new System.EventHandler(this.TrackBar_ValueChanged);
+            // 
+            // _LabelValue
+            // 
+            this._LabelValue.AutoEllipsis = true;
+            this._LabelValue.Location = new System.Drawing.Point(59, 21);
+            this._LabelValue.Name = "_LabelValue";
+            this._LabelValue.Size = new System.Drawing.Size(69, 16);
+            this._LabelValue.TabIndex = 1;
+            this._LabelValue.Text = "Value";
+            this._LabelValue.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // _LabelMin
+            // 
+            this._LabelMin.AutoEllipsis = true;
+            this._LabelMin.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+            this._LabelMin.Location = new System.Drawing.Point(3, 21);
+            this._LabelMin.Name = "_LabelMin";
+            this._LabelMin.Size = new System.Drawing.Size(50, 16);
+            this._LabelMin.TabIndex = 2;
+            this._LabelMin.Text = "Min";
+            this._LabelMin.TextAlign = System.Drawing.ContentAlignment.BottomLeft;
+            // 
+            // _LabelMax
+            // 
+            this._LabelMax.AutoEllipsis = true;
+            this._LabelMax.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+            this._LabelMax.Location = new System.Drawing.Point(134, 21);
+            this._LabelMax.Name = "_LabelMax";
+            this._LabelMax.Size = new System.Drawing.Size(52, 16);
+            this._LabelMax.TabIndex = 3;
+            this._LabelMax.Text = "Max";
+            this._LabelMax.TextAlign = System.Drawing.ContentAlignment.BottomRight;
+            // 
+            // RangeValueDropDown
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.Controls.Add(this._LabelMax);
+            this.Controls.Add(this._LabelMin);
+            this.Controls.Add(this._LabelValue);
+            this.Controls.Add(this._TrackBar);
+            this.Name = "RangeValueDropDown";
+            this.Size = new System.Drawing.Size(186, 40);
+            ((System.ComponentModel.ISupportInitialize)(this._TrackBar)).EndInit();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.TrackBar _TrackBar;
+        private System.Windows.Forms.Label _LabelValue;
+        private System.Windows.Forms.Label _LabelMin;
+        private System.Windows.Forms.Label _LabelMax;
+
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/RangeValueDropDown.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/RangeValueDropDown.cs
new file mode 100644
index 00000000..794af900
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/RangeValueDropDown.cs	
@@ -0,0 +1,154 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Windows.Forms;
+using System.Windows.Forms.Design;
+
+namespace DevComponents.Instrumentation.Design
+{
+    [ToolboxItem(false)]
+    public partial class RangeValueDropDown : UserControl
+    {
+        #region Private variables
+
+        private float _Value;
+        private bool _EscapePressed;
+
+        private IWindowsFormsEditorService _EditorService;
+        private ITypeDescriptorContext _Context;
+
+        #endregion
+
+        public RangeValueDropDown(float value, float minimum, float maximum,
+            IWindowsFormsEditorService editorService, ITypeDescriptorContext context)
+        {
+            InitializeComponent();
+
+            _EditorService = editorService;
+            _Context = context;
+
+            if (value < minimum)
+            {
+                if ((minimum * 1000 > Int16.MinValue) && (minimum * 1000 < Int16.MaxValue))
+                    minimum = value;
+            }
+
+            if (value > maximum)
+            {
+                if ((maximum * 1000 > Int16.MinValue) && (maximum * 1000 < Int16.MaxValue))
+                    maximum = value;
+            }
+
+            _TrackBar.Minimum = (int)(minimum * 1000);
+            _TrackBar.Maximum = (int)(maximum * 1000);
+            _TrackBar.SmallChange = _TrackBar.Maximum / 100;
+            _TrackBar.LargeChange = _TrackBar.Maximum / 10;
+            _TrackBar.TickFrequency = _TrackBar.LargeChange;
+
+            _TrackBar.Value = (int)(value * 1000);
+
+            _LabelMin.Text = String.Format("{0:f}", minimum);
+            _LabelMax.Text = String.Format("{0:f}", maximum);
+
+            Value = value;
+        }
+
+        public RangeValueDropDown()
+        {
+            InitializeComponent();
+        }
+
+        #region DefaultSize
+
+        protected override Size DefaultSize
+        {
+            get { return new Size(186, 40); }
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region EditorService
+
+        public IWindowsFormsEditorService EditorService
+        {
+            get { return (_EditorService); }
+            set { _EditorService = value; }
+        }
+
+        #endregion
+
+        #region EscapePressed
+
+        public bool EscapePressed
+        {
+            get { return (_EscapePressed); }
+            set { _EscapePressed = value; }
+        }
+
+        #endregion
+
+        #region Value
+
+        public float Value
+        {
+            get { return (_Value); }
+
+            set
+            {
+                _Value = value;
+
+                _LabelValue.Text = String.Format("{0:f3}", value);
+                _LabelValue.Update();
+
+                _Context.OnComponentChanging();
+                _Context.PropertyDescriptor.SetValue(_Context.Instance, value);
+                _Context.OnComponentChanged();
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region OnResize
+
+        protected override void OnResize(EventArgs e)
+        {
+            base.OnResize(e);
+
+            int width = _TrackBar.Width;
+
+            int dx = width / 3;
+
+            _LabelMin.Width = dx;
+            _LabelMax.Width = dx;
+            _LabelValue.Width = dx;
+
+            _LabelValue.Location = new Point((width - dx) / 2, _LabelValue.Location.Y);
+            _LabelMax.Location = new Point(width - dx, _LabelMax.Location.Y);
+        }
+
+        #endregion
+
+        #region _TrackBar_ValueChanged
+
+        private void TrackBar_ValueChanged(object sender, EventArgs e)
+        {
+            Value = ((float)_TrackBar.Value) / 1000;
+        }
+
+        #endregion
+
+        #region _TrackBar_PreviewKeyDown
+
+        private void _TrackBar_PreviewKeyDown(object sender, PreviewKeyDownEventArgs e)
+        {
+            if (e.KeyCode == Keys.Escape)
+                _EscapePressed = true;
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/RangeValueDropDown.resx b/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/RangeValueDropDown.resx
new file mode 100644
index 00000000..19dc0dd8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/RangeValueDropDown.resx	
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/RangeValueEditor.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/RangeValueEditor.cs
new file mode 100644
index 00000000..9e281822
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/RangeValueEditor.cs	
@@ -0,0 +1,218 @@
+using System;
+using System.ComponentModel;
+using System.Drawing.Design;
+using System.Windows.Forms.Design;
+
+namespace DevComponents.Instrumentation.Design
+{
+    public class RangeValueEditor : UITypeEditor
+    {
+        #region Private variables
+
+        private const float MinValue = 0;
+        private const float MaxValue = 1;
+
+        #endregion
+
+        #region Public properties
+
+        public virtual float Minimum
+        {
+            get { return (MinValue); }
+        }
+
+        public virtual float Maximum
+        {
+            get { return (MaxValue); }
+        }
+
+        #endregion
+
+        #region GetEditStyle
+
+        public override UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext context)
+        {
+            return (UITypeEditorEditStyle.DropDown);
+        }
+
+        #endregion
+
+        #region GetPaintValueSupported
+
+        public override bool GetPaintValueSupported(ITypeDescriptorContext context)
+        {
+            return (false);
+        }
+
+        #endregion
+
+        #region EditValue
+
+        public override object EditValue(
+            ITypeDescriptorContext context, IServiceProvider provider, object value)
+        {
+            if (provider != null)
+            {
+                IWindowsFormsEditorService editorService =
+                    provider.GetService(typeof(IWindowsFormsEditorService)) as IWindowsFormsEditorService;
+
+                if (editorService != null)
+                {
+                    RangeValueDropDown rv = new
+                        RangeValueDropDown((float)value, Minimum, Maximum, editorService, context);
+
+                    rv.EscapePressed = false;
+
+                    editorService.DropDownControl(rv);
+
+                    if (rv.EscapePressed == true)
+                        context.PropertyDescriptor.SetValue(context.Instance, value);
+                    else
+                        return (rv.Value);
+                }
+            }
+
+            return (base.EditValue(context, provider, value));
+        }
+
+        #endregion
+    }
+
+    #region AngleRangeValueEditor
+
+    public class AngleRangeValueEditor : RangeValueEditor
+    {
+        #region Public properties
+
+        public override float Maximum
+        {
+            get { return (360); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region RadiusRangeValueEditor
+
+    public class RadiusRangeValueEditor : RangeValueEditor
+    {
+        #region Public properties
+        
+        public override float Maximum
+        {
+            get { return (.5f); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region WidthRangeValueEditor
+
+    public class WidthRangeValueEditor : RangeValueEditor
+    {
+        #region Public properties
+
+        public override float Maximum
+        {
+            get { return (.3f); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region CapWidthRangeValueEditor
+
+    public class CapWidthRangeValueEditor : RangeValueEditor
+    {
+        #region Public properties
+
+        public override float Maximum
+        {
+            get { return (1f); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region OffsetRangeValueEditor
+
+    public class OffsetRangeValueEditor : RangeValueEditor
+    {
+        #region Public properties
+
+        public override float Maximum
+        {
+            get { return (.3f); }
+        }
+
+        public override float Minimum
+        {
+            get { return (-.3f); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region OffsetRangeValueEditor
+
+    public class OffsetPosRangeValueEditor : RangeValueEditor
+    {
+        #region Public properties
+
+        public override float Maximum
+        {
+            get { return (.9f); }
+        }
+
+        public override float Minimum
+        {
+            get { return (0f); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region WidthMaxRangeValueEditor
+
+    public class WidthMaxRangeValueEditor : RangeValueEditor
+    {
+        #region Public properties
+
+        public override float Maximum
+        {
+            get { return (1f); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region HalfRadiusRangeValueEditor
+
+    public class HalfRadiusRangeValueEditor : RangeValueEditor
+    {
+        #region Public properties
+
+        public override float Maximum
+        {
+            get { return (.5f); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/Resources/Copy.png b/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/Resources/Copy.png
new file mode 100644
index 00000000..195dc6d6
Binary files /dev/null and b/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/Resources/Copy.png differ
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/SizeDropDown.Designer.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/SizeDropDown.Designer.cs
new file mode 100644
index 00000000..cdbb453c
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/SizeDropDown.Designer.cs	
@@ -0,0 +1,48 @@
+namespace DevComponents.Instrumentation.Design
+{
+    partial class SizeDropDown
+    {
+        /// <summary> 
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #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.SuspendLayout();
+            // 
+            // PivotPointDropDown
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.Name = "PivotPointDropDown";
+            this.Size = new System.Drawing.Size(99, 110);
+            this.PreviewKeyDown += new System.Windows.Forms.PreviewKeyDownEventHandler(this.PivotPointDropDown_PreviewKeyDown);
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/SizeDropDown.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/SizeDropDown.cs
new file mode 100644
index 00000000..50ce5079
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/SizeDropDown.cs	
@@ -0,0 +1,242 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Windows.Forms;
+using System.Windows.Forms.Design;
+
+namespace DevComponents.Instrumentation.Design
+{
+    [ToolboxItem(false)]
+    public partial class SizeDropDown : UserControl
+    {
+        #region Constants
+
+        private const int DotRadius = 4;
+
+        #endregion
+
+        #region Private variables
+
+        private SizeF _Size;
+        private Rectangle _DotBounds;
+        private Rectangle _FrameBounds;
+        private Rectangle _DotRect;
+
+        private bool _InFrame;
+        private bool _InSizeDot;
+        private bool _PivotMoving;
+
+        private bool _EscapePressed;
+
+        private IWindowsFormsEditorService _EditorService;
+        private ITypeDescriptorContext _Context;
+
+        #endregion
+
+        public SizeDropDown(SizeF value,
+            IWindowsFormsEditorService editorService, ITypeDescriptorContext context)
+        {
+            Initialize();
+
+            _EditorService = editorService;
+            _Context = context;
+
+            _Size = value;
+        }
+
+        public SizeDropDown()
+        {
+            Initialize();
+        }
+
+        #region Initialize
+
+        private void Initialize()
+        {
+            InitializeComponent();
+
+            SetStyle(ControlStyles.UserPaint, true);
+            SetStyle(ControlStyles.AllPaintingInWmPaint, true);
+            SetStyle(ControlStyles.OptimizedDoubleBuffer, true);
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region EditorService
+
+        public IWindowsFormsEditorService EditorService
+        {
+            get { return (_EditorService); }
+            set { _EditorService = value; }
+        }
+
+        #endregion
+
+        #region EscapePressed
+
+        public bool EscapePressed
+        {
+            get { return (_EscapePressed); }
+            set { _EscapePressed = value; }
+        }
+
+        #endregion
+
+        #region PivotPoint
+
+        public SizeF Syze
+        {
+            get { return (_Size); }
+
+            set
+            {
+                _Size = value;
+
+                RecalcLayout();
+                Invalidate();
+
+                _Context.OnComponentChanging();
+                _Context.PropertyDescriptor.SetValue(_Context.Instance, value);
+                _Context.OnComponentChanged();
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RecalcLayout
+
+        private void RecalcLayout()
+        {
+            int n = Math.Min(Bounds.Width - 4, Bounds.Height - 4);
+
+            _FrameBounds = new Rectangle(2, 2, n, n);
+            _FrameBounds.X = (Bounds.Width - n) / 2;
+            _FrameBounds.Y = (Bounds.Height - n) / 2;
+
+            int x = _FrameBounds.X + (int)(_Size.Width * _FrameBounds.Width);
+            int y = _FrameBounds.Y + (int)(_Size.Height * _FrameBounds.Height);
+
+            _DotBounds = new Rectangle(x - DotRadius, y - DotRadius,
+                DotRadius * 2, DotRadius * 2);
+
+            _DotRect = new Rectangle(0, 0, x, y);
+        }
+
+        #endregion
+
+        #region Paint support
+
+        #region OnPaint
+
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            base.OnPaint(e);
+
+            Graphics g = e.Graphics;
+
+            g.SmoothingMode = SmoothingMode.AntiAlias;
+
+            RecalcLayout();
+
+            g.DrawRectangle(Pens.Red, _DotRect);
+
+            DrawPivotDot(g);
+        }
+
+        #endregion
+
+        #region DrawPivotDot
+
+        private void DrawPivotDot(Graphics g)
+        {
+            g.FillEllipse(Brushes.SkyBlue, _DotBounds);
+            g.DrawEllipse(Pens.DimGray, _DotBounds);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Mouse support
+
+        #region OnMouseMove
+
+        protected override void OnMouseMove(MouseEventArgs e)
+        {
+            base.OnMouseMove(e);
+
+            _InFrame = (_FrameBounds.Contains(e.Location) == true);
+
+            if (_PivotMoving == true && _InFrame == true)
+            {
+                Syze = new SizeF(
+                    (float)(e.X - _FrameBounds.X) / _FrameBounds.Width,
+                    (float)(e.Y - _FrameBounds.Y) / _FrameBounds.Height);
+            }
+
+            _InSizeDot = (_DotBounds.Contains(e.Location) == true);
+
+            Cursor = (_InSizeDot == true) ? Cursors.Hand : Cursors.Default;
+        }
+
+        #endregion
+
+        #region OnMouseLeave
+
+        protected override void OnMouseLeave(EventArgs e)
+        {
+            base.OnMouseLeave(e);
+
+            _InFrame = false;
+            _InSizeDot = false;
+        }
+
+        #endregion
+
+        #region OnMouseDown
+
+        protected override void OnMouseDown(MouseEventArgs e)
+        {
+            base.OnMouseDown(e);
+
+            if (e.Button == MouseButtons.Left)
+            {
+                if (_InSizeDot == true)
+                    _PivotMoving = true;
+            }
+        }
+
+        #endregion
+
+        #region OnMouseUp
+
+        protected override void OnMouseUp(MouseEventArgs e)
+        {
+            base.OnMouseUp(e);
+
+            _PivotMoving = false;
+
+            _InFrame = (_FrameBounds.Contains(e.Location) == true);
+            _InSizeDot = (_DotBounds.Contains(e.Location) == true);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region PivotPointDropDown_PreviewKeyDown
+
+        private void PivotPointDropDown_PreviewKeyDown(object sender, PreviewKeyDownEventArgs e)
+        {
+            if (e.KeyCode == Keys.Escape)
+                _EscapePressed = true;
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/SizeDropDown.resx b/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/SizeDropDown.resx
new file mode 100644
index 00000000..19dc0dd8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/SizeDropDown.resx	
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/SizeEditor.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/SizeEditor.cs
new file mode 100644
index 00000000..8f1910a4
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/KnobControlDesignTime/SizeEditor.cs	
@@ -0,0 +1,59 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Windows.Forms.Design;
+
+namespace DevComponents.Instrumentation.Design
+{
+    public class SizeEditor : UITypeEditor
+    {
+        #region GetEditStyle
+
+        public override UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext context)
+        {
+            return (UITypeEditorEditStyle.DropDown);
+        }
+
+        #endregion
+
+        #region GetPaintValueSupported
+
+        public override bool GetPaintValueSupported(ITypeDescriptorContext context)
+        {
+            return (false);
+        }
+
+        #endregion
+
+        #region EditValue
+
+        public override object EditValue(
+            ITypeDescriptorContext context, IServiceProvider provider, object value)
+        {
+            if (provider != null)
+            {
+                IWindowsFormsEditorService editorService =
+                    provider.GetService(typeof(IWindowsFormsEditorService)) as IWindowsFormsEditorService;
+
+                if (editorService != null)
+                {
+                    SizeDropDown pv = new SizeDropDown((SizeF)value, editorService, context);
+
+                    pv.EscapePressed = false;
+
+                    editorService.DropDownControl(pv);
+
+                    if (pv.EscapePressed == true)
+                        context.PropertyDescriptor.SetValue(context.Instance, value);
+                    else
+                        return (pv.Syze);
+                }
+            }
+
+            return (base.EditValue(context, provider, value));
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/Knobs/BaseKnob.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/Knobs/BaseKnob.cs
new file mode 100644
index 00000000..5e2410c8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/Knobs/BaseKnob.cs	
@@ -0,0 +1,818 @@
+using System;
+using System.Drawing;
+using System.Windows.Forms;
+using System.Drawing.Drawing2D;
+
+namespace DevComponents.Instrumentation.Primitives
+{
+    public class BaseKnob
+    {
+        #region Private variables
+
+        private bool _Reset = true;
+        private int _KnobIndicatorPointerBorderWidth = -1;
+
+        #endregion
+
+        #region Protected variables
+
+        protected KnobControl Knob;             // Associated KnobControl
+
+        protected int MajorTicks;               // Number of major ticks
+        protected int MinorTicks;               // Number of minor ticks
+        protected Size MajorTickSize;           // Size of a major tick
+        protected Size MinorTickSize;           // Size of a minor tick
+
+        protected int KnobWidth;                // Normalized knob width
+        protected int IndTickHeight;            // Ind tick height;
+        protected int MaxLabelWidth;            // Maximum label width
+        protected float ZoneIndWidth;           // Zone indicator width
+
+        protected KnobColorTable DefaultColorTable;    // Default Knob color table
+
+        #endregion
+
+        #region Internal variables
+
+        internal Rectangle TickLabelBounds;     // Tick Label bounding rectangle
+        internal Rectangle KnobFaceBounds;      // Knob face bounding rectangle
+        internal Rectangle KnobIndicatorBounds; // Knob Indicator bounding rectangle
+        internal Rectangle FocusRectBounds;     // Focus bounding rectangle
+        internal Rectangle ZoneIndicatorBounds; // Zone indicator bounding rectangle
+
+        #endregion
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="knobControl">Associated knob control</param>
+        public BaseKnob(KnobControl knobControl)
+        {
+            Knob = knobControl;
+
+            DefaultColorTable = new KnobColorTable();
+        }
+
+        #region Public Properties
+
+        #region MajorTickColor
+
+        /// <summary>
+        /// MajorTickColor
+        /// </summary>
+        protected Color MajorTickColor
+        {
+            get
+            {
+                Color c = Knob.KnobColor.MajorTickColor;
+
+                return (c.IsEmpty == false ?
+                    c : DefaultColorTable.MajorTickColor);
+            }
+        }
+
+        #endregion
+
+        #region MinorTickColor
+
+        /// <summary>
+        /// MinorTickColor
+        /// </summary>
+        protected Color MinorTickColor
+        {
+            get
+            {
+                Color c = Knob.KnobColor.MinorTickColor;
+
+                return (c.IsEmpty == false ?
+                    c : DefaultColorTable.MinorTickColor);
+            }
+        }
+
+        #endregion
+
+        #region KnobIndicatorPointerBorderColor
+
+        /// <summary>
+        /// KnobIndicatorPointerBorderColor
+        /// </summary>
+        protected Color KnobIndicatorPointerBorderColor
+        {
+            get
+            {
+                Color c = Knob.KnobColor.KnobIndicatorPointerBorderColor;
+
+                return (c.IsEmpty == false ?
+                    c : DefaultColorTable.KnobIndicatorPointerBorderColor);
+            }
+        }
+
+        #endregion
+
+        #region KnobIndicatorPointerBorderWidth
+
+        /// <summary>
+        /// KnobIndicatorPointerBorderWidth
+        /// </summary>
+        protected int KnobIndicatorPointerBorderWidth
+        {
+            get
+            {
+                int width = Knob.KnobColor.KnobIndicatorPointerBorderWidth;
+
+                if (width <= 0)
+                    return (DefaultColorTable.KnobIndicatorPointerBorderWidth);
+
+                return (width);
+            }
+        }
+
+        #endregion
+
+        #region KnobIndicatorPointerColor
+
+        /// <summary>
+        /// KnobIndicatorPointerColor
+        /// </summary>
+        protected Color KnobIndicatorPointerColor
+        {
+            get
+            {
+                Color c = Knob.KnobColor.KnobIndicatorPointerColor;
+
+                return (c.IsEmpty == false ?
+                    c : DefaultColorTable.KnobIndicatorPointerColor);
+            }
+        }
+
+        #endregion
+
+        #region ZoneIndicatorColor
+
+        /// <summary>
+        /// ZoneIndicatorBaseColor
+        /// </summary>
+        protected Color ZoneIndicatorColor
+        {
+            get
+            {
+                Color c = Knob.KnobColor.ZoneIndicatorColor;
+
+                return (c.IsEmpty == false ?
+                    c : DefaultColorTable.ZoneIndicatorColor);
+            }
+        }
+
+        #endregion
+
+        #region KnobFaceColor
+
+        /// <summary>
+        /// KnobFaceColor
+        /// </summary>
+        protected LinearGradientColorTable KnobFaceColor
+        {
+            get
+            {
+                return (ApplyColor(Knob.KnobColor.KnobFaceColor,
+                                   DefaultColorTable.KnobFaceColor));
+            }
+        }
+
+        #endregion
+
+        #region KnobIndicatorColor
+
+        /// <summary>
+        /// KnobIndicatorColor
+        /// </summary>
+        protected LinearGradientColorTable KnobIndicatorColor
+        {
+            get
+            {
+                return (ApplyColor(Knob.KnobColor.KnobIndicatorColor,
+                                   DefaultColorTable.KnobIndicatorColor));
+            }
+        }
+
+        #endregion
+
+        #region LeftZoneIndicatorColor
+
+        /// <summary>
+        /// LeftZoneIndicatorColor
+        /// </summary>
+        protected LinearGradientColorTable LeftZoneIndicatorColor
+        {
+            get
+            {
+                return (ApplyColor(Knob.KnobColor.MinZoneIndicatorColor,
+                                   DefaultColorTable.MinZoneIndicatorColor));
+            }
+        }
+
+        #endregion
+
+        #region MiddleZoneIndicatorColor
+
+        /// <summary>
+        /// MiddleZoneIndicatorColor
+        /// </summary>
+        protected LinearGradientColorTable MiddleZoneIndicatorColor
+        {
+            get
+            {
+                return (ApplyColor(Knob.KnobColor.MidZoneIndicatorColor,
+                                   DefaultColorTable.MidZoneIndicatorColor));
+            }
+        }
+
+        #endregion
+
+        #region RightZoneIndicatorColor
+
+        /// <summary>
+        /// RightZoneIndicatorColor
+        /// </summary>
+        protected LinearGradientColorTable RightZoneIndicatorColor
+        {
+            get
+            {
+                return (ApplyColor(Knob.KnobColor.MaxZoneIndicatorColor,
+                                   DefaultColorTable.MaxZoneIndicatorColor));
+            }
+        }
+
+
+        #endregion
+
+        #region TickLabelFormat
+
+        /// <summary>
+        /// MajorTickColor
+        /// </summary>
+        protected string TickLabelFormat
+        {
+            get { return (Knob.TickLabelFormat); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ApplyColor
+
+        /// <summary>
+        /// ApplyColor
+        /// </summary>
+        /// <param name="c"></param>
+        /// <param name="d"></param>
+        /// <returns></returns>
+        private LinearGradientColorTable ApplyColor(
+            LinearGradientColorTable c, LinearGradientColorTable d)
+        {
+            if (c.IsEmpty == true)
+                return (d);
+
+            if (c.Start.IsEmpty == false && c.End.IsEmpty == false)
+                return (c);
+
+            return (new LinearGradientColorTable(
+                c.Start.IsEmpty ? d.Start : c.Start,
+                c.End.IsEmpty ? d.End : c.End, c.GradientAngle));
+        }
+
+        #endregion
+
+        #region Knob configuration
+
+        #region ConfigureKnob
+
+        /// <summary>
+        /// Main control configuration routine
+        /// </summary>
+        /// <param name="e"></param>
+        public virtual void ConfigureKnob(PaintEventArgs e)
+        {
+            // Calculate the bounding width for the control to be the 
+            // minimum of either the width and the height
+
+            KnobWidth = Math.Min(Knob.Width, Knob.Height);
+            KnobWidth = Math.Max(KnobWidth, Knob.MinKnobSize);
+
+            if ((KnobWidth % 2) != 0)
+                KnobWidth -= 1;
+
+            // Calculate the number of Major and Minor ticks and then
+            // measure each associated label so that we can mane sure we
+            // have enough room for them in the control rectangle
+
+            CalculateTicksCounts();
+            MeasureTickLabels();
+        }
+
+        #endregion
+
+        #region ResetKnob
+
+        /// <summary>
+        /// Sets the reset state to true, signifying
+        /// that the control needs to be reconfigured
+        /// before it is redrawn to the screen
+        /// </summary>
+        public void ResetKnob()
+        {
+            _Reset = true;
+        }
+
+        #endregion
+
+        #region InitRender
+
+        /// <summary>
+        /// Initializes the rendering process by making
+        /// sure that the control is reconfigured if
+        /// necessary
+        /// </summary>
+        /// <param name="e"></param>
+        public void InitRender(PaintEventArgs e)
+        {
+            if (_Reset == true)
+            {
+                ConfigureKnob(e);
+
+                _Reset = false;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Render processing
+
+        public virtual void RenderZoneIndicator(PaintEventArgs e) { }
+        public virtual void RenderKnobFace(PaintEventArgs e) { }
+        public virtual void RenderKnobIndicator(PaintEventArgs e) { }
+
+        #region RenderTickMinor
+
+        /// <summary>
+        /// Renders the minor tick marks
+        /// </summary>
+        /// <param name="e"></param>
+        public virtual void RenderTickMinor(PaintEventArgs e)
+        {
+            Graphics g = e.Graphics;
+
+            using (Pen pen = new Pen(MinorTickColor, MinorTickSize.Width))
+            {
+                for (int i = 0; i < MinorTicks; i++)
+                {
+                    // Don't draw a minor tick if it overlaps
+                    // with a previous major tick
+
+                    if (Knob.MajorTickAmount > 0)
+                    {
+                        if ((i == 0 || i == MinorTicks - 1) ||
+                            ((Knob.MinorTickAmount * i) % Knob.MajorTickAmount == 0))
+                            continue;
+                    }
+
+                    g.DrawLines(pen, GetMinorTickPoints(i));
+                }
+            }
+        }
+
+        /// <summary>
+        /// Calculates a series of points
+        /// that defines the tick mark
+        /// </summary>
+        /// <param name="tick">Tick to calculate</param>
+        /// <returns>An array of points that defines the tick</returns>
+        private Point[] GetMinorTickPoints(int tick)
+        {
+            float degree = GetTickDegree((float)Knob.MinorTickAmount, tick);
+            double rad = GetRadians(degree);
+
+            int dx = ZoneIndicatorBounds.X + ZoneIndicatorBounds.Width / 2;
+            int dy = ZoneIndicatorBounds.Y + ZoneIndicatorBounds.Height / 2;
+            int h = (int)(ZoneIndicatorBounds.Width / 2 + ZoneIndWidth / 2 - 1);
+
+            Point[] pts = new Point[2];
+
+            pts[0].X = (int)(Math.Cos(rad) * h + dx);
+            pts[0].Y = (int)(Math.Sin(rad) * h + dy);
+
+            pts[1].X = (int)(Math.Cos(rad) * (h + MinorTickSize.Height) + dx);
+            pts[1].Y = (int)(Math.Sin(rad) * (h + MinorTickSize.Height) + dy);
+
+            return (pts);
+        }
+
+        #endregion
+
+        #region RenderTickMajor
+
+        /// <summary>
+        /// Renders the Major Tick marks
+        /// </summary>
+        /// <param name="e"></param>
+        public virtual void RenderTickMajor(PaintEventArgs e)
+        {
+            Graphics g = e.Graphics;
+
+            // Loop through each tick
+
+            using (Pen pen1 = new Pen(MajorTickColor, MajorTickSize.Width))
+            {
+                for (int i = 0; i < MajorTicks; i++)
+                    g.DrawLines(pen1, GetMajorTickPoints(i));
+            }
+        }
+
+        /// <summary>
+        /// Calculates a series of points
+        /// that defines the tick mark
+        /// </summary>
+        /// <param name="tick">Tick to calculate</param>
+        /// <returns>An array of points that defines the tick</returns>
+        private Point[] GetMajorTickPoints(int tick)
+        {
+            float degree = GetTickDegree((float)Knob.MajorTickAmount, tick);
+            double rad = GetRadians(degree);
+
+            int dx = ZoneIndicatorBounds.X + ZoneIndicatorBounds.Width / 2;
+            int dy = ZoneIndicatorBounds.Y + ZoneIndicatorBounds.Height / 2;
+            int h = (int)(ZoneIndicatorBounds.Width / 2 + ZoneIndWidth / 2) - 1;
+
+            Point[] pts = new Point[2];
+
+            pts[0].X = (int)(Math.Cos(rad) * h + dx);
+            pts[0].Y = (int)(Math.Sin(rad) * h + dy);
+
+            pts[1].X = (int)(Math.Cos(rad) * (h + MajorTickSize.Height) + dx);
+            pts[1].Y = (int)(Math.Sin(rad) * (h + MajorTickSize.Height) + dy);
+
+            return (pts);
+        }
+
+        #endregion
+
+        #region RenderTickLabel
+
+        /// <summary>
+        /// Renders the major tick label
+        /// </summary>
+        /// <param name="e"></param>
+        public virtual void RenderTickLabel(PaintEventArgs e)
+        {
+            Graphics g = e.Graphics;
+
+            // Allocate a StrFormat to use in the display
+            // of out tick label text
+
+            using (StringFormat strFormat = new StringFormat(StringFormatFlags.NoClip))
+            {
+                strFormat.Alignment = StringAlignment.Center;
+
+                float radius = TickLabelBounds.Width / 2;
+
+                // Grab our tick label font - which is
+                // dynamically sized according to the control
+
+                Font labelFont = Knob.Font;
+
+                int dx = KnobWidth / 2;
+                int dy = (KnobWidth - (int) labelFont.SizeInPoints) / 2;
+
+                // Loop through each major tick
+
+                float dpt = (float) (Knob.SweepAngle * Knob.MajorTickAmount / ValueCount);
+
+                for (int i = 0; i < MajorTicks; i++)
+                {
+                    if (Math.Abs(dpt * i) < 360)
+                    {
+                        float degree = dpt * i + Knob.StartAngle;
+
+                        if (dpt < 0)
+                        {
+                            if (degree < Knob.StartAngle + Knob.SweepAngle)
+                                degree = Knob.StartAngle + Knob.SweepAngle;
+                        }
+                        else
+                        {
+                            if (degree > Knob.StartAngle + Knob.SweepAngle)
+                                degree = Knob.StartAngle + Knob.SweepAngle;
+                        }
+
+                        decimal x = Math.Min(Knob.MinValue + (i * Knob.MajorTickAmount), Knob.MaxValue);
+                        string s = ((int)x == x) ? ((int)x).ToString(TickLabelFormat) : x.ToString(TickLabelFormat);
+                        Size sz = TextRenderer.MeasureText(s, labelFont);
+
+                        double currentAngle = GetRadians(degree);
+
+                        Point pt = new Point((int) (dx - sz.Width / 2 + radius * (float) Math.Cos(currentAngle)),
+                                             (int) (dy + radius * (float) Math.Sin(currentAngle)));
+
+                        Rectangle r = new Rectangle(pt, new Size(1000, 1000));
+
+                        TextRenderer.DrawText(g, s, labelFont, r,
+                                              Knob.ForeColor, TextFormatFlags.Left);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region RenderFocusRect
+
+        /// <summary>
+        /// Renders the base focus rect
+        /// </summary>
+        /// <param name="e"></param>
+        public virtual void RenderFocusRect(PaintEventArgs e)
+        {
+            Graphics g = e.Graphics;
+
+            using (Pen pen = new Pen(Color.DarkGray))
+            {
+                pen.DashStyle = DashStyle.Dash;
+
+                g.DrawEllipse(pen, FocusRectBounds);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetValueFromPoint
+
+        /// <summary>
+        /// Determines the control Value from
+        /// a specified Point on the control
+        /// </summary>
+        /// <param name="pt">Point on the control</param>
+        /// <returns>Value</returns>
+        public decimal GetValueFromPoint(Point pt)
+        {
+            // Calculate the relative X and Y
+            // coordinate pair for the given point
+
+            int radius = ZoneIndicatorBounds.Width / 2;
+
+            Point cpt = new Point(ZoneIndicatorBounds.X + radius, ZoneIndicatorBounds.Y + radius);
+
+            int dx = pt.X - cpt.X;
+            int dy = pt.Y - cpt.Y;
+
+            // Determine the radians for the given coord pair
+            // based upon which quadrant it is located in
+
+            double radians;
+
+            if (dx >= 0)
+            {
+                if (dy >= 0)
+                    radians = Math.Atan((double)dy / dx);
+                else
+                    radians = -Math.Atan((double)dx / dy) + Math.PI * 1.5;
+            }
+            else
+            {
+                if (dy >= 0)
+                    radians = -Math.Atan((double)dx / dy) + Math.PI / 2;
+                else
+                    radians = Math.Atan((double)dy / dx) + Math.PI;
+            }
+
+            // Convert our calculated Radians to Degrees
+            // and then 'normalize' our values to the
+            // current StartAngle
+
+            int degrees = (int)GetDegrees(radians);
+
+            decimal normal = degrees - Knob.StartAngle;
+
+            if (Knob.SweepAngle < 0)
+            {
+                normal = 360 - normal;
+                normal = normal % 360;
+            }
+
+            if (normal < 0)
+                normal += 360;
+
+            // If our normalized angle is within the
+            // SweepAngle, then return the associated
+            // range value
+
+            int n = Math.Abs(Knob.SweepAngle);
+
+            if (normal >= 0 && normal <= n)
+                return (normal * ValueCount / n + Knob.MinValue);
+
+            // The normalized angle is outside the SweepAngle, so
+            // return either the MinValue or MaxValue (based upon
+            // which one is closer)
+
+            return ((normal >= n + (360 - n) / 2) ? Knob.MinValue : Knob.MaxValue);
+        }
+
+        #endregion
+
+        #region CalculateTicksCounts
+
+        /// <summary>
+        /// Calculate how many major and
+        /// minor ticks are presented on the control
+        /// </summary>
+        private void CalculateTicksCounts()
+        {
+            decimal count = ValueCount;
+
+            // Calculate the number of major ticks
+
+            MajorTicks = 0;
+
+            if (Knob.MajorTickAmount > 0)
+            {
+                MajorTicks = (int)(count / Knob.MajorTickAmount);
+
+                if (MajorTicks * Knob.MajorTickAmount < count)
+                    MajorTicks++;
+
+                MajorTicks++;
+            }
+
+            // Calculate the number of minor ticks
+
+            MinorTicks = 0;
+
+            if (Knob.MinorTickAmount > 0)
+            {
+                MinorTicks = (int)(count / Knob.MinorTickAmount);
+
+                if (MinorTicks * Knob.MinorTickAmount < count)
+                    MinorTicks++;
+
+                MinorTicks++;
+            }
+        }
+
+        #endregion
+
+        #region MeasureTickLabels
+
+        /// <summary>
+        /// Measure the width of each text label in order to
+        /// make sure we have room for it in the control
+        /// </summary>
+        private void MeasureTickLabels()
+        {
+            MaxLabelWidth = 0;
+
+            if (Knob.ShowTickLabels == true)
+            {
+                Font labelFont = Knob.Font;
+
+                for (int i = 0; i < MajorTicks; i++)
+                {
+                    // Save the text and width for later use
+
+                    decimal n =  Knob.MinValue + (i * Knob.MajorTickAmount);
+
+                    string s = n.ToString(TickLabelFormat);
+
+                    int w = TextRenderer.MeasureText(s, labelFont).Width + 2;
+
+                    // Keep track of the maximum width
+
+                    if (w > MaxLabelWidth)
+                        MaxLabelWidth = w;
+                }
+            }
+        }
+
+        #endregion
+
+        #region GetTickDegree
+
+        /// <summary>
+        /// Gets the arc degree associated with
+        /// the given gauge tick
+        /// </summary>
+        /// <param name="tickAmount">Major or minor tick amount</param>
+        /// <param name="tick">The tick to convert</param>
+        /// <returns></returns>
+        protected float GetTickDegree(float tickAmount, int tick)
+        {
+            float dpt = (Knob.SweepAngle * tickAmount) / (float)ValueCount;
+            float degree = dpt * tick + Knob.StartAngle;
+
+            if (dpt < 0)
+            {
+                if (degree < Knob.StartAngle + Knob.SweepAngle)
+                    degree = Knob.StartAngle + Knob.SweepAngle;
+            }
+            else
+            {
+                if (degree > Knob.StartAngle + Knob.SweepAngle)
+                    degree = Knob.StartAngle + Knob.SweepAngle;
+            }
+
+            return (degree);
+        }
+
+        #endregion
+
+        #region GetRadians
+
+        /// <summary>
+        /// Converts Degrees to Radians
+        /// </summary>
+        /// <param name="theta">Degrees</param>
+        /// <returns>Radians</returns>
+        public double GetRadians(float theta)
+        {
+            return (theta * Math.PI / 180);
+        }
+
+        #endregion
+
+        #region GetDegrees
+
+        /// <summary>
+        /// Converts Radians to Degrees
+        /// </summary>
+        /// <param name="radians">Radians</param>
+        /// <returns>Degrees</returns>
+        public double GetDegrees(double radians)
+        {
+            return (radians * 180 / Math.PI);
+        }
+
+        #endregion
+
+        #region ValueCount
+
+        /// <summary>
+        /// Gets the value range, expressed as a count
+        /// </summary>
+        internal decimal ValueCount
+        {
+            get { return (Knob.MaxValue - Knob.MinValue); }
+        }
+
+        #endregion
+
+        #region PointInControl
+
+        /// <summary>
+        /// Determines if a given Point is within
+        /// the bounds of the control
+        /// </summary>
+        /// <param name="pt"></param>
+        /// <returns></returns>
+        public virtual bool PointInControl(Point pt)
+        {
+            // Allow a little leeway around the control
+
+            Rectangle r = new Rectangle(ZoneIndicatorBounds.Location, ZoneIndicatorBounds.Size);
+
+            r.Inflate(40, 40);
+
+            int radius = r.Width / 2;
+
+            Point cpt = new Point(r.X + radius, r.Y + radius);
+
+            return (PointInCircle(pt, cpt, radius));      
+        }
+
+        #endregion
+
+        #region PointInCircle
+
+        /// <summary>
+        /// Determines if a given point is within a given circle
+        /// </summary>
+        /// <param name="pt">Point in question</param>
+        /// <param name="cpt">Center Point</param>
+        /// <param name="radius">Circle radius</param>
+        /// <returns></returns>
+        public bool PointInCircle(Point pt, Point cpt, int radius)
+        {
+            int a = pt.X - cpt.X;
+            int b = pt.Y - cpt.Y;
+
+            int c = (int)Math.Sqrt(a * a + b * b);
+
+            return (c < radius);
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/Knobs/KnobColorTable.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/Knobs/KnobColorTable.cs
new file mode 100644
index 00000000..094484a5
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/Knobs/KnobColorTable.cs	
@@ -0,0 +1,599 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Globalization;
+using DevComponents.Instrumentation.Primitives;
+
+namespace DevComponents.Instrumentation
+{
+    [TypeConverter(typeof(KnobColorTableConvertor))]
+    public class KnobColorTable
+    {
+        public static readonly KnobColorTable Empty = new KnobColorTable();
+
+        #region Events
+
+        /// <summary>
+        /// Event raised when ColorTable has changed
+        /// </summary>
+        [Description("Event raised when ColorTable has changed.")]
+        public event EventHandler<EventArgs> ColorTableChanged;
+
+        #endregion
+
+        #region Private variables
+
+        private Color _MajorTickColor = Color.Empty;
+        private Color _MinorTickColor = Color.Empty;
+        private Color _ZoneIndicatorColor = Color.Empty;
+        private Color _KnobIndicatorPointerColor = Color.Empty;
+        private Color _KnobIndicatorPointerBorderColor = Color.Empty;
+
+        private LinearGradientColorTable _KnobFaceColor = new LinearGradientColorTable();
+        private LinearGradientColorTable _KnobIndicatorColor = new LinearGradientColorTable();
+        private LinearGradientColorTable _MinZoneIndicatorColor = new LinearGradientColorTable();
+        private LinearGradientColorTable _MaxZoneIndicatorColor = new LinearGradientColorTable();
+        private LinearGradientColorTable _MidZoneIndicatorColor = new LinearGradientColorTable();
+
+        private int _KnobIndicatorPointerBorderWidth;
+
+        #endregion
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        public KnobColorTable()
+        {
+            _KnobFaceColor = new LinearGradientColorTable();
+            _KnobFaceColor.ColorTableChanged += KnobColorTableChanged;
+
+            _KnobIndicatorColor = new LinearGradientColorTable();
+            _KnobIndicatorColor.ColorTableChanged += KnobColorTableChanged;
+
+            _MinZoneIndicatorColor = new LinearGradientColorTable();
+            _MinZoneIndicatorColor.ColorTableChanged += KnobColorTableChanged;
+
+            _MaxZoneIndicatorColor = new LinearGradientColorTable();
+            _MaxZoneIndicatorColor.ColorTableChanged += KnobColorTableChanged;
+
+            _MidZoneIndicatorColor = new LinearGradientColorTable();
+            _MidZoneIndicatorColor.ColorTableChanged += KnobColorTableChanged;
+        }
+
+        #region Public properties
+
+        #region MajorTickColor
+
+        /// <summary>
+        /// Gets or sets the color of the Major Tick marks
+        /// </summary>
+        [Browsable(true)]
+        [Description("Indicates the color of the Major Tick marks")]
+        public Color MajorTickColor
+        {
+            get { return (_MajorTickColor); }
+
+            set
+            {
+                if (_MajorTickColor != value)
+                {
+                    _MajorTickColor = value;
+
+                    OnColorTableChange();
+                }
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeMajorTickColor()
+        {
+            return (_MajorTickColor.IsEmpty == false);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetMajorTickColor()
+        {
+            MajorTickColor = Color.Empty;
+        }
+
+        #endregion
+
+        #region MinorTickColor
+
+        /// <summary>
+        /// Gets or sets the color of the Minor Tick marks
+        /// </summary>
+        [Browsable(true)]
+        [Description("Indicates the color of the Minor Tick marks")]
+        public Color MinorTickColor
+        {
+            get { return (_MinorTickColor); }
+
+            set
+            {
+                if (_MinorTickColor != value)
+                {
+                    _MinorTickColor = value;
+
+                    OnColorTableChange();
+                }
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeMinorTickColor()
+        {
+            return (_MinorTickColor.IsEmpty == false);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetMinorTickColor()
+        {
+            MinorTickColor = Color.Empty;
+        }
+
+        #endregion
+
+        #region KnobIndicatorPointerBorderColor
+
+        /// <summary>
+        /// Gets or sets the color of the KnobIndicatorPointer Border
+        /// </summary>
+        [Browsable(true)]
+        [Description("Indicates the color of the KnobIndicatorPointer Border")]
+        public Color KnobIndicatorPointerBorderColor
+        {
+            get { return (_KnobIndicatorPointerBorderColor); }
+
+            set
+            {
+                if (_KnobIndicatorPointerBorderColor != value)
+                {
+                    _KnobIndicatorPointerBorderColor = value;
+
+                    OnColorTableChange();
+                }
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeKnobIndicatorPointerBorderColor()
+        {
+            return (_KnobIndicatorPointerBorderColor.IsEmpty == false);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetKnobIndicatorPointerBorderColor()
+        {
+            KnobIndicatorPointerBorderColor = Color.Empty;
+        }
+        #endregion
+
+        #region KnobIndicatorPointerBorderWidth
+
+        /// <summary>
+        /// Gets or sets the width of the KnobIndicatorPointer Border
+        /// </summary>
+        [Browsable(true), DefaultValue(0)]
+        [Description("Indicates the width of the KnobIndicatorPointer Border")]
+        public int KnobIndicatorPointerBorderWidth
+        {
+            get { return (_KnobIndicatorPointerBorderWidth); }
+
+            set
+            {
+                if (_KnobIndicatorPointerBorderWidth != value)
+                {
+                    _KnobIndicatorPointerBorderWidth = value;
+
+                    OnColorTableChange();
+                }
+            }
+        }
+
+        #endregion
+
+        #region KnobIndicatorPointerColor
+
+        /// <summary>
+        /// Gets or sets the color of the KnobIndicatorPointer
+        /// </summary>
+        [Browsable(true)]
+        [Description("Indicates the color of the KnobIndicatorPointer")]
+        public Color KnobIndicatorPointerColor
+        {
+            get { return (_KnobIndicatorPointerColor); }
+
+            set
+            {
+                if (_KnobIndicatorPointerColor != value)
+                {
+                    _KnobIndicatorPointerColor = value;
+
+                    OnColorTableChange();
+                }
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeKnobIndicatorPointerColor()
+        {
+            return (_KnobIndicatorPointerColor.IsEmpty == false);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetKnobIndicatorPointerColor()
+        {
+            KnobIndicatorPointerColor = Color.Empty;
+        }
+        #endregion
+
+        #region ZoneIndicatorColor
+
+        /// <summary>
+        /// Gets or sets the color of the ZoneIndicator
+        /// </summary>
+        [Browsable(true)]
+        [Description("Indicates the color of the ZoneIndicator")]
+        public Color ZoneIndicatorColor
+        {
+            get { return (_ZoneIndicatorColor); }
+
+            set
+            {
+                if (_ZoneIndicatorColor != value)
+                {
+                    _ZoneIndicatorColor = value;
+
+                    OnColorTableChange();
+                }
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeZoneIndicatorColor()
+        {
+            return (_ZoneIndicatorColor.IsEmpty == false);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetZoneIndicatorColor()
+        {
+            ZoneIndicatorColor = Color.Empty;
+        }
+
+        #endregion
+
+        #region KnobFaceColor
+
+        /// <summary>
+        /// Gets or sets the color of the KnobFace
+        /// </summary>
+        [Browsable(true)]
+        [Description("Indicates the color of the KnobFace")]
+        public LinearGradientColorTable KnobFaceColor
+        {
+            get { return (_KnobFaceColor); }
+
+            set
+            {
+                if (_KnobFaceColor != value)
+                {
+                    if (_KnobFaceColor != null)
+                        _KnobFaceColor.ColorTableChanged -= KnobColorTableChanged;
+
+                    _KnobFaceColor = value;
+
+                    if (_KnobFaceColor != null)
+                        _KnobFaceColor.ColorTableChanged += KnobColorTableChanged;
+
+                    OnColorTableChange();
+                }
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeKnobFaceColor()
+        {
+            return (_KnobFaceColor.IsEmpty == false);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetKnobFaceColor()
+        {
+            KnobFaceColor = LinearGradientColorTable.Empty;
+        }
+
+        #endregion
+
+        #region KnobIndicatorColor
+
+        /// <summary>
+        /// Gets or sets the color of the KnobIndicator
+        /// </summary>
+        [Browsable(true)]
+        [Description("Indicates the color of the KnobIndicator")]
+        public LinearGradientColorTable KnobIndicatorColor
+        {
+            get { return (_KnobIndicatorColor); }
+
+            set
+            {
+                if (_KnobIndicatorColor != value)
+                {
+                    if (_KnobIndicatorColor != null)
+                        _KnobIndicatorColor.ColorTableChanged -= KnobColorTableChanged;
+
+                    _KnobIndicatorColor = value;
+
+                    if (_KnobIndicatorColor != null)
+                        _KnobIndicatorColor.ColorTableChanged += KnobColorTableChanged;
+
+                    OnColorTableChange();
+                }
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeKnobIndicatorColor()
+        {
+            return (_KnobIndicatorColor.IsEmpty == false);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetKnobIndicatorColor()
+        {
+            KnobIndicatorColor = LinearGradientColorTable.Empty;
+        }
+
+        #endregion
+
+        #region MinZoneIndicatorColor
+
+        /// <summary>
+        /// Gets or sets the color of the MinZoneIndicator
+        /// </summary>
+        [Browsable(true)]
+        [Description("Indicates the color of the MinZoneIndicator")]
+        public LinearGradientColorTable MinZoneIndicatorColor
+        {
+            get { return (_MinZoneIndicatorColor); }
+
+            set
+            {
+                if (_MinZoneIndicatorColor != value)
+                {
+                    if (_MinZoneIndicatorColor != null)
+                        _MinZoneIndicatorColor.ColorTableChanged -= KnobColorTableChanged;
+
+                    _MinZoneIndicatorColor = value;
+
+                    if (_MinZoneIndicatorColor != null)
+                        _MinZoneIndicatorColor.ColorTableChanged += KnobColorTableChanged;
+
+                    OnColorTableChange();
+                }
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeMinZoneIndicatorColor()
+        {
+            return (_MinZoneIndicatorColor.IsEmpty == false);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetMinZoneIndicatorColor()
+        {
+            MinZoneIndicatorColor = LinearGradientColorTable.Empty;
+        }
+
+        #endregion
+
+        #region MaxZoneIndicatorColor
+
+        /// <summary>
+        /// Gets or sets the color of the MaxZoneIndicator
+        /// </summary>
+        [Browsable(true)]
+        [Description("Indicates the color of the MaxZoneIndicator")]
+        public LinearGradientColorTable MaxZoneIndicatorColor
+        {
+            get { return (_MaxZoneIndicatorColor); }
+
+            set
+            {
+                if (_MaxZoneIndicatorColor != value)
+                {
+                    if (_MaxZoneIndicatorColor != null)
+                        _MaxZoneIndicatorColor.ColorTableChanged -= KnobColorTableChanged;
+
+                    _MaxZoneIndicatorColor = value;
+
+                    if (_MaxZoneIndicatorColor != null)
+                        _MaxZoneIndicatorColor.ColorTableChanged += KnobColorTableChanged;
+                    
+                    OnColorTableChange();
+                }
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeMaxZoneIndicatorColor()
+        {
+            return (_MaxZoneIndicatorColor.IsEmpty == false);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetMaxZoneIndicatorColor()
+        {
+            MaxZoneIndicatorColor = LinearGradientColorTable.Empty;
+        }
+
+        #endregion
+
+        #region MidZoneIndicatorColor
+
+        /// <summary>
+        /// Gets or sets the color of the MidZoneIndicator
+        /// </summary>
+        [Browsable(true)]
+        [Description("Indicates the color of the MidZoneIndicator")]
+        public LinearGradientColorTable MidZoneIndicatorColor
+        {
+            get { return (_MidZoneIndicatorColor); }
+
+            set
+            {
+                if (_MidZoneIndicatorColor != value)
+                {
+                    if (_MidZoneIndicatorColor != null)
+                        _MidZoneIndicatorColor.ColorTableChanged -= KnobColorTableChanged;
+
+                    _MidZoneIndicatorColor = value;
+
+                    if (_MidZoneIndicatorColor != null)
+                        _MidZoneIndicatorColor.ColorTableChanged += KnobColorTableChanged;
+
+                    OnColorTableChange();
+                }
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeMidZoneIndicatorColor()
+        {
+            return (_MidZoneIndicatorColor.IsEmpty == false);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetMidZoneIndicatorColor()
+        {
+            MidZoneIndicatorColor = LinearGradientColorTable.Empty;
+        }
+
+        #endregion
+
+        #region IsEmpty
+
+        [Browsable(false)]
+        public bool IsEmpty
+        {
+            get
+            {
+                return (_MajorTickColor.IsEmpty && _MinorTickColor.IsEmpty && _KnobIndicatorPointerColor.IsEmpty &&
+                        _KnobFaceColor.IsEmpty && _ZoneIndicatorColor.IsEmpty && _MinZoneIndicatorColor.IsEmpty &&
+                        _MaxZoneIndicatorColor.IsEmpty && _MidZoneIndicatorColor.IsEmpty && _KnobIndicatorColor.IsEmpty);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region KnobColorTableChanged
+
+        /// <summary>
+        /// KnobColorTableChanged
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void KnobColorTableChanged(object sender, EventArgs e)
+        {
+            OnColorTableChange();
+        }
+
+        #endregion
+
+        #region OnColorTableChange
+
+        /// <summary>
+        /// OnColorTableChange
+        /// </summary>
+        private void OnColorTableChange()
+        {
+            if (ColorTableChanged != null)
+                ColorTableChanged(this, EventArgs.Empty);
+        }
+
+        #endregion
+    }
+
+    #region KnobColorTableConvertor
+
+    /// <summary>
+    /// KnobColorTableConvertor
+    /// </summary>
+    public class KnobColorTableConvertor : ExpandableObjectConverter
+    {
+        public override object ConvertTo(
+            ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+        {
+            if (destinationType == typeof(string))
+            {
+                KnobColorTable kct = value as KnobColorTable;
+
+                if (kct != null)
+                {
+                    ColorConverter cvt = new ColorConverter();
+
+                    string s;
+
+                    if ((s = MyColorConverter(kct.KnobFaceColor, cvt)) != null)
+                        return (s);
+
+                    if ((s = MyColorConverter(kct.KnobIndicatorColor, cvt)) != null)
+                        return (s);
+
+                    if ((s = MyColorConverter(kct.MinZoneIndicatorColor, cvt)) != null)
+                        return (s);
+
+                    if ((s = MyColorConverter(kct.MidZoneIndicatorColor, cvt)) != null)
+                        return (s);
+
+                    if ((s = MyColorConverter(kct.MaxZoneIndicatorColor, cvt)) != null)
+                        return (s);
+
+                    if (kct.MinorTickColor.IsEmpty == false)
+                        return (cvt.ConvertToString(kct.MinorTickColor));
+
+                    if (kct.MajorTickColor.IsEmpty == false)
+                        return (cvt.ConvertToString(kct.MajorTickColor));
+
+                    if (kct.KnobIndicatorPointerColor.IsEmpty == false)
+                        return (cvt.ConvertToString(kct.KnobIndicatorPointerColor));
+
+                    if (kct.ZoneIndicatorColor.IsEmpty == false)
+                        return (cvt.ConvertToString(kct.ZoneIndicatorColor));
+
+                    return (String.Empty);
+                }
+            }
+
+            return (base.ConvertTo(context, culture, value, destinationType));
+        }
+
+        #region MyColorConverter
+
+        /// <summary>
+        /// MyColorConverter
+        /// </summary>
+        /// <param name="ct">ColorTable</param>
+        /// <param name="cvt">ColorConverter</param>
+        /// <returns>string or null</returns>
+        private string MyColorConverter(LinearGradientColorTable ct, ColorConverter cvt)
+        {
+            if (ct.Start.IsEmpty == false)
+                return (cvt.ConvertToString(ct.Start));
+
+            if (ct.End.IsEmpty == false)
+                return (cvt.ConvertToString(ct.Start));
+
+            return (null);
+        }
+
+        #endregion
+    }
+
+    #endregion
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/Knobs/KnobControl.Designer.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/Knobs/KnobControl.Designer.cs
new file mode 100644
index 00000000..d1c4dff1
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/Knobs/KnobControl.Designer.cs	
@@ -0,0 +1,36 @@
+namespace DevComponents.Instrumentation
+{
+    partial class KnobControl
+    {
+        /// <summary> 
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #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();
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/Knobs/KnobControl.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/Knobs/KnobControl.cs
new file mode 100644
index 00000000..d7b0b372
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/Knobs/KnobControl.cs	
@@ -0,0 +1,1806 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Windows.Forms;
+using DevComponents.Instrumentation.Primitives;
+
+namespace DevComponents.Instrumentation
+{
+    /// <summary>
+    /// Defines Knob instrumentation control.
+    /// </summary>
+    [ToolboxItem(true)]
+    [Designer("DevComponents.Instrumentation.Design.KnobControlDesigner, DevComponents.Instrumentation.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=76cb4c6eb576bca5")]
+    public partial class KnobControl : Control, IDisposable
+    {
+        #region Delegates
+
+        private delegate void InternalRender(PaintEventArgs e);
+
+        public delegate void PreRenderEventHandler(object sender, PreRenderEventArgs e);
+        public delegate void PostRenderEventHandler(object sender, PostRenderEventArgs e);
+        public delegate void RenderFocusRectEventHandler(object sender, RenderFocusRectEventArgs e);
+
+        #endregion
+
+        #region Events
+
+        #region RenderEvent
+
+        #region PreRender
+
+        /// <summary>
+        /// Event raised just before the ZoneIndicator is rendered
+        /// </summary>
+        [Description("Event raised just before the ZoneIndicator is rendered ")]
+        public event PreRenderEventHandler PreRenderZoneIndicator;
+
+        /// <summary>
+        /// Event raised just before the Minor Tick Marks are rendered
+        /// </summary>
+        [Description("Event raised just before the Minor Tick Marks are rendered ")]
+        public event PreRenderEventHandler PreRenderTickMinor;
+
+        /// <summary>
+        /// Event raised just before the Major Tick Marks are rendered
+        /// </summary>
+        [Description("Event raised just before the Major Tick Marks are rendered ")]
+        public event PreRenderEventHandler PreRenderTickMajor;
+
+        /// <summary>
+        /// Event raised just before the Tick Labels are rendered
+        /// </summary>
+        [Description("Event raised just before the Tick Labels are rendered ")]
+        public event PreRenderEventHandler PreRenderTickLabel;
+
+        /// <summary>
+        /// Event raised just before the KnobFace is rendered
+        /// </summary>
+        [Description("Event raised just before the KnobFace is rendered ")]
+        public event PreRenderEventHandler PreRenderKnobFace;
+
+        /// <summary>
+        /// Event raised just before the KnobIndicator is rendered
+        /// </summary>
+        [Description("Event raised just before the KnobIndicator is rendered ")]
+        public event PreRenderEventHandler PreRenderKnobIndicator;
+
+        #endregion
+
+        #region PostRender
+
+        /// <summary>
+        /// Event raised right after the ZoneIndicator is rendered
+        /// </summary>
+        [Description("Event raised right after the ZoneIndicator is rendered ")]
+        public event PostRenderEventHandler PostRenderZoneIndicator;
+
+        /// <summary>
+        /// Event raised right after the Minor Tick Marks are rendered
+        /// </summary>
+        [Description("Event raised right after the Minor Tick Marks are rendered ")]
+        public event PostRenderEventHandler PostRenderTickMinor;
+
+        /// <summary>
+        /// Event raised right after the Major Tick Marks are rendered
+        /// </summary>
+        [Description("Event raised right after the Major Tick Marks are rendered ")]
+        public event PostRenderEventHandler PostRenderTickMajor;
+
+        /// <summary>
+        /// Event raised right after the Tick Labels are rendered
+        /// </summary>
+        [Description("Event raised right after the Tick Labels are rendered ")]
+        public event PostRenderEventHandler PostRenderTickLabel;
+
+        /// <summary>
+        /// Event raised right after the KnobFace is rendered
+        /// </summary>
+        [Description("Event raised right after the KnobFace is rendered ")]
+        public event PostRenderEventHandler PostRenderKnobFace;
+
+        /// <summary>
+        /// Event raised right after the KnobIndicator is rendered
+        /// </summary>
+        [Description("Event raised right after the KnobIndicator is rendered ")]
+        public event PostRenderEventHandler PostRenderKnobIndicator;
+
+        #endregion
+
+        #region RenderFocusRect
+
+        /// <summary>
+        /// Event raised when the Focus Rectangle needs rendered
+        /// </summary>
+        [Description("Event raised when the Focus Rectangle needs rendered ")]
+        public event RenderFocusRectEventHandler RenderFocusRect;
+
+        #endregion
+
+        #endregion
+
+        #region ValueChanged
+
+        /// <summary>
+        /// Event raised when the Focus Rectangle needs rendered
+        /// </summary>
+        [Description("Event raised when the Knob Value has changed.")]
+        public event EventHandler<ValueChangedEventArgs> ValueChanged;
+
+        #endregion
+
+        #region ColorTableChanged
+
+        /// <summary>
+        /// Event raised when the Knob ColorTable has changed
+        /// </summary>
+        [Description("Event raised when the Knob ColorTable has changed.")]
+        public event EventHandler<EventArgs> ColorTableChanged;
+
+        #endregion
+
+        #endregion
+
+        #region Constants
+
+        internal int MinKnobSize = 60;
+
+        #endregion
+
+        #region Private variables
+
+        private BaseKnob _Knob;                             // Base knob
+        private eKnobStyle _KnobStyle = eKnobStyle.Style1;  // Default style
+
+        private decimal _Value;                             // Knob Value
+        private decimal _MajorTickAmount = 10;              // Major tick amount
+        private decimal _MinorTickAmount = 2;               // Minor tick amount
+
+        private bool _AllowDecimalValueSelection = true;    // Allow decimal values or not
+        private int _SelectionDecimals = 1;
+
+        private decimal _MinValue;                          // Minimum allowable value
+        private decimal _MaxValue = 100;                    // Maximum allowable value
+
+        private int _StartAngle = 130;                      // Starting knob angle
+        private int _SweepAngle = 280;                      // Sweep angle (start + sweep == end)
+
+        private int _MinZonePercentage = 80;                // Min zone percentage
+        private int _MaxZonePercentage = 20;                // Max zone percentage
+
+        private bool _KnobRotating;                         // Is the knob being rotated by the mouse? 
+        private decimal _SaveValue;                         // Rotation cancel value
+
+        private bool _FocusCuesEnabled = true;              // Are Focus cues enabled?
+        private bool _ShowTickLabels = true;                // Show tick labels?
+        private bool _ReadOnly;                             // ReadOnly?
+        private bool _IgnoreKeyLimits;                      // Allow key wrapping?
+        private bool _SetValueOnFocus = true;
+
+        private KnobColorTable _KnobColor;
+
+        private decimal _SelectionDelta;
+
+        private string _TickLabelFormat;
+
+        #endregion
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        public KnobControl()
+        {
+            // Initialize our control
+
+            InitializeComponent();
+
+            SetStyle(ControlStyles.UserPaint, true);
+            SetStyle(ControlStyles.AllPaintingInWmPaint, true);
+            SetStyle(ControlStyles.ResizeRedraw, true);
+            SetStyle(ControlStyles.StandardDoubleClick, true);
+            SetStyle(ControlStyles.OptimizedDoubleBuffer, true);
+            SetStyle(ControlStyles.SupportsTransparentBackColor, true);
+            SetStyle(ControlStyles.Selectable, true);
+
+            // Set our Knob Style and default KnobColorTable 
+
+            SetKnobStyle(eKnobStyle.Style1);
+
+            KnobColor = new KnobColorTable();
+
+            // Hook on to our events
+
+            HookEvents(true);
+        }
+
+        #region Public properties
+
+        #region AllowDecimalValueSelection
+
+        /// <summary>
+        /// Gets and sets whether Values with decimals can be used
+        /// </summary>
+        [Browsable(true), Category("Behavior"), DefaultValue(true)]
+        [Description("Indicates whether Values with decimals can be used")]
+        public bool AllowDecimalValueSelection
+        {
+            get { return (_AllowDecimalValueSelection); }
+            set { _AllowDecimalValueSelection = value; InvalidateKnob(); }
+        }
+
+        #endregion
+
+        #region FocusCuesEnabled
+
+        /// <summary>
+        /// Gets or sets whether control displays focus cues when focused.
+        /// </summary>
+        [Category("Behavior"), DefaultValue(true)]
+        [Description("Indicates whether control displays focus cues when focused.")]
+        public bool FocusCuesEnabled
+        {
+            get { return _FocusCuesEnabled; }
+
+            set
+            {
+                _FocusCuesEnabled = value;
+
+                if (this.Focused)
+                    InvalidateKnob();
+            }
+        }
+
+        #endregion
+
+        #region Font
+
+        /// <summary>
+        /// Gets or sets the KnobControl Font
+        /// </summary>
+        [Browsable(true), Category("Appearance")]
+        [Description("Indicates the KnobControl Font")]
+        public override Font Font
+        {
+            get { return base.Font; }
+            set { base.Font = value; InvalidateKnob(); }
+        }
+
+        #endregion
+
+        #region IgnoreKeyLimits
+
+        /// <summary>
+        /// Gets and sets whether key processing will ignore or
+        /// stop at knob min/max limits (default is 'false').
+        /// </summary>
+        [Browsable(true), Category("Behavior"), DefaultValue(false)]
+        [Description("Indicates whether key processing will ignore or stop at knob min/max limits (default is 'false').")]
+        public bool IgnoreKeyLimits
+        {
+            get { return (_IgnoreKeyLimits); }
+            set { _IgnoreKeyLimits = value; }
+        }
+
+        #endregion
+
+        #region KnobColor
+
+        /// <summary>
+        /// Gets and sets the display Colors of the KnobControl
+        /// </summary>
+        [Browsable(true), Category("Appearance")]
+        [Description("Indicates the display Colors of the KnobControl")]
+        public KnobColorTable KnobColor
+        {
+            get { return (_KnobColor); }
+
+            set
+            {
+                if (_KnobColor != null)
+                    _KnobColor.ColorTableChanged -= KnobColor_ColorTableChanged;
+
+                _KnobColor = value;
+
+                if (_KnobColor != null)
+                    _KnobColor.ColorTableChanged += KnobColor_ColorTableChanged;
+
+                OnColorTableChanged();
+                
+                InvalidateKnob();
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized
+        /// </summary>
+        public bool ShouldSerializeKnobColor()
+        {
+            return (_KnobColor.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to it's default value
+        /// </summary>
+        public void ResetKnobColor()
+        {
+            KnobColor = KnobColorTable.Empty;
+        }
+
+        #endregion
+
+        #region KnobStyle
+
+        /// <summary>
+        /// Gets and sets the display style of the knob
+        /// </summary>
+        [Browsable(true), Category("Appearance"), DefaultValue(eKnobStyle.Style1)]
+        [Description("Indicates the display style of the knob")]
+        public eKnobStyle KnobStyle
+        {
+            get { return _KnobStyle; }
+
+            set
+            {
+                if (_KnobStyle != value)
+                {
+                    SetKnobStyle(value);
+
+                    InvalidateKnob();
+                }
+            }
+        }
+
+        #region SetKnobStyle
+
+        /// <summary>
+        /// Sets the display style for the control
+        /// </summary>
+        /// <param name="style"></param>
+        private void SetKnobStyle(eKnobStyle style)
+        {
+            switch (style)
+            {
+                case eKnobStyle.Style1:
+                    _Knob = new KnobStyle1(this);
+                    break;
+
+                case eKnobStyle.Style2:
+                    _Knob = new KnobStyle2(this);
+                    break;
+
+                case eKnobStyle.Style3:
+                    _Knob = new KnobStyle3(this);
+                    break;
+
+                default:
+                    _Knob = new KnobStyle4(this);
+                    break;
+            }
+
+            _KnobStyle = style;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region MinZonePercentage
+
+        /// <summary>
+        /// Get and sets the numeric value that
+        /// represents the MinZoneIndicator percentage
+        /// </summary>
+        [Browsable(true), Category("Appearance"), DefaultValue(80)]
+        [Description("Indicates numeric value that represents the MinZoneIndicator percentage")]
+        public int MinZonePercentage
+        {
+            get { return (_MinZonePercentage); }
+
+            set
+            {
+                if (_MinZonePercentage != value)
+                {
+                    if (value < 0)
+                    {
+                        const string s = "Value must be non-negative.";
+                        throw new ArgumentOutOfRangeException(s);
+                    }
+
+                    if (value > 100)
+                    {
+                        const string s = "Value must be less or equal to 100.";
+                        throw new ArgumentOutOfRangeException(s);
+                    }
+
+                    _MinZonePercentage = value;
+
+                    InvalidateKnob();
+                }
+            }
+        }
+
+        #endregion
+
+        #region MajorTickAmount
+
+        /// <summary>
+        /// Gets and sets the amount each
+        /// major tick represents on the knob
+        /// </summary>
+        [Browsable(true), Category("Appearance")]
+        [Description("Indicates the amount each major tick represents on the knob")]
+        public decimal MajorTickAmount
+        {
+            get { return _MajorTickAmount; }
+
+            set
+            {
+                if (_MajorTickAmount != value)
+                {
+                    if (value < 0)
+                    {
+                        const string s = "Value must be non-negative.";
+                        throw new ArgumentOutOfRangeException(s);
+                    }
+
+                    _MajorTickAmount = value;
+
+                    InvalidateKnob();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized
+        /// </summary>
+        public bool ShouldSerializeMajorTickAmount()
+        {
+            return (_MajorTickAmount != 10);
+        }
+
+        /// <summary>
+        /// Resets property to it's default value
+        /// </summary>
+        public void ResetMajorTickAmount()
+        {
+            MajorTickAmount = 10;
+        }
+
+        #endregion
+
+        #region MaxValue
+
+        /// <summary>
+        /// Get and sets the upper limit of the knob range
+        /// </summary>
+        [Browsable(true), Category("Behavior"), DefaultValue(100)]
+        [Description("Indicates the upper limit of the knob range")]
+        public decimal MaxValue
+        {
+            get
+            {
+                return ((_AllowDecimalValueSelection == false) ?
+                    Math.Round(_MaxValue) : Math.Round(_MaxValue, _SelectionDecimals));
+            }
+
+            set
+            {
+                if (_MaxValue != value)
+                {
+                    if (value <= MinValue)
+                        MinValue = value - 1;
+                    
+                    _MaxValue = value;
+
+                    // Keep the current Value within the
+                    // users MinValue and MaxValue range
+                    
+                    if (_Value > _MaxValue)
+                        _Value = _MaxValue;
+
+                    InvalidateKnob();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized
+        /// </summary>
+        public bool ShouldSerializeMaxValue()
+        {
+            return (_MaxValue != 100);
+        }
+
+        /// <summary>
+        /// Resets property to it's default value
+        /// </summary>
+        public void ResetMaxValue()
+        {
+            MaxValue = 100;
+        }
+
+        #endregion
+
+        #region MinorTickAmount
+
+        /// <summary>
+        /// Gets and sets the amount each
+        /// minor tick represents on the knob
+        /// </summary>
+        [Browsable(true), Category("Appearance")]
+        [Description("Indicates the amount each minor tick represents on the knob")]
+        public decimal MinorTickAmount
+        {
+            get { return _MinorTickAmount; }
+
+            set
+            {
+                if (_MinorTickAmount != value)
+                {
+                    if (value < 0)
+                    {
+                        const string s = "Value must be non-negative.";
+                        throw new ArgumentOutOfRangeException(s);
+                    }
+
+                    _MinorTickAmount = value;
+
+                    InvalidateKnob();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized
+        /// </summary>
+        public bool ShouldSerializeMinorTickAmount()
+        {
+            return (_MinorTickAmount != 2);
+        }
+
+        /// <summary>
+        /// Resets property to it's default value
+        /// </summary>
+        public void ResetMinorTickAmount()
+        {
+            MinorTickAmount = 2;
+        }
+
+        #endregion
+
+        #region MinValue
+
+        /// <summary>
+        /// Gets and sets the lower limit of the knob range
+        /// </summary>
+        [Browsable(true), Category("Behavior"), DefaultValue(0)]
+        [Description("Indicates the lower limit of the knob range")]
+        public decimal MinValue
+        {
+            get
+            {
+                return ((_AllowDecimalValueSelection == false) ?
+                    Math.Round(_MinValue) : Math.Round(_MinValue, _SelectionDecimals));
+            }
+
+            set
+            {
+                if (_MinValue != value)
+                {
+                    if (value >= MaxValue)
+                        MaxValue = value + 1;
+
+                    _MinValue = value;
+
+                    // Keep the current Value within the
+                    // users MinValue and MaxValue range
+
+                    if (_Value < _MinValue)
+                        _Value = _MinValue;
+
+                    InvalidateKnob();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized
+        /// </summary>
+        public bool ShouldSerializeMinValue()
+        {
+            return (_MinValue != 100);
+        }
+
+        /// <summary>
+        /// Resets property to it's default value
+        /// </summary>
+        public void ResetMinValue()
+        {
+            MinValue = 0;
+        }
+
+        #endregion
+
+        #region MaxZonePercentage
+
+        /// <summary>
+        /// Get and sets the numeric value that
+        /// represents the MaxZoneIndicator percentage
+        /// </summary>
+        [Browsable(true), Category("Appearance"), DefaultValue(20)]
+        [Description("Indicates numeric value that represents the MaxZoneIndicator percentage")]
+        public int MaxZonePercentage
+        {
+            get { return (_MaxZonePercentage); }
+
+            set
+            {
+                if (_MaxZonePercentage != value)
+                {
+                    if (value < 0)
+                    {
+                        const string s = "Value must be non-negative.";
+                        throw new ArgumentOutOfRangeException(s);
+                    }
+
+                    if (value > 100)
+                    {
+                        const string s = "Value must be less or equal to 100.";
+                        throw new ArgumentOutOfRangeException(s);
+                    }
+
+                    _MaxZonePercentage = value;
+
+                    InvalidateKnob();
+                }
+            }
+        }
+
+        #endregion
+
+        #region ReadOnly
+
+        /// <summary>
+        /// Get and sets the (user access) ReadOnly state of the control
+        /// </summary>
+        [Browsable(true), Category("Behavior"), DefaultValue(false)]
+        [Description("Indicates the (user access) ReadOnly state of the control")]
+        public bool ReadOnly
+        {
+            get { return (_ReadOnly); }
+            set { _ReadOnly = value; }
+        }
+
+        #endregion
+
+        #region SelectionDecimals
+
+        /// <summary>
+        /// Gets and sets the number of selection decimals. This is used in conjunction with AllowDecimalValueSelection.
+        /// </summary>
+        [Browsable(true), Category("Behavior"), DefaultValue(1)]
+        [Description("Indicates the number of selection decimals. This is used in conjunction with AllowDecimalValueSelection.")]
+        public int SelectionDecimals
+        {
+            get { return (_SelectionDecimals); }
+            set { _SelectionDecimals = value; InvalidateKnob(); }
+        }
+
+        #endregion
+
+        #region SelectionDelta
+
+        /// <summary>
+        /// Gets or sets the delta value used to adjust the knob Value, when
+        /// the user presses the up or down arrow keys. (0 signifies use of 
+        /// SelectionDecimals precision as default delta value.)
+        /// </summary>
+        [Browsable(true), Category("Behavior"), DefaultValue(typeof(Decimal), "0")]
+        [Description("Indicates the delta value used to adjust the knob Value, when the user presses the up or down arrow keys. (0 signifies use of SelectionDecimals precision as default delta value.)")]
+        public decimal SelectionDelta
+        {
+            get { return (_SelectionDelta); }
+            set { _SelectionDelta = value; }
+        }
+
+        #endregion
+
+        #region SetValueOnFocus
+
+        /// <summary>
+        /// Gets and sets whether the knob Value will be set when
+        /// knob is given focus via mouse selection.
+        /// </summary>
+        [Browsable(true), Category("Behavior"), DefaultValue(true)]
+        [Description("Indicates whether the knob Value will be set when knob is given focus via mouse selection")]
+        public bool SetValueOnFocus
+        {
+            get { return (_SetValueOnFocus); }
+            set { _SetValueOnFocus = value; }
+        }
+
+        #endregion
+
+        #region ShowTickLabels
+
+        [Category("Behavior"), DefaultValue(true)]
+        [Description("Indicates whether control displays the MajorTick text labels.")]
+        public bool ShowTickLabels
+        {
+            get { return (_ShowTickLabels); }
+            set { _ShowTickLabels = value; InvalidateKnob(); }
+        }
+
+        #endregion
+
+        #region StartAngle
+
+        /// <summary>
+        /// Gets and sets the angle measured
+        /// from the x-axis to the starting point of the gauge zone
+        /// </summary>
+        [Browsable(true), Category("Appearance"), DefaultValue(130)]
+        [Description("Angle measured from the x-axis to the starting point of the gauge zone")]
+        public int StartAngle
+        {
+            get { return _StartAngle; }
+
+            set
+            {
+                if (_StartAngle != value)
+                {
+                    if (value < 0 || value > 360)
+                    {
+                        const string s = "Value must be between 0 and 360, inclusive.";
+                        throw new ArgumentOutOfRangeException(s);
+                    }
+
+                    _StartAngle = value;
+
+                    InvalidateKnob();
+                }
+            }
+        }
+
+        #endregion
+
+        #region SweepAngle
+
+        /// <summary>
+        /// Get and sets the angle measured from the StartAngle to the ending point of the gauge zone.
+        /// Positive values signify clockwise rotation; negative values, counter-clockwise rotation.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), DefaultValue(280)]
+        [Description("Angle measured from the StartAngle to the ending point of the gauge zone. Positive values signify clockwise rotation; negative values, counter-clockwise rotation.")]
+        public int SweepAngle
+        {
+            get { return _SweepAngle; }
+
+            set
+            {
+                if (_SweepAngle != value)
+                {
+                    int n = Math.Abs(value);
+
+                    if (n > 360)
+                    {
+                        const string s = "Value must be between -360 and 360, inclusive.";
+                        throw new ArgumentOutOfRangeException(s);
+                    }
+
+                    _SweepAngle = value;
+
+                    InvalidateKnob();
+                }
+            }
+        }
+
+        #endregion
+
+        #region TickLabelFormat
+
+        /// <summary>
+        /// Get and sets the .Net Numeric Format String
+        /// specifier to be used for the numeric knob tick labels.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), DefaultValue(null)]
+        [Description("Indicates the .Net Numeric Format String specifier to be used for the numeric knob tick labels.")]
+        public string TickLabelFormat
+        {
+            get { return (_TickLabelFormat); }
+
+            set
+            {
+                _TickLabelFormat = value;
+
+                InvalidateKnob();
+            }
+        }
+
+        #endregion
+
+        #region Value
+
+        /// <summary>
+        /// Gets and sets the numeric value that
+        /// represents the current position of the knob selector
+        /// </summary>
+        [Browsable(true), Category("Behavior")]
+        [Description("Indicates numeric value that represents the current position of the knob selector")]
+        public decimal Value
+        {
+            get
+            {
+                return (_Value);
+            }
+
+            set
+            {
+                if (_Value != value)
+                {
+                    value = (_AllowDecimalValueSelection == false) ?
+                        Math.Round(value) : (Math.Round(value, _SelectionDecimals));
+
+                    if (value < MinValue)
+                    {
+                        const string s = "Value must be greater or equal than the Minimum property value.";
+                        throw new ArgumentOutOfRangeException(s);
+                    }
+
+                    if (value > MaxValue)
+                    {
+                        const string s = "Value must be greater or equal than the Maximum property value.";
+                        throw new ArgumentOutOfRangeException(s);
+                    }
+
+                    decimal oldValue = _Value;
+                    _Value = value;
+
+                    OnValueChanged(oldValue, value);
+
+                    InvalidateKnob();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized
+        /// </summary>
+        public bool ShouldSerializeValue()
+        {
+            return (Value != 0);
+        }
+
+        /// <summary>
+        /// Resets property to it's default value
+        /// </summary>
+        public void ResetValue()
+        {
+            Value = 0;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region HookEvents
+
+        /// <summary>
+        /// Hooks or unhooks needed events
+        /// </summary>
+        /// <param name="hook">true to hook</param>
+        private void HookEvents(bool hook)
+        {
+            if (hook == true)
+                Resize += KnobControl_Resize;
+            else
+                Resize -= KnobControl_Resize;
+        }
+
+        #endregion
+
+        #region Event processing
+
+        #region KnobControl_Resize
+
+        /// <summary>
+        /// Control Resize processing
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void KnobControl_Resize(object sender, EventArgs e)
+        {
+            if (Width < MinKnobSize)
+                Width = MinKnobSize;
+
+            if (Height < MinKnobSize)
+                Height = MinKnobSize;
+
+            _Knob.ResetKnob();
+        }
+
+        #endregion
+
+        #region KnobColor_ColorTableChanged
+
+        void KnobColor_ColorTableChanged(object sender, EventArgs e)
+        {
+            Invalidate();
+
+            OnColorTableChanged();
+        }
+
+        #endregion
+
+        #endregion
+
+        #region OnGotFocus
+
+        /// <summary>
+        /// Handles control GotFocus
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnGotFocus(EventArgs e)
+        {
+            if (_FocusCuesEnabled == true)
+                InvalidateKnob();
+
+            base.OnGotFocus(e);
+        }
+
+        #endregion
+
+        #region OnLostFocus
+
+        /// <summary>
+        /// Handles control GotFocus
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnLostFocus(EventArgs e)
+        {
+            if (_FocusCuesEnabled == true)
+                InvalidateKnob();
+
+            base.OnLostFocus(e);
+        }
+
+        #endregion
+
+        #region OnValueChanged
+
+        /// <summary>
+        /// Called when the control 'Value' is changed
+        /// </summary>
+        protected virtual void OnValueChanged(decimal oldValue, decimal newValue)
+        {
+            if (ValueChanged != null)
+                ValueChanged(this, new ValueChangedEventArgs(oldValue, newValue));
+        }
+
+        #endregion
+
+        #region OnColorTableChanged
+
+        /// <summary>
+        /// Called when the Knob ColorTable has changed
+        /// </summary>
+        private void OnColorTableChanged()
+        {
+            if (ColorTableChanged != null)
+                ColorTableChanged(this, EventArgs.Empty);
+        }
+
+        #endregion
+
+        #region OnPaint
+
+        #region OnPaint
+
+        /// <summary>
+        /// Paints the contents of the control
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            Graphics g = e.Graphics;
+
+            SmoothingMode sm = g.SmoothingMode;
+            g.SmoothingMode = SmoothingMode.AntiAlias;
+
+            // Paint our background
+
+            using (Brush br = new SolidBrush(BackColor))
+            {
+                Rectangle r = Bounds;
+                r.Location = Point.Empty;
+
+                g.FillRectangle(br, r);
+            }
+
+            // Initialize the rendering process
+            // and render each individual part
+
+            _Knob.InitRender(e);
+
+            RenderZoneIndicator(e);
+            RenderTickMinor(e);
+            RenderTickMajor(e);
+            RenderTickLabel(e);
+            RenderKnobFace(e);
+            RenderKnobIndicator(e);
+            RenderFocusRectangle(e);
+
+            g.SmoothingMode = sm;
+        }
+
+        #endregion
+
+        #region RenderZoneIndicator
+
+        /// <summary>
+        /// RenderZoneIndicator
+        /// </summary>
+        /// <param name="e"></param>
+        private void RenderZoneIndicator(PaintEventArgs e)
+        {
+            RenderPart(e, _Knob.ZoneIndicatorBounds,
+                PreRenderZoneIndicator, PostRenderZoneIndicator, _Knob.RenderZoneIndicator);
+        }
+
+        #endregion
+
+        #region RenderTickMinor
+
+        /// <summary>
+        /// RenderTickMinor
+        /// </summary>
+        /// <param name="e"></param>
+        private void RenderTickMinor(PaintEventArgs e)
+        {
+            RenderPart(e, _Knob.ZoneIndicatorBounds,
+                PreRenderTickMinor, PostRenderTickMinor, _Knob.RenderTickMinor);
+        }
+
+        #endregion
+
+        #region RenderTickMajor
+
+        /// <summary>
+        /// RenderTickMajor
+        /// </summary>
+        /// <param name="e"></param>
+        private void RenderTickMajor(PaintEventArgs e)
+        {
+            RenderPart(e, _Knob.ZoneIndicatorBounds,
+                PreRenderTickMajor, PostRenderTickMajor, _Knob.RenderTickMajor);
+        }
+
+        #endregion
+
+        #region RenderTickLabel
+
+        /// <summary>
+        /// RenderTickLabel
+        /// </summary>
+        /// <param name="e"></param>
+        private void RenderTickLabel(PaintEventArgs e)
+        {
+            if (_ShowTickLabels == true)
+            {
+                RenderPart(e, _Knob.TickLabelBounds,
+                           PreRenderTickLabel, PostRenderTickLabel, _Knob.RenderTickLabel);
+            }
+        }
+
+        #endregion
+
+        #region RenderKnobFace
+
+        /// <summary>
+        /// RenderKnobFace
+        /// </summary>
+        /// <param name="e"></param>
+        private void RenderKnobFace(PaintEventArgs e)
+        {
+            RenderPart(e, _Knob.KnobFaceBounds,
+                PreRenderKnobFace, PostRenderKnobFace, _Knob.RenderKnobFace);
+        }
+
+        #endregion
+
+        #region RenderKnobIndicator
+
+        /// <summary>
+        /// RenderKnobIndicator
+        /// </summary>
+        /// <param name="e"></param>
+        private void RenderKnobIndicator(PaintEventArgs e)
+        {
+            RenderPart(e, _Knob.KnobIndicatorBounds,
+                PreRenderKnobIndicator, PostRenderKnobIndicator, _Knob.RenderKnobIndicator);
+
+        }
+
+        #endregion
+
+        #region RenderFocusRectangle
+
+        /// <summary>
+        /// RenderFocusRectangle
+        /// </summary>
+        /// <param name="e"></param>
+        private void RenderFocusRectangle(PaintEventArgs e)
+        {
+            if (_FocusCuesEnabled == true && Focused == true)
+            {
+                if (RenderFocusRect != null)
+                {
+                    RenderFocusRectEventArgs ev =
+                        new RenderFocusRectEventArgs(e.Graphics, e.ClipRectangle, _Knob.FocusRectBounds);
+
+                    RenderFocusRect(this, ev);
+                }
+                else
+                {
+                    _Knob.RenderFocusRect(e);
+                }
+            }
+        }
+
+        #endregion
+
+        #region RenderPart
+
+        /// <summary>
+        /// Renders an individual 'part' of the control knob
+        /// </summary>
+        /// <param name="e"></param>
+        /// <param name="bounds">Bounding rectangle</param>
+        /// <param name="preRender">User PreRender callout</param>
+        /// <param name="postRender">User PostRender callout</param>
+        /// <param name="internalRender">Internal render callout</param>
+        private void RenderPart(PaintEventArgs e, Rectangle bounds,
+            PreRenderEventHandler preRender, PostRenderEventHandler postRender,
+            InternalRender internalRender)
+        {
+            bool cancel = false;
+
+            // If the user wants to PreRender the control
+            // then callout to their associated handler
+
+            if (preRender != null)
+            {
+                PreRenderEventArgs ev =
+                    new PreRenderEventArgs(e.Graphics, e.ClipRectangle, bounds);
+
+                preRender(this, ev);
+
+                cancel = ev.Cancel;
+            }
+
+            // If our internal rendering was not canceled
+            // by the user (via the PreRender event), then
+            // perform our own rendering of the control
+
+            if (cancel == false)
+            {
+                internalRender(e);
+
+                // If the user cancelled our internal rendering
+                // then their is no need to PostRender, but if not
+                // then we need to give them another shot at the
+                // rendering process
+
+                if (postRender != null)
+                {
+                    PostRenderEventArgs ev =
+                        new PostRenderEventArgs(e.Graphics, e.ClipRectangle, bounds);
+
+                    postRender(this, ev);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Keyboard support
+
+        #region IsInputKey
+
+        /// <summary>
+        /// Routine to signify that the directional keys
+        /// (up/down/left/right) are special input keys
+        /// </summary>
+        /// <param name="key"></param>
+        /// <returns>true if the key is an input key</returns>
+        protected override bool IsInputKey(Keys key)
+        {
+            if (_ReadOnly == true)
+                return (false);
+
+            switch (key)
+            {
+                // Incrementing keys
+
+                case Keys.Up:
+                case Keys.Right:
+                case Keys.End:
+                case Keys.PageUp:
+
+                // Decrementing keys
+
+                case Keys.Down:
+                case Keys.Left:
+                case Keys.Home:
+                case Keys.PageDown:
+
+                    return (true);
+            }
+
+            return (base.IsInputKey(key));
+        }
+
+        #endregion
+
+        #region OnKeyDown
+
+        /// <summary>
+        /// Handles knob rotation via key input
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnKeyDown(KeyEventArgs e)
+        {
+            base.OnKeyDown(e);
+
+            if (e.Handled == false)
+            {
+                if (_ReadOnly == false)
+                {
+                    switch (e.KeyCode)
+                    {
+                        case Keys.Home:
+                            Value = MinValue;
+                            break;
+
+                        case Keys.End:
+                            Value = MaxValue;
+                            break;
+
+                        case Keys.Right:
+                        case Keys.Up:
+                            AdjustValue(GetDelta(ModifierKeys, true));
+                            break;
+
+                        case Keys.Left:
+                        case Keys.Down:
+                            AdjustValue(GetDelta(ModifierKeys, false));
+                            break;
+
+                        case Keys.PageUp:
+                            AdjustValue(GetDelta(Keys.Control | Keys.Shift, true));
+                            break;
+
+                        case Keys.PageDown:
+                            AdjustValue(GetDelta(Keys.Control | Keys.Shift, false));
+                            break;
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region AdjustValue
+
+        /// <summary>
+        /// Adjusts the Value via the keyboard or mouse
+        /// </summary>
+        /// <param name="delta"></param>
+        private void AdjustValue(decimal delta)
+        {
+            decimal value = Value + delta;
+
+            if (value < MinValue)
+                value = (IgnoreKeyLimits ? MaxValue - (MinValue - value) : MinValue);
+
+            if (value > MaxValue)
+                value = (IgnoreKeyLimits ? (value - MaxValue) : MaxValue);
+
+            Value = value;
+        }
+
+        #endregion
+
+        #region GetDelta
+
+        /// <summary>
+        /// Calculates the delta adjustment for the
+        /// pos or neg increment with respect to the
+        /// supplied modifiers (Control/Shift)
+        /// </summary>
+        /// <param name="mods">Keys.Control and/or Keys.Shift</param>
+        /// <param name="inc">Denotes whether to increment or decrement</param>
+        /// <returns>Signed delta value</returns>
+        private decimal GetDelta(Keys mods, bool inc)
+        {
+            decimal delta = 0;
+
+            // If the Control Key is pressed then the user is
+            // wanting to jump by tick amounts (either Minor or Major)
+
+            if ((mods & Keys.Control) == Keys.Control)
+            {
+                // Shift Key denotes Major tick changes, no shift
+                // key denotes Minor tick changes
+
+                delta = ((mods & Keys.Shift) == Keys.Shift) ?
+                    MajorTickAmount : MinorTickAmount;
+
+                // Make our first adjustment align
+                // on a tick boundary
+
+                if (delta > 0)
+                {
+                    decimal dv = Value % delta;
+
+                    if (dv > 0)
+                        delta = inc ? delta - dv : dv;
+
+                    else if (dv < 0)
+                        delta = inc ? -dv : delta + dv;
+
+                    if (AllowDecimalValueSelection == false)
+                        delta = Math.Round(delta, 1);
+                }
+            }
+
+            // Adjust delta to a valid unit
+
+            if (delta == 0)
+            {
+                // No tick change, so just advance
+                // by single units
+
+                if (_SelectionDelta != 0)
+                {
+                    delta = _SelectionDelta;
+                }
+                else
+                {
+                    delta = (AllowDecimalValueSelection == true) ?
+                        (decimal)(1 / Math.Pow(10, SelectionDecimals)) : 1;
+                }
+            }
+
+            return (inc == true ? delta : -delta);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Mouse support
+
+        #region OnMouseDown
+
+        /// <summary>
+        /// MouseDown processing
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnMouseDown(MouseEventArgs e)
+        {
+            if (_ReadOnly == false)
+            {
+                // Check to see if the user's MouseDown
+                // was inside our knob control
+
+                Point pt = new Point(e.X, e.Y);
+
+                if (DesignMode == false && _Knob.PointInControl(pt) == true)
+                {
+                    if (SetValueOnFocus == true || Focused == true)
+                    {
+                        // Save the current control Value incase
+                        // the user cancels the operation
+
+                        _SaveValue = Value;
+
+                        // Set the new knob Value and set our state
+                        // to signify we are rotating the knob
+
+                        Value = _Knob.GetValueFromPoint(pt);
+
+                        Cursor = Cursors.Hand;
+
+                        _KnobRotating = true;
+                    }
+
+                    // Give the control the focus
+
+                    Focus();
+                }
+            }
+
+            base.OnMouseDown(e);
+        }
+
+        #endregion
+
+        #region OnMouseUp
+
+        /// <summary>
+        /// MouseUp processing
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnMouseUp(MouseEventArgs e)
+        {
+            // If the user is actively was rotating the knob
+            // then reset our state processing accordingly
+
+            if (_KnobRotating == true)
+            {
+                Cursor = Cursors.Default;
+
+                _KnobRotating = false;
+            }
+
+            base.OnMouseUp(e);
+        }
+
+        #endregion
+
+        #region OnMouseMove
+
+        /// <summary>
+        /// MouseMove processing
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnMouseMove(MouseEventArgs e)
+        {
+            // Process the mouse movement if the user
+            // is actively rotating the knob
+
+            if (_KnobRotating == true)
+            {
+                Point pt = new Point(e.X, e.Y);
+
+                // If the mouse is within the knob control
+                // then set the new Value accordingly, otherwise
+                // restore the Value to our previous Value
+
+                if (_Knob.PointInControl(pt) == true)
+                {
+                    Value = _Knob.GetValueFromPoint(pt);
+                    Cursor = Cursors.Hand;
+                }
+                else
+                {
+                    Value = _SaveValue;
+                    Cursor = Cursors.Default;
+                }
+            }
+
+            base.OnMouseMove(e);
+        }
+
+        #endregion
+
+        #region OnMouseWheel
+
+        /// <summary>
+        /// Handles MouseWheel events
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnMouseWheel(MouseEventArgs e)
+        {
+            if (_ReadOnly == false)
+            {
+                // Adjust the Value based upon the
+                // MouseWheel delta value
+
+                AdjustValue(GetDelta(ModifierKeys, e.Delta > 0));
+            }
+
+            // Add call the base handler
+
+            base.OnMouseWheel(e);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InvalidateKnob
+
+        /// <summary>
+        /// Invalidates the knob
+        /// </summary>
+        private void InvalidateKnob()
+        {
+            // Signal that the knob definition changed and
+            // that a reconfigure of the control will need
+            // to be done
+
+            _Knob.ResetKnob();
+
+            // Invalidate the control
+
+            Invalidate();
+        }
+
+        #endregion
+
+        #region GetValueFromPoint
+
+        /// <summary>
+        /// Gets the Knob value from the given Point
+        /// </summary>
+        /// <param name="pt">Point</param>
+        /// <returns>Value</returns>
+        public decimal GetValueFromPoint(Point pt)
+        {
+            return (_Knob.GetValueFromPoint(pt));
+        }
+
+        #endregion
+
+        #region IDisposable Members
+
+        /// <summary>
+        /// IDisposable.Dispose
+        /// </summary>
+        void IDisposable.Dispose()
+        {
+            HookEvents(false);
+
+            Dispose();
+        }
+
+        #endregion
+    }
+
+    #region Enums
+
+    /// <summary>
+    /// Various Knob Control display styles
+    /// </summary>
+    public enum eKnobStyle
+    {
+        Style1,
+        Style2,
+        Style3,
+        Style4
+    }
+
+    #endregion
+
+    #region EventArgs
+
+    #region PreRenderEventArgs
+
+    /// <summary>
+    /// PreRenderEventArgs - user cancellable
+    /// </summary>
+    public class PreRenderEventArgs : CancelEventArgs
+    {
+        #region Private variables
+
+        private Graphics _Graphics;         // Graphics object
+        private Rectangle _ClipRectangle;   // Cliprect
+        private Rectangle _Bounds;          // Bounding rectangle
+
+        #endregion
+
+        /// <summary>
+        /// PreRenderEventArgs
+        /// </summary>
+        /// <param name="graphics"></param>
+        /// <param name="clipRectangle"></param>
+        /// <param name="bounds"></param>
+        public PreRenderEventArgs(Graphics graphics, Rectangle clipRectangle, Rectangle bounds)
+        {
+            _Graphics = graphics;
+            _ClipRectangle = clipRectangle;
+            _Bounds = bounds;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the event Graphics object
+        /// </summary>
+        public Graphics Graphics
+        {
+            get { return (_Graphics); }
+        }
+
+        /// <summary>
+        /// Gets the event ClipRectangle
+        /// </summary>
+        public Rectangle ClipRectangle
+        {
+            get { return (_ClipRectangle); }
+        }
+
+        /// <summary>
+        /// Gets the event Bounds
+        /// </summary>
+        public Rectangle Bounds
+        {
+            get { return (_Bounds); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region PostRenderEventArgs
+
+    /// <summary>
+    /// PostRenderEventArgs
+    /// </summary>
+    public class PostRenderEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private Graphics _Graphics;         // Graphics object
+        private Rectangle _ClipRectangle;   // Cliprect
+        private Rectangle _Bounds;          // Bounding rectangle
+
+        #endregion
+
+        /// <summary>
+        /// PostRenderEventArgs
+        /// </summary>
+        /// <param name="graphics"></param>
+        /// <param name="clipRectangle"></param>
+        /// <param name="bounds"></param>
+        public PostRenderEventArgs(Graphics graphics, Rectangle clipRectangle, Rectangle bounds)
+        {
+            _Graphics = graphics;
+            _ClipRectangle = clipRectangle;
+            _Bounds = bounds;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the event Graphics object
+        /// </summary>
+        public Graphics Graphics
+        {
+            get { return (_Graphics); }
+        }
+
+        /// <summary>
+        /// Gets the event ClipRectangle
+        /// </summary>
+        public Rectangle ClipRectangle
+        {
+            get { return (_ClipRectangle); }
+        }
+
+        /// <summary>
+        /// Gets the event Bounds
+        /// </summary>
+        public Rectangle Bounds
+        {
+            get { return (_Bounds); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region RenderFocusRectEventArgs
+
+    /// <summary>
+    /// RenderFocusRectEventArgs
+    /// </summary>
+    public class RenderFocusRectEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private Graphics _Graphics;         // Graphics object
+        private Rectangle _ClipRectangle;   // Cliprect
+        private Rectangle _Bounds;          // Bounding rectangle
+
+        #endregion
+
+        /// <summary>
+        /// RenderFocusRectEventArgs
+        /// </summary>
+        /// <param name="graphics"></param>
+        /// <param name="clipRectangle"></param>
+        /// <param name="bounds"></param>
+        public RenderFocusRectEventArgs(Graphics graphics, Rectangle clipRectangle, Rectangle bounds)
+        {
+            _Graphics = graphics;
+            _ClipRectangle = clipRectangle;
+            _Bounds = bounds;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the event Graphics object
+        /// </summary>
+        public Graphics Graphics
+        {
+            get { return (_Graphics); }
+        }
+
+        /// <summary>
+        /// Gets the event ClipRectangle
+        /// </summary>
+        public Rectangle ClipRectangle
+        {
+            get { return (_ClipRectangle); }
+        }
+
+        /// <summary>
+        /// Gets the event Bounds
+        /// </summary>
+        public Rectangle Bounds
+        {
+            get { return (_Bounds); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region ValueChangedEventArgs
+
+    /// <summary>
+    /// ValueChangedEventArgs
+    /// </summary>
+    public class ValueChangedEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private decimal _OldValue;          // Old value
+        private decimal _NewValue;          // New value
+
+        #endregion
+
+        /// <summary>
+        /// ValueChangedEventArgs
+        /// </summary>
+        public ValueChangedEventArgs(decimal oldValue, decimal newValue)
+        {
+            _OldValue = oldValue;
+            _NewValue = newValue;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the old value
+        /// </summary>
+        public decimal OldValue
+        {
+            get { return (_OldValue); }
+        }
+
+        /// <summary>
+        /// Gets the new value
+        /// </summary>
+        public decimal NewValue
+        {
+            get { return (_NewValue); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/Knobs/KnobStyle1.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/Knobs/KnobStyle1.cs
new file mode 100644
index 00000000..8f33316f
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/Knobs/KnobStyle1.cs	
@@ -0,0 +1,243 @@
+using System;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Windows.Forms;
+
+namespace DevComponents.Instrumentation.Primitives
+{
+    public class KnobStyle1 : BaseKnob
+    {
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="knobControl">Associated knob control</param>
+        public KnobStyle1(KnobControl knobControl)
+            : base(knobControl)
+        {
+        }
+
+        #region Knob Configuration
+
+        #region ConfigureKnob
+
+        /// <summary>
+        /// Configures the given knob control
+        /// by establishing various default object parameters
+        /// </summary>
+        /// <param name="e"></param>
+        public override void ConfigureKnob(PaintEventArgs e)
+        {
+            base.ConfigureKnob(e);
+
+            // Calculate default sizes and bounding object rectangles
+
+            ZoneIndWidth = 2;
+
+            MajorTickSize = new Size((int)(KnobWidth * 0.015), (int)(KnobWidth * 0.017));
+            MinorTickSize = new Size(MajorTickSize.Width / 2, MajorTickSize.Height);
+
+            IndTickHeight = (int)ZoneIndWidth;
+
+            CalculateBoundingRects();
+
+            // Fill in the default knob colors
+
+            DefaultColorTable.MajorTickColor = Color.Black;
+            DefaultColorTable.MinorTickColor = Color.Black;
+            DefaultColorTable.ZoneIndicatorColor = Color.Black;
+            DefaultColorTable.KnobIndicatorPointerColor = Color.Gray;
+            DefaultColorTable.KnobIndicatorPointerBorderColor = Color.Gray;
+
+            DefaultColorTable.KnobFaceColor = new LinearGradientColorTable(Color.Black, Color.Gray, 40);
+            DefaultColorTable.KnobIndicatorColor = new LinearGradientColorTable(Color.Gray, Color.White, 40);
+            DefaultColorTable.MinZoneIndicatorColor = new LinearGradientColorTable(Color.White, Color.Green);
+            DefaultColorTable.MaxZoneIndicatorColor = new LinearGradientColorTable(Color.Yellow, Color.Red);
+        }
+
+        #endregion
+
+        #region CalculateBoundingRects
+
+        /// <summary>
+        /// Calculates several default control
+        /// // bounding rectangles
+        /// </summary>
+        private void CalculateBoundingRects()
+        {
+            // Calculate the bounding Zone indicator rectangle and width
+
+            int delta = MaxLabelWidth + MajorTickSize.Height + (int)(KnobWidth * 0.04f);
+
+            ZoneIndicatorBounds = new Rectangle(delta, delta,
+                KnobWidth - (delta * 2), KnobWidth - (delta * 2));
+
+            // Calculate the KnobFace and inset face rectangles
+
+            delta += 1;
+
+            KnobFaceBounds = new Rectangle(delta, delta,
+                KnobWidth - (delta * 2), KnobWidth - (delta * 2));
+
+            // Calculate the KnobIndicator bounding rectangle
+
+            delta += (int)(KnobWidth * .07f);
+
+            KnobIndicatorBounds = new Rectangle(delta, delta,
+                KnobWidth - (delta * 2), KnobWidth - (delta * 2));
+
+            // Calculate the TickLabel bounding rect
+
+            delta = (int)((MaxLabelWidth + IndTickHeight) * .85f);
+
+            TickLabelBounds = new Rectangle(ZoneIndicatorBounds.Location, ZoneIndicatorBounds.Size);
+            TickLabelBounds.Inflate(delta, delta);
+
+            // Calculate the focus rectangle
+
+            FocusRectBounds = new Rectangle(KnobIndicatorBounds.Location, KnobIndicatorBounds.Size);
+
+            delta = (int)(KnobIndicatorBounds.Width * .035);
+
+            FocusRectBounds.Inflate(-delta, -delta);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Part rendering code
+
+        #region RenderZoneIndicator
+
+        /// <summary>
+        /// Renders the zone indicator
+        /// </summary>
+        /// <param name="e"></param>
+        public override void RenderZoneIndicator(PaintEventArgs e)
+        {
+            if (ZoneIndicatorBounds.Width > 10 && ZoneIndicatorBounds.Height > 10)
+            {
+                Graphics g = e.Graphics;
+
+                using (Pen pen = new Pen(ZoneIndicatorColor, 2))
+                    g.DrawEllipse(pen, ZoneIndicatorBounds);
+            }
+        }
+
+        #endregion
+
+        #region RenderKnobFace
+
+        /// <summary>
+        /// Renders the knob face
+        /// </summary>
+        /// <param name="e"></param>
+        public override void RenderKnobFace(PaintEventArgs e)
+        {
+            if (KnobFaceBounds.Width > 10 && KnobFaceBounds.Height > 10)
+            {
+                Graphics g = e.Graphics;
+
+                using (Brush br = KnobFaceColor.GetBrush(KnobFaceBounds))
+                    g.FillEllipse(br, KnobFaceBounds);
+            }
+        }
+
+        #endregion
+
+        #region RenderKnobIndicator
+
+        /// <summary>
+        /// Renders the knob face
+        /// </summary>
+        /// <param name="e"></param>
+        public override void RenderKnobIndicator(PaintEventArgs e)
+        {
+            if (KnobIndicatorBounds.Width > 10 && KnobIndicatorBounds.Height > 10)
+            {
+                Graphics g = e.Graphics;
+
+                // Render the Indicator shadow
+
+                Rectangle r = new Rectangle(KnobIndicatorBounds.X, KnobIndicatorBounds.Y,
+                                            KnobIndicatorBounds.Width, KnobIndicatorBounds.Height);
+
+                int delta = (int) (KnobWidth * .025f);
+
+                r.Offset(delta, delta);
+
+                using (SolidBrush br = new
+                    SolidBrush(Color.FromArgb(160, KnobFaceColor.Start)))
+                {
+                    g.FillEllipse(br, r);
+                }
+
+                r.Offset(-delta, -delta);
+
+                // Render the indicator
+
+                using (LinearGradientBrush br = new
+                    LinearGradientBrush(KnobIndicatorBounds, KnobIndicatorColor.End, KnobIndicatorColor.Start, -40f))
+                    g.FillEllipse(br, KnobIndicatorBounds);
+
+                delta = (int) (r.Width * .02f);
+
+                r.Inflate(-delta, -delta);
+
+                using (Brush br = KnobIndicatorColor.GetBrush(r))
+                    g.FillEllipse(br, r);
+
+                // Render the indicator dimple
+
+                r = GetIndicatorRect();
+
+                delta = (int) (r.Width * .05f);
+
+                r.Inflate(delta, delta);
+
+                using (Brush lgb = new
+                    LinearGradientBrush(r, Color.White, KnobIndicatorPointerColor, -40f))
+                {
+                    g.FillEllipse(lgb, r);
+                }
+
+                r.Inflate(-delta, -delta);
+
+                using (LinearGradientBrush lgb = new
+                    LinearGradientBrush(r, KnobIndicatorPointerColor, Color.White, 220f))
+                {
+                    g.FillEllipse(lgb, r);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Returns the knob indicator rectangle
+        /// </summary>
+        /// <returns></returns>
+        private Rectangle GetIndicatorRect()
+        {
+            float degrees = (float)(Knob.SweepAngle / ValueCount) *
+                (float)(Knob.Value - Knob.MinValue) + Knob.StartAngle;
+
+            double radians = GetRadians(degrees);
+
+            int dx = KnobIndicatorBounds.X + KnobIndicatorBounds.Width / 2;
+            int dy = KnobIndicatorBounds.Y + KnobIndicatorBounds.Height / 2;
+            int h = (int)(KnobIndicatorBounds.Width * .3f);
+
+            int x = (int)(Math.Cos(radians) * h + dx);
+            int y = (int)(Math.Sin(radians) * h + dy);
+
+            int radius = (int)(KnobIndicatorBounds.Width * .12f);
+
+            Rectangle r = new Rectangle(x - radius, y - radius, radius * 2, radius * 2);
+
+            return (r);
+        }
+
+        #endregion
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/Knobs/KnobStyle2.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/Knobs/KnobStyle2.cs
new file mode 100644
index 00000000..963bcdff
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/Knobs/KnobStyle2.cs	
@@ -0,0 +1,386 @@
+using System;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Windows.Forms;
+
+namespace DevComponents.Instrumentation.Primitives
+{
+    public class KnobStyle2 : BaseKnob
+    {
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="knobControl">Associated knob control</param>
+        public KnobStyle2(KnobControl knobControl)
+            : base(knobControl)
+        {
+        }
+
+        #region Knob Configuration
+
+        #region ConfigureKnob
+
+        /// <summary>
+        /// Configures the given knob control
+        /// by establishing various default object parameters
+        /// </summary>
+        /// <param name="e"></param>
+        public override void ConfigureKnob(PaintEventArgs e)
+        {
+            base.ConfigureKnob(e);
+
+            // Calculate default sizes and bounding object rectangles
+
+            ZoneIndWidth = KnobWidth * 0.047f;
+
+            MajorTickSize = new Size((int)(KnobWidth * 0.008), (int)(KnobWidth * 0.017));
+            MinorTickSize = new Size(1, (int)(KnobWidth * 0.02));
+
+            IndTickHeight = (int)ZoneIndWidth / 3;
+
+            CalculateBoundingRects();
+
+            // Fill in the default knob colors
+
+            DefaultColorTable.MajorTickColor = Color.Black;
+            DefaultColorTable.MinorTickColor = Color.Gray;
+            DefaultColorTable.ZoneIndicatorColor = Color.SteelBlue;
+            DefaultColorTable.KnobIndicatorPointerColor = Color.Black;
+            DefaultColorTable.KnobIndicatorPointerBorderColor = Color.Black;
+
+            DefaultColorTable.KnobFaceColor = new LinearGradientColorTable(Color.White, Color.LightGray);
+            DefaultColorTable.KnobIndicatorColor = new LinearGradientColorTable(0xFFFFFF, 0x1A507B);
+            DefaultColorTable.MinZoneIndicatorColor = new LinearGradientColorTable(Color.White, Color.Green);
+            DefaultColorTable.MaxZoneIndicatorColor = new LinearGradientColorTable(Color.Yellow, Color.Red);
+        }
+
+        #endregion
+
+        #region CalculateBoundingRects
+
+        /// <summary>
+        /// Calculates several default control
+        /// // bounding rectangles
+        /// </summary>
+        private void CalculateBoundingRects()
+        {
+            // Calculate the bounding Zone indicator rectangle and width
+
+            int delta = MaxLabelWidth + MajorTickSize.Height + (int)(KnobWidth * 0.05f);
+
+            ZoneIndicatorBounds = new Rectangle(delta, delta,
+                KnobWidth - (delta * 2), KnobWidth - (delta * 2));
+
+            // Calculate the KnobFace and inset face rectangles
+
+            delta += (int)ZoneIndWidth + 1;
+
+            KnobFaceBounds = new Rectangle(delta, delta,
+                KnobWidth - (delta * 2), KnobWidth - (delta * 2));
+
+            // Calculate the KnobIndicator bounding rectangle
+
+            delta += (int)(KnobWidth * .068f);
+
+            KnobIndicatorBounds = new Rectangle(delta, delta,
+                KnobWidth - (delta * 2), KnobWidth - (delta * 2));
+
+            // Calculate the TickLabel bounding rect
+
+            delta = (int)((MaxLabelWidth + IndTickHeight) * .60f + IndTickHeight);
+
+            TickLabelBounds = new Rectangle(ZoneIndicatorBounds.Location, ZoneIndicatorBounds.Size);
+            TickLabelBounds.Inflate(delta, delta);
+
+            // Calculate the focus rectangle
+
+            FocusRectBounds = new Rectangle(KnobFaceBounds.Location, KnobFaceBounds.Size);
+
+            delta = (int)(KnobFaceBounds.Width * .025);
+
+            FocusRectBounds.Inflate(-delta, -delta);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Part rendering code
+
+        #region RenderZoneIndicator
+
+        /// <summary>
+        /// Renders the zone indicator
+        /// </summary>
+        /// <param name="e"></param>
+        public override void RenderZoneIndicator(PaintEventArgs e)
+        {
+            if (ZoneIndicatorBounds.Width > 10 && ZoneIndicatorBounds.Height > 10)
+            {
+                Graphics g = e.Graphics;
+
+                Color c = ControlPaint.Light(ZoneIndicatorColor, .30f);
+
+                int passes = (int) (ZoneIndWidth);
+                int adj = 100 / passes;
+
+                Rectangle r = new Rectangle(ZoneIndicatorBounds.X,
+                                            ZoneIndicatorBounds.Y, ZoneIndicatorBounds.Width, ZoneIndicatorBounds.Height);
+
+                r.Inflate(-passes, -passes);
+
+                for (int i = 0; i < passes; i++)
+                {
+                    using (Pen pen = new Pen(c, 2))
+                    {
+                        g.DrawEllipse(pen, r);
+
+                        r.Inflate(1, 1);
+
+                        c = Color.FromArgb(Math.Max(0, c.R - adj),
+                                           Math.Max(0, c.G - adj), Math.Max(0, c.B - adj));
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region RenderTickMinor
+
+        /// <summary>
+        /// Renders the minor tick marks
+        /// </summary>
+        /// <param name="e"></param>
+        public override void RenderTickMinor(PaintEventArgs e)
+        {
+            Graphics g = e.Graphics;
+
+            using (Pen pen = new Pen(MinorTickColor, MinorTickSize.Width))
+            {
+                for (int i = 0; i < MinorTicks; i++)
+                {
+                    // Don't draw a minor tick if it overlaps
+                    // with a previous major tick
+
+                    if (Knob.MajorTickAmount > 0)
+                    {
+                        if ((i == 0 || i == MinorTicks - 1) ||
+                            ((Knob.MinorTickAmount * i) % Knob.MajorTickAmount == 0))
+                            continue;
+                    }
+
+                    g.DrawLines(pen, GetMinorTickPoints(i));
+                }
+            }
+        }
+
+        /// <summary>
+        /// Calculates a series of points
+        /// that defines the tick mark
+        /// </summary>
+        /// <param name="tick">Tick to calculate</param>
+        /// <returns>An array of points that defines the tick</returns>
+        private Point[] GetMinorTickPoints(int tick)
+        {
+            float degree = GetTickDegree((float)Knob.MinorTickAmount, tick);
+            double rad = GetRadians(degree);
+
+            int dx = ZoneIndicatorBounds.X + ZoneIndicatorBounds.Width / 2;
+            int dy = ZoneIndicatorBounds.Y + ZoneIndicatorBounds.Height / 2;
+            int h = (int)(ZoneIndicatorBounds.Width / 2 + ZoneIndWidth * .1f);
+
+            Point[] pts = new Point[2];
+
+            pts[0].X = (int)(Math.Cos(rad) * h + dx);
+            pts[0].Y = (int)(Math.Sin(rad) * h + dy);
+
+            pts[1].X = (int)(Math.Cos(rad) * (h + MinorTickSize.Height) + dx);
+            pts[1].Y = (int)(Math.Sin(rad) * (h + MinorTickSize.Height) + dy);
+
+            return (pts);
+        }
+
+        #endregion
+
+        #region RenderKnobFace
+
+        /// <summary>
+        /// Renders the knob face
+        /// </summary>
+        /// <param name="e"></param>
+        public override void RenderKnobFace(PaintEventArgs e)
+        {
+            if (KnobFaceBounds.Width > 10 && KnobFaceBounds.Height > 10)
+            {
+                Graphics g = e.Graphics;
+
+                // Allocate a path to accumulate the knob
+                // drawing pieces
+
+                using (GraphicsPath path = new GraphicsPath())
+                {
+                    // Draw the 14 arc segments all the way to the
+                    // center of the knob just in case the user wants
+                    // to render a different sized/shaped knob indicator
+
+                    Rectangle rInset = new Rectangle(KnobFaceBounds.X, KnobFaceBounds.Y,
+                                                     KnobFaceBounds.Width, KnobFaceBounds.Height);
+
+                    int w = KnobFaceBounds.Width/2 - 1;
+
+                    rInset.Inflate(-w, -w);
+
+                    const float arc = 360f/14;
+
+                    for (int i = 0; i < 14; i++)
+                    {
+                        if (i%2 == 0)
+                        {
+                            path.AddArc(KnobFaceBounds, i*arc, arc);
+                            path.AddArc(rInset, (i + 1)*arc, -arc);
+
+                            // Let Windows connect the arcs
+
+                            path.CloseFigure();
+                        }
+                    }
+
+                    // Select an appropriate hatch size given
+                    // the overall size of the control
+
+                    HatchStyle hs = (KnobWidth < 250)
+                                        ? HatchStyle.LightUpwardDiagonal
+                                        : HatchStyle.WideUpwardDiagonal;
+
+                    // Fill the face and then draw the outlining path
+
+                    using (HatchBrush hbr = new HatchBrush(hs, KnobFaceColor.Start, KnobFaceColor.End))
+                        g.FillPath(hbr, path);
+
+                    using (Pen pen = new Pen(KnobFaceColor.End))
+                        g.DrawPath(pen, path);
+                }
+            }
+        }
+
+        #endregion
+
+        #region RenderKnobIndicator
+
+        #region RenderKnobIndicator
+
+        /// <summary>
+        /// Renders the knob face
+        /// </summary>
+        /// <param name="e"></param>
+        public override void RenderKnobIndicator(PaintEventArgs e)
+        {
+            if (KnobIndicatorBounds.Width > 10 && KnobIndicatorBounds.Height > 10)
+            {
+                Graphics g = e.Graphics;
+
+                // Allocate a graphics path and draw the
+                // arrow lines into it
+
+                using (GraphicsPath path = new GraphicsPath())
+                {
+                    path.AddLines(GetIndicatorPoints());
+                    path.CloseFigure();
+
+                    // Fill the closed arrow
+
+                    using (SolidBrush br = new SolidBrush(KnobIndicatorPointerColor))
+                        g.FillPath(br, path);
+
+                    // Outline the arrow and draw the knob face
+
+                    if (KnobIndicatorPointerBorderWidth > 0 &&
+                        KnobIndicatorPointerColor.Equals(KnobIndicatorPointerBorderColor) == false)
+                    {
+                        using (Pen pen = new Pen(KnobIndicatorPointerBorderColor, KnobIndicatorPointerBorderWidth))
+                            g.DrawPath(pen, path);
+                    }
+
+                    // Fill the knob face
+
+                    using (Brush br = KnobIndicatorColor.GetBrush(KnobIndicatorBounds))
+                        g.FillEllipse(br, KnobIndicatorBounds);
+
+                    // Reset the path and add a glossy looking
+                    // hilight to the control face
+
+                    path.Reset();
+                    path.AddEllipse(KnobIndicatorBounds);
+
+                    using (PathGradientBrush pgb = new PathGradientBrush(path))
+                    {
+                        pgb.CenterColor = KnobIndicatorColor.Start;
+                        pgb.SurroundColors = new Color[] {KnobIndicatorColor.End};
+
+                        int radius = KnobIndicatorBounds.Width/2;
+                        int dr = Math.Max((int) (radius*.1f), 5);
+
+                        float dx = (radius - dr)*(float) Math.Sin(GetRadians(60));
+                        float dy = (radius - dr)*(float) Math.Cos(GetRadians(60));
+
+                        pgb.CenterPoint = new PointF(KnobIndicatorBounds.X + radius - dx,
+                                                     KnobIndicatorBounds.Y + radius - dy);
+
+                        g.FillRectangle(pgb, KnobIndicatorBounds);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region GetIndicatorPoints
+
+        /// <summary>
+        /// Calculates a series of points that
+        /// defines the indicator arrow
+        /// </summary>
+        /// <returns>An array of defining points</returns>
+        private Point[] GetIndicatorPoints()
+        {
+            float degrees = (float)(Knob.SweepAngle / ValueCount) *
+                (float)(Knob.Value - Knob.MinValue) + Knob.StartAngle;
+
+            int arrowHeight = (int)(KnobWidth * .052f);
+
+            double rad0 = GetRadians(degrees - 17);
+            double rad1 = GetRadians(degrees);
+            double rad2 = GetRadians(degrees + 17);
+
+            int n = (int)(KnobIndicatorBounds.Width * .03f);
+
+            if (n < 2)
+                n = 2;
+
+            int dx = KnobIndicatorBounds.X + KnobIndicatorBounds.Width / 2 + 1;
+            int dy = KnobIndicatorBounds.Y + KnobIndicatorBounds.Height / 2 + 1;
+            int h = KnobIndicatorBounds.Width / 2 + n;
+
+            Point[] pts = new Point[3];
+
+            pts[0].X = (int)(Math.Cos(rad0) * h + dx);
+            pts[0].Y = (int)(Math.Sin(rad0) * h + dy);
+
+            pts[1].X = (int)(Math.Cos(rad1) * (h + arrowHeight) + dx);
+            pts[1].Y = (int)(Math.Sin(rad1) * (h + arrowHeight) + dy);
+
+            pts[2].X = (int)(Math.Cos(rad2) * h + dx);
+            pts[2].Y = (int)(Math.Sin(rad2) * h + dy);
+
+            return (pts);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/Knobs/KnobStyle3.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/Knobs/KnobStyle3.cs
new file mode 100644
index 00000000..9e91d079
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/Knobs/KnobStyle3.cs	
@@ -0,0 +1,776 @@
+using System;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Windows.Forms;
+
+namespace DevComponents.Instrumentation.Primitives
+{
+    public class KnobStyle3 : BaseKnob
+    {
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="knobControl">Associated knob control</param>
+        public KnobStyle3(KnobControl knobControl)
+            : base(knobControl)
+        {
+        }
+
+        #region Knob Configuration
+
+        #region ConfigureKnob
+
+        /// <summary>
+        /// Configures the given knob control
+        /// by establishing various default object parameters
+        /// </summary>
+        /// <param name="e"></param>
+        public override void ConfigureKnob(PaintEventArgs e)
+        {
+            base.ConfigureKnob(e);
+
+            // Calculate default sizes and bounding object rectangles
+
+            ZoneIndWidth = KnobWidth * 0.034f;
+
+            MajorTickSize = new Size((int)(KnobWidth * 0.018), (int)(KnobWidth * 0.05));
+            MinorTickSize = new Size(MajorTickSize.Width / 2, MajorTickSize.Height);
+
+            IndTickHeight = MajorTickSize.Height / 3;
+
+            CalculateBoundingRects();
+
+            // Fill in the default knob colors
+
+            DefaultColorTable.MajorTickColor = Color.Black;
+            DefaultColorTable.MinorTickColor = Color.Black;
+            DefaultColorTable.ZoneIndicatorColor = Color.Black;
+            DefaultColorTable.KnobIndicatorPointerColor = Color.Black;
+            DefaultColorTable.KnobIndicatorPointerBorderColor = Color.Gray;
+
+            DefaultColorTable.KnobFaceColor = new LinearGradientColorTable(Color.Goldenrod, Color.Goldenrod, 40);
+            DefaultColorTable.KnobIndicatorColor = new LinearGradientColorTable(Color.White, Color.LightGray);
+            DefaultColorTable.MinZoneIndicatorColor = new LinearGradientColorTable(Color.White, Color.Green);
+            DefaultColorTable.MaxZoneIndicatorColor = new LinearGradientColorTable(Color.Yellow, Color.Red);
+            DefaultColorTable.MidZoneIndicatorColor = new LinearGradientColorTable(Color.CornflowerBlue);
+        }
+
+        #endregion
+
+        #region CalculateBoundingRects
+
+        /// <summary>
+        /// Calculates several default control
+        /// // bounding rectangles
+        /// </summary>
+        private void CalculateBoundingRects()
+        {
+            // Calculate the bounding Zone indicator rectangle and width
+
+            int delta = MaxLabelWidth + MajorTickSize.Height;
+
+            ZoneIndicatorBounds = new Rectangle(delta, delta,
+                KnobWidth - (delta * 2), KnobWidth - (delta * 2));
+
+            // Calculate the KnobFace and inset face rectangles
+
+            delta = (int)(ZoneIndicatorBounds.Width * .025f + ZoneIndWidth);
+
+            KnobFaceBounds = ZoneIndicatorBounds;
+            KnobFaceBounds.Inflate(-delta, -delta);
+
+            // Calculate the KnobIndicator bounding rectangle
+
+            delta = (int)(ZoneIndicatorBounds.Width * .14f);
+
+            KnobIndicatorBounds = ZoneIndicatorBounds;
+            KnobIndicatorBounds.Inflate(-delta, -delta);
+
+            // Calculate the TickLabel bounding rect
+
+            delta = (int)((MaxLabelWidth + IndTickHeight) * .60f);
+
+            TickLabelBounds = new Rectangle(ZoneIndicatorBounds.Location, ZoneIndicatorBounds.Size);
+            TickLabelBounds.Inflate(delta, delta);
+
+            // Calculate the focus rectangle
+
+            FocusRectBounds = KnobIndicatorBounds;
+
+            delta = (int)(KnobIndicatorBounds.Width * .025);
+            FocusRectBounds.Inflate(-delta, -delta);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Part rendering code
+
+        #region RenderZoneIndicator
+
+        #region RenderZoneIndicator
+
+        /// <summary>
+        /// Renders the zone indicator
+        /// </summary>
+        /// <param name="e"></param>
+        public override void RenderZoneIndicator(PaintEventArgs e)
+        {
+            if (ZoneIndicatorBounds.Width > 10 && ZoneIndicatorBounds.Height > 10)
+            {
+                Graphics g = e.Graphics;
+
+                int leftEndAngle = Knob.StartAngle;
+                int rightStartAngle = Knob.StartAngle;
+
+                // Render the left zone - if present
+
+                if (Knob.MinZonePercentage > 0)
+                {
+                    float pct = Knob.MinZonePercentage / 100f;
+
+                    RenderArc(g, Knob.StartAngle,
+                              Knob.SweepAngle * pct, LeftZoneIndicatorColor);
+
+                    leftEndAngle = (int)(Knob.StartAngle + Knob.SweepAngle * pct);
+                }
+                
+                // Render the right-hand zone - if present
+
+                if (Knob.MaxZonePercentage > 0)
+                {
+                    float pct = Knob.MaxZonePercentage / 100f;
+
+                    RenderArc(g, Knob.StartAngle + Knob.SweepAngle * (1 - pct),
+                              Knob.SweepAngle * pct, RightZoneIndicatorColor);
+
+                    rightStartAngle = (int)(Knob.StartAngle + Knob.SweepAngle * (1 - pct));
+                }
+
+                // Render the middle zone
+
+                if (rightStartAngle != leftEndAngle)
+                {
+                    RenderArc(g, leftEndAngle,
+                        rightStartAngle - leftEndAngle, MiddleZoneIndicatorColor);
+                }
+            }
+        }
+
+        #endregion
+
+        #region RenderArc
+
+        /// <summary>
+        /// Renders a gradient indicator arc by dividing
+        /// the arc into sub-arcs, enabling us to utilize normal
+        /// rectangle gradient support
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="a1">Starting angle</param>
+        /// <param name="s1">Sweep angle</param>
+        /// <param name="ct"></param>
+        private void RenderArc(Graphics g, float a1, float s1, LinearGradientColorTable ct)
+        {
+            float n1 = Math.Abs(s1);
+
+            Color c1 = ct.Start;
+            Color c2 = ct.End.IsEmpty == false ? ct.End : ct.Start;
+
+            // Calculate our rect and inflate to
+            // make room for the indicator arc
+
+            Rectangle rect = new
+                Rectangle(ZoneIndicatorBounds.Location, ZoneIndicatorBounds.Size);
+
+            int dw = (int)(ZoneIndWidth / 2);
+
+            rect.Inflate(-dw, -dw);
+
+            // Calculate the RGB color deltas
+
+            float dr = (c2.R - c1.R) / n1;
+            float dg = (c2.G - c1.G) / n1;
+            float db = (c2.B - c1.B) / n1;
+
+            // Set our initial starting color and range
+
+            Color c3 = Color.FromArgb(c1.ToArgb());
+
+            float s2 = s1;
+            float a2 = a1;
+
+            int pa = (s1 > 0) ? 100 : -100;
+
+            // Loop through the arc, processing sub-arcs less
+            // than 180 degrees so that we can use GDI+ built-in
+            // gradient rectangle support
+
+            while (s2 != 0)
+            {
+                // Limit our sweep angle pass to 90 degrees
+
+                float sw = (s2 > 0) ? 
+                    Math.Min(s2, 90) : Math.Max(s2, -90);
+
+                // Calculate our sub-sweep angle points.  This
+                // enables us to create an associated bounding
+                // rectangle for the sub-sweep arc
+
+                Point pt1 = CalcCoord(a2);
+                Point pt2 = CalcCoord(a2 + sw);
+
+                Rectangle r = new Rectangle();
+
+                r.Location = new Point(Math.Min(pt1.X, pt2.X), Math.Min(pt1.Y, pt2.Y));
+                r.Size = new Size(Math.Abs(pt1.X - pt2.X), Math.Abs(pt1.Y - pt2.Y));
+
+                if (r.Width == 0)
+                    r.Width = 1;
+
+                if (r.Height == 0)
+                    r.Height = 1;
+
+                // Calculate the terminal color for the
+                // sub-sweep arc
+
+                float n = Math.Abs(sw);
+
+                int red = (int)(c3.R + n * dr);
+                red = Math.Max(Math.Min(red, 255), 0);
+
+                int green = (int)(c3.G + n * dg);
+                green = Math.Max(Math.Min(green, 255), 0);
+
+                int blue = (int)(c3.B + n * db);
+                blue = Math.Max(Math.Min(blue, 255), 0);
+                
+                Color c4 = Color.FromArgb(red, green, blue);
+
+                // Tally up this sub-sweep
+
+                s2 -= sw;
+
+                // Render the sub-arc with an appropriately
+                // orientated gradient brush, and draw the arc
+
+                using (LinearGradientBrush lbr = new LinearGradientBrush(r, c3, c4, a2 + pa))
+                {
+                    using (Pen pen = new Pen(lbr, (int)ZoneIndWidth))
+                        g.DrawArc(pen, rect, a2, sw);
+                }
+
+                // Bump up our starting angle to reflect the
+                // processing of this sub-arc
+
+                a2 += sw;
+
+                // Set the next starting color to the
+                // ending color for this arc
+
+                c3 = c4;
+            }
+
+            // Render the bounding indicator arcs
+
+            using (GraphicsPath p1 = new GraphicsPath())
+            {
+                rect.Inflate(-dw, -dw);
+
+                p1.AddArc(ZoneIndicatorBounds, a1, s1);
+                p1.AddArc(rect, a1 + s1, -s1);
+
+                // Let Windows close the arcs, and then
+                // render them
+
+                p1.CloseFigure();
+
+                using (Pen pen = new Pen(ZoneIndicatorColor, MinorTickSize.Width))
+                    g.DrawPath(pen, p1);
+            }
+        }
+
+        #endregion
+
+        #region CalcCoord
+
+        /// <summary>
+        /// Calculates the arc coordinates for 
+        /// a given angle
+        /// </summary>
+        /// <param name="a2">Angle</param>
+        /// <returns></returns>
+        private Point CalcCoord(float a2)
+        {
+            Point pt = new Point();
+
+            // Normalize the angle and calculate some
+            // working vars
+
+            if (a2 < 0)
+                a2 += 360;
+
+            a2 = a2 % 360;
+
+            int delta = ZoneIndicatorBounds.X + ZoneIndicatorBounds.Width / 2;
+            int radius = ZoneIndicatorBounds.Width / 2;
+            int d = (int)(ZoneIndWidth / 2);
+
+            // Determine the angle quadrant, and then calculate
+            // the intersecting coordinate accordingly
+
+            if (a2 < 90)
+            {
+                pt.X = (int)(Math.Cos(GetRadians(a2 % 90)) * (radius + d));
+                pt.Y = (int)(Math.Sin(GetRadians(a2 % 90)) * (radius + d));
+            }
+            else if (a2 < 180)
+            {
+                pt.X = -(int)(Math.Sin(GetRadians(a2 % 90)) * (radius + d));
+                pt.Y = (int)(Math.Cos(GetRadians(a2 % 90)) * (radius + d));
+            }
+            else if (a2 < 270)
+            {
+                pt.X = -(int)(Math.Cos(GetRadians(a2 % 90)) * (radius + d));
+                pt.Y = -(int)(Math.Sin(GetRadians(a2 % 90)) * (radius + d));
+            }
+            else
+            {
+                pt.X = (int)(Math.Sin(GetRadians(a2 % 90)) * (radius + d));
+                pt.Y = -(int)(Math.Cos(GetRadians(a2 % 90)) * (radius + d));
+            }
+
+            // Adjust the point to the intersecting arc
+
+            pt.X += delta;
+            pt.Y += delta;
+
+            return (pt);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderTickMinor
+
+        #region RenderTickMinor
+
+        /// <summary>
+        /// Renders the minor tick marks
+        /// </summary>
+        /// <param name="e"></param>
+        public override void RenderTickMinor(PaintEventArgs e)
+        {
+            Graphics g = e.Graphics;
+
+            using (Pen pen = new Pen(MinorTickColor, MinorTickSize.Width))
+            {
+                for (int i = 0; i < MinorTicks; i++)
+                {
+                    // Don't draw a minor tick if it overlaps
+                    // with a previous major tick
+
+                    if (Knob.MajorTickAmount > 0)
+                    {
+                        if ((i == 0 || i == MinorTicks - 1) ||
+                            ((Knob.MinorTickAmount * i) % Knob.MajorTickAmount == 0))
+                            continue;
+                    }
+
+                    g.DrawLines(pen, GetMinorTickPoints(i));
+                }
+            }
+        }
+
+        #endregion
+
+        #region GetMinorTickPoints
+
+        /// <summary>
+        /// Calculates a series of points
+        /// that defines the tick mark
+        /// </summary>
+        /// <param name="tick">Tick to calculate</param>
+        /// <returns>An array of points that defines the tick</returns>
+        private Point[] GetMinorTickPoints(int tick)
+        {
+            float degree = GetTickDegree((float)Knob.MinorTickAmount, tick);
+            double rad = GetRadians(degree);
+
+            int dx = ZoneIndicatorBounds.X + ZoneIndicatorBounds.Width / 2;
+            int dy = ZoneIndicatorBounds.Y + ZoneIndicatorBounds.Height / 2;
+            int h = ZoneIndicatorBounds.Width / 2 - (int)ZoneIndWidth;
+
+            Point[] pts = new Point[2];
+
+            pts[0].X = (int)(Math.Cos(rad) * (h) + dx);
+            pts[0].Y = (int)(Math.Sin(rad) * (h) + dy);
+
+            pts[1].X = (int)(Math.Cos(rad) * (h + MinorTickSize.Height) + dx);
+            pts[1].Y = (int)(Math.Sin(rad) * (h + MinorTickSize.Height) + dy);
+
+            return (pts);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderTickMajor
+
+        #region RenderTickMajor
+
+        /// <summary>
+        /// Renders the Major Tick marks
+        /// </summary>
+        /// <param name="e"></param>
+        public override void RenderTickMajor(PaintEventArgs e)
+        {
+            Graphics g = e.Graphics;
+
+            // Loop through each tick
+
+            using (Pen pen1 = new Pen(MajorTickColor, MajorTickSize.Width))
+            {
+                for (int i = 0; i < MajorTicks; i++)
+                    g.DrawLines(pen1, GetMajorTickPoints(i));
+            }
+        }
+
+        #endregion
+
+        #region GetMajorTickPoints
+
+        /// <summary>
+        /// Calculates a series of points
+        /// that defines the tick mark
+        /// </summary>
+        /// <param name="tick">Tick to calculate</param>
+        /// <returns>An array of points that defines the tick</returns>
+        private Point[] GetMajorTickPoints(int tick)
+        {
+            float degree = GetTickDegree((float)Knob.MajorTickAmount, tick);
+            double rad = GetRadians(degree);
+
+            int dx = ZoneIndicatorBounds.X + ZoneIndicatorBounds.Width / 2;
+            int dy = ZoneIndicatorBounds.Y + ZoneIndicatorBounds.Height / 2;
+            int h = ZoneIndicatorBounds.Width / 2 - (int)ZoneIndWidth;
+
+            Point[] pts = new Point[2];
+
+            pts[0].X = (int)(Math.Cos(rad) * h + dx);
+            pts[0].Y = (int)(Math.Sin(rad) * h + dy);
+
+            pts[1].X = (int)(Math.Cos(rad) * (h + MajorTickSize.Height + 1) + dx);
+            pts[1].Y = (int)(Math.Sin(rad) * (h + MajorTickSize.Height + 1) + dy);
+
+            return (pts);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderKnobFace
+
+        #region RenderKnobFace
+
+        /// <summary>
+        /// Renders the knob face
+        /// </summary>
+        /// <param name="e"></param>
+        public override void RenderKnobFace(PaintEventArgs e)
+        {
+            if (KnobFaceBounds.Width > 10 && KnobFaceBounds.Height > 10)
+            {
+                Graphics g = e.Graphics;
+
+                // Allocate a path to accumulate the knob
+                // drawing pieces
+
+                using (GraphicsPath path = new GraphicsPath())
+                {
+                    // Render the face shadow
+
+                    RenderInset(g, path, Pens.Gray, MinorTickSize.Width);
+
+                    using (SolidBrush br =
+                        new SolidBrush(Color.FromArgb(160, Color.Gray)))
+                    {
+                        g.FillPath(br, path);
+                    }
+
+                    path.Reset();
+
+                    // Render the face front
+
+                    using (Pen pen = new Pen(Color.White, MinorTickSize.Width))
+                        RenderInset(g, path, pen, 0);
+
+                    using (Brush br = KnobFaceColor.GetBrush(KnobFaceBounds))
+                        g.FillPath(br, path);
+                }
+            }
+        }
+
+        #endregion
+
+        #region RenderInset
+
+        /// <summary>
+        /// Renders the face, including the arc insets
+        /// as well as the connecting segments
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="path">Path to render to</param>
+        /// <param name="pen">Outlining pen</param>
+        /// <param name="offset">Delta offset - used for shadowing</param>
+        private void RenderInset(Graphics g, GraphicsPath path, Pen pen, int offset)
+        {
+            // Calculate the bounding rectangle
+            // for the inset segments
+
+            Rectangle rInset = KnobFaceBounds;
+
+            int w = (int)(ZoneIndWidth);
+            rInset.Inflate(-w, -w);
+
+            // Calculate the bounding rectangle
+            // for the inset arcs
+
+            int radius = (int)(KnobWidth * .055f);
+
+            Rectangle r = new Rectangle(0, 0, radius, radius);
+
+            // Loop through each arc point and
+            // render the individual arc insets
+
+            for (int i = 0; i < 12; i++)
+            {
+                // Calculate the inset location and
+                // render the inset arc
+
+                r.Location = GetArcPoint(rInset, i * 30f, (int)(offset - radius * .5f));
+
+                path.AddArc(r, (i * 30) - 90, -180);
+            }
+
+            // Let Windows connect the arcs, and
+            // then draw the completed path
+
+            path.CloseFigure();
+
+            g.DrawPath(pen, path);
+        }
+
+        #endregion
+
+        #region GetArcPoint
+
+        /// <summary>
+        /// Calculates the arc point at the given
+        /// degree and offset
+        /// </summary>
+        /// <param name="rInset">Inset bounding rectangle</param>
+        /// <param name="degree">Degree to position arc inset</param>
+        /// <param name="offset">Offset (used for shading)</param>
+        /// <returns></returns>
+        private Point GetArcPoint(Rectangle rInset, float degree, int offset)
+        {
+            // Calculate the default position
+
+            double rad = GetRadians(degree);
+
+            int dx = rInset.X + rInset.Width / 2;
+            int dy = rInset.Y + rInset.Height / 2;
+            int h = rInset.Width / 2 + (int)ZoneIndWidth;
+
+            Point pt = new Point();
+
+            pt.X = (int)(Math.Cos(rad) * h + dx);
+            pt.Y = (int)(Math.Sin(rad) * h + dy);
+
+            // Offset the point if so requested
+            // (face shadow support)
+
+            pt.Offset(offset, offset);
+
+            return (pt);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RenderKnobIndicator
+
+        #region RenderKnobIndicator
+
+        /// <summary>
+        /// Renders the knob face
+        /// </summary>
+        /// <param name="e"></param>
+        public override void RenderKnobIndicator(PaintEventArgs e)
+        {
+            if (KnobIndicatorBounds.Width > 10 && KnobIndicatorBounds.Height > 10)
+            {
+                Graphics g = e.Graphics;
+
+                // Allocate a graphics path and calculate
+                // its bounding rectangle
+
+                using (GraphicsPath path = new GraphicsPath())
+                {
+                    Rectangle r = new
+                        Rectangle(KnobIndicatorBounds.Location, KnobIndicatorBounds.Size);
+
+                    int delta = (int) (KnobWidth*.020f);
+
+                    // Render the knob, it's shadow, and
+                    // the hilight crescent
+
+                    r.Offset(delta, delta);
+                    RenderIndFace(g, path, r);
+
+                    r.Offset(-delta*2, -delta*2);
+                    RenderIndCrescent(g, path, r);
+
+                    // Render the indicator arrow
+
+                    path.AddLines(GetIndicatorPoints());
+                    path.CloseFigure();
+
+                    // Fill the closed arrow
+
+                    using (SolidBrush br = new SolidBrush(KnobIndicatorPointerColor))
+                    {
+                        g.FillPath(br, path);
+
+                        // Outline the arrow
+
+                        if (KnobIndicatorPointerBorderWidth > 0 &&
+                            KnobIndicatorPointerColor.Equals(KnobIndicatorPointerBorderColor) == false)
+                        {
+                            using (Pen pen = new Pen(KnobIndicatorPointerBorderColor, KnobIndicatorPointerBorderWidth))
+                                g.DrawPath(pen, path);
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region RenderIndCrescent
+
+        /// <summary>
+        /// Renders the hilight crescent
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="path">Accumulating GraphicsPath</param>
+        /// <param name="r">Bounding rectangle</param>
+        private void RenderIndCrescent(Graphics g, GraphicsPath path, Rectangle r)
+        {
+            // Add the bottom crescent arc
+
+            path.AddArc(r, 8, 78);
+
+            // Calculate the intersecting upper arc
+            // and add it to the path
+
+            int cradius = r.Width / 2;
+            int nradius = (int)(cradius * 1.5f);
+
+            int dr = nradius - cradius;
+            int dz = (int)(dr * Math.Cos(45) * 1.6f);
+
+            Rectangle r2 = new Rectangle(r.X - dr - dz, r.Y - dr - dz, nradius * 2, nradius * 2);
+
+            path.AddArc(r2, 70, -50);
+
+            Color c = Color.FromArgb(170, KnobIndicatorColor.Start);
+
+            using (LinearGradientBrush lbr =
+                new LinearGradientBrush(KnobIndicatorBounds, Color.White, c, 45f))
+            {
+                g.FillPath(lbr, path);
+            }
+
+            path.Reset();
+        }
+
+        #endregion
+
+        #region RenderIndFace
+
+        /// <summary>
+        /// Renders the face of the knob indicator
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="path">Accumulating GraphicsPath</param>
+        /// <param name="r">Bounding rectangle</param>
+        private void RenderIndFace(Graphics g, GraphicsPath path, Rectangle r)
+        {
+            // Render the knob shadow
+
+            Color c3 = Color.FromArgb(100, ControlPaint.Dark(KnobIndicatorColor.End));
+
+            using (SolidBrush br = new SolidBrush(c3))
+                g.FillEllipse(br, r);
+
+            // Render the knob
+
+            using (Brush br = KnobIndicatorColor.GetBrush(KnobIndicatorBounds))
+                g.FillEllipse(br, KnobIndicatorBounds);
+
+            path.Reset();
+        }
+
+        #endregion
+
+        #region GetIndicatorPoints
+
+        /// <summary>
+        /// Calculates a series of points that
+        /// defines the indicator arrow
+        /// </summary>
+        /// <returns>An array of defining points</returns>
+        private Point[] GetIndicatorPoints()
+        {
+            float degrees = (float)(Knob.SweepAngle / ValueCount) *
+                (float)(Knob.Value - Knob.MinValue) + Knob.StartAngle;
+
+            int arrowHeight = (int)(KnobWidth * .025f);
+
+            double rad0 = GetRadians(degrees - 19);
+            double rad1 = GetRadians(degrees);
+            double rad2 = GetRadians(degrees + 19);
+
+            int dx = KnobIndicatorBounds.X + KnobIndicatorBounds.Width / 2 + 1;
+            int dy = KnobIndicatorBounds.Y + KnobIndicatorBounds.Height / 2 + 1;
+            int h = KnobIndicatorBounds.Width / 2;
+
+            Point[] pts = new Point[3];
+
+            pts[0].X = (int)(Math.Cos(rad0) * h + dx);
+            pts[0].Y = (int)(Math.Sin(rad0) * h + dy);
+
+            pts[1].X = (int)(Math.Cos(rad1) * (h + arrowHeight) + dx);
+            pts[1].Y = (int)(Math.Sin(rad1) * (h + arrowHeight) + dy);
+
+            pts[2].X = (int)(Math.Cos(rad2) * h + dx);
+            pts[2].Y = (int)(Math.Sin(rad2) * h + dy);
+
+            return (pts);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/Knobs/KnobStyle4.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/Knobs/KnobStyle4.cs
new file mode 100644
index 00000000..dc92a515
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/Knobs/KnobStyle4.cs	
@@ -0,0 +1,293 @@
+using System;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Windows.Forms;
+
+namespace DevComponents.Instrumentation.Primitives
+{
+    public class KnobStyle4 : BaseKnob
+    {
+        #region Private instance variables
+
+        private Rectangle _KnobFaceInset;   // Knob face inset rect
+
+        #endregion
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="knobControl">Associated knob control</param>
+        public KnobStyle4(KnobControl knobControl)
+            : base(knobControl)
+        {
+        }
+
+        #region Knob Configuration
+
+        #region ConfigureKnob
+
+        /// <summary>
+        /// Configures the given knob control
+        /// by establishing various default object parameters
+        /// </summary>
+        /// <param name="e"></param>
+        public override void ConfigureKnob(PaintEventArgs e)
+        {
+            base.ConfigureKnob(e);
+
+            // Calculate default sizes and bounding object rectangles
+
+            ZoneIndWidth = KnobWidth * 0.025f;
+
+            MajorTickSize = new Size((int)(KnobWidth * 0.01), (int)(KnobWidth * 0.04));
+            MinorTickSize = new Size(MajorTickSize.Width, (int)(MajorTickSize.Height * .60f));
+
+            IndTickHeight = (int)ZoneIndWidth + MajorTickSize.Height;
+
+            CalculateBoundingRects();
+
+            // Fill in the default knob colors
+
+            DefaultColorTable.MajorTickColor = Color.Gray;
+            DefaultColorTable.MinorTickColor = Color.DeepSkyBlue;
+            DefaultColorTable.ZoneIndicatorColor = Color.DeepSkyBlue;
+            DefaultColorTable.KnobIndicatorPointerColor = Color.White;
+            DefaultColorTable.KnobIndicatorPointerBorderColor = Color.Gray;
+
+            DefaultColorTable.KnobFaceColor = new LinearGradientColorTable(Color.White, ColorFactory.GetColor(0xAAAAAA), 40);
+            DefaultColorTable.KnobIndicatorColor = new LinearGradientColorTable(Color.White, ColorFactory.GetColor(0xAAAAAA), 20);
+            DefaultColorTable.MinZoneIndicatorColor = new LinearGradientColorTable(Color.White, Color.Green);
+            DefaultColorTable.MaxZoneIndicatorColor = new LinearGradientColorTable( Color.Yellow, Color.Red);
+
+            DefaultColorTable.KnobIndicatorPointerBorderWidth = 2;
+        }
+
+        #endregion
+
+        #region CalculateBoundingRects
+
+        /// <summary>
+        /// Calculates several default control
+        /// // bounding rectangles
+        /// </summary>
+        private void CalculateBoundingRects()
+        {
+            // Calculate the bounding Zone indicator rectangle and width
+
+            int delta = MaxLabelWidth + MajorTickSize.Height + (int)(KnobWidth * 0.04f);
+
+            ZoneIndicatorBounds = new Rectangle(delta, delta,
+                KnobWidth - (delta * 2), KnobWidth - (delta * 2));
+
+            // Calculate the KnobFace and inset face rectangles
+
+            delta += (int)(ZoneIndWidth);
+
+            KnobFaceBounds = new Rectangle(delta, delta,
+                KnobWidth - (delta * 2), KnobWidth - (delta * 2));
+
+            _KnobFaceInset = new Rectangle(KnobFaceBounds.X, KnobFaceBounds.Y,
+                KnobFaceBounds.Width, KnobFaceBounds.Height);
+
+            _KnobFaceInset.Inflate(-(int)(KnobWidth * .02f), -(int)(KnobWidth * .02f));
+
+            // Calculate the KnobIndicator bounding rectangle
+
+            delta += (int)(KnobFaceBounds.Width * .23f);
+
+            KnobIndicatorBounds = new Rectangle(delta, delta,
+                KnobWidth - (delta * 2), KnobWidth - (delta * 2));
+
+            // Calculate the TickLabel bounding rect
+
+            delta = (int)((MaxLabelWidth + IndTickHeight) * .60f);
+
+            TickLabelBounds = new Rectangle(ZoneIndicatorBounds.Location, ZoneIndicatorBounds.Size);
+            TickLabelBounds.Inflate(delta, delta);
+
+            // Calculate the focus rectangle
+
+            FocusRectBounds = new Rectangle(KnobIndicatorBounds.Location, KnobIndicatorBounds.Size);
+
+            delta = (int)(KnobIndicatorBounds.Width * .045);
+
+            FocusRectBounds.Inflate(-delta, -delta);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Part rendering code
+
+        #region RenderZoneIndicator
+
+        /// <summary>
+        /// Renders the zone indicator
+        /// </summary>
+        /// <param name="e"></param>
+        public override void RenderZoneIndicator(PaintEventArgs e)
+        {
+            if (ZoneIndicatorBounds.Width > 10 && ZoneIndicatorBounds.Height > 10)
+            {
+                Graphics g = e.Graphics;
+
+                using (Pen pen = new Pen(ZoneIndicatorColor, ZoneIndWidth))
+                    g.DrawArc(pen, ZoneIndicatorBounds, Knob.StartAngle - 1, Knob.SweepAngle + 2);
+            }
+        }
+
+        #endregion
+
+        #region RenderKnobFace
+
+        /// <summary>
+        /// Renders the knob face
+        /// </summary>
+        /// <param name="e"></param>
+        public override void RenderKnobFace(PaintEventArgs e)
+        {
+            if (KnobFaceBounds.Width > 10 && KnobFaceBounds.Height > 10)
+            {
+                Graphics g = e.Graphics;
+
+                // allocate a path to accumulate the knob
+                // drawing pieces
+
+                using (GraphicsPath path = new GraphicsPath())
+                {
+                    // Draw the 12, 30 degree arc segments
+
+                    for (int i = 0; i < 12; i++)
+                    {
+                        path.AddArc((i % 2 == 0)
+                            ? KnobFaceBounds : _KnobFaceInset, i * 30 - 15, 30);
+                    }
+
+                    path.CloseFigure();
+
+                    // Fill the face and then draw the outlining path
+
+                    using (Brush br = KnobFaceColor.GetBrush(KnobFaceBounds))
+                        g.FillPath(br, path);
+
+                    g.DrawPath(Pens.Gray, path);
+                }
+            }
+        }
+
+        #endregion
+
+        #region RenderKnobIndicator
+
+        #region RenderKnobIndicator
+
+        /// <summary>
+        /// Renders the knob indicator
+        /// </summary>
+        /// <param name="e"></param>
+        public override void RenderKnobIndicator(PaintEventArgs e)
+        {
+            if (KnobIndicatorBounds.Width > 10 && KnobIndicatorBounds.Height > 10)
+            {
+                Graphics g = e.Graphics;
+
+                // Allocate a graphics path and draw the
+                // arrow lines into it
+
+                using (GraphicsPath path = new GraphicsPath())
+                {
+                    path.AddLines(GetIndicatorPoints());
+
+                    path.CloseFigure();
+
+                    // Fill the closed arrow
+
+                    using (SolidBrush br = new SolidBrush(KnobIndicatorPointerColor))
+                        g.FillPath(br, path);
+
+                    // Outline the arrow and draw the knob face
+
+                    if (KnobIndicatorPointerBorderWidth > 0 &&
+                        KnobIndicatorPointerColor.Equals(KnobIndicatorPointerBorderColor) == false)
+                    {
+                        int width = KnobIndicatorPointerBorderWidth;
+
+                        using (Pen pen = new Pen(KnobIndicatorPointerBorderColor, width))
+                            g.DrawPath(pen, path);
+                    }
+
+                    Color c = ControlPaint.Dark(KnobIndicatorColor.End, .4f);
+
+                    using (Pen pen = new Pen(c, 2))
+                        g.DrawArc(pen, KnobIndicatorBounds, 0, 360);
+
+                    // Fill the knob face
+
+                    using (Brush br = KnobIndicatorColor.GetBrush(KnobIndicatorBounds))
+                        g.FillEllipse(br, KnobIndicatorBounds);
+
+                    // Reset the path and add a glossy looking
+                    // hilight to the top of the control
+
+                    path.Reset();
+
+                    path.AddArc(KnobFaceBounds, 180, 180);
+                    path.CloseFigure();
+
+                    using (LinearGradientBrush lgb =
+                        new LinearGradientBrush(KnobFaceBounds, Color.FromArgb(75, Color.White),
+                                                Color.Transparent, LinearGradientMode.Vertical))
+                    {
+                        g.FillPath(lgb, path);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region GetIndicatorPoints
+
+        /// <summary>
+        /// Calculates a series of points that
+        /// defines the indicator arrow
+        /// </summary>
+        /// <returns>An array of defining points</returns>
+        private Point[] GetIndicatorPoints()
+        {
+            float degrees = (float)(Knob.SweepAngle / ValueCount) *
+                (float)(Knob.Value - Knob.MinValue) + Knob.StartAngle;
+
+            int arrowHeight = (int)(KnobIndicatorBounds.Width * .25f);
+
+            double rad0 = GetRadians(degrees - 10);
+            double rad1 = GetRadians(degrees);
+            double rad2 = GetRadians(degrees + 10);
+
+            int dx = KnobIndicatorBounds.X + KnobIndicatorBounds.Width / 2 + 1;
+            int dy = KnobIndicatorBounds.Y + KnobIndicatorBounds.Height / 2 + 1;
+            int h = KnobIndicatorBounds.Width / 2 + 4;
+
+            Point[] pts = new Point[3];
+
+            pts[0].X = (int)(Math.Cos(rad0) * h + dx);
+            pts[0].Y = (int)(Math.Sin(rad0) * h + dy);
+
+            pts[1].X = (int)(Math.Cos(rad1) * (h + arrowHeight) + dx);
+            pts[1].Y = (int)(Math.Sin(rad1) * (h + arrowHeight) + dy);
+
+            pts[2].X = (int)(Math.Cos(rad2) * h + dx);
+            pts[2].Y = (int)(Math.Sin(rad2) * h + dy);
+
+            return (pts);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+    }
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/Primitives/ColorFactory.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/Primitives/ColorFactory.cs
new file mode 100644
index 00000000..809a52b5
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/Primitives/ColorFactory.cs	
@@ -0,0 +1,56 @@
+using System;
+using System.Drawing;
+
+namespace DevComponents.Instrumentation.Primitives
+{
+    public class ColorFactory
+    {
+        /// <summary>
+		/// Converts hex string to Color type.
+		/// </summary>
+		/// <param name="rgbHex">Hexadecimal color representation.</param>
+		/// <returns>Reference to Color object.</returns>
+		public static Color GetColor(string rgbHex)
+        {
+            if (string.IsNullOrEmpty(rgbHex) == false)
+            {
+                if (rgbHex.Length == 8)
+                {
+                    return (Color.FromArgb(Convert.ToInt32(rgbHex.Substring(0, 2), 16),
+                                           Convert.ToInt32(rgbHex.Substring(2, 2), 16),
+                                           Convert.ToInt32(rgbHex.Substring(4, 2), 16),
+                                           Convert.ToInt32(rgbHex.Substring(6, 2), 16)));
+                }
+
+                return (Color.FromArgb(Convert.ToInt32(rgbHex.Substring(0, 2), 16),
+                                       Convert.ToInt32(rgbHex.Substring(2, 2), 16),
+                                       Convert.ToInt32(rgbHex.Substring(4, 2), 16)));
+            }
+
+            return Color.Empty;
+        }
+
+        /// <summary>
+        /// Converts hex string to Color type.
+        /// </summary>
+        /// <param name="rgb">Color representation as 32-bit RGB value.</param>
+        /// <returns>Reference to Color object.</returns>
+        public static Color GetColor(int rgb)
+        {
+            return ((rgb == -1) ? Color.Empty :
+                Color.FromArgb((rgb & 0xFF0000) >> 16, (rgb & 0xFF00) >> 8, rgb & 0xFF));
+        }
+
+        /// <summary>
+        /// Converts hex string to Color type.
+        /// </summary>
+        /// <param name="alpha"></param>
+        /// <param name="rgb">Color representation as 32-bit RGB value.</param>
+        /// <returns>Reference to Color object.</returns>
+        public static Color GetColor(int alpha, int rgb)
+        {
+            return ((rgb == -1) ? Color.Empty :
+                Color.FromArgb(alpha, (rgb & 0xFF0000) >> 16, (rgb & 0xFF00) >> 8, rgb & 0xFF));
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/Primitives/GenericCollection.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/Primitives/GenericCollection.cs
new file mode 100644
index 00000000..961fa393
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/Primitives/GenericCollection.cs	
@@ -0,0 +1,167 @@
+using System;
+using System.Collections.ObjectModel;
+
+namespace DevComponents.Instrumentation.Primitives
+{
+    public class BaseCollection<T> : Collection<T> where T : class, ICloneable, new()
+    {
+        #region Events
+
+        public event EventHandler<EventArgs> CollectionChanged;
+
+        #endregion
+
+        #region Private variables
+
+        private bool _IsRangeSet;
+
+        #endregion
+
+        #region AddRange
+
+        /// <summary>
+        /// Adds a range of items to the collection
+        /// </summary>
+        /// <param name="items">Array of items to add</param>
+        public void AddRange(T[] items)
+        {
+            try
+            {
+                _IsRangeSet = true;
+
+                for (int i = 0; i < items.Length; i++)
+                    Add(items[i]);
+            }
+            finally
+            {
+                _IsRangeSet = false;
+
+                OnCollectionChanged();
+            }
+        }
+
+        #endregion
+
+        #region RemoveItem
+
+        /// <summary>
+        /// Processes list RemoveItem calls
+        /// </summary>
+        /// <param name="index">Index to remove</param>
+        protected override void RemoveItem(int index)
+        {
+            base.RemoveItem(index);
+
+            OnCollectionChanged();
+        }
+
+        #endregion
+
+        #region InsertItem
+
+        /// <summary>
+        /// Processes list InsertItem calls
+        /// </summary>
+        /// <param name="index">Index to add</param>
+        /// <param name="item">Text to add</param>
+        protected override void InsertItem(int index, T item)
+        {
+            if (item != null)
+            {
+                base.InsertItem(index, item);
+
+                OnCollectionChanged();
+            }
+        }
+
+        #endregion
+
+        #region SetItem
+
+        /// <summary>
+        /// Processes list SetItem calls (e.g. replace)
+        /// </summary>
+        /// <param name="index">Index to replace</param>
+        /// <param name="newItem">Text to replace</param>
+        protected override void SetItem(int index, T newItem)
+        {
+            base.SetItem(index, newItem);
+
+            OnCollectionChanged();
+        }
+
+        #endregion
+
+        #region ClearItems
+
+        /// <summary>
+        /// Processes list Clear calls (e.g. remove all)
+        /// </summary>
+        protected override void ClearItems()
+        {
+            if (Count > 0)
+                base.ClearItems();
+
+            OnCollectionChanged();
+        }
+
+        #endregion
+
+        #region OnCollectionChanged
+
+        private void OnCollectionChanged()
+        {
+            if (CollectionChanged != null)
+            {
+                if (_IsRangeSet == false)
+                    CollectionChanged(this, EventArgs.Empty);
+            }
+        }
+
+        #endregion
+
+        #region ICloneable Members
+
+        public virtual object Clone()
+        {
+            BaseCollection<T> copy = new BaseCollection<T>();
+
+            CopyToItem(copy);
+
+            return (copy);
+        }
+
+        #endregion
+
+        #region CopyToItem
+
+        internal void CopyToItem(BaseCollection<T> copy)
+        {
+            foreach (T item in this)
+                copy.Add((T)item.Clone());
+        }
+
+        #endregion
+    }
+
+    public class GenericCollection<T> : BaseCollection<T> where T : GaugeItem, new()
+    {
+        #region Name indexer
+
+        public T this[string name]
+        {
+            get
+            {
+                foreach (T item in Items)
+                {
+                    if (item.Name != null && item.Name.Equals(name))
+                        return (item);
+                }
+
+                return (null);
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/Primitives/LinearGradientColorTable.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/Primitives/LinearGradientColorTable.cs
new file mode 100644
index 00000000..4273a469
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/Primitives/LinearGradientColorTable.cs	
@@ -0,0 +1,288 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Globalization;
+
+namespace DevComponents.Instrumentation.Primitives
+{
+    /// <summary>
+    /// Represents the color table of linear gradient.
+    /// </summary>
+    [TypeConverter(typeof(LinearGradientColorTableConvertor))]
+    public class LinearGradientColorTable
+    {
+        public static readonly LinearGradientColorTable Empty = new LinearGradientColorTable();
+
+        #region Events
+
+        public event EventHandler<EventArgs> ColorTableChanged;
+
+        #endregion
+
+        #region Private variables
+
+        private Color _Start = Color.Empty;
+        private Color _End = Color.Empty;
+        private int _GradientAngle = 90;
+
+        #endregion
+
+        #region Constructors
+
+        /// <summary>
+        /// Creates new instance of the object.
+        /// </summary>
+        public LinearGradientColorTable() { }
+        /// <summary>
+        /// Creates new instance of the object.
+        /// </summary>
+        /// <param name="start">Start color.</param>
+        public LinearGradientColorTable(Color start)
+        {
+            this.Start = start;
+        }
+
+        /// <summary>
+        /// Creates new instance of the object.
+        /// </summary>
+        /// <param name="start">Start color.</param>
+        /// <param name="end">End color.</param>
+        public LinearGradientColorTable(Color start, Color end)
+        {
+            this.Start = start;
+            this.End = end;
+        }
+
+        /// <summary>
+        /// Creates new instance of the object.
+        /// </summary>
+        /// <param name="start">Start color in hexadecimal representation like FFFFFF.</param>
+        /// <param name="end">End color in hexadecimal representation like FFFFFF.</param>
+        public LinearGradientColorTable(string start, string end)
+        {
+            this.Start = ColorFactory.GetColor(start);
+            this.End = ColorFactory.GetColor(end);
+        }
+
+        /// <summary>
+        /// Creates new instance of the object.
+        /// </summary>
+        /// <param name="start">Start color in 32-bit RGB representation.</param>
+        /// <param name="end">End color in 32-bit RGB representation.</param>
+        public LinearGradientColorTable(int start, int end)
+        {
+            this.Start = ColorFactory.GetColor(start);
+            this.End = ColorFactory.GetColor(end);
+        }
+
+        /// <summary>
+        /// Creates new instance of the object.
+        /// </summary>
+        /// <param name="start">Start color in 32-bit RGB representation.</param>
+        /// <param name="end">End color in 32-bit RGB representation.</param>
+        /// <param name="gradientAngle">Gradient angle.</param>
+        public LinearGradientColorTable(int start, int end, int gradientAngle)
+        {
+            this.Start = ColorFactory.GetColor(start);
+            this.End = ColorFactory.GetColor(end);
+            this.GradientAngle = gradientAngle;
+        }
+
+        /// <summary>
+        /// Creates new instance of the object.
+        /// </summary>
+        /// <param name="start">Start color.</param>
+        /// <param name="end">End color.</param>
+        /// <param name="gradientAngle">Gradient angle.</param>
+        public LinearGradientColorTable(Color start, Color end, int gradientAngle)
+        {
+            this.Start = start;
+            this.End = end;
+            this.GradientAngle = gradientAngle;
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region Start
+
+        /// <summary>
+        /// Gets or sets the start color.
+        /// </summary>
+        [Browsable(true)]
+        [NotifyParentProperty(true)]
+        [Description("Indicates the Starting Gradient Color.")]
+        public Color Start
+        {
+            get { return (_Start); }
+
+            set
+            {
+                if (_Start != value)
+                {
+                    _Start = value;
+
+                    OnColorTableChanged();
+                }
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        internal virtual bool ShouldSerializeStart()
+        {
+            return (_Start.IsEmpty == false);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        internal virtual void ResetStart()
+        {
+            Start = Color.Empty;
+        }
+
+        #endregion
+
+        #region End
+
+        /// <summary>
+        /// Gets or sets the end color.
+        /// </summary>
+        [Browsable(true)]
+        [NotifyParentProperty(true)]
+        [Description("Indicates the Ending Gradient Color.")]
+        public Color End
+        {
+            get { return (_End); }
+
+            set
+            {
+                if (_End != value)
+                {
+                    _End = value;
+
+                    OnColorTableChanged();
+                }
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        internal virtual bool ShouldSerializeEnd()
+        {
+            return (_End.IsEmpty == false);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        internal virtual void ResetEnd()
+        {
+            End = Color.Empty;
+        }
+        #endregion
+
+        #region GradientAngle
+
+        /// <summary>
+        /// Gets or sets the gradient angle. Default value is 90.
+        /// </summary>
+        [Browsable(true), DefaultValue(90)]
+        [NotifyParentProperty(true)]
+        [Description("Indicates the Gradient Angle.  Default is 90")]
+        public int GradientAngle
+        {
+            get { return (_GradientAngle); }
+
+            set
+            {
+                if (_GradientAngle != value)
+                {
+                    _GradientAngle = value;
+
+                    OnColorTableChanged();
+                }
+            }
+        }
+
+        #endregion
+
+        #region IsEmpty
+
+        /// <summary>
+        /// Gets whether both colors assigned are empty.
+        /// </summary>
+        [Browsable(false)]
+        public virtual bool IsEmpty
+        {
+            get { return (Start.IsEmpty && End.IsEmpty && GradientAngle == 90); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region OnColorTableChanged
+
+        protected void OnColorTableChanged()
+        {
+            if (ColorTableChanged != null)
+                ColorTableChanged(this, EventArgs.Empty);
+        }
+
+        #endregion
+
+        #region GetBrush
+
+        public Brush GetBrush(Rectangle r)
+        {
+            return (GetBrush(r, _GradientAngle));
+        }
+
+        public Brush GetBrush(Rectangle r, int angle)
+        {
+            if (_End.IsEmpty == true)
+                return (new SolidBrush(_Start));
+
+            LinearGradientBrush lbr =
+                new LinearGradientBrush(r, _Start, _End, angle);
+
+            return (lbr);
+        }
+
+        #endregion
+    }
+
+    #region LinearGradientColorTableConvertor
+
+    public class LinearGradientColorTableConvertor : ExpandableObjectConverter
+    {
+        public override object ConvertTo(
+            ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+        {
+            if (destinationType == typeof(string))
+            {
+                LinearGradientColorTable lct = value as LinearGradientColorTable;
+
+                if (lct != null)
+                {
+                    ColorConverter cvt = new ColorConverter();
+
+                    if (lct.Start != Color.Empty)
+                        return (cvt.ConvertToString(lct.Start));
+
+                    if (lct.End != Color.Empty)
+                        return (cvt.ConvertToString(lct.End));
+
+                    if (lct.GradientAngle != 90)
+                        return (lct.GradientAngle.ToString());
+
+                    return (String.Empty);
+                }
+            }
+
+            return (base.ConvertTo(context, culture, value, destinationType));
+        }
+    }
+
+    #endregion
+
+}
+
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/Program.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/Program.cs
new file mode 100644
index 00000000..4dd8e207
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/Program.cs	
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Windows.Forms;
+
+namespace KnobControl
+{
+    static class Program
+    {
+        /// <summary>
+        /// The main entry point for the application.
+        /// </summary>
+        [STAThread]
+        static void Main()
+        {
+            Application.EnableVisualStyles();
+            Application.SetCompatibleTextRenderingDefault(false);
+            Application.Run(new Form1());
+        }
+    }
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/Properties/Resources.Designer.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/Properties/Resources.Designer.cs
new file mode 100644
index 00000000..fd2bb214
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/Properties/Resources.Designer.cs	
@@ -0,0 +1,63 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace DevComponents.Instrumentation.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DevComponents.Instrumentation.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/Properties/Resources.resx b/PROMS/DotNetBar Source Code/InstrumentationControls/Properties/Resources.resx
new file mode 100644
index 00000000..04e2214f
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/Properties/Resources.resx	
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/Properties/Settings.Designer.cs b/PROMS/DotNetBar Source Code/InstrumentationControls/Properties/Settings.Designer.cs
new file mode 100644
index 00000000..c683caa8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/Properties/Settings.Designer.cs	
@@ -0,0 +1,26 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace DevComponents.Instrumentation.Properties {
+    
+    
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
+        
+        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
+        
+        public static Settings Default {
+            get {
+                return defaultInstance;
+            }
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/Properties/Settings.settings b/PROMS/DotNetBar Source Code/InstrumentationControls/Properties/Settings.settings
new file mode 100644
index 00000000..39645652
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/Properties/Settings.settings	
@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='utf-8'?>
+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)">
+  <Profiles>
+    <Profile Name="(Default)" />
+  </Profiles>
+  <Settings />
+</SettingsFile>
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/Resources/Copy.png b/PROMS/DotNetBar Source Code/InstrumentationControls/Resources/Copy.png
new file mode 100644
index 00000000..195dc6d6
Binary files /dev/null and b/PROMS/DotNetBar Source Code/InstrumentationControls/Resources/Copy.png differ
diff --git a/PROMS/DotNetBar Source Code/InstrumentationControls/app.config b/PROMS/DotNetBar Source Code/InstrumentationControls/app.config
new file mode 100644
index 00000000..0df7832f
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/InstrumentationControls/app.config	
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<configuration>
+	<startup/></configuration>
diff --git a/PROMS/DotNetBar Source Code/IntegerInput.ico b/PROMS/DotNetBar Source Code/IntegerInput.ico
new file mode 100644
index 00000000..f576c163
Binary files /dev/null and b/PROMS/DotNetBar Source Code/IntegerInput.ico differ
diff --git a/PROMS/DotNetBar Source Code/Interfaces.cs b/PROMS/DotNetBar Source Code/Interfaces.cs
new file mode 100644
index 00000000..297e07cb
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Interfaces.cs	
@@ -0,0 +1,369 @@
+using System.Collections;
+namespace DevComponents.DotNetBar
+{
+	using System;
+	using System.Drawing;
+    /// <summary>
+    /// Interface for designer-item integration.
+    /// </summary>
+    public interface IBarItemDesigner
+    {
+        void StartExternalDrag(BaseItem item);
+    }
+
+    /// <summary>
+    /// Interface implemented by target Bar interested in access to designer.
+    /// </summary>
+    public interface IBarDesignerServices
+    {
+        /// <summary>
+        /// Gets or sets the BarBaseControlDesigner instance.
+        /// </summary>
+        IBarItemDesigner Designer { get;set;}
+    }
+
+	/// <summary>
+	/// Provides design-time support for DotNetBar items.
+	/// </summary>
+	public interface IDesignTimeProvider
+	{
+		InsertPosition GetInsertPosition(Point pScreen, BaseItem DragItem);
+		void DrawReversibleMarker(int iPos, bool Before);
+		void InsertItemAt(BaseItem objItem, int iPos, bool Before);
+	}
+
+	public class InsertPosition
+	{
+		public int Position;
+		public bool Before;
+		public IDesignTimeProvider TargetProvider;
+		public InsertPosition()
+		{
+			Position=-1;
+			Before=false;
+			TargetProvider=null;
+		}
+		public InsertPosition(int iPosition, bool bBefore, IDesignTimeProvider target)
+		{
+			this.Position=iPosition;
+			this.Before=bBefore;
+			this.TargetProvider=target;
+		}
+
+        public override string ToString()
+        {
+            if (TargetProvider == null)
+                return string.Format("TargetProvider={0}, Position={1}, Before={2}", "null", Position, Before);
+            else
+                return string.Format("TargetProvider={0}, Position={1}, Before={2}", TargetProvider, Position, Before);
+        }
+	}
+
+	/// <summary>
+	/// Provides support for personalized menu items.
+	/// </summary>
+	public interface IPersonalizedMenuItem
+	{
+		eMenuVisibility MenuVisibility {get;set;}
+		bool RecentlyUsed {get;set;}
+	}
+
+	public interface IOwnerItemEvents
+	{
+		void InvokeItemAdded(BaseItem item,EventArgs e);
+		void InvokeItemRemoved(BaseItem item, BaseItem parent, int itemIndex);
+		void InvokeMouseEnter(BaseItem item,EventArgs e);
+		void InvokeMouseHover(BaseItem item,EventArgs e);
+        void InvokeMouseLeave(BaseItem item,EventArgs e);
+		void InvokeMouseDown(BaseItem item, System.Windows.Forms.MouseEventArgs e);
+		void InvokeMouseUp(BaseItem item, System.Windows.Forms.MouseEventArgs e);
+		void InvokeMouseMove(BaseItem item, System.Windows.Forms.MouseEventArgs e);
+		void InvokeItemClick(BaseItem objItem);
+        void InvokeItemDoubleClick(BaseItem objItem, System.Windows.Forms.MouseEventArgs e);
+		void InvokeGotFocus(BaseItem item,EventArgs e);
+		void InvokeLostFocus(BaseItem item,EventArgs e);
+		void InvokeExpandedChange(BaseItem item,EventArgs e);
+		void InvokeItemTextChanged(BaseItem item, EventArgs e);
+//		void InvokeItemDisplayedChanged(BaseItem item, EventArgs e);
+
+		void InvokeContainerControlDeserialize(BaseItem item,ControlContainerSerializationEventArgs e);
+        void InvokeContainerControlSerialize(BaseItem item,ControlContainerSerializationEventArgs e);
+		void InvokeContainerLoadControl(BaseItem item,EventArgs e);
+
+		void InvokeOptionGroupChanging(BaseItem item, OptionGroupChangingEventArgs e);
+
+		void InvokeToolTipShowing(object item, EventArgs e);
+
+        void InvokeCheckedChanged(ButtonItem item, EventArgs e);
+	}
+
+	public interface IOwnerMenuSupport
+	{
+		bool PersonalizedAllVisible {get;set;}
+		bool ShowFullMenusOnHover {get;set;}
+		bool AlwaysShowFullMenus {get;set;}
+
+		void RegisterPopup(PopupItem objPopup);
+		void UnregisterPopup(PopupItem objPopup);
+		bool RelayMouseHover();
+
+		// Events
+		void InvokePopupClose(PopupItem item,EventArgs e);
+		void InvokePopupContainerLoad(PopupItem item,EventArgs e);
+		void InvokePopupContainerUnload(PopupItem item,EventArgs e);
+		void InvokePopupOpen(PopupItem item,PopupOpenEventArgs e);
+		void InvokePopupShowing(PopupItem item,EventArgs e);
+
+		bool ShowPopupShadow {get;}
+		eMenuDropShadow MenuDropShadow{get;set;}
+		ePopupAnimation PopupAnimation{get;set;}
+		bool AlphaBlendShadow{get;set;}
+        /// <summary>
+        /// Closes all popups managed by the owner control.
+        /// </summary>
+        void ClosePopups();
+	}
+
+	public interface IOwnerBarSupport
+	{
+		void InvokeDockTabChange(Bar bar,DockTabChangeEventArgs e);
+		void InvokeBarDock(Bar bar,EventArgs e);
+		void InvokeBarUndock(Bar bar,EventArgs e);
+		void InvokeAutoHideChanged(Bar bar,EventArgs e);
+		void InvokeBarClosing(Bar bar,BarClosingEventArgs e);
+		void InvokeAutoHideDisplay(Bar bar,AutoHideDisplayEventArgs e);
+		void InvokeBarTearOff(Bar bar,EventArgs e);
+		void InvokeBeforeDockTabDisplay(BaseItem item, EventArgs e);
+
+		DockSiteInfo GetDockInfo(IDockInfo pDock, int x, int y);
+		void DockComplete();
+
+		void BarContextMenu(System.Windows.Forms.Control bar, System.Windows.Forms.MouseEventArgs e);
+
+		System.Collections.ArrayList WereVisible{get;}
+		void AddShortcutsFromBar(Bar bar);
+		void RemoveShortcutsFromBar(Bar bar);
+
+		// Dock Site Support
+		DockSite LeftDockSite{get;set;}
+		DockSite RightDockSite{get;set;}
+		DockSite TopDockSite{get;set;}
+		DockSite BottomDockSite{get;set;}
+		DockSite FillDockSite{get;set;}
+
+        DockSite ToolbarLeftDockSite { get;set;}
+        DockSite ToolbarRightDockSite { get;set;}
+        DockSite ToolbarTopDockSite { get;set;}
+        DockSite ToolbarBottomDockSite { get;set;}
+
+		bool ApplyDocumentBarStyle{get;set;}
+	}
+
+	public interface IOwnerAutoHideSupport
+	{
+		// Auto-hide support
+		AutoHidePanel LeftAutoHidePanel {get;set;}
+		AutoHidePanel RightAutoHidePanel {get;set;}
+		AutoHidePanel TopAutoHidePanel {get;set;}
+		AutoHidePanel BottomAutoHidePanel {get;set;}
+		bool HasLeftAutoHidePanel {get;}
+		bool HasRightAutoHidePanel {get;}
+		bool HasTopAutoHidePanel {get;}
+		bool HasBottomAutoHidePanel {get;}
+
+	}
+
+	public interface IOwner
+	{
+		System.Windows.Forms.Form ParentForm {get;set;}
+		System.Collections.ArrayList GetItems(string ItemName);
+		System.Collections.ArrayList GetItems(string ItemName, Type itemType);
+        System.Collections.ArrayList GetItems(string ItemName, Type itemType, bool useGlobalName);
+		BaseItem GetItem(string ItemName);
+		void SetExpandedItem(BaseItem objItem);
+		BaseItem GetExpandedItem();
+
+		void SetFocusItem(BaseItem objFocusItem);
+		BaseItem GetFocusItem();
+		void DesignTimeContextMenu(BaseItem objItem);
+
+		void RemoveShortcutsFromItem(BaseItem objItem);
+		void AddShortcutsFromItem(BaseItem objItem);
+
+		System.Windows.Forms.ImageList Images {get;set;}
+		System.Windows.Forms.ImageList ImagesMedium {get;set;}
+		System.Windows.Forms.ImageList ImagesLarge {get;set;}
+
+		// Drag support
+		void StartItemDrag(BaseItem objItem);
+		BaseItem DragItem{get;}
+		bool DragInProgress{get;}
+
+		bool ShowToolTips{get;set;}
+		bool ShowShortcutKeysInToolTips{get;set;}
+		bool AlwaysDisplayKeyAccelerators{get;set;}
+
+		System.Windows.Forms.Form ActiveMdiChild{get;}
+		System.Windows.Forms.MdiClient GetMdiClient(System.Windows.Forms.Form MdiForm);
+		
+		void Customize();
+		void InvokeResetDefinition(BaseItem item,EventArgs e);
+        bool ShowResetButton{get;set;}
+
+		void InvokeDefinitionLoaded(object sender,EventArgs e);
+		void InvokeUserCustomize(object sender,EventArgs e);
+		void InvokeEndUserCustomize(object sender, EndUserCustomizeEventArgs e);
+
+		void OnApplicationActivate();
+		void OnApplicationDeactivate();
+		void OnParentPositionChanging();
+
+		bool DesignMode {get;}
+
+		bool DisabledImagesGrayScale{get;set;}
+	}
+
+	/// <summary>
+	/// Provides support for custom localization.
+	/// </summary>
+	public interface IOwnerLocalize
+	{
+		void InvokeLocalizeString(LocalizeEventArgs e);
+	}
+
+	internal interface IThemeCache
+	{
+		DevComponents.DotNetBar.ThemeWindow ThemeWindow{get;}
+		DevComponents.DotNetBar.ThemeRebar ThemeRebar{get;}
+		DevComponents.DotNetBar.ThemeToolbar ThemeToolbar{get;}
+		DevComponents.DotNetBar.ThemeHeader ThemeHeader{get;}
+		DevComponents.DotNetBar.ThemeScrollBar ThemeScrollBar{get;}
+		DevComponents.DotNetBar.ThemeExplorerBar ThemeExplorerBar{get;}
+		DevComponents.DotNetBar.ThemeProgress ThemeProgress{get;}
+        DevComponents.DotNetBar.ThemeButton ThemeButton { get;}
+	}
+
+	public interface IBarImageSize
+	{
+		eBarImageSize ImageSize {get;set;}
+	}
+
+	/// <summary>
+	/// Describes container support for setting the word-wrap behavior of it's sub-items.
+	/// </summary>
+	public interface IContainerWordWrap
+	{
+		/// <summary>
+		/// Gets or sets whether sub items text will be word wrapped if it cannot fit the space allocated.
+		/// </summary>
+		bool WordWrapSubItems{get;set;}
+	}
+
+    /// <summary>
+    /// Desribes interface that provides custom serialization support for items.
+    /// </summary>
+    public interface ICustomSerialization
+    {
+        /// <summary>
+        /// Occurs after an item has been serialized to XmlElement and provides you with opportunity to add any custom data
+        /// to serialized XML. This allows you to serialize any data with the item and load it back up in DeserializeItem event.
+        /// </summary>
+        /// <remarks>
+        /// 	<para>To serialize custom data to XML definition control creates handle this event and use CustomXmlElement
+        /// property on SerializeItemEventArgs to add new nodes or set attributes with custom data you want saved.</para>
+        /// </remarks>
+        event SerializeItemEventHandler SerializeItem;
+
+        /// <summary>
+        /// Occurs after an item has been de-serialized (load) from XmlElement and provides you with opportunity to load any custom data
+        /// you have serialized during SerializeItem event.
+        /// </summary>
+        /// <remarks>
+        /// 	<para>To de-serialize custom data from XML definition handle this event and use CustomXmlElement
+        /// property on SerializeItemEventArgs to retrive any data you saved in SerializeItem event.</para>
+        /// </remarks>
+        event SerializeItemEventHandler DeserializeItem;
+
+        /// <summary>
+        /// Invokes SerializeItem event.
+        /// </summary>
+        /// <param name="e">Provides data for the event.</param>
+        void InvokeSerializeItem(SerializeItemEventArgs e);
+
+        /// <summary>
+        /// Invokes DeserializeItem event.
+        /// </summary>
+        /// <param name="e">Provides data for the event.</param>
+        void InvokeDeserializeItem(SerializeItemEventArgs e);
+
+        /// <summary>
+        /// Gets whether any handlers have been defined for SerializeItem event. If no handles have been defined to optimize performance SerializeItem event will not be attempted to fire.
+        /// </summary>
+        bool HasSerializeItemHandlers { get;}
+
+        /// <summary>
+        /// Gets whether any handlers have been defined for DeserializeItem event. If no handles have been defined to optimize performance DeserializeItem event will not be attempted to fire.
+        /// </summary>
+        bool HasDeserializeItemHandlers { get;}
+    }
+
+    /// <summary>
+    /// Defines interface that should be implemented by controls that support per control renderers.
+    /// </summary>
+    public interface IRenderingSupport
+    {
+        /// <summary>
+        /// Gets the renderer control will be rendered with. This can be either custom renderer set on the control or the
+        /// Rendering.GlobalManager specified renderer.
+        /// </summary>
+        /// <returns></returns>
+        Rendering.BaseRenderer GetRenderer();
+
+        /// <summary>
+        /// Gets or sets the redering mode used by control. Default value is eRenderMode.Global which means that static GlobalManager.Renderer is used. If set to Custom then Renderer property must
+        /// also be set to the custom renderer that will be used.
+        /// </summary>
+        eRenderMode RenderMode { get; set; }
+
+        /// <summary>
+        /// Gets or sets the custom renderer used by the items on this control. RenderMode property must also be set to eRenderMode.Custom in order renderer
+        /// specified here to be used.
+        /// </summary>
+        DevComponents.DotNetBar.Rendering.BaseRenderer Renderer { get; set;}
+    }
+
+    /// <summary>
+    /// Defines interface for internal accessibility support for DotNetBar control.
+    /// </summary>
+    public interface IAccessibilitySupport
+    {
+        /// <summary>
+        /// Gets or sets the item default accesibility action will be performed on.
+        /// </summary>
+        BaseItem DoDefaultActionItem { get; set;}
+    }
+
+    /// <summary>
+    /// Provides interface for controls that support ribbon customization.
+    /// </summary>
+    public interface IRibbonCustomize
+    {
+        /// <summary>
+        /// Called when item contained by the container is right-clicked.
+        /// </summary>
+        /// <param name="item">Instance of the item that was right-clicked.</param>
+        void ItemRightClick(BaseItem item);
+    }
+
+    /// <summary>
+    /// Defines notification interface for scrollable item controls.
+    /// </summary>
+    public interface IScrollableItemControl
+    {
+        /// <summary>
+        /// Indicates that item has been selected via keyboard.
+        /// </summary>
+        /// <param name="item">Reference to item being selected</param>
+        void KeyboardItemSelected(BaseItem item);
+    }
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/IpAddressInput.ico b/PROMS/DotNetBar Source Code/IpAddressInput.ico
new file mode 100644
index 00000000..e6a7491a
Binary files /dev/null and b/PROMS/DotNetBar Source Code/IpAddressInput.ico differ
diff --git a/PROMS/DotNetBar Source Code/ItemContainer.cs b/PROMS/DotNetBar Source Code/ItemContainer.cs
new file mode 100644
index 00000000..0564d231
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/ItemContainer.cs	
@@ -0,0 +1,304 @@
+using System;
+using System.ComponentModel.Design;
+using System.Drawing;
+using System.ComponentModel;
+using System.Drawing.Drawing2D;
+using System.Windows.Forms;
+using System.Windows.Forms.Design;
+using DevComponents.UI.ContentManager;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Represents item container that arranges items horizontally or vertically.
+	/// </summary>
+	[ToolboxItem(false),DesignTimeVisible(false),Designer(typeof(ItemContainerDesigner))]
+	public class ItemContainer:ImageItem , IDesignTimeProvider
+	{
+		#region Private Variables & Constructor
+		private eOrientation m_LayoutOrientation=eOrientation.Horizontal;
+		private Size m_EmptyDesignTimeSize=new Size(24,24);
+		private bool m_SystemContainer=false;
+		
+		/// <summary>
+		/// Creates new instance of the ItemContainer object.
+		/// </summary>
+		public ItemContainer()
+		{
+			m_IsContainer=true;
+			this.AutoCollapseOnClick=true;
+			this.AccessibleRole=System.Windows.Forms.AccessibleRole.Grouping;
+		}
+		#endregion
+
+		#region Internal Implementation
+		/// <summary>
+		/// Must be overriden by class that is inheriting to provide the painting for the item.
+		/// </summary>
+		public override void Paint(ItemPaintArgs p)
+		{
+			ItemDisplay display=GetItemDisplay();
+			display.Paint(this,p);
+
+			if(this.DesignMode && !this.SystemContainer && p.DesignerSelection)
+			{
+				Graphics g=p.Graphics;
+				Rectangle r=this.DisplayRectangle;
+				using(Pen pen=new Pen(Color.FromArgb(120,Color.Red),1))
+				{
+					pen.DashStyle=DashStyle.Dash;
+					Display.DrawRoundedRectangle(g,pen,r,3);
+				}
+
+				Image image=BarFunctions.LoadBitmap("SystemImages.AddMoreItemsContainer.png");
+				g.DrawImageUnscaled(image,r.X+1,r.Y+1);
+				return;
+			}
+		}
+
+		/// <summary>
+		/// Recalcualtes the size of the container. Assumes that DisplayRectangle.Location is set to the upper left location of this container.
+		/// </summary>
+		public override void RecalcSize()
+		{
+			if(this.SuspendLayout)
+				return;
+
+			if(this.SubItems.Count==0)
+			{
+				if(this.DesignMode && !this.SystemContainer)
+				{
+					m_Rect.Size=m_EmptyDesignTimeSize;
+					if(m_LayoutOrientation==eOrientation.Horizontal)
+						m_Rect.Width+=12;
+					else
+						m_Rect.Height+=12;
+				}
+				else
+				{
+					m_Rect=Rectangle.Empty;
+				}
+				return;
+			}
+			
+			IContentLayout layout=this.GetContentLayout();
+			BlockLayoutManager blockLayout=this.GetBlockLayoutManager();
+			BaseItem[] elements=new BaseItem[this.SubItems.Count];
+			this.SubItems.CopyTo(elements,0);
+			if(m_Rect.Width==0)
+				m_Rect.Width=16;
+			if(m_Rect.Height==0)
+				m_Rect.Height=16;
+			m_Rect=layout.Layout(m_Rect,elements,blockLayout);
+			base.RecalcSize();
+		}
+
+		/// <summary>
+		/// Occurs when the mouse pointer is over the item and a mouse button is pressed. This is used by internal implementation only.
+		/// </summary>
+		[System.ComponentModel.Browsable(false),System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+		public override void InternalMouseDown(System.Windows.Forms.MouseEventArgs objArg)
+		{
+			if(this.DesignMode && !this.SystemContainer)
+			{
+				Rectangle r=this.DisplayRectangle;
+				r.Width=14;
+				r.Height=14;
+				if(r.Contains(objArg.X,objArg.Y))
+				{
+					IOwner owner=this.GetOwner() as IOwner;
+					if(owner!=null)
+					{
+						owner.SetFocusItem(this);
+						return;
+					}
+				}
+			}
+			base.InternalMouseDown(objArg);
+		}
+
+		/// <summary>
+		/// Gets or sets orientation inside the container. Do not change the value of this property. It is managed by system only.
+		/// </summary>
+		[Browsable(false),DevCoBrowsable(false),DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public override eOrientation Orientation
+		{
+			get {return eOrientation.Horizontal;}
+			set	{}
+		}
+
+		/// <summary>
+		/// Gets or sets orientation inside the container.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),DefaultValue(eOrientation.Horizontal),DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
+		public virtual eOrientation LayoutOrientation
+		{
+			get {return m_LayoutOrientation;}
+			set
+			{
+				m_LayoutOrientation=value;
+				OnOrientationChanged();
+			}
+		}
+
+		private void OnOrientationChanged()
+		{
+			m_NeedRecalcSize=true;
+			if(m_LayoutManager!=null)
+				m_LayoutManager.ContentOrientation=(this.LayoutOrientation==eOrientation.Horizontal?eContentOrientation.Horizontal:eContentOrientation.Vertical);
+		}
+
+		/// <summary>
+		/// IBlock member implementation
+		/// </summary>
+		[Browsable(false),DevCoBrowsable(false),DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden),EditorBrowsable(EditorBrowsableState.Never)]
+		public override System.Drawing.Rectangle Bounds
+		{
+			get
+			{
+				return base.Bounds;
+			}
+			set
+			{
+				Point offset=new Point(value.X-m_Rect.X,value.Y-m_Rect.Y);
+				m_Rect=value;
+				if(!offset.IsEmpty)
+				{
+					foreach(IBlock b in this.SubItems)
+					{
+						Rectangle r=b.Bounds;
+						r.Offset(offset);
+						b.Bounds=r;
+					}
+				}
+			}
+		}
+
+		/// <summary>
+		/// Returns copy of the item.
+		/// </summary>
+		public override BaseItem Copy()
+		{
+			ItemContainer objCopy=new ItemContainer();
+			this.CopyToItem(objCopy);
+			return objCopy;
+		}
+		/// <summary>
+		/// Copies the ButtonItem specific properties to new instance of the item.
+		/// </summary>
+		/// <param name="c">New ButtonItem instance.</param>
+		protected override void CopyToItem(BaseItem c)
+		{
+			ItemContainer copy=c as ItemContainer;
+			base.CopyToItem(copy);
+			
+		}
+
+		/// <summary>
+		/// Gets or sets a value indicating whether the item is expanded or not. For Popup items this would indicate whether the item is popped up or not.
+		/// </summary>
+		[System.ComponentModel.Browsable(false),System.ComponentModel.DefaultValue(false),System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
+		public override bool Expanded
+		{
+			get
+			{
+				return m_Expanded;
+			}
+			set
+			{
+				base.Expanded=value;
+				if(!value)
+					BaseItem.CollapseSubItems(this);
+			}
+		}
+
+		/// <summary>
+		/// Occurs when sub item expanded state has changed.
+		/// </summary>
+		/// <param name="item">Sub item affected.</param>
+		protected internal override void OnSubItemExpandChange(BaseItem item)
+		{
+			base.OnSubItemExpandChange(item);
+			if(item.Expanded)
+				this.Expanded=true;
+		}
+		
+		/// <summary>
+		/// Returns whether instance of the item container is used as system container internally by DotNetBar.
+		/// </summary>
+		public bool SystemContainer
+		{
+			get {return m_SystemContainer;}
+		}
+
+		/// <summary>
+		/// Sets whether container is used as system container internally by DotNetBar.
+		/// </summary>
+		/// <param name="b">true or false to indicate whether container is system container or not.</param>
+		internal void SetSystemContainer(bool b)
+		{
+			m_SystemContainer=b;
+		}
+
+		/// <summary>
+		/// Gets or sets the accessible role of the item.
+		/// </summary>
+		[DevCoBrowsable(true),Browsable(true),Category("Accessibility"),Description("Gets or sets the accessible role of the item."),DefaultValue(System.Windows.Forms.AccessibleRole.Grouping)]
+		public override System.Windows.Forms.AccessibleRole AccessibleRole
+		{
+			get {return base.AccessibleRole;}
+			set {base.AccessibleRole=value;}
+		}
+		#endregion
+
+		#region Factories
+		private SerialContentLayoutManager m_LayoutManager=null;
+		internal IContentLayout GetContentLayout()
+		{
+			if(m_LayoutManager==null)
+			{
+				m_LayoutManager=new SerialContentLayoutManager();
+				m_LayoutManager.BlockSpacing=1;
+				m_LayoutManager.ContentAlignment=eContentAlignment.Left;
+				m_LayoutManager.ContentLineAlignment=eContentLineAlignment.Top;
+				m_LayoutManager.ContentOrientation=(this.LayoutOrientation==eOrientation.Horizontal?eContentOrientation.Horizontal:eContentOrientation.Vertical);
+				m_LayoutManager.EvenHeight=(this.LayoutOrientation==eOrientation.Horizontal?true:false);
+				m_LayoutManager.FitContainer=false;
+				m_LayoutManager.FitContainerOversize=false;
+				m_LayoutManager.MultiLine=false;
+			}
+			return m_LayoutManager;
+		}
+
+		private BlockLayoutManager GetBlockLayoutManager()
+		{
+			return new ItemBlockLayoutManager();
+		}
+		
+		private ItemDisplay m_ItemDisplay=null;
+		private ItemDisplay GetItemDisplay()
+		{
+			if(m_ItemDisplay==null)
+				m_ItemDisplay=new ItemDisplay();
+			return m_ItemDisplay;
+		}
+		#endregion
+
+		#region IDesignTimeProvider Implementation
+		
+		InsertPosition IDesignTimeProvider.GetInsertPosition(Point pScreen, BaseItem dragItem)
+		{
+			return DesignTimeProviderContainer.GetInsertPosition(this,pScreen,dragItem);
+		}
+		void IDesignTimeProvider.DrawReversibleMarker(int iPos, bool Before)
+		{
+			DesignTimeProviderContainer.DrawReversibleMarker(this,iPos,Before);
+		}
+		void IDesignTimeProvider.InsertItemAt(BaseItem objItem, int iPos, bool Before)
+		{
+			DesignTimeProviderContainer.InsertItemAt(this,objItem,iPos,Before);
+		}
+
+		#endregion
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/ItemContainerDesigner.cs b/PROMS/DotNetBar Source Code/ItemContainerDesigner.cs
new file mode 100644
index 00000000..857a0120
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/ItemContainerDesigner.cs	
@@ -0,0 +1,45 @@
+using System;
+using System.ComponentModel.Design;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Reprensents Windows Forms Designer for ItemContainer object.
+	/// </summary>
+	public class ItemContainerDesigner:BaseItemDesigner
+	{
+		public override DesignerVerbCollection Verbs 
+		{
+			get 
+			{
+				DesignerVerb[] verbs = new DesignerVerb[]
+					{
+						new DesignerVerb("Add Button", new EventHandler(CreateButton)),
+						new DesignerVerb("Add Horizontal Container", new EventHandler(CreateHorizontalContainer)),
+						new DesignerVerb("Add Vertical Container", new EventHandler(CreateVerticalContainer)),
+						new DesignerVerb("Add Text Box", new EventHandler(CreateTextBox)),
+						new DesignerVerb("Add Combo Box", new EventHandler(CreateComboBox)),
+						new DesignerVerb("Add Label", new EventHandler(CreateLabel)),
+				};
+				return new DesignerVerbCollection(verbs);
+			}
+		}
+
+		private void CreateVerticalContainer(object sender, EventArgs e)
+		{
+			CreateContainer(eOrientation.Vertical);
+		}
+
+		private void CreateHorizontalContainer(object sender, EventArgs e)
+		{
+			CreateContainer(eOrientation.Horizontal);
+		}
+
+		private void CreateContainer(eOrientation orientation)
+		{
+			DesignerSupport.CreateItemContainer(this,(BaseItem)this.Component,orientation);
+			this.RecalcLayout();
+		}
+
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/ItemDockContainer.cs b/PROMS/DotNetBar Source Code/ItemDockContainer.cs
new file mode 100644
index 00000000..3b51f19d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/ItemDockContainer.cs	
@@ -0,0 +1,624 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+using System.ComponentModel;
+using System.Drawing.Drawing2D;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Defines an container where you can arrange child elements added to SubItems collection either horizontally or vertically, relative to each other using SetDock and GetDock methods.
+    /// </summary>
+    [ToolboxItem(false), DesignTimeVisible(false), ProvideProperty("Dock", typeof(BaseItem))]
+    [Designer("DevComponents.DotNetBar.Design.ItemContainerDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+    public class ItemDockContainer : ImageItem, System.ComponentModel.IExtenderProvider, IDesignTimeProvider
+    {
+        #region Private Variables
+        private ElementStyle _BackgroundStyle = new ElementStyle();
+        private Rectangle _DesignerSelectionRectangle = Rectangle.Empty;
+        private Size _EmptyDesignTimeSize = new Size(24, 24);
+        #endregion
+
+        #region Constructor
+
+
+        /// <summary>
+        /// Initializes a new instance of the ItemDockContainer class.
+        /// </summary>
+        public ItemDockContainer()
+        {
+            m_IsContainer = true;
+            _BackgroundStyle.StyleChanged += new EventHandler(BackgroundStyleChanged);
+        }
+        #endregion
+
+        #region Internal Implementation
+        /// <summary>
+        /// Returns copy of the item.
+        /// </summary>
+        public override BaseItem Copy()
+        {
+            ItemDockContainer objCopy = new ItemDockContainer();
+            this.CopyToItem(objCopy);
+            return objCopy;
+        }
+
+        /// <summary>
+        /// Copies the ButtonItem specific properties to new instance of the item.
+        /// </summary>
+        /// <param name="copy">New ButtonItem instance.</param>
+        internal void InternalCopyToItem(ButtonItem copy)
+        {
+            CopyToItem((BaseItem)copy);
+        }
+
+        /// <summary>
+        /// Copies the ButtonItem specific properties to new instance of the item.
+        /// </summary>
+        /// <param name="copy">New ButtonItem instance.</param>
+        protected override void CopyToItem(BaseItem copy)
+        {
+            base.CopyToItem(copy);
+            ItemDockContainer idc = (ItemDockContainer)copy;
+            idc.LastChildFill = _LastChildFill;
+        }
+
+        /// <summary>
+        /// Recalculates the size of the container. Assumes that DisplayRectangle.Location is set to the upper left location of this container.
+        /// </summary>
+        public override void RecalcSize()
+        {
+            if (this.SuspendLayout)
+                return;
+
+            if (this.SubItems.Count == 0 || this.VisibleSubItems == 0)
+            {
+                if (this.DesignMode && !this.SystemContainer)
+                {
+                    m_Rect.Size = GetEmptyDesignTimeSize();
+                }
+                else
+                {
+                    m_Rect = Rectangle.Empty;
+                }
+                base.RecalcSize();
+                return;
+            }
+
+            m_Rect = LayoutItems(m_Rect);
+
+            base.RecalcSize();
+        }
+        private BaseItem LastVisibleItem
+        {
+            get
+            {
+                int count = this.SubItems.Count - 1;
+                for (int i = count; i >= 0; i--)
+                {
+                    BaseItem item = SubItems[i];
+                    if (item.Visible)
+                    {
+                        return item;
+                    }
+                }
+                return null;
+            }
+        }
+        private System.Drawing.Rectangle LayoutItems(Rectangle bounds)
+        {
+            Rectangle itemsBounds = new Rectangle();
+            BaseItem lastVisibleItem = LastVisibleItem;
+            foreach (BaseItem item in m_SubItems)
+            {
+                if (!item.Visible)
+                {
+                    item.Displayed = false;
+                    continue;
+                }
+                item.Displayed = true;
+                item.RecalcSize();
+                eItemDock dock = GetDock(item);
+                if (_LastChildFill && item == lastVisibleItem)
+                {
+                    itemsBounds.Width += item.WidthInternal;
+                    if (item.HeightInternal > itemsBounds.Height)
+                        itemsBounds.Height = item.HeightInternal;
+                }
+                else if (dock == eItemDock.Left || dock == eItemDock.Right)
+                {
+                    itemsBounds.Width += item.WidthInternal;
+                    if (item.HeightInternal > itemsBounds.Height)
+                        itemsBounds.Height = item.HeightInternal;
+                }
+                else if (dock == eItemDock.Top || dock == eItemDock.Bottom)
+                {
+                    itemsBounds.Height += item.HeightInternal;
+                    if (item.WidthInternal > itemsBounds.Width)
+                        itemsBounds.Width = item.WidthInternal;
+                }
+            }
+
+            if (bounds.Width < itemsBounds.Width)
+                bounds.Width = itemsBounds.Width;
+            if (bounds.Height < itemsBounds.Height)
+                bounds.Height = itemsBounds.Height;
+
+            if (!this.Stretch)
+            {
+                if (itemsBounds.Height < bounds.Height)
+                    bounds.Height = itemsBounds.Height;
+            }
+
+            ArrangeItems(bounds);
+            return bounds;
+        }
+
+        private void ArrangeItems(Rectangle bounds)
+        {
+            BaseItem lastVisibleItem = LastVisibleItem;
+            Rectangle arrangeBounds = bounds;
+
+            foreach (BaseItem item in m_SubItems)
+            {
+                if (!item.Visible)
+                    continue;
+
+                eItemDock dock = GetDock(item);
+                if (_LastChildFill && item == lastVisibleItem)
+                {
+                    item.LeftInternal = arrangeBounds.Left;
+                    item.TopInternal = arrangeBounds.Top;
+                    item.WidthInternal = arrangeBounds.Width;
+                    item.HeightInternal = arrangeBounds.Height;
+                }
+                else if (dock == eItemDock.Left)
+                {
+                    item.LeftInternal = arrangeBounds.Left;
+                    item.TopInternal = arrangeBounds.Top;
+                    item.HeightInternal = arrangeBounds.Height;
+                    if (item.WidthInternal <= arrangeBounds.Width)
+                    {
+                        arrangeBounds.Width -= item.WidthInternal;
+                        arrangeBounds.X += item.WidthInternal;
+                    }
+                    else if (arrangeBounds.Width > 0)
+                    {
+                        arrangeBounds.X += arrangeBounds.Width;
+                        arrangeBounds.Width = 0;
+                    }
+                }
+                else if (dock == eItemDock.Right)
+                {
+                    item.HeightInternal = arrangeBounds.Height;
+                    if (item.WidthInternal <= arrangeBounds.Width)
+                    {
+                        item.LeftInternal = arrangeBounds.Right - item.WidthInternal;
+                        item.TopInternal = arrangeBounds.Top;
+                        arrangeBounds.Width -= item.WidthInternal;
+                    }
+                    else
+                    {
+                        item.LeftInternal = arrangeBounds.Left;
+                        item.TopInternal = arrangeBounds.Top;
+                        if (arrangeBounds.Width > 0)
+                        {
+                            arrangeBounds.X += arrangeBounds.Width;
+                            arrangeBounds.Width = 0;
+                        }
+                    }
+                }
+                else if (dock == eItemDock.Top)
+                {
+                    item.LeftInternal = arrangeBounds.Left;
+                    item.TopInternal = arrangeBounds.Top;
+                    item.WidthInternal = arrangeBounds.Width;
+                    if (item.HeightInternal <= arrangeBounds.Height)
+                    {
+                        arrangeBounds.Height -= item.HeightInternal;
+                        arrangeBounds.Y += item.HeightInternal;
+                    }
+                    else if (arrangeBounds.Height > 0)
+                    {
+                        arrangeBounds.Y += arrangeBounds.Height;
+                        arrangeBounds.Height = 0;
+                    }
+                }
+                else if (dock == eItemDock.Bottom)
+                {
+                    item.WidthInternal = arrangeBounds.Width;
+                    if (item.HeightInternal <= arrangeBounds.Height)
+                    {
+                        item.LeftInternal = arrangeBounds.Left;
+                        item.TopInternal = arrangeBounds.Bottom - item.HeightInternal;
+                        arrangeBounds.Height -= item.HeightInternal;
+                    }
+                    else
+                    {
+                        item.LeftInternal = arrangeBounds.Left;
+                        item.TopInternal = arrangeBounds.Top;
+                        if (arrangeBounds.Height > 0)
+                        {
+                            arrangeBounds.Y += arrangeBounds.Height;
+                            arrangeBounds.Height = 0;
+                        }
+                    }
+                }
+            }
+        }
+
+        protected override void OnExternalSizeChange()
+        {
+            if (!this.SuspendLayout)
+                ArrangeItems(m_Rect);
+            base.OnExternalSizeChange();
+        }
+
+        /// <summary>
+        /// Called after TopInternal property has changed
+        /// </summary>
+        protected override void OnTopLocationChanged(int oldValue)
+        {
+            base.OnTopLocationChanged(oldValue);
+            Point offset = new Point(0, this.TopInternal - oldValue);
+            OffsetSubItems(offset);
+        }
+
+        /// <summary>
+        /// Called after LeftInternal property has changed
+        /// </summary>
+        protected override void OnLeftLocationChanged(int oldValue)
+        {
+            base.OnLeftLocationChanged(oldValue);
+            Point offset = new Point(this.LeftInternal - oldValue, 0);
+            OffsetSubItems(offset);
+        }
+
+        private bool _Offsetting = false;
+        internal void OffsetSubItems(Point offset)
+        {
+            if (_Offsetting || offset.IsEmpty)
+                return;
+
+            try
+            {
+                _Offsetting = true;
+                BaseItem[] items = new BaseItem[this.SubItems.Count];
+                this.SubItems.CopyTo(items, 0);
+                foreach (BaseItem b in items)
+                {
+                    Rectangle r = b.Bounds;
+                    r.Offset(offset);
+                    b.Bounds = r;
+                }
+            }
+            finally
+            {
+                _Offsetting = false;
+            }
+        }
+
+        /// <summary>
+        /// Must be overridden by class that is inheriting to provide the painting for the item.
+        /// </summary>
+        public override void Paint(ItemPaintArgs p)
+        {
+            Graphics g = p.Graphics;
+            Region oldClip = null;
+            bool clipSet = false;
+
+            PaintBackground(p);
+
+            Rectangle clip = GetClipRectangle();
+            oldClip = g.Clip;
+            g.SetClip(clip, CombineMode.Intersect);
+            clipSet = true;
+
+            ItemDisplay display = GetItemDisplay();
+            display.Paint(this, p);
+
+            if (clipSet)
+            {
+                if (oldClip != null)
+                    g.Clip = oldClip;
+                else
+                    g.ResetClip();
+            }
+
+            if (this.DesignMode && !this.SystemContainer && p.DesignerSelection)
+            {
+                Rectangle r = this.DisplayRectangle;
+
+                Pen pen = null;
+                if (this.Focused)
+                    pen = new Pen(Color.FromArgb(190, Color.Navy), 1);
+                else
+                    pen = new Pen(Color.FromArgb(80, Color.Black), 1);
+
+                pen.DashStyle = DashStyle.Dot;
+                DisplayHelp.DrawRoundedRectangle(g, pen, r, 3);
+                pen.Dispose();
+                pen = null;
+
+                Image image = BarFunctions.LoadBitmap("SystemImages.AddMoreItemsContainer.png");
+
+                if (this.Parent is ItemContainer && !((ItemContainer)this.Parent).SystemContainer)
+                {
+                    ItemContainer pc = this.Parent as ItemContainer;
+                    while (pc != null && !pc.SystemContainer)
+                    {
+                        if (new Rectangle(pc.DisplayRectangle.Location, image.Size).Contains(this.DisplayRectangle.Location))
+                        {
+                            if (r.X + image.Width + 1 > this.DisplayRectangle.Right)
+                            {
+                                r.X = this.DisplayRectangle.X;
+                                if (r.Y + image.Height < this.DisplayRectangle.Bottom)
+                                    r.Y += image.Height + 1;
+                                else
+                                    break;
+                            }
+                            r.X += (image.Width + 1);
+                        }
+                        pc = pc.Parent as ItemContainer;
+                    }
+                }
+
+                _DesignerSelectionRectangle = new Rectangle(r.X + 1, r.Y + 1, image.Width, image.Height);
+                g.DrawImageUnscaled(image, _DesignerSelectionRectangle.Location);
+            }
+
+            this.DrawInsertMarker(p.Graphics);
+        }
+        private ItemDisplay _ItemDisplay = null;
+        internal ItemDisplay GetItemDisplay()
+        {
+            if (_ItemDisplay == null)
+                _ItemDisplay = new ItemDisplay();
+            return _ItemDisplay;
+        }
+        protected virtual void PaintBackground(ItemPaintArgs p)
+        {
+            _BackgroundStyle.SetColorScheme(p.Colors);
+            Graphics g = p.Graphics;
+            ElementStyleDisplay.Paint(new ElementStyleDisplayInfo(_BackgroundStyle, g, this.DisplayRectangle));
+        }
+
+        private void BackgroundStyleChanged(object sender, EventArgs e)
+        {
+            this.OnAppearanceChanged();
+        }
+
+        protected virtual Rectangle GetClipRectangle()
+        {
+            Rectangle clip = this.DisplayRectangle;
+            bool disposeStyle = false;
+            ElementStyle style = ElementStyleDisplay.GetElementStyle(_BackgroundStyle, out disposeStyle);
+            clip.X += ElementStyleLayout.LeftWhiteSpace(style);
+            clip.Width -= ElementStyleLayout.HorizontalStyleWhiteSpace(style);
+            clip.Y += ElementStyleLayout.TopWhiteSpace(style);
+            clip.Height -= ElementStyleLayout.VerticalStyleWhiteSpace(style);
+            if (disposeStyle)
+                style.Dispose();
+            return clip;
+        }
+
+        private Dictionary<BaseItem, eItemDock> _ItemDock = new Dictionary<BaseItem, eItemDock>();
+        /// <summary>
+        /// Retrieves the docking for specified item.
+        /// </summary>
+        [DefaultValue(eItemDock.Left)]
+        public eItemDock GetDock(BaseItem item)
+        {
+            if (item == null) throw new ArgumentNullException("item cannot be null");
+            eItemDock dock = eItemDock.Left;
+            if (_ItemDock.TryGetValue(item, out dock))
+                return dock;
+            return eItemDock.Left;
+        }
+
+        /// <summary>
+        /// Sets the docking within container for specified item.
+        /// </summary>
+        /// <param name="item">Item to set docking for.</param>
+        /// <param name="dock">Docking value.</param>
+        [Localizable(true)]
+        public void SetDock(BaseItem item, eItemDock dock)
+        {
+            if (item == null) throw new ArgumentNullException("item cannot be null");
+            if (dock == eItemDock.Left)
+            {
+                if (_ItemDock.ContainsKey(item))
+                    _ItemDock.Remove(item);
+            }
+            else
+            {
+                if (_ItemDock.ContainsKey(item))
+                    _ItemDock[item] = dock;
+                else
+                    _ItemDock.Add(item, dock);
+            }
+            if (this.DesignMode)
+            {
+                this.NeedRecalcSize = true;
+                this.Refresh();
+            }
+        }
+
+        /// <summary>
+        /// Returns empty container default design-time size.
+        /// </summary>
+        /// <returns>Size of an empty container.</returns>
+        protected virtual Size GetEmptyDesignTimeSize()
+        {
+            Size s = _EmptyDesignTimeSize;
+            return s;
+        }
+
+
+        private bool _LastChildFill = true;
+        /// <summary>
+        /// Gets or sets a value that indicates whether the last child element within a ItemDockContainer stretches to fill the remaining available space.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance"), Description("Indicates whether the last child element within a ItemDockContainer stretches to fill the remaining available space.")]
+        public bool LastChildFill
+        {
+            get { return _LastChildFill; }
+            set
+            {
+                _LastChildFill = value;
+                NeedRecalcSize = true;
+                OnAppearanceChanged();
+            }
+        }
+
+        private bool _SystemContainer = false;
+        [Browsable(false)]
+        public bool SystemContainer
+        {
+            get { return _SystemContainer; }
+            internal set
+            {
+                _SystemContainer = value;
+            }
+        }
+
+        /// <summary>
+        /// IBlock member implementation
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), EditorBrowsable(EditorBrowsableState.Never)]
+        public override System.Drawing.Rectangle Bounds
+        {
+            get
+            {
+                return base.Bounds;
+            }
+            set
+            {
+                Point offset = new Point(value.X - m_Rect.X, value.Y - m_Rect.Y);
+                base.Bounds = value;
+
+                if (!offset.IsEmpty)
+                {
+                    OffsetSubItems(offset);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Occurs when the mouse pointer is over the item and a mouse button is pressed. This is used by internal implementation only.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+        public override void InternalMouseDown(System.Windows.Forms.MouseEventArgs objArg)
+        {
+            if (this.DesignMode && !this.SystemContainer)
+            {
+                BaseItem item = ItemAtLocation(objArg.X, objArg.Y);
+                if (item == this && !(item.DesignMode && !item.DesignTimeVisible))
+                {
+                    IOwner owner = this.GetOwner() as IOwner;
+                    if (owner != null)
+                    {
+                        owner.SetFocusItem(this);
+                        return;
+                    }
+                }
+            }
+            else if (!this.DisplayRectangle.Contains(objArg.X, objArg.Y))
+            {
+                if (this.DesignMode)
+                {
+                    IOwner owner = this.GetOwner() as IOwner;
+                    if (owner != null)
+                        owner.SetFocusItem(null);
+                    LeaveHotSubItem(null);
+                }
+                return;
+            }
+            base.InternalMouseDown(objArg);
+        }
+
+        /// <summary>
+        /// Return Sub Item at specified location
+        /// </summary>
+        public override BaseItem ItemAtLocation(int x, int y)
+        {
+            if (this.DesignMode && !this.SystemContainer && !_DesignerSelectionRectangle.IsEmpty)
+            {
+                if (_DesignerSelectionRectangle.Contains(x, y))
+                    return this;
+            }
+
+            if (!this.Visible || !this.DisplayRectangle.Contains(x, y))
+                return null;
+
+            if (m_SubItems != null)
+            {
+                foreach (BaseItem objSub in m_SubItems)
+                {
+                    if (objSub.IsContainer)
+                    {
+                        BaseItem item = objSub.ItemAtLocation(x, y);
+                        if (item != null)
+                            return item;
+                    }
+                    else
+                    {
+                        if ((objSub.Visible || this.IsOnCustomizeMenu) && objSub.Displayed && objSub.DisplayRectangle.Contains(x, y))
+                        {
+                            if (this.DesignMode && !this.DisplayRectangle.IntersectsWith(objSub.DisplayRectangle))
+                                continue;
+                            return objSub;
+                        }
+                    }
+                }
+            }
+
+            if (this.DisplayRectangle.Contains(x, y) && /*this.DesignMode &&*/ !this.SystemContainer)
+                return this;
+            return null;
+        }
+
+        #endregion
+
+        #region IExtenderProvider Members
+
+        bool IExtenderProvider.CanExtend(object extendee)
+        {
+            BaseItem item = extendee as BaseItem;
+            if(item!=null && this.SubItems.Contains(item))
+                return true;
+            return false;
+        }
+
+        #endregion
+
+        #region IDesignTimeProvider Implementation
+        protected virtual InsertPosition GetContainerInsertPosition(Point pScreen, BaseItem dragItem)
+        {
+            return DesignTimeProviderContainer.GetInsertPosition(this, pScreen, dragItem);
+        }
+        InsertPosition IDesignTimeProvider.GetInsertPosition(Point pScreen, BaseItem dragItem)
+        {
+            return GetContainerInsertPosition(pScreen, dragItem);
+        }
+        void IDesignTimeProvider.DrawReversibleMarker(int iPos, bool Before)
+        {
+            DesignTimeProviderContainer.DrawReversibleMarker(this, iPos, Before);
+        }
+        void IDesignTimeProvider.InsertItemAt(BaseItem objItem, int iPos, bool Before)
+        {
+            DesignTimeProviderContainer.InsertItemAt(this, objItem, iPos, Before);
+        }
+
+        #endregion
+    }
+
+    public enum eItemDock
+    {
+        Left,
+        Right,
+        Top,
+        Bottom
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/ItemPaintArgs.cs b/PROMS/DotNetBar Source Code/ItemPaintArgs.cs
new file mode 100644
index 00000000..f6b2343e
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/ItemPaintArgs.cs	
@@ -0,0 +1,218 @@
+using System;
+using System.Drawing;
+using System.Windows.Forms;
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Summary description for ItemPaintArgs.
+	/// </summary>
+	public class ItemPaintArgs
+	{
+		public System.Drawing.Graphics Graphics;
+		public ColorScheme Colors;
+		public System.Windows.Forms.Control ContainerControl;
+		public eTextFormat ButtonStringFormat;
+		public bool IsOnMenu=false;
+        public bool IsOnPopupBar = false;
+		public bool IsOnMenuBar=false;
+        public bool IsOnRibbonBar = false;
+        public bool IsOnNavigationBar = false;
+		public System.Drawing.Font Font;
+		public IOwner Owner;
+        public bool RightToLeft = false;
+		private DevComponents.DotNetBar.ThemeWindow m_ThemeWindow=null;
+		private DevComponents.DotNetBar.ThemeRebar m_ThemeRebar=null;
+		private DevComponents.DotNetBar.ThemeToolbar m_ThemeToolbar=null;
+		private DevComponents.DotNetBar.ThemeHeader m_ThemeHeader=null;
+		private DevComponents.DotNetBar.ThemeScrollBar m_ThemeScrollBar=null;
+		private DevComponents.DotNetBar.ThemeExplorerBar m_ThemeExplorerBar=null;
+		private DevComponents.DotNetBar.ThemeProgress m_ThemeProgress=null;
+        private DevComponents.DotNetBar.ThemeButton m_ThemeButton = null;
+        public bool DesignerSelection = false;
+        public bool GlassEnabled = false;
+        private Rendering.BaseRenderer m_Renderer = null;
+        public ButtonItemRendererEventArgs ButtonItemRendererEventArgs = new ButtonItemRendererEventArgs();
+        public Rectangle ClipRectangle = Rectangle.Empty;
+        public Rectangle ContainerClipRectangle = Rectangle.Empty;
+        public bool ControlExpanded = true;
+        internal bool CachedPaint = false;
+        internal bool IsDefaultButton = false;
+        public bool IsFlatOffice2007Representation = false;
+        public PaintEventArgs PaintEventArgs = null;
+        internal bool AnimationEnabled = false;
+        internal System.Collections.Generic.List<Animation.AnimationRequest> AnimationRequests = null;
+        public bool DragInProgress = false;
+        public object ContextData = null;
+        public object ContextData2 = null;
+	    private bool _IsBackstageTab = false;
+
+        public ItemPaintArgs(IOwner owner, System.Windows.Forms.Control control, System.Drawing.Graphics g, ColorScheme scheme)
+		{
+			this.Graphics=g;
+			this.Colors=scheme;
+			this.ContainerControl=control;
+			this.Owner=owner;
+            if(control!=null)
+                this.RightToLeft = (control.RightToLeft == System.Windows.Forms.RightToLeft.Yes);
+            if (control is MenuPanel || this.ContainerControl is ItemsListBox)
+                this.IsOnMenu = true;
+            else if (control is Bar && ((Bar)control).MenuBar)
+                this.IsOnMenuBar = true;
+            else if (control is Bar && ((Bar)control).BarState == eBarState.Popup)
+                this.IsOnPopupBar = true;
+            else if (control is RibbonBar)
+                this.IsOnRibbonBar = true;
+            else if (control is NavigationBar)
+                this.IsOnNavigationBar = true;
+            else if (control is SuperTabControl && ((SuperTabControl) control).TabStrip.ApplicationButton != null)
+                _IsBackstageTab = true;
+            if(control!=null)
+			    this.Font=control.Font;
+			CreateStringFormat();
+		}
+
+        internal Rendering.BaseRenderer Renderer
+        {
+            get { return m_Renderer; }
+            set { m_Renderer = value; }
+        }
+
+		internal DevComponents.DotNetBar.ThemeWindow ThemeWindow
+		{
+			get
+			{
+				if(m_ThemeWindow==null)
+				{
+					if(this.ContainerControl is Bar)
+						m_ThemeWindow=((Bar)this.ContainerControl).ThemeWindow;
+					else if(this.ContainerControl is IThemeCache)
+						m_ThemeWindow=((IThemeCache)this.ContainerControl).ThemeWindow;
+
+				}
+				return m_ThemeWindow;
+			}
+		}
+		internal DevComponents.DotNetBar.ThemeRebar ThemeRebar
+		{
+			get
+			{
+				if(m_ThemeRebar==null)
+				{
+					if(this.ContainerControl is Bar)
+						m_ThemeRebar=((Bar)this.ContainerControl).ThemeRebar;
+					else if(this.ContainerControl is IThemeCache)
+						m_ThemeRebar=((IThemeCache)this.ContainerControl).ThemeRebar;
+				}
+				return m_ThemeRebar;
+			}
+		}
+		internal DevComponents.DotNetBar.ThemeToolbar ThemeToolbar
+		{
+			get
+			{
+				if(m_ThemeToolbar==null)
+				{
+					if(this.ContainerControl is Bar)
+						m_ThemeToolbar=((Bar)this.ContainerControl).ThemeToolbar;
+					else if(this.ContainerControl is IThemeCache)
+						m_ThemeToolbar=((IThemeCache)this.ContainerControl).ThemeToolbar;
+				}
+				return m_ThemeToolbar;
+			}
+		}
+		internal DevComponents.DotNetBar.ThemeHeader ThemeHeader
+		{
+			get
+			{
+				if(m_ThemeHeader==null)
+				{
+					if(this.ContainerControl is Bar)
+						m_ThemeHeader=((Bar)this.ContainerControl).ThemeHeader;
+					else if(this.ContainerControl is IThemeCache)
+						m_ThemeHeader=((IThemeCache)this.ContainerControl).ThemeHeader;						
+				}
+				return m_ThemeHeader;
+			}
+		}
+		internal DevComponents.DotNetBar.ThemeScrollBar ThemeScrollBar
+		{
+			get
+			{
+				if(m_ThemeScrollBar==null)
+				{
+					if(this.ContainerControl is Bar)
+						m_ThemeScrollBar=((Bar)this.ContainerControl).ThemeScrollBar;
+					else if(this.ContainerControl is IThemeCache)
+						m_ThemeScrollBar=((IThemeCache)this.ContainerControl).ThemeScrollBar;
+				}
+				return m_ThemeScrollBar;
+			}
+		}
+
+		internal DevComponents.DotNetBar.ThemeExplorerBar ThemeExplorerBar
+		{
+			get
+			{
+				if(m_ThemeExplorerBar==null)
+				{
+					if(this.ContainerControl is IThemeCache)
+						m_ThemeExplorerBar=((IThemeCache)this.ContainerControl).ThemeExplorerBar;
+				}
+				return m_ThemeExplorerBar;
+			}
+		}
+
+		internal DevComponents.DotNetBar.ThemeProgress ThemeProgress
+		{
+			get
+			{
+				if(m_ThemeProgress==null)
+				{
+					if(this.ContainerControl is Bar)
+						m_ThemeProgress=((Bar)this.ContainerControl).ThemeProgress;
+					else if(this.ContainerControl is IThemeCache)
+						m_ThemeProgress=((IThemeCache)this.ContainerControl).ThemeProgress;
+				}
+				return m_ThemeProgress;
+			}
+		}
+
+        internal DevComponents.DotNetBar.ThemeButton ThemeButton
+        {
+            get
+            {
+                if (m_ThemeButton == null)
+                {
+                    if (this.ContainerControl is IThemeCache)
+                        m_ThemeButton = ((IThemeCache)this.ContainerControl).ThemeButton;
+                }
+                return m_ThemeButton;
+            }
+        }
+
+		private void CreateStringFormat()
+		{
+            eTextFormat sfmt = eTextFormat.Default;
+            if (this.ContainerControl is ItemControl && !(this.Owner!=null && this.Owner.AlwaysDisplayKeyAccelerators))
+                sfmt |= eTextFormat.HidePrefix;
+			else if(!((this.Owner!=null && this.Owner.AlwaysDisplayKeyAccelerators) || NativeFunctions.ShowKeyboardCues || this.IsOnMenu)) 
+			{
+				Bar bar=this.ContainerControl as Bar;
+                if (!((this.ContainerControl != null && this.ContainerControl.Focused) || (bar != null && bar.MenuFocus) || (bar != null && bar.AlwaysDisplayKeyAccelerators) || this.ContainerControl is NavigationBar))
+                    sfmt |= eTextFormat.HidePrefix;
+			}
+            if(this.ContainerControl is RibbonBar)
+                sfmt |= eTextFormat.VerticalCenter;
+            else
+                sfmt |= eTextFormat.SingleLine | eTextFormat.VerticalCenter;
+            if (!TextDrawing.UseTextRenderer)
+                sfmt |= eTextFormat.EndEllipsis;
+			this.ButtonStringFormat=sfmt;
+		}
+
+	    internal bool IsBackstageTab
+	    {
+	        get { return _IsBackstageTab; }
+	    }
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/ItemSerializationContext.cs b/PROMS/DotNetBar Source Code/ItemSerializationContext.cs
new file mode 100644
index 00000000..662dc62b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/ItemSerializationContext.cs	
@@ -0,0 +1,58 @@
+using System;
+using System.Text;
+using System.Collections;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Provides context information for serialization.
+    /// </summary>
+    public class ItemSerializationContext
+    {
+        /// <summary>
+        /// Gets or sets reference to context XmlElement an item is being serialized to.
+        /// </summary>
+        public System.Xml.XmlElement ItemXmlElement = null;
+
+        /// <summary>
+        /// Gets or sets whether SerializeItem event handler has been defined and whether event should be fired.
+        /// </summary>
+        public bool HasSerializeItemHandlers = false;
+
+        /// <summary>
+        /// Gets or sets whether DeserializeItem event handler has been defined and whether event should be fired.
+        /// </summary>
+        public bool HasDeserializeItemHandlers = false;
+
+        /// <summary>
+        /// Provides access to serializer.
+        /// </summary>
+        public ICustomSerialization Serializer = null;
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public System.ComponentModel.Design.IDesignerHost _DesignerHost = null;
+        internal Hashtable DockControls = null;
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public BaseItem CreateItemFromXml(System.Xml.XmlElement xmlItem)
+        {
+            if (_DesignerHost != null)
+            {
+                BaseItem item = null;
+                string name = "";
+                if (xmlItem.HasAttribute("name")) name = xmlItem.GetAttribute("name");
+                try
+                {
+                    item = BarFunctions.CreateItemFromXml(xmlItem, _DesignerHost, name);
+                }
+                catch { }
+                if (item == null) item = BarFunctions.CreateItemFromXml(xmlItem, _DesignerHost, "");
+                if (name != "") item.GlobalName = name;
+
+                return item;
+            }
+            else
+                return BarFunctions.CreateItemFromXml(xmlItem);
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/ItemStyle.cs b/PROMS/DotNetBar Source Code/ItemStyle.cs
new file mode 100644
index 00000000..aa6b877a
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/ItemStyle.cs	
@@ -0,0 +1,1534 @@
+using System;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Represent an style for the item.
+	/// </summary>
+	[ToolboxItem(false), TypeConverter(typeof(System.ComponentModel.ExpandableObjectConverter))]
+	public class ItemStyle: ICloneable
+	{
+		const eBorderSide DEFAULT_BORDERSIDE=eBorderSide.Top | eBorderSide.Bottom | eBorderSide.Left | eBorderSide.Right;
+		const int DEFAULT_CORNER_DIAMETER=8;
+		private ColorEx m_BackColor1=ColorEx.Empty;
+		private ColorEx m_BackColor2=ColorEx.Empty;
+		private int m_GradientAngle=0;
+		private ColorEx m_ForeColor=ColorEx.Empty;
+        private Font m_Font=null;
+		// Background Image support
+		private Image m_BackgroundImage=null;
+		private eBackgroundImagePosition m_BackgroundImagePosition=eBackgroundImagePosition.Stretch;
+		private byte m_BackgroundImageAlpha=255;
+
+		// Text Formating
+		private bool m_WordWrap=false;
+		private StringAlignment m_Alignment=StringAlignment.Near;
+		private StringAlignment m_LineAlignment=StringAlignment.Center;
+		private StringTrimming m_TextTrimming=StringTrimming.EllipsisCharacter;
+
+		private eBorderType m_Border=eBorderType.None;
+		private eBorderSide m_BorderSide=DEFAULT_BORDERSIDE;
+		private int m_BorderWidth=1;
+		private ColorEx m_BorderColor=ColorEx.Empty;
+		private bool m_Custom=false;
+		private DashStyle m_BorderDashStyle=DashStyle.Solid;
+
+		private int m_MarginLeft=0, m_MarginRight=0,m_MarginTop=0,m_MarginBottom=0;
+
+        private bool m_VerticalText = false;
+
+		internal event EventHandler VisualPropertyChanged;
+
+		// Corner type support
+		private eCornerType m_CornerType=eCornerType.Square;
+		private int m_CornerDiameter=DEFAULT_CORNER_DIAMETER;
+
+		/// <summary>
+		/// Default Constructor
+		/// </summary>
+		public ItemStyle()
+		{
+			m_BackColor1.ColorChanged+=new EventHandler(this.ColorChanged);
+			m_BackColor2.ColorChanged+=new EventHandler(this.ColorChanged);
+			m_ForeColor.ColorChanged+=new EventHandler(this.ColorChanged);
+			m_BorderColor.ColorChanged+=new EventHandler(this.ColorChanged);
+		}
+
+		/// <summary>
+		/// Makes a copy of the ItemStyle object.
+		/// </summary>
+		/// <returns>New Instance of a ItemStyle object</returns>
+		public object Clone()
+		{
+			ItemStyle copy=new ItemStyle();
+			copy.Alignment=this.Alignment;
+			copy.BackColor1.SetColor(this.BackColor1.Color);
+			copy.BackColor1.Alpha=this.BackColor1.Alpha;
+			copy.BackColor1.SetColorSchemePart(this.BackColor1.ColorSchemePart);
+			copy.BackColor2.SetColor(this.BackColor2.Color);
+			copy.BackColor2.Alpha=this.BackColor2.Alpha;
+			copy.BackColor2.SetColorSchemePart(this.BackColor2.ColorSchemePart);
+			if(this.BackgroundImage!=null)
+				copy.BackgroundImage=this.BackgroundImage.Clone() as System.Drawing.Image;
+			copy.BackgroundImageAlpha=this.BackgroundImageAlpha;
+			copy.BackgroundImagePosition=this.BackgroundImagePosition;
+			copy.Border=this.Border;
+			copy.BorderDashStyle=this.BorderDashStyle;
+			copy.BorderColor.SetColor(this.BorderColor.Color);
+			copy.BorderColor.Alpha=this.BorderColor.Alpha;
+			copy.BorderColor.SetColorSchemePart(this.BorderColor.ColorSchemePart);
+			copy.BorderWidth=this.BorderWidth;
+			if(this.Font!=null)
+				copy.Font=this.Font.Clone() as Font;
+			copy.ForeColor.SetColor(this.ForeColor.Color);
+			copy.ForeColor.Alpha=this.ForeColor.Alpha;
+			copy.ForeColor.SetColorSchemePart(this.ForeColor.ColorSchemePart);
+			copy.GradientAngle=this.GradientAngle;
+			copy.LineAlignment=this.LineAlignment;
+			copy.BorderSide=this.BorderSide;
+			copy.TextTrimming=this.TextTrimming;
+			copy.WordWrap=this.WordWrap;
+			copy.Custom=this.Custom;
+			copy.MarginBottom=this.MarginBottom;
+			copy.MarginLeft=this.MarginLeft;
+			copy.MarginRight=this.MarginRight;
+			copy.MarginTop=this.MarginTop;
+			copy.CornerType=this.CornerType;
+			copy.CornerDiameter=this.CornerDiameter;
+            copy.VerticalText = this.VerticalText;
+            copy.UseMnemonic = _UseMnemonic;
+			return copy;
+		}
+
+		internal void ApplyStyle(ItemStyle style)
+		{
+			if(style==null)
+				return;
+
+			m_Alignment=style.Alignment;
+			if(!style.BackColor1.IsEmpty)
+				m_BackColor1=style.BackColor1;
+			if(!style.BackColor2.IsEmpty)
+				m_BackColor2=style.BackColor2;
+			if(style.BackgroundImage!=null)
+                m_BackgroundImage=style.BackgroundImage;
+			if(style.BackgroundImageAlpha!=255)
+				m_BackgroundImageAlpha=style.BackgroundImageAlpha;
+			if(style.BackgroundImagePosition!=eBackgroundImagePosition.Stretch)
+				m_BackgroundImagePosition=style.BackgroundImagePosition;
+			if(style.Border!=eBorderType.None)
+				m_Border=style.Border;
+			if(style.BorderDashStyle!=DashStyle.Solid)
+				m_BorderDashStyle=style.BorderDashStyle;
+			if(!style.BorderColor.IsEmpty)
+				m_BorderColor=style.BorderColor;
+			if(style.BorderSide!=DEFAULT_BORDERSIDE)
+				m_BorderSide=style.BorderSide;
+			if(style.BorderWidth!=1)
+				m_BorderWidth=style.BorderWidth;
+			if(style.Font!=null)
+				m_Font=style.Font;
+			if(!style.ForeColor.IsEmpty)
+				m_ForeColor=style.ForeColor;
+			if(style.LineAlignment!=StringAlignment.Center)
+				m_LineAlignment=style.LineAlignment;
+			if(style.TextTrimming!=StringTrimming.EllipsisCharacter)
+				m_TextTrimming=style.TextTrimming;
+			if(style.WordWrap!=false)
+				m_WordWrap=style.WordWrap;
+			if(style.MarginBottom!=0)
+				m_MarginBottom=style.MarginBottom;
+			if(style.MarginLeft!=0)
+				m_MarginLeft=style.MarginLeft;
+			if(style.MarginRight!=0)
+				m_MarginRight=style.MarginRight;
+			if(style.MarginTop!=0)
+				m_MarginTop=style.MarginTop;
+            if(style.CornerType!=eCornerType.Square)
+				m_CornerType=style.CornerType;
+			if(style.CornerDiameter!=DEFAULT_CORNER_DIAMETER)
+				m_CornerDiameter=style.CornerDiameter;
+            if (style.VerticalText)
+                m_VerticalText = style.VerticalText;
+            if (!style.UseMnemonic)
+                _UseMnemonic = style.UseMnemonic;
+		}
+
+		internal void ApplyColorScheme(ColorScheme cs)
+		{
+            if (this.BackColor1.ColorSchemePart != eColorSchemePart.Custom && this.BackColor1.ColorSchemePart != eColorSchemePart.None)
+				this.BackColor1.SetColor((Color)cs.GetType().GetProperty(this.BackColor1.ColorSchemePart.ToString()).GetValue(cs,null));
+            if (this.BackColor2.ColorSchemePart != eColorSchemePart.Custom && this.BackColor2.ColorSchemePart != eColorSchemePart.None)
+				this.BackColor2.SetColor((Color)cs.GetType().GetProperty(this.BackColor2.ColorSchemePart.ToString()).GetValue(cs,null));
+            if (this.BorderColor.ColorSchemePart != eColorSchemePart.Custom && this.BorderColor.ColorSchemePart != eColorSchemePart.None)
+                this.BorderColor.SetColor((Color)cs.GetType().GetProperty(this.BorderColor.ColorSchemePart.ToString()).GetValue(cs, null));
+            if (this.ForeColor.ColorSchemePart != eColorSchemePart.Custom && this.ForeColor.ColorSchemePart != eColorSchemePart.None)
+				this.ForeColor.SetColor((Color)cs.GetType().GetProperty(this.ForeColor.ColorSchemePart.ToString()).GetValue(cs,null));
+		}
+
+		private void ColorChanged(object sender, EventArgs e)
+		{
+			InvokeVisualPropertyChanged();
+		}
+
+		private void InvokeVisualPropertyChanged()
+		{
+			if(VisualPropertyChanged!=null)
+				VisualPropertyChanged(this,new EventArgs());
+		}
+
+		internal bool Custom
+		{
+			get
+			{
+				return m_Custom | m_BackColor1.Custom | m_BackColor2.Custom | m_ForeColor.Custom;
+			}
+			set
+			{
+				m_Custom=value;
+				m_BackColor1.Custom=value;
+				m_BackColor2.Custom=value;
+				m_ForeColor.Custom=value;
+			}
+		}
+
+        /// <summary>
+        /// Gets or sets whether text is drawn vertically by this style.
+        /// </summary>
+        [Browsable(false),DefaultValue(false)]
+        public bool VerticalText
+        {
+            get { return m_VerticalText; }
+            set
+            {
+                if (m_VerticalText != value)
+                {
+                    m_VerticalText = value;
+                    InvokeVisualPropertyChanged();
+                }
+            }
+        }
+		
+		/// <summary>
+		/// Gets or sets a background color or starting color for gradient background.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),NotifyParentPropertyAttribute(true),Category("Style"),Description("Gets or sets a background color or starting color for gradient background."),DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+		public ColorEx BackColor1
+		{
+			get
+			{
+				return m_BackColor1;
+			}
+		}
+		[System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+		public bool ShouldSerializeBackColor1()
+		{return !m_BackColor1.IsEmpty;}
+		public void ResetBackColor1()
+		{
+			m_BackColor1.ColorChanged-=new EventHandler(this.ColorChanged);
+			m_BackColor1=ColorEx.Empty;
+			m_BackColor1.ColorChanged+=new EventHandler(this.ColorChanged);
+		}
+		internal void SetBackColor1(ColorEx c)
+		{
+			m_BackColor1=c;
+		}
+
+		/// <summary>
+		/// Gets or sets a background color or ending color for gradient background.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),NotifyParentPropertyAttribute(true),Category("Style"),Description("Gets or sets a background color or ending color for gradient background."),DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+		public ColorEx BackColor2
+		{
+			get
+			{
+				return m_BackColor2;
+			}
+		}
+		[System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+		public bool ShouldSerializeBackColor2()
+		{return !m_BackColor2.IsEmpty;}
+		public void ResetBackColor2()
+		{
+			m_BackColor2.ColorChanged-=new EventHandler(this.ColorChanged);
+			m_BackColor2=ColorEx.Empty;
+			m_BackColor2.ColorChanged+=new EventHandler(this.ColorChanged);
+		}
+		internal void SetBackColor2(ColorEx c)
+		{
+			m_BackColor2=c;
+		}
+
+		/// <summary>
+		/// Gets or sets a text color.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),NotifyParentPropertyAttribute(true),Category("Style"),Description("Gets or sets a text color."),DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+		public ColorEx ForeColor
+		{
+			get
+			{
+				return m_ForeColor;
+			}
+		}
+		[System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+		public bool ShouldSerializeForeColor()
+		{return !m_ForeColor.IsEmpty;}
+
+		/// <summary>
+		/// Gets or sets the gradient angle.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),NotifyParentPropertyAttribute(true),Category("Style"),DefaultValue(0),Description("Gets or sets the gradient angle.")]
+		public int GradientAngle
+		{
+			get
+			{
+				return m_GradientAngle;
+			}
+			set
+			{
+				if(m_GradientAngle!=value)
+				{
+					m_GradientAngle=value;
+					m_Custom=true;
+					InvokeVisualPropertyChanged();
+				}
+			}
+		}
+
+		internal System.Drawing.Region GetRegion(Rectangle clientRectangle)
+		{
+            if (m_CornerType == eCornerType.Rounded && m_CornerDiameter > 1)
+            {
+                IntPtr rr = WinApi.CreateRoundRectRgn(clientRectangle.X, clientRectangle.Y,
+                    clientRectangle.Width, clientRectangle.Height, m_CornerDiameter, m_CornerDiameter);
+                Region reg = System.Drawing.Region.FromHrgn(rr);
+                WinApi.DeleteObject(rr);
+                return reg;
+            }
+        
+            // GetPath will reduce the size so account for that here
+            clientRectangle.Width++;
+            clientRectangle.Height++;
+
+			GraphicsPath path=this.GetPath(clientRectangle);
+			Region r=new Region();
+            r.MakeEmpty();
+            r.Union(path);
+			// Widen path for the border...
+			if(m_Border!=eBorderType.None && m_BorderWidth>0 && m_CornerType!=eCornerType.Square && !m_BorderColor.IsEmpty)
+			{
+				using(Pen pen=new Pen(Color.Black,m_BorderWidth))
+				{
+					path.Widen(pen);
+				}
+				Region r2=new Region(path);
+				r.Union(path);
+			}
+            else if (m_CornerType == eCornerType.Rounded)
+            {
+                path.Widen(SystemPens.Control);
+                Region r2 = new Region(path);
+                r.Union(path);
+            }
+
+			return r;
+		}
+
+		private GraphicsPath GetPath(Rectangle clientRectangle)
+		{
+            GraphicsPath path = null;
+
+			if(m_CornerType!=eCornerType.Square)
+			{
+				clientRectangle.Width--;
+				clientRectangle.Height--;
+			}
+
+			switch(m_CornerType)
+			{
+				case eCornerType.Square:
+				{
+                    path =new GraphicsPath();
+					path.AddRectangle(clientRectangle);
+					break;
+				}
+				case eCornerType.Rounded:
+				{
+                    path = DisplayHelp.GetRoundedRectanglePath(clientRectangle, m_CornerDiameter);
+                    //path.AddLine(clientRectangle.X,clientRectangle.Bottom-m_CornerDiameter,clientRectangle.X,clientRectangle.Y+m_CornerDiameter);
+                    //path.AddArc(clientRectangle.X,clientRectangle.Y,m_CornerDiameter*2,m_CornerDiameter*2,180,90);
+                    //path.AddLine(clientRectangle.X+m_CornerDiameter,clientRectangle.Y,clientRectangle.Right-m_CornerDiameter,clientRectangle.Y);
+                    //path.AddArc(clientRectangle.Right-m_CornerDiameter*2,clientRectangle.Y,m_CornerDiameter*2,m_CornerDiameter*2,270,90);
+                    //path.AddLine(clientRectangle.Right,clientRectangle.Y+m_CornerDiameter,clientRectangle.Right,clientRectangle.Bottom-m_CornerDiameter);
+                    //path.AddArc(clientRectangle.Right-m_CornerDiameter*2,clientRectangle.Bottom-m_CornerDiameter*2,m_CornerDiameter*2,m_CornerDiameter*2,0,90);
+                    //path.AddLine(clientRectangle.Right-m_CornerDiameter,clientRectangle.Bottom,clientRectangle.X+m_CornerDiameter,clientRectangle.Bottom);
+                    //path.AddArc(clientRectangle.X,clientRectangle.Bottom-m_CornerDiameter*2,m_CornerDiameter*2,m_CornerDiameter*2,90,90);
+                    //path.CloseAllFigures();
+					break;
+				}
+				case eCornerType.Diagonal:
+				{
+                    path = new GraphicsPath();
+					path.AddLine(clientRectangle.X,clientRectangle.Bottom-m_CornerDiameter,clientRectangle.X,clientRectangle.Y+m_CornerDiameter);
+					path.AddLine(clientRectangle.X+m_CornerDiameter,clientRectangle.Y,clientRectangle.Right-m_CornerDiameter,clientRectangle.Y);
+					path.AddLine(clientRectangle.Right,clientRectangle.Y+m_CornerDiameter,clientRectangle.Right,clientRectangle.Bottom-m_CornerDiameter);
+					path.AddLine(clientRectangle.Right-m_CornerDiameter,clientRectangle.Bottom,clientRectangle.X+m_CornerDiameter,clientRectangle.Bottom);
+					path.CloseAllFigures();
+					break;
+				}
+			}
+
+			return path;
+		}
+
+		/// <summary>
+		/// Gets or sets the style Font
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),NotifyParentPropertyAttribute(true),Category("Style"),DefaultValue(null),Description("Gets or sets the style Font")]
+		public System.Drawing.Font Font
+		{
+			get
+			{
+				return m_Font;
+			}
+			set
+			{
+				m_Font=value;
+				m_Custom=true;
+				InvokeVisualPropertyChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets a value that determines whether text is displayed in multiple lines or one long line.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),NotifyParentPropertyAttribute(true),Category("Style"),DefaultValue(false),Description("Gets or sets a value that determines whether text is displayed in multiple lines or one long line.")]
+		public bool WordWrap
+		{
+			get {return m_WordWrap;}
+			set
+			{
+				if(m_WordWrap!=value)
+					m_WordWrap=value;
+				m_Custom=true;
+				InvokeVisualPropertyChanged();
+			}
+		}
+
+		/// <summary>
+		/// Specifies alignment of the text.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),Category("Style"),DefaultValue(StringAlignment.Near),Description("Specifies alignment of the text.")]
+		public StringAlignment Alignment
+		{
+			get {return m_Alignment;}
+			set
+			{
+				if(m_Alignment!=value)
+				{
+					m_Alignment=value;
+					m_Custom=true;
+					InvokeVisualPropertyChanged();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Specifies alignment of the text.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),NotifyParentPropertyAttribute(true),Category("Style"),DefaultValue(StringAlignment.Center),Description("Specifies alignment of the text.")]
+		public StringAlignment LineAlignment
+		{
+			get {return m_LineAlignment;}
+			set
+			{
+				if(m_LineAlignment!=value)
+				{
+					m_LineAlignment=value;
+					m_Custom=true;
+					InvokeVisualPropertyChanged();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Specifies how to trim characters when text does not fit.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),NotifyParentPropertyAttribute(true),Category("Style"),DefaultValue(StringTrimming.EllipsisCharacter),Description("Specifies how to trim characters when text does not fit.")]
+		public StringTrimming TextTrimming
+		{
+			get {return m_TextTrimming;}
+			set
+			{
+				if(m_TextTrimming!=value)
+				{
+					m_TextTrimming=value;
+					m_Custom=true;
+					InvokeVisualPropertyChanged();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Specifies background image.
+        /// </summary>
+        [Browsable(true),DevCoBrowsable(true),NotifyParentPropertyAttribute(true),Category("Style"),DefaultValue(null),Description("Specifies background image."),DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
+		public Image BackgroundImage
+		{
+			get {return m_BackgroundImage;}
+			set
+			{
+				m_BackgroundImage=value;
+				m_Custom=true;
+				InvokeVisualPropertyChanged();
+			}
+		}
+		public void ResetBackgroundImage()
+		{
+			m_BackgroundImage=null;
+		}
+
+		/// <summary>
+		/// Specifies background image position when container is larger than image.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),NotifyParentPropertyAttribute(true),Category("Style"),DefaultValue(eBackgroundImagePosition.Stretch),Description("Specifies background image position when container is larger than image.")]
+		public eBackgroundImagePosition BackgroundImagePosition
+		{
+			get {return m_BackgroundImagePosition;}
+			set
+			{
+				if(m_BackgroundImagePosition!=value)
+				{
+					m_BackgroundImagePosition=value;
+					m_Custom=true;
+					InvokeVisualPropertyChanged();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Specifies the transparency of background image.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),NotifyParentPropertyAttribute(true),Category("Style"),DefaultValue((byte)255),Description("Specifies the transparency of background image.")]
+		public byte BackgroundImageAlpha
+		{
+			get {return m_BackgroundImageAlpha;}
+			set
+			{
+				if(m_BackgroundImageAlpha!=value)
+				{
+					m_BackgroundImageAlpha=value;
+					m_Custom=true;
+					InvokeVisualPropertyChanged();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the corner type.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),NotifyParentPropertyAttribute(true),Category("Style"),DefaultValue(eCornerType.Square),Description("Indicates corner type.")]		
+		public eCornerType CornerType
+		{
+			get {return m_CornerType;}
+			set
+			{
+				if(m_CornerType!=value)
+				{
+					m_CornerType=value;
+					m_Custom=true;
+					InvokeVisualPropertyChanged();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the diameter in pixels of the corner type rounded or diagonal.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),NotifyParentPropertyAttribute(true),Category("Style"),DefaultValue(DEFAULT_CORNER_DIAMETER),Description("Indicates diameter in pixels of the corner type rounded or diagonal.")]
+		public int CornerDiameter
+		{
+			get {return m_CornerDiameter;}
+			set
+			{
+				if(m_CornerDiameter!=value)
+				{
+					m_CornerDiameter=value;
+					m_Custom=true;
+					InvokeVisualPropertyChanged();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the border type.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),NotifyParentPropertyAttribute(true),Category("Style"),DefaultValue(eBorderType.None),Description("Specifies the border type.")]
+		public eBorderType Border
+		{
+			get {return m_Border;}
+			set
+			{
+				if(m_Border!=value)
+				{
+					m_Border=value;
+					m_Custom=true;
+					InvokeVisualPropertyChanged();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets dash style for single line border type.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),DefaultValue(DashStyle.Solid),NotifyParentPropertyAttribute(true),Category("Style"),Description("Indicates dash style for single line border type.")]
+		public DashStyle BorderDashStyle
+		{
+			get {return m_BorderDashStyle;}
+			set
+			{
+				m_BorderDashStyle=value;
+				InvokeVisualPropertyChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the border sides that are displayed.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),NotifyParentPropertyAttribute(true),Category("Style"),DefaultValue(DEFAULT_BORDERSIDE),Description("Specifies border sides that are displayed.")]
+		public eBorderSide BorderSide
+		{
+			get {return m_BorderSide;}
+			set
+			{
+				if(m_BorderSide!=value)
+				{
+					m_BorderSide=value;
+					m_Custom=true;
+					InvokeVisualPropertyChanged();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the border color.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),NotifyParentPropertyAttribute(true),Category("Style"),Description("Specifies the border color."),DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+		public ColorEx BorderColor
+		{
+			get {return m_BorderColor;}
+		}
+
+		[System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+		public bool ShouldSerializeBorderColor()
+		{return !m_BorderColor.IsEmpty;}
+
+		[System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+		public void ResetBorderColor()
+		{
+			m_BorderColor.ColorChanged-=new EventHandler(this.ColorChanged);
+			m_BorderColor=ColorEx.Empty;
+			m_BorderColor.ColorChanged+=new EventHandler(this.ColorChanged);
+		}
+
+		/// <summary>
+		/// Gets or sets the line tickness of single line border.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),NotifyParentPropertyAttribute(true),Category("Style"),DefaultValue(1),Description("Specifies the line tickness of single line border.")]
+		public int BorderWidth
+		{
+			get {return m_BorderWidth;}
+			set 
+			{
+				m_BorderWidth=value;
+				InvokeVisualPropertyChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the left text margin.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),NotifyParentPropertyAttribute(true),Category("Style"),DefaultValue(0),Description("Specifies left text margin.")]
+		public int MarginLeft
+		{
+			get {return m_MarginLeft;}
+			set 
+			{
+				m_MarginLeft=value;
+				InvokeVisualPropertyChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the right text margin.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),NotifyParentPropertyAttribute(true),Category("Style"),DefaultValue(0),Description("Specifies right text margin.")]
+		public int MarginRight
+		{
+			get {return m_MarginRight;}
+			set 
+			{
+				m_MarginRight=value;
+				InvokeVisualPropertyChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the top text margin.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),NotifyParentPropertyAttribute(true),Category("Style"),DefaultValue(0),Description("Specifies top text margin.")]
+		public int MarginTop
+		{
+			get {return m_MarginTop;}
+			set 
+			{
+				m_MarginTop=value;
+				InvokeVisualPropertyChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the bottom text margin.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),NotifyParentPropertyAttribute(true),Category("Style"),DefaultValue(0),Description("Specifies bottom text margin.")]
+		public int MarginBottom
+		{
+			get {return m_MarginBottom;}
+			set 
+			{
+				m_MarginBottom=value;
+				InvokeVisualPropertyChanged();
+			}
+		}
+
+		/// <summary>
+		/// Paints the style.
+		/// </summary>
+		/// <param name="g">Graphics object</param>
+		/// <param name="r">Target area</param>
+		/// <param name="text">Text</param>
+		/// <param name="textRect">Text area</param>
+		/// <param name="font">Text Font</param>
+		public void Paint(Graphics g, Rectangle r, string text, Rectangle textRect, System.Drawing.Font font)
+		{
+			this.Paint(g,r,text,textRect,font,null);
+		}
+        private void AdjustRectangleForBorder(ref Rectangle rPath)
+        {
+            if (m_Border != eBorderType.None && !m_BorderColor.IsEmpty)
+            {
+                int borderReduction = 1;
+                if (m_BorderWidth > 1)
+                    borderReduction = m_BorderWidth / 2;
+                else if (m_BorderWidth == 0)
+                    borderReduction = 0;
+                if ((m_BorderSide & eBorderSide.Top) == eBorderSide.Top)
+                {
+                    rPath.Y += borderReduction;
+                    rPath.Height -= borderReduction;
+                }
+
+                if ((m_BorderSide & eBorderSide.Bottom) == eBorderSide.Bottom)
+                {
+                    rPath.Height -= borderReduction;
+                }
+
+                if ((m_BorderSide & eBorderSide.Left) == eBorderSide.Left)
+                {
+                    rPath.X += borderReduction;
+                    rPath.Width -= borderReduction;
+                }
+
+                if ((m_BorderSide & eBorderSide.Right) == eBorderSide.Right)
+                {
+                    rPath.Width -= borderReduction;
+                }
+            }
+        }
+        /// <summary>
+		/// Paints the style
+		/// </summary>
+		/// <param name="g">Graphics object</param>
+		/// <param name="r">Target Area</param>
+		/// <param name="text">Text</param>
+		/// <param name="textRect">Text area</param>
+		/// <param name="font">Text Font</param>
+		/// <param name="borderShape">Border Type</param>
+		public void Paint(Graphics g, Rectangle r, string text, Rectangle textRect, System.Drawing.Font font, Point[] borderShape)
+		{
+			if(r.Width==0 || r.Height==0)
+				return;
+
+			Rectangle rPath=r;
+			if(g.SmoothingMode==System.Drawing.Drawing2D.SmoothingMode.AntiAlias)
+				rPath.Inflate(1,1);
+            AdjustRectangleForBorder(ref rPath);
+			GraphicsPath path=this.GetPath(rPath);
+
+			if(!m_BackColor1.IsEmpty)
+			{
+				if(!m_BackColor2.IsEmpty)
+				{
+					Color clr1=Color.FromArgb(m_BackColor1.Alpha, m_BackColor1.Color);
+					Color clr2=Color.FromArgb(m_BackColor2.Alpha, m_BackColor2.Color);;
+					// Gradient Background fill
+					Rectangle rGradient=r;
+					LinearGradientBrush brush=BarFunctions.CreateLinearGradientBrush(rGradient,clr1,clr2,m_GradientAngle,false);
+					//g.FillRectangle(brush,r);
+					g.FillPath(brush,path);
+					brush.Dispose();
+				}
+				else if(m_BackColor1.Color!=Color.Transparent)
+				{
+					Color clr=Color.FromArgb(m_BackColor1.Alpha, m_BackColor1.Color);
+					SolidBrush brush=new SolidBrush(clr);
+					//g.FillRectangle(brush,r);
+					g.FillPath(brush,path);
+					brush.Dispose();
+				}
+			}
+            path.Dispose();
+
+            Rectangle borderBounds = r; borderBounds.Width--; borderBounds.Height--; AdjustRectangleForBorder(ref borderBounds);
+            path = this.GetPath(borderBounds);
+
+			if(m_BackgroundImage!=null)
+			{
+				Region clip=g.Clip;
+                using (GraphicsPath clipBorderPath = this.GetPath(r))
+                {
+                    g.SetClip(clipBorderPath);
+                    BarFunctions.PaintBackgroundImage(g, r, m_BackgroundImage, m_BackgroundImagePosition, m_BackgroundImageAlpha);
+                }
+				g.Clip=clip;
+                if (clip != null) clip.Dispose();
+			}
+
+			// Draw Border
+			if(m_Border!=eBorderType.None && !m_BorderColor.IsEmpty)
+			{
+				if(m_CornerType!=eCornerType.Square)
+				{
+					if(m_BorderDashStyle==DashStyle.Solid)
+						g.SmoothingMode=SmoothingMode.HighQuality;
+					using(Pen pen=new Pen(m_BorderColor.GetCompositeColor(),m_BorderWidth))
+					{
+						//pen.Alignment=PenAlignment.Inset;
+						pen.DashStyle=m_BorderDashStyle;						
+						g.DrawPath(pen,path);
+					}
+					if(m_BorderDashStyle==DashStyle.Solid)
+						g.SmoothingMode=SmoothingMode.Default;
+				}
+				else if(m_Border==eBorderType.SingleLine && borderShape!=null && borderShape.Length>0)
+				{
+					using(Pen pen=new Pen(m_BorderColor.GetCompositeColor(),m_BorderWidth))
+					{
+						pen.DashStyle=m_BorderDashStyle;
+						g.DrawLines(pen,borderShape);
+					}
+				}
+				else
+				{
+					switch(m_Border)
+					{
+						case eBorderType.Bump:
+						case eBorderType.Etched:
+						case eBorderType.DoubleLine:
+						case eBorderType.SingleLine:
+							BarFunctions.DrawBorder(g,m_Border,r,(m_BorderColor.IsEmpty?SystemColors.ControlText:Color.FromArgb(m_BorderColor.Alpha,m_BorderColor.Color)),m_BorderSide,m_BorderDashStyle,m_BorderWidth);
+							break;
+						case eBorderType.Raised:
+						{
+							System.Windows.Forms.Border3DSide border3dside;
+							if(m_BorderSide==eBorderSide.All)
+								border3dside=System.Windows.Forms.Border3DSide.All;
+							else
+								border3dside=(((m_BorderSide&eBorderSide.Left)!=0)?System.Windows.Forms.Border3DSide.Left:0) |
+								(((m_BorderSide&eBorderSide.Right)!=0)?System.Windows.Forms.Border3DSide.Right:0) |
+								(((m_BorderSide&eBorderSide.Top)!=0)?System.Windows.Forms.Border3DSide.Top:0) | 
+								(((m_BorderSide&eBorderSide.Bottom)!=0)?System.Windows.Forms.Border3DSide.Bottom:0);
+                            BarFunctions.DrawBorder3D(g, r, System.Windows.Forms.Border3DStyle.RaisedInner, border3dside, (m_BorderColor.IsEmpty ? m_BackColor1.Color : Color.FromArgb(m_BorderColor.Alpha, m_BorderColor.Color)), false);
+							break;
+						}
+                        case eBorderType.RaisedInner:
+                        {
+                            using (Pen pen = new Pen(Color.White))
+                            {
+                                if ((m_BorderSide & eBorderSide.Top) == eBorderSide.Top)
+                                    g.DrawLine(pen, r.X, r.Y, r.Right, r.Y);
+                                if ((m_BorderSide & eBorderSide.Left) == eBorderSide.Left)
+                                    g.DrawLine(pen, r.X, r.Y, r.X, r.Bottom);
+                            }
+
+                            using (Pen pen = new Pen(m_BorderColor.GetCompositeColor()))
+                            {
+                                if ((m_BorderSide & eBorderSide.Right) == eBorderSide.Right)
+                                    g.DrawLine(pen, r.Right - 1, r.Y, r.Right - 1, r.Bottom);
+                                if ((m_BorderSide & eBorderSide.Bottom) == eBorderSide.Bottom)
+                                    g.DrawLine(pen, r.X, r.Bottom - 1, r.Right, r.Bottom - 1);
+                            }
+                            break;
+                        }
+						case eBorderType.Sunken:
+						{
+							System.Windows.Forms.Border3DSide border3dside;
+							if(m_BorderSide==eBorderSide.All)
+								border3dside=System.Windows.Forms.Border3DSide.All;
+							else
+								border3dside=(((m_BorderSide&eBorderSide.Left)!=0)?System.Windows.Forms.Border3DSide.Left:0) |
+								(((m_BorderSide&eBorderSide.Right)!=0)?System.Windows.Forms.Border3DSide.Right:0) |
+								(((m_BorderSide&eBorderSide.Top)!=0)?System.Windows.Forms.Border3DSide.Top:0) | 
+								(((m_BorderSide&eBorderSide.Bottom)!=0)?System.Windows.Forms.Border3DSide.Bottom:0);
+							BarFunctions.DrawBorder3D(g,r,System.Windows.Forms.Border3DStyle.SunkenOuter,border3dside,(m_BorderColor.IsEmpty?m_BackColor1.Color:Color.FromArgb(m_BorderColor.Alpha,m_BorderColor.Color)),false);
+							break;
+						}
+					}
+				}
+			}
+
+			if(text!="" && !m_ForeColor.IsEmpty)
+			{
+				if(m_Font!=null)
+					font=m_Font;
+				Color clr=Color.FromArgb(m_ForeColor.Alpha, m_ForeColor.Color);
+				
+				if(m_MarginLeft!=0)
+				{
+					textRect.X+=m_MarginLeft;
+					textRect.Width-=m_MarginLeft;
+				}
+				if(m_MarginRight!=0)
+				{
+					textRect.Width-=m_MarginRight;
+				}
+				if(m_MarginTop!=0)
+				{
+					textRect.Y+=m_MarginTop;
+					textRect.Height-=m_MarginTop;
+				}
+				if(m_MarginBottom!=0)
+					textRect.Height-=m_MarginBottom;
+
+                if (textRect.Width > 0 && textRect.Height > 0)
+                {
+                    if (m_VerticalText)
+                    {
+                        g.RotateTransform(-90);
+                        TextDrawing.DrawStringLegacy(g, text, font, clr, new Rectangle(-textRect.Bottom, textRect.X, textRect.Height, textRect.Width), this.GetTextFormat());
+                        g.ResetTransform();
+                    }
+                    else
+                        TextDrawing.DrawString(g, text, font, clr, textRect, this.GetTextFormat());
+                }
+			}
+            if (path != null) path.Dispose();
+			if(m_CornerType!=eCornerType.Square)
+				g.ResetClip();
+		}
+		/// <summary>
+		/// Paints the style
+		/// </summary>
+		/// <param name="g">Graphics object</param>
+		/// <param name="r">Target Area</param>
+		public void Paint(Graphics g, Rectangle r)
+		{
+			this.Paint(g,r,"",Rectangle.Empty,System.Windows.Forms.Control.DefaultFont);
+		}
+		/// <summary>
+		/// Paints the style text only.
+		/// </summary>
+		/// <param name="g">Graphics object</param>
+		/// <param name="text">Text</param>
+		/// <param name="textRect">Text area</param>
+		/// <param name="font">Font</param>
+		public void PaintText(Graphics g, string text, Rectangle textRect, System.Drawing.Font font)
+		{
+			if(text!="")
+			{
+				if(m_Font!=null)
+					font=m_Font;
+				Color clr=Color.FromArgb(m_ForeColor.Alpha, m_ForeColor.Color);
+
+				if(m_MarginLeft!=0)
+				{
+					textRect.X+=m_MarginLeft;
+					textRect.Width-=m_MarginLeft;
+				}
+				if(m_MarginRight!=0)
+				{
+					textRect.Width-=m_MarginRight;
+				}
+				if(m_MarginTop!=0)
+				{
+					textRect.Y+=m_MarginTop;
+					textRect.Height-=m_MarginTop;
+				}
+				if(m_MarginBottom!=0)
+					textRect.Height-=m_MarginBottom;
+
+                if (textRect.Width > 0 && textRect.Height > 0)
+                {
+                    if (m_VerticalText)
+                    {
+                        g.RotateTransform(-90);
+                        TextDrawing.DrawStringLegacy(g, text, font, clr, new Rectangle(-textRect.Bottom, textRect.X, textRect.Height, textRect.Width), this.GetTextFormat());
+                        g.ResetTransform();
+                    }
+                    else
+                        TextDrawing.DrawString(g, text, font, clr, textRect, this.GetTextFormat());
+                }
+			}
+		}
+
+		internal System.Drawing.StringFormat StringFormat
+		{
+			get
+			{
+				System.Drawing.StringFormat format=BarFunctions.CreateStringFormat(); // new System.Drawing.StringFormat(StringFormat.GenericTypographic);
+				format.Alignment=m_Alignment;
+				format.LineAlignment=m_LineAlignment;
+				if(m_WordWrap)
+					format.FormatFlags=format.FormatFlags & ~(format.FormatFlags & StringFormatFlags.NoWrap);
+				else
+					format.FormatFlags=format.FormatFlags | StringFormatFlags.NoWrap;
+				format.Trimming=m_TextTrimming;
+				format.HotkeyPrefix=System.Drawing.Text.HotkeyPrefix.Show;
+				return format;
+			}
+		}
+
+        internal eTextFormat GetTextFormat()
+        {
+            eTextFormat format = eTextFormat.Default;
+            if (m_Alignment == StringAlignment.Center)
+                format |= eTextFormat.HorizontalCenter;
+            else if (m_Alignment == StringAlignment.Far)
+                format |= eTextFormat.Right;
+            if (m_LineAlignment == StringAlignment.Center)
+                format |= eTextFormat.VerticalCenter;
+            else if (m_LineAlignment == StringAlignment.Far)
+                format |= eTextFormat.Bottom;
+            if (!m_WordWrap)
+                format |= eTextFormat.SingleLine;
+            else
+                format |= eTextFormat.WordBreak;
+            if (m_TextTrimming != StringTrimming.None)
+                format |= eTextFormat.EndEllipsis;
+            if(!_UseMnemonic)
+                format |= eTextFormat.NoPrefix;
+            return format;
+        }
+
+        private bool _UseMnemonic = true;
+        /// <summary>
+        /// Gets or sets a value indicating whether the control interprets an ampersand character (&) in the control's Text property to be an access key prefix character.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance"), Description("Indicates whether the control interprets an ampersand character (&) in the control's Text property to be an access key prefix character.")]
+        public bool UseMnemonic
+        {
+            get { return _UseMnemonic; }
+            set
+            {
+                _UseMnemonic = value;
+            }
+        }
+
+		internal ThemeTextFormat ThemeStringFormat
+		{
+			get
+			{
+				ThemeTextFormat format=ThemeTextFormat.HidePrefix;
+				switch(m_Alignment)
+				{
+					case StringAlignment.Center:
+						format=format | ThemeTextFormat.Center;
+						break;
+					case StringAlignment.Near:
+						format=format | (System.Windows.Forms.SystemInformation.RightAlignedMenus?ThemeTextFormat.Right:ThemeTextFormat.Left);
+						break;
+					case StringAlignment.Far:
+						format=format | (System.Windows.Forms.SystemInformation.RightAlignedMenus?ThemeTextFormat.Left:ThemeTextFormat.Right);
+						break;
+				}
+				switch(m_LineAlignment)
+				{
+					case StringAlignment.Center:
+						format=format | (m_WordWrap?ThemeTextFormat.Bottom:ThemeTextFormat.VCenter);
+						break;
+					case StringAlignment.Near:
+						format=format | ThemeTextFormat.Top;
+						break;
+					case StringAlignment.Far:
+						format=format | ThemeTextFormat.Bottom;
+						break;
+				}
+				if(m_WordWrap)
+					format=format | ThemeTextFormat.WordBreak;
+				else
+					format=format | ThemeTextFormat.SingleLine;
+				switch(m_TextTrimming)
+				{
+					case StringTrimming.Character:
+						format=format | ThemeTextFormat.NoFullWidthCharBreak;
+						break;
+					case StringTrimming.EllipsisCharacter:
+						format=format | ThemeTextFormat.EndEllipsis;
+						break;
+					case StringTrimming.EllipsisPath:
+						format=format | ThemeTextFormat.PathElliosis;
+						break;
+					case StringTrimming.EllipsisWord:
+						format=format | ThemeTextFormat.WordEllipsis;
+						break;
+					case StringTrimming.Word:
+						format=format | ThemeTextFormat.WordEllipsis;
+						break;
+				}
+				return format;
+			}
+		}
+		internal void Serialize(System.Xml.XmlElement styleElement)
+		{
+			if(!m_BackColor1.IsEmpty)
+			{
+				if(m_BackColor1.ColorSchemePart==eColorSchemePart.Custom)
+				{
+					styleElement.SetAttribute("bc1",BarFunctions.ColorToString(m_BackColor1.Color));
+					styleElement.SetAttribute("bc1a",m_BackColor1.Alpha.ToString());
+				}
+				else
+					styleElement.SetAttribute("bc1csp",m_BackColor1.ColorSchemePart.ToString());
+			}
+			if(!m_BackColor2.IsEmpty)
+			{
+				if(m_BackColor2.ColorSchemePart==eColorSchemePart.Custom)
+				{
+					styleElement.SetAttribute("bc2",BarFunctions.ColorToString(m_BackColor2.Color));
+					styleElement.SetAttribute("bc2a",m_BackColor2.Alpha.ToString());
+				}
+				else
+					styleElement.SetAttribute("bc2csp",m_BackColor2.ColorSchemePart.ToString());
+			}
+			if(!m_ForeColor.IsEmpty)
+			{
+				if(m_ForeColor.ColorSchemePart==eColorSchemePart.Custom)
+				{
+					styleElement.SetAttribute("fc",BarFunctions.ColorToString(m_ForeColor.Color));
+					styleElement.SetAttribute("fca",m_ForeColor.Alpha.ToString());
+				}
+				else
+					styleElement.SetAttribute("fccsp",m_ForeColor.ColorSchemePart.ToString());
+			}
+			if(!m_BorderColor.IsEmpty)
+			{
+				if(m_BorderColor.ColorSchemePart==eColorSchemePart.Custom)
+				{
+					styleElement.SetAttribute("borderc",BarFunctions.ColorToString(m_BorderColor.Color));
+					styleElement.SetAttribute("borderca",m_BorderColor.Alpha.ToString());
+				}
+				else
+					styleElement.SetAttribute("bordercsp",m_BorderColor.ColorSchemePart.ToString());
+			}
+			styleElement.SetAttribute("ga",m_GradientAngle.ToString());
+			if(m_Font!=null)
+			{
+				styleElement.SetAttribute("fontname",m_Font.Name);
+				styleElement.SetAttribute("fontemsize",System.Xml.XmlConvert.ToString(m_Font.Size));
+				styleElement.SetAttribute("fontstyle",System.Xml.XmlConvert.ToString((int)m_Font.Style));
+			}
+			if(m_BackgroundImage!=null)
+			{
+				System.Xml.XmlElement elementImage=styleElement.OwnerDocument.CreateElement("backimage");
+				styleElement.AppendChild(elementImage);
+				BarFunctions.SerializeImage(m_BackgroundImage,elementImage);
+				elementImage.SetAttribute("pos",((int)m_BackgroundImagePosition).ToString());
+				elementImage.SetAttribute("alpha",m_BackgroundImageAlpha.ToString());
+			}
+			if(m_WordWrap)
+				styleElement.SetAttribute("wordwrap",System.Xml.XmlConvert.ToString(m_WordWrap));
+			if(m_Alignment!=StringAlignment.Near)
+				styleElement.SetAttribute("align",System.Xml.XmlConvert.ToString((int)m_Alignment));
+			if(m_LineAlignment!=StringAlignment.Center)
+				styleElement.SetAttribute("valign",System.Xml.XmlConvert.ToString((int)m_LineAlignment));
+			if(m_TextTrimming!=StringTrimming.EllipsisCharacter)
+				styleElement.SetAttribute("trim",System.Xml.XmlConvert.ToString((int)m_TextTrimming));
+            if(m_Border!=eBorderType.None)
+				styleElement.SetAttribute("border",System.Xml.XmlConvert.ToString((int)m_Border));
+			if(m_BorderWidth!=1)
+				styleElement.SetAttribute("borderw",m_BorderWidth.ToString());
+
+			if(m_CornerDiameter!=DEFAULT_CORNER_DIAMETER)
+				styleElement.SetAttribute("cornerdiameter",m_CornerDiameter.ToString());
+			if(m_CornerType!=eCornerType.Square)
+				styleElement.SetAttribute("cornertype",System.Xml.XmlConvert.ToString((int)m_CornerType));
+		}
+		internal void Deserialize(System.Xml.XmlElement styleElement)
+		{
+			m_BackColor1=ColorEx.Empty;
+			if(styleElement.HasAttribute("bc1"))
+			{
+				m_BackColor1.Color=BarFunctions.ColorFromString(styleElement.GetAttribute("bc1"));
+				m_BackColor1.Alpha=System.Xml.XmlConvert.ToByte(styleElement.GetAttribute("bc1a"));
+			}
+			else if(styleElement.HasAttribute("bc1csp"))
+				m_BackColor1.ColorSchemePart=(eColorSchemePart)Enum.Parse(typeof(eColorSchemePart),styleElement.GetAttribute("bc1csp"));
+			m_BackColor2=ColorEx.Empty;
+			if(styleElement.HasAttribute("bc2"))
+			{
+				m_BackColor2.Color=BarFunctions.ColorFromString(styleElement.GetAttribute("bc2"));
+				m_BackColor2.Alpha=System.Xml.XmlConvert.ToByte(styleElement.GetAttribute("bc2a"));
+			}
+			else if(styleElement.HasAttribute("bc2csp"))
+				m_BackColor2.ColorSchemePart=(eColorSchemePart)Enum.Parse(typeof(eColorSchemePart),styleElement.GetAttribute("bc2csp"));
+			m_ForeColor=ColorEx.Empty;
+			if(styleElement.HasAttribute("fc"))
+			{
+				m_ForeColor.Color=BarFunctions.ColorFromString(styleElement.GetAttribute("fc"));
+				m_ForeColor.Alpha=System.Xml.XmlConvert.ToByte(styleElement.GetAttribute("fca"));
+			}
+			else if(styleElement.HasAttribute("fccsp"))
+				m_ForeColor.ColorSchemePart=(eColorSchemePart)Enum.Parse(typeof(eColorSchemePart),styleElement.GetAttribute("fccsp"));
+
+			m_BorderColor=ColorEx.Empty;
+			if(styleElement.HasAttribute("borderc"))
+			{
+				m_BorderColor.Color=BarFunctions.ColorFromString(styleElement.GetAttribute("borderc"));
+				m_BorderColor.Alpha=System.Xml.XmlConvert.ToByte(styleElement.GetAttribute("borderca"));
+			}
+			else if(styleElement.HasAttribute("bordercsp"))
+				m_BorderColor.ColorSchemePart=(eColorSchemePart)Enum.Parse(typeof(eColorSchemePart),styleElement.GetAttribute("bordercsp"));
+
+			m_GradientAngle=System.Xml.XmlConvert.ToInt16(styleElement.GetAttribute("ga"));
+
+			// Load font information if it exists
+			m_Font=null;
+			if(styleElement.HasAttribute("fontname"))
+			{
+				string FontName=styleElement.GetAttribute("fontname");
+				float FontSize=System.Xml.XmlConvert.ToSingle(styleElement.GetAttribute("fontemsize"));
+				System.Drawing.FontStyle FontStyle=(System.Drawing.FontStyle)System.Xml.XmlConvert.ToInt32(styleElement.GetAttribute("fontstyle"));
+				try
+				{
+					m_Font=new Font(FontName,FontSize,FontStyle);
+				}
+				catch(Exception)
+				{
+					m_Font=null;
+				}
+			}
+			// Load Image
+			m_BackgroundImage=null;
+			foreach(System.Xml.XmlElement xmlElem in styleElement.ChildNodes)
+			{
+				if(xmlElem.Name=="backimage")
+				{
+					m_BackgroundImage=BarFunctions.DeserializeImage(xmlElem);
+					m_BackgroundImagePosition=(eBackgroundImagePosition)System.Xml.XmlConvert.ToInt32(xmlElem.GetAttribute("pos"));
+					m_BackgroundImageAlpha=System.Xml.XmlConvert.ToByte(xmlElem.GetAttribute("alpha"));
+				}
+			}
+
+			m_WordWrap=false;
+			if(styleElement.HasAttribute("wordwrap"))
+				m_WordWrap=System.Xml.XmlConvert.ToBoolean(styleElement.GetAttribute("wordwrap"));
+            
+			m_Alignment=StringAlignment.Near;
+			if(styleElement.HasAttribute("align"))
+				m_Alignment=(StringAlignment)System.Xml.XmlConvert.ToInt32(styleElement.GetAttribute("align"));
+			m_LineAlignment=StringAlignment.Center;
+			if(styleElement.HasAttribute("valign"))
+				m_LineAlignment=(StringAlignment)System.Xml.XmlConvert.ToInt32(styleElement.GetAttribute("valign"));
+			m_TextTrimming=StringTrimming.EllipsisCharacter;
+			if(styleElement.HasAttribute("trim"))
+				m_TextTrimming=(StringTrimming)System.Xml.XmlConvert.ToInt32(styleElement.GetAttribute("trim"));
+
+			m_Border=eBorderType.None;
+			if(styleElement.HasAttribute("border"))
+				m_Border=(eBorderType)System.Xml.XmlConvert.ToInt32(styleElement.GetAttribute("border"));
+	
+			m_BorderWidth=1;
+            if(styleElement.HasAttribute("borderw"))
+				m_BorderWidth=System.Xml.XmlConvert.ToInt32(styleElement.GetAttribute("borderw"));
+
+			m_CornerType=eCornerType.Square;
+			if(styleElement.HasAttribute("cornertype"))
+				m_CornerType=(eCornerType)System.Xml.XmlConvert.ToInt32(styleElement.GetAttribute("cornertype"));
+			m_CornerDiameter=DEFAULT_CORNER_DIAMETER;
+			if(styleElement.HasAttribute("cornerdiameter"))
+				m_CornerDiameter=System.Xml.XmlConvert.ToInt32(styleElement.GetAttribute("cornerdiameter"));
+		}
+
+	}
+
+	/// <summary>
+	/// ColorEx object that provides the transparency setting ability.
+	/// </summary>
+	[ToolboxItem(false),TypeConverter(typeof(System.ComponentModel.ExpandableObjectConverter)),EditorBrowsable(EditorBrowsableState.Never)]
+	public class ColorEx
+	{
+		private System.Drawing.Color _Color=System.Drawing.Color.Empty;
+		private byte _Alpha=255;
+		private eColorSchemePart m_ColorSchemePart=eColorSchemePart.Custom;
+		internal bool Custom=false;
+		internal event EventHandler ColorChanged;
+		public ColorEx()
+		{
+		}
+
+		/// <summary>
+		/// Constructor with Color Initialization.
+		/// </summary>
+		/// <param name="color">Color object</param>
+		ColorEx(System.Drawing.Color color)
+		{
+			this.Color=color;
+			this.Alpha=255;
+		}
+
+		/// <summary>
+		/// Constructor with Color and Transparency Initialization.
+		/// </summary>
+		/// <param name="color">Color object</param>
+		/// <param name="opacity">Transparency</param>
+		ColorEx(System.Drawing.Color color, byte opacity)
+		{
+			this.Color=color;
+			this.Alpha=opacity;
+		}
+
+		/// <summary>
+		/// Gets or sets the Color object which does not include transparency.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),NotifyParentPropertyAttribute(true)]
+		public System.Drawing.Color Color
+		{
+			get {return _Color;}
+			set {
+				_Color=value;
+				if(_Color!=Color.Empty)
+				{
+					m_ColorSchemePart=eColorSchemePart.Custom;
+					Custom=true;
+				}
+				if(ColorChanged!=null)
+					ColorChanged(this,new EventArgs());
+			}
+		}
+		[EditorBrowsable(EditorBrowsableState.Never),Browsable(false)]
+		public bool ShouldSerializeColor()
+		{
+			return (_Color!=Color.Empty && m_ColorSchemePart==eColorSchemePart.Custom);
+		}
+		internal void SetColor(Color c)
+		{
+			_Color=c;
+		}
+
+		/// <summary>
+		/// Indicates the transparency for the color.
+		/// </summary>
+		[DefaultValue((byte)255),NotifyParentPropertyAttribute(true),Browsable(true),DevCoBrowsable(true)]
+		public byte Alpha
+		{
+			get {return _Alpha;}
+			set {
+				if(_Alpha!=value)
+				{
+					_Alpha=value;
+					Custom=true;
+				}
+				if(ColorChanged!=null)
+					ColorChanged(this,new EventArgs());
+			}
+		}
+
+		/// <summary>
+		///     Specifies that color derived from system colors which is part of DotNetBar Color Scheme object is used.
+		///     Colors derived from system colors are automatically refreshed when
+		///     system colors are changed.
+		/// </summary>
+		/// <remarks>
+		///     We recommend using this property to specify color rather than setting color directly.
+		///     Using colors that are derived from system colors improves uniform look of your application
+		///     and visual integration into user environment.
+		/// </remarks>
+		[DefaultValue(eColorSchemePart.Custom),NotifyParentPropertyAttribute(true),Browsable(true),DevCoBrowsable(true)]
+		public eColorSchemePart ColorSchemePart
+		{
+			get {return m_ColorSchemePart;}
+			set
+			{
+				m_ColorSchemePart=value;
+				if(m_ColorSchemePart!=eColorSchemePart.Custom)
+				{
+					_Color=Color.Empty;
+					Custom=true;
+				}
+				if(ColorChanged!=null)
+					ColorChanged(this,new EventArgs());
+			}
+		}
+
+		internal void SetColorSchemePart(eColorSchemePart p)
+		{
+			m_ColorSchemePart=p;
+		}
+
+		/// <summary>
+		/// Returns empty ColorEx object.
+		/// </summary>
+		public static ColorEx Empty
+		{
+			get{return new ColorEx(Color.Empty);}
+		}
+
+		/// <summary>
+		/// Indicates whether object contain any color.
+		/// </summary>
+		[Browsable(false),DevCoBrowsable(false)]
+		public bool IsEmpty
+		{
+			get
+			{
+				return (_Color==Color.Empty);
+			}
+		}
+		/// <summary>
+		/// Returns the color object with the transparency set.
+		/// </summary>
+		/// <returns>Color object</returns>
+		public Color GetCompositeColor()
+		{
+			if(_Color.IsEmpty)
+				return Color.Empty;
+			else
+				return Color.FromArgb(_Alpha,_Color);
+		}
+	}
+
+//	public class ItemStyleTypeConverter:TypeConverter 
+//	{
+//		public override bool CanConvertTo(ITypeDescriptorContext context, Type destinationType) 
+//		{
+//			if (destinationType == typeof(System.ComponentModel.Design.Serialization.InstanceDescriptor)) 
+//				return true;
+//			return base.CanConvertTo(context, destinationType);
+//		}
+//
+//		public override object ConvertTo(ITypeDescriptorContext context, System.Globalization.CultureInfo culture, object value, Type destinationType) 
+//		{
+//			// other TypeConverter operations go here...
+//			//
+//			if (destinationType == typeof(System.ComponentModel.Design.Serialization.InstanceDescriptor) && value is ItemStyle) 
+//			{
+//				System.Reflection.ConstructorInfo ctor = typeof(ItemStyle).GetConstructor(Type.EmptyTypes);
+//				if(ctor != null) 
+//				{
+//					return new System.ComponentModel.Design.Serialization.InstanceDescriptor(ctor,null);
+//				}
+//			}
+//			return base.ConvertTo(context, culture, value, destinationType);      
+//		}
+//
+////		public override object CreateInstance(ITypeDescriptorContext ctx, System.Collections.IDictionary d)
+////		{
+////			return new ItemStyle();
+////		}
+//
+//		
+////		public override bool GetCreateInstanceSupported(ITypeDescriptorContext context) 
+////		{
+////			return true;
+////		}
+//
+//		public override PropertyDescriptorCollection GetProperties(ITypeDescriptorContext context, object value, System.Attribute[] attributes) 
+//		{
+//			PropertyDescriptorCollection propDesc;
+//			string[] prop;
+//
+//			propDesc = TypeDescriptor.GetProperties(typeof(ItemStyle), attributes);
+//
+//			prop = new String[16];
+//			prop[0] = "Alignment";
+//			prop[1] = "BackColor1";
+//			prop[2] = "BackColor2";
+//			prop[3] = "BackgroundImage";
+//			prop[4] = "BackgroundImageAlpha";
+//			prop[5] = "BackgroundImagePosition";
+//			prop[6] = "Border";
+//			prop[7] = "BorderColor";
+//			prop[8] = "BorderSide";
+//			prop[9] = "BorderWidth";
+//			prop[10] = "Font";
+//			prop[11] = "ForeColor";
+//			prop[12] = "GradientAngle";
+//			prop[13] = "LineAlignment";
+//			prop[14] = "TextTrimming";
+//			prop[15] = "WordWrap";
+//			return propDesc.Sort(prop);
+//		}
+//
+//		public override bool GetPropertiesSupported(ITypeDescriptorContext context) 
+//		{
+//			return true;
+//		}
+//	}
+//
+//	public class ColorExTypeConverter:TypeConverter 
+//	{
+//		public override bool CanConvertTo(ITypeDescriptorContext context, Type destinationType) 
+//		{
+//			if (destinationType == typeof(System.ComponentModel.Design.Serialization.InstanceDescriptor)) 
+//				return true;
+//			return base.CanConvertTo(context, destinationType);
+//		}
+//
+//		public override object ConvertTo(ITypeDescriptorContext context, System.Globalization.CultureInfo culture, object value, Type destinationType) 
+//		{
+//			// other TypeConverter operations go here...
+//			//
+//			if (destinationType == typeof(System.ComponentModel.Design.Serialization.InstanceDescriptor) && value is ColorEx) 
+//			{
+//				System.Reflection.ConstructorInfo ctor = typeof(ColorEx).GetConstructor(Type.EmptyTypes);
+//				if(ctor != null) 
+//				{
+//					return new System.ComponentModel.Design.Serialization.InstanceDescriptor(ctor,null);
+//				}
+//			}
+//			return base.ConvertTo(context, culture, value, destinationType);      
+//		}
+//
+////		public override object CreateInstance(ITypeDescriptorContext ctx, System.Collections.IDictionary d)
+////		{
+////			return new ColorEx();
+////		}
+////
+////		
+////		public override bool GetCreateInstanceSupported(ITypeDescriptorContext context) 
+////		{
+////			return true;
+////		}
+//
+//		public override PropertyDescriptorCollection GetProperties(ITypeDescriptorContext context, object value, System.Attribute[] attributes) 
+//		{
+//			PropertyDescriptorCollection propDesc;
+//			string[] prop;
+//
+//			propDesc = TypeDescriptor.GetProperties(typeof(ColorEx), attributes);
+//
+//			prop = new String[2];
+//			prop[0] = "Color";
+//			prop[1] = "Alpha";
+//			return propDesc.Sort(prop);
+//		}
+//
+//		public override bool GetPropertiesSupported(ITypeDescriptorContext context) 
+//		{
+//			return true;
+//		}
+//	}
+}
diff --git a/PROMS/DotNetBar Source Code/ItemStyleMapper.cs b/PROMS/DotNetBar Source Code/ItemStyleMapper.cs
new file mode 100644
index 00000000..b9b1e35c
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/ItemStyleMapper.cs	
@@ -0,0 +1,416 @@
+using System;
+using System.Text;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+
+namespace DevComponents.DotNetBar
+{
+    [ToolboxItem(false)]
+    public class ItemStyleMapper
+    {
+        private ElementStyle m_ElementStyle=null;
+
+        private ColorExMapper m_BackColor1=null;
+        private ColorExMapper m_BackColor2=null;
+        private ColorExMapper m_ForeColor=null;
+        private ColorExMapper m_BorderColor=null;
+
+        public ItemStyleMapper(ElementStyle style)
+        {
+            m_ElementStyle=style;
+            m_BackColor1=new ColorExMapper("BackColor",style);
+            m_BackColor2=new ColorExMapper("BackColor2",style);
+            m_ForeColor=new ColorExMapper("TextColor",style);
+            m_BorderColor=new ColorExMapper("BorderColor",style);
+        }
+
+        /// <summary>
+        /// Gets or sets a background color or starting color for gradient background.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public ColorExMapper BackColor1
+        {
+            get
+            {
+                return m_BackColor1;
+            }
+        }
+        /// <summary>
+        /// Gets or sets a background color or ending color for gradient background.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public ColorExMapper BackColor2
+        {
+            get
+            {
+                return m_BackColor2;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a text color.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public ColorExMapper ForeColor
+        {
+            get
+            {
+                return m_ForeColor;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the gradient angle.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public int GradientAngle
+        {
+            get
+            {
+                return m_ElementStyle.BackColorGradientAngle;
+            }
+            set
+            {
+                TypeDescriptor.GetProperties(m_ElementStyle)["BackColorGradientAngle"].SetValue(m_ElementStyle,value);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the style Font
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public System.Drawing.Font Font
+        {
+            get
+            {
+                return m_ElementStyle.Font;
+            }
+            set
+            {
+                TypeDescriptor.GetProperties(m_ElementStyle)["Font"].SetValue(m_ElementStyle,value);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value that determines whether text is displayed in multiple lines or one long line.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool WordWrap
+        {
+            get { return m_ElementStyle.WordWrap; }
+            set
+            {
+                TypeDescriptor.GetProperties(m_ElementStyle)["WordWrap"].SetValue(m_ElementStyle,value);
+            }
+        }
+
+        /// <summary>
+        /// Specifies alignment of the text.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public StringAlignment Alignment
+        {
+            get { return (StringAlignment)m_ElementStyle.TextAlignment; }
+            set
+            {
+                TypeDescriptor.GetProperties(m_ElementStyle)["TextAlignment"].SetValue(m_ElementStyle,(eStyleTextAlignment)value);
+            }
+        }
+
+        /// <summary>
+        /// Specifies alignment of the text.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public StringAlignment LineAlignment
+        {
+            get { return (StringAlignment)m_ElementStyle.TextLineAlignment; }
+            set
+            {
+                TypeDescriptor.GetProperties(m_ElementStyle)["TextLineAlignment"].SetValue(m_ElementStyle,(eStyleTextAlignment)value);
+            }
+        }
+
+        /// <summary>
+        /// Specifies how to trim characters when text does not fit.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public StringTrimming TextTrimming
+        {
+            get { return (StringTrimming)m_ElementStyle.TextTrimming; }
+            set
+            {
+                TypeDescriptor.GetProperties(m_ElementStyle)["TextTrimming"].SetValue(m_ElementStyle,(eStyleTextTrimming)value);
+            }
+        }
+
+        /// <summary>
+        /// Specifies background image.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public Image BackgroundImage
+        {
+            get { return m_ElementStyle.BackgroundImage; }
+            set
+            {
+                TypeDescriptor.GetProperties(m_ElementStyle)["BackgroundImage"].SetValue(m_ElementStyle,value);
+            }
+        }
+
+        /// <summary>
+        /// Specifies background image position when container is larger than image.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public eBackgroundImagePosition BackgroundImagePosition
+        {
+            get { return (eBackgroundImagePosition)m_ElementStyle.BackgroundImagePosition; }
+            set
+            {
+                TypeDescriptor.GetProperties(m_ElementStyle)["BackgroundImagePosition"].SetValue(m_ElementStyle,(eStyleBackgroundImage)value);
+            }
+        }
+
+        /// <summary>
+        /// Specifies the transparency of background image.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public byte BackgroundImageAlpha
+        {
+            get { return m_ElementStyle.BackgroundImageAlpha; }
+            set
+            {
+                TypeDescriptor.GetProperties(m_ElementStyle)["BackgroundImageAlpha"].SetValue(m_ElementStyle,value);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the corner type.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public eCornerType CornerType
+        {
+            get { return m_ElementStyle.CornerType; }
+            set
+            {
+                TypeDescriptor.GetProperties(m_ElementStyle)["CornerType"].SetValue(m_ElementStyle,value);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the diameter in pixels of the corner type rounded or diagonal.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public int CornerDiameter
+        {
+            get { return m_ElementStyle.CornerDiameter; }
+            set
+            {
+                TypeDescriptor.GetProperties(m_ElementStyle)["CornerDiameter"].SetValue(m_ElementStyle,value);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the border type.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public eBorderType Border
+        {
+            get { return eBorderType.None; }
+            set
+            {
+                eStyleBorderType b=eStyleBorderType.None;
+                if(value!=eBorderType.None)
+                    b=eStyleBorderType.Solid;
+                TypeDescriptor.GetProperties(m_ElementStyle)["BorderLeft"].SetValue(m_ElementStyle,b);
+                TypeDescriptor.GetProperties(m_ElementStyle)["BorderTop"].SetValue(m_ElementStyle,b);
+                TypeDescriptor.GetProperties(m_ElementStyle)["BorderRight"].SetValue(m_ElementStyle,b);
+                TypeDescriptor.GetProperties(m_ElementStyle)["BorderBottom"].SetValue(m_ElementStyle,b);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets dash style for single line border type.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public DashStyle BorderDashStyle
+        {
+            get { return DashStyle.Solid ; }
+            set
+            {
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the border sides that are displayed.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public eBorderSide BorderSide
+        {
+            get { return eBorderSide.None; }
+            set
+            {
+                if((value & eBorderSide.Left)==eBorderSide.Left)
+                    TypeDescriptor.GetProperties(m_ElementStyle)["BorderLeft"].SetValue(m_ElementStyle,eStyleBorderType.Solid);
+                else
+                    TypeDescriptor.GetProperties(m_ElementStyle)["BorderLeft"].SetValue(m_ElementStyle,eStyleBorderType.None);
+
+                if((value & eBorderSide.Right)==eBorderSide.Right)
+                    TypeDescriptor.GetProperties(m_ElementStyle)["BorderRight"].SetValue(m_ElementStyle,eStyleBorderType.Solid);
+                else
+                    TypeDescriptor.GetProperties(m_ElementStyle)["BorderRight"].SetValue(m_ElementStyle,eStyleBorderType.None);
+
+                if((value & eBorderSide.Top)==eBorderSide.Top)
+                    TypeDescriptor.GetProperties(m_ElementStyle)["BorderTop"].SetValue(m_ElementStyle,eStyleBorderType.Solid);
+                else
+                    TypeDescriptor.GetProperties(m_ElementStyle)["BorderTop"].SetValue(m_ElementStyle,eStyleBorderType.None);
+
+                if((value & eBorderSide.Bottom)==eBorderSide.Bottom)
+                    TypeDescriptor.GetProperties(m_ElementStyle)["BorderBottom"].SetValue(m_ElementStyle,eStyleBorderType.Solid);
+                else
+                    TypeDescriptor.GetProperties(m_ElementStyle)["BorderBottom"].SetValue(m_ElementStyle,eStyleBorderType.None);
+
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the border color.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public ColorExMapper BorderColor
+        {
+            get { return m_BorderColor; }
+        }
+
+        
+
+        /// <summary>
+        /// Gets or sets the line tickness of single line border.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public int BorderWidth
+        {
+            get { return m_ElementStyle.BorderLeftWidth; }
+            set
+            {
+                TypeDescriptor.GetProperties(m_ElementStyle)["BorderLeftWidth"].SetValue(m_ElementStyle,value);
+                TypeDescriptor.GetProperties(m_ElementStyle)["BorderTopWidth"].SetValue(m_ElementStyle,value);
+                TypeDescriptor.GetProperties(m_ElementStyle)["BorderRightWidth"].SetValue(m_ElementStyle,value);
+                TypeDescriptor.GetProperties(m_ElementStyle)["BorderBottomWidth"].SetValue(m_ElementStyle,value);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the left text margin.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public int MarginLeft
+        {
+            get { return m_ElementStyle.MarginLeft; }
+            set
+            {
+                TypeDescriptor.GetProperties(m_ElementStyle)["MarginLeft"].SetValue(m_ElementStyle,value);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the right text margin.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public int MarginRight
+        {
+            get { return m_ElementStyle.MarginRight; }
+            set
+            {
+                TypeDescriptor.GetProperties(m_ElementStyle)["MarginRight"].SetValue(m_ElementStyle,value);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the top text margin.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public int MarginTop
+        {
+            get { return m_ElementStyle.MarginTop; }
+            set
+            {
+                TypeDescriptor.GetProperties(m_ElementStyle)["MarginTop"].SetValue(m_ElementStyle,value);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the bottom text margin.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public int MarginBottom
+        {
+            get { return m_ElementStyle.MarginBottom; }
+            set
+            {
+                TypeDescriptor.GetProperties(m_ElementStyle)["MarginBottom"].SetValue(m_ElementStyle,value);
+            }
+        }
+
+    }
+
+    /// <summary>
+    /// ColorEx object that provides the transparency setting ability.
+    /// </summary>
+    [ToolboxItem(false)]
+    public class ColorExMapper
+    {
+        private ElementStyle m_ElementStyle=null;
+        private string m_ColorProperty="";
+        public ColorExMapper(string colorProperty, ElementStyle style)
+        {
+            m_ColorProperty=colorProperty;
+            m_ElementStyle=style;
+        }
+
+        /// <summary>
+        /// Gets or sets the Color object which does not include transparency.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public System.Drawing.Color Color
+        {
+            get { return (Color)TypeDescriptor.GetProperties(m_ElementStyle)[m_ColorProperty].GetValue(m_ElementStyle); }
+            set
+            {
+                TypeDescriptor.GetProperties(m_ElementStyle)[m_ColorProperty].SetValue(m_ElementStyle, value);
+            }
+        }
+        
+        /// <summary>
+        /// Indicates the transparency for the color.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public byte Alpha
+        {
+            get { return ((Color)TypeDescriptor.GetProperties(m_ElementStyle)[m_ColorProperty].GetValue(m_ElementStyle)).A; }
+            set
+            {
+                TypeDescriptor.GetProperties(m_ElementStyle)[m_ColorProperty].SetValue(m_ElementStyle, Color.FromArgb(value,this.Color));
+            }
+        }
+
+        /// <summary>
+        ///     Specifies that color derived from system colors which is part of DotNetBar Color Scheme object is used.
+        ///     Colors derived from system colors are automatically refreshed when
+        ///     system colors are changed.
+        /// </summary>
+        /// <remarks>
+        ///     We recommend using this property to specify color rather than setting color directly.
+        ///     Using colors that are derived from system colors improves uniform look of your application
+        ///     and visual integration into user environment.
+        /// </remarks>
+        [Browsable(false), DevCoBrowsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public eColorSchemePart ColorSchemePart
+        {
+            get { return (eColorSchemePart)TypeDescriptor.GetProperties(m_ElementStyle)[m_ColorProperty+"SchemePart"].GetValue(m_ElementStyle); }
+            set
+            {
+                TypeDescriptor.GetProperties(m_ElementStyle)[m_ColorProperty + "SchemePart"].SetValue(m_ElementStyle, value);
+            }
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/ItemVisualGenerator.cs b/PROMS/DotNetBar Source Code/ItemVisualGenerator.cs
new file mode 100644
index 00000000..acb70f28
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/ItemVisualGenerator.cs	
@@ -0,0 +1,562 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel;
+using System.Collections;
+using System.Windows.Forms;
+using System.Reflection;
+using System.Globalization;
+using DevComponents.DotNetBar.Primitives;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Provides binding support for ItemPanel control.
+    /// </summary>
+    public class ItemVisualGenerator
+    {
+        #region Constructor
+        private IBindingSupport _Parent = null;
+
+        /// <summary>
+        /// Initializes a new instance of the ItemVisualGenerator class.
+        /// </summary>
+        /// <param name="parent"></param>
+        public ItemVisualGenerator(IBindingSupport parent)
+        {
+            _Parent = parent;
+        }
+
+        #endregion
+
+        #region Implementation
+        private object _DataSource = null;
+        /// <summary>
+        /// Gets or sets the data source for the ComboTree. Expected is an object that implements the IList or IListSource interfaces, 
+        /// such as a DataSet or an Array. The default is null.
+        /// </summary>
+        [AttributeProvider(typeof(IListSource)), Description("Indicates data source for the ComboTree."), Category("Data"), DefaultValue(null), RefreshProperties(RefreshProperties.Repaint)]
+        public object DataSource
+        {
+            get
+            {
+                return _DataSource;
+            }
+            set
+            {
+                if (((value != null) && !(value is IList)) && !(value is IListSource))
+                {
+                    throw new ArgumentException("Data type is not supported for complex data binding");
+                }
+                if (_DataSource != value)
+                {
+                    if (DesignMode)
+                        _DataSource = value;
+                    else
+                        this.SetDataConnection(value, true);
+                }
+            }
+        }
+
+        private bool DesignMode
+        {
+            get
+            {
+                if (_Parent is IComponent && ((IComponent)_Parent).Site != null)
+                    return ((IComponent)_Parent).Site.DesignMode;
+                if (_Parent is Control && ((Control)_Parent).Site != null)
+                    return ((Control)_Parent).Site.DesignMode;
+                return false;
+            }
+        }
+
+        private bool _InSetDataConnection = false;
+        private void SetDataConnection(object newDataSource, bool force)
+        {
+            bool dataSourceChanged = _DataSource != newDataSource;
+
+            if (!_InSetDataConnection)
+            {
+                try
+                {
+                    if (force || dataSourceChanged)
+                    {
+                        _InSetDataConnection = true;
+                        IList list = (this.DataManager != null) ? this.DataManager.List : null;
+                        bool isDataManagerNull = this.DataManager == null;
+                        this.UnwireDataSource();
+                        _DataSource = newDataSource;
+                        this.WireDataSource();
+                        if (_IsDataSourceInitialized && !IsCustomCollection)
+                        {
+                            CurrencyManager manager = null;
+                            if (((newDataSource != null) && (_Parent.BindingContext != null)) && (newDataSource != Convert.DBNull))
+                            {
+                                string bindingPath = "";
+                                if (_Bindings != null && _Bindings.Count > 0)
+                                    bindingPath = _Bindings[0].BindingMemberInfo.BindingPath;
+                                manager = (CurrencyManager)_Parent.BindingContext[newDataSource, bindingPath];
+                            }
+                            if (_DataManager != manager)
+                            {
+                                if (_DataManager != null)
+                                {
+                                    _DataManager.ItemChanged -= new ItemChangedEventHandler(this.DataManager_ItemChanged);
+                                    _DataManager.PositionChanged -= new EventHandler(this.DataManager_PositionChanged);
+                                }
+                                _DataManager = manager;
+                                if (_DataManager != null)
+                                {
+                                    _DataManager.ItemChanged += new ItemChangedEventHandler(this.DataManager_ItemChanged);
+                                    _DataManager.PositionChanged += new EventHandler(this.DataManager_PositionChanged);
+                                }
+                            }
+                            if (((_DataManager != null) && (dataSourceChanged)) && !ValidateDisplayMembers(_Bindings))
+                            {
+                                throw new ArgumentException("Wrong Bindings parameter", "newBindings");
+                            }
+                            if ((_DataManager != null && (dataSourceChanged || force))
+                                && (dataSourceChanged || (force && ((list != _DataManager.List) || isDataManagerNull))))
+                            {
+                                DataManager_ItemChanged(_DataManager, null);
+                            }
+                        }
+                        _Converters.Clear();
+                    }
+                }
+                finally
+                {
+                    _InSetDataConnection = false;
+                }
+            }
+        }
+
+        private bool ValidateDisplayMembers(List<BindingDef> members)
+        {
+            if (members == null || members.Count == 0) return true;
+
+            foreach (BindingDef item in members)
+            {
+                if (item.BindingMemberInfo != null && !BindingMemberInfoInDataManager(item.BindingMemberInfo))
+                    return false;
+            }
+            return true;
+        }
+        private bool BindingMemberInfoInDataManager(BindingMemberInfo bindingMemberInfo)
+        {
+            if (_DataManager != null)
+            {
+                PropertyDescriptorCollection itemProperties = _DataManager.GetItemProperties();
+                int count = itemProperties.Count;
+                for (int i = 0; i < count; i++)
+                {
+                    if (!typeof(IList).IsAssignableFrom(itemProperties[i].PropertyType) && itemProperties[i].Name.Equals(bindingMemberInfo.BindingField))
+                    {
+                        return true;
+                    }
+                }
+                for (int j = 0; j < count; j++)
+                {
+                    if (!typeof(IList).IsAssignableFrom(itemProperties[j].PropertyType) && (string.Compare(itemProperties[j].Name, bindingMemberInfo.BindingField, true, CultureInfo.CurrentCulture) == 0))
+                    {
+                        return true;
+                    }
+                }
+            }
+            return false;
+        }
+
+        private List<BindingDef> _Bindings = new List<BindingDef>();
+        public List<BindingDef> Bindings
+        {
+            get { return _Bindings; }
+            set
+            {
+                if (value != _Bindings)
+                {
+                    List<BindingDef> oldValue = _Bindings;
+                    _Bindings = value;
+                    OnBindingsChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when Bindings property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnBindingsChanged(List<BindingDef> oldValue, List<BindingDef> newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("Bindings"));
+        }
+
+        private CurrencyManager _DataManager = null;
+        internal CurrencyManager DataManager
+        {
+            get
+            {
+                return _DataManager;
+            }
+        }
+        private bool _IsDataSourceInitEventHooked = false;
+        private void UnwireDataSource()
+        {
+            if (IsCustomCollection)
+            {
+                CustomCollection<object> col = (CustomCollection<object>)_DataSource;
+                col.CollectionChanged -= CustomCollectionChanged;
+            }
+            else
+            {
+                if (_DataSource is IComponent)
+                {
+                    ((IComponent) _DataSource).Disposed -= new EventHandler(DataSourceDisposed);
+                }
+                ISupportInitializeNotification dataSource = _DataSource as ISupportInitializeNotification;
+                if ((dataSource != null) && _IsDataSourceInitEventHooked)
+                {
+                    dataSource.Initialized -= new EventHandler(DataSourceInitialized);
+                    _IsDataSourceInitEventHooked = false;
+                }
+            }
+        }
+
+        private void CustomCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            _Parent.BeginUpdate();
+            try
+            {
+                if (e.Action == NotifyCollectionChangedAction.Add)
+                {
+                    int i = e.NewStartingIndex;
+                    foreach (object item in e.NewItems)
+                    {
+                        CreateVisualItem(_Parent.ItemsCollection, item, i, _Bindings);
+                        i++;
+                    }
+                }
+                else if (e.Action == NotifyCollectionChangedAction.Remove)
+                {
+                    _Parent.ItemsCollection.RemoveAt(e.OldStartingIndex);
+                    //_Parent.ItemsCollection.RemoveAt(e.NewStartingIndex);
+                }
+                else if (e.Action == NotifyCollectionChangedAction.Replace)
+                {
+                    SetItemCore(e.NewStartingIndex, e.NewItems[0]);
+                }
+                else if (e.Action == NotifyCollectionChangedAction.Reset)
+                {
+                    RefreshItems();
+                }
+            }
+            finally
+            {
+                _Parent.EndUpdate();
+            }
+        }
+        private void DataSourceDisposed(object sender, EventArgs e)
+        {
+            this.SetDataConnection(null, true);
+        }
+        private bool _IsDataSourceInitialized = false;
+        private void WireDataSource()
+        {
+            if (IsCustomCollection)
+            {
+                CustomCollection<object> col = (CustomCollection<object>) _DataSource;
+                col.CollectionChanged += CustomCollectionChanged;
+                _IsDataSourceInitialized = true;
+            }
+            else
+            {
+                if (_DataSource is IComponent)
+                {
+                    ((IComponent) _DataSource).Disposed += new EventHandler(DataSourceDisposed);
+                }
+                ISupportInitializeNotification dataSource = _DataSource as ISupportInitializeNotification;
+                if ((dataSource != null) && !dataSource.IsInitialized)
+                {
+                    dataSource.Initialized += new EventHandler(DataSourceInitialized);
+                    _IsDataSourceInitEventHooked = true;
+                    _IsDataSourceInitialized = false;
+                }
+                else
+                {
+                    _IsDataSourceInitialized = true;
+                }
+            }
+        }
+        private void DataSourceInitialized(object sender, EventArgs e)
+        {
+            this.SetDataConnection(_DataSource, true);
+        }
+
+        private void DataManager_ItemChanged(object sender, ItemChangedEventArgs e)
+        {
+            if (_Parent is Control)
+            {
+                Control parentControl = (Control)_Parent;
+                if (parentControl.InvokeRequired)
+                {
+                    parentControl.Invoke(new ItemChangedEventHandler(DataManager_ItemChanged), sender, e);
+                    return;
+                }
+            }
+            if (_DataManager != null)
+            {
+                if (e == null || e.Index == -1)
+                {
+                    this.SetItemsCore(_DataManager.List);
+                    if (_Parent.AllowSelection)
+                    {
+                        _Parent.SelectedIndex = _DataManager.Position;
+                    }
+                }
+                else
+                {
+                    this.SetItemCore(e.Index, _DataManager.List[e.Index]);
+                }
+            }
+        }
+        private void DataManager_PositionChanged(object sender, EventArgs e)
+        {
+            if ((_DataManager != null) && _Parent.AllowSelection)
+            {
+                _Parent.SelectedIndex = _DataManager.Position;
+            }
+        }
+
+        private ICloneable _VisualTemplate = null;
+        /// <summary>
+        /// Gets or sets the visual template that is generated for each data item.
+        /// </summary>
+        public ICloneable VisualTemplate
+        {
+            get { return _VisualTemplate; }
+            set
+            {
+                if (value != _VisualTemplate)
+                {
+                    ICloneable oldValue = _VisualTemplate;
+                    _VisualTemplate = value;
+                    OnVisualTemplateChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when VisualTemplate property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnVisualTemplateChanged(ICloneable oldValue, ICloneable newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("VisualTemplate"));
+        }
+
+        /// <summary>
+        /// When overridden in a derived class, sets the specified array of objects in a collection in the derived class.
+        /// </summary>
+        /// <param name="items">An array of items.</param>
+        protected virtual void SetItemsCore(IList items)
+        {
+            _Parent.BeginUpdate();
+
+            _Parent.ItemsCollection.Clear();
+
+            for (int i = 0; i < items.Count; i++)
+            {
+                object item = items[i];
+                CreateVisualItem(_Parent.ItemsCollection, item, i, _Bindings);
+            }
+
+            _Parent.EndUpdate();
+        }
+
+        /// <summary>
+        /// Creates a new item from template for the data.
+        /// </summary>
+        /// <param name="item">Data to create item for.</param>
+        /// <returns>New instance of the BaseItem.</returns>
+        private object CreateVisualItem(IList parent, object item, int itemIndex, List<BindingDef> bindings)
+        {
+            if(IsCustomCollection && item is ListBoxItem)
+            {
+                if (parent.Count <= itemIndex)
+                    parent.Add(item);
+                else
+                    parent.Insert(itemIndex, item);
+
+                if (bindings.Count == 0) return item;
+                SetVisualItemData(item, item, bindings, itemIndex);
+                return item;
+            }
+            object visualItem = _VisualTemplate.Clone();
+
+            if (parent.Count <= itemIndex)
+                parent.Add(visualItem);
+            else
+                parent.Insert(itemIndex, visualItem);
+
+            SetVisualItemData(visualItem, item, bindings, itemIndex);
+
+            DataItemVisualEventArgs eventArgs = new DataItemVisualEventArgs(visualItem, item);
+            _Parent.InvokeDataNodeCreated(eventArgs);
+
+            return eventArgs.Visual;
+        }
+
+        private void SetVisualItemData(object visualItem, object item, List<BindingDef> bindings, int bindingIndex)
+        {
+            PropertyInfo tagProperty = visualItem.GetType().GetProperty("Tag");
+            if (tagProperty != null)
+                tagProperty.SetValue(visualItem, new ItemBindingData(item, bindingIndex), null);
+
+            if (bindings.Count == 0)
+            {
+                if (visualItem is BaseItem)
+                {
+                    if (item is string)
+                        ((BaseItem)visualItem).Text = (string)item;
+                    else if (item != null)
+                        ((BaseItem)visualItem).Text = item.ToString();
+                }
+                
+            }
+            else
+            {
+                foreach (BindingDef binding in bindings)
+                {
+                    binding.Update(this, visualItem, item);
+                }
+            }
+        }
+
+        /// <summary>
+        /// When overridden in a derived class, sets the object with the specified index in the derived class.
+        /// </summary>
+        /// <param name="index">The array index of the object.</param>
+        /// <param name="value">The object.</param>
+        protected virtual void SetItemCore(int index, object value)
+        {
+            object visual = _Parent.ItemsCollection[index];
+            if (visual == null) return;
+
+            _Parent.BeginUpdate();
+            SetVisualItemData(visual, value, _Bindings, index);
+            _Parent.EndUpdate();
+        }
+
+        /// <summary>
+        /// When overridden in a derived class, resynchronizes the item data with the contents of the data source.
+        /// </summary>
+        public virtual void RefreshItems()
+        {
+            _Parent.ItemsCollection.Clear();
+
+            if (_DataManager != null)
+            {
+                SetItemsCore(_DataManager.List);
+                if (_Parent.AllowSelection)
+                {
+                    _Parent.SelectedIndex = _DataManager.Position;
+                }
+            }
+            else if (_DataSource is IList)
+                SetItemsCore((IList)_DataSource);
+        }
+
+        private Hashtable _Converters = new Hashtable();
+        internal TypeConverter GetFieldConverter(string fieldName)
+        {
+            if (_Converters.ContainsKey(fieldName))
+                return (TypeConverter)_Converters[fieldName];
+            if (_DataManager != null)
+            {
+                PropertyDescriptorCollection itemProperties = _DataManager.GetItemProperties();
+                if (itemProperties != null)
+                {
+                    PropertyDescriptor descriptor = itemProperties.Find(fieldName, true);
+                    if (descriptor != null)
+                    {
+                        _Converters.Add(fieldName, descriptor.Converter);
+                        return descriptor.Converter;
+                    }
+                }
+            }
+
+            return null;
+        }
+
+        private bool _CustomCollectionBinding = false;
+        /// <summary>
+        /// Indicates that generator should recognize when CustomCollection<T> is set as DataSource and bind to it instead of going through DataManager route.
+        /// </summary>
+        public bool CustomCollectionBinding 
+        {
+            get { return _CustomCollectionBinding; } 
+            set
+            {
+                _CustomCollectionBinding = value;
+            }
+        }
+        #endregion
+
+        public bool IsCustomCollection
+        {
+            get
+            {
+                return _CustomCollectionBinding && _DataSource is CustomCollection<object>;
+            }
+        }
+    }
+
+    public interface IBindingSupport
+    {
+        /// <summary>
+        /// Gets or sets whether selection is allowed.
+        /// </summary>
+        bool AllowSelection { get;set;}
+        /// <summary>
+        /// Gets or sets the selected item index.
+        /// </summary>
+        int SelectedIndex { get;set;}
+        /// <summary>
+        /// Gets or sets the BindingContext.
+        /// </summary>
+        BindingContext BindingContext { get;set;}
+        IList ItemsCollection { get; }
+        void BeginUpdate();
+        void EndUpdate();
+        void InvokeDataNodeCreated(DataItemVisualEventArgs e);
+    }
+
+    /// <summary>
+    /// Defines delegate for data visual creation based events.
+    /// </summary>
+    public delegate void DataItemVisualEventHandler(object sender, DataItemVisualEventArgs e);
+    /// <summary>
+    /// Defines event arguments for data visual creation based events.
+    /// </summary>
+    public class DataItemVisualEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets or sets the visual that is created for data item.
+        /// </summary>
+        public object Visual = null;
+        /// <summary>
+        /// Gets the data-item node is being created for.
+        /// </summary>
+        public readonly object DataItem = null;
+
+        /// <summary>
+        /// Initializes a new instance of the DataNodeEventArgs class.
+        /// </summary>
+        /// <param name="node"></param>
+        /// <param name="dataItem"></param>
+        public DataItemVisualEventArgs(object visual, object dataItem)
+        {
+            Visual = visual;
+            DataItem = dataItem;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Items.cs b/PROMS/DotNetBar Source Code/Items.cs
new file mode 100644
index 00000000..139dcc06
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Items.cs	
@@ -0,0 +1,219 @@
+namespace DevComponents.DotNetBar
+{
+    using System;
+	using System.Collections;
+
+    /// <summary>
+    ///		Holds reference to all unique items in the DotNetBar.
+    /// </summary>
+    public class Items:IEnumerable,IDisposable
+    {
+		private System.Collections.SortedList m_Items;
+		private DotNetBarManager m_Owner;
+
+        internal Items(DotNetBarManager objOwner)
+        {
+			m_Items=new System.Collections.SortedList();
+			m_Owner=objOwner;
+        }
+
+		public void Dispose()
+		{
+			this.Clear();
+			m_Items=null;
+			m_Owner=null;
+		}
+
+		public void Clear()
+		{
+			if(m_Owner!=null)
+			{
+				foreach(BaseItem item in m_Items.Values)
+					((IOwner)m_Owner).RemoveShortcutsFromItem(item);
+			}
+			m_Items.Clear();
+		}
+
+		public void Add(BaseItem objItem)
+		{
+			if(objItem==null)
+				throw new System.ArgumentNullException("Item must be valid value");
+			if(objItem.Name==null || objItem.Name=="")
+			{
+				// Auto assign item name
+				objItem.Name="item_"+objItem.Id.ToString();
+			}
+			if(m_Items.ContainsKey(objItem.Name))
+			{
+				throw new System.InvalidOperationException("Item with this name already exists");
+			}
+			
+			if(objItem.Parent!=null)
+				throw new System.InvalidOperationException("Item already has a Parent. Remove item from Parent first.");
+				
+			objItem.SetOwner(m_Owner);
+			objItem.GlobalItem=true;
+
+			m_Items.Add(objItem.Name,objItem);
+		}
+
+		public void AddCopy(BaseItem objItem)
+		{
+			if(objItem==null)
+				throw new System.ArgumentNullException("Item must be valid value");
+			if(objItem.Name==null || objItem.Name=="")
+			{
+				// Auto assign item name
+				objItem.Name="item_"+objItem.Id.ToString();
+			}
+			if(m_Items.ContainsKey(objItem.Name))
+				throw new System.InvalidOperationException("Item with this name already exists");
+			BaseItem objCopy=objItem.Copy();
+			objCopy.SetOwner(m_Owner);
+			objCopy.GlobalItem=true;
+			m_Items.Add(objCopy.Name,objCopy);
+		}
+
+		public void Remove(BaseItem objItemToRemove)
+		{
+			if(m_Items.ContainsKey(objItemToRemove.Name))
+			{
+				m_Items.Remove(objItemToRemove.Name);
+				objItemToRemove.SetOwner(null);
+				((IOwner)m_Owner).RemoveShortcutsFromItem(objItemToRemove);
+				//objItemToRemove.GlobalItem=false;
+				return;
+			}
+			
+			string sItemName=objItemToRemove.Name;
+			foreach(DictionaryEntry o in m_Items)
+			{
+				BaseItem objItem=o.Value as BaseItem;
+				// Name out of sync case
+				if(objItem==objItemToRemove)
+				{
+					m_Items.RemoveAt(m_Items.IndexOfValue(objItem));
+					objItemToRemove.SetOwner(null);
+					((IOwner)m_Owner).RemoveShortcutsFromItem(objItemToRemove);
+                    return;
+				}
+				if(objItem.SubItems.Count>0)
+				{
+					if(RemoveItem(sItemName,objItem))
+					{
+						//objItemToRemove.GlobalItem=false;
+						return;
+					}
+				}
+			}
+
+			// This will throw exception...
+			m_Items.Remove(objItemToRemove.Name);
+			objItemToRemove.SetOwner(null);
+		}
+
+		public void Remove(string sItemName)
+		{
+			Remove(m_Items[sItemName] as BaseItem);
+		}
+        
+		public BaseItem this[string sItemName]
+		{
+			get
+			{
+				if(m_Items.ContainsKey(sItemName))
+					return m_Items[sItemName] as BaseItem;
+				foreach(DictionaryEntry o in m_Items)
+				{
+					BaseItem objItem=o.Value as BaseItem;
+					if(objItem.Name==sItemName)
+						return objItem;
+					if(objItem.SubItems.Count>0)
+					{
+						objItem=GetItem(sItemName,objItem);
+						if(objItem!=null)
+							return objItem;
+					}
+				}
+				throw new InvalidOperationException("Item not found in collection");
+				//return null;
+			}
+		}
+
+		private BaseItem GetItem(string sName, BaseItem objParent)
+		{
+			BaseItem objItem2=null;
+			foreach(BaseItem objItem in objParent.SubItems)
+			{
+				if(objItem.Name==sName)
+					return objItem;
+				if(objItem.SubItems.Count>0)
+				{
+					objItem2=GetItem(sName,objItem);
+					if(objItem2!=null)
+						return objItem2;
+				}
+			}
+			return null;
+		}
+
+		private bool RemoveItem(string sName, BaseItem objParent)
+		{
+			foreach(BaseItem objItem in objParent.SubItems)
+			{
+				if(objItem.Name==sName)
+				{
+					objParent.SubItems.Remove(objItem);
+					objItem.SetOwner(null);
+					((IOwner)m_Owner).RemoveShortcutsFromItem(objItem);
+					return true;
+				}
+				if(objItem.SubItems.Count>0)
+				{
+					if(RemoveItem(sName,objItem))
+						return true;
+				}
+			}
+			return false;
+		}
+
+		//public BaseItem Item(string sItemName)
+		//{
+		//	return m_Items[sItemName] as BaseItem;
+		//}
+
+		public BaseItem this[int iIndex]
+		{
+			get
+			{
+				return m_Items.GetByIndex(iIndex) as BaseItem;
+			}
+		}
+
+		//public BaseItem Item(int iIndex)
+		//{
+		//	return m_Items.GetByIndex(iIndex) as BaseItem;
+		//}
+
+		public int Count
+		{
+			get
+			{
+				return m_Items.Count;
+			}
+		}
+		public IEnumerator GetEnumerator()
+		{
+			return m_Items.GetEnumerator();
+		}
+		
+		public bool Contains(BaseItem objItem)
+		{
+			return m_Items.ContainsValue(objItem);
+		}
+		public bool Contains(string sName)
+		{
+			return m_Items.ContainsKey(sName);
+		}
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/ItemsListBox.cs b/PROMS/DotNetBar Source Code/ItemsListBox.cs
new file mode 100644
index 00000000..70fdba08
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/ItemsListBox.cs	
@@ -0,0 +1,90 @@
+namespace DevComponents.DotNetBar
+{
+	using System;
+	using System.Windows.Forms;
+	using System.Collections;
+
+	/// <summary>
+	///		
+	/// </summary>
+	internal class ItemsListBox : System.Windows.Forms.ListBox
+	{
+		private ArrayList m_Items;
+		internal eDotNetBarStyle Style=eDotNetBarStyle.Office2003;
+		internal ItemsListBox()
+		{
+			this.DrawMode=DrawMode.OwnerDrawFixed;
+			m_Items=null;
+			this.IntegralHeight=false;
+			this.BackColor=System.Drawing.SystemColors.Control;
+		}
+
+		protected override void OnDrawItem(DrawItemEventArgs e)
+		{
+			base.OnDrawItem(e);
+			if(m_Items==null || e.Index<0)
+				return;
+
+			BaseItem objItem=this.Items[e.Index] as BaseItem;
+			e.DrawBackground();
+			if(objItem==null)
+			{
+				//e.DrawBackground();
+				return;
+			}
+			objItem.LeftInternal=e.Bounds.Left;
+			objItem.TopInternal=e.Bounds.Top;
+			
+			objItem.WidthInternal=e.Bounds.Width;
+
+            if ((e.State & DrawItemState.Selected) == DrawItemState.Selected)
+            {
+                objItem.InternalMouseEnter();
+                objItem.InternalMouseMove(new MouseEventArgs(MouseButtons.None, 0, objItem.LeftInternal + 2, objItem.TopInternal + 2, 0));
+            }
+			ItemPaintArgs pa=new ItemPaintArgs(null,this,e.Graphics,new ColorScheme(Style)); // TODO: ADD COLOR SCHEME
+            pa.Renderer = GetRenderer();
+			objItem.Paint(pa);
+
+			if((e.State & DrawItemState.Selected)==DrawItemState.Selected)
+				objItem.InternalMouseLeave();
+		}
+        /// <summary>
+        /// Returns the renderer control will be rendered with.
+        /// </summary>
+        /// <returns>The current renderer.</returns>
+        private Rendering.BaseRenderer GetRenderer()
+        {
+            return Rendering.GlobalManager.Renderer;
+        }
+
+		/*protected virtual void OnMeasureItem(MeasureItemEventArgs e)
+		{
+			base.OnMeasureItem(e);
+		}*/
+		internal void SetItems(ArrayList DotNetBarItems)
+		{
+			m_Items=DotNetBarItems;
+			this.Items.Clear();
+			int iMaxHeight=0;
+			foreach(BaseItem objItem in m_Items)
+			{
+				objItem.ContainerControl=this;
+				objItem.SetIsOnCustomizeDialog(true);
+				objItem.Visible=true;
+				objItem.WidthInternal=this.ClientSize.Width;
+				objItem.RecalcSize();
+				if(objItem.HeightInternal>iMaxHeight)
+					iMaxHeight=objItem.HeightInternal;
+			}
+			if(iMaxHeight==0)
+				iMaxHeight=16;
+			this.ItemHeight=iMaxHeight;
+			foreach(BaseItem objItem in m_Items)
+			{
+				objItem.HeightInternal=iMaxHeight;
+				this.Items.Add(objItem);
+			}
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/LabelItem.cs b/PROMS/DotNetBar Source Code/LabelItem.cs
new file mode 100644
index 00000000..c769930f
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/LabelItem.cs	
@@ -0,0 +1,2257 @@
+using System;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.ComponentModel;
+using DevComponents.DotNetBar.Rendering;
+using System.Windows.Forms;
+using DevComponents.UI.ContentManager;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Summary description for LabelItem.
+	/// </summary>
+    [ToolboxItem(false), DesignTimeVisible(false), DefaultEvent("Click"), Designer("DevComponents.DotNetBar.Design.SimpleBaseItemDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+    public class LabelItem : BaseItem, IBlockExtended
+    {
+        #region Private Variables
+        internal const eBorderSide DEFAULT_BORDERSIDE = eBorderSide.Top | eBorderSide.Bottom | eBorderSide.Left | eBorderSide.Right;
+        private eBorderType m_BorderType=eBorderType.None;
+		private Color m_BackColor=Color.Empty;
+		private Color m_ForeColor=Color.Empty;
+		private Color m_SingleLineColor=SystemColors.ControlDark;
+		private bool m_SingleLineColorCustom=false;
+		private System.Drawing.StringAlignment m_TextAlignment=System.Drawing.StringAlignment.Near;
+		private System.Drawing.StringAlignment m_TextLineAlignment=System.Drawing.StringAlignment.Center;
+		private System.Drawing.Font m_Font=null;
+		private bool m_DividerStyle=false;
+
+		private int m_PaddingLeft=0, m_PaddingRight=0, m_PaddingTop=0, m_PaddingBottom=0;
+		private int m_Width=0, m_Height=0;
+		private bool m_WordWrap=false;
+
+		private eImagePosition m_ImagePosition;
+		private System.Drawing.Image m_Image;
+		private System.Drawing.Image m_ImageCachedIdx=null;
+        private System.Drawing.Image m_DisabledImage = null;
+        private System.Drawing.Icon m_DisabledIcon = null;
+		System.Drawing.Icon m_Icon=null;
+		private int m_ImageIndex=-1;
+		private ItemPaintArgs _ItemPaintArgs=null;
+		//private const int ImageTextSpacing=2;
+        private eBorderSide m_BorderSide = DEFAULT_BORDERSIDE;
+        private bool m_ShowPrefix = false;
+        internal bool SuspendPaint = false;
+        #endregion
+
+        #region Events
+        /// <summary>
+        /// Occurs when text markup link is clicked. Markup links can be created using "a" tag, for example:
+        /// <a name="MyLink">Markup link</a>
+        /// </summary>
+        [Description("Occurs when text markup link is clicked. Markup links can be created using a tag.")]
+        public event MarkupLinkClickEventHandler MarkupLinkClick;
+        #endregion
+
+        #region Internal Implementation
+        private int _ImageTextSpacing = 2;
+        /// <summary>
+        /// Specifies spacing between label image and text.
+        /// </summary>
+        [DefaultValue(2), Category("Appearance"), Description("Specifies spacing between label image and text.")]
+        public int ImageTextSpacing
+        {
+            get { return _ImageTextSpacing; }
+            set
+            {
+                if (value != _ImageTextSpacing)
+                {
+                    int oldValue = _ImageTextSpacing;
+                    _ImageTextSpacing = value;
+                    OnImageTextSpacingChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when ImageTextSpacing property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnImageTextSpacingChanged(int oldValue, int newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("ImageTextSpacing"));
+            NeedRecalcSize = true;
+            this.Invalidate();
+        }
+        public LabelItem():this("","") {}
+		public LabelItem(string sName):this(sName,""){}
+		public LabelItem(string sName, string ItemText):base(sName,ItemText)
+		{
+			//this.CanCustomize=false;
+			this.IsAccessible=false;
+		}
+
+        protected override void Dispose(bool disposing)
+        {
+            if (BarUtilities.DisposeItemImages && !this.DesignMode)
+            {
+                BarUtilities.DisposeImage(ref m_Image);
+                BarUtilities.DisposeImage(ref m_ImageCachedIdx);
+                BarUtilities.DisposeImage(ref m_Icon);
+            }
+            base.Dispose(disposing);
+        }
+
+		public override BaseItem Copy()
+		{
+			LabelItem copy=new LabelItem(m_Name);
+			this.CopyToItem(copy);
+
+			return copy;
+		}
+
+        internal void InternalCopyToItem(LabelItem copy)
+        {
+            CopyToItem(copy);
+        }
+
+	    protected override void CopyToItem(BaseItem copy)
+		{
+			LabelItem objCopy=copy as LabelItem;
+			base.CopyToItem(objCopy);
+
+			objCopy.BorderType=m_BorderType;
+            objCopy.BorderSide = m_BorderSide;
+			objCopy.BackColor=m_BackColor;
+			objCopy.ForeColor=m_ForeColor;
+			if(m_SingleLineColorCustom)
+				objCopy.SingleLineColor=m_SingleLineColor;
+			objCopy.WidthInternal=this.WidthInternal;
+			objCopy.HeightInternal=this.HeightInternal;
+			objCopy.TextAlignment=this.TextAlignment;
+			objCopy.TextLineAlignment=this.TextLineAlignment;
+			objCopy.Font=m_Font;
+			objCopy.PaddingBottom=m_PaddingBottom;
+			objCopy.PaddingLeft=m_PaddingLeft;
+			objCopy.PaddingRight=m_PaddingRight;
+			objCopy.PaddingTop=m_PaddingTop;
+            if (this.Image != null)
+                objCopy.Image = (Image) this.Image.Clone();
+            objCopy.ImageIndex = this.ImageIndex;
+            objCopy.ImagePosition = this.ImagePosition;
+            objCopy.WordWrap = this.WordWrap;
+            objCopy.DividerStyle = this.DividerStyle;
+            objCopy.EnableMarkup = this.EnableMarkup;
+            objCopy.Width = this.Width;
+            objCopy.Height = this.Height;
+            objCopy.Symbol = _Symbol;
+            objCopy.SymbolSet = _SymbolSet;
+            objCopy.SymbolSize = _SymbolSize;
+            objCopy.SymbolColor = _SymbolColor;
+		}
+
+        public override void Paint(ItemPaintArgs pa)
+        {
+            if (this.SuspendLayout || !IsRendered)
+                return;
+            
+            _ItemPaintArgs = pa;
+            System.Drawing.Graphics g = pa.Graphics;
+
+            CompositeImage image = null;
+            Size imageSize = Size.Empty;
+
+            bool isSymbolImage = false;
+            if (string.IsNullOrEmpty(this.SymbolRealized))
+            {
+                image = this.GetImage();
+                if (image != null)
+                    imageSize = image.Size;
+            }
+            else
+            {
+                isSymbolImage = true;
+                Font symFont = Symbols.GetFont(this.SymbolSize, this.SymbolSet);
+                imageSize = TextDrawing.MeasureString(g, this.SymbolRealized, symFont);
+                int descent = (int)Math.Ceiling((symFont.FontFamily.GetCellDescent(symFont.Style) *
+                    symFont.Size / symFont.FontFamily.GetEmHeight(symFont.Style)));
+                imageSize.Height -= descent;
+            }
+
+            Rectangle thisRect = this.DisplayRectangle;
+            Rectangle rClip = Rectangle.Empty;
+            System.Windows.Forms.Border3DSide borderside;
+            if (m_DividerStyle)
+            {
+                borderside = System.Windows.Forms.Border3DSide.Top;
+            }
+            else
+            {
+                if (m_BorderSide == eBorderSide.All)
+                    borderside = (System.Windows.Forms.Border3DSide.Left |
+                    System.Windows.Forms.Border3DSide.Right | System.Windows.Forms.Border3DSide.Top |
+                    System.Windows.Forms.Border3DSide.Bottom);
+                else
+                    borderside = (((m_BorderSide & eBorderSide.Left) != 0) ? System.Windows.Forms.Border3DSide.Left : 0) |
+                    (((m_BorderSide & eBorderSide.Right) != 0) ? System.Windows.Forms.Border3DSide.Right : 0) |
+                    (((m_BorderSide & eBorderSide.Top) != 0) ? System.Windows.Forms.Border3DSide.Top : 0) |
+                    (((m_BorderSide & eBorderSide.Bottom) != 0) ? System.Windows.Forms.Border3DSide.Bottom : 0);
+            }
+
+            if (!(pa.ContainerControl is LabelX))
+                DisplayHelp.FillRectangle(g, this.DisplayRectangle, m_BackColor, Color.Empty);
+
+            if (m_DividerStyle)
+            {
+                System.Windows.Forms.Control ctrl = this.ContainerControl as System.Windows.Forms.Control;
+                System.Windows.Forms.RightToLeft rtl = System.Windows.Forms.RightToLeft.No;
+                if (ctrl != null && ctrl.RightToLeft == System.Windows.Forms.RightToLeft.Yes)
+                    rtl = System.Windows.Forms.RightToLeft.Yes;
+
+                bool disposeFont = false;
+                Font font = GetFont(out disposeFont);
+                Size sz = TextDrawing.MeasureString(g, m_Text, font, m_Rect.Width, this.GetStringFormat());
+                if (disposeFont) font.Dispose();
+                sz.Width += 4;
+                if (sz.Width > thisRect.Width)
+                    sz.Width = thisRect.Width;
+                rClip = new Rectangle(thisRect.X, thisRect.Y, (int)sz.Width, (int)sz.Height);
+                if (m_TextAlignment == StringAlignment.Center)
+                    rClip.Offset((thisRect.Width - (int)sz.Width) / 2, 0);
+                else if (m_TextAlignment == StringAlignment.Far && rtl == System.Windows.Forms.RightToLeft.No || m_TextAlignment == StringAlignment.Near && rtl == System.Windows.Forms.RightToLeft.Yes)
+                    rClip.Offset(thisRect.Width - rClip.Width, 0);
+                if (m_TextLineAlignment == StringAlignment.Center)
+                    rClip.Offset(0, (thisRect.Height - rClip.Height) / 2);
+                else if (m_TextLineAlignment == StringAlignment.Far && rtl == System.Windows.Forms.RightToLeft.No || m_TextLineAlignment == StringAlignment.Near && rtl == System.Windows.Forms.RightToLeft.Yes)
+                    rClip.Offset(0, thisRect.Height - rClip.Height);
+            }
+            
+            switch (m_BorderType)
+            {
+                case eBorderType.Bump:
+                    if (m_DividerStyle)
+                    {
+                        System.Windows.Forms.ControlPaint.DrawBorder3D(g, m_Rect.X, m_Rect.Y + m_Rect.Height / 2, m_Rect.Width, 2, System.Windows.Forms.Border3DStyle.Bump, borderside);
+                    }
+                    else
+                    {
+                        System.Windows.Forms.ControlPaint.DrawBorder3D(g, m_Rect, System.Windows.Forms.Border3DStyle.Bump, borderside);
+                        thisRect.Inflate(-2, -2);
+                    }
+                    break;
+                case eBorderType.Etched:
+                    if (m_DividerStyle)
+                    {
+                        System.Windows.Forms.ControlPaint.DrawBorder3D(g, m_Rect.X, m_Rect.Y + m_Rect.Height / 2, m_Rect.Width, 2, System.Windows.Forms.Border3DStyle.Etched, borderside);
+                    }
+                    else
+                    {
+                        System.Windows.Forms.ControlPaint.DrawBorder3D(g, m_Rect, System.Windows.Forms.Border3DStyle.Etched, borderside);
+                        thisRect.Inflate(-2, -2);
+                    }
+                    break;
+                case eBorderType.Raised:
+                case eBorderType.RaisedInner:
+                    if (m_DividerStyle)
+                    {
+                        System.Windows.Forms.ControlPaint.DrawBorder3D(g, m_Rect.X, m_Rect.Y + m_Rect.Height / 2, m_Rect.Width, 2, System.Windows.Forms.Border3DStyle.RaisedInner, borderside);
+                    }
+                    else
+                    {
+                        System.Windows.Forms.ControlPaint.DrawBorder3D(g, m_Rect, System.Windows.Forms.Border3DStyle.RaisedInner, borderside);
+                        thisRect.Inflate(-2, -2);
+                    }
+                    break;
+                case eBorderType.Sunken:
+                    if (m_DividerStyle)
+                    {
+                        System.Windows.Forms.ControlPaint.DrawBorder3D(g, m_Rect.X, m_Rect.Y + m_Rect.Height / 2, m_Rect.Width, 2, System.Windows.Forms.Border3DStyle.SunkenOuter, borderside);
+                    }
+                    else
+                    {
+                        System.Windows.Forms.ControlPaint.DrawBorder3D(g, m_Rect, System.Windows.Forms.Border3DStyle.SunkenOuter, borderside);
+                        thisRect.Inflate(-2, -2);
+                    }
+                    break;
+                case eBorderType.SingleLine:
+                    if (m_DividerStyle)
+                    {
+                        g.DrawLine(new Pen(GetSingleLineColor(), 1), m_Rect.X, m_Rect.Y + m_Rect.Height / 2, m_Rect.Right, m_Rect.Y + m_Rect.Height / 2);
+                    }
+                    else
+                    {
+                        BarFunctions.DrawBorder(g, eBorderType.SingleLine, m_Rect, GetSingleLineColor(), m_BorderSide, DashStyle.Solid, 1);
+                        thisRect.Inflate(-1, -1);
+                    }
+                    break;
+                case eBorderType.DoubleLine:
+                    {
+                        BarFunctions.DrawBorder(g, eBorderType.DoubleLine, m_Rect, GetSingleLineColor());
+                        thisRect.Inflate(-2, -2);
+                        break;
+                    }
+                default:
+                    break;
+            }
+
+            if (m_DividerStyle)
+                g.FillRectangle(new SolidBrush(m_BackColor), rClip);
+
+            eOrientation orientation = this.Orientation;
+            if (_TextOrientation == eOrientation.Vertical) orientation = _TextOrientation;
+
+            if (orientation == eOrientation.Horizontal)
+                thisRect.X += m_PaddingLeft;
+            else
+                thisRect.Y += m_PaddingLeft;
+
+            if (orientation == eOrientation.Horizontal)
+                thisRect.Width -= (m_PaddingLeft + m_PaddingRight);
+            else
+                thisRect.Width -= (m_PaddingTop + m_PaddingBottom);
+            thisRect.Y += m_PaddingTop;
+            if (orientation == eOrientation.Horizontal)
+                thisRect.Height -= (m_PaddingTop + m_PaddingBottom);
+            else
+                thisRect.Height -= (m_PaddingLeft + m_PaddingRight);
+
+            Color textColor = GetTextColor(pa);
+            Color symbolColor = textColor;
+            if (!this.SymbolColor.IsEmpty) symbolColor = this.SymbolColor;
+
+            if (image != null || isSymbolImage)
+            {
+                switch (m_ImagePosition)
+                {
+                    case eImagePosition.Left:
+                        {
+                            if (orientation == eOrientation.Horizontal)
+                            {
+                                if (isSymbolImage)
+                                    TextDrawing.DrawStringLegacy(g, this.SymbolRealized, Symbols.GetFont(this.SymbolSize, this.SymbolSet), symbolColor, new Rectangle(thisRect.X + ImageTextSpacing, (thisRect.Y + (thisRect.Height - imageSize.Height) / 2),0,0), eTextFormat.Default);
+                                else
+                                   image.DrawImage(g, new Rectangle(thisRect.X + ImageTextSpacing, (thisRect.Y + (thisRect.Height - imageSize.Height) / 2), imageSize.Width, imageSize.Height));
+                                thisRect.X += (imageSize.Width + ImageTextSpacing * 2);
+                                thisRect.Width -= (imageSize.Width + ImageTextSpacing * 2);
+                            }
+                            else
+                            {
+                                if (isSymbolImage)
+                                    TextDrawing.DrawStringLegacy(g, this.SymbolRealized, Symbols.GetFont(this.SymbolSize, this.SymbolSet), symbolColor, new Rectangle(thisRect.X + (thisRect.Width - imageSize.Height) / 2, thisRect.Y + ImageTextSpacing, 0, 0), eTextFormat.Default);
+                                else
+                                    image.DrawImage(g, new Rectangle(thisRect.X + (thisRect.Width - imageSize.Height) / 2, thisRect.Y + ImageTextSpacing, imageSize.Width, imageSize.Height));
+                                thisRect.Y += (imageSize.Height + ImageTextSpacing * 2);
+                                thisRect.Height -= (imageSize.Height + ImageTextSpacing * 2);
+                            }
+                            break;
+                        }
+                    case eImagePosition.Right:
+                        {
+                            if (orientation == eOrientation.Horizontal)
+                            {
+                                if (isSymbolImage)
+                                    TextDrawing.DrawStringLegacy(g, this.SymbolRealized, Symbols.GetFont(this.SymbolSize, this.SymbolSet), symbolColor, new Rectangle(thisRect.Right - imageSize.Width - ImageTextSpacing, (thisRect.Y + (thisRect.Height - imageSize.Height) / 2), 0, 0), eTextFormat.Default);
+                                else
+                                    image.DrawImage(g, new Rectangle(thisRect.Right - imageSize.Width - ImageTextSpacing, (thisRect.Y + (thisRect.Height - imageSize.Height) / 2), imageSize.Width, imageSize.Height));
+                                thisRect.Width -= (imageSize.Width + ImageTextSpacing * 2);
+                            }
+                            else
+                            {
+                                if (isSymbolImage)
+                                    TextDrawing.DrawStringLegacy(g, this.SymbolRealized, Symbols.GetFont(this.SymbolSize, this.SymbolSet), symbolColor, new Rectangle(thisRect.X, thisRect.Bottom - imageSize.Height - ImageTextSpacing, 0, 0), eTextFormat.Default);
+                                else
+                                    image.DrawImage(g, new Rectangle(thisRect.X, thisRect.Bottom - imageSize.Height - ImageTextSpacing, imageSize.Width, imageSize.Height));
+                                thisRect.Height -= (imageSize.Height + ImageTextSpacing * 2);
+                            }
+                            break;
+                        }
+                    case eImagePosition.Top:
+                        {
+                            if (orientation == eOrientation.Horizontal)
+                            {
+                                if (isSymbolImage)
+                                    TextDrawing.DrawStringLegacy(g, this.SymbolRealized, Symbols.GetFont(this.SymbolSize, this.SymbolSet), symbolColor, new Rectangle(thisRect.X + (thisRect.Width - imageSize.Width) / 2, thisRect.Y, 0, 0), eTextFormat.Default);
+                                else
+                                    image.DrawImage(g, new Rectangle(thisRect.X + (thisRect.Width - imageSize.Width) / 2, thisRect.Y, imageSize.Width, imageSize.Height));
+                                thisRect.Y += (imageSize.Height + ImageTextSpacing);
+                                thisRect.Height -= (imageSize.Height + ImageTextSpacing);
+                            }
+                            else
+                            {
+                                if (isSymbolImage)
+                                    TextDrawing.DrawStringLegacy(g, this.SymbolRealized, Symbols.GetFont(this.SymbolSize, this.SymbolSet), symbolColor, new Rectangle(thisRect.X, thisRect.Y + (thisRect.Height - imageSize.Height) / 2, 0, 0), eTextFormat.Default);
+                                else
+                                    image.DrawImage(g, new Rectangle(thisRect.X, thisRect.Y + (thisRect.Height - imageSize.Height) / 2, imageSize.Width, imageSize.Height));
+                                thisRect.X += (imageSize.Width + ImageTextSpacing);
+                                thisRect.Width -= (imageSize.Width + ImageTextSpacing);
+                            }
+                            break;
+                        }
+                    case eImagePosition.Bottom:
+                        {
+                            if (orientation == eOrientation.Horizontal)
+                            {
+                                if (isSymbolImage)
+                                    TextDrawing.DrawStringLegacy(g, this.SymbolRealized, Symbols.GetFont(this.SymbolSize, this.SymbolSet), symbolColor, new Rectangle(thisRect.X + (thisRect.Width - imageSize.Width) / 2, thisRect.Bottom - imageSize.Height, 0, 0), eTextFormat.Default);
+                                else
+                                    image.DrawImage(g, new Rectangle(thisRect.X + (thisRect.Width - imageSize.Width) / 2, thisRect.Bottom - imageSize.Height, imageSize.Width, imageSize.Height));
+                                thisRect.Height -= (imageSize.Height + ImageTextSpacing);
+                            }
+                            else
+                            {
+                                if (isSymbolImage)
+                                    TextDrawing.DrawStringLegacy(g, this.SymbolRealized, Symbols.GetFont(this.SymbolSize, this.SymbolSet), symbolColor, new Rectangle(thisRect.Right - imageSize.Width, thisRect.Y + (thisRect.Height - imageSize.Height) / 2, 0, 0), eTextFormat.Default);
+                                else
+                                    image.DrawImage(g, new Rectangle(thisRect.Right - imageSize.Width, thisRect.Y + (thisRect.Height - imageSize.Height) / 2, imageSize.Width, imageSize.Height));
+                                thisRect.Width -= (imageSize.Width + ImageTextSpacing);
+                            }
+                            break;
+                        }
+                }
+            }
+
+            if (thisRect.Height > 0 && thisRect.Width > 0)
+            {
+                if (orientation == eOrientation.Horizontal)
+                {
+                    if (m_TextAlignment == StringAlignment.Far) thisRect.Width--;
+                    if (this.TextMarkupBody != null)
+                    {
+                        bool disposeFont = false;
+                        Font font = GetFont(out disposeFont);
+                        TextMarkup.MarkupDrawContext d = new TextMarkup.MarkupDrawContext(g, font, textColor, pa.RightToLeft);
+                        d.HotKeyPrefixVisible = !((GetStringFormat() & eTextFormat.NoPrefix) == eTextFormat.NoPrefix);
+                        if (m_TextLineAlignment == StringAlignment.Near)
+                            this.TextMarkupBody.Bounds = new Rectangle(thisRect.Location, this.TextMarkupBody.Bounds.Size);
+                        else if (m_TextLineAlignment == StringAlignment.Center)
+                            this.TextMarkupBody.Bounds = new Rectangle(new Point(thisRect.X, thisRect.Y + (thisRect.Height - this.TextMarkupBody.Bounds.Height) / 2), this.TextMarkupBody.Bounds.Size);
+                        else if (m_TextLineAlignment == StringAlignment.Far)
+                            this.TextMarkupBody.Bounds = new Rectangle(new Point(thisRect.X, thisRect.Bottom - this.TextMarkupBody.Bounds.Height), this.TextMarkupBody.Bounds.Size);
+                        Region oldClip = g.Clip;
+                        Rectangle clipRect = thisRect;
+                        clipRect.Inflate(2, 2);
+                        g.SetClip(clipRect, CombineMode.Replace);
+                        this.TextMarkupBody.Render(d);
+
+                        if (disposeFont) font.Dispose();
+
+                        if (oldClip != null)
+                            g.Clip = oldClip;
+                        else
+                            g.ResetClip();
+                    }
+                    else
+                    {
+                        eTextFormat format = GetStringFormat();
+                        if (pa.RightToLeft) format |= eTextFormat.RightToLeft;
+                        bool disposeFont = false;
+                        Font font = GetFont(out disposeFont);
+                        if (pa.GlassEnabled && this.Parent is CaptionItemContainer && !(this.ContainerControl is Ribbon.QatToolbar))
+                        {
+                            if (!pa.CachedPaint)
+                                Office2007RibbonControlPainter.PaintTextOnGlass(g, m_Text, font, thisRect, TextDrawing.GetTextFormat(format), textColor, true, true, 7);
+                        }
+                        else
+                        {
+                            if ((format & eTextFormat.VerticalCenter) == eTextFormat.VerticalCenter) thisRect.Inflate(0, 2); // Height can be safely increased when vertically centered so the text is not clipped and not displayed
+                            TextDrawing.DrawString(g, m_Text, font, textColor, thisRect, format);
+                        }
+                        if(disposeFont) font.Dispose();
+                    }
+                }
+                else
+                {
+                    if(_VerticalTextTopUp)
+                        g.RotateTransform(90);
+                    else
+                        g.RotateTransform(-90);
+                    bool disposeFont = false;
+                    Font font = GetFont(out disposeFont);
+                    if (this.TextMarkupBody != null)
+                    {
+                        this.TextMarkupBody.Bounds = (_VerticalTextTopUp ? new Rectangle(thisRect.Top, -thisRect.Right, this.TextMarkupBody.Bounds.Width + 2, this.TextMarkupBody.Bounds.Height) :
+                            new Rectangle(-thisRect.Bottom, thisRect.X, thisRect.Height + 1, thisRect.Width + 1));
+                        TextMarkup.MarkupDrawContext d = new TextMarkup.MarkupDrawContext(g, font, textColor, pa.RightToLeft);
+                        d.HotKeyPrefixVisible = !((GetStringFormat() & eTextFormat.HidePrefix) == eTextFormat.HidePrefix);
+                        this.TextMarkupBody.Render(d);
+                    }
+                    else
+                    {
+                        TextDrawing.DrawStringLegacy(g, m_Text, font, textColor, (_VerticalTextTopUp ? new Rectangle(thisRect.Top, -thisRect.Right, thisRect.Height + 1, thisRect.Width + 1) :
+                            new Rectangle(-thisRect.Bottom, thisRect.X, thisRect.Height + 1, thisRect.Width + 1)), GetStringFormat());
+                    }
+                    if(disposeFont) font.Dispose();
+                    g.ResetTransform();
+                }
+            }
+
+            //if(this.DesignMode)
+            this.DrawInsertMarker(g);
+
+            if (this.DesignMode && this.Focused)
+            {
+                Rectangle r = m_Rect;
+                r.Width--;
+                r.Height--;
+                //r.Inflate(-1,-1);
+                DesignTime.DrawDesignTimeSelection(g, r, pa.Colors.ItemDesignTimeBorder);
+            }
+
+            _ItemPaintArgs = null;
+        }
+
+        private Color GetTextColor(ItemPaintArgs pa)
+        {
+            Color foreColor = m_ForeColor;
+            if(_ForeColorColorSchemePart!= eColorSchemePart.None)
+                foreColor = (Color)pa.Colors.GetType().GetProperty(_ForeColorColorSchemePart.ToString()).GetValue(pa.Colors, null);
+            return GetTextColor(pa, this.EffectiveStyle, this.Enabled && GetEnabled(pa.ContainerControl), foreColor);
+        }
+
+        internal static Color GetTextColor(ItemPaintArgs pa, eDotNetBarStyle effectiveStyle, bool isEnabled, Color defaultColor)
+        {
+            Office2007ColorTable table = null;
+            if (pa.Renderer is Rendering.Office2007Renderer)
+                table = ((Rendering.Office2007Renderer)pa.Renderer).ColorTable;
+            
+            if (defaultColor.IsEmpty && table != null)
+            {
+                if (pa.ContainerControl != null && table.LabelItemColors.Count > 0)
+                {
+                    // First lookup contextual colors
+                    LabelColors lc;
+                    if (pa.ContainerControl is Bar && ((Bar)pa.ContainerControl).BarType == eBarType.StatusBar &&
+                        table.LabelItemColors.TryGetValue(Office2007ColorTable.GetContextualKey(pa.ContainerControl.GetType(), "StatusBar"), out lc))
+                        return isEnabled ? lc.Text : lc.DisabledText;
+                    if (table.LabelItemColors.TryGetValue(Office2007ColorTable.GetContextualKey(pa.ContainerControl.GetType()), out lc))
+                        return isEnabled ? lc.Text : lc.DisabledText;
+                    if (table.LabelItemColors.TryGetValue(string.Empty, out lc))
+                        return isEnabled ? lc.Text : lc.DisabledText;
+                }
+            }
+
+            if (BarFunctions.IsOffice2007Style(effectiveStyle) && defaultColor.IsEmpty && table!=null)
+            {
+                if ((pa.IsOnMenu || pa.IsOnPopupBar) && table.ButtonItemColors.Count>0)
+                {
+                    return isEnabled ? table.ButtonItemColors[0].Default.Text : pa.Colors.ItemDisabledText;
+                }
+                else
+                {
+                    if((pa.ContainerControl is RibbonStrip /*|| pa.ContainerControl is Bar*/)&& table.RibbonTabItemColors.Count>0)
+                        return table.RibbonTabItemColors[0].Default.Text;
+                    Rendering.Office2007ButtonItemColorTable ct = table.ButtonItemColors[Enum.GetName(typeof(eButtonColor), eButtonColor.Orange)];
+                    if (ct != null && !ct.Default.Text.IsEmpty)
+                        return isEnabled ? ct.Default.Text : pa.Colors.ItemDisabledText;
+                }
+            }
+            else if (!isEnabled)
+            {
+            	return pa.Colors.ItemDisabledText;
+            }
+
+            if (defaultColor.IsEmpty) return pa.Colors.ItemText;
+
+            return defaultColor;
+        }
+
+        private Graphics CreateGraphics()
+        {
+            System.Windows.Forms.Control objCtrl = this.ContainerControl as System.Windows.Forms.Control;
+            if (!IsHandleValid(objCtrl))
+                return null;
+
+            return BarFunctions.CreateGraphics(objCtrl);
+        }
+
+        public override void RecalcSize()
+        {
+            if (this.SuspendLayout)
+                return;
+
+            if (this.TextMarkupBody != null)
+            {
+                RecalcSizeMarkup();
+            }
+            else
+            {
+                Size imageSize = Size.Empty;
+                if (string.IsNullOrEmpty(this.SymbolRealized))
+                {
+                    CompositeImage image = this.GetImage();
+                    if (image != null)
+                        imageSize = image.Size;
+                }
+
+                eOrientation orientation = this.Orientation;
+                if (_TextOrientation == eOrientation.Vertical) orientation = _TextOrientation;
+
+                if (orientation == eOrientation.Horizontal || m_Width == 0)
+                {
+                    if (m_Width == 0)
+                    {
+                        // Auto-size label
+                        Graphics g = this.CreateGraphics();
+                        if (g == null) return;
+                        try
+                        {
+                            if (!string.IsNullOrEmpty(this.SymbolRealized))
+                            {
+                                Font symFont = Symbols.GetFont(this.SymbolSize, this.SymbolSet);
+                                imageSize = TextDrawing.MeasureString(g, "\uF00A", symFont); // Need to do this to get consistent size for the symbol since they are not all the same width we pick widest
+                                //imageSize = TextDrawing.MeasureString(g, button.Symbol, symFont);
+                                int descent = (int)Math.Ceiling((symFont.FontFamily.GetCellDescent(symFont.Style) *
+                                    symFont.Size / symFont.FontFamily.GetEmHeight(symFont.Style)));
+                                imageSize.Height -= descent;
+                            }
+
+                            // Measure string
+                            Font objCurrentFont = null;
+                            bool disposeFont = false;
+                            if (m_Font != null)
+                                objCurrentFont = m_Font;
+                            else
+                                objCurrentFont = GetFont(out disposeFont);
+
+                            Size objStringSize = Size.Empty;
+                            eTextFormat objStringFormat = GetStringFormat();
+
+                            if (m_Text != "")
+                            {
+                                string text = m_Text;
+                                if (text.EndsWith(" "))
+                                    text += ".";
+                                int stringAreaWidth = 0;
+                                if (m_WordWrap && this.Stretch && this.WidthInternal > 16)
+                                    stringAreaWidth = this.WidthInternal;
+                                if (orientation == eOrientation.Vertical && !this.IsOnMenu)
+                                    objStringSize = TextDrawing.MeasureStringLegacy(g, text, objCurrentFont, new Size(stringAreaWidth, 0), objStringFormat);
+                                else
+                                    objStringSize = TextDrawing.MeasureString(g, text, objCurrentFont, stringAreaWidth, objStringFormat);
+                                objStringSize.Width += Dpi.Width2;
+                                if (objCurrentFont.Italic)
+                                    objStringSize.Width += objCurrentFont.Height / 3;
+                            }
+                            else
+                            {
+                                if (orientation == eOrientation.Vertical && !this.IsOnMenu)
+                                    objStringSize = TextDrawing.MeasureStringLegacy(g, " ", objCurrentFont, Size.Empty, objStringFormat);
+                                else
+                                    objStringSize = TextDrawing.MeasureString(g, " ", objCurrentFont, 0, objStringFormat);
+                                objStringSize.Width += 2;
+                            }
+                            if (this.Parent is CaptionItemContainer) objStringSize.Width += 2;
+                            if (m_BorderType != eBorderType.None)
+                            {
+                                objStringSize.Width += 4;
+                                objStringSize.Height += 2;
+                                if (m_BorderType != eBorderType.SingleLine)
+                                    objStringSize.Height += 2;
+
+                            }
+
+                            if (orientation == eOrientation.Horizontal)
+                            {
+                                if (this.Stretch && !(this.Parent is ItemContainer))
+                                    this.WidthInternal = 8;
+                                else
+                                    this.WidthInternal = objStringSize.Width + m_PaddingLeft + m_PaddingRight;
+                                this.HeightInternal = objStringSize.Height + m_PaddingTop + m_PaddingBottom; // +1;
+                                if (!imageSize.IsEmpty)
+                                {
+                                    if (m_ImagePosition == eImagePosition.Left || m_ImagePosition == eImagePosition.Right)
+                                    {
+                                        this.WidthInternal += imageSize.Width + ImageTextSpacing * 2;
+                                        this.HeightInternal = Math.Max(this.HeightInternal, imageSize.Height + ImageTextSpacing);
+                                    }
+                                    else
+                                    {
+                                        this.HeightInternal += imageSize.Height + ImageTextSpacing * 2;
+                                    }
+                                }
+                            }
+                            else
+                            {
+                                if (this.Stretch && !(this.Parent is ItemContainer))
+                                    this.HeightInternal = 8;
+                                else
+                                    this.HeightInternal = objStringSize.Width + m_PaddingLeft + m_PaddingRight;
+                                this.WidthInternal = objStringSize.Height + m_PaddingTop + m_PaddingBottom;
+                                if (!imageSize.IsEmpty)
+                                {
+                                    if (m_ImagePosition == eImagePosition.Left || m_ImagePosition == eImagePosition.Right)
+                                    {
+                                        this.HeightInternal += imageSize.Width + ImageTextSpacing * 2;
+                                        this.WidthInternal = Math.Max(this.WidthInternal, imageSize.Width + ImageTextSpacing);
+                                    }
+                                    else
+                                    {
+                                        this.WidthInternal += imageSize.Height + ImageTextSpacing * 2;
+                                        this.HeightInternal = Math.Max(imageSize.Height + ImageTextSpacing, this.HeightInternal);
+                                    }
+                                }
+                            }
+                            if (disposeFont)
+                            {
+                                objCurrentFont.Dispose();
+                                objCurrentFont = null;
+                            }
+                        }
+                        finally
+                        {
+                            g.TextRenderingHint = System.Drawing.Text.TextRenderingHint.SystemDefault;
+                            g.SmoothingMode = SmoothingMode.Default;
+                            g.Dispose();
+                        }
+                    }
+                    else
+                    {
+                        this.WidthInternal = Dpi.Width(m_Width);
+                        if (m_Height == 0)
+                        {
+                            // Measure string
+                            System.Drawing.Font objCurrentFont = null;
+                            bool disposeFont = false;
+                            if (m_Font != null)
+                                objCurrentFont = m_Font;
+                            else
+                                objCurrentFont = GetFont(out disposeFont);
+
+                            Graphics g = this.CreateGraphics();
+                            if (g!=null && !string.IsNullOrEmpty(this.SymbolRealized))
+                            {
+                                Font symFont = Symbols.GetFont(this.SymbolSize, this.SymbolSet);
+                                imageSize = TextDrawing.MeasureString(g, "\uF00A", symFont); // Need to do this to get consistent size for the symbol since they are not all the same width we pick widest
+                                //imageSize = TextDrawing.MeasureString(g, button.Symbol, symFont);
+                                int descent = (int)Math.Ceiling((symFont.FontFamily.GetCellDescent(symFont.Style) *
+                                    symFont.Size / symFont.FontFamily.GetEmHeight(symFont.Style)));
+                                imageSize.Height -= descent;
+                            }
+
+                            if (this.WordWrap)
+                            {
+                                if (g != null)
+                                {
+                                    int availableWidth = this.WidthInternal - (m_PaddingLeft + m_PaddingRight);
+                                    if (!imageSize.IsEmpty && orientation == eOrientation.Horizontal && (m_ImagePosition == eImagePosition.Left || m_ImagePosition == eImagePosition.Right))
+                                        availableWidth -= imageSize.Width + 4;
+                                    Size textSize = TextDrawing.MeasureString(g, this.Text, objCurrentFont, availableWidth);
+                                    this.HeightInternal = textSize.Height + 2;
+                                }
+                                else
+                                    this.HeightInternal = (int)Math.Ceiling(objCurrentFont.GetHeight());
+                            }
+                            else
+                                this.HeightInternal = (int)Math.Ceiling(objCurrentFont.GetHeight());
+                            if (g != null)
+                            {
+                                g.Dispose();
+                                g = null;
+                            }
+
+                            this.HeightInternal += m_PaddingTop + m_PaddingBottom + (this.IsRightToLeft ? 2 : 0);
+
+                            if (m_BorderType != eBorderType.None)
+                            {
+                                this.HeightInternal += 2;
+                                if (m_BorderType != eBorderType.SingleLine)
+                                    this.HeightInternal += 2;
+                            }
+
+                            if (!imageSize.IsEmpty)
+                            {
+                                if (orientation == eOrientation.Horizontal)
+                                {
+                                    if (m_ImagePosition == eImagePosition.Left || m_ImagePosition == eImagePosition.Right)
+                                        this.HeightInternal = Math.Max(this.HeightInternal, imageSize.Height/*+2*/);
+                                    else
+                                        this.HeightInternal += imageSize.Height + 4;
+                                }
+                                else
+                                {
+                                    if (m_ImagePosition == eImagePosition.Left || m_ImagePosition == eImagePosition.Right)
+                                        this.WidthInternal = Math.Max(this.HeightInternal, imageSize.Height + 2);
+                                    else
+                                        this.WidthInternal += imageSize.Height + 4;
+                                }
+                            }
+                            if (disposeFont)
+                            {
+                                objCurrentFont.Dispose();
+                                objCurrentFont = null;
+                            }
+                        }
+                        else
+                            this.HeightInternal = Dpi.Height(m_Height);
+                    }
+                }
+                else
+                {
+                    this.WidthInternal = Dpi.Width(m_Width);
+                    this.HeightInternal = Dpi.Height(m_Height);
+                }
+            }
+            
+            base.RecalcSize();
+        }
+
+        #region Markup Implementation
+        protected override void OnExternalSizeChange()
+        {
+            if (this.TextMarkupBody != null)
+            {
+                if(_TextOrientation == eOrientation.Horizontal)
+                    ArrangeMarkup(this.WidthInternal);
+                else
+                    ArrangeMarkup(this.HeightInternal + 1);
+            }
+            base.OnExternalSizeChange();
+        }
+
+        private void ArrangeMarkup(int specifiedWidth)
+        {
+            System.Windows.Forms.Control objCtrl = this.ContainerControl as System.Windows.Forms.Control;
+            if (!IsHandleValid(objCtrl))
+                return;
+            using (Graphics g = BarFunctions.CreateGraphics(objCtrl))
+            {
+                Font objCurrentFont = null;
+                bool disposeFont = false;
+                if (m_Font != null)
+                    objCurrentFont = m_Font;
+                else
+                    objCurrentFont = GetFont(out disposeFont);
+
+                CompositeImage image = this.GetImage();
+
+                Size availableSize = GetMarkupAvailableSize(g, specifiedWidth);
+
+                TextMarkup.MarkupDrawContext d = new DevComponents.DotNetBar.TextMarkup.MarkupDrawContext(g, objCurrentFont, this.ForeColor, false);
+                d.HotKeyPrefixVisible = !((GetStringFormat() & eTextFormat.HidePrefix) == eTextFormat.HidePrefix);
+                TextMarkupBody.Measure(availableSize, d);
+                d.RightToLeft = (objCtrl.RightToLeft == System.Windows.Forms.RightToLeft.Yes);
+
+                if (specifiedWidth == 0 && m_Width == 0)
+                    availableSize = TextMarkupBody.Bounds.Size;
+
+                TextMarkupBody.Arrange(new Rectangle(Point.Empty, availableSize), d);
+
+                if(disposeFont) objCurrentFont.Dispose();
+            }
+        }
+
+        private Size GetMarkupAvailableSize(Graphics g, int specifiedWidth)
+        {
+            Size availableSize = new Size((specifiedWidth==0?Dpi.Width(m_Width):specifiedWidth), 1);
+            if(_TextOrientation == eOrientation.Vertical)
+                availableSize = new Size((specifiedWidth == 0 ? Dpi.Height(m_Height): specifiedWidth), 1);
+
+            Size imageSize = Size.Empty;
+
+            if (!string.IsNullOrEmpty(_Symbol))
+                imageSize = GetSymbolSize(g);
+            else
+            {
+                CompositeImage image = this.GetImage();
+                if (image != null) imageSize = image.Size;
+            }
+
+            if (availableSize.Width == 0)
+                availableSize.Width = 1600;
+            else
+            {
+                availableSize.Width -= (m_PaddingLeft + m_PaddingRight);
+                if (!imageSize.IsEmpty && (m_ImagePosition == eImagePosition.Left || m_ImagePosition == eImagePosition.Right))
+                    availableSize.Width -= (imageSize.Width + ImageTextSpacing * 2);
+                if (m_BorderType != eBorderType.None)
+                    availableSize.Width -= 4;
+            }
+            return availableSize;
+        }
+
+        private void RecalcSizeMarkup()
+        {
+            RecalcSizeMarkup(0);
+        }
+
+        private Size GetSymbolSize(Graphics g)
+        {
+            Size symbolSize = Size.Empty;
+            if (g == null || string.IsNullOrEmpty(_Symbol)) return symbolSize;
+            Font symFont = Symbols.GetFont(this.SymbolSize, this.SymbolSet);
+            symbolSize = TextDrawing.MeasureString(g, "\uF00A", symFont); // Need to do this to get consistent size for the symbol since they are not all the same width we pick widest
+            int descent = (int)Math.Ceiling((symFont.FontFamily.GetCellDescent(symFont.Style) *
+                symFont.Size / symFont.FontFamily.GetEmHeight(symFont.Style)));
+            symbolSize.Height -= descent;
+            return symbolSize;
+        }
+        internal void RecalcSizeMarkup(int proposedWidth)
+        {
+            eOrientation orientation = this.Orientation;
+            if (_TextOrientation == eOrientation.Vertical) orientation = _TextOrientation;
+
+            ArrangeMarkup(proposedWidth);
+
+            int width = TextMarkupBody.Bounds.Width;
+            int height = TextMarkupBody.Bounds.Height;
+
+            if (m_BorderType != eBorderType.None)
+            {
+                width += 4;
+                height += 4;
+            }
+
+            Size imageSize = Size.Empty;
+
+            //if (m_Width != 0)
+            {
+                if (!string.IsNullOrEmpty(this.SymbolRealized))
+                {
+                    using (Graphics g = this.CreateGraphics())
+                    {
+                        imageSize = GetSymbolSize(g);
+                    }
+                }
+                else
+                {
+                    CompositeImage image = this.GetImage();
+                    if (image != null)
+                        imageSize = image.Size;
+                }
+            }
+
+            if (!imageSize.IsEmpty)
+            {
+                if (m_Width == 0)
+                {
+                    if (m_ImagePosition == eImagePosition.Left || m_ImagePosition == eImagePosition.Right)
+                    {
+                        width += (imageSize.Width + ImageTextSpacing * 2);
+                        height = Math.Max(height, imageSize.Height + ImageTextSpacing);
+                    }
+                    else
+                    {
+                        height += (imageSize.Height + ImageTextSpacing * 2);
+                        width = Math.Max(width, imageSize.Width + ImageTextSpacing);
+                    }
+                }
+            }
+
+            if(m_Width==0)
+            {
+                width+=(m_PaddingLeft + m_PaddingRight);
+                height+=(m_PaddingTop + m_PaddingBottom);
+
+                if (this.Stretch && !(this.Parent is ItemContainer))
+                    width = 8;
+            }
+
+            if (orientation == eOrientation.Vertical)
+            {
+                width += 2;
+                int old = width;
+                width = height;
+                height = old;
+            }
+
+            if (m_Width == 0)
+            {
+                m_Rect.Width = width;
+            }
+            else
+                m_Rect.Width = Dpi.Width(m_Width);
+            if (m_Height == 0)
+                m_Rect.Height = height;
+            else
+                m_Rect.Height = Dpi.Height(m_Height);
+        }
+
+        /// <summary>
+        /// Gets whether item supports text markup. Default is false.
+        /// </summary>
+        protected override bool IsMarkupSupported
+        {
+            get { return _EnableMarkup; }
+        }
+
+        private bool _EnableMarkup = true;
+        /// <summary>
+        /// Gets or sets whether text-markup support is enabled for items Text property. Default value is true.
+        /// Set this property to false to display HTML or other markup in the item instead of it being parsed as text-markup.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance"), Description("Indicates whether text-markup support is enabled for items Text property.")]
+        public bool EnableMarkup
+        {
+            get { return _EnableMarkup; }
+            set
+            {
+                if (_EnableMarkup != value)
+                {
+                    _EnableMarkup = value;
+                    NeedRecalcSize = true;
+                    OnTextChanged();
+                }
+            }
+        }
+        #endregion
+
+		/// <summary>
+		/// Gets or sets the type of the border drawn around the label.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DefaultValue(eBorderType.None),System.ComponentModel.Category("Appearance"),System.ComponentModel.Description("Indicates the type of the border drawn around the label.")]
+		public eBorderType BorderType
+		{
+			get
+			{
+				return m_BorderType;
+			}
+			set
+			{
+				if(m_BorderType==value)
+					return;
+				m_BorderType=value;
+				this.Refresh();
+				OnAppearanceChanged();
+			}
+		}
+
+        /// <summary>
+        /// Gets or sets the border sides that are displayed. Default value specifies border on all 4 sides.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Category("Appearance"), DefaultValue(DEFAULT_BORDERSIDE), Description("Specifies border sides that are displayed.")]
+        public eBorderSide BorderSide
+        {
+            get { return m_BorderSide; }
+            set
+            {
+                if (m_BorderSide != value)
+                {
+                    m_BorderSide = value;
+                    this.Refresh();
+                }
+            }
+        }
+
+		/// <summary>
+		/// Gets or sets the background color of the label.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Appearance"),System.ComponentModel.Description("Determines the background color of the label.")]
+		public Color BackColor
+		{
+			get
+			{
+				return m_BackColor;
+			}
+			set
+			{
+				if(m_BackColor==value)
+					return;
+				m_BackColor=value;
+				this.Refresh();
+				OnAppearanceChanged();
+			}
+		}
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeBackColor()
+        {
+            return !m_BackColor.IsEmpty;
+        }
+
+        private eColorSchemePart _ForeColorColorSchemePart = eColorSchemePart.None;
+        internal eColorSchemePart ForeColorColorSchemePart
+        {
+            get
+            {
+                return _ForeColorColorSchemePart;
+            }
+            set
+            {
+                _ForeColorColorSchemePart = value;
+            }
+        }
+		/// <summary>
+		/// Gets or sets the text color.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Appearance"),System.ComponentModel.Description("Indicates text color.")]
+		public Color ForeColor
+		{
+			get
+			{
+				return m_ForeColor;
+			}
+			set
+			{
+				if(m_ForeColor==value)
+					return;
+				m_ForeColor=value;
+				this.Refresh();
+				OnAppearanceChanged();
+			}
+		}
+        /// <summary>
+        /// Reset property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetForeColor()
+        {
+            this.ForeColor = Color.Empty;
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeForeColor()
+        {
+            return !m_ForeColor.IsEmpty;
+        }
+
+		/// <summary>
+		/// Gets or sets the border line color when border is single line.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Appearance"),System.ComponentModel.Description("Indicates border line color when border is single line.")]
+		public Color SingleLineColor
+		{
+			get
+			{
+				return m_SingleLineColor;
+			}
+			set
+			{
+				if(m_SingleLineColor==value)
+					return;
+				m_SingleLineColor=value;
+                if (m_SingleLineColor != SystemColors.ControlDark)
+                    m_SingleLineColorCustom = true;
+                else
+                    m_SingleLineColorCustom = false;
+				this.Refresh();
+				OnAppearanceChanged();
+			}
+		}
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeSingleLineColor()
+        {
+            return (m_SingleLineColor != SystemColors.ControlDark);
+        }
+
+        /// <summary>
+        /// Resets the SingleLineColor property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetSingleLineColor()
+        {
+            SingleLineColor = SystemColors.ControlDark;
+        }
+
+        private Color GetSingleLineColor()
+        {
+            if (m_SingleLineColorCustom)
+                return m_SingleLineColor;
+            Color c = m_SingleLineColor;
+
+            eDotNetBarStyle effectiveStyle = EffectiveStyle;
+            if (effectiveStyle == eDotNetBarStyle.Office2003 || effectiveStyle == eDotNetBarStyle.VS2005 || BarFunctions.IsOffice2007Style(this.EffectiveStyle))
+            {
+                if (BarFunctions.IsOffice2007Style(effectiveStyle))
+                {
+                    if (this.ContainerControl is IRenderingSupport)
+                    {
+                        Office2007Renderer renderer = ((IRenderingSupport)this.ContainerControl).GetRenderer() as Office2007Renderer;
+                        if (renderer == null)
+                            renderer = GlobalManager.Renderer as Office2007Renderer;
+                        if (renderer != null)
+                            c = renderer.ColorTable.Bar.ToolbarBottomBorder;
+                    }
+                }
+                else
+                {
+                    ColorScheme scheme = null;
+                    if (this.ContainerControl is Bar)
+                        scheme = ((Bar)this.ContainerControl).ColorScheme;
+                    else if (this.ContainerControl is MenuPanel)
+                        scheme = ((MenuPanel)this.ContainerControl).ColorScheme;
+                    else
+                        scheme = new ColorScheme(this.EffectiveStyle);
+                    if (scheme != null)
+                        m_SingleLineColor = scheme.BarDockedBorder;
+                    else
+                        m_SingleLineColor = SystemColors.ControlDark;
+                }
+            }
+
+            return c;
+        }
+
+		/// <summary>
+        /// Gets or sets the horizontal text alignment.
+		/// </summary>
+        [Browsable(true), DefaultValue(System.Drawing.StringAlignment.Near), DevCoBrowsable(true), Category("Layout"), Description("Indicates text alignment.")]
+		public System.Drawing.StringAlignment TextAlignment
+		{
+			get
+			{
+				return m_TextAlignment;
+			}
+			set
+			{
+				if(m_TextAlignment==value)
+					return;
+				m_TextAlignment=value;
+				this.Refresh();
+				OnAppearanceChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the text vertical alignment.
+		/// </summary>
+		[Browsable(true),DefaultValue(System.Drawing.StringAlignment.Center),DevCoBrowsable(true),Category("Layout"),Description("Indicates text line alignment.")]
+		public System.Drawing.StringAlignment TextLineAlignment
+		{
+			get
+			{
+				return m_TextLineAlignment;
+			}
+			set
+			{
+				if(m_TextLineAlignment==value)
+					return;
+				m_TextLineAlignment=value;
+				this.Refresh();
+				OnAppearanceChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the label font.
+		/// </summary>
+		[Browsable(true),DefaultValue(null), DevCoBrowsable(true),Category("Appearance"),Description("Indicates label font.")]
+		public System.Drawing.Font Font
+		{
+			get
+			{
+				return m_Font;
+			}
+			set
+			{
+				if(m_Font!=value)
+				{
+					m_Font=value;
+					this.Refresh();
+				}
+				OnAppearanceChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the left padding in pixels.
+		/// </summary>
+        [System.ComponentModel.Browsable(true), DefaultValue(0), DevCoBrowsable(true), System.ComponentModel.Category("Layout"), System.ComponentModel.Description("Indicates left padding in pixels.")]
+		public int PaddingLeft
+		{
+			get
+			{
+				return m_PaddingLeft;
+			}
+			set
+			{
+				if(m_PaddingLeft==value)
+					return;
+				m_PaddingLeft=value;
+				NeedRecalcSize=true;
+				this.Refresh();
+				OnAppearanceChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the right padding in pixels.
+		/// </summary>
+        [System.ComponentModel.Browsable(true), DefaultValue(0), DevCoBrowsable(true), System.ComponentModel.Category("Layout"), System.ComponentModel.Description("Indicates right padding in pixels.")]
+		public int PaddingRight
+		{
+			get
+			{
+				return m_PaddingRight;
+			}
+			set
+			{
+				if(m_PaddingRight==value)
+					return;
+				m_PaddingRight=value;
+				NeedRecalcSize=true;
+				this.Refresh();
+				OnAppearanceChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the top padding in pixels.
+		/// </summary>
+        [System.ComponentModel.Browsable(true), DefaultValue(0), DevCoBrowsable(true), System.ComponentModel.Category("Layout"), System.ComponentModel.Description("Indicates top padding in pixels.")]
+		public int PaddingTop
+		{
+			get
+			{
+				return m_PaddingTop;
+			}
+			set
+			{
+				if(m_PaddingTop==value)
+					return;
+				m_PaddingTop=value;
+				NeedRecalcSize=true;
+				this.Refresh();
+				OnAppearanceChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the bottom padding in pixels.
+		/// </summary>
+		[Browsable(true),DefaultValue(0),DevCoBrowsable(true),Category("Layout"),Description("Indicates bottom padding in pixels.")]
+		public int PaddingBottom
+		{
+			get
+			{
+				return m_PaddingBottom;
+			}
+			set
+			{
+				if(m_PaddingBottom==value)
+					return;
+				m_PaddingBottom=value;
+				NeedRecalcSize=true;
+				this.Refresh();
+				OnAppearanceChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the width of the label in pixels.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DevCoBrowsable(true),System.ComponentModel.DefaultValue(0),System.ComponentModel.Category("Layout"),System.ComponentModel.Description("Indicates the width of the label in pixels.")]
+		public int Width
+		{
+			get
+			{
+				return m_Width;
+			}
+			set
+			{
+				if(m_Width==value)
+					return;
+				m_Width=value;
+				NeedRecalcSize=true;
+                if (!SuspendPaint)
+                {
+                    this.Refresh();
+                    OnAppearanceChanged();
+                }
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the height of the label.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DevCoBrowsable(true),System.ComponentModel.DefaultValue(0),System.ComponentModel.Category("Layout"),System.ComponentModel.Description("Indicates height of the label in pixels.")]
+		public int Height
+		{
+			get
+			{
+				return m_Height;
+			}
+			set
+			{
+				if(m_Height==value)
+					return;
+				m_Height=value;
+				NeedRecalcSize=true;
+                if (!SuspendPaint)
+                {
+                    this.Refresh();
+                    OnAppearanceChanged();
+                }
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets whether the label is drawn as a divider label.
+		/// </summary>
+		[Browsable(true),DefaultValue(false),DevCoBrowsable(true),Category("Appearance"),Description("Indicates whether label has divider style.")]
+		public bool DividerStyle
+		{
+			get
+			{
+				return m_DividerStyle;
+			}
+			set
+			{
+				if(m_DividerStyle==value)
+					return;
+				m_DividerStyle=value;
+				this.Refresh();
+				OnAppearanceChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets a value that determines whether text is displayed in multiple lines or one long line.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Style"),System.ComponentModel.DefaultValue(false),System.ComponentModel.Description("Gets or sets a value that determines whether text is displayed in multiple lines or one long line.")]
+		public bool WordWrap
+		{
+			get {return m_WordWrap;}
+			set
+			{
+                if (m_WordWrap != value)
+                {
+                    m_WordWrap = value;
+                    m_NeedRecalcSize = true;
+                }
+				OnAppearanceChanged();
+			}
+		}
+
+	    private bool _FontBold = false;
+        /// <summary>
+        /// Indicates whether label text is rendered using bold font unless the Font property is specifically set to different font.
+        /// </summary>
+        [DefaultValue(false), Category("Appearance"), Description("Indicates whether label text is rendered using bold font unless the Font property is specifically set to different font.")]
+	    public bool FontBold
+	    {
+	        get { return _FontBold; }
+	        set
+	        {
+	            if (_FontBold != value)
+	            {
+	                bool oldValue = _FontBold;
+	                _FontBold = value;
+	                OnFontBoldChanged(value, oldValue);
+	            }
+	        }
+	    }
+
+	    protected virtual void OnFontBoldChanged(bool newValue, bool oldValue)
+	    {
+	        NeedRecalcSize = true;
+            OnAppearanceChanged();
+	    }
+		protected virtual Font GetFont(out bool disposeFont)
+		{
+		    disposeFont = false;
+			if(m_Font!=null)
+				return m_Font;
+		    Font font = null;
+			System.Windows.Forms.Control objCtrl=this.ContainerControl as System.Windows.Forms.Control;
+			if(objCtrl!=null)
+				font = (Font)objCtrl.Font;
+            else
+                font = SystemFonts.DefaultFont; // (Font)System.Windows.Forms.SystemInformation.MenuFont;
+		    if (font != null && _FontBold)
+		    {
+		        font = new Font(font, FontStyle.Bold);
+		        disposeFont = true;
+		    }
+		    return font;
+		}
+
+        internal bool ShowPrefix
+        {
+            get { return m_ShowPrefix; }
+            set { m_ShowPrefix = value; }
+        }
+
+		private eTextFormat GetStringFormat()
+        {
+            eTextFormat format = eTextFormat.Default | eTextFormat.ExpandTabs | eTextFormat.EndEllipsis;
+            if (!m_ShowPrefix)
+                format |= eTextFormat.NoPrefix;
+
+            if (!m_WordWrap)
+                format |= eTextFormat.SingleLine;
+            else
+                format |= eTextFormat.WordBreak;
+            if (m_TextAlignment == StringAlignment.Center)
+                format |= eTextFormat.HorizontalCenter;
+            else if (m_TextAlignment == StringAlignment.Far)
+                format |= eTextFormat.Right;
+            if (m_TextLineAlignment == StringAlignment.Center)
+                format |= eTextFormat.VerticalCenter;
+            else if (m_TextLineAlignment == StringAlignment.Far)
+                format |= eTextFormat.Bottom;
+            if (this.IsRightToLeft)
+                format |= eTextFormat.RightToLeft;
+            
+            return format;
+		}
+
+		protected internal override void Serialize(ItemSerializationContext context)
+		{
+			base.Serialize(context);
+            System.Xml.XmlElement ThisItem = context.ItemXmlElement;
+			ThisItem.SetAttribute("bt",System.Xml.XmlConvert.ToString(((int)m_BorderType)));
+            if(m_BorderSide!=DEFAULT_BORDERSIDE)
+                ThisItem.SetAttribute("BorderSide", System.Xml.XmlConvert.ToString(((int)m_BorderSide)));
+			if(!m_BackColor.IsEmpty)
+				ThisItem.SetAttribute("bc",BarFunctions.ColorToString(m_BackColor));
+			ThisItem.SetAttribute("fc",BarFunctions.ColorToString(m_ForeColor));
+			if(m_SingleLineColorCustom)
+				ThisItem.SetAttribute("sc",BarFunctions.ColorToString(m_SingleLineColor));
+			ThisItem.SetAttribute("ta",System.Xml.XmlConvert.ToString(((int)m_TextAlignment)));
+			ThisItem.SetAttribute("tla",System.Xml.XmlConvert.ToString(((int)m_TextLineAlignment)));
+			ThisItem.SetAttribute("ds",System.Xml.XmlConvert.ToString(m_DividerStyle));
+			ThisItem.SetAttribute("pl",System.Xml.XmlConvert.ToString(m_PaddingLeft));
+			ThisItem.SetAttribute("pr",System.Xml.XmlConvert.ToString(m_PaddingRight));
+			ThisItem.SetAttribute("pt",System.Xml.XmlConvert.ToString(m_PaddingTop));
+			ThisItem.SetAttribute("pb",System.Xml.XmlConvert.ToString(m_PaddingBottom));
+			ThisItem.SetAttribute("w",System.Xml.XmlConvert.ToString(m_Width));
+			ThisItem.SetAttribute("h",System.Xml.XmlConvert.ToString(m_Height));
+
+			// Save Font information if needed
+			if(this.Font!=null)
+			{
+				if(this.Font.Name!=System.Windows.Forms.SystemInformation.MenuFont.Name || this.Font.Size!=System.Windows.Forms.SystemInformation.MenuFont.Size || this.Font.Style!=System.Windows.Forms.SystemInformation.MenuFont.Style)
+				{
+					ThisItem.SetAttribute("fontname",this.Font.Name);
+					ThisItem.SetAttribute("fontemsize",System.Xml.XmlConvert.ToString(this.Font.Size));
+					ThisItem.SetAttribute("fontstyle",System.Xml.XmlConvert.ToString((int)this.Font.Style));
+				}
+			}
+
+			System.Xml.XmlElement xmlElem=null, xmlElem2=null;
+            
+			// Serialize Images
+			if(m_Image!=null || m_ImageIndex>=0 || m_Icon!=null)
+			{
+				xmlElem=ThisItem.OwnerDocument.CreateElement("images");
+				ThisItem.AppendChild(xmlElem);
+
+				if(m_ImageIndex>=0)
+					xmlElem.SetAttribute("imageindex",System.Xml.XmlConvert.ToString(m_ImageIndex));
+
+				if(m_Image!=null)
+				{
+					xmlElem2=ThisItem.OwnerDocument.CreateElement("image");
+					xmlElem2.SetAttribute("type","default");
+					xmlElem.AppendChild(xmlElem2);
+					BarFunctions.SerializeImage(m_Image,xmlElem2);
+				}
+				if(m_Icon!=null)
+				{
+					xmlElem2=ThisItem.OwnerDocument.CreateElement("image");
+					xmlElem2.SetAttribute("type","icon");
+					xmlElem.AppendChild(xmlElem2);
+					BarFunctions.SerializeIcon(m_Icon,xmlElem2);
+				}
+			}
+		}
+
+		public override void Deserialize(ItemSerializationContext context)
+		{
+			base.Deserialize(context);
+
+            System.Xml.XmlElement ItemXmlSource = context.ItemXmlElement;
+
+			m_BorderType=(eBorderType)System.Xml.XmlConvert.ToInt32(ItemXmlSource.GetAttribute("bt"));
+
+            if (ItemXmlSource.HasAttribute("BorderSide"))
+                m_BorderSide = (eBorderSide)System.Xml.XmlConvert.ToInt32(ItemXmlSource.GetAttribute("BorderSide"));
+            else
+                m_BorderSide = DEFAULT_BORDERSIDE;
+
+			if(ItemXmlSource.HasAttribute("bc"))
+                m_BackColor=BarFunctions.ColorFromString(ItemXmlSource.GetAttribute("bc"));
+			else
+				m_BackColor=Color.Empty;
+			m_ForeColor=BarFunctions.ColorFromString(ItemXmlSource.GetAttribute("fc"));
+
+            if (ItemXmlSource.HasAttribute("sc"))
+            {
+                m_SingleLineColor = BarFunctions.ColorFromString(ItemXmlSource.GetAttribute("sc"));
+                if (m_SingleLineColor != SystemColors.ControlDark)
+                    m_SingleLineColorCustom = true;
+            }
+            else
+            {
+                m_SingleLineColorCustom = false;
+                m_SingleLineColor = SystemColors.ControlDark;
+            }
+
+			m_TextAlignment=(StringAlignment)System.Xml.XmlConvert.ToInt32(ItemXmlSource.GetAttribute("ta"));
+			m_TextLineAlignment=(StringAlignment)System.Xml.XmlConvert.ToInt32(ItemXmlSource.GetAttribute("tla"));
+
+			m_DividerStyle=System.Xml.XmlConvert.ToBoolean(ItemXmlSource.GetAttribute("ds"));
+
+            m_PaddingLeft=System.Xml.XmlConvert.ToInt32(ItemXmlSource.GetAttribute("pl"));
+			m_PaddingRight=System.Xml.XmlConvert.ToInt32(ItemXmlSource.GetAttribute("pr"));
+			m_PaddingTop=System.Xml.XmlConvert.ToInt32(ItemXmlSource.GetAttribute("pt"));
+			m_PaddingBottom=System.Xml.XmlConvert.ToInt32(ItemXmlSource.GetAttribute("pb"));
+
+			m_Width=System.Xml.XmlConvert.ToInt32(ItemXmlSource.GetAttribute("w"));
+			m_Height=System.Xml.XmlConvert.ToInt32(ItemXmlSource.GetAttribute("h"));
+
+			// Load font information if it exists
+			if(ItemXmlSource.HasAttribute("fontname"))
+			{
+				string FontName=ItemXmlSource.GetAttribute("fontname");
+				float FontSize=System.Xml.XmlConvert.ToSingle(ItemXmlSource.GetAttribute("fontemsize"));
+				System.Drawing.FontStyle FontStyle=(System.Drawing.FontStyle)System.Xml.XmlConvert.ToInt32(ItemXmlSource.GetAttribute("fontstyle"));
+				try
+				{
+					this.Font=new Font(FontName,FontSize,FontStyle);
+				}
+				catch(Exception)
+				{
+                    this.Font = SystemFonts.DefaultFont; // System.Windows.Forms.SystemInformation.MenuFont.Clone() as Font;
+				}
+			}
+
+			// Load Images
+			foreach(System.Xml.XmlElement xmlElem in ItemXmlSource.ChildNodes)
+			{
+				if(xmlElem.Name=="images")
+				{
+					if(xmlElem.HasAttribute("imageindex"))
+						m_ImageIndex=System.Xml.XmlConvert.ToInt32(xmlElem.GetAttribute("imageindex"));
+
+					foreach(System.Xml.XmlElement xmlElem2 in xmlElem.ChildNodes)
+					{
+						switch(xmlElem2.GetAttribute("type"))
+						{
+							case "default":
+							{
+								m_Image=BarFunctions.DeserializeImage(xmlElem2);
+								m_ImageIndex=-1;
+								break;
+							}
+							case "icon":
+							{
+								m_Icon=BarFunctions.DeserializeIcon(xmlElem2);
+								m_ImageIndex=-1;
+								break;
+							}
+						}
+					}
+					break;
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the text associated with this item.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DevCoBrowsable(true),Editor("DevComponents.DotNetBar.Design.TextMarkupUIEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf",typeof(System.Drawing.Design.UITypeEditor)),System.ComponentModel.Category("Appearance"),System.ComponentModel.Description("The text contained in the item.")]
+		public override string Text
+		{
+			get
+			{
+				return base.Text;
+			}
+			set
+			{
+				if(m_Text==value)
+					return;
+				if(value==null)
+					m_Text="";
+				else
+					m_Text=value;
+				m_AccessKey=NativeFunctions.GetAccessKey(m_Text);
+
+                if(ShouldSyncProperties)
+                    BarFunctions.SyncProperty(this, "Text");
+
+                this.OnTextChanged();
+
+				if(this.Displayed && m_Parent!=null && !this.SuspendLayout)
+				{
+					if(m_Width == 0 || this.ContainerControl is BaseItemControl)
+						NeedRecalcSize=true;
+                    if(!(this.ContainerControl is LabelX))
+					    this.Refresh(); 
+					// No need for this Labels are always fixed in size
+					//RecalcSize();
+					//m_Parent.SubItemSizeChanged(this);
+				}
+
+			}
+		}
+
+		/// <summary>
+		/// Specifies the label icon. Icons support alpha blending.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Appearance"),System.ComponentModel.Description("Specifies the label icon."),System.ComponentModel.DefaultValue(null)]
+		public System.Drawing.Icon Icon
+		{
+			get
+			{
+				return m_Icon;
+			}
+			set
+			{
+				m_Icon=value;
+				this.OnImageChanged();
+				OnAppearanceChanged();
+			}
+		}
+
+		/// <summary>
+		/// Specifies label image.
+        /// </summary>
+        [Browsable(true),DevCoBrowsable(true),Category("Appearance"),Description("The image that will be displayed on the face of the item."),DefaultValue(null)]
+		public System.Drawing.Image Image
+		{
+			get
+			{
+				return m_Image;
+			}
+			set
+			{
+				m_Image=value;
+				this.OnImageChanged();
+				OnAppearanceChanged();
+			}
+		}
+
+        // Property Editor support for ImageIndex selection
+        [System.ComponentModel.Browsable(false), System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+        public System.Windows.Forms.ImageList ImageList
+        {
+            get
+            {
+                IOwner owner = this.GetOwner() as IOwner;
+                if (owner != null)
+                    return owner.Images;
+                return null;
+            }
+        }
+		/// <summary>
+		/// Specifies the index of the image for the label if ImageList is used.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Appearance"),System.ComponentModel.Description("The image list image index of the image that will be displayed on the face of the item."),System.ComponentModel.Editor("DevComponents.DotNetBar.Design.ImageIndexEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)),System.ComponentModel.TypeConverter(typeof(System.Windows.Forms.ImageIndexConverter)),System.ComponentModel.DefaultValue(-1)]
+		public int ImageIndex
+		{
+			get
+			{
+				return m_ImageIndex;
+			}
+			set
+			{
+				m_ImageCachedIdx=null;
+				if(m_ImageIndex!=value)
+				{
+					m_ImageIndex=value;
+                    if(ShouldSyncProperties)
+                        BarFunctions.SyncProperty(this, "ImageIndex");
+					OnImageChanged();
+				}
+				OnAppearanceChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets/Sets the image position inside the label.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Appearance"),System.ComponentModel.Description("The alignment of the image in relation to text displayed by this item."),System.ComponentModel.DefaultValue(eImagePosition.Left)]
+		public eImagePosition ImagePosition
+		{
+			get
+			{
+				return m_ImagePosition;
+			}
+			set
+			{
+				if(m_ImagePosition!=value)
+				{
+					m_ImagePosition=value;
+                    if(ShouldSyncProperties)
+                        BarFunctions.SyncProperty(this, "ImagePosition");
+					NeedRecalcSize=true;
+					this.Refresh();
+				}
+				OnAppearanceChanged();
+			}
+		}
+
+
+		private void OnImageChanged()
+		{
+            if (m_DisabledImage != null)
+            {
+                m_DisabledImage.Dispose();
+                m_DisabledImage = null;
+            }
+            if (m_DisabledIcon != null)
+            {
+                m_DisabledIcon.Dispose();
+                m_DisabledIcon = null;
+            }
+
+			NeedRecalcSize=true;
+			this.Refresh();
+		}
+
+        private CompositeImage GetImage()
+        {
+            if (this.GetEnabled())
+                return GetImage(ImageState.Default);
+            else
+                return GetImage(ImageState.Disabled);
+        }
+
+		private CompositeImage GetImage(ImageState state)
+		{
+			Image image=null;
+
+            if (state == ImageState.Disabled)
+            {
+                if (m_DisabledImage == null && m_DisabledIcon == null && (m_Icon != null || m_Image != null || m_ImageIndex >= 0))
+                    CreateDisabledImage();
+
+                if(m_DisabledIcon!=null)
+                    return new CompositeImage(new System.Drawing.Icon(m_DisabledIcon, IconSize), true);
+                if(m_DisabledImage!=null)
+                    return new CompositeImage(m_DisabledImage, false);
+            }
+
+			if(m_Icon!=null)
+			{
+				System.Drawing.Size iconSize=this.IconSize;
+				return new CompositeImage(new System.Drawing.Icon(m_Icon,iconSize),true);
+			}
+
+			if(m_Image!=null)
+			{
+				return new CompositeImage(m_Image,false);
+			}
+
+			if(m_ImageIndex>=0)
+			{
+				image=GetImageFromImageList(m_ImageIndex);
+				if(image!=null)
+					return new CompositeImage(image,false);
+			}
+
+			return null;
+		}
+
+        private void CreateDisabledImage()
+        {
+            if (m_Image == null && m_ImageIndex < 0 && m_Icon == null)
+                return;
+            if (m_DisabledImage != null)
+                m_DisabledImage.Dispose();
+            m_DisabledImage = null;
+            if (m_DisabledIcon != null)
+                m_DisabledIcon.Dispose();
+            m_DisabledIcon = null;
+
+            CompositeImage defaultImage = GetImage(ImageState.Default);
+
+            if (defaultImage == null)
+                return;
+
+            if (this.GetOwner() is IOwner && ((IOwner)this.GetOwner()).DisabledImagesGrayScale)
+            {
+                if (defaultImage.IsIcon)
+                {
+                    m_DisabledIcon = BarFunctions.CreateDisabledIcon(defaultImage.Icon);
+                }
+                else
+                {
+                    m_DisabledImage = ImageHelper.CreateGrayScaleImage(defaultImage.Image as Bitmap);
+                }
+            }
+            if (m_DisabledIcon != null || m_DisabledImage != null)
+                return;
+
+            // Use old algorithm if first one failed...
+            System.Drawing.Imaging.PixelFormat pixelFormat = System.Drawing.Imaging.PixelFormat.Format32bppArgb;
+            if (!defaultImage.IsIcon && defaultImage.Image != null)
+                pixelFormat = defaultImage.Image.PixelFormat;
+
+            if (pixelFormat == System.Drawing.Imaging.PixelFormat.Format1bppIndexed || pixelFormat == System.Drawing.Imaging.PixelFormat.Format4bppIndexed || pixelFormat == System.Drawing.Imaging.PixelFormat.Format8bppIndexed)
+                pixelFormat = System.Drawing.Imaging.PixelFormat.Format32bppArgb;
+
+            Bitmap bmp = new Bitmap(defaultImage.Width, defaultImage.Height, pixelFormat);
+            m_DisabledImage = new Bitmap(defaultImage.Width, defaultImage.Height, pixelFormat);
+
+            Graphics g2 = Graphics.FromImage(bmp);
+            using (SolidBrush brush = new SolidBrush(System.Drawing.Color.White))
+                g2.FillRectangle(brush, 0, 0, defaultImage.Width, defaultImage.Height);
+            //g2.DrawImage(defaultImage,0,0,defaultImage.Width,defaultImage.Height);
+            defaultImage.DrawImage(g2, new Rectangle(0, 0, defaultImage.Width, defaultImage.Height));
+            g2.Dispose();
+            g2 = Graphics.FromImage(m_DisabledImage);
+
+            bmp.MakeTransparent(System.Drawing.Color.White);
+            eDotNetBarStyle effectiveStyle = EffectiveStyle;
+            if ((effectiveStyle == eDotNetBarStyle.OfficeXP || effectiveStyle == eDotNetBarStyle.Office2003 || effectiveStyle == eDotNetBarStyle.VS2005 || BarFunctions.IsOffice2007Style(effectiveStyle)) && NativeFunctions.ColorDepth >= 8)
+            {
+                float[][] array = new float[5][];
+                array[0] = new float[5] { 0, 0, 0, 0, 0 };
+                array[1] = new float[5] { 0, 0, 0, 0, 0 };
+                array[2] = new float[5] { 0, 0, 0, 0, 0 };
+                array[3] = new float[5] { .5f, .5f, .5f, .5f, 0 };
+                array[4] = new float[5] { 0, 0, 0, 0, 0 };
+                System.Drawing.Imaging.ColorMatrix grayMatrix = new System.Drawing.Imaging.ColorMatrix(array);
+                System.Drawing.Imaging.ImageAttributes disabledImageAttr = new System.Drawing.Imaging.ImageAttributes();
+                disabledImageAttr.ClearColorKey();
+                disabledImageAttr.SetColorMatrix(grayMatrix);
+                g2.DrawImage(bmp, new Rectangle(0, 0, bmp.Width, bmp.Height), 0, 0, bmp.Width, bmp.Height, GraphicsUnit.Pixel, disabledImageAttr);
+            }
+            else
+                System.Windows.Forms.ControlPaint.DrawImageDisabled(g2, bmp, 0, 0, ColorFunctions.MenuBackColor(g2));
+
+            // Clean up
+            g2.Dispose();
+            g2 = null;
+            bmp.Dispose();
+            bmp = null;
+
+            defaultImage.Dispose();
+        }
+
+		private Image GetImageFromImageList(int ImageIndex)
+		{
+			if(ImageIndex>=0)
+			{
+				IOwner owner=null;
+				IBarImageSize iImageSize=null;
+				if(_ItemPaintArgs!=null)
+				{
+					owner=_ItemPaintArgs.Owner;
+					iImageSize=_ItemPaintArgs.ContainerControl as IBarImageSize;
+				}
+				if(owner==null) owner=this.GetOwner() as IOwner;
+				if(iImageSize==null) iImageSize=this.ContainerControl as IBarImageSize; 
+
+				if(owner!=null)
+				{
+					try
+					{
+						if(iImageSize!=null && iImageSize.ImageSize!=eBarImageSize.Default)
+						{
+							if(iImageSize.ImageSize==eBarImageSize.Medium && owner.ImagesMedium!=null)
+								return owner.ImagesMedium.Images[ImageIndex];
+							else if(iImageSize.ImageSize==eBarImageSize.Large && owner.ImagesLarge!=null)
+								return owner.ImagesLarge.Images[ImageIndex];
+							else if(owner.Images!=null)
+							{
+								if(ImageIndex==m_ImageIndex)
+								{
+									if(m_ImageCachedIdx==null)
+										m_ImageCachedIdx=owner.Images.Images[ImageIndex];
+									return m_ImageCachedIdx;
+								}
+								else
+									return owner.Images.Images[ImageIndex];
+							}
+						}
+						else if(m_Parent is SideBarPanelItem && ((SideBarPanelItem)m_Parent).ItemImageSize!=eBarImageSize.Default)
+						{
+							eBarImageSize imgSize=((SideBarPanelItem)m_Parent).ItemImageSize;
+							if(imgSize==eBarImageSize.Medium && owner.ImagesMedium!=null)
+								return owner.ImagesMedium.Images[ImageIndex];
+							else if(imgSize==eBarImageSize.Large && owner.ImagesLarge!=null)
+								return owner.ImagesLarge.Images[ImageIndex];
+							else if(owner.Images!=null)
+								return owner.Images.Images[ImageIndex];
+						}
+						else if(owner.Images!=null)
+						{
+							if(ImageIndex==m_ImageIndex)
+							{
+								if(m_ImageCachedIdx==null)
+									m_ImageCachedIdx=owner.Images.Images[ImageIndex];
+
+								return m_ImageCachedIdx;
+							}
+							else
+								return owner.Images.Images[ImageIndex];
+						}
+					}
+					catch(Exception)
+					{
+						return null;
+					}
+				}
+			}
+			return null;
+		}
+
+		private System.Drawing.Size IconSize
+		{
+			get
+			{
+				// Default Icon Size
+				System.Drawing.Size size=new Size(16,16);
+				IBarImageSize iImageSize=null;
+				if(_ItemPaintArgs!=null)
+				{
+					iImageSize=_ItemPaintArgs.ContainerControl as IBarImageSize;
+				}
+				if(iImageSize==null) iImageSize=this.ContainerControl as IBarImageSize; 
+
+				try
+				{
+					if(iImageSize!=null && iImageSize.ImageSize!=eBarImageSize.Default)
+					{
+						if(iImageSize.ImageSize==eBarImageSize.Medium)
+							size=new Size(24,24);
+						else if(iImageSize.ImageSize==eBarImageSize.Large)
+							size=new Size(32,32);
+					}
+					else if(m_Parent is SideBarPanelItem && ((SideBarPanelItem)m_Parent).ItemImageSize!=eBarImageSize.Default)
+					{
+						eBarImageSize imgSize=((SideBarPanelItem)m_Parent).ItemImageSize;
+						if(imgSize==eBarImageSize.Medium)
+							size=new Size(24,24);
+						else if(imgSize==eBarImageSize.Large)
+							size=new Size(32,32);
+					}
+				}
+				catch(Exception)
+				{
+				}
+
+				return size;
+			}
+        }
+
+        protected override void OnCommandChanged()
+        {
+            if (!this.DesignMode && this.Command == null)
+                this.Text = "";
+            base.OnCommandChanged();
+        }
+
+        private eOrientation _TextOrientation = eOrientation.Horizontal;
+        /// <summary>
+        /// Gets or sets text-orientation. Default is horizontal.
+        /// </summary>
+        [DefaultValue(eOrientation.Horizontal), Category("Appearance"), Description("Indicates text-orientation")]
+        public eOrientation TextOrientation
+        {
+            get { return _TextOrientation; }
+            set 
+            {
+                _TextOrientation = value;
+                NeedRecalcSize = true;
+                this.Refresh();
+            }
+        }
+
+        private bool _VerticalTextTopUp = true;
+        /// <summary>
+        /// Gets or sets how vertical text is rotated when TextOrientation = Vertical.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance"), Description("Indicates how vertical text is rotated when TextOrientation = Vertical.")]
+        public bool VerticalTextTopUp
+        {
+            get { return _VerticalTextTopUp; }
+            set 
+            { 
+                _VerticalTextTopUp = value;
+                if (_TextOrientation == eOrientation.Vertical)
+                {
+                    this.Refresh();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets the realized symbol string.
+        /// </summary>
+        [Browsable(false)]
+        public string SymbolRealized
+        {
+            get { return _SymbolRealized; }
+        }
+        private string _Symbol = "", _SymbolRealized = "";
+        /// <summary>
+        /// Indicates the symbol displayed on label instead of the image. Setting the symbol overrides the image setting.
+        /// </summary>
+        [DefaultValue(""), Category("Appearance"), Description("Indicates the symbol displayed on face of the tile instead of the image. Setting the symbol overrides the image setting.")]
+        [Editor("DevComponents.DotNetBar.Design.SymbolTypeEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor))]
+        public string Symbol
+        {
+            get { return _Symbol; }
+            set
+            {
+                if (value != _Symbol)
+                {
+                    string oldValue = _Symbol;
+                    _Symbol = value;
+                    OnSymbolChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when Symbol property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnSymbolChanged(string oldValue, string newValue)
+        {
+            if (string.IsNullOrEmpty(newValue))
+                _SymbolRealized = "";
+            else
+                _SymbolRealized = Symbols.GetSymbol(newValue);
+            //OnPropertyChanged(new PropertyChangedEventArgs("Symbol"));
+            NeedRecalcSize = true;
+            OnAppearanceChanged();
+            this.Refresh();
+        }
+
+        private eSymbolSet _SymbolSet = eSymbolSet.Awesome;
+        /// <summary>
+        /// Gets or sets the symbol set used to represent the Symbol.
+        /// </summary>
+        [Browsable(false), DefaultValue(eSymbolSet.Awesome)]
+        public eSymbolSet SymbolSet
+        {
+            get { return _SymbolSet; }
+            set
+            {
+                if (_SymbolSet != value)
+                {
+                    eSymbolSet oldValue = _SymbolSet;
+                    _SymbolSet = value;
+                    OnSymbolSetChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when SymbolSet property value changes.
+        /// </summary>
+        /// <param name="oldValue">Indciates old value</param>
+        /// <param name="newValue">Indicates new value</param>
+        protected virtual void OnSymbolSetChanged(eSymbolSet oldValue, eSymbolSet newValue)
+        {
+            NeedRecalcSize = true;
+            OnAppearanceChanged();
+            this.Refresh();
+        }
+
+        private float _SymbolSize = 0f;
+        /// <summary>
+        /// Indicates the size of the symbol in points.
+        /// </summary>
+        [DefaultValue(0f), Category("Appearance"), Description("Indicates the size of the symbol in points.")]
+        public float SymbolSize
+        {
+            get { return _SymbolSize; }
+            set
+            {
+                if (value != _SymbolSize)
+                {
+                    float oldValue = _SymbolSize;
+                    _SymbolSize = value;
+                    OnSymbolSizeChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when SymbolSize property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnSymbolSizeChanged(float oldValue, float newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("SymbolSize"));
+            NeedRecalcSize = true;
+            OnAppearanceChanged();
+            this.Refresh();
+        }
+
+        private Color _SymbolColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets the color of the symbol.
+        /// </summary>
+        [Category("Columns"), Description("Indicates color of the symbol.")]
+        public Color SymbolColor
+        {
+            get { return _SymbolColor; }
+            set { _SymbolColor = value; this.Refresh(); }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeSymbolColor()
+        {
+            return !_SymbolColor.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetSymbolColor()
+        {
+            this.SymbolColor = Color.Empty;
+        }
+        #endregion
+
+        #region Markup Support
+        protected override void TextMarkupLinkClick(object sender, EventArgs e)
+        {
+            TextMarkup.HyperLink link = sender as TextMarkup.HyperLink;
+            if(link!=null)
+                OnMarkupLinkClick(new MarkupLinkClickEventArgs(link.Name, link.HRef));
+            base.TextMarkupLinkClick(sender, e);
+        }
+
+        protected virtual void OnMarkupLinkClick(MarkupLinkClickEventArgs e)
+        {
+            if (this.MarkupLinkClick != null)
+                MarkupLinkClick(this, e);
+        }
+        #endregion
+
+        #region IBlockExtended Members
+        private bool _ContainerNewLineAfter = false;
+        /// <summary>
+        /// Gets or sets whether label hosted in multi-line ItemContainer triggers new line switch after label is processed.
+        /// </summary>
+        [DefaultValue(false), Category("Layout"), Description("Indicates whether label hosted in multi-line ItemContainer triggers new line switch after label is processed.")]
+        public bool ContainerNewLineAfter
+        {
+            get { return _ContainerNewLineAfter; }
+            set
+            {
+                _ContainerNewLineAfter = value;
+            }
+        }
+        
+        bool IBlockExtended.IsBlockElement
+        {
+            get { return false; }
+        }
+
+        bool IBlockExtended.IsNewLineAfterElement
+        {
+            get { return _ContainerNewLineAfter; }
+        }
+
+        bool IBlockExtended.CanStartNewLine
+        {
+            get { return true; }
+        }
+
+        bool IBlockExtended.IsBlockContainer
+        {
+            get { return false; }
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/ListBoxAdv.ico b/PROMS/DotNetBar Source Code/ListBoxAdv.ico
new file mode 100644
index 00000000..154ea0de
Binary files /dev/null and b/PROMS/DotNetBar Source Code/ListBoxAdv.ico differ
diff --git a/PROMS/DotNetBar Source Code/LocalizationKeys.cs b/PROMS/DotNetBar Source Code/LocalizationKeys.cs
new file mode 100644
index 00000000..756cdd2a
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/LocalizationKeys.cs	
@@ -0,0 +1,671 @@
+using System;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Contains static keys that are used to discover localized text for internal controls.
+    /// </summary>
+    public class LocalizationKeys
+    {
+        /// <summary>
+        /// Navigation Pane collapse button tooltip text.
+        /// </summary>
+        public static string NavPaneCollapseButtonTooltip = "navPaneCollapseTooltip";
+        /// <summary>
+        /// Navigation Pane expand button tooltip text.
+        /// </summary>
+        public static string NavPaneExpandButtonTooltip = "navPaneExpandTooltip";
+        /// <summary>
+        /// Bar auto-hide button tooltip text.
+        /// </summary>
+        public static string BarAutoHideButtonTooltip="barsys_autohide_tooltip";
+        /// <summary>
+        /// Bar customize button tooltip text.
+        /// </summary>
+        public static string BarCustomizeButtonTooltip = "barsys_customize_tooltip";
+        /// <summary>
+        /// Bar close button tooltip text.
+        /// </summary>
+        public static string BarCloseButtonTooltip = "barsys_close_tooltip";
+        /// <summary>
+        /// Bar maximize button tooltip text.
+        /// </summary>
+        public static string BarMaximizeButtonTooltip = "barsys_maximize_tooltip";
+        /// <summary>
+        /// CustomizeItem tooltip text.
+        /// </summary>
+        public static string CustomizeItemTooltip = "cust_mnu_tooltip";
+        /// <summary>
+        /// CustomizeItem Add/Remove text.
+        /// </summary>
+        public static string CustomizeItemAddRemove = "cust_mnu_addremove";
+        /// <summary>
+        /// CustomizeItem text for button that opens Customize dialog.
+        /// </summary>
+        public static string CustomizeItemCustomize = "cust_mnu_cust";
+        /// <summary>
+        /// CustomizeItem text for Reset command.
+        /// </summary>
+        public static string CustomizeItemReset = "cust_mnu_reset";
+        /// <summary>
+        /// Tooltip text for system button that displays overflow items.
+        /// </summary>
+        public static string OverlfowDisplayMoreTooltip = "sys_morebuttons";
+        /// <summary>
+        /// Text for Customize Dialog caption.
+        /// </summary>
+        public static string CustomizeDialogCaption = "cust_caption";
+        /// <summary>
+        /// Text for Customize Dialog toolbars tab.
+        /// </summary>
+        public static string CustomizeDialogTabToolbars = "cust_tab_toolbars";
+        /// <summary>
+        /// Text for Customize Dialog commands tab.
+        /// </summary>
+        public static string CustomizeDialogTabCommands = "cust_tab_commands";
+        /// <summary>
+        /// Text for Customize Dialog options tab.
+        /// </summary>
+        public static string CustomizeDialogTabOptions = "cust_tab_options";
+        /// <summary>
+        /// Text for Customize Dialog keyboard button.
+        /// </summary>
+        public static string CustomizeDialogKeyboardButton = "cust_btn_keyboard";
+        /// <summary>
+        /// Text for Customize Dialog close button.
+        /// </summary>
+        public static string CustomizeDialogCloseButton = "cust_btn_close";
+        /// <summary>
+        /// Text for Customize Dialog new toolbar button.
+        /// </summary>
+        public static string CustomizeDialogNewToolbarButton = "cust_btn_new";
+        /// <summary>
+        /// Text for Customize Dialog rename toolbar button.
+        /// </summary>
+        public static string CustomizeDialogRenameToolbarButton = "cust_btn_rename";
+        /// <summary>
+        /// Text for Customize Dialog delete toolbar button.
+        /// </summary>
+        public static string CustomizeDialogDeleteToolbarButton = "cust_btn_delete";
+        /// <summary>
+        /// Text for Customize Dialog reset toolbar button.
+        /// </summary>
+        public static string CustomizeDialogResetToolbarButton = "cust_btn_reset";
+        /// <summary>
+        /// Text for Customize Dialog label that gives following instructions to user:
+        /// To add a command to Bar select the category and drag the command out of this box to a Bar.
+        /// </summary>
+        public static string CustomizeDialogLabelDragInfo = "cust_lbl_cmdsins";
+        /// <summary>
+        /// Text for Customize Dialog categories label.
+        /// </summary>
+        public static string CustomizeDialogLabelCategories = "cust_lbl_cats";
+        /// <summary>
+        /// Text for Customize Dialog toolbars label.
+        /// </summary>
+        public static string CustomizeDialogLabelToolbars = "cust_lbl_tlbs";
+        /// <summary>
+        /// Text for Customize Dialog options tab Personalized Menus and Toolbars label.
+        /// </summary>
+        public static string CustomizeDialogOptionsPersonalized = "cust_lbl_pmt";
+        /// <summary>
+        /// Text for Customize Dialog options tab Aways show full menus check box.
+        /// </summary>
+        public static string CustomizeDialogOptionsFullMenus = "cust_chk_fullmenus";
+        /// <summary>
+        /// Text for Customize Dialog options tab Show full menus after a short delay check box.
+        /// </summary>
+        public static string CustomizeDialogOptionsFullMenusDelay = "cust_chk_delay";
+        /// <summary>
+        /// Text for Customize Dialog options tab 'Reset my usage data' command.
+        /// </summary>
+        public static string CustomizeDialogOptionsResetUsage = "cust_btn_resetusage";
+        /// <summary>
+        /// Text for Customize Dialog options tab 'Other' labe.
+        /// </summary>
+        public static string CustomizeDialogOptionsOther = "cust_lbl_other";
+        /// <summary>
+        /// Text for Customize Dialog options tab 'Show Screen&Tips on Toolbars' check box.
+        /// </summary>
+        public static string CustomizeDialogOptionsScreenTips = "cust_chk_showst";
+        /// <summary>
+        /// Text for Customize Dialog options tab 'Show &Shortcut Keys in ScreenTips' check box.
+        /// </summary>
+        public static string CustomizeDialogOptionsScreenTipsKeys = "cust_chk_showsk";
+        /// <summary>
+        /// Text for Customize Dialog options tab 'Menu Animation:' label.
+        /// </summary>
+        public static string CustomizeDialogOptionsMenuAnimation = "cust_lbl_menuan";
+        /// <summary>
+        /// Text for Customize Dialog options tab Menu Animation combo box None option.
+        /// </summary>
+        public static string CustomizeDialogOptionsMenuAnimationNone = "cust_cbo_none";
+        /// <summary>
+        /// Text for Customize Dialog options tab Menu Animation combo box System Default option.
+        /// </summary>
+        public static string CustomizeDialogOptionsMenuAnimationSys = "cust_cbo_system";
+        /// <summary>
+        /// Text for Customize Dialog options tab Menu Animation combo box Random option.
+        /// </summary>
+        public static string CustomizeDialogOptionsMenuAnimationRandom = "cust_cbo_random";
+        /// <summary>
+        /// Text for Customize Dialog options tab Menu Animation combo box Unfold option.
+        /// </summary>
+        public static string CustomizeDialogOptionsMenuAnimationUnfold = "cust_cbo_unfold";
+        /// <summary>
+        /// Text for Customize Dialog options tab Menu Animation combo box Slide option.
+        /// </summary>
+        public static string CustomizeDialogOptionsMenuAnimationSlide = "cust_cbo_slide";
+        /// <summary>
+        /// Text for Customize Dialog Confirm delete of bar message box.
+        /// </summary>
+        public static string CustomizeDialogOptionsConfirmDelete = "cust_msg_delete";
+        /// <summary>
+        /// Text for Reset command on customize item context menu.
+        /// </summary>
+        public static string CustomizeMenuReset = "cust_pm_reset";
+        /// <summary>
+        /// Text for Delete item command on customize item context menu.
+        /// </summary>
+        public static string CustomizeMenuDelete = "cust_pm_delete";
+        /// <summary>
+        /// Text for Change Name item command on customize item context menu.
+        /// </summary>
+        public static string CustomizeMenuChangeName = "cust_pm_name";
+        /// <summary>
+        /// Text for Default Style item command on customize item context menu.
+        /// </summary>
+        public static string CustomizeMenuDefaultStyle = "cust_pm_stydef";
+        /// <summary>
+        /// Text for Text Only item command on customize item context menu.
+        /// </summary>
+        public static string CustomizeMenuTextOnly = "cust_pm_stytextonly";
+        /// <summary>
+        /// Text for Image And Text item command on customize item context menu.
+        /// </summary>
+        public static string CustomizeMenuImageAndText = "cust_pm_styimagetext";
+        /// <summary>
+        /// Text for Begin Group item command on customize item context menu.
+        /// </summary>
+        public static string CustomizeMenuBeginGroup = "cust_pm_begingroup";
+        /// <summary>
+        /// Text MdiSystemItem Minimize button.
+        /// </summary>
+        public static string MdiSystemItemMinimizeTooltip = "mdisystt_minimize";
+        /// <summary>
+        /// Text MdiSystemItem Restore button.
+        /// </summary>
+        public static string MdiSystemItemRestoreTooltip = "mdisystt_restore";
+        /// <summary>
+        /// Text MdiSystemItem Close button.
+        /// </summary>
+        public static string MdiSystemItemCloseTooltip = "mdisystt_close";
+        /// <summary>
+        /// Text MdiSystemItem menu Restore command.
+        /// </summary>
+        public static string MdiSystemItemMenuRestore = "mdisysmenu_restore";
+        /// <summary>
+        /// Text MdiSystemItem menu Move command.
+        /// </summary>
+        public static string MdiSystemItemMenuMove = "mdisysmenu_move";
+        /// <summary>
+        /// Text MdiSystemItem menu Size command.
+        /// </summary>
+        public static string MdiSystemItemMenuSize = "mdisysmenu_size";
+        /// <summary>
+        /// Text MdiSystemItem menu Minimize command.
+        /// </summary>
+        public static string MdiSystemItemMenuMinimize = "mdisysmenu_minimize";
+        /// <summary>
+        /// Text MdiSystemItem menu Maximize command.
+        /// </summary>
+        public static string MdiSystemItemMenuMaximize = "mdisysmenu_maximize";
+        /// <summary>
+        /// Text MdiSystemItem menu Close command.
+        /// </summary>
+        public static string MdiSystemItemMenuClose = "mdisysmenu_close";
+        /// <summary>
+        /// Text MdiSystemItem menu Next command.
+        /// </summary>
+        public static string MdiSystemItemMenuNext = "mdisysmenu_next";
+        /// <summary>
+        /// Text Navigation Bar Show More Buttons menu item.
+        /// </summary>
+        public static string NavBarShowMoreButtons = "navbar_showmorebuttons";
+        /// <summary>
+        /// Text Navigation Bar Show Fewer Buttons menu item.
+        /// </summary>
+        public static string NavBarShowFewerButtons = "navbar_showfewerbuttons";
+        /// <summary>
+        /// Text Navigation Bar Options menu item.
+        /// </summary>
+        public static string NavBarOptions = "navbar_navpaneoptions";
+        /// <summary>
+        /// Text for Move Up button on Navigation Bar Options dialog box.
+        /// </summary>
+        public static string NavBarDialogMoveUp = "navbar_navpanedialogmoveup";
+        /// <summary>
+        /// Text for Move Down button on Navigation Bar Options dialog box.
+        /// </summary>
+        public static string NavBarDialogMoveDown = "navbar_navpanedialogmovedown";
+        /// <summary>
+        /// Text for Reset button on Navigation Bar Options dialog box.
+        /// </summary>
+        public static string NavBarDialogReset = "navbar_navpanedialogreset";
+        /// <summary>
+        /// Text for OK button on Navigation Bar Options dialog box.
+        /// </summary>
+        public static string NavBarDialogOK = "navbar_navpanedialogok";
+        /// <summary>
+        /// Text for Cancel button on Navigation Bar Options dialog box.
+        /// </summary>
+        public static string NavBarDialogCancel = "navbar_navpanedialogcancel";
+        /// <summary>
+        /// Text for Navigation Bar Options dialog box title.
+        /// </summary>
+        public static string NavBarDialogTitle = "navbar_navpanedialogtitle";
+        /// <summary>
+        /// Text for Navigation Bar Options label which is displayed above the list box which lists all the controls.
+        /// </summary>
+        public static string NavBarDialogListLabel = "navbar_navpanedialoglistlabel";
+
+        /// <summary>
+        /// Text for Rename Toolbar dialog caption.
+        /// </summary>
+        public static string RenameBarDialogCaption = "barrename_caption";
+        /// <summary>
+        /// Text for New Toolbar dialog caption.
+        /// </summary>
+        public static string NewBarDialogCaption = "barname_caption";
+        /// <summary>
+        /// Text for Bar Name label on Bar edit dialog (either rename or new).
+        /// </summary>
+        public static string BarEditDialogBarNameLabel = "barname_name";
+        /// <summary>
+        /// Text for OK Button on Bar edit dialog (either rename or new).
+        /// </summary>
+        public static string BarEditDialogBarOkButton = "barname_ok";
+        /// <summary>
+        /// Text for Cancel Button on Bar edit dialog (either rename or new).
+        /// </summary>
+        public static string BarEditDialogBarCancelButton = "barname_cancel";
+        /// <summary>
+        /// Text for Invalid Name Message on Bar edit dialog (either rename or new).
+        /// </summary>
+        public static string BarEditDialogInvalidNameMessage = "barname_msginvalidname";
+        /// <summary>
+        /// Text displayed on Color Picker drop down Theme Colors label.
+        /// </summary>
+        public static string ColorPickerThemeColorsLabel = "colorpicker_themecolorslabel";
+        /// <summary>
+        /// Text displayed on Color Picker drop down Standard Colors label.
+        /// </summary>
+        public static string ColorPickerStandardColorsLabel = "colorpicker_standardcolorslabel";
+        /// <summary>
+        /// Text displayed on Color Picker drop down more colors menu item.
+        /// </summary>
+        public static string ColorPickerMoreColorsMenuItem = "colorpicker_morecolors";
+        /// <summary>
+        /// Text for the OK Button on Color Picker dialog.
+        /// </summary>
+        public static string ColorPickerDialogOKButton = "colorpickerdialog_okbutton";
+        /// <summary>
+        /// Text for the Cancel Button on Color Picker dialog.
+        /// </summary>
+        public static string ColorPickerDialogCancelButton = "colorpickerdialog_cancelbutton";
+        /// <summary>
+        /// Text for the new color label on Color Picker dialog.
+        /// </summary>
+        public static string ColorPickerDialogNewColorLabel = "colorpickerdialog_newcolorlabel";
+        /// <summary>
+        /// Text for the current color label on Color Picker dialog.
+        /// </summary>
+        public static string ColorPickerDialogCurrentColorLabel = "colorpickerdialog_currentcolorlabel";
+        /// <summary>
+        /// Text for the colors label on the standard colors tab.
+        /// </summary>
+        public static string ColorPickerDialogStandardColorsLabel= "colorpickerdialog_standardcolorslabel";
+        /// <summary>
+        /// Text for the colors label on the custom colors tab.
+        /// </summary>
+        public static string ColorPickerDialogCustomColorsLabel = "colorpickerdialog_customcolorslabel";
+        /// <summary>
+        /// Text for the green component label on the custom colors tab.
+        /// </summary>
+        public static string ColorPickerDialogGreenLabel = "colorpickerdialog_greenlabel";
+        /// <summary>
+        /// Text for the blue component label on the custom colors tab.
+        /// </summary>
+        public static string ColorPickerDialogBlueLabel = "colorpickerdialog_bluelabel";
+        /// <summary>
+        /// Text for the red component label on the custom colors tab.
+        /// </summary>
+        public static string ColorPickerDialogRedLabel = "colorpickerdialog_redlabel";
+        /// <summary>
+        /// Text for the Color Model label on the custom colors tab.
+        /// </summary>
+        public static string ColorPickerDialogColorModelLabel = "colorpickerdialog_colormodellabel";
+        /// <summary>
+        /// Text for the RGB combo box item choice on the custom colors tab.
+        /// </summary>
+        public static string ColorPickerDialogRgbLabel = "colorpickerdialog_rgblabel";
+
+        /// <summary>
+        /// Text for the Standard tab on color picker dialog.
+        /// </summary>
+        public static string ColorPickerTabStandard= "colorpickerdialog_tabstandard";
+        /// <summary>
+        /// Text for the Custom tab on color picker dialog.
+        /// </summary>
+        public static string ColorPickerTabCustom = "colorpickerdialog_tabcustom";
+        /// <summary>
+        /// Text for the Custom tab on color picker dialog.
+        /// </summary>
+        public static string ColorPickerCaption = "colorpickerdialog_caption";
+
+        // Ribbon Control Localization Keys
+        /// <summary>
+        /// Text for the Custom tab on color picker dialog.
+        /// </summary>
+        public static string QatCustomizeTooltip = "qat_customizetooltip";
+
+        /// <summary>
+        /// Indicates the text for Today button displayed on the MonthCalendarItem control.
+        /// </summary>
+        public static string MonthCalendarTodayButtonText = "monthcalendar_todaybutton";
+
+        /// <summary>
+        /// Indicates the text for Clear button displayed on the MonthCalendarItem control.
+        /// </summary>
+        public static string MonthCalendarClearButtonText = "monthcalendar_clearbutton";
+
+        /// <summary>
+        /// Indicates the text for MessageBoxEx Abort button.
+        /// </summary>
+        public static string MessageBoxAbortButton = "mb_abortbutton";
+        /// <summary>
+        /// Indicates the text for MessageBoxEx Cancel button.
+        /// </summary>
+        public static string MessageBoxCancelButton = "mb_cancelbutton";
+        /// <summary>
+        /// Indicates the text for MessageBoxEx Close button.
+        /// </summary>
+        public static string MessageBoxCloseButton = "mb_closebutton";
+        /// <summary>
+        /// Indicates the text for MessageBoxEx Continue button.
+        /// </summary>
+        public static string MessageBoxContinueButton = "mb_continuebutton";
+        /// <summary>
+        /// Indicates the text for MessageBoxEx Help button.
+        /// </summary>
+        public static string MessageBoxHelpButton = "mb_helpbutton";
+        /// <summary>
+        /// Indicates the text for MessageBoxEx Ignore button.
+        /// </summary>
+        public static string MessageBoxIgnoreButton = "mb_ignorebutton";
+        /// <summary>
+        /// Indicates the text for MessageBoxEx No button.
+        /// </summary>
+        public static string MessageBoxNoButton = "mb_nobutton";
+        /// <summary>
+        /// Indicates the text for MessageBoxEx OK button.
+        /// </summary>
+        public static string MessageBoxOkButton = "mb_okbutton";
+        /// <summary>
+        /// Indicates the text for MessageBoxEx Retry button.
+        /// </summary>
+        public static string MessageBoxRetryButton = "mb_retrybutton";
+        /// <summary>
+        /// Indicates the text for MessageBoxEx Try Again button.
+        /// </summary>
+        public static string MessageBoxTryAgainButton = "mb_tryagainbutton";
+        /// <summary>
+        /// Indicates the text for MessageBoxEx Yes button.
+        /// </summary>
+        public static string MessageBoxYesButton = "mb_yesbutton";
+        /// <summary>
+        /// Identifies Form system menu Restore item.
+        /// </summary>
+        public static string FormSystemMenuRestore = "FormSystemMenuRestore";
+        /// <summary>
+        /// Identifies Form system menu Move item.
+        /// </summary>
+        public static string FormSystemMenuMove = "FormSystemMenuMove";
+        /// <summary>
+        /// Identifies Form system menu Size item.
+        /// </summary>
+        public static string FormSystemMenuSize = "FormSystemMenuSize";
+        /// <summary>
+        /// Identifies Form system menu Minimize item.
+        /// </summary>
+        public static string FormSystemMenuMinimize = "FormSystemMenuMinimize";
+        /// <summary>
+        /// Identifies Form system menu Maximize item.
+        /// </summary>
+        public static string FormSystemMenuMaximize = "FormSystemMenuMaximize";
+        /// <summary>
+        /// Identifies Form system menu Close item.
+        /// </summary>
+        public static string FormSystemMenuClose = "FormSystemMenuClose";
+        /// <summary>
+        /// Identifies Time Selector OK button.
+        /// </summary>
+        public static string TimeSelectorOkButton = "TimeSelectorOkButton";
+        /// <summary>
+        /// Identifies Time Selector Clear button.
+        /// </summary>
+        public static string TimeSelectorClearButton = "TimeSelectorClearButton";
+        /// <summary>
+        /// Identifies Time Selector Hour Label.
+        /// </summary>
+        public static string TimeSelectorHourLabel = "TimeSelectorHourLabel";
+        /// <summary>
+        /// Identifies Time Selector Minute Label.
+        /// </summary>
+        public static string TimeSelectorMinuteLabel = "TimeSelectorMinuteLabel";
+
+        #region SuperGrid Keys
+
+        /// <summary>
+        /// Identifies 'Show all' Filter Expression label.
+        /// </summary>
+        public static string SuperGridFilterShowAll = "SuperGrid_FilterShowAll";
+        /// <summary>
+        /// Identifies 'Show null' Filter Expression label.
+        /// </summary>
+        public static string SuperGridFilterShowNull = "SuperGrid_FilterShowNull";
+        /// <summary>
+        /// Identifies 'Show not null' Filter Expression label.
+        /// </summary>
+        public static string SuperGridFilterShowNotNull = "SuperGrid_FilterShowNotnull";
+        /// <summary>
+        /// Identifies 'Custom' Filter Expression label.
+        /// </summary>
+        public static string SuperGridFilterCustom = "SuperGrid_FilterCustom";
+        /// <summary>
+        /// Identifies 'Enter expression' Filter text.
+        /// </summary>
+        public static string SuperGridFilterEnterExpr = "SuperGrid_FilterEnterExpr";
+        /// <summary>
+        /// Identifies 'Apply' Filter Expression button label.
+        /// </summary>
+        public static string SuperGridFilterSampleExpr = "SuperGrid_FilterSampleExpr";
+        /// <summary>
+        /// Identifies 'Apply' Filter Expression button label.
+        /// </summary>
+        public static string SuperGridFilterCustomHelp = "SuperGrid_FilterCustomHelp";
+        /// <summary>
+        /// Identifies 'Apply' Filter Expression button label.
+        /// </summary>
+        public static string SuperGridFilterApply = "SuperGrid_FilterApply";
+        /// <summary>
+        /// Identifies 'Ok' Filter Expression button label.
+        /// </summary>
+        public static string SuperGridFilterOk = "SuperGrid_FilterOk";
+        /// <summary>
+        /// Identifies 'Cancel' Filter Expression button label.
+        /// </summary>
+        public static string SuperGridFilterCancel = "SuperGrid_FilterCancel";
+        /// <summary>
+        /// Identifies 'Close' Filter Expression button label.
+        /// </summary>
+        public static string SuperGridFilterClose = "SuperGrid_FilterClose";
+        /// <summary>
+        /// Identifies 'Clear' Filter Expression button label.
+        /// </summary>
+        public static string SuperGridFilterClear = "SuperGrid_FilterClear";
+        /// <summary>
+        /// Identifies 'Clear' Filter Expression button label.
+        /// </summary>
+        public static string SuperGridFilterReset = "SuperGrid_FilterReset";
+        /// <summary>
+        /// Identifies Filter DateTimePicked dialog 'Filter by relative date' text.
+        /// </summary>
+        public static string SuperGridFilterByRelativeDate = "SuperGrid_FilterByRelativeDate";
+        /// <summary>
+        /// Identifies Filter DateTimePicker dialog 'Filter by specific date' text.
+        /// </summary>
+        public static string SuperGridFilterBySpecificDate = "SuperGrid_FilterBySpecificDate";
+        /// <summary>
+        /// Identifies Filter DateTimePicker dialog 'Filter by date range' text.
+        /// </summary>
+        public static string SuperGridFilterByDateRange = "SuperGrid_FilterByDateRange";
+        /// <summary>
+        /// Identifies Filter DateTimePicker dialog, ByRelativeDate combo entry 'Current Month' text.
+        /// </summary>
+        public static string SuperGridFilterCurrentMonth = "SuperGrid_FilterCurrentMonth";
+        /// <summary>
+        /// Identifies Filter DateTimePicker dialog, ByRelativeDate combo entry 'Current Year' text.
+        /// </summary>
+        public static string SuperGridFilterCurrentYear = "SuperGrid_FilterCurrentYear";
+        /// <summary>
+        /// Identifies Filter DateTimePicker dialog, ByRelativeDate combo entry 'Last Month Period' text.
+        /// </summary>
+        public static string SuperGridFilterLastMonthPeriod = "SuperGrid_FilterLastMonthPeriod";
+        /// <summary>
+        /// Identifies Filter DateTimePicker dialog, ByRelativeDate combo entry 'Last 3 Month Period' text.
+        /// </summary>
+        public static string SuperGridFilterLast3MonthPeriod = "SuperGrid_FilterLast3MonthPeriod";
+        /// <summary>
+        /// Identifies Filter DateTimePicker dialog, ByRelativeDate combo entry 'Last 6 Month Period' text.
+        /// </summary>
+        public static string SuperGridFilterLast6MonthPeriod = "SuperGrid_FilterLast6MonthPeriod";
+        /// <summary>
+        /// Identifies Filter DateTimePicker dialog, ByRelativeDate combo entry 'Last 9 Month Period' text.
+        /// </summary>
+        public static string SuperGridFilterLast9MonthPeriod = "SuperGridFilter_Last9MonthPeriod";
+        /// <summary>
+        /// Identifies Filter DateTimePicker dialog, ByRelativeDate combo entry 'Last Year' text.
+        /// </summary>
+        public static string SuperGridFilterLastYear = "SuperGrid_FilterLastYear";
+        /// <summary>
+        /// Identifies Filter DateTimePicker dialog, ByRelativeDate combo entry 'Last 5 Year Period' text.
+        /// </summary>
+        public static string SuperGridFilterLast5YearPeriod = "SuperGrid_FilterLast5YearPeriod";
+        /// <summary>
+        /// Identifies Filter DateTimePicker dialog, ByRelativeDate combo entry 'Last 10 Year Period' text.
+        /// </summary>
+        public static string SuperGridFilterLast10YearPeriod = "SuperGrid_FilterLast10YearPeriod";
+        /// <summary>
+        /// Identifies Filter expression evaluation error 'Expression error' text.
+        /// </summary>
+        public static string SuperGridFilterExprError = "SuperGrid_FilterExprError";
+        /// <summary>
+        /// Identifies Filter expression evaluation error 'Missing parenthesis' text.
+        /// </summary>
+        public static string SuperGridFilterMissingParen = "SuperGrid_FilterMissingParen";
+        /// <summary>
+        /// Identifies Filter expression evaluation error 'Missing quote' text.
+        /// </summary>
+        public static string SuperGridFilterMissingQuote = "SuperGrid_FilterMissingQuote";
+        /// <summary>
+        /// Identifies Filter expression evaluation error 'Invalid number of arguments' text.
+        /// </summary>
+        public static string SuperGridFilterInvalidArgCount = "SuperGrid_FilterInvalidArgCount";
+        /// <summary>
+        /// Identifies Filter expression evaluation error 'Invalid argument' text.
+        /// </summary>
+        public static string SuperGridFilterInvalidArg = "SuperGrid_FilterInvalidArg";
+        /// <summary>
+        /// Identifies Filter expression evaluation error 'Invalid 'Empty' operation' text.
+        /// </summary>
+        public static string SuperGridFilterInvalidEmptyOp = "SuperGrid_FilterInvalidEmptyOp";
+        /// <summary>
+        /// Identifies Filter expression evaluation error 'Invalid DateTime operation' text.
+        /// </summary>
+        public static string SuperGridFilterInvalidDateTimeOp = "SuperGrid_FilterInvalidDateTimeOp";
+        /// <summary>
+        /// Identifies Filter expression evaluation error 'Invalid bool operation' text.
+        /// </summary>
+        public static string SuperGridFilterInvalidBoolOp = "SuperGrid_FilterInvalidBoolOp";
+        /// <summary>
+        /// Identifies Filter expression evaluation error 'Invalid string operation' text.
+        /// </summary>
+        public static string SuperGridFilterInvalidStringOp = "SuperGrid_FilterInvalidStringOp";
+        /// <summary>
+        /// Identifies Filter expression evaluation error 'Invalid numeric operation' text.
+        /// </summary>
+        public static string SuperGridFilterInvalidNumericOp = "SuperGrid_FilterInvalidNumericOp";
+        /// <summary>
+        /// Identifies Filter expression evaluation error 'Invalid logical evaluation' text.
+        /// </summary>
+        public static string SuperGridFilterInvalidEval = "SuperGrid_FilterInvalidEval";
+        /// <summary>
+        /// Identifies Filter expression evaluation error 'Undefined User function' text.
+        /// </summary>
+        public static string SuperGridFilterUndefinedFunction = "SuperGrid_FilterUndefinedFunction";
+        /// <summary>
+        /// Identifies custom filter dialog title 'Custom Filter' text.
+        /// </summary>
+        public static string SuperGridFilterCustomFilter = "SuperGrid_FilterCustomFilter";
+        /// <summary>
+        /// Identifies custom filter dialog 'New Filter' text.
+        /// </summary>
+        public static string SuperGridNewFilterExpr = "SuperGrid_NewFilterExpr";
+        /// <summary>
+        /// Identifies custom filter dialog 'New' button text.
+        /// </summary>
+        public static string SuperGridNewFilter = "SuperGrid_NewFilter";
+        /// <summary>
+        /// Identifies custom filter dialog 'Delete' button text.
+        /// </summary>
+        public static string SuperGridDeleteFilter = "SuperGrid_DeleteFilter";
+        /// <summary>
+        /// Identifies custom filter dialog 'Filter Name' text.
+        /// </summary>
+        public static string SuperGridFilterName = "SuperGrid_FilterName";
+        /// <summary>
+        /// Identifies custom filter dialog 'Description' text.
+        /// </summary>
+        public static string SuperGridFilterDescription = "SuperGrid_FilterDescription";
+        /// <summary>
+        /// Identifies custom filter dialog 'Show in FilterPopup' text.
+        /// </summary>
+        public static string SuperGridShowInFilterPopup = "SuperGrid_ShowInFilterPopup";
+        /// <summary>
+        /// Identifies custom filter dialog title 'Custom Filter' text.
+        /// </summary>
+        public static string SuperGridFilterHelpTitle = "SuperGrid_FilterHelpTitle";
+        /// <summary>
+        /// Identifies the default GroupBy WaterMarkText.
+        /// </summary>
+        public static string SuperGridGroupByWaterMarkText = "SuperGrid_GroupByWaterMarkText";
+
+        #endregion
+
+        /// <summary>
+        /// Occurs when DotNetBar is looking for translated text for one of the internal text that are
+        /// displayed on menus, toolbars and customize forms. You need to set Handled=true if you want
+        /// your custom text to be used instead of the built-in system value.
+        /// </summary>
+        public static event DotNetBarManager.LocalizeStringEventHandler LocalizeString;
+
+        internal static void InvokeLocalizeString(LocalizeEventArgs e)
+        {
+            if (LocalizeString != null)
+            {
+                LocalizeString(null, e);
+            }
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/LogItem.cs b/PROMS/DotNetBar Source Code/LogItem.cs
new file mode 100644
index 00000000..b29047c2
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/LogItem.cs	
@@ -0,0 +1,589 @@
+#if (FRAMEWORK20)
+using System;
+using System.Text;
+using System.Drawing;
+using System.Windows.Forms;
+using System.Drawing.Drawing2D;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represents an item that displays log information in list container.
+    /// </summary>
+    public class LogItem : BaseItem
+    {
+        #region Private Variables
+        private const int DefaultWidth = 96;
+        private const int VerticalPadding = 3;
+        private const int HorizontalPadding = 7;
+        private const int TextLineSpacing = 4;
+        private const int MinimumHeight = 32;
+        private Size _CalloutSize = new Size(10, 10);
+        private int _CornerSize = 5;
+        #endregion
+
+        #region Events
+        /// <summary>
+        /// Occurs when text markup link is clicked. Markup links can be created using "a" tag, for example:
+        /// <a name="MyLink">Markup link</a>
+        /// </summary>
+        public event MarkupLinkClickEventHandler MarkupLinkClick;
+        #endregion
+
+        #region Internal Implementation
+        /// <summary>
+        /// Initializes a new instance of the LogItem class.
+        /// </summary>
+        /// <param name=""></param>
+        public LogItem():this("","")
+        {
+        }
+		/// <summary>
+        /// Creates new instance of LogItem and assigns the name to it.
+		/// </summary>
+		/// <param name="sItemName">Item name.</param>
+		public LogItem(string sItemName):this(sItemName,"") {}
+		/// <summary>
+        /// Creates new instance of LogItem and assigns the name and text to it.
+		/// </summary>
+		/// <param name="sItemName">Item name.</param>
+		/// <param name="ItemText">item text.</param>
+        public LogItem(string sItemName, string ItemText)
+            : base(sItemName, ItemText)
+        {
+            SetIsContainer(true);
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            if (BarUtilities.DisposeItemImages && !this.DesignMode)
+            {
+                BarUtilities.DisposeImage(ref _Image);
+            }
+            base.Dispose(disposing);
+        }
+
+        /// <summary>
+		/// Returns copy of the item.
+		/// </summary>
+		public override BaseItem Copy()
+		{
+            LogItem copy = new LogItem(m_Name);
+			this.CopyToItem(copy);
+			return copy;
+		}
+		/// <summary>
+		/// Copies the ButtonItem specific properties to new instance of the item.
+		/// </summary>
+		/// <param name="copy">New ButtonItem instance.</param>
+        protected override void CopyToItem(BaseItem instanceCopy)
+        {
+            LogItem copy = instanceCopy as LogItem;
+            base.CopyToItem(instanceCopy);
+
+            copy.BackColor = this.BackColor;
+            copy.Created = this.Created;
+            copy.HeaderTextColor = this.HeaderTextColor;
+            if (this.Image != null)
+                copy.Image = (Image) this.Image.Clone();
+            copy.ImagePosition = this.ImagePosition;
+            copy.SourceName = this.SourceName;
+            copy.TextColor = this.TextColor;
+        }
+
+        public override BaseItem ItemAtLocation(int x, int y)
+        {
+            if (this.SubItems.Count > 0)
+            {
+                BaseItem item = base.ItemAtLocation(x, y);
+                if (item != null) return item;
+            }
+            return this.Bounds.Contains(x, y) ? this : null;
+        }
+
+        protected virtual int GetTextWidth(Rectangle bounds)
+        {
+            int textWidth = Math.Max(0, bounds.Width - (HorizontalPadding * 2 + _CalloutSize.Width + (_Image != null ? _ImageSize.Width : 0)));
+            return textWidth;
+        }
+
+        public override void RecalcSize()
+        {
+            // We accept the width assigned and calculate the height based on that...
+            Rectangle bounds = this.DisplayRectangle;
+            Size imageSize = _ImageSize;
+
+            if (bounds.Width <= 0)
+            {
+                if (_Image != null)
+                    bounds.Width = imageSize.Width;
+                bounds.Width += DefaultWidth;
+            }
+
+            if (_Image != null && bounds.Width - (imageSize.Width + 25) <= 1)
+            {
+                bounds.Height = imageSize.Height;
+            }
+            else
+            {
+                int totalHeight = VerticalPadding * 2;
+                Control parent = this.ContainerControl as Control;
+                if (parent != null)
+                {
+                    Font font = parent.Font;
+                    using (Graphics g = parent.CreateGraphics())
+                    {
+                        int textWidth = GetTextWidth(bounds);
+                        Size textSize = TextDrawing.MeasureString(g, (string.IsNullOrEmpty(this.SourceName) ? "A" : this.SourceName), font);
+                        totalHeight += textSize.Height + TextLineSpacing;
+
+                        textSize = ButtonItemLayout.MeasureItemText(this, g, textWidth, font, eTextFormat.WordBreak, parent.RightToLeft == RightToLeft.Yes);
+                        //textSize = TextDrawing.MeasureString(g, this.Text, font, textWidth, eTextFormat.WordBreak);
+
+                        totalHeight += textSize.Height + TextLineSpacing;
+                    }
+                }
+                bounds.Height = Math.Max(totalHeight, (imageSize != null ? imageSize.Height : MinimumHeight));
+            }
+
+            base.RecalcSize();
+
+            m_Rect = bounds;
+        }
+
+        public override void Paint(ItemPaintArgs p)
+        {
+            Graphics g = p.Graphics;
+            Rectangle bounds = this.DisplayRectangle;
+
+            if (_Image != null)
+            {
+                Rectangle imageRect = GetImageRect(bounds);
+                g.DrawImage(_Image, imageRect);
+            }
+
+            Rectangle contentBounds = GetContentBounds(bounds);
+
+            // Draw shadow
+            Rectangle shadowBounds = contentBounds;
+            shadowBounds.Inflate(1, 0);
+            shadowBounds.Offset(0, 1);
+            using (GraphicsPath path = CreateCalloutPath(shadowBounds))
+            {
+                using (Pen pen = new Pen(Color.FromArgb(32, Color.Black)))
+                    g.DrawPath(pen, path);
+            }
+
+            using (GraphicsPath path = CreateCalloutPath(contentBounds))
+            {
+                Brush fill = GetCalloutBrush();
+                if (fill != null)
+                {
+                    g.FillPath(fill, path);
+                    fill.Dispose();
+                }
+                Pen pen = GetCalloutPen();
+                if (pen != null)
+                {
+                    g.DrawPath(pen, path);
+                    pen.Dispose();
+                }
+            }
+
+            Color headerColor = GetHeaderColor();
+            Rectangle headerTextBounds = GetTextBounds(bounds);
+            Rectangle textBounds = headerTextBounds;
+            string userName = this.SourceName;
+            if (!string.IsNullOrEmpty(userName))
+            {
+                using (Font font = new Font(p.Font, FontStyle.Bold))
+                {
+                    TextDrawing.DrawString(g, userName, font, headerColor, headerTextBounds, eTextFormat.Top | eTextFormat.Left);
+                    textBounds.Y += font.Height + TextLineSpacing;
+                    textBounds.Height -= font.Height + TextLineSpacing;
+                }
+            }
+            if (_Created != DateTime.MinValue && _Created != DateTime.MaxValue)
+            {
+                TimeSpan span = DateTime.Now.Subtract(_Created);
+                //Console.WriteLine("Tweet from {0} created on {1}", SourceName, _Created);
+                string timeString = GetHumanTimeSpan(span);
+                using (Font font = new Font(p.Font, FontStyle.Italic))
+                {
+                    TextDrawing.DrawString(g, timeString, font, headerColor, headerTextBounds, eTextFormat.Top | eTextFormat.Right);
+                    headerTextBounds.Y += font.Height + TextLineSpacing;
+                    headerTextBounds.Height -= font.Height + TextLineSpacing;
+                }
+            }
+
+            string text = this.Text;
+            Color textColor = GetTextColor();
+            if (!string.IsNullOrEmpty(text))
+            {
+                Font font = p.Font;
+                if (this.TextMarkupBody != null)
+                {
+                    TextMarkup.MarkupDrawContext d = new TextMarkup.MarkupDrawContext(g, font, textColor, p.RightToLeft);
+                    d.HotKeyPrefixVisible = true;
+                    this.TextMarkupBody.Bounds = textBounds;
+                    this.TextMarkupBody.Render(d);
+                }
+                else
+                    TextDrawing.DrawString(g,
+                        text,
+                        font,
+                        textColor,
+                        textBounds,
+                        eTextFormat.Top | eTextFormat.Left | eTextFormat.WordBreak | eTextFormat.WordEllipsis);
+            }
+        }
+
+        private Color _TextColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets the color of the control text body.
+        /// </summary>
+        [Category("Columns"), Description("Indicates color of control text body.")]
+        public Color TextColor
+        {
+            get { return _TextColor; }
+            set { _TextColor = value; }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeTextColor()
+        {
+            return !_TextColor.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetTextColor()
+        {
+            this.TextColor = Color.Empty;
+        }
+
+        private Color GetTextColor()
+        {
+            if (!_TextColor.IsEmpty)
+                return _TextColor;
+            return Color.Black;
+        }
+
+        private Color _HeaderTextColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets the color of the header text.
+        /// </summary>
+        [Category("Columns"), Description("Indicates color of header text.")]
+        public Color HeaderTextColor
+        {
+            get { return _HeaderTextColor; }
+            set { _HeaderTextColor = value; }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeHeaderTextColor()
+        {
+            return !_HeaderTextColor.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetHeaderTextColor()
+        {
+            this.HeaderTextColor = Color.Empty;
+        }
+
+        private Color GetHeaderColor()
+        {
+            if (!_HeaderTextColor.IsEmpty) return _HeaderTextColor;
+            return ColorScheme.GetColor(0x5D8CCB);
+        }
+
+        protected virtual Rectangle GetTextBounds(Rectangle bounds)
+        {
+            Rectangle textBounds = GetContentBounds(bounds);
+            if (_ImagePosition == eLogItemImagePosition.Left)
+                textBounds.X += _CalloutSize.Width;
+            textBounds.Width -= _CalloutSize.Width;
+            textBounds.Inflate(-HorizontalPadding, -VerticalPadding);
+            return textBounds;
+        }
+
+        private Brush GetCalloutBrush()
+        {
+            return new SolidBrush(_BackColor);
+            return new SolidBrush(ColorScheme.GetColor(0xE6EDF7));
+            return new SolidBrush(Color.FromArgb(208, Color.White));
+        }
+
+        private Pen GetCalloutPen()
+        {
+            return new Pen(ColorScheme.GetColor(0x5D8CC9), 1f);
+        }
+
+        private GraphicsPath CreateCalloutPath(Rectangle contentBounds)
+        {
+            GraphicsPath path = new GraphicsPath();
+            if (_ImagePosition == eLogItemImagePosition.Left)
+            {
+                if (_CornerSize == 0)
+                {
+                    Rectangle pathBounds = contentBounds;
+                    pathBounds.Width--;
+                    pathBounds.Height--;
+                    int i = _CalloutSize.Height / 2;
+                    path.AddLine(pathBounds.X + _CalloutSize.Width, pathBounds.Y + _CalloutSize.Height + i, pathBounds.X, pathBounds.Y + i * 2);
+                    path.AddLine(pathBounds.X, pathBounds.Y + i * 2, pathBounds.X + _CalloutSize.Width, pathBounds.Y + i);
+                    path.AddLine(pathBounds.X + _CalloutSize.Width, pathBounds.Y, pathBounds.Right, pathBounds.Y);
+                    path.AddLine(pathBounds.Right, pathBounds.Bottom, pathBounds.X + _CalloutSize.Width, pathBounds.Bottom);
+                    path.CloseAllFigures();
+                }
+                else
+                {
+                    Rectangle pathBounds = contentBounds;
+                    pathBounds.Width--;
+                    pathBounds.Height--;
+                    int topOffset = _CornerSize;
+                    int i = _CalloutSize.Height / 2;
+                    path.AddLine(pathBounds.X + _CalloutSize.Width, pathBounds.Y + topOffset + _CalloutSize.Height + i, pathBounds.X, pathBounds.Y + topOffset + i * 2);
+                    path.AddLine(pathBounds.X, pathBounds.Y + topOffset + i * 2, pathBounds.X + _CalloutSize.Width, pathBounds.Y + topOffset + i);
+                    pathBounds.X += _CalloutSize.Width;
+                    pathBounds.Width -= _CalloutSize.Width;
+                    ArcData cornerArc = ElementStyleDisplay.GetCornerArc(pathBounds, _CornerSize, eCornerArc.TopLeft);
+                    path.AddArc(cornerArc.X, cornerArc.Y, cornerArc.Width, cornerArc.Height, cornerArc.StartAngle, cornerArc.SweepAngle);
+                    cornerArc = ElementStyleDisplay.GetCornerArc(pathBounds, _CornerSize, eCornerArc.TopRight);
+                    path.AddArc(cornerArc.X, cornerArc.Y, cornerArc.Width, cornerArc.Height, cornerArc.StartAngle, cornerArc.SweepAngle);
+                    cornerArc = ElementStyleDisplay.GetCornerArc(pathBounds, _CornerSize, eCornerArc.BottomRight);
+                    path.AddArc(cornerArc.X, cornerArc.Y, cornerArc.Width, cornerArc.Height, cornerArc.StartAngle, cornerArc.SweepAngle);
+                    cornerArc = ElementStyleDisplay.GetCornerArc(pathBounds, _CornerSize, eCornerArc.BottomLeft);
+                    path.AddArc(cornerArc.X, cornerArc.Y, cornerArc.Width, cornerArc.Height, cornerArc.StartAngle, cornerArc.SweepAngle);
+                    path.CloseAllFigures();
+                }
+            }
+            else
+            {
+                if (_CornerSize == 0)
+                {
+                    Rectangle pathBounds = contentBounds;
+                    pathBounds.Width--;
+                    pathBounds.Height--;
+                    int i = _CalloutSize.Height / 2;
+                    path.AddLine(pathBounds.Right - _CalloutSize.Width, pathBounds.Y + _CalloutSize.Height + i, pathBounds.Right, pathBounds.Y + i * 2);
+                    path.AddLine(pathBounds.Right, pathBounds.Y + i * 2, pathBounds.Right - _CalloutSize.Width, pathBounds.Y + i);
+                    path.AddLine(pathBounds.Right - _CalloutSize.Width, pathBounds.Y, pathBounds.X, pathBounds.Y);
+                    path.AddLine(pathBounds.X, pathBounds.Bottom, pathBounds.Right - _CalloutSize.Width, pathBounds.Bottom);
+                    path.CloseAllFigures();
+                }
+                else
+                {
+                    Rectangle pathBounds = contentBounds;
+                    pathBounds.Width--;
+                    pathBounds.Height--;
+                    int topOffset = _CornerSize;
+                    int i = _CalloutSize.Height / 2;
+
+                    pathBounds.Width -= _CalloutSize.Width;
+                    ArcData cornerArc = ElementStyleDisplay.GetCornerArc(pathBounds, _CornerSize, eCornerArc.TopLeft);
+                    path.AddArc(cornerArc.X, cornerArc.Y, cornerArc.Width, cornerArc.Height, cornerArc.StartAngle, cornerArc.SweepAngle);
+                    cornerArc = ElementStyleDisplay.GetCornerArc(pathBounds, _CornerSize, eCornerArc.TopRight);
+                    path.AddArc(cornerArc.X, cornerArc.Y, cornerArc.Width, cornerArc.Height, cornerArc.StartAngle, cornerArc.SweepAngle);
+
+                    pathBounds.Width += _CalloutSize.Width;
+                    path.AddLine(pathBounds.Right - _CalloutSize.Width, pathBounds.Y + i, pathBounds.Right, pathBounds.Y + i * 2);
+                    path.AddLine(pathBounds.Right, pathBounds.Y + i * 2, pathBounds.Right - _CalloutSize.Width, pathBounds.Y + _CalloutSize.Height + i);
+                    pathBounds.Width -= _CalloutSize.Width;
+
+                    cornerArc = ElementStyleDisplay.GetCornerArc(pathBounds, _CornerSize, eCornerArc.BottomRight);
+                    path.AddArc(cornerArc.X, cornerArc.Y, cornerArc.Width, cornerArc.Height, cornerArc.StartAngle, cornerArc.SweepAngle);
+                    cornerArc = ElementStyleDisplay.GetCornerArc(pathBounds, _CornerSize, eCornerArc.BottomLeft);
+                    path.AddArc(cornerArc.X, cornerArc.Y, cornerArc.Width, cornerArc.Height, cornerArc.StartAngle, cornerArc.SweepAngle);
+                    path.CloseAllFigures();
+                }
+            }
+
+            return path;
+        }
+
+        private Rectangle GetContentBounds(Rectangle bounds)
+        {
+            if (_Image != null)
+            {
+                if (_ImagePosition == eLogItemImagePosition.Left)
+                    bounds.X += _ImageSize.Width;
+                bounds.Width -= _ImageSize.Width;
+            }
+            // Adjust for shadow
+            bounds.Height--;
+            bounds.Width--;
+            return bounds;
+        }
+
+        private Rectangle GetImageRect(Rectangle bounds)
+        {
+            if (_ImagePosition == eLogItemImagePosition.Left)
+                return new Rectangle(bounds.X, bounds.Y, _ImageSize.Width, _ImageSize.Height);
+            return new Rectangle(bounds.Right - _ImageSize.Width, bounds.Y, _ImageSize.Width, _ImageSize.Height);
+        }
+
+        private Image _Image = null;
+        private Size _ImageSize = new Size(48, 48);
+        /// <summary>
+        /// Gets or sets the image displayed on the log item.
+        /// </summary>
+        [DefaultValue(null), Category("Appearance"), Description("Specifies image displayed on the log item.")]
+        public Image Image
+        {
+            get { return _Image; }
+            set
+            {
+                if (_Image == value)
+                    return;
+                _Image = value;
+                _ImageSize = new Size(48, 48);
+                if (_Image != null)
+                {
+                    try
+                    {
+                        _ImageSize = _Image.Size;
+                    }
+                    catch { }
+                }
+                NeedRecalcSize = true;
+                this.Refresh();
+            }
+        }
+
+        private eLogItemImagePosition _ImagePosition = eLogItemImagePosition.Left;
+        /// <summary>
+        /// Gets or sets the image position in relation to text.
+        /// </summary>
+        [DefaultValue(eLogItemImagePosition.Left), Category("Appearance"), Description("Specifies the image position in relation to text.")]
+        public eLogItemImagePosition ImagePosition
+        {
+            get { return _ImagePosition; }
+            set
+            {
+
+                if (_ImagePosition == value)
+                    return;
+                _ImagePosition = value;
+                NeedRecalcSize = true;
+                this.Refresh();
+            }
+        }
+
+        private string _SourceName = "";
+        [DefaultValue(""), Category("Appearance"), Description("Specifies the log item source name")]
+        public string SourceName
+        {
+            get { return _SourceName; }
+            set
+            {
+                _SourceName = value;
+            }
+        }
+
+        private DateTime _Created;
+        public DateTime Created
+        {
+            get { return _Created; }
+            set { _Created = value; }
+        }
+
+        private string GetHumanTimeSpan(TimeSpan span)
+        {
+            if (span.TotalMinutes <= 1.5)
+                return "now";
+            else if (span.TotalMinutes < 2)
+                return "about a minute ago";
+            else if (span.TotalMinutes < 60)
+                return span.TotalMinutes.ToString("N0") + " minutes ago";
+            else if (span.TotalHours < 2)
+                return span.TotalHours.ToString("N0") + " hour ago";
+            else if (span.TotalHours < 24)
+                return span.TotalHours.ToString("N0") + " hours ago";
+            else if (span.TotalDays < 2)
+                return span.TotalDays.ToString("N0") + " day ago";
+            else if (span.TotalDays < 30)
+                return span.TotalDays.ToString("N0") + " days ago";
+            return (span.TotalDays / 30).ToString("N0") + " months ago";
+        }
+
+        private Color _BackColor = Color.White;
+        /// <summary>
+        /// Gets or sets the background color of the item.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates background color of the item.")]
+        public Color BackColor
+        {
+            get { return _BackColor; }
+            set
+            {
+                if (value != _BackColor)
+                {
+                    Color oldValue = _BackColor;
+                    _BackColor = value;
+                    OnBackColorChanged(oldValue, value);
+                }
+            }
+        }
+        private void OnBackColorChanged(Color oldValue, Color newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("BackColor"));
+            this.Refresh();
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeBackColor()
+        {
+            return _BackColor != Color.White;
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetBackColor()
+        {
+            this.BackColor = Color.White;
+        }
+        protected void SetBackColor(Color color)
+        {
+            _BackColor = color;
+        }
+        #endregion
+
+        #region Markup Support
+        /// <summary>
+        /// Gets whether item supports text markup. Default is false.
+        /// </summary>
+        protected override bool IsMarkupSupported
+        {
+            get { return true; }
+        }
+
+        protected override void TextMarkupLinkClick(object sender, EventArgs e)
+        {
+            TextMarkup.HyperLink link = sender as TextMarkup.HyperLink;
+            if (link != null)
+                OnMarkupLinkClick(new MarkupLinkClickEventArgs(link.Name, link.HRef));
+            base.TextMarkupLinkClick(sender, e);
+        }
+
+        protected virtual void OnMarkupLinkClick(MarkupLinkClickEventArgs e)
+        {
+            if (this.MarkupLinkClick != null)
+                MarkupLinkClick(this, e);
+        }
+        #endregion
+    }
+
+    public enum eLogItemImagePosition
+    {
+        Left,
+        Right
+    }
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/MDISystemItem.cs b/PROMS/DotNetBar Source Code/MDISystemItem.cs
new file mode 100644
index 00000000..40e4c9dd
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/MDISystemItem.cs	
@@ -0,0 +1,837 @@
+using System;
+using System.Drawing;
+using System.Drawing.Imaging;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Summary description for MDISystemItem.
+	/// </summary>
+	[System.ComponentModel.ToolboxItem(false),System.ComponentModel.DesignTimeVisible(false)]
+	public class MDISystemItem:PopupItem
+	{
+		private bool m_IsSystemIcon;
+		private Icon m_Icon;
+
+		private bool m_MinimizeEnabled, m_RestoreEnabled, m_CloseEnabled;
+		private SystemButton m_MouseOver;
+		private SystemButton m_MouseDown;
+		private SystemButton m_LastButtonClick;
+
+		public MDISystemItem():this("") {}
+		public MDISystemItem(string sName):base(sName)
+		{
+			this.GlobalItem=false;
+			this.SetSystemItem(true);
+			m_IsSystemIcon=false;
+			m_Icon=null;
+			m_MinimizeEnabled=true;
+			m_RestoreEnabled=true;
+			m_CloseEnabled=true;
+			m_MouseOver=SystemButton.None;
+			m_MouseDown=SystemButton.None;
+			m_LastButtonClick=SystemButton.None;
+			this.CanCustomize=false;
+			this.Tooltip="";
+			this.ShowSubItems=false;
+			m_ShouldSerialize=false;
+			this.IsAccessible=false;
+		}
+
+        protected override void Dispose(bool disposing)
+        {
+            if (m_Icon != null)
+            {
+                m_Icon.Dispose();
+                m_Icon = null;
+            }
+            foreach (BaseItem item in this.SubItems)
+            {
+                ButtonItem button = item as ButtonItem;
+                if (button != null && button.Image != null)
+                {
+                    button.Image.Dispose();
+                    button.Image = null;
+                }
+            }
+            base.Dispose(disposing);
+        }
+
+		/// <summary>
+		/// Returns copy of CustomizeItem item
+		/// </summary>
+		public override BaseItem Copy()
+		{
+			MDISystemItem objCopy=new MDISystemItem();
+			this.CopyToItem(objCopy);
+			objCopy.MinimizeEnabled=m_MinimizeEnabled;
+			objCopy.RestoreEnabled=m_RestoreEnabled;
+			objCopy.CloseEnabled=m_CloseEnabled;
+			return objCopy;
+		}
+		protected override void CopyToItem(BaseItem copy)
+		{
+			MDISystemItem objCopy=copy as MDISystemItem;
+			base.CopyToItem(objCopy);
+            objCopy.IsSystemIcon=m_IsSystemIcon;
+		}
+		
+		/// <summary>
+		/// MDI System Item can render itself as either Simple icon with system drop down menu or set of
+		/// system buttons Minimize, Restore and Close. This item is rendered on the Bar that is designated as
+		/// Menu bar and when bar is used on MDI form and MDI Child form is maximized.
+		/// </summary>
+		public bool IsSystemIcon
+		{
+			get
+			{
+				return m_IsSystemIcon;
+			}
+			set
+			{
+				if(m_IsSystemIcon!=value)
+				{
+					m_IsSystemIcon=value;
+					NeedRecalcSize=true;
+					if(m_IsSystemIcon)
+					{
+						CreateSystemMenu();
+						this.ShowSubItems=true;
+					}
+					else
+					{
+						this.SubItems.Clear();
+						this.ShowSubItems=false;
+					}
+					this.ShowSubItems=m_IsSystemIcon;
+					this.Refresh();
+				}
+			}
+		}
+
+		public override void Paint(ItemPaintArgs pa)
+		{
+			if(this.SuspendLayout)
+				return;
+
+            if (BarFunctions.IsOffice2007Style(this.EffectiveStyle))
+            {
+                if (pa.Renderer != null)
+                {
+                    pa.Renderer.DrawMdiSystemItem(new MdiSystemItemRendererEventArgs(pa.Graphics, this));
+                    return;
+                }
+            }
+
+			System.Drawing.Graphics g=pa.Graphics;
+			Rectangle r;
+			
+			if(m_IsSystemIcon)
+			{
+				r=this.DisplayRectangle;
+				r.Offset((r.Width-16)/2,(r.Height-16)/2);
+				if(m_Icon!=null)
+					g.DrawIconUnstretched(m_Icon,r);
+				return;
+			}
+
+            if (this.EffectiveStyle == eDotNetBarStyle.Office2000)
+			{
+                r = new Rectangle(this.DisplayRectangle.Location, GetButtonSize());
+				r.Inflate(-1,-2);
+				r.Location=this.DisplayRectangle.Location;
+
+				if(this.Orientation==eOrientation.Horizontal)
+					r.Offset(0,(this.DisplayRectangle.Height-r.Height)/2);
+				else
+					r.Offset((this.WidthInternal-r.Width)/2,0);
+
+				if(!m_MinimizeEnabled)
+					System.Windows.Forms.ControlPaint.DrawCaptionButton(g,r,System.Windows.Forms.CaptionButton.Minimize,System.Windows.Forms.ButtonState.Inactive);
+				else if(m_MouseDown==SystemButton.Minimize)
+					System.Windows.Forms.ControlPaint.DrawCaptionButton(g,r,System.Windows.Forms.CaptionButton.Minimize,System.Windows.Forms.ButtonState.Pushed);
+				else
+					System.Windows.Forms.ControlPaint.DrawCaptionButton(g,r,System.Windows.Forms.CaptionButton.Minimize,System.Windows.Forms.ButtonState.Normal);
+				
+				if(this.Orientation==eOrientation.Horizontal)
+					r.Offset(r.Width+1,0);
+				else
+					r.Offset(0,r.Height+1);
+
+				if(!m_RestoreEnabled)
+                    System.Windows.Forms.ControlPaint.DrawCaptionButton(g,r,System.Windows.Forms.CaptionButton.Restore,System.Windows.Forms.ButtonState.Inactive);
+				else if(m_MouseDown==SystemButton.Restore)
+					System.Windows.Forms.ControlPaint.DrawCaptionButton(g,r,System.Windows.Forms.CaptionButton.Restore,System.Windows.Forms.ButtonState.Pushed);
+				else
+					System.Windows.Forms.ControlPaint.DrawCaptionButton(g,r,System.Windows.Forms.CaptionButton.Restore,System.Windows.Forms.ButtonState.Normal);
+
+				if(this.Orientation==eOrientation.Horizontal)
+					r.Offset(r.Width+3,0);
+				else
+					r.Offset(0,r.Height+3);
+
+				if(!m_CloseEnabled)
+                    System.Windows.Forms.ControlPaint.DrawCaptionButton(g,r,System.Windows.Forms.CaptionButton.Close,System.Windows.Forms.ButtonState.Inactive);
+				else if(m_MouseDown==SystemButton.Close)
+					System.Windows.Forms.ControlPaint.DrawCaptionButton(g,r,System.Windows.Forms.CaptionButton.Close,System.Windows.Forms.ButtonState.Pushed);
+				else
+					System.Windows.Forms.ControlPaint.DrawCaptionButton(g,r,System.Windows.Forms.CaptionButton.Close,System.Windows.Forms.ButtonState.Normal);
+			}
+			else
+			{
+                r = new Rectangle(this.DisplayRectangle.Location, GetButtonSize());
+				r.Inflate(-1,-1);
+				if(this.Orientation==eOrientation.Horizontal)
+					r.Offset(0,(this.DisplayRectangle.Height-r.Height)/2);
+				else
+					r.Offset((this.WidthInternal-r.Width)/2,0);
+
+				this.PaintButton(pa,SystemButton.Minimize,r);
+
+				if(this.Orientation==eOrientation.Horizontal)
+					r.Offset(r.Width,0);
+				else
+					r.Offset(0,r.Height);
+				this.PaintButton(pa,SystemButton.Restore,r);
+
+				if(this.Orientation==eOrientation.Horizontal)
+					r.Offset(r.Width+2,0);
+				else
+					r.Offset(0,r.Height+2);
+				this.PaintButton(pa,SystemButton.Close,r);
+
+			}
+		}
+
+		private void PaintButton(ItemPaintArgs pa, SystemButton btn, Rectangle r)
+		{
+			System.Drawing.Graphics g=pa.Graphics;
+
+			if(this.IsThemed)
+			{
+				System.Windows.Forms.Control container=this.ContainerControl as System.Windows.Forms.Control;
+				if(container!=null)
+				{
+					ThemeWindow theme=pa.ThemeWindow;
+					ThemeWindowParts part=ThemeWindowParts.MdiMinButton;
+					ThemeWindowStates state=ThemeWindowStates.ButtonNormal;
+					switch(btn)
+					{
+						case SystemButton.Close:
+						{
+							part=ThemeWindowParts.MdiCloseButton;
+							break;
+						}
+						case SystemButton.Help:
+						{
+							part=ThemeWindowParts.MdiHelpButton;
+							break;
+						}
+						case SystemButton.Restore:
+						{
+							part=ThemeWindowParts.MdiRestoreButton;
+							break;
+						}
+					}
+					if(btn==m_MouseDown)
+						state=ThemeWindowStates.ButtonPushed;
+					else if(btn==m_MouseOver)
+						state=ThemeWindowStates.ButtonHot;
+
+                    theme.DrawBackground(g,part,state,r);
+					return;
+				}
+			}
+
+			// Draw state if any
+			if(btn==m_MouseDown)
+			{
+				if(pa.Colors.ItemPressedBackground2.IsEmpty)
+					g.FillRectangle(new SolidBrush(pa.Colors.ItemPressedBackground),r);
+				else
+				{
+					System.Drawing.Drawing2D.LinearGradientBrush gradient=BarFunctions.CreateLinearGradientBrush(r,pa.Colors.ItemPressedBackground,pa.Colors.ItemPressedBackground2,pa.Colors.ItemPressedBackgroundGradientAngle);
+					g.FillRectangle(gradient,r);
+					gradient.Dispose();
+				}
+				NativeFunctions.DrawRectangle(g,SystemPens.Highlight,r);
+			}
+			else if(btn==m_MouseOver)
+			{
+				if(!pa.Colors.ItemHotBackground2.IsEmpty)
+				{
+					System.Drawing.Drawing2D.LinearGradientBrush gradient=BarFunctions.CreateLinearGradientBrush(r,pa.Colors.ItemHotBackground,pa.Colors.ItemHotBackground2,pa.Colors.ItemHotBackgroundGradientAngle);
+					g.FillRectangle(gradient,r);
+					gradient.Dispose();
+				}
+				else
+					g.FillRectangle(new SolidBrush(pa.Colors.ItemHotBackground),r);
+				NativeFunctions.DrawRectangle(g,new Pen(pa.Colors.ItemHotBorder),r);
+			}
+
+            using (Bitmap bmp = GetButtonBitmap(g, btn, r, pa.Colors))
+            {
+                if (btn == SystemButton.Minimize && !m_MinimizeEnabled ||
+                    btn == SystemButton.Restore && !m_RestoreEnabled ||
+                    btn == SystemButton.Close && !m_CloseEnabled)
+                {
+                    float[][] array = new float[5][];
+                    array[0] = new float[5] { 0, 0, 0, 0, 0 };
+                    array[1] = new float[5] { 0, 0, 0, 0, 0 };
+                    array[2] = new float[5] { 0, 0, 0, 0, 0 };
+                    array[3] = new float[5] { .5f, .5f, .5f, .5f, 0 };
+                    array[4] = new float[5] { 0, 0, 0, 0, 0 };
+                    System.Drawing.Imaging.ColorMatrix grayMatrix = new System.Drawing.Imaging.ColorMatrix(array);
+                    System.Drawing.Imaging.ImageAttributes disabledImageAttr = new System.Drawing.Imaging.ImageAttributes();
+                    disabledImageAttr.ClearColorKey();
+                    disabledImageAttr.SetColorMatrix(grayMatrix);
+                    g.DrawImage(bmp, r, 0, 0, bmp.Width, bmp.Height, GraphicsUnit.Pixel, disabledImageAttr);
+                }
+                else
+                {
+                    if (btn == m_MouseDown)
+                        r.Offset(1, 1);
+                    g.DrawImageUnscaled(bmp, r);
+                }
+            }
+		}
+
+        internal Bitmap GetButtonBitmap(Graphics g, SystemButton btn, Rectangle r, ColorScheme colorScheme)
+        {
+            Bitmap bmp = new Bitmap(r.Width, r.Height, g);
+            Graphics gBmp = Graphics.FromImage(bmp);
+            Rectangle rBtn = new Rectangle(0, 0, r.Width, r.Height);
+            rBtn.Inflate(0, -1);
+            Rectangle rClip = rBtn;
+            rClip.Inflate(-1, -1);
+            using (SolidBrush brush = new SolidBrush(SystemColors.Control))
+                gBmp.FillRectangle(brush, 0, 0, r.Width, r.Height);
+            gBmp.SetClip(rClip);
+            System.Windows.Forms.ControlPaint.DrawCaptionButton(gBmp, rBtn, (System.Windows.Forms.CaptionButton)btn, System.Windows.Forms.ButtonState.Flat);
+            gBmp.ResetClip();
+            gBmp.Dispose();
+
+            if (!colorScheme.MdiSystemItemForeground.IsEmpty)
+            {
+                Bitmap bitmap = new Bitmap(bmp, bmp.Width, bmp.Height);
+                using (Graphics graphics2 = Graphics.FromImage(bitmap))
+                {
+                    graphics2.Clear(Color.Transparent);
+                    ImageAttributes imageAttrs = new ImageAttributes();
+                    ColorMap map = new ColorMap();
+                    map.OldColor = Color.Black;
+                    map.NewColor = colorScheme.MdiSystemItemForeground;
+                    imageAttrs.SetRemapTable(new ColorMap[] { map }, ColorAdjustType.Bitmap);
+                    graphics2.DrawImage(bmp, new Rectangle(0, 0, bmp.Width, bmp.Height), 0, 0, bmp.Width, bmp.Height, GraphicsUnit.Pixel, imageAttrs, null, IntPtr.Zero);
+                }
+                bmp.Dispose();
+                bmp=bitmap;
+            }
+
+            bmp.MakeTransparent(SystemColors.Control);
+
+            return bmp;
+        }
+
+		protected override void OnTooltip(bool bShow)
+		{
+			base.OnTooltip(bShow);
+			if(!bShow || this.IsSystemIcon)
+				return;
+
+			Point p=System.Windows.Forms.Control.MousePosition;
+			System.Windows.Forms.Control ctrl=this.ContainerControl as System.Windows.Forms.Control;
+			if(ctrl!=null)
+				p=ctrl.PointToClient(p);
+
+			SystemButton btn=this.GetButton(p.X,p.Y);
+
+			using(LocalizationManager lm=new LocalizationManager(this.GetOwner() as IOwnerLocalize))
+			{
+				if(btn==SystemButton.Minimize)
+				{
+					this.Tooltip=lm.GetLocalizedString(LocalizationKeys.MdiSystemItemMinimizeTooltip); //"Minimize";
+				}
+				else if(btn==SystemButton.Restore)
+				{
+					this.Tooltip=lm.GetLocalizedString(LocalizationKeys.MdiSystemItemRestoreTooltip); //"Restore Down";
+				}
+                else if (btn == SystemButton.Maximize)
+                {
+                    this.Tooltip = lm.GetLocalizedString(LocalizationKeys.MdiSystemItemMenuMaximize);
+                }
+				else if(btn==SystemButton.Close)
+				{
+					this.Tooltip=lm.GetLocalizedString(LocalizationKeys.MdiSystemItemCloseTooltip); //"Close";
+				}
+				else
+					this.Tooltip="";
+			}
+		}
+
+		public override void InternalMouseDown(System.Windows.Forms.MouseEventArgs objArg)
+		{
+			base.InternalMouseDown(objArg);
+            if (objArg.Button != System.Windows.Forms.MouseButtons.Left || this.DesignMode || !this.GetEnabled())
+				return;
+
+			if(this.IsSystemIcon)
+			{
+				if(m_Parent!=null)
+				{
+					if(this.Expanded)
+						m_Parent.AutoExpand=false;
+					else
+						m_Parent.AutoExpand=true;
+				}
+
+				this.Expanded=!this.Expanded;
+				return;
+			}
+
+			SystemButton btn=this.GetButton(objArg.X,objArg.Y);
+
+            if (btn == SystemButton.Help)
+            {
+                m_MouseDown = SystemButton.Help;
+                this.Refresh();
+            }
+			else if(m_MinimizeEnabled && btn==SystemButton.Minimize)
+			{
+				m_MouseDown=SystemButton.Minimize;
+				this.Refresh();
+			}
+			else if(m_RestoreEnabled && btn==SystemButton.Restore)
+			{
+				m_MouseDown=SystemButton.Restore;
+				this.Refresh();
+			}
+            else if (!m_RestoreEnabled && btn == SystemButton.Maximize)
+            {
+                m_MouseDown = SystemButton.Maximize;
+                this.Refresh();
+            }
+			else if(m_CloseEnabled && btn==SystemButton.Close)
+			{
+				m_MouseDown=SystemButton.Close;
+				this.Refresh();
+			}
+			else// if(m_MouseDown!=btn)
+			{
+				m_MouseDown=SystemButton.None;
+				this.Refresh();
+			}
+		}
+
+		public override void InternalMouseUp(System.Windows.Forms.MouseEventArgs objArg)
+		{
+			base.InternalMouseUp(objArg);
+			if(m_MouseDown!=SystemButton.None)
+			{
+				m_MouseDown=SystemButton.None;
+				this.Refresh();
+			}
+
+		}
+
+		public override void InternalClick(System.Windows.Forms.MouseButtons mb, System.Drawing.Point mpos)
+		{
+			if(this.IsSystemIcon)
+			{
+				m_LastButtonClick=SystemButton.None;
+				base.InternalClick(mb,mpos);
+				return;
+			}
+
+			Point p=mpos;
+            //System.Windows.Forms.Control ctrl=this.ContainerControl as System.Windows.Forms.Control;
+            //if(ctrl!=null)
+            //    p=ctrl.PointToClient(p);
+
+			m_LastButtonClick=this.GetButton(p.X,p.Y);
+			// Make sure that button is enabled
+			if(m_LastButtonClick==SystemButton.Close && !m_CloseEnabled ||
+				m_LastButtonClick==SystemButton.Minimize && !m_MinimizeEnabled ||
+				m_LastButtonClick==SystemButton.Restore && !m_RestoreEnabled ||
+                m_LastButtonClick == SystemButton.Maximize && m_RestoreEnabled)
+				m_LastButtonClick=SystemButton.None;
+
+            if (m_LastButtonClick != SystemButton.None)
+                base.InternalClick(mb, mpos);
+		}
+
+		public override void InternalMouseLeave()
+		{
+			base.InternalMouseLeave();
+			//if(m_MouseOver==SystemButton.None && (System.Windows.Forms.Control.MouseButtons!=System.Windows.Forms.MouseButtons.Left || m_MouseDown==SystemButton.None))
+				//return;
+			
+			m_MouseDown=SystemButton.None;
+			m_MouseOver=SystemButton.None;
+
+			this.Refresh();
+		}
+
+		public override void InternalMouseMove(System.Windows.Forms.MouseEventArgs objArg)
+		{
+			base.InternalMouseMove(objArg);
+
+			SystemButton btn=this.GetButton(objArg.X,objArg.Y);
+
+            if (btn == SystemButton.Help)
+            {
+                // Help
+                if (m_MouseOver != SystemButton.Help)
+                {
+                    m_MouseOver = SystemButton.Help;
+                    if (this.ToolTipVisible)
+                    {
+                        this.HideToolTip();
+                        this.ResetHover();
+                    }
+                    this.Refresh();
+                }
+                return;
+            }
+
+			if(btn==SystemButton.Minimize)
+			{
+				// Minimize
+				if(m_MouseOver!=SystemButton.Minimize)
+				{
+					m_MouseOver=SystemButton.Minimize;
+					if(this.ToolTipVisible)
+					{
+						this.HideToolTip();
+						this.ResetHover();
+					}
+					this.Refresh();
+				}
+				return;
+			}
+
+			if(btn==SystemButton.Restore)
+			{
+				// Restore
+				if(m_MouseOver!=SystemButton.Restore)
+				{
+					m_MouseOver=SystemButton.Restore;
+					if(this.ToolTipVisible)
+					{
+						this.HideToolTip();
+						this.ResetHover();
+					}
+					this.Refresh();
+				}
+				return;
+			}
+
+            if (btn == SystemButton.Maximize)
+            {
+                // Restore
+                if (m_MouseOver != SystemButton.Maximize)
+                {
+                    m_MouseOver = SystemButton.Maximize;
+                    if (this.ToolTipVisible)
+                    {
+                        this.HideToolTip();
+                        this.ResetHover();
+                    }
+                    this.Refresh();
+                }
+                return;
+            }
+
+
+			if(btn==SystemButton.Close)
+			{
+				// Close
+				if(m_MouseOver!=SystemButton.Close)
+				{
+					m_MouseOver=SystemButton.Close;
+					if(this.ToolTipVisible)
+					{
+						this.HideToolTip();
+						this.ResetHover();
+					}
+					this.Refresh();
+				}
+				return;
+			}
+            
+			if(m_MouseOver!=SystemButton.None)
+			{
+				m_MouseOver=SystemButton.None;
+				if(this.ToolTipVisible)
+				{
+					this.HideToolTip();
+					this.ResetHover();
+				}
+				this.Refresh();
+			}
+		}
+
+		public override void RecalcSize()
+		{
+			if(this.SuspendLayout)
+				return;
+
+            if (m_IsSystemIcon)
+            {
+                m_Rect.Size = new Size(Dpi.Width16, Dpi.Height16);
+            }
+            else
+            {
+                if (this.Orientation == eOrientation.Horizontal)
+                    m_Rect.Size = new Size(GetButtonSize().Width * 3 + 2, GetButtonSize().Height);
+                else
+                    m_Rect.Size = new Size(GetButtonSize().Width, GetButtonSize().Height * 3 + 2);
+            }
+			base.RecalcSize();
+		}
+
+        internal void SetIcon(Icon icon)
+        {
+            if (m_Icon != null) m_Icon.Dispose();
+            if (icon != null)
+                m_Icon = new Icon(icon, Dpi.Width16, Dpi.Height16);
+            else
+                m_Icon = null;
+        }
+
+		public System.Drawing.Icon Icon
+		{
+			get
+			{
+				return m_Icon;
+			}
+			set
+			{
+				if(value!=null)
+					m_Icon=new Icon(value,16,16);
+				else
+                    m_Icon=null;
+				this.Refresh();
+			}
+		}
+
+        /// <summary>
+        /// Returns the single button size.
+        /// </summary>
+        /// <returns>Size of the button.</returns>
+        internal virtual Size GetButtonSize()
+        {
+            return System.Windows.Forms.SystemInformation.MenuButtonSize;
+        }
+
+		internal virtual SystemButton GetButton(int x, int y)
+		{
+            Rectangle r = new Rectangle(this.DisplayRectangle.Location, GetButtonSize());
+			r.Inflate(-1,-2);
+			r.Location=this.DisplayRectangle.Location;
+			
+			if(this.Orientation==eOrientation.Horizontal)
+				r.Offset(0,(this.DisplayRectangle.Height-r.Height)/2);
+			else
+				r.Offset((this.WidthInternal-r.Width)/2,0);
+
+			if(r.Contains(x,y))
+				return SystemButton.Minimize;
+
+			if(this.Orientation==eOrientation.Horizontal)
+				r.Offset(r.Width+1,0);
+			else
+				r.Offset(0,r.Height+1);
+
+            if (r.Contains(x, y))
+            {
+                if(m_RestoreEnabled)
+                    return SystemButton.Restore;
+                return SystemButton.Maximize;
+            }
+
+			if(this.Orientation==eOrientation.Horizontal)
+				r.Offset(r.Width+3,0);
+			else
+				r.Offset(0,r.Height+3);
+
+			if(r.Contains(x,y))
+				return SystemButton.Close;
+
+			return SystemButton.None;
+		}
+
+		internal SystemButton LastButtonClick
+		{
+			get
+			{
+				return m_LastButtonClick;
+			}
+		}
+
+		public bool MinimizeEnabled
+		{
+			get
+			{
+				return m_MinimizeEnabled;
+			}
+			set
+			{
+				if(value!=m_MinimizeEnabled)
+				{
+					m_MinimizeEnabled=value;
+					this.Refresh();
+				}
+			}
+		}
+
+		public bool RestoreEnabled
+		{
+			get
+			{
+				return m_RestoreEnabled;
+			}
+			set
+			{
+				if(value!=m_RestoreEnabled)
+				{
+					m_RestoreEnabled=value;
+					this.Refresh();
+				}
+			}
+		}
+
+		public bool CloseEnabled
+		{
+			get
+			{
+				return m_CloseEnabled;
+			}
+			set
+			{
+				if(value!=m_CloseEnabled)
+				{
+					m_CloseEnabled=value;
+					this.Refresh();
+				}
+			}
+		}
+
+		private Bitmap GetSysImage(SystemButton btn)
+		{
+			if(btn==SystemButton.None)
+				return null;
+            Rectangle rBtn = new Rectangle(0, 0, GetButtonSize().Width - 2, GetButtonSize().Height - 2);
+			Bitmap bmp=new Bitmap(rBtn.Width,rBtn.Height,System.Drawing.Imaging.PixelFormat.Format24bppRgb);
+			//bmp.GetHbitmap();
+
+			Graphics gBmp=Graphics.FromImage(bmp);
+			rBtn.Inflate(0,-1);
+			Rectangle rClip=rBtn;
+			rClip.Inflate(-1,-1);
+			using(SolidBrush brush=new SolidBrush(SystemColors.Control))
+				gBmp.FillRectangle(brush,0,0,bmp.Width,bmp.Height);
+			//gBmp.Clear(SystemColors.Control);
+			gBmp.SetClip(rClip);
+			System.Windows.Forms.ControlPaint.DrawCaptionButton(gBmp,rBtn,(System.Windows.Forms.CaptionButton)btn,System.Windows.Forms.ButtonState.Flat);
+			gBmp.ResetClip();
+			gBmp.Dispose();
+
+			bmp.MakeTransparent(SystemColors.Control);
+
+			return bmp;
+		}
+
+		private void CreateSystemMenu()
+		{
+			using(LocalizationManager lm=new LocalizationManager(this.GetOwner() as IOwnerLocalize))
+			{
+				this.SubItems.Clear();
+				this.PopupType=ePopupType.Menu;
+				ButtonItem btn=new ButtonItem("dotnetbarsysmenurestore");
+                btn.GlobalItem = false;
+				btn.Text=lm.GetLocalizedString(LocalizationKeys.MdiSystemItemMenuRestore); //"Restore";
+				btn.Image=GetSysImage(SystemButton.Restore);
+				btn.Click+=new System.EventHandler(this.MenuClick);
+				btn.Enabled=m_RestoreEnabled;
+				this.SubItems.Add(btn);
+
+				btn=new ButtonItem();
+                btn.GlobalItem = false;
+				btn.Text=lm.GetLocalizedString(LocalizationKeys.MdiSystemItemMenuMove); //"Move";
+				btn.Enabled=false;
+				this.SubItems.Add(btn);
+
+				btn=new ButtonItem();
+                btn.GlobalItem = false;
+				btn.Text=lm.GetLocalizedString(LocalizationKeys.MdiSystemItemMenuSize); //"Size";
+				btn.Enabled=false;
+				this.SubItems.Add(btn);
+
+				btn=new ButtonItem("dotnetbarsysmenuminimize");
+                btn.GlobalItem = false;
+				btn.Text=lm.GetLocalizedString(LocalizationKeys.MdiSystemItemMenuMinimize); //"Minimize";
+				btn.Image=GetSysImage(SystemButton.Minimize);
+				btn.Click+=new System.EventHandler(this.MenuClick);
+				btn.Enabled=m_MinimizeEnabled;
+				this.SubItems.Add(btn);
+
+				btn=new ButtonItem();
+                btn.GlobalItem = false;
+				btn.Text=lm.GetLocalizedString(LocalizationKeys.MdiSystemItemMenuMaximize); //"Maximize";
+				btn.Image=GetSysImage(SystemButton.Maximize);
+				btn.Enabled=false;
+				this.SubItems.Add(btn);
+
+				btn=new ButtonItem("dotnetbarsysmenuclose");
+                btn.GlobalItem = false;
+				btn.Text=lm.GetLocalizedString(LocalizationKeys.MdiSystemItemMenuClose); //"Close";
+				btn.Image=GetSysImage(SystemButton.Close);
+				btn.BeginGroup=true;
+				btn.Click+=new System.EventHandler(this.MenuClick);
+				btn.Shortcuts.Add(eShortcut.CtrlF4);
+				btn.Enabled=m_CloseEnabled;
+				this.SubItems.Add(btn);
+
+				btn=new ButtonItem("dotnetbarsysmenunext");
+                btn.GlobalItem = false;
+				btn.Text=lm.GetLocalizedString(LocalizationKeys.MdiSystemItemMenuNext); //"Next";
+				btn.BeginGroup=true;
+				btn.Shortcuts.Add(eShortcut.CtrlF6);
+				btn.Click+=new System.EventHandler(this.MenuClick);
+				this.SubItems.Add(btn);
+			}
+		}
+
+		private void MenuClick(object sender, System.EventArgs e)
+		{
+			// System items need to be collapsed by us on Click see RaiseClick method on BaseItem
+			BaseItem.CollapseAll(this);
+			BaseItem objItem=sender as BaseItem;
+			if(objItem==null)
+				return;
+			m_LastButtonClick=SystemButton.None;
+			if(objItem.Name=="dotnetbarsysmenurestore")
+				m_LastButtonClick=SystemButton.Restore;
+			else if(objItem.Name=="dotnetbarsysmenuminimize")
+				m_LastButtonClick=SystemButton.Minimize;
+			else if(objItem.Name=="dotnetbarsysmenuclose")
+				m_LastButtonClick=SystemButton.Close;
+			else if(objItem.Name=="dotnetbarsysmenunext")
+				m_LastButtonClick=SystemButton.NextWindow;
+
+			if(m_LastButtonClick!=SystemButton.None)
+				this.RaiseClick();
+		}
+
+        internal SystemButton MouseOverButton
+        {
+            get { return m_MouseOver; }
+        }
+
+        internal SystemButton MouseDownButton
+        {
+            get { return m_MouseDown; }
+        }
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/MdiWindowListItem.cs b/PROMS/DotNetBar Source Code/MdiWindowListItem.cs
new file mode 100644
index 00000000..e13ac461
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/MdiWindowListItem.cs	
@@ -0,0 +1,619 @@
+using System;
+using System.Drawing;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Summary description for MdiWindowListItem.
+	/// </summary>
+	[System.ComponentModel.ToolboxItem(false),System.ComponentModel.DesignTimeVisible(false)]
+	public class MdiWindowListItem:ImageItem
+	{
+		private bool m_Initialized=false;
+		private System.Collections.ArrayList m_MdiItems=new System.Collections.ArrayList();
+		private int m_MaxCaptionLength=22;
+		private bool m_ShowWindowIcons=true;
+		private bool m_MdiNoFormActivateFlicker=true;
+		private bool m_CreateMdiChildAccessKeys=false;
+
+		public MdiWindowListItem():this("","") {}
+		public MdiWindowListItem(string sName):this(sName,""){}
+		public MdiWindowListItem(string sName, string ItemText):base(sName,ItemText)
+		{
+			m_SystemItem=true;
+			m_Visible=false;
+			this.IsAccessible=false;
+		}
+
+		[System.ComponentModel.Browsable(false),DevCoBrowsable(false),System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+		public override bool Visible
+		{
+			get
+			{
+                return this.DesignMode && this.Site != null;
+			}
+			set{}
+		}
+
+        protected override void OnSiteChanged()
+        {
+            if (this.Site != null)
+            {
+                m_SystemItem = false;
+                m_Visible = true;
+            }
+            else
+            {
+                m_SystemItem = true;
+                m_Visible = false; 
+            }
+            base.OnSiteChanged();
+        }
+
+		/// <summary>
+		/// Gets or sets whether the MDI Child Window Icons are displayed on items.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Appearance"),System.ComponentModel.Description("Specifies whether the MDI Child Window Icons are displayed on items.")]
+		public bool ShowWindowIcons
+		{
+			get {return m_ShowWindowIcons;}
+			set {m_ShowWindowIcons=value;}
+		}
+
+		public override BaseItem Copy()
+		{
+			MdiWindowListItem objCopy=new MdiWindowListItem(this.Name);
+			this.CopyToItem(objCopy);
+			return objCopy;
+		}
+		protected override void CopyToItem(BaseItem copy)
+		{
+			base.CopyToItem(copy);
+		}
+
+        protected override void Dispose(bool disposing)
+		{
+			if(m_MdiItems!=null && m_MdiItems.Count>0)
+			{
+				foreach(BaseItem item in m_MdiItems)
+				{
+					item.Tag=null;
+					if(this.Parent!=null)
+						this.Parent.SubItems.Remove(item);
+				}
+				m_MdiItems.Clear();
+			}
+			base.Dispose(disposing);
+		}
+
+		public override void Paint(ItemPaintArgs pa)
+		{
+            if (this.DesignMode)
+            {
+                Graphics g = pa.Graphics;
+                TextDrawing.DrawString(g, (this.Name.Length > 0 ? this.Name : "MdiWindowListItem"), pa.Font, pa.Colors.ItemText, m_Rect, eTextFormat.Left | eTextFormat.VerticalCenter | eTextFormat.HorizontalCenter | eTextFormat.EndEllipsis);
+                if (this.Focused)
+                {
+                    Rectangle r = m_Rect;
+                    r.Inflate(-1, -1);
+                    DesignTime.DrawDesignTimeSelection(g, r, pa.Colors.ItemDesignTimeBorder);
+                }
+
+                this.DrawInsertMarker(pa.Graphics);
+            }
+		}
+		public override void RecalcSize()
+		{
+            if (this.DesignMode)
+            {
+                this.WidthInternal = 64;
+                this.HeightInternal = 24;
+            }
+			base.RecalcSize();
+		}
+
+		/// <summary>
+		/// Gets or sets maximum form caption length that will be displayed on each item. If caption length exceeds given value ... characters are added.
+		/// </summary>
+		[System.ComponentModel.Category("Behavior"),System.ComponentModel.Browsable(true),DevCoBrowsable(true),System.ComponentModel.DefaultValue(22),System.ComponentModel.Description("Indicates maximum form caption length that will be displayed on each item. If caption length exceeds given value ... characters are added.")]
+		public int MaxCaptionLength
+		{
+			get {return m_MaxCaptionLength;}
+			set
+			{
+				if(m_MaxCaptionLength!=value)
+				{
+					m_MaxCaptionLength=value;
+					RefreshMdiList();
+				}
+			}
+		}
+
+		protected internal override void OnContainerChanged(object objOldContainer)
+		{	
+			base.OnContainerChanged(objOldContainer);
+			if(this.ContainerControl==null)
+				return;
+			if(!m_Initialized)
+				Initialize();
+		}
+
+		public override void Deserialize(ItemSerializationContext context)
+		{
+			base.Deserialize(context);
+            System.Xml.XmlElement ItemXmlSource = context.ItemXmlElement;
+			if(ItemXmlSource.HasAttribute("showicons"))
+				m_ShowWindowIcons=System.Xml.XmlConvert.ToBoolean(ItemXmlSource.GetAttribute("showicons"));
+			if(ItemXmlSource.HasAttribute("mdiaccesskey"))
+				m_CreateMdiChildAccessKeys=System.Xml.XmlConvert.ToBoolean(ItemXmlSource.GetAttribute("mdiaccesskey"));
+			if(!m_Initialized)
+				Initialize();
+		}
+		protected internal override void Serialize(ItemSerializationContext context)
+		{
+			base.Serialize(context);
+            System.Xml.XmlElement ThisItem = context.ItemXmlElement;
+			if(!m_ShowWindowIcons)
+                ThisItem.SetAttribute("showicons",System.Xml.XmlConvert.ToString(m_ShowWindowIcons));
+			if(m_CreateMdiChildAccessKeys)
+                ThisItem.SetAttribute("mdiaccesskey",System.Xml.XmlConvert.ToString(m_CreateMdiChildAccessKeys));
+		}
+
+        /// <summary>
+        /// Initializes the item and connects it to the MDI form so it can process the events. You should not call this method directly since this process is
+        /// automatically managed by the item.
+        /// </summary>
+        public void Initialize(System.Windows.Forms.Form mdiForm)
+        {
+            IOwner owner = this.GetOwner() as IOwner;
+            if (owner == null) return;
+
+            System.Windows.Forms.Form parentForm = mdiForm;
+            
+            System.Windows.Forms.MdiClient client = owner.GetMdiClient(parentForm);
+            if (client == null)
+            {
+                parentForm.Load += new EventHandler(this.ParentFormLoaded);
+                return;
+            }
+
+            client.ControlAdded += new System.Windows.Forms.ControlEventHandler(this.MdiFormAdded);
+            client.ControlRemoved += new System.Windows.Forms.ControlEventHandler(this.MdiFormRemoved);
+            parentForm.MdiChildActivate += new EventHandler(this.MdiFormActivated);
+            m_Initialized = true;
+            RefreshMdiList();
+        }
+
+        /// <summary>
+        /// Initializes the item and connects it to the MDI form so it can process the events. You should not call this method directly since this process is
+        /// automatically managed by the item.
+        /// </summary>
+		public void Initialize()
+		{
+			IOwner owner=this.GetOwner() as IOwner;
+            if (owner == null || owner.ParentForm == null && !(owner is RibbonBar && ((RibbonBar)owner).IsOverflowRibbon) || m_Initialized)
+				return;
+
+            System.Windows.Forms.Form parentForm = owner.ParentForm;
+            if (parentForm == null)
+            {
+                if (System.Windows.Forms.Form.ActiveForm != null && System.Windows.Forms.Form.ActiveForm.IsMdiChild)
+                    parentForm = System.Windows.Forms.Form.ActiveForm;
+                if (parentForm == null)
+                    return;
+            }
+
+            Initialize(parentForm);
+		}
+
+        /// <summary>
+        /// Gets whether item has been connected to the MDI form so it can process its events.
+        /// </summary>
+        [Browsable(false)]
+        public bool IsInitialized
+        {
+            get { return m_Initialized; }
+        }
+
+		private void ParentFormLoaded(object sender, EventArgs e)
+		{
+			IOwner owner=this.GetOwner() as IOwner;
+			if(owner==null || owner.ParentForm==null)
+				return;
+
+            owner.ParentForm.Load-=new EventHandler(this.ParentFormLoaded);
+
+			if(!m_Initialized)
+				Initialize();
+		}
+
+		private void RemoveEvents()
+		{
+			IOwner owner=this.GetOwner() as IOwner;
+			if(owner==null || owner.ParentForm==null || !m_Initialized)
+				return;
+
+			System.Windows.Forms.MdiClient client=owner.GetMdiClient(owner.ParentForm);
+			if(client==null)
+				return;
+
+			client.ControlAdded-=new System.Windows.Forms.ControlEventHandler(this.MdiFormAdded);
+			client.ControlRemoved-=new System.Windows.Forms.ControlEventHandler(this.MdiFormRemoved);
+			owner.ParentForm.MdiChildActivate-=new EventHandler(this.MdiFormActivated);
+			m_Initialized=false;
+		}
+
+		[System.ComponentModel.Browsable(false),System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+		public void MdiFormAdded(object sender, System.Windows.Forms.ControlEventArgs e)
+		{
+			IOwner owner=this.GetOwner() as IOwner;
+			if(owner==null || owner.ParentForm==null && !(owner is RibbonBar && ((RibbonBar)owner).IsOverflowRibbon) || !m_Initialized)
+				return;
+
+            System.Windows.Forms.Form parentForm = owner.ParentForm;
+            if (parentForm == null)
+            {
+                parentForm = ((System.Windows.Forms.Control)sender).Parent as System.Windows.Forms.Form;
+            }
+			System.Windows.Forms.Form form=e.Control as System.Windows.Forms.Form;
+
+			if(form==null)
+			{
+				RefreshMdiList();
+				return;
+			}
+            
+			int iInsertPosition=this.Parent.SubItems.IndexOf(this)+1;
+			if(m_MdiItems.Count>0)
+				iInsertPosition=this.Parent.SubItems.IndexOf((BaseItem)m_MdiItems[m_MdiItems.Count-1])+1;
+
+			string text=GetFormText(form.Text,m_MdiItems.Count+1);
+			ButtonItem btn=new ButtonItem("mdi-"+form.GetHashCode(),text);
+			btn.ShouldSerialize=false;
+			btn.ButtonStyle=eButtonStyle.ImageAndText;
+			if(m_MdiItems.Count==0 && this.BeginGroup)
+				btn.BeginGroup=true;
+
+			btn.Tag=form;
+            if (parentForm.ActiveMdiChild == form)
+				btn.Checked=true;
+
+			btn.Click+=new EventHandler(this.MdiWindowItemClick);
+			btn.SetSystemItem(true);
+
+			if(m_ShowWindowIcons && form.Icon!=null && form.ControlBox)
+			{
+				btn.Icon=form.Icon.Clone() as System.Drawing.Icon;
+			}
+
+			m_MdiItems.Add(btn);
+			this.Parent.SubItems.Add(btn,iInsertPosition);
+			btn.Visible=form.Visible;
+
+			if(m_CreateMdiChildAccessKeys)
+				RefreshMdiItemsText();
+
+			if(this.ContainerControl is Bar)
+				((Bar)this.ContainerControl).RecalcLayout();
+            else if (this.ContainerControl is ItemControl)
+                ((ItemControl)this.ContainerControl).RecalcLayout();
+
+			form.TextChanged+=new EventHandler(this.FormTextChanged);
+            form.VisibleChanged+=new EventHandler(this.FormVisibleChanged);
+		}
+
+		[System.ComponentModel.Browsable(false),System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+		public void MdiFormRemoved(object sender, System.Windows.Forms.ControlEventArgs e)
+		{
+			System.Windows.Forms.Form form=e.Control as System.Windows.Forms.Form;
+			if(form==null)
+			{
+				RefreshMdiList();
+				return;
+			}
+
+            form.TextChanged -= new EventHandler(this.FormTextChanged);
+            form.VisibleChanged -= new EventHandler(this.FormVisibleChanged);
+			
+			foreach(BaseItem item in m_MdiItems)
+			{
+				if(item.Tag==form)
+				{
+					this.Parent.SubItems.Remove(item);
+                    item.Click -= new EventHandler(this.MdiWindowItemClick);
+                    item.Dispose();
+					item.Tag=null;
+					m_MdiItems.Remove(item);
+					if(this.BeginGroup && m_MdiItems.Count>0)
+						((BaseItem)m_MdiItems[0]).BeginGroup=true;
+					break;
+				}
+			}
+			
+			if(m_MdiItems.Count==0)
+			{
+				if(this.ContainerControl is Bar)
+					((Bar)this.ContainerControl).RecalcLayout();
+			}
+			else if(m_CreateMdiChildAccessKeys)
+				RefreshMdiItemsText();
+		}
+
+		private void MdiFormActivated(object sender, EventArgs e)
+		{
+			IOwner owner=this.GetOwner() as IOwner;
+            if (owner == null || owner.ParentForm == null && !(owner is RibbonBar && ((RibbonBar)owner).IsOverflowRibbon) || !m_Initialized)
+				return;
+            System.Windows.Forms.Form parentForm = sender as System.Windows.Forms.Form;
+			System.Windows.Forms.Form form=parentForm.ActiveMdiChild;
+
+			foreach(ButtonItem item in m_MdiItems)
+			{
+				if(item.Tag==form)
+					item.Checked=true;
+				else
+					item.Checked=false;
+			}
+		}
+		
+		private void MdiWindowItemClick(object sender, EventArgs e)
+		{
+			ButtonItem btn=sender as ButtonItem;
+			if(btn.Checked)
+				return;
+            System.Windows.Forms.Form form=btn.Tag as System.Windows.Forms.Form;
+
+			IOwner owner=this.GetOwner() as IOwner;
+
+            System.Windows.Forms.Form parentForm = form.MdiParent;
+			if(owner==null || parentForm==null || !m_Initialized)
+				return;
+			System.Windows.Forms.Form oldActive=owner.ActiveMdiChild;
+			System.Windows.Forms.MdiClient client=owner.GetMdiClient(parentForm);
+
+			bool bSetRedraw=false;
+
+			if(client!=null && m_MdiNoFormActivateFlicker && (form.WindowState==System.Windows.Forms.FormWindowState.Maximized || oldActive!=null && oldActive.WindowState==System.Windows.Forms.FormWindowState.Maximized))
+			{
+				NativeFunctions.SendMessage(client.Handle,NativeFunctions.WM_SETREDRAW,0,0);
+				bSetRedraw=true;
+			}
+
+			form.Activate();
+
+			if(bSetRedraw)
+			{
+				NativeFunctions.SendMessage(client.Handle,NativeFunctions.WM_SETREDRAW,1,0);
+				client.Refresh();
+			}
+
+			if(oldActive!=null && oldActive.WindowState==System.Windows.Forms.FormWindowState.Normal && !(this.ContainerControl is Bar))
+			{
+				if(BarFunctions.ThemedOS)
+				{
+					// This will force repaint of Title bar since there were some repainting issues with it...
+					string s=oldActive.Text;
+					oldActive.Text=s+" ";
+					oldActive.Text=s;
+				}
+			}
+		}
+
+		private void RefreshMdiList()
+		{
+            if (this.Parent == null || m_MdiItems == null) return;
+
+			this.Parent.SuspendLayout=true;
+			if(m_MdiItems.Count>0)
+			{
+				foreach(BaseItem item in m_MdiItems)
+				{
+					item.Tag=null;
+					this.Parent.SubItems.Remove(item);
+				}
+				m_MdiItems.Clear();
+			}
+			IOwner owner=this.GetOwner() as IOwner;
+            if (owner == null || owner.ParentForm == null && !(owner is RibbonBar && ((RibbonBar)owner).IsOverflowRibbon) || !m_Initialized)
+			{
+				this.Parent.SuspendLayout=false;
+				return;
+			}
+
+            System.Windows.Forms.Form parentForm = owner.ParentForm;
+            if (owner is RibbonBar && ((RibbonBar)owner).IsOverflowRibbon && parentForm==null)
+            {
+                if (System.Windows.Forms.Form.ActiveForm != null && System.Windows.Forms.Form.ActiveForm.IsMdiChild)
+                    parentForm = System.Windows.Forms.Form.ActiveForm;
+
+                if (parentForm == null)
+                    return;
+            }
+
+			System.Windows.Forms.MdiClient client=owner.GetMdiClient(parentForm);
+			if(client==null)
+			{
+				this.Parent.SuspendLayout=false;
+				return;
+			}
+
+			int iInsertPosition=this.Parent.SubItems.IndexOf(this)+1;
+			bool bFirst=true;
+			int count=1;
+			foreach(System.Windows.Forms.Form form in client.MdiChildren)
+			{
+				string text=GetFormText(form.Text,count);
+				ButtonItem btn=new ButtonItem("mdi-"+form.Handle,text);
+				btn.ShouldSerialize=false;
+				btn.ButtonStyle=eButtonStyle.ImageAndText;
+				if(bFirst && this.BeginGroup)
+					btn.BeginGroup=true;
+				bFirst=false;
+				btn.Tag=form;
+				if(parentForm.ActiveMdiChild==form)
+					btn.Checked=true;
+				btn.Click+=new EventHandler(this.MdiWindowItemClick);
+				btn.SetSystemItem(true);
+				//Bitmap img=null;
+				if(m_ShowWindowIcons && form.Icon!=null && form.ControlBox)
+				{
+//					img=new Bitmap(16,16,System.Drawing.Imaging.PixelFormat.Format32bppArgb);
+//					Graphics g=Graphics.FromImage(img);
+//					g.DrawImage(form.Icon.ToBitmap(),new Rectangle(0,0,16,16));
+//					g.Dispose();
+//					btn.Image=img;
+					btn.Icon=form.Icon.Clone() as System.Drawing.Icon;
+				}
+				m_MdiItems.Add(btn);
+				this.Parent.SubItems.Add(btn,iInsertPosition);
+				btn.Visible=form.Visible;
+				iInsertPosition++;
+
+				form.TextChanged+=new EventHandler(this.FormTextChanged);
+				//btn.DisplayedChanged+=new EventHandler(this.OnMdiItemDisplayedChanged);
+				count++;
+			}
+
+			this.Parent.SuspendLayout=false;
+
+			if(m_MdiItems.Count>0 && this.ContainerControl is Bar)
+				((Bar)this.ContainerControl).RecalcLayout();
+		}
+
+		private string GetFormText(string text, int index)
+		{
+			if(text.Length>m_MaxCaptionLength)
+				text=text.Substring(0,m_MaxCaptionLength)+"...";
+			if(m_CreateMdiChildAccessKeys && index<10)
+				text="&" + index.ToString()+". "+text;
+			return text;
+		}
+
+		/// <summary>
+		/// Refresh the MDI Child form Icons that are displayed on window list items.
+		/// </summary>
+		public void RefreshButtonIcons()
+		{
+			if(!m_ShowWindowIcons || m_MdiItems==null)
+				return;
+			foreach(ButtonItem b in m_MdiItems)
+			{
+				try
+				{
+					if(b.Tag is System.Windows.Forms.Form && ((System.Windows.Forms.Form)b.Tag).ControlBox)
+						b.Icon=((System.Windows.Forms.Form)b.Tag).Icon.Clone() as System.Drawing.Icon;
+				}
+				catch{};
+			}
+		}
+
+		public override void SetParent(BaseItem o)
+		{
+			if(this.Parent!=null)
+				this.Parent.ExpandChange-=new EventHandler(this.ParentExpandedChanged);
+			base.SetParent(o);
+			if(this.Parent!=null)
+				this.Parent.ExpandChange+=new EventHandler(this.ParentExpandedChanged);
+		}
+
+		private void ParentExpandedChanged(object sender, EventArgs e)
+		{
+			if(this.Parent!=null && this.Parent.Expanded)
+				RefreshButtonIcons();
+		}
+
+		private void FormTextChanged(object sender, EventArgs e)
+		{
+			System.Windows.Forms.Form form=sender as System.Windows.Forms.Form;
+			if(form==null)
+				return;
+			for(int i=0;i<m_MdiItems.Count;i++)
+			{
+				BaseItem item=m_MdiItems[i] as BaseItem;
+				if(item.Tag==form)
+				{
+					item.Text=GetFormText(form.Text,i+1);
+					break;
+				}
+			}
+		}
+
+		private void RefreshMdiItemsText()
+		{
+			for(int i=0;i<m_MdiItems.Count;i++)
+			{
+				BaseItem item=m_MdiItems[i] as BaseItem;
+				item.Text=GetFormText(((System.Windows.Forms.Form)item.Tag).Text,i+1);
+			}
+		}
+
+		private void FormVisibleChanged(object sender, EventArgs e)
+		{
+			System.Windows.Forms.Form form=sender as System.Windows.Forms.Form;
+			if(form==null)
+				return;
+			if(m_CreateMdiChildAccessKeys)
+				RefreshMdiItemsText();
+			foreach(BaseItem item in m_MdiItems)
+			{
+				if(item.Tag==form)
+				{
+					item.Visible=form.Visible;
+					if(this.BeginGroup)
+					{
+						bool bBeginGroup=true;
+						foreach(BaseItem mdiItem in m_MdiItems)
+						{
+							if(bBeginGroup && mdiItem.Visible)
+							{
+								mdiItem.BeginGroup=true;
+								bBeginGroup=false;
+							}
+							else
+								mdiItem.BeginGroup=false;
+
+						}
+					}
+					if(this.ContainerControl is Bar && item.Visible)
+						((Bar)this.ContainerControl).RecalcLayout();
+					break;
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets whether flicker associated with switching maximized Mdi child forms is attempted to eliminate. You should set this property to false if you encounter any painting problems with your Mdi child forms.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DevCoBrowsable(true),System.ComponentModel.Description("Indicates whether flicker associated with switching maximized Mdi child forms is attempted to eliminate."),System.ComponentModel.Category("Mdi Support"),System.ComponentModel.DefaultValue(true)]
+		public bool MdiNoFormActivateFlicker
+		{
+			get{return m_MdiNoFormActivateFlicker;}
+			set
+			{
+				if(m_MdiNoFormActivateFlicker!=value)
+				{
+					m_MdiNoFormActivateFlicker=value;
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets whether numbered access keys are created for MDI Child window menu items for first 9 items. Access keys will start with number 1 and go through 9. Default value is false
+		/// which indicates that access keys are not created.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DevCoBrowsable(true),System.ComponentModel.Description("Indicates whether numbered access keys are created for MDI Child window menu items for first 9 items."),System.ComponentModel.Category("Mdi Support"),System.ComponentModel.DefaultValue(false)]
+		public bool CreateMdiChildAccessKeys
+		{
+			get {return m_CreateMdiChildAccessKeys;}
+			set
+			{
+				if(m_CreateMdiChildAccessKeys!=value)
+				{
+					m_CreateMdiChildAccessKeys=value;
+					this.RefreshMdiList();
+				}
+			}
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/MenuPanel.cs b/PROMS/DotNetBar Source Code/MenuPanel.cs
new file mode 100644
index 00000000..b14f820b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/MenuPanel.cs	
@@ -0,0 +1,3670 @@
+using System;
+using System.Windows.Forms;
+using System.Drawing;
+using System.ComponentModel;
+using System.ComponentModel.Design;
+using System.Collections;
+using System.Drawing.Drawing2D;
+using DevComponents.DotNetBar.Rendering;
+using System.Drawing.Text;
+using System.Collections.Generic;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    ///    Summary description for PopupWindow.
+    /// </summary>
+    [System.ComponentModel.ToolboxItem(false),System.ComponentModel.DesignTimeVisible(false)]
+    public class MenuPanel : Control, IDesignTimeProvider, IAccessibilitySupport, IKeyTipsControl, IKeyTipsRenderer
+    {
+		#region Private Variables
+		private struct ExpandButtonData
+		{
+			public ExpandButtonData(bool personalizedallvisible,bool showexpandbutton,Rectangle rExpandButton,bool mouseover)
+			{
+				this.PersonalizedAllVisible=personalizedallvisible;
+				this.ShowExpandButton=showexpandbutton;
+				this.Rect=rExpandButton;
+				this.MouseOver=mouseover;
+			}
+			public bool PersonalizedAllVisible;
+			public bool ShowExpandButton;
+			public Rectangle Rect;
+			public bool MouseOver;
+		}
+
+		const int WM_MOUSEACTIVATE = 0x21;
+		const int MA_NOACTIVATE = 3;
+		const int MA_NOACTIVATEANDEAT = 4;
+		private const int DEFAULT_SIDE_WIDTH=16;
+		private const int GROUP_SPACINGDOTNET=3;
+		private const int GROUP_SPACINGOFFICE=9;
+		
+		protected BaseItem m_ParentItem;
+		protected BaseItem m_HotSubItem;
+		protected Point m_ParentItemScreenPos;
+		private bool m_Hover;
+		private bool m_Scroll;
+		private bool m_TopScroll;
+		private bool m_BottomScroll;
+		private int m_ScrollTopPosition;
+		private int m_TopScrollHeight, m_BottomScrollHeight;
+		private Rectangle m_ClientRect;
+		private SideBarImage m_SideBarImage;
+		private Rectangle m_SideRect;
+
+		private object m_Owner;
+
+		private bool m_IsCustomizeMenu; // This setting is used internaly for menu that is shown as result of clicking on Add or Remove Button to customize the Bar
+		private System.Drawing.Point m_MouseDownPt;
+
+		private ePersonalizedMenus m_PersonalizedMenus=ePersonalizedMenus.Disabled;
+		const int DEFAULT_EXPAND_BUTTON_HEIGHT=14;
+		const int OFFICE2003_EXPAND_BUTTON_HEIGHT=18;
+		private int EXPAND_BUTTON_HEIGHT=DEFAULT_EXPAND_BUTTON_HEIGHT;
+
+		private ExpandButtonData m_ExpandButton=new ExpandButtonData(false,false,Rectangle.Empty,false);
+
+		private System.Windows.Forms.Timer m_ScrollTimer=null;
+		private ePopupAnimation m_PopupAnimation=ePopupAnimation.ManagerControlled;
+
+		private PopupShadow m_DropShadow=null;
+		private ColorScheme m_ColorScheme=null;
+
+		// Used to eat the mouse move messages when user is using the keyboard to browse through the
+		// top level menus. The problem was that on each repaint the mouse move was fired even though the
+		// mouse did not move at all. So if mouse was over an menu item it was not possible to switch to the
+		// new menu item becouse mouse was "holding" the focus.
+		private bool m_IgnoreDuplicateMouseMove=false;
+		private System.Windows.Forms.MouseEventArgs m_LastMouseMoveEvent=null;
+
+		internal bool m_AccessibleObjectCreated=false;
+
+		private bool m_PopupMenu=true;
+		private bool m_ShowToolTips=true;
+
+		private BaseItem m_DelayedCollapseItem=null;
+		private bool m_LastExpandedOnHover=true; // was false
+		private bool m_AntiAlias=false;
+        private int m_CornerSize = 3;
+        private BaseItem m_DoDefaultActionItem = null;
+        internal bool UseWholeScreenForSizeChecking = false;
+		#endregion
+
+        public MenuPanel():base()
+        {
+			m_ParentItem=null;
+			//m_OldContainer=null;
+			m_HotSubItem=null;
+			m_Hover=false;
+			m_Scroll=false;
+			m_TopScroll=false;
+			m_BottomScroll=false;
+			m_ScrollTopPosition=0;
+			m_TopScrollHeight=0;
+			m_BottomScrollHeight=0;
+			m_ClientRect=new Rectangle();
+			m_SideRect=new Rectangle();
+			m_SideBarImage=new SideBarImage();
+			m_IsCustomizeMenu=false;
+			m_Owner=null;
+			this.Font=System.Windows.Forms.SystemInformation.MenuFont;//.Clone() as Font;
+			this.SetStyle(ControlStyles.Selectable,false);
+			this.SetStyle(ControlStyles.AllPaintingInWmPaint,true);
+			this.SetStyle(ControlStyles.UserPaint,true);
+			this.SetStyle(ControlStyles.Opaque,true);
+			this.SetStyle(ControlStyles.ResizeRedraw,true);
+			this.SetStyle(DisplayHelp.DoubleBufferFlag,true);
+			this.IsAccessible=true;
+			this.AccessibleRole=AccessibleRole.MenuPopup;
+        }
+		protected override void Dispose(bool disposing)
+        {
+			if(this.Parent!=null && this.Parent is PopupContainer)
+			{
+				Control parent=this.Parent;
+				this.Parent.Controls.Remove(this);
+                parent.Dispose();
+				parent=null;
+			}
+			if(m_AccessibleObjectCreated)
+			{
+				PopupMenuAccessibleObject acc=this.AccessibilityObject as PopupMenuAccessibleObject;
+				if(acc!=null)
+					acc.GenerateEvent(AccessibleEvents.Destroy);
+			}
+
+			if(m_DropShadow!=null)
+			{
+				m_DropShadow.Hide();
+				m_DropShadow.Dispose();
+				m_DropShadow=null;
+			}
+		    this.Font = null;
+			RestoreContainer();
+			m_ParentItem=null;
+			base.Dispose(disposing);
+        }
+		
+		protected override void WndProc(ref Message m)
+		{
+			if(m.Msg==WM_MOUSEACTIVATE)
+			{
+				m.Result=new System.IntPtr(MA_NOACTIVATE);
+				return;
+			}
+            else if (m.Msg == NativeFunctions.WM_USER + 107)
+            {
+                if (m_DoDefaultActionItem != null)
+                {
+                    m_DoDefaultActionItem.DoAccesibleDefaultAction();
+                    m_DoDefaultActionItem = null;
+                }
+
+            }
+			base.WndProc(ref m);
+        }
+
+        private Rendering.BaseRenderer GetRenderer()
+        {
+            Rendering.BaseRenderer r = Rendering.GlobalManager.Renderer;
+
+            if (m_ParentItem != null && m_ParentItem.GetContainerControl(false) is IRenderingSupport)
+            {
+                Rendering.BaseRenderer renderer = ((IRenderingSupport)m_ParentItem.GetContainerControl(false)).GetRenderer();
+                if (renderer != null)
+                    r = renderer;
+            }
+
+            return r;
+        }
+
+        #region KeyTips Support
+        private bool m_ShowKeyTips = false;
+        private string m_KeyTipsKeysStack = "";
+        private Font m_KeyTipsFont = null;
+        private KeyTipsCanvasControl m_KeyTipsCanvas = null;
+        /// <summary>
+        /// Gets or sets whether Key Tips (accelerator keys) for items are displayed on top of them.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public virtual bool ShowKeyTips
+        {
+            get { return m_ShowKeyTips; }
+            set
+            {
+                if (m_ShowKeyTips != value)
+                {
+                    m_ShowKeyTips = value;
+                    this.OnShowKeyTipsChanged();
+                }
+            }
+        }
+
+        string IKeyTipsControl.KeyTipsKeysStack
+        {
+            get { return m_KeyTipsKeysStack; }
+            set
+            {
+                m_KeyTipsKeysStack = value;
+                if (m_KeyTipsCanvas != null)
+                {
+                    this.Refresh();
+                    //m_KeyTipsCanvas.Update();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the font that is used to display Key Tips (accelerator keys) when they are displayed. Default value is null which means
+        /// that control Font is used for Key Tips display.
+        /// </summary>
+        [Browsable(true), DefaultValue(null), Category("Appearance"), Description("Indicates font that is used to display Key Tips (accelerator keys) when they are displayed.")]
+        public virtual Font KeyTipsFont
+        {
+            get { return m_KeyTipsFont; }
+            set { m_KeyTipsFont = value; }
+        }
+
+        protected virtual void OnShowKeyTipsChanged()
+        {
+            m_KeyTipsKeysStack = "";
+            if (this.ShowKeyTips)
+                CreateKeyTipCanvas();
+            else
+                DestroyKeyTipCanvas();
+        }
+
+        protected virtual void CreateKeyTipCanvas()
+        {
+            if (m_KeyTipsCanvas != null)
+            {
+                m_KeyTipsCanvas.BringToFront();
+                return;
+            }
+
+            m_KeyTipsCanvas = new KeyTipsCanvasControl(this);
+            m_KeyTipsCanvas.Bounds = new Rectangle(0, 0, this.Width, this.Height);
+            m_KeyTipsCanvas.Visible = true;
+            this.Controls.Add(m_KeyTipsCanvas);
+            m_KeyTipsCanvas.BringToFront();
+        }
+
+        protected virtual void DestroyKeyTipCanvas()
+        {
+            if (m_KeyTipsCanvas == null)
+                return;
+            m_KeyTipsCanvas.Visible = false;
+            this.Controls.Remove(m_KeyTipsCanvas);
+            m_KeyTipsCanvas.Dispose();
+            m_KeyTipsCanvas = null;
+        }
+
+        void IKeyTipsRenderer.PaintKeyTips(Graphics g)
+        {
+            this.PaintKeyTips(g);
+        }
+
+        protected virtual void PaintKeyTips(Graphics g)
+        {
+            if (!m_ShowKeyTips || m_ParentItem == null)
+                return;
+
+            KeyTipsRendererEventArgs e = new KeyTipsRendererEventArgs(g, Rectangle.Empty, "", GetKeyTipFont(), null);
+
+            Rendering.BaseRenderer renderer = GetRenderer();
+            PaintContainerKeyTips(m_ParentItem, renderer, e);
+        }
+
+        protected virtual Font GetKeyTipFont()
+        {
+            Font font = this.Font;
+            if (m_KeyTipsFont != null)
+                font = m_KeyTipsFont;
+            return font;
+        }
+
+        internal virtual void PaintContainerKeyTips(BaseItem container, Rendering.BaseRenderer renderer, KeyTipsRendererEventArgs e)
+        {
+            foreach (BaseItem item in container.SubItems)
+            {
+                if (!item.Visible || !item.Displayed)
+                    continue;
+
+                if (item.IsContainer)
+                    PaintContainerKeyTips(item, renderer, e);
+
+                if (item.AccessKey == Char.MinValue && item.KeyTips == "" || m_KeyTipsKeysStack != "" && !item.KeyTips.StartsWith(m_KeyTipsKeysStack)
+                    || item.KeyTips == "" && m_KeyTipsKeysStack != "")
+                    continue;
+
+                if (item.KeyTips != "")
+                    e.KeyTip = item.KeyTips;
+                else
+                    e.KeyTip = item.AccessKey.ToString().ToUpper();
+
+                e.Bounds = GetKeyTipRectangle(e.Graphics, item, e.Font, e.KeyTip);
+                e.ReferenceObject = item;
+
+                renderer.DrawKeyTips(e);
+            }
+        }
+
+        protected virtual Rectangle GetKeyTipRectangle(Graphics g, BaseItem item, Font font, string keyTip)
+        {
+            Size padding = KeyTipsPainter.KeyTipsPadding;
+            Size size = TextDrawing.MeasureString(g, keyTip, font);
+            size.Width += padding.Width;
+            size.Height += padding.Height;
+
+            Rectangle ib = item.DisplayRectangle;
+            Rectangle r = new Rectangle(ib.X + 16, ib.Bottom - size.Height, size.Width, size.Height);
+
+            return r;
+        }
+
+        public virtual bool ProcessMnemonicEx(char charCode)
+        {
+            if (ProcessContainerAccessKey(m_ParentItem, charCode))
+                return true;
+            return false;
+        }
+        #endregion
+
+        /// <summary>
+        /// Gets or sets the item default accessibility action will be performed on.
+        /// </summary>
+        BaseItem IAccessibilitySupport.DoDefaultActionItem
+        {
+            get { return m_DoDefaultActionItem; }
+            set { m_DoDefaultActionItem = value; }
+        }
+
+		[DefaultValue(true), Browsable(true), DevCoBrowsable(true)]
+		public bool PopupMenu
+		{
+			get {return m_PopupMenu;}
+			set {m_PopupMenu=value;}
+		}
+
+        // Closes the popup menu.
+        public void Close()
+        {
+            if (m_AccessibleObjectCreated)
+            {
+                MenuPanel.PopupMenuAccessibleObject acc = this.AccessibilityObject as PopupMenuAccessibleObject;
+                if (acc != null)
+                {
+                    if (m_ParentItem != null && m_ParentItem.IsOnMenuBar)
+                        acc.GenerateEvent(AccessibleEvents.SystemMenuEnd);
+                    acc.GenerateEvent(AccessibleEvents.SystemMenuPopupEnd);
+                }
+            }
+
+            if (m_ParentItem != null)
+            {
+                Control c = m_ParentItem.ContainerControl as Control;
+                if (c != null)
+                    c.MouseWheel -= ParentControlMouseWheel;
+            }
+
+            SetFocusItem(null);
+            Hide();
+        }
+
+        protected override AccessibleObject CreateAccessibilityInstance()
+		{
+			m_AccessibleObjectCreated=true;
+			return new PopupMenuAccessibleObject(this);
+		}
+
+		private void SetupAccessibility()
+		{
+			if(m_ParentItem!=null && m_ParentItem.Text!="")
+				this.AccessibleName=m_ParentItem.Text;
+			else
+				this.AccessibleName="DotNetBar Popup Menu";
+			this.AccessibleDescription=""; //this.AccessibleName+" ("+this.Name+")";
+			this.AccessibleRole=AccessibleRole.MenuPopup;
+		}
+
+        internal ItemPaintArgs GetItemPaintArgs(Graphics g)
+        {
+            ItemPaintArgs pa;
+            if (m_ColorScheme == null)
+                pa = new ItemPaintArgs(m_Owner as IOwner, this, g, new ColorScheme(g));
+            else
+                pa = new ItemPaintArgs(m_Owner as IOwner, this, g, m_ColorScheme);
+
+            pa.Renderer = GetRenderer();
+
+            if (m_ParentItem.DesignMode)
+            {
+                ISite site = this.GetSite();
+                if (site != null && site.DesignMode)
+                    pa.DesignerSelection = true;
+            }
+
+            return pa;
+        }
+
+		protected override void OnPaint(PaintEventArgs e)
+		{
+			if(m_ParentItem!=null)
+			{
+                ItemPaintArgs pa = GetItemPaintArgs(e.Graphics);
+                pa.PaintEventArgs = e;
+                pa.ClipRectangle = e.ClipRectangle;
+                SmoothingMode sm = e.Graphics.SmoothingMode;
+                TextRenderingHint th = e.Graphics.TextRenderingHint;
+
+				if(m_AntiAlias)
+				{
+					e.Graphics.SmoothingMode=System.Drawing.Drawing2D.SmoothingMode.AntiAlias;
+                    e.Graphics.TextRenderingHint = DisplayHelp.AntiAliasTextRenderingHint;
+				}
+
+                if (m_ParentItem.EffectiveStyle == eDotNetBarStyle.Office2000)
+					PaintOffice(pa);
+				else
+					PaintDotNet(pa);
+
+                if (m_ParentItem is ApplicationButton)
+                {
+                    ((ApplicationButton)m_ParentItem).OnMenuPaint(pa);
+                }
+                else if (m_ParentItem is DevComponents.DotNetBar.Metro.MetroAppButton)
+                {
+                    ((DevComponents.DotNetBar.Metro.MetroAppButton)m_ParentItem).OnMenuPaint(pa);
+                }
+
+                e.Graphics.SmoothingMode = sm;
+                e.Graphics.TextRenderingHint = th;
+			}
+        }
+
+        #region InternalMenuColors
+        private class InternalMenuColors
+        {
+            public Rendering.LinearGradientColorTable Background = new Rendering.LinearGradientColorTable();
+            public Rendering.LinearGradientColorTable Side = new Rendering.LinearGradientColorTable();
+            public Rendering.LinearGradientColorTable SideUnused = new Rendering.LinearGradientColorTable();
+            public Rendering.LinearGradientColorTable Border = new Rendering.LinearGradientColorTable();
+            public Rendering.LinearGradientColorTable SideBorder = new Rendering.LinearGradientColorTable();
+            public Rendering.LinearGradientColorTable SideBorderLight = new Rendering.LinearGradientColorTable();
+        }
+        
+        private InternalMenuColors GetMenuColors(ItemPaintArgs pa)
+        {
+            InternalMenuColors colors = new InternalMenuColors();
+            if (m_ParentItem != null && BarFunctions.IsOffice2007Style(m_ParentItem.EffectiveStyle) && pa.Renderer is Rendering.Office2007Renderer)
+            {
+                Rendering.Office2007MenuColorTable ct = ((Rendering.Office2007Renderer)pa.Renderer).ColorTable.Menu;
+                colors.Background = ct.Background;
+                colors.Border = ct.Border;
+                colors.Side = ct.Side;
+                colors.SideBorder = ct.SideBorder;
+                colors.SideBorderLight = ct.SideBorderLight;
+                colors.SideUnused = ct.SideUnused;
+            }
+            else
+            {
+                colors.Background.Start = pa.Colors.MenuBackground;
+                colors.Background.End = pa.Colors.MenuBackground2;
+                colors.Background.GradientAngle = pa.Colors.MenuBackgroundGradientAngle;
+                colors.Side.Start = pa.Colors.MenuSide;
+                colors.Side.End = pa.Colors.MenuSide2;
+                colors.Side.GradientAngle = pa.Colors.MenuSideGradientAngle;
+                colors.SideUnused.Start = pa.Colors.MenuUnusedSide;
+                colors.SideUnused.End = pa.Colors.MenuUnusedSide2;
+                colors.SideUnused.GradientAngle = pa.Colors.MenuUnusedSideGradientAngle;
+                colors.Border.Start = pa.Colors.MenuBorder;
+                colors.SideBorder.Start = pa.Colors.ItemSeparator;
+                colors.SideBorderLight.Start = pa.Colors.ItemSeparatorShade;
+            }
+
+            return colors;
+        }
+        #endregion
+
+        private bool IsContainerMenu
+        {
+            get
+            {
+                if (m_ParentItem != null && m_ParentItem.SubItems.Count == 1 && m_ParentItem.SubItems[0] is ItemContainer)
+                    return true;
+                return false;
+            }
+        }
+
+        protected void PaintDotNet(ItemPaintArgs pa)
+        {
+            Graphics g = pa.Graphics;
+            if (this.DisplayShadow && !this.AlphaShadow)
+                SetupRegion();
+            InternalMenuColors menuColors = this.GetMenuColors(pa);
+
+            DisplayHelp.FillRectangle(g, this.ClientRectangle, menuColors.Background);
+
+            PaintSideBar(pa);
+
+            //Pen p=new Pen(pa.Colors.MenuBorder,1);
+            if (m_ParentItem != null)
+            {
+                Rectangle borderRect = this.ClientRectangle;
+                if (this.DisplayShadow && !this.AlphaShadow)
+                    borderRect = new Rectangle(0, 0, this.ClientSize.Width - 2, this.ClientSize.Height - 2);
+                eDotNetBarStyle effectiveStyle = m_ParentItem.EffectiveStyle;
+                if (BarFunctions.IsOffice2007Style(effectiveStyle) && (!StyleManager.IsMetro(effectiveStyle) || StyleManager.IsVisualStudio2012(StyleManager.Style)))
+                {
+                    if (this.Region != null)
+                    {
+                        DisplayHelp.DrawRoundedRectangle(g, menuColors.Border.Start, borderRect, m_CornerSize);
+                        Rectangle borderInset = borderRect;
+                        borderInset.Inflate(-1, -1);
+                        Color c = ControlPaint.LightLight(menuColors.Background.Start);
+                        if (IsContainerMenu)
+                        {
+                            c = Color.Empty;
+                            GraphicsPath path = DisplayHelp.GetRoundedRectanglePath(borderInset, m_CornerSize);
+                            Region reg = new Region(path);
+                            path.Widen(SystemPens.Control);
+                            reg.Union(path);
+                            path.Dispose();
+                            path = null;
+                            g.Clip = reg;
+                        }
+
+                        if (!c.IsEmpty)
+                        {
+                            using (Pen pen = new Pen(c))
+                                DisplayHelp.DrawRoundedRectangle(g, pen, borderInset, m_CornerSize);
+                        }
+                    }
+                    else
+                    {
+                        DisplayHelp.DrawRectangle(g, menuColors.Border.Start, borderRect);
+                    }
+                }
+                else
+                    DisplayHelp.DrawGradientRectangle(g, borderRect, menuColors.Border, 1);
+
+                // Shadow
+                if (this.DisplayShadow && !this.AlphaShadow && m_ParentItem != null && !BarFunctions.IsOffice2007Style(effectiveStyle))
+                {
+                    using (Pen p = new Pen(SystemColors.ControlDark, 2))
+                    {
+                        Point[] pt = new Point[3];
+                        pt[0].X = 2;
+                        pt[0].Y = this.ClientSize.Height - 1;
+                        pt[1].X = this.ClientSize.Width - 1;
+                        pt[1].Y = this.ClientSize.Height - 1;
+                        pt[2].X = this.ClientSize.Width - 1;
+                        pt[2].Y = 2;
+                        g.DrawLines(p, pt);
+                    }
+                }
+
+                if ((!StyleManager.IsMetro(effectiveStyle) || StyleManager.IsVisualStudio2012(StyleManager.Style)) && ((!BarFunctions.IsOffice2007Style(effectiveStyle) || effectiveStyle == eDotNetBarStyle.Office2010 || effectiveStyle == eDotNetBarStyle.Metro) && m_ParentItem is ButtonItem && m_ParentItem.Displayed && m_ParentItem.Visible && m_ParentItem.Orientation == eOrientation.Horizontal && !(m_ParentItem.ContainerControl is ContextMenuBar)))
+                {
+                    // Determine where to draw the line based on parent position
+                    if (m_PopupMenu && this.Parent != null && m_ParentItemScreenPos.Y < this.Parent.Location.Y)
+                    {
+                        Point p1 = new Point((m_ParentItemScreenPos.X - this.Parent.Location.X) + 1, 0);
+                        Point p2 = new Point(p1.X + m_ParentItem.WidthInternal - (pa.Colors.ItemExpandedShadow.IsEmpty ? 3 : 5), 0);
+                        using (Pen pen = new Pen(pa.Colors.ItemExpandedBackground, 1))
+                            g.DrawLine(pen, p1, p2);
+                    }
+                }
+                // If menu scrolls paint side bars
+                if (m_Scroll)
+                {
+                    BaseItem objItem = m_ParentItem.SubItems[0];
+                    if (m_TopScroll)
+                    {
+                        ImageItem objImageItem = m_ParentItem as ImageItem;
+                        if (objImageItem != null)
+                        {
+                            Rectangle sideRect = new Rectangle(m_ClientRect.Left, m_ClientRect.Top, objImageItem.SubItemsImageSize.Width + 7, m_TopScrollHeight);
+                            DisplayHelp.FillRectangle(g, sideRect, menuColors.Side);
+                            if (BarFunctions.IsOffice2007Style(effectiveStyle))
+                                PaintMenuItemSide(pa, sideRect, menuColors);
+                        }
+                        else
+                        {
+                            Rectangle sideRect = new Rectangle(m_ClientRect.Left, m_ClientRect.Top, DEFAULT_SIDE_WIDTH + 7, m_TopScrollHeight);
+                            DisplayHelp.FillRectangle(g, sideRect, menuColors.Side);
+                            if (BarFunctions.IsOffice2007Style(effectiveStyle))
+                                PaintMenuItemSide(pa, sideRect, menuColors);
+                        }
+                    }
+                    if (m_BottomScroll)
+                    {
+                        ImageItem objImageItem = m_ParentItem as ImageItem;
+                        if (objImageItem != null)
+                        {
+                            Rectangle sideRect = new Rectangle(m_ClientRect.Left, m_ClientRect.Bottom - m_BottomScrollHeight - 1, objImageItem.SubItemsImageSize.Width + 7, m_BottomScrollHeight);
+                            DisplayHelp.FillRectangle(g, sideRect, menuColors.Side);
+                            if (BarFunctions.IsOffice2007Style(effectiveStyle))
+                                PaintMenuItemSide(pa, sideRect, menuColors);
+                        }
+                        else
+                        {
+                            Rectangle sideRect = new Rectangle(m_ClientRect.Left, m_ClientRect.Bottom - m_BottomScrollHeight - 1, DEFAULT_SIDE_WIDTH + 7, m_BottomScrollHeight);
+                            DisplayHelp.FillRectangle(g, sideRect, menuColors.Side);
+                            if (BarFunctions.IsOffice2007Style(effectiveStyle))
+                                PaintMenuItemSide(pa, sideRect, menuColors);
+                        }
+                    }
+                    objItem = null;
+                }
+                PaintItems(pa, menuColors);
+            }
+            else
+                DisplayHelp.DrawGradientRectangle(g, this.ClientRectangle, menuColors.Border, 1);
+        }
+
+		protected void PaintOffice(ItemPaintArgs pa)
+		{
+			using(SolidBrush brush=new SolidBrush(SystemColors.Control))
+				pa.Graphics.FillRectangle(brush,this.DisplayRectangle);
+			//pa.Graphics.Clear(SystemColors.Control);
+			
+			PaintSideBar(pa);
+
+			System.Windows.Forms.ControlPaint.DrawBorder3D(pa.Graphics,0,0,this.ClientSize.Width,this.ClientSize.Height,System.Windows.Forms.Border3DStyle.Raised);
+			if(m_ParentItem!=null)
+				PaintItems(pa, GetMenuColors(pa));
+		}
+
+        private bool DoPaintSide(BaseItem item)
+        {
+            if (item is LabelItem || item is ItemContainer)
+                return false;
+            return true;
+        }
+
+        private void PaintItems(ItemPaintArgs pa, InternalMenuColors menuColors)
+		{
+			Graphics g=pa.Graphics;
+            bool rightToLeft = (this.RightToLeft == RightToLeft.Yes);
+
+			// Draw all contained items
+			if(m_ParentItem!=null && m_ParentItem!=null)
+			{
+				// Special case handling when menus exceed the size of window
+				Point[] p;
+				Rectangle clipRect=new Rectangle((int)g.ClipBounds.X,(int)g.ClipBounds.Y,(int)g.ClipBounds.Width,(int)g.ClipBounds.Height);
+				if(m_Scroll)
+				{
+					if(m_TopScroll)
+					{
+						p=new Point[3];
+						p[0].X=m_ClientRect.Left+(m_ClientRect.Width-8)/2;
+						p[0].Y=m_ClientRect.Top+8;
+						p[1].X=p[0].X+8;
+						p[1].Y=p[0].Y;
+						p[2].X=p[0].X+4;
+						p[2].Y=p[0].Y-5;
+						g.FillPolygon(SystemBrushes.ControlText,p);
+					}
+					BaseItem objTmp;
+					ImageItem objParentImageItem=m_ParentItem as ImageItem;
+					int iSideWidth=DEFAULT_SIDE_WIDTH;
+					if(objParentImageItem!=null)
+						iSideWidth=objParentImageItem.SubItemsImageSize.Width;
+					objParentImageItem=null;
+                    bool previousContainerItem = false;
+					for(int i=m_ScrollTopPosition;i<m_ParentItem.SubItems.Count;i++)
+					{
+						objTmp=m_ParentItem.SubItems[i];
+						if(!clipRect.IntersectsWith(objTmp.DisplayRectangle))
+							continue;
+						if(objTmp.Visible || m_IsCustomizeMenu)
+						{
+							if(objTmp.Displayed)
+							{
+                                SmoothingMode sm = g.SmoothingMode;
+                                g.SmoothingMode = SmoothingMode.Default;
+								if(objTmp.BeginGroup && objTmp.TopInternal>ClientMarginTop)  // Exclude first element
+								{
+                                    if (objTmp.EffectiveStyle == eDotNetBarStyle.Office2000)
+									{
+										if(m_IsCustomizeMenu)
+											System.Windows.Forms.ControlPaint.DrawBorder3D(g,objTmp.HeightInternal+Dpi.Height2+objTmp.LeftInternal+Dpi.Width13,objTmp.TopInternal-Dpi.Height5,objTmp.WidthInternal-Dpi.Width26-objTmp.HeightInternal-Dpi.Height2,Dpi.Height2,System.Windows.Forms.Border3DStyle.Etched,System.Windows.Forms.Border3DSide.Top);
+										else
+                                            System.Windows.Forms.ControlPaint.DrawBorder3D(g, objTmp.LeftInternal + Dpi.Width13, objTmp.TopInternal - Dpi.Height5, objTmp.WidthInternal - Dpi.Width26, Dpi.Width2, System.Windows.Forms.Border3DStyle.Etched, System.Windows.Forms.Border3DSide.Top);
+									}
+									else
+									{
+										if(m_IsCustomizeMenu)
+										{
+                                            Rectangle sideRect = new Rectangle(objTmp.LeftInternal, objTmp.TopInternal - Dpi.Height3, objTmp.HeightInternal + Dpi.Height2 + iSideWidth + Dpi.Width7, Dpi.Height3);
+                                            sideRect.Inflate(0, Dpi.Height1);
+                                            DisplayHelp.FillRectangle(g, sideRect, menuColors.Side.Start, menuColors.Side.End, menuColors.Side.GradientAngle);
+
+                                            if (BarFunctions.IsOffice2007Style(objTmp.EffectiveStyle))
+                                                PaintMenuItemSide(pa, sideRect, menuColors);
+                                            DisplayHelp.DrawLine(g, objTmp.LeftInternal + iSideWidth + Dpi.Width8 + Dpi.Width7 + objTmp.HeightInternal + Dpi.Width2, objTmp.TopInternal - Dpi.Height2, objTmp.DisplayRectangle.Right - Dpi.Width1, objTmp.TopInternal - Dpi.Height2,
+                                                menuColors.SideBorder.Start, Dpi.Width1);
+                                            if (BarFunctions.IsOffice2007Style(objTmp.EffectiveStyle))
+                                                DisplayHelp.DrawLine(g, objTmp.LeftInternal + iSideWidth + Dpi.Width8 + Dpi.Width7 + objTmp.HeightInternal + Dpi.Width2, objTmp.TopInternal - Dpi.Height1, objTmp.DisplayRectangle.Right - Dpi.Width1, objTmp.TopInternal - Dpi.Height1, menuColors.SideBorderLight.Start, Dpi.Width1);
+
+										}
+										else
+										{
+                                            bool paintSide = DoPaintSide(objTmp);
+                                            bool itemOnlySeparator = paintSide;
+                                            if(paintSide)
+                                            {
+                                                Rectangle sideRect = new Rectangle(objTmp.LeftInternal, objTmp.TopInternal - Dpi.Width3, iSideWidth + Dpi.Width7, Dpi.Height3);
+                                                sideRect.Inflate(0, Dpi.Height1);
+											    // Paint side bar
+                                                if (objTmp is IPersonalizedMenuItem && ((IPersonalizedMenuItem)objTmp).MenuVisibility == eMenuVisibility.VisibleIfRecentlyUsed && !((IPersonalizedMenuItem)objTmp).RecentlyUsed)
+                                                    DisplayHelp.FillRectangle(g, sideRect, menuColors.SideUnused);
+                                                else
+                                                    DisplayHelp.FillRectangle(g, sideRect, menuColors.Side);
+
+                                                if (BarFunctions.IsOffice2007Style(objTmp.EffectiveStyle))
+                                                    PaintMenuItemSide(pa, sideRect, menuColors);
+                                            }
+                                            if (itemOnlySeparator && previousContainerItem)
+                                                itemOnlySeparator = false;
+                                            DisplayHelp.DrawLine(g, objTmp.LeftInternal + (itemOnlySeparator ? (iSideWidth + Dpi.Width8 + Dpi.Width7) : 0), objTmp.TopInternal - Dpi.Height2, objTmp.DisplayRectangle.Right - Dpi.Width1, objTmp.TopInternal - Dpi.Height2, menuColors.SideBorder.Start, Dpi.Width1);
+                                            if (BarFunctions.IsOffice2007Style(objTmp.EffectiveStyle))
+                                                DisplayHelp.DrawLine(g, objTmp.LeftInternal + (itemOnlySeparator ? (iSideWidth + Dpi.Width8 + Dpi.Width7) : 0), objTmp.TopInternal - Dpi.Height1, objTmp.DisplayRectangle.Right - Dpi.Width1, objTmp.TopInternal - Dpi.Height1, menuColors.SideBorderLight.Start, Dpi.Width1);
+										}
+									}
+								}
+                                g.SmoothingMode = sm;
+								objTmp.Paint(pa);
+                                previousContainerItem = (objTmp.IsContainer);
+							}
+						}
+					}
+					if(m_BottomScroll)
+					{
+						// Draw down button
+						p=new Point[3];
+						p[0].X=m_ClientRect.Left+(m_ClientRect.Width-8)/2;
+						p[0].Y=m_ClientRect.Bottom-8;
+						p[1].X=p[0].X+8;
+						p[1].Y=p[0].Y;
+						p[2].X=p[0].X+4;
+						p[2].Y=p[0].Y+4;
+						g.FillPolygon(SystemBrushes.ControlText,p);
+					}
+				}
+				else
+				{
+					// This is very simple...
+					ImageItem objParentImageItem=m_ParentItem as ImageItem;
+					int iSideBarWidth=Dpi.Width(DEFAULT_SIDE_WIDTH);
+					if(objParentImageItem!=null)
+						iSideBarWidth=objParentImageItem.SubItemsImageSize.Width;
+					objParentImageItem=null;
+					bool bFirst=true;
+                    bool previousContainerItem = false;
+					foreach(BaseItem objTmp in m_ParentItem.SubItems)
+					{
+						if(!clipRect.IntersectsWith(objTmp.DisplayRectangle))
+							continue;
+
+						if(objTmp.Visible && objTmp.Displayed || m_IsCustomizeMenu)
+						{
+                            SmoothingMode sm = g.SmoothingMode;
+                            g.SmoothingMode = SmoothingMode.Default;
+							if(objTmp.BeginGroup && !bFirst)
+							{
+                                if (objTmp.EffectiveStyle == eDotNetBarStyle.Office2000)
+								{
+									if(m_IsCustomizeMenu)
+										System.Windows.Forms.ControlPaint.DrawBorder3D(g,objTmp.HeightInternal+2+objTmp.LeftInternal+13,objTmp.TopInternal-5,objTmp.WidthInternal-26-objTmp.HeightInternal-2,2,System.Windows.Forms.Border3DStyle.Etched,System.Windows.Forms.Border3DSide.Top);
+									else
+										System.Windows.Forms.ControlPaint.DrawBorder3D(g,objTmp.LeftInternal+13,objTmp.TopInternal-5,objTmp.WidthInternal-26,2,System.Windows.Forms.Border3DStyle.Etched,System.Windows.Forms.Border3DSide.Top);
+								}
+								else
+								{
+									if(m_IsCustomizeMenu)
+									{
+                                        Rectangle sideBar = new Rectangle(objTmp.LeftInternal, objTmp.TopInternal - 3, objTmp.HeightInternal + 2 + iSideBarWidth + 7, 3);
+                                        sideBar.Inflate(0, 1);
+                                        if (rightToLeft)
+                                        {
+                                            sideBar.Width = iSideBarWidth + 7;
+                                            sideBar.X = objTmp.DisplayRectangle.Right - sideBar.Width;
+                                        }
+										// Paint side bar
+                                        DisplayHelp.FillRectangle(g, sideBar, menuColors.Side);
+
+                                        if (BarFunctions.IsOffice2007Style(objTmp.EffectiveStyle))
+                                            PaintMenuItemSide(pa, sideBar, menuColors);
+
+                                        if (rightToLeft)
+                                        {
+                                            DisplayHelp.DrawLine(g, objTmp.LeftInternal + 1, objTmp.TopInternal - 2, objTmp.DisplayRectangle.Right - (iSideBarWidth + 8 + 7 + objTmp.HeightInternal + 2 + 1), objTmp.TopInternal - 2, menuColors.SideBorder.Start, 1);
+                                            if (BarFunctions.IsOffice2007Style(objTmp.EffectiveStyle))
+                                                DisplayHelp.DrawLine(g, objTmp.LeftInternal + 1, objTmp.TopInternal - 1, objTmp.DisplayRectangle.Right - (iSideBarWidth + 8 + 7 + objTmp.HeightInternal + 2 + 1), objTmp.TopInternal - 1, menuColors.SideBorderLight.Start,1);
+                                        }
+                                        else
+                                        {
+                                            DisplayHelp.DrawLine(g, objTmp.LeftInternal + iSideBarWidth + 8 + 7 + objTmp.HeightInternal + 2, objTmp.TopInternal - 2, objTmp.DisplayRectangle.Right - 1, objTmp.TopInternal - 2, menuColors.SideBorder.Start, 1);
+                                            if (BarFunctions.IsOffice2007Style(objTmp.EffectiveStyle))
+                                                DisplayHelp.DrawLine(g, objTmp.LeftInternal + iSideBarWidth + 8 + 7 + objTmp.HeightInternal + 2, objTmp.TopInternal - 1, objTmp.DisplayRectangle.Right - 1, objTmp.TopInternal - 1, menuColors.SideBorderLight.Start, 1);
+                                        }
+									}
+									else
+									{
+                                        Rectangle sideBar = new Rectangle(objTmp.LeftInternal, objTmp.TopInternal - Dpi.Height2, iSideBarWidth + Dpi.Width7, Dpi.Height3);
+                                        sideBar.Inflate(0, Dpi.Height2);
+                                        if (rightToLeft)
+                                            sideBar.X = objTmp.DisplayRectangle.Right - sideBar.Width - Dpi.Width1;
+                                        
+                                        bool paintSide = DoPaintSide(objTmp);
+                                        bool itemOnlySeparator = paintSide;
+                                        if (itemOnlySeparator && previousContainerItem)
+                                        {
+                                            paintSide = false;
+                                            itemOnlySeparator = false;
+                                        }
+                                        if (paintSide)
+                                        {
+                                            // Paint side bar
+                                            if (objTmp is IPersonalizedMenuItem && ((IPersonalizedMenuItem)objTmp).MenuVisibility == eMenuVisibility.VisibleIfRecentlyUsed && !((IPersonalizedMenuItem)objTmp).RecentlyUsed)
+                                            {
+                                                DisplayHelp.FillRectangle(g, sideBar, menuColors.SideUnused);
+                                            }
+                                            else
+                                            {
+                                                DisplayHelp.FillRectangle(g, sideBar, menuColors.Side);
+                                            }
+
+                                            if (BarFunctions.IsOffice2007Style(objTmp.EffectiveStyle))
+                                                PaintMenuItemSide(pa, sideBar, menuColors);
+                                        }
+                                        
+                                        if (rightToLeft)
+                                        {
+                                            DisplayHelp.DrawLine(g, objTmp.LeftInternal + Dpi.Width1, objTmp.TopInternal - Dpi.Height2, objTmp.DisplayRectangle.Right - (itemOnlySeparator ? (iSideBarWidth + Dpi.Width8 + Dpi.Width7 + Dpi.Width1) : 0), objTmp.TopInternal - Dpi.Height2, menuColors.SideBorder.Start, Dpi.Width1);
+                                            if (BarFunctions.IsOffice2007Style(objTmp.EffectiveStyle))
+                                                DisplayHelp.DrawLine(g, objTmp.LeftInternal + Dpi.Width1, objTmp.TopInternal - Dpi.Height1, objTmp.DisplayRectangle.Right - (itemOnlySeparator ? (iSideBarWidth + Dpi.Width8 + Dpi.Width7 + Dpi.Width1) : 0), objTmp.TopInternal - Dpi.Height1, menuColors.SideBorderLight.Start, Dpi.Width1);
+                                        }
+                                        else
+                                        {
+                                            DisplayHelp.DrawLine(g, objTmp.LeftInternal + (itemOnlySeparator ? (iSideBarWidth + Dpi.Width8 + Dpi.Width7) : 0), objTmp.TopInternal - Dpi.Height2, objTmp.DisplayRectangle.Right - Dpi.Width1, objTmp.TopInternal - Dpi.Height2, pa.Colors.ItemSeparator, Dpi.Width1);
+                                            if (BarFunctions.IsOffice2007Style(objTmp.EffectiveStyle) && !pa.Colors.ItemSeparatorShade.IsEmpty)
+                                                DisplayHelp.DrawLine(g, objTmp.LeftInternal + (itemOnlySeparator ? (iSideBarWidth + Dpi.Width8 + Dpi.Width7) : 0), objTmp.TopInternal - Dpi.Height1, objTmp.DisplayRectangle.Right - Dpi.Width1, objTmp.TopInternal - Dpi.Height1, pa.Colors.ItemSeparatorShade, Dpi.Width1);
+                                        }
+									}
+								}
+							}
+                            g.SmoothingMode = sm;
+							bFirst=false;
+							objTmp.Paint(pa);
+							objTmp.Displayed=true;
+                            previousContainerItem = objTmp.IsContainer;
+						}
+					}
+				}
+                PaintExpandButton(pa, menuColors);
+			}
+		}
+
+        private void PaintMenuItemSide(ItemPaintArgs pa, Rectangle sideRect, InternalMenuColors menuColors)
+        {
+            if (pa.Owner is DotNetBarManager) // Do not paint side lines for DotNetBarManager owned items...
+                return;
+            Graphics g = pa.Graphics;
+            if (pa.RightToLeft)
+            {
+                Point p = new Point(sideRect.X, sideRect.Y);
+                DisplayHelp.DrawLine(g, p.X, p.Y, p.X, p.Y + sideRect.Height, menuColors.SideBorderLight.Start, 1);
+                
+                p.X++;
+
+                DisplayHelp.DrawLine(g, p.X, p.Y, p.X, p.Y + sideRect.Height, menuColors.SideBorder.Start, 1);
+            }
+            else
+            {
+                Point p = new Point(sideRect.Right - 2, sideRect.Y);
+
+                DisplayHelp.DrawLine(g, p.X, p.Y, p.X, p.Y + sideRect.Height, menuColors.SideBorder.Start, 1);
+                
+                p.X++;
+
+                DisplayHelp.DrawLine(g, p.X, p.Y, p.X, p.Y + sideRect.Height, menuColors.SideBorderLight.Start, 1);
+            }
+        }
+
+		private void RefreshExpandButton()
+		{
+			Graphics g=this.CreateGraphics();
+            try
+            {
+                ItemPaintArgs pa;
+                if (m_ColorScheme == null)
+                    pa = new ItemPaintArgs(m_Owner as IOwner, this, g, new ColorScheme(g));
+                else
+                    pa = new ItemPaintArgs(m_Owner as IOwner, this, g, m_ColorScheme);
+
+                PaintExpandButton(pa, GetMenuColors(pa));
+            }
+            finally
+            {
+                g.Dispose();
+            }
+		}
+
+        private bool IsGradientStyle
+        {
+            get
+            {
+                if (m_ParentItem != null)
+                {
+                    return m_ParentItem.EffectiveStyle == eDotNetBarStyle.OfficeXP || m_ParentItem.EffectiveStyle == eDotNetBarStyle.Office2003 || m_ParentItem.EffectiveStyle == eDotNetBarStyle.VS2005 || BarFunctions.IsOffice2007Style(m_ParentItem.EffectiveStyle);
+                }
+                return true;
+            }
+        }
+
+		private void PaintExpandButton(ItemPaintArgs pa, InternalMenuColors menuColors)
+		{
+			if(!m_ExpandButton.ShowExpandButton || m_ParentItem==null)
+				return;
+
+			Graphics g=pa.Graphics;
+
+			ImageItem objParentImageItem=m_ParentItem as ImageItem;
+			int iSideWidth=DEFAULT_SIDE_WIDTH;
+			if(objParentImageItem!=null && objParentImageItem.SubItemsImageSize.Width>iSideWidth)
+				iSideWidth=objParentImageItem.SubItemsImageSize.Width;
+			iSideWidth+=7;
+
+			objParentImageItem=null;
+
+            if (IsGradientStyle)
+			{
+				if(m_ExpandButton.MouseOver)
+				{
+                    Rectangle r = m_ExpandButton.Rect;
+                    DisplayHelp.FillRectangle(g, r, pa.Colors.MenuBackground, Color.Empty);
+					r.Inflate(-1,0);
+					if(Control.MouseButtons==MouseButtons.Left)
+					{
+                        DisplayHelp.FillRectangle(g, r, pa.Colors.ItemPressedBackground, pa.Colors.ItemPressedBackground2, pa.Colors.ItemPressedBackgroundGradientAngle);
+					}
+					else
+					{
+                        DisplayHelp.FillRectangle(g, r, pa.Colors.ItemHotBackground, pa.Colors.ItemHotBackground2, pa.Colors.ItemHotBackgroundGradientAngle);
+					}
+					NativeFunctions.DrawRectangle(g,SystemPens.Highlight,r);
+				}
+				else
+				{
+                    Rectangle r=new Rectangle(m_ExpandButton.Rect.Left+iSideWidth,m_ExpandButton.Rect.Top,m_ExpandButton.Rect.Width-iSideWidth,m_ExpandButton.Rect.Height);
+                    DisplayHelp.FillRectangle(g, r, pa.Colors.MenuBackground, Color.Empty);
+
+                    Rectangle sideRect = new Rectangle(m_ExpandButton.Rect.Left, m_ExpandButton.Rect.Top, iSideWidth, m_ExpandButton.Rect.Height);
+                    DisplayHelp.FillRectangle(g, sideRect, pa.Colors.MenuSide, pa.Colors.MenuSide2, pa.Colors.MenuSideGradientAngle);
+                    if (m_ParentItem != null && BarFunctions.IsOffice2007Style(m_ParentItem.EffectiveStyle))
+                        PaintMenuItemSide(pa, sideRect, menuColors);
+				}
+
+                if (m_ParentItem.EffectiveStyle == eDotNetBarStyle.Office2003 || m_ParentItem.EffectiveStyle == eDotNetBarStyle.VS2005 || BarFunctions.IsOffice2007Style(m_ParentItem.EffectiveStyle))
+				{
+					System.Drawing.Drawing2D.GraphicsPath path=new System.Drawing.Drawing2D.GraphicsPath();
+					Point pTopLeft=new Point(m_ExpandButton.Rect.X+(m_ExpandButton.Rect.Width-16)/2,m_ExpandButton.Rect.Y+(m_ExpandButton.Rect.Height-16)/2);
+					path.AddEllipse(pTopLeft.X,pTopLeft.Y,16,16);
+					System.Drawing.Drawing2D.PathGradientBrush gb=new System.Drawing.Drawing2D.PathGradientBrush(path);
+					gb.CenterColor=pa.Colors.MenuSide;
+					gb.SurroundColors=new Color[]{pa.Colors.MenuSide2};
+					gb.CenterPoint=new Point(pTopLeft.X+3,pTopLeft.Y+3);
+					System.Drawing.Drawing2D.SmoothingMode sm=g.SmoothingMode;
+					g.SmoothingMode=System.Drawing.Drawing2D.SmoothingMode.AntiAlias;
+					g.FillEllipse(gb,pTopLeft.X,pTopLeft.Y,16,16);
+					g.SmoothingMode=sm;
+				}
+
+			}
+            else if (m_ParentItem.EffectiveStyle == eDotNetBarStyle.Office2000)
+			{
+				if(m_ExpandButton.MouseOver)
+				{	
+					//g.FillRectangle(new SolidBrush(g.GetNearestColor(ControlPaint.Light(SystemColors.Control))),m_ExpandButton.Rect);
+					g.FillRectangle(new SolidBrush(ColorFunctions.RecentlyUsedOfficeBackColor()),m_ExpandButton.Rect);
+					if(Control.MouseButtons==MouseButtons.Left)
+						ControlPaint.DrawBorder(g,m_ExpandButton.Rect,SystemColors.Control,ButtonBorderStyle.Inset);
+					else
+						ControlPaint.DrawBorder3D(g,m_ExpandButton.Rect,Border3DStyle.RaisedInner,(Border3DSide.Left | Border3DSide.Right | Border3DSide.Top | Border3DSide.Bottom));
+					//NativeFunctions.DrawRectangle(g,SystemPens.Highlight,m_ExpandButton.Rect);
+				}
+				else
+				{
+					g.FillRectangle(SystemBrushes.Control,m_ExpandButton.Rect);
+				}
+			}
+
+			Point[] p=new Point[3];
+			p[0].X=m_ExpandButton.Rect.Left+(m_ExpandButton.Rect.Width-4)/2;
+            if (m_ParentItem.EffectiveStyle == eDotNetBarStyle.Office2003 || m_ParentItem.EffectiveStyle == eDotNetBarStyle.VS2005 || BarFunctions.IsOffice2007Style(m_ParentItem.EffectiveStyle))
+				p[0].Y=m_ExpandButton.Rect.Top+(m_ExpandButton.Rect.Height-7)/2;
+			else
+				p[0].Y=m_ExpandButton.Rect.Top+3;
+			p[1].X=p[0].X+2;
+			p[1].Y=p[0].Y+2;
+			p[2].X=p[0].X+4;
+			p[2].Y=p[0].Y;
+			g.DrawLines(SystemPens.ControlText,p);
+			p[0].Y+=1;
+			p[1].Y+=1;
+			p[2].Y+=1;
+			g.DrawLines(SystemPens.ControlText,p);
+
+			p[0].Y+=3;
+			p[1].Y+=3;
+			p[2].Y+=3;
+			g.DrawLines(SystemPens.ControlText,p);
+			p[0].Y+=1;
+			p[1].Y+=1;
+			p[2].Y+=1;
+			g.DrawLines(SystemPens.ControlText,p);
+
+		}
+
+		private void PaintSideBar(ItemPaintArgs pa)
+		{
+			Graphics g=pa.Graphics;
+			if(m_SideBarImage.Picture==null)
+				return;
+			
+			if(!m_SideBarImage.GradientColor1.IsEmpty && !m_SideBarImage.GradientColor2.IsEmpty)
+			{
+				PointF[] p=new PointF[2];
+				p[0].X=m_SideRect.Left;
+				p[0].Y=m_SideRect.Top;
+                p[1].X=m_SideRect.Left;
+				p[1].Y=m_SideRect.Bottom;
+
+				System.Drawing.Drawing2D.LinearGradientBrush lgb=BarFunctions.CreateLinearGradientBrush(m_SideRect,m_SideBarImage.GradientColor1,m_SideBarImage.GradientColor2,m_SideBarImage.GradientAngle);
+                g.FillRectangle(lgb,m_SideRect);
+			}
+			else if(!m_SideBarImage.BackColor.Equals(Color.Empty))
+				g.FillRectangle(new SolidBrush(m_SideBarImage.BackColor),m_SideRect);
+			
+			if(m_SideBarImage.StretchPicture)
+			{
+				g.DrawImage(m_SideBarImage.Picture,m_SideRect);
+			}
+			else
+			{
+				if(m_SideBarImage.Alignment==eAlignment.Top)
+					g.DrawImage(m_SideBarImage.Picture,m_SideRect.X,m_SideRect.Top,m_SideRect.Width,m_SideBarImage.Picture.Height);
+				else if(m_SideBarImage.Alignment==eAlignment.Bottom)
+					g.DrawImage(m_SideBarImage.Picture,m_SideRect.Left,m_SideRect.Bottom-m_SideBarImage.Picture.Height,m_SideBarImage.Picture.Width,m_SideBarImage.Picture.Height);
+				else
+					g.DrawImage(m_SideBarImage.Picture,m_SideRect.Left,m_SideRect.Top+(m_SideRect.Height-m_SideBarImage.Picture.Height)/2,m_SideBarImage.Picture.Width,m_SideBarImage.Picture.Height);
+			}
+		}
+
+		public BaseItem ParentItem
+		{
+			get
+			{
+				return m_ParentItem;
+			}
+			set
+			{
+				RestoreContainer();
+				m_ParentItem=value;
+				if(m_ParentItem==null || m_ParentItem.SubItems.Count==0)
+					return;
+
+                if (m_ParentItem.EffectiveStyle == eDotNetBarStyle.Office2003 || m_ParentItem.EffectiveStyle == eDotNetBarStyle.VS2005 || BarFunctions.IsOffice2007Style(m_ParentItem.EffectiveStyle))
+					EXPAND_BUTTON_HEIGHT=OFFICE2003_EXPAND_BUTTON_HEIGHT;
+				else
+					EXPAND_BUTTON_HEIGHT=DEFAULT_EXPAND_BUTTON_HEIGHT;
+
+				// Force ContainerChanged event so the items like MdiWindowListItem do not modify collection when we loop through it
+				if(m_ParentItem.SubItems.Count>0)
+					m_ParentItem.SubItems[0].ContainerControl=this;
+				for(int i=1;i<m_ParentItem.SubItems.Count;i++)
+					m_ParentItem.SubItems[i].ContainerControl=this;
+				
+				// Get the parent's screen position
+				System.Windows.Forms.Control objCtrl=m_ParentItem.ContainerControl as System.Windows.Forms.Control;
+                if (objCtrl != null)
+                    objCtrl.MouseWheel += ParentControlMouseWheel;
+				if(m_ParentItem.Displayed)
+				{
+					if(BaseItem.IsHandleValid(objCtrl))
+					{
+						m_ParentItemScreenPos=objCtrl.PointToScreen(new Point(m_ParentItem.LeftInternal,m_ParentItem.TopInternal));
+						objCtrl=null;
+					}
+				}
+				if(objCtrl is ItemControl)
+					m_AntiAlias=((ItemControl)objCtrl).AntiAlias;
+			}
+		}
+
+        void ParentControlMouseWheel(object sender, MouseEventArgs e)
+        {
+            if (m_Scroll)
+            {
+                if (e.Delta > 0)
+                {
+                    if (m_TopScroll)
+                        ScrollItemsUp();
+                }
+                else
+                {
+                    if (m_BottomScroll)
+                        ScrollItemsDown();
+                }
+            }
+        }
+
+		private void SetupRegion()
+		{
+			if(m_ParentItem!=null)
+			{
+				Rectangle r=new Rectangle(0,0,this.Width,this.Height);
+				System.Drawing.Region rgn=new System.Drawing.Region(r);
+				r.X=this.Width-2;
+				r.Y=0;
+				r.Width=2;
+				r.Height=2;
+				rgn.Xor(r);
+				//rgn.Exclude(r);
+				r.X=0;
+				r.Y=this.Height-2;
+				r.Width=2;
+				r.Height=2;
+				rgn.Xor(r);
+				this.Region=rgn;
+			}
+		}
+
+        public void RecalcLayout()
+        {
+            this.RecalcSize();
+            this.Invalidate(true);
+        }
+
+		public void RecalcSize()
+		{
+			if(m_ParentItem!=null)
+			{
+                m_ParentItem.IsRightToLeft = (this.RightToLeft == RightToLeft.Yes);
+                if (m_ParentItem.EffectiveStyle == eDotNetBarStyle.Office2000)
+					RecalcSizeOffice();
+				else
+					RecalcSizeDotNet();
+				if(this.Visible && m_PopupMenu && this.Parent!=null && this.Parent is PopupContainer)
+				{
+					ScreenInformation objScreen=BarFunctions.ScreenFromControl(this.Parent);
+					if(objScreen!=null)
+					{
+                        Rectangle screenArea = objScreen.WorkingArea;
+                        if (UseWholeScreenForSizeChecking)
+                            screenArea = objScreen.Bounds;
+						if(this.Parent.Location.Y+this.Size.Height>screenArea.Bottom)
+						{
+							// Reduce the size
+							m_ClientRect.Height=m_ClientRect.Height-(this.Parent.Location.Y+this.Size.Height-screenArea.Bottom);
+                            this.Height = this.Height - (this.Parent.Location.Y + this.Size.Height - screenArea.Bottom);
+                            if (!m_Scroll)
+                            {
+                                m_Scroll = true;
+                                m_ScrollTopPosition = 0;
+                            }
+							RepositionItems();
+						}
+						else
+							m_Scroll=false;
+					}
+				}
+			}
+            if (this.Visible)
+            {
+                if (m_ParentItem != null && BarFunctions.IsOffice2007Style(m_ParentItem.EffectiveStyle) && IsRoundRegion)
+                {
+                    if(this.Parent!=null)
+                        SetRoundRegion(this.Parent);
+                    SetRoundRegion(this);
+                }
+                this.Refresh();
+            }
+		}
+
+		protected override void OnResize(EventArgs e)
+		{
+			if(this.Parent is PopupContainer)
+			{
+				this.Parent.Size=this.Size;
+			}
+			base.OnResize(e);
+		}
+
+		private void RecalcSizeDotNet()
+		{
+			m_ExpandButton.ShowExpandButton=false;
+
+			if(m_ParentItem==null || m_ParentItem.SubItems.Count==0)
+			{
+				this.Height=24;
+				this.Width=m_ParentItem.WidthInternal+16;
+				//SetupRegion(); Very bad from AnimateWindow on W2K when control is not shown
+				return;
+			}
+
+			int iMaxWidth=0, iTop=ClientMarginTop, iLeft=ClientMarginLeft;
+			int iMaxHeight=0;
+			bool bAdjustHeight=false;
+			bool rightToLeft = (this.RightToLeft == RightToLeft.Yes);
+			// Take in account the side bar picture
+			if(m_SideBarImage.Picture!=null)
+				iLeft+=m_SideBarImage.Picture.Width;
+
+			foreach(BaseItem objItem in m_ParentItem.SubItems)
+			{
+				objItem.RecalcSize();
+				if(objItem.Visible || m_IsCustomizeMenu)
+				{
+					if(!m_ParentItem.DesignMode && m_PersonalizedMenus!=ePersonalizedMenus.Disabled && !m_ExpandButton.PersonalizedAllVisible && !m_IsCustomizeMenu)
+					{
+						IPersonalizedMenuItem ipm=objItem as IPersonalizedMenuItem;
+						if(ipm!=null && ipm.MenuVisibility==eMenuVisibility.VisibleIfRecentlyUsed && !ipm.RecentlyUsed)
+						{
+                            objItem.Displayed=false;
+							m_ExpandButton.ShowExpandButton=true;
+							continue;
+						}
+					}
+					if(objItem.HeightInternal!=iMaxHeight && objItem is ImageItem)
+					{
+						if(iMaxHeight>0)
+							bAdjustHeight=true;
+						if(objItem.HeightInternal>iMaxHeight)
+							iMaxHeight=objItem.HeightInternal;
+					}
+					if(objItem.BeginGroup && iTop>ClientMarginTop)
+						iTop+=Dpi.Height(GROUP_SPACINGDOTNET);
+					objItem.TopInternal=iTop;
+					objItem.LeftInternal=iLeft;
+					iTop+=objItem.HeightInternal;
+					if(objItem.WidthInternal>iMaxWidth)
+						iMaxWidth=objItem.WidthInternal;
+					objItem.Displayed=true;
+				}
+				else
+					objItem.Displayed=false;
+			}
+
+			if(iMaxWidth==0)
+				iMaxWidth=120;
+
+			if(bAdjustHeight)
+			{
+				iTop=ClientMarginTop;
+				foreach(BaseItem objItem in m_ParentItem.SubItems)
+				{
+					objItem.WidthInternal=iMaxWidth;
+					
+					if(objItem.Displayed)
+					{
+						if(objItem.BeginGroup && iTop>ClientMarginTop)
+							iTop+=Dpi.Height(GROUP_SPACINGDOTNET);
+						objItem.TopInternal=iTop;
+						iTop+=objItem.HeightInternal;
+					}
+                    //if (objItem.IsContainer && rightToLeft)
+                    //    objItem.RecalcSize();
+				}
+			}
+			else
+			{
+				// Set each item width to max width
+                foreach (BaseItem objItem in m_ParentItem.SubItems)
+                {
+                    objItem.WidthInternal = iMaxWidth;
+                    //if (objItem.IsContainer && rightToLeft)
+                    //    objItem.RecalcSize();
+                }
+			}
+			
+			if(m_ExpandButton.ShowExpandButton)
+			{
+				m_ExpandButton.Rect=new Rectangle(iLeft,iTop,iMaxWidth,EXPAND_BUTTON_HEIGHT);
+				iTop+=EXPAND_BUTTON_HEIGHT;
+			}
+
+			m_ClientRect=new Rectangle(iLeft,ClientMarginTop,iMaxWidth,iTop-ClientMarginTop);
+			if(m_SideBarImage.Picture!=null)
+				m_SideRect=new Rectangle(iLeft-m_SideBarImage.Picture.Width,ClientMarginTop,m_SideBarImage.Picture.Width,iTop-ClientMarginTop);
+			this.Size=new Size(iLeft+iMaxWidth+ClientMarginRight,iTop+ClientMarginBottom);
+			if(this.Height==92)
+				this.Height=92;
+			//SetupRegion(); Very bad for AnimateWindow on W2K when control is not shown
+		}
+
+		private void RecalcSizeOffice()
+		{
+			m_ExpandButton.ShowExpandButton=false;
+
+			if(m_ParentItem==null || m_ParentItem.SubItems.Count==0)
+			{
+				this.Height=24;
+				this.Width=m_ParentItem.WidthInternal+16;
+				return;
+			}
+
+			int iMaxWidth=0, iTop=ClientMarginTop, iLeft=ClientMarginLeft;
+			int iMaxHeight=0;
+			bool bAdjustHeight=false;
+			
+			// Take in account the side bar picture
+			if(m_SideBarImage.Picture!=null)
+				iLeft+=m_SideBarImage.Picture.Width;
+
+			foreach(BaseItem objItem in m_ParentItem.SubItems)
+			{
+				objItem.RecalcSize();
+				if(objItem.Visible || m_IsCustomizeMenu)
+				{
+					if(!m_ParentItem.DesignMode && m_PersonalizedMenus!=ePersonalizedMenus.Disabled && !m_ExpandButton.PersonalizedAllVisible && !m_IsCustomizeMenu)
+					{
+						IPersonalizedMenuItem ipm=objItem as IPersonalizedMenuItem;
+						if(ipm!=null && ipm.MenuVisibility==eMenuVisibility.VisibleIfRecentlyUsed && !ipm.RecentlyUsed)
+						{
+							objItem.Displayed=false;
+							m_ExpandButton.ShowExpandButton=true;
+							continue;
+						}
+					}
+					if(objItem.HeightInternal!=iMaxHeight && objItem is ImageItem)
+					{
+						if(iMaxHeight>0)
+							bAdjustHeight=true;
+						if(objItem.HeightInternal>iMaxHeight)
+							iMaxHeight=objItem.HeightInternal;
+					}
+					if(objItem.BeginGroup && iTop>ClientMarginTop)
+						iTop+=GROUP_SPACINGOFFICE;
+					objItem.TopInternal=iTop;
+					objItem.LeftInternal=iLeft;
+					iTop+=objItem.HeightInternal;
+					if(objItem.WidthInternal>iMaxWidth)
+						iMaxWidth=objItem.WidthInternal;
+					objItem.Displayed=true;
+				}
+				else
+					objItem.Displayed=false;
+			}
+
+			if(iMaxWidth==0)
+				iMaxWidth=120;
+
+			if(bAdjustHeight)
+			{
+				iTop=3;
+				foreach(BaseItem objItem in m_ParentItem.SubItems)
+				{
+                    //if (objItem is ImageItem)
+                    //    objItem.HeightInternal = iMaxHeight;
+					objItem.WidthInternal=iMaxWidth;
+
+					if(objItem.Displayed)
+					{
+						if(objItem.BeginGroup && iTop>ClientMarginTop)
+							iTop+=GROUP_SPACINGOFFICE;
+						objItem.TopInternal=iTop;
+						//iTop+=iMaxHeight;
+						iTop+=objItem.HeightInternal;
+					}
+				}
+			}
+			else
+			{
+				// Set each item width to max width
+				foreach(BaseItem objItem in m_ParentItem.SubItems)
+					objItem.WidthInternal=iMaxWidth;
+			}
+
+			if(m_ExpandButton.ShowExpandButton)
+			{
+				m_ExpandButton.Rect=new Rectangle(iLeft,iTop,iMaxWidth,EXPAND_BUTTON_HEIGHT);
+				iTop+=EXPAND_BUTTON_HEIGHT;
+			}
+			
+			m_ClientRect=new Rectangle(iLeft,ClientMarginTop,iMaxWidth,iTop-ClientMarginTop);
+
+			if(m_SideBarImage.Picture!=null)
+				m_SideRect=new Rectangle(iLeft-m_SideBarImage.Picture.Width,ClientMarginTop,m_SideBarImage.Picture.Width,iTop);
+			this.Size=new Size(iLeft+iMaxWidth+ClientMarginRight,iTop+ClientMarginBottom);
+		}
+
+		private void RestoreContainer()
+		{
+			if(m_ParentItem!=null && m_ParentItem.SubItems.Count!=0)
+			{
+				foreach(BaseItem objItem in m_ParentItem.SubItems)
+				{
+					objItem.ContainerControl=null;
+				}
+				int iLastIndex=0;
+				while(m_ParentItem!=null && iLastIndex<m_ParentItem.SubItems.Count)
+				{
+					m_ParentItem.SubItems[iLastIndex].Expanded=false;
+					iLastIndex++;
+				}
+				iLastIndex=0;
+				while(m_ParentItem!=null && iLastIndex<m_ParentItem.SubItems.Count)
+				{
+					m_ParentItem.SubItems[iLastIndex].Displayed=false;
+					iLastIndex++;
+				}
+			}
+		}
+
+		private BaseItem ExpandedItem()
+		{
+			if(m_ParentItem!=null && m_ParentItem.SubItems.Count>0)
+			{
+				foreach(BaseItem objSub in m_ParentItem.SubItems)
+				{
+                    if (objSub.Expanded && objSub is PopupItem)
+						return objSub;
+                    if (objSub.IsContainer)
+                    {
+                        BaseItem exp = objSub.ExpandedItem();
+                        if (exp is PopupItem)
+                            return exp;
+                    }
+				}
+			}
+			return null;
+		}
+
+		protected internal BaseItem FocusedItem()
+		{
+			if(m_ParentItem!=null && m_ParentItem.SubItems.Count>0)
+			{
+                foreach (BaseItem objSub in m_ParentItem.SubItems)
+                {
+                    if (objSub.Focused)
+                    {
+                        return objSub;
+                    }
+                    else if (objSub.IsContainer)
+                    {
+                        BaseItem focused = objSub.FocusedItem();
+                        if (focused != null)
+                            return focused;
+                    }
+                }
+			}
+			return null;
+		}
+
+		internal void SetFocusItem(BaseItem objFocus)
+		{
+			if(m_ParentItem==null || m_ParentItem.Parent!=null)
+				return;
+			BaseItem objItem=FocusedItem();
+            if(objItem==objFocus)
+				return;
+			
+			if(objItem!=null)
+				objItem.OnLostFocus();
+
+			if(objFocus!=null)
+				objFocus.OnGotFocus();
+		}
+
+		internal void InternalMouseMove(MouseEventArgs e)
+		{
+			this.OnMouseMove(e);
+		}
+
+		protected override void OnMouseMove(MouseEventArgs e)
+		{
+			base.OnMouseMove(e);
+
+			if(m_IgnoreDuplicateMouseMove)
+			{
+				if(m_LastMouseMoveEvent==null)
+				{
+					m_LastMouseMoveEvent=new System.Windows.Forms.MouseEventArgs(e.Button,e.Clicks,e.X,e.Y,e.Delta);
+					return;
+				}
+				if(m_LastMouseMoveEvent.X!=e.X || m_LastMouseMoveEvent.Y!=e.Y ||
+					m_LastMouseMoveEvent.Button!=e.Button)
+				{
+					m_IgnoreDuplicateMouseMove=false;
+					m_LastMouseMoveEvent=null;
+				}
+				else
+					return;
+			}
+
+			// Don't forward event if some other item has focus. This is the case for example for
+			// Text box items or any other item that can receive focus...
+			//if(!m_ParentItem.DesignMode && m_Owner!=null && m_Owner.GetFocusItem()!=null && m_ParentItem.ContainerControl!=null || this.FocusedItem()!=null && !m_ParentItem.DesignMode)
+			//	return;
+
+            if (m_ParentItem != null && m_ParentItem.DesignMode && e.Button == System.Windows.Forms.MouseButtons.Left && (Math.Abs(e.X - m_MouseDownPt.X) >= 2 || Math.Abs(e.Y - m_MouseDownPt.Y) >= 2 || m_DragDropInProgress))
+			{
+				BaseItem objFocus=this.FocusedItem();
+				IOwner owner=m_Owner as IOwner;
+                ISite site = this.GetSite();
+                if (site != null && objFocus!=null)
+                {
+                    DesignTimeMouseMove(e);
+                }
+                else
+                {
+                    if (objFocus != null && owner != null && objFocus.CanCustomize)
+                        owner.StartItemDrag(objFocus);
+                }
+			}
+
+			if(m_ParentItem==null || m_ParentItem.SubItems.Count==0 || m_ParentItem.DesignMode)
+				return;
+
+            //if (e.Button != MouseButtons.None && m_HotSubItem != null)
+            //{
+            //    m_HotSubItem.InternalMouseMove(e);
+            //    return;
+            //}
+
+			BaseItem objNew=ItemAtLocation(e.X,e.Y);
+
+			BaseItem objExpanded=ExpandedItem();
+
+			if(objExpanded!=null && objExpanded is PopupItem)
+			{
+				Control ctrlExpanded=((PopupItem)objExpanded).PopupControl;
+				if(ctrlExpanded!=null)
+				{
+					Point pClient=ctrlExpanded.PointToClient(this.PointToScreen(new Point(e.X,e.Y)));
+					if(ctrlExpanded.ClientRectangle.Contains(pClient))
+					{
+						if(ctrlExpanded is MenuPanel)
+						{
+							((MenuPanel)ctrlExpanded).InternalMouseMove(new MouseEventArgs(e.Button,e.Clicks,pClient.X,pClient.Y,e.Delta));
+							return;
+						}
+					}
+				}
+			}
+
+            if (objExpanded != null && objNew != objExpanded)
+            {
+                if (objExpanded is PopupItem && ((PopupItem)objExpanded).PopupType != ePopupType.Menu ||
+                    objExpanded != null && m_ParentItem != null && m_ParentItem.SubItems.Count > 0 && m_ParentItem.SubItems[0] is ItemContainer && !(m_ParentItem is ApplicationButton || m_ParentItem is DevComponents.DotNetBar.Metro.MetroAppButton))
+                {
+                    objExpanded.Expanded = false;
+                }
+                else
+                    CollapseItemDelayed(objExpanded);
+            }
+
+			if(m_ExpandButton.ShowExpandButton)
+			{
+				if(objNew==null && m_ExpandButton.Rect.Contains(e.X,e.Y) && !m_ExpandButton.MouseOver)
+				{
+					m_ExpandButton.MouseOver=true;
+					RefreshExpandButton();
+				}
+				else if(objNew!=null && m_ExpandButton.MouseOver)
+				{
+					m_ExpandButton.MouseOver=false;
+					RefreshExpandButton();
+				}
+			}
+
+            if (objNew == null && m_HotSubItem is GalleryContainer)
+            {
+                GalleryContainer gc = m_HotSubItem as GalleryContainer;
+                if (!gc.SystemGallery && gc.PopupUsesStandardScrollbars && gc.ScrollBarControl != null && gc.ScrollBarControl.IsMouseDown && e.Button == MouseButtons.Left)
+                    objNew = m_HotSubItem;
+            }
+
+			if(objNew!=m_HotSubItem)
+			{
+				if(m_HotSubItem!=null)
+				{
+					// Don't leave the hot item if it is exanded and mouse is inside the side bar picture, if we have side bar picture
+					//if(m_HotSubItem.Expanded && !m_SideRect.IsEmpty && m_SideRect.Contains(e.X,e.Y))
+					//	return;
+					m_HotSubItem.InternalMouseLeave();
+					// We need to reset hover thing since it is fired only first time mouse hovers inside the window and we need it for each of our items
+					if(m_Hover)
+					{
+						ResetHover();
+						m_Hover=false;
+					}
+				}
+
+                if (objNew != null)
+                {
+                    objNew.InternalMouseEnter();
+                    objNew.InternalMouseMove(e);
+                    m_HotSubItem = objNew;
+                }
+                else
+                {
+                    m_HotSubItem = null;
+                }
+			}
+			else if(m_HotSubItem!=null)
+			{
+				m_HotSubItem.InternalMouseMove(e);
+			}
+
+            // Gallery scrollbar support
+            if (this.Capture && !this.DisplayRectangle.Contains(e.X, e.Y) && m_ParentItem!=null &&
+                m_ParentItem.SubItems.Count>0 && m_ParentItem.SubItems[0] is GalleryContainer)
+            {
+                if (m_ParentItem.SubItems[0].Visible && m_ParentItem.SubItems[0].Displayed)
+                    m_ParentItem.SubItems[0].InternalMouseMove(e);
+            }
+        }
+
+        #region Design Time Drag & Drop
+        private bool m_DragDropInProgress = false;
+        private int m_InsertPosition=-1;
+        private bool m_InsertBefore=false;
+        private IDesignTimeProvider m_DesignTimeProvider=null;
+        private BaseItem m_DragItem = null;
+        private IDesignTimeProvider m_DragDropDesignTimeProvider = null;
+
+        private ISite GetSite()
+        {
+            ISite site = null;
+            IOwner owner = this.Owner as IOwner;
+            Control c = null;
+            if (owner is Control)
+            {
+                c = owner as Control;
+            }
+            else if (m_ParentItem != null && m_ParentItem.ContainerControl is Control)
+            {
+                c = m_ParentItem.ContainerControl as Control;
+            }
+
+            if (c != null)
+            {
+                while (site == null && c != null)
+                {
+                    if (c.Site != null && c.Site.DesignMode)
+                        site = c.Site;
+                    else
+                        c = c.Parent;
+                }
+            }
+
+            if (site == null && m_ParentItem != null)
+            {
+                BaseItem item = m_ParentItem;
+                while (site == null && item != null)
+                {
+                    if (item.Site != null && item.Site.DesignMode)
+                        site = item.Site;
+                    else
+                        item = item.Parent;
+                }
+            }
+
+            return site;
+        }
+
+        private void DesignTimeMouseMove(MouseEventArgs e)
+        {
+            if (m_DragDropInProgress)
+            {
+                try
+                {
+                    if (m_DesignTimeProvider != null)
+                    {
+                        m_DesignTimeProvider.DrawReversibleMarker(m_InsertPosition, m_InsertBefore);
+                        m_DesignTimeProvider = null;
+                    }
+                    InsertPosition pos = m_DragDropDesignTimeProvider.GetInsertPosition(Control.MousePosition, m_DragItem);
+                    
+                    if (pos != null)
+                    {
+                        if (pos.TargetProvider == null)
+                        {
+                            // Cursor is over drag item
+                            System.Windows.Forms.Cursor.Current = System.Windows.Forms.Cursors.No;
+                        }
+                        else
+                        {
+                            pos.TargetProvider.DrawReversibleMarker(pos.Position, pos.Before);
+                            m_InsertPosition = pos.Position;
+                            m_InsertBefore = pos.Before;
+                            m_DesignTimeProvider = pos.TargetProvider;
+                            System.Windows.Forms.Cursor.Current = System.Windows.Forms.Cursors.Hand;
+                        }
+                    }
+                    else
+                    {
+                        System.Windows.Forms.Cursor.Current = System.Windows.Forms.Cursors.No;
+                    }
+                }
+                catch
+                {
+                    m_DesignTimeProvider = null;
+                }
+            }
+            else
+            {
+                // Get top level design-time provider
+                BaseItem item = m_ParentItem;
+                while (item.Parent is IDesignTimeProvider)
+                    item = item.Parent;
+
+                ISite site = GetSite();
+                if (site != null && item.ContainerControl!=null)
+                {
+                    IDesignerHost dh = site.GetService(typeof(IDesignerHost)) as IDesignerHost;
+                    if (dh != null)
+                    {
+                        Control c = item.ContainerControl as Control;
+                        if (c is RibbonStrip && c.Site == null && c.Parent is RibbonControl)
+                            c = c.Parent;
+                        IBarItemDesigner designer = dh.GetDesigner(c) as IBarItemDesigner;
+                        if (designer != null)
+                        {
+                            designer.StartExternalDrag(this.FocusedItem());
+                            return;
+                        }
+                    }
+                }
+                
+                m_DragDropDesignTimeProvider = (IDesignTimeProvider)item;
+                m_DragItem = this.FocusedItem();
+                m_DragDropInProgress = true;
+                this.Capture = true;
+            }
+        }
+
+        private void DesignTimeMouseUp(MouseEventArgs e)
+        {
+            ISite site = GetSite();
+            if (site == null)
+                return;
+            IComponentChangeService cc = site.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+
+            if (m_DesignTimeProvider != null)
+            {
+                m_DesignTimeProvider.DrawReversibleMarker(m_InsertPosition, m_InsertBefore);
+                BaseItem objParent = m_DragItem.Parent;
+                if (objParent != null)
+                {
+                    if (objParent == (BaseItem)m_DesignTimeProvider && m_InsertPosition > 0)
+                    {
+                        if (objParent.SubItems.IndexOf(m_DragItem) < m_InsertPosition)
+                            m_InsertPosition--;
+                    }
+                    if (cc != null)
+                        cc.OnComponentChanging(objParent, TypeDescriptor.GetProperties(objParent)["SubItems"]);
+                    
+                    objParent.SubItems.Remove(m_DragItem);
+                    
+                    if (cc != null)
+                        cc.OnComponentChanged(objParent, TypeDescriptor.GetProperties(objParent)["SubItems"], null, null);
+
+                    Control ctrl = objParent.ContainerControl as Control;
+                    if (ctrl is Bar)
+                        ((Bar)ctrl).RecalcLayout();
+                    else if (ctrl is MenuPanel)
+                        ((MenuPanel)ctrl).RecalcSize();
+                }
+                
+                m_DesignTimeProvider.InsertItemAt(m_DragItem, m_InsertPosition, m_InsertBefore);
+                
+                m_DesignTimeProvider = null;
+                
+            }
+            m_DragDropDesignTimeProvider = null;
+            m_DragItem = null;
+            m_DragDropInProgress = false;
+            this.Capture = false;
+        }
+
+        private void DesignTimeMouseDown(MouseEventArgs e)
+        {
+            IOwner owner = this.Owner as IOwner;
+            BaseItem objNew = ItemAtLocation(e.X, e.Y);
+            
+            // If parent of the item is GalleryContainer ensure that mouse is not over gallery scroll buttons
+            if (objNew != null && objNew.Parent is GalleryContainer)
+            {
+                GalleryContainer gc = objNew.Parent as GalleryContainer;
+                if (gc.ScrollHitTest(e.X, e.Y))
+                    objNew = gc;
+            }
+
+            // Ignore system items
+            if (objNew != null && objNew.SystemItem)
+                objNew = null;
+
+            if (objNew == null)
+            {
+                if(e.Button == MouseButtons.Right)
+                {
+                    ISite site = GetSite();
+                    if (site != null)
+                    {
+                        ISelectionService selection = (ISelectionService)site.GetService(typeof(ISelectionService));
+                        if (selection.PrimarySelection == m_ParentItem)
+                        {
+                            // Show context menu for parent item...
+                            IMenuCommandService service1 = (IMenuCommandService)site.GetService(typeof(IMenuCommandService));
+                            if (service1 != null)
+                            {
+                                service1.ShowContextMenu(new CommandID(new Guid("{74D21312-2AEE-11d1-8BFB-00A0C90F26F7}"), 0x500)/*System.Windows.Forms.Design.MenuCommands.SelectionMenu*/, Control.MousePosition.X, Control.MousePosition.Y);
+                            }
+                        }
+                    }
+                }
+                return;
+            }
+
+            BaseItem objExpanded = ExpandedItem();
+            if (objExpanded != null && m_HotSubItem != objExpanded)
+                objExpanded.Expanded = false;
+
+            if (owner != null)
+            {
+                owner.SetFocusItem(objNew);
+                ISite site = GetSite();
+                if (site != null)
+                {
+                    ISelectionService selection = (ISelectionService)site.GetService(typeof(ISelectionService));
+                    if (selection != null)
+                    {
+                        ArrayList arr = new ArrayList(1);
+                        arr.Add(objNew);
+#if FRAMEWORK20
+                        selection.SetSelectedComponents(arr, SelectionTypes.Primary);
+#else
+                            selection.SetSelectedComponents(arr,SelectionTypes.MouseDown);
+#endif
+                    }
+                    if (e.Button == MouseButtons.Right)
+                    {
+                        IMenuCommandService service1 = (IMenuCommandService)site.GetService(typeof(IMenuCommandService));
+                        if (service1 != null)
+                        {
+                            service1.ShowContextMenu(new CommandID(new Guid("{74D21312-2AEE-11d1-8BFB-00A0C90F26F7}"), 0x500)/*System.Windows.Forms.Design.MenuCommands.SelectionMenu*/, Control.MousePosition.X, Control.MousePosition.Y);
+                        }
+                    }
+                }
+            }
+            owner = null;
+            if (objNew != null)
+                objNew.InternalMouseDown(e);
+        }
+        #endregion
+
+        internal void SelectFirstItem()
+		{
+			if(m_ParentItem!=null)
+			{
+				BaseItem disp=null;
+				foreach(BaseItem item in m_ParentItem.SubItems)
+				{
+                    if (item.Displayed && item.GetEnabled())
+					{
+                        if (item is ItemContainer)
+                        {
+                            if (!((ItemContainer)item).SelectFirstItem())
+                                continue;
+                        }
+						disp=item;
+						break;
+					}
+				}
+				if(disp!=null && m_HotSubItem!=disp)
+				{
+					if(m_HotSubItem!=null)
+					{
+						// Don't leave the hot item if it is exanded and mouse is inside the side bar picture, if we have side bar picture
+						//if(m_HotSubItem.Expanded && !m_SideRect.IsEmpty && m_SideRect.Contains(e.X,e.Y))
+						//	return;
+						m_HotSubItem.InternalMouseLeave();
+						// We need to reset hover thing since it is fired only first time mouse hovers inside the window and we need it for each of our items
+						if(m_Hover)
+						{
+							ResetHover();
+							m_Hover=false;
+						}
+					}
+				
+					if(disp!=null)
+					{
+                        if (!(disp is ItemContainer))
+                        {
+                            disp.InternalMouseEnter();
+                            disp.InternalMouseMove(new MouseEventArgs(MouseButtons.None, 0, disp.LeftInternal + 1, disp.TopInternal + 1, 0));
+                        }
+						m_HotSubItem=disp;
+					}
+				}
+			}
+		}
+		
+		private void CollapseItemDelayed(BaseItem item)
+		{
+			ResetHover();
+			
+			if(m_DelayedCollapseItem!=null && m_DelayedCollapseItem!=item)
+			{
+				m_DelayedCollapseItem.Expanded=false;
+			}
+
+			if(!m_LastExpandedOnHover)
+			{
+				item.Expanded=false;
+				m_DelayedCollapseItem=null;
+				m_LastExpandedOnHover=true; // was false
+			}
+			else
+			{
+				m_DelayedCollapseItem=item;
+				m_DelayedCollapseItem.InternalMouseLeave();
+			}
+		}
+
+		internal void InternalMouseHover()
+		{
+			if(m_ParentItem!=null && m_ParentItem.DesignMode || m_ParentItem==null)
+				return;
+			
+			// Hover delayed collapse of last expanded item
+			if(m_DelayedCollapseItem!=null)
+			{
+				m_DelayedCollapseItem.Expanded=false;
+				m_DelayedCollapseItem=null;
+			}
+
+			if(m_HotSubItem!=null)
+			{
+				bool bWasExpanded=false;
+				bWasExpanded=m_HotSubItem.Expanded;
+				m_HotSubItem.InternalMouseHover();
+				m_Hover=true;
+				if(!bWasExpanded && m_HotSubItem!=null && m_HotSubItem.Expanded)
+					m_LastExpandedOnHover=true;
+				else
+					m_LastExpandedOnHover=true; // was false
+			}
+			else if(m_ExpandButton.ShowExpandButton && m_ExpandButton.MouseOver)
+			{
+				if(m_PersonalizedMenus!=ePersonalizedMenus.DisplayOnClick)
+				{
+					m_ExpandButton.PersonalizedAllVisible=true;
+					IOwnerMenuSupport ownersupport=m_Owner as IOwnerMenuSupport;
+					if(ownersupport!=null)
+						ownersupport.PersonalizedAllVisible=true;
+					RecalcSize();
+					ResetHover();
+				}
+			}
+			else if(m_Scroll)
+			{
+				if(m_ScrollTimer==null)
+				{
+					CheckScrolling();
+					ResetHover();
+				}
+			}
+		}
+
+		protected override void OnMouseHover(EventArgs e)
+		{
+			base.OnMouseHover(e);
+			InternalMouseHover();
+		}
+
+		protected override void OnMouseLeave(EventArgs e)
+		{
+			if(m_ParentItem!=null && m_ParentItem.DesignMode || m_ParentItem==null)
+				return;
+			// If we had hot sub item pass the mouse leave message to it...
+			if(m_HotSubItem!=null) // && !m_HotSubItem.Expanded)
+			{
+				// Handle the case when child control of the item gets the mouse
+				Point mp=this.PointToClient(Control.MousePosition);
+                if (!m_HotSubItem.DisplayRectangle.Contains(mp))
+				{
+                    if (!(m_HotSubItem is PopupItem && m_HotSubItem.Expanded))
+                    {
+                        m_HotSubItem.InternalMouseLeave();
+                        m_HotSubItem = null;
+                    }
+				}
+			}
+			else if(m_ExpandButton.ShowExpandButton && m_ExpandButton.MouseOver)
+			{
+				m_ExpandButton.MouseOver=false;
+				RefreshExpandButton();
+			}
+
+            if (m_HotSubItem == null)
+            {
+                BaseItem exp = ExpandedItem();
+                if (exp != null && exp is PopupItem)
+                {
+                    m_HotSubItem = exp;
+                    m_HotSubItem.InternalMouseEnter();
+                    m_HotSubItem.InternalMouseMove(new MouseEventArgs(MouseButtons.None, 0, m_HotSubItem.DisplayRectangle.X+4, m_HotSubItem.DisplayRectangle.Y+4, 0));
+                }
+            }
+
+			base.OnMouseLeave(e);
+		}
+
+		protected override void OnMouseDown(MouseEventArgs e)
+		{
+			if(m_ParentItem==null)
+				return;
+            this.ShowKeyTips = false;
+
+			IOwner owner=this.Owner as IOwner;
+			m_MouseDownPt=new System.Drawing.Point(e.X,e.Y);
+			if(m_ParentItem.DesignMode)
+			{
+                DesignTimeMouseDown(e);
+			}
+
+			if(!this.DesignMode && owner!=null && owner.GetFocusItem()!=null)
+			{
+				BaseItem objNew=ItemAtLocation(e.X,e.Y);
+				if(objNew!=owner.GetFocusItem())
+					owner.GetFocusItem().ReleaseFocus();
+					
+			}
+
+            if (e.Button == MouseButtons.Right && m_HotSubItem != null && !this.IsCustomizeMenu && owner is IRibbonCustomize && m_ParentItem!=null && m_ParentItem.Name!="syscustomizepopupmenu")
+                ((IRibbonCustomize)owner).ItemRightClick(m_HotSubItem);
+
+			if(m_HotSubItem!=null)
+				m_HotSubItem.InternalMouseDown(e);
+			else if(m_ExpandButton.ShowExpandButton && m_ExpandButton.MouseOver)
+			{
+				RefreshExpandButton();
+			}
+
+			base.OnMouseDown(e);
+		}
+
+		internal void InternalMouseUp(MouseEventArgs e)
+		{
+			this.OnMouseUp(e);
+		}
+
+		protected override void OnMouseUp(MouseEventArgs e)
+		{
+            if (m_DragDropInProgress)
+            {
+                DesignTimeMouseUp(e);
+            }
+            else
+            {
+                if (m_HotSubItem != null)
+                {
+                    m_HotSubItem.InternalMouseUp(e);
+                }
+                else if (m_ExpandButton.ShowExpandButton && m_ExpandButton.MouseOver)
+                {
+                    if (m_PersonalizedMenus != ePersonalizedMenus.DisplayOnHover && m_ExpandButton.Rect.Contains(e.X, e.Y))
+                    {
+                        ExpandRecentlyUsed();
+                    }
+                    else
+                        RefreshExpandButton();
+                }
+            }
+
+			base.OnMouseUp(e);
+		}
+
+		internal void ExpandRecentlyUsed()
+		{
+			if(m_PersonalizedMenus!=ePersonalizedMenus.DisplayOnHover)
+			{
+				m_ExpandButton.PersonalizedAllVisible=true;
+				IOwnerMenuSupport ownermenu=this.Owner as IOwnerMenuSupport;
+				if(ownermenu!=null)
+					ownermenu.PersonalizedAllVisible=true;
+				RecalcSize();
+			}
+		}
+
+		protected override void OnClick(EventArgs e)
+		{
+			if(m_ParentItem!=null && m_ParentItem.DesignMode || m_ParentItem==null)
+				return;
+
+			if(m_HotSubItem!=null)
+			{
+				m_HotSubItem.InternalClick(Control.MouseButtons,Control.MousePosition);
+			}
+			else if(m_Scroll)
+			{
+				CheckScrolling();
+			}
+			base.OnClick(e);
+		}
+
+		protected override void OnDoubleClick(EventArgs e)
+		{
+            ISite site = this.GetSite();
+			if(site!=null && site.DesignMode)
+			{
+				ISelectionService selection = (ISelectionService) site.GetService(typeof(ISelectionService));
+				if(selection!=null)
+				{
+					IDesignerHost host=(IDesignerHost) site.GetService(typeof(IDesignerHost));
+					if(host!=null)
+					{
+						IDesigner designer=host.GetDesigner(selection.PrimarySelection as IComponent);
+						if(designer!=null)
+						{
+							designer.DoDefaultAction();
+						}
+					}
+				}
+			}
+
+			if(m_ParentItem!=null && m_ParentItem.DesignMode || m_ParentItem==null)
+				return;
+
+			if(m_HotSubItem!=null)
+			{
+				m_HotSubItem.InternalDoubleClick(Control.MouseButtons,Control.MousePosition);
+			}
+			base.OnDoubleClick(e);
+		}
+
+		protected override void OnKeyDown(KeyEventArgs e)
+		{
+			if(m_ParentItem==null || m_ParentItem.SubItems.Count==0)
+			{
+				base.OnKeyDown(e);
+				return;
+			}
+			this.ExKeyDown(e);
+			base.OnKeyDown(e);
+		}
+
+        private bool CanGetMouseFocus(BaseItem item)
+        {
+            if (item is LabelItem)
+                return false;
+            return true;
+        }
+
+		internal void ExKeyDown(KeyEventArgs e)
+		{
+			if(m_ParentItem==null || m_ParentItem.SubItems.Count==0 || m_ParentItem.DesignMode)
+				return;
+
+			if(m_HotSubItem==null || m_HotSubItem!=null && !m_HotSubItem.Expanded)
+			{
+				if(e.KeyCode==Keys.Down)
+				{
+                    if (m_ParentItem is ItemContainer)
+                    {
+                        m_ParentItem.InternalKeyDown(e);
+                    }
+                    else
+                    {
+                        if (m_HotSubItem is ItemContainer)
+                            m_HotSubItem.InternalKeyDown(e);
+
+                        if (!e.Handled)
+                        {
+                            int i = 0;
+                            if (m_HotSubItem != null)
+                            {
+                                m_HotSubItem.InternalMouseLeave();
+                                i = m_ParentItem.SubItems.IndexOf(m_HotSubItem) + 1;
+                                if (i == m_ParentItem.SubItems.Count && m_ExpandButton.ShowExpandButton)
+                                {
+                                    m_ExpandButton.MouseOver = true;
+                                    RefreshExpandButton();
+                                }
+                                else if (i < 0 || i == m_ParentItem.SubItems.Count)
+                                {
+                                    i = 0;
+                                }
+                                m_HotSubItem = null;
+                            }
+                            else if (m_ExpandButton.MouseOver)
+                            {
+                                m_ExpandButton.MouseOver = false;
+                                RefreshExpandButton();
+                                i = 0;
+                            }
+                            BaseItem objTmp;
+                            for (int f = i; f < m_ParentItem.SubItems.Count; f++)
+                            {
+                                objTmp = m_ParentItem.SubItems[f];
+                                if (objTmp.Displayed && objTmp.Visible && CanGetMouseFocus(objTmp))
+                                {
+                                    m_HotSubItem = objTmp;
+                                    m_HotSubItem.InternalMouseEnter();
+                                    m_HotSubItem.InternalMouseMove(new MouseEventArgs(MouseButtons.None, 0, m_HotSubItem.LeftInternal + 2, m_HotSubItem.TopInternal + 2, 0));
+                                    if (m_HotSubItem.IsContainer)
+                                        m_HotSubItem.InternalKeyDown(e);
+                                    break;
+                                }
+                            }
+                            if (m_HotSubItem == null && m_ExpandButton.ShowExpandButton && !m_ExpandButton.MouseOver)
+                            {
+                                m_ExpandButton.MouseOver = true;
+                                RefreshExpandButton();
+                            }
+                        }
+                    }
+					e.Handled=true;
+					m_IgnoreDuplicateMouseMove=true;
+				}
+				else if(e.KeyCode==Keys.Up)
+				{
+                    if (m_ParentItem is ItemContainer)
+                    {
+                        m_ParentItem.InternalKeyDown(e);
+                    }
+                    else
+                    {
+                        if (m_HotSubItem is ItemContainer)
+                            m_HotSubItem.InternalKeyDown(e);
+                        if (!e.Handled)
+                        {
+                            int i = 0;
+                            if (m_HotSubItem != null)
+                            {
+                                m_HotSubItem.InternalMouseLeave();
+                                i = m_ParentItem.SubItems.IndexOf(m_HotSubItem) - 1;
+                                if (i < 0 && m_ExpandButton.ShowExpandButton)
+                                {
+                                    m_ExpandButton.MouseOver = true;
+                                    RefreshExpandButton();
+                                }
+                                else if (i < 0)
+                                    i = m_ParentItem.SubItems.Count - 1;
+                                m_HotSubItem = null;
+                            }
+                            else if (m_ExpandButton.MouseOver)
+                            {
+                                m_ExpandButton.MouseOver = false;
+                                RefreshExpandButton();
+                                i = m_ParentItem.SubItems.Count - 1;
+                            }
+                            else if (m_ExpandButton.ShowExpandButton)
+                            {
+                                m_ExpandButton.MouseOver = true;
+                                RefreshExpandButton();
+                            }
+                            else
+                                i = m_ParentItem.SubItems.Count - 1;
+                            BaseItem objTmp;
+                            for (int f = i; f >= 0; f--)
+                            {
+                                objTmp = m_ParentItem.SubItems[f];
+                                if (objTmp.Displayed && objTmp.Visible && CanGetMouseFocus(objTmp))
+                                {
+                                    m_HotSubItem = objTmp;
+                                    m_HotSubItem.InternalMouseEnter();
+                                    m_HotSubItem.InternalMouseMove(new MouseEventArgs(MouseButtons.None, 0, m_HotSubItem.LeftInternal + 2, m_HotSubItem.TopInternal + 2, 0));
+                                    if (m_HotSubItem.IsContainer)
+                                        m_HotSubItem.InternalKeyDown(e);
+                                    break;
+                                }
+                            }
+                            if (m_HotSubItem == null && m_ExpandButton.ShowExpandButton && !m_ExpandButton.MouseOver)
+                            {
+                                m_ExpandButton.MouseOver = true;
+                                RefreshExpandButton();
+                            }
+                        }
+                    }
+					e.Handled=true;
+					m_IgnoreDuplicateMouseMove=true;
+				}
+				else if(e.KeyCode==Keys.Right)
+				{
+					m_IgnoreDuplicateMouseMove=true;
+                    if (m_HotSubItem != null && m_HotSubItem.GetEnabled())
+                    {
+                        ButtonItem objBtn = m_HotSubItem as ButtonItem;
+                        if (objBtn != null)
+                        {
+                            if (objBtn.SubItems.Count > 0 && objBtn.ShowSubItems && !objBtn.Expanded)
+                            {
+                                objBtn.Expanded = true;
+                                if (objBtn.PopupControl is MenuPanel)
+                                    ((MenuPanel)objBtn.PopupControl).SelectFirstItem();
+
+                                e.Handled = true;
+                            }
+                        }
+                    }
+                    if (m_HotSubItem != null && m_HotSubItem is ItemContainer)
+                        m_HotSubItem.InternalKeyDown(e);
+
+                    if (!e.Handled && m_ParentItem!=null)
+                    {
+                        foreach (BaseItem item in m_ParentItem.SubItems)
+                        {
+                            if (item is ItemContainer)
+                            {
+                                item.InternalKeyDown(e);
+                                if (e.Handled)
+                                    break;
+                            }
+                        }
+                    }
+				}
+				else if(e.KeyCode==Keys.Left)
+				{
+                    if (m_HotSubItem != null && m_HotSubItem is ItemContainer)
+                        m_HotSubItem.InternalKeyDown(e);
+                    if (!e.Handled)
+                    {
+                        m_IgnoreDuplicateMouseMove = true;
+                        // Close this popup
+                        if (BaseItem.IsOnPopup(m_ParentItem))
+                        {
+                            m_ParentItem.Expanded = false;
+                            e.Handled = true;
+                        }
+                    }
+				}
+				else if(e.KeyCode==Keys.Escape)
+				{
+                    BaseItem parent = m_ParentItem;
+                    parent.Expanded = false;
+                    if (parent.Parent != null && parent.Parent is GenericItemContainer && parent.Parent.AutoExpand)
+                        parent.Parent.AutoExpand = false;
+                    e.Handled = true;
+				}
+                else if (e.KeyCode == Keys.Enter && m_HotSubItem != null && m_HotSubItem.IsContainer)
+                {
+                    m_HotSubItem.InternalKeyDown(e);
+                }
+                else if (e.KeyCode == Keys.Enter && m_HotSubItem != null && m_HotSubItem.SubItems.Count > 0 && m_HotSubItem.ShowSubItems && !m_HotSubItem.Expanded && m_HotSubItem.GetEnabled())
+                {
+                    m_HotSubItem.Expanded = true;
+                    if (m_HotSubItem is PopupItem && ((PopupItem)m_HotSubItem).PopupControl is MenuPanel)
+                        ((MenuPanel)((PopupItem)m_HotSubItem).PopupControl).SelectFirstItem();
+
+                    e.Handled = true;
+                }
+                else if ((e.KeyCode == Keys.Enter || e.KeyCode == Keys.Space) && m_ExpandButton.ShowExpandButton && m_ExpandButton.MouseOver)
+                {
+                    ExpandRecentlyUsed();
+                }
+                else
+                {
+                    int key = 0;
+                    if (e.Shift)
+                    {
+                        try
+                        {
+                            byte[] keyState = new byte[256];
+                            if (NativeFunctions.GetKeyboardState(keyState))
+                            {
+                                byte[] chars = new byte[2];
+                                if (NativeFunctions.ToAscii((uint)e.KeyValue, 0, keyState, chars, 0) != 0)
+                                {
+                                    key = chars[0];
+                                }
+                            }
+                        }
+                        catch (Exception)
+                        {
+                            key = 0;
+                        }
+                    }
+
+                    if (key == 0 && !BarFunctions.IsSystemKey(e.KeyCode))
+                    {
+                        key = (int)NativeFunctions.MapVirtualKey((uint)e.KeyValue, 2);
+                        if (key == 0)
+                            key = e.KeyValue;
+                    }
+                    if(e is KeyEventArgsEx && ((KeyEventArgsEx)e).KeyChar!=0)
+                    {
+                        if (ProcessContainerAccessKey(m_ParentItem, ((KeyEventArgsEx)e).KeyChar))
+                            e.Handled = true;
+                    }
+                    if (!e.Handled && key > 0)
+                    {
+                        char[] ch = new char[1];
+                        byte[] by = new byte[1];
+                        by[0] = System.Convert.ToByte(key);
+                        System.Text.Encoding.Default.GetDecoder().GetChars(by, 0, 1, ch, 0);
+                        string s = ch[0].ToString();
+                        ch[0] = (s.ToLower())[0];
+                        if ((Control.ModifierKeys & Keys.Control) == Keys.None && ProcessContainerAccessKey(m_ParentItem, ch[0]))
+                            e.Handled = true;
+                    }
+                }
+			}
+
+			if(!e.Handled && m_HotSubItem!=null)
+			{
+                bool raiseKeyDown=true;
+                if (this.Controls.Count > 0)
+                {
+                    foreach (Control childControl in this.Controls)
+                    {
+                        if (childControl.Focused)
+                        {
+                            raiseKeyDown = false;
+                            break;
+                        }
+                    }
+                }
+                if(raiseKeyDown)
+    				m_HotSubItem.InternalKeyDown(e);
+			}
+		}
+
+        protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
+        {
+            if (keyData == Keys.Escape || keyData == Keys.Enter)
+            {
+                KeyEventArgs args = new KeyEventArgs(keyData);
+                ExKeyDown(args);
+                if (args.Handled) return true;
+            }
+            return base.ProcessCmdKey(ref msg, keyData);
+        }
+
+        private bool ProcessContainerAccessKey(BaseItem container, char key)
+        {
+            List<BaseItem> itemsForMnemonic = GetItemsForMnemonic(container, key);
+            if (itemsForMnemonic.Count > 1)
+            {
+                // Special processing for case when more than one item uses same mnemonic key
+                BaseItem newHotSubitem = null;
+                if (m_HotSubItem == null)
+                    newHotSubitem = itemsForMnemonic[0];
+                else
+                {
+                    int hotItemIndex = itemsForMnemonic.IndexOf(m_HotSubItem);
+                    if (hotItemIndex == -1)
+                        newHotSubitem = itemsForMnemonic[0];
+                    else
+                    {
+                        if (hotItemIndex == itemsForMnemonic.Count - 1)
+                            hotItemIndex = 0;
+                        else
+                            hotItemIndex++;
+                        newHotSubitem = itemsForMnemonic[hotItemIndex];
+                    }
+                }
+                if (newHotSubitem != null)
+                {
+                    if (m_HotSubItem != null)
+                        m_HotSubItem.InternalMouseLeave();
+                    m_HotSubItem = newHotSubitem;
+                    m_HotSubItem.InternalMouseEnter();
+                    m_HotSubItem.InternalMouseMove(new MouseEventArgs(MouseButtons.None, 0, m_HotSubItem.LeftInternal + 2, m_HotSubItem.TopInternal + 2, 0));
+                }
+                return true;
+            }
+
+            BaseItem item = GetItemForMnemonic(container, key, true);
+            if (item!=null && item.GetEnabled() && item.Visible)
+            {
+                if (item is ItemContainer)
+                {
+                    this.ShowKeyTips = false;
+                    this.HotSubItem = item;
+                }
+                else if (item.SubItems.Count > 0 && item.ShowSubItems && !item.Expanded)
+                {
+                    if (m_HotSubItem != item)
+                    {
+                        if (m_HotSubItem != null)
+                            m_HotSubItem.InternalMouseLeave();
+                        m_HotSubItem = item;
+                        m_HotSubItem.InternalMouseEnter();
+                        m_HotSubItem.InternalMouseMove(new MouseEventArgs(MouseButtons.None, 0, m_HotSubItem.LeftInternal + 2, m_HotSubItem.TopInternal + 2, 0));
+                    }
+                    item.Expanded = true;
+                    if (item is PopupItem && ((PopupItem)item).PopupControl is MenuPanel)
+                    {
+                        ((MenuPanel)((PopupItem)item).PopupControl).SelectFirstItem();
+                    }
+                    m_IgnoreDuplicateMouseMove = true;
+                }
+                else
+                {
+                    this.ShowKeyTips = false;
+                    if (item is ComboBoxItem)
+                    {
+                        ((ComboBoxItem)item).ComboBoxEx.Focus();
+                        ((ComboBoxItem)item).ComboBoxEx.DroppedDown = true;
+                    }
+                    else if (item is TextBoxItem)
+                    {
+                        ((TextBoxItem)item).TextBox.Focus();
+                    }
+                    else if (item is ControlContainerItem && ((ControlContainerItem)item).Control != null)
+                        ((ControlContainerItem)item).Control.Focus();
+                    else
+                        item.RaiseClick();
+                }
+                return true;
+            }
+
+            return false;
+        }
+
+        private List<BaseItem> GetItemsForMnemonic(BaseItem container, char charCode)
+        {
+            List<BaseItem> items = new List<BaseItem>();
+            foreach (BaseItem item in container.SubItems)
+            {
+                if (IsMnemonic(charCode, item.Text))
+                {
+                    if (item.Visible && item.GetEnabled())
+                    {
+                        items.Add(item);
+                    }
+                }
+            }
+            return items;
+        }
+
+        protected virtual BaseItem GetItemForMnemonic(BaseItem container, char charCode, bool deepScan)
+        {
+            string keyTipsString = m_KeyTipsKeysStack + charCode.ToString();
+            keyTipsString = keyTipsString.ToUpper();
+            bool partialMatch = false;
+
+            foreach (BaseItem item in container.SubItems)
+            {
+                if (item.KeyTips != "" || m_KeyTipsKeysStack != "")
+                {
+                    if (item.KeyTips != "")
+                    {
+                        if (item.KeyTips == keyTipsString)
+                        {
+                            if (item.Visible && item.GetEnabled())
+                            {
+                                return item;
+                            }
+                        }
+                        else if (item.KeyTips.StartsWith(keyTipsString))
+                        {
+                            partialMatch = true;
+                        }
+                    }
+                }
+                else if (IsMnemonic(charCode, item.Text))
+                {
+                    if (item.Visible && item.GetEnabled())
+                    {
+                        return item;
+                    }
+                }
+
+                if (deepScan && item.IsContainer)
+                {
+                    BaseItem mItem = GetItemForMnemonic(item, charCode, deepScan);
+                    if (mItem != null)
+                        return mItem;
+                }
+                else if (deepScan && item is ControlContainerItem && ((ControlContainerItem)item).Control is RibbonBar)
+                {
+                    RibbonBar rb = ((ControlContainerItem)item).Control as RibbonBar;
+                    BaseItem mItem = GetItemForMnemonic(rb.GetBaseItemContainer(), charCode, deepScan);
+                    if (mItem != null)
+                        return mItem;
+                }
+            }
+
+            if (partialMatch)
+            {
+                m_KeyTipsKeysStack += charCode.ToString().ToUpper();
+            }
+
+            return null;
+        }
+
+		/// <summary>
+		/// Return Sub Item at specified location
+		/// </summary>
+		protected BaseItem ItemAtLocation(int x, int y)
+		{
+			if(m_ParentItem!=null && m_ParentItem.SubItems.Count!=0)
+			{
+				foreach(BaseItem objSub in m_ParentItem.SubItems)
+				{
+					if((objSub.Visible || m_IsCustomizeMenu) && objSub.Displayed && x>=objSub.LeftInternal && x<=(objSub.LeftInternal+objSub.WidthInternal) && y>=objSub.TopInternal && y<=(objSub.TopInternal+objSub.HeightInternal))
+					{
+                        if (objSub.IsContainer)
+                        {
+                            BaseItem item = objSub.ItemAtLocation(x, y);
+                            if (item != null)
+                                return item;
+                        }
+						return objSub;
+					}
+				}
+			}
+			return null;
+		}
+
+		protected override void OnHandleDestroyed(EventArgs e)
+		{
+			ClearHotSubItem();
+			base.OnHandleDestroyed(e);
+		}
+
+		internal void ClearHotSubItem()
+		{
+			if(m_HotSubItem!=null)
+			{	
+				//if(m_ParentItem!=null && m_ParentItem.DesignMode && this.Owner!=null)
+				//	this.Owner.SetFocusItem(null);
+				//else
+					m_HotSubItem.InternalMouseLeave();
+
+				m_HotSubItem=null;
+			}
+		}
+
+		private void ResetHover()
+		{
+			// We need to reset hover thing since it is fired only first time mouse hovers inside the window and we need it for each of our items
+			NativeFunctions.TRACKMOUSEEVENT tme=new NativeFunctions.TRACKMOUSEEVENT();
+			tme.dwFlags=NativeFunctions.TME_QUERY;
+			tme.hwndTrack=this.Handle;
+			tme.cbSize=System.Runtime.InteropServices.Marshal.SizeOf(tme);
+			NativeFunctions.TrackMouseEvent(ref tme);
+			tme.dwFlags=tme.dwFlags | NativeFunctions.TME_HOVER;
+			NativeFunctions.TrackMouseEvent(ref tme);
+		}
+
+		private void SetupScrollTimer()
+		{
+			m_ScrollTimer=new Timer();
+			m_ScrollTimer.Interval=100;
+			m_ScrollTimer.Tick+=new EventHandler(this.ScrollTimerTick);
+			m_ScrollTimer.Start();
+		}
+
+		private void ScrollTimerTick(object sender, EventArgs e)
+		{
+			CheckScrolling();
+		}
+
+        private void ScrollItemsUp()
+        {
+            if (m_ScrollTopPosition > 0)
+            {
+                m_ScrollTopPosition--;
+                //BaseItem o=m_ParentItem.SubItems[m_ScrollTopPosition] as BaseItem;
+                //if(o is SeparatorItem && m_ScrollTopPosition>0)
+                //	m_ScrollTopPosition--;
+
+            }
+            RepositionItems();
+            this.Refresh();
+        }
+        private void ScrollItemsDown()
+        {
+            m_ScrollTopPosition++;
+            //BaseItem o=m_ParentItem.SubItems[m_ScrollTopPosition] as BaseItem;
+            //if(o is SeparatorItem && m_ScrollTopPosition<m_ParentItem.SubItemsCount)
+            //	m_ScrollTopPosition++;
+            RepositionItems();
+            this.Refresh();
+        }
+        private bool CheckScrolling()
+		{
+			if(!m_Scroll)
+				return false;
+			Point p=this.PointToClient(Control.MousePosition);
+			if(m_TopScroll && p.Y<=m_TopScrollHeight+m_ClientRect.Top)
+			{
+                ScrollItemsUp();
+				if(m_ScrollTimer==null)
+					SetupScrollTimer();
+				return true;
+			}
+			else if(m_BottomScroll && p.Y>=this.Height-m_BottomScrollHeight)
+			{
+                ScrollItemsDown();
+				if(m_ScrollTimer==null)
+					SetupScrollTimer();
+				return true;
+			}
+			else
+			{
+				if(m_ScrollTimer!=null)
+				{
+					m_ScrollTimer.Stop();
+					m_ScrollTimer.Dispose();
+					m_ScrollTimer=null;
+				}
+			}
+			return false;
+		}
+
+		// Reposition items when scrolling changes
+		// This function will change only Y coordinate of the items
+		// It will also set the Displayed property properly
+		private void RepositionItems()
+		{
+			m_TopScroll=false;
+			m_BottomScroll=false;
+            if(!m_Scroll || m_ParentItem==null || m_ParentItem.SubItems.Count==0)
+				return;
+			int iTop=m_ClientRect.Top;
+			int iItemHeight=0;
+			if(m_ScrollTopPosition>0)
+			{
+				// There is a top scroll triangle, with inital height of 16
+                m_TopScrollHeight=16;
+				iTop+=m_TopScrollHeight;
+				m_TopScroll=true;
+			}
+			BaseItem objItem;
+			bool bOverrun=false;
+			for(int i=0;i<m_ParentItem.SubItems.Count;i++)
+			{
+                objItem=m_ParentItem.SubItems[i];
+				if(bOverrun || i<m_ScrollTopPosition || !objItem.Visible && !m_IsCustomizeMenu)
+				{
+					objItem.Displayed=false;
+					continue;
+				}
+
+				iItemHeight=objItem.HeightInternal;
+				if(objItem.BeginGroup)
+				{
+                    if (m_ParentItem.EffectiveStyle == eDotNetBarStyle.Office2000)
+						iItemHeight+=Dpi.Height(GROUP_SPACINGOFFICE);
+					else
+						iItemHeight+=Dpi.Height(GROUP_SPACINGDOTNET);
+				}
+
+                if(iItemHeight+iTop>m_ClientRect.Bottom || m_ClientRect.Bottom-(iItemHeight+iTop)<15 && i+1<m_ParentItem.SubItems.Count)
+				{
+					// Overflows, this item is out
+					objItem.Displayed=false;
+					bOverrun=true;
+					
+					// We will need bottom scrolling triangle
+					m_BottomScroll=true;
+					m_BottomScrollHeight=m_ClientRect.Bottom-iTop;
+					continue;
+				}
+
+				// If this item is last item we need to change positions so last item
+				// Is at the bottom of the window
+				if(i==m_ParentItem.SubItems.Count-1)
+				{
+					// This is a last item, now we have to do more work to make this look better
+					// Get the previous item so we know what our top position will be
+					objItem.Displayed=true;
+					iTop=m_ClientRect.Bottom;
+                    for(int i1=i;i1>=m_ScrollTopPosition;i1--)
+					{
+						objItem=m_ParentItem.SubItems[i1];
+						if(!objItem.Visible && !m_IsCustomizeMenu)
+							continue;
+						iTop-=objItem.HeightInternal;
+						objItem.TopInternal=iTop;
+						if(objItem.BeginGroup)
+						{
+                            if (m_ParentItem.EffectiveStyle == eDotNetBarStyle.Office2000)
+								iTop-=Dpi.Height(GROUP_SPACINGOFFICE);
+							else
+								iTop-=Dpi.Height(GROUP_SPACINGDOTNET);
+						}
+					}
+					// See can we fit more items on top
+					if(m_ScrollTopPosition>0)
+					{
+						objItem=m_ParentItem.SubItems[m_ScrollTopPosition-1];
+						if(iTop-objItem.HeightInternal-15>m_ClientRect.Top)
+						{
+							// Great we can fit some more
+							for(int i1=m_ScrollTopPosition-1;i1>=0;i1--)
+							{
+						        objItem=m_ParentItem.SubItems[i1];
+								if(!objItem.Visible && !m_IsCustomizeMenu)
+									continue;
+								if(iTop-objItem.HeightInternal-15>m_ClientRect.Top)
+								{
+									iTop-=objItem.HeightInternal;
+									objItem.TopInternal=iTop;
+									objItem.Displayed=true;
+									if(objItem.BeginGroup)
+									{
+                                        if (m_ParentItem.EffectiveStyle == eDotNetBarStyle.Office2000)
+											iTop-=Dpi.Height(GROUP_SPACINGOFFICE);
+										else
+											iTop-=Dpi.Height(GROUP_SPACINGDOTNET);
+									}
+									m_ScrollTopPosition=i1;
+								}
+								else
+									break;
+							}
+						}
+					}
+
+					// Set the top scroll triangle height
+					m_TopScrollHeight=iTop-m_ClientRect.Top;
+					m_BottomScroll=false;
+					break;
+				}
+
+				if(objItem.BeginGroup)
+				{
+                    if (m_ParentItem.EffectiveStyle == eDotNetBarStyle.Office2000)
+						iTop+=Dpi.Height(GROUP_SPACINGOFFICE);
+					else
+						iTop+=Dpi.Height(GROUP_SPACINGDOTNET);
+				}
+
+				objItem.TopInternal=iTop;
+				objItem.Displayed=true;
+				iTop+=objItem.HeightInternal;
+			}
+		}
+
+        private bool IsRoundRegion
+        {
+            get
+            {
+                if (m_ParentItem != null)
+                {
+                    if (m_ParentItem is ApplicationButton && m_ParentItem.EffectiveStyle == eDotNetBarStyle.Windows7 || StyleManager.IsMetro(m_ParentItem.EffectiveStyle)) return false;
+
+                    BaseItem p = m_ParentItem;
+                    while(p.Parent!=null)
+                        p=p.Parent;
+                    Control c = p.ContainerControl as Control;
+                    if (c is RibbonStrip || c is RibbonBar || c is ContextMenuBar && BarFunctions.IsOffice2007Style(((ContextMenuBar)c).Style))
+                        return true;
+                }
+                return false;
+            }
+        }
+
+        private void SetRoundRegion(Control c)
+        {
+            Rectangle rectPath = c.ClientRectangle;
+            rectPath.Width--;
+            rectPath.Height--;
+            GraphicsPath path = DisplayHelp.GetRoundedRectanglePath(rectPath, m_CornerSize);
+            Region r = new Region();
+            r.MakeEmpty();
+            r.Union(path);
+            // Widen path for the border...
+            path.Widen(SystemPens.ControlText);
+            r.Union(path);
+            c.Region = r;
+        }
+
+        public new void Hide()
+        {
+            base.Hide();
+
+            if (m_DesignerParent && this.Parent!=null)
+            {
+                this.Parent.Controls.Remove(this);
+                m_DesignerParent = false;
+            }
+        }
+
+        private bool m_DesignerParent = false;
+        private bool AddtoDesignTimeContainer()
+        {
+            ISite site = GetSite();
+            if (site == null)
+                return false;
+
+            IDesignerHost dh = site.GetService(typeof(IDesignerHost)) as IDesignerHost;
+            if (dh == null) return false;
+
+            Control parent = dh.RootComponent as Control;
+            while (parent != null)
+            {
+                parent = parent.Parent;
+                if (parent!=null && parent.GetType().Name.IndexOf("DesignerFrame")>=0)
+                    break;
+            }
+            if (parent == null || parent.Parent==null) return false;
+            //parent = parent.Parent;
+            Point p = parent.PointToClient(this.Location);
+            parent.Controls.Add(this);
+            this.Location = p;
+            base.Visible = true;
+            this.Update();
+            this.BringToFront();
+            m_DesignerParent = true;
+            return true;
+        }
+
+		public new void Show()
+		{
+			if(!m_PopupMenu)
+			{
+				base.Visible=true;
+				this.Update();
+				return;
+			}
+
+            // Design mode add
+            if (m_ParentItem != null && (m_ParentItem.Site != null && m_ParentItem.Site.DesignMode || m_ParentItem.DesignMode ||
+                m_ParentItem.Parent != null && m_ParentItem.Parent.Site != null && m_ParentItem.Parent.Site.DesignMode))
+            {
+                if (AddtoDesignTimeContainer())
+                    return;
+            }
+
+			PopupContainer popup=new PopupContainer();
+			popup.ShowDropShadow=(this.DisplayShadow && this.AlphaShadow);
+			
+			//NativeFunctions.sndPlaySound("MenuPopup",NativeFunctions.SND_ASYNC | NativeFunctions.SND_NODEFAULT);
+			// This window cannot be outside the screen
+			// If height of the window is outside the screen, reduce the
+			// window size and set the flag so we know we have to scroll the window
+			ScreenInformation objScreen=BarFunctions.ScreenFromControl(this);
+
+			if(objScreen!=null)
+			{
+				Rectangle workingArea=objScreen.WorkingArea;
+                if (IsContextMenu || UseWholeScreenForSizeChecking)
+					workingArea=objScreen.Bounds;
+				if(this.Location.Y+this.Size.Height>workingArea.Bottom)
+				{
+					// Reduce the size
+					m_ClientRect.Height=m_ClientRect.Height-(this.Location.Y+this.Size.Height-workingArea.Bottom);
+					this.Height=this.Height-(this.Location.Y+this.Size.Height-workingArea.Bottom);
+					m_Scroll=true;
+					m_ScrollTopPosition=0;
+					RepositionItems();
+				}
+			}
+            
+			popup.Location=this.Location;
+			popup.Controls.Add(this);
+			popup.Size=this.Size;
+			this.Location=new Point(0,0);
+			popup.CreateControl();
+
+            if (BarFunctions.IsOffice2007Style(m_ParentItem.EffectiveStyle) && IsRoundRegion)
+            {
+                SetRoundRegion(this);
+                SetRoundRegion(popup);
+            }
+
+			ePopupAnimation animation=m_PopupAnimation;
+			if(!BarFunctions.SupportsAnimation)
+				animation=ePopupAnimation.None;
+			else
+			{
+				if(animation==ePopupAnimation.ManagerControlled)
+				{
+					IOwnerMenuSupport ownermenu=m_Owner as IOwnerMenuSupport;
+					if(ownermenu!=null)
+						animation=ownermenu.PopupAnimation;
+					if(animation==ePopupAnimation.ManagerControlled)
+						animation=ePopupAnimation.SystemDefault;
+				}
+
+				if(animation==ePopupAnimation.SystemDefault)
+					animation=NativeFunctions.SystemMenuAnimation;
+				else if(animation==ePopupAnimation.Random)
+				{
+					Random r=new System.Random();
+					int i=r.Next(2);
+					animation=ePopupAnimation.Fade;
+					if(i==1)
+						animation=ePopupAnimation.Slide;
+					else if(i==2)
+						animation=ePopupAnimation.Unfold;
+				}
+			}
+
+			// No animation if menu is hosting controls... Animation caused strange errors on some machines
+			if(this.Controls.Count>0)
+				animation=ePopupAnimation.None;
+
+			if(animation==ePopupAnimation.Fade && Environment.OSVersion.Version.Major>=5)
+			{
+				NativeFunctions.AnimateWindow(popup.Handle,BarFunctions.ANIMATION_INTERVAL,NativeFunctions.AW_BLEND);
+                popup.Visible = true;
+			}
+			else if(animation==ePopupAnimation.Slide)
+			{
+				NativeFunctions.AnimateWindow(popup.Handle,BarFunctions.ANIMATION_INTERVAL,(NativeFunctions.AW_SLIDE | NativeFunctions.AW_HOR_POSITIVE | NativeFunctions.AW_VER_POSITIVE));
+                popup.Visible = true;
+			}
+            else if (animation == ePopupAnimation.Unfold)
+            {
+                NativeFunctions.AnimateWindow(popup.Handle, BarFunctions.ANIMATION_INTERVAL, (NativeFunctions.AW_HOR_POSITIVE | NativeFunctions.AW_VER_POSITIVE));
+                popup.Visible = true;
+            }
+            else
+            {
+                base.Visible = true;
+                popup.Visible = true;
+            }
+			popup.ShowShadow();
+
+			if(animation!=ePopupAnimation.None && this.Controls.Count>0)
+				this.Refresh();
+
+			Rectangle rectDisplay=new Rectangle(popup.Location,popup.Size);
+			if(rectDisplay.Contains(Control.MousePosition))
+			{
+				m_IgnoreDuplicateMouseMove=true;
+			}
+
+			// This makes the menu paint BEFORE it returns out of this function
+			this.Update();
+
+			MenuPanel.PopupMenuAccessibleObject acc=this.AccessibilityObject as PopupMenuAccessibleObject;
+			if(acc!=null)
+			{
+				if(m_ParentItem!=null && m_ParentItem.IsOnMenuBar)
+					acc.GenerateEvent(AccessibleEvents.SystemMenuStart);
+				acc.GenerateEvent(AccessibleEvents.SystemMenuPopupStart);
+			}
+		}
+
+		private bool IsContextMenu
+		{
+			get
+			{
+				if(m_ParentItem==null)
+					return false;
+				if(m_ParentItem.Parent==null || m_ParentItem.ContainerControl is ContextMenuBar)
+					return true;
+				BaseItem topParent=m_ParentItem.Parent;
+				while(topParent.Parent!=null)
+					topParent=topParent.Parent;
+				if(topParent is PopupItem)
+					return true;
+				return false;
+			}
+		}
+
+		protected override void OnVisibleChanged(EventArgs e)
+		{
+			base.OnVisibleChanged(e);
+			if(!this.Visible && m_DropShadow!=null)
+			{
+				m_DropShadow.Hide();
+				m_DropShadow.Dispose();
+				m_DropShadow=null;
+			}
+			if(!this.Visible && this.Parent!=null && this.Parent is PopupContainer)
+			{
+				this.Parent.Visible=false;
+			}
+
+			if(!this.Visible && m_ScrollTimer!=null)
+			{
+				m_ScrollTimer.Stop();
+				m_ScrollTimer.Dispose();
+				m_ScrollTimer=null;
+			}
+
+			if(m_AccessibleObjectCreated)
+			{
+				MenuPanel.PopupMenuAccessibleObject acc=this.AccessibilityObject as PopupMenuAccessibleObject;
+				if(acc!=null)
+				{
+					if(m_ParentItem!=null)
+					{
+						foreach(BaseItem item in m_ParentItem.SubItems)
+							acc.GenerateEvent(item,AccessibleEvents.Destroy);
+					}
+					if(!this.Visible)
+					{
+						acc.GenerateEvent(AccessibleEvents.SystemMenuPopupEnd);
+						acc.GenerateEvent(AccessibleEvents.StateChange);
+					}
+				}
+			}
+		}
+
+		private int ClientMarginLeft
+		{
+			get
+			{
+				int iMargin=0;
+
+                if (m_ParentItem != null && IsGradientStyle)
+                {
+                    iMargin = 1;
+                    if (BarFunctions.IsOffice2007Style(m_ParentItem.EffectiveStyle))
+                        iMargin++;
+                    if (IsContainerMenu)
+                        iMargin--;
+                }
+                else
+                    iMargin = 3;
+
+				return iMargin;
+			}
+		}
+
+		private int ClientMarginTop
+		{
+			get
+			{
+				int iMargin=0;
+				if(m_ParentItem!=null && IsGradientStyle)
+					iMargin=2;
+				else
+					iMargin=3;
+                
+                if (IsContainerMenu)
+                    iMargin--;
+
+				return iMargin;
+			}
+		}
+
+		private int ClientMarginRight
+		{
+			get
+			{
+				bool bShowShadow=true;
+				int iMargin=0;
+				IOwnerMenuSupport ownermenu=m_Owner as IOwnerMenuSupport;
+				if(ownermenu!=null && !ownermenu.ShowPopupShadow)
+					bShowShadow=false;
+				if(m_ParentItem!=null && IsGradientStyle)
+				{
+					if(this.AlphaShadow || !bShowShadow)
+						iMargin=1;
+					else
+						iMargin=3;
+                    if (BarFunctions.IsOffice2007Style(m_ParentItem.EffectiveStyle))
+                        iMargin++;
+
+                    if (IsContainerMenu)
+                        iMargin--;
+				}
+				else
+					iMargin=3;
+
+				return iMargin;
+			}
+		}
+
+		private int ClientMarginBottom
+		{
+			get
+			{
+				IOwnerMenuSupport ownermenu=m_Owner as IOwnerMenuSupport;
+				bool bShowShadow=true;
+				int iMargin=0;
+				if(ownermenu!=null && !ownermenu.ShowPopupShadow)
+					bShowShadow=false;
+				if(m_ParentItem!=null && IsGradientStyle)
+				{
+					if(this.AlphaShadow || !bShowShadow)
+						iMargin=2;
+					else
+						iMargin=4;
+                    if (IsContainerMenu)
+                        iMargin--;
+				}
+				else
+					iMargin=3;
+
+				return iMargin;
+			}
+		}
+
+		internal bool DisplayShadow
+		{
+			get
+			{
+				if(!m_PopupMenu || m_ParentItem!=null && m_ParentItem.Site!=null && m_ParentItem.Site.DesignMode)
+					return false;
+				IOwnerMenuSupport ownermenu=m_Owner as IOwnerMenuSupport;
+				if(ownermenu!=null)
+				{
+                    if (m_ParentItem != null && m_ParentItem.EffectiveStyle == eDotNetBarStyle.Office2000)
+					{
+						if(ownermenu.MenuDropShadow==eMenuDropShadow.Show)
+							return true;
+						else
+							return false;
+					}
+					return ownermenu.ShowPopupShadow;
+				}
+				else
+				{
+                    if (m_ParentItem != null && m_ParentItem.EffectiveStyle == eDotNetBarStyle.Office2000)
+						return false;
+				}
+
+				return true;
+			}
+		}
+
+        /// <summary>
+        /// Gets or sets whether anti-alias smoothing is used while painting. Default value is false.
+        /// </summary>
+        [DefaultValue(false), Browsable(true), Category("Appearance"), Description("Gets or sets whether anti-aliasing is used while painting.")]
+        public bool AntiAlias
+        {
+            get { return m_AntiAlias; }
+            set {m_AntiAlias = value; }
+        }
+
+		internal bool AlphaShadow
+		{
+			get
+			{
+				if(Environment.OSVersion.Version.Major<5)
+					return false;
+				IOwnerMenuSupport ownermenu=m_Owner as IOwnerMenuSupport;
+				if(ownermenu!=null && !ownermenu.AlphaBlendShadow)
+					return false;
+				return true; //NativeFunctions.CursorShadow;
+			}
+		}
+
+        
+
+		/// <summary>
+		/// Indicates whether Tooltips are shown on Bars and menus.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DevCoBrowsable(true),DefaultValue(true),System.ComponentModel.Category("Run-time Behavior"),System.ComponentModel.Description("Indicates whether Tooltips are shown on Bar and it's sub-items.")]
+		public bool ShowToolTips
+		{
+			get
+			{
+				return m_ShowToolTips;
+			}
+			set
+			{
+				m_ShowToolTips=value;
+			}
+		}
+
+		/// <summary>
+		/// Sets,Gets the side bar image structure.
+		/// </summary>
+		public SideBarImage SideBar
+		{
+			get
+			{
+				return m_SideBarImage;
+			}
+			set
+			{
+				m_SideBarImage=value;
+			}
+		}
+
+		public object Owner
+		{
+			get
+			{
+				return m_Owner;
+			}
+			set
+			{
+				m_Owner=value;
+			}
+		}
+
+		internal bool IsCustomizeMenu
+		{
+			get
+			{
+				return m_IsCustomizeMenu;
+			}
+			set
+			{
+				m_IsCustomizeMenu=value;
+				if(m_ParentItem!=null)
+				{
+					foreach(BaseItem objItem in m_ParentItem.SubItems)
+						objItem.SetIsOnCustomizeMenu(m_IsCustomizeMenu);
+				}
+			}
+		}
+
+		[System.ComponentModel.Browsable(true),System.ComponentModel.Category("Appearance"),System.ComponentModel.Description("Indicates when menu items are displayed when MenuVisiblity is set to VisibleIfRecentlyUsed and RecentlyUsed is true.")]
+		public ePersonalizedMenus PersonalizedMenus
+		{
+			get
+			{
+				return m_PersonalizedMenus;
+			}
+			set
+			{
+				m_PersonalizedMenus=value;
+			}
+		}
+
+		public bool PersonalizedAllVisible
+		{
+			get
+			{
+				return m_ExpandButton.PersonalizedAllVisible;
+			}
+			set
+			{
+				m_ExpandButton.PersonalizedAllVisible=value;
+			}
+		}
+
+		public ePopupAnimation PopupAnimation
+		{
+			get
+			{
+				return m_PopupAnimation;
+			}
+			set
+			{
+				m_PopupAnimation=value;
+			}
+		}
+
+		public DevComponents.DotNetBar.ColorScheme ColorScheme
+		{
+			get {return m_ColorScheme;}
+			set
+			{
+				m_ColorScheme=value;
+				if(this.Visible)
+					this.Refresh();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the HotSubItem on the menu. This method is used internally by DotNetBar and should not be used in your application.
+		/// </summary>
+		public BaseItem HotSubItem
+		{
+			get {return m_HotSubItem;}
+			set
+			{
+				if(m_HotSubItem!=null)
+					m_HotSubItem.InternalMouseLeave();
+				m_HotSubItem=null;
+				if(this.ParentItem.SubItems.Contains(value) || IsChildItem(value))
+				{
+					m_HotSubItem=value;
+					if(m_HotSubItem!=null)
+					{
+						m_HotSubItem.InternalMouseEnter();
+						m_HotSubItem.InternalMouseMove(new MouseEventArgs(MouseButtons.None,0,m_HotSubItem.LeftInternal+1,m_HotSubItem.TopInternal+1,0));
+					}
+				}
+			}
+		}
+
+        private bool IsChildItem(BaseItem item)
+        {
+            if (item == null) return false;
+            while (item != null)
+            {
+                if (this.ParentItem == item) return true;
+                item = item.Parent;
+            }
+            return false;
+        }
+
+		//***********************************************
+		// IDesignTimeProvider Implementation
+		//***********************************************
+		public InsertPosition GetInsertPosition(Point pScreen, BaseItem DragItem)
+		{
+			if(m_ParentItem==null)
+				return null;
+
+            return DesignTimeProviderContainer.GetInsertPosition(m_ParentItem, pScreen, DragItem);
+
+            //InsertPosition objInsertPos=null;
+            //Point pClient=this.PointToClient(pScreen);
+            //Rectangle r;
+            //if(this.ClientRectangle.Contains(pClient))
+            //{
+            //    for(int i=0;i<m_ParentItem.SubItems.Count;i++)
+            //    {
+            //        BaseItem objItem=m_ParentItem.SubItems[i];
+            //        r=objItem.DisplayRectangle;
+            //        r.Inflate(2,2);
+            //        if(objItem.Visible && r.Contains(pClient))
+            //        {
+            //            if(objItem.SystemItem)
+            //                return null;
+            //            if(objItem==DragItem)
+            //                return new InsertPosition();
+
+            //            if (objItem.IsContainer && objItem is IDesignTimeProvider)
+            //            {
+            //                Rectangle inner = r;
+            //                inner.Inflate(-5, -5);
+            //                if (inner.Contains(pClient))
+            //                    return ((IDesignTimeProvider)objItem).GetInsertPosition(pScreen, DragItem);
+            //            }
+
+            //            objInsertPos=new InsertPosition();
+            //            objInsertPos.TargetProvider=(IDesignTimeProvider)m_ParentItem;
+            //            objInsertPos.Position=i;
+            //            //if(objItem.Orientation==eOrientation.Horizontal)
+            //            //{
+            //            //	if(pClient.X<=objItem.Left+objItem.Width/2)
+            //            //		objInsertPos.Before=true;
+            //            //}
+            //            //else
+            //            //{
+            //                if(pClient.Y<=objItem.TopInternal+objItem.HeightInternal/2)
+            //                    objInsertPos.Before=true;
+            //            //}
+            //            if(objItem is PopupItem && objItem.SubItems.Count>0)
+            //            {
+            //                if(!objItem.Expanded)
+            //                    objItem.Expanded=true;
+            //            }
+            //            else
+            //                BaseItem.CollapseSubItems(m_ParentItem);
+
+            //            break;
+            //        }
+            //    }
+            //    if(objInsertPos==null)
+            //    {
+            //        // Container is empty but it can contain the items
+            //        //objInsertPos=new InsertPosition(m_ParentItem.SubItemsCount-1,false,this);
+            //        if(m_ParentItem.SubItems.Count>1 && m_ParentItem.SubItems[m_ParentItem.SubItems.Count-1].SystemItem)
+            //            objInsertPos=new InsertPosition(m_ParentItem.SubItems.Count-2,true,(IDesignTimeProvider)m_ParentItem);
+            //        else
+            //            objInsertPos=new InsertPosition(m_ParentItem.SubItems.Count-1,false,(IDesignTimeProvider)m_ParentItem);
+            //    }
+            //}
+            //else
+            //{
+            //    foreach(BaseItem objItem in m_ParentItem.SubItems)
+            //    {
+            //        if(objItem==DragItem)
+            //            continue;
+            //        IDesignTimeProvider provider=objItem as IDesignTimeProvider;
+            //        if(provider!=null)
+            //        {
+            //            objInsertPos=provider.GetInsertPosition(pScreen, DragItem);
+            //            if(objInsertPos!=null)
+            //                break;
+            //        }
+            //    }
+            //}
+            //return objInsertPos;
+		}
+
+		public void DrawReversibleMarker(int iPos, bool Before)
+		{
+			Rectangle r, rl,rr;
+
+			if(iPos>=0)
+			{
+				BaseItem objItem=m_ParentItem.SubItems[iPos];
+				if(objItem.DesignInsertMarker!=eDesignInsertPosition.None)
+					objItem.DesignInsertMarker=eDesignInsertPosition.None;
+				else if(Before)
+					objItem.DesignInsertMarker=eDesignInsertPosition.Before;
+				else
+					objItem.DesignInsertMarker=eDesignInsertPosition.After;
+				return;
+			}
+			else
+			{
+				r=new Rectangle(this.ClientRectangle.Left+2,this.ClientRectangle.Top+2,this.ClientRectangle.Width-4,1);
+				rl=new Rectangle(this.ClientRectangle.Left+1,this.ClientRectangle.Top,1,5);
+				rr=new Rectangle(this.ClientRectangle.Right-2,this.ClientRectangle.Top,1,5);
+			}
+
+            //r.Location=this.PointToScreen(r.Location);
+            //rl.Location=this.PointToScreen(rl.Location);
+            //rr.Location=this.PointToScreen(rr.Location);
+            //ControlPaint.DrawReversibleFrame(r,SystemColors.Control,FrameStyle.Thick);
+            //ControlPaint.DrawReversibleFrame(rl,SystemColors.Control,FrameStyle.Thick);
+            //ControlPaint.DrawReversibleFrame(rr,SystemColors.Control,FrameStyle.Thick);
+		}
+		public void InsertItemAt(BaseItem objItem, int iPos, bool Before)
+		{
+			if(!Before)
+			{
+				//objItem.BeginGroup=true; //!objItem.BeginGroup;
+				if(iPos+1>=m_ParentItem.SubItems.Count)
+					m_ParentItem.SubItems.Add(objItem);
+				else
+					m_ParentItem.SubItems.Add(objItem,iPos+1);
+			}
+			else
+			{
+				//objItem.BeginGroup=false;
+				if(iPos>=m_ParentItem.SubItems.Count)
+					m_ParentItem.SubItems.Add(objItem);
+				else
+					m_ParentItem.SubItems.Add(objItem,iPos);
+			}
+			objItem.ContainerControl=this;
+			ClearHotSubItem();
+			this.RecalcSize();
+
+            ISite site = GetSite();
+            if (site != null && m_ParentItem != null)
+            {
+                IComponentChangeService cc = this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+                if (cc != null)
+                    cc.OnComponentChanged(m_ParentItem, TypeDescriptor.GetProperties(m_ParentItem)["SubItems"], null, null);
+            }
+		}
+
+		public class PopupMenuAccessibleObject : Control.ControlAccessibleObject
+		{
+			MenuPanel m_Owner = null;
+			public PopupMenuAccessibleObject(MenuPanel owner):base(owner)
+			{
+				m_Owner = owner;
+			}
+
+			internal void GenerateEvent(BaseItem sender, System.Windows.Forms.AccessibleEvents e)
+			{
+				if(m_Owner==null)
+					return;
+				if(m_Owner!=null && m_Owner.m_ParentItem!=null)
+				{
+					int	iChild = m_Owner.m_ParentItem.SubItems.IndexOf(sender);
+					if(iChild>=0)
+					{
+						m_Owner.AccessibilityNotifyClients(e,iChild);
+					}
+				}
+			}
+
+			internal void GenerateEvent(System.Windows.Forms.AccessibleEvents e)
+			{
+				if(m_Owner==null)
+					return;
+				m_Owner.AccessibilityNotifyClients(e,-1);
+            }
+
+            //public override string Name 
+            //{
+            //    get
+            //    {
+            //        if(m_Owner==null)
+            //            return "";
+            //        return m_Owner.AccessibleName;
+            //    }
+            //    set
+            //    {
+            //        if(m_Owner==null)
+            //            return;
+            //        m_Owner.AccessibleName = value;
+            //    }
+            //}
+
+            //public override string Description
+            //{
+            //    get
+            //    {
+            //        if(m_Owner==null)
+            //            return "";
+            //        return m_Owner.AccessibleDescription;
+            //    }
+            //}
+
+			public override AccessibleRole Role
+			{
+				get
+				{
+					if(m_Owner==null)
+						return AccessibleRole.None;
+					return m_Owner.AccessibleRole;
+				}
+			}
+
+			public override AccessibleObject Parent 
+			{
+				get
+				{
+                    if (m_Owner == null || m_Owner.ParentItem == null)
+                        return null;
+					return m_Owner.ParentItem.AccessibleObject;
+				}
+			}
+
+			public override Rectangle Bounds 
+			{
+				get
+				{
+					if(m_Owner==null)
+						return Rectangle.Empty;
+					return this.m_Owner.DisplayRectangle;
+				}
+			}
+
+			public override int GetChildCount()
+			{
+				if(m_Owner!=null && m_Owner.m_ParentItem!=null)
+					return this.m_Owner.m_ParentItem.SubItems.Count;
+				return 0;
+			}
+
+			public override System.Windows.Forms.AccessibleObject GetChild(int iIndex)
+			{
+				if(m_Owner!=null && m_Owner.m_ParentItem!=null)
+					return this.m_Owner.m_ParentItem.SubItems[iIndex].AccessibleObject;
+				return null;
+			}
+
+			public override AccessibleStates State
+			{
+				get
+				{
+					if(m_Owner==null || m_Owner.IsDisposed)
+						return AccessibleStates.Unavailable;
+
+					return AccessibleStates.Floating;
+				}
+			}
+
+			public override void Select(AccessibleSelection flags){}
+			public override void DoDefaultAction() {}
+
+			//			public virtual string DefaultAction {get;}
+			//			public virtual AccessibleStates State {get;}
+			//			public virtual void DoDefaultAction();
+			//			public virtual bool Equals(object obj);
+			//			public static bool Equals(object objA,object objB);
+			//			public virtual AccessibleObject GetFocused();
+			//			public virtual AccessibleObject GetSelected();
+			//			public virtual AccessibleObject HitTest(int xScreen,int yScreen);
+			//			public virtual AccessibleObject Navigate(AccessibleNavigation navdir);
+		}
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/MessageHandler.cs b/PROMS/DotNetBar Source Code/MessageHandler.cs
new file mode 100644
index 00000000..e346b3b9
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/MessageHandler.cs	
@@ -0,0 +1,313 @@
+using System;
+using System.Windows.Forms;
+using System.Collections;
+using System.Threading;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Summary description for MessageHandler.
+	/// </summary>
+	internal class MessageHandler
+	{
+		private static ArrayList m_Clients=new ArrayList();
+		//private static bool m_FilterInstalled=false;
+		//private static MessageFilterWrapper m_MessageFilter=null;
+		private static Hashtable m_FilterOnThread=new Hashtable();
+
+        private static ReaderWriterLock rwClientsListLock;
+
+        // Methods
+        static MessageHandler()
+        {
+            MessageHandler.rwClientsListLock = new ReaderWriterLock();
+        }
+
+		public static void RegisterMessageClient(IMessageHandlerClient client)
+		{
+			if(m_Clients.Contains(client))
+				return;
+
+			if(!m_FilterOnThread.ContainsKey(System.Threading.Thread.CurrentThread.GetHashCode()))
+				InstallMessageFilter();
+
+            LockCookie cookie1 = new LockCookie();
+            bool readerLockHeld = MessageHandler.rwClientsListLock.IsReaderLockHeld;
+
+            if (readerLockHeld)
+            {
+                cookie1 = MessageHandler.rwClientsListLock.UpgradeToWriterLock(-1);
+            }
+            else
+            {
+                MessageHandler.rwClientsListLock.AcquireWriterLock(-1);
+            }
+
+            try
+            {
+                m_Clients.Add(client);
+            }
+            finally
+            {
+                if (readerLockHeld)
+                {
+                    MessageHandler.rwClientsListLock.DowngradeFromWriterLock(ref cookie1);
+                }
+                else
+                {
+                    MessageHandler.rwClientsListLock.ReleaseWriterLock();
+                }
+            }
+		}
+
+		public static void UnregisterMessageClient(IMessageHandlerClient client)
+		{
+            if (m_Clients.Contains(client))
+            {
+                LockCookie cookie1 = new LockCookie();
+                bool readerLockHeld = MessageHandler.rwClientsListLock.IsReaderLockHeld;
+
+                if (readerLockHeld)
+                {
+                    cookie1 = MessageHandler.rwClientsListLock.UpgradeToWriterLock(-1);
+                }
+                else
+                {
+                    MessageHandler.rwClientsListLock.AcquireWriterLock(-1);
+                }
+                bool unregister = false;
+                try
+                {
+                    m_Clients.Remove(client);
+                    unregister = m_Clients.Count == 0;
+                }
+                finally
+                {
+                    if (readerLockHeld)
+                    {
+                        MessageHandler.rwClientsListLock.DowngradeFromWriterLock(ref cookie1);
+                    }
+                    else
+                    {
+                        MessageHandler.rwClientsListLock.ReleaseWriterLock();
+                    }
+                }
+
+                if (BarUtilities.AutoRemoveMessageFilter && unregister && m_FilterOnThread.ContainsKey(System.Threading.Thread.CurrentThread.GetHashCode()))
+                    UninstallMessageFilter();
+            }
+		}
+
+		private static void InstallMessageFilter()
+		{
+			if(m_FilterOnThread.ContainsKey(System.Threading.Thread.CurrentThread.GetHashCode()))
+				return;
+			MessageFilterWrapper messageFilter=new MessageFilterWrapper();
+			Application.AddMessageFilter(messageFilter);
+			m_FilterOnThread.Add(System.Threading.Thread.CurrentThread.GetHashCode(),messageFilter);
+		}
+
+		private static void UninstallMessageFilter()
+		{
+			if(!m_FilterOnThread.ContainsKey(System.Threading.Thread.CurrentThread.GetHashCode()))
+				return;
+			MessageFilterWrapper messageFilter=m_FilterOnThread[System.Threading.Thread.CurrentThread.GetHashCode()] as MessageFilterWrapper;
+			Application.RemoveMessageFilter(messageFilter);
+			m_FilterOnThread.Remove(System.Threading.Thread.CurrentThread.GetHashCode());
+		}
+
+		private static IMessageHandlerClient GetModalClient()
+		{
+            MessageHandler.rwClientsListLock.AcquireReaderLock(-1);
+            try
+            {
+                foreach (IMessageHandlerClient client in m_Clients)
+                {
+                    if (client.IsModal)
+                    {
+                        return client;
+                    }
+                }
+            }
+            finally
+            {
+                MessageHandler.rwClientsListLock.ReleaseReaderLock();
+            }
+			return null;
+		}
+
+        private static IMessageHandlerClient[] GetMessageClients()
+        {
+            IMessageHandlerClient[] messageClients;
+            MessageHandler.rwClientsListLock.AcquireReaderLock(-1);
+            try
+            {
+                messageClients = (IMessageHandlerClient[])m_Clients.ToArray(typeof(IMessageHandlerClient));
+            }
+            finally
+            {
+                MessageHandler.rwClientsListLock.ReleaseReaderLock();
+            }
+
+            return messageClients;
+        }
+
+		public static bool OnSysKeyDown(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+		{
+			IMessageHandlerClient modalClient=MessageHandler.GetModalClient();
+			if(modalClient!=null)
+			{
+                if (!IsInvokeRequired(modalClient) && modalClient.OnSysKeyDown(hWnd, wParam, lParam))
+					return true;
+				return false;
+			}
+
+			IMessageHandlerClient[] messageClients = GetMessageClients();
+
+			foreach(IMessageHandlerClient client in messageClients)
+			{
+                if (!IsInvokeRequired(client) && client.OnSysKeyDown(hWnd, wParam, lParam))
+					return true;
+			}
+			return false;
+		}
+
+		public static bool OnSysKeyUp(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+		{
+			IMessageHandlerClient modalClient=MessageHandler.GetModalClient();
+			if(modalClient!=null)
+			{
+                if (!IsInvokeRequired(modalClient) && modalClient.OnSysKeyUp(hWnd, wParam, lParam))
+					return true;
+				return false;
+			}
+
+            IMessageHandlerClient[] messageClients = GetMessageClients();
+			foreach(IMessageHandlerClient client in messageClients)
+			{
+                if (!IsInvokeRequired(client) && client.OnSysKeyUp(hWnd, wParam, lParam))
+					return true;
+			}
+			return false;
+		}
+
+		public static bool OnKeyDown(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+		{
+            IMessageHandlerClient[] messageClients = GetMessageClients();
+
+			foreach(IMessageHandlerClient client in messageClients)
+			{
+                if (!IsInvokeRequired(client) && client.OnKeyDown(hWnd, wParam, lParam))
+					return true;
+			}
+			return false;
+		}
+
+		public static bool OnMouseDown(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+		{
+            IMessageHandlerClient[] messageClients = GetMessageClients();
+			foreach(IMessageHandlerClient client in messageClients)
+			{
+				if(!IsInvokeRequired(client) && client.OnMouseDown(hWnd,wParam,lParam))
+					return true;
+			}
+			return false;
+		}
+
+        private static bool IsInvokeRequired(IMessageHandlerClient client)
+        {
+            DotNetBarManager manager = client as DotNetBarManager;
+            if (manager != null && manager.ParentForm != null && manager.ParentForm.InvokeRequired)
+                return true;
+            else if (client is Control && ((Control)client).InvokeRequired)
+                return true;
+
+            return false;
+        }
+
+		public static bool OnMouseMove(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+		{
+            IMessageHandlerClient[] messageClients = GetMessageClients();
+			foreach(IMessageHandlerClient client in messageClients)
+			{
+                if(!IsInvokeRequired(client) && client.OnMouseMove(hWnd, wParam, lParam))
+				    return true;
+			}
+			return false;
+		}
+
+        public static bool OnMouseWheel(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+            IMessageHandlerClient modalClient = MessageHandler.GetModalClient();
+            if (modalClient != null)
+            {
+                if (!IsInvokeRequired(modalClient) && modalClient.OnMouseWheel(hWnd, wParam, lParam))
+                    return true;
+                return false;
+            }
+
+            IMessageHandlerClient[] messageClients = GetMessageClients();
+            foreach (IMessageHandlerClient client in messageClients)
+            {
+                if (!IsInvokeRequired(client) && client.OnMouseWheel(hWnd, wParam, lParam))
+                    return true;
+            }
+            return false;
+        }
+	}
+
+	internal class MessageFilterWrapper:IMessageFilter
+	{
+		public bool PreFilterMessage(ref System.Windows.Forms.Message m)
+		{
+			switch(m.Msg)
+			{
+				case NativeFunctions.WM_SYSKEYDOWN:
+				{
+					return MessageHandler.OnSysKeyDown(m.HWnd,m.WParam,m.LParam);
+				}
+				case NativeFunctions.WM_SYSKEYUP:
+				{
+					return MessageHandler.OnSysKeyUp(m.HWnd,m.WParam,m.LParam);
+				}
+				case (int)WinApi.WindowsMessages.WM_KEYDOWN:
+				{
+					return MessageHandler.OnKeyDown(m.HWnd,m.WParam,m.LParam);
+				}
+				case NativeFunctions.WM_LBUTTONDOWN:
+				case NativeFunctions.WM_NCLBUTTONDOWN:
+				case NativeFunctions.WM_RBUTTONDOWN:
+				case NativeFunctions.WM_MBUTTONDOWN:
+				case NativeFunctions.WM_NCMBUTTONDOWN:
+				case NativeFunctions.WM_NCRBUTTONDOWN:
+				{
+					return MessageHandler.OnMouseDown(m.HWnd,m.WParam,m.LParam);
+				}
+				case NativeFunctions.WM_MOUSEMOVE:
+				{
+					return MessageHandler.OnMouseMove(m.HWnd,m.WParam,m.LParam);
+				}
+                case NativeFunctions.WM_MOUSEWHEEL:
+                {
+                    return MessageHandler.OnMouseWheel(m.HWnd, m.WParam, m.LParam);
+                }
+			}
+			return false;
+		}
+
+		public void PostFilterMessage(ref System.Windows.Forms.Message m)
+		{
+		}
+	}
+
+	internal interface IMessageHandlerClient
+	{
+		bool OnSysKeyDown(IntPtr hWnd, IntPtr wParam, IntPtr lParam);
+		bool OnSysKeyUp(IntPtr hWnd, IntPtr wParam, IntPtr lParam);
+		bool OnKeyDown(IntPtr hWnd, IntPtr wParam, IntPtr lParam);
+		bool OnMouseDown(IntPtr hWnd, IntPtr wParam, IntPtr lParam);
+		bool OnMouseMove(IntPtr hWnd, IntPtr wParam, IntPtr lParam);
+        bool OnMouseWheel(IntPtr hWnd, IntPtr wParam, IntPtr lParam);
+		bool IsModal{get;}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/Metro/BorderColors.cs b/PROMS/DotNetBar Source Code/Metro/BorderColors.cs
new file mode 100644
index 00000000..dcc1d485
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Metro/BorderColors.cs	
@@ -0,0 +1,331 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+using System.Globalization;
+using System.ComponentModel;
+using System.Runtime.InteropServices;
+using System.Collections;
+using System.ComponentModel.Design.Serialization;
+using System.Reflection;
+
+namespace DevComponents.DotNetBar.Metro
+{
+
+    /// <summary>
+    /// Defines BorderColors structure used to define border colors.
+    /// </summary>
+    [StructLayout(LayoutKind.Sequential), TypeConverter(typeof(BorderColorsConverter))]
+    public struct BorderColors : IEquatable<BorderColors>
+    {
+        #region Constructor
+        private Color _Left;
+        private Color _Top;
+        private Color _Right;
+        private Color _Bottom;
+
+        /// <summary>
+        /// Creates new instance of the object.
+        /// </summary>
+        /// <param name="uniformLength">Uniform BorderColors</param>
+        public BorderColors(Color uniformBorderColors)
+        {
+            _Left = _Top = _Right = _Bottom = uniformBorderColors;
+        }
+        /// <summary>
+        /// Creates new instance of the object.
+        /// </summary>
+        /// <param name="left">Left BorderColors</param>
+        /// <param name="top">Top BorderColors</param>
+        /// <param name="right">Right BorderColors</param>
+        /// <param name="bottom">Bottom BorderColors</param>
+        public BorderColors(Color left, Color top, Color right, Color bottom)
+        {
+            _Left = left;
+            _Top = top;
+            _Right = right;
+            _Bottom = bottom;
+        }
+        #endregion
+
+        #region Implementation
+        /// <summary>
+        /// Gets whether object equals to this instance.
+        /// </summary>
+        /// <param name="obj">object to test.</param>
+        /// <returns>returns whether objects are Equals</returns>
+        public override bool Equals(object obj)
+        {
+            if (obj is BorderColors)
+            {
+                BorderColors BorderColors = (BorderColors)obj;
+                return (this == BorderColors);
+            }
+            return false;
+        }
+        /// <summary>
+        /// Gets whether object equals to this instance.
+        /// </summary>
+        /// <param name="BorderColors">object to test.</param>
+        /// <returns>returns whether objects are Equals</returns>
+        public bool Equals(BorderColors BorderColors)
+        {
+            return (this == BorderColors);
+        }
+        /// <summary>
+        /// Returns hash code for object.
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            return (((_Left.GetHashCode() ^ _Top.GetHashCode()) ^ _Right.GetHashCode()) ^ _Bottom.GetHashCode());
+        }
+
+        const string StringValueSeparator = ",";
+        /// <summary>
+        /// Returns string representation of object.
+        /// </summary>
+        /// <returns>string representing BorderColors</returns>
+        public override string ToString()
+        {
+            return Convert.ToString(_Left) + StringValueSeparator + Convert.ToString(_Top) + StringValueSeparator + Convert.ToString(_Right) + StringValueSeparator + Convert.ToString(_Bottom);
+        }
+        /// <summary>
+        /// Gets string representation of object.
+        /// </summary>
+        /// <param name="cultureInfo">Culture info.</param>
+        /// <returns>string representing BorderColors</returns>
+        internal string ToString(CultureInfo cultureInfo)
+        {
+            return Convert.ToString(_Left, cultureInfo) + StringValueSeparator + Convert.ToString(_Top, cultureInfo) + StringValueSeparator + Convert.ToString(_Right, cultureInfo) + StringValueSeparator + Convert.ToString(_Bottom, cultureInfo);
+        }
+        /// <summary>
+        /// Returns whether all values are empty.
+        /// </summary>
+        [Browsable(false)]
+        public bool IsEmpty
+        {
+            get
+            {
+                return (this.Left.IsEmpty && this.Top.IsEmpty && this.Right.IsEmpty && this.Bottom.IsEmpty);
+            }
+        }
+        /// <summary>
+        /// Returns whether all values are the same.
+        /// </summary>
+        [Browsable(false)]
+        public bool IsUniform
+        {
+            get
+            {
+                return (this.Left == this.Top && this.Top == this.Right && this.Right == this.Bottom);
+            }
+        }
+
+        public static bool operator ==(BorderColors t1, BorderColors t2)
+        {
+            return (t1._Left == t2._Left && t1._Top == t2._Top && t1._Right == t2._Right && t1._Bottom == t2._Bottom);
+        }
+
+        public static bool operator !=(BorderColors t1, BorderColors t2)
+        {
+            return !(t1 == t2);
+        }
+        /// <summary>
+        /// Gets or sets the left BorderColors.
+        /// </summary>
+        public Color Left
+        {
+            get
+            {
+                return _Left;
+            }
+            set
+            {
+                _Left = value;
+            }
+        }
+        /// <summary>
+        /// Gets or sets the top BorderColors.
+        /// </summary>
+        public Color Top
+        {
+            get
+            {
+                return _Top;
+            }
+            set
+            {
+                _Top = value;
+            }
+        }
+        /// <summary>
+        /// Gets or sets the Right BorderColors.
+        /// </summary>
+        public Color Right
+        {
+            get
+            {
+                return _Right;
+            }
+            set
+            {
+                _Right = value;
+            }
+        }
+        /// <summary>
+        /// Gets or sets the Bottom BorderColors.
+        /// </summary>
+        public Color Bottom
+        {
+            get
+            {
+                return _Bottom;
+            }
+            set
+            {
+                _Bottom = value;
+            }
+        }
+        #endregion
+    }
+
+
+    #region BorderColorsConverter
+    /// <summary>
+    /// Provides BorderColors TypeConverter.
+    /// </summary>
+    public class BorderColorsConverter : TypeConverter
+    {
+        public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
+        {
+            return ((sourceType == typeof(string)) || base.CanConvertFrom(context, sourceType));
+        }
+
+        public override bool CanConvertTo(ITypeDescriptorContext context, Type destinationType)
+        {
+            return ((destinationType == typeof(InstanceDescriptor)) || base.CanConvertTo(context, destinationType));
+        }
+
+        public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
+        {
+            string str = value as string;
+            if (string.IsNullOrEmpty(str))
+            {
+                return new BorderColors();
+            }
+            string str2 = str.Trim();
+            if (str2.Length == 0)
+            {
+                return null;
+            }
+            if (culture == null)
+            {
+                culture = CultureInfo.CurrentCulture;
+            }
+            char ch = culture.TextInfo.ListSeparator[0];
+            string[] strArray = str2.Split(new char[] { ch });
+            Color[] numArray = new Color[strArray.Length];
+            //TypeConverter converter = TypeDescriptor.GetConverter(typeof(Color));
+            for (int i = 0; i < numArray.Length; i++)
+            {
+                numArray[i] = ColorScheme.GetColor(strArray[i]);// (Color)converter.ConvertFromString(context, culture, strArray[i]);
+            }
+
+            if (numArray.Length == 1)
+            {
+                return new BorderColors(numArray[0]);
+            }
+
+            if (numArray.Length != 4)
+            {
+                throw new ArgumentException("Text Parsing Failed");
+            }
+            return new BorderColors(numArray[0], numArray[1], numArray[2], numArray[3]);
+        }
+
+        private string ToArgbString(Color color)
+        {
+            if (color.IsEmpty) return "";
+            if (color.A == 255)
+                return color.R.ToString("X2") + color.G.ToString("X2") + color.B.ToString("X2");
+            return color.A.ToString("X2") + color.R.ToString("X2") + color.G.ToString("X2") + color.B.ToString("X2");
+        }
+        public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+        {
+            if (destinationType == null)
+            {
+                throw new ArgumentNullException("destinationType");
+            }
+            if (value is BorderColors)
+            {
+                if (destinationType == typeof(string))
+                {
+                    BorderColors colors = (BorderColors)value;
+                    if (colors.IsEmpty) return "";
+                    if (colors.IsUniform) return ToArgbString(colors.Left);
+                    if (culture == null)
+                    {
+                        culture = CultureInfo.CurrentCulture;
+                    }
+                    string separator = culture.TextInfo.ListSeparator + " ";
+                    //TypeConverter converter = TypeDescriptor.GetConverter(typeof(Color));
+                    string[] strArray = new string[4];
+                    int num = 0;
+                    //strArray[num++] = converter.ConvertToString(context, culture, BorderColors.Left);
+                    //strArray[num++] = converter.ConvertToString(context, culture, BorderColors.Top);
+                    //strArray[num++] = converter.ConvertToString(context, culture, BorderColors.Right);
+                    //strArray[num++] = converter.ConvertToString(context, culture, BorderColors.Bottom);
+                    strArray[num++] = ToArgbString(colors.Left);
+                    strArray[num++] = ToArgbString(colors.Top);
+                    strArray[num++] = ToArgbString(colors.Right);
+                    strArray[num++] = ToArgbString(colors.Bottom);
+                    return string.Join(separator, strArray);
+                }
+                if (destinationType == typeof(InstanceDescriptor))
+                {
+                    BorderColors BorderColors2 = (BorderColors)value;
+                    ConstructorInfo constructor = typeof(BorderColors).GetConstructor(new Type[] { typeof(Color), typeof(Color), typeof(Color), typeof(Color) });
+                    if (constructor != null)
+                    {
+                        return new InstanceDescriptor(constructor, new object[] { BorderColors2.Left, BorderColors2.Top, BorderColors2.Right, BorderColors2.Bottom });
+                    }
+                }
+            }
+            return base.ConvertTo(context, culture, value, destinationType);
+        }
+
+        public override object CreateInstance(ITypeDescriptorContext context, IDictionary propertyValues)
+        {
+            if (propertyValues == null)
+            {
+                throw new ArgumentNullException("propertyValues");
+            }
+            object left = propertyValues["Left"];
+            object top = propertyValues["Top"];
+            object right = propertyValues["Right"];
+            object bottom = propertyValues["Bottom"];
+            if ((((left == null) || (top == null)) || ((right == null) || (bottom == null))) || ((!(left is Color) || !(top is Color)) || (!(right is Color) || !(bottom is Color))))
+            {
+                throw new ArgumentException(string.Format("Property Value Invalid: left={0}, top={1}, right={2}, bottom={3}", left, top, right, bottom));
+            }
+            return new BorderColors((Color)left, (Color)top, (Color)right, (Color)bottom);
+        }
+
+        public override bool GetCreateInstanceSupported(ITypeDescriptorContext context)
+        {
+            return true;
+        }
+
+        public override PropertyDescriptorCollection GetProperties(ITypeDescriptorContext context, object value, Attribute[] attributes)
+        {
+            return TypeDescriptor.GetProperties(typeof(BorderColors), attributes).Sort(new string[] { "Left", "Top", "Right", "Bottom" });
+        }
+
+        public override bool GetPropertiesSupported(ITypeDescriptorContext context)
+        {
+            return true;
+        }
+    }
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/Metro/ColorTables/MetroColorTable.cs b/PROMS/DotNetBar Source Code/Metro/ColorTables/MetroColorTable.cs
new file mode 100644
index 00000000..9ef7bd3a
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Metro/ColorTables/MetroColorTable.cs	
@@ -0,0 +1,402 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+using System.ComponentModel;
+using System.ComponentModel.Design.Serialization;
+using System.Globalization;
+using System.Reflection;
+using System.Collections;
+
+namespace DevComponents.DotNetBar.Metro.ColorTables
+{
+    public class MetroColorTable
+    {
+        /// <summary>
+        /// Gets or sets the background color.
+        /// </summary>
+        public Color CanvasColor = Color.White;
+        /// <summary>
+        /// Gets or sets the canvas light shade color. This property is not directly used but it is provided for reference.
+        /// </summary>
+        public Color CanvasColorShadeLight = Color.White;
+        /// <summary>
+        /// Gets or sets the canvas lighter shade color. This property is not directly used but it is provided for reference.
+        /// </summary>
+        public Color CanvasColorShadeLighter = Color.White;
+
+        /// <summary>
+        /// Gets or sets the foreground color.
+        /// </summary>
+        public Color ForeColor = Color.Black;
+        /// <summary>
+        /// Gets or sets the base metro color.
+        /// </summary>
+        public Color BaseColor = Color.Black;
+        /// <summary>
+        /// Gets or sets background color of edit controls.
+        /// </summary>
+        public Color EditControlBackColor;
+
+        /// <summary>
+        /// Gets or sets the color table for MetroAppForm.
+        /// </summary>
+        public MetroAppFormColorTable MetroAppForm = new MetroAppFormColorTable();
+
+        /// <summary>
+        /// Gets or sets the color table for MetroForm.
+        /// </summary>
+        public MetroFormColorTable MetroForm = new MetroFormColorTable();
+
+        /// <summary>
+        /// Gets or sets the color table for MetroTab.
+        /// </summary>
+        public MetroTabColorTable MetroTab = new MetroTabColorTable();
+
+        /// <summary>
+        /// Gets or sets color table for MetroStatusBar.
+        /// </summary>
+        public MetroStatusBarColorTable MetroStatusBar = new MetroStatusBarColorTable();
+
+        /// <summary>
+        /// Gets or sets color table for MetroToolbar.
+        /// </summary>
+        public MetroToolbarColorTable MetroToolbar = new MetroToolbarColorTable();
+
+        /// <summary>
+        /// Gets or sets the color table used by MetroTile items.
+        /// </summary>
+        public MetroTileColorTable MetroTile = new MetroTileColorTable();
+
+        /// <summary>
+        /// Gets or sets the metro-part colors that define the metro UI color scheme. These colors are provided for you reference and reuse in your app.
+        /// </summary>
+        public MetroPartColors MetroPartColors = new MetroPartColors();
+    }
+
+    /// <summary>
+    /// Represents class that defines parameters for Metro style color scheme.
+    /// </summary>
+    [TypeConverterAttribute(typeof(MetroColorGeneratorParametersConverter))]
+    public struct MetroColorGeneratorParameters
+    {
+        #region Implementation
+        /// <summary>
+        /// Initializes a new instance of the MetroStyleParameters class.
+        /// </summary>
+        /// <param name="canvasColor">Canvas color.</param>
+        /// <param name="baseColor">Base color.</param>
+        public MetroColorGeneratorParameters(Color canvasColor, Color baseColor)
+        {
+            if (canvasColor.IsEmpty) canvasColor = DefaultCanvasColor;
+            if (baseColor.IsEmpty) baseColor = DefaultBaseColor;
+            _CanvasColor = canvasColor;
+            _BaseColor = baseColor;
+            _ThemeName = "";
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the MetroColorGeneratorParameters structure.
+        /// </summary>
+        /// <param name="canvasColor">Canvas color.</param>
+        /// <param name="baseColor">Base color.</param>
+        /// <param name="themeName">User friendly theme name.</param>
+        public MetroColorGeneratorParameters(Color canvasColor, Color baseColor, string themeName)
+        {
+            _CanvasColor = canvasColor;
+            _BaseColor = baseColor;
+            _ThemeName = themeName;
+        }
+
+        /// <summary>
+        /// Returns array of all predefined Metro color themes.
+        /// </summary>
+        /// <returns></returns>
+        public static MetroColorGeneratorParameters[] GetAllPredefinedThemes()
+        {
+            Type t = typeof(MetroColorGeneratorParameters);
+            PropertyInfo[] members = t.GetProperties(BindingFlags.Public | BindingFlags.Static);
+            List<MetroColorGeneratorParameters> themes = new List<MetroColorGeneratorParameters>();
+            foreach (PropertyInfo mem in members)
+            {
+                if (mem.PropertyType == t)
+                {
+                    themes.Add((MetroColorGeneratorParameters)mem.GetValue(null, null));
+                }
+            }
+            return themes.ToArray();
+        }
+
+        private static readonly Color DefaultCanvasColor = Color.White;
+        private Color _CanvasColor;
+        /// <summary>
+        /// Gets or sets the color of the Metro canvas.
+        /// </summary>
+        [Category("Columns"), Description("Indicates color of the metro Canvas.")]
+        public Color CanvasColor
+        {
+            get { return _CanvasColor; }
+            set { _CanvasColor = value; }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeCanvasColor()
+        {
+            return _CanvasColor != DefaultCanvasColor;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetCanvasColor()
+        {
+            this.CanvasColor = DefaultCanvasColor;
+        }
+
+        private static readonly Color DefaultBaseColor = ColorScheme.GetColor("FFA31A");
+        private Color _BaseColor;
+        /// <summary>
+        /// Gets or sets the base color for the Metro style.
+        /// </summary>
+        [Category("Columns"), Description("Indicates base color of the Metro style.")]
+        public Color BaseColor
+        {
+            get { return _BaseColor; }
+            set { _BaseColor = value; }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeBaseColor()
+        {
+            return _BaseColor != DefaultBaseColor;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetBaseColor()
+        {
+            this.BaseColor = DefaultBaseColor;
+        }
+
+        private string _ThemeName;
+        /// <summary>
+        /// Gets or sets the user friendly theme name.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public string ThemeName
+        {
+            get { return _ThemeName; }
+            set { _ThemeName = value; }
+        }
+        #endregion
+
+        #region Static Color Schemes
+        public static MetroColorGeneratorParameters Default { get { return new MetroColorGeneratorParameters(Color.White, ColorScheme.GetColor("2B579A"), "Default"); } }
+        public static MetroColorGeneratorParameters Purple { get { return new MetroColorGeneratorParameters(ColorScheme.GetColor("FFFFFF"), ColorScheme.GetColor("6A3889"), "Purple"); } }
+        public static MetroColorGeneratorParameters Red { get { return new MetroColorGeneratorParameters(ColorScheme.GetColor("FFFFFF"), ColorScheme.GetColor("CF4926"), "Red"); } }
+        public static MetroColorGeneratorParameters Green { get { return new MetroColorGeneratorParameters(ColorScheme.GetColor("FFFFFF"), ColorScheme.GetColor("217346"), "Green"); } }
+        public static MetroColorGeneratorParameters Blue { get { return new MetroColorGeneratorParameters(ColorScheme.GetColor("FFFFFF"), ColorScheme.GetColor("0072C6"), "Blue"); } }
+        public static MetroColorGeneratorParameters DarkPurple { get { return new MetroColorGeneratorParameters(ColorScheme.GetColor("FFFFFF"), ColorScheme.GetColor("80397B"), "DarkPurple"); } }
+        public static MetroColorGeneratorParameters RedAmplified { get { return new MetroColorGeneratorParameters(ColorScheme.GetColor("FFFFFF"), ColorScheme.GetColor("D24726"), "RedAmplified"); } }
+        public static MetroColorGeneratorParameters ForestGreen { get { return new MetroColorGeneratorParameters(ColorScheme.GetColor("FFFFFF"), ColorScheme.GetColor("077568"), "ForestGreen"); } }
+        
+        public static MetroColorGeneratorParameters Brown { get { return new MetroColorGeneratorParameters(ColorScheme.GetColor(0xE7DEC0), ColorScheme.GetColor("6D4320"), "Brown");}}
+        public static MetroColorGeneratorParameters DarkRed { get { return new MetroColorGeneratorParameters(ColorScheme.GetColor("F2F2F2"), ColorScheme.GetColor("A4373A"), "Dark Red"); } }
+        public static MetroColorGeneratorParameters Orange { get { return new MetroColorGeneratorParameters(ColorScheme.GetColor("FFFFFF"), ColorScheme.GetColor("ED8E00"), "Orange"); } }
+        public static MetroColorGeneratorParameters BlackMaroon { get { return new MetroColorGeneratorParameters(ColorScheme.GetColor("1C190F"), ColorScheme.GetColor("8A2F25"), "Black Maroon");}}
+        public static MetroColorGeneratorParameters BlackSky { get { return new MetroColorGeneratorParameters(Color.Black, ColorScheme.GetColor("00A7FF"), "Black Sky");}}
+        public static MetroColorGeneratorParameters BlackClouds { get { return new MetroColorGeneratorParameters(ColorScheme.GetColor("000000"), ColorScheme.GetColor("9B96A3"), "Black Clouds");}}
+        public static MetroColorGeneratorParameters BlackLilac { get { return new MetroColorGeneratorParameters(ColorScheme.GetColor("191919"), ColorScheme.GetColor("D8CAFF"), "Black Lilac");}}
+        public static MetroColorGeneratorParameters Bordeaux { get { return new MetroColorGeneratorParameters(ColorScheme.GetColor("F2EBDC"), ColorScheme.GetColor("960E00"), "Bordeaux");}}
+        public static MetroColorGeneratorParameters Rust { get { return new MetroColorGeneratorParameters(ColorScheme.GetColor("B4B48D"), ColorScheme.GetColor("A94D2D"), "Rust");}}
+        public static MetroColorGeneratorParameters Espresso { get { return new MetroColorGeneratorParameters(ColorScheme.GetColor("AB9667"), ColorScheme.GetColor("383025"), "Espresso");}}
+        public static MetroColorGeneratorParameters PowderRed { get { return new MetroColorGeneratorParameters(ColorScheme.GetColor("D0D9D6"), ColorScheme.GetColor("BF0404"), "Powder Red");}}
+        public static MetroColorGeneratorParameters BlueishBrown { get { return new MetroColorGeneratorParameters(ColorScheme.GetColor("D5D5E0"), ColorScheme.GetColor("3D1429"), "Blueish Brown");}}
+        public static MetroColorGeneratorParameters SilverGreen { get { return new MetroColorGeneratorParameters(ColorScheme.GetColor("F2F2F2"), ColorScheme.GetColor("588C3F"), "Silver Green");}}
+        public static MetroColorGeneratorParameters MaroonSilver { get { return new MetroColorGeneratorParameters(ColorScheme.GetColor("260B01"), ColorScheme.GetColor("F2F2F2"), "Maroon Silver");}}
+        public static MetroColorGeneratorParameters SkyGreen { get { return new MetroColorGeneratorParameters(ColorScheme.GetColor("BDD5D0"), ColorScheme.GetColor("04ADBF"), "Sky Green");}}
+        public static MetroColorGeneratorParameters DarkBrown { get { return new MetroColorGeneratorParameters(ColorScheme.GetColor("D9B573"), ColorScheme.GetColor("261105"), "Dark Brown");}}
+        public static MetroColorGeneratorParameters Latte { get { return new MetroColorGeneratorParameters(ColorScheme.GetColor("B18D5A"), ColorScheme.GetColor("851A1D"), "Latte");}}
+        public static MetroColorGeneratorParameters Cherry { get { return new MetroColorGeneratorParameters(ColorScheme.GetColor("DECDAE"), ColorScheme.GetColor("5A0D12"), "Cherry");}}
+        public static MetroColorGeneratorParameters GrayOrange { get { return new MetroColorGeneratorParameters(ColorScheme.GetColor("E8E8DC"), ColorScheme.GetColor("FF8600"), "Gray Orange");}}
+        public static MetroColorGeneratorParameters EarlyRed { get { return new MetroColorGeneratorParameters(ColorScheme.GetColor("FCFCF0"), ColorScheme.GetColor("C93C00"), "Early Red");}}
+        public static MetroColorGeneratorParameters EarlyMaroon { get { return new MetroColorGeneratorParameters(ColorScheme.GetColor("FCFCF0"), ColorScheme.GetColor("730046"), "Early Maroon");}}
+        public static MetroColorGeneratorParameters EarlyOrange { get { return new MetroColorGeneratorParameters(ColorScheme.GetColor("FCFCF0"), ColorScheme.GetColor("E88801"), "Early Orange");}}
+        public static MetroColorGeneratorParameters SilverBlues { get { return new MetroColorGeneratorParameters(ColorScheme.GetColor("dcdcdc"), ColorScheme.GetColor("002395"), "Silver Blues");}}
+        public static MetroColorGeneratorParameters RetroBlue { get { return new MetroColorGeneratorParameters(ColorScheme.GetColor("FEFEFE"), ColorScheme.GetColor("3E788F"), "Retro Blue");}}
+        public static MetroColorGeneratorParameters LatteRed { get { return new MetroColorGeneratorParameters(ColorScheme.GetColor("A77A51"), ColorScheme.GetColor("8C170D"), "Latte Red");}}
+        public static MetroColorGeneratorParameters LatteDarkSteel { get { return new MetroColorGeneratorParameters(ColorScheme.GetColor("A77A51"), ColorScheme.GetColor("2C2D40"), "Latte Dark Steel");}}
+        public static MetroColorGeneratorParameters SimplyBlue { get { return new MetroColorGeneratorParameters(ColorScheme.GetColor("E2E2E2"), ColorScheme.GetColor("215BA6"), "Simply Blue");}}
+        public static MetroColorGeneratorParameters WashedBlue { get { return new MetroColorGeneratorParameters(ColorScheme.GetColor("B8CDD1"), ColorScheme.GetColor("B4090A"), "Washed Blue");}}
+        public static MetroColorGeneratorParameters WashedWhite { get { return new MetroColorGeneratorParameters(ColorScheme.GetColor("FEFFF8"), ColorScheme.GetColor("92AAB1"), "Washed White");}}
+        public static MetroColorGeneratorParameters NapaRed { get { return new MetroColorGeneratorParameters(ColorScheme.GetColor("F2F2F2"), ColorScheme.GetColor("A64B29"), "Napa Red");}}
+        public static MetroColorGeneratorParameters Magenta { get { return new MetroColorGeneratorParameters(ColorScheme.GetColor("FFFFFF"), ColorScheme.GetColor("7F3B78"), "Magenta"); } }
+        public static MetroColorGeneratorParameters DarkBlue { get { return new MetroColorGeneratorParameters(ColorScheme.GetColor("FFFFFF"), ColorScheme.GetColor("2B569A"), "Dark Blue"); } }
+        public static MetroColorGeneratorParameters VisualStudio2012Light { get { return new MetroColorGeneratorParameters(ColorScheme.GetColor("EFEFF2"), ColorScheme.GetColor("007ACC"), "Visual Studio 2012 Light"); } }
+        public static MetroColorGeneratorParameters VisualStudio2012Dark { get { return new MetroColorGeneratorParameters(ColorScheme.GetColor("2D2D30"), ColorScheme.GetColor("007ACC"), "Visual Studio 2012 Dark"); } }
+        public static MetroColorGeneratorParameters Office2016Blue { get { return new MetroColorGeneratorParameters(ColorScheme.GetColor("FFFFFF"), ColorScheme.GetColor("0173C7"), "Office 2016 Blue"); } }
+        public static MetroColorGeneratorParameters Office2016DarkBlue { get { return new MetroColorGeneratorParameters(ColorScheme.GetColor("FFFFFF"), ColorScheme.GetColor("2A579A"), "Office 2016 Dark Blue"); } }
+        public static MetroColorGeneratorParameters Office2016Green { get { return new MetroColorGeneratorParameters(ColorScheme.GetColor("FFFFFF"), ColorScheme.GetColor("227447"), "Office 2016 Green"); } }
+        public static MetroColorGeneratorParameters Office2016Orange { get { return new MetroColorGeneratorParameters(ColorScheme.GetColor("FFFFFF"), ColorScheme.GetColor("B7472A"), "Office 2016 Orange"); } }
+        public static MetroColorGeneratorParameters Office2016Red { get { return new MetroColorGeneratorParameters(ColorScheme.GetColor("FFFFFF"), ColorScheme.GetColor("A4373A"), "Office 2016 Red"); } }
+        public static MetroColorGeneratorParameters Office2016Purple { get { return new MetroColorGeneratorParameters(ColorScheme.GetColor("FFFFFF"), ColorScheme.GetColor("80397B"), "Office 2016 Purple"); } }
+
+        #endregion
+    }
+    #region MetroColorGeneratorParameters
+    public class MetroColorGeneratorParametersConverter : TypeConverter
+    {
+        public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
+        {
+            return ((sourceType == typeof(string)) || base.CanConvertFrom(context, sourceType));
+        }
+
+        public override bool CanConvertTo(ITypeDescriptorContext context, Type destinationType)
+        {
+            return ((destinationType == typeof(InstanceDescriptor)) || base.CanConvertTo(context, destinationType));
+        }
+
+        public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
+        {
+            string str = value as string;
+            if (str == null)
+            {
+                return base.ConvertFrom(context, culture, value);
+            }
+            string str2 = str.Trim();
+            if (str2.Length == 0)
+            {
+                return null;
+            }
+            if (culture == null)
+            {
+                culture = CultureInfo.CurrentCulture;
+            }
+            char ch = culture.TextInfo.ListSeparator[0];
+            string[] strArray = str2.Split(new char[] { ch });
+            if (strArray.Length != 2)
+            {
+                throw new ArgumentException("String parsing failed due to incorrect format.");
+            }
+
+            MetroColorGeneratorParameters colorParams = new MetroColorGeneratorParameters();
+            TypeConverter converter = TypeDescriptor.GetConverter(typeof(Color));
+
+            colorParams.CanvasColor = (Color)converter.ConvertFromString(context, culture, strArray[0]);
+            colorParams.BaseColor = (Color)converter.ConvertFromString(context, culture, strArray[1]);
+            
+            return colorParams;
+        }
+
+        public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+        {
+            if (destinationType == null)
+            {
+                throw new ArgumentNullException("destinationType");
+            }
+            if (value is MetroColorGeneratorParameters)
+            {
+                if (destinationType == typeof(string))
+                {
+                    MetroColorGeneratorParameters colorParams = (MetroColorGeneratorParameters)value;
+                    if (culture == null)
+                    {
+                        culture = CultureInfo.CurrentCulture;
+                    }
+                    string separator = culture.TextInfo.ListSeparator + " ";
+                    //TypeConverter converter = TypeDescriptor.GetConverter(typeof(Color));
+                    string[] strArray = new string[2];
+                    int num = 0;
+                    strArray[num++] = ColorToString(culture, colorParams.CanvasColor); // converter.ConvertToString(context, culture, colorParams.CanvasColor);
+                    strArray[num++] = ColorToString(culture, colorParams.BaseColor); // converter.ConvertToString(context, culture, colorParams.BaseColor);
+                    return string.Join(separator, strArray);
+                }
+                if (destinationType == typeof(InstanceDescriptor))
+                {
+                    MetroColorGeneratorParameters colorParams = (MetroColorGeneratorParameters)value;
+                    ConstructorInfo constructor = typeof(MetroColorGeneratorParameters).GetConstructor(new Type[] { typeof(Color), typeof(Color) });
+                    if (constructor != null)
+                    {
+                        return new InstanceDescriptor(constructor, new object[] { colorParams.CanvasColor, colorParams.BaseColor });
+                    }
+                }
+            }
+            return base.ConvertTo(context, culture, value, destinationType);
+        }
+
+        private static string ColorToString(CultureInfo culture, Color color)
+        {
+            string[] strArray;
+            if (color == Color.Empty)
+            {
+                return string.Empty;
+            }
+            if (color.IsKnownColor)
+            {
+                return color.Name;
+            }
+            if (color.IsNamedColor)
+            {
+                return ("'" + color.Name + "'");
+            }
+            if (culture == null)
+            {
+                culture = CultureInfo.CurrentCulture;
+            }
+            string separator = "";
+            int num = 0;
+            if (color.A < 0xff)
+            {
+                strArray = new string[4];
+                strArray[num++] = color.A.ToString("X2");
+            }
+            else
+            {
+                strArray = new string[3];
+            }
+            strArray[num++] = color.R.ToString("X2");
+            strArray[num++] = color.G.ToString("X2");
+            strArray[num++] = color.B.ToString("X2");
+            return "#" + string.Join(separator, strArray);
+
+        }
+
+        public override object CreateInstance(ITypeDescriptorContext context, IDictionary propertyValues)
+        {
+            if (propertyValues == null)
+            {
+                throw new ArgumentNullException("propertyValues");
+            }
+            object canvasColor = propertyValues["CanvasColor"];
+            object baseColor = propertyValues["BaseColor"];
+            if (canvasColor == null || !(canvasColor is Color) || baseColor==null || !(baseColor is Color))
+            {
+                throw new ArgumentException("Invalid property value entry");
+            }
+            return new MetroColorGeneratorParameters((Color)canvasColor, (Color)baseColor);
+        }
+
+        public override bool GetCreateInstanceSupported(ITypeDescriptorContext context)
+        {
+            return true;
+        }
+
+        public override PropertyDescriptorCollection GetProperties(ITypeDescriptorContext context, object value, Attribute[] attributes)
+        {
+            return TypeDescriptor.GetProperties(typeof(MetroColorGeneratorParameters), attributes).Sort(new string[] { "CanvasColor", "BaseColor" });
+        }
+
+        public override bool GetPropertiesSupported(ITypeDescriptorContext context)
+        {
+            return true;
+        }
+    }
+    #endregion
+ 
+
+}
diff --git a/PROMS/DotNetBar Source Code/Metro/ColorTables/MetroColorTableInitializer.cs b/PROMS/DotNetBar Source Code/Metro/ColorTables/MetroColorTableInitializer.cs
new file mode 100644
index 00000000..14878b18
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Metro/ColorTables/MetroColorTableInitializer.cs	
@@ -0,0 +1,318 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+using DevComponents.DotNetBar.Rendering;
+using DevComponents.DotNetBar.Metro.Helpers;
+
+namespace DevComponents.DotNetBar.Metro.ColorTables
+{
+    /// <summary>
+    /// Initializes the Metro UI color table based on colors specified.
+    /// </summary>
+    internal class MetroColorTableInitializer
+    {
+        public static MetroColorTable CreateColorTable(MetroColorGeneratorParameters colorParams)
+        {
+            return CreateColorTable(colorParams.CanvasColor, colorParams.BaseColor);
+        }
+        public static MetroColorTable CreateColorTable(Color canvasColor, Color baseColor)
+        {
+            MetroColorTable metroTable = new MetroColorTable();
+            Office2007ColorTable officeMetroColorTable = new Office2007ColorTable();
+            CreateColors(metroTable, officeMetroColorTable, canvasColor, baseColor);
+            if (StyleManager.IsMetro(StyleManager.Style))
+                ((Office2007Renderer)GlobalManager.Renderer).ColorTable = officeMetroColorTable;
+            return metroTable;
+        }
+
+        private const double DEGREE = 1d / 360;
+        private static double GetHue(double hue, int addDegrees)
+        {
+            hue += addDegrees * DEGREE;
+            if (hue > 1)
+                hue -= 1;
+            else if (hue < 0)
+                hue += 1;
+            return hue;
+        }
+        private static double GetComplementSaturation(double saturation)
+        {
+            if (saturation == 1) return 1;
+
+            if (saturation < .81d)
+                return saturation + .1d;
+            if (saturation < .91d)
+                return saturation + .05d;
+            return saturation + (.99d - saturation);
+        }
+        public static MetroPartColors CreateMetroPartColors(Color canvasColor, Color baseColor)
+        {
+            ColorFunctions.HLSColor canvasHsl = ColorFunctions.RGBToHSL(canvasColor);
+            ColorFunctions.HLSColor baseHsl = ColorFunctions.RGBToHSL(baseColor);
+            HSVColor baseHsv = ColorHelpers.ColorToHSV(baseColor);
+            HSVColor canvasHsv = ColorHelpers.ColorToHSV(canvasColor);
+
+            // Create metro colors
+            MetroPartColors partColors = new MetroPartColors();
+            partColors.CanvasColor = canvasColor;
+            partColors.BaseColor = baseColor;
+            partColors.TextColor = (canvasHsl.Lightness < .4) ? Color.White : Color.Black;
+            //HSVColor textHsv = ColorHelpers.ColorToHSV(partColors.TextColor);
+            partColors.TextInactiveColor = ColorHelpers.HSVToColor(canvasHsv.Hue, canvasHsv.Saturation, (partColors.TextColor == Color.White ? canvasHsv.Value + .53 : canvasHsv.Value - .47));
+            partColors.TextDisabledColor = ColorHelpers.HSVToColor(canvasHsv.Hue, canvasHsv.Saturation, (partColors.TextColor == Color.Black ? canvasHsv.Value - .33 : canvasHsv.Value + .67));
+            partColors.TextLightColor = ColorHelpers.HSVToColor(canvasHsv.Hue, canvasHsv.Saturation, (partColors.TextColor == Color.Black ? canvasHsv.Value - .6 : canvasHsv.Value + .4));
+            partColors.CanvasColorDarkShade = ColorHelpers.HSVToColor(canvasHsv.Hue, canvasHsv.Saturation, (partColors.TextColor == Color.Black ? canvasHsv.Value - .33 : canvasHsv.Value + .67));
+            partColors.CanvasColorLightShade = ColorHelpers.HSVToColor(canvasHsv.Hue, canvasHsv.Saturation, (partColors.TextColor == Color.White ? canvasHsv.Value + .17 : canvasHsv.Value - .17));
+            partColors.CanvasColorLighterShade = ColorHelpers.HSVToColor(canvasHsv.Hue, canvasHsv.Saturation, (partColors.TextColor == Color.White ? canvasHsv.Value + .05 : canvasHsv.Value - .05));
+            if(partColors.IsSolidCanvas)
+                partColors.CanvasColorLight = (partColors.TextColor == Color.Black)?ColorHelpers.HSVToColor(0, 0, .99):ColorHelpers.HSVToColor(canvasHsv.Hue, canvasHsv.Saturation, canvasHsv.Value+.05);
+            else
+                partColors.CanvasColorLight = (partColors.TextColor == Color.Black) ? ColorHelpers.HSVToColor(canvasHsv.Hue, canvasHsv.Saturation, canvasHsv.Value + (canvasHsv.Value>=.96?.020:.058)) : ColorHelpers.HSVToColor(canvasHsv.Hue, canvasHsv.Saturation, canvasHsv.Value - .05);
+            //Console.WriteLine(string.Format("{0:X2}{1:X2}{2:X2}{3:X2}", partColors.CanvasColorLight.A, partColors.CanvasColorLight.R, partColors.CanvasColorLight.G, partColors.CanvasColorLight.B));
+            partColors.BaseTextColor = GetTextColor(baseColor);
+
+            partColors.BaseColorLight = ColorHelpers.HSVToColor(baseHsv.Hue, GetColorMin(0.08, baseHsv.Saturation - .41), baseHsv.Value + .3);
+            partColors.BaseColorLight1 = ColorHelpers.HSVToColor(baseHsv.Hue, GetColorMin(0.05, baseHsv.Saturation - .12), baseHsv.Value + .12);
+            partColors.BaseColorLightText = GetTextColor(partColors.BaseColorLight);
+
+            partColors.BaseColorLightest = ColorHelpers.HSVToColor(baseHsv.Hue, GetColorMin(0.05, baseHsv.Saturation - .6), baseHsv.Value + .35);
+            partColors.BaseColorLighter = ColorHelpers.HSVToColor(baseHsv.Hue, GetColorMin(0.08, baseHsv.Saturation - .4), baseHsv.Value + .39);
+            partColors.BaseColorDark = ColorHelpers.HSVToColor(baseHsv.Hue, baseHsv.Saturation + .1, baseHsv.Value - .06);
+            partColors.BaseColorDarker = ColorFunctions.HLSToRGB(baseHsl.Hue, baseHsl.Lightness - .2, baseHsl.Saturation);
+
+            partColors.ComplementColor = ColorHelpers.HSVToColor(GetComplementHue(baseHsv.Hue), baseHsv.Saturation, baseHsv.Value + (baseHsv.Value > .5d ? -.35 : 0d));
+            ColorFunctions.HLSColor compHsl = ColorFunctions.RGBToHSL(partColors.ComplementColor);
+            HSVColor compHsv = ColorHelpers.ColorToHSV(partColors.ComplementColor);
+            partColors.ComplementColorLight = ColorHelpers.HSVToColor(compHsv.Hue, compHsv.Saturation, compHsv.Value + .2d);
+            partColors.ComplementColorDark = ColorFunctions.HLSToRGB(compHsl.Hue, compHsl.Lightness - .10, compHsl.Saturation);
+            partColors.ComplementColorDarker = ColorFunctions.HLSToRGB(compHsl.Hue, compHsl.Lightness - .2, compHsl.Saturation);
+            partColors.ComplementColorText = GetTextColor(partColors.ComplementColor);
+            partColors.ComplementColorLightText = GetTextColor(partColors.ComplementColorLight);
+
+            partColors.BaseButtonGradientStart = ColorHelpers.HSVToColor(canvasHsv.Hue, canvasHsv.Saturation, (canvasHsv.Value > 0 ? canvasHsv.Value - .01 : canvasHsv.Value + .08));
+            partColors.BaseButtonGradientEnd = ColorHelpers.HSVToColor(canvasHsv.Hue, canvasHsv.Saturation, (canvasHsv.Value > 0 ? canvasHsv.Value - .08 : canvasHsv.Value + .20));
+
+            if (partColors.TextColor == Color.Black)
+                partColors.EditControlBackColor = Color.White;
+            else
+                partColors.EditControlBackColor = Color.Black;
+
+            return partColors;
+        }
+        public static void CreateColors(MetroColorTable metroTable, Office2007ColorTable officeMetroColorTable, Color canvasColor, Color baseColor)
+        {
+            MetroPartColors partColors = CreateMetroPartColors(canvasColor, baseColor);
+
+            metroTable.CanvasColor = partColors.CanvasColor;
+            metroTable.CanvasColorShadeLight = partColors.CanvasColorLightShade;
+            metroTable.CanvasColorShadeLighter = partColors.CanvasColorLighterShade;
+            metroTable.ForeColor = partColors.TextColor;
+            metroTable.BaseColor = baseColor;
+            metroTable.EditControlBackColor = partColors.EditControlBackColor;
+            metroTable.MetroPartColors = partColors;
+
+            metroTable.MetroAppForm.BorderThickness = new Thickness(0, 0, 1, 1);
+            metroTable.MetroAppForm.BorderColors = new BorderColors(partColors.BaseColor);
+            metroTable.MetroAppForm.BorderColorsInactive = new BorderColors(partColors.BaseColorLight);
+
+            metroTable.MetroForm.BorderThickness = new Thickness(3, 3, 3, 3);
+            metroTable.MetroForm.BorderColors = new BorderColors[3] { new BorderColors(partColors.BaseColorDark), new BorderColors(partColors.BaseColor), new BorderColors(partColors.BaseColor) };
+            metroTable.MetroForm.BorderColorsInactive = new BorderColors[4] { new BorderColors(partColors.BaseColorLight), new BorderColors(partColors.BaseColorLight), new BorderColors(partColors.BaseColorLight), new BorderColors(partColors.BaseColorLight) };
+
+            metroTable.MetroTab.ActiveCaptionText = partColors.TextInactiveColor;
+            metroTable.MetroTab.InactiveCaptionText = partColors.TextDisabledColor;
+
+            metroTable.MetroTab.MetroTabItem.Default = GetMetroTabItemStateTable(partColors.TextInactiveColor);
+            metroTable.MetroTab.MetroTabItem.Selected = GetMetroTabItemStateTable(partColors.BaseColor);
+            metroTable.MetroTab.MetroTabItem.Disabled = GetMetroTabItemStateTable(partColors.TextDisabledColor);
+            metroTable.MetroTab.MetroTabItem.MouseOver = GetMetroTabItemStateTable(partColors.TextInactiveColor, partColors.BaseColor);
+            metroTable.MetroTab.MetroTabItem.Pressed = null;
+
+            metroTable.MetroTab.TabPanelBackgroundStyle = new ElementStyle(partColors.TextColor, partColors.CanvasColor);
+
+            // Toolbar
+            metroTable.MetroToolbar.BackgroundStyle = new ElementStyle(partColors.TextColor, partColors.CanvasColor);
+
+            // Status Bar
+            metroTable.MetroStatusBar.BackgroundStyle = new ElementStyle(partColors.TextColor, partColors.BaseColor);
+            metroTable.MetroStatusBar.TopBorders = new Color[0];
+            metroTable.MetroStatusBar.BottomBorders = new Color[0];
+            metroTable.MetroStatusBar.ResizeMarkerLightColor = Color.FromArgb(196, Color.White);
+            metroTable.MetroStatusBar.ResizeMarkerColor = partColors.BaseColorDarker;
+
+            MetroOfficeColorTableInitializer.InitializeColorTable(officeMetroColorTable, ColorFactory.Empty, partColors);
+        }
+        private static double GetColorMin(double minValue, double value)
+        {
+            if (value < 0)
+                return minValue;
+            return value;
+        }
+
+        private static Color GetTextColor(Color color)
+        {
+            ColorFunctions.HLSColor hslColor = ColorFunctions.RGBToHSL(color);
+            return hslColor.Lightness < .65 ? Color.White : Color.Black;
+            //HSVColor hsvColor = ColorHelpers.ColorToHSV(backColor);
+            //return hsvColor.Value < .65 ? Color.White : Color.Black;
+        }
+
+        private static double GetComplementHue(double hue)
+        {
+            if (hue <= .37777d)
+            {
+                return Math.Min(1, hue + (137 * DEGREE + (86 * DEGREE * (hue / .37777d))));
+            }
+            else
+            {
+                return Math.Max(0, hue - (137 * DEGREE + (86 * DEGREE * (hue / .6222222d))));//     ((137 + 86 * DEGREE * (hue / .6222222) * DEGREE)));
+            }
+        }
+
+        private static MetroTabItemStateColorTable GetMetroTabItemStateTable(Color textColor)
+        {
+            return GetMetroTabItemStateTable(textColor, Color.Empty);
+        }
+        private static MetroTabItemStateColorTable GetMetroTabItemStateTable(Color textColor, Color bottomBorderColor)
+        {
+            ElementStyle style = new ElementStyle(textColor);
+            style.TextAlignment = eStyleTextAlignment.Center;
+            style.TextLineAlignment = eStyleTextAlignment.Center;
+            style.HideMnemonic = true;
+            if (!bottomBorderColor.IsEmpty)
+            {
+                style.BorderBottom = eStyleBorderType.Solid;
+                style.BorderBottomWidth = 2;
+                style.BorderBottomColor = bottomBorderColor;
+            }
+            return new MetroTabItemStateColorTable(style);
+        }
+    }
+    /// <summary>
+    /// Defines base set of Metro UI color scheme.
+    /// </summary>
+    public class MetroPartColors
+    {
+        /// <summary>
+        /// Gets or sets the base canvas color, like form background.
+        /// </summary>
+        public Color CanvasColor;
+        /// <summary>
+        /// Gets or sets the chrome base color, used for window border, selection marking etc.
+        /// </summary>
+        public Color BaseColor;
+        /// <summary>
+        /// Gets or sets the text color for text displayed over the BaseColor.
+        /// </summary>
+        public Color BaseTextColor;
+        /// <summary>
+        /// Gets or sets the text color displayed over the canvas color.
+        /// </summary>
+        public Color TextColor;
+        /// <summary>
+        /// Gets or sets the lighter text color used for example for inactive non selected tab text etc.
+        /// </summary>
+        public Color TextInactiveColor;
+        /// <summary>
+        /// Gets or sets the text color used for disabled text.
+        /// </summary>
+        public Color TextDisabledColor;
+        /// <summary>
+        /// Gets or sets the text light color.
+        /// </summary>
+        public Color TextLightColor;
+        /// <summary>
+        /// Gets or sets the color that lighter than canvas color unless canvas is white in which case this will be white as well.
+        /// </summary>
+        public Color CanvasColorLight;
+        /// <summary>
+        /// Gets or sets the color that is in dark shade off of the canvas color.
+        /// </summary>
+        public Color CanvasColorDarkShade;
+        /// <summary>
+        /// Gets or sets the color that is in darker shade off of the canvas color.
+        /// </summary>
+        public Color CanvasColorDarkerShade;
+        /// <summary>
+        /// Gets or sets the color that is in light shade off of the canvas color.
+        /// </summary>
+        public Color CanvasColorLightShade;
+        /// <summary>
+        /// Gets or sets the color that is in lighter shade off of the canvas color.
+        /// </summary>
+        public Color CanvasColorLighterShade;
+        /// <summary>
+        /// Gets or sets the light base color shade.
+        /// </summary>
+        public Color BaseColorLight;
+        /// <summary>
+        /// Gets or sets the just a tad lighter base color.
+        /// </summary>
+        public Color BaseColorLight1;
+        /// <summary>
+        /// Gets or sets the text color for light base color.
+        /// </summary>
+        public Color BaseColorLightText;
+        /// <summary>
+        /// Gets or sets the lighter base color shade.
+        /// </summary>
+        public Color BaseColorLighter;
+        /// <summary>
+        /// Gets or sets the lightest base color shade.
+        /// </summary>
+        public Color BaseColorLightest;
+        /// <summary>
+        /// Gets or sets the dark base color shade.
+        /// </summary>
+        public Color BaseColorDark;
+        /// <summary>
+        /// Gets or sets the darker base color shade.
+        /// </summary>
+        public Color BaseColorDarker;
+        /// <summary>
+        /// Gets or sets the base color analogous color 1
+        /// </summary>
+        public Color ComplementColor;
+        /// <summary>
+        /// Gets or sets the Analogous color light variant.
+        /// </summary>
+        public Color ComplementColorLight;
+        /// <summary>
+        /// Gets or sets the text color for Analogous color light variant.
+        /// </summary>
+        public Color ComplementColorLightText;
+        /// <summary>
+        /// Gets or sets the Analogous color dark variant.
+        /// </summary>
+        public Color ComplementColorDark;
+        /// <summary>
+        /// Gets or sets the Analogous color darker variant.
+        /// </summary>
+        public Color ComplementColorDarker;
+        /// <summary>
+        /// Gets or sets the Analogous color text color.
+        /// </summary>
+        public Color ComplementColorText;
+        /// <summary>
+        /// Gets or sets the off base color button gradient start.
+        /// </summary>
+        public Color BaseButtonGradientStart;
+        /// <summary>
+        /// Gets or sets the off base color button gradient start.
+        /// </summary>
+        public Color BaseButtonGradientEnd;
+        /// <summary>
+        /// Gets or sets background color of edit controls.
+        /// </summary>
+        public Color EditControlBackColor;
+
+        internal bool IsSolidCanvas
+        {
+            get
+            {
+                return CanvasColor == Color.White || CanvasColor == Color.Black;
+            }
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Metro/ColorTables/MetroFormColorTable.cs b/PROMS/DotNetBar Source Code/Metro/ColorTables/MetroFormColorTable.cs
new file mode 100644
index 00000000..ac8d8615
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Metro/ColorTables/MetroFormColorTable.cs	
@@ -0,0 +1,53 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Metro.ColorTables
+{
+    /// <summary>
+    /// Represents the MetroAppForm color table.
+    /// </summary>
+    public class MetroAppFormColorTable
+    {
+        /// <summary>
+        /// Gets or sets the border thickness.
+        /// </summary>
+        public Thickness BorderThickness = new Thickness(0, 0, 1, 1);
+        /// <summary>
+        /// Gets or sets the border thickness for form when it is running on Windows without Glass effect enabled.
+        /// </summary>
+        public Thickness BorderPlainThickness = new Thickness(1);
+        /// <summary>
+        /// Gets or sets the border colors.
+        /// </summary>
+        public BorderColors BorderColors = new BorderColors(ColorScheme.GetColor("FF6B10"));
+        /// <summary>
+        /// Gets or sets the inactive form border colors.
+        /// </summary>
+        public BorderColors BorderColorsInactive = new BorderColors();
+    }
+
+    /// <summary>
+    /// Represents the MetroForm color table.
+    /// </summary>
+    public class MetroFormColorTable
+    {
+        /// <summary>
+        /// Gets or sets the border thickness.
+        /// </summary>
+        public Thickness BorderThickness = new Thickness(0, 0, 1, 1);
+        /// <summary>
+        /// Gets or sets the border thickness for form when it is running on Windows without Glass effect enabled.
+        /// </summary>
+        public Thickness BorderPlainThickness = new Thickness(1);
+        /// <summary>
+        /// Gets or sets the border colors.
+        /// </summary>
+        public BorderColors[] BorderColors = new BorderColors[1] { new BorderColors(ColorScheme.GetColor("FF6B10")) };
+        /// <summary>
+        /// Gets or sets the inactive form border colors.
+        /// </summary>
+        public BorderColors[] BorderColorsInactive = null;
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Metro/ColorTables/MetroOfficeColorTableInitializer.cs b/PROMS/DotNetBar Source Code/Metro/ColorTables/MetroOfficeColorTableInitializer.cs
new file mode 100644
index 00000000..5b3d32d4
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Metro/ColorTables/MetroOfficeColorTableInitializer.cs	
@@ -0,0 +1,2640 @@
+using System;
+using System.Text;
+using System.Drawing;
+using DevComponents.DotNetBar.Schedule;
+using DevComponents.DotNetBar.Rendering;
+using DevComponents.AdvTree.Display;
+using DevComponents.DotNetBar.Controls;
+using DevComponents.WinForms.Drawing;
+
+namespace DevComponents.DotNetBar.Metro.ColorTables
+{
+    internal static class MetroOfficeColorTableInitializer
+    {
+        public static void InitializeColorTable(Office2007ColorTable table, ColorFactory factory, MetroPartColors metroColors)
+        {
+            Color ribbonBack = factory.GetColor(metroColors.IsSolidCanvas ? metroColors.CanvasColor : metroColors.CanvasColorLight);
+
+            #region RibbonControl Start Images
+            table.RibbonControl.StartButtonDefault = BarFunctions.LoadBitmap("SystemImages.BlankOffice2010NormalSilver.png");
+            table.RibbonControl.StartButtonMouseOver = BarFunctions.LoadBitmap("SystemImages.BlankOffice2010HotSilver.png");
+            table.RibbonControl.StartButtonPressed = BarFunctions.LoadBitmap("SystemImages.BlankOffice2010PressedSilver.png");
+            #endregion
+
+            #region RibbonControl
+            table.RibbonControl.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColorLightShade));
+            table.RibbonControl.InnerBorder = null; // LinearGradientColorTable.Empty;// new LinearGradientColorTable(factory.GetColor(Color.FromArgb(32, Color.White)));
+            table.RibbonControl.TabsBackground = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor));
+            table.RibbonControl.TabsGlassBackground = new LinearGradientColorTable(Color.Transparent, factory.GetColor(metroColors.CanvasColor));
+            table.RibbonControl.TabDividerBorder = Color.Empty; // factory.GetColor(0xA7BAD1);
+            table.RibbonControl.TabDividerBorderLight = Color.Empty; // factory.GetColor(0xF4F8FD);
+            table.RibbonControl.CornerSize = 1;
+            table.RibbonControl.PanelTopBackgroundHeight = 0;
+            table.RibbonControl.PanelTopBackground = new LinearGradientColorTable(ribbonBack);
+            table.RibbonControl.PanelBottomBackground = null; // new LinearGradientColorTable(factory.GetColor(0xF6F7F8), factory.GetColor(0xE5E9EE));
+            #endregion
+
+            #region Ribbon KeyTips
+            table.KeyTips.KeyTipBackground = factory.GetColor(metroColors.TextDisabledColor);
+            table.KeyTips.KeyTipText = factory.GetColor(metroColors.CanvasColor);
+            table.KeyTips.KeyTipBorder = factory.GetColor(metroColors.TextDisabledColor);
+            #endregion
+
+            #region Item Group
+            table.ItemGroup.OuterBorder = LinearGradientColorTable.Empty; //new LinearGradientColorTable(factory.GetColor(0xC0C3C8));
+            table.ItemGroup.InnerBorder = LinearGradientColorTable.Empty;
+            table.ItemGroup.TopBackground = LinearGradientColorTable.Empty;
+            table.ItemGroup.BottomBackground = LinearGradientColorTable.Empty;
+            table.ItemGroup.ItemGroupDividerDark = Color.Empty;
+            table.ItemGroup.ItemGroupDividerLight = Color.Empty;
+            #endregion
+
+            #region RibbonBar
+            table.RibbonBar.Default = GetRibbonBar(factory, metroColors, ribbonBack);
+            table.RibbonBar.MouseOver = GetRibbonBarMouseOver(factory, metroColors, ribbonBack);
+            table.RibbonBar.Expanded = GetRibbonBarExpanded(factory, metroColors, ribbonBack);
+            #endregion
+
+            #region ButtonItem Colors Initialization
+            table.RibbonButtonItemColors.Clear();
+            table.ButtonItemColors.Clear();
+            table.MenuButtonItemColors.Clear();
+            // Orange
+            Office2007ButtonItemColorTable cb = GetButtonItemDefault(factory, metroColors);
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Orange);
+            table.ButtonItemColors.Add(cb);
+            // Orange with background
+            cb = GetButtonItemDefaultWithBackground(factory, metroColors);
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.OrangeWithBackground);
+            table.ButtonItemColors.Add(cb);
+            // Blue
+            cb = GetButtonItemBlue(factory, metroColors);
+            cb.MouseOverSplitInactive = new Office2007ButtonItemStateColorTable();
+            cb.MouseOverSplitInactive.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xB1BAC4));
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Blue);
+            table.ButtonItemColors.Add(cb);
+            // Blue with background
+            cb = GetButtonItemBlueWithBackground(factory, metroColors);
+            cb.MouseOverSplitInactive = new Office2007ButtonItemStateColorTable();
+            cb.MouseOverSplitInactive.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xB1BAC4));
+            cb.MouseOverSplitInactive = cb.Default;
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.BlueWithBackground);
+            table.ButtonItemColors.Add(cb);
+            // Magenta
+            cb = GetButtonItemMagenta(factory, metroColors);
+            cb.MouseOverSplitInactive = new Office2007ButtonItemStateColorTable();
+            cb.MouseOverSplitInactive.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xB1BAC4));
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Magenta);
+            table.ButtonItemColors.Add(cb);
+            // Blue with background
+            cb = GetButtonItemMagentaWithBackground(factory, metroColors);
+            cb.MouseOverSplitInactive = new Office2007ButtonItemStateColorTable();
+            cb.MouseOverSplitInactive.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xB1BAC4));
+            cb.MouseOverSplitInactive = cb.Default;
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.MagentaWithBackground);
+            table.ButtonItemColors.Add(cb);
+
+            cb = Office2010BlueFactory.GetButtonItemOffice2007WithBackground(factory);
+            cb.MouseOverSplitInactive = new Office2007ButtonItemStateColorTable();
+            cb.MouseOverSplitInactive.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xB1BAC4));
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Office2007WithBackground);
+            table.ButtonItemColors.Add(cb);
+
+            table.ButtonItemColors.Add(CreateBlueOrbColorTable(factory, metroColors));
+
+            table.BackstageButtonItemColors.Clear();
+            table.BackstageButtonItemColors.Add(GetButtonItemBackstageDefault(factory, metroColors));
+
+            table.ContextualTables.Add(Office2007ColorTable.GetContextualKey(typeof(Office2007ButtonItemColorTable), "StatusBar"), GetButtonItemStatusBar(factory, metroColors));
+            #endregion
+
+            #region RibbonTabItem Colors Initialization
+            table.RibbonTabItemColors.Clear();
+            Office2007RibbonTabItemColorTable rt = GetRibbonTabItemBlueDefault(factory, metroColors, ribbonBack);
+            rt.Name = Enum.GetName(typeof(eRibbonTabColor), eRibbonTabColor.Default);
+            table.RibbonTabItemColors.Add(rt);
+
+            // Magenta
+            rt = GetRibbonTabItemBlueDefault(factory, metroColors, ribbonBack); 
+            //rt.CornerSize = 2;
+            rt.Name = Enum.GetName(typeof(eRibbonTabColor), eRibbonTabColor.Magenta);
+            table.RibbonTabItemColors.Add(rt);
+
+            // Green
+            rt = GetRibbonTabItemBlueDefault(factory, metroColors, ribbonBack); //GetRibbonTabItemBlueGreen(factory);
+            //rt.CornerSize = 2;
+            rt.Name = Enum.GetName(typeof(eRibbonTabColor), eRibbonTabColor.Green);
+            table.RibbonTabItemColors.Add(rt);
+
+            // Orange
+            rt = GetRibbonTabItemBlueDefault(factory, metroColors, ribbonBack); //GetRibbonTabItemBlueOrange(factory);
+            //rt.CornerSize = 2;
+            rt.Name = Enum.GetName(typeof(eRibbonTabColor), eRibbonTabColor.Orange);
+            table.RibbonTabItemColors.Add(rt);
+            #endregion
+
+            #region RibbonTabItemGroup Colors Initialization
+            table.RibbonTabGroupColors.Clear();
+            // Default
+            Office2007RibbonTabGroupColorTable tg = GetRibbonTabGroupDefault(factory);
+            tg.Name = Enum.GetName(typeof(eRibbonTabGroupColor), eRibbonTabGroupColor.Default);
+            table.RibbonTabGroupColors.Add(tg);
+
+            // Magenta
+            tg = GetRibbonTabGroupMagenta(factory);
+            tg.Name = Enum.GetName(typeof(eRibbonTabGroupColor), eRibbonTabGroupColor.Magenta);
+            table.RibbonTabGroupColors.Add(tg);
+
+            // Green
+            tg = GetRibbonTabGroupGreen(factory);
+            tg.Name = Enum.GetName(typeof(eRibbonTabGroupColor), eRibbonTabGroupColor.Green);
+            table.RibbonTabGroupColors.Add(tg);
+
+            // Orange
+            tg = GetRibbonTabGroupOrange(factory);
+            tg.Name = Enum.GetName(typeof(eRibbonTabGroupColor), eRibbonTabGroupColor.Orange);
+            table.RibbonTabGroupColors.Add(tg);
+            #endregion
+
+            #region Initialize Bar
+            table.Bar.ToolbarTopBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor)/*, factory.GetColor(metroColors.BaseColorDark)*/);
+            table.Bar.ToolbarBottomBackground = null; // new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            table.Bar.ToolbarBottomBorder = Color.Empty;
+            table.Bar.PopupToolbarBackground = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor), Color.Empty);
+            table.Bar.PopupToolbarBorder = factory.GetColor(metroColors.BaseColor);
+            table.Bar.StatusBarTopBorder = factory.GetColor(metroColors.BaseColor);
+            table.Bar.StatusBarTopBorderLight = factory.GetColor(metroColors.BaseColor);
+            table.Bar.StatusBarAltBackground.Clear();
+            table.Bar.StatusBarAltBackground.Add(new BackgroundColorBlend(factory.GetColor(metroColors.BaseColor), 0f));
+            table.Bar.StatusBarAltBackground.Add(new BackgroundColorBlend(factory.GetColor(metroColors.BaseColor), 1f));
+            #endregion
+
+            #region Menu
+            table.Menu.Background = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor), Color.Empty);
+            table.Menu.Border = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColorDarkShade), Color.Empty);
+            table.Menu.Side = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor), Color.Empty);
+            table.Menu.SideBorder = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor), Color.Empty);
+            table.Menu.SideBorderLight = LinearGradientColorTable.Empty;
+            table.Menu.SideUnused = LinearGradientColorTable.Empty;
+            table.Menu.FileBackgroundBlend.Clear();
+            table.Menu.FileBackgroundBlend.AddRange(new DevComponents.DotNetBar.BackgroundColorBlend[] {
+                new DevComponents.DotNetBar.BackgroundColorBlend(factory.GetColor(metroColors.CanvasColorLighterShade), 0F),
+                new DevComponents.DotNetBar.BackgroundColorBlend(factory.GetColor(metroColors.CanvasColorLighterShade), 1F)});
+            table.Menu.FileContainerBorder = factory.GetColor(metroColors.CanvasColorLightShade);
+            table.Menu.FileContainerBorderLight = Color.Transparent;
+            table.Menu.FileColumnOneBackground = factory.GetColor(metroColors.CanvasColor);
+            table.Menu.FileColumnOneBorder = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.Menu.FileColumnTwoBackground = factory.GetColor(metroColors.CanvasColor);
+            table.Menu.FileBottomContainerBackgroundBlend.Clear();
+            //table.Menu.FileBottomContainerBackgroundBlend.AddRange(new DevComponents.DotNetBar.BackgroundColorBlend[] {
+            //    new DevComponents.DotNetBar.BackgroundColorBlend(factory.GetColor(0xEBF3FC), 0F),
+            //    new DevComponents.DotNetBar.BackgroundColorBlend(factory.GetColor(0xEBF3FC), 1F)});
+            #endregion
+
+            #region ComboBox
+            table.ComboBox.Default.Background = factory.GetColor(metroColors.EditControlBackColor);
+            table.ComboBox.Default.Border = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.ComboBox.Default.ExpandBackground = new LinearGradientColorTable();
+            table.ComboBox.Default.ExpandBorderInner = new LinearGradientColorTable();
+            table.ComboBox.Default.ExpandBorderOuter = new LinearGradientColorTable();
+            table.ComboBox.Default.ExpandText = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.ComboBox.DefaultStandalone.Background = factory.GetColor(metroColors.EditControlBackColor);
+            table.ComboBox.DefaultStandalone.Border = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.ComboBox.DefaultStandalone.ExpandBackground = LinearGradientColorTable.Empty;
+            table.ComboBox.DefaultStandalone.ExpandBorderInner = LinearGradientColorTable.Empty;
+            table.ComboBox.DefaultStandalone.ExpandBorderOuter = LinearGradientColorTable.Empty;
+            table.ComboBox.DefaultStandalone.ExpandText = factory.GetColor(metroColors.TextColor);
+            table.ComboBox.MouseOver.Background = factory.GetColor(metroColors.EditControlBackColor);
+            table.ComboBox.MouseOver.Border = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.ComboBox.MouseOver.ExpandBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseButtonGradientStart), factory.GetColor(metroColors.BaseButtonGradientEnd), 90);
+            table.ComboBox.MouseOver.ExpandBorderInner = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDarker));
+            table.ComboBox.MouseOver.ExpandBorderOuter = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor), Color.Empty, 90);
+            table.ComboBox.MouseOver.ExpandText = factory.GetColor(metroColors.TextColor);
+            table.ComboBox.DroppedDown.Background = factory.GetColor(metroColors.EditControlBackColor);
+            table.ComboBox.DroppedDown.Border = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.ComboBox.DroppedDown.ExpandBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight), factory.GetColor(metroColors.BaseColorDark), 90);
+            table.ComboBox.DroppedDown.ExpandBorderInner = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDarker));
+            table.ComboBox.DroppedDown.ExpandBorderOuter = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor), Color.Empty, 90);
+            table.ComboBox.DroppedDown.ExpandText = factory.GetColor(metroColors.TextColor);
+            #endregion
+
+            #region Dialog Launcher
+            table.DialogLauncher.Default.DialogLauncher = factory.GetColor(metroColors.TextInactiveColor);
+            table.DialogLauncher.Default.DialogLauncherShade = Color.Empty; // factory.GetColor(64, 0xFFFFFF);
+
+            table.DialogLauncher.MouseOver.DialogLauncher = factory.GetColor(metroColors.BaseColor);
+            table.DialogLauncher.MouseOver.DialogLauncherShade = Color.Empty; // Color.FromArgb(128, factory.GetColor(0xFFFFFF));
+            table.DialogLauncher.MouseOver.TopBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLightest));
+            table.DialogLauncher.MouseOver.BottomBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLightest));
+            table.DialogLauncher.MouseOver.InnerBorder = LinearGradientColorTable.Empty;// new LinearGradientColorTable(factory.GetColor(Color.FromArgb(128, Color.White)));
+            table.DialogLauncher.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLightest), Color.Empty);
+
+            table.DialogLauncher.Pressed.DialogLauncher = factory.GetColor(metroColors.BaseColor);
+            table.DialogLauncher.Pressed.DialogLauncherShade = Color.Empty; // Color.FromArgb(48, factory.GetColor(0xFFFFFF));
+            table.DialogLauncher.Pressed.TopBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight));
+            table.DialogLauncher.Pressed.BottomBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight));
+            table.DialogLauncher.Pressed.InnerBorder = LinearGradientColorTable.Empty;//new LinearGradientColorTable(factory.GetColor(Color.FromArgb(48, Color.White)));
+            table.DialogLauncher.Pressed.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight), Color.Empty);
+            #endregion
+
+            #region System Button, Form
+            // Default state no background
+            table.SystemButton.Default = new Office2007SystemButtonStateColorTable();
+            table.SystemButton.Default.Foreground = new LinearGradientColorTable(factory.GetColor(metroColors.TextInactiveColor));
+            table.SystemButton.Default.LightShade = Color.Empty;
+            table.SystemButton.Default.DarkShade = Color.Empty;
+
+            // Mouse over state
+            table.SystemButton.MouseOver = new Office2007SystemButtonStateColorTable();
+            table.SystemButton.MouseOver.Foreground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            table.SystemButton.MouseOver.LightShade = Color.Empty;
+            table.SystemButton.MouseOver.DarkShade = Color.Empty;
+            table.SystemButton.MouseOver.TopBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLightest));
+            table.SystemButton.MouseOver.BottomBackground = null;
+            table.SystemButton.MouseOver.TopHighlight = null; // new LinearGradientColorTable(factory.GetColor(0xFBFCFF), Color.Transparent);
+            table.SystemButton.MouseOver.BottomHighlight = null; // new LinearGradientColorTable(factory.GetColor(0xFBFCFF), Color.Transparent);
+            table.SystemButton.MouseOver.OuterBorder = null;
+            table.SystemButton.MouseOver.InnerBorder = null;
+
+            // Pressed
+            table.SystemButton.Pressed = new Office2007SystemButtonStateColorTable();
+            table.SystemButton.Pressed.Foreground = new LinearGradientColorTable(factory.GetColor(metroColors.TextColor));
+            table.SystemButton.Pressed.LightShade = Color.Empty;
+            table.SystemButton.Pressed.DarkShade = Color.Empty;
+            table.SystemButton.Pressed.TopBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight));
+            table.SystemButton.Pressed.TopHighlight = null;
+            table.SystemButton.Pressed.BottomBackground = null;
+            table.SystemButton.Pressed.BottomHighlight = null;
+            table.SystemButton.Pressed.OuterBorder = null;
+            table.SystemButton.Pressed.InnerBorder = null;
+
+            // CLOSE Default state no background
+            table.SystemButtonClose = new Office2007SystemButtonColorTable();
+            table.SystemButtonClose.Default = new Office2007SystemButtonStateColorTable();
+            table.SystemButtonClose.Default.Foreground = new LinearGradientColorTable(factory.GetColor(metroColors.TextInactiveColor));
+            table.SystemButtonClose.Default.LightShade = Color.Empty;
+            table.SystemButtonClose.Default.DarkShade = Color.Empty;
+
+            // Mouse over state
+            table.SystemButtonClose.MouseOver = new Office2007SystemButtonStateColorTable();
+            table.SystemButtonClose.MouseOver.Foreground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            table.SystemButtonClose.MouseOver.LightShade = Color.Empty;
+            table.SystemButtonClose.MouseOver.DarkShade = Color.Empty;
+            table.SystemButtonClose.MouseOver.TopBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLightest));
+            table.SystemButtonClose.MouseOver.BottomBackground = null;
+            table.SystemButtonClose.MouseOver.TopHighlight = null; // new LinearGradientColorTable(factory.GetColor(0xFBFCFF), Color.Transparent);
+            table.SystemButtonClose.MouseOver.BottomHighlight = null; // new LinearGradientColorTable(factory.GetColor(0xFBFCFF), Color.Transparent);
+            table.SystemButtonClose.MouseOver.OuterBorder = null;
+            table.SystemButtonClose.MouseOver.InnerBorder = null;
+
+            // Pressed
+            table.SystemButtonClose.Pressed = new Office2007SystemButtonStateColorTable();
+            table.SystemButtonClose.Pressed.Foreground = new LinearGradientColorTable(factory.GetColor(metroColors.TextColor));
+            table.SystemButtonClose.Pressed.LightShade = Color.Empty;
+            table.SystemButtonClose.Pressed.DarkShade = Color.Empty;
+            table.SystemButtonClose.Pressed.TopBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight)); ;
+            table.SystemButtonClose.Pressed.TopHighlight = null;
+            table.SystemButtonClose.Pressed.BottomBackground = null;
+            table.SystemButtonClose.Pressed.BottomHighlight = null;
+            table.SystemButtonClose.Pressed.OuterBorder = null;
+            table.SystemButtonClose.Pressed.InnerBorder = null;
+
+            // Form border
+            table.Form.Active.BorderColors = new Color[] {
+                factory.GetColor(metroColors.BaseColor),
+                factory.GetColor(metroColors.CanvasColor),
+                factory.GetColor(metroColors.CanvasColor),
+                factory.GetColor(metroColors.CanvasColor),
+                factory.GetColor(metroColors.CanvasColor)
+            };
+
+            table.Form.Inactive.BorderColors = new Color[] {
+                factory.GetColor(metroColors.BaseColor),
+                factory.GetColor(metroColors.CanvasColor),
+                factory.GetColor(metroColors.CanvasColor),
+                factory.GetColor(metroColors.CanvasColor),
+                factory.GetColor(metroColors.CanvasColor)
+            };
+
+            // Form Caption Active
+            table.Form.Active.CaptionTopBackground = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor));
+            table.Form.Active.CaptionBottomBackground = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor));
+            table.Form.Active.CaptionBottomBorder = null;
+            table.Form.Active.CaptionText = factory.GetColor(metroColors.TextLightColor);
+            table.Form.Active.CaptionTextExtra = factory.GetColor(metroColors.TextInactiveColor);
+
+            // Form Caption Inactive
+            table.Form.Inactive.CaptionTopBackground = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor));
+            table.Form.Inactive.CaptionBottomBackground = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor));
+            table.Form.Inactive.CaptionText = factory.GetColor(metroColors.CanvasColorLightShade);
+            table.Form.Inactive.CaptionTextExtra = factory.GetColor(metroColors.CanvasColorLighterShade);
+
+            table.Form.BackColor = factory.GetColor(metroColors.CanvasColor);
+            table.Form.TextColor = factory.GetColor(metroColors.TextColor);
+            table.Form.MdiClientBackgroundImage = null; // BarFunctions.LoadBitmap("SystemImages.Office2010SilverClientBackground.png");
+            #endregion
+
+            #region Quick Access Toolbar Background
+            table.QuickAccessToolbar.Active.TopBackground = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(0xDEE7F4), factory.GetColor(0xE6EEF9));
+            table.QuickAccessToolbar.Active.BottomBackground = LinearGradientColorTable.Empty; //new LinearGradientColorTable(factory.GetColor(0xDBE7F7), factory.GetColor(0xC9D9EE));
+            table.QuickAccessToolbar.Active.OutterBorderColor = Color.Empty; // factory.GetColor(0xF6F9FC);
+            table.QuickAccessToolbar.Active.MiddleBorderColor = Color.Empty; // factory.GetColor(0x9AB3D5);
+            table.QuickAccessToolbar.Active.InnerBorderColor = Color.Empty; //  factory.GetColor(0xD2E3F9);
+
+            table.QuickAccessToolbar.Inactive.TopBackground = LinearGradientColorTable.Empty; //new LinearGradientColorTable(factory.GetColor(0xE6ECF3), factory.GetColor(0xCED8E6));
+            table.QuickAccessToolbar.Inactive.BottomBackground = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(0xCED8E6), factory.GetColor(0xC8D3E3));
+            table.QuickAccessToolbar.Inactive.OutterBorderColor = Color.Empty; // factory.GetColor(0xF6F9FC);
+            table.QuickAccessToolbar.Inactive.MiddleBorderColor = Color.Empty; // factory.GetColor(0x9AB3D5);
+            table.QuickAccessToolbar.Inactive.InnerBorderColor = Color.Empty;
+
+            table.QuickAccessToolbar.Standalone.TopBackground = new LinearGradientColorTable();
+            table.QuickAccessToolbar.Standalone.BottomBackground = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor));
+            table.QuickAccessToolbar.Standalone.OutterBorderColor = factory.GetColor(metroColors.CanvasColorLightShade);
+            table.QuickAccessToolbar.Standalone.MiddleBorderColor = Color.Empty;
+            table.QuickAccessToolbar.Standalone.InnerBorderColor = Color.Empty; // factory.GetColor(0xDCE8F7);
+
+            table.QuickAccessToolbar.QatCustomizeMenuLabelBackground = factory.GetColor(metroColors.CanvasColorLighterShade);
+            table.QuickAccessToolbar.QatCustomizeMenuLabelText = factory.GetColor(metroColors.CanvasColorDarkShade);
+
+            table.QuickAccessToolbar.Active.GlassBorder = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(Color.FromArgb(132, Color.Black)), Color.FromArgb(80, Color.Black));
+            table.QuickAccessToolbar.Inactive.GlassBorder = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(Color.FromArgb(132, Color.Black)), Color.FromArgb(80, Color.Black));
+            #endregion
+
+            #region Tab Colors
+            table.TabControl.Default = new Office2007TabItemStateColorTable();
+            table.TabControl.Default.TopBackground = LinearGradientColorTable.Empty;
+            table.TabControl.Default.BottomBackground = LinearGradientColorTable.Empty;
+            table.TabControl.Default.InnerBorder = Color.Empty;
+            table.TabControl.Default.OuterBorder = Color.Empty;
+            table.TabControl.Default.Text = factory.GetColor(metroColors.TextInactiveColor);
+
+            table.TabControl.MouseOver = new Office2007TabItemStateColorTable();
+            table.TabControl.MouseOver.TopBackground = LinearGradientColorTable.Empty;
+            table.TabControl.MouseOver.BottomBackground = LinearGradientColorTable.Empty;
+            table.TabControl.MouseOver.InnerBorder = Color.Empty;
+            table.TabControl.MouseOver.OuterBorder = Color.Empty;
+            table.TabControl.MouseOver.Text = metroColors.BaseColor;
+
+            table.TabControl.Selected = new Office2007TabItemStateColorTable();
+            table.TabControl.Selected.TopBackground = LinearGradientColorTable.Empty;
+            table.TabControl.Selected.BottomBackground = LinearGradientColorTable.Empty;
+            table.TabControl.Selected.InnerBorder = Color.Empty;
+            table.TabControl.Selected.OuterBorder = metroColors.CanvasColorLightShade;
+            table.TabControl.Selected.Text = metroColors.BaseColor;
+
+            table.TabControl.TabBackground = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor));
+            table.TabControl.TabPanelBackground = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor), Color.Empty);
+            table.TabControl.TabPanelBorder = metroColors.CanvasColorLightShade;
+            #endregion
+
+            #region CheckBoxItem
+            table.CheckBoxItem = GetCheckBoxItem(factory, metroColors);
+
+            Office2007CheckBoxColorTable chk = GetCheckBoxItem(factory, metroColors);
+            chk.Default.Text = factory.GetColor(metroColors.BaseTextColor);
+            chk.MouseOver.Text = factory.GetColor(metroColors.BaseTextColor);
+            chk.Pressed.Text = factory.GetColor(metroColors.BaseTextColor);
+            table.ContextualTables.Add(Office2007ColorTable.GetContextualKey(typeof(Office2007CheckBoxColorTable), typeof(Bar)) + "+StatusBar", chk);
+            table.ContextualTables.Add(Office2007ColorTable.GetContextualKey(typeof(Office2007CheckBoxColorTable), typeof(MetroStatusBar)), chk);
+            #endregion
+
+            #region Scroll Bar Colors
+            InitializeScrollBarColorTable(table, factory, metroColors);
+            InitializeAppBlueScrollBarColorTable(table, factory, metroColors);
+            #endregion
+
+            #region ProgressBarItem
+            Office2007ProgressBarColorTable pct = table.ProgressBarItem;
+            pct.BackgroundColors = new GradientColorTable(metroColors.CanvasColor);
+            pct.OuterBorder = factory.GetColor(metroColors.BaseColorDarker);
+            pct.InnerBorder = Color.Empty;
+            pct.Chunk = new GradientColorTable(metroColors.BaseColor);
+            pct.ChunkOverlay = new GradientColorTable();
+            //pct.ChunkOverlay.LinearGradientAngle = 90;
+            //pct.ChunkOverlay.Colors.AddRange(new BackgroundColorBlend[] {
+            //    new BackgroundColorBlend(Color.FromArgb(192, factory.GetColor(metroColors.BaseColorLight)), 0f),
+            //    new BackgroundColorBlend(Color.FromArgb(128, factory.GetColor(metroColors.BaseColor)), .5f),
+            //    new BackgroundColorBlend(Color.FromArgb(64, factory.GetColor(metroColors.BaseColor)), .5f),
+            //    new BackgroundColorBlend(Color.Transparent, 1f),
+            //});
+            //pct.ChunkShadow = new GradientColorTable(0xB2B9C8, 0xD5DAE5, 0);
+            pct.ChunkShadow = new GradientColorTable();
+
+            // Paused State
+            pct = table.ProgressBarItemPaused;
+            pct.BackgroundColors = new GradientColorTable(0xEBEDF0, 0xD5D8DC);
+            pct.OuterBorder = factory.GetColor(0x868B91);
+            pct.InnerBorder = factory.GetColor(0xFFFFFF);
+            pct.Chunk = new GradientColorTable(0xAEA700, 0xFFFDCD, 0);
+            pct.ChunkOverlay = new GradientColorTable();
+            pct.ChunkOverlay.LinearGradientAngle = 90;
+            pct.ChunkOverlay.Colors.AddRange(new BackgroundColorBlend[] {
+                new BackgroundColorBlend(Color.FromArgb(192, factory.GetColor(0xFFFBA3)), 0f),
+                new BackgroundColorBlend(Color.FromArgb(128, factory.GetColor(0xD2CA00)), .5f),
+                new BackgroundColorBlend(Color.FromArgb(64, factory.GetColor(0xFEF400)), .5f),
+                new BackgroundColorBlend(Color.Transparent, 1f),
+            });
+            pct.ChunkShadow = new GradientColorTable(0xB2B9C8, 0xD5DAE5, 0);
+
+            // Error State
+            pct = table.ProgressBarItemError;
+            pct.BackgroundColors = new GradientColorTable(0xEBEDF0, 0xD5D8DC);
+            pct.OuterBorder = factory.GetColor(0x868B91);
+            pct.InnerBorder = factory.GetColor(0xFFFFFF);
+            pct.Chunk = new GradientColorTable(0xD20000, 0xFFCDCD, 0);
+            pct.ChunkOverlay = new GradientColorTable();
+            pct.ChunkOverlay.LinearGradientAngle = 90;
+            pct.ChunkOverlay.Colors.AddRange(new BackgroundColorBlend[] {
+                new BackgroundColorBlend(Color.FromArgb(192, factory.GetColor(0xFF8F8F)), 0f),
+                new BackgroundColorBlend(Color.FromArgb(128, factory.GetColor(0xD20000)), .5f),
+                new BackgroundColorBlend(Color.FromArgb(64, factory.GetColor(0xFE0000)), .5f),
+                new BackgroundColorBlend(Color.Transparent, 1f),
+            });
+            pct.ChunkShadow = new GradientColorTable(0xB2B9C8, 0xD5DAE5, 0);
+            #endregion
+
+            #region Gallery
+            Office2007GalleryColorTable gallery = table.Gallery;
+            gallery.GroupLabelBackground = factory.GetColor(metroColors.CanvasColorLighterShade);
+            gallery.GroupLabelText = factory.GetColor(metroColors.CanvasColorDarkShade);
+            gallery.GroupLabelBorder = Color.Empty;
+            #endregion
+
+            #region Legacy Colors
+            table.LegacyColors.BarBackground = factory.GetColor(metroColors.CanvasColor);
+            table.LegacyColors.BarBackground2 = Color.Empty;
+            table.LegacyColors.BarStripeColor = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.LegacyColors.BarCaptionBackground = factory.GetColor(metroColors.CanvasColor);
+            table.LegacyColors.BarCaptionBackground2 = Color.Empty;
+            table.LegacyColors.BarCaptionInactiveBackground = factory.GetColor(metroColors.CanvasColor);
+            table.LegacyColors.BarCaptionInactiveBackground2 = Color.Empty;
+            table.LegacyColors.BarCaptionInactiveText = factory.GetColor(metroColors.TextDisabledColor);
+            table.LegacyColors.BarCaptionText = factory.GetColor(metroColors.TextInactiveColor);
+            table.LegacyColors.BarFloatingBorder = factory.GetColor(metroColors.BaseColor);
+            table.LegacyColors.BarPopupBackground = factory.GetColor(metroColors.CanvasColor);
+            table.LegacyColors.BarPopupBorder = factory.GetColor(metroColors.BaseColor);
+            table.LegacyColors.ItemBackground = Color.Empty;
+            table.LegacyColors.ItemBackground2 = Color.Empty;
+            table.LegacyColors.ItemCheckedBackground = Color.Empty;
+            table.LegacyColors.ItemCheckedBackground2 = Color.Empty;
+            table.LegacyColors.ItemCheckedBorder = factory.GetColor(metroColors.BaseColor);
+            table.LegacyColors.ItemCheckedText = factory.GetColor(metroColors.TextColor);
+            table.LegacyColors.ItemDisabledBackground = Color.Empty;
+            table.LegacyColors.ItemDisabledText = factory.GetColor(metroColors.TextDisabledColor);
+            table.LegacyColors.ItemExpandedShadow = Color.Empty;
+            table.LegacyColors.ItemExpandedBackground = factory.GetColor(metroColors.CanvasColor);
+            table.LegacyColors.ItemExpandedBackground2 = Color.Empty;
+            table.LegacyColors.ItemExpandedText = factory.GetColor(metroColors.TextColor);
+            table.LegacyColors.ItemExpandedBorder = Color.Empty;
+            table.LegacyColors.ItemHotBackground = factory.GetColor(metroColors.CanvasColorLightShade);
+            table.LegacyColors.ItemHotBackground2 = Color.Empty;
+            table.LegacyColors.ItemHotBorder = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.LegacyColors.ItemHotText = factory.GetColor(metroColors.TextColor);
+            table.LegacyColors.ItemPressedBackground = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.LegacyColors.ItemPressedBackground2 = Color.Empty;
+            table.LegacyColors.ItemPressedBorder = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.LegacyColors.ItemPressedText = factory.GetColor(metroColors.TextColor);
+            table.LegacyColors.ItemSeparator = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.LegacyColors.ItemSeparatorShade = Color.Empty;
+            table.LegacyColors.ItemText = factory.GetColor(metroColors.TextColor); // SystemColors.ControlTet;
+            table.LegacyColors.MenuBackground = factory.GetColor(metroColors.CanvasColor);
+            table.LegacyColors.MenuBackground2 = Color.Empty; // Color.White;
+            table.LegacyColors.MenuBarBackground = factory.GetColor(metroColors.CanvasColor);
+            table.LegacyColors.MenuBorder = factory.GetColor(metroColors.BaseColor);
+            table.LegacyColors.MenuSide = factory.GetColor(metroColors.CanvasColor);
+            table.LegacyColors.MenuSide2 = Color.Empty; // factory.GetColor(0xDDE0E8);
+            table.LegacyColors.MenuUnusedBackground = table.LegacyColors.MenuBackground;
+            table.LegacyColors.MenuUnusedSide = Color.Empty;
+            table.LegacyColors.MenuUnusedSide2 = Color.Empty;// System.Windows.Forms.ControlPaint.Light(table.LegacyColors.MenuSide2);
+            table.LegacyColors.ItemDesignTimeBorder = Color.Black;
+            table.LegacyColors.BarDockedBorder = Color.Empty;
+            table.LegacyColors.DockSiteBackColor = factory.GetColor(metroColors.CanvasColor);
+            table.LegacyColors.DockSiteBackColor2 = Color.Empty;
+            table.LegacyColors.CustomizeBackground = Color.Empty;
+            table.LegacyColors.CustomizeBackground2 = Color.Empty;
+            table.LegacyColors.CustomizeText = factory.GetColor(metroColors.TextInactiveColor);
+            table.LegacyColors.PanelBackground = factory.GetColor(metroColors.CanvasColorLighterShade);
+            table.LegacyColors.PanelBackground2 = Color.Empty;
+            table.LegacyColors.PanelText = factory.GetColor(metroColors.TextColor);
+            table.LegacyColors.PanelBorder = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.LegacyColors.ExplorerBarBackground = factory.GetColor(metroColors.CanvasColor);
+            table.LegacyColors.ExplorerBarBackground2 = Color.Empty;
+            table.LegacyColors.SplitterBackground = table.LegacyColors.PanelBackground;
+            table.LegacyColors.SplitterBackground2 = table.LegacyColors.PanelBackground2;
+            table.LegacyColors.SplitterText = table.LegacyColors.PanelText;
+            table.LegacyColors.SplitterBorder = table.LegacyColors.PanelBorder;
+            #endregion
+
+            #region Navigation Pane
+            table.NavigationPane.ButtonBackground = new GradientColorTable();
+            table.NavigationPane.ButtonBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(metroColors.CanvasColor), 0));
+            //table.NavigationPane.ButtonBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(metroColors.CanvasColorLightShade), 1));
+            #endregion
+
+            #region SuperTooltip
+            table.SuperTooltip.BackgroundColors = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor));
+            table.SuperTooltip.TextColor = factory.GetColor(metroColors.TextColor);
+            #endregion
+
+            #region Slider
+            Office2007SliderColorTable sl = table.Slider;
+            sl.Default.LabelColor = factory.GetColor(metroColors.TextColor);
+            sl.Default.SliderLabelColor = factory.GetColor(metroColors.TextColor);
+            sl.Default.PartBackground = new GradientColorTable();
+            sl.Default.PartBorderColor = Color.Empty;
+            sl.Default.PartBorderLightColor = Color.Empty;
+            sl.Default.PartForeColor = factory.GetColor(metroColors.TextDisabledColor);
+            sl.Default.PartForeLightColor = Color.Empty;
+            sl.Default.TrackLineColor = factory.GetColor(metroColors.TextDisabledColor);
+            sl.Default.TrackLineLightColor = factory.GetColor(Color.FromArgb(48, Color.White));
+
+            sl.MouseOver.LabelColor = factory.GetColor(metroColors.TextColor);
+            sl.MouseOver.SliderLabelColor = factory.GetColor(metroColors.TextColor);
+            sl.MouseOver.PartBackground = new GradientColorTable();
+            sl.MouseOver.PartBorderColor = Color.Empty;
+            sl.MouseOver.PartBorderLightColor = Color.Empty;
+            sl.MouseOver.PartForeColor = factory.GetColor(metroColors.TextColor);
+            sl.MouseOver.PartForeLightColor = Color.Empty;
+            sl.MouseOver.TrackLineColor = factory.GetColor(metroColors.BaseColorDark);
+            sl.MouseOver.TrackLineLightColor = factory.GetColor(Color.FromArgb(48, Color.White));
+
+            sl.Pressed.LabelColor = factory.GetColor(metroColors.TextColor);
+            sl.Pressed.SliderLabelColor = factory.GetColor(metroColors.TextColor);
+            sl.Pressed.PartBackground = new GradientColorTable();
+            sl.Pressed.PartBorderColor = Color.Empty;
+            sl.Pressed.PartBorderLightColor = Color.Empty;
+            sl.Pressed.PartForeColor = factory.GetColor(metroColors.TextColor);
+            sl.Pressed.PartForeLightColor = Color.Empty;
+            sl.Pressed.TrackLineColor = factory.GetColor(metroColors.TextColor);
+            sl.Pressed.TrackLineLightColor = factory.GetColor(Color.FromArgb(48, Color.White));
+
+            ColorBlendFactory df = new ColorBlendFactory(ColorScheme.GetColor(0xCFCFCF));
+            sl.Disabled.LabelColor = factory.GetColor(metroColors.TextDisabledColor);
+            sl.Disabled.SliderLabelColor = factory.GetColor(metroColors.TextDisabledColor);
+            sl.Disabled.PartBackground = new GradientColorTable();
+            sl.Disabled.PartBorderColor = df.GetColor(sl.Default.PartBorderColor);
+            sl.Disabled.PartBorderLightColor = df.GetColor(sl.Default.PartBorderLightColor);
+            sl.Disabled.PartForeColor = df.GetColor(sl.Default.PartForeColor);
+            sl.Disabled.PartForeLightColor = df.GetColor(sl.Default.PartForeLightColor);
+            sl.Disabled.TrackLineColor = df.GetColor(sl.Default.TrackLineColor);
+            sl.Disabled.TrackLineLightColor = df.GetColor(sl.Default.TrackLineLightColor);
+
+            sl.TrackPart = new Office2007SliderPartColorTable();
+            sl.TrackPart.Default.LabelColor = factory.GetColor(metroColors.TextDisabledColor);
+            sl.TrackPart.Default.SliderLabelColor = factory.GetColor(metroColors.TextColor);
+            sl.TrackPart.Default.PartBackground = new GradientColorTable(factory.GetColor(metroColors.TextDisabledColor));
+            sl.TrackPart.Default.PartBorderColor = factory.GetColor(metroColors.TextDisabledColor);
+            sl.TrackPart.Default.PartBorderLightColor = Color.Empty;
+            sl.TrackPart.Default.PartForeColor = factory.GetColor(metroColors.TextDisabledColor);
+            sl.TrackPart.Default.PartForeLightColor = factory.GetColor(metroColors.TextDisabledColor);
+            sl.TrackPart.Default.TrackLineColor = factory.GetColor(metroColors.TextDisabledColor);
+            sl.TrackPart.Default.TrackLineLightColor = factory.GetColor(Color.FromArgb(48, Color.White));
+            sl.TrackPart.MouseOver.LabelColor = factory.GetColor(metroColors.TextColor);
+            sl.TrackPart.MouseOver.SliderLabelColor = factory.GetColor(metroColors.TextColor);
+            sl.TrackPart.MouseOver.PartBackground = new GradientColorTable(factory.GetColor(metroColors.TextColor));
+            sl.TrackPart.MouseOver.PartBorderColor = factory.GetColor(metroColors.TextColor);
+            sl.TrackPart.MouseOver.PartBorderLightColor = Color.Empty;
+            sl.TrackPart.MouseOver.PartForeColor = factory.GetColor(metroColors.TextColor);
+            sl.TrackPart.MouseOver.PartForeLightColor = factory.GetColor(metroColors.TextColor);
+            sl.TrackPart.MouseOver.TrackLineColor = factory.GetColor(metroColors.TextDisabledColor);
+            sl.TrackPart.MouseOver.TrackLineLightColor = factory.GetColor(Color.FromArgb(48, Color.White));
+            sl.TrackPart.Pressed = sl.TrackPart.MouseOver;
+
+            // Contextual Table when on StatusBar
+            sl = new Office2007SliderColorTable();
+            sl.Default.LabelColor = factory.GetColor(metroColors.TextColor);
+            sl.Default.SliderLabelColor = factory.GetColor(metroColors.TextColor);
+            sl.Default.PartBackground = new GradientColorTable();
+            sl.Default.PartBorderColor = Color.Empty;
+            sl.Default.PartBorderLightColor = Color.Empty;
+            sl.Default.PartForeColor = factory.GetColor(metroColors.CanvasColor);
+            sl.Default.PartForeLightColor = factory.GetColor(metroColors.BaseColorDark);
+            sl.Default.TrackLineColor = factory.GetColor(metroColors.BaseColorDark);
+            sl.Default.TrackLineLightColor = factory.GetColor(Color.FromArgb(48, Color.White));
+
+            sl.MouseOver.LabelColor = factory.GetColor(metroColors.TextColor);
+            sl.MouseOver.SliderLabelColor = factory.GetColor(metroColors.TextColor);
+            sl.MouseOver.PartBackground = new GradientColorTable();
+            sl.MouseOver.PartBorderColor = Color.Empty;
+            sl.MouseOver.PartBorderLightColor = Color.Empty;
+            sl.MouseOver.PartForeColor = factory.GetColor(metroColors.CanvasColor);
+            sl.MouseOver.PartForeLightColor = factory.GetColor(metroColors.BaseColorDark);
+            sl.MouseOver.TrackLineColor = factory.GetColor(metroColors.BaseColorDark);
+            sl.MouseOver.TrackLineLightColor = factory.GetColor(Color.FromArgb(48, Color.White));
+
+            sl.Pressed.LabelColor = factory.GetColor(metroColors.TextColor);
+            sl.Pressed.SliderLabelColor = factory.GetColor(metroColors.TextColor);
+            sl.Pressed.PartBackground = new GradientColorTable();
+            sl.Pressed.PartBorderColor = Color.Empty;
+            sl.Pressed.PartBorderLightColor = Color.Empty;
+            sl.Pressed.PartForeColor = factory.GetColor(metroColors.CanvasColorLighterShade);
+            sl.Pressed.PartForeLightColor = factory.GetColor(metroColors.BaseColorDark);
+            sl.Pressed.TrackLineColor = factory.GetColor(metroColors.CanvasColorDarkShade);
+            sl.Pressed.TrackLineLightColor = factory.GetColor(Color.FromArgb(48, Color.White));
+
+            df = new ColorBlendFactory(ColorScheme.GetColor(0xCFCFCF));
+            sl.Disabled.LabelColor = factory.GetColor(metroColors.TextDisabledColor);
+            sl.Disabled.SliderLabelColor = factory.GetColor(metroColors.TextDisabledColor);
+            sl.Disabled.PartBackground = new GradientColorTable();
+            foreach (BackgroundColorBlend b in sl.Default.PartBackground.Colors)
+                sl.Disabled.PartBackground.Colors.Add(new BackgroundColorBlend(df.GetColor(b.Color), b.Position));
+            sl.Disabled.PartBorderColor = df.GetColor(sl.Default.PartBorderColor);
+            sl.Disabled.PartBorderLightColor = df.GetColor(sl.Default.PartBorderLightColor);
+            sl.Disabled.PartForeColor = df.GetColor(sl.Default.PartForeColor);
+            sl.Disabled.PartForeLightColor = df.GetColor(sl.Default.PartForeLightColor);
+            sl.Disabled.TrackLineColor = df.GetColor(sl.Default.TrackLineColor);
+            sl.Disabled.TrackLineLightColor = df.GetColor(sl.Default.TrackLineLightColor);
+            
+            sl.TrackPart = new Office2007SliderPartColorTable();
+            sl.TrackPart.Default.LabelColor = factory.GetColor(metroColors.BaseTextColor);
+            sl.TrackPart.Default.SliderLabelColor = factory.GetColor(metroColors.TextColor);
+            sl.TrackPart.Default.PartBackground = new GradientColorTable(factory.GetColor(metroColors.CanvasColor));
+            sl.TrackPart.Default.PartBorderColor = factory.GetColor(metroColors.BaseColorDarker);
+            sl.TrackPart.Default.PartBorderLightColor = Color.Empty;
+            sl.TrackPart.Default.PartForeColor = factory.GetColor(metroColors.CanvasColor);
+            sl.TrackPart.Default.PartForeLightColor = factory.GetColor(metroColors.CanvasColor);
+            sl.TrackPart.Default.TrackLineColor = factory.GetColor(metroColors.BaseColorDark);
+            sl.TrackPart.Default.TrackLineLightColor = factory.GetColor(Color.FromArgb(48, Color.White));
+            sl.TrackPart.MouseOver = sl.TrackPart.Default;
+            sl.TrackPart.Pressed = sl.TrackPart.Default;
+
+            table.ContextualTables.Add(Office2007ColorTable.GetContextualKey(typeof(Office2007SliderColorTable), typeof(Bar)) + "+StatusBar", sl);
+            table.ContextualTables.Add(Office2007ColorTable.GetContextualKey(typeof(Office2007SliderColorTable), typeof(MetroStatusBar)), sl);
+            #endregion
+
+            #region RangeSlider
+            MetroOfficeColorTableInitializer.InitRangeSlider(table, factory, metroColors);
+            #endregion
+
+            #region ListViewEx
+            table.ListViewEx.Border = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.ListViewEx.ColumnBackground = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColorLightShade));
+            table.ListViewEx.ColumnSeparator = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.ListViewEx.ColumnForeColor = factory.GetColor(metroColors.TextColor);
+            table.ListViewEx.SelectionBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor), Color.Empty);
+            table.ListViewEx.SelectionBorder = Color.Empty;
+            table.ListViewEx.SelectionForeColor = factory.GetColor(metroColors.BaseTextColor);
+            #endregion
+
+            #region DataGridView
+            table.DataGridView.BackgroundColor = factory.GetColor(metroColors.CanvasColor);
+            table.DataGridView.DefaultCellBackground = factory.GetColor(metroColors.CanvasColor);
+            table.DataGridView.DefaultCellText = factory.GetColor(metroColors.TextColor);
+            table.DataGridView.ColumnHeaderNormalBorder = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.DataGridView.ColumnHeaderNormalBackground = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColorLightShade));
+            table.DataGridView.ColumnHeaderNormalText = factory.GetColor(metroColors.TextColor);
+            table.DataGridView.ColumnHeaderSelectedBackground = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColorLighterShade));
+            table.DataGridView.ColumnHeaderSelectedText = factory.GetColor(metroColors.TextColor);
+            table.DataGridView.ColumnHeaderSelectedBorder = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.DataGridView.ColumnHeaderSelectedMouseOverBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            table.DataGridView.ColumnHeaderSelectedMouseOverBorder = factory.GetColor(metroColors.BaseColorDark);
+            table.DataGridView.ColumnHeaderMouseOverBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            table.DataGridView.ColumnHeaderMouseOverBorder = factory.GetColor(metroColors.BaseColorDark);
+            table.DataGridView.ColumnHeaderPressedBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            table.DataGridView.ColumnHeaderPressedBorder = factory.GetColor(metroColors.BaseColorDark);
+
+            table.DataGridView.RowNormalBackground = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColorLightShade));
+            table.DataGridView.RowNormalBorder = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.DataGridView.RowSelectedBackground = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColorLighterShade));
+            table.DataGridView.RowSelectedBorder = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.DataGridView.RowSelectedMouseOverBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            table.DataGridView.RowSelectedMouseOverBorder = factory.GetColor(metroColors.BaseColorDark);
+            table.DataGridView.RowMouseOverBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            table.DataGridView.RowMouseOverBorder = factory.GetColor(metroColors.BaseColorDark);
+            table.DataGridView.RowPressedBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            table.DataGridView.RowPressedBorder = factory.GetColor(metroColors.BaseColorDark);
+
+            table.DataGridView.GridColor = factory.GetColor(metroColors.CanvasColorDarkShade);
+
+            table.DataGridView.SelectorBackground = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColorLightShade));
+            table.DataGridView.SelectorBorder = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.DataGridView.SelectorBorderDark = Color.Empty;// factory.GetColor(0xC3C3C3);
+            table.DataGridView.SelectorBorderLight = Color.Empty;// factory.GetColor(0xF9F9F9);
+            table.DataGridView.SelectorSign = new LinearGradientColorTable(factory.GetColor(metroColors.TextColor));
+
+            table.DataGridView.SelectorMouseOverBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            table.DataGridView.SelectorMouseOverBorder = factory.GetColor(metroColors.BaseColorDark);
+            table.DataGridView.SelectorMouseOverBorderDark = Color.Empty;// factory.GetColor(0xB0CFF7);
+            table.DataGridView.SelectorMouseOverBorderLight = Color.Empty; // factory.GetColor(0xD5E4F2);
+            table.DataGridView.SelectorMouseOverSign = new LinearGradientColorTable(factory.GetColor(metroColors.TextColor));
+            #endregion
+
+            #region SideBar
+            table.SideBar.Background = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor));
+            table.SideBar.Border = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.SideBar.SideBarPanelItemText = factory.GetColor(metroColors.TextColor);
+            table.SideBar.SideBarPanelItemDefault = new GradientColorTable();
+            table.SideBar.SideBarPanelItemDefault.Colors.Add(new BackgroundColorBlend(factory.GetColor(metroColors.CanvasColor), 0));
+            table.SideBar.SideBarPanelItemDefault.Colors.Add(new BackgroundColorBlend(factory.GetColor(metroColors.CanvasColor), 1));
+            // Expanded
+            table.SideBar.SideBarPanelItemExpanded = new GradientColorTable();
+            table.SideBar.SideBarPanelItemExpanded.Colors.Add(new BackgroundColorBlend(factory.GetColor(metroColors.BaseColor), 0));
+            table.SideBar.SideBarPanelItemExpanded.Colors.Add(new BackgroundColorBlend(factory.GetColor(metroColors.BaseColor), 1));
+            // MouseOver
+            table.SideBar.SideBarPanelItemMouseOver = new GradientColorTable();
+            table.SideBar.SideBarPanelItemMouseOver.Colors.Add(new BackgroundColorBlend(factory.GetColor(metroColors.BaseColor), 0));
+            table.SideBar.SideBarPanelItemMouseOver.Colors.Add(new BackgroundColorBlend(factory.GetColor(metroColors.BaseColorDark), 1));
+            // Pressed
+            table.SideBar.SideBarPanelItemPressed = new GradientColorTable();
+            table.SideBar.SideBarPanelItemPressed.Colors.Add(new BackgroundColorBlend(factory.GetColor(metroColors.BaseColorDark), 0));
+            table.SideBar.SideBarPanelItemPressed.Colors.Add(new BackgroundColorBlend(factory.GetColor(metroColors.BaseColorDark), 1));
+            #endregion
+
+            #region AdvTree
+#if !NOTREE
+            table.AdvTree = new DevComponents.AdvTree.Display.TreeColorTable();
+            CreateAdvTreeColorTable(table.AdvTree, factory, metroColors);
+#endif
+            #endregion
+
+            #region CrumbBar
+            table.CrumbBarItemView = new CrumbBarItemViewColorTable();
+            CrumbBarItemViewStateColorTable crumbBarViewTable = new CrumbBarItemViewStateColorTable();
+            table.CrumbBarItemView.Default = crumbBarViewTable;
+            crumbBarViewTable.Foreground = factory.GetColor(metroColors.TextColor);
+            crumbBarViewTable = new CrumbBarItemViewStateColorTable();
+            table.CrumbBarItemView.MouseOver = crumbBarViewTable;
+            crumbBarViewTable.Foreground = factory.GetColor(metroColors.BaseTextColor);
+            crumbBarViewTable.Background = new BackgroundColorBlendCollection();
+            crumbBarViewTable.Background.AddRange(new BackgroundColorBlend[]{
+                new BackgroundColorBlend(factory.GetColor(metroColors.BaseColor), 0f),
+                new BackgroundColorBlend(factory.GetColor(metroColors.BaseColorDark), 1f)});
+            crumbBarViewTable.Border = factory.GetColor(metroColors.BaseColorDark);
+            crumbBarViewTable.BorderLight = Color.Empty; // factory.GetColor("90FFFFFF");
+            crumbBarViewTable = new CrumbBarItemViewStateColorTable();
+            table.CrumbBarItemView.MouseOverInactive = crumbBarViewTable;
+            crumbBarViewTable.Foreground = factory.GetColor(metroColors.BaseTextColor);
+            crumbBarViewTable.Background = new BackgroundColorBlendCollection();
+            crumbBarViewTable.Background.AddRange(new BackgroundColorBlend[]{
+                new BackgroundColorBlend(factory.GetColor(metroColors.BaseColor), 0f),
+                new BackgroundColorBlend(factory.GetColor(metroColors.BaseColor), 1f)});
+            crumbBarViewTable.Border = factory.GetColor(metroColors.BaseColorDark);
+            crumbBarViewTable.BorderLight = Color.Empty; // factory.GetColor("90FFFFFF");
+            crumbBarViewTable = new CrumbBarItemViewStateColorTable();
+            table.CrumbBarItemView.Pressed = crumbBarViewTable;
+            crumbBarViewTable.Foreground = factory.GetColor(metroColors.BaseTextColor);
+            crumbBarViewTable.Background = new BackgroundColorBlendCollection();
+            crumbBarViewTable.Background.AddRange(new BackgroundColorBlend[]{
+                new BackgroundColorBlend(factory.GetColor(metroColors.BaseColorDark), 0f),
+                new BackgroundColorBlend(factory.GetColor(metroColors.BaseColorDark), 1f)});
+            crumbBarViewTable.Border = factory.GetColor(metroColors.BaseColorDark);
+            crumbBarViewTable.BorderLight = Color.Empty; // factory.GetColor("408B7654");
+
+            #endregion
+
+            #region WarningBox
+            table.WarningBox.BackColor = factory.GetColor(factory.GetColor(metroColors.CanvasColor));
+            table.WarningBox.WarningBorderColor = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.WarningBox.WarningBackColor1 = factory.GetColor(metroColors.CanvasColor);
+            table.WarningBox.WarningBackColor2 = factory.GetColor(metroColors.CanvasColor);
+            #endregion
+
+            #region CalendarView
+
+            #region WeekDayViewColors
+
+            table.CalendarView.WeekDayViewColors = new ColorDef[]
+            {
+                new ColorDef(factory.GetColor(metroColors.CanvasColorLightShade)),           // DayViewBorder
+                new ColorDef(factory.GetColor(metroColors.CanvasColorDarkShade)),           // DayHeaderForeground
+
+                new ColorDef(new Color[] {factory.GetColor(metroColors.CanvasColor)},
+                new float[] {0f}, 90f),             // DayHeaderBackground
+
+                new ColorDef(factory.GetColor(metroColors.CanvasColorLightShade)),           // DayHeaderBorder
+
+                new ColorDef(factory.GetColor(metroColors.CanvasColor)),           // DayWorkHoursBackground
+                new ColorDef(factory.GetColor(metroColors.CanvasColorLightShade)),           // DayAllDayEventBackground
+                new ColorDef(factory.GetColor(metroColors.CanvasColorLighterShade)),           // DayOffWorkHoursBackground
+
+                new ColorDef(factory.GetColor(metroColors.CanvasColorDarkShade)),           // DayHourBorder
+                new ColorDef(factory.GetColor(metroColors.CanvasColorLightShade)),           // DayHalfHourBorder
+
+                new ColorDef(factory.GetColor(metroColors.BaseColor)),           // SelectionBackground
+
+                new ColorDef(factory.GetColor(metroColors.CanvasColorLightShade)),           // OwnerTabBorder
+
+                new ColorDef(factory.GetColor(metroColors.CanvasColor)),    // OwnerTabBackground
+
+                new ColorDef(factory.GetColor(metroColors.CanvasColorDarkShade)),           // OwnerTabForeground
+                new ColorDef(factory.GetColor(metroColors.CanvasColor)),           // OwnerTabContentBackground
+                new ColorDef(factory.GetColor(metroColors.CanvasColorDarkShade)),           // OwnerTabSelectedForeground
+                new ColorDef(factory.GetColor(metroColors.CanvasColorLighterShade)),           // OwnerTabSelectionBackground
+
+                new ColorDef(factory.GetColor(metroColors.CanvasColor)),           // CondensedViewBackground
+
+                new ColorDef(factory.GetColor(metroColors.CanvasColorLightShade)),           // NowDayViewBorder
+                new ColorDef(factory.GetColor(metroColors.CanvasColorDarkShade)),           // NowDayHeaderForeground - 0x15428B
+
+                new ColorDef(factory.GetColor(metroColors.CanvasColorLighterShade)),       // NowDayHeaderBackground
+                
+                new ColorDef(new Color[] {factory.GetColor(0xFFED79), factory.GetColor(0xFFD86B), factory.GetColor(0xFFBB00), factory.GetColor(0xFFEA77)},
+                new float[] {0f, .55f ,58f, 1f}, 90f),              // TimeIndicator
+
+                new ColorDef(factory.GetColor(0xEB8900)),           // TimeIndicatorBorder
+            };
+
+            #endregion
+
+            #region HourRulerColors
+
+            table.CalendarView.TimeRulerColors = new ColorDef[]
+            {
+                new ColorDef(factory.GetColor(metroColors.CanvasColor)),           // TimeRulerBackground
+                new ColorDef(factory.GetColor(metroColors.CanvasColorDarkShade)),           // TimeRulerForeground
+                new ColorDef(factory.GetColor(metroColors.CanvasColorDarkShade)),           // TimeRulerBorder
+                new ColorDef(factory.GetColor(metroColors.CanvasColorDarkShade)),           // TimeRulerTickBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xFFED79), factory.GetColor(0xFFD86B), factory.GetColor(0xFFBB00), factory.GetColor(0xFFEA77)},
+                new float[] {0f, .55f ,58f, 1f}, 90f),              // TimeRulerIndicator
+
+                new ColorDef(factory.GetColor(0xEB8900)),           // TimeRulerIndicatorBorder
+            };
+
+            #endregion
+
+            #region MonthViewColors
+
+            table.CalendarView.MonthViewColors = new ColorDef[]
+            {
+              new ColorDef(factory.GetColor(metroColors.CanvasColorLightShade)),           // DayOfWeekHeaderBorder
+
+                new ColorDef(factory.GetColor(metroColors.CanvasColor)),                    // DayOfWeekHeaderBackground
+
+                new ColorDef(factory.GetColor(metroColors.CanvasColorDarkShade)),           // DayOfWeekHeaderForeground
+                new ColorDef(factory.GetColor(metroColors.CanvasColorLightShade)),           // SideBarBorder
+
+                new ColorDef(factory.GetColor(metroColors.CanvasColor)),                   // SideBarBackground
+
+                new ColorDef(factory.GetColor(metroColors.CanvasColorDarkShade)),           // SideBarForeground
+                new ColorDef(factory.GetColor(metroColors.CanvasColorLightShade)),           // DayHeaderBorder
+
+                new ColorDef(factory.GetColor(metroColors.CanvasColor)),                    // DayHeaderBackground
+
+                new ColorDef(factory.GetColor(metroColors.CanvasColorDarkShade)),           // DayHeaderForeground
+                new ColorDef(factory.GetColor(metroColors.CanvasColorLightShade)),           // DayContentBorder
+                new ColorDef(factory.GetColor(metroColors.BaseColor)),           // DayContentSelectionBackground
+                new ColorDef(factory.GetColor(metroColors.CanvasColor)),           // DayContentActiveDayBackground
+                new ColorDef(factory.GetColor(metroColors.CanvasColor)),           // DayContentInactiveDayBackground
+
+                new ColorDef(factory.GetColor(metroColors.CanvasColorLightShade)),           // OwnerTabBorder
+
+                new ColorDef(factory.GetColor(metroColors.CanvasColor)),
+
+                new ColorDef(factory.GetColor(metroColors.CanvasColorLightShade)),           // OwnerTabForeground
+                new ColorDef(factory.GetColor(metroColors.CanvasColor)),           // OwnerTabContentBackground
+                new ColorDef(factory.GetColor(metroColors.CanvasColorDarkShade)),           // OwnerTabSelectedForeground
+                new ColorDef(factory.GetColor(metroColors.CanvasColor)),           // OwnerTabSelectionBackground
+
+                new ColorDef(factory.GetColor(metroColors.BaseColor)),           // NowDayViewBorder
+                new ColorDef(factory.GetColor(metroColors.TextColor)),           // NowDayHeaderForeground - 0x15428B
+
+                new ColorDef(factory.GetColor(metroColors.CanvasColorLighterShade)),              // NowDayHeaderBackground
+
+                new ColorDef(factory.GetColor(metroColors.TextColor)),   // ContentLinkForeground - DayHeaderForeground
+                new ColorDef(factory.GetColor(metroColors.CanvasColorLightShade)),            // ContentLinkBackground - DayContentActiveDayBackground
+            };
+
+            #endregion
+
+            #region AppointmentColors
+
+            table.CalendarView.AppointmentColors = new ColorDef[]
+            {
+                new ColorDef(factory.GetColor(metroColors.CanvasColorDarkShade)),           // DefaultBorder
+
+                new ColorDef(new Color[] {factory.GetColor(metroColors.BaseButtonGradientStart), factory.GetColor(metroColors.BaseButtonGradientEnd)},
+                             new float[] {0f, 1f}, 90f),            // DefaultBackground
+
+                new ColorDef(factory.GetColor(0x28518E)),           // BlueBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xB1C5EC), factory.GetColor(0x759DDA)}, 
+                             new float[] {0f, 1f}, 90f),            // BlueBackground
+
+                new ColorDef(factory.GetColor(0x2C6524)),           // GreenBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xC2E8BC), factory.GetColor(0x84D17B)},
+                             new float[] {0f, 1f}, 90f),            // GreenBackground
+
+                new ColorDef(factory.GetColor(0x8B3E0A)),           // OrangeBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xF9C7A0), factory.GetColor(0xF49758)},
+                             new float[] {0f, 1f}, 90f),            // OrangeBackground
+
+                new ColorDef(factory.GetColor(0x3E2771)),           // PurpleBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xC5B5E6), factory.GetColor(0x957BD2)},
+                             new float[] {0f, 1f}, 90f),            // PurpleBackground
+
+                new ColorDef(factory.GetColor(0x86171C)),           // RedBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xF1AAAC), factory.GetColor(0xE5676E)},
+                             new float[] {0f, 1f}, 90f),            // RedBackground
+
+                new ColorDef(factory.GetColor(0x7C7814)),           // YellowBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xFFFCAA), factory.GetColor(0xFFF958)},
+                             new float[] {0f, 1f}, 90f),            // YellowBackground
+
+                new ColorDef(factory.GetColor(-1)),                 // BusyTimeMarker
+                new ColorDef(factory.GetColor(0xFFFFFF)),           // FreeTimeMarker
+                new ColorDef(factory.GetColor(0x800080))            // OutOfOfficeTimeMarker
+            };
+
+            #endregion
+
+            #endregion
+
+            #region SuperTab
+
+            #region SuperTab
+
+            table.SuperTab.Background = new SuperTabLinearGradientColorTable(
+                factory.GetColor(metroColors.CanvasColor), Color.Empty);
+
+            table.SuperTab.InnerBorder = factory.GetColor(metroColors.CanvasColorLighterShade);
+            table.SuperTab.OuterBorder = factory.GetColor(metroColors.CanvasColorDarkShade);
+
+            table.SuperTab.ControlBoxDefault.Image = factory.GetColor(metroColors.CanvasColorDarkShade);
+
+            table.SuperTab.ControlBoxMouseOver.Background = factory.GetColor(metroColors.CanvasColorLightShade);
+            table.SuperTab.ControlBoxMouseOver.Border = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.SuperTab.ControlBoxMouseOver.Image = factory.GetColor(metroColors.TextColor);
+
+            table.SuperTab.ControlBoxPressed.Background = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.SuperTab.ControlBoxPressed.Border = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.SuperTab.ControlBoxPressed.Image = factory.GetColor(metroColors.TextColor);
+
+            table.SuperTab.InsertMarker = factory.GetColor(metroColors.BaseColor);
+
+            #endregion
+
+            #region SuperTabItem
+
+            // Top Default
+
+            table.SuperTabItem.Default.Normal.Background = new SuperTabLinearGradientColorTable(factory.GetColor(factory.GetColor(metroColors.CanvasColor)));
+
+            table.SuperTabItem.Default.Normal.InnerBorder = factory.GetColor(metroColors.CanvasColorLighterShade);
+            table.SuperTabItem.Default.Normal.OuterBorder = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.SuperTabItem.Default.Normal.Text = factory.GetColor(metroColors.TextInactiveColor);
+            table.SuperTabItem.Default.Normal.CloseMarker = factory.GetColor(metroColors.CanvasColorLightShade);
+
+            // Disabled
+            table.SuperTabItem.Default.Disabled.Text = factory.GetColor(metroColors.TextDisabledColor);
+            table.SuperTabItem.Default.Disabled.Background.AdaptiveGradient = false;
+            table.SuperTabItem.Default.Disabled.CloseMarker = factory.GetColor(metroColors.TextDisabledColor);
+
+            // Top Selected
+
+            table.SuperTabItem.Default.Selected.Background = new SuperTabLinearGradientColorTable(
+                new Color[] { factory.GetColor(metroColors.CanvasColorLighterShade), factory.GetColor(metroColors.CanvasColorLightShade), factory.GetColor(metroColors.CanvasColorLightShade), factory.GetColor(metroColors.CanvasColor) },
+                new float[] { 0, .5f, .5f, 1 });
+
+            table.SuperTabItem.Default.Selected.InnerBorder = factory.GetColor(metroColors.CanvasColorLighterShade);
+            table.SuperTabItem.Default.Selected.OuterBorder = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.SuperTabItem.Default.Selected.Text = factory.GetColor(metroColors.TextColor);
+            table.SuperTabItem.Default.Selected.CloseMarker = factory.GetColor(metroColors.CanvasColorDarkShade);
+
+            // Top SelectedMouseOver
+
+            table.SuperTabItem.Default.SelectedMouseOver.Background = new SuperTabLinearGradientColorTable(
+                new Color[] { factory.GetColor(metroColors.CanvasColor), factory.GetColor(metroColors.CanvasColorLightShade) },
+                new float[] { 0, 1 });
+
+            table.SuperTabItem.Default.SelectedMouseOver.InnerBorder = factory.GetColor(metroColors.CanvasColorLighterShade);
+            table.SuperTabItem.Default.SelectedMouseOver.OuterBorder = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.SuperTabItem.Default.SelectedMouseOver.Text = factory.GetColor(metroColors.TextColor);
+            table.SuperTabItem.Default.SelectedMouseOver.CloseMarker = factory.GetColor(metroColors.CanvasColorDarkShade);
+
+            // Top MouseOver
+
+            table.SuperTabItem.Default.MouseOver.Background = new SuperTabLinearGradientColorTable(factory.GetColor(metroColors.CanvasColor), metroColors.CanvasColorLightShade);
+
+            table.SuperTabItem.Default.MouseOver.InnerBorder = factory.GetColor(metroColors.CanvasColorLighterShade);
+            table.SuperTabItem.Default.MouseOver.OuterBorder = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.SuperTabItem.Default.MouseOver.Text = factory.GetColor(metroColors.TextColor);
+            table.SuperTabItem.Default.MouseOver.CloseMarker = factory.GetColor(metroColors.CanvasColorDarkShade);
+
+            // Left, Bottom, Right
+
+            table.SuperTabItem.Left = table.SuperTabItem.Default;
+            table.SuperTabItem.Bottom = table.SuperTabItem.Default;
+            table.SuperTabItem.Right = table.SuperTabItem.Default;
+
+            #endregion
+
+            #region SuperTabPanel
+
+            table.SuperTabPanel.Default.Background = new SuperTabLinearGradientColorTable(factory.GetColor(metroColors.CanvasColor), Color.Empty);
+            table.SuperTabPanel.Default.InnerBorder = factory.GetColor(metroColors.CanvasColorLighterShade);
+            table.SuperTabPanel.Default.OuterBorder = factory.GetColor(metroColors.CanvasColorDarkShade);
+
+            table.SuperTabPanel.Left = table.SuperTabPanel.Default;
+            table.SuperTabPanel.Bottom = table.SuperTabPanel.Default;
+            table.SuperTabPanel.Right = table.SuperTabPanel.Default;
+
+            #endregion
+
+            #endregion
+
+            #region Backstage
+
+            #region Backstage
+            SuperTabStyleColorFactory.GetMetroBackstageColorTable(table.Backstage, factory, metroColors);
+            #endregion
+
+            #region BackstageItem
+            SuperTabStyleColorFactory.GetMetroBackstageItemColorTable(table.BackstageItem, factory, metroColors);
+            #endregion
+
+            #region BackstagePanel
+            SuperTabStyleColorFactory.GetMetroBackstagePanelColorTable(table.BackstagePanel, factory, metroColors);
+            #endregion
+
+            #endregion
+
+            #region SwitchButton
+            SwitchButtonColorTable sbt = new SwitchButtonColorTable();
+            sbt.BorderColor = factory.GetColor(metroColors.CanvasColorDarkShade);
+            sbt.OffBackColor = factory.GetColor(metroColors.CanvasColorDarkShade);
+            sbt.OffTextColor = factory.GetColor(metroColors.TextColor);
+            sbt.OnBackColor = factory.GetColor(metroColors.BaseColor);
+            sbt.OnTextColor = factory.GetColor(metroColors.BaseTextColor);
+            sbt.SwitchBackColor = factory.GetColor(metroColors.TextColor);
+            sbt.SwitchBorderColor = Color.Empty; // factory.GetColor(metroColors.CanvasColorLightShade);
+            sbt.TextColor = factory.GetColor(metroColors.TextColor);
+            table.SwitchButton = new SwitchButtonColors();
+            table.SwitchButton.Default = sbt;
+            table.SwitchButton.Disabled.BorderColor = factory.GetColor(metroColors.CanvasColorLightShade);
+            table.SwitchButton.Disabled.SwitchBorderColor = Color.Empty;
+            table.SwitchButton.Disabled.OffTextColor = table.CheckBoxItem.Disabled.Text;
+            table.SwitchButton.Disabled.OnTextColor = table.SwitchButton.Disabled.OffTextColor;
+            table.SwitchButton.Disabled.TextColor = table.SwitchButton.Disabled.OffTextColor;
+            table.SwitchButton.Disabled.SwitchBackColor = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.SwitchButton.Disabled.OffBackColor = factory.GetColor(metroColors.CanvasColorLightShade);
+            table.SwitchButton.Disabled.OnBackColor = factory.GetColor(metroColors.CanvasColorLightShade);
+            #endregion
+
+            #region ElementStyle Classes
+            table.StyleClasses.Clear();
+            ElementStyle style = new ElementStyle();
+            style.Class = ElementStyleClassKeys.RibbonGalleryContainerKey;
+            style.BorderColor = factory.GetColor(metroColors.CanvasColorDarkShade);
+            style.Border = eStyleBorderType.Solid;
+            style.BorderWidth = 1;
+            style.CornerDiameter = 0;
+            style.CornerType = eCornerType.Square;
+            style.BackColor = factory.GetColor(metroColors.EditControlBackColor);
+            table.StyleClasses.Add(style.Class, style);
+            // FileMenuContainer
+            style = GetFileMenuContainerStyle(table);
+            table.StyleClasses.Add(style.Class, style);
+            // Two Column File Menu Container
+            style = GetTwoColumnMenuContainerStyle(table);
+            table.StyleClasses.Add(style.Class, style);
+            // Column one File Menu Container
+            style = GetMenuColumnOneContainerStyle(table);
+            table.StyleClasses.Add(style.Class, style);
+            // Column two File Menu Container
+            style = GetMenuColumnTwoContainerStyle(table);
+            table.StyleClasses.Add(style.Class, style);
+            // Bottom File Menu Container
+            style = GetMenuBottomContainer(table);
+            table.StyleClasses.Add(style.Class, style);
+            // TextBox border
+            style = Office2007ColorTableFactory.GetTextBoxStyle(factory.GetColor(metroColors.CanvasColorDarkShade));
+            table.StyleClasses.Add(style.Class, style);
+            // RichTextBox border
+            style = Office2007ColorTableFactory.GetRichTextBoxStyle(factory.GetColor(metroColors.CanvasColorDarkShade));
+            table.StyleClasses.Add(style.Class, style);
+            // ItemPanel
+            style = Office2007ColorTableFactory.GetItemPanelStyle(factory.GetColor(metroColors.CanvasColorDarkShade), factory.GetColor(metroColors.CanvasColor));
+            table.StyleClasses.Add(style.Class, style);
+            // ListBoxAdv
+            style = Office2007ColorTableFactory.GetListBoxAdvStyle(factory.GetColor(metroColors.CanvasColorDarkShade), factory.GetColor(metroColors.CanvasColor));
+            table.StyleClasses.Add(style.Class, style);
+            // DateTimeInput background
+            style = Office2007ColorTableFactory.GetDateTimeInputBackgroundStyle(factory.GetColor(metroColors.CanvasColorDarkShade), factory.GetColor(metroColors.CanvasColor));
+            table.StyleClasses.Add(style.Class, style);
+            // Ribbon Client Panel
+            style = Office2010BlueFactory.GetRibbonClientPanelStyle(factory, eOffice2010ColorScheme.Silver);
+            table.StyleClasses.Add(style.Class, style);
+            // ListView Border
+            style = Office2007ColorTableFactory.GetListViewBorderStyle(table.ListViewEx);
+            table.StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetStatusBarAltStyle(table.Bar);
+            table.StyleClasses.Add(style.Class, style);
+#if !NOTREE
+            // Tree Border/Background
+            style = Office2007ColorTableFactory.GetAdvTreeStyle(factory.GetColor(metroColors.CanvasColorDarkShade), factory.GetColor(metroColors.CanvasColor));
+            table.StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetAdvTreeColumnsHeaderStyle(factory.GetColor(metroColors.CanvasColorLighterShade), Color.Empty, factory.GetColor(metroColors.CanvasColorDarkShade));
+            table.StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetAdvTreeNodesColumnsHeaderStyle(factory.GetColor(metroColors.CanvasColorLighterShade), Color.Empty, factory.GetColor(metroColors.CanvasColorLighterShade));
+            table.StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetAdvTreeColumnStyle(factory.GetColor(metroColors.TextColor));
+            table.StyleClasses.Add(style.Class, style);
+            // CrumbBar
+            style = Office2007ColorTableFactory.GetCrumbBarBackgroundStyle(factory.GetColor(metroColors.CanvasColor), factory.GetColor(metroColors.CanvasColorLightShade), factory.GetColor(metroColors.CanvasColorDarkShade));
+            table.StyleClasses.Add(style.Class, style);
+#endif
+            // DataGridView border
+            style = Office2007ColorTableFactory.GetDataGridViewStyle();
+            table.StyleClasses.Add(style.Class, style);
+            // DataGridViewDateTime border
+            style = Office2007ColorTableFactory.GetDataGridViewDateTimeStyle();
+            table.StyleClasses.Add(style.Class, style);
+            // DataGridViewNumeric border
+            style = Office2007ColorTableFactory.GetDataGridViewNumericStyle();
+            table.StyleClasses.Add(style.Class, style);
+            // DataGridViewIpAddress border
+            style = Office2007ColorTableFactory.GetDataGridViewIpAddressStyle();
+            table.StyleClasses.Add(style.Class, style);
+
+            // Slide-out button
+            style = GetSlideOutButtonStyle(metroColors.ComplementColor);
+            table.StyleClasses.Add(style.Class, style);
+
+            // MetroTilePanel
+            style = Office2007ColorTableFactory.GetMetroTilePanelStyle(factory.GetColor(metroColors.CanvasColor));
+            table.StyleClasses.Add(style.Class, style);
+
+            // MetroTileGroup
+            style = Office2007ColorTableFactory.GetMetroTileGroupStyle(factory.GetColor(metroColors.TextColor));
+            table.StyleClasses.Add(style.Class, style);
+
+            // MonthCalendarAdv
+            style = Office2007ColorTableFactory.GetMonthCalendarStyle(factory.GetColor(metroColors.CanvasColor));
+            table.StyleClasses.Add(style.Class, style);
+
+            // ProgressSteps control
+            style = Office2007ColorTableFactory.GetProgressStepsStyle(table);
+            table.StyleClasses.Add(style.Class, style);
+
+            // SideNavStrip
+            style = Office2007ColorTableFactory.GetSideNavStripStyle(metroColors.BaseColor);
+            table.StyleClasses.Add(style.Class, style);
+
+            // TabFormPanel
+            style = Office2007ColorTableFactory.GetTabFormPanelStyle(ribbonBack);
+            table.StyleClasses.Add(style.Class, style);
+
+            style = Office2007ColorTableFactory.GetToolboxControlStyle(factory.GetColor(metroColors.CanvasColorDarkShade), Color.Empty);
+            table.StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetToolboxGroupTitle(factory.GetColor(metroColors.TextColor));
+            table.StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetToolboxGroupTitleMouseOver(factory.GetColor(metroColors.BaseColorLightText), factory.GetColor(metroColors.BaseColorLightest));
+            table.StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetToolboxGroupExpandedTitle(factory.GetColor(metroColors.BaseTextColor), factory.GetColor(metroColors.BaseColor));
+            table.StyleClasses.Add(style.Class, style);
+            #endregion
+
+            #region Contextual Label Colors
+            table.LabelItemColors.Clear();
+            table.LabelItemColors.Add(Office2007ColorTable.GetContextualKey(typeof(MetroStatusBar)), new LabelColors(factory.GetColor(metroColors.BaseTextColor), factory.GetColor(metroColors.TextDisabledColor)));
+            table.LabelItemColors.Add(Office2007ColorTable.GetContextualKey(typeof(Bar), "StatusBar"), new LabelColors(factory.GetColor(metroColors.BaseTextColor), factory.GetColor(metroColors.TextDisabledColor)));
+            table.LabelItemColors.Add(Office2007ColorTable.GetContextualKey(typeof(Bar)), new LabelColors(factory.GetColor(metroColors.TextColor), factory.GetColor(metroColors.TextDisabledColor)));
+            #endregion
+
+            InitAppButtonColors(table, factory, metroColors);
+
+            #region StepIndicator
+            table.StepIndicator.BackgroundColor = factory.GetColor(metroColors.CanvasColorLighterShade);
+            table.StepIndicator.IndicatorColor = factory.GetColor(Color.FromArgb(128, metroColors.ComplementColorLight));
+            #endregion
+
+            #region RadialMenu
+            table.RadialMenu = new RadialMenuColorTable();
+            table.RadialMenu.CircularBackColor = factory.GetColor(metroColors.ComplementColor);
+            table.RadialMenu.CircularBorderColor = factory.GetColor(0xFFFFFF);
+            table.RadialMenu.CircularForeColor = factory.GetColor(0xFFFFFF);
+            table.RadialMenu.RadialMenuBackground = factory.GetColor(metroColors.CanvasColor);
+            table.RadialMenu.RadialMenuBorder = factory.GetColor(metroColors.BaseColor);
+            table.RadialMenu.RadialMenuButtonBackground = factory.GetColor(metroColors.CanvasColor);
+            table.RadialMenu.RadialMenuButtonBorder = factory.GetColor(metroColors.BaseColor);
+            table.RadialMenu.RadialMenuExpandForeground = factory.GetColor(metroColors.CanvasColor);
+            table.RadialMenu.RadialMenuInactiveBorder = Color.FromArgb(128, table.RadialMenu.RadialMenuBorder);
+            table.RadialMenu.RadialMenuItemForeground = factory.GetColor(metroColors.BaseColor);
+            table.RadialMenu.RadialMenuItemDisabledForeground = factory.GetColor(metroColors.TextDisabledColor);
+            table.RadialMenu.RadialMenuItemMouseOverBackground = Color.FromArgb(72, table.RadialMenu.RadialMenuItemForeground);
+            table.RadialMenu.RadialMenuItemMouseOverForeground = factory.GetColor(metroColors.BaseColor);
+            table.RadialMenu.RadialMenuMouseOverBorder = Color.FromArgb(200, table.RadialMenu.RadialMenuBorder);
+            #endregion
+
+            #region StepItem
+            table.StepItem.Default = new OfficeStepItemStateColorTable(new Color[]{
+                    factory.GetColor(metroColors.CanvasColor)
+                    },
+                    90,
+                    new float[0],
+                factory.GetColor(metroColors.TextColor),
+                new Color[] {
+                    factory.GetColor(metroColors.CanvasColorDarkShade) });
+            table.StepItem.Progress = new OfficeStepItemStateColorTable(new Color[]{
+                    factory.GetColor(0xD8F577), 
+                    factory.GetColor(0x75C300),
+                    factory.GetColor(0x75C300),
+                    factory.GetColor(0xA9E923)
+                    },
+                    90,
+                    new float[] { 0f, .6f, .6f, 1f },
+                Color.Empty,
+                new Color[0]);
+            table.StepItem.MouseOver = new OfficeStepItemStateColorTable(new Color[]{
+                    factory.GetColor(metroColors.BaseColorLightest)
+                    },
+                    90,
+                    new float[0],
+                factory.GetColor(metroColors.BaseColorLightText),
+                new Color[] {
+                    factory.GetColor(metroColors.BaseColorLightest) });
+            table.StepItem.Pressed = new OfficeStepItemStateColorTable(new Color[]{
+                    factory.GetColor(metroColors.BaseColorLight)
+                    },
+                    90,
+                    new float[0],
+                factory.GetColor(metroColors.TextColor),
+                new Color[] {
+                    factory.GetColor(metroColors.BaseColorLight) });
+            #endregion
+
+            #region TokenEditor
+            table.TokenEditor = new TokenEditorColorTable(metroColors.TextColor, metroColors.CanvasColorLighterShade, metroColors.TextColor, metroColors.CanvasColorLightShade, metroColors.BaseTextColor, metroColors.BaseColor);
+            #endregion
+
+            #region Flyout
+            table.Flyout.BorderColor = metroColors.BaseColor;
+            table.Flyout.BackColor = metroColors.CanvasColor;
+            #endregion
+
+            #region SideNav
+            table.SideNav.SideNavItem.Default = new SideNavItemStateColorTable(factory.GetColor(metroColors.BaseTextColor));
+            table.SideNav.SideNavItem.MouseOver = new SideNavItemStateColorTable(factory.GetColor(metroColors.BaseColorLightText),
+                new Color[]
+                {
+                    factory.GetColor(metroColors.BaseColorLight)
+                },
+                new Color[] { factory.GetColor(metroColors.BaseColorLight) },
+                0);
+            table.SideNav.SideNavItem.Pressed = new SideNavItemStateColorTable(factory.GetColor(metroColors.BaseTextColor),
+                new Color[]
+                {
+                    factory.GetColor(metroColors.BaseColorDark)
+                },
+                new Color[] { factory.GetColor(metroColors.BaseColorDark) },
+                0);
+            table.SideNav.SideNavItem.Selected = new SideNavItemStateColorTable(factory.GetColor(metroColors.BaseTextColor),
+                new Color[] { factory.GetColor(metroColors.BaseColorDark) },
+                new Color[] { Color.Empty, factory.GetColor(metroColors.BaseColorDark), Color.Empty, factory.GetColor(metroColors.BaseColorDark) });
+            table.SideNav.BorderColors = new Color[] { factory.GetColor(metroColors.BaseColorDark) };
+            table.SideNav.TitleBackColor = factory.GetColor(metroColors.BaseColorDark);
+            table.SideNav.TitleBorderColors = new Color[] { Color.Empty, Color.Empty, Color.Empty, factory.GetColor(metroColors.BaseColorDark) };
+            table.SideNav.PanelBackColor = table.Form.BackColor;
+
+            #endregion
+
+            #region TabForm
+            table.TabForm.Active.CaptionText = factory.GetColor(metroColors.TextLightColor);
+            table.TabForm.Inactive.CaptionText = factory.GetColor(metroColors.TextLightColor);
+            table.TabForm.Active.CaptionBackColors = new Color[] { factory.GetColor(metroColors.CanvasColor) };
+            table.TabForm.Inactive.CaptionBackColors = new Color[] { factory.GetColor(metroColors.CanvasColor) };
+            table.TabFormItemColorTables.Clear();
+            table.TabFormItemColorTables.Add(TabFormItem.DefaultColorTableKey,
+                Office2007ColorTable.CreateDefaultTabFormItemColorTable(factory,
+                new Color[] { factory.GetColor(metroColors.CanvasColorLighterShade) },
+                new Color[] { factory.GetColor(metroColors.CanvasColorLightShade) },
+                factory.GetColor(metroColors.TextLightColor),
+                new Color[] { factory.GetColor(ribbonBack) },
+                new Color[] { factory.GetColor(metroColors.CanvasColorLightShade) },
+                factory.GetColor(metroColors.BaseColor)
+                ));
+            table.TabFormItemColorTables.Add(TabFormItem.BlueColorTableKey, Office2007ColorTable.CreateBlueTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.YellowColorTableKey, Office2007ColorTable.CreateYellowTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.PurpleColorTableKey, Office2007ColorTable.CreatePurpleTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.CyanColorTableKey, Office2007ColorTable.CreateCyanTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.BlueMistColorTableKey, Office2007ColorTable.CreateBlueMistTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.PurpleMistColorTableKey, Office2007ColorTable.CreatePurpleMistTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.TanColorTableKey, Office2007ColorTable.CreateTanTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.LemonLimeColorTableKey, Office2007ColorTable.CreateLemonLimeTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.AppleColorTableKey, Office2007ColorTable.CreateAppleTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.TealColorTableKey, Office2007ColorTable.CreateTealTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.RedChalkColorTableKey, Office2007ColorTable.CreateRedChalkTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.SilverColorTableKey, Office2007ColorTable.CreateSilverTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.OrangeColorTableKey, Office2007ColorTable.CreateOrangeTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.GreenColorTableKey, Office2007ColorTable.CreateGreenTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.MagentaColorTableKey, Office2007ColorTable.CreateMagentaTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.RedColorTableKey, Office2007ColorTable.CreateRedTabFormItemColorTable(factory));
+            #endregion
+        }
+        #region Application Button Colors
+        private static Office2007ButtonItemColorTable FallBackAppButtonColorTable = null;
+        internal static Office2007ButtonItemColorTable GetAppFallBackColorTable()
+        {
+            if (FallBackAppButtonColorTable != null) return FallBackAppButtonColorTable;
+
+            MetroPartColors metroColors = MetroColorTableInitializer.CreateMetroPartColors(MetroColorGeneratorParameters.Default.CanvasColor, MetroColorGeneratorParameters.Default.BaseColor);
+            // Blue default
+            Office2007ButtonItemColorTable table = new Office2007ButtonItemColorTable();
+            table.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Orange);
+
+            Office2007ButtonItemStateColorTable ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(metroColors.BaseColor);
+            ct.BottomBackgroundHighlight = LinearGradientColorTable.Empty; 
+            ct.OuterBorder = LinearGradientColorTable.Empty;
+            ct.InnerBorder = LinearGradientColorTable.Empty;
+            ct.Text = metroColors.BaseTextColor;
+            table.Default = ct;
+
+            ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(metroColors.BaseColorLight1);
+            ct.BottomBackgroundHighlight = LinearGradientColorTable.Empty;
+            ct.OuterBorder = LinearGradientColorTable.Empty;
+            ct.InnerBorder = LinearGradientColorTable.Empty; 
+            ct.Text = metroColors.BaseTextColor;
+            table.MouseOver = ct;
+
+            ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(metroColors.BaseColorDark);
+            ct.BottomBackgroundHighlight = LinearGradientColorTable.Empty;
+            ct.OuterBorder = LinearGradientColorTable.Empty;
+            ct.InnerBorder = LinearGradientColorTable.Empty;
+            ct.Text = metroColors.BaseTextColor;
+            table.Pressed = ct;
+
+            table.Expanded = table.Pressed;
+            table.Checked = table.Pressed;
+
+            FallBackAppButtonColorTable = table;
+
+            return table;
+        }
+        internal static void InitAppButtonColors(Office2007ColorTable colorTable, ColorFactory factory, MetroPartColors metroColors)
+        {
+            Office2007ButtonItemColorTableCollection colors = colorTable.ApplicationButtonColors;
+            colors.Clear();
+
+            // Blue default
+            Office2007ButtonItemColorTable table = new Office2007ButtonItemColorTable();
+            table.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Orange);
+
+            Office2007ButtonItemStateColorTable ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            ct.BottomBackgroundHighlight = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(32, 0xFFFFFF), Color.Transparent);
+            ct.OuterBorder = LinearGradientColorTable.Empty; //new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            ct.InnerBorder = LinearGradientColorTable.Empty; //new LinearGradientColorTable(factory.GetColor(16, 0xFFFFFF));
+            ct.Text = factory.GetColor(metroColors.BaseTextColor);
+            table.Default = ct;
+
+            ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight1));
+            ct.BottomBackgroundHighlight = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(82, 0xFFFFFF), Color.Transparent);
+            ct.OuterBorder = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            ct.InnerBorder = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(72, 0xFFFFFF), factory.GetColor(48, 0xFFFFFF)); //new LinearGradientColorTable(factory.GetColor(0x55A1F3), factory.GetColor(0x4F9EEE));
+            ct.Text = factory.GetColor(metroColors.BaseTextColor);
+            table.MouseOver = ct;
+
+            ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            ct.BottomBackgroundHighlight = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(82, 0xFFFFFF), Color.Transparent);
+            ct.OuterBorder = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDarker));
+            ct.InnerBorder = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(72, 0xFFFFFF), factory.GetColor(48, 0xFFFFFF)); //new LinearGradientColorTable(factory.GetColor(0x55A1F3), factory.GetColor(0x4F9EEE));
+            ct.Text = factory.GetColor(metroColors.BaseTextColor);
+            table.Pressed = ct;
+
+            table.Expanded = table.MouseOver;
+            table.Checked = table.Pressed;
+
+            colors.Add(table);
+
+            // Magenta
+            table = new Office2007ButtonItemColorTable();
+            table.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Magenta);
+
+            ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(factory.GetColor(0xCC256B), factory.GetColor(0xB10851));
+            ct.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(64, 0xFFFFFF), Color.Transparent);
+            ct.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x8F013C), factory.GetColor(0x940741));
+            ct.InnerBorder = new LinearGradientColorTable(factory.GetColor(32, 0xFFFFFF));
+            ct.Text = factory.GetColor(0xFFFFFF);
+            table.Default = ct;
+
+            ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(factory.GetColor(0xD63272), factory.GetColor(0xB10B52));
+            ct.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(82, 0xFFFFFF), Color.Transparent);
+            ct.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x8F013C), factory.GetColor(0x950942));
+            ct.InnerBorder = new LinearGradientColorTable(factory.GetColor(72, 0xFFFFFF), factory.GetColor(48, 0xFFFFFF)); //new LinearGradientColorTable(factory.GetColor(0x55A1F3), factory.GetColor(0x4F9EEE));
+            ct.Text = factory.GetColor(0xFFFFFF);
+            table.MouseOver = ct;
+
+            ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(factory.GetColor(0xB50C53), factory.GetColor(0xB00B52));
+            ct.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(82, 0xFFFFFF), Color.Transparent);
+            ct.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x8F013D), factory.GetColor(0x950741));
+            ct.InnerBorder = new LinearGradientColorTable(factory.GetColor(72, 0xFFFFFF), factory.GetColor(48, 0xFFFFFF)); //new LinearGradientColorTable(factory.GetColor(0x55A1F3), factory.GetColor(0x4F9EEE));
+            ct.Text = factory.GetColor(0xFFFFFF);
+            table.Pressed = ct;
+
+            table.Expanded = table.MouseOver;
+            table.Checked = table.Pressed;
+
+            colors.Add(table);
+
+            // Orange
+            table = new Office2007ButtonItemColorTable();
+            table.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Blue);
+
+            ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(factory.GetColor(0xF27350), factory.GetColor(0xE5552F));
+            ct.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xF89E42), Color.Transparent);
+            ct.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xCC2B12), factory.GetColor(0xCF3415));
+            ct.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xF68954), factory.GetColor(0xF78B3E));
+            ct.Text = factory.GetColor(0xFFFFFF);
+            table.Default = ct;
+
+            ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(factory.GetColor(0xF87E4D), factory.GetColor(0xE6552E));
+            ct.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xFBBD5E), Color.Transparent);
+            ct.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xCA2810), factory.GetColor(0xCD3217));
+            ct.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFBAA5A), factory.GetColor(0xFCB857)); //new LinearGradientColorTable(factory.GetColor(0x55A1F3), factory.GetColor(0x4F9EEE));
+            ct.Text = factory.GetColor(0xFFFFFF);
+            table.MouseOver = ct;
+
+            ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(factory.GetColor(0xE3531D), factory.GetColor(0xE04E19));
+            ct.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xFDAF4C), Color.Transparent);
+            ct.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xCA2810), factory.GetColor(0xCD3013));
+            ct.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xE86229), factory.GetColor(0xFB8D44)); //new LinearGradientColorTable(factory.GetColor(0x55A1F3), factory.GetColor(0x4F9EEE));
+            ct.Text = factory.GetColor(0xFFFFFF);
+            table.Pressed = ct;
+
+            table.Expanded = table.MouseOver;
+            table.Checked = table.Pressed;
+
+            colors.Add(table);
+
+            // Green
+            table = new Office2007ButtonItemColorTable();
+            table.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.BlueWithBackground);
+
+            ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(factory.GetColor(0x459731), factory.GetColor(0x2B7F2C));
+            ct.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0x6BCA45), Color.Transparent);
+            ct.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x186337), factory.GetColor(0x1E6A39));
+            ct.InnerBorder = new LinearGradientColorTable(factory.GetColor(0x4CA231), factory.GetColor(0x53B331));
+            ct.Text = factory.GetColor(0xFFFFFF);
+            table.Default = ct;
+
+            ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(factory.GetColor(0x469734), factory.GetColor(0x267C2B));
+            ct.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0x89D668), Color.Transparent);
+            ct.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x196437), factory.GetColor(0x216B3C));
+            ct.InnerBorder = new LinearGradientColorTable(factory.GetColor(0x65B943), factory.GetColor(0x70CC4A));
+            ct.Text = factory.GetColor(0xFFFFFF);
+            table.MouseOver = ct;
+
+            ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(factory.GetColor(0x2F822A), factory.GetColor(0x2A7E2C));
+            ct.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0x68CB38), Color.Transparent);
+            ct.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x186437), factory.GetColor(0x1D6A38));
+            ct.InnerBorder = new LinearGradientColorTable(factory.GetColor(0x368F2B), factory.GetColor(0x59BD2D)); //new LinearGradientColorTable(factory.GetColor(0x55A1F3), factory.GetColor(0x4F9EEE));
+            ct.Text = factory.GetColor(0xFFFFFF);
+            table.Pressed = ct;
+
+            table.Expanded = table.MouseOver;
+            table.Checked = table.Pressed;
+
+            colors.Add(table);
+
+            // Teal
+            table = new Office2007ButtonItemColorTable();
+            table.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.MagentaWithBackground);
+
+            ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(factory.GetColor(0x159795), factory.GetColor(0x018281));
+            ct.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0x20B7B4), Color.Transparent);
+            ct.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x055E5E), factory.GetColor(0x076464));
+            ct.InnerBorder = new LinearGradientColorTable(factory.GetColor(0x1BA29D), factory.GetColor(0x1FB1A9));
+            ct.Text = factory.GetColor(0xFFFFFF);
+            table.Default = ct;
+
+            ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(factory.GetColor(0x1F9C99), factory.GetColor(0x038584));
+            ct.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0x36CDCA), Color.Transparent);
+            ct.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x055E5E), factory.GetColor(0x096767));
+            ct.InnerBorder = new LinearGradientColorTable(factory.GetColor(0x30B8B3), factory.GetColor(0x34C2BE));
+            ct.Text = factory.GetColor(0xFFFFFF);
+            table.MouseOver = ct;
+
+            ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(factory.GetColor(0x028482), factory.GetColor(0x028081));
+            ct.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0x2CC2BE), Color.Transparent);
+            ct.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x055E5E), factory.GetColor(0x086565));
+            ct.InnerBorder = new LinearGradientColorTable(factory.GetColor(0x028F8D), factory.GetColor(0x1DB4AD)); //new LinearGradientColorTable(factory.GetColor(0x55A1F3), factory.GetColor(0x4F9EEE));
+            ct.Text = factory.GetColor(0xFFFFFF);
+            table.Pressed = ct;
+
+            table.Expanded = table.MouseOver;
+            table.Checked = table.Pressed;
+
+            colors.Add(table);
+        }
+        #endregion
+
+        #region RibbonBar
+        public static Office2007RibbonBarStateColorTable GetRibbonBar(ColorFactory factory, MetroPartColors metroColors, Color ribbonBack)
+        {
+            Office2007RibbonBarStateColorTable rb = new Office2007RibbonBarStateColorTable();
+            rb.TopBackgroundHeight = 0.8f;
+            rb.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColorLightShade));
+            rb.InnerBorder = LinearGradientColorTable.Empty;// new LinearGradientColorTable(factory.GetColor(factory.GetColor(180, Color.White)), factory.GetColor(120, 0xFFFFFF));
+            rb.TopBackground = new LinearGradientColorTable(ribbonBack);
+            rb.BottomBackground = null; // new LinearGradientColorTable(factory.GetColor(0xF6F7F8), factory.GetColor(0xE5E9EE));
+            rb.TitleBackground = null;// new LinearGradientColorTable(factory.GetColor(0xC2D8F1), factory.GetColor(0xC0D8EF));
+            rb.TitleText = factory.GetColor(metroColors.TextColor);
+            return rb;
+        }
+
+        public static Office2007RibbonBarStateColorTable GetRibbonBarMouseOver(ColorFactory factory, MetroPartColors metroColors, Color ribbonBack)
+        {
+            return GetRibbonBar(factory, metroColors, ribbonBack);
+            //Office2007RibbonBarStateColorTable rb = new Office2007RibbonBarStateColorTable();
+            //rb.TopBackgroundHeight = 0.8f;
+            //rb.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xEFF1F2), factory.GetColor(0xCDD2D7));
+            //rb.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFFFFFF), factory.GetColor(120, 0xFFFFFF));
+            //rb.TopBackground = new LinearGradientColorTable(factory.GetColor(0xFEFEFE), factory.GetColor(0xDEE4EB));
+            //rb.BottomBackground = null;// new LinearGradientColorTable(factory.GetColor(0xC7D8ED), factory.GetColor(0xD8E8F5));
+            //rb.TitleBackground = new LinearGradientColorTable(factory.GetColor(0xF8FAFB), Color.Transparent);
+            //rb.TitleText = factory.GetColor(0x565F6D);
+            //return rb;
+        }
+
+        public static Office2007RibbonBarStateColorTable GetRibbonBarExpanded(ColorFactory factory, MetroPartColors metroColors, Color ribbonBack)
+        {
+            Office2007RibbonBarStateColorTable rb = new Office2007RibbonBarStateColorTable();
+            rb.TopBackgroundHeight = 15;
+            rb.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor), factory.GetColor(metroColors.CanvasColorLightShade));
+            rb.InnerBorder = new LinearGradientColorTable(factory.GetColor(factory.GetColor(180, Color.White)), factory.GetColor(120, 0xFFFFFF));
+            rb.TopBackground = new LinearGradientColorTable(ribbonBack);
+            rb.BottomBackground = null;// new LinearGradientColorTable(factory.GetColor(0xC7D8ED), factory.GetColor(0xD8E8F5));
+            rb.TitleBackground = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColorLighterShade), Color.Transparent);
+            rb.TitleText = Color.Empty;
+            return rb;
+        }
+        #endregion
+
+        #region CheckBoxItem
+        private static Office2007CheckBoxColorTable GetCheckBoxItem(ColorFactory factory, MetroPartColors metroColors)
+        {
+            Office2007CheckBoxColorTable chk = new Office2007CheckBoxColorTable();
+
+            chk.Default.CheckBackground = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor), Color.Empty);
+            chk.Default.CheckBorder = factory.GetColor(metroColors.TextDisabledColor);
+            chk.Default.CheckInnerBackground = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor));
+            chk.Default.CheckInnerBorder = factory.GetColor(metroColors.CanvasColor);
+            chk.Default.CheckSign = new LinearGradientColorTable(factory.GetColor(metroColors.TextLightColor), Color.Empty);
+            chk.Default.Text = factory.GetColor(metroColors.TextColor);
+
+            chk.MouseOver.CheckBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLightest), Color.Empty);
+            chk.MouseOver.CheckBorder = factory.GetColor(metroColors.BaseColorLight);
+            chk.MouseOver.CheckInnerBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLightest));
+            chk.MouseOver.CheckInnerBorder = factory.GetColor(metroColors.BaseColorLightest);
+            chk.MouseOver.CheckSign = new LinearGradientColorTable(factory.GetColor(metroColors.TextColor), Color.Empty);
+            chk.MouseOver.Text = factory.GetColor(metroColors.TextColor);
+
+            chk.Pressed.CheckBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight));
+            chk.Pressed.CheckBorder = factory.GetColor(metroColors.BaseColorLight);
+            chk.Pressed.CheckInnerBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight));
+            chk.Pressed.CheckInnerBorder = factory.GetColor(metroColors.BaseColorLight);
+            chk.Pressed.CheckSign = new LinearGradientColorTable(factory.GetColor(metroColors.TextColor), Color.Empty);
+            chk.Pressed.Text = factory.GetColor(metroColors.TextColor);
+
+            chk.Disabled.CheckBackground = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor), Color.Empty);
+            chk.Disabled.CheckBorder = factory.GetColor(metroColors.CanvasColorLightShade);
+            chk.Disabled.CheckInnerBackground = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor));
+            chk.Disabled.CheckInnerBorder = Color.Empty; // factory.GetColor(metroColors.CanvasColorLightShade);
+            chk.Disabled.CheckSign = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColorDarkShade), Color.Empty);
+            chk.Disabled.Text = factory.GetColor(metroColors.CanvasColorDarkShade);
+
+            return chk;
+        }
+        #endregion
+
+        #region Buttons
+        private static Office2007ButtonItemColorTable GetButtonItemBackstageDefault(ColorFactory factory, MetroPartColors metroColors)
+        {
+            Office2007ButtonItemColorTable cb = new Office2007ButtonItemColorTable();
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Blue);
+            cb.Default = new Office2007ButtonItemStateColorTable();
+            cb.Default.Text = factory.GetColor(metroColors.BaseTextColor);
+
+            // Button mouse over
+            cb.MouseOver = new Office2007ButtonItemStateColorTable();
+            cb.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            cb.MouseOver.InnerBorder = LinearGradientColorTable.Empty;
+            cb.MouseOver.TopBackground = null;
+            cb.MouseOver.TopBackgroundHighlight = null;
+            cb.MouseOver.BottomBackground = null;
+            cb.MouseOver.BottomBackgroundHighlight = null;
+            cb.MouseOver.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            cb.MouseOver.SplitBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark), Color.Empty);
+            cb.MouseOver.SplitBorderLight = LinearGradientColorTable.Empty;
+            cb.MouseOver.Text = factory.GetColor(metroColors.BaseTextColor);
+
+            cb.MouseOverSplitInactive = new Office2007ButtonItemStateColorTable();
+            cb.MouseOverSplitInactive.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x527DE0));
+
+            // Pressed
+            cb.Pressed = new Office2007ButtonItemStateColorTable();
+            cb.Pressed.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            cb.Pressed.InnerBorder = new LinearGradientColorTable(factory.GetColor(192, 0xFFFFFF));
+            cb.Pressed.TopBackground = new LinearGradientColorTable(factory.GetColor(32, metroColors.BaseColor));
+            cb.Pressed.TopBackgroundHighlight = LinearGradientColorTable.Empty; //new LinearGradientColorTable(Color.FromArgb(192, Color.White), Color.Transparent);
+            cb.Pressed.BottomBackground = new LinearGradientColorTable(factory.GetColor(32, metroColors.BaseColor));
+            cb.Pressed.BottomBackgroundHighlight = LinearGradientColorTable.Empty;
+            cb.Pressed.SplitBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor), Color.Empty);
+            cb.Pressed.SplitBorderLight = new LinearGradientColorTable(factory.GetColor(135, 0xFFFFFF), Color.Empty);
+            cb.Pressed.Text = factory.GetColor(metroColors.TextColor);
+
+            // Checked
+            cb.Checked = cb.Pressed;
+
+            // Expanded button
+            cb.Expanded = cb.MouseOver;
+
+            SetBlueExpandColors(cb, factory);
+
+            return cb;
+        }
+        public static Office2007ButtonItemColorTable GetButtonItemDefault(ColorFactory factory, MetroPartColors metroColors)
+        {
+            Office2007ButtonItemColorTable cb = new Office2007ButtonItemColorTable();
+            cb.Default = new Office2007ButtonItemStateColorTable();
+            cb.Default.Text = factory.GetColor(metroColors.TextColor);
+
+            // Button mouse over
+            cb.MouseOver = new Office2007ButtonItemStateColorTable();
+            cb.MouseOver.TopBackground = null;
+            cb.MouseOver.TopBackgroundHighlight = null;
+            cb.MouseOver.BottomBackground = null;
+            cb.MouseOver.BottomBackgroundHighlight = null;
+            cb.MouseOver.Background = new LinearGradientColorTable(metroColors.BaseColorLightest);
+            cb.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLightest));// LinearGradientColorTable.Empty;
+            cb.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLightest));
+            cb.MouseOver.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.MouseOver.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.MouseOver.Text = factory.GetColor(metroColors.BaseColorLightText);
+            //cb.MouseOver = new Office2007ButtonItemStateColorTable();
+            //cb.MouseOver.TopBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseButtonGradientStart));
+            //cb.MouseOver.TopBackgroundHighlight = LinearGradientColorTable.Empty;
+            //cb.MouseOver.BottomBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseButtonGradientEnd));
+            //cb.MouseOver.BottomBackgroundHighlight = LinearGradientColorTable.Empty;
+            //cb.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDarker));
+            //cb.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            //cb.MouseOver.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            //cb.MouseOver.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            //cb.MouseOver.Text = factory.GetColor(metroColors.TextColor);
+
+
+            cb.MouseOverSplitInactive = new Office2007ButtonItemStateColorTable();
+            cb.MouseOverSplitInactive.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLightest));
+
+            // Pressed
+            cb.Pressed = new Office2007ButtonItemStateColorTable();
+            cb.Pressed.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight));
+            cb.Pressed.InnerBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight));
+            cb.Pressed.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight));
+            cb.Pressed.TopBackground = null;
+            cb.Pressed.TopBackgroundHighlight = null;
+            cb.Pressed.BottomBackground = null;
+            cb.Pressed.BottomBackgroundHighlight = null;
+            cb.Pressed.SplitBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight));
+            cb.Pressed.SplitBorderLight = LinearGradientColorTable.Empty;//(factory.GetColor(metroColors.BaseColorLight), Color.Empty);
+            cb.Pressed.Text = factory.GetColor(metroColors.TextColor);
+            //cb.Pressed = new Office2007ButtonItemStateColorTable();
+            //cb.Pressed.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            //cb.Pressed.InnerBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDarker));
+            //cb.Pressed.TopBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight));
+            //cb.Pressed.TopBackgroundHighlight = LinearGradientColorTable.Empty;
+            //cb.Pressed.BottomBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            //cb.Pressed.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(Color.FromArgb(48, Color.White)), Color.Transparent);
+            //cb.Pressed.SplitBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            //cb.Pressed.SplitBorderLight = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight), Color.Empty);
+            //cb.Pressed.Text = factory.GetColor(metroColors.BaseTextColor);
+
+            // Checked
+            cb.Checked = new Office2007ButtonItemStateColorTable();
+            cb.Checked.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLighter));
+            cb.Checked.InnerBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLighter));
+            cb.Checked.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLighter));
+            cb.Checked.TopBackground = null; //new LinearGradientColorTable(metroColors.BaseColorLight);
+            cb.Checked.TopBackgroundHighlight = null; //LinearGradientColorTable.Empty;
+            cb.Checked.BottomBackground = null; // new LinearGradientColorTable(metroColors.BaseColorLight);
+            cb.Checked.BottomBackgroundHighlight = null; // new LinearGradientColorTable(factory.GetColor("20FFFFFF"), Color.Transparent);
+            cb.Checked.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Checked.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Checked.Text = factory.GetColor(metroColors.BaseColorLightText);
+            //cb.Checked = new Office2007ButtonItemStateColorTable();
+            //cb.Checked.OuterBorder = new LinearGradientColorTable(metroColors.BaseColorDark);
+            //cb.Checked.InnerBorder = new LinearGradientColorTable(metroColors.BaseColorDarker);
+            //cb.Checked.TopBackground = new LinearGradientColorTable(metroColors.BaseColorLight);
+            //cb.Checked.TopBackgroundHighlight = LinearGradientColorTable.Empty;
+            //cb.Checked.BottomBackground = new LinearGradientColorTable(metroColors.BaseColorLight);
+            //cb.Checked.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor("20FFFFFF"), Color.Transparent);
+            //cb.Checked.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            //cb.Checked.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            //cb.Checked.Text = factory.GetColor(metroColors.BaseColorLightText);
+
+            // Expanded button
+            cb.Expanded = new Office2007ButtonItemStateColorTable();
+            cb.Expanded.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight));
+            cb.Expanded.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight));
+            cb.Expanded.InnerBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight));
+            cb.Expanded.TopBackground = null; // new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight));
+            cb.Expanded.TopBackgroundHighlight = null; // LinearGradientColorTable.Empty;
+            cb.Expanded.BottomBackground = null; // new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            cb.Expanded.BottomBackgroundHighlight = null; // new LinearGradientColorTable(factory.GetColor(Color.FromArgb(92, Color.White)), Color.Transparent);
+            cb.Expanded.SplitBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight));
+            cb.Expanded.SplitBorderLight = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight), Color.Empty);
+            cb.Expanded.Text = factory.GetColor(metroColors.TextColor);
+
+            SetBlueExpandColors(cb, factory);
+
+            return cb;
+        }
+
+        public static Office2007ButtonItemColorTable GetButtonItemDefaultWithBackground(ColorFactory factory, MetroPartColors metroColors)
+        {
+            Office2007ButtonItemColorTable cb = GetButtonItemDefault(factory, metroColors);
+
+            cb.Default.TopBackground = null; // new LinearGradientColorTable(factory.GetColor(metroColors.BaseButtonGradientStart));
+            cb.Default.TopBackgroundHighlight = null;// LinearGradientColorTable.Empty;
+            cb.Default.BottomBackground = null; // new LinearGradientColorTable(factory.GetColor(metroColors.BaseButtonGradientEnd));
+            cb.Default.BottomBackgroundHighlight = null; // LinearGradientColorTable.Empty;
+            cb.Default.Background = new LinearGradientColorTable(metroColors.CanvasColor);
+            cb.Default.InnerBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColorDarkShade));
+            cb.Default.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.MouseOverSplitInactive = cb.Default;
+
+            // Same as default
+            cb.Disabled = new Office2007ButtonItemStateColorTable();
+            cb.Disabled.TopBackground = null;
+            cb.Disabled.TopBackgroundHighlight = null; // new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.BottomBackground = null; // LinearGradientColorTable.Empty;
+            cb.Disabled.BottomBackgroundHighlight = null; // new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.Background = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor));
+            cb.Disabled.InnerBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColorLightShade), Color.Empty);
+            cb.Disabled.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.Text = factory.GetColor(metroColors.CanvasColorLightShade);
+            return cb;
+        }
+
+        public static Office2007ButtonItemColorTable GetButtonItemBlue(ColorFactory factory, MetroPartColors metroColors)
+        {
+            Office2007ButtonItemColorTable cb = new Office2007ButtonItemColorTable();
+            cb.Default = new Office2007ButtonItemStateColorTable();
+            cb.Default.Text = factory.GetColor(metroColors.TextColor);
+
+            // Button mouse over
+            cb.MouseOver = new Office2007ButtonItemStateColorTable();
+            cb.MouseOver.TopBackground = null; // new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight));
+            cb.MouseOver.TopBackgroundHighlight = null;// LinearGradientColorTable.Empty;
+            cb.MouseOver.BottomBackground = null; // new LinearGradientColorTable(factory.GetColor(metroColors.BaseButtonGradientEnd));
+            cb.MouseOver.BottomBackgroundHighlight = null;// LinearGradientColorTable.Empty;
+            cb.MouseOver.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight));
+            cb.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            cb.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            cb.MouseOver.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.MouseOver.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.MouseOver.Text = factory.GetColor(metroColors.BaseColorLightText);
+
+            cb.MouseOverSplitInactive = new Office2007ButtonItemStateColorTable();
+            cb.MouseOverSplitInactive.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+
+            // Pressed
+            cb.Pressed = new Office2007ButtonItemStateColorTable();
+            cb.Pressed.OuterBorder = new LinearGradientColorTable(metroColors.BaseColorDarker);
+            cb.Pressed.InnerBorder = new LinearGradientColorTable(metroColors.BaseColorDark);
+            cb.Pressed.TopBackground = null;// new LinearGradientColorTable(factory.GetColor("DAF6FF"));
+            cb.Pressed.TopBackgroundHighlight = null; // LinearGradientColorTable.Empty;
+            cb.Pressed.BottomBackground = null;// new LinearGradientColorTable(factory.GetColor("A7E8FF"));
+            cb.Pressed.BottomBackgroundHighlight = null; // new LinearGradientColorTable(factory.GetColor(Color.FromArgb(48, Color.White)), Color.Transparent);
+            cb.Pressed.Background = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor));
+            cb.Pressed.SplitBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            cb.Pressed.SplitBorderLight = LinearGradientColorTable.Empty;
+            cb.Pressed.Text = factory.GetColor(metroColors.TextColor);
+
+            // Checked
+            cb.Checked = new Office2007ButtonItemStateColorTable();
+            cb.Checked.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            cb.Checked.InnerBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            cb.Checked.TopBackground = null;  // new LinearGradientColorTable(factory.GetColor("A7E8FF"));
+            cb.Checked.TopBackgroundHighlight = null; // LinearGradientColorTable.Empty;
+            cb.Checked.BottomBackground = null; // new LinearGradientColorTable(factory.GetColor("A7E8FF"));
+            cb.Checked.BottomBackgroundHighlight = null; // new LinearGradientColorTable(factory.GetColor("20FFFFFF"), Color.Transparent);
+            cb.Checked.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            cb.Checked.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Checked.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Checked.Text = factory.GetColor(metroColors.BaseTextColor);
+
+            // Expanded button
+            cb.Expanded = new Office2007ButtonItemStateColorTable();
+            cb.Expanded.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            cb.Expanded.InnerBorder = LinearGradientColorTable.Empty;
+            cb.Expanded.TopBackground = null; // new LinearGradientColorTable(factory.GetColor("DAF6FF"));
+            cb.Expanded.TopBackgroundHighlight = null; // LinearGradientColorTable.Empty;
+            cb.Expanded.BottomBackground = null; // new LinearGradientColorTable(factory.GetColor("A7E8FF"));
+            cb.Expanded.BottomBackgroundHighlight = null; // new LinearGradientColorTable(factory.GetColor(Color.FromArgb(48, Color.White)), Color.Transparent);
+            cb.Expanded.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            cb.Expanded.SplitBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            cb.Expanded.SplitBorderLight = LinearGradientColorTable.Empty; //(factory.GetColor("A000BFFF"), Color.Empty);
+            cb.Expanded.Text = factory.GetColor(metroColors.BaseTextColor);
+
+            SetBlueExpandColors(cb, factory);
+
+            return cb;
+        }
+
+        public static Office2007ButtonItemColorTable GetButtonItemBlueWithBackground(ColorFactory factory, MetroPartColors metroColors)
+        {
+            Office2007ButtonItemColorTable cb = GetButtonItemBlue(factory, metroColors);
+
+            cb.Default.TopBackground = null; //new LinearGradientColorTable(factory.GetColor(metroColors.BaseButtonGradientStart));
+            cb.Default.TopBackgroundHighlight = null;// LinearGradientColorTable.Empty;
+            cb.Default.BottomBackground = null;// new LinearGradientColorTable(factory.GetColor(metroColors.BaseButtonGradientEnd));
+            cb.Default.BottomBackgroundHighlight = null;// LinearGradientColorTable.Empty;
+            cb.Default.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            cb.Default.InnerBorder = LinearGradientColorTable.Empty;
+            cb.Default.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            cb.Default.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.Text = factory.GetColor(metroColors.BaseTextColor);
+            cb.MouseOverSplitInactive = cb.Default;
+
+            // Same as default
+            cb.Disabled = new Office2007ButtonItemStateColorTable();
+            cb.Disabled.TopBackground = null;
+            cb.Disabled.TopBackgroundHighlight = null;
+            cb.Disabled.BottomBackground = null;
+            cb.Disabled.BottomBackgroundHighlight = null;
+            cb.Disabled.Background = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor));
+            cb.Disabled.InnerBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColorLightShade), Color.Empty);
+            cb.Disabled.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.Text = factory.GetColor(metroColors.CanvasColorLightShade);
+            return cb;
+        }
+
+        public static Office2007ButtonItemColorTable GetButtonItemMagenta(ColorFactory factory, MetroPartColors metroColors)
+        {
+            Office2007ButtonItemColorTable cb = new Office2007ButtonItemColorTable();
+            cb.Default = new Office2007ButtonItemStateColorTable();
+            cb.Default.Text = factory.GetColor(metroColors.TextColor);
+
+            // Button mouse over
+            cb.MouseOver = new Office2007ButtonItemStateColorTable();
+            cb.MouseOver.TopBackground = null; // new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight));
+            cb.MouseOver.TopBackgroundHighlight = null;// LinearGradientColorTable.Empty;
+            cb.MouseOver.BottomBackground = null; // new LinearGradientColorTable(factory.GetColor(metroColors.BaseButtonGradientEnd));
+            cb.MouseOver.BottomBackgroundHighlight = null;// LinearGradientColorTable.Empty;
+            cb.MouseOver.Background = new LinearGradientColorTable(factory.GetColor(metroColors.ComplementColorLight));
+            cb.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(metroColors.ComplementColorDark));
+            cb.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.ComplementColor));
+            cb.MouseOver.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.MouseOver.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.MouseOver.Text = factory.GetColor(metroColors.ComplementColorLightText);
+
+            cb.MouseOverSplitInactive = new Office2007ButtonItemStateColorTable();
+            cb.MouseOverSplitInactive.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.ComplementColor));
+
+            // Pressed
+            cb.Pressed = new Office2007ButtonItemStateColorTable();
+            cb.Pressed.OuterBorder = new LinearGradientColorTable(metroColors.ComplementColorDarker);
+            cb.Pressed.InnerBorder = new LinearGradientColorTable(metroColors.ComplementColorDark);
+            cb.Pressed.TopBackground = null;// new LinearGradientColorTable(factory.GetColor("DAF6FF"));
+            cb.Pressed.TopBackgroundHighlight = null; // LinearGradientColorTable.Empty;
+            cb.Pressed.BottomBackground = null;// new LinearGradientColorTable(factory.GetColor("A7E8FF"));
+            cb.Pressed.BottomBackgroundHighlight = null; // new LinearGradientColorTable(factory.GetColor(Color.FromArgb(48, Color.White)), Color.Transparent);
+            cb.Pressed.Background = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor));
+            cb.Pressed.SplitBorder = new LinearGradientColorTable(factory.GetColor(metroColors.ComplementColor));
+            cb.Pressed.SplitBorderLight = LinearGradientColorTable.Empty;
+            cb.Pressed.Text = factory.GetColor(metroColors.TextColor);
+
+            // Checked
+            cb.Checked = new Office2007ButtonItemStateColorTable();
+            cb.Checked.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.ComplementColorDark));
+            cb.Checked.InnerBorder = new LinearGradientColorTable(factory.GetColor(metroColors.ComplementColorDark));
+            cb.Checked.TopBackground = null;  // new LinearGradientColorTable(factory.GetColor("A7E8FF"));
+            cb.Checked.TopBackgroundHighlight = null; // LinearGradientColorTable.Empty;
+            cb.Checked.BottomBackground = null; // new LinearGradientColorTable(factory.GetColor("A7E8FF"));
+            cb.Checked.BottomBackgroundHighlight = null; // new LinearGradientColorTable(factory.GetColor("20FFFFFF"), Color.Transparent);
+            cb.Checked.Background = new LinearGradientColorTable(factory.GetColor(metroColors.ComplementColor));
+            cb.Checked.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Checked.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Checked.Text = factory.GetColor(metroColors.ComplementColorText);
+
+            // Expanded button
+            cb.Expanded = new Office2007ButtonItemStateColorTable();
+            cb.Expanded.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.ComplementColor));
+            cb.Expanded.InnerBorder = LinearGradientColorTable.Empty;
+            cb.Expanded.TopBackground = null; // new LinearGradientColorTable(factory.GetColor("DAF6FF"));
+            cb.Expanded.TopBackgroundHighlight = null; // LinearGradientColorTable.Empty;
+            cb.Expanded.BottomBackground = null; // new LinearGradientColorTable(factory.GetColor("A7E8FF"));
+            cb.Expanded.BottomBackgroundHighlight = null; // new LinearGradientColorTable(factory.GetColor(Color.FromArgb(48, Color.White)), Color.Transparent);
+            cb.Expanded.Background = new LinearGradientColorTable(factory.GetColor(metroColors.ComplementColor));
+            cb.Expanded.SplitBorder = new LinearGradientColorTable(factory.GetColor(metroColors.ComplementColorDark));
+            cb.Expanded.SplitBorderLight = LinearGradientColorTable.Empty; //(factory.GetColor("A000BFFF"), Color.Empty);
+            cb.Expanded.Text = factory.GetColor(metroColors.ComplementColorText);
+
+            SetBlueExpandColors(cb, factory);
+
+            return cb;
+        }
+
+        public static Office2007ButtonItemColorTable GetButtonItemMagentaWithBackground(ColorFactory factory, MetroPartColors metroColors)
+        {
+            Office2007ButtonItemColorTable cb = GetButtonItemMagenta(factory, metroColors);
+
+            cb.Default.TopBackground = null;
+            cb.Default.TopBackgroundHighlight = null;
+            cb.Default.BottomBackground = null;
+            cb.Default.BottomBackgroundHighlight = null;
+            cb.Default.Background = new LinearGradientColorTable(factory.GetColor(metroColors.ComplementColor));
+            cb.Default.InnerBorder = LinearGradientColorTable.Empty;
+            cb.Default.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.ComplementColor));
+            cb.Default.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.Text = factory.GetColor(metroColors.ComplementColorText);
+            cb.MouseOverSplitInactive = cb.Default;
+
+            // Same as default
+            cb.Disabled = new Office2007ButtonItemStateColorTable();
+            cb.Disabled.TopBackground = null;
+            cb.Disabled.TopBackgroundHighlight = null;
+            cb.Disabled.BottomBackground = null;
+            cb.Disabled.BottomBackgroundHighlight = null;
+            cb.Disabled.Background = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor));
+            cb.Disabled.InnerBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColorLightShade), Color.Empty);
+            cb.Disabled.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.Text = factory.GetColor(metroColors.CanvasColorLightShade);
+            return cb;
+        }
+
+        public static void SetBlueExpandColors(Office2007ButtonItemColorTable ct, ColorFactory factory)
+        {
+            Color cb = factory.GetColor(0x454F5A);
+            Color cl = Color.FromArgb(192, Color.White);
+            ct.Default.ExpandBackground = cb;
+            ct.Default.ExpandLight = cl;
+
+            ct.Checked.ExpandBackground = cb;
+            ct.Checked.ExpandLight = cl;
+
+            //ct.Disabled.ExpandBackground = factory.GetColor(0xB7B7B7);
+            //ct.Disabled.ExpandLight = factory.GetColor(0xEDEDED);
+
+            ct.Expanded.ExpandBackground = cb;
+            ct.Expanded.ExpandLight = cl;
+
+            ct.MouseOver.ExpandBackground = cb;
+            ct.MouseOver.ExpandLight = cl;
+
+            ct.Pressed.ExpandBackground = cb;
+            ct.Pressed.ExpandLight = cl;
+        }
+
+        public static Office2007ButtonItemColorTable CreateBlueOrbColorTable(ColorFactory factory, MetroPartColors metroColors)
+        {
+            Office2007ButtonItemColorTable cb = new Office2007ButtonItemColorTable();
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.BlueOrb);
+
+            // Default
+            cb.Default = new Office2007ButtonItemStateColorTable();
+            cb.Default.TopBackground = null;
+            cb.Default.TopBackgroundHighlight = null;
+            cb.Default.BottomBackground = null;
+            cb.Default.BottomBackgroundHighlight = null;
+            cb.Default.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            cb.Default.InnerBorder = LinearGradientColorTable.Empty;
+            cb.Default.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseTextColor));
+            cb.Default.OuterBorderWidth = 2;
+            cb.Default.SplitBorder = LinearGradientColorTable.Empty;
+            cb.Default.SplitBorderLight = LinearGradientColorTable.Empty;
+            cb.Default.Text = factory.GetColor(metroColors.BaseTextColor);
+            cb.MouseOverSplitInactive = cb.Default;
+
+            
+            // Button mouse over
+            cb.MouseOver = new Office2007ButtonItemStateColorTable();
+            cb.MouseOver.TopBackground = null;
+            cb.MouseOver.TopBackgroundHighlight = null;
+            cb.MouseOver.BottomBackground = null;
+            cb.MouseOver.BottomBackgroundHighlight = null;
+            cb.MouseOver.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight));
+            cb.MouseOver.InnerBorder = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLightest));// LinearGradientColorTable.Empty;
+            cb.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight));
+            cb.MouseOver.OuterBorderWidth = 2;
+            cb.MouseOver.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.MouseOver.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.MouseOver.Text = factory.GetColor(metroColors.BaseColorLightText);
+
+            cb.MouseOverSplitInactive = new Office2007ButtonItemStateColorTable();
+            cb.MouseOverSplitInactive.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight1));
+            cb.MouseOverSplitInactive.Text = factory.GetColor(metroColors.BaseColorLightText);
+            cb.MouseOverSplitInactive.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight1));
+
+            // Pressed
+            cb.Pressed = new Office2007ButtonItemStateColorTable();
+            cb.Pressed.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight));
+            cb.Pressed.OuterBorderWidth = 2;
+            cb.Pressed.InnerBorder = LinearGradientColorTable.Empty; // (factory.GetColor(metroColors.BaseColorLight));
+            cb.Pressed.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            cb.Pressed.TopBackground = null;
+            cb.Pressed.TopBackgroundHighlight = null;
+            cb.Pressed.BottomBackground = null;
+            cb.Pressed.BottomBackgroundHighlight = null;
+            cb.Pressed.SplitBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight));
+            cb.Pressed.SplitBorderLight = LinearGradientColorTable.Empty;//(factory.GetColor(metroColors.BaseColorLight), Color.Empty);
+            cb.Pressed.Text = factory.GetColor(metroColors.BaseColorLight);
+
+            // Checked
+            cb.Checked = new Office2007ButtonItemStateColorTable();
+            cb.Checked.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseTextColor));
+            cb.Checked.OuterBorderWidth = 2;
+            cb.Checked.InnerBorder = LinearGradientColorTable.Empty; // (factory.GetColor(metroColors.BaseTextColor));
+            cb.Checked.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            cb.Checked.TopBackground = null; //new LinearGradientColorTable(metroColors.BaseColorLight);
+            cb.Checked.TopBackgroundHighlight = null; //LinearGradientColorTable.Empty;
+            cb.Checked.BottomBackground = null; // new LinearGradientColorTable(metroColors.BaseColorLight);
+            cb.Checked.BottomBackgroundHighlight = null; // new LinearGradientColorTable(factory.GetColor("20FFFFFF"), Color.Transparent);
+            cb.Checked.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Checked.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Checked.Text = factory.GetColor(metroColors.BaseTextColor);
+
+            // Expanded button
+            cb.Expanded = new Office2007ButtonItemStateColorTable();
+            cb.Expanded.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLightest));
+            cb.Expanded.OuterBorderWidth = 2;
+            cb.Expanded.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            cb.Expanded.InnerBorder = LinearGradientColorTable.Empty;
+            cb.Expanded.TopBackground = null; 
+            cb.Expanded.TopBackgroundHighlight = null; 
+            cb.Expanded.BottomBackground = null;
+            cb.Expanded.BottomBackgroundHighlight = null;
+            cb.Expanded.SplitBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight));
+            cb.Expanded.SplitBorderLight = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight), Color.Empty);
+            cb.Expanded.Text = factory.GetColor(metroColors.BaseColorLightest);
+
+            // Same as default
+            cb.Disabled = new Office2007ButtonItemStateColorTable();
+            cb.Disabled.TopBackground = null;
+            cb.Disabled.TopBackgroundHighlight = null; // new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.BottomBackground = null; // LinearGradientColorTable.Empty;
+            cb.Disabled.BottomBackgroundHighlight = null; // new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            cb.Disabled.InnerBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight1), Color.Empty);
+            cb.Disabled.OuterBorderWidth = 2;
+            cb.Disabled.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.Text = factory.GetColor(metroColors.BaseColorLight1);
+            return cb;
+        }
+
+        public static Office2007ButtonItemColorTable GetButtonItemStatusBar(ColorFactory factory, MetroPartColors metroColors)
+        {
+            Office2007ButtonItemColorTable cb = new Office2007ButtonItemColorTable();
+            cb.Default = new Office2007ButtonItemStateColorTable();
+            cb.Default.Text = factory.GetColor(metroColors.BaseTextColor);
+
+            // Button mouse over
+            cb.MouseOver = new Office2007ButtonItemStateColorTable();
+            cb.MouseOver.TopBackground = null;
+            cb.MouseOver.TopBackgroundHighlight = null;
+            cb.MouseOver.BottomBackground = null;
+            cb.MouseOver.BottomBackgroundHighlight = null;
+            cb.MouseOver.Background = new LinearGradientColorTable(metroColors.BaseColorLight1);
+            cb.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight1));
+            cb.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight1));
+            cb.MouseOver.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.MouseOver.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.MouseOver.Text = factory.GetColor(metroColors.BaseTextColor);
+
+            cb.MouseOverSplitInactive = new Office2007ButtonItemStateColorTable();
+            cb.MouseOverSplitInactive.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight1));
+
+            // Pressed
+            cb.Pressed = new Office2007ButtonItemStateColorTable();
+            cb.Pressed.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            cb.Pressed.InnerBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            cb.Pressed.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            cb.Pressed.TopBackground = null;
+            cb.Pressed.TopBackgroundHighlight = null;
+            cb.Pressed.BottomBackground = null;
+            cb.Pressed.BottomBackgroundHighlight = null;
+            cb.Pressed.SplitBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            cb.Pressed.SplitBorderLight = LinearGradientColorTable.Empty;
+            cb.Pressed.Text = factory.GetColor(metroColors.BaseTextColor);
+
+            // Checked
+            cb.Checked = new Office2007ButtonItemStateColorTable();
+            cb.Checked.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            cb.Checked.InnerBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            cb.Checked.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            cb.Checked.TopBackground = null;
+            cb.Checked.TopBackgroundHighlight = null;
+            cb.Checked.BottomBackground = null;
+            cb.Checked.BottomBackgroundHighlight = null;
+            cb.Checked.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Checked.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Checked.Text = factory.GetColor(metroColors.BaseTextColor);
+
+            // Expanded button
+            cb.Expanded = new Office2007ButtonItemStateColorTable();
+            cb.Expanded.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            cb.Expanded.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            cb.Expanded.InnerBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            cb.Expanded.TopBackground = null;
+            cb.Expanded.TopBackgroundHighlight = null; 
+            cb.Expanded.BottomBackground = null; 
+            cb.Expanded.BottomBackgroundHighlight = null;
+            cb.Expanded.SplitBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            cb.Expanded.SplitBorderLight = LinearGradientColorTable.Empty;
+            cb.Expanded.Text = factory.GetColor(metroColors.BaseTextColor);
+
+            SetBlueExpandColors(cb, factory);
+
+            return cb;
+        }
+        #endregion
+
+        #region RibbonTabItem
+        public static Office2007RibbonTabItemColorTable GetRibbonTabItemBlueDefault(ColorFactory factory, MetroPartColors metroColors, Color ribbonBack)
+        {
+            Office2007RibbonTabItemColorTable rt = new Office2007RibbonTabItemColorTable();
+            rt.Default.Text = factory.GetColor(metroColors.TextLightColor);
+            rt.CornerSize = 0;
+
+            // Selected Tab
+            rt.Selected = new Office2007RibbonTabItemStateColorTable();
+            rt.Selected.Background = new LinearGradientColorTable(ribbonBack);
+            rt.Selected.BackgroundHighlight = new LinearGradientColorTable();
+            rt.Selected.InnerBorder = new LinearGradientColorTable();
+            rt.Selected.OuterBorder = new LinearGradientColorTable(metroColors.CanvasColorLightShade);
+            rt.Selected.Text = factory.GetColor(metroColors.BaseColor);
+
+            // Selected Tab Mouse Over
+            rt.SelectedMouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.SelectedMouseOver.Background = new LinearGradientColorTable(ribbonBack);
+            rt.SelectedMouseOver.BackgroundHighlight = LinearGradientColorTable.Empty;
+            rt.SelectedMouseOver.InnerBorder = LinearGradientColorTable.Empty;
+            rt.SelectedMouseOver.OuterBorder = new LinearGradientColorTable(metroColors.CanvasColorLightShade);
+            rt.SelectedMouseOver.Text = factory.GetColor(metroColors.BaseColor);
+
+            // Tab Mouse Over
+            rt.MouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.MouseOver.Background = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor));
+            rt.MouseOver.BackgroundHighlight = LinearGradientColorTable.Empty;
+            rt.MouseOver.InnerBorder = LinearGradientColorTable.Empty;
+            rt.MouseOver.OuterBorder = LinearGradientColorTable.Empty; // new LinearGradientColorTable(metroColors.CanvasColorLightShade);
+            rt.MouseOver.Text = factory.GetColor(metroColors.BaseColor);
+
+            return rt;
+        }
+
+        public static Office2007RibbonTabItemColorTable GetRibbonTabItemBlueMagenta(ColorFactory factory)
+        {
+            Office2007RibbonTabItemColorTable rt = new Office2007RibbonTabItemColorTable();
+            rt.Default.Text = factory.GetColor(0x3B3B3B);
+            rt.CornerSize = 2;
+
+            // Selected Tab
+            rt.Selected = new Office2007RibbonTabItemStateColorTable();
+            rt.Selected.Background = new LinearGradientColorTable(factory.GetColor(0xF4DEEE), factory.GetColor(0xFEFEFE));
+            rt.Selected.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(64, Color.White), Color.Transparent);
+            rt.Selected.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFFFFFF), Color.Transparent);
+            rt.Selected.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xE088C0), factory.GetColor(0xDF6DAA));
+            rt.Selected.Text = factory.GetColor(0x3B3B3B);
+
+            // Selected Tab Mouse Over
+            rt.SelectedMouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.SelectedMouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xF4DEEE), factory.GetColor(0xFEFEFE));
+            rt.SelectedMouseOver.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(64, Color.White), Color.Transparent);
+            rt.SelectedMouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFFFFFF), Color.Transparent);
+            rt.SelectedMouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xE088C0), factory.GetColor(0xDF6DAA));
+            rt.SelectedMouseOver.Text = factory.GetColor(0x3B3B3B);
+
+            // Tab Mouse Over
+            rt.MouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.MouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xEDB5D8), factory.GetColor(0xFCFBFB));
+            rt.MouseOver.BackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xFCFBFB), Color.Transparent);
+            rt.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xF9D7EE), factory.GetColor(0xFDEDF8));
+            rt.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xE33991));
+            rt.MouseOver.Text = factory.GetColor(0x3B3B3B);
+
+            return rt;
+        }
+
+        public static Office2007RibbonTabItemColorTable GetRibbonTabItemBlueGreen(ColorFactory factory)
+        {
+            Office2007RibbonTabItemColorTable rt = new Office2007RibbonTabItemColorTable();
+            rt.Default.Text = factory.GetColor(0x3B3B3B);
+            rt.CornerSize = 2;
+
+            // Selected Tab
+            rt.Selected = new Office2007RibbonTabItemStateColorTable();
+            rt.Selected.Background = new LinearGradientColorTable(factory.GetColor(0xE4F3E0), factory.GetColor(0xE4F2DF));
+            rt.Selected.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(64, Color.White), Color.Transparent);
+            rt.Selected.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xD5EAD3), factory.GetColor(0xB8DEB1));
+            rt.Selected.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xB9C1B7), factory.GetColor(0xBFC1BE));
+            rt.Selected.Text = factory.GetColor(0x3B3B3B);
+
+            // Selected Tab Mouse Over
+            rt.SelectedMouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.SelectedMouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xE4F3E0), factory.GetColor(0xE4F2DF));
+            rt.SelectedMouseOver.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(32, Color.White), Color.Transparent);
+            rt.SelectedMouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xD5EAD3), factory.GetColor(0xB8DEB1));
+            rt.SelectedMouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xB9C1B7), factory.GetColor(0xBFC1BE));
+            rt.SelectedMouseOver.Text = factory.GetColor(0x3B3B3B);
+
+            // Tab Mouse Over
+            rt.MouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.MouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xB3DEE3), factory.GetColor(0x8ADE9F));
+            rt.MouseOver.BackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xDEECFF), Color.Transparent);
+            rt.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xE2EFFF), factory.GetColor(0xC7DFFF));
+            rt.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xC1C8D1), factory.GetColor(0xC0C7D0));
+            rt.MouseOver.Text = factory.GetColor(0x3B3B3B);
+
+            return rt;
+        }
+
+        public static Office2007RibbonTabItemColorTable GetRibbonTabItemBlueOrange(ColorFactory factory)
+        {
+            Office2007RibbonTabItemColorTable rt = new Office2007RibbonTabItemColorTable();
+            rt.Default.Text = factory.GetColor(0x3B3B3B);
+            rt.CornerSize = 2;
+
+            // Selected Tab
+            rt.Selected = new Office2007RibbonTabItemStateColorTable();
+            rt.Selected.Background = new LinearGradientColorTable(factory.GetColor(0xFFF59F), factory.GetColor(0xFFFAD5));
+            rt.Selected.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(64, Color.White), Color.Transparent);
+            rt.Selected.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFFFBD6), factory.GetColor(0xFDF28C));
+            rt.Selected.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xCAC7AC), factory.GetColor(0xC2C2C2));
+            rt.Selected.Text = factory.GetColor(0x3B3B3B);
+
+            // Selected Tab Mouse Over
+            rt.SelectedMouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.SelectedMouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xFFF59F), factory.GetColor(0xFFFAD5));
+            rt.SelectedMouseOver.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(32, Color.White), Color.Transparent);
+            rt.SelectedMouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFFFBD6), factory.GetColor(0xFDF28C));
+            rt.SelectedMouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xCAC7AC), factory.GetColor(0xC2C2C2));
+            rt.SelectedMouseOver.Text = factory.GetColor(0x3B3B3B);
+
+            // Tab Mouse Over
+            rt.MouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.MouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xCFE0E1), factory.GetColor(0xE9E799));
+            rt.MouseOver.BackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xCBE2FF), Color.Transparent);
+            rt.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xE2EFFF), factory.GetColor(0xC7DFFF));
+            rt.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xC1C8D1), factory.GetColor(0xC0C7D0));
+            rt.MouseOver.Text = factory.GetColor(0x3B3B3B);
+
+            return rt;
+        }
+        #endregion
+
+        #region Style Class Creation
+        public static ElementStyle GetSlideOutButtonStyle(Color complementColor)
+        {
+            ElementStyle style = new ElementStyle(ElementStyleClassKeys.SlideOutButtonKey);
+            style.BackColor = complementColor;
+            style.TextColor = Color.White;
+            return style;
+        }
+
+        public static ElementStyle GetFileMenuContainerStyle(Office2007ColorTable table)
+        {
+            ElementStyle style = new ElementStyle();
+            style.Class = ElementStyleClassKeys.RibbonFileMenuContainerKey;
+            Office2007MenuColorTable mc = table.Menu;
+
+            style.PaddingBottom = 3;
+            style.PaddingLeft = 0;
+            style.PaddingRight = 0;
+            style.PaddingTop = 22;
+            style.Border = eStyleBorderType.Solid;
+            style.CornerType = eCornerType.Rounded;
+            style.BorderWidth = 1;
+            style.BorderColor = Color.Transparent;
+            style.CornerDiameter = 3;
+            BackgroundColorBlend[] blend = new BackgroundColorBlend[mc.FileBackgroundBlend.Count];
+            mc.FileBackgroundBlend.CopyTo(blend);
+            style.BackColorBlend.Clear();
+            style.BackColorBlend.AddRange(blend);
+            style.BackColorGradientAngle = 90;
+            return style;
+        }
+
+        public static ElementStyle GetTwoColumnMenuContainerStyle(Office2007ColorTable table)
+        {
+            ElementStyle style = new ElementStyle();
+            style.Class = ElementStyleClassKeys.RibbonFileMenuTwoColumnContainerKey;
+            Office2007MenuColorTable mc = table.Menu;
+
+            style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Double;
+            style.BorderBottomWidth = 0;
+            style.BorderColor = mc.FileContainerBorder;
+            //style.BorderColorLight = mc.FileContainerBorderLight;
+            style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.None;
+            style.BorderLeftWidth = 0;
+            style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.None;
+            style.BorderRightWidth = 0;
+            style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            style.BorderTopWidth = 1;
+            style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            style.BorderBottomWidth = 1;
+            style.PaddingBottom = 0;
+            style.PaddingLeft = 0;
+            style.PaddingRight = 0;
+            style.PaddingTop = 0;
+
+            return style;
+        }
+
+        public static ElementStyle GetMenuColumnOneContainerStyle(Office2007ColorTable table)
+        {
+            ElementStyle style = new ElementStyle();
+            style.Class = ElementStyleClassKeys.RibbonFileMenuColumnOneContainerKey;
+            Office2007MenuColorTable mc = table.Menu;
+
+            style.BackColor = mc.FileColumnOneBackground;
+            style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            style.BorderRightColor = mc.FileColumnOneBorder;
+            style.BorderRightWidth = 1;
+            style.PaddingRight = 1;
+
+            return style;
+        }
+
+        public static ElementStyle GetMenuColumnTwoContainerStyle(Office2007ColorTable table)
+        {
+            ElementStyle style = new ElementStyle();
+            style.Class = ElementStyleClassKeys.RibbonFileMenuColumnTwoContainerKey;
+            Office2007MenuColorTable mc = table.Menu;
+
+            style.BackColor = mc.FileColumnTwoBackground;
+
+            return style;
+        }
+
+        public static ElementStyle GetMenuBottomContainer(Office2007ColorTable table)
+        {
+            ElementStyle style = new ElementStyle();
+            style.Class = ElementStyleClassKeys.RibbonFileMenuBottomContainerKey;
+            Office2007MenuColorTable mc = table.Menu;
+
+            //BackgroundColorBlend[] blend = new BackgroundColorBlend[mc.FileBottomContainerBackgroundBlend.Count];
+            //mc.FileBottomContainerBackgroundBlend.CopyTo(blend);
+            //style.BackColorBlend.Clear();
+            //style.BackColorBlend.AddRange(blend);
+            //style.BackColorGradientAngle = 90;
+            style.MarginTop = 2;
+            style.MarginRight = 2;
+            return style;
+        }
+        #endregion
+
+        #region Scroll Bar
+        public static void InitializeScrollBarColorTable(Office2007ColorTable t, ColorFactory factory, MetroPartColors metroParts)
+        {
+            InitializeScrollBarColorTable(t.ScrollBar, factory, metroParts);
+        }
+        public static void InitializeScrollBarColorTable(Office2007ScrollBarColorTable scrollBarColorTable, ColorFactory factory, MetroPartColors metroParts)
+        {
+            Office2007ScrollBarStateColorTable sct = scrollBarColorTable.Default;
+            sct.Background = new LinearGradientColorTable(factory.GetColor(metroParts.CanvasColor));
+            sct.Border = LinearGradientColorTable.Empty;
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(metroParts.TextInactiveColor));
+            sct.ThumbOuterBorder = new LinearGradientColorTable(factory.GetColor(metroParts.CanvasColorLightShade));
+            sct.TrackBackground.Clear();
+            sct.TrackInnerBorder = LinearGradientColorTable.Empty;
+            sct.TrackOuterBorder = new LinearGradientColorTable(factory.GetColor(metroParts.CanvasColorLightShade));
+            sct.TrackSignBackground = new LinearGradientColorTable(factory.GetColor(metroParts.CanvasColor));
+
+            // Mouse Over
+            sct = scrollBarColorTable.MouseOver;
+            sct.Background = scrollBarColorTable.Default.Background;
+            sct.Border = scrollBarColorTable.Default.Border;
+            sct.ThumbBackground.Clear();
+            sct.ThumbInnerBorder = LinearGradientColorTable.Empty;
+            sct.ThumbOuterBorder = new LinearGradientColorTable(factory.GetColor(metroParts.CanvasColorLightShade));
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(metroParts.TextInactiveColor));
+            sct.TrackBackground.Clear();
+            sct.TrackInnerBorder = LinearGradientColorTable.Empty;
+            sct.TrackOuterBorder = new LinearGradientColorTable(factory.GetColor(metroParts.CanvasColorLightShade));
+            sct.TrackSignBackground = new LinearGradientColorTable(factory.GetColor(metroParts.CanvasColorLighterShade));
+
+            // Control Mouse Over
+            sct = scrollBarColorTable.MouseOverControl;
+            sct.Background = scrollBarColorTable.Default.Background;
+            sct.Border = scrollBarColorTable.Default.Border;
+            sct.ThumbBackground.Clear();
+            sct.ThumbInnerBorder = LinearGradientColorTable.Empty;
+            sct.ThumbOuterBorder = new LinearGradientColorTable(factory.GetColor(metroParts.CanvasColorLightShade));
+            sct.ThumbSignBackground = scrollBarColorTable.Default.ThumbSignBackground;
+            sct.TrackBackground.Clear();
+            sct.TrackInnerBorder = LinearGradientColorTable.Empty;
+            sct.TrackOuterBorder = new LinearGradientColorTable(factory.GetColor(metroParts.CanvasColorLightShade));
+            sct.TrackSignBackground = new LinearGradientColorTable(factory.GetColor(metroParts.CanvasColor));
+
+            // Pressed
+            sct = scrollBarColorTable.Pressed;
+            sct.Background = scrollBarColorTable.Default.Background;
+            sct.Border = scrollBarColorTable.Default.Border;
+            sct.ThumbBackground.Clear();
+            sct.ThumbInnerBorder = LinearGradientColorTable.Empty;
+            sct.ThumbOuterBorder = new LinearGradientColorTable(factory.GetColor(metroParts.TextInactiveColor));
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(metroParts.TextInactiveColor));
+            sct.TrackBackground.Clear();
+            sct.TrackInnerBorder = LinearGradientColorTable.Empty;
+            sct.TrackOuterBorder = new LinearGradientColorTable(factory.GetColor(metroParts.TextInactiveColor));
+            sct.TrackSignBackground = new LinearGradientColorTable(factory.GetColor(metroParts.CanvasColorLighterShade));
+            // Disabled
+            sct = scrollBarColorTable.Disabled;
+            sct.Background = scrollBarColorTable.Default.Background;
+            sct.Border = scrollBarColorTable.Default.Border;
+            sct.ThumbBackground.Clear();
+            sct.ThumbInnerBorder = new LinearGradientColorTable();
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(metroParts.TextDisabledColor));
+            sct.TrackBackground.Clear();
+            sct.TrackInnerBorder = new LinearGradientColorTable();
+            sct.TrackSignBackground = new LinearGradientColorTable();
+        }
+        public static void InitializeAppBlueScrollBarColorTable(Office2007ColorTable t, ColorFactory factory, MetroPartColors metroParts)
+        {
+            InitializeScrollBarColorTable(t.AppScrollBar, factory, metroParts);
+        }
+        #endregion
+
+        #region AdvTree
+        public static void CreateAdvTreeColorTable(TreeColorTable ct, ColorFactory factory, MetroPartColors metroColors)
+        {
+            #region Tree Selection
+            TreeSelectionColors treeSelection = new TreeSelectionColors();
+            ct.Selection = treeSelection;
+            // Highlight full row
+            SelectionColorTable selColorTable = new SelectionColorTable();
+            selColorTable.Fill = new SolidFill(factory.GetColor(metroColors.BaseColor));
+            selColorTable.TextColor = factory.GetColor(metroColors.BaseTextColor);
+            treeSelection.FullRowSelect = selColorTable;
+            //  Highlight full row Inactive
+            selColorTable = new SelectionColorTable();
+            selColorTable.Fill = new SolidFill(metroColors.CanvasColorLightShade);
+            treeSelection.FullRowSelectInactive = selColorTable;
+
+            // Node Marker
+            selColorTable = new SelectionColorTable();
+            selColorTable.Fill = new SolidFill(factory.GetColor(metroColors.BaseColor));
+            selColorTable.TextColor = factory.GetColor(metroColors.BaseTextColor);
+            treeSelection.NodeMarker = selColorTable;
+            // Node marker inactive
+            selColorTable = new SelectionColorTable();
+            selColorTable.Fill = new SolidFill(factory.GetColor(metroColors.CanvasColorLightShade));
+            treeSelection.NodeMarkerInactive = selColorTable;
+
+            // Cell selection
+            selColorTable = new SelectionColorTable();
+            selColorTable.Fill = new SolidFill(factory.GetColor(metroColors.BaseColor));
+            selColorTable.TextColor = factory.GetColor(metroColors.BaseTextColor);
+            treeSelection.HighlightCells = selColorTable;
+            // Cell selection inactive
+            selColorTable = new SelectionColorTable();
+            selColorTable.Fill = new SolidFill(factory.GetColor(metroColors.CanvasColorLightShade));
+            treeSelection.HighlightCellsInactive = selColorTable;
+
+            selColorTable = new SelectionColorTable();
+            selColorTable.Fill = new SolidFill(factory.GetColor(metroColors.BaseColor));
+            selColorTable.TextColor = factory.GetColor(metroColors.BaseTextColor);
+            treeSelection.NodeHotTracking = selColorTable;
+            #endregion
+
+            #region Expand Buttons
+            TreeExpandColorTable expand = new TreeExpandColorTable();
+            expand.CollapseBorder = new SolidBorder(factory.GetColor(metroColors.CanvasColorDarkShade), 1);
+            expand.CollapseFill = new SolidFill(factory.GetColor(metroColors.CanvasColor));
+            expand.CollapseMouseOverBorder = new SolidBorder(factory.GetColor(metroColors.TextColor), 1);
+            expand.CollapseMouseOverFill = new SolidFill(factory.GetColor(metroColors.TextColor));
+            expand.ExpandBorder = new SolidBorder(factory.GetColor(metroColors.CanvasColorDarkShade), 1);
+            expand.ExpandFill = new SolidFill(factory.GetColor(metroColors.CanvasColor));
+            expand.ExpandMouseOverBorder = new SolidBorder(factory.GetColor(metroColors.TextColor), 1);
+            expand.ExpandMouseOverFill = new SolidFill(factory.GetColor(metroColors.CanvasColor));
+            ct.ExpandTriangle = expand;
+            // Rectangle
+            expand = new TreeExpandColorTable();
+            expand.CollapseForeground = new SolidFill(factory.GetColor(metroColors.CanvasColorDarkShade));
+            expand.CollapseBorder = new SolidBorder(factory.GetColor(metroColors.TextColor), 1);
+            expand.CollapseFill = new GradientFill(new ColorStop[]{
+                new ColorStop(factory.GetColor(metroColors.CanvasColor), 0f), new ColorStop(factory.GetColor(metroColors.CanvasColor), .40f), new ColorStop(factory.GetColor(metroColors.CanvasColorLighterShade), 1f)}, 45);
+            expand.CollapseMouseOverForeground = expand.CollapseForeground;
+            expand.CollapseMouseOverBorder = expand.CollapseBorder;
+            expand.CollapseMouseOverFill = expand.CollapseFill;
+            expand.ExpandForeground = expand.CollapseForeground;
+            expand.ExpandBorder = expand.CollapseBorder;
+            expand.ExpandFill = expand.CollapseFill;
+            expand.ExpandMouseOverForeground = expand.CollapseForeground;
+            expand.ExpandMouseOverBorder = expand.CollapseBorder;
+            expand.ExpandMouseOverFill = expand.CollapseFill;
+            ct.ExpandRectangle = expand;
+            ct.ExpandEllipse = expand;
+            #endregion
+
+            #region Misc Tree Color
+            ct.GridLines = factory.GetColor(metroColors.CanvasColorLightShade);
+            #endregion
+        }
+        #endregion
+
+        #region RibbonTab Group
+        public static Office2007RibbonTabGroupColorTable GetRibbonTabGroupDefault(ColorFactory factory)
+        {
+            Office2007RibbonTabGroupColorTable tg = new Office2007RibbonTabGroupColorTable();
+            tg.Background = new LinearGradientColorTable(factory.GetColor(0xF6F1FC));
+            tg.BackgroundHighlight = LinearGradientColorTable.Empty;
+            tg.Text = factory.GetColor(0x935ED3);
+            tg.Border = new LinearGradientColorTable(factory.GetColor(0x935ED3));
+
+            return tg;
+        }
+
+        public static Office2007RibbonTabGroupColorTable GetRibbonTabGroupOrange(ColorFactory factory)
+        {
+            Office2007RibbonTabGroupColorTable tg = new Office2007RibbonTabGroupColorTable();
+            tg.Background = new LinearGradientColorTable(factory.GetColor(0xFFF8ED));
+            tg.BackgroundHighlight = LinearGradientColorTable.Empty;
+            tg.Text = factory.GetColor(0xCF5C0A);
+            tg.Border = new LinearGradientColorTable(factory.GetColor(0xFF9D00));
+
+            return tg;
+        }
+
+        public static Office2007RibbonTabGroupColorTable GetRibbonTabGroupMagenta(ColorFactory factory)
+        {
+            Office2007RibbonTabGroupColorTable tg = new Office2007RibbonTabGroupColorTable();
+            tg.Background = new LinearGradientColorTable(factory.GetColor(0xFCF0F7));
+            tg.BackgroundHighlight = LinearGradientColorTable.Empty;
+            tg.Text = factory.GetColor(0xC9599C);
+            tg.Border = new LinearGradientColorTable(factory.GetColor(0xC9599C));
+
+            return tg;
+        }
+
+        public static Office2007RibbonTabGroupColorTable GetRibbonTabGroupGreen(ColorFactory factory)
+        {
+            Office2007RibbonTabGroupColorTable tg = new Office2007RibbonTabGroupColorTable();
+            tg.Background = new LinearGradientColorTable(factory.GetColor(0xE6F3E6));
+            tg.BackgroundHighlight = LinearGradientColorTable.Empty;
+            tg.Text = factory.GetColor(0x49A349);
+            tg.Border = new LinearGradientColorTable(factory.GetColor(0x49A349));
+
+            return tg;
+        }
+        #endregion
+
+        #region RangeSlider
+        internal static void InitRangeSlider(Office2007ColorTable table, ColorFactory factory, MetroPartColors metroColors)
+        {
+            Office2010RangeSliderColorTable rsl = table.RangeSlider;
+            rsl.TickLineColor = factory.GetColor(metroColors.TextInactiveColor);
+
+            rsl.RangeBackground = new GradientColorTable(factory.GetColor(metroColors.CanvasColorLightShade));
+            rsl.RangeLineColor = factory.GetColor(metroColors.TextInactiveColor);
+            rsl.RangeValueBackground = new GradientColorTable(factory.GetColor(metroColors.BaseColorLight));
+            rsl.RangeValueLineColor = factory.GetColor(metroColors.BaseColor);
+            rsl.RangeCornerRadius = 0;
+
+            rsl.MinRangeSlider.Default.Background = new GradientColorTable(factory.GetColor(metroColors.BaseColor));
+            rsl.MinRangeSlider.Default.BorderColor = factory.GetColor(metroColors.BaseColor);
+            rsl.MinRangeSlider.Default.BorderLightColor = Color.Empty;
+            rsl.MinRangeSlider.Disabled.Background = new GradientColorTable(factory.GetColor(metroColors.TextDisabledColor));
+            rsl.MinRangeSlider.Disabled.BorderColor = metroColors.TextDisabledColor;
+            rsl.MinRangeSlider.Disabled.BorderLightColor = Color.Empty;
+            rsl.MinRangeSlider.MouseOver.Background = new GradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            rsl.MinRangeSlider.MouseOver.BorderColor = metroColors.BaseColorDark;
+            rsl.MinRangeSlider.MouseOver.BorderLightColor = Color.Empty;
+            rsl.MinRangeSlider.Pressed.Background = rsl.MinRangeSlider.MouseOver.Background;
+            rsl.MinRangeSlider.Pressed.BorderColor = rsl.MinRangeSlider.MouseOver.BorderColor;
+            rsl.MinRangeSlider.Pressed.BorderLightColor = rsl.MinRangeSlider.MouseOver.BorderLightColor;
+
+            rsl.MaxRangeSlider = rsl.MinRangeSlider;
+        }
+        #endregion
+    }
+
+
+}
diff --git a/PROMS/DotNetBar Source Code/Metro/ColorTables/MetroStatusBarColorTable.cs b/PROMS/DotNetBar Source Code/Metro/ColorTables/MetroStatusBarColorTable.cs
new file mode 100644
index 00000000..8b022041
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Metro/ColorTables/MetroStatusBarColorTable.cs	
@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Metro.ColorTables
+{
+    public class MetroStatusBarColorTable
+    {
+        /// <summary>
+        /// Gets or sets the color array for the top-border lines.
+        /// </summary>
+        public Color[] TopBorders;
+        /// <summary>
+        /// Gets or sets the color array for the bottom-border lines.
+        /// </summary>
+        public Color[] BottomBorders;
+        /// <summary>
+        /// Gets or sets status bar background style.
+        /// </summary>
+        public ElementStyle BackgroundStyle = null;
+        /// <summary>
+        /// Gets or sets the resize handle marker light color.
+        /// </summary>
+        public Color ResizeMarkerLightColor;
+        /// <summary>
+        /// Gets or sets the resize handle marker color.
+        /// </summary>
+        public Color ResizeMarkerColor;
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Metro/ColorTables/MetroTabColorTable.cs b/PROMS/DotNetBar Source Code/Metro/ColorTables/MetroTabColorTable.cs
new file mode 100644
index 00000000..cdd28296
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Metro/ColorTables/MetroTabColorTable.cs	
@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Metro.ColorTables
+{
+    public class MetroTabColorTable
+    {
+        /// <summary>
+        /// Gets or sets the color table for MetroTabStrip.
+        /// </summary>
+        public MetroTabStripColorTable TabStrip = new MetroTabStripColorTable();
+
+        /// <summary>
+        /// Gets or sets tab panel background style.
+        /// </summary>
+        public ElementStyle TabPanelBackgroundStyle = new ElementStyle();
+
+        /// <summary>
+        /// Gets or sets the color table for MetroTabItem.
+        /// </summary>
+        public MetroTabItemColorTable MetroTabItem = new MetroTabItemColorTable();
+
+        /// <summary>
+        /// Gets or sets the color of the active form caption text displayed on metro strip.
+        /// </summary>
+        public Color ActiveCaptionText;
+        /// <summary>
+        /// Gets or sets the color of the inactive form caption text displayed on metro strip.
+        /// </summary>
+        public Color InactiveCaptionText;
+        /// <summary>
+        /// Gets or sets the text formatting for caption text.
+        /// </summary>
+        public eTextFormat CaptionTextFormat = eTextFormat.VerticalCenter | eTextFormat.Left | eTextFormat.EndEllipsis | eTextFormat.NoPrefix;
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Metro/ColorTables/MetroTabItemColorTable.cs b/PROMS/DotNetBar Source Code/Metro/ColorTables/MetroTabItemColorTable.cs
new file mode 100644
index 00000000..c20fb116
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Metro/ColorTables/MetroTabItemColorTable.cs	
@@ -0,0 +1,52 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Metro.ColorTables
+{
+    /// <summary>
+    /// Represents MetroTabItem color table.
+    /// </summary>
+    public class MetroTabItemColorTable
+    {
+        /// <summary>
+        /// Gets or sets the default state tab colors.
+        /// </summary>
+        public MetroTabItemStateColorTable Default;
+        /// <summary>
+        /// Gets or sets the mouse over state tab colors.
+        /// </summary>
+        public MetroTabItemStateColorTable MouseOver;
+        /// <summary>
+        /// Gets or sets the selected state tab colors.
+        /// </summary>
+        public MetroTabItemStateColorTable Selected;
+        /// <summary>
+        /// Gets or sets the pressed state tab colors.
+        /// </summary>
+        public MetroTabItemStateColorTable Pressed;
+        /// <summary>
+        /// Gets or sets the disabled state tab colors.
+        /// </summary>
+        public MetroTabItemStateColorTable Disabled;
+    }
+
+    public class MetroTabItemStateColorTable
+    {
+        /// <summary>
+        /// Initializes a new instance of the MetroTabItemStateColorTable class.
+        /// </summary>
+        /// <param name="textColor"></param>
+        /// <param name="background"></param>
+        public MetroTabItemStateColorTable(ElementStyle background)
+        {
+            Background = background;
+        }
+
+        /// <summary>
+        /// Gets or sets the background style.
+        /// </summary>
+        public ElementStyle Background = null;
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Metro/ColorTables/MetroTabStripColorTable.cs b/PROMS/DotNetBar Source Code/Metro/ColorTables/MetroTabStripColorTable.cs
new file mode 100644
index 00000000..0b5a9841
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Metro/ColorTables/MetroTabStripColorTable.cs	
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Metro.ColorTables
+{
+    public class MetroTabStripColorTable
+    {
+        /// <summary>
+        /// Gets or sets tabstrip background style.
+        /// </summary>
+        public ElementStyle BackgroundStyle = new ElementStyle();
+        
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Metro/ColorTables/MetroTileColorTable.cs b/PROMS/DotNetBar Source Code/Metro/ColorTables/MetroTileColorTable.cs
new file mode 100644
index 00000000..bb91705b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Metro/ColorTables/MetroTileColorTable.cs	
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Metro.ColorTables
+{
+    public class MetroTileColorTable
+    {
+        /// <summary>
+        /// Gets or sets the tile check-mark background overlay color.
+        /// </summary>
+        public Color CheckBackground = Color.FromArgb(76, Color.Black);
+
+        /// <summary>
+        /// Gets or sets the tile check-mark foreground overlay color.
+        /// </summary>
+        public Color CheckForeground = Color.FromArgb(204, Color.White);
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Metro/ColorTables/MetroToolbarColorTable.cs b/PROMS/DotNetBar Source Code/Metro/ColorTables/MetroToolbarColorTable.cs
new file mode 100644
index 00000000..b697e8e2
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Metro/ColorTables/MetroToolbarColorTable.cs	
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace DevComponents.DotNetBar.Metro.ColorTables
+{
+    public class MetroToolbarColorTable
+    {
+        /// <summary>
+        /// Gets or sets toolbar background style.
+        /// </summary>
+        public ElementStyle BackgroundStyle = null;
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Metro/ColorTables/Office2016ColorTableInitializer.cs b/PROMS/DotNetBar Source Code/Metro/ColorTables/Office2016ColorTableInitializer.cs
new file mode 100644
index 00000000..0aa0e2df
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Metro/ColorTables/Office2016ColorTableInitializer.cs	
@@ -0,0 +1,2709 @@
+using System;
+using System.Text;
+using System.Drawing;
+using DevComponents.DotNetBar.Schedule;
+using DevComponents.DotNetBar.Rendering;
+using DevComponents.AdvTree.Display;
+using DevComponents.DotNetBar.Controls;
+using DevComponents.WinForms.Drawing;
+
+
+namespace DevComponents.DotNetBar.Metro.ColorTables
+{
+    internal class Office2016ColorTableInitializer
+    {
+        public static void InitializeColorTable(Office2007ColorTable table, ColorFactory factory, MetroPartColors metroColors)
+        {
+            // This was conflicting with buttons which used CanvasColorLight for on mouse over effect.
+            //Color ribbonBack = factory.GetColor(metroColors.IsSolidCanvas ? metroColors.CanvasColor : metroColors.CanvasColorLight);
+            Color ribbonBack = factory.GetColor(metroColors.CanvasColorLight);
+
+            #region RibbonControl Start Images
+            table.RibbonControl.StartButtonDefault = BarFunctions.LoadBitmap("SystemImages.BlankOffice2010NormalSilver.png");
+            table.RibbonControl.StartButtonMouseOver = BarFunctions.LoadBitmap("SystemImages.BlankOffice2010HotSilver.png");
+            table.RibbonControl.StartButtonPressed = BarFunctions.LoadBitmap("SystemImages.BlankOffice2010PressedSilver.png");
+            #endregion
+
+            #region RibbonControl
+            table.RibbonControl.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            table.RibbonControl.InnerBorder = null; // LinearGradientColorTable.Empty;// new LinearGradientColorTable(factory.GetColor(Color.FromArgb(32, Color.White)));
+            table.RibbonControl.TabsBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            table.RibbonControl.TabsGlassBackground = new LinearGradientColorTable(Color.Transparent, factory.GetColor(metroColors.CanvasColor));
+            table.RibbonControl.TabDividerBorder = Color.Empty; // factory.GetColor(0xA7BAD1);
+            table.RibbonControl.TabDividerBorderLight = Color.Empty; // factory.GetColor(0xF4F8FD);
+            table.RibbonControl.CornerSize = 1;
+            table.RibbonControl.PanelTopBackgroundHeight = 0;
+            table.RibbonControl.PanelTopBackground = new LinearGradientColorTable(ribbonBack);
+            table.RibbonControl.PanelBottomBackground = null; // new LinearGradientColorTable(factory.GetColor(0xF6F7F8), factory.GetColor(0xE5E9EE));
+            #endregion
+
+            #region Ribbon KeyTips
+            table.KeyTips.KeyTipBackground = factory.GetColor(metroColors.TextDisabledColor);
+            table.KeyTips.KeyTipText = factory.GetColor(metroColors.CanvasColor);
+            table.KeyTips.KeyTipBorder = factory.GetColor(metroColors.TextDisabledColor);
+            #endregion
+
+            #region Item Group
+            table.ItemGroup.OuterBorder = LinearGradientColorTable.Empty; //new LinearGradientColorTable(factory.GetColor(0xC0C3C8));
+            table.ItemGroup.InnerBorder = LinearGradientColorTable.Empty;
+            table.ItemGroup.TopBackground = LinearGradientColorTable.Empty;
+            table.ItemGroup.BottomBackground = LinearGradientColorTable.Empty;
+            table.ItemGroup.ItemGroupDividerDark = Color.Empty;
+            table.ItemGroup.ItemGroupDividerLight = Color.Empty;
+            #endregion
+
+            #region RibbonBar
+            table.RibbonBar.Default = GetRibbonBar(factory, metroColors, ribbonBack);
+            table.RibbonBar.MouseOver = GetRibbonBarMouseOver(factory, metroColors, ribbonBack);
+            table.RibbonBar.Expanded = GetRibbonBarExpanded(factory, metroColors, ribbonBack);
+            #endregion
+
+            #region ButtonItem Colors Initialization
+            table.RibbonButtonItemColors.Clear();
+            table.ButtonItemColors.Clear();
+            table.MenuButtonItemColors.Clear();
+            // Orange
+            Office2007ButtonItemColorTable cb = GetButtonItemDefault(factory, metroColors);
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Orange);
+            table.ButtonItemColors.Add(cb);
+            // Orange with background
+            cb = GetButtonItemDefaultWithBackground(factory, metroColors);
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.OrangeWithBackground);
+            table.ButtonItemColors.Add(cb);
+            // Blue
+            cb = GetButtonItemBlue(factory, metroColors);
+            cb.MouseOverSplitInactive = new Office2007ButtonItemStateColorTable();
+            cb.MouseOverSplitInactive.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xB1BAC4));
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Blue);
+            table.ButtonItemColors.Add(cb);
+            // Blue with background
+            cb = GetButtonItemBlueWithBackground(factory, metroColors);
+            cb.MouseOverSplitInactive = new Office2007ButtonItemStateColorTable();
+            cb.MouseOverSplitInactive.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xB1BAC4));
+            cb.MouseOverSplitInactive = cb.Default;
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.BlueWithBackground);
+            table.ButtonItemColors.Add(cb);
+            // Magenta
+            cb = GetButtonItemMagenta(factory, metroColors);
+            cb.MouseOverSplitInactive = new Office2007ButtonItemStateColorTable();
+            cb.MouseOverSplitInactive.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xB1BAC4));
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Magenta);
+            table.ButtonItemColors.Add(cb);
+            // Blue with background
+            cb = GetButtonItemMagentaWithBackground(factory, metroColors);
+            cb.MouseOverSplitInactive = new Office2007ButtonItemStateColorTable();
+            cb.MouseOverSplitInactive.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xB1BAC4));
+            cb.MouseOverSplitInactive = cb.Default;
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.MagentaWithBackground);
+            table.ButtonItemColors.Add(cb);
+
+            cb = Office2010BlueFactory.GetButtonItemOffice2007WithBackground(factory);
+            cb.MouseOverSplitInactive = new Office2007ButtonItemStateColorTable();
+            cb.MouseOverSplitInactive.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xB1BAC4));
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Office2007WithBackground);
+            table.ButtonItemColors.Add(cb);
+
+            table.ButtonItemColors.Add(CreateBlueOrbColorTable(factory, metroColors));
+
+            table.BackstageButtonItemColors.Clear();
+            table.BackstageButtonItemColors.Add(GetButtonItemBackstageDefault(factory, metroColors));
+
+            table.ContextualTables.Add(Office2007ColorTable.GetContextualKey(typeof(Office2007ButtonItemColorTable), "StatusBar"), GetButtonItemStatusBar(factory, metroColors));
+            table.ContextualTables.Add(Office2007ColorTable.GetContextualKey(typeof(Office2007ButtonItemColorTable), "MetroTabStrip"), GetButtonItemStatusBar(factory, metroColors));
+            table.ContextualTables.Add(Office2007ColorTable.GetContextualKey(typeof(Office2007ButtonItemColorTable), "NavigationBar"), GetButtonItemNavigationBar(factory, metroColors));
+            #endregion
+
+            #region RibbonTabItem Colors Initialization
+            table.RibbonTabItemColors.Clear();
+            Office2007RibbonTabItemColorTable rt = GetRibbonTabItemBlueDefault(factory, metroColors, ribbonBack);
+            rt.Name = Enum.GetName(typeof(eRibbonTabColor), eRibbonTabColor.Default);
+            table.RibbonTabItemColors.Add(rt);
+
+            // Magenta
+            rt = GetRibbonTabItemBlueDefault(factory, metroColors, ribbonBack); //GetRibbonTabItemBlueMagenta(factory);
+            rt.Name = Enum.GetName(typeof(eRibbonTabColor), eRibbonTabColor.Magenta);
+            table.RibbonTabItemColors.Add(rt);
+
+            // Green
+            rt = GetRibbonTabItemBlueDefault(factory, metroColors, ribbonBack); //GetRibbonTabItemBlueGreen(factory);
+            rt.Name = Enum.GetName(typeof(eRibbonTabColor), eRibbonTabColor.Green);
+            table.RibbonTabItemColors.Add(rt);
+
+            // Orange
+            rt = GetRibbonTabItemBlueDefault(factory, metroColors, ribbonBack); //GetRibbonTabItemBlueOrange(factory);
+            rt.Name = Enum.GetName(typeof(eRibbonTabColor), eRibbonTabColor.Orange);
+            table.RibbonTabItemColors.Add(rt);
+            #endregion
+
+            #region RibbonTabItemGroup Colors Initialization
+            table.RibbonTabGroupColors.Clear();
+            // Default
+            Office2007RibbonTabGroupColorTable tg = GetRibbonTabGroupDefault(factory, metroColors);
+            tg.Name = Enum.GetName(typeof(eRibbonTabGroupColor), eRibbonTabGroupColor.Default);
+            table.RibbonTabGroupColors.Add(tg);
+
+            // Magenta
+            tg = GetRibbonTabGroupMagenta(factory, metroColors);
+            tg.Name = Enum.GetName(typeof(eRibbonTabGroupColor), eRibbonTabGroupColor.Magenta);
+            table.RibbonTabGroupColors.Add(tg);
+
+            // Green
+            tg = GetRibbonTabGroupGreen(factory, metroColors);
+            tg.Name = Enum.GetName(typeof(eRibbonTabGroupColor), eRibbonTabGroupColor.Green);
+            table.RibbonTabGroupColors.Add(tg);
+
+            // Orange
+            tg = GetRibbonTabGroupOrange(factory, metroColors);
+            tg.Name = Enum.GetName(typeof(eRibbonTabGroupColor), eRibbonTabGroupColor.Orange);
+            table.RibbonTabGroupColors.Add(tg);
+            #endregion
+
+            #region Initialize Bar
+            table.Bar.ToolbarTopBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor)/*, factory.GetColor(metroColors.BaseColorDark)*/);
+            table.Bar.ToolbarBottomBackground = null; // new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            table.Bar.ToolbarBottomBorder = Color.Empty;
+            table.Bar.PopupToolbarBackground = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor), Color.Empty);
+            table.Bar.PopupToolbarBorder = factory.GetColor(metroColors.BaseColor);
+            table.Bar.StatusBarTopBorder = factory.GetColor(metroColors.BaseColor);
+            table.Bar.StatusBarTopBorderLight = factory.GetColor(metroColors.BaseColor);
+            table.Bar.StatusBarAltBackground.Clear();
+            table.Bar.StatusBarAltBackground.Add(new BackgroundColorBlend(factory.GetColor(metroColors.BaseColor), 0f));
+            table.Bar.StatusBarAltBackground.Add(new BackgroundColorBlend(factory.GetColor(metroColors.BaseColor), 1f));
+            #endregion
+
+            #region Menu
+            table.Menu.Background = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor), Color.Empty);
+            table.Menu.Border = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColorLightShade), Color.Empty);
+            table.Menu.Side = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor), Color.Empty);
+            table.Menu.SideBorder = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor), Color.Empty);
+            table.Menu.SideBorderLight = LinearGradientColorTable.Empty;
+            table.Menu.SideUnused = LinearGradientColorTable.Empty;
+            table.Menu.FileBackgroundBlend.Clear();
+            table.Menu.FileBackgroundBlend.AddRange(new DevComponents.DotNetBar.BackgroundColorBlend[] {
+                new DevComponents.DotNetBar.BackgroundColorBlend(factory.GetColor(metroColors.CanvasColorLighterShade), 0F),
+                new DevComponents.DotNetBar.BackgroundColorBlend(factory.GetColor(metroColors.CanvasColorLighterShade), 1F)});
+            table.Menu.FileContainerBorder = factory.GetColor(metroColors.CanvasColorLightShade);
+            table.Menu.FileContainerBorderLight = Color.Transparent;
+            table.Menu.FileColumnOneBackground = factory.GetColor(metroColors.CanvasColor);
+            table.Menu.FileColumnOneBorder = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.Menu.FileColumnTwoBackground = factory.GetColor(metroColors.CanvasColor);
+            table.Menu.FileBottomContainerBackgroundBlend.Clear();
+            #endregion
+
+            #region ComboBox
+            table.ComboBox.Default.Background = factory.GetColor(metroColors.EditControlBackColor);
+            table.ComboBox.Default.Border = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.ComboBox.Default.ExpandBackground = new LinearGradientColorTable();
+            table.ComboBox.Default.ExpandBorderInner = new LinearGradientColorTable();
+            table.ComboBox.Default.ExpandBorderOuter = new LinearGradientColorTable();
+            table.ComboBox.Default.ExpandText = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.ComboBox.DefaultStandalone.Background = factory.GetColor(metroColors.EditControlBackColor);
+            table.ComboBox.DefaultStandalone.Border = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.ComboBox.DefaultStandalone.ExpandBackground = LinearGradientColorTable.Empty;
+            table.ComboBox.DefaultStandalone.ExpandBorderInner = LinearGradientColorTable.Empty;
+            table.ComboBox.DefaultStandalone.ExpandBorderOuter = LinearGradientColorTable.Empty;
+            table.ComboBox.DefaultStandalone.ExpandText = factory.GetColor(metroColors.TextColor);
+            table.ComboBox.MouseOver.Background = factory.GetColor(metroColors.EditControlBackColor);
+            table.ComboBox.MouseOver.Border = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.ComboBox.MouseOver.ExpandBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            table.ComboBox.MouseOver.ExpandBorderInner = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            table.ComboBox.MouseOver.ExpandBorderOuter = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            table.ComboBox.MouseOver.ExpandText = factory.GetColor(metroColors.TextColor);
+            table.ComboBox.DroppedDown.Background = factory.GetColor(metroColors.EditControlBackColor);
+            table.ComboBox.DroppedDown.Border = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.ComboBox.DroppedDown.ExpandBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            table.ComboBox.DroppedDown.ExpandBorderInner = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            table.ComboBox.DroppedDown.ExpandBorderOuter = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            table.ComboBox.DroppedDown.ExpandText = factory.GetColor(metroColors.TextColor);
+            #endregion
+
+            #region Dialog Launcher
+            table.DialogLauncher.Default.DialogLauncher = factory.GetColor(metroColors.TextInactiveColor);
+            table.DialogLauncher.Default.DialogLauncherShade = Color.Empty; // factory.GetColor(64, 0xFFFFFF);
+
+            table.DialogLauncher.MouseOver.DialogLauncher = factory.GetColor(metroColors.BaseColor);
+            table.DialogLauncher.MouseOver.DialogLauncherShade = Color.Empty; // Color.FromArgb(128, factory.GetColor(0xFFFFFF));
+            table.DialogLauncher.MouseOver.TopBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLightest));
+            table.DialogLauncher.MouseOver.BottomBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLightest));
+            table.DialogLauncher.MouseOver.InnerBorder = LinearGradientColorTable.Empty;// new LinearGradientColorTable(factory.GetColor(Color.FromArgb(128, Color.White)));
+            table.DialogLauncher.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLightest), Color.Empty);
+
+            table.DialogLauncher.Pressed.DialogLauncher = factory.GetColor(metroColors.BaseColor);
+            table.DialogLauncher.Pressed.DialogLauncherShade = Color.Empty; // Color.FromArgb(48, factory.GetColor(0xFFFFFF));
+            table.DialogLauncher.Pressed.TopBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight));
+            table.DialogLauncher.Pressed.BottomBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight));
+            table.DialogLauncher.Pressed.InnerBorder = LinearGradientColorTable.Empty;//new LinearGradientColorTable(factory.GetColor(Color.FromArgb(48, Color.White)));
+            table.DialogLauncher.Pressed.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight), Color.Empty);
+            #endregion
+
+            #region System Button, Form
+            // Default state no background
+            table.SystemButton.Default = new Office2007SystemButtonStateColorTable();
+            table.SystemButton.Default.Foreground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseTextColor));
+            table.SystemButton.Default.LightShade = Color.Empty;
+            table.SystemButton.Default.DarkShade = Color.Empty;
+
+            // Mouse over state
+            table.SystemButton.MouseOver = new Office2007SystemButtonStateColorTable();
+            table.SystemButton.MouseOver.Foreground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseTextColor));
+            table.SystemButton.MouseOver.LightShade = Color.Empty;
+            table.SystemButton.MouseOver.DarkShade = Color.Empty;
+            table.SystemButton.MouseOver.TopBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight1));
+            table.SystemButton.MouseOver.BottomBackground = null;
+            table.SystemButton.MouseOver.TopHighlight = null;
+            table.SystemButton.MouseOver.BottomHighlight = null;
+            table.SystemButton.MouseOver.OuterBorder = null;
+            table.SystemButton.MouseOver.InnerBorder = null;
+
+            // Pressed
+            table.SystemButton.Pressed = new Office2007SystemButtonStateColorTable();
+            table.SystemButton.Pressed.Foreground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseTextColor));
+            table.SystemButton.Pressed.LightShade = Color.Empty;
+            table.SystemButton.Pressed.DarkShade = Color.Empty;
+            table.SystemButton.Pressed.TopBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            table.SystemButton.Pressed.TopHighlight = null;
+            table.SystemButton.Pressed.BottomBackground = null;
+            table.SystemButton.Pressed.BottomHighlight = null;
+            table.SystemButton.Pressed.OuterBorder = null;
+            table.SystemButton.Pressed.InnerBorder = null;
+
+            // CLOSE Default state no background
+            table.SystemButtonClose = new Office2007SystemButtonColorTable();
+            table.SystemButtonClose.Default = new Office2007SystemButtonStateColorTable();
+            table.SystemButtonClose.Default.Foreground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseTextColor));
+            table.SystemButtonClose.Default.LightShade = Color.Empty;
+            table.SystemButtonClose.Default.DarkShade = Color.Empty;
+
+            // Mouse over state
+            table.SystemButtonClose.MouseOver = new Office2007SystemButtonStateColorTable();
+            table.SystemButtonClose.MouseOver.Foreground = new LinearGradientColorTable(factory.GetColor(Color.White));
+            table.SystemButtonClose.MouseOver.LightShade = Color.Empty;
+            table.SystemButtonClose.MouseOver.DarkShade = Color.Empty;
+            table.SystemButtonClose.MouseOver.TopBackground = new LinearGradientColorTable(factory.GetColor(0xE81123));
+            table.SystemButtonClose.MouseOver.BottomBackground = null;
+            table.SystemButtonClose.MouseOver.TopHighlight = null;
+            table.SystemButtonClose.MouseOver.BottomHighlight = null;
+            table.SystemButtonClose.MouseOver.OuterBorder = null;
+            table.SystemButtonClose.MouseOver.InnerBorder = null;
+
+            // Pressed
+            table.SystemButtonClose.Pressed = new Office2007SystemButtonStateColorTable();
+            table.SystemButtonClose.Pressed.Foreground = new LinearGradientColorTable(factory.GetColor(Color.Black));
+            table.SystemButtonClose.Pressed.LightShade = Color.Empty;
+            table.SystemButtonClose.Pressed.DarkShade = Color.Empty;
+            table.SystemButtonClose.Pressed.TopBackground = new LinearGradientColorTable(factory.GetColor(0xF1707A)); ;
+            table.SystemButtonClose.Pressed.TopHighlight = null;
+            table.SystemButtonClose.Pressed.BottomBackground = null;
+            table.SystemButtonClose.Pressed.BottomHighlight = null;
+            table.SystemButtonClose.Pressed.OuterBorder = null;
+            table.SystemButtonClose.Pressed.InnerBorder = null;
+
+            // Form border
+            table.Form.Active.BorderColors = new Color[] {
+                factory.GetColor(metroColors.BaseColor),
+                factory.GetColor(metroColors.CanvasColor),
+                factory.GetColor(metroColors.CanvasColor),
+                factory.GetColor(metroColors.CanvasColor),
+                factory.GetColor(metroColors.CanvasColor)
+            };
+
+            table.Form.Inactive.BorderColors = new Color[] {
+                factory.GetColor(metroColors.BaseColor),
+                factory.GetColor(metroColors.CanvasColor),
+                factory.GetColor(metroColors.CanvasColor),
+                factory.GetColor(metroColors.CanvasColor),
+                factory.GetColor(metroColors.CanvasColor)
+            };
+
+            // Form Caption Active
+            table.Form.Active.CaptionTopBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            table.Form.Active.CaptionBottomBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            table.Form.Active.CaptionBottomBorder = null;
+            table.Form.Active.CaptionText = factory.GetColor(metroColors.BaseTextColor);
+            table.Form.Active.CaptionTextExtra = factory.GetColor(metroColors.BaseTextColor);
+
+            // Form Caption Inactive
+            table.Form.Inactive.CaptionTopBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            table.Form.Inactive.CaptionBottomBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            table.Form.Inactive.CaptionText = factory.GetColor(metroColors.BaseColorLightText);
+            table.Form.Inactive.CaptionTextExtra = factory.GetColor(metroColors.BaseColorLightText);
+
+            table.Form.BackColor = factory.GetColor(metroColors.CanvasColor);
+            table.Form.TextColor = factory.GetColor(metroColors.TextColor);
+            table.Form.MdiClientBackgroundImage = null; // BarFunctions.LoadBitmap("SystemImages.Office2010SilverClientBackground.png");
+            #endregion
+
+            #region Quick Access Toolbar Background
+            table.QuickAccessToolbar.Active.TopBackground = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(0xDEE7F4), factory.GetColor(0xE6EEF9));
+            table.QuickAccessToolbar.Active.BottomBackground = LinearGradientColorTable.Empty; //new LinearGradientColorTable(factory.GetColor(0xDBE7F7), factory.GetColor(0xC9D9EE));
+            table.QuickAccessToolbar.Active.OutterBorderColor = Color.Empty; // factory.GetColor(0xF6F9FC);
+            table.QuickAccessToolbar.Active.MiddleBorderColor = Color.Empty; // factory.GetColor(0x9AB3D5);
+            table.QuickAccessToolbar.Active.InnerBorderColor = Color.Empty; //  factory.GetColor(0xD2E3F9);
+
+            table.QuickAccessToolbar.Inactive.TopBackground = LinearGradientColorTable.Empty; //new LinearGradientColorTable(factory.GetColor(0xE6ECF3), factory.GetColor(0xCED8E6));
+            table.QuickAccessToolbar.Inactive.BottomBackground = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(0xCED8E6), factory.GetColor(0xC8D3E3));
+            table.QuickAccessToolbar.Inactive.OutterBorderColor = Color.Empty; // factory.GetColor(0xF6F9FC);
+            table.QuickAccessToolbar.Inactive.MiddleBorderColor = Color.Empty; // factory.GetColor(0x9AB3D5);
+            table.QuickAccessToolbar.Inactive.InnerBorderColor = Color.Empty;
+
+            table.QuickAccessToolbar.Standalone.TopBackground = new LinearGradientColorTable();
+            table.QuickAccessToolbar.Standalone.BottomBackground = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor));
+            table.QuickAccessToolbar.Standalone.OutterBorderColor = factory.GetColor(metroColors.CanvasColorLightShade);
+            table.QuickAccessToolbar.Standalone.MiddleBorderColor = Color.Empty;
+            table.QuickAccessToolbar.Standalone.InnerBorderColor = Color.Empty; // factory.GetColor(0xDCE8F7);
+
+            table.QuickAccessToolbar.QatCustomizeMenuLabelBackground = factory.GetColor(metroColors.CanvasColorLighterShade);
+            table.QuickAccessToolbar.QatCustomizeMenuLabelText = factory.GetColor(metroColors.CanvasColorDarkShade);
+
+            table.QuickAccessToolbar.Active.GlassBorder = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(Color.FromArgb(132, Color.Black)), Color.FromArgb(80, Color.Black));
+            table.QuickAccessToolbar.Inactive.GlassBorder = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(Color.FromArgb(132, Color.Black)), Color.FromArgb(80, Color.Black));
+            #endregion
+
+            #region Tab Colors
+            table.TabControl.Default = new Office2007TabItemStateColorTable();
+            table.TabControl.Default.TopBackground = LinearGradientColorTable.Empty;
+            table.TabControl.Default.BottomBackground = LinearGradientColorTable.Empty;
+            table.TabControl.Default.InnerBorder = Color.Empty;
+            table.TabControl.Default.OuterBorder = Color.Empty;
+            table.TabControl.Default.Text = factory.GetColor(metroColors.TextColor);
+
+            table.TabControl.MouseOver = new Office2007TabItemStateColorTable();
+            table.TabControl.MouseOver.TopBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight1), Color.Empty);
+            table.TabControl.MouseOver.BottomBackground = LinearGradientColorTable.Empty;
+            table.TabControl.MouseOver.InnerBorder = Color.Empty;
+            table.TabControl.MouseOver.OuterBorder = factory.GetColor(metroColors.BaseColorLight1);
+            table.TabControl.MouseOver.Text = metroColors.TextColor;
+
+            table.TabControl.Selected = new Office2007TabItemStateColorTable();
+            table.TabControl.Selected.TopBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor), Color.Empty);
+            table.TabControl.Selected.BottomBackground = LinearGradientColorTable.Empty; ;
+            table.TabControl.Selected.InnerBorder = Color.Empty;
+            table.TabControl.Selected.OuterBorder = factory.GetColor(metroColors.BaseColor);
+            table.TabControl.Selected.Text = metroColors.BaseColor;
+
+            table.TabControl.TabBackground = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor));
+            table.TabControl.TabPanelBackground = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor), Color.Empty);
+            table.TabControl.TabPanelBorder = metroColors.CanvasColorLightShade;
+            #endregion
+
+            #region Dock TabStrip Colors
+            table.DockTabStrip = new Office2007TabColorTable();
+            table.DockTabStrip.Default = new Office2007TabItemStateColorTable();
+            table.DockTabStrip.Default.TopBackground = LinearGradientColorTable.Empty;
+            table.DockTabStrip.Default.BottomBackground = LinearGradientColorTable.Empty;
+            table.DockTabStrip.Default.InnerBorder = Color.Empty;
+            table.DockTabStrip.Default.OuterBorder = Color.Empty;
+            table.DockTabStrip.Default.Text = factory.GetColor(metroColors.TextColor);
+
+            table.DockTabStrip.MouseOver = new Office2007TabItemStateColorTable();
+            table.DockTabStrip.MouseOver.TopBackground = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColorLight), Color.Empty);
+            table.DockTabStrip.MouseOver.BottomBackground = LinearGradientColorTable.Empty;
+            table.DockTabStrip.MouseOver.InnerBorder = Color.Empty;
+            table.DockTabStrip.MouseOver.OuterBorder = Color.Empty;
+            table.DockTabStrip.MouseOver.Text = metroColors.BaseColor;
+
+            table.DockTabStrip.Selected = new Office2007TabItemStateColorTable();
+            table.DockTabStrip.Selected.TopBackground = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColorLight), Color.Empty);
+            table.DockTabStrip.Selected.BottomBackground = LinearGradientColorTable.Empty;
+            table.DockTabStrip.Selected.InnerBorder = Color.Empty;
+            table.DockTabStrip.Selected.OuterBorder = factory.GetColor(metroColors.CanvasColorLighterShade);
+            table.DockTabStrip.Selected.Text = metroColors.BaseColor;
+
+            table.DockTabStrip.TabBackground = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor));
+            table.DockTabStrip.TabPanelBackground = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColorLight), Color.Empty);
+            table.DockTabStrip.TabPanelBorder = metroColors.CanvasColorLightShade;
+            #endregion
+
+            #region CheckBoxItem
+            table.CheckBoxItem = GetCheckBoxItem(factory, metroColors);
+
+            Office2007CheckBoxColorTable chk = GetCheckBoxItem(factory, metroColors);
+            chk.Default.Text = factory.GetColor(metroColors.BaseTextColor);
+            chk.MouseOver.Text = factory.GetColor(metroColors.BaseTextColor);
+            chk.Pressed.Text = factory.GetColor(metroColors.BaseTextColor);
+            table.ContextualTables.Add(Office2007ColorTable.GetContextualKey(typeof(Office2007CheckBoxColorTable), typeof(Bar)) + "+StatusBar", chk);
+            table.ContextualTables.Add(Office2007ColorTable.GetContextualKey(typeof(Office2007CheckBoxColorTable), typeof(MetroStatusBar)), chk);
+            #endregion
+
+            #region Scroll Bar Colors
+            InitializeScrollBarColorTable(table, factory, metroColors);
+            InitializeAppBlueScrollBarColorTable(table, factory, metroColors);
+            #endregion
+
+            #region ProgressBarItem
+            Office2007ProgressBarColorTable pct = table.ProgressBarItem;
+            pct.BackgroundColors = new GradientColorTable(metroColors.CanvasColor);
+            pct.OuterBorder = factory.GetColor(metroColors.BaseColorDarker);
+            pct.InnerBorder = Color.Empty;
+            pct.Chunk = new GradientColorTable(metroColors.BaseColor);
+            pct.ChunkOverlay = new GradientColorTable();
+            //pct.ChunkOverlay.LinearGradientAngle = 90;
+            //pct.ChunkOverlay.Colors.AddRange(new BackgroundColorBlend[] {
+            //    new BackgroundColorBlend(Color.FromArgb(192, factory.GetColor(metroColors.BaseColorLight)), 0f),
+            //    new BackgroundColorBlend(Color.FromArgb(128, factory.GetColor(metroColors.BaseColor)), .5f),
+            //    new BackgroundColorBlend(Color.FromArgb(64, factory.GetColor(metroColors.BaseColor)), .5f),
+            //    new BackgroundColorBlend(Color.Transparent, 1f),
+            //});
+            //pct.ChunkShadow = new GradientColorTable(0xB2B9C8, 0xD5DAE5, 0);
+            pct.ChunkShadow = new GradientColorTable();
+
+            // Paused State
+            pct = table.ProgressBarItemPaused;
+            pct.BackgroundColors = new GradientColorTable(0xEBEDF0, 0xD5D8DC);
+            pct.OuterBorder = factory.GetColor(0x868B91);
+            pct.InnerBorder = factory.GetColor(0xFFFFFF);
+            pct.Chunk = new GradientColorTable(0xAEA700, 0xFFFDCD, 0);
+            pct.ChunkOverlay = new GradientColorTable();
+            pct.ChunkOverlay.LinearGradientAngle = 90;
+            pct.ChunkOverlay.Colors.AddRange(new BackgroundColorBlend[] {
+                new BackgroundColorBlend(Color.FromArgb(192, factory.GetColor(0xFFFBA3)), 0f),
+                new BackgroundColorBlend(Color.FromArgb(128, factory.GetColor(0xD2CA00)), .5f),
+                new BackgroundColorBlend(Color.FromArgb(64, factory.GetColor(0xFEF400)), .5f),
+                new BackgroundColorBlend(Color.Transparent, 1f),
+            });
+            pct.ChunkShadow = new GradientColorTable(0xB2B9C8, 0xD5DAE5, 0);
+
+            // Error State
+            pct = table.ProgressBarItemError;
+            pct.BackgroundColors = new GradientColorTable(0xEBEDF0, 0xD5D8DC);
+            pct.OuterBorder = factory.GetColor(0x868B91);
+            pct.InnerBorder = factory.GetColor(0xFFFFFF);
+            pct.Chunk = new GradientColorTable(0xD20000, 0xFFCDCD, 0);
+            pct.ChunkOverlay = new GradientColorTable();
+            pct.ChunkOverlay.LinearGradientAngle = 90;
+            pct.ChunkOverlay.Colors.AddRange(new BackgroundColorBlend[] {
+                new BackgroundColorBlend(Color.FromArgb(192, factory.GetColor(0xFF8F8F)), 0f),
+                new BackgroundColorBlend(Color.FromArgb(128, factory.GetColor(0xD20000)), .5f),
+                new BackgroundColorBlend(Color.FromArgb(64, factory.GetColor(0xFE0000)), .5f),
+                new BackgroundColorBlend(Color.Transparent, 1f),
+            });
+            pct.ChunkShadow = new GradientColorTable(0xB2B9C8, 0xD5DAE5, 0);
+            #endregion
+
+            #region Gallery
+            Office2007GalleryColorTable gallery = table.Gallery;
+            gallery.GroupLabelBackground = factory.GetColor(metroColors.CanvasColorLighterShade);
+            gallery.GroupLabelText = factory.GetColor(metroColors.CanvasColorDarkShade);
+            gallery.GroupLabelBorder = Color.Empty;
+            #endregion
+
+            #region Legacy Colors
+            table.LegacyColors.BarBackground = factory.GetColor(metroColors.CanvasColorLight);
+            table.LegacyColors.BarBackground2 = Color.Empty;
+            table.LegacyColors.BarStripeColor = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.LegacyColors.BarCaptionBackground = factory.GetColor(metroColors.BaseColor);
+            table.LegacyColors.BarCaptionBackground2 = Color.Empty;
+            table.LegacyColors.BarCaptionInactiveBackground = factory.GetColor(metroColors.CanvasColor);
+            table.LegacyColors.BarCaptionInactiveBackground2 = Color.Empty;
+            table.LegacyColors.BarCaptionInactiveText = factory.GetColor(metroColors.TextDisabledColor);
+            table.LegacyColors.BarCaptionText = factory.GetColor(metroColors.BaseTextColor);
+            table.LegacyColors.BarFloatingBorder = factory.GetColor(metroColors.BaseColor);
+            table.LegacyColors.BarPopupBackground = factory.GetColor(metroColors.CanvasColor);
+            table.LegacyColors.BarPopupBorder = factory.GetColor(metroColors.BaseColor);
+            table.LegacyColors.ItemBackground = Color.Empty;
+            table.LegacyColors.ItemBackground2 = Color.Empty;
+            table.LegacyColors.ItemCheckedBackground = Color.Empty;
+            table.LegacyColors.ItemCheckedBackground2 = Color.Empty;
+            table.LegacyColors.ItemCheckedBorder = factory.GetColor(metroColors.BaseColor);
+            table.LegacyColors.ItemCheckedText = factory.GetColor(metroColors.TextColor);
+            table.LegacyColors.ItemDisabledBackground = Color.Empty;
+            table.LegacyColors.ItemDisabledText = factory.GetColor(metroColors.TextDisabledColor);
+            table.LegacyColors.ItemExpandedShadow = Color.Empty;
+            table.LegacyColors.ItemExpandedBackground = factory.GetColor(metroColors.CanvasColor);
+            table.LegacyColors.ItemExpandedBackground2 = Color.Empty;
+            table.LegacyColors.ItemExpandedText = factory.GetColor(metroColors.TextColor);
+            table.LegacyColors.ItemExpandedBorder = factory.GetColor(metroColors.CanvasColorLightShade);
+            table.LegacyColors.ItemHotBackground = factory.GetColor(metroColors.CanvasColorLight);
+            table.LegacyColors.ItemHotBackground2 = Color.Empty;
+            table.LegacyColors.ItemHotBorder = factory.GetColor(metroColors.CanvasColorLight);
+            table.LegacyColors.ItemHotText = factory.GetColor(metroColors.TextColor);
+            table.LegacyColors.ItemPressedBackground = factory.GetColor(metroColors.BaseColor);
+            table.LegacyColors.ItemPressedBackground2 = Color.Empty;
+            table.LegacyColors.ItemPressedBorder = factory.GetColor(metroColors.BaseColor);
+            table.LegacyColors.ItemPressedText = factory.GetColor(metroColors.BaseTextColor);
+            table.LegacyColors.ItemSeparator = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.LegacyColors.ItemSeparatorShade = Color.Empty;
+            table.LegacyColors.ItemText = factory.GetColor(metroColors.TextColor);
+            table.LegacyColors.MenuBackground = factory.GetColor(metroColors.CanvasColor);
+            table.LegacyColors.MenuBackground2 = Color.Empty;
+            table.LegacyColors.MenuBarBackground = factory.GetColor(metroColors.CanvasColor);
+            table.LegacyColors.MenuBorder = table.LegacyColors.ItemExpandedBorder;
+            table.LegacyColors.MenuSide = factory.GetColor(metroColors.CanvasColor);
+            table.LegacyColors.MenuSide2 = Color.Empty;
+            table.LegacyColors.MenuUnusedBackground = table.LegacyColors.MenuBackground;
+            table.LegacyColors.MenuUnusedSide = Color.Empty;
+            table.LegacyColors.MenuUnusedSide2 = Color.Empty;
+            table.LegacyColors.ItemDesignTimeBorder = Color.Black;
+            table.LegacyColors.BarDockedBorder = Color.Empty;
+            table.LegacyColors.DockSiteBackColor = factory.GetColor(metroColors.CanvasColorLighterShade);
+            table.LegacyColors.DockSiteBackColor2 = Color.Empty;
+            table.LegacyColors.CustomizeBackground = Color.Empty;
+            table.LegacyColors.CustomizeBackground2 = Color.Empty;
+            table.LegacyColors.CustomizeText = factory.GetColor(metroColors.TextInactiveColor);
+            table.LegacyColors.PanelBackground = factory.GetColor(metroColors.CanvasColor);
+            table.LegacyColors.PanelBackground2 = Color.Empty;
+            table.LegacyColors.PanelText = factory.GetColor(metroColors.TextColor);
+            table.LegacyColors.PanelBorder = factory.GetColor(metroColors.CanvasColorLightShade);
+            table.LegacyColors.ExplorerBarBackground = factory.GetColor(metroColors.CanvasColorLight);
+            table.LegacyColors.ExplorerBarBackground2 = Color.Empty;
+            table.LegacyColors.SplitterBackground = table.LegacyColors.PanelBackground;
+            table.LegacyColors.SplitterBackground2 = table.LegacyColors.PanelBackground2;
+            table.LegacyColors.SplitterText = table.LegacyColors.PanelText;
+            table.LegacyColors.SplitterBorder = table.LegacyColors.PanelBorder;
+
+            table.LegacyColors.AutoHideTabBackground = factory.GetColor(metroColors.CanvasColor);
+            table.LegacyColors.AutoHideTabText = factory.GetColor(metroColors.TextColor);
+            table.LegacyColors.AutoHideTabBorder = factory.GetColor(metroColors.CanvasColorLightShade);
+            table.LegacyColors.AutoHideSelectedTabBackground = factory.GetColor(metroColors.CanvasColor);
+            table.LegacyColors.AutoHideSelectedTabBorder = factory.GetColor(metroColors.BaseColor);
+            table.LegacyColors.AutoHideSelectedTabText = factory.GetColor(metroColors.BaseColor);
+
+            #endregion
+
+            #region Navigation Pane
+            table.NavigationPane.ButtonBackground = new GradientColorTable();
+            table.NavigationPane.ButtonBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(metroColors.CanvasColor), 0));
+            #endregion
+
+            #region SuperTooltip
+            table.SuperTooltip.BackgroundColors = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor));
+            table.SuperTooltip.TextColor = factory.GetColor(metroColors.TextColor);
+            #endregion
+
+            #region Slider
+            Office2007SliderColorTable sl = table.Slider;
+            sl.Default.LabelColor = factory.GetColor(metroColors.TextColor);
+            sl.Default.SliderLabelColor = factory.GetColor(metroColors.TextColor);
+            sl.Default.PartBackground = new GradientColorTable();
+            sl.Default.PartBorderColor = Color.Empty;
+            sl.Default.PartBorderLightColor = Color.Empty;
+            sl.Default.PartForeColor = factory.GetColor(metroColors.TextDisabledColor);
+            sl.Default.PartForeLightColor = Color.Empty;
+            sl.Default.TrackLineColor = factory.GetColor(metroColors.TextDisabledColor);
+            sl.Default.TrackLineLightColor = factory.GetColor(Color.FromArgb(48, Color.White));
+
+            sl.MouseOver.LabelColor = factory.GetColor(metroColors.TextColor);
+            sl.MouseOver.SliderLabelColor = factory.GetColor(metroColors.TextColor);
+            sl.MouseOver.PartBackground = new GradientColorTable();
+            sl.MouseOver.PartBorderColor = Color.Empty;
+            sl.MouseOver.PartBorderLightColor = Color.Empty;
+            sl.MouseOver.PartForeColor = factory.GetColor(metroColors.TextColor);
+            sl.MouseOver.PartForeLightColor = Color.Empty;
+            sl.MouseOver.TrackLineColor = factory.GetColor(metroColors.BaseColorDark);
+            sl.MouseOver.TrackLineLightColor = factory.GetColor(Color.FromArgb(48, Color.White));
+
+            sl.Pressed.LabelColor = factory.GetColor(metroColors.TextColor);
+            sl.Pressed.SliderLabelColor = factory.GetColor(metroColors.TextColor);
+            sl.Pressed.PartBackground = new GradientColorTable();
+            sl.Pressed.PartBorderColor = Color.Empty;
+            sl.Pressed.PartBorderLightColor = Color.Empty;
+            sl.Pressed.PartForeColor = factory.GetColor(metroColors.TextColor);
+            sl.Pressed.PartForeLightColor = Color.Empty;
+            sl.Pressed.TrackLineColor = factory.GetColor(metroColors.TextColor);
+            sl.Pressed.TrackLineLightColor = factory.GetColor(Color.FromArgb(48, Color.White));
+
+            ColorBlendFactory df = new ColorBlendFactory(ColorScheme.GetColor(0xCFCFCF));
+            sl.Disabled.LabelColor = factory.GetColor(metroColors.TextDisabledColor);
+            sl.Disabled.SliderLabelColor = factory.GetColor(metroColors.TextDisabledColor);
+            sl.Disabled.PartBackground = new GradientColorTable();
+            sl.Disabled.PartBorderColor = df.GetColor(sl.Default.PartBorderColor);
+            sl.Disabled.PartBorderLightColor = df.GetColor(sl.Default.PartBorderLightColor);
+            sl.Disabled.PartForeColor = df.GetColor(sl.Default.PartForeColor);
+            sl.Disabled.PartForeLightColor = df.GetColor(sl.Default.PartForeLightColor);
+            sl.Disabled.TrackLineColor = df.GetColor(sl.Default.TrackLineColor);
+            sl.Disabled.TrackLineLightColor = df.GetColor(sl.Default.TrackLineLightColor);
+
+            sl.TrackPart = new Office2007SliderPartColorTable();
+            sl.TrackPart.Default.LabelColor = factory.GetColor(metroColors.TextDisabledColor);
+            sl.TrackPart.Default.SliderLabelColor = factory.GetColor(metroColors.TextColor);
+            sl.TrackPart.Default.PartBackground = new GradientColorTable(factory.GetColor(metroColors.TextDisabledColor));
+            sl.TrackPart.Default.PartBorderColor = factory.GetColor(metroColors.TextDisabledColor);
+            sl.TrackPart.Default.PartBorderLightColor = Color.Empty;
+            sl.TrackPart.Default.PartForeColor = factory.GetColor(metroColors.TextDisabledColor);
+            sl.TrackPart.Default.PartForeLightColor = factory.GetColor(metroColors.TextDisabledColor);
+            sl.TrackPart.Default.TrackLineColor = factory.GetColor(metroColors.TextDisabledColor);
+            sl.TrackPart.Default.TrackLineLightColor = factory.GetColor(Color.FromArgb(48, Color.White));
+            sl.TrackPart.MouseOver.LabelColor = factory.GetColor(metroColors.TextColor);
+            sl.TrackPart.MouseOver.SliderLabelColor = factory.GetColor(metroColors.TextColor);
+            sl.TrackPart.MouseOver.PartBackground = new GradientColorTable(factory.GetColor(metroColors.TextColor));
+            sl.TrackPart.MouseOver.PartBorderColor = factory.GetColor(metroColors.TextColor);
+            sl.TrackPart.MouseOver.PartBorderLightColor = Color.Empty;
+            sl.TrackPart.MouseOver.PartForeColor = factory.GetColor(metroColors.TextColor);
+            sl.TrackPart.MouseOver.PartForeLightColor = factory.GetColor(metroColors.TextColor);
+            sl.TrackPart.MouseOver.TrackLineColor = factory.GetColor(metroColors.TextDisabledColor);
+            sl.TrackPart.MouseOver.TrackLineLightColor = factory.GetColor(Color.FromArgb(48, Color.White));
+            sl.TrackPart.Pressed = sl.TrackPart.MouseOver;
+
+            // Contextual Table when on StatusBar
+            sl = new Office2007SliderColorTable();
+            sl.Default.LabelColor = factory.GetColor(metroColors.TextColor);
+            sl.Default.SliderLabelColor = factory.GetColor(metroColors.TextColor);
+            sl.Default.PartBackground = new GradientColorTable();
+            sl.Default.PartBorderColor = Color.Empty;
+            sl.Default.PartBorderLightColor = Color.Empty;
+            sl.Default.PartForeColor = factory.GetColor(metroColors.CanvasColor);
+            sl.Default.PartForeLightColor = factory.GetColor(metroColors.BaseColorDark);
+            sl.Default.TrackLineColor = factory.GetColor(metroColors.BaseColorDark);
+            sl.Default.TrackLineLightColor = factory.GetColor(Color.FromArgb(48, Color.White));
+
+            sl.MouseOver.LabelColor = factory.GetColor(metroColors.TextColor);
+            sl.MouseOver.SliderLabelColor = factory.GetColor(metroColors.TextColor);
+            sl.MouseOver.PartBackground = new GradientColorTable();
+            sl.MouseOver.PartBorderColor = Color.Empty;
+            sl.MouseOver.PartBorderLightColor = Color.Empty;
+            sl.MouseOver.PartForeColor = factory.GetColor(metroColors.CanvasColor);
+            sl.MouseOver.PartForeLightColor = factory.GetColor(metroColors.BaseColorDark);
+            sl.MouseOver.TrackLineColor = factory.GetColor(metroColors.BaseColorDark);
+            sl.MouseOver.TrackLineLightColor = factory.GetColor(Color.FromArgb(48, Color.White));
+
+            sl.Pressed.LabelColor = factory.GetColor(metroColors.TextColor);
+            sl.Pressed.SliderLabelColor = factory.GetColor(metroColors.TextColor);
+            sl.Pressed.PartBackground = new GradientColorTable();
+            sl.Pressed.PartBorderColor = Color.Empty;
+            sl.Pressed.PartBorderLightColor = Color.Empty;
+            sl.Pressed.PartForeColor = factory.GetColor(metroColors.CanvasColorLighterShade);
+            sl.Pressed.PartForeLightColor = factory.GetColor(metroColors.BaseColorDark);
+            sl.Pressed.TrackLineColor = factory.GetColor(metroColors.CanvasColorDarkShade);
+            sl.Pressed.TrackLineLightColor = factory.GetColor(Color.FromArgb(48, Color.White));
+
+            df = new ColorBlendFactory(ColorScheme.GetColor(0xCFCFCF));
+            sl.Disabled.LabelColor = factory.GetColor(metroColors.TextDisabledColor);
+            sl.Disabled.SliderLabelColor = factory.GetColor(metroColors.TextDisabledColor);
+            sl.Disabled.PartBackground = new GradientColorTable();
+            foreach (BackgroundColorBlend b in sl.Default.PartBackground.Colors)
+                sl.Disabled.PartBackground.Colors.Add(new BackgroundColorBlend(df.GetColor(b.Color), b.Position));
+            sl.Disabled.PartBorderColor = df.GetColor(sl.Default.PartBorderColor);
+            sl.Disabled.PartBorderLightColor = df.GetColor(sl.Default.PartBorderLightColor);
+            sl.Disabled.PartForeColor = df.GetColor(sl.Default.PartForeColor);
+            sl.Disabled.PartForeLightColor = df.GetColor(sl.Default.PartForeLightColor);
+            sl.Disabled.TrackLineColor = df.GetColor(sl.Default.TrackLineColor);
+            sl.Disabled.TrackLineLightColor = df.GetColor(sl.Default.TrackLineLightColor);
+
+            sl.TrackPart = new Office2007SliderPartColorTable();
+            sl.TrackPart.Default.LabelColor = factory.GetColor(metroColors.BaseTextColor);
+            sl.TrackPart.Default.SliderLabelColor = factory.GetColor(metroColors.TextColor);
+            sl.TrackPart.Default.PartBackground = new GradientColorTable(factory.GetColor(metroColors.CanvasColor));
+            sl.TrackPart.Default.PartBorderColor = factory.GetColor(metroColors.BaseColorDarker);
+            sl.TrackPart.Default.PartBorderLightColor = Color.Empty;
+            sl.TrackPart.Default.PartForeColor = factory.GetColor(metroColors.CanvasColor);
+            sl.TrackPart.Default.PartForeLightColor = factory.GetColor(metroColors.CanvasColor);
+            sl.TrackPart.Default.TrackLineColor = factory.GetColor(metroColors.BaseColorDark);
+            sl.TrackPart.Default.TrackLineLightColor = factory.GetColor(Color.FromArgb(48, Color.White));
+            sl.TrackPart.MouseOver = sl.TrackPart.Default;
+            sl.TrackPart.Pressed = sl.TrackPart.Default;
+
+            table.ContextualTables.Add(Office2007ColorTable.GetContextualKey(typeof(Office2007SliderColorTable), typeof(Bar)) + "+StatusBar", sl);
+            table.ContextualTables.Add(Office2007ColorTable.GetContextualKey(typeof(Office2007SliderColorTable), typeof(MetroStatusBar)), sl);
+            #endregion
+
+            #region RangeSlider
+            MetroOfficeColorTableInitializer.InitRangeSlider(table, factory, metroColors);
+            #endregion
+
+            #region ListViewEx
+            table.ListViewEx.Border = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.ListViewEx.ColumnBackground = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColorLightShade));
+            table.ListViewEx.ColumnSeparator = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.ListViewEx.ColumnForeColor = factory.GetColor(metroColors.TextColor);
+            table.ListViewEx.SelectionBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor), Color.Empty);
+            table.ListViewEx.SelectionBorder = Color.Empty;
+            table.ListViewEx.SelectionForeColor = factory.GetColor(metroColors.BaseTextColor);
+            #endregion
+
+            #region DataGridView
+            table.DataGridView.BackgroundColor = factory.GetColor(metroColors.CanvasColor);
+            table.DataGridView.DefaultCellBackground = factory.GetColor(metroColors.CanvasColor);
+            table.DataGridView.DefaultCellText = factory.GetColor(metroColors.TextColor);
+            table.DataGridView.ColumnHeaderNormalBorder = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.DataGridView.ColumnHeaderNormalBackground = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColorLightShade));
+            table.DataGridView.ColumnHeaderNormalText = factory.GetColor(metroColors.TextColor);
+            table.DataGridView.ColumnHeaderSelectedBackground = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColorLighterShade));
+            table.DataGridView.ColumnHeaderSelectedText = factory.GetColor(metroColors.TextColor);
+            table.DataGridView.ColumnHeaderSelectedBorder = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.DataGridView.ColumnHeaderSelectedMouseOverBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            table.DataGridView.ColumnHeaderSelectedMouseOverBorder = factory.GetColor(metroColors.BaseColorDark);
+            table.DataGridView.ColumnHeaderMouseOverBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            table.DataGridView.ColumnHeaderMouseOverBorder = factory.GetColor(metroColors.BaseColorDark);
+            table.DataGridView.ColumnHeaderPressedBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            table.DataGridView.ColumnHeaderPressedBorder = factory.GetColor(metroColors.BaseColorDark);
+
+            table.DataGridView.RowNormalBackground = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColorLightShade));
+            table.DataGridView.RowNormalBorder = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.DataGridView.RowSelectedBackground = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColorLighterShade));
+            table.DataGridView.RowSelectedBorder = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.DataGridView.RowSelectedMouseOverBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            table.DataGridView.RowSelectedMouseOverBorder = factory.GetColor(metroColors.BaseColorDark);
+            table.DataGridView.RowMouseOverBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            table.DataGridView.RowMouseOverBorder = factory.GetColor(metroColors.BaseColorDark);
+            table.DataGridView.RowPressedBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            table.DataGridView.RowPressedBorder = factory.GetColor(metroColors.BaseColorDark);
+
+            table.DataGridView.GridColor = factory.GetColor(metroColors.CanvasColorDarkShade);
+
+            table.DataGridView.SelectorBackground = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColorLightShade));
+            table.DataGridView.SelectorBorder = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.DataGridView.SelectorBorderDark = Color.Empty;// factory.GetColor(0xC3C3C3);
+            table.DataGridView.SelectorBorderLight = Color.Empty;// factory.GetColor(0xF9F9F9);
+            table.DataGridView.SelectorSign = new LinearGradientColorTable(factory.GetColor(metroColors.TextColor));
+
+            table.DataGridView.SelectorMouseOverBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            table.DataGridView.SelectorMouseOverBorder = factory.GetColor(metroColors.BaseColorDark);
+            table.DataGridView.SelectorMouseOverBorderDark = Color.Empty;// factory.GetColor(0xB0CFF7);
+            table.DataGridView.SelectorMouseOverBorderLight = Color.Empty; // factory.GetColor(0xD5E4F2);
+            table.DataGridView.SelectorMouseOverSign = new LinearGradientColorTable(factory.GetColor(metroColors.TextColor));
+            #endregion
+
+            #region SideBar
+            table.SideBar.Background = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor));
+            table.SideBar.Border = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.SideBar.SideBarPanelItemText = factory.GetColor(metroColors.TextColor);
+            table.SideBar.SideBarPanelItemDefault = new GradientColorTable();
+            table.SideBar.SideBarPanelItemDefault.Colors.Add(new BackgroundColorBlend(factory.GetColor(metroColors.CanvasColor), 0));
+            table.SideBar.SideBarPanelItemDefault.Colors.Add(new BackgroundColorBlend(factory.GetColor(metroColors.CanvasColor), 1));
+            // Expanded
+            table.SideBar.SideBarPanelItemExpanded = new GradientColorTable();
+            table.SideBar.SideBarPanelItemExpanded.Colors.Add(new BackgroundColorBlend(factory.GetColor(metroColors.BaseColor), 0));
+            table.SideBar.SideBarPanelItemExpanded.Colors.Add(new BackgroundColorBlend(factory.GetColor(metroColors.BaseColor), 1));
+            // MouseOver
+            table.SideBar.SideBarPanelItemMouseOver = new GradientColorTable();
+            table.SideBar.SideBarPanelItemMouseOver.Colors.Add(new BackgroundColorBlend(factory.GetColor(metroColors.BaseColor), 0));
+            table.SideBar.SideBarPanelItemMouseOver.Colors.Add(new BackgroundColorBlend(factory.GetColor(metroColors.BaseColorDark), 1));
+            // Pressed
+            table.SideBar.SideBarPanelItemPressed = new GradientColorTable();
+            table.SideBar.SideBarPanelItemPressed.Colors.Add(new BackgroundColorBlend(factory.GetColor(metroColors.BaseColorDark), 0));
+            table.SideBar.SideBarPanelItemPressed.Colors.Add(new BackgroundColorBlend(factory.GetColor(metroColors.BaseColorDark), 1));
+            #endregion
+
+            #region AdvTree
+#if !NOTREE
+            table.AdvTree = new DevComponents.AdvTree.Display.TreeColorTable();
+            CreateAdvTreeColorTable(table.AdvTree, factory, metroColors);
+#endif
+            #endregion
+
+            #region CrumbBar
+            table.CrumbBarItemView = new CrumbBarItemViewColorTable();
+            CrumbBarItemViewStateColorTable crumbBarViewTable = new CrumbBarItemViewStateColorTable();
+            table.CrumbBarItemView.Default = crumbBarViewTable;
+            crumbBarViewTable.Foreground = factory.GetColor(metroColors.TextColor);
+            crumbBarViewTable = new CrumbBarItemViewStateColorTable();
+            table.CrumbBarItemView.MouseOver = crumbBarViewTable;
+            crumbBarViewTable.Foreground = factory.GetColor(metroColors.BaseTextColor);
+            crumbBarViewTable.Background = new BackgroundColorBlendCollection();
+            crumbBarViewTable.Background.AddRange(new BackgroundColorBlend[]{
+                new BackgroundColorBlend(factory.GetColor(metroColors.BaseColor), 0f),
+                new BackgroundColorBlend(factory.GetColor(metroColors.BaseColorDark), 1f)});
+            crumbBarViewTable.Border = factory.GetColor(metroColors.BaseColorDark);
+            crumbBarViewTable.BorderLight = Color.Empty; // factory.GetColor("90FFFFFF");
+            crumbBarViewTable = new CrumbBarItemViewStateColorTable();
+            table.CrumbBarItemView.MouseOverInactive = crumbBarViewTable;
+            crumbBarViewTable.Foreground = factory.GetColor(metroColors.BaseTextColor);
+            crumbBarViewTable.Background = new BackgroundColorBlendCollection();
+            crumbBarViewTable.Background.AddRange(new BackgroundColorBlend[]{
+                new BackgroundColorBlend(factory.GetColor(metroColors.BaseColor), 0f),
+                new BackgroundColorBlend(factory.GetColor(metroColors.BaseColor), 1f)});
+            crumbBarViewTable.Border = factory.GetColor(metroColors.BaseColorDark);
+            crumbBarViewTable.BorderLight = Color.Empty; // factory.GetColor("90FFFFFF");
+            crumbBarViewTable = new CrumbBarItemViewStateColorTable();
+            table.CrumbBarItemView.Pressed = crumbBarViewTable;
+            crumbBarViewTable.Foreground = factory.GetColor(metroColors.BaseTextColor);
+            crumbBarViewTable.Background = new BackgroundColorBlendCollection();
+            crumbBarViewTable.Background.AddRange(new BackgroundColorBlend[]{
+                new BackgroundColorBlend(factory.GetColor(metroColors.BaseColorDark), 0f),
+                new BackgroundColorBlend(factory.GetColor(metroColors.BaseColorDark), 1f)});
+            crumbBarViewTable.Border = factory.GetColor(metroColors.BaseColorDark);
+            crumbBarViewTable.BorderLight = Color.Empty; // factory.GetColor("408B7654");
+
+            #endregion
+
+            #region WarningBox
+            table.WarningBox.BackColor = factory.GetColor(factory.GetColor(metroColors.CanvasColor));
+            table.WarningBox.WarningBorderColor = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.WarningBox.WarningBackColor1 = factory.GetColor(metroColors.CanvasColor);
+            table.WarningBox.WarningBackColor2 = factory.GetColor(metroColors.CanvasColor);
+            #endregion
+
+            #region CalendarView
+
+            #region WeekDayViewColors
+
+            table.CalendarView.WeekDayViewColors = new ColorDef[]
+            {
+                new ColorDef(factory.GetColor(metroColors.CanvasColorLightShade)),           // DayViewBorder
+                new ColorDef(factory.GetColor(metroColors.CanvasColorDarkShade)),           // DayHeaderForeground
+
+                new ColorDef(new Color[] {factory.GetColor(metroColors.CanvasColor)},
+                new float[] {0f}, 90f),             // DayHeaderBackground
+
+                new ColorDef(factory.GetColor(metroColors.CanvasColorLightShade)),           // DayHeaderBorder
+
+                new ColorDef(factory.GetColor(metroColors.CanvasColor)),           // DayWorkHoursBackground
+                new ColorDef(factory.GetColor(metroColors.CanvasColorLightShade)),           // DayAllDayEventBackground
+                new ColorDef(factory.GetColor(metroColors.CanvasColorLighterShade)),           // DayOffWorkHoursBackground
+
+                new ColorDef(factory.GetColor(metroColors.CanvasColorDarkShade)),           // DayHourBorder
+                new ColorDef(factory.GetColor(metroColors.CanvasColorLightShade)),           // DayHalfHourBorder
+
+                new ColorDef(factory.GetColor(metroColors.BaseColor)),           // SelectionBackground
+
+                new ColorDef(factory.GetColor(metroColors.CanvasColorLightShade)),           // OwnerTabBorder
+
+                new ColorDef(factory.GetColor(metroColors.CanvasColor)),    // OwnerTabBackground
+
+                new ColorDef(factory.GetColor(metroColors.CanvasColorDarkShade)),           // OwnerTabForeground
+                new ColorDef(factory.GetColor(metroColors.CanvasColor)),           // OwnerTabContentBackground
+                new ColorDef(factory.GetColor(metroColors.CanvasColorDarkShade)),           // OwnerTabSelectedForeground
+                new ColorDef(factory.GetColor(metroColors.CanvasColorLighterShade)),           // OwnerTabSelectionBackground
+
+                new ColorDef(factory.GetColor(metroColors.CanvasColor)),           // CondensedViewBackground
+
+                new ColorDef(factory.GetColor(metroColors.CanvasColorLightShade)),           // NowDayViewBorder
+                new ColorDef(factory.GetColor(metroColors.CanvasColorDarkShade)),           // NowDayHeaderForeground - 0x15428B
+
+                new ColorDef(factory.GetColor(metroColors.CanvasColorLighterShade)),       // NowDayHeaderBackground
+                
+                new ColorDef(new Color[] {factory.GetColor(0xFFED79), factory.GetColor(0xFFD86B), factory.GetColor(0xFFBB00), factory.GetColor(0xFFEA77)},
+                new float[] {0f, .55f ,58f, 1f}, 90f),              // TimeIndicator
+
+                new ColorDef(factory.GetColor(0xEB8900)),           // TimeIndicatorBorder
+            };
+
+            #endregion
+
+            #region HourRulerColors
+
+            table.CalendarView.TimeRulerColors = new ColorDef[]
+            {
+                new ColorDef(factory.GetColor(metroColors.CanvasColor)),           // TimeRulerBackground
+                new ColorDef(factory.GetColor(metroColors.CanvasColorDarkShade)),           // TimeRulerForeground
+                new ColorDef(factory.GetColor(metroColors.CanvasColorDarkShade)),           // TimeRulerBorder
+                new ColorDef(factory.GetColor(metroColors.CanvasColorDarkShade)),           // TimeRulerTickBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xFFED79), factory.GetColor(0xFFD86B), factory.GetColor(0xFFBB00), factory.GetColor(0xFFEA77)},
+                new float[] {0f, .55f ,58f, 1f}, 90f),              // TimeRulerIndicator
+
+                new ColorDef(factory.GetColor(0xEB8900)),           // TimeRulerIndicatorBorder
+            };
+
+            #endregion
+
+            #region MonthViewColors
+
+            table.CalendarView.MonthViewColors = new ColorDef[]
+            {
+              new ColorDef(factory.GetColor(metroColors.CanvasColorLightShade)),           // DayOfWeekHeaderBorder
+
+                new ColorDef(factory.GetColor(metroColors.CanvasColor)),                    // DayOfWeekHeaderBackground
+
+                new ColorDef(factory.GetColor(metroColors.CanvasColorDarkShade)),           // DayOfWeekHeaderForeground
+                new ColorDef(factory.GetColor(metroColors.CanvasColorLightShade)),           // SideBarBorder
+
+                new ColorDef(factory.GetColor(metroColors.CanvasColor)),                   // SideBarBackground
+
+                new ColorDef(factory.GetColor(metroColors.CanvasColorDarkShade)),           // SideBarForeground
+                new ColorDef(factory.GetColor(metroColors.CanvasColorLightShade)),           // DayHeaderBorder
+
+                new ColorDef(factory.GetColor(metroColors.CanvasColor)),                    // DayHeaderBackground
+
+                new ColorDef(factory.GetColor(metroColors.CanvasColorDarkShade)),           // DayHeaderForeground
+                new ColorDef(factory.GetColor(metroColors.CanvasColorLightShade)),           // DayContentBorder
+                new ColorDef(factory.GetColor(metroColors.BaseColor)),           // DayContentSelectionBackground
+                new ColorDef(factory.GetColor(metroColors.CanvasColor)),           // DayContentActiveDayBackground
+                new ColorDef(factory.GetColor(metroColors.CanvasColor)),           // DayContentInactiveDayBackground
+
+                new ColorDef(factory.GetColor(metroColors.CanvasColorLightShade)),           // OwnerTabBorder
+
+                new ColorDef(factory.GetColor(metroColors.CanvasColor)),
+
+                new ColorDef(factory.GetColor(metroColors.CanvasColorLightShade)),           // OwnerTabForeground
+                new ColorDef(factory.GetColor(metroColors.CanvasColor)),           // OwnerTabContentBackground
+                new ColorDef(factory.GetColor(metroColors.CanvasColorDarkShade)),           // OwnerTabSelectedForeground
+                new ColorDef(factory.GetColor(metroColors.CanvasColor)),           // OwnerTabSelectionBackground
+
+                new ColorDef(factory.GetColor(metroColors.BaseColor)),           // NowDayViewBorder
+                new ColorDef(factory.GetColor(metroColors.TextColor)),           // NowDayHeaderForeground - 0x15428B
+
+                new ColorDef(factory.GetColor(metroColors.CanvasColorLighterShade)),              // NowDayHeaderBackground
+
+                new ColorDef(factory.GetColor(metroColors.TextColor)),   // ContentLinkForeground - DayHeaderForeground
+                new ColorDef(factory.GetColor(metroColors.CanvasColorLightShade)),            // ContentLinkBackground - DayContentActiveDayBackground
+            };
+
+            #endregion
+
+            #region AppointmentColors
+
+            table.CalendarView.AppointmentColors = new ColorDef[]
+            {
+                new ColorDef(factory.GetColor(metroColors.CanvasColorDarkShade)),           // DefaultBorder
+
+                new ColorDef(new Color[] {factory.GetColor(metroColors.BaseButtonGradientStart), factory.GetColor(metroColors.BaseButtonGradientEnd)},
+                             new float[] {0f, 1f}, 90f),            // DefaultBackground
+
+                new ColorDef(factory.GetColor(0x28518E)),           // BlueBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xB1C5EC), factory.GetColor(0x759DDA)}, 
+                             new float[] {0f, 1f}, 90f),            // BlueBackground
+
+                new ColorDef(factory.GetColor(0x2C6524)),           // GreenBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xC2E8BC), factory.GetColor(0x84D17B)},
+                             new float[] {0f, 1f}, 90f),            // GreenBackground
+
+                new ColorDef(factory.GetColor(0x8B3E0A)),           // OrangeBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xF9C7A0), factory.GetColor(0xF49758)},
+                             new float[] {0f, 1f}, 90f),            // OrangeBackground
+
+                new ColorDef(factory.GetColor(0x3E2771)),           // PurpleBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xC5B5E6), factory.GetColor(0x957BD2)},
+                             new float[] {0f, 1f}, 90f),            // PurpleBackground
+
+                new ColorDef(factory.GetColor(0x86171C)),           // RedBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xF1AAAC), factory.GetColor(0xE5676E)},
+                             new float[] {0f, 1f}, 90f),            // RedBackground
+
+                new ColorDef(factory.GetColor(0x7C7814)),           // YellowBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xFFFCAA), factory.GetColor(0xFFF958)},
+                             new float[] {0f, 1f}, 90f),            // YellowBackground
+
+                new ColorDef(factory.GetColor(-1)),                 // BusyTimeMarker
+                new ColorDef(factory.GetColor(0xFFFFFF)),           // FreeTimeMarker
+                new ColorDef(factory.GetColor(0x800080))            // OutOfOfficeTimeMarker
+            };
+
+            #endregion
+
+            #endregion
+
+            #region SuperTab
+
+            #region SuperTab
+
+            table.SuperTab.Background = new SuperTabLinearGradientColorTable(
+                factory.GetColor(metroColors.CanvasColor), Color.Empty);
+
+            table.SuperTab.InnerBorder = factory.GetColor(metroColors.CanvasColorLighterShade);
+            table.SuperTab.OuterBorder = factory.GetColor(metroColors.CanvasColorDarkShade);
+
+            table.SuperTab.ControlBoxDefault.Image = factory.GetColor(metroColors.CanvasColorDarkShade);
+
+            table.SuperTab.ControlBoxMouseOver.Background = factory.GetColor(metroColors.CanvasColorLightShade);
+            table.SuperTab.ControlBoxMouseOver.Border = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.SuperTab.ControlBoxMouseOver.Image = factory.GetColor(metroColors.TextColor);
+
+            table.SuperTab.ControlBoxPressed.Background = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.SuperTab.ControlBoxPressed.Border = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.SuperTab.ControlBoxPressed.Image = factory.GetColor(metroColors.TextColor);
+
+            table.SuperTab.InsertMarker = factory.GetColor(metroColors.BaseColor);
+
+            #endregion
+
+            #region SuperTabItem
+
+            // Top Default
+
+            table.SuperTabItem.Default.Normal.Background = new SuperTabLinearGradientColorTable(factory.GetColor(factory.GetColor(metroColors.CanvasColor)));
+
+            table.SuperTabItem.Default.Normal.InnerBorder = factory.GetColor(metroColors.CanvasColorLighterShade);
+            table.SuperTabItem.Default.Normal.OuterBorder = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.SuperTabItem.Default.Normal.Text = factory.GetColor(metroColors.TextInactiveColor);
+            table.SuperTabItem.Default.Normal.CloseMarker = factory.GetColor(metroColors.CanvasColorLightShade);
+
+            // Disabled
+            table.SuperTabItem.Default.Disabled.Text = factory.GetColor(metroColors.TextDisabledColor);
+            table.SuperTabItem.Default.Disabled.Background.AdaptiveGradient = false;
+            table.SuperTabItem.Default.Disabled.CloseMarker = factory.GetColor(metroColors.TextDisabledColor);
+
+            // Top Selected
+
+            table.SuperTabItem.Default.Selected.Background = new SuperTabLinearGradientColorTable(
+                new Color[] { factory.GetColor(metroColors.CanvasColorLighterShade), factory.GetColor(metroColors.CanvasColorLightShade), factory.GetColor(metroColors.CanvasColorLightShade), factory.GetColor(metroColors.CanvasColor) },
+                new float[] { 0, .5f, .5f, 1 });
+
+            table.SuperTabItem.Default.Selected.InnerBorder = factory.GetColor(metroColors.CanvasColorLighterShade);
+            table.SuperTabItem.Default.Selected.OuterBorder = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.SuperTabItem.Default.Selected.Text = factory.GetColor(metroColors.TextColor);
+            table.SuperTabItem.Default.Selected.CloseMarker = factory.GetColor(metroColors.CanvasColorDarkShade);
+
+            // Top SelectedMouseOver
+
+            table.SuperTabItem.Default.SelectedMouseOver.Background = new SuperTabLinearGradientColorTable(
+                new Color[] { factory.GetColor(metroColors.CanvasColor), factory.GetColor(metroColors.CanvasColorLightShade) },
+                new float[] { 0, 1 });
+
+            table.SuperTabItem.Default.SelectedMouseOver.InnerBorder = factory.GetColor(metroColors.CanvasColorLighterShade);
+            table.SuperTabItem.Default.SelectedMouseOver.OuterBorder = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.SuperTabItem.Default.SelectedMouseOver.Text = factory.GetColor(metroColors.TextColor);
+            table.SuperTabItem.Default.SelectedMouseOver.CloseMarker = factory.GetColor(metroColors.CanvasColorDarkShade);
+
+            // Top MouseOver
+
+            table.SuperTabItem.Default.MouseOver.Background = new SuperTabLinearGradientColorTable(factory.GetColor(metroColors.CanvasColor), metroColors.CanvasColorLightShade);
+
+            table.SuperTabItem.Default.MouseOver.InnerBorder = factory.GetColor(metroColors.CanvasColorLighterShade);
+            table.SuperTabItem.Default.MouseOver.OuterBorder = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.SuperTabItem.Default.MouseOver.Text = factory.GetColor(metroColors.TextColor);
+            table.SuperTabItem.Default.MouseOver.CloseMarker = factory.GetColor(metroColors.CanvasColorDarkShade);
+
+            // Left, Bottom, Right
+
+            table.SuperTabItem.Left = table.SuperTabItem.Default;
+            table.SuperTabItem.Bottom = table.SuperTabItem.Default;
+            table.SuperTabItem.Right = table.SuperTabItem.Default;
+
+            #endregion
+
+            #region SuperTabPanel
+
+            table.SuperTabPanel.Default.Background = new SuperTabLinearGradientColorTable(factory.GetColor(metroColors.CanvasColor), Color.Empty);
+            table.SuperTabPanel.Default.InnerBorder = factory.GetColor(metroColors.CanvasColorLighterShade);
+            table.SuperTabPanel.Default.OuterBorder = factory.GetColor(metroColors.CanvasColorDarkShade);
+
+            table.SuperTabPanel.Left = table.SuperTabPanel.Default;
+            table.SuperTabPanel.Bottom = table.SuperTabPanel.Default;
+            table.SuperTabPanel.Right = table.SuperTabPanel.Default;
+
+            #endregion
+
+            #endregion
+
+            #region Backstage
+
+            #region Backstage
+            SuperTabStyleColorFactory.GetMetroBackstageColorTable(table.Backstage, factory, metroColors);
+            #endregion
+
+            #region BackstageItem
+            SuperTabStyleColorFactory.GetMetroBackstageItemColorTable(table.BackstageItem, factory, metroColors);
+            #endregion
+
+            #region BackstagePanel
+            SuperTabStyleColorFactory.GetMetroBackstagePanelColorTable(table.BackstagePanel, factory, metroColors);
+            #endregion
+
+            #endregion
+
+            #region SwitchButton
+            SwitchButtonColorTable sbt = new SwitchButtonColorTable();
+            sbt.BorderColor = factory.GetColor(metroColors.CanvasColorDarkShade);
+            sbt.OffBackColor = factory.GetColor(metroColors.CanvasColorDarkShade);
+            sbt.OffTextColor = factory.GetColor(metroColors.TextColor);
+            sbt.OnBackColor = factory.GetColor(metroColors.BaseColorDark);
+            sbt.OnTextColor = factory.GetColor(metroColors.BaseTextColor);
+            sbt.SwitchBackColor = factory.GetColor(metroColors.BaseColorDark);
+            sbt.SwitchOnBackColor = factory.GetColor(metroColors.CanvasColorLightShade);
+            sbt.SwitchBorderColor = Color.Empty; // factory.GetColor(metroColors.CanvasColorLightShade);
+            sbt.TextColor = factory.GetColor(metroColors.TextColor);
+            table.SwitchButton = new SwitchButtonColors();
+            table.SwitchButton.Default = sbt;
+            table.SwitchButton.Disabled.BorderColor = factory.GetColor(metroColors.CanvasColorLightShade);
+            table.SwitchButton.Disabled.SwitchBorderColor = Color.Empty;
+            table.SwitchButton.Disabled.OffTextColor = factory.GetColor(160,metroColors.TextColor);
+            table.SwitchButton.Disabled.OnTextColor = factory.GetColor(160, metroColors.TextColor); ;
+            table.SwitchButton.Disabled.TextColor = factory.GetColor(160, metroColors.TextColor); ;
+            table.SwitchButton.Disabled.SwitchBackColor = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.SwitchButton.Disabled.OffBackColor = factory.GetColor(metroColors.CanvasColorLightShade);
+            table.SwitchButton.Disabled.OnBackColor = factory.GetColor(metroColors.CanvasColorLightShade);
+            #endregion
+
+            #region ElementStyle Classes
+            table.StyleClasses.Clear();
+            ElementStyle style = new ElementStyle();
+            style.Class = ElementStyleClassKeys.RibbonGalleryContainerKey;
+            style.BorderColor = factory.GetColor(metroColors.CanvasColorDarkShade);
+            style.Border = eStyleBorderType.Solid;
+            style.BorderWidth = 1;
+            style.CornerDiameter = 0;
+            style.CornerType = eCornerType.Square;
+            style.BackColor = factory.GetColor(metroColors.EditControlBackColor);
+            table.StyleClasses.Add(style.Class, style);
+            // FileMenuContainer
+            style = GetFileMenuContainerStyle(table);
+            table.StyleClasses.Add(style.Class, style);
+            // Two Column File Menu Container
+            style = GetTwoColumnMenuContainerStyle(table);
+            table.StyleClasses.Add(style.Class, style);
+            // Column one File Menu Container
+            style = GetMenuColumnOneContainerStyle(table);
+            table.StyleClasses.Add(style.Class, style);
+            // Column two File Menu Container
+            style = GetMenuColumnTwoContainerStyle(table);
+            table.StyleClasses.Add(style.Class, style);
+            // Bottom File Menu Container
+            style = GetMenuBottomContainer(table);
+            table.StyleClasses.Add(style.Class, style);
+            // TextBox border
+            style = Office2007ColorTableFactory.GetTextBoxStyle(factory.GetColor(metroColors.CanvasColorDarkShade));
+            table.StyleClasses.Add(style.Class, style);
+            // RichTextBox border
+            style = Office2007ColorTableFactory.GetRichTextBoxStyle(factory.GetColor(metroColors.CanvasColorDarkShade));
+            table.StyleClasses.Add(style.Class, style);
+            // ItemPanel
+            style = Office2007ColorTableFactory.GetItemPanelStyle(factory.GetColor(metroColors.CanvasColorDarkShade), factory.GetColor(metroColors.CanvasColor));
+            table.StyleClasses.Add(style.Class, style);
+            // ListBoxAdv
+            style = Office2007ColorTableFactory.GetListBoxAdvStyle(factory.GetColor(metroColors.CanvasColorDarkShade), factory.GetColor(metroColors.CanvasColor));
+            table.StyleClasses.Add(style.Class, style);
+            // DateTimeInput background
+            style = Office2007ColorTableFactory.GetDateTimeInputBackgroundStyle(factory.GetColor(metroColors.CanvasColorDarkShade), factory.GetColor(metroColors.CanvasColor));
+            table.StyleClasses.Add(style.Class, style);
+            // Ribbon Client Panel
+            style = Office2010BlueFactory.GetRibbonClientPanelStyle(factory, eOffice2010ColorScheme.Silver);
+            table.StyleClasses.Add(style.Class, style);
+            // ListView Border
+            style = Office2007ColorTableFactory.GetListViewBorderStyle(table.ListViewEx);
+            table.StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetStatusBarAltStyle(table.Bar);
+            table.StyleClasses.Add(style.Class, style);
+#if !NOTREE
+            // Tree Border/Background
+            style = Office2007ColorTableFactory.GetAdvTreeStyle(factory.GetColor(metroColors.CanvasColorDarkShade), factory.GetColor(metroColors.CanvasColor));
+            table.StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetAdvTreeColumnsHeaderStyle(factory.GetColor(metroColors.CanvasColorLighterShade), Color.Empty, factory.GetColor(metroColors.CanvasColorDarkShade));
+            table.StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetAdvTreeNodesColumnsHeaderStyle(factory.GetColor(metroColors.CanvasColorLighterShade), Color.Empty, factory.GetColor(metroColors.CanvasColorLighterShade));
+            table.StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetAdvTreeColumnStyle(factory.GetColor(metroColors.TextColor));
+            table.StyleClasses.Add(style.Class, style);
+            // CrumbBar
+            style = Office2007ColorTableFactory.GetCrumbBarBackgroundStyle(factory.GetColor(metroColors.CanvasColor), factory.GetColor(metroColors.CanvasColorLightShade), factory.GetColor(metroColors.CanvasColorDarkShade));
+            table.StyleClasses.Add(style.Class, style);
+#endif
+            // DataGridView border
+            style = Office2007ColorTableFactory.GetDataGridViewStyle();
+            table.StyleClasses.Add(style.Class, style);
+            // DataGridViewDateTime border
+            style = Office2007ColorTableFactory.GetDataGridViewDateTimeStyle();
+            table.StyleClasses.Add(style.Class, style);
+            // DataGridViewNumeric border
+            style = Office2007ColorTableFactory.GetDataGridViewNumericStyle();
+            table.StyleClasses.Add(style.Class, style);
+            // DataGridViewIpAddress border
+            style = Office2007ColorTableFactory.GetDataGridViewIpAddressStyle();
+            table.StyleClasses.Add(style.Class, style);
+
+            // Slide-out button
+            style = GetSlideOutButtonStyle(metroColors.ComplementColor);
+            table.StyleClasses.Add(style.Class, style);
+
+            // MetroTilePanel
+            style = Office2007ColorTableFactory.GetMetroTilePanelStyle(factory.GetColor(metroColors.CanvasColor));
+            table.StyleClasses.Add(style.Class, style);
+
+            // MetroTileGroup
+            style = Office2007ColorTableFactory.GetMetroTileGroupStyle(factory.GetColor(metroColors.TextColor));
+            table.StyleClasses.Add(style.Class, style);
+
+            // MonthCalendarAdv
+            style = Office2007ColorTableFactory.GetMonthCalendarStyle(factory.GetColor(metroColors.CanvasColor));
+            table.StyleClasses.Add(style.Class, style);
+
+            // ProgressSteps control
+            style = Office2007ColorTableFactory.GetProgressStepsStyle(table);
+            table.StyleClasses.Add(style.Class, style);
+
+            // SideNavStrip
+            style = Office2007ColorTableFactory.GetSideNavStripStyle(metroColors.BaseColor);
+            table.StyleClasses.Add(style.Class, style);
+
+            // TabFormPanel
+            style = Office2007ColorTableFactory.GetTabFormPanelStyle(factory.GetColor(0xF5F6F7));
+            table.StyleClasses.Add(style.Class, style);
+
+            style = Office2007ColorTableFactory.GetToolboxControlStyle(factory.GetColor(metroColors.CanvasColorDarkShade), Color.Empty);
+            table.StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetToolboxGroupTitle(factory.GetColor(metroColors.TextColor));
+            table.StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetToolboxGroupTitleMouseOver(factory.GetColor(metroColors.BaseColorLightText), factory.GetColor(metroColors.BaseColorLightest));
+            table.StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetToolboxGroupExpandedTitle(factory.GetColor(metroColors.BaseTextColor), factory.GetColor(metroColors.BaseColor));
+            table.StyleClasses.Add(style.Class, style);
+            #endregion
+
+            #region Contextual Label Colors
+            table.LabelItemColors.Clear();
+            table.LabelItemColors.Add(Office2007ColorTable.GetContextualKey(typeof(MetroStatusBar)), new LabelColors(factory.GetColor(metroColors.BaseTextColor), factory.GetColor(metroColors.TextDisabledColor)));
+            table.LabelItemColors.Add(Office2007ColorTable.GetContextualKey(typeof(Bar)), new LabelColors(factory.GetColor(metroColors.TextColor), factory.GetColor(metroColors.TextDisabledColor)));
+            table.LabelItemColors.Add(Office2007ColorTable.GetContextualKey(typeof(Bar), "StatusBar"), new LabelColors(factory.GetColor(metroColors.BaseTextColor), factory.GetColor(metroColors.TextDisabledColor)));
+            #endregion
+
+            InitAppButtonColors(table, factory, metroColors);
+
+            #region StepIndicator
+            table.StepIndicator.BackgroundColor = factory.GetColor(metroColors.CanvasColorLighterShade);
+            table.StepIndicator.IndicatorColor = factory.GetColor(Color.FromArgb(128, metroColors.ComplementColorLight));
+            #endregion
+
+            #region RadialMenu
+            table.RadialMenu = new RadialMenuColorTable();
+            table.RadialMenu.CircularBackColor = factory.GetColor(metroColors.ComplementColor);
+            table.RadialMenu.CircularBorderColor = factory.GetColor(0xFFFFFF);
+            table.RadialMenu.CircularForeColor = factory.GetColor(0xFFFFFF);
+            table.RadialMenu.RadialMenuBackground = factory.GetColor(metroColors.CanvasColor);
+            table.RadialMenu.RadialMenuBorder = factory.GetColor(metroColors.BaseColor);
+            table.RadialMenu.RadialMenuButtonBackground = factory.GetColor(metroColors.CanvasColor);
+            table.RadialMenu.RadialMenuButtonBorder = factory.GetColor(metroColors.BaseColor);
+            table.RadialMenu.RadialMenuExpandForeground = factory.GetColor(metroColors.CanvasColor);
+            table.RadialMenu.RadialMenuInactiveBorder = Color.FromArgb(128, table.RadialMenu.RadialMenuBorder);
+            table.RadialMenu.RadialMenuItemForeground = factory.GetColor(metroColors.BaseColor);
+            table.RadialMenu.RadialMenuItemDisabledForeground = factory.GetColor(metroColors.TextDisabledColor);
+            table.RadialMenu.RadialMenuItemMouseOverBackground = Color.FromArgb(72, table.RadialMenu.RadialMenuItemForeground);
+            table.RadialMenu.RadialMenuItemMouseOverForeground = factory.GetColor(metroColors.BaseColor);
+            table.RadialMenu.RadialMenuMouseOverBorder = Color.FromArgb(200, table.RadialMenu.RadialMenuBorder);
+            #endregion
+
+            #region StepItem
+            table.StepItem.Default = new OfficeStepItemStateColorTable(new Color[]{
+                    factory.GetColor(metroColors.CanvasColor)
+                    },
+                    90,
+                    new float[0],
+                factory.GetColor(metroColors.TextColor),
+                new Color[] {
+                    factory.GetColor(metroColors.CanvasColorDarkShade) });
+            table.StepItem.Progress = new OfficeStepItemStateColorTable(new Color[]{
+                    factory.GetColor(0xD8F577), 
+                    factory.GetColor(0x75C300),
+                    factory.GetColor(0x75C300),
+                    factory.GetColor(0xA9E923)
+                    },
+                    90,
+                    new float[] { 0f, .6f, .6f, 1f },
+                Color.Empty,
+                new Color[0]);
+            table.StepItem.MouseOver = new OfficeStepItemStateColorTable(new Color[]{
+                    factory.GetColor(metroColors.CanvasColorLight)
+                    },
+                    90,
+                    new float[0],
+                factory.GetColor(metroColors.TextColor),
+                new Color[] {
+                    factory.GetColor(metroColors.CanvasColorLight) });
+            table.StepItem.Pressed = new OfficeStepItemStateColorTable(new Color[]{
+                    factory.GetColor(metroColors.BaseColor)
+                    },
+                    90,
+                    new float[0],
+                factory.GetColor(metroColors.BaseTextColor),
+                new Color[] {
+                    factory.GetColor(metroColors.BaseColor) });
+            #endregion
+
+            #region TokenEditor
+            table.TokenEditor = new TokenEditorColorTable(metroColors.TextColor, metroColors.CanvasColorLighterShade, metroColors.TextColor, metroColors.CanvasColorLightShade, metroColors.BaseTextColor, metroColors.BaseColor);
+            #endregion
+
+            #region Flyout
+            table.Flyout.BorderColor = metroColors.BaseColor;
+            table.Flyout.BackColor = metroColors.CanvasColor;
+            #endregion
+
+            #region SideNav
+            table.SideNav.SideNavItem.Default = new SideNavItemStateColorTable(factory.GetColor(metroColors.BaseTextColor));
+            table.SideNav.SideNavItem.MouseOver = new SideNavItemStateColorTable(factory.GetColor(metroColors.BaseColorLightText),
+                new Color[]
+                {
+                    factory.GetColor(metroColors.BaseColorLight)
+                },
+                new Color[] { factory.GetColor(metroColors.BaseColorLight) },
+                0);
+            table.SideNav.SideNavItem.Pressed = new SideNavItemStateColorTable(factory.GetColor(metroColors.BaseColorLightText),
+                new Color[]
+                {
+                    factory.GetColor(metroColors.BaseColorDark)
+                },
+                new Color[] { factory.GetColor(metroColors.BaseColorDark) },
+                0);
+            table.SideNav.SideNavItem.Selected = new SideNavItemStateColorTable(factory.GetColor(metroColors.TextColor),
+                new Color[] { factory.GetColor(metroColors.CanvasColor) },
+                new Color[] { Color.Empty, factory.GetColor(metroColors.CanvasColor), Color.Empty, factory.GetColor(metroColors.CanvasColor) });
+            table.SideNav.BorderColors = new Color[] { factory.GetColor(metroColors.BaseColor) };
+            table.SideNav.TitleBackColor = factory.GetColor(metroColors.BaseColorDark);
+            table.SideNav.TitleBorderColors = new Color[] { Color.Empty, Color.Empty, Color.Empty, factory.GetColor(metroColors.BaseColor) };
+            table.SideNav.PanelBackColor = table.Form.BackColor;
+
+            #endregion
+
+            #region TabForm
+            table.TabForm.CaptionTextFormat = eTextFormat.VerticalCenter | eTextFormat.HorizontalCenter | eTextFormat.EndEllipsis | eTextFormat.NoPrefix;
+            table.TabForm.Active.CaptionText = factory.GetColor(metroColors.BaseTextColor);
+            table.TabForm.Inactive.CaptionText = factory.GetColor(metroColors.BaseTextColor);
+            table.TabForm.Active.CaptionBackColors = new Color[] { factory.GetColor(metroColors.BaseColor) };
+            table.TabForm.Inactive.CaptionBackColors = new Color[] { factory.GetColor(metroColors.BaseColor) };
+            table.TabFormItemColorTables.Clear();
+            table.TabFormItemColorTables.Add(TabFormItem.DefaultColorTableKey,
+                Office2007ColorTable.CreateDefaultTabFormItemColorTable(factory,
+                new Color[] { factory.GetColor(metroColors.CanvasColorLighterShade) },
+                new Color[] { factory.GetColor(metroColors.CanvasColorLightShade) },
+                factory.GetColor(metroColors.TextLightColor),
+                new Color[] { factory.GetColor(ribbonBack) },
+                new Color[] { factory.GetColor(metroColors.CanvasColorLightShade) },
+                factory.GetColor(metroColors.BaseColor)
+                ));
+            table.TabFormItemColorTables.Add(TabFormItem.BlueColorTableKey, Office2007ColorTable.CreateBlueTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.YellowColorTableKey, Office2007ColorTable.CreateYellowTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.PurpleColorTableKey, Office2007ColorTable.CreatePurpleTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.CyanColorTableKey, Office2007ColorTable.CreateCyanTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.BlueMistColorTableKey, Office2007ColorTable.CreateBlueMistTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.PurpleMistColorTableKey, Office2007ColorTable.CreatePurpleMistTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.TanColorTableKey, Office2007ColorTable.CreateTanTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.LemonLimeColorTableKey, Office2007ColorTable.CreateLemonLimeTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.AppleColorTableKey, Office2007ColorTable.CreateAppleTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.TealColorTableKey, Office2007ColorTable.CreateTealTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.RedChalkColorTableKey, Office2007ColorTable.CreateRedChalkTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.SilverColorTableKey, Office2007ColorTable.CreateSilverTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.OrangeColorTableKey, Office2007ColorTable.CreateOrangeTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.GreenColorTableKey, Office2007ColorTable.CreateGreenTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.MagentaColorTableKey, Office2007ColorTable.CreateMagentaTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.RedColorTableKey, Office2007ColorTable.CreateRedTabFormItemColorTable(factory));
+            #endregion
+
+        }
+        #region Application Button Colors
+        private static Office2007ButtonItemColorTable FallBackAppButtonColorTable = null;
+        internal static Office2007ButtonItemColorTable GetAppFallBackColorTable()
+        {
+            if (FallBackAppButtonColorTable != null) return FallBackAppButtonColorTable;
+
+            MetroPartColors metroColors = VisualStudio2012ColorTableInitializer.CreateMetroPartColors(MetroColorGeneratorParameters.Default.CanvasColor, MetroColorGeneratorParameters.Default.BaseColor);
+            // Blue default
+            Office2007ButtonItemColorTable table = new Office2007ButtonItemColorTable();
+            table.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Orange);
+
+            Office2007ButtonItemStateColorTable ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(metroColors.BaseColor);
+            ct.BottomBackgroundHighlight = LinearGradientColorTable.Empty;
+            ct.OuterBorder = LinearGradientColorTable.Empty;
+            ct.InnerBorder = LinearGradientColorTable.Empty;
+            ct.Text = metroColors.BaseTextColor;
+            table.Default = ct;
+
+            ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(metroColors.BaseColorLight1);
+            ct.BottomBackgroundHighlight = LinearGradientColorTable.Empty;
+            ct.OuterBorder = LinearGradientColorTable.Empty;
+            ct.InnerBorder = LinearGradientColorTable.Empty;
+            ct.Text = metroColors.BaseTextColor;
+            table.MouseOver = ct;
+
+            ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(metroColors.BaseColorDark);
+            ct.BottomBackgroundHighlight = LinearGradientColorTable.Empty;
+            ct.OuterBorder = LinearGradientColorTable.Empty;
+            ct.InnerBorder = LinearGradientColorTable.Empty;
+            ct.Text = metroColors.BaseTextColor;
+            table.Pressed = ct;
+
+            table.Expanded = table.Pressed;
+            table.Checked = table.Pressed;
+
+            FallBackAppButtonColorTable = table;
+
+            return table;
+        }
+        internal static void InitAppButtonColors(Office2007ColorTable colorTable, ColorFactory factory, MetroPartColors metroColors)
+        {
+            Office2007ButtonItemColorTableCollection colors = colorTable.ApplicationButtonColors;
+            colors.Clear();
+
+            // Blue default
+            Office2007ButtonItemColorTable table = new Office2007ButtonItemColorTable();
+            table.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Orange);
+
+            Office2007ButtonItemStateColorTable ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            ct.BottomBackgroundHighlight = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(32, 0xFFFFFF), Color.Transparent);
+            ct.OuterBorder = LinearGradientColorTable.Empty; //new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            ct.InnerBorder = LinearGradientColorTable.Empty; //new LinearGradientColorTable(factory.GetColor(16, 0xFFFFFF));
+            ct.Text = factory.GetColor(metroColors.BaseTextColor);
+            table.Default = ct;
+
+            ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight1));
+            ct.BottomBackgroundHighlight = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(82, 0xFFFFFF), Color.Transparent);
+            ct.OuterBorder = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            ct.InnerBorder = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(72, 0xFFFFFF), factory.GetColor(48, 0xFFFFFF)); //new LinearGradientColorTable(factory.GetColor(0x55A1F3), factory.GetColor(0x4F9EEE));
+            ct.Text = factory.GetColor(metroColors.BaseTextColor);
+            table.MouseOver = ct;
+
+            ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            ct.BottomBackgroundHighlight = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(82, 0xFFFFFF), Color.Transparent);
+            ct.OuterBorder = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDarker));
+            ct.InnerBorder = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(72, 0xFFFFFF), factory.GetColor(48, 0xFFFFFF)); //new LinearGradientColorTable(factory.GetColor(0x55A1F3), factory.GetColor(0x4F9EEE));
+            ct.Text = factory.GetColor(metroColors.BaseTextColor);
+            table.Pressed = ct;
+
+            table.Expanded = table.MouseOver;
+            table.Checked = table.Pressed;
+
+            colors.Add(table);
+
+            // Magenta
+            table = new Office2007ButtonItemColorTable();
+            table.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Magenta);
+
+            ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(factory.GetColor(0xCC256B), factory.GetColor(0xB10851));
+            ct.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(64, 0xFFFFFF), Color.Transparent);
+            ct.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x8F013C), factory.GetColor(0x940741));
+            ct.InnerBorder = new LinearGradientColorTable(factory.GetColor(32, 0xFFFFFF));
+            ct.Text = factory.GetColor(0xFFFFFF);
+            table.Default = ct;
+
+            ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(factory.GetColor(0xD63272), factory.GetColor(0xB10B52));
+            ct.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(82, 0xFFFFFF), Color.Transparent);
+            ct.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x8F013C), factory.GetColor(0x950942));
+            ct.InnerBorder = new LinearGradientColorTable(factory.GetColor(72, 0xFFFFFF), factory.GetColor(48, 0xFFFFFF)); //new LinearGradientColorTable(factory.GetColor(0x55A1F3), factory.GetColor(0x4F9EEE));
+            ct.Text = factory.GetColor(0xFFFFFF);
+            table.MouseOver = ct;
+
+            ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(factory.GetColor(0xB50C53), factory.GetColor(0xB00B52));
+            ct.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(82, 0xFFFFFF), Color.Transparent);
+            ct.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x8F013D), factory.GetColor(0x950741));
+            ct.InnerBorder = new LinearGradientColorTable(factory.GetColor(72, 0xFFFFFF), factory.GetColor(48, 0xFFFFFF)); //new LinearGradientColorTable(factory.GetColor(0x55A1F3), factory.GetColor(0x4F9EEE));
+            ct.Text = factory.GetColor(0xFFFFFF);
+            table.Pressed = ct;
+
+            table.Expanded = table.MouseOver;
+            table.Checked = table.Pressed;
+
+            colors.Add(table);
+
+            // Orange
+            table = new Office2007ButtonItemColorTable();
+            table.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Blue);
+
+            ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(factory.GetColor(0xF27350), factory.GetColor(0xE5552F));
+            ct.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xF89E42), Color.Transparent);
+            ct.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xCC2B12), factory.GetColor(0xCF3415));
+            ct.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xF68954), factory.GetColor(0xF78B3E));
+            ct.Text = factory.GetColor(0xFFFFFF);
+            table.Default = ct;
+
+            ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(factory.GetColor(0xF87E4D), factory.GetColor(0xE6552E));
+            ct.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xFBBD5E), Color.Transparent);
+            ct.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xCA2810), factory.GetColor(0xCD3217));
+            ct.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFBAA5A), factory.GetColor(0xFCB857)); //new LinearGradientColorTable(factory.GetColor(0x55A1F3), factory.GetColor(0x4F9EEE));
+            ct.Text = factory.GetColor(0xFFFFFF);
+            table.MouseOver = ct;
+
+            ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(factory.GetColor(0xE3531D), factory.GetColor(0xE04E19));
+            ct.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xFDAF4C), Color.Transparent);
+            ct.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xCA2810), factory.GetColor(0xCD3013));
+            ct.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xE86229), factory.GetColor(0xFB8D44)); //new LinearGradientColorTable(factory.GetColor(0x55A1F3), factory.GetColor(0x4F9EEE));
+            ct.Text = factory.GetColor(0xFFFFFF);
+            table.Pressed = ct;
+
+            table.Expanded = table.MouseOver;
+            table.Checked = table.Pressed;
+
+            colors.Add(table);
+
+            // Green
+            table = new Office2007ButtonItemColorTable();
+            table.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.BlueWithBackground);
+
+            ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(factory.GetColor(0x459731), factory.GetColor(0x2B7F2C));
+            ct.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0x6BCA45), Color.Transparent);
+            ct.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x186337), factory.GetColor(0x1E6A39));
+            ct.InnerBorder = new LinearGradientColorTable(factory.GetColor(0x4CA231), factory.GetColor(0x53B331));
+            ct.Text = factory.GetColor(0xFFFFFF);
+            table.Default = ct;
+
+            ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(factory.GetColor(0x469734), factory.GetColor(0x267C2B));
+            ct.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0x89D668), Color.Transparent);
+            ct.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x196437), factory.GetColor(0x216B3C));
+            ct.InnerBorder = new LinearGradientColorTable(factory.GetColor(0x65B943), factory.GetColor(0x70CC4A));
+            ct.Text = factory.GetColor(0xFFFFFF);
+            table.MouseOver = ct;
+
+            ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(factory.GetColor(0x2F822A), factory.GetColor(0x2A7E2C));
+            ct.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0x68CB38), Color.Transparent);
+            ct.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x186437), factory.GetColor(0x1D6A38));
+            ct.InnerBorder = new LinearGradientColorTable(factory.GetColor(0x368F2B), factory.GetColor(0x59BD2D)); //new LinearGradientColorTable(factory.GetColor(0x55A1F3), factory.GetColor(0x4F9EEE));
+            ct.Text = factory.GetColor(0xFFFFFF);
+            table.Pressed = ct;
+
+            table.Expanded = table.MouseOver;
+            table.Checked = table.Pressed;
+
+            colors.Add(table);
+
+            // Teal
+            table = new Office2007ButtonItemColorTable();
+            table.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.MagentaWithBackground);
+
+            ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(factory.GetColor(0x159795), factory.GetColor(0x018281));
+            ct.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0x20B7B4), Color.Transparent);
+            ct.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x055E5E), factory.GetColor(0x076464));
+            ct.InnerBorder = new LinearGradientColorTable(factory.GetColor(0x1BA29D), factory.GetColor(0x1FB1A9));
+            ct.Text = factory.GetColor(0xFFFFFF);
+            table.Default = ct;
+
+            ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(factory.GetColor(0x1F9C99), factory.GetColor(0x038584));
+            ct.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0x36CDCA), Color.Transparent);
+            ct.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x055E5E), factory.GetColor(0x096767));
+            ct.InnerBorder = new LinearGradientColorTable(factory.GetColor(0x30B8B3), factory.GetColor(0x34C2BE));
+            ct.Text = factory.GetColor(0xFFFFFF);
+            table.MouseOver = ct;
+
+            ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(factory.GetColor(0x028482), factory.GetColor(0x028081));
+            ct.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0x2CC2BE), Color.Transparent);
+            ct.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x055E5E), factory.GetColor(0x086565));
+            ct.InnerBorder = new LinearGradientColorTable(factory.GetColor(0x028F8D), factory.GetColor(0x1DB4AD)); //new LinearGradientColorTable(factory.GetColor(0x55A1F3), factory.GetColor(0x4F9EEE));
+            ct.Text = factory.GetColor(0xFFFFFF);
+            table.Pressed = ct;
+
+            table.Expanded = table.MouseOver;
+            table.Checked = table.Pressed;
+
+            colors.Add(table);
+        }
+        #endregion
+
+        #region RibbonBar
+        public static Office2007RibbonBarStateColorTable GetRibbonBar(ColorFactory factory, MetroPartColors metroColors, Color ribbonBack)
+        {
+            Office2007RibbonBarStateColorTable rb = new Office2007RibbonBarStateColorTable();
+            rb.TopBackgroundHeight = 0.8f;
+            rb.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColorLightShade));
+            rb.InnerBorder = LinearGradientColorTable.Empty;// new LinearGradientColorTable(factory.GetColor(factory.GetColor(180, Color.White)), factory.GetColor(120, 0xFFFFFF));
+            rb.TopBackground = new LinearGradientColorTable(ribbonBack);
+            rb.BottomBackground = null; // new LinearGradientColorTable(factory.GetColor(0xF6F7F8), factory.GetColor(0xE5E9EE));
+            rb.TitleBackground = null;// new LinearGradientColorTable(factory.GetColor(0xC2D8F1), factory.GetColor(0xC0D8EF));
+            rb.TitleText = factory.GetColor(metroColors.TextColor);
+            return rb;
+        }
+
+        public static Office2007RibbonBarStateColorTable GetRibbonBarMouseOver(ColorFactory factory, MetroPartColors metroColors, Color ribbonBack)
+        {
+            return GetRibbonBar(factory, metroColors, ribbonBack);
+            //Office2007RibbonBarStateColorTable rb = new Office2007RibbonBarStateColorTable();
+            //rb.TopBackgroundHeight = 0.8f;
+            //rb.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xEFF1F2), factory.GetColor(0xCDD2D7));
+            //rb.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFFFFFF), factory.GetColor(120, 0xFFFFFF));
+            //rb.TopBackground = new LinearGradientColorTable(factory.GetColor(0xFEFEFE), factory.GetColor(0xDEE4EB));
+            //rb.BottomBackground = null;// new LinearGradientColorTable(factory.GetColor(0xC7D8ED), factory.GetColor(0xD8E8F5));
+            //rb.TitleBackground = new LinearGradientColorTable(factory.GetColor(0xF8FAFB), Color.Transparent);
+            //rb.TitleText = factory.GetColor(0x565F6D);
+            //return rb;
+        }
+
+        public static Office2007RibbonBarStateColorTable GetRibbonBarExpanded(ColorFactory factory, MetroPartColors metroColors, Color ribbonBack)
+        {
+            Office2007RibbonBarStateColorTable rb = new Office2007RibbonBarStateColorTable();
+            rb.TopBackgroundHeight = 15;
+            rb.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor), factory.GetColor(metroColors.CanvasColorLightShade));
+            rb.InnerBorder = new LinearGradientColorTable(factory.GetColor(factory.GetColor(180, Color.White)), factory.GetColor(120, 0xFFFFFF));
+            rb.TopBackground = new LinearGradientColorTable(ribbonBack);
+            rb.BottomBackground = null;// new LinearGradientColorTable(factory.GetColor(0xC7D8ED), factory.GetColor(0xD8E8F5));
+            rb.TitleBackground = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColorLighterShade), Color.Transparent);
+            rb.TitleText = Color.Empty;
+            return rb;
+        }
+        #endregion
+
+        #region CheckBoxItem
+        private static Office2007CheckBoxColorTable GetCheckBoxItem(ColorFactory factory, MetroPartColors metroColors)
+        {
+            Office2007CheckBoxColorTable chk = new Office2007CheckBoxColorTable();
+
+            chk.Default.CheckBackground = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor), Color.Empty);
+            chk.Default.CheckBorder = factory.GetColor(metroColors.TextDisabledColor);
+            chk.Default.CheckInnerBackground = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor));
+            chk.Default.CheckInnerBorder = factory.GetColor(metroColors.CanvasColor);
+            chk.Default.CheckSign = new LinearGradientColorTable(factory.GetColor(metroColors.TextLightColor), Color.Empty);
+            chk.Default.Text = factory.GetColor(metroColors.TextColor);
+
+            chk.MouseOver.CheckBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLightest), Color.Empty);
+            chk.MouseOver.CheckBorder = factory.GetColor(metroColors.BaseColorLight);
+            chk.MouseOver.CheckInnerBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLightest));
+            chk.MouseOver.CheckInnerBorder = factory.GetColor(metroColors.BaseColorLightest);
+            chk.MouseOver.CheckSign = new LinearGradientColorTable(factory.GetColor(metroColors.TextColor), Color.Empty);
+            chk.MouseOver.Text = factory.GetColor(metroColors.TextColor);
+
+            chk.Pressed.CheckBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight));
+            chk.Pressed.CheckBorder = factory.GetColor(metroColors.BaseColorLight);
+            chk.Pressed.CheckInnerBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight));
+            chk.Pressed.CheckInnerBorder = factory.GetColor(metroColors.BaseColorLight);
+            chk.Pressed.CheckSign = new LinearGradientColorTable(factory.GetColor(metroColors.TextColor), Color.Empty);
+            chk.Pressed.Text = factory.GetColor(metroColors.TextColor);
+
+            chk.Disabled.CheckBackground = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor), Color.Empty);
+            chk.Disabled.CheckBorder = factory.GetColor(metroColors.CanvasColorLightShade);
+            chk.Disabled.CheckInnerBackground = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor));
+            chk.Disabled.CheckInnerBorder = Color.Empty; // factory.GetColor(metroColors.CanvasColorLightShade);
+            chk.Disabled.CheckSign = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColorDarkShade), Color.Empty);
+            chk.Disabled.Text = factory.GetColor(metroColors.CanvasColorDarkShade);
+
+            return chk;
+        }
+        #endregion
+
+        #region Buttons
+        private static Office2007ButtonItemColorTable GetButtonItemBackstageDefault(ColorFactory factory, MetroPartColors metroColors)
+        {
+            Office2007ButtonItemColorTable cb = new Office2007ButtonItemColorTable();
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Blue);
+            cb.Default = new Office2007ButtonItemStateColorTable();
+            cb.Default.Text = factory.GetColor(metroColors.BaseTextColor);
+
+            // Button mouse over
+            cb.MouseOver = new Office2007ButtonItemStateColorTable();
+            cb.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            cb.MouseOver.InnerBorder = LinearGradientColorTable.Empty;
+            cb.MouseOver.TopBackground = null;
+            cb.MouseOver.TopBackgroundHighlight = null;
+            cb.MouseOver.BottomBackground = null;
+            cb.MouseOver.BottomBackgroundHighlight = null;
+            cb.MouseOver.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            cb.MouseOver.SplitBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark), Color.Empty);
+            cb.MouseOver.SplitBorderLight = LinearGradientColorTable.Empty;
+            cb.MouseOver.Text = factory.GetColor(metroColors.BaseTextColor);
+
+            cb.MouseOverSplitInactive = new Office2007ButtonItemStateColorTable();
+            cb.MouseOverSplitInactive.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x527DE0));
+
+            // Pressed
+            cb.Pressed = new Office2007ButtonItemStateColorTable();
+            cb.Pressed.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            cb.Pressed.InnerBorder = new LinearGradientColorTable(factory.GetColor(192, 0xFFFFFF));
+            cb.Pressed.TopBackground = new LinearGradientColorTable(factory.GetColor(32, metroColors.BaseColor));
+            cb.Pressed.TopBackgroundHighlight = LinearGradientColorTable.Empty; //new LinearGradientColorTable(Color.FromArgb(192, Color.White), Color.Transparent);
+            cb.Pressed.BottomBackground = new LinearGradientColorTable(factory.GetColor(32, metroColors.BaseColor));
+            cb.Pressed.BottomBackgroundHighlight = LinearGradientColorTable.Empty;
+            cb.Pressed.SplitBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor), Color.Empty);
+            cb.Pressed.SplitBorderLight = new LinearGradientColorTable(factory.GetColor(135, 0xFFFFFF), Color.Empty);
+            cb.Pressed.Text = factory.GetColor(metroColors.TextColor);
+
+            // Checked
+            cb.Checked = cb.Pressed;
+
+            // Expanded button
+            cb.Expanded = cb.MouseOver;
+
+            SetBlueExpandColors(cb, factory);
+
+            return cb;
+        }
+        public static Office2007ButtonItemColorTable GetButtonItemDefault(ColorFactory factory, MetroPartColors metroColors)
+        {
+            Office2007ButtonItemColorTable cb = new Office2007ButtonItemColorTable();
+            cb.Default = new Office2007ButtonItemStateColorTable();
+            cb.Default.Text = factory.GetColor(metroColors.TextColor);
+
+            // Button mouse over
+            cb.MouseOver = new Office2007ButtonItemStateColorTable();
+            cb.MouseOver.TopBackground = null;
+            cb.MouseOver.TopBackgroundHighlight = null;
+            cb.MouseOver.BottomBackground = null;
+            cb.MouseOver.BottomBackgroundHighlight = null;
+            cb.MouseOver.Background = new LinearGradientColorTable(metroColors.CanvasColorLightShade);
+            cb.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColorLightShade));// LinearGradientColorTable.Empty;
+            cb.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColorDarkShade));
+            cb.MouseOver.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.MouseOver.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.MouseOver.Text = factory.GetColor(metroColors.TextColor);
+            //cb.MouseOver = new Office2007ButtonItemStateColorTable();
+            //cb.MouseOver.TopBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseButtonGradientStart));
+            //cb.MouseOver.TopBackgroundHighlight = LinearGradientColorTable.Empty;
+            //cb.MouseOver.BottomBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseButtonGradientEnd));
+            //cb.MouseOver.BottomBackgroundHighlight = LinearGradientColorTable.Empty;
+            //cb.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDarker));
+            //cb.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            //cb.MouseOver.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            //cb.MouseOver.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            //cb.MouseOver.Text = factory.GetColor(metroColors.TextColor);
+
+
+            cb.MouseOverSplitInactive = new Office2007ButtonItemStateColorTable();
+            cb.MouseOverSplitInactive.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor));
+
+            // Pressed
+            cb.Pressed = new Office2007ButtonItemStateColorTable();
+            cb.Pressed.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColorDarkerShade));
+            cb.Pressed.InnerBorder = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColorDarkerShade));
+            cb.Pressed.Background = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColorDarkerShade));
+            cb.Pressed.TopBackground = null;
+            cb.Pressed.TopBackgroundHighlight = null;
+            cb.Pressed.BottomBackground = null;
+            cb.Pressed.BottomBackgroundHighlight = null;
+            cb.Pressed.SplitBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight));
+            cb.Pressed.SplitBorderLight = LinearGradientColorTable.Empty;//(factory.GetColor(metroColors.BaseColorLight), Color.Empty);
+            cb.Pressed.Text = factory.GetColor(metroColors.TextColor);
+            //cb.Pressed = new Office2007ButtonItemStateColorTable();
+            //cb.Pressed.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            //cb.Pressed.InnerBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDarker));
+            //cb.Pressed.TopBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight));
+            //cb.Pressed.TopBackgroundHighlight = LinearGradientColorTable.Empty;
+            //cb.Pressed.BottomBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            //cb.Pressed.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(Color.FromArgb(48, Color.White)), Color.Transparent);
+            //cb.Pressed.SplitBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            //cb.Pressed.SplitBorderLight = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight), Color.Empty);
+            //cb.Pressed.Text = factory.GetColor(metroColors.BaseTextColor);
+
+            // Checked
+            cb.Checked = new Office2007ButtonItemStateColorTable();
+            cb.Checked.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColorDarkerShade));
+            cb.Checked.InnerBorder = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColorDarkShade));
+            cb.Checked.Background = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColorDarkShade));
+            cb.Checked.TopBackground = null; //new LinearGradientColorTable(metroColors.BaseColorLight);
+            cb.Checked.TopBackgroundHighlight = null; //LinearGradientColorTable.Empty;
+            cb.Checked.BottomBackground = null; // new LinearGradientColorTable(metroColors.BaseColorLight);
+            cb.Checked.BottomBackgroundHighlight = null; // new LinearGradientColorTable(factory.GetColor("20FFFFFF"), Color.Transparent);
+            cb.Checked.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Checked.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Checked.Text = factory.GetColor(metroColors.BaseColorLightText);
+            //cb.Checked = new Office2007ButtonItemStateColorTable();
+            //cb.Checked.OuterBorder = new LinearGradientColorTable(metroColors.BaseColorDark);
+            //cb.Checked.InnerBorder = new LinearGradientColorTable(metroColors.BaseColorDarker);
+            //cb.Checked.TopBackground = new LinearGradientColorTable(metroColors.BaseColorLight);
+            //cb.Checked.TopBackgroundHighlight = LinearGradientColorTable.Empty;
+            //cb.Checked.BottomBackground = new LinearGradientColorTable(metroColors.BaseColorLight);
+            //cb.Checked.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor("20FFFFFF"), Color.Transparent);
+            //cb.Checked.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            //cb.Checked.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            //cb.Checked.Text = factory.GetColor(metroColors.BaseColorLightText);
+
+            // Expanded button
+            cb.Expanded = new Office2007ButtonItemStateColorTable();
+            cb.Expanded.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            cb.Expanded.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            cb.Expanded.InnerBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            cb.Expanded.TopBackground = null; // new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight));
+            cb.Expanded.TopBackgroundHighlight = null; // LinearGradientColorTable.Empty;
+            cb.Expanded.BottomBackground = null; // new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            cb.Expanded.BottomBackgroundHighlight = null; // new LinearGradientColorTable(factory.GetColor(Color.FromArgb(92, Color.White)), Color.Transparent);
+            cb.Expanded.SplitBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            cb.Expanded.SplitBorderLight = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight), Color.Empty);
+            cb.Expanded.Text = factory.GetColor(metroColors.BaseTextColor);
+
+            SetBlueExpandColors(cb, factory);
+
+            return cb;
+        }
+
+        public static Office2007ButtonItemColorTable GetButtonItemDefaultWithBackground(ColorFactory factory, MetroPartColors metroColors)
+        {
+            Office2007ButtonItemColorTable cb = GetButtonItemDefault(factory, metroColors);
+
+            cb.Default.TopBackground = null; // new LinearGradientColorTable(factory.GetColor(metroColors.BaseButtonGradientStart));
+            cb.Default.TopBackgroundHighlight = null;// LinearGradientColorTable.Empty;
+            cb.Default.BottomBackground = null; // new LinearGradientColorTable(factory.GetColor(metroColors.BaseButtonGradientEnd));
+            cb.Default.BottomBackgroundHighlight = null; // LinearGradientColorTable.Empty;
+            cb.Default.Background = new LinearGradientColorTable(metroColors.CanvasColor);
+            cb.Default.InnerBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColorDarkShade));
+            cb.Default.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.MouseOverSplitInactive = cb.Default;
+
+            // Same as default
+            cb.Disabled = new Office2007ButtonItemStateColorTable();
+            cb.Disabled.TopBackground = null;
+            cb.Disabled.TopBackgroundHighlight = null; // new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.BottomBackground = null; // LinearGradientColorTable.Empty;
+            cb.Disabled.BottomBackgroundHighlight = null; // new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.Background = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor));
+            cb.Disabled.InnerBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColorLightShade), Color.Empty);
+            cb.Disabled.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.Text = factory.GetColor(metroColors.CanvasColorLightShade);
+            return cb;
+        }
+
+        public static Office2007ButtonItemColorTable GetButtonItemBlue(ColorFactory factory, MetroPartColors metroColors)
+        {
+            Office2007ButtonItemColorTable cb = new Office2007ButtonItemColorTable();
+            cb.Default = new Office2007ButtonItemStateColorTable();
+            cb.Default.Text = factory.GetColor(metroColors.TextColor);
+
+            // Button mouse over
+            cb.MouseOver = new Office2007ButtonItemStateColorTable();
+            cb.MouseOver.TopBackground = null; // new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight));
+            cb.MouseOver.TopBackgroundHighlight = null;// LinearGradientColorTable.Empty;
+            cb.MouseOver.BottomBackground = null; // new LinearGradientColorTable(factory.GetColor(metroColors.BaseButtonGradientEnd));
+            cb.MouseOver.BottomBackgroundHighlight = null;// LinearGradientColorTable.Empty;
+            cb.MouseOver.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight));
+            cb.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            cb.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            cb.MouseOver.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.MouseOver.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.MouseOver.Text = factory.GetColor(metroColors.BaseColorLightText);
+
+            cb.MouseOverSplitInactive = new Office2007ButtonItemStateColorTable();
+            cb.MouseOverSplitInactive.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+
+            // Pressed
+            cb.Pressed = new Office2007ButtonItemStateColorTable();
+            cb.Pressed.OuterBorder = new LinearGradientColorTable(metroColors.BaseColorDarker);
+            cb.Pressed.InnerBorder = new LinearGradientColorTable(metroColors.BaseColorDark);
+            cb.Pressed.TopBackground = null;// new LinearGradientColorTable(factory.GetColor("DAF6FF"));
+            cb.Pressed.TopBackgroundHighlight = null; // LinearGradientColorTable.Empty;
+            cb.Pressed.BottomBackground = null;// new LinearGradientColorTable(factory.GetColor("A7E8FF"));
+            cb.Pressed.BottomBackgroundHighlight = null; // new LinearGradientColorTable(factory.GetColor(Color.FromArgb(48, Color.White)), Color.Transparent);
+            cb.Pressed.Background = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor));
+            cb.Pressed.SplitBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            cb.Pressed.SplitBorderLight = LinearGradientColorTable.Empty;
+            cb.Pressed.Text = factory.GetColor(metroColors.TextColor);
+
+            // Checked
+            cb.Checked = new Office2007ButtonItemStateColorTable();
+            cb.Checked.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            cb.Checked.InnerBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            cb.Checked.TopBackground = null;  // new LinearGradientColorTable(factory.GetColor("A7E8FF"));
+            cb.Checked.TopBackgroundHighlight = null; // LinearGradientColorTable.Empty;
+            cb.Checked.BottomBackground = null; // new LinearGradientColorTable(factory.GetColor("A7E8FF"));
+            cb.Checked.BottomBackgroundHighlight = null; // new LinearGradientColorTable(factory.GetColor("20FFFFFF"), Color.Transparent);
+            cb.Checked.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            cb.Checked.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Checked.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Checked.Text = factory.GetColor(metroColors.BaseTextColor);
+
+            // Expanded button
+            cb.Expanded = new Office2007ButtonItemStateColorTable();
+            cb.Expanded.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            cb.Expanded.InnerBorder = LinearGradientColorTable.Empty;
+            cb.Expanded.TopBackground = null; // new LinearGradientColorTable(factory.GetColor("DAF6FF"));
+            cb.Expanded.TopBackgroundHighlight = null; // LinearGradientColorTable.Empty;
+            cb.Expanded.BottomBackground = null; // new LinearGradientColorTable(factory.GetColor("A7E8FF"));
+            cb.Expanded.BottomBackgroundHighlight = null; // new LinearGradientColorTable(factory.GetColor(Color.FromArgb(48, Color.White)), Color.Transparent);
+            cb.Expanded.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            cb.Expanded.SplitBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            cb.Expanded.SplitBorderLight = LinearGradientColorTable.Empty; //(factory.GetColor("A000BFFF"), Color.Empty);
+            cb.Expanded.Text = factory.GetColor(metroColors.BaseTextColor);
+
+            SetBlueExpandColors(cb, factory);
+
+            return cb;
+        }
+
+        public static Office2007ButtonItemColorTable GetButtonItemBlueWithBackground(ColorFactory factory, MetroPartColors metroColors)
+        {
+            Office2007ButtonItemColorTable cb = GetButtonItemBlue(factory, metroColors);
+
+            cb.Default.TopBackground = null; //new LinearGradientColorTable(factory.GetColor(metroColors.BaseButtonGradientStart));
+            cb.Default.TopBackgroundHighlight = null;// LinearGradientColorTable.Empty;
+            cb.Default.BottomBackground = null;// new LinearGradientColorTable(factory.GetColor(metroColors.BaseButtonGradientEnd));
+            cb.Default.BottomBackgroundHighlight = null;// LinearGradientColorTable.Empty;
+            cb.Default.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            cb.Default.InnerBorder = LinearGradientColorTable.Empty;
+            cb.Default.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            cb.Default.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.Text = factory.GetColor(metroColors.BaseTextColor);
+            cb.MouseOverSplitInactive = cb.Default;
+
+            // Same as default
+            cb.Disabled = new Office2007ButtonItemStateColorTable();
+            cb.Disabled.TopBackground = null;
+            cb.Disabled.TopBackgroundHighlight = null;
+            cb.Disabled.BottomBackground = null;
+            cb.Disabled.BottomBackgroundHighlight = null;
+            cb.Disabled.Background = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor));
+            cb.Disabled.InnerBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColorLightShade), Color.Empty);
+            cb.Disabled.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.Text = factory.GetColor(metroColors.CanvasColorLightShade);
+            return cb;
+        }
+
+        public static Office2007ButtonItemColorTable GetButtonItemMagenta(ColorFactory factory, MetroPartColors metroColors)
+        {
+            Office2007ButtonItemColorTable cb = new Office2007ButtonItemColorTable();
+            cb.Default = new Office2007ButtonItemStateColorTable();
+            cb.Default.Text = factory.GetColor(metroColors.TextColor);
+
+            // Button mouse over
+            cb.MouseOver = new Office2007ButtonItemStateColorTable();
+            cb.MouseOver.TopBackground = null; // new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight));
+            cb.MouseOver.TopBackgroundHighlight = null;// LinearGradientColorTable.Empty;
+            cb.MouseOver.BottomBackground = null; // new LinearGradientColorTable(factory.GetColor(metroColors.BaseButtonGradientEnd));
+            cb.MouseOver.BottomBackgroundHighlight = null;// LinearGradientColorTable.Empty;
+            cb.MouseOver.Background = new LinearGradientColorTable(factory.GetColor(metroColors.ComplementColorLight));
+            cb.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(metroColors.ComplementColorDark));
+            cb.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.ComplementColor));
+            cb.MouseOver.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.MouseOver.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.MouseOver.Text = factory.GetColor(metroColors.ComplementColorLightText);
+
+            cb.MouseOverSplitInactive = new Office2007ButtonItemStateColorTable();
+            cb.MouseOverSplitInactive.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.ComplementColor));
+
+            // Pressed
+            cb.Pressed = new Office2007ButtonItemStateColorTable();
+            cb.Pressed.OuterBorder = new LinearGradientColorTable(metroColors.ComplementColorDarker);
+            cb.Pressed.InnerBorder = new LinearGradientColorTable(metroColors.ComplementColorDark);
+            cb.Pressed.TopBackground = null;// new LinearGradientColorTable(factory.GetColor("DAF6FF"));
+            cb.Pressed.TopBackgroundHighlight = null; // LinearGradientColorTable.Empty;
+            cb.Pressed.BottomBackground = null;// new LinearGradientColorTable(factory.GetColor("A7E8FF"));
+            cb.Pressed.BottomBackgroundHighlight = null; // new LinearGradientColorTable(factory.GetColor(Color.FromArgb(48, Color.White)), Color.Transparent);
+            cb.Pressed.Background = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor));
+            cb.Pressed.SplitBorder = new LinearGradientColorTable(factory.GetColor(metroColors.ComplementColor));
+            cb.Pressed.SplitBorderLight = LinearGradientColorTable.Empty;
+            cb.Pressed.Text = factory.GetColor(metroColors.TextColor);
+
+            // Checked
+            cb.Checked = new Office2007ButtonItemStateColorTable();
+            cb.Checked.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.ComplementColorDark));
+            cb.Checked.InnerBorder = new LinearGradientColorTable(factory.GetColor(metroColors.ComplementColorDark));
+            cb.Checked.TopBackground = null;  // new LinearGradientColorTable(factory.GetColor("A7E8FF"));
+            cb.Checked.TopBackgroundHighlight = null; // LinearGradientColorTable.Empty;
+            cb.Checked.BottomBackground = null; // new LinearGradientColorTable(factory.GetColor("A7E8FF"));
+            cb.Checked.BottomBackgroundHighlight = null; // new LinearGradientColorTable(factory.GetColor("20FFFFFF"), Color.Transparent);
+            cb.Checked.Background = new LinearGradientColorTable(factory.GetColor(metroColors.ComplementColor));
+            cb.Checked.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Checked.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Checked.Text = factory.GetColor(metroColors.ComplementColorText);
+
+            // Expanded button
+            cb.Expanded = new Office2007ButtonItemStateColorTable();
+            cb.Expanded.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.ComplementColor));
+            cb.Expanded.InnerBorder = LinearGradientColorTable.Empty;
+            cb.Expanded.TopBackground = null; // new LinearGradientColorTable(factory.GetColor("DAF6FF"));
+            cb.Expanded.TopBackgroundHighlight = null; // LinearGradientColorTable.Empty;
+            cb.Expanded.BottomBackground = null; // new LinearGradientColorTable(factory.GetColor("A7E8FF"));
+            cb.Expanded.BottomBackgroundHighlight = null; // new LinearGradientColorTable(factory.GetColor(Color.FromArgb(48, Color.White)), Color.Transparent);
+            cb.Expanded.Background = new LinearGradientColorTable(factory.GetColor(metroColors.ComplementColor));
+            cb.Expanded.SplitBorder = new LinearGradientColorTable(factory.GetColor(metroColors.ComplementColorDark));
+            cb.Expanded.SplitBorderLight = LinearGradientColorTable.Empty; //(factory.GetColor("A000BFFF"), Color.Empty);
+            cb.Expanded.Text = factory.GetColor(metroColors.ComplementColorText);
+
+            SetBlueExpandColors(cb, factory);
+
+            return cb;
+        }
+
+        public static Office2007ButtonItemColorTable GetButtonItemMagentaWithBackground(ColorFactory factory, MetroPartColors metroColors)
+        {
+            Office2007ButtonItemColorTable cb = GetButtonItemMagenta(factory, metroColors);
+
+            cb.Default.TopBackground = null;
+            cb.Default.TopBackgroundHighlight = null;
+            cb.Default.BottomBackground = null;
+            cb.Default.BottomBackgroundHighlight = null;
+            cb.Default.Background = new LinearGradientColorTable(factory.GetColor(metroColors.ComplementColor));
+            cb.Default.InnerBorder = LinearGradientColorTable.Empty;
+            cb.Default.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.ComplementColor));
+            cb.Default.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.Text = factory.GetColor(metroColors.ComplementColorText);
+            cb.MouseOverSplitInactive = cb.Default;
+
+            // Same as default
+            cb.Disabled = new Office2007ButtonItemStateColorTable();
+            cb.Disabled.TopBackground = null;
+            cb.Disabled.TopBackgroundHighlight = null;
+            cb.Disabled.BottomBackground = null;
+            cb.Disabled.BottomBackgroundHighlight = null;
+            cb.Disabled.Background = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor));
+            cb.Disabled.InnerBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColorLightShade), Color.Empty);
+            cb.Disabled.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.Text = factory.GetColor(metroColors.CanvasColorLightShade);
+            return cb;
+        }
+
+        public static void SetBlueExpandColors(Office2007ButtonItemColorTable ct, ColorFactory factory)
+        {
+            Color cb = factory.GetColor(0x454F5A);
+            Color cl = Color.FromArgb(192, Color.White);
+            ct.Default.ExpandBackground = cb;
+            ct.Default.ExpandLight = cl;
+
+            ct.Checked.ExpandBackground = cb;
+            ct.Checked.ExpandLight = cl;
+
+            //ct.Disabled.ExpandBackground = factory.GetColor(0xB7B7B7);
+            //ct.Disabled.ExpandLight = factory.GetColor(0xEDEDED);
+
+            ct.Expanded.ExpandBackground = cb;
+            ct.Expanded.ExpandLight = cl;
+
+            ct.MouseOver.ExpandBackground = cb;
+            ct.MouseOver.ExpandLight = cl;
+
+            ct.Pressed.ExpandBackground = cb;
+            ct.Pressed.ExpandLight = cl;
+        }
+
+        public static Office2007ButtonItemColorTable CreateBlueOrbColorTable(ColorFactory factory, MetroPartColors metroColors)
+        {
+            Office2007ButtonItemColorTable cb = new Office2007ButtonItemColorTable();
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.BlueOrb);
+
+            // Default
+            cb.Default = new Office2007ButtonItemStateColorTable();
+            cb.Default.TopBackground = null;
+            cb.Default.TopBackgroundHighlight = null;
+            cb.Default.BottomBackground = null;
+            cb.Default.BottomBackgroundHighlight = null;
+            cb.Default.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            cb.Default.InnerBorder = LinearGradientColorTable.Empty;
+            cb.Default.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseTextColor));
+            cb.Default.OuterBorderWidth = 2;
+            cb.Default.SplitBorder = LinearGradientColorTable.Empty;
+            cb.Default.SplitBorderLight = LinearGradientColorTable.Empty;
+            cb.Default.Text = factory.GetColor(metroColors.BaseTextColor);
+            cb.MouseOverSplitInactive = cb.Default;
+
+
+            // Button mouse over
+            cb.MouseOver = new Office2007ButtonItemStateColorTable();
+            cb.MouseOver.TopBackground = null;
+            cb.MouseOver.TopBackgroundHighlight = null;
+            cb.MouseOver.BottomBackground = null;
+            cb.MouseOver.BottomBackgroundHighlight = null;
+            cb.MouseOver.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            cb.MouseOver.InnerBorder = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLightest));// LinearGradientColorTable.Empty;
+            cb.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLightest));
+            cb.MouseOver.OuterBorderWidth = 2;
+            cb.MouseOver.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.MouseOver.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.MouseOver.Text = factory.GetColor(metroColors.BaseColorLightest);
+
+            cb.MouseOverSplitInactive = new Office2007ButtonItemStateColorTable();
+            cb.MouseOverSplitInactive.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLightest));
+
+            // Pressed
+            cb.Pressed = new Office2007ButtonItemStateColorTable();
+            cb.Pressed.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight));
+            cb.Pressed.OuterBorderWidth = 2;
+            cb.Pressed.InnerBorder = LinearGradientColorTable.Empty; // (factory.GetColor(metroColors.BaseColorLight));
+            cb.Pressed.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            cb.Pressed.TopBackground = null;
+            cb.Pressed.TopBackgroundHighlight = null;
+            cb.Pressed.BottomBackground = null;
+            cb.Pressed.BottomBackgroundHighlight = null;
+            cb.Pressed.SplitBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight));
+            cb.Pressed.SplitBorderLight = LinearGradientColorTable.Empty;//(factory.GetColor(metroColors.BaseColorLight), Color.Empty);
+            cb.Pressed.Text = factory.GetColor(metroColors.BaseColorLight);
+
+            // Checked
+            cb.Checked = new Office2007ButtonItemStateColorTable();
+            cb.Checked.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseTextColor));
+            cb.Checked.OuterBorderWidth = 2;
+            cb.Checked.InnerBorder = LinearGradientColorTable.Empty; // (factory.GetColor(metroColors.BaseTextColor));
+            cb.Checked.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            cb.Checked.TopBackground = null; //new LinearGradientColorTable(metroColors.BaseColorLight);
+            cb.Checked.TopBackgroundHighlight = null; //LinearGradientColorTable.Empty;
+            cb.Checked.BottomBackground = null; // new LinearGradientColorTable(metroColors.BaseColorLight);
+            cb.Checked.BottomBackgroundHighlight = null; // new LinearGradientColorTable(factory.GetColor("20FFFFFF"), Color.Transparent);
+            cb.Checked.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Checked.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Checked.Text = factory.GetColor(metroColors.BaseTextColor);
+
+            // Expanded button
+            cb.Expanded = new Office2007ButtonItemStateColorTable();
+            cb.Expanded.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLightest));
+            cb.Expanded.OuterBorderWidth = 2;
+            cb.Expanded.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            cb.Expanded.InnerBorder = LinearGradientColorTable.Empty;
+            cb.Expanded.TopBackground = null;
+            cb.Expanded.TopBackgroundHighlight = null;
+            cb.Expanded.BottomBackground = null;
+            cb.Expanded.BottomBackgroundHighlight = null;
+            cb.Expanded.SplitBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight));
+            cb.Expanded.SplitBorderLight = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight), Color.Empty);
+            cb.Expanded.Text = factory.GetColor(metroColors.BaseColorLightest);
+
+            // Same as default
+            cb.Disabled = new Office2007ButtonItemStateColorTable();
+            cb.Disabled.TopBackground = null;
+            cb.Disabled.TopBackgroundHighlight = null; // new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.BottomBackground = null; // LinearGradientColorTable.Empty;
+            cb.Disabled.BottomBackgroundHighlight = null; // new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            cb.Disabled.InnerBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight1), Color.Empty);
+            cb.Disabled.OuterBorderWidth = 2;
+            cb.Disabled.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.Text = factory.GetColor(metroColors.BaseColorLight1);
+            return cb;
+        }
+
+        public static Office2007ButtonItemColorTable GetButtonItemStatusBar(ColorFactory factory, MetroPartColors metroColors)
+        {
+            Office2007ButtonItemColorTable cb = new Office2007ButtonItemColorTable();
+            cb.Default = new Office2007ButtonItemStateColorTable();
+            cb.Default.Text = factory.GetColor(metroColors.BaseTextColor);
+
+            // Button mouse over
+            cb.MouseOver = new Office2007ButtonItemStateColorTable();
+            cb.MouseOver.TopBackground = null;
+            cb.MouseOver.TopBackgroundHighlight = null;
+            cb.MouseOver.BottomBackground = null;
+            cb.MouseOver.BottomBackgroundHighlight = null;
+            cb.MouseOver.Background = new LinearGradientColorTable(metroColors.BaseColorLight1);
+            cb.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight1));
+            cb.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight1));
+            cb.MouseOver.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.MouseOver.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.MouseOver.Text = factory.GetColor(metroColors.BaseTextColor);
+
+            cb.MouseOverSplitInactive = new Office2007ButtonItemStateColorTable();
+            cb.MouseOverSplitInactive.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight1));
+
+            // Pressed
+            cb.Pressed = new Office2007ButtonItemStateColorTable();
+            cb.Pressed.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            cb.Pressed.InnerBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            cb.Pressed.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            cb.Pressed.TopBackground = null;
+            cb.Pressed.TopBackgroundHighlight = null;
+            cb.Pressed.BottomBackground = null;
+            cb.Pressed.BottomBackgroundHighlight = null;
+            cb.Pressed.SplitBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            cb.Pressed.SplitBorderLight = LinearGradientColorTable.Empty;
+            cb.Pressed.Text = factory.GetColor(metroColors.BaseTextColor);
+
+            // Checked
+            cb.Checked = new Office2007ButtonItemStateColorTable();
+            cb.Checked.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            cb.Checked.InnerBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            cb.Checked.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            cb.Checked.TopBackground = null;
+            cb.Checked.TopBackgroundHighlight = null;
+            cb.Checked.BottomBackground = null;
+            cb.Checked.BottomBackgroundHighlight = null;
+            cb.Checked.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Checked.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Checked.Text = factory.GetColor(metroColors.BaseTextColor);
+
+            // Expanded button
+            cb.Expanded = new Office2007ButtonItemStateColorTable();
+            cb.Expanded.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            cb.Expanded.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            cb.Expanded.InnerBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            cb.Expanded.TopBackground = null;
+            cb.Expanded.TopBackgroundHighlight = null;
+            cb.Expanded.BottomBackground = null;
+            cb.Expanded.BottomBackgroundHighlight = null;
+            cb.Expanded.SplitBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            cb.Expanded.SplitBorderLight = LinearGradientColorTable.Empty;
+            cb.Expanded.Text = factory.GetColor(metroColors.BaseTextColor);
+
+            SetBlueExpandColors(cb, factory);
+
+            return cb;
+        }
+
+        public static Office2007ButtonItemColorTable GetButtonItemNavigationBar(ColorFactory factory, MetroPartColors metroColors)
+        {
+            Office2007ButtonItemColorTable cb = new Office2007ButtonItemColorTable();
+            cb.Default = new Office2007ButtonItemStateColorTable();
+            cb.Default.Text = factory.GetColor(metroColors.TextColor);
+
+            // Button mouse over
+            cb.MouseOver = new Office2007ButtonItemStateColorTable();
+            cb.MouseOver.TopBackground = null;
+            cb.MouseOver.TopBackgroundHighlight = null;
+            cb.MouseOver.BottomBackground = null;
+            cb.MouseOver.BottomBackgroundHighlight = null;
+            cb.MouseOver.Background = new LinearGradientColorTable(metroColors.BaseColorLight1);
+            cb.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight1));
+            cb.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight1));
+            cb.MouseOver.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.MouseOver.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.MouseOver.Text = factory.GetColor(metroColors.BaseTextColor);
+
+            cb.MouseOverSplitInactive = new Office2007ButtonItemStateColorTable();
+            cb.MouseOverSplitInactive.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight1));
+
+            // Pressed
+            cb.Pressed = new Office2007ButtonItemStateColorTable();
+            cb.Pressed.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            cb.Pressed.InnerBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            cb.Pressed.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            cb.Pressed.TopBackground = null;
+            cb.Pressed.TopBackgroundHighlight = null;
+            cb.Pressed.BottomBackground = null;
+            cb.Pressed.BottomBackgroundHighlight = null;
+            cb.Pressed.SplitBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            cb.Pressed.SplitBorderLight = LinearGradientColorTable.Empty;
+            cb.Pressed.Text = factory.GetColor(metroColors.BaseTextColor);
+
+            // Checked
+            cb.Checked = new Office2007ButtonItemStateColorTable();
+            cb.Checked.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            cb.Checked.InnerBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            cb.Checked.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            cb.Checked.TopBackground = null;
+            cb.Checked.TopBackgroundHighlight = null;
+            cb.Checked.BottomBackground = null;
+            cb.Checked.BottomBackgroundHighlight = null;
+            cb.Checked.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Checked.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Checked.Text = factory.GetColor(metroColors.BaseTextColor);
+
+            // Expanded button
+            cb.Expanded = new Office2007ButtonItemStateColorTable();
+            cb.Expanded.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            cb.Expanded.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            cb.Expanded.InnerBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            cb.Expanded.TopBackground = null;
+            cb.Expanded.TopBackgroundHighlight = null;
+            cb.Expanded.BottomBackground = null;
+            cb.Expanded.BottomBackgroundHighlight = null;
+            cb.Expanded.SplitBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            cb.Expanded.SplitBorderLight = LinearGradientColorTable.Empty;
+            cb.Expanded.Text = factory.GetColor(metroColors.BaseTextColor);
+
+            SetBlueExpandColors(cb, factory);
+
+            return cb;
+        }
+        #endregion
+
+        #region RibbonTabItem
+        public static Office2007RibbonTabItemColorTable GetRibbonTabItemBlueDefault(ColorFactory factory, MetroPartColors metroColors, Color ribbonBack)
+        {
+            Office2007RibbonTabItemColorTable rt = new Office2007RibbonTabItemColorTable();
+            rt.Default.Text = factory.GetColor(metroColors.CanvasColor);
+            rt.CornerSize = 0;
+
+            // Selected Tab
+            rt.Selected = new Office2007RibbonTabItemStateColorTable();
+            rt.Selected.Background = new LinearGradientColorTable(ribbonBack);
+            rt.Selected.BackgroundHighlight = new LinearGradientColorTable();
+            rt.Selected.InnerBorder = new LinearGradientColorTable();
+            rt.Selected.OuterBorder = new LinearGradientColorTable(metroColors.BaseColor);
+            rt.Selected.Text = factory.GetColor(metroColors.BaseColor);
+
+            // Selected Tab Mouse Over
+            rt.SelectedMouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.SelectedMouseOver.Background = new LinearGradientColorTable(ribbonBack);
+            rt.SelectedMouseOver.BackgroundHighlight = LinearGradientColorTable.Empty;
+            rt.SelectedMouseOver.InnerBorder = LinearGradientColorTable.Empty;
+            rt.SelectedMouseOver.OuterBorder = new LinearGradientColorTable(metroColors.BaseColor);
+            rt.SelectedMouseOver.Text = factory.GetColor(metroColors.BaseColor);
+
+            // Tab Mouse Over
+            rt.MouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.MouseOver.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight1));
+            rt.MouseOver.BackgroundHighlight = LinearGradientColorTable.Empty;
+            rt.MouseOver.InnerBorder = LinearGradientColorTable.Empty;
+            rt.MouseOver.OuterBorder = LinearGradientColorTable.Empty; // new LinearGradientColorTable(metroColors.CanvasColorLightShade);
+            rt.MouseOver.Text = factory.GetColor(metroColors.CanvasColor);
+
+            return rt;
+        }
+
+        public static Office2007RibbonTabItemColorTable GetRibbonTabItemBlueMagenta(ColorFactory factory)
+        {
+            Office2007RibbonTabItemColorTable rt = new Office2007RibbonTabItemColorTable();
+            rt.Default.Text = factory.GetColor(0x3B3B3B);
+            rt.CornerSize = 0;
+
+            // Selected Tab
+            rt.Selected = new Office2007RibbonTabItemStateColorTable();
+            rt.Selected.Background = new LinearGradientColorTable(factory.GetColor(0xF4DEEE), factory.GetColor(0xFEFEFE));
+            rt.Selected.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(64, Color.White), Color.Transparent);
+            rt.Selected.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFFFFFF), Color.Transparent);
+            rt.Selected.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xE088C0), factory.GetColor(0xDF6DAA));
+            rt.Selected.Text = factory.GetColor(0x3B3B3B);
+
+            // Selected Tab Mouse Over
+            rt.SelectedMouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.SelectedMouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xF4DEEE), factory.GetColor(0xFEFEFE));
+            rt.SelectedMouseOver.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(64, Color.White), Color.Transparent);
+            rt.SelectedMouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFFFFFF), Color.Transparent);
+            rt.SelectedMouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xE088C0), factory.GetColor(0xDF6DAA));
+            rt.SelectedMouseOver.Text = factory.GetColor(0x3B3B3B);
+
+            // Tab Mouse Over
+            rt.MouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.MouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xEDB5D8), factory.GetColor(0xFCFBFB));
+            rt.MouseOver.BackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xFCFBFB), Color.Transparent);
+            rt.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xF9D7EE), factory.GetColor(0xFDEDF8));
+            rt.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xE33991));
+            rt.MouseOver.Text = factory.GetColor(0x3B3B3B);
+
+            return rt;
+        }
+
+        public static Office2007RibbonTabItemColorTable GetRibbonTabItemBlueGreen(ColorFactory factory)
+        {
+            Office2007RibbonTabItemColorTable rt = new Office2007RibbonTabItemColorTable();
+            rt.Default.Text = factory.GetColor(0x3B3B3B);
+            rt.CornerSize = 0;
+
+            // Selected Tab
+            rt.Selected = new Office2007RibbonTabItemStateColorTable();
+            rt.Selected.Background = new LinearGradientColorTable(factory.GetColor(0xE4F3E0), factory.GetColor(0xE4F2DF));
+            rt.Selected.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(64, Color.White), Color.Transparent);
+            rt.Selected.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xD5EAD3), factory.GetColor(0xB8DEB1));
+            rt.Selected.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xB9C1B7), factory.GetColor(0xBFC1BE));
+            rt.Selected.Text = factory.GetColor(0x3B3B3B);
+
+            // Selected Tab Mouse Over
+            rt.SelectedMouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.SelectedMouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xE4F3E0), factory.GetColor(0xE4F2DF));
+            rt.SelectedMouseOver.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(32, Color.White), Color.Transparent);
+            rt.SelectedMouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xD5EAD3), factory.GetColor(0xB8DEB1));
+            rt.SelectedMouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xB9C1B7), factory.GetColor(0xBFC1BE));
+            rt.SelectedMouseOver.Text = factory.GetColor(0x3B3B3B);
+
+            // Tab Mouse Over
+            rt.MouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.MouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xB3DEE3), factory.GetColor(0x8ADE9F));
+            rt.MouseOver.BackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xDEECFF), Color.Transparent);
+            rt.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xE2EFFF), factory.GetColor(0xC7DFFF));
+            rt.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xC1C8D1), factory.GetColor(0xC0C7D0));
+            rt.MouseOver.Text = factory.GetColor(0x3B3B3B);
+
+            return rt;
+        }
+
+        public static Office2007RibbonTabItemColorTable GetRibbonTabItemBlueOrange(ColorFactory factory)
+        {
+            Office2007RibbonTabItemColorTable rt = new Office2007RibbonTabItemColorTable();
+            rt.Default.Text = factory.GetColor(0x3B3B3B);
+            rt.CornerSize = 0;
+
+            // Selected Tab
+            rt.Selected = new Office2007RibbonTabItemStateColorTable();
+            rt.Selected.Background = new LinearGradientColorTable(factory.GetColor(0xFFF59F), factory.GetColor(0xFFFAD5));
+            rt.Selected.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(64, Color.White), Color.Transparent);
+            rt.Selected.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFFFBD6), factory.GetColor(0xFDF28C));
+            rt.Selected.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xCAC7AC), factory.GetColor(0xC2C2C2));
+            rt.Selected.Text = factory.GetColor(0x3B3B3B);
+
+            // Selected Tab Mouse Over
+            rt.SelectedMouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.SelectedMouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xFFF59F), factory.GetColor(0xFFFAD5));
+            rt.SelectedMouseOver.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(32, Color.White), Color.Transparent);
+            rt.SelectedMouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFFFBD6), factory.GetColor(0xFDF28C));
+            rt.SelectedMouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xCAC7AC), factory.GetColor(0xC2C2C2));
+            rt.SelectedMouseOver.Text = factory.GetColor(0x3B3B3B);
+
+            // Tab Mouse Over
+            rt.MouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.MouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xCFE0E1), factory.GetColor(0xE9E799));
+            rt.MouseOver.BackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xCBE2FF), Color.Transparent);
+            rt.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xE2EFFF), factory.GetColor(0xC7DFFF));
+            rt.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xC1C8D1), factory.GetColor(0xC0C7D0));
+            rt.MouseOver.Text = factory.GetColor(0x3B3B3B);
+
+            return rt;
+        }
+        #endregion
+
+        #region Style Class Creation
+        public static ElementStyle GetSlideOutButtonStyle(Color complementColor)
+        {
+            ElementStyle style = new ElementStyle(ElementStyleClassKeys.SlideOutButtonKey);
+            style.BackColor = complementColor;
+            style.TextColor = Color.White;
+            return style;
+        }
+
+        public static ElementStyle GetFileMenuContainerStyle(Office2007ColorTable table)
+        {
+            ElementStyle style = new ElementStyle();
+            style.Class = ElementStyleClassKeys.RibbonFileMenuContainerKey;
+            Office2007MenuColorTable mc = table.Menu;
+
+            style.PaddingBottom = 3;
+            style.PaddingLeft = 0;
+            style.PaddingRight = 0;
+            style.PaddingTop = 25;
+            style.Border = eStyleBorderType.Solid;
+            style.CornerType = eCornerType.Rounded;
+            style.BorderWidth = 1;
+            style.BorderColor = Color.Transparent;
+            style.CornerDiameter = 3;
+            BackgroundColorBlend[] blend = new BackgroundColorBlend[mc.FileBackgroundBlend.Count];
+            mc.FileBackgroundBlend.CopyTo(blend);
+            style.BackColorBlend.Clear();
+            style.BackColorBlend.AddRange(blend);
+            style.BackColorGradientAngle = 90;
+            return style;
+        }
+
+        public static ElementStyle GetTwoColumnMenuContainerStyle(Office2007ColorTable table)
+        {
+            ElementStyle style = new ElementStyle();
+            style.Class = ElementStyleClassKeys.RibbonFileMenuTwoColumnContainerKey;
+            Office2007MenuColorTable mc = table.Menu;
+
+            style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Double;
+            style.BorderBottomWidth = 0;
+            style.BorderColor = mc.FileContainerBorder;
+            //style.BorderColorLight = mc.FileContainerBorderLight;
+            style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.None;
+            style.BorderLeftWidth = 0;
+            style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.None;
+            style.BorderRightWidth = 0;
+            style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            style.BorderTopWidth = 1;
+            style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            style.BorderBottomWidth = 1;
+            style.PaddingBottom = 0;
+            style.PaddingLeft = 0;
+            style.PaddingRight = 0;
+            style.PaddingTop = 0;
+
+            return style;
+        }
+
+        public static ElementStyle GetMenuColumnOneContainerStyle(Office2007ColorTable table)
+        {
+            ElementStyle style = new ElementStyle();
+            style.Class = ElementStyleClassKeys.RibbonFileMenuColumnOneContainerKey;
+            Office2007MenuColorTable mc = table.Menu;
+
+            style.BackColor = mc.FileColumnOneBackground;
+            style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            style.BorderRightColor = mc.FileColumnOneBorder;
+            style.BorderRightWidth = 1;
+            style.PaddingRight = 1;
+
+            return style;
+        }
+
+        public static ElementStyle GetMenuColumnTwoContainerStyle(Office2007ColorTable table)
+        {
+            ElementStyle style = new ElementStyle();
+            style.Class = ElementStyleClassKeys.RibbonFileMenuColumnTwoContainerKey;
+            Office2007MenuColorTable mc = table.Menu;
+
+            style.BackColor = mc.FileColumnTwoBackground;
+
+            return style;
+        }
+
+        public static ElementStyle GetMenuBottomContainer(Office2007ColorTable table)
+        {
+            ElementStyle style = new ElementStyle();
+            style.Class = ElementStyleClassKeys.RibbonFileMenuBottomContainerKey;
+            Office2007MenuColorTable mc = table.Menu;
+
+            //BackgroundColorBlend[] blend = new BackgroundColorBlend[mc.FileBottomContainerBackgroundBlend.Count];
+            //mc.FileBottomContainerBackgroundBlend.CopyTo(blend);
+            //style.BackColorBlend.Clear();
+            //style.BackColorBlend.AddRange(blend);
+            //style.BackColorGradientAngle = 90;
+            style.MarginTop = 2;
+            style.MarginRight = 2;
+            return style;
+        }
+        #endregion
+
+        #region Scroll Bar
+        public static void InitializeScrollBarColorTable(Office2007ColorTable t, ColorFactory factory, MetroPartColors metroParts)
+        {
+            InitializeScrollBarColorTable(t.ScrollBar, factory, metroParts);
+        }
+        public static void InitializeScrollBarColorTable(Office2007ScrollBarColorTable scrollBarColorTable, ColorFactory factory, MetroPartColors metroParts)
+        {
+            Office2007ScrollBarStateColorTable sct = scrollBarColorTable.Default;
+            sct.Background = new LinearGradientColorTable(factory.GetColor(metroParts.CanvasColor));
+            sct.Border = LinearGradientColorTable.Empty;
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(metroParts.TextInactiveColor));
+            sct.ThumbOuterBorder = new LinearGradientColorTable(factory.GetColor(metroParts.CanvasColorLightShade));
+            sct.TrackBackground.Clear();
+            sct.TrackInnerBorder = LinearGradientColorTable.Empty;
+            sct.TrackOuterBorder = new LinearGradientColorTable(factory.GetColor(metroParts.CanvasColorLightShade));
+            sct.TrackSignBackground = new LinearGradientColorTable(factory.GetColor(metroParts.CanvasColor));
+
+            // Mouse Over
+            sct = scrollBarColorTable.MouseOver;
+            sct.Background = scrollBarColorTable.Default.Background;
+            sct.Border = scrollBarColorTable.Default.Border;
+            sct.ThumbBackground.Clear();
+            sct.ThumbInnerBorder = LinearGradientColorTable.Empty;
+            sct.ThumbOuterBorder = new LinearGradientColorTable(factory.GetColor(metroParts.CanvasColorLightShade));
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(metroParts.TextInactiveColor));
+            sct.TrackBackground.Clear();
+            sct.TrackInnerBorder = LinearGradientColorTable.Empty;
+            sct.TrackOuterBorder = new LinearGradientColorTable(factory.GetColor(metroParts.CanvasColorLightShade));
+            sct.TrackSignBackground = new LinearGradientColorTable(factory.GetColor(metroParts.CanvasColorLighterShade));
+
+            // Control Mouse Over
+            sct = scrollBarColorTable.MouseOverControl;
+            sct.Background = scrollBarColorTable.Default.Background;
+            sct.Border = scrollBarColorTable.Default.Border;
+            sct.ThumbBackground.Clear();
+            sct.ThumbInnerBorder = LinearGradientColorTable.Empty;
+            sct.ThumbOuterBorder = new LinearGradientColorTable(factory.GetColor(metroParts.CanvasColorLightShade));
+            sct.ThumbSignBackground = scrollBarColorTable.Default.ThumbSignBackground;
+            sct.TrackBackground.Clear();
+            sct.TrackInnerBorder = LinearGradientColorTable.Empty;
+            sct.TrackOuterBorder = new LinearGradientColorTable(factory.GetColor(metroParts.CanvasColorLightShade));
+            sct.TrackSignBackground = new LinearGradientColorTable(factory.GetColor(metroParts.CanvasColor));
+
+            // Pressed
+            sct = scrollBarColorTable.Pressed;
+            sct.Background = scrollBarColorTable.Default.Background;
+            sct.Border = scrollBarColorTable.Default.Border;
+            sct.ThumbBackground.Clear();
+            sct.ThumbInnerBorder = LinearGradientColorTable.Empty;
+            sct.ThumbOuterBorder = new LinearGradientColorTable(factory.GetColor(metroParts.TextInactiveColor));
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(metroParts.TextInactiveColor));
+            sct.TrackBackground.Clear();
+            sct.TrackInnerBorder = LinearGradientColorTable.Empty;
+            sct.TrackOuterBorder = new LinearGradientColorTable(factory.GetColor(metroParts.TextInactiveColor));
+            sct.TrackSignBackground = new LinearGradientColorTable(factory.GetColor(metroParts.CanvasColorLighterShade));
+            // Disabled
+            sct = scrollBarColorTable.Disabled;
+            sct.Background = scrollBarColorTable.Default.Background;
+            sct.Border = scrollBarColorTable.Default.Border;
+            sct.ThumbBackground.Clear();
+            sct.ThumbInnerBorder = new LinearGradientColorTable();
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(metroParts.TextDisabledColor));
+            sct.TrackBackground.Clear();
+            sct.TrackInnerBorder = new LinearGradientColorTable();
+            sct.TrackSignBackground = new LinearGradientColorTable();
+        }
+        public static void InitializeAppBlueScrollBarColorTable(Office2007ColorTable t, ColorFactory factory, MetroPartColors metroParts)
+        {
+            InitializeScrollBarColorTable(t.AppScrollBar, factory, metroParts);
+        }
+        #endregion
+
+        #region AdvTree
+        public static void CreateAdvTreeColorTable(TreeColorTable ct, ColorFactory factory, MetroPartColors metroColors)
+        {
+            #region Tree Selection
+            TreeSelectionColors treeSelection = new TreeSelectionColors();
+            ct.Selection = treeSelection;
+            // Highlight full row
+            SelectionColorTable selColorTable = new SelectionColorTable();
+            selColorTable.Fill = new SolidFill(factory.GetColor(metroColors.BaseColor));
+            selColorTable.TextColor = factory.GetColor(metroColors.BaseTextColor);
+            treeSelection.FullRowSelect = selColorTable;
+            //  Highlight full row Inactive
+            selColorTable = new SelectionColorTable();
+            selColorTable.Fill = new SolidFill(metroColors.CanvasColorLightShade);
+            treeSelection.FullRowSelectInactive = selColorTable;
+
+            // Node Marker
+            selColorTable = new SelectionColorTable();
+            selColorTable.Fill = new SolidFill(factory.GetColor(metroColors.BaseColor));
+            selColorTable.TextColor = factory.GetColor(metroColors.BaseTextColor);
+            treeSelection.NodeMarker = selColorTable;
+            // Node marker inactive
+            selColorTable = new SelectionColorTable();
+            selColorTable.Fill = new SolidFill(factory.GetColor(metroColors.CanvasColorLightShade));
+            treeSelection.NodeMarkerInactive = selColorTable;
+
+            // Cell selection
+            selColorTable = new SelectionColorTable();
+            selColorTable.Fill = new SolidFill(factory.GetColor(metroColors.BaseColor));
+            selColorTable.TextColor = factory.GetColor(metroColors.BaseTextColor);
+            treeSelection.HighlightCells = selColorTable;
+            // Cell selection inactive
+            selColorTable = new SelectionColorTable();
+            selColorTable.Fill = new SolidFill(factory.GetColor(metroColors.CanvasColorLightShade));
+            treeSelection.HighlightCellsInactive = selColorTable;
+
+            selColorTable = new SelectionColorTable();
+            selColorTable.Fill = new SolidFill(factory.GetColor(metroColors.BaseColor));
+            selColorTable.TextColor = factory.GetColor(metroColors.BaseTextColor);
+            treeSelection.NodeHotTracking = selColorTable;
+            #endregion
+
+            #region Expand Buttons
+            TreeExpandColorTable expand = new TreeExpandColorTable();
+            expand.CollapseBorder = new SolidBorder(factory.GetColor(metroColors.CanvasColorDarkShade), 1);
+            expand.CollapseFill = new SolidFill(factory.GetColor(metroColors.CanvasColor));
+            expand.CollapseMouseOverBorder = new SolidBorder(factory.GetColor(metroColors.TextColor), 1);
+            expand.CollapseMouseOverFill = new SolidFill(factory.GetColor(metroColors.TextColor));
+            expand.ExpandBorder = new SolidBorder(factory.GetColor(metroColors.CanvasColorDarkShade), 1);
+            expand.ExpandFill = new SolidFill(factory.GetColor(metroColors.CanvasColor));
+            expand.ExpandMouseOverBorder = new SolidBorder(factory.GetColor(metroColors.TextColor), 1);
+            expand.ExpandMouseOverFill = new SolidFill(factory.GetColor(metroColors.CanvasColor));
+            ct.ExpandTriangle = expand;
+            // Rectangle
+            expand = new TreeExpandColorTable();
+            expand.CollapseForeground = new SolidFill(factory.GetColor(metroColors.CanvasColorDarkShade));
+            expand.CollapseBorder = new SolidBorder(factory.GetColor(metroColors.TextColor), 1);
+            expand.CollapseFill = new GradientFill(new ColorStop[]{
+                new ColorStop(factory.GetColor(metroColors.CanvasColor), 0f), new ColorStop(factory.GetColor(metroColors.CanvasColor), .40f), new ColorStop(factory.GetColor(metroColors.CanvasColorLighterShade), 1f)}, 45);
+            expand.CollapseMouseOverForeground = expand.CollapseForeground;
+            expand.CollapseMouseOverBorder = expand.CollapseBorder;
+            expand.CollapseMouseOverFill = expand.CollapseFill;
+            expand.ExpandForeground = expand.CollapseForeground;
+            expand.ExpandBorder = expand.CollapseBorder;
+            expand.ExpandFill = expand.CollapseFill;
+            expand.ExpandMouseOverForeground = expand.CollapseForeground;
+            expand.ExpandMouseOverBorder = expand.CollapseBorder;
+            expand.ExpandMouseOverFill = expand.CollapseFill;
+            ct.ExpandRectangle = expand;
+            ct.ExpandEllipse = expand;
+            #endregion
+
+            #region Misc Tree Color
+            ct.GridLines = factory.GetColor(metroColors.CanvasColorLightShade);
+            #endregion
+        }
+        #endregion
+
+        #region RibbonTab Group
+        public static Office2007RibbonTabGroupColorTable GetRibbonTabGroupDefault(ColorFactory factory, MetroPartColors metroColors)
+        {
+            Office2007RibbonTabGroupColorTable tg = new Office2007RibbonTabGroupColorTable();
+            tg.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            tg.BackgroundHighlight = LinearGradientColorTable.Empty;
+            tg.Text = factory.GetColor(metroColors.BaseColorLighter);
+            tg.Border = LinearGradientColorTable.Empty;
+
+            return tg;
+        }
+
+        public static Office2007RibbonTabGroupColorTable GetRibbonTabGroupOrange(ColorFactory factory, MetroPartColors metroColors)
+        {
+            Office2007RibbonTabGroupColorTable tg = new Office2007RibbonTabGroupColorTable();
+            tg.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            tg.BackgroundHighlight = LinearGradientColorTable.Empty;
+            tg.Text = factory.GetColor(metroColors.BaseColorLighter);
+            tg.Border = LinearGradientColorTable.Empty;
+            return tg;
+        }
+
+        public static Office2007RibbonTabGroupColorTable GetRibbonTabGroupMagenta(ColorFactory factory, MetroPartColors metroColors)
+        {
+            Office2007RibbonTabGroupColorTable tg = new Office2007RibbonTabGroupColorTable();
+            tg.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            tg.BackgroundHighlight = LinearGradientColorTable.Empty;
+            tg.Text = factory.GetColor(metroColors.BaseColorLighter);
+            tg.Border = LinearGradientColorTable.Empty;
+
+            return tg;
+        }
+
+        public static Office2007RibbonTabGroupColorTable GetRibbonTabGroupGreen(ColorFactory factory, MetroPartColors metroColors)
+        {
+            Office2007RibbonTabGroupColorTable tg = new Office2007RibbonTabGroupColorTable();
+            tg.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            tg.BackgroundHighlight = LinearGradientColorTable.Empty;
+            tg.Text = factory.GetColor(metroColors.BaseColorLighter);
+            tg.Border = LinearGradientColorTable.Empty;
+
+            return tg;
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Metro/ColorTables/Office2016MetroInitializer.cs b/PROMS/DotNetBar Source Code/Metro/ColorTables/Office2016MetroInitializer.cs
new file mode 100644
index 00000000..cbe38038
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Metro/ColorTables/Office2016MetroInitializer.cs	
@@ -0,0 +1,174 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+using DevComponents.DotNetBar.Rendering;
+using DevComponents.DotNetBar.Metro.Helpers;
+
+namespace DevComponents.DotNetBar.Metro.ColorTables
+{
+    internal class Office2016MetroInitializer
+    {
+        public static MetroColorTable CreateColorTable(MetroColorGeneratorParameters colorParams)
+        {
+            return CreateColorTable(colorParams.CanvasColor, colorParams.BaseColor);
+        }
+        public static MetroColorTable CreateColorTable(Color canvasColor, Color baseColor)
+        {
+            MetroColorTable metroTable = new MetroColorTable();
+            Office2007ColorTable officeMetroColorTable = new Office2007ColorTable();
+            CreateColors(metroTable, officeMetroColorTable, canvasColor, baseColor);
+            if (StyleManager.IsMetro(StyleManager.Style))
+                ((Office2007Renderer)GlobalManager.Renderer).ColorTable = officeMetroColorTable;
+            return metroTable;
+        }
+
+        private const double DEGREE = 1d / 360;
+        public static MetroPartColors CreateMetroPartColors(Color canvasColor, Color baseColor)
+        {
+            ColorFunctions.HLSColor canvasHsl = ColorFunctions.RGBToHSL(canvasColor);
+            ColorFunctions.HLSColor baseHsl = ColorFunctions.RGBToHSL(baseColor);
+            HSVColor baseHsv = ColorHelpers.ColorToHSV(baseColor);
+            HSVColor canvasHsv = ColorHelpers.ColorToHSV(canvasColor);
+
+            // Create metro colors
+            MetroPartColors partColors = new MetroPartColors();
+            partColors.CanvasColor = canvasColor;
+            partColors.BaseColor = baseColor;
+            partColors.TextColor = (canvasHsl.Lightness < .4) ? Color.White : Color.Black;
+            //HSVColor textHsv = ColorHelpers.ColorToHSV(partColors.TextColor);
+            partColors.TextInactiveColor = ColorHelpers.HSVToColor(canvasHsv.Hue, canvasHsv.Saturation, (partColors.TextColor == Color.White ? canvasHsv.Value + .53 : canvasHsv.Value - .47));
+            partColors.TextDisabledColor = ColorHelpers.HSVToColor(canvasHsv.Hue, canvasHsv.Saturation, (partColors.TextColor == Color.Black ? canvasHsv.Value - .33 : canvasHsv.Value + .67));
+            partColors.TextLightColor = ColorHelpers.HSVToColor(canvasHsv.Hue, canvasHsv.Saturation, (partColors.TextColor == Color.Black ? canvasHsv.Value - .6 : canvasHsv.Value + .4));
+            partColors.CanvasColorDarkShade = partColors.TextColor == Color.Black ? ColorScheme.GetColor(0xC8C8C8) : ColorHelpers.HSVToColor(canvasHsv.Hue, canvasHsv.Saturation, (partColors.TextColor == Color.Black ? canvasHsv.Value - .33 : canvasHsv.Value + .33));
+            partColors.CanvasColorDarkerShade = ColorScheme.GetColor(0xB4B4B4);
+            partColors.CanvasColorLightShade = ColorScheme.GetColor(0xCCCCCC);
+            partColors.CanvasColorLighterShade = ColorHelpers.HSVToColor(canvasHsv.Hue, canvasHsv.Saturation, (partColors.TextColor == Color.White ? canvasHsv.Value + .08 : canvasHsv.Value - .08));
+            partColors.CanvasColorLight = (partColors.TextColor == Color.Black) ? ColorScheme.GetColor(0xF1F1F1) : ColorHelpers.HSVToColor(canvasHsv.Hue, canvasHsv.Saturation, canvasHsv.Value + .06);
+            partColors.BaseTextColor = GetTextColor(baseColor);
+
+            partColors.BaseColorLight = ColorHelpers.HSVToColor(baseHsv.Hue, GetColorMin(0.08, baseHsv.Saturation - .41), baseHsv.Value + .3);
+            partColors.BaseColorLight1 = ColorHelpers.HSVToColor(baseHsv.Hue, GetColorMin(0.05, baseHsv.Saturation - .12), baseHsv.Value + .12);
+            partColors.BaseColorLightText = GetTextColor(partColors.BaseColorLight);
+
+            partColors.BaseColorLightest = ColorHelpers.HSVToColor(baseHsv.Hue, GetColorMin(0.05, baseHsv.Saturation - .6), baseHsv.Value + .5);
+            partColors.BaseColorLighter = ColorHelpers.HSVToColor(baseHsv.Hue, GetColorMin(0.08, baseHsv.Saturation - .46), baseHsv.Value + .39);
+            partColors.BaseColorDark = ColorHelpers.HSVToColor(baseHsv.Hue, baseHsv.Saturation + .1, baseHsv.Value - .06);
+            partColors.BaseColorDarker = ColorFunctions.HLSToRGB(baseHsl.Hue, baseHsl.Lightness - .2, baseHsl.Saturation);
+
+            partColors.ComplementColor = ColorHelpers.HSVToColor(GetComplementHue(baseHsv.Hue), baseHsv.Saturation, baseHsv.Value + (baseHsv.Value > .5d ? -.35 : 0d));
+            ColorFunctions.HLSColor compHsl = ColorFunctions.RGBToHSL(partColors.ComplementColor);
+            HSVColor compHsv = ColorHelpers.ColorToHSV(partColors.ComplementColor);
+            partColors.ComplementColorLight = ColorHelpers.HSVToColor(compHsv.Hue, compHsv.Saturation, compHsv.Value + .2d);
+            partColors.ComplementColorDark = ColorFunctions.HLSToRGB(compHsl.Hue, compHsl.Lightness - .10, compHsl.Saturation);
+            partColors.ComplementColorDarker = ColorFunctions.HLSToRGB(compHsl.Hue, compHsl.Lightness - .2, compHsl.Saturation);
+            partColors.ComplementColorText = GetTextColor(partColors.ComplementColor);
+            partColors.ComplementColorLightText = GetTextColor(partColors.ComplementColorLight);
+
+            partColors.BaseButtonGradientStart = ColorHelpers.HSVToColor(canvasHsv.Hue, canvasHsv.Saturation, (canvasHsv.Value > 0 ? canvasHsv.Value - .01 : canvasHsv.Value + .08));
+            partColors.BaseButtonGradientEnd = ColorHelpers.HSVToColor(canvasHsv.Hue, canvasHsv.Saturation, (canvasHsv.Value > 0 ? canvasHsv.Value - .08 : canvasHsv.Value + .20));
+
+            if (partColors.TextColor == Color.Black)
+                partColors.EditControlBackColor = Color.White;
+            else
+                partColors.EditControlBackColor = Color.Black;
+
+            return partColors;
+        }
+        public static void CreateColors(MetroColorTable metroTable, Office2007ColorTable officeMetroColorTable, Color canvasColor, Color baseColor)
+        {
+            MetroPartColors partColors = CreateMetroPartColors(canvasColor, baseColor);
+
+            metroTable.CanvasColor = partColors.CanvasColor;
+            metroTable.CanvasColorShadeLight = partColors.CanvasColorLightShade;
+            metroTable.CanvasColorShadeLighter = partColors.CanvasColorLighterShade;
+            metroTable.ForeColor = partColors.TextColor;
+            metroTable.BaseColor = baseColor;
+            metroTable.EditControlBackColor = partColors.EditControlBackColor;
+            metroTable.MetroPartColors = partColors;
+
+            metroTable.MetroAppForm.BorderThickness = new Thickness(1, 1, 1, 1);
+            metroTable.MetroAppForm.BorderColors = new BorderColors(partColors.BaseColor);
+            metroTable.MetroAppForm.BorderColorsInactive = new BorderColors(partColors.BaseColorLight);
+
+            metroTable.MetroForm.BorderThickness = new Thickness(1, 1, 1, 1);
+            metroTable.MetroForm.BorderColors = new BorderColors[1] { new BorderColors(partColors.BaseColor) };
+            metroTable.MetroForm.BorderColorsInactive = new BorderColors[4] { new BorderColors(partColors.BaseColorLight), new BorderColors(partColors.BaseColorLight), new BorderColors(partColors.BaseColorLight), new BorderColors(partColors.BaseColorLight) };
+
+            metroTable.MetroTab.ActiveCaptionText = partColors.BaseTextColor;
+            metroTable.MetroTab.InactiveCaptionText = partColors.BaseTextColor;
+
+            metroTable.MetroTab.MetroTabItem.Default = GetMetroTabItemStateTable(partColors.BaseTextColor, Color.Empty);
+            metroTable.MetroTab.MetroTabItem.Selected = GetMetroTabItemStateTable(partColors.BaseColor, partColors.CanvasColorLight);
+            metroTable.MetroTab.MetroTabItem.Disabled = GetMetroTabItemStateTable(partColors.TextDisabledColor, Color.Empty);
+            metroTable.MetroTab.MetroTabItem.MouseOver = null;
+            metroTable.MetroTab.MetroTabItem.Pressed = null;
+            metroTable.MetroTab.TabStrip.BackgroundStyle = new ElementStyle(partColors.BaseTextColor, partColors.BaseColor);
+            metroTable.MetroTab.CaptionTextFormat = eTextFormat.VerticalCenter | eTextFormat.HorizontalCenter | eTextFormat.EndEllipsis | eTextFormat.NoPrefix;
+
+            metroTable.MetroTab.TabPanelBackgroundStyle = new ElementStyle(partColors.TextColor, partColors.CanvasColorLight);
+
+            // Toolbar
+            metroTable.MetroToolbar.BackgroundStyle = new ElementStyle(partColors.TextColor, partColors.CanvasColorLight);
+
+            // Status Bar
+            metroTable.MetroStatusBar.BackgroundStyle = new ElementStyle(partColors.BaseTextColor, partColors.BaseColor);
+            metroTable.MetroStatusBar.TopBorders = new Color[0];
+            metroTable.MetroStatusBar.BottomBorders = new Color[0];
+            metroTable.MetroStatusBar.ResizeMarkerLightColor = Color.FromArgb(196, Color.White);
+            metroTable.MetroStatusBar.ResizeMarkerColor = partColors.BaseColorDarker;
+
+            Office2016ColorTableInitializer.InitializeColorTable(officeMetroColorTable, ColorFactory.Empty, partColors);
+        }
+        private static double GetColorMin(double minValue, double value)
+        {
+            if (value < 0)
+                return minValue;
+            return value;
+        }
+
+        private static Color GetTextColor(Color color)
+        {
+            ColorFunctions.HLSColor hslColor = ColorFunctions.RGBToHSL(color);
+            return hslColor.Lightness < .65 ? Color.White : Color.Black;
+            //HSVColor hsvColor = ColorHelpers.ColorToHSV(backColor);
+            //return hsvColor.Value < .65 ? Color.White : Color.Black;
+        }
+
+        private static double GetComplementHue(double hue)
+        {
+            if (hue <= .37777d)
+            {
+                return Math.Min(1, hue + (137 * DEGREE + (86 * DEGREE * (hue / .37777d))));
+            }
+            else
+            {
+                return Math.Max(0, hue - (137 * DEGREE + (86 * DEGREE * (hue / .6222222d))));//     ((137 + 86 * DEGREE * (hue / .6222222) * DEGREE)));
+            }
+        }
+
+        private static MetroTabItemStateColorTable GetMetroTabItemStateTable(Color textColor, Color backColor)
+        {
+            ElementStyle style = new ElementStyle(textColor);
+            style.TextAlignment = eStyleTextAlignment.Center;
+            style.TextLineAlignment = eStyleTextAlignment.Center;
+            style.HideMnemonic = true;
+            if (!backColor.IsEmpty)
+            {
+                style.CornerTypeTopRight = eCornerType.Rounded;
+                style.CornerTypeTopLeft = eCornerType.Rounded;
+                style.CornerDiameter = 2;
+                style.BorderLeft = eStyleBorderType.Solid;
+                style.BorderTop = eStyleBorderType.Solid;
+                style.BorderRight = eStyleBorderType.Solid;
+                style.BorderLeftWidth = 1;
+                style.BorderTopWidth = 1;
+                style.BorderRightWidth = 1;
+                style.BorderColor = backColor;
+                style.BackColor = backColor;
+            }
+            style.TextColor = textColor;
+            return new MetroTabItemStateColorTable(style);
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Metro/ColorTables/OfficeMobile2014ColorTableInitializer.cs b/PROMS/DotNetBar Source Code/Metro/ColorTables/OfficeMobile2014ColorTableInitializer.cs
new file mode 100644
index 00000000..19c140a7
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Metro/ColorTables/OfficeMobile2014ColorTableInitializer.cs	
@@ -0,0 +1,2646 @@
+using System;
+using System.Text;
+using System.Drawing;
+using DevComponents.DotNetBar.Schedule;
+using DevComponents.DotNetBar.Rendering;
+using DevComponents.AdvTree.Display;
+using DevComponents.DotNetBar.Controls;
+using DevComponents.WinForms.Drawing;
+
+namespace DevComponents.DotNetBar.Metro.ColorTables
+{
+    internal class OfficeMobile2014ColorTableInitializer
+    {
+        public static void InitializeColorTable(Office2007ColorTable table, ColorFactory factory, MetroPartColors metroColors)
+        {
+            // This was conflicting with buttons which used CanvasColorLight for on mouse over effect.
+            //Color ribbonBack = factory.GetColor(metroColors.IsSolidCanvas ? metroColors.CanvasColor : metroColors.CanvasColorLight);
+            Color ribbonBack = factory.GetColor(metroColors.CanvasColorLight);
+
+            #region RibbonControl Start Images
+            table.RibbonControl.StartButtonDefault = BarFunctions.LoadBitmap("SystemImages.BlankOffice2010NormalSilver.png");
+            table.RibbonControl.StartButtonMouseOver = BarFunctions.LoadBitmap("SystemImages.BlankOffice2010HotSilver.png");
+            table.RibbonControl.StartButtonPressed = BarFunctions.LoadBitmap("SystemImages.BlankOffice2010PressedSilver.png");
+            #endregion
+
+            #region RibbonControl
+            table.RibbonControl.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            table.RibbonControl.InnerBorder = null; // LinearGradientColorTable.Empty;// new LinearGradientColorTable(factory.GetColor(Color.FromArgb(32, Color.White)));
+            table.RibbonControl.TabsBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            table.RibbonControl.TabsGlassBackground = new LinearGradientColorTable(Color.Transparent, factory.GetColor(metroColors.CanvasColor));
+            table.RibbonControl.TabDividerBorder = Color.Empty; // factory.GetColor(0xA7BAD1);
+            table.RibbonControl.TabDividerBorderLight = Color.Empty; // factory.GetColor(0xF4F8FD);
+            table.RibbonControl.CornerSize = 1;
+            table.RibbonControl.PanelTopBackgroundHeight = 0;
+            table.RibbonControl.PanelTopBackground = new LinearGradientColorTable(ribbonBack);
+            table.RibbonControl.PanelBottomBackground = null; // new LinearGradientColorTable(factory.GetColor(0xF6F7F8), factory.GetColor(0xE5E9EE));
+            #endregion
+
+            #region Ribbon KeyTips
+            table.KeyTips.KeyTipBackground = factory.GetColor(metroColors.TextDisabledColor);
+            table.KeyTips.KeyTipText = factory.GetColor(metroColors.CanvasColor);
+            table.KeyTips.KeyTipBorder = factory.GetColor(metroColors.TextDisabledColor);
+            #endregion
+
+            #region Item Group
+            table.ItemGroup.OuterBorder = LinearGradientColorTable.Empty; //new LinearGradientColorTable(factory.GetColor(0xC0C3C8));
+            table.ItemGroup.InnerBorder = LinearGradientColorTable.Empty;
+            table.ItemGroup.TopBackground = LinearGradientColorTable.Empty;
+            table.ItemGroup.BottomBackground = LinearGradientColorTable.Empty;
+            table.ItemGroup.ItemGroupDividerDark = Color.Empty;
+            table.ItemGroup.ItemGroupDividerLight = Color.Empty;
+            #endregion
+
+            #region RibbonBar
+            table.RibbonBar.Default = GetRibbonBar(factory, metroColors, ribbonBack);
+            table.RibbonBar.MouseOver = GetRibbonBarMouseOver(factory, metroColors, ribbonBack);
+            table.RibbonBar.Expanded = GetRibbonBarExpanded(factory, metroColors, ribbonBack);
+            #endregion
+
+            #region ButtonItem Colors Initialization
+            table.RibbonButtonItemColors.Clear();
+            table.ButtonItemColors.Clear();
+            table.MenuButtonItemColors.Clear();
+            // Orange
+            Office2007ButtonItemColorTable cb = GetButtonItemDefault(factory, metroColors);
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Orange);
+            table.ButtonItemColors.Add(cb);
+            // Orange with background
+            cb = GetButtonItemDefaultWithBackground(factory, metroColors);
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.OrangeWithBackground);
+            table.ButtonItemColors.Add(cb);
+            // Blue
+            cb = GetButtonItemBlue(factory, metroColors);
+            cb.MouseOverSplitInactive = new Office2007ButtonItemStateColorTable();
+            cb.MouseOverSplitInactive.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xB1BAC4));
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Blue);
+            table.ButtonItemColors.Add(cb);
+            // Blue with background
+            cb = GetButtonItemBlueWithBackground(factory, metroColors);
+            cb.MouseOverSplitInactive = new Office2007ButtonItemStateColorTable();
+            cb.MouseOverSplitInactive.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xB1BAC4));
+            cb.MouseOverSplitInactive = cb.Default;
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.BlueWithBackground);
+            table.ButtonItemColors.Add(cb);
+            // Magenta
+            cb = GetButtonItemMagenta(factory, metroColors);
+            cb.MouseOverSplitInactive = new Office2007ButtonItemStateColorTable();
+            cb.MouseOverSplitInactive.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xB1BAC4));
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Magenta);
+            table.ButtonItemColors.Add(cb);
+            // Blue with background
+            cb = GetButtonItemMagentaWithBackground(factory, metroColors);
+            cb.MouseOverSplitInactive = new Office2007ButtonItemStateColorTable();
+            cb.MouseOverSplitInactive.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xB1BAC4));
+            cb.MouseOverSplitInactive = cb.Default;
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.MagentaWithBackground);
+            table.ButtonItemColors.Add(cb);
+
+            cb = Office2010BlueFactory.GetButtonItemOffice2007WithBackground(factory);
+            cb.MouseOverSplitInactive = new Office2007ButtonItemStateColorTable();
+            cb.MouseOverSplitInactive.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xB1BAC4));
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Office2007WithBackground);
+            table.ButtonItemColors.Add(cb);
+
+            table.ButtonItemColors.Add(CreateBlueOrbColorTable(factory, metroColors));
+
+            table.BackstageButtonItemColors.Clear();
+            table.BackstageButtonItemColors.Add(GetButtonItemBackstageDefault(factory, metroColors));
+
+            table.ContextualTables.Add(Office2007ColorTable.GetContextualKey(typeof(Office2007ButtonItemColorTable), "StatusBar"), GetButtonItemStatusBar(factory, metroColors));
+            table.ContextualTables.Add(Office2007ColorTable.GetContextualKey(typeof(Office2007ButtonItemColorTable), "MetroTabStrip"), GetButtonItemStatusBar(factory, metroColors));
+            #endregion
+
+            #region RibbonTabItem Colors Initialization
+            table.RibbonTabItemColors.Clear();
+            Office2007RibbonTabItemColorTable rt = GetRibbonTabItemBlueDefault(factory, metroColors, ribbonBack);
+            rt.CornerSize = 2;
+            rt.Name = Enum.GetName(typeof(eRibbonTabColor), eRibbonTabColor.Default);
+            table.RibbonTabItemColors.Add(rt);
+
+            // Magenta
+            rt = GetRibbonTabItemBlueDefault(factory, metroColors, ribbonBack); //GetRibbonTabItemBlueMagenta(factory);
+            rt.CornerSize = 2;
+            rt.Name = Enum.GetName(typeof(eRibbonTabColor), eRibbonTabColor.Magenta);
+            table.RibbonTabItemColors.Add(rt);
+
+            // Green
+            rt = GetRibbonTabItemBlueDefault(factory, metroColors, ribbonBack); //GetRibbonTabItemBlueGreen(factory);
+            rt.CornerSize = 2;
+            rt.Name = Enum.GetName(typeof(eRibbonTabColor), eRibbonTabColor.Green);
+            table.RibbonTabItemColors.Add(rt);
+
+            // Orange
+            rt = GetRibbonTabItemBlueDefault(factory, metroColors, ribbonBack); //GetRibbonTabItemBlueOrange(factory);
+            rt.CornerSize = 2;
+            rt.Name = Enum.GetName(typeof(eRibbonTabColor), eRibbonTabColor.Orange);
+            table.RibbonTabItemColors.Add(rt);
+            #endregion
+
+            #region RibbonTabItemGroup Colors Initialization
+            table.RibbonTabGroupColors.Clear();
+            // Default
+            Office2007RibbonTabGroupColorTable tg = GetRibbonTabGroupDefault(factory, metroColors);
+            tg.Name = Enum.GetName(typeof(eRibbonTabGroupColor), eRibbonTabGroupColor.Default);
+            table.RibbonTabGroupColors.Add(tg);
+
+            // Magenta
+            tg = GetRibbonTabGroupMagenta(factory, metroColors);
+            tg.Name = Enum.GetName(typeof(eRibbonTabGroupColor), eRibbonTabGroupColor.Magenta);
+            table.RibbonTabGroupColors.Add(tg);
+
+            // Green
+            tg = GetRibbonTabGroupGreen(factory, metroColors);
+            tg.Name = Enum.GetName(typeof(eRibbonTabGroupColor), eRibbonTabGroupColor.Green);
+            table.RibbonTabGroupColors.Add(tg);
+
+            // Orange
+            tg = GetRibbonTabGroupOrange(factory, metroColors);
+            tg.Name = Enum.GetName(typeof(eRibbonTabGroupColor), eRibbonTabGroupColor.Orange);
+            table.RibbonTabGroupColors.Add(tg);
+            #endregion
+
+            #region Initialize Bar
+            table.Bar.ToolbarTopBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor)/*, factory.GetColor(metroColors.BaseColorDark)*/);
+            table.Bar.ToolbarBottomBackground = null; // new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            table.Bar.ToolbarBottomBorder = Color.Empty;
+            table.Bar.PopupToolbarBackground = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor), Color.Empty);
+            table.Bar.PopupToolbarBorder = factory.GetColor(metroColors.BaseColor);
+            table.Bar.StatusBarTopBorder = factory.GetColor(metroColors.BaseColor);
+            table.Bar.StatusBarTopBorderLight = factory.GetColor(metroColors.BaseColor);
+            table.Bar.StatusBarAltBackground.Clear();
+            table.Bar.StatusBarAltBackground.Add(new BackgroundColorBlend(factory.GetColor(metroColors.BaseColor), 0f));
+            table.Bar.StatusBarAltBackground.Add(new BackgroundColorBlend(factory.GetColor(metroColors.BaseColor), 1f));
+            #endregion
+
+            #region Menu
+            table.Menu.Background = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor), Color.Empty);
+            table.Menu.Border = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColorLightShade), Color.Empty);
+            table.Menu.Side = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor), Color.Empty);
+            table.Menu.SideBorder = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor), Color.Empty);
+            table.Menu.SideBorderLight = LinearGradientColorTable.Empty;
+            table.Menu.SideUnused = LinearGradientColorTable.Empty;
+            table.Menu.FileBackgroundBlend.Clear();
+            table.Menu.FileBackgroundBlend.AddRange(new DevComponents.DotNetBar.BackgroundColorBlend[] {
+                new DevComponents.DotNetBar.BackgroundColorBlend(factory.GetColor(metroColors.CanvasColorLighterShade), 0F),
+                new DevComponents.DotNetBar.BackgroundColorBlend(factory.GetColor(metroColors.CanvasColorLighterShade), 1F)});
+            table.Menu.FileContainerBorder = factory.GetColor(metroColors.CanvasColorLightShade);
+            table.Menu.FileContainerBorderLight = Color.Transparent;
+            table.Menu.FileColumnOneBackground = factory.GetColor(metroColors.CanvasColor);
+            table.Menu.FileColumnOneBorder = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.Menu.FileColumnTwoBackground = factory.GetColor(metroColors.CanvasColor);
+            table.Menu.FileBottomContainerBackgroundBlend.Clear();
+            #endregion
+
+            #region ComboBox
+            table.ComboBox.Default.Background = factory.GetColor(metroColors.EditControlBackColor);
+            table.ComboBox.Default.Border = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.ComboBox.Default.ExpandBackground = new LinearGradientColorTable();
+            table.ComboBox.Default.ExpandBorderInner = new LinearGradientColorTable();
+            table.ComboBox.Default.ExpandBorderOuter = new LinearGradientColorTable();
+            table.ComboBox.Default.ExpandText = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.ComboBox.DefaultStandalone.Background = factory.GetColor(metroColors.EditControlBackColor);
+            table.ComboBox.DefaultStandalone.Border = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.ComboBox.DefaultStandalone.ExpandBackground = LinearGradientColorTable.Empty;
+            table.ComboBox.DefaultStandalone.ExpandBorderInner = LinearGradientColorTable.Empty;
+            table.ComboBox.DefaultStandalone.ExpandBorderOuter = LinearGradientColorTable.Empty;
+            table.ComboBox.DefaultStandalone.ExpandText = factory.GetColor(metroColors.TextColor);
+            table.ComboBox.MouseOver.Background = factory.GetColor(metroColors.EditControlBackColor);
+            table.ComboBox.MouseOver.Border = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.ComboBox.MouseOver.ExpandBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            table.ComboBox.MouseOver.ExpandBorderInner = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            table.ComboBox.MouseOver.ExpandBorderOuter = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            table.ComboBox.MouseOver.ExpandText = factory.GetColor(metroColors.TextColor);
+            table.ComboBox.DroppedDown.Background = factory.GetColor(metroColors.EditControlBackColor);
+            table.ComboBox.DroppedDown.Border = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.ComboBox.DroppedDown.ExpandBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            table.ComboBox.DroppedDown.ExpandBorderInner = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            table.ComboBox.DroppedDown.ExpandBorderOuter = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            table.ComboBox.DroppedDown.ExpandText = factory.GetColor(metroColors.TextColor);
+            #endregion
+
+            #region Dialog Launcher
+            table.DialogLauncher.Default.DialogLauncher = factory.GetColor(metroColors.TextInactiveColor);
+            table.DialogLauncher.Default.DialogLauncherShade = Color.Empty; // factory.GetColor(64, 0xFFFFFF);
+
+            table.DialogLauncher.MouseOver.DialogLauncher = factory.GetColor(metroColors.BaseColor);
+            table.DialogLauncher.MouseOver.DialogLauncherShade = Color.Empty; // Color.FromArgb(128, factory.GetColor(0xFFFFFF));
+            table.DialogLauncher.MouseOver.TopBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLightest));
+            table.DialogLauncher.MouseOver.BottomBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLightest));
+            table.DialogLauncher.MouseOver.InnerBorder = LinearGradientColorTable.Empty;// new LinearGradientColorTable(factory.GetColor(Color.FromArgb(128, Color.White)));
+            table.DialogLauncher.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLightest), Color.Empty);
+
+            table.DialogLauncher.Pressed.DialogLauncher = factory.GetColor(metroColors.BaseColor);
+            table.DialogLauncher.Pressed.DialogLauncherShade = Color.Empty; // Color.FromArgb(48, factory.GetColor(0xFFFFFF));
+            table.DialogLauncher.Pressed.TopBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight));
+            table.DialogLauncher.Pressed.BottomBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight));
+            table.DialogLauncher.Pressed.InnerBorder = LinearGradientColorTable.Empty;//new LinearGradientColorTable(factory.GetColor(Color.FromArgb(48, Color.White)));
+            table.DialogLauncher.Pressed.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight), Color.Empty);
+            #endregion
+
+            #region System Button, Form
+            // Default state no background
+            table.SystemButton.Default = new Office2007SystemButtonStateColorTable();
+            table.SystemButton.Default.Foreground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseTextColor));
+            table.SystemButton.Default.LightShade = Color.Empty;
+            table.SystemButton.Default.DarkShade = Color.Empty;
+
+            // Mouse over state
+            table.SystemButton.MouseOver = new Office2007SystemButtonStateColorTable();
+            table.SystemButton.MouseOver.Foreground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseTextColor));
+            table.SystemButton.MouseOver.LightShade = Color.Empty;
+            table.SystemButton.MouseOver.DarkShade = Color.Empty;
+            table.SystemButton.MouseOver.TopBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            table.SystemButton.MouseOver.BottomBackground = null;
+            table.SystemButton.MouseOver.TopHighlight = null;
+            table.SystemButton.MouseOver.BottomHighlight = null;
+            table.SystemButton.MouseOver.OuterBorder = null;
+            table.SystemButton.MouseOver.InnerBorder = null;
+
+            // Pressed
+            table.SystemButton.Pressed = new Office2007SystemButtonStateColorTable();
+            table.SystemButton.Pressed.Foreground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseTextColor));
+            table.SystemButton.Pressed.LightShade = Color.Empty;
+            table.SystemButton.Pressed.DarkShade = Color.Empty;
+            table.SystemButton.Pressed.TopBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDarker));
+            table.SystemButton.Pressed.TopHighlight = null;
+            table.SystemButton.Pressed.BottomBackground = null;
+            table.SystemButton.Pressed.BottomHighlight = null;
+            table.SystemButton.Pressed.OuterBorder = null;
+            table.SystemButton.Pressed.InnerBorder = null;
+
+            // CLOSE Default state no background
+            table.SystemButtonClose = new Office2007SystemButtonColorTable();
+            table.SystemButtonClose.Default = new Office2007SystemButtonStateColorTable();
+            table.SystemButtonClose.Default.Foreground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseTextColor));
+            table.SystemButtonClose.Default.LightShade = Color.Empty;
+            table.SystemButtonClose.Default.DarkShade = Color.Empty;
+
+            // Mouse over state
+            table.SystemButtonClose.MouseOver = new Office2007SystemButtonStateColorTable();
+            table.SystemButtonClose.MouseOver.Foreground = new LinearGradientColorTable(Color.White);
+            table.SystemButtonClose.MouseOver.LightShade = Color.Empty;
+            table.SystemButtonClose.MouseOver.DarkShade = Color.Empty;
+            table.SystemButtonClose.MouseOver.TopBackground = new LinearGradientColorTable(factory.GetColor(0xE81123));
+            table.SystemButtonClose.MouseOver.BottomBackground = null;
+            table.SystemButtonClose.MouseOver.TopHighlight = null;
+            table.SystemButtonClose.MouseOver.BottomHighlight = null;
+            table.SystemButtonClose.MouseOver.OuterBorder = null;
+            table.SystemButtonClose.MouseOver.InnerBorder = null;
+
+            // Pressed
+            table.SystemButtonClose.Pressed = new Office2007SystemButtonStateColorTable();
+            table.SystemButtonClose.Pressed.Foreground = new LinearGradientColorTable(factory.GetColor(Color.White));
+            table.SystemButtonClose.Pressed.LightShade = Color.Empty;
+            table.SystemButtonClose.Pressed.DarkShade = Color.Empty;
+            table.SystemButtonClose.Pressed.TopBackground = new LinearGradientColorTable(factory.GetColor(0xF1707A)); ;
+            table.SystemButtonClose.Pressed.TopHighlight = null;
+            table.SystemButtonClose.Pressed.BottomBackground = null;
+            table.SystemButtonClose.Pressed.BottomHighlight = null;
+            table.SystemButtonClose.Pressed.OuterBorder = null;
+            table.SystemButtonClose.Pressed.InnerBorder = null;
+
+            // Form border
+            table.Form.Active.BorderColors = new Color[] {
+                factory.GetColor(metroColors.BaseColor),
+                factory.GetColor(metroColors.CanvasColor),
+                factory.GetColor(metroColors.CanvasColor),
+                factory.GetColor(metroColors.CanvasColor),
+                factory.GetColor(metroColors.CanvasColor)
+            };
+
+            table.Form.Inactive.BorderColors = new Color[] {
+                factory.GetColor(metroColors.BaseColor),
+                factory.GetColor(metroColors.CanvasColor),
+                factory.GetColor(metroColors.CanvasColor),
+                factory.GetColor(metroColors.CanvasColor),
+                factory.GetColor(metroColors.CanvasColor)
+            };
+
+            // Form Caption Active
+            table.Form.Active.CaptionTopBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            table.Form.Active.CaptionBottomBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            table.Form.Active.CaptionBottomBorder = null;
+            table.Form.Active.CaptionText = factory.GetColor(metroColors.BaseTextColor);
+            table.Form.Active.CaptionTextExtra = factory.GetColor(metroColors.BaseTextColor);
+
+            // Form Caption Inactive
+            table.Form.Inactive.CaptionTopBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            table.Form.Inactive.CaptionBottomBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            table.Form.Inactive.CaptionText = factory.GetColor(metroColors.BaseColorLightText);
+            table.Form.Inactive.CaptionTextExtra = factory.GetColor(metroColors.BaseColorLightText);
+
+            table.Form.BackColor = factory.GetColor(metroColors.CanvasColor);
+            table.Form.TextColor = factory.GetColor(metroColors.TextColor);
+            table.Form.MdiClientBackgroundImage = null; // BarFunctions.LoadBitmap("SystemImages.Office2010SilverClientBackground.png");
+            #endregion
+
+            #region Quick Access Toolbar Background
+            table.QuickAccessToolbar.Active.TopBackground = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(0xDEE7F4), factory.GetColor(0xE6EEF9));
+            table.QuickAccessToolbar.Active.BottomBackground = LinearGradientColorTable.Empty; //new LinearGradientColorTable(factory.GetColor(0xDBE7F7), factory.GetColor(0xC9D9EE));
+            table.QuickAccessToolbar.Active.OutterBorderColor = Color.Empty; // factory.GetColor(0xF6F9FC);
+            table.QuickAccessToolbar.Active.MiddleBorderColor = Color.Empty; // factory.GetColor(0x9AB3D5);
+            table.QuickAccessToolbar.Active.InnerBorderColor = Color.Empty; //  factory.GetColor(0xD2E3F9);
+
+            table.QuickAccessToolbar.Inactive.TopBackground = LinearGradientColorTable.Empty; //new LinearGradientColorTable(factory.GetColor(0xE6ECF3), factory.GetColor(0xCED8E6));
+            table.QuickAccessToolbar.Inactive.BottomBackground = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(0xCED8E6), factory.GetColor(0xC8D3E3));
+            table.QuickAccessToolbar.Inactive.OutterBorderColor = Color.Empty; // factory.GetColor(0xF6F9FC);
+            table.QuickAccessToolbar.Inactive.MiddleBorderColor = Color.Empty; // factory.GetColor(0x9AB3D5);
+            table.QuickAccessToolbar.Inactive.InnerBorderColor = Color.Empty;
+
+            table.QuickAccessToolbar.Standalone.TopBackground = new LinearGradientColorTable();
+            table.QuickAccessToolbar.Standalone.BottomBackground = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor));
+            table.QuickAccessToolbar.Standalone.OutterBorderColor = factory.GetColor(metroColors.CanvasColorLightShade);
+            table.QuickAccessToolbar.Standalone.MiddleBorderColor = Color.Empty;
+            table.QuickAccessToolbar.Standalone.InnerBorderColor = Color.Empty; // factory.GetColor(0xDCE8F7);
+
+            table.QuickAccessToolbar.QatCustomizeMenuLabelBackground = factory.GetColor(metroColors.CanvasColorLighterShade);
+            table.QuickAccessToolbar.QatCustomizeMenuLabelText = factory.GetColor(metroColors.CanvasColorDarkShade);
+
+            table.QuickAccessToolbar.Active.GlassBorder = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(Color.FromArgb(132, Color.Black)), Color.FromArgb(80, Color.Black));
+            table.QuickAccessToolbar.Inactive.GlassBorder = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(Color.FromArgb(132, Color.Black)), Color.FromArgb(80, Color.Black));
+            #endregion
+
+            #region Tab Colors
+            table.TabControl.Default = new Office2007TabItemStateColorTable();
+            table.TabControl.Default.TopBackground = LinearGradientColorTable.Empty;
+            table.TabControl.Default.BottomBackground = LinearGradientColorTable.Empty;
+            table.TabControl.Default.InnerBorder = Color.Empty;
+            table.TabControl.Default.OuterBorder = Color.Empty;
+            table.TabControl.Default.Text = factory.GetColor(metroColors.TextColor);
+
+            table.TabControl.MouseOver = new Office2007TabItemStateColorTable();
+            table.TabControl.MouseOver.TopBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight1), Color.Empty);
+            table.TabControl.MouseOver.BottomBackground = LinearGradientColorTable.Empty;
+            table.TabControl.MouseOver.InnerBorder = Color.Empty;
+            table.TabControl.MouseOver.OuterBorder = factory.GetColor(metroColors.BaseColorLight1);
+            table.TabControl.MouseOver.Text = metroColors.TextColor;
+
+            table.TabControl.Selected = new Office2007TabItemStateColorTable();
+            table.TabControl.Selected.TopBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor), Color.Empty);
+            table.TabControl.Selected.BottomBackground = LinearGradientColorTable.Empty; ;
+            table.TabControl.Selected.InnerBorder = Color.Empty;
+            table.TabControl.Selected.OuterBorder = factory.GetColor(metroColors.BaseColor);
+            table.TabControl.Selected.Text = metroColors.BaseColor;
+
+            table.TabControl.TabBackground = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor));
+            table.TabControl.TabPanelBackground = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor), Color.Empty);
+            table.TabControl.TabPanelBorder = metroColors.CanvasColorLightShade;
+            #endregion
+
+            #region Dock TabStrip Colors
+            table.DockTabStrip = new Office2007TabColorTable();
+            table.DockTabStrip.Default = new Office2007TabItemStateColorTable();
+            table.DockTabStrip.Default.TopBackground = LinearGradientColorTable.Empty;
+            table.DockTabStrip.Default.BottomBackground = LinearGradientColorTable.Empty;
+            table.DockTabStrip.Default.InnerBorder = Color.Empty;
+            table.DockTabStrip.Default.OuterBorder = Color.Empty;
+            table.DockTabStrip.Default.Text = factory.GetColor(metroColors.TextColor);
+
+            table.DockTabStrip.MouseOver = new Office2007TabItemStateColorTable();
+            table.DockTabStrip.MouseOver.TopBackground = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColorLight), Color.Empty);
+            table.DockTabStrip.MouseOver.BottomBackground = LinearGradientColorTable.Empty;
+            table.DockTabStrip.MouseOver.InnerBorder = Color.Empty;
+            table.DockTabStrip.MouseOver.OuterBorder = Color.Empty;
+            table.DockTabStrip.MouseOver.Text = metroColors.BaseColor;
+
+            table.DockTabStrip.Selected = new Office2007TabItemStateColorTable();
+            table.DockTabStrip.Selected.TopBackground = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColorLight), Color.Empty);
+            table.DockTabStrip.Selected.BottomBackground = LinearGradientColorTable.Empty;
+            table.DockTabStrip.Selected.InnerBorder = Color.Empty;
+            table.DockTabStrip.Selected.OuterBorder = factory.GetColor(metroColors.CanvasColorLighterShade);
+            table.DockTabStrip.Selected.Text = metroColors.BaseColor;
+
+            table.DockTabStrip.TabBackground = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor));
+            table.DockTabStrip.TabPanelBackground = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColorLight), Color.Empty);
+            table.DockTabStrip.TabPanelBorder = metroColors.CanvasColorLightShade;
+            #endregion
+
+            #region CheckBoxItem
+            table.CheckBoxItem = GetCheckBoxItem(factory, metroColors);
+
+            Office2007CheckBoxColorTable chk = GetCheckBoxItem(factory, metroColors);
+            chk.Default.Text = factory.GetColor(metroColors.BaseTextColor);
+            chk.MouseOver.Text = factory.GetColor(metroColors.BaseTextColor);
+            chk.Pressed.Text = factory.GetColor(metroColors.BaseTextColor);
+            table.ContextualTables.Add(Office2007ColorTable.GetContextualKey(typeof(Office2007CheckBoxColorTable), typeof(Bar)) + "+StatusBar", chk);
+            table.ContextualTables.Add(Office2007ColorTable.GetContextualKey(typeof(Office2007CheckBoxColorTable), typeof(MetroStatusBar)), chk);
+            #endregion
+
+            #region Scroll Bar Colors
+            InitializeScrollBarColorTable(table, factory, metroColors);
+            InitializeAppBlueScrollBarColorTable(table, factory, metroColors);
+            #endregion
+
+            #region ProgressBarItem
+            Office2007ProgressBarColorTable pct = table.ProgressBarItem;
+            pct.BackgroundColors = new GradientColorTable(metroColors.CanvasColor);
+            pct.OuterBorder = factory.GetColor(metroColors.BaseColorDarker);
+            pct.InnerBorder = Color.Empty;
+            pct.Chunk = new GradientColorTable(metroColors.BaseColor);
+            pct.ChunkOverlay = new GradientColorTable();
+            //pct.ChunkOverlay.LinearGradientAngle = 90;
+            //pct.ChunkOverlay.Colors.AddRange(new BackgroundColorBlend[] {
+            //    new BackgroundColorBlend(Color.FromArgb(192, factory.GetColor(metroColors.BaseColorLight)), 0f),
+            //    new BackgroundColorBlend(Color.FromArgb(128, factory.GetColor(metroColors.BaseColor)), .5f),
+            //    new BackgroundColorBlend(Color.FromArgb(64, factory.GetColor(metroColors.BaseColor)), .5f),
+            //    new BackgroundColorBlend(Color.Transparent, 1f),
+            //});
+            //pct.ChunkShadow = new GradientColorTable(0xB2B9C8, 0xD5DAE5, 0);
+            pct.ChunkShadow = new GradientColorTable();
+
+            // Paused State
+            pct = table.ProgressBarItemPaused;
+            pct.BackgroundColors = new GradientColorTable(0xEBEDF0, 0xD5D8DC);
+            pct.OuterBorder = factory.GetColor(0x868B91);
+            pct.InnerBorder = factory.GetColor(0xFFFFFF);
+            pct.Chunk = new GradientColorTable(0xAEA700, 0xFFFDCD, 0);
+            pct.ChunkOverlay = new GradientColorTable();
+            pct.ChunkOverlay.LinearGradientAngle = 90;
+            pct.ChunkOverlay.Colors.AddRange(new BackgroundColorBlend[] {
+                new BackgroundColorBlend(Color.FromArgb(192, factory.GetColor(0xFFFBA3)), 0f),
+                new BackgroundColorBlend(Color.FromArgb(128, factory.GetColor(0xD2CA00)), .5f),
+                new BackgroundColorBlend(Color.FromArgb(64, factory.GetColor(0xFEF400)), .5f),
+                new BackgroundColorBlend(Color.Transparent, 1f),
+            });
+            pct.ChunkShadow = new GradientColorTable(0xB2B9C8, 0xD5DAE5, 0);
+
+            // Error State
+            pct = table.ProgressBarItemError;
+            pct.BackgroundColors = new GradientColorTable(0xEBEDF0, 0xD5D8DC);
+            pct.OuterBorder = factory.GetColor(0x868B91);
+            pct.InnerBorder = factory.GetColor(0xFFFFFF);
+            pct.Chunk = new GradientColorTable(0xD20000, 0xFFCDCD, 0);
+            pct.ChunkOverlay = new GradientColorTable();
+            pct.ChunkOverlay.LinearGradientAngle = 90;
+            pct.ChunkOverlay.Colors.AddRange(new BackgroundColorBlend[] {
+                new BackgroundColorBlend(Color.FromArgb(192, factory.GetColor(0xFF8F8F)), 0f),
+                new BackgroundColorBlend(Color.FromArgb(128, factory.GetColor(0xD20000)), .5f),
+                new BackgroundColorBlend(Color.FromArgb(64, factory.GetColor(0xFE0000)), .5f),
+                new BackgroundColorBlend(Color.Transparent, 1f),
+            });
+            pct.ChunkShadow = new GradientColorTable(0xB2B9C8, 0xD5DAE5, 0);
+            #endregion
+
+            #region Gallery
+            Office2007GalleryColorTable gallery = table.Gallery;
+            gallery.GroupLabelBackground = factory.GetColor(metroColors.CanvasColorLighterShade);
+            gallery.GroupLabelText = factory.GetColor(metroColors.CanvasColorDarkShade);
+            gallery.GroupLabelBorder = Color.Empty;
+            #endregion
+
+            #region Legacy Colors
+            table.LegacyColors.BarBackground = factory.GetColor(metroColors.CanvasColorLight);
+            table.LegacyColors.BarBackground2 = Color.Empty;
+            table.LegacyColors.BarStripeColor = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.LegacyColors.BarCaptionBackground = factory.GetColor(metroColors.BaseColor);
+            table.LegacyColors.BarCaptionBackground2 = Color.Empty;
+            table.LegacyColors.BarCaptionInactiveBackground = factory.GetColor(metroColors.CanvasColor);
+            table.LegacyColors.BarCaptionInactiveBackground2 = Color.Empty;
+            table.LegacyColors.BarCaptionInactiveText = factory.GetColor(metroColors.TextDisabledColor);
+            table.LegacyColors.BarCaptionText = factory.GetColor(metroColors.BaseTextColor);
+            table.LegacyColors.BarFloatingBorder = factory.GetColor(metroColors.BaseColor);
+            table.LegacyColors.BarPopupBackground = factory.GetColor(metroColors.CanvasColor);
+            table.LegacyColors.BarPopupBorder = factory.GetColor(metroColors.BaseColor);
+            table.LegacyColors.ItemBackground = Color.Empty;
+            table.LegacyColors.ItemBackground2 = Color.Empty;
+            table.LegacyColors.ItemCheckedBackground = Color.Empty;
+            table.LegacyColors.ItemCheckedBackground2 = Color.Empty;
+            table.LegacyColors.ItemCheckedBorder = factory.GetColor(metroColors.BaseColor);
+            table.LegacyColors.ItemCheckedText = factory.GetColor(metroColors.TextColor);
+            table.LegacyColors.ItemDisabledBackground = Color.Empty;
+            table.LegacyColors.ItemDisabledText = factory.GetColor(metroColors.TextDisabledColor);
+            table.LegacyColors.ItemExpandedShadow = Color.Empty;
+            table.LegacyColors.ItemExpandedBackground = factory.GetColor(metroColors.CanvasColor);
+            table.LegacyColors.ItemExpandedBackground2 = Color.Empty;
+            table.LegacyColors.ItemExpandedText = factory.GetColor(metroColors.TextColor);
+            table.LegacyColors.ItemExpandedBorder = factory.GetColor(metroColors.CanvasColorLightShade);
+            table.LegacyColors.ItemHotBackground = factory.GetColor(metroColors.CanvasColorLight);
+            table.LegacyColors.ItemHotBackground2 = Color.Empty;
+            table.LegacyColors.ItemHotBorder = factory.GetColor(metroColors.CanvasColorLight);
+            table.LegacyColors.ItemHotText = factory.GetColor(metroColors.TextColor);
+            table.LegacyColors.ItemPressedBackground = factory.GetColor(metroColors.BaseColor);
+            table.LegacyColors.ItemPressedBackground2 = Color.Empty;
+            table.LegacyColors.ItemPressedBorder = factory.GetColor(metroColors.BaseColor);
+            table.LegacyColors.ItemPressedText = factory.GetColor(metroColors.BaseTextColor);
+            table.LegacyColors.ItemSeparator = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.LegacyColors.ItemSeparatorShade = Color.Empty;
+            table.LegacyColors.ItemText = factory.GetColor(metroColors.TextColor);
+            table.LegacyColors.MenuBackground = factory.GetColor(metroColors.CanvasColor);
+            table.LegacyColors.MenuBackground2 = Color.Empty;
+            table.LegacyColors.MenuBarBackground = factory.GetColor(metroColors.CanvasColor);
+            table.LegacyColors.MenuBorder = table.LegacyColors.ItemExpandedBorder;
+            table.LegacyColors.MenuSide = factory.GetColor(metroColors.CanvasColor);
+            table.LegacyColors.MenuSide2 = Color.Empty;
+            table.LegacyColors.MenuUnusedBackground = table.LegacyColors.MenuBackground;
+            table.LegacyColors.MenuUnusedSide = Color.Empty;
+            table.LegacyColors.MenuUnusedSide2 = Color.Empty;
+            table.LegacyColors.ItemDesignTimeBorder = Color.Black;
+            table.LegacyColors.BarDockedBorder = Color.Empty;
+            table.LegacyColors.DockSiteBackColor = factory.GetColor(metroColors.CanvasColorLighterShade);
+            table.LegacyColors.DockSiteBackColor2 = Color.Empty;
+            table.LegacyColors.CustomizeBackground = Color.Empty;
+            table.LegacyColors.CustomizeBackground2 = Color.Empty;
+            table.LegacyColors.CustomizeText = factory.GetColor(metroColors.TextInactiveColor);
+            table.LegacyColors.PanelBackground = factory.GetColor(metroColors.CanvasColor);
+            table.LegacyColors.PanelBackground2 = Color.Empty;
+            table.LegacyColors.PanelText = factory.GetColor(metroColors.TextColor);
+            table.LegacyColors.PanelBorder = factory.GetColor(metroColors.CanvasColorLighterShade);
+            table.LegacyColors.ExplorerBarBackground = factory.GetColor(metroColors.CanvasColorLight);
+            table.LegacyColors.ExplorerBarBackground2 = Color.Empty;
+            table.LegacyColors.SplitterBackground = table.LegacyColors.PanelBackground;
+            table.LegacyColors.SplitterBackground2 = table.LegacyColors.PanelBackground2;
+            table.LegacyColors.SplitterText = table.LegacyColors.PanelText;
+            table.LegacyColors.SplitterBorder = table.LegacyColors.PanelBorder;
+
+            table.LegacyColors.AutoHideTabBackground = factory.GetColor(metroColors.CanvasColor);
+            table.LegacyColors.AutoHideTabText = factory.GetColor(metroColors.TextColor);
+            table.LegacyColors.AutoHideTabBorder = factory.GetColor(metroColors.CanvasColorLightShade);
+            table.LegacyColors.AutoHideSelectedTabBackground = factory.GetColor(metroColors.CanvasColor);
+            table.LegacyColors.AutoHideSelectedTabBorder = factory.GetColor(metroColors.BaseColor);
+            table.LegacyColors.AutoHideSelectedTabText = factory.GetColor(metroColors.BaseColor);
+
+            #endregion
+
+            #region Navigation Pane
+            table.NavigationPane.ButtonBackground = new GradientColorTable();
+            table.NavigationPane.ButtonBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(metroColors.CanvasColor), 0));
+            #endregion
+
+            #region SuperTooltip
+            table.SuperTooltip.BackgroundColors = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor));
+            table.SuperTooltip.TextColor = factory.GetColor(metroColors.TextColor);
+            #endregion
+
+            #region Slider
+            Office2007SliderColorTable sl = table.Slider;
+            sl.Default.LabelColor = factory.GetColor(metroColors.TextColor);
+            sl.Default.SliderLabelColor = factory.GetColor(metroColors.TextColor);
+            sl.Default.PartBackground = new GradientColorTable();
+            sl.Default.PartBorderColor = Color.Empty;
+            sl.Default.PartBorderLightColor = Color.Empty;
+            sl.Default.PartForeColor = factory.GetColor(metroColors.TextColor);
+            sl.Default.PartForeLightColor = Color.Empty;
+            sl.Default.TrackLineColor = factory.GetColor(metroColors.TextColor);
+            sl.Default.TrackLineLightColor = factory.GetColor(Color.FromArgb(48, Color.White));
+
+            sl.MouseOver.LabelColor = factory.GetColor(metroColors.TextColor);
+            sl.MouseOver.SliderLabelColor = factory.GetColor(metroColors.TextColor);
+            sl.MouseOver.PartBackground = new GradientColorTable();
+            sl.MouseOver.PartBorderColor = Color.Empty;
+            sl.MouseOver.PartBorderLightColor = Color.Empty;
+            sl.MouseOver.PartForeColor = factory.GetColor(metroColors.TextColor);
+            sl.MouseOver.PartForeLightColor = Color.Empty;
+            sl.MouseOver.TrackLineColor = factory.GetColor(metroColors.TextColor);
+            sl.MouseOver.TrackLineLightColor = factory.GetColor(Color.FromArgb(48, Color.White));
+
+            sl.Pressed.LabelColor = factory.GetColor(metroColors.TextColor);
+            sl.Pressed.SliderLabelColor = factory.GetColor(metroColors.TextColor);
+            sl.Pressed.PartBackground = new GradientColorTable();
+            sl.Pressed.PartBorderColor = Color.Empty;
+            sl.Pressed.PartBorderLightColor = Color.Empty;
+            sl.Pressed.PartForeColor = factory.GetColor(metroColors.TextColor);
+            sl.Pressed.PartForeLightColor = Color.Empty;
+            sl.Pressed.TrackLineColor = factory.GetColor(metroColors.TextColor);
+            sl.Pressed.TrackLineLightColor = factory.GetColor(Color.FromArgb(48, Color.White));
+
+            ColorBlendFactory df = new ColorBlendFactory(ColorScheme.GetColor(0xCFCFCF));
+            sl.Disabled.LabelColor = factory.GetColor(metroColors.TextDisabledColor);
+            sl.Disabled.SliderLabelColor = factory.GetColor(metroColors.TextDisabledColor);
+            sl.Disabled.PartBackground = new GradientColorTable();
+            sl.Disabled.PartBorderColor = df.GetColor(sl.Default.PartBorderColor);
+            sl.Disabled.PartBorderLightColor = df.GetColor(sl.Default.PartBorderLightColor);
+            sl.Disabled.PartForeColor = df.GetColor(sl.Default.PartForeColor);
+            sl.Disabled.PartForeLightColor = df.GetColor(sl.Default.PartForeLightColor);
+            sl.Disabled.TrackLineColor = df.GetColor(sl.Default.TrackLineColor);
+            sl.Disabled.TrackLineLightColor = df.GetColor(sl.Default.TrackLineLightColor);
+
+            sl.TrackPart = new Office2007SliderPartColorTable();
+            sl.TrackPart.Default.LabelColor = factory.GetColor(metroColors.TextColor);
+            sl.TrackPart.Default.SliderLabelColor = factory.GetColor(metroColors.TextColor);
+            sl.TrackPart.Default.PartBackground = new GradientColorTable(factory.GetColor(metroColors.TextColor));
+            sl.TrackPart.Default.PartBorderColor = factory.GetColor(metroColors.TextColor);
+            sl.TrackPart.Default.PartBorderLightColor = Color.Empty;
+            sl.TrackPart.Default.PartForeColor = factory.GetColor(metroColors.TextColor);
+            sl.TrackPart.Default.PartForeLightColor = factory.GetColor(metroColors.TextColor);
+            sl.TrackPart.Default.TrackLineColor = factory.GetColor(metroColors.TextColor);
+            sl.TrackPart.Default.TrackLineLightColor = factory.GetColor(Color.FromArgb(48, Color.White));
+            sl.TrackPart.MouseOver.LabelColor = factory.GetColor(metroColors.TextColor);
+            sl.TrackPart.MouseOver.SliderLabelColor = factory.GetColor(metroColors.TextColor);
+            sl.TrackPart.MouseOver.PartBackground = new GradientColorTable(factory.GetColor(metroColors.TextColor));
+            sl.TrackPart.MouseOver.PartBorderColor = factory.GetColor(metroColors.TextColor);
+            sl.TrackPart.MouseOver.PartBorderLightColor = Color.Empty;
+            sl.TrackPart.MouseOver.PartForeColor = factory.GetColor(metroColors.TextColor);
+            sl.TrackPart.MouseOver.PartForeLightColor = factory.GetColor(metroColors.TextColor);
+            sl.TrackPart.MouseOver.TrackLineColor = factory.GetColor(metroColors.TextColor);
+            sl.TrackPart.MouseOver.TrackLineLightColor = factory.GetColor(Color.FromArgb(48, Color.White));
+            sl.TrackPart.Pressed = sl.TrackPart.MouseOver;
+
+            // Contextual Table when on StatusBar
+            sl = new Office2007SliderColorTable();
+            sl.Default.LabelColor = factory.GetColor(metroColors.TextColor);
+            sl.Default.SliderLabelColor = factory.GetColor(metroColors.TextColor);
+            sl.Default.PartBackground = new GradientColorTable();
+            sl.Default.PartBorderColor = Color.Empty;
+            sl.Default.PartBorderLightColor = Color.Empty;
+            sl.Default.PartForeColor = factory.GetColor(metroColors.CanvasColor);
+            sl.Default.PartForeLightColor = factory.GetColor(metroColors.BaseColorDark);
+            sl.Default.TrackLineColor = factory.GetColor(metroColors.BaseColorDark);
+            sl.Default.TrackLineLightColor = factory.GetColor(Color.FromArgb(48, Color.White));
+
+            sl.MouseOver.LabelColor = factory.GetColor(metroColors.TextColor);
+            sl.MouseOver.SliderLabelColor = factory.GetColor(metroColors.TextColor);
+            sl.MouseOver.PartBackground = new GradientColorTable();
+            sl.MouseOver.PartBorderColor = Color.Empty;
+            sl.MouseOver.PartBorderLightColor = Color.Empty;
+            sl.MouseOver.PartForeColor = factory.GetColor(metroColors.CanvasColor);
+            sl.MouseOver.PartForeLightColor = factory.GetColor(metroColors.BaseColorDark);
+            sl.MouseOver.TrackLineColor = factory.GetColor(metroColors.BaseColorDark);
+            sl.MouseOver.TrackLineLightColor = factory.GetColor(Color.FromArgb(48, Color.White));
+
+            sl.Pressed.LabelColor = factory.GetColor(metroColors.TextColor);
+            sl.Pressed.SliderLabelColor = factory.GetColor(metroColors.TextColor);
+            sl.Pressed.PartBackground = new GradientColorTable();
+            sl.Pressed.PartBorderColor = Color.Empty;
+            sl.Pressed.PartBorderLightColor = Color.Empty;
+            sl.Pressed.PartForeColor = factory.GetColor(metroColors.CanvasColorLighterShade);
+            sl.Pressed.PartForeLightColor = factory.GetColor(metroColors.BaseColorDark);
+            sl.Pressed.TrackLineColor = factory.GetColor(metroColors.CanvasColorDarkShade);
+            sl.Pressed.TrackLineLightColor = factory.GetColor(Color.FromArgb(48, Color.White));
+
+            df = new ColorBlendFactory(ColorScheme.GetColor(0xCFCFCF));
+            sl.Disabled.LabelColor = factory.GetColor(metroColors.TextDisabledColor);
+            sl.Disabled.SliderLabelColor = factory.GetColor(metroColors.TextDisabledColor);
+            sl.Disabled.PartBackground = new GradientColorTable();
+            foreach (BackgroundColorBlend b in sl.Default.PartBackground.Colors)
+                sl.Disabled.PartBackground.Colors.Add(new BackgroundColorBlend(df.GetColor(b.Color), b.Position));
+            sl.Disabled.PartBorderColor = df.GetColor(sl.Default.PartBorderColor);
+            sl.Disabled.PartBorderLightColor = df.GetColor(sl.Default.PartBorderLightColor);
+            sl.Disabled.PartForeColor = df.GetColor(sl.Default.PartForeColor);
+            sl.Disabled.PartForeLightColor = df.GetColor(sl.Default.PartForeLightColor);
+            sl.Disabled.TrackLineColor = df.GetColor(sl.Default.TrackLineColor);
+            sl.Disabled.TrackLineLightColor = df.GetColor(sl.Default.TrackLineLightColor);
+
+            sl.TrackPart = new Office2007SliderPartColorTable();
+            sl.TrackPart.Default.LabelColor = factory.GetColor(metroColors.BaseTextColor);
+            sl.TrackPart.Default.SliderLabelColor = factory.GetColor(metroColors.TextColor);
+            sl.TrackPart.Default.PartBackground = new GradientColorTable(factory.GetColor(metroColors.CanvasColor));
+            sl.TrackPart.Default.PartBorderColor = factory.GetColor(metroColors.BaseColorDarker);
+            sl.TrackPart.Default.PartBorderLightColor = Color.Empty;
+            sl.TrackPart.Default.PartForeColor = factory.GetColor(metroColors.CanvasColor);
+            sl.TrackPart.Default.PartForeLightColor = factory.GetColor(metroColors.CanvasColor);
+            sl.TrackPart.Default.TrackLineColor = factory.GetColor(metroColors.BaseColorDark);
+            sl.TrackPart.Default.TrackLineLightColor = factory.GetColor(Color.FromArgb(48, Color.White));
+            sl.TrackPart.MouseOver = sl.TrackPart.Default;
+            sl.TrackPart.Pressed = sl.TrackPart.Default;
+
+            table.ContextualTables.Add(Office2007ColorTable.GetContextualKey(typeof(Office2007SliderColorTable), typeof(Bar)) + "+StatusBar", sl);
+            table.ContextualTables.Add(Office2007ColorTable.GetContextualKey(typeof(Office2007SliderColorTable), typeof(MetroStatusBar)), sl);
+            #endregion
+
+            #region RangeSlider
+            MetroOfficeColorTableInitializer.InitRangeSlider(table, factory, metroColors);
+            #endregion
+
+            #region ListViewEx
+            table.ListViewEx.Border = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.ListViewEx.ColumnBackground = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColorLightShade));
+            table.ListViewEx.ColumnSeparator = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.ListViewEx.ColumnForeColor = factory.GetColor(metroColors.TextColor);
+            table.ListViewEx.SelectionBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor), Color.Empty);
+            table.ListViewEx.SelectionBorder = Color.Empty;
+            table.ListViewEx.SelectionForeColor = factory.GetColor(metroColors.BaseTextColor);
+            #endregion
+
+            #region DataGridView
+            table.DataGridView.BackgroundColor = factory.GetColor(metroColors.CanvasColor);
+            table.DataGridView.DefaultCellBackground = factory.GetColor(metroColors.CanvasColor);
+            table.DataGridView.DefaultCellText = factory.GetColor(metroColors.TextColor);
+            table.DataGridView.ColumnHeaderNormalBorder = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.DataGridView.ColumnHeaderNormalBackground = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColorLightShade));
+            table.DataGridView.ColumnHeaderNormalText = factory.GetColor(metroColors.TextColor);
+            table.DataGridView.ColumnHeaderSelectedBackground = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColorLighterShade));
+            table.DataGridView.ColumnHeaderSelectedText = factory.GetColor(metroColors.TextColor);
+            table.DataGridView.ColumnHeaderSelectedBorder = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.DataGridView.ColumnHeaderSelectedMouseOverBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            table.DataGridView.ColumnHeaderSelectedMouseOverBorder = factory.GetColor(metroColors.BaseColorDark);
+            table.DataGridView.ColumnHeaderMouseOverBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            table.DataGridView.ColumnHeaderMouseOverBorder = factory.GetColor(metroColors.BaseColorDark);
+            table.DataGridView.ColumnHeaderPressedBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            table.DataGridView.ColumnHeaderPressedBorder = factory.GetColor(metroColors.BaseColorDark);
+
+            table.DataGridView.RowNormalBackground = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColorLightShade));
+            table.DataGridView.RowNormalBorder = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.DataGridView.RowSelectedBackground = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColorLighterShade));
+            table.DataGridView.RowSelectedBorder = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.DataGridView.RowSelectedMouseOverBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            table.DataGridView.RowSelectedMouseOverBorder = factory.GetColor(metroColors.BaseColorDark);
+            table.DataGridView.RowMouseOverBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            table.DataGridView.RowMouseOverBorder = factory.GetColor(metroColors.BaseColorDark);
+            table.DataGridView.RowPressedBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            table.DataGridView.RowPressedBorder = factory.GetColor(metroColors.BaseColorDark);
+
+            table.DataGridView.GridColor = factory.GetColor(metroColors.CanvasColorDarkShade);
+
+            table.DataGridView.SelectorBackground = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColorLightShade));
+            table.DataGridView.SelectorBorder = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.DataGridView.SelectorBorderDark = Color.Empty;// factory.GetColor(0xC3C3C3);
+            table.DataGridView.SelectorBorderLight = Color.Empty;// factory.GetColor(0xF9F9F9);
+            table.DataGridView.SelectorSign = new LinearGradientColorTable(factory.GetColor(metroColors.TextColor));
+
+            table.DataGridView.SelectorMouseOverBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            table.DataGridView.SelectorMouseOverBorder = factory.GetColor(metroColors.BaseColorDark);
+            table.DataGridView.SelectorMouseOverBorderDark = Color.Empty;// factory.GetColor(0xB0CFF7);
+            table.DataGridView.SelectorMouseOverBorderLight = Color.Empty; // factory.GetColor(0xD5E4F2);
+            table.DataGridView.SelectorMouseOverSign = new LinearGradientColorTable(factory.GetColor(metroColors.TextColor));
+            #endregion
+
+            #region SideBar
+            table.SideBar.Background = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor));
+            table.SideBar.Border = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.SideBar.SideBarPanelItemText = factory.GetColor(metroColors.TextColor);
+            table.SideBar.SideBarPanelItemDefault = new GradientColorTable();
+            table.SideBar.SideBarPanelItemDefault.Colors.Add(new BackgroundColorBlend(factory.GetColor(metroColors.CanvasColor), 0));
+            table.SideBar.SideBarPanelItemDefault.Colors.Add(new BackgroundColorBlend(factory.GetColor(metroColors.CanvasColor), 1));
+            // Expanded
+            table.SideBar.SideBarPanelItemExpanded = new GradientColorTable();
+            table.SideBar.SideBarPanelItemExpanded.Colors.Add(new BackgroundColorBlend(factory.GetColor(metroColors.BaseColor), 0));
+            table.SideBar.SideBarPanelItemExpanded.Colors.Add(new BackgroundColorBlend(factory.GetColor(metroColors.BaseColor), 1));
+            // MouseOver
+            table.SideBar.SideBarPanelItemMouseOver = new GradientColorTable();
+            table.SideBar.SideBarPanelItemMouseOver.Colors.Add(new BackgroundColorBlend(factory.GetColor(metroColors.BaseColor), 0));
+            table.SideBar.SideBarPanelItemMouseOver.Colors.Add(new BackgroundColorBlend(factory.GetColor(metroColors.BaseColorDark), 1));
+            // Pressed
+            table.SideBar.SideBarPanelItemPressed = new GradientColorTable();
+            table.SideBar.SideBarPanelItemPressed.Colors.Add(new BackgroundColorBlend(factory.GetColor(metroColors.BaseColorDark), 0));
+            table.SideBar.SideBarPanelItemPressed.Colors.Add(new BackgroundColorBlend(factory.GetColor(metroColors.BaseColorDark), 1));
+            #endregion
+
+            #region AdvTree
+#if !NOTREE
+            table.AdvTree = new DevComponents.AdvTree.Display.TreeColorTable();
+            CreateAdvTreeColorTable(table.AdvTree, factory, metroColors);
+#endif
+            #endregion
+
+            #region CrumbBar
+            table.CrumbBarItemView = new CrumbBarItemViewColorTable();
+            CrumbBarItemViewStateColorTable crumbBarViewTable = new CrumbBarItemViewStateColorTable();
+            table.CrumbBarItemView.Default = crumbBarViewTable;
+            crumbBarViewTable.Foreground = factory.GetColor(metroColors.TextColor);
+            crumbBarViewTable = new CrumbBarItemViewStateColorTable();
+            table.CrumbBarItemView.MouseOver = crumbBarViewTable;
+            crumbBarViewTable.Foreground = factory.GetColor(metroColors.BaseTextColor);
+            crumbBarViewTable.Background = new BackgroundColorBlendCollection();
+            crumbBarViewTable.Background.AddRange(new BackgroundColorBlend[]{
+                new BackgroundColorBlend(factory.GetColor(metroColors.BaseColor), 0f),
+                new BackgroundColorBlend(factory.GetColor(metroColors.BaseColorDark), 1f)});
+            crumbBarViewTable.Border = factory.GetColor(metroColors.BaseColorDark);
+            crumbBarViewTable.BorderLight = Color.Empty; // factory.GetColor("90FFFFFF");
+            crumbBarViewTable = new CrumbBarItemViewStateColorTable();
+            table.CrumbBarItemView.MouseOverInactive = crumbBarViewTable;
+            crumbBarViewTable.Foreground = factory.GetColor(metroColors.BaseTextColor);
+            crumbBarViewTable.Background = new BackgroundColorBlendCollection();
+            crumbBarViewTable.Background.AddRange(new BackgroundColorBlend[]{
+                new BackgroundColorBlend(factory.GetColor(metroColors.BaseColor), 0f),
+                new BackgroundColorBlend(factory.GetColor(metroColors.BaseColor), 1f)});
+            crumbBarViewTable.Border = factory.GetColor(metroColors.BaseColorDark);
+            crumbBarViewTable.BorderLight = Color.Empty; // factory.GetColor("90FFFFFF");
+            crumbBarViewTable = new CrumbBarItemViewStateColorTable();
+            table.CrumbBarItemView.Pressed = crumbBarViewTable;
+            crumbBarViewTable.Foreground = factory.GetColor(metroColors.BaseTextColor);
+            crumbBarViewTable.Background = new BackgroundColorBlendCollection();
+            crumbBarViewTable.Background.AddRange(new BackgroundColorBlend[]{
+                new BackgroundColorBlend(factory.GetColor(metroColors.BaseColorDark), 0f),
+                new BackgroundColorBlend(factory.GetColor(metroColors.BaseColorDark), 1f)});
+            crumbBarViewTable.Border = factory.GetColor(metroColors.BaseColorDark);
+            crumbBarViewTable.BorderLight = Color.Empty; // factory.GetColor("408B7654");
+
+            #endregion
+
+            #region WarningBox
+            table.WarningBox.BackColor = factory.GetColor(factory.GetColor(metroColors.CanvasColor));
+            table.WarningBox.WarningBorderColor = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.WarningBox.WarningBackColor1 = factory.GetColor(metroColors.CanvasColor);
+            table.WarningBox.WarningBackColor2 = factory.GetColor(metroColors.CanvasColor);
+            #endregion
+
+            #region CalendarView
+
+            #region WeekDayViewColors
+
+            table.CalendarView.WeekDayViewColors = new ColorDef[]
+            {
+                new ColorDef(factory.GetColor(metroColors.CanvasColorLightShade)),           // DayViewBorder
+                new ColorDef(factory.GetColor(metroColors.CanvasColorDarkShade)),           // DayHeaderForeground
+
+                new ColorDef(new Color[] {factory.GetColor(metroColors.CanvasColor)},
+                new float[] {0f}, 90f),             // DayHeaderBackground
+
+                new ColorDef(factory.GetColor(metroColors.CanvasColorLightShade)),           // DayHeaderBorder
+
+                new ColorDef(factory.GetColor(metroColors.CanvasColor)),           // DayWorkHoursBackground
+                new ColorDef(factory.GetColor(metroColors.CanvasColorLightShade)),           // DayAllDayEventBackground
+                new ColorDef(factory.GetColor(metroColors.CanvasColorLighterShade)),           // DayOffWorkHoursBackground
+
+                new ColorDef(factory.GetColor(metroColors.CanvasColorDarkShade)),           // DayHourBorder
+                new ColorDef(factory.GetColor(metroColors.CanvasColorLightShade)),           // DayHalfHourBorder
+
+                new ColorDef(factory.GetColor(metroColors.BaseColor)),           // SelectionBackground
+
+                new ColorDef(factory.GetColor(metroColors.CanvasColorLightShade)),           // OwnerTabBorder
+
+                new ColorDef(factory.GetColor(metroColors.CanvasColor)),    // OwnerTabBackground
+
+                new ColorDef(factory.GetColor(metroColors.CanvasColorDarkShade)),           // OwnerTabForeground
+                new ColorDef(factory.GetColor(metroColors.CanvasColor)),           // OwnerTabContentBackground
+                new ColorDef(factory.GetColor(metroColors.CanvasColorDarkShade)),           // OwnerTabSelectedForeground
+                new ColorDef(factory.GetColor(metroColors.CanvasColorLighterShade)),           // OwnerTabSelectionBackground
+
+                new ColorDef(factory.GetColor(metroColors.CanvasColor)),           // CondensedViewBackground
+
+                new ColorDef(factory.GetColor(metroColors.CanvasColorLightShade)),           // NowDayViewBorder
+                new ColorDef(factory.GetColor(metroColors.CanvasColorDarkShade)),           // NowDayHeaderForeground - 0x15428B
+
+                new ColorDef(factory.GetColor(metroColors.CanvasColorLighterShade)),       // NowDayHeaderBackground
+                
+                new ColorDef(new Color[] {factory.GetColor(0xFFED79), factory.GetColor(0xFFD86B), factory.GetColor(0xFFBB00), factory.GetColor(0xFFEA77)},
+                new float[] {0f, .55f ,58f, 1f}, 90f),              // TimeIndicator
+
+                new ColorDef(factory.GetColor(0xEB8900)),           // TimeIndicatorBorder
+            };
+
+            #endregion
+
+            #region HourRulerColors
+
+            table.CalendarView.TimeRulerColors = new ColorDef[]
+            {
+                new ColorDef(factory.GetColor(metroColors.CanvasColor)),           // TimeRulerBackground
+                new ColorDef(factory.GetColor(metroColors.CanvasColorDarkShade)),           // TimeRulerForeground
+                new ColorDef(factory.GetColor(metroColors.CanvasColorDarkShade)),           // TimeRulerBorder
+                new ColorDef(factory.GetColor(metroColors.CanvasColorDarkShade)),           // TimeRulerTickBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xFFED79), factory.GetColor(0xFFD86B), factory.GetColor(0xFFBB00), factory.GetColor(0xFFEA77)},
+                new float[] {0f, .55f ,58f, 1f}, 90f),              // TimeRulerIndicator
+
+                new ColorDef(factory.GetColor(0xEB8900)),           // TimeRulerIndicatorBorder
+            };
+
+            #endregion
+
+            #region MonthViewColors
+
+            table.CalendarView.MonthViewColors = new ColorDef[]
+            {
+              new ColorDef(factory.GetColor(metroColors.CanvasColorLightShade)),           // DayOfWeekHeaderBorder
+
+                new ColorDef(factory.GetColor(metroColors.CanvasColor)),                    // DayOfWeekHeaderBackground
+
+                new ColorDef(factory.GetColor(metroColors.CanvasColorDarkShade)),           // DayOfWeekHeaderForeground
+                new ColorDef(factory.GetColor(metroColors.CanvasColorLightShade)),           // SideBarBorder
+
+                new ColorDef(factory.GetColor(metroColors.CanvasColor)),                   // SideBarBackground
+
+                new ColorDef(factory.GetColor(metroColors.CanvasColorDarkShade)),           // SideBarForeground
+                new ColorDef(factory.GetColor(metroColors.CanvasColorLightShade)),           // DayHeaderBorder
+
+                new ColorDef(factory.GetColor(metroColors.CanvasColor)),                    // DayHeaderBackground
+
+                new ColorDef(factory.GetColor(metroColors.CanvasColorDarkShade)),           // DayHeaderForeground
+                new ColorDef(factory.GetColor(metroColors.CanvasColorLightShade)),           // DayContentBorder
+                new ColorDef(factory.GetColor(metroColors.BaseColor)),           // DayContentSelectionBackground
+                new ColorDef(factory.GetColor(metroColors.CanvasColor)),           // DayContentActiveDayBackground
+                new ColorDef(factory.GetColor(metroColors.CanvasColor)),           // DayContentInactiveDayBackground
+
+                new ColorDef(factory.GetColor(metroColors.CanvasColorLightShade)),           // OwnerTabBorder
+
+                new ColorDef(factory.GetColor(metroColors.CanvasColor)),
+
+                new ColorDef(factory.GetColor(metroColors.CanvasColorLightShade)),           // OwnerTabForeground
+                new ColorDef(factory.GetColor(metroColors.CanvasColor)),           // OwnerTabContentBackground
+                new ColorDef(factory.GetColor(metroColors.CanvasColorDarkShade)),           // OwnerTabSelectedForeground
+                new ColorDef(factory.GetColor(metroColors.CanvasColor)),           // OwnerTabSelectionBackground
+
+                new ColorDef(factory.GetColor(metroColors.BaseColor)),           // NowDayViewBorder
+                new ColorDef(factory.GetColor(metroColors.TextColor)),           // NowDayHeaderForeground - 0x15428B
+
+                new ColorDef(factory.GetColor(metroColors.CanvasColorLighterShade)),              // NowDayHeaderBackground
+
+                new ColorDef(factory.GetColor(metroColors.TextColor)),   // ContentLinkForeground - DayHeaderForeground
+                new ColorDef(factory.GetColor(metroColors.CanvasColorLightShade)),            // ContentLinkBackground - DayContentActiveDayBackground
+            };
+
+            #endregion
+
+            #region AppointmentColors
+
+            table.CalendarView.AppointmentColors = new ColorDef[]
+            {
+                new ColorDef(factory.GetColor(metroColors.CanvasColorDarkShade)),           // DefaultBorder
+
+                new ColorDef(new Color[] {factory.GetColor(metroColors.BaseButtonGradientStart), factory.GetColor(metroColors.BaseButtonGradientEnd)},
+                             new float[] {0f, 1f}, 90f),            // DefaultBackground
+
+                new ColorDef(factory.GetColor(0x28518E)),           // BlueBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xB1C5EC), factory.GetColor(0x759DDA)}, 
+                             new float[] {0f, 1f}, 90f),            // BlueBackground
+
+                new ColorDef(factory.GetColor(0x2C6524)),           // GreenBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xC2E8BC), factory.GetColor(0x84D17B)},
+                             new float[] {0f, 1f}, 90f),            // GreenBackground
+
+                new ColorDef(factory.GetColor(0x8B3E0A)),           // OrangeBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xF9C7A0), factory.GetColor(0xF49758)},
+                             new float[] {0f, 1f}, 90f),            // OrangeBackground
+
+                new ColorDef(factory.GetColor(0x3E2771)),           // PurpleBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xC5B5E6), factory.GetColor(0x957BD2)},
+                             new float[] {0f, 1f}, 90f),            // PurpleBackground
+
+                new ColorDef(factory.GetColor(0x86171C)),           // RedBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xF1AAAC), factory.GetColor(0xE5676E)},
+                             new float[] {0f, 1f}, 90f),            // RedBackground
+
+                new ColorDef(factory.GetColor(0x7C7814)),           // YellowBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xFFFCAA), factory.GetColor(0xFFF958)},
+                             new float[] {0f, 1f}, 90f),            // YellowBackground
+
+                new ColorDef(factory.GetColor(-1)),                 // BusyTimeMarker
+                new ColorDef(factory.GetColor(0xFFFFFF)),           // FreeTimeMarker
+                new ColorDef(factory.GetColor(0x800080))            // OutOfOfficeTimeMarker
+            };
+
+            #endregion
+
+            #endregion
+
+            #region SuperTab
+
+            #region SuperTab
+
+            table.SuperTab.Background = new SuperTabLinearGradientColorTable(
+                factory.GetColor(metroColors.CanvasColor), Color.Empty);
+
+            table.SuperTab.InnerBorder = factory.GetColor(metroColors.CanvasColorLighterShade);
+            table.SuperTab.OuterBorder = factory.GetColor(metroColors.CanvasColorDarkShade);
+
+            table.SuperTab.ControlBoxDefault.Image = factory.GetColor(metroColors.CanvasColorDarkShade);
+
+            table.SuperTab.ControlBoxMouseOver.Background = factory.GetColor(metroColors.CanvasColorLightShade);
+            table.SuperTab.ControlBoxMouseOver.Border = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.SuperTab.ControlBoxMouseOver.Image = factory.GetColor(metroColors.TextColor);
+
+            table.SuperTab.ControlBoxPressed.Background = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.SuperTab.ControlBoxPressed.Border = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.SuperTab.ControlBoxPressed.Image = factory.GetColor(metroColors.TextColor);
+
+            table.SuperTab.InsertMarker = factory.GetColor(metroColors.BaseColor);
+
+            #endregion
+
+            #region SuperTabItem
+
+            // Top Default
+
+            table.SuperTabItem.Default.Normal.Background = new SuperTabLinearGradientColorTable(factory.GetColor(factory.GetColor(metroColors.CanvasColor)));
+
+            table.SuperTabItem.Default.Normal.InnerBorder = factory.GetColor(metroColors.CanvasColorLighterShade);
+            table.SuperTabItem.Default.Normal.OuterBorder = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.SuperTabItem.Default.Normal.Text = factory.GetColor(metroColors.TextInactiveColor);
+            table.SuperTabItem.Default.Normal.CloseMarker = factory.GetColor(metroColors.CanvasColorLightShade);
+
+            // Disabled
+            table.SuperTabItem.Default.Disabled.Text = factory.GetColor(metroColors.TextDisabledColor);
+            table.SuperTabItem.Default.Disabled.Background.AdaptiveGradient = false;
+            table.SuperTabItem.Default.Disabled.CloseMarker = factory.GetColor(metroColors.TextDisabledColor);
+
+            // Top Selected
+
+            table.SuperTabItem.Default.Selected.Background = new SuperTabLinearGradientColorTable(
+                new Color[] { factory.GetColor(metroColors.CanvasColorLighterShade), factory.GetColor(metroColors.CanvasColorLightShade), factory.GetColor(metroColors.CanvasColorLightShade), factory.GetColor(metroColors.CanvasColor) },
+                new float[] { 0, .5f, .5f, 1 });
+
+            table.SuperTabItem.Default.Selected.InnerBorder = factory.GetColor(metroColors.CanvasColorLighterShade);
+            table.SuperTabItem.Default.Selected.OuterBorder = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.SuperTabItem.Default.Selected.Text = factory.GetColor(metroColors.TextColor);
+            table.SuperTabItem.Default.Selected.CloseMarker = factory.GetColor(metroColors.CanvasColorDarkShade);
+
+            // Top SelectedMouseOver
+
+            table.SuperTabItem.Default.SelectedMouseOver.Background = new SuperTabLinearGradientColorTable(
+                new Color[] { factory.GetColor(metroColors.CanvasColor), factory.GetColor(metroColors.CanvasColorLightShade) },
+                new float[] { 0, 1 });
+
+            table.SuperTabItem.Default.SelectedMouseOver.InnerBorder = factory.GetColor(metroColors.CanvasColorLighterShade);
+            table.SuperTabItem.Default.SelectedMouseOver.OuterBorder = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.SuperTabItem.Default.SelectedMouseOver.Text = factory.GetColor(metroColors.TextColor);
+            table.SuperTabItem.Default.SelectedMouseOver.CloseMarker = factory.GetColor(metroColors.CanvasColorDarkShade);
+
+            // Top MouseOver
+
+            table.SuperTabItem.Default.MouseOver.Background = new SuperTabLinearGradientColorTable(factory.GetColor(metroColors.CanvasColor), metroColors.CanvasColorLightShade);
+
+            table.SuperTabItem.Default.MouseOver.InnerBorder = factory.GetColor(metroColors.CanvasColorLighterShade);
+            table.SuperTabItem.Default.MouseOver.OuterBorder = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.SuperTabItem.Default.MouseOver.Text = factory.GetColor(metroColors.TextColor);
+            table.SuperTabItem.Default.MouseOver.CloseMarker = factory.GetColor(metroColors.CanvasColorDarkShade);
+
+            // Left, Bottom, Right
+
+            table.SuperTabItem.Left = table.SuperTabItem.Default;
+            table.SuperTabItem.Bottom = table.SuperTabItem.Default;
+            table.SuperTabItem.Right = table.SuperTabItem.Default;
+
+            #endregion
+
+            #region SuperTabPanel
+
+            table.SuperTabPanel.Default.Background = new SuperTabLinearGradientColorTable(factory.GetColor(metroColors.CanvasColor), Color.Empty);
+            table.SuperTabPanel.Default.InnerBorder = factory.GetColor(metroColors.CanvasColorLighterShade);
+            table.SuperTabPanel.Default.OuterBorder = factory.GetColor(metroColors.CanvasColorDarkShade);
+
+            table.SuperTabPanel.Left = table.SuperTabPanel.Default;
+            table.SuperTabPanel.Bottom = table.SuperTabPanel.Default;
+            table.SuperTabPanel.Right = table.SuperTabPanel.Default;
+
+            #endregion
+
+            #endregion
+
+            #region Backstage
+
+            #region Backstage
+            SuperTabStyleColorFactory.GetMetroBackstageColorTable(table.Backstage, factory, metroColors);
+            #endregion
+
+            #region BackstageItem
+            SuperTabStyleColorFactory.GetMetroBackstageItemColorTable(table.BackstageItem, factory, metroColors);
+            #endregion
+
+            #region BackstagePanel
+            SuperTabStyleColorFactory.GetMetroBackstagePanelColorTable(table.BackstagePanel, factory, metroColors);
+            #endregion
+
+            #endregion
+
+            #region SwitchButton
+            SwitchButtonColorTable sbt = new SwitchButtonColorTable();
+            sbt.BorderColor = factory.GetColor(metroColors.CanvasColorDarkShade);
+            sbt.OffBackColor = factory.GetColor(metroColors.CanvasColorDarkShade);
+            sbt.OffTextColor = factory.GetColor(metroColors.TextColor);
+            sbt.OnBackColor = factory.GetColor(metroColors.BaseColorDark);
+            sbt.OnTextColor = factory.GetColor(metroColors.BaseTextColor);
+            sbt.SwitchBackColor = factory.GetColor(metroColors.BaseColorDark);
+            sbt.SwitchOnBackColor = factory.GetColor(metroColors.CanvasColorLightShade);
+            sbt.SwitchBorderColor = Color.Empty; // factory.GetColor(metroColors.CanvasColorLightShade);
+            sbt.TextColor = factory.GetColor(metroColors.TextColor);
+            table.SwitchButton = new SwitchButtonColors();
+            table.SwitchButton.Default = sbt;
+            table.SwitchButton.Disabled.BorderColor = factory.GetColor(metroColors.CanvasColorLightShade);
+            table.SwitchButton.Disabled.SwitchBorderColor = Color.Empty;
+            table.SwitchButton.Disabled.OffTextColor = table.CheckBoxItem.Disabled.Text;
+            table.SwitchButton.Disabled.OnTextColor = table.SwitchButton.Disabled.OffTextColor;
+            table.SwitchButton.Disabled.TextColor = table.SwitchButton.Disabled.OffTextColor;
+            table.SwitchButton.Disabled.SwitchBackColor = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.SwitchButton.Disabled.OffBackColor = factory.GetColor(metroColors.CanvasColorLightShade);
+            table.SwitchButton.Disabled.OnBackColor = factory.GetColor(metroColors.CanvasColorLightShade);
+            #endregion
+
+            #region ElementStyle Classes
+            table.StyleClasses.Clear();
+            ElementStyle style = new ElementStyle();
+            style.Class = ElementStyleClassKeys.RibbonGalleryContainerKey;
+            style.BorderColor = factory.GetColor(metroColors.CanvasColorDarkShade);
+            style.Border = eStyleBorderType.Solid;
+            style.BorderWidth = 1;
+            style.CornerDiameter = 0;
+            style.CornerType = eCornerType.Square;
+            style.BackColor = factory.GetColor(metroColors.EditControlBackColor);
+            table.StyleClasses.Add(style.Class, style);
+            // FileMenuContainer
+            style = GetFileMenuContainerStyle(table);
+            table.StyleClasses.Add(style.Class, style);
+            // Two Column File Menu Container
+            style = GetTwoColumnMenuContainerStyle(table);
+            table.StyleClasses.Add(style.Class, style);
+            // Column one File Menu Container
+            style = GetMenuColumnOneContainerStyle(table);
+            table.StyleClasses.Add(style.Class, style);
+            // Column two File Menu Container
+            style = GetMenuColumnTwoContainerStyle(table);
+            table.StyleClasses.Add(style.Class, style);
+            // Bottom File Menu Container
+            style = GetMenuBottomContainer(table);
+            table.StyleClasses.Add(style.Class, style);
+            // TextBox border
+            style = Office2007ColorTableFactory.GetTextBoxStyle(factory.GetColor(metroColors.CanvasColorDarkShade));
+            table.StyleClasses.Add(style.Class, style);
+            // RichTextBox border
+            style = Office2007ColorTableFactory.GetRichTextBoxStyle(factory.GetColor(metroColors.CanvasColorDarkShade));
+            table.StyleClasses.Add(style.Class, style);
+            // ItemPanel
+            style = Office2007ColorTableFactory.GetItemPanelStyle(factory.GetColor(metroColors.CanvasColorDarkShade), factory.GetColor(metroColors.CanvasColor));
+            table.StyleClasses.Add(style.Class, style);
+            // ListBoxAdv
+            style = Office2007ColorTableFactory.GetListBoxAdvStyle(factory.GetColor(metroColors.CanvasColorDarkShade), factory.GetColor(metroColors.CanvasColor));
+            table.StyleClasses.Add(style.Class, style);
+            // DateTimeInput background
+            style = Office2007ColorTableFactory.GetDateTimeInputBackgroundStyle(factory.GetColor(metroColors.CanvasColorDarkShade), factory.GetColor(metroColors.CanvasColor));
+            table.StyleClasses.Add(style.Class, style);
+            // Ribbon Client Panel
+            style = Office2010BlueFactory.GetRibbonClientPanelStyle(factory, eOffice2010ColorScheme.Silver);
+            table.StyleClasses.Add(style.Class, style);
+            // ListView Border
+            style = Office2007ColorTableFactory.GetListViewBorderStyle(table.ListViewEx);
+            table.StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetStatusBarAltStyle(table.Bar);
+            table.StyleClasses.Add(style.Class, style);
+#if !NOTREE
+            // Tree Border/Background
+            style = Office2007ColorTableFactory.GetAdvTreeStyle(factory.GetColor(metroColors.CanvasColorDarkShade), factory.GetColor(metroColors.CanvasColor));
+            table.StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetAdvTreeColumnsHeaderStyle(factory.GetColor(metroColors.CanvasColorLighterShade), Color.Empty, factory.GetColor(metroColors.CanvasColorDarkShade));
+            table.StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetAdvTreeNodesColumnsHeaderStyle(factory.GetColor(metroColors.CanvasColorLighterShade), Color.Empty, factory.GetColor(metroColors.CanvasColorLighterShade));
+            table.StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetAdvTreeColumnStyle(factory.GetColor(metroColors.TextColor));
+            table.StyleClasses.Add(style.Class, style);
+            // CrumbBar
+            style = Office2007ColorTableFactory.GetCrumbBarBackgroundStyle(factory.GetColor(metroColors.CanvasColor), factory.GetColor(metroColors.CanvasColorLightShade), factory.GetColor(metroColors.CanvasColorDarkShade));
+            table.StyleClasses.Add(style.Class, style);
+#endif
+            // DataGridView border
+            style = Office2007ColorTableFactory.GetDataGridViewStyle();
+            table.StyleClasses.Add(style.Class, style);
+            // DataGridViewDateTime border
+            style = Office2007ColorTableFactory.GetDataGridViewDateTimeStyle();
+            table.StyleClasses.Add(style.Class, style);
+            // DataGridViewNumeric border
+            style = Office2007ColorTableFactory.GetDataGridViewNumericStyle();
+            table.StyleClasses.Add(style.Class, style);
+            // DataGridViewIpAddress border
+            style = Office2007ColorTableFactory.GetDataGridViewIpAddressStyle();
+            table.StyleClasses.Add(style.Class, style);
+
+            // Slide-out button
+            style = GetSlideOutButtonStyle(metroColors.ComplementColor);
+            table.StyleClasses.Add(style.Class, style);
+
+            // MetroTilePanel
+            style = Office2007ColorTableFactory.GetMetroTilePanelStyle(factory.GetColor(metroColors.CanvasColor));
+            table.StyleClasses.Add(style.Class, style);
+
+            // MetroTileGroup
+            style = Office2007ColorTableFactory.GetMetroTileGroupStyle(factory.GetColor(metroColors.TextColor));
+            table.StyleClasses.Add(style.Class, style);
+
+            // MonthCalendarAdv
+            style = Office2007ColorTableFactory.GetMonthCalendarStyle(factory.GetColor(metroColors.CanvasColor));
+            table.StyleClasses.Add(style.Class, style);
+
+            // ProgressSteps control
+            style = Office2007ColorTableFactory.GetProgressStepsStyle(table);
+            table.StyleClasses.Add(style.Class, style);
+
+            // SideNavStrip
+            style = Office2007ColorTableFactory.GetSideNavStripStyle(metroColors.BaseColor);
+            table.StyleClasses.Add(style.Class, style);
+
+            // TabFormPanel
+            style = Office2007ColorTableFactory.GetTabFormPanelStyle(ribbonBack);
+            table.StyleClasses.Add(style.Class, style);
+
+            style = Office2007ColorTableFactory.GetToolboxControlStyle(factory.GetColor(metroColors.CanvasColorDarkShade), Color.Empty);
+            table.StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetToolboxGroupTitle(factory.GetColor(metroColors.TextColor));
+            table.StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetToolboxGroupTitleMouseOver(factory.GetColor(metroColors.BaseColorLightText), factory.GetColor(metroColors.BaseColorLightest));
+            table.StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetToolboxGroupExpandedTitle(factory.GetColor(metroColors.BaseTextColor), factory.GetColor(metroColors.BaseColor));
+            table.StyleClasses.Add(style.Class, style);
+            #endregion
+
+            #region Contextual Label Colors
+            table.LabelItemColors.Clear();
+            table.LabelItemColors.Add(Office2007ColorTable.GetContextualKey(typeof(MetroStatusBar)), new LabelColors(factory.GetColor(metroColors.BaseTextColor), factory.GetColor(metroColors.TextDisabledColor)));
+            table.LabelItemColors.Add(Office2007ColorTable.GetContextualKey(typeof(Bar)), new LabelColors(factory.GetColor(metroColors.BaseTextColor), factory.GetColor(metroColors.TextDisabledColor)));
+            #endregion
+
+            InitAppButtonColors(table, factory, metroColors);
+
+            #region StepIndicator
+            table.StepIndicator.BackgroundColor = factory.GetColor(metroColors.CanvasColorLighterShade);
+            table.StepIndicator.IndicatorColor = factory.GetColor(Color.FromArgb(128, metroColors.ComplementColorLight));
+            #endregion
+
+            #region RadialMenu
+            table.RadialMenu = new RadialMenuColorTable();
+            table.RadialMenu.CircularBackColor = factory.GetColor(metroColors.ComplementColor);
+            table.RadialMenu.CircularBorderColor = factory.GetColor(0xFFFFFF);
+            table.RadialMenu.CircularForeColor = factory.GetColor(0xFFFFFF);
+            table.RadialMenu.RadialMenuBackground = factory.GetColor(metroColors.CanvasColor);
+            table.RadialMenu.RadialMenuBorder = factory.GetColor(metroColors.BaseColor);
+            table.RadialMenu.RadialMenuButtonBackground = factory.GetColor(metroColors.CanvasColor);
+            table.RadialMenu.RadialMenuButtonBorder = factory.GetColor(metroColors.BaseColor);
+            table.RadialMenu.RadialMenuExpandForeground = factory.GetColor(metroColors.CanvasColor);
+            table.RadialMenu.RadialMenuInactiveBorder = Color.FromArgb(128, table.RadialMenu.RadialMenuBorder);
+            table.RadialMenu.RadialMenuItemForeground = factory.GetColor(metroColors.BaseColor);
+            table.RadialMenu.RadialMenuItemDisabledForeground = factory.GetColor(metroColors.TextDisabledColor);
+            table.RadialMenu.RadialMenuItemMouseOverBackground = Color.FromArgb(72, table.RadialMenu.RadialMenuItemForeground);
+            table.RadialMenu.RadialMenuItemMouseOverForeground = factory.GetColor(metroColors.BaseColor);
+            table.RadialMenu.RadialMenuMouseOverBorder = Color.FromArgb(200, table.RadialMenu.RadialMenuBorder);
+            #endregion
+
+            #region StepItem
+            table.StepItem.Default = new OfficeStepItemStateColorTable(new Color[]{
+                    factory.GetColor(metroColors.CanvasColor)
+                    },
+                    90,
+                    new float[0],
+                factory.GetColor(metroColors.TextColor),
+                new Color[] {
+                    factory.GetColor(metroColors.CanvasColorDarkShade) });
+            table.StepItem.Progress = new OfficeStepItemStateColorTable(new Color[]{
+                    factory.GetColor(0xD8F577), 
+                    factory.GetColor(0x75C300),
+                    factory.GetColor(0x75C300),
+                    factory.GetColor(0xA9E923)
+                    },
+                    90,
+                    new float[] { 0f, .6f, .6f, 1f },
+                Color.Empty,
+                new Color[0]);
+            table.StepItem.MouseOver = new OfficeStepItemStateColorTable(new Color[]{
+                    factory.GetColor(metroColors.CanvasColorLight)
+                    },
+                    90,
+                    new float[0],
+                factory.GetColor(metroColors.TextColor),
+                new Color[] {
+                    factory.GetColor(metroColors.CanvasColorLight) });
+            table.StepItem.Pressed = new OfficeStepItemStateColorTable(new Color[]{
+                    factory.GetColor(metroColors.BaseColor)
+                    },
+                    90,
+                    new float[0],
+                factory.GetColor(metroColors.BaseTextColor),
+                new Color[] {
+                    factory.GetColor(metroColors.BaseColor) });
+            #endregion
+
+            #region TokenEditor
+            table.TokenEditor = new TokenEditorColorTable(metroColors.TextColor, metroColors.CanvasColorLighterShade, metroColors.TextColor, metroColors.CanvasColorLightShade, metroColors.BaseTextColor, metroColors.BaseColor);
+            #endregion
+
+            #region Flyout
+            table.Flyout.BorderColor = metroColors.BaseColor;
+            table.Flyout.BackColor = metroColors.CanvasColor;
+            #endregion
+
+            #region SideNav
+            table.SideNav.SideNavItem.Default = new SideNavItemStateColorTable(factory.GetColor(metroColors.BaseTextColor));
+            table.SideNav.SideNavItem.MouseOver = new SideNavItemStateColorTable(factory.GetColor(metroColors.BaseColorLightText),
+                new Color[]
+                {
+                    factory.GetColor(metroColors.BaseColorLight)
+                },
+                new Color[] { factory.GetColor(metroColors.BaseColorLight) },
+                0);
+            table.SideNav.SideNavItem.Pressed = new SideNavItemStateColorTable(factory.GetColor(metroColors.BaseColorLightText),
+                new Color[]
+                {
+                    factory.GetColor(metroColors.BaseColorDark)
+                },
+                new Color[] { factory.GetColor(metroColors.BaseColorDark) },
+                0);
+            table.SideNav.SideNavItem.Selected = new SideNavItemStateColorTable(factory.GetColor(metroColors.TextColor),
+                new Color[] { factory.GetColor(metroColors.CanvasColor) },
+                new Color[] { Color.Empty, factory.GetColor(metroColors.CanvasColor), Color.Empty, factory.GetColor(metroColors.CanvasColor) });
+            table.SideNav.BorderColors = new Color[] { factory.GetColor(metroColors.BaseColor) };
+            table.SideNav.TitleBackColor = factory.GetColor(metroColors.BaseColorDark);
+            table.SideNav.TitleBorderColors = new Color[] { Color.Empty, Color.Empty, Color.Empty, factory.GetColor(metroColors.BaseColor) };
+            table.SideNav.PanelBackColor = table.Form.BackColor;
+
+            #endregion
+
+            #region TabForm
+            table.TabForm.CaptionTextFormat|= eTextFormat.HorizontalCenter;
+            table.TabForm.Active.CaptionText = factory.GetColor(metroColors.BaseTextColor);
+            table.TabForm.Inactive.CaptionText = factory.GetColor(metroColors.BaseTextColor);
+            table.TabForm.Active.CaptionBackColors = new Color[] { factory.GetColor(metroColors.BaseColor) };
+            table.TabForm.Inactive.CaptionBackColors = new Color[] { factory.GetColor(metroColors.BaseColor) };
+            table.TabFormItemColorTables.Clear();
+            table.TabFormItemColorTables.Add(TabFormItem.DefaultColorTableKey,
+                Office2007ColorTable.CreateDefaultTabFormItemColorTable(factory,
+                new Color[] { factory.GetColor(metroColors.CanvasColorLighterShade) },
+                new Color[] { factory.GetColor(metroColors.CanvasColorLightShade) },
+                factory.GetColor(metroColors.TextLightColor),
+                new Color[] { factory.GetColor(ribbonBack) },
+                new Color[] { factory.GetColor(metroColors.CanvasColorLightShade) },
+                factory.GetColor(metroColors.BaseColor)
+                ));
+            table.TabFormItemColorTables.Add(TabFormItem.BlueColorTableKey, Office2007ColorTable.CreateBlueTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.YellowColorTableKey, Office2007ColorTable.CreateYellowTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.PurpleColorTableKey, Office2007ColorTable.CreatePurpleTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.CyanColorTableKey, Office2007ColorTable.CreateCyanTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.BlueMistColorTableKey, Office2007ColorTable.CreateBlueMistTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.PurpleMistColorTableKey, Office2007ColorTable.CreatePurpleMistTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.TanColorTableKey, Office2007ColorTable.CreateTanTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.LemonLimeColorTableKey, Office2007ColorTable.CreateLemonLimeTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.AppleColorTableKey, Office2007ColorTable.CreateAppleTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.TealColorTableKey, Office2007ColorTable.CreateTealTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.RedChalkColorTableKey, Office2007ColorTable.CreateRedChalkTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.SilverColorTableKey, Office2007ColorTable.CreateSilverTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.OrangeColorTableKey, Office2007ColorTable.CreateOrangeTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.GreenColorTableKey, Office2007ColorTable.CreateGreenTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.MagentaColorTableKey, Office2007ColorTable.CreateMagentaTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.RedColorTableKey, Office2007ColorTable.CreateRedTabFormItemColorTable(factory));
+            #endregion
+
+        }
+        #region Application Button Colors
+        private static Office2007ButtonItemColorTable FallBackAppButtonColorTable = null;
+        internal static Office2007ButtonItemColorTable GetAppFallBackColorTable()
+        {
+            if (FallBackAppButtonColorTable != null) return FallBackAppButtonColorTable;
+
+            MetroPartColors metroColors = VisualStudio2012ColorTableInitializer.CreateMetroPartColors(MetroColorGeneratorParameters.Default.CanvasColor, MetroColorGeneratorParameters.Default.BaseColor);
+            // Blue default
+            Office2007ButtonItemColorTable table = new Office2007ButtonItemColorTable();
+            table.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Orange);
+
+            Office2007ButtonItemStateColorTable ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(metroColors.BaseColor);
+            ct.BottomBackgroundHighlight = LinearGradientColorTable.Empty;
+            ct.OuterBorder = LinearGradientColorTable.Empty;
+            ct.InnerBorder = LinearGradientColorTable.Empty;
+            ct.Text = metroColors.BaseTextColor;
+            table.Default = ct;
+
+            ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(metroColors.BaseColorLight1);
+            ct.BottomBackgroundHighlight = LinearGradientColorTable.Empty;
+            ct.OuterBorder = LinearGradientColorTable.Empty;
+            ct.InnerBorder = LinearGradientColorTable.Empty;
+            ct.Text = metroColors.BaseTextColor;
+            table.MouseOver = ct;
+
+            ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(metroColors.BaseColorDark);
+            ct.BottomBackgroundHighlight = LinearGradientColorTable.Empty;
+            ct.OuterBorder = LinearGradientColorTable.Empty;
+            ct.InnerBorder = LinearGradientColorTable.Empty;
+            ct.Text = metroColors.BaseTextColor;
+            table.Pressed = ct;
+
+            table.Expanded = table.Pressed;
+            table.Checked = table.Pressed;
+
+            FallBackAppButtonColorTable = table;
+
+            return table;
+        }
+        internal static void InitAppButtonColors(Office2007ColorTable colorTable, ColorFactory factory, MetroPartColors metroColors)
+        {
+            Office2007ButtonItemColorTableCollection colors = colorTable.ApplicationButtonColors;
+            colors.Clear();
+
+            // Blue default
+            Office2007ButtonItemColorTable table = new Office2007ButtonItemColorTable();
+            table.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Orange);
+
+            Office2007ButtonItemStateColorTable ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            ct.BottomBackgroundHighlight = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(32, 0xFFFFFF), Color.Transparent);
+            ct.OuterBorder = LinearGradientColorTable.Empty; //new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            ct.InnerBorder = LinearGradientColorTable.Empty; //new LinearGradientColorTable(factory.GetColor(16, 0xFFFFFF));
+            ct.Text = factory.GetColor(metroColors.BaseTextColor);
+            table.Default = ct;
+
+            ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight1));
+            ct.BottomBackgroundHighlight = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(82, 0xFFFFFF), Color.Transparent);
+            ct.OuterBorder = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            ct.InnerBorder = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(72, 0xFFFFFF), factory.GetColor(48, 0xFFFFFF)); //new LinearGradientColorTable(factory.GetColor(0x55A1F3), factory.GetColor(0x4F9EEE));
+            ct.Text = factory.GetColor(metroColors.BaseTextColor);
+            table.MouseOver = ct;
+
+            ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            ct.BottomBackgroundHighlight = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(82, 0xFFFFFF), Color.Transparent);
+            ct.OuterBorder = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDarker));
+            ct.InnerBorder = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(72, 0xFFFFFF), factory.GetColor(48, 0xFFFFFF)); //new LinearGradientColorTable(factory.GetColor(0x55A1F3), factory.GetColor(0x4F9EEE));
+            ct.Text = factory.GetColor(metroColors.BaseTextColor);
+            table.Pressed = ct;
+
+            table.Expanded = table.MouseOver;
+            table.Checked = table.Pressed;
+
+            colors.Add(table);
+
+            // Magenta
+            table = new Office2007ButtonItemColorTable();
+            table.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Magenta);
+
+            ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(factory.GetColor(0xCC256B), factory.GetColor(0xB10851));
+            ct.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(64, 0xFFFFFF), Color.Transparent);
+            ct.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x8F013C), factory.GetColor(0x940741));
+            ct.InnerBorder = new LinearGradientColorTable(factory.GetColor(32, 0xFFFFFF));
+            ct.Text = factory.GetColor(0xFFFFFF);
+            table.Default = ct;
+
+            ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(factory.GetColor(0xD63272), factory.GetColor(0xB10B52));
+            ct.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(82, 0xFFFFFF), Color.Transparent);
+            ct.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x8F013C), factory.GetColor(0x950942));
+            ct.InnerBorder = new LinearGradientColorTable(factory.GetColor(72, 0xFFFFFF), factory.GetColor(48, 0xFFFFFF)); //new LinearGradientColorTable(factory.GetColor(0x55A1F3), factory.GetColor(0x4F9EEE));
+            ct.Text = factory.GetColor(0xFFFFFF);
+            table.MouseOver = ct;
+
+            ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(factory.GetColor(0xB50C53), factory.GetColor(0xB00B52));
+            ct.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(82, 0xFFFFFF), Color.Transparent);
+            ct.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x8F013D), factory.GetColor(0x950741));
+            ct.InnerBorder = new LinearGradientColorTable(factory.GetColor(72, 0xFFFFFF), factory.GetColor(48, 0xFFFFFF)); //new LinearGradientColorTable(factory.GetColor(0x55A1F3), factory.GetColor(0x4F9EEE));
+            ct.Text = factory.GetColor(0xFFFFFF);
+            table.Pressed = ct;
+
+            table.Expanded = table.MouseOver;
+            table.Checked = table.Pressed;
+
+            colors.Add(table);
+
+            // Orange
+            table = new Office2007ButtonItemColorTable();
+            table.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Blue);
+
+            ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(factory.GetColor(0xF27350), factory.GetColor(0xE5552F));
+            ct.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xF89E42), Color.Transparent);
+            ct.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xCC2B12), factory.GetColor(0xCF3415));
+            ct.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xF68954), factory.GetColor(0xF78B3E));
+            ct.Text = factory.GetColor(0xFFFFFF);
+            table.Default = ct;
+
+            ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(factory.GetColor(0xF87E4D), factory.GetColor(0xE6552E));
+            ct.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xFBBD5E), Color.Transparent);
+            ct.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xCA2810), factory.GetColor(0xCD3217));
+            ct.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFBAA5A), factory.GetColor(0xFCB857)); //new LinearGradientColorTable(factory.GetColor(0x55A1F3), factory.GetColor(0x4F9EEE));
+            ct.Text = factory.GetColor(0xFFFFFF);
+            table.MouseOver = ct;
+
+            ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(factory.GetColor(0xE3531D), factory.GetColor(0xE04E19));
+            ct.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xFDAF4C), Color.Transparent);
+            ct.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xCA2810), factory.GetColor(0xCD3013));
+            ct.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xE86229), factory.GetColor(0xFB8D44)); //new LinearGradientColorTable(factory.GetColor(0x55A1F3), factory.GetColor(0x4F9EEE));
+            ct.Text = factory.GetColor(0xFFFFFF);
+            table.Pressed = ct;
+
+            table.Expanded = table.MouseOver;
+            table.Checked = table.Pressed;
+
+            colors.Add(table);
+
+            // Green
+            table = new Office2007ButtonItemColorTable();
+            table.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.BlueWithBackground);
+
+            ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(factory.GetColor(0x459731), factory.GetColor(0x2B7F2C));
+            ct.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0x6BCA45), Color.Transparent);
+            ct.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x186337), factory.GetColor(0x1E6A39));
+            ct.InnerBorder = new LinearGradientColorTable(factory.GetColor(0x4CA231), factory.GetColor(0x53B331));
+            ct.Text = factory.GetColor(0xFFFFFF);
+            table.Default = ct;
+
+            ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(factory.GetColor(0x469734), factory.GetColor(0x267C2B));
+            ct.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0x89D668), Color.Transparent);
+            ct.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x196437), factory.GetColor(0x216B3C));
+            ct.InnerBorder = new LinearGradientColorTable(factory.GetColor(0x65B943), factory.GetColor(0x70CC4A));
+            ct.Text = factory.GetColor(0xFFFFFF);
+            table.MouseOver = ct;
+
+            ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(factory.GetColor(0x2F822A), factory.GetColor(0x2A7E2C));
+            ct.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0x68CB38), Color.Transparent);
+            ct.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x186437), factory.GetColor(0x1D6A38));
+            ct.InnerBorder = new LinearGradientColorTable(factory.GetColor(0x368F2B), factory.GetColor(0x59BD2D)); //new LinearGradientColorTable(factory.GetColor(0x55A1F3), factory.GetColor(0x4F9EEE));
+            ct.Text = factory.GetColor(0xFFFFFF);
+            table.Pressed = ct;
+
+            table.Expanded = table.MouseOver;
+            table.Checked = table.Pressed;
+
+            colors.Add(table);
+
+            // Teal
+            table = new Office2007ButtonItemColorTable();
+            table.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.MagentaWithBackground);
+
+            ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(factory.GetColor(0x159795), factory.GetColor(0x018281));
+            ct.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0x20B7B4), Color.Transparent);
+            ct.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x055E5E), factory.GetColor(0x076464));
+            ct.InnerBorder = new LinearGradientColorTable(factory.GetColor(0x1BA29D), factory.GetColor(0x1FB1A9));
+            ct.Text = factory.GetColor(0xFFFFFF);
+            table.Default = ct;
+
+            ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(factory.GetColor(0x1F9C99), factory.GetColor(0x038584));
+            ct.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0x36CDCA), Color.Transparent);
+            ct.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x055E5E), factory.GetColor(0x096767));
+            ct.InnerBorder = new LinearGradientColorTable(factory.GetColor(0x30B8B3), factory.GetColor(0x34C2BE));
+            ct.Text = factory.GetColor(0xFFFFFF);
+            table.MouseOver = ct;
+
+            ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(factory.GetColor(0x028482), factory.GetColor(0x028081));
+            ct.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0x2CC2BE), Color.Transparent);
+            ct.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x055E5E), factory.GetColor(0x086565));
+            ct.InnerBorder = new LinearGradientColorTable(factory.GetColor(0x028F8D), factory.GetColor(0x1DB4AD)); //new LinearGradientColorTable(factory.GetColor(0x55A1F3), factory.GetColor(0x4F9EEE));
+            ct.Text = factory.GetColor(0xFFFFFF);
+            table.Pressed = ct;
+
+            table.Expanded = table.MouseOver;
+            table.Checked = table.Pressed;
+
+            colors.Add(table);
+        }
+        #endregion
+
+        #region RibbonBar
+        public static Office2007RibbonBarStateColorTable GetRibbonBar(ColorFactory factory, MetroPartColors metroColors, Color ribbonBack)
+        {
+            Office2007RibbonBarStateColorTable rb = new Office2007RibbonBarStateColorTable();
+            rb.TopBackgroundHeight = 0.8f;
+            rb.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColorLightShade));
+            rb.InnerBorder = LinearGradientColorTable.Empty;// new LinearGradientColorTable(factory.GetColor(factory.GetColor(180, Color.White)), factory.GetColor(120, 0xFFFFFF));
+            rb.TopBackground = new LinearGradientColorTable(ribbonBack);
+            rb.BottomBackground = null; // new LinearGradientColorTable(factory.GetColor(0xF6F7F8), factory.GetColor(0xE5E9EE));
+            rb.TitleBackground = null;// new LinearGradientColorTable(factory.GetColor(0xC2D8F1), factory.GetColor(0xC0D8EF));
+            rb.TitleText = factory.GetColor(metroColors.TextColor);
+            return rb;
+        }
+
+        public static Office2007RibbonBarStateColorTable GetRibbonBarMouseOver(ColorFactory factory, MetroPartColors metroColors, Color ribbonBack)
+        {
+            return GetRibbonBar(factory, metroColors, ribbonBack);
+            //Office2007RibbonBarStateColorTable rb = new Office2007RibbonBarStateColorTable();
+            //rb.TopBackgroundHeight = 0.8f;
+            //rb.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xEFF1F2), factory.GetColor(0xCDD2D7));
+            //rb.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFFFFFF), factory.GetColor(120, 0xFFFFFF));
+            //rb.TopBackground = new LinearGradientColorTable(factory.GetColor(0xFEFEFE), factory.GetColor(0xDEE4EB));
+            //rb.BottomBackground = null;// new LinearGradientColorTable(factory.GetColor(0xC7D8ED), factory.GetColor(0xD8E8F5));
+            //rb.TitleBackground = new LinearGradientColorTable(factory.GetColor(0xF8FAFB), Color.Transparent);
+            //rb.TitleText = factory.GetColor(0x565F6D);
+            //return rb;
+        }
+
+        public static Office2007RibbonBarStateColorTable GetRibbonBarExpanded(ColorFactory factory, MetroPartColors metroColors, Color ribbonBack)
+        {
+            Office2007RibbonBarStateColorTable rb = new Office2007RibbonBarStateColorTable();
+            rb.TopBackgroundHeight = 15;
+            rb.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor), factory.GetColor(metroColors.CanvasColorLightShade));
+            rb.InnerBorder = new LinearGradientColorTable(factory.GetColor(factory.GetColor(180, Color.White)), factory.GetColor(120, 0xFFFFFF));
+            rb.TopBackground = new LinearGradientColorTable(ribbonBack);
+            rb.BottomBackground = null;// new LinearGradientColorTable(factory.GetColor(0xC7D8ED), factory.GetColor(0xD8E8F5));
+            rb.TitleBackground = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColorLighterShade), Color.Transparent);
+            rb.TitleText = Color.Empty;
+            return rb;
+        }
+        #endregion
+
+        #region CheckBoxItem
+        private static Office2007CheckBoxColorTable GetCheckBoxItem(ColorFactory factory, MetroPartColors metroColors)
+        {
+            Office2007CheckBoxColorTable chk = new Office2007CheckBoxColorTable();
+
+            chk.Default.CheckBackground = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor), Color.Empty);
+            chk.Default.CheckBorder = factory.GetColor(metroColors.TextDisabledColor);
+            chk.Default.CheckInnerBackground = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor));
+            chk.Default.CheckInnerBorder = factory.GetColor(metroColors.CanvasColor);
+            chk.Default.CheckSign = new LinearGradientColorTable(factory.GetColor(metroColors.TextLightColor), Color.Empty);
+            chk.Default.Text = factory.GetColor(metroColors.TextColor);
+
+            chk.MouseOver.CheckBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLightest), Color.Empty);
+            chk.MouseOver.CheckBorder = factory.GetColor(metroColors.BaseColorLight);
+            chk.MouseOver.CheckInnerBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLightest));
+            chk.MouseOver.CheckInnerBorder = factory.GetColor(metroColors.BaseColorLightest);
+            chk.MouseOver.CheckSign = new LinearGradientColorTable(factory.GetColor(metroColors.TextColor), Color.Empty);
+            chk.MouseOver.Text = factory.GetColor(metroColors.TextColor);
+
+            chk.Pressed.CheckBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight));
+            chk.Pressed.CheckBorder = factory.GetColor(metroColors.BaseColorLight);
+            chk.Pressed.CheckInnerBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight));
+            chk.Pressed.CheckInnerBorder = factory.GetColor(metroColors.BaseColorLight);
+            chk.Pressed.CheckSign = new LinearGradientColorTable(factory.GetColor(metroColors.TextColor), Color.Empty);
+            chk.Pressed.Text = factory.GetColor(metroColors.TextColor);
+
+            chk.Disabled.CheckBackground = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor), Color.Empty);
+            chk.Disabled.CheckBorder = factory.GetColor(metroColors.CanvasColorLightShade);
+            chk.Disabled.CheckInnerBackground = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor));
+            chk.Disabled.CheckInnerBorder = Color.Empty; // factory.GetColor(metroColors.CanvasColorLightShade);
+            chk.Disabled.CheckSign = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColorDarkShade), Color.Empty);
+            chk.Disabled.Text = factory.GetColor(metroColors.CanvasColorDarkShade);
+
+            return chk;
+        }
+        #endregion
+
+        #region Buttons
+        private static Office2007ButtonItemColorTable GetButtonItemBackstageDefault(ColorFactory factory, MetroPartColors metroColors)
+        {
+            Office2007ButtonItemColorTable cb = new Office2007ButtonItemColorTable();
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Blue);
+            cb.Default = new Office2007ButtonItemStateColorTable();
+            cb.Default.Text = factory.GetColor(metroColors.BaseTextColor);
+
+            // Button mouse over
+            cb.MouseOver = new Office2007ButtonItemStateColorTable();
+            cb.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            cb.MouseOver.InnerBorder = LinearGradientColorTable.Empty;
+            cb.MouseOver.TopBackground = null;
+            cb.MouseOver.TopBackgroundHighlight = null;
+            cb.MouseOver.BottomBackground = null;
+            cb.MouseOver.BottomBackgroundHighlight = null;
+            cb.MouseOver.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            cb.MouseOver.SplitBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark), Color.Empty);
+            cb.MouseOver.SplitBorderLight = LinearGradientColorTable.Empty;
+            cb.MouseOver.Text = factory.GetColor(metroColors.BaseTextColor);
+
+            cb.MouseOverSplitInactive = new Office2007ButtonItemStateColorTable();
+            cb.MouseOverSplitInactive.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x527DE0));
+
+            // Pressed
+            cb.Pressed = new Office2007ButtonItemStateColorTable();
+            cb.Pressed.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            cb.Pressed.InnerBorder = new LinearGradientColorTable(factory.GetColor(192, 0xFFFFFF));
+            cb.Pressed.TopBackground = new LinearGradientColorTable(factory.GetColor(32, metroColors.BaseColor));
+            cb.Pressed.TopBackgroundHighlight = LinearGradientColorTable.Empty; //new LinearGradientColorTable(Color.FromArgb(192, Color.White), Color.Transparent);
+            cb.Pressed.BottomBackground = new LinearGradientColorTable(factory.GetColor(32, metroColors.BaseColor));
+            cb.Pressed.BottomBackgroundHighlight = LinearGradientColorTable.Empty;
+            cb.Pressed.SplitBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor), Color.Empty);
+            cb.Pressed.SplitBorderLight = new LinearGradientColorTable(factory.GetColor(135, 0xFFFFFF), Color.Empty);
+            cb.Pressed.Text = factory.GetColor(metroColors.TextColor);
+
+            // Checked
+            cb.Checked = cb.Pressed;
+
+            // Expanded button
+            cb.Expanded = cb.MouseOver;
+
+            SetBlueExpandColors(cb, factory);
+
+            return cb;
+        }
+        public static Office2007ButtonItemColorTable GetButtonItemDefault(ColorFactory factory, MetroPartColors metroColors)
+        {
+            Office2007ButtonItemColorTable cb = new Office2007ButtonItemColorTable();
+            cb.Default = new Office2007ButtonItemStateColorTable();
+            cb.Default.Text = factory.GetColor(metroColors.TextColor);
+
+            // Button mouse over
+            cb.MouseOver = new Office2007ButtonItemStateColorTable();
+            cb.MouseOver.TopBackground = null;
+            cb.MouseOver.TopBackgroundHighlight = null;
+            cb.MouseOver.BottomBackground = null;
+            cb.MouseOver.BottomBackgroundHighlight = null;
+            cb.MouseOver.Background = new LinearGradientColorTable(metroColors.CanvasColorLightShade);
+            cb.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColorLightShade));// LinearGradientColorTable.Empty;
+            cb.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColorDarkShade));
+            cb.MouseOver.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.MouseOver.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.MouseOver.Text = factory.GetColor(metroColors.TextColor);
+            //cb.MouseOver = new Office2007ButtonItemStateColorTable();
+            //cb.MouseOver.TopBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseButtonGradientStart));
+            //cb.MouseOver.TopBackgroundHighlight = LinearGradientColorTable.Empty;
+            //cb.MouseOver.BottomBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseButtonGradientEnd));
+            //cb.MouseOver.BottomBackgroundHighlight = LinearGradientColorTable.Empty;
+            //cb.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDarker));
+            //cb.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            //cb.MouseOver.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            //cb.MouseOver.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            //cb.MouseOver.Text = factory.GetColor(metroColors.TextColor);
+
+
+            cb.MouseOverSplitInactive = new Office2007ButtonItemStateColorTable();
+            cb.MouseOverSplitInactive.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor));
+
+            // Pressed
+            cb.Pressed = new Office2007ButtonItemStateColorTable();
+            cb.Pressed.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColorDarkerShade));
+            cb.Pressed.InnerBorder = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColorDarkerShade));
+            cb.Pressed.Background = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColorDarkerShade));
+            cb.Pressed.TopBackground = null;
+            cb.Pressed.TopBackgroundHighlight = null;
+            cb.Pressed.BottomBackground = null;
+            cb.Pressed.BottomBackgroundHighlight = null;
+            cb.Pressed.SplitBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight));
+            cb.Pressed.SplitBorderLight = LinearGradientColorTable.Empty;//(factory.GetColor(metroColors.BaseColorLight), Color.Empty);
+            cb.Pressed.Text = factory.GetColor(metroColors.TextColor);
+            //cb.Pressed = new Office2007ButtonItemStateColorTable();
+            //cb.Pressed.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            //cb.Pressed.InnerBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDarker));
+            //cb.Pressed.TopBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight));
+            //cb.Pressed.TopBackgroundHighlight = LinearGradientColorTable.Empty;
+            //cb.Pressed.BottomBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            //cb.Pressed.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(Color.FromArgb(48, Color.White)), Color.Transparent);
+            //cb.Pressed.SplitBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            //cb.Pressed.SplitBorderLight = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight), Color.Empty);
+            //cb.Pressed.Text = factory.GetColor(metroColors.BaseTextColor);
+
+            // Checked
+            cb.Checked = new Office2007ButtonItemStateColorTable();
+            cb.Checked.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColorDarkerShade));
+            cb.Checked.InnerBorder = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColorDarkShade));
+            cb.Checked.Background = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColorDarkShade));
+            cb.Checked.TopBackground = null; //new LinearGradientColorTable(metroColors.BaseColorLight);
+            cb.Checked.TopBackgroundHighlight = null; //LinearGradientColorTable.Empty;
+            cb.Checked.BottomBackground = null; // new LinearGradientColorTable(metroColors.BaseColorLight);
+            cb.Checked.BottomBackgroundHighlight = null; // new LinearGradientColorTable(factory.GetColor("20FFFFFF"), Color.Transparent);
+            cb.Checked.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Checked.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Checked.Text = factory.GetColor(metroColors.BaseColorLightText);
+            //cb.Checked = new Office2007ButtonItemStateColorTable();
+            //cb.Checked.OuterBorder = new LinearGradientColorTable(metroColors.BaseColorDark);
+            //cb.Checked.InnerBorder = new LinearGradientColorTable(metroColors.BaseColorDarker);
+            //cb.Checked.TopBackground = new LinearGradientColorTable(metroColors.BaseColorLight);
+            //cb.Checked.TopBackgroundHighlight = LinearGradientColorTable.Empty;
+            //cb.Checked.BottomBackground = new LinearGradientColorTable(metroColors.BaseColorLight);
+            //cb.Checked.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor("20FFFFFF"), Color.Transparent);
+            //cb.Checked.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            //cb.Checked.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            //cb.Checked.Text = factory.GetColor(metroColors.BaseColorLightText);
+
+            // Expanded button
+            cb.Expanded = new Office2007ButtonItemStateColorTable();
+            cb.Expanded.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            cb.Expanded.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            cb.Expanded.InnerBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            cb.Expanded.TopBackground = null; // new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight));
+            cb.Expanded.TopBackgroundHighlight = null; // LinearGradientColorTable.Empty;
+            cb.Expanded.BottomBackground = null; // new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            cb.Expanded.BottomBackgroundHighlight = null; // new LinearGradientColorTable(factory.GetColor(Color.FromArgb(92, Color.White)), Color.Transparent);
+            cb.Expanded.SplitBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            cb.Expanded.SplitBorderLight = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight), Color.Empty);
+            cb.Expanded.Text = factory.GetColor(metroColors.BaseTextColor);
+
+            SetBlueExpandColors(cb, factory);
+
+            return cb;
+        }
+
+        public static Office2007ButtonItemColorTable GetButtonItemDefaultWithBackground(ColorFactory factory, MetroPartColors metroColors)
+        {
+            Office2007ButtonItemColorTable cb = GetButtonItemDefault(factory, metroColors);
+
+            cb.Default.TopBackground = null; // new LinearGradientColorTable(factory.GetColor(metroColors.BaseButtonGradientStart));
+            cb.Default.TopBackgroundHighlight = null;// LinearGradientColorTable.Empty;
+            cb.Default.BottomBackground = null; // new LinearGradientColorTable(factory.GetColor(metroColors.BaseButtonGradientEnd));
+            cb.Default.BottomBackgroundHighlight = null; // LinearGradientColorTable.Empty;
+            cb.Default.Background = new LinearGradientColorTable(metroColors.CanvasColor);
+            cb.Default.InnerBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColorDarkShade));
+            cb.Default.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.MouseOverSplitInactive = cb.Default;
+
+            // Same as default
+            cb.Disabled = new Office2007ButtonItemStateColorTable();
+            cb.Disabled.TopBackground = null;
+            cb.Disabled.TopBackgroundHighlight = null; // new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.BottomBackground = null; // LinearGradientColorTable.Empty;
+            cb.Disabled.BottomBackgroundHighlight = null; // new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.Background = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor));
+            cb.Disabled.InnerBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColorLightShade), Color.Empty);
+            cb.Disabled.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.Text = factory.GetColor(metroColors.CanvasColorLightShade);
+            return cb;
+        }
+
+        public static Office2007ButtonItemColorTable GetButtonItemBlue(ColorFactory factory, MetroPartColors metroColors)
+        {
+            Office2007ButtonItemColorTable cb = new Office2007ButtonItemColorTable();
+            cb.Default = new Office2007ButtonItemStateColorTable();
+            cb.Default.Text = factory.GetColor(metroColors.TextColor);
+
+            // Button mouse over
+            cb.MouseOver = new Office2007ButtonItemStateColorTable();
+            cb.MouseOver.TopBackground = null; // new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight));
+            cb.MouseOver.TopBackgroundHighlight = null;// LinearGradientColorTable.Empty;
+            cb.MouseOver.BottomBackground = null; // new LinearGradientColorTable(factory.GetColor(metroColors.BaseButtonGradientEnd));
+            cb.MouseOver.BottomBackgroundHighlight = null;// LinearGradientColorTable.Empty;
+            cb.MouseOver.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight));
+            cb.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            cb.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            cb.MouseOver.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.MouseOver.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.MouseOver.Text = factory.GetColor(metroColors.BaseColorLightText);
+
+            cb.MouseOverSplitInactive = new Office2007ButtonItemStateColorTable();
+            cb.MouseOverSplitInactive.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+
+            // Pressed
+            cb.Pressed = new Office2007ButtonItemStateColorTable();
+            cb.Pressed.OuterBorder = new LinearGradientColorTable(metroColors.BaseColorDarker);
+            cb.Pressed.InnerBorder = new LinearGradientColorTable(metroColors.BaseColorDark);
+            cb.Pressed.TopBackground = null;// new LinearGradientColorTable(factory.GetColor("DAF6FF"));
+            cb.Pressed.TopBackgroundHighlight = null; // LinearGradientColorTable.Empty;
+            cb.Pressed.BottomBackground = null;// new LinearGradientColorTable(factory.GetColor("A7E8FF"));
+            cb.Pressed.BottomBackgroundHighlight = null; // new LinearGradientColorTable(factory.GetColor(Color.FromArgb(48, Color.White)), Color.Transparent);
+            cb.Pressed.Background = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor));
+            cb.Pressed.SplitBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            cb.Pressed.SplitBorderLight = LinearGradientColorTable.Empty;
+            cb.Pressed.Text = factory.GetColor(metroColors.TextColor);
+
+            // Checked
+            cb.Checked = new Office2007ButtonItemStateColorTable();
+            cb.Checked.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            cb.Checked.InnerBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            cb.Checked.TopBackground = null;  // new LinearGradientColorTable(factory.GetColor("A7E8FF"));
+            cb.Checked.TopBackgroundHighlight = null; // LinearGradientColorTable.Empty;
+            cb.Checked.BottomBackground = null; // new LinearGradientColorTable(factory.GetColor("A7E8FF"));
+            cb.Checked.BottomBackgroundHighlight = null; // new LinearGradientColorTable(factory.GetColor("20FFFFFF"), Color.Transparent);
+            cb.Checked.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            cb.Checked.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Checked.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Checked.Text = factory.GetColor(metroColors.BaseTextColor);
+
+            // Expanded button
+            cb.Expanded = new Office2007ButtonItemStateColorTable();
+            cb.Expanded.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            cb.Expanded.InnerBorder = LinearGradientColorTable.Empty;
+            cb.Expanded.TopBackground = null; // new LinearGradientColorTable(factory.GetColor("DAF6FF"));
+            cb.Expanded.TopBackgroundHighlight = null; // LinearGradientColorTable.Empty;
+            cb.Expanded.BottomBackground = null; // new LinearGradientColorTable(factory.GetColor("A7E8FF"));
+            cb.Expanded.BottomBackgroundHighlight = null; // new LinearGradientColorTable(factory.GetColor(Color.FromArgb(48, Color.White)), Color.Transparent);
+            cb.Expanded.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            cb.Expanded.SplitBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            cb.Expanded.SplitBorderLight = LinearGradientColorTable.Empty; //(factory.GetColor("A000BFFF"), Color.Empty);
+            cb.Expanded.Text = factory.GetColor(metroColors.BaseTextColor);
+
+            SetBlueExpandColors(cb, factory);
+
+            return cb;
+        }
+
+        public static Office2007ButtonItemColorTable GetButtonItemBlueWithBackground(ColorFactory factory, MetroPartColors metroColors)
+        {
+            Office2007ButtonItemColorTable cb = GetButtonItemBlue(factory, metroColors);
+
+            cb.Default.TopBackground = null; //new LinearGradientColorTable(factory.GetColor(metroColors.BaseButtonGradientStart));
+            cb.Default.TopBackgroundHighlight = null;// LinearGradientColorTable.Empty;
+            cb.Default.BottomBackground = null;// new LinearGradientColorTable(factory.GetColor(metroColors.BaseButtonGradientEnd));
+            cb.Default.BottomBackgroundHighlight = null;// LinearGradientColorTable.Empty;
+            cb.Default.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            cb.Default.InnerBorder = LinearGradientColorTable.Empty;
+            cb.Default.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            cb.Default.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.Text = factory.GetColor(metroColors.BaseTextColor);
+            cb.MouseOverSplitInactive = cb.Default;
+
+            // Same as default
+            cb.Disabled = new Office2007ButtonItemStateColorTable();
+            cb.Disabled.TopBackground = null;
+            cb.Disabled.TopBackgroundHighlight = null;
+            cb.Disabled.BottomBackground = null;
+            cb.Disabled.BottomBackgroundHighlight = null;
+            cb.Disabled.Background = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor));
+            cb.Disabled.InnerBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColorLightShade), Color.Empty);
+            cb.Disabled.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.Text = factory.GetColor(metroColors.CanvasColorLightShade);
+            return cb;
+        }
+
+        public static Office2007ButtonItemColorTable GetButtonItemMagenta(ColorFactory factory, MetroPartColors metroColors)
+        {
+            Office2007ButtonItemColorTable cb = new Office2007ButtonItemColorTable();
+            cb.Default = new Office2007ButtonItemStateColorTable();
+            cb.Default.Text = factory.GetColor(metroColors.TextColor);
+
+            // Button mouse over
+            cb.MouseOver = new Office2007ButtonItemStateColorTable();
+            cb.MouseOver.TopBackground = null; // new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight));
+            cb.MouseOver.TopBackgroundHighlight = null;// LinearGradientColorTable.Empty;
+            cb.MouseOver.BottomBackground = null; // new LinearGradientColorTable(factory.GetColor(metroColors.BaseButtonGradientEnd));
+            cb.MouseOver.BottomBackgroundHighlight = null;// LinearGradientColorTable.Empty;
+            cb.MouseOver.Background = new LinearGradientColorTable(factory.GetColor(metroColors.ComplementColorLight));
+            cb.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(metroColors.ComplementColorDark));
+            cb.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.ComplementColor));
+            cb.MouseOver.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.MouseOver.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.MouseOver.Text = factory.GetColor(metroColors.ComplementColorLightText);
+
+            cb.MouseOverSplitInactive = new Office2007ButtonItemStateColorTable();
+            cb.MouseOverSplitInactive.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.ComplementColor));
+
+            // Pressed
+            cb.Pressed = new Office2007ButtonItemStateColorTable();
+            cb.Pressed.OuterBorder = new LinearGradientColorTable(metroColors.ComplementColorDarker);
+            cb.Pressed.InnerBorder = new LinearGradientColorTable(metroColors.ComplementColorDark);
+            cb.Pressed.TopBackground = null;// new LinearGradientColorTable(factory.GetColor("DAF6FF"));
+            cb.Pressed.TopBackgroundHighlight = null; // LinearGradientColorTable.Empty;
+            cb.Pressed.BottomBackground = null;// new LinearGradientColorTable(factory.GetColor("A7E8FF"));
+            cb.Pressed.BottomBackgroundHighlight = null; // new LinearGradientColorTable(factory.GetColor(Color.FromArgb(48, Color.White)), Color.Transparent);
+            cb.Pressed.Background = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor));
+            cb.Pressed.SplitBorder = new LinearGradientColorTable(factory.GetColor(metroColors.ComplementColor));
+            cb.Pressed.SplitBorderLight = LinearGradientColorTable.Empty;
+            cb.Pressed.Text = factory.GetColor(metroColors.TextColor);
+
+            // Checked
+            cb.Checked = new Office2007ButtonItemStateColorTable();
+            cb.Checked.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.ComplementColorDark));
+            cb.Checked.InnerBorder = new LinearGradientColorTable(factory.GetColor(metroColors.ComplementColorDark));
+            cb.Checked.TopBackground = null;  // new LinearGradientColorTable(factory.GetColor("A7E8FF"));
+            cb.Checked.TopBackgroundHighlight = null; // LinearGradientColorTable.Empty;
+            cb.Checked.BottomBackground = null; // new LinearGradientColorTable(factory.GetColor("A7E8FF"));
+            cb.Checked.BottomBackgroundHighlight = null; // new LinearGradientColorTable(factory.GetColor("20FFFFFF"), Color.Transparent);
+            cb.Checked.Background = new LinearGradientColorTable(factory.GetColor(metroColors.ComplementColor));
+            cb.Checked.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Checked.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Checked.Text = factory.GetColor(metroColors.ComplementColorText);
+
+            // Expanded button
+            cb.Expanded = new Office2007ButtonItemStateColorTable();
+            cb.Expanded.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.ComplementColor));
+            cb.Expanded.InnerBorder = LinearGradientColorTable.Empty;
+            cb.Expanded.TopBackground = null; // new LinearGradientColorTable(factory.GetColor("DAF6FF"));
+            cb.Expanded.TopBackgroundHighlight = null; // LinearGradientColorTable.Empty;
+            cb.Expanded.BottomBackground = null; // new LinearGradientColorTable(factory.GetColor("A7E8FF"));
+            cb.Expanded.BottomBackgroundHighlight = null; // new LinearGradientColorTable(factory.GetColor(Color.FromArgb(48, Color.White)), Color.Transparent);
+            cb.Expanded.Background = new LinearGradientColorTable(factory.GetColor(metroColors.ComplementColor));
+            cb.Expanded.SplitBorder = new LinearGradientColorTable(factory.GetColor(metroColors.ComplementColorDark));
+            cb.Expanded.SplitBorderLight = LinearGradientColorTable.Empty; //(factory.GetColor("A000BFFF"), Color.Empty);
+            cb.Expanded.Text = factory.GetColor(metroColors.ComplementColorText);
+
+            SetBlueExpandColors(cb, factory);
+
+            return cb;
+        }
+
+        public static Office2007ButtonItemColorTable GetButtonItemMagentaWithBackground(ColorFactory factory, MetroPartColors metroColors)
+        {
+            Office2007ButtonItemColorTable cb = GetButtonItemMagenta(factory, metroColors);
+
+            cb.Default.TopBackground = null;
+            cb.Default.TopBackgroundHighlight = null;
+            cb.Default.BottomBackground = null;
+            cb.Default.BottomBackgroundHighlight = null;
+            cb.Default.Background = new LinearGradientColorTable(factory.GetColor(metroColors.ComplementColor));
+            cb.Default.InnerBorder = LinearGradientColorTable.Empty;
+            cb.Default.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.ComplementColor));
+            cb.Default.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.Text = factory.GetColor(metroColors.ComplementColorText);
+            cb.MouseOverSplitInactive = cb.Default;
+
+            // Same as default
+            cb.Disabled = new Office2007ButtonItemStateColorTable();
+            cb.Disabled.TopBackground = null;
+            cb.Disabled.TopBackgroundHighlight = null;
+            cb.Disabled.BottomBackground = null;
+            cb.Disabled.BottomBackgroundHighlight = null;
+            cb.Disabled.Background = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor));
+            cb.Disabled.InnerBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColorLightShade), Color.Empty);
+            cb.Disabled.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.Text = factory.GetColor(metroColors.CanvasColorLightShade);
+            return cb;
+        }
+
+        public static void SetBlueExpandColors(Office2007ButtonItemColorTable ct, ColorFactory factory)
+        {
+            Color cb = factory.GetColor(0x454F5A);
+            Color cl = Color.FromArgb(192, Color.White);
+            ct.Default.ExpandBackground = cb;
+            ct.Default.ExpandLight = cl;
+
+            ct.Checked.ExpandBackground = cb;
+            ct.Checked.ExpandLight = cl;
+
+            //ct.Disabled.ExpandBackground = factory.GetColor(0xB7B7B7);
+            //ct.Disabled.ExpandLight = factory.GetColor(0xEDEDED);
+
+            ct.Expanded.ExpandBackground = cb;
+            ct.Expanded.ExpandLight = cl;
+
+            ct.MouseOver.ExpandBackground = cb;
+            ct.MouseOver.ExpandLight = cl;
+
+            ct.Pressed.ExpandBackground = cb;
+            ct.Pressed.ExpandLight = cl;
+        }
+
+        public static Office2007ButtonItemColorTable CreateBlueOrbColorTable(ColorFactory factory, MetroPartColors metroColors)
+        {
+            Office2007ButtonItemColorTable cb = new Office2007ButtonItemColorTable();
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.BlueOrb);
+
+            // Default
+            cb.Default = new Office2007ButtonItemStateColorTable();
+            cb.Default.TopBackground = null;
+            cb.Default.TopBackgroundHighlight = null;
+            cb.Default.BottomBackground = null;
+            cb.Default.BottomBackgroundHighlight = null;
+            cb.Default.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            cb.Default.InnerBorder = LinearGradientColorTable.Empty;
+            cb.Default.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseTextColor));
+            cb.Default.OuterBorderWidth = 2;
+            cb.Default.SplitBorder = LinearGradientColorTable.Empty;
+            cb.Default.SplitBorderLight = LinearGradientColorTable.Empty;
+            cb.Default.Text = factory.GetColor(metroColors.BaseTextColor);
+            cb.MouseOverSplitInactive = cb.Default;
+
+
+            // Button mouse over
+            cb.MouseOver = new Office2007ButtonItemStateColorTable();
+            cb.MouseOver.TopBackground = null;
+            cb.MouseOver.TopBackgroundHighlight = null;
+            cb.MouseOver.BottomBackground = null;
+            cb.MouseOver.BottomBackgroundHighlight = null;
+            cb.MouseOver.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            cb.MouseOver.InnerBorder = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLightest));// LinearGradientColorTable.Empty;
+            cb.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLightest));
+            cb.MouseOver.OuterBorderWidth = 2;
+            cb.MouseOver.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.MouseOver.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.MouseOver.Text = factory.GetColor(metroColors.BaseColorLightest);
+
+            cb.MouseOverSplitInactive = new Office2007ButtonItemStateColorTable();
+            cb.MouseOverSplitInactive.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLightest));
+
+            // Pressed
+            cb.Pressed = new Office2007ButtonItemStateColorTable();
+            cb.Pressed.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight));
+            cb.Pressed.OuterBorderWidth = 2;
+            cb.Pressed.InnerBorder = LinearGradientColorTable.Empty; // (factory.GetColor(metroColors.BaseColorLight));
+            cb.Pressed.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            cb.Pressed.TopBackground = null;
+            cb.Pressed.TopBackgroundHighlight = null;
+            cb.Pressed.BottomBackground = null;
+            cb.Pressed.BottomBackgroundHighlight = null;
+            cb.Pressed.SplitBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight));
+            cb.Pressed.SplitBorderLight = LinearGradientColorTable.Empty;//(factory.GetColor(metroColors.BaseColorLight), Color.Empty);
+            cb.Pressed.Text = factory.GetColor(metroColors.BaseColorLight);
+
+            // Checked
+            cb.Checked = new Office2007ButtonItemStateColorTable();
+            cb.Checked.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseTextColor));
+            cb.Checked.OuterBorderWidth = 2;
+            cb.Checked.InnerBorder = LinearGradientColorTable.Empty; // (factory.GetColor(metroColors.BaseTextColor));
+            cb.Checked.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            cb.Checked.TopBackground = null; //new LinearGradientColorTable(metroColors.BaseColorLight);
+            cb.Checked.TopBackgroundHighlight = null; //LinearGradientColorTable.Empty;
+            cb.Checked.BottomBackground = null; // new LinearGradientColorTable(metroColors.BaseColorLight);
+            cb.Checked.BottomBackgroundHighlight = null; // new LinearGradientColorTable(factory.GetColor("20FFFFFF"), Color.Transparent);
+            cb.Checked.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Checked.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Checked.Text = factory.GetColor(metroColors.BaseTextColor);
+
+            // Expanded button
+            cb.Expanded = new Office2007ButtonItemStateColorTable();
+            cb.Expanded.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLightest));
+            cb.Expanded.OuterBorderWidth = 2;
+            cb.Expanded.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            cb.Expanded.InnerBorder = LinearGradientColorTable.Empty;
+            cb.Expanded.TopBackground = null;
+            cb.Expanded.TopBackgroundHighlight = null;
+            cb.Expanded.BottomBackground = null;
+            cb.Expanded.BottomBackgroundHighlight = null;
+            cb.Expanded.SplitBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight));
+            cb.Expanded.SplitBorderLight = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight), Color.Empty);
+            cb.Expanded.Text = factory.GetColor(metroColors.BaseColorLightest);
+
+            // Same as default
+            cb.Disabled = new Office2007ButtonItemStateColorTable();
+            cb.Disabled.TopBackground = null;
+            cb.Disabled.TopBackgroundHighlight = null; // new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.BottomBackground = null; // LinearGradientColorTable.Empty;
+            cb.Disabled.BottomBackgroundHighlight = null; // new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            cb.Disabled.InnerBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight1), Color.Empty);
+            cb.Disabled.OuterBorderWidth = 2;
+            cb.Disabled.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.Text = factory.GetColor(metroColors.BaseColorLight1);
+            return cb;
+        }
+
+        public static Office2007ButtonItemColorTable GetButtonItemStatusBar(ColorFactory factory, MetroPartColors metroColors)
+        {
+            Office2007ButtonItemColorTable cb = new Office2007ButtonItemColorTable();
+            cb.Default = new Office2007ButtonItemStateColorTable();
+            cb.Default.Text = factory.GetColor(metroColors.BaseTextColor);
+
+            // Button mouse over
+            cb.MouseOver = new Office2007ButtonItemStateColorTable();
+            cb.MouseOver.TopBackground = null;
+            cb.MouseOver.TopBackgroundHighlight = null;
+            cb.MouseOver.BottomBackground = null;
+            cb.MouseOver.BottomBackgroundHighlight = null;
+            cb.MouseOver.Background = new LinearGradientColorTable(metroColors.BaseColorLight1);
+            cb.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight1));
+            cb.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight1));
+            cb.MouseOver.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.MouseOver.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.MouseOver.Text = factory.GetColor(metroColors.BaseTextColor);
+
+            cb.MouseOverSplitInactive = new Office2007ButtonItemStateColorTable();
+            cb.MouseOverSplitInactive.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight1));
+
+            // Pressed
+            cb.Pressed = new Office2007ButtonItemStateColorTable();
+            cb.Pressed.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            cb.Pressed.InnerBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            cb.Pressed.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            cb.Pressed.TopBackground = null;
+            cb.Pressed.TopBackgroundHighlight = null;
+            cb.Pressed.BottomBackground = null;
+            cb.Pressed.BottomBackgroundHighlight = null;
+            cb.Pressed.SplitBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            cb.Pressed.SplitBorderLight = LinearGradientColorTable.Empty;
+            cb.Pressed.Text = factory.GetColor(metroColors.BaseTextColor);
+
+            // Checked
+            cb.Checked = new Office2007ButtonItemStateColorTable();
+            cb.Checked.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            cb.Checked.InnerBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            cb.Checked.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            cb.Checked.TopBackground = null;
+            cb.Checked.TopBackgroundHighlight = null;
+            cb.Checked.BottomBackground = null;
+            cb.Checked.BottomBackgroundHighlight = null;
+            cb.Checked.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Checked.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Checked.Text = factory.GetColor(metroColors.BaseTextColor);
+
+            // Expanded button
+            cb.Expanded = new Office2007ButtonItemStateColorTable();
+            cb.Expanded.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            cb.Expanded.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            cb.Expanded.InnerBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            cb.Expanded.TopBackground = null;
+            cb.Expanded.TopBackgroundHighlight = null;
+            cb.Expanded.BottomBackground = null;
+            cb.Expanded.BottomBackgroundHighlight = null;
+            cb.Expanded.SplitBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            cb.Expanded.SplitBorderLight = LinearGradientColorTable.Empty;
+            cb.Expanded.Text = factory.GetColor(metroColors.BaseTextColor);
+
+            SetBlueExpandColors(cb, factory);
+
+            return cb;
+        }
+        #endregion
+
+        #region RibbonTabItem
+        public static Office2007RibbonTabItemColorTable GetRibbonTabItemBlueDefault(ColorFactory factory, MetroPartColors metroColors, Color ribbonBack)
+        {
+            Office2007RibbonTabItemColorTable rt = new Office2007RibbonTabItemColorTable();
+            rt.Default.Text = factory.GetColor(metroColors.CanvasColor);
+            rt.CornerSize = 0;
+
+            // Selected Tab
+            rt.Selected = new Office2007RibbonTabItemStateColorTable();
+            rt.Selected.Background = new LinearGradientColorTable(ribbonBack);
+            rt.Selected.BackgroundHighlight = new LinearGradientColorTable();
+            rt.Selected.InnerBorder = new LinearGradientColorTable();
+            rt.Selected.OuterBorder = new LinearGradientColorTable(metroColors.BaseColor);
+            rt.Selected.Text = factory.GetColor(metroColors.BaseColor);
+
+            // Selected Tab Mouse Over
+            rt.SelectedMouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.SelectedMouseOver.Background = new LinearGradientColorTable(ribbonBack);
+            rt.SelectedMouseOver.BackgroundHighlight = LinearGradientColorTable.Empty;
+            rt.SelectedMouseOver.InnerBorder = LinearGradientColorTable.Empty;
+            rt.SelectedMouseOver.OuterBorder = new LinearGradientColorTable(metroColors.BaseColor);
+            rt.SelectedMouseOver.Text = factory.GetColor(metroColors.BaseColor);
+
+            // Tab Mouse Over
+            rt.MouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.MouseOver.Background = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor));
+            rt.MouseOver.BackgroundHighlight = LinearGradientColorTable.Empty;
+            rt.MouseOver.InnerBorder = LinearGradientColorTable.Empty;
+            rt.MouseOver.OuterBorder = LinearGradientColorTable.Empty; // new LinearGradientColorTable(metroColors.CanvasColorLightShade);
+            rt.MouseOver.Text = factory.GetColor(metroColors.CanvasColor);
+
+            return rt;
+        }
+
+        public static Office2007RibbonTabItemColorTable GetRibbonTabItemBlueMagenta(ColorFactory factory)
+        {
+            Office2007RibbonTabItemColorTable rt = new Office2007RibbonTabItemColorTable();
+            rt.Default.Text = factory.GetColor(0x3B3B3B);
+            rt.CornerSize = 2;
+
+            // Selected Tab
+            rt.Selected = new Office2007RibbonTabItemStateColorTable();
+            rt.Selected.Background = new LinearGradientColorTable(factory.GetColor(0xF4DEEE), factory.GetColor(0xFEFEFE));
+            rt.Selected.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(64, Color.White), Color.Transparent);
+            rt.Selected.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFFFFFF), Color.Transparent);
+            rt.Selected.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xE088C0), factory.GetColor(0xDF6DAA));
+            rt.Selected.Text = factory.GetColor(0x3B3B3B);
+
+            // Selected Tab Mouse Over
+            rt.SelectedMouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.SelectedMouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xF4DEEE), factory.GetColor(0xFEFEFE));
+            rt.SelectedMouseOver.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(64, Color.White), Color.Transparent);
+            rt.SelectedMouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFFFFFF), Color.Transparent);
+            rt.SelectedMouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xE088C0), factory.GetColor(0xDF6DAA));
+            rt.SelectedMouseOver.Text = factory.GetColor(0x3B3B3B);
+
+            // Tab Mouse Over
+            rt.MouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.MouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xEDB5D8), factory.GetColor(0xFCFBFB));
+            rt.MouseOver.BackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xFCFBFB), Color.Transparent);
+            rt.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xF9D7EE), factory.GetColor(0xFDEDF8));
+            rt.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xE33991));
+            rt.MouseOver.Text = factory.GetColor(0x3B3B3B);
+
+            return rt;
+        }
+
+        public static Office2007RibbonTabItemColorTable GetRibbonTabItemBlueGreen(ColorFactory factory)
+        {
+            Office2007RibbonTabItemColorTable rt = new Office2007RibbonTabItemColorTable();
+            rt.Default.Text = factory.GetColor(0x3B3B3B);
+            rt.CornerSize = 2;
+
+            // Selected Tab
+            rt.Selected = new Office2007RibbonTabItemStateColorTable();
+            rt.Selected.Background = new LinearGradientColorTable(factory.GetColor(0xE4F3E0), factory.GetColor(0xE4F2DF));
+            rt.Selected.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(64, Color.White), Color.Transparent);
+            rt.Selected.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xD5EAD3), factory.GetColor(0xB8DEB1));
+            rt.Selected.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xB9C1B7), factory.GetColor(0xBFC1BE));
+            rt.Selected.Text = factory.GetColor(0x3B3B3B);
+
+            // Selected Tab Mouse Over
+            rt.SelectedMouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.SelectedMouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xE4F3E0), factory.GetColor(0xE4F2DF));
+            rt.SelectedMouseOver.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(32, Color.White), Color.Transparent);
+            rt.SelectedMouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xD5EAD3), factory.GetColor(0xB8DEB1));
+            rt.SelectedMouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xB9C1B7), factory.GetColor(0xBFC1BE));
+            rt.SelectedMouseOver.Text = factory.GetColor(0x3B3B3B);
+
+            // Tab Mouse Over
+            rt.MouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.MouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xB3DEE3), factory.GetColor(0x8ADE9F));
+            rt.MouseOver.BackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xDEECFF), Color.Transparent);
+            rt.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xE2EFFF), factory.GetColor(0xC7DFFF));
+            rt.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xC1C8D1), factory.GetColor(0xC0C7D0));
+            rt.MouseOver.Text = factory.GetColor(0x3B3B3B);
+
+            return rt;
+        }
+
+        public static Office2007RibbonTabItemColorTable GetRibbonTabItemBlueOrange(ColorFactory factory)
+        {
+            Office2007RibbonTabItemColorTable rt = new Office2007RibbonTabItemColorTable();
+            rt.Default.Text = factory.GetColor(0x3B3B3B);
+            rt.CornerSize = 2;
+
+            // Selected Tab
+            rt.Selected = new Office2007RibbonTabItemStateColorTable();
+            rt.Selected.Background = new LinearGradientColorTable(factory.GetColor(0xFFF59F), factory.GetColor(0xFFFAD5));
+            rt.Selected.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(64, Color.White), Color.Transparent);
+            rt.Selected.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFFFBD6), factory.GetColor(0xFDF28C));
+            rt.Selected.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xCAC7AC), factory.GetColor(0xC2C2C2));
+            rt.Selected.Text = factory.GetColor(0x3B3B3B);
+
+            // Selected Tab Mouse Over
+            rt.SelectedMouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.SelectedMouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xFFF59F), factory.GetColor(0xFFFAD5));
+            rt.SelectedMouseOver.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(32, Color.White), Color.Transparent);
+            rt.SelectedMouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFFFBD6), factory.GetColor(0xFDF28C));
+            rt.SelectedMouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xCAC7AC), factory.GetColor(0xC2C2C2));
+            rt.SelectedMouseOver.Text = factory.GetColor(0x3B3B3B);
+
+            // Tab Mouse Over
+            rt.MouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.MouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xCFE0E1), factory.GetColor(0xE9E799));
+            rt.MouseOver.BackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xCBE2FF), Color.Transparent);
+            rt.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xE2EFFF), factory.GetColor(0xC7DFFF));
+            rt.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xC1C8D1), factory.GetColor(0xC0C7D0));
+            rt.MouseOver.Text = factory.GetColor(0x3B3B3B);
+
+            return rt;
+        }
+        #endregion
+
+        #region Style Class Creation
+        public static ElementStyle GetSlideOutButtonStyle(Color complementColor)
+        {
+            ElementStyle style = new ElementStyle(ElementStyleClassKeys.SlideOutButtonKey);
+            style.BackColor = complementColor;
+            style.TextColor = Color.White;
+            return style;
+        }
+
+        public static ElementStyle GetFileMenuContainerStyle(Office2007ColorTable table)
+        {
+            ElementStyle style = new ElementStyle();
+            style.Class = ElementStyleClassKeys.RibbonFileMenuContainerKey;
+            Office2007MenuColorTable mc = table.Menu;
+
+            style.PaddingBottom = 3;
+            style.PaddingLeft = 0;
+            style.PaddingRight = 0;
+            style.PaddingTop = 25;
+            style.Border = eStyleBorderType.Solid;
+            style.CornerType = eCornerType.Rounded;
+            style.BorderWidth = 1;
+            style.BorderColor = Color.Transparent;
+            style.CornerDiameter = 3;
+            BackgroundColorBlend[] blend = new BackgroundColorBlend[mc.FileBackgroundBlend.Count];
+            mc.FileBackgroundBlend.CopyTo(blend);
+            style.BackColorBlend.Clear();
+            style.BackColorBlend.AddRange(blend);
+            style.BackColorGradientAngle = 90;
+            return style;
+        }
+
+        public static ElementStyle GetTwoColumnMenuContainerStyle(Office2007ColorTable table)
+        {
+            ElementStyle style = new ElementStyle();
+            style.Class = ElementStyleClassKeys.RibbonFileMenuTwoColumnContainerKey;
+            Office2007MenuColorTable mc = table.Menu;
+
+            style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Double;
+            style.BorderBottomWidth = 0;
+            style.BorderColor = mc.FileContainerBorder;
+            //style.BorderColorLight = mc.FileContainerBorderLight;
+            style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.None;
+            style.BorderLeftWidth = 0;
+            style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.None;
+            style.BorderRightWidth = 0;
+            style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            style.BorderTopWidth = 1;
+            style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            style.BorderBottomWidth = 1;
+            style.PaddingBottom = 0;
+            style.PaddingLeft = 0;
+            style.PaddingRight = 0;
+            style.PaddingTop = 0;
+
+            return style;
+        }
+
+        public static ElementStyle GetMenuColumnOneContainerStyle(Office2007ColorTable table)
+        {
+            ElementStyle style = new ElementStyle();
+            style.Class = ElementStyleClassKeys.RibbonFileMenuColumnOneContainerKey;
+            Office2007MenuColorTable mc = table.Menu;
+
+            style.BackColor = mc.FileColumnOneBackground;
+            style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            style.BorderRightColor = mc.FileColumnOneBorder;
+            style.BorderRightWidth = 1;
+            style.PaddingRight = 1;
+
+            return style;
+        }
+
+        public static ElementStyle GetMenuColumnTwoContainerStyle(Office2007ColorTable table)
+        {
+            ElementStyle style = new ElementStyle();
+            style.Class = ElementStyleClassKeys.RibbonFileMenuColumnTwoContainerKey;
+            Office2007MenuColorTable mc = table.Menu;
+
+            style.BackColor = mc.FileColumnTwoBackground;
+
+            return style;
+        }
+
+        public static ElementStyle GetMenuBottomContainer(Office2007ColorTable table)
+        {
+            ElementStyle style = new ElementStyle();
+            style.Class = ElementStyleClassKeys.RibbonFileMenuBottomContainerKey;
+            Office2007MenuColorTable mc = table.Menu;
+
+            //BackgroundColorBlend[] blend = new BackgroundColorBlend[mc.FileBottomContainerBackgroundBlend.Count];
+            //mc.FileBottomContainerBackgroundBlend.CopyTo(blend);
+            //style.BackColorBlend.Clear();
+            //style.BackColorBlend.AddRange(blend);
+            //style.BackColorGradientAngle = 90;
+            style.MarginTop = 2;
+            style.MarginRight = 2;
+            return style;
+        }
+        #endregion
+
+        #region Scroll Bar
+        public static void InitializeScrollBarColorTable(Office2007ColorTable t, ColorFactory factory, MetroPartColors metroParts)
+        {
+            InitializeScrollBarColorTable(t.ScrollBar, factory, metroParts);
+        }
+        public static void InitializeScrollBarColorTable(Office2007ScrollBarColorTable scrollBarColorTable, ColorFactory factory, MetroPartColors metroParts)
+        {
+            Office2007ScrollBarStateColorTable sct = scrollBarColorTable.Default;
+            sct.Background = new LinearGradientColorTable(factory.GetColor(metroParts.CanvasColorLight));
+            sct.Border = LinearGradientColorTable.Empty;
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(metroParts.TextInactiveColor));
+            sct.TrackBackground.Clear();
+            sct.TrackInnerBorder = LinearGradientColorTable.Empty;
+            sct.TrackOuterBorder = LinearGradientColorTable.Empty;
+            sct.TrackSignBackground = new LinearGradientColorTable(factory.GetColor(metroParts.TextInactiveColor));
+
+            // Mouse Over
+            sct = scrollBarColorTable.MouseOver;
+            sct.Background = scrollBarColorTable.Default.Background;
+            sct.Border = scrollBarColorTable.Default.Border;
+            sct.ThumbBackground.Clear();
+            sct.ThumbInnerBorder = LinearGradientColorTable.Empty;
+            sct.ThumbOuterBorder = LinearGradientColorTable.Empty;
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(metroParts.TextColor));
+            sct.TrackBackground.Clear();
+            sct.TrackInnerBorder = LinearGradientColorTable.Empty;
+            sct.TrackOuterBorder = LinearGradientColorTable.Empty;
+            sct.TrackSignBackground = new LinearGradientColorTable(factory.GetColor(metroParts.TextColor));
+
+            // Control Mouse Over
+            sct = scrollBarColorTable.MouseOverControl;
+            sct.Background = scrollBarColorTable.Default.Background;
+            sct.Border = scrollBarColorTable.Default.Border;
+            sct.ThumbBackground.Clear();
+            sct.ThumbInnerBorder = LinearGradientColorTable.Empty;
+            sct.ThumbOuterBorder = new LinearGradientColorTable(factory.GetColor(metroParts.TextColor));
+            sct.ThumbSignBackground = scrollBarColorTable.Default.ThumbSignBackground;
+            sct.TrackBackground.Clear();
+            sct.TrackInnerBorder = LinearGradientColorTable.Empty;
+            sct.TrackOuterBorder = LinearGradientColorTable.Empty;
+            sct.TrackSignBackground = new LinearGradientColorTable(factory.GetColor(metroParts.TextColor));
+
+            // Pressed
+            sct = scrollBarColorTable.Pressed;
+            sct.Background = scrollBarColorTable.Default.Background;
+            sct.Border = scrollBarColorTable.Default.Border;
+            sct.ThumbBackground.Clear();
+            sct.ThumbInnerBorder = LinearGradientColorTable.Empty;
+            sct.ThumbOuterBorder = LinearGradientColorTable.Empty;
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(metroParts.TextColor));
+            sct.TrackBackground.Clear();
+            sct.TrackInnerBorder = LinearGradientColorTable.Empty;
+            sct.TrackOuterBorder = LinearGradientColorTable.Empty;
+            sct.TrackSignBackground = new LinearGradientColorTable(factory.GetColor(metroParts.TextColor));
+            // Disabled
+            sct = scrollBarColorTable.Disabled;
+            sct.Background = scrollBarColorTable.Default.Background;
+            sct.Border = scrollBarColorTable.Default.Border;
+            sct.ThumbBackground.Clear();
+            sct.ThumbInnerBorder = new LinearGradientColorTable();
+            sct.ThumbOuterBorder = new LinearGradientColorTable();
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(metroParts.TextDisabledColor));
+            sct.TrackBackground.Clear();
+            sct.TrackInnerBorder = new LinearGradientColorTable();
+            sct.TrackOuterBorder = new LinearGradientColorTable();
+            sct.TrackSignBackground = new LinearGradientColorTable();
+        }
+        public static void InitializeAppBlueScrollBarColorTable(Office2007ColorTable t, ColorFactory factory, MetroPartColors metroParts)
+        {
+            InitializeScrollBarColorTable(t.AppScrollBar, factory, metroParts);
+        }
+        #endregion
+
+        #region AdvTree
+        public static void CreateAdvTreeColorTable(TreeColorTable ct, ColorFactory factory, MetroPartColors metroColors)
+        {
+            #region Tree Selection
+            TreeSelectionColors treeSelection = new TreeSelectionColors();
+            ct.Selection = treeSelection;
+            // Highlight full row
+            SelectionColorTable selColorTable = new SelectionColorTable();
+            selColorTable.Fill = new SolidFill(factory.GetColor(metroColors.BaseColor));
+            selColorTable.TextColor = factory.GetColor(metroColors.BaseTextColor);
+            treeSelection.FullRowSelect = selColorTable;
+            //  Highlight full row Inactive
+            selColorTable = new SelectionColorTable();
+            selColorTable.Fill = new SolidFill(metroColors.CanvasColorLightShade);
+            treeSelection.FullRowSelectInactive = selColorTable;
+
+            // Node Marker
+            selColorTable = new SelectionColorTable();
+            selColorTable.Fill = new SolidFill(factory.GetColor(metroColors.BaseColor));
+            selColorTable.TextColor = factory.GetColor(metroColors.BaseTextColor);
+            treeSelection.NodeMarker = selColorTable;
+            // Node marker inactive
+            selColorTable = new SelectionColorTable();
+            selColorTable.Fill = new SolidFill(factory.GetColor(metroColors.CanvasColorLightShade));
+            treeSelection.NodeMarkerInactive = selColorTable;
+
+            // Cell selection
+            selColorTable = new SelectionColorTable();
+            selColorTable.Fill = new SolidFill(factory.GetColor(metroColors.BaseColor));
+            selColorTable.TextColor = factory.GetColor(metroColors.BaseTextColor);
+            treeSelection.HighlightCells = selColorTable;
+            // Cell selection inactive
+            selColorTable = new SelectionColorTable();
+            selColorTable.Fill = new SolidFill(factory.GetColor(metroColors.CanvasColorLightShade));
+            treeSelection.HighlightCellsInactive = selColorTable;
+
+            selColorTable = new SelectionColorTable();
+            selColorTable.Fill = new SolidFill(factory.GetColor(metroColors.BaseColor));
+            selColorTable.TextColor = factory.GetColor(metroColors.BaseTextColor);
+            treeSelection.NodeHotTracking = selColorTable;
+            #endregion
+
+            #region Expand Buttons
+            TreeExpandColorTable expand = new TreeExpandColorTable();
+            expand.CollapseBorder = new SolidBorder(factory.GetColor(metroColors.CanvasColorDarkShade), 1);
+            expand.CollapseFill = new SolidFill(factory.GetColor(metroColors.CanvasColor));
+            expand.CollapseMouseOverBorder = new SolidBorder(factory.GetColor(metroColors.TextColor), 1);
+            expand.CollapseMouseOverFill = new SolidFill(factory.GetColor(metroColors.TextColor));
+            expand.ExpandBorder = new SolidBorder(factory.GetColor(metroColors.CanvasColorDarkShade), 1);
+            expand.ExpandFill = new SolidFill(factory.GetColor(metroColors.CanvasColor));
+            expand.ExpandMouseOverBorder = new SolidBorder(factory.GetColor(metroColors.TextColor), 1);
+            expand.ExpandMouseOverFill = new SolidFill(factory.GetColor(metroColors.CanvasColor));
+            ct.ExpandTriangle = expand;
+            // Rectangle
+            expand = new TreeExpandColorTable();
+            expand.CollapseForeground = new SolidFill(factory.GetColor(metroColors.CanvasColorDarkShade));
+            expand.CollapseBorder = new SolidBorder(factory.GetColor(metroColors.TextColor), 1);
+            expand.CollapseFill = new GradientFill(new ColorStop[]{
+                new ColorStop(factory.GetColor(metroColors.CanvasColor), 0f), new ColorStop(factory.GetColor(metroColors.CanvasColor), .40f), new ColorStop(factory.GetColor(metroColors.CanvasColorLighterShade), 1f)}, 45);
+            expand.CollapseMouseOverForeground = expand.CollapseForeground;
+            expand.CollapseMouseOverBorder = expand.CollapseBorder;
+            expand.CollapseMouseOverFill = expand.CollapseFill;
+            expand.ExpandForeground = expand.CollapseForeground;
+            expand.ExpandBorder = expand.CollapseBorder;
+            expand.ExpandFill = expand.CollapseFill;
+            expand.ExpandMouseOverForeground = expand.CollapseForeground;
+            expand.ExpandMouseOverBorder = expand.CollapseBorder;
+            expand.ExpandMouseOverFill = expand.CollapseFill;
+            ct.ExpandRectangle = expand;
+            ct.ExpandEllipse = expand;
+            #endregion
+
+            #region Misc Tree Color
+            ct.GridLines = factory.GetColor(metroColors.CanvasColorLightShade);
+            #endregion
+        }
+        #endregion
+
+        #region RibbonTab Group
+        public static Office2007RibbonTabGroupColorTable GetRibbonTabGroupDefault(ColorFactory factory, MetroPartColors metroColors)
+        {
+            Office2007RibbonTabGroupColorTable tg = new Office2007RibbonTabGroupColorTable();
+            tg.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            tg.BackgroundHighlight = LinearGradientColorTable.Empty;
+            tg.Text = factory.GetColor(0x935ED3);
+            tg.Border = new LinearGradientColorTable(factory.GetColor(0x935ED3));
+
+            return tg;
+        }
+
+        public static Office2007RibbonTabGroupColorTable GetRibbonTabGroupOrange(ColorFactory factory, MetroPartColors metroColors)
+        {
+            Office2007RibbonTabGroupColorTable tg = new Office2007RibbonTabGroupColorTable();
+            tg.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            tg.BackgroundHighlight = LinearGradientColorTable.Empty;
+            tg.Text = factory.GetColor(0xFF9D00);
+            tg.Border = new LinearGradientColorTable(factory.GetColor(0xFF9D00));
+
+            return tg;
+        }
+
+        public static Office2007RibbonTabGroupColorTable GetRibbonTabGroupMagenta(ColorFactory factory, MetroPartColors metroColors)
+        {
+            Office2007RibbonTabGroupColorTable tg = new Office2007RibbonTabGroupColorTable();
+            tg.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            tg.BackgroundHighlight = LinearGradientColorTable.Empty;
+            tg.Text = factory.GetColor(0xC9599C);
+            tg.Border = new LinearGradientColorTable(factory.GetColor(0xC9599C));
+
+            return tg;
+        }
+
+        public static Office2007RibbonTabGroupColorTable GetRibbonTabGroupGreen(ColorFactory factory, MetroPartColors metroColors)
+        {
+            Office2007RibbonTabGroupColorTable tg = new Office2007RibbonTabGroupColorTable();
+            tg.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            tg.BackgroundHighlight = LinearGradientColorTable.Empty;
+            tg.Text = factory.GetColor(0x49A349);
+            tg.Border = new LinearGradientColorTable(factory.GetColor(0x49A349));
+
+            return tg;
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Metro/ColorTables/OfficeMobile2014MetroInitializer.cs b/PROMS/DotNetBar Source Code/Metro/ColorTables/OfficeMobile2014MetroInitializer.cs
new file mode 100644
index 00000000..aef95738
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Metro/ColorTables/OfficeMobile2014MetroInitializer.cs	
@@ -0,0 +1,177 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+using DevComponents.DotNetBar.Rendering;
+using DevComponents.DotNetBar.Metro.Helpers;
+
+namespace DevComponents.DotNetBar.Metro.ColorTables
+{
+    /// <summary>
+    /// Initializes Office Mobile 2014 color scheme Metro color table based on colors specified.
+    /// </summary>
+    internal class OfficeMobile2014MetroInitializer
+    {
+        public static MetroColorTable CreateColorTable(MetroColorGeneratorParameters colorParams)
+        {
+            return CreateColorTable(colorParams.CanvasColor, colorParams.BaseColor);
+        }
+        public static MetroColorTable CreateColorTable(Color canvasColor, Color baseColor)
+        {
+            MetroColorTable metroTable = new MetroColorTable();
+            Office2007ColorTable officeMetroColorTable = new Office2007ColorTable();
+            CreateColors(metroTable, officeMetroColorTable, canvasColor, baseColor);
+            if (StyleManager.IsMetro(StyleManager.Style))
+                ((Office2007Renderer)GlobalManager.Renderer).ColorTable = officeMetroColorTable;
+            return metroTable;
+        }
+
+        private const double DEGREE = 1d / 360;
+        public static MetroPartColors CreateMetroPartColors(Color canvasColor, Color baseColor)
+        {
+            ColorFunctions.HLSColor canvasHsl = ColorFunctions.RGBToHSL(canvasColor);
+            ColorFunctions.HLSColor baseHsl = ColorFunctions.RGBToHSL(baseColor);
+            HSVColor baseHsv = ColorHelpers.ColorToHSV(baseColor);
+            HSVColor canvasHsv = ColorHelpers.ColorToHSV(canvasColor);
+
+            // Create metro colors
+            MetroPartColors partColors = new MetroPartColors();
+            partColors.CanvasColor = canvasColor;
+            partColors.BaseColor = baseColor;
+            partColors.TextColor = (canvasHsl.Lightness < .4) ? Color.White : Color.Black;
+            //HSVColor textHsv = ColorHelpers.ColorToHSV(partColors.TextColor);
+            partColors.TextInactiveColor = ColorHelpers.HSVToColor(canvasHsv.Hue, canvasHsv.Saturation, (partColors.TextColor == Color.White ? canvasHsv.Value + .53 : canvasHsv.Value - .47));
+            partColors.TextDisabledColor = ColorHelpers.HSVToColor(canvasHsv.Hue, canvasHsv.Saturation, (partColors.TextColor == Color.Black ? canvasHsv.Value - .33 : canvasHsv.Value + .67));
+            partColors.TextLightColor = ColorHelpers.HSVToColor(canvasHsv.Hue, canvasHsv.Saturation, (partColors.TextColor == Color.Black ? canvasHsv.Value - .6 : canvasHsv.Value + .4));
+            partColors.CanvasColorDarkShade = partColors.TextColor == Color.Black ? ColorScheme.GetColor(0xC8C8C8) : ColorHelpers.HSVToColor(canvasHsv.Hue, canvasHsv.Saturation, (partColors.TextColor == Color.Black ? canvasHsv.Value - .33 : canvasHsv.Value + .33));
+            partColors.CanvasColorDarkerShade = ColorScheme.GetColor(0xB4B4B4);
+            partColors.CanvasColorLightShade = ColorScheme.GetColor(0xCCCCCC);
+            partColors.CanvasColorLighterShade = ColorHelpers.HSVToColor(canvasHsv.Hue, canvasHsv.Saturation, (partColors.TextColor == Color.White ? canvasHsv.Value + .05 : canvasHsv.Value - .05));
+            partColors.CanvasColorLight = (partColors.TextColor == Color.Black) ? ColorScheme.GetColor(0xFAFAFA) : ColorHelpers.HSVToColor(canvasHsv.Hue, canvasHsv.Saturation, canvasHsv.Value + .06);
+            partColors.BaseTextColor = GetTextColor(baseColor);
+
+            partColors.BaseColorLight = ColorHelpers.HSVToColor(baseHsv.Hue, GetColorMin(0.08, baseHsv.Saturation - .41), baseHsv.Value + .3);
+            partColors.BaseColorLight1 = ColorHelpers.HSVToColor(baseHsv.Hue, GetColorMin(0.05, baseHsv.Saturation - .12), baseHsv.Value + .12);
+            partColors.BaseColorLightText = GetTextColor(partColors.BaseColorLight);
+
+            partColors.BaseColorLightest = ColorHelpers.HSVToColor(baseHsv.Hue, GetColorMin(0.05, baseHsv.Saturation - .6), baseHsv.Value + .5);
+            partColors.BaseColorLighter = ColorHelpers.HSVToColor(baseHsv.Hue, GetColorMin(0.08, baseHsv.Saturation - .46), baseHsv.Value + .39);
+            partColors.BaseColorDark = ColorHelpers.HSVToColor(baseHsv.Hue, baseHsv.Saturation + .1, baseHsv.Value - .06);
+            partColors.BaseColorDarker = ColorFunctions.HLSToRGB(baseHsl.Hue, baseHsl.Lightness - .2, baseHsl.Saturation);
+
+            partColors.ComplementColor = ColorHelpers.HSVToColor(GetComplementHue(baseHsv.Hue), baseHsv.Saturation, baseHsv.Value + (baseHsv.Value > .5d ? -.35 : 0d));
+            ColorFunctions.HLSColor compHsl = ColorFunctions.RGBToHSL(partColors.ComplementColor);
+            HSVColor compHsv = ColorHelpers.ColorToHSV(partColors.ComplementColor);
+            partColors.ComplementColorLight = ColorHelpers.HSVToColor(compHsv.Hue, compHsv.Saturation, compHsv.Value + .2d);
+            partColors.ComplementColorDark = ColorFunctions.HLSToRGB(compHsl.Hue, compHsl.Lightness - .10, compHsl.Saturation);
+            partColors.ComplementColorDarker = ColorFunctions.HLSToRGB(compHsl.Hue, compHsl.Lightness - .2, compHsl.Saturation);
+            partColors.ComplementColorText = GetTextColor(partColors.ComplementColor);
+            partColors.ComplementColorLightText = GetTextColor(partColors.ComplementColorLight);
+
+            partColors.BaseButtonGradientStart = ColorHelpers.HSVToColor(canvasHsv.Hue, canvasHsv.Saturation, (canvasHsv.Value > 0 ? canvasHsv.Value - .01 : canvasHsv.Value + .08));
+            partColors.BaseButtonGradientEnd = ColorHelpers.HSVToColor(canvasHsv.Hue, canvasHsv.Saturation, (canvasHsv.Value > 0 ? canvasHsv.Value - .08 : canvasHsv.Value + .20));
+
+            if (partColors.TextColor == Color.Black)
+                partColors.EditControlBackColor = Color.White;
+            else
+                partColors.EditControlBackColor = Color.Black;
+
+            return partColors;
+        }
+        public static void CreateColors(MetroColorTable metroTable, Office2007ColorTable officeMetroColorTable, Color canvasColor, Color baseColor)
+        {
+            MetroPartColors partColors = CreateMetroPartColors(canvasColor, baseColor);
+
+            metroTable.CanvasColor = partColors.CanvasColor;
+            metroTable.CanvasColorShadeLight = partColors.CanvasColorLightShade;
+            metroTable.CanvasColorShadeLighter = partColors.CanvasColorLighterShade;
+            metroTable.ForeColor = partColors.TextColor;
+            metroTable.BaseColor = baseColor;
+            metroTable.EditControlBackColor = partColors.EditControlBackColor;
+            metroTable.MetroPartColors = partColors;
+
+            metroTable.MetroAppForm.BorderThickness = new Thickness(1, 1, 1, 1);
+            metroTable.MetroAppForm.BorderColors = new BorderColors(partColors.BaseColor);
+            metroTable.MetroAppForm.BorderColorsInactive = new BorderColors(partColors.BaseColorLight);
+
+            metroTable.MetroForm.BorderThickness = new Thickness(1, 1, 1, 1);
+            metroTable.MetroForm.BorderColors = new BorderColors[1] { new BorderColors(partColors.BaseColor) };
+            metroTable.MetroForm.BorderColorsInactive = new BorderColors[4] { new BorderColors(partColors.BaseColorLight), new BorderColors(partColors.BaseColorLight), new BorderColors(partColors.BaseColorLight), new BorderColors(partColors.BaseColorLight) };
+
+            metroTable.MetroTab.ActiveCaptionText = partColors.BaseTextColor;
+            metroTable.MetroTab.InactiveCaptionText = partColors.BaseTextColor;
+
+            metroTable.MetroTab.MetroTabItem.Default = GetMetroTabItemStateTable(partColors.BaseTextColor, Color.Empty);
+            metroTable.MetroTab.MetroTabItem.Selected = GetMetroTabItemStateTable(partColors.BaseColor, partColors.CanvasColorLight);
+            metroTable.MetroTab.MetroTabItem.Disabled = GetMetroTabItemStateTable(partColors.TextDisabledColor, Color.Empty);
+            metroTable.MetroTab.MetroTabItem.MouseOver = null;
+            metroTable.MetroTab.MetroTabItem.Pressed = null;
+            metroTable.MetroTab.TabStrip.BackgroundStyle = new ElementStyle(partColors.BaseTextColor, partColors.BaseColor);
+            metroTable.MetroTab.CaptionTextFormat = eTextFormat.VerticalCenter | eTextFormat.HorizontalCenter | eTextFormat.EndEllipsis | eTextFormat.NoPrefix;
+
+            metroTable.MetroTab.TabPanelBackgroundStyle = new ElementStyle(partColors.TextColor, partColors.CanvasColorLight);
+
+            // Toolbar
+            metroTable.MetroToolbar.BackgroundStyle = new ElementStyle(partColors.TextColor, partColors.CanvasColorLight);
+
+            // Status Bar
+            metroTable.MetroStatusBar.BackgroundStyle = new ElementStyle(partColors.BaseTextColor, partColors.BaseColor);
+            metroTable.MetroStatusBar.TopBorders = new Color[0];
+            metroTable.MetroStatusBar.BottomBorders = new Color[0];
+            metroTable.MetroStatusBar.ResizeMarkerLightColor = Color.FromArgb(196, Color.White);
+            metroTable.MetroStatusBar.ResizeMarkerColor = partColors.BaseColorDarker;
+
+            OfficeMobile2014ColorTableInitializer.InitializeColorTable(officeMetroColorTable, ColorFactory.Empty, partColors);
+        }
+        private static double GetColorMin(double minValue, double value)
+        {
+            if (value < 0)
+                return minValue;
+            return value;
+        }
+
+        private static Color GetTextColor(Color color)
+        {
+            ColorFunctions.HLSColor hslColor = ColorFunctions.RGBToHSL(color);
+            return hslColor.Lightness < .65 ? Color.White : Color.Black;
+            //HSVColor hsvColor = ColorHelpers.ColorToHSV(backColor);
+            //return hsvColor.Value < .65 ? Color.White : Color.Black;
+        }
+
+        private static double GetComplementHue(double hue)
+        {
+            if (hue <= .37777d)
+            {
+                return Math.Min(1, hue + (137 * DEGREE + (86 * DEGREE * (hue / .37777d))));
+            }
+            else
+            {
+                return Math.Max(0, hue - (137 * DEGREE + (86 * DEGREE * (hue / .6222222d))));//     ((137 + 86 * DEGREE * (hue / .6222222) * DEGREE)));
+            }
+        }
+
+        private static MetroTabItemStateColorTable GetMetroTabItemStateTable(Color textColor, Color backColor)
+        {
+            ElementStyle style = new ElementStyle(textColor);
+            style.TextAlignment = eStyleTextAlignment.Center;
+            style.TextLineAlignment = eStyleTextAlignment.Center;
+            style.HideMnemonic = true;
+            if (!backColor.IsEmpty)
+            {
+                style.CornerTypeTopRight = eCornerType.Rounded;
+                style.CornerTypeTopLeft = eCornerType.Rounded;
+                style.CornerDiameter = 2;
+                style.BorderLeft = eStyleBorderType.Solid;
+                style.BorderTop = eStyleBorderType.Solid;
+                style.BorderRight = eStyleBorderType.Solid;
+                style.BorderLeftWidth = 1;
+                style.BorderTopWidth = 1;
+                style.BorderRightWidth = 1;
+                style.BorderColor = backColor;
+                style.BackColor = backColor;
+            }
+            style.TextColor = textColor;
+            return new MetroTabItemStateColorTable(style);
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Metro/ColorTables/VisualStudio2012ColorTableInitializer.cs b/PROMS/DotNetBar Source Code/Metro/ColorTables/VisualStudio2012ColorTableInitializer.cs
new file mode 100644
index 00000000..5afa52af
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Metro/ColorTables/VisualStudio2012ColorTableInitializer.cs	
@@ -0,0 +1,169 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+using DevComponents.DotNetBar.Rendering;
+using DevComponents.DotNetBar.Metro.Helpers;
+
+namespace DevComponents.DotNetBar.Metro.ColorTables
+{
+    /// <summary>
+    /// Initializes the Visual Studio 2012 color scheme Metro color table based on colors specified.
+    /// </summary>
+    internal class VisualStudio2012ColorTableInitializer
+    {
+        public static MetroColorTable CreateColorTable(MetroColorGeneratorParameters colorParams)
+        {
+            return CreateColorTable(colorParams.CanvasColor, colorParams.BaseColor);
+        }
+        public static MetroColorTable CreateColorTable(Color canvasColor, Color baseColor)
+        {
+            MetroColorTable metroTable = new MetroColorTable();
+            Office2007ColorTable officeMetroColorTable = new Office2007ColorTable();
+            CreateColors(metroTable, officeMetroColorTable, canvasColor, baseColor);
+            if (StyleManager.IsMetro(StyleManager.Style))
+                ((Office2007Renderer)GlobalManager.Renderer).ColorTable = officeMetroColorTable;
+            return metroTable;
+        }
+
+        private const double DEGREE = 1d / 360;
+        public static MetroPartColors CreateMetroPartColors(Color canvasColor, Color baseColor)
+        {
+            ColorFunctions.HLSColor canvasHsl = ColorFunctions.RGBToHSL(canvasColor);
+            ColorFunctions.HLSColor baseHsl = ColorFunctions.RGBToHSL(baseColor);
+            HSVColor baseHsv = ColorHelpers.ColorToHSV(baseColor);
+            HSVColor canvasHsv = ColorHelpers.ColorToHSV(canvasColor);
+
+            // Create metro colors
+            MetroPartColors partColors = new MetroPartColors();
+            partColors.CanvasColor = canvasColor;
+            partColors.BaseColor = baseColor;
+            partColors.TextColor = (canvasHsl.Lightness < .4) ? Color.White : Color.Black;
+            //HSVColor textHsv = ColorHelpers.ColorToHSV(partColors.TextColor);
+            partColors.TextInactiveColor = ColorHelpers.HSVToColor(canvasHsv.Hue, canvasHsv.Saturation, (partColors.TextColor == Color.White ? canvasHsv.Value + .53 : canvasHsv.Value - .47));
+            partColors.TextDisabledColor = ColorHelpers.HSVToColor(canvasHsv.Hue, canvasHsv.Saturation, (partColors.TextColor == Color.Black ? canvasHsv.Value - .33 : canvasHsv.Value + .67));
+            partColors.TextLightColor = ColorHelpers.HSVToColor(canvasHsv.Hue, canvasHsv.Saturation, (partColors.TextColor == Color.Black ? canvasHsv.Value - .6 : canvasHsv.Value + .4));
+            partColors.CanvasColorDarkShade = ColorHelpers.HSVToColor(canvasHsv.Hue, canvasHsv.Saturation, (partColors.TextColor == Color.Black ? canvasHsv.Value - .33 : canvasHsv.Value + .33));
+            partColors.CanvasColorLightShade = ColorHelpers.HSVToColor(canvasHsv.Hue, canvasHsv.Saturation, (partColors.TextColor == Color.White ? canvasHsv.Value + .17 : canvasHsv.Value - .17));
+            partColors.CanvasColorLighterShade = ColorHelpers.HSVToColor(canvasHsv.Hue, canvasHsv.Saturation, (partColors.TextColor == Color.White ? canvasHsv.Value + .05 : canvasHsv.Value - .05));
+            partColors.CanvasColorLight = (partColors.TextColor == Color.Black) ? ColorHelpers.HSVToColor(0, 0, .999) : ColorHelpers.HSVToColor(canvasHsv.Hue, canvasHsv.Saturation, canvasHsv.Value + .06);
+            partColors.BaseTextColor = GetTextColor(baseColor);
+
+            partColors.BaseColorLight = ColorHelpers.HSVToColor(baseHsv.Hue, GetColorMin(0.08, baseHsv.Saturation - .41), baseHsv.Value + .3);
+            partColors.BaseColorLight1 = ColorHelpers.HSVToColor(baseHsv.Hue, GetColorMin(0.05, baseHsv.Saturation - .12), baseHsv.Value + .12);
+            partColors.BaseColorLightText = GetTextColor(partColors.BaseColorLight);
+
+            partColors.BaseColorLightest = ColorHelpers.HSVToColor(baseHsv.Hue, GetColorMin(0.05, baseHsv.Saturation - .6), baseHsv.Value + .5);
+            partColors.BaseColorLighter = ColorHelpers.HSVToColor(baseHsv.Hue, GetColorMin(0.08, baseHsv.Saturation - .46), baseHsv.Value + .39);
+            partColors.BaseColorDark = ColorHelpers.HSVToColor(baseHsv.Hue, baseHsv.Saturation + .1, baseHsv.Value - .06);
+            partColors.BaseColorDarker = ColorFunctions.HLSToRGB(baseHsl.Hue, baseHsl.Lightness - .2, baseHsl.Saturation);
+
+            partColors.ComplementColor = ColorHelpers.HSVToColor(GetComplementHue(baseHsv.Hue), baseHsv.Saturation, baseHsv.Value + (baseHsv.Value > .5d ? -.35 : 0d));
+            ColorFunctions.HLSColor compHsl = ColorFunctions.RGBToHSL(partColors.ComplementColor);
+            HSVColor compHsv = ColorHelpers.ColorToHSV(partColors.ComplementColor);
+            partColors.ComplementColorLight = ColorHelpers.HSVToColor(compHsv.Hue, compHsv.Saturation, compHsv.Value + .2d);
+            partColors.ComplementColorDark = ColorFunctions.HLSToRGB(compHsl.Hue, compHsl.Lightness - .10, compHsl.Saturation);
+            partColors.ComplementColorDarker = ColorFunctions.HLSToRGB(compHsl.Hue, compHsl.Lightness - .2, compHsl.Saturation);
+            partColors.ComplementColorText = GetTextColor(partColors.ComplementColor);
+            partColors.ComplementColorLightText = GetTextColor(partColors.ComplementColorLight);
+
+            partColors.BaseButtonGradientStart = ColorHelpers.HSVToColor(canvasHsv.Hue, canvasHsv.Saturation, (canvasHsv.Value > 0 ? canvasHsv.Value - .01 : canvasHsv.Value + .08));
+            partColors.BaseButtonGradientEnd = ColorHelpers.HSVToColor(canvasHsv.Hue, canvasHsv.Saturation, (canvasHsv.Value > 0 ? canvasHsv.Value - .08 : canvasHsv.Value + .20));
+
+            if (partColors.TextColor == Color.Black)
+                partColors.EditControlBackColor = Color.White;
+            else
+                partColors.EditControlBackColor = Color.Black;
+
+            return partColors;
+        }
+        public static void CreateColors(MetroColorTable metroTable, Office2007ColorTable officeMetroColorTable, Color canvasColor, Color baseColor)
+        {
+            MetroPartColors partColors = CreateMetroPartColors(canvasColor, baseColor);
+
+            metroTable.CanvasColor = partColors.CanvasColor;
+            metroTable.CanvasColorShadeLight = partColors.CanvasColorLightShade;
+            metroTable.CanvasColorShadeLighter = partColors.CanvasColorLighterShade;
+            metroTable.ForeColor = partColors.TextColor;
+            metroTable.BaseColor = baseColor;
+            metroTable.EditControlBackColor = partColors.EditControlBackColor;
+            metroTable.MetroPartColors = partColors;
+
+            metroTable.MetroAppForm.BorderThickness = new Thickness(0, 0, 1, 1);
+            metroTable.MetroAppForm.BorderColors = new BorderColors(partColors.BaseColor);
+            metroTable.MetroAppForm.BorderColorsInactive = new BorderColors(partColors.BaseColorLight);
+
+            metroTable.MetroForm.BorderThickness = new Thickness(1, 1, 1, 1);
+            metroTable.MetroForm.BorderColors = new BorderColors[1] { new BorderColors(partColors.BaseColor) };
+            metroTable.MetroForm.BorderColorsInactive = new BorderColors[4] { new BorderColors(partColors.BaseColorLight), new BorderColors(partColors.BaseColorLight), new BorderColors(partColors.BaseColorLight), new BorderColors(partColors.BaseColorLight) };
+
+            metroTable.MetroTab.ActiveCaptionText = partColors.TextInactiveColor;
+            metroTable.MetroTab.InactiveCaptionText = partColors.TextDisabledColor;
+
+            metroTable.MetroTab.MetroTabItem.Default = GetMetroTabItemStateTable(partColors.TextInactiveColor);
+            metroTable.MetroTab.MetroTabItem.Selected = GetMetroTabItemStateTable(partColors.BaseColor);
+            metroTable.MetroTab.MetroTabItem.Disabled = GetMetroTabItemStateTable(partColors.TextDisabledColor);
+            metroTable.MetroTab.MetroTabItem.MouseOver = GetMetroTabItemStateTable(partColors.TextInactiveColor, partColors.BaseColor);
+            metroTable.MetroTab.MetroTabItem.Pressed = null;
+
+            metroTable.MetroTab.TabPanelBackgroundStyle = new ElementStyle(partColors.TextColor, partColors.CanvasColor);
+
+            // Toolbar
+            metroTable.MetroToolbar.BackgroundStyle = new ElementStyle(partColors.TextColor, partColors.CanvasColor);
+
+            // Status Bar
+            metroTable.MetroStatusBar.BackgroundStyle = new ElementStyle(partColors.TextColor, partColors.BaseColor);
+            metroTable.MetroStatusBar.TopBorders = new Color[0];
+            metroTable.MetroStatusBar.BottomBorders = new Color[0];
+            metroTable.MetroStatusBar.ResizeMarkerLightColor = Color.FromArgb(196, Color.White);
+            metroTable.MetroStatusBar.ResizeMarkerColor = partColors.BaseColorDarker;
+
+            VisualStudio2012OfficeColorTableInitializer.InitializeColorTable(officeMetroColorTable, ColorFactory.Empty, partColors);
+        }
+        private static double GetColorMin(double minValue, double value)
+        {
+            if (value < 0)
+                return minValue;
+            return value;
+        }
+
+        private static Color GetTextColor(Color color)
+        {
+            ColorFunctions.HLSColor hslColor = ColorFunctions.RGBToHSL(color);
+            return hslColor.Lightness < .65 ? Color.White : Color.Black;
+            //HSVColor hsvColor = ColorHelpers.ColorToHSV(backColor);
+            //return hsvColor.Value < .65 ? Color.White : Color.Black;
+        }
+
+        private static double GetComplementHue(double hue)
+        {
+            if (hue <= .37777d)
+            {
+                return Math.Min(1, hue + (137 * DEGREE + (86 * DEGREE * (hue / .37777d))));
+            }
+            else
+            {
+                return Math.Max(0, hue - (137 * DEGREE + (86 * DEGREE * (hue / .6222222d))));//     ((137 + 86 * DEGREE * (hue / .6222222) * DEGREE)));
+            }
+        }
+
+        private static MetroTabItemStateColorTable GetMetroTabItemStateTable(Color textColor)
+        {
+            return GetMetroTabItemStateTable(textColor, Color.Empty);
+        }
+        private static MetroTabItemStateColorTable GetMetroTabItemStateTable(Color textColor, Color bottomBorderColor)
+        {
+            ElementStyle style = new ElementStyle(textColor);
+            style.TextAlignment = eStyleTextAlignment.Center;
+            style.TextLineAlignment = eStyleTextAlignment.Center;
+            style.HideMnemonic = true;
+            if (!bottomBorderColor.IsEmpty)
+            {
+                style.BorderBottom = eStyleBorderType.Solid;
+                style.BorderBottomWidth = 2;
+                style.BorderBottomColor = bottomBorderColor;
+            }
+            return new MetroTabItemStateColorTable(style);
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Metro/ColorTables/VisualStudio2012OfficeColorTableInitializer.cs b/PROMS/DotNetBar Source Code/Metro/ColorTables/VisualStudio2012OfficeColorTableInitializer.cs
new file mode 100644
index 00000000..7d2df691
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Metro/ColorTables/VisualStudio2012OfficeColorTableInitializer.cs	
@@ -0,0 +1,2643 @@
+using System;
+using System.Text;
+using System.Drawing;
+using DevComponents.DotNetBar.Schedule;
+using DevComponents.DotNetBar.Rendering;
+using DevComponents.AdvTree.Display;
+using DevComponents.DotNetBar.Controls;
+using DevComponents.WinForms.Drawing;
+
+namespace DevComponents.DotNetBar.Metro.ColorTables
+{
+    internal class VisualStudio2012OfficeColorTableInitializer
+    {
+        public static void InitializeColorTable(Office2007ColorTable table, ColorFactory factory, MetroPartColors metroColors)
+        {
+            // This was conflicting with buttons which used CanvasColorLight for on mouse over effect.
+            //Color ribbonBack = factory.GetColor(metroColors.IsSolidCanvas ? metroColors.CanvasColor : metroColors.CanvasColorLight);
+            Color ribbonBack = factory.GetColor(metroColors.CanvasColorLighterShade);
+
+            #region RibbonControl Start Images
+            table.RibbonControl.StartButtonDefault = BarFunctions.LoadBitmap("SystemImages.BlankOffice2010NormalSilver.png");
+            table.RibbonControl.StartButtonMouseOver = BarFunctions.LoadBitmap("SystemImages.BlankOffice2010HotSilver.png");
+            table.RibbonControl.StartButtonPressed = BarFunctions.LoadBitmap("SystemImages.BlankOffice2010PressedSilver.png");
+            #endregion
+
+            #region RibbonControl
+            table.RibbonControl.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColorLightShade));
+            table.RibbonControl.InnerBorder = null; // LinearGradientColorTable.Empty;// new LinearGradientColorTable(factory.GetColor(Color.FromArgb(32, Color.White)));
+            table.RibbonControl.TabsBackground = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor));
+            table.RibbonControl.TabsGlassBackground = new LinearGradientColorTable(Color.Transparent, factory.GetColor(metroColors.CanvasColor));
+            table.RibbonControl.TabDividerBorder = Color.Empty; // factory.GetColor(0xA7BAD1);
+            table.RibbonControl.TabDividerBorderLight = Color.Empty; // factory.GetColor(0xF4F8FD);
+            table.RibbonControl.CornerSize = 1;
+            table.RibbonControl.PanelTopBackgroundHeight = 0;
+            table.RibbonControl.PanelTopBackground = new LinearGradientColorTable(ribbonBack);
+            table.RibbonControl.PanelBottomBackground = null; // new LinearGradientColorTable(factory.GetColor(0xF6F7F8), factory.GetColor(0xE5E9EE));
+            #endregion
+
+            #region Ribbon KeyTips
+            table.KeyTips.KeyTipBackground = factory.GetColor(metroColors.TextDisabledColor);
+            table.KeyTips.KeyTipText = factory.GetColor(metroColors.CanvasColor);
+            table.KeyTips.KeyTipBorder = factory.GetColor(metroColors.TextDisabledColor);
+            #endregion
+
+            #region Item Group
+            table.ItemGroup.OuterBorder = LinearGradientColorTable.Empty; //new LinearGradientColorTable(factory.GetColor(0xC0C3C8));
+            table.ItemGroup.InnerBorder = LinearGradientColorTable.Empty;
+            table.ItemGroup.TopBackground = LinearGradientColorTable.Empty;
+            table.ItemGroup.BottomBackground = LinearGradientColorTable.Empty;
+            table.ItemGroup.ItemGroupDividerDark = Color.Empty;
+            table.ItemGroup.ItemGroupDividerLight = Color.Empty;
+            #endregion
+
+            #region RibbonBar
+            table.RibbonBar.Default = GetRibbonBar(factory, metroColors, ribbonBack);
+            table.RibbonBar.MouseOver = GetRibbonBarMouseOver(factory, metroColors, ribbonBack);
+            table.RibbonBar.Expanded = GetRibbonBarExpanded(factory, metroColors, ribbonBack);
+            #endregion
+
+            #region ButtonItem Colors Initialization
+            table.RibbonButtonItemColors.Clear();
+            table.ButtonItemColors.Clear();
+            table.MenuButtonItemColors.Clear();
+            // Orange
+            Office2007ButtonItemColorTable cb = GetButtonItemDefault(factory, metroColors);
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Orange);
+            table.ButtonItemColors.Add(cb);
+            // Orange with background
+            cb = GetButtonItemDefaultWithBackground(factory, metroColors);
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.OrangeWithBackground);
+            table.ButtonItemColors.Add(cb);
+            // Blue
+            cb = GetButtonItemBlue(factory, metroColors);
+            cb.MouseOverSplitInactive = new Office2007ButtonItemStateColorTable();
+            cb.MouseOverSplitInactive.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xB1BAC4));
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Blue);
+            table.ButtonItemColors.Add(cb);
+            // Blue with background
+            cb = GetButtonItemBlueWithBackground(factory, metroColors);
+            cb.MouseOverSplitInactive = new Office2007ButtonItemStateColorTable();
+            cb.MouseOverSplitInactive.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xB1BAC4));
+            cb.MouseOverSplitInactive = cb.Default;
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.BlueWithBackground);
+            table.ButtonItemColors.Add(cb);
+            // Magenta
+            cb = GetButtonItemMagenta(factory, metroColors);
+            cb.MouseOverSplitInactive = new Office2007ButtonItemStateColorTable();
+            cb.MouseOverSplitInactive.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xB1BAC4));
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Magenta);
+            table.ButtonItemColors.Add(cb);
+            // Blue with background
+            cb = GetButtonItemMagentaWithBackground(factory, metroColors);
+            cb.MouseOverSplitInactive = new Office2007ButtonItemStateColorTable();
+            cb.MouseOverSplitInactive.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xB1BAC4));
+            cb.MouseOverSplitInactive = cb.Default;
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.MagentaWithBackground);
+            table.ButtonItemColors.Add(cb);
+
+            cb = Office2010BlueFactory.GetButtonItemOffice2007WithBackground(factory);
+            cb.MouseOverSplitInactive = new Office2007ButtonItemStateColorTable();
+            cb.MouseOverSplitInactive.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xB1BAC4));
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Office2007WithBackground);
+            table.ButtonItemColors.Add(cb);
+
+            table.ButtonItemColors.Add(CreateBlueOrbColorTable(factory, metroColors));
+
+            table.BackstageButtonItemColors.Clear();
+            table.BackstageButtonItemColors.Add(GetButtonItemBackstageDefault(factory, metroColors));
+
+            table.ContextualTables.Add(Office2007ColorTable.GetContextualKey(typeof(Office2007ButtonItemColorTable), "StatusBar"), GetButtonItemStatusBar(factory, metroColors));
+            #endregion
+
+            #region RibbonTabItem Colors Initialization
+            table.RibbonTabItemColors.Clear();
+            Office2007RibbonTabItemColorTable rt = GetRibbonTabItemBlueDefault(factory, metroColors, ribbonBack);
+            rt.Name = Enum.GetName(typeof(eRibbonTabColor), eRibbonTabColor.Default);
+            table.RibbonTabItemColors.Add(rt);
+
+            // Magenta
+            rt = GetRibbonTabItemBlueDefault(factory, metroColors, ribbonBack); //GetRibbonTabItemBlueMagenta(factory);
+            //rt.CornerSize = 2;
+            rt.Name = Enum.GetName(typeof(eRibbonTabColor), eRibbonTabColor.Magenta);
+            table.RibbonTabItemColors.Add(rt);
+
+            // Green
+            rt = GetRibbonTabItemBlueDefault(factory, metroColors, ribbonBack); //GetRibbonTabItemBlueGreen(factory);
+            //rt.CornerSize = 2;
+            rt.Name = Enum.GetName(typeof(eRibbonTabColor), eRibbonTabColor.Green);
+            table.RibbonTabItemColors.Add(rt);
+
+            // Orange
+            rt = GetRibbonTabItemBlueDefault(factory, metroColors, ribbonBack); //GetRibbonTabItemBlueOrange(factory);
+            //rt.CornerSize = 2;
+            rt.Name = Enum.GetName(typeof(eRibbonTabColor), eRibbonTabColor.Orange);
+            table.RibbonTabItemColors.Add(rt);
+            #endregion
+
+            #region RibbonTabItemGroup Colors Initialization
+            table.RibbonTabGroupColors.Clear();
+            // Default
+            Office2007RibbonTabGroupColorTable tg = GetRibbonTabGroupDefault(factory);
+            tg.Name = Enum.GetName(typeof(eRibbonTabGroupColor), eRibbonTabGroupColor.Default);
+            table.RibbonTabGroupColors.Add(tg);
+
+            // Magenta
+            tg = GetRibbonTabGroupMagenta(factory);
+            tg.Name = Enum.GetName(typeof(eRibbonTabGroupColor), eRibbonTabGroupColor.Magenta);
+            table.RibbonTabGroupColors.Add(tg);
+
+            // Green
+            tg = GetRibbonTabGroupGreen(factory);
+            tg.Name = Enum.GetName(typeof(eRibbonTabGroupColor), eRibbonTabGroupColor.Green);
+            table.RibbonTabGroupColors.Add(tg);
+
+            // Orange
+            tg = GetRibbonTabGroupOrange(factory);
+            tg.Name = Enum.GetName(typeof(eRibbonTabGroupColor), eRibbonTabGroupColor.Orange);
+            table.RibbonTabGroupColors.Add(tg);
+            #endregion
+
+            #region Initialize Bar
+            table.Bar.ToolbarTopBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor)/*, factory.GetColor(metroColors.BaseColorDark)*/);
+            table.Bar.ToolbarBottomBackground = null; // new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            table.Bar.ToolbarBottomBorder = Color.Empty;
+            table.Bar.PopupToolbarBackground = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor), Color.Empty);
+            table.Bar.PopupToolbarBorder = factory.GetColor(metroColors.BaseColor);
+            table.Bar.StatusBarTopBorder = factory.GetColor(metroColors.BaseColor);
+            table.Bar.StatusBarTopBorderLight = factory.GetColor(metroColors.BaseColor);
+            table.Bar.StatusBarAltBackground.Clear();
+            table.Bar.StatusBarAltBackground.Add(new BackgroundColorBlend(factory.GetColor(metroColors.BaseColor), 0f));
+            table.Bar.StatusBarAltBackground.Add(new BackgroundColorBlend(factory.GetColor(metroColors.BaseColor), 1f));
+            #endregion
+
+            #region Menu
+            table.Menu.Background = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor), Color.Empty);
+            table.Menu.Border = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColorLightShade), Color.Empty);
+            table.Menu.Side = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor), Color.Empty);
+            table.Menu.SideBorder = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor), Color.Empty);
+            table.Menu.SideBorderLight = LinearGradientColorTable.Empty;
+            table.Menu.SideUnused = LinearGradientColorTable.Empty;
+            table.Menu.FileBackgroundBlend.Clear();
+            table.Menu.FileBackgroundBlend.AddRange(new DevComponents.DotNetBar.BackgroundColorBlend[] {
+                new DevComponents.DotNetBar.BackgroundColorBlend(factory.GetColor(metroColors.CanvasColorLighterShade), 0F),
+                new DevComponents.DotNetBar.BackgroundColorBlend(factory.GetColor(metroColors.CanvasColorLighterShade), 1F)});
+            table.Menu.FileContainerBorder = factory.GetColor(metroColors.CanvasColorLightShade);
+            table.Menu.FileContainerBorderLight = Color.Transparent;
+            table.Menu.FileColumnOneBackground = factory.GetColor(metroColors.CanvasColor);
+            table.Menu.FileColumnOneBorder = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.Menu.FileColumnTwoBackground = factory.GetColor(metroColors.CanvasColor);
+            table.Menu.FileBottomContainerBackgroundBlend.Clear();
+            #endregion
+
+            #region ComboBox
+            table.ComboBox.Default.Background = factory.GetColor(metroColors.EditControlBackColor);
+            table.ComboBox.Default.Border = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.ComboBox.Default.ExpandBackground = new LinearGradientColorTable();
+            table.ComboBox.Default.ExpandBorderInner = new LinearGradientColorTable();
+            table.ComboBox.Default.ExpandBorderOuter = new LinearGradientColorTable();
+            table.ComboBox.Default.ExpandText = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.ComboBox.DefaultStandalone.Background = factory.GetColor(metroColors.EditControlBackColor);
+            table.ComboBox.DefaultStandalone.Border = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.ComboBox.DefaultStandalone.ExpandBackground = LinearGradientColorTable.Empty;
+            table.ComboBox.DefaultStandalone.ExpandBorderInner = LinearGradientColorTable.Empty;
+            table.ComboBox.DefaultStandalone.ExpandBorderOuter = LinearGradientColorTable.Empty;
+            table.ComboBox.DefaultStandalone.ExpandText = factory.GetColor(metroColors.TextColor);
+            table.ComboBox.MouseOver.Background = factory.GetColor(metroColors.EditControlBackColor);
+            table.ComboBox.MouseOver.Border = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.ComboBox.MouseOver.ExpandBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            table.ComboBox.MouseOver.ExpandBorderInner = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            table.ComboBox.MouseOver.ExpandBorderOuter = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            table.ComboBox.MouseOver.ExpandText = factory.GetColor(metroColors.TextColor);
+            table.ComboBox.DroppedDown.Background = factory.GetColor(metroColors.EditControlBackColor);
+            table.ComboBox.DroppedDown.Border = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.ComboBox.DroppedDown.ExpandBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            table.ComboBox.DroppedDown.ExpandBorderInner = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            table.ComboBox.DroppedDown.ExpandBorderOuter = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            table.ComboBox.DroppedDown.ExpandText = factory.GetColor(metroColors.BaseTextColor);
+            #endregion
+
+            #region Dialog Launcher
+            table.DialogLauncher.Default.DialogLauncher = factory.GetColor(metroColors.TextInactiveColor);
+            table.DialogLauncher.Default.DialogLauncherShade = Color.Empty; // factory.GetColor(64, 0xFFFFFF);
+
+            table.DialogLauncher.MouseOver.DialogLauncher = factory.GetColor(metroColors.BaseColor);
+            table.DialogLauncher.MouseOver.DialogLauncherShade = Color.Empty; // Color.FromArgb(128, factory.GetColor(0xFFFFFF));
+            table.DialogLauncher.MouseOver.TopBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLightest));
+            table.DialogLauncher.MouseOver.BottomBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLightest));
+            table.DialogLauncher.MouseOver.InnerBorder = LinearGradientColorTable.Empty;// new LinearGradientColorTable(factory.GetColor(Color.FromArgb(128, Color.White)));
+            table.DialogLauncher.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLightest), Color.Empty);
+
+            table.DialogLauncher.Pressed.DialogLauncher = factory.GetColor(metroColors.BaseColor);
+            table.DialogLauncher.Pressed.DialogLauncherShade = Color.Empty; // Color.FromArgb(48, factory.GetColor(0xFFFFFF));
+            table.DialogLauncher.Pressed.TopBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight));
+            table.DialogLauncher.Pressed.BottomBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight));
+            table.DialogLauncher.Pressed.InnerBorder = LinearGradientColorTable.Empty;//new LinearGradientColorTable(factory.GetColor(Color.FromArgb(48, Color.White)));
+            table.DialogLauncher.Pressed.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight), Color.Empty);
+            #endregion
+
+            #region System Button, Form
+            // Default state no background
+            table.SystemButton.Default = new Office2007SystemButtonStateColorTable();
+            table.SystemButton.Default.Foreground = new LinearGradientColorTable(factory.GetColor(metroColors.TextColor));
+            table.SystemButton.Default.LightShade = Color.Empty;
+            table.SystemButton.Default.DarkShade = Color.Empty;
+
+            // Mouse over state
+            table.SystemButton.MouseOver = new Office2007SystemButtonStateColorTable();
+            table.SystemButton.MouseOver.Foreground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseTextColor));
+            table.SystemButton.MouseOver.LightShade = Color.Empty;
+            table.SystemButton.MouseOver.DarkShade = Color.Empty;
+            table.SystemButton.MouseOver.TopBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            table.SystemButton.MouseOver.BottomBackground = null;
+            table.SystemButton.MouseOver.TopHighlight = null;
+            table.SystemButton.MouseOver.BottomHighlight = null;
+            table.SystemButton.MouseOver.OuterBorder = null;
+            table.SystemButton.MouseOver.InnerBorder = null;
+
+            // Pressed
+            table.SystemButton.Pressed = new Office2007SystemButtonStateColorTable();
+            table.SystemButton.Pressed.Foreground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseTextColor));
+            table.SystemButton.Pressed.LightShade = Color.Empty;
+            table.SystemButton.Pressed.DarkShade = Color.Empty;
+            table.SystemButton.Pressed.TopBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDarker));
+            table.SystemButton.Pressed.TopHighlight = null;
+            table.SystemButton.Pressed.BottomBackground = null;
+            table.SystemButton.Pressed.BottomHighlight = null;
+            table.SystemButton.Pressed.OuterBorder = null;
+            table.SystemButton.Pressed.InnerBorder = null;
+
+            // CLOSE Default state no background
+            table.SystemButtonClose = new Office2007SystemButtonColorTable();
+            table.SystemButtonClose.Default = new Office2007SystemButtonStateColorTable();
+            table.SystemButtonClose.Default.Foreground = new LinearGradientColorTable(factory.GetColor(metroColors.TextColor));
+            table.SystemButtonClose.Default.LightShade = Color.Empty;
+            table.SystemButtonClose.Default.DarkShade = Color.Empty;
+
+            // Mouse over state
+            table.SystemButtonClose.MouseOver = new Office2007SystemButtonStateColorTable();
+            table.SystemButtonClose.MouseOver.Foreground = new LinearGradientColorTable(factory.GetColor(Color.White));
+            table.SystemButtonClose.MouseOver.LightShade = Color.Empty;
+            table.SystemButtonClose.MouseOver.DarkShade = Color.Empty;
+            table.SystemButtonClose.MouseOver.TopBackground = new LinearGradientColorTable(factory.GetColor(0xE81123));
+            table.SystemButtonClose.MouseOver.BottomBackground = null;
+            table.SystemButtonClose.MouseOver.TopHighlight = null;
+            table.SystemButtonClose.MouseOver.BottomHighlight = null; 
+            table.SystemButtonClose.MouseOver.OuterBorder = null;
+            table.SystemButtonClose.MouseOver.InnerBorder = null;
+
+            // Pressed
+            table.SystemButtonClose.Pressed = new Office2007SystemButtonStateColorTable();
+            table.SystemButtonClose.Pressed.Foreground = new LinearGradientColorTable(factory.GetColor(Color.White));
+            table.SystemButtonClose.Pressed.LightShade = Color.Empty;
+            table.SystemButtonClose.Pressed.DarkShade = Color.Empty;
+            table.SystemButtonClose.Pressed.TopBackground = new LinearGradientColorTable(factory.GetColor(0xF1707A)); ;
+            table.SystemButtonClose.Pressed.TopHighlight = null;
+            table.SystemButtonClose.Pressed.BottomBackground = null;
+            table.SystemButtonClose.Pressed.BottomHighlight = null;
+            table.SystemButtonClose.Pressed.OuterBorder = null;
+            table.SystemButtonClose.Pressed.InnerBorder = null;
+
+            // Form border
+            table.Form.Active.BorderColors = new Color[] {
+                factory.GetColor(metroColors.BaseColor),
+                factory.GetColor(metroColors.CanvasColor),
+                factory.GetColor(metroColors.CanvasColor),
+                factory.GetColor(metroColors.CanvasColor),
+                factory.GetColor(metroColors.CanvasColor)
+            };
+
+            table.Form.Inactive.BorderColors = new Color[] {
+                factory.GetColor(metroColors.BaseColor),
+                factory.GetColor(metroColors.CanvasColor),
+                factory.GetColor(metroColors.CanvasColor),
+                factory.GetColor(metroColors.CanvasColor),
+                factory.GetColor(metroColors.CanvasColor)
+            };
+
+            // Form Caption Active
+            table.Form.Active.CaptionTopBackground = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor));
+            table.Form.Active.CaptionBottomBackground = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor));
+            table.Form.Active.CaptionBottomBorder = null;
+            table.Form.Active.CaptionText = factory.GetColor(metroColors.TextLightColor);
+            table.Form.Active.CaptionTextExtra = factory.GetColor(metroColors.TextInactiveColor);
+
+            // Form Caption Inactive
+            table.Form.Inactive.CaptionTopBackground = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor));
+            table.Form.Inactive.CaptionBottomBackground = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor));
+            table.Form.Inactive.CaptionText = factory.GetColor(metroColors.CanvasColorLightShade);
+            table.Form.Inactive.CaptionTextExtra = factory.GetColor(metroColors.CanvasColorLighterShade);
+
+            table.Form.BackColor = factory.GetColor(metroColors.CanvasColor);
+            table.Form.TextColor = factory.GetColor(metroColors.TextColor);
+            table.Form.MdiClientBackgroundImage = null; // BarFunctions.LoadBitmap("SystemImages.Office2010SilverClientBackground.png");
+            #endregion
+
+            #region Quick Access Toolbar Background
+            table.QuickAccessToolbar.Active.TopBackground = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(0xDEE7F4), factory.GetColor(0xE6EEF9));
+            table.QuickAccessToolbar.Active.BottomBackground = LinearGradientColorTable.Empty; //new LinearGradientColorTable(factory.GetColor(0xDBE7F7), factory.GetColor(0xC9D9EE));
+            table.QuickAccessToolbar.Active.OutterBorderColor = Color.Empty; // factory.GetColor(0xF6F9FC);
+            table.QuickAccessToolbar.Active.MiddleBorderColor = Color.Empty; // factory.GetColor(0x9AB3D5);
+            table.QuickAccessToolbar.Active.InnerBorderColor = Color.Empty; //  factory.GetColor(0xD2E3F9);
+
+            table.QuickAccessToolbar.Inactive.TopBackground = LinearGradientColorTable.Empty; //new LinearGradientColorTable(factory.GetColor(0xE6ECF3), factory.GetColor(0xCED8E6));
+            table.QuickAccessToolbar.Inactive.BottomBackground = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(0xCED8E6), factory.GetColor(0xC8D3E3));
+            table.QuickAccessToolbar.Inactive.OutterBorderColor = Color.Empty; // factory.GetColor(0xF6F9FC);
+            table.QuickAccessToolbar.Inactive.MiddleBorderColor = Color.Empty; // factory.GetColor(0x9AB3D5);
+            table.QuickAccessToolbar.Inactive.InnerBorderColor = Color.Empty;
+
+            table.QuickAccessToolbar.Standalone.TopBackground = new LinearGradientColorTable();
+            table.QuickAccessToolbar.Standalone.BottomBackground = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor));
+            table.QuickAccessToolbar.Standalone.OutterBorderColor = factory.GetColor(metroColors.CanvasColorLightShade);
+            table.QuickAccessToolbar.Standalone.MiddleBorderColor = Color.Empty;
+            table.QuickAccessToolbar.Standalone.InnerBorderColor = Color.Empty; // factory.GetColor(0xDCE8F7);
+
+            table.QuickAccessToolbar.QatCustomizeMenuLabelBackground = factory.GetColor(metroColors.CanvasColorLighterShade);
+            table.QuickAccessToolbar.QatCustomizeMenuLabelText = factory.GetColor(metroColors.CanvasColorDarkShade);
+
+            table.QuickAccessToolbar.Active.GlassBorder = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(Color.FromArgb(132, Color.Black)), Color.FromArgb(80, Color.Black));
+            table.QuickAccessToolbar.Inactive.GlassBorder = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(Color.FromArgb(132, Color.Black)), Color.FromArgb(80, Color.Black));
+            #endregion
+
+            #region Tab Colors
+            table.TabControl.Default = new Office2007TabItemStateColorTable();
+            table.TabControl.Default.TopBackground = LinearGradientColorTable.Empty;
+            table.TabControl.Default.BottomBackground = LinearGradientColorTable.Empty;
+            table.TabControl.Default.InnerBorder = Color.Empty;
+            table.TabControl.Default.OuterBorder = Color.Empty;
+            table.TabControl.Default.Text = factory.GetColor(metroColors.TextColor);
+
+            table.TabControl.MouseOver = new Office2007TabItemStateColorTable();
+            table.TabControl.MouseOver.TopBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight1), Color.Empty);
+            table.TabControl.MouseOver.BottomBackground = LinearGradientColorTable.Empty;
+            table.TabControl.MouseOver.InnerBorder = Color.Empty;
+            table.TabControl.MouseOver.OuterBorder = factory.GetColor(metroColors.BaseColorLight1);
+            table.TabControl.MouseOver.Text = metroColors.TextColor;
+
+            table.TabControl.Selected = new Office2007TabItemStateColorTable();
+            table.TabControl.Selected.TopBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor), Color.Empty);
+            table.TabControl.Selected.BottomBackground = LinearGradientColorTable.Empty; ;
+            table.TabControl.Selected.InnerBorder = Color.Empty;
+            table.TabControl.Selected.OuterBorder = factory.GetColor(metroColors.BaseColor);
+            table.TabControl.Selected.Text = metroColors.BaseTextColor;
+
+            table.TabControl.TabBackground = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor));
+            table.TabControl.TabPanelBackground = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor), Color.Empty);
+            table.TabControl.TabPanelBorder = metroColors.CanvasColorLightShade;
+            #endregion
+
+            #region Dock TabStrip Colors
+            table.DockTabStrip = new Office2007TabColorTable();
+            table.DockTabStrip.Default = new Office2007TabItemStateColorTable();
+            table.DockTabStrip.Default.TopBackground = LinearGradientColorTable.Empty;
+            table.DockTabStrip.Default.BottomBackground = LinearGradientColorTable.Empty;
+            table.DockTabStrip.Default.InnerBorder = Color.Empty;
+            table.DockTabStrip.Default.OuterBorder = Color.Empty;
+            table.DockTabStrip.Default.Text = factory.GetColor(metroColors.TextColor);
+
+            table.DockTabStrip.MouseOver = new Office2007TabItemStateColorTable();
+            table.DockTabStrip.MouseOver.TopBackground = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColorLight), Color.Empty);
+            table.DockTabStrip.MouseOver.BottomBackground = LinearGradientColorTable.Empty;
+            table.DockTabStrip.MouseOver.InnerBorder = Color.Empty;
+            table.DockTabStrip.MouseOver.OuterBorder = Color.Empty;
+            table.DockTabStrip.MouseOver.Text = metroColors.BaseColor;
+
+            table.DockTabStrip.Selected = new Office2007TabItemStateColorTable();
+            table.DockTabStrip.Selected.TopBackground = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColorLight), Color.Empty);
+            table.DockTabStrip.Selected.BottomBackground = LinearGradientColorTable.Empty;
+            table.DockTabStrip.Selected.InnerBorder = Color.Empty;
+            table.DockTabStrip.Selected.OuterBorder = factory.GetColor(metroColors.CanvasColorLighterShade);
+            table.DockTabStrip.Selected.Text = metroColors.BaseColor;
+
+            table.DockTabStrip.TabBackground = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor));
+            table.DockTabStrip.TabPanelBackground = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColorLight), Color.Empty);
+            table.DockTabStrip.TabPanelBorder = metroColors.CanvasColorLightShade;
+            #endregion
+
+            #region CheckBoxItem
+            table.CheckBoxItem = GetCheckBoxItem(factory, metroColors);
+
+            Office2007CheckBoxColorTable chk = GetCheckBoxItem(factory, metroColors);
+            chk.Default.Text = factory.GetColor(metroColors.BaseTextColor);
+            chk.MouseOver.Text = factory.GetColor(metroColors.BaseTextColor);
+            chk.Pressed.Text = factory.GetColor(metroColors.BaseTextColor);
+            table.ContextualTables.Add(Office2007ColorTable.GetContextualKey(typeof(Office2007CheckBoxColorTable), typeof(Bar)) + "+StatusBar", chk);
+            table.ContextualTables.Add(Office2007ColorTable.GetContextualKey(typeof(Office2007CheckBoxColorTable), typeof(MetroStatusBar)), chk);
+            #endregion
+
+            #region Scroll Bar Colors
+            InitializeScrollBarColorTable(table, factory, metroColors);
+            InitializeAppBlueScrollBarColorTable(table, factory, metroColors);
+            #endregion
+
+            #region ProgressBarItem
+            Office2007ProgressBarColorTable pct = table.ProgressBarItem;
+            pct.BackgroundColors = new GradientColorTable(metroColors.CanvasColor);
+            pct.OuterBorder = factory.GetColor(metroColors.BaseColorDarker);
+            pct.InnerBorder = Color.Empty;
+            pct.Chunk = new GradientColorTable(metroColors.BaseColor);
+            pct.ChunkOverlay = new GradientColorTable();
+            //pct.ChunkOverlay.LinearGradientAngle = 90;
+            //pct.ChunkOverlay.Colors.AddRange(new BackgroundColorBlend[] {
+            //    new BackgroundColorBlend(Color.FromArgb(192, factory.GetColor(metroColors.BaseColorLight)), 0f),
+            //    new BackgroundColorBlend(Color.FromArgb(128, factory.GetColor(metroColors.BaseColor)), .5f),
+            //    new BackgroundColorBlend(Color.FromArgb(64, factory.GetColor(metroColors.BaseColor)), .5f),
+            //    new BackgroundColorBlend(Color.Transparent, 1f),
+            //});
+            //pct.ChunkShadow = new GradientColorTable(0xB2B9C8, 0xD5DAE5, 0);
+            pct.ChunkShadow = new GradientColorTable();
+
+            // Paused State
+            pct = table.ProgressBarItemPaused;
+            pct.BackgroundColors = new GradientColorTable(0xEBEDF0, 0xD5D8DC);
+            pct.OuterBorder = factory.GetColor(0x868B91);
+            pct.InnerBorder = factory.GetColor(0xFFFFFF);
+            pct.Chunk = new GradientColorTable(0xAEA700, 0xFFFDCD, 0);
+            pct.ChunkOverlay = new GradientColorTable();
+            pct.ChunkOverlay.LinearGradientAngle = 90;
+            pct.ChunkOverlay.Colors.AddRange(new BackgroundColorBlend[] {
+                new BackgroundColorBlend(Color.FromArgb(192, factory.GetColor(0xFFFBA3)), 0f),
+                new BackgroundColorBlend(Color.FromArgb(128, factory.GetColor(0xD2CA00)), .5f),
+                new BackgroundColorBlend(Color.FromArgb(64, factory.GetColor(0xFEF400)), .5f),
+                new BackgroundColorBlend(Color.Transparent, 1f),
+            });
+            pct.ChunkShadow = new GradientColorTable(0xB2B9C8, 0xD5DAE5, 0);
+
+            // Error State
+            pct = table.ProgressBarItemError;
+            pct.BackgroundColors = new GradientColorTable(0xEBEDF0, 0xD5D8DC);
+            pct.OuterBorder = factory.GetColor(0x868B91);
+            pct.InnerBorder = factory.GetColor(0xFFFFFF);
+            pct.Chunk = new GradientColorTable(0xD20000, 0xFFCDCD, 0);
+            pct.ChunkOverlay = new GradientColorTable();
+            pct.ChunkOverlay.LinearGradientAngle = 90;
+            pct.ChunkOverlay.Colors.AddRange(new BackgroundColorBlend[] {
+                new BackgroundColorBlend(Color.FromArgb(192, factory.GetColor(0xFF8F8F)), 0f),
+                new BackgroundColorBlend(Color.FromArgb(128, factory.GetColor(0xD20000)), .5f),
+                new BackgroundColorBlend(Color.FromArgb(64, factory.GetColor(0xFE0000)), .5f),
+                new BackgroundColorBlend(Color.Transparent, 1f),
+            });
+            pct.ChunkShadow = new GradientColorTable(0xB2B9C8, 0xD5DAE5, 0);
+            #endregion
+
+            #region Gallery
+            Office2007GalleryColorTable gallery = table.Gallery;
+            gallery.GroupLabelBackground = factory.GetColor(metroColors.CanvasColorLighterShade);
+            gallery.GroupLabelText = factory.GetColor(metroColors.CanvasColorDarkShade);
+            gallery.GroupLabelBorder = Color.Empty;
+            #endregion
+
+            #region Legacy Colors
+            table.LegacyColors.BarBackground = factory.GetColor(metroColors.CanvasColor);
+            table.LegacyColors.BarBackground2 = Color.Empty;
+            table.LegacyColors.BarStripeColor = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.LegacyColors.BarCaptionBackground = factory.GetColor(metroColors.BaseColor);
+            table.LegacyColors.BarCaptionBackground2 = Color.Empty;
+            table.LegacyColors.BarCaptionInactiveBackground = factory.GetColor(metroColors.CanvasColor);
+            table.LegacyColors.BarCaptionInactiveBackground2 = Color.Empty;
+            table.LegacyColors.BarCaptionInactiveText = factory.GetColor(metroColors.TextDisabledColor);
+            table.LegacyColors.BarCaptionText = factory.GetColor(metroColors.BaseTextColor);
+            table.LegacyColors.BarFloatingBorder = factory.GetColor(metroColors.BaseColor);
+            table.LegacyColors.BarPopupBackground = factory.GetColor(metroColors.CanvasColor);
+            table.LegacyColors.BarPopupBorder = factory.GetColor(metroColors.BaseColor);
+            table.LegacyColors.ItemBackground = Color.Empty;
+            table.LegacyColors.ItemBackground2 = Color.Empty;
+            table.LegacyColors.ItemCheckedBackground = Color.Empty;
+            table.LegacyColors.ItemCheckedBackground2 = Color.Empty;
+            table.LegacyColors.ItemCheckedBorder = factory.GetColor(metroColors.BaseColor);
+            table.LegacyColors.ItemCheckedText = factory.GetColor(metroColors.TextColor);
+            table.LegacyColors.ItemDisabledBackground = Color.Empty;
+            table.LegacyColors.ItemDisabledText = factory.GetColor(metroColors.TextDisabledColor);
+            table.LegacyColors.ItemExpandedShadow = Color.Empty;
+            table.LegacyColors.ItemExpandedBackground = factory.GetColor(metroColors.CanvasColorLightShade);
+            table.LegacyColors.ItemExpandedBackground2 = Color.Empty;
+            table.LegacyColors.ItemExpandedText = factory.GetColor(metroColors.TextColor);
+            table.LegacyColors.ItemExpandedBorder = factory.GetColor(metroColors.CanvasColorLightShade);
+            table.LegacyColors.ItemHotBackground = factory.GetColor(metroColors.CanvasColorLightShade);
+            table.LegacyColors.ItemHotBackground2 = Color.Empty;
+            table.LegacyColors.ItemHotBorder = factory.GetColor(metroColors.CanvasColorLight);
+            table.LegacyColors.ItemHotText = factory.GetColor(metroColors.TextColor);
+            table.LegacyColors.ItemPressedBackground = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.LegacyColors.ItemPressedBackground2 = Color.Empty;
+            table.LegacyColors.ItemPressedBorder = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.LegacyColors.ItemPressedText = factory.GetColor(metroColors.TextColor);
+            table.LegacyColors.ItemSeparator = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.LegacyColors.ItemSeparatorShade = Color.Empty;
+            table.LegacyColors.ItemText = factory.GetColor(metroColors.TextColor);
+            table.LegacyColors.MenuBackground = factory.GetColor(metroColors.CanvasColor);
+            table.LegacyColors.MenuBackground2 = Color.Empty;
+            table.LegacyColors.MenuBarBackground = factory.GetColor(metroColors.CanvasColor);
+            table.LegacyColors.MenuBorder = table.LegacyColors.ItemExpandedBorder;
+            table.LegacyColors.MenuSide = factory.GetColor(metroColors.CanvasColor);
+            table.LegacyColors.MenuSide2 = Color.Empty;
+            table.LegacyColors.MenuUnusedBackground = table.LegacyColors.MenuBackground;
+            table.LegacyColors.MenuUnusedSide = Color.Empty;
+            table.LegacyColors.MenuUnusedSide2 = Color.Empty;
+            table.LegacyColors.ItemDesignTimeBorder = Color.Black;
+            table.LegacyColors.BarDockedBorder = Color.Empty;
+            table.LegacyColors.DockSiteBackColor = factory.GetColor(metroColors.CanvasColorLighterShade);
+            table.LegacyColors.DockSiteBackColor2 = Color.Empty;
+            table.LegacyColors.CustomizeBackground = Color.Empty;
+            table.LegacyColors.CustomizeBackground2 = Color.Empty;
+            table.LegacyColors.CustomizeText = factory.GetColor(metroColors.TextInactiveColor);
+            table.LegacyColors.PanelBackground = factory.GetColor(metroColors.CanvasColor);
+            table.LegacyColors.PanelBackground2 = Color.Empty;
+            table.LegacyColors.PanelText = factory.GetColor(metroColors.TextColor);
+            table.LegacyColors.PanelBorder = factory.GetColor(metroColors.CanvasColorLighterShade);
+            table.LegacyColors.ExplorerBarBackground = factory.GetColor(metroColors.CanvasColorLight);
+            table.LegacyColors.ExplorerBarBackground2 = Color.Empty;
+            table.LegacyColors.SplitterBackground = table.LegacyColors.PanelBackground;
+            table.LegacyColors.SplitterBackground2 = table.LegacyColors.PanelBackground2;
+            table.LegacyColors.SplitterText = table.LegacyColors.PanelText;
+            table.LegacyColors.SplitterBorder = table.LegacyColors.PanelBorder;
+
+            table.LegacyColors.AutoHideTabBackground = factory.GetColor(metroColors.CanvasColor);
+            table.LegacyColors.AutoHideTabText = factory.GetColor(metroColors.TextColor);
+            table.LegacyColors.AutoHideTabBorder = factory.GetColor(metroColors.CanvasColorLightShade);
+            table.LegacyColors.AutoHideSelectedTabBackground = factory.GetColor(metroColors.CanvasColor);
+            table.LegacyColors.AutoHideSelectedTabBorder = factory.GetColor(metroColors.BaseColor);
+            table.LegacyColors.AutoHideSelectedTabText = factory.GetColor(metroColors.BaseColor);
+            
+            #endregion
+
+            #region Navigation Pane
+            table.NavigationPane.ButtonBackground = new GradientColorTable();
+            table.NavigationPane.ButtonBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(metroColors.CanvasColor), 0));
+            #endregion
+
+            #region SuperTooltip
+            table.SuperTooltip.BackgroundColors = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor));
+            table.SuperTooltip.TextColor = factory.GetColor(metroColors.TextColor);
+            #endregion
+
+            #region Slider
+            Office2007SliderColorTable sl = table.Slider;
+            sl.Default.LabelColor = factory.GetColor(metroColors.TextColor);
+            sl.Default.SliderLabelColor = factory.GetColor(metroColors.TextColor);
+            sl.Default.PartBackground = new GradientColorTable();
+            sl.Default.PartBorderColor = Color.Empty;
+            sl.Default.PartBorderLightColor = Color.Empty;
+            sl.Default.PartForeColor = factory.GetColor(metroColors.TextDisabledColor);
+            sl.Default.PartForeLightColor = Color.Empty;
+            sl.Default.TrackLineColor = factory.GetColor(metroColors.TextDisabledColor);
+            sl.Default.TrackLineLightColor = factory.GetColor(Color.FromArgb(48, Color.White));
+
+            sl.MouseOver.LabelColor = factory.GetColor(metroColors.TextColor);
+            sl.MouseOver.SliderLabelColor = factory.GetColor(metroColors.TextColor);
+            sl.MouseOver.PartBackground = new GradientColorTable();
+            sl.MouseOver.PartBorderColor = Color.Empty;
+            sl.MouseOver.PartBorderLightColor = Color.Empty;
+            sl.MouseOver.PartForeColor = factory.GetColor(metroColors.TextColor);
+            sl.MouseOver.PartForeLightColor = Color.Empty;
+            sl.MouseOver.TrackLineColor = factory.GetColor(metroColors.BaseColorDark);
+            sl.MouseOver.TrackLineLightColor = factory.GetColor(Color.FromArgb(48, Color.White));
+
+            sl.Pressed.LabelColor = factory.GetColor(metroColors.TextColor);
+            sl.Pressed.SliderLabelColor = factory.GetColor(metroColors.TextColor);
+            sl.Pressed.PartBackground = new GradientColorTable();
+            sl.Pressed.PartBorderColor = Color.Empty;
+            sl.Pressed.PartBorderLightColor = Color.Empty;
+            sl.Pressed.PartForeColor = factory.GetColor(metroColors.TextColor);
+            sl.Pressed.PartForeLightColor = Color.Empty;
+            sl.Pressed.TrackLineColor = factory.GetColor(metroColors.TextColor);
+            sl.Pressed.TrackLineLightColor = factory.GetColor(Color.FromArgb(48, Color.White));
+
+            ColorBlendFactory df = new ColorBlendFactory(ColorScheme.GetColor(0xCFCFCF));
+            sl.Disabled.LabelColor = factory.GetColor(metroColors.TextDisabledColor);
+            sl.Disabled.SliderLabelColor = factory.GetColor(metroColors.TextDisabledColor);
+            sl.Disabled.PartBackground = new GradientColorTable();
+            sl.Disabled.PartBorderColor = df.GetColor(sl.Default.PartBorderColor);
+            sl.Disabled.PartBorderLightColor = df.GetColor(sl.Default.PartBorderLightColor);
+            sl.Disabled.PartForeColor = df.GetColor(sl.Default.PartForeColor);
+            sl.Disabled.PartForeLightColor = df.GetColor(sl.Default.PartForeLightColor);
+            sl.Disabled.TrackLineColor = df.GetColor(sl.Default.TrackLineColor);
+            sl.Disabled.TrackLineLightColor = df.GetColor(sl.Default.TrackLineLightColor);
+
+            sl.TrackPart = new Office2007SliderPartColorTable();
+            sl.TrackPart.Default.LabelColor = factory.GetColor(metroColors.TextDisabledColor);
+            sl.TrackPart.Default.SliderLabelColor = factory.GetColor(metroColors.TextColor);
+            sl.TrackPart.Default.PartBackground = new GradientColorTable(factory.GetColor(metroColors.TextDisabledColor));
+            sl.TrackPart.Default.PartBorderColor = factory.GetColor(metroColors.TextDisabledColor);
+            sl.TrackPart.Default.PartBorderLightColor = Color.Empty;
+            sl.TrackPart.Default.PartForeColor = factory.GetColor(metroColors.TextDisabledColor);
+            sl.TrackPart.Default.PartForeLightColor = factory.GetColor(metroColors.TextDisabledColor);
+            sl.TrackPart.Default.TrackLineColor = factory.GetColor(metroColors.TextDisabledColor);
+            sl.TrackPart.Default.TrackLineLightColor = factory.GetColor(Color.FromArgb(48, Color.White));
+            sl.TrackPart.MouseOver.LabelColor = factory.GetColor(metroColors.TextColor);
+            sl.TrackPart.MouseOver.SliderLabelColor = factory.GetColor(metroColors.TextColor);
+            sl.TrackPart.MouseOver.PartBackground = new GradientColorTable(factory.GetColor(metroColors.TextColor));
+            sl.TrackPart.MouseOver.PartBorderColor = factory.GetColor(metroColors.TextColor);
+            sl.TrackPart.MouseOver.PartBorderLightColor = Color.Empty;
+            sl.TrackPart.MouseOver.PartForeColor = factory.GetColor(metroColors.TextColor);
+            sl.TrackPart.MouseOver.PartForeLightColor = factory.GetColor(metroColors.TextColor);
+            sl.TrackPart.MouseOver.TrackLineColor = factory.GetColor(metroColors.TextDisabledColor);
+            sl.TrackPart.MouseOver.TrackLineLightColor = factory.GetColor(Color.FromArgb(48, Color.White));
+            sl.TrackPart.Pressed = sl.TrackPart.MouseOver;
+
+            // Contextual Table when on StatusBar
+            sl = new Office2007SliderColorTable();
+            sl.Default.LabelColor = factory.GetColor(metroColors.TextColor);
+            sl.Default.SliderLabelColor = factory.GetColor(metroColors.TextColor);
+            sl.Default.PartBackground = new GradientColorTable();
+            sl.Default.PartBorderColor = Color.Empty;
+            sl.Default.PartBorderLightColor = Color.Empty;
+            sl.Default.PartForeColor = factory.GetColor(metroColors.CanvasColor);
+            sl.Default.PartForeLightColor = factory.GetColor(metroColors.BaseColorDark);
+            sl.Default.TrackLineColor = factory.GetColor(metroColors.BaseColorDark);
+            sl.Default.TrackLineLightColor = factory.GetColor(Color.FromArgb(48, Color.White));
+
+            sl.MouseOver.LabelColor = factory.GetColor(metroColors.TextColor);
+            sl.MouseOver.SliderLabelColor = factory.GetColor(metroColors.TextColor);
+            sl.MouseOver.PartBackground = new GradientColorTable();
+            sl.MouseOver.PartBorderColor = Color.Empty;
+            sl.MouseOver.PartBorderLightColor = Color.Empty;
+            sl.MouseOver.PartForeColor = factory.GetColor(metroColors.CanvasColor);
+            sl.MouseOver.PartForeLightColor = factory.GetColor(metroColors.BaseColorDark);
+            sl.MouseOver.TrackLineColor = factory.GetColor(metroColors.BaseColorDark);
+            sl.MouseOver.TrackLineLightColor = factory.GetColor(Color.FromArgb(48, Color.White));
+
+            sl.Pressed.LabelColor = factory.GetColor(metroColors.TextColor);
+            sl.Pressed.SliderLabelColor = factory.GetColor(metroColors.TextColor);
+            sl.Pressed.PartBackground = new GradientColorTable();
+            sl.Pressed.PartBorderColor = Color.Empty;
+            sl.Pressed.PartBorderLightColor = Color.Empty;
+            sl.Pressed.PartForeColor = factory.GetColor(metroColors.CanvasColorLighterShade);
+            sl.Pressed.PartForeLightColor = factory.GetColor(metroColors.BaseColorDark);
+            sl.Pressed.TrackLineColor = factory.GetColor(metroColors.CanvasColorDarkShade);
+            sl.Pressed.TrackLineLightColor = factory.GetColor(Color.FromArgb(48, Color.White));
+
+            df = new ColorBlendFactory(ColorScheme.GetColor(0xCFCFCF));
+            sl.Disabled.LabelColor = factory.GetColor(metroColors.TextDisabledColor);
+            sl.Disabled.SliderLabelColor = factory.GetColor(metroColors.TextDisabledColor);
+            sl.Disabled.PartBackground = new GradientColorTable();
+            foreach (BackgroundColorBlend b in sl.Default.PartBackground.Colors)
+                sl.Disabled.PartBackground.Colors.Add(new BackgroundColorBlend(df.GetColor(b.Color), b.Position));
+            sl.Disabled.PartBorderColor = df.GetColor(sl.Default.PartBorderColor);
+            sl.Disabled.PartBorderLightColor = df.GetColor(sl.Default.PartBorderLightColor);
+            sl.Disabled.PartForeColor = df.GetColor(sl.Default.PartForeColor);
+            sl.Disabled.PartForeLightColor = df.GetColor(sl.Default.PartForeLightColor);
+            sl.Disabled.TrackLineColor = df.GetColor(sl.Default.TrackLineColor);
+            sl.Disabled.TrackLineLightColor = df.GetColor(sl.Default.TrackLineLightColor);
+
+            sl.TrackPart = new Office2007SliderPartColorTable();
+            sl.TrackPart.Default.LabelColor = factory.GetColor(metroColors.BaseTextColor);
+            sl.TrackPart.Default.SliderLabelColor = factory.GetColor(metroColors.TextColor);
+            sl.TrackPart.Default.PartBackground = new GradientColorTable(factory.GetColor(metroColors.CanvasColor));
+            sl.TrackPart.Default.PartBorderColor = factory.GetColor(metroColors.BaseColorDarker);
+            sl.TrackPart.Default.PartBorderLightColor = Color.Empty;
+            sl.TrackPart.Default.PartForeColor = factory.GetColor(metroColors.CanvasColor);
+            sl.TrackPart.Default.PartForeLightColor = factory.GetColor(metroColors.CanvasColor);
+            sl.TrackPart.Default.TrackLineColor = factory.GetColor(metroColors.BaseColorDark);
+            sl.TrackPart.Default.TrackLineLightColor = factory.GetColor(Color.FromArgb(48, Color.White));
+            sl.TrackPart.MouseOver = sl.TrackPart.Default;
+            sl.TrackPart.Pressed = sl.TrackPart.Default;
+
+            table.ContextualTables.Add(Office2007ColorTable.GetContextualKey(typeof(Office2007SliderColorTable), typeof(Bar)) + "+StatusBar", sl);
+            table.ContextualTables.Add(Office2007ColorTable.GetContextualKey(typeof(Office2007SliderColorTable), typeof(MetroStatusBar)), sl);
+            #endregion
+
+            #region RangeSlider
+            MetroOfficeColorTableInitializer.InitRangeSlider(table, factory, metroColors);
+            #endregion
+
+            #region ListViewEx
+            table.ListViewEx.Border = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.ListViewEx.ColumnBackground = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColorLightShade));
+            table.ListViewEx.ColumnSeparator = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.ListViewEx.ColumnForeColor = factory.GetColor(metroColors.TextColor);
+            table.ListViewEx.SelectionBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor), Color.Empty);
+            table.ListViewEx.SelectionBorder = Color.Empty;
+            table.ListViewEx.SelectionForeColor = factory.GetColor(metroColors.BaseTextColor);
+            #endregion
+
+            #region DataGridView
+            table.DataGridView.BackgroundColor = factory.GetColor(metroColors.CanvasColor);
+            table.DataGridView.DefaultCellBackground = factory.GetColor(metroColors.CanvasColor);
+            table.DataGridView.DefaultCellText = factory.GetColor(metroColors.TextColor);
+            table.DataGridView.ColumnHeaderNormalBorder = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.DataGridView.ColumnHeaderNormalBackground = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColorLightShade));
+            table.DataGridView.ColumnHeaderNormalText = factory.GetColor(metroColors.TextColor);
+            table.DataGridView.ColumnHeaderSelectedBackground = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColorLighterShade));
+            table.DataGridView.ColumnHeaderSelectedText = factory.GetColor(metroColors.TextColor);
+            table.DataGridView.ColumnHeaderSelectedBorder = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.DataGridView.ColumnHeaderSelectedMouseOverBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            table.DataGridView.ColumnHeaderSelectedMouseOverBorder = factory.GetColor(metroColors.BaseColorDark);
+            table.DataGridView.ColumnHeaderMouseOverBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            table.DataGridView.ColumnHeaderMouseOverBorder = factory.GetColor(metroColors.BaseColorDark);
+            table.DataGridView.ColumnHeaderPressedBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            table.DataGridView.ColumnHeaderPressedBorder = factory.GetColor(metroColors.BaseColorDark);
+
+            table.DataGridView.RowNormalBackground = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColorLightShade));
+            table.DataGridView.RowNormalBorder = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.DataGridView.RowSelectedBackground = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColorLighterShade));
+            table.DataGridView.RowSelectedBorder = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.DataGridView.RowSelectedMouseOverBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            table.DataGridView.RowSelectedMouseOverBorder = factory.GetColor(metroColors.BaseColorDark);
+            table.DataGridView.RowMouseOverBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            table.DataGridView.RowMouseOverBorder = factory.GetColor(metroColors.BaseColorDark);
+            table.DataGridView.RowPressedBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            table.DataGridView.RowPressedBorder = factory.GetColor(metroColors.BaseColorDark);
+
+            table.DataGridView.GridColor = factory.GetColor(metroColors.CanvasColorDarkShade);
+
+            table.DataGridView.SelectorBackground = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColorLightShade));
+            table.DataGridView.SelectorBorder = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.DataGridView.SelectorBorderDark = Color.Empty;// factory.GetColor(0xC3C3C3);
+            table.DataGridView.SelectorBorderLight = Color.Empty;// factory.GetColor(0xF9F9F9);
+            table.DataGridView.SelectorSign = new LinearGradientColorTable(factory.GetColor(metroColors.TextColor));
+
+            table.DataGridView.SelectorMouseOverBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            table.DataGridView.SelectorMouseOverBorder = factory.GetColor(metroColors.BaseColorDark);
+            table.DataGridView.SelectorMouseOverBorderDark = Color.Empty;// factory.GetColor(0xB0CFF7);
+            table.DataGridView.SelectorMouseOverBorderLight = Color.Empty; // factory.GetColor(0xD5E4F2);
+            table.DataGridView.SelectorMouseOverSign = new LinearGradientColorTable(factory.GetColor(metroColors.TextColor));
+            #endregion
+
+            #region SideBar
+            table.SideBar.Background = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor));
+            table.SideBar.Border = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.SideBar.SideBarPanelItemText = factory.GetColor(metroColors.TextColor);
+            table.SideBar.SideBarPanelItemDefault = new GradientColorTable();
+            table.SideBar.SideBarPanelItemDefault.Colors.Add(new BackgroundColorBlend(factory.GetColor(metroColors.CanvasColor), 0));
+            table.SideBar.SideBarPanelItemDefault.Colors.Add(new BackgroundColorBlend(factory.GetColor(metroColors.CanvasColor), 1));
+            // Expanded
+            table.SideBar.SideBarPanelItemExpanded = new GradientColorTable();
+            table.SideBar.SideBarPanelItemExpanded.Colors.Add(new BackgroundColorBlend(factory.GetColor(metroColors.BaseColor), 0));
+            table.SideBar.SideBarPanelItemExpanded.Colors.Add(new BackgroundColorBlend(factory.GetColor(metroColors.BaseColor), 1));
+            // MouseOver
+            table.SideBar.SideBarPanelItemMouseOver = new GradientColorTable();
+            table.SideBar.SideBarPanelItemMouseOver.Colors.Add(new BackgroundColorBlend(factory.GetColor(metroColors.BaseColor), 0));
+            table.SideBar.SideBarPanelItemMouseOver.Colors.Add(new BackgroundColorBlend(factory.GetColor(metroColors.BaseColorDark), 1));
+            // Pressed
+            table.SideBar.SideBarPanelItemPressed = new GradientColorTable();
+            table.SideBar.SideBarPanelItemPressed.Colors.Add(new BackgroundColorBlend(factory.GetColor(metroColors.BaseColorDark), 0));
+            table.SideBar.SideBarPanelItemPressed.Colors.Add(new BackgroundColorBlend(factory.GetColor(metroColors.BaseColorDark), 1));
+            #endregion
+
+            #region AdvTree
+#if !NOTREE
+            table.AdvTree = new DevComponents.AdvTree.Display.TreeColorTable();
+            CreateAdvTreeColorTable(table.AdvTree, factory, metroColors);
+#endif
+            #endregion
+
+            #region CrumbBar
+            table.CrumbBarItemView = new CrumbBarItemViewColorTable();
+            CrumbBarItemViewStateColorTable crumbBarViewTable = new CrumbBarItemViewStateColorTable();
+            table.CrumbBarItemView.Default = crumbBarViewTable;
+            crumbBarViewTable.Foreground = factory.GetColor(metroColors.TextColor);
+            crumbBarViewTable = new CrumbBarItemViewStateColorTable();
+            table.CrumbBarItemView.MouseOver = crumbBarViewTable;
+            crumbBarViewTable.Foreground = factory.GetColor(metroColors.BaseTextColor);
+            crumbBarViewTable.Background = new BackgroundColorBlendCollection();
+            crumbBarViewTable.Background.AddRange(new BackgroundColorBlend[]{
+                new BackgroundColorBlend(factory.GetColor(metroColors.BaseColor), 0f),
+                new BackgroundColorBlend(factory.GetColor(metroColors.BaseColorDark), 1f)});
+            crumbBarViewTable.Border = factory.GetColor(metroColors.BaseColorDark);
+            crumbBarViewTable.BorderLight = Color.Empty; // factory.GetColor("90FFFFFF");
+            crumbBarViewTable = new CrumbBarItemViewStateColorTable();
+            table.CrumbBarItemView.MouseOverInactive = crumbBarViewTable;
+            crumbBarViewTable.Foreground = factory.GetColor(metroColors.BaseTextColor);
+            crumbBarViewTable.Background = new BackgroundColorBlendCollection();
+            crumbBarViewTable.Background.AddRange(new BackgroundColorBlend[]{
+                new BackgroundColorBlend(factory.GetColor(metroColors.BaseColor), 0f),
+                new BackgroundColorBlend(factory.GetColor(metroColors.BaseColor), 1f)});
+            crumbBarViewTable.Border = factory.GetColor(metroColors.BaseColorDark);
+            crumbBarViewTable.BorderLight = Color.Empty; // factory.GetColor("90FFFFFF");
+            crumbBarViewTable = new CrumbBarItemViewStateColorTable();
+            table.CrumbBarItemView.Pressed = crumbBarViewTable;
+            crumbBarViewTable.Foreground = factory.GetColor(metroColors.BaseTextColor);
+            crumbBarViewTable.Background = new BackgroundColorBlendCollection();
+            crumbBarViewTable.Background.AddRange(new BackgroundColorBlend[]{
+                new BackgroundColorBlend(factory.GetColor(metroColors.BaseColorDark), 0f),
+                new BackgroundColorBlend(factory.GetColor(metroColors.BaseColorDark), 1f)});
+            crumbBarViewTable.Border = factory.GetColor(metroColors.BaseColorDark);
+            crumbBarViewTable.BorderLight = Color.Empty; // factory.GetColor("408B7654");
+
+            #endregion
+
+            #region WarningBox
+            table.WarningBox.BackColor = factory.GetColor(factory.GetColor(metroColors.CanvasColor));
+            table.WarningBox.WarningBorderColor = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.WarningBox.WarningBackColor1 = factory.GetColor(metroColors.CanvasColor);
+            table.WarningBox.WarningBackColor2 = factory.GetColor(metroColors.CanvasColor);
+            #endregion
+
+            #region CalendarView
+
+            #region WeekDayViewColors
+
+            table.CalendarView.WeekDayViewColors = new ColorDef[]
+            {
+                new ColorDef(factory.GetColor(metroColors.CanvasColorLightShade)),           // DayViewBorder
+                new ColorDef(factory.GetColor(metroColors.CanvasColorDarkShade)),           // DayHeaderForeground
+
+                new ColorDef(new Color[] {factory.GetColor(metroColors.CanvasColor)},
+                new float[] {0f}, 90f),             // DayHeaderBackground
+
+                new ColorDef(factory.GetColor(metroColors.CanvasColorLightShade)),           // DayHeaderBorder
+
+                new ColorDef(factory.GetColor(metroColors.CanvasColor)),           // DayWorkHoursBackground
+                new ColorDef(factory.GetColor(metroColors.CanvasColorLightShade)),           // DayAllDayEventBackground
+                new ColorDef(factory.GetColor(metroColors.CanvasColorLighterShade)),           // DayOffWorkHoursBackground
+
+                new ColorDef(factory.GetColor(metroColors.CanvasColorDarkShade)),           // DayHourBorder
+                new ColorDef(factory.GetColor(metroColors.CanvasColorLightShade)),           // DayHalfHourBorder
+
+                new ColorDef(factory.GetColor(metroColors.BaseColor)),           // SelectionBackground
+
+                new ColorDef(factory.GetColor(metroColors.CanvasColorLightShade)),           // OwnerTabBorder
+
+                new ColorDef(factory.GetColor(metroColors.CanvasColor)),    // OwnerTabBackground
+
+                new ColorDef(factory.GetColor(metroColors.CanvasColorDarkShade)),           // OwnerTabForeground
+                new ColorDef(factory.GetColor(metroColors.CanvasColor)),           // OwnerTabContentBackground
+                new ColorDef(factory.GetColor(metroColors.CanvasColorDarkShade)),           // OwnerTabSelectedForeground
+                new ColorDef(factory.GetColor(metroColors.CanvasColorLighterShade)),           // OwnerTabSelectionBackground
+
+                new ColorDef(factory.GetColor(metroColors.CanvasColor)),           // CondensedViewBackground
+
+                new ColorDef(factory.GetColor(metroColors.CanvasColorLightShade)),           // NowDayViewBorder
+                new ColorDef(factory.GetColor(metroColors.CanvasColorDarkShade)),           // NowDayHeaderForeground - 0x15428B
+
+                new ColorDef(factory.GetColor(metroColors.CanvasColorLighterShade)),       // NowDayHeaderBackground
+                
+                new ColorDef(new Color[] {factory.GetColor(0xFFED79), factory.GetColor(0xFFD86B), factory.GetColor(0xFFBB00), factory.GetColor(0xFFEA77)},
+                new float[] {0f, .55f ,58f, 1f}, 90f),              // TimeIndicator
+
+                new ColorDef(factory.GetColor(0xEB8900)),           // TimeIndicatorBorder
+            };
+
+            #endregion
+
+            #region HourRulerColors
+
+            table.CalendarView.TimeRulerColors = new ColorDef[]
+            {
+                new ColorDef(factory.GetColor(metroColors.CanvasColor)),           // TimeRulerBackground
+                new ColorDef(factory.GetColor(metroColors.CanvasColorDarkShade)),           // TimeRulerForeground
+                new ColorDef(factory.GetColor(metroColors.CanvasColorDarkShade)),           // TimeRulerBorder
+                new ColorDef(factory.GetColor(metroColors.CanvasColorDarkShade)),           // TimeRulerTickBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xFFED79), factory.GetColor(0xFFD86B), factory.GetColor(0xFFBB00), factory.GetColor(0xFFEA77)},
+                new float[] {0f, .55f ,58f, 1f}, 90f),              // TimeRulerIndicator
+
+                new ColorDef(factory.GetColor(0xEB8900)),           // TimeRulerIndicatorBorder
+            };
+
+            #endregion
+
+            #region MonthViewColors
+
+            table.CalendarView.MonthViewColors = new ColorDef[]
+            {
+              new ColorDef(factory.GetColor(metroColors.CanvasColorLightShade)),           // DayOfWeekHeaderBorder
+
+                new ColorDef(factory.GetColor(metroColors.CanvasColor)),                    // DayOfWeekHeaderBackground
+
+                new ColorDef(factory.GetColor(metroColors.CanvasColorDarkShade)),           // DayOfWeekHeaderForeground
+                new ColorDef(factory.GetColor(metroColors.CanvasColorLightShade)),           // SideBarBorder
+
+                new ColorDef(factory.GetColor(metroColors.CanvasColor)),                   // SideBarBackground
+
+                new ColorDef(factory.GetColor(metroColors.CanvasColorDarkShade)),           // SideBarForeground
+                new ColorDef(factory.GetColor(metroColors.CanvasColorLightShade)),           // DayHeaderBorder
+
+                new ColorDef(factory.GetColor(metroColors.CanvasColor)),                    // DayHeaderBackground
+
+                new ColorDef(factory.GetColor(metroColors.CanvasColorDarkShade)),           // DayHeaderForeground
+                new ColorDef(factory.GetColor(metroColors.CanvasColorLightShade)),           // DayContentBorder
+                new ColorDef(factory.GetColor(metroColors.BaseColor)),           // DayContentSelectionBackground
+                new ColorDef(factory.GetColor(metroColors.CanvasColor)),           // DayContentActiveDayBackground
+                new ColorDef(factory.GetColor(metroColors.CanvasColor)),           // DayContentInactiveDayBackground
+
+                new ColorDef(factory.GetColor(metroColors.CanvasColorLightShade)),           // OwnerTabBorder
+
+                new ColorDef(factory.GetColor(metroColors.CanvasColor)),
+
+                new ColorDef(factory.GetColor(metroColors.CanvasColorLightShade)),           // OwnerTabForeground
+                new ColorDef(factory.GetColor(metroColors.CanvasColor)),           // OwnerTabContentBackground
+                new ColorDef(factory.GetColor(metroColors.CanvasColorDarkShade)),           // OwnerTabSelectedForeground
+                new ColorDef(factory.GetColor(metroColors.CanvasColor)),           // OwnerTabSelectionBackground
+
+                new ColorDef(factory.GetColor(metroColors.BaseColor)),           // NowDayViewBorder
+                new ColorDef(factory.GetColor(metroColors.TextColor)),           // NowDayHeaderForeground - 0x15428B
+
+                new ColorDef(factory.GetColor(metroColors.CanvasColorLighterShade)),              // NowDayHeaderBackground
+
+                new ColorDef(factory.GetColor(metroColors.TextColor)),   // ContentLinkForeground - DayHeaderForeground
+                new ColorDef(factory.GetColor(metroColors.CanvasColorLightShade)),            // ContentLinkBackground - DayContentActiveDayBackground
+            };
+
+            #endregion
+
+            #region AppointmentColors
+
+            table.CalendarView.AppointmentColors = new ColorDef[]
+            {
+                new ColorDef(factory.GetColor(metroColors.CanvasColorDarkShade)),           // DefaultBorder
+
+                new ColorDef(new Color[] {factory.GetColor(metroColors.BaseButtonGradientStart), factory.GetColor(metroColors.BaseButtonGradientEnd)},
+                             new float[] {0f, 1f}, 90f),            // DefaultBackground
+
+                new ColorDef(factory.GetColor(0x28518E)),           // BlueBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xB1C5EC), factory.GetColor(0x759DDA)}, 
+                             new float[] {0f, 1f}, 90f),            // BlueBackground
+
+                new ColorDef(factory.GetColor(0x2C6524)),           // GreenBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xC2E8BC), factory.GetColor(0x84D17B)},
+                             new float[] {0f, 1f}, 90f),            // GreenBackground
+
+                new ColorDef(factory.GetColor(0x8B3E0A)),           // OrangeBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xF9C7A0), factory.GetColor(0xF49758)},
+                             new float[] {0f, 1f}, 90f),            // OrangeBackground
+
+                new ColorDef(factory.GetColor(0x3E2771)),           // PurpleBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xC5B5E6), factory.GetColor(0x957BD2)},
+                             new float[] {0f, 1f}, 90f),            // PurpleBackground
+
+                new ColorDef(factory.GetColor(0x86171C)),           // RedBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xF1AAAC), factory.GetColor(0xE5676E)},
+                             new float[] {0f, 1f}, 90f),            // RedBackground
+
+                new ColorDef(factory.GetColor(0x7C7814)),           // YellowBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xFFFCAA), factory.GetColor(0xFFF958)},
+                             new float[] {0f, 1f}, 90f),            // YellowBackground
+
+                new ColorDef(factory.GetColor(-1)),                 // BusyTimeMarker
+                new ColorDef(factory.GetColor(0xFFFFFF)),           // FreeTimeMarker
+                new ColorDef(factory.GetColor(0x800080))            // OutOfOfficeTimeMarker
+            };
+
+            #endregion
+
+            #endregion
+
+            #region SuperTab
+
+            #region SuperTab
+
+            table.SuperTab.Background = new SuperTabLinearGradientColorTable(
+                factory.GetColor(metroColors.CanvasColor), Color.Empty);
+
+            table.SuperTab.InnerBorder = factory.GetColor(metroColors.CanvasColorLighterShade);
+            table.SuperTab.OuterBorder = factory.GetColor(metroColors.CanvasColorDarkShade);
+
+            table.SuperTab.ControlBoxDefault.Image = factory.GetColor(metroColors.CanvasColorDarkShade);
+
+            table.SuperTab.ControlBoxMouseOver.Background = factory.GetColor(metroColors.CanvasColorLightShade);
+            table.SuperTab.ControlBoxMouseOver.Border = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.SuperTab.ControlBoxMouseOver.Image = factory.GetColor(metroColors.TextColor);
+
+            table.SuperTab.ControlBoxPressed.Background = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.SuperTab.ControlBoxPressed.Border = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.SuperTab.ControlBoxPressed.Image = factory.GetColor(metroColors.TextColor);
+
+            table.SuperTab.InsertMarker = factory.GetColor(metroColors.BaseColor);
+
+            #endregion
+
+            #region SuperTabItem
+
+            // Top Default
+
+            table.SuperTabItem.Default.Normal.Background = new SuperTabLinearGradientColorTable(factory.GetColor(factory.GetColor(metroColors.CanvasColor)));
+
+            table.SuperTabItem.Default.Normal.InnerBorder = factory.GetColor(metroColors.CanvasColorLighterShade);
+            table.SuperTabItem.Default.Normal.OuterBorder = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.SuperTabItem.Default.Normal.Text = factory.GetColor(metroColors.TextInactiveColor);
+            table.SuperTabItem.Default.Normal.CloseMarker = factory.GetColor(metroColors.CanvasColorLightShade);
+
+            // Disabled
+            table.SuperTabItem.Default.Disabled.Text = factory.GetColor(metroColors.TextDisabledColor);
+            table.SuperTabItem.Default.Disabled.Background.AdaptiveGradient = false;
+            table.SuperTabItem.Default.Disabled.CloseMarker = factory.GetColor(metroColors.TextDisabledColor);
+
+            // Top Selected
+
+            table.SuperTabItem.Default.Selected.Background = new SuperTabLinearGradientColorTable(
+                new Color[] { factory.GetColor(metroColors.CanvasColorLighterShade), factory.GetColor(metroColors.CanvasColorLightShade), factory.GetColor(metroColors.CanvasColorLightShade), factory.GetColor(metroColors.CanvasColor) },
+                new float[] { 0, .5f, .5f, 1 });
+
+            table.SuperTabItem.Default.Selected.InnerBorder = factory.GetColor(metroColors.CanvasColorLighterShade);
+            table.SuperTabItem.Default.Selected.OuterBorder = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.SuperTabItem.Default.Selected.Text = factory.GetColor(metroColors.TextColor);
+            table.SuperTabItem.Default.Selected.CloseMarker = factory.GetColor(metroColors.CanvasColorDarkShade);
+
+            // Top SelectedMouseOver
+
+            table.SuperTabItem.Default.SelectedMouseOver.Background = new SuperTabLinearGradientColorTable(
+                new Color[] { factory.GetColor(metroColors.CanvasColor), factory.GetColor(metroColors.CanvasColorLightShade) },
+                new float[] { 0, 1 });
+
+            table.SuperTabItem.Default.SelectedMouseOver.InnerBorder = factory.GetColor(metroColors.CanvasColorLighterShade);
+            table.SuperTabItem.Default.SelectedMouseOver.OuterBorder = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.SuperTabItem.Default.SelectedMouseOver.Text = factory.GetColor(metroColors.TextColor);
+            table.SuperTabItem.Default.SelectedMouseOver.CloseMarker = factory.GetColor(metroColors.CanvasColorDarkShade);
+
+            // Top MouseOver
+
+            table.SuperTabItem.Default.MouseOver.Background = new SuperTabLinearGradientColorTable(factory.GetColor(metroColors.CanvasColor), metroColors.CanvasColorLightShade);
+
+            table.SuperTabItem.Default.MouseOver.InnerBorder = factory.GetColor(metroColors.CanvasColorLighterShade);
+            table.SuperTabItem.Default.MouseOver.OuterBorder = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.SuperTabItem.Default.MouseOver.Text = factory.GetColor(metroColors.TextColor);
+            table.SuperTabItem.Default.MouseOver.CloseMarker = factory.GetColor(metroColors.CanvasColorDarkShade);
+
+            // Left, Bottom, Right
+
+            table.SuperTabItem.Left = table.SuperTabItem.Default;
+            table.SuperTabItem.Bottom = table.SuperTabItem.Default;
+            table.SuperTabItem.Right = table.SuperTabItem.Default;
+
+            #endregion
+
+            #region SuperTabPanel
+
+            table.SuperTabPanel.Default.Background = new SuperTabLinearGradientColorTable(factory.GetColor(metroColors.CanvasColor), Color.Empty);
+            table.SuperTabPanel.Default.InnerBorder = factory.GetColor(metroColors.CanvasColorLighterShade);
+            table.SuperTabPanel.Default.OuterBorder = factory.GetColor(metroColors.CanvasColorDarkShade);
+
+            table.SuperTabPanel.Left = table.SuperTabPanel.Default;
+            table.SuperTabPanel.Bottom = table.SuperTabPanel.Default;
+            table.SuperTabPanel.Right = table.SuperTabPanel.Default;
+
+            #endregion
+
+            #endregion
+
+            #region Backstage
+
+            #region Backstage
+            SuperTabStyleColorFactory.GetMetroBackstageColorTable(table.Backstage, factory, metroColors);
+            #endregion
+
+            #region BackstageItem
+            SuperTabStyleColorFactory.GetMetroBackstageItemColorTable(table.BackstageItem, factory, metroColors);
+            #endregion
+
+            #region BackstagePanel
+            SuperTabStyleColorFactory.GetMetroBackstagePanelColorTable(table.BackstagePanel, factory, metroColors);
+            #endregion
+
+            #endregion
+
+            #region SwitchButton
+            SwitchButtonColorTable sbt = new SwitchButtonColorTable();
+            sbt.BorderColor = factory.GetColor(metroColors.CanvasColorDarkShade);
+            sbt.OffBackColor = factory.GetColor(metroColors.CanvasColorDarkShade);
+            sbt.OffTextColor = factory.GetColor(metroColors.TextColor);
+            sbt.OnBackColor = factory.GetColor(metroColors.BaseColor);
+            sbt.OnTextColor = factory.GetColor(metroColors.BaseTextColor);
+            sbt.SwitchBackColor = factory.GetColor(metroColors.BaseColor);
+            sbt.SwitchOnBackColor = factory.GetColor(metroColors.CanvasColorLightShade);
+            sbt.SwitchBorderColor = Color.Empty; // factory.GetColor(metroColors.CanvasColorLightShade);
+            sbt.TextColor = factory.GetColor(metroColors.TextColor);
+            table.SwitchButton = new SwitchButtonColors();
+            table.SwitchButton.Default = sbt;
+            table.SwitchButton.Disabled.BorderColor = factory.GetColor(metroColors.CanvasColorLightShade);
+            table.SwitchButton.Disabled.SwitchBorderColor = Color.Empty;
+            table.SwitchButton.Disabled.OffTextColor = table.CheckBoxItem.Disabled.Text;
+            table.SwitchButton.Disabled.OnTextColor = table.SwitchButton.Disabled.OffTextColor;
+            table.SwitchButton.Disabled.TextColor = table.SwitchButton.Disabled.OffTextColor;
+            table.SwitchButton.Disabled.SwitchBackColor = factory.GetColor(metroColors.CanvasColorDarkShade);
+            table.SwitchButton.Disabled.OffBackColor = factory.GetColor(metroColors.CanvasColorLightShade);
+            table.SwitchButton.Disabled.OnBackColor = factory.GetColor(metroColors.CanvasColorLightShade);
+            #endregion
+
+            #region ElementStyle Classes
+            table.StyleClasses.Clear();
+            ElementStyle style = new ElementStyle();
+            style.Class = ElementStyleClassKeys.RibbonGalleryContainerKey;
+            style.BorderColor = factory.GetColor(metroColors.CanvasColorDarkShade);
+            style.Border = eStyleBorderType.Solid;
+            style.BorderWidth = 1;
+            style.CornerDiameter = 0;
+            style.CornerType = eCornerType.Square;
+            style.BackColor = factory.GetColor(metroColors.EditControlBackColor);
+            table.StyleClasses.Add(style.Class, style);
+            // FileMenuContainer
+            style = GetFileMenuContainerStyle(table);
+            table.StyleClasses.Add(style.Class, style);
+            // Two Column File Menu Container
+            style = GetTwoColumnMenuContainerStyle(table);
+            table.StyleClasses.Add(style.Class, style);
+            // Column one File Menu Container
+            style = GetMenuColumnOneContainerStyle(table);
+            table.StyleClasses.Add(style.Class, style);
+            // Column two File Menu Container
+            style = GetMenuColumnTwoContainerStyle(table);
+            table.StyleClasses.Add(style.Class, style);
+            // Bottom File Menu Container
+            style = GetMenuBottomContainer(table);
+            table.StyleClasses.Add(style.Class, style);
+            // TextBox border
+            style = Office2007ColorTableFactory.GetTextBoxStyle(factory.GetColor(metroColors.CanvasColorDarkShade));
+            table.StyleClasses.Add(style.Class, style);
+            // RichTextBox border
+            style = Office2007ColorTableFactory.GetRichTextBoxStyle(factory.GetColor(metroColors.CanvasColorDarkShade));
+            table.StyleClasses.Add(style.Class, style);
+            // ItemPanel
+            style = Office2007ColorTableFactory.GetItemPanelStyle(factory.GetColor(metroColors.CanvasColorDarkShade), factory.GetColor(metroColors.CanvasColor));
+            table.StyleClasses.Add(style.Class, style);
+            // ListBoxAdv
+            style = Office2007ColorTableFactory.GetListBoxAdvStyle(factory.GetColor(metroColors.CanvasColorDarkShade), factory.GetColor(metroColors.CanvasColor));
+            table.StyleClasses.Add(style.Class, style);
+            // DateTimeInput background
+            style = Office2007ColorTableFactory.GetDateTimeInputBackgroundStyle(factory.GetColor(metroColors.CanvasColorDarkShade), factory.GetColor(metroColors.CanvasColor));
+            table.StyleClasses.Add(style.Class, style);
+            // Ribbon Client Panel
+            style = Office2010BlueFactory.GetRibbonClientPanelStyle(factory, eOffice2010ColorScheme.Silver);
+            table.StyleClasses.Add(style.Class, style);
+            // ListView Border
+            style = Office2007ColorTableFactory.GetListViewBorderStyle(table.ListViewEx);
+            table.StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetStatusBarAltStyle(table.Bar);
+            table.StyleClasses.Add(style.Class, style);
+#if !NOTREE
+            // Tree Border/Background
+            style = Office2007ColorTableFactory.GetAdvTreeStyle(factory.GetColor(metroColors.CanvasColorDarkShade), factory.GetColor(metroColors.CanvasColor));
+            table.StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetAdvTreeColumnsHeaderStyle(factory.GetColor(metroColors.CanvasColorLighterShade), Color.Empty, factory.GetColor(metroColors.CanvasColorDarkShade));
+            table.StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetAdvTreeNodesColumnsHeaderStyle(factory.GetColor(metroColors.CanvasColorLighterShade), Color.Empty, factory.GetColor(metroColors.CanvasColorLighterShade));
+            table.StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetAdvTreeColumnStyle(factory.GetColor(metroColors.TextColor));
+            table.StyleClasses.Add(style.Class, style);
+            // CrumbBar
+            style = Office2007ColorTableFactory.GetCrumbBarBackgroundStyle(factory.GetColor(metroColors.CanvasColor), factory.GetColor(metroColors.CanvasColorLightShade), factory.GetColor(metroColors.CanvasColorDarkShade));
+            table.StyleClasses.Add(style.Class, style);
+#endif
+            // DataGridView border
+            style = Office2007ColorTableFactory.GetDataGridViewStyle();
+            table.StyleClasses.Add(style.Class, style);
+            // DataGridViewDateTime border
+            style = Office2007ColorTableFactory.GetDataGridViewDateTimeStyle();
+            table.StyleClasses.Add(style.Class, style);
+            // DataGridViewNumeric border
+            style = Office2007ColorTableFactory.GetDataGridViewNumericStyle();
+            table.StyleClasses.Add(style.Class, style);
+            // DataGridViewIpAddress border
+            style = Office2007ColorTableFactory.GetDataGridViewIpAddressStyle();
+            table.StyleClasses.Add(style.Class, style);
+
+            // Slide-out button
+            style = GetSlideOutButtonStyle(metroColors.ComplementColor);
+            table.StyleClasses.Add(style.Class, style);
+
+            // MetroTilePanel
+            style = Office2007ColorTableFactory.GetMetroTilePanelStyle(factory.GetColor(metroColors.CanvasColor));
+            table.StyleClasses.Add(style.Class, style);
+
+            // MetroTileGroup
+            style = Office2007ColorTableFactory.GetMetroTileGroupStyle(factory.GetColor(metroColors.TextColor));
+            table.StyleClasses.Add(style.Class, style);
+
+            // MonthCalendarAdv
+            style = Office2007ColorTableFactory.GetMonthCalendarStyle(factory.GetColor(metroColors.CanvasColor));
+            table.StyleClasses.Add(style.Class, style);
+
+            // ProgressSteps control
+            style = Office2007ColorTableFactory.GetProgressStepsStyle(table);
+            table.StyleClasses.Add(style.Class, style);
+
+            // SideNavStrip
+            style = Office2007ColorTableFactory.GetSideNavStripStyle(metroColors.BaseColor);
+            table.StyleClasses.Add(style.Class, style);
+
+            // TabFormPanel
+            style = Office2007ColorTableFactory.GetTabFormPanelStyle(ribbonBack);
+            table.StyleClasses.Add(style.Class, style);
+
+            style = Office2007ColorTableFactory.GetToolboxControlStyle(factory.GetColor(metroColors.CanvasColorDarkShade), Color.Empty);
+            table.StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetToolboxGroupTitle(factory.GetColor(metroColors.TextColor));
+            table.StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetToolboxGroupTitleMouseOver(factory.GetColor(metroColors.BaseColorLightText), factory.GetColor(metroColors.BaseColorLightest));
+            table.StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetToolboxGroupExpandedTitle(factory.GetColor(metroColors.BaseTextColor), factory.GetColor(metroColors.BaseColor));
+            table.StyleClasses.Add(style.Class, style);
+            #endregion
+
+            #region Contextual Label Colors
+            table.LabelItemColors.Clear();
+            table.LabelItemColors.Add(Office2007ColorTable.GetContextualKey(typeof(MetroStatusBar)), new LabelColors(factory.GetColor(metroColors.BaseTextColor), factory.GetColor(metroColors.TextDisabledColor)));
+            table.LabelItemColors.Add(Office2007ColorTable.GetContextualKey(typeof(Bar), "StatusBar"), new LabelColors(factory.GetColor(metroColors.BaseTextColor), factory.GetColor(metroColors.TextDisabledColor)));
+            table.LabelItemColors.Add(Office2007ColorTable.GetContextualKey(typeof(Bar)), new LabelColors(factory.GetColor(metroColors.TextColor), factory.GetColor(metroColors.TextDisabledColor)));
+            #endregion
+
+            InitAppButtonColors(table, factory, metroColors);
+
+            #region StepIndicator
+            table.StepIndicator.BackgroundColor = factory.GetColor(metroColors.CanvasColorLighterShade);
+            table.StepIndicator.IndicatorColor = factory.GetColor(Color.FromArgb(128, metroColors.ComplementColorLight));
+            #endregion
+
+            #region RadialMenu
+            table.RadialMenu = new RadialMenuColorTable();
+            table.RadialMenu.CircularBackColor = factory.GetColor(metroColors.ComplementColor);
+            table.RadialMenu.CircularBorderColor = factory.GetColor(0xFFFFFF);
+            table.RadialMenu.CircularForeColor = factory.GetColor(0xFFFFFF);
+            table.RadialMenu.RadialMenuBackground = factory.GetColor(metroColors.CanvasColor);
+            table.RadialMenu.RadialMenuBorder = factory.GetColor(metroColors.BaseColor);
+            table.RadialMenu.RadialMenuButtonBackground = factory.GetColor(metroColors.CanvasColor);
+            table.RadialMenu.RadialMenuButtonBorder = factory.GetColor(metroColors.BaseColor);
+            table.RadialMenu.RadialMenuExpandForeground = factory.GetColor(metroColors.CanvasColor);
+            table.RadialMenu.RadialMenuInactiveBorder = Color.FromArgb(128, table.RadialMenu.RadialMenuBorder);
+            table.RadialMenu.RadialMenuItemForeground = factory.GetColor(metroColors.BaseColor);
+            table.RadialMenu.RadialMenuItemDisabledForeground = factory.GetColor(metroColors.TextDisabledColor);
+            table.RadialMenu.RadialMenuItemMouseOverBackground = Color.FromArgb(72, table.RadialMenu.RadialMenuItemForeground);
+            table.RadialMenu.RadialMenuItemMouseOverForeground = factory.GetColor(metroColors.BaseColor);
+            table.RadialMenu.RadialMenuMouseOverBorder = Color.FromArgb(200, table.RadialMenu.RadialMenuBorder);
+            #endregion
+
+            #region StepItem
+            table.StepItem.Default = new OfficeStepItemStateColorTable(new Color[]{
+                    factory.GetColor(metroColors.CanvasColor)
+                    },
+                    90,
+                    new float[0],
+                factory.GetColor(metroColors.TextColor),
+                new Color[] {
+                    factory.GetColor(metroColors.CanvasColorDarkShade) });
+            table.StepItem.Progress = new OfficeStepItemStateColorTable(new Color[]{
+                    factory.GetColor(0xD8F577), 
+                    factory.GetColor(0x75C300),
+                    factory.GetColor(0x75C300),
+                    factory.GetColor(0xA9E923)
+                    },
+                    90,
+                    new float[] { 0f, .6f, .6f, 1f },
+                Color.Empty,
+                new Color[0]);
+            table.StepItem.MouseOver = new OfficeStepItemStateColorTable(new Color[]{
+                    factory.GetColor(metroColors.CanvasColorLight)
+                    },
+                    90,
+                    new float[0],
+                factory.GetColor(metroColors.TextColor),
+                new Color[] {
+                    factory.GetColor(metroColors.CanvasColorLight) });
+            table.StepItem.Pressed = new OfficeStepItemStateColorTable(new Color[]{
+                    factory.GetColor(metroColors.BaseColor)
+                    },
+                    90,
+                    new float[0],
+                factory.GetColor(metroColors.BaseTextColor),
+                new Color[] {
+                    factory.GetColor(metroColors.BaseColor) });
+            #endregion
+
+            #region TokenEditor
+            table.TokenEditor = new TokenEditorColorTable(metroColors.TextColor, metroColors.CanvasColorLighterShade, metroColors.TextColor, metroColors.CanvasColorLightShade, metroColors.BaseTextColor, metroColors.BaseColor);
+            #endregion
+
+            #region Flyout
+            table.Flyout.BorderColor = metroColors.BaseColor;
+            table.Flyout.BackColor = metroColors.CanvasColor;
+            #endregion
+
+            #region SideNav
+            table.SideNav.SideNavItem.Default = new SideNavItemStateColorTable(factory.GetColor(metroColors.BaseTextColor));
+            table.SideNav.SideNavItem.MouseOver = new SideNavItemStateColorTable(factory.GetColor(metroColors.BaseColorLightText),
+                new Color[]
+                {
+                    factory.GetColor(metroColors.BaseColorLight)
+                },
+                new Color[] { factory.GetColor(metroColors.BaseColorLight) },
+                0);
+            table.SideNav.SideNavItem.Pressed = new SideNavItemStateColorTable(factory.GetColor(metroColors.BaseColorLightText),
+                new Color[]
+                {
+                    factory.GetColor(metroColors.BaseColorDark)
+                },
+                new Color[] { factory.GetColor(metroColors.BaseColorDark) },
+                0);
+            table.SideNav.SideNavItem.Selected = new SideNavItemStateColorTable(factory.GetColor(metroColors.TextColor),
+                new Color[] { factory.GetColor(metroColors.CanvasColor) },
+                new Color[] { Color.Empty, factory.GetColor(metroColors.CanvasColor), Color.Empty, factory.GetColor(metroColors.CanvasColor) });
+            table.SideNav.BorderColors = new Color[] { factory.GetColor(metroColors.BaseColor) };
+            table.SideNav.TitleBackColor = factory.GetColor(metroColors.BaseColorDark);
+            table.SideNav.TitleBorderColors = new Color[] { Color.Empty, Color.Empty, Color.Empty, factory.GetColor(metroColors.BaseColor) };
+            table.SideNav.PanelBackColor = table.Form.BackColor;
+
+            #endregion
+
+            #region TabForm
+            table.TabForm.Active.CaptionText = factory.GetColor(metroColors.TextColor);
+            table.TabForm.Inactive.CaptionText = factory.GetColor(metroColors.TextLightColor);
+            table.TabForm.Active.CaptionBackColors = new Color[] { factory.GetColor(metroColors.CanvasColor) };
+            table.TabForm.Inactive.CaptionBackColors = new Color[] { factory.GetColor(metroColors.CanvasColor) };
+            table.TabFormItemColorTables.Clear();
+            table.TabFormItemColorTables.Add(TabFormItem.DefaultColorTableKey,
+                Office2007ColorTable.CreateDefaultTabFormItemColorTable(factory,
+                new Color[] { factory.GetColor(metroColors.CanvasColor) },
+                new Color[] { factory.GetColor(metroColors.CanvasColorLightShade) },
+                factory.GetColor(metroColors.TextLightColor),
+                new Color[] { factory.GetColor(ribbonBack) },
+                new Color[] { factory.GetColor(metroColors.CanvasColorLightShade) },
+                factory.GetColor(metroColors.BaseColor)
+                ));
+            table.TabFormItemColorTables.Add(TabFormItem.BlueColorTableKey, Office2007ColorTable.CreateBlueTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.YellowColorTableKey, Office2007ColorTable.CreateYellowTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.PurpleColorTableKey, Office2007ColorTable.CreatePurpleTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.CyanColorTableKey, Office2007ColorTable.CreateCyanTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.BlueMistColorTableKey, Office2007ColorTable.CreateBlueMistTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.PurpleMistColorTableKey, Office2007ColorTable.CreatePurpleMistTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.TanColorTableKey, Office2007ColorTable.CreateTanTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.LemonLimeColorTableKey, Office2007ColorTable.CreateLemonLimeTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.AppleColorTableKey, Office2007ColorTable.CreateAppleTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.TealColorTableKey, Office2007ColorTable.CreateTealTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.RedChalkColorTableKey, Office2007ColorTable.CreateRedChalkTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.SilverColorTableKey, Office2007ColorTable.CreateSilverTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.OrangeColorTableKey, Office2007ColorTable.CreateOrangeTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.GreenColorTableKey, Office2007ColorTable.CreateGreenTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.MagentaColorTableKey, Office2007ColorTable.CreateMagentaTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.RedColorTableKey, Office2007ColorTable.CreateRedTabFormItemColorTable(factory));
+            #endregion
+        }
+        #region Application Button Colors
+        private static Office2007ButtonItemColorTable FallBackAppButtonColorTable = null;
+        internal static Office2007ButtonItemColorTable GetAppFallBackColorTable()
+        {
+            if (FallBackAppButtonColorTable != null) return FallBackAppButtonColorTable;
+
+            MetroPartColors metroColors = VisualStudio2012ColorTableInitializer.CreateMetroPartColors(MetroColorGeneratorParameters.Default.CanvasColor, MetroColorGeneratorParameters.Default.BaseColor);
+            // Blue default
+            Office2007ButtonItemColorTable table = new Office2007ButtonItemColorTable();
+            table.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Orange);
+
+            Office2007ButtonItemStateColorTable ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(metroColors.BaseColor);
+            ct.BottomBackgroundHighlight = LinearGradientColorTable.Empty;
+            ct.OuterBorder = LinearGradientColorTable.Empty;
+            ct.InnerBorder = LinearGradientColorTable.Empty;
+            ct.Text = metroColors.BaseTextColor;
+            table.Default = ct;
+
+            ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(metroColors.BaseColorLight1);
+            ct.BottomBackgroundHighlight = LinearGradientColorTable.Empty;
+            ct.OuterBorder = LinearGradientColorTable.Empty;
+            ct.InnerBorder = LinearGradientColorTable.Empty;
+            ct.Text = metroColors.BaseTextColor;
+            table.MouseOver = ct;
+
+            ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(metroColors.BaseColorDark);
+            ct.BottomBackgroundHighlight = LinearGradientColorTable.Empty;
+            ct.OuterBorder = LinearGradientColorTable.Empty;
+            ct.InnerBorder = LinearGradientColorTable.Empty;
+            ct.Text = metroColors.BaseTextColor;
+            table.Pressed = ct;
+
+            table.Expanded = table.Pressed;
+            table.Checked = table.Pressed;
+
+            FallBackAppButtonColorTable = table;
+
+            return table;
+        }
+        internal static void InitAppButtonColors(Office2007ColorTable colorTable, ColorFactory factory, MetroPartColors metroColors)
+        {
+            Office2007ButtonItemColorTableCollection colors = colorTable.ApplicationButtonColors;
+            colors.Clear();
+
+            // Blue default
+            Office2007ButtonItemColorTable table = new Office2007ButtonItemColorTable();
+            table.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Orange);
+
+            Office2007ButtonItemStateColorTable ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            ct.BottomBackgroundHighlight = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(32, 0xFFFFFF), Color.Transparent);
+            ct.OuterBorder = LinearGradientColorTable.Empty; //new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            ct.InnerBorder = LinearGradientColorTable.Empty; //new LinearGradientColorTable(factory.GetColor(16, 0xFFFFFF));
+            ct.Text = factory.GetColor(metroColors.BaseTextColor);
+            table.Default = ct;
+
+            ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight1));
+            ct.BottomBackgroundHighlight = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(82, 0xFFFFFF), Color.Transparent);
+            ct.OuterBorder = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            ct.InnerBorder = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(72, 0xFFFFFF), factory.GetColor(48, 0xFFFFFF)); //new LinearGradientColorTable(factory.GetColor(0x55A1F3), factory.GetColor(0x4F9EEE));
+            ct.Text = factory.GetColor(metroColors.BaseTextColor);
+            table.MouseOver = ct;
+
+            ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            ct.BottomBackgroundHighlight = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(82, 0xFFFFFF), Color.Transparent);
+            ct.OuterBorder = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDarker));
+            ct.InnerBorder = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(72, 0xFFFFFF), factory.GetColor(48, 0xFFFFFF)); //new LinearGradientColorTable(factory.GetColor(0x55A1F3), factory.GetColor(0x4F9EEE));
+            ct.Text = factory.GetColor(metroColors.BaseTextColor);
+            table.Pressed = ct;
+
+            table.Expanded = table.MouseOver;
+            table.Checked = table.Pressed;
+
+            colors.Add(table);
+
+            // Magenta
+            table = new Office2007ButtonItemColorTable();
+            table.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Magenta);
+
+            ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(factory.GetColor(0xCC256B), factory.GetColor(0xB10851));
+            ct.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(64, 0xFFFFFF), Color.Transparent);
+            ct.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x8F013C), factory.GetColor(0x940741));
+            ct.InnerBorder = new LinearGradientColorTable(factory.GetColor(32, 0xFFFFFF));
+            ct.Text = factory.GetColor(0xFFFFFF);
+            table.Default = ct;
+
+            ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(factory.GetColor(0xD63272), factory.GetColor(0xB10B52));
+            ct.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(82, 0xFFFFFF), Color.Transparent);
+            ct.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x8F013C), factory.GetColor(0x950942));
+            ct.InnerBorder = new LinearGradientColorTable(factory.GetColor(72, 0xFFFFFF), factory.GetColor(48, 0xFFFFFF)); //new LinearGradientColorTable(factory.GetColor(0x55A1F3), factory.GetColor(0x4F9EEE));
+            ct.Text = factory.GetColor(0xFFFFFF);
+            table.MouseOver = ct;
+
+            ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(factory.GetColor(0xB50C53), factory.GetColor(0xB00B52));
+            ct.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(82, 0xFFFFFF), Color.Transparent);
+            ct.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x8F013D), factory.GetColor(0x950741));
+            ct.InnerBorder = new LinearGradientColorTable(factory.GetColor(72, 0xFFFFFF), factory.GetColor(48, 0xFFFFFF)); //new LinearGradientColorTable(factory.GetColor(0x55A1F3), factory.GetColor(0x4F9EEE));
+            ct.Text = factory.GetColor(0xFFFFFF);
+            table.Pressed = ct;
+
+            table.Expanded = table.MouseOver;
+            table.Checked = table.Pressed;
+
+            colors.Add(table);
+
+            // Orange
+            table = new Office2007ButtonItemColorTable();
+            table.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Blue);
+
+            ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(factory.GetColor(0xF27350), factory.GetColor(0xE5552F));
+            ct.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xF89E42), Color.Transparent);
+            ct.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xCC2B12), factory.GetColor(0xCF3415));
+            ct.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xF68954), factory.GetColor(0xF78B3E));
+            ct.Text = factory.GetColor(0xFFFFFF);
+            table.Default = ct;
+
+            ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(factory.GetColor(0xF87E4D), factory.GetColor(0xE6552E));
+            ct.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xFBBD5E), Color.Transparent);
+            ct.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xCA2810), factory.GetColor(0xCD3217));
+            ct.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFBAA5A), factory.GetColor(0xFCB857)); //new LinearGradientColorTable(factory.GetColor(0x55A1F3), factory.GetColor(0x4F9EEE));
+            ct.Text = factory.GetColor(0xFFFFFF);
+            table.MouseOver = ct;
+
+            ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(factory.GetColor(0xE3531D), factory.GetColor(0xE04E19));
+            ct.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xFDAF4C), Color.Transparent);
+            ct.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xCA2810), factory.GetColor(0xCD3013));
+            ct.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xE86229), factory.GetColor(0xFB8D44)); //new LinearGradientColorTable(factory.GetColor(0x55A1F3), factory.GetColor(0x4F9EEE));
+            ct.Text = factory.GetColor(0xFFFFFF);
+            table.Pressed = ct;
+
+            table.Expanded = table.MouseOver;
+            table.Checked = table.Pressed;
+
+            colors.Add(table);
+
+            // Green
+            table = new Office2007ButtonItemColorTable();
+            table.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.BlueWithBackground);
+
+            ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(factory.GetColor(0x459731), factory.GetColor(0x2B7F2C));
+            ct.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0x6BCA45), Color.Transparent);
+            ct.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x186337), factory.GetColor(0x1E6A39));
+            ct.InnerBorder = new LinearGradientColorTable(factory.GetColor(0x4CA231), factory.GetColor(0x53B331));
+            ct.Text = factory.GetColor(0xFFFFFF);
+            table.Default = ct;
+
+            ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(factory.GetColor(0x469734), factory.GetColor(0x267C2B));
+            ct.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0x89D668), Color.Transparent);
+            ct.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x196437), factory.GetColor(0x216B3C));
+            ct.InnerBorder = new LinearGradientColorTable(factory.GetColor(0x65B943), factory.GetColor(0x70CC4A));
+            ct.Text = factory.GetColor(0xFFFFFF);
+            table.MouseOver = ct;
+
+            ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(factory.GetColor(0x2F822A), factory.GetColor(0x2A7E2C));
+            ct.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0x68CB38), Color.Transparent);
+            ct.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x186437), factory.GetColor(0x1D6A38));
+            ct.InnerBorder = new LinearGradientColorTable(factory.GetColor(0x368F2B), factory.GetColor(0x59BD2D)); //new LinearGradientColorTable(factory.GetColor(0x55A1F3), factory.GetColor(0x4F9EEE));
+            ct.Text = factory.GetColor(0xFFFFFF);
+            table.Pressed = ct;
+
+            table.Expanded = table.MouseOver;
+            table.Checked = table.Pressed;
+
+            colors.Add(table);
+
+            // Teal
+            table = new Office2007ButtonItemColorTable();
+            table.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.MagentaWithBackground);
+
+            ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(factory.GetColor(0x159795), factory.GetColor(0x018281));
+            ct.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0x20B7B4), Color.Transparent);
+            ct.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x055E5E), factory.GetColor(0x076464));
+            ct.InnerBorder = new LinearGradientColorTable(factory.GetColor(0x1BA29D), factory.GetColor(0x1FB1A9));
+            ct.Text = factory.GetColor(0xFFFFFF);
+            table.Default = ct;
+
+            ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(factory.GetColor(0x1F9C99), factory.GetColor(0x038584));
+            ct.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0x36CDCA), Color.Transparent);
+            ct.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x055E5E), factory.GetColor(0x096767));
+            ct.InnerBorder = new LinearGradientColorTable(factory.GetColor(0x30B8B3), factory.GetColor(0x34C2BE));
+            ct.Text = factory.GetColor(0xFFFFFF);
+            table.MouseOver = ct;
+
+            ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(factory.GetColor(0x028482), factory.GetColor(0x028081));
+            ct.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0x2CC2BE), Color.Transparent);
+            ct.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x055E5E), factory.GetColor(0x086565));
+            ct.InnerBorder = new LinearGradientColorTable(factory.GetColor(0x028F8D), factory.GetColor(0x1DB4AD)); //new LinearGradientColorTable(factory.GetColor(0x55A1F3), factory.GetColor(0x4F9EEE));
+            ct.Text = factory.GetColor(0xFFFFFF);
+            table.Pressed = ct;
+
+            table.Expanded = table.MouseOver;
+            table.Checked = table.Pressed;
+
+            colors.Add(table);
+        }
+        #endregion
+
+        #region RibbonBar
+        public static Office2007RibbonBarStateColorTable GetRibbonBar(ColorFactory factory, MetroPartColors metroColors, Color ribbonBack)
+        {
+            Office2007RibbonBarStateColorTable rb = new Office2007RibbonBarStateColorTable();
+            rb.TopBackgroundHeight = 0.8f;
+            rb.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColorLightShade));
+            rb.InnerBorder = LinearGradientColorTable.Empty;// new LinearGradientColorTable(factory.GetColor(factory.GetColor(180, Color.White)), factory.GetColor(120, 0xFFFFFF));
+            rb.TopBackground = new LinearGradientColorTable(ribbonBack);
+            rb.BottomBackground = null; // new LinearGradientColorTable(factory.GetColor(0xF6F7F8), factory.GetColor(0xE5E9EE));
+            rb.TitleBackground = null;// new LinearGradientColorTable(factory.GetColor(0xC2D8F1), factory.GetColor(0xC0D8EF));
+            rb.TitleText = factory.GetColor(metroColors.TextColor);
+            return rb;
+        }
+
+        public static Office2007RibbonBarStateColorTable GetRibbonBarMouseOver(ColorFactory factory, MetroPartColors metroColors, Color ribbonBack)
+        {
+            return GetRibbonBar(factory, metroColors, ribbonBack);
+            //Office2007RibbonBarStateColorTable rb = new Office2007RibbonBarStateColorTable();
+            //rb.TopBackgroundHeight = 0.8f;
+            //rb.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xEFF1F2), factory.GetColor(0xCDD2D7));
+            //rb.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFFFFFF), factory.GetColor(120, 0xFFFFFF));
+            //rb.TopBackground = new LinearGradientColorTable(factory.GetColor(0xFEFEFE), factory.GetColor(0xDEE4EB));
+            //rb.BottomBackground = null;// new LinearGradientColorTable(factory.GetColor(0xC7D8ED), factory.GetColor(0xD8E8F5));
+            //rb.TitleBackground = new LinearGradientColorTable(factory.GetColor(0xF8FAFB), Color.Transparent);
+            //rb.TitleText = factory.GetColor(0x565F6D);
+            //return rb;
+        }
+
+        public static Office2007RibbonBarStateColorTable GetRibbonBarExpanded(ColorFactory factory, MetroPartColors metroColors, Color ribbonBack)
+        {
+            Office2007RibbonBarStateColorTable rb = new Office2007RibbonBarStateColorTable();
+            rb.TopBackgroundHeight = 15;
+            rb.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor), factory.GetColor(metroColors.CanvasColorLightShade));
+            rb.InnerBorder = new LinearGradientColorTable(factory.GetColor(factory.GetColor(180, Color.White)), factory.GetColor(120, 0xFFFFFF));
+            rb.TopBackground = new LinearGradientColorTable(ribbonBack);
+            rb.BottomBackground = null;// new LinearGradientColorTable(factory.GetColor(0xC7D8ED), factory.GetColor(0xD8E8F5));
+            rb.TitleBackground = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColorLighterShade), Color.Transparent);
+            rb.TitleText = Color.Empty;
+            return rb;
+        }
+        #endregion
+
+        #region CheckBoxItem
+        private static Office2007CheckBoxColorTable GetCheckBoxItem(ColorFactory factory, MetroPartColors metroColors)
+        {
+            Office2007CheckBoxColorTable chk = new Office2007CheckBoxColorTable();
+
+            chk.Default.CheckBackground = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor), Color.Empty);
+            chk.Default.CheckBorder = factory.GetColor(metroColors.TextDisabledColor);
+            chk.Default.CheckInnerBackground = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor));
+            chk.Default.CheckInnerBorder = factory.GetColor(metroColors.CanvasColor);
+            chk.Default.CheckSign = new LinearGradientColorTable(factory.GetColor(metroColors.TextLightColor), Color.Empty);
+            chk.Default.Text = factory.GetColor(metroColors.TextColor);
+
+            chk.MouseOver.CheckBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLightest), Color.Empty);
+            chk.MouseOver.CheckBorder = factory.GetColor(metroColors.BaseColorLight);
+            chk.MouseOver.CheckInnerBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLightest));
+            chk.MouseOver.CheckInnerBorder = factory.GetColor(metroColors.BaseColorLightest);
+            chk.MouseOver.CheckSign = new LinearGradientColorTable(factory.GetColor(metroColors.TextColor), Color.Empty);
+            chk.MouseOver.Text = factory.GetColor(metroColors.TextColor);
+
+            chk.Pressed.CheckBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight));
+            chk.Pressed.CheckBorder = factory.GetColor(metroColors.BaseColorLight);
+            chk.Pressed.CheckInnerBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight));
+            chk.Pressed.CheckInnerBorder = factory.GetColor(metroColors.BaseColorLight);
+            chk.Pressed.CheckSign = new LinearGradientColorTable(factory.GetColor(metroColors.TextColor), Color.Empty);
+            chk.Pressed.Text = factory.GetColor(metroColors.TextColor);
+
+            chk.Disabled.CheckBackground = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor), Color.Empty);
+            chk.Disabled.CheckBorder = factory.GetColor(metroColors.CanvasColorLightShade);
+            chk.Disabled.CheckInnerBackground = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor));
+            chk.Disabled.CheckInnerBorder = Color.Empty; // factory.GetColor(metroColors.CanvasColorLightShade);
+            chk.Disabled.CheckSign = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColorDarkShade), Color.Empty);
+            chk.Disabled.Text = factory.GetColor(metroColors.CanvasColorDarkShade);
+
+            return chk;
+        }
+        #endregion
+
+        #region Buttons
+        private static Office2007ButtonItemColorTable GetButtonItemBackstageDefault(ColorFactory factory, MetroPartColors metroColors)
+        {
+            Office2007ButtonItemColorTable cb = new Office2007ButtonItemColorTable();
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Blue);
+            cb.Default = new Office2007ButtonItemStateColorTable();
+            cb.Default.Text = factory.GetColor(metroColors.BaseTextColor);
+
+            // Button mouse over
+            cb.MouseOver = new Office2007ButtonItemStateColorTable();
+            cb.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            cb.MouseOver.InnerBorder = LinearGradientColorTable.Empty;
+            cb.MouseOver.TopBackground = null;
+            cb.MouseOver.TopBackgroundHighlight = null;
+            cb.MouseOver.BottomBackground = null;
+            cb.MouseOver.BottomBackgroundHighlight = null;
+            cb.MouseOver.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            cb.MouseOver.SplitBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark), Color.Empty);
+            cb.MouseOver.SplitBorderLight = LinearGradientColorTable.Empty;
+            cb.MouseOver.Text = factory.GetColor(metroColors.BaseTextColor);
+
+            cb.MouseOverSplitInactive = new Office2007ButtonItemStateColorTable();
+            cb.MouseOverSplitInactive.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x527DE0));
+
+            // Pressed
+            cb.Pressed = new Office2007ButtonItemStateColorTable();
+            cb.Pressed.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            cb.Pressed.InnerBorder = LinearGradientColorTable.Empty;
+            cb.Pressed.TopBackground = new LinearGradientColorTable(factory.GetColor(32, metroColors.BaseColor));
+            cb.Pressed.TopBackgroundHighlight = LinearGradientColorTable.Empty; //new LinearGradientColorTable(Color.FromArgb(192, Color.White), Color.Transparent);
+            cb.Pressed.BottomBackground = new LinearGradientColorTable(factory.GetColor(32, metroColors.BaseColor));
+            cb.Pressed.BottomBackgroundHighlight = LinearGradientColorTable.Empty;
+            cb.Pressed.SplitBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor), Color.Empty);
+            cb.Pressed.SplitBorderLight = new LinearGradientColorTable(factory.GetColor(135, 0xFFFFFF), Color.Empty);
+            cb.Pressed.Text = factory.GetColor(metroColors.TextColor);
+
+            // Checked
+            cb.Checked = cb.Pressed;
+
+            // Expanded button
+            cb.Expanded = cb.MouseOver;
+
+            SetBlueExpandColors(cb, factory);
+
+            return cb;
+        }
+        public static Office2007ButtonItemColorTable GetButtonItemDefault(ColorFactory factory, MetroPartColors metroColors)
+        {
+            Office2007ButtonItemColorTable cb = new Office2007ButtonItemColorTable();
+            cb.Default = new Office2007ButtonItemStateColorTable();
+            cb.Default.Text = factory.GetColor(metroColors.TextColor);
+
+            // Button mouse over
+            cb.MouseOver = new Office2007ButtonItemStateColorTable();
+            cb.MouseOver.TopBackground = null;
+            cb.MouseOver.TopBackgroundHighlight = null;
+            cb.MouseOver.BottomBackground = null;
+            cb.MouseOver.BottomBackgroundHighlight = null;
+            cb.MouseOver.Background = new LinearGradientColorTable(metroColors.CanvasColorLight);
+            cb.MouseOver.InnerBorder = LinearGradientColorTable.Empty;
+            cb.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColorDarkShade));
+            cb.MouseOver.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.MouseOver.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.MouseOver.Text = factory.GetColor(metroColors.TextColor);
+            //cb.MouseOver = new Office2007ButtonItemStateColorTable();
+            //cb.MouseOver.TopBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseButtonGradientStart));
+            //cb.MouseOver.TopBackgroundHighlight = LinearGradientColorTable.Empty;
+            //cb.MouseOver.BottomBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseButtonGradientEnd));
+            //cb.MouseOver.BottomBackgroundHighlight = LinearGradientColorTable.Empty;
+            //cb.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDarker));
+            //cb.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            //cb.MouseOver.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            //cb.MouseOver.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            //cb.MouseOver.Text = factory.GetColor(metroColors.TextColor);
+
+
+            cb.MouseOverSplitInactive = new Office2007ButtonItemStateColorTable();
+            cb.MouseOverSplitInactive.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor));
+
+            // Pressed
+            cb.Pressed = new Office2007ButtonItemStateColorTable();
+            cb.Pressed.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            cb.Pressed.InnerBorder = LinearGradientColorTable.Empty;
+            cb.Pressed.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            cb.Pressed.TopBackground = null;
+            cb.Pressed.TopBackgroundHighlight = null;
+            cb.Pressed.BottomBackground = null;
+            cb.Pressed.BottomBackgroundHighlight = null;
+            cb.Pressed.SplitBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight));
+            cb.Pressed.SplitBorderLight = LinearGradientColorTable.Empty;//(factory.GetColor(metroColors.BaseColorLight), Color.Empty);
+            cb.Pressed.Text = factory.GetColor(metroColors.BaseTextColor);
+            //cb.Pressed = new Office2007ButtonItemStateColorTable();
+            //cb.Pressed.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            //cb.Pressed.InnerBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDarker));
+            //cb.Pressed.TopBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight));
+            //cb.Pressed.TopBackgroundHighlight = LinearGradientColorTable.Empty;
+            //cb.Pressed.BottomBackground = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            //cb.Pressed.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(Color.FromArgb(48, Color.White)), Color.Transparent);
+            //cb.Pressed.SplitBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            //cb.Pressed.SplitBorderLight = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight), Color.Empty);
+            //cb.Pressed.Text = factory.GetColor(metroColors.BaseTextColor);
+
+            // Checked
+            cb.Checked = new Office2007ButtonItemStateColorTable();
+            cb.Checked.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight));
+            cb.Checked.InnerBorder = LinearGradientColorTable.Empty;
+            cb.Checked.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight));
+            cb.Checked.TopBackground = null; //new LinearGradientColorTable(metroColors.BaseColorLight);
+            cb.Checked.TopBackgroundHighlight = null; //LinearGradientColorTable.Empty;
+            cb.Checked.BottomBackground = null; // new LinearGradientColorTable(metroColors.BaseColorLight);
+            cb.Checked.BottomBackgroundHighlight = null; // new LinearGradientColorTable(factory.GetColor("20FFFFFF"), Color.Transparent);
+            cb.Checked.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Checked.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Checked.Text = factory.GetColor(metroColors.BaseColorLightText);
+            //cb.Checked = new Office2007ButtonItemStateColorTable();
+            //cb.Checked.OuterBorder = new LinearGradientColorTable(metroColors.BaseColorDark);
+            //cb.Checked.InnerBorder = new LinearGradientColorTable(metroColors.BaseColorDarker);
+            //cb.Checked.TopBackground = new LinearGradientColorTable(metroColors.BaseColorLight);
+            //cb.Checked.TopBackgroundHighlight = LinearGradientColorTable.Empty;
+            //cb.Checked.BottomBackground = new LinearGradientColorTable(metroColors.BaseColorLight);
+            //cb.Checked.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor("20FFFFFF"), Color.Transparent);
+            //cb.Checked.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            //cb.Checked.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            //cb.Checked.Text = factory.GetColor(metroColors.BaseColorLightText);
+
+            // Expanded button
+            cb.Expanded = new Office2007ButtonItemStateColorTable();
+            cb.Expanded.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            cb.Expanded.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            cb.Expanded.InnerBorder = LinearGradientColorTable.Empty;
+            cb.Expanded.TopBackground = null; // new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight));
+            cb.Expanded.TopBackgroundHighlight = null; // LinearGradientColorTable.Empty;
+            cb.Expanded.BottomBackground = null; // new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            cb.Expanded.BottomBackgroundHighlight = null; // new LinearGradientColorTable(factory.GetColor(Color.FromArgb(92, Color.White)), Color.Transparent);
+            cb.Expanded.SplitBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            cb.Expanded.SplitBorderLight = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight), Color.Empty);
+            cb.Expanded.Text = factory.GetColor(metroColors.BaseTextColor);
+
+            SetBlueExpandColors(cb, factory);
+
+            return cb;
+        }
+
+        public static Office2007ButtonItemColorTable GetButtonItemDefaultWithBackground(ColorFactory factory, MetroPartColors metroColors)
+        {
+            Office2007ButtonItemColorTable cb = GetButtonItemDefault(factory, metroColors);
+
+            cb.Default.TopBackground = null; // new LinearGradientColorTable(factory.GetColor(metroColors.BaseButtonGradientStart));
+            cb.Default.TopBackgroundHighlight = null;// LinearGradientColorTable.Empty;
+            cb.Default.BottomBackground = null; // new LinearGradientColorTable(factory.GetColor(metroColors.BaseButtonGradientEnd));
+            cb.Default.BottomBackgroundHighlight = null; // LinearGradientColorTable.Empty;
+            cb.Default.Background = new LinearGradientColorTable(metroColors.CanvasColor);
+            cb.Default.InnerBorder = LinearGradientColorTable.Empty;
+            cb.Default.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColorDarkShade));
+            cb.Default.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.MouseOverSplitInactive = cb.Default;
+
+            // Same as default
+            cb.Disabled = new Office2007ButtonItemStateColorTable();
+            cb.Disabled.TopBackground = null;
+            cb.Disabled.TopBackgroundHighlight = null; // new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.BottomBackground = null; // LinearGradientColorTable.Empty;
+            cb.Disabled.BottomBackgroundHighlight = null; // new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.Background = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor));
+            cb.Disabled.InnerBorder = LinearGradientColorTable.Empty;
+            cb.Disabled.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColorLightShade), Color.Empty);
+            cb.Disabled.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.Text = factory.GetColor(metroColors.CanvasColorLightShade);
+            return cb;
+        }
+
+        public static Office2007ButtonItemColorTable GetButtonItemBlue(ColorFactory factory, MetroPartColors metroColors)
+        {
+            Office2007ButtonItemColorTable cb = new Office2007ButtonItemColorTable();
+            cb.Default = new Office2007ButtonItemStateColorTable();
+            cb.Default.Text = factory.GetColor(metroColors.TextColor);
+
+            // Button mouse over
+            cb.MouseOver = new Office2007ButtonItemStateColorTable();
+            cb.MouseOver.TopBackground = null; // new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight));
+            cb.MouseOver.TopBackgroundHighlight = null;// LinearGradientColorTable.Empty;
+            cb.MouseOver.BottomBackground = null; // new LinearGradientColorTable(factory.GetColor(metroColors.BaseButtonGradientEnd));
+            cb.MouseOver.BottomBackgroundHighlight = null;// LinearGradientColorTable.Empty;
+            cb.MouseOver.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight));
+            cb.MouseOver.InnerBorder = LinearGradientColorTable.Empty;
+            cb.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            cb.MouseOver.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.MouseOver.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.MouseOver.Text = factory.GetColor(metroColors.BaseColorLightText);
+
+            cb.MouseOverSplitInactive = new Office2007ButtonItemStateColorTable();
+            cb.MouseOverSplitInactive.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+
+            // Pressed
+            cb.Pressed = new Office2007ButtonItemStateColorTable();
+            cb.Pressed.OuterBorder = new LinearGradientColorTable(metroColors.BaseColorDarker);
+            cb.Pressed.InnerBorder = LinearGradientColorTable.Empty;
+            cb.Pressed.TopBackground = null;// new LinearGradientColorTable(factory.GetColor("DAF6FF"));
+            cb.Pressed.TopBackgroundHighlight = null; // LinearGradientColorTable.Empty;
+            cb.Pressed.BottomBackground = null;// new LinearGradientColorTable(factory.GetColor("A7E8FF"));
+            cb.Pressed.BottomBackgroundHighlight = null; // new LinearGradientColorTable(factory.GetColor(Color.FromArgb(48, Color.White)), Color.Transparent);
+            cb.Pressed.Background = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor));
+            cb.Pressed.SplitBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            cb.Pressed.SplitBorderLight = LinearGradientColorTable.Empty;
+            cb.Pressed.Text = factory.GetColor(metroColors.TextColor);
+
+            // Checked
+            cb.Checked = new Office2007ButtonItemStateColorTable();
+            cb.Checked.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            cb.Checked.InnerBorder = LinearGradientColorTable.Empty;
+            cb.Checked.TopBackground = null;  // new LinearGradientColorTable(factory.GetColor("A7E8FF"));
+            cb.Checked.TopBackgroundHighlight = null; // LinearGradientColorTable.Empty;
+            cb.Checked.BottomBackground = null; // new LinearGradientColorTable(factory.GetColor("A7E8FF"));
+            cb.Checked.BottomBackgroundHighlight = null; // new LinearGradientColorTable(factory.GetColor("20FFFFFF"), Color.Transparent);
+            cb.Checked.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            cb.Checked.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Checked.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Checked.Text = factory.GetColor(metroColors.BaseTextColor);
+
+            // Expanded button
+            cb.Expanded = new Office2007ButtonItemStateColorTable();
+            cb.Expanded.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            cb.Expanded.InnerBorder = LinearGradientColorTable.Empty;
+            cb.Expanded.TopBackground = null; // new LinearGradientColorTable(factory.GetColor("DAF6FF"));
+            cb.Expanded.TopBackgroundHighlight = null; // LinearGradientColorTable.Empty;
+            cb.Expanded.BottomBackground = null; // new LinearGradientColorTable(factory.GetColor("A7E8FF"));
+            cb.Expanded.BottomBackgroundHighlight = null; // new LinearGradientColorTable(factory.GetColor(Color.FromArgb(48, Color.White)), Color.Transparent);
+            cb.Expanded.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            cb.Expanded.SplitBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            cb.Expanded.SplitBorderLight = LinearGradientColorTable.Empty; //(factory.GetColor("A000BFFF"), Color.Empty);
+            cb.Expanded.Text = factory.GetColor(metroColors.BaseTextColor);
+
+            SetBlueExpandColors(cb, factory);
+
+            return cb;
+        }
+
+        public static Office2007ButtonItemColorTable GetButtonItemBlueWithBackground(ColorFactory factory, MetroPartColors metroColors)
+        {
+            Office2007ButtonItemColorTable cb = GetButtonItemBlue(factory, metroColors);
+
+            cb.Default.TopBackground = null; //new LinearGradientColorTable(factory.GetColor(metroColors.BaseButtonGradientStart));
+            cb.Default.TopBackgroundHighlight = null;// LinearGradientColorTable.Empty;
+            cb.Default.BottomBackground = null;// new LinearGradientColorTable(factory.GetColor(metroColors.BaseButtonGradientEnd));
+            cb.Default.BottomBackgroundHighlight = null;// LinearGradientColorTable.Empty;
+            cb.Default.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            cb.Default.InnerBorder = LinearGradientColorTable.Empty;
+            cb.Default.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            cb.Default.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.Text = factory.GetColor(metroColors.BaseTextColor);
+            cb.MouseOverSplitInactive = cb.Default;
+
+            // Same as default
+            cb.Disabled = new Office2007ButtonItemStateColorTable();
+            cb.Disabled.TopBackground = null;
+            cb.Disabled.TopBackgroundHighlight = null;
+            cb.Disabled.BottomBackground = null;
+            cb.Disabled.BottomBackgroundHighlight = null;
+            cb.Disabled.Background = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor));
+            cb.Disabled.InnerBorder = LinearGradientColorTable.Empty;
+            cb.Disabled.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColorLightShade), Color.Empty);
+            cb.Disabled.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.Text = factory.GetColor(metroColors.CanvasColorLightShade);
+            return cb;
+        }
+
+        public static Office2007ButtonItemColorTable GetButtonItemMagenta(ColorFactory factory, MetroPartColors metroColors)
+        {
+            Office2007ButtonItemColorTable cb = new Office2007ButtonItemColorTable();
+            cb.Default = new Office2007ButtonItemStateColorTable();
+            cb.Default.Text = factory.GetColor(metroColors.TextColor);
+
+            // Button mouse over
+            cb.MouseOver = new Office2007ButtonItemStateColorTable();
+            cb.MouseOver.TopBackground = null; // new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight));
+            cb.MouseOver.TopBackgroundHighlight = null;// LinearGradientColorTable.Empty;
+            cb.MouseOver.BottomBackground = null; // new LinearGradientColorTable(factory.GetColor(metroColors.BaseButtonGradientEnd));
+            cb.MouseOver.BottomBackgroundHighlight = null;// LinearGradientColorTable.Empty;
+            cb.MouseOver.Background = new LinearGradientColorTable(factory.GetColor(metroColors.ComplementColorLight));
+            cb.MouseOver.InnerBorder = LinearGradientColorTable.Empty;
+            cb.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.ComplementColor));
+            cb.MouseOver.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.MouseOver.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.MouseOver.Text = factory.GetColor(metroColors.ComplementColorLightText);
+
+            cb.MouseOverSplitInactive = new Office2007ButtonItemStateColorTable();
+            cb.MouseOverSplitInactive.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.ComplementColor));
+
+            // Pressed
+            cb.Pressed = new Office2007ButtonItemStateColorTable();
+            cb.Pressed.OuterBorder = new LinearGradientColorTable(metroColors.ComplementColorDarker);
+            cb.Pressed.InnerBorder = LinearGradientColorTable.Empty;
+            cb.Pressed.TopBackground = null;// new LinearGradientColorTable(factory.GetColor("DAF6FF"));
+            cb.Pressed.TopBackgroundHighlight = null; // LinearGradientColorTable.Empty;
+            cb.Pressed.BottomBackground = null;// new LinearGradientColorTable(factory.GetColor("A7E8FF"));
+            cb.Pressed.BottomBackgroundHighlight = null; // new LinearGradientColorTable(factory.GetColor(Color.FromArgb(48, Color.White)), Color.Transparent);
+            cb.Pressed.Background = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor));
+            cb.Pressed.SplitBorder = new LinearGradientColorTable(factory.GetColor(metroColors.ComplementColor));
+            cb.Pressed.SplitBorderLight = LinearGradientColorTable.Empty;
+            cb.Pressed.Text = factory.GetColor(metroColors.TextColor);
+
+            // Checked
+            cb.Checked = new Office2007ButtonItemStateColorTable();
+            cb.Checked.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.ComplementColorDark));
+            cb.Checked.InnerBorder = LinearGradientColorTable.Empty;
+            cb.Checked.TopBackground = null;  // new LinearGradientColorTable(factory.GetColor("A7E8FF"));
+            cb.Checked.TopBackgroundHighlight = null; // LinearGradientColorTable.Empty;
+            cb.Checked.BottomBackground = null; // new LinearGradientColorTable(factory.GetColor("A7E8FF"));
+            cb.Checked.BottomBackgroundHighlight = null; // new LinearGradientColorTable(factory.GetColor("20FFFFFF"), Color.Transparent);
+            cb.Checked.Background = new LinearGradientColorTable(factory.GetColor(metroColors.ComplementColor));
+            cb.Checked.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Checked.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Checked.Text = factory.GetColor(metroColors.ComplementColorText);
+
+            // Expanded button
+            cb.Expanded = new Office2007ButtonItemStateColorTable();
+            cb.Expanded.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.ComplementColor));
+            cb.Expanded.InnerBorder = LinearGradientColorTable.Empty;
+            cb.Expanded.TopBackground = null; // new LinearGradientColorTable(factory.GetColor("DAF6FF"));
+            cb.Expanded.TopBackgroundHighlight = null; // LinearGradientColorTable.Empty;
+            cb.Expanded.BottomBackground = null; // new LinearGradientColorTable(factory.GetColor("A7E8FF"));
+            cb.Expanded.BottomBackgroundHighlight = null; // new LinearGradientColorTable(factory.GetColor(Color.FromArgb(48, Color.White)), Color.Transparent);
+            cb.Expanded.Background = new LinearGradientColorTable(factory.GetColor(metroColors.ComplementColor));
+            cb.Expanded.SplitBorder = new LinearGradientColorTable(factory.GetColor(metroColors.ComplementColorDark));
+            cb.Expanded.SplitBorderLight = LinearGradientColorTable.Empty; //(factory.GetColor("A000BFFF"), Color.Empty);
+            cb.Expanded.Text = factory.GetColor(metroColors.ComplementColorText);
+
+            SetBlueExpandColors(cb, factory);
+
+            return cb;
+        }
+
+        public static Office2007ButtonItemColorTable GetButtonItemMagentaWithBackground(ColorFactory factory, MetroPartColors metroColors)
+        {
+            Office2007ButtonItemColorTable cb = GetButtonItemMagenta(factory, metroColors);
+
+            cb.Default.TopBackground = null;
+            cb.Default.TopBackgroundHighlight = null;
+            cb.Default.BottomBackground = null;
+            cb.Default.BottomBackgroundHighlight = null;
+            cb.Default.Background = new LinearGradientColorTable(factory.GetColor(metroColors.ComplementColor));
+            cb.Default.InnerBorder = LinearGradientColorTable.Empty;
+            cb.Default.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.ComplementColor));
+            cb.Default.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.Text = factory.GetColor(metroColors.ComplementColorText);
+            cb.MouseOverSplitInactive = cb.Default;
+
+            // Same as default
+            cb.Disabled = new Office2007ButtonItemStateColorTable();
+            cb.Disabled.TopBackground = null;
+            cb.Disabled.TopBackgroundHighlight = null;
+            cb.Disabled.BottomBackground = null;
+            cb.Disabled.BottomBackgroundHighlight = null;
+            cb.Disabled.Background = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor));
+            cb.Disabled.InnerBorder = LinearGradientColorTable.Empty;
+            cb.Disabled.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColorLightShade), Color.Empty);
+            cb.Disabled.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.Text = factory.GetColor(metroColors.CanvasColorLightShade);
+            return cb;
+        }
+
+        public static void SetBlueExpandColors(Office2007ButtonItemColorTable ct, ColorFactory factory)
+        {
+            Color cb = factory.GetColor(0x454F5A);
+            Color cl = Color.FromArgb(192, Color.White);
+            ct.Default.ExpandBackground = cb;
+            ct.Default.ExpandLight = cl;
+
+            ct.Checked.ExpandBackground = cb;
+            ct.Checked.ExpandLight = cl;
+
+            //ct.Disabled.ExpandBackground = factory.GetColor(0xB7B7B7);
+            //ct.Disabled.ExpandLight = factory.GetColor(0xEDEDED);
+
+            ct.Expanded.ExpandBackground = cb;
+            ct.Expanded.ExpandLight = cl;
+
+            ct.MouseOver.ExpandBackground = cb;
+            ct.MouseOver.ExpandLight = cl;
+
+            ct.Pressed.ExpandBackground = cb;
+            ct.Pressed.ExpandLight = cl;
+        }
+
+        public static Office2007ButtonItemColorTable CreateBlueOrbColorTable(ColorFactory factory, MetroPartColors metroColors)
+        {
+            Office2007ButtonItemColorTable cb = new Office2007ButtonItemColorTable();
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.BlueOrb);
+
+            // Default
+            cb.Default = new Office2007ButtonItemStateColorTable();
+            cb.Default.TopBackground = null;
+            cb.Default.TopBackgroundHighlight = null;
+            cb.Default.BottomBackground = null;
+            cb.Default.BottomBackgroundHighlight = null;
+            cb.Default.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            cb.Default.InnerBorder = LinearGradientColorTable.Empty;
+            cb.Default.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseTextColor));
+            cb.Default.OuterBorderWidth = 2;
+            cb.Default.SplitBorder = LinearGradientColorTable.Empty;
+            cb.Default.SplitBorderLight = LinearGradientColorTable.Empty;
+            cb.Default.Text = factory.GetColor(metroColors.BaseTextColor);
+            cb.MouseOverSplitInactive = cb.Default;
+
+
+            // Button mouse over
+            cb.MouseOver = new Office2007ButtonItemStateColorTable();
+            cb.MouseOver.TopBackground = null;
+            cb.MouseOver.TopBackgroundHighlight = null;
+            cb.MouseOver.BottomBackground = null;
+            cb.MouseOver.BottomBackgroundHighlight = null;
+            cb.MouseOver.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            cb.MouseOver.InnerBorder = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLightest));// LinearGradientColorTable.Empty;
+            cb.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLightest));
+            cb.MouseOver.OuterBorderWidth = 2;
+            cb.MouseOver.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.MouseOver.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.MouseOver.Text = factory.GetColor(metroColors.BaseColorLightest);
+
+            cb.MouseOverSplitInactive = new Office2007ButtonItemStateColorTable();
+            cb.MouseOverSplitInactive.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLightest));
+
+            // Pressed
+            cb.Pressed = new Office2007ButtonItemStateColorTable();
+            cb.Pressed.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight));
+            cb.Pressed.OuterBorderWidth = 2;
+            cb.Pressed.InnerBorder = LinearGradientColorTable.Empty; // (factory.GetColor(metroColors.BaseColorLight));
+            cb.Pressed.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            cb.Pressed.TopBackground = null;
+            cb.Pressed.TopBackgroundHighlight = null;
+            cb.Pressed.BottomBackground = null;
+            cb.Pressed.BottomBackgroundHighlight = null;
+            cb.Pressed.SplitBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight));
+            cb.Pressed.SplitBorderLight = LinearGradientColorTable.Empty;//(factory.GetColor(metroColors.BaseColorLight), Color.Empty);
+            cb.Pressed.Text = factory.GetColor(metroColors.BaseColorLight);
+
+            // Checked
+            cb.Checked = new Office2007ButtonItemStateColorTable();
+            cb.Checked.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseTextColor));
+            cb.Checked.OuterBorderWidth = 2;
+            cb.Checked.InnerBorder = LinearGradientColorTable.Empty; // (factory.GetColor(metroColors.BaseTextColor));
+            cb.Checked.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            cb.Checked.TopBackground = null; //new LinearGradientColorTable(metroColors.BaseColorLight);
+            cb.Checked.TopBackgroundHighlight = null; //LinearGradientColorTable.Empty;
+            cb.Checked.BottomBackground = null; // new LinearGradientColorTable(metroColors.BaseColorLight);
+            cb.Checked.BottomBackgroundHighlight = null; // new LinearGradientColorTable(factory.GetColor("20FFFFFF"), Color.Transparent);
+            cb.Checked.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Checked.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Checked.Text = factory.GetColor(metroColors.BaseTextColor);
+
+            // Expanded button
+            cb.Expanded = new Office2007ButtonItemStateColorTable();
+            cb.Expanded.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLightest));
+            cb.Expanded.OuterBorderWidth = 2;
+            cb.Expanded.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            cb.Expanded.InnerBorder = LinearGradientColorTable.Empty;
+            cb.Expanded.TopBackground = null;
+            cb.Expanded.TopBackgroundHighlight = null;
+            cb.Expanded.BottomBackground = null;
+            cb.Expanded.BottomBackgroundHighlight = null;
+            cb.Expanded.SplitBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight));
+            cb.Expanded.SplitBorderLight = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight), Color.Empty);
+            cb.Expanded.Text = factory.GetColor(metroColors.BaseColorLightest);
+
+            // Same as default
+            cb.Disabled = new Office2007ButtonItemStateColorTable();
+            cb.Disabled.TopBackground = null;
+            cb.Disabled.TopBackgroundHighlight = null; // new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.BottomBackground = null; // LinearGradientColorTable.Empty;
+            cb.Disabled.BottomBackgroundHighlight = null; // new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColor));
+            cb.Disabled.InnerBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight1), Color.Empty);
+            cb.Disabled.OuterBorderWidth = 2;
+            cb.Disabled.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.Text = factory.GetColor(metroColors.BaseColorLight1);
+            return cb;
+        }
+
+        public static Office2007ButtonItemColorTable GetButtonItemStatusBar(ColorFactory factory, MetroPartColors metroColors)
+        {
+            Office2007ButtonItemColorTable cb = new Office2007ButtonItemColorTable();
+            cb.Default = new Office2007ButtonItemStateColorTable();
+            cb.Default.Text = factory.GetColor(metroColors.BaseTextColor);
+
+            // Button mouse over
+            cb.MouseOver = new Office2007ButtonItemStateColorTable();
+            cb.MouseOver.TopBackground = null;
+            cb.MouseOver.TopBackgroundHighlight = null;
+            cb.MouseOver.BottomBackground = null;
+            cb.MouseOver.BottomBackgroundHighlight = null;
+            cb.MouseOver.Background = new LinearGradientColorTable(metroColors.BaseColorLight1);
+            cb.MouseOver.InnerBorder = LinearGradientColorTable.Empty;
+            cb.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight1));
+            cb.MouseOver.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.MouseOver.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.MouseOver.Text = factory.GetColor(metroColors.BaseTextColor);
+
+            cb.MouseOverSplitInactive = new Office2007ButtonItemStateColorTable();
+            cb.MouseOverSplitInactive.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight1));
+
+            // Pressed
+            cb.Pressed = new Office2007ButtonItemStateColorTable();
+            cb.Pressed.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            cb.Pressed.InnerBorder = LinearGradientColorTable.Empty;
+            cb.Pressed.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            cb.Pressed.TopBackground = null;
+            cb.Pressed.TopBackgroundHighlight = null;
+            cb.Pressed.BottomBackground = null;
+            cb.Pressed.BottomBackgroundHighlight = null;
+            cb.Pressed.SplitBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            cb.Pressed.SplitBorderLight = LinearGradientColorTable.Empty;
+            cb.Pressed.Text = factory.GetColor(metroColors.BaseTextColor);
+
+            // Checked
+            cb.Checked = new Office2007ButtonItemStateColorTable();
+            cb.Checked.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            cb.Checked.InnerBorder = LinearGradientColorTable.Empty;
+            cb.Checked.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            cb.Checked.TopBackground = null;
+            cb.Checked.TopBackgroundHighlight = null;
+            cb.Checked.BottomBackground = null;
+            cb.Checked.BottomBackgroundHighlight = null;
+            cb.Checked.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Checked.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Checked.Text = factory.GetColor(metroColors.BaseTextColor);
+
+            // Expanded button
+            cb.Expanded = new Office2007ButtonItemStateColorTable();
+            cb.Expanded.OuterBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            cb.Expanded.Background = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            cb.Expanded.InnerBorder = LinearGradientColorTable.Empty;
+            cb.Expanded.TopBackground = null;
+            cb.Expanded.TopBackgroundHighlight = null;
+            cb.Expanded.BottomBackground = null;
+            cb.Expanded.BottomBackgroundHighlight = null;
+            cb.Expanded.SplitBorder = new LinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            cb.Expanded.SplitBorderLight = LinearGradientColorTable.Empty;
+            cb.Expanded.Text = factory.GetColor(metroColors.BaseTextColor);
+
+            SetBlueExpandColors(cb, factory);
+
+            return cb;
+        }
+        #endregion
+
+        #region RibbonTabItem
+        public static Office2007RibbonTabItemColorTable GetRibbonTabItemBlueDefault(ColorFactory factory, MetroPartColors metroColors, Color ribbonBack)
+        {
+            Office2007RibbonTabItemColorTable rt = new Office2007RibbonTabItemColorTable();
+            rt.Default.Text = factory.GetColor(metroColors.TextLightColor);
+            rt.CornerSize = 0;
+
+            // Selected Tab
+            rt.Selected = new Office2007RibbonTabItemStateColorTable();
+            rt.Selected.Background = new LinearGradientColorTable(ribbonBack);
+            rt.Selected.BackgroundHighlight = new LinearGradientColorTable();
+            rt.Selected.InnerBorder = new LinearGradientColorTable();
+            rt.Selected.OuterBorder = new LinearGradientColorTable(metroColors.CanvasColorLightShade);
+            rt.Selected.Text = factory.GetColor(metroColors.BaseColor);
+
+            // Selected Tab Mouse Over
+            rt.SelectedMouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.SelectedMouseOver.Background = new LinearGradientColorTable(ribbonBack);
+            rt.SelectedMouseOver.BackgroundHighlight = LinearGradientColorTable.Empty;
+            rt.SelectedMouseOver.InnerBorder = LinearGradientColorTable.Empty;
+            rt.SelectedMouseOver.OuterBorder = new LinearGradientColorTable(metroColors.CanvasColorLightShade);
+            rt.SelectedMouseOver.Text = factory.GetColor(metroColors.BaseColor);
+
+            // Tab Mouse Over
+            rt.MouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.MouseOver.Background = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(metroColors.CanvasColor));
+            rt.MouseOver.BackgroundHighlight = LinearGradientColorTable.Empty;
+            rt.MouseOver.InnerBorder = LinearGradientColorTable.Empty;
+            rt.MouseOver.OuterBorder = LinearGradientColorTable.Empty; // new LinearGradientColorTable(metroColors.CanvasColorLightShade);
+            rt.MouseOver.Text = factory.GetColor(metroColors.BaseColor);
+
+            return rt;
+        }
+
+        public static Office2007RibbonTabItemColorTable GetRibbonTabItemBlueMagenta(ColorFactory factory)
+        {
+            Office2007RibbonTabItemColorTable rt = new Office2007RibbonTabItemColorTable();
+            rt.Default.Text = factory.GetColor(0x3B3B3B);
+            rt.CornerSize = 2;
+
+            // Selected Tab
+            rt.Selected = new Office2007RibbonTabItemStateColorTable();
+            rt.Selected.Background = new LinearGradientColorTable(factory.GetColor(0xF4DEEE), factory.GetColor(0xFEFEFE));
+            rt.Selected.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(64, Color.White), Color.Transparent);
+            rt.Selected.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFFFFFF), Color.Transparent);
+            rt.Selected.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xE088C0), factory.GetColor(0xDF6DAA));
+            rt.Selected.Text = factory.GetColor(0x3B3B3B);
+
+            // Selected Tab Mouse Over
+            rt.SelectedMouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.SelectedMouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xF4DEEE), factory.GetColor(0xFEFEFE));
+            rt.SelectedMouseOver.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(64, Color.White), Color.Transparent);
+            rt.SelectedMouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFFFFFF), Color.Transparent);
+            rt.SelectedMouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xE088C0), factory.GetColor(0xDF6DAA));
+            rt.SelectedMouseOver.Text = factory.GetColor(0x3B3B3B);
+
+            // Tab Mouse Over
+            rt.MouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.MouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xEDB5D8), factory.GetColor(0xFCFBFB));
+            rt.MouseOver.BackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xFCFBFB), Color.Transparent);
+            rt.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xF9D7EE), factory.GetColor(0xFDEDF8));
+            rt.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xE33991));
+            rt.MouseOver.Text = factory.GetColor(0x3B3B3B);
+
+            return rt;
+        }
+
+        public static Office2007RibbonTabItemColorTable GetRibbonTabItemBlueGreen(ColorFactory factory)
+        {
+            Office2007RibbonTabItemColorTable rt = new Office2007RibbonTabItemColorTable();
+            rt.Default.Text = factory.GetColor(0x3B3B3B);
+            rt.CornerSize = 2;
+
+            // Selected Tab
+            rt.Selected = new Office2007RibbonTabItemStateColorTable();
+            rt.Selected.Background = new LinearGradientColorTable(factory.GetColor(0xE4F3E0), factory.GetColor(0xE4F2DF));
+            rt.Selected.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(64, Color.White), Color.Transparent);
+            rt.Selected.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xD5EAD3), factory.GetColor(0xB8DEB1));
+            rt.Selected.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xB9C1B7), factory.GetColor(0xBFC1BE));
+            rt.Selected.Text = factory.GetColor(0x3B3B3B);
+
+            // Selected Tab Mouse Over
+            rt.SelectedMouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.SelectedMouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xE4F3E0), factory.GetColor(0xE4F2DF));
+            rt.SelectedMouseOver.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(32, Color.White), Color.Transparent);
+            rt.SelectedMouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xD5EAD3), factory.GetColor(0xB8DEB1));
+            rt.SelectedMouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xB9C1B7), factory.GetColor(0xBFC1BE));
+            rt.SelectedMouseOver.Text = factory.GetColor(0x3B3B3B);
+
+            // Tab Mouse Over
+            rt.MouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.MouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xB3DEE3), factory.GetColor(0x8ADE9F));
+            rt.MouseOver.BackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xDEECFF), Color.Transparent);
+            rt.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xE2EFFF), factory.GetColor(0xC7DFFF));
+            rt.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xC1C8D1), factory.GetColor(0xC0C7D0));
+            rt.MouseOver.Text = factory.GetColor(0x3B3B3B);
+
+            return rt;
+        }
+
+        public static Office2007RibbonTabItemColorTable GetRibbonTabItemBlueOrange(ColorFactory factory)
+        {
+            Office2007RibbonTabItemColorTable rt = new Office2007RibbonTabItemColorTable();
+            rt.Default.Text = factory.GetColor(0x3B3B3B);
+            rt.CornerSize = 2;
+
+            // Selected Tab
+            rt.Selected = new Office2007RibbonTabItemStateColorTable();
+            rt.Selected.Background = new LinearGradientColorTable(factory.GetColor(0xFFF59F), factory.GetColor(0xFFFAD5));
+            rt.Selected.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(64, Color.White), Color.Transparent);
+            rt.Selected.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFFFBD6), factory.GetColor(0xFDF28C));
+            rt.Selected.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xCAC7AC), factory.GetColor(0xC2C2C2));
+            rt.Selected.Text = factory.GetColor(0x3B3B3B);
+
+            // Selected Tab Mouse Over
+            rt.SelectedMouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.SelectedMouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xFFF59F), factory.GetColor(0xFFFAD5));
+            rt.SelectedMouseOver.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(32, Color.White), Color.Transparent);
+            rt.SelectedMouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFFFBD6), factory.GetColor(0xFDF28C));
+            rt.SelectedMouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xCAC7AC), factory.GetColor(0xC2C2C2));
+            rt.SelectedMouseOver.Text = factory.GetColor(0x3B3B3B);
+
+            // Tab Mouse Over
+            rt.MouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.MouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xCFE0E1), factory.GetColor(0xE9E799));
+            rt.MouseOver.BackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xCBE2FF), Color.Transparent);
+            rt.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xE2EFFF), factory.GetColor(0xC7DFFF));
+            rt.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xC1C8D1), factory.GetColor(0xC0C7D0));
+            rt.MouseOver.Text = factory.GetColor(0x3B3B3B);
+
+            return rt;
+        }
+        #endregion
+
+        #region Style Class Creation
+        public static ElementStyle GetSlideOutButtonStyle(Color complementColor)
+        {
+            ElementStyle style = new ElementStyle(ElementStyleClassKeys.SlideOutButtonKey);
+            style.BackColor = complementColor;
+            style.TextColor = Color.White;
+            return style;
+        }
+
+        public static ElementStyle GetFileMenuContainerStyle(Office2007ColorTable table)
+        {
+            ElementStyle style = new ElementStyle();
+            style.Class = ElementStyleClassKeys.RibbonFileMenuContainerKey;
+            Office2007MenuColorTable mc = table.Menu;
+
+            style.PaddingBottom = 3;
+            style.PaddingLeft = 0;
+            style.PaddingRight = 0;
+            style.PaddingTop = 25;
+            style.Border = eStyleBorderType.Solid;
+            style.CornerType = eCornerType.Rounded;
+            style.BorderWidth = 1;
+            style.BorderColor = Color.Transparent;
+            style.CornerDiameter = 3;
+            BackgroundColorBlend[] blend = new BackgroundColorBlend[mc.FileBackgroundBlend.Count];
+            mc.FileBackgroundBlend.CopyTo(blend);
+            style.BackColorBlend.Clear();
+            style.BackColorBlend.AddRange(blend);
+            style.BackColorGradientAngle = 90;
+            return style;
+        }
+
+        public static ElementStyle GetTwoColumnMenuContainerStyle(Office2007ColorTable table)
+        {
+            ElementStyle style = new ElementStyle();
+            style.Class = ElementStyleClassKeys.RibbonFileMenuTwoColumnContainerKey;
+            Office2007MenuColorTable mc = table.Menu;
+
+            style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Double;
+            style.BorderBottomWidth = 0;
+            style.BorderColor = mc.FileContainerBorder;
+            //style.BorderColorLight = mc.FileContainerBorderLight;
+            style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.None;
+            style.BorderLeftWidth = 0;
+            style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.None;
+            style.BorderRightWidth = 0;
+            style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            style.BorderTopWidth = 1;
+            style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            style.BorderBottomWidth = 1;
+            style.PaddingBottom = 0;
+            style.PaddingLeft = 0;
+            style.PaddingRight = 0;
+            style.PaddingTop = 0;
+
+            return style;
+        }
+
+        public static ElementStyle GetMenuColumnOneContainerStyle(Office2007ColorTable table)
+        {
+            ElementStyle style = new ElementStyle();
+            style.Class = ElementStyleClassKeys.RibbonFileMenuColumnOneContainerKey;
+            Office2007MenuColorTable mc = table.Menu;
+
+            style.BackColor = mc.FileColumnOneBackground;
+            style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            style.BorderRightColor = mc.FileColumnOneBorder;
+            style.BorderRightWidth = 1;
+            style.PaddingRight = 1;
+
+            return style;
+        }
+
+        public static ElementStyle GetMenuColumnTwoContainerStyle(Office2007ColorTable table)
+        {
+            ElementStyle style = new ElementStyle();
+            style.Class = ElementStyleClassKeys.RibbonFileMenuColumnTwoContainerKey;
+            Office2007MenuColorTable mc = table.Menu;
+
+            style.BackColor = mc.FileColumnTwoBackground;
+
+            return style;
+        }
+
+        public static ElementStyle GetMenuBottomContainer(Office2007ColorTable table)
+        {
+            ElementStyle style = new ElementStyle();
+            style.Class = ElementStyleClassKeys.RibbonFileMenuBottomContainerKey;
+            Office2007MenuColorTable mc = table.Menu;
+
+            //BackgroundColorBlend[] blend = new BackgroundColorBlend[mc.FileBottomContainerBackgroundBlend.Count];
+            //mc.FileBottomContainerBackgroundBlend.CopyTo(blend);
+            //style.BackColorBlend.Clear();
+            //style.BackColorBlend.AddRange(blend);
+            //style.BackColorGradientAngle = 90;
+            style.MarginTop = 2;
+            style.MarginRight = 2;
+            return style;
+        }
+        #endregion
+
+        #region Scroll Bar
+        public static void InitializeScrollBarColorTable(Office2007ColorTable t, ColorFactory factory, MetroPartColors metroParts)
+        {
+            InitializeScrollBarColorTable(t.ScrollBar, factory, metroParts);
+        }
+        public static void InitializeScrollBarColorTable(Office2007ScrollBarColorTable scrollBarColorTable, ColorFactory factory, MetroPartColors metroParts)
+        {
+            Office2007ScrollBarStateColorTable sct = scrollBarColorTable.Default;
+            sct.Background = new LinearGradientColorTable(factory.GetColor(metroParts.CanvasColorLight));
+            sct.Border = LinearGradientColorTable.Empty;
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(metroParts.TextInactiveColor));
+            sct.TrackBackground.Clear();
+            sct.TrackInnerBorder = LinearGradientColorTable.Empty;
+            sct.TrackOuterBorder = LinearGradientColorTable.Empty;
+            sct.TrackSignBackground = new LinearGradientColorTable(factory.GetColor(metroParts.TextInactiveColor));
+
+            // Mouse Over
+            sct = scrollBarColorTable.MouseOver;
+            sct.Background = scrollBarColorTable.Default.Background;
+            sct.Border = scrollBarColorTable.Default.Border;
+            sct.ThumbBackground.Clear();
+            sct.ThumbInnerBorder = LinearGradientColorTable.Empty;
+            sct.ThumbOuterBorder = LinearGradientColorTable.Empty;
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(metroParts.TextColor));
+            sct.TrackBackground.Clear();
+            sct.TrackInnerBorder = LinearGradientColorTable.Empty;
+            sct.TrackOuterBorder = LinearGradientColorTable.Empty;
+            sct.TrackSignBackground = new LinearGradientColorTable(factory.GetColor(metroParts.TextColor));
+
+            // Control Mouse Over
+            sct = scrollBarColorTable.MouseOverControl;
+            sct.Background = scrollBarColorTable.Default.Background;
+            sct.Border = scrollBarColorTable.Default.Border;
+            sct.ThumbBackground.Clear();
+            sct.ThumbInnerBorder = LinearGradientColorTable.Empty;
+            sct.ThumbOuterBorder = new LinearGradientColorTable(factory.GetColor(metroParts.TextColor));
+            sct.ThumbSignBackground = scrollBarColorTable.Default.ThumbSignBackground;
+            sct.TrackBackground.Clear();
+            sct.TrackInnerBorder = LinearGradientColorTable.Empty;
+            sct.TrackOuterBorder = LinearGradientColorTable.Empty;
+            sct.TrackSignBackground = new LinearGradientColorTable(factory.GetColor(metroParts.TextColor));
+
+            // Pressed
+            sct = scrollBarColorTable.Pressed;
+            sct.Background = scrollBarColorTable.Default.Background;
+            sct.Border = scrollBarColorTable.Default.Border;
+            sct.ThumbBackground.Clear();
+            sct.ThumbInnerBorder = LinearGradientColorTable.Empty;
+            sct.ThumbOuterBorder = LinearGradientColorTable.Empty;
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(metroParts.TextColor));
+            sct.TrackBackground.Clear();
+            sct.TrackInnerBorder = LinearGradientColorTable.Empty;
+            sct.TrackOuterBorder = LinearGradientColorTable.Empty;
+            sct.TrackSignBackground = new LinearGradientColorTable(factory.GetColor(metroParts.TextColor));
+            // Disabled
+            sct = scrollBarColorTable.Disabled;
+            sct.Background = scrollBarColorTable.Default.Background;
+            sct.Border = scrollBarColorTable.Default.Border;
+            sct.ThumbBackground.Clear();
+            sct.ThumbInnerBorder = new LinearGradientColorTable();
+            sct.ThumbOuterBorder = new LinearGradientColorTable();
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(metroParts.TextDisabledColor));
+            sct.TrackBackground.Clear();
+            sct.TrackInnerBorder = new LinearGradientColorTable();
+            sct.TrackOuterBorder = new LinearGradientColorTable();
+            sct.TrackSignBackground = new LinearGradientColorTable();
+        }
+        public static void InitializeAppBlueScrollBarColorTable(Office2007ColorTable t, ColorFactory factory, MetroPartColors metroParts)
+        {
+            InitializeScrollBarColorTable(t.AppScrollBar, factory, metroParts);
+        }
+        #endregion
+
+        #region AdvTree
+        public static void CreateAdvTreeColorTable(TreeColorTable ct, ColorFactory factory, MetroPartColors metroColors)
+        {
+            #region Tree Selection
+            TreeSelectionColors treeSelection = new TreeSelectionColors();
+            ct.Selection = treeSelection;
+            // Highlight full row
+            SelectionColorTable selColorTable = new SelectionColorTable();
+            selColorTable.Fill = new SolidFill(factory.GetColor(metroColors.BaseColor));
+            selColorTable.TextColor = factory.GetColor(metroColors.BaseTextColor);
+            treeSelection.FullRowSelect = selColorTable;
+            //  Highlight full row Inactive
+            selColorTable = new SelectionColorTable();
+            selColorTable.Fill = new SolidFill(metroColors.CanvasColorLightShade);
+            treeSelection.FullRowSelectInactive = selColorTable;
+
+            // Node Marker
+            selColorTable = new SelectionColorTable();
+            selColorTable.Fill = new SolidFill(factory.GetColor(metroColors.BaseColor));
+            selColorTable.TextColor = factory.GetColor(metroColors.BaseTextColor);
+            treeSelection.NodeMarker = selColorTable;
+            // Node marker inactive
+            selColorTable = new SelectionColorTable();
+            selColorTable.Fill = new SolidFill(factory.GetColor(metroColors.CanvasColorLightShade));
+            treeSelection.NodeMarkerInactive = selColorTable;
+
+            // Cell selection
+            selColorTable = new SelectionColorTable();
+            selColorTable.Fill = new SolidFill(factory.GetColor(metroColors.BaseColor));
+            selColorTable.TextColor = factory.GetColor(metroColors.BaseTextColor);
+            treeSelection.HighlightCells = selColorTable;
+            // Cell selection inactive
+            selColorTable = new SelectionColorTable();
+            selColorTable.Fill = new SolidFill(factory.GetColor(metroColors.CanvasColorLightShade));
+            treeSelection.HighlightCellsInactive = selColorTable;
+
+            selColorTable = new SelectionColorTable();
+            selColorTable.Fill = new SolidFill(factory.GetColor(metroColors.BaseColor));
+            selColorTable.TextColor = factory.GetColor(metroColors.BaseTextColor);
+            treeSelection.NodeHotTracking = selColorTable;
+            #endregion
+
+            #region Expand Buttons
+            TreeExpandColorTable expand = new TreeExpandColorTable();
+            expand.CollapseBorder = new SolidBorder(factory.GetColor(metroColors.CanvasColorDarkShade), 1);
+            expand.CollapseFill = new SolidFill(factory.GetColor(metroColors.CanvasColor));
+            expand.CollapseMouseOverBorder = new SolidBorder(factory.GetColor(metroColors.TextColor), 1);
+            expand.CollapseMouseOverFill = new SolidFill(factory.GetColor(metroColors.TextColor));
+            expand.ExpandBorder = new SolidBorder(factory.GetColor(metroColors.CanvasColorDarkShade), 1);
+            expand.ExpandFill = new SolidFill(factory.GetColor(metroColors.CanvasColor));
+            expand.ExpandMouseOverBorder = new SolidBorder(factory.GetColor(metroColors.TextColor), 1);
+            expand.ExpandMouseOverFill = new SolidFill(factory.GetColor(metroColors.CanvasColor));
+            ct.ExpandTriangle = expand;
+            // Rectangle
+            expand = new TreeExpandColorTable();
+            expand.CollapseForeground = new SolidFill(factory.GetColor(metroColors.CanvasColorDarkShade));
+            expand.CollapseBorder = new SolidBorder(factory.GetColor(metroColors.TextColor), 1);
+            expand.CollapseFill = new GradientFill(new ColorStop[]{
+                new ColorStop(factory.GetColor(metroColors.CanvasColor), 0f), new ColorStop(factory.GetColor(metroColors.CanvasColor), .40f), new ColorStop(factory.GetColor(metroColors.CanvasColorLighterShade), 1f)}, 45);
+            expand.CollapseMouseOverForeground = expand.CollapseForeground;
+            expand.CollapseMouseOverBorder = expand.CollapseBorder;
+            expand.CollapseMouseOverFill = expand.CollapseFill;
+            expand.ExpandForeground = expand.CollapseForeground;
+            expand.ExpandBorder = expand.CollapseBorder;
+            expand.ExpandFill = expand.CollapseFill;
+            expand.ExpandMouseOverForeground = expand.CollapseForeground;
+            expand.ExpandMouseOverBorder = expand.CollapseBorder;
+            expand.ExpandMouseOverFill = expand.CollapseFill;
+            ct.ExpandRectangle = expand;
+            ct.ExpandEllipse = expand;
+            #endregion
+
+            #region Misc Tree Color
+            ct.GridLines = factory.GetColor(metroColors.CanvasColorLightShade);
+            #endregion
+        }
+        #endregion
+
+        #region RibbonTab Group
+        public static Office2007RibbonTabGroupColorTable GetRibbonTabGroupDefault(ColorFactory factory)
+        {
+            Office2007RibbonTabGroupColorTable tg = new Office2007RibbonTabGroupColorTable();
+            tg.Background = new LinearGradientColorTable(factory.GetColor(0xF6F1FC));
+            tg.BackgroundHighlight = LinearGradientColorTable.Empty;
+            tg.Text = factory.GetColor(0x935ED3);
+            tg.Border = new LinearGradientColorTable(factory.GetColor(0x935ED3));
+
+            return tg;
+        }
+
+        public static Office2007RibbonTabGroupColorTable GetRibbonTabGroupOrange(ColorFactory factory)
+        {
+            Office2007RibbonTabGroupColorTable tg = new Office2007RibbonTabGroupColorTable();
+            tg.Background = new LinearGradientColorTable(factory.GetColor(0xFFF8ED));
+            tg.BackgroundHighlight = LinearGradientColorTable.Empty;
+            tg.Text = factory.GetColor(0xCF5C0A);
+            tg.Border = new LinearGradientColorTable(factory.GetColor(0xFF9D00));
+
+            return tg;
+        }
+
+        public static Office2007RibbonTabGroupColorTable GetRibbonTabGroupMagenta(ColorFactory factory)
+        {
+            Office2007RibbonTabGroupColorTable tg = new Office2007RibbonTabGroupColorTable();
+            tg.Background = new LinearGradientColorTable(factory.GetColor(0xFCF0F7));
+            tg.BackgroundHighlight = LinearGradientColorTable.Empty;
+            tg.Text = factory.GetColor(0xC9599C);
+            tg.Border = new LinearGradientColorTable(factory.GetColor(0xC9599C));
+
+            return tg;
+        }
+
+        public static Office2007RibbonTabGroupColorTable GetRibbonTabGroupGreen(ColorFactory factory)
+        {
+            Office2007RibbonTabGroupColorTable tg = new Office2007RibbonTabGroupColorTable();
+            tg.Background = new LinearGradientColorTable(factory.GetColor(0xE6F3E6));
+            tg.BackgroundHighlight = LinearGradientColorTable.Empty;
+            tg.Text = factory.GetColor(0x49A349);
+            tg.Border = new LinearGradientColorTable(factory.GetColor(0x49A349));
+
+            return tg;
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Metro/Helpers/ColorHelpers.cs b/PROMS/DotNetBar Source Code/Metro/Helpers/ColorHelpers.cs
new file mode 100644
index 00000000..6e49b148
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Metro/Helpers/ColorHelpers.cs	
@@ -0,0 +1,206 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Metro.Helpers
+{
+    internal static class ColorHelpers
+    {
+        public static HSVColor ColorToHSV(Color color)
+        {
+            double var_R = ((double)color.R / 255);                     //RGB from 0 to 255
+            double var_G = ((double)color.G / 255);
+            double var_B = ((double)color.B / 255);
+
+            double var_Min = Min(var_R, var_G, var_B);    //Min. value of RGB
+            double var_Max = Max(var_R, var_G, var_B);    //Max. value of RGB
+            double del_Max = var_Max - var_Min;             //Delta RGB value
+
+            HSVColor hsv = new HSVColor();
+
+            hsv.Value = var_Max;
+
+            if (del_Max == 0)                     //This is a gray, no chroma...
+            {
+                hsv.Hue = 0;                                //HSV results from 0 to 1
+                hsv.Saturation = 0;
+            }
+            else                                    //Chromatic data...
+            {
+                hsv.Saturation = del_Max / var_Max;
+
+                double del_R = (((var_Max - var_R) / 6) + (del_Max / 2)) / del_Max;
+                double del_G = (((var_Max - var_G) / 6) + (del_Max / 2)) / del_Max;
+                double del_B = (((var_Max - var_B) / 6) + (del_Max / 2)) / del_Max;
+
+                if (var_R == var_Max)
+                    hsv.Hue = del_B - del_G;
+                else if (var_G == var_Max)
+                    hsv.Hue = (1d / 3d) + del_R - del_B;
+                else if (var_B == var_Max)
+                    hsv.Hue = (2d / 3d) + del_G - del_R;
+
+                if (hsv.Hue < 0) hsv.Hue += 1;
+                if (hsv.Hue > 1) hsv.Hue -= 1;
+            }
+
+            return hsv;
+        }
+
+        public static Color HSVToColor(double h, double s, double v)
+        {
+            return HSVToColor(new HSVColor(h, s, v));
+        }
+
+        public static Color HSVToColor(HSVColor hsv)
+        {
+            Color color;
+            if (hsv.Value < 0)
+                hsv.Value = 0;
+            else if (hsv.Value > 1)
+                hsv.Value = 1;
+            if (hsv.Saturation > 1)
+                hsv.Saturation = 1;
+            else if (hsv.Saturation < 0)
+                hsv.Saturation = 0;
+            if (hsv.Saturation == 0)                       //HSV from 0 to 1
+            {
+                color = Color.FromArgb((int)(hsv.Value * 255), (int)(hsv.Value * 255), (int)(hsv.Value * 255));
+            }
+            else
+            {
+                double var_h = hsv.Hue * 6;
+                if (var_h == 6) var_h = 0;      //H must be < 1
+                int var_i = (int)var_h;             //Or ... var_i = floor( var_h )
+                double var_1 = hsv.Value * (1 - hsv.Saturation);
+                double var_2 = hsv.Value * (1 - hsv.Saturation * (var_h - var_i));
+                double var_3 = hsv.Value * (1 - hsv.Saturation * (1 - (var_h - var_i)));
+
+                double var_r, var_g, var_b;
+                if (var_i == 0)
+                {
+                    var_r = hsv.Value;
+                    var_g = var_3;
+                    var_b = var_1;
+                }
+                else if (var_i == 1)
+                {
+                    var_r = var_2;
+                    var_g = hsv.Value;
+                    var_b = var_1;
+                }
+                else if (var_i == 2)
+                {
+                    var_r = var_1;
+                    var_g = hsv.Value;
+                    var_b = var_3;
+                }
+                else if (var_i == 3)
+                {
+                    var_r = var_1;
+                    var_g = var_2;
+                    var_b = hsv.Value;
+                }
+                else if (var_i == 4)
+                {
+                    var_r = var_3;
+                    var_g = var_1;
+                    var_b = hsv.Value;
+                }
+                else
+                {
+                    var_r = hsv.Value;
+                    var_g = var_1;
+                    var_b = var_2;
+                }
+
+                color = Color.FromArgb((int)(var_r * 255), (int)(var_g * 255), (int)(var_b * 255));
+            }
+
+            return color;
+        }
+
+        private static double Max(double rR, double rG, double rB)
+        {
+            double ret = 0;
+            if (rR > rG)
+            {
+                if (rR > rB)
+                    ret = rR;
+                else
+                    ret = rB;
+            }
+            else
+            {
+                if (rB > rG)
+                    ret = rB;
+                else
+                    ret = rG;
+            }
+            return ret;
+        }
+
+        private static double Min(double rR, double rG, double rB)
+        {
+            double ret = 0;
+            if (rR < rG)
+            {
+                if (rR < rB)
+                    ret = rR;
+                else
+                    ret = rB;
+            }
+            else
+            {
+                if (rB < rG)
+                    ret = rB;
+                else
+                    ret = rG;
+            }
+            return ret;
+        }
+
+        public static Color GetShadeColor(Color c)
+        {
+            if (c.IsEmpty) return Color.Black;
+            HSVColor hsv = ColorToHSV(c);
+            hsv.Value += hsv.Value > .5 ? -.2 : .2;
+            return HSVToColor(hsv);
+        }
+    }
+
+    internal struct HSVColor
+    {
+        /// <summary>
+        /// Gets or sets color hue. Hue is value from 0-1 which determines the degree on color wheel color is on, i.e. 0.5 = 180 degrees
+        /// </summary>
+        public double Hue;
+        /// <summary>
+        /// Gets or sets the color saturation from 0-1, i.e. 0-100%.
+        /// </summary>
+        public double Saturation;
+        /// <summary>
+        /// Gets or sets the amount of white and black in color.
+        /// </summary>
+        public double Value;
+
+        /// <summary>
+        /// Initializes a new instance of the HSVColor structure.
+        /// </summary>
+        /// <param name="hue"></param>
+        /// <param name="saturation"></param>
+        /// <param name="value"></param>
+        public HSVColor(double hue, double saturation, double value)
+        {
+            Hue = hue;
+            Saturation = saturation;
+            Value = value;
+        }
+
+        public override string ToString()
+        {
+            return string.Format("Hue={0}, Saturation={1}, Value={2}", Hue, Saturation, Value);
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Metro/Helpers/DoubleHelpers.cs b/PROMS/DotNetBar Source Code/Metro/Helpers/DoubleHelpers.cs
new file mode 100644
index 00000000..0b2a1bc6
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Metro/Helpers/DoubleHelpers.cs	
@@ -0,0 +1,64 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Runtime.InteropServices;
+
+namespace DevComponents.DotNetBar.Metro.Helpers
+{
+    internal static class DoubleHelpers
+    {
+        /// <summary>
+        /// Gets whether values are close.
+        /// </summary>
+        /// <param name="value1">First value.</param>
+        /// <param name="value2">Second value</param>
+        /// <returns>true if values are close enough</returns>
+        public static bool AreClose(double value1, double value2)
+        {
+            if (value1 == value2)
+            {
+                return true;
+            }
+            double num2 = ((Math.Abs(value1) + Math.Abs(value2)) + 10.0) * 2.2204460492503131E-16;
+            double num = value1 - value2;
+            return ((-num2 < num) && (num2 > num));
+        }
+        /// <summary>
+        /// Gets whether value is zero
+        /// </summary>
+        /// <param name="value">value to check</param>
+        /// <returns>true if value is considered zero</returns>
+        public static bool IsZero(double value)
+        {
+            return (Math.Abs(value) < 2.2204460492503131E-15);
+        }
+
+        /// <summary>
+        /// Gets whether value is not an number.
+        /// </summary>
+        /// <param name="value">value to test</param>
+        /// <returns>true if value is not an number</returns>
+        public static bool IsNaN(double value)
+        {
+            NanUnion union = new NanUnion();
+            union.DoubleValue = value;
+            ulong num = union.UintValue & 18442240474082181120L;
+            ulong num2 = union.UintValue & ((ulong)0xfffffffffffffL);
+            if ((num != 0x7ff0000000000000L) && (num != 18442240474082181120L))
+            {
+                return false;
+            }
+            return (num2 != 0L);
+        }
+
+        [StructLayout(LayoutKind.Explicit)]
+        private struct NanUnion
+        {
+            // Fields
+            [FieldOffset(0)]
+            internal double DoubleValue;
+            [FieldOffset(0)]
+            internal ulong UintValue;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Metro/MetroAppButton.cs b/PROMS/DotNetBar Source Code/Metro/MetroAppButton.cs
new file mode 100644
index 00000000..f878ed7f
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Metro/MetroAppButton.cs	
@@ -0,0 +1,368 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel;
+using System.Windows.Forms;
+using System.Drawing;
+using DevComponents.DotNetBar.Rendering;
+
+namespace DevComponents.DotNetBar.Metro
+{
+    /// <summary>
+    /// Represents the Metro application button used on MetroTab control.
+    /// </summary>
+    [ToolboxItem(false), DesignTimeVisible(false), DefaultEvent("Click"), Designer("DevComponents.DotNetBar.Design.MetroAppButtonDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+    public class MetroAppButton : ButtonItem
+    {
+        #region Internal Implementation
+        /// <summary>
+        /// Initializes a new instance of the MetroAppButton class.
+        /// </summary>
+        public MetroAppButton()
+        {
+            this.VerifyPopupScreenPosition = false;
+        }
+        protected override void Dispose(bool disposing)
+        {
+            if (_BackstageTab != null)
+                _BackstageTab.Leave -= BackstageTabLeave;
+            base.Dispose(disposing);
+        }
+        public override void RecalcSize()
+        {
+            ButtonItemLayout.LayoutButton(this, true);
+            m_NeedRecalcSize = false;
+        }
+        /// <summary>
+        /// Gets or sets a value indicating whether the item is expanded or not. For Popup items this would indicate whether the item is popped up or not.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), System.ComponentModel.DefaultValue(false), System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
+        public override bool Expanded
+        {
+            get { return base.Expanded; }
+
+            set
+            {
+                if (base.Expanded != value)
+                {
+                    if (!value)
+                    {
+                        MetroTabStrip container = this.ContainerControl as MetroTabStrip;
+                        if (container != null && container.MouseDownOnCaption)
+                            return;
+                    }
+                    base.Expanded = value;
+                }
+            }
+        }
+
+        private bool _ThumbTucked = false;
+        protected internal override void OnExpandChange()
+        {
+            _ThumbTucked = false;
+            if (!this.DesignMode && this.Expanded && this.PopupLocation.IsEmpty && this.PopupSide == ePopupSide.Default &&
+                (this.Parent is CaptionItemContainer ||
+                this.Parent is MetroTabItemContainer))
+            {
+                if (this.SubItems.Count > 0 && this.SubItems[0] is ItemContainer &&
+                    ((ItemContainer)this.SubItems[0]).BackgroundStyle.Class == ElementStyleClassKeys.RibbonFileMenuContainerKey)
+                {
+                    MetroTabStrip rs = this.ContainerControl as MetroTabStrip;
+                    if (rs != null)
+                    {
+                        if (this.Parent is MetroTabItemContainer)
+                        {
+                            if (this.EffectiveStyle == eDotNetBarStyle.Windows7)
+                                this.PopupLocation = new Point(this.IsRightToLeft ? this.Bounds.Right : this.LeftInternal, this.TopInternal - 1);
+                            else
+                                this.PopupLocation = new Point(this.IsRightToLeft ? this.Bounds.Right : this.LeftInternal, this.TopInternal);
+                        }
+                        else
+                            this.PopupLocation = new Point(this.IsRightToLeft ? this.Bounds.Right : this.LeftInternal, rs.GetItemContainerBounds().Y - 1);
+                        _ThumbTucked = true;
+                    }
+                }
+            }
+
+            if (_BackstageTab != null && _BackstageTabEnabled)
+            {
+                if (this.Expanded)
+                {
+                    PopupOpenEventArgs args = new PopupOpenEventArgs();
+                    OnPopupOpen(args);
+                    if (args.Cancel)
+                    {
+                        this.Expanded = false;
+                        return;
+                    }
+
+                    UpdateBackstageTabSize();
+                    if (this.ContainerControl is IKeyTipsControl)
+                    {
+                        IKeyTipsControl kc = this.ContainerControl as IKeyTipsControl;
+                        _BackstageTab.TabStrip.ShowKeyTips = kc.ShowKeyTips;
+                        kc.ShowKeyTips = false;
+                    }
+                    OnPopupShowing(EventArgs.Empty);
+                    _BackstageTab.Visible = true;
+                    _BackstageTab.BringToFront();
+                    _BackstageTab.Focus();
+                    MetroTabStrip strip = this.MetroTabStrip;
+                    if (strip != null && strip.SelectedTab != null)
+                    {
+                        _LastSelectedTabItem = strip.SelectedTab;
+                        if (this.DesignMode)
+                            _LastSelectedTabItem.RenderTabState = false;
+                        else
+                            _LastSelectedTabItem.Checked = false;
+                    }
+
+
+                }
+                else
+                {
+                    OnPopupClose(EventArgs.Empty);
+                    if (_LastSelectedTabItem != null)
+                    {
+                        if (this.DesignMode)
+                            _LastSelectedTabItem.RenderTabState = true;
+                        else
+                            _LastSelectedTabItem.Checked = true;
+                        _LastSelectedTabItem = null;
+                    }
+                    if (this.ContainerControl is IKeyTipsControl)
+                    {
+                        IKeyTipsControl kc = this.ContainerControl as IKeyTipsControl;
+                        kc.ShowKeyTips = _BackstageTab.TabStrip.ShowKeyTips;
+                        _BackstageTab.TabStrip.ShowKeyTips = false;
+                    }
+                    _BackstageTab.Visible = false;
+                    MetroTabStrip strip = this.ContainerControl as MetroTabStrip;
+                    if (strip != null)
+                        strip.BackstageTabClosed(_BackstageTab);
+                    OnPopupFinalized(EventArgs.Empty);
+                }
+
+                HideToolTip();
+                // Fire events
+                RaiseExpandChange(EventArgs.Empty);
+                return;
+            }
+
+            base.OnExpandChange();
+        }
+
+        public override void ContainerLostFocus(bool appLostFocus)
+        {
+            if (_BackstageTabEnabled && _BackstageTab != null && this.DesignMode && this.Expanded && appLostFocus) return;
+
+            base.ContainerLostFocus(appLostFocus);
+
+        }
+
+        internal override bool PopupPositionAdjusted
+        {
+            get { return base.PopupPositionAdjusted; }
+            set
+            {
+                base.PopupPositionAdjusted = value;
+                if (base.PopupPositionAdjusted && _ThumbTucked)
+                    _ThumbTucked = false;
+            }
+        }
+
+        internal void OnMenuPaint(ItemPaintArgs pa)
+        {
+            if (!_ThumbTucked) return;
+
+            Graphics g = pa.Graphics;
+            MetroTabStrip rs = this.ContainerControl as MetroTabStrip;
+            if (rs != null)
+            {
+                if (this.Parent is MetroTabItemContainer)
+                {
+                    if (pa.RightToLeft)
+                        g.TranslateTransform(-(this.LeftInternal - pa.ContainerControl.Width + this.WidthInternal), -(this.TopInternal));
+                    else
+                    {
+                        if (this.EffectiveStyle == eDotNetBarStyle.Windows7)
+                            g.TranslateTransform(-this.LeftInternal, -(this.TopInternal - 1));
+                        else
+                            g.TranslateTransform(-this.LeftInternal, -(this.TopInternal));
+                    }
+                }
+                else
+                {
+                    if (pa.RightToLeft)
+                        g.TranslateTransform(-(this.LeftInternal - pa.ContainerControl.Width + this.WidthInternal), -(rs.GetItemContainerBounds().Y - 1));
+                    else
+                        g.TranslateTransform(-this.LeftInternal, -(rs.GetItemContainerBounds().Y - 1));
+                }
+
+                g.ResetClip();
+                Control c = pa.ContainerControl;
+                pa.ContainerControl = rs;
+                pa.IsOnMenu = false;
+                this.IgnoreAlpha = true;
+                bool oldGlassEnabled = pa.GlassEnabled;
+                pa.GlassEnabled = rs.IsGlassEnabled;
+                this.Paint(pa);
+                pa.GlassEnabled = oldGlassEnabled;
+                this.IgnoreAlpha = false;
+                pa.ContainerControl = c;
+                pa.IsOnMenu = true;
+                g.ResetTransform();
+            }
+        }
+        protected override void OnCommandChanged()
+        {
+        }
+
+        protected override bool IsRightHanded
+        {
+            get
+            {
+                return false;
+            }
+        }
+
+        protected override void OnStyleChanged()
+        {
+            this.ImagePaddingHorizontal = 0;
+            this.ImagePaddingVertical = 0;
+            
+            base.OnStyleChanged();
+        }
+
+        protected override bool IsPulseEnabed
+        {
+            get
+            {
+                if ((this.EffectiveStyle == eDotNetBarStyle.Office2010 || StyleManager.IsMetro(this.EffectiveStyle)) && WinApi.IsGlassEnabled) return false;
+                return base.IsPulseEnabed;
+            }
+        }
+
+        private void UpdateBackstageTabSize()
+        {
+            if (_BackstageTab == null) return;
+            Control parentForm = _BackstageTab.Parent;
+            if (parentForm == null) throw new InvalidOperationException("BackstageTab control does not have a parent");
+
+            Rectangle tabBounds = parentForm.ClientRectangle;
+            MetroTabStrip strip = this.MetroTabStrip;
+            if (strip != null)
+            {
+                Point p = parentForm.PointToClient(strip.PointToScreen(this.Bounds.Location));
+                p.Y += this.Bounds.Height;// +1;
+                tabBounds = new Rectangle(p.X, p.Y, parentForm.ClientRectangle.Width, parentForm.ClientRectangle.Height - p.Y);
+                MetroAppForm metroForm = parentForm as MetroAppForm;
+                if (metroForm != null)
+                {
+                    Thickness borderThickness = metroForm.GetBorderThickness();
+                    tabBounds.Width -= (int)borderThickness.Horizontal;
+                    tabBounds.Height -= (int)borderThickness.Bottom;
+                }
+            }
+
+            _BackstageTab.Bounds = tabBounds;
+            _BackstageTab.Anchor = AnchorStyles.Left | AnchorStyles.Right | AnchorStyles.Bottom | AnchorStyles.Top;
+        }
+
+        private MetroTabItem _LastSelectedTabItem = null;
+        private MetroTabStrip MetroTabStrip
+        {
+            get
+            {
+                return this.ContainerControl as MetroTabStrip;
+            }
+        }
+
+        private bool _BackstageTabEnabled = true;
+        /// <summary>
+        /// Gets or sets whether control set on BackstageTab property is used on application menu popup.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether control set on BackstageTab property is used on application menu popup.")]
+        public bool BackstageTabEnabled
+        {
+            get { return _BackstageTabEnabled; }
+            set
+            {
+                this.Expanded = false;
+                _BackstageTabEnabled = value;
+            }
+        }
+
+
+        private SuperTabControl _BackstageTab = null;
+        /// <summary>
+        /// Gets or sets the backstage tab that is displayed instead of popup menu.
+        /// </summary>
+        [DefaultValue(null), Category("Behavior"), Description("Indicates backstage tab that is displayed instead of popup menu.")]
+        public SuperTabControl BackstageTab
+        {
+            get
+            {
+                return _BackstageTab;
+            }
+            set
+            {
+                SuperTabControl oldValue = _BackstageTab;
+                _BackstageTab = value;
+                OnBackstageTabChanged(oldValue, value);
+            }
+        }
+
+        private void OnBackstageTabChanged(SuperTabControl oldValue, SuperTabControl newValue)
+        {
+            if (oldValue != null)
+            {
+                oldValue.Leave -= BackstageTabLeave;
+                if (oldValue.TabStrip != null) oldValue.TabStrip.ApplicationButton = null;
+            }
+
+            if (this.Expanded) this.Expanded = false;
+            if (newValue != null)
+            {
+                newValue.Visible = false;
+                newValue.Leave += BackstageTabLeave;
+                if (newValue.TabStrip != null) newValue.TabStrip.ApplicationButton = this;
+            }
+        }
+
+        private void BackstageTabLeave(object sender, EventArgs e)
+        {
+            if (this.Expanded)
+                this.Expanded = false;
+        }
+
+        /// <summary>
+        /// Processes the Escape key when Application Button is hosting the backstage tab and uses it to close the tab if open.
+        /// This method is called from ProcessDialogKey method of MetroForm.
+        /// </summary>
+        /// <param name="keyData">Key data</param>
+        /// <returns>true if key was used to close backstage tab</returns>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ProcessEscapeKey(Keys keyData)
+        {
+            if (keyData == Keys.Escape && this.Expanded)
+            {
+                this.Expanded = false;
+                return true;
+            }
+            return false;
+        }
+        internal void BackstageMnemonicProcessed(char charCode)
+        {
+        }
+
+        protected override bool CanShowPopup
+        {
+            get
+            {
+                return (this.ShowSubItems || ShouldAutoExpandOnClick) && (this.SubItems.Count > 0 || this.PopupType == ePopupType.Container || BackstageTab != null && BackstageTabEnabled);
+            }
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Metro/MetroAppForm.cs b/PROMS/DotNetBar Source Code/Metro/MetroAppForm.cs
new file mode 100644
index 00000000..bbe8e658
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Metro/MetroAppForm.cs	
@@ -0,0 +1,1429 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows.Forms;
+using System.Drawing;
+using System.ComponentModel;
+using DevComponents.DotNetBar.Metro.Rendering;
+using System.Runtime.InteropServices;
+using System.Diagnostics;
+using DevComponents.DotNetBar.Metro.ColorTables;
+using DevComponents.DotNetBar.Controls;
+using System.Reflection;
+
+namespace DevComponents.DotNetBar.Metro
+{
+    public class MetroAppForm : Form
+    {
+        #region System Menu Constants
+        private const string SysMenuRestore = "restore";
+        private const string SysMenuMove = "move";
+        private const string SysMenuSize = "size";
+        private const string SysMenuMinimize = "minimize";
+        private const string SysMenuMaximize = "maximize";
+        private const string SysMenuClose = "close";
+        private const string SysMenu = "sysMenu";
+        #endregion
+
+        #region Events
+        /// <summary>
+        /// Occurs before modal panel is shown and allows change of modal panel bounds.
+        /// </summary>
+        [Description("Occurs before modal panel is shown and allows change of modal panel bounds.")]
+        public event ModalPanelBoundsEventHandler PrepareModalPanelBounds;
+        /// <summary>
+        /// Raises PrepareModalPanelBounds event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnPrepareModalPanelBounds(ModalPanelBoundsEventArgs e)
+        {
+            ModalPanelBoundsEventHandler handler = PrepareModalPanelBounds;
+            if (handler != null)
+                handler(this, e);
+        }
+        #endregion
+
+        #region Constructor
+        private System.Windows.Forms.Padding GlassDefaultPadding = new System.Windows.Forms.Padding(1, 1, 1, 1); //new System.Windows.Forms.Padding(0, 1, 1, 1);
+        private System.Windows.Forms.Padding PlainDefaultPadding = new System.Windows.Forms.Padding(1, 1, 1, 1);
+        
+        /// <summary>
+        /// Initializes a new instance of the MetroForm class.
+        /// </summary>
+        public MetroAppForm()
+        {
+            if (!StyleManager.IsMetro(StyleManager.Style))
+                StyleManager.Style = eStyle.Metro;
+            StyleManager.Register(this);
+            _IsGlassEnabled = WinApi.IsGlassEnabled;
+            this.ControlBox = false;
+            //this.Font = new System.Drawing.Font("Segoe UI", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            if (_IsGlassEnabled)
+                this.Padding = GlassDefaultPadding;
+            else
+                this.Padding = PlainDefaultPadding;
+            //_BorderOverlay = new BorderOverlay();
+            //this.Controls.Add(_BorderOverlay);
+            //UpdateBorderOverlay();
+        }
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing) StyleManager.Unregister(this);
+            base.Dispose(disposing);
+        }
+
+        //private BorderOverlay _BorderOverlay = null;
+        //private void UpdateBorderOverlay()
+        //{
+        //    if (_BorderOverlay == null) return;
+        //    Rectangle bounds = new Rectangle(0, 0, this.Width, this.Height);
+        //    if (_BorderOverlay.Bounds != bounds)
+        //    {
+        //        // Exclude Border
+        //        Rectangle borderExcludedBounds = bounds;
+        //        Thickness thickness = this.BorderThickness;
+        //        if (thickness.IsZero)
+        //        {
+        //            thickness = MetroRender.GetColorTable().MetroForm.BorderThickness;
+        //        }
+        //        if (thickness.IsZero)
+        //        {
+        //            _BorderOverlay.Visible = false;
+        //            return;
+        //        }
+
+        //        borderExcludedBounds.Width -= (int)thickness.Horizontal;
+        //        borderExcludedBounds.Height -= (int)thickness.Vertical;
+        //        borderExcludedBounds.X += (int)thickness.Left;
+        //        borderExcludedBounds.Y += (int)thickness.Top;
+        //        Region region = new Region(bounds);
+        //        region.Exclude(borderExcludedBounds);
+        //        if (!_BorderOverlay.Visible) _BorderOverlay.Visible = true;
+        //        _BorderOverlay.Bounds = bounds;
+        //        _BorderOverlay.Region = region;
+        //        if (this.Controls.IndexOf(_BorderOverlay) != 0)
+        //            _BorderOverlay.SendToBack();
+
+        //    }
+        //}
+
+        /// <summary>
+        /// Called by StyleManager to notify control that style on manager has changed and that control should refresh its appearance if
+        /// its style is controlled by StyleManager.
+        /// </summary>
+        /// <param name="newStyle">New active style.</param>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void StyleManagerStyleChanged(eDotNetBarStyle newStyle)
+        {
+            UpdateColorScheme();
+        }
+
+        private void UpdateColorScheme()
+        {
+            StyleManager.UpdateMetroAmbientColors(this);
+        }
+        protected override void OnShown(EventArgs e)
+        {
+            if (this.DesignMode)
+                UpdateColorScheme();
+            else if (_PreRenderShell && _MetroTab != null)
+            {
+                using (Bitmap bmp = new Bitmap(16, 16))
+                    _MetroTab.DrawToBitmap(bmp, new Rectangle(0, 0, this.Width, this.Height));
+            }
+            base.OnShown(e);
+        }
+        private bool _PreRenderShell = true;
+        /// <summary>
+        /// Gets or sets whether MetroShell is pre-rendered when form is shown to make first rendering smoother. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool PreRenderShell
+        {
+            get { return _PreRenderShell; }
+            set { _PreRenderShell = value; }
+        }
+        protected override void OnHandleCreated(EventArgs e)
+        {
+            UpdateColorScheme();
+            base.OnHandleCreated(e);
+        }
+        #endregion
+
+        #region Implementation
+        protected override void ScaleControl(SizeF factor, BoundsSpecified specified)
+        {
+            Dpi.SetScaling(factor);
+            base.ScaleControl(factor, specified);
+        }
+
+        /// <summary>
+        /// Gets whether at least one modal panel is displayed.
+        /// </summary>
+        [Browsable(false)]
+        public bool IsModalPanelDisplayed
+        {
+            get
+            {
+                return _ModalPanels.Count > 0;
+            }
+        }
+
+        private bool _ModalPanelBoundsExcludeStatusBar = false;
+        /// <summary>
+        /// Indicates whether modal panel when displayed shows MetroStatusBar.
+        /// </summary>
+        [DefaultValue(false), Category("Appearance"), Description("Indicates whether modal panel when displayed shows MetroStatusBar.")]
+        public bool ModalPanelBoundsExcludeStatusBar
+        {
+            get { return _ModalPanelBoundsExcludeStatusBar; }
+            set
+            {
+                _ModalPanelBoundsExcludeStatusBar = value;
+            }
+        }
+        
+
+        /// <summary>
+        /// Shows the panel control in the center of the form and covers all non system controls making the panel effectively modal.
+        /// </summary>
+        /// <param name="panel">Control to show.</param>
+        public void ShowModalPanel(Control panel)
+        {
+            ShowModalPanel(panel, false, eSlideSide.Left, SlidePanel.DefaultAnimationTime);
+        }
+        /// <summary>
+        /// Shows the panel control in the center of the form by sliding it in from specified side and covers all non system controls making the panel effectively modal.
+        /// </summary>
+        /// <param name="panel">Panel to show.</param>
+        /// <param name="slideFromSide">Side to slide panel into the view from.</param>
+        public void ShowModalPanel(Control panel, eSlideSide slideFromSide)
+        {
+            ShowModalPanel(panel, true, slideFromSide, SlidePanel.DefaultAnimationTime);
+        }
+        /// <summary>
+        /// Shows the panel control in the center of the form by sliding it in from specified side and covers all non system controls making the panel effectively modal.
+        /// </summary>
+        /// <param name="panel">Panel to show.</param>
+        /// <param name="slideFromSide">Side to slide panel into the view from.</param>
+        /// <param name="animationTimeMilliseconds">Slide animation speed in milliseconds.</param>
+        public void ShowModalPanel(Control panel, eSlideSide slideFromSide, int animationTimeMilliseconds)
+        {
+            ShowModalPanel(panel, true, slideFromSide, SlidePanel.DefaultAnimationTime);
+        }
+        private List<Control> _ModalPanels = new List<Control>();
+        private List<long> _DisabledItemIds = new List<long>();
+        private void ShowModalPanel(Control panel, bool slideIn, eSlideSide slideFromSide, int animationTimeMilliseconds)
+        {
+            StyleManager.UpdateAmbientColors(panel);
+
+            SlidePanel slidePanel = new SlidePanel();
+            slidePanel.CenterContent = true;
+            slidePanel.AnimationTime = animationTimeMilliseconds;
+            slidePanel.SlideSide = slideFromSide;
+            slidePanel.SlideOutButtonVisible = false;
+
+            if (slideIn)
+            {
+                slidePanel.Bounds = GetModalPanelBounds();
+                slidePanel.SlideOutOfViewSilent(this);
+            }
+            else
+            {
+                slidePanel.Bounds = GetModalPanelBounds();
+            }
+
+            slidePanel.Controls.Add(panel);
+            this.Controls.Add(slidePanel);
+            this.Controls.SetChildIndex(slidePanel, 0);
+            _ModalPanels.Add(slidePanel);
+
+            if (_ModalPanels.Count == 1 && _MetroTab != null)
+            {
+                //_MetroTab.MetroTabStrip.Enabled = false;
+                _MetroTab.MetroTabStrip.StripContainerItem.Enabled = false;
+                for (int i = 0; i < _MetroTab.MetroTabStrip.CaptionContainerItem.SubItems.Count; i++)
+                {
+                    BaseItem item = _MetroTab.MetroTabStrip.CaptionContainerItem.SubItems[i];
+                    if (item.SystemItem && !(item is QatCustomizeItem)) continue;
+                    item.Enabled = false;
+                    _DisabledItemIds.Add(item.Id);
+                }
+                _MetroTab.MetroTabStrip.Invalidate();
+            }
+
+            this.Update();
+            if (slideIn)
+                slidePanel.IsOpen = true;
+
+        }
+        /// <summary>
+        /// Hides the panel control that was previously shown using ShowModalPanel method.
+        /// </summary>
+        /// <param name="panel">Control to hide.</param>
+        public void CloseModalPanel(Control panel)
+        {
+            CloseModalPanel(panel, false, eSlideSide.Left);
+        }
+        /// <summary>
+        /// Hides the panel control that was previously shown using ShowModalPanel method by sliding it out of the view to the specified side.
+        /// </summary>
+        /// <param name="panel">Control to hide.</param>
+        /// <param name="slideOutToSide">Side to slide control into.</param>
+        public void CloseModalPanel(Control panel, eSlideSide slideOutToSide)
+        {
+            CloseModalPanel(panel, true, slideOutToSide);
+        }
+        private void CloseModalPanel(Control panel, bool slideOut, eSlideSide slideOutToSide)
+        {
+            SlidePanel slidePanel = null;
+            foreach (Control modalPanel in _ModalPanels)
+            {
+                if (modalPanel.Contains(panel))
+                {
+                    slidePanel = (SlidePanel)modalPanel;
+                    break;
+                }
+            }
+            if (slidePanel == null) throw new ArgumentException("panel was not shown previously using ShowModalPanel method");
+
+            if (slideOut)
+            {
+                slidePanel.SlideSide = slideOutToSide;
+                slidePanel.IsOpen = false;
+                DateTime start = DateTime.Now;
+                while (slidePanel.IsAnimating)
+                {
+                    Application.DoEvents();
+                    if (DateTime.Now.Subtract(start).TotalMilliseconds > 950)
+                    {
+                        slidePanel.AbortAnimation();
+                        slidePanel.Visible = false;
+                        break;
+                    }
+                }
+            }
+            else
+                slidePanel.Visible = false;
+            slidePanel.Controls.Remove(panel);
+            if (slidePanel.Parent != null)
+                slidePanel.Parent.Controls.Remove(slidePanel);
+            if (_ModalPanels.Contains(slidePanel))
+                _ModalPanels.Remove(slidePanel);
+            if(!slidePanel.IsDisposed)
+                slidePanel.Dispose();
+
+            if (_ModalPanels.Count == 0 && _MetroTab != null)
+            {
+                //_MetroTab.MetroTabStrip.Enabled = true;
+                _MetroTab.MetroTabStrip.StripContainerItem.Enabled = true;
+                for (int i = 0; i < _MetroTab.MetroTabStrip.CaptionContainerItem.SubItems.Count; i++)
+                {
+                    BaseItem item = _MetroTab.MetroTabStrip.CaptionContainerItem.SubItems[i];
+                    if (item.SystemItem) continue;
+                    if(_DisabledItemIds.Contains(item.Id))
+                        item.Enabled = true;
+                }
+
+                _MetroTab.MetroTabStrip.Refresh();
+            }
+        }
+
+        internal NonClientInfo GetNonClientInfo()
+        {
+            WinApi.RECT rect = new WinApi.RECT(0, 0, 200, 200);
+            CreateParams params1 = this.CreateParams;
+            WinApi.AdjustWindowRectEx(ref rect, params1.Style, false, params1.ExStyle);
+
+            NonClientInfo n = new NonClientInfo();
+            n.CaptionTotalHeight = Math.Abs(rect.Top);
+            n.BottomBorder = rect.Height - 200 - n.CaptionTotalHeight;
+            n.LeftBorder = Math.Abs(rect.Left);
+            n.RightBorder = rect.Width - 200 - n.LeftBorder;
+
+            return n;
+        }
+
+        private void UpdateModalPanelsSize()
+        {
+            foreach (Control modalPanel in _ModalPanels)
+            {
+                modalPanel.Bounds = GetModalPanelBounds();
+                if (this.WindowState == FormWindowState.Maximized)
+                {
+                    NonClientInfo nci = GetNonClientInfo();
+                    modalPanel.Padding = new System.Windows.Forms.Padding(nci.LeftBorder + 1);
+                }
+                else
+                    modalPanel.Padding = new System.Windows.Forms.Padding();
+            }
+        }
+        private Rectangle GetModalPanelBounds()
+        {
+            Thickness borderThickness = GetBorderThickness();
+
+            int statusBarHeight = 0;
+            if (_ModalPanelBoundsExcludeStatusBar)
+            {
+                foreach (Control item in this.Controls)
+                {
+                    if (item is MetroStatusBar && item.Dock == DockStyle.Bottom)
+                    {
+                        statusBarHeight = item.Height;
+                        break;
+                    }
+                }
+            }
+
+            Rectangle bounds = Rectangle.Empty;
+            if (_MetroTab != null && _MetroTab.CaptionVisible)
+            {
+                int captionHeight = _MetroTab.MetroTabStrip.GetCaptionHeight() + 2;
+                bounds = new Rectangle((int)borderThickness.Left, captionHeight, this.Width - (int)borderThickness.Horizontal, this.Height - captionHeight - (int)borderThickness.Bottom - statusBarHeight);
+            }
+            else
+            {
+                bounds = new Rectangle((int)borderThickness.Left, (int)borderThickness.Top, this.Width - (int)borderThickness.Horizontal, this.Height - (int)borderThickness.Vertical - statusBarHeight);
+            }
+
+            ModalPanelBoundsEventArgs args = new ModalPanelBoundsEventArgs(bounds);
+            OnPrepareModalPanelBounds(args);
+            bounds = args.ModalPanelBounds;
+
+            return bounds;
+        }
+
+        private bool _IsGlassEnabled = false;
+        /// <summary>
+        /// Returns whether Windows Glass effects are enabled.
+        /// </summary>
+        [Browsable(false)]
+        public bool IsGlassEnabled
+        {
+            get
+            {
+                return _IsGlassEnabled;
+            }
+        }
+        private void UpdateIsGlassEnabled()
+        {
+            bool glassEnabled = WinApi.IsGlassEnabled;
+            if (glassEnabled != _IsGlassEnabled)
+            {
+                _IsGlassEnabled = glassEnabled;
+                OnGlassEnabledChanged();
+            }
+        }
+        private void OnGlassEnabledChanged()
+        {
+            if (_IsGlassEnabled)
+                this.Padding = GlassDefaultPadding;
+            else
+                this.Padding = PlainDefaultPadding;
+            if (_IsGlassEnabled && this.Region != null)
+                this.Region = null;
+            else
+                this.Region = GetPlainFormRegion();
+            this.Refresh();
+        }
+        private Region GetPlainFormRegion()
+        {
+            Region reg = new Region(new Rectangle(0, 0, this.Width, this.Height));
+            return reg;
+        }
+
+        private MetroShell _MetroTab = null;
+        /// <summary>
+        /// Gets or sets the MetroTab that is hosted by this form. This property is for internal use only.
+        /// </summary>
+        [Browsable(false)]
+        public virtual MetroShell MetroShell
+        {
+            get { return _MetroTab; }
+            internal set
+            {
+                _MetroTab = value;
+            }
+        }
+
+        protected override void OnStyleChanged(EventArgs e)
+        {
+            UpdateMetroSystemCaptionItem();
+            base.OnStyleChanged(e);
+        }
+
+        protected override void OnControlAdded(ControlEventArgs e)
+        {
+            if (e.Control is MetroShell)
+            {
+                _MetroTab = e.Control as MetroShell;
+                UpdateMetroSystemCaptionItem();
+            }
+            base.OnControlAdded(e);
+        }
+
+        protected override void OnControlRemoved(ControlEventArgs e)
+        {
+            if (e.Control == _MetroTab)
+            {
+                _MetroTab = null;
+            }
+            base.OnControlRemoved(e);
+        }
+
+        private bool _Sizable = true;
+        /// <summary>
+        /// Gets or sets whether form can be resized.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether form can be resized.")]
+        public bool Sizable
+        {
+            get { return _Sizable; }
+            set { _Sizable = value; }
+        }
+
+        /// <summary>
+        /// Gets effective Border Thickness for the form.
+        /// </summary>
+        /// <returns>Thickness</returns>
+        public Thickness GetBorderThickness()
+        {
+            if (!_BorderThickness.IsZero) return _BorderThickness;
+            MetroAppFormColorTable ct = GetFormColorTable();
+            return this.IsGlassEnabled ? ct.BorderThickness : ct.BorderPlainThickness;
+        }
+
+        private MetroAppFormColorTable GetFormColorTable()
+        {
+            MetroColorTable ct = MetroRender.GetColorTable();
+            return ct.MetroAppForm;
+        }
+
+        private Thickness _BorderThickness = new Thickness();
+        /// <summary>
+        /// Gets or sets the form border thickness. Default value is empty thickness which indicates that thickness is taken from MetroFormColorTable.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates form border thickness.")]
+        public Thickness BorderThickness
+        {
+            get { return _BorderThickness; }
+            set
+            {
+                if (value != _BorderThickness)
+                {
+                    Thickness oldValue = _BorderThickness;
+                    _BorderThickness = value;
+                    OnBorderThicknessChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when BorderThickness property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnBorderThicknessChanged(Thickness oldValue, Thickness newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("BorderThickness"));
+            this.Invalidate();
+        }
+
+        private BorderColors _BorderColor;
+        /// <summary>
+        /// Gets or sets the form border colors.
+        /// </summary>
+        public BorderColors BorderColor
+        {
+            get { return _BorderColor; }
+            set
+            {
+                if (value != _BorderColor)
+                {
+                    BorderColors oldValue = _BorderColor;
+                    _BorderColor = value;
+                    OnBorderColorChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when BorderColor property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnBorderColorChanged(BorderColors oldValue, BorderColors newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("BorderColor"));
+            this.Invalidate();
+        }
+
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            if (!_IsGlassEnabled && this.Region == null)
+                this.Region = GetPlainFormRegion();
+            MetroRender.Paint(this, e);
+            base.OnPaint(e);
+        }
+
+        protected override void OnActivated(EventArgs e)
+        {
+            ExtendGlass();
+            this.Invalidate();
+            base.OnActivated(e);
+        }
+
+        protected override void OnDeactivate(EventArgs e)
+        {
+            this.Invalidate();
+            base.OnDeactivate(e);
+        }
+
+        private void ExtendGlass()
+        {
+            if (!WinApi.IsGlassEnabled) return;
+
+            WinApi.MARGINS m = new WinApi.MARGINS();
+            m.cyTopHeight = 0;
+            m.cxLeftWidth = 0;
+            m.cxRightWidth = 0;
+            m.cyBottomHeight = NativeFunctions.IsTerminalSession() ? 0 : 1;
+            WinApi.DwmExtendFrameIntoClientArea(this.Handle, ref m);
+        }
+
+        protected virtual bool WindowsMessageSetText(ref Message m)
+        {
+            if (WinApi.IsGlassEnabled) return true;
+
+            bool modified = WinApi.ModifyHwndStyle(m.HWnd, (int)WinApi.WindowStyles.WS_VISIBLE, 0);
+
+            base.DefWndProc(ref m);
+
+            if (_MetroTab != null) _MetroTab.Refresh();
+            if (modified)
+            {
+                WinApi.ModifyHwndStyle(m.HWnd, 0, (int)WinApi.WindowStyles.WS_VISIBLE);
+            }
+            return false;
+        }
+        protected virtual bool WindowsMessageWindowsPosChanged(ref Message m)
+        {
+            if (this.WindowState == FormWindowState.Minimized || this.WindowState == FormWindowState.Maximized)
+            {
+                _TrackSetBoundsCore = true;
+                base.WndProc(ref m);
+                _TrackSetBoundsCore = true;
+                return false;
+            }
+            return true;
+        }
+        protected override void WndProc(ref Message m)
+        {
+            bool callBase = true;
+            if (!PreProcessWndProc(ref m))
+                return;
+
+            if (m.Msg == (int)WinApi.WindowsMessages.WM_NCCALCSIZE)
+            {
+                callBase = WindowsMessageNCCalcSize(ref m);
+            }
+            else if (m.Msg == (int)WinApi.WindowsMessages.WM_NCACTIVATE)
+            {
+                callBase = WindowsMessageNCActivate(ref m);
+            }
+            else if (m.Msg == (int)WinApi.WindowsMessages.WM_DWMCOMPOSITIONCHANGED)
+            {
+                callBase = WindowsMessageDwmCompositionChanged(ref m);
+            }
+            else if (m.Msg == (int)WinApi.WindowsMessages.WM_NCHITTEST)
+            {
+                callBase = WindowsMessageNCHitTest(ref m);
+            }
+            else if (m.Msg == (int)WinApi.WindowsMessages.WM_SETTEXT)
+            {
+                callBase = WindowsMessageSetText(ref m);
+            }
+            else if (m.Msg == (int)WinApi.WindowsMessages.WM_NCPAINT)
+            {
+                callBase = WindowsMessageNCPaint(ref m);
+            }
+            else if (m.Msg == (int)WinApi.WindowsMessages.WM_ERASEBKGND)
+            {
+                if (!WinApi.IsGlassEnabled)
+                {
+                    callBase = false;
+                    m.Result = new IntPtr(1);
+                }
+            }
+            else if (m.Msg == (int)WinApi.WindowsMessages.WM_SETICON)
+            {
+                callBase = WindowsMessageSetIcon(ref m);
+            }
+            else if (m.Msg == (int)WinApi.WindowsMessages.WM_SETTEXT)
+            {
+                callBase = WindowsMessageSetText(ref m);
+            }
+            else if (m.Msg == (int)WinApi.WindowsMessages.WM_SETCURSOR)
+            {
+                callBase = WindowsMessageSetCursor(ref m);
+            }
+            else if (m.Msg == (int)WinApi.WindowsMessages.WM_WINDOWPOSCHANGED)
+            {
+                callBase = WindowsMessageWindowsPosChanged(ref m);
+            }
+
+            if (callBase)
+                base.WndProc(ref m);
+        }
+        protected virtual bool WindowsMessageSetCursor(ref Message m)
+        {
+            // Button down on client area while there is a modal form displayed
+            if (!_IsActive && (WinApi.HIWORD(m.LParam) == (int)WinApi.WindowsMessages.WM_LBUTTONUP || WinApi.HIWORD(m.LParam) == (int)WinApi.WindowsMessages.WM_LBUTTONDOWN) && WinApi.LOWORD(m.LParam) == (int)WinApi.WindowHitTestRegions.Error ||
+                !this.Enabled || BarUtilities.IsModalFormOpen)
+                return true;
+
+            bool modified = WinApi.ModifyHwndStyle(m.HWnd, (int)WinApi.WindowStyles.WS_VISIBLE, 0);
+
+            base.DefWndProc(ref m);
+
+            if (_MetroTab != null && this.DesignMode) _MetroTab.Refresh();
+            if (modified)
+            {
+                WinApi.ModifyHwndStyle(m.HWnd, 0, (int)WinApi.WindowStyles.WS_VISIBLE);
+            }
+
+            return false;
+        }
+        protected virtual bool WindowsMessageSetIcon(ref Message m)
+        {
+            bool modified = WinApi.ModifyHwndStyle(m.HWnd, (int)WinApi.WindowStyles.WS_VISIBLE, 0);
+
+            base.DefWndProc(ref m);
+
+            if (_MetroTab != null) _MetroTab.Refresh();
+            if (modified)
+            {
+                WinApi.ModifyHwndStyle(m.HWnd, 0, (int)WinApi.WindowStyles.WS_VISIBLE);
+            }
+
+            return false;
+        }
+
+        protected virtual bool WindowsMessageNCPaint(ref Message m)
+        {
+            if (WinApi.IsGlassEnabled)
+            {
+                return true;
+            }
+            else
+            {
+                m.Result = IntPtr.Zero;
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// Called when WM_NCHITTEST message is received.
+        /// </summary>
+        /// <param name="m">Reference to message data.</param>
+        /// <returns>Return true to call base form implementation otherwise return false.</returns>
+        protected virtual bool WindowsMessageNCHitTest(ref Message m)
+        {
+            // Get position being tested...
+            int x = WinApi.LOWORD(m.LParam);
+            int y = WinApi.HIWORD(m.LParam);
+            Point p = PointToClient(new Point(x, y));
+
+            Thickness borderResize = FormResizeBorder;
+            if (this.Sizable && !borderResize.IsZero && this.WindowState == FormWindowState.Normal)
+            {
+                Rectangle hitTest = new Rectangle(0, 0, (int)borderResize.Left, (int)borderResize.Top); hitTest.Inflate(1, 1);
+                if (hitTest.Contains(p))
+                {
+                    m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.TopLeftSizeableCorner);
+                    return false;
+                }
+                hitTest = new Rectangle(this.Width - (int)borderResize.Right, 0, (int)borderResize.Right, (int)borderResize.Top); hitTest.Inflate(1, 1);
+                if (hitTest.Contains(p))
+                {
+                    m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.TopRightSizeableCorner);
+                    return false;
+                }
+                hitTest = new Rectangle(this.Width - ((int)borderResize.Right+Dpi.Width10), this.Height - ((int)borderResize.Bottom+Dpi.Height10), (int)borderResize.Right+Dpi.Width10, (int)borderResize.Bottom+Dpi.Height10); hitTest.Inflate(2, 2);
+                if (hitTest.Contains(p))
+                {
+                    m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.BottomRightSizeableCorner);
+                    return false;
+                }
+                hitTest = new Rectangle(0, this.Height - (int)borderResize.Bottom, (int)borderResize.Left, (int)borderResize.Bottom); hitTest.Inflate(1, 1);
+                if (hitTest.Contains(p))
+                {
+                    m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.BottomLeftSizeableCorner);
+                    return false;
+                }
+
+                hitTest = new Rectangle(0, 0, (int)borderResize.Left, this.Height);
+                if (hitTest.Contains(p))
+                {
+                    m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.LeftSizeableBorder);
+                    return false;
+                }
+                hitTest = new Rectangle(0, 0, this.Width, (int)borderResize.Top);
+                if (hitTest.Contains(p))
+                {
+                    m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.TopSizeableBorder);
+                    return false;
+                }
+                hitTest = new Rectangle(this.Width - (int)borderResize.Right, 0, (int)borderResize.Right, this.Height);
+                if (hitTest.Contains(p))
+                {
+                    m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.RightSizeableBorder);
+                    return false;
+                }
+
+                hitTest = new Rectangle(0, this.Height - (int)borderResize.Bottom, this.Width, (int)borderResize.Bottom);
+                if (hitTest.Contains(p))
+                {
+                    m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.BottomSizeableBorder);
+                    return false;
+                }
+            }
+
+            MetroShell tab = _MetroTab;
+            if (tab != null)
+            {
+                Rectangle r = new Rectangle((RightToLeft == RightToLeft.No ? (int)borderResize.Left : this.Width - (int)borderResize.Right - 24), (int)borderResize.Left, 24, 24);
+                if (r.Contains(p))
+                {
+                    m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.Menu);
+                    return false;
+                }
+            }
+
+            if (BarFunctions.IsWindows7 && this.WindowState == FormWindowState.Maximized && tab != null && tab.CaptionVisible)
+            {
+                p = tab.MetroTabStrip.PointToClient(new Point(x, y));
+                if (tab.MetroTabStrip.CaptionBounds.Contains(p))
+                {
+                    m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.TitleBar);
+                    return false;
+                }
+            }
+
+
+            return true;
+        }
+
+        /// <summary>
+        /// Called when WM_DWMCOMPOSITIONCHANGED message is received.
+        /// </summary>
+        /// <param name="m">Reference to message data.</param>
+        /// <returns>Return true to call base form implementation otherwise return false.</returns>
+        protected virtual bool WindowsMessageDwmCompositionChanged(ref Message m)
+        {
+            UpdateIsGlassEnabled();
+            ExtendGlass();
+            return true;
+        }
+
+        private bool _IsActive = false;
+        /// <summary>
+        /// Gets whether form is active.
+        /// </summary>
+        [Browsable(false)]
+        public bool IsActive
+        {
+            get { return _IsActive; }
+            internal set
+            {
+                if (_IsActive != value)
+                {
+                    _IsActive = value;
+                    OnIsActiveChanged();
+                }
+            }
+        }
+        private void OnIsActiveChanged()
+        {
+            if (_MetroTab != null)
+                _MetroTab.MetroTabStrip.Invalidate(_MetroTab.MetroTabStrip.CaptionBounds);
+        }
+
+        /// <summary>
+        /// Called when WM_NCACTIVATE message is received.
+        /// </summary>
+        /// <param name="m">Reference to message data.</param>
+        /// <returns>Return true to call base form implementation otherwise return false.</returns>
+        protected virtual bool WindowsMessageNCActivate(ref Message m)
+        {
+            if (m.WParam != IntPtr.Zero)
+                IsActive = true;
+            else
+                IsActive = false;
+
+            m.Result = WinApi.DefWindowProc(m.HWnd, WinApi.WindowsMessages.WM_NCACTIVATE, m.WParam, new IntPtr(-1));
+            if (this.DesignMode)
+                RefreshAll();
+
+            return false;
+        }
+        private void RefreshAll()
+        {
+            if (this.IsHandleCreated)
+            {
+                this.Invalidate(true);
+                this.Refresh();
+            }
+        }
+
+        protected override void OnTextChanged(EventArgs e)
+        {
+            if (this.DesignMode)
+            {
+                if (_MetroTab != null) _MetroTab.Refresh();
+            }
+            base.OnTextChanged(e);
+        }
+
+        private bool _Minimized = false;
+        private bool _Maximized = false;
+        private bool _ChangingSize = false;
+        protected override void OnResize(EventArgs e)
+        {
+            if (!_IsGlassEnabled)
+            {
+                this.Region = GetPlainFormRegion();
+                this.Invalidate();
+            }
+
+            UpdateModalPanelsSize();
+            
+            base.OnResize(e);
+        }
+
+        private bool _TrackSetBoundsCore = false;
+        protected override void SetBoundsCore(int x, int y, int width, int height, BoundsSpecified specified)
+        {
+            if (_TrackSetBoundsCore ||
+                this.DesignMode && ((specified & BoundsSpecified.Height) == BoundsSpecified.Height || (specified & BoundsSpecified.Width) == BoundsSpecified.Width))
+            {
+                if (width != this.Width || height != this.Height)
+                {
+                    AdjustBounds(ref width, ref height, specified);
+                }
+                _TrackSetBoundsCore = false;
+            }
+            //else if ((specified & BoundsSpecified.Width) == BoundsSpecified.None)
+            //{
+            //    specified |= BoundsSpecified.Width;
+            //    AdjustBounds(ref width, ref height, specified);
+            //}
+
+            base.SetBoundsCore(x, y, width, height, specified);
+        }
+
+        protected virtual void AdjustBounds(ref int width, ref int height)
+        {
+            AdjustBounds(ref width, ref height, BoundsSpecified.Width | BoundsSpecified.Height);
+        }
+        protected virtual void AdjustBounds(ref int width, ref int height, BoundsSpecified specified)
+        {
+            WinApi.RECT rect = new WinApi.RECT(0, 0, width, height);
+            CreateParams params1 = this.CreateParams;
+            WinApi.AdjustWindowRectEx(ref rect, params1.Style, false, params1.ExStyle);
+
+            if ((specified & BoundsSpecified.Height) == BoundsSpecified.Height)
+            {
+                height -= (rect.Height - height);
+                //if (IsGlassEnabled)
+                //{
+                //    if (this.FormBorderStyle == FormBorderStyle.FixedDialog)
+                //        height += SystemInformation.FixedFrameBorderSize.Height;
+                //    else if (this.FormBorderStyle == FormBorderStyle.Fixed3D)
+                //        height += SystemInformation.FixedFrameBorderSize.Height;
+                //    else if (this.FormBorderStyle == FormBorderStyle.FixedSingle)
+                //        height += 1;
+                //    else if (this.FormBorderStyle == FormBorderStyle.FixedToolWindow)
+                //        height += SystemInformation.FixedFrameBorderSize.Height;
+                //    else
+                //        height += SystemInformation.FrameBorderSize.Height /* * NativeFunctions.BorderMultiplierFactor*/;
+                //}
+            }
+
+            if ((specified & BoundsSpecified.Width) == BoundsSpecified.Width)
+            {
+                width -= (rect.Width - width);
+            }
+        }
+        protected override void SetClientSizeCore(int x, int y)
+        {
+            if (!this.DesignMode)
+            {
+                this.Size = new Size(x, y);
+
+                Type type = typeof(Control);
+                try // try with ignore catch is bad idea but in this case its for future proofing, just in case M$ removes these members
+                {
+                    type.InvokeMember("clientWidth", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.SetField, null, this, new object[] { x });
+                    type.InvokeMember("clientHeight", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.SetField, null, this, new object[] { y });
+                }
+                catch { }
+                OnClientSizeChanged(EventArgs.Empty);
+                return;
+            }
+            base.SetClientSizeCore(x, y);
+        }
+        private FormWindowState GetWindowState()
+        {
+            WinApi.WINDOWPLACEMENT wp = new WinApi.WINDOWPLACEMENT();
+            if (WinApi.GetWindowPlacement(this.Handle, out wp))
+            {
+                if (wp.showCmd == (int)WinApi.ShowWindowCommands.Maximize)
+                    return FormWindowState.Maximized;
+                else if (wp.showCmd == (int)WinApi.ShowWindowCommands.Minimize)
+                    return FormWindowState.Minimized;
+                else if (wp.showCmd == (int)WinApi.ShowWindowCommands.Normal)
+                    return FormWindowState.Normal;
+            }
+
+            return this.WindowState;
+        }
+        /// <summary>
+        /// Called when WM_NCCALCSIZE message is received.
+        /// </summary>
+        /// <param name="m">Message structure.</param>
+        /// <returns>true to call base WndProc otherwise false.</returns>
+        protected virtual bool WindowsMessageNCCalcSize(ref Message m)
+        {
+            // Default implementation of ribbon form does not have non-client area at all...
+            if (m.WParam != IntPtr.Zero && GetWindowState() == FormWindowState.Maximized)
+            {
+                WinApi.NCCALCSIZE_PARAMS csp;
+                csp = (WinApi.NCCALCSIZE_PARAMS)Marshal.PtrToStructure(m.LParam, typeof(WinApi.NCCALCSIZE_PARAMS));
+                NonClientInfo nci = GetNonClientInfo();
+                Size reduction = new Size(nci.LeftBorder, nci.BottomBorder); //SystemInformation.FrameBorderSize;
+                Size frameBorderSize = reduction;
+                if (reduction.Width > 2)
+                    reduction.Width -= reduction.Width - 2;
+                if (reduction.Height > 2)
+                    reduction.Height -= reduction.Height - 2;
+
+                WinApi.WINDOWPOS pos = (WinApi.WINDOWPOS)Marshal.PtrToStructure(csp.lppos, typeof(WinApi.WINDOWPOS));
+                //Console.WriteLine(pos);
+                WinApi.RECT newClientRect = WinApi.RECT.FromRectangle(new Rectangle(pos.x + frameBorderSize.Width - 1, pos.y + reduction.Height,
+                    pos.cx - frameBorderSize.Width * 2 + 3, pos.cy - frameBorderSize.Height - 1));
+                if (_AutoHideTaskBarReduction > 0)
+                {
+                    Taskbar taskBar = new Taskbar();
+                    if (taskBar.AutoHide)
+                    {
+                        if (taskBar.Position == TaskbarPosition.Bottom)
+                            newClientRect.Bottom -= _AutoHideTaskBarReduction;
+                        else if (taskBar.Position == TaskbarPosition.Top)
+                        {
+                            newClientRect.Bottom -= _AutoHideTaskBarReduction;
+                            newClientRect.Top += _AutoHideTaskBarReduction;
+                        }
+                        else if (taskBar.Position == TaskbarPosition.Left)
+                        {
+                            newClientRect.Right -= _AutoHideTaskBarReduction;
+                            newClientRect.Left += _AutoHideTaskBarReduction;
+                        }
+                        else if (taskBar.Position == TaskbarPosition.Right)
+                            newClientRect.Right -= _AutoHideTaskBarReduction;
+                    }
+                }
+
+                csp.rgrc0 = newClientRect;
+                csp.rgrc1 = newClientRect;
+                Marshal.StructureToPtr(csp, m.LParam, false);
+                m.Result = new IntPtr((int)WinApi.WindowsMessages.WVR_VALIDRECTS);
+                this.Invalidate();
+                return false;
+            }
+
+            m.Result = IntPtr.Zero;
+            this.Invalidate();
+            return false;
+        }
+        private int _AutoHideTaskBarReduction = 4;
+        /// <summary>
+        /// Indicates the number of pixels subtracted from form's height or width (depending on taskbar position) when form is maximized and taskbar is in auto-hide state. Default value is 4.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public int AutoHideTaskBarReduction
+        {
+            get { return _AutoHideTaskBarReduction; }
+            set { _AutoHideTaskBarReduction = value; }
+        }
+        private bool PreProcessWndProc(ref Message m)
+        {
+            return true;
+        }
+
+        protected override bool ProcessDialogKey(Keys keyData)
+        {
+            if (keyData == Keys.Escape)
+            {
+                MetroShell metroTab = this.MetroShell;
+                if (metroTab != null)
+                {
+                    MetroAppButton appButton = metroTab.GetApplicationButton() as MetroAppButton;
+                    if (appButton != null)
+                    {
+                        if (appButton.ProcessEscapeKey(keyData))
+                            return true;
+                    }
+                }
+            }
+            return base.ProcessDialogKey(keyData);
+        }
+
+        /// <summary>
+        /// This property is not to be used with MetroForm.
+        /// </summary>
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public new FormBorderStyle FormBorderStyle
+        {
+            get { return base.FormBorderStyle; }
+            set { base.FormBorderStyle = value; }
+        }
+
+        private Thickness _FormResizeBorder = new Thickness(5);
+        /// <summary>
+        /// Gets or sets the size of the border on the edges of the form that when mouse is over allow for form resizing.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public Thickness FormResizeBorder
+        {
+            get { return _FormResizeBorder; }
+            set { _FormResizeBorder = value; }
+        }
+
+        private void UpdateMetroSystemCaptionItem()
+        {
+            SystemCaptionItem captionItem = GetSystemCaptionItem();
+            if (captionItem != null)
+            {
+                captionItem.MinimizeVisible = this.MinimizeBox;
+                captionItem.RestoreMaximizeVisible = this.MaximizeBox;
+                captionItem.CloseVisible = this.CloseBoxVisible;
+                captionItem.HelpVisible = this.HelpButton;
+                if (!this.MaximizeBox && !this.MinimizeBox && !this.CloseBoxVisible)
+                    captionItem.Visible = false;
+                else
+                    captionItem.Visible = true;
+                if (_MetroTab != null)
+                    _MetroTab.RecalcLayout();
+            }
+        }
+        private SystemCaptionItem GetSystemCaptionItem()
+        {
+            if (_MetroTab != null)
+            {
+                return _MetroTab.MetroTabStrip.SystemCaptionItem;
+            }
+            return null;
+        }
+
+        private bool _CloseBoxVisible = true;
+        /// <summary>
+        /// Indicates whether Close button in top-right corner of the form is visible.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance"), Description("Indicates whether Close button in top-right corner of the form is visible.")]
+        public bool CloseBoxVisible
+        {
+            get { return _CloseBoxVisible; }
+            set { _CloseBoxVisible = value; UpdateMetroSystemCaptionItem(); }
+        }
+
+        /// <summary>
+        /// This property cannot be used on MetroAppForm
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override bool AutoScroll
+        {
+            get
+            {
+                return base.AutoScroll;
+            }
+            set
+            {
+                if (value) value = false;
+                base.AutoScroll = value;
+            }
+        }
+        /// <summary>
+        /// This property cannot be used on MetroAppForm
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override Point AutoScrollOffset
+        {
+            get
+            {
+                return base.AutoScrollOffset;
+            }
+            set
+            {
+                base.AutoScrollOffset = value;
+            }
+        }
+        /// <summary>
+        /// This property cannot be used on MetroAppForm
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public new Size AutoScrollMargin
+        {
+            get
+            {
+                return base.AutoScrollMargin;
+            }
+            set
+            {
+                base.AutoScrollMargin = value;
+            }
+        }
+        /// <summary>
+        /// This property cannot be used on MetroAppForm
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public new Size AutoScrollMinSize
+        {
+            get
+            {
+                return base.AutoScrollMinSize;
+            }
+            set
+            {
+                base.AutoScrollMinSize = value;
+            }
+        }
+ 
+
+
+ 
+
+        #endregion
+
+        #region System Menu Handling
+        private ContextMenuBar _ContextMenuBar = null;
+        internal void ShowSystemWindowMenu(Point p)
+        {
+            if (this.DesignMode) return;
+            CreateContextMenuBar();
+
+            // Update items enabled state
+            ButtonItem sysMenu = ((ButtonItem)_ContextMenuBar.Items[SysMenu]);
+            sysMenu.SubItems[SysMenuRestore].Enabled = this.WindowState != FormWindowState.Normal;
+            sysMenu.SubItems[SysMenuMove].Enabled = this.WindowState == FormWindowState.Normal;
+            sysMenu.SubItems[SysMenuSize].Enabled = this.WindowState == FormWindowState.Normal && this.Sizable;
+            sysMenu.SubItems[SysMenuMinimize].Enabled = this.WindowState != FormWindowState.Minimized && this.MinimizeBox; ;
+            sysMenu.SubItems[SysMenuMaximize].Enabled = this.WindowState != FormWindowState.Maximized && this.Sizable && this.MaximizeBox; ;
+            sysMenu.SubItems[SysMenuClose].Enabled = true;
+
+            sysMenu.Popup(p);
+        }
+        internal void ShowSystemWindowMenu()
+        {
+            ShowSystemWindowMenu(Control.MousePosition);
+        }
+
+        private string GetLocalizedString(string key)
+        {
+            string text = "";
+            if (key == LocalizationKeys.FormSystemMenuRestore)
+                text = _SystemMenuRestore;
+            else if (key == LocalizationKeys.FormSystemMenuMove)
+                text = _SystemMenuMove;
+            else if (key == LocalizationKeys.FormSystemMenuSize)
+                text = _SystemMenuSize;
+            else if (key == LocalizationKeys.FormSystemMenuMinimize)
+                text = _SystemMenuMinimize;
+            else if (key == LocalizationKeys.FormSystemMenuMaximize)
+                text = _SystemMenuMaximize;
+            else if (key == LocalizationKeys.FormSystemMenuClose)
+                text = _SystemMenuClose;
+
+            return LocalizationManager.GetLocalizedString(key, text);
+        }
+        private void CreateContextMenuBar()
+        {
+            if (_ContextMenuBar != null || this.DesignMode) return;
+            _ContextMenuBar = new ContextMenuBar();
+            _ContextMenuBar.Style = eDotNetBarStyle.StyleManagerControlled;
+            this.Controls.Add(_ContextMenuBar);
+
+            ButtonItem sysMenu = new ButtonItem(SysMenu);
+            _ContextMenuBar.Items.Add(sysMenu);
+            ButtonItem sysItem = new ButtonItem(SysMenuRestore, GetLocalizedString(LocalizationKeys.FormSystemMenuRestore));
+            sysItem.Image = BarFunctions.LoadBitmap("SystemImages.WinRestore.png");
+            sysItem.Click += new EventHandler(SysItemClick);
+            sysMenu.SubItems.Add(sysItem);
+            sysItem = new ButtonItem(SysMenuMove, GetLocalizedString(LocalizationKeys.FormSystemMenuMove));
+            sysItem.Click += new EventHandler(SysItemClick);
+            sysMenu.SubItems.Add(sysItem);
+            sysItem = new ButtonItem(SysMenuSize, GetLocalizedString(LocalizationKeys.FormSystemMenuSize));
+            sysItem.Click += new EventHandler(SysItemClick);
+            sysMenu.SubItems.Add(sysItem);
+            sysItem = new ButtonItem(SysMenuMinimize, GetLocalizedString(LocalizationKeys.FormSystemMenuMinimize));
+            sysItem.Click += new EventHandler(SysItemClick);
+            sysItem.Image = BarFunctions.LoadBitmap("SystemImages.WinMin.png");
+            sysMenu.SubItems.Add(sysItem);
+            sysItem = new ButtonItem(SysMenuMaximize, GetLocalizedString(LocalizationKeys.FormSystemMenuMaximize));
+            sysItem.Click += new EventHandler(SysItemClick);
+            sysItem.Image = BarFunctions.LoadBitmap("SystemImages.WinMax.png");
+            sysMenu.SubItems.Add(sysItem);
+            sysItem = new ButtonItem(SysMenuClose, GetLocalizedString(LocalizationKeys.FormSystemMenuClose));
+            sysItem.Click += new EventHandler(SysItemClick);
+            sysItem.Image = BarFunctions.LoadBitmap("SystemImages.WinClose.png");
+            sysItem.BeginGroup = true;
+            sysItem.FontBold = true;
+            sysItem.HotFontBold = true;
+            sysItem.Shortcuts.Add(eShortcut.CtrlF4);
+            sysMenu.SubItems.Add(sysItem);
+        }
+
+        void SysItemClick(object sender, EventArgs e)
+        {
+            BaseItem item = sender as BaseItem;
+            if (item == null) return;
+            if (item.Name == SysMenuRestore)
+                NativeFunctions.PostMessage(this.Handle, NativeFunctions.WM_SYSCOMMAND, NativeFunctions.SC_RESTORE, 0);
+            else if (item.Name == SysMenuMove)
+                NativeFunctions.PostMessage(this.Handle, NativeFunctions.WM_SYSCOMMAND, NativeFunctions.SC_MOVE, 0);
+            else if (item.Name == SysMenuSize)
+                NativeFunctions.PostMessage(this.Handle, NativeFunctions.WM_SYSCOMMAND, NativeFunctions.SC_SIZE, 0);
+            else if (item.Name == SysMenuMinimize)
+                NativeFunctions.PostMessage(this.Handle, NativeFunctions.WM_SYSCOMMAND, NativeFunctions.SC_MINIMIZE, 0);
+            else if (item.Name == SysMenuMaximize)
+                NativeFunctions.PostMessage(this.Handle, NativeFunctions.WM_SYSCOMMAND, NativeFunctions.SC_MAXIMIZE, 0);
+            else if (item.Name == SysMenuClose)
+                NativeFunctions.PostMessage(this.Handle, NativeFunctions.WM_SYSCOMMAND, NativeFunctions.SC_CLOSE, 0);
+
+        }
+
+        private string _SystemMenuRestore = "Restore";
+        /// <summary>
+        /// Gets or sets text for form system menu Restore item.
+        /// </summary>
+        [DefaultValue("Restore"), Description("Indicates text for form system menu Restore item."), Localizable(true), Category("System Menu")]
+        public string SystemMenuRestore
+        {
+            get { return _SystemMenuRestore; }
+            set { _SystemMenuRestore = value; }
+        }
+        private string _SystemMenuMove = "Move";
+        /// <summary>
+        /// Gets or sets text for form system menu Move item.
+        /// </summary>
+        [DefaultValue("Move"), Description("Indicates text for form system menu Move item."), Localizable(true), Category("System Menu")]
+        public string SystemMenuMove
+        {
+            get { return _SystemMenuMove; }
+            set { _SystemMenuMove = value; }
+        }
+        private string _SystemMenuSize = "Size";
+        /// <summary>
+        /// Gets or sets text for form system menu Size item.
+        /// </summary>
+        [DefaultValue("Size"), Description("Indicates text for form system menu Size item."), Localizable(true), Category("System Menu")]
+        public string SystemMenuSize
+        {
+            get { return _SystemMenuSize; }
+            set { _SystemMenuSize = value; }
+        }
+        private string _SystemMenuMinimize = "Minimize";
+        /// <summary>
+        /// Gets or sets text for form system menu Minimize item.
+        /// </summary>
+        [DefaultValue("Minimize"), Description("Indicates text for form system menu Minimize item."), Localizable(true), Category("System Menu")]
+        public string SystemMenuMinimize
+        {
+            get { return _SystemMenuMinimize; }
+            set { _SystemMenuMinimize = value; }
+        }
+        private string _SystemMenuMaximize = "Maximize";
+        /// <summary>
+        /// Gets or sets text for form system menu Maximize item.
+        /// </summary>
+        [DefaultValue("Maximize"), Description("Indicates text for form system menu Maximize item."), Localizable(true), Category("System Menu")]
+        public string SystemMenuMaximize
+        {
+            get { return _SystemMenuMaximize; }
+            set { _SystemMenuMaximize = value; }
+        }
+        private string _SystemMenuClose = "Close";
+        /// <summary>
+        /// Gets or sets text for form system menu Close item.
+        /// </summary>
+        [DefaultValue("Close"), Description("Indicates text for form system menu Close item."), Localizable(true), Category("System Menu")]
+        public string SystemMenuClose
+        {
+            get { return _SystemMenuClose; }
+            set { _SystemMenuClose = value; }
+        }
+        #endregion
+    }
+
+    #region BorderOverlay
+    internal class BorderOverlay : Control
+    {
+        /// <summary>
+        /// Initializes a new instance of the BorderOverlay class.
+        /// </summary>
+        public BorderOverlay()
+        {
+            this.SetStyle(ControlStyles.UserPaint | ControlStyles.AllPaintingInWmPaint | ControlStyles.Opaque |
+                ControlStyles.ResizeRedraw | ControlStyles.DoubleBuffer | ControlStyles.Selectable, true);
+        }
+
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            MetroRender.Paint(this, e);
+            base.OnPaint(e);
+        }
+
+        protected override void WndProc(ref Message m)
+        {
+            if (m.Msg == (int)WinApi.WindowsMessages.WM_NCHITTEST)
+            {
+                m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.TransparentOrCovered);
+                return;
+            }
+            base.WndProc(ref m);
+        }
+    }
+    #endregion
+
+    #region PrepareModalPanelBounds Event
+    /// <summary>
+    /// Delegate for PrepareModalPanelBounds event.
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    public delegate void ModalPanelBoundsEventHandler(object sender, ModalPanelBoundsEventArgs e);
+    /// <summary>
+    /// Provides data for PrepareModalPanelBounds event.
+    /// </summary>
+    public class ModalPanelBoundsEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets or sets the bounds modal panel will occupy when shown.
+        /// </summary>
+        public Rectangle ModalPanelBounds = Rectangle.Empty;
+        /// <summary>
+        /// Initializes a new instance of the ModalPanelBoundsEventArgs class.
+        /// </summary>
+        /// <param name="modalPanelBounds"></param>
+        public ModalPanelBoundsEventArgs(Rectangle modalPanelBounds)
+        {
+            ModalPanelBounds = modalPanelBounds;
+        }
+    }
+    #endregion
+}
+
+
diff --git a/PROMS/DotNetBar Source Code/Metro/MetroForm.cs b/PROMS/DotNetBar Source Code/Metro/MetroForm.cs
new file mode 100644
index 00000000..a5650148
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Metro/MetroForm.cs	
@@ -0,0 +1,331 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel;
+using System.Drawing.Drawing2D;
+using System.Drawing;
+using DevComponents.DotNetBar.Metro.Rendering;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Metro
+{
+    public class MetroForm : OfficeForm
+    {
+        #region Private Vars
+        private const string DefaultSettingsButtonText = "<font size=\"7\">SETTINGS</font>";
+        private const string DefaultHelpButtonText = "<font size=\"7\">HELP</font>";
+        private ButtonItem _Settings = null;
+        private ButtonItem _Help = null;
+        #endregion
+
+        #region Internal Implementation
+        /// <summary>
+        /// Initializes a new instance of the MetroForm class.
+        /// </summary>
+        public MetroForm()
+        {
+            if (!StyleManager.IsMetro(StyleManager.Style))
+                StyleManager.Style = eStyle.Metro;
+
+            StyleManager.Register(this);
+            base.EnableGlass = false;
+        }
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing) StyleManager.Unregister(this);
+            base.Dispose(disposing);
+        }
+        protected override void OnHandleCreated(EventArgs e)
+        {
+            UpdateColorScheme();
+            base.OnHandleCreated(e);
+        }
+        /// <summary>
+        /// Gets the array of LinearGradientColorTable objects that describe the border colors. The colors with index 0 is used as the outer most
+        /// border.
+        /// </summary>
+        /// <returns>Array of LinearGradientColorTable</returns>
+        protected override Color[] GetBorderColors(int borderSize)
+        {
+            DevComponents.DotNetBar.Metro.ColorTables.MetroColorTable metroColorTable = MetroRender.GetColorTable();
+            DevComponents.DotNetBar.Metro.ColorTables.MetroFormColorTable ct = metroColorTable.MetroForm;
+            Color canvas = this.BackColor; //metroColorTable.CanvasColor;
+            BorderColors[] borderColors = _BorderColors ?? ct.BorderColors;
+            Color[] colors = new Color[((FormBorderStyle == FormBorderStyle.FixedSingle) ? 1 : borderColors.Length + (borderSize > borderColors.Length ? 1 : 0))];
+            if (FormBorderStyle == System.Windows.Forms.FormBorderStyle.FixedSingle && borderSize > 1)
+            {
+                colors = new Color[4];
+                colors[0] = borderColors[0].Left;
+                colors[1] = colors[0];
+                colors[2] = colors[0];
+                colors[3] = canvas;
+                return colors;
+            }
+            for (int i = 0; i < colors.Length; i++)
+            {
+                if (i > borderColors.Length - 1)
+                    colors[i] = canvas;
+                else
+                    colors[i] = borderColors[i].Left;
+            }
+
+            return colors;
+        }
+        /// <summary>
+        /// Called by StyleManager to notify control that style on manager has changed and that control should refresh its appearance if
+        /// its style is controlled by StyleManager.
+        /// </summary>
+        /// <param name="newStyle">New active style.</param>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override void StyleManagerStyleChanged(eDotNetBarStyle newStyle)
+        {
+            base.StyleManagerStyleChanged(newStyle);
+            if (BarFunctions.IsHandleValid(this))
+                UpdateColorScheme();
+        }
+
+        private void UpdateColorScheme()
+        {
+            StyleManager.UpdateMetroAmbientColors(this);
+        }
+
+        private BorderColors[] _BorderColors = null;
+        /// <summary>
+        /// Gets or sets custom border colors for the form. When set it overrides settings from global Metro color table.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public BorderColors[] BorderColors
+        {
+            get { return _BorderColors; }
+            set { _BorderColors = value; Invalidate(); }
+        }
+
+        /// <summary>
+        /// This property is not applicable for MetroForm.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool EnableGlass
+        {
+            get
+            {
+                return base.EnableGlass;
+            }
+            set
+            {
+                base.EnableGlass = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the form path for the given input bounds.
+        /// </summary>
+        /// <param name="bounds">Represent the form bounds.</param>
+        /// <returns></returns>
+        protected override GraphicsPath GetFormPath(Rectangle bounds)
+        {
+            GraphicsPath path = new GraphicsPath();
+            path.AddRectangle(bounds);
+            return path;
+        }
+
+        protected override bool UseCornerSize
+        {
+            get
+            {
+                return false;
+            }
+        }
+
+        //        protected override Rectangle GetInnerFormBounds()
+        //        {
+        //            Rectangle r = new Rectangle(3, 3, this.Width - 7, this.Height - 2);
+
+        //#if FRAMEWORK20
+        //            if (this.RightToLeftLayout) r = new Rectangle(3, 3, this.Width - 6, this.Height - 2);
+        //#endif
+
+        //            return r;
+        //        }
+
+        protected override LabelItem CreateTitleLabel()
+        {
+            LabelItem label = new LabelItem();
+            label.GlobalItem = false;
+            try
+            {
+                label.Font = new Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            }
+            catch
+            {
+                label.Font = SystemFonts.MenuFont; // SystemInformation.MenuFont;
+            }
+            label.Stretch = true;
+            label.TextLineAlignment = StringAlignment.Center;
+            label.TextAlignment = StringAlignment.Center;
+            label.Text = this.Text;
+            label.PaddingLeft = 3;
+            label.PaddingRight = 1;
+
+            return label;
+        }
+
+        protected override void CreateAdditionalCaptionItems(GenericItemContainer captionContainer)
+        {
+            // Add Settings and Help buttons
+            _Settings = new ButtonItem("sysSettingsButton");
+            _Settings.Text = DefaultSettingsButtonText;
+            //_Settings.ItemAlignment = eItemAlignment.Far;
+            _Settings.Click += InternalSettingsButtonClick;
+            _Settings.SetSystemItem(true);
+            _Settings.CanCustomize = false;
+            _Settings.Visible = false;
+            captionContainer.SubItems.Add(_Settings);
+
+            _Help = new ButtonItem("sysHelpButton");
+            _Help.Text = DefaultHelpButtonText;
+            _Help.SetSystemItem(true);
+            _Help.CanCustomize = false;
+            _Help.Visible = false;
+            //_Help.ItemAlignment = eItemAlignment.Far;
+            _Help.Click += InternalHelpButtonClick;
+            captionContainer.SubItems.Add(_Help);
+
+            base.CreateAdditionalCaptionItems(captionContainer);
+        }
+
+        /// Gets or sets whether SETTINGS button is visible.
+        /// </summary>
+        [DefaultValue(false), Category("Appearance"), Description("Indicates whether SETTINGS button is visible.")]
+        public bool SettingsButtonVisible
+        {
+            get { return _Settings.Visible; }
+            set
+            {
+                if (value != _Settings.Visible)
+                {
+                    _Settings.Visible = value;
+                    if (this.IsHandleCreated)
+                        this.RecalcSize();
+                }
+            }
+        }
+
+        /// Gets or sets whether HELP button is visible.
+        /// </summary>
+        [DefaultValue(false), Category("Appearance"), Description("Indicates whether HELP button is visible.")]
+        public bool HelpButtonVisible
+        {
+            get { return _Help.Visible; }
+            set
+            {
+                if (value != _Help.Visible)
+                {
+                    _Help.Visible = value;
+                    this.RecalcSize();
+                }
+            }
+        }
+
+        private string _HelpButtonText = "";
+        /// <summary>
+        /// Gets or sets the HELP button text.
+        /// </summary>
+        [DefaultValue(""), Category("Appearance"), Description("Indicates HELP button text")]
+        public string HelpButtonText
+        {
+            get { return _HelpButtonText; }
+            set
+            {
+                if (value != _HelpButtonText)
+                {
+                    string oldValue = _HelpButtonText;
+                    _HelpButtonText = value;
+                    OnHelpButtonTextChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when HelpButtonText property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnHelpButtonTextChanged(string oldValue, string newValue)
+        {
+            if (string.IsNullOrEmpty(newValue))
+                _Help.Text = DefaultHelpButtonText;
+            else
+                _Help.Text = "<font size=\"7\">" + newValue + "</font>";
+            this.RecalcSize();
+        }
+        private string _SettingsButtonText = "";
+        /// <summary>
+        /// Gets or sets the SETTINGS button text.
+        /// </summary>
+        [DefaultValue(""), Category("Appearance"), Description("Indicates SETTINGS button text")]
+        public string SettingsButtonText
+        {
+            get { return _SettingsButtonText; }
+            set
+            {
+                if (value != _SettingsButtonText)
+                {
+                    string oldValue = _SettingsButtonText;
+                    _SettingsButtonText = value;
+                    OnSettingsButtonTextChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when SettingsButtonText property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnSettingsButtonTextChanged(string oldValue, string newValue)
+        {
+            if (string.IsNullOrEmpty(newValue))
+                _Settings.Text = DefaultSettingsButtonText;
+            else
+                _Settings.Text = "<font size=\"7\">" + newValue + "</font>";
+            this.RecalcSize();
+        }
+        private void InternalSettingsButtonClick(object sender, EventArgs e)
+        {
+            OnSettingsButtonClick(e);
+        }
+        private void InternalHelpButtonClick(object sender, EventArgs e)
+        {
+            OnHelpButtonClick(e);
+        }
+        /// <summary>
+        /// Occurs when SETTINGS button, if displayed, is clicked.
+        /// </summary>
+        [Description("Occurs when SETTINGS button, if displayed, is clicked.")]
+        public event EventHandler SettingsButtonClick;
+        /// <summary>
+        /// Raises SettingsButtonClick event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnSettingsButtonClick(EventArgs e)
+        {
+            EventHandler handler = SettingsButtonClick;
+            if (handler != null)
+                handler(this, e);
+        }
+        /// <summary>
+        /// Occurs when HELP button, if displayed, is clicked.
+        /// </summary>
+        [Description("Occurs when HELP button, if displayed, is clicked.")]
+        public event EventHandler HelpButtonClick;
+        /// <summary>
+        /// Raises HelpButtonClick event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnHelpButtonClick(EventArgs e)
+        {
+            EventHandler handler = HelpButtonClick;
+            if (handler != null)
+                handler(this, e);
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Metro/MetroMessageBoxDialog.cs b/PROMS/DotNetBar Source Code/Metro/MetroMessageBoxDialog.cs
new file mode 100644
index 00000000..a997db8a
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Metro/MetroMessageBoxDialog.cs	
@@ -0,0 +1,707 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+using System.Windows.Forms;
+using System.Runtime.InteropServices;
+using System.Globalization;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar.Metro
+{
+    internal class MetroMessageBoxDialog : MetroForm
+    {
+        private ButtonX Button1;
+        private ButtonX Button2;
+        private ButtonX Button3;
+        private PictureBox PictureBox1;
+        private PanelEx TextPanel;
+        private PanelEx ButtonBackgroundPanel;
+        private eDotNetBarStyle m_Style = eDotNetBarStyle.Metro;
+        private bool m_Button1Visible = true;
+        private bool m_Button2Visible = true;
+        private bool m_Button3Visible = true;
+        private MessageBoxButtons m_Buttons = MessageBoxButtons.OK;
+
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        public MetroMessageBoxDialog()
+        {
+            InitializeComponent();
+            TextPanel.DisableSelection();
+        }
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                this.Button1.Click -= new System.EventHandler(this.Button1_Click);
+                this.Button2.Click -= new System.EventHandler(this.Button2_Click);
+                this.Button3.Click -= new System.EventHandler(this.Button3_Click);
+                this.TextPanel.MarkupLinkClick -= new MarkupLinkClickEventHandler(TextPanelMarkupLinkClick);
+            }
+
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form 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.Button1 = new DevComponents.DotNetBar.ButtonX();
+            this.Button2 = new DevComponents.DotNetBar.ButtonX();
+            this.Button3 = new DevComponents.DotNetBar.ButtonX();
+            this.PictureBox1 = new System.Windows.Forms.PictureBox();
+            this.TextPanel = new DevComponents.DotNetBar.PanelEx();
+            this.ButtonBackgroundPanel = new DevComponents.DotNetBar.PanelEx();
+            this.SuspendLayout();
+            // 
+            // Button1
+            // 
+            this.Button1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+            this.Button1.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+            this.Button1.Location = new System.Drawing.Point(26, 85);
+            this.Button1.Name = "Button1";
+            this.Button1.Size = new System.Drawing.Size(77, 24);
+            this.Button1.TabIndex = 0;
+            this.Button1.Text = "&OK";
+            this.Button1.Click += new System.EventHandler(this.Button1_Click);
+            this.Button1.Style = eDotNetBarStyle.StyleManagerControlled;
+            // 
+            // Button2
+            // 
+            this.Button2.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+            this.Button2.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+            this.Button2.Location = new System.Drawing.Point(109, 85);
+            this.Button2.Name = "Button2";
+            this.Button2.Size = new System.Drawing.Size(77, 24);
+            this.Button2.TabIndex = 1;
+            this.Button2.Text = "&Cancel";
+            this.Button2.Click += new System.EventHandler(this.Button2_Click);
+            this.Button2.Style = eDotNetBarStyle.StyleManagerControlled;
+            // 
+            // Button3
+            // 
+            this.Button3.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+            this.Button3.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+            this.Button3.Location = new System.Drawing.Point(192, 85);
+            this.Button3.Name = "Button3";
+            this.Button3.Size = new System.Drawing.Size(77, 24);
+            this.Button3.TabIndex = 2;
+            this.Button3.Text = "&Ignore";
+            this.Button3.Click += new System.EventHandler(this.Button3_Click);
+            this.Button3.Style = eDotNetBarStyle.StyleManagerControlled;
+            // 
+            // PictureBox1
+            // 
+            this.PictureBox1.BackColor = System.Drawing.Color.Transparent;
+            this.PictureBox1.Location = new System.Drawing.Point(10, 10);
+            this.PictureBox1.Name = "PictureBox1";
+            this.PictureBox1.Size = new System.Drawing.Size(34, 34);
+            this.PictureBox1.TabIndex = 3;
+            this.PictureBox1.TabStop = false;
+            // 
+            // TextPanel
+            // 
+            this.TextPanel.AntiAlias = false;
+            this.TextPanel.CanvasColor = System.Drawing.SystemColors.Control;
+            this.TextPanel.Location = new System.Drawing.Point(53, 10);
+            this.TextPanel.Name = "TextPanel";
+            this.TextPanel.Size = new System.Drawing.Size(225, 53);
+            this.TextPanel.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+            this.TextPanel.Style.BorderWidth = 0;
+            this.TextPanel.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText;
+            this.TextPanel.Style.GradientAngle = 90;
+            this.TextPanel.Style.LineAlignment = System.Drawing.StringAlignment.Near;
+            this.TextPanel.TabIndex = 4;
+            this.TextPanel.TabStop = false;
+            this.TextPanel.Style.WordWrap = true;
+            this.TextPanel.MarkupLinkClick += new MarkupLinkClickEventHandler(TextPanelMarkupLinkClick);
+
+            // 
+            // ButtonBackgroundPanel
+            // 
+            this.ButtonBackgroundPanel.AntiAlias = false;
+            this.ButtonBackgroundPanel.CanvasColor = System.Drawing.SystemColors.Control;
+            this.ButtonBackgroundPanel.Location = new System.Drawing.Point(53, 10);
+            this.ButtonBackgroundPanel.Name = "ButtonBackgroundPanel";
+            this.ButtonBackgroundPanel.Size = new System.Drawing.Size(225, 42);
+            this.ButtonBackgroundPanel.Dock = DockStyle.Bottom;
+            this.ButtonBackgroundPanel.ColorSchemeStyle = eDotNetBarStyle.StyleManagerControlled;
+            this.ButtonBackgroundPanel.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+            this.ButtonBackgroundPanel.Style.BorderWidth = 1;
+            this.ButtonBackgroundPanel.Style.BorderSide = eBorderSide.Top;
+            this.ButtonBackgroundPanel.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText;
+            this.ButtonBackgroundPanel.Style.BackColor1.ColorSchemePart = eColorSchemePart.BarBackground;
+            this.ButtonBackgroundPanel.Style.BorderColor.ColorSchemePart = eColorSchemePart.BarDockedBorder;
+            this.ButtonBackgroundPanel.Style.GradientAngle = 90;
+            this.ButtonBackgroundPanel.Style.LineAlignment = System.Drawing.StringAlignment.Near;
+            this.ButtonBackgroundPanel.TabIndex = 4;
+            this.ButtonBackgroundPanel.TabStop = false;
+            // 
+            // MessageBoxDialog
+            // 
+#if FRAMEWORK20
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+            this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); // for design in 96 DPI
+#endif
+            this.ClientSize = new System.Drawing.Size(290, 121);
+            this.ShowInTaskbar = false;
+            this.Controls.Add(this.TextPanel);
+            this.Controls.Add(this.PictureBox1);
+            this.Controls.Add(this.Button3);
+            this.Controls.Add(this.Button2);
+            this.Controls.Add(this.Button1);
+            this.Controls.Add(this.ButtonBackgroundPanel);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.Name = "MessageBoxDialog";
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+        private void TextPanelMarkupLinkClick(object sender, MarkupLinkClickEventArgs e)
+        {
+            MessageBoxEx.InvokeMarkupLinkClick(sender, e);
+        }
+
+        public DialogResult Show(IWin32Window owner, string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, MessageBoxDefaultButton defaultButton, bool topMost)
+        {
+            m_Buttons = buttons;
+            this.Text = caption;
+            TextPanel.Style.UseMnemonic = false;
+            TextPanel.Text = text;
+            if (icon != MessageBoxIcon.None)
+            {
+                Image iconImage= GetSystemImage(icon);
+                if (iconImage != null && iconImage.Width > PictureBox1.Width) PictureBox1.Width = iconImage.Width;
+                if (iconImage!=null && iconImage.Height > PictureBox1.Height) PictureBox1.Height = iconImage.Height;
+                PictureBox1.Image = iconImage;
+            }
+            else
+            {
+                PictureBox1.Image = null;
+                PictureBox1.Visible = false;
+            }
+
+            if (buttons == MessageBoxButtons.OKCancel || buttons == MessageBoxButtons.RetryCancel || buttons == MessageBoxButtons.YesNo)
+            {
+                Button3.Visible = false;
+                m_Button3Visible = false;
+            }
+            else if (buttons == MessageBoxButtons.OK)
+            {
+                Button2.Visible = false;
+                Button3.Visible = false;
+                m_Button2Visible = false;
+                m_Button3Visible = false;
+            }
+
+            // Set Cancel and Accept buttons
+            if (buttons == MessageBoxButtons.OK)
+            {
+                this.AcceptButton = Button1;
+                this.CancelButton = Button1;
+            }
+            else if (buttons == MessageBoxButtons.OKCancel || buttons == MessageBoxButtons.RetryCancel || buttons == MessageBoxButtons.YesNo)
+            {
+                this.AcceptButton = Button1;
+                this.CancelButton = Button2;
+            }
+            else if (buttons == MessageBoxButtons.YesNoCancel)
+            {
+                this.AcceptButton = Button1;
+                this.CancelButton = Button3;
+            }
+
+            SetButtonText(buttons);
+
+            if (defaultButton == MessageBoxDefaultButton.Button1 && m_Button1Visible)
+            {
+                Button1.Select();
+                this.AcceptButton = Button1;
+            }
+            else if (defaultButton == MessageBoxDefaultButton.Button2 && m_Button2Visible)
+            {
+                this.AcceptButton = Button2;
+                Button2.Select();
+            }
+            else if (defaultButton == MessageBoxDefaultButton.Button3 && m_Button3Visible)
+            {
+                this.AcceptButton = Button3;
+                Button3.Select();
+            }
+
+            ResizeDialog();
+
+            SetupColors();
+
+#if FRAMEWORK20
+            if (icon == MessageBoxIcon.Question)
+                System.Media.SystemSounds.Question.Play(); // NativeFunctions.sndPlaySound("SystemQuestion", NativeFunctions.SND_ASYNC | NativeFunctions.SND_NODEFAULT);
+            else if (icon == MessageBoxIcon.Asterisk)
+                System.Media.SystemSounds.Asterisk.Play(); // NativeFunctions.sndPlaySound("SystemAsterisk", NativeFunctions.SND_ASYNC | NativeFunctions.SND_NODEFAULT);
+            else
+                System.Media.SystemSounds.Exclamation.Play(); // NativeFunctions.sndPlaySound("SystemExclamation", NativeFunctions.SND_ASYNC | NativeFunctions.SND_NODEFAULT);
+#else
+            if(icon == MessageBoxIcon.Question)
+                NativeFunctions.sndPlaySound("SystemQuestion", NativeFunctions.SND_ASYNC | NativeFunctions.SND_NODEFAULT);
+            else if(icon == MessageBoxIcon.Asterisk)
+                NativeFunctions.sndPlaySound("SystemAsterisk", NativeFunctions.SND_ASYNC | NativeFunctions.SND_NODEFAULT);
+            else
+                NativeFunctions.sndPlaySound("SystemExclamation", NativeFunctions.SND_ASYNC | NativeFunctions.SND_NODEFAULT);
+#endif
+            if (buttons == MessageBoxButtons.AbortRetryIgnore || buttons == MessageBoxButtons.YesNo)
+            {
+                this.CloseEnabled = false;
+            }
+
+            if(this.TopMost!=topMost)
+                this.TopMost = topMost;
+            return this.ShowDialog(owner);
+        }
+
+        public eDotNetBarStyle Style
+        {
+            get
+            {
+                return m_Style;
+            }
+            set
+            {
+            	m_Style = value;
+            }
+        }
+
+        private void SetupColors()
+        {
+            if (!_MessageTextColor.IsEmpty)
+            {
+                this.TextPanel.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.Custom;
+                this.TextPanel.Style.ForeColor.Color = _MessageTextColor;
+            }
+            else if (DevComponents.DotNetBar.Rendering.GlobalManager.Renderer is DevComponents.DotNetBar.Rendering.Office2007Renderer)
+            {
+                DevComponents.DotNetBar.Rendering.Office2007ColorTable ct = ((DevComponents.DotNetBar.Rendering.Office2007Renderer)DevComponents.DotNetBar.Rendering.GlobalManager.Renderer).ColorTable;
+                this.TextPanel.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.Custom;
+                this.TextPanel.Style.ForeColor.Color = ct.Form.TextColor;
+                this.TextPanel.Style.BackColor1.Color = ct.Form.BackColor;
+            }            
+        }
+
+        private bool _ButtonsDividerVisible = true;
+        /// <summary>
+        /// Gets or sets whether divider panel that divides message box buttons and text content is visible. Default value is true.
+        /// </summary>
+        public bool ButtonsDividerVisible
+        {
+            get { return _ButtonsDividerVisible; }
+            set
+            {
+                if (_ButtonsDividerVisible != value)
+                {
+                    _ButtonsDividerVisible = value;
+                    this.ButtonBackgroundPanel.Visible = _ButtonsDividerVisible;
+                }
+            }
+        }
+        
+
+        private Color _MessageTextColor = Color.Empty;
+        public Color MessageTextColor
+        {
+            get { return _MessageTextColor; }
+            set { _MessageTextColor = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether Text supports and renders text markup. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Gets or sets whether Text supports and renders text markup.")]
+        public bool TextMarkupEnabled
+        {
+            get { return TextPanel.TextMarkupEnabled; }
+            set
+            {
+                TextPanel.TextMarkupEnabled = value;
+            }
+        }
+
+        private void SetButtonText(MessageBoxButtons buttons)
+        {
+            if (buttons == MessageBoxButtons.AbortRetryIgnore)
+            {
+                Button1.Text = GetString(SystemStrings.Abort);
+                Button2.Text = GetString(SystemStrings.Retry);
+                Button3.Text = GetString(SystemStrings.Ignore);
+            }
+            else if (buttons == MessageBoxButtons.OK)
+            {
+                Button1.Text = GetString(SystemStrings.OK);
+            }
+            else if (buttons == MessageBoxButtons.OKCancel)
+            {
+                Button1.Text = GetString(SystemStrings.OK);
+                Button2.Text = GetString(SystemStrings.Cancel);
+            }
+            else if (buttons == MessageBoxButtons.RetryCancel)
+            {
+                Button1.Text = GetString(SystemStrings.Retry);
+                Button2.Text = GetString(SystemStrings.Cancel);
+            }
+            else if (buttons == MessageBoxButtons.YesNo)
+            {
+                Button1.Text = GetString(SystemStrings.Yes);
+                Button2.Text = GetString(SystemStrings.No);
+            }
+            else if (buttons == MessageBoxButtons.YesNoCancel)
+            {
+                Button1.Text = GetString(SystemStrings.Yes);
+                Button2.Text = GetString(SystemStrings.No);
+                Button3.Text = GetString(SystemStrings.Cancel);
+            }
+        }
+
+        internal static Image GetSystemImage(MessageBoxIcon icon)
+        {
+            Icon ico = null;
+            if (icon == MessageBoxIcon.Asterisk)
+                ico = SystemIcons.Asterisk;
+            else if (icon == MessageBoxIcon.Error || icon == MessageBoxIcon.Stop)
+                ico = SystemIcons.Error;
+            else if (icon == MessageBoxIcon.Exclamation)
+                ico = SystemIcons.Exclamation;
+            else if (icon == MessageBoxIcon.Hand)
+                ico = SystemIcons.Hand;
+            else if (icon == MessageBoxIcon.Information)
+                ico = SystemIcons.Information;
+            else if (icon == MessageBoxIcon.Question)
+                ico = SystemIcons.Question;
+            else if (icon == MessageBoxIcon.Warning)
+                ico = SystemIcons.Warning;
+
+            Bitmap bmp = new Bitmap(ico.Width, ico.Height);
+            bmp.MakeTransparent();
+            using (Graphics g = Graphics.FromImage(bmp))
+            {
+                if (System.Environment.Version.Build <= 3705 && System.Environment.Version.Revision == 288 && System.Environment.Version.Major == 1 && System.Environment.Version.Minor == 0)
+                {
+                    IntPtr hdc = g.GetHdc();
+                    try
+                    {
+                        NativeFunctions.DrawIconEx(hdc, 0, 0, ico.Handle, ico.Width, ico.Height, 0, IntPtr.Zero, 3);
+                    }
+                    finally
+                    {
+                        g.ReleaseHdc(hdc);
+                    }
+                }
+                else if (ico.Handle != IntPtr.Zero)
+                {
+                    try
+                    {
+                        g.DrawIcon(ico, 0,0);
+                    }
+                    catch { }
+                }
+            }
+            return bmp;
+        }
+
+        private void ResizeDialog()
+        {
+            Size size = Size.Empty;
+            int buttonSpacing = 6;
+            int buttonMargin = Dpi.Width(40);
+            int textMargin = Dpi.Width10;
+            int minTextSize = Dpi.Width(110);
+
+            if (PictureBox1.Image!=null)
+            {
+                TextPanel.Left = PictureBox1.Bounds.Right + Dpi.Width16;
+            }
+            else
+                TextPanel.Left = PictureBox1.Left;
+
+            Rectangle workingArea = Screen.PrimaryScreen.WorkingArea;
+            TextPanel.Size = TextPanel.GetAutoSize(workingArea.Width);
+            
+            if (TextPanel.Size.Width > (double)workingArea.Width * .75d)
+                TextPanel.Size = TextPanel.GetAutoSize((int)((double)workingArea.Width * .75d));
+            else if (TextPanel.Size.Width < minTextSize)
+                TextPanel.Width = minTextSize;
+            
+            // Measure the caption size
+            if (this.Text.Length > 0)
+            {
+                Size captionSize = Size.Empty;
+                Font font = this.Font;
+                using (Graphics g = BarFunctions.CreateGraphics(this))
+                {
+                    size = TextDrawing.MeasureString(g, this.Text, font);
+                }
+                size.Width += 2;
+                size.Height += 2;
+                if (size.Width > TextPanel.Width)
+                    TextPanel.Width = size.Width;
+            }
+
+            int y = Math.Max(TextPanel.Bounds.Bottom, PictureBox1.Bounds.Bottom);
+            y += (int)(19 / Dpi.Factor.Height);
+
+            Button1.Top = y;
+            Button2.Top = y;
+            Button3.Top = y;
+
+            int buttonWidth = Button1.Width +
+                (m_Button2Visible ? Button2.Width + buttonSpacing : 0) +
+                (m_Button3Visible ? Button3.Width + buttonSpacing : 0);
+
+            int buttonArea = buttonWidth + buttonMargin * 2;
+            if (buttonWidth < TextPanel.Bounds.Right + textMargin)
+                buttonArea = TextPanel.Bounds.Right + textMargin;
+            else
+            {
+                TextPanel.Width += buttonArea - TextPanel.Bounds.Right - textMargin;
+            }
+           
+            // Arrange buttons inside of the available area
+            int x = (buttonArea - buttonWidth) / 2;
+            Button1.Left = x;
+            x += Button1.Width + buttonSpacing;
+
+            if (m_Button2Visible)
+            {
+                Button2.Left = x;
+                x += Button2.Width + buttonSpacing;
+            }
+
+            if (m_Button3Visible)
+            {
+                Button3.Left = x;
+                x += Button3.Width + buttonSpacing;
+            }
+
+            size = new Size(TextPanel.Bounds.Right + textMargin,
+                Button1.Bounds.Bottom + textMargin);
+
+            this.ClientSize = size;
+        }
+
+        private void Button1_Click(object sender, EventArgs e)
+        {
+            DialogResult r = DialogResult.OK;
+            if (m_Buttons == MessageBoxButtons.OK || m_Buttons == MessageBoxButtons.OKCancel)
+                r = DialogResult.OK;
+            else if (m_Buttons == MessageBoxButtons.YesNo || m_Buttons == MessageBoxButtons.YesNoCancel)
+                r = DialogResult.Yes;
+            else if (m_Buttons == MessageBoxButtons.AbortRetryIgnore)
+                r = DialogResult.Abort;
+            else if (m_Buttons == MessageBoxButtons.RetryCancel)
+                r = DialogResult.Retry;
+
+            this.DialogResult = r;
+        }
+
+        private void Button2_Click(object sender, EventArgs e)
+        {
+            DialogResult r = DialogResult.Cancel;
+            if (m_Buttons == MessageBoxButtons.OKCancel)
+                r = DialogResult.Cancel;
+            else if (m_Buttons == MessageBoxButtons.YesNo || m_Buttons == MessageBoxButtons.YesNoCancel)
+                r = DialogResult.No;
+            else if (m_Buttons == MessageBoxButtons.AbortRetryIgnore)
+                r = DialogResult.Retry;
+            else if (m_Buttons == MessageBoxButtons.RetryCancel)
+                r = DialogResult.Cancel;
+
+            this.DialogResult = r;
+        }
+
+        private void Button3_Click(object sender, EventArgs e)
+        {
+            DialogResult r = DialogResult.Cancel;
+            if (m_Buttons == MessageBoxButtons.AbortRetryIgnore)
+                r = DialogResult.Ignore;
+            else if (m_Buttons == MessageBoxButtons.YesNoCancel)
+                r = DialogResult.Cancel;
+
+            this.DialogResult = r;
+        }
+
+        protected override void WndProc(ref Message m)
+        {
+            int wParamInt = WinApi.ToInt(m.WParam);
+            if (m.Msg == NativeFunctions.WM_SYSCOMMAND && (wParamInt == NativeFunctions.SC_MAXIMIZE || wParamInt == NativeFunctions.SC_MINIMIZE))
+                return;
+            base.WndProc(ref m);
+        }
+
+        protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
+        {
+            if ((keyData & Keys.C) == Keys.C && (keyData & Keys.Control) == Keys.Control)
+            {
+                string s = "------------------------------" + "\r\n" + this.Text + "\r\n" + "------------------------------" +
+                    "\r\n" + TextPanel.Text +
+                    "\r\n" + "------------------------------" + "\r\n";
+                if (Button1.Visible)
+                    s += "[" + Button1.Text.Replace("&", "") + "]  ";
+                if (Button2.Visible)
+                    s += "[" + Button2.Text.Replace("&", "") + "]  ";
+                if (Button3.Visible)
+                    s += "[" + Button3.Text.Replace("&", "") + "]";
+                s += "\r\n------------------------------";
+#if (FRAMEWORK20)
+                Clipboard.SetText(s);
+#else
+                Clipboard.SetDataObject(s);
+#endif
+            }
+            return base.ProcessCmdKey(ref msg, keyData);
+        }
+
+        /// <summary>
+        /// Gets or sets the anti-alias setting for text-pane.
+        /// </summary>
+        public bool AntiAlias
+        {
+            get { return TextPanel.AntiAlias; }
+            set
+            {
+                TextPanel.AntiAlias = value;
+            }
+        }
+        
+
+        #region System Strings
+        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
+        private static extern string MB_GetString(int i);
+
+        private static string GetLocalizedText(SystemStrings sysString)
+        {
+            string key = "";
+            string result = null;
+            if (sysString == SystemStrings.Abort)
+            {
+                result = "&Abort";
+                key = LocalizationKeys.MessageBoxAbortButton;
+            }
+            else if (sysString == SystemStrings.Cancel)
+            {
+                result = "&Cancel";
+                key = LocalizationKeys.MessageBoxCancelButton;
+            }
+            else if (sysString == SystemStrings.Close)
+            {
+                result = "C&lose";
+                key = LocalizationKeys.MessageBoxCloseButton;
+            }
+            else if (sysString == SystemStrings.Continue)
+            {
+                result = "Co&ntinue";
+                key = LocalizationKeys.MessageBoxContinueButton;
+            }
+            else if (sysString == SystemStrings.Help)
+            {
+                result = "&Help";
+                key = LocalizationKeys.MessageBoxHelpButton;
+            }
+            else if (sysString == SystemStrings.Ignore)
+            {
+                result = "&Ignore";
+                key = LocalizationKeys.MessageBoxIgnoreButton;
+            }
+            else if (sysString == SystemStrings.No)
+            {
+                result = "&No";
+                key = LocalizationKeys.MessageBoxNoButton;
+            }
+            else if (sysString == SystemStrings.OK)
+            {
+                result = "&OK";
+                key = LocalizationKeys.MessageBoxOkButton;
+            }
+            else if (sysString == SystemStrings.Retry)
+            {
+                result = "&Retry";
+                key = LocalizationKeys.MessageBoxRetryButton;
+            }
+            else if (sysString == SystemStrings.TryAgain)
+            {
+                result = "&Try Again";
+                key = LocalizationKeys.MessageBoxTryAgainButton;
+            }
+            else if (sysString == SystemStrings.Yes)
+            {
+                result = "&Yes";
+                key = LocalizationKeys.MessageBoxYesButton;
+            }
+
+            if (key != null)
+            {
+                result = LocalizationManager.GetLocalizedString(key, result);
+            }
+
+            return result;
+        }
+        private static string GetString(SystemStrings sysString)
+        {
+            string result = "";
+
+            if (CultureInfo.CurrentUICulture.TwoLetterISOLanguageName.ToLower() != "en" && MessageBoxEx.UseSystemLocalizedString)
+            {
+                try
+                {
+                    result = MB_GetString((int)sysString);
+                }
+                catch
+                {
+                    result = "";
+                }
+            }
+
+            if (result == "")
+            {
+                result = GetLocalizedText(sysString);
+            }
+
+            return result;
+        }
+
+        /// <summary>
+        /// Enumeration of available common system strings.
+        /// </summary>
+        private enum SystemStrings
+        {
+            OK = 0,
+            Cancel = 1,
+            Abort = 2,
+            Retry = 3,
+            Ignore = 4,
+            Yes = 5,
+            No = 6,
+            Close = 7,
+            Help = 8,
+            TryAgain = 9,
+            Continue = 10
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Metro/MetroQatCustomizeDialog.cs b/PROMS/DotNetBar Source Code/Metro/MetroQatCustomizeDialog.cs
new file mode 100644
index 00000000..20228d81
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Metro/MetroQatCustomizeDialog.cs	
@@ -0,0 +1,113 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using DevComponents.DotNetBar.Ribbon;
+
+namespace DevComponents.DotNetBar.Metro
+{
+    internal class MetroQatCustomizeDialog : MetroForm
+    {
+        private QatCustomizePanel qatCustomizePanel1;
+        internal ButtonX buttonOK;
+        internal ButtonX buttonCancel;
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form 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.qatCustomizePanel1 = new DevComponents.DotNetBar.Ribbon.QatCustomizePanel();
+            this.buttonOK = new DevComponents.DotNetBar.ButtonX();
+            this.buttonCancel = new DevComponents.DotNetBar.ButtonX();
+            this.SuspendLayout();
+            // 
+            // qatCustomizePanel1
+            // 
+            this.qatCustomizePanel1.BackColor = System.Drawing.Color.Transparent;
+            this.qatCustomizePanel1.Location = new System.Drawing.Point(0, 0);
+            this.qatCustomizePanel1.Name = "qatCustomizePanel1";
+            this.qatCustomizePanel1.Size = new System.Drawing.Size(444, 298);
+            this.qatCustomizePanel1.TabIndex = 0;
+            // 
+            // buttonOK
+            // 
+            this.buttonOK.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+            this.buttonOK.DialogResult = System.Windows.Forms.DialogResult.OK;
+            this.buttonOK.Location = new System.Drawing.Point(285, 297);
+            this.buttonOK.Name = "buttonOK";
+            this.buttonOK.Size = new System.Drawing.Size(73, 21);
+            this.buttonOK.TabIndex = 1;
+            this.buttonOK.Text = "OK";
+            // 
+            // buttonCancel
+            // 
+            this.buttonCancel.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+            this.buttonCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+            this.buttonCancel.Location = new System.Drawing.Point(364, 297);
+            this.buttonCancel.Name = "buttonCancel";
+            this.buttonCancel.Size = new System.Drawing.Size(73, 21);
+            this.buttonCancel.TabIndex = 2;
+            this.buttonCancel.Text = "Cancel";
+            // 
+            // QatCustomizeDialog
+            // 
+            this.ClientSize = new System.Drawing.Size(445, 324);
+            this.Controls.Add(this.buttonCancel);
+            this.Controls.Add(this.buttonOK);
+            this.Controls.Add(this.qatCustomizePanel1);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.ShowInTaskbar = false;
+            this.Name = "QatCustomizeDialog";
+            this.Text = "Customize";
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        public MetroQatCustomizeDialog()
+        {
+            InitializeComponent();
+        }
+
+        /// <summary>
+        /// Loads the items for the customization from MetroTab control. Registered MetroToolbar controls are enumerated and items
+        /// are added if they have CanCustomize=true.
+        /// </summary>
+        /// <param name="tab">MetroTab control that holds references to known MetroToolbars.</param>
+        public void LoadItems(MetroShell tab)
+        {
+            qatCustomizePanel1.LoadItems(tab);
+        }
+
+        /// <summary>
+        /// Gets reference to the internal Quick Access Toolbar Customization panel.
+        /// </summary>
+        public QatCustomizePanel QatCustomizePanel
+        {
+            get { return qatCustomizePanel1; }
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Metro/MetroShell.cs b/PROMS/DotNetBar Source Code/Metro/MetroShell.cs
new file mode 100644
index 00000000..d6a210ed
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Metro/MetroShell.cs	
@@ -0,0 +1,1604 @@
+using System.Drawing;
+using System.Windows.Forms;
+using System.ComponentModel;
+using System.Drawing.Drawing2D;
+using System;
+using System.Collections;
+using System.Text;
+using DevComponents.DotNetBar.Rendering;
+using System.Collections.Generic;
+
+namespace DevComponents.DotNetBar.Metro
+{
+    /// <summary>
+    /// Represents Metro Tab control, usually used as application tab but can be used as standard tab control as well.
+    /// </summary>
+    [ToolboxBitmap(typeof(MetroShell), "MetroShell.ico"), ToolboxItem(true), Designer("DevComponents.DotNetBar.Design.MetroShellDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf"), System.Runtime.InteropServices.ComVisible(false)]
+    public class MetroShell : System.Windows.Forms.ContainerControl
+    {
+        #region Events
+        /// <summary>
+        /// Occurs just before the customize popup menu is displayed and provides the ability to cancel the menu display as well
+        /// as to add/remove the menu items from the customize popup menu.
+        /// </summary>
+        public event CustomizeMenuPopupEventHandler BeforeCustomizeMenuPopup;
+
+        /// <summary>
+        /// Occurs before an item is added to the quick access toolbar as result of user action. This event provides ability to
+        /// cancel the addition of the item by setting the Cancel=true of event arguments.
+        /// </summary>
+        public event CustomizeMenuPopupEventHandler BeforeAddItemToQuickAccessToolbar;
+
+        /// <summary>
+        /// Occurs before an item is removed from the quick access toolbar as result of user action. This event provides ability to
+        /// cancel the addition of the item by setting the Cancel=true of event arguments.
+        /// </summary>
+        public event CustomizeMenuPopupEventHandler BeforeRemoveItemFromQuickAccessToolbar;
+
+        /// <summary>
+        /// Occurs when DotNetBar is looking for translated text for one of the internal text that are
+        /// displayed on menus, toolbars and customize forms. You need to set Handled=true if you want
+        /// your custom text to be used instead of the built-in system value.
+        /// </summary>
+        public event DotNetBarManager.LocalizeStringEventHandler LocalizeString;
+
+        /// <summary>
+        /// Occurs when Item on metro tab strip or quick access toolbar is clicked.
+        /// </summary>
+        [Description("Occurs when Item on metro tab strip or quick access toolbar is clicked.")]
+        public event EventHandler ItemClick;
+
+        /// <summary>
+        /// Occurs before Quick Access Toolbar dialog is displayed. This event provides the opportunity to cancel the showing of
+        /// built-in dialog and display custom customization dialog. You can also set the Dialog property of the event arguments to
+        /// the custom dialog you want used instead of the DotNetBar system customization dialog.
+        /// </summary>
+        public event QatCustomizeDialogEventHandler BeforeQatCustomizeDialog;
+        /// <summary>
+        /// Occurs after the Quick Access Toolbar dialog is closed.
+        /// </summary>
+        public event QatCustomizeDialogEventHandler AfterQatCustomizeDialog;
+
+        /// <summary>
+        /// Occurs after any changes done on the Quick Access Toolbar dialog are applied to the actual Quick Access Toolbar.
+        /// </summary>
+        public event EventHandler AfterQatDialogChangesApplied;
+
+        /// <summary>
+        ///     Occurs after selected Metro tab has changed. You can use
+        ///     <see cref="SelectedTab">MetroShell.SelectedTab</see>
+        ///     property to get reference to newly selected tab.
+        /// </summary>
+        public event EventHandler SelectedTabChanged;
+
+        /// <summary>
+        /// Occurs when text markup link from TitleText markup is clicked. Markup links can be created using "a" tag, for example:
+        /// <a name="MyLink">Markup link</a>
+        /// </summary>
+        [Description("Occurs when text markup link from TitleText markup is clicked.")]
+        public event MarkupLinkClickEventHandler TitleTextMarkupLinkClick;
+
+        /// <summary>
+        /// Occurs when SETTINGS button, if displayed, is clicked.
+        /// </summary>
+        [Description("Occurs when SETTINGS button, if displayed, is clicked.")]
+        public event EventHandler SettingsButtonClick;
+        /// <summary>
+        /// Raises SettingsButtonClick event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnSettingsButtonClick(EventArgs e)
+        {
+            EventHandler handler = SettingsButtonClick;
+            if (handler != null)
+                handler(this, e);
+        }
+        internal void InvokeSettingsButtonClick(EventArgs e)
+        {
+            OnSettingsButtonClick(e);
+        }
+
+        /// <summary>
+        /// Occurs when HELP button, if displayed, is clicked.
+        /// </summary>
+        [Description("Occurs when HELP button, if displayed, is clicked.")]
+        public event EventHandler HelpButtonClick;
+        /// <summary>
+        /// Raises HelpButtonClick event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnHelpButtonClick(EventArgs e)
+        {
+            EventHandler handler = HelpButtonClick;
+            if (handler != null)
+                handler(this, e);
+        }
+        internal void InvokeHelpButtonClick(EventArgs e)
+        {
+            OnHelpButtonClick(e);
+        }
+        #endregion
+
+        #region Private Variables and Constructor
+        private MetroTabStrip _TabStrip = null;
+        private bool m_AutoSize = false;
+        private ShadowPaintInfo m_ShadowPaintInfo = null;
+        private bool _UseCustomizeDialog = true;
+        //private bool m_EnableQatPlacement = true;
+
+        private eMetroCategorizeMode m_CategorizeMode = eMetroCategorizeMode.Toolbar;
+        private DevComponents.DotNetBar.Ribbon.QatToolbar m_QatToolbar = null;
+        private int DefaultBottomDockPadding = 0;
+        private DevComponents.DotNetBar.Ribbon.SubItemsQatCollection m_QatSubItemsCollection = null;
+        private bool m_QatLayoutChanged = false;
+        private RibbonLocalization m_SystemText = new RibbonLocalization();
+        private bool _UseExternalCustomization = false;
+        private const string SYS_CUSTOMIZE_POPUP_MENU = "syscustomizepopupmenu";
+        private bool m_MenuTabsEnabled = true;
+        private ContextMenuBar m_GlobalContextMenuBar = null;
+        private SubItemsCollection _QatFrequentCommands = new SubItemsCollection(null);
+
+        /// <summary>
+        /// Gets the name of the QAT Customize Item which is used to display the QAT Customize Dialog box.
+        /// </summary>
+        public static readonly string SysQatCustomizeItemName = "sysCustomizeQuickAccessToolbar";
+        /// <summary>
+        /// Gets the name of the Add to Quick Access Toolbar context menu item.
+        /// </summary>
+        public static readonly string SysQatAddToItemName = "sysAddToQuickAccessToolbar";
+        /// <summary>
+        /// Gets the name of the Remove from Quick Access Toolbar context menu item.
+        /// </summary>
+        public static readonly string SysQatRemoveFromItemName = "sysRemoveFromQuickAccessToolbar";
+        /// <summary>
+        /// Gets the name of the QAT placement change context menu item.
+        /// </summary>
+        public static readonly string SysQatPlaceItemName = "sysPlaceQuickAccessToolbar";
+        ///// <summary>
+        ///// Gets the name of the Minimize Ribbon Item which is used to minimize the ribbon.
+        ///// </summary>
+        //public static readonly string SysMinimizeRibbon = "sysMinimizeRibbon";
+        ///// <summary>
+        ///// Gets the name of the Maximize Ribbon Item which is used to maximize the ribbon.
+        ///// </summary>
+        //public static readonly string SysMaximizeRibbon = "sysMaximizeRibbon";
+        /// <summary>
+        /// Gets the name of the label displayed on Quick Access Toolbar customize popup menu.
+        /// </summary>
+        public static readonly string SysQatCustomizeLabelName = "sysCustomizeQuickAccessToolbarLabel";
+        /// <summary>
+        /// Gets the string that is used as starting name for the frequently used QAT menu items created when QAT Customize menu is displayed.
+        /// </summary>
+        public static readonly string SysFrequentlyQatNamePart = "sysQatFrequent_";
+
+        public MetroShell()
+        {
+            // This forces the initialization out of paint loop which speeds up how fast components show up
+            BaseRenderer renderer = DevComponents.DotNetBar.Rendering.GlobalManager.Renderer;
+
+            _QatFrequentCommands.IgnoreEvents = true;
+            _QatFrequentCommands.AllowParentRemove = false;
+
+            this.SetStyle(ControlStyles.AllPaintingInWmPaint
+                  | ControlStyles.ResizeRedraw
+                  | DisplayHelp.DoubleBufferFlag
+                  | ControlStyles.UserPaint
+                  | ControlStyles.Opaque
+                  , true);
+            _TabStrip = new MetroTabStrip();
+            _TabStrip.Dock = DockStyle.Top;
+            _TabStrip.Height = 32;
+            _TabStrip.ItemAdded += new System.EventHandler(TabStripItemAdded);
+            _TabStrip.LocalizeString += new DotNetBarManager.LocalizeStringEventHandler(TabStripLocalizeString);
+            _TabStrip.ItemClick += new System.EventHandler(TabStripItemClick);
+            _TabStrip.ButtonCheckedChanged += new EventHandler(TabStripButtonCheckedChanged);
+            _TabStrip.TitleTextMarkupLinkClick += new MarkupLinkClickEventHandler(TabStripTitleTextMarkupLinkClick);
+            this.Controls.Add(_TabStrip);
+            this.TabStop = false;
+            this.DockPadding.Bottom = DefaultBottomDockPadding;
+            StyleManager.Register(this);
+        }
+        protected override void Dispose(bool disposing)
+        {
+            StyleManager.Unregister(this);
+            base.Dispose(disposing);
+        }
+        #endregion
+
+        #region Internal Implementation
+        /// <summary>
+        /// Called by StyleManager to notify control that style on manager has changed and that control should refresh its appearance if
+        /// its style is controlled by StyleManager.
+        /// </summary>
+        /// <param name="newStyle">New active style.</param>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void StyleManagerStyleChanged(eDotNetBarStyle newStyle)
+        {
+            this.DockPadding.Left = 0;
+        }
+
+        /// <summary>
+        /// Gets the collection of the Quick Access Toolbar Frequently used commands. You should add existing buttons to this collection that
+        /// you already have on the MetroToolbar controls or on the application menu. The list will be used to construct the frequently used
+        /// menu that is displayed when Customize Quick Access Toolbar menu is displayed and it allows end-user to remove and add these
+        /// frequently used commands to the QAT directly from this menu.
+        /// Note that items you add here should not be items that are already on Quick Access Toolbar, i.e. in MetroShell.QuickToolbarItems collection.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public SubItemsCollection QatFrequentCommands
+        {
+            get
+            {
+                return _QatFrequentCommands;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether KeyTips functionality is enabled. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Browsable(true), Category("Behavior"), Description("Indicates whether KeyTips functionality is enabled.")]
+        public bool KeyTipsEnabled
+        {
+            get { return _TabStrip.KeyTipsEnabled; }
+            set { _TabStrip.KeyTipsEnabled = value; }
+        }
+
+        internal bool IsDesignMode
+        {
+            get { return this.DesignMode; }
+        }
+
+        protected virtual void OnSelectedTabChanged(EventArgs e)
+        {
+            if (SelectedTabChanged != null)
+                SelectedTabChanged(this, e);
+        }
+
+        void TabStripButtonCheckedChanged(object sender, EventArgs e)
+        {
+            if (sender is MetroTabItem && ((MetroTabItem)sender).Checked)
+            {
+                OnSelectedTabChanged(new EventArgs());
+            }
+        }
+
+        private void TabStripItemClick(object sender, System.EventArgs e)
+        {
+            if (ItemClick != null)
+                ItemClick(sender, e);
+        }
+
+        private void TabStripLocalizeString(object sender, LocalizeEventArgs e)
+        {
+            if (LocalizeString != null)
+                LocalizeString(this, e);
+        }
+
+        /// <summary>
+        /// Gets or sets whether anti-alias smoothing is used while painting. Default value is false.
+        /// </summary>
+        [DefaultValue(true), Browsable(true), Category("Appearance"), Description("Gets or sets whether anti-aliasing is used while painting.")]
+        public bool AntiAlias
+        {
+            get { return _TabStrip.AntiAlias; }
+            set
+            {
+                _TabStrip.AntiAlias = value;
+                this.Invalidate();
+            }
+        }
+
+        internal DevComponents.DotNetBar.Rendering.Office2007ColorTable GetOffice2007ColorTable()
+        {
+            DevComponents.DotNetBar.Rendering.Office2007Renderer r = DevComponents.DotNetBar.Rendering.GlobalManager.Renderer as DevComponents.DotNetBar.Rendering.Office2007Renderer;
+            if (r != null)
+                return r.ColorTable;
+            return new DevComponents.DotNetBar.Rendering.Office2007ColorTable();
+        }
+
+        /// <summary>
+        /// Performs the setup of the MetroTabPanel with the current style of the MetroShell Control.
+        /// </summary>
+        /// <param name="panel">Panel to apply style changes to.</param>
+        public void SetTabPanelStyle(MetroTabPanel panel)
+        {
+            if (this.DesignMode)
+            {
+                TypeDescriptor.GetProperties(panel.DockPadding)["Left"].SetValue(panel.DockPadding, 3);
+                TypeDescriptor.GetProperties(panel.DockPadding)["Right"].SetValue(panel.DockPadding, 3);
+                TypeDescriptor.GetProperties(panel.DockPadding)["Bottom"].SetValue(panel.DockPadding, 3);
+            }
+            else
+            {
+                panel.DockPadding.Left = 3;
+                panel.DockPadding.Right = 3;
+                panel.DockPadding.Bottom = 3;
+            }
+        }
+
+        /// <summary>
+        /// Creates new Rendering Tab at specified position, creates new associated panel and adds them to the control.
+        /// </summary>
+        /// <param name="text">Specifies the text displayed on the tab.</param>
+        /// <param name="name">Specifies the name of the tab</param>
+        /// <param name="insertPosition">Specifies the position of the new tab inside of Items collection.</param>
+        /// <returns>New instance of the MetroTabItem that was created.</returns>
+        public MetroTabItem CreateTab(string text, string name, int insertPosition)
+        {
+            MetroTabItem item = new MetroTabItem();
+            item.Text = text;
+            item.Name = name;
+
+            MetroTabPanel panel = new MetroTabPanel();
+            panel.Dock = DockStyle.Fill;
+            SetTabPanelStyle(panel);
+            this.Controls.Add(panel);
+            panel.SendToBack();
+
+            item.Panel = panel;
+            if (insertPosition < 0)
+            {
+                insertPosition = this.Items.Count;
+                for (int i = 0; i < this.Items.Count; i++)
+                {
+                    if (this.Items[i].ItemAlignment == eItemAlignment.Far)
+                    {
+                        insertPosition = i;
+                        break;
+                    }
+                }
+                if (insertPosition >= this.Items.Count)
+                    this.Items.Add(item);
+                else
+                    this.Items.Insert(insertPosition, item);
+            }
+            else if (insertPosition > this.Items.Count - 1)
+                this.Items.Add(item);
+            else
+                this.Items.Insert(insertPosition, item);
+
+            return item;
+        }
+
+        /// <summary>
+        /// Creates new Rendering Tab and associated panel and adds them to the control.
+        /// </summary>
+        /// <param name="text">Specifies the text displayed on the tab.</param>
+        /// <param name="name">Specifies the name of the tab</param>
+        /// <returns>New instance of the MetroTabItem that was created.</returns>
+        public MetroTabItem CreateTab(string text, string name)
+        {
+            return CreateTab(text, name, -1);
+        }
+
+        /// <summary>
+        /// Recalculates layout of the control and applies any changes made to the size or position of the items contained.
+        /// </summary>
+        public void RecalcLayout()
+        {
+            _TabStrip.RecalcLayout();
+            if (m_QatToolbar != null && m_QatToolbar.Visible)
+                m_QatToolbar.RecalcLayout();
+        }
+
+        protected override void OnHandleCreated(System.EventArgs e)
+        {
+            base.OnHandleCreated(e);
+            foreach (Control c in this.Controls)
+            {
+                IntPtr h = c.Handle;
+                if (c is MetroTabPanel)
+                {
+                    foreach (Control r in c.Controls)
+                        h = r.Handle;
+                }
+            }
+            this.RecalcLayout();
+        }
+
+        protected override void OnControlAdded(ControlEventArgs e)
+        {
+            base.OnControlAdded(e);
+
+            if (this.DesignMode)
+                return;
+            MetroTabPanel panel = e.Control as MetroTabPanel;
+            if (panel == null)
+                return;
+            if (panel.MetroTabItem != null)
+            {
+                if (this.Items.Contains(panel.MetroTabItem) && this.SelectedTab == panel.MetroTabItem)
+                {
+                    panel.Visible = true;
+                    panel.BringToFront();
+                }
+                else
+                    panel.Visible = false;
+            }
+            else
+                panel.Visible = false;
+        }
+
+        private void TabStripItemAdded(object sender, System.EventArgs e)
+        {
+            if (this.DesignMode)
+                return;
+
+            if (sender is MetroTabItem)
+            {
+                MetroTabItem tab = sender as MetroTabItem;
+                if (tab.Panel != null)
+                {
+                    if (this.Controls.Contains(tab.Panel) && tab.Checked)
+                    {
+                        tab.Panel.Visible = true;
+                        tab.Panel.BringToFront();
+                    }
+                    else
+                        tab.Panel.Visible = false;
+                }
+            }
+        }
+
+        protected override void OnControlRemoved(ControlEventArgs e)
+        {
+            base.OnControlRemoved(e);
+            MetroTabPanel panel = e.Control as MetroTabPanel;
+            if (panel == null)
+                return;
+            if (panel.MetroTabItem != null)
+            {
+                if (this.Items.Contains(panel.MetroTabItem))
+                    this.Items.Remove(panel.MetroTabItem);
+            }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void SetDesignMode()
+        {
+            _TabStrip.SetDesignMode(true);
+        }
+
+        private ElementStyle GetBackgroundStyle()
+        {
+            return _TabStrip.InternalGetBackgroundStyle();
+        }
+
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            ElementStyle style = GetBackgroundStyle();
+            if (style.BackColor.A < 255 && !style.BackColor.IsEmpty ||
+                this.BackColor == Color.Transparent || this.BackgroundImage != null)
+            {
+                base.OnPaintBackground(e);
+            }
+            else
+            {
+                using (SolidBrush brush = new SolidBrush(this.BackColor))
+                    e.Graphics.FillRectangle(brush, this.ClientRectangle);
+            }
+
+            ElementStyleDisplayInfo info = new ElementStyleDisplayInfo(style, e.Graphics, this.ClientRectangle);
+            ElementStyleDisplay.PaintBackground(info);
+        }
+
+        protected override void WndProc(ref Message m)
+        {
+            if (m.Msg == (int)WinApi.WindowsMessages.WM_NCHITTEST)
+            {
+                // Get position being tested...
+                int x = WinApi.LOWORD(m.LParam);
+                int y = WinApi.HIWORD(m.LParam);
+                Point p = PointToClient(new Point(x, y));
+
+                if (this.CaptionVisible && _TabStrip != null && !_TabStrip.IsMaximized)
+                {
+                    MetroAppForm form = this.FindForm() as MetroAppForm;
+                    if (form == null || form.Sizable)
+                    {
+                        int formBorderSize = 4;
+                        Rectangle r = new Rectangle(0, 0, this.Width, formBorderSize);
+                        if (r.Contains(p)) // Top side form resizing
+                        {
+                            m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.TransparentOrCovered);
+                            return;
+                        }
+                        r = new Rectangle(0, 0, formBorderSize, this.Height); // Left side form resizing
+                        if (r.Contains(p))
+                        {
+                            m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.TransparentOrCovered);
+                            return;
+                        }
+                        r = new Rectangle(this.Width - formBorderSize, 0, formBorderSize, this.Height); // Right side form resizing
+                        if (r.Contains(p))
+                        {
+                            m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.TransparentOrCovered);
+                            return;
+                        }
+                    }
+                }
+                if (BarFunctions.IsWindows7 && _TabStrip != null && _TabStrip.IsMaximized)
+                {
+                    Rectangle r = _TabStrip.CaptionBounds;
+                    if (r.Contains(p))
+                    {
+                        m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.TransparentOrCovered);
+                        return;
+                    }
+                }
+                // System Icon
+                if ((p.X < 28 && this.RightToLeft == RightToLeft.No || p.X > this.Width - 28 && this.RightToLeft == RightToLeft.Yes) && p.Y < 28)
+                {
+                    m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.TransparentOrCovered);
+                    return;
+                }
+            }
+            base.WndProc(ref m);
+        }
+        #endregion
+
+        #region Properties
+        /// <summary>
+        /// Indicates whether Form.Icon is shown in top-left corner.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance"), Description("Indicates whether Form.Icon is shown in top-left corner.")]
+        public bool ShowIcon
+        {
+            get
+            {
+                return _TabStrip.ShowIcon;
+            }
+            set
+            {
+                _TabStrip.ShowIcon = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the rich text displayed on title bar instead of the Form.Text property. This property supports text-markup.
+        /// You can use <font color="SysCaptionTextExtra"> markup to instruct the markup renderer to use Office 2007 system caption extra text color which
+        /// changes depending on the currently selected color table. Note that when using this property you should manage also the Form.Text property since
+        /// that is the text that will be displayed in Windows task-bar and elsewhere where system Form.Text property is used.
+        /// You can also use the hyperlinks as part of the text markup and handle the TitleTextMarkupLinkClick event to be notified when they are clicked.
+        /// </summary>
+        [Browsable(true), DefaultValue(""), Editor("DevComponents.DotNetBar.Design.TextMarkupUIEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), EditorBrowsable(EditorBrowsableState.Always), Category("Appearance"), Description("Indicates text displayed on Title bar instead of the Form.Text property.")]
+        public string TitleText
+        {
+            get { return _TabStrip.TitleText; }
+            set { _TabStrip.TitleText = value; }
+        }
+
+        /// <summary>
+        /// Occurs when text markup link is clicked.
+        /// </summary>
+        private void TabStripTitleTextMarkupLinkClick(object sender, MarkupLinkClickEventArgs e)
+        {
+            if (TitleTextMarkupLinkClick != null)
+                TitleTextMarkupLinkClick(this, new MarkupLinkClickEventArgs(e.Name, e.HRef));
+        }
+
+        /// <summary>
+        /// Gets or sets the Context menu bar associated with the this control which is used as part of Global Items feature. The context menu 
+        /// bar assigned here will be used to search for the items with the same Name or GlobalName property so global properties can be propagated when changed.
+        /// You should assign this property to enable the Global Items feature to reach your ContextMenuBar.
+        /// </summary>
+        [DefaultValue(null), Description("Indicates Context menu bar associated with the MetroShell control which is used as part of Global Items feature."), Category("Data")]
+        public ContextMenuBar GlobalContextMenuBar
+        {
+            get { return m_GlobalContextMenuBar; }
+            set
+            {
+                if (m_GlobalContextMenuBar != null)
+                    m_GlobalContextMenuBar.GlobalParentComponent = null;
+                m_GlobalContextMenuBar = value;
+                if (m_GlobalContextMenuBar != null)
+                    m_GlobalContextMenuBar.GlobalParentComponent = this;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether custom caption and quick access toolbar provided by the control is visible. Default value is false.
+        /// This property should be set to true when control is used on MetroAppForm.
+        /// </summary>
+        [Browsable(true), DefaultValue(false), Category("Caption"), Description("Indicates whether custom caption and quick access toolbar provided by the control is visible.")]
+        public bool CaptionVisible
+        {
+            get { return _TabStrip.CaptionVisible; }
+            set
+            {
+                _TabStrip.CaptionVisible = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the font for the form caption text when CaptionVisible=true. Default value is NULL which means that system font is used.
+        /// </summary>
+        [Browsable(true), DefaultValue(null), Category("Caption"), Description("Indicates font for the form caption text when CaptionVisible=true.")]
+        public Font CaptionFont
+        {
+            get { return _TabStrip.CaptionFont; }
+            set
+            {
+                _TabStrip.CaptionFont = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the explicit height of the caption provided by control. Caption height when set is composed of the TabGroupHeight and
+        /// the value specified here. Default value is 0 which means that system default caption size is used.
+        /// </summary>
+        [Browsable(true), DefaultValue(0), Category("Caption"), Description("Indicates explicit height of the caption provided by control")]
+        public int CaptionHeight
+        {
+            get { return _TabStrip.CaptionHeight; }
+            set
+            {
+                _TabStrip.CaptionHeight = value;
+                this.RecalcLayout();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the font that is used to display Key Tips (accelerator keys) when they are displayed. Default value is null which means
+        /// that control Font is used for Key Tips display.
+        /// </summary>
+        [Browsable(true), DefaultValue(null), Category("Appearance"), Description("Indicates font that is used to display Key Tips (accelerator keys) when they are displayed.")]
+        public virtual Font KeyTipsFont
+        {
+            get { return _TabStrip.KeyTipsFont; }
+            set { _TabStrip.KeyTipsFont = value; }
+        }
+
+        /// <summary>
+        /// Specifies the background style of the control.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Category("Style"), Description("Gets or sets bar background style."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ElementStyle BackgroundStyle
+        {
+            get { return _TabStrip.BackgroundStyle; }
+        }
+
+        /// <summary>
+        /// Gets or sets the currently selected MetroTabItem. MetroTabItems are selected using the Checked property. Only a single
+        /// MetroTabItem can be selected (Checked) at any given time.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public MetroTabItem SelectedTab
+        {
+            get { return _TabStrip.SelectedTab; }
+            set
+            {
+                if (value != null) value.Checked = true;
+            }
+        }
+
+        /// <summary>
+        /// Returns reference to internal metro tab-strip control.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public MetroTabStrip MetroTabStrip
+        {
+            get { return _TabStrip; }
+        }
+
+        /// <summary>
+        /// Returns collection of items on a bar.
+        /// </summary>
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content), Browsable(false)]
+        public SubItemsCollection Items
+        {
+            get { return _TabStrip.Items; }
+        }
+
+        /// <summary>
+        /// Returns collection of quick toolbar access and caption items.
+        /// </summary>
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content), Browsable(false)]
+        public SubItemsCollection QuickToolbarItems
+        {
+            get { return GetQatSubItemsCollection(); }
+        }
+
+        private SubItemsCollection GetQatSubItemsCollection()
+        {
+            return _TabStrip.QuickToolbarItems;
+        }
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public eDotNetBarStyle EffectiveStyle
+        {
+            get
+            {
+                return _TabStrip.EffectiveStyle;
+            }
+        }
+
+        private static BaseItem GetAppButton(MetroShell tab)
+        {
+            BaseItem appButton = null;
+            for (int i = 0; i < tab.QuickToolbarItems.Count; i++)
+            {
+                if (tab.QuickToolbarItems[i] is MetroAppButton)
+                {
+                    appButton = tab.QuickToolbarItems[i];
+                    break;
+                }
+
+            }
+            return appButton;
+        }
+        protected override void OnBackColorChanged(EventArgs e)
+        {
+            base.OnBackColorChanged(e);
+        }
+
+        internal void OnChildItemClick(BaseItem item)
+        {
+            _TabStrip.OnChildItemClick(item);
+            if (item == null) return;
+            if (item is MetroTabItem || item.IsContainer || item.Name.StartsWith("sysgallery") || item is CheckBoxItem || !item.AutoCollapseOnClick) return;
+            if (item is PopupItem && item.Expanded) return;
+
+        }
+
+#if TRIAL
+        private bool _ShownOnce = false;
+#endif
+        protected override void OnVisibleChanged(EventArgs e)
+        {
+#if TRIAL
+                if(!this.DesignMode && !_ShownOnce)
+                {
+				    RemindForm frm=new RemindForm();
+				    frm.ShowDialog();
+				    frm.Dispose();
+                    _ShownOnce = true;
+                }
+#endif
+
+            base.OnVisibleChanged(e);
+        }
+
+        private bool _MouseWheelTabScrollEnabled = true;
+        /// <summary>
+        /// Gets or sets whether mouse wheel scrolls through the Metro tabs. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether mouse wheel scrolls through the Metro tabs.")]
+        public bool MouseWheelTabScrollEnabled
+        {
+            get { return _MouseWheelTabScrollEnabled; }
+            set
+            {
+                _MouseWheelTabScrollEnabled = value;
+            }
+        }
+
+        /// <summary>
+        /// ImageList for images used on Items. Images specified here will always be used on menu-items and are by default used on all Bars.
+        /// </summary>
+        [Browsable(true), Category("Data"), DefaultValue(null), Description("ImageList for images used on Items. Images specified here will always be used on menu-items and are by default used on all Bars.")]
+        public ImageList Images
+        {
+            get { return _TabStrip.Images; }
+            set { _TabStrip.Images = value; }
+        }
+
+        /// <summary>
+        /// ImageList for medium-sized images used on Items.
+        /// </summary>
+        [Browsable(true), Category("Data"), DefaultValue(null), Description("ImageList for medium-sized images used on Items.")]
+        public ImageList ImagesMedium
+        {
+            get { return _TabStrip.ImagesMedium; }
+            set { _TabStrip.ImagesMedium = value; }
+        }
+
+        /// <summary>
+        /// ImageList for large-sized images used on Items.
+        /// </summary>
+        [Browsable(true), Category("Data"), DefaultValue(null), Description("ImageList for large-sized images used on Items.")]
+        public ImageList ImagesLarge
+        {
+            get { return _TabStrip.ImagesLarge; }
+            set { _TabStrip.ImagesLarge = value; }
+        }
+
+        protected override void OnTabStopChanged(System.EventArgs e)
+        {
+            base.OnTabStopChanged(e);
+            _TabStrip.TabStop = this.TabStop;
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the user can give the focus to this control using the TAB key. Default value is false.
+        /// </summary>
+        [Browsable(true), DefaultValue(false), Category("Behavior"), Description("Indicates whether the user can give the focus to this control using the TAB key.")]
+        public new bool TabStop
+        {
+            get { return base.TabStop; }
+            set { base.TabStop = value; }
+        }
+        #endregion
+
+        #region Metro Customization
+
+        private bool DisplayCustomizeContextMenu
+        {
+            get { return this.CanCustomize && (this.CaptionVisible || _UseExternalCustomization); }
+        }
+
+        /// <summary>
+        /// Called when right-mouse button is pressed over MetroTabStrip
+        /// </summary>
+        /// <param name="metroStrip">Reference to MetroTabStrip object.</param>
+        internal void OnTabStripRightClick(MetroTabStrip metroStrip, int x, int y)
+        {
+            if (!DisplayCustomizeContextMenu)
+                return;
+            BaseItem item = metroStrip.HitTest(x, y);
+            if (item != null && item.CanCustomize && !item.SystemItem)
+            {
+                ShowCustomizeContextMenu(item, true);
+            }
+        }
+
+        /// <summary>
+        /// Displays popup customize context menu for given customization object.
+        /// </summary>
+        /// <param name="o">Object that should be customized, usually an instance of BaseItem.</param>
+        /// <param name="isTabStrip">Indicates whether customize menu is displayed over metro tab strip</param>
+        internal virtual void ShowCustomizeContextMenu(object o, bool isTabStrip)
+        {
+            if (o == null || !_UseCustomizeDialog)
+                return;
+
+            _TabStrip.ClosePopup(SYS_CUSTOMIZE_POPUP_MENU);
+
+            ButtonItem cont = new ButtonItem(SYS_CUSTOMIZE_POPUP_MENU);
+            cont.Style = eDotNetBarStyle.StyleManagerControlled;
+            cont.SetOwner(_TabStrip);
+
+            if ((CanCustomizeItem(o as BaseItem)) && !_UseExternalCustomization)
+            {
+                if (o is BaseItem && this.QuickToolbarItems.Contains((BaseItem)o))
+                {
+
+                    ButtonItem b = new ButtonItem(SysQatRemoveFromItemName);
+                    b.Text = this.SystemText.QatRemoveItemText;
+                    b.Click += new System.EventHandler(CustomizeRemoveFromQuickAccessToolbar);
+                    b.Tag = o;
+                    cont.SubItems.Add(b);
+                }
+                else
+                {
+                    BaseItem itemToCustomize = o as BaseItem;
+
+                    ButtonItem b = new ButtonItem(SysQatAddToItemName);
+                    b.Text = this.SystemText.QatAddItemText;
+                    b.Click += new System.EventHandler(CustomizeAddToQuickAccessToolbar);
+                    b.Tag = o;
+                    cont.SubItems.Add(b);
+
+                    if (itemToCustomize != null && this.QuickToolbarItems.Contains(itemToCustomize.Name))
+                        b.Enabled = false;
+
+                    if (itemToCustomize != null && BaseItem.IsOnPopup(itemToCustomize) && itemToCustomize.Parent != null)
+                    {
+                        Control c = itemToCustomize.ContainerControl as Control;
+                        if (c != null) c.VisibleChanged += new EventHandler(CustomizePopupItemParentVisibleChange);
+                    }
+                }
+            }
+
+            if (_UseCustomizeDialog)
+            {
+                ButtonItem b = new ButtonItem(SysQatCustomizeItemName);
+                b.Text = this.SystemText.QatCustomizeText;
+                b.BeginGroup = true;
+                b.Click += new EventHandler(CustomizeQuickAccessToolbarDialog);
+                cont.SubItems.Add(b);
+            }
+
+            RibbonCustomizeEventArgs e = new RibbonCustomizeEventArgs(o, cont);
+            OnBeforeCustomizeMenuPopup(e);
+            if (e.Cancel)
+            {
+                cont.Dispose();
+                return;
+            }
+
+            ((IOwnerMenuSupport)_TabStrip).RegisterPopup(cont);
+            cont.Popup(Control.MousePosition);
+        }
+
+        private void CustomizePopupItemParentVisibleChange(object sender, EventArgs e)
+        {
+            Control c = sender as Control;
+            if (c == null) return;
+            c.VisibleChanged -= new EventHandler(CustomizePopupItemParentVisibleChange);
+            // Close the Customize Context menu we displayed
+            _TabStrip.ClosePopup(SYS_CUSTOMIZE_POPUP_MENU);
+        }
+
+        private ArrayList GetQatItems(bool includeCustomizeItem)
+        {
+            ArrayList list = new ArrayList();
+            foreach (BaseItem item in this.QuickToolbarItems)
+            {
+                if (IsSystemItem(item) || item is ButtonItem && ((ButtonItem)item).HotTrackingStyle == eHotTrackingStyle.Image && this.QuickToolbarItems.IndexOf(item) == 0)
+                {
+                    if (includeCustomizeItem && item is CustomizeItem)
+                        list.Add(item);
+                    continue;
+                }
+                list.Add(item);
+            }
+
+            return list;
+        }
+
+        internal Ribbon.QatToolbar QatToolbar
+        {
+            get { return m_QatToolbar; }
+        }
+
+        private void CustomizeQuickAccessToolbarDialog(object sender, EventArgs e)
+        {
+            ShowQatCustomizeDialog();
+        }
+
+        private bool CanCustomizeItem(BaseItem item)
+        {
+            if (item == null)
+                return false;
+
+            if (!item.CanCustomize || item.SystemItem)
+                return false;
+
+            if (item is ItemContainer) // && ((ItemContainer)item).SystemContainer)
+                return false;
+
+            if (item is ButtonItem && this.QuickToolbarItems.IndexOf(item) == 0)
+                return false;
+
+            return true;
+        }
+
+        private string GetQATRibbonBarName(RibbonBar bar)
+        {
+            return "qt_" + bar.Name;
+        }
+
+        private void CustomizeRemoveFromQuickAccessToolbar(object sender, System.EventArgs e)
+        {
+            ButtonItem b = sender as ButtonItem;
+            if (b.Tag is BaseItem)
+            {
+                BaseItem item = b.Tag as BaseItem;
+                RemoveItemFromQuickAccessToolbar(item);
+            }
+
+            b.Tag = null;
+        }
+
+        /// <summary>
+        /// Removes an item from the Quick Access Toolbar.
+        /// </summary>
+        /// <param name="item">Reference to the item that is already part of Quick Access Toolbar.</param>
+        public void RemoveItemFromQuickAccessToolbar(BaseItem item)
+        {
+            RibbonCustomizeEventArgs rc = new RibbonCustomizeEventArgs(item, null);
+            OnBeforeRemoveItemFromQuickAccessToolbar(rc);
+
+            if (!rc.Cancel)
+            {
+                this.QuickToolbarItems.Remove(item);
+                //item.Parent.SubItems.Remove(item);
+                this.RecalcLayout();
+                m_QatLayoutChanged = true;
+            }
+        }
+
+        private void CustomizeAddToQuickAccessToolbar(object sender, System.EventArgs e)
+        {
+            ButtonItem b = sender as ButtonItem;
+
+            AddItemToQuickAccessToolbar(b.Tag);
+
+            b.Tag = null;
+        }
+
+        /// <summary>
+        /// Adds an instance of base type BaseItem to the Quick Access Toolbar. Note that this method creates
+        /// new instance of the item or an representation of the item being added and adds that to the Quick Access Toolbar.
+        /// </summary>
+        /// <param name="originalItem">Reference to the item to add, must be an BaseItem type.</param>
+        public void AddItemToQuickAccessToolbar(object originalItem)
+        {
+            BaseItem copy = GetQatItemCopy(originalItem);
+            if (copy != null)
+            {
+                RibbonCustomizeEventArgs re = new RibbonCustomizeEventArgs(copy, null);
+                OnBeforeAddItemToQuickAccessToolbar(re);
+                if (!re.Cancel)
+                {
+                    this.QuickToolbarItems.Add(copy);
+                    this.RecalcLayout();
+                    m_QatLayoutChanged = true;
+                }
+            }
+        }
+
+        private BaseItem GetQatItemCopy(object o)
+        {
+            BaseItem copy = null;
+            if (o is ButtonItem)
+            {
+                ButtonItem button = ((ButtonItem)o).Copy() as ButtonItem;
+                button.KeyTips = "";
+                button.ImageFixedSize = Size.Empty;
+                button.FixedSize = Size.Empty;
+                button.ButtonStyle = eButtonStyle.Default;
+                button.ImagePosition = eImagePosition.Left;
+                button.BeginGroup = false;
+                button.UseSmallImage = true;
+                button.ImagePaddingHorizontal = 8;
+                button.ImagePaddingVertical = 6;
+
+                if (button.TextMarkupBody != null && button.TextMarkupBody.HasExpandElement)
+                    button.Text = TextMarkup.MarkupParser.RemoveExpand(button.Text);
+
+                if (button.Image == null && button.ImageIndex == -1 && button.Icon == null)
+                    button.Image = BarFunctions.LoadBitmap("SystemImages.GreenLight.png");
+                else
+                    button.ImageFixedSize = new Size(16, 16);
+                copy = button;
+            }
+            else if (o is BaseItem)
+            {
+                copy = ((BaseItem)o).Copy();
+                copy.KeyTips = "";
+            }
+            //else if (o is RibbonBar)
+            //{
+            //    RibbonBar bar = o as RibbonBar;
+            //    ButtonItem item = new ButtonItem(GetQATRibbonBarName(bar));
+            //    item.Image = bar.GetOverflowButtonImage();
+            //    item.ImageFixedSize = new Size(16, 16);
+            //    item.AutoExpandOnClick = true;
+            //    item.Tooltip = bar.Text;
+            //    item.Text = bar.Text;
+            //    RibbonBar qatBar = null;
+            //    bool recalcLayout = false;
+            //    if (bar.IsItemsAutoSizeActive)
+            //    {
+            //        bar.RestoreAutoSizedItems();
+            //        qatBar = bar.CreateOverflowRibbon(true);
+            //        recalcLayout = true;
+            //    }
+            //    else
+            //        qatBar = bar.CreateOverflowRibbon(true);
+            //    qatBar.IsOnQat = true;
+            //    qatBar.QatButtonParent = item;
+            //    foreach (BaseItem child in bar.Items)
+            //    {
+            //        BaseItem childCopy = child.Copy();
+            //        qatBar.Items.Add(childCopy);
+            //    }
+            //    if (recalcLayout) bar.RecalcLayout();
+
+            //    ItemContainer ic = new ItemContainer();
+            //    ic.Stretch = true;
+            //    ControlContainerItem cont = new ControlContainerItem();
+            //    cont.AllowItemResize = false;
+            //    ic.SubItems.Add(cont);
+            //    cont.Control = qatBar;
+            //    item.SubItems.Add(ic);
+
+            //    copy = item;
+            //}
+
+            return copy;
+        }
+
+        /// <summary>
+        /// Raises the BeforeCustomizeMenuPopup event.
+        /// </summary>
+        /// <param name="e">Event arguments</param>
+        protected virtual void OnBeforeCustomizeMenuPopup(RibbonCustomizeEventArgs e)
+        {
+            if (BeforeCustomizeMenuPopup != null)
+                BeforeCustomizeMenuPopup(this, e);
+        }
+
+        /// <summary>
+        /// Raises the BeforeAddItemToQuickAccessToolbar event.
+        /// </summary>
+        /// <param name="e">Event arguments.</param>
+        protected virtual void OnBeforeAddItemToQuickAccessToolbar(RibbonCustomizeEventArgs e)
+        {
+            if (BeforeAddItemToQuickAccessToolbar != null)
+                BeforeAddItemToQuickAccessToolbar(this, e);
+        }
+
+        protected virtual void OnBeforeRemoveItemFromQuickAccessToolbar(RibbonCustomizeEventArgs e)
+        {
+            if (BeforeRemoveItemFromQuickAccessToolbar != null)
+                BeforeRemoveItemFromQuickAccessToolbar(this, e);
+        }
+
+        /// <summary>
+        /// Gets or sets whether control can be customized and items added by end-user using context menu to the quick access toolbar.
+        /// Caption of the control must be visible for customization to be enabled. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Browsable(true), Category("Quick Access Toolbar"), Description("Indicates whether control can be customized. Caption must be visible for customization to be fully enabled.")]
+        public bool CanCustomize
+        {
+            get { return _TabStrip.CanCustomize; }
+            set { _TabStrip.CanCustomize = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether external implementation for metro toolbar and menu item customization will be used for customizing the control. When set to true
+        /// it enables the displaying of MetroToolbar and menu item context menus which allow customization. You are responsible for
+        /// adding the menu items to context menu to handle all aspects of item customization. See "MetroShell Control Quick Access Toolbar Customization" topic in help file under How To.
+        /// Default value is false.
+        /// </summary>
+        [DefaultValue(false), Browsable(true), Category("Quick Access Toolbar"), Description("Indicates whether external implementation for MetroToolbar and menu item customization will be used for customizing the MetroShell control.")]
+        public bool UseExternalCustomization
+        {
+            get { return _UseExternalCustomization; }
+            set { _UseExternalCustomization = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether end-user customization of the placement of the Quick Access Toolbar is enabled. User
+        /// can change the position of the Quick Access Toolbar using the customize menu. Default value is true.
+        /// </summary>
+        //[Browsable(true), DefaultValue(true), Category("Quick Access Toolbar"), Description("Indicates whether end-user customization of the placement of the Quick Access Toolbar is enabled.")]
+        //public bool EnableQatPlacement
+        //{
+        //    get { return m_EnableQatPlacement; }
+        //    set { m_EnableQatPlacement = value; }
+        //}
+
+        /// <summary>
+        /// Gets or sets whether customize dialog is used to customize the quick access toolbar. You can handle the EnterCustomize event 
+        /// to display your custom dialog instead of built-in dialog for customization. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Browsable(true), Category("Quick Access Toolbar"), Description("Indicates whether customize dialog is used to customize the quick access toolbar.")]
+        public bool UseCustomizeDialog
+        {
+            get { return _UseCustomizeDialog; }
+            set { _UseCustomizeDialog = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the categorization mode for the items on Quick Access Toolbar customize dialog box. Default value categorizes
+        /// items by the toolbar they appear on.
+        /// </summary>
+        [DefaultValue(eMetroCategorizeMode.Toolbar), Browsable(true), Category("Quick Access Toolbar"), Description("Indicates categorization mode for the items on Quick Access Toolbar customize dialog box.")]
+        public eMetroCategorizeMode CategorizeMode
+        {
+            get { return m_CategorizeMode; }
+            set { m_CategorizeMode = value; }
+        }
+
+        /// <summary>
+        /// Shows the quick access toolbar customize dialog.
+        /// </summary>
+        public virtual void ShowQatCustomizeDialog()
+        {
+            Form qatDialog = CreateQatCustomizeDialog();
+
+            if (BeforeQatCustomizeDialog != null)
+            {
+                QatCustomizeDialogEventArgs ce = new QatCustomizeDialogEventArgs(qatDialog);
+                BeforeQatCustomizeDialog(this, ce);
+                if (ce.Cancel || ce.Dialog == null)
+                {
+                    qatDialog.Dispose();
+                    return;
+                }
+
+                qatDialog = ce.Dialog;
+            }
+
+            if (qatDialog is MetroQatCustomizeDialog)
+                ((MetroQatCustomizeDialog)qatDialog).LoadItems(this);
+
+            Form form = this.FindForm();
+            qatDialog.StartPosition = FormStartPosition.CenterParent;
+            DialogResult result = qatDialog.ShowDialog(form);
+
+            if (AfterQatCustomizeDialog != null)
+            {
+                QatCustomizeDialogEventArgs ce = new QatCustomizeDialogEventArgs(qatDialog);
+                AfterQatCustomizeDialog(this, ce);
+                if (ce.Cancel)
+                {
+                    qatDialog.Dispose();
+                    return;
+                }
+            }
+
+            if (result == DialogResult.Cancel)
+            {
+                qatDialog.Dispose();
+                return;
+            }
+
+            // Apply changes to the Quick Access Toolbar
+            MetroQatCustomizeDialog qd = qatDialog as MetroQatCustomizeDialog;
+            if (qd == null || !qd.QatCustomizePanel.DataChanged) return;
+            ApplyQatCustomizePanelChanges(qd.QatCustomizePanel);
+            qatDialog.Dispose();
+        }
+
+        /// <summary>
+        /// Applies the Quick Access Toolbar customization changes made on QatCustomizePanel to the MetroShell Control Quick Access Toolbar. Note that QatCustomizePanel.DataChanged property indicates whether user made any changes to the data on the panel.
+        /// </summary>
+        /// <param name="customizePanel">Reference to the QatCustomizePanel</param>
+        public void ApplyQatCustomizePanelChanges(Ribbon.QatCustomizePanel customizePanel)
+        {
+            if (customizePanel == null || !customizePanel.DataChanged) return;
+            _TabStrip.BeginUpdate();
+            try
+            {
+                ItemPanel itemPanelQat = customizePanel.itemPanelQat;
+
+                int start = 0;
+                BaseItem startButton = GetApplicationButton();
+                if (startButton != null)
+                    start = this.QuickToolbarItems.IndexOf(startButton) + 1;
+
+                ArrayList removeList = new ArrayList();
+                SubItemsCollection qatList = new SubItemsCollection(null);
+
+                for (int i = start; i < this.QuickToolbarItems.Count; i++)
+                {
+                    BaseItem item = this.QuickToolbarItems[i];
+                    if (IsSystemItem(item))
+                        continue;
+
+                    if (!itemPanelQat.Items.Contains(item.Name))
+                        removeList.Add(item);
+                    else
+                        qatList._Add(item);
+                }
+
+                foreach (BaseItem item in removeList)
+                    this.QuickToolbarItems.Remove(item);
+                foreach (BaseItem item in qatList)
+                    this.QuickToolbarItems.Remove(item);
+
+                foreach (BaseItem item in itemPanelQat.Items)
+                {
+                    // Already exists on Quick Access Toolbar
+                    if (item.Tag != null)
+                    {
+                        BaseItem copy = GetQatItemCopy(item.Tag as BaseItem);
+                        this.QuickToolbarItems.Add(copy);
+                    }
+                    else
+                    {
+                        BaseItem qatItem = qatList[item.Name];
+                        if (qatItem != null)
+                            this.QuickToolbarItems.Add(qatItem);
+                    }
+                }
+
+                m_QatLayoutChanged = true;
+            }
+            finally
+            {
+                _TabStrip.EndUpdate();
+            }
+
+            OnAfterQatDialogChangesApplied();
+        }
+
+        /// <summary>
+        /// Raises the AfterQatDialogChangesApplied event.
+        /// </summary>
+        protected virtual void OnAfterQatDialogChangesApplied()
+        {
+            if (AfterQatDialogChangesApplied != null)
+                AfterQatDialogChangesApplied(this, new EventArgs());
+        }
+
+        private MetroQatCustomizeDialog CreateQatCustomizeDialog()
+        {
+            MetroQatCustomizeDialog qat = new MetroQatCustomizeDialog();
+            qat.Text = SystemText.QatDialogCaption;
+            qat.buttonCancel.Text = SystemText.QatDialogCancelButton;
+            qat.buttonOK.Text = SystemText.QatDialogOkButton;
+            qat.QatCustomizePanel.buttonAddToQat.Text = SystemText.QatDialogAddButton;
+            qat.QatCustomizePanel.buttonRemoveFromQat.Text = SystemText.QatDialogRemoveButton;
+            qat.QatCustomizePanel.labelCategories.Text = SystemText.QatDialogCategoriesLabel;
+            qat.QatCustomizePanel.checkQatBelowRibbon.Text = SystemText.QatDialogPlacementCheckbox;
+
+            return qat;
+        }
+
+        private bool IsSystemItem(BaseItem item)
+        {
+            if (item.SystemItem || item is ItemContainer || item is CustomizeItem || item is SystemCaptionItem)
+                return true;
+            return false;
+        }
+        /// <summary>
+        /// Returns the Metro Application Button.
+        /// </summary>
+        /// <returns>reference to Application Button or null if button is not found.</returns>
+        public BaseItem GetApplicationButton()
+        {
+            return _TabStrip.GetApplicationButton();
+        }
+
+        /// <summary>
+        /// Gets or sets the Quick Access Toolbar layout description. You can use the value obtained from this property to save
+        /// the customized Quick Access Toolbar into registry or into any other storage object. You can also set the saved layout description back
+        /// to restore user customize layout.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public string QatLayout
+        {
+            get
+            {
+                return GetQatLayoutDescription();
+            }
+            set
+            {
+                SetQatLayoutDescription(value);
+            }
+        }
+
+        private string GetQatLayoutDescription()
+        {
+            ArrayList qatList = GetQatItems(false);
+            StringBuilder layoutDesc = new StringBuilder();
+            foreach (BaseItem item in qatList)
+            {
+                if (item.Name != "")
+                {
+                    layoutDesc.Append("," + item.Name);
+                }
+            }
+
+            return layoutDesc.ToString();
+        }
+
+        private void SetQatLayoutDescription(string layoutDesc)
+        {
+            if (layoutDesc == "" || layoutDesc == null)
+                return;
+
+            string[] values = layoutDesc.Split(',');
+            if (values.Length == 0)
+                return;
+            ArrayList qatItems = new ArrayList();
+            for (int i = 0; i < values.Length; i++)
+            {
+                if (this.QuickToolbarItems.Contains(values[i]))
+                    qatItems.Add(this.QuickToolbarItems[values[i]]);
+                else
+                {
+                    BaseItem item = FindItem(values[i]);
+                    if (item != null && CanCustomizeItem(item))
+                        qatItems.Add(GetQatItemCopy(item));
+                }
+            }
+
+            ArrayList removeItems = GetQatItems(false);
+            foreach (BaseItem item in removeItems)
+                this.QuickToolbarItems.Remove(item);
+
+            foreach (BaseItem item in qatItems)
+                this.QuickToolbarItems.Add(item);
+
+            m_QatLayoutChanged = false;
+        }
+
+        private BaseItem FindItem(string name)
+        {
+            foreach (WeakReference toolbarRef in _Toolbars)
+            {
+                if (!toolbarRef.IsAlive)
+                    continue;
+                IOwner toolbar = (IOwner)toolbarRef.Target;
+                if (toolbar != null)
+                {
+                    BaseItem item = toolbar.GetItem(name);
+                    if(item!=null)
+                        return item;
+                }
+            }
+            return null;
+        }
+
+        internal List<IOwner> RegisteredToolbars
+        {
+            get
+            {
+                List<IOwner> list = new List<IOwner>();
+                foreach (WeakReference toolbarRef in _Toolbars)
+                {
+                    if (toolbarRef.IsAlive)
+                    {
+                        list.Add((IOwner)toolbarRef.Target);
+                    }
+                }
+                return list;
+            }
+        }
+
+        private List<WeakReference> _Toolbars = new List<WeakReference>();
+        /// <summary>
+        /// Registers the MetroToolbar or any other DotNetBar container that implements IOwner interface so it can participate in Quick Access Toolbar serialization and customization.
+        /// </summary>
+        /// <param name="toolbar"></param>
+        public void RegisterToolbar(IOwner toolbar)
+        {
+            if (toolbar == null)
+                throw new ArgumentNullException("toolbar parameter cannot be null");
+            if (IsToolbarRegistered(toolbar))
+                throw new ArgumentException("toolbar is already registered");
+            WeakReference toolbarRef = new WeakReference(toolbar);
+            _Toolbars.Add(toolbarRef);
+        }
+        /// <summary>
+        /// Registers the MetroToolbar or any other DotNetBar container that implements IOwner interface so it can participate in Quick Access Toolbar serialization and customization.
+        /// </summary>
+        /// <param name="toolbar"></param>
+        public void UnregisterToolbar(IOwner toolbar)
+        {
+            if (toolbar == null)
+                throw new ArgumentNullException("toolbar parameter cannot be null");
+
+            foreach (WeakReference toolbarRef in _Toolbars)
+            {
+                if (toolbarRef.IsAlive && toolbarRef.Target == toolbar)
+                {
+                    _Toolbars.Remove(toolbarRef);
+                    return;
+                }
+            }
+        }
+        private bool IsToolbarRegistered(IOwner toolbar)
+        {
+            foreach (WeakReference toolbarRef in _Toolbars)
+            {
+                if(toolbarRef.IsAlive && toolbarRef.Target == toolbar)
+                    return true;
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// Gets or sets whether Quick Access Toolbar has been customized by end-user. You can use value of this property to determine
+        /// whether Quick Access Toolbar layout that can be accessed using QatLayout property should be saved.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool QatLayoutChanged
+        {
+            get { return m_QatLayoutChanged; }
+            set { m_QatLayoutChanged = value; }
+        }
+
+        /// <summary>
+        /// Gets the reference to the Metro localization object which holds all system text used by the component.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), NotifyParentPropertyAttribute(true), Category("Localization"), Description("Gets system text used by the component.."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public RibbonLocalization SystemText
+        {
+            get { return m_SystemText; }
+        }
+
+        protected override Size DefaultSize
+        {
+            get
+            {
+                return new Size(200, 100);
+            }
+        }
+
+        private eMetroTabStripDock _TabStripDock = eMetroTabStripDock.Top;
+        /// <summary>
+        /// Gets or sets the side tab-strip is docked to.
+        /// </summary>
+        [DefaultValue(eMetroTabStripDock.Top), Category("Appearance"), Description("Indicates side tab-strip is docked to.")]
+        public eMetroTabStripDock TabStripDock
+        {
+            get { return _TabStripDock; }
+            set
+            {
+                _TabStripDock = value;
+                if (_TabStripDock == eMetroTabStripDock.Top)
+                    _TabStrip.Dock = DockStyle.Top;
+                else if (_TabStripDock == eMetroTabStripDock.Bottom)
+                    _TabStrip.Dock = DockStyle.Bottom;
+            }
+        }
+        /// <summary>
+        /// Gets or sets whether SETTINGS button is visible.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance"), Description("Indicates whether SETTINGS button is visible.")]
+        public bool SettingsButtonVisible
+        {
+            get { return _TabStrip.MetroStripContainer.SettingsButtonVisible; }
+            set
+            {
+                if (value != _TabStrip.MetroStripContainer.SettingsButtonVisible)
+                {
+                    _TabStrip.MetroStripContainer.SettingsButtonVisible = value;
+                }
+            }
+        }
+        /// Gets or sets whether HELP button is visible.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance"), Description("Indicates whether HELP button is visible.")]
+        public bool HelpButtonVisible
+        {
+            get { return _TabStrip.MetroStripContainer.HelpButtonVisible; }
+            set
+            {
+                if (value != _TabStrip.MetroStripContainer.HelpButtonVisible)
+                {
+                    _TabStrip.MetroStripContainer.HelpButtonVisible = value;
+                }
+            }
+        }
+        /// <summary>
+        /// Gets or sets the SETTINGS button text.
+        /// </summary>
+        [DefaultValue(""), Category("Appearance"), Description("Indicates SETTINGS button text")]
+        public string SettingsButtonText
+        {
+            get { return _TabStrip.MetroStripContainer.SettingsButtonText; }
+            set { _TabStrip.MetroStripContainer.SettingsButtonText = value; }
+        }
+        /// <summary>
+        /// Gets or sets the HELP button text.
+        /// </summary>
+        [DefaultValue(""), Category("Appearance"), Description("Indicates HELP button text")]
+        public string HelpButtonText
+        {
+            get { return _TabStrip.MetroStripContainer.HelpButtonText; }
+            set { _TabStrip.MetroStripContainer.HelpButtonText = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the font tab items are displayed with.
+        /// </summary>
+        [AmbientValue((string) null), Localizable(true) , Category("Appearance"), Description("Indicates the font tab items are displayed with.")]
+        public Font TabStripFont
+        {
+            get { return _TabStrip.Font; }
+            set
+            {
+                _TabStrip.Font = value;
+            }
+        }
+        #endregion
+    }
+
+    public enum eMetroTabStripDock
+    {
+        Top,
+        Bottom
+    }
+
+    /// <summary>
+    /// Describes the categorization mode used to categorize items on the Customize Metro dialog.
+    /// </summary>
+    public enum eMetroCategorizeMode
+    {
+        /// <summary>
+        /// Items are automatically categorized by the toolbar they appear on.
+        /// </summary>
+        Toolbar,
+        /// <summary>
+        /// Items are categorized by the Category property on each item. Category property should be set on each item.
+        /// </summary>
+        Categories
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Metro/MetroShell.ico b/PROMS/DotNetBar Source Code/Metro/MetroShell.ico
new file mode 100644
index 00000000..93dbbb91
Binary files /dev/null and b/PROMS/DotNetBar Source Code/Metro/MetroShell.ico differ
diff --git a/PROMS/DotNetBar Source Code/Metro/MetroStatusBar.cs b/PROMS/DotNetBar Source Code/Metro/MetroStatusBar.cs
new file mode 100644
index 00000000..3d02d946
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Metro/MetroStatusBar.cs	
@@ -0,0 +1,212 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using DevComponents.DotNetBar.Metro.Rendering;
+using System.ComponentModel;
+using System.Drawing;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Metro
+{
+    /// <summary>
+    /// Represents Metro-UI Status Bar control.
+    /// </summary>
+    [ToolboxBitmap(typeof(MetroShell), "MetroStatusBar.ico"), ToolboxItem(true), Designer("DevComponents.DotNetBar.Design.MetroStatusBarDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf"), System.Runtime.InteropServices.ComVisible(false)]
+    public class MetroStatusBar : ItemControl
+    {
+        #region Constructor
+        private GenericItemContainer _ItemContainer = null;
+        /// <summary>
+        /// Initializes a new instance of the MetroStatusBar class.
+        /// </summary>
+        public MetroStatusBar()
+        {
+            _ItemContainer = new GenericItemContainer();
+            _ItemContainer.GlobalItem = false;
+            _ItemContainer.ContainerControl = this;
+            _ItemContainer.Stretch = true;
+            _ItemContainer.Displayed = true;
+            _ItemContainer.WrapItems = false;
+            _ItemContainer.ItemSpacing = 2;
+            _ItemContainer.PaddingTop = 1;
+            _ItemContainer.PaddingBottom = 4;
+            _ItemContainer.PaddingLeft = 4;
+            _ItemContainer.PaddingRight = 1;
+            _ItemContainer.ToolbarItemsAlign = eContainerVerticalAlignment.Middle;
+            _ItemContainer.EventHeight = false;
+            _ItemContainer.FillsContainerControl = true;
+            _ItemContainer.Style = eDotNetBarStyle.StyleManagerControlled;
+            this.ColorScheme.Style = eDotNetBarStyle.StyleManagerControlled;
+            _ItemContainer.SetOwner(this);
+            _ItemContainer.LayoutType = eLayoutType.Toolbar;
+
+            this.SetBaseItemContainer(_ItemContainer);
+            this.DragDropSupport = true;
+            this.ItemAdded += new EventHandler(ChildItemAdded);
+            this.ItemRemoved += new ItemRemovedEventHandler(ChildItemRemoved);
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            this.ItemAdded -= new EventHandler(ChildItemAdded);
+            this.ItemRemoved -= new ItemRemovedEventHandler(ChildItemRemoved);
+            base.Dispose(disposing);
+        }
+        #endregion
+
+        #region Implementation
+        /// <summary>
+        /// Indicates whether items that cannot fit are displayed on popup.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether items that cannot fit are displayed on popup.")]
+        public bool OverflowEnabled
+        {
+            get { return _ItemContainer.OverflowEnabled; }
+            set
+            {
+                _ItemContainer.OverflowEnabled = value;
+                if (this.IsHandleCreated)
+                    RecalcLayout();
+            }
+        }
+        
+
+        private void ChildItemAdded(object sender, EventArgs e)
+        {
+            this.RecalcLayout();
+        }
+        private void ChildItemRemoved(object sender, ItemRemovedEventArgs e)
+        {
+            this.RecalcLayout();
+        }
+
+        protected override void PaintControlBackground(ItemPaintArgs pa)
+        {
+            MetroRender.Paint(this, pa);
+            base.PaintControlBackground(pa);
+        }
+
+        /// <summary>
+        /// Returns collection of items on a bar.
+        /// </summary>
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content), Browsable(false)]
+        public SubItemsCollection Items
+        {
+            get
+            {
+                return _ItemContainer.SubItems;
+            }
+        }
+
+        private readonly int ResizeHandleWidth = 10;
+        protected override Rectangle GetItemContainerRectangle()
+        {
+            Rectangle ic = base.GetItemContainerRectangle();
+            if (_ResizeHandleVisible)
+            {
+                ic.Width -= ResizeHandleWidth;
+                if (this.RightToLeft == System.Windows.Forms.RightToLeft.Yes)
+                    ic.X += ResizeHandleWidth;
+            }
+            return ic;
+        }
+
+        private bool _ResizeHandleVisible = true;
+        /// <summary>
+        /// Gets or sets whether resize handle used to resize the parent form is visible. 
+        /// </summary>
+        [DefaultValue(true), Category("Appearance"), Description("Indicates whether resize handle used to resize the parent form is visible.")]
+        public bool ResizeHandleVisible
+        {
+            get { return _ResizeHandleVisible; }
+            set
+            {
+                if (value != _ResizeHandleVisible)
+                {
+                    bool oldValue = _ResizeHandleVisible;
+                    _ResizeHandleVisible = value;
+                    OnResizeHandleVisibleChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when ResizeHandleVisible property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnResizeHandleVisibleChanged(bool oldValue, bool newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("ResizeHandleVisible"));
+            this.RecalcLayout();
+        }
+
+        protected override void WndProc(ref System.Windows.Forms.Message m)
+        {
+            if (_ResizeHandleVisible && m.Msg == (int)WinApi.WindowsMessages.WM_NCHITTEST)
+            {
+                // Get position being tested...
+                int x = WinApi.LOWORD(m.LParam);
+                int y = WinApi.HIWORD(m.LParam);
+                Point p = PointToClient(new Point(x, y));
+                int resizeHandleWidth = Dpi.Width(ResizeHandleWidth);
+                Rectangle resizeBounds = (this.RightToLeft == System.Windows.Forms.RightToLeft.Yes) ?
+                    new Rectangle(0, this.Height - resizeHandleWidth, resizeHandleWidth, resizeHandleWidth) :
+                    new Rectangle(this.Width - resizeHandleWidth, this.Height - resizeHandleWidth, resizeHandleWidth, resizeHandleWidth);
+                if (resizeBounds.Contains(p))
+                {
+                    m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.TransparentOrCovered);
+                    return;
+                }
+            }
+            base.WndProc(ref m);
+        }
+
+
+        /// <summary>
+        /// Gets or sets spacing between items, default value is 2.
+        /// </summary>
+        [DefaultValue(2), Category("Appearance"), Description("Gets or sets spacing between items.")]
+        public int ItemSpacing
+        {
+            get { return _ItemContainer.ItemSpacing; }
+            set
+            {
+                _ItemContainer.ItemSpacing = value;
+                this.RecalcLayout();
+            }
+        }
+
+        protected override Size DefaultSize
+        {
+            get
+            {
+                return new Size(200, 22);
+            }
+        }
+        #endregion
+
+        #region Licensing
+#if !TRIAL
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            base.OnPaint(e);
+            if (NativeFunctions.keyValidated2 != 266)
+                TextDrawing.DrawString(e.Graphics, "Invalid License", this.Font, Color.FromArgb(180, Color.Red), this.ClientRectangle, eTextFormat.Bottom | eTextFormat.HorizontalCenter);
+        }
+
+        private string _LicenseKey = "";
+        [Browsable(false), DefaultValue("")]
+        public string LicenseKey
+        {
+            get { return _LicenseKey; }
+            set
+            {
+                if (NativeFunctions.ValidateLicenseKey(value))
+                    return;
+                _LicenseKey = (!NativeFunctions.CheckLicenseKey(value) ? "9dsjkhds7" : value);
+            }
+        }
+#endif
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Metro/MetroStatusBar.ico b/PROMS/DotNetBar Source Code/Metro/MetroStatusBar.ico
new file mode 100644
index 00000000..f0e7d1c6
Binary files /dev/null and b/PROMS/DotNetBar Source Code/Metro/MetroStatusBar.ico differ
diff --git a/PROMS/DotNetBar Source Code/Metro/MetroStripContainerItem.cs b/PROMS/DotNetBar Source Code/Metro/MetroStripContainerItem.cs
new file mode 100644
index 00000000..fb7487f3
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Metro/MetroStripContainerItem.cs	
@@ -0,0 +1,679 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Metro
+{
+    /// <summary>
+    /// Defines the internal container item for the ribbon strip control.
+    /// </summary>
+    [System.ComponentModel.ToolboxItem(false), System.ComponentModel.DesignTimeVisible(false)]
+    internal class MetroStripContainerItem : ImageItem, IDesignTimeProvider
+    {
+        #region Private Variables
+        private const string DefaultSettingsButtonText = "<font size=\"7\">SETTINGS</font>";
+        private const string DefaultHelpButtonText = "<font size=\"7\">HELP</font>";
+
+        private MetroTabItemContainer _ItemContainer = null;
+        private CaptionItemContainer _CaptionContainer = null;
+        private SystemCaptionItem _SystemCaptionItem = null;
+        private MetroTabStrip _TabStrip = null;
+        private SystemCaptionItem _WindowIcon = null;
+        private Separator _IconSeparator = null;
+        private ButtonItem _Settings = null;
+        private ButtonItem _Help = null;
+        #endregion
+
+        #region Constructor
+        /// <summary>
+        /// Creates new instance of the class and initializes it with the parent RibbonStrip control.
+        /// </summary>
+        /// <param name="parent">Reference to parent RibbonStrip control</param>
+        public MetroStripContainerItem(MetroTabStrip parent)
+        {
+            _TabStrip = parent;
+
+            // We contain other controls
+            m_IsContainer = true;
+            this.AccessibleRole = System.Windows.Forms.AccessibleRole.Grouping;
+
+            _ItemContainer = new MetroTabItemContainer();
+            _ItemContainer.ContainerControl = parent;
+            _ItemContainer.GlobalItem = false;
+            //_ItemContainer.WrapItems = false;
+            //_ItemContainer.EventHeight = false;
+            //_ItemContainer.UseMoreItemsButton = false;
+            _ItemContainer.Stretch = true;
+            _ItemContainer.Displayed = true;
+            //_ItemContainer.SystemContainer = true;
+            //_ItemContainer.PaddingTop = 0;
+            //_ItemContainer.PaddingBottom = 0;
+            //_ItemContainer.PaddingLeft = 0;
+            //_ItemContainer.ItemSpacing = 1;
+
+            _CaptionContainer = new CaptionItemContainer();
+            _CaptionContainer.ContainerControl = parent;
+            _CaptionContainer.GlobalItem = false;
+            _CaptionContainer.WrapItems = false;
+            _CaptionContainer.EventHeight = false;
+            _CaptionContainer.EqualButtonSize = false;
+            _CaptionContainer.ToolbarItemsAlign = eContainerVerticalAlignment.Top;
+            _CaptionContainer.UseMoreItemsButton = false;
+            _CaptionContainer.Stretch = true;
+            _CaptionContainer.Displayed = true;
+            _CaptionContainer.SystemContainer = true;
+            _CaptionContainer.PaddingBottom = 0;
+            _CaptionContainer.PaddingTop = 0;
+            _CaptionContainer.PaddingLeft = 6;
+            _CaptionContainer.ItemSpacing = 1;
+            _CaptionContainer.TrackSubItemsImageSize = false;
+            _CaptionContainer.ItemAdded += new EventHandler(this.CaptionContainerNewItemAdded);
+            this.SubItems.Add(_CaptionContainer);
+            this.SubItems.Add(_ItemContainer);
+
+            _Settings = new ButtonItem("sysSettingsButton");
+            _Settings.Text=DefaultSettingsButtonText;
+            //_Settings.HotTrackingStyle = eHotTrackingStyle.None;
+            _Settings.ItemAlignment = eItemAlignment.Far;
+            _Settings.Click += new EventHandler(SettingsButtonClick);
+            _Settings.SetSystemItem(true);
+            _Settings.CanCustomize = false;
+            _CaptionContainer.SubItems.Add(_Settings);
+
+            _Help = new ButtonItem("sysHelpButton");
+            _Help.Text = DefaultHelpButtonText;
+            _Help.SetSystemItem(true);
+            _Help.CanCustomize = false;
+            //_Help.HotTrackingStyle = eHotTrackingStyle.None;
+            _Help.ItemAlignment = eItemAlignment.Far;
+            _Help.Click += new EventHandler(HelpButtonClick);
+            _CaptionContainer.SubItems.Add(_Help);
+
+            SystemCaptionItem sc = new SystemCaptionItem();
+            sc.RestoreEnabled = false;
+            sc.IsSystemIcon = false;
+            sc.ItemAlignment = eItemAlignment.Far;
+            _CaptionContainer.SubItems.Add(sc);
+            _SystemCaptionItem = sc;
+        }
+        #endregion
+
+        #region Internal Implementation
+        private void CaptionContainerNewItemAdded(object sender, EventArgs e)
+        {
+            if (sender is BaseItem)
+            {
+                BaseItem item = sender as BaseItem;
+                if (!(item is SystemCaptionItem))
+                {
+                    if (_CaptionContainer.SubItems.Contains(_Settings))
+                    {
+                        _CaptionContainer.SubItems._Remove(_Settings);
+                        _CaptionContainer.SubItems._Add(_Settings);
+                    }
+                    if (_CaptionContainer.SubItems.Contains(_Help))
+                    {
+                        _CaptionContainer.SubItems._Remove(_Help);
+                        _CaptionContainer.SubItems._Add(_Help);
+                    }
+                    if (_CaptionContainer.SubItems.Contains(_SystemCaptionItem))
+                    {
+                        _CaptionContainer.SubItems._Remove(_SystemCaptionItem);
+                        _CaptionContainer.SubItems._Add(_SystemCaptionItem);
+                    }
+                }
+            }
+        }
+
+        private void SettingsButtonClick(object sender, EventArgs e)
+        {
+            MetroTabStrip mts = this.ContainerControl as MetroTabStrip;
+            if (mts == null) return;
+
+            MetroShell tab = mts.Parent as MetroShell;
+            if (tab == null) return;
+
+            tab.InvokeSettingsButtonClick(e);
+        }
+        private void HelpButtonClick(object sender, EventArgs e)
+        {
+            MetroTabStrip mts = this.ContainerControl as MetroTabStrip;
+            if (mts == null) return;
+
+            MetroShell tab = mts.Parent as MetroShell;
+            if (tab == null) return;
+
+            tab.InvokeHelpButtonClick(e);
+        }
+
+        internal void ReleaseSystemFocus()
+        {
+            _ItemContainer.ReleaseSystemFocus();
+            if (_TabStrip.CaptionVisible)
+                _CaptionContainer.ReleaseSystemFocus();
+        }
+
+        public override void ContainerLostFocus(bool appLostFocus)
+        {
+            base.ContainerLostFocus(appLostFocus);
+            _ItemContainer.ContainerLostFocus(appLostFocus);
+            if (_TabStrip.CaptionVisible)
+                _CaptionContainer.ContainerLostFocus(appLostFocus);
+        }
+
+        internal void SetSystemFocus()
+        {
+            if (_TabStrip.CaptionVisible && _ItemContainer.ExpandedItem()==null)
+                _CaptionContainer.SetSystemFocus();
+            else
+                _ItemContainer.SetSystemFocus();
+        }
+
+        /// <summary>
+		/// Paints this base container
+		/// </summary>
+        public override void Paint(ItemPaintArgs pa)
+        {
+            if (this.SuspendLayout)
+                return;
+
+            _ItemContainer.Paint(pa);
+            if (_TabStrip.CaptionVisible)
+                _CaptionContainer.Paint(pa);
+        }
+
+        public override void RecalcSize()
+        {
+            if (this.SuspendLayout)
+                return;
+            _ItemContainer.Bounds = GetItemContainerBounds();
+            _ItemContainer.RecalcSize();
+            if (_ItemContainer.HeightInternal < 0) _ItemContainer.HeightInternal = 0;
+            bool isMaximized = false;
+            if (_TabStrip.CaptionVisible)
+            {
+                _CaptionContainer.Bounds = GetCaptionContainerBounds();
+                _CaptionContainer.RecalcSize();
+                Size frameBorderSize = SystemInformation.FrameBorderSize;
+                Control container = this.ContainerControl as Control;
+                if (container != null)
+                {
+                    Form form = container.FindForm();
+                    if (form != null)
+                    {
+                        if (_WindowIcon != null)
+                            _WindowIcon.SetVisibleDirect(form.ShowIcon && _TabStrip.ShowIcon);
+                        if (_IconSeparator != null)
+                            _IconSeparator.SetVisibleDirect(form.ShowIcon && _TabStrip.ShowIcon);
+                    }
+                    MetroAppForm appForm = form as MetroAppForm;
+                    if (appForm != null)
+                    {
+                        NonClientInfo nci = appForm.GetNonClientInfo();
+                        frameBorderSize.Width = nci.LeftBorder;
+                        frameBorderSize.Height = nci.BottomBorder;
+                    }
+                }
+                if (_TabStrip.CaptionHeight == 0 && _SystemCaptionItem.TopInternal < (frameBorderSize.Height - 1))
+                {
+                    Control c = this.ContainerControl as Control;
+                    Form form = null;
+                    if (c != null) form = c.FindForm();
+                    if (form != null && form.WindowState == FormWindowState.Maximized)
+                        isMaximized = true;
+
+                    if (isMaximized)
+                    {
+                        _SystemCaptionItem.TopInternal = 1;
+                        if (_WindowIcon != null) _WindowIcon.TopInternal = 1;
+                    }
+                    else
+                    {
+                        _SystemCaptionItem.TopInternal = Math.Max(1,frameBorderSize.Height - 6);
+                        if (_WindowIcon != null) _WindowIcon.TopInternal = frameBorderSize.Height - 5;
+                    }
+                }
+                
+                // Adjust the Y position of the items inside of the caption container since they are top aligned and
+                // quick access toolbar items should be aligned with the bottom of the system caption item.
+                if (System.Environment.OSVersion.Version.Major >= 6)
+                {
+                    int topOffset = 3;
+                    if (isMaximized)
+                        topOffset += 1;
+                    int maxBottom = 0;
+                    foreach (BaseItem item in _CaptionContainer.SubItems)
+                    {
+                        if (!(item is ApplicationButton || item is DevComponents.DotNetBar.Metro.MetroAppButton) && item != _SystemCaptionItem && item != _IconSeparator)
+                            item.TopInternal += topOffset;
+                        else if (item == _IconSeparator)
+                            item.TopInternal += (isMaximized ? 2 : 1);
+                        maxBottom = Math.Max(item.Bounds.Bottom, maxBottom);
+                    }
+                    if (_CaptionContainer.MoreItems != null)
+                        _CaptionContainer.MoreItems.TopInternal += topOffset;
+                    if (maxBottom > _CaptionContainer.HeightInternal) _CaptionContainer.SetDisplayRectangle(new Rectangle(_CaptionContainer.Bounds.X, _CaptionContainer.Bounds.Y, _CaptionContainer.Bounds.Width, maxBottom));
+                }
+                else
+                {
+                    int maxBottom = 0;
+                    foreach (BaseItem item in _CaptionContainer.SubItems)
+                    {
+                        if (item.HeightInternal < _SystemCaptionItem.HeightInternal && (item != _IconSeparator && item!= _WindowIcon))
+                        {
+                            //item.TopInternal += (m_SystemCaptionItem.HeightInternal - item.HeightInternal);
+                            item.TopInternal = (_SystemCaptionItem.Bounds.Bottom - (item.HeightInternal + ((item is LabelItem) ? 2 : 0)));
+                            maxBottom = Math.Max(item.Bounds.Bottom, maxBottom);
+                        }
+                    }
+                    if (_CaptionContainer.MoreItems != null)
+                        _CaptionContainer.MoreItems.TopInternal += (_SystemCaptionItem.HeightInternal - _CaptionContainer.MoreItems.HeightInternal);
+                    if (maxBottom > _CaptionContainer.HeightInternal) _CaptionContainer.SetDisplayRectangle(new Rectangle(_CaptionContainer.Bounds.X, _CaptionContainer.Bounds.Y, _CaptionContainer.Bounds.Width, maxBottom));
+                }
+
+                if (_ItemContainer.HeightInternal == 0)
+                    this.HeightInternal = _CaptionContainer.HeightInternal;
+                else
+                    this.HeightInternal = _ItemContainer.Bounds.Bottom;// -m_CaptionContainer.Bounds.Top;
+            }
+            else
+            {
+                int h = _ItemContainer.HeightInternal;
+                this.HeightInternal = h;
+            }
+
+            base.RecalcSize();
+        }
+
+        private Rectangle GetItemContainerBounds()
+        {
+            return _TabStrip.GetItemContainerBounds();
+        }
+
+        private Rectangle GetCaptionContainerBounds()
+        {
+            return _TabStrip.GetCaptionContainerBounds();
+        }
+
+        /// <summary>
+        /// Gets reference to internal ribbon strip container that contains tabs and/or other items.
+        /// </summary>
+        public SimpleItemContainer RibbonStripContainer
+        {
+            get { return _ItemContainer; }
+        }
+
+        /// <summary>
+        /// Gets reference to internal caption container item that contains the quick toolbar, start button and system caption item.
+        /// </summary>
+        public GenericItemContainer CaptionContainer
+        {
+            get { return _CaptionContainer; }
+        }
+
+        public SystemCaptionItem SystemCaptionItem
+        {
+            get { return _SystemCaptionItem; }
+        }
+
+        /// <summary>
+        /// Returns copy of GenericItemContainer item
+        /// </summary>
+        public override BaseItem Copy()
+        {
+            MetroStripContainerItem objCopy = new MetroStripContainerItem(_TabStrip);
+            this.CopyToItem(objCopy);
+
+            return objCopy;
+        }
+        protected override void CopyToItem(BaseItem copy)
+        {
+            MetroStripContainerItem objCopy = copy as MetroStripContainerItem;
+            base.CopyToItem(objCopy);
+        }
+
+
+        public override void InternalClick(MouseButtons mb, Point mpos)
+        {
+            _ItemContainer.InternalClick(mb, mpos);
+            if (_TabStrip.CaptionVisible) _CaptionContainer.InternalClick(mb, mpos);
+        }
+
+        public override void InternalDoubleClick(MouseButtons mb, Point mpos)
+        {
+            _ItemContainer.InternalDoubleClick(mb, mpos);
+            if (_TabStrip.CaptionVisible) _CaptionContainer.InternalDoubleClick(mb, mpos);
+        }
+
+        public override void InternalMouseDown(MouseEventArgs objArg)
+        {
+            _ItemContainer.InternalMouseDown(objArg);
+            if (_TabStrip.CaptionVisible)
+            {
+                if(this.DesignMode && _CaptionContainer.ItemAtLocation(objArg.X, objArg.Y)!=null || !this.DesignMode)
+                    _CaptionContainer.InternalMouseDown(objArg);
+            }
+        }
+
+        public override void InternalMouseHover()
+        {
+            _ItemContainer.InternalMouseHover();
+            if (_TabStrip.CaptionVisible) _CaptionContainer.InternalMouseHover();
+        }
+
+        public override void InternalMouseLeave()
+        {
+            _ItemContainer.InternalMouseLeave();
+            if (_TabStrip.CaptionVisible) _CaptionContainer.InternalMouseLeave();
+        }
+
+        public override void InternalMouseMove(MouseEventArgs objArg)
+        {
+            _ItemContainer.InternalMouseMove(objArg);
+            if (_TabStrip.CaptionVisible) _CaptionContainer.InternalMouseMove(objArg);
+        }
+
+        public override void InternalMouseUp(MouseEventArgs objArg)
+        {
+            _ItemContainer.InternalMouseUp(objArg);
+            if (_TabStrip.CaptionVisible) _CaptionContainer.InternalMouseUp(objArg);
+        }
+
+        public override void InternalKeyDown(KeyEventArgs objArg)
+        {
+            BaseItem expanded = this.ExpandedItem();
+            if (expanded == null)
+                expanded = _CaptionContainer.ExpandedItem();
+            if (expanded == null)
+                expanded = _ItemContainer.ExpandedItem();
+
+            if (expanded == null || !_TabStrip.CaptionVisible)
+            {
+                _ItemContainer.InternalKeyDown(objArg);
+                if (!objArg.Handled && _TabStrip.CaptionVisible)
+                    _CaptionContainer.InternalKeyDown(objArg);
+            }
+            else
+            {
+                if (expanded.Parent == _ItemContainer)
+                {
+                    _ItemContainer.InternalKeyDown(objArg);
+                }
+                else
+                {
+                    _CaptionContainer.InternalKeyDown(objArg);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Return Sub Item at specified location
+        /// </summary>
+        public override BaseItem ItemAtLocation(int x, int y)
+        {
+            if (_ItemContainer.DisplayRectangle.Contains(x, y))
+                return _ItemContainer.ItemAtLocation(x, y);
+
+            if (_CaptionContainer.DisplayRectangle.Contains(x, y))
+                return _CaptionContainer.ItemAtLocation(x, y);
+
+            return null;
+        }
+
+        protected override void OnStyleChanged()
+        {
+            eDotNetBarStyle effectiveStyle = this.EffectiveStyle;
+            if (effectiveStyle == eDotNetBarStyle.Office2010)
+            {
+                if (_WindowIcon == null)
+                {
+                    _IconSeparator = new Separator("sys_caption_separator");
+                    _IconSeparator.SetSystemItem(true);
+                    _IconSeparator.DesignTimeVisible = false;
+                    _IconSeparator.CanCustomize = false;
+                    _CaptionContainer.SubItems._Add(_IconSeparator, 0);
+                    _WindowIcon = new SystemCaptionItem();
+                    _WindowIcon.Name = "sys_caption_icon";
+                    _WindowIcon.Enabled = false;
+                    _WindowIcon.Style = this.Style;
+                    _WindowIcon.IsSystemIcon = true;
+                    _WindowIcon.DesignTimeVisible = false;
+                    _WindowIcon.CanCustomize = false;
+                    _WindowIcon.QueryIconOnPaint = true;
+                    _WindowIcon.MouseDown += WindowIconMouseDown;
+                    _WindowIcon.DoubleClick += WindowIconDoubleClick;
+                    _CaptionContainer.SubItems._Add(_WindowIcon, 0);
+                }
+            }
+            else if (effectiveStyle == eDotNetBarStyle.Windows7)
+            {
+                if (_WindowIcon == null)
+                {
+                    _IconSeparator = new Separator("sys_caption_separator");
+                    _IconSeparator.FixedSize = new Size(3, 12);
+                    _IconSeparator.SetSystemItem(true);
+                    _IconSeparator.DesignTimeVisible = false;
+                    _IconSeparator.CanCustomize = false;
+                    _CaptionContainer.SubItems._Add(_IconSeparator, 0);
+                    _WindowIcon = new SystemCaptionItem();
+                    _WindowIcon.Name = "sys_caption_icon";
+                    _WindowIcon.Enabled = false;
+                    _WindowIcon.Style = this.Style;
+                    _WindowIcon.IsSystemIcon = true;
+                    _WindowIcon.QueryIconOnPaint = true;
+                    _WindowIcon.DesignTimeVisible = false;
+                    _WindowIcon.CanCustomize = false;
+                    _WindowIcon.MouseDown += WindowIconMouseDown;
+                    _CaptionContainer.SubItems._Add(_WindowIcon, 0);
+                }
+            }
+            else if (StyleManager.IsMetro(effectiveStyle))
+            {
+                if (_WindowIcon == null)
+                {
+                    _IconSeparator = new Separator("sys_caption_separator");
+                    _IconSeparator.FixedSize = new Size(3, 14);
+                    _IconSeparator.SetSystemItem(true);
+                    _IconSeparator.DesignTimeVisible = false;
+                    _IconSeparator.CanCustomize = false;
+                    _CaptionContainer.SubItems._Add(_IconSeparator, 0);
+                    _WindowIcon = new SystemCaptionItem();
+                    _WindowIcon.Name = "sys_caption_icon";
+                    _WindowIcon.Enabled = false;
+                    _WindowIcon.Style = this.Style;
+                    _WindowIcon.IsSystemIcon = true;
+                    _WindowIcon.DesignTimeVisible = false;
+                    _WindowIcon.CanCustomize = false;
+                    _WindowIcon.QueryIconOnPaint = true;
+                    _WindowIcon.MouseDown += WindowIconMouseDown;
+                    _WindowIcon.DoubleClick += WindowIconDoubleClick;
+                    _CaptionContainer.SubItems._Add(_WindowIcon, 0);
+                }
+            }
+            else if (_WindowIcon != null)
+            {
+                if (_CaptionContainer.SubItems.Contains(_WindowIcon))
+                    _CaptionContainer.SubItems._Remove(_WindowIcon);
+                _WindowIcon.MouseDown -= WindowIconMouseDown;
+                _WindowIcon.DoubleClick -= WindowIconDoubleClick;
+                _WindowIcon.Dispose();
+                _WindowIcon = null;
+                if (_CaptionContainer.SubItems.Contains(_IconSeparator))
+                    _CaptionContainer.SubItems._Remove(_IconSeparator);
+                _IconSeparator.Dispose();
+                _IconSeparator = null;
+            }
+            base.OnStyleChanged();
+        }
+
+        void WindowIconDoubleClick(object sender, EventArgs e)
+        {
+            if (_TabStrip != null) 
+            {
+                _TabStrip.CloseParentForm();
+            }
+        }
+
+        void WindowIconMouseDown(object sender, MouseEventArgs e)
+        {
+            MetroTabStrip mts = this.ContainerControl as MetroTabStrip;
+            if (mts != null)
+            {
+                Point p = new Point(_WindowIcon.LeftInternal, _WindowIcon.Bounds.Bottom + 1);
+                p = mts.PointToScreen(p);
+                mts.ShowSystemMenu(p);
+            }
+        }
+        #endregion
+
+        #region IDesignTimeProvider Members
+
+        public InsertPosition GetInsertPosition(Point pScreen, BaseItem DragItem)
+        {
+            InsertPosition pos = _ItemContainer.GetInsertPosition(pScreen, DragItem);
+            if(pos==null && _TabStrip.CaptionVisible)
+                pos = _CaptionContainer.GetInsertPosition(pScreen, DragItem);
+            return pos;
+        }
+
+        public void DrawReversibleMarker(int iPos, bool Before)
+        {
+            //DesignTimeProviderContainer.DrawReversibleMarker(this, iPos, Before);
+        }
+
+        public void InsertItemAt(BaseItem objItem, int iPos, bool Before)
+        {
+            //DesignTimeProviderContainer.InsertItemAt(this, objItem, iPos, Before);
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the item is expanded or not. For Popup items this would indicate whether the item is popped up or not.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), System.ComponentModel.DefaultValue(false), System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
+        public override bool Expanded
+        {
+            get
+            {
+                return base.Expanded;
+            }
+            set
+            {
+                base.Expanded = value;
+                if (!value)
+                {
+                    foreach (BaseItem item in this.SubItems)
+                        item.Expanded = false;
+                }
+            }
+        }
+
+        /// <summary>
+        /// When parent items does recalc size for its sub-items it should query
+        /// image size and store biggest image size into this property.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden), System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+        public override System.Drawing.Size SubItemsImageSize
+        {
+            get
+            {
+                return base.SubItemsImageSize;
+            }
+            set
+            {
+                //m_SubItemsImageSize = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether Settings button is visible.
+        /// </summary>
+        public bool SettingsButtonVisible
+        {
+            get { return _Settings.Visible; }
+            set
+            {
+                if (value != _Settings.Visible)
+                {
+                    _Settings.Visible = value;
+                    this.RecalcSize();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether Help button is visible.
+        /// </summary>
+        public bool HelpButtonVisible
+        {
+            get { return _Help.Visible; }
+            set
+            {
+                if (value != _Help.Visible)
+                {
+                    _Help.Visible = value;
+                    this.RecalcSize();
+                }
+            }
+        }
+
+        private string _SettingsButtonText = "";
+        /// <summary>
+        /// Gets or sets the Settings button text.
+        /// </summary>
+        public string SettingsButtonText
+        {
+            get { return _SettingsButtonText; }
+            set
+            {
+                if (value != _SettingsButtonText)
+                {
+                    string oldValue = _SettingsButtonText;
+                    _SettingsButtonText = value;
+                    OnSettingsButtonTextChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when SettingsButtonText property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnSettingsButtonTextChanged(string oldValue, string newValue)
+        {
+            if (string.IsNullOrEmpty(newValue))
+                _Settings.Text = DefaultSettingsButtonText;
+            else
+                _Settings.Text = "<font size=\"7\">" + newValue + "</font>";
+        }
+
+        private string _HelpButtonText;
+        public string HelpButtonText
+        {
+            get { return _HelpButtonText; }
+            set
+            {
+                if (value != _HelpButtonText)
+                {
+                    string oldValue = _HelpButtonText;
+                    _HelpButtonText = value;
+                    OnHelpButtonTextChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when HelpButtonText property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnHelpButtonTextChanged(string oldValue, string newValue)
+        {
+            if (string.IsNullOrEmpty(newValue))
+                _Help.Text = DefaultHelpButtonText;
+            else
+                _Help.Text = "<font size=\"7\">" + newValue + "</font>";
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Metro/MetroTabItem.cs b/PROMS/DotNetBar Source Code/Metro/MetroTabItem.cs
new file mode 100644
index 00000000..4514816c
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Metro/MetroTabItem.cs	
@@ -0,0 +1,742 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel;
+using System.Drawing;
+using DevComponents.DotNetBar.Metro.Rendering;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Metro
+{
+    /// <summary>
+    /// Represents Rendering Tab used on Metro Tab Control.
+    /// </summary>
+    [ToolboxItem(false), DesignTimeVisible(false), Designer("DevComponents.DotNetBar.Design.MetroTabItemDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+    public class MetroTabItem:ButtonItem
+	{
+		#region Private Variables & Constructor
+		private MetroTabPanel _Panel=null;
+        private eMetroTabColor _ColorTable = eMetroTabColor.Default; private string _CashedColorTableName = "Default";
+        private bool _ReducedSize = false;
+        private int _PaddingHorizontal = 0;
+        /// <summary>
+        /// Initializes a new instance of the MetroTabItem class.
+        /// </summary>
+        public MetroTabItem()
+        {
+            this.ButtonStyle = eButtonStyle.ImageAndText;
+        }
+        #endregion
+
+        #region Internal Implementation
+        public override void Paint(ItemPaintArgs p)
+        {
+            MetroRender.Paint(this, p);
+
+            if (!string.IsNullOrEmpty(NotificationMarkText))
+                DevComponents.DotNetBar.Rendering.NotificationMarkPainter.Paint(p.Graphics, this.Bounds, NotificationMarkPosition,
+                    NotificationMarkText, new Size(NotificationMarkSize, NotificationMarkSize), NotificationMarkOffset, NotificationMarkColor);
+        }
+
+        public override void RecalcSize()
+        {
+            _ImageRenderBounds = Rectangle.Empty;
+            _TextRenderBounds = Rectangle.Empty;
+            base.RecalcSize();
+        }
+
+        private Rectangle _ImageRenderBounds = Rectangle.Empty;
+        /// <summary>
+        /// Gets or sets cached image rendering bounds.
+        /// </summary>
+        internal Rectangle ImageRenderBounds
+        {
+            get { return _ImageRenderBounds; }
+            set { _ImageRenderBounds = value; }
+        }
+
+        private Rectangle _TextRenderBounds = Rectangle.Empty;
+        /// <summary>
+        /// Gets or sets cached text rendering bounds.
+        /// </summary>
+        internal Rectangle TextRenderBounds
+        {
+            get { return _TextRenderBounds; }
+            set { _TextRenderBounds = value;}
+        }
+
+        private bool _RenderTabState = true;
+        /// <summary>
+        /// Gets or sets whether tab renders its state. Used internally by DotNetBar. Do not set.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never), Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        internal bool RenderTabState
+        {
+            get { return _RenderTabState; }
+            set
+            {
+                _RenderTabState = value;
+                if (this.ContainerControl is System.Windows.Forms.Control)
+                    ((System.Windows.Forms.Control)this.ContainerControl).Invalidate();
+                else
+                    this.Refresh();
+            }
+        }
+
+        protected override bool IsFadeEnabled
+        {
+            get
+            {
+                return false;
+            }
+        }
+        /// <summary>
+        /// Gets or sets the additional padding added around the tab item in pixels. Default value is 0.
+        /// </summary>
+        [Browsable(true), DefaultValue(0), Category("Layout"), Description("Indicates additional padding added around the tab item in pixels.")]
+        public int PaddingHorizontal
+        {
+            get { return _PaddingHorizontal; }
+            set
+            {
+                _PaddingHorizontal = value;
+                UpdateTabAppearance();
+            }
+        }
+
+        /// <summary>
+        /// Selects the tab.
+        /// </summary>
+        public void Select()
+        {
+            this.Checked = true;
+        }
+        /// <summary>
+        /// Gets or sets whether size of the tab has been reduced below the default calculated size.
+        /// </summary>
+        internal bool ReducedSize
+        {
+            get { return _ReducedSize; }
+            set { _ReducedSize = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the predefined color of item. Color specified here applies to items with Office 2007 style only. It does not have
+        /// any effect on other styles. Default value is eMetroTabColor.Default
+        /// </summary>
+        [Browsable(true), DefaultValue(eMetroTabColor.Default), Category("Appearance"), Description("Indicates predefined color of item when Office 2007 style is used.")]
+        public new eMetroTabColor ColorTable
+        {
+            get { return _ColorTable; }
+            set
+            {
+                if (_ColorTable != value)
+                {
+                    _ColorTable = value;
+                    _CashedColorTableName = Enum.GetName(typeof(eMetroTabColor), _ColorTable);
+                    this.Refresh();
+                }
+            }
+        }
+
+        internal override string GetColorTableName()
+        {
+            return this.CustomColorName != "" ? this.CustomColorName : _CashedColorTableName;
+        }
+
+		/// <summary>
+		/// Gets or sets the panel assigned to this tab item.
+		/// </summary>
+		[Browsable(false),DefaultValue(null)]
+		public MetroTabPanel Panel
+		{
+			get {return _Panel;}
+			set
+			{
+				_Panel=value;
+				OnPanelChanged();
+			}
+		}
+
+		private void OnPanelChanged()
+		{
+			ChangePanelVisibility();
+		}
+
+		/// <summary>
+		/// Called after Checked property has changed.
+		/// </summary>
+		protected override void OnCheckedChanged()
+		{
+            if(this.Checked && this.Parent!=null)
+			{
+                ChangePanelVisibility();
+				foreach(BaseItem item in this.Parent.SubItems)
+				{
+					if(item==this)
+						continue;
+                    MetroTabItem b = item as MetroTabItem;
+                    if (b != null && b.Checked)
+                    {
+                        if (this.DesignMode)
+                            TypeDescriptor.GetProperties(b)["Checked"].SetValue(b, false);
+                        else
+                            b.Checked = false;
+                    }
+				}
+			}
+
+            if (BarFunctions.IsOffice2007Style(this.EffectiveStyle) && this.ContainerControl is System.Windows.Forms.Control)
+                ((System.Windows.Forms.Control)this.ContainerControl).Invalidate();
+            if(!this.Checked)
+                ChangePanelVisibility();
+            InvokeCheckedChanged();
+		}
+
+		private void ChangePanelVisibility()
+		{
+			if(this.Checked && _Panel!=null)
+			{
+                if (this.DesignMode)
+                {
+                    if (!_Panel.Visible) _Panel.Visible = true;
+                    TypeDescriptor.GetProperties(_Panel)["Visible"].SetValue(_Panel, true);
+                    _Panel.BringToFront();
+                }
+                else
+                {
+                    if (!_Panel.IsDisposed)
+                    {
+                        // Following 3 lines reduce flashing of panel's child controls when Dock panel is shown
+                        System.Windows.Forms.DockStyle oldDock = _Panel.Dock;
+                        _Panel.Dock = System.Windows.Forms.DockStyle.None;
+                        _Panel.Location = new Point(-32000, 32000);
+                        _Panel.Enabled = true;
+                        _Panel.Visible = true;
+                        _Panel.BringToFront();
+                        if (_Panel.Dock != oldDock)
+                            _Panel.Dock = oldDock;
+                    }
+                    
+                }
+			}
+			else if(!this.Checked && _Panel!=null && !_Panel.IsPopupMode) // Panels in popup mode will be taken care of by Ribbon
+			{
+                if (this.DesignMode)
+                    TypeDescriptor.GetProperties(_Panel)["Visible"].SetValue(_Panel, false);
+                else
+                {
+                    _Panel.Visible = false;
+                    _Panel.Enabled = false;
+                }
+			}
+		}
+
+        /// <summary>
+        /// Occurs just before Click event is fired.
+        /// </summary>
+        protected override void OnClick()
+        {
+            base.OnClick();
+            if (!this.Checked)
+            {
+                if (this.DesignMode)
+                    TypeDescriptor.GetProperties(this)["Checked"].SetValue(this, true);
+                else
+                {
+                    MetroShell shell = GetMetroShell();
+                    if (shell != null && !shell.ValidateChildren())
+                        return;
+                    this.Checked = true;
+                }
+            }
+        }
+        private MetroShell GetMetroShell()
+        {
+            MetroTabStrip strip = this.ContainerControl as MetroTabStrip;
+            if (strip == null) return null;
+            return strip.Parent as MetroShell;
+        }
+        /// <summary>
+		/// Called when Visibility of the items has changed.
+		/// </summary>
+		/// <param name="bVisible">New Visible state.</param>
+		protected internal override void OnVisibleChanged(bool bVisible)
+		{
+			base.OnVisibleChanged(bVisible);
+			if(!bVisible && this.Checked)
+			{
+				TypeDescriptor.GetProperties(this)["Checked"].SetValue(this,false);
+				// Try to check first item in the group
+				if(this.Parent!=null)
+				{
+					foreach(BaseItem item in this.Parent.SubItems)
+					{
+                        if (item == this || !item.GetEnabled() || !item.Visible)
+							continue;
+						MetroTabItem b=item as MetroTabItem;
+						if(b!=null)
+						{
+							TypeDescriptor.GetProperties(b)["Checked"].SetValue(this,true);
+							break;
+						}
+					}
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or set the Group item belongs to. The groups allows a user to choose from mutually exclusive options within the group. The choice is reflected by Checked property.
+		/// </summary>
+		[Browsable(false),DevCoBrowsable(false),DefaultValue(""),EditorBrowsable(EditorBrowsableState.Never)]
+		public override string OptionGroup
+		{
+			get {return base.OptionGroup;}
+			set {base.OptionGroup=value;}
+		}
+
+		/// <summary>
+		/// Occurs after item visual style has changed.
+		/// </summary>
+		protected override void OnStyleChanged()
+		{
+			base.OnStyleChanged();
+            UpdateTabAppearance();
+		}
+
+        private void UpdateTabAppearance()
+        {
+            if (StyleManager.Style == eStyle.OfficeMobile2014 || StyleManager.Style == eStyle.Office2016)
+            {
+                this.VerticalPadding = 5;
+                this.HorizontalPadding = 16 + _PaddingHorizontal;
+            }
+            else
+            {
+                this.VerticalPadding = 1;
+                this.HorizontalPadding = 16 + _PaddingHorizontal;
+            }
+
+            this.NeedRecalcSize = true;
+            this.OnAppearanceChanged();
+        }
+
+		/// <summary>
+		/// Returns the collection of sub items.
+		/// </summary>
+		[Browsable(false),DevCoBrowsable(false),DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Content)]
+		public override SubItemsCollection SubItems
+		{
+			get {return base.SubItems;}
+		}
+
+        internal override void DoAccesibleDefaultAction()
+        {
+            this.Checked = true;
+        }
+
+        protected override void Invalidate(System.Windows.Forms.Control containerControl)
+        {
+            Rectangle r = m_Rect;
+            r.Width++;
+            r.Height++;
+            if (containerControl.InvokeRequired)
+                containerControl.BeginInvoke(new MethodInvoker(delegate { containerControl.Invalidate(r, true); }));
+            else
+                containerControl.Invalidate(r, true);
+        }
+
+        public override bool UseParentSubItemsImageSize
+        {
+            get
+            {
+                return false;
+            }
+        }
+		#endregion
+
+		#region Hidden Properties
+		/// <summary>
+		/// Indicates whether the item will auto-collapse (fold) when clicked. 
+		/// When item is on popup menu and this property is set to false, menu will not
+		/// close when item is clicked.
+		/// </summary>
+        [Browsable(false), DevCoBrowsable(false), EditorBrowsable(EditorBrowsableState.Never), Category("Behavior"), DefaultValue(true), Description("Indicates whether the item will auto-collapse (fold) when clicked.")]
+		public override bool AutoCollapseOnClick
+		{
+			get
+			{
+				return base.AutoCollapseOnClick;
+			}
+			set
+			{
+				base.AutoCollapseOnClick=value;
+			}
+		}
+
+		/// <summary>
+		/// Indicates whether the item will auto-expand when clicked. 
+		/// When item is on top level bar and not on menu and contains sub-items, sub-items will be shown only if user
+		/// click the expand part of the button. Setting this propert to true will expand the button and show sub-items when user
+		/// clicks anywhere inside of the button. Default value is false which indicates that button is expanded only
+		/// if its expand part is clicked.
+		/// </summary>
+        [DefaultValue(false), Browsable(false), EditorBrowsable(EditorBrowsableState.Never), DevCoBrowsable(false), Category("Behavior"), Description("Indicates whether the item will auto-collapse (fold) when clicked.")]
+		public override bool AutoExpandOnClick
+		{
+			get
+			{
+				return base.AutoExpandOnClick;
+			}
+			set
+			{
+				base.AutoExpandOnClick=value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets whether item can be customized by end user.
+		/// </summary>
+        [Browsable(false), DevCoBrowsable(false), EditorBrowsable(EditorBrowsableState.Never), DefaultValue(true), System.ComponentModel.Category("Behavior"), System.ComponentModel.Description("Indicates whether item can be customized by user.")]
+		public override bool CanCustomize
+		{
+			get
+			{
+				return base.CanCustomize;
+			}
+			set
+			{
+				base.CanCustomize=value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or set a value indicating whether the button is in the checked state.
+		/// </summary>
+		[Browsable(false),DevCoBrowsable(false),Category("Appearance"),Description("Indicates whether item is checked or not."),DefaultValue(false)]
+		public override bool Checked
+		{
+			get
+			{
+				return base.Checked;
+			}
+			set
+			{
+				base.Checked=value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets whether Click event will be auto repeated when mouse button is kept pressed over the item.
+		/// </summary>
+        [Browsable(false), DevCoBrowsable(false), EditorBrowsable(EditorBrowsableState.Never), DefaultValue(false), Category("Behavior"), Description("Gets or sets whether Click event will be auto repeated when mouse button is kept pressed over the item.")]
+		public override bool ClickAutoRepeat
+		{
+			get
+			{
+				return base.ClickAutoRepeat;
+			}
+			set
+			{
+				base.ClickAutoRepeat=value;                
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the auto-repeat interval for the click event when mouse button is kept pressed over the item.
+		/// </summary>
+        [Browsable(false), DevCoBrowsable(false), EditorBrowsable(EditorBrowsableState.Never), DefaultValue(600), Category("Behavior"), Description("Gets or sets the auto-repeat interval for the click event when mouse button is kept pressed over the item.")]
+		public override int ClickRepeatInterval
+		{
+			get
+			{
+				return base.ClickRepeatInterval;
+			}
+			set
+			{
+				base.ClickRepeatInterval=value;                
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets a value indicating whether the item is enabled.
+		/// </summary>
+		[Browsable(false),DevCoBrowsable(false),DefaultValue(true),Category("Behavior"),Description("Indicates whether is item enabled.")]
+		public override bool Enabled
+		{
+			get
+			{
+				return base.Enabled;
+			}
+			set
+			{
+				base.Enabled=value;
+			}
+		}
+
+		/// <summary>
+		/// Indicates item's visiblity when on pop-up menu.
+		/// </summary>
+        [Browsable(false), DevCoBrowsable(false), EditorBrowsable(EditorBrowsableState.Never), Category("Appearance"), Description("Indicates item's visiblity when on pop-up menu."), DefaultValue(eMenuVisibility.VisibleAlways)]
+		public override eMenuVisibility MenuVisibility
+		{
+			get
+			{
+				return base.MenuVisibility;
+			}
+			set
+			{
+				base.MenuVisibility=value;
+			}
+		}
+
+		/// <summary>
+		/// Indicates when menu items are displayed when MenuVisiblity is set to VisibleIfRecentlyUsed and RecentlyUsed is true.
+		/// </summary>
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never), DevCoBrowsable(false), Category("Appearance"), Description("Indicates when menu items are displayed when MenuVisiblity is set to VisibleIfRecentlyUsed and RecentlyUsed is true."), DefaultValue(ePersonalizedMenus.Disabled)]
+		public override ePersonalizedMenus PersonalizedMenus
+		{
+			get
+			{
+				return base.PersonalizedMenus;
+			}
+			set
+			{
+				base.PersonalizedMenus=value;
+			}
+		}
+
+		/// <summary>
+		/// Indicates Animation type for Popups.
+		/// </summary>
+        [Browsable(false), DevCoBrowsable(false), EditorBrowsable(EditorBrowsableState.Never), Category("Behavior"), Description("Indicates Animation type for Popups."), DefaultValue(ePopupAnimation.ManagerControlled)]
+		public override ePopupAnimation PopupAnimation
+		{
+			get
+			{
+				return base.PopupAnimation;
+			}
+			set
+			{
+				base.PopupAnimation=value;
+			}
+		}
+
+		/// <summary>
+		/// Indicates the font that will be used on the popup window.
+		/// </summary>
+        [Browsable(false), DevCoBrowsable(false), EditorBrowsable(EditorBrowsableState.Never), Category("Appearance"), Description("Indicates the font that will be used on the popup window."), DefaultValue(null)]
+		public override System.Drawing.Font PopupFont
+		{
+			get
+			{
+				return base.PopupFont;
+			}
+			set
+			{
+				base.PopupFont=value;
+			}
+		}
+
+		/// <summary>
+		/// Indicates whether sub-items are shown on popup Bar or popup menu.
+		/// </summary>
+        [Browsable(false), DevCoBrowsable(false), EditorBrowsable(EditorBrowsableState.Never), Category("Appearance"), Description("Indicates whether sub-items are shown on popup Bar or popup menu."), DefaultValue(ePopupType.Menu)]
+		public override ePopupType PopupType
+		{
+			get
+			{
+				return base.PopupType;
+			}
+			set
+			{
+				base.PopupType=value;
+			}
+		}
+
+		/// <summary>
+		/// Specifies the inital width for the Bar that hosts pop-up items. Applies to PopupType.Toolbar only.
+		/// </summary>
+        [Browsable(false), DevCoBrowsable(false), EditorBrowsable(EditorBrowsableState.Never), Category("Layout"), Description("Specifies the inital width for the Bar that hosts pop-up items. Applies to PopupType.Toolbar only."), DefaultValue(200)]
+		public override int PopupWidth
+		{
+			get
+			{
+				return base.PopupWidth;
+			}
+			set
+			{
+				base.PopupWidth=value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets whether item will display sub items.
+		/// </summary>
+        [Browsable(false), DevCoBrowsable(false), EditorBrowsable(EditorBrowsableState.Never), DefaultValue(true), Category("Behavior"), Description("Determines whether sub-items are displayed.")]
+		public override bool ShowSubItems
+		{
+			get
+			{
+				return base.ShowSubItems;
+			}
+			set
+			{
+				base.ShowSubItems=value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets whether the item expands automatically to fill out the remaining space inside the container. Applies to Items on stretchable, no-wrap Bars only.
+		/// </summary>
+        [Browsable(false), DevCoBrowsable(false), EditorBrowsable(EditorBrowsableState.Never), DefaultValue(false), Category("Appearance"), Description("Indicates whether item will stretch to consume empty space. Items on stretchable, no-wrap Bars only.")]
+		public override bool Stretch
+		{
+			get
+			{
+				return base.Stretch;
+			}
+			set
+			{
+				base.Stretch=value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the width of the expand part of the button item.
+		/// </summary>
+        [Browsable(false), DevCoBrowsable(false), EditorBrowsable(EditorBrowsableState.Never), Category("Behavior"), Description("Indicates the width of the expand part of the button item."), DefaultValue(12)]
+		public override int SubItemsExpandWidth
+		{
+			get {return base.SubItemsExpandWidth;}
+			set
+			{
+				base.SubItemsExpandWidth=value;
+			}
+		}
+
+        /// <summary>
+        /// Gets or set the alternative shortcut text.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), EditorBrowsable(EditorBrowsableState.Never), DevCoBrowsable(false), System.ComponentModel.Category("Design"), System.ComponentModel.Description("Gets or set the alternative Shortcut Text.  This text appears next to the Text instead of any shortcuts"), System.ComponentModel.DefaultValue("")]
+        public override string AlternateShortCutText
+        {
+            get
+            {
+                return base.AlternateShortCutText;
+            }
+            set
+            {
+                base.AlternateShortCutText = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether item separator is shown before this item.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), DevCoBrowsable(false), System.ComponentModel.DefaultValue(false), System.ComponentModel.Category("Appearance"), System.ComponentModel.Description("Indicates whether this item is beginning of the group.")]
+        public override bool BeginGroup
+        {
+            get
+            {
+                return base.BeginGroup;
+            }
+            set
+            {
+                base.BeginGroup = value;
+            }
+        }
+
+        /// <summary>
+        /// Returns category for this item. If item cannot be customzied using the
+        /// customize dialog category is empty string.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), DevCoBrowsable(false), System.ComponentModel.DefaultValue(""), System.ComponentModel.Category("Design"), System.ComponentModel.Description("Indicates item category used to group similar items at design-time."), EditorBrowsable(EditorBrowsableState.Never)]
+        public override string Category
+        {
+            get
+            {
+
+                return base.Category;
+            }
+            set
+            {
+                base.Category = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the text color of the button when mouse is over the item.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), DevCoBrowsable(false), System.ComponentModel.Category("Appearance"), System.ComponentModel.Description("The foreground color used to display text when mouse is over the item."), EditorBrowsable(EditorBrowsableState.Never)]
+        public override Color HotForeColor
+        {
+            get
+            {
+                return base.HotForeColor;
+            }
+            set
+            {
+                base.HotForeColor = value;
+            }
+        }
+
+        /// <summary>
+        /// Indicates the way item is painting the picture when mouse is over it. Setting the value to Color will render the image in gray-scale when mouse is not over the item.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), DevCoBrowsable(false), System.ComponentModel.Category("Appearance"), System.ComponentModel.Description("Indicates the way item is painting the picture when mouse is over it. Setting the value to Color will render the image in gray-scale when mouse is not over the item."), System.ComponentModel.DefaultValue(eHotTrackingStyle.Default), EditorBrowsable(EditorBrowsableState.Never)]
+        public override eHotTrackingStyle HotTrackingStyle
+        {
+            get { return base.HotTrackingStyle; }
+            set
+            {
+                base.HotTrackingStyle = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the text color of the button.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), DevCoBrowsable(false), EditorBrowsable(EditorBrowsableState.Never), System.ComponentModel.Category("Appearance"), System.ComponentModel.Description("The foreground color used to display text.")]
+        public override Color ForeColor
+        {
+            get
+            {
+                return base.ForeColor;
+            }
+            set
+            {
+                base.ForeColor = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets/Sets the button style which controls the appearance of the button elements. Changing the property can display image only, text only or image and text on the button at all times.
+        /// </summary>
+        [Browsable(false), Category("Appearance"), Description("Determines the style of the button."), DefaultValue(eButtonStyle.ImageAndText), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override eButtonStyle ButtonStyle
+        {
+            get
+            {
+                return base.ButtonStyle;
+            }
+            set
+            {
+                base.ButtonStyle = value;
+            }
+        }
+		#endregion
+    }
+
+    /// <summary>
+    /// Specifies predefined color assigned to Metro Tab.
+    /// </summary>
+    public enum eMetroTabColor
+    {
+        Default,
+        Complement1,
+        Complement2,
+        Complement3,
+        Complement4
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Metro/MetroTabItemContainer.cs b/PROMS/DotNetBar Source Code/Metro/MetroTabItemContainer.cs
new file mode 100644
index 00000000..9a2041ac
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Metro/MetroTabItemContainer.cs	
@@ -0,0 +1,77 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Collections;
+
+namespace DevComponents.DotNetBar.Metro
+{
+    internal class MetroTabItemContainer : SimpleItemContainer
+    {
+        //protected override bool OnBeforeLayout()
+        //{
+        //    if (this.Orientation != eOrientation.Horizontal)
+        //        return true;
+
+        //    ArrayList ribbonTabItems = new ArrayList();
+        //    int totalWidth = 0;
+        //    int totalRibbonTabItemsWidth = 0;
+        //    int minimumSize = 24;
+        //    int availableWidth = this.WidthInternal - (this.PaddingLeft + this.PaddingRight);
+
+        //    foreach (BaseItem item in this.SubItems)
+        //    {
+        //        if (!item.Visible)
+        //            continue;
+        //        item.RecalcSize();
+        //        totalWidth += (item.WidthInternal + this.ItemSpacing);
+        //        if (item is RibbonTabItem)
+        //        {
+        //            // Reset reduced size flag
+        //            ((RibbonTabItem)item).ReducedSize = false;
+        //            ribbonTabItems.Add(item);
+        //            totalRibbonTabItemsWidth += (item.WidthInternal + this.ItemSpacing);
+        //        }
+        //    }
+
+        //    int totalReduction = totalWidth - availableWidth;
+
+        //    if (totalWidth > availableWidth && totalRibbonTabItemsWidth > 0)
+        //    {
+        //        if (totalReduction >= totalRibbonTabItemsWidth - (minimumSize * ribbonTabItems.Count + ribbonTabItems.Count - 1))
+        //        {
+        //            foreach (RibbonTabItem item in ribbonTabItems)
+        //            {
+        //                item.WidthInternal = minimumSize;
+        //                item.ReducedSize = true;
+        //            }
+        //        }
+        //        else
+        //        {
+        //            float reduction = 1 - (float)totalReduction / (float)totalRibbonTabItemsWidth;
+        //            bool reducedSize = false;
+        //            if (reduction <= .75)
+        //                reducedSize = true;
+        //            for (int i = 0; i < ribbonTabItems.Count; i++)
+        //            {
+        //                RibbonTabItem item = ribbonTabItems[i] as RibbonTabItem;
+        //                item.ReducedSize = reducedSize;
+        //                if (i == ribbonTabItems.Count - 1)
+        //                {
+        //                    item.WidthInternal -= totalReduction;
+        //                }
+        //                else
+        //                {
+        //                    int width = (int)(item.WidthInternal * reduction);
+        //                    if (width < minimumSize)
+        //                        width = minimumSize;
+        //                    totalReduction -= (item.WidthInternal - width);
+        //                    item.WidthInternal = width;
+        //                }
+        //            }
+        //        }
+        //    }
+
+        //    return false;
+        //}
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Metro/MetroTabPanel.cs b/PROMS/DotNetBar Source Code/Metro/MetroTabPanel.cs
new file mode 100644
index 00000000..75a740ab
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Metro/MetroTabPanel.cs	
@@ -0,0 +1,352 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel;
+using System.Windows.Forms;
+using System.Drawing;
+using DevComponents.DotNetBar.Metro.Rendering;
+using System.Collections;
+
+namespace DevComponents.DotNetBar.Metro
+{
+    /// <summary>
+	/// Represents panel used by MetroTabItem as a container panel for the control.
+	/// </summary>
+    [ToolboxItem(false), Designer("DevComponents.DotNetBar.Design.MetroTabPanelDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+    public class MetroTabPanel: PanelControl, IKeyTipsControl
+	{
+		#region Private Variables
+		private const string INFO_TEXT="Drop controls here. Drag and Drop tabs and items to re-order.";
+		private MetroTabItem _TabItem=null;
+		private bool _UseCustomStyle=false;
+		#endregion
+
+		#region Internal Implementation
+		/// <summary>
+		/// Creates new instance of the panel.
+		/// </summary>
+        public MetroTabPanel()
+            : base()
+		{
+            this.ColorSchemeStyle = eDotNetBarStyle.StyleManagerControlled;
+            if (StyleManager.IsMetro(StyleManager.Style))
+                this.BackColor = MetroRender.GetColorTable().CanvasColor;
+            //this.BackColor=SystemColors.Control;
+		}
+
+        protected override ElementStyle GetStyle()
+        {
+            if (!this.Style.Custom)
+            {
+                return GetDefaultStyle();
+            }
+            return base.GetStyle();
+        }
+
+        private bool _PopupMode = false;
+        private MetroShell _MetroTab = null;
+        internal MetroShell GetMetroTab()
+        {
+            if (_PopupMode)
+                return _MetroTab;
+            return this.Parent as MetroShell;
+        }
+
+        internal bool IsPopupMode
+        {
+            get { return _PopupMode; }
+        }
+
+        internal void SetPopupMode(bool popupMode, MetroShell rc)
+        {
+            _PopupMode = popupMode;
+            if (_PopupMode)
+            {
+                _MetroTab = rc;
+
+#if FRAMEWORK20
+                if (this.Padding.Bottom > 0)
+                {
+                    this.Height += this.Padding.Bottom;
+                    this.Padding = new System.Windows.Forms.Padding(this.Padding.Left, this.Padding.Bottom, this.Padding.Right, this.Padding.Bottom);
+                }
+#else
+                if (this.DockPadding.Bottom > 0)
+                {
+                    this.DockPadding.Top = this.DockPadding.Bottom;
+                    this.Height += this.DockPadding.Bottom;
+                }
+#endif
+            }
+            else
+            {
+#if FRAMEWORK20
+                if (this.Padding.Top > 0)
+                {
+                    this.Height -= this.Padding.Top;
+                    this.Padding = new System.Windows.Forms.Padding(this.Padding.Left, 0, this.Padding.Right, this.Padding.Bottom);
+                }
+#else
+                if (this.DockPadding.Top > 0)
+                {
+                    this.Height -= this.DockPadding.Top;
+                    this.DockPadding.Top = 0;
+                }
+#endif
+                _MetroTab = null;
+            }
+        }
+
+        private ElementStyle GetDefaultStyle()
+        {
+            return MetroRender.GetColorTable().MetroTab.TabPanelBackgroundStyle;
+        }
+
+
+		private Rectangle GetThemedRect(Rectangle r)
+		{
+			const int offset=6;
+			r.Y-=offset;
+			r.Height+=offset;
+			return r;
+		}
+		
+		protected override void OnPaint(PaintEventArgs e)
+		{
+			bool baseCall=true;
+			if(DrawThemedPane && BarFunctions.ThemedOS)
+			{
+				Rectangle r=GetThemedRect(this.ClientRectangle);
+				eTabStripAlignment tabAlignment=eTabStripAlignment.Top;
+				
+				Rectangle rTemp=new Rectangle(0,0,r.Width,r.Height);
+				if(tabAlignment==eTabStripAlignment.Right || tabAlignment==eTabStripAlignment.Left)
+					rTemp=new Rectangle(0,0,rTemp.Height,rTemp.Width);
+				if(m_ThemeCachedBitmap==null || m_ThemeCachedBitmap.Size!=rTemp.Size)
+				{
+					DisposeThemeCachedBitmap();
+					Bitmap bmp=new Bitmap(rTemp.Width,rTemp.Height,e.Graphics);
+					try
+					{
+						Graphics gTemp=Graphics.FromImage(bmp);
+						try
+						{
+							using(SolidBrush brush=new SolidBrush(Color.Transparent))
+								gTemp.FillRectangle(brush,0,0,bmp.Width,bmp.Height);
+							this.ThemeTab.DrawBackground(gTemp,ThemeTabParts.Pane,ThemeTabStates.Normal,rTemp);
+						}
+						finally
+						{
+							gTemp.Dispose();
+						}
+					}
+					finally
+					{
+						if(tabAlignment==eTabStripAlignment.Left)
+							bmp.RotateFlip(RotateFlipType.Rotate270FlipNone);
+						else if(tabAlignment==eTabStripAlignment.Right)
+							bmp.RotateFlip(RotateFlipType.Rotate90FlipNone);
+						else if(tabAlignment==eTabStripAlignment.Bottom)
+							bmp.RotateFlip(RotateFlipType.Rotate180FlipNone);
+						e.Graphics.DrawImageUnscaled(bmp,r.X,r.Y);							
+						m_ThemeCachedBitmap=bmp;
+					}
+				}
+				else
+					e.Graphics.DrawImageUnscaled(m_ThemeCachedBitmap,r.X,r.Y);
+
+				baseCall=false;
+			}
+
+			if(baseCall)
+				base.OnPaint(e);
+
+			if(this.DesignMode && this.Controls.Count==0 && this.Text=="")
+			{
+				Rectangle r=this.ClientRectangle;
+				r.Inflate(-2,-2);
+				StringFormat sf=BarFunctions.CreateStringFormat();
+				sf.Alignment=StringAlignment.Center;
+				sf.LineAlignment=StringAlignment.Center;
+				sf.Trimming=StringTrimming.EllipsisCharacter;
+				Font font=new Font(this.Font,FontStyle.Bold);
+				e.Graphics.DrawString(INFO_TEXT,font,new SolidBrush(ControlPaint.Dark(this.Style.BackColor)),r,sf);
+				font.Dispose();
+				sf.Dispose();
+			}
+            if (this.Parent is MetroShell) ((MetroShell)this.Parent).MetroTabStrip.InvalidateKeyTipsCanvas();
+		}
+
+		/// <summary>
+		/// Indicates whether style of the panel is managed by tab control automatically.
+		/// Set this to true if you would like to control style of the panel.
+		/// </summary>
+		[Browsable(true),DefaultValue(false),Category("Appearance"),Description("Indicates whether style of the panel is managed by tab control automatically. Set this to true if you would like to control style of the panel.")]
+		public bool UseCustomStyle
+		{
+			get {return _UseCustomStyle;}
+			set {_UseCustomStyle=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets TabItem that this panel is attached to.
+		/// </summary>
+		[Browsable(false),DefaultValue(null),DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public MetroTabItem MetroTabItem
+		{
+			get {return _TabItem;}
+			set	{_TabItem=value;}
+		}
+
+		protected override void OnResize(EventArgs e)
+		{
+			DisposeThemeCachedBitmap();
+			base.OnResize(e);
+		}
+
+		/// <summary>
+		/// Gets or sets which edge of the parent container a control is docked to.
+		/// </summary>
+		[Browsable(false),DefaultValue(DockStyle.None)]
+		public override DockStyle Dock
+		{
+			get {return base.Dock;}
+			set {base.Dock=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets the size of the control.
+		/// </summary>
+		[Browsable(false)]
+		public new Size Size
+		{
+			get {return base.Size;}
+			set {base.Size=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets the coordinates of the upper-left corner of the control relative to the upper-left corner of its container.
+		/// </summary>
+		[Browsable(false)]
+		public new Point Location
+		{
+			get {return base.Location;}
+			set {base.Location=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets a value indicating whether the control is displayed.
+		/// </summary>
+		[Browsable(false)]
+		public new bool Visible
+		{
+			get {return base.Visible;}
+			set {base.Visible=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets which edges of the control are anchored to the edges of its container.
+		/// </summary>
+		[Browsable(false)]
+		public override AnchorStyles Anchor
+		{
+			get {return base.Anchor;}
+			set {base.Anchor=value;}
+		}
+
+        [Browsable(false), DefaultValue("")]
+        public override string Text
+        {
+            get
+            {
+                return base.Text;
+            }
+            set
+            {
+                base.Text = value;
+            }
+        }
+
+        private class XPositionComparer : IComparer
+        {
+            // Calls CaseInsensitiveComparer.Compare with the parameters reversed.
+            int IComparer.Compare(object x, object y)
+            {
+                if (x is Control && y is Control)
+                {
+                    return ((Control)x).Left - ((Control)y).Left;
+                }
+                else
+                    return ((new CaseInsensitiveComparer()).Compare(x, y));
+            }
+        }
+
+        bool IKeyTipsControl.ProcessMnemonicEx(char charCode)
+        {
+            if (this.Controls.Count == 0) return false;
+
+            Control[] ca = new Control[this.Controls.Count];
+            this.Controls.CopyTo(ca, 0);
+            ArrayList controls = new ArrayList(ca);
+            controls.Sort(new XPositionComparer());
+            foreach (Control c in controls)
+            {
+                IKeyTipsControl ktc = c as IKeyTipsControl;
+                if (ktc!=null && c.Visible && c.Enabled)
+                {
+                    string oldStack = ktc.KeyTipsKeysStack;
+                    bool ret = ktc.ProcessMnemonicEx(charCode);
+                    if (ret)
+                        return true;
+                    if (ktc.KeyTipsKeysStack != oldStack)
+                    {
+                        ((IKeyTipsControl)this).KeyTipsKeysStack = ktc.KeyTipsKeysStack;
+                        return false;
+                    }
+                }
+            }
+            return false;
+        }
+
+        private bool _ShowKeyTips = false;
+        bool IKeyTipsControl.ShowKeyTips
+        {
+            get
+            {
+                return _ShowKeyTips;
+            }
+            set
+            {
+                _ShowKeyTips = value;
+                Control[] controls = new Control[this.Controls.Count];
+                this.Controls.CopyTo(controls, 0);
+                foreach (Control c in controls)
+                {
+                    if (c is IKeyTipsControl && c.Enabled && (c.Visible || !_ShowKeyTips))
+                        ((IKeyTipsControl)c).ShowKeyTips = _ShowKeyTips;
+                }
+            }
+        }
+
+        private string m_KeyTipsKeysStack = "";
+        string IKeyTipsControl.KeyTipsKeysStack
+        {
+            get { return m_KeyTipsKeysStack; }
+            set
+            {
+                m_KeyTipsKeysStack = value;
+                foreach (Control c in this.Controls)
+                {
+                    if (c is IKeyTipsControl && c.Visible && c.Enabled)
+                        ((IKeyTipsControl)c).KeyTipsKeysStack = m_KeyTipsKeysStack;
+                }
+            }
+        }
+
+        protected override void OnLayout(LayoutEventArgs levent)
+        {
+            base.OnLayout(levent);
+        }
+		#endregion
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/Metro/MetroTabStrip.cs b/PROMS/DotNetBar Source Code/Metro/MetroTabStrip.cs
new file mode 100644
index 00000000..3c8186e2
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Metro/MetroTabStrip.cs	
@@ -0,0 +1,1470 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Runtime.InteropServices;
+using System.ComponentModel;
+using System.Drawing;
+using System.Windows.Forms;
+using System.Collections;
+using DevComponents.DotNetBar.Metro.Rendering;
+using DevComponents.DotNetBar.Rendering;
+
+namespace DevComponents.DotNetBar.Metro
+{
+    /// <summary>
+    /// Represents Metro-UI TabStrip control.
+    /// </summary>
+    [ToolboxItem(false), ComVisible(false)]
+    public class MetroTabStrip : ItemControl
+    {
+        #region Private Variables & Constructor
+        private MetroStripContainerItem _StripContainer = null;
+        private int _CaptionHeight = 0;
+        private bool _CaptionVisible = false;
+        private Rectangle _CaptionBounds = Rectangle.Empty;
+        private Rectangle _QuickToolbarBounds = Rectangle.Empty;
+        private Rectangle _SystemCaptionItemBounds = Rectangle.Empty;
+        private Font _CaptionFont = null;
+        private bool _CanCustomize = true;
+        private ElementStyle _DefaultBackgroundStyle = new ElementStyle();
+        private bool _KeyTipsEnabled = true;
+        private string _TitleText = "";
+
+        public MetroTabStrip()
+        {
+            this.SetStyle(ControlStyles.StandardDoubleClick, true);
+
+            _StripContainer = new MetroStripContainerItem(this);
+            _StripContainer.GlobalItem = false;
+            _StripContainer.ContainerControl = this;
+            _StripContainer.Displayed = true;
+            _StripContainer.SetOwner(this);
+            _StripContainer.Style = eDotNetBarStyle.Metro;
+            this.SetBaseItemContainer(_StripContainer);
+
+            this.ColorScheme.Style = eDotNetBarStyle.Office2003;
+
+            this.AutoSize = true;
+
+            // Setup system caption item
+            _StripContainer.SystemCaptionItem.Click += new EventHandler(SystemCaptionClick);
+
+            StyleManager.Register(this);
+        }
+        protected override void Dispose(bool disposing)
+        {
+            StyleManager.Unregister(this);
+            base.Dispose(disposing);
+        }
+        /// <summary>
+        /// Called by StyleManager to notify control that style on manager has changed and that control should refresh its appearance if
+        /// its style is controlled by StyleManager.
+        /// </summary>
+        /// <param name="newStyle">New active style.</param>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void StyleManagerStyleChanged(eDotNetBarStyle newStyle)
+        {
+            this.Style = StyleManager.GetEffectiveStyle();
+        }
+        #endregion
+
+        #region Events
+        /// <summary>
+        /// Occurs when text markup link from TitleText markup is clicked. Markup links can be created using "a" tag, for example:
+        /// <a name="MyLink">Markup link</a>
+        /// </summary>
+        [Description("Occurs when text markup link from TitleText markup is clicked.")]
+        public event MarkupLinkClickEventHandler TitleTextMarkupLinkClick;
+        #endregion
+
+        #region Internal Implementation
+        private TextMarkup.BodyElement _TitleTextMarkup = null;
+        /// <summary>
+        /// Gets or sets the rich text displayed on Ribbon Title instead of the Form.Text property. This property supports text-markup.
+        /// You can use <font color="SysCaptionTextExtra"> markup to instruct the markup renderer to use Office 2007 system caption extra text color which
+        /// changes depending on the currently selected color table. Note that when using this property you should manage also the Form.Text property since
+        /// that is the text that will be displayed in Windows task-bar and elsewhere where system Form.Text property is used.
+        /// You can also use the hyperlinks as part of the text markup and handle the TitleTextMarkupLinkClick event to be notified when they are clicked.
+        /// </summary>
+        [Browsable(true), DefaultValue(""), Editor("DevComponents.DotNetBar.Design.TextMarkupUIEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), EditorBrowsable(EditorBrowsableState.Always), Category("Appearance"), Description("Indicates text displayed on Ribbon Title instead of the Form.Text property.")]
+        public string TitleText
+        {
+            get { return _TitleText; }
+            set
+            {
+                if (value == null) value = "";
+                _TitleText = value;
+                _TitleTextMarkup = null;
+
+                if (!TextMarkup.MarkupParser.IsMarkup(ref _TitleText))
+                    return;
+
+                _TitleTextMarkup = TextMarkup.MarkupParser.Parse(_TitleText);
+
+                if (_TitleTextMarkup != null)
+                    _TitleTextMarkup.HyperLinkClick += new EventHandler(InternalTitleTextMarkupLinkClick);
+                TitleTextMarkupLastArrangeBounds = Rectangle.Empty;
+                this.Invalidate();
+            }
+        }
+
+        /// <summary>
+        /// Occurs when text markup link is clicked.
+        /// </summary>
+        private void InternalTitleTextMarkupLinkClick(object sender, EventArgs e)
+        {
+            TextMarkup.HyperLink link = sender as TextMarkup.HyperLink;
+            if (link != null)
+            {
+                if (TitleTextMarkupLinkClick != null)
+                    TitleTextMarkupLinkClick(this, new MarkupLinkClickEventArgs(link.Name, link.HRef));
+            }
+        }
+
+        /// <summary>
+        /// Gets reference to parsed markup body element if text was markup otherwise returns null.
+        /// </summary>
+        internal TextMarkup.BodyElement TitleTextMarkupBody
+        {
+            get { return _TitleTextMarkup; }
+        }
+
+        internal Rectangle TitleTextMarkupLastArrangeBounds = Rectangle.Empty;
+        /// <summary>
+        /// Gets or sets whether KeyTips functionality is enabled. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Browsable(true), Category("Behavior"), Description("Indicates whether KeyTips functionality is enabled.")]
+        public bool KeyTipsEnabled
+        {
+            get { return _KeyTipsEnabled; }
+            set { _KeyTipsEnabled = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether control can be customized and items added by end-user using context menu to the quick access toolbar.
+        /// Caption of the control must be visible for customization to be enabled. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Browsable(true), Category("Customization"), Description("Indicates whether control can be customized. Caption must be visible for customization to be fully enabled.")]
+        public bool CanCustomize
+        {
+            get { return _CanCustomize; }
+            set { _CanCustomize = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the explicit height of the caption provided by control. Caption height when set is composed of the TabGroupHeight and
+        /// the value specified here. Default value is 0 which means that system default caption size is used.
+        /// </summary>
+        [Browsable(true), DefaultValue(0), Category("Appearance"), Description("Indicates explicit height of the caption provided by control")]
+        public int CaptionHeight
+        {
+            get { return _CaptionHeight; }
+            set
+            {
+                _CaptionHeight = value;
+                _StripContainer.NeedRecalcSize = true;
+            }
+        }
+
+        internal bool HasVisibleTabs
+        {
+            get
+            {
+                foreach (BaseItem item in this.Items)
+                {
+                    if (item.Visible) return true;
+                }
+                return false;
+            }
+        }
+
+        internal Rectangle CaptionBounds
+        {
+            get { return _CaptionBounds; }
+            set { _CaptionBounds = value; }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never), Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public Rectangle QuickToolbarBounds
+        {
+            get { return _QuickToolbarBounds; }
+            set { _QuickToolbarBounds = value; }
+        }
+
+        internal Rectangle SystemCaptionItemBounds
+        {
+            get { return _SystemCaptionItemBounds; }
+            set { _SystemCaptionItemBounds = value; }
+        }
+
+        internal SystemCaptionItem SystemCaptionItem
+        {
+            get { return _StripContainer.SystemCaptionItem; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether custom caption line provided by the control is visible. Default value is false.
+        /// This property should be set to true when control is used on Office2007RibbonForm.
+        /// </summary>
+        [Browsable(true), DefaultValue(false), Category("Appearance"), Description("Indicates whether custom caption line provided by the control is visible.")]
+        public bool CaptionVisible
+        {
+            get { return _CaptionVisible; }
+            set
+            {
+                _CaptionVisible = value;
+                OnCaptionVisibleChanged();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the font for the form caption text when CaptionVisible=true. Default value is NULL which means that system font is used.
+        /// </summary>
+        [Browsable(true), DefaultValue(null), Category("Appearance"), Description("")]
+        public Font CaptionFont
+        {
+            get { return _CaptionFont; }
+            set
+            {
+                _CaptionFont = value;
+                _StripContainer.NeedRecalcSize = true;
+                this.Invalidate();
+            }
+        }
+
+        private void OnCaptionVisibleChanged()
+        {
+            _StripContainer.NeedRecalcSize = true;
+            this.RecalcLayout();
+        }
+
+        internal eDotNetBarStyle EffectiveStyle
+        {
+            get
+            {
+                return _StripContainer.EffectiveStyle;
+            }
+        }
+        /// <summary>
+        /// Gets/Sets the visual style of the control.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Category("Appearance"), Description("Specifies the visual style of the control."), DefaultValue(eDotNetBarStyle.Metro)]
+        public eDotNetBarStyle Style
+        {
+            get
+            {
+                return _StripContainer.Style;
+            }
+            set
+            {
+                this.ColorScheme.Style = value;
+                _StripContainer.Style = value;
+                this.Invalidate();
+                this.RecalcLayout();
+            }
+        }
+
+        /// <summary>
+        /// Returns collection of items on a bar.
+        /// </summary>
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content), Browsable(false)]
+        public SubItemsCollection Items
+        {
+            get
+            {
+                return _StripContainer.RibbonStripContainer.SubItems;
+            }
+        }
+
+        /// <summary>
+        /// Returns currently selected MetroTabItem. MetroTabItems are selected using the Checked property. Only a single
+        /// MetroTabItem can be Checked at any given time.
+        /// </summary>
+        [Browsable(false)]
+        public MetroTabItem SelectedTab
+        {
+            get
+            {
+                foreach (BaseItem item in this.Items)
+                {
+                    if (item is MetroTabItem && ((MetroTabItem)item).Checked)
+                        return (MetroTabItem)item;
+                }
+                return null;
+            }
+        }
+
+        protected override void WndProc(ref Message m)
+        {
+            if (m.Msg == (int)WinApi.WindowsMessages.WM_NCHITTEST)
+            {
+                // Get position being tested...
+                int x = WinApi.LOWORD(m.LParam);
+                int y = WinApi.HIWORD(m.LParam);
+                Point p = PointToClient(new Point(x, y));
+                if (IsGlassEnabled && this.CaptionVisible)
+                {
+                    Rectangle r = new Rectangle(this.Width - BarFunctions.CaptionButtonSize.Width * 3, 0, BarFunctions.CaptionButtonSize.Width * 3, BarFunctions.CaptionButtonSize.Height + 6);
+                    if (r.Contains(p))
+                    {
+                        m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.TransparentOrCovered);
+                        return;
+                    }
+
+                    r = new Rectangle(0, 0, this.Width, 4);
+                    if (r.Contains(p))
+                    {
+                        m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.TransparentOrCovered);
+                        return;
+                    }
+
+                    if (_CaptionBounds.Contains(p))
+                    {
+                        m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.TransparentOrCovered);
+                        return;
+                    }
+                }
+                else if (this.CaptionVisible && !this.IsMaximized)
+                {
+                    Rectangle r = new Rectangle(0, 0, this.Width, 4);
+                    if (r.Contains(p))
+                    {
+                        m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.TransparentOrCovered);
+                        return;
+                    }
+                }
+                if (BarFunctions.IsWindows7 && this.IsMaximized)
+                {
+                    if(this.CaptionBounds.Contains(p))
+                    {
+                        m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.TransparentOrCovered);
+                        return;
+                    }
+                }
+            }
+
+            base.WndProc(ref m);
+        }
+
+        internal bool IsMaximized
+        {
+            get
+            {
+                Form f = this.FindForm();
+                return (f != null && f.WindowState == FormWindowState.Maximized);
+            }
+        }
+
+        /// <summary>
+        /// Returns the color scheme used by control. Color scheme for Office2007 style will be retrived from the current renderer instead of
+        /// local color scheme referenced by ColorScheme property.
+        /// </summary>
+        /// <returns>An instance of ColorScheme object.</returns>
+        protected override ColorScheme GetColorScheme()
+        {
+            BaseRenderer r = GetRenderer();
+            if (r is Office2007Renderer)
+                return ((Office2007Renderer)r).ColorTable.LegacyColors;
+            return base.GetColorScheme();
+        }
+
+        protected override void PaintControlBackground(ItemPaintArgs pa)
+        {
+            base.PaintControlBackground(pa);
+
+            _QuickToolbarBounds = Rectangle.Empty;
+            _CaptionBounds = Rectangle.Empty;
+            _SystemCaptionItemBounds = Rectangle.Empty;
+
+            MetroRender.Paint(this, pa);
+            //DevComponents.DotNetBar.Rendering.BaseRenderer renderer = GetRenderer();
+            //if (renderer != null && this.Parent is MetroTab)
+            //{
+            //    renderer.DrawMetroTabBackground(new MetroTabRendererEventArgs(pa.Graphics, this.Parent as MetroTab, pa.GlassEnabled));
+
+            //    if (_CaptionVisible)
+            //        renderer.DrawQuickAccessToolbarBackground(new MetroTabRendererEventArgs(pa.Graphics, this.Parent as MetroTab, pa.GlassEnabled));
+            //}
+
+            //// Paint form caption text
+            //if (renderer != null && _CaptionVisible)
+            //{
+            //    MetroTabRendererEventArgs rer = new MetroTabRendererEventArgs(pa.Graphics, this.Parent as MetroTab, pa.GlassEnabled);
+            //    rer.ItemPaintArgs = pa;
+            //    renderer.DrawRibbonFormCaptionText(rer);
+            //}
+
+#if TRIAL
+            if (NativeFunctions.ColorExpAlt())
+				{
+					pa.Graphics.Clear(Color.White);
+					TextDrawing.DrawString(pa.Graphics, "Your DotNetBar trial has expired :-(", this.Font, Color.FromArgb(128, Color.Black), this.ClientRectangle, eTextFormat.HorizontalCenter | eTextFormat.VerticalCenter);
+				}
+                //else
+                //{
+                //    TextDrawing.DrawString(pa.Graphics, "Trial Version", this.Font, Color.FromArgb(128, Color.Black), new Rectangle(0, 0, this.Width - 12, this.Height-4), eTextFormat.Right | eTextFormat.Bottom);
+                //}
+#endif
+        }
+
+        protected override ElementStyle GetBackgroundStyle()
+        {
+            if (this.BackgroundStyle.Custom)
+                return base.GetBackgroundStyle();
+            return _DefaultBackgroundStyle;
+        }
+
+        internal void InitDefaultStyles()
+        {
+            _DefaultBackgroundStyle = MetroRender.GetColorTable().MetroTab.TabStrip.BackgroundStyle;
+        }
+
+        internal ElementStyle InternalGetBackgroundStyle()
+        {
+            return this.GetBackgroundStyle();
+        }
+
+        internal Rectangle GetItemContainerBounds()
+        {
+            Rectangle r = base.GetItemContainerRectangle();
+            if (_CaptionVisible)
+            {
+                r.Y += GetAbsoluteCaptionHeight();
+            }
+            return r;
+        }
+
+        internal Rectangle GetCaptionContainerBounds()
+        {
+            Rectangle baseRect = base.GetItemContainerRectangle();
+            if (this.IsGlassEnabled)
+                baseRect.Y += 3;
+            return new Rectangle(baseRect.X, baseRect.Y, baseRect.Width, GetAbsoluteCaptionHeight());
+        }
+        /// <summary>
+        /// Returns effective caption height.
+        /// </summary>
+        /// <returns>Caption height.</returns>
+        public int GetCaptionHeight()
+        {
+            if (_CaptionHeight == 0)
+            {
+                if (StyleManager.Style == eStyle.OfficeMobile2014 || StyleManager.Style == eStyle.Office2016)
+                    return Dpi.Height32;
+                else
+                    return Dpi.Height25;
+            }
+            else
+            {
+                return Dpi.Height(_CaptionHeight);
+            }
+        }
+
+        internal int GetAbsoluteCaptionHeight()
+        {
+            return GetCaptionHeight();
+        }
+
+        internal int GetTotalCaptionHeight()
+        {
+            return GetCaptionHeight();
+        }
+
+        internal override bool IsGlassEnabled
+        {
+            get
+            {
+                return false;
+            }
+        }
+
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            if (_StripContainer.NeedRecalcSize) this.RecalcSize();
+            InitDefaultStyles();
+            base.OnPaint(e);
+        }
+
+        protected override void RecalcSize()
+        {
+            _CaptionBounds = Rectangle.Empty;
+            _SystemCaptionItemBounds = Rectangle.Empty;
+            _QuickToolbarBounds = Rectangle.Empty;
+            InitDefaultStyles();
+            base.RecalcSize();
+        }
+
+        /// <summary>
+        /// Returns automatically calculated height of the control given current content.
+        /// </summary>
+        /// <returns>Height in pixels.</returns>
+        public override int GetAutoSizeHeight()
+        {
+            int i = base.GetAutoSizeHeight();
+            return i;
+        }
+
+        protected override bool OnMouseWheel(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+            Rectangle r = this.DisplayRectangle;
+            r.Location = this.PointToScreen(r.Location);
+
+            MetroShell rc = this.Parent as MetroShell;
+
+            if (this.Parent is MetroShell)
+            {
+                r = this.Parent.DisplayRectangle;
+                r.Location = this.Parent.PointToScreen(r.Location);
+                if (rc.SelectedTab != null && rc.SelectedTab.Panel is IKeyTipsControl && ((IKeyTipsControl)rc.SelectedTab.Panel).ShowKeyTips)
+                    return false;
+            }
+
+            if (rc != null && !rc.MouseWheelTabScrollEnabled) return false;
+
+            Point mousePos = Control.MousePosition;
+
+            bool parentActive = true;
+            Form parentForm = this.FindForm();
+            if (parentForm != null && !BarFunctions.IsFormActive(parentForm))
+                parentActive = false;
+
+            if (parentActive && r.Contains(mousePos) && !this.ShowKeyTips && this.Items.Count > 0)
+            {
+                IntPtr handle = NativeFunctions.WindowFromPoint(new NativeFunctions.POINT(mousePos));
+                Control c = Control.FromChildHandle(handle);
+                if (c == null)
+                    c = Control.FromHandle(handle);
+                if (c is MetroTabStrip || c is MetroShell || c is MetroTabPanel)
+                {
+                    MetroTabItem selectedTab = this.SelectedTab;
+                    int start = 0;
+                    int end = this.Items.Count - 1;
+
+                    int direction = 1;
+                    if ((wParam.ToInt64() & 0x80000000) > 0)
+                    {
+                        direction = -1;
+                        end = 0;
+                    }
+                    if (selectedTab != null)
+                    {
+                        start = this.Items.IndexOf(selectedTab) + direction;
+                        if (direction < 0 && start < 0) return false;
+
+                        if (start == this.Items.Count)
+                            start = 0;
+                        else if (start < 0)
+                            start = this.Items.Count - 1;
+                    }
+
+                    int index = start - direction;
+                    do
+                    {
+                        index += direction;
+                        if (index < 0 || index > this.Items.Count - 1) break;
+
+                        if (this.Items[index] is MetroTabItem && this.Items[index].Visible)
+                        {
+                            ((MetroTabItem)this.Items[index]).Checked = true;
+                            return true;
+                        }
+                    } while (index != end);
+                }
+            }
+
+            return false;
+        }
+
+        /// <summary>
+        /// Returns the collection of items with the specified name.
+        /// </summary>
+        /// <param name="ItemName">Item name to look for.</param>
+        /// <returns></returns>
+        public override ArrayList GetItems(string ItemName)
+        {
+            ArrayList list = new ArrayList(15);
+            BarFunctions.GetSubItemsByName(GetBaseItemContainer(), ItemName, list);
+
+            MetroShell rc = this.GetMetroTab();
+
+            if (rc != null && rc.GlobalContextMenuBar != null)
+                BarFunctions.GetSubItemsByName(rc.GlobalContextMenuBar.ItemsContainer, ItemName, list);
+
+            return list;
+        }
+
+        /// <summary>
+        /// Returns the collection of items with the specified name and type.
+        /// </summary>
+        /// <param name="ItemName">Item name to look for.</param>
+        /// <param name="itemType">Item type to look for.</param>
+        /// <returns></returns>
+        public override ArrayList GetItems(string ItemName, Type itemType)
+        {
+            ArrayList list = new ArrayList(15);
+            BarFunctions.GetSubItemsByNameAndType(GetBaseItemContainer(), ItemName, list, itemType);
+
+            MetroShell rc = this.GetMetroTab();
+            if (rc != null && rc.GlobalContextMenuBar != null)
+                BarFunctions.GetSubItemsByNameAndType(rc.GlobalContextMenuBar.ItemsContainer, ItemName, list, itemType);
+
+            return list;
+        }
+
+        /// <summary>
+        /// Returns the collection of items with the specified name and type.
+        /// </summary>
+        /// <param name="ItemName">Item name to look for.</param>
+        /// <param name="itemType">Item type to look for.</param>
+        /// <param name="useGlobalName">Indicates whether GlobalName property is used for searching.</param>
+        /// <returns></returns>
+        public override ArrayList GetItems(string ItemName, Type itemType, bool useGlobalName)
+        {
+            ArrayList list = new ArrayList(15);
+            BarFunctions.GetSubItemsByNameAndType(GetBaseItemContainer(), ItemName, list, itemType, useGlobalName);
+
+            MetroShell rc = this.GetMetroTab();
+
+            if (rc != null && rc.GlobalContextMenuBar != null)
+                BarFunctions.GetSubItemsByNameAndType(rc.GlobalContextMenuBar.ItemsContainer, ItemName, list, itemType, useGlobalName);
+
+            return list;
+        }
+
+        /// <summary>
+        /// Returns the first item that matches specified name.
+        /// </summary>
+        /// <param name="ItemName">Item name to look for.</param>
+        /// <returns></returns>
+        public override BaseItem GetItem(string ItemName)
+        {
+            BaseItem item = BarFunctions.GetSubItemByName(GetBaseItemContainer(), ItemName);
+            if (item != null)
+                return item;
+
+            MetroShell rc = this.GetMetroTab();
+            if (rc != null && rc.GlobalContextMenuBar != null)
+                return BarFunctions.GetSubItemByName(rc.GlobalContextMenuBar.ItemsContainer, ItemName);
+
+            return null;
+        }
+        #endregion
+
+        #region KeyTips Support
+        private bool _AltFocus = false;
+        private IKeyTipsControl _AltFocusedControl = null;
+
+        /// <summary>
+        /// Called when ShowKeyTips on RibbonBar contained by this Ribbon is set to true
+        /// </summary>
+        internal void OnRibbonBarShowKeyTips(RibbonBar bar)
+        {
+            if (!_AltFocus)
+            {
+                _AltFocus = true;
+            }
+
+            if (_AltFocusedControl != bar.Parent && bar.Parent is RibbonPanel)
+            {
+                if (_AltFocusedControl != null)
+                    _AltFocusedControl.ShowKeyTips = false;
+                _AltFocusedControl = bar.Parent as IKeyTipsControl;
+                if (_AltFocusedControl != null)
+                    _AltFocusedControl.ShowKeyTips = true;
+            }
+        }
+
+        protected override void OnShowKeyTipsChanged()
+        {
+            MetroShell rc = this.GetMetroTab();
+            base.OnShowKeyTipsChanged();
+
+            if (this.ShowKeyTips && !_AltFocus)
+                GiveKeyTipsAltFocus();
+        }
+
+        internal void BackstageTabClosed(SuperTabControl tabControl)
+        {
+            if (_AltFocusedControl == tabControl || _AltFocusedControl == tabControl.TabStrip)
+                _AltFocusedControl = null;
+        }
+
+        protected override bool OnKeyDown(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+            if (_AltFocus)
+            {
+                if (HasRegisteredPopups)
+                {
+                    bool ret = base.OnKeyDown(hWnd, wParam, lParam);
+                    if (!HasRegisteredPopups) ReleaseAltFocus();
+                }
+                Keys key = (Keys)NativeFunctions.MapVirtualKey((uint)wParam, 2);
+                if (key == Keys.None)
+                {
+                    int wParamInt = WinApi.ToInt(wParam);
+                    key = (Keys)wParamInt;
+                }
+
+                if (key == Keys.Escape)
+                {
+                    bool reShowKeyTips = false;
+                    if (!this.ShowKeyTips && _AltFocusedControl != null)
+                    {
+                        if (_AltFocusedControl is RibbonPanel)
+                            reShowKeyTips = true;
+                    }
+
+                    ReleaseAltFocus();
+
+                    if (reShowKeyTips)
+                    {
+                        GiveKeyTipsAltFocus();
+                    }
+
+                    return base.OnKeyDown(hWnd, wParam, lParam);
+                }
+
+                char accessKey = CharFromInt((int)key);
+                if (accessKey == char.MinValue)
+                {
+                    ReleaseAltFocus();
+                    return true;
+                }
+                else if (key == Keys.Space || key == Keys.Down || key == Keys.Right || key == Keys.Tab)
+                {
+                    ReleaseAltFocus();
+                    return false;
+                }
+
+                if (this.ProcessMnemonic(accessKey))
+                    return true;
+
+                return true;
+            }
+
+            return base.OnKeyDown(hWnd, wParam, lParam);
+        }
+
+        private char CharFromInt(int key)
+        {
+            char[] ch = new char[1];
+            byte[] by = new byte[1];
+            try
+            {
+                by[0] = System.Convert.ToByte(key);
+                System.Text.Encoding.Default.GetDecoder().GetChars(by, 0, 1, ch, 0);
+            }
+            catch (Exception)
+            {
+                return char.MinValue;
+            }
+
+            return ch[0];
+        }
+
+        protected override bool OnSysKeyUp(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+            int wParamInt = WinApi.ToInt(wParam);
+            if (wParamInt == 18 || wParamInt == 121)
+            {
+                bool callBase = true;
+                if (_AltFocus)
+                {
+                    if (wParamInt == 18 || wParamInt == 121)
+                        callBase = false;
+                    ReleaseAltFocus();
+                }
+                else
+                {
+                    Form f = this.FindForm();
+                    if (f == Form.ActiveForm)
+                    {
+                        callBase = false;
+                        GiveKeyTipsAltFocus();
+                    }
+                }
+                if (!callBase)
+                    return true;
+            }
+            return base.OnSysKeyUp(hWnd, wParam, lParam);
+        }
+
+        private void GiveKeyTipsAltFocus()
+        {
+            if (!_KeyTipsEnabled) return;
+
+            _AltFocus = true;
+            this.ShowKeyTips = true;
+            SetupActiveWindowTimer();
+        }
+
+        private void ReleaseAltFocus()
+        {
+            if (_AltFocus)
+            {
+                ReleaseActiveWindowTimer();
+                if (!this.ShowKeyTips && _AltFocusedControl != null)
+                {
+                    _AltFocusedControl.ShowKeyTips = false;
+                    _AltFocusedControl = null;
+                }
+                this.ShowKeyTips = false;
+            }
+
+            _AltFocus = false;
+        }
+
+        /// <summary>
+        /// Gets whether Ribbon is in key-tips mode including its child controls.
+        /// </summary>
+        [Browsable(false)]
+        public bool IsInKeyTipsMode
+        {
+            get
+            {
+                return _AltFocus | this.ShowKeyTips;
+            }
+        }
+
+        /// <summary>
+        /// Forces the control to exit Ribbon Key-Tips mode.
+        /// </summary>
+        public void ExitKeyTipsMode()
+        {
+            ReleaseAltFocus();
+        }
+
+        internal void OnChildItemClick(BaseItem item)
+        {
+            if (this.ShowKeyTips || _AltFocusedControl != null && _AltFocusedControl.ShowKeyTips)
+            {
+                this.ShowKeyTips = false;
+                ReleaseAltFocus();
+            }
+        }
+
+        protected override bool OnSysMouseDown(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+            if (this.ShowKeyTips || _AltFocusedControl != null && _AltFocusedControl.ShowKeyTips)
+            {
+                this.ShowKeyTips = false;
+                ReleaseAltFocus();
+            }
+
+            return base.OnSysMouseDown(hWnd, wParam, lParam);
+        }
+
+        protected override bool ProcessMnemonic(char charCode)
+        {
+            if (_AltFocusedControl != null)
+            {
+                if (_AltFocusedControl.ProcessMnemonicEx(charCode))
+                {
+                    ReleaseAltFocus();
+                    return true;
+                }
+                return false;
+            }
+            if (!_AltFocus && (Control.ModifierKeys & Keys.Alt) != Keys.Alt)
+                return false;
+            return base.ProcessMnemonic(charCode);
+        }
+
+        public override bool ProcessMnemonicEx(char charCode)
+        {
+            // If different ribbon tab item is selected we should not exit the Alt mode...
+            BaseItem item = null;
+
+            if (_CaptionVisible)
+            {
+                item = GetItemForMnemonic(_StripContainer.CaptionContainer, charCode, false, true);
+                if (item != null)
+                {
+                    if (ProcessItemMnemonicKey(item))
+                    {
+                        ReleaseAltFocus();
+                        return true;
+                    }
+                }
+            }
+
+            MetroShell rc = this.GetMetroTab();
+
+            if (item == null)
+            {
+                item = GetItemForMnemonic(this.GetBaseItemContainer(), charCode, true, true);
+            }
+
+            if (item is MetroTabItem && item.Visible)
+            {
+                if (!_AltFocus)
+                {
+                    GiveKeyTipsAltFocus();
+                }
+                this.ShowKeyTips = false;
+                if (item != this.SelectedTab)
+                {
+                    // Switch the tab
+                    item.RaiseClick();
+                    //this.ShowKeyTips = true;
+                }
+                if (this.SelectedTab != null && _KeyTipsEnabled)
+                {
+                    if (_AltFocusedControl != null)
+                        _AltFocusedControl.ShowKeyTips = false;
+                    _AltFocusedControl = this.SelectedTab.Panel;
+                    if (_AltFocusedControl != null)
+                        _AltFocusedControl.ShowKeyTips = true;
+                }
+
+                // Keep the Alt focus
+                return true;
+            }
+            else if (item != null && ProcessItemMnemonicKey(item))
+            {
+                this.ShowKeyTips = false;
+                if (item is MetroAppButton)
+                {
+                    MetroAppButton appButton = (MetroAppButton)item;
+                    if (appButton.BackstageTab != null)
+                    {
+                        if (_AltFocusedControl != null)
+                            _AltFocusedControl.ShowKeyTips = false;
+                        _AltFocusedControl = appButton.BackstageTab.TabStrip;
+                        if (!_AltFocusedControl.ShowKeyTips)
+                            _AltFocusedControl.ShowKeyTips = true;
+                    }
+
+                }
+                return true;
+            }
+
+            //if (base.ProcessMnemonicEx(charCode))
+            //{
+            //    ReleaseAltFocus();
+            //    return true;
+            //}
+
+            if (_AltFocus && this.SelectedTab != null && this.SelectedTab.Panel != null)
+            {
+                Control panel = this.SelectedTab.Panel;
+                foreach (Control c in panel.Controls)
+                {
+                    if (c is RibbonBar && c.Visible)
+                    {
+                        if (IsMnemonic(charCode, c.Text))
+                        {
+                            // Select RibbonBar for Alt+ Key access
+                            this.ShowKeyTips = false;
+                            ((RibbonBar)c).ShowKeyTips = true;
+                            if (_AltFocusedControl != null)
+                                _AltFocusedControl.ShowKeyTips = false;
+                            _AltFocusedControl = (IKeyTipsControl)c;
+                            return true;
+                        }
+                    }
+                }
+            }
+
+            return false;
+        }
+
+        protected override void OnActiveWindowChanged()
+        {
+            ReleaseAltFocus();
+            base.OnActiveWindowChanged();
+        }
+
+        protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
+        {
+            return base.ProcessCmdKey(ref msg, keyData);
+        }
+
+        protected override bool ProcessDialogKey(Keys keyData)
+        {
+            return base.ProcessDialogKey(keyData);
+        }
+        #endregion
+
+        #region Caption Container Support
+        private bool _ShowIcon = true;
+        /// <summary>
+        /// Indicates whether Form.Icon is shown in top-left corner.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance"), Description("Indicates whether Form.Icon is shown in top-left corner.")]
+        public bool ShowIcon
+        {
+            get
+            {
+                return _ShowIcon;
+            }
+            set
+            {
+                if (_ShowIcon != value) 
+                {
+                    _ShowIcon = value;
+                    _StripContainer.NeedRecalcSize = true;
+                    this.RecalcLayout();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Called when item on popup container is right-clicked.
+        /// </summary>
+        /// <param name="item">Instance of the item that is right-clicked.</param>
+        protected override void OnPopupItemRightClick(BaseItem item)
+        {
+            MetroShell rc = this.GetMetroTab();
+            if (rc != null)
+                rc.ShowCustomizeContextMenu(item, false);
+        }
+        //private MetroTab GetMetroTab()
+        //{
+        //    Control parent = this.Parent;
+        //    while (parent != null && !(parent is MetroTab))
+        //        parent = parent.Parent;
+        //    if (parent is MetroTab)
+        //        return parent as MetroTab;
+        //    return null;
+        //}
+        protected override void OnMouseLeave(EventArgs e)
+        {
+            if (_TitleTextMarkup != null)
+                _TitleTextMarkup.MouseLeave(this);
+            base.OnMouseLeave(e);
+        }
+
+        internal bool MouseDownOnCaption
+        {
+            get
+            {
+                return _MouseDownOnCaption;
+            }
+        }
+
+        private MetroShell GetMetroTab()
+        {
+            return this.Parent as MetroShell;
+        }
+
+        internal void ShowSystemMenu(Point p)
+        {
+            Form form = this.FindForm();
+            if (form is MetroAppForm)
+                ((MetroAppForm)form).ShowSystemWindowMenu(p);
+            else
+            {
+                const int TPM_RETURNCMD = 0x0100;
+                byte[] bx = BitConverter.GetBytes(p.X);
+                byte[] by = BitConverter.GetBytes(p.Y);
+                byte[] blp = new byte[] { bx[0], bx[1], by[0], by[1] };
+                int lParam = BitConverter.ToInt32(blp, 0);
+                this.Capture = false;
+                NativeFunctions.SendMessage(form.Handle, NativeFunctions.WM_SYSCOMMAND, NativeFunctions.TrackPopupMenu(
+                    NativeFunctions.GetSystemMenu(form.Handle, false), TPM_RETURNCMD, p.X, p.Y, 0, form.Handle, IntPtr.Zero), lParam);
+            }
+        }
+
+        private bool _MouseDownOnCaption = false;
+        private Point _MouseDownPoint = Point.Empty;
+        protected override void OnMouseDown(MouseEventArgs e)
+        {
+            _MouseDownOnCaption = false;
+            _MouseDownPoint = e.Location;
+            if (_CaptionVisible)
+            {
+                _MouseDownOnCaption = HitTestCaption(new Point(e.X, e.Y));
+                if (e.Button == MouseButtons.Right && _MouseDownOnCaption)
+                {
+                    ShowSystemMenu(Control.MousePosition);
+                    return;
+                }
+
+                if (_TitleTextMarkup != null)
+                    _TitleTextMarkup.MouseDown(this, e);
+
+                e = TranslateMouseEventArgs(e);
+            }
+
+            if (e.Button == MouseButtons.Right && this.QuickToolbarBounds.Contains(e.X, e.Y))
+            {
+                MetroShell mt = this.GetMetroTab();
+                if (mt != null)
+                    mt.OnTabStripRightClick(this, e.X, e.Y);
+            }
+
+            base.OnMouseDown(e);
+        }
+
+        protected override void OnMouseUp(MouseEventArgs e)
+        {
+            if (_CaptionVisible)
+            {
+                if (_TitleTextMarkup != null)
+                    _TitleTextMarkup.MouseUp(this, e);
+
+                e = TranslateMouseEventArgs(e);
+            }
+            _MouseDownOnCaption = false;
+            base.OnMouseUp(e);
+        }
+
+        internal BaseItem GetApplicationButton()
+        {
+            if (!this.CaptionVisible)
+                return null;
+            BaseItem cont = this.CaptionContainerItem;
+
+            if (this.EffectiveStyle == eDotNetBarStyle.Office2010 && this.Items.Count > 0 && this.Items[0] is MetroAppButton)
+                return this.Items[0];
+
+            if (cont.SubItems.Count > 0 && cont.SubItems[0] is MetroAppButton)
+                return cont.SubItems[0];
+
+            if (cont.SubItems.Count > 0 && cont.SubItems[0] is ButtonItem && ((ButtonItem)cont.SubItems[0]).HotTrackingStyle == eHotTrackingStyle.Image)
+                return cont.SubItems[0];
+
+            return null;
+        }
+        /// <summary>
+        /// Starts moving of the parent form action which happens when user attempts to drag the form caption.
+        /// </summary>
+        public void StartFormMove()
+        {
+            Form form = this.FindForm();
+            if (form != null && form.WindowState == FormWindowState.Normal)
+            {
+                PopupItem popup = GetApplicationButton() as PopupItem;
+                if (popup != null && popup.Expanded) popup.Expanded = false;
+
+                const int HTCAPTION = 2;
+                Point p = Control.MousePosition;
+                byte[] bx = BitConverter.GetBytes(p.X);
+                byte[] by = BitConverter.GetBytes(p.Y);
+                byte[] blp = new byte[] { bx[0], bx[1], by[0], by[1] };
+                int lParam = BitConverter.ToInt32(blp, 0);
+                this.Capture = false;
+                NativeFunctions.SendMessage(form.Handle, NativeFunctions.WM_SYSCOMMAND, NativeFunctions.SC_MOVE + HTCAPTION, lParam);
+                _MouseDownOnCaption = false;
+            }
+        }
+        protected override void OnMouseMove(MouseEventArgs e)
+        {
+            if (_CaptionVisible)
+            {
+                if (e.Button == MouseButtons.Left && (_MouseDownOnCaption && HitTestCaption(new Point(e.X, e.Y)) || HitTest(_MouseDownPoint.X, _MouseDownPoint.Y)==null))
+                {
+                    Form form = this.FindForm();
+                    if (form != null && form.WindowState == FormWindowState.Normal)
+                    {
+                        StartFormMove();
+                        return;
+                    }
+                }
+                if (_TitleTextMarkup != null)
+                    _TitleTextMarkup.MouseMove(this, e);
+                e = TranslateMouseEventArgs(e);
+            }
+            base.OnMouseMove(e);
+        }
+
+        protected override void InternalOnClick(MouseButtons mb, Point mousePos)
+        {
+            if (_CaptionVisible)
+            {
+                MouseEventArgs e = new MouseEventArgs(mb, 0, mousePos.X, mousePos.Y, 0);
+                e = TranslateMouseEventArgs(e);
+                mousePos = new Point(e.X, e.Y);
+            }
+
+            base.InternalOnClick(mb, mousePos);
+        }
+
+        private MouseEventArgs TranslateMouseEventArgs(MouseEventArgs e)
+        {
+            if (e.Y <= 6)
+            {
+                Form form = this.FindForm();
+                if (form != null && form.WindowState == FormWindowState.Maximized && form is RibbonForm)
+                {
+                    if (e.X <= 4)
+                    {
+                        BaseItem sb = GetApplicationButton();
+                        if (sb != null)
+                        {
+                            e = new MouseEventArgs(e.Button, e.Clicks, sb.LeftInternal + 1, sb.TopInternal + 1, e.Delta);
+                        }
+                    }
+                    else if (e.X >= this.Width - 6)
+                        e = new MouseEventArgs(e.Button, e.Clicks, this.SystemCaptionItem.DisplayRectangle.Right - 4, this.SystemCaptionItem.DisplayRectangle.Top + 4, e.Delta);
+                    else
+                        e = new MouseEventArgs(e.Button, e.Clicks, e.X, this.CaptionContainerItem.TopInternal + 5, e.Delta);
+                }
+            }
+            return e;
+        }
+
+        protected override void OnClick(EventArgs e)
+        {
+            if (_CaptionVisible)
+            {
+                if (_TitleTextMarkup != null)
+                    _TitleTextMarkup.Click(this);
+            }
+            base.OnClick(e);
+        }
+
+        protected override void OnDoubleClick(EventArgs e)
+        {
+            if (_CaptionVisible)
+            {
+                // Check whether double click is on caption so window can be maximized/restored
+                Point p = this.PointToClient(Control.MousePosition);
+                if (HitTestCaption(p))
+                {
+                    Form form = this.FindForm();
+                    if (form != null && form.MaximizeBox && (form.FormBorderStyle == FormBorderStyle.Sizable || form.FormBorderStyle == FormBorderStyle.SizableToolWindow))
+                    {
+                        if (form.WindowState == FormWindowState.Normal)
+                        {
+                            NativeFunctions.PostMessage(form.Handle, NativeFunctions.WM_SYSCOMMAND, NativeFunctions.SC_MAXIMIZE, 0);
+                        }
+                        else if (form.WindowState == FormWindowState.Maximized)
+                        {
+                            NativeFunctions.PostMessage(form.Handle, NativeFunctions.WM_SYSCOMMAND, NativeFunctions.SC_RESTORE, 0);
+                        }
+                    }
+                }
+            }
+            base.OnDoubleClick(e);
+        }
+
+        /// <summary>
+        /// Returns true if point is inside the caption area.
+        /// </summary>
+        /// <param name="p">Client point coordinates.</param>
+        /// <returns>True if point is inside of caption area otherwise false.</returns>
+        protected bool HitTestCaption(Point p)
+        {
+            return _CaptionBounds.Contains(p);
+        }
+
+        private void SystemCaptionClick(object sender, EventArgs e)
+        {
+            SystemCaptionItem sci = sender as SystemCaptionItem;
+            Form frm = this.FindForm();
+
+            if (frm == null)
+                return;
+
+            if (sci.LastButtonClick == sci.MouseDownButton)
+            {
+                if (sci.LastButtonClick == SystemButton.Minimize)
+                {
+                    NativeFunctions.PostMessage(frm.Handle, NativeFunctions.WM_SYSCOMMAND, NativeFunctions.SC_MINIMIZE, 0);
+                }
+                else if (sci.LastButtonClick == SystemButton.Maximize)
+                {
+                    NativeFunctions.PostMessage(frm.Handle, NativeFunctions.WM_SYSCOMMAND, NativeFunctions.SC_MAXIMIZE, 0);
+                }
+                else if (sci.LastButtonClick == SystemButton.Restore)
+                {
+                    NativeFunctions.PostMessage(frm.Handle, NativeFunctions.WM_SYSCOMMAND, NativeFunctions.SC_RESTORE, 0);
+                }
+                else if (sci.LastButtonClick == SystemButton.Close)
+                {
+                    NativeFunctions.PostMessage(frm.Handle, NativeFunctions.WM_SYSCOMMAND, NativeFunctions.SC_CLOSE, 0);
+                }
+                else if (sci.LastButtonClick == SystemButton.Help)
+                {
+                    NativeFunctions.PostMessage(frm.Handle, NativeFunctions.WM_SYSCOMMAND, NativeFunctions.SC_CONTEXTHELP, 0);
+                }
+            }
+        }
+
+        internal void CloseParentForm()
+        {
+            Form frm = this.FindForm();
+
+            if (frm == null)
+                return;
+            
+            NativeFunctions.PostMessage(frm.Handle, NativeFunctions.WM_SYSCOMMAND, NativeFunctions.SC_CLOSE, 0);
+        }
+
+
+        protected override void OnResize(EventArgs e)
+        {
+            base.OnResize(e);
+            if (!_CaptionVisible)
+                return;
+
+            Form frm = this.FindForm();
+            if (frm == null)
+                return;
+
+            if (frm.WindowState == FormWindowState.Maximized || frm.WindowState == FormWindowState.Minimized)
+                _StripContainer.SystemCaptionItem.RestoreEnabled = true;
+            else
+                _StripContainer.SystemCaptionItem.RestoreEnabled = false;
+        }
+
+        /// <summary>
+        /// Returns collection of items on a bar.
+        /// </summary>
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content), Browsable(false)]
+        public SubItemsCollection QuickToolbarItems
+        {
+            get { return _StripContainer.CaptionContainer.SubItems; }
+        }
+
+        /// <summary>
+        /// Gets the reference to the internal container item for the items displayed in control caption.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public GenericItemContainer CaptionContainerItem
+        {
+            get { return _StripContainer.CaptionContainer; }
+        }
+
+        /// <summary>
+        /// Gets the reference to the internal container for the ribbon tabs and other items.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public SimpleItemContainer StripContainerItem
+        {
+            get { return _StripContainer.RibbonStripContainer; }
+        }
+
+        internal MetroStripContainerItem MetroStripContainer
+        {
+            get
+            {
+                return _StripContainer;
+            }
+        }
+
+        protected override void PaintKeyTips(Graphics g)
+        {
+            if (!this.ShowKeyTips)
+                return;
+
+            KeyTipsRendererEventArgs e = new KeyTipsRendererEventArgs(g, Rectangle.Empty, "", GetKeyTipFont(), null);
+
+            DevComponents.DotNetBar.Rendering.BaseRenderer renderer = GetRenderer();
+            PaintContainerKeyTips(_StripContainer.RibbonStripContainer, renderer, e);
+            if (_CaptionVisible)
+                PaintContainerKeyTips(_StripContainer.CaptionContainer, renderer, e);
+        }
+
+        protected override Rectangle GetKeyTipRectangle(Graphics g, BaseItem item, Font font, string keyTip)
+        {
+            Rectangle r = base.GetKeyTipRectangle(g, item, font, keyTip);
+            if (this.QuickToolbarItems.Contains(item))
+                r.Y += 4;
+            return r;
+        }
+        #endregion
+
+        #region Mdi Child System Item
+        internal void ClearMDIChildSystemItems(bool bRecalcLayout)
+        {
+            if (_StripContainer.RibbonStripContainer == null)
+                return;
+            bool recalc = false;
+            try
+            {
+                if (this.Items.Contains("dotnetbarsysiconitem"))
+                {
+                    this.Items.Remove("dotnetbarsysiconitem");
+                    recalc = true;
+                }
+                if (this.Items.Contains("dotnetbarsysmenuitem"))
+                {
+                    this.Items.Remove("dotnetbarsysmenuitem");
+                    recalc = true;
+                }
+                if (bRecalcLayout && recalc)
+                    this.RecalcLayout();
+            }
+            catch (Exception)
+            {
+            }
+        }
+
+        internal void ShowMDIChildSystemItems(System.Windows.Forms.Form objMdiChild, bool bRecalcLayout)
+        {
+            ClearMDIChildSystemItems(bRecalcLayout);
+
+            if (objMdiChild == null)
+                return;
+
+            MDISystemItem mdi = new MDISystemItem("dotnetbarsysmenuitem");
+            if (!objMdiChild.ControlBox)
+                mdi.CloseEnabled = false;
+            if (!objMdiChild.MinimizeBox)
+                mdi.MinimizeEnabled = false;
+            if (!objMdiChild.MaximizeBox)
+            {
+                mdi.RestoreEnabled = false;
+            }
+            mdi.ItemAlignment = eItemAlignment.Far;
+            mdi.Click += new System.EventHandler(this.MDISysItemClick);
+
+            this.Items.Add(mdi);
+
+            if (bRecalcLayout)
+                this.RecalcLayout();
+        }
+
+        private void MDISysItemClick(object sender, System.EventArgs e)
+        {
+            MDISystemItem mdi = sender as MDISystemItem;
+            Form frm = this.FindForm();
+            if (frm != null)
+                frm = frm.ActiveMdiChild;
+            if (frm == null)
+            {
+                ClearMDIChildSystemItems(true);
+                return;
+            }
+            if (mdi.LastButtonClick == SystemButton.Minimize)
+            {
+                NativeFunctions.PostMessage(frm.Handle, NativeFunctions.WM_SYSCOMMAND, NativeFunctions.SC_MINIMIZE, 0);
+            }
+            else if (mdi.LastButtonClick == SystemButton.Restore)
+            {
+                NativeFunctions.PostMessage(frm.Handle, NativeFunctions.WM_SYSCOMMAND, NativeFunctions.SC_RESTORE, 0);
+            }
+            else if (mdi.LastButtonClick == SystemButton.Close)
+            {
+                NativeFunctions.PostMessage(frm.Handle, NativeFunctions.WM_SYSCOMMAND, NativeFunctions.SC_CLOSE, 0);
+            }
+            else if (mdi.LastButtonClick == SystemButton.NextWindow)
+            {
+                NativeFunctions.PostMessage(frm.Handle, NativeFunctions.WM_SYSCOMMAND, NativeFunctions.SC_NEXTWINDOW, 0);
+            }
+        }
+        #endregion
+
+        internal void InvokeMouseDown(MouseEventArgs e)
+        {
+            OnMouseDown(e);
+        }
+
+        internal void InvokeMouseMove(MouseEventArgs e)
+        {
+            OnMouseMove(e);
+        }
+
+        internal void InvokeMouseUp(MouseEventArgs e)
+        {
+            OnMouseUp(e);
+        }
+
+        internal void InvokeClick(EventArgs e)
+        {
+            OnClick(e);
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Metro/MetroTileItem.cs b/PROMS/DotNetBar Source Code/Metro/MetroTileItem.cs
new file mode 100644
index 00000000..ce558960
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Metro/MetroTileItem.cs	
@@ -0,0 +1,2348 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+using System.ComponentModel;
+using DevComponents.DotNetBar.Metro.Rendering;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.Primitives;
+
+namespace DevComponents.DotNetBar.Metro
+{
+    /// <summary>
+    /// Represents Metro Tile.
+    /// </summary>
+    [DefaultEvent("Click"), DefaultProperty("Text")]
+    [ToolboxItem(false), Designer("DevComponents.DotNetBar.Design.SimpleItemDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+    public class MetroTileItem : BaseItem
+    {
+        #region Events
+        /// <summary>
+        /// Occurs after Checked property has changed.
+        /// </summary>
+        [Description("Occurs after Checked property has changed.")]
+        public event EventHandler CheckedChanged;
+        /// <summary>
+        /// Raises CheckedChanged event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnCheckedChanged(EventArgs e)
+        {
+            EventHandler handler = CheckedChanged;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        /// <summary>
+        /// Occurs before an item in option group is checked and provides opportunity to cancel that.
+        /// </summary>
+        [Description("Occurs before an item in option group is checked and provides opportunity to cancel that.")]
+        public event OptionGroupChangingEventHandler OptionGroupChanging;
+        /// <summary>
+        /// Raises OptionGroupChanging event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnOptionGroupChanging(OptionGroupChangingEventArgs e)
+        {
+            OptionGroupChangingEventHandler handler = OptionGroupChanging;
+            if (handler != null)
+                handler(this, e);
+
+            if (!e.Cancel)
+            {
+                IOwnerItemEvents owner = this.GetIOwnerItemEvents();
+                if (owner != null)
+                    owner.InvokeOptionGroupChanging(this, e);
+            }
+        }
+        #endregion
+
+        #region Constructor
+        private static readonly Size DefaultTileSize = new Size(180, 90);
+        /// <summary>
+        /// Creates new instance of metro tile.
+        /// </summary>
+        public MetroTileItem() : this("", "") { }
+        /// <summary>
+        /// Creates new instance of metro tile and assigns the name to it.
+        /// </summary>
+        /// <param name="sItemName">Item name.</param>
+        public MetroTileItem(string sItemName) : this(sItemName, "") { }
+        /// <summary>
+        /// Creates new instance of metro tile and assigns the name and text to it.
+        /// </summary>
+        /// <param name="sItemName">Item name.</param>
+        /// <param name="ItemText">item text.</param>
+        public MetroTileItem(string sItemName, string ItemText)
+            : base(sItemName, ItemText)
+        {
+            _Frames = new CustomCollection<MetroTileFrame>();
+            _Frames.CollectionChanged += new NotifyCollectionChangedEventHandler(FramesCollectionChanged);
+            MetroTileFrame frame = new MetroTileFrame();
+            frame.MarkupLinkClick += new MarkupLinkClickEventHandler(FrameMarkupLinkClick);
+            _Frames.Add(frame);
+        }
+
+        /// <summary>
+        /// Occurs when text markup link is clicked. Markup links can be created using "a" tag, for example:
+        /// <a name="MyLink">Markup link</a>
+        /// </summary>
+        [Description("Occurs when text markup link is clicked. Markup links can be created using a tag.")]
+        public event MarkupLinkClickEventHandler MarkupLinkClick;
+        protected virtual void OnMarkupLinkClick(MarkupLinkClickEventArgs e)
+        {
+            if (this.MarkupLinkClick != null)
+                MarkupLinkClick(this, e);
+        }
+        private void FrameMarkupLinkClick(object sender, MarkupLinkClickEventArgs e)
+        {
+            OnMarkupLinkClick(e);
+        }
+        /// <summary>
+        /// Returns copy of the item.
+        /// </summary>
+        public override BaseItem Copy()
+        {
+            MetroTileItem objCopy = new MetroTileItem(m_Name);
+            this.CopyToItem(objCopy);
+            return objCopy;
+        }
+
+        /// <summary>
+        /// Copies the MetroTileItem specific properties to new instance of the item.
+        /// </summary>
+        /// <param name="copy">New ProgressBarItem instance.</param>
+        internal void InternalCopyToItem(MetroTileItem copy)
+        {
+            CopyToItem(copy);
+        }
+
+        /// <summary>
+        /// Copies the MetroTileItem specific properties to new instance of the item.
+        /// </summary>
+        /// <param name="copy">New MetroTileItem instance.</param>
+        protected override void CopyToItem(BaseItem copy)
+        {
+            base.CopyToItem(copy);
+
+            MetroTileItem tile = copy as MetroTileItem;
+            tile.AnimationDuration = this.AnimationDuration;
+            tile.AnimationEnabled = this.AnimationEnabled;
+            tile.AutoRotateFramesInterval = this.AutoRotateFramesInterval;
+            tile.CheckBehavior = this.CheckBehavior;
+            tile.Checked = this.Checked;
+            tile.DisabledBackColor = this.DisabledBackColor;
+            tile.EnableMarkup = this.EnableMarkup;
+            tile.Image = this.Image;
+            tile.Symbol = this.Symbol;
+            tile.SymbolSet = this.SymbolSet;
+            tile.SymbolSize = this.SymbolSize;
+            tile.SymbolColor = this.SymbolColor;
+            tile.ImageIndent = this.ImageIndent;
+            tile.ImageTextAlignment = this.ImageTextAlignment;
+            tile.OptionGroup = this.OptionGroup;
+            tile.TileColor = this.TileColor;
+            tile.TileSize = this.TileSize;
+            tile.TitleText = this.TitleText;
+            tile.TitleTextAlignment = this.TitleTextAlignment;
+            tile.TitleTextColor = this.TitleTextColor;
+            tile.TitleTextFont = this.TitleTextFont;
+            tile.Text = this.Text;
+
+            tile.NotificationMarkColor = this.NotificationMarkColor;
+            tile.NotificationMarkPosition = this.NotificationMarkPosition;
+            tile.NotificationMarkSize = this.NotificationMarkSize;
+            tile.NotificationMarkText = this.NotificationMarkText;
+
+            for (int i = 1; i < this.Frames.Count; i++)
+            {
+                tile.Frames.Add((MetroTileFrame)this.Frames[i].Clone());
+            }
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            DisposeCurrentAnimation();
+            DestroyAutoRotateTimer();
+            _Frames.Dispose();
+            base.Dispose(disposing);
+        }
+        #endregion
+
+        #region Implementation
+
+        private string _NotificationMarkText = "";
+        /// <summary>
+        /// Specifies maximum of 2 character text displayed inside of the notification mark on top of the button.
+        /// </summary>
+        [DefaultValue(""), Category("Appearance"), Description("Specifies maximum of 2 character text displayed inside of the notification mark on top of the button.")]
+        public string NotificationMarkText
+        {
+            get { return _NotificationMarkText; }
+            set
+            {
+                if (value != _NotificationMarkText)
+                {
+                    string oldValue = _NotificationMarkText;
+                    _NotificationMarkText = value;
+                    OnNotificationMarkTextChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when NotificationMarkText property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnNotificationMarkTextChanged(string oldValue, string newValue)
+        {
+            if (string.IsNullOrEmpty(newValue)) _NotificationMarkWasDisplayed = true; // Make sure button gets invalidated properly
+            this.Refresh();
+        }
+
+        private eNotificationMarkPosition _NotificationMarkPosition = eNotificationMarkPosition.TopLeft;
+        /// <summary>
+        /// Indicates the position of the notification marker within the bounds of the button.
+        /// </summary>
+        [DefaultValue(eNotificationMarkPosition.TopLeft), Category("Appearance"), Description("Indicates the position of the notification marker within the bounds of the button.")]
+        public eNotificationMarkPosition NotificationMarkPosition
+        {
+            get { return _NotificationMarkPosition; }
+            set
+            {
+                if (value != _NotificationMarkPosition)
+                {
+                    eNotificationMarkPosition oldValue = _NotificationMarkPosition;
+                    _NotificationMarkPosition = value;
+                    OnNotificationMarkPositionChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when NotificationMarkPosition property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnNotificationMarkPositionChanged(eNotificationMarkPosition oldValue, eNotificationMarkPosition newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("NotificationMarkPosition"));
+            if (!string.IsNullOrEmpty(_NotificationMarkText))
+                this.Refresh();
+        }
+        private int _NotificationMarkSize = 0;
+        /// <summary>
+        /// Specifies diameter of notification mark. When set to 0 system default value is used.
+        /// </summary>
+        [DefaultValue(0), Category("Appearance"), Description("Specifies diameter of notification mark. When set to 0 system default value is used.")]
+        public int NotificationMarkSize
+        {
+            get { return _NotificationMarkSize; }
+            set
+            {
+                if (value != _NotificationMarkSize)
+                {
+                    int oldValue = _NotificationMarkSize;
+                    _NotificationMarkSize = value;
+                    OnNotificationMarkSizeChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when NotificationMarkSize property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnNotificationMarkSizeChanged(int oldValue, int newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("NotificationMarkSize"));
+            this.Refresh();
+        }
+        private Color _NotificationMarkColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets background color of the notification mark.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates background color of the notification mark.")]
+        public Color NotificationMarkColor
+        {
+            get { return _NotificationMarkColor; }
+            set { _NotificationMarkColor = value; this.Refresh(); }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeNotificationMarkColor()
+        {
+            return !_NotificationMarkColor.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetNotificationMarkColor()
+        {
+            this.NotificationMarkColor = Color.Empty;
+        }
+        private static readonly Point DefaultNotificationMarkOffset = new Point(-2, -2);
+        private Point _NotificationMarkOffset = DefaultNotificationMarkOffset;
+        /// <summary>
+        /// Specifies the offset for the notification mark relative to its position.
+        /// </summary>
+        [Category("Appearance"), Description("Specifies the offset for the notification mark relative to its position.")]
+        public Point NotificationMarkOffset
+        {
+            get { return _NotificationMarkOffset; }
+            set
+            {
+                if (value != _NotificationMarkOffset)
+                {
+                    Point oldValue = _NotificationMarkOffset;
+                    _NotificationMarkOffset = value;
+                    OnNotificationMarkOffsetChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when NotificationMarkOffset property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnNotificationMarkOffsetChanged(Point oldValue, Point newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("NotificationMarkOffset"));
+            this.Invalidate();
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeNotificationMarkOffset()
+        {
+            return _NotificationMarkOffset != DefaultNotificationMarkOffset;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetNotificationMarkOffset()
+        {
+            this.NotificationMarkOffset = DefaultNotificationMarkOffset;
+        }
+        private bool _NotificationMarkWasDisplayed = false;
+        protected override Rectangle GetInvalidateBounds()
+        {
+            if (_NotificationMarkWasDisplayed || !string.IsNullOrEmpty(_NotificationMarkText))
+            {
+                _NotificationMarkWasDisplayed = false;
+                Rectangle r = base.GetInvalidateBounds();
+                r.Inflate(6, 6);
+                return r;
+            }
+            return base.GetInvalidateBounds();
+        }
+
+        private void FramesCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            if (e.OldItems != null && e.OldItems.Count > 0)
+            {
+                foreach (MetroTileFrame item in e.OldItems)
+                {
+                    item.PropertyChanged -= FramePropertyChanged;
+                }
+            }
+            if (e.NewItems != null && e.NewItems.Count > 0)
+            {
+                foreach (MetroTileFrame item in e.NewItems)
+                {
+                    item.PropertyChanged += FramePropertyChanged;
+                }
+            }
+
+            if (_CurrentFrame >= _Frames.Count)
+            {
+                _CurrentFrame = 0;
+                this.Refresh();
+            }
+        }
+        private void FramePropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            if (e.PropertyName == "TileStyle" || e.PropertyName == "TitleText" || e.PropertyName == "TitleTextAlignment"
+                || e.PropertyName == "Image" || e.PropertyName == "ImageIndent" || e.PropertyName == "Text" || e.PropertyName == "TextMarkupEnabled"
+                || e.PropertyName == "ImageTextAlignment" || e.PropertyName == "Symbol" || e.PropertyName == "SymbolSize")
+                this.NeedRecalcSize = true;
+            this.Refresh();
+        }
+
+        /// <summary>
+        /// Occurs just before Click event is fired.
+        /// </summary>
+        protected override void OnClick()
+        {
+            base.OnClick();
+            ExecuteCommand();
+        }
+        private Rectangle _LastRenderBounds = Rectangle.Empty;
+        public override void Paint(ItemPaintArgs p)
+        {
+            if (p.AnimationEnabled && p.AnimationRequests != null && !_LastRenderBounds.IsEmpty && m_Rect != _LastRenderBounds)
+            {
+                // Animate transition
+                Rectangle newBounds = m_Rect;
+                m_Rect = _LastRenderBounds;
+                _LastRenderBounds = Rectangle.Empty;
+                Animation.AnimationRequest ar = new DevComponents.DotNetBar.Animation.AnimationRequest(this, "Bounds", m_Rect, newBounds);
+                p.AnimationRequests.Add(ar);
+                return;
+            }
+            MetroRender.Paint(this, p);
+
+            if (this.Focused && this.DesignMode)
+            {
+                Rectangle r = m_Rect;
+                r.Inflate(-1, -1);
+                DesignTime.DrawDesignTimeSelection(p.Graphics, r, p.Colors.ItemDesignTimeBorder);
+            }
+            _LastRenderBounds = m_Rect;
+
+            if (!string.IsNullOrEmpty(_NotificationMarkText))
+                DevComponents.DotNetBar.Rendering.NotificationMarkPainter.Paint(p.Graphics, this.Bounds,
+                    _NotificationMarkPosition, _NotificationMarkText,
+                    (_NotificationMarkSize > 0 ? new Size(_NotificationMarkSize, _NotificationMarkSize) : DefaultMarkSize), _NotificationMarkOffset, _NotificationMarkColor, p.ContainerClipRectangle);
+
+            if (!(p.ContainerControl is MetroTilePanel))
+                this.DrawInsertMarker(p.Graphics);
+        }
+        private static readonly Size DefaultMarkSize = new Size(16, 16);
+
+        public override void RecalcSize()
+        {
+            Control control = this.ContainerControl as Control;
+            if (control == null || control.Disposing || control.IsDisposed)
+                return;
+
+            Graphics g = BarFunctions.CreateGraphics(control);
+            if (g == null) return;
+            bool rightToLeft = (control.RightToLeft == RightToLeft.Yes);
+            Size tileSize = Dpi.Size(_TileSize);
+            for (int i = 0; i < _Frames.Count; i++)
+            {
+                MetroTileFrame frame = _Frames[i];
+
+                bool dispose = false;
+                ElementStyle style = ElementStyleDisplay.GetElementStyle(frame.EffectiveStyle, out dispose);
+                int textWidth = tileSize.Width - style.PaddingHorizontal;
+                int maxItemWidth = 0;
+                // Child items positioned in top-left corner
+                if (m_SubItems != null && i < m_SubItems.Count)
+                {
+                    BaseItem item = m_SubItems[i];
+                    if (item.Visible)
+                    {
+                        item.LeftInternal = m_Rect.Left + style.PaddingLeft;
+                        item.TopInternal = m_Rect.Top + style.PaddingTop;
+                        item.WidthInternal = tileSize.Width - style.PaddingHorizontal;
+                        item.HeightInternal = tileSize.Height - style.PaddingVertical;
+                        item.RecalcSize();
+                        item.Displayed = true;
+                        maxItemWidth = Math.Max(maxItemWidth, item.WidthInternal);
+                    }
+                    else
+                        item.Displayed = false;
+                }
+                textWidth = Math.Max(12, textWidth - maxItemWidth);
+
+                ContentAlignment imageTextAlign = frame.ImageTextAlignment;
+                if (!string.IsNullOrEmpty(frame.SymbolRealized))
+                {
+                    Font symFont = Symbols.GetFont(frame.SymbolSize, frame.SymbolSet);
+                    Size imageSize = TextDrawing.MeasureString(g, "\uF00A", symFont); // Need to do this to get consistent size for the symbol since they are not all the same width we pick widest
+                    //imageSize = TextDrawing.MeasureString(g, button.Symbol, symFont);
+                    int descent = (int)Math.Ceiling((symFont.FontFamily.GetCellDescent(symFont.Style) *
+                        symFont.Size / symFont.FontFamily.GetEmHeight(symFont.Style)));
+                    imageSize.Height -= descent;
+
+                    if (imageTextAlign == ContentAlignment.TopLeft || imageTextAlign == ContentAlignment.TopRight ||
+                        imageTextAlign == ContentAlignment.BottomLeft || imageTextAlign == ContentAlignment.BottomRight ||
+                        imageTextAlign == ContentAlignment.MiddleLeft || imageTextAlign == ContentAlignment.MiddleRight)
+                        textWidth = Math.Max(12, textWidth - imageSize.Width);
+                }
+                else if (frame.Image != null)
+                {
+                    if (imageTextAlign == ContentAlignment.TopLeft || imageTextAlign == ContentAlignment.TopRight ||
+                        imageTextAlign == ContentAlignment.BottomLeft || imageTextAlign == ContentAlignment.BottomRight ||
+                        imageTextAlign == ContentAlignment.MiddleLeft || imageTextAlign == ContentAlignment.MiddleRight)
+                        textWidth = Math.Max(12, textWidth - Dpi.ImageWidth(frame.Image.Width));
+                }
+
+                if (frame.Text != "")
+                    MetroTileFrame.MeasureText(frame, g, textWidth, control.Font, eTextFormat.Default, rightToLeft);
+                Size titleSize = Size.Empty;
+                frame.TitleTextBounds = Rectangle.Empty;
+                if (frame.TitleTextMarkupBody != null)
+                {
+                    Font titleFont = GetTitleTextFont(frame, style, control);
+                    Size availSize = new Size(textWidth, 1);
+                    TextMarkup.MarkupDrawContext d = new TextMarkup.MarkupDrawContext(g, titleFont, System.Drawing.Color.Empty, false);
+                    frame.TitleTextMarkupBody.Measure(availSize, d);
+                    availSize.Height = frame.TitleTextMarkupBody.Bounds.Size.Height;
+                    d.RightToLeft = rightToLeft;
+                    frame.TitleTextMarkupBody.Arrange(new Rectangle(0, 0, availSize.Width, availSize.Height), d);
+                    titleSize = frame.TitleTextMarkupBody.Bounds.Size;
+                }
+                else if (!string.IsNullOrEmpty(frame.TitleText))
+                {
+                    Font titleFont = GetTitleTextFont(frame, style, control);
+                    Size availSize = new Size(tileSize.Width - style.PaddingHorizontal, tileSize.Height);
+                    titleSize = TextDrawing.MeasureString(g, frame.TitleText, titleFont, availSize.Width, eTextFormat.Default | eTextFormat.SingleLine);
+                }
+
+                if (!titleSize.IsEmpty)
+                {
+                    titleSize.Width = Math.Min(titleSize.Width + 2, tileSize.Width);
+                    if (frame.TitleTextAlignment == ContentAlignment.BottomCenter)
+                        frame.TitleTextBounds = new Rectangle(style.PaddingLeft + (tileSize.Width - style.PaddingHorizontal - titleSize.Width) / 2, tileSize.Height - titleSize.Height - style.PaddingBottom - 3, tileSize.Width, titleSize.Height + 1);
+                    else if (frame.TitleTextAlignment == ContentAlignment.BottomLeft)
+                        frame.TitleTextBounds = new Rectangle(style.PaddingLeft, tileSize.Height - titleSize.Height - style.PaddingBottom - 3, titleSize.Width, titleSize.Height + 1);
+                    else if (frame.TitleTextAlignment == ContentAlignment.BottomRight)
+                        frame.TitleTextBounds = new Rectangle(tileSize.Width - style.PaddingRight - titleSize.Width, tileSize.Height - titleSize.Height - style.PaddingBottom - 3, titleSize.Width, titleSize.Height + 1);
+                    else if (frame.TitleTextAlignment == ContentAlignment.MiddleCenter)
+                        frame.TitleTextBounds = new Rectangle(style.PaddingLeft + (tileSize.Width - style.PaddingHorizontal - titleSize.Width) / 2, style.PaddingTop + (tileSize.Height - style.PaddingVertical - titleSize.Height) / 2, tileSize.Width, titleSize.Height + 1);
+                    else if (frame.TitleTextAlignment == ContentAlignment.MiddleLeft)
+                        frame.TitleTextBounds = new Rectangle(style.PaddingLeft, style.PaddingTop + (tileSize.Height - style.PaddingVertical - titleSize.Height) / 2, titleSize.Width, titleSize.Height + 1);
+                    else if (frame.TitleTextAlignment == ContentAlignment.MiddleRight)
+                        frame.TitleTextBounds = new Rectangle(tileSize.Width - style.PaddingRight - titleSize.Width, style.PaddingTop + (tileSize.Height - style.PaddingVertical - titleSize.Height) / 2, titleSize.Width, titleSize.Height + 1);
+                    else if (frame.TitleTextAlignment == ContentAlignment.TopCenter)
+                        frame.TitleTextBounds = new Rectangle(style.PaddingLeft + (tileSize.Width - style.PaddingHorizontal - titleSize.Width) / 2, style.PaddingTop, titleSize.Width, titleSize.Height + 1);
+                    else if (frame.TitleTextAlignment == ContentAlignment.TopLeft)
+                        frame.TitleTextBounds = new Rectangle(style.PaddingLeft, style.PaddingTop, titleSize.Width, titleSize.Height + 1);
+                    else if (frame.TitleTextAlignment == ContentAlignment.TopRight)
+                        frame.TitleTextBounds = new Rectangle(tileSize.Width - style.PaddingRight - titleSize.Width, style.PaddingTop, titleSize.Width, titleSize.Height + 1);
+                }
+
+                if (dispose) style.Dispose();
+            }
+
+            m_Rect = new Rectangle(m_Rect.X, m_Rect.Y, tileSize.Width, tileSize.Height);
+            base.RecalcSize();
+        }
+
+        internal Font GetTitleTextFont(MetroTileFrame frame, ElementStyle style, Control control)
+        {
+            Font titleFont = frame.TitleTextFont;
+            if (titleFont == null && style != null) titleFont = style.Font;
+            if (titleFont == null && control != null) titleFont = control.Font;
+            if (titleFont == null) titleFont = SystemFonts.DefaultFont; // SystemInformation.MenuFont;
+
+            return titleFont;
+        }
+        private void TileStyleChanged(object sender, EventArgs e)
+        {
+            this.NeedRecalcSize = true;
+            this.OnAppearanceChanged();
+        }
+
+        private Size _TileSize = DefaultTileSize;
+        /// <summary>
+        /// Gets or sets the tile size.
+        /// </summary>
+        [Description("Indicates Tile Size"), Category("Appearance")]
+        public Size TileSize
+        {
+            get { return _TileSize; }
+            set
+            {
+                if (value != _TileSize)
+                {
+                    Size oldValue = _TileSize;
+                    _TileSize = value;
+                    OnTileSizeChanged(oldValue, value);
+                }
+            }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeTileSize()
+        {
+            return _TileSize != DefaultTileSize;
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetTileSize()
+        {
+            TileSize = DefaultTileSize;
+        }
+        /// <summary>
+        /// Called when TileSize property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnTileSizeChanged(Size oldValue, Size newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("TileSize"));
+            NeedRecalcSize = true;
+            this.OnAppearanceChanged();
+        }
+
+        /// <summary>
+        /// Gets or sets the predefined tile color for default tile frame.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates predefined tile color for default tile frame.")]
+        public eMetroTileColor TileColor
+        {
+            get { return _Frames[0].TileColor; }
+            set { _Frames[0].TileColor = value; }
+        }
+
+        /// <summary>
+        /// Specifies the Tile style default tile frame.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Category("Style"), Description("Gets or sets Tile style for default tile frame."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ElementStyle TileStyle
+        {
+            get { return _Frames[0].TileStyle; }
+        }
+
+        /// <summary>
+        /// Indicates the symbol displayed on face of the tile instead of the image. Setting the symbol overrides the image setting.
+        /// </summary>
+        [DefaultValue(""), Category("Appearance"), Description("Indicates the symbol displayed on face of the tile instead of the image. Setting the symbol overrides the image setting.")]
+        [Editor("DevComponents.DotNetBar.Design.SymbolTypeEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor))]
+        public string Symbol
+        {
+            get { return _Frames[0].Symbol; }
+            set { _Frames[0].Symbol = value;  }
+        }
+
+        /// <summary>
+        /// Gets or sets the symbol set used to represent the Symbol.
+        /// </summary>
+        [Browsable(false), DefaultValue(eSymbolSet.Awesome)]
+        public eSymbolSet SymbolSet
+        {
+            get { return _Frames[0].SymbolSet; }
+            set { _Frames[0].SymbolSet = value; }
+        }
+        /// <summary>
+        /// Called when SymbolSet property value changes.
+        /// </summary>
+        /// <param name="oldValue">Indciates old value</param>
+        /// <param name="newValue">Indicates new value</param>
+        protected virtual void OnSymbolSetChanged(eSymbolSet oldValue, eSymbolSet newValue)
+        {
+            NeedRecalcSize = true;
+            OnAppearanceChanged();
+            this.Refresh();
+        }
+
+        /// <summary>
+        /// Indicates the size of the symbol in points.
+        /// </summary>
+        [DefaultValue(0f), Category("Appearance"), Description("Indicates the size of the symbol in points.")]
+        public float SymbolSize
+        {
+            get { return _Frames[0].SymbolSize; }
+            set { _Frames[0].SymbolSize = value; }
+        }
+        /// <summary>
+        /// Gets or sets the color of the symbol.
+        /// </summary>
+        [Category("Columns"), Description("Indicates color of the symbol.")]
+        public Color SymbolColor
+        {
+            get { return _Frames[0].SymbolColor; }
+            set { _Frames[0].SymbolColor = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the image displayed on the tile.
+        /// </summary>
+        [DefaultValue(null), Category("Appearance"), Description("Indicates image displayed on the tile.")]
+        public Image Image
+        {
+            get { return _Frames[0].Image; }
+            set { _Frames[0].Image = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets image alignment in relation to text.
+        /// </summary>
+        [DefaultValue(ContentAlignment.TopLeft), Category("Appearance"), Description("Indicates the image alignment in relation to text.")]
+        public ContentAlignment ImageTextAlignment
+        {
+            get { return _Frames[0].ImageTextAlignment; }
+            set { _Frames[0].ImageTextAlignment = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the text associated with this item.
+        /// </summary>
+        [Browsable(true), Editor("DevComponents.DotNetBar.Design.TextMarkupUIEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), System.ComponentModel.Category("Appearance"), System.ComponentModel.Description("The text contained in the item."), Localizable(true), DefaultValue("")]
+        public override string Text
+        {
+            get
+            {
+                return _Frames[0].Text;
+            }
+            set
+            {
+                _Frames[0].Text = value;
+            }
+        }
+
+        public override void InternalClick(MouseButtons mb, Point mpos)
+        {
+            base.InternalClick(mb, mpos);
+
+            MetroTileFrame frame = GetCurrentFrame();
+            if (frame != null && frame.TextMarkupBody != null)
+                frame.TextMarkupBody.Click(this.ContainerControl as Control);
+        }
+
+        public override void InternalMouseDown(System.Windows.Forms.MouseEventArgs objArg)
+        {
+            bool isEnabled = GetEnabled();
+            if (objArg.Button == System.Windows.Forms.MouseButtons.Left && isEnabled)
+                IsLeftMouseButtonDown = true;
+
+            if (isEnabled)
+            {
+                eMetroTileCheckBehavior checkBehavior = EffectiveCheckBehavior;
+                if (checkBehavior == eMetroTileCheckBehavior.LeftMouseButtonClick && objArg.Button == MouseButtons.Left)
+                    this.Checked = !this.Checked;
+                else if (checkBehavior == eMetroTileCheckBehavior.MiddleMouseButtonClick && objArg.Button == MouseButtons.Middle)
+                    this.Checked = !this.Checked;
+                else if (checkBehavior == eMetroTileCheckBehavior.RightMouseButtonClick && objArg.Button == MouseButtons.Right)
+                    this.Checked = !this.Checked;
+            }
+
+            MetroTileFrame frame = GetCurrentFrame();
+            if (frame != null && frame.TextMarkupBody != null)
+                frame.TextMarkupBody.MouseDown(this.ContainerControl as Control, objArg);
+
+            base.InternalMouseDown(objArg);
+        }
+        public override void InternalMouseUp(System.Windows.Forms.MouseEventArgs objArg)
+        {
+            if (objArg.Button == System.Windows.Forms.MouseButtons.Left || Control.MouseButtons != MouseButtons.Left) IsLeftMouseButtonDown = false;
+
+            MetroTileFrame frame = GetCurrentFrame();
+            if (frame != null && frame.TextMarkupBody != null)
+                frame.TextMarkupBody.MouseUp(this.ContainerControl as Control, objArg);
+
+            base.InternalMouseUp(objArg);
+        }
+        public override void InternalMouseMove(System.Windows.Forms.MouseEventArgs objArg)
+        {
+            if (GetEnabled())
+                IsMouseOver = true;
+            try
+            {
+                if (!this.DesignMode)
+                    SetIsContainer(true);
+                base.InternalMouseMove(objArg);
+
+                MetroTileFrame frame = GetCurrentFrame();
+                if (frame != null && frame.TextMarkupBody != null)
+                    frame.TextMarkupBody.MouseMove(this.ContainerControl as Control, objArg);
+            }
+            finally
+            {
+                SetIsContainer(false);
+            }
+        }
+        public override void InternalMouseLeave()
+        {
+            IsMouseOver = false;
+            IsLeftMouseButtonDown = false;
+            MetroTileFrame frame = GetCurrentFrame();
+            if (frame != null && frame.TextMarkupBody != null)
+                frame.TextMarkupBody.MouseLeave(this.ContainerControl as Control);
+            base.InternalMouseLeave();
+        }
+
+        private MetroTileFrame GetCurrentFrame()
+        {
+            if(this.CurrentFrame<0 || this.CurrentFrame>=this.Frames.Count)
+                return null;
+            return this.Frames[this.CurrentFrame];
+        }
+
+        private bool _IsLeftMouseButtonDown = false;
+        /// <summary>
+        /// Gets whether left mouse button is pressed over the tile.
+        /// </summary>
+        [Browsable(false)]
+        public bool IsLeftMouseButtonDown
+        {
+            get { return _IsLeftMouseButtonDown; }
+            internal set
+            {
+                if (value != _IsLeftMouseButtonDown)
+                {
+                    bool oldValue = _IsLeftMouseButtonDown;
+                    _IsLeftMouseButtonDown = value;
+                    OnIsLeftMouseButtonDownChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when IsLeftMouseButtonDown property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnIsLeftMouseButtonDownChanged(bool oldValue, bool newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("IsLeftMouseButtonDown"));
+            this.Refresh();
+        }
+
+        private bool _IsMouseOver = false;
+        /// <summary>
+        /// Gets whether mouse is over the item.
+        /// </summary>
+        [Browsable(false)]
+        public bool IsMouseOver
+        {
+            get { return _IsMouseOver; }
+            internal set
+            {
+                if (value != _IsMouseOver)
+                {
+                    bool oldValue = _IsMouseOver;
+                    _IsMouseOver = value;
+                    OnIsMouseOverChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when IsMouseOver property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnIsMouseOverChanged(bool oldValue, bool newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("IsMouseOver"));
+            this.Refresh();
+        }
+
+        /// <summary>
+        /// Gets or sets the tile title text displayed by default in lower left corner.
+        /// </summary>
+        [DefaultValue(""), Category("Appearance"), Description("Indicates tile title text displayed by default in lower left corner"), Editor("DevComponents.DotNetBar.Design.TextMarkupUIEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor))]
+        public string TitleText
+        {
+            get { return _Frames[0].TitleText; }
+            set { _Frames[0].TitleText = value; }
+        }
+        /// <summary>
+        /// Occurs when an hyperlink in title text markup is clicked.
+        /// </summary>
+        public event EventHandler TitleTextMarkupLinkClick;
+        /// <summary>
+        /// Raises TitleTextMarkupLinkClick event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnTitleTextMarkupLinkClick(EventArgs e)
+        {
+            EventHandler handler = TitleTextMarkupLinkClick;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        /// <summary>
+        /// Gets or sets the title text font.
+        /// </summary>
+        [DefaultValue(null), Category("Appearance"), Description("Gets or sets the title text font.")]
+        public Font TitleTextFont
+        {
+            get { return _Frames[0].TitleTextFont; }
+            set { _Frames[0].TitleTextFont = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the color of the title text.
+        /// </summary>
+        [Category("Columns"), Description("Indicates color of title text.")]
+        public Color TitleTextColor
+        {
+            get { return _Frames[0].TitleTextColor; }
+            set { _Frames[0].TitleTextColor = value; }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeTitleTextColor()
+        {
+            return _Frames[0].ShouldSerializeTitleTextColor();
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetTitleTextColor()
+        {
+            _Frames[0].ResetTitleTextColor();
+        }
+
+        /// <summary>
+        /// Gets or sets title text alignment.
+        /// </summary>
+        [DefaultValue(ContentAlignment.BottomLeft), Category("Appearance"), Description("Indicates title text alignment.")]
+        public ContentAlignment TitleTextAlignment
+        {
+            get { return _Frames[0].TitleTextAlignment; }
+            set { _Frames[0].TitleTextAlignment = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the top-left location of the image.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates  top-left location of the image.")]
+        public Point ImageIndent
+        {
+            get { return _Frames[0].ImageIndent; }
+            set { _Frames[0].ImageIndent = value; }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeImageIndent()
+        {
+            return _Frames[0].ShouldSerializeImageIndent();
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetImageIndent()
+        {
+            _Frames[0].ResetImageIndent();
+        }
+
+        private bool _Checked = false;
+        /// <summary>
+        /// Gets or sets whether tile is checked.
+        /// </summary>
+        [DefaultValue(false), Category("Appearance"), Description("Indicates whether tile is checked.")]
+        public bool Checked
+        {
+            get { return _Checked; }
+            set
+            {
+                if (value != _Checked)
+                {
+                    bool oldValue = _Checked;
+                    _Checked = value;
+                    OnCheckedChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when Checked property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnCheckedChanged(bool oldValue, bool newValue)
+        {
+            // Allow user to cancel the checking
+            if (newValue && _OptionGroup.Length > 0 && this.Parent != null)
+            {
+                MetroTileItem b = null;
+                foreach (BaseItem item in this.Parent.SubItems)
+                {
+                    if (item == this)
+                        continue;
+                    b = item as MetroTileItem;
+                    if (b != null && b.OptionGroup == _OptionGroup && b.Checked)
+                    {
+                        break;
+                    }
+                }
+                OptionGroupChangingEventArgs e = new OptionGroupChangingEventArgs(b, this);
+                OnOptionGroupChanging(e);
+                if (e.Cancel)
+                {
+                    _Checked = oldValue;
+                    return;
+                }
+            }
+
+            if (ShouldSyncProperties)
+                BarFunctions.SyncProperty(this, "Checked");
+
+            if (_OptionGroup != "" && newValue && this.Parent != null)
+            {
+                foreach (BaseItem item in this.Parent.SubItems)
+                {
+                    if (item == this)
+                        continue;
+                    MetroTileItem b = item as MetroTileItem;
+                    if (b != null && b.OptionGroup == _OptionGroup && b.Checked)
+                        b.Checked = false;
+                }
+            }
+
+            //OnPropertyChanged(new PropertyChangedEventArgs("Checked"));
+            this.Refresh();
+            OnCheckedChanged(EventArgs.Empty);
+        }
+
+        private eMetroTileCheckBehavior _CheckBehavior = eMetroTileCheckBehavior.Inherit;
+        /// <summary>
+        /// Gets or sets the automatic check behavior of metro tile.
+        /// </summary>
+        [DefaultValue(eMetroTileCheckBehavior.Inherit), Category("Behavior"), Description("Indicates automatic check behavior of metro tile.")]
+        public eMetroTileCheckBehavior CheckBehavior
+        {
+            get { return _CheckBehavior; }
+            set
+            {
+                if (value != _CheckBehavior)
+                {
+                    eMetroTileCheckBehavior oldValue = _CheckBehavior;
+                    _CheckBehavior = value;
+                    OnCheckBehaviorChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when CheckBehavior property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnCheckBehaviorChanged(eMetroTileCheckBehavior oldValue, eMetroTileCheckBehavior newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("CheckBehavior"));
+        }
+        private eMetroTileCheckBehavior EffectiveCheckBehavior
+        {
+            get
+            {
+                if (_CheckBehavior == eMetroTileCheckBehavior.Inherit)
+                {
+                    Control parent = this.ContainerControl as Control;
+                    if (parent is ItemPanel)
+                        return eMetroTileCheckBehavior.RightMouseButtonClick;
+                }
+                return _CheckBehavior;
+            }
+        }
+
+        private string _OptionGroup = "";
+        /// <summary>
+        /// Gets or set the Group item belongs to. The groups allows a user to choose from mutually exclusive options within the group. The choice is reflected by Checked property.
+        /// </summary>
+        [Browsable(true), Category("Behavior"), Description("Gets or set the Group item belongs to. The groups allows a user to choose from mutually exclusive options within the group."), System.ComponentModel.DefaultValue("")]
+        public virtual string OptionGroup
+        {
+            get
+            {
+                return _OptionGroup;
+            }
+            set
+            {
+                if (_OptionGroup != value)
+                {
+                    _OptionGroup = value;
+                    if (_OptionGroup != "" && _Checked && this.Parent != null)
+                    {
+                        foreach (BaseItem item in this.Parent.SubItems)
+                        {
+                            if (item == this)
+                                continue;
+                            MetroTileItem b = item as MetroTileItem;
+                            if (b != null && b.OptionGroup == _OptionGroup && b.Checked)
+                                this.Checked = false;
+                        }
+                    }
+                    OnAppearanceChanged();
+                    this.Refresh();
+                }
+            }
+        }
+
+        private CustomCollection<MetroTileFrame> _Frames = null;
+        /// <summary>
+        /// Gets the list of tile frames that are displayed when frame animation is enabled using AnimationEnabled property.
+        /// </summary>
+        [Category("Appearance"), Description("List of tile frames that are displayed when frame animation is enabled using AnimationEnabled property."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public CustomCollection<MetroTileFrame> Frames
+        {
+            get { return _Frames; }
+        }
+
+        private int _CurrentFrame = 0;
+        /// <summary>
+        /// Gets or sets index of currently displayed frame in Frames collection.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), DefaultValue(0), Category("Appearance"), Description("Indicates index of currently displayed frame in Frames collection.")]
+        public int CurrentFrame
+        {
+            get { return _CurrentFrame; }
+            set
+            {
+                if (value != _CurrentFrame)
+                {
+                    if (value < 0 || value >= _Frames.Count)
+                        throw new ArgumentException("Frame value is invalid. It must be greater or equal than zero and less than Frames.Count");
+                    int oldValue = _CurrentFrame;
+                    _CurrentFrame = value;
+                    OnCurrentFrameChanged(oldValue, value);
+                }
+            }
+        }
+
+        private int _LastFrame = 0;
+        /// <summary>
+        /// Gets the index of last selected frame, i.e. before CurrentFrame was set with new value.
+        /// </summary>
+        internal int LastFrame
+        {
+            get
+            {
+                return _LastFrame;
+            }
+        }
+
+        private Animation.Animation _CurrentAnimation = null;
+        private void DisposeCurrentAnimation()
+        {
+            Animation.Animation anim = _CurrentAnimation;
+            _CurrentAnimation = null;
+            if (anim != null)
+            {
+                anim.Stop();
+                anim.Dispose();
+            }
+        }
+        private bool GetDesignMode()
+        {
+            if (this.DesignMode) return true;
+            if(this.Site!=null && this.Site.DesignMode) return true;
+            return false;
+        }
+        /// <summary>
+        /// Called when CurrentFrame property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnCurrentFrameChanged(int oldValue, int newValue)
+        {
+            _LastFrame = oldValue;
+            if (_AnimationEnabled && _AnimationDuration > 0 && !GetDesignMode()) // Animate transition from current frame to new frame
+            {
+                DisposeCurrentAnimation();
+                int targetValue = Dpi.Height(_TileSize.Height);
+                Animation.AnimationInt anim = new DevComponents.DotNetBar.Animation.AnimationInt(new Animation.AnimationRequest(this, "CurrentFrameOffset", targetValue, 0),
+                    Animation.AnimationEasing.EaseOutExpo, _AnimationDuration);
+                _CurrentAnimation = anim;
+                anim.Start();
+            }
+            else
+                this.Refresh();
+            //OnPropertyChanged(new PropertyChangedEventArgs("CurrentFrame"));
+        }
+
+        private int _CurrentFrameOffset = 0;
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), EditorBrowsable(EditorBrowsableState.Never)]
+        public int CurrentFrameOffset
+        {
+            get { return _CurrentFrameOffset; }
+            set
+            {
+                if (_CurrentFrameOffset != value)
+                {
+                    _CurrentFrameOffset = value;
+                    this.Invalidate();
+                    //this.Update();
+                }
+            }
+        }
+
+        private bool _AnimationEnabled = true;
+        /// <summary>
+        /// Gets or sets whether Frame animation is enabled when CurrentFrame has changed. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance"), Description("Indicates whether Frame animation is enabled when CurrentFrame has changed.")]
+        public bool AnimationEnabled
+        {
+            get { return _AnimationEnabled; }
+            set { _AnimationEnabled = value; }
+        }
+
+        private int _AnimationDuration = 800;
+        /// <summary>
+        /// Gets or sets the frames animation duration in milliseconds. Default value is 800.
+        /// </summary>
+        [DefaultValue(800), Category("Behavior"), Description("Indicates frames animation duration in milliseconds.")]
+        public int AnimationDuration
+        {
+            get { return _AnimationDuration; }
+            set
+            {
+                if (value < 0) value = 0;
+                _AnimationDuration = value;
+            }
+        }
+
+        private int _AutoRotateFramesInterval = 0;
+        /// <summary>
+        /// Gets or sets the automatic tile frame rotation interval in milliseconds. When set it will change the CurrentFrame property so each frame from Frames collection is displayed after interval set here.
+        /// </summary>
+        [DefaultValue(0), Category("Behavior"), Description("Indicates automatic tile frame rotation interval in milliseconds. When set it will change the CurrentFrame property so each frame from Frames collection is displayed after interval set here.")]
+        public int AutoRotateFramesInterval
+        {
+            get { return _AutoRotateFramesInterval; }
+            set
+            {
+                if (value < 0) value = 0;
+                if (value != _AutoRotateFramesInterval)
+                {
+                    int oldValue = _AutoRotateFramesInterval;
+                    _AutoRotateFramesInterval = value;
+                    OnAutoRotateFramesIntervalChanged(oldValue, value);
+                }
+            }
+        }
+        private Timer _AutoRotateTimer = null;
+        private void DestroyAutoRotateTimer()
+        {
+            Timer timer = _AutoRotateTimer;
+            _AutoRotateTimer = null;
+            if (timer != null)
+            {
+                timer.Stop();
+                timer.Dispose();
+            }
+        }
+        private void CreateAutoRotateTimer()
+        {
+            if (_AutoRotateTimer != null) return;
+            _AutoRotateTimer = new Timer();
+            _AutoRotateTimer.Interval = _AutoRotateFramesInterval;
+            if (_Frames[_CurrentFrame].FrameDisplayDuration > 0)
+                _AutoRotateTimer.Interval = _Frames[_CurrentFrame].FrameDisplayDuration;
+            _AutoRotateTimer.Tick += new EventHandler(AutoRotateTimerTick);
+            _AutoRotateTimer.Start();
+        }
+
+        private void AutoRotateTimerTick(object sender, EventArgs e)
+        {
+            if (this.Frames.Count <= 1) return;
+            int frame = this.CurrentFrame + 1;
+            if (frame >= this.Frames.Count)
+                frame = 0;
+            this.CurrentFrame = frame;
+            if (_Frames[frame].FrameDisplayDuration > 0)
+                _AutoRotateTimer.Interval = _Frames[frame].FrameDisplayDuration;
+            else
+                _AutoRotateTimer.Interval = _AutoRotateFramesInterval;
+        }
+        /// <summary>
+        /// Called when AutoRotateFramesInterval property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnAutoRotateFramesIntervalChanged(int oldValue, int newValue)
+        {
+            if (newValue == 0 || GetDesignMode())
+                DestroyAutoRotateTimer();
+            else if (this.Visible)
+                CreateAutoRotateTimer();
+            //OnPropertyChanged(new PropertyChangedEventArgs("AutoRotateFramesInterval"));
+        }
+
+        protected internal override void OnVisibleChanged(bool newValue)
+        {
+            if (newValue && !GetDesignMode())
+            {
+                if (_AutoRotateFramesInterval > 0 && _Frames.Count > 1 && _AutoRotateTimer == null)
+                    CreateAutoRotateTimer();
+            }
+            else if (_AutoRotateTimer != null)
+                DestroyAutoRotateTimer();
+
+            base.OnVisibleChanged(newValue);
+        }
+
+        /// <summary>
+        /// Called when DragStartPoint property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected override void OnDragStartPointChanged(Point oldValue, Point newValue)
+        {
+            if (newValue.IsEmpty)
+            {
+                if (_AutoRotateTimer != null)
+                    _AutoRotateTimer.Enabled = true;
+            }
+            else
+            {
+                if (_AutoRotateTimer != null)
+                    _AutoRotateTimer.Enabled = false;
+            }
+            base.OnDragStartPointChanged(oldValue, newValue);
+        }
+
+        private static readonly Color DefaultDisabledBackColor = Color.Empty;
+        private Color _DisabledBackColor = DefaultDisabledBackColor;
+        /// <summary>
+        /// Gets or sets tile background color when Enabled=false.
+        /// </summary>
+        [Category("Columns"), Description("Indicates tile background color when Enabled=false.")]
+        public  Color DisabledBackColor
+        {
+        	get {	return _DisabledBackColor; }
+        	set { _DisabledBackColor = value;	}
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeDisabledBackColor()
+        {
+            return _DisabledBackColor != DefaultDisabledBackColor;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetDisabledBackColor()
+        {
+            this.DisabledBackColor =  DefaultDisabledBackColor;
+        }
+        #endregion
+
+        #region Markup Implementation
+        /// <summary>
+        /// Gets whether item supports text markup. Default is false.
+        /// </summary>
+        protected override bool IsMarkupSupported
+        {
+            get { return _EnableMarkup; }
+        }
+
+        private bool _EnableMarkup = true;
+        /// <summary>
+        /// Gets or sets whether text-markup support is enabled for items Text property. Default value is true.
+        /// Set this property to false to display HTML or other markup in the item instead of it being parsed as text-markup.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance"), Description("Indicates whether text-markup support is enabled for items Text property.")]
+        public bool EnableMarkup
+        {
+            get { return _EnableMarkup; }
+            set
+            {
+                if (_EnableMarkup != value)
+                {
+                    _EnableMarkup = value;
+                    NeedRecalcSize = true;
+                    OnTextChanged();
+                    OnAppearanceChanged();
+                }
+            }
+        }
+
+        #endregion
+    }
+
+    #region eMetroTileColor
+    public enum eMetroTileColor
+    {
+        Default,
+        Green,
+        Orange,
+        Magenta,
+        Blue,
+        Teal,
+        Plum,
+        Coffee,
+        RedOrange,
+        RedViolet,
+        Olive,
+        DarkOlive,
+        Rust,
+        Maroon,
+        Yellowish,
+        Blueish,
+        DarkBlue,
+        Yellow,
+        Gray,
+        DarkGreen,
+        MaroonWashed,
+        PlumWashed,
+        Azure
+    }
+    #endregion
+
+    #region eMetroTileCheckBehavior
+    /// <summary>
+    /// Specifies how MetroTileItem is checked.
+    /// </summary>
+    public enum eMetroTileCheckBehavior
+    {
+        /// <summary>
+        /// Metro tile item inherits the check behavior from host control.
+        /// </summary>
+        Inherit,
+        /// <summary>
+        /// Metro tile item cannot be checked.
+        /// </summary>
+        None,
+        /// <summary>
+        /// Metro tile item is checked using right mouse button.
+        /// </summary>
+        RightMouseButtonClick,
+        /// <summary>
+        /// Metro tile item is checked using middle mouse button.
+        /// </summary>
+        MiddleMouseButtonClick,
+        /// <summary>
+        /// Metro tile item is checked using left mouse button.
+        /// </summary>
+        LeftMouseButtonClick
+    }
+    #endregion
+
+    #region MetroTileFrame
+    /// <summary>
+    /// Defines single frame for metro-tile item.
+    /// </summary>
+    [DesignTimeVisible(false), ToolboxItem(false), Designer("DevComponents.DotNetBar.Design.MetroTileFrameDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+    public class MetroTileFrame : Component, ICloneable, INotifyPropertyChanged
+    {
+        /// <summary>
+        /// Initializes a new instance of the MetroTileFrame class.
+        /// </summary>
+        public MetroTileFrame()
+        {
+            _TileStyle = new ElementStyle();
+            UpdateEffectiveStyle();
+            _TileStyle.StyleChanged += TileStyleChanged;
+        }
+        private void TileStyleChanged(object sender, EventArgs e)
+        {
+            UpdateEffectiveStyle();
+            OnPropertyChanged(new PropertyChangedEventArgs("TileStyle"));
+        }
+
+        private string _TitleText = "";
+        /// <summary>
+        /// Gets or sets the tile title text displayed by default in lower left corner.
+        /// </summary>
+        [DefaultValue(""), Category("Appearance"), Description("Indicates tile title text displayed by default in lower left corner"), Editor("DevComponents.DotNetBar.Design.TextMarkupUIEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor))]
+        public string TitleText
+        {
+            get { return _TitleText; }
+            set
+            {
+                if (value != _TitleText)
+                {
+                    string oldValue = _TitleText;
+                    _TitleText = value;
+                    OnTitleTextChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when TitleText property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnTitleTextChanged(string oldValue, string newValue)
+        {
+            TitleTextMarkupUpdate();
+            OnPropertyChanged(new PropertyChangedEventArgs("TitleText"));
+        }
+        /// <summary>
+        /// Gets reference to parsed markup body element if text was markup otherwise returns null.
+        /// </summary>
+        internal TextMarkup.BodyElement TitleTextMarkupBody
+        {
+            get { return _TitleTextMarkup; }
+        }
+        private TextMarkup.BodyElement _TitleTextMarkup = null;
+        private void TitleTextMarkupUpdate()
+        {
+            if (_TitleTextMarkup != null)
+                _TitleTextMarkup.HyperLinkClick -= TitleTextMarkupLinkClicked;
+            _TitleTextMarkup = null;
+
+            if (!_TextMarkupEnabled)
+                return;
+
+            if (!TextMarkup.MarkupParser.IsMarkup(ref _TitleText))
+                return;
+
+            _TitleTextMarkup = TextMarkup.MarkupParser.Parse(_TitleText);
+
+            if (_TitleTextMarkup != null)
+                _TitleTextMarkup.HyperLinkClick += TitleTextMarkupLinkClicked;
+        }
+        private void TitleTextMarkupLinkClicked(object sender, EventArgs e)
+        {
+            DevComponents.DotNetBar.TextMarkup.HyperLink link = sender as DevComponents.DotNetBar.TextMarkup.HyperLink;
+
+            if (link != null)
+                OnTitleTextMarkupLinkClick(new MarkupLinkClickEventArgs(link.Name, link.HRef));
+            else
+               OnTitleTextMarkupLinkClick(e);
+        }
+        /// <summary>
+        /// Occurs when an hyperlink in title text markup is clicked.
+        /// </summary>
+        public event EventHandler TitleTextMarkupLinkClick;
+        /// <summary>
+        /// Raises TitleTextMarkupLinkClick event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnTitleTextMarkupLinkClick(EventArgs e)
+        {
+            EventHandler handler = TitleTextMarkupLinkClick;
+            if (handler != null)
+                handler(this, e);
+        }
+
+
+        private Font _TitleTextFont = null;
+        /// <summary>
+        /// Gets or sets the title text font.
+        /// </summary>
+        [DefaultValue(null), Category("Appearance"), Description("Gets or sets the title text font.")]
+        public Font TitleTextFont
+        {
+            get { return _TitleTextFont; }
+            set
+            {
+                if (value != _TitleTextFont)
+                {
+                    Font oldValue = _TitleTextFont;
+                    _TitleTextFont = value;
+                    OnTitleTextFontChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when TitleTextFont property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnTitleTextFontChanged(Font oldValue, Font newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("TitleTextFont"));
+        }
+        private Rectangle _TitleTextBounds = Rectangle.Empty;
+        internal Rectangle TitleTextBounds
+        {
+            get
+            {
+                return _TitleTextBounds;
+            }
+            set
+            {
+                _TitleTextBounds = value;
+            }
+        }
+
+        private Color _TitleTextColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets the color of the title text.
+        /// </summary>
+        [Category("Columns"), Description("Indicates color of title text.")]
+        public Color TitleTextColor
+        {
+            get { return _TitleTextColor; }
+            set
+            {
+                if (_TitleTextColor != value)
+                {
+                    Color oldValue = _TitleTextColor;
+                    _TitleTextColor = value;
+                    OnTitleTextColorChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when TitleTextColor property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnTitleTextColorChanged(Color oldValue, Color newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("TitleTextColor"));
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeTitleTextColor()
+        {
+            return !_TitleTextColor.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetTitleTextColor()
+        {
+            this.TitleTextColor = Color.Empty;
+        }
+
+        private ContentAlignment _TitleTextAlignment = ContentAlignment.BottomLeft;
+        /// <summary>
+        /// Gets or sets title text alignment.
+        /// </summary>
+        [DefaultValue(ContentAlignment.BottomLeft), Category("Appearance"), Description("Indicates title text alignment.")]
+        public ContentAlignment TitleTextAlignment
+        {
+            get { return _TitleTextAlignment; }
+            set
+            {
+                if (value != _TitleTextAlignment)
+                {
+                    ContentAlignment oldValue = _TitleTextAlignment;
+                    _TitleTextAlignment = value;
+                    OnTitleTextAlignmentChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when TitleTextAlignment property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnTitleTextAlignmentChanged(ContentAlignment oldValue, ContentAlignment newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("TitleTextAlignment"));
+        }
+
+        /// <summary>
+        /// Gets the effective style for the tile when TileColor property is set to predefined tile color.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public ElementStyle EffectiveStyle
+        {
+            get
+            {
+                return _EffectiveStyle;
+            }
+        }
+
+        private ElementStyle _TileStyle = null;
+        /// <summary>
+        /// Specifies the Tile style of the item.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Category("Style"), Description("Gets or sets Tile style of the item."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ElementStyle TileStyle
+        {
+            get { return _TileStyle; }
+        }
+
+        /// <summary>
+        /// Gets the realized symbol string.
+        /// </summary>
+        [Browsable(false)]
+        public string SymbolRealized
+        {
+            get { return _SymbolRealized; }
+        }
+        private string _Symbol = "", _SymbolRealized = "";
+        /// <summary>
+        /// Indicates the symbol displayed on face of the tile instead of the image. Setting the symbol overrides the image setting.
+        /// </summary>
+        [DefaultValue(""), Category("Appearance"), Description("Indicates the symbol displayed on face of the tile instead of the image. Setting the symbol overrides the image setting.")]
+        [Editor("DevComponents.DotNetBar.Design.SymbolTypeEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor))]
+        public string Symbol
+        {
+            get { return _Symbol; }
+            set
+            {
+                if (value != _Symbol)
+                {
+                    string oldValue = _Symbol;
+                    _Symbol = value;
+                    OnSymbolChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when Symbol property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnSymbolChanged(string oldValue, string newValue)
+        {
+            if (string.IsNullOrEmpty(newValue))
+                _SymbolRealized = "";
+            else
+                _SymbolRealized = Symbols.GetSymbol(newValue);
+            OnPropertyChanged(new PropertyChangedEventArgs("Symbol"));
+        }
+
+        private eSymbolSet _SymbolSet = eSymbolSet.Awesome;
+        /// <summary>
+        /// Gets or sets the symbol set used to represent the Symbol.
+        /// </summary>
+        [Browsable(false), DefaultValue(eSymbolSet.Awesome)]
+        public eSymbolSet SymbolSet
+        {
+            get { return _SymbolSet; }
+            set
+            {
+                if (_SymbolSet != value)
+                {
+                    eSymbolSet oldValue = _SymbolSet;
+                    _SymbolSet = value;
+                    OnSymbolSetChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when SymbolSet property value changes.
+        /// </summary>
+        /// <param name="oldValue">Indciates old value</param>
+        /// <param name="newValue">Indicates new value</param>
+        protected virtual void OnSymbolSetChanged(eSymbolSet oldValue, eSymbolSet newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("SymbolSet"));
+        }
+
+        private float _SymbolSize = 0f;
+        /// <summary>
+        /// Indicates the size of the symbol in points.
+        /// </summary>
+        [DefaultValue(0f), Category("Appearance"), Description("Indicates the size of the symbol in points.")]
+        public float SymbolSize
+        {
+            get { return _SymbolSize; }
+            set
+            {
+                if (value != _SymbolSize)
+                {
+                    float oldValue = _SymbolSize;
+                    _SymbolSize = value;
+                    OnSymbolSizeChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when SymbolSize property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnSymbolSizeChanged(float oldValue, float newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("SymbolSize"));
+        }
+
+        private Color _SymbolColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets the color of the symbol.
+        /// </summary>
+        [Category("Columns"), Description("Indicates color of the symbol.")]
+        public Color SymbolColor
+        {
+            get { return _SymbolColor; }
+            set { _SymbolColor = value; OnPropertyChanged(new PropertyChangedEventArgs("SymbolColor")); }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeSymbolColor()
+        {
+            return !_SymbolColor.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetSymbolColor()
+        {
+            this.SymbolColor = Color.Empty;
+        }
+
+        private Image _Image = null;
+        /// <summary>
+        /// Gets or sets the image displayed on the tile.
+        /// </summary>
+        [DefaultValue(null), Category("Appearance"), Description("Indicates image displayed on the tile.")]
+        public Image Image
+        {
+            get { return _Image; }
+            set
+            {
+                if (value != _Image)
+                {
+                    Image oldValue = _Image;
+                    _Image = value;
+                    OnImageChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when Image property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnImageChanged(Image oldValue, Image newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("Image"));
+        }
+
+        private static readonly Point DefaultImageIndent = new Point(2, 2);
+        private Point _ImageIndent = DefaultImageIndent;
+        /// <summary>
+        /// Gets or sets the top-left location of the image.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates  top-left location of the image.")]
+        public Point ImageIndent
+        {
+            get { return _ImageIndent; }
+            set
+            {
+                if (value != _ImageIndent)
+                {
+                    Point oldValue = _ImageIndent;
+                    _ImageIndent = value;
+                    OnImageIndentChanged(oldValue, value);
+                }
+            }
+        }
+        protected virtual void OnImageIndentChanged(Point oldValue, Point newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("ImageIndent"));
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeImageIndent()
+        {
+            return _ImageIndent != DefaultImageIndent;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetImageIndent()
+        {
+            this.ImageIndent = DefaultImageIndent;
+        }
+
+        private string _Text = "";
+        /// <summary>
+        /// Gets or sets the text associated with this item.
+        /// </summary>
+        [Browsable(true), Editor("DevComponents.DotNetBar.Design.TextMarkupUIEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), System.ComponentModel.Category("Appearance"), Description("The text contained in the item."), Localizable(true), DefaultValue("")]
+        public string Text
+        {
+            get { return _Text; }
+            set
+            {
+                if (value != _Text)
+                {
+                    string oldValue = _Text;
+                    _Text = value;
+                    OnTextChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when Text property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnTextChanged(string oldValue, string newValue)
+        {
+            MarkupTextChanged();
+            OnPropertyChanged(new PropertyChangedEventArgs("Text"));
+        }
+
+        private eMetroTileColor _TileColor = eMetroTileColor.Default;
+        /// <summary>
+        /// Gets or sets the predefined tile color.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates predefined tile color.")]
+        public eMetroTileColor TileColor
+        {
+            get { return _TileColor; }
+            set
+            {
+                if (value != _TileColor)
+                {
+                    eMetroTileColor oldValue = _TileColor;
+                    _TileColor = value;
+                    OnTileColorChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when Color property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnTileColorChanged(eMetroTileColor oldValue, eMetroTileColor newValue)
+        {
+            UpdateEffectiveStyle();
+            OnPropertyChanged(new PropertyChangedEventArgs("TileColor"));
+        }
+
+        private ElementStyle _EffectiveStyle = new ElementStyle();
+        private void UpdateEffectiveStyle()
+        {
+            ElementStyle style = GetPredefinedTileStyle(_TileColor);
+            style.ApplyStyle(_TileStyle);
+            _EffectiveStyle = style;
+        }
+
+        private ElementStyle GetPredefinedTileStyle(eMetroTileColor tileColor)
+        {
+            ElementStyle style = new ElementStyle();
+            style.TextColor = System.Drawing.Color.White;
+            style.PaddingTop = 4;
+            style.PaddingRight = 4;
+            style.PaddingBottom = 4;
+            style.PaddingLeft = 4;
+
+            if (tileColor == eMetroTileColor.Default)
+            {
+                style.BackColor = ColorScheme.GetColor(0x094AB2);
+                style.BackColor2 = ColorScheme.GetColor(0x0A5BC4);
+                style.BackColorGradientAngle = 45;
+                style.Border = eStyleBorderType.Solid;
+                style.BorderColor = ColorScheme.GetColor(0x236CCA);
+                style.BorderWidth = 1;
+            }
+            else if (tileColor == eMetroTileColor.Blue)
+            {
+                style.BackColor = ColorScheme.GetColor(0x0072C6);
+                style.BackColor2 = ColorScheme.GetColor(0x008DD3);
+                style.BackColorGradientAngle = 45;
+                style.Border = eStyleBorderType.Solid;
+                style.BorderColor = ColorScheme.GetColor(0x1A80CC);
+                style.BorderWidth = 1;
+            }
+            else if (tileColor == eMetroTileColor.Green)
+            {
+                style.BackColor = ColorScheme.GetColor(0x008A00);
+                style.BackColor2 = ColorScheme.GetColor(0x00A600);
+                style.BackColorGradientAngle = 45;
+                style.Border = eStyleBorderType.Solid;
+                style.BorderColor = ColorScheme.GetColor(0x1A961A);
+                style.BorderWidth = 1;
+            }
+            else if (tileColor == eMetroTileColor.Magenta)
+            {
+                style.BackColor = ColorScheme.GetColor(0x8C0095);
+                style.BackColor2 = ColorScheme.GetColor(0xA700AE);
+                style.BackColorGradientAngle = 45;
+                style.Border = eStyleBorderType.Solid;
+                style.BorderColor = ColorScheme.GetColor(0x981AA0);
+                style.BorderWidth = 1;
+            }
+            else if (tileColor == eMetroTileColor.Orange)
+            {
+                style.BackColor = ColorScheme.GetColor(0xD24726);
+                style.BackColor2 = ColorScheme.GetColor(0xDC572E);
+                style.BackColorGradientAngle = 45;
+                style.Border = eStyleBorderType.Solid;
+                style.BorderColor = ColorScheme.GetColor(0xD75A3C);
+                style.BorderWidth = 1;
+            }
+            else if (tileColor == eMetroTileColor.Plum)
+            {
+                style.BackColor = ColorScheme.GetColor(0x5133AB);
+                style.BackColor2 = ColorScheme.GetColor(0x643EBF);
+                style.BackColorGradientAngle = 45;
+                style.Border = eStyleBorderType.Solid;
+                style.BorderColor = ColorScheme.GetColor(0x6348B4);
+                style.BorderWidth = 1;
+            }
+            else if (tileColor == eMetroTileColor.Teal)
+            {
+                style.BackColor = ColorScheme.GetColor(0x008299);
+                style.BackColor2 = ColorScheme.GetColor(0x00A0B1);
+                style.BackColorGradientAngle = 45;
+                style.Border = eStyleBorderType.Solid;
+                style.BorderColor = ColorScheme.GetColor(0x1A8FA3);
+                style.BorderWidth = 1;
+            }
+            else if (tileColor == eMetroTileColor.Coffee)
+            {
+                style.BackColor = ColorScheme.GetColor(0x453A29);
+                style.BackColor2 = ColorScheme.GetColor(0x554732);
+                style.BackColorGradientAngle = 45;
+                style.Border = eStyleBorderType.Solid;
+                style.BorderColor = ColorScheme.GetColor(0x584E3F);
+                style.BorderWidth = 1;
+            }
+            else if (tileColor == eMetroTileColor.RedOrange)
+            {
+                style.BackColor = ColorScheme.GetColor(0xD23326);
+                style.BackColor2 = ColorScheme.GetColor(0xDC392E);
+                style.BackColorGradientAngle = 45;
+                style.Border = eStyleBorderType.Solid;
+                style.BorderColor = ColorScheme.GetColor(0xD7463C);
+                style.BorderWidth = 1;
+            }
+            else if (tileColor == eMetroTileColor.RedViolet)
+            {
+                style.BackColor = ColorScheme.GetColor(0x8C1351);
+                style.BackColor2 = ColorScheme.GetColor(0x9E165B);
+                style.BackColorGradientAngle = 45;
+                style.Border = eStyleBorderType.Solid;
+                style.BorderColor = ColorScheme.GetColor(0xAA4379);
+                style.BorderWidth = 1;
+            }
+            else if (tileColor == eMetroTileColor.Olive)
+            {
+                style.BackColor = ColorScheme.GetColor(0x317F3D);
+                style.BackColor2 = ColorScheme.GetColor(0x3A9548);
+                style.BackColorGradientAngle = 45;
+                style.Border = eStyleBorderType.Solid;
+                style.BorderColor = ColorScheme.GetColor(0x3B9949);
+                style.BorderWidth = 1;
+            }
+            else if (tileColor == eMetroTileColor.DarkOlive)
+            {
+                style.BackColor = ColorScheme.GetColor(0x004A00);
+                style.BackColor2 = ColorScheme.GetColor(0x005100);
+                style.BackColorGradientAngle = 45;
+                style.Border = eStyleBorderType.Solid;
+                style.BorderColor = ColorScheme.GetColor(0x005400);
+                style.BorderWidth = 1;
+            }
+            else if (tileColor == eMetroTileColor.Rust)
+            {
+                style.BackColor = ColorScheme.GetColor(0x61292B);
+                style.BackColor2 = ColorScheme.GetColor(0x682C2F);
+                style.BackColorGradientAngle = 45;
+                style.Border = eStyleBorderType.Solid;
+                style.BorderColor = ColorScheme.GetColor(0x6B2E31);
+                style.BorderWidth = 1;
+            }
+            else if (tileColor == eMetroTileColor.Maroon)
+            {
+                style.BackColor = ColorScheme.GetColor(0xAC193D);
+                style.BackColor2 = ColorScheme.GetColor(0xBF1E4B);
+                style.BackColorGradientAngle = 45;
+                style.Border = eStyleBorderType.Solid;
+                style.BorderColor = ColorScheme.GetColor(0xB43051);
+                style.BorderWidth = 1;
+            }
+            else if (tileColor == eMetroTileColor.Yellowish)
+            {
+                style.BackColor = ColorScheme.GetColor(0xC69408);
+                style.BackColor2 = ColorScheme.GetColor(0xBF8E09);
+                style.BackColorGradientAngle = 45;
+                style.Border = eStyleBorderType.Solid;
+                style.BorderColor = ColorScheme.GetColor(0xC18D09);
+                style.BorderWidth = 1;
+            }
+            else if (tileColor == eMetroTileColor.Blueish)
+            {
+                style.BackColor = ColorScheme.GetColor(0x6E7E94);
+                style.BackColor2 = ColorScheme.GetColor(0x69788C);
+                style.BackColorGradientAngle = 45;
+                style.Border = eStyleBorderType.Solid;
+                style.BorderColor = ColorScheme.GetColor(0x637184);
+                style.BorderWidth = 1;
+            }
+            else if (tileColor == eMetroTileColor.DarkBlue)
+            {
+                style.BackColor = ColorScheme.GetColor(0x16499A);
+                style.BackColor2 = ColorScheme.GetColor(0x184EA0);
+                style.BackColorGradientAngle = 45;
+                style.Border = eStyleBorderType.Solid;
+                style.BorderColor = ColorScheme.GetColor(0x184FA3);
+                style.BorderWidth = 1;
+            }
+            else if (tileColor == eMetroTileColor.Yellow)
+            {
+                style.BackColor = ColorScheme.GetColor(0xFCD116);
+                style.BackColor2 = ColorScheme.GetColor(0xFCDB1A);
+                style.BackColorGradientAngle = 45;
+                style.TextColor = ColorScheme.GetColor(0x9E1716);
+                style.Border = eStyleBorderType.Solid;
+                style.BorderColor = ColorScheme.GetColor(0xFCD62E);
+                style.BorderWidth = 1;
+            }
+            else if (tileColor == eMetroTileColor.Gray)
+            {
+                style.BackColor = ColorScheme.GetColor(0x444444);
+                style.BackColor2 = ColorScheme.GetColor(0x545454);
+                style.BackColorGradientAngle = 45;
+                style.Border = eStyleBorderType.Solid;
+                style.BorderColor = ColorScheme.GetColor(0x575757);
+                style.BorderWidth = 1;
+            }
+            else if (tileColor == eMetroTileColor.DarkGreen)
+            {
+                style.BackColor = ColorScheme.GetColor(0x2D652B);
+                style.BackColor2 = ColorScheme.GetColor(0x2A5B27);
+                style.BackColorGradientAngle = 45;
+                style.Border = eStyleBorderType.Solid;
+                style.BorderColor = ColorScheme.GetColor(0x2D6029);
+                style.BorderWidth = 1;
+            }
+            else if (tileColor == eMetroTileColor.MaroonWashed)
+            {
+                style.BackColor = ColorScheme.GetColor(0x7F6E94);
+                style.BackColor2 = ColorScheme.GetColor(0x7A6B8E);
+                style.BackColorGradientAngle = 45;
+                style.Border = eStyleBorderType.Solid;
+                style.BorderColor = ColorScheme.GetColor(0x817296);
+                style.BorderWidth = 1;
+            }
+            else if (tileColor == eMetroTileColor.PlumWashed)
+            {
+                style.BackColor = ColorScheme.GetColor(0xAA4379);
+                style.BackColor2 = ColorScheme.GetColor(0xAF467E);
+                style.BackColorGradientAngle = 45;
+                style.Border = eStyleBorderType.Solid;
+                style.BorderColor = ColorScheme.GetColor(0xBC4B87);
+                style.BorderWidth = 1;
+            }
+            else if (tileColor == eMetroTileColor.Azure)
+            {
+                style.BackColor = ColorScheme.GetColor(0x2672EC);
+                style.BackColor2 = ColorScheme.GetColor(0x2979F2);
+                style.BackColorGradientAngle = 45;
+                style.Border = eStyleBorderType.Solid;
+                style.BorderColor = ColorScheme.GetColor(0x2A7DF9);
+                style.BorderWidth = 1;
+            }
+
+            return style;
+        }
+
+        private int _FrameDisplayDuration = 0;
+        /// <summary>
+        /// Gets or sets the frame display duration in milliseconds during metro-tile frame animation. When not set then each frame will stay visible for duration set on MetroTileItem.AutoRotateFramesInterval.
+        /// </summary>
+        [DefaultValue(0), Category("Behavior"), Description("Indicates frame display duration in milliseconds during metro-tile frame animation. When not set then each frame will stay visible for duration set on MetroTileItem.AutoRotateFramesInterval.")]
+        public int FrameDisplayDuration
+        {
+            get { return _FrameDisplayDuration; }
+            set
+            {
+                if (value != _FrameDisplayDuration)
+                {
+                    int oldValue = _FrameDisplayDuration;
+                    _FrameDisplayDuration = value;
+                    OnFrameDisplayDurationChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when FrameDisplayDuration property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnFrameDisplayDurationChanged(int oldValue, int newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("FrameDisplayDuration"));
+        }
+
+        #region Markup Implementation
+        private TextMarkup.BodyElement _TextMarkup = null;
+
+        private void MarkupTextChanged()
+        {
+            if (_TextMarkup != null)
+                _TextMarkup.HyperLinkClick -= TextMarkupLinkClick;
+
+            _TextMarkup = null;
+
+            if (!_TextMarkupEnabled)
+                return;
+
+            if (!TextMarkup.MarkupParser.IsMarkup(ref _Text))
+                return;
+
+            _TextMarkup = TextMarkup.MarkupParser.Parse(_Text);
+
+            if (_TextMarkup != null)
+                _TextMarkup.HyperLinkClick += TextMarkupLinkClick;
+        }
+
+        /// <summary>
+        /// Occurs when text markup link is clicked.
+        /// </summary>
+        protected virtual void TextMarkupLinkClick(object sender, EventArgs e)
+        {
+            TextMarkup.HyperLink link = sender as TextMarkup.HyperLink;
+            if (link != null)
+                OnMarkupLinkClick(new MarkupLinkClickEventArgs(link.Name, link.HRef));
+        }
+        /// <summary>
+        /// Occurs when text markup link is clicked. Markup links can be created using "a" tag, for example:
+        /// <a name="MyLink">Markup link</a>
+        /// </summary>
+        [Description("Occurs when text markup link is clicked. Markup links can be created using a tag.")]
+        public event MarkupLinkClickEventHandler MarkupLinkClick;
+        /// <summary>
+        /// Raises MarkupLinkClick event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnMarkupLinkClick(MarkupLinkClickEventArgs e)
+        {
+            MarkupLinkClickEventHandler handler = MarkupLinkClick;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        /// <summary>
+        /// Gets reference to parsed markup body element if text was markup otherwise returns null.
+        /// </summary>
+        internal TextMarkup.BodyElement TextMarkupBody
+        {
+            get { return _TextMarkup; }
+        }
+
+        private bool _TextMarkupEnabled = true;
+        /// <summary>
+        /// Gets or sets whether text-markup can be used in Text property.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance"), Description("Indicates whether text-markup can be used in Text property.")]
+        public bool TextMarkupEnabled
+        {
+            get { return _TextMarkupEnabled; }
+            set
+            {
+                if (value != _TextMarkupEnabled)
+                {
+                    bool oldValue = _TextMarkupEnabled;
+                    _TextMarkupEnabled = value;
+                    OnTextMarkupEnabledChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when TextMarkupEnabled property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnTextMarkupEnabledChanged(bool oldValue, bool newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("TextMarkupEnabled"));
+        }
+
+        internal static Size MeasureText(MetroTileFrame item, Graphics g, int containerWidth, Font font, eTextFormat stringFormat, bool rightToLeft)
+        {
+            if (item.Text == "" && item.TextMarkupBody == null) return Size.Empty;
+
+            Size textSize = Size.Empty;
+
+            if (item.TextMarkupBody == null)
+            {
+                textSize = TextDrawing.MeasureString(g, ButtonItemPainter.GetDrawText(item.Text), font, containerWidth, stringFormat);
+            }
+            else
+            {
+                Size availSize = new Size(containerWidth, 1);
+                if (containerWidth == 0)
+                    availSize.Width = 1600;
+                TextMarkup.MarkupDrawContext d = new TextMarkup.MarkupDrawContext(g, font, Color.Empty, false);
+                item.TextMarkupBody.Measure(availSize, d);
+                availSize = item.TextMarkupBody.Bounds.Size;
+                if (containerWidth != 0)
+                    availSize.Width = containerWidth;
+                d.RightToLeft = rightToLeft;
+                item.TextMarkupBody.Arrange(new Rectangle(0, 0, availSize.Width, availSize.Height), d);
+
+                textSize = item.TextMarkupBody.Bounds.Size;
+            }
+
+            return textSize;
+        }
+
+        private ContentAlignment _ImageTextAlignment = ContentAlignment.TopLeft;
+        /// <summary>
+        /// Gets or sets image alignment in relation to text.
+        /// </summary>
+        [DefaultValue(ContentAlignment.TopLeft), Category("Appearance"), Description("Indicates the image alignment in relation to text.")]
+        public ContentAlignment ImageTextAlignment
+        {
+            get { return _ImageTextAlignment; }
+            set
+            {
+                if (value != _ImageTextAlignment)
+                {
+                    ContentAlignment oldValue = _ImageTextAlignment;
+                    _ImageTextAlignment = value;
+                    OnImageTextAlignmentChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when ImageTextAlignment property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnImageTextAlignmentChanged(ContentAlignment oldValue, ContentAlignment newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("ImageTextAlignment"));
+        }
+        #endregion
+
+        #region INotifyPropertyChanged Members
+        /// <summary>
+        /// Raises the PropertyChanged event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnPropertyChanged(PropertyChangedEventArgs e)
+        {
+            PropertyChangedEventHandler handler = PropertyChanged;
+            if (handler != null) handler(this, e);
+        }
+        /// <summary>
+        /// Occurs when property on BindingDef object has changed.
+        /// </summary>
+        [Description("Occurs when property on BindingDef object has changed.Occurs when property on BindingDef object has changed.")]
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        #endregion
+
+        #region IDisposable Members
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing)
+                _TileStyle.StyleChanged -= TileStyleChanged;
+            base.Dispose(disposing);
+        }
+        #endregion
+
+        #region ICloneable Members
+
+        public object Clone()
+        {
+            MetroTileFrame frame = new MetroTileFrame();
+            if (this.Image != null)
+                frame.Image = (Image)this.Image.Clone();
+            frame.ImageIndent = this.ImageIndent;
+            frame.Text = this.Text;
+            frame.TextMarkupEnabled = this.TextMarkupEnabled;
+            //frame.TileStyle.ApplyFontStyle(this.TileStyle);
+            frame.TileStyle.ApplyStyle(this.TileStyle);
+            frame.TileColor = this.TileColor;
+            frame.TitleText = this.TitleText;
+            frame.TitleTextAlignment = this.TitleTextAlignment;
+            frame.TitleTextColor = this.TitleTextColor;
+            if (this.TitleTextFont != null)
+                frame.TitleTextFont = (Font)this.TitleTextFont.Clone();
+            frame.ImageTextAlignment = this.ImageTextAlignment;
+            frame.FrameDisplayDuration = this.FrameDisplayDuration;
+            frame.Symbol = this.Symbol;
+            frame.SymbolSet = this.SymbolSet;
+            frame.SymbolSize = this.SymbolSize;
+            frame.SymbolColor = this.SymbolColor;
+            return frame;
+        }
+
+        #endregion
+    }
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/Metro/MetroTilePanel.cs b/PROMS/DotNetBar Source Code/Metro/MetroTilePanel.cs
new file mode 100644
index 00000000..cab8acd1
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Metro/MetroTilePanel.cs	
@@ -0,0 +1,100 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Metro
+{
+    /// <summary>
+    /// Represents panel for Metro Tiles.
+    /// </summary>
+    [ToolboxBitmap(typeof(MetroTilePanel), "Metro.MetroTilePanel.ico"), ToolboxItem(true), Designer("DevComponents.DotNetBar.Design.MetroTilePanelDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf"), System.Runtime.InteropServices.ComVisible(false)]
+    public class MetroTilePanel : ItemPanel
+    {
+        #region Events
+
+        #endregion
+
+        #region Constructor
+        /// <summary>
+        /// Initializes a new instance of the MetroTilePanel class.
+        /// </summary>
+        public MetroTilePanel()
+        {
+            this.ResizeItemsToFit = false;
+            this.ItemSpacing = DefaultItemSpacing;
+            this.AutoScroll = true;
+        }
+        #endregion
+
+        #region Implementation
+        protected override void OnHandleCreated(EventArgs e)
+        {
+            if (!this.DesignMode)
+                this.GetBaseItemContainer().AllowDrop = false;
+            base.OnHandleCreated(e);
+        }
+        protected override void OnDragInProgressChanged()
+        {
+            if (!this.DragInProgress)
+                AnimateNextPaintRequest = true;
+            this.Invalidate();
+            base.OnDragInProgressChanged();
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the control enables the user to scroll to items placed outside of its visible boundaries.
+        /// </summary>
+        [Browsable(true), DefaultValue(true)]
+        public new virtual bool AutoScroll
+        {
+            get { return base.AutoScroll; }
+            set { base.AutoScroll = value; }
+        }
+
+        private const int DefaultItemSpacing = 32;
+        /// <summary>
+        /// Gets or sets spacing in pixels between items. Default value is 1.
+        /// </summary>
+        [Browsable(true), DefaultValue(DefaultItemSpacing), Category("Layout"), Description("Indicates spacing in pixels between items.")]
+        public override int ItemSpacing
+        {
+            get { return base.ItemSpacing; }
+            set
+            {
+                base.ItemSpacing = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether items contained by container are resized to fit the container bounds. When container is in horizontal
+        /// layout mode then all items will have the same height. When container is in vertical layout mode then all items
+        /// will have the same width. Default value is true.
+        /// </summary>
+        [Browsable(false), DefaultValue(false), Category("Layout")]
+        public override bool ResizeItemsToFit
+        {
+            get { return base.ResizeItemsToFit; }
+            set
+            {
+                base.ResizeItemsToFit = value;
+            }
+        }
+
+        protected override Size DefaultSize
+        {
+            get
+            {
+                return new Size(600, 400);
+            }
+        }
+
+        protected override void OnMouseDragOverProcessed(int x, int y, System.Windows.Forms.DragEventArgs dragArgs)
+        {
+            base.OnMouseDragOverProcessed(x, y, dragArgs);
+            this.Invalidate();
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Metro/MetroTilePanel.ico b/PROMS/DotNetBar Source Code/Metro/MetroTilePanel.ico
new file mode 100644
index 00000000..8b9d0d52
Binary files /dev/null and b/PROMS/DotNetBar Source Code/Metro/MetroTilePanel.ico differ
diff --git a/PROMS/DotNetBar Source Code/Metro/MetroToolbar.cs b/PROMS/DotNetBar Source Code/Metro/MetroToolbar.cs
new file mode 100644
index 00000000..f4a8d68a
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Metro/MetroToolbar.cs	
@@ -0,0 +1,637 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing.Design;
+using System.ComponentModel;
+using DevComponents.DotNetBar.Metro.Rendering;
+using System.Drawing;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Metro
+{
+    [ToolboxBitmap(typeof(MetroShell), "MetroToolbar.ico"), ToolboxItem(true), Designer("DevComponents.DotNetBar.Design.MetroToolbarDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf"), System.Runtime.InteropServices.ComVisible(false)]
+    public class MetroToolbar : ItemControl
+    {
+        #region Events
+        /// <summary>
+        /// Occurs before Expanded property has changed, i.e. control expanded or collapsed and allows you to cancel action by setting Cancel=true on event arguments.
+        /// </summary>
+        [Description("Occurs before Expanded property has changed, i.e. control expanded or collapsed and allows you to cancel action by setting Cancel=true on event arguments.")]
+        public event CancelEventHandler ExpandedChanging;
+        /// <summary>
+        /// Raises ExpandedChanging event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnExpandedChanging(CancelEventArgs e)
+        {
+            CancelEventHandler handler = ExpandedChanging;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        /// <summary>
+        /// Occurs after Expanded property value has changed, i.e. control was expanded or collapsed.
+        /// </summary>
+        [Description("Occurs after Expanded property value has changed, i.e. control was expanded or collapsed.")]
+        public event EventHandler ExpandedChanged;
+        /// <summary>
+        /// Raises ExpandedChanged event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnExpandedChanged(EventArgs e)
+        {
+            EventHandler handler = ExpandedChanged;
+            if (handler != null)
+                handler(this, e);
+        }
+        #endregion
+
+        #region Constructor
+        private MetroToolbarContainer _ItemContainer = null;
+        /// <summary>
+        /// Initializes a new instance of the MetroStatusBar class.
+        /// </summary>
+        public MetroToolbar()
+        {
+            _ItemContainer = new MetroToolbarContainer(this);
+            _ItemContainer.GlobalItem = false;
+            _ItemContainer.ContainerControl = this;
+            _ItemContainer.Stretch = true;
+            _ItemContainer.Displayed = true;
+            _ItemContainer.Style = eDotNetBarStyle.StyleManagerControlled;
+            //base.AutoSize = true;
+            this.ColorScheme.Style = eDotNetBarStyle.StyleManagerControlled;
+            _ItemContainer.SetOwner(this);
+            this.SetBaseItemContainer(_ItemContainer);
+            this.DragDropSupport = true;
+            this.ItemAdded += new EventHandler(ChildItemAdded);
+            this.ItemRemoved += new ItemRemovedEventHandler(ChildItemRemoved);
+            StyleManager.Register(this);
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            StyleManager.Unregister(this);
+            this.ItemAdded -= new EventHandler(ChildItemAdded);
+            this.ItemRemoved -= new ItemRemovedEventHandler(ChildItemRemoved);
+            base.Dispose(disposing);
+        }
+        /// <summary>
+        /// Called by StyleManager to notify control that style on manager has changed and that control should refresh its appearance if
+        /// its style is controlled by StyleManager.
+        /// </summary>
+        /// <param name="newStyle">New active style.</param>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void StyleManagerStyleChanged(eDotNetBarStyle newStyle)
+        {
+            _ItemContainer.NeedRecalcSize = true;
+        }
+        #endregion
+
+        #region Internal Implementation
+        protected override void PaintControlBackground(ItemPaintArgs pa)
+        {
+            MetroRender.Paint(this, pa);
+            base.PaintControlBackground(pa);
+        }
+        private void ChildItemAdded(object sender, EventArgs e)
+        {
+            this.RecalcLayout();
+        }
+        private void ChildItemRemoved(object sender, ItemRemovedEventArgs e)
+        {
+            this.RecalcLayout();
+        }
+        protected override void OnForeColorChanged(EventArgs e)
+        {
+            _ItemContainer.UpdateSystemColors();
+            base.OnForeColorChanged(e);
+        }
+        /// <summary>
+        /// Returns collection of items on a bar.
+        /// </summary>
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content), Browsable(false)]
+        public SubItemsCollection Items
+        {
+            get
+            {
+                return _ItemContainer.MainItemsContainer.SubItems;
+            }
+        }
+        /// <summary>
+        /// Gets or sets spacing between items, default value is 0.
+        /// </summary>
+        [DefaultValue(0), Category("Appearance"), Description("Gets or sets spacing between items.")]
+        public int ItemSpacing
+        {
+            get { return _ItemContainer.MainItemsContainer.ItemSpacing; }
+            set
+            {
+                _ItemContainer.MainItemsContainer.ItemSpacing = value;
+                this.RecalcLayout();
+            }
+        }
+
+        /// <summary>
+        /// Returns collection of items on a bar.
+        /// </summary>
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content), Browsable(false)]
+        public SubItemsCollection ExtraItems
+        {
+            get
+            {
+                return _ItemContainer.ExtraItemsContainer.SubItems;
+            }
+        }
+
+        private bool _ToolbarRegistered = false;
+        protected override void OnParentChanged(EventArgs e)
+        {
+            if (_AutoRegister)
+                RegisterToolbar();
+            base.OnParentChanged(e);
+        }
+        protected override void OnHandleDestroyed(EventArgs e)
+        {
+            if (_AutoRegister)
+                UnregisterToolbar();
+            base.OnHandleDestroyed(e);
+        }
+        protected override void OnHandleCreated(EventArgs e)
+        {
+            base.OnHandleCreated(e);
+            if (_AutoRegister)
+                RegisterToolbar();
+            if (_SetExpandedDelayed)
+                this.Expanded = _ExpandedDelayed;
+        }
+
+        private void RegisterToolbar()
+        {
+            RegisterToolbar(GetMetroTab());
+        }
+        /// <summary>
+        /// Registers toolbar with MetroTab so it can participate in Quick Access Toolbar operations.
+        /// </summary>
+        /// <param name="tab">MetroTab</param>
+        public void RegisterToolbar(MetroShell tab)
+        {
+            if (_ToolbarRegistered) return;
+            if (tab == null) return;
+            tab.RegisterToolbar(this);
+            _ToolbarRegistered = true;
+        }
+        private void UnregisterToolbar()
+        {
+            UnregisterToolbar(GetMetroTab());
+        }
+        /// <summary>
+        /// Unregisters previously registered toolbar from MetroTab and removes it from Quick Access Toolbar operations.
+        /// </summary>
+        public void UnregisterToolbar(MetroShell tab)
+        {
+            if (!_ToolbarRegistered) return;
+            if (tab == null) return;
+            tab.UnregisterToolbar(this);
+            _ToolbarRegistered = false;
+        }
+        private MetroShell GetMetroTab()
+        {
+            MetroAppForm form = this.FindForm() as MetroAppForm;
+            if (form == null)
+            {
+                // Walk up the chain perhaps its there
+                Control parent = this.Parent;
+                while (parent != null)
+                {
+                    if(parent is MetroShell)
+                        return (MetroShell)parent;
+                    parent = parent.Parent;
+                }
+                return null;
+            }
+
+            MetroShell tab = form.MetroShell;
+            return tab;
+        }
+
+        private bool _AutoRegister = true;
+        /// <summary>
+        /// Gets or sets whether toolbar is attempted to be automatically registered with parent MetroShell control so it can participate in Quick Access Toolbar operations. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Browsable(false), Category("Behavior"), Description("Indicates whether toolbar is attempted to be automatically registered with parent MetroTab control so it can participate in Quick Access Toolbar operations")]
+        public bool AutoRegister
+        {
+            get { return _AutoRegister; }
+            set
+            {
+                _AutoRegister = value;
+            }
+        }
+        
+
+        private bool _SetExpandedDelayed = false;
+        private bool _ExpandedDelayed = false;
+        private bool _Expanded = false;
+        /// <summary>
+        /// Gets or sets whether control is expanded or not. When control is expanded both main and extra toolbar items are visible. When collapsed
+        /// only main items are visible. Default value is false.
+        /// </summary>
+        [DefaultValue(false), Browsable(true), Category("Layout"), Description("Indicates whether control is expanded or not. When control is expanded both main and extra toolbar items are visible.")]
+        public bool Expanded
+        {
+            get { return _Expanded; }
+            set
+            {
+                if (_Expanded != value)
+                {
+                    CancelEventArgs cargs = new CancelEventArgs();
+                    OnExpandedChanging(cargs);
+                    if (cargs.Cancel) return;
+
+                    if (IsUpdateSuspended || !BarFunctions.IsHandleValid(this))
+                    {
+                        _SetExpandedDelayed = true;
+                        _ExpandedDelayed = value;
+                        return;
+                    }
+                    _SetExpandedDelayed = false;
+                    _Expanded = value;
+                    OnExpandedChanged();
+                }
+            }
+        }
+
+        protected override void RecalcSize()
+        {
+            if (_ChangingExpanded) return;
+
+            base.RecalcSize();
+            int height = GetAutoSizeHeight();
+            if (height != this.Height)
+                this.Height = height;
+        }
+
+        /// <summary>
+        /// Returns automatically calculated height of the control given current content.
+        /// </summary>
+        /// <returns>Height in pixels.</returns>
+        public override int GetAutoSizeHeight()
+        {
+            ElementStyle style = GetBackgroundStyle();
+            int styleWhiteSpace = 0;
+            if (style != null)
+                styleWhiteSpace = ElementStyleLayout.VerticalStyleWhiteSpace(style);
+
+            if (_Expanded)
+            {
+                //if (_ItemContainer.MainItemsContainer.SubItems.Count == 0 && _ItemContainer.ExtraItemsContainer.SubItems.Count == 0)
+                //    return 28;
+                return _ItemContainer.HeightInternal;
+            }
+            else
+            {
+                //if (_ItemContainer.MainItemsContainer.SubItems.Count == 0)
+                //    return 28;
+                return _ItemContainer.MainItemsContainer.HeightInternal;
+            }
+        }
+
+        private eExpandDirection _LastExpandDirection = eExpandDirection.Auto;
+        private bool _ChangingExpanded = false;
+        private void OnExpandedChanged()
+        {
+            _ChangingExpanded = true;
+
+            try
+            {
+                Rectangle startRect = this.Bounds;
+                Rectangle endRect;
+
+                ElementStyle style = GetBackgroundStyle();
+                int styleWhiteSpace = 0;
+                if (style != null)
+                    styleWhiteSpace = ElementStyleLayout.VerticalStyleWhiteSpace(style);
+
+                if (_Expanded)
+                {
+                    eExpandDirection direction = GetExpandDirection();
+                    if (direction == eExpandDirection.Bottom)
+                        endRect = new Rectangle(this.Left, this.Top, this.Width, _ItemContainer.HeightInternal + styleWhiteSpace);
+                    else
+                        endRect = new Rectangle(this.Left, this.Top - (_ItemContainer.HeightInternal - _ItemContainer.MainItemsContainer.HeightInternal), this.Width, _ItemContainer.HeightInternal + styleWhiteSpace);
+                    _LastExpandDirection = direction;
+                }
+                else
+                {
+                    if (_LastExpandDirection == eExpandDirection.Bottom)
+                        endRect = new Rectangle(this.Left, this.Top, this.Width, _ItemContainer.MainItemsContainer.HeightInternal + styleWhiteSpace);
+                    else
+                        endRect = new Rectangle(this.Left, this.Top + (_ItemContainer.HeightInternal - _ItemContainer.MainItemsContainer.HeightInternal), this.Width, _ItemContainer.MainItemsContainer.HeightInternal + styleWhiteSpace);
+                }
+
+                if (_AnimationSpeed <= 0 || this.DesignMode)
+                {
+                    if (this.DesignMode)
+                        TypeDescriptor.GetProperties(this)["Bounds"].SetValue(this, endRect);
+                    else
+                        this.Bounds = endRect;
+                }
+                else
+                    BarFunctions.AnimateControl(this, true, _AnimationSpeed, startRect, endRect);
+
+                OnExpandedChanged(EventArgs.Empty);
+
+                if (_Expanded)
+                {
+                    if (_AutoCollapse && !this.DesignMode)
+                        TrackAutoCollapse();
+                }
+                else
+                {
+                    if (_AutoCollapse)
+                        StopAutoCollapseTracking();
+                }
+            }
+            finally
+            {
+                _ChangingExpanded = false;
+            }
+        }
+
+        private Timer _ActiveWindowTimer = null;
+        private IntPtr _ForegroundWindow = IntPtr.Zero;
+        private IntPtr _ActiveWindow = IntPtr.Zero;
+        private void TrackAutoCollapse()
+        {
+            if (_ActiveWindowTimer != null)
+                return;
+            _ActiveWindowTimer = new Timer();
+            _ActiveWindowTimer.Interval = 100;
+            _ActiveWindowTimer.Tick += new EventHandler(ActiveWindowTimer_Tick);
+
+            _ForegroundWindow = NativeFunctions.GetForegroundWindow();
+            _ActiveWindow = NativeFunctions.GetActiveWindow();
+
+            _ActiveWindowTimer.Start();
+
+        }
+        private void ActiveWindowTimer_Tick(object sender, EventArgs e)
+        {
+            if (_ActiveWindowTimer == null)
+                return;
+
+            IntPtr f = NativeFunctions.GetForegroundWindow();
+            IntPtr a = NativeFunctions.GetActiveWindow();
+
+            if (f != _ForegroundWindow || a != _ActiveWindow)
+            {
+                if (a != IntPtr.Zero)
+                {
+                    Control c = Control.FromHandle(a);
+                    if (c is PopupContainer || c is PopupContainerControl || c is Balloon)
+                        return;
+                }
+                _ActiveWindowTimer.Stop();
+                OnActiveWindowTrackingChanged();
+            }
+        }
+        /// <summary>
+        /// Called after change of active window has been detected. SetupActiveWindowTimer must be called to enable detection.
+        /// </summary>
+        private void OnActiveWindowTrackingChanged()
+        {
+            if (this.Expanded)
+                CollapseToolbar(eEventSource.Code);
+            ReleaseActiveWindowTimer();
+        }
+        private void StopAutoCollapseTracking()
+        {
+            if (_ActiveWindowTimer != null)
+            {
+                Timer timer = _ActiveWindowTimer;
+                _ActiveWindowTimer = null;
+                timer.Stop();
+                timer.Tick -= new EventHandler(ActiveWindowTimer_Tick);
+                timer.Dispose();
+            }
+        }
+        protected override void OnItemMouseUp(BaseItem item, MouseEventArgs e)
+        {
+            base.OnItemMouseUp(item, e);
+
+            if (e.Button == MouseButtons.Right && item.CanCustomize)
+            {
+                MetroShell tab = GetAppMetroTab();
+                if (tab != null)
+                    tab.ShowCustomizeContextMenu(item, true);
+            }
+        }
+        private MetroShell GetAppMetroTab()
+        {
+            MetroAppForm form = this.FindForm() as MetroAppForm;
+            if (form != null)
+            {
+                return form.MetroShell;
+            }
+            return null;
+        }
+
+        /// <summary>
+        /// Invokes the ItemClick event.
+        /// </summary>
+        /// <param name="item">Reference to the item that was clicked.</param>
+        protected override void OnItemClick(BaseItem item)
+        {
+            base.OnItemClick(item);
+
+            if (_Expanded && _AutoCollapse && !item.SystemItem)
+            {
+                if (item is PopupItem && !((PopupItem)item).AutoCollapseOnClick)
+                    return;
+                CollapseToolbar(eEventSource.Code);
+            }
+        }
+        protected override bool OnSysMouseDown(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+            if (!this.DesignMode && _AutoCollapse && this.Expanded && !this.ClientRectangle.Contains(this.PointToClient(Control.MousePosition)))
+                CollapseToolbar(eEventSource.Mouse);
+            return base.OnSysMouseDown(hWnd, wParam, lParam);
+        }
+        private void CollapseToolbar(eEventSource source)
+        {
+            if (this.Expanded)
+                this.Expanded = false;
+        }
+        private eExpandDirection GetExpandDirection()
+        {
+            if (_ExpandDirection != eExpandDirection.Auto)
+                return _ExpandDirection;
+            if (this.Parent == null)
+                return eExpandDirection.Bottom;
+            Rectangle parentRect = this.Parent.ClientRectangle;
+            if (this.Top + _ItemContainer.HeightInternal > parentRect.Bottom)
+                return eExpandDirection.Top;
+            return eExpandDirection.Bottom;
+        }
+
+        private bool _AutoCollapse = true;
+        /// <summary>
+        /// Gets or sets whether control is automatically collapsed, Expanded property set to False, if control was expanded and any button on the control was clicked or mouse is clicked elsewhere, parent form has lost input focus or some other control gains input focus.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether control is automatically collapsed, Expanded property set to False, if control was expanded and any button on the control was clicked or mouse is clicked elsewhere, parent form has lost input focus or some other control gains input focus.")]
+        public bool AutoCollapse
+        {
+            get { return _AutoCollapse; }
+            set
+            {
+                if (value != _AutoCollapse)
+                {
+                    bool oldValue = _AutoCollapse;
+                    _AutoCollapse = value;
+                    OnAutoCollapseChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when AutoCollapse property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnAutoCollapseChanged(bool oldValue, bool newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("AutoCollapse"));
+        }
+
+        private int _AnimationSpeed = 150;
+        /// <summary>
+        /// Gets or sets the animation speed duration in milliseconds. Default value is 150 milliseconds. Set to zero, 0 to disable animation.
+        /// </summary>
+        [DefaultValue(150), Category("Behavior"), Description("Indicates animation speed duration in milliseconds. Default value is 150 milliseconds. Set to zero, 0 to disable animation.")]
+        public int AnimationSpeed
+        {
+            get { return _AnimationSpeed; }
+            set
+            {
+                if (value != _AnimationSpeed)
+                {
+                    int oldValue = _AnimationSpeed;
+                    _AnimationSpeed = value;
+                    OnAnimationSpeedChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when AnimationSpeed property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnAnimationSpeedChanged(int oldValue, int newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("AnimationSpeed"));
+        }
+
+        private eExpandDirection _ExpandDirection = eExpandDirection.Auto;
+        /// <summary>
+        /// Gets or sets the expand direction for the toolbar. Default value is Auto.
+        /// </summary>
+        [DefaultValue(eExpandDirection.Auto), Category("Behavior"), Description("Indicates expand direction for the toolbar")]
+        public eExpandDirection ExpandDirection
+        {
+            get { return _ExpandDirection; }
+            set
+            {
+                if (value != _ExpandDirection)
+                {
+                    eExpandDirection oldValue = _ExpandDirection;
+                    _ExpandDirection = value;
+                    OnExpandDirectionChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when ExpandDirection property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnExpandDirectionChanged(eExpandDirection oldValue, eExpandDirection newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("ExpandDirection"));
+        }
+
+        /// <summary>
+        /// Gets or sets whether Expand button is visible. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance"), Description("Indicates whether Expand button is visible")]
+        public bool ExpandButtonVisible
+        {
+            get { return _ItemContainer.ExpandButtonVisible; }
+            set
+            {
+                _ItemContainer.ExpandButtonVisible = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether control height is set automatically based on the content. Default value is false.
+        /// </summary>
+        [Browsable(false), Category("Layout"), Description("Indicates whether control height is set automatically."), DefaultValue(true), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+#if FRAMEWORK20
+        public override bool AutoSize
+#else
+        public bool AutoSize
+#endif
+        {
+            get { return base.AutoSize; }
+            set
+            {
+                base.AutoSize = value;
+            }
+        }
+
+        #endregion
+
+        #region Licensing
+#if !TRIAL
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            base.OnPaint(e);
+            if (NativeFunctions.keyValidated2 != 266)
+                TextDrawing.DrawString(e.Graphics, "Invalid License", this.Font, Color.FromArgb(180, Color.Red), this.ClientRectangle, eTextFormat.Bottom | eTextFormat.HorizontalCenter);
+        }
+
+        private string _LicenseKey = "";
+        [Browsable(false), DefaultValue("")]
+        public string LicenseKey
+        {
+            get { return _LicenseKey; }
+            set
+            {
+                if (NativeFunctions.ValidateLicenseKey(value))
+                    return;
+                _LicenseKey = (!NativeFunctions.CheckLicenseKey(value) ? "9dsjkhds7" : value);
+            }
+        }
+#endif
+        #endregion
+    }
+
+    /// <summary>
+    /// Defines expand direction behavior for MetroToolbar.
+    /// </summary>
+    public enum eExpandDirection
+    {
+        /// <summary>
+        /// Expand direction is automatically determined by the position of the control on the form.
+        /// </summary>
+        Auto,
+        /// <summary>
+        /// Control is expanded up so bottom of the control is fixed.
+        /// </summary>
+        Top,
+        /// <summary>
+        /// Control sis expanded down so top of the control is fixed.
+        /// </summary>
+        Bottom
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Metro/MetroToolbar.ico b/PROMS/DotNetBar Source Code/Metro/MetroToolbar.ico
new file mode 100644
index 00000000..f09cc548
Binary files /dev/null and b/PROMS/DotNetBar Source Code/Metro/MetroToolbar.ico differ
diff --git a/PROMS/DotNetBar Source Code/Metro/MetroToolbarContainer.cs b/PROMS/DotNetBar Source Code/Metro/MetroToolbarContainer.cs
new file mode 100644
index 00000000..c484910f
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Metro/MetroToolbarContainer.cs	
@@ -0,0 +1,306 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+using System.ComponentModel;
+using DevComponents.DotNetBar.Metro.Rendering;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Metro
+{
+    /// <summary>
+    /// Defines the internal container item for the MetroToolbar control.
+    /// </summary>
+    [System.ComponentModel.ToolboxItem(false), System.ComponentModel.DesignTimeVisible(false)]
+    public class MetroToolbarContainer : ImageItem, IDesignTimeProvider
+    {
+        #region Internal Implementation
+        private SimpleItemContainer _MainItemsContainer = null;
+        private ButtonItem _ExpandButton = null;
+        private ItemContainer _ExtraItemsContainer = null;
+        private MetroToolbar _MetroToolbar = null;
+        /// <summary>
+        /// Creates new instance of the class and initializes it with the parent RibbonStrip control.
+        /// </summary>
+        /// <param name="parent">Reference to parent MetroToolbar control</param>
+        public MetroToolbarContainer(MetroToolbar parent)
+        {
+            _MetroToolbar = parent;
+
+            // We contain other controls
+            m_IsContainer = true;
+            this.AccessibleRole = System.Windows.Forms.AccessibleRole.Grouping;
+
+            _MainItemsContainer = new SimpleItemContainer();
+            //_MainItemsContainer.LayoutOrientation = eOrientation.Horizontal;
+            _MainItemsContainer.GlobalItem = false;
+            _MainItemsContainer.Displayed = true;
+            //_MainItemsContainer.ItemSpacing = 0;
+            _MainItemsContainer.SetSystemContainer(true);
+            _MainItemsContainer.ContainerControl = parent;
+            _MainItemsContainer.DesignTimeVisible = false;
+            _MainItemsContainer.Name = "_MainItemsContainer";
+            this.SubItems.Add(_MainItemsContainer);
+
+            _ExpandButton = new ButtonItem();
+            _ExpandButton.Click += new EventHandler(ExpandButtonClick);
+            _ExpandButton.ImagePaddingHorizontal = 12;
+            _ExpandButton.ImagePaddingVertical = 10;
+            _ExpandButton.Name = "sysMetroToolbarExpandButton";
+            _ExpandButton.SetSystemItem(true);
+            _ExpandButton.ContainerControl = parent;
+            _ExpandButton.DesignTimeVisible = false;
+            UpdateExpandButtonImage();
+            this.SubItems.Add(_ExpandButton);
+
+            _ExtraItemsContainer = new ItemContainer();
+            _ExtraItemsContainer.LayoutOrientation = eOrientation.Horizontal;
+            _ExtraItemsContainer.GlobalItem = false;
+            _ExtraItemsContainer.Displayed = true;
+            _ExtraItemsContainer.MultiLine = true;
+            _ExtraItemsContainer.SetSystemContainer(true);
+            _ExtraItemsContainer.ContainerControl = parent;
+            _ExtraItemsContainer.DesignTimeVisible = false;
+            _ExtraItemsContainer.Name = "_ExtraItemsContainer";
+            this.SubItems.Add(_ExtraItemsContainer);
+        }
+        protected override void Dispose(bool disposing)
+        {
+            if (_ExpandButton.Image != null)
+            {
+                Image image = _ExpandButton.Image;
+                _ExpandButton.Image = null;
+                image.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+        private void UpdateExpandButtonImage()
+        {
+            if (_ExpandButton.Image != null)
+            {
+                Image image = _ExpandButton.Image;
+                _ExpandButton.Image = null;
+                image.Dispose();
+            }
+
+            Bitmap bitmap = new Bitmap(16, 16);
+            using (Graphics g = Graphics.FromImage(bitmap))
+            {
+                g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.HighQuality;
+                using (SolidBrush brush = new SolidBrush(MetroRender.GetColorTable().ForeColor))
+                {
+                    g.FillEllipse(brush, new Rectangle(0, 2, 4, 4));
+                    g.FillEllipse(brush, new Rectangle(6, 2, 4, 4));
+                    g.FillEllipse(brush, new Rectangle(12, 2, 4, 4));
+                }
+            }
+            _ExpandButton.Image = bitmap;
+        }
+        void ExpandButtonClick(object sender, EventArgs e)
+        {
+            _MetroToolbar.Expanded = !_MetroToolbar.Expanded;
+        }
+
+        /// <summary>
+        /// Paints this base container
+        /// </summary>
+        public override void Paint(ItemPaintArgs pa)
+        {
+            if (this.SuspendLayout)
+                return;
+
+            _MainItemsContainer.Paint(pa);
+            _ExpandButton.Paint(pa);
+            _ExtraItemsContainer.Paint(pa);
+        }
+
+        public override void RecalcSize()
+        {
+            if (ExpandButtonVisible)
+            {
+                _ExpandButton.Displayed = true;
+                _ExpandButton.RecalcSize();
+                _ExpandButton.SetDisplayRectangle(new Rectangle(this.WidthInternal - _ExpandButton.WidthInternal, this.TopInternal, _ExpandButton.WidthInternal, _ExpandButton.HeightInternal));
+            }
+            else
+            {
+                _ExpandButton.Displayed = false;
+                _ExpandButton.HeightInternal = 0;
+                _ExpandButton.WidthInternal = 0;
+            }
+
+            _MainItemsContainer.LeftInternal = this.LeftInternal;
+            _MainItemsContainer.TopInternal = this.TopInternal;
+            if (_MainItemsContainer.VisibleSubItems == 0)
+            {
+                _MainItemsContainer.MinimumSize = new Size(this.WidthInternal - _ExpandButton.WidthInternal, 28);
+            }
+            else
+            {
+                _MainItemsContainer.MinimumSize = Size.Empty;
+                _MainItemsContainer.WidthInternal = this.WidthInternal - _ExpandButton.WidthInternal;
+                _MainItemsContainer.HeightInternal = 0;
+            }
+            _MainItemsContainer.RecalcSize();
+            
+
+            const int MainExtraItemsSpacing = 1;
+            _ExtraItemsContainer.TopInternal = this.TopInternal + Math.Max(_MainItemsContainer.HeightInternal, _ExpandButton.HeightInternal) + MainExtraItemsSpacing;
+            if (_ExtraItemsContainer.VisibleSubItems == 0)
+            {
+                _ExtraItemsContainer.MinimumSize = new Size(this.WidthInternal, 28);
+            }
+            else
+            {
+                _ExtraItemsContainer.MinimumSize = Size.Empty;
+                _ExtraItemsContainer.WidthInternal = this.WidthInternal;
+                _ExtraItemsContainer.HeightInternal = 0;
+            }
+            _ExtraItemsContainer.RecalcSize();
+
+
+            this.HeightInternal = Math.Max(_ExpandButton.HeightInternal, _MainItemsContainer.HeightInternal) + _ExtraItemsContainer.HeightInternal + MainExtraItemsSpacing;
+
+            base.RecalcSize();
+        }
+
+        /// <summary>
+        /// Returns copy of GenericItemContainer item
+        /// </summary>
+        public override BaseItem Copy()
+        {
+            MetroToolbarContainer objCopy = new MetroToolbarContainer(_MetroToolbar);
+            this.CopyToItem(objCopy);
+
+            return objCopy;
+        }
+        protected override void CopyToItem(BaseItem copy)
+        {
+            RibbonStripContainerItem objCopy = copy as RibbonStripContainerItem;
+            base.CopyToItem(objCopy);
+        }
+
+        private bool _ExpandButtonVisible = true;
+        /// <summary>
+        /// Gets or sets whether Expand button is visible. Default value is true.
+        /// </summary>
+        [DefaultValue(true)]
+        public bool ExpandButtonVisible
+        {
+            get { return _ExpandButtonVisible; }
+            set
+            {
+                if (value != _ExpandButtonVisible)
+                {
+                    bool oldValue = _ExpandButtonVisible;
+                    _ExpandButtonVisible = value;
+                    OnExpandButtonVisibleChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when ExpandButtonVisible property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnExpandButtonVisibleChanged(bool oldValue, bool newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("ExpandButtonVisible"));
+            this.NeedRecalcSize = true;
+            _MetroToolbar.RecalcLayout();
+        }
+
+        /// <summary>
+        /// Gets reference to container that host items.
+        /// </summary>
+        public SimpleItemContainer MainItemsContainer
+        {
+            get
+            {
+                return _MainItemsContainer;
+            }
+        }
+
+        /// <summary>
+        /// Gets reference to container that hosts extra items.
+        /// </summary>
+        public ItemContainer ExtraItemsContainer
+        {
+            get
+            {
+                return _ExtraItemsContainer;
+            }
+        }
+
+        public void UpdateSystemColors()
+        {
+            UpdateExpandButtonImage();
+        }
+        #endregion
+
+        #region IDesignTimeProvider Members
+
+        public InsertPosition GetInsertPosition(Point pScreen, BaseItem DragItem)
+        {
+            InsertPosition pos = null;
+            Point clientPoint = _MetroToolbar.PointToClient(pScreen);
+            if(_MainItemsContainer.DisplayRectangle.Contains(clientPoint) || !_MetroToolbar.Expanded)
+                pos = ((IDesignTimeProvider)_MainItemsContainer).GetInsertPosition(pScreen, DragItem);
+
+            if (pos == null && _MetroToolbar.Expanded)
+            {
+                pos = ((IDesignTimeProvider)_ExtraItemsContainer).GetInsertPosition(pScreen, DragItem);
+            }
+            return pos;
+        }
+
+        public void DrawReversibleMarker(int iPos, bool Before)
+        {
+            DesignTimeProviderContainer.DrawReversibleMarker(this, iPos, Before);
+        }
+
+        public void InsertItemAt(BaseItem objItem, int iPos, bool Before)
+        {
+            DesignTimeProviderContainer.InsertItemAt(this, objItem, iPos, Before);
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the item is expanded or not. For Popup items this would indicate whether the item is popped up or not.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), System.ComponentModel.DefaultValue(false), System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
+        public override bool Expanded
+        {
+            get
+            {
+                return base.Expanded;
+            }
+            set
+            {
+                base.Expanded = value;
+                if (!value)
+                {
+                    foreach (BaseItem item in this.SubItems)
+                        item.Expanded = false;
+                }
+            }
+        }
+
+        /// <summary>
+        /// When parent items does recalc size for its sub-items it should query
+        /// image size and store biggest image size into this property.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden), System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+        public override System.Drawing.Size SubItemsImageSize
+        {
+            get
+            {
+                return base.SubItemsImageSize;
+            }
+            set
+            {
+                //m_SubItemsImageSize = value;
+            }
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Metro/Rendering/DrawingHelpers.cs b/PROMS/DotNetBar Source Code/Metro/Rendering/DrawingHelpers.cs
new file mode 100644
index 00000000..502b03ec
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Metro/Rendering/DrawingHelpers.cs	
@@ -0,0 +1,102 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Metro.Rendering
+{
+    internal static class DrawingHelpers
+    {
+        /// <summary>
+        /// Draws the border.
+        /// </summary>
+        /// <param name="g">Graphics canvas.</param>
+        /// <param name="bounds">Bounds for border.</param>
+        /// <param name="borderThickness">Border thickness.</param>
+        /// <param name="borderColor">Border color.</param>
+        public static void DrawBorder(Graphics g, RectangleF bounds, Thickness borderThickness, BorderColors borderColor)
+        {
+            if (borderColor.IsEmpty || borderThickness.IsZero) return;
+
+            bounds.Width -= (float)borderThickness.Right;
+            bounds.Height -= (float)borderThickness.Bottom;
+            if (borderThickness.Right > 1) bounds.Width++;
+            if (borderThickness.Bottom > 1) bounds.Height++;
+
+            System.Drawing.Drawing2D.SmoothingMode sm = g.SmoothingMode;
+            g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.None;
+
+            if (borderThickness.Left > 0d && !borderColor.Left.IsEmpty)
+            {
+                using (Pen pen = new Pen(borderColor.Left, (float)borderThickness.Left))
+                {
+                    pen.Alignment = System.Drawing.Drawing2D.PenAlignment.Inset;
+                    g.DrawLine(pen, bounds.X, bounds.Y, bounds.X, bounds.Bottom);
+                }
+            }
+
+            if (borderThickness.Top > 0d && !borderColor.Top.IsEmpty)
+            {
+                using (Pen pen = new Pen(borderColor.Top, (float)borderThickness.Top))
+                {
+                    pen.Alignment = System.Drawing.Drawing2D.PenAlignment.Inset;
+                    g.DrawLine(pen, bounds.X, bounds.Y, bounds.Right, bounds.Y);
+                }
+            }
+
+            if (borderThickness.Right > 0d && !borderColor.Right.IsEmpty)
+            {
+                using (Pen pen = new Pen(borderColor.Right, (float)borderThickness.Right))
+                {
+                    pen.Alignment = System.Drawing.Drawing2D.PenAlignment.Inset;
+                    g.DrawLine(pen, bounds.Right, bounds.Y, bounds.Right, bounds.Bottom + (float)borderThickness.Bottom / 2);
+                }
+            }
+
+            if (borderThickness.Bottom > 0d && !borderColor.Bottom.IsEmpty)
+            {
+                using (Pen pen = new Pen(borderColor.Bottom, (float)borderThickness.Bottom))
+                {
+                    pen.Alignment = System.Drawing.Drawing2D.PenAlignment.Inset;
+                    g.DrawLine(pen, bounds.X, bounds.Bottom, bounds.Right, bounds.Bottom);
+                }
+            }
+
+            g.SmoothingMode = sm;
+        }
+        /// <summary>
+        /// Draws background.
+        /// </summary>
+        /// <param name="g">Graphics canvas.</param>
+        /// <param name="bounds">Background bounds.</param>
+        /// <param name="color">Background color</param>
+        public static void DrawBackground(Graphics g, RectangleF bounds, string color)
+        {
+            if (string.IsNullOrEmpty(color)) return;
+
+            using (SolidBrush brush = new SolidBrush(ColorScheme.GetColor(color)))
+                g.FillRectangle(brush, bounds);
+
+        }
+
+        /// <summary>
+        /// Deflates the rectangle by the border thickness.
+        /// </summary>
+        /// <param name="bounds">Rectangle.</param>
+        /// <param name="borderThickness">Border thickness</param>
+        /// <returns>Rectangle deflated by the border thickness</returns>
+        public static RectangleF Deflate(RectangleF bounds, Thickness borderThickness)
+        {
+            if (borderThickness.IsZero) return bounds;
+
+            bounds.X += (float)borderThickness.Left;
+            bounds.Width -= (float)(borderThickness.Left + borderThickness.Right);
+            bounds.Y += (float)borderThickness.Top;
+            bounds.Height -= (float)(borderThickness.Top + borderThickness.Bottom);
+
+            return bounds;
+        }
+
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Metro/Rendering/MetroAppButtonPainter.cs b/PROMS/DotNetBar Source Code/Metro/Rendering/MetroAppButtonPainter.cs
new file mode 100644
index 00000000..1e784170
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Metro/Rendering/MetroAppButtonPainter.cs	
@@ -0,0 +1,134 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using DevComponents.DotNetBar.Rendering;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+
+namespace DevComponents.DotNetBar.Metro.Rendering
+{
+    internal class MetroAppButtonPainter : Office2007ButtonItemPainter
+    {
+        public override Office2007ButtonItemColorTable GetColorTable(ButtonItem button, eButtonContainer buttonCont)
+        {
+            Office2007ColorTable colorTable = this.ColorTable;
+            Office2007ButtonItemColorTable buttonColorTable = null;
+
+            if (button.CustomColorName != "")
+                buttonColorTable = colorTable.ApplicationButtonColors[button.CustomColorName];
+
+            if (buttonColorTable == null)
+                buttonColorTable = colorTable.ApplicationButtonColors[button.GetColorTableName()];
+
+            if (buttonColorTable == null && colorTable.ApplicationButtonColors.Count > 0)
+                buttonColorTable = colorTable.ApplicationButtonColors[0];
+
+            if (buttonColorTable == null) // Return fall back static table
+                buttonColorTable = DevComponents.DotNetBar.Metro.ColorTables.MetroOfficeColorTableInitializer.GetAppFallBackColorTable();
+
+            return buttonColorTable;
+        }
+
+        protected override Rectangle GetDisplayRectangle(ButtonItem button)
+        {
+            Rectangle r = button.DisplayRectangle;
+            if (button is ApplicationButton && ((ApplicationButton)button).IsMenuOverlayPaint)
+            {
+                r.Width += 4;
+                r.Height += 1;
+            }
+            return r;
+        }
+
+        private static readonly int RibbonFormWidthOffset = 2;
+        public override void PaintButtonText(ButtonItem button, ItemPaintArgs pa, Color textColor, CompositeImage image)
+        {
+            Rectangle r = GetDisplayRectangle(button);
+            r.Inflate(-1, -1);
+            r.Width--;
+
+            if (pa.ContainerControl.FindForm() is RibbonForm)
+                r.Width -= RibbonFormWidthOffset+2;
+
+            if (button is ApplicationButton && ((ApplicationButton)button).IsMenuOverlayPaint)
+            {
+                r.Height -= 1;
+                r.Width +=3;
+            }
+
+            eTextFormat format = eTextFormat.HorizontalCenter | eTextFormat.VerticalCenter | eTextFormat.HidePrefix;
+            TextDrawing.DrawString(pa.Graphics, button.Text, pa.Font, textColor, r, format);
+        }
+
+        protected override Color GetTextColor(ButtonItem button, ItemPaintArgs pa)
+        {
+            return base.GetTextColor(button, pa, GetColorTable(button, eButtonContainer.RibbonStrip));
+        }
+
+        public override void PaintButtonImage(ButtonItem button, ItemPaintArgs pa, CompositeImage image, Rectangle imagebounds)
+        {
+            if (!string.IsNullOrEmpty(button.Text)) return;
+            Rectangle r = GetDisplayRectangle(button);
+            r.X = r.X + (r.Width - imagebounds.Width) / 2;
+            r.Y = r.Y + (r.Height - imagebounds.Height) / 2;
+            r.Width = imagebounds.Width;
+            r.Height = imagebounds.Height;
+            base.PaintButtonImage(button, pa, image, r);
+        }
+
+        public override void PaintButtonBackground(ButtonItem button, ItemPaintArgs pa, CompositeImage image)
+        {
+            Office2007ButtonItemColorTable colors = GetColorTable(button, eButtonContainer.RibbonStrip);
+            Office2007ButtonItemStateColorTable stateColors = colors.Default;
+            
+            if (button.IsMouseDown)
+                stateColors = colors.Pressed;
+            else if (button.IsMouseOver)
+                stateColors = colors.MouseOver;
+            Rectangle bounds = GetDisplayRectangle(button);
+            bounds.Width--;
+            //bounds.Height--;
+            Graphics g = pa.Graphics;
+
+            if (pa.ContainerControl.FindForm() is RibbonForm)
+                bounds.Width -= RibbonFormWidthOffset;
+
+            //using (GraphicsPath borderPath = DisplayHelp.GetRoundedRectanglePath(bounds, 0, 2, 2, 0))
+            {
+                //DisplayHelp.FillPath(g, borderPath, stateColors.Background);
+                DisplayHelp.FillRectangle(g, bounds, stateColors.Background);
+
+                if (stateColors.BottomBackgroundHighlight != null && !stateColors.BottomBackgroundHighlight.IsEmpty)
+                {
+                    Rectangle ellipse = new Rectangle(bounds.X - 12, bounds.Y + bounds.Height / 2 - 4, bounds.Width + 24, bounds.Height + 4);
+                    using (GraphicsPath path = new GraphicsPath())
+                    {
+                        path.AddEllipse(ellipse);
+                        using (PathGradientBrush brush = new PathGradientBrush(path))
+                        {
+                            brush.CenterColor = stateColors.BottomBackgroundHighlight.Start;
+                            brush.SurroundColors = new Color[] { stateColors.BottomBackgroundHighlight.End };
+                            brush.CenterPoint = new PointF(ellipse.X + ellipse.Width / 2, bounds.Bottom - 1);
+
+                            g.FillRectangle(brush, bounds);
+                        }
+                    }
+                }
+
+                if (stateColors.InnerBorder != null && !stateColors.InnerBorder.IsEmpty)
+                {
+                    Rectangle innerBorder = bounds;
+                    innerBorder.Inflate(-1, -1);
+                    using (GraphicsPath innerBorderPath = new GraphicsPath())
+                    {
+                        innerBorderPath.AddRectangle(innerBorder);
+                        DisplayHelp.DrawGradientPath(g, innerBorderPath, innerBorder, stateColors.InnerBorder, 1);
+                    }
+                }
+
+                if (stateColors.OuterBorder != null && !stateColors.OuterBorder.IsEmpty)
+                    DisplayHelp.DrawRectangle(g, stateColors.OuterBorder.Start, bounds); //DisplayHelp.DrawGradientPathBorder(g, borderPath, stateColors.OuterBorder, 1);
+            }
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Metro/Rendering/MetroButtonItemPainter.cs b/PROMS/DotNetBar Source Code/Metro/Rendering/MetroButtonItemPainter.cs
new file mode 100644
index 00000000..62bca5a3
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Metro/Rendering/MetroButtonItemPainter.cs	
@@ -0,0 +1,51 @@
+using DevComponents.DotNetBar.Rendering;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace DevComponents.DotNetBar.Metro.Rendering
+{
+    internal class MetroButtonItemPainter : Office2007ButtonItemPainter
+    {
+        private static RoundRectangleShapeDescriptor _DefaultMetroShape = new RoundRectangleShapeDescriptor(0);
+        private static RoundRectangleShapeDescriptor _DefaultMobileShape = new RoundRectangleShapeDescriptor(2);
+        protected override IShapeDescriptor GetButtonShape(ButtonItem button, ItemPaintArgs pa)
+        {
+            IShapeDescriptor shape = MetroButtonItemPainter.GetButtonShape(button);
+            
+            if (pa.ContainerControl is ButtonX)
+                shape = ((ButtonX)pa.ContainerControl).GetButtonShape();
+            else if (pa.ContainerControl is NavigationBar)
+                shape = ((NavigationBar)pa.ContainerControl).ButtonShape;
+            return shape;
+        }
+        private static IShapeDescriptor GetButtonShape(ButtonItem button)
+        {
+            if (button.Shape != null)
+                return button.Shape;
+            else if(StyleManager.Style == eStyle.OfficeMobile2014)
+                return _DefaultMobileShape;
+            return _DefaultMetroShape;
+        }
+
+        public override DotNetBar.Rendering.Office2007ButtonItemColorTable GetColorTable(ButtonItem button, eButtonContainer buttonCont)
+        {
+            if (buttonCont == eButtonContainer.MetroTabStrip)
+            {
+                Office2007ColorTable colorTable = this.ColorTable;
+                object st = null;
+                if (colorTable.ContextualTables.TryGetValue(Office2007ColorTable.GetContextualKey(ButtonColorTableType, "MetroTabStrip"), out st))
+                    return (Office2007ButtonItemColorTable)st;
+            }
+            else if (buttonCont == eButtonContainer.NavigationPane)
+            {
+                Office2007ColorTable colorTable = this.ColorTable;
+                object st = null;
+                if (colorTable.ContextualTables.TryGetValue(Office2007ColorTable.GetContextualKey(ButtonColorTableType, "NavigationBar"), out st))
+                    return (Office2007ButtonItemColorTable)st;
+            }
+
+            return base.GetColorTable(button, buttonCont);
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Metro/Rendering/MetroCaptionItemPainter.cs b/PROMS/DotNetBar Source Code/Metro/Rendering/MetroCaptionItemPainter.cs
new file mode 100644
index 00000000..d135b7c9
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Metro/Rendering/MetroCaptionItemPainter.cs	
@@ -0,0 +1,161 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+using DevComponents.DotNetBar.Rendering;
+using System.Drawing.Drawing2D;
+using System.Drawing.Text;
+
+namespace DevComponents.DotNetBar.Metro.Rendering
+{
+    internal class MetroCaptionItemPainter : Office2007SystemCaptionItemPainter
+    {
+        #region Internal Implementation
+        protected override Rectangle GetSignRect(Rectangle r, Size s)
+        {
+            if (r.Height < 10)
+                return Rectangle.Empty;
+
+            return new Rectangle(r.X + (r.Width - s.Width) / 2, r.Y + (int)Math.Ceiling((double)(r.Height - s.Height)/2), s.Width, s.Height);
+            //return new Rectangle(r.X + (r.Width - s.Width) / 2, r.Bottom - r.Height / 4 - s.Height - 3, s.Width, s.Height);
+        }
+
+        protected override void PaintMinimize(Graphics g, Rectangle r, Office2007SystemButtonStateColorTable ct, bool isEnabled, LinearGradientColorTable foregroundOverride)
+        {
+            Size s = new Size(Dpi.Width9, Dpi.Height2);
+            Rectangle rm = GetSignRect(r, s);
+            LinearGradientColorTable foreground = foregroundOverride ?? ct.Foreground;
+            if (isEnabled)
+                DisplayHelp.FillRectangle(g, rm, foreground);
+            else
+                DisplayHelp.FillRectangle(g, rm, GetDisabledColor(foreground.Start), GetDisabledColor(foreground.End), foreground.GradientAngle);
+        }
+
+        internal static Color GetDisabledColor(Color color)
+        {
+            if (color.IsEmpty) return color;
+            return Color.FromArgb(128, color);
+        }
+
+
+        protected override void PaintRestore(Graphics g, Rectangle r, Office2007SystemButtonStateColorTable ct, bool isEnabled, LinearGradientColorTable foregroundOverride)
+        {
+            SmoothingMode sm = g.SmoothingMode;
+            g.SmoothingMode = SmoothingMode.None;
+
+            Size s = new Size(Dpi.Width10, Dpi.Height10);
+            Rectangle rm = GetSignRect(r, s);
+            Region oldClip = g.Clip;
+
+            LinearGradientColorTable foreground = foregroundOverride ?? ct.Foreground;
+            LinearGradientColorTable buttonTable = isEnabled ? foreground : new LinearGradientColorTable(GetDisabledColor(foreground.Start), GetDisabledColor(foreground.End), foreground.GradientAngle);
+            using (Brush fill = DisplayHelp.CreateBrush(rm, foreground))
+            {
+                Rectangle inner = new Rectangle(rm.X + Dpi.Width4, rm.Y + Dpi.Width2, Dpi.Width6, Dpi.Height4);
+                g.SetClip(inner, CombineMode.Exclude);
+                g.SetClip(new Rectangle(rm.X + Dpi.Width1, rm.Y + Dpi.Height5, Dpi.Width6, Dpi.Height4), CombineMode.Exclude);
+
+                g.FillRectangle(fill, rm.X + Dpi.Width3, rm.Y, Dpi.Width8, Dpi.Height7);
+                g.ResetClip();
+
+                inner = new Rectangle(rm.X + Dpi.Width1, rm.Y + Dpi.Height5, Dpi.Width6, Dpi.Height4);
+                g.SetClip(inner, CombineMode.Exclude);
+                g.FillRectangle(fill, rm.X, rm.Y + Dpi.Height3, Dpi.Width8, Dpi.Height7);
+                g.ResetClip();
+            }
+            if (oldClip != null)
+            {
+                g.Clip = oldClip;
+                oldClip.Dispose();
+            }
+            g.SmoothingMode = sm;
+        }
+
+        protected override void PaintMaximize(Graphics g, Rectangle r, Office2007SystemButtonStateColorTable ct, bool isEnabled, LinearGradientColorTable foregroundOverride)
+        {
+            Size s = new Size(Dpi.Width10, Dpi.Height10);
+            Rectangle rm = GetSignRect(r, s);
+            Region oldClip = g.Clip;
+
+            Rectangle inner = new Rectangle(rm.X + Dpi.Width1, rm.Y + Dpi.Height3, (ct.DarkShade.IsEmpty ? Dpi.Width8 : Dpi.Width7), (ct.DarkShade.IsEmpty ? Dpi.Height6 : Dpi.Height5));
+            g.SetClip(inner, CombineMode.Exclude);
+            LinearGradientColorTable foreground = foregroundOverride ?? ct.Foreground;
+            if (isEnabled)
+                DisplayHelp.FillRectangle(g, rm, foreground);
+            else
+                DisplayHelp.FillRectangle(g, rm, GetDisabledColor(foreground.Start), GetDisabledColor(foreground.End), foreground.GradientAngle);
+
+            if (oldClip != null)
+            {
+                g.Clip = oldClip;
+                oldClip.Dispose();
+            }
+        }
+
+        protected override void PaintClose(Graphics g, Rectangle r, Office2007SystemButtonStateColorTable ct, bool isEnabled, LinearGradientColorTable foregroundOverride)
+        {
+            SmoothingMode sm = g.SmoothingMode;
+            g.SmoothingMode = SmoothingMode.Default;
+
+            Size s = new Size(Dpi.Width8, Dpi.Height8);
+            Rectangle rm = GetSignRect(r, s);
+
+            Rectangle r1 = rm;
+            r1.Offset(0, -1);
+
+            LinearGradientColorTable foreground = foregroundOverride ?? ct.Foreground;
+            if (isEnabled)
+            {
+                using (Pen pen = new Pen(foreground.Start, Dpi.Width2))
+                {
+                    g.DrawLine(pen, r1.X, r1.Y, r1.Right, r1.Bottom);
+                    g.DrawLine(pen, r1.Right, r1.Y, r1.X, r1.Bottom);
+                }
+            }
+            else
+            {
+                using (Pen pen = new Pen(GetDisabledColor(foreground.Start), Dpi.Width2))
+                {
+                    g.DrawLine(pen, r1.X, r1.Y, r1.Right, r1.Bottom);
+                    g.DrawLine(pen, r1.Right, r1.Y, r1.X, r1.Bottom);
+                }
+            }
+
+            g.SmoothingMode = sm;
+        }
+
+        protected override void PaintHelp(Graphics g, Rectangle r, Office2007SystemButtonStateColorTable ct, bool isEnabled, LinearGradientColorTable foregroundOverride)
+        {
+            SmoothingMode sm = g.SmoothingMode;
+            TextRenderingHint th = g.TextRenderingHint;
+            g.SmoothingMode = SmoothingMode.Default;
+            g.TextRenderingHint = TextRenderingHint.ClearTypeGridFit;
+#if FRAMEWORK20
+            using (Font font = new Font(SystemFonts.DefaultFont, FontStyle.Bold))
+#else
+			using(Font font = new Font("Arial", 10, FontStyle.Bold))
+#endif
+            {
+                Size s = TextDrawing.MeasureString(g, "?", font);
+                s.Width += Dpi.Width4;
+                s.Height -= Dpi.Width2;
+                Rectangle rm = GetSignRect(r, s);
+
+                rm.Offset(1, 1);
+                Color color = isEnabled ? ct.DarkShade : GetDisabledColor(ct.DarkShade);
+                using (SolidBrush brush = new SolidBrush(color))
+                    g.DrawString("?", font, brush, rm);
+                rm.Offset(-1, -1);
+                LinearGradientColorTable foreground = foregroundOverride ?? ct.Foreground;
+                color = isEnabled ? foreground.Start : GetDisabledColor(foreground.Start);
+                using (SolidBrush brush = new SolidBrush(color))
+                    g.DrawString("?", font, brush, rm);
+
+            }
+            g.SmoothingMode = sm;
+            g.TextRenderingHint = th;
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Metro/Rendering/MetroFormRenderer.cs b/PROMS/DotNetBar Source Code/Metro/Rendering/MetroFormRenderer.cs
new file mode 100644
index 00000000..08a34305
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Metro/Rendering/MetroFormRenderer.cs	
@@ -0,0 +1,42 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+using DevComponents.DotNetBar.Metro.ColorTables;
+
+namespace DevComponents.DotNetBar.Metro.Rendering
+{
+    internal class MetroFormRenderer : MetroRenderer
+    {
+        public override void Render(MetroRendererInfo renderingInfo)
+        {
+            MetroAppForm form = renderingInfo.Control as MetroAppForm;
+            BorderOverlay overlay = renderingInfo.Control as BorderOverlay;
+            if (form == null && overlay != null) form = overlay.Parent as MetroAppForm;
+            Graphics g = renderingInfo.PaintEventArgs.Graphics;
+            MetroAppFormColorTable fct = renderingInfo.ColorTable.MetroAppForm;
+
+            Thickness borderThickness = form.BorderThickness;
+            BorderColors colors = form.BorderColor;
+            if (borderThickness.IsZero && colors.IsEmpty)
+            {
+                // Get it from table
+                borderThickness = form.IsGlassEnabled ? fct.BorderThickness : fct.BorderPlainThickness;
+                colors = form.IsActive ? fct.BorderColors : fct.BorderColorsInactive;
+            }
+
+            if (overlay == null) // If overlay is being rendered it does not need fill
+            {
+                using (SolidBrush brush = new SolidBrush(form.BackColor))
+                    g.FillRectangle(brush, new Rectangle(0, 0, form.Width, form.Height));
+            }
+
+
+            if (!borderThickness.IsZero && !colors.IsEmpty)
+            {
+                RectangleF br = new RectangleF(0, 0, form.Width, form.Height);
+                DrawingHelpers.DrawBorder(g, br, borderThickness, colors);
+            }
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Metro/Rendering/MetroKeyTipsPainter.cs b/PROMS/DotNetBar Source Code/Metro/Rendering/MetroKeyTipsPainter.cs
new file mode 100644
index 00000000..0c3d27c0
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Metro/Rendering/MetroKeyTipsPainter.cs	
@@ -0,0 +1,40 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Metro.Rendering
+{
+    internal class MetroKeyTipsPainter : Office2007KeyTipsPainter
+    {
+        public override void PaintKeyTips(KeyTipsRendererEventArgs e)
+        {
+            Rectangle r = e.Bounds;
+            r.Inflate(1, 1);
+
+            Color textColor = ColorTable.KeyTips.KeyTipText;
+            Color backColor = ColorTable.KeyTips.KeyTipBackground;
+
+            if (e.ReferenceObject is BaseItem && !((BaseItem)e.ReferenceObject).Enabled)
+            {
+                int alpha = 128;
+                backColor = Color.FromArgb(alpha, backColor);
+                textColor = Color.FromArgb(alpha, textColor);
+            }
+
+            Graphics g = e.Graphics;
+            string keyTip = e.KeyTip;
+            Font font = e.Font;
+
+            using (SolidBrush brush = new SolidBrush(backColor))
+                DisplayHelp.FillRoundedRectangle(g, brush, r, 1);
+            using (Pen pen = new Pen(textColor, 1))
+                DisplayHelp.DrawRoundedRectangle(g, pen, r, 1);
+
+            //DisplayHelp.FillRectangle(g, r, backColor);
+            //using (Pen pen = new Pen(textColor, 1))
+            //    DisplayHelp.DrawRoundedRectangle(g, pen, r, 2);
+            TextDrawing.DrawString(g, keyTip, font, textColor, r, eTextFormat.HorizontalCenter | eTextFormat.VerticalCenter);
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Metro/Rendering/MetroRender.cs b/PROMS/DotNetBar Source Code/Metro/Rendering/MetroRender.cs
new file mode 100644
index 00000000..e4762bbb
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Metro/Rendering/MetroRender.cs	
@@ -0,0 +1,229 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.Metro.ColorTables;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Metro.Rendering
+{
+    public static class MetroRender
+    {
+        private static MetroRenderer[] _Renderers;
+        static MetroRender()
+        {
+            _Renderers = new MetroRenderer[Enum.GetNames(typeof(Renderers)).Length];
+            _Renderers[(int)Renderers.MetroForm] = new MetroFormRenderer();
+            _Renderers[(int)Renderers.MetroTabItem] = new MetroTabItemPainter();
+            _Renderers[(int)Renderers.MetroTabStrip] = new MetroTabStripPainter();
+            _Renderers[(int)Renderers.MetroStatusBar] = new MetroStatusBarPainter();
+            _Renderers[(int)Renderers.MetroToolbar] = new MetroToolbarPainter();
+            _Renderers[(int)Renderers.MetroTileItem] = new MetroTileItemPainter();
+        }
+
+        /// <summary>
+        /// Renders the MetroTileItem.
+        /// </summary>
+        /// <param name="item">MetroTileItem to render.</param>
+        /// <param name="e">Rendering event arguments.</param>
+        public static void Paint(MetroTileItem item, ItemPaintArgs pa)
+        {
+            MetroRenderer renderer = GetRenderer(Renderers.MetroTileItem);
+            renderer.Render(GetRenderingInfo(item, pa, GetColorTable()));
+        }
+
+        /// <summary>
+        /// Renders the MetroForm.
+        /// </summary>
+        /// <param name="form">Form to render.</param>
+        /// <param name="e">Rendering event arguments.</param>
+        public static void Paint(MetroAppForm form, PaintEventArgs e)
+        {
+            MetroRenderer renderer = GetRenderer(Renderers.MetroForm);
+            renderer.Render(GetRenderingInfo(form, e, GetColorTable()));
+        }
+
+        /// <summary>
+        /// Renders the MetroForm.
+        /// </summary>
+        /// <param name="formOverlay">Form to render.</param>
+        /// <param name="e">Rendering event arguments.</param>
+        internal static void Paint(BorderOverlay formOverlay, PaintEventArgs e)
+        {
+            MetroRenderer renderer = GetRenderer(Renderers.MetroForm);
+            renderer.Render(GetRenderingInfo(formOverlay, e, GetColorTable()));
+        }
+
+        /// <summary>
+        /// Renders the MetroTabItem.
+        /// </summary>
+        /// <param name="tab">Form to render.</param>
+        /// <param name="e">Rendering event arguments.</param>
+        public static void Paint(MetroTabItem tab, ItemPaintArgs pa)
+        {
+            MetroRenderer renderer = GetRenderer(Renderers.MetroTabItem);
+            renderer.Render(GetRenderingInfo(tab, pa, GetColorTable()));
+        }
+
+        /// <summary>
+        /// Renders the MetroTabStrip
+        /// </summary>
+        /// <param name="tabStrip">TabStrip to render.</param>
+        /// <param name="pa">Paint args</param>
+        public static void Paint(MetroTabStrip tabStrip, ItemPaintArgs pa)
+        {
+            MetroRenderer renderer = GetRenderer(Renderers.MetroTabStrip);
+            MetroRendererInfo info = GetRenderingInfo(tabStrip, pa, GetColorTable());
+            renderer.Render(info);
+        }
+        /// <summary>
+        /// Renders the MetroStatusBar.
+        /// </summary>
+        /// <param name="bar">Status bar to render</param>
+        /// <param name="pa">Paint args</param>
+        public static void Paint(MetroStatusBar bar, ItemPaintArgs pa)
+        {
+            MetroRenderer renderer = GetRenderer(Renderers.MetroStatusBar);
+            renderer.Render(GetRenderingInfo(bar, pa, GetColorTable()));
+        }
+
+        /// <summary>
+        /// Renders the MetroStatusBar.
+        /// </summary>
+        /// <param name="bar">Status bar to render</param>
+        /// <param name="pa">Paint args</param>
+        public static void Paint(MetroToolbar bar, ItemPaintArgs pa)
+        {
+            MetroRenderer renderer = GetRenderer(Renderers.MetroToolbar);
+            renderer.Render(GetRenderingInfo(bar, pa, GetColorTable()));
+        }
+
+        private static MetroRenderer GetRenderer(Renderers renderer)
+        {
+            return _Renderers[(int)renderer];
+        }
+
+        private static MetroRendererInfo _RenderingInfo = new MetroRendererInfo();
+        private static MetroRendererInfo GetRenderingInfo(Control control, PaintEventArgs e, MetroColorTable colorTable)
+        {
+            _RenderingInfo.Control = control;
+            _RenderingInfo.PaintEventArgs = e;
+            _RenderingInfo.ColorTable = colorTable;
+            _RenderingInfo.DefaultFont = control.Font;
+            _RenderingInfo.RightToLeft = (control.RightToLeft == RightToLeft.Yes);
+            return _RenderingInfo;
+        }
+        private static MetroRendererInfo GetRenderingInfo(Control control, ItemPaintArgs e, MetroColorTable colorTable)
+        {
+            _RenderingInfo.Control = control;
+            _RenderingInfo.PaintEventArgs = e.PaintEventArgs;
+            _RenderingInfo.DefaultFont = e.Font;
+            _RenderingInfo.ColorTable = colorTable;
+            _RenderingInfo.RightToLeft = e.RightToLeft;
+            _RenderingInfo.ItemPaintArgs = e;
+            return _RenderingInfo;
+        }
+        private static MetroRendererInfo GetRenderingInfo(MetroTabStrip control, ItemPaintArgs e, MetroColorTable colorTable)
+        {
+            _RenderingInfo.Control = control;
+            _RenderingInfo.PaintEventArgs = e.PaintEventArgs;
+            _RenderingInfo.DefaultFont = e.Font;
+            if (e.Font.Bold)
+                _RenderingInfo.DefaultPlainFont = new Font(e.Font, FontStyle.Regular);
+            _RenderingInfo.ColorTable = colorTable;
+            _RenderingInfo.RightToLeft = e.RightToLeft;
+            _RenderingInfo.ItemPaintArgs = e;
+            return _RenderingInfo;
+        }
+        private static MetroRendererInfo GetRenderingInfo(object control, ItemPaintArgs e, MetroColorTable colorTable)
+        {
+            _RenderingInfo.Control = control;
+            _RenderingInfo.PaintEventArgs = e.PaintEventArgs;
+            _RenderingInfo.DefaultFont = e.Font;
+            _RenderingInfo.ColorTable = colorTable;
+            _RenderingInfo.RightToLeft = e.RightToLeft;
+            _RenderingInfo.ItemPaintArgs = e;
+            return _RenderingInfo;
+        }
+
+        private static MetroColorTable _ColorTable = null;
+        public static MetroColorTable GetColorTable()
+        {
+            if (_ColorTable == null)
+            {
+                UpdateColorTable(MetroColorGeneratorParameters.Default);
+            }
+            return _ColorTable;
+        }
+
+        internal static void UpdateColorTable(MetroColorGeneratorParameters colorParams)
+        {
+            if (StyleManager.IsVisualStudio2012(StyleManager.Style))
+                _ColorTable = VisualStudio2012ColorTableInitializer.CreateColorTable(colorParams);
+            else if (StyleManager.Style == eStyle.OfficeMobile2014)
+                _ColorTable = OfficeMobile2014MetroInitializer.CreateColorTable(colorParams);
+            else if (StyleManager.Style == eStyle.Office2016)
+                _ColorTable = Office2016MetroInitializer.CreateColorTable(colorParams);
+            else
+                _ColorTable = MetroColorTableInitializer.CreateColorTable(colorParams);
+        }
+        
+    }
+
+    /// <summary>
+    /// Defines class for passing rendering information to renderer.
+    /// </summary>
+    public class MetroRendererInfo
+    {
+        /// <summary>
+        /// Gets or sets the control to render.
+        /// </summary>
+        public object Control = null;
+        /// <summary>
+        /// Gets or sets the paint event arguments to use to render out control.
+        /// </summary>
+        public PaintEventArgs PaintEventArgs = null;
+        /// <summary>
+        /// Gets or sets the current color table.
+        /// </summary>
+        public MetroColorTable ColorTable;
+        /// <summary>
+        /// Gets or sets default font.
+        /// </summary>
+        public Font DefaultFont = SystemFonts.DefaultFont;
+        /// <summary>
+        /// Gets or sets default plain font.
+        /// </summary>
+        public Font DefaultPlainFont = null;
+        /// <summary>
+        /// Gets or sets right-to-left setting.
+        /// </summary>
+        public bool RightToLeft = false;
+        /// <summary>
+        /// Gets or sets the paint information for items.
+        /// </summary>
+        public ItemPaintArgs ItemPaintArgs = null;
+    }
+    /// <summary>
+    /// Abstract renderer for rendering Metro-UI controls.
+    /// </summary>
+    public abstract class MetroRenderer
+    {
+        
+        /// <summary>
+        /// Renders the 
+        /// </summary>
+        /// <param name="renderingInfo"></param>
+        public abstract void Render(MetroRendererInfo renderingInfo);
+    }
+
+    public enum Renderers : int
+    {
+        MetroForm,
+        MetroTabItem,
+        MetroTabStrip,
+        MetroStatusBar,
+        MetroToolbar,
+        MetroTileItem
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Metro/Rendering/MetroRibbonTabGroupPainter.cs b/PROMS/DotNetBar Source Code/Metro/Rendering/MetroRibbonTabGroupPainter.cs
new file mode 100644
index 00000000..4f0764b8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Metro/Rendering/MetroRibbonTabGroupPainter.cs	
@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+using System.Text.RegularExpressions;
+
+namespace DevComponents.DotNetBar.Metro.Rendering
+{
+    internal class MetroRibbonTabGroupPainter : Office2007RibbonTabGroupPainter
+    {
+        protected override void PaintTabGroupBackground(System.Drawing.Graphics g, DevComponents.DotNetBar.Rendering.Office2007RibbonTabGroupColorTable colorTable, System.Drawing.Rectangle bounds, System.Drawing.Rectangle groupBounds, bool glassEnabled)
+        {
+            DisplayHelp.FillRectangle(g, groupBounds, colorTable.Background);
+
+            if (StyleManager.Style != eStyle.Office2016)
+            {
+                Rectangle top = new Rectangle(groupBounds.X, groupBounds.Y, groupBounds.Width, 3);
+                DisplayHelp.FillRectangle(g, top, colorTable.Border);
+                if (StyleManager.Style == eStyle.OfficeMobile2014)
+                {
+                    DisplayHelp.DrawGradientLine(g, groupBounds.X, groupBounds.Y, groupBounds.X, 24, colorTable.Border, 1);
+                    DisplayHelp.DrawGradientLine(g, groupBounds.Right - 1, groupBounds.Y, groupBounds.Right - 1, 24, colorTable.Border, 1);
+                }
+            }
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Metro/Rendering/MetroScrollBarPainter.cs b/PROMS/DotNetBar Source Code/Metro/Rendering/MetroScrollBarPainter.cs
new file mode 100644
index 00000000..c6eba9b3
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Metro/Rendering/MetroScrollBarPainter.cs	
@@ -0,0 +1,234 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using DevComponents.DotNetBar.ScrollBar;
+using DevComponents.DotNetBar.Rendering;
+using System.Drawing.Drawing2D;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Metro.Rendering
+{
+    internal class MetroScrollBarPainter : ScrollBarPainter, IOffice2007Painter
+    {
+        #region Private Variables
+        private Office2007ColorTable m_ColorTable = null;
+        private bool m_AppStyleScrollBar = false;
+        private Presentation.ShapeBorder m_ThumbOuterBorder = new Presentation.ShapeBorder(1);
+        private Presentation.ShapeBorder m_ThumbInnerBorder = new Presentation.ShapeBorder(1);
+        private Presentation.ShapeFill m_ThumbInnerFill = new Presentation.ShapeFill();
+        private Presentation.ShapeFill m_ThumbSignFill = new Presentation.ShapeFill();
+        private Presentation.Shape m_ThumbShape = null;
+        private Presentation.ShapePath m_ThumbSignShape = null;
+        private Size m_ThumbSignSize = new Size(9, 5);
+
+        private Presentation.Shape m_TrackShape = null;
+        private Presentation.ShapeBorder m_TrackOuterBorder = new Presentation.ShapeBorder(1);
+        private Presentation.ShapeBorder m_TrackInnerBorder = new Presentation.ShapeBorder(1);
+        private Presentation.ShapeFill m_TrackInnerFill = new Presentation.ShapeFill();
+
+        private Presentation.Shape m_BackgroundShape = null;
+        private Presentation.ShapeBorder m_BackgroundBorder = new Presentation.ShapeBorder(1);
+        private Presentation.ShapeFill m_BackgroundFill = new Presentation.ShapeFill();
+        #endregion
+
+        #region IOffice2007Painter Members
+
+        public DevComponents.DotNetBar.Rendering.Office2007ColorTable ColorTable
+        {
+            get
+            {
+                return m_ColorTable;
+            }
+            set
+            {
+                m_ColorTable = value;
+            }
+        }
+
+        #endregion
+        
+        #region Internal Implemementation
+        public MetroScrollBarPainter()
+        {
+            m_ThumbShape = GetThumbShape();
+            m_TrackShape = GetTrackShape();
+            m_BackgroundShape = GetBackgroundShape();
+        }
+
+        public override void PaintThumb(System.Drawing.Graphics g, System.Drawing.Rectangle bounds, eScrollThumbPosition position, eScrollBarState state)
+        {
+            Office2007ScrollBarStateColorTable ct = GetColorTable(state);
+            if (ct == null) return;
+
+            // Initialize Colors
+            m_ThumbOuterBorder.Width = Dpi.Width1;
+            m_ThumbOuterBorder.Apply(ct.ThumbOuterBorder);
+            m_ThumbSignFill.Apply(ct.ThumbSignBackground);
+
+            m_ThumbSignShape.Path = GetThumbSignPath(position);
+            m_ThumbShape.Paint(new Presentation.ShapePaintInfo(g, bounds));
+            m_ThumbSignShape.Path.Dispose();
+            m_ThumbSignShape.Path = null;
+        }
+
+        private Office2007ScrollBarStateColorTable GetColorTable(eScrollBarState state)
+        {
+            Office2007ScrollBarColorTable csb = m_AppStyleScrollBar ? m_ColorTable.AppScrollBar : m_ColorTable.ScrollBar;
+            if (state == eScrollBarState.Normal)
+                return csb.Default;
+            else if (state == eScrollBarState.Disabled)
+                return csb.Disabled;
+            else if (state == eScrollBarState.ControlMouseOver)
+                return csb.MouseOverControl;
+            else if (state == eScrollBarState.PartMouseOver)
+                return csb.MouseOver;
+            else if (state == eScrollBarState.Pressed)
+                return csb.Pressed;
+
+            return null;
+        }
+
+        public override void PaintTrackHorizontal(System.Drawing.Graphics g, System.Drawing.Rectangle bounds, eScrollBarState state)
+        {
+            Office2007ScrollBarStateColorTable ct = GetColorTable(state);
+            if (ct == null) return;
+
+            // Apply Colors...
+            // Apply Colors...
+            m_TrackInnerFill.Apply(ct.TrackSignBackground);
+            m_TrackOuterBorder.Width = Dpi.Width1;
+            m_TrackOuterBorder.Apply(ct.TrackOuterBorder);
+            m_TrackShape.Paint(new Presentation.ShapePaintInfo(g, bounds));
+        }
+
+        public override void PaintTrackVertical(System.Drawing.Graphics g, System.Drawing.Rectangle bounds, eScrollBarState state)
+        {
+            Office2007ScrollBarStateColorTable ct = GetColorTable(state);
+            if (ct == null) return;
+
+            // Apply Colors...
+            m_TrackInnerFill.Apply(ct.TrackSignBackground);
+            m_TrackOuterBorder.Apply(ct.TrackOuterBorder);
+            m_TrackShape.Paint(new Presentation.ShapePaintInfo(g, bounds));
+        }
+
+        public override void PaintBackground(Graphics g, Rectangle bounds, eScrollBarState state, bool horizontal, bool sideBorderOnly, bool rtl)
+        {
+            Office2007ScrollBarStateColorTable ct = GetColorTable(state);
+            if (ct == null) return;
+
+            // Apply Colors...
+            m_BackgroundBorder.Width = Dpi.Width1;
+            if (sideBorderOnly)
+                m_BackgroundBorder.Apply(null);
+            else
+                m_BackgroundBorder.Apply(ct.Border);
+
+            m_BackgroundFill.Apply(ct.Background);
+            m_BackgroundFill.GradientAngle = horizontal ? 90 : 0;
+
+            m_BackgroundShape.Paint(new Presentation.ShapePaintInfo(g, bounds));
+            if (sideBorderOnly && !ct.Border.Start.IsEmpty)
+            {
+                if (horizontal)
+                    DisplayHelp.DrawLine(g, bounds.X, bounds.Y, bounds.Right, bounds.Y, ct.Border.Start, Dpi.Width1);
+                else
+                {
+                    if (rtl)
+                        DisplayHelp.DrawLine(g, bounds.Right - 1, bounds.Y, bounds.Right - 1, bounds.Bottom, ct.Border.Start, Dpi.Width1);
+                    else
+                        DisplayHelp.DrawLine(g, 0, bounds.Y, 0, bounds.Bottom, ct.Border.Start, Dpi.Width1);
+                }
+            }
+        }
+
+        private Presentation.Shape GetBackgroundShape()
+        {
+            Presentation.Rectangle b = new Presentation.Rectangle();
+            b.Border = m_BackgroundBorder;
+            b.Fill = m_BackgroundFill;
+            return b;
+        }
+
+        private Presentation.Shape GetThumbShape()
+        {
+            Presentation.Rectangle thumb = new Presentation.Rectangle();
+            thumb.Border = m_ThumbOuterBorder;
+            thumb.Padding = new Presentation.PaddingInfo(1,1,1,1);
+            m_ThumbSignShape = new Presentation.ShapePath();
+            m_ThumbSignShape.Fill = m_ThumbSignFill;
+            thumb.Children.Add(m_ThumbSignShape);
+
+            return thumb;
+        }
+
+        private Presentation.Shape GetTrackShape()
+        {
+            Presentation.Rectangle thumb = new Presentation.Rectangle();
+            thumb.Padding = new DevComponents.DotNetBar.Presentation.PaddingInfo(1, 1, 1, 1);
+            thumb.Border = m_TrackOuterBorder;
+            Presentation.Rectangle innerRect = new Presentation.Rectangle();
+            innerRect.Padding = new Presentation.PaddingInfo(2, 2, 2, 2);
+            innerRect.Fill = m_TrackInnerFill;
+            thumb.Children.Add(innerRect);
+
+            return thumb;
+        }
+
+        private GraphicsPath GetThumbSignPath(eScrollThumbPosition pos)
+        {
+            GraphicsPath path = new GraphicsPath();
+            Size signSize = Dpi.Size(m_ThumbSignSize);
+
+            if (pos == eScrollThumbPosition.Left || pos == eScrollThumbPosition.Right)
+            {
+                int w = signSize.Width;
+                signSize.Width = signSize.Height;
+                signSize.Height = w;
+            }
+
+            if (pos == eScrollThumbPosition.Top)
+            {
+                path.AddPolygon(new PointF[] {new PointF(-Dpi.Width1, signSize.Height), 
+                    new PointF(signSize.Width / 2 , -Dpi.Width1), 
+                    new PointF(signSize.Width / 2, -Dpi.Width1), new PointF(signSize.Width, signSize.Height), 
+                    new PointF(signSize.Width, signSize.Height), new PointF(-1, signSize.Height)});
+                path.CloseAllFigures();
+            }
+            else if (pos == eScrollThumbPosition.Bottom)
+            {
+                path.AddLine(signSize.Width / 2, signSize.Height + Dpi.Width1, signSize.Width, Dpi.Width1);
+                path.AddLine(signSize.Width, Dpi.Width1, 0, Dpi.Width1);
+                path.AddLine(0, 1, signSize.Width / 2, signSize.Height + Dpi.Width1);
+                path.CloseAllFigures();
+            }
+            else if (pos == eScrollThumbPosition.Left)
+            {
+                //signSize.Width++;
+                signSize.Height += Dpi.Height1;
+                int h2 = (int)(signSize.Height / 2);
+                path.AddLine(0, h2, signSize.Width, 0);
+                path.AddLine(signSize.Width, 0, signSize.Width, signSize.Height);
+                path.AddLine(signSize.Width, signSize.Height, 0, h2);
+                path.CloseAllFigures();
+            }
+            else if (pos == eScrollThumbPosition.Right)
+            {
+                signSize.Height += Dpi.Height1;
+                path.AddLine(signSize.Width, signSize.Height / 2, 0, 0);
+                path.AddLine(0, 0, 0, signSize.Height);
+                path.AddLine(0, signSize.Height, signSize.Width, signSize.Height / 2);
+                path.CloseAllFigures();
+            }
+
+            return path;
+        }
+
+        public bool AppStyleScrollBar
+        {
+            get { return m_AppStyleScrollBar; }
+            set { m_AppStyleScrollBar = value; }
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Metro/Rendering/MetroStatusBarPainter.cs b/PROMS/DotNetBar Source Code/Metro/Rendering/MetroStatusBarPainter.cs
new file mode 100644
index 00000000..bda13118
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Metro/Rendering/MetroStatusBarPainter.cs	
@@ -0,0 +1,59 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+using DevComponents.DotNetBar.Metro.ColorTables;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Metro.Rendering
+{
+    internal class MetroStatusBarPainter : MetroRenderer
+    {
+        public override void Render(MetroRendererInfo renderingInfo)
+        {
+            MetroStatusBar bar = (MetroStatusBar)renderingInfo.Control;
+            Graphics g = renderingInfo.PaintEventArgs.Graphics;
+            MetroStatusBarColorTable ct = renderingInfo.ColorTable.MetroStatusBar;
+            Rectangle bounds = bar.ClientRectangle;
+
+            if (ct.BackgroundStyle != null)
+            {
+                ElementStyleDisplayInfo di = new ElementStyleDisplayInfo(ct.BackgroundStyle, g, bounds);
+                ElementStyleDisplay.PaintBackground(di);
+            }
+
+            if (ct.TopBorders != null && ct.TopBorders.Length > 0)
+            {
+                for (int i = 0; i < ct.TopBorders.Length; i++)
+                {
+                    using (Pen pen = new Pen(ct.TopBorders[i]))
+                        g.DrawLine(pen, bounds.X, bounds.Y + i, bounds.Right, bounds.Y + i);
+                }
+            }
+
+            if (ct.BottomBorders != null && ct.BottomBorders.Length > 0)
+            {
+                for (int i = 0; i < ct.BottomBorders.Length; i++)
+                {
+                    using (Pen pen = new Pen(ct.BottomBorders[i]))
+                        g.DrawLine(pen, bounds.X, bounds.Bottom - i - 1, bounds.Right, bounds.Bottom - i - 1);
+                }
+            }
+
+            if (bar.ResizeHandleVisible)
+            {
+                Form form = bar.FindForm();
+                if (form != null && form.WindowState == FormWindowState.Normal)
+                    DevComponents.DotNetBar.Rendering.ResizeHandlePainter.DrawResizeHandle(
+                        g, bounds, ct.ResizeMarkerLightColor, ct.ResizeMarkerColor, (bar.RightToLeft == RightToLeft.Yes));
+            }
+
+#if TRIAL
+            Rectangle tr = bounds;
+            tr.Inflate(-2, -2);
+            using(Font font=new Font(bar.Font.FontFamily, 8f, FontStyle.Regular))
+                TextDrawing.DrawString(g, "DotNetBar Trial", font, Color.FromArgb(80, Color.Black), tr, eTextFormat.Bottom | eTextFormat.HorizontalCenter);
+#endif
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Metro/Rendering/MetroSwitchButtonPainter.cs b/PROMS/DotNetBar Source Code/Metro/Rendering/MetroSwitchButtonPainter.cs
new file mode 100644
index 00000000..7f2c03f0
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Metro/Rendering/MetroSwitchButtonPainter.cs	
@@ -0,0 +1,177 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using DevComponents.DotNetBar.Rendering;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using DevComponents.DotNetBar.Ribbon;
+
+namespace DevComponents.DotNetBar.Metro.Rendering
+{
+    class MetroSwitchButtonPainter : Office2010SwitchButtonPainter
+    {
+        public override void Paint(SwitchButtonRenderEventArgs e)
+        {
+            SwitchButtonItem switchButton = e.SwitchButtonItem;
+            bool enabled = switchButton.Enabled;
+            SwitchButtonColorTable colorTable = enabled ? this.ColorTable.SwitchButton.Default : this.ColorTable.SwitchButton.Disabled;
+            if (colorTable == null) colorTable = new SwitchButtonColorTable();
+
+            Rectangle bounds = switchButton.Bounds;
+            Graphics g = e.Graphics;
+
+            int buttonWidth = Dpi.Width(switchButton.ButtonWidth);
+            Padding margin = Dpi.Size(switchButton.Margin);
+            if (e.ItemPaintArgs != null && e.ItemPaintArgs.ContainerControl is AdvTree.AdvTree)
+            {
+                if (switchButton.ItemAlignment == eItemAlignment.Far)
+                    bounds.X = bounds.Right - margin.Right - buttonWidth;
+                else if (switchButton.ItemAlignment == eItemAlignment.Center)
+                    bounds.X += (bounds.Width - buttonWidth) / 2;
+            }
+            else
+                bounds.X = bounds.Right - margin.Right - buttonWidth;
+            bounds.Width = buttonWidth;
+            int buttonHeight = Dpi.Height(switchButton.ButtonHeight);
+            bounds.Y += margin.Top + (bounds.Height - margin.Vertical - buttonHeight) / 2;
+            bounds.Height = buttonHeight;
+            switchButton.ButtonBounds = bounds;
+            bool rendersOnGlass = (e.ItemPaintArgs != null && e.ItemPaintArgs.GlassEnabled && (switchButton.Parent is CaptionItemContainer && !(e.ItemPaintArgs.ContainerControl is QatToolbar) || (switchButton.Parent is RibbonTabItemContainer && switchButton.EffectiveStyle == eDotNetBarStyle.Office2010)));
+            
+            if (switchButton.TextVisible && !string.IsNullOrEmpty(switchButton.Text))
+            {
+                Rectangle textRect = switchButton.Bounds;
+                Padding textPadding = Dpi.Size(switchButton.TextPadding);
+                textRect.Width -= buttonWidth + margin.Right + textPadding.Horizontal;
+                textRect.Y += textPadding.Top;
+                textRect.X += textPadding.Left;
+                textRect.Height -= textPadding.Vertical;
+                bool rtl = e.RightToLeft;
+                Color textColor = (switchButton.TextColor.IsEmpty || !enabled) ? colorTable.TextColor : switchButton.TextColor;
+                Font textFont = e.Font;
+                eTextFormat tf = eTextFormat.Left | eTextFormat.VerticalCenter;
+                if (switchButton.TextMarkupBody != null)
+                {
+                    TextMarkup.MarkupDrawContext d = new TextMarkup.MarkupDrawContext(g, textFont, textColor, rtl);
+                    d.HotKeyPrefixVisible = !((tf & eTextFormat.HidePrefix) == eTextFormat.HidePrefix);
+                    if ((tf & eTextFormat.VerticalCenter) == eTextFormat.VerticalCenter)
+                        textRect.Y = switchButton.TopInternal + (switchButton.Bounds.Height - switchButton.TextMarkupBody.Bounds.Height) / 2;
+                    else if ((tf & eTextFormat.Bottom) == eTextFormat.Bottom)
+                        textRect.Y += (switchButton.TextMarkupBody.Bounds.Height - textRect.Height) + 1;
+                    textRect.Height = switchButton.TextMarkupBody.Bounds.Height;
+                    switchButton.TextMarkupBody.Bounds = textRect;
+                    switchButton.TextMarkupBody.Render(d);
+                }
+                else
+                {
+#if FRAMEWORK20
+                    if (rendersOnGlass)
+                    {
+                        if (!e.ItemPaintArgs.CachedPaint)
+                            Office2007RibbonControlPainter.PaintTextOnGlass(g, switchButton.Text, textFont, textRect, TextDrawing.GetTextFormat(tf));
+                    }
+                    else
+#endif
+                        TextDrawing.DrawString(g, switchButton.Text, textFont, textColor, textRect, tf);
+                }
+            }
+
+
+            bool switchState = switchButton.Value;
+            string offText = switchButton.OffText;
+            string onText = switchButton.OnText;
+            Font font = (switchButton.SwitchFont == null) ? new Font(e.Font, FontStyle.Bold) : switchButton.SwitchFont;
+            Color textOffColor = (switchButton.OffTextColor.IsEmpty || !enabled) ? colorTable.OffTextColor : switchButton.OffTextColor;
+            Color textOnColor = (switchButton.OnTextColor.IsEmpty || !enabled) ? colorTable.OnTextColor : switchButton.OnTextColor;
+
+            int switchWidth = Dpi.Width(switchButton.SwitchWidth);
+            int switchX = Math.Min(bounds.X + switchButton.SwitchOffset, bounds.Right);
+            if (switchState)
+            {
+                switchX = Math.Max(bounds.Right - switchWidth - switchButton.SwitchOffset, bounds.X);
+            }
+
+            Color borderColor = (switchButton.BorderColor.IsEmpty || !enabled) ? colorTable.BorderColor : switchButton.BorderColor;
+            Color offBackgroundColor = (switchButton.OffBackColor.IsEmpty || !enabled) ? colorTable.OffBackColor : switchButton.OffBackColor;
+            Color onBackgroundColor = (switchButton.OnBackColor.IsEmpty || !enabled) ? colorTable.OnBackColor : switchButton.OnBackColor;
+
+            // Main control border
+            DisplayHelp.DrawRectangle(g, borderColor, bounds);
+
+            // Set clip
+            Rectangle innerBoundsClip = bounds;
+            innerBoundsClip.Inflate(-2, -2);
+            GraphicsPath innerClipPath = new GraphicsPath();
+            innerClipPath.AddRectangle(innerBoundsClip);
+            Region oldClip = g.Clip;
+            g.SetClip(innerClipPath, System.Drawing.Drawing2D.CombineMode.Intersect);
+            innerClipPath.Dispose();
+
+
+            // Draw On Background, it is to the left of the switch
+            Rectangle onBounds = new Rectangle(switchX - (bounds.Width - switchWidth), bounds.Y, bounds.Width - switchWidth + 2, bounds.Height);
+            switchButton.OnPartBounds = onBounds;
+            onBounds.Inflate(-2, -2);
+            DisplayHelp.FillRectangle(g, onBounds, onBackgroundColor);
+            if (!string.IsNullOrEmpty(onText))
+            {
+                // Draw On Text
+                if (rendersOnGlass && BarUtilities.UseTextRenderer)
+                    TextDrawing.DrawStringLegacy(g, onText, font, textOnColor, onBounds, eTextFormat.HorizontalCenter | eTextFormat.VerticalCenter);
+                else
+                    TextDrawing.DrawString(g, onText, font, textOnColor, onBounds, eTextFormat.HorizontalCenter | eTextFormat.VerticalCenter | eTextFormat.NoClipping);
+            }
+           
+            // Draw Off Background, it is on the right of the switch 
+            Rectangle offBounds = new Rectangle(switchX + switchWidth - 2, bounds.Y, bounds.Width - switchWidth + 2, bounds.Height);
+            switchButton.OffPartBounds = offBounds;
+            offBounds.Inflate(-2, -2);
+            DisplayHelp.FillRectangle(g, offBounds, offBackgroundColor);
+
+            if (!string.IsNullOrEmpty(offText))
+            {
+                // Draw Off Text
+                if (rendersOnGlass && BarUtilities.UseTextRenderer)
+                    TextDrawing.DrawStringLegacy(g, offText, font, textOffColor, offBounds, eTextFormat.HorizontalCenter | eTextFormat.VerticalCenter);
+                else
+                    TextDrawing.DrawString(g, offText, font, textOffColor, offBounds, eTextFormat.HorizontalCenter | eTextFormat.VerticalCenter | eTextFormat.NoClipping);
+            }
+            
+            // Restore old clip
+            g.Clip = oldClip;
+            oldClip.Dispose();
+
+            // Draw Switch on top
+            Rectangle switchBounds = new Rectangle(switchX, bounds.Y, switchWidth, bounds.Height);
+            switchButton.SwitchBounds = switchBounds;
+            Color switchBorderColor = (switchButton.SwitchBorderColor.IsEmpty || !enabled) ? colorTable.SwitchBorderColor : switchButton.SwitchBorderColor;
+            Color switchFillColor = (switchButton.SwitchBackColor.IsEmpty || !enabled) ? colorTable.SwitchBackColor : switchButton.SwitchBackColor;
+            if (!colorTable.SwitchOnBackColor.IsEmpty && switchButton.Value && switchButton.SwitchBackColor.IsEmpty)
+                switchFillColor = colorTable.SwitchOnBackColor;
+
+            DisplayHelp.FillRectangle(g, switchBounds, switchFillColor);
+            if(!switchBorderColor.IsEmpty)
+                DisplayHelp.DrawRectangle(g, switchBorderColor, switchBounds);
+            
+            if (switchButton.IsReadOnly && switchButton.ShowReadOnlyMarker)
+            {
+                Color markerColor = switchButton.ReadOnlyMarkerColor;
+                Rectangle marker = new Rectangle(switchBounds.X + (switchBounds.Width - 7) / 2, switchBounds.Y + (switchBounds.Height - 10) / 2, 7, 10);
+                SmoothingMode sm = g.SmoothingMode;
+                g.SmoothingMode = SmoothingMode.None;
+                using (SolidBrush brush = new SolidBrush(markerColor))
+                {
+                    g.FillRectangle(brush, new Rectangle(marker.X, marker.Y + 4, marker.Width, marker.Height - 4));
+                    g.FillRectangle(Brushes.White, new Rectangle(marker.X + 3, marker.Y + 5, 1, 2));
+                }
+                using (Pen pen = new Pen(markerColor, 1))
+                {
+                    g.DrawLine(pen, marker.X + 2, marker.Y + 0, marker.X + 4, marker.Y + 0);
+                    g.DrawLine(pen, marker.X + 1, marker.Y + 1, marker.X + 1, marker.Y + 3);
+                    g.DrawLine(pen, marker.X + 5, marker.Y + 1, marker.X + 5, marker.Y + 3);
+                }
+                g.SmoothingMode = sm;
+            }
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Metro/Rendering/MetroTabItemPainter.cs b/PROMS/DotNetBar Source Code/Metro/Rendering/MetroTabItemPainter.cs
new file mode 100644
index 00000000..580379e5
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Metro/Rendering/MetroTabItemPainter.cs	
@@ -0,0 +1,143 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using DevComponents.DotNetBar.Metro.ColorTables;
+using System.Drawing;
+using System.Drawing.Imaging;
+
+namespace DevComponents.DotNetBar.Metro.Rendering
+{
+    internal class MetroTabItemPainter : MetroRenderer
+    {
+        public override void Render(MetroRendererInfo renderingInfo)
+        {
+            MetroTabItem tab = (MetroTabItem)renderingInfo.Control;
+            Graphics g = renderingInfo.PaintEventArgs.Graphics;
+            MetroTabItemColorTable cti = renderingInfo.ColorTable.MetroTab.MetroTabItem;
+            MetroTabItemStateColorTable color = cti.Default;
+            if (!tab.Enabled)
+                color = cti.Disabled;
+            else if (tab.Checked)
+                color = cti.Selected;
+            else if (tab.IsMouseDown && cti.Pressed != null)
+                color = cti.Pressed;
+            else if (tab.IsMouseOver && cti.MouseOver != null)
+                color = cti.MouseOver;
+
+            Rectangle bounds = tab.Bounds;
+            Rectangle textBounds = tab.TextRenderBounds;
+            Rectangle imageBounds = tab.ImageRenderBounds;
+            CompositeImage image = tab.GetImage();
+
+            if (color.Background != null)
+            {
+                Font font = renderingInfo.DefaultFont;
+                if (!tab.Checked && font.Bold && renderingInfo.DefaultPlainFont != null)
+                    font = renderingInfo.DefaultPlainFont;
+                ElementStyleDisplayInfo di = new ElementStyleDisplayInfo(color.Background, g, bounds);
+                ElementStyleDisplay.Paint(di);
+
+                if (image != null && tab.ButtonStyle != eButtonStyle.TextOnlyAlways)
+                {
+                    if (imageBounds.IsEmpty)
+                        imageBounds = GetImageRectangle(tab, image);
+                    if (textBounds.IsEmpty)
+                        textBounds = GetTextRectangle(tab, image, imageBounds);
+
+                }
+                else if (textBounds.IsEmpty)
+                    textBounds = bounds;
+
+                if (tab.TextMarkupBody == null)
+                {
+                    di.Bounds = textBounds;
+                    
+                    ElementStyleDisplay.PaintText(di, tab.Text, font);
+                }
+                else
+                {
+                    eTextFormat stringFormat = eTextFormat.HorizontalCenter | eTextFormat.VerticalCenter;
+                    TextMarkup.MarkupDrawContext d = new TextMarkup.MarkupDrawContext(g, font, color.Background.TextColor, renderingInfo.RightToLeft);
+                    d.HotKeyPrefixVisible = !((stringFormat & eTextFormat.HidePrefix) == eTextFormat.HidePrefix);
+                    d.ContextObject = tab;
+                    Rectangle mr = new Rectangle(textBounds.X, textBounds.Y + (textBounds.Height - tab.TextMarkupBody.Bounds.Height) / 2 + 1, tab.TextMarkupBody.Bounds.Width, tab.TextMarkupBody.Bounds.Height);
+                    if ((stringFormat & eTextFormat.HorizontalCenter) != 0)
+                        mr.Offset((textBounds.Width - mr.Width) / 2, 0);
+                    if (tab._FixedSizeCenterText) mr.Y--;
+                    tab.TextMarkupBody.Bounds = mr;
+                    tab.TextMarkupBody.Render(d);
+                }
+                tab.TextRenderBounds = textBounds;
+                tab.ImageRenderBounds = imageBounds;
+            }
+
+            if (image != null)
+            {
+                if (!tab.IsMouseOver && tab.HotTrackingStyle == eHotTrackingStyle.Color)
+                {
+                    // Draw gray-scale image for this hover style...
+                    float[][] array = new float[5][];
+                    array[0] = new float[5] { 0.2125f, 0.2125f, 0.2125f, 0, 0 };
+                    array[1] = new float[5] { 0.5f, 0.5f, 0.5f, 0, 0 };
+                    array[2] = new float[5] { 0.0361f, 0.0361f, 0.0361f, 0, 0 };
+                    array[3] = new float[5] { 0, 0, 0, 1, 0 };
+                    array[4] = new float[5] { 0.2f, 0.2f, 0.2f, 0, 1 };
+                    ColorMatrix grayMatrix = new ColorMatrix(array);
+                    ImageAttributes att = new ImageAttributes();
+                    att.SetColorMatrix(grayMatrix);
+                    image.DrawImage(g, imageBounds, 0, 0, image.ActualWidth, image.ActualHeight, GraphicsUnit.Pixel, att);
+                }
+                else
+                {
+                    image.DrawImage(g, imageBounds);
+                }
+            }
+
+            //g.FillRectangle(Brushes.Red, bounds);
+        }
+
+        private Rectangle GetImageRectangle(MetroTabItem tab, CompositeImage image)
+        {
+            Rectangle imageRect = Rectangle.Empty;
+            // Calculate image position
+            if (image != null)
+            {
+                Size imageSize = tab.ImageSize;
+
+                if (tab.ImagePosition == eImagePosition.Top || tab.ImagePosition == eImagePosition.Bottom)
+                    imageRect = new Rectangle(tab.ImageDrawRect.X, tab.ImageDrawRect.Y, tab.DisplayRectangle.Width, tab.ImageDrawRect.Height);
+                else if(tab.ImagePosition == eImagePosition.Left)
+                    imageRect = new Rectangle(tab.ImageDrawRect.X+4, tab.ImageDrawRect.Y, tab.ImageDrawRect.Width, tab.ImageDrawRect.Height);
+                else if (tab.ImagePosition == eImagePosition.Right)
+                    imageRect = new Rectangle(tab.ImageDrawRect.X + tab.ImagePaddingHorizontal+4, tab.ImageDrawRect.Y, tab.ImageDrawRect.Width, tab.ImageDrawRect.Height);
+                imageRect.Offset(tab.DisplayRectangle.Left, tab.DisplayRectangle.Top);
+                imageRect.Offset((imageRect.Width - imageSize.Width) / 2, (imageRect.Height - imageSize.Height) / 2);
+
+                imageRect.Width = imageSize.Width;
+                imageRect.Height = imageSize.Height;
+            }
+
+            return imageRect;
+        }
+
+        private Rectangle GetTextRectangle(MetroTabItem tab, CompositeImage image, Rectangle imageBounds)
+        {
+            Rectangle itemRect = tab.DisplayRectangle;
+            Rectangle textRect = tab.TextDrawRect;
+
+            if (tab.ImagePosition == eImagePosition.Top || tab.ImagePosition == eImagePosition.Bottom)
+            {
+                textRect = new Rectangle(1, textRect.Y, itemRect.Width - 2, textRect.Height);
+            }
+            textRect.Offset(itemRect.Left, itemRect.Top);
+
+            if (tab.ImagePosition == eImagePosition.Left)
+                textRect.X = imageBounds.Right + tab.ImagePaddingHorizontal;
+
+            if (textRect.Right > itemRect.Right)
+                textRect.Width = itemRect.Right - textRect.Left;
+
+            return textRect;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Metro/Rendering/MetroTabStripPainter.cs b/PROMS/DotNetBar Source Code/Metro/Rendering/MetroTabStripPainter.cs
new file mode 100644
index 00000000..3259b91f
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Metro/Rendering/MetroTabStripPainter.cs	
@@ -0,0 +1,365 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using DevComponents.DotNetBar.Metro.ColorTables;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+
+namespace DevComponents.DotNetBar.Metro.Rendering
+{
+    internal class MetroTabStripPainter : MetroRenderer
+    {
+        public override void Render(MetroRendererInfo renderingInfo)
+        {
+            MetroTabStrip strip = (MetroTabStrip)renderingInfo.Control;
+            Graphics g = renderingInfo.PaintEventArgs.Graphics;
+            MetroTabStripColorTable ct = renderingInfo.ColorTable.MetroTab.TabStrip;
+            Rectangle bounds = strip.ClientRectangle;
+
+            if (ct.BackgroundStyle != null)
+            {
+                ElementStyleDisplayInfo di = new ElementStyleDisplayInfo(ct.BackgroundStyle, g, bounds);
+                ElementStyleDisplay.PaintBackground(di);
+            }
+
+            if (strip.CaptionVisible)
+            {
+                if (strip.CaptionBounds.IsEmpty || strip.SystemCaptionItemBounds.IsEmpty || strip.QuickToolbarBounds.IsEmpty)
+                    SetQatAndCaptionItemBounds(strip, renderingInfo);
+                Color captionTextColor = renderingInfo.ColorTable.MetroTab.ActiveCaptionText;
+                eTextFormat textFormat = renderingInfo.ColorTable.MetroTab.CaptionTextFormat;
+                System.Windows.Forms.Form form = strip.FindForm();
+                bool isFormActive = true;
+                if (form != null && (form != System.Windows.Forms.Form.ActiveForm && form.MdiParent == null ||
+                    form.MdiParent != null && form.MdiParent.ActiveMdiChild != form))
+                {
+                    captionTextColor = renderingInfo.ColorTable.MetroTab.InactiveCaptionText;
+                    isFormActive = false;
+                }
+
+                Font font = SystemFonts.DefaultFont; // System.Windows.Forms.SystemInformation.MenuFont;
+                bool disposeFont = true;
+                if (strip.CaptionFont != null)
+                {
+                    font.Dispose();
+                    font = strip.CaptionFont;
+                    disposeFont = false;
+                }
+                string text = strip.TitleText;
+                if (string.IsNullOrEmpty(text) && form != null) text = form.Text;
+                bool isTitleTextMarkup = strip.TitleTextMarkupBody != null;
+                Rectangle captionRect = strip.CaptionBounds;
+                const int CAPTION_TEXT_PADDING = 12;
+                captionRect.X += CAPTION_TEXT_PADDING;
+                captionRect.Width -= CAPTION_TEXT_PADDING;
+
+                if(StyleManager.Style == eStyle.OfficeMobile2014)
+                {
+                    captionRect.Y -= 2;
+                    captionRect.Height -= 2;
+                    // Center text in center of window instead of center of available space
+                    if (!strip.SystemCaptionItemBounds.IsEmpty && captionRect.Width > strip.SystemCaptionItemBounds.Width)
+                    {
+                        captionRect.X += strip.SystemCaptionItemBounds.Width / 2 + 18;
+                        captionRect.Width -= strip.SystemCaptionItemBounds.Width / 2 +18;
+                    }
+                    if (!strip.QuickToolbarBounds.IsEmpty && captionRect.Width > strip.QuickToolbarBounds.Width)
+                    {
+                        captionRect.X -= strip.QuickToolbarBounds.Width / 2;
+                        captionRect.Width += strip.QuickToolbarBounds.Width / 2;
+                    }
+                }
+
+                if (!isTitleTextMarkup)
+                    TextDrawing.DrawString(g, text, font, captionTextColor, captionRect, textFormat);
+                else
+                {
+                    TextMarkup.MarkupDrawContext d = new TextMarkup.MarkupDrawContext(g, font, captionTextColor, strip.RightToLeft == System.Windows.Forms.RightToLeft.Yes, captionRect, false);
+                    d.AllowMultiLine = false;
+                    d.IgnoreFormattingColors = !isFormActive;
+                    TextMarkup.BodyElement body = strip.TitleTextMarkupBody;
+                    if (strip.TitleTextMarkupLastArrangeBounds != captionRect)
+                    {
+                        body.Measure(captionRect.Size, d);
+                        body.Arrange(captionRect, d);
+                        strip.TitleTextMarkupLastArrangeBounds = captionRect;
+                        Rectangle mr = body.Bounds;
+                        if (mr.Width < captionRect.Width)
+                            mr.Offset((captionRect.Width - mr.Width) / 2, 0);
+                        if (mr.Height < captionRect.Height)
+                            mr.Offset(0, (captionRect.Height - mr.Height) / 2);
+                        body.Bounds = mr;
+                    }
+                    Region oldClip = g.Clip;
+                    g.SetClip(captionRect, CombineMode.Intersect);
+                    body.Render(d);
+                    g.Clip = oldClip;
+                    if (oldClip != null) oldClip.Dispose();
+                }
+
+                if (disposeFont) font.Dispose();
+            }
+
+            //g.FillRectangle(Brushes.Yellow, strip.QuickToolbarBounds);
+            //g.FillRectangle(Brushes.Green, strip.CaptionBounds);
+            //g.FillRectangle(Brushes.Indigo, strip.SystemCaptionItemBounds);
+            
+        }
+
+        private void SetQatAndCaptionItemBounds(MetroTabStrip strip,MetroRendererInfo renderingInfo)
+        {
+            if (!strip.CaptionVisible)
+                return;
+            bool rightToLeft = (strip.RightToLeft == System.Windows.Forms.RightToLeft.Yes);
+            
+            System.Windows.Forms.Form form = strip.FindForm();
+            bool isMaximized = false;
+            if (form != null) isMaximized = form.WindowState == System.Windows.Forms.FormWindowState.Maximized;
+
+            // Get right most X position of the Quick Access Toolbar
+            int right = 0, sysLeft = 0;
+            Size qatSize = Size.Empty;
+            for (int i = strip.QuickToolbarItems.Count - 1; i >= 0; i--)
+            {
+                BaseItem item = strip.QuickToolbarItems[i];
+                if (!item.Visible || !item.Displayed)
+                    continue;
+                if (item is QatCustomizeItem) qatSize = item.DisplayRectangle.Size;
+                if (item.ItemAlignment == eItemAlignment.Near && item.Visible && i > 0)
+                {
+                    if (rightToLeft)
+                        right = item.DisplayRectangle.X;
+                    else
+                        right = item.DisplayRectangle.Right;
+                    break;
+                }
+                else if (item.ItemAlignment == eItemAlignment.Far && item.Visible)
+                {
+                    if (rightToLeft)
+                        sysLeft = item.DisplayRectangle.Right;
+                    else
+                        sysLeft = item.DisplayRectangle.X;
+                }
+            }
+            
+            if (strip.CaptionContainerItem is CaptionItemContainer && ((CaptionItemContainer)strip.CaptionContainerItem).MoreItems != null)
+            {
+                if (rightToLeft)
+                    right = ((CaptionItemContainer)strip.CaptionContainerItem).MoreItems.DisplayRectangle.X;
+                else
+                    right = ((CaptionItemContainer)strip.CaptionContainerItem).MoreItems.DisplayRectangle.Right;
+                qatSize = ((CaptionItemContainer)strip.CaptionContainerItem).MoreItems.DisplayRectangle.Size;
+            }
+
+            Rectangle r = new Rectangle(right, 2, strip.CaptionContainerItem.WidthInternal - right - (strip.CaptionContainerItem.WidthInternal-sysLeft), strip.GetTotalCaptionHeight());
+            strip.CaptionBounds = r;
+
+            if (sysLeft > 0)
+            {
+                if (rightToLeft)
+                    strip.SystemCaptionItemBounds = new Rectangle(r.X, r.Y, sysLeft, r.Height);
+                else
+                    strip.SystemCaptionItemBounds = new Rectangle(sysLeft, r.Y, strip.CaptionContainerItem.WidthInternal - sysLeft, r.Height);
+            }
+
+            if (right == 0 || r.Height <= 0 || r.Width <= 0)
+                return;
+
+            BaseItem startButton = strip.GetApplicationButton();
+            if (startButton != null)
+            {
+                int startIndex = strip.QuickToolbarItems.IndexOf(startButton);
+                if (strip.QuickToolbarItems.Count - 1 > startIndex)
+                {
+                    BaseItem firstItem = strip.QuickToolbarItems[startIndex + 1];
+                    if (rightToLeft)
+                    {
+                        r.Width -= r.Right - firstItem.DisplayRectangle.Right;
+                    }
+                    else
+                    {
+                        r.Width -= firstItem.DisplayRectangle.X - r.X;
+                        r.X = firstItem.DisplayRectangle.X;
+                    }
+                }
+            }
+
+            r.Height = ((CaptionItemContainer)strip.CaptionContainerItem).MaxItemHeight + 6;
+            r.X = 0;
+            r.Width = right;
+            strip.QuickToolbarBounds = r;
+        }
+
+        //private void PaintCaptionText(MetroTabStrip rs)
+        //{
+        //    if (!rs.CaptionVisible || rs.CaptionBounds.IsEmpty)
+        //        return;
+
+        //    Graphics g = e.Graphics;
+        //    bool isMaximized = false;
+        //    bool isFormActive = true;
+        //    Rendering.Office2007FormStateColorTable formct = m_ColorTable.Form.Active;
+        //    System.Windows.Forms.Form form = rs.FindForm();
+        //    if (form != null && (form != System.Windows.Forms.Form.ActiveForm && form.MdiParent == null ||
+        //        form.MdiParent != null && form.MdiParent.ActiveMdiChild != form))
+        //    {
+        //        formct = m_ColorTable.Form.Inactive;
+        //        isFormActive = false;
+        //    }
+        //    string text = e.RibbonControl.TitleText;
+        //    string plainText = text;
+        //    bool isTitleTextMarkup = e.RibbonControl.RibbonStrip.TitleTextMarkupBody != null;
+        //    if (isTitleTextMarkup)
+        //        plainText = e.RibbonControl.RibbonStrip.TitleTextMarkupBody.PlainText;
+        //    if (form != null)
+        //    {
+        //        if (text == "")
+        //        {
+        //            text = form.Text;
+        //            plainText = text;
+        //        }
+        //        isMaximized = form.WindowState == System.Windows.Forms.FormWindowState.Maximized;
+        //    }
+
+        //    Rectangle captionRect = rs.CaptionBounds;
+
+        //    // Exclude quick access toolbar if any
+        //    if (!rs.QuickToolbarBounds.IsEmpty)
+        //        DisplayHelp.ExcludeEdgeRect(ref captionRect, rs.QuickToolbarBounds);
+        //    else
+        //    {
+        //        BaseItem sb = e.RibbonControl.GetApplicationButton();
+        //        if (sb != null && sb.Visible && sb.Displayed)
+        //            DisplayHelp.ExcludeEdgeRect(ref captionRect, sb.Bounds);
+        //        else
+        //            DisplayHelp.ExcludeEdgeRect(ref captionRect, new Rectangle(0, 0, 22, 22)); // The system button in top-left corner
+        //    }
+
+        //    if (!rs.SystemCaptionItemBounds.IsEmpty)
+        //        DisplayHelp.ExcludeEdgeRect(ref captionRect, rs.SystemCaptionItemBounds);
+
+
+        //    // Array of the rectangles after they are split
+        //    ArrayList rects = new ArrayList(5);
+        //    ArrayList tempRemoveList = new ArrayList(5);
+        //    // Exclude Context Tabs Captions if any
+        //    if (rs.TabGroupsVisible)
+        //    {
+        //        foreach (RibbonTabItemGroup group in rs.TabGroups)
+        //        {
+        //            foreach (Rectangle r in group.DisplayPositions)
+        //            {
+        //                if (rects.Count > 0)
+        //                {
+        //                    tempRemoveList.Clear();
+        //                    Rectangle[] arrCopy = new Rectangle[rects.Count];
+        //                    rects.CopyTo(arrCopy);
+        //                    for (int irc = 0; irc < arrCopy.Length; irc++)
+        //                    {
+        //                        if (arrCopy[irc].IntersectsWith(r))
+        //                        {
+        //                            tempRemoveList.Add(irc);
+        //                            Rectangle[] splitRects = DisplayHelp.ExcludeRectangle(arrCopy[irc], r);
+        //                            rects.AddRange(splitRects);
+        //                        }
+        //                    }
+        //                    foreach (int idx in tempRemoveList)
+        //                        rects.RemoveAt(idx);
+        //                }
+        //                else
+        //                {
+        //                    if (r.IntersectsWith(captionRect))
+        //                    {
+        //                        Rectangle[] splitRects = DisplayHelp.ExcludeRectangle(captionRect, r);
+        //                        if (splitRects.Length > 0)
+        //                        {
+        //                            rects.AddRange(splitRects);
+        //                            break;
+        //                        }
+        //                    }
+        //                }
+        //            }
+        //        }
+        //    }
+
+        //    Font font = System.Windows.Forms.SystemInformation.MenuFont;
+        //    bool disposeFont = true;
+        //    if (rs.CaptionFont != null)
+        //    {
+        //        font.Dispose();
+        //        font = rs.CaptionFont;
+        //        disposeFont = false;
+        //    }
+        //    Size textSize = Size.Empty;
+        //    if (isTitleTextMarkup)
+        //    {
+        //        textSize = e.RibbonControl.RibbonStrip.TitleTextMarkupBody.Bounds.Size;
+        //    }
+        //    else
+        //    {
+        //        textSize = TextDrawing.MeasureString(g, plainText, font);
+        //    }
+
+        //    if (rects.Count > 0)
+        //    {
+        //        rs.CaptionTextBounds = (Rectangle[])rects.ToArray(typeof(Rectangle));
+        //        if (e.RibbonControl.RightToLeft == System.Windows.Forms.RightToLeft.No)
+        //            rects.Reverse();
+        //        captionRect = Rectangle.Empty;
+        //        foreach (Rectangle r in rects)
+        //        {
+        //            if (r.Width >= textSize.Width)
+        //            {
+        //                captionRect = r;
+        //                break;
+        //            }
+        //            else if (r.Width > captionRect.Width)
+        //                captionRect = r;
+        //        }
+        //    }
+        //    else
+        //        rs.CaptionTextBounds = new Rectangle[] { captionRect };
+
+        //    if (captionRect.Width > 6 && captionRect.Height > 6)
+        //    {
+        //        if (e.GlassEnabled && e.ItemPaintArgs != null && e.ItemPaintArgs.ThemeWindow != null && !e.RibbonControl.IsDesignMode)
+        //        {
+        //            if (!e.ItemPaintArgs.CachedPaint || isMaximized)
+        //                PaintGlassText(g, plainText, font, captionRect, isMaximized);
+        //        }
+        //        else
+        //        {
+        //            if (!isTitleTextMarkup)
+        //                TextDrawing.DrawString(g, plainText, font, formct.CaptionText, captionRect, eTextFormat.VerticalCenter | eTextFormat.HorizontalCenter | eTextFormat.EndEllipsis | eTextFormat.NoPrefix);
+        //            else
+        //            {
+        //                TextMarkup.MarkupDrawContext d = new TextMarkup.MarkupDrawContext(g, font, formct.CaptionText, e.RibbonControl.RightToLeft == System.Windows.Forms.RightToLeft.Yes, captionRect, false);
+        //                d.AllowMultiLine = false;
+        //                d.IgnoreFormattingColors = !isFormActive;
+        //                TextMarkup.BodyElement body = e.RibbonControl.RibbonStrip.TitleTextMarkupBody;
+        //                if (e.RibbonControl.RibbonStrip.TitleTextMarkupLastArrangeBounds != captionRect)
+        //                {
+        //                    body.Measure(captionRect.Size, d);
+        //                    body.Arrange(captionRect, d);
+        //                    e.RibbonControl.RibbonStrip.TitleTextMarkupLastArrangeBounds = captionRect;
+        //                    Rectangle mr = body.Bounds;
+        //                    if (mr.Width < captionRect.Width)
+        //                        mr.Offset((captionRect.Width - mr.Width) / 2, 0);
+        //                    if (mr.Height < captionRect.Height)
+        //                        mr.Offset(0, (captionRect.Height - mr.Height) / 2);
+        //                    body.Bounds = mr;
+        //                }
+        //                Region oldClip = g.Clip;
+        //                g.SetClip(captionRect, CombineMode.Intersect);
+        //                body.Render(d);
+        //                g.Clip = oldClip;
+        //                if (oldClip != null) oldClip.Dispose();
+        //            }
+        //        }
+        //    }
+
+        //    if (disposeFont) font.Dispose();
+        //}
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Metro/Rendering/MetroTileItemPainter.cs b/PROMS/DotNetBar Source Code/Metro/Rendering/MetroTileItemPainter.cs
new file mode 100644
index 00000000..da247c94
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Metro/Rendering/MetroTileItemPainter.cs	
@@ -0,0 +1,345 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+using System.Windows.Forms;
+using System.Drawing.Drawing2D;
+using DevComponents.DotNetBar.Metro.ColorTables;
+
+namespace DevComponents.DotNetBar.Metro.Rendering
+{
+    internal class MetroTileItemPainter : MetroRenderer
+    {
+        private static readonly int InflatePixels = 1;
+        private static readonly int InflatePixelsMouseDown = 2;
+        private static readonly int DragEffectInflatePixels = -4;
+        private static readonly int DragInsertOffsetPixels = 10;
+
+        //private static readonly Point ImageIndent = new Point(2, 2);
+        public override void Render(MetroRendererInfo renderingInfo)
+        {
+            MetroTileItem item = (MetroTileItem)renderingInfo.Control;
+            if (item.Frames.Count == 0)
+            {
+                using (HatchBrush brush = new HatchBrush(HatchStyle.ForwardDiagonal, Color.Red))
+                    renderingInfo.PaintEventArgs.Graphics.FillRectangle(brush, item.Bounds);
+                return;
+            }
+            
+            Matrix currentTransform = null;
+            float zoom = 0.95f;
+            System.Drawing.Drawing2D.Matrix mx = null;
+
+            if (renderingInfo.ItemPaintArgs.DragInProgress)
+            {
+                currentTransform = renderingInfo.PaintEventArgs.Graphics.Transform;
+                
+                mx = new System.Drawing.Drawing2D.Matrix(zoom, 0, 0, zoom, 0, 0);
+                float offsetX = (item.WidthInternal * (1.0f / zoom) - item.WidthInternal) / 2;
+                float offsetY = (item.HeightInternal * (1.0f / zoom) - item.HeightInternal) / 2;
+                mx.Translate(offsetX, offsetY);
+                renderingInfo.PaintEventArgs.Graphics.Transform = mx;
+            }
+
+            if (item.CurrentFrameOffset != 0 && item.LastFrame != item.CurrentFrame)
+            {
+                Graphics g = renderingInfo.PaintEventArgs.Graphics;
+                if (currentTransform == null)
+                    currentTransform = g.Transform;
+                g.TranslateTransform(0, -(item.HeightInternal - item.CurrentFrameOffset - InflatePixels * 2), MatrixOrder.Append);
+                // Draw last frame first then offset the current frame
+                RenderFrame(renderingInfo, item.LastFrame);
+                if (mx != null)
+                    g.Transform = mx;
+                else
+                    g.Transform = currentTransform;
+                g.TranslateTransform(0, item.CurrentFrameOffset, MatrixOrder.Append);
+
+                RenderFrame(renderingInfo, item.CurrentFrame);
+            }
+            else
+                RenderFrame(renderingInfo, item.CurrentFrame);
+
+            if (currentTransform != null)
+            {
+                renderingInfo.PaintEventArgs.Graphics.Transform = currentTransform;
+                currentTransform.Dispose();
+            }
+        }
+        private void RenderFrame(MetroRendererInfo renderingInfo, int frameIndex)
+        {
+            MetroTileItem item = (MetroTileItem)renderingInfo.Control;
+            MetroTileFrame frame = item.Frames[frameIndex];
+            MetroTileColorTable colorTable = renderingInfo.ColorTable.MetroTile;
+            Graphics g = renderingInfo.PaintEventArgs.Graphics;
+            Rectangle bounds = item.Bounds;
+            Region clip = null;
+            if (!item.DragStartPoint.IsEmpty) // When dragging tile moves with the mouse
+            {
+                bounds.Location = renderingInfo.ItemPaintArgs.ContainerControl.PointToClient(Control.MousePosition);
+                bounds.Location.Offset(-item.DragStartPoint.X, -item.DragStartPoint.Y);
+                clip = g.Clip;
+                g.SetClip(bounds, CombineMode.Replace);
+            }
+            Control control = item.ContainerControl as Control;
+            bounds.Inflate(-InflatePixels, -InflatePixels);
+            if (item.IsLeftMouseButtonDown)
+                bounds.Inflate(-InflatePixelsMouseDown, -InflatePixelsMouseDown);
+            else if (item.IsMouseOver)
+                bounds.Inflate(InflatePixels, InflatePixels);
+
+            //if (renderingInfo.ItemPaintArgs.DragInProgress)
+            //    bounds.Inflate(DragEffectInflatePixels, DragEffectInflatePixels);
+
+            eDesignInsertPosition insertMarker = item.DesignInsertMarker;
+            if (insertMarker == eDesignInsertPosition.After)
+            {
+                if (item.IsDesignMarkHorizontal)
+                    bounds.Offset(-DragInsertOffsetPixels, 0);
+                else
+                    bounds.Offset(0, -DragInsertOffsetPixels);
+                g.ResetClip();
+            }
+            else if (insertMarker == eDesignInsertPosition.Before)
+            {
+                if (item.IsDesignMarkHorizontal)
+                    bounds.Offset(DragInsertOffsetPixels, 0);
+                else
+                    bounds.Offset(0, DragInsertOffsetPixels);
+                g.ResetClip();
+            }
+
+            bool dispose = false;
+            bool enabled = item.GetEnabled(renderingInfo.ItemPaintArgs.ContainerControl);
+            ElementStyle style = ElementStyleDisplay.GetElementStyle(frame.EffectiveStyle, out dispose);
+
+            if (bounds.Width > 2048) bounds.Width = 2048;
+            if (bounds.Height > 1600) bounds.Height = 1600;
+
+            if (enabled)
+            {
+                ElementStyleDisplayInfo di = new ElementStyleDisplayInfo(style, g,  bounds);
+                ElementStyleDisplay.Paint(di);
+            }
+            else
+            {
+                using (SolidBrush brush = new SolidBrush(item.DisabledBackColor.IsEmpty ? renderingInfo.ColorTable.MetroPartColors.CanvasColorLighterShade : item.DisabledBackColor))
+                    g.FillRectangle(brush, bounds);
+            }
+
+            Rectangle textRect = bounds;
+            textRect.X += style.PaddingLeft;
+            textRect.Y += style.PaddingTop;
+            textRect.Width -= style.PaddingHorizontal;
+            textRect.Height -= style.PaddingVertical;
+            if (item.IsLeftMouseButtonDown)
+            {
+                textRect.Width += InflatePixelsMouseDown*2;
+                textRect.Height += InflatePixelsMouseDown*2;
+            }
+            else if(item.IsMouseOver)
+                textRect.Inflate(-InflatePixels, -InflatePixels);
+            Size tileSize = Dpi.Size(item.TileSize);
+            if (item.SubItems.Count > 0 && frameIndex < item.SubItems.Count)
+            {
+                BaseItem child = item.SubItems[frameIndex];
+                if (child.Displayed)
+                {
+                    child.TopInternal = bounds.Y + style.PaddingTop + ((bounds.Height - style.PaddingTop - frame.TitleTextBounds.Height) - child.HeightInternal) / 2;
+                    child.LeftInternal = bounds.X + style.PaddingLeft;
+                    child.WidthInternal = tileSize.Width - style.PaddingHorizontal;
+                    child.Paint(renderingInfo.ItemPaintArgs);
+                }
+            }
+
+            Image image = frame.Image;
+            ContentAlignment imageTextAlign = frame.ImageTextAlignment;
+            Color textColor = enabled ? style.TextColor : renderingInfo.ColorTable.MetroPartColors.CanvasColorLightShade;
+            Color symbolColor = textColor;
+            if (!frame.SymbolColor.IsEmpty) symbolColor = frame.SymbolColor;
+            if (image != null || !string.IsNullOrEmpty(frame.SymbolRealized))
+            {
+                Font symFont = null;
+                Rectangle imageRect = Rectangle.Empty;
+                if (string.IsNullOrEmpty(frame.SymbolRealized))
+                    imageRect = new Rectangle(0, 0, Dpi.ImageWidth(image.Width), Dpi.ImageHeight(image.Height));
+                else
+                {
+                    symFont = Symbols.GetFont(frame.SymbolSize, frame.SymbolSet);
+                    Size imageSize = TextDrawing.MeasureString(g, frame.SymbolRealized, symFont);
+                    int descent = (int)Math.Ceiling((symFont.FontFamily.GetCellDescent(symFont.Style) *
+                        symFont.Size / symFont.FontFamily.GetEmHeight(symFont.Style)));
+                    imageSize.Height -= descent;
+                    imageRect = new Rectangle(0, 0, imageSize.Width, imageSize.Height);
+                }
+
+                imageRect.Offset(bounds.Location);
+
+                if (imageTextAlign == ContentAlignment.TopLeft)
+                {
+                    textRect.X += (imageRect.Width + frame.ImageIndent.X);
+                    textRect.Width -= (imageRect.Width + frame.ImageIndent.X);
+                    imageRect.Offset(frame.ImageIndent.X, frame.ImageIndent.Y);
+                }
+                else if (imageTextAlign == ContentAlignment.TopCenter)
+                {
+                    imageRect.X += (tileSize.Width - imageRect.Width) / 2;
+                    imageRect.Offset(frame.ImageIndent.X, frame.ImageIndent.Y);
+                    textRect.Y += (imageRect.Height + frame.ImageIndent.Y);
+                    textRect.Height -= (imageRect.Height);
+                }
+                else if (imageTextAlign == ContentAlignment.TopRight)
+                {
+                    imageRect.X += (tileSize.Width - imageRect.Width - frame.ImageIndent.X);
+                    imageRect.Offset(0, frame.ImageIndent.Y);
+                    textRect.Width -= (imageRect.Width + frame.ImageIndent.X);
+                }
+                else if (imageTextAlign == ContentAlignment.BottomCenter)
+                {
+                    imageRect.Offset((tileSize.Width - imageRect.Width) / 2, tileSize.Height - imageRect.Height);
+                    imageRect.Offset(frame.ImageIndent.X, frame.ImageIndent.Y);
+                    textRect.Height -= (imageRect.Height);
+                }
+                else if (imageTextAlign == ContentAlignment.BottomLeft)
+                {
+                    imageRect.Offset(0, tileSize.Height - imageRect.Height);
+                    imageRect.Offset(frame.ImageIndent.X, frame.ImageIndent.Y);
+                    textRect.X += (imageRect.Width + frame.ImageIndent.X);
+                    textRect.Width -= (imageRect.Width + frame.ImageIndent.X);
+                }
+                else if (imageTextAlign == ContentAlignment.BottomRight)
+                {
+                    imageRect.Offset((tileSize.Width - imageRect.Width - frame.ImageIndent.X), tileSize.Height - imageRect.Height);
+                    imageRect.Offset(0, frame.ImageIndent.Y);
+                    textRect.Width -= (imageRect.Width + frame.ImageIndent.X);
+                }
+                else if (imageTextAlign == ContentAlignment.MiddleCenter)
+                {
+                    imageRect.Offset((tileSize.Width - imageRect.Width) / 2, (tileSize.Height - imageRect.Height) / 2);
+                    imageRect.Offset(frame.ImageIndent.X, frame.ImageIndent.Y);
+                    textRect.Height = Math.Max(0, textRect.Bottom - imageRect.Bottom);
+                    textRect.Y = imageRect.Bottom + 1;
+                }
+                else if (imageTextAlign == ContentAlignment.MiddleLeft)
+                {
+                    imageRect.Offset(0, (tileSize.Height - imageRect.Height) / 2);
+                    imageRect.Offset(frame.ImageIndent.X, frame.ImageIndent.Y);
+                    textRect.X += (imageRect.Width + frame.ImageIndent.X);
+                    textRect.Width -= (imageRect.Width + frame.ImageIndent.X);
+                }
+                else if (imageTextAlign == ContentAlignment.MiddleRight)
+                {
+                    imageRect.Offset((tileSize.Width - imageRect.Width - frame.ImageIndent.X), (tileSize.Height - imageRect.Height) / 2);
+                    imageRect.Offset(0, frame.ImageIndent.Y);
+                    textRect.Width -= (imageRect.Width + frame.ImageIndent.X);
+                }
+                else
+                    imageRect.Offset(frame.ImageIndent.X, frame.ImageIndent.Y);
+
+                if (string.IsNullOrEmpty(frame.SymbolRealized))
+                    g.DrawImage(image, imageRect);
+                else
+                    TextDrawing.DrawStringLegacy(g, frame.SymbolRealized, symFont, symbolColor, new Rectangle(imageRect.X, imageRect.Y, 0, 0), eTextFormat.Default);
+            }
+
+            if (textRect.Width > 0 && textRect.Height > 0 && frame.Text != null)
+            {
+                Font font = renderingInfo.DefaultFont;
+                if (style.Font != null)
+                    font = style.Font;
+                bool rightToLeft = renderingInfo.RightToLeft;
+                if (frame.TextMarkupBody == null)
+                {
+                    eTextFormat textFormat = eTextFormat.Default | eTextFormat.WordBreak | eTextFormat.NoClipping;
+                    if (style.TextLineAlignment == eStyleTextAlignment.Center)
+                        textFormat |= eTextFormat.VerticalCenter;
+                    else if (style.TextLineAlignment == eStyleTextAlignment.Far)
+                        textFormat |= eTextFormat.Bottom;
+                    if (style.TextAlignment == eStyleTextAlignment.Center)
+                        textFormat |= eTextFormat.HorizontalCenter;
+                    else if (style.TextAlignment == eStyleTextAlignment.Far)
+                        textFormat |= eTextFormat.Right;
+                    //if (frame.Text.Contains("Explorer")) Console.WriteLine("{0}    {1}", textRect, DateTime.Now);
+                    TextDrawing.DrawString(g, frame.Text, font, textColor, textRect, textFormat);
+                }
+                else
+                {
+                    TextMarkup.MarkupDrawContext d = new TextMarkup.MarkupDrawContext(g, font, textColor, rightToLeft);
+                    d.HotKeyPrefixVisible = false;
+                    d.ContextObject = item;
+                    Rectangle markupBounds = textRect;
+                    // Can't do this because it will break all apps default for TextLineAlignment is eStyleTextAlignment.Center
+                    //if (style.TextLineAlignment == eStyleTextAlignment.Center)
+                    //    markupBounds = new Rectangle(new Point(textRect.X, textRect.Y + (textRect.Height - frame.TextMarkupBody.Bounds.Height) / 2), frame.TextMarkupBody.Bounds.Size);
+                    //else if (style.TextLineAlignment == eStyleTextAlignment.Far)
+                    //    markupBounds = new Rectangle(new Point(textRect.X, textRect.Bottom - frame.TextMarkupBody.Bounds.Height), frame.TextMarkupBody.Bounds.Size);
+
+                    frame.TextMarkupBody.Bounds = markupBounds;
+                    frame.TextMarkupBody.Render(d);
+                }
+            }
+
+            if (frame.TitleText != null)
+            {
+                Color titleTextColor = enabled ? frame.TitleTextColor : renderingInfo.ColorTable.MetroPartColors.CanvasColorLightShade;
+                if (titleTextColor.IsEmpty)
+                    titleTextColor = style.TextColor;
+                Font font = item.GetTitleTextFont(frame, style, control);
+                Rectangle titleTextRect = frame.TitleTextBounds;
+                titleTextRect.Offset(bounds.Location);
+                if (item.IsLeftMouseButtonDown)
+                    titleTextRect.Offset(1, 1);
+                else if (item.IsMouseOver)
+                    titleTextRect.Offset(InflatePixels, InflatePixels);
+                if (frame.TitleTextMarkupBody == null)
+                    TextDrawing.DrawString(g, frame.TitleText, font, titleTextColor, titleTextRect, eTextFormat.Default | eTextFormat.SingleLine);
+                else
+                {
+                    TextMarkup.MarkupDrawContext d = new TextMarkup.MarkupDrawContext(g, font, titleTextColor, renderingInfo.RightToLeft);
+                    d.HotKeyPrefixVisible = false;
+                    d.ContextObject = item;
+                    Rectangle markupBounds = titleTextRect;
+                    frame.TitleTextMarkupBody.Bounds = markupBounds;
+                    frame.TitleTextMarkupBody.Render(d);
+                }
+            }
+
+            if (item.Checked)
+            {
+                Size checkMarkSize = Dpi.Size(CheckMarkSize);
+                Rectangle markBounds = new Rectangle(bounds.Right - checkMarkSize.Width, bounds.Y, checkMarkSize.Width, checkMarkSize.Height);
+                using (GraphicsPath markPath = new GraphicsPath())
+                {
+                    markPath.AddLine(markBounds.X, markBounds.Y, markBounds.Right - 1, markBounds.Y);
+                    markPath.AddLine(markBounds.Right - 1, markBounds.Y, markBounds.Right - 1, markBounds.Bottom - 1);
+                    markPath.CloseFigure();
+                    using (SolidBrush brush = new SolidBrush(colorTable.CheckBackground))
+                        g.FillPath(brush, markPath);
+                }
+                using (SolidBrush brush = new SolidBrush(colorTable.CheckForeground))
+                {
+                    Rectangle checkCircleBounds = new Rectangle();
+                    checkCircleBounds.Size = new Size(Dpi.Width11, Dpi.Height11);
+                    checkCircleBounds.X = markBounds.Right - checkCircleBounds.Size.Width - Dpi.Width3;
+                    checkCircleBounds.Y = markBounds.Y + Dpi.Height2;
+                    using (Pen pen = new Pen(colorTable.CheckForeground, Dpi.Width2))
+                    {
+                        g.DrawEllipse(pen, checkCircleBounds);
+                        g.DrawLine(pen, checkCircleBounds.X + Dpi.Width3, checkCircleBounds.Y + Dpi.Height5, checkCircleBounds.X + Dpi.Width6, checkCircleBounds.Y + Dpi.Height8);
+                        g.DrawLine(pen, checkCircleBounds.X + Dpi.Width6, checkCircleBounds.Y + Dpi.Height8, checkCircleBounds.X + Dpi.Width9, checkCircleBounds.Y + Dpi.Height3);
+                    }
+                }
+            }
+
+            if (dispose) style.Dispose();
+
+            if (clip != null) 
+            {
+                g.Clip = clip;
+                clip.Dispose();
+            }
+        }
+
+        private static readonly Size CheckMarkSize = new Size(27, 27);
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Metro/Rendering/MetroToolbarPainter.cs b/PROMS/DotNetBar Source Code/Metro/Rendering/MetroToolbarPainter.cs
new file mode 100644
index 00000000..29b9ef84
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Metro/Rendering/MetroToolbarPainter.cs	
@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+using DevComponents.DotNetBar.Metro.ColorTables;
+
+namespace DevComponents.DotNetBar.Metro.Rendering
+{
+    internal class MetroToolbarPainter : MetroRenderer
+    {
+        public override void Render(MetroRendererInfo renderingInfo)
+        {
+            MetroToolbar bar = (MetroToolbar)renderingInfo.Control;
+            Graphics g = renderingInfo.PaintEventArgs.Graphics;
+            MetroToolbarColorTable ct = renderingInfo.ColorTable.MetroToolbar;
+            Rectangle bounds = bar.ClientRectangle;
+
+            if (ct.BackgroundStyle != null)
+            {
+                ElementStyleDisplayInfo di = new ElementStyleDisplayInfo(ct.BackgroundStyle, g, bounds);
+                ElementStyleDisplay.PaintBackground(di);
+            }
+
+#if TRIAL
+            if (bar.Expanded)
+            {
+                Rectangle tr = bounds;
+                tr.Inflate(-2, -2);
+                using (Font font = new Font(bar.Font.FontFamily, 8f, FontStyle.Regular))
+                    TextDrawing.DrawString(g, "DotNetBar Trial", font, Color.FromArgb(32, Color.Black), tr, eTextFormat.Bottom | eTextFormat.Right);
+            }
+#endif
+
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Metro/Thickness.cs b/PROMS/DotNetBar Source Code/Metro/Thickness.cs
new file mode 100644
index 00000000..8e97fdd9
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Metro/Thickness.cs	
@@ -0,0 +1,377 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Runtime.InteropServices;
+using System.ComponentModel;
+using System.Globalization;
+using System.Drawing;
+using System.Collections;
+using System.Reflection;
+using System.ComponentModel.Design.Serialization;
+using DevComponents.DotNetBar.Metro.Helpers;
+
+namespace DevComponents.DotNetBar.Metro
+{
+    /// <summary>
+    /// Defines Thickness structure used by borders and margins.
+    /// </summary>
+    [StructLayout(LayoutKind.Sequential), TypeConverter(typeof(ThicknessConverter))]
+    public struct Thickness : IEquatable<Thickness>
+    {
+        #region Constructor
+        private double _Left;
+        private double _Top;
+        private double _Right;
+        private double _Bottom;
+
+        /// <summary>
+        /// Creates new instance of the object.
+        /// </summary>
+        /// <param name="uniformLength">Uniform Thickness</param>
+        public Thickness(double uniformThickness)
+        {
+            _Left = _Top = _Right = _Bottom = uniformThickness;
+        }
+        /// <summary>
+        /// Creates new instance of the object.
+        /// </summary>
+        /// <param name="left">Left Thickness</param>
+        /// <param name="top">Top Thickness</param>
+        /// <param name="right">Right Thickness</param>
+        /// <param name="bottom">Bottom Thickness</param>
+        public Thickness(double left, double top, double right, double bottom)
+        {
+            _Left = left;
+            _Top = top;
+            _Right = right;
+            _Bottom = bottom;
+        }
+        #endregion
+
+        #region Implementation
+        /// <summary>
+        /// Gets whether object equals to this instance.
+        /// </summary>
+        /// <param name="obj">object to test.</param>
+        /// <returns>returns whether objects are Equals</returns>
+        public override bool Equals(object obj)
+        {
+            if (obj is Thickness)
+            {
+                Thickness thickness = (Thickness)obj;
+                return (this == thickness);
+            }
+            return false;
+        }
+        /// <summary>
+        /// Gets whether object equals to this instance.
+        /// </summary>
+        /// <param name="thickness">object to test.</param>
+        /// <returns>returns whether objects are Equals</returns>
+        public bool Equals(Thickness thickness)
+        {
+            return (this == thickness);
+        }
+        /// <summary>
+        /// Returns hash code for object.
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            return (((_Left.GetHashCode() ^ _Top.GetHashCode()) ^ _Right.GetHashCode()) ^ _Bottom.GetHashCode());
+        }
+
+        const string StringValueSeparator = ",";
+        /// <summary>
+        /// Returns string representation of object.
+        /// </summary>
+        /// <returns>string representing Thickness</returns>
+        public override string ToString()
+        {
+            return Convert.ToString(_Left) + StringValueSeparator + Convert.ToString(_Top) + StringValueSeparator + Convert.ToString(_Right) + StringValueSeparator + Convert.ToString(_Bottom);
+        }
+        /// <summary>
+        /// Gets string representation of object.
+        /// </summary>
+        /// <param name="cultureInfo">Culture info.</param>
+        /// <returns>string representing Thickness</returns>
+        internal string ToString(CultureInfo cultureInfo)
+        {
+            return Convert.ToString(_Left, cultureInfo) + StringValueSeparator + Convert.ToString(_Top, cultureInfo) + StringValueSeparator + Convert.ToString(_Right, cultureInfo) + StringValueSeparator + Convert.ToString(_Bottom, cultureInfo);
+        }
+        /// <summary>
+        /// Returns whether all values are zero.
+        /// </summary>
+        [Browsable(false)]
+        public bool IsZero
+        {
+            get
+            {
+                return (((DoubleHelpers.IsZero(this.Left) && DoubleHelpers.IsZero(this.Top)) && DoubleHelpers.IsZero(this.Right)) && DoubleHelpers.IsZero(this.Bottom));
+            }
+        }
+        /// <summary>
+        /// Returns whether all values are the same.
+        /// </summary>
+        [Browsable(false)]
+        public bool IsUniform
+        {
+            get
+            {
+                return ((DoubleHelpers.AreClose(this.Left, this.Top) && DoubleHelpers.AreClose(this.Left, this.Right)) && DoubleHelpers.AreClose(this.Left, this.Bottom));
+            }
+        }
+        /// <summary>
+        /// Returns whether object holds valid value.
+        /// </summary>
+        /// <param name="allowNegative">Specifies whether negative values are allowed.</param>
+        /// <param name="allowNaN">Specifies whether NaN values are allowed.</param>
+        /// <param name="allowPositiveInfinity">Specifies whether positive infinity values are allowed</param>
+        /// <param name="allowNegativeInfinity">Specifies whether negative infinity values are allowed</param>
+        /// <returns>true if object holds valid value</returns>
+        internal bool IsValid(bool allowNegative, bool allowNaN, bool allowPositiveInfinity, bool allowNegativeInfinity)
+        {
+            if (!allowNegative && (((this.Left < 0.0) || (this.Right < 0.0)) || ((this.Top < 0.0) || (this.Bottom < 0.0))))
+            {
+                return false;
+            }
+            if (!allowNaN && ((DoubleHelpers.IsNaN(this.Left) || DoubleHelpers.IsNaN(this.Right)) || (DoubleHelpers.IsNaN(this.Top) || DoubleHelpers.IsNaN(this.Bottom))))
+            {
+                return false;
+            }
+            if (!allowPositiveInfinity && ((double.IsPositiveInfinity(this.Left) || double.IsPositiveInfinity(this.Right)) || (double.IsPositiveInfinity(this.Top) || double.IsPositiveInfinity(this.Bottom))))
+            {
+                return false;
+            }
+            return (allowNegativeInfinity || ((!double.IsNegativeInfinity(this.Left) && !double.IsNegativeInfinity(this.Right)) && (!double.IsNegativeInfinity(this.Top) && !double.IsNegativeInfinity(this.Bottom))));
+        }
+        /// <summary>
+        /// Returns true if two objects are close.
+        /// </summary>
+        /// <param name="thickness">Thickness to test.</param>
+        /// <returns>true if values are close.</returns>
+        internal bool IsClose(Thickness thickness)
+        {
+            return (((DoubleHelpers.AreClose(this.Left, thickness.Left) && DoubleHelpers.AreClose(this.Top, thickness.Top)) && DoubleHelpers.AreClose(this.Right, thickness.Right)) && DoubleHelpers.AreClose(this.Bottom, thickness.Bottom));
+        }
+        /// <summary>
+        /// Returns true if two objects are close.
+        /// </summary>
+        /// <param name="thickness1">Thickness 1</param>
+        /// <param name="thickness2">Thickness 2</param>
+        /// <returns>true if values are close.</returns>
+        internal static bool AreClose(Thickness thickness1, Thickness thickness2)
+        {
+            return thickness1.IsClose(thickness2);
+        }
+
+        public static bool operator ==(Thickness t1, Thickness t2)
+        {
+            return (((((t1._Left == t2._Left) || (DoubleHelpers.IsNaN(t1._Left) && DoubleHelpers.IsNaN(t2._Left))) && ((t1._Top == t2._Top) || (DoubleHelpers.IsNaN(t1._Top) && DoubleHelpers.IsNaN(t2._Top)))) && ((t1._Right == t2._Right) || (DoubleHelpers.IsNaN(t1._Right) && DoubleHelpers.IsNaN(t2._Right)))) && ((t1._Bottom == t2._Bottom) || (DoubleHelpers.IsNaN(t1._Bottom) && DoubleHelpers.IsNaN(t2._Bottom))));
+        }
+
+        public static bool operator !=(Thickness t1, Thickness t2)
+        {
+            return !(t1 == t2);
+        }
+        /// <summary>
+        /// Gets or sets the left Thickness.
+        /// </summary>
+        public double Left
+        {
+            get
+            {
+                return _Left;
+            }
+            set
+            {
+                _Left = value;
+            }
+        }
+        /// <summary>
+        /// Gets or sets the top Thickness.
+        /// </summary>
+        public double Top
+        {
+            get
+            {
+                return _Top;
+            }
+            set
+            {
+                _Top = value;
+            }
+        }
+        /// <summary>
+        /// Gets or sets the Right Thickness.
+        /// </summary>
+        public double Right
+        {
+            get
+            {
+                return _Right;
+            }
+            set
+            {
+                _Right = value;
+            }
+        }
+        /// <summary>
+        /// Gets or sets the Bottom Thickness.
+        /// </summary>
+        public double Bottom
+        {
+            get
+            {
+                return _Bottom;
+            }
+            set
+            {
+                _Bottom = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the total horizontal thickness i.e. Left+Right.
+        /// </summary>
+        [Browsable(false)]
+        public double Horizontal
+        {
+            get
+            {
+                return _Left + _Right;
+            }
+        }
+        /// <summary>
+        /// Gets the total vertical thickness i.e. Top+Bottom.
+        /// </summary>
+        [Browsable(false)]
+        public double Vertical
+        {
+            get
+            {
+                return _Top + _Bottom;
+            }
+        }
+        #endregion
+    }
+
+    #region ThicknessConverter
+    /// <summary>
+    /// Provides Thickness TypeConverter.
+    /// </summary>
+    public class ThicknessConverter : TypeConverter
+    {
+        public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
+        {
+            return ((sourceType == typeof(string)) || base.CanConvertFrom(context, sourceType));
+        }
+
+        public override bool CanConvertTo(ITypeDescriptorContext context, Type destinationType)
+        {
+            return ((destinationType == typeof(InstanceDescriptor)) || base.CanConvertTo(context, destinationType));
+        }
+
+        public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
+        {
+            string str = value as string;
+            if (str == null)
+            {
+                return base.ConvertFrom(context, culture, value);
+            }
+            string str2 = str.Trim();
+            if (str2.Length == 0)
+            {
+                return null;
+            }
+            if (culture == null)
+            {
+                culture = CultureInfo.CurrentCulture;
+            }
+            char ch = culture.TextInfo.ListSeparator[0];
+            string[] strArray = str2.Split(new char[] { ch });
+            double[] numArray = new double[strArray.Length];
+            TypeConverter converter = TypeDescriptor.GetConverter(typeof(double));
+            for (int i = 0; i < numArray.Length; i++)
+            {
+                numArray[i] = (double)converter.ConvertFromString(context, culture, strArray[i]);
+            }
+            if (numArray.Length != 4)
+            {
+                throw new ArgumentException("Text Parsing Failed");
+            }
+            return new Thickness(numArray[0], numArray[1], numArray[2], numArray[3]);
+        }
+
+        public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+        {
+            if (destinationType == null)
+            {
+                throw new ArgumentNullException("destinationType");
+            }
+            if (value is Thickness)
+            {
+                if (destinationType == typeof(string))
+                {
+                    Thickness Thickness = (Thickness)value;
+                    if (culture == null)
+                    {
+                        culture = CultureInfo.CurrentCulture;
+                    }
+                    string separator = culture.TextInfo.ListSeparator + " ";
+                    TypeConverter converter = TypeDescriptor.GetConverter(typeof(double));
+                    string[] strArray = new string[4];
+                    int num = 0;
+                    strArray[num++] = converter.ConvertToString(context, culture, Thickness.Left);
+                    strArray[num++] = converter.ConvertToString(context, culture, Thickness.Top);
+                    strArray[num++] = converter.ConvertToString(context, culture, Thickness.Right);
+                    strArray[num++] = converter.ConvertToString(context, culture, Thickness.Bottom);
+                    return string.Join(separator, strArray);
+                }
+                if (destinationType == typeof(InstanceDescriptor))
+                {
+                    Thickness Thickness2 = (Thickness)value;
+                    ConstructorInfo constructor = typeof(Thickness).GetConstructor(new Type[] { typeof(double), typeof(double), typeof(double), typeof(double) });
+                    if (constructor != null)
+                    {
+                        return new InstanceDescriptor(constructor, new object[] { Thickness2.Left, Thickness2.Top, Thickness2.Right, Thickness2.Bottom });
+                    }
+                }
+            }
+            return base.ConvertTo(context, culture, value, destinationType);
+        }
+
+        public override object CreateInstance(ITypeDescriptorContext context, IDictionary propertyValues)
+        {
+            if (propertyValues == null)
+            {
+                throw new ArgumentNullException("propertyValues");
+            }
+            object left = propertyValues["Left"];
+            object top = propertyValues["Top"];
+            object right = propertyValues["Right"];
+            object bottom = propertyValues["Bottom"];
+            if ((((left == null) || (top == null)) || ((right == null) || (bottom == null))) || ((!(left is double) || !(top is double)) || (!(right is double) || !(bottom is double))))
+            {
+                throw new ArgumentException(string.Format("Property Value Invalid: left={0}, top={1}, right={2}, bottom={3}", left, top, right, bottom));
+            }
+            return new Thickness((double)left, (double)top, (double)right, (double)bottom);
+        }
+
+        public override bool GetCreateInstanceSupported(ITypeDescriptorContext context)
+        {
+            return true;
+        }
+
+        public override PropertyDescriptorCollection GetProperties(ITypeDescriptorContext context, object value, Attribute[] attributes)
+        {
+            return TypeDescriptor.GetProperties(typeof(Thickness), attributes).Sort(new string[] { "Left", "Top", "Right", "Bottom" });
+        }
+
+        public override bool GetPropertiesSupported(ITypeDescriptorContext context)
+        {
+            return true;
+        }
+    }
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/MicroCharts/AreaMicroChart.cs b/PROMS/DotNetBar Source Code/MicroCharts/AreaMicroChart.cs
new file mode 100644
index 00000000..41a76bef
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/MicroCharts/AreaMicroChart.cs	
@@ -0,0 +1,303 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar.MicroCharts
+{
+    internal class AreaMicroChart : MicroChartBase
+    {
+        public override void CreateChart(MicroChartRenderInfo info)
+        {
+            Graphics graphics = info.Graphics;
+
+            int pointRadius = Dpi.Width(PointRadius);
+            int chartHeight = info.ChartHeight - pointRadius * 2;
+            int chartWidth = info.ChartWidth - pointRadius * 2;
+
+            int drawStep = Math.Max(3, (chartWidth / (Math.Max(1, info.DataPoints.Count - 1))));
+            int dataStep = Math.Max(1, ((info.DataPoints.Count * drawStep) / chartWidth));
+            int x = pointRadius;
+            double dataPointMinValue = info.DataPointMinValue;
+
+            double zeroValue = _MicroChartStyle.ZeroLineValue;
+            if (dataPointMinValue > zeroValue)
+                dataPointMinValue = zeroValue;
+
+            double range = info.DataPointMaxValue - dataPointMinValue;
+            if (range == 0) range = 1;
+            int zeroY = Math.Min((int)(chartHeight * (1 - (zeroValue - dataPointMinValue) / range)), chartHeight - 1) + pointRadius;
+
+            int totalPoints = (int)Math.Ceiling((double)info.DataPoints.Count / dataStep);
+            Point[] chartPoints = new Point[totalPoints];
+            MicroChartHotPoint[] microHotPoints = new MicroChartHotPoint[totalPoints];
+            int index = 0;
+            GraphicsPath areaPath = new GraphicsPath();
+            Point lastPoint = new Point(0, zeroY);
+            Point lowPoint = Point.Empty, highPoint = Point.Empty;
+
+            for (int i = 0; i < info.DataPoints.Count; i += dataStep)
+            {
+                double value = info.DataPoints[i];
+                double nextValue = (i < (info.DataPoints.Count - 1)) ? info.DataPoints[i + 1] : zeroValue;
+                Point p = new Point(x, Math.Min((int)(chartHeight * (1 - (value - dataPointMinValue) / range)), chartHeight - 1) + pointRadius);
+                Point endPoint = new Point(x + drawStep, Math.Min((int)(chartHeight * (1 - (nextValue - dataPointMinValue) / range)), chartHeight - 1));
+
+                if (lowPoint.IsEmpty && value == info.DataPointMinValue)
+                    lowPoint = p;
+                else if (/*highPoint.IsEmpty &&*/ value == info.DataPointMaxValue)
+                    highPoint = p;
+
+                chartPoints[index] = p;
+
+                if (i + dataStep >= info.DataPoints.Count)
+                    areaPath.AddPolygon(new Point[] { new Point(x, zeroY), p, endPoint, new Point(chartWidth, endPoint.Y), new Point(chartWidth, zeroY) });
+                else
+                    areaPath.AddPolygon(new Point[] { new Point(x, zeroY), p, endPoint, new Point(endPoint.X, zeroY) });
+
+                microHotPoints[index] = new MicroChartHotPoint(GetHotPointBounds(p, info), new Rectangle(p.X - drawStep / 2, 0, endPoint.X - p.X, chartHeight), Color.Gray /*_MicroChartStyle.LineColor*/, value, index);
+                index++;
+                x += drawStep;
+            }
+
+            using (SolidBrush brush = new SolidBrush(_MicroChartStyle.AreaColor))
+                graphics.FillPath(brush, areaPath);
+            areaPath.Dispose();
+
+            if (!lowPoint.IsEmpty && !_MicroChartStyle.LowPointColor.IsEmpty)
+            {
+                using (SolidBrush brush = new SolidBrush(_MicroChartStyle.LowPointColor))
+                    graphics.FillPolygon(brush, GetChartPointBounds(lowPoint));
+            }
+
+            if (!highPoint.IsEmpty && !_MicroChartStyle.HighPointColor.IsEmpty)
+            {
+                using (SolidBrush brush = new SolidBrush(_MicroChartStyle.HighPointColor))
+                    graphics.FillPolygon(brush, GetChartPointBounds(highPoint));
+            }
+
+            if (!_MicroChartStyle.FirstPointColor.IsEmpty && chartPoints.Length > 0)
+            {
+                using (SolidBrush brush = new SolidBrush(_MicroChartStyle.FirstPointColor))
+                    graphics.FillPolygon(brush, GetChartPointBounds(chartPoints[0]));
+            }
+
+            if (!_MicroChartStyle.LastPointColor.IsEmpty && chartPoints.Length > 1)
+            {
+                using (SolidBrush brush = new SolidBrush(_MicroChartStyle.LastPointColor))
+                    graphics.FillPolygon(brush, GetChartPointBounds(chartPoints[chartPoints.Length - 1]));
+            }
+
+            info.MicroChartHotPoints = microHotPoints;
+
+        }
+        private static int HotPointOffset
+        {
+            get { return Dpi.Width4; }
+        }
+        private Rectangle GetHotPointBounds(Point hotPoint, MicroChartRenderInfo info)
+        {
+            //Rectangle bounds = new Rectangle(Math.Min(info.ChartWidth - HotPointOffset * 2, Math.Max(-1, hotPoint.X - HotPointOffset)),
+            //    Math.Min(info.ChartHeight - HotPointOffset * 2, Math.Max(-1, hotPoint.Y - HotPointOffset)),
+            //    HotPointOffset * 2,
+            //    HotPointOffset * 2);
+            Rectangle bounds = new Rectangle(hotPoint.X - HotPointOffset,
+                hotPoint.Y - HotPointOffset,
+                HotPointOffset * 2,
+                HotPointOffset * 2);
+            return bounds;
+        }
+
+        private AreaMicroChartStyle _MicroChartStyle;
+        public AreaMicroChartStyle Style
+        {
+            get { return _MicroChartStyle; }
+            set { _MicroChartStyle = value; }
+        }
+    }
+
+    /// <summary>
+    /// Defines the style for Area micro chart.
+    /// </summary>
+    [System.ComponentModel.ToolboxItem(false), System.ComponentModel.DesignTimeVisible(false), TypeConverter(typeof(System.ComponentModel.ExpandableObjectConverter))]
+    public class AreaMicroChartStyle
+    {
+        /// <summary>
+        /// Initializes a new instance of the AreaMicroChartStyle class.
+        /// </summary>
+        public AreaMicroChartStyle()
+        {
+        }
+
+        /// <summary>
+        /// Occurs when style appearance changes.
+        /// </summary>
+        public event EventHandler StyleChanged;
+        /// <summary>
+        /// Raises StyleChanged event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnStyleChanged(EventArgs e)
+        {
+            EventHandler handler = StyleChanged;
+            if (handler != null)
+                handler(this, e);
+        }
+        private void OnStyleChanged()
+        {
+            OnStyleChanged(EventArgs.Empty);
+        }
+
+        private double _ZeroLineValue = 0d;
+        /// <summary>
+        /// Gets or sets the value of the zero line, i.e. where zero line is drawn. Default value is 0.
+        /// </summary>
+        [DefaultValue(0d), Category("Appearance"), Description("Indicates value of the zero line, i.e. where zero line is drawn.")]
+        public double ZeroLineValue
+        {
+            get { return _ZeroLineValue; }
+            set
+            {
+                _ZeroLineValue = value;
+                OnStyleChanged();
+            }
+        }
+
+        private Color _AreaColor = ColorScheme.GetColor(0x938953);
+        /// <summary>
+        /// Gets or sets the chart area color.
+        /// </summary>
+        [Category("Columns"), Description("Indicates chart area color.")]
+        public Color AreaColor
+        {
+            get { return _AreaColor; }
+            set { _AreaColor = value; OnStyleChanged(); }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeAreaColor()
+        {
+            return _AreaColor != ColorScheme.GetColor(0x938953);
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetAreaColor()
+        {
+            this.AreaColor = ColorScheme.GetColor(0x938953);
+        }
+
+        private Color _HighPointColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets the color of the high point dot on chart.
+        /// </summary>
+        [Category("Columns"), Description("Indicates color of high point dot on chart..")]
+        public Color HighPointColor
+        {
+            get { return _HighPointColor; }
+            set { _HighPointColor = value; OnStyleChanged(); }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeHighPointColor()
+        {
+            return !_HighPointColor.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetHighPointColor()
+        {
+            this.HighPointColor = Color.Empty;
+        }
+
+        private Color _LowPointColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets the color of the low point dot on chart.
+        /// </summary>
+        [Category("Columns"), Description("Indicates color of low point dot on chart.")]
+        public Color LowPointColor
+        {
+            get { return _LowPointColor; }
+            set { _LowPointColor = value; OnStyleChanged(); }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeLowPointColor()
+        {
+            return !_LowPointColor.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetLowPointColor()
+        {
+            this.LowPointColor = Color.Empty;
+        }
+
+        private Color _FirstPointColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets the color of the first point dot on chart.
+        /// </summary>
+        [Category("Columns"), Description("Indicates color of first point dot on chart..")]
+        public Color FirstPointColor
+        {
+            get { return _FirstPointColor; }
+            set { _FirstPointColor = value; OnStyleChanged(); }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeFirstPointColor()
+        {
+            return !_FirstPointColor.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetFirstPointColor()
+        {
+            this.FirstPointColor = Color.Empty;
+        }
+
+        private Color _LastPointColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets the color of the last point dot on chart.
+        /// </summary>
+        [Category("Columns"), Description("Indicates color of last point dot on chart.")]
+        public Color LastPointColor
+        {
+            get { return _LastPointColor; }
+            set { _LastPointColor = value; OnStyleChanged(); }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeLastPointColor()
+        {
+            return !_LastPointColor.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetLastPointColor()
+        {
+            this.LastPointColor = Color.Empty;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/MicroCharts/BarBaseMicroChart.cs b/PROMS/DotNetBar Source Code/MicroCharts/BarBaseMicroChart.cs
new file mode 100644
index 00000000..4d5a1fb9
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/MicroCharts/BarBaseMicroChart.cs	
@@ -0,0 +1,41 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.MicroCharts
+{
+    internal abstract class BarBaseMicroChart : MicroChartBase
+    {
+        internal static int HotPointOffset
+        {
+            get { return Dpi.Width4; }
+        }
+        protected virtual Rectangle GetHotPointBounds(Rectangle barBounds, bool isPositiveValue)
+        {
+            Rectangle bounds = Rectangle.Empty;
+            if (isPositiveValue)
+            {
+                bounds = new Rectangle(barBounds.X + (barBounds.Width - HotPointOffset * 2) / 2,
+                    barBounds.Y - HotPointOffset,
+                    HotPointOffset * 2,
+                    HotPointOffset * 2);
+            }
+            else
+            {
+                bounds = new Rectangle(barBounds.X + (barBounds.Width - HotPointOffset * 2) / 2,
+                    barBounds.Bottom - HotPointOffset,
+                    HotPointOffset * 2,
+                    HotPointOffset * 2);
+            }
+            return bounds;
+        }
+
+        private BarMicroChartStyle _Style;
+        public virtual BarMicroChartStyle Style
+        {
+            get { return _Style; }
+            set { _Style = value; }
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/MicroCharts/BarMicroChart.cs b/PROMS/DotNetBar Source Code/MicroCharts/BarMicroChart.cs
new file mode 100644
index 00000000..1de17db4
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/MicroCharts/BarMicroChart.cs	
@@ -0,0 +1,104 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.MicroCharts
+{
+    internal class BarMicroChart : BarBaseMicroChart
+    {
+        public override void CreateChart(MicroChartRenderInfo info)
+        {
+            Graphics graphics = info.Graphics;
+
+            int chartHeight = info.ChartHeight;
+            int chartWidth = info.ChartWidth;
+
+            BarMicroChartStyle style = this.Style;
+            int drawStep = Math.Max(style.MinBarSize, (chartHeight / (Math.Max(1, info.DataPoints.Count))));
+            int dataStep = Math.Max(1, ((info.DataPoints.Count * (drawStep + 1)) / chartHeight));
+            int y = 0;
+            double dataPointMinValue = info.DataPointMinValue;
+
+            if (dataPointMinValue > style.ZeroLineValue)
+                dataPointMinValue = style.ZeroLineValue;
+
+            double range = info.DataPointMaxValue - dataPointMinValue;
+            if (range == 0) range = 1;
+
+            int totalPoints = (int)Math.Ceiling((double)info.DataPoints.Count / dataStep);
+            MicroChartHotPoint[] microHotPoints = new MicroChartHotPoint[totalPoints];
+            int index = 0;
+            int zeroX = Math.Min((int)(chartWidth * (1 - (style.ZeroLineValue - dataPointMinValue) / range)), chartWidth);
+
+            System.Drawing.Drawing2D.SmoothingMode smoothingMode = graphics.SmoothingMode;
+            graphics.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.Default;
+            using (SolidBrush positiveBarBrush = new SolidBrush(style.PositiveBarColor))
+            {
+                using (SolidBrush negativeBarBrush = new SolidBrush(style.NegativeBarColor))
+                {
+                    for (int i = 0; i < info.DataPoints.Count; i += dataStep)
+                    {
+                        double value = info.DataPoints[i];
+                        int x = Math.Min((int)(chartWidth * (1 - (value - dataPointMinValue) / range)), chartWidth - 1);
+                        Rectangle barBounds = Rectangle.Empty;
+                        if (value > style.ZeroLineValue)
+                        {
+                            if (zeroX == chartWidth && x == zeroX) x--;
+                            barBounds = new Rectangle(x, y, Math.Max(1, zeroX - x), drawStep);
+
+                            if (value == info.DataPointMaxValue && !style.HighPointBarColor.IsEmpty)
+                            {
+                                using (SolidBrush brush = new SolidBrush(style.HighPointBarColor))
+                                    graphics.FillRectangle(brush, barBounds);
+                            }
+                            else
+                                graphics.FillRectangle(positiveBarBrush, barBounds);
+
+                            microHotPoints[index] = new MicroChartHotPoint(GetHotPointBounds(barBounds, true), new Rectangle(0, barBounds.Y, chartWidth, barBounds.Height), style.PositiveBarColor, value, index);
+                        }
+                        else
+                        {
+                            barBounds = new Rectangle(zeroX, y, Math.Max(1, x - zeroX), drawStep);
+                            
+                            if (value == info.DataPointMinValue && !style.LowPointBarColor.IsEmpty)
+                            {
+                                using (SolidBrush brush = new SolidBrush(style.LowPointBarColor))
+                                    graphics.FillRectangle(brush, barBounds);
+                            }
+                            else
+                                graphics.FillRectangle(negativeBarBrush, barBounds);
+
+                            microHotPoints[index] = new MicroChartHotPoint(GetHotPointBounds(barBounds, false), new Rectangle(0, barBounds.Y, chartWidth, barBounds.Height), style.NegativeBarColor, value, index);
+                        }
+
+                        index++;
+                        y += drawStep + 1;
+                    }
+                }
+            }
+            graphics.SmoothingMode = smoothingMode;
+            info.MicroChartHotPoints = microHotPoints;
+        }
+
+        protected override Rectangle GetHotPointBounds(Rectangle barBounds, bool isPositiveValue)
+        {
+            Rectangle bounds = Rectangle.Empty;
+            if (isPositiveValue)
+            {
+                bounds = new Rectangle(barBounds.X - HotPointOffset,
+                    barBounds.Y + (barBounds.Height - HotPointOffset * 2) / 2,
+                    HotPointOffset * 2,
+                    HotPointOffset * 2);
+            }
+            else
+            {
+                bounds = new Rectangle(barBounds.Right - HotPointOffset,
+                    barBounds.Y + (barBounds.Height - HotPointOffset * 2) / 2,
+                    HotPointOffset * 2,
+                    HotPointOffset * 2);
+            }
+            return bounds;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/MicroCharts/ColumnMicroChart.cs b/PROMS/DotNetBar Source Code/MicroCharts/ColumnMicroChart.cs
new file mode 100644
index 00000000..5f2665f7
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/MicroCharts/ColumnMicroChart.cs	
@@ -0,0 +1,262 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar.MicroCharts
+{
+    internal class ColumnMicroChart : BarBaseMicroChart
+    {
+        public override void CreateChart(MicroChartRenderInfo info)
+        {
+            Graphics graphics = info.Graphics;
+
+            int chartHeight = info.ChartHeight;
+            int chartWidth = info.ChartWidth;
+
+            BarMicroChartStyle style = this.Style;
+            int drawStep = Math.Max(style.MinBarSize, (chartWidth / (Math.Max(1, info.DataPoints.Count - 1))));
+            int dataStep = Math.Max(1, ((info.DataPoints.Count * drawStep) / chartWidth));
+            int x = 0;
+            double dataPointMinValue = info.DataPointMinValue;
+
+            if (dataPointMinValue > style.ZeroLineValue)
+                dataPointMinValue = style.ZeroLineValue;
+
+            double range = info.DataPointMaxValue - dataPointMinValue;
+            if (range == 0) range = 1;
+
+            int totalPoints = (int)Math.Ceiling((double)info.DataPoints.Count / dataStep);
+            MicroChartHotPoint[] microHotPoints = new MicroChartHotPoint[totalPoints];
+            int index = 0;
+            int zeroY = Math.Min((int)(chartHeight * (1 - (style.ZeroLineValue - dataPointMinValue) / range)), chartHeight);
+
+            System.Drawing.Drawing2D.SmoothingMode smoothingMode = graphics.SmoothingMode;
+            graphics.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.Default;
+            using (SolidBrush positiveBarBrush = new SolidBrush(style.PositiveBarColor))
+            {
+                using (SolidBrush negativeBarBrush = new SolidBrush(style.NegativeBarColor))
+                {
+                    for (int i = 0; i < info.DataPoints.Count; i += dataStep)
+                    {
+                        double value = info.DataPoints[i];
+                        int y = Math.Min((int)(chartHeight * (1 - (value - dataPointMinValue) / range)), chartHeight - 1);
+                        Rectangle barBounds = Rectangle.Empty;
+                        if (value > style.ZeroLineValue)
+                        {
+                            if (zeroY == chartHeight && y == zeroY) y--;
+                            barBounds = new Rectangle(x, y, drawStep, Math.Max(1, zeroY - y));
+                            if (value == info.DataPointMaxValue && !style.HighPointBarColor.IsEmpty)
+                            {
+                                using (SolidBrush brush = new SolidBrush(style.HighPointBarColor))
+                                    graphics.FillRectangle(brush, barBounds);
+                            }
+                            else
+                                graphics.FillRectangle(positiveBarBrush, barBounds);
+                            microHotPoints[index] = new MicroChartHotPoint(GetHotPointBounds(barBounds, true), style.PositiveBarColor, value, index);
+                        }
+                        else
+                        {
+                            barBounds = new Rectangle(x, zeroY, drawStep, Math.Max(1, y - zeroY));
+                            if (value == info.DataPointMinValue && !style.LowPointBarColor.IsEmpty)
+                            {
+                                using (SolidBrush brush = new SolidBrush(style.LowPointBarColor))
+                                    graphics.FillRectangle(brush, barBounds);
+                            }
+                            else
+                                graphics.FillRectangle(negativeBarBrush, barBounds);
+                            microHotPoints[index] = new MicroChartHotPoint(GetHotPointBounds(barBounds, false), style.NegativeBarColor, value, index);
+                        }
+
+                        index++;
+                        x += drawStep;
+                    }
+                }
+            }
+            graphics.SmoothingMode = smoothingMode;
+            info.MicroChartHotPoints = microHotPoints;
+        }
+    }
+
+    /// <summary>
+    /// Defines the style for the bar style micro charts.
+    /// </summary>
+    [System.ComponentModel.ToolboxItem(false), System.ComponentModel.DesignTimeVisible(false), TypeConverter(typeof(System.ComponentModel.ExpandableObjectConverter))]
+    public class BarMicroChartStyle
+    {
+        /// <summary>
+        /// Occurs when style appearance changes.
+        /// </summary>
+        public event EventHandler StyleChanged;
+        /// <summary>
+        /// Raises StyleChanged event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnStyleChanged(EventArgs e)
+        {
+            EventHandler handler = StyleChanged;
+            if (handler != null)
+                handler(this, e);
+        }
+        private void OnStyleChanged()
+        {
+            OnStyleChanged(EventArgs.Empty);
+        }
+
+
+        private int _MinBarWidth = 2;
+        /// <summary>
+        /// Gets or sets the minimum single bar width.
+        /// </summary>
+        [DefaultValue(2), Category("Appearance"), Description("Indicates minimum single bar width.")]
+        public int MinBarSize
+        {
+            get { return _MinBarWidth; }
+            set
+            {
+                _MinBarWidth = value;
+                OnStyleChanged();
+            }
+        }
+
+
+        private Color _PositiveBarColor = Color.Black;
+        /// <summary>
+        /// Gets or sets the color of positive bar value.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates color of positive bar value.")]
+        public Color PositiveBarColor
+        {
+            get { return _PositiveBarColor; }
+            set { _PositiveBarColor = value; OnStyleChanged(); }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializePositiveBarColor()
+        {
+            return _PositiveBarColor != Color.Black;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetPositiveBarColor()
+        {
+            this.PositiveBarColor = Color.Black;
+        }
+
+        private Color _NegativeBarColor = Color.Red;
+        /// <summary>
+        /// Gets or sets the color of negative bar value.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates color of negative bar value.")]
+        public Color NegativeBarColor
+        {
+            get { return _NegativeBarColor; }
+            set { _NegativeBarColor = value; OnStyleChanged(); }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeNegativeBarColor()
+        {
+            return _NegativeBarColor != Color.Red;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetNegativeBarColor()
+        {
+            this.NegativeBarColor = Color.Red;
+        }
+
+        private bool _DrawAverageLine = false;
+        /// <summary>
+        /// Gets or sets whether average line is drawn.
+        /// </summary>
+        [DefaultValue(false), Category("Appearance")]
+        public bool DrawAverageLine
+        {
+            get { return _DrawAverageLine; }
+            set
+            {
+                _DrawAverageLine = value;
+                OnStyleChanged();
+            }
+        }
+
+        private double _ZeroLineValue = 0d;
+        /// <summary>
+        /// Gets or sets the value of the zero line, i.e. pivot point that determines negative and positive values. Default value is 0.
+        /// </summary>
+        [DefaultValue(0d), Category("Appearance"), Description("Indicates value of the zero line, i.e. pivot point that determines negative and positive values.")]
+        public double ZeroLineValue
+        {
+            get { return _ZeroLineValue; }
+            set
+            {
+                _ZeroLineValue = value;
+                OnStyleChanged();
+            }
+        }
+
+        private Color _LowPointBarColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets the color of the lowest value bar on graph.
+        /// </summary>
+        [Category("Columns"), Description("Indicates color of lowest bar on graph.")]
+        public Color LowPointBarColor
+        {
+            get { return _LowPointBarColor; }
+            set { _LowPointBarColor = value; OnStyleChanged(); }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeLowPointBarColor()
+        {
+            return !_LowPointBarColor.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetLowPointBarColor()
+        {
+            this.LowPointBarColor = Color.Empty;
+        }
+
+        private Color _HighPointBarColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets the color of the highest value bar on graph.
+        /// </summary>
+        [Category("Columns"), Description("Indicates color of highest value bar on graph..")]
+        public Color HighPointBarColor
+        {
+            get { return _HighPointBarColor; }
+            set { _HighPointBarColor = value; OnStyleChanged(); }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeHighPointBarColor()
+        {
+            return !_HighPointBarColor.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetHighPointBarColor()
+        {
+            this.HighPointBarColor = Color.Empty;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/MicroCharts/HundredPctBar.cs b/PROMS/DotNetBar Source Code/MicroCharts/HundredPctBar.cs
new file mode 100644
index 00000000..b66d6e62
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/MicroCharts/HundredPctBar.cs	
@@ -0,0 +1,191 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar.MicroCharts
+{
+    internal class HundredPctBar : MicroChartBase
+    {
+        public override void CreateChart(MicroChartRenderInfo info)
+        {
+            int chartHeight = info.ChartHeight;
+            int chartWidth = info.ChartWidth;
+
+            int x = 0;
+            int y = 0;
+
+            HundredPctMicroChartStyle style = this.Style;
+            int drawStep = Math.Max(style.MinBarSize, (chartWidth / (Math.Max(1, info.DataPoints.Count))));
+            int dataStep = Math.Max(1, ((info.DataPoints.Count * drawStep) / chartWidth));
+
+            Graphics graphics = info.Graphics;
+            double sum = info.Sum;
+
+            if (dataStep > 1)
+            {
+                sum = 0;
+                for (int i = 0; i < info.DataPoints.Count; i += dataStep)
+                    sum += Math.Abs(info.DataPoints[i]);
+            }
+
+            int colorsCount = style.BarColors.Count;
+            int sliceColor = 0;
+
+            int totalPoints = (int)Math.Ceiling((double)info.DataPoints.Count / dataStep);
+            MicroChartHotPoint[] microHotPoints = new MicroChartHotPoint[totalPoints];
+            int hotPointIndex = 0;
+            
+            using (Pen pen = new Pen(style.BarOutlineColor, 1))
+            {
+                for (int i = 0; i < info.DataPoints.Count; i += dataStep)
+                {
+                    double value = Math.Abs(info.DataPoints[i]);
+
+                    Rectangle barBounds = new Rectangle(x, y, (int)Math.Round(chartWidth * value / sum), chartHeight);
+
+                    using (SolidBrush brush = new SolidBrush(style.BarColors[sliceColor]))
+                        graphics.FillRectangle(brush, barBounds);
+                    graphics.DrawRectangle(pen, barBounds);
+
+                    microHotPoints[hotPointIndex] = new MicroChartHotPoint(GetHotPointBounds(barBounds), barBounds, style.BarColors[sliceColor], value, i);
+
+                    hotPointIndex++;
+                    
+                    x += barBounds.Width;
+
+                    sliceColor++;
+                    if (sliceColor >= colorsCount)
+                        sliceColor = 0;
+                }
+                
+            }
+
+            info.MicroChartHotPoints = microHotPoints;
+        }
+
+        private HundredPctMicroChartStyle _Style;
+        public virtual HundredPctMicroChartStyle Style
+        {
+            get { return _Style; }
+            set { _Style = value; }
+        }
+
+        private static int HotPointOffset
+        {
+            get { return Dpi.Width4; }
+        }
+        private Rectangle GetHotPointBounds(Rectangle barBounds)
+        {
+            return new Rectangle(barBounds.X + (barBounds.Width - HotPointOffset * 2) / 2,
+                barBounds.Y + (barBounds.Height - HotPointOffset * 2) / 2,
+                HotPointOffset * 2, HotPointOffset * 2);
+        }
+    }
+
+    /// <summary>
+    /// Defines the style for 100% bar chart.
+    /// </summary>
+    [System.ComponentModel.ToolboxItem(false), System.ComponentModel.DesignTimeVisible(false), TypeConverter(typeof(System.ComponentModel.ExpandableObjectConverter))]
+    public class HundredPctMicroChartStyle
+    {
+        private List<Color> _BarColors = new List<Color>();
+        /// <summary>
+        /// Initializes a new instance of the PieMicroChartStyle class.
+        /// </summary>
+        public HundredPctMicroChartStyle()
+        {
+            _BarColors.AddRange(new Color[]{ColorScheme.GetColor(0xC00000), ColorScheme.GetColor(0xFF0000), 
+                ColorScheme.GetColor(0xFFC000), ColorScheme.GetColor(0xFFFF00), ColorScheme.GetColor(0x92D050),
+                ColorScheme.GetColor(0x00B050), ColorScheme.GetColor(0x00B0F0), ColorScheme.GetColor(0x0070C0),
+                ColorScheme.GetColor(0x002060), ColorScheme.GetColor(0x7030A0), ColorScheme.GetColor(0xEEECE1),
+                ColorScheme.GetColor(0x1F497D), ColorScheme.GetColor(0x4F81BD), ColorScheme.GetColor(0xC0504D),
+                ColorScheme.GetColor(0x9BBB59), ColorScheme.GetColor(0x8064A2), ColorScheme.GetColor(0x4BACC6),
+                ColorScheme.GetColor(0xF79646), ColorScheme.GetColor(0xF2F2F2), ColorScheme.GetColor(0xDDD9C3),
+                ColorScheme.GetColor(0xC6D9F0), ColorScheme.GetColor(0xF2DCDB), ColorScheme.GetColor(0xEBF1DD),
+                ColorScheme.GetColor(0xE5E0EC), ColorScheme.GetColor(0xDBEEF3), ColorScheme.GetColor(0xFDEADA),
+                ColorScheme.GetColor(0xD8D8D8), ColorScheme.GetColor(0xC4BD97), ColorScheme.GetColor(0x8DB3E2),
+                ColorScheme.GetColor(0xE5B9B7), ColorScheme.GetColor(0xD7E3BC), ColorScheme.GetColor(0xCCC1D9),
+                ColorScheme.GetColor(0xB7DDE8), ColorScheme.GetColor(0xFBD5B5), ColorScheme.GetColor(0xBFBFBF),
+                ColorScheme.GetColor(0x938953), ColorScheme.GetColor(0x548DD4), ColorScheme.GetColor(0x95B3D7),
+                ColorScheme.GetColor(0xD99694), ColorScheme.GetColor(0xC3D69B), ColorScheme.GetColor(0xB2A1C7),
+                ColorScheme.GetColor(0x92CDDC), ColorScheme.GetColor(0xFAC08F), ColorScheme.GetColor(0xA5A5A5),
+                ColorScheme.GetColor(0x494429), ColorScheme.GetColor(0x17365D), ColorScheme.GetColor(0x366092),
+                ColorScheme.GetColor(0x953734), ColorScheme.GetColor(0x76923C), ColorScheme.GetColor(0x5F497A),
+                ColorScheme.GetColor(0x31859B), ColorScheme.GetColor(0xE36C09)
+            });
+        }
+
+        /// <summary>
+        /// Occurs when style appearance changes.
+        /// </summary>
+        public event EventHandler StyleChanged;
+        /// <summary>
+        /// Raises StyleChanged event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnStyleChanged(EventArgs e)
+        {
+            EventHandler handler = StyleChanged;
+            if (handler != null)
+                handler(this, e);
+        }
+        private void OnStyleChanged()
+        {
+            OnStyleChanged(EventArgs.Empty);
+        }
+
+        private int _MinBarWidth = 2;
+        /// <summary>
+        /// Gets or sets the minimum single bar width.
+        /// </summary>
+        [DefaultValue(2), Category("Appearance"), Description("Indicates minimum single bar width.")]
+        public int MinBarSize
+        {
+            get { return _MinBarWidth; }
+            set
+            {
+                _MinBarWidth = value;
+                OnStyleChanged();
+            }
+        }
+
+        /// <summary>
+        /// Gets the pre-defined slice colors for the pie chart.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public List<Color> BarColors
+        {
+            get { return _BarColors; }
+        }
+
+        private Color _BarOutlineColor = ColorScheme.GetColor(0xE2E4E7);
+        /// <summary>
+        /// Gets or sets the color of the slice outline.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates color of slice outline.")]
+        public Color BarOutlineColor
+        {
+            get { return _BarOutlineColor; }
+            set { _BarOutlineColor = value; OnStyleChanged(); }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeBarOutlineColor()
+        {
+            return _BarOutlineColor != ColorScheme.GetColor(0xE2E4E7);
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetBarOutlineColor()
+        {
+            this.BarOutlineColor = ColorScheme.GetColor(0xE2E4E7);
+        }
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/MicroCharts/LineMicroChart.cs b/PROMS/DotNetBar Source Code/MicroCharts/LineMicroChart.cs
new file mode 100644
index 00000000..03739858
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/MicroCharts/LineMicroChart.cs	
@@ -0,0 +1,596 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar.MicroCharts
+{
+    internal class LineMicroChart : MicroChartBase
+    {
+        public override void CreateChart(MicroChartRenderInfo info)
+        {
+            Graphics graphics = info.Graphics;
+
+            int pointRadius = Dpi.Width(PointRadius);
+            int chartHeight = info.ChartHeight - pointRadius * 2;
+            int chartWidth = info.ChartWidth - pointRadius * 2;
+
+            int drawStep = (int)Math.Max(1, chartWidth / (Math.Max(1, info.DataPoints.Count - 1)));
+            int dataStep = Math.Max(1, ((info.DataPoints.Count * drawStep) / chartWidth));
+            if (info.DataPoints.Count <= 2) dataStep = 1;
+            int x = pointRadius;
+            double dataPointMinValue = info.DataPointMinValue;
+            double dataPointMaxValue = info.DataPointMaxValue;
+
+            if (_MicroChartStyle.DrawZeroLine && dataPointMinValue > _MicroChartStyle.ZeroLineValue)
+                dataPointMinValue = _MicroChartStyle.ZeroLineValue;
+            if (_MicroChartStyle.DrawControlLine1)
+            {
+                if (dataPointMinValue > _MicroChartStyle.ControlLine1StartValue)
+                    dataPointMinValue = _MicroChartStyle.ControlLine1StartValue;
+                if (dataPointMinValue > _MicroChartStyle.ControlLine1EndValue)
+                    dataPointMinValue = _MicroChartStyle.ControlLine1EndValue;
+                if (dataPointMaxValue < _MicroChartStyle.ControlLine1StartValue)
+                    dataPointMaxValue = _MicroChartStyle.ControlLine1StartValue;
+                if (dataPointMaxValue < _MicroChartStyle.ControlLine1EndValue)
+                    dataPointMaxValue = _MicroChartStyle.ControlLine1EndValue;
+            }
+            if (_MicroChartStyle.DrawControlLine2)
+            {
+                if (dataPointMinValue > _MicroChartStyle.ControlLine2StartValue)
+                    dataPointMinValue = _MicroChartStyle.ControlLine2StartValue;
+                if (dataPointMinValue > _MicroChartStyle.ControlLine2EndValue)
+                    dataPointMinValue = _MicroChartStyle.ControlLine2EndValue;
+                if (dataPointMaxValue < _MicroChartStyle.ControlLine2StartValue)
+                    dataPointMaxValue = _MicroChartStyle.ControlLine2StartValue;
+                if (dataPointMaxValue < _MicroChartStyle.ControlLine2EndValue)
+                    dataPointMaxValue = _MicroChartStyle.ControlLine2EndValue;
+            }
+
+            
+            double range = dataPointMaxValue - dataPointMinValue;
+            if (range == 0) range = 1;
+
+            int totalPoints = (int)Math.Ceiling((double)info.DataPoints.Count / dataStep);
+            Point[] chartPoints = new Point[totalPoints];
+            MicroChartHotPoint[] microHotPoints = new MicroChartHotPoint[totalPoints];
+            Point lowPoint = Point.Empty, highPoint = Point.Empty;
+            int index = 0;
+            for (int i = 0; i < info.DataPoints.Count; i += dataStep)
+            {
+                double value = info.DataPoints[i];
+                Point p = new Point(x, (int)Math.Min((int)(chartHeight * (1 - (value - dataPointMinValue) / range)), chartHeight - 1) + pointRadius);
+                if (lowPoint.IsEmpty && value == info.DataPointMinValue)
+                    lowPoint = p;
+                else if (/*highPoint.IsEmpty &&*/ value == dataPointMaxValue)
+                    highPoint = p;
+
+                chartPoints[index] = p;
+                microHotPoints[index] = new MicroChartHotPoint(GetHotPointBounds(p, info), new Rectangle(p.X - drawStep / 2, 0, drawStep, chartHeight), _MicroChartStyle.LineColor, value, index);
+                index++;
+                x += drawStep;
+                if (x > chartWidth || i >= info.DataPoints.Count - dataStep * 2) x = chartWidth;
+            }
+
+            if (_MicroChartStyle.DrawAverageLine && !_MicroChartStyle.AverageLineColor.IsEmpty)
+            {
+                using (Pen pen = new Pen(_MicroChartStyle.AverageLineColor, Dpi.Width1))
+                    graphics.DrawLine(pen, 0, chartHeight / 2, chartWidth, chartHeight / 2);
+            }
+
+            //if (_MicroChartStyle.DrawTrendLine && !_MicroChartStyle.TrendLineColor.IsEmpty)
+            //{
+            //    using (Pen pen = new Pen(_MicroChartStyle.TrendLineColor))
+            //        graphics.DrawLine(pen, 0, (int)(chartHeight * (1 - (info.TrendInfo.Start - dataPointMinValue) / range)),
+            //            chartWidth, (int)(chartHeight * (1 - (info.TrendInfo.End - dataPointMinValue) / range)));
+            //}
+
+            if (_MicroChartStyle.DrawZeroLine && !_MicroChartStyle.ZeroLineColor.IsEmpty)
+            {
+                using (Pen pen = new Pen(_MicroChartStyle.ZeroLineColor, Dpi.Width1))
+                {
+                    int y = Math.Min((int)(chartHeight * (1 - (_MicroChartStyle.ZeroLineValue - dataPointMinValue) / range)) + pointRadius, (chartHeight + pointRadius) - 1);
+                    if (y < 0) y = 0;
+                    graphics.DrawLine(pen, 0, y, chartWidth, y);
+                }
+            }
+
+            if (_MicroChartStyle.DrawControlLine1 && !_MicroChartStyle.ControlLine1Color.IsEmpty)
+            {
+                using (Pen pen = new Pen(_MicroChartStyle.ControlLine1Color, Dpi.Width1))
+                {
+                    int y1 = Math.Min((int)(chartHeight * (1 - (_MicroChartStyle.ControlLine1StartValue - dataPointMinValue) / range)) + pointRadius, (chartHeight + pointRadius) - 1);
+                    if (y1 < 0) y1 = 0;
+                    int y2 = Math.Min((int)(chartHeight * (1 - (_MicroChartStyle.ControlLine1EndValue - dataPointMinValue) / range)) + pointRadius, (chartHeight + pointRadius) - 1);
+                    if (y2 < 0) y2 = 0;
+                    graphics.DrawLine(pen, 0, y1, chartWidth, y2);
+                }
+            }
+            if (_MicroChartStyle.DrawControlLine2 && !_MicroChartStyle.ControlLine2Color.IsEmpty)
+            {
+                using (Pen pen = new Pen(_MicroChartStyle.ControlLine2Color, Dpi.Width1))
+                {
+                    int y1 = Math.Min((int)(chartHeight * (1 - (_MicroChartStyle.ControlLine2StartValue - dataPointMinValue) / range)) + pointRadius, (chartHeight + pointRadius) - 1);
+                    if (y1 < 0) y1 = 0;
+                    int y2 = Math.Min((int)(chartHeight * (1 - (_MicroChartStyle.ControlLine2EndValue - dataPointMinValue) / range)) + pointRadius, (chartHeight + pointRadius) - 1);
+                    if (y2 < 0) y2 = 0;
+                    graphics.DrawLine(pen, 0, y1, chartWidth, y2);
+                }
+            }
+
+            if (chartPoints.Length > 1)
+            {
+                using (Pen pen = new Pen(_MicroChartStyle.LineColor, Dpi.Width1))
+                    graphics.DrawLines(pen, chartPoints);
+            }
+
+            if (!lowPoint.IsEmpty && !_MicroChartStyle.LowPointColor.IsEmpty && chartPoints.Length > 0)
+            {
+                using (SolidBrush brush = new SolidBrush(_MicroChartStyle.LowPointColor))
+                    graphics.FillPolygon(brush, GetChartPointBounds(lowPoint));
+            }
+
+            if (!highPoint.IsEmpty && !_MicroChartStyle.HighPointColor.IsEmpty && chartPoints.Length > 0)
+            {
+                using (SolidBrush brush = new SolidBrush(_MicroChartStyle.HighPointColor))
+                    graphics.FillPolygon(brush, GetChartPointBounds(highPoint));
+            }
+
+            if (!_MicroChartStyle.FirstPointColor.IsEmpty && chartPoints.Length > 0)
+            {
+                using (SolidBrush brush = new SolidBrush(_MicroChartStyle.FirstPointColor))
+                    graphics.FillPolygon(brush, GetChartPointBounds(chartPoints[0]));
+            }
+
+            if (!_MicroChartStyle.LastPointColor.IsEmpty && chartPoints.Length > 1)
+            {
+                using (SolidBrush brush = new SolidBrush(_MicroChartStyle.LastPointColor))
+                    graphics.FillPolygon(brush, GetChartPointBounds(chartPoints[chartPoints.Length - 1]));
+            }
+
+            info.MicroChartHotPoints = microHotPoints;
+
+        }
+
+        private static int HotPointOffset
+        {
+            get { return Dpi.Width4; }
+        }
+        private Rectangle GetHotPointBounds(Point hotPoint, MicroChartRenderInfo info)
+        {
+            //Rectangle bounds = new Rectangle(Math.Min(info.ChartWidth - HotPointOffset * 2, Math.Max(-1, hotPoint.X - HotPointOffset)),
+            //    Math.Min(info.ChartHeight - HotPointOffset * 2, Math.Max(-1, hotPoint.Y - HotPointOffset)),
+            //    HotPointOffset * 2,
+            //    HotPointOffset * 2);
+            Rectangle bounds = new Rectangle(hotPoint.X - HotPointOffset,
+                hotPoint.Y - HotPointOffset,
+                HotPointOffset * 2,
+                HotPointOffset * 2);
+            return bounds;
+        }
+
+        private LineMicroChartStyle _MicroChartStyle;
+        public LineMicroChartStyle Style
+        {
+            get { return _MicroChartStyle; }
+            set { _MicroChartStyle = value; }
+        }
+    }
+
+    /// <summary>
+    /// Defines the style for the line micro chart.
+    /// </summary>
+    [System.ComponentModel.ToolboxItem(false), System.ComponentModel.DesignTimeVisible(false), TypeConverter(typeof(System.ComponentModel.ExpandableObjectConverter))]
+    public class LineMicroChartStyle
+    {
+        private Color _LineColor = Color.Black;
+        /// <summary>
+        /// Gets or sets the color of the chart line.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates color of chart line .")]
+        public Color LineColor
+        {
+            get { return _LineColor; }
+            set { _LineColor = value; OnStyleChanged(); }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeLineColor()
+        {
+            return _LineColor != Color.Black;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetLineColor()
+        {
+            this.LineColor = Color.Black;
+        }
+
+        private bool _DrawAverageLine = false;
+        /// <summary>
+        /// Gets or sets whether average line is drawn.
+        /// </summary>
+        [DefaultValue(false), Category("Appearance")]
+        public bool DrawAverageLine
+        {
+            get { return _DrawAverageLine; }
+            set
+            {
+                _DrawAverageLine = value;
+                OnStyleChanged();
+            }
+        }
+
+        private Color _AverageLineColor = ColorScheme.GetColor(0xFAC08F);
+        /// <summary>
+        /// Gets or sets the color of the 
+        /// </summary>
+        [Category("Columns"), Description("Indicates color of.")]
+        public Color AverageLineColor
+        {
+            get { return _AverageLineColor; }
+            set { _AverageLineColor = value; OnStyleChanged(); }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeAverageLineColor()
+        {
+            return _AverageLineColor != ColorScheme.GetColor(0xFAC08F);
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetAverageLineColor()
+        {
+            this.AverageLineColor = ColorScheme.GetColor(0xFAC08F);
+        }
+
+        //private bool _DrawTrendLine = false;
+        //[DefaultValue(false), Category("Appearance")]
+        //public bool DrawTrendLine
+        //{
+        //    get { return _DrawTrendLine; }
+        //    set
+        //    {
+        //        _DrawTrendLine = value;
+        //    }
+        //}
+
+        //private Color _TrendLineColor = ColorScheme.GetColor(0xBFBFBF);
+        ///// <summary>
+        ///// Gets or sets the color of the trend line.
+        ///// </summary>
+        //[Category("Columns"), Description("Indicates color of trend line.")]
+        //public Color TrendLineColor
+        //{
+        //    get { return _TrendLineColor; }
+        //    set { _TrendLineColor = value; }
+        //}
+        ///// <summary>
+        ///// Gets whether property should be serialized.
+        ///// </summary>
+        //[EditorBrowsable(EditorBrowsableState.Never)]
+        //public bool ShouldSerializeTrendLineColor()
+        //{
+        //    return !_TrendLineColor.IsEmpty;
+        //}
+        ///// <summary>
+        ///// Resets property to its default value.
+        ///// </summary>
+        //[EditorBrowsable(EditorBrowsableState.Never)]
+        //public void ResetTrendLineColor()
+        //{
+        //    this.TrendLineColor = Color.Empty;
+        //}
+
+        private bool _DrawZeroLine = true;
+        /// <summary>
+        /// Gets or sets whether zero-line is drawn on chart.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance"), Description("Gets or sets whether zero-line is drawn on chart.")]
+        public bool DrawZeroLine
+        {
+            get { return _DrawZeroLine; }
+            set
+            {
+                _DrawZeroLine = value;
+                OnStyleChanged();
+            }
+        }
+
+        private double _ZeroLineValue = 0d;
+        /// <summary>
+        /// Gets or sets the value of the zero line, i.e. where zero line is drawn. Default value is 0.
+        /// </summary>
+        [DefaultValue(0d), Category("Appearance"), Description("Indicates value of the zero line, i.e. where zero line is drawn.")]
+        public double ZeroLineValue
+        {
+            get { return _ZeroLineValue; }
+            set
+            {
+                _ZeroLineValue = value;
+                OnStyleChanged();
+            }
+        }
+
+        private Color _ZeroLineColor = Color.Red;
+        /// <summary>
+        /// Gets or sets the color of the 
+        /// </summary>
+        [Category("Columns"), Description("Indicates color of.")]
+        public Color ZeroLineColor
+        {
+            get { return _ZeroLineColor; }
+            set { _ZeroLineColor = value; OnStyleChanged(); }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeZeroLineColor()
+        {
+            return _ZeroLineColor != Color.Red;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetZeroLineColor()
+        {
+            this.ZeroLineColor = Color.Red;
+        }
+
+        /// <summary>
+        /// Occurs when style appearance changes.
+        /// </summary>
+        public event EventHandler StyleChanged;
+        /// <summary>
+        /// Raises StyleChanged event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnStyleChanged(EventArgs e)
+        {
+            EventHandler handler = StyleChanged;
+            if (handler != null)
+                handler(this, e);
+        }
+        private void OnStyleChanged()
+        {
+            OnStyleChanged(EventArgs.Empty);
+        }
+
+        private Color _HighPointColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets the color of the high point dot on chart.
+        /// </summary>
+        [Category("Columns"), Description("Indicates color of high point dot on chart..")]
+        public Color HighPointColor
+        {
+            get { return _HighPointColor; }
+            set { _HighPointColor = value; OnStyleChanged(); }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeHighPointColor()
+        {
+            return !_HighPointColor.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetHighPointColor()
+        {
+            this.HighPointColor = Color.Empty;
+        }
+
+        private Color _LowPointColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets the color of the low point dot on chart.
+        /// </summary>
+        [Category("Columns"), Description("Indicates color of low point dot on chart.")]
+        public Color LowPointColor
+        {
+            get { return _LowPointColor; }
+            set { _LowPointColor = value; OnStyleChanged(); }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeLowPointColor()
+        {
+            return !_LowPointColor.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetLowPointColor()
+        {
+            this.LowPointColor = Color.Empty;
+        }
+
+        private Color _FirstPointColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets the color of the first point dot on chart.
+        /// </summary>
+        [Category("Columns"), Description("Indicates color of first point dot on chart..")]
+        public Color FirstPointColor
+        {
+            get { return _FirstPointColor; }
+            set { _FirstPointColor = value; OnStyleChanged(); }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeFirstPointColor()
+        {
+            return !_FirstPointColor.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetFirstPointColor()
+        {
+            this.FirstPointColor = Color.Empty;
+        }
+
+        private Color _LastPointColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets the color of the last point dot on chart.
+        /// </summary>
+        [Category("Columns"), Description("Indicates color of last point dot on chart.")]
+        public Color LastPointColor
+        {
+            get { return _LastPointColor; }
+            set { _LastPointColor = value; OnStyleChanged(); }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeLastPointColor()
+        {
+            return !_LastPointColor.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetLastPointColor()
+        {
+            this.LastPointColor = Color.Empty;
+        }
+
+        private bool _DrawControlLine1 = false;
+        /// <summary>
+        /// Gets or sets whether control line is drawn. Default value is false. Control lines can be used to display for example low and high control bounds for the chart.
+        /// </summary>
+        [DefaultValue(false), Description("Indicates whether control line is drawn. Control lines can be used to display for example low and high control bounds for the chart")]
+        public bool DrawControlLine1
+        {
+            get { return _DrawControlLine1; }
+            set { _DrawControlLine1 = value; OnStyleChanged(); }
+        }
+
+        private Color _ControlLine1Color = Color.Empty;
+        /// <summary>
+        /// Gets or sets the color of the first control line.
+        /// </summary>
+        [Category("Columns"), Description("Indicates color of.")]
+        public  Color ControlLine1Color
+        {
+        	get {	return _ControlLine1Color; }
+            set { _ControlLine1Color = value; OnStyleChanged(); }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeControlLine1Color()
+        {
+            return !_ControlLine1Color.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetControlLine1Color()
+        {
+            this.ControlLine1Color = Color.Empty;
+        }
+        private double _ControlLine1StartValue = 0d;
+        /// <summary>
+        /// Gets or sets starting value that is used to draw first control line.
+        /// </summary>
+        [DefaultValue(0d), Description("Indicates the starting value that is used to draw first control line.")]
+        public double ControlLine1StartValue
+        {
+        	get {	return _ControlLine1StartValue; }
+            set { _ControlLine1StartValue = value; OnStyleChanged(); }
+        }
+        private double _ControlLine1EndValue = 0d;
+        /// <summary>
+        /// Gets or sets end value that is used to draw first control line.
+        /// </summary>
+        [DefaultValue(0d), Description("Indicates the end value that is used to draw first control line.")]
+        public double ControlLine1EndValue
+        {
+        	get {	return _ControlLine1EndValue; }
+            set { _ControlLine1EndValue = value; OnStyleChanged(); }
+        }
+
+
+        private bool _DrawControlLine2 = false;
+        /// <summary>
+        /// Gets or sets whether control line is drawn. Default value is false. Control lines can be used to display for example low and high control bounds for the chart.
+        /// </summary>
+        [DefaultValue(false), Description("Indicates whether control line is drawn. Control lines can be used to display for example low and high control bounds for the chart")]
+        public bool DrawControlLine2
+        {
+            get { return _DrawControlLine2; }
+            set { _DrawControlLine2 = value; OnStyleChanged(); }
+        }
+
+        private Color _ControlLine2Color = Color.Empty;
+        /// <summary>
+        /// Gets or sets the color of the second control line.
+        /// </summary>
+        [Category("Columns"), Description("Indicates color of second control line.")]
+        public Color ControlLine2Color
+        {
+            get { return _ControlLine2Color; }
+            set { _ControlLine2Color = value; OnStyleChanged(); }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeControlLine2Color()
+        {
+            return !_ControlLine2Color.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetControlLine2Color()
+        {
+            this.ControlLine2Color = Color.Empty;
+        }
+        private double _ControlLine2StartValue = 0d;
+        /// <summary>
+        /// Gets or sets starting value that is used to draw second control line.
+        /// </summary>
+        [DefaultValue(0d), Description("Indicates the starting value that is used to draw first second line.")]
+        public double ControlLine2StartValue
+        {
+            get { return _ControlLine2StartValue; }
+            set { _ControlLine2StartValue = value; OnStyleChanged(); }
+        }
+        private double _ControlLine2EndValue = 0d;
+        /// <summary>
+        /// Gets or sets end value that is used to draw second control line.
+        /// </summary>
+        [DefaultValue(0d), Description("Indicates the end value that is used to draw second control line.")]
+        public double ControlLine2EndValue
+        {
+            get { return _ControlLine2EndValue; }
+            set { _ControlLine2EndValue = value; OnStyleChanged(); }
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/MicroCharts/MicroChart.cs b/PROMS/DotNetBar Source Code/MicroCharts/MicroChart.cs
new file mode 100644
index 00000000..45d263cd
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/MicroCharts/MicroChart.cs	
@@ -0,0 +1,546 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Drawing.Text;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.MicroCharts;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represents Micro-Chart Control.
+    /// </summary>
+    [ToolboxBitmap(typeof(MicroChart), "MicroCharts.MicroChart.ico"), ToolboxItem(true), DefaultEvent("Click"), Designer("DevComponents.DotNetBar.Design.MicroChartDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf"), System.Runtime.InteropServices.ComVisible(false)]
+    public class MicroChart : BaseItemControl, ICommandSource
+    {
+        #region Events
+
+        #endregion
+
+        #region Constructor
+        private MicroChartItem _MicroChart = null;
+        /// <summary>
+        /// Initializes a new instance of the MicroChart class.
+        /// </summary>
+        public MicroChart()
+        {
+            this.SetStyle(ControlStyles.Selectable, false);
+            _MicroChart = new MicroChartItem();
+            _MicroChart.TextVisible = false;
+            _MicroChart.MouseOverDataPointChanged += new EventHandler(MicroChartMouseOverDataPointChanged);
+            this.HostItem = _MicroChart;
+        }
+        #endregion
+
+        #region Implementation
+        protected override void OnHandleCreated(EventArgs e)
+        {
+            this.RecalcLayout();
+            base.OnHandleCreated(e);
+        }
+        /// <summary>
+        /// Forces the button to perform internal layout.
+        /// </summary>
+        public override void RecalcLayout()
+        {
+            if (_MicroChart == null) return;
+            Rectangle bounds = this.ClientRectangle;
+            bounds.Inflate(-4, -4);
+            if (bounds.Width < 4) bounds.Width = 4;
+            if (bounds.Height < 4) bounds.Height = 4;
+            _MicroChart.Bounds = bounds;
+            _MicroChart.ChartHeight = bounds.Height;
+            _MicroChart.ChartWidth = bounds.Width;
+
+            base.RecalcLayout();
+        }
+
+        protected override Size DefaultSize
+        {
+            get
+            {
+                return new Size(96, 24);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether mouse over tooltip for data point is enabled. Default value is true.
+        /// </summary>
+        [Category("Behavior"), DefaultValue(true), Description("Indicates whether mouse over tooltip for data point is enabled")]
+        public bool MouseOverDataPointTooltipEnabled
+        {
+            get { return _MicroChart.MouseOverDataPointTooltipEnabled; }
+            set
+            {
+                _MicroChart.MouseOverDataPointTooltipEnabled = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the index of data point (DataPoints collection) that mouse is over or returns -1 if mouse is not over any data-point.
+        /// </summary>
+        [Browsable(false)]
+        public int MouseOverDataPointIndex
+        {
+            get
+            {
+                return _MicroChart.MouseOverDataPointIndex;
+            }
+        }
+
+        private void MicroChartMouseOverDataPointChanged(object sender, EventArgs e)
+        {
+            OnMouseOverDataPointChanged(e);
+        }
+        /// <summary>
+        /// Occurs when MouseOverDataPointIndex property changes due to user moving the mouse and pointing it to different data point on chart.
+        /// </summary>
+        public event EventHandler MouseOverDataPointChanged;
+        /// <summary>
+        /// Raises MouseOverDataPointChanged event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnMouseOverDataPointChanged(EventArgs e)
+        {
+            EventHandler handler = MouseOverDataPointChanged;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        /// <summary>
+        /// Gets or sets the tooltips for each data-point assigned through DataPoints property. If not set control will automatically 
+        /// show tooltip based on the data-point value.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public List<string> DataPointTooltips
+        {
+            get { return _MicroChart.DataPointTooltips; }
+            set
+            {
+                _MicroChart.DataPointTooltips = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the chart data points. Note that if you are adding or removing points directly from this collection you must call
+        /// Refresh() method on the control to refresh the display.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public List<double> DataPoints
+        {
+            get { return _MicroChart.DataPoints; }
+            set
+            {
+                if (value != _MicroChart.DataPoints)
+                {
+                    List<double> oldValue = _MicroChart.DataPoints;
+                    _MicroChart.DataPoints = value;
+                    OnDataPointsChanged(oldValue, value);
+                }
+            }
+        }
+        private void OnDataPointsChanged(List<double> oldValue, List<double> newValue)
+        {
+        }
+
+        /// <summary>
+        /// Gets or sets the format string for the value when it is displayed as tool-tip for data point.
+        /// </summary>
+        [DefaultValue(""), Category("Appearance"), Description("Indicates format string for the value when it is displayed as tool-tip for data point.")]
+        public string TooltipValueFormatString
+        {
+            get { return _MicroChart.TooltipValueFormatString; }
+            set
+            {
+                _MicroChart.TooltipValueFormatString = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether chart is tracking mouse movement to show data-point and its value on tooltip. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether chart is tracking mouse movement to show data-point and its value on tooltip.")]
+        public bool TrackChartPoints
+        {
+            get { return _MicroChart.TrackChartPoints; }
+            set
+            {
+                _MicroChart.TrackChartPoints = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether transition animation between same chart with different data-points is enabled. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates  whether transition animation between same chart with different data-points is enabled.")]
+        public bool AnimationEnabled
+        {
+            get { return _MicroChart.AnimationEnabled; }
+            set
+            {
+                _MicroChart.AnimationEnabled = value;
+            }
+        }
+        internal bool IsAnimationEnabled
+        {
+            get
+            {
+                if (this.DesignMode || NativeFunctions.IsTerminalSession())
+                    return false;
+                return true;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether button like mouse over tracking is enabled for whole control. When enabled control looks like a button when mouse is over it. Default value is false.
+        /// </summary>
+        [DefaultValue(false), Category("Behavior"), Description("Indicates whether button like mouse over tracking is enabled for whole control. When enabled control looks like a button when mouse is over it.")]
+        public bool MouseOverEnabled
+        {
+            get { return _MicroChart.MouseOverEnabled; }
+            set
+            {
+                _MicroChart.MouseOverEnabled = value;
+            }
+        }
+
+        /// <summary>
+        /// Invalidates the chart display and requests the re-paint.
+        /// </summary>
+        /// <param name="animateTransition">Indicates whether to animate transition to new chart</param>
+        public void InvalidateChart(bool animateTransition)
+        {
+            _MicroChart.InvalidateChart(animateTransition);
+        }
+
+        /// <summary>
+        /// Gets the style used to customize appearance of Line micro-chart.
+        /// </summary>
+        [Category("Style"), Description("Identifies style used to customize appearance of Line micro-chart."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public LineMicroChartStyle LineChartStyle
+        {
+            get
+            {
+                return _MicroChart.LineChartStyle;
+            }
+        }
+
+        /// <summary>
+        /// Gets the style used to customize appearance of Plot micro-chart.
+        /// </summary>
+        [Category("Style"), Description("Identifies style used to customize appearance of Plot micro-chart."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public PlotMicroChartStyle PlotChartStyle
+        {
+            get
+            {
+                return _MicroChart.PlotChartStyle;
+            }
+        }
+
+        /// <summary>
+        /// Gets the style used to customize appearance of Column micro-chart.
+        /// </summary>
+        [Category("Style"), Description("Identifies style used to customize appearance of Column micro-chart."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public BarMicroChartStyle ColumnChartStyle
+        {
+            get
+            {
+                return _MicroChart.ColumnChartStyle;
+            }
+        }
+
+        /// <summary>
+        /// Gets the style used to customize appearance of Bar micro-chart.
+        /// </summary>
+        [Category("Style"), Description("Identifies style used to customize appearance of Bar micro-chart."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public BarMicroChartStyle BarChartStyle
+        {
+            get
+            {
+                return _MicroChart.BarChartStyle;
+            }
+        }
+
+        /// <summary>
+        /// Gets the style used to customize appearance of Win-Lose micro-chart.
+        /// </summary>
+        [Category("Style"), Description("Identifies style used to customize appearance of Win-Lose micro-chart."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public BarMicroChartStyle WinLoseChartStyle
+        {
+            get
+            {
+                return _MicroChart.WinLoseChartStyle;
+            }
+        }
+
+        /// <summary>
+        /// Gets the style used to customize appearance of Pie micro-chart.
+        /// </summary>
+        [Category("Style"), Description("Identifies style used to customize appearance of Pie micro-chart."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public PieMicroChartStyle PieChartStyle
+        {
+            get
+            {
+                return _MicroChart.PieChartStyle;
+            }
+        }
+
+        /// <summary>
+        /// Gets the style used to customize appearance of Area micro-chart.
+        /// </summary>
+        [Category("Style"), Description("Identifies style used to customize appearance of Area micro-chart."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public AreaMicroChartStyle AreaChartStyle
+        {
+            get
+            {
+                return _MicroChart.AreaChartStyle;
+            }
+        }
+
+        /// <summary>
+        /// Gets the style used to customize appearance of 100% micro-chart.
+        /// </summary>
+        [Category("Style"), Description("Identifies style used to customize appearance of 100% micro-chart."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public HundredPctMicroChartStyle HundredPctChartStyle
+        {
+            get
+            {
+                return _MicroChart.HundredPctChartStyle;
+            }
+        }
+
+        ///// <summary>
+        ///// Gets or sets the width of the chart part of the control.
+        ///// </summary>
+        //[DefaultValue(54), Category("Appearance"), Description("Indicates width of the chart part of the control.")]
+        //public int ChartWidth
+        //{
+        //    get { return _MicroChart.ChartWidth; }
+        //    set
+        //    {
+        //        _MicroChart.ChartWidth = value;
+        //    }
+        //}
+
+        ///// <summary>
+        ///// Gets or sets the height of the chart part of the control.
+        ///// </summary>
+        //[DefaultValue(15), Category("Appearance"), Description("Indicates height of the chart part of the control.")]
+        //public int ChartHeight
+        //{
+        //    get { return _MicroChart.ChartHeight; }
+        //    set
+        //    {
+        //        _MicroChart.ChartHeight = value;
+        //    }
+        //}
+
+        /// <summary>
+        /// Gets or sets the type of the chart rendered.
+        /// </summary>
+        [DefaultValue(eMicroChartType.Line), Category("Appearance"), Description("Indicates type of the chart rendered.")]
+        public eMicroChartType ChartType
+        {
+            get { return _MicroChart.ChartType; }
+            set
+            {
+                _MicroChart.ChartType = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the maximum value for data points. By default maximum data point is calculated based on that data displayed by the chart, but when
+        /// two charts need to be scaled the same setting maximum and minimum values for them will ensure that scales are visually the same.
+        /// </summary>
+        [DefaultValue(double.NaN), Category("Behavior"), Description("Indicates maximum value for data points. By default maximum data point is calculated based on that data displayed by the chart, but when two charts need to be scaled the same setting maximum and minimum values for them will ensure that scales are visually the same.")]
+        public double DataMaxValue
+        {
+            get { return _MicroChart.DataMaxValue; }
+            set
+            {
+                _MicroChart.DataMaxValue = value;
+            }
+        }
+        /// <summary>
+        /// Gets or sets the minimum value for data points. By default minimum data point is calculated based on that data displayed by the chart, but when
+        /// two charts need to be scaled the same setting maximum and minimum values for them will ensure that scales are visually the same.
+        /// </summary>
+        [DefaultValue(double.NaN), Category("Behavior"), Description("Indicates minimum value for data points. By default minimum data point is calculated based on that data displayed by the chart, but when two charts need to be scaled the same setting maximum and minimum values for them will ensure that scales are visually the same.")]
+        public double DataMinValue
+        {
+            get { return _MicroChart.DataMinValue; }
+            set
+            {
+                _MicroChart.DataMinValue = value;
+            }
+        }
+
+        ///// <summary>
+        ///// Gets or sets whether text-markup support is enabled for items Text property. Default value is true.
+        ///// Set this property to false to display HTML or other markup in the item instead of it being parsed as text-markup.
+        ///// </summary>
+        //[DefaultValue(true), Category("Appearance"), Description("Indicates whether text-markup support is enabled for items Text property.")]
+        //public bool EnableMarkup
+        //{
+        //    get { return _MicroChart.EnableMarkup; }
+        //    set
+        //    {
+        //        _MicroChart.EnableMarkup = value;
+        //    }
+        //}
+
+        ///// <summary>
+        ///// Gets or sets text-position in relation to the chart.
+        ///// </summary>
+        //[DefaultValue(eMicroChartTextPosition.Left), Category("Appearance"), Description("Indicates text-position in relation to the chart.")]
+        //public eMicroChartTextPosition TextPosition
+        //{
+        //    get { return _MicroChart.TextPosition; }
+        //    set
+        //    {
+        //        _MicroChart.TextPosition = value;
+        //    }
+        //}
+
+        ///// <summary>
+        ///// Gets or sets whether caption/label set using Text property is visible.
+        ///// </summary>
+        //[DefaultValue(true), Category("Appearance"), Description("Indicates whether caption/label set using Text property is visible.")]
+        //public bool TextVisible
+        //{
+        //    get { return _MicroChart.TextVisible; }
+        //    set
+        //    {
+        //        _MicroChart.TextVisible = value;
+        //    }
+        //}
+
+        ///// <summary>
+        ///// Gets or sets text padding.
+        ///// </summary>
+        //[Browsable(true), Category("Appearance"), Description("Gets or sets text padding."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        //public Padding TextPadding
+        //{
+        //    get { return _MicroChart.TextPadding; }
+        //}
+        //[EditorBrowsable(EditorBrowsableState.Never)]
+        //public bool ShouldSerializeTextPadding()
+        //{
+        //    return _MicroChart.ShouldSerializeTextPadding();
+        //}
+        //[EditorBrowsable(EditorBrowsableState.Never)]
+        //public void ResetTextPadding()
+        //{
+        //    _MicroChart.ResetTextPadding();
+        //}
+
+        /// <summary>
+        ///// Gets or sets the text color.
+        ///// </summary>
+        //[Category("Appearance"), Description("Indicates text color.")]
+        //public Color TextColor
+        //{
+        //    get { return _MicroChart.TextColor; }
+        //    set { _MicroChart.TextColor = value; }
+        //}
+        ///// <summary>
+        ///// Gets whether property should be serialized.
+        ///// </summary>
+        //[EditorBrowsable(EditorBrowsableState.Never)]
+        //public bool ShouldSerializeTextColor()
+        //{
+        //    return _MicroChart.ShouldSerializeTextColor();
+        //}
+        ///// <summary>
+        ///// Resets property to its default value.
+        ///// </summary>
+        //[EditorBrowsable(EditorBrowsableState.Never)]
+        //public void ResetTextColor()
+        //{
+        //    _MicroChart.ResetTextColor();
+        //}
+        #endregion
+
+        #region ICommandSource Members
+        /// <summary>
+        /// Gets whether command is executed when control is clicked.
+        /// </summary>
+        protected virtual bool ExecuteCommandOnClick
+        {
+            get { return true; }
+        }
+
+        protected virtual void ExecuteCommand()
+        {
+            if (_Command == null) return;
+            CommandManager.ExecuteCommand(this);
+        }
+
+        /// <summary>
+        /// Gets or sets the command assigned to the item. Default value is null.
+        /// <remarks>Note that if this property is set to null Enabled property will be set to false automatically to disable the item.</remarks>
+        /// </summary>
+        [DefaultValue(null), Category("Commands"), Description("Indicates the command assigned to the item.")]
+        public Command Command
+        {
+            get { return (Command)((ICommandSource)this).Command; }
+            set
+            {
+                ((ICommandSource)this).Command = value;
+            }
+        }
+
+        private ICommand _Command = null;
+        //[Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        ICommand ICommandSource.Command
+        {
+            get
+            {
+                return _Command;
+            }
+            set
+            {
+                bool changed = false;
+                if (_Command != value)
+                    changed = true;
+
+                if (_Command != null)
+                    CommandManager.UnRegisterCommandSource(this, _Command);
+                _Command = value;
+                if (value != null)
+                    CommandManager.RegisterCommand(this, value);
+                if (changed)
+                    OnCommandChanged();
+            }
+        }
+
+        /// <summary>
+        /// Called when Command property value changes.
+        /// </summary>
+        protected virtual void OnCommandChanged()
+        {
+        }
+
+        private object _CommandParameter = null;
+        /// <summary>
+        /// Gets or sets user defined data value that can be passed to the command when it is executed.
+        /// </summary>
+        [Browsable(true), DefaultValue(null), Category("Commands"), Description("Indicates user defined data value that can be passed to the command when it is executed."), System.ComponentModel.TypeConverter(typeof(System.ComponentModel.StringConverter)), System.ComponentModel.Localizable(true)]
+        public object CommandParameter
+        {
+            get
+            {
+                return _CommandParameter;
+            }
+            set
+            {
+                _CommandParameter = value;
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/MicroCharts/MicroChart.ico b/PROMS/DotNetBar Source Code/MicroCharts/MicroChart.ico
new file mode 100644
index 00000000..d68a736e
Binary files /dev/null and b/PROMS/DotNetBar Source Code/MicroCharts/MicroChart.ico differ
diff --git a/PROMS/DotNetBar Source Code/MicroCharts/MicroChartBase.cs b/PROMS/DotNetBar Source Code/MicroCharts/MicroChartBase.cs
new file mode 100644
index 00000000..5d7e741e
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/MicroCharts/MicroChartBase.cs	
@@ -0,0 +1,135 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.MicroCharts
+{
+    /// <summary>
+    /// Represents the base class each micro-chart implements
+    /// </summary>
+    internal abstract class MicroChartBase
+    {
+        internal const int PointRadius = 3;
+        /// <summary>
+        /// Creates the chart image.
+        /// </summary>
+        /// <param name="info">Rendering information.</param>
+        /// <returns>Image of the chart.</returns>
+        public abstract void CreateChart(MicroChartRenderInfo info);
+
+        protected virtual Point[] GetChartPointBounds(Point p)
+        {
+            return new Point[] { new Point(p.X, p.Y - PointRadius), new Point(p.X - PointRadius, p.Y), new Point(p.X, p.Y + PointRadius), new Point(p.X + PointRadius, p.Y), new Point(p.X, p.Y - PointRadius) };
+        }
+    }
+
+    internal struct TrendInfo
+    {
+        public double Slope;
+        public double Intercept;
+        public double Start;
+        public double End;
+
+        /// <summary>
+        /// Initializes a new instance of the TrendInfo structure.
+        /// </summary>
+        /// <param name="slope"></param>
+        /// <param name="intercept"></param>
+        /// <param name="start"></param>
+        /// <param name="end"></param>
+        public TrendInfo(double slope, double intercept, double start, double end)
+        {
+            Slope = slope;
+            Intercept = intercept;
+            Start = start;
+            End = end;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the TrendInfo structure.
+        /// </summary>
+        static TrendInfo()
+        {
+            
+        }
+    }
+
+    internal class MicroChartRenderInfo
+    {
+        public List<double> DataPoints;
+        public MicroChartHotPoint[] MicroChartHotPoints;
+        public Graphics Graphics;
+        public int ChartWidth;
+        public int ChartHeight;
+
+        public double DataPointMaxValue;
+        public double DataPointMinValue;
+        public double Sum;
+
+        public TrendInfo TrendInfo;
+
+        /// <summary>
+        /// Initializes a new instance of the MicroChartRenderInfo structure.
+        /// </summary>
+        /// <param name="dataPoints"></param>
+        /// <param name="graphics"></param>
+        /// <param name="chartWidth"></param>
+        /// <param name="chartHeight"></param>
+        public MicroChartRenderInfo(List<double> dataPoints, Graphics graphics, int chartWidth, int chartHeight, double dataMax, double dataMin)
+        {
+            DataPoints = dataPoints;
+            Graphics = graphics;
+            ChartWidth = chartWidth;
+            ChartHeight = chartHeight;
+
+            MicroChartHotPoints = null;
+            DataPointMaxValue = dataMax;
+            DataPointMinValue = dataMin;
+            Sum = 0;
+            TrendInfo = new TrendInfo();
+
+            UpdateChartStats();
+        }
+
+        private void UpdateChartStats()
+        {
+            if (DataPoints == null || DataPoints.Count == 0) return;
+            double min = DataPoints[0], max = DataPoints[0];
+
+            // For trending
+            double xxSum = 0, xySum = 0, xAxisValuesSum = 0, yAxisValuesSum = 0;
+            Sum = Math.Abs(DataPoints[0]);
+
+            for (int i = 1; i < DataPoints.Count; i++)
+            {
+                double value = DataPoints[i];
+                if (value < min) min = value;
+                if (value > max) max = value;
+                Sum += Math.Abs(value);
+                xySum += value * (i + 1);
+                xxSum = value * value;
+                yAxisValuesSum += value;
+                xAxisValuesSum += i + 1;
+            }
+
+
+            double slope = 0, intercept = 0, start = 0, end = 0;
+            try
+            {
+                slope = ((DataPoints.Count * xySum) - (xAxisValuesSum * yAxisValuesSum)) /
+                    ((DataPoints.Count * xxSum) - (xAxisValuesSum * xAxisValuesSum));
+            }
+            catch (DivideByZeroException) { }
+            intercept = (yAxisValuesSum - (slope * xAxisValuesSum)) / DataPoints.Count;
+            start = Math.Max(0, (slope * DataPoints[0]) + intercept);
+            end = (slope * DataPoints[DataPoints.Count - 1]) + intercept;
+            this.TrendInfo = new TrendInfo(slope, intercept, start, end);
+
+            if(double.IsNaN(DataPointMaxValue))
+                DataPointMaxValue = max;
+            if(double.IsNaN(DataPointMinValue))
+                DataPointMinValue = min;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/MicroCharts/MicroChartItem.cs b/PROMS/DotNetBar Source Code/MicroCharts/MicroChartItem.cs
new file mode 100644
index 00000000..a6fe50ce
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/MicroCharts/MicroChartItem.cs	
@@ -0,0 +1,1654 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+using System.Windows.Forms;
+using System.ComponentModel;
+using System.Drawing.Imaging;
+using DevComponents.DotNetBar.MicroCharts;
+using DevComponents.DotNetBar.Rendering;
+using System.Threading;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represents the micro-chart item.
+    /// </summary>
+    [ToolboxItem(false), DesignTimeVisible(false), DefaultEvent("Click"), Designer("DevComponents.DotNetBar.Design.MicroChartItemDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+    public class MicroChartItem : PopupItem, IPersonalizedMenuItem
+    {
+        #region Events
+
+        #endregion
+
+        #region Constructor
+        internal static readonly int TextChartSpacing = 3;
+
+        /// <summary>
+        /// Creates new instance of MicroChartItem.
+        /// </summary>
+        public MicroChartItem() : this("", "") { }
+        /// <summary>
+        /// Creates new instance of MicroChartItem and assigns the name to it.
+        /// </summary>
+        /// <param name="sItemName">Item name.</param>
+        public MicroChartItem(string sItemName) : this(sItemName, "") { }
+        /// <summary>
+        /// Creates new instance of MicroChartItem and assigns the name and text to it.
+        /// </summary>
+        /// <param name="sItemName">Item name.</param>
+        /// <param name="ItemText">item text.</param>
+        public MicroChartItem(string sItemName, string ItemText)
+            : base(sItemName, ItemText)
+        {
+            _Margin.PropertyChanged += new PropertyChangedEventHandler(MarginPropertyChanged);
+
+            _LineMicroChartStyle = new LineMicroChartStyle();
+            _LineMicroChartStyle.StyleChanged += new EventHandler(ChartStyleChanged);
+
+            _PlotMicroChartStyle = new PlotMicroChartStyle();
+            _PlotMicroChartStyle.StyleChanged += new EventHandler(ChartStyleChanged);
+
+            _ColumnMicroChartStyle = new BarMicroChartStyle();
+            _ColumnMicroChartStyle.StyleChanged += new EventHandler(ChartStyleChanged);
+
+            _BarMicroChartStyle = new BarMicroChartStyle();
+            _BarMicroChartStyle.StyleChanged += new EventHandler(ChartStyleChanged);
+
+            _WinLoseMicroChartStyle = new BarMicroChartStyle();
+            _WinLoseMicroChartStyle.StyleChanged += new EventHandler(ChartStyleChanged);
+
+            _PieMicroChartStyle = new PieMicroChartStyle();
+            _PieMicroChartStyle.StyleChanged += new EventHandler(ChartStyleChanged);
+
+            _AreaMicroChartStyle = new AreaMicroChartStyle();
+            _AreaMicroChartStyle.StyleChanged += new EventHandler(ChartStyleChanged);
+
+            _HundredPctMicroChartStyle = new HundredPctMicroChartStyle();
+            _HundredPctMicroChartStyle.StyleChanged += new EventHandler(ChartStyleChanged);
+        }
+
+        /// <summary>
+        /// Returns copy of the item.
+        /// </summary>
+        public override BaseItem Copy()
+        {
+            MicroChartItem objCopy = new MicroChartItem(m_Name);
+            this.CopyToItem(objCopy);
+            return objCopy;
+        }
+
+        /// <summary>
+        /// Copies the MicroChartItem specific properties to new instance of the item.
+        /// </summary>
+        /// <param name="copy">New MicroChartItem instance.</param>
+        internal void InternalCopyToItem(MicroChartItem copy)
+        {
+            CopyToItem(copy);
+        }
+
+        /// <summary>
+        /// Copies the MicroChartItem specific properties to new instance of the item.
+        /// </summary>
+        /// <param name="copy">New MicroChartItem instance.</param>
+        protected override void CopyToItem(BaseItem copy)
+        {
+            MicroChartItem item = copy as MicroChartItem;
+
+            if (item != null)
+            {
+                item.ChartHeight = this.ChartHeight;
+                item.ChartType = this.ChartType;
+                item.ChartWidth = this.ChartWidth;
+                item.DataPoints = this.DataPoints;
+                item.MouseOverEnabled = this.MouseOverEnabled;
+                item.TextVisible = this.TextVisible;
+                item.TrackChartPoints = this.TrackChartPoints;
+
+                base.CopyToItem(item);
+            }
+        }
+        #endregion
+
+        #region Implementation
+        protected override void Dispose(bool disposing)
+        {
+            if (_TransitionWorker != null)
+            {
+                _TransitionWorker.Dispose();
+                _TransitionWorker = null;
+            }
+            Image image = _ChartImage;
+            _ChartImage = null;
+            if (image != null)
+                image.Dispose();
+
+            base.Dispose(disposing);
+        }
+
+        private int _TextWidth = 0;
+        /// <summary>
+        /// Gets or sets the suggested text-width. If you want to make sure that text you set wraps over multiple lines you can set suggested text-width so word break is performed.
+        /// </summary>
+        [DefaultValue(0), Category("Appearance"), Description("Indicates suggested text-width. If you want to make sure that text you set wraps over multiple lines you can set suggested text-width so word break is performed.")]
+        public int TextWidth
+        {
+            get { return _TextWidth; }
+            set
+            {
+                _TextWidth = value;
+                NeedRecalcSize = true;
+                Refresh();
+            }
+        }
+
+
+        private Size _TextSize = Size.Empty;
+        /// <summary>
+        /// Recalculate the size of the item. If overridden base implementation must be called so default processing can occur.
+        /// </summary>
+        public override void RecalcSize()
+        {
+            int chartWidth = _ChartWidth;
+            int chartHeight =_ChartHeight;
+            if (!(this.ContainerControl is MicroChart))
+            {
+                chartWidth = Dpi.Width(_ChartWidth);
+                chartHeight = Dpi.Height(_ChartHeight);
+            }
+
+            Padding padding = Dpi.Size(_Margin);
+            m_Rect.Width = chartWidth + padding.Horizontal + Dpi.Width8;
+            m_Rect.Height = chartHeight + padding.Vertical + Dpi.Height8;
+
+            bool onMenu = this.IsOnMenu && !(this.Parent is ItemContainer);
+
+            if (onMenu)
+            {
+                Size sideBarSize = GetMaxImageSize();
+                // Get the right image size that we will use for calculation
+                m_Rect.Width += (sideBarSize.Width + 7);
+                if (this.IsOnCustomizeMenu)
+                    m_Rect.Width += (sideBarSize.Height + 2);
+            }
+
+            if (_TextVisible && !string.IsNullOrEmpty(this.Text))
+            {
+                Control parent = this.ContainerControl as Control;
+                if (parent != null)
+                {
+                    Font font = parent.Font;
+                    using (Graphics g = parent.CreateGraphics())
+                    {
+                        int textWidth = Dpi.Width(_TextWidth);
+                        Size textSize = ButtonItemLayout.MeasureItemText(this, g, textWidth, font, (textWidth > 0 ? eTextFormat.WordBreak : eTextFormat.SingleLine), parent.RightToLeft == RightToLeft.Yes);
+                        _TextSize = textSize;
+                        Padding textPadding = Dpi.Size(_TextPadding);
+                        textSize.Width += textPadding.Horizontal;
+                        textSize.Height += textPadding.Vertical;
+                        int textChartSpacing = Dpi.Width(TextChartSpacing);
+                        if (_TextPosition == eMicroChartTextPosition.Left || _TextPosition == eMicroChartTextPosition.Right)
+                        {
+                            textSize.Width += textChartSpacing;
+                            m_Rect.Width += textSize.Width;
+                            m_Rect.Height = Math.Max(m_Rect.Height, textSize.Height);
+                        }
+                        else
+                        {
+                            textSize.Height += textChartSpacing;
+                            m_Rect.Height += textSize.Height;
+                            m_Rect.Width = Math.Max(m_Rect.Width, textSize.Width);
+                        }
+
+                    }
+                }
+            }
+
+            base.RecalcSize();
+        }
+        private Size GetMaxImageSize()
+        {
+            if (m_Parent != null)
+            {
+                ImageItem objParentImageItem = m_Parent as ImageItem;
+                if (objParentImageItem != null)
+                    return objParentImageItem.SubItemsImageSize;
+                else
+                    return this.ImageSize;
+            }
+            else
+                return this.ImageSize;
+        }
+
+        private string _TooltipValueFormatString = "";
+        /// <summary>
+        /// Gets or sets the format string for the value when it is displayed as tool-tip for data point.
+        /// </summary>
+        [DefaultValue(""), Category("Appearance"), Description("Indicates format string for the value when it is displayed as tool-tip for data point.")]
+        public string TooltipValueFormatString
+        {
+            get { return _TooltipValueFormatString; }
+            set
+            {
+                if (value == null) value = string.Empty;
+                if (value != _TooltipValueFormatString)
+                {
+                    string oldValue = _TooltipValueFormatString;
+                    _TooltipValueFormatString = value;
+                    OnTooltipValueFormatStringChanged(oldValue, value);
+                }
+            }
+        }
+
+        private void OnTooltipValueFormatStringChanged(string oldValue, string newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("TooltipValueFormatString"));
+        }
+
+        private List<double> _DataPoints = new List<double>();
+        /// <summary>
+        /// Gets or sets the chart data points. Note that if you are adding or removing points directly from this collection you must call
+        /// Refresh() method on the control to refresh the display.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public List<double> DataPoints
+        {
+            get { return _DataPoints; }
+            set
+            {
+                if (value != _DataPoints)
+                {
+                    List<double> oldValue = _DataPoints;
+                    _DataPoints = value;
+                    OnDataPointsChanged(oldValue, value);
+                }
+            }
+        }
+
+        private void OnDataPointsChanged(List<double> oldValue, List<double> newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("DataPoints"));
+            TransitionChart();
+        }
+
+        private List<string> _DataPointTooltips = new List<string>();
+        /// <summary>
+        /// Gets or sets the tooltips for each data-point assigned through DataPoints property. If not set control will automatically 
+        /// show tooltip based on the data-point value.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public List<string> DataPointTooltips
+        {
+            get { return _DataPointTooltips; }
+            set
+            {
+                if (value != _DataPointTooltips)
+                {
+                    List<string> oldValue = _DataPointTooltips;
+                    _DataPointTooltips = value;
+                    OnDataPointTooltipsChanged(oldValue, value);
+                }
+            }
+        }
+
+        private void OnDataPointTooltipsChanged(List<string> oldValue, List<string> newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("DataPointTooltips"));
+        }
+
+        private Image _TransitionImage = null;
+        private float _TransitionOpacity = 0f;
+        private BackgroundWorker _TransitionWorker = null;
+        private void TransitionChart()
+        {
+            if (_ChartImage != null)
+            {
+                Control cc = this.ContainerControl as Control;
+                if (cc != null && cc.IsHandleCreated && IsAnimationEnabled)
+                {
+                    Image image = _TransitionImage;
+                    _TransitionImage = _ChartImage;
+                    if (image != null)
+                        image.Dispose();
+                    _ChartImage = null;
+                    InvalidateChartImage(false);
+                    if (_TransitionWorker == null)
+                    {
+                        _TransitionWorker = new BackgroundWorker();
+                        _TransitionWorker.WorkerSupportsCancellation = true;
+                        _TransitionWorker.DoWork += TransitionWorkerDoWork;
+                        _TransitionWorker.RunWorkerCompleted += TransitionWorkerCompleted;
+                        _TransitionWorker.RunWorkerAsync();
+                    }
+                    return;
+                }
+            }
+            InvalidateChartImage(false);
+        }
+
+        System.Threading.Semaphore _CompletedSemaphore = new System.Threading.Semaphore(1, 1);
+        void TransitionWorkerCompleted(object sender, RunWorkerCompletedEventArgs e)
+        {
+            _CompletedSemaphore.WaitOne();
+            BackgroundWorker worker = _TransitionWorker;
+            Image image = _TransitionImage;
+            _TransitionImage = null;
+            if (image != null)
+                image.Dispose();
+
+            _TransitionWorker = null;
+            if (worker != null)
+                worker.Dispose();
+            this.Refresh();
+            _CompletedSemaphore.Release();
+        }
+
+        void TransitionWorkerDoWork(object sender, DoWorkEventArgs e)
+        {
+            while (_TransitionOpacity < 1)
+            {
+                _TransitionOpacity += 0.1f;
+                if (e.Cancel) break;
+                this.Refresh();
+                try
+                {
+                    using (
+                                        System.Threading.ManualResetEvent wait =
+                                            new System.Threading.ManualResetEvent(false))
+                        wait.WaitOne(60);
+                    //Thread.Sleep(60);
+                }
+                catch
+                {
+                }
+            }
+            _TransitionOpacity = 0f;
+        }
+
+        private bool _AnimationEnabled = true;
+        /// <summary>
+        /// Gets or sets whether transition animation between same chart with different data-points is enabled. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates  whether transition animation between same chart with different data-points is enabled.")]
+        public bool AnimationEnabled
+        {
+            get { return _AnimationEnabled; }
+            set
+            {
+                _AnimationEnabled = value;
+            }
+        }
+        /// <summary>
+        /// Gets whether fade effect is enabled.
+        /// </summary>
+        private bool IsAnimationEnabled
+        {
+            get
+            {
+                //if (!_AnimationEnabled) return false;
+
+                //System.Windows.Forms.Control cc = this.ContainerControl as System.Windows.Forms.Control;
+                //if (cc != null)
+                //{
+                //    if (cc is ItemControl)
+                //        return ((ItemControl)cc).IsFadeEnabled;
+                //    else if (cc is MicroChart)
+                //        return ((MicroChart)cc).IsAnimationEnabled;
+                //    else if (cc is Bar)
+                //        return ((Bar)cc).IsFadeEnabled;
+                //    else if (cc is ButtonX)
+                //        return ((ButtonX)cc).IsFadeEnabled;
+                //}
+                return _AnimationEnabled;
+            }
+        }
+
+
+        private bool _TrackChartPoints = true;
+        /// <summary>
+        /// Gets or sets whether chart is tracking mouse movement to show data-point and its value on tooltip. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether chart is tracking mouse movement to show data-point and its value on tooltip.")]
+        public bool TrackChartPoints
+        {
+            get { return _TrackChartPoints; }
+            set
+            {
+                _TrackChartPoints = value;
+            }
+        }
+
+        private bool _MouseOverEnabled = false;
+        /// <summary>
+        /// Gets or sets whether button like mouse over tracking is enabled for whole control. When enabled control looks like a button when mouse is over it. Default value is false.
+        /// </summary>
+        [DefaultValue(false), Category("Behavior"), Description("Indicates whether button like mouse over tracking is enabled for whole control. When enabled control looks like a button when mouse is over it.")]
+        public bool MouseOverEnabled
+        {
+            get { return _MouseOverEnabled; }
+            set
+            {
+                _MouseOverEnabled = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the index of data point (DataPoints collection) that mouse is over or returns -1 if mouse is not over any data-point.
+        /// </summary>
+        [Browsable(false)]
+        public int MouseOverDataPointIndex
+        {
+            get
+            {
+                if (_HotPoint.IsEmpty) return -1;
+                return _HotPoint.DataPointIndex;
+            }
+        }
+
+        private bool _MouseOverDataPointTooltipEnabled = true;
+        /// <summary>
+        /// Gets or sets whether mouse over tooltip for data point is enabled. Default value is true.
+        /// </summary>
+        [Category("Behavior"), DefaultValue(true), Description("Indicates whether mouse over tooltip for data point is enabled")]
+        public bool MouseOverDataPointTooltipEnabled
+        {
+            get { return _MouseOverDataPointTooltipEnabled; }
+            set
+            {
+                _MouseOverDataPointTooltipEnabled = value;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when MouseOverDataPointIndex property changes due to user moving the mouse and pointing it to different data point on chart.
+        /// </summary>
+        public event EventHandler MouseOverDataPointChanged;
+        /// <summary>
+        /// Raises MouseOverDataPointChanged event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnMouseOverDataPointChanged(EventArgs e)
+        {
+            EventHandler handler = MouseOverDataPointChanged;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        private MicroChartHotPoint _HotPoint = MicroChartHotPoint.Empty;
+        private MicroChartHotPoint HotPoint
+        {
+            get
+            {
+                return _HotPoint;
+            }
+            set
+            {
+                if (_HotPoint.HotPointBounds != value.HotPointBounds)
+                {
+                    _HotPoint = value;
+                    if (_HotPoint.IsEmpty && this.ToolTipVisible)
+                    {
+                        this.HideToolTip();
+                        this.Tooltip = "";
+                    }
+                    else if (_TrackChartPoints && _MouseOverDataPointTooltipEnabled)
+                    {
+                        if (_DataPointTooltips.Count > 0 && _DataPointTooltips.Count > value.DataPointIndex)
+                        {
+                            string tooltip = _DataPointTooltips[value.DataPointIndex];
+                            if (tooltip.IndexOf("{0}") >= 0)
+                                tooltip = string.Format(tooltip, value.Value);
+                            this.Tooltip = tooltip;
+                        }
+                        else if (string.IsNullOrEmpty(_TooltipValueFormatString))
+                            this.Tooltip = value.Value.ToString();
+                        else
+                            this.Tooltip = value.Value.ToString(_TooltipValueFormatString);
+                        if (!this.ToolTipVisible) this.ShowToolTip();
+                    }
+                    OnMouseOverDataPointChanged(EventArgs.Empty);
+                    this.Refresh();
+                }
+            }
+        }
+
+        private bool _IsMouseOver = false;
+        public override void InternalMouseEnter()
+        {
+            base.InternalMouseEnter();
+            if (!_IsMouseOver)
+            {
+                _IsMouseOver = true;
+                this.Refresh();
+            }
+        }
+
+        public override void InternalMouseLeave()
+        {
+            HotPoint = MicroChartHotPoint.Empty;
+            if (_IsMouseOver)
+            {
+                _IsMouseOver = false;
+                this.Refresh();
+            }
+            base.InternalMouseLeave();
+        }
+
+        private bool _IsPressed = false;
+        public override void InternalMouseDown(MouseEventArgs objArg)
+        {
+            if (!_IsPressed && objArg.Button == MouseButtons.Left)
+            {
+                _IsPressed = true;
+                this.Refresh();
+            }
+            base.InternalMouseDown(objArg);
+        }
+
+        public override void InternalMouseUp(MouseEventArgs objArg)
+        {
+            if (_IsPressed && objArg.Button == MouseButtons.Left)
+            {
+                _IsPressed = false;
+                this.Refresh();
+            }
+            base.InternalMouseUp(objArg);
+        }
+
+        public override void InternalMouseMove(MouseEventArgs objArg)
+        {
+            if (m_Rect.Contains(objArg.X, objArg.Y) && _ChartHotPoints != null)
+            {
+
+                MicroChartHotPoint newHotPoint = MicroChartHotPoint.Empty;
+                int chartWidth = _ChartWidth;
+                int chartHeight = _ChartHeight;
+                if (!(this.ContainerControl is MicroChart))
+                {
+                    chartWidth = Dpi.Width(_ChartWidth);
+                    chartHeight = Dpi.Height(_ChartHeight);
+                }
+
+                Rectangle chartBounds = new Rectangle(_ChartLocation.X, _ChartLocation.Y, chartWidth, chartHeight);
+                if (chartBounds.Contains(objArg.X, objArg.Y))
+                {
+                    foreach (MicroChartHotPoint point in _ChartHotPoints)
+                    {
+                        Point chartPoint = new Point(objArg.X - _ChartLocation.X, objArg.Y - _ChartLocation.Y);
+                        Rectangle r = point.HotPointBounds;
+                        Rectangle sliceBounds = point.ChartSliceBounds;
+                        r.Offset(_ChartLocation);
+                        if (!sliceBounds.IsEmpty)
+                            sliceBounds.Offset(_ChartLocation);
+
+                        if (_ChartType == eMicroChartType.Pie && PieSliceContains(chartPoint, point) ||
+                            _ChartType != eMicroChartType.Pie && (r.Contains(objArg.X, objArg.Y) || sliceBounds.Contains(objArg.X, objArg.Y)))
+                        {
+                            newHotPoint = point;
+                            break;
+                        }
+                    }
+                }
+
+                HotPoint = newHotPoint;
+            }
+            base.InternalMouseMove(objArg);
+        }
+
+        private bool PieSliceContains(Point point, MicroChartHotPoint hotPoint)
+        {
+            int chartWidth = _ChartWidth;
+            int chartHeight = _ChartHeight;
+            if (!(this.ContainerControl is MicroChart))
+            {
+                chartWidth = Dpi.Width(_ChartWidth);
+                chartHeight = Dpi.Height(_ChartHeight);
+            }
+
+            int diameter = Math.Min(chartHeight, chartWidth);
+            double a = diameter / 2 + (chartWidth - diameter) / 2;
+            double b = diameter / 2 + (chartHeight - diameter) / 2; ;
+            double x = point.X - a;
+            double y = point.Y - b;
+            double angle = Math.Atan2(y, x);
+            if (angle < 0)
+                angle += 2 * Math.PI;
+            double angleDegrees = angle * 180 / Math.PI;
+            // point is inside the pie slice only if between start and end angle
+
+            if (angleDegrees >= hotPoint.StartAngle &&
+                       angleDegrees <= hotPoint.StartAngle + hotPoint.SweepAngle)
+            {
+                return true;
+            }
+            return false;
+        }
+
+
+        /// <summary>
+        /// Invalidates the chart display and requests the re-paint.
+        /// </summary>
+        /// <param name="animateTransition">Indicates whether to animate transition to new chart</param>
+        public void InvalidateChart(bool animateTransition)
+        {
+            if (animateTransition)
+                TransitionChart();
+            else
+                InvalidateChartImage(false);
+        }
+
+        private void InvalidateChartImage(bool isPainting)
+        {
+            Image image = _ChartImage;
+            _ChartImage = null;
+            if (image != null)
+                image.Dispose();
+            if (!isPainting)
+                this.Refresh();
+        }
+
+        private Bitmap _ChartImage = null;
+        private Point _ChartLocation = Point.Empty;
+        /// <summary>
+        /// Draws the chart.
+        /// </summary>
+        /// <param name="p">Paint arguments</param>
+        public override void Paint(ItemPaintArgs p)
+        {
+            if (_DataPoints != null && _LastDataPointCount != _DataPoints.Count)
+                InvalidateChartImage(true);
+
+            if (_ChartImage == null)
+                _ChartImage = CreateChartImage();
+
+            Graphics g = p.Graphics;
+
+            Rectangle contentBounds = m_Rect;
+            bool onMenu = this.IsOnMenu && !(this.Parent is ItemContainer);
+            bool rtl = p.RightToLeft;
+            eDotNetBarStyle effectiveStyle = this.EffectiveStyle;
+            bool enabled = GetEnabled(p.ContainerControl);
+
+            if (onMenu)
+            {
+                Size sideBarSize = GetMaxImageSize();
+                if (!rtl)
+                    contentBounds.X += sideBarSize.Width + 7;
+                contentBounds.Width -= sideBarSize.Width + 7;
+                DrawMenuSideBar(p, effectiveStyle);
+            }
+
+            if (_MouseOverEnabled && enabled && (_IsMouseOver || this.Expanded))
+            {
+                DrawMouseOverState(p, effectiveStyle);
+            }
+
+            if (_BackgroundImage != null)
+                BarFunctions.PaintBackgroundImage(g, contentBounds, _BackgroundImage, _BackgroundImagePosition, 255);
+
+            Padding padding = Dpi.Size(_Margin);
+            Point chartLocation = new Point(contentBounds.X + Dpi.Width4 + padding.Left, contentBounds.Y + Dpi.Height4 + padding.Top);
+
+            int chartHeight = _ChartHeight;
+            int chartWidth = _ChartWidth;
+            if (!(this.ContainerControl is MicroChart))
+            {
+                chartWidth = Dpi.Width(_ChartWidth);
+                chartHeight = Dpi.Height(_ChartHeight);
+            }
+            if (_TextVisible && !string.IsNullOrEmpty(this.Text))
+            {
+                Rectangle textRect = contentBounds;
+
+                int textChartSpacing = Dpi.Width(TextChartSpacing);
+                Padding textPadding = Dpi.Size(_TextPadding);
+                if (_TextPosition == eMicroChartTextPosition.Left && !rtl || _TextPosition == eMicroChartTextPosition.Right && rtl)
+                {
+                    textRect.Width = _TextSize.Width;
+                    textRect.Y += textPadding.Top + padding.Top + Dpi.Height1;
+                    textRect.X += padding.Left + textPadding.Left + Dpi.Width1;
+                    textRect.Height = Math.Max(_TextSize.Height + Dpi.Height2, chartHeight + Dpi.Height6);
+                    chartLocation.X = textRect.Right + textPadding.Right + textChartSpacing;
+                }
+                else if (_TextPosition == eMicroChartTextPosition.Right && !rtl || _TextPosition == eMicroChartTextPosition.Left && rtl)
+                {
+                    textRect.Width = _TextSize.Width;
+                    textRect.Y += textPadding.Top + padding.Top + Dpi.Height1;
+                    textRect.X += padding.Left + textPadding.Left + chartWidth + textChartSpacing + Dpi.Width1;
+                    textRect.Height = Math.Max(_TextSize.Height + Dpi.Height2, chartHeight + Dpi.Height6);
+                }
+                else if (_TextPosition == eMicroChartTextPosition.Top)
+                {
+                    textRect.Width = _TextSize.Width;
+                    textRect.Y += textPadding.Top + padding.Top + Dpi.Height1;
+                    textRect.X += padding.Left;
+                    textRect.Height = _TextSize.Height;
+                    chartLocation.Y = textRect.Bottom + textPadding.Bottom + textChartSpacing;
+                    if (_TextSize.Width > chartWidth)
+                        chartLocation.X += (_TextSize.Width - chartWidth) / 2;
+                    else
+                        textRect.X = chartLocation.X + (chartWidth - _TextSize.Width) / 2;
+                }
+                else if (_TextPosition == eMicroChartTextPosition.Bottom)
+                {
+                    textRect.Width = _TextSize.Width;
+                    textRect.Y += textPadding.Top + padding.Top + chartHeight + textChartSpacing + Dpi.Height1;
+                    textRect.X += padding.Left;
+                    textRect.Height = _TextSize.Height;
+                    if (_TextSize.Width > chartWidth)
+                        chartLocation.X += (_TextSize.Width - chartWidth) / 2;
+                    else
+                        textRect.X = chartLocation.X + (chartWidth - _TextSize.Width) / 2;
+                }
+
+                Color textColor = this.TextColor;
+                if (textColor.IsEmpty)
+                {
+                    textColor = LabelItem.GetTextColor(p, this.EffectiveStyle, GetEnabled(), textColor);
+                }
+
+                Font textFont = p.Font;
+                eTextFormat tf = eTextFormat.Left | eTextFormat.VerticalCenter | eTextFormat.WordBreak;
+                if (this.TextMarkupBody != null)
+                {
+                    TextMarkup.MarkupDrawContext d = new TextMarkup.MarkupDrawContext(g, textFont, textColor, rtl);
+                    d.HotKeyPrefixVisible = !((tf & eTextFormat.HidePrefix) == eTextFormat.HidePrefix);
+                    if ((tf & eTextFormat.VerticalCenter) == eTextFormat.VerticalCenter)
+                        textRect.Y = this.TopInternal + (contentBounds.Height - this.TextMarkupBody.Bounds.Height) / 2;
+                    else if ((tf & eTextFormat.Bottom) == eTextFormat.Bottom)
+                        textRect.Y += (this.TextMarkupBody.Bounds.Height - textRect.Height) + Dpi.Height1;
+                    textRect.Height = this.TextMarkupBody.Bounds.Height;
+                    this.TextMarkupBody.Bounds = textRect;
+                    this.TextMarkupBody.Render(d);
+                }
+                else
+                {
+                    if (p != null && p.GlassEnabled && this.Parent is CaptionItemContainer && !(p.ContainerControl is DevComponents.DotNetBar.Ribbon.QatToolbar))
+                    {
+                        if (!p.CachedPaint)
+                            Office2007RibbonControlPainter.PaintTextOnGlass(g, this.Text, textFont, textRect, TextDrawing.GetTextFormat(tf));
+                    }
+                    else
+                        TextDrawing.DrawString(g, this.Text, textFont, textColor, textRect, tf);
+                }
+            }
+
+            if (_TransitionImage != null)
+            {
+                Rectangle chartRect = new Rectangle(chartLocation.X, chartLocation.Y, chartWidth, chartHeight);
+                System.Drawing.Imaging.ColorMatrix matrix1 = new System.Drawing.Imaging.ColorMatrix();
+                matrix1[3, 3] = (1 - _TransitionOpacity);
+                using (System.Drawing.Imaging.ImageAttributes imageAtt = new System.Drawing.Imaging.ImageAttributes())
+                {
+                    imageAtt.SetColorMatrix(matrix1);
+                    g.DrawImage(_TransitionImage, chartRect, 0, 0, chartRect.Width, chartRect.Height, GraphicsUnit.Pixel, imageAtt);
+                }
+                matrix1[3, 3] = _TransitionOpacity;
+                using (System.Drawing.Imaging.ImageAttributes imageAtt = new System.Drawing.Imaging.ImageAttributes())
+                {
+                    imageAtt.SetColorMatrix(matrix1);
+                    g.DrawImage(_ChartImage, chartRect, 0, 0, chartRect.Width, chartRect.Height, GraphicsUnit.Pixel, imageAtt);
+                }
+            }
+            else
+            {
+                g.DrawImage(_ChartImage, chartLocation);
+            }
+
+            _ChartLocation = chartLocation;
+
+            if (_TrackChartPoints && !_HotPoint.IsEmpty)
+            {
+                Rectangle hotPointBounds = _HotPoint.HotPointBounds;
+                hotPointBounds.Offset(chartLocation);
+                using (Pen pen = new Pen(Brushes.DarkGray, Dpi.Width1))
+                {
+                    g.FillEllipse(Brushes.White, hotPointBounds);
+                    g.DrawEllipse(pen, hotPointBounds);
+                }
+                hotPointBounds.Inflate(-Dpi.Width2, -Dpi.Height2);
+                using (SolidBrush brush = new SolidBrush(_HotPoint.Color))
+                    g.FillEllipse(brush, hotPointBounds);
+            }
+
+            //g.DrawRectangle(Pens.Yellow, new Rectangle(m_Rect.X, m_Rect.Y, m_Rect.Width - 1, m_Rect.Height - 1));
+
+            if (this.Focused && this.DesignMode)
+            {
+                Rectangle r = m_Rect;
+                r.Inflate(-1, -1);
+                DesignTime.DrawDesignTimeSelection(g, r, p.Colors.ItemDesignTimeBorder);
+            }
+
+            this.DrawInsertMarker(p.Graphics);
+        }
+
+        private static RoundRectangleShapeDescriptor _MenuShape = new RoundRectangleShapeDescriptor(3);
+        private void DrawMouseOverState(ItemPaintArgs p, eDotNetBarStyle effectiveStyle)
+        {
+            Rectangle rHover = this.DisplayRectangle;
+            rHover.Inflate(-1, 0);
+            Graphics g = p.Graphics;
+
+            if (BarFunctions.IsOffice2007Style(effectiveStyle) && !(p.Owner is DotNetBarManager) && GlobalManager.Renderer is Office2007Renderer)
+            {
+                Office2007ButtonItemStateColorTable bt;
+                if (this.Expanded)
+                    bt = ((Office2007Renderer)GlobalManager.Renderer).ColorTable.ButtonItemColors[0].Expanded;
+                else if (_IsPressed)
+                    bt = ((Office2007Renderer)GlobalManager.Renderer).ColorTable.ButtonItemColors[0].Pressed;
+                else
+                    bt = ((Office2007Renderer)GlobalManager.Renderer).ColorTable.ButtonItemColors[0].MouseOver;
+                Office2007ButtonItemPainter.PaintBackground(g, bt, rHover, _MenuShape);
+            }
+            else
+            {
+                if (!p.Colors.ItemHotBackground2.IsEmpty)
+                {
+                    System.Drawing.Drawing2D.LinearGradientBrush gradient = BarFunctions.CreateLinearGradientBrush(rHover, p.Colors.ItemHotBackground, p.Colors.ItemHotBackground2, p.Colors.ItemHotBackgroundGradientAngle);
+                    g.FillRectangle(gradient, rHover);
+                    gradient.Dispose();
+                }
+                else
+                    g.FillRectangle(new SolidBrush(p.Colors.ItemHotBackground), rHover);
+                NativeFunctions.DrawRectangle(g, new Pen(p.Colors.ItemHotBorder), rHover);
+            }
+        }
+
+        private void DrawMenuSideBar(ItemPaintArgs pa, eDotNetBarStyle effectiveStyle)
+        {
+            Rectangle sideRect = GetMenuSideBounds(pa.RightToLeft);
+            Graphics g = pa.Graphics;
+
+            // Draw side bar
+            if (!BarFunctions.IsOffice2007Style(effectiveStyle))
+            {
+                if (this.MenuVisibility == eMenuVisibility.VisibleIfRecentlyUsed && !this.RecentlyUsed)
+                {
+                    if (!pa.Colors.MenuUnusedSide2.IsEmpty)
+                    {
+                        System.Drawing.Drawing2D.LinearGradientBrush gradient = BarFunctions.CreateLinearGradientBrush(new Rectangle(m_Rect.Left, m_Rect.Top, sideRect.Width, m_Rect.Height), pa.Colors.MenuUnusedSide, pa.Colors.MenuUnusedSide2, pa.Colors.MenuUnusedSideGradientAngle);
+                        g.FillRectangle(gradient, sideRect);
+                        gradient.Dispose();
+                    }
+                    else
+                        g.FillRectangle(new SolidBrush(pa.Colors.MenuUnusedSide), sideRect);
+                }
+                else
+                {
+                    if (!pa.Colors.MenuSide2.IsEmpty)
+                    {
+                        System.Drawing.Drawing2D.LinearGradientBrush gradient = BarFunctions.CreateLinearGradientBrush(sideRect, pa.Colors.MenuSide, pa.Colors.MenuSide2, pa.Colors.MenuSideGradientAngle);
+                        g.FillRectangle(gradient, sideRect);
+                        gradient.Dispose();
+                    }
+                    else
+                        g.FillRectangle(new SolidBrush(pa.Colors.MenuSide), sideRect);
+                }
+            }
+            if (BarFunctions.IsOffice2007Style(effectiveStyle) && GlobalManager.Renderer is Office2007Renderer)
+            {
+                Office2007MenuColorTable mt = ((Office2007Renderer)GlobalManager.Renderer).ColorTable.Menu;
+                if (mt != null)
+                {
+                    // Draw side bar
+                    if (this.MenuVisibility == eMenuVisibility.VisibleIfRecentlyUsed && !this.RecentlyUsed)
+                        DisplayHelp.FillRectangle(g, sideRect, mt.SideUnused);
+                    else
+                        DisplayHelp.FillRectangle(g, sideRect, mt.Side);
+                }
+
+                if (mt != null && !mt.SideBorder.IsEmpty)
+                {
+                    if (pa.RightToLeft)
+                        DisplayHelp.DrawGradientLine(g, sideRect.X, sideRect.Y, sideRect.X, sideRect.Bottom - 1, mt.SideBorder, 1);
+                    else
+                        DisplayHelp.DrawGradientLine(g, sideRect.Right - 2, sideRect.Y, sideRect.Right - 2, sideRect.Bottom - 1, mt.SideBorder, 1);
+                }
+                if (mt != null && !mt.SideBorderLight.IsEmpty)
+                {
+                    if (pa.RightToLeft)
+                        DisplayHelp.DrawGradientLine(g, sideRect.X + 1, sideRect.Y, sideRect.X + 1, sideRect.Bottom - 1, mt.SideBorderLight, 1);
+                    else
+                        DisplayHelp.DrawGradientLine(g, sideRect.Right - 1, sideRect.Y, sideRect.Right - 1, sideRect.Bottom - 1, mt.SideBorderLight, 1);
+                }
+            }
+        }
+
+        private Rectangle GetMenuSideBounds(bool rtl)
+        {
+            Size sideBarSize = GetMaxImageSize();
+            sideBarSize.Width += 7;
+            if (this.IsOnCustomizeMenu)
+                sideBarSize.Width += sideBarSize.Height + 8;
+            Rectangle bounds = m_Rect;
+            Rectangle sideRect = new Rectangle(bounds.Left, bounds.Top, sideBarSize.Width, bounds.Height);
+            if (rtl)
+                sideRect.X = bounds.Right - sideRect.Width;
+            return sideRect;
+        }
+
+        private MicroChartHotPoint[] _ChartHotPoints = new MicroChartHotPoint[0];
+        private int _LastDataPointCount = -1;
+        private Bitmap CreateChartImage()
+        {
+            int chartWidth = _ChartWidth;
+            int chartHeight = _ChartHeight;
+            if (!(this.ContainerControl is MicroChart))
+            {
+                chartWidth = Dpi.Width(_ChartWidth);
+                chartHeight = Dpi.Height(_ChartHeight);
+            }
+
+            Bitmap image = new Bitmap(chartWidth, chartHeight, PixelFormat.Format32bppArgb);
+
+            using (Graphics g = Graphics.FromImage(image))
+            {
+                g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.HighQuality;
+                MicroChartBase draw = GetMicroChart();
+                MicroChartRenderInfo info = new MicroChartRenderInfo(_DataPoints, g, chartWidth, chartHeight, _DataMaxValue, _DataMinValue);
+                draw.CreateChart(info);
+                _ChartHotPoints = info.MicroChartHotPoints;
+            }
+
+            if (_DataPoints != null)
+                _LastDataPointCount = _DataPoints.Count;
+            else
+                _LastDataPointCount = -1;
+
+            return image;
+        }
+
+        private void ChartStyleChanged(object sender, EventArgs e)
+        {
+            InvalidateChartImage(false);
+        }
+
+        private LineMicroChartStyle _LineMicroChartStyle = null;
+        /// <summary>
+        /// Gets the style used to customize appearance of Line micro-chart.
+        /// </summary>
+        [Category("Style"), Description("Identifies style used to customize appearance of Line micro-chart."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public LineMicroChartStyle LineChartStyle
+        {
+            get
+            {
+                return _LineMicroChartStyle;
+            }
+        }
+
+        private PlotMicroChartStyle _PlotMicroChartStyle = null;
+        /// <summary>
+        /// Gets the style used to customize appearance of Plot micro-chart.
+        /// </summary>
+        [Category("Style"), Description("Identifies style used to customize appearance of Plot micro-chart."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public PlotMicroChartStyle PlotChartStyle
+        {
+            get
+            {
+                return _PlotMicroChartStyle;
+            }
+        }
+
+        private BarMicroChartStyle _ColumnMicroChartStyle = null;
+        /// <summary>
+        /// Gets the style used to customize appearance of Column micro-chart.
+        /// </summary>
+        [Category("Style"), Description("Identifies style used to customize appearance of Column micro-chart."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public BarMicroChartStyle ColumnChartStyle
+        {
+            get
+            {
+                return _ColumnMicroChartStyle;
+            }
+        }
+
+        private BarMicroChartStyle _BarMicroChartStyle = null;
+        /// <summary>
+        /// Gets the style used to customize appearance of Bar micro-chart.
+        /// </summary>
+        [Category("Style"), Description("Identifies style used to customize appearance of Bar micro-chart."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public BarMicroChartStyle BarChartStyle
+        {
+            get
+            {
+                return _BarMicroChartStyle;
+            }
+        }
+
+        private BarMicroChartStyle _WinLoseMicroChartStyle = null;
+        /// <summary>
+        /// Gets the style used to customize appearance of Win-Lose micro-chart.
+        /// </summary>
+        [Category("Style"), Description("Identifies style used to customize appearance of Win-Lose micro-chart."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public BarMicroChartStyle WinLoseChartStyle
+        {
+            get
+            {
+                return _WinLoseMicroChartStyle;
+            }
+        }
+
+        private PieMicroChartStyle _PieMicroChartStyle = null;
+        /// <summary>
+        /// Gets the style used to customize appearance of Pie micro-chart.
+        /// </summary>
+        [Category("Style"), Description("Identifies style used to customize appearance of Pie micro-chart."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public PieMicroChartStyle PieChartStyle
+        {
+            get
+            {
+                return _PieMicroChartStyle;
+            }
+        }
+
+        private AreaMicroChartStyle _AreaMicroChartStyle = null;
+        /// <summary>
+        /// Gets the style used to customize appearance of Area micro-chart.
+        /// </summary>
+        [Category("Style"), Description("Identifies style used to customize appearance of Area micro-chart."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public AreaMicroChartStyle AreaChartStyle
+        {
+            get
+            {
+                return _AreaMicroChartStyle;
+            }
+        }
+
+        private HundredPctMicroChartStyle _HundredPctMicroChartStyle = null;
+        /// <summary>
+        /// Gets the style used to customize appearance of 100% micro-chart.
+        /// </summary>
+        [Category("Style"), Description("Identifies style used to customize appearance of 100% micro-chart."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public HundredPctMicroChartStyle HundredPctChartStyle
+        {
+            get
+            {
+                return _HundredPctMicroChartStyle;
+            }
+        }
+
+        private MicroChartBase GetMicroChart()
+        {
+            MicroChartBase chart = null;
+            if (_ChartType == eMicroChartType.Line)
+            {
+                LineMicroChart lineChart = new LineMicroChart();
+                lineChart.Style = _LineMicroChartStyle;
+                chart = lineChart;
+            }
+            else if (_ChartType == eMicroChartType.Plot)
+            {
+                PlotMicroChart plotChart = new PlotMicroChart();
+                plotChart.Style = _PlotMicroChartStyle;
+                chart = plotChart;
+            }
+            else if (_ChartType == eMicroChartType.Column)
+            {
+                ColumnMicroChart columnChart = new ColumnMicroChart();
+                columnChart.Style = _ColumnMicroChartStyle;
+                chart = columnChart;
+            }
+            else if (_ChartType == eMicroChartType.Bar)
+            {
+                BarMicroChart barChart = new BarMicroChart();
+                barChart.Style = _BarMicroChartStyle;
+                chart = barChart;
+            }
+            else if (_ChartType == eMicroChartType.WinLose)
+            {
+                WinLoseMicroChart columnChart = new WinLoseMicroChart();
+                columnChart.Style = _WinLoseMicroChartStyle;
+                chart = columnChart;
+            }
+            else if (_ChartType == eMicroChartType.Pie)
+            {
+                PieMicroChart pieChart = new PieMicroChart();
+                pieChart.Style = _PieMicroChartStyle;
+                chart = pieChart;
+            }
+            else if (_ChartType == eMicroChartType.Area)
+            {
+                AreaMicroChart areaChart = new AreaMicroChart();
+                areaChart.Style = _AreaMicroChartStyle;
+                chart = areaChart;
+            }
+            else if (_ChartType == eMicroChartType.HundredPercentBar)
+            {
+                HundredPctBar pctChart = new HundredPctBar();
+                pctChart.Style = _HundredPctMicroChartStyle;
+                chart = pctChart;
+            }
+            return chart;
+        }
+
+        private int _ChartWidth = 54;
+        /// <summary>
+        /// Gets or sets the width of the chart part of the control.
+        /// </summary>
+        [DefaultValue(54), Category("Appearance"), Description("Indicates width of the chart part of the control.")]
+        public int ChartWidth
+        {
+            get { return _ChartWidth; }
+            set
+            {
+                if (value != _ChartWidth)
+                {
+                    if (_ChartWidth <= 0)
+                        throw new ArgumentException("CharWidth must be greater than 0");
+                    int oldValue = _ChartWidth;
+                    _ChartWidth = value;
+                    OnChartWidthChanged(oldValue, value);
+                }
+            }
+        }
+        private void OnChartWidthChanged(int oldValue, int newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("ChartWidth"));
+            InvalidateChartImage(false);
+        }
+
+        private int _ChartHeight = 15;
+        /// <summary>
+        /// Gets or sets the height of the chart part of the control.
+        /// </summary>
+        [DefaultValue(15), Category("Appearance"), Description("Indicates height of the chart part of the control.")]
+        public int ChartHeight
+        {
+            get { return _ChartHeight; }
+            set
+            {
+                if (value != _ChartHeight)
+                {
+                    if (_ChartWidth <= 0)
+                        throw new ArgumentException("CharHeight must be greater than 0");
+                    int oldValue = _ChartHeight;
+                    _ChartHeight = value;
+                    OnChartHeightChanged(oldValue, value);
+                }
+            }
+        }
+
+        private void OnChartHeightChanged(int oldValue, int newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("ChartHeight"));
+            InvalidateChartImage(false);
+        }
+
+        private eMicroChartType _ChartType = eMicroChartType.Line;
+        /// <summary>
+        /// Gets or sets the type of the chart rendered.
+        /// </summary>
+        [DefaultValue(eMicroChartType.Line), Category("Appearance"), Description("Indicates type of the chart rendered.")]
+        public eMicroChartType ChartType
+        {
+            get { return _ChartType; }
+            set
+            {
+                if (value != _ChartType)
+                {
+                    eMicroChartType oldValue = _ChartType;
+                    _ChartType = value;
+                    OnChartTypeChanged(oldValue, value);
+                }
+            }
+        }
+
+        private void OnChartTypeChanged(eMicroChartType oldValue, eMicroChartType newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("ChartType"));
+            InvalidateChartImage(false);
+        }
+
+        /// <summary>
+        /// Gets whether item supports text markup. Default is false.
+        /// </summary>
+        protected override bool IsMarkupSupported
+        {
+            get { return _EnableMarkup; }
+        }
+
+        private bool _EnableMarkup = true;
+        /// <summary>
+        /// Gets or sets whether text-markup support is enabled for items Text property. Default value is true.
+        /// Set this property to false to display HTML or other markup in the item instead of it being parsed as text-markup.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance"), Description("Indicates whether text-markup support is enabled for items Text property.")]
+        public bool EnableMarkup
+        {
+            get { return _EnableMarkup; }
+            set
+            {
+                if (_EnableMarkup != value)
+                {
+                    _EnableMarkup = value;
+                    NeedRecalcSize = true;
+                    OnTextChanged();
+                }
+            }
+        }
+
+        private eMicroChartTextPosition _TextPosition = eMicroChartTextPosition.Left;
+        /// <summary>
+        /// Gets or sets text-position in relation to the chart.
+        /// </summary>
+        [DefaultValue(eMicroChartTextPosition.Left), Category("Appearance"), Description("Indicates text-position in relation to the chart.")]
+        public eMicroChartTextPosition TextPosition
+        {
+            get { return _TextPosition; }
+            set
+            {
+                if (value != _TextPosition)
+                {
+                    eMicroChartTextPosition oldValue = _TextPosition;
+                    _TextPosition = value;
+                    OnTextPositionChanged(oldValue, value);
+                }
+            }
+        }
+
+        private void OnTextPositionChanged(eMicroChartTextPosition oldValue, eMicroChartTextPosition newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("TextPosition"));
+            NeedRecalcSize = true;
+            this.Refresh();
+        }
+
+        /// <summary>
+        /// Gets or sets the text associated with this item.
+        /// </summary>
+        [System.ComponentModel.Browsable(true), Editor("DevComponents.DotNetBar.Design.TextMarkupUIEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), System.ComponentModel.Category("Appearance"), System.ComponentModel.Description("The text contained in the item."), System.ComponentModel.Localizable(true), System.ComponentModel.DefaultValue("")]
+        public override string Text
+        {
+            get
+            {
+                return base.Text;
+            }
+            set
+            {
+                base.Text = value;
+            }
+        }
+
+        private bool _TextVisible = true;
+        /// <summary>
+        /// Gets or sets whether caption/label set using Text property is visible.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance"), Description("Indicates whether caption/label set using Text property is visible.")]
+        public bool TextVisible
+        {
+            get { return _TextVisible; }
+            set
+            {
+                _TextVisible = value;
+                NeedRecalcSize = true;
+                this.Refresh();
+            }
+        }
+
+        private Padding _TextPadding = new Padding(0, 0, 0, 0);
+        /// <summary>
+        /// Gets or sets text padding.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), Description("Gets or sets text padding."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public Padding TextPadding
+        {
+            get { return _TextPadding; }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeTextPadding()
+        {
+            return _TextPadding.Bottom != 0 || _TextPadding.Top != 0 || _TextPadding.Left != 0 || _TextPadding.Right != 0;
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetTextPadding()
+        {
+            _TextPadding = new Padding(0, 0, 0, 0);
+        }
+        private void TextPaddingPropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            NeedRecalcSize = true;
+            this.Refresh();
+        }
+
+        private Padding _Margin = new Padding(0, 0, 0, 0);
+        /// <summary>
+        /// Gets or sets switch margin.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), Description("Gets or sets switch margin."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public Padding Margin
+        {
+            get { return _Margin; }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeMargin()
+        {
+            return _Margin.Bottom != 0 || _Margin.Top != 0 || _Margin.Left != 0 || _Margin.Right != 0;
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetMargin()
+        {
+            _Margin = new Padding(0, 0, 0, 0);
+        }
+        private void MarginPropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            NeedRecalcSize = true;
+            this.Refresh();
+        }
+
+        private Color _TextColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets the text color.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates text color.")]
+        public Color TextColor
+        {
+            get { return _TextColor; }
+            set { _TextColor = value; }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeTextColor()
+        {
+            return !_TextColor.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetTextColor()
+        {
+            this.TextColor = Color.Empty;
+        }
+
+        private eBackgroundImagePosition _BackgroundImagePosition = eBackgroundImagePosition.Tile;
+        /// <summary>
+        /// Gets or sets the background image position
+        /// </summary>
+        [Browsable(true), Category("Appearance"), DefaultValue(eBackgroundImagePosition.Tile), Description("Specifies background image position")]
+        public eBackgroundImagePosition BackgroundImagePosition
+        {
+            get { return _BackgroundImagePosition; }
+            set
+            {
+                if (_BackgroundImagePosition != value)
+                {
+                    _BackgroundImagePosition = value;
+                    this.Refresh();
+                }
+            }
+        }
+
+        private Image _BackgroundImage = null;
+        /// <summary>
+        /// Gets or sets the background image used by the control.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), DefaultValue(null), Description("Indicates background image used by the control.")]
+        public Image BackgroundImage
+        {
+            get { return _BackgroundImage; }
+            set
+            {
+                _BackgroundImage = value;
+                this.Refresh();
+            }
+        }
+
+        private double _DataMaxValue = double.NaN;
+        /// <summary>
+        /// Gets or sets the maximum value for data points. By default maximum data point is calculated based on that data displayed by the chart, but when
+        /// two charts need to be scaled the same setting maximum and minimum values for them will ensure that scales are visually the same.
+        /// </summary>
+        [DefaultValue(double.NaN), Category("Behavior"), Description("Indicates maximum value for data points. By default maximum data point is calculated based on that data displayed by the chart, but when two charts need to be scaled the same setting maximum and minimum values for them will ensure that scales are visually the same.")]
+        public double DataMaxValue
+        {
+            get { return _DataMaxValue; }
+            set
+            {
+                if (value != _DataMaxValue)
+                {
+                    double oldValue = _DataMaxValue;
+                    _DataMaxValue = value;
+                    InvalidateChart(false);
+                    this.Refresh();
+                    OnDataMaxValueChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when DataMaxValue property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnDataMaxValueChanged(double oldValue, double newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("DataMaxValue"));
+        }
+
+        private double _DataMinValue = double.NaN;
+        /// <summary>
+        /// Gets or sets the minimum value for data points. By default minimum data point is calculated based on that data displayed by the chart, but when
+        /// two charts need to be scaled the same setting maximum and minimum values for them will ensure that scales are visually the same.
+        /// </summary>
+        [DefaultValue(double.NaN), Category("Behavior"), Description("Indicates minimum value for data points. By default minimum data point is calculated based on that data displayed by the chart, but when two charts need to be scaled the same setting maximum and minimum values for them will ensure that scales are visually the same.")]
+        public double DataMinValue
+        {
+            get { return _DataMinValue; }
+            set
+            {
+                if (value != _DataMinValue)
+                {
+                    double oldValue = _DataMinValue;
+                    _DataMinValue = value;
+                    InvalidateChart(false);
+                    this.Refresh();
+                    OnDataMinValueChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when DataMinValue property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnDataMinValueChanged(double oldValue, double newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("DataMinValue"));
+        }
+        #endregion
+
+        #region IPersonalizedMenuItem Members
+        private eMenuVisibility _MenuVisibility = eMenuVisibility.VisibleAlways;
+        /// <summary>
+        /// Indicates item's visibility when on pop-up menu.
+        /// </summary>
+        [DefaultValue(eMenuVisibility.VisibleAlways), Browsable(true), DevCoBrowsable(true), System.ComponentModel.Category("Appearance"), System.ComponentModel.Description("Indicates item's visibility when on pop-up menu.")]
+        public eMenuVisibility MenuVisibility
+        {
+            get
+            {
+                return _MenuVisibility;
+            }
+            set
+            {
+                if (_MenuVisibility != value)
+                {
+                    _MenuVisibility = value;
+                    if (ShouldSyncProperties)
+                        BarFunctions.SyncProperty(this, "MenuVisibility");
+                }
+            }
+        }
+
+        private bool _RecentlyUsed = false;
+        /// <summary>
+        /// Indicates whether item was recently used.
+        /// </summary>
+        [Browsable(false), DefaultValue(false)]
+        public bool RecentlyUsed
+        {
+            get
+            {
+                return _RecentlyUsed;
+            }
+            set
+            {
+                if (_RecentlyUsed != value)
+                {
+                    _RecentlyUsed = value;
+                    if (ShouldSyncProperties)
+                        BarFunctions.SyncProperty(this, "RecentlyUsed");
+                }
+            }
+        }
+
+        #endregion
+    }
+
+    /// <summary>
+    /// Represents MicroChart hot-points.
+    /// </summary>
+    internal struct MicroChartHotPoint
+    {
+        public Rectangle HotPointBounds;
+        public Rectangle ChartSliceBounds;
+        public Color Color;
+        public double Value;
+        public static readonly MicroChartHotPoint Empty = new MicroChartHotPoint();
+        public int DataPointIndex;
+
+        /// <summary>
+        /// Start angle for pie slice.
+        /// </summary>
+        public double StartAngle;
+        /// <summary>
+        /// Sweep angle for pie slice.
+        /// </summary>
+        public double SweepAngle;
+
+        public bool IsEmpty
+        {
+            get
+            {
+                return this.HotPointBounds.IsEmpty;
+            }
+        }
+        /// <summary>
+        /// Initializes a new instance of the MicroChartHotPoint structure.
+        /// </summary>
+        /// <param name="hotPoint"></param>
+        /// <param name="hotPointColor"></param>
+        public MicroChartHotPoint(Rectangle hotPoint, Color hotPointColor, double value, int dataPointIndex)
+        {
+            HotPointBounds = hotPoint;
+            Color = hotPointColor;
+            Value = value;
+            StartAngle = 0;
+            SweepAngle = 0;
+            ChartSliceBounds = Rectangle.Empty;
+            DataPointIndex = dataPointIndex;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the MicroChartHotPoint structure.
+        /// </summary>
+        /// <param name="hotPointBounds"></param>
+        /// <param name="chartSliceBounds"></param>
+        /// <param name="color"></param>
+        /// <param name="value"></param>
+        public MicroChartHotPoint(Rectangle hotPointBounds, Rectangle chartSliceBounds, Color color, double value, int dataPointIndex)
+        {
+            HotPointBounds = hotPointBounds;
+            ChartSliceBounds = chartSliceBounds;
+            Color = color;
+            Value = value;
+            StartAngle = 0;
+            SweepAngle = 0;
+            DataPointIndex = dataPointIndex;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the MicroChartHotPoint structure.
+        /// </summary>
+        /// <param name="bounds"></param>
+        /// <param name="color"></param>
+        /// <param name="value"></param>
+        /// <param name="startAngle"></param>
+        /// <param name="sweepAngle"></param>
+        public MicroChartHotPoint(Rectangle bounds, Color color, double value, double startAngle, double sweepAngle, int dataPointIndex)
+        {
+            HotPointBounds = bounds;
+            Color = color;
+            Value = value;
+            StartAngle = startAngle;
+            SweepAngle = sweepAngle;
+            ChartSliceBounds = Rectangle.Empty;
+            DataPointIndex = dataPointIndex;
+        }
+    }
+
+    /// <summary>
+    /// Defines available MicroChar types.
+    /// </summary>
+    public enum eMicroChartType
+    {
+        /// <summary>
+        /// Identifies Plot chart.
+        /// </summary>
+        Plot,
+        /// <summary>
+        /// Identifies WinLose chart.
+        /// </summary>
+        WinLose,
+        /// <summary>
+        /// Identifies Area chart.
+        /// </summary>
+        Area,
+        /// <summary>
+        /// Identifies Line chart.
+        /// </summary>
+        Line,
+        /// <summary>
+        /// Identifies Column chart.
+        /// </summary>
+        Column,
+        /// <summary>
+        /// Identifies Bar chart.
+        /// </summary>
+        Bar,
+        /// <summary>
+        /// Identifies Pie chart.
+        /// </summary>
+        Pie,
+        /// <summary>
+        /// Identifies 100% bar.
+        /// </summary>
+        HundredPercentBar
+    }
+
+
+    /// <summary>
+    /// Defines micro-chart text position in relation to the chart.
+    /// </summary>
+    public enum eMicroChartTextPosition
+    {
+        /// <summary>
+        /// Text is positioned to the left of the chart.
+        /// </summary>
+        Left,
+        /// <summary>
+        /// Text is positioned to the right of the chart.
+        /// </summary>
+        Right,
+        /// <summary>
+        /// Text is positioned on top of the chart.
+        /// </summary>
+        Top,
+        /// <summary>
+        /// Text is positioned on bottom of the chart.
+        /// </summary>
+        Bottom
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/MicroCharts/PieMicroChart.cs b/PROMS/DotNetBar Source Code/MicroCharts/PieMicroChart.cs
new file mode 100644
index 00000000..07227f52
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/MicroCharts/PieMicroChart.cs	
@@ -0,0 +1,165 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+using System.ComponentModel;
+using System.Drawing.Drawing2D;
+
+namespace DevComponents.DotNetBar.MicroCharts
+{
+    internal class PieMicroChart : MicroChartBase
+    {
+        public override void CreateChart(MicroChartRenderInfo info)
+        {
+            int chartWidth = Math.Min(info.ChartHeight, info.ChartWidth) - 1;
+            int x = (info.ChartWidth - chartWidth) / 2;
+            int y = (info.ChartHeight - chartWidth) / 2;
+
+            int dataStep = Math.Max(1, ((info.DataPoints.Count * 15) / 360));
+
+            PieMicroChartStyle style = this.Style;
+            Graphics graphics = info.Graphics;
+            double sum = info.Sum;
+
+            if (dataStep > 1)
+            {
+                sum = 0;
+                for (int i = 0; i < info.DataPoints.Count; i += dataStep)
+                    sum += Math.Abs(info.DataPoints[i]);
+            }
+
+            float angle = 0;
+            
+            int colorsCount = _Style.SliceColors.Count;
+            int sliceColor = 0;
+            
+            int totalPoints = (int)Math.Ceiling((double)info.DataPoints.Count / dataStep);
+            MicroChartHotPoint[] microHotPoints = new MicroChartHotPoint[totalPoints];
+            int hotPointIndex = 0;
+
+            using (Pen pen = new Pen(_Style.SliceOutlineColor, 1))
+            {
+                for (int i = 0; i < info.DataPoints.Count; i += dataStep)
+                {
+                    double value = Math.Abs(info.DataPoints[i]);
+                    float sweepAngle = (float)Math.Max(1, Math.Round((float)(360 * (value / sum))));
+
+                    using (SolidBrush brush = new SolidBrush(_Style.SliceColors[sliceColor]))
+                        graphics.FillPie(brush, x, y, chartWidth, chartWidth, angle, sweepAngle);
+                    graphics.DrawPie(pen, x, y, chartWidth, chartWidth, angle, sweepAngle);
+
+                    Rectangle hotPointBounds = new Rectangle(
+                        x + (int)(chartWidth / 2 + chartWidth / 3 * Math.Cos((angle + sweepAngle / 2) * Math.PI / 180)),
+                        y + (int)(chartWidth / 2 + chartWidth / 3 * Math.Sin((angle + sweepAngle / 2) * Math.PI / 180)),
+                        1, 1);
+                    hotPointBounds.Inflate(4, 4);
+                    microHotPoints[hotPointIndex] = new MicroChartHotPoint(hotPointBounds, _Style.SliceColors[sliceColor], value, angle, sweepAngle, i);
+                    hotPointIndex++;
+
+                    angle += sweepAngle;
+                    sliceColor++;
+                    if (sliceColor >= colorsCount)
+                        sliceColor = 0;
+                }
+            }
+
+            info.MicroChartHotPoints = microHotPoints;
+        }
+
+        private PieMicroChartStyle _Style;
+        public virtual PieMicroChartStyle Style
+        {
+            get { return _Style; }
+            set { _Style = value; }
+        }
+    }
+    /// <summary>
+    /// Defines the style for pie chart.
+    /// </summary>
+    [System.ComponentModel.ToolboxItem(false), System.ComponentModel.DesignTimeVisible(false), TypeConverter(typeof(System.ComponentModel.ExpandableObjectConverter))]
+    public class PieMicroChartStyle
+    {
+        private List<Color> _SliceColors = new List<Color>();
+        /// <summary>
+        /// Initializes a new instance of the PieMicroChartStyle class.
+        /// </summary>
+        public PieMicroChartStyle()
+        {
+            _SliceColors.AddRange(new Color[]{ColorScheme.GetColor(0xC00000), ColorScheme.GetColor(0xFF0000), 
+                ColorScheme.GetColor(0xFFC000), ColorScheme.GetColor(0xFFFF00), ColorScheme.GetColor(0x92D050),
+                ColorScheme.GetColor(0x00B050), ColorScheme.GetColor(0x00B0F0), ColorScheme.GetColor(0x0070C0),
+                ColorScheme.GetColor(0x002060), ColorScheme.GetColor(0x7030A0), ColorScheme.GetColor(0xEEECE1),
+                ColorScheme.GetColor(0x1F497D), ColorScheme.GetColor(0x4F81BD), ColorScheme.GetColor(0xC0504D),
+                ColorScheme.GetColor(0x9BBB59), ColorScheme.GetColor(0x8064A2), ColorScheme.GetColor(0x4BACC6),
+                ColorScheme.GetColor(0xF79646), ColorScheme.GetColor(0xF2F2F2), ColorScheme.GetColor(0xDDD9C3),
+                ColorScheme.GetColor(0xC6D9F0), ColorScheme.GetColor(0xF2DCDB), ColorScheme.GetColor(0xEBF1DD),
+                ColorScheme.GetColor(0xE5E0EC), ColorScheme.GetColor(0xDBEEF3), ColorScheme.GetColor(0xFDEADA),
+                ColorScheme.GetColor(0xD8D8D8), ColorScheme.GetColor(0xC4BD97), ColorScheme.GetColor(0x8DB3E2),
+                ColorScheme.GetColor(0xE5B9B7), ColorScheme.GetColor(0xD7E3BC), ColorScheme.GetColor(0xCCC1D9),
+                ColorScheme.GetColor(0xB7DDE8), ColorScheme.GetColor(0xFBD5B5), ColorScheme.GetColor(0xBFBFBF),
+                ColorScheme.GetColor(0x938953), ColorScheme.GetColor(0x548DD4), ColorScheme.GetColor(0x95B3D7),
+                ColorScheme.GetColor(0xD99694), ColorScheme.GetColor(0xC3D69B), ColorScheme.GetColor(0xB2A1C7),
+                ColorScheme.GetColor(0x92CDDC), ColorScheme.GetColor(0xFAC08F), ColorScheme.GetColor(0xA5A5A5),
+                ColorScheme.GetColor(0x494429), ColorScheme.GetColor(0x17365D), ColorScheme.GetColor(0x366092),
+                ColorScheme.GetColor(0x953734), ColorScheme.GetColor(0x76923C), ColorScheme.GetColor(0x5F497A),
+                ColorScheme.GetColor(0x31859B), ColorScheme.GetColor(0xE36C09)
+            });
+        }
+
+        /// <summary>
+        /// Occurs when style appearance changes.
+        /// </summary>
+        public event EventHandler StyleChanged;
+        /// <summary>
+        /// Raises StyleChanged event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnStyleChanged(EventArgs e)
+        {
+            EventHandler handler = StyleChanged;
+            if (handler != null)
+                handler(this, e);
+        }
+        private void OnStyleChanged()
+        {
+            OnStyleChanged(EventArgs.Empty);
+        }
+
+        /// <summary>
+        /// Gets the pre-defined slice colors for the pie chart.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public List<Color> SliceColors
+        {
+            get { return _SliceColors; }
+        }
+
+        private Color _SliceOutlineColor = ColorScheme.GetColor(0xE2E4E7);
+        /// <summary>
+        /// Gets or sets the color of the slice outline.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates color of slice outline.")]
+        public Color SliceOutlineColor
+        {
+            get { return _SliceOutlineColor; }
+            set { _SliceOutlineColor = value; OnStyleChanged(); }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeSliceOutlineColor()
+        {
+            return _SliceOutlineColor != ColorScheme.GetColor(0xE2E4E7);
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetSliceOutlineColor()
+        {
+            this.SliceOutlineColor = ColorScheme.GetColor(0xE2E4E7);
+        }
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/MicroCharts/PlotMicroChart.cs b/PROMS/DotNetBar Source Code/MicroCharts/PlotMicroChart.cs
new file mode 100644
index 00000000..92c99a3c
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/MicroCharts/PlotMicroChart.cs	
@@ -0,0 +1,592 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.MicroCharts
+{
+    internal class PlotMicroChart : MicroChartBase
+    {
+        public override void CreateChart(MicroChartRenderInfo info)
+        {
+            Graphics graphics = info.Graphics;
+
+            int pointRadius = Dpi.Width(PointRadius);
+            int chartHeight = info.ChartHeight - pointRadius * 2;
+            int chartWidth = info.ChartWidth - pointRadius*2;
+
+            int drawStep = Math.Max(4, (chartWidth / (Math.Max(1, info.DataPoints.Count - 1))));
+            int dataStep = Math.Max(1, ((info.DataPoints.Count * drawStep) / chartWidth));
+            int x = pointRadius;
+            double dataPointMinValue = info.DataPointMinValue;
+            double dataPointMaxValue = info.DataPointMaxValue;
+
+            if (_Style.DrawZeroLine && dataPointMinValue > _Style.ZeroLineValue)
+                dataPointMinValue = _Style.ZeroLineValue;
+            if (_Style.DrawControlLine1)
+            {
+                if (dataPointMinValue > _Style.ControlLine1StartValue)
+                    dataPointMinValue = _Style.ControlLine1StartValue;
+                if (dataPointMinValue > _Style.ControlLine1EndValue)
+                    dataPointMinValue = _Style.ControlLine1EndValue;
+                if (dataPointMaxValue < _Style.ControlLine1StartValue)
+                    dataPointMaxValue = _Style.ControlLine1StartValue;
+                if (dataPointMaxValue < _Style.ControlLine1EndValue)
+                    dataPointMaxValue = _Style.ControlLine1EndValue;
+            }
+            if (_Style.DrawControlLine2)
+            {
+                if (dataPointMinValue > _Style.ControlLine2StartValue)
+                    dataPointMinValue = _Style.ControlLine2StartValue;
+                if (dataPointMinValue > _Style.ControlLine2EndValue)
+                    dataPointMinValue = _Style.ControlLine2EndValue;
+                if (dataPointMaxValue < _Style.ControlLine2StartValue)
+                    dataPointMaxValue = _Style.ControlLine2StartValue;
+                if (dataPointMaxValue < _Style.ControlLine2EndValue)
+                    dataPointMaxValue = _Style.ControlLine2EndValue;
+            }
+
+            double range = dataPointMaxValue - dataPointMinValue;
+            if (range == 0) range = 1;
+
+            int totalPoints = (int)Math.Ceiling((double)info.DataPoints.Count / dataStep);
+            Point[] chartPoints = new Point[totalPoints];
+            MicroChartHotPoint[] microHotPoints = new MicroChartHotPoint[totalPoints];
+            int index = 0;
+
+            if (_Style.DrawAverageLine && !_Style.AverageLineColor.IsEmpty)
+            {
+                using (Pen pen = new Pen(_Style.AverageLineColor, Dpi.Width1))
+                    graphics.DrawLine(pen, 0, chartHeight / 2, chartWidth, chartHeight / 2);
+            }
+
+            //if (_Style.DrawTrendLine && !_Style.TrendLineColor.IsEmpty)
+            //{
+            //    using (Pen pen = new Pen(_Style.TrendLineColor))
+            //        graphics.DrawLine(pen, 0, (int)(chartHeight * (1 - (info.TrendInfo.Start - dataPointMinValue) / range)),
+            //            chartWidth, (int)(chartHeight * (1 - (info.TrendInfo.End - dataPointMinValue) / range)));
+            //}
+
+            if (_Style.DrawZeroLine && !_Style.ZeroLineColor.IsEmpty)
+            {
+                using (Pen pen = new Pen(_Style.ZeroLineColor, Dpi.Width1))
+                {
+                    int y = Math.Min((int)(chartHeight * (1 - (_Style.ZeroLineValue - dataPointMinValue) / range)) + pointRadius, chartHeight - 1);
+                    if (y < 0) y = 0;
+                    graphics.DrawLine(pen, 0, y, chartWidth, y);
+                }
+            }
+            if (_Style.DrawControlLine1 && !_Style.ControlLine1Color.IsEmpty)
+            {
+                using (Pen pen = new Pen(_Style.ControlLine1Color, Dpi.Width1))
+                {
+                    int y1 = Math.Min((int)(chartHeight * (1 - (_Style.ControlLine1StartValue - dataPointMinValue) / range)) + pointRadius, (chartHeight + pointRadius) - 1);
+                    if (y1 < 0) y1 = 0;
+                    int y2 = Math.Min((int)(chartHeight * (1 - (_Style.ControlLine1EndValue - dataPointMinValue) / range)) + pointRadius, (chartHeight + pointRadius) - 1);
+                    if (y2 < 0) y2 = 0;
+                    graphics.DrawLine(pen, 0, y1, chartWidth, y2);
+                }
+            }
+            if (_Style.DrawControlLine2 && !_Style.ControlLine2Color.IsEmpty)
+            {
+                using (Pen pen = new Pen(_Style.ControlLine2Color, Dpi.Width1))
+                {
+                    int y1 = Math.Min((int)(chartHeight * (1 - (_Style.ControlLine2StartValue - dataPointMinValue) / range)) + pointRadius, (chartHeight + pointRadius) - 1);
+                    if (y1 < 0) y1 = 0;
+                    int y2 = Math.Min((int)(chartHeight * (1 - (_Style.ControlLine2EndValue - dataPointMinValue) / range)) + pointRadius, (chartHeight + pointRadius) - 1);
+                    if (y2 < 0) y2 = 0;
+                    graphics.DrawLine(pen, 0, y1, chartWidth, y2);
+                }
+            }
+
+            Point lowPoint = Point.Empty, highPoint = Point.Empty;
+
+            using (Brush plotBrush = new SolidBrush(_Style.PlotColor))
+            {
+                for (int i = 0; i < info.DataPoints.Count; i += dataStep)
+                {
+                    double value = info.DataPoints[i];
+                    Point p = new Point(x, Math.Min((int)(chartHeight * (1 - (value - dataPointMinValue) / range)), chartHeight - 1) + pointRadius);
+                    
+                    if (lowPoint.IsEmpty && value == info.DataPointMinValue)
+                        lowPoint = p;
+                    else if (/*highPoint.IsEmpty &&*/ value == info.DataPointMaxValue)
+                        highPoint = p;
+
+                    graphics.FillEllipse(plotBrush, new Rectangle(p.X - Dpi.Width1, p.Y - Dpi.Height1, Dpi.Width3, Dpi.Height3));
+
+                    chartPoints[index] = p;
+                    microHotPoints[index] = new MicroChartHotPoint(GetHotPointBounds(p, info), new Rectangle(x, 0, drawStep, chartHeight), _Style.PlotColor, value, index);
+                    index++;
+                    x += drawStep;
+                }
+            }
+
+            if (!lowPoint.IsEmpty && !_Style.LowPointColor.IsEmpty)
+            {
+                using (SolidBrush brush = new SolidBrush(_Style.LowPointColor))
+                    graphics.FillPolygon(brush, GetChartPointBounds(lowPoint));
+            }
+
+            if (!highPoint.IsEmpty && !_Style.HighPointColor.IsEmpty)
+            {
+                using (SolidBrush brush = new SolidBrush(_Style.HighPointColor))
+                    graphics.FillPolygon(brush, GetChartPointBounds(highPoint));
+            }
+
+            if (!_Style.FirstPointColor.IsEmpty && chartPoints.Length > 0)
+            {
+                using (SolidBrush brush = new SolidBrush(_Style.FirstPointColor))
+                    graphics.FillPolygon(brush, GetChartPointBounds(chartPoints[0]));
+            }
+
+            if (!_Style.LastPointColor.IsEmpty && chartPoints.Length > 1)
+            {
+                using (SolidBrush brush = new SolidBrush(_Style.LastPointColor))
+                    graphics.FillPolygon(brush, GetChartPointBounds(chartPoints[chartPoints.Length - 1]));
+            }
+
+            info.MicroChartHotPoints = microHotPoints;
+
+        }
+        private static int HotPointOffset
+        {
+            get { return Dpi.Width4; }
+        }
+        private Rectangle GetHotPointBounds(Point hotPoint, MicroChartRenderInfo info)
+        {
+            //Rectangle bounds = new Rectangle(Math.Min(info.ChartWidth - HotPointOffset * 2, Math.Max(-1, hotPoint.X - HotPointOffset)),
+            //    Math.Min(info.ChartHeight - HotPointOffset * 2, Math.Max(-1, hotPoint.Y - HotPointOffset)),
+            //    HotPointOffset * 2,
+            //    HotPointOffset * 2);
+            Rectangle bounds = new Rectangle(hotPoint.X - HotPointOffset,
+                hotPoint.Y - HotPointOffset,
+                HotPointOffset * 2,
+                HotPointOffset * 2);
+            return bounds;
+        }
+
+        private PlotMicroChartStyle _Style;
+        public PlotMicroChartStyle Style
+        {
+            get { return _Style; }
+            set { _Style = value; }
+        }
+    }
+
+    /// <summary>
+    /// Defines the style for the plot micro chart.
+    /// </summary>
+    [System.ComponentModel.ToolboxItem(false), System.ComponentModel.DesignTimeVisible(false), TypeConverter(typeof(System.ComponentModel.ExpandableObjectConverter))]
+    public class PlotMicroChartStyle
+    {
+        /// <summary>
+        /// Occurs when style appearance changes.
+        /// </summary>
+        public event EventHandler StyleChanged;
+        /// <summary>
+        /// Raises StyleChanged event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnStyleChanged(EventArgs e)
+        {
+            EventHandler handler = StyleChanged;
+            if (handler != null)
+                handler(this, e);
+        }
+        private void OnStyleChanged()
+        {
+            OnStyleChanged(EventArgs.Empty);
+        }
+
+        private Color _PlotColor = Color.Black;
+        /// <summary>
+        /// Gets or sets the color of the chart line.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates color of chart line .")]
+        public Color PlotColor
+        {
+            get { return _PlotColor; }
+            set { _PlotColor = value; OnStyleChanged(); }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializePlotColor()
+        {
+            return _PlotColor != Color.Black;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetPlotColor()
+        {
+            this.PlotColor = Color.Black;
+        }
+
+        private bool _DrawAverageLine = false;
+        /// <summary>
+        /// Gets or sets whether average line is drawn.
+        /// </summary>
+        [DefaultValue(false), Category("Appearance")]
+        public bool DrawAverageLine
+        {
+            get { return _DrawAverageLine; }
+            set
+            {
+                _DrawAverageLine = value;
+                OnStyleChanged();
+            }
+        }
+
+        private Color _AverageLineColor = ColorScheme.GetColor(0xFAC08F);
+        /// <summary>
+        /// Gets or sets the color of the 
+        /// </summary>
+        [Category("Columns"), Description("Indicates color of.")]
+        public Color AverageLineColor
+        {
+            get { return _AverageLineColor; }
+            set { _AverageLineColor = value; OnStyleChanged(); }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeAverageLineColor()
+        {
+            return _AverageLineColor != ColorScheme.GetColor(0xFAC08F);
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetAverageLineColor()
+        {
+            this.AverageLineColor = ColorScheme.GetColor(0xFAC08F);
+        }
+
+        //private bool _DrawTrendLine = false;
+        //[DefaultValue(false), Category("Appearance")]
+        //public bool DrawTrendLine
+        //{
+        //    get { return _DrawTrendLine; }
+        //    set
+        //    {
+        //        _DrawTrendLine = value;
+        //    }
+        //}
+
+        //private Color _TrendLineColor = ColorScheme.GetColor(0xBFBFBF);
+        ///// <summary>
+        ///// Gets or sets the color of the trend line.
+        ///// </summary>
+        //[Category("Columns"), Description("Indicates color of trend line.")]
+        //public Color TrendLineColor
+        //{
+        //    get { return _TrendLineColor; }
+        //    set { _TrendLineColor = value; }
+        //}
+        ///// <summary>
+        ///// Gets whether property should be serialized.
+        ///// </summary>
+        //[EditorBrowsable(EditorBrowsableState.Never)]
+        //public bool ShouldSerializeTrendLineColor()
+        //{
+        //    return !_TrendLineColor.IsEmpty;
+        //}
+        ///// <summary>
+        ///// Resets property to its default value.
+        ///// </summary>
+        //[EditorBrowsable(EditorBrowsableState.Never)]
+        //public void ResetTrendLineColor()
+        //{
+        //    this.TrendLineColor = Color.Empty;
+        //}
+
+        private bool _DrawZeroLine = false;
+        /// <summary>
+        /// Gets or sets whether zero-line is drawn on chart.
+        /// </summary>
+        [DefaultValue(false), Category("Appearance"), Description("Gets or sets whether zero-line is drawn on chart.")]
+        public bool DrawZeroLine
+        {
+            get { return _DrawZeroLine; }
+            set
+            {
+                _DrawZeroLine = value;
+                OnStyleChanged();
+            }
+        }
+
+        private double _ZeroLineValue = 0d;
+        /// <summary>
+        /// Gets or sets the value of the zero line, i.e. where zero line is drawn. Default value is 0.
+        /// </summary>
+        [DefaultValue(0d), Category("Appearance"), Description("Indicates value of the zero line, i.e. where zero line is drawn.")]
+        public double ZeroLineValue
+        {
+            get { return _ZeroLineValue; }
+            set
+            {
+                _ZeroLineValue = value;
+                OnStyleChanged();
+            }
+        }
+
+        private Color _ZeroLineColor = Color.Red;
+        /// <summary>
+        /// Gets or sets the color of the 
+        /// </summary>
+        [Category("Columns"), Description("Indicates color of.")]
+        public Color ZeroLineColor
+        {
+            get { return _ZeroLineColor; }
+            set { _ZeroLineColor = value; OnStyleChanged(); }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeZeroLineColor()
+        {
+            return _ZeroLineColor != Color.Red;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetZeroLineColor()
+        {
+            this.ZeroLineColor = Color.Red;
+        }
+
+        private Color _HighPointColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets the color of the high point dot on chart.
+        /// </summary>
+        [Category("Columns"), Description("Indicates color of high point dot on chart..")]
+        public Color HighPointColor
+        {
+            get { return _HighPointColor; }
+            set { _HighPointColor = value; OnStyleChanged(); }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeHighPointColor()
+        {
+            return !_HighPointColor.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetHighPointColor()
+        {
+            this.HighPointColor = Color.Empty;
+        }
+
+        private Color _LowPointColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets the color of the low point dot on chart.
+        /// </summary>
+        [Category("Columns"), Description("Indicates color of low point dot on chart.")]
+        public Color LowPointColor
+        {
+            get { return _LowPointColor; }
+            set { _LowPointColor = value; OnStyleChanged(); }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeLowPointColor()
+        {
+            return !_LowPointColor.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetLowPointColor()
+        {
+            this.LowPointColor = Color.Empty;
+        }
+
+        private Color _FirstPointColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets the color of the first point dot on chart.
+        /// </summary>
+        [Category("Columns"), Description("Indicates color of first point dot on chart..")]
+        public Color FirstPointColor
+        {
+            get { return _FirstPointColor; }
+            set { _FirstPointColor = value; OnStyleChanged(); }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeFirstPointColor()
+        {
+            return !_FirstPointColor.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetFirstPointColor()
+        {
+            this.FirstPointColor = Color.Empty;
+        }
+
+        private Color _LastPointColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets the color of the last point dot on chart.
+        /// </summary>
+        [Category("Columns"), Description("Indicates color of last point dot on chart.")]
+        public Color LastPointColor
+        {
+            get { return _LastPointColor; }
+            set { _LastPointColor = value; OnStyleChanged(); }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeLastPointColor()
+        {
+            return !_LastPointColor.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetLastPointColor()
+        {
+            this.LastPointColor = Color.Empty;
+        }
+
+        private bool _DrawControlLine1 = false;
+        /// <summary>
+        /// Gets or sets whether control line is drawn. Default value is false. Control lines can be used to display for example low and high control bounds for the chart.
+        /// </summary>
+        [DefaultValue(false), Description("Indicates whether control line is drawn. Control lines can be used to display for example low and high control bounds for the chart")]
+        public bool DrawControlLine1
+        {
+            get { return _DrawControlLine1; }
+            set { _DrawControlLine1 = value; OnStyleChanged(); }
+        }
+
+        private Color _ControlLine1Color = Color.Empty;
+        /// <summary>
+        /// Gets or sets the color of the first control line.
+        /// </summary>
+        [Category("Columns"), Description("Indicates color of.")]
+        public Color ControlLine1Color
+        {
+            get { return _ControlLine1Color; }
+            set { _ControlLine1Color = value; OnStyleChanged(); }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeControlLine1Color()
+        {
+            return !_ControlLine1Color.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetControlLine1Color()
+        {
+            this.ControlLine1Color = Color.Empty;
+        }
+        private double _ControlLine1StartValue = 0d;
+        /// <summary>
+        /// Gets or sets starting value that is used to draw first control line.
+        /// </summary>
+        [DefaultValue(0d), Description("Indicates the starting value that is used to draw first control line.")]
+        public double ControlLine1StartValue
+        {
+            get { return _ControlLine1StartValue; }
+            set { _ControlLine1StartValue = value; OnStyleChanged(); }
+        }
+        private double _ControlLine1EndValue = 0d;
+        /// <summary>
+        /// Gets or sets end value that is used to draw first control line.
+        /// </summary>
+        [DefaultValue(0d), Description("Indicates the end value that is used to draw first control line.")]
+        public double ControlLine1EndValue
+        {
+            get { return _ControlLine1EndValue; }
+            set { _ControlLine1EndValue = value; OnStyleChanged(); }
+        }
+
+
+        private bool _DrawControlLine2 = false;
+        /// <summary>
+        /// Gets or sets whether control line is drawn. Default value is false. Control lines can be used to display for example low and high control bounds for the chart.
+        /// </summary>
+        [DefaultValue(false), Description("Indicates whether control line is drawn. Control lines can be used to display for example low and high control bounds for the chart")]
+        public bool DrawControlLine2
+        {
+            get { return _DrawControlLine2; }
+            set { _DrawControlLine2 = value; OnStyleChanged(); }
+        }
+
+        private Color _ControlLine2Color = Color.Empty;
+        /// <summary>
+        /// Gets or sets the color of the second control line.
+        /// </summary>
+        [Category("Columns"), Description("Indicates color of second control line.")]
+        public Color ControlLine2Color
+        {
+            get { return _ControlLine2Color; }
+            set { _ControlLine2Color = value; OnStyleChanged(); }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeControlLine2Color()
+        {
+            return !_ControlLine2Color.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetControlLine2Color()
+        {
+            this.ControlLine2Color = Color.Empty;
+        }
+        private double _ControlLine2StartValue = 0d;
+        /// <summary>
+        /// Gets or sets starting value that is used to draw second control line.
+        /// </summary>
+        [DefaultValue(0d), Description("Indicates the starting value that is used to draw first second line.")]
+        public double ControlLine2StartValue
+        {
+            get { return _ControlLine2StartValue; }
+            set { _ControlLine2StartValue = value; OnStyleChanged(); }
+        }
+        private double _ControlLine2EndValue = 0d;
+        /// <summary>
+        /// Gets or sets end value that is used to draw second control line.
+        /// </summary>
+        [DefaultValue(0d), Description("Indicates the end value that is used to draw second control line.")]
+        public double ControlLine2EndValue
+        {
+            get { return _ControlLine2EndValue; }
+            set { _ControlLine2EndValue = value; OnStyleChanged(); }
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/MicroCharts/WinLoseMicroChart.cs b/PROMS/DotNetBar Source Code/MicroCharts/WinLoseMicroChart.cs
new file mode 100644
index 00000000..96e05948
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/MicroCharts/WinLoseMicroChart.cs	
@@ -0,0 +1,77 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.MicroCharts
+{
+    internal class WinLoseMicroChart : BarBaseMicroChart
+    {
+        public override void CreateChart(MicroChartRenderInfo info)
+        {
+            Graphics graphics = info.Graphics;
+
+            int chartHeight = info.ChartHeight;
+            int chartWidth = info.ChartWidth;
+
+            BarMicroChartStyle style = this.Style;
+            int drawStep = Math.Max(style.MinBarSize, (chartWidth / (Math.Max(1, info.DataPoints.Count - 1))));
+            int dataStep = Math.Max(1, ((info.DataPoints.Count * drawStep) / chartWidth));
+            int x = 0;
+
+            double zeroValue = style.ZeroLineValue;
+
+            int totalPoints = (int)Math.Ceiling((double)info.DataPoints.Count / dataStep);
+            MicroChartHotPoint[] microHotPoints = new MicroChartHotPoint[totalPoints];
+            int index = 0;
+            int zeroY = chartHeight / 2;
+
+            System.Drawing.Drawing2D.SmoothingMode smoothingMode = graphics.SmoothingMode;
+            graphics.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.Default;
+
+            using (SolidBrush positiveBarBrush = new SolidBrush(style.PositiveBarColor))
+            {
+                using (SolidBrush negativeBarBrush = new SolidBrush(style.NegativeBarColor))
+                {
+                    for (int i = 0; i < info.DataPoints.Count; i += dataStep)
+                    {
+                        double value = info.DataPoints[i];
+                        if (value > style.ZeroLineValue)
+                        {
+                            Rectangle barBounds = new Rectangle(x, 0, drawStep, Math.Max(1, zeroY));
+                            
+                            if (value == info.DataPointMaxValue && !style.HighPointBarColor.IsEmpty)
+                            {
+                                using (SolidBrush brush = new SolidBrush(style.HighPointBarColor))
+                                    graphics.FillRectangle(brush, barBounds);
+                            }
+                            else
+                                graphics.FillRectangle(positiveBarBrush, barBounds);
+
+                            microHotPoints[index] = new MicroChartHotPoint(GetHotPointBounds(barBounds, true), new Rectangle(barBounds.X, 0, barBounds.Width, chartHeight), style.PositiveBarColor, value, index);
+                        }
+                        else
+                        {
+                            Rectangle barBounds = new Rectangle(x, zeroY, drawStep, Math.Max(1, chartHeight - zeroY));
+
+                            if (value == info.DataPointMinValue && !style.LowPointBarColor.IsEmpty)
+                            {
+                                using (SolidBrush brush = new SolidBrush(style.LowPointBarColor))
+                                    graphics.FillRectangle(brush, barBounds);
+                            }
+                            else
+                                graphics.FillRectangle(negativeBarBrush, barBounds);
+
+                            microHotPoints[index] = new MicroChartHotPoint(GetHotPointBounds(barBounds, false), new Rectangle(barBounds.X, 0, barBounds.Width, chartHeight), style.NegativeBarColor, value, index);
+                        }
+
+                        index++;
+                        x += drawStep;
+                    }
+                }
+            }
+            graphics.SmoothingMode = smoothingMode;
+            info.MicroChartHotPoints = microHotPoints;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/MonthCalendarAdv.ico b/PROMS/DotNetBar Source Code/MonthCalendarAdv.ico
new file mode 100644
index 00000000..29e30b66
Binary files /dev/null and b/PROMS/DotNetBar Source Code/MonthCalendarAdv.ico differ
diff --git a/PROMS/DotNetBar Source Code/NativeFunctions.cs b/PROMS/DotNetBar Source Code/NativeFunctions.cs
new file mode 100644
index 00000000..c8ee52bc
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/NativeFunctions.cs	
@@ -0,0 +1,776 @@
+namespace DevComponents.DotNetBar
+{
+    using System;
+	using System.Runtime.InteropServices;
+    using System.Drawing;
+using System.Security;
+
+	[Flags()]
+	internal enum eDrawCaption:uint		/* flags for DrawCaption */
+	{
+		DC_ACTIVE=0x0001,
+		DC_SMALLCAP=0x0002,
+		DC_ICON=0x0004,
+		DC_TEXT=0x0008,
+		DC_INBUTTON=0x0010,
+		DC_GRADIENT=0x0020
+    }
+
+    /// <summary>
+    ///    Summary description for NativeFunctions.
+    /// </summary>
+    [SuppressUnmanagedCodeSecurity()]
+    internal class NativeFunctions
+    {
+        #region Licensing
+#if !TRIAL
+		internal static bool keyValidated=false;
+		internal static int keyValidated2=0;
+		internal static bool ValidateLicenseKey(string key)
+		{
+			bool ret = false;
+			string[] parts = key.Split('-');
+			int i = 10;
+			foreach(string s in parts)
+			{
+				if(s=="88405280")
+					i++;
+				else if(s=="D06E")
+					i += 10;
+				else if(s=="4617")
+					i += 8;
+				else if(s=="8810")
+					i += 12;
+				else if(s=="64462F60FA93")
+					i += 3;
+			}
+			if(i==29)
+				return true;
+			keyValidated = true;
+			return ret;
+		}
+        internal static bool CheckLicenseKey(string key)
+        {
+            // F962CEC7-CD8F-4911-A9E9-CAB39962FC1F, 189, 266
+            string[] parts = key.Split('-');
+            int test = 0;
+            for (int i = parts.Length - 1; i >= 0; i--)
+            {
+                if (parts[i] == "A9E9")
+                    test += 11;
+                else if (parts[i] == "F962CEC7")
+                    test += 12;
+                else if (parts[i] == "CAB39962FC1F")
+                    test += 2;
+                else if (parts[i] == "4911")
+                    test += 99;
+                else if (parts[i] == "CD8F")
+                    test += 65;
+            }
+
+            keyValidated2 = test + 77;
+
+            if (test == 23)
+                return false;
+
+            return true;
+        }
+#endif
+        #endregion
+
+#if TRIAL
+		private static Color m_ColorExpFlag=Color.Empty;
+        internal static bool CheckedThrough = false;
+		internal static bool ColorExpAlt()
+		{
+#if NOTIMELIMIT
+				return false;
+#else
+			Color clr=SystemColors.Control;
+			Color clr2;
+			Color clr3;
+			clr2=clr;
+			if(clr2.ToArgb()==clr.ToArgb())
+			{
+				clr3=clr2;
+			}
+			else
+			{
+				clr3=clr;
+			}
+
+			if(!m_ColorExpFlag.IsEmpty)
+			{
+				return (m_ColorExpFlag==Color.Black?false:true);
+			}
+			try
+			{
+				Microsoft.Win32.RegistryKey key=Microsoft.Win32.Registry.ClassesRoot;
+                try
+                {
+                    key = key.CreateSubKey("CLSID\\{C0093B14-207D-4406-826D-7186EF33C7E5}\\InprocServer32");
+                }
+                catch (System.UnauthorizedAccessException)
+                {
+                    key = key.OpenSubKey("CLSID\\{C0093B14-207D-4406-826D-7186EF33C7E5}\\InprocServer32");
+                }
+				try
+				{
+					if(key.GetValue("")==null || key.GetValue("").ToString()=="")
+					{
+						key.SetValue("",DateTime.Today.ToOADate().ToString());
+					}
+					else
+					{
+						if(key.GetValue("").ToString()=="windows3.dll")
+						{
+							m_ColorExpFlag=Color.White;
+							key.Close();
+							key=null;
+							return true;
+						}
+						DateTime date=DateTime.FromOADate(double.Parse(key.GetValue("").ToString()));
+						if(((TimeSpan)DateTime.Today.Subtract(date)).TotalDays>28)
+						{
+							m_ColorExpFlag=Color.White;
+							key.SetValue("","windows4.dll");
+							key.Close();
+							key=null;
+							return true;
+						}
+						if(((TimeSpan)DateTime.Today.Subtract(date)).TotalDays<0)
+						{
+							m_ColorExpFlag=Color.White;
+							key.SetValue("","windows3.dll");
+							key.Close();
+							key=null;
+							return true;
+						}
+					}
+				}
+				finally
+				{
+					if(key!=null)
+						key.Close();
+                    CheckedThrough = true;
+				}
+			}
+			catch{}
+			m_ColorExpFlag=Color.Black;
+			return false;
+#endif
+		}
+#endif
+
+        [StructLayout(LayoutKind.Sequential)]
+		public struct RECT
+		{
+			public RECT(int left,int top,int right,int bottom)
+			{
+				this.Left=left;
+				this.Top=top;
+				this.Right=right;
+				this.Bottom=bottom;
+			}
+			public int Left;
+			public int Top;
+			public int Right;
+			public int Bottom;
+
+            public static RECT FromRectangle(Rectangle rectangle)
+            {
+                return new RECT(rectangle.Left, rectangle.Top, rectangle.Right, rectangle.Bottom);
+            }
+		}
+
+		[StructLayout(LayoutKind.Sequential)]
+		public struct POINT
+		{
+            public POINT(System.Drawing.Point p)
+            {
+                this.x = p.X;
+                this.y = p.Y;
+            }
+            public POINT(int x, int y)
+            {
+                this.x = x;
+                this.y = y;
+            }
+			public int x;
+			public int y;
+		}
+
+		[StructLayout(LayoutKind.Sequential)]
+		public struct SIZE
+		{
+			public int cx;
+			public int cy;
+		}
+
+		[StructLayout(LayoutKind.Sequential)]
+        public struct TRACKMOUSEEVENT {
+            public int cbSize;
+            public uint dwFlags;
+            public int dwHoverTime;
+            public IntPtr hwndTrack;
+        }
+
+		[StructLayout(LayoutKind.Sequential)]
+        public struct WINDOWPOS {
+			public int hwnd;
+			public int hwndInsertAfter;
+			public int  x;
+			public int  y;
+			public int  cx;
+			public int  cy;
+			public int flags;
+        }
+
+		[DllImport("user32.dll")] 
+		public static extern int MapWindowPoints( 
+			IntPtr hWndFrom, 
+			IntPtr hWndTo, 
+			ref POINT lpPoints, 
+			int cPoints);
+
+        [DllImport("user32.dll")]
+        static extern int GetClassName(IntPtr hWnd, [Out] System.Text.StringBuilder lpClassName, int nMaxCount);
+
+        [DllImport("user32.dll")]
+        public static extern IntPtr GetFocus();
+
+        [DllImport("user32.dll")]
+        public static extern IntPtr SetFocus(IntPtr hWnd);
+
+		[DllImport("user32.dll")] 
+		public static extern IntPtr GetForegroundWindow();
+
+		[DllImport("user32")]
+		public static extern IntPtr WindowFromPoint(POINT p);
+
+        [DllImport("user32.dll")]
+        public static extern IntPtr ChildWindowFromPointEx(IntPtr hWndParent, POINT pt, uint uFlags);
+
+        /// <summary>
+        /// For use with ChildWindowFromPointEx
+        /// </summary>
+        [Flags]
+        public enum WindowFromPointFlags
+        {
+            /// <summary>
+            /// Does not skip any child windows
+            /// </summary>
+            CWP_ALL = 0x0000,
+            /// <summary>
+            /// Skips invisible child windows
+            /// </summary>
+            CWP_SKIPINVISIBLE = 0x0001,
+            /// <summary>
+            /// Skips disabled child windows
+            /// </summary>
+            CWP_SKIPDISABLED = 0x0002,
+            /// <summary>
+            /// Skips transparent child windows
+            /// </summary>
+            CWP_SKIPTRANSPARENT = 0x0004
+        }
+
+        [DllImport("user32")]
+		public static extern IntPtr ChildWindowFromPoint(IntPtr parent, POINT p);
+        [DllImport("user32.dll")]
+        public static extern IntPtr RealChildWindowFromPoint(IntPtr hwndParent, POINT ptParentClientCoords);
+
+		[DllImport("user32")]
+		public static extern bool DrawIconEx(IntPtr hDC, int X, int Y, IntPtr hIcon, int width, int height, int frameIndex, IntPtr flickerFreeBrush, int flags);
+
+		[DllImport("user32")]
+		public static extern uint MapVirtualKey(uint uCode, uint uMapType);
+
+		[DllImport("user32")]
+		public static extern bool GetKeyboardState(byte[] state);
+
+		[DllImport("user32.dll")]
+		public static extern bool DrawCaption(IntPtr hwnd, IntPtr hdc, ref RECT lprc,eDrawCaption uFlags);
+
+		[DllImport("user32")]
+		public static extern int ToAscii(uint uVirtKey, uint uScanCode, byte[] lpKeyState,  byte[] lpChar, uint uFlags);
+
+		[DllImport("user32")]
+		public static extern int SetFocus(int hWnd);
+
+		[DllImport("user32")]
+		public static extern bool IsWindow(int hWnd);
+
+		[DllImport("user32")]
+		public static extern bool TrackMouseEvent(ref TRACKMOUSEEVENT tme);
+
+		[DllImport("user32")]
+        public static extern bool DrawEdge(int hdc,ref RECT pRect, uint edge, uint grfFlags);
+
+		[DllImport("user32")]
+		public static extern bool SetWindowPos(IntPtr hWnd, IntPtr hWndInsertAfter, int X, int Y, int cx, int cy, int uFlags);
+		
+//		[DllImport("user32")]
+//		public static extern bool ShowWindow(IntPtr hWnd, int nCmdShow);
+		[DllImport("user32")]
+		public static extern int SetWindowRgn(IntPtr hWnd, IntPtr hRgn, bool bRedraw);
+
+		//[DllImport("user32")]
+		//public static extern bool InvalidateRect(IntPtr hWnd, ref RECT lpRect, bool bErase);
+
+        [DllImport("user32")]
+        public static extern bool RedrawWindow(IntPtr hWnd, [In] ref RECT lprcUpdate, IntPtr hrgnUpdate, uint flags);
+        //[DllImport("user32")]
+        //public static extern bool RedrawWindow(IntPtr hWnd, IntPtr lprcUpdate, IntPtr hrgnUpdate, uint flags);
+
+		[DllImport("user32")]
+		public static extern bool SystemParametersInfo(
+			uint uiAction,  // system parameter to retrieve or set
+			uint uiParam,   // depends on action to be taken
+			ref bool pvParam,  // depends on action to be taken
+			uint fWinIni    // user profile update option
+			);
+        [DllImport("user32")]
+        public static extern bool SystemParametersInfo(
+            uint uiAction,  // system parameter to retrieve or set
+            uint uiParam,   // depends on action to be taken
+            ref int pvParam,  // depends on action to be taken
+            uint fWinIni    // user profile update option
+            );
+		public const uint SPI_GETMENUANIMATION=0x1002;
+		public const uint SPI_GETMENUFADE=0x1012;
+		public const uint SPI_GETMENUUNDERLINES=0x100A;
+		public const uint SPI_GETDROPSHADOW=0x1024;
+		public const uint SPI_GETCURSORSHADOW=0x101A;
+		public const uint SPI_GETMENUDROPALIGNMENT=27;
+        public const uint SM_CXBORDER = 5;
+
+        public static int BorderMultiplierFactor
+        {
+            get
+            {
+                int i = 0;
+                SystemParametersInfo(SM_CXBORDER, 0, ref i, 0);
+                return i;
+            }
+        }
+
+		[DllImport("gdi32")]
+        public static extern int SetROP2(int hDC, int DrawMode);
+
+		[DllImport("gdi32")]
+		public static extern int SelectClipRgn(IntPtr hDC, int hRgn);
+		[DllImport("gdi32")]
+		public static extern int  CreateRectRgn(
+			int nLeftRect,   // x-coordinate of upper-left corner
+			int nTopRect,    // y-coordinate of upper-left corner
+			int nRightRect,  // x-coordinate of lower-right corner
+			int nBottomRect  // y-coordinate of lower-right corner
+			);
+
+		[DllImport("gdi32")]
+        public static extern int CreateDC(string lpszDriver, int lpszDevice, int lpszOutput, int lpInitData);
+
+        [DllImport("gdi32")]
+        public static extern bool DeleteDC(int hDC);
+
+		[DllImport("user32")]
+		public static extern bool DrawFocusRect(int hDC, ref RECT r);
+		[DllImport("User32.dll", CharSet=CharSet.Auto)]
+		public static extern IntPtr GetDC(IntPtr hWnd);
+
+        [DllImport("user32")]
+        public static extern bool PostMessage(IntPtr hWnd, int Msg, int wParam, int lParam);
+        [DllImport("user32")]
+        public static extern bool PostMessage(IntPtr hWnd, int Msg, IntPtr wParam, IntPtr lParam);
+		[DllImport("user32")]
+		public static extern int SendMessage(IntPtr hWnd, int Msg, int wParam, int lParam);
+
+        [DllImport("user32.dll")]
+        public static extern int TrackPopupMenu(IntPtr hMenu, uint uFlags, int x, int y,
+           int nReserved, IntPtr hWnd, IntPtr prcRect);
+        [DllImport("user32.dll")]
+        public static extern IntPtr GetSystemMenu(IntPtr hWnd, bool bRevert);
+
+		[DllImport("user32")]
+		public static extern IntPtr GetDesktopWindow();
+		[DllImport("user32")]
+		public static extern IntPtr GetActiveWindow();
+
+		[DllImport("user32")]
+		public static extern bool SetLayeredWindowAttributes(IntPtr hwnd, int crKey, byte bAlpha, int dwFlags);
+		public const int LWA_COLORKEY=0x00000001;
+		public const int LWA_ALPHA=0x00000002;
+		[DllImport("User32.dll", CharSet=CharSet.Auto)]
+		public static extern bool UpdateLayeredWindow(IntPtr hwnd, IntPtr hdcDst, ref POINT pptDst, ref SIZE psize, IntPtr hdcSrc, ref POINT pprSrc, Int32 crKey, ref BLENDFUNCTION pblend, Int32 dwFlags);
+        [DllImport("user32.dll", ExactSpelling = true, SetLastError = true)]
+        public static extern bool UpdateLayeredWindow(IntPtr hwnd, IntPtr hdcDst, ref Point pptDst, ref Size psize, IntPtr hdcSrc, ref Point pprSrc, Int32 crKey, ref BLENDFUNCTION pblend, Int32 dwFlags);
+
+		[StructLayout(LayoutKind.Sequential, Pack=1)]
+		public struct BLENDFUNCTION
+		{
+			public byte BlendOp;
+			public byte BlendFlags;
+			public byte SourceConstantAlpha;
+			public byte AlphaFormat;
+		}
+		public enum Win32UpdateLayeredWindowsFlags
+		{
+			ULW_COLORKEY = 0x00000001,
+			ULW_ALPHA    = 0x00000002,
+			ULW_OPAQUE   = 0x00000004
+		}
+
+		public enum Win23AlphaFlags : byte
+		{
+			AC_SRC_OVER  = 0x00,
+			AC_SRC_ALPHA = 0x01
+		}
+
+		const int R2_NOTXORPEN=10; // DPx
+
+		[DllImport("winmm")]
+		public static extern int sndPlaySound(string lpszSoundName, int uFlags);
+		public const int SND_ASYNC=0x0001;  /* play asynchronously */
+		public const int SND_NODEFAULT=0x0002;  /* silence (!default) if sound not found */
+
+		[DllImport("user32")]
+		public static extern bool ValidateRect(IntPtr hWnd,ref NativeFunctions.RECT pRect);
+		[DllImport("user32")]
+		public static extern bool LockWindowUpdate(IntPtr hWndLock);
+
+		// 3D border styles
+		public const uint 
+			BDR_RAISEDOUTER=0x0001,
+            BDR_SUNKENOUTER=0x0002,
+            BDR_RAISEDINNER=0x0004,
+            BDR_SUNKENINNER=0x0008,
+            BDR_OUTER=(BDR_RAISEDOUTER | BDR_SUNKENOUTER),
+            BDR_INNER=(BDR_RAISEDINNER | BDR_SUNKENINNER),
+            BDR_RAISED=(BDR_RAISEDOUTER | BDR_RAISEDINNER),
+            BDR_SUNKEN=(BDR_SUNKENOUTER | BDR_SUNKENINNER),
+            EDGE_RAISED=(BDR_RAISEDOUTER | BDR_RAISEDINNER),
+            EDGE_SUNKEN=(BDR_SUNKENOUTER | BDR_SUNKENINNER),
+            EDGE_ETCHED=(BDR_SUNKENOUTER | BDR_RAISEDINNER),
+            EDGE_BUMP=(BDR_RAISEDOUTER | BDR_SUNKENINNER);
+        // Border flags
+        public const uint
+			BF_LEFT=0x0001,
+            BF_TOP=0x0002,
+            BF_RIGHT=0x0004,
+            BF_BOTTOM=0x0008,
+            BF_TOPLEFT=(BF_TOP | BF_LEFT),
+            BF_TOPRIGHT=(BF_TOP | BF_RIGHT),
+            BF_BOTTOMLEFT=(BF_BOTTOM | BF_LEFT),
+            BF_BOTTOMRIGHT=(BF_BOTTOM | BF_RIGHT),
+            BF_RECT=(BF_LEFT | BF_TOP | BF_RIGHT | BF_BOTTOM),
+            BF_DIAGONAL=0x0010,
+			// For diagonal lines, the BF_RECT flags specify the end point of the
+			// vector bounded by the rectangle parameter.
+			BF_DIAGONAL_ENDTOPRIGHT=(BF_DIAGONAL | BF_TOP | BF_RIGHT),
+			BF_DIAGONAL_ENDTOPLEFT=(BF_DIAGONAL | BF_TOP | BF_LEFT),
+			BF_DIAGONAL_ENDBOTTOMLEFT=(BF_DIAGONAL | BF_BOTTOM | BF_LEFT),
+			BF_DIAGONAL_ENDBOTTOMRIGHT=(BF_DIAGONAL | BF_BOTTOM | BF_RIGHT),
+			BF_MIDDLE=0x0800,  /* Fill in the middle */
+			BF_SOFT=0x1000,  /* For softer buttons */
+			BF_ADJUST=0x2000,  /* Calculate the space left over */
+			BF_FLAT=0x4000,  /* For flat rather than 3D borders */
+			BF_MONO=0x8000;  /* For monochrome borders */
+
+		// Track Mouse Event Flags
+		public const uint
+			TME_HOVER=0x00000001,
+			TME_LEAVE=0x00000002,
+			TME_NONCLIENT=0x00000010,
+			TME_QUERY=0x40000000,
+			TME_CANCEL=0x80000000,
+			HOVER_DEFAULT=0xFFFFFFFF;
+
+		public const long WM_ACTIVATEAPP=0x001C;
+		public const int WM_LBUTTONDOWN=0x0201;
+		public const int WM_LBUTTONUP=0x0202;
+		public const int WM_LBUTTONDBLCLK=0x0203;
+		public const int WM_NCLBUTTONDOWN=0x00A1;
+		public const int WM_NCMBUTTONDBLCLK=0x00A9;
+		public const int WM_NCACTIVATE=0x0086;
+		public const int WM_RBUTTONDOWN=0x0204;
+		public const int WM_RBUTTONUP=0x0205;
+		public const int WM_MBUTTONDOWN=0x0207;
+		public const int WM_NCRBUTTONDOWN=0x00A4;
+		public const int WM_NCMBUTTONDOWN=0x00A7;
+		public const int WM_CONTEXTMENU=0x007B;
+		public const int WM_USER=0x0400;
+		public const int WM_MOUSEMOVE=0x0200;
+		public const int WM_MOUSELEAVE=0x02A3;
+		public const int HWND_TOP=0;
+		public const int HWND_BOTTOM=1;
+		public const int HWND_TOPMOST=-1;
+		public const int HWND_NOTOPMOST=-2;
+		public const int SWP_NOMOVE=0x0002;
+		public const int SWP_NOSIZE=0x0001;
+		public const int SWP_NOACTIVATE=0x0010;
+		public const int SWP_NOZORDER=0x0004;
+		public const int SWP_SHOWWINDOW=0x0040;
+		public const int SWP_HIDEWINDOW=0x0080;
+        public const int SWP_FRAMECHANGED = 0x0020;
+        public const int SWP_NOOWNERZORDER = 0x0200;  /* Don't do owner Z ordering */
+        public const int SWP_NOSENDCHANGING = 0x0400;
+
+		public const int WM_SETFOCUS=0x0007;
+		public const int WM_KILLFOCUS=0x0008;
+		public const int WM_SHOWWINDOW = 0x18;
+		public const int WM_SETREDRAW=0x000B;
+		public const int WM_PAINT=0x000F;
+        public const int WM_MOUSEWHEEL = 0x20A;
+        public const int WM_HSCROLL = 0x0114;
+        public const int WM_VSCROLL = 0x0115;
+
+
+
+		//public const int WM_KEYFIRST					=0x0100;
+		//public const int WM_KEYUP                       =0x0101;
+		//public const int WM_CHAR                        =0x0102;
+		//public const int WM_DEADCHAR                    =0x0103;
+		public const int WM_SYSKEYDOWN                  =0x0104;
+		public const int WM_SYSKEYUP                    =0x0105;
+		//public const int WM_SYSCHAR                     =0x0106;
+
+		public const int WM_ACTIVATE=0x0006;
+		public const int WA_INACTIVE=0;
+		public const int WA_ACTIVE=1;
+		public const int WA_CLICKACTIVE=2;
+
+		// Animate Window Constants
+		public const int AW_HOR_POSITIVE             =0x00000001;
+		public const int AW_HOR_NEGATIVE             =0x00000002;
+		public const int AW_VER_POSITIVE             =0x00000004;
+		public const int AW_VER_NEGATIVE             =0x00000008;
+		public const int AW_CENTER                   =0x00000010;
+		public const int AW_HIDE                     =0x00010000;
+		public const int AW_ACTIVATE                 =0x00020000;
+		public const int AW_SLIDE                    =0x00040000;
+		public const int AW_BLEND                    =0x00080000;
+
+		public const int WM_SYSCOMMAND=0x0112;
+		public const int SC_CLOSE=0xF060;
+        public const int SC_CONTEXTHELP = 0xF180;
+		public const int SC_NEXTWINDOW=0xF040;
+		public const int SC_PREVWINDOW=0xF050;
+		public const int SC_KEYMENU=0xF100;
+		public const int SC_RESTORE=0xF120;
+		public const int SC_MINIMIZE=0xF020;
+		public const int SC_MAXIMIZE=0xF030;
+        public const int SC_MOVE = 0xF010;
+        public const int SC_SIZE = 0xF000;
+
+		public const int WM_MOUSEACTIVATE = 0x21;
+		public const int MA_NOACTIVATE = 3;
+		public const int MA_NOACTIVATEANDEAT = 4;
+		public const uint WS_POPUP=0x80000000;
+		public const uint WS_CLIPSIBLINGS=0x04000000;
+		public const uint WS_CLIPCHILDREN=0x02000000;
+		public const uint WS_EX_TOPMOST=0x00000008;
+		public const uint WS_EX_TOOLWINDOW=0x00000080;
+
+		public const int WM_THEMECHANGED=0x031A;
+		public const int WM_PRINTCLIENT=0x0318;
+
+		[DllImport("user32",SetLastError=true, CharSet=CharSet.Auto)]
+		public static extern int AnimateWindow(IntPtr hWnd, int dwTime, int dwFlags);
+
+		[DllImport("gdi32",SetLastError=true, CharSet=CharSet.Auto)]
+		public static extern int GetDeviceCaps(int hdc, int nIndex);
+		public const int WM_DISPLAYCHANGE = 0x7E;
+		public const int BITSPIXEL = 12; // Number of bits per pixel
+		//[DllImport("gdi32",SetLastError=true, CharSet=CharSet.Auto, EntryPoint="CreateDC")]
+		//public static extern int CreateDCAsNull(string lpDriverName, int lpDeviceName, int lpOutput, int lpInitData);
+//		[DllImport("gdi32",SetLastError=true, CharSet=CharSet.Auto)]
+//        public static extern int DeleteDC(int hdc);
+
+		[StructLayout(LayoutKind.Sequential)]
+		public struct OSVERSIONINFO 
+		{
+			public int dwOSVersionInfoSize;
+			public int dwMajorVersion;
+			public int dwMinorVersion;
+			public int dwBuildNumber;
+			public int dwPlatformId;
+			[MarshalAs(UnmanagedType.ByValTStr, SizeConst=128)]
+			public string szCSDVersion;
+		}
+		[DllImport("kernel32.Dll")] public static extern short GetVersionEx(ref OSVERSIONINFO o);
+
+		public static void DrawReversibleDesktopRect(System.Drawing.Rectangle rect, int iWidth)
+		{
+//			System.Windows.Forms.ControlPaint.DrawReversibleFrame(rect,System.Drawing.SystemColors.ControlText,System.Windows.Forms.FrameStyle.Thick);
+//			return;
+			RECT r;
+			r.Left=rect.Left;
+			r.Top=rect.Top;
+			r.Right=rect.Right;
+			r.Bottom=rect.Bottom;
+			int dc=CreateDC("DISPLAY",0,0,0);
+			int oldRop=SetROP2(dc,R2_NOTXORPEN);
+			for(int i=0;i<iWidth;i++)
+			{
+				DrawFocusRect(dc,ref r);
+				r.Left++;
+				r.Top++;
+				r.Right--;
+				r.Bottom--;
+			}
+			SetROP2(dc,oldRop);
+			DeleteDC(dc);
+		}
+
+		public static char GetAccessKey(string s)
+		{
+			int i=s.IndexOf('&',0);
+			while(i>=0 && i<s.Length-1)
+			{
+				i++;
+				if(s[i]!='&')
+				{
+					return (s.Substring(i,1).ToLower())[0];
+				}
+				i=s.IndexOf('&',i);
+			}
+			return '\0';
+		}
+
+		public static void DrawRectangle(System.Drawing.Graphics g, System.Drawing.Pen pen,  int x, int y, int Width, int Height)
+		{
+			// TODO: BETA 2 fix for drawing the rectangle
+			Width--;
+			Height--;
+			g.DrawRectangle(pen,x,y,Width,Height);
+		}
+		public static void DrawRectangle(System.Drawing.Graphics g, System.Drawing.Pen pen, System.Drawing.Rectangle r)
+		{
+			DrawRectangle(g,pen,r.X,r.Y,r.Width,r.Height);
+		}
+
+		public static ePopupAnimation SystemMenuAnimation
+		{
+			get
+			{
+				bool bRet=false;
+				SystemParametersInfo(SPI_GETMENUANIMATION,0,ref bRet,0);
+				if(bRet)
+				{
+					bRet=false;
+					SystemParametersInfo(SPI_GETMENUFADE,0,ref bRet,0);
+					if(bRet)
+						return ePopupAnimation.Fade;
+					else
+						return ePopupAnimation.Slide;
+				}
+				return ePopupAnimation.None;
+			}
+		}
+
+		private static bool m_ShowKeyboardCues=true;
+		public static bool ShowKeyboardCues
+		{
+			get
+			{
+				return m_ShowKeyboardCues;
+			}
+		}
+		private static bool m_ShowDropShadow=true;
+		public static bool ShowDropShadow
+		{
+			get
+			{
+				return m_ShowDropShadow;
+			}
+		}
+		internal static void RefreshSettings()
+		{
+#if FRAMEWORK20
+            m_ShowKeyboardCues = System.Windows.Forms.SystemInformation.MenuAccessKeysUnderlined;
+            m_ShowDropShadow = System.Windows.Forms.SystemInformation.IsDropShadowEnabled;
+            m_CursorShadow = m_ShowDropShadow;
+            m_RightHandedMenus = System.Windows.Forms.SystemInformation.RightAlignedMenus;
+#else
+            bool bRet=false;
+            SystemParametersInfo(SPI_GETMENUUNDERLINES,0,ref bRet,0);
+			m_ShowKeyboardCues=bRet;
+            bRet=false;
+            SystemParametersInfo(SPI_GETDROPSHADOW,0,ref bRet,0);
+			m_ShowDropShadow=bRet;
+			bRet=false;
+            SystemParametersInfo(SPI_GETCURSORSHADOW,0,ref bRet,0);
+			m_CursorShadow=bRet;
+			bRet=false;
+            SystemParametersInfo(SPI_GETMENUDROPALIGNMENT,0,ref bRet,0);
+			m_RightHandedMenus=bRet;
+#endif
+        }
+
+		public static int ColorDepth=0;
+		internal static void OnDisplayChange()
+		{
+			int hdc = CreateDC("DISPLAY", 0, 0, 0);
+            ColorDepth = GetColorDepth(hdc);
+			DeleteDC(hdc);
+		}
+
+        internal static int GetColorDepth(int hdc)
+        {
+            return GetDeviceCaps(hdc, BITSPIXEL);
+        }
+
+		public static bool AlphaBlendingSupported
+		{
+			get
+			{
+				if(Environment.OSVersion.Version.Major>=5)  // Windows 2000 and up
+					return true;
+				else
+					return false;
+			}
+		}
+
+		private static bool m_CursorShadow=true;
+		public static bool CursorShadow
+		{
+			get
+			{
+				return m_CursorShadow;
+			}
+		}
+
+		private static bool m_RightHandedMenus=false;
+		public static bool RightHandedMenus
+		{
+			get { return m_RightHandedMenus; }
+		}
+
+		[DllImport("user32.dll")]
+		public static extern int GetSystemMetrics(int nIndex);
+		public const int SM_REMOTESESSION = 0x1000;
+		public static bool IsTerminalSession() 
+		{
+			return ( 0 != GetSystemMetrics(SM_REMOTESESSION) );
+		}
+
+        public static string GetClassName(IntPtr handle)
+        {
+            System.Text.StringBuilder className = new System.Text.StringBuilder(150);
+            //Get the window class name
+            int res = GetClassName(handle, className, className.Capacity);
+            if (res != 0)
+            {
+                return className.ToString();
+            }
+
+            return "";
+        }
+
+        public static int MAKELPARAM(int low, int high)
+        {
+            return ((high << 0x10) | (low & 0xffff));
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/NavPaneOptions.cs b/PROMS/DotNetBar Source Code/NavPaneOptions.cs
new file mode 100644
index 00000000..9a8f4895
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/NavPaneOptions.cs	
@@ -0,0 +1,238 @@
+using System;
+using System.Drawing;
+using System.Collections;
+using System.ComponentModel;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Summary description for NavPaneOptions.
+	/// </summary>
+	public class NavPaneOptions : System.Windows.Forms.Form
+	{
+		internal System.Windows.Forms.Label labelListCaption;
+		private NavigationBarContainer m_NavBar=null;
+		private System.Windows.Forms.CheckedListBox lbButtons;
+		internal System.Windows.Forms.Button cmdMoveUp;
+        internal System.Windows.Forms.Button cmdMoveDown;
+        internal System.Windows.Forms.Button cmdReset;
+        internal System.Windows.Forms.Button cmdOK;
+        internal System.Windows.Forms.Button cmdCancel;
+
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.Container components = null;
+
+		public NavPaneOptions()
+		{
+			//
+			// Required for Windows Form Designer support
+			//
+			InitializeComponent();
+            cmdReset.Visible = false;
+		}
+
+		public NavigationBarContainer NavBarContainer
+		{
+			get {return m_NavBar;}
+			set 
+			{
+				m_NavBar=value;
+				ContainerChanged();
+			}
+		}
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		protected override void Dispose( bool disposing )
+		{
+			if( disposing )
+			{
+				if(components != null)
+				{
+					components.Dispose();
+				}
+			}
+			base.Dispose( disposing );
+		}
+
+		private void ContainerChanged()
+		{
+			lbButtons.Items.Clear();
+			if(m_NavBar==null)
+				return;
+			foreach(BaseItem item in m_NavBar.SubItems)
+			{
+				lbButtons.Items.Add(item,item.Visible);
+			}
+		}
+
+		#region Windows Form 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.labelListCaption = new System.Windows.Forms.Label();
+			this.lbButtons = new System.Windows.Forms.CheckedListBox();
+			this.cmdMoveUp = new System.Windows.Forms.Button();
+			this.cmdMoveDown = new System.Windows.Forms.Button();
+			this.cmdReset = new System.Windows.Forms.Button();
+			this.cmdOK = new System.Windows.Forms.Button();
+			this.cmdCancel = new System.Windows.Forms.Button();
+			this.SuspendLayout();
+			// 
+			// label1
+			// 
+			this.labelListCaption.AutoSize = true;
+			this.labelListCaption.Location = new System.Drawing.Point(8, 8);
+			this.labelListCaption.Name = "labelListCaption";
+			this.labelListCaption.Size = new System.Drawing.Size(144, 13);
+			this.labelListCaption.TabIndex = 0;
+			this.labelListCaption.Text = "Display &buttons in this order";
+			// 
+			// lbButtons
+			// 
+			this.lbButtons.Location = new System.Drawing.Point(8, 32);
+			this.lbButtons.Name = "lbButtons";
+			this.lbButtons.Size = new System.Drawing.Size(210, 109);
+			this.lbButtons.TabIndex = 1;
+			this.lbButtons.SelectedIndexChanged += new System.EventHandler(this.lbButtons_SelectedIndexChanged);
+			// 
+			// cmdMoveUp
+			// 
+			this.cmdMoveUp.FlatStyle = System.Windows.Forms.FlatStyle.System;
+			this.cmdMoveUp.Location = new System.Drawing.Point(224, 32);
+			this.cmdMoveUp.Name = "cmdMoveUp";
+			this.cmdMoveUp.TabIndex = 2;
+			this.cmdMoveUp.Text = "Move &Up";
+			this.cmdMoveUp.Click += new System.EventHandler(this.cmdMoveUp_Click);
+			// 
+			// cmdMoveDown
+			// 
+			this.cmdMoveDown.FlatStyle = System.Windows.Forms.FlatStyle.System;
+			this.cmdMoveDown.Location = new System.Drawing.Point(224, 64);
+			this.cmdMoveDown.Name = "cmdMoveDown";
+			this.cmdMoveDown.TabIndex = 3;
+			this.cmdMoveDown.Text = "Move &Down";
+			this.cmdMoveDown.Click += new System.EventHandler(this.cmdMoveDown_Click);
+			// 
+			// cmdReset
+			// 
+			this.cmdReset.FlatStyle = System.Windows.Forms.FlatStyle.System;
+			this.cmdReset.Location = new System.Drawing.Point(224, 104);
+			this.cmdReset.Name = "cmdReset";
+			this.cmdReset.TabIndex = 4;
+			this.cmdReset.Text = "&Reset";
+			this.cmdReset.Click += new System.EventHandler(this.cmdReset_Click);
+			// 
+			// cmdOK
+			// 
+			this.cmdOK.DialogResult = System.Windows.Forms.DialogResult.OK;
+			this.cmdOK.FlatStyle = System.Windows.Forms.FlatStyle.System;
+			this.cmdOK.Location = new System.Drawing.Point(144, 152);
+			this.cmdOK.Name = "cmdOK";
+			this.cmdOK.TabIndex = 5;
+			this.cmdOK.Text = "OK";
+			this.cmdOK.Click += new System.EventHandler(this.cmdOK_Click);
+			// 
+			// cmdCancel
+			// 
+			this.cmdCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.cmdCancel.FlatStyle = System.Windows.Forms.FlatStyle.System;
+			this.cmdCancel.Location = new System.Drawing.Point(224, 152);
+			this.cmdCancel.Name = "cmdCancel";
+			this.cmdCancel.TabIndex = 6;
+			this.cmdCancel.Text = "Cancel";
+			// 
+			// NavPaneOptions
+			// 
+			this.AutoScaleBaseSize = new System.Drawing.Size(5, 13);
+			this.ClientSize = new System.Drawing.Size(304, 182);
+			this.Controls.AddRange(new System.Windows.Forms.Control[] {
+																		  this.cmdCancel,
+																		  this.cmdOK,
+																		  this.cmdReset,
+																		  this.cmdMoveDown,
+																		  this.cmdMoveUp,
+																		  this.lbButtons,
+																		  this.labelListCaption});
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.Name = "NavPaneOptions";
+			this.ShowInTaskbar = false;
+			this.Text = "Navigation Pane Options";
+			this.ResumeLayout(false);
+
+		}
+		#endregion
+
+		private void lbButtons_SelectedIndexChanged(object sender, System.EventArgs e)
+		{
+			if(lbButtons.SelectedIndex==0)
+				cmdMoveUp.Enabled=false;
+			else
+				cmdMoveUp.Enabled=true;
+
+			if(lbButtons.SelectedIndex==lbButtons.Items.Count-1)
+				cmdMoveDown.Enabled=false;
+			else
+                cmdMoveDown.Enabled=true;
+		}
+
+		private void cmdMoveUp_Click(object sender, System.EventArgs e)
+		{
+			if(lbButtons.SelectedIndex<0)
+				return;
+			BaseItem item=lbButtons.SelectedItem as BaseItem;
+			int i=lbButtons.SelectedIndex;
+            bool isChecked = lbButtons.GetItemChecked(i);
+			lbButtons.Items.RemoveAt(i);
+			i--;
+			lbButtons.Items.Insert(i,item);
+            lbButtons.SetItemChecked(i, isChecked);
+			lbButtons.SelectedIndex=i;
+		}
+
+		private void cmdMoveDown_Click(object sender, System.EventArgs e)
+		{
+			if(lbButtons.SelectedIndex<0)
+				return;
+			BaseItem item=lbButtons.SelectedItem as BaseItem;
+			int i=lbButtons.SelectedIndex;
+            bool isChecked = lbButtons.GetItemChecked(i);
+			lbButtons.Items.RemoveAt(i);
+			i++;
+			lbButtons.Items.Insert(i,item);
+			lbButtons.SetItemChecked(i,isChecked);
+			lbButtons.SelectedIndex=i;
+		}
+
+		private void cmdReset_Click(object sender, System.EventArgs e)
+		{
+		    
+		}
+
+		private void cmdOK_Click(object sender, System.EventArgs e)
+		{
+			m_NavBar.SuspendLayout=true;
+			m_NavBar.SubItems._Clear();
+			for(int i=0;i<lbButtons.Items.Count;i++)
+			{
+				BaseItem item=lbButtons.Items[i] as BaseItem;
+				item.Visible=lbButtons.GetItemChecked(i);
+				m_NavBar.SubItems._Add(item);
+			}
+			m_NavBar.SuspendLayout=false;
+            if (m_NavBar.ContainerControl is BarBaseControl)
+                ((BarBaseControl)m_NavBar.ContainerControl).RecalcLayout();
+            m_NavBar.OptionsDialogClosed();
+		}
+
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/NavPaneOptions.resx b/PROMS/DotNetBar Source Code/NavPaneOptions.resx
new file mode 100644
index 00000000..7076b266
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/NavPaneOptions.resx	
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+            Microsoft ResX Schema 
+        
+            Version 1.3
+                
+            The primary goals of this format is to allow a simple XML format 
+            that is mostly human readable. The generation and parsing of the 
+            various data types are done through the TypeConverter classes 
+            associated with the data types.
+        
+            Example:
+        
+                ... ado.net/XML headers & schema ...
+                <resheader name="resmimetype">text/microsoft-resx</resheader>
+                <resheader name="version">1.3</resheader>
+                <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+                <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+                <data name="Name1">this is my long string</data>
+                <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+                <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+                    [base64 mime encoded serialized .NET Framework object]
+                </data>
+                <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+                    [base64 mime encoded string representing a byte array form of the .NET Framework object]
+                </data>
+        
+            There are any number of "resheader" rows that contain simple 
+            name/value pairs.
+            
+            Each data row contains a name, and value. The row also contains a 
+            type or mimetype. Type corresponds to a .NET class that support 
+            text/value conversion through the TypeConverter architecture. 
+            Classes that don't support this are serialized and stored with the 
+            mimetype set.
+                     
+            The mimetype is used for serialized objects, and tells the 
+            ResXResourceReader how to depersist the object. This is currently not 
+            extensible. For a given mimetype the value must be set accordingly:
+        
+            Note - application/x-microsoft.net.object.binary.base64 is the format 
+                   that the ResXResourceWriter will generate, however the reader can 
+                   read any of the formats listed below.
+        
+            mimetype: application/x-microsoft.net.object.binary.base64
+            value   : The object must be serialized with 
+                    : System.Serialization.Formatters.Binary.BinaryFormatter
+                    : and then encoded with base64 encoding.
+        
+            mimetype: application/x-microsoft.net.object.soap.base64
+            value   : The object must be serialized with 
+                    : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+                    : and then encoded with base64 encoding.
+            mimetype: application/x-microsoft.net.object.bytearray.base64
+            value   : The object must be serialized into a byte array 
+                    : using a System.ComponentModel.TypeConverter
+                    : and then encoded with base64 encoding.
+        -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>1.3</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="$this.Name">
+    <value>NavPaneOptions</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/NavigationBar.bmp b/PROMS/DotNetBar Source Code/NavigationBar.bmp
new file mode 100644
index 00000000..c6bfce15
Binary files /dev/null and b/PROMS/DotNetBar Source Code/NavigationBar.bmp differ
diff --git a/PROMS/DotNetBar Source Code/NavigationBar.cs b/PROMS/DotNetBar Source Code/NavigationBar.cs
new file mode 100644
index 00000000..b88a822f
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/NavigationBar.cs	
@@ -0,0 +1,755 @@
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.Drawing;
+using System.Data;
+using System.Windows.Forms;
+using System.Xml;
+using System.Drawing.Drawing2D;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Represents Outlook 2003 like Navigation Bar.
+	/// </summary>
+    [ToolboxItem(true), System.Runtime.InteropServices.ComVisible(false), Designer("DevComponents.DotNetBar.Design.NavigationBarDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+	public class NavigationBar: BarBaseControl,ISupportInitialize
+	{
+		private NavigationBarContainer m_ItemContainer;
+		private bool m_SplitterVisible=false;
+		const int SPLITTER_SIZE=6;
+		private Cursor m_SavedSplitterCursor=null;
+		private bool m_SplitterMouseDown=false;
+        /// <summary>
+        /// Occurs after Options dialog which is used to customize control's content has closed by user using OK button.
+        /// </summary>
+        public event EventHandler OptionsDialogClosed;
+		/// <summary>
+		/// Default constructor.
+		/// </summary>
+		public NavigationBar():base()
+		{
+			m_ItemContainer=new NavigationBarContainer();
+			m_ItemContainer.GlobalItem=false;
+			m_ItemContainer.ContainerControl=this;
+			m_ItemContainer.Stretch=false;
+			m_ItemContainer.Displayed=true;
+			m_ItemContainer.Style=eDotNetBarStyle.Office2003;
+			m_ItemContainer.SetOwner(this);
+			this.SetBaseItemContainer(m_ItemContainer);
+
+			SetDesignTimeDefaults();
+		}
+
+        internal void InvokeOptionsDialogClosed()
+        {
+            OnOptionsDialogClosed(new EventArgs());
+        }
+        protected virtual void OnOptionsDialogClosed(EventArgs e)
+        {
+            EventHandler handler = OptionsDialogClosed;
+            if (handler != null) handler(this, e);
+        }
+        protected override void OnResize(EventArgs e)
+		{
+			base.OnResize(e);
+            if (this.Width == 0 || this.Height == 0)
+                return;
+			this.RecalcSize();
+		}
+
+		protected override void OnHandleCreated(EventArgs e)
+		{
+			base.OnHandleCreated(e);
+			this.RecalcSize();
+		}
+
+		protected override void RecalcSize()
+		{
+			if(m_Initializing || !BarFunctions.IsHandleValid(this))
+				return;
+
+			base.RecalcSize();
+
+			if(m_ItemContainer.IsRecalculatingSize)
+				return;
+
+			Rectangle r=this.GetItemContainerRectangle();
+			if(m_ItemContainer.HeightInternal>0)
+			{
+                this.Height = m_ItemContainer.HeightInternal + r.Top + Math.Max(0,this.ClientRectangle.Bottom - r.Bottom);
+			}
+		}
+
+		/// <summary>
+		/// Returns collection of items on a bar.
+		/// </summary>
+		[DesignerSerializationVisibility(DesignerSerializationVisibility.Content), Browsable(false)]
+		public SubItemsCollection Items
+		{
+			get
+			{
+				return m_ItemContainer.SubItems;
+			}
+		}
+
+		/// <summary>
+		/// Applies design-time defaults to control.
+		/// </summary>
+		public override void SetDesignTimeDefaults()
+		{
+			base.SetDesignTimeDefaults();
+
+			ApplyColorSchemeDefaults();
+
+			this.BackgroundStyle.BorderColor.ColorSchemePart=eColorSchemePart.PanelBorder;
+			this.BackgroundStyle.Border=eBorderType.SingleLine;
+		}
+
+		private void ApplyColorSchemeDefaults()
+		{
+			// ColorScheme Defaults
+            this.ColorScheme.ItemHotBorder = Color.Empty;
+            this.ColorScheme.ItemBackground = this.ColorScheme.BarBackground;
+            this.ColorScheme.ItemBackground2 = this.ColorScheme.BarBackground2;
+            this.ColorScheme.ItemHotBorder = Color.Empty;
+            this.ColorScheme.ItemPressedBorder = Color.Empty;
+            this.ColorScheme.ItemCheckedBorder = Color.Empty;
+            this.ColorScheme.ItemExpandedBackground = this.ColorScheme.ItemHotBackground;
+            this.ColorScheme.ItemExpandedBackground2 = this.ColorScheme.ItemHotBackground2;
+            this.ColorScheme.ItemExpandedShadow = Color.Empty;
+            this.ColorScheme.ItemExpandedBorder = Color.Empty;
+            this.ColorScheme.ResetChangedFlag();
+
+			this.BackgroundStyle.ApplyColorScheme(this.ColorScheme);
+		}
+
+		protected override void OnSystemColorsChanged(EventArgs e)
+		{
+			base.OnSystemColorsChanged(e);
+			Application.DoEvents();
+			this.ColorScheme.Refresh();
+			ApplyColorSchemeDefaults();
+		}
+
+		/// <summary>
+		/// Gets or sets whether Configure Buttons button is visible.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),Category("Behavior"),Description("Indicates Configure Buttons button is visible."),System.ComponentModel.DefaultValue(true)]
+		public bool ConfigureItemVisible
+		{
+			get {return m_ItemContainer.ConfigureItemVisible;}
+			set
+			{
+				m_ItemContainer.ConfigureItemVisible=value;
+				this.RecalcLayout();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets whether Show More Buttons and Show Fewer Buttons menu items are visible on Configure buttons menu.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),Category("Behavior"),Description("Indicates whether Show More Buttons and Show Fewer Buttons menu items are visible on Configure buttons menu."),System.ComponentModel.DefaultValue(true)]
+		public bool ConfigureShowHideVisible
+		{
+			get {return m_ItemContainer.ConfigureShowHideVisible;}
+			set
+			{
+				m_ItemContainer.ConfigureShowHideVisible=value;
+				this.RecalcLayout();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets whether Navigation Pane Options menu item is visible on Configure buttons menu.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),Category("Behavior"),Description("Gets or sets whether Navigation Pane Options menu item is visible on Configure buttons menu."),System.ComponentModel.DefaultValue(true)]
+		public bool ConfigureNavOptionsVisible
+		{
+			get {return m_ItemContainer.ConfigureNavOptionsVisible;}
+			set
+			{
+				m_ItemContainer.ConfigureNavOptionsVisible=value;
+				this.RecalcLayout();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets whether Navigation Pane Add/Remove Buttons menu item is visible on Configure buttons menu.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),Category("Behavior"),Description("Indicates whether Navigation Pane Add/Remove Buttons menu item is visible on Configure buttons menu."),System.ComponentModel.DefaultValue(true)]
+		public bool ConfigureAddRemoveVisible
+		{
+			get {return m_ItemContainer.ConfigureAddRemoveVisible;}
+			set
+			{
+				m_ItemContainer.ConfigureAddRemoveVisible=value;
+				this.RecalcLayout();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets whether summary line is visible.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),Category("Behavior"),Description("Indicates whether summary line is visible."),System.ComponentModel.DefaultValue(true)]
+		public bool SummaryLineVisible
+		{
+			get {return m_ItemContainer.SummaryLineVisible;}
+			set
+			{
+				m_ItemContainer.SummaryLineVisible=value;
+				this.RecalcLayout();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the padding in pixels at the top portion of the item. Height of each item will be increased by padding amount.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),Category("Layout"),Description("Indicates the padding in pixels at the top portion of the item."),DefaultValue(4)]
+		public int ItemPaddingTop
+		{
+			get {return m_ItemContainer.ItemPaddingTop;}
+			set
+			{
+				m_ItemContainer.ItemPaddingTop=value;
+				if(this.DesignMode)
+					this.RecalcLayout();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the padding in pixels for bottom portion of the item. Height of each item will be increased by padding amount.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),Category("Layout"),Description("Indicates the padding in pixels at the bottom of the item."),DefaultValue(4)]
+		public int ItemPaddingBottom
+		{
+			get {return m_ItemContainer.ItemPaddingBottom;}
+			set
+			{
+				m_ItemContainer.ItemPaddingBottom=value;
+				if(this.DesignMode)
+					this.RecalcLayout();
+			}
+		}
+
+		/// <summary>
+		/// Increases the size of the navigation bar if possible by showing more buttons on the top.
+		/// </summary>
+		public void ShowMoreButtons()
+		{
+			m_ItemContainer.ShowMoreButtons();
+		}
+
+		/// <summary>
+		/// Reduces the size of the navigation bar if possible by showing fewer buttons on the top.
+		/// </summary>
+		public void ShowFewerButtons()
+		{
+			m_ItemContainer.ShowFewerButtons();
+		}
+
+		protected override Rectangle GetItemContainerRectangle()
+		{
+			Rectangle r=base.GetItemContainerRectangle();
+			if(m_SplitterVisible)
+			{
+				r.Y+=SPLITTER_SIZE;
+				r.Height-=SPLITTER_SIZE;
+			}
+			return r;
+		}
+
+        protected override void PaintContentOnTop(ItemPaintArgs pa)
+		{
+            base.PaintContentOnTop(pa);
+			PaintSplitter(pa);
+		}
+
+		/// <summary>
+		/// Returns items container.
+		/// </summary>
+		[Browsable(false)]
+		public NavigationBarContainer ItemsContainer
+		{
+			get {return m_ItemContainer;}
+		}
+
+		/// <summary>
+		/// Returns reference to currently checked button.
+		/// </summary>
+		[Browsable(false)]
+		public ButtonItem CheckedButton
+		{
+			get
+			{
+				foreach(BaseItem item in m_ItemContainer.SubItems)
+				{
+                    if(item is ButtonItem && ((ButtonItem)item).Checked)
+						return item as ButtonItem;
+				}
+				return null;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets whether images are automatically resized to size specified in ImageSizeSummaryLine when button is on the bottom summary line of navigation bar.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),Category("Appearance"),Description("Indicates whether images are automatically resized to size specified in ImageSizeSummaryLine when button is on the bottom summary line of navigation bar."),DefaultValue(true)]
+		public bool AutoSizeButtonImage
+		{
+			get {return m_ItemContainer.AutoSizeButtonImage;}
+			set {m_ItemContainer.AutoSizeButtonImage=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets size of the image that will be use to resize images to when button button is on the bottom summary line of navigation bar and AutoSizeButtonImage=true.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),Category("Appearance"),Description("Indicates size of the image that will be use to resize images to when button button is on the bottom summary line of navigation bar and AutoSizeButtonImage=true.")]
+		public Size ImageSizeSummaryLine
+		{
+			get {return m_ItemContainer.ImageSizeSummaryLine;}
+			set {m_ItemContainer.ImageSizeSummaryLine=value;}
+		}
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeImageSizeSummaryLine()
+		{
+			return (m_ItemContainer.ImageSizeSummaryLine.Width!=16 || m_ItemContainer.ImageSizeSummaryLine.Height!=16);
+		}
+		
+		private bool m_Initializing=false;
+		void ISupportInitialize.BeginInit()
+		{
+			m_Initializing=true;
+		}
+		void ISupportInitialize.EndInit()
+		{
+			m_Initializing=false;
+			this.RecalcLayout();
+		}
+
+		/// <summary>
+		/// Saves current visual layout of navigation bar control to XML based file.
+		/// </summary>
+		/// <param name="fileName">File name to save layout to.</param>
+		public void SaveLayout(string fileName)
+		{
+			System.Xml.XmlDocument xmlDoc=new System.Xml.XmlDocument();
+			XmlElement parent=xmlDoc.CreateElement("navbarlayout");
+			xmlDoc.AppendChild(parent);
+
+			this.SaveLayout(parent);
+
+			xmlDoc.Save(fileName);
+		}
+
+		/// <summary>
+		/// Saves current visual layout of navigation bar control to XmlElement.
+		/// </summary>
+		/// <param name="xmlParent">XmlElement object that will act as a parent for the layout definition. Exact same element should be passed into the LoadLayout method to load the layout.</param>
+		public void SaveLayout(XmlElement xmlParent)
+		{
+			if(this.Items.Count==0)
+				return;
+			XmlElement root=xmlParent.OwnerDocument.CreateElement("navigationbar");
+			xmlParent.AppendChild(root);
+			root.SetAttribute("height",this.Height.ToString());
+			foreach(BaseItem item in this.Items)
+			{
+				if(item is ButtonItem && item.Name!="")
+				{
+					XmlElement xmlItem=xmlParent.OwnerDocument.CreateElement("item");
+					root.AppendChild(xmlItem);
+					xmlItem.SetAttribute("index",this.Items.IndexOf(item).ToString());
+					xmlItem.SetAttribute("name",item.Name);
+					xmlItem.SetAttribute("visible",XmlConvert.ToString(item.Visible));
+					xmlItem.SetAttribute("checked",XmlConvert.ToString(((ButtonItem)item).Checked));
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the navigation bar definition string.
+		/// </summary>
+		[Browsable(false),DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public string LayoutDefinition
+		{
+			get
+			{
+				System.Xml.XmlDocument xmlDoc=new System.Xml.XmlDocument();
+				XmlElement parent=xmlDoc.CreateElement("navbarlayout");
+				xmlDoc.AppendChild(parent);
+				this.SaveLayout(parent);
+				return xmlDoc.OuterXml;
+			}
+			set
+			{
+				System.Xml.XmlDocument xmlDoc=new System.Xml.XmlDocument();
+				xmlDoc.LoadXml(value);
+				LoadLayout(xmlDoc.FirstChild as XmlElement);
+			}
+		}
+
+		/// <summary>
+		/// Loads navigation bar layout that was saved using SaveLayout method. Note that this method must be called after all items are created and added to the control.
+		/// </summary>
+		/// <param name="fileName">File to load layout from.</param>
+		public void LoadLayout(string fileName)
+		{
+			System.Xml.XmlDocument xmlDoc=new System.Xml.XmlDocument();
+			xmlDoc.Load(fileName);
+			this.LoadLayout(xmlDoc.FirstChild as XmlElement);
+		}
+
+		/// <summary>
+		/// Loads navigation bar layout that was saved using SaveLayout method. Note that this method must be called after all items are created and added to the control.
+		/// </summary>
+		/// <param name="xmlParent">Parent XML element that is used to load layout from. Note that this must be the same element that was passed into the SaveLayout method.</param>
+		public void LoadLayout(XmlElement xmlParent)
+		{
+			if(this.Items.Count==0)
+				return;
+
+			XmlElement root=xmlParent.FirstChild as XmlElement;
+			if(root==null || root.Name!="navigationbar")
+				throw new InvalidOperationException("xmlParent parameter in LoadLayout does not contain expected XML child note with name navigationbar. Invalid XML layout file.");
+			
+			try
+			{
+				((ISupportInitialize)this).BeginInit();
+				this.Height=XmlConvert.ToInt32(root.GetAttribute("height"));
+				foreach(XmlElement xmlItem in root.ChildNodes)
+				{
+					if(!this.Items.Contains(xmlItem.GetAttribute("name")))
+						continue;
+					BaseItem item=this.Items[xmlItem.GetAttribute("name")];
+					if(item is ButtonItem)
+					{
+						ButtonItem button=item as ButtonItem;
+						button.Checked=XmlConvert.ToBoolean(xmlItem.GetAttribute("checked"));
+						button.Visible=XmlConvert.ToBoolean(xmlItem.GetAttribute("visible"));
+						int i=XmlConvert.ToInt32(xmlItem.GetAttribute("index"));
+						if(this.Items.IndexOf(item)!=i)
+						{
+							this.Items.RemoveAt(this.Items.IndexOf(item));
+							this.Items.Insert(i,item);
+						}
+					}
+				}
+			}
+			finally
+			{
+				((ISupportInitialize)this).EndInit();
+			}
+		}
+
+		protected override bool ProcessMnemonic(char charCode)
+		{
+			string s="&"+charCode.ToString();
+			s=s.ToLower();
+			foreach(BaseItem item in this.Items)
+			{
+				string text=item.Text.ToLower();
+				if(text.IndexOf(s)>=0)
+				{
+					if(item is ButtonItem)
+					{
+						((ButtonItem)item).Checked=true;
+						return true;
+					}
+				}
+			}
+			return false;
+		}
+
+        /// <summary>
+        /// Gets/Sets the visual style for items and color scheme.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Category("Appearance"), Description("Specifies the visual style of the control."), DefaultValue(eDotNetBarStyle.Office2003)]
+        public eDotNetBarStyle Style
+        {
+            get
+            {
+                return m_ItemContainer.Style;
+            }
+            set
+            {
+                this.ColorScheme.Style = value;
+                m_ItemContainer.Style = value;
+                ApplyColorSchemeDefaults();
+                this.RecalcLayout();
+            }
+        }
+
+        private static RoundRectangleShapeDescriptor _ButtonShape = new RoundRectangleShapeDescriptor();
+        internal IShapeDescriptor ButtonShape
+        {
+            get
+            {
+                return _ButtonShape;
+            }
+        }
+
+		#region Splitter Support
+        protected virtual void PaintSplitter(ItemPaintArgs pa)
+        {
+            if (m_SplitterVisible)
+            {
+                Rectangle r = this.GetSplitterRectangle();
+                eDotNetBarStyle effectiveStyle = m_ItemContainer.EffectiveStyle;
+
+                if (effectiveStyle == eDotNetBarStyle.Office2010)
+                {
+                    r.Height--;
+                    r.Inflate(0, 0);
+                    r.Width -= 2;
+                }
+
+                if (effectiveStyle != eDotNetBarStyle.Office2010)
+                {
+                    using (System.Drawing.Drawing2D.LinearGradientBrush brush = BarFunctions.CreateLinearGradientBrush(r, pa.Colors.SplitterBackground, pa.Colors.SplitterBackground2, 90))
+                        pa.Graphics.FillRectangle(brush, r);
+
+                    using (SolidBrush brush = new SolidBrush(Color.White))
+                    {
+                        int x = r.X + (r.Width - 34) / 2;
+                        int y = r.Y + 2;
+                        for (int i = 0; i < 9; i++)
+                        {
+                            pa.Graphics.FillRectangle(brush, x, y, 2, 2);
+                            x += 4;
+                        }
+                    }
+
+                    using (SolidBrush brush = new SolidBrush(Color.FromArgb(128, ControlPaint.Dark(pa.Colors.SplitterBackground))))
+                    {
+                        int x = r.X + (r.Width - 34) / 2 - 1;
+                        int y = r.Y + 1;
+                        for (int i = 0; i < 9; i++)
+                        {
+                            pa.Graphics.FillRectangle(brush, x, y, 2, 2);
+                            x += 4;
+                        }
+                    }
+                    DisplayHelp.DrawLine(pa.Graphics, r.X, r.Bottom - 1, r.Right, r.Bottom - 1, pa.Colors.SplitterBorder, 1);
+                }
+                else
+                {
+                    Rectangle fillRect = r;
+                    fillRect.Height -= 1;
+                    SmoothingMode sm = pa.Graphics.SmoothingMode;
+                    pa.Graphics.SmoothingMode = SmoothingMode.None;
+                    using (System.Drawing.Drawing2D.LinearGradientBrush brush = new LinearGradientBrush(fillRect, pa.Colors.SplitterBackground, pa.Colors.SplitterBackground2, 90))
+                        pa.Graphics.FillRectangle(brush, fillRect);
+                    pa.Graphics.SmoothingMode = sm;
+                    DisplayHelp.DrawRectangle(pa.Graphics, pa.Colors.SplitterBorder, r);
+                }
+            }
+        }
+
+		protected virtual Rectangle GetSplitterRectangle()
+		{
+			Rectangle r=new Rectangle(this.ClientRectangle.X,this.ClientRectangle.Y,this.Width,SPLITTER_SIZE);
+			if(this.BackgroundStyle.Border==eBorderType.SingleLine)
+			{
+				if((this.BackgroundStyle.BorderSide & eBorderSide.Top)==eBorderSide.Top)
+					r.Y++;
+				if((this.BackgroundStyle.BorderSide & eBorderSide.Right)==eBorderSide.Right)
+					r.Width--;
+				if((this.BackgroundStyle.BorderSide & eBorderSide.Left)==eBorderSide.Left)
+				{
+					r.X++;
+					r.Width--;
+				}
+			}
+			else if(this.BackgroundStyle.Border!=eBorderType.None)
+			{
+				if((this.BackgroundStyle.BorderSide & eBorderSide.Top)==eBorderSide.Top)
+					r.Y+=2;
+				if((this.BackgroundStyle.BorderSide & eBorderSide.Right)==eBorderSide.Right)
+					r.Width-=2;
+				if((this.BackgroundStyle.BorderSide & eBorderSide.Left)==eBorderSide.Left)
+				{
+					r.X+=2;
+					r.Width-=2;
+				}
+			}
+			return r;
+		}
+
+		protected override void OnMouseMove(MouseEventArgs e)
+		{
+			SplitterMouseMove(e);
+			if(!m_SplitterMouseDown)
+				base.OnMouseMove(e);
+		}
+        [EditorBrowsable(EditorBrowsableState.Never)]
+		public void SplitterMouseMove(MouseEventArgs e)
+		{
+			if(m_SplitterVisible && !m_SplitterMouseDown)
+			{
+				if(HitTestSplitter(e.X,e.Y))
+				{
+					if(m_SavedSplitterCursor==null || this.GetDesignMode())
+					{
+						if(m_SavedSplitterCursor==null)
+						{
+							if(this.GetDesignMode())
+								m_SavedSplitterCursor=Cursor.Current;
+							else
+								m_SavedSplitterCursor=this.Cursor;
+						}
+
+						if(this.GetDesignMode())
+							Cursor.Current=Cursors.SizeNS;
+						else
+							this.Cursor=Cursors.SizeNS;
+					}
+				}
+				else if(m_SavedSplitterCursor!=null)
+				{
+					if(this.GetDesignMode())
+						Cursor.Current=m_SavedSplitterCursor;
+					else
+						this.Cursor=m_SavedSplitterCursor;
+					m_SavedSplitterCursor=null;
+				}
+			}
+
+			if(m_SplitterMouseDown)
+			{
+				bool reduceSize=false;
+				BaseItem firstDisplayed=m_ItemContainer.GetFirstVisibleItem();
+				if(firstDisplayed==null)
+					reduceSize=false;
+				else if(e.Y>=firstDisplayed.DisplayRectangle.Bottom-SPLITTER_SIZE)
+					reduceSize=true;
+
+//				BaseItem referenceItem=m_ItemContainer.GetResizeReferenceItem(reduceSize);
+//				if(referenceItem==null)
+//					return;
+//				int itemHeight=referenceItem.HeightInternal;
+//				if(referenceItem is ButtonItem && m_ItemContainer.AutoSizeButtonImage && !m_ItemContainer.ImageSizeSummaryLine.IsEmpty && !((ButtonItem)referenceItem).ImageFixedSize.IsEmpty)
+//				{
+//					Size size=((ButtonItem)referenceItem).ImageFixedSize;
+//					((ButtonItem)referenceItem).ImageFixedSize=Size.Empty;
+//					referenceItem.RecalcSize();
+//					itemHeight=referenceItem.HeightInternal;
+//					itemHeight+=(m_ItemContainer.ItemPaddingBottom+m_ItemContainer.ItemPaddingTop);
+//                    ((ButtonItem)referenceItem).ImageFixedSize=size;
+//					referenceItem.RecalcSize();
+//				}
+
+				int itemHeight=m_ItemContainer.GetChangeSizeHeight(reduceSize);
+
+				if(firstDisplayed!=null && e.Y>=firstDisplayed.DisplayRectangle.Bottom-SPLITTER_SIZE && this.GetItemContainerRectangle().Height>itemHeight+SPLITTER_SIZE)
+				{
+					//this.Height-=itemHeight;
+					m_ItemContainer.ShowFewerButtons();
+				}
+				else if(e.Y<0 && Math.Abs(e.Y)>=itemHeight+SPLITTER_SIZE)
+				{
+//					itemHeight+=SPLITTER_SIZE;
+//					this.Height+=itemHeight+1;
+					m_ItemContainer.ShowMoreButtons();
+				}
+				else
+					this.RecalcLayout();
+			}
+		}
+
+		protected override void OnMouseLeave(EventArgs e)
+		{
+			SplitterMouseLeave();
+			base.OnMouseLeave(e);
+		}
+        [EditorBrowsable(EditorBrowsableState.Never)]
+		public void SplitterMouseLeave()
+		{
+			if(m_SavedSplitterCursor!=null)
+			{
+				if(this.GetDesignMode())
+					Cursor.Current=m_SavedSplitterCursor;
+				else
+					this.Cursor=m_SavedSplitterCursor;
+				m_SavedSplitterCursor=null;
+			}
+		}
+
+		protected override void OnMouseDown(MouseEventArgs e)
+		{
+			SplitterMouseDown(e);
+
+			if(!m_SplitterMouseDown)
+				base.OnMouseDown(e);
+		}
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public void SplitterMouseDown(MouseEventArgs e)
+		{
+			if(this.Dock==DockStyle.Bottom && HitTestSplitter(e.X,e.Y))
+			{
+				this.Capture=true;
+				m_SplitterMouseDown=true;
+			}
+		}
+        [EditorBrowsable(EditorBrowsableState.Never)]
+		public bool HitTestSplitter(int x, int y)
+		{
+			if(m_SplitterVisible)
+			{
+				Rectangle r=this.GetSplitterRectangle();
+				if(r.Contains(x,y))
+				{
+					return true;
+				}
+			}
+			return false;
+		}
+
+		protected override void OnMouseUp(MouseEventArgs e)
+		{
+			SplitterMouseUp(e);
+			base.OnMouseUp(e);
+		}
+        [EditorBrowsable(EditorBrowsableState.Never), Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public bool IsSplitterMouseDown
+		{
+			get {return m_SplitterMouseDown;}
+		}
+        [EditorBrowsable(EditorBrowsableState.Never)]
+		public void SplitterMouseUp(MouseEventArgs e)
+		{
+			if(m_SplitterMouseDown)
+			{
+				m_SplitterMouseDown=false;
+				this.Capture=false;
+
+				if(m_SavedSplitterCursor!=null)
+				{
+					this.Cursor=m_SavedSplitterCursor;
+					m_SavedSplitterCursor=null;
+				}
+			}
+		}
+
+		// Internal Splitter sizing logic assumes that control is docked to bottom and it will
+		// change height ONLY. It is not capable of handling the generic splitter case!!!!!
+		// OnMouseDown is hard-coded to check for Dock=Bottom to prevent any problems
+		/// <summary>
+		/// Indicates whether splitter on top of the navigation bar is visible. When activated splitter will let user change the height of the
+		/// control to show fewer or more buttons. It is recommended to have navigation bar docked to bottom (Dock=Bottom) to maintain
+		/// proper layout.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),Category("Layout"),Description("Indicates whether splitter on top of the navigation bar is visible."),DefaultValue(false)]
+		public bool SplitterVisible
+		{
+			get{return m_SplitterVisible;}
+			set
+			{
+				m_SplitterVisible=value;
+				if(this.DesignMode)
+					this.RecalcLayout();
+			}
+		}
+		#endregion
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/NavigationBarContainer.cs b/PROMS/DotNetBar Source Code/NavigationBarContainer.cs
new file mode 100644
index 00000000..56652e96
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/NavigationBarContainer.cs	
@@ -0,0 +1,980 @@
+using System;
+using System.Drawing;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Container control for Navigation Bar.
+	/// </summary>
+	[System.ComponentModel.ToolboxItem(false)]
+    public class NavigationBarContainer : ImageItem, IDesignTimeProvider
+	{
+		private ButtonItem m_ConfigureItem=null;
+		private int m_ItemPaddingTop=2, m_ItemPaddingBottom=2;
+		private int m_BottomLineItemStartIndex=-1;
+
+		private bool m_ConfigureItemVisible=true;
+		private bool m_ConfigureShowHideVisible=true;
+		private bool m_ConfigureNavOptionsVisible=true;
+		private bool m_ConfigureAddRemoveVisible=true;
+		
+		private bool m_AutoSizeButtonImage=true;
+		private Size m_ImageSizeSummaryLine=new Size(16,16);
+
+		private const int DEFAULT_HEIGHT=32;
+		private bool m_SummaryLineVisible=true;
+
+		/// <summary>
+		/// Creates new instance of NavigationBarContainer.
+		/// </summary>
+		public NavigationBarContainer():this("","") {}
+		/// <summary>
+		/// Creates new instance of SideBarPanelItem and assigns the name to it.
+		/// </summary>
+		/// <param name="sItemName">Item name.</param>
+		public NavigationBarContainer(string sItemName):this(sItemName,"") {}
+		/// <summary>
+		/// Creates new instance of SideBarPanelItem and assigns the name and text to it.
+		/// </summary>
+		/// <param name="sItemName">Item name.</param>
+		/// <param name="ItemText">item text.</param>
+		public NavigationBarContainer(string sItemName, string ItemText):base(sItemName,ItemText)
+		{
+			m_IsContainer=true;
+			this.SubItemsImageSize=Size.Empty;
+		}
+
+		/// <summary>
+		/// Returns copy of SideBarPanelItem item.
+		/// </summary>
+		public override BaseItem Copy()
+		{
+			NavigationBarContainer objCopy=new NavigationBarContainer();
+			this.CopyToItem(objCopy);
+			return objCopy;
+		}
+
+		/// <summary>
+		/// Recalculates size of this container.
+		/// </summary>
+		public override void RecalcSize()
+		{
+			m_RecalculatingSize=true;
+
+			// Maximum height of item will be used as a height of bottom line of items
+			int iMaxHeight=0;
+            eDotNetBarStyle effectiveStyle = this.EffectiveStyle;
+			int itemSpacing=1;
+			int containerBorder=0;
+			BaseItem lastVisible=null;
+			
+			CreateConfigureButton(m_Rect.Bottom,DEFAULT_HEIGHT);
+
+			foreach(BaseItem item in this.SubItems)
+			{
+				if(item is ButtonItem)
+				{
+					((ButtonItem)item).ButtonStyle=eButtonStyle.ImageAndText;
+					((ButtonItem)item).ImageFixedSize=Size.Empty;
+				}
+
+				if(m_AutoSizeButtonImage && !m_ImageSizeSummaryLine.IsEmpty)
+					((ButtonItem)item).ImageFixedSize=m_ImageSizeSummaryLine;
+
+				item.RecalcSize();
+				item.HeightInternal+=(m_ItemPaddingTop+m_ItemPaddingBottom);
+
+				if(item.Visible)
+				{
+					lastVisible=item;
+					if(item.HeightInternal>iMaxHeight)
+						iMaxHeight=item.HeightInternal;
+				}
+
+				if(m_AutoSizeButtonImage && !m_ImageSizeSummaryLine.IsEmpty)
+				{
+					((ButtonItem)item).ImageFixedSize=Size.Empty;
+					item.RecalcSize();
+					item.HeightInternal+=(m_ItemPaddingTop+m_ItemPaddingBottom);
+				}
+			}
+
+			// Now arrange them
+			int y=m_Rect.Top, x=m_Rect.Left+containerBorder;
+			int heightActual=0;
+			int itemWidth=this.WidthInternal-(containerBorder*2);
+			bool bFirstInLine=false;
+			bool bOverFlow=false;
+			int iFirstInLine=-1;
+			foreach(BaseItem item in this.SubItems)
+			{
+				if(item.Visible)
+				{
+					if(y+item.HeightInternal+(lastVisible==item?0:itemSpacing)<=m_Rect.Bottom-(m_SummaryLineVisible?iMaxHeight:0)) //((!bFirstInLine && lastVisible==item)?0:iMaxHeight))
+					{
+						// Items on top of each other
+						item.TopInternal=y;
+						item.LeftInternal=x;
+						item.WidthInternal=itemWidth;
+						item.Displayed=true;
+						y+=(item.HeightInternal+itemSpacing);
+						heightActual+=(item.HeightInternal+itemSpacing);
+                        if (lastVisible == item) heightActual -= itemSpacing;
+                        item.DesignMarkerOrientation = eDesignMarkerOrientation.Vertical;
+					}
+					else
+					{
+						if(m_SummaryLineVisible)
+						{
+                            item.DesignMarkerOrientation = eDesignMarkerOrientation.Horizontal;
+							// Items next to each other
+							if(!bFirstInLine)
+							{
+								heightActual+=(iMaxHeight);
+								bFirstInLine=true;
+								iFirstInLine=this.SubItems.IndexOf(item);
+							}
+							if(item is ButtonItem)
+							{
+								((ButtonItem)item).ButtonStyle=eButtonStyle.Default;
+								if(m_AutoSizeButtonImage && !m_ImageSizeSummaryLine.IsEmpty)
+									((ButtonItem)item).ImageFixedSize=m_ImageSizeSummaryLine;
+
+								item.RecalcSize();
+								item.HeightInternal+=(m_ItemPaddingTop+m_ItemPaddingBottom);
+                                if (effectiveStyle == eDotNetBarStyle.Office2010)
+                                    item.WidthInternal += 4;
+								if(bOverFlow || x+item.WidthInternal>m_Rect.Right-GetConfigureItemWidth())
+								{
+									bOverFlow=true;
+									item.Displayed=false;
+								}
+								else
+								{
+									item.TopInternal=y;
+									item.LeftInternal=x;
+									item.HeightInternal=iMaxHeight;
+									x+=item.WidthInternal;
+									item.Displayed=true;
+								}
+							}
+						}
+						else
+							item.Displayed=false;
+					}
+				}
+				else
+					item.Displayed=false;
+			}
+
+			if(iMaxHeight==0)
+				iMaxHeight=DEFAULT_HEIGHT;
+
+			CreateConfigureButton(y,iMaxHeight);
+
+            if (!bFirstInLine && m_SummaryLineVisible)
+                heightActual += (iMaxHeight);
+
+			// Right align the line items
+			if(iFirstInLine>=0)
+			{
+				x=m_Rect.Right-containerBorder;
+				if(m_ConfigureItem!=null)
+					x-=m_ConfigureItem.WidthInternal;
+				for(int i=this.SubItems.Count-1;i>=iFirstInLine;i--)
+				{
+					if(this.SubItems[i].Displayed)
+					{
+						x-=this.SubItems[i].WidthInternal;
+						this.SubItems[i].LeftInternal=x;
+					}
+				}
+			}
+			m_BottomLineItemStartIndex=iFirstInLine;
+
+			if(heightActual==0)
+				heightActual=DEFAULT_HEIGHT;
+
+			m_Rect.Height=heightActual;
+
+			m_RecalculatingSize=false;
+		}
+
+		private void PaintLineBackground(ItemPaintArgs pa,Rectangle r, eDotNetBarStyle style)
+		{
+            if (BarFunctions.IsOffice2007Style(style) && pa.Renderer != null)
+            {
+                pa.Renderer.DrawNavPaneButtonBackground(new NavPaneRenderEventArgs(pa.Graphics, r));
+            }
+            else
+            {
+                // Paint background of bottom line
+                if (!pa.Colors.ItemBackground.IsEmpty || !pa.Colors.ItemBackground2.IsEmpty)
+                    DisplayHelp.FillRectangle(pa.Graphics, r, pa.Colors.ItemBackground, pa.Colors.ItemBackground2, pa.Colors.ItemBackgroundGradientAngle);
+                else if (!pa.Colors.BarBackground.IsEmpty || !pa.Colors.BarBackground2.IsEmpty)
+                    DisplayHelp.FillRectangle(pa.Graphics, r, pa.Colors.BarBackground, pa.Colors.BarBackground2, pa.Colors.BarBackgroundGradientAngle);
+            }
+            if (style != eDotNetBarStyle.Office2010 && !StyleManager.IsMetro(style))
+            {
+                using (System.Drawing.Pen pen = new System.Drawing.Pen(pa.Colors.PanelBorder, 1))
+                {
+                    pa.Graphics.DrawLine(pen, r.Left, r.Top - 1, r.Right, r.Top - 1);
+                }
+            }
+		}
+
+		public override void Paint(ItemPaintArgs pa)
+		{
+			if(m_Rect.Width==0 || m_Rect.Height==0)
+				return;
+
+			eDotNetBarStyle effectiveStyle = this.EffectiveStyle;
+            if ((effectiveStyle == eDotNetBarStyle.Office2010 || StyleManager.IsMetro(effectiveStyle)) && pa.Renderer!=null)
+            {
+                Region oldClip = pa.Graphics.Clip;
+                pa.Graphics.ResetClip();
+                pa.Renderer.DrawNavPaneButtonBackground(new NavPaneRenderEventArgs(pa.Graphics, pa.ContainerControl.ClientRectangle));
+                pa.Graphics.Clip = oldClip;
+                if (oldClip != null) oldClip.Dispose();
+            }
+            if(m_ConfigureItem!=null && m_SummaryLineVisible)
+			{
+				Rectangle rBottomLine=new Rectangle(m_Rect.X,m_ConfigureItem.TopInternal,m_Rect.Width,m_ConfigureItem.HeightInternal);
+                PaintLineBackground(pa, rBottomLine, effectiveStyle);
+			}
+			else if(m_BottomLineItemStartIndex>=0)
+			{
+				Rectangle rBottomLine=new Rectangle(m_Rect.X,this.SubItems[m_BottomLineItemStartIndex].TopInternal,m_Rect.Width,this.SubItems[m_BottomLineItemStartIndex].HeightInternal);
+                PaintLineBackground(pa, rBottomLine, effectiveStyle);
+			}
+            else if (m_SummaryLineVisible)
+            {
+                int top = -1;
+                for (int i = this.SubItems.Count - 1; i >= 0; i--)
+                {
+                    BaseItem item = this.SubItems[i];
+                    if (item.Visible && item.Displayed)
+                    {
+                        top = item.DisplayRectangle.Bottom;
+                        break;
+                    }
+                }
+
+                if (top >= 0)
+                {
+                    Rectangle rBottomLine = new Rectangle(m_Rect.X, top, m_Rect.Width, m_Rect.Bottom - top);
+                    PaintLineBackground(pa, rBottomLine, effectiveStyle);
+                    DisplayHelp.DrawLine(pa.Graphics, m_Rect.X, top, m_Rect.Right, top, pa.Colors.PanelBorder, 1);
+                }
+            }
+
+            bool paintItemBackground = (pa.Colors.ItemBackground.IsEmpty && pa.Colors.ItemBackground2.IsEmpty) && effectiveStyle != eDotNetBarStyle.Office2010;
+			for(int i=0;i<this.SubItems.Count;i++)
+			{
+				BaseItem item=this.SubItems[i];
+
+				if(item.Visible && item.Displayed)
+				{
+                    if (paintItemBackground)
+                    {
+                        if (BarFunctions.IsOffice2007Style(effectiveStyle) && pa.Renderer != null)
+                            pa.Renderer.DrawNavPaneButtonBackground(new NavPaneRenderEventArgs(pa.Graphics, item.DisplayRectangle));
+                        else
+                            DisplayHelp.FillRectangle(pa.Graphics, item.DisplayRectangle, pa.Colors.BarBackground, pa.Colors.BarBackground2, pa.Colors.BarBackgroundGradientAngle);
+                    }
+					item.Paint(pa);
+                    if (i > 0 && effectiveStyle != eDotNetBarStyle.Office2010 && !StyleManager.IsMetro(effectiveStyle))
+                    {
+                        using (System.Drawing.Pen pen = new System.Drawing.Pen(pa.Colors.PanelBorder, 1))
+                        {
+                            pa.Graphics.DrawLine(pen, m_Rect.Left, item.TopInternal - 1, m_Rect.Right, item.TopInternal - 1);
+                        }
+                    }
+				}
+			}
+			
+			if(m_ConfigureItem!=null)
+			{
+				m_ConfigureItem.Paint(pa);
+			}
+		}
+
+		#region Configure Button Implementation
+        internal void OptionsDialogClosed()
+        {
+            NavigationBar bar = this.ContainerControl as NavigationBar;
+            if (bar != null) bar.InvokeOptionsDialogClosed();
+        }
+        private void CreateConfigureButton(int y, int height)
+		{
+			if(!m_ConfigureItemVisible)
+				return;
+
+			if(m_ConfigureItem==null)
+			{
+				LocalizationManager lm=new LocalizationManager(this.GetOwner() as IOwnerLocalize);
+
+				m_ConfigureItem=new ButtonItem();
+				m_ConfigureItem.Image=new System.Drawing.Bitmap(typeof(DevComponents.DotNetBar.DotNetBarManager),"SystemImages.NavBarConfigure.png");
+                m_ConfigureItem.ImageFixedSize = m_ConfigureItem.Image.Size;
+				m_ConfigureItem.Style=m_Style;
+				m_ConfigureItem.ShowSubItems=false;
+				m_ConfigureItem.SetSystemItem(true);
+                m_ConfigureItem.ContainerState = eContainerState.NavigationPane;
+				// Add Sub-Items
+				ButtonItem item;
+				if(m_ConfigureShowHideVisible)
+				{
+					item=new ButtonItem("sysShowMoreButtons");
+					item.Image=new System.Drawing.Bitmap(typeof(DevComponents.DotNetBar.DotNetBarManager),"SystemImages.NavBarShowMore.png");
+					item.Text=lm.GetDefaultLocalizedString(LocalizationKeys.NavBarShowMoreButtons);
+					item.SetSystemItem(true);
+					item.Click+=new EventHandler(this.OnShowMoreButtonsClick);
+					m_ConfigureItem.SubItems.Add(item);
+
+					item=new ButtonItem("sysShowFewerButtons");
+					item.Image=new System.Drawing.Bitmap(typeof(DevComponents.DotNetBar.DotNetBarManager),"SystemImages.NavBarShowLess.png");
+					item.Text=lm.GetDefaultLocalizedString(LocalizationKeys.NavBarShowFewerButtons);
+					item.SetSystemItem(true);
+					item.Click+=new EventHandler(this.OnShowFewerButtonsClick);
+					m_ConfigureItem.SubItems.Add(item);
+				}
+
+				if(m_ConfigureNavOptionsVisible)
+				{
+					item=new ButtonItem("sysNavPaneOptions");
+					item.Text=lm.GetDefaultLocalizedString(LocalizationKeys.NavBarOptions);
+					item.Click+=new EventHandler(this.OnNavPaneOptionsClick);
+					item.SetSystemItem(true);
+					m_ConfigureItem.SubItems.Add(item);
+				}
+
+				if(m_ConfigureAddRemoveVisible)
+				{
+					CustomizeItem customize=new CustomizeItem();
+					customize.Name="sysNavPaneAddRemove";
+					customize.CustomizeItemVisible=false;
+					m_ConfigureItem.SubItems.Add(customize);
+				}
+
+				m_ConfigureItem.SetParent(this);
+				m_ConfigureItem.Click+=new EventHandler(this.ConfigureItemClick);
+				m_ConfigureItem.ExpandChange+=new EventHandler(this.ConfigureExpandedChanged);
+				m_ConfigureItem.PopupShowing+=new EventHandler(this.ConfigurePopupShowing);
+				m_ConfigureItem.PopupSide=ePopupSide.Right;
+
+				lm.Dispose();
+
+				BarBaseControl ctrl=this.ContainerControl as BarBaseControl;
+				if(ctrl!=null && ctrl.Font!=null)
+					m_ConfigureItem.PopupFont=new Font(ctrl.Font,FontStyle.Regular);
+				else
+                    m_ConfigureItem.PopupFont = SystemFonts.MenuFont;
+			}
+			m_ConfigureItem.PopupType=ePopupType.Menu;
+			m_ConfigureItem.Displayed=true;
+            m_ConfigureItem.HeightInternal = height;
+			m_ConfigureItem.RecalcSize();
+			m_ConfigureItem.LeftInternal=m_Rect.Right-m_ConfigureItem.WidthInternal;
+			m_ConfigureItem.TopInternal=y;
+			m_ConfigureItem.HeightInternal=height;
+		}
+
+		private int GetConfigureItemWidth()
+		{
+			if(m_ConfigureItem!=null && m_ConfigureItemVisible)
+				return m_ConfigureItem.WidthInternal;
+			return 0;
+		}
+
+		private void ConfigureItemClick(object sender, EventArgs e)
+		{
+			m_ConfigureItem.Expanded=!m_ConfigureItem.Expanded;
+		}
+
+		private void ConfigureExpandedChanged(object sender, EventArgs e)
+		{
+			if(m_ConfigureItem.Expanded)
+			{
+				// Enable Disable buttons
+				if(m_ConfigureShowHideVisible)
+				{
+					m_ConfigureItem.SubItems["sysShowMoreButtons"].Enabled=(m_BottomLineItemStartIndex>=0);
+					m_ConfigureItem.SubItems["sysShowFewerButtons"].Enabled=(m_BottomLineItemStartIndex!=0);
+				}
+				
+				// Add overflow items
+				bool bFirst=true;
+				foreach(BaseItem item in this.SubItems)
+				{
+					if(item.Visible && !item.Displayed)
+					{
+						BaseItem copy=item.Clone() as BaseItem;
+						if(bFirst)
+						{
+							copy.GlobalItem=false;
+							copy.BeginGroup=true;
+							//copy.GlobalItem=true;
+                            copy.Click += new EventHandler(ButtonCopyClick);
+							bFirst=false;
+						}
+						else
+						{
+							copy.GlobalItem=false;
+							copy.BeginGroup=false;
+							//copy.GlobalItem=true;
+                            copy.Click += new EventHandler(ButtonCopyClick);
+						}
+                        copy.Tag = item;
+                        if (copy is ButtonItem)
+                        {
+                            ((ButtonItem)copy).ImageFixedSize = new Size(16, 16);
+                        }
+						m_ConfigureItem.SubItems.Insert(m_ConfigureItem.SubItems.Count-1,copy);
+					}
+				}
+
+				// Set popup location
+				System.Drawing.Size popupSize=m_ConfigureItem.PopupSize;
+                Point popupLocation = new System.Drawing.Point(m_ConfigureItem.DisplayRectangle.Right, m_ConfigureItem.DisplayRectangle.Top + (m_ConfigureItem.DisplayRectangle.Height / 2) - popupSize.Height);
+                System.Windows.Forms.Control c = this.ContainerControl as System.Windows.Forms.Control;
+                if (c != null)
+                {
+                    Point ps = c.PointToScreen(popupLocation);
+                    ScreenInformation screen = BarFunctions.ScreenFromControl(c);
+                    if (ps.Y < screen.WorkingArea.Top)
+                    {
+                        popupLocation.Y = c.PointToClient(screen.WorkingArea.Location).Y;
+                    }
+                }
+                m_ConfigureItem.PopupLocation = popupLocation;
+			}
+			else
+			{
+				int height=m_ConfigureItem.HeightInternal;
+				// Remove any cloned items added
+				System.Collections.ArrayList list=new System.Collections.ArrayList();
+				foreach(BaseItem item in m_ConfigureItem.SubItems)
+				{
+					if(!item.SystemItem)
+						list.Add(item);
+				}
+                m_ConfigureItem.SuspendLayout = true;
+				foreach(BaseItem item in list)
+					m_ConfigureItem.SubItems.Remove(item);
+                m_ConfigureItem.SuspendLayout = false;
+				m_ConfigureItem.RecalcSize();
+				m_ConfigureItem.HeightInternal=height;
+				//m_ConfigureItem.Refresh();
+			}
+		}
+
+        private void ButtonCopyClick(object sender, EventArgs e)
+        {
+            ButtonItem b = sender as ButtonItem;
+            if (b != null)
+            {
+                ButtonItem l = b.Tag as ButtonItem;
+                if (l != null)
+                {
+                    l.Checked = true;
+                    b.Checked = true;
+                }
+            }
+        }
+
+		private void OnShowMoreButtonsClick(object sender, EventArgs e)
+		{
+			this.ShowMoreButtons();
+			BaseItem.CollapseAll(sender as BaseItem);
+		}
+
+		/// <summary>
+		/// Increases the size of the navigation bar if possible by showing more buttons on the top.
+		/// </summary>
+		public void ShowMoreButtons()
+		{
+			// Need to increase the height of host control if possible
+			System.Windows.Forms.Control ctrl=this.ContainerControl as System.Windows.Forms.Control;
+            if (ctrl != null)
+                ctrl.Height += GetChangeSizeHeight(false) + (this.DesignMode ? 10 : 1);
+		}
+
+		internal int GetChangeSizeHeight(bool reduceSize)
+		{
+			int height=0;
+			BaseItem referenceItem=GetResizeReferenceItem(reduceSize);
+			if(referenceItem==null)
+				return height;
+			height=referenceItem.HeightInternal;
+            
+			if(referenceItem is ButtonItem && AutoSizeButtonImage && !ImageSizeSummaryLine.IsEmpty && !((ButtonItem)referenceItem).ImageFixedSize.IsEmpty)
+			{
+                ButtonItem button = (ButtonItem)referenceItem;
+				Size size=button.ImageFixedSize;
+				button.ImageFixedSize=Size.Empty;
+                eButtonStyle buttonStyle = button.ButtonStyle;
+                button.ButtonStyle = eButtonStyle.ImageAndText;
+				referenceItem.RecalcSize();
+                
+                height = Math.Max(height, referenceItem.HeightInternal + ItemPaddingBottom + ItemPaddingTop);
+				
+				button.ImageFixedSize=size;
+                button.ButtonStyle = buttonStyle;
+				button.RecalcSize();
+			}
+			return height;
+		}
+
+		private void OnShowFewerButtonsClick(object sender, EventArgs e)
+		{
+			this.ShowFewerButtons();
+			BaseItem.CollapseAll(sender as BaseItem);
+		}
+
+		internal BaseItem GetResizeReferenceItem(bool reduceSize)
+		{
+			if(reduceSize && this.SummaryLineStartItemIndex>1)
+				return this.SubItems[this.SummaryLineStartItemIndex-1];
+			if(this.SummaryLineStartItemIndex>=0)
+				return this.SubItems[this.SummaryLineStartItemIndex];
+			foreach(BaseItem item in this.SubItems)
+			{
+				if(item.Visible && item.Displayed)
+					return item;
+			}
+			return null;
+		}
+
+		internal BaseItem GetFirstVisibleItem()
+		{
+			foreach(BaseItem item in this.SubItems)
+			{
+				if(item.Visible && item.Displayed)
+					return item;
+			}
+			return null;
+		}
+
+		/// <summary>
+		/// Returns index of the first item that is displayed in summary line or -1 if there is no item displayed in summary line.
+		/// </summary>
+		[Browsable(false)]
+		public int SummaryLineStartItemIndex
+		{
+			get { return m_BottomLineItemStartIndex; }
+		}
+
+		/// <summary>
+		/// Reduces the size of the navigation bar if possible by showing fewer buttons on the top.
+		/// </summary>
+		public void ShowFewerButtons()
+		{
+			// Need to reduce the height of host control if possible
+			System.Windows.Forms.Control ctrl=this.ContainerControl as System.Windows.Forms.Control;
+			if(ctrl!=null)
+			{
+				int height=this.GetChangeSizeHeight(true);
+				if(ctrl.Height-height>0)
+					ctrl.Height-=height;
+			}
+		}
+
+		private void OnNavPaneOptionsClick(object sender, EventArgs e)
+		{
+			BaseItem.CollapseAll(sender as BaseItem);
+
+			NavPaneOptions options=new NavPaneOptions();
+            LocalizationManager lm = new LocalizationManager(this.GetOwner() as IOwnerLocalize);
+            if (lm != null)
+            {
+                string s = lm.GetDefaultLocalizedString(LocalizationKeys.NavBarDialogCancel);
+                if (s != "") options.cmdCancel.Text = s;
+                s = lm.GetDefaultLocalizedString(LocalizationKeys.NavBarDialogMoveDown);
+                if (s != "") options.cmdMoveDown.Text = s;
+                s = lm.GetDefaultLocalizedString(LocalizationKeys.NavBarDialogMoveUp);
+                if (s != "") options.cmdMoveUp.Text = s;
+                s = lm.GetDefaultLocalizedString(LocalizationKeys.NavBarDialogOK);
+                if (s != "") options.cmdOK.Text = s;
+                s = lm.GetDefaultLocalizedString(LocalizationKeys.NavBarDialogReset);
+                if (s != "") options.cmdReset.Text = s;
+                s = lm.GetDefaultLocalizedString(LocalizationKeys.NavBarDialogTitle);
+                if (s != "") options.Text = s;
+                s = lm.GetDefaultLocalizedString(LocalizationKeys.NavBarDialogListLabel);
+                if (s != "") options.labelListCaption.Text = s;
+                
+            }
+
+			options.StartPosition=System.Windows.Forms.FormStartPosition.CenterScreen;
+			options.NavBarContainer=this;
+			System.Windows.Forms.DialogResult result=options.ShowDialog();
+			options.Dispose();
+			if(result==System.Windows.Forms.DialogResult.OK)
+			{
+				if(this.ContainerControl is BarBaseControl)
+					((BarBaseControl)this.ContainerControl).RecalcLayout();
+			}
+		}
+
+		private void ConfigurePopupShowing(object sender, EventArgs e)
+		{
+            if (this.ContainerControl is NavigationBar && BarFunctions.IsOffice2007Style(this.EffectiveStyle))
+                ((MenuPanel)m_ConfigureItem.PopupControl).ColorScheme = ((NavigationBar)this.ContainerControl).GetColorScheme();
+            else
+                ((MenuPanel)m_ConfigureItem.PopupControl).ColorScheme = new ColorScheme(this.EffectiveStyle);
+		}
+		#endregion
+
+		#region Mouse Support
+		public override void InternalMouseHover()
+		{
+			if(m_ConfigureItem!=null && m_ConfigureItem.Expanded && m_HotSubItem!=m_ConfigureItem && this.DesignMode)
+			{
+				m_ConfigureItem.Expanded=false;
+			}
+			base.InternalMouseHover();
+		}
+
+		public override void InternalMouseDown(System.Windows.Forms.MouseEventArgs objArg)
+		{
+			if(m_ConfigureItem!=null && m_ConfigureItem.Expanded && m_HotSubItem!=m_ConfigureItem && !this.DesignMode)
+			{
+				m_ConfigureItem.Expanded=false;
+			}
+			base.InternalMouseDown(objArg);
+		}
+
+		public override void InternalMouseMove(System.Windows.Forms.MouseEventArgs objArg)
+		{
+			// Call base implementation if we don't have the more items button
+			if(m_ConfigureItem==null || !m_ConfigureItem.DisplayRectangle.Contains(objArg.X,objArg.Y) || this.DesignMode)
+			{
+				base.InternalMouseMove(objArg);
+				return;
+			}
+
+			// Mouse is over our more items button
+			BaseItem objNew=m_ConfigureItem;
+			if(objNew!=m_HotSubItem)
+			{
+				if(m_HotSubItem!=null)
+				{
+					m_HotSubItem.InternalMouseLeave();
+					if(objNew!=null && m_HotSubItem.Expanded)
+						m_HotSubItem.Expanded=false;
+				}
+				
+				if(objNew!=null)
+				{
+					if(m_AutoExpand)
+					{
+						BaseItem objItem=ExpandedItem();
+						if(objItem!=null && objItem!=objNew)
+							objItem.Expanded=false;
+					}
+					objNew.InternalMouseEnter();
+					objNew.InternalMouseMove(objArg);
+					if(m_AutoExpand && objNew.Enabled && objNew.ShowSubItems)
+					{
+						if(objNew is PopupItem)
+						{
+							PopupItem pi=objNew as PopupItem;
+							ePopupAnimation oldAnim=pi.PopupAnimation;
+							pi.PopupAnimation=ePopupAnimation.None;
+							objNew.Expanded=true;
+							pi.PopupAnimation=oldAnim;
+						}
+						else
+							objNew.Expanded=true;
+					}
+					m_HotSubItem=objNew;
+				}
+				else
+					m_HotSubItem=null;
+			}
+			else if(m_HotSubItem!=null)
+			{
+				m_HotSubItem.InternalMouseMove(objArg);
+			}
+		}
+		#endregion
+
+		protected internal override void OnSubItemExpandChange(BaseItem objItem)
+		{
+			base.OnSubItemExpandChange(objItem);
+			if(objItem.Expanded)
+			{
+				foreach(BaseItem objExp in this.SubItems)
+				{
+					if(objExp!=objItem && objExp is PopupItem && objExp.Expanded)
+						objExp.Expanded=false;
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets a value indicating whether the item is expanded or not. For Popup items this would indicate whether the item is popped up or not.
+		/// </summary>
+		[System.ComponentModel.Browsable(false),System.ComponentModel.DefaultValue(false),System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
+		public override bool Expanded
+		{
+			get
+			{
+				return base.Expanded;
+			}
+			set
+			{
+				if(!value)
+				{
+					foreach(BaseItem objExp in this.SubItems)
+					{
+						if(objExp.Expanded)
+							objExp.Expanded=false;
+					}
+					if(m_ConfigureItem!=null && m_ConfigureItem.Expanded)
+						m_ConfigureItem.Expanded=false;
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets whether Configure Buttons button is visible.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),Category("Behavior"),Description("Indicates Configure Buttons button is visible."),System.ComponentModel.DefaultValue(true)]
+		public bool ConfigureItemVisible
+		{
+			get {return m_ConfigureItemVisible;}
+			set
+			{
+				if(m_ConfigureItemVisible!=value)
+				{
+					m_ConfigureItemVisible=value;
+					NeedRecalcSize=true;
+					if(!m_ConfigureItemVisible && m_ConfigureItem!=null)
+						m_ConfigureItem=null;
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets whether Show More Buttons and Show Fewer Buttons menu items are visible on Configure buttons menu.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),Category("Behavior"),Description("Indicates whether Show More Buttons and Show Fewer Buttons menu items are visible on Configure buttons menu."),System.ComponentModel.DefaultValue(true)]
+		public bool ConfigureShowHideVisible
+		{
+			get {return m_ConfigureShowHideVisible;}
+			set
+			{
+				if(m_ConfigureShowHideVisible!=value)
+				{
+					m_ConfigureShowHideVisible=value;
+                    if (m_ConfigureItem != null)
+                    {
+                        if (m_ConfigureItem.Expanded) m_ConfigureItem.Expanded = false;
+                        m_ConfigureItem = null;
+                        NeedRecalcSize = true;
+                    }
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets whether Navigation Pane Options menu item is visible on Configure buttons menu.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),Category("Behavior"),Description("Indicates whether Show More Buttons and Show Fewer Buttons menu items are visible on Configure buttons menu."),System.ComponentModel.DefaultValue(true)]
+		public bool ConfigureNavOptionsVisible
+		{
+			get {return m_ConfigureNavOptionsVisible;}
+			set
+			{
+				if(m_ConfigureNavOptionsVisible!=value)
+				{
+					m_ConfigureNavOptionsVisible=value;
+                    if (m_ConfigureItem != null)
+                    {
+                        if (m_ConfigureItem.Expanded) m_ConfigureItem.Expanded = false;
+                        m_ConfigureItem = null;
+                    }
+					NeedRecalcSize=true;
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets whether Navigation Pane Add/Remove Buttons menu item is visible on Configure buttons menu.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),Category("Behavior"),Description("Indicates whether Navigation Pane Add/Remove Buttons menu item is visible on Configure buttons menu."),System.ComponentModel.DefaultValue(true)]
+		public bool ConfigureAddRemoveVisible
+		{
+			get {return m_ConfigureAddRemoveVisible;}
+			set
+			{
+				if(m_ConfigureAddRemoveVisible!=value)
+				{
+					m_ConfigureAddRemoveVisible=value;
+                    if (m_ConfigureItem != null)
+                    {
+                        if (m_ConfigureItem.Expanded) m_ConfigureItem.Expanded = false;
+                        m_ConfigureItem = null;
+                        NeedRecalcSize = true;
+                    }
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the padding in pixels at the top portion of the item. Height of each item will be increased by padding amount.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),Category("Layout"),Description("Indicates the padding in pixels at the top portion of the item."),DefaultValue(2)]
+		public int ItemPaddingTop
+		{
+			get {return m_ItemPaddingTop;}
+			set
+			{
+				m_ItemPaddingTop=value;
+				NeedRecalcSize=true;
+				if(this.DesignMode)
+					this.Refresh();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the padding in pixels for bottom portion of the item. Height of each item will be increased by padding amount.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),Category("Layout"),Description("Indicates the padding in pixels at the bottom of the item."),DefaultValue(2)]
+		public int ItemPaddingBottom
+		{
+			get {return m_ItemPaddingBottom;}
+			set
+			{
+				m_ItemPaddingBottom=value;
+				NeedRecalcSize=true;
+				if(this.DesignMode)
+					this.Refresh();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets whether images are automatically resized to size specified in ImageSizeSummaryLine when button is on the bottom summary line of navigation bar.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),Category("Appearance"),Description("Indicates whether images are automatically resized to size specified in ImageSizeSummaryLine when button is on the bottom summary line of navigation bar."),DefaultValue(true)]
+		public bool AutoSizeButtonImage
+		{
+			get {return m_AutoSizeButtonImage;}
+			set
+			{
+				if(m_AutoSizeButtonImage!=value)
+				{
+					m_AutoSizeButtonImage=value;
+					NeedRecalcSize=true;
+					if(this.DesignMode)
+						this.Refresh();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets size of the image that will be use to resize images to when button button is on the bottom summary line of navigation bar and AutoSizeButtonImage=true.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),Category("Appearance"),Description("Indicates size of the image that will be use to resize images to when button button is on the bottom summary line of navigation bar and AutoSizeButtonImage=true.")]
+		public Size ImageSizeSummaryLine
+		{
+			get {return m_ImageSizeSummaryLine;}
+			set
+			{
+				m_ImageSizeSummaryLine=value;
+				if(m_AutoSizeButtonImage)
+				{
+					NeedRecalcSize=true;
+					if(this.DesignMode)
+						this.Refresh();
+				}
+			}
+		}
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeImageSizeSummaryLine()
+		{
+			return (m_ImageSizeSummaryLine.Width!=16 || m_ImageSizeSummaryLine.Height!=16);
+		}
+
+		/// <summary>
+		/// Gets or sets whether summary line is visible.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),Category("Appearance"),DefaultValue(true),Description("Indicates whether summary line is visible.")]
+		public bool SummaryLineVisible
+		{
+			get {return m_SummaryLineVisible;}
+			set
+			{
+				if(m_SummaryLineVisible!=value)
+				{
+					m_SummaryLineVisible=value;
+					NeedRecalcSize=true;
+					if(this.DesignMode)
+						this.Refresh();
+				}
+			}
+		}
+
+		[System.ComponentModel.Browsable(false),System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+		public override void RefreshImageSize()
+		{}
+
+		/// <summary>
+		/// Must be called by any sub item that implements the image when image has changed
+		/// </summary>
+		public override void OnSubItemImageSizeChanged(BaseItem objItem){}
+
+		/// <summary>
+		/// Occurs after an item has been added to the container. This procedure is called on both item being added and the parent of the item. To distinguish between those two states check the item parameter.
+		/// </summary>
+		/// <param name="item">When occurring on the parent this will hold the reference to the item that has been added. When occurring on the item being added this will be null (Nothing).</param>
+		protected internal override void OnItemAdded(BaseItem item)
+		{
+			IOwnerItemEvents owner=this.GetIOwnerItemEvents();
+			if(owner!=null)
+				owner.InvokeItemAdded(item,new EventArgs());
+            item.ContainerState = eContainerState.NavigationPane;
+            item.DesignMarkerOrientation = eDesignMarkerOrientation.Horizontal;
+		}
+        /// <summary>
+        /// Occurs after an item has been removed.
+        /// </summary>
+        /// <param name="item">Item being removed.</param>
+        protected internal override void OnAfterItemRemoved(BaseItem item, int itemIndex)
+        {
+            base.OnAfterItemRemoved(item, itemIndex);
+            item.ContainerState = eContainerState.NotSet;
+            item.DesignMarkerOrientation = eDesignMarkerOrientation.NotSet;
+        }
+
+
+        public override void InternalKeyDown(System.Windows.Forms.KeyEventArgs objArg)
+        {
+            base.InternalKeyDown(objArg);
+
+            ContainerKeyboardNavigation.ProcessKeyDown(this, objArg);
+        }
+
+        #region IDesignTimeProvider Implementation
+        protected virtual InsertPosition GetContainerInsertPosition(Point pScreen, BaseItem dragItem)
+        {
+            return DesignTimeProviderContainer.GetInsertPosition(this, pScreen, dragItem);
+        }
+        InsertPosition IDesignTimeProvider.GetInsertPosition(Point pScreen, BaseItem dragItem)
+        {
+            return GetContainerInsertPosition(pScreen, dragItem);
+        }
+        void IDesignTimeProvider.DrawReversibleMarker(int iPos, bool Before)
+        {
+            DesignTimeProviderContainer.DrawReversibleMarker(this, iPos, Before);
+        }
+        void IDesignTimeProvider.InsertItemAt(BaseItem objItem, int iPos, bool Before)
+        {
+            DesignTimeProviderContainer.InsertItemAt(this, objItem, iPos, Before);
+        }
+
+        #endregion
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/NavigationBarDesigner.cs b/PROMS/DotNetBar Source Code/NavigationBarDesigner.cs
new file mode 100644
index 00000000..02ee3149
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/NavigationBarDesigner.cs	
@@ -0,0 +1,208 @@
+using System;
+using System.Windows.Forms;
+using System.Windows.Forms.Design;
+using System.Collections;
+using System.Drawing;
+using System.ComponentModel.Design;
+using System.ComponentModel;
+using System.ComponentModel.Design.Serialization;
+using System.CodeDom;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Provides design time support for NavigationBar control.
+	/// </summary>
+	public class NavigationBarDesigner:BarBaseControlDesigner
+	{
+		/// <summary>
+		/// Default constructor
+		/// </summary>
+		public NavigationBarDesigner()
+		{
+			this.EnableItemDragDrop=false;
+		}
+
+		public override DesignerVerbCollection Verbs 
+		{
+			get 
+			{
+				DesignerVerb[] verbs;
+				verbs = new DesignerVerb[]
+				{
+					new DesignerVerb("Create New Button", new EventHandler(CreateNewButton)),
+				};
+				return new DesignerVerbCollection(verbs);
+			}
+		}
+		private void CreateNewButton(object sender, EventArgs e)
+		{
+			IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+			NavigationBar navbar=this.Control as NavigationBar;
+			if(navbar==null || dh==null)
+				return;
+
+			IComponentChangeService change=this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+			if(change!=null)
+				change.OnComponentChanging(this.Component,null);
+
+			ButtonItem item=dh.CreateComponent(typeof(ButtonItem)) as ButtonItem;
+			item.Text=item.Name;
+			item.OptionGroup="navBar";
+			item.Image=BarFunctions.LoadBitmap("SystemImages.DefaultNavBarImage.png");
+			navbar.Items.Add(item);
+			if(navbar.Items.Count==1)
+				item.Checked=true;
+			navbar.RecalcLayout();
+
+			if(change!=null)
+				change.OnComponentChanged(this.Component,null,null,null);
+
+		}
+
+		protected override bool OnMouseDown(ref Message m)
+		{
+			if(base.OnMouseDown(ref m))
+				return true;
+			
+			NavigationBar navbar=this.GetItemContainerControl() as NavigationBar;
+			if(navbar==null || navbar.IsDisposed || !navbar.SplitterVisible)
+				return false;
+
+			Point pos=navbar.PointToClient(System.Windows.Forms.Control.MousePosition);
+			MouseEventArgs e=new MouseEventArgs(MouseButtons.Left,0,pos.X,pos.Y,0);
+
+			if(m.Msg==NativeFunctions.WM_LBUTTONDOWN)
+			{
+				if(navbar.HitTestSplitter(e.X,e.Y))
+					navbar.SplitterMouseDown(e);
+				if(navbar.IsSplitterMouseDown /*|| navbar.ClientRectangle.Contains(pos)*/)
+					return true;;
+			}
+
+			return false;
+		}
+
+		protected override bool OnMouseUp(ref Message m)
+		{
+			NavigationBar navbar=this.GetItemContainerControl() as NavigationBar;
+			if(navbar!=null && !navbar.IsDisposed && navbar.SplitterVisible)
+			{
+				Point pos=navbar.PointToClient(System.Windows.Forms.Control.MousePosition);
+				MouseEventArgs e=new MouseEventArgs(MouseButtons.Left,0,pos.X,pos.Y,0);
+				// Design-time splitter support
+				if(navbar.IsSplitterMouseDown)
+				{
+					navbar.SplitterMouseUp(e);
+					this.OnNavigationBarHeightChanged(navbar.Height);
+				}
+				else
+					navbar.SplitterMouseUp(e);
+			}
+
+			if(base.OnMouseUp(ref m))
+				return true;
+
+			return false;
+		}
+
+		protected virtual void OnNavigationBarHeightChanged(int newHeight)
+		{
+//			IComponentChangeService change=this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+//			if(change!=null)
+//			{
+//				change.OnComponentChanging(this.Control,TypeDescriptor.GetProperties(this.Control).Find("NavigationBarHeight",true));
+//				change.OnComponentChanged(this.Control,TypeDescriptor.GetProperties(this.Control).Find("NavigationBarHeight",true),0,newHeight);
+//			}
+		}
+
+		protected override bool OnMouseMove(ref Message m)
+		{
+			if(base.OnMouseMove(ref m))
+				return true;
+			NavigationBar navbar=this.GetItemContainerControl() as NavigationBar;
+			if(navbar!=null && !navbar.IsDisposed && navbar.SplitterVisible)
+			{
+				Point pos=navbar.PointToClient(System.Windows.Forms.Control.MousePosition);
+				MouseEventArgs e=new MouseEventArgs(System.Windows.Forms.Control.MouseButtons,0,pos.X,pos.Y,0);
+				navbar.SplitterMouseMove(e);
+			}
+			return false;
+		}
+
+		protected override bool OnMouseLeave(ref Message m)
+		{
+			if(base.OnMouseLeave(ref m))
+				return true;
+			NavigationBar navbar=this.GetItemContainerControl() as NavigationBar;
+			if(navbar!=null && !navbar.IsDisposed && navbar.SplitterVisible)
+				navbar.SplitterMouseLeave();
+			return false;
+		}
+
+		protected override void OnItemSelected(BaseItem item)
+		{
+			base.OnItemSelected(item);
+
+			if(item is ButtonItem && !((ButtonItem)item).Checked)
+			{
+				ButtonItem button=item as ButtonItem;
+				IComponentChangeService change=this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+				if(change!=null)
+					change.OnComponentChanging(button,TypeDescriptor.GetProperties(button).Find("Checked",true));
+				button.Checked=true;
+				if(change!=null)
+					change.OnComponentChanged(button,TypeDescriptor.GetProperties(button).Find("Checked",true),null,null);
+			}
+		}
+	}
+
+//	public class NavigationBarSerializer : CodeDomSerializer
+//	{
+//		public override object Serialize(IDesignerSerializationManager manager, object value) 
+//		{
+//			// first, locate and invoke the default serializer for 
+//			CodeDomSerializer baseSerializer = (CodeDomSerializer)manager.GetSerializer(
+//				typeof(NavigationBar).BaseType, 
+//				typeof(CodeDomSerializer));
+//
+//			object codeObject = baseSerializer.Serialize(manager, value);
+//
+//			// now add some custom code
+//			if (codeObject is CodeStatementCollection) 
+//			{
+//
+//				//				// add a custom comment to the code.
+//				CodeStatementCollection statements = 
+//					(CodeStatementCollection)codeObject;
+//
+//				// call a custom method.
+//				CodeExpression targetObject = 
+//					base.SerializeToReferenceExpression(manager, value);
+//				if(targetObject != null) 
+//				{
+//					
+//					CodeMethodInvokeExpression methodCall = 
+//						new CodeMethodInvokeExpression(targetObject, "RecalcLayout");
+//					statements.Add(methodCall);
+//				}
+//         
+//			}
+//
+//			// finally, return the statements that have been created
+//			return codeObject;
+//		}
+//
+//		/// The default serializer can handle the deserialization just fine.  We override this
+//		/// because it is an abstract member.
+//		/// </summary>
+//		public override object Deserialize(IDesignerSerializationManager manager, object codeDomObject)  
+//		{
+//			// delegate straight through to the default serializer
+//			//
+//			CodeDomSerializer baseSerializer = (CodeDomSerializer)manager.GetSerializer(typeof(NavigationBar).BaseType, typeof(CodeDomSerializer));
+//
+//			return baseSerializer.Deserialize(manager, codeDomObject);
+//		}
+//	}
+}
diff --git a/PROMS/DotNetBar Source Code/NavigationPane.bmp b/PROMS/DotNetBar Source Code/NavigationPane.bmp
new file mode 100644
index 00000000..b18aeab7
Binary files /dev/null and b/PROMS/DotNetBar Source Code/NavigationPane.bmp differ
diff --git a/PROMS/DotNetBar Source Code/NavigationPane.cs b/PROMS/DotNetBar Source Code/NavigationPane.cs
new file mode 100644
index 00000000..1500ff9a
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/NavigationPane.cs	
@@ -0,0 +1,1431 @@
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.Drawing;
+using System.Data;
+using System.Drawing.Drawing2D;
+using System.Drawing.Imaging;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar
+{
+	#region Event Delegates
+	/// <summary>
+	/// Delegate for OptionGroupChanging event.
+	/// </summary>
+	public delegate void PanelChangingEventHandler(object sender,  PanelChangingEventArgs e);
+
+	/// <summary>
+	/// Delegate for PanelPopup events.
+	/// </summary>
+	public delegate void PanelPopupEventHandler(object sender,  PanelPopupEventArgs e);
+	#endregion
+
+	/// <summary>
+	/// Represents Outlook 2003 style navigation pane control.
+	/// </summary>
+    [ToolboxItem(true), Designer("DevComponents.DotNetBar.Design.NavigationPaneDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+	public class NavigationPane : System.Windows.Forms.UserControl
+	{
+		private DevComponents.DotNetBar.PanelExTitle panelTitle;
+		private DevComponents.DotNetBar.NavigationBar navBar;
+
+		/// <summary> 
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.Container components = null;
+		private int m_NavigationBarHeight=0;
+        private bool m_CanCollapse = false;
+        private bool m_Expanded = true;
+        private bool m_ExpandedDelayed = true;
+        private Image m_DefaultCollapseImage = null;
+        private Image m_DefaultExpandImage = null;
+        private Image m_DefaultCollapseImageMouseOver = null;
+        private Image m_DefaultExpandImageMouseOver = null;
+
+        private Image m_TitleImageCollapse = null;
+        private Image m_TitleImageExpand = null;
+        private Image m_TitleImageCollapseMouseOver = null;
+        private Image m_TitleImageExpandMouseOver = null;
+        private int m_ExpandedSize = 0;
+        private int m_CollapsedSize = 0;
+        private PanelEx m_PanePopupPanel = null;
+        private int m_AnimationTime = 100;
+        private bool m_PopupPaneVisible = false;
+        private PanelEx m_PopupPanelContainer = null;
+        private bool m_LayoutSuspended = false;
+
+		#region Events
+		/// <summary>
+		/// Occurs when Item is clicked.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when Item is clicked."),Category("Navigation Pane Events")]
+		public event EventHandler ItemClick;
+        /// <summary>
+        /// Occurs when currently selected panel is about to change.
+        /// </summary>
+		[System.ComponentModel.Description("Occurs when Item is clicked."),Category("Navigation Pane Events")]
+		public event PanelChangingEventHandler PanelChanging;
+
+        /// <summary>
+        /// Occurs when control is looking for translated text for one of the internal text that are
+        /// displayed on menus, toolbars and customize forms. You need to set Handled=true if you want
+        /// your custom text to be used instead of the built-in system value.
+        /// </summary>
+        public event DotNetBarManager.LocalizeStringEventHandler LocalizeString;
+
+		/// <summary>
+		/// Occurs before panel is displayed on popup when control is collapsed. You can use this event to modify default
+		/// size of the popup panel or cancel the popup of the panel.
+		/// </summary>
+		public event PanelPopupEventHandler BeforePanelPopup;
+
+        /// <summary>
+        /// Occurs after panel is displayed on popup.
+        /// </summary>
+        public event EventHandler AfterPanelPopup;
+
+        /// <summary>
+        /// Occurs after panel displayed on popup is closed.
+        /// </summary>
+        public event EventHandler PanelPopupClosed;
+
+		/// <summary>
+		/// Occurs before Expanded property is changed. You can cancel change of this property by setting Cancel=true on the event arguments.
+		/// </summary>
+		public event ExpandChangeEventHandler ExpandedChanging;
+		/// <summary>
+		/// Occurs after Expanded property has changed. You can handle ExpandedChanging event and have opportunity to cancel the change.
+		/// </summary>
+		public event ExpandChangeEventHandler ExpandedChanged;
+        /// <summary>
+        /// Occurs after Options dialog which is used to customize control's content has closed by user using OK button.
+        /// </summary>
+        public event EventHandler OptionsDialogClosed;
+		#endregion
+
+		public NavigationPane()
+		{
+			// This call is required by the Windows.Forms Form Designer.
+			InitializeComponent();
+
+			this.SetStyle(ControlStyles.Opaque,true);
+			this.SetStyle(DisplayHelp.DoubleBufferFlag,true);
+			this.SetStyle(ControlStyles.AllPaintingInWmPaint,true);
+
+			navBar.ItemAdded+=new EventHandler(NavBarItemAdded);
+			navBar.ItemRemoved+=new BarBaseControl.ItemRemovedEventHandler(NavBarItemRemoved);
+            navBar.ApplicationMouseDown += new HandlerMessageEventHandler(ApplicationMouseDown);
+            navBar.LocalizeString += new DotNetBarManager.LocalizeStringEventHandler(navBar_LocalizeString);
+            navBar.OptionsDialogClosed += new EventHandler(NavBarOptionsDialogClosed);
+			navBar.SplitterVisible=true;
+			m_NavigationBarHeight=navBar.Height;
+            panelTitle.ExpandedClick += new EventHandler(panelEx1_ExpandedClick);
+            panelTitle.ExpandChangeButton.ImagePaddingHorizontal = 2;
+            panelTitle.ExpandChangeButton.ImagePaddingVertical = 2;
+
+            StyleManager.Register(this);
+		}
+
+        void NavBarOptionsDialogClosed(object sender, EventArgs e)
+        {
+            OnOptionsDialogClosed(e);
+        }
+
+        void navBar_LocalizeString(object sender, LocalizeEventArgs e)
+        {
+            if (LocalizeString != null)
+                LocalizeString(this, e);
+        }
+
+        protected virtual void OnOptionsDialogClosed(EventArgs e)
+        {
+            EventHandler handler = OptionsDialogClosed;
+            if (handler != null) handler(this, e);
+        }
+
+        /// <summary> 
+		/// Clean up any resources being used.
+		/// </summary>
+		protected override void Dispose( bool disposing )
+		{
+			if( disposing )
+			{
+                if (m_DefaultCollapseImage != null)
+                    m_DefaultCollapseImage.Dispose();
+                if (m_DefaultExpandImage != null)
+                    m_DefaultExpandImage.Dispose();
+				if(components != null)
+				{
+					components.Dispose();
+				}
+			}
+            StyleManager.Unregister(this);
+			base.Dispose( disposing );
+		}
+		
+		protected override void OnPaint(PaintEventArgs e)
+		{
+			base.OnPaint(e);
+
+            if (navBar.ItemsContainer.EffectiveStyle == eDotNetBarStyle.Office2010)
+            {
+                Rendering.BaseRenderer renderer = navBar.GetRenderer();
+                if(renderer!=null)
+                    renderer.DrawNavPaneButtonBackground(new NavPaneRenderEventArgs(e.Graphics, this.ClientRectangle));
+            }
+            else
+            {
+                using (SolidBrush brush = new SolidBrush(this.NavigationBar.GetColorScheme().BarBackground))
+                    e.Graphics.FillRectangle(brush, this.ClientRectangle);
+                using (Pen pen = new Pen(this.NavigationBar.GetColorScheme().PanelBorder, 1))
+                    e.Graphics.DrawRectangle(pen, new Rectangle(0, 0, this.Width - 1, this.Height - 1));
+            }
+		}
+        [EditorBrowsable(EditorBrowsableState.Never)]
+		public void SetDesignMode()
+		{
+			navBar.SetDesignMode(this.DesignMode);
+		}
+
+        /// <summary>
+        /// Returns the width of the expanded control if control is currently collapsed.
+        /// </summary>
+        [Browsable(false)]
+        public int ExpandedSize
+        {
+            get { return m_ExpandedSize; }
+        }
+
+		/// <summary>
+		/// Returns collection containing buttons on navigation bar.
+		/// </summary>
+		[DesignerSerializationVisibility(DesignerSerializationVisibility.Content), Browsable(false)]
+		public SubItemsCollection Items
+		{
+			get
+			{
+				return navBar.Items;
+			}
+		}
+
+		/// <summary>
+		/// Applies any layout changes and repaint the control.
+		/// </summary>
+		public virtual void RecalcLayout()
+		{
+			navBar.RecalcLayout();
+		}
+
+		private void NavBarItemAdded(object sender, EventArgs e)
+		{
+			ButtonItem item=sender as ButtonItem;
+            if (item != null && !item.IsOnCustomizeMenu)
+            {
+                item.CheckedChanged += new EventHandler(ItemCheckedChanged);
+                item.TextChanged += new EventHandler(ItemTextChanged);
+                item.VisibleChanged += new EventHandler(ItemVisibleChanged);
+
+                if (item.Checked)
+                {
+                    item.SetChecked(false);
+                    item.Checked = true;
+                }
+            }
+		}
+
+        void ItemVisibleChanged(object sender, EventArgs e)
+        {
+            ButtonItem item = sender as ButtonItem;
+            if (item == null || item.IsOnCustomizeMenu)
+                return;
+            if (item.Checked && !item.Visible)
+            {
+                foreach (BaseItem childItem in this.Items)
+                {
+                    ButtonItem button = childItem as ButtonItem;
+                    if (button == null || !button.Visible)
+                        continue;
+                    button.Checked = true;
+                    break;
+                }
+            }
+        }
+
+		private void NavBarItemRemoved(object sender, ItemRemovedEventArgs e)
+		{
+			ButtonItem item=sender as ButtonItem;
+			if(item!=null)
+			{
+				try
+				{
+					item.CheckedChanged-=new EventHandler(ItemCheckedChanged);
+                    item.TextChanged -= new EventHandler(ItemTextChanged);
+                    item.VisibleChanged -= new EventHandler(ItemVisibleChanged);
+				}
+				catch{}
+			}
+		}
+
+		private void ItemCheckedChanged(object sender, EventArgs e)
+		{
+			ButtonItem item=sender as ButtonItem;
+			if(item==null || item.IsOnCustomizeMenu)
+				return;
+			foreach(Control c in this.Controls)
+			{
+				if(c is NavigationPanePanel)
+				{
+					NavigationPanePanel panel=c as NavigationPanePanel;
+					if(panel.ParentItem==item)
+					{
+						if(item.Checked)
+						{
+                            if (m_Expanded)
+                            {
+                                if (!this.DesignMode)
+                                    panel.Visible = true;
+                                panel.BringToFront();
+                            }
+							panelTitle.Text=item.Text;
+                            if (m_PanePopupPanel != null)
+                                m_PanePopupPanel.Text = panelTitle.Text;
+						}
+						else
+						{
+                            if (m_Expanded)
+                            {
+                                if (!this.DesignMode)
+                                    panel.Visible = false;
+                                else
+                                    panel.SendToBack();
+                            }
+						}
+						break;
+					}
+				}
+			}
+		}
+
+		private void ItemTextChanged(object sender, EventArgs e)
+		{
+			ButtonItem item=sender as ButtonItem;
+			if(item==null)
+				return;
+            if (item.Checked)
+            {
+                panelTitle.Text = item.Text;
+                if (m_PanePopupPanel != null)
+                    m_PanePopupPanel.Text = item.Text;
+            }
+		}
+
+		protected override void OnControlAdded(ControlEventArgs e)
+		{
+			base.OnControlAdded(e);
+
+			if(this.DesignMode)
+				return;
+			NavigationPanePanel panel=e.Control as NavigationPanePanel;
+			if(panel==null)
+				return;
+
+			if(panel.ParentItem!=null && m_Expanded)
+			{
+				if(this.Items.Contains(panel.ParentItem) && panel.ParentItem is ButtonItem)
+				{
+					panel.Visible=((ButtonItem)panel.ParentItem).Checked;
+					if(panel.Visible)
+						panel.BringToFront();
+				}
+				else
+					panel.Visible=false;
+			}
+			else
+				panel.Visible=false;
+		}
+
+        protected override void OnSystemColorsChanged(EventArgs e)
+        {
+            base.OnSystemColorsChanged(e);
+            Application.DoEvents();
+            if (m_CanCollapse)
+            {
+                UpdateExpandCollapseImages();
+                UpdateExpandButton();
+            }
+        }
+
+		/// <summary>
+		/// Returns Panel associated with button on navigation bar or null if panel cannot be found.
+		/// </summary>
+		/// <param name="item">Button on navigation bar.</param>
+		/// <returns></returns>
+		public NavigationPanePanel GetPanel(ButtonItem item)
+		{
+			if(item==null)
+				return null;
+			foreach(Control c in this.Controls)
+			{
+				NavigationPanePanel panel=c as NavigationPanePanel;
+				if(panel!=null)
+				{
+					if(panel.ParentItem==item)
+						return panel;
+				}
+			}
+			return null;
+		}
+
+		/// <summary>
+		/// Gets or sets the height of the navigation bar part of the navigation pane control.
+		/// Navigation Bar height is automatically calculated based on the content.
+		/// Setting this property suggests desired height of the navigation bar but the actual height will be
+        /// calculated to ensure that complete buttons are visible so suggested and actual height might differ.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),Category("Layout"),DefaultValue(32)]
+		public int NavigationBarHeight
+		{
+			get
+			{
+                if (!this.DesignMode && navBar != null && navBar.Items.Count > 0)
+                    return navBar.Height;
+
+				return m_NavigationBarHeight;
+			}
+			set
+			{
+				m_NavigationBarHeight=value;
+				navBar.Height=m_NavigationBarHeight;
+			}
+		}
+
+		private void OnNavBarResize(object sender, EventArgs e)
+		{
+			if(this.DesignMode)
+				m_NavigationBarHeight=navBar.Height;
+		}
+
+        protected override void OnLayout(LayoutEventArgs e)
+        {
+            base.OnLayout(e);
+            UpdatePanePopupPanelSize();
+        }
+
+        /// <summary>
+        /// Suspends normal layout logic.
+        /// </summary>
+        public new void SuspendLayout()
+        {
+            m_LayoutSuspended = true;
+            base.SuspendLayout();
+        }
+
+		/// <summary>
+		/// Resumes normal layout logic. Optionally forces an immediate layout of pending layout requests.
+		/// </summary>
+		public new void ResumeLayout(bool performLayout)
+		{
+            m_LayoutSuspended = false;
+			navBar.Height=m_NavigationBarHeight;
+			navBar.SendToBack();
+			base.ResumeLayout(true);
+            this.Expanded = m_ExpandedDelayed;
+		}
+
+		/// <summary>
+		/// Returns reference to internal NavigationBar control.
+		/// </summary>
+		[Browsable(false),DevCoBrowsable(false)]
+		public NavigationBar NavigationBar
+		{
+			get
+			{
+				return navBar;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets size of the image that will be use to resize images to when button button is on the bottom summary line of navigation bar and AutoSizeButtonImage=true.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),Category("Appearance"),Description("Indicates size of the image that will be use to resize images to when button button is on the bottom summary line of navigation bar and AutoSizeButtonImage=true.")]
+		public Size ImageSizeSummaryLine
+		{
+			get {return navBar.ImageSizeSummaryLine;}
+			set {navBar.ImageSizeSummaryLine=value;}
+		}
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeImageSizeSummaryLine()
+		{
+			return navBar.ShouldSerializeImageSizeSummaryLine();
+		}
+
+		/// <summary>
+		/// Gets or sets whether Configure Buttons button is visible.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),Category("Behavior"),Description("Indicates Configure Buttons button is visible."),DefaultValue(true)]
+		public bool ConfigureItemVisible
+		{
+			get {return navBar.ConfigureItemVisible;}
+			set {navBar.ConfigureItemVisible=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets whether Show More Buttons and Show Fewer Buttons menu items are visible on Configure buttons menu.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),Category("Behavior"),Description("Indicates whether Show More Buttons and Show Fewer Buttons menu items are visible on Configure buttons menu."),System.ComponentModel.DefaultValue(true)]
+		public bool ConfigureShowHideVisible
+		{
+			get {return navBar.ConfigureShowHideVisible;}
+			set	{navBar.ConfigureShowHideVisible=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets whether Navigation Pane Options menu item is visible on Configure buttons menu.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),Category("Behavior"),Description("Gets or sets whether Navigation Pane Options menu item is visible on Configure buttons menu."),System.ComponentModel.DefaultValue(true)]
+		public bool ConfigureNavOptionsVisible
+		{
+			get {return navBar.ConfigureNavOptionsVisible;}
+			set	{navBar.ConfigureNavOptionsVisible=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets whether Navigation Pane Add/Remove Buttons menu item is visible on Configure buttons menu.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),Category("Behavior"),Description("Indicates whether Navigation Pane Add/Remove Buttons menu item is visible on Configure buttons menu."),System.ComponentModel.DefaultValue(true)]
+		public bool ConfigureAddRemoveVisible
+		{
+			get {return navBar.ConfigureAddRemoveVisible;}
+			set {navBar.ConfigureAddRemoveVisible=value;}
+		}
+
+		/// <summary>
+		/// Returns reference to currently checked button.
+		/// </summary>
+		public ButtonItem CheckedButton
+		{
+			get {return navBar.CheckedButton;}
+		}
+
+		/// <summary>
+		/// Returns reference to currently selected panel. Panels are automatically switched when buttons are checked.
+		/// </summary>
+		public NavigationPanePanel SelectedPanel
+		{
+			get {return this.GetPanel(this.CheckedButton);}
+		}
+
+		/// <summary>
+		/// Increases the size of the navigation bar if possible by showing more buttons on the top.
+		/// </summary>
+		public void ShowMoreButtons()
+		{
+			navBar.ShowMoreButtons();
+		}
+
+		/// <summary>
+		/// Reduces the size of the navigation bar if possible by showing fewer buttons on the top.
+		/// </summary>
+		public void ShowFewerButtons()
+		{
+			navBar.ShowFewerButtons();
+		}
+
+		/// <summary>
+		/// ImageList for images used on Items.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),System.ComponentModel.Category("Data"),DefaultValue(null),System.ComponentModel.Description("ImageList for images used on Items.")]
+		public System.Windows.Forms.ImageList Images
+		{
+			get
+			{
+				return navBar.Images;
+			}
+			set
+			{
+				navBar.Images=value;
+			}
+		}
+
+		/// <summary>
+		/// Returns reference to the PanelEx that is used to display title.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),DesignerSerializationVisibility(DesignerSerializationVisibility.Content),Category("Appearance"),Description("PanelEx control that is used to display title.")]
+		public PanelEx TitlePanel
+		{
+			get {return panelTitle;}
+		}
+
+		/// <summary>
+		/// Gets or sets the padding in pixels at the top portion of the item. Height of each item will be increased by padding amount.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),Category("Layout"),Description("Indicates the padding in pixels at the top portion of the item."),DefaultValue(4)]
+		public int ItemPaddingTop
+		{
+			get {return navBar.ItemPaddingTop;}
+			set 
+			{
+				navBar.ItemPaddingTop=value;
+				if(this.DesignMode)
+					this.RecalcLayout();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the padding in pixels for bottom portion of the item. Height of each item will be increased by padding amount.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),Category("Layout"),Description("Indicates the padding in pixels at the bottom of the item."),DefaultValue(4)]
+		public int ItemPaddingBottom
+		{
+			get {return navBar.ItemPaddingBottom;}
+			set 
+			{
+				navBar.ItemPaddingBottom=value;
+				if(this.DesignMode)
+					this.RecalcLayout();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets whether images are automatically resized to size specified in ImageSizeSummaryLine when button is on the bottom summary line of navigation bar.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),Category("Appearance"),Description("Indicates whether images are automatically resized to size specified in ImageSizeSummaryLine when button is on the bottom summary line of navigation bar."),DefaultValue(true)]
+		public bool AutoSizeButtonImage
+		{
+			get {return navBar.AutoSizeButtonImage;}
+			set {navBar.AutoSizeButtonImage=value;}
+		}
+
+		/// <summary>
+		/// Saves current visual layout of navigation bar control to XML based file.
+		/// </summary>
+		/// <param name="fileName">File name to save layout to.</param>
+		public void SaveLayout(string fileName)
+		{
+			navBar.SaveLayout(fileName);
+		}
+
+		/// <summary>
+		/// Saves current visual layout of navigation bar control to XmlElement.
+		/// </summary>
+		/// <param name="xmlParent">XmlElement object that will act as a parent for the layout definition. Exact same element should be passed into the LoadLayout method to load the layout.</param>
+		public void SaveLayout(System.Xml.XmlElement xmlParent)
+		{
+			navBar.SaveLayout(xmlParent);
+		}
+
+		/// <summary>
+		/// Gets or sets the navigation bar definition string.
+		/// </summary>
+		[Browsable(false),DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public string LayoutDefinition
+		{
+			get
+			{
+				return navBar.LayoutDefinition;
+			}
+			set
+			{
+				navBar.LayoutDefinition=value;
+			}
+		}
+
+        /// <summary>
+        /// Gets or sets whether anti-alias smoothing is used while painting. Default value is false.
+        /// </summary>
+        [DefaultValue(false), Browsable(true), Category("Appearance"), Description("Gets or sets whether anti-aliasing is used while painting.")]
+        public bool AntiAlias
+        {
+            get { return navBar.AntiAlias; }
+            set
+            {
+                navBar.AntiAlias = value;
+                if (panelTitle != null)
+                    panelTitle.AntiAlias = value;
+                if (m_PanePopupPanel != null)
+                    m_PanePopupPanel.AntiAlias = value;
+                if (m_PopupPanelContainer != null)
+                    m_PopupPanelContainer.AntiAlias = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets animation time in milliseconds when control is expanded or collapsed. Default value is 100 miliseconds. You can set this to 0 (zero) to disable animation.
+        /// </summary>
+        [Browsable(true), DefaultValue(100), Category("Expand"), Description("Indicates animation time in milliseconds when control is expanded or collapsed.")]
+        public int AnimationTime
+        {
+            get { return m_AnimationTime; }
+            set
+            {
+                if (m_AnimationTime >= 0)
+                    m_AnimationTime = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether navigation pane can be collapsed. Default value is false. When set to true
+        /// expand/collapse button will be displayed in title so control can be reduced in size.
+        /// </summary>
+        [Browsable(true), Category("Title"), DefaultValue(false), Description("Indicates whether navigation pane can be collapsed.")]
+        public bool CanCollapse
+        {
+            get { return m_CanCollapse; }
+            set
+            {
+                m_CanCollapse = value;
+                OnCanCollapseChanged();
+                panelTitle.ExpandButtonVisible = m_CanCollapse;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets alignment of the expand button inside of title bar.
+        /// </summary>
+        [Browsable(true), DefaultValue(eTitleButtonAlignment.Right), Category("Title"), Description("Indicates the alignment of expand button inside title bar.")]
+        public eTitleButtonAlignment TitleButtonAlignment
+        {
+            get { return panelTitle.ButtonAlignment; }
+            set
+            {
+                panelTitle.ButtonAlignment = value;
+                UpdateExpandButton();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether navigation pane is expanded. Default value is true. 
+        /// When control is collapsed it is reduced in size so it consumes less space.
+        /// </summary>
+        [Browsable(true), Category("Title"), DefaultValue(true), Description("Indicates whether navigation pane can be collapsed.")]
+        public bool Expanded
+        {
+            get { return m_Expanded; }
+            set
+            {
+                if (m_LayoutSuspended)
+                {
+                    m_ExpandedDelayed = value;
+                    return;
+                }
+                if (m_Expanded != value)
+                {
+					SetExpanded(value, eEventSource.Code);
+                }
+            }
+        }
+
+		private void SetExpanded(bool expanded, eEventSource source)
+		{
+			if(ExpandedChanging!=null)
+			{
+				ExpandedChangeEventArgs args=new ExpandedChangeEventArgs(source, expanded);
+				ExpandedChanging(this,args);
+				if(args.Cancel)
+					return;
+			}
+
+			m_Expanded = expanded;
+			OnExpandedChanged();
+
+			if(ExpandedChanged!=null)
+			{
+				ExpandedChangeEventArgs args=new ExpandedChangeEventArgs(source, expanded);
+				ExpandedChanged(this,args);
+			}
+		}
+
+        private void OnExpandedChanged()
+        {
+            if (m_Expanded)
+            {
+                foreach (BaseItem item in navBar.Items)
+                    item.RenderText = true;
+                panelTitle.DrawText = true;
+                this.PopupSelectedPaneVisible = false;
+                DestroyPanePopup();
+                if (this.AnimationTime == 0 || this.DesignMode)
+                    TypeDescriptor.GetProperties(this)["Width"].SetValue(this, m_ExpandedSize);
+                else
+                {
+                    Rectangle targetRect = new Rectangle(this.Location, new Size(m_ExpandedSize, this.Height));
+                    if (this.Dock == DockStyle.Right)
+                        targetRect.Offset(-m_ExpandedSize, 0);
+                    BarFunctions.AnimateControl(this, true, m_AnimationTime, this.Bounds, targetRect);
+                }
+            }
+            else
+            {
+                panelTitle.DrawText = false;
+                m_ExpandedSize = this.Width;
+                if (this.AnimationTime == 0 || this.DesignMode)
+                    TypeDescriptor.GetProperties(this)["Width"].SetValue(this, GetCollapsedSize());
+                else
+                {
+                    Rectangle targetRect = new Rectangle(this.Location, new Size(GetCollapsedSize(), this.Height));
+                    if (this.Dock == DockStyle.Right)
+                        targetRect.Offset(this.Width - targetRect.Width, 0);
+                    BarFunctions.AnimateControl(this, true, m_AnimationTime, this.Bounds, targetRect);
+                }
+                SetupPanePopup();
+                foreach (BaseItem item in navBar.Items)
+                    item.RenderText = false;
+                navBar.Invalidate();
+            }
+            this.UpdateExpandButton();
+        }
+
+        private int GetCollapsedSize()
+        {
+            int defaultCollapsedSize = Math.Max(panelTitle.Font.Height + 10, 34);
+
+            if (m_CollapsedSize > 0)
+                return m_CollapsedSize;
+
+            ButtonItem item = navBar.ItemsContainer.GetFirstVisibleItem() as ButtonItem;
+            if (item == null)
+                return defaultCollapsedSize;
+
+            if (item.ImageSize.IsEmpty)
+                return defaultCollapsedSize;
+
+            CompositeImage image = item.GetImage(ImageState.Default, Color.Black);
+            if (image != null)
+                return Math.Max(defaultCollapsedSize, image.RealWidth + 10);
+
+            return defaultCollapsedSize;
+        }
+
+        void panelEx1_ExpandedClick(object sender, EventArgs e)
+        {
+            SetExpanded(!this.Expanded,eEventSource.Mouse);
+        }
+
+        private void ApplicationMouseDown(object sender, HandlerMessageEventArgs e)
+        {
+            if (this.PopupSelectedPaneVisible)
+            {
+                string s = NativeFunctions.GetClassName(e.hWnd);
+                s = s.ToLower();
+                if (s.IndexOf("combolbox") >= 0)
+                    return;
+
+                Control c = Control.FromChildHandle(e.hWnd);
+                while (c != null)
+                {
+                    if (c == m_PopupPanelContainer || c == m_PanePopupPanel)
+                        return;
+                    c=c.Parent;
+                }
+                this.PopupSelectedPaneVisible = false;
+            }
+        }
+
+        /// <summary>
+        /// Gets the reference to the inner panel displaying Navigation Pane vertical text created when control is collapsed.
+        /// </summary>
+        [Browsable(false)]
+        public PanelEx CollapsedInnerPanel
+        {
+            get
+            {
+                return m_PanePopupPanel;
+            }
+        }
+
+        private void SetupPanePopup()
+        {
+            m_PanePopupPanel = new PanelEx();
+            m_PanePopupPanel.ColorSchemeStyle = navBar.Style;
+            m_PanePopupPanel.ColorScheme = navBar.GetColorScheme();
+            m_PanePopupPanel.ApplyButtonStyle();
+            m_PanePopupPanel.Style.VerticalText = true;
+            m_PanePopupPanel.Style.ForeColor.ColorSchemePart = eColorSchemePart.PanelText;
+            m_PanePopupPanel.Style.BackColor1.ColorSchemePart = eColorSchemePart.PanelBackground;
+            m_PanePopupPanel.Style.ResetBackColor2();
+            m_PanePopupPanel.StyleMouseOver.VerticalText = true;
+            m_PanePopupPanel.StyleMouseDown.VerticalText = true;
+            m_PanePopupPanel.Font = panelTitle.Font;
+            m_PanePopupPanel.AntiAlias = this.AntiAlias;
+            UpdatePanePopupPanelSize();
+
+            if(this.CheckedButton!=null)
+                m_PanePopupPanel.Text = this.CheckedButton.Text;
+            else
+                m_PanePopupPanel.Text = "Navigation Pane";
+            
+            foreach (Control c in this.Controls)
+            {
+                if (c is NavigationPanePanel)
+                    c.Visible = false;
+            }
+            this.Controls.Add(m_PanePopupPanel);
+            m_PanePopupPanel.Click += new EventHandler(PanePopupPanelClick);
+        }
+
+        void PanePopupPanelClick(object sender, EventArgs e)
+        {
+            this.PopupSelectedPaneVisible = !this.PopupSelectedPaneVisible;
+        }
+
+        /// <summary>
+        /// Popup selected pane when control is collapsed. When control is collapsed (Expanded=false) currently selected pane is not visible
+        /// calling this method will popup selected pane and allow user access to it. Use PopupPaneVisible property
+        /// to check whether currently selected pane is displayed as popup.
+        /// </summary>
+        private void PopupSelectedPane()
+        {
+            if (m_PopupPaneVisible)
+                return;
+            Control selectedNavPane = null;
+            foreach (Control c in this.Controls)
+            {
+                if (c is NavigationPanePanel && ((NavigationPanePanel)c).ParentItem == this.CheckedButton)
+                {
+                    selectedNavPane = c;
+                    break;
+                }
+            }
+            if (selectedNavPane == null)
+                return;
+
+			// Animation start and end rectangles
+			int h = navBar.Top - panelTitle.Bottom;
+			Rectangle targetRect = new Rectangle(this.Width, panelTitle.Bottom, m_ExpandedSize, h);
+			Rectangle startRect = new Rectangle(this.Width, panelTitle.Bottom, 16, h);
+
+			if(BeforePanelPopup!=null)
+			{
+				PanelPopupEventArgs args=new PanelPopupEventArgs(targetRect);
+				BeforePanelPopup(this, args);
+                if(args.Cancel)
+					return;
+				targetRect=args.PopupBounds;
+			}
+
+            Control parentForm = this.FindForm();
+            if (parentForm == null)
+                parentForm = this.TopLevelControl;
+            if (parentForm == null)
+                parentForm = this.Parent;
+
+            m_PopupPanelContainer = new PanelEx();
+            m_PopupPanelContainer.Visible = false;
+            m_PopupPanelContainer.ApplyLabelStyle();
+            m_PopupPanelContainer.AntiAlias = this.AntiAlias;
+            //m_PopupPanelContainer.Style.BorderSide = eBorderSide.All;
+            //m_PopupPanelContainer.Style.Border = eBorderType.SingleLine;
+            //m_PopupPanelContainer.Style.BorderWidth = 1;
+            //m_PopupPanelContainer.Style.BorderColor.Color = panelTitle.Style.BorderColor.Color;
+            //m_PopupPanelContainer.DockPadding.All = 1;
+            parentForm.Controls.Add(m_PopupPanelContainer);
+            m_PopupPanelContainer.BringToFront();
+            this.Controls.Remove(selectedNavPane);
+            if (selectedNavPane is NavigationPanePanel)
+            {
+                NavigationPanePanel panel = ((NavigationPanePanel)selectedNavPane);
+                panel.DockPadding.Bottom = 1;
+                if (panel.Style.Border == eBorderType.None)
+                {
+                    m_PopupPanelContainer.Style.BorderSide = eBorderSide.All;
+                    m_PopupPanelContainer.Style.Border = eBorderType.SingleLine;
+                    m_PopupPanelContainer.Style.BorderWidth = 1;
+                    m_PopupPanelContainer.Style.BorderColor.Color = panelTitle.Style.BorderColor.Color;
+                    m_PopupPanelContainer.DockPadding.All = 1;
+                }
+            }
+            m_PopupPanelContainer.Controls.Add(selectedNavPane);
+            selectedNavPane.Visible = true;
+
+            if (this.Dock == DockStyle.Right)
+            {
+                targetRect.Offset(-(this.Width + targetRect.Width), 0);
+                startRect.Offset(-(this.Width + startRect.Width), 0);
+            }
+
+            Point p = this.PointToScreen(targetRect.Location);
+            targetRect.Location = parentForm.PointToClient(p);
+            p = this.PointToScreen(startRect.Location);
+            startRect.Location = parentForm.PointToClient(p);
+
+            if (AnimationTime == 0)
+            {
+                m_PopupPanelContainer.Bounds = targetRect;
+                m_PopupPanelContainer.Visible = true;
+            }
+            else
+                BarFunctions.AnimateControl(m_PopupPanelContainer, true, AnimationTime, startRect, targetRect);
+
+            m_PopupPanelContainer.Focus();
+            m_PopupPanelContainer.Leave += new EventHandler(m_PopupPanelContainer_Leave);
+            m_PopupPaneVisible = true;
+
+            if (AfterPanelPopup != null)
+                AfterPanelPopup(this, new EventArgs());
+        }
+
+        void m_PopupPanelContainer_Leave(object sender, EventArgs e)
+        {
+            if (PopupSelectedPaneVisible)
+                PopupSelectedPaneVisible = false;
+        }
+
+		private bool m_Hiding=false;
+        /// <summary>
+        /// Hides popup selected pane when control is collapsed and selected pane is displayed as popup. When control is collapsed (Expanded=false)
+        /// currently selected pane can be displayed as popup. Calling this method will hide the popup pane. Use PopupPaneVisible property
+        /// to check whether currently selected pane is displayed as popup.
+        /// </summary>
+        private void HideSelectedPopupPane()
+        {
+            if (!m_PopupPaneVisible || m_Hiding)
+                return;
+            m_Hiding=true;
+			try
+			{
+				if (AnimationTime == 0)
+					m_PopupPanelContainer.Hide();
+				else
+				{
+					Rectangle targetRect = new Rectangle(this.Width, this.Top, 16, this.Height);
+					if (this.Dock == DockStyle.Right)
+						targetRect.Offset(-(this.Width + targetRect.Width), 0);
+					Point p = this.PointToScreen(targetRect.Location);
+					targetRect.Location = m_PopupPanelContainer.Parent.PointToClient(p);
+					BarFunctions.AnimateControl(m_PopupPanelContainer, false, AnimationTime, m_PopupPanelContainer.Bounds, targetRect);
+				}
+
+				Control navPanel=null;
+				foreach(Control c in m_PopupPanelContainer.Controls)
+				{
+					if(c is NavigationPanePanel)
+					{
+						c.Visible=false;
+						m_PopupPanelContainer.Controls.Remove(c);
+						navPanel=c;
+						break;
+					}
+				}
+				if(navPanel is NavigationPanePanel)
+					((NavigationPanePanel)navPanel).DockPadding.Bottom = 0;
+				this.Controls.Add(navPanel);
+				m_PopupPanelContainer.Leave -= new EventHandler(m_PopupPanelContainer_Leave);
+				m_PopupPanelContainer.Dispose();
+				m_PopupPanelContainer = null;
+				m_PopupPaneVisible = false;
+                OnPanelPopupClosed(EventArgs.Empty);
+			}
+			finally
+			{
+				m_Hiding=false;
+			}
+        }
+
+        /// <summary>
+        /// Raises the PanelPopupClosed event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnPanelPopupClosed(EventArgs e)
+        {
+            EventHandler handler = PanelPopupClosed;
+            if (handler != null) handler(this, e);
+        }
+        /// <summary>
+        /// Gets or sets whether selected pane is displayed as popup when control is collapsed (Expanded=false). Using
+        /// navigation pane button that is displayed when control is collapsed user can popup or close currently selected pane without
+        /// expanding the control. You can use this property to do same from code as well as check whether selected pane is displayed as
+        /// popup. Note that control must be collapsed (Expanded=false) in order for this property to have any effect.
+        /// </summary>
+        [Browsable(false),DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool PopupSelectedPaneVisible
+        {
+            get { return m_PopupPaneVisible; }
+            set
+            {
+                if (m_PopupPaneVisible != value)
+                {
+                    if (value)
+                        PopupSelectedPane();
+                    else
+                        HideSelectedPopupPane();
+                }
+            }
+        }
+
+        private void UpdatePanePopupPanelSize()
+        {
+            if (m_PanePopupPanel == null)
+                return;
+            int margin = 3;
+            m_PanePopupPanel.Bounds=new Rectangle(new Point(this.ClientRectangle.X + margin, panelTitle.Bottom + margin),
+                new Size(this.ClientRectangle.Width - margin * 2, navBar.Top - panelTitle.Bottom - margin * 2));
+        }
+
+        private void DestroyPanePopup()
+        {
+            if (m_PanePopupPanel != null)
+            {
+                this.Controls.Remove(m_PanePopupPanel);
+                m_PanePopupPanel.Dispose();
+                m_PanePopupPanel = null;
+            }
+
+            foreach(Control c in this.Controls)
+            {
+                if (c is NavigationPanePanel && ((NavigationPanePanel)c).ParentItem == this.CheckedButton)
+                {
+                    c.Visible = true;
+                    if(this.DesignMode)
+                        TypeDescriptor.GetProperties(c)["Visible"].SetValue(c, true);
+                    c.BringToFront();
+                    break;
+                }
+            }
+        }
+
+        private void OnCanCollapseChanged()
+        {
+            if (m_CanCollapse)
+            {
+                UpdateExpandCollapseImages();
+            }
+            UpdateExpandButton();
+        }
+
+        private Image GetCollapseImage(bool mouseOverImage)
+        {
+            if (mouseOverImage)
+            {
+                if (m_TitleImageCollapseMouseOver != null)
+                    return m_TitleImageCollapseMouseOver;
+                return m_DefaultCollapseImageMouseOver;
+            }
+            else
+            {
+                if (m_TitleImageCollapse != null)
+                    return m_TitleImageCollapse;
+                return m_DefaultCollapseImage;
+            }
+        }
+
+        private Image GetExpandImage(bool mouseOverImage)
+        {
+            if (mouseOverImage)
+            {
+                if (m_TitleImageExpandMouseOver != null)
+                    return m_TitleImageExpandMouseOver;
+                return m_DefaultExpandImageMouseOver;
+            }
+            else
+            {
+                if (m_TitleImageExpand != null)
+                    return m_TitleImageExpand;
+                return m_DefaultExpandImage;
+            }
+        }
+
+        internal void Office2007ColorTableChanged()
+        {
+            ColorSchemeStyleChanged();
+        }
+
+        private void UpdateExpandButton()
+        {
+            LocalizationManager lm=new LocalizationManager(navBar as IOwnerLocalize);
+            if (m_Expanded)
+            {
+                if (panelTitle.ButtonAlignment == eTitleButtonAlignment.Right || m_TitleImageCollapse!=null)
+                {
+                    panelTitle.ExpandChangeButton.Image = GetCollapseImage(false);
+                    panelTitle.ExpandChangeButton.HoverImage = GetCollapseImage(true);
+                }
+                else
+                {
+                    panelTitle.ExpandChangeButton.Image = GetExpandImage(false);
+                    panelTitle.ExpandChangeButton.HoverImage = GetExpandImage(true);
+                }
+                panelTitle.ExpandChangeButton.Tooltip = lm.GetDefaultLocalizedString(LocalizationKeys.NavPaneCollapseButtonTooltip);
+            }
+            else
+            {
+                if (panelTitle.ButtonAlignment == eTitleButtonAlignment.Right || m_TitleImageExpand != null)
+                {
+                    panelTitle.ExpandChangeButton.Image = GetExpandImage(false);
+                    panelTitle.ExpandChangeButton.HoverImage = GetExpandImage(true);
+                }
+                else
+                {
+                    panelTitle.ExpandChangeButton.Image = GetCollapseImage(false);
+                    panelTitle.ExpandChangeButton.HoverImage = GetCollapseImage(true);
+                }
+                panelTitle.ExpandChangeButton.Tooltip = lm.GetDefaultLocalizedString(LocalizationKeys.NavPaneExpandButtonTooltip);
+            }
+            panelTitle.UpdateButtonPosition();
+        }
+	    
+	    private void UpdateExpandCollapseImages()
+	    {
+            if (m_DefaultCollapseImage != null)
+                m_DefaultCollapseImage.Dispose();
+            if (m_DefaultExpandImage != null)
+                m_DefaultExpandImage.Dispose();
+            if (m_DefaultCollapseImageMouseOver != null)
+                m_DefaultCollapseImageMouseOver.Dispose();
+            if (m_DefaultExpandImageMouseOver != null)
+                m_DefaultExpandImageMouseOver.Dispose();
+
+            m_DefaultCollapseImage = UIGraphics.CreateExpandButtonImage(true, panelTitle.ColorScheme.PanelText, false);
+            m_DefaultCollapseImageMouseOver = UIGraphics.CreateExpandButtonImage(true, panelTitle.ColorScheme.ItemHotText, false);
+            m_DefaultExpandImage = UIGraphics.CreateExpandButtonImage(false, panelTitle.ColorScheme.PanelText, false);
+            m_DefaultExpandImageMouseOver = UIGraphics.CreateExpandButtonImage(false, panelTitle.ColorScheme.ItemHotText, false);
+	    }
+
+		/// <summary>
+		/// Loads navigation bar layout that was saved using SaveLayout method. Note that this method must be called after all items are created and added to the control.
+		/// </summary>
+		/// <param name="fileName">File to load layout from.</param>
+		public void LoadLayout(string fileName)
+		{
+			navBar.LoadLayout(fileName);
+		}
+
+		/// <summary>
+		/// Loads navigation bar layout that was saved using SaveLayout method. Note that this method must be called after all items are created and added to the control.
+		/// </summary>
+		/// <param name="xmlParent">Parent XML element that is used to load layout from. Note that this must be the same element that was passed into the SaveLayout method.</param>
+		public void LoadLayout(System.Xml.XmlElement xmlParent)
+		{
+			navBar.LoadLayout(xmlParent);
+		}
+
+        /// <summary>
+        /// Gets/Sets the visual style for the control. Default style is Office 2003.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Category("Appearance"), Description("Specifies the visual style of the control."), DefaultValue(eDotNetBarStyle.Office2003)]
+        public eDotNetBarStyle Style
+        {
+            get
+            {
+                return navBar.Style;
+            }
+            set
+            {
+                navBar.Style = value;
+                ColorSchemeStyleChanged();
+            }
+        }
+
+        /// <summary>
+        /// Called by StyleManager to notify control that style on manager has changed and that control should refresh its appearance if
+        /// its style is controlled by StyleManager.
+        /// </summary>
+        /// <param name="newStyle">New active style.</param>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void StyleManagerStyleChanged(eDotNetBarStyle newStyle)
+        {
+            ColorSchemeStyleChanged();
+            if (this.IsHandleCreated && this.Visible)
+                this.Invalidate(true);
+        }
+
+        protected override void OnHandleCreated(EventArgs e)
+        {
+            ColorSchemeStyleChanged();
+            base.OnHandleCreated(e);
+        }
+
+        /// <summary>
+        /// Updates the color scheme on child panels to reflect the style of the NavigationBar control. Calling this method is necessary only if you manually
+        /// change the NavigationBar.ColorScheme property.
+        /// </summary>
+        public void ColorSchemeStyleChanged()
+        {
+            ColorScheme cs = null;
+            eDotNetBarStyle style = navBar.ItemsContainer.EffectiveStyle;
+
+            if (BarFunctions.IsOffice2007Style(style) || navBar.ColorScheme != null && navBar.ColorScheme.PredefinedColorScheme == ePredefinedColorScheme.SystemColors)
+                cs = navBar.GetColorScheme();
+
+            foreach (Control c in this.Controls)
+            {
+                if (c is PanelEx)
+                {
+                    PanelEx p = c as PanelEx;
+                    TypeDescriptor.GetProperties(p)["ColorSchemeStyle"].SetValue(p, style);
+                    if (cs != null)
+                        ((PanelEx)c).ColorScheme = cs;
+                }
+            }
+
+            if (style == eDotNetBarStyle.Office2010)
+                panelTitle.Style.Border = eBorderType.None;
+            else if (BarFunctions.IsOffice2007Style(style))
+                panelTitle.Style.Border = eBorderType.RaisedInner;
+            else
+                panelTitle.Style.Border = eBorderType.SingleLine;
+
+            UpdateExpandCollapseImages();
+            UpdateExpandButton();
+
+            if (style == eDotNetBarStyle.Office2010)
+            {
+                this.DockPadding.All = 0;
+                this.navBar.BackgroundStyle.BorderWidth = 0;
+                this.navBar.BackgroundStyle.BorderColor.Color = Color.Transparent;
+            }
+            else
+            {
+                this.DockPadding.All = 1;
+                this.navBar.BackgroundStyle.BorderWidth = 1;
+                navBar.BackgroundStyle.BorderColor.ColorSchemePart = eColorSchemePart.PanelBorder;
+            }
+        }
+
+		#region Event Forwarding
+		private void OnNavBarItemClick(object sender, EventArgs e)
+		{
+			if(ItemClick!=null)
+				ItemClick(sender, e);
+		}
+		private void OnNavBarOptionGroupChanging(object sender, OptionGroupChangingEventArgs e)
+		{
+			NavigationPanePanel oldPanel=null, newPanel=null;
+            if(e.OldChecked!=null)
+				oldPanel=this.GetPanel((ButtonItem)e.OldChecked);
+			if(e.NewChecked!=null)
+                newPanel = this.GetPanel((ButtonItem)e.NewChecked);
+
+			if(newPanel==null)
+				return;
+
+			PanelChangingEventArgs epanel=new PanelChangingEventArgs(oldPanel,newPanel);
+			InvokePanelChanging(epanel);
+			e.Cancel=epanel.Cancel;
+
+		}
+		protected virtual void InvokePanelChanging(PanelChangingEventArgs e)
+		{
+			if(PanelChanging!=null)
+				PanelChanging(this,e);
+		}
+		#endregion
+
+		#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.panelTitle = new DevComponents.DotNetBar.PanelExTitle();
+			this.navBar = new DevComponents.DotNetBar.NavigationBar();
+			((ISupportInitialize)this.navBar).BeginInit();
+			//this.SuspendLayout();
+			// 
+			// panelTitle
+			// 
+			this.panelTitle.Dock = System.Windows.Forms.DockStyle.Top;
+			this.panelTitle.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((System.Byte)(0)));
+			this.panelTitle.Name = "panelTitle";
+			this.panelTitle.Size = new System.Drawing.Size(150, 24);
+			this.panelTitle.Style.Alignment = System.Drawing.StringAlignment.Near;
+			this.panelTitle.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground;
+			this.panelTitle.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2;
+			this.panelTitle.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+            this.panelTitle.Style.BorderSide = eBorderSide.Bottom;
+			this.panelTitle.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+			this.panelTitle.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
+			this.panelTitle.Style.GradientAngle = 90;
+			this.panelTitle.Style.MarginLeft=4;
+			this.panelTitle.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Near;
+			this.panelTitle.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Near;
+			this.panelTitle.TabIndex = 0;
+            this.panelTitle.ExpandButtonVisible = false;
+			this.panelTitle.Text = "Title";
+			// 
+			// navigationBar1
+			// 
+			this.navBar.BackgroundStyle.BackColor1.ColorSchemePart = eColorSchemePart.PanelBackground;
+			this.navBar.BackgroundStyle.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+            this.navBar.BackgroundStyle.BorderSide = eBorderSide.Top;
+			this.navBar.BackgroundStyle.BorderColor.ColorSchemePart = eColorSchemePart.PanelBorder;
+			this.navBar.Dock = System.Windows.Forms.DockStyle.Bottom;
+			this.navBar.Location = new System.Drawing.Point(0, 128);
+			this.navBar.Name = "navigationBar1";
+			this.navBar.Size = new System.Drawing.Size(150, 32);
+			this.navBar.TabIndex = 1;
+			this.navBar.Text = "navBar";
+			this.navBar.Resize+=new EventHandler(this.OnNavBarResize);
+			this.navBar.ItemClick+=new EventHandler(this.OnNavBarItemClick);
+			this.navBar.OptionGroupChanging+=new OptionGroupChangingEventHandler(this.OnNavBarOptionGroupChanging);
+			this.navBar.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((System.Byte)(0)));
+			// 
+			// NavigationPane
+			// 
+			this.Controls.AddRange(new System.Windows.Forms.Control[] {
+																		  this.navBar,
+																		  this.panelTitle});
+			this.Name = "NavigationPane";
+			this.Size = new System.Drawing.Size(150, 192);
+            this.DockPadding.All = 1;
+
+			((ISupportInitialize)this.navBar).EndInit();
+			//this.ResumeLayout(false);
+		}
+		#endregion
+	}
+
+	#region PanelChangingEventArgs 
+	/// <summary>
+	/// Represents event arguments for PanelChanging event.
+	/// </summary>
+	public class PanelChangingEventArgs : EventArgs
+	{
+		/// <summary>
+		/// Set to true to cancel changing of the panel.
+		/// </summary>
+		public bool Cancel=false;
+		/// <summary>
+		/// Panel that will be selected if operation is not cancelled.
+		/// </summary>
+		public readonly NavigationPanePanel NewPanel;
+		/// <summary>
+		/// Panel that is currently selected and which will be de-selected if operation is not cancelled.
+		/// </summary>
+		public readonly NavigationPanePanel OldPanel;
+		/// <summary>
+		/// Default constructor.
+		/// </summary>
+		public PanelChangingEventArgs(NavigationPanePanel oldpanel, NavigationPanePanel newpanel)
+		{
+			NewPanel=newpanel;
+			OldPanel=oldpanel;
+		}
+	}
+	#endregion
+
+	#region PanelPopupEventArgs
+	/// <summary>
+	/// Represents event arguments for BeforePanelPopup event.
+	/// </summary>
+	public class PanelPopupEventArgs : EventArgs
+	{
+		/// <summary>
+		/// Set to true to cancel popup of the panel.
+		/// </summary>
+		public bool Cancel=false;
+		/// <summary>
+		/// Size and position of popup. You can modify this memeber to affect size and position of popup.
+		/// </summary>
+		public Rectangle PopupBounds=Rectangle.Empty;
+		/// <summary>
+		/// Default constructor.
+		/// </summary>
+		public PanelPopupEventArgs(Rectangle popupBounds)
+		{
+			this.PopupBounds=popupBounds;
+		}
+	}
+	#endregion
+}
diff --git a/PROMS/DotNetBar Source Code/NavigationPane.resx b/PROMS/DotNetBar Source Code/NavigationPane.resx
new file mode 100644
index 00000000..b7674775
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/NavigationPane.resx	
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+            Microsoft ResX Schema 
+        
+            Version 1.3
+                
+            The primary goals of this format is to allow a simple XML format 
+            that is mostly human readable. The generation and parsing of the 
+            various data types are done through the TypeConverter classes 
+            associated with the data types.
+        
+            Example:
+        
+                ... ado.net/XML headers & schema ...
+                <resheader name="resmimetype">text/microsoft-resx</resheader>
+                <resheader name="version">1.3</resheader>
+                <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+                <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+                <data name="Name1">this is my long string</data>
+                <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+                <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+                    [base64 mime encoded serialized .NET Framework object]
+                </data>
+                <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+                    [base64 mime encoded string representing a byte array form of the .NET Framework object]
+                </data>
+        
+            There are any number of "resheader" rows that contain simple 
+            name/value pairs.
+            
+            Each data row contains a name, and value. The row also contains a 
+            type or mimetype. Type corresponds to a .NET class that support 
+            text/value conversion through the TypeConverter architecture. 
+            Classes that don't support this are serialized and stored with the 
+            mimetype set.
+                     
+            The mimetype is used for serialized objects, and tells the 
+            ResXResourceReader how to depersist the object. This is currently not 
+            extensible. For a given mimetype the value must be set accordingly:
+        
+            Note - application/x-microsoft.net.object.binary.base64 is the format 
+                   that the ResXResourceWriter will generate, however the reader can 
+                   read any of the formats listed below.
+        
+            mimetype: application/x-microsoft.net.object.binary.base64
+            value   : The object must be serialized with 
+                    : System.Serialization.Formatters.Binary.BinaryFormatter
+                    : and then encoded with base64 encoding.
+        
+            mimetype: application/x-microsoft.net.object.soap.base64
+            value   : The object must be serialized with 
+                    : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+                    : and then encoded with base64 encoding.
+            mimetype: application/x-microsoft.net.object.bytearray.base64
+            value   : The object must be serialized into a byte array 
+                    : using a System.ComponentModel.TypeConverter
+                    : and then encoded with base64 encoding.
+        -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>1.3</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="$this.Name">
+    <value>NavigationPane</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/NavigationPaneDesigner.cs b/PROMS/DotNetBar Source Code/NavigationPaneDesigner.cs
new file mode 100644
index 00000000..8dccea4c
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/NavigationPaneDesigner.cs	
@@ -0,0 +1,463 @@
+using System;
+using System.Windows.Forms;
+using System.Windows.Forms.Design;
+using System.Collections;
+using System.Drawing;
+using System.ComponentModel.Design;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Summary description for NavigationPaneDesigner.
+	/// </summary>
+	public class NavigationPaneDesigner:NavigationBarDesigner
+	{
+		public override void Initialize(IComponent component) 
+		{
+			base.Initialize(component);
+			if(!component.Site.DesignMode)
+				return;
+			NavigationPane pane=this.Control as NavigationPane;
+			if(pane!=null)
+				pane.SetDesignMode();
+		}
+		public override DesignerVerbCollection Verbs 
+		{
+			get 
+			{
+				DesignerVerb[] verbs;
+				verbs = new DesignerVerb[]
+				{
+					new DesignerVerb("Create New Pane", new EventHandler(CreateNewPane)),
+				};
+				return new DesignerVerbCollection(verbs);
+			}
+		}
+
+#if FRAMEWORK20
+        public override void InitializeNewComponent(IDictionary defaultValues)
+        {
+            base.InitializeNewComponent(defaultValues);
+            SetDesignTimeDefaults();
+        }
+#else
+		public override void OnSetComponentDefaults()
+		{
+			base.OnSetComponentDefaults();
+			SetDesignTimeDefaults();
+		}
+#endif
+
+        private void SetDesignTimeDefaults()
+        {
+            CreateNewPane();
+        }
+
+		private void CreateNewPane(object sender, EventArgs e)
+		{
+			CreateNewPane();
+		}
+
+		private void CreateNewPane()
+		{
+			IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+			NavigationPane navPane=this.Control as NavigationPane;
+			if(navPane==null || dh==null)
+				return;
+
+			IComponentChangeService change=this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+			if(change!=null)
+				change.OnComponentChanging(this.Component,null);
+
+			ButtonItem item=dh.CreateComponent(typeof(ButtonItem)) as ButtonItem;
+			item.Text=item.Name;
+			item.OptionGroup="navBar";
+			item.Image=BarFunctions.LoadBitmap("SystemImages.DefaultNavBarImage.png");
+			NavigationPanePanel panel=dh.CreateComponent(typeof(NavigationPanePanel)) as NavigationPanePanel;
+			panel.ParentItem=item;
+			navPane.Items.Add(item);
+			navPane.Controls.Add(panel);
+			panel.DockPadding.All=1;
+			panel.DockPadding.Bottom=0;
+			panel.Dock=DockStyle.Fill;
+			panel.SendToBack();
+			panel.ApplyLabelStyle();
+			panel.Style.Border=eBorderType.SingleLine;
+			panel.Style.BorderColor.ColorSchemePart=eColorSchemePart.PanelBorder;
+
+			if(navPane.Items.Count==1)
+				item.Checked=true;
+			navPane.RecalcLayout();
+			if(change!=null)
+				change.OnComponentChanged(this.Component,null,null,null);
+
+			if(change!=null)
+			{
+				change.OnComponentChanging(panel,null);
+				change.OnComponentChanged(panel,null,null,null);
+			}
+		}
+
+		public override bool CanParent(Control c)
+		{
+			if(c is NavigationPanePanel)
+				return true;
+			return false;
+		}
+
+		protected override BaseItem GetItemContainer()
+		{
+			NavigationPane bar=this.Control as NavigationPane;
+			if(bar!=null)
+				return bar.NavigationBar.GetBaseItemContainer();
+			return null;
+		}
+
+		protected override System.Windows.Forms.Control GetItemContainerControl()
+		{
+			NavigationPane bar=this.Control as NavigationPane;
+			if(bar!=null)
+				return bar.NavigationBar;
+			return null;
+		}
+		/// <summary>
+		/// Triggered when some other component on the form is removed.
+		/// </summary>
+		protected override void OtherComponentRemoving(object sender, ComponentEventArgs e)
+		{
+			base.OtherComponentRemoving(sender,e);
+
+			NavigationPane bar=this.Component as NavigationPane;
+			if(bar==null || bar.IsDisposed)
+				return;
+
+			IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+			if(dh==null)
+				return;
+
+			// Check is any of the buttons or panel that we host
+			if(!m_InternalRemoving && e.Component is BaseItem)
+			{
+				BaseItem item=e.Component as BaseItem;
+				if(bar.NavigationBar.GetItem(item.Name)==item)
+				{
+					if(item is ButtonItem)
+					{
+						NavigationPanePanel panel=bar.GetPanel(item as ButtonItem);
+						if(panel!=null && dh!=null)
+						{
+							bar.Controls.Remove(panel);
+							dh.DestroyComponent(panel);
+						}
+					}
+					item.Parent.SubItems.Remove(item);
+					bar.RecalcLayout();
+				}
+			}
+			else if(!m_InternalRemoving && e.Component is NavigationPanePanel)
+			{
+				if(bar.Controls.Contains(e.Component as NavigationPanePanel))
+				{
+					NavigationPanePanel navpane=e.Component as NavigationPanePanel;
+					if(navpane.ParentItem!=null)
+						bar.Items.Remove(navpane.ParentItem);
+					bar.RecalcLayout();
+				}
+			}
+		}
+
+        protected override void PreFilterProperties(IDictionary properties)
+        {
+            base.PreFilterProperties(properties);
+            properties["Expanded"] = TypeDescriptor.CreateProperty(typeof(NavigationPaneDesigner), (PropertyDescriptor)properties["Expanded"], new Attribute[]
+				{
+					new DefaultValueAttribute(true),
+					new BrowsableAttribute(true),
+					new CategoryAttribute("Title"),
+                    new DescriptionAttribute("Indicates whether navigation pane can be collapsed.")});
+
+        }
+
+        /// <summary>
+        /// Gets or sets whether navigation pane is expanded. Default value is true. 
+        /// When control is collapsed it is reduced in size so it consumes less space.
+        /// </summary>
+        [Browsable(true), Category("Title"), DefaultValue(true), Description("Indicates whether navigation pane can be collapsed.")]
+        public bool Expanded
+        {
+            get { return (bool)ShadowProperties["Expanded"]; }
+            set
+            {
+                // this value is not passed to the actual control at design-time
+                this.ShadowProperties["Expanded"] = value;
+            }
+        }
+
+		#region Commented Out
+//		public override System.Collections.ICollection AssociatedComponents
+//		{
+//			get
+//			{
+//				ArrayList c=new ArrayList(base.AssociatedComponents);
+//				NavigationPane navpane=this.Control as NavigationPane;
+//				if(navpane!=null)
+//				{
+//					foreach(BaseItem item in navpane.Items)
+//						c.Add(item);
+//				}
+//				return c;
+//			}
+//		}
+
+//		private bool m_InternalRemoving=false;
+//		private void OnComponentRemoving(object sender,ComponentEventArgs e)
+//		{
+//			NavigationPane bar=this.Component as NavigationPane;
+//			IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+//
+//			if(e.Component!=this.Component)
+//			{
+//				// Check is any of the buttons or panel that we host
+//				if(!m_InternalRemoving && e.Component is BaseItem)
+//				{
+//					BaseItem item=e.Component as BaseItem;
+//					if(bar.NavigationBar.GetItem(item.Name)==item)
+//					{
+//						if(item is ButtonItem)
+//						{
+//							NavigationPanePanel panel=bar.GetPanel(item as ButtonItem);
+//							if(panel!=null && dh!=null)
+//							{
+//								bar.Controls.Remove(panel);
+//								dh.DestroyComponent(panel);
+//							}
+//						}
+//						item.Parent.SubItems.Remove(item);
+//						bar.RecalcLayout();
+//					}
+//									}
+//				else if(!m_InternalRemoving && e.Component is NavigationPanePanel)
+//				{
+//					if(bar.Controls.Contains(e.Component as NavigationPanePanel))
+//					{
+//						NavigationPanePanel navpane=e.Component as NavigationPanePanel;
+//						if(navpane.ParentItem!=null)
+//							bar.Items.Remove(navpane.ParentItem);
+//						bar.RecalcLayout();
+//					}
+//				}
+//				return;
+//			}
+//
+//			m_InternalRemoving=true;
+//			try
+//			{
+//				// Unhook events
+//				IComponentChangeService cc=(IComponentChangeService)GetService(typeof(IComponentChangeService));
+//				if(cc!=null)
+//					cc.ComponentRemoving-=new ComponentEventHandler(this.OnComponentRemoving);
+//
+//				if(dh==null || bar==null)
+//					return;
+//
+//				foreach(BaseItem item in bar.Items)
+//				{
+//					DestroySubItems(item,dh);
+//					dh.DestroyComponent(item);
+//				}
+//			}
+//			finally
+//			{
+//				m_InternalRemoving=false;
+//			}
+//		}
+//		private void DestroySubItems(BaseItem parent, IDesignerHost dh)
+//		{
+//			foreach(BaseItem item in parent.SubItems)
+//			{
+//				DestroySubItems(item,dh);
+//				dh.DestroyComponent(item);
+//			}
+//		}
+
+//		private void OnSelectionChanged(object sender, EventArgs e) 
+//		{
+//			ISelectionService ss = (ISelectionService)sender;
+//			if(ss.PrimarySelection!=this.Control)
+//			{
+//				NavigationPane bar=this.Control as NavigationPane;
+//				if(ss.PrimarySelection is BaseItem)
+//				{
+//					BaseItem item=ss.PrimarySelection as BaseItem;
+//					if(!bar.Items.Contains(item))
+//					{
+//						foreach(BaseItem panel in bar.Items)
+//						{
+//							if(panel.SubItems.Contains(item))
+//								return;
+//						}
+//						((IOwner)bar).SetFocusItem(null);
+//					}
+//				}
+//				else
+//				{
+//					((IOwner)bar).SetFocusItem(null);
+//					((IOwner)bar).OnApplicationDeactivate(); // Closes all popups
+//				}
+//			}
+//		}
+
+//		private BaseItem m_SelectItem=null;
+//		protected override void WndProc(ref Message m)
+//		{
+//			NavigationPane navpane=this.Control as NavigationPane;
+//			if(navpane==null || navpane.IsDisposed)
+//			{
+//				base.WndProc(ref m);
+//				return;
+//			}
+//			NavigationBar navbar=navpane.NavigationBar;
+//			if(navbar==null || navbar.ItemsContainer==null || navbar.IsDisposed)
+//			{
+//				base.WndProc(ref m);
+//				return;
+//			}
+//
+//			switch(m.Msg)
+//			{
+//				case NativeFunctions.WM_LBUTTONDOWN:
+//				case NativeFunctions.WM_RBUTTONDOWN:
+//				{
+//					Point pos=navbar.PointToClient(System.Windows.Forms.Control.MousePosition);
+//					MouseEventArgs e=new MouseEventArgs(MouseButtons.Left,0,pos.X,pos.Y,0);
+//					BaseItem focusItem=((IOwner)navbar).GetFocusItem();
+//					navbar.ItemsContainer.InternalMouseDown(e);
+//					if(focusItem==((IOwner)navbar).GetFocusItem())
+//					{
+//						if(m.Msg==NativeFunctions.WM_RBUTTONDOWN)
+//							return;
+//
+//						((IOwner)navbar).SetFocusItem(null);
+//					}
+//					
+//					if(m.Msg==NativeFunctions.WM_LBUTTONDOWN)
+//					{
+//						if(navbar.HitTestSplitter(e.X,e.Y))
+//							navbar.SplitterMouseDown(e);
+//						if(navbar.IsSplitterMouseDown || navbar.ClientRectangle.Contains(pos))
+//							return;
+//					}
+//					break;
+//				}
+//				case NativeFunctions.WM_RBUTTONUP:
+//				case NativeFunctions.WM_LBUTTONUP:
+//				{
+//					Point pos=navbar.PointToClient(System.Windows.Forms.Control.MousePosition);
+//					MouseEventArgs e=new MouseEventArgs(MouseButtons.Left,0,pos.X,pos.Y,0);
+//					navbar.ItemsContainer.InternalMouseUp(e);
+//					
+//					// Design-time splitter support
+//					if(navbar.IsSplitterMouseDown)
+//					{
+//						navbar.SplitterMouseUp(e);
+//						IComponentChangeService change=this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+//						if(change!=null)
+//						{
+//							change.OnComponentChanging(this.Control,TypeDescriptor.GetProperties(this.Control).Find("NavigationBarHeight",true));
+//							change.OnComponentChanged(this.Component,TypeDescriptor.GetProperties(this.Control).Find("NavigationBarHeight",true),0,navpane.NavigationBarHeight);
+//						}
+//					}
+//					else
+//						navbar.SplitterMouseUp(e);
+//
+//					if(((IOwner)navbar).GetFocusItem()!=null)
+//					{
+//						m_SelectItem=((IOwner)navbar).GetFocusItem();
+//						NativeFunctions.PostMessage(m.HWnd.ToInt32(),NativeFunctions.WM_USER+101,0,0);
+//					}
+//					else
+//					{
+//						ISelectionService selection = (ISelectionService) this.GetService(typeof(ISelectionService));
+//						if(selection.PrimarySelection!=navpane && !(selection.PrimarySelection.GetType() == typeof(NavigationPanePanel)))
+//						{
+//							ArrayList arr=new ArrayList(1);
+//							arr.Add(navpane);
+//							selection.SetSelectedComponents(arr,SelectionTypes.Click);
+//						}
+//					}
+//
+//					break;
+//				}
+//				case NativeFunctions.WM_MOUSEMOVE:
+//				{
+//					Point pos=navbar.PointToClient(System.Windows.Forms.Control.MousePosition);
+//					MouseEventArgs e=new MouseEventArgs(System.Windows.Forms.Control.MouseButtons,0,pos.X,pos.Y,0);
+//					navbar.SplitterMouseMove(e);
+//					break;
+//				}
+//				case NativeFunctions.WM_MOUSELEAVE:
+//				{
+//					navbar.SplitterMouseLeave();
+//					break;
+//				}
+//				case NativeFunctions.WM_USER+101:
+//				{
+//					if(ProcessPendingSelection())
+//						return;
+//					break;
+//				}
+//			}
+//
+//			base.WndProc(ref m);
+//		}
+//
+//		private bool ProcessPendingSelection()
+//		{
+//			NavigationPane navpane=this.Control as NavigationPane;
+//			NavigationBar navbar=navpane.NavigationBar;
+//			if(navbar==null)
+//				return false;
+//			if(m_SelectItem!=null)
+//			{
+//				Point pos=navbar.PointToClient(System.Windows.Forms.Control.MousePosition);
+//				if(m_SelectItem is ButtonItem && !((ButtonItem)m_SelectItem).Checked)
+//				{
+//					ButtonItem button=m_SelectItem as ButtonItem;
+//					IComponentChangeService change=this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+//					if(change!=null)
+//						change.OnComponentChanging(button,TypeDescriptor.GetProperties(button).Find("Checked",true));
+//					m_SelectItem.InternalClick(MouseButtons.Left,pos);
+//					button.Checked=true;
+//					if(change!=null)
+//						change.OnComponentChanged(button,TypeDescriptor.GetProperties(button).Find("Checked",true),null,null);
+//				}
+//				ISelectionService selection = (ISelectionService) this.GetService(typeof(ISelectionService));
+//				ArrayList arr=new ArrayList(1);
+//				arr.Add(m_SelectItem);
+//				selection.SetSelectedComponents(arr,SelectionTypes.Click);
+//
+//				m_SelectItem=null;
+//				return true;
+//			}
+//			return false;
+//		}
+//		public override void Initialize(IComponent component) 
+//		{
+//			base.Initialize(component);
+//			if(!component.Site.DesignMode)
+//				return;
+//
+//			ISelectionService ss =(ISelectionService)GetService(typeof(ISelectionService));
+//			if(ss!=null)
+//				ss.SelectionChanged+=new EventHandler(OnSelectionChanged);
+//
+//			// If our component is removed we need to clean-up
+//			IComponentChangeService cc=(IComponentChangeService)GetService(typeof(IComponentChangeService));
+//			if(cc!=null)
+//				cc.ComponentRemoving+=new ComponentEventHandler(this.OnComponentRemoving);
+//		}
+//
+		#endregion
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/NavigationPanePanel.cs b/PROMS/DotNetBar Source Code/NavigationPanePanel.cs
new file mode 100644
index 00000000..9b019b1c
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/NavigationPanePanel.cs	
@@ -0,0 +1,59 @@
+using System;
+using System.Windows.Forms;
+using System.Windows.Forms.Design;
+using System.Collections;
+using System.Drawing;
+using System.ComponentModel.Design;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Represents Panel on Navigation Pane control.
+	/// </summary>
+	[ToolboxItem(false),Designer("DevComponents.DotNetBar.Design.NavigationPanePanelDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+	public class NavigationPanePanel:PanelEx
+	{
+		private BaseItem m_ParentItem;
+		private const string INFO_TEXT="Drop controls on this panel to associate them with current selection";
+		public NavigationPanePanel()
+		{
+			
+		}
+
+		/// <summary>
+		/// Gets or sets button associated with the pane on the panel when hosted on NavigationPane control.
+		/// </summary>
+		[Browsable(false),DevCoBrowsable(false)]
+		public BaseItem ParentItem
+		{
+			get {return m_ParentItem;}
+			set
+			{
+				m_ParentItem=value;
+				if(m_ParentItem!=null && this.Parent is NavigationPane && m_ParentItem is ButtonItem)
+				{
+					if(((ButtonItem)m_ParentItem).Checked)
+					{
+						this.Visible=true;
+						this.BringToFront();
+					}
+				}
+			}
+		}
+
+		protected override void OnPaint(PaintEventArgs e)
+		{
+			base.OnPaint(e);
+			if(this.DesignMode && this.Controls.Count==0 && this.Text=="")
+			{
+				Rectangle r=this.ClientRectangle;
+				r.Inflate(-2,-2);
+                eTextFormat sf = eTextFormat.Default | eTextFormat.HorizontalCenter | eTextFormat.VerticalCenter | eTextFormat.EndEllipsis;
+				Font font=new Font(this.Font,FontStyle.Bold);
+				TextDrawing.DrawString(e.Graphics,INFO_TEXT,font,ControlPaint.Dark(this.Style.BackColor1.Color),r,sf);
+				font.Dispose();
+			}
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/Office2007Form/FormCaptionPainter.cs b/PROMS/DotNetBar Source Code/Office2007Form/FormCaptionPainter.cs
new file mode 100644
index 00000000..cb0ce64c
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Office2007Form/FormCaptionPainter.cs	
@@ -0,0 +1,13 @@
+using System;
+using System.Text;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Defines the abstract class for form caption painter.
+    /// </summary>
+    internal abstract class FormCaptionPainter
+    {
+        public abstract void PaintCaptionBackground(FormCaptionRendererEventArgs e);
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Office2007Form/FormCaptionRendererEventArgs.cs b/PROMS/DotNetBar Source Code/Office2007Form/FormCaptionRendererEventArgs.cs
new file mode 100644
index 00000000..1bde1ad5
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Office2007Form/FormCaptionRendererEventArgs.cs	
@@ -0,0 +1,36 @@
+using System;
+using System.Text;
+using System.Drawing;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Provides data for form caption rendering events.
+    /// </summary>
+    public class FormCaptionRendererEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets or sets the reference to graphics object.
+        /// </summary>
+        public Graphics Graphics = null;
+        /// <summary>
+        /// Gets or sets the caption bounds.
+        /// </summary>
+        public Rectangle Bounds = Rectangle.Empty;
+        /// <summary>
+        /// Gets or sets the form caption is rendered for.
+        /// </summary>
+        public Form Form = null;
+
+        /// <summary>
+        /// Creates new instance of the class.
+        /// </summary>
+        public FormCaptionRendererEventArgs(Graphics g, Rectangle bounds, Form form)
+        {
+            this.Graphics = g;
+            this.Bounds = bounds;
+            this.Form = form;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Office2007Form/Office2007FormCaptionPainter.cs b/PROMS/DotNetBar Source Code/Office2007Form/Office2007FormCaptionPainter.cs
new file mode 100644
index 00000000..70733b94
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Office2007Form/Office2007FormCaptionPainter.cs	
@@ -0,0 +1,65 @@
+using System;
+using System.Text;
+using DevComponents.DotNetBar.Rendering;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Defines the Office 2007 style form caption painter.
+    /// </summary>
+    internal class Office2007FormCaptionPainter : FormCaptionPainter, IOffice2007Painter
+    {
+        #region IOffice2007Painter
+        private Office2007ColorTable m_ColorTable = null; //new Office2007ColorTable();
+
+        /// <summary>
+        /// Gets or sets color table used by renderer.
+        /// </summary>
+        public Office2007ColorTable ColorTable
+        {
+            get { return m_ColorTable; }
+            set { m_ColorTable = value; }
+        }
+        #endregion
+
+        #region Internal Implementation
+        public override void PaintCaptionBackground(FormCaptionRendererEventArgs e)
+        {
+            Graphics g = e.Graphics;
+            Rendering.Office2007FormStateColorTable formct = m_ColorTable.Form.Active;
+            System.Windows.Forms.Form form = e.Form;
+            bool drawBottomBorder = false;
+            if (form != null && form is RibbonForm)
+            {
+                if(!((RibbonForm)form).NonClientActive)
+                    formct = m_ColorTable.Form.Inactive;
+            }
+            else if (form != null && (form != System.Windows.Forms.Form.ActiveForm && form.MdiParent == null ||
+                form.MdiParent != null && form.MdiParent.ActiveMdiChild != form))
+                formct = m_ColorTable.Form.Inactive;
+            if (form is OfficeForm) drawBottomBorder = true;
+
+            Rectangle captionRect = e.Bounds;
+
+            SmoothingMode sm = g.SmoothingMode;
+            g.SmoothingMode = SmoothingMode.Default;
+            // Top Part
+            Rectangle topCaptionPart = new Rectangle(captionRect.X, captionRect.Y, captionRect.Width, (int)(captionRect.Height * .3));
+            DisplayHelp.FillRectangle(g, topCaptionPart, formct.CaptionTopBackground);
+            Rectangle bottomCaptionPart = new Rectangle(captionRect.X, topCaptionPart.Bottom, captionRect.Width, captionRect.Height - topCaptionPart.Height);
+            DisplayHelp.FillRectangle(g, bottomCaptionPart, formct.CaptionBottomBackground);
+            if (drawBottomBorder && formct.CaptionBottomBorder != null && formct.CaptionBottomBorder.Length > 0)
+            {
+                int lines = formct.CaptionBottomBorder.Length;
+                for (int i = 0; i < lines; i++)
+                {
+                    DisplayHelp.DrawLine(g, captionRect.X, captionRect.Bottom - lines + i, captionRect.Right, captionRect.Bottom - lines + i, formct.CaptionBottomBorder[i], 1);
+                }
+            }
+            g.SmoothingMode = sm;
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Office2007Form/Office2007SystemCaptionItemPainter.cs b/PROMS/DotNetBar Source Code/Office2007Form/Office2007SystemCaptionItemPainter.cs
new file mode 100644
index 00000000..79ed7f6a
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Office2007Form/Office2007SystemCaptionItemPainter.cs	
@@ -0,0 +1,521 @@
+using System;
+using System.Text;
+using DevComponents.DotNetBar.Rendering;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Drawing.Text;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represents the painter for the Office 2007 SystemCaptionItem
+    /// </summary>
+    internal class Office2007SystemCaptionItemPainter : SystemCaptionItemPainter, IOffice2007Painter
+    {
+        #region IOffice2007Painter
+        private Office2007ColorTable m_ColorTable = null; //new Office2007ColorTable();
+
+        /// <summary>
+        /// Gets or sets color table used by renderer.
+        /// </summary>
+        public Office2007ColorTable ColorTable
+        {
+            get { return m_ColorTable; }
+            set { m_ColorTable = value; }
+        }
+        #endregion
+
+        #region Internal Implementation
+        /// <summary>
+        /// Paints the SystemCaptionItem as icon in left hand corner.
+        /// </summary>
+        /// <param name="e"></param>
+        public override void PaintSystemIcon(SystemCaptionItemRendererEventArgs e, bool isEnabled)
+        {
+            System.Drawing.Graphics g = e.Graphics;
+            SystemCaptionItem item = e.SystemCaptionItem;
+
+            Rectangle r = item.DisplayRectangle;
+            r.Offset((r.Width - Dpi.Width16) / 2, (r.Height - Dpi.Height16) / 2);
+            if (item.Icon != null)
+            {
+                if (System.Environment.Version.Build <= 3705 && System.Environment.Version.Revision == 288 && System.Environment.Version.Major == 1 && System.Environment.Version.Minor == 0)
+                {
+                    IntPtr hdc = g.GetHdc();
+                    try
+                    {
+                        NativeFunctions.DrawIconEx(hdc, r.X, r.Y, item.Icon.Handle, r.Width, r.Height, 0, IntPtr.Zero, 3);
+                    }
+                    finally
+                    {
+                        g.ReleaseHdc(hdc);
+                    }
+                }
+                else
+                    g.DrawIcon(item.Icon, r);
+            }
+        }
+
+        /// <summary>
+        /// Paints the SystemCaptionItem as set of buttons minimize, restore/maximize and close.
+        /// </summary>
+        /// <param name="e"></param>
+        public override void PaintFormButtons(SystemCaptionItemRendererEventArgs e)
+        {
+            if (e.GlassEnabled) // When Windows Vista Glass is enabled we let system caption button paint themselves
+                return;
+
+            System.Drawing.Graphics g = e.Graphics;
+            SystemCaptionItem item = e.SystemCaptionItem;
+            Office2007SystemButtonColorTable colorTable = m_ColorTable.SystemButton;
+            Rectangle r = item.DisplayRectangle;
+            Region oldClip = g.Clip;
+            Rectangle rclip = r;
+            rclip.Height++;
+            g.SetClip(rclip);
+
+            Size buttonSize = item.GetButtonSize();
+            if (buttonSize.Height > r.Height)
+                buttonSize = new Size(r.Height, r.Height);
+            bool itemEnabled = item.GetEnabled();
+            // Minimize button
+            Rectangle rb = new Rectangle(r.X, r.Y + (r.Height - buttonSize.Height) / 2, buttonSize.Width, buttonSize.Height);
+            eDotNetBarStyle effectiveStyle = item.EffectiveStyle;
+            if (StyleManager.IsMetro(effectiveStyle) && item.ContainerControl is DevComponents.DotNetBar.Metro.MetroForm)
+            {
+                Form form = (Form)item.ContainerControl;
+                if (form.FormBorderStyle == FormBorderStyle.FixedDialog)
+                    rb.Inflate(0, -2);
+            }
+            Office2007SystemButtonStateColorTable ct = colorTable.Default;
+            LinearGradientColorTable foregroundOverride = null;
+            bool useForegroundOverride = item.ContainerControl is DevComponents.DotNetBar.Metro.MetroTabStrip && StyleManager.Style != eStyle.OfficeMobile2014;
+            if (useForegroundOverride)
+                foregroundOverride = new LinearGradientColorTable(m_ColorTable.Form.TextColor);
+            else
+                foregroundOverride = null;
+
+            if (item.HelpVisible && (!item.IsRightToLeft || item.CloseVisible && item.IsRightToLeft))
+            {
+                Office2007SystemButtonColorTable originalColorTable = colorTable;
+                if (item.CloseEnabled && itemEnabled && item.IsRightToLeft && m_ColorTable.SystemButtonClose != null)
+                    colorTable = m_ColorTable.SystemButtonClose;
+
+                if (item.CloseEnabled && itemEnabled && item.IsRightToLeft || !item.IsRightToLeft)
+                {
+                    if (item.MouseDownButton == SystemButton.Help && !item.IsRightToLeft ||
+                        item.MouseDownButton == SystemButton.Close && item.IsRightToLeft)
+                    {
+                        ct = colorTable.Pressed;
+                        foregroundOverride = null;
+                    }
+                    else if (item.MouseOverButton == SystemButton.Help && !item.IsRightToLeft ||
+                        item.MouseOverButton == SystemButton.Close && item.IsRightToLeft)
+                    {
+                        ct = colorTable.MouseOver;
+                        foregroundOverride = null;
+                    }
+                }
+                PaintBackground(g, rb, ct);
+                if (item.IsRightToLeft)
+                    PaintClose(g, rb, ct, item.CloseEnabled && itemEnabled, foregroundOverride);
+                else
+                    PaintHelp(g, rb, ct, itemEnabled, foregroundOverride);
+
+                rb.Offset(rb.Width + 1, 0);
+                colorTable = originalColorTable;
+            }
+
+            if (item.MinimizeVisible && item.HelpVisible || item.MinimizeVisible && !item.HelpVisible && (!item.IsRightToLeft || item.CloseVisible && item.IsRightToLeft))
+            {
+                ct = colorTable.Default;
+                if (useForegroundOverride)
+                    foregroundOverride = new LinearGradientColorTable(m_ColorTable.Form.TextColor);
+                else
+                    foregroundOverride = null;
+
+                if (item.CloseEnabled && itemEnabled && item.IsRightToLeft || !item.IsRightToLeft)
+                {
+                    if (item.MouseDownButton == SystemButton.Minimize && !item.IsRightToLeft ||
+                        item.MouseDownButton == SystemButton.Close && item.IsRightToLeft)
+                    {
+                        ct = colorTable.Pressed;
+                        foregroundOverride = null;
+                    }
+                    else if (item.MouseOverButton == SystemButton.Minimize && !item.IsRightToLeft ||
+                        item.MouseOverButton == SystemButton.Close && item.IsRightToLeft)
+                    {
+                        ct = colorTable.MouseOver;
+                        foregroundOverride = null;
+                    }
+                }
+                PaintBackground(g, rb, ct);
+                if (item.IsRightToLeft)
+                    PaintClose(g, rb, ct, item.CloseEnabled && itemEnabled, foregroundOverride);
+                else
+                    PaintMinimize(g, rb, ct, itemEnabled, foregroundOverride);
+
+                rb.Offset(rb.Width + 1, 0);
+            }
+
+            if (item.RestoreMaximizeVisible)
+            {
+                if (item.RestoreEnabled && itemEnabled)
+                {
+                    ct = colorTable.Default;
+                    if (useForegroundOverride)
+                        foregroundOverride = new LinearGradientColorTable(m_ColorTable.Form.TextColor);
+                    else
+                        foregroundOverride = null;
+
+                    if (item.MouseDownButton == SystemButton.Restore)
+                    {
+                        ct = colorTable.Pressed;
+                        foregroundOverride = null;
+                    }
+                    else if (item.MouseOverButton == SystemButton.Restore)
+                    {
+                        ct = colorTable.MouseOver;
+                        foregroundOverride = null;
+                    }
+                    PaintBackground(g, rb, ct);
+                    PaintRestore(g, rb, ct, itemEnabled, foregroundOverride);
+                }
+                else
+                {
+                    ct = colorTable.Default;
+                    if (useForegroundOverride)
+                        foregroundOverride = new LinearGradientColorTable(m_ColorTable.Form.TextColor);
+                    else
+                        foregroundOverride = null;
+
+                    if (item.MouseDownButton == SystemButton.Maximize)
+                    {
+                        ct = colorTable.Pressed;
+                        foregroundOverride = null;
+                    }
+                    else if (item.MouseOverButton == SystemButton.Maximize)
+                    {
+                        ct = colorTable.MouseOver;
+                        foregroundOverride = null;
+                    }
+                    PaintBackground(g, rb, ct);
+                    PaintMaximize(g, rb, ct, itemEnabled, foregroundOverride);
+                }
+
+                rb.Offset(rb.Width + 1, 0);
+            }
+
+            if (item.CloseVisible && !item.IsRightToLeft || !item.HelpVisible && item.MinimizeVisible && item.IsRightToLeft || item.HelpVisible && item.IsRightToLeft)
+            {
+                Office2007SystemButtonColorTable originalColorTable = colorTable;
+                if (item.CloseEnabled && itemEnabled && !item.IsRightToLeft && m_ColorTable.SystemButtonClose != null)
+                    colorTable = m_ColorTable.SystemButtonClose;
+
+                ct = colorTable.Default;
+                if (useForegroundOverride)
+                    foregroundOverride = new LinearGradientColorTable(m_ColorTable.Form.TextColor);
+                else
+                    foregroundOverride = null;
+
+                if (item.CloseEnabled && itemEnabled && !item.IsRightToLeft ||
+                    item.IsRightToLeft)
+                {
+                    if (item.MouseDownButton == SystemButton.Close && !item.IsRightToLeft ||
+                        item.MouseDownButton == SystemButton.Minimize && item.IsRightToLeft)
+                    {
+                        ct = colorTable.Pressed;
+                        foregroundOverride = null;
+                    }
+                    else if (item.MouseOverButton == SystemButton.Close && !item.IsRightToLeft ||
+                        item.MouseOverButton == SystemButton.Minimize && item.IsRightToLeft)
+                    {
+                        ct = colorTable.MouseOver;
+                        foregroundOverride = null;
+                    }
+                }
+
+                PaintBackground(g, rb, ct);
+                if (item.IsRightToLeft)
+                {
+                    if (item.HelpVisible)
+                        PaintHelp(g, rb, ct, itemEnabled, foregroundOverride);
+                    else
+                        PaintMinimize(g, rb, ct, itemEnabled, foregroundOverride);
+                }
+                else
+                    PaintClose(g, rb, ct, item.CloseEnabled && itemEnabled, foregroundOverride);
+
+                colorTable = originalColorTable;
+            }
+
+            g.Clip = oldClip;
+            if (oldClip != null) oldClip.Dispose();
+        }
+
+        /// <summary>
+        /// Paints the background of the button using specified color table colors.
+        /// </summary>
+        /// <param name="g">Graphics object.</param>
+        /// <param name="r">Background bounds</param>
+        /// <param name="ct">Color Table</param>
+        protected virtual void PaintBackground(Graphics g, Rectangle r, Office2007SystemButtonStateColorTable ct)
+        {
+            int cornerSize = 2;
+            Rectangle border = r;
+            if (ct.OuterBorder != null && !ct.OuterBorder.IsEmpty)
+                r.Inflate(-1, -1);
+
+            Rectangle rt = new Rectangle(r.X, r.Y, r.Width, r.Height / 2);
+            if (ct.TopBackground != null && !ct.TopBackground.IsEmpty)
+            {
+                rt.Height++;
+                if (ct.BottomBackground == null) rt = r;
+                DisplayHelp.FillRectangle(g, rt, ct.TopBackground);
+                rt.Height--;
+            }
+
+            //Region oldClip = g.Clip;
+
+            if (ct.BottomBackground != null && !ct.BottomBackground.IsEmpty)
+            {
+                rt.Y += rt.Height;
+                rt.Height = (r.Height - rt.Height);
+                DisplayHelp.FillRectangle(g, rt, ct.BottomBackground);
+            }
+
+            // Highlight
+            if (ct.TopHighlight != null && !ct.TopHighlight.IsEmpty)
+            {
+                Rectangle fill = r;
+                fill.Height = fill.Height / 2;
+                DrawHighlight(g, ct.TopHighlight, fill, new PointF(fill.X + fill.Width / 2, fill.Bottom));
+            }
+
+            // Highlight
+            if (ct.BottomHighlight != null && !ct.BottomHighlight.IsEmpty)
+            {
+                Rectangle fill = r;
+                fill.Height = fill.Height / 2;
+                fill.Y += (r.Height - fill.Height);
+                DrawHighlight(g, ct.BottomHighlight, fill, new PointF(fill.X + fill.Width / 2, fill.Bottom));
+            }
+
+            if (ct.OuterBorder != null && !ct.OuterBorder.IsEmpty)
+            {
+                DisplayHelp.DrawRoundGradientRectangle(g, border, ct.OuterBorder, 1, cornerSize);
+                border.Inflate(-1, -1);
+            }
+
+            if (ct.InnerBorder != null && !ct.InnerBorder.IsEmpty)
+            {
+                DisplayHelp.DrawRoundGradientRectangle(g, border, ct.InnerBorder, 1, cornerSize);
+            }
+        }
+
+        private void DrawHighlight(Graphics g, LinearGradientColorTable c, Rectangle r, PointF centerPoint)
+        {
+            Rectangle ellipse = new Rectangle(r.X, r.Y, r.Width, r.Height * 2);
+            GraphicsPath path = new GraphicsPath();
+            path.AddEllipse(ellipse);
+            PathGradientBrush brush = new PathGradientBrush(path);
+            brush.CenterColor = c.Start;
+            brush.SurroundColors = new Color[] { c.End };
+            brush.CenterPoint = centerPoint;
+            Blend blend = new Blend();
+            blend.Factors = new float[] { 0f, .5f, 1f };
+            blend.Positions = new float[] { .0f, .4f, 1f };
+            brush.Blend = blend;
+
+            g.FillRectangle(brush, r);
+            brush.Dispose();
+            path.Dispose();
+        }
+
+        protected virtual void PaintMinimize(Graphics g, Rectangle r, Office2007SystemButtonStateColorTable ct, bool isEnabled, LinearGradientColorTable foregroundOverride)
+        {
+            SmoothingMode sm = g.SmoothingMode;
+            g.SmoothingMode = SmoothingMode.Default;
+
+            Size s = new Size(Dpi.Width7, Dpi.Height3);
+            Rectangle rm = GetSignRect(r, s);
+
+            DisplayHelp.DrawLine(g, rm.X, rm.Y, rm.Right, rm.Y, ct.DarkShade, 1);
+            rm.Offset(0, 1);
+            LinearGradientColorTable foreground = foregroundOverride ?? ct.Foreground;
+            DisplayHelp.DrawLine(g, rm.X, rm.Y, rm.Right, rm.Y, foreground.Start, 1);
+            rm.Offset(0, 1);
+            DisplayHelp.DrawLine(g, rm.X, rm.Y, rm.Right, rm.Y, ct.LightShade, 1);
+
+            g.SmoothingMode = sm;
+        }
+
+        protected virtual Rectangle GetSignRect(Rectangle r, Size s)
+        {
+            if (r.Height < 10)
+                return Rectangle.Empty;
+
+            return new Rectangle(r.X + (r.Width - s.Width) / 2, r.Bottom - r.Height / 4 - s.Height, s.Width, s.Height);
+        }
+
+        protected virtual void PaintRestore(Graphics g, Rectangle r, Office2007SystemButtonStateColorTable ct, bool isEnabled, LinearGradientColorTable foregroundOverride)
+        {
+            SmoothingMode sm = g.SmoothingMode;
+            g.SmoothingMode = SmoothingMode.Default;
+
+            Size s = new Size(Dpi.Width9, Dpi.Height8);
+            Rectangle rm = GetSignRect(r, s);
+
+            Rectangle r1 = new Rectangle(rm.X, rm.Y + Dpi.Height1, Dpi.Width7, Dpi.Height7);
+            Region oldClip = g.Clip;
+            for (int i = 0; i < 2; i++)
+            {
+                LinearGradientColorTable foreground = foregroundOverride ?? ct.Foreground;
+                DisplayHelp.DrawGradientRectangle(g, new Rectangle(r1.X, r1.Y + 1, r1.Width, r1.Height - 1), foreground, 1);
+                DisplayHelp.DrawLine(g, r1.X, r1.Y, r1.Right - 1, r1.Y, ct.DarkShade, 1);
+                DisplayHelp.DrawLine(g, r1.X + 1, r1.Y + 2, r1.Right - 2, r1.Y + 2, ct.LightShade, 1);
+                DisplayHelp.DrawLine(g, r1.X + 1, r1.Y + 2, r1.Right - 2, r1.Y + 2, ct.LightShade, 1);
+                g.SetClip(r1, CombineMode.Exclude);
+                r1.Offset(Dpi.Width2, -Dpi.Height1);
+            }
+
+            if (oldClip != null)
+                g.Clip = oldClip;
+            else
+                g.ResetClip();
+
+            g.SmoothingMode = sm;
+        }
+
+        protected virtual void PaintMaximize(Graphics g, Rectangle r, Office2007SystemButtonStateColorTable ct, bool isEnabled, LinearGradientColorTable foregroundOverride)
+        {
+            SmoothingMode sm = g.SmoothingMode;
+            g.SmoothingMode = SmoothingMode.Default;
+
+            Size s = new Size(Dpi.Width9, Dpi.Height8);
+            Rectangle rm = GetSignRect(r, s);
+
+            Color color = isEnabled ? ct.DarkShade : Color.FromArgb(128, ct.DarkShade);
+            DisplayHelp.DrawLine(g, rm.X, rm.Y, rm.Right - 1, rm.Y, color, 1);
+            rm.Y++;
+            rm.Height--;
+            LinearGradientColorTable foreground = foregroundOverride ?? ct.Foreground;
+            color = isEnabled ? foreground.Start : Color.FromArgb(128, foreground.Start);
+            DisplayHelp.DrawLine(g, rm.X, rm.Y, rm.Right - 1, rm.Y, color, 1);
+            rm.Y++;
+            rm.Height--;
+            Rectangle r1 = rm;
+            r1.Height--;
+            if (isEnabled)
+                DisplayHelp.DrawGradientRectangle(g, r1, foreground, 1);
+            else
+                DisplayHelp.DrawGradientRectangle(g, r1, Color.FromArgb(128, foreground.Start), Color.FromArgb(128, foreground.End), foreground.GradientAngle, 1);
+
+            color = isEnabled ? ct.LightShade : Color.FromArgb(128, ct.LightShade);
+            DisplayHelp.DrawLine(g, rm.X, rm.Bottom - 1, rm.Right - 1, rm.Bottom - 1, color, 1);
+
+            g.SmoothingMode = sm;
+        }
+
+        protected virtual void PaintClose(Graphics g, Rectangle r, Office2007SystemButtonStateColorTable ct, bool isEnabled, LinearGradientColorTable foregroundOverride)
+        {
+            SmoothingMode sm = g.SmoothingMode;
+            g.SmoothingMode = SmoothingMode.Default;
+            Size s = new Size(Dpi.Width11, Dpi.Height9);
+            Rectangle rm = GetSignRect(r, s);
+
+            Rectangle r1 = rm;
+            r1.Inflate(-Dpi.Width1, 0);
+            r1.Height--;
+
+            using (GraphicsPath path = new GraphicsPath())
+            {
+                path.AddLine(r1.X, r1.Y, r1.X + Dpi.Width2, r1.Y);
+                path.AddLine(r1.X + Dpi.Width2, r1.Y, r1.X + Dpi.Width4, r1.Y + Dpi.Width2);
+                path.AddLine(r1.X + Dpi.Width4, r1.Y + Dpi.Width2, r1.X + Dpi.Width6, r1.Y + 0);
+                path.AddLine(r1.X + Dpi.Width6, r1.Y + 0, r1.X + Dpi.Width8, r1.Y + 0);
+                path.AddLine(r1.X + Dpi.Width8, r1.Y + 0, r1.X + Dpi.Width5, r1.Y + Dpi.Height3);
+                path.AddLine(r1.X + Dpi.Width5, r1.Y + Dpi.Height4, r1.X + Dpi.Width8, r1.Y + Dpi.Height7);
+                path.AddLine(r1.X + Dpi.Width8, r1.Y + Dpi.Height7, r1.X + Dpi.Width6, r1.Y + Dpi.Height7);
+                path.AddLine(r1.X + Dpi.Width6, r1.Y + Dpi.Height7, r1.X + Dpi.Width4, r1.Y + Dpi.Height5);
+                path.AddLine(r1.X + Dpi.Width4, r1.Y + Dpi.Height5, r1.X + Dpi.Width2, r1.Y + Dpi.Height7);
+                path.AddLine(r1.X + Dpi.Width2, r1.Y + Dpi.Height7, r1.X + 0, r1.Y + Dpi.Height7);
+                path.AddLine(r1.X + 0, r1.Y + Dpi.Height7, r1.X + Dpi.Width3, r1.Y + Dpi.Height4);
+                path.AddLine(r1.X + Dpi.Width3, r1.Y + Dpi.Height3, r1.X, r1.Y);
+                LinearGradientColorTable foreground = foregroundOverride ?? ct.Foreground;
+                if (isEnabled)
+                {
+                    DisplayHelp.FillPath(g, path, foreground);
+                    DisplayHelp.DrawGradientPathBorder(g, path, foreground, 1);
+                }
+                else
+                {
+                    LinearGradientColorTable lg = new LinearGradientColorTable(foreground.Start.IsEmpty ? foreground.Start : Color.FromArgb(128, foreground.Start),
+                        foreground.End.IsEmpty ? foreground.End : Color.FromArgb(128, foreground.End),
+                        foreground.GradientAngle);
+                    DisplayHelp.FillPath(g, path, lg);
+                    DisplayHelp.DrawGradientPathBorder(g, path, lg, 1);
+                }
+            }
+
+            if (!ct.DarkShade.IsEmpty)
+            {
+                using (Pen pen = new Pen(isEnabled ? ct.DarkShade : Color.FromArgb(128, ct.DarkShade), 1))
+                {
+                    g.DrawLine(pen, r1.X, r1.Y, r1.X + Dpi.Width2, r1.Y);
+                    g.DrawLine(pen, r1.X + Dpi.Width2, r1.Y, r1.X + Dpi.Width4, r1.Y + Dpi.Width2);
+                    g.DrawLine(pen, r1.X + Dpi.Width4, r1.Y + Dpi.Width2, r1.X + Dpi.Width6, r1.Y + 0);
+                    g.DrawLine(pen, r1.X + Dpi.Width6, r1.Y + 0, r1.X + Dpi.Width8, r1.Y + 0);
+                }
+            }
+
+            if (!ct.LightShade.IsEmpty)
+            {
+                using (Pen pen = new Pen(isEnabled ? ct.LightShade : Color.FromArgb(128, ct.LightShade), 1))
+                {
+                    g.DrawLine(pen, rm.X + 0, rm.Y + Dpi.Height8, rm.X + Dpi.Width3, rm.Y + Dpi.Height8);
+                    g.DrawLine(pen, rm.X + Dpi.Width3, rm.Y + Dpi.Height8, rm.X + Dpi.Width5, rm.Y + Dpi.Height6);
+                    g.DrawLine(pen, rm.X + Dpi.Width5, rm.Y + Dpi.Height6, rm.X + Dpi.Width7, rm.Y + Dpi.Height8);
+                    g.DrawLine(pen, rm.X + Dpi.Width7, rm.Y + Dpi.Height8, rm.X + Dpi.Width10, rm.Y + Dpi.Height8);
+                }
+            }
+
+            g.SmoothingMode = sm;
+
+        }
+
+        protected virtual void PaintHelp(Graphics g, Rectangle r, Office2007SystemButtonStateColorTable ct, bool isEnabled, LinearGradientColorTable foregroundOverride)
+        {
+            SmoothingMode sm = g.SmoothingMode;
+            TextRenderingHint th = g.TextRenderingHint;
+            g.SmoothingMode = SmoothingMode.Default;
+            g.TextRenderingHint = TextRenderingHint.ClearTypeGridFit;
+#if FRAMEWORK20
+            using (Font font = new Font(SystemFonts.DefaultFont, FontStyle.Bold))
+#else
+			using(Font font = new Font("Arial", 10, FontStyle.Bold))
+#endif
+            {
+                Size s = TextDrawing.MeasureString(g, "?", font);
+                s.Width += 4;
+                s.Height -= 2;
+                Rectangle rm = GetSignRect(r, s);
+
+                rm.Offset(1, 1);
+                Color color = isEnabled ? ct.LightShade : Color.FromArgb(128, ct.LightShade);
+                using (SolidBrush brush = new SolidBrush(color))
+                    g.DrawString("?", font, brush, rm);
+                rm.Offset(-1, -1);
+                LinearGradientColorTable foreground = foregroundOverride ?? ct.Foreground;
+                color = isEnabled ? foreground.Start : Color.FromArgb(128, foreground.Start);
+                using (SolidBrush brush = new SolidBrush(color))
+                    g.DrawString("?", font, brush, rm);
+
+            }
+            g.SmoothingMode = sm;
+            g.TextRenderingHint = th;
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Office2007Form/OfficeForm.cs b/PROMS/DotNetBar Source Code/Office2007Form/OfficeForm.cs
new file mode 100644
index 00000000..aa05dfc3
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Office2007Form/OfficeForm.cs	
@@ -0,0 +1,1586 @@
+using System;
+using System.Text;
+using System.Drawing;
+using System.Windows.Forms;
+using System.Runtime.InteropServices;
+using DevComponents.DotNetBar.Rendering;
+using System.Drawing.Drawing2D;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represents the form in Office style with custom borders and caption.
+    /// </summary>
+    public class OfficeForm : RibbonForm
+    {
+        #region Private Variables
+        private int m_BorderWidth = 2;
+        private int m_CornerSize = 5;
+        private GenericItemContainer m_Caption = null;
+        private ColorScheme m_ColorScheme = null;
+        private LabelItem m_TitleLabel = null;
+        private SystemCaptionItem m_SystemIcon = null;
+        private SystemCaptionItem m_SystemButtons = null;
+        private Timer m_MouseTimer = null;
+        private Font m_CaptionFont = null;
+        private string m_TitleText = "";
+        #endregion
+
+        #region Constructor
+        public OfficeForm()
+            : base()
+        {
+            // This forces the initialization out of paint loop which speeds up how fast components show up
+            BaseRenderer renderer = Rendering.GlobalManager.Renderer;
+
+            m_BorderWidth = SystemInformation.Border3DSize.Width + NativeFunctions.BorderMultiplierFactor;
+            this.DockPadding.All = 0;
+
+            m_Caption = new GenericItemContainer();
+            m_Caption.GlobalItem = false;
+            m_Caption.ContainerControl = this;
+            m_Caption.WrapItems = false;
+            m_Caption.EventHeight = false;
+            m_Caption.UseMoreItemsButton = false;
+            m_Caption.Stretch = true;
+            m_Caption.Displayed = true;
+            m_Caption.SystemContainer = true;
+            m_Caption.PaddingTop = 0;
+            m_Caption.PaddingBottom = 0;
+            m_Caption.PaddingLeft = 2;
+            m_Caption.ItemSpacing = 1;
+            m_Caption.SetOwner(this);
+            m_Caption.Style = eDotNetBarStyle.StyleManagerControlled;
+            m_Caption.ToolbarItemsAlign = eContainerVerticalAlignment.Top;
+
+            m_SystemIcon = new SystemCaptionItem();
+            m_SystemIcon.GlobalItem = false;
+            m_SystemIcon.Enabled = false;
+            m_Caption.SubItems.Add(m_SystemIcon);
+            m_SystemIcon.IsSystemIcon = true;
+            m_SystemIcon.Icon = this.Icon;
+
+            m_TitleLabel = CreateTitleLabel();
+            m_Caption.SubItems.Add(m_TitleLabel);
+            
+            CreateAdditionalCaptionItems(m_Caption);
+
+            m_SystemButtons = new SystemCaptionItem();
+            m_SystemButtons.GlobalItem = false;
+            //m_SystemButtons.ItemAlignment = eItemAlignment.Far;
+            m_SystemButtons.Click += new EventHandler(SystemButtons_Click);
+            m_SystemButtons.MouseEnter += new EventHandler(SystemButtons_MouseEnter);
+            m_Caption.SubItems.Add(m_SystemButtons);
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                CleanupMdiClientHandler();
+                StopCaptionNCMouseTimer();
+                m_SystemButtons.Click -= new EventHandler(SystemButtons_Click);
+                m_SystemButtons.MouseEnter -= new EventHandler(SystemButtons_MouseEnter);
+                m_TitleLabel.MarkupLinkClick -= TitleLabelMarkupLinkClick;
+                m_Caption.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        protected virtual void CreateAdditionalCaptionItems(GenericItemContainer captionContainer)
+        {
+        }
+
+        protected virtual LabelItem CreateTitleLabel()
+        {
+            LabelItem label = new LabelItem();
+            label.GlobalItem = false;
+            label.Font = SystemFonts.CaptionFont;
+            label.Stretch = true;
+            label.TextLineAlignment = StringAlignment.Center;
+            label.Text = this.Text;
+            label.PaddingLeft = 3;
+            label.PaddingRight = 3;
+            label.MarkupLinkClick += TitleLabelMarkupLinkClick;
+            return label;
+        }
+        private void TitleLabelMarkupLinkClick(object sender, MarkupLinkClickEventArgs e)
+        {
+            OnTitleTextMarkupLinkClick(e);
+        }
+
+        /// <summary>
+        /// Called by StyleManager to notify control that style on manager has changed and that control should refresh its appearance if
+        /// its style is controlled by StyleManager.
+        /// </summary>
+        /// <param name="newStyle">New active style.</param>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override void StyleManagerStyleChanged(eDotNetBarStyle newStyle)
+        {
+            base.StyleManagerStyleChanged(newStyle);
+            this.RecalcSize();
+            InvalidateNonClient(true);
+        }
+        #endregion
+
+        #region Internal Implementation
+        protected override bool SetClientSizeCoreCustom(int x, int y)
+        {
+            TrackSetBoundsCore = true;
+            AdjustBounds(ref x, ref y);
+            return true; // Make sure base call is made
+        }
+        /// <summary>
+        /// Gets or sets the rich text displayed in form caption instead of the Form.Text property. This property supports text-markup.
+        /// You can use <font color="SysCaptionTextExtra"> markup to instruct the markup renderer to use Office 2007 system caption extra text color which
+        /// changes depending on the currently selected color table. Note that when using this property you should manage also the Form.Text property since
+        /// that is the text that will be displayed in Windows task-bar and elsewhere where system Form.Text property is used.
+        /// You can also use the hyperlinks as part of the text markup and handle the TitleTextMarkupLinkClick event to be notified when they are clicked.
+        /// Setting this property to an empty string (default value) indicates that Form.Text property will be used for form caption.
+        /// </summary>
+        [Browsable(true), DefaultValue(""), Editor("DevComponents.DotNetBar.Design.TextMarkupUIEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), EditorBrowsable(EditorBrowsableState.Always), Category("Appearance"), Description("Indicates text displayed in form caption instead of the Form.Text property.")]
+        public string TitleText
+        {
+            get { return m_TitleText; }
+            set 
+            {
+                if (value == null) value = "";
+                
+                m_TitleText = value;
+                if (value == "")
+                    m_TitleLabel.Text = this.Text;
+                else
+                    m_TitleLabel.Text = value;
+                if (this.IsHandleCreated) this.RecalcSize();
+                this.InvalidateNonClient(false);
+            }
+        }
+        /// <summary>
+        /// Occurs when text-markup link in TitleText is clicked.
+        /// </summary>
+        public event MarkupLinkClickEventHandler TitleTextMarkupLinkClick;
+        /// <summary>
+        /// Raises TitleTextMarkupLinkClick event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnTitleTextMarkupLinkClick(MarkupLinkClickEventArgs e)
+        {
+            MarkupLinkClickEventHandler handler = TitleTextMarkupLinkClick;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        /// <summary>
+        /// Gets whether custom form styling is enabled.
+        /// </summary>
+        /// <returns>true if custom styling is enabled otherwise false.</returns>
+        protected override bool IsCustomFormStyleEnabled()
+        {
+            return base.IsCustomFormStyleEnabled() && (!(WinApi.IsGlassEnabled && EnableGlass && !DesignMode) || this.IsMdiChild);
+        }
+        private bool _WasMdiChild = false, _UpdateFromGlassStateOnHandleCreated = false;
+        protected override void OnParentChanged(EventArgs e)
+        {
+            if (this.EnableGlass && WinApi.IsGlassEnabled)
+            {
+                if (this.IsHandleCreated)
+                    UpdateFormGlassState();
+                else if (_WasMdiChild)
+                    _UpdateFromGlassStateOnHandleCreated = true;
+                    
+            }
+            _WasMdiChild = IsMdiChild;
+        }
+
+        /// <summary>
+        /// Gets or sets the font for the form caption text when CaptionVisible=true. Default value is NULL which means that system font is used.
+        /// </summary>
+        [Browsable(true), DefaultValue(null), Category("Caption"), Description("Indicates font for the form caption text when CaptionVisible=true.")]
+        public Font CaptionFont
+        {
+            get { return m_CaptionFont; }
+            set
+            {
+                m_CaptionFont = value;
+                OnCaptionFontChanged();
+            }
+        }
+
+        private void OnCaptionFontChanged()
+        {
+            if (m_TitleLabel != null)
+            {
+                if (m_CaptionFont != null)
+                    m_TitleLabel.Font = m_CaptionFont;
+                else
+                {
+#if FRAMEWORK20
+                    m_TitleLabel.Font = SystemFonts.CaptionFont;
+#else
+                    m_TitleLabel.Font = SystemInformation.MenuFont;
+#endif
+                }
+                this.Invalidate(m_Caption.DisplayRectangle);
+            }
+            InvalidateNonClient(false);
+        }
+
+        protected override void OnFontChanged(EventArgs e)
+        {
+            base.OnFontChanged(e);
+            InvalidateNonClient(false);
+        }
+
+        protected override bool WindowsMessageSetIcon(ref Message m)
+        {
+            UpdateSystemButton();
+            return base.WindowsMessageSetIcon(ref m);
+        }
+        #endregion
+
+        #region Non-client area handling
+        /// <summary>
+        /// Invalidates non client area of the form.
+        /// </summary>
+        /// <param name="invalidateForm">Indicates whether complete form is invalidated.</param>
+        public void InvalidateNonClient(bool invalidateForm)
+        {
+            if (!BarFunctions.IsHandleValid(this)) return;
+            const int RDW_INVALIDATE = 0x0001;
+            const int RDW_FRAME = 0x0400;
+            NativeFunctions.RECT r = new NativeFunctions.RECT(0, 0, this.Width, m_Caption.HeightInternal);
+            if(invalidateForm)
+                r = new NativeFunctions.RECT(0, 0, this.Width, this.Height);
+            NativeFunctions.RedrawWindow(this.Handle, ref r, IntPtr.Zero, RDW_INVALIDATE | RDW_FRAME);
+        }
+
+        protected override Rectangle ReduceDisplayRectangle(Rectangle r)
+        {
+            return r;
+        }
+        protected override void AdjustBounds(ref int width, ref int height, BoundsSpecified specified)
+        {
+            return;
+            //if(System.Environment.OSVersion.Version.Major == 6 && !IsCustomFormStyleEnabled())
+            //    return;
+
+            //WinApi.RECT rect = new WinApi.RECT(0, 0, width, height);
+            //CreateParams params1 = this.CreateParams;
+            //WinApi.AdjustWindowRectEx(ref rect, params1.Style, false, params1.ExStyle);
+
+            //if ((specified & BoundsSpecified.Height) == BoundsSpecified.Height)
+            //{
+            //    if (System.Environment.OSVersion.Version.Major == 6 && this.FormBorderStyle != FormBorderStyle.Sizable && !this.DesignMode)
+            //        height -= (rect.Height - height - m_BorderWidth * 2 - (SystemInformation.CaptionHeight + 9));
+            //    else if (!this.ControlBox && this.FormBorderStyle == FormBorderStyle.FixedDialog && !this.DesignMode)
+            //        height -= (rect.Height - height - m_BorderWidth * 2 - 1);
+            //    else if (!this.ControlBox && this.FormBorderStyle == FormBorderStyle.Fixed3D && !this.DesignMode)
+            //        height -= (rect.Height - height - m_BorderWidth * 2) + 2;
+            //    else if (!this.ControlBox && this.FormBorderStyle == FormBorderStyle.FixedSingle && !this.DesignMode)
+            //        height -= (rect.Height - height - m_BorderWidth * 2) + 2;
+            //    else
+            //        height -= (rect.Height - height - m_BorderWidth * 2 - (SystemInformation.CaptionHeight + 1) /*- (System.Environment.OSVersion.Version.Major == 6 ? SystemInformation.Border3DSize.Height : 0)*/);
+            //}
+
+            //if ((specified & BoundsSpecified.Width) == BoundsSpecified.Width)
+            //{
+            //    if (System.Environment.OSVersion.Version.Major == 6 && FormBorderStyle != FormBorderStyle.Sizable && !this.DesignMode)
+            //        width -= (rect.Width - width - m_BorderWidth * 2 - 9);
+            //    else if (!this.ControlBox && this.FormBorderStyle == FormBorderStyle.FixedDialog && !this.DesignMode)
+            //        width -= (rect.Width - width - m_BorderWidth * 2 - 2) ;
+            //    else if (!this.ControlBox && this.FormBorderStyle == FormBorderStyle.Fixed3D && !this.DesignMode)
+            //        width -= (rect.Width - width - m_BorderWidth * 2)+2;
+            //    else if (!this.ControlBox && this.FormBorderStyle == FormBorderStyle.FixedSingle && !this.DesignMode)
+            //        width -= (rect.Width - width - m_BorderWidth * 2) + 2;
+            //    else
+            //        width -= (rect.Width - width - m_BorderWidth * 2 /*- (System.Environment.OSVersion.Version.Major == 6 ? SystemInformation.Border3DSize.Width * 2 : 0)*/);
+            //}
+        }
+
+        /// <summary>
+        /// Gets whether Vista glass effect extension over the ribbon control caption is enabled.
+        /// </summary>
+        protected override bool EnableGlassExtend
+        {
+            get
+            {
+                return false;
+            }
+        }
+
+        protected override bool WindowsMessageDwmCompositionChanged(ref Message m)
+        {
+            bool ret = base.WindowsMessageDwmCompositionChanged(ref m);
+            UpdateFormControlStyle();
+            return ret;
+        }
+
+        protected override bool WindowsMessageNCCalcSize(ref Message m)
+        {
+            if (m_SystemButtons != null)
+                m_SystemButtons.ToolWindowButtons =
+                    (this.FormBorderStyle == System.Windows.Forms.FormBorderStyle.FixedToolWindow ||
+                     this.FormBorderStyle == System.Windows.Forms.FormBorderStyle.SizableToolWindow);
+            return true; // There should be no need to do custom sizing since in designer any changes to non-client area size result in form size change
+            // Default implementation of ribbon form does not have non-client area at all...
+            //if (m.WParam == IntPtr.Zero)
+            //{
+            //    WinApi.RECT r = (WinApi.RECT)Marshal.PtrToStructure(m.LParam, typeof(WinApi.RECT));
+
+            //    WinApi.RECT newClientRect = WinApi.RECT.FromRectangle(GetClientRectangle(r.ToRectangle()));
+
+            //    Marshal.StructureToPtr(newClientRect, m.LParam, false);
+            //    m.Result = IntPtr.Zero;
+            //}
+            //else
+            //{
+            //    WinApi.NCCALCSIZE_PARAMS csp;
+            //    csp = (WinApi.NCCALCSIZE_PARAMS)Marshal.PtrToStructure(m.LParam, typeof(WinApi.NCCALCSIZE_PARAMS));
+
+            //    WinApi.WINDOWPOS pos = (WinApi.WINDOWPOS)Marshal.PtrToStructure(csp.lppos, typeof(WinApi.WINDOWPOS));
+
+            //    WinApi.RECT newClientRect = WinApi.RECT.FromRectangle(GetClientRectangle(new Rectangle(pos.x, pos.y, pos.cx, pos.cy)));
+            //    csp.rgrc0 = newClientRect;
+            //    csp.rgrc1 = newClientRect;
+            //    Marshal.StructureToPtr(csp, m.LParam, false);
+            //    m.Result = new IntPtr((int)WinApi.WindowsMessages.WVR_VALIDRECTS);
+            //}
+
+            //return false;
+        }
+
+        /// <summary>
+        /// Called when WM_NCACTIVATE message is received.
+        /// </summary>
+        /// <param name="m">Reference to message data.</param>
+        /// <returns>Return true to call base form implementation otherwise return false.</returns>
+        protected override bool WindowsMessageNCActivate(ref Message m)
+        {
+            if (m.WParam != IntPtr.Zero)
+                this.NonClientActive = true;
+            else
+            {
+                this.NonClientActive = false;
+                _LastNCMouseMove = DateTime.MinValue;
+            }
+            CreateCashedCaptionBitmap();
+            BaseWndProc(ref m);
+            DrawCashedCaptionBitmap();
+            //m.Result = new IntPtr(1);
+            //bool ret = base.WindowsMessageNCActivate(ref m);
+            if (NonClientPaintEnabled)
+            {
+                PaintNonClientAreaBuffered();
+                Redraw();
+            }
+            //if (this.IsMdiContainer)
+            //{
+            //    this.Invalidate(new Rectangle(0, 0, this.Width, 32), true);
+            //}
+            //else
+            //{
+            //    this.Invalidate(new Rectangle(0, 0, this.Width, 2), true);
+            //}
+            //this.Update();
+            return false;
+        }
+
+        #region Cashed Drawing of caption
+        private BufferedBitmap m_CashedCaptionBitmap = null;
+        private Point m_CashedCaptionBitmapLocation = Point.Empty;
+        private void CreateCashedCaptionBitmap()
+        {
+            if (m_CashedCaptionBitmap != null)
+            {
+                m_CashedCaptionBitmap.Dispose();
+                m_CashedCaptionBitmap = null;
+            }
+            if (m_Caption.DisplayRectangle.Width <= 0 || m_Caption.DisplayRectangle.Height <= 0 || !this.IsHandleCreated || this.IsDisposed)
+                return;
+
+            IntPtr dc = WinApi.GetWindowDC(this.Handle);
+            try
+            {
+                m_CashedCaptionBitmap = new BufferedBitmap(dc, new Rectangle(m_CashedCaptionBitmapLocation.X, m_CashedCaptionBitmapLocation.Y,
+                    m_Caption.DisplayRectangle.Width, m_Caption.DisplayRectangle.Height));
+            }
+            finally
+            {
+                WinApi.ReleaseDC(this.Handle, dc);
+            }
+
+            PaintFormCaptionTo(m_CashedCaptionBitmap.Graphics);
+        }
+        private void DrawCashedCaptionBitmap()
+        {
+            if (m_CashedCaptionBitmap == null)
+                return;
+            IntPtr dc = WinApi.GetWindowDC(this.Handle);
+            using (Graphics g = Graphics.FromHdc(dc))
+            {
+                m_CashedCaptionBitmap.Render(g);
+            }
+            WinApi.ReleaseDC(this.Handle, dc);
+            
+            m_CashedCaptionBitmap.Dispose();
+            m_CashedCaptionBitmap = null;
+        }
+        #endregion
+
+        protected override Rectangle GetClientRectangle(Rectangle rect)
+        {
+            NonClientInfo nci = GetNonClientInfo();
+            if (this.WindowState == FormWindowState.Minimized && this.IsMdiChild)
+            {
+                return new Rectangle(rect.X + nci.LeftBorder, rect.Y + nci.CaptionTotalHeight, rect.Width - (nci.LeftBorder + nci.RightBorder), 0);
+            }
+            return new Rectangle(rect.X + nci.LeftBorder, rect.Y + nci.CaptionTotalHeight, 
+                rect.Width - (nci.LeftBorder + nci.RightBorder), rect.Height - (nci.CaptionTotalHeight + nci.BottomBorder));
+
+            //WinApi.RECT r = new WinApi.RECT(0, 0, rect.Width, rect.Height);
+            //CreateParams params1 = this.CreateParams;
+            //WinApi.AdjustWindowRectEx(ref r, params1.Style, false, params1.ExStyle);
+
+            //return new Rectangle(Math.Abs(r.Left), Math.Abs(r.Top), rect.Width - (r.Width - rect.Width), rect.Height - (r.Height - rect.Height));
+
+            
+            //if (this.WindowState == FormWindowState.Maximized && this.IsMdiChild && System.Environment.OSVersion.Version.Major == 6)
+            //{
+            //    rect.Inflate(-(m_BorderWidth + SystemInformation.Border3DSize.Width + 3), -(m_BorderWidth + SystemInformation.Border3DSize.Height + 2));
+            //    rect.Y += SystemInformation.CaptionHeight + 1;
+            //    rect.Height -= SystemInformation.CaptionHeight + 1;
+            //}
+            //else
+            //{
+            //    rect.Inflate(-m_BorderWidth, -m_BorderWidth);
+            //    rect.Y += SystemInformation.CaptionHeight + 1;
+            //    rect.Height -= SystemInformation.CaptionHeight + 1;
+            //}
+            //return rect;
+        }
+        protected virtual bool UseCornerSize
+        {
+            get
+            {
+                return true;
+            }
+        }
+        /// <summary>
+        /// Gets the form path for the give input bounds.
+        /// </summary>
+        /// <param name="bounds">Represents the form bounds.</param>
+        /// <returns></returns>
+        protected override GraphicsPath GetFormPath(Rectangle bounds)
+        {
+            GraphicsPath path = new GraphicsPath();
+            Rectangle r = bounds;
+
+            if (!UseCornerSize || this.TopLeftCornerSize == 0 && TopRightCornerSize == 0)
+            {
+                path.AddRectangle(r);
+                return path;
+            }
+            ArcData arc = ElementStyleDisplay.GetCornerArc(r, m_CornerSize, eCornerArc.TopLeft);
+            path.AddArc(arc.X, arc.Y, arc.Width, arc.Height, arc.StartAngle, arc.SweepAngle);
+
+            arc = ElementStyleDisplay.GetCornerArc(r, m_CornerSize, eCornerArc.TopRight);
+            path.AddArc(arc.X, arc.Y, arc.Width, arc.Height, arc.StartAngle, arc.SweepAngle);
+
+            path.AddLine(r.Right, r.Bottom - 3, r.Right, r.Bottom);
+            path.AddLine(r.Right, r.Bottom, r.Right-3, r.Bottom);
+
+            path.AddLine(r.X + 3, r.Bottom, r.X, r.Bottom);
+            path.AddLine(r.X, r.Bottom, r.X, r.Bottom - 3);
+            
+            path.CloseAllFigures();
+
+            return path;
+        }
+
+        private Point GetMousePosition()
+        {
+            if (this.IsDisposed)
+                return Point.Empty;
+            Point p = this.PointToClient(Control.MousePosition);
+            if (WindowState != FormWindowState.Minimized)
+            {
+                p.X += m_Caption.PaddingLeft; //m_BorderWidth;
+                p.Y += m_Caption.HeightInternal;
+            }
+
+            return p;
+        }
+
+        private Timer _CaptionNCMouseTimer = null;
+        private bool CaptionNCMouseInside
+        {
+            get
+            {
+                return _CaptionNCMouseInside;
+            }
+            set
+            {
+                if (_CaptionNCMouseInside != value)
+                {
+                    _CaptionNCMouseInside = value;
+                    if (!_CaptionNCMouseInside)
+                    {
+                        StopCaptionNCMouseTimer();
+                        m_Caption.InternalMouseLeave();
+                    }
+                    else
+                        StartCaptionNCMouseTimer();
+                }
+            }
+        }
+        private void StartCaptionNCMouseTimer()
+        {
+            if (_CaptionNCMouseTimer != null) return;
+            _CaptionNCMouseTimer = new Timer();
+            _CaptionNCMouseTimer.Interval = 300;
+            _CaptionNCMouseTimer.Tick += new EventHandler(NCMouseTimerTick);
+            _CaptionNCMouseTimer.Start();
+        }
+        private void NCMouseTimerTick(object sender, EventArgs e)
+        {
+            Point p = GetMousePosition();
+            if (!m_Caption.Bounds.Contains(p))
+            {
+                CaptionNCMouseInside = false;
+            }
+        }
+        private void StopCaptionNCMouseTimer()
+        {
+            Timer timer = _CaptionNCMouseTimer;
+            _CaptionNCMouseTimer = null;
+            if (timer == null) return;
+            timer.Stop();
+            timer.Tick -= NCMouseTimerTick;
+            timer.Dispose();
+        }
+
+        private DateTime _LastNCMouseMove = DateTime.MinValue;
+        private bool _CaptionNCMouseInside = false;
+        protected override bool WindowsMessageNCMouseMove(ref Message m)
+        {
+            Point p = GetMousePosition();
+            
+            m_Caption.InternalMouseMove(new MouseEventArgs(Control.MouseButtons, 0, p.X, p.Y, 0));
+            CaptionNCMouseInside = true;
+            if (m_SystemIcon.Tooltip != "" && m_Caption.HotSubItem == m_SystemIcon)
+            {
+                SetupHoverTimer();
+            }
+            
+            if (Control.MouseButtons == MouseButtons.Left)
+            {
+                BaseItem item = m_Caption.ItemAtLocation(p.X, p.Y);
+                if (item == m_TitleLabel && m_Caption.ItemAtLocation(_NcMouseDownPoint.X, _NcMouseDownPoint.Y)==item)
+                {
+                    if (this.WindowState == FormWindowState.Normal || this.WindowState == FormWindowState.Minimized && this.IsMdiChild)
+                    {
+                        const int HTCAPTION = 2;
+                        byte[] bx = BitConverter.GetBytes(p.X);
+                        byte[] by = BitConverter.GetBytes(p.Y);
+                        byte[] blp = new byte[] { bx[0], bx[1], by[0], by[1] };
+                        int lParam = BitConverter.ToInt32(blp, 0);
+                        this.Capture = false;
+                        PopupManager.CloseAllPopups();
+                        NativeFunctions.SendMessage(this.Handle, NativeFunctions.WM_SYSCOMMAND, NativeFunctions.SC_MOVE + HTCAPTION, lParam);
+                        return false;
+                    }
+                    else if (this.WindowState == FormWindowState.Maximized && BarFunctions.IsWindows7 && _IsActive)
+                    {
+                        if (_LastNCMouseMove != DateTime.MinValue)
+                        {
+                            if (DateTime.Now.Subtract(_LastNCMouseMove).TotalSeconds > 0)
+                            {
+                                this.WindowState = FormWindowState.Normal;
+                                _LastNCMouseMove = DateTime.MinValue;
+                            }
+                        }
+                        else
+                            _LastNCMouseMove = DateTime.Now;
+                    }
+                }
+            }
+
+            return true;
+        }
+
+        private bool _IsActive = false;
+        protected override void OnActivated(EventArgs e)
+        {
+            _IsActive = true;
+            base.OnActivated(e);
+        }
+
+        protected override bool WindowsMessageNCMouseLeave(ref Message m)
+        {
+            StopHoverTimer();
+            m_Caption.InternalMouseLeave();
+            CaptionNCMouseInside = false;
+            return true;
+        }
+
+        private Timer m_HoverTimer = null;
+        private void SetupHoverTimer()
+        {
+            if (m_HoverTimer != null)
+            {
+                m_HoverTimer.Stop();
+                m_HoverTimer.Start();
+                return;
+            }
+            m_HoverTimer = new Timer();
+#if FRAMEWORK20
+            m_HoverTimer.Interval = Math.Max(500, SystemInformation.MouseHoverTime);
+#else
+			m_HoverTimer.Interval = 600;
+#endif
+            m_HoverTimer.Tick += new EventHandler(HoverTimer_Tick);
+            m_HoverTimer.Start();
+        }
+
+        private void HoverTimer_Tick(object sender, EventArgs e)
+        {
+            m_HoverTimer.Stop();
+            if (m_SystemIcon != null && m_SystemIcon.Tooltip != "" && m_Caption != null && m_Caption.HotSubItem == m_SystemIcon)
+            {
+                m_Caption.InternalMouseHover();
+            }
+            StopHoverTimer();
+        }
+
+        private void StopHoverTimer()
+        {
+            Timer t = m_HoverTimer;
+            if (m_HoverTimer != null)
+            {
+                m_HoverTimer = null;
+                t.Stop();
+                t.Tick -= new EventHandler(HoverTimer_Tick);
+            }
+        }
+
+        protected override bool WindowsMessageNCHitTest(ref Message m)
+        {
+            // Get position being tested...
+            int x = WinApi.LOWORD(m.LParam);
+            int y = WinApi.HIWORD(m.LParam);
+
+            Point p = PointToClient(new Point(x, y));
+            if (this.WindowState != FormWindowState.Minimized)
+            {
+                p.X += m_BorderWidth;
+                p.Y += m_BorderWidth + SystemInformation.CaptionHeight;
+            }
+
+            int borderSize = m_BorderWidth;
+            int cornerPadding = 2;
+
+            if (IsSizable)
+            {
+                #if FRAMEWORK20
+                if (this.RightToLeftLayout && this.RightToLeft == RightToLeft.Yes)
+                #else
+				if (this.RightToLeft == RightToLeft.Yes)
+                #endif
+                {
+                    // Top-left corner
+                    Rectangle r = new Rectangle(this.Width - (m_CornerSize + cornerPadding), 0, (m_CornerSize + cornerPadding), (m_CornerSize + cornerPadding));
+                    if (r.Contains(p))
+                    {
+                        m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.TopLeftSizeableCorner);
+                        return false;
+                    }
+                    // Top Right
+                    r = new Rectangle(0, 0, (m_CornerSize + cornerPadding), (m_CornerSize + cornerPadding));
+                    if (r.Contains(p))
+                    {
+                        m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.TopRightSizeableCorner);
+                        return false;
+                    }
+                    // Bottom Left
+                    r = new Rectangle(this.Width - (m_CornerSize + cornerPadding), this.Height - (m_CornerSize + cornerPadding), (m_CornerSize + cornerPadding), (m_CornerSize + cornerPadding));
+                    if (r.Contains(p))
+                    {
+                        m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.BottomLeftSizeableCorner);
+                        return false;
+                    }
+                    // Bottom Right
+                    r = new Rectangle(0, this.Height - (m_CornerSize + cornerPadding), (m_CornerSize + cornerPadding), (m_CornerSize + cornerPadding));
+                    if (r.Contains(p))
+                    {
+                        m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.BottomRightSizeableCorner);
+                        return false;
+                    }
+
+                    // Left border
+                    r = new Rectangle(this.Width - borderSize, 0, borderSize, this.Height);
+                    if (r.Contains(p))
+                    {
+                        m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.LeftSizeableBorder);
+                        return false;
+                    }
+                    // Right border
+                    r = new Rectangle(0, 0, borderSize, this.Height);
+                    if (r.Contains(p))
+                    {
+                        m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.RightSizeableBorder);
+                        return false;
+                    }
+                }
+                else
+                {
+                    // Top-left corner
+                    Rectangle r = new Rectangle(0, 0, m_CornerSize + cornerPadding, m_CornerSize + cornerPadding);
+                    if (r.Contains(p))
+                    {
+                        m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.TopLeftSizeableCorner);
+                        return false;
+                    }
+                    // Top Right
+                    r = new Rectangle(this.Width - (m_CornerSize + cornerPadding), 0, m_CornerSize + cornerPadding, m_CornerSize + cornerPadding);
+                    if (r.Contains(p))
+                    {
+                        m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.TopRightSizeableCorner);
+                        return false;
+                    }
+                    // Bottom Left
+                    r = new Rectangle(0, this.Height - m_CornerSize, m_CornerSize + cornerPadding, m_CornerSize + cornerPadding);
+                    if (r.Contains(p))
+                    {
+                        m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.BottomLeftSizeableCorner);
+                        return false;
+                    }
+                    // Bottom Right
+                    r = new Rectangle(this.Width - m_CornerSize, this.Height - m_CornerSize, m_CornerSize + cornerPadding, m_CornerSize + cornerPadding);
+                    if (r.Contains(p))
+                    {
+                        m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.BottomRightSizeableCorner);
+                        return false;
+                    }
+
+                    // Top border
+                    r = new Rectangle(0, 0, this.Width, borderSize);
+                    if (r.Contains(p))
+                    {
+                        m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.TopSizeableBorder);
+                        return false;
+                    }
+                    // Bottom border
+                    r = new Rectangle(0, this.Height - borderSize, this.Width, borderSize);
+                    if (r.Contains(p))
+                    {
+                        m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.BottomSizeableBorder);
+                        return false;
+                    }
+                    // Left border
+                    r = new Rectangle(0, 0, borderSize, this.Height);
+                    if (r.Contains(p))
+                    {
+                        m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.LeftSizeableBorder);
+                        return false;
+                    }
+                    // Right border
+                    r = new Rectangle(this.Width - borderSize, 0, borderSize, this.Height);
+                    if (r.Contains(p))
+                    {
+                        m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.RightSizeableBorder);
+                        return false;
+                    }
+                }
+            }
+
+            BaseItem item=m_Caption.ItemAtLocation(p.X, p.Y);
+            if (item == m_TitleLabel)
+            {
+                m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.TitleBar);
+                return false;
+            }
+            else if (item == m_SystemIcon)
+            {
+                m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.Menu);
+                return false;
+            }
+            else if (item == m_SystemButtons)
+            {
+                SystemButton btn = m_SystemButtons.GetButton(p.X, p.Y);
+                if (btn == SystemButton.Minimize)
+                    m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.MinimizeButton);
+                else if (btn == SystemButton.Maximize)
+                    m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.MaximizeButton);
+                else if (btn == SystemButton.Close)
+                    m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.CloseButton);
+                else if (btn == SystemButton.Restore)
+                    m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.ReduceButton);
+                else if (btn == SystemButton.Help)
+                    m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.HelpButton);
+
+                return false;
+            }
+            else if (item is ButtonItem)
+            {
+                m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.Object);
+                return false;
+            }
+            
+            return true;
+
+        }
+
+        private Point _NcMouseDownPoint = Point.Empty;
+        protected override bool WindowsMessageNCLButtonDown(ref Message m)
+        {
+            int wParamInt = WinApi.ToInt(m.WParam);
+            if (wParamInt == (int)WinApi.WindowHitTestRegions.TopSizeableBorder ||
+                wParamInt == (int)WinApi.WindowHitTestRegions.TopRightSizeableCorner) return true;
+            Point p = GetMousePosition();
+            _NcMouseDownPoint = p;
+            m_Caption.InternalMouseDown(new MouseEventArgs(MouseButtons.Left, 0, p.X, p.Y, 0));
+
+            BaseItem item = m_Caption.ItemAtLocation(p.X, p.Y);
+            if (item != null && (item == m_SystemButtons || item == m_TitleLabel || p.X >= m_SystemButtons.DisplayRectangle.X && p.X <= m_SystemButtons.DisplayRectangle.Right))
+            {
+                if (!this.NonClientActive)
+                    this.Activate();
+                return false;
+            }
+
+            return true;
+        }
+
+        protected override bool WindowsMessageNCLButtonUp(ref Message m)
+        {
+            Point p = GetMousePosition();
+            BaseItem item = m_Caption.ItemAtLocation(p.X, p.Y);
+
+            m_Caption.InternalMouseUp(new MouseEventArgs(MouseButtons.Left, 0, p.X, p.Y, 0));
+            
+            if (p == _NcMouseDownPoint && !string.IsNullOrEmpty(this.TitleText))
+                m_Caption.InternalClick(MouseButtons.Left, p);
+
+            if (item == m_SystemButtons)
+                return false;
+
+            return true;
+        }
+
+        private void SystemButtons_Click(object sender, EventArgs e)
+        {
+            SystemCaptionItem sci = sender as SystemCaptionItem;
+            Form frm = this;
+
+            if (sci.MouseDownButton == SystemButton.Minimize)
+            {
+                NativeFunctions.PostMessage(frm.Handle, NativeFunctions.WM_SYSCOMMAND, NativeFunctions.SC_MINIMIZE, 0);
+                m_Caption.InternalMouseLeave();
+            }
+            else if (sci.MouseDownButton == SystemButton.Maximize)
+            {
+                NativeFunctions.PostMessage(frm.Handle, NativeFunctions.WM_SYSCOMMAND, NativeFunctions.SC_MAXIMIZE, 0);
+                m_Caption.InternalMouseLeave();
+            }
+            else if (sci.MouseDownButton == SystemButton.Restore)
+            {
+                NativeFunctions.PostMessage(frm.Handle, NativeFunctions.WM_SYSCOMMAND, NativeFunctions.SC_RESTORE, 0);
+                m_Caption.InternalMouseLeave();
+            }
+            else if (sci.MouseDownButton == SystemButton.Close)
+            {
+                NativeFunctions.PostMessage(frm.Handle, NativeFunctions.WM_SYSCOMMAND, NativeFunctions.SC_CLOSE, 0);
+                m_Caption.InternalMouseLeave();
+            }
+            else if (sci.MouseDownButton == SystemButton.Help)
+            {
+                NativeFunctions.PostMessage(frm.Handle, NativeFunctions.WM_SYSCOMMAND, NativeFunctions.SC_CONTEXTHELP, 0);
+                m_Caption.InternalMouseLeave();
+            }
+        }
+
+        private void SystemButtons_MouseEnter(object sender, EventArgs e)
+        {
+            if (m_MouseTimer == null)
+                SetupMouseTimer();
+        }
+
+        private void SetupMouseTimer()
+        {
+            m_MouseTimer = new Timer();
+            m_MouseTimer.Interval = 200;
+            m_MouseTimer.Tick += new EventHandler(MouseTimer_Tick);
+            m_MouseTimer.Start();
+        }
+
+        private void MouseTimer_Tick(object sender, EventArgs e)
+        {
+            Point p = GetMousePosition();
+            if (m_SystemButtons != null && !m_SystemButtons.DisplayRectangle.Contains(p))
+            {
+                m_MouseTimer.Enabled = false;
+                StopMouseTimer();
+
+                m_SystemButtons.InternalMouseLeave();
+            }
+        }
+
+        private void StopMouseTimer()
+        {
+            if (m_MouseTimer != null)
+            {
+                m_MouseTimer.Enabled = false;
+                m_MouseTimer.Tick -= new EventHandler(MouseTimer_Tick);
+                m_MouseTimer.Dispose();
+                m_MouseTimer = null;
+            }
+        }
+
+        protected override void OnVisibleChanged(EventArgs e)
+        {
+            if (!this.Visible)
+            {
+                StopMouseTimer();
+                StopCaptionNCMouseTimer();
+            }
+            base.OnVisibleChanged(e);
+        }
+
+        protected override void OnClosed(EventArgs e)
+        {
+            this.StopMouseTimer();
+            base.OnClosed(e);
+        }
+
+        protected override void OnResize(EventArgs e)
+        {
+            RecalcSize();
+
+            base.OnResize(e);
+        }
+
+        internal void RecalcSize()
+        {
+            if (!this.IsHandleCreated) return;
+            if (m_Caption != null)
+            {
+                NonClientInfo nci = GetNonClientInfo();
+                m_Caption.LeftInternal = 1;
+                m_Caption.TopInternal = 0;
+                m_Caption.PaddingLeft = Dpi.DescaleWidth(nci.LeftBorder) - 1;
+                m_Caption.PaddingRight = Dpi.DescaleWidth(nci.RightBorder);
+                m_Caption.PaddingTop = Dpi.DescaleHeight(nci.BottomBorder)/2 + 1;
+                m_Caption.WidthInternal = this.Width - 1;
+                m_Caption.HeightInternal = nci.CaptionTotalHeight - nci.BottomBorder / 2;
+                m_Caption.IsRightToLeft = (this.RightToLeft == RightToLeft.Yes);
+                m_Caption.OverflowEnabled = false;
+                if (m_TitleLabel != null)
+                {
+                    m_TitleLabel.Height = Dpi.DescaleHeight(m_Caption.HeightInternal - nci.BottomBorder-2);
+                    if (m_TitleText != "")
+                        m_TitleLabel.Width = 0;
+                    else
+                        m_TitleLabel.Width = 16;
+                    m_TitleLabel.TextLineAlignment = StringAlignment.Center;
+                }
+
+                m_Caption.RecalcSize();
+                m_Caption.HeightInternal = nci.CaptionTotalHeight;
+                if (m_SystemIcon != null)
+                    m_SystemIcon.TopInternal += (m_Caption.HeightInternal - m_SystemIcon.HeightInternal - nci.BottomBorder * 2) / 2 + 1;
+                m_TitleLabel.TopInternal+=Dpi.Height1;
+
+                if (this.WindowState == FormWindowState.Maximized)
+                {
+                    if (m_SystemIcon != null)
+                        m_SystemIcon.TopInternal += Dpi.Height2;
+                    m_TitleLabel.TopInternal += Dpi.Height2;
+                }
+
+                if (FormBorderStyle != FormBorderStyle.FixedSingle)
+                {
+                    m_SystemButtons.TopInternal -= Dpi.Height1;
+                }
+            }
+
+            if (this.WindowState == FormWindowState.Maximized || this.WindowState == FormWindowState.Minimized)
+                m_SystemButtons.RestoreEnabled = true;
+            else
+                m_SystemButtons.RestoreEnabled = false;
+        }
+
+        protected override void OnMouseLeave(EventArgs e)
+        {
+            m_Caption.InternalMouseLeave();
+            base.OnMouseLeave(e);
+        }
+
+        protected override void OnDeactivate(EventArgs e)
+        {
+            _IsActive = false;
+            base.OnDeactivate(e);
+            StopMouseTimer();
+            m_Caption.InternalMouseLeave();
+        }
+
+        protected override void OnTextChanged(EventArgs e)
+        {
+            base.OnTextChanged(e);
+            UpdateFormText();
+        }
+
+        /// <summary>
+        /// Updates the form title bar text. Usually calling this method is not necessary but under certain conditions when form is used as MDI parent form
+        /// calling it to update combined text is necessary.
+        /// </summary>
+        public void UpdateFormText()
+        {
+            bool changed = false;
+            if (m_TitleLabel != null && m_TitleText == "")
+            {
+                changed = m_TitleLabel.Text != this.Text;
+                m_TitleLabel.Text = this.Text;
+            }
+            if (changed)
+            {
+                if (this.IsMdiChild && this.MdiParent is RibbonForm)
+                {
+                    ((RibbonForm)this.MdiParent).InvalidateRibbonCaption();
+                }
+                InvalidateNonClient(false);
+            }
+        }
+        protected override void OnControlRemoved(ControlEventArgs e)
+        {
+            if (e.Control is MdiClient)
+            {
+                e.Control.ControlRemoved -= MdiClientControlRemoved;
+                e.Control.ControlAdded -= MdiClientControlAdded;
+                e.Control.HandleCreated -= MdiClientHandleCreated;
+                CleanupMdiClientHandler();
+            }
+            base.OnControlRemoved(e);
+        }
+        protected override void OnControlAdded(ControlEventArgs e)
+        {
+            if (e.Control is MdiClient)
+            {
+                e.Control.ControlRemoved += MdiClientControlRemoved;
+                e.Control.ControlAdded += MdiClientControlAdded;
+                e.Control.HandleCreated += MdiClientHandleCreated;
+                SetupMdiClientHandler((MdiClient)e.Control);
+            }
+            base.OnControlAdded(e);
+        }
+
+        private void CleanupMdiClientHandler()
+        {
+            if (_MdiHandler != null)
+            {
+                _MdiHandler.MdiSetMenu -= this.OnMdiSetMenu;
+                _MdiHandler.ReleaseHandle();
+                _MdiHandler = null;
+            }
+        }
+        private void SetupMdiClientHandler(MdiClient mdiClient)
+        {
+            if (mdiClient.IsHandleCreated)
+                SubclassMdiClient(mdiClient);
+        }
+        private bool _HideMdiSystemMenu = true;
+        [DefaultValue(true), Browsable(false)]
+        public bool HideMdiSystemMenu
+        {
+            get { return _HideMdiSystemMenu; }
+            set
+            {
+                _HideMdiSystemMenu = value;
+            }
+        }
+        
+        private void OnMdiSetMenu(object sender, System.EventArgs e)
+        {
+            MDIClientMsgHandler m = sender as MDIClientMsgHandler;
+            if (_HideMdiSystemMenu)
+                m.EatMessage = true;
+        }
+        private MDIClientMsgHandler _MdiHandler = null;
+        private void SubclassMdiClient(MdiClient client)
+        {
+            CleanupMdiClientHandler();
+            _MdiHandler = new MDIClientMsgHandler();
+            _MdiHandler.MdiSetMenu += new EventHandler(this.OnMdiSetMenu);
+            _MdiHandler.AssignHandle(client.Handle);
+        }
+        private void MdiClientHandleCreated(object sender, EventArgs e)
+        {
+            SubclassMdiClient((MdiClient)sender);
+        }
+
+        private void MdiClientControlRemoved(object sender, ControlEventArgs e)
+        {
+            e.Control.Resize -= new EventHandler(MdiChildResize);
+        }
+        private void MdiClientControlAdded(object sender, ControlEventArgs e)
+        {
+            e.Control.Resize += new EventHandler(MdiChildResize);
+        }
+        
+        protected override void OnMdiChildActivate(EventArgs e)
+        {
+            UpdateFormText();
+            base.OnMdiChildActivate(e);
+        }
+
+        private void MdiChildResize(object sender, EventArgs e)
+        {
+            InvokeDelayed(new MethodInvoker(delegate { UpdateFormText(); }));
+        }
+
+        protected override void OnStyleChanged(EventArgs e)
+        {
+            UpdateSystemButton();
+            InvalidateNonClient(false);
+            base.OnStyleChanged(e);
+        }
+
+        protected override void OnSystemColorsChanged(EventArgs e)
+        {
+            OnCaptionFontChanged();
+            base.OnSystemColorsChanged(e);
+        }
+
+        protected override void OnHandleCreated(EventArgs e)
+        {
+            UpdateSystemButton();
+            if (_UpdateFromGlassStateOnHandleCreated)
+            {
+                _UpdateFromGlassStateOnHandleCreated = false;
+                UpdateFormGlassState();
+            }
+            base.OnHandleCreated(e);
+        }
+        protected override void OnRenderFormIconChanged(bool oldValue, bool newValue)
+        {
+            UpdateSystemButton();
+            base.OnRenderFormIconChanged(oldValue, newValue);
+        }
+        protected override void OnRenderFormTextChanged(bool oldValue, bool newValue)
+        {
+            UpdateSystemButton();
+            base.OnRenderFormTextChanged(oldValue, newValue);
+        }
+        private void UpdateSystemButton()
+        {
+            if (m_SystemButtons != null)
+            {
+                m_SystemButtons.MinimizeVisible = this.MinimizeBox;
+                m_SystemButtons.RestoreMaximizeVisible = this.MaximizeBox;
+
+                m_SystemButtons.Visible = this.ControlBox;
+                m_SystemIcon.Visible = this.ControlBox;
+
+                m_SystemButtons.HelpVisible = this.HelpButton;
+            }
+
+#if FRAMEWORK20
+            if (m_SystemIcon != null)
+            {
+                m_SystemIcon.Visible = this.ShowIcon && this.RenderFormIcon;
+            }
+#endif
+            if (this.FormBorderStyle == FormBorderStyle.FixedDialog)
+                m_SystemIcon.Visible = false;
+
+            if (m_TitleLabel != null)
+                m_TitleLabel.IsRendered = this.RenderFormText;
+
+            if (this.IsHandleCreated)
+                RecalcSize();
+        }
+
+        /// <summary>
+        /// Gets or sets the icon for the form.
+        /// </summary>
+        [Browsable(true)]
+        public new Icon Icon
+        {
+            get { return base.Icon; }
+            set
+            {
+                base.Icon = value;
+                m_SystemIcon.Icon = value;
+                UpdateSystemButton();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the form enables auto scrolling.
+        /// </summary>
+        [Browsable(false), DefaultValue(false)]
+        public override bool AutoScroll
+        {
+            get { return base.AutoScroll; }
+            set { base.AutoScroll = value; }
+        }
+
+        protected internal bool CloseEnabled
+        {
+            get
+            {
+                return m_SystemButtons.CloseEnabled;
+            }
+            set
+            {
+                if (m_SystemButtons.CloseEnabled != value)
+                {
+                    m_SystemButtons.CloseEnabled = value;
+                    OnCloseEnabledChanged();
+                }
+            }
+        }
+        /// <summary>
+        /// Called when CloseEnabled property value has changed.
+        /// </summary>
+        protected virtual void OnCloseEnabledChanged()
+        {
+            if (!BarFunctions.IsHandleValid(this)) return;
+
+            IntPtr handle = this.Handle;
+            IntPtr menuHandle = NativeFunctions.GetSystemMenu(handle, false);
+            uint flags = 0;
+            const uint MF_BYCOMMAND = 0x0;
+            const uint MF_GRAYED = 0x1;
+            if (CloseEnabled)
+            {
+                flags = MF_BYCOMMAND | ~MF_GRAYED;
+            }
+            else
+            {
+                flags = MF_BYCOMMAND | MF_GRAYED;
+            }
+            WinApi.EnableMenuItem(menuHandle, NativeFunctions.SC_CLOSE, flags);
+        }
+
+        /// <summary>
+        /// Gets or sets the Office 2007 Renderer global Color Table. Setting this property will affect all controls in application that are using Office 2007 global renderer.
+        /// </summary>
+        [Browsable(false), Category("Appearance"), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), Description("Indicates the Office 2007 Renderer global Color Table.")]
+        public Rendering.eOffice2007ColorScheme Office2007ColorTable
+        {
+            get
+            {
+                Rendering.Office2007Renderer r = this.GetRenderer() as Rendering.Office2007Renderer;
+                if (r != null)
+                    return r.ColorTable.InitialColorScheme;
+                return Rendering.eOffice2007ColorScheme.Blue;
+            }
+            set
+            {
+#if (FRAMEWORK20)
+                RibbonPredefinedColorSchemes.ChangeOffice2007ColorTable(value);
+#else
+                RibbonPredefinedColorSchemes.ChangeOffice2007ColorTable(this, value);
+#endif
+            }
+        }
+        #endregion
+
+        #region Non-client area painting
+        /// <summary>
+        /// Gets whether client border is painted in OnPaint method.
+        /// </summary>
+        protected override bool PaintClientBorder
+        {
+            get { return false; }
+        }
+        /// <summary>
+        /// Gets whether ribbon control caption is painted
+        /// </summary>
+        protected override bool PaintRibbonCaption
+        {
+            get { return false; }
+        }
+
+        /// <summary>
+        /// Paints the non-client area of the form.
+        /// </summary>
+        protected override bool WindowsMessageNCPaint(ref Message m)
+        {
+            m.Result = IntPtr.Zero;
+
+            if (this.IsHandleCreated && !this.IsDisposed && this.Handle != IntPtr.Zero && this.EnableCustomStyle && NonClientPaintEnabled)
+            {
+                PaintNonClientAreaBuffered();
+            }
+
+            return false;
+        }
+
+        protected virtual void PaintNonClientAreaBuffered()
+        {
+            IntPtr dc = WinApi.GetWindowDC(this.Handle);
+            try
+            {
+                using (Graphics g = Graphics.FromHdc(dc))
+                {
+                    PaintNonClientAreaBuffered(g);
+                }
+            }
+            finally
+            {
+                WinApi.ReleaseDC(this.Handle, dc);
+            }
+        }
+
+        protected virtual void PaintNonClientAreaBuffered(Graphics targetGraphics)
+        {
+            BufferedBitmap bmp = new BufferedBitmap(targetGraphics, new Rectangle(0,0,this.Width, this.Height));
+            try
+            {
+                bmp.Graphics.SetClip(this.GetClientRectangle(new Rectangle(0, 0, this.Width, this.Height)), CombineMode.Exclude);
+                PaintNonClientArea(bmp.Graphics);
+
+                bmp.Render(targetGraphics, this.GetClientRectangle(new Rectangle(0, 0, this.Width, this.Height)));
+            }
+            finally
+            {
+                bmp.Dispose();
+            }
+        }
+
+        protected virtual Rectangle GetInnerFormBounds()
+        {
+            //NonClientInfo nci = GetNonClientInfo();
+            //return new Rectangle(nci.LeftBorder, nci.BottomBorder, this.Width - (nci.LeftBorder + nci.RightBorder + 1), this.Height - nci.BottomBorder * 2);
+
+            Rectangle r =  new Rectangle(1, 1, this.Width - 3, this.Height - 1);
+
+            #if FRAMEWORK20
+            if (this.RightToLeftLayout) r = new Rectangle(1, 1, this.Width - 2, this.Height - 1);
+            #endif
+
+            return r;
+        }
+
+        protected virtual void PaintNonClientArea(Graphics g)
+        {
+            NonClientInfo nci = GetNonClientInfo();
+            PaintFormBorder(g, nci.LeftBorder, false);
+            //PaintFormCaptionTo(g);
+            Rectangle r = GetInnerFormBounds();
+            if (m_CornerSize > 1 && UseCornerSize)
+                m_CornerSize--;
+            using (GraphicsPath path = GetFormPath(r))
+            {
+                if (m_CornerSize > 0 && UseCornerSize)
+                    m_CornerSize++;
+                Region reg = new Region();
+                reg.MakeEmpty();
+                reg.Union(path);
+                // Widen path for the border...
+                path.Widen(SystemPens.Control);
+                Region r2 = new Region(path);
+                reg.Union(path);
+                g.SetClip(reg, CombineMode.Replace);
+
+                PaintFormCaptionTo(g);
+            }
+            g.ResetClip();
+        }
+
+        private bool m_AntiAlias = true;
+        /// <summary>
+        /// Gets or sets whether anti-alias smoothing is used while painting form caption. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Browsable(true), Category("Appearance"), Description("Gets or sets whether anti-aliasing is used while painting form caption.")]
+        public bool CaptionAntiAlias
+        {
+            get { return m_AntiAlias; }
+            set
+            {
+                if (m_AntiAlias != value)
+                {
+                    m_AntiAlias = value;
+                }
+            }
+        }
+
+        private void PaintFormCaptionTo(Graphics g)
+        {
+            ItemPaintArgs p = GetItemPaintArgs(g);
+
+            SmoothingMode sm = g.SmoothingMode;
+            System.Drawing.Text.TextRenderingHint th = g.TextRenderingHint;
+
+            if (m_AntiAlias)
+            {
+                g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.AntiAlias;
+                // Setting this disables the Clear-Type rendering on other controls on form. Do not do it.
+                //g.TextRenderingHint = DisplayHelp.AntiAliasTextRenderingHint;
+            }
+
+            if (p.Renderer != null)
+            {
+                if (p.Renderer is Office2007Renderer)
+                {
+                    if (NonClientActive)
+                        m_TitleLabel.ForeColor = ((Office2007Renderer)p.Renderer).ColorTable.Form.Active.CaptionText;
+                    else
+                        m_TitleLabel.ForeColor = ((Office2007Renderer)p.Renderer).ColorTable.Form.Inactive.CaptionText;
+                }
+                
+                p.Renderer.DrawFormCaptionBackground(new FormCaptionRendererEventArgs(g, m_Caption.DisplayRectangle, this));
+            }
+
+            int nciLeftBorder = 0;
+            if (this.BackgroundImage != null && this.BackgroundImageUnderCaption ||
+                StyleManager.IsMetro(StyleManager.Style))
+            {
+                NonClientInfo nci = GetNonClientInfo();
+                nciLeftBorder = nci.LeftBorder;
+            }
+
+            PaintNonClientBackgroundImage(g, this.ClientRectangle);
+
+            if (this.BackgroundImage != null && this.BackgroundImageUnderCaption || StyleManager.IsMetro(StyleManager.Style))
+            {
+                PaintFormBorder(g, nciLeftBorder, true);
+            }
+
+            m_Caption.Paint(p);
+
+            //if (m_AntiAlias)
+            {
+                g.SmoothingMode = sm;
+                //g.TextRenderingHint = th;
+            }
+        }
+
+        private ItemPaintArgs GetItemPaintArgs(Graphics g)
+        {
+            ItemPaintArgs pa = new ItemPaintArgs(null, this, g, GetColorScheme());
+            pa.Renderer = this.GetRenderer();
+            return pa;
+        }
+
+        protected virtual ColorScheme GetColorScheme()
+        {
+            if (m_ColorScheme == null)
+            {
+                if (GlobalManager.Renderer is Office2007Renderer)
+                    return ((Office2007Renderer)GlobalManager.Renderer).ColorTable.LegacyColors;
+                return new ColorScheme(eDotNetBarStyle.Office2007);
+            }
+            else
+                return m_ColorScheme;
+        }
+
+        private Rendering.BaseRenderer m_DefaultRenderer = null;
+        private Rendering.BaseRenderer m_Renderer = null;
+        private eRenderMode m_RenderMode = eRenderMode.Global;
+        /// <summary>
+        /// Returns the renderer control will be rendered with.
+        /// </summary>
+        /// <returns>The current renderer.</returns>
+        public virtual Rendering.BaseRenderer GetRenderer()
+        {
+            if (m_RenderMode == eRenderMode.Global && Rendering.GlobalManager.Renderer != null)
+                return Rendering.GlobalManager.Renderer;
+            else if (m_RenderMode == eRenderMode.Custom && m_Renderer != null)
+                return m_Renderer;
+
+            if (m_DefaultRenderer == null)
+                m_DefaultRenderer = new Rendering.Office2007Renderer();
+
+            return m_Renderer;
+        }
+
+        /// <summary>
+        /// Gets or sets the redering mode used by control. Default value is eRenderMode.Global which means that static GlobalManager.Renderer is used. If set to Custom then Renderer property must
+        /// also be set to the custom renderer that will be used.
+        /// </summary>
+        [Browsable(false), DefaultValue(eRenderMode.Global)]
+        public eRenderMode RenderMode
+        {
+            get { return m_RenderMode; }
+            set
+            {
+                if (m_RenderMode != value)
+                {
+                    m_RenderMode = value;
+                    this.Invalidate(true);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the custom renderer used by the items on this control. RenderMode property must also be set to eRenderMode.Custom in order renderer
+        /// specified here to be used.
+        /// </summary>
+        [Browsable(false), DefaultValue(null)]
+        public DevComponents.DotNetBar.Rendering.BaseRenderer Renderer
+        {
+            get
+            {
+                return m_Renderer;
+            }
+            set { m_Renderer = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the tooltip for the form system icon.
+        /// </summary>
+        [Browsable(true), DefaultValue(""), Description("Indicates tooltip for the form system icon."), Localizable(true)]
+        public string IconTooltip
+        {
+            get { return m_SystemIcon.Tooltip; }
+            set { m_SystemIcon.Tooltip = value; }
+        }
+
+        ///// <summary>
+        ///// Gets the array of LinearGradientColorTable objects that describe the border colors. The colors with index 0 is used as the outer most
+        ///// border.
+        ///// </summary>
+        ///// <returns>Array of LinearGradientColorTable</returns>
+        //protected override LinearGradientColorTable[] GetBorderColors()
+        //{
+        //    LinearGradientColorTable[] colors = base.GetBorderColors();
+
+        //    RECT rect = new RECT(0, 0, this.ClientRectangle.Width, this.ClientRectangle.Height);
+        //    CreateParams params1 = this.CreateParams;
+        //    AdjustWindowRectEx(ref rect, params1.Style, false, params1.ExStyle);
+
+        //    int borderWidth = Math.Abs(rect.Left);
+        //    if (colors.Length < borderWidth)
+        //    {
+        //        LinearGradientColorTable[] cn = new LinearGradientColorTable[borderWidth];
+        //        LinearGradientColorTable innerColor = colors[colors.Length-1];
+        //        colors.CopyTo(cn, 0);
+        //        for (int i = colors.Length; i < borderWidth; i++)
+        //            cn[i] = new LinearGradientColorTable(innerColor.Start, innerColor.End, innerColor.GradientAngle);
+        //        colors = cn;
+        //    }
+
+        //    return colors;
+        //}
+        #endregion
+
+        #region Windows API
+        
+        #endregion
+    }
+
+    public class Office2007Form : OfficeForm
+    {
+    }
+
+    internal class NonClientInfo
+    {
+        public int CaptionTotalHeight = 0;
+        public int BottomBorder = 0;
+        public int LeftBorder = 0;
+        public int RightBorder = 0;
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Office2007Form/RibbonForm.cs b/PROMS/DotNetBar Source Code/Office2007Form/RibbonForm.cs
new file mode 100644
index 00000000..250cc84e
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Office2007Form/RibbonForm.cs	
@@ -0,0 +1,2384 @@
+using System;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+using System.Drawing.Drawing2D;
+using System.Runtime.InteropServices;
+using DevComponents.DotNetBar.Rendering;
+using System.Drawing.Imaging;
+using System.Collections;
+using System.Reflection;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represents the form class that should be used instead of standard Form when form caption is provided by Ribbon control
+    /// and custom form look and feel in style of Office 2007 is required. This form does not have standard form caption.
+    /// </summary>
+    public class RibbonForm : Form
+    {
+        #region Private Variables
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        private int m_TopLeftCornerSize = 6;
+        private int m_TopRightCornerSize = 6;
+        private int m_BottomLeftCornerSize = 6;
+        private int m_BottomRightCornerSize = 6;
+        protected int m_DisplayRectangleReductionTop = 1;
+        protected int m_DisplayRectangleReductionBottom = 2;
+        protected int m_DisplayRectangleReductionHorizontal = 5;
+        RibbonControl m_RibbonControl = null;
+        private FormWindowState m_WindowStateDelayed = FormWindowState.Normal;
+        private bool m_TrackWindowStateSetting = false;
+        private bool m_IsLoaded = false;
+        private bool m_FlattenMDIBorder = true;
+        private bool m_NonClientActive = true;
+        private Point m_NonClientOffset = Point.Empty;
+        protected bool m_EnableCustomStyle = true;
+        private int m_GlassHeight = 0;
+        private bool m_IsGlassEnabled = false;
+        private bool m_GlassHitTestTrack = false;
+        private bool m_EnableGlass = true;
+        #endregion
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing) StyleManager.Unregister(this);
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            if (m_CashedCaptionBitmap != null)
+            {
+                m_CashedCaptionBitmap.Dispose();
+                m_CashedCaptionBitmap = null;
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form 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()
+        {
+            // 
+            // Office2007RibbonForm
+            // 
+        }
+
+        #endregion
+
+        public RibbonForm()
+            : base()
+        {
+#if !FRAMEWORK20
+            this.DockPadding.Top = m_DisplayRectangleReductionTop;
+            this.DockPadding.Bottom = m_DisplayRectangleReductionBottom;
+            this.DockPadding.Right = m_DisplayRectangleReductionHorizontal;
+            this.DockPadding.Left = m_DisplayRectangleReductionHorizontal;
+#endif
+            m_IsGlassEnabled = GetGlassEnabled();
+            InitializeComponent();
+            UpdateFormControlStyle();
+            StyleManager.Register(this);
+        }
+
+        /// <summary>
+        /// Called by StyleManager to notify control that style on manager has changed and that control should refresh its appearance if
+        /// its style is controlled by StyleManager.
+        /// </summary>
+        /// <param name="newStyle">New active style.</param>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public virtual void StyleManagerStyleChanged(eDotNetBarStyle newStyle)
+        {
+            UpdateFormStyling();
+            UpdateRibbonSystemCaptionItem();
+        }
+
+        protected virtual void UpdateFormControlStyle()
+        {
+            if (IsCustomFormStyleEnabled())
+            {
+                if (!this.GetStyle(ControlStyles.AllPaintingInWmPaint))
+                {
+                    this.SetStyle(ControlStyles.AllPaintingInWmPaint
+                       | ControlStyles.ResizeRedraw
+                       | DisplayHelp.DoubleBufferFlag
+                       | ControlStyles.UserPaint
+                       , true);
+                }
+            }
+            else
+            {
+                if (this.GetStyle(ControlStyles.AllPaintingInWmPaint))
+                {
+                    this.SetStyle(ControlStyles.AllPaintingInWmPaint
+                       | ControlStyles.ResizeRedraw
+                       | DisplayHelp.DoubleBufferFlag
+                        /*| ControlStyles.UserPaint*/
+                       , false);
+                }
+            }
+        }
+
+        internal int DisplayRectangleReductionHorizontal
+        {
+            get { return m_DisplayRectangleReductionHorizontal; }
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override void ResetBackColor()
+        {
+            base.ResetBackColor();
+            _BackColorSet = false;
+        }
+
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), EditorBrowsable(EditorBrowsableState.Never)]
+        public bool BackColorSet
+        {
+            get
+            {
+                return _BackColorSet;
+            }
+            set
+            {
+                _BackColorSet = value;
+            }
+        }
+        private bool _BackColorSet = false;
+        public override Color BackColor
+        {
+            get
+            {
+                return base.BackColor;
+            }
+            set
+            {
+                base.BackColor = value;
+                if (value == SystemColors.Control && this.DesignMode) return;
+                _BackColorSet = true;
+            }
+        }
+
+        private void UpdateFormBackColor()
+        {
+            if (_BackColorSet) return;
+            if (IsCustomFormStyleEnabled())
+            {
+                if (GlobalManager.Renderer is Office2007Renderer)
+                {
+                    Color bc = ((Office2007Renderer)GlobalManager.Renderer).ColorTable.Form.BackColor;
+                    base.BackColor = bc;
+                }
+            }
+            else
+                base.BackColor = SystemColors.Control;
+        }
+        protected virtual void UpdateFormStyling()
+        {
+            if (this.HasCustomRegion) // Its key not to reset Region here to zero IF form needs region due to the new style. If Region is reset and later assigned the Glass if enabled would flash
+                this.Region = GetRegion();
+            else
+                this.Region = null;
+            UpdateFormBackColor();
+            if (IsGlassEnabled)
+            {
+                if (StyleManager.IsMetro(StyleManager.PreviousStyle))
+                    RefreshGlassState();
+                else
+                    UpdateGlass();
+            }
+            UpdateMdiClientBackgroundImage();
+            this.Invalidate();
+        }
+
+        private void UpdateMdiClientBackgroundImage()
+        {
+            if (!this.IsMdiContainer) return;
+            MdiClient client = BarFunctions.GetMdiClient(this);
+            if (client == null) return;
+
+            if (GlobalManager.Renderer is Office2007Renderer)
+                client.BackgroundImage = ((Office2007Renderer)GlobalManager.Renderer).ColorTable.Form.MdiClientBackgroundImage;
+
+            if (StyleManager.IsMetro(StyleManager.Style) && client != null)
+            {
+                client.BackColor = ((Office2007Renderer)GlobalManager.Renderer).ColorTable.Form.BackColor;
+            }
+        }
+
+        protected override void OnLoad(EventArgs e)
+        {
+            base.OnLoad(e);
+            UpdateFormStyling();
+
+            m_IsLoaded = true;
+            if (m_TrackWindowStateSetting)
+            {
+                base.WindowState = m_WindowStateDelayed;
+                m_TrackWindowStateSetting = false;
+            }
+        }
+
+        protected override void OnActivated(EventArgs e)
+        {
+            base.OnActivated(e);
+            InvalidateRibbonCaption();
+        }
+
+        protected override void OnDeactivate(EventArgs e)
+        {
+            base.OnDeactivate(e);
+            InvalidateRibbonCaption();
+        }
+
+        protected override void OnTextChanged(EventArgs e)
+        {
+            base.OnTextChanged(e);
+            InvalidateRibbonCaption();
+        }
+
+        protected override void OnStyleChanged(EventArgs e)
+        {
+            UpdateRibbonSystemCaptionItem();
+            UpdateFormControlStyle();
+            base.OnStyleChanged(e);
+        }
+
+        protected override void ScaleControl(SizeF factor, BoundsSpecified specified)
+        {
+            Dpi.SetScaling(factor);
+            base.ScaleControl(factor, specified);
+            if(m_RibbonControl!=null)
+                m_RibbonControl.RecalcLayout();
+        }
+
+        /// <summary>
+        /// Gets or sets whether Windows Vista Glass support is enabled when form is running on Windows Vista with Glass support.
+        /// Default value is true.
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Appearance"), Description("Indicates whether Windows Vista Glass support is enabled when form is running on Windows Vista with Glass support.")]
+        public virtual bool EnableGlass
+        {
+            get { return m_EnableGlass; }
+            set
+            {
+                if (m_EnableGlass != value)
+                {
+                    m_EnableGlass = value;
+                    if (m_RibbonControl != null)
+                        m_RibbonControl.CanSupportGlass = IsGlassEnabled;
+                    if (m_IsGlassEnabled && this.IsHandleCreated && !this.DesignMode)
+                    {
+                        bool isMdiChildMaximized = false;
+                        if (this.IsMdiContainer && this.ActiveMdiChild != null && this.ActiveMdiChild.WindowState == FormWindowState.Maximized)
+                            isMdiChildMaximized = true;
+                        //this.RecreateHandle(); // This has nasty side-effects when glass is switched on/off Modal forms disappear App.OpenForms gets messed up
+                        NativeFunctions.SetWindowPos(this.Handle, IntPtr.Zero, 0, 0, 0, 0, NativeFunctions.SWP_FRAMECHANGED |
+                                NativeFunctions.SWP_NOACTIVATE | NativeFunctions.SWP_NOMOVE | NativeFunctions.SWP_NOSIZE | NativeFunctions.SWP_NOZORDER);
+                        UpdateFormGlassState();
+                        if (isMdiChildMaximized && this.IsMdiContainer && this.ActiveMdiChild != null)
+                            this.ActiveMdiChild.WindowState = FormWindowState.Maximized;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the RibbonControl that is hosted by this form. This property is for internal use only.
+        /// </summary>
+        [Browsable(false)]
+        protected virtual RibbonControl RibbonControl
+        {
+            get { return m_RibbonControl; }
+            set
+            {
+                m_RibbonControl = value;
+                if (m_RibbonControl != null)
+                    UpdateRibbonSystemCaptionItem();
+            }
+        }
+
+        private void UpdateRibbonSystemCaptionItem()
+        {
+            SystemCaptionItem captionItem = GetSystemCaptionItem();
+            if (captionItem != null)
+            {
+                captionItem.MinimizeVisible = this.MinimizeBox;
+                if (this.IsGlassEnabled && this.MinimizeBox && this.FormBorderStyle == FormBorderStyle.Sizable)
+                    captionItem.RestoreMaximizeVisible = true;
+                else
+                    captionItem.RestoreMaximizeVisible = this.MaximizeBox;
+
+                captionItem.HelpVisible = this.HelpButton;
+                captionItem.Visible = this.ControlBox;
+                m_RibbonControl.RecalcLayout();
+            }
+        }
+        private SystemCaptionItem GetSystemCaptionItem()
+        {
+            if (m_RibbonControl != null && IsCustomFormStyleEnabled())
+            {
+                return m_RibbonControl.RibbonStrip.SystemCaptionItem;
+            }
+            return null;
+        }
+
+        /// <summary>
+        /// Gets whether Vista glass effect extension over the ribbon control caption is enabled.
+        /// </summary>
+        protected virtual bool EnableGlassExtend
+        {
+            get
+            {
+                return true;
+            }
+        }
+
+        internal void UpdateGlass()
+        {
+            if (!this.IsGlassEnabled || !BarFunctions.IsHandleValid(this) || !this.EnableGlassExtend) return;
+
+            int glassHeight = 0;
+
+            if (m_RibbonControl == null || !m_RibbonControl.CaptionVisible)
+            {
+                NonClientInfo nci = GetNonClientInfo();
+                glassHeight = nci.BottomBorder;
+            }
+            else
+            {
+                glassHeight = m_RibbonControl.RibbonStrip.GetGlassCaptionHeight();
+            }
+
+            WinApi.ExtendGlass(this.Handle, glassHeight);
+            m_GlassHeight = glassHeight;
+        }
+
+        internal int GlassHeight
+        {
+            get { return m_GlassHeight; }
+        }
+
+        internal void InvalidateRibbonCaption()
+        {
+            if (!IsCustomFormStyleEnabled())
+                return;
+
+            if (m_RibbonControl != null && m_RibbonControl.RibbonStrip.CaptionVisible)
+            {
+                m_RibbonControl.RibbonStrip.Invalidate(m_RibbonControl.RibbonStrip.CaptionBounds);
+            }
+            if (this.IsGlassEnabled) return;
+            Rectangle r = this.ClientRectangle;
+            r.Inflate(-m_DisplayRectangleReductionHorizontal * 2, -(m_DisplayRectangleReductionTop * 2 + m_DisplayRectangleReductionBottom * 2));
+            Region reg = new Region(this.ClientRectangle);
+            using (GraphicsPath formPath = GetFormPath(r))
+            {
+                reg.Exclude(formPath);
+                this.Invalidate(reg);
+            }
+        }
+
+        protected override void OnControlAdded(ControlEventArgs e)
+        {
+            if (e.Control is RibbonControl)
+            {
+                m_RibbonControl = e.Control as RibbonControl;
+                m_RibbonControl.CanSupportGlass = IsGlassEnabled;
+                UpdateRibbonSystemCaptionItem();
+                UpdateGlass();
+            }
+            base.OnControlAdded(e);
+        }
+
+        protected override void OnControlRemoved(ControlEventArgs e)
+        {
+            if (e.Control == m_RibbonControl)
+            {
+                m_RibbonControl.CanSupportGlass = false;
+                m_RibbonControl = null;
+            }
+            base.OnControlRemoved(e);
+        }
+
+        protected override void OnMdiChildActivate(EventArgs e)
+        {
+            InvalidateRibbonCaption();
+            base.OnMdiChildActivate(e);
+            if (this.IsGlassEnabled)
+            {
+                IntPtr menu = WinApi.GetMenu(this.Handle);
+                if (menu != IntPtr.Zero)
+                    WinApi.SetMenu(this.Handle, IntPtr.Zero);
+            }
+        }
+
+        private bool ShouldForwardCornerEvents()
+        {
+            return this.WindowState == FormWindowState.Maximized && this.RibbonControl != null && !this.IsGlassEnabled;
+        }
+
+        protected override void OnMouseDown(MouseEventArgs e)
+        {
+            if (ShouldForwardCornerEvents() && (e.X <= m_DisplayRectangleReductionHorizontal || e.X >= this.ClientRectangle.Width - m_DisplayRectangleReductionHorizontal) && e.Y <= m_DisplayRectangleReductionHorizontal)
+            {
+                MouseEventArgs e1 = e;
+                if (e.X >= this.ClientRectangle.Width - m_DisplayRectangleReductionHorizontal)
+                    e1 = new MouseEventArgs(e.Button, e.Clicks, e.X - m_DisplayRectangleReductionHorizontal * 2, e.Y, e.Delta);
+                this.RibbonControl.RibbonStrip.InvokeMouseDown(e1);
+            }
+            base.OnMouseDown(e);
+        }
+
+        protected override void OnMouseUp(MouseEventArgs e)
+        {
+            if (ShouldForwardCornerEvents() && (e.X <= m_DisplayRectangleReductionHorizontal || e.X >= this.ClientRectangle.Width - m_DisplayRectangleReductionHorizontal) && e.Y <= m_DisplayRectangleReductionHorizontal)
+            {
+                MouseEventArgs e1 = e;
+                if (e.X >= this.ClientRectangle.Width - m_DisplayRectangleReductionHorizontal)
+                    e1 = new MouseEventArgs(e.Button, e.Clicks, e.X - m_DisplayRectangleReductionHorizontal * 2, e.Y, e.Delta);
+                this.RibbonControl.RibbonStrip.InvokeMouseUp(e1);
+            }
+            base.OnMouseUp(e);
+        }
+
+        protected override void OnMouseMove(MouseEventArgs e)
+        {
+            if (ShouldForwardCornerEvents() && (e.X <= m_DisplayRectangleReductionHorizontal || e.X >= this.ClientRectangle.Width - m_DisplayRectangleReductionHorizontal))
+            {
+                MouseEventArgs e1 = e;
+                if (e.X >= this.ClientRectangle.Width - m_DisplayRectangleReductionHorizontal)
+                    e1 = new MouseEventArgs(e.Button, e.Clicks, e.X - m_DisplayRectangleReductionHorizontal * 2, e.Y, e.Delta);
+                this.RibbonControl.RibbonStrip.InvokeMouseMove(e1);
+            }
+            base.OnMouseMove(e);
+        }
+
+        protected override void OnClick(EventArgs e)
+        {
+            if (ShouldForwardCornerEvents())
+            {
+                Point p = this.PointToClient(Control.MousePosition);
+                if (p.X <= m_DisplayRectangleReductionHorizontal || p.X >= this.ClientRectangle.Width - m_DisplayRectangleReductionHorizontal)
+                {
+                    this.RibbonControl.RibbonStrip.InvokeClick(e);
+                }
+            }
+            base.OnClick(e);
+        }
+
+        protected override void OnHandleCreated(EventArgs e)
+        {
+            if (this.IsMdiContainer)
+            {
+                BarUtilities.ChangeMDIClientBorder(this, m_FlattenMDIBorder);
+            }
+
+            UpdateGlass();
+            //if (IsCustomFormStyleEnabled() && IsGlassEnabled)
+            //{
+            //    int enable = 0;
+            //    WinApi.DwmGetWindowAttribute(this.Handle, (int)WinApi.DWMWINDOWATTRIBUTE.DWMWA_NCRENDERING_ENABLED, ref enable, Marshal.SizeOf(enable));
+            //    if (enable != 0)
+            //    {
+            //        enable = (int)WinApi.DWMNCRENDERINGPOLICY.DWMNCRP_DISABLED;
+            //        int res = WinApi.DwmSetWindowAttribute(this.Handle, (int)WinApi.DWMWINDOWATTRIBUTE.DWMWA_NCRENDERING_POLICY,
+            //            ref enable, Marshal.SizeOf(enable));
+            //        WinApi.DwmSetWindowAttribute(this.Handle, (int)WinApi.DWMWINDOWATTRIBUTE.DWMWA_TRANSITIONS_FORCEDISABLED,
+            //            ref enable, Marshal.SizeOf(enable));
+            //    }
+            //}
+            base.OnHandleCreated(e);
+        }
+
+        private void OnFlattenMDIBorderChanged()
+        {
+            if (this.IsMdiContainer && this.IsHandleCreated)
+            {
+                BarUtilities.ChangeMDIClientBorder(this, m_FlattenMDIBorder);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the form's window state.
+        /// </summary>
+        [Browsable(true), DefaultValue(FormWindowState.Normal)]
+        public new FormWindowState WindowState
+        {
+            get
+            {
+                if (m_TrackWindowStateSetting)
+                    return m_WindowStateDelayed;
+                return base.WindowState;
+            }
+            set
+            {
+                //if (!m_IsLoaded)
+                //{
+                //    m_TrackWindowStateSetting = true;
+                //    m_WindowStateDelayed = value;
+                //}
+                //else
+                base.WindowState = value;
+                if (value == FormWindowState.Maximized && !this.IsHandleCreated && !m_IsLoaded)
+                    this.StartPosition = FormStartPosition.CenterScreen;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether custom style for the form is enabled. Default value is true.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool EnableCustomStyle
+        {
+            get { return m_EnableCustomStyle; }
+            set
+            {
+                m_EnableCustomStyle = value;
+                OnEnableCustomStyleChanged();
+            }
+        }
+
+        /// <summary>
+        /// Called when EnableCustomStyle property has changed.
+        /// </summary>
+        protected virtual void OnEnableCustomStyleChanged()
+        {
+            this.Region = null;
+            FormBorderStyle fbs = this.FormBorderStyle;
+            this.FormBorderStyle = FormBorderStyle.None;
+            this.FormBorderStyle = fbs;
+            if (this.IsGlassEnabled)
+                WinApi.ExtendGlass(this.Handle, 0);
+        }
+
+        /// <summary>
+        /// Gets whether custom form styling is enabled.
+        /// </summary>
+        /// <returns>true if custom styling is enabled otherwise false.</returns>
+        protected virtual bool IsCustomFormStyleEnabled()
+        {
+            return m_EnableCustomStyle;
+        }
+
+        /// <summary>
+        /// Gets or sets top left rounded corner size. Default value is 6.
+        /// </summary>
+        [Browsable(true), DefaultValue(6), Description("Indicates top left rounded corner size"), Category("Border")]
+        public int TopLeftCornerSize
+        {
+            get { return m_TopLeftCornerSize; }
+            set
+            {
+                if (value < 0) value = 0;
+                m_TopLeftCornerSize = value;
+                this.Region = null;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets top right rounded corner size. Default value is 6.
+        /// </summary>
+        /// 
+        [Browsable(true), DefaultValue(6), Description("Indicates top right rounded corner size"), Category("Border")]
+        public int TopRightCornerSize
+        {
+            get { return m_TopRightCornerSize; }
+            set
+            {
+                if (value < 0) value = 0;
+                m_TopRightCornerSize = value;
+                this.Region = null;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets bottom left rounded corner size. Default value is 6.
+        /// </summary>
+        [Browsable(true), DefaultValue(6), Description("Indicates bottom left rounded corner size"), Category("Border")]
+        public int BottomLeftCornerSize
+        {
+            get { return m_BottomLeftCornerSize; }
+            set
+            {
+                if (value < 0) value = 0;
+                m_BottomLeftCornerSize = value;
+                this.Region = null;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets bottom right rounded corner size. Default value is 6.
+        /// </summary>
+        [Browsable(true), DefaultValue(6), Description("Indicates bottom right rounded corner size"), Category("Border")]
+        public int BottomRightCornerSize
+        {
+            get { return m_BottomRightCornerSize; }
+            set
+            {
+                if (value < 0) value = 0;
+                m_BottomRightCornerSize = value;
+                this.Region = null;
+            }
+        }
+
+        /// <summary>
+        /// Gets whether client border is painted in OnPaint method.
+        /// </summary>
+        protected virtual bool PaintClientBorder
+        {
+            get { return _NonClientPaintEnabled && IsCustomFormStyleEnabled(); }
+        }
+
+        /// <summary>
+        /// Gets whether ribbon control caption is painted
+        /// </summary>
+        protected virtual bool PaintRibbonCaption
+        {
+            get { return _NonClientPaintEnabled && m_RibbonControl != null; }
+        }
+
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            if (this.HasCustomRegion && this.Region == null)
+                this.Region = GetRegion();
+
+            if (this.IsGlassEnabled && m_GlassHeight > 0)
+            {
+                e.Graphics.SetClip(new Rectangle(0, 0, this.Width, m_GlassHeight), CombineMode.Exclude);
+            }
+
+            base.OnPaint(e);
+
+            if (PaintClientBorder && !this.IsGlassEnabled)
+                PaintFormBorder(e);
+
+            if (PaintRibbonCaption && !this.IsGlassEnabled)
+                PaintCaptionParts(e.Graphics);
+        }
+
+        protected override void OnPaintBackground(PaintEventArgs e)
+        {
+            Graphics g = e.Graphics;
+            if (this.IsGlassEnabled && m_GlassHeight > 0)
+            {
+                g.SetClip(new Rectangle(0, 0, this.Width, m_GlassHeight), CombineMode.Exclude);
+            }
+
+            using (SolidBrush brush = new SolidBrush(this.BackColor))
+                e.Graphics.FillRectangle(brush, new Rectangle(0, 0, this.Width, this.Height));
+
+            if (_BackgroundImageUnderCaption && this.BackgroundImage != null)
+            {
+                //using (SolidBrush brush = new SolidBrush(this.BackColor))
+                //    g.FillRectangle(brush, this.ClientRectangle);
+                Rectangle r = this.ClientRectangle;
+                // Offset it for caption height
+                NonClientInfo info = GetNonClientInfo();
+                r.Y -= info.CaptionTotalHeight;
+                r.Height += info.CaptionTotalHeight;
+                r.X -= info.LeftBorder;
+                BarFunctions.PaintBackgroundImage(g, r, this.BackgroundImage,
+                    GetBackgroundImagePosition(this.BackgroundImageLayout), 255);
+            }
+            else
+            {
+                if (BackgroundImage != null)
+                    BarFunctions.PaintBackgroundImage(g, this.ClientRectangle, this.BackgroundImage,
+                    GetBackgroundImagePosition(this.BackgroundImageLayout), 255);
+                base.OnPaintBackground(e);
+            }
+        }
+        protected eStyleBackgroundImage GetBackgroundImagePosition(ImageLayout layout)
+        {
+            if (layout == ImageLayout.Center)
+                return eStyleBackgroundImage.Center;
+            else if (layout == ImageLayout.None)
+                return eStyleBackgroundImage.TopLeft;
+            else if (layout == ImageLayout.Stretch)
+                return eStyleBackgroundImage.Stretch;
+            else if (layout == ImageLayout.Tile)
+                return eStyleBackgroundImage.Tile;
+            else if (layout == ImageLayout.Zoom)
+                return eStyleBackgroundImage.Zoom;
+            return eStyleBackgroundImage.TopLeft;
+        }
+        protected virtual void PaintFormBorder(PaintEventArgs e)
+        {
+            PaintFormBorder(e.Graphics, BorderSize, false);
+        }
+
+        protected virtual void PaintNonClientBackgroundImage(Graphics g, Rectangle targetRectangle)
+        {
+            if (_BackgroundImageUnderCaption && this.BackgroundImage != null)
+            {
+                BarFunctions.PaintBackgroundImage(g, targetRectangle, this.BackgroundImage, GetBackgroundImagePosition(this.BackgroundImageLayout), 255);
+            }
+        }
+
+        protected virtual void PaintFormBorder(Graphics g, int borderSize, bool borderOnly)
+        {
+            if (this.IsGlassEnabled) return;
+
+            if (!borderOnly && !this.BackColor.IsEmpty && this.BackColor != Color.Transparent)
+            {
+                //g.Clear(this.BackColor);
+                Rectangle rb = this.ClientRectangle;
+                rb.Inflate(1, 1);
+                using (SolidBrush cb = new SolidBrush(this.BackColor))
+                    g.FillRectangle(cb, rb);
+            }
+
+            if (!borderOnly)
+                PaintNonClientBackgroundImage(g, this.ClientRectangle);
+
+            Color[] borders = GetBorderColors(borderSize);
+
+            Rectangle r = new Rectangle(0, 0, this.Width - 1, this.Height - 1);
+
+            SmoothingMode sm = g.SmoothingMode;
+            g.SmoothingMode = SmoothingMode.None;
+
+            if (!borderOnly && borders.Length > 1)
+            {
+                using (SolidBrush brush = new SolidBrush(borders[borders.Length - 1]))
+                {
+                    g.FillRectangle(brush, new Rectangle(0, 0, 8, 8));
+                    g.FillRectangle(brush, new Rectangle(this.Width - 8, 0, 8, 8));
+                }
+            }
+
+            int colorTableIndex = 0;
+            for (int i = 0; i < borderSize; i++)
+            {
+                Color color = borders[colorTableIndex];
+                if (borderOnly && color == this.BackColor) break;
+                using (GraphicsPath path = GetFormPath(r))
+                {
+                    DisplayHelp.DrawGradientPathBorder(g, path, color, Color.Empty, 90, 1);
+                }
+                r.Inflate(-1, -1);
+
+                if (colorTableIndex < borders.Length - 1)
+                    colorTableIndex++;
+            }
+
+            if (!borderOnly && m_RibbonControl != null && m_RibbonControl.Visible && m_RibbonControl.Expanded && StyleManager.IsMetro(StyleManager.Style))
+            {
+                if (GlobalManager.Renderer is Office2007Renderer)
+                {
+                    Office2007RibbonColorTable ct = ((Office2007Renderer)GlobalManager.Renderer).ColorTable.RibbonControl;
+                    Point p = this.PointToClient(m_RibbonControl.RibbonStrip.PointToScreen(new Point(0, m_RibbonControl.RibbonStrip.Height)));
+                    using (SolidBrush brush = new SolidBrush(ct.PanelTopBackground.Start))
+                    {
+                        Rectangle borderPart = new Rectangle(1, p.Y, borderSize - 1, m_RibbonControl.Height - m_RibbonControl.RibbonStrip.Height - m_RibbonControl.Padding.Bottom);
+                        g.FillRectangle(brush, borderPart);
+                        borderPart.X = this.Width - borderSize;
+                        g.FillRectangle(brush, borderPart);
+                    }
+                }
+            }
+
+            g.SmoothingMode = sm;
+        }
+
+        protected virtual void PaintCaptionParts(Graphics g)
+        {
+            if (m_RibbonControl == null || !m_RibbonControl.CaptionVisible) return;
+            if (m_DisplayRectangleReductionHorizontal <= 2)
+                return;
+            RibbonControlRendererEventArgs e = new RibbonControlRendererEventArgs(g, m_RibbonControl, this.IsGlassEnabled);
+            e.ItemPaintArgs = m_RibbonControl.RibbonStrip.GetItemPaintArgs(g);
+            BaseRenderer r = m_RibbonControl.RibbonStrip.GetRenderer();
+            if (r == null) return;
+            Region oldClip = g.Clip;
+            Rectangle formRect = new Rectangle(1, 1, this.Width - 3, this.Height - 3);
+            eDotNetBarStyle effectiveStyle = m_RibbonControl.EffectiveStyle;
+            if (effectiveStyle == eDotNetBarStyle.Office2010)
+                formRect = new Rectangle(2, 2, this.Width - 5, this.Height - 4);
+            else if (StyleManager.IsMetro(effectiveStyle))
+                formRect = new Rectangle(1, 1, this.Width - 3, this.Height - 3);
+
+            Region formRegion = GetRegion(formRect);
+            int part = m_DisplayRectangleReductionHorizontal;
+            Rectangle excludeRect = new Rectangle(formRect.X, m_RibbonControl.RibbonStrip.CaptionBounds.Height + 5,
+                formRect.Width, this.Height - (m_RibbonControl.RibbonStrip.CaptionBounds.Height + 2));
+
+            g.SetClip(formRegion, CombineMode.Replace);
+            g.SetClip(excludeRect, CombineMode.Exclude);
+            g.TranslateTransform(1, 1);
+            r.DrawRibbonControlBackground(e);
+            r.DrawQuickAccessToolbarBackground(e); // Will not be needed with latest Office 2007 style
+
+            if (StyleManager.IsMetro(effectiveStyle))
+            {
+                if (m_RibbonControl.GetApplicationButton() != null)
+                {
+                    ButtonItem appButton = m_RibbonControl.GetApplicationButton() as ButtonItem;
+                    g.TranslateTransform(-1, 0);
+                    if (appButton != null && appButton.Displayed)
+                    {
+                        g.SetClip(formRegion, CombineMode.Replace);
+                        r.DrawButtonItem(new ButtonItemRendererEventArgs(g, appButton, m_RibbonControl.RibbonStrip.GetItemPaintArgs(g)));
+                        if (m_RibbonControl.Expanded)
+                        {
+                            g.TranslateTransform(0, 1);
+                            r.DrawButtonItem(new ButtonItemRendererEventArgs(g, appButton, m_RibbonControl.RibbonStrip.GetItemPaintArgs(g)));
+                        }
+                    }
+                }
+                g.ResetTransform();
+                if (m_RibbonControl.TabGroups.Count > 0)
+                {
+                    g.SetClip(formRegion, CombineMode.Replace);
+                    g.TranslateTransform(m_RibbonControl.Left, 0);
+                    m_RibbonControl.RibbonStrip.PaintTabGroups(m_RibbonControl.RibbonStrip.GetItemPaintArgs(g));
+                    g.ResetTransform();
+                }
+                Office2007ColorTable table = ((Office2007Renderer)r).ColorTable;
+                if (m_RibbonControl.Expanded && !table.RibbonControl.OuterBorder.Start.IsEmpty)
+                {
+                    using (Pen pen = new Pen(table.RibbonControl.OuterBorder.Start))
+                    {
+                        g.DrawLine(pen, this.Width - 5, m_RibbonControl.RibbonStrip.Height, this.Width - 1, m_RibbonControl.RibbonStrip.Height);
+                        g.DrawLine(pen, this.Width - 5, m_RibbonControl.Height - m_RibbonControl.Padding.Bottom, this.Width - 1, m_RibbonControl.Height - m_RibbonControl.Padding.Bottom);
+                        g.DrawLine(pen, 1, m_RibbonControl.Height - m_RibbonControl.Padding.Bottom, 5, m_RibbonControl.Height - m_RibbonControl.Padding.Bottom);
+                    }
+                }
+                if ((StyleManager.Style == eStyle.OfficeMobile2014 || StyleManager.Style == eStyle.Office2016) && !table.RibbonControl.TabsBackground.IsEmpty)
+                {
+                    Region currentClip = g.Clip;
+                    g.ResetClip();
+                    DisplayHelp.FillRectangle(g,
+                        new Rectangle(this.Width - 14, m_RibbonControl.RibbonStrip.CaptionBounds.Height, 
+                            14, m_RibbonControl.RibbonStrip.Height - m_RibbonControl.RibbonStrip.CaptionBounds.Height + 1), 
+                            table.RibbonControl.TabsBackground);
+                    DisplayHelp.FillRectangle(g,
+                        new Rectangle(1, m_RibbonControl.RibbonStrip.CaptionBounds.Height, 
+                            5, m_RibbonControl.RibbonStrip.Height - m_RibbonControl.RibbonStrip.CaptionBounds.Height+1), 
+                            table.RibbonControl.TabsBackground);
+                    g.Clip = currentClip;
+                    if (currentClip != null) currentClip.Dispose();
+                }
+            }
+
+            g.ResetTransform();
+
+            if (m_RibbonControl.BackgroundImage != null && !m_RibbonControl.RibbonStrip.IsBackstageOpen)
+            {
+                Rectangle br = new Rectangle(1, 1, this.Width - 2, m_RibbonControl.RibbonStrip.Height - m_RibbonControl.Padding.Bottom);
+                BarFunctions.PaintBackgroundImage(g, br, m_RibbonControl.BackgroundImage,
+                m_RibbonControl.BackgroundImagePosition, 255);
+            }
+
+            // Draw Status bar if any...
+            Bar statusBar = GetStatusBar();
+            if (statusBar != null && BarFunctions.IsOffice2007Style(statusBar.Style) && !statusBar.IsThemed)
+            {
+                r = statusBar.GetRenderer();
+                if (r != null)
+                {
+                    g.SetClip(formRegion, CombineMode.Replace);
+                    //g.FillRectangle(Brushes.Red, new Rectangle(0, statusBar.Top, this.Width, statusBar.Height + 4));
+
+                    ToolbarRendererEventArgs te = new ToolbarRendererEventArgs(statusBar, g, new Rectangle(0, statusBar.Top, this.Width, statusBar.Height + 4));
+                    te.ItemPaintArgs = statusBar.GetItemPaintArgs(g);
+                    te.ItemPaintArgs.CachedPaint = true;
+                    r.DrawToolbarBackground(te);
+                }
+            }
+
+            g.Clip = oldClip;
+            if (oldClip != null) oldClip.Dispose();
+            formRegion.Dispose();
+        }
+
+        private Bar GetStatusBar()
+        {
+            foreach (Control c in this.Controls)
+            {
+                if (c.Dock == DockStyle.Bottom && c is Bar)
+                    return c as Bar;
+            }
+
+            return null;
+        }
+
+        internal int BorderSize
+        {
+            get
+            {
+                return GetBorderColors(0).Length;
+            }
+        }
+
+        /// <summary>
+        /// Gets the array of LinearGradientColorTable objects that describe the border colors. The colors with index 0 is used as the outer most
+        /// border.
+        /// </summary>
+        /// <returns>Array of LinearGradientColorTable</returns>
+        protected virtual Color[] GetBorderColors(int borderSize)
+        {
+            if (GlobalManager.Renderer is Office2007Renderer)
+            {
+                Office2007FormStateColorTable ct = ((Office2007Renderer)GlobalManager.Renderer).ColorTable.Form.Active;
+                if (!m_NonClientActive && !this.DesignMode) ct = ((Office2007Renderer)GlobalManager.Renderer).ColorTable.Form.Inactive;
+                return ct.BorderColors;
+            }
+            else
+            {
+                return new Color[] {
+                Color.FromArgb(59, 90 , 130),
+                Color.FromArgb(177, 198, 225)};
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether 3D MDI border is removed. Default value is true.
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Appearance"), Description("Indicates whether 3D MDI border is removed.")]
+        public bool FlattenMDIBorder
+        {
+            get
+            {
+                return m_FlattenMDIBorder;
+            }
+            set
+            {
+                m_FlattenMDIBorder = value;
+                OnFlattenMDIBorderChanged();
+            }
+        }
+
+#if FRAMEWORK20
+        public override Rectangle DisplayRectangle
+        {
+            get
+            {
+                Rectangle r = base.DisplayRectangle;
+                r = ReduceDisplayRectangle(r);
+                return r;
+            }
+        }
+#endif
+
+        protected virtual Rectangle ReduceDisplayRectangle(Rectangle r)
+        {
+            if (IsCustomFormStyleEnabled() && !this.IsGlassEnabled)
+            {
+                r.Inflate(-m_DisplayRectangleReductionHorizontal, 0);
+                r.Y += m_DisplayRectangleReductionTop;
+                r.Height -= (m_DisplayRectangleReductionTop + m_DisplayRectangleReductionBottom);
+            }
+
+            return r;
+        }
+
+        protected override void OnResize(EventArgs e)
+        {
+            if (this.HasCustomRegion)
+            {
+                this.Region = GetRegion();
+                this.Invalidate();
+            }
+            base.OnResize(e);
+        }
+
+        /// <summary>
+        /// Gets whether form uses custom region
+        /// </summary>
+        protected virtual bool HasCustomRegion
+        {
+            get { return true && IsCustomFormStyleEnabled() && !this.IsGlassEnabled; }
+        }
+
+        /// <summary>
+        /// Returns form custom region.
+        /// </summary>
+        /// <returns>New instance of the custom region.</returns>
+        protected virtual Region GetRegion()
+        {
+            bool customStyleEnabled = IsCustomFormStyleEnabled();
+
+            if (customStyleEnabled && this.WindowState == FormWindowState.Maximized && BarFunctions.ThemedOS && !Themes.ThemesActive)
+            {
+                NonClientInfo nci = GetNonClientInfo();
+                int border = nci.LeftBorder /* * NativeFunctions.BorderMultiplierFactor */;
+                return GetRegion(new Rectangle(border, 0, this.Width - (border * 2 + 1), this.Height - 1));
+            }
+
+            if (this.WindowState == FormWindowState.Maximized || !customStyleEnabled)
+                return null;
+
+            return GetRegion(new Rectangle(0, 0, this.Width - 1, this.Height - 1));
+        }
+
+        private Region GetRegion(Rectangle bounds)
+        {
+            GraphicsPath path = GetFormPath(bounds);
+            Region r = new Region();
+            r.MakeEmpty();
+            r.Union(path);
+
+            // Widen path for the border...
+            path.Widen(SystemPens.Control);
+            Region r2 = new Region(path);
+            r.Union(path);
+            path.Dispose();
+            return r;
+        }
+
+        /// <summary>
+        /// Gets the form path for the given input bounds.
+        /// </summary>
+        /// <param name="bounds">Represent the form bounds.</param>
+        /// <returns></returns>
+        protected virtual GraphicsPath GetFormPath(Rectangle bounds)
+        {
+            GraphicsPath path = new GraphicsPath();
+            Rectangle r = bounds;
+
+            if (StyleManager.IsMetro(StyleManager.GetEffectiveStyle()))
+            {
+                path.AddRectangle(r);
+                return path;
+            }
+
+            bool rightToLeft = (this.RightToLeft == RightToLeft.Yes);
+            ArcData arc;
+
+            int cornerSize = (rightToLeft ? m_TopRightCornerSize : (m_TopLeftCornerSize + (m_TopLeftCornerSize > 0 ? 1 : 0)));
+            if (cornerSize > 0)
+            {
+                arc = ElementStyleDisplay.GetCornerArc(r, cornerSize, eCornerArc.TopLeft);
+                path.AddArc(arc.X, arc.Y, arc.Width, arc.Height, arc.StartAngle, arc.SweepAngle);
+            }
+            else
+            {
+                path.AddLine(bounds.X, bounds.Y + 2, bounds.X, bounds.Y);
+                path.AddLine(bounds.X, bounds.Y, bounds.X + 2, bounds.Y);
+            }
+
+            cornerSize = (rightToLeft ? m_TopLeftCornerSize + m_TopLeftCornerSize > 0 ? 1 : 0 : m_TopRightCornerSize);
+            if (cornerSize > 0)
+            {
+                arc = ElementStyleDisplay.GetCornerArc(r, cornerSize, eCornerArc.TopRight);
+                path.AddArc(arc.X, arc.Y, arc.Width, arc.Height, arc.StartAngle, arc.SweepAngle);
+            }
+            else
+            {
+                path.AddLine(bounds.Right - 2, bounds.Y, bounds.Right, bounds.Y);
+                path.AddLine(bounds.Right, bounds.Y, bounds.Right, bounds.Y + 2);
+            }
+
+            if (m_BottomRightCornerSize > 0)
+            {
+                arc = ElementStyleDisplay.GetCornerArc(r, m_BottomRightCornerSize, eCornerArc.BottomRight);
+                path.AddArc(arc.X, arc.Y, arc.Width, arc.Height, arc.StartAngle, arc.SweepAngle);
+            }
+            else
+            {
+                path.AddLine(bounds.Right, bounds.Bottom - 2, bounds.Right, bounds.Bottom);
+                path.AddLine(bounds.Right, bounds.Bottom, bounds.Right - 2, bounds.Bottom);
+            }
+
+            if (m_BottomLeftCornerSize > 0)
+            {
+                arc = ElementStyleDisplay.GetCornerArc(r, m_BottomLeftCornerSize, eCornerArc.BottomLeft);
+                path.AddArc(arc.X, arc.Y, arc.Width, arc.Height, arc.StartAngle, arc.SweepAngle);
+            }
+            else
+            {
+                path.AddLine(bounds.X + 2, bounds.Bottom, bounds.X, bounds.Bottom);
+                path.AddLine(bounds.X, bounds.Bottom, bounds.X, bounds.Bottom - 2);
+            }
+
+            path.CloseAllFigures();
+
+            return path;
+        }
+
+        //protected override void OnPaintBackground(PaintEventArgs e)
+        //{
+        //    base.OnPaintBackground(e);
+        //    Graphics g = e.Graphics;
+        //    Rectangle r = new Rectangle(0,0,this.Width-1, this.Height-1);
+        //    using (GraphicsPath path = GetFormPath(r))
+        //    {
+        //        using (Pen pen = new Pen(Color.Red, 1))
+        //        {
+        //            path.Widen(pen);
+        //            SmoothingMode sm = g.SmoothingMode;
+        //            g.SmoothingMode = SmoothingMode.HighQuality;
+        //            g.DrawPath(pen, path);
+        //            //g.FillPath(SystemBrushes.ControlDarkDark, path);
+        //            g.SmoothingMode = sm;
+        //        }
+        //    }
+        //}
+
+        #region Non-client area painting
+        /// <summary>
+        /// Paints the non-client area of the form.
+        /// </summary>
+        protected virtual bool WindowsMessageNCPaint(ref Message m)
+        {
+            if (this.IsGlassEnabled)
+            {
+                return true;
+            }
+            else
+            {
+                if (BarFunctions.IsVista && !BarFunctions.IsWindows7 && _NonClientPaintEnabled)
+                {
+                    IntPtr dc = WinApi.GetWindowDC(this.Handle);
+                    try
+                    {
+                        using (Graphics g = Graphics.FromHdc(dc))
+                        {
+                            BufferedBitmap bmp = new BufferedBitmap(g, new Rectangle(0, 0, this.Width, this.Height));
+                            try
+                            {
+                                bmp.Graphics.SetClip(this.GetClientRectangle(new Rectangle(0, 0, this.Width, this.Height)), CombineMode.Exclude);
+                                PaintFormBorder(new PaintEventArgs(bmp.Graphics, Rectangle.Empty));
+                                bmp.Render(g, this.GetClientRectangle(new Rectangle(0, 0, this.Width, this.Height)));
+                            }
+                            finally
+                            {
+                                bmp.Dispose();
+                            }
+                        }
+                    }
+                    finally
+                    {
+                        WinApi.ReleaseDC(this.Handle, dc);
+                    }
+                }
+                
+                m.Result = IntPtr.Zero;
+                return false;
+            }
+        }
+
+        internal bool NonClientActive
+        {
+            get { return m_NonClientActive; }
+            set { m_NonClientActive = value; }
+        }
+        #endregion
+
+        #region Non-client area handling
+        protected virtual bool WindowsMessageNCCalcSize(ref Message m)
+        {
+            // Default implementation of ribbon form does not have non-client area at all...
+            if (m.WParam == IntPtr.Zero)
+            {
+                WinApi.RECT r = (WinApi.RECT)Marshal.PtrToStructure(m.LParam, typeof(WinApi.RECT));
+                WinApi.RECT newClientRect = WinApi.RECT.FromRectangle(GetClientRectangle(r.ToRectangle())); //WinApi.RECT newClientRect = new WinApi.RECT(r.Left, r.Top, r.Right, r.Bottom);
+                Marshal.StructureToPtr(newClientRect, m.LParam, false);
+                m.Result = IntPtr.Zero;
+            }
+            else
+            {
+                WinApi.NCCALCSIZE_PARAMS csp;
+                csp = (WinApi.NCCALCSIZE_PARAMS)Marshal.PtrToStructure(m.LParam, typeof(WinApi.NCCALCSIZE_PARAMS));
+
+                WinApi.WINDOWPOS pos = (WinApi.WINDOWPOS)Marshal.PtrToStructure(csp.lppos, typeof(WinApi.WINDOWPOS));
+
+                WinApi.RECT newClientRect = WinApi.RECT.FromRectangle(GetClientRectangle(new Rectangle(pos.x, pos.y, pos.cx, pos.cy)));  //WinApi.RECT newClientRect = new WinApi.RECT(pos.x, pos.y, (pos.x + pos.cx), (pos.y + pos.cy));
+
+                csp.rgrc0 = newClientRect;
+                csp.rgrc1 = newClientRect;
+                Marshal.StructureToPtr(csp, m.LParam, false);
+                m.Result = new IntPtr((int)WinApi.WindowsMessages.WVR_VALIDRECTS);
+            }
+
+            return false;
+        }
+        internal NonClientInfo GetNonClientInfo()
+        {
+            WinApi.RECT rect = new WinApi.RECT(0, 0, 200, 200);
+            CreateParams params1 = this.CreateParams;
+            WinApi.AdjustWindowRectEx(ref rect, params1.Style, false, params1.ExStyle);
+
+            NonClientInfo n = new NonClientInfo();
+            n.CaptionTotalHeight = Math.Abs(rect.Top);
+            n.BottomBorder = rect.Height - 200 - n.CaptionTotalHeight;
+            n.LeftBorder = Math.Abs(rect.Left);
+            n.RightBorder = rect.Width - 200 - n.LeftBorder;
+            // Removed this code since the non-client area even with FormBorderStyle.FixedSingle is still 8 pixels system default
+            //if (FormBorderStyle == FormBorderStyle.FixedSingle)
+            //{
+            //    n.BottomBorder = 1;
+            //    n.LeftBorder = 1;
+            //    n.RightBorder = 1;
+            //}
+            return n;
+        }
+        protected virtual Rectangle GetClientRectangle(Rectangle r)
+        {
+            if (this.WindowState == FormWindowState.Maximized && !this.IsGlassEnabled)
+            {
+                WinApi.RECT rect = new WinApi.RECT(0, 0, 100, 100);
+                CreateParams params1 = this.CreateParams;
+                WinApi.AdjustWindowRectEx(ref rect, params1.Style, false, params1.ExStyle);
+                Rectangle wr = rect.ToRectangle();
+                int borderWidth = Math.Abs(wr.X);
+                int borderHeight = wr.Bottom - 100;
+                int formBorderSize = 3;
+                int formBorderSizeHorizontal = m_DisplayRectangleReductionHorizontal + 1 - 3;
+
+                m_NonClientOffset.X = (borderWidth - formBorderSizeHorizontal);
+                m_NonClientOffset.Y = (borderWidth - formBorderSize - 1);
+
+                r.X += m_NonClientOffset.X;
+                r.Width -= (borderWidth * 2 - formBorderSizeHorizontal * 2 - 1);
+                r.Height -= (borderWidth * 2 - formBorderSize * 2 - 1);
+                r.Y += m_NonClientOffset.Y;
+                Screen scr = Screen.FromHandle(this.Handle);
+                if (r.Height > scr.Bounds.Height && scr.Primary)
+                    r.Height = scr.Bounds.Height;
+            }
+            else
+            {
+                m_NonClientOffset = Point.Empty;
+                if (IsGlassEnabled)
+                {
+                    NonClientInfo nci = GetNonClientInfo();
+                    int borderWidth = nci.LeftBorder; // SystemInformation.FrameBorderSize.Width /* *NativeFunctions.BorderMultiplierFactor*/;
+                    int borderHeight = nci.BottomBorder; // SystemInformation.FrameBorderSize.Height /* * NativeFunctions.BorderMultiplierFactor*/;
+                    //if (FormBorderStyle == FormBorderStyle.Fixed3D)
+                    //{
+                    //    borderWidth = SystemInformation.Border3DSize.Width + SystemInformation.FixedFrameBorderSize.Width;
+                    //    borderHeight = SystemInformation.Border3DSize.Height + SystemInformation.FixedFrameBorderSize.Height;
+                    //}
+                    //else if (FormBorderStyle == FormBorderStyle.FixedDialog)
+                    //{
+                    //    borderWidth = SystemInformation.FixedFrameBorderSize.Width;
+                    //    borderHeight = SystemInformation.FixedFrameBorderSize.Height;
+                    //}
+                    //else if (FormBorderStyle == FormBorderStyle.FixedSingle)
+                    //{
+                    //    borderWidth = 1;
+                    //    borderHeight = 1;
+                    //}
+                    r.X += borderWidth;
+                    r.Width -= borderWidth * 2;
+                    r.Height -= borderHeight;
+                    if (WindowState == FormWindowState.Maximized || WinApi.IsZoomed(this.Handle))
+                    {
+                        Screen scr = Screen.FromHandle(this.Handle);
+                        if (r.Height > scr.Bounds.Height && scr.Primary)
+                            r.Height = scr.Bounds.Height + borderHeight - 2;
+                    }
+                }
+                else if (BarFunctions.IsVista && !BarFunctions.IsWindows7)
+                    r.Height--;
+            }
+
+            return r;
+        }
+
+        /// <summary>
+        /// Gets whether Windows Glass effect is rendered on the form when supported by Operating System and enabled using EnableGlass.
+        /// </summary>
+        [Browsable(false)]
+        public bool IsGlassEnabled
+        {
+            get
+            {
+                if (this.DesignMode || this.IsMdiChild || StyleManager.IsMetro(StyleManager.Style) || BarFunctions.IsWindows10) return false;
+                return m_IsGlassEnabled && m_EnableGlass;
+            }
+        }
+
+        /// <summary>
+        /// Called when WM_NCACTIVATE message is received.
+        /// </summary>
+        /// <param name="m">Reference to message data.</param>
+        /// <returns>Return true to call base form implementation otherwise return false.</returns>
+        protected virtual bool WindowsMessageNCActivate(ref Message m)
+        {
+            if (m.WParam != IntPtr.Zero)
+                m_NonClientActive = true;
+            else
+                m_NonClientActive = false;
+
+            if (m_RibbonControl != null && StyleManager.IsMetro(m_RibbonControl.EffectiveStyle) && m_RibbonControl.GetApplicationButton() != null && m_RibbonControl.GetApplicationButton().Expanded)
+            {
+                NativeFunctions.LockWindowUpdate(this.Handle);
+                base.WndProc(ref m);
+                NativeFunctions.LockWindowUpdate(IntPtr.Zero);
+                if (this.WindowState == FormWindowState.Maximized)
+                {
+                    ApplicationButton appButton = m_RibbonControl.GetApplicationButton() as ApplicationButton;
+                    if (appButton != null && appButton.BackstageTab != null)
+                        appButton.BackstageTab.Refresh();
+                    m_RibbonControl.Refresh();
+                }
+                return false;
+            }
+
+            CreateCashedCaptionBitmap();
+            IntPtr oldLParam = m.LParam;
+            m.LParam = new IntPtr(-1);
+            base.WndProc(ref m);
+            m.LParam = oldLParam;
+
+            //WinApi.DefWindowProc(m.HWnd, WinApi.WindowsMessages.WM_NCACTIVATE, m.WParam, new IntPtr(-1));
+            DrawCashedCaptionBitmap();
+
+            if (!m_NonClientActive && BarFunctions.IsWindowsXP && WindowState == FormWindowState.Maximized)
+            {
+                if (m_RibbonControl != null) m_RibbonControl.Invalidate(true);
+            }
+            return false;
+        }
+
+        #region Cashed Drawing of ribbon caption
+        private BufferedBitmap m_CashedCaptionBitmap = null;
+        private Rectangle[] m_CashedCaptionRegion = null;
+        private Point m_CashedCaptionBitmapLocation = Point.Empty;
+        private void CreateCashedCaptionBitmap()
+        {
+            if (m_RibbonControl == null || this.WindowState == FormWindowState.Minimized || !this.IsHandleCreated || !m_RibbonControl.IsHandleCreated || m_RibbonControl.RibbonStrip == null
+                || m_RibbonControl.RibbonStrip.Width <= 0 || m_RibbonControl.RibbonStrip.Height <= 0 || !m_RibbonControl.Visible)
+                return;
+            if (m_CashedCaptionBitmap != null)
+            {
+                m_CashedCaptionBitmap.Dispose();
+                m_CashedCaptionBitmap = null;
+            }
+            if (m_CashedCaptionRegion != null)
+            {
+                m_CashedCaptionRegion = null;
+            }
+
+            Rectangle r = m_RibbonControl.RibbonStrip.Bounds;
+            r.Location = m_RibbonControl.PointToScreen(r.Location);
+            r.Location = this.PointToClient(r.Location);
+            NonClientInfo nci = GetNonClientInfo();
+            if (this.IsGlassEnabled) r.X += nci.LeftBorder /* * NativeFunctions.BorderMultiplierFactor*/;
+            m_CashedCaptionBitmapLocation = r.Location;
+            if (this.WindowState == FormWindowState.Maximized)
+                m_CashedCaptionBitmapLocation.Offset(m_NonClientOffset.X, m_NonClientOffset.Y);
+
+            ArrayList clips = new ArrayList(10);
+            Size bmpSize = new Size(m_RibbonControl.RibbonStrip.Width, Math.Min(m_RibbonControl.RibbonStrip.Height, m_RibbonControl.Height));
+            
+            IntPtr hdc = WinApi.GetWindowDC(this.Handle);
+            m_CashedCaptionBitmap = new BufferedBitmap(hdc, new Rectangle(m_CashedCaptionBitmapLocation, bmpSize));
+            WinApi.ReleaseDC(this.Handle, hdc);
+
+            using (PaintEventArgs paintEventArgs = new PaintEventArgs(m_CashedCaptionBitmap.Graphics, Rectangle.Empty))
+                m_RibbonControl.RibbonStrip.InternalPaint(paintEventArgs);
+
+            foreach (Control c in m_RibbonControl.RibbonStrip.Controls)
+            {
+                if (c.Visible)
+                {
+                    Rectangle rc = c.Bounds;
+                    rc.Location = m_RibbonControl.RibbonStrip.PointToScreen(rc.Location);
+                    rc.Location = this.PointToClient(rc.Location);
+                    clips.Add(rc);
+                }
+            }
+
+            m_CashedCaptionRegion = new Rectangle[clips.Count];
+            clips.CopyTo(m_CashedCaptionRegion);
+        }
+        private void DrawCashedCaptionBitmap()
+        {
+            if (m_CashedCaptionBitmap == null)
+                return;
+            try
+            {
+                IntPtr dc = WinApi.GetWindowDC(this.Handle);
+                try
+                {
+                    using (Graphics g = Graphics.FromHdc(dc))
+                    {
+                        m_CashedCaptionBitmap.Render(g, m_CashedCaptionRegion);
+                    }
+                }
+                finally
+                {
+                    WinApi.ReleaseDC(this.Handle, dc);
+                }
+            }
+            finally
+            {
+                m_CashedCaptionBitmap.Dispose();
+                m_CashedCaptionBitmap = null;
+                m_CashedCaptionRegion = null;
+            }
+
+            if (System.Environment.OSVersion.Version.Major >= 6)
+            {
+                this.RedrawBorder();
+            }
+            else
+            {
+                if (m_RibbonControl != null)
+                {
+                    foreach (Control c in m_RibbonControl.RibbonStrip.Controls)
+                    {
+                        if (c.Visible)
+                        {
+                            c.Refresh();
+                        }
+                    }
+                }
+            }
+        }
+
+        //private void RedrawRibbonCaption()
+        //{
+        //    if (m_RibbonControl == null || !this.IsHandleCreated)
+        //        return;
+
+        //    Bitmap bmp = new Bitmap(m_RibbonControl.RibbonStrip.Width, m_RibbonControl.RibbonStrip.Height);
+        //    using (Graphics g = Graphics.FromImage(bmp))
+        //    {
+        //        m_RibbonControl.RibbonStrip.InternalPaint(new PaintEventArgs(g, Rectangle.Empty));
+        //    }
+
+        //    IntPtr dc = GetWindowDC(this.Handle);
+        //    try
+        //    {
+        //        using (Graphics g = Graphics.FromHdc(dc))
+        //        {
+        //            Rectangle r = m_RibbonControl.RibbonStrip.Bounds;
+        //            r.Location = m_RibbonControl.PointToScreen(r.Location);
+        //            r.Location = this.PointToClient(r.Location);
+        //            g.SetClip(r);
+        //            foreach (Control c in m_RibbonControl.RibbonStrip.Controls)
+        //            {
+        //                if (c.Visible)
+        //                {
+        //                    Rectangle rc = c.Bounds;
+        //                    rc.Location = m_RibbonControl.RibbonStrip.PointToScreen(rc.Location);
+        //                    rc.Location = this.PointToClient(rc.Location);
+        //                    g.SetClip(rc, CombineMode.Exclude);
+        //                }
+        //            }
+
+        //            //g.DrawImage(bmp, r.Location);
+        //            g.TranslateTransform(r.Location.X, r.Location.Y);
+        //            m_RibbonControl.RibbonStrip.InternalPaint(new PaintEventArgs(g, m_RibbonControl.RibbonStrip.ClientRectangle));
+        //        }
+        //    }
+        //    finally
+        //    {
+        //        ReleaseDC(this.Handle, dc);
+        //    }
+        //    //bmp.Save(@"c:\denis.png", System.Drawing.Imaging.ImageFormat.Png);
+        //    //bmp.Dispose();
+        //}
+        #endregion
+
+        protected virtual void Redraw()
+        {
+            if (this.WindowState != FormWindowState.Minimized)
+            {
+                WinApi.RedrawWindow(this.Handle, IntPtr.Zero, IntPtr.Zero, WinApi.RedrawWindowFlags.RDW_UPDATENOW |
+                    WinApi.RedrawWindowFlags.RDW_INVALIDATE | WinApi.RedrawWindowFlags.RDW_INTERNALPAINT | WinApi.RedrawWindowFlags.RDW_ALLCHILDREN);
+            }
+        }
+
+        protected virtual void RedrawBorder()
+        {
+            Region r = new Region();
+            Size bs = new Size(SystemInformation.Border3DSize.Width /* * NativeFunctions.BorderMultiplierFactor*/,
+                SystemInformation.Border3DSize.Height /* * NativeFunctions.BorderMultiplierFactor*/);
+            r.Union(new Rectangle(0, 0, this.Width, bs.Height));
+            r.Union(new Rectangle(this.Height - bs.Height, 0, this.Width, bs.Height));
+            r.Union(new Rectangle(0, 0, bs.Width, this.Height));
+            r.Union(new Rectangle(this.Width - bs.Width, 0, bs.Width, this.Height));
+            this.Invalidate(r, true);
+            r.Dispose();
+            this.Update();
+        }
+
+        protected virtual bool WindowsMessageNCHitTest(ref Message m)
+        {
+            // Get position being tested...
+            int x = WinApi.LOWORD(m.LParam);
+            int y = WinApi.HIWORD(m.LParam);
+            Point p = PointToClient(new Point(x, y));
+            int borderSize = Dpi.Width5;
+            int cornerPadding = 1;
+            int bottomRightCornerPadding = Dpi.Width5;
+            NonClientInfo nci = GetNonClientInfo();
+
+            if (this.IsGlassEnabled)
+            {    
+                borderSize = nci.LeftBorder /* * NativeFunctions.BorderMultiplierFactor*/;
+                IntPtr result = IntPtr.Zero;
+                WinApi.DwmDefWindowProc(this.Handle, m.Msg, m.WParam, m.LParam, out result);
+                int res = WinApi.ToInt(result);
+                //if (res == (int)WinApi.WindowHitTestRegions.MinimizeButton) Console.WriteLine("Minimize Hit Tested at {0}", p);
+                if (res == (int)WinApi.WindowHitTestRegions.MinimizeButton ||
+                    res == (int)WinApi.WindowHitTestRegions.MaximizeButton ||
+                    res == (int)WinApi.WindowHitTestRegions.CloseButton ||
+                    res == (int)WinApi.WindowHitTestRegions.ReduceButton ||
+                    res == (int)WinApi.WindowHitTestRegions.HelpButton)
+                {
+                    m.Result = result;
+                    m_GlassHitTestTrack = true;
+                    return false;
+                }
+                p.X += nci.LeftBorder /* * NativeFunctions.BorderMultiplierFactor*/;
+                //p.Y += SystemInformation.FrameBorderSize.Height * NativeFunctions.BorderMultiplierFactor;
+            }
+
+            Rectangle r = Rectangle.Empty;
+            if (IsSizable)
+            {
+                // Top border
+                int topLeftCornerSize = Dpi.Width(m_TopLeftCornerSize);
+                int bottomLeftCornerSize = Dpi.Width(m_BottomLeftCornerSize);
+                int bottomRightCornerSize = Dpi.Width(m_BottomRightCornerSize);
+                r = new Rectangle(topLeftCornerSize, 0, this.Width - (bottomLeftCornerSize + bottomRightCornerSize), borderSize);
+                if (r.Contains(p))
+                {
+                    m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.TopSizeableBorder);
+                    return false;
+                }
+                // Bottom border
+                r = new Rectangle(bottomLeftCornerSize, this.Height - borderSize, this.Width - (bottomLeftCornerSize + bottomRightCornerSize), borderSize);
+                if (r.Contains(p))
+                {
+                    m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.BottomSizeableBorder);
+                    return false;
+                }
+                // Is form mirrored?
+#if FRAMEWORK20
+                int topRightCornerSize = Dpi.Width(m_TopRightCornerSize);
+                if (this.RightToLeftLayout && this.RightToLeft == RightToLeft.Yes)
+#else
+				if (this.RightToLeft == RightToLeft.Yes)
+#endif
+                {
+                    // Top-left corner
+                    r = new Rectangle(this.Width - topRightCornerSize, 0, topRightCornerSize + cornerPadding, topRightCornerSize + cornerPadding);
+                    if (r.Contains(p))
+                    {
+                        m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.TopLeftSizeableCorner);
+                        return false;
+                    }
+                    // Top Right
+                    r = new Rectangle(0, 0, topLeftCornerSize + cornerPadding, topLeftCornerSize + cornerPadding);
+                    if (r.Contains(p))
+                    {
+                        m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.TopRightSizeableCorner);
+                        return false;
+                    }
+                    // Bottom Left
+                    r = new Rectangle(this.Width - bottomRightCornerSize, this.Height - bottomRightCornerSize, bottomRightCornerSize + cornerPadding, bottomRightCornerSize + cornerPadding);
+                    if (r.Contains(p))
+                    {
+                        m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.BottomLeftSizeableCorner);
+                        return false;
+                    }
+                    // Bottom Right
+                    r = new Rectangle(0, this.Height - bottomLeftCornerSize, bottomLeftCornerSize + cornerPadding, bottomLeftCornerSize + cornerPadding);
+                    if (r.Contains(p))
+                    {
+                        m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.BottomRightSizeableCorner);
+                        return false;
+                    }
+
+                    // Left border
+                    r = new Rectangle(this.Width - borderSize, 0, borderSize, this.Height);
+                    if (r.Contains(p))
+                    {
+                        m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.LeftSizeableBorder);
+                        return false;
+                    }
+                    // Right border
+                    r = new Rectangle(0, 0, borderSize, this.Height);
+                    if (r.Contains(p))
+                    {
+                        m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.RightSizeableBorder);
+                        return false;
+                    }
+                }
+                else
+                {
+                    // Top-left corner
+                    r = new Rectangle(0, 0, topLeftCornerSize + cornerPadding, topLeftCornerSize + cornerPadding);
+                    if (r.Contains(p))
+                    {
+                        m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.TopLeftSizeableCorner);
+                        return false;
+                    }
+                    // Top Right
+                    r = new Rectangle(this.Width - topRightCornerSize, 0, topRightCornerSize + cornerPadding, topRightCornerSize + cornerPadding);
+                    if (r.Contains(p))
+                    {
+                        m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.TopRightSizeableCorner);
+                        return false;
+                    }
+                    // Bottom Left
+                    r = new Rectangle(0, this.Height - bottomLeftCornerSize, bottomLeftCornerSize + cornerPadding, bottomLeftCornerSize + cornerPadding);
+                    if (r.Contains(p))
+                    {
+                        m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.BottomLeftSizeableCorner);
+                        return false;
+                    }
+                    // Bottom Right
+                    r = new Rectangle(this.Width - bottomRightCornerSize, this.Height - bottomRightCornerSize, bottomRightCornerSize + bottomRightCornerPadding, bottomRightCornerSize + bottomRightCornerPadding);
+                    if (r.Contains(p))
+                    {
+                        m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.BottomRightSizeableCorner);
+                        return false;
+                    }
+
+                    // Left border
+                    r = new Rectangle(0, 0, borderSize, this.Height);
+                    if (r.Contains(p))
+                    {
+                        m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.LeftSizeableBorder);
+                        return false;
+                    }
+                    // Right border
+                    r = new Rectangle(this.Width - borderSize, 0, borderSize, this.Height);
+                    if (r.Contains(p))
+                    {
+                        m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.RightSizeableBorder);
+                        return false;
+                    }
+                }
+            }
+
+            RibbonControl ribbonControl = m_RibbonControl;
+            if (ribbonControl != null && (ribbonControl.EffectiveStyle == eDotNetBarStyle.Office2010 || ribbonControl.EffectiveStyle == eDotNetBarStyle.Windows7 || StyleManager.IsMetro(ribbonControl.EffectiveStyle)))
+            {
+                r = new Rectangle((RightToLeft == RightToLeft.No ? borderSize : this.Width - borderSize - Dpi.Width24), borderSize, Dpi.Width24, Dpi.Height24);
+                if (r.Contains(p))
+                {
+                    m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.Menu);
+                    return false;
+                }
+            }
+            // Close button edge handling
+            if (this.WindowState == FormWindowState.Maximized && p.X >= this.ClientRectangle.Width - (borderSize + 12) && p.Y <= this.ClientRectangle.Y + borderSize + 22 && ribbonControl != null && ribbonControl.CaptionVisible && this.GetSystemCaptionItem() != null)
+            {
+                SystemCaptionItem captionItem = GetSystemCaptionItem();
+                if (captionItem.CloseEnabled && captionItem.Visible)
+                {
+                    m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.ClientArea);
+                    return false;
+                }
+            }
+            if (BarFunctions.IsWindows7 && this.WindowState == FormWindowState.Maximized && ribbonControl != null && ribbonControl.CaptionVisible)
+            {
+                p = ribbonControl.RibbonStrip.PointToClient(new Point(x, y));
+                if (ribbonControl.RibbonStrip.CaptionBounds.Contains(p))
+                {
+                    m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.TitleBar);
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        /// <summary>
+        /// Returns whether form is sizable given form state (maximized, minimized, normal) and FormBorderStyle setting.
+        /// </summary>
+        protected virtual bool IsSizable
+        {
+            get
+            {
+                if (FormBorderStyle == FormBorderStyle.Sizable || FormBorderStyle == FormBorderStyle.SizableToolWindow)
+                {
+                    if (WindowState == FormWindowState.Normal)
+                        return true;
+                }
+                return false;
+            }
+        }
+
+        protected virtual bool WindowsMessageSetText(ref Message m)
+        {
+            bool modified = WinApi.ModifyHwndStyle(m.HWnd, (int)WinApi.WindowStyles.WS_VISIBLE, 0);
+
+            base.DefWndProc(ref m);
+
+            if (m_RibbonControl != null && m_RibbonControl.RibbonStrip != null) m_RibbonControl.RibbonStrip.Refresh();
+            if (modified)
+            {
+                WinApi.ModifyHwndStyle(m.HWnd, 0, (int)WinApi.WindowStyles.WS_VISIBLE);
+            }
+            return false;
+        }
+
+        protected virtual bool WindowsMessageInitMenuPopup(ref Message m)
+        {
+            base.WndProc(ref m);
+            this.Invalidate(true);
+            return false;
+        }
+
+        protected virtual bool WindowsMessageWindowsPosChanged(ref Message m)
+        {
+            if (this.WindowState == FormWindowState.Minimized || this.WindowState == FormWindowState.Maximized)
+            {
+                m_TrackSetBoundsCore = true;
+                base.WndProc(ref m);
+                m_TrackSetBoundsCore = true;
+                return false;
+            }
+            return true;
+        }
+
+        protected virtual bool WindowsMessageNCMouseMove(ref Message m)
+        {
+            return true;
+        }
+
+        protected virtual bool WindowsMessageNCMouseLeave(ref Message m)
+        {
+            if (m_GlassHitTestTrack)
+            {
+                IntPtr result = IntPtr.Zero;
+                WinApi.DwmDefWindowProc(this.Handle, (int)WinApi.WindowsMessages.WM_NCHITTEST,
+                    IntPtr.Zero, IntPtr.Zero, out result);
+                //int res = WinApi.ToInt(result);
+                m_GlassHitTestTrack = false;
+            }
+            return true;
+        }
+
+        protected virtual bool WindowsMessageNCLButtonDown(ref Message m)
+        {
+            return true;
+        }
+
+        protected virtual bool WindowsMessageNCLButtonUp(ref Message m)
+        {
+            return true;
+        }
+
+        protected virtual bool WindowsMessageNCDblClk(ref Message m)
+        {
+            return true;
+        }
+
+        protected virtual bool WindowsMessageMouseActivate(ref Message m)
+        {
+            this.Activate();
+            return true;
+        }
+
+        protected virtual bool WindowsMessageMdiSetMenu(ref Message m)
+        {
+            return false;
+        }
+
+        protected virtual bool WindowsMessageMdiRefreshMenu(ref Message m)
+        {
+            return false;
+        }
+
+        private bool WindowsMessageMdiActivate(ref Message m)
+        {
+            if (this.IsGlassEnabled && m_RibbonControl != null)
+            {
+                IntPtr menu = WinApi.GetMenu(this.Handle);
+                if (menu != IntPtr.Zero)
+                    WinApi.SetMenu(this.Handle, IntPtr.Zero);
+            }
+            return true;
+        }
+
+        protected virtual bool WindowsMessageSetIcon(ref Message m)
+        {
+            if (this.WindowState == FormWindowState.Maximized && !this.IsMdiChild)
+            {
+                bool modified = WinApi.ModifyHwndStyle(m.HWnd, (int)WinApi.WindowStyles.WS_CAPTION, 0);
+                CreateCashedCaptionBitmap();
+                base.WndProc(ref m);
+                if (modified)
+                    WinApi.ModifyHwndStyle(m.HWnd, 0, (int)WinApi.WindowStyles.WS_CAPTION);
+                DrawCashedCaptionBitmap();
+                return false;
+            }
+            return true;
+        }
+
+        internal void InvokeDelayed(MethodInvoker method)
+        {
+            InvokeDelayed(method, 10);
+        }
+        internal void InvokeDelayed(MethodInvoker method, int timeOut)
+        {
+            Timer delayedInvokeTimer = new Timer();
+            delayedInvokeTimer = new Timer();
+            delayedInvokeTimer.Tag = method;
+            delayedInvokeTimer.Interval = timeOut;
+            delayedInvokeTimer.Tick += new EventHandler(DelayedInvokeTimerTick);
+            delayedInvokeTimer.Start();
+        }
+        internal void DelayedInvokeTimerTick(object sender, EventArgs e)
+        {
+            Timer timer = (Timer)sender;
+            MethodInvoker method = (MethodInvoker)timer.Tag;
+            timer.Stop();
+            timer.Dispose();
+            method.Invoke();
+        }
+
+        private void RefreshGlassState()
+        {
+            if (m_RibbonControl != null)
+                m_RibbonControl.CanSupportGlass = IsGlassEnabled;
+
+            UpdateFormGlassState();
+            UpdateFormBackColor();
+            if (this.IsGlassEnabled)
+            {
+                if (this.WindowState == FormWindowState.Maximized)
+                {
+                    this.WindowState = FormWindowState.Normal;
+                    this.EnableGlass = false;
+                    Application.DoEvents();
+                    this.EnableGlass = true;
+                    this.WindowState = FormWindowState.Maximized;
+                }
+            }
+        }
+        protected virtual bool WindowsMessageDwmCompositionChanged(ref Message m)
+        {
+            InvokeDelayed(new MethodInvoker(delegate { RefreshGlassState(); }), 800);
+            return false;
+        }
+
+        /// <summary>
+        /// Invalidates non client area of the form.
+        /// </summary>
+        /// <param name="invalidateForm">Indicates whether complete form is invalidated.</param>
+        protected void UpdateFormGlassState()
+        {
+            bool newGlassEnabled = GetGlassEnabled();
+            bool glassStateChanged = m_IsGlassEnabled != newGlassEnabled;
+            m_IsGlassEnabled = newGlassEnabled;
+            bool isMdiChildMaximized = false;
+            if (this.IsMdiContainer && this.ActiveMdiChild != null && this.ActiveMdiChild.WindowState == FormWindowState.Maximized)
+            {
+                this.ActiveMdiChild.WindowState = FormWindowState.Normal;
+                isMdiChildMaximized = true;
+            }
+            string text = this.Text;
+            //this.RecreateHandle(); // This has nasty side-effects when glass is switched on/off Modal forms disappear App.OpenForms gets messed up
+            //if (this.IsGlassEnabled && BarFunctions.IsVista && !BarFunctions.IsWindows7)
+            //    VistaRecreateHandle();
+            //else
+            NativeFunctions.SetWindowPos(this.Handle, IntPtr.Zero, 0, 0, 0, 0, NativeFunctions.SWP_FRAMECHANGED |
+                        NativeFunctions.SWP_NOACTIVATE | NativeFunctions.SWP_NOMOVE | NativeFunctions.SWP_NOSIZE | NativeFunctions.SWP_NOZORDER);
+            if (this.IsGlassEnabled)
+            {
+                this.Region = null;
+                if (m_RibbonControl != null)
+                    m_RibbonControl.Region = null;
+                UpdateGlass();
+            }
+
+            if (isMdiChildMaximized && this.IsMdiContainer && this.ActiveMdiChild != null)
+                this.ActiveMdiChild.WindowState = FormWindowState.Maximized;
+            this.Text = text;
+
+            if (this.IsGlassEnabled && glassStateChanged && this.WindowState != FormWindowState.Minimized) // This helps with glass refresh
+            {
+                FormWindowState oldState = this.WindowState;
+                this.WindowState = FormWindowState.Minimized;
+                this.WindowState = oldState;
+            }
+
+            if (glassStateChanged)
+                OnWindowsGlassStateChanged();
+        }
+
+        protected virtual void OnWindowsGlassStateChanged()
+        {
+        }
+
+        private bool GetGlassEnabled()
+        {
+            if (this.DesignMode) return false;
+            return WinApi.IsGlassEnabled;
+        }
+
+        protected virtual bool WindowsMessageStyleChanged(ref Message m)
+        {
+            if (!m_NoStyleChangeProcessing)
+            {
+                CreateCashedCaptionBitmap();
+                base.WndProc(ref m);
+                DrawCashedCaptionBitmap();
+                return false;
+            }
+
+            return true;
+        }
+
+        private bool m_NoStyleChangeProcessing = false;
+        protected virtual bool WindowsMessageSetCursor(ref Message m)
+        {
+            // Button down on client area while there is a modal form displayed
+            if (!m_NonClientActive && (WinApi.HIWORD(m.LParam) == (int)WinApi.WindowsMessages.WM_LBUTTONUP || WinApi.HIWORD(m.LParam) == (int)WinApi.WindowsMessages.WM_LBUTTONDOWN) && WinApi.LOWORD(m.LParam) == (int)WinApi.WindowHitTestRegions.Error ||
+                IsGlassEnabled || !this.Enabled || BarUtilities.IsModalFormOpen)
+                return true;
+            m_NoStyleChangeProcessing = true;
+            const int WS_VISIBLE = 0x10000000;
+            IntPtr style = WinApi.GetWindowLongPtr(this.Handle, (int)WinApi.GWL.GWL_STYLE);
+            IntPtr newStyle;
+            if (IntPtr.Size == 8)
+            {
+                long ns = style.ToInt64();
+                newStyle = new IntPtr(ns & ~(ns & WS_VISIBLE));
+            }
+            else
+            {
+                int ns = style.ToInt32();
+                newStyle = new IntPtr(ns & ~(ns & WS_VISIBLE));
+            }
+            WinApi.SetWindowLongPtr(this.Handle, (int)WinApi.GWL.GWL_STYLE, newStyle);
+            base.WndProc(ref m);
+            WinApi.SetWindowLongPtr(this.Handle, (int)WinApi.GWL.GWL_STYLE, style);
+            m_NoStyleChangeProcessing = false;
+            return false;
+        }
+
+        internal bool TrackSetBoundsCore
+        {
+            get
+            {
+                return m_TrackSetBoundsCore;
+            }
+            set
+            {
+                m_TrackSetBoundsCore = value;
+            }
+        }
+        private bool m_TrackSetBoundsCore = false;
+        protected override void SetBoundsCore(int x, int y, int width, int height, BoundsSpecified specified)
+        {
+            if (IsCustomFormStyleEnabled())
+            {
+                if (m_TrackSetBoundsCore ||
+                    this.DesignMode && ((specified & BoundsSpecified.Height) == BoundsSpecified.Height || (specified & BoundsSpecified.Width) == BoundsSpecified.Width))
+                {
+                    if (width != this.Width || height != this.Height)
+                    {
+                        AdjustBounds(ref width, ref height, specified);
+                    }
+                    m_TrackSetBoundsCore = false;
+                }
+            }
+
+            base.SetBoundsCore(x, y, width, height, specified);
+        }
+
+        protected virtual void AdjustBounds(ref int width, ref int height)
+        {
+            AdjustBounds(ref width, ref height, BoundsSpecified.Width | BoundsSpecified.Height);
+        }
+
+        protected virtual void AdjustBounds(ref int width, ref int height, BoundsSpecified specified)
+        {
+            WinApi.RECT rect = new WinApi.RECT(0, 0, width, height);
+            CreateParams params1 = this.CreateParams;
+            WinApi.AdjustWindowRectEx(ref rect, params1.Style, false, params1.ExStyle);
+            NonClientInfo nci = GetNonClientInfo();
+            if ((specified & BoundsSpecified.Height) == BoundsSpecified.Height)
+            {
+                height -= (rect.Height - height);
+                if (IsGlassEnabled)
+                {
+                    height += nci.BottomBorder;
+                }
+            }
+
+            if ((specified & BoundsSpecified.Width) == BoundsSpecified.Width && !IsGlassEnabled)
+                width -= (rect.Width - width);
+        }
+
+        private Size GetSystemFormBorderSize()
+        {
+            NonClientInfo nci = GetNonClientInfo();
+            return new Size(nci.LeftBorder, nci.BottomBorder);
+        }
+
+        protected virtual bool SetClientSizeCoreCustom(int x, int y)
+        {
+            m_TrackSetBoundsCore = true;
+            if (this.IsGlassEnabled)
+            {
+                Size borderSize = GetSystemFormBorderSize();
+                this.Size = new Size(x + borderSize.Width * 2, y + borderSize.Height * 2 + SystemInformation.CaptionHeight);
+            }
+            else
+                this.Size = new Size(x, y);
+            Type type = typeof(Control);
+            try // try with ignore catch is bad idea but in this case its for future proofing, just in case M$ removes these members
+            {
+                type.InvokeMember("clientWidth", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.SetField, null, this, new object[] { x });
+                type.InvokeMember("clientHeight", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.SetField, null, this, new object[] { y });
+            }
+            catch { }
+            OnClientSizeChanged(EventArgs.Empty);
+            return false;
+        }
+
+        protected override void SetClientSizeCore(int x, int y)
+        {
+            bool callBase = true;
+            if (!this.DesignMode && IsCustomFormStyleEnabled())
+            {
+                callBase = SetClientSizeCoreCustom(x, y);
+            }
+
+            if (callBase)
+                base.SetClientSizeCore(x, y);
+        }
+
+        //protected virtual bool SetClientSizeCoreExtension(ref int x, ref int y)
+        //{
+        //    if (!this.DesignMode)
+        //    {
+        //        m_TrackSetBoundsCore = true;
+        //        int originalWidth = x, originalHeight = y;
+        //        AdjustBounds(ref x, ref y);
+        //        base.SetClientSizeCore(x, y);
+        //        Type controlType = GetControlType();
+        //        if (controlType != null)
+        //        {
+        //            MemberInfo[] mems = controlType.GetMember("clientWidth", BindingFlags.NonPublic | BindingFlags.Instance);
+        //            if (mems.Length > 0)
+        //            {
+        //                controlType.InvokeMember("clientWidth", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.SetField, null, this, new object[] { originalWidth });
+        //                controlType.InvokeMember("clientHeight", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.SetField, null, this, new object[] { originalHeight });
+        //            }
+        //        }
+        //        return false;
+        //    }
+
+        //    return true;
+        //}
+
+        private Type GetControlType()
+        {
+            Type t = this.GetType().BaseType;
+            while (t != null && t.Name != "Control")
+                t = t.BaseType;
+            return t;
+        }
+        #endregion
+
+        protected virtual void BaseWndProc(ref Message m)
+        {
+            base.WndProc(ref m);
+        }
+
+        protected override void WndProc(ref Message m)
+        {
+            if (!IsCustomFormStyleEnabled())
+            {
+                if (!m_IsGlassEnabled && WinApi.IsGlassEnabled)
+                    UpdateFormGlassState();
+                base.WndProc(ref m);
+                return;
+            }
+
+            bool callBase = true;
+            switch (m.Msg)
+            {
+                case (int)WinApi.WindowsMessages.WM_STYLECHANGED:
+                    {
+                        callBase = WindowsMessageStyleChanged(ref m);
+                        break;
+                    }
+                case (int)WinApi.WindowsMessages.WM_NCPAINT:
+                    {
+                        callBase = WindowsMessageNCPaint(ref m);
+                        break;
+                    }
+                case (int)WinApi.WindowsMessages.WM_NCCALCSIZE:
+                    {
+                        base.WndProc(ref m);
+                        WindowsMessageNCCalcSize(ref m);
+                        callBase = false;
+                        break;
+                    }
+                case (int)WinApi.WindowsMessages.WM_NCACTIVATE:
+                    {
+                        callBase = WindowsMessageNCActivate(ref m);
+                        break;
+                    }
+                case (int)WinApi.WindowsMessages.WM_SETTEXT:
+                    {
+                        callBase = WindowsMessageSetText(ref m);
+                        break;
+                    }
+                case (int)WinApi.WindowsMessages.WM_INITMENUPOPUP:
+                    {
+                        callBase = WindowsMessageInitMenuPopup(ref m);
+                        break;
+                    }
+                case (int)WinApi.WindowsMessages.WM_WINDOWPOSCHANGED:
+                    {
+                        callBase = WindowsMessageWindowsPosChanged(ref m);
+                        break;
+                    }
+                case (int)WinApi.WindowsMessages.WM_NCHITTEST:
+                    {
+                        callBase = WindowsMessageNCHitTest(ref m);
+                        break;
+                    }
+                case (int)WinApi.WindowsMessages.WM_ERASEBKGND:
+                    {
+                        callBase = false;
+                        //using (Graphics g = this.CreateGraphics())
+                        //{
+                        //    using (SolidBrush brush = new SolidBrush(Color.Green))
+                        //        g.FillRectangle(brush, new Rectangle(0,0, this.Width, this.Height));
+                        //}
+                        m.Result = new IntPtr(1);
+                        break;
+                    }
+                case (int)WinApi.WindowsMessages.WM_NCMOUSEMOVE:
+                    {
+                        callBase = WindowsMessageNCMouseMove(ref m);
+                        break;
+                    }
+                case (int)WinApi.WindowsMessages.WM_NCMOUSELEAVE:
+                    {
+                        callBase = WindowsMessageNCMouseLeave(ref m);
+                        break;
+                    }
+                case (int)WinApi.WindowsMessages.WM_NCLBUTTONDOWN:
+                    {
+                        callBase = WindowsMessageNCLButtonDown(ref m);
+                        break;
+                    }
+                case (int)WinApi.WindowsMessages.WM_NCLBUTTONUP:
+                    {
+                        callBase = WindowsMessageNCLButtonUp(ref m);
+                        break;
+                    }
+                case (int)WinApi.WindowsMessages.WM_SETCURSOR:
+                    {
+                        callBase = WindowsMessageSetCursor(ref m);
+                        break;
+                    }
+                case (int)WinApi.WindowsMessages.WM_SETICON:
+                    {
+                        callBase = WindowsMessageSetIcon(ref m);
+                        break;
+                    }
+                case (int)WinApi.WindowsMessages.WM_NCLBUTTONDBLCLK:
+                    {
+                        callBase = WindowsMessageNCDblClk(ref m);
+                        break;
+                    }
+                case (int)WinApi.WindowsMessages.WM_MOUSEACTIVATE:
+                    {
+                        callBase = WindowsMessageMouseActivate(ref m);
+                        break;
+                    }
+                case (int)WinApi.WindowsMessages.WM_MDISETMENU:
+                    {
+                        callBase = WindowsMessageMdiSetMenu(ref m);
+                        break;
+                    }
+                case (int)WinApi.WindowsMessages.WM_MDIREFRESHMENU:
+                    {
+                        callBase = WindowsMessageMdiRefreshMenu(ref m);
+                        break;
+                    }
+                case (int)WinApi.WindowsMessages.WM_DWMCOMPOSITIONCHANGED:
+                    {
+                        callBase = WindowsMessageDwmCompositionChanged(ref m);
+                        break;
+                    }
+                case (int)WinApi.WindowsMessages.WM_MDIACTIVATE:
+                    {
+                        callBase = WindowsMessageMdiActivate(ref m);
+                        break;
+                    }
+                case 0xae:
+                case 0x92:
+                    {
+                        // Mystery message that paints the min, max, close buttons when mouse hits the corners of the form for resizing...
+                        callBase = false;
+                        break;
+                    }
+            }
+
+            if (callBase)
+                base.WndProc(ref m);
+        }
+
+        protected override bool ProcessDialogKey(Keys keyData)
+        {
+            if (keyData == Keys.Escape)
+            {
+                RibbonControl ribbon = this.RibbonControl;
+                if (ribbon != null)
+                {
+                    ApplicationButton appButton = ribbon.GetApplicationButton() as ApplicationButton;
+                    if (appButton != null)
+                    {
+                        if (appButton.ProcessEscapeKey(keyData))
+                            return true;
+                    }
+                }
+            }
+            return base.ProcessDialogKey(keyData);
+        }
+        private bool _NonClientPaintEnabled = true;
+        /// <summary>
+        /// Gets or sets whether non-client area of the form rendering is enabled.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool NonClientPaintEnabled
+        {
+            get { return _NonClientPaintEnabled; }
+            set
+            {
+                _NonClientPaintEnabled = value;
+            }
+        }
+
+        /// <summary>
+        /// Redraws the non-client area of the form.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void RedrawNonClient()
+        {
+            WinApi.RedrawWindow(this.Handle,
+                        IntPtr.Zero,
+                        IntPtr.Zero,
+                        WinApi.RedrawWindowFlags.RDW_INVALIDATE | WinApi.RedrawWindowFlags.RDW_FRAME | WinApi.RedrawWindowFlags.RDW_UPDATENOW);
+        }
+
+        private bool _BackgroundImageUnderCaption = false;
+        /// <summary>
+        /// Indicates whether form BackgroundImage is pulled up and rendered under form caption as well.
+        /// </summary>
+        [DefaultValue(false), Category("Behavior"), Description("Indicates whether form BackgroundImage is pulled up and rendered under form caption as well.")]
+        public bool BackgroundImageUnderCaption
+        {
+            get { return _BackgroundImageUnderCaption; }
+            set
+            {
+                if (value != _BackgroundImageUnderCaption)
+                {
+                    bool oldValue = _BackgroundImageUnderCaption;
+                    _BackgroundImageUnderCaption = value;
+                    OnBackgroundImageUnderCaptionChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when BackgroundImageUnderCaption property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnBackgroundImageUnderCaptionChanged(bool oldValue, bool newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("BackgroundImageUnderCaption"));
+            if (this.IsHandleCreated)
+            {
+                this.Invalidate();
+                RedrawNonClient();
+            }
+        }
+
+        private bool _RenderFormIcon = true;
+        /// <summary>
+        /// Indicates whether form icon is drawn. This is different from ShowIcon property which when set to false also removes the form icon from task-bar. Setting this property to false will keep form icon in task-bar but will hide on the form.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance"), Description("Indicates whether form icon is drawn. This is different from ShowIcon property which when set to false also removes the form icon from task-bar. Setting this property to false will keep form icon in task-bar but will hide on the form.")]
+        public bool RenderFormIcon
+        {
+            get { return _RenderFormIcon; }
+            set
+            {
+                if (value != _RenderFormIcon)
+                {
+                    bool oldValue = _RenderFormIcon;
+                    _RenderFormIcon = value;
+                    OnRenderFormIconChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when RenderFormIcon property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnRenderFormIconChanged(bool oldValue, bool newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("RenderFormIcon"));
+            if (this.IsHandleCreated)
+            {
+                if (m_RibbonControl != null)
+                    m_RibbonControl.RibbonStrip.GetBaseItemContainer().NeedRecalcSize = true;
+                RedrawNonClient();
+            }
+        }
+
+        private bool _RenderFormText = true;
+        /// <summary>
+        /// Indicates whether form Text is rendered in form caption.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance"), Description("Indicates whether form Text is rendered in form caption.")]
+        public bool RenderFormText
+        {
+            get { return _RenderFormText; }
+            set
+            {
+                if (value != _RenderFormText)
+                {
+                    bool oldValue = _RenderFormText;
+                    _RenderFormText = value;
+                    OnRenderFormTextChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when RenderFormText property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnRenderFormTextChanged(bool oldValue, bool newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("RenderFormText"));
+            if (this.IsHandleCreated)
+            {
+                RedrawNonClient();
+            }
+        }
+    }
+
+    public class Office2007RibbonForm : RibbonForm
+    {
+    }
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/Office2007Form/SystemCaptionItem.cs b/PROMS/DotNetBar Source Code/Office2007Form/SystemCaptionItem.cs
new file mode 100644
index 00000000..96056969
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Office2007Form/SystemCaptionItem.cs	
@@ -0,0 +1,295 @@
+using System;
+using System.Text;
+using System.Drawing;
+using System.ComponentModel;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.Controls;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represents an item that provides system buttons displayed on form caption.
+    /// </summary>
+    public class SystemCaptionItem : MDISystemItem
+    {
+        #region Private Variables
+        private bool m_MinimizeVisible = true;
+        private bool m_RestoreMaximizeVisible = true;
+        private bool m_CloseVisible = true;
+        private bool m_HelpVisible = false;
+        private bool m_GlassEnabled = false;
+        #endregion
+
+        #region Internal Implementation
+        /// <summary>
+        /// Gets the default size of the system buttons.
+        /// </summary>
+        /// <returns></returns>
+        internal override Size GetButtonSize()
+        {
+            Size s;
+            if (!_CustomButtonSize.IsEmpty)
+                return Dpi.Size(_CustomButtonSize);
+            if (_ToolWindowButtons)
+            {
+                s = System.Windows.Forms.SystemInformation.ToolWindowCaptionButtonSize;
+                s.Width += 5;
+                return s;
+            }
+
+            s = System.Windows.Forms.SystemInformation.CaptionButtonSize;
+            if (System.Environment.OSVersion.Version.Major < 6 && this.ContainerControl is RibbonStrip)
+                s = new Size(Dpi.Width25, Dpi.Height25);
+            else if (this.ContainerControl is TabFormStripControl)
+                s = new Size(Dpi.Width25, Dpi.Height20);
+            else if (StyleManager.IsMetro(this.EffectiveStyle))
+                s = new Size(Dpi.Width25, Dpi.Height25);
+            if (System.Environment.OSVersion.Version.Major >= 6 && s.Height == 19 && this.Parent is CaptionItemContainer)
+                s.Height += 3;
+            
+            return s;
+        }
+
+        private Size _CustomButtonSize = Size.Empty;
+        /// <summary>
+        /// Gets or sets the custom button size to use instead of system determined size.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public Size CustomButtonSize
+        {
+            get { return _CustomButtonSize; }
+            set { _CustomButtonSize = value; }
+        }
+
+        public override void Paint(ItemPaintArgs pa)
+        {
+            if (this.SuspendLayout)
+                return;
+
+            if (_QueryIconOnPaint && pa.ContainerControl!=null)
+            {
+                Form parentForm = pa.ContainerControl.FindForm();
+                if (parentForm != null)
+                {
+                    this.SetIcon(parentForm.Icon);
+                }
+            }
+
+            m_GlassEnabled = pa.GlassEnabled;
+
+            if (pa.Renderer != null)
+                pa.Renderer.DrawSystemCaptionItem(new SystemCaptionItemRendererEventArgs(pa.Graphics, this, pa.GlassEnabled));
+            else
+                base.Paint(pa);
+        }
+
+        protected override bool ShowToolTips
+        {
+            get
+            {
+                return !m_GlassEnabled;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether Minimize button is visible.
+        /// </summary>
+        [Browsable(false), DefaultValue(true)]
+        public bool MinimizeVisible
+        {
+            get { return m_MinimizeVisible; }
+            set
+            {
+                m_MinimizeVisible = value;
+                NeedRecalcSize = true;
+                this.OnAppearanceChanged();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether Restore/Maximize button is visible.
+        /// </summary>
+        [Browsable(false), DefaultValue(true)]
+        public bool RestoreMaximizeVisible
+        {
+            get { return m_RestoreMaximizeVisible; }
+            set
+            {
+                m_RestoreMaximizeVisible = value;
+                NeedRecalcSize = true;
+                this.OnAppearanceChanged();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether Close button is visible.
+        /// </summary>
+        [Browsable(false), DefaultValue(true)]
+        public bool CloseVisible
+        {
+            get { return m_CloseVisible; }
+            set
+            {
+                m_CloseVisible = value;
+                NeedRecalcSize = true;
+                this.OnAppearanceChanged();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether help button is visible.
+        /// </summary>
+        [Browsable(false), DefaultValue(false)]
+        public bool HelpVisible
+        {
+            get { return m_HelpVisible; }
+            set
+            {
+                m_HelpVisible = value;
+                NeedRecalcSize = true;
+                this.OnAppearanceChanged();
+            }
+        }
+
+        public override void RecalcSize()
+        {
+
+            if (this.SuspendLayout)
+                return;
+
+            if (this.IsSystemIcon)
+            {
+                base.RecalcSize();
+            }
+            else
+            {
+                Size singleButtonSize = GetButtonSize();
+                int buttonCount = 0;
+                if (m_MinimizeVisible)
+                    buttonCount++;
+                if(m_RestoreMaximizeVisible)
+                    buttonCount++;
+                if (m_CloseVisible)
+                    buttonCount++;
+                if (m_HelpVisible)
+                    buttonCount++;
+
+                if (this.Orientation == eOrientation.Horizontal)
+                    m_Rect.Size = new Size(singleButtonSize.Width * buttonCount + buttonCount - 1, singleButtonSize.Height);
+                else
+                    m_Rect.Size = new Size(singleButtonSize.Width, singleButtonSize.Height * buttonCount + buttonCount - 1);
+            }
+
+            m_NeedRecalcSize = false;
+        }
+
+        internal override SystemButton GetButton(int x, int y)
+        {
+            Rectangle r = new Rectangle(this.DisplayRectangle.Location, GetButtonSize());
+            //r.Inflate(-1, -2);
+            r.Location = this.DisplayRectangle.Location;
+
+            if (this.Orientation == eOrientation.Horizontal)
+                r.Offset(0, (this.DisplayRectangle.Height - r.Height) / 2);
+            else
+                r.Offset((this.WidthInternal - r.Width) / 2, 0);
+
+            if (m_HelpVisible && (!IsRightToLeft || m_CloseVisible && IsRightToLeft))
+            {
+                if (r.Contains(x, y))
+                {
+                    if (IsRightToLeft)
+                        return SystemButton.Close;
+                    else
+                        return SystemButton.Help;
+                }
+
+                if (this.Orientation == eOrientation.Horizontal)
+                    r.Offset(r.Width + 1, 0);
+                else
+                    r.Offset(0, r.Height + 1);
+            }
+
+            if (m_MinimizeVisible && m_HelpVisible || !m_HelpVisible && m_MinimizeVisible && (!IsRightToLeft || m_CloseVisible && IsRightToLeft))
+            {
+                if (r.Contains(x, y))
+                {
+                    if (IsRightToLeft)
+                        return SystemButton.Close;
+                    else
+                        return SystemButton.Minimize;
+                }
+
+                if (this.Orientation == eOrientation.Horizontal)
+                    r.Offset(r.Width + 1, 0);
+                else
+                    r.Offset(0, r.Height + 1);
+            }
+
+            if (m_RestoreMaximizeVisible)
+            {
+                if (r.Contains(x, y))
+                {
+                    if (this.RestoreEnabled)
+                        return SystemButton.Restore;
+                    return SystemButton.Maximize;
+                }
+
+                if (this.Orientation == eOrientation.Horizontal)
+                    r.Offset(r.Width + 3, 0);
+                else
+                    r.Offset(0, r.Height + 3);
+            }
+
+            if (m_CloseVisible && !IsRightToLeft || m_MinimizeVisible && IsRightToLeft)
+            {
+                if (r.Contains(x, y))
+                {
+                    if (IsRightToLeft)
+                        return SystemButton.Minimize;
+                    else
+                        return SystemButton.Close;
+                }
+            }
+
+            return SystemButton.None;
+        }
+
+        public override void Refresh()
+        {
+            base.Refresh();
+            System.Drawing.Rectangle inv = m_Rect;
+            Control c = this.ContainerControl as Control;
+            if (c != null && IsHandleValid(c))
+            {
+                const int RDW_INVALIDATE = 0x0001;
+                const int RDW_FRAME = 0x0400;
+                int height = SystemInformation.Border3DSize.Height + SystemInformation.CaptionHeight;
+                NativeFunctions.RECT r = new NativeFunctions.RECT(0, -height, c.Width, height);
+                NativeFunctions.RedrawWindow(c.Handle, ref r, IntPtr.Zero, RDW_INVALIDATE | RDW_FRAME);
+            }
+        }
+
+        private bool _QueryIconOnPaint = false;
+        /// <summary>
+        /// Gets or sets whether Icon is queried when item is painted. Default value is false.
+        /// </summary>
+        [Browsable(false)]
+        public bool QueryIconOnPaint
+        {
+            get { return _QueryIconOnPaint; }
+            set
+            {
+                _QueryIconOnPaint = value;
+            }
+        }
+
+        private bool _ToolWindowButtons = false;
+        internal bool ToolWindowButtons
+        {
+            get { return _ToolWindowButtons; }
+            set { _ToolWindowButtons = value;}
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Office2007Form/SystemCaptionItemPainter.cs b/PROMS/DotNetBar Source Code/Office2007Form/SystemCaptionItemPainter.cs
new file mode 100644
index 00000000..0a2c567e
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Office2007Form/SystemCaptionItemPainter.cs	
@@ -0,0 +1,23 @@
+using System;
+using System.Text;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represents the base class for the SystemCaptionItem painter.
+    /// </summary>
+    internal class SystemCaptionItemPainter
+    {
+        public virtual void Paint(SystemCaptionItemRendererEventArgs e)
+        {
+            if (e.SystemCaptionItem.IsSystemIcon)
+                PaintSystemIcon(e, e.SystemCaptionItem.GetEnabled());
+            else
+                PaintFormButtons(e);
+        }
+
+        public virtual void PaintSystemIcon(SystemCaptionItemRendererEventArgs e, bool isEnabled) { }
+
+        public virtual void PaintFormButtons(SystemCaptionItemRendererEventArgs e) { }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Office2007Form/SystemCaptionItemRendererEventArgs.cs b/PROMS/DotNetBar Source Code/Office2007Form/SystemCaptionItemRendererEventArgs.cs
new file mode 100644
index 00000000..23c7394a
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Office2007Form/SystemCaptionItemRendererEventArgs.cs	
@@ -0,0 +1,42 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Provides data for the RenderSystemCaptionItem event.
+    /// </summary>
+    public class SystemCaptionItemRendererEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets or sets Graphics control is rendered on.
+        /// </summary>
+        public Graphics Graphics = null;
+
+        /// <summary>
+        /// Gets reference to SystemCaptionItem being rendered.
+        /// </summary>
+        public SystemCaptionItem SystemCaptionItem = null;
+
+        /// <summary>
+        /// Gets whether Windows Vista Glass is enabled.
+        /// </summary>
+        public bool GlassEnabled = false;
+
+        /// <summary>
+        /// Creates new instance of the class and initializes it with default values.
+        /// </summary>
+        /// <param name="g">Reference to Graphics object.</param>
+        /// <param name="item">Reference to item being rendered.</param>
+        /// <param name="glassEnabled">Indicates whether Vista Glass effect is enabled.</param>
+        public SystemCaptionItemRendererEventArgs(Graphics g, SystemCaptionItem item, bool glassEnabled)
+        {
+            this.Graphics = g;
+            this.SystemCaptionItem = item;
+            this.GlassEnabled = glassEnabled;
+        }
+    }
+
+    
+}
diff --git a/PROMS/DotNetBar Source Code/OldBar.cs b/PROMS/DotNetBar Source Code/OldBar.cs
new file mode 100644
index 00000000..b2a36d9d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/OldBar.cs	
@@ -0,0 +1,127 @@
+namespace DevComponents.DotNetBar
+{
+    using System;
+
+    /// <summary>
+    ///    Summary description for bar.
+    /// </summary>
+    public sealed class Bar
+    {
+		/*private string m_Caption;
+		private bool m_MoreButtonsVisible;
+		private int m_Width;
+		private int m_Height;
+		private int m_DockedWidth;
+		private int m_DockedHeight;
+		private int m_DockSide;
+		private int m_Flags;
+        private int m_Items;
+		private bool m_WrapTools;
+		private bool m_Visible;*/
+
+		private Toolbar m_Toolbar;
+		private string m_Name;
+        public Bar(string sName)
+        {
+			m_Toolbar=new Toolbar();
+			m_Toolbar.ToolBarState=eBarState.Floating;
+			m_Name=sName;
+        }
+
+		public string Caption
+		{
+			get
+			{
+				return m_Toolbar.Caption;
+			}
+			set
+			{
+				m_Toolbar.Caption=value;
+			}
+		}
+
+		public eBarState BarState
+		{
+			get
+			{
+				return m_Toolbar.ToolBarState;
+			}
+			set
+			{
+				m_Toolbar.ToolBarState=value;
+			}
+		}
+
+		public GenericItemContainer BarItems
+		{
+			get
+			{
+				return m_Toolbar.Items as GenericItemContainer;
+			}
+		}
+
+		public int Width
+		{
+			get
+			{
+				return m_Toolbar.Width;
+			}
+		}
+
+		public int Height
+		{
+			get
+			{
+				return m_Toolbar.Height;
+			}
+		}
+
+		public bool Visible
+		{
+			get
+			{
+				return m_Toolbar.Visible;
+			}
+			set
+			{
+				m_Toolbar.Visible=value;
+			}
+		}
+
+		public int DockLine
+		{
+			get
+			{
+				return m_Toolbar.DockLine;
+			}
+		}
+
+		public int DockOffset
+		{
+			get
+			{
+				return m_Toolbar.DockOffset;
+			}
+		}
+
+		public bool WrapItems
+		{
+			get
+			{
+				return m_Toolbar.WrapItems;
+			}
+			set
+			{
+				m_Toolbar.WrapItemsDock=value;
+			}
+		}
+
+		public string Name
+		{
+			get
+			{
+				return m_Name;
+			}
+		}
+    }
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/PanelEx.bmp b/PROMS/DotNetBar Source Code/PanelEx.bmp
new file mode 100644
index 00000000..9e796826
Binary files /dev/null and b/PROMS/DotNetBar Source Code/PanelEx.bmp differ
diff --git a/PROMS/DotNetBar Source Code/PanelEx.cs b/PROMS/DotNetBar Source Code/PanelEx.cs
new file mode 100644
index 00000000..9e463b0b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/PanelEx.cs	
@@ -0,0 +1,1675 @@
+using System;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Windows.Forms;
+using System.ComponentModel;
+using System.Drawing.Text;
+using DevComponents.DotNetBar.Controls;
+using DevComponents.DotNetBar.ScrollBar;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Represents graphical panel control with support for different visual styles and gradients.
+	/// </summary>
+    [ToolboxItem(true), Designer("DevComponents.DotNetBar.Design.PanelExDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf"), DefaultEvent("Click")]
+    public class PanelEx : System.Windows.Forms.Panel, IButtonControl, Controls.INonClientControl, IScrollBarOverrideSupport
+	{
+		#region Private Variables
+		private ItemStyle m_Style;
+		private ItemStyle m_StyleMouseOver;
+		private ItemStyle m_StyleMouseDown;
+
+		private ColorScheme m_ColorScheme=null;
+		private eDotNetBarStyle m_ColorSchemeStyle=eDotNetBarStyle.Office2003;
+
+		private bool m_MouseOver=false, m_MouseDown=false;
+
+		private Rectangle m_ClientTextRectangle=Rectangle.Empty;
+		private bool m_TextDockConstrained=true;
+		private bool m_ShowFocusRectangle;
+		private string m_Text="";
+
+		// Theme Caching Support
+		private ThemeTab m_ThemeTab=null;
+
+		private DialogResult m_DialogResult=DialogResult.None;
+		private bool m_IsDefault=false;
+
+		private bool m_AntiAlias=true;
+		private Color m_CanvasColor=Color.White;
+
+		protected Bitmap m_ThemeCachedBitmap=null;
+        private bool m_SuspendPaint = false;
+        private TextMarkup.BodyElement m_TextMarkup = null;
+        private bool m_RenderText = true;
+        private bool m_RightToLeftLayout = false;
+        private bool m_MarkupUsesStyleAlignment = false;
+        //private Controls.NonClientPaintHandler m_NCPainter = null;
+        private ScrollbarSkinner _ScrollSkinner = null;
+		#endregion
+
+        #region Events
+        /// <summary>
+        /// Occurs when text markup link is clicked. Markup links can be created using "a" tag, for example:
+        /// <a name="MyLink">Markup link</a>
+        /// </summary>
+        public event MarkupLinkClickEventHandler MarkupLinkClick;
+        #endregion
+
+        /// <summary>
+		///     Default constructor.
+		/// </summary>
+		public PanelEx()
+		{
+			if(!ColorFunctions.ColorsLoaded)
+			{
+				NativeFunctions.RefreshSettings();
+				NativeFunctions.OnDisplayChange();
+				ColorFunctions.LoadColors();
+			}
+
+            _ScrollSkinner = new ScrollbarSkinner(this);
+
+			this.SetStyle(ControlStyles.UserPaint,true);
+			this.SetStyle(ControlStyles.AllPaintingInWmPaint,true);
+			this.SetStyle(ControlStyles.Opaque,true);
+			this.SetStyle(ControlStyles.ResizeRedraw,true);
+			this.SetStyle(DisplayHelp.DoubleBufferFlag,true);
+			this.SetStyle(ControlStyles.SupportsTransparentBackColor,true);
+			this.SetStyle(ControlStyles.ContainerControl,true);
+
+			this.SetStyle(ControlStyles.Selectable,true);
+			//this.SetStyle(ControlStyles.StandardDoubleClick,false);
+
+			m_ColorScheme=new ColorScheme(m_ColorSchemeStyle);
+
+			ResetStyle();
+			ResetStyleMouseOver();
+			ResetStyleMouseDown();
+
+            //m_NCPainter = new Controls.NonClientPaintHandler(this, eScrollBarSkin.Optimized);
+
+            this.BackColor=Color.Transparent;
+
+            StyleManager.Register(this);
+		}
+
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing) StyleManager.Unregister(this);
+            //if (m_NCPainter != null)
+            //{
+            //    m_NCPainter.Dispose();
+            //    //m_NCPainter = null;
+            //}
+            DisposeScrollBarSkinner();
+            if (m_Style != null) m_Style.VisualPropertyChanged -= new EventHandler(this.OnVisualPropertyChanged);
+            if (m_StyleMouseDown != null) m_StyleMouseDown.VisualPropertyChanged -= new EventHandler(this.OnVisualPropertyChanged);
+            if (m_StyleMouseOver != null) m_StyleMouseOver.VisualPropertyChanged -= new EventHandler(this.OnVisualPropertyChanged);
+            base.Dispose(disposing);
+        }
+
+        /// <summary>
+        /// Called by StyleManager to notify control that style on manager has changed and that control should refresh its appearance if
+        /// its style is controlled by StyleManager.
+        /// </summary>
+        /// <param name="newStyle">New active style.</param>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public virtual void StyleManagerStyleChanged(eDotNetBarStyle newStyle)
+        {
+            OnColorSchemeChanged();
+        }
+
+        internal void DisableSelection()
+        {
+            this.SetStyle(ControlStyles.Selectable, false);
+            this.TabStop = false;
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether right-to-left mirror placement is turned on. Default value is false.
+        /// </summary>
+        [Browsable(true), DefaultValue(false), Category("Layout"), Description("Indicates whether right-to-left mirror placement is turned on. ")]
+        public bool RightToLeftLayout
+        {
+            get { return m_RightToLeftLayout; }
+            set
+            {
+                if (m_RightToLeftLayout != value)
+                {
+                    m_RightToLeftLayout = value;
+                    if (this.IsHandleCreated)
+                        this.RecreateHandle();
+                }
+            }
+        }
+		
+		[Browsable(false),EditorBrowsable(EditorBrowsableState.Never)]
+		public new System.Windows.Forms.BorderStyle BorderStyle
+		{
+			get {return base.BorderStyle;}
+			set {base.BorderStyle=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets Bar Color Scheme. Note that when ColorSchemeStyle property is set to Office 2007 style the color scheme is always retrived from the GlobalManager.Renderer and any\
+        /// changes made on this property will not have any effect.
+		/// </summary>
+		[Browsable(false),DevCoBrowsable(false),Category("Appearance"),Description("Gets or sets Bar Color Scheme."),DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+		public DevComponents.DotNetBar.ColorScheme ColorScheme
+		{
+			get {return m_ColorScheme;}
+			set
+			{
+				if(value==null)
+					throw new ArgumentException("NULL is not a valid value for this property.");
+				m_ColorScheme=value;
+                OnColorSchemeChanged();
+				if(this.Visible)
+					this.Refresh();
+			}
+		}
+		[Browsable(false),EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeColorScheme()
+		{
+            return m_ColorScheme.SchemeChanged && !BarFunctions.IsOffice2007Style(m_ColorSchemeStyle);
+		}
+		
+		private void OnVisualPropertyChanged(object sender, EventArgs e)
+		{
+            if (m_MarkupUsesStyleAlignment) this.ResizeMarkup();
+
+            if (m_SuspendPaint)
+            {
+                return;
+            }
+
+			RefreshStyleSystemColors();
+			
+			SetRegion();
+
+            this.Invalidate();
+		}
+
+        protected override void OnVisibleChanged(EventArgs e)
+        {
+            if (BarFunctions.IsOffice2007Style(m_ColorSchemeStyle))
+                RefreshStyleSystemColors();
+            base.OnVisibleChanged(e);
+        }
+
+		private eCornerType m_CurrentCornerType=eCornerType.Square;
+		private int m_CornerDiameter=8;
+		private void SetRegion()
+		{
+			SetRegion(false);
+		}
+		private void SetRegion(bool bResize)
+		{
+			if(bResize || m_CurrentCornerType!=m_Style.CornerType || m_CornerDiameter!=m_Style.CornerDiameter)
+			{
+				m_CurrentCornerType=m_Style.CornerType;
+				m_CornerDiameter=m_Style.CornerDiameter;
+				if(m_Style!=null && !(DrawThemedPane && BarFunctions.ThemedOS) && m_Style.CornerType!=eCornerType.Square)
+				{
+                    Region newRegion=m_Style.GetRegion(this.ClientRectangle);
+                    this.Region = newRegion;
+				}
+				else
+					this.Region=null;
+			}
+		}
+
+		/// <summary>
+		/// Applies color scheme colors to the style objects.
+		/// </summary>
+		public void RefreshStyleSystemColors()
+		{
+			ColorScheme cs=GetColorScheme();
+			if(m_Style!=null)
+				m_Style.ApplyColorScheme(cs);
+			if(m_StyleMouseOver!=null)
+				m_StyleMouseOver.ApplyColorScheme(cs);
+			if(m_StyleMouseDown!=null)
+				m_StyleMouseDown.ApplyColorScheme(cs);
+		}
+
+        protected override void WndProc(ref System.Windows.Forms.Message m)
+        {
+           if (m.Msg == (int)WinApi.WindowsMessages.WM_VSCROLL || m.Msg == (int)WinApi.WindowsMessages.WM_HSCROLL || m.Msg == (int)WinApi.WindowsMessages.WM_MOUSEWHEEL)
+            {
+                base.WndProc(ref m);
+                OnScrollBarValueChanged(new ScrollValueChangedEventArgs(ScrollbarControl.MapMessageToScrollChange(m.Msg)));
+                return;
+            }
+            else if (m.Msg == (int)WinApi.WindowsMessages.WM_NCCALCSIZE)
+            {
+                base.WndProc(ref m);
+                OnNonClientSizeChanged(EventArgs.Empty);
+                return;
+            }
+            else if (m.Msg == 206 || m.Msg == 8270) // Internal RichTextBox message we use to trigger scroll-bar update
+            {
+                base.WndProc(ref m);
+                OnScrollBarValueChanged(new ScrollValueChangedEventArgs(eScrollBarScrollChange.Horizontal | eScrollBarScrollChange.Vertical));
+                return;
+            }
+           else if (m.Msg == (int)WinApi.WindowsMessages.WM_MOVE) // Internal RichTextBox message we use to trigger scroll-bar update
+           {
+               base.WndProc(ref m);
+               OnControlMoved(EventArgs.Empty);
+               return;
+           }
+
+            base.WndProc(ref m);
+        }
+
+	    private void PaintScrollCorner()
+	    {
+	        IntPtr dc = WinApi.GetWindowDC(this.Handle);
+	        try
+	        {
+	            using (Graphics g = Graphics.FromHdc(dc))
+	            {
+	                g.FillRectangle(SystemBrushes.Control, this.Width - SystemInformation.VerticalScrollBarWidth,
+	                                this.Height - SystemInformation.HorizontalScrollBarHeight,
+	                                SystemInformation.VerticalScrollBarWidth,
+	                                SystemInformation.HorizontalScrollBarHeight);
+	            }
+	        }
+	        finally
+	        {
+	            WinApi.ReleaseDC(this.Handle, dc);
+	        }
+	    }
+
+	    /// <summary>
+        /// Gets or sets whether paint operations for the control are suspended.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool SuspendPaint
+        {
+            get { return m_SuspendPaint; }
+            set
+            {
+                if (m_SuspendPaint != value)
+                {
+                    m_SuspendPaint = value;
+                    if (!m_SuspendPaint)
+                    {
+                        SetRegion();
+                        this.Invalidate();
+                    }
+                }
+            }
+        }
+
+        private bool IsThemed
+        {
+            get { return DrawThemedPane && BarFunctions.ThemedOS; }
+        }
+
+		protected override void OnPaint(PaintEventArgs e)
+		{
+            if (this.ClientRectangle.Width == 0 || this.ClientRectangle.Height == 0 || m_SuspendPaint)
+                return;
+            
+            using (SolidBrush brush = new SolidBrush(m_CanvasColor))
+                e.Graphics.FillRectangle(brush, this.ClientRectangle);
+
+			if((m_Style.BackColor1.Color.IsEmpty || m_Style.BackColor1.Color.A<255) &&
+				(m_Style.BackColor2.Color.IsEmpty || m_Style.BackColor2.Color.A<255))
+			{
+				base.OnPaintBackground(e);
+			}
+
+            SmoothingMode sm = e.Graphics.SmoothingMode;
+            TextRenderingHint th = e.Graphics.TextRenderingHint;
+
+			if(m_AntiAlias)
+			{
+				e.Graphics.SmoothingMode=System.Drawing.Drawing2D.SmoothingMode.AntiAlias;
+                e.Graphics.TextRenderingHint = DisplayHelp.AntiAliasTextRenderingHint;
+			}
+
+            ItemStyle style = m_Style.Clone() as ItemStyle;
+            if (m_MouseDown && this.Enabled && m_StyleMouseDown.Custom)
+                style.ApplyStyle(m_StyleMouseDown);
+            else if (m_MouseOver && this.Enabled && m_StyleMouseOver.Custom)
+                style.ApplyStyle(m_StyleMouseOver);
+
+            if (m_TextMarkup == null)
+                RefreshTextClientRectangle();
+
+            Rectangle r = this.DisplayRectangle; // new Rectangle(0, 0, this.Width, this.Height);
+
+            // Numbers below set by experiment. Graphics.FillPath fails with System.AccessViolationException if Width or Height is larger than these numbers
+            r.Width = Math.Min(r.Width, 17200);
+            r.Height = Math.Min(r.Height, 17200);
+#if FRAMEWORK20
+            r.X -= this.Padding.Left;
+            r.Y -= this.Padding.Top;
+            r.Width += this.Padding.Horizontal;
+            r.Height += this.Padding.Vertical;
+#else
+            r.X -= this.DockPadding.Left;
+            r.Y -= this.DockPadding.Top;
+            r.Width += this.DockPadding.Left + this.DockPadding.Right;
+            r.Height += this.DockPadding.Top + this.DockPadding.Bottom;
+#endif
+            Rectangle rText = m_ClientTextRectangle;
+            rText.Inflate(-1, -1);
+
+            if (!this.Enabled)
+                style.ForeColor.Color = m_ColorScheme.ItemDisabledText;
+
+            Graphics g = e.Graphics;
+            
+			if(IsThemed)
+			{
+				if(m_ThemeCachedBitmap==null || m_ThemeCachedBitmap.Size!=this.ClientRectangle.Size)
+				{
+					DisposeThemeCachedBitmap();
+					Bitmap bmp=new Bitmap(this.ClientRectangle.Width,this.ClientRectangle.Height,e.Graphics);
+					Graphics gTmp=Graphics.FromImage(bmp);
+					try
+					{
+						this.ThemeTab.DrawBackground(gTmp,ThemeTabParts.Pane,ThemeTabStates.Normal,new Rectangle(0,0,bmp.Width,bmp.Height));
+					}
+					finally
+					{
+						gTmp.Dispose();
+					}
+					e.Graphics.DrawImage(bmp,0,0,bmp.Width,bmp.Height);
+					if(m_Style.BackgroundImage!=null)
+						BarFunctions.PaintBackgroundImage(e.Graphics,this.ClientRectangle,m_Style.BackgroundImage,m_Style.BackgroundImagePosition,m_Style.BackgroundImageAlpha);
+					m_ThemeCachedBitmap=bmp;
+				}
+				else
+				{
+					e.Graphics.DrawImage(m_ThemeCachedBitmap,0,0,m_ThemeCachedBitmap.Width,m_ThemeCachedBitmap.Height);
+				}
+
+                if (this.RenderText)
+                {
+                    Region oldClip = g.Clip;
+                    Rectangle rClip = this.ClientRectangle;
+                    rClip.Inflate(-2, -2);
+                    rClip.Height -= 3;
+                    g.SetClip(rClip);
+                    if (m_TextMarkup == null)
+                        style.PaintText(g, this.Text, rText, this.Font);
+                    else
+                    {
+                        Rectangle clip = e.ClipRectangle;
+                        if (clip.Height == this.ClientRectangle.Height && clip.Width < this.ClientRectangle.Width)
+                            clip.Width = this.ClientRectangle.Width;
+                        
+                        TextMarkup.MarkupDrawContext d = new TextMarkup.MarkupDrawContext(g, this.Font, style.ForeColor.Color, (this.RightToLeft == RightToLeft.Yes), clip, true);
+                        m_TextMarkup.Render(d);
+                    }
+                    g.Clip = oldClip;
+                }
+			}
+			else
+			{
+                if (m_TextMarkup == null)
+                {
+                    if(m_RenderText)
+                        style.Paint(g, r, this.Text, rText, this.Font);
+                    else
+                        style.Paint(g, r);
+                }
+                else
+                {
+                    style.Paint(g, r);
+                    if (m_RenderText)
+                    {
+                        Rectangle clip = e.ClipRectangle;
+                        if (clip.Height == this.ClientRectangle.Height && clip.Width < this.ClientRectangle.Width)
+                            clip.Width = this.ClientRectangle.Width;
+                        TextMarkup.MarkupDrawContext d = new TextMarkup.MarkupDrawContext(g, this.Font, style.ForeColor.Color, (this.RightToLeft == RightToLeft.Yes), clip, true);
+                        if (this.AutoScroll)
+                        {
+                            m_TextMarkup.Bounds = new Rectangle(-_TextMarkupLayoutMargin.Width + this.AutoScrollPosition.X,
+                                -_TextMarkupLayoutMargin.Height+this.AutoScrollPosition.Y,
+                                m_TextMarkup.Bounds.Width, m_TextMarkup.Bounds.Height);
+                        }
+
+                        m_TextMarkup.Render(d);
+                    }
+                }
+			}
+
+            if (this.Focused && m_ShowFocusRectangle)
+            {
+                r = this.ClientRectangle;
+                r.Inflate(-2, -2);
+                if (r.Width > 0 && r.Height > 0)
+                    ControlPaint.DrawFocusRectangle(g, r);
+            }
+
+            e.Graphics.SmoothingMode = sm;
+            e.Graphics.TextRenderingHint = th;
+
+			base.OnPaint(e);
+		}
+
+        internal bool RenderText
+        {
+            get { return m_RenderText; }
+            set { m_RenderText = value; }
+        }
+
+		protected override void OnResize(EventArgs e)
+		{
+            //if (m_NCPainter != null) m_NCPainter.PaintNonClientAreaBuffered();
+			base.OnResize(e);
+            RefreshTextClientRectangle();
+			SetRegion(true);
+		}
+
+        //protected override void OnEnabledChanged(EventArgs e)
+        //{
+        //    m_SuspendPaint = true;
+        //    base.OnEnabledChanged(e);
+        //    m_SuspendPaint = false;
+        //    this.Invalidate();
+        //}
+
+		protected override void OnChangeUICues(UICuesEventArgs e)
+		{
+			base.OnChangeUICues(e);
+			if(m_ShowFocusRectangle)
+			{
+				this.Refresh();
+			}
+		}
+
+		protected override void OnLostFocus(EventArgs e)
+		{
+			base.OnLostFocus(e);
+			if(m_ShowFocusRectangle)
+				this.Refresh();
+		}
+
+		protected override void OnGotFocus(EventArgs e)
+		{
+			base.OnGotFocus(e);
+			if(m_ShowFocusRectangle)
+				this.Refresh();
+		}
+
+        protected override void OnMouseMove(MouseEventArgs e)
+        {
+            if (m_TextMarkup != null)
+                m_TextMarkup.MouseMove(this, e);
+            base.OnMouseMove(e);
+        }
+
+		protected override void OnMouseDown(MouseEventArgs e)
+		{
+            if (m_TextMarkup != null)
+                m_TextMarkup.MouseDown(this, e);
+			if(e.Button==MouseButtons.Left)
+			{
+                SetMouseDown(true);
+			}
+			base.OnMouseDown(e);
+		}
+
+        /// <summary>
+        /// Sets the internal mouse down flag which controls appearance of the control. You can use this method to simulate the pressed state for the panel with appropriate StyleMouseDown assigned.
+        /// </summary>
+        /// <param name="mouseDown">New value for the mouse down flag.</param>
+        public void SetMouseDown(bool mouseDown)
+        {
+            if (m_MouseDown != mouseDown)
+            {
+                m_MouseDown = mouseDown;
+                if (m_StyleMouseDown.Custom)
+                    this.Invalidate(false);
+            }
+        }
+
+		protected override void OnMouseUp(MouseEventArgs e)
+		{
+			base.OnMouseUp(e);
+
+            if (m_TextMarkup != null)
+                m_TextMarkup.MouseUp(this, e);
+
+            SetMouseDown(false);
+		}
+
+        protected override void OnClick(EventArgs e)
+        {
+            if (m_TextMarkup != null)
+                m_TextMarkup.Click(this);
+            base.OnClick(e);
+        }
+        
+		protected override void OnMouseEnter(EventArgs e)
+		{
+			base.OnMouseEnter(e);
+
+            SetMouseOver(true);
+		}
+
+        /// <summary>
+        /// Sets the mouse over internal flag that tracks whether the mouse is over the control. You can use this method to simulate the mouse over appearance when appropriate StyleMouseOver style is set.
+        /// </summary>
+        /// <param name="mouseOver">New value for the mouse over flag.</param>
+        public void SetMouseOver(bool mouseOver)
+        {
+            if (m_MouseOver != mouseOver)
+            {
+                m_MouseOver = mouseOver;
+                if (m_StyleMouseOver.Custom)
+                    this.Invalidate(false);
+            }
+        }
+
+		protected override void OnMouseLeave(EventArgs e)
+		{
+			base.OnMouseLeave(e);
+            if (m_TextMarkup != null)
+                m_TextMarkup.MouseLeave(this);
+            SetMouseOver(false);
+		}
+
+		protected override void OnSystemColorsChanged(EventArgs e)
+		{
+			base.OnSystemColorsChanged(e);
+
+		    BarUtilities.InvokeDelayed(new MethodInvoker(delegate
+		    {
+		        m_ColorScheme.Refresh(null, true);
+		        RefreshStyleSystemColors();
+
+		        if (m_ThemeTab != null)
+		            RefreshThemes();
+
+		        this.Invalidate(true);
+		    }), 500);
+		}
+
+		protected override void OnHandleDestroyed(EventArgs e)
+		{
+			DisposeThemes();
+            base.OnHandleDestroyed(e);
+		}
+
+        protected override void OnFontChanged(EventArgs e)
+        {
+            base.OnFontChanged(e);
+            if (m_TextMarkup != null)
+                m_TextMarkup.InvalidateElementsSize();
+            RefreshTextClientRectangle();
+        }
+
+        private bool _TextMarkupEnabled = true;
+        /// <summary>
+        /// Gets or sets whether Text supports and renders text markup. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Gets or sets whether Text supports and renders text markup.")]
+        public bool TextMarkupEnabled
+        {
+            get { return _TextMarkupEnabled; }
+            set
+            {
+                if (_TextMarkupEnabled != value)
+                {
+                    _TextMarkupEnabled = value;
+                    OnTextChanged(EventArgs.Empty);
+                    if (_TextMarkupEnabled) ResizeMarkup();
+                    this.Invalidate();
+                }
+            }
+        }
+
+        protected override void OnTextChanged(EventArgs e)
+        {
+            string text=this.Text;
+            
+            if (m_TextMarkup != null)
+            {
+                m_TextMarkup.MouseLeave(this);
+                m_TextMarkup.HyperLinkClick -= new EventHandler(TextMarkupLinkClicked);
+                m_TextMarkup = null;
+            }
+
+            if (_TextMarkupEnabled && TextMarkup.MarkupParser.IsMarkup(ref text))
+                m_TextMarkup = TextMarkup.MarkupParser.Parse(text);
+
+            if (m_TextMarkup != null)
+            {
+                m_TextMarkup.HyperLinkClick += new EventHandler(TextMarkupLinkClicked);
+                RefreshTextClientRectangle();
+            }
+            base.OnTextChanged(e);
+        }
+
+        private void TextMarkupLinkClicked(object sender, EventArgs e)
+        {
+            TextMarkup.HyperLink link = sender as TextMarkup.HyperLink;
+            if (link != null)
+            {
+                OnMarkupLinkClick(new MarkupLinkClickEventArgs(link.Name, link.HRef));
+            }
+        }
+
+        protected virtual void OnMarkupLinkClick(MarkupLinkClickEventArgs e)
+        {
+            if (this.MarkupLinkClick != null)
+                MarkupLinkClick(this, e);
+        }
+
+        protected override bool ProcessMnemonic(char charCode)
+        {
+            if (IsMnemonic(charCode, this.Text))
+            {
+                OnClick(new EventArgs());
+                return true;
+            }
+            return base.ProcessMnemonic(charCode);
+        }
+
+		/// <summary>
+		///   Gets or sets the text displayed on panel.
+		/// </summary>
+        [Browsable(true), DevCoBrowsable(true), Editor("DevComponents.DotNetBar.Design.TextMarkupUIEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), EditorBrowsable(EditorBrowsableState.Always), Category("Appearance"), Description("Gets or sets the text displayed on panel.")]
+		public override string Text
+		{
+			get {return m_Text;}
+			set
+			{
+                if (m_Text != value)
+                {
+                    base.Text = value;
+                    m_Text = value;
+                    OnTextChanged(new EventArgs());
+                    this.Refresh();
+                }
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets whether focus rectangle is displayed when control has focus.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),DefaultValue(false),Category("Appearance"),Description("Indicates whether focus rectangle is displayed when control has focus.")]
+		public bool ShowFocusRectangle
+		{
+			get {return m_ShowFocusRectangle;}
+			set
+			{
+				m_ShowFocusRectangle=value;
+				if(this.DesignMode)
+					this.Refresh();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the canvas color for the panel. Canvas color will be visible on areas of the control that do not get covered
+		/// by the style and it will also be used as a base color for style to be painted on.
+		/// </summary>
+		[Browsable(true),Category("Background"),Description("Gets or sets the canvas color.")]
+		public Color CanvasColor
+		{
+			get
+			{
+				return m_CanvasColor;
+			}
+			set
+			{
+				m_CanvasColor=value;
+				if(this.DesignMode)
+					this.Refresh();
+			}
+		}
+		/// <summary>
+		/// Indicates whether CanvasColor should be serialized. Used by windows forms designer design-time support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeCanvasColor()
+		{return (m_CanvasColor!=Color.White);}
+		/// <summary>
+		/// Resets CanvasColor to it's default value. Used by windows forms designer design-time support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetCanvasColor()
+		{
+			m_CanvasColor=Color.White;
+		}
+
+		/// <summary>
+		/// Gets or sets the panel style.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),NotifyParentPropertyAttribute(true),Category("Style"),Description("Gets or sets panel style."),DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+		public ItemStyle Style
+		{
+			get
+			{
+				return m_Style;
+			}
+		}
+		/// <summary>
+		///     Resets the style to it's default value.
+		/// </summary>
+		public void ResetStyle()
+		{
+            if (m_Style != null) m_Style.VisualPropertyChanged -= new EventHandler(this.OnVisualPropertyChanged);
+			// Set default style
+			m_Style=new ItemStyle();			
+			m_Style.VisualPropertyChanged+=new EventHandler(this.OnVisualPropertyChanged);
+			RefreshStyleSystemColors();
+		}
+
+		/// <summary>
+		/// Resets the internal mouse tracking properties that track whether mouse is over the panel and whether is mouse pressed while over the panel.
+		/// </summary>
+		public void ResetMouseTracking()
+		{
+			m_MouseOver=false;
+			m_MouseDown=false;
+			this.Refresh();
+		}
+
+		/// <summary>
+		/// Gets or sets the panel style when mouse hovers over the panel.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),NotifyParentPropertyAttribute(true),Category("Style"),Description("Gets or sets the panel style when mouse hovers over the panel."),DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+		public ItemStyle StyleMouseOver
+		{
+			get
+			{
+				return m_StyleMouseOver;
+			}
+		}
+		/// <summary>
+		///     Resets the style to it's default value.
+		/// </summary>
+		public void ResetStyleMouseOver()
+		{
+            if (m_StyleMouseOver != null) m_StyleMouseOver.VisualPropertyChanged -= new EventHandler(this.OnVisualPropertyChanged);
+			m_StyleMouseOver=new ItemStyle();
+			m_StyleMouseOver.VisualPropertyChanged+=new EventHandler(this.OnVisualPropertyChanged);
+		}
+
+		/// <summary>
+		/// Gets or sets the panel style when mouse button is pressed on the panel.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),NotifyParentPropertyAttribute(true),Category("Style"),Description("Gets or sets the panel style when mouse button is pressed on the panel."),DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+		public ItemStyle StyleMouseDown
+		{
+			get
+			{
+				return m_StyleMouseDown;
+			}
+		}
+		/// <summary>
+		///     Resets the style to it's default value.
+		/// </summary>
+		public void ResetStyleMouseDown()
+		{
+            if (m_StyleMouseDown != null) m_StyleMouseDown.VisualPropertyChanged -= new EventHandler(this.OnVisualPropertyChanged);
+			m_StyleMouseDown=new ItemStyle();
+			m_StyleMouseDown.VisualPropertyChanged+=new EventHandler(this.OnVisualPropertyChanged);
+		}
+
+		[Browsable(false),EditorBrowsable(EditorBrowsableState.Never),DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public override Color BackColor
+		{
+			get {return base.BackColor;}
+			set {base.BackColor=value;}
+		}
+
+		[Browsable(false),EditorBrowsable(EditorBrowsableState.Never),DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public override Image BackgroundImage
+		{
+			get {return base.BackgroundImage;}
+			set {base.BackgroundImage=value;}
+		}
+
+		[Browsable(false),EditorBrowsable(EditorBrowsableState.Never),DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public override Color ForeColor
+		{
+			get {return base.ForeColor;}
+			set {base.ForeColor=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets whether anti-alias smoothing is used while painting.
+		/// </summary>
+		[DefaultValue(true),Browsable(true),Category("Appearance"),Description("Gets or sets whether anti-aliasing is used while painting.")]
+		public bool AntiAlias
+		{
+			get {return m_AntiAlias;}
+			set
+			{
+				if(m_AntiAlias!=value)
+				{
+					m_AntiAlias=value;
+                    OnAntiAliasChanged();
+					this.Refresh();
+				}
+			}
+		}
+
+        /// <summary>
+        /// Called when AntiAlias property has changed.
+        /// </summary>
+        protected virtual void OnAntiAliasChanged() { }
+
+        protected ColorScheme GetColorScheme()
+        {
+            if (BarFunctions.IsOffice2007Style(m_ColorSchemeStyle))
+            {
+                Rendering.Office2007Renderer r = Rendering.GlobalManager.Renderer as Rendering.Office2007Renderer;
+                if (r != null && r.ColorTable.LegacyColors != null)
+                    return r.ColorTable.LegacyColors;
+            }
+
+            return m_ColorScheme;
+        }
+
+
+		/// <summary>
+		///     Gets or sets color scheme style.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),Category("Style"),Description("Gets or sets color scheme style."),DefaultValue(eDotNetBarStyle.Office2003)]
+		public eDotNetBarStyle ColorSchemeStyle
+		{
+			get {return m_ColorSchemeStyle;}
+			set
+			{
+				m_ColorSchemeStyle=value;
+                if (BarFunctions.IsOffice2007Style(m_ColorSchemeStyle) && Rendering.GlobalManager.Renderer is Rendering.Office2007Renderer)
+                    m_ColorScheme = ((Rendering.Office2007Renderer)Rendering.GlobalManager.Renderer).ColorTable.LegacyColors;
+                else
+                    m_ColorScheme = new ColorScheme(m_ColorSchemeStyle);
+
+                //if (m_NCPainter != null)
+                //{
+                //    if (BarFunctions.IsOffice2007Style(value))
+                //        m_NCPainter.SkinScrollbars = eScrollBarSkin.Optimized;
+                //    else
+                //        m_NCPainter.SkinScrollbars = eScrollBarSkin.None;
+                //}
+
+                OnColorSchemeChanged();
+				this.Invalidate();
+			}
+		}
+
+        /// <summary>
+        /// Called after either ColorScheme or ColorSchemeStyle has changed. If you override make sure that you call base implementation so default
+        /// processing can occur.
+        /// </summary>
+        protected virtual void OnColorSchemeChanged()
+        {
+            RefreshStyleSystemColors();
+        }
+
+#if FRAMEWORK20
+        public override Size GetPreferredSize(Size proposedSize)
+        {
+            if (this.Controls.Count == 0)
+            {
+                if (!BarFunctions.IsHandleValid(this))
+                    return proposedSize;
+                Size size = GetAutoSize();
+                if (size.IsEmpty) return proposedSize;
+                return size;
+            }
+            else
+                return base.GetPreferredSize(proposedSize);
+        }
+#endif
+
+        /// <summary>
+        /// Returns the size of the panel calculated based on the text assigned.
+        /// </summary>
+        /// <returns>Calculated size of the panel or Size.Empty if panel size cannot be calculated.</returns>
+        public Size GetAutoSize()
+        {
+            return GetAutoSize(0);
+        }
+
+        /// <summary>
+        /// Returns the size of the panel calculated based on the text assigned.
+        /// </summary>
+        /// <returns>Calculated size of the panel or Size.Empty if panel size cannot be calculated.</returns>
+        public Size GetAutoSize(int preferedWidth)
+        {
+            if (m_TextMarkup == null && this.Text.Length == 0) return new Size(16, 16);
+            Size size = Size.Empty;
+
+            if (m_TextMarkup != null)
+            {
+                if (preferedWidth == 0)
+                {
+                    size = m_TextMarkup.Bounds.Size;
+                }
+                else
+                {
+                    size = GetMarkupSize(preferedWidth);
+                }
+                size.Width += 4;
+                size.Height += 6;
+            }
+            else if (this.Text.Length > 0)
+            {
+                Font font = this.Font;
+                if (m_Style.Font != null) font = m_Style.Font;
+                using (Graphics g = BarFunctions.CreateGraphics(this))
+                {
+                    if(preferedWidth<=0)
+                        size = TextDrawing.MeasureString(g, this.Text, font, 0, (this.Style.UseMnemonic ? eTextFormat.Default : eTextFormat.NoPrefix));
+                    else
+                        size = TextDrawing.MeasureString(g, this.Text, font, preferedWidth, (this.Style.UseMnemonic ? eTextFormat.Default : eTextFormat.NoPrefix));
+                }
+                size.Width += 2;
+                size.Height += 2;
+            }
+            if (size.IsEmpty) return size;
+
+            size.Width += m_Style.MarginLeft + m_Style.MarginRight;
+            size.Height += m_Style.MarginTop + m_Style.MarginBottom;
+
+            return size;
+        }
+
+		protected virtual void RefreshTextClientRectangle()
+		{
+			Rectangle r=this.DisplayRectangle;
+
+            if (m_TextDockConstrained)
+            {
+                foreach (Control ctrl in this.Controls)
+                {
+                    if (ctrl.Dock != DockStyle.None)
+                    {
+                        if (ctrl.Dock == DockStyle.Fill)
+                        {
+                            r = Rectangle.Empty;
+                            break;
+                        }
+                        switch (ctrl.Dock)
+                        {
+                            case DockStyle.Left:
+                                {
+                                    r.X += ctrl.Width;
+                                    r.Width -= ctrl.Width;
+                                    break;
+                                }
+                            case DockStyle.Right:
+                                {
+                                    r.Width -= ctrl.Width;
+                                    break;
+                                }
+                            case DockStyle.Top:
+                                {
+                                    r.Y += ctrl.Height;
+                                    r.Height -= ctrl.Height;
+                                    break;
+                                }
+                            case DockStyle.Bottom:
+                                {
+                                    r.Height -= ctrl.Height;
+                                    break;
+                                }
+                        }
+                    }
+                }
+
+                if (r.Width <= 0 || r.Height <= 0)
+                    r = Rectangle.Empty;
+            }
+
+			m_ClientTextRectangle=r;
+
+            ResizeMarkup();
+		}
+
+        private Size GetMarkupSize(int proposedWidth)
+        {
+            Size size = Size.Empty;
+            if (m_TextMarkup != null)
+            {
+                Rectangle r = new Rectangle(0, 0, proposedWidth, 500);
+                r.Inflate(-2, -2);
+                r.Inflate(-(m_Style.MarginLeft + m_Style.MarginRight), -(m_Style.MarginTop + m_Style.MarginBottom));
+                if (this.IsThemed)
+                    r.Height -= 4;
+                Graphics g = this.CreateGraphics();
+                SmoothingMode sm = g.SmoothingMode;
+                TextRenderingHint th = g.TextRenderingHint;
+                TextMarkup.BodyElement markup = TextMarkup.MarkupParser.Parse(this.Text);
+                try
+                {
+                    if (m_AntiAlias)
+                    {
+                        g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.AntiAlias;
+                        g.TextRenderingHint = DisplayHelp.AntiAliasTextRenderingHint;
+                    }
+                    TextMarkup.MarkupDrawContext d = new TextMarkup.MarkupDrawContext(g, this.Font, SystemColors.Control, (this.RightToLeft == RightToLeft.Yes));
+                    markup.Measure(r.Size, d);
+                    size = markup.Bounds.Size;
+                }
+                finally
+                {
+                    g.SmoothingMode = sm;
+                    g.TextRenderingHint = th;
+                    g.Dispose();
+                }
+            }
+
+            return size;
+        }
+
+	    private bool _ResizeMarkupDelayed = false;
+	    protected override void OnHandleCreated(EventArgs e)
+	    {
+	        if (_ResizeMarkupDelayed)
+	        {
+	            ResizeMarkup();
+	        }
+	        base.OnHandleCreated(e);
+	    }
+
+	    /// <summary>
+        /// Updates the markup size to reflect current position of the scrollbars. You must call this method if you are scrolling control with markup using the AutoScrollPosition property.
+        /// </summary>
+        public void UpdateMarkupSize()
+        {
+            RefreshTextClientRectangle();
+            this.Invalidate();
+        }
+
+	    private Size _TextMarkupLayoutMargin = new Size(-2, -2);
+        protected virtual void ResizeMarkup()
+        {
+            if (m_TextMarkup != null)
+            {
+                if (!BarFunctions.IsHandleValid(this))
+                {
+                    _ResizeMarkupDelayed = true;
+                    return;
+                }
+                _ResizeMarkupDelayed = false;
+                Rectangle r = this.ClientTextRectangle;
+                r.Inflate(_TextMarkupLayoutMargin);
+                r.Inflate(-(m_Style.MarginLeft + m_Style.MarginRight), -(m_Style.MarginTop + m_Style.MarginBottom));
+                if (this.IsThemed)
+                    r.Height -= 4;
+                if (r.Width <= 0 || r.Height <= 0)
+                    return;
+                Graphics g = this.CreateGraphics();
+                SmoothingMode sm = g.SmoothingMode;
+                TextRenderingHint th = g.TextRenderingHint;
+                try
+                {
+                    if (m_AntiAlias)
+                    {
+                        g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.AntiAlias;
+                        g.TextRenderingHint = DisplayHelp.AntiAliasTextRenderingHint;
+                    }
+                    TextMarkup.MarkupDrawContext d = new TextMarkup.MarkupDrawContext(g, this.Font, SystemColors.Control, (this.RightToLeft == RightToLeft.Yes));
+                    m_TextMarkup.Measure(r.Size, d);
+                    if (m_MarkupUsesStyleAlignment)
+                    {
+                        if (m_TextMarkup.Bounds.Height < r.Height)
+                        {
+                            if (this.Style.LineAlignment == StringAlignment.Center)
+                            {
+                                r.Y += (r.Height - m_TextMarkup.Bounds.Height) / 2;
+                                r.Height = m_TextMarkup.Bounds.Height;
+                            }
+                            else if (this.Style.LineAlignment == StringAlignment.Far)
+                            {
+                                r.Y = (r.Bottom - m_TextMarkup.Bounds.Height);
+                                r.Height = m_TextMarkup.Bounds.Height;
+                            }
+                        }
+
+                        if (m_TextMarkup.Bounds.Width < r.Width)
+                        {
+                            if (this.Style.Alignment == StringAlignment.Center)
+                            {
+                                r.X += (r.Width - m_TextMarkup.Bounds.Width) / 2;
+                                r.Width = m_TextMarkup.Bounds.Width;
+                            }
+                            else if (this.Style.Alignment == StringAlignment.Far && this.RightToLeft == RightToLeft.No || 
+                                this.Style.Alignment == StringAlignment.Near && this.RightToLeft== RightToLeft.Yes)
+                            {
+                                r.X = (r.Right - m_TextMarkup.Bounds.Width);
+                                r.Width = m_TextMarkup.Bounds.Width;
+                            }
+                        }
+                    }
+                    
+                    m_TextMarkup.Arrange(r, d);
+                    if (this.AutoScroll)
+                    {
+                        Size autoScrollMinSize = Size.Empty;
+                        if (m_TextMarkup.Bounds.Height > r.Height)
+                            autoScrollMinSize.Height = m_TextMarkup.Bounds.Height + m_Style.MarginTop + m_Style.MarginBottom + 2;
+                        if (m_TextMarkup.Bounds.Width > r.Width)
+                            autoScrollMinSize.Width = m_TextMarkup.Bounds.Width + m_Style.MarginLeft + m_Style.MarginRight + 2;
+
+                        if (this.AutoScrollMinSize != autoScrollMinSize)
+                            this.AutoScrollMinSize = autoScrollMinSize;
+                    }
+                    else if (!this.AutoScrollMinSize.IsEmpty)
+                        this.AutoScrollMinSize = Size.Empty;
+                }
+                finally
+                {
+                    g.SmoothingMode = sm;
+                    g.TextRenderingHint = th;
+                    g.Dispose();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the container will allow the user to scroll to any controls placed outside of its visible boundaries.
+        /// </summary>
+        [DefaultValue(false), Browsable(true)]
+        public override bool AutoScroll
+        {
+            get
+            {
+                return base.AutoScroll;
+            }
+            set
+            {
+                if (!value)
+                    this.AutoScrollMinSize = Size.Empty;
+                base.AutoScroll = value;
+                this.RefreshTextClientRectangle();
+            }
+        }
+
+		/// <summary>
+		/// Gets or sets whether text rectangle painted on panel is considering docked controls inside the panel. 
+		/// </summary>
+		[DefaultValue(true),Category("Appearance"),Description("Indicates whether text rectangle painted on panel is considering docked controls inside the panel.")]
+		public bool TextDockConstrained
+		{
+			get {return m_TextDockConstrained;}
+			set
+			{
+				m_TextDockConstrained=value;
+				if(this.DesignMode)
+					this.Refresh();
+			}
+		
+		}
+
+		protected override void OnControlAdded(ControlEventArgs e)
+		{
+			base.OnControlAdded(e);
+            RefreshTextClientRectangle();
+			if(this.DesignMode)
+			{
+				this.Refresh();
+			}
+		}
+		protected override void OnControlRemoved(ControlEventArgs e)
+		{
+			base.OnControlRemoved(e);
+            RefreshTextClientRectangle();
+			if(m_TextDockConstrained && this.DesignMode)
+			{
+				this.Refresh();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the text rectangle. This property is set by internal implementation and it should not be set by outside code.
+		/// </summary>
+		[Browsable(false),DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public Rectangle ClientTextRectangle
+		{
+			get {return m_ClientTextRectangle;}
+            set { m_ClientTextRectangle = value; }
+		}
+
+		/// <summary>
+		///     Applies predefined Panel color scheme to the control.
+		/// </summary>
+		public void ApplyPanelStyle()
+		{
+			//this.ColorSchemeStyle=eDotNetBarStyle.Office2003;
+
+			this.ResetStyle();
+			this.ResetStyleMouseDown();
+			this.ResetStyleMouseOver();
+
+			m_Style.Border=eBorderType.SingleLine;
+			m_Style.BorderColor.ColorSchemePart=eColorSchemePart.PanelBorder;
+			m_Style.BackColor1.ColorSchemePart=eColorSchemePart.PanelBackground;
+			m_Style.BackColor2.ColorSchemePart=eColorSchemePart.PanelBackground2;
+			m_Style.GradientAngle=m_ColorScheme.PanelBackgroundGradientAngle;
+			m_Style.ForeColor.ColorSchemePart=eColorSchemePart.PanelText;
+			m_Style.Alignment=StringAlignment.Center;
+			m_Style.LineAlignment=StringAlignment.Center;
+
+			this.Refresh();
+		}
+
+		/// <summary>
+		///     Applies predefined Button color scheme to the control.
+		/// </summary>
+		public void ApplyButtonStyle()
+		{
+			//this.ColorSchemeStyle=eDotNetBarStyle.Office2003;
+
+			this.ResetStyle();
+			this.ResetStyleMouseDown();
+			this.ResetStyleMouseOver();
+
+			this.Style.Alignment = System.Drawing.StringAlignment.Center;
+			this.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground;
+			this.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground2;
+			//this.Style.BackgroundImagePosition = DevComponents.DotNetBar.eBackgroundImagePosition.Tile;
+			this.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+			this.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder;
+			this.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText;
+			this.Style.GradientAngle = 90;
+			this.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center;
+			this.StyleMouseDown.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground;
+			this.StyleMouseDown.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground2;
+			this.StyleMouseDown.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBorder;
+			this.StyleMouseDown.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedText;
+			this.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
+			this.StyleMouseOver.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemHotBackground;
+			this.StyleMouseOver.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemHotBackground2;
+			this.StyleMouseOver.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemHotBorder;
+			this.StyleMouseOver.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemHotText;
+
+			this.Refresh();
+		}
+
+		/// <summary>
+		///     Applies predefined Label color scheme to the control.
+		/// </summary>
+		public void ApplyLabelStyle()
+		{
+			this.ResetStyle();
+			this.ResetStyleMouseDown();
+			this.ResetStyleMouseOver();
+
+			TypeDescriptor.GetProperties(this.Style)["Alignment"].SetValue(this.Style,System.Drawing.StringAlignment.Center);
+			TypeDescriptor.GetProperties(this.Style.BackColor1)["ColorSchemePart"].SetValue(this.Style.BackColor1,DevComponents.DotNetBar.eColorSchemePart.BarBackground);
+			//TypeDescriptor.GetProperties(this.Style.BackColor2)["ColorSchemePart"].SetValue(this.Style.BackColor2,DevComponents.DotNetBar.eColorSchemePart.BarBackground2);
+			//TypeDescriptor.GetProperties(this.Style)["BackgroundImagePosition"].SetValue(this.Style,eBackgroundImagePosition.Tile);
+			TypeDescriptor.GetProperties(this.Style.BorderColor)["ColorSchemePart"].SetValue(this.Style.BorderColor,eColorSchemePart.BarDockedBorder);
+			TypeDescriptor.GetProperties(this.Style.ForeColor)["ColorSchemePart"].SetValue(this.Style.ForeColor,eColorSchemePart.ItemText);
+			TypeDescriptor.GetProperties(this.Style)["GradientAngle"].SetValue(this.Style,90);
+			//this.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center;
+			//this.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
+
+			this.Refresh();
+		}
+
+        protected override CreateParams CreateParams
+        {
+            get
+            {
+                CreateParams cp = base.CreateParams;
+                if (m_RightToLeftLayout)
+                {
+                    const int WS_EX_LAYOUTRTL = 0x400000;
+                    const int WS_EX_NOINHERITLAYOUT = 0x100000;
+                    cp.ExStyle |= WS_EX_LAYOUTRTL | WS_EX_NOINHERITLAYOUT;
+                }
+                return cp;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether text markup if it occupies less space than control provides uses the Style Alignment and LineAlignment properties to align the markup inside of the control. Default value is false.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), DefaultValue(false), Description("Indicates whether text markup if it occupies less space than control provides uses the Style Alignment and LineAlignment properties to align the markup inside of the control.")]
+        public virtual bool MarkupUsesStyleAlignment
+        {
+            get { return m_MarkupUsesStyleAlignment; }
+            set
+            {
+                if (m_MarkupUsesStyleAlignment != value)
+                {
+                    m_MarkupUsesStyleAlignment = value;
+                    if (BarFunctions.IsHandleValid(this) && m_TextMarkup!=null)
+                    {
+                        this.ResizeMarkup();
+                        this.Invalidate();
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Returns reference to internal vertical scroll-bar control.
+        /// </summary>
+        [Browsable(false)]
+        public VScrollBarAdv VScrollBar
+        {
+            get
+            {
+                if (_ScrollSkinner!=null)
+                    return _ScrollSkinner.VScrollBar;
+                return null;
+            }
+        }
+
+
+        /// <summary>
+        /// Returns reference to internal horizontal scroll-bar control.
+        /// </summary>
+        [Browsable(false)]
+        public HScrollBarAdv HScrollBar
+        {
+            get
+            {
+                if (_ScrollSkinner != null)
+                    return _ScrollSkinner.HScrollBar;
+                return null;
+            }
+        }
+
+        private void DisposeScrollBarSkinner()
+        {
+            if (_ScrollSkinner != null)
+            {
+                _ScrollSkinner.Dispose();
+                _ScrollSkinner = null;
+            }
+        }
+        private bool _UseThemedScrollbars=true;
+        /// <summary>
+        /// Indicates whether panel uses themed DotNetBar scrollbars. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether panel uses themed DotNetBar scrollbars.")]
+        public bool UseThemedScrollbars
+        {
+            get
+            {
+                return _UseThemedScrollbars;
+            }
+            set
+            {
+                if (_UseThemedScrollbars != value)
+                {
+                    DisposeScrollBarSkinner();
+                    _UseThemedScrollbars = value;
+                    if (_UseThemedScrollbars)
+                    {
+                        _ScrollSkinner = new ScrollbarSkinner(this);
+                        _ScrollSkinner.ScrollBarAppearance = _ScrollBarAppearance;
+                    }
+                }
+            }
+        }
+
+        private eScrollBarAppearance _ScrollBarAppearance = eScrollBarAppearance.Default;
+        /// <summary>
+        /// Gets or sets the scroll-bar visual style.
+        /// </summary>
+        [DefaultValue(eScrollBarAppearance.Default), Category("Appearance"), Description("Gets or sets the scroll-bar visual style.")]
+        public eScrollBarAppearance ScrollBarAppearance
+        {
+            get { return _ScrollBarAppearance; }
+            set
+            {
+                _ScrollBarAppearance = value;
+                if (_ScrollSkinner != null)
+                    _ScrollSkinner.ScrollBarAppearance = _ScrollBarAppearance;
+            }
+        }
+
+
+		#region IButtonControl implementation
+		/// <summary>
+		/// Gets or sets the value returned to the parent form when the button is clicked.
+		/// </summary>
+		[Browsable(true),Category("Behavior"),DefaultValue(DialogResult.None),Description("Gets or sets the value returned to the parent form when the button is clicked.")]
+		public DialogResult DialogResult
+		{
+			get
+			{
+				return m_DialogResult;
+			}
+
+			set
+			{
+				if(Enum.IsDefined(typeof(DialogResult), value))                
+				{
+					m_DialogResult=value;
+				}
+			}    
+		}
+
+		/// <summary>
+		/// Notifies a control that it is the default button so that its appearance and behavior is adjusted accordingly.
+		/// </summary>
+		/// <param name="value">true if the control should behave as a default button; otherwise false.</param>
+		public void NotifyDefault(bool value)
+		{
+			if(m_IsDefault!=value)
+			{
+				m_IsDefault=value;
+			}
+		}
+
+		/// <summary>
+		/// Generates a Click event for the control.
+		/// </summary>
+		public void PerformClick()
+		{
+			if(this.CanSelect)
+			{
+				this.OnClick(EventArgs.Empty);
+			}
+		}
+		#endregion
+
+		#region Themes Support
+		/// <summary>
+		/// Specifies whether item is drawn using Themes when running on OS that supports themes like Windows XP.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DevCoBrowsable(true),System.ComponentModel.DefaultValue(false),System.ComponentModel.Category("Appearance"),System.ComponentModel.Description("Specifies whether item is drawn using Themes when running on OS that supports themes like Windows XP.")]
+		public virtual bool ThemeAware
+		{
+			get
+			{
+				return DrawThemedPane;
+			}
+			set
+			{
+				DisposeThemeCachedBitmap();
+				DrawThemedPane=value;
+				this.Refresh();
+			}
+		}
+
+		internal bool DrawThemedPane=false;
+		private void RefreshThemes()
+		{
+			DisposeThemeCachedBitmap();
+			if(m_ThemeTab!=null)
+			{
+				m_ThemeTab.Dispose();
+				m_ThemeTab=new ThemeTab(this);
+			}
+		}
+		private void DisposeThemes()
+		{
+			if(m_ThemeTab!=null)
+			{
+				m_ThemeTab.Dispose();
+				m_ThemeTab=null;
+			}
+			DisposeThemeCachedBitmap();
+		}
+		protected void DisposeThemeCachedBitmap()
+		{
+			if(m_ThemeCachedBitmap!=null)
+			{
+				m_ThemeCachedBitmap.Dispose();
+				m_ThemeCachedBitmap=null;
+			}
+		}
+		internal DevComponents.DotNetBar.ThemeTab ThemeTab
+		{
+			get
+			{
+				if(m_ThemeTab==null)
+					m_ThemeTab=new ThemeTab(this);
+				return m_ThemeTab;
+			}
+		}
+		#endregion
+
+        #region INonClientControl Members
+        private Rendering.BaseRenderer m_DefaultRenderer = null;
+        /// <summary>
+        /// Returns the renderer control will be rendered with.
+        /// </summary>
+        /// <returns>The current renderer.</returns>
+        private Rendering.BaseRenderer GetRenderer()
+        {
+            if (Rendering.GlobalManager.Renderer != null)
+                return Rendering.GlobalManager.Renderer;
+            
+            if (m_DefaultRenderer == null)
+                m_DefaultRenderer = new Rendering.Office2007Renderer();
+
+            return m_DefaultRenderer;
+        }
+
+        void DevComponents.DotNetBar.Controls.INonClientControl.BaseWndProc(ref Message m)
+        {
+            base.WndProc(ref m);
+        }
+
+        ItemPaintArgs DevComponents.DotNetBar.Controls.INonClientControl.GetItemPaintArgs(Graphics g)
+        {
+            ItemPaintArgs pa = new ItemPaintArgs(this as IOwner, this, g, GetColorScheme());
+            pa.Renderer = this.GetRenderer();
+            pa.DesignerSelection = false; // m_DesignerSelection;
+            pa.GlassEnabled = !this.DesignMode && WinApi.IsGlassEnabled;
+            return pa;
+        }
+
+        ElementStyle DevComponents.DotNetBar.Controls.INonClientControl.BorderStyle
+        {
+            get { return null; }
+        }
+
+        void DevComponents.DotNetBar.Controls.INonClientControl.PaintBackground(PaintEventArgs e)
+        {
+            base.OnPaintBackground(e);
+        }
+
+        IntPtr DevComponents.DotNetBar.Controls.INonClientControl.Handle
+        {
+            get { return this.Handle; }
+        }
+
+        int DevComponents.DotNetBar.Controls.INonClientControl.Width
+        {
+            get { return this.Width; }
+        }
+
+        int DevComponents.DotNetBar.Controls.INonClientControl.Height
+        {
+            get { return this.Height; }
+        }
+
+        bool DevComponents.DotNetBar.Controls.INonClientControl.IsHandleCreated
+        {
+            get { return this.IsHandleCreated; }
+        }
+
+        Point DevComponents.DotNetBar.Controls.INonClientControl.PointToScreen(Point client)
+        {
+            return this.PointToScreen(client);
+        }
+
+        Color DevComponents.DotNetBar.Controls.INonClientControl.BackColor
+        {
+            get { return this.BackColor; }
+        }
+        void DevComponents.DotNetBar.Controls.INonClientControl.AdjustClientRectangle(ref Rectangle r) { }
+        void DevComponents.DotNetBar.Controls.INonClientControl.AdjustBorderRectangle(ref Rectangle r) { }
+        void DevComponents.DotNetBar.Controls.INonClientControl.RenderNonClient(Graphics g) { }
+
+        private Color _DisabledBackColor = Color.Empty;
+        /// <summary>
+        /// Specifies back color when Enabled=false
+        /// </summary>
+        [Browsable(false), Category("Appearance"), Description("Specifies back color when Enabled=false")]
+        public Color DisabledBackColor
+        {
+            get { return _DisabledBackColor; }
+            set
+            {
+                _DisabledBackColor = value;
+                if (!Enabled) this.Invalidate();
+            }
+        }
+        #endregion
+
+        #region IScrollBarOverrideSupport Members
+        [Browsable(false)]
+        public event EventHandler NonClientSizeChanged;
+        /// <summary>
+        /// Raises NonClientSizeChanged event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnNonClientSizeChanged(EventArgs e)
+        {
+            EventHandler handler = NonClientSizeChanged;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        public event ScrollValueChangedHandler ScrollBarValueChanged;
+        /// <summary>
+        /// Raises ScrollBarValueChanged event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnScrollBarValueChanged(ScrollValueChangedEventArgs e)
+        {
+            ScrollValueChangedHandler handler = ScrollBarValueChanged;
+            if (handler != null)
+                handler(this, e);
+        }
+        [Browsable(false)]
+        public event EventHandler ControlMoved;
+        /// <summary>
+        /// Raises NonClientSizeChanged event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnControlMoved(EventArgs e)
+        {
+            EventHandler handler = ControlMoved;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        bool IScrollBarOverrideSupport.DesignMode
+        {
+            get
+            {
+                return this.DesignMode;
+            }
+        }
+        #endregion
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/PanelExDesigner.cs b/PROMS/DotNetBar Source Code/PanelExDesigner.cs
new file mode 100644
index 00000000..dfa11caa
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/PanelExDesigner.cs	
@@ -0,0 +1,142 @@
+using System;
+using System.Windows.Forms;
+using System.Windows.Forms.Design;
+using System.Collections;
+using System.Drawing;
+using System.ComponentModel.Design;
+using System.ComponentModel;
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Summary description for PanelExDesigner.
+	/// </summary>
+	public class PanelExDesigner:System.Windows.Forms.Design.ScrollableControlDesigner
+	{
+		public override DesignerVerbCollection Verbs 
+		{
+			get 
+			{
+				DesignerVerb[] verbs;
+				verbs = new DesignerVerb[]
+				{
+					new DesignerVerb("Apply Panel Style", new EventHandler(ApplyPanelStyle)),
+					new DesignerVerb("Apply Button Style", new EventHandler(ApplyButtonStyle)),
+					new DesignerVerb("Apply Label Style", new EventHandler(ApplyLabelStyle))
+				};
+				return new DesignerVerbCollection(verbs);
+			}
+		}
+
+		private void ApplyPanelStyle(object sender, EventArgs e)
+		{
+			PanelEx p=this.Control as PanelEx;
+			if(p==null)
+				return;
+
+			IComponentChangeService change=this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+			if(change!=null)
+				change.OnComponentChanging(this.Component,null);
+
+			p.ApplyPanelStyle();
+
+			if(change!=null)
+				change.OnComponentChanged(this.Component,null,null,null);
+		}
+
+		private void ApplyButtonStyle(object sender, EventArgs e)
+		{
+			PanelEx p=this.Control as PanelEx;
+			if(p==null)
+				return;
+			
+			IComponentChangeService change=this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+			if(change!=null)
+				change.OnComponentChanging(this.Component,null);
+
+			p.ApplyButtonStyle();
+
+			if(change!=null)
+				change.OnComponentChanged(this.Component,null,null,null);
+		}
+
+		private void ApplyLabelStyle(object sender, EventArgs e)
+		{
+			PanelEx p=this.Control as PanelEx;
+			if(p==null)
+				return;
+			
+			IComponentChangeService change=this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+			if(change!=null)
+				change.OnComponentChanging(this.Component,null);
+
+			p.ApplyLabelStyle();
+
+			if(change!=null)
+				change.OnComponentChanged(this.Component,null,null,null);
+		}
+#if FRAMEWORK20
+        public override void InitializeNewComponent(IDictionary defaultValues)
+        {
+            base.InitializeNewComponent(defaultValues);
+            SetDesignTimeDefaults();
+        }
+#else
+		public override void OnSetComponentDefaults()
+		{
+			base.OnSetComponentDefaults();
+            SetDesignTimeDefaults();
+		}
+#endif
+
+        private void SetDesignTimeDefaults()
+        {
+            PanelEx p = this.Control as PanelEx;
+            if (p == null)
+                return;
+            p.ApplyPanelStyle();
+            p.CanvasColor = SystemColors.Control;
+        }
+
+		protected override void OnPaintAdornments(PaintEventArgs pe) 
+		{
+			PanelEx p;
+			p = this.Component as PanelEx;
+			if(p.Style.Border==eBorderType.None)
+				this.DrawBorder(pe.Graphics);
+			base.OnPaintAdornments(pe);
+		}
+
+		
+		private void DrawBorder(Graphics g) 
+		{
+			PanelEx panel=this.Control as PanelEx;
+            Color border=SystemColors.ControlDarkDark;
+			Rectangle rClient = this.Control.ClientRectangle;
+			Color backColor = panel.Style.BackColor1.Color;
+
+			BarFunctions.DrawDesignTimeSelection(g,rClient,backColor,border,1);
+		}
+
+//		private void OnChildControlAdded(object sender, ControlEventArgs e)
+//		{
+//			if(e.Control==null)
+//				return;
+//
+//			IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+//			if(dh==null)
+//				return;
+//
+//			if(!dh.Loading)
+//			{
+//				if(e.Control.BackColor==Color.Transparent)
+//					e.Control.BackColor=SystemColors.Control;
+//			}
+//		}
+
+//		public override void Initialize(IComponent component)
+//		{
+//			base.Initialize(component);
+//			base.Control.ControlAdded+=new ControlEventHandler(this.OnChildControlAdded);
+//		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/PanelExTitle.cs b/PROMS/DotNetBar Source Code/PanelExTitle.cs
new file mode 100644
index 00000000..25d77b34
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/PanelExTitle.cs	
@@ -0,0 +1,221 @@
+using System;
+using System.Text;
+using System.ComponentModel;
+using System.Drawing;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar
+{
+    [ToolboxItem(false), EditorBrowsable(EditorBrowsableState.Never)]
+    public class PanelExTitle:PanelEx
+    {
+        #region Private Variables, Events & Constructor
+        private ItemContainer m_ItemContainer = null;
+        private ButtonItem m_ExpandChangeButton = null;
+        private int m_ButtonMargin = 3;
+        private eTitleButtonAlignment m_ButtonAlignment = eTitleButtonAlignment.Right;
+        private bool m_DrawText = true;
+        /// <summary>
+        /// Occurs when Expanded/Collapse button is clicked.
+        /// </summary>
+        public event EventHandler ExpandedClick;
+
+        public PanelExTitle()
+        {
+            m_ExpandChangeButton = new ButtonItem("close");
+            m_ExpandChangeButton.Style = eDotNetBarStyle.Office2003;
+            m_ExpandChangeButton.Image = BarFunctions.LoadBitmap("SystemImages.CollapseTitle.png");
+            m_ExpandChangeButton.Displayed = true;
+            m_ExpandChangeButton.Click += new EventHandler(m_ExpandChangeButton_Click);
+
+            m_ItemContainer = new ItemContainer();
+            m_ItemContainer.ContainerControl = this;
+            m_ItemContainer.Style = eDotNetBarStyle.Office2003;
+            m_ItemContainer.SubItems.Add(m_ExpandChangeButton);
+            base.MarkupUsesStyleAlignment = true;
+        }
+        #endregion
+
+        #region ButtonItem integration
+        protected override void ScaleControl(SizeF factor, BoundsSpecified specified)
+        {
+            base.ScaleControl(factor, specified);
+            m_ItemContainer.NotifyScaleItem(factor);
+        }
+
+        protected override void OnMouseEnter(EventArgs e)
+        {
+            base.OnMouseEnter(e);
+            m_ItemContainer.InternalMouseEnter();
+        }
+
+        protected override void OnMouseLeave(EventArgs e)
+        {
+            base.OnMouseLeave(e);
+            m_ItemContainer.InternalMouseLeave();
+        }
+
+        protected override void OnMouseDown(System.Windows.Forms.MouseEventArgs e)
+        {
+            base.OnMouseDown(e);
+            m_ItemContainer.InternalMouseDown(e);
+        }
+
+        protected override void OnMouseUp(System.Windows.Forms.MouseEventArgs e)
+        {
+            base.OnMouseUp(e);
+            m_ItemContainer.InternalMouseUp(e);
+        }
+
+        protected override void OnMouseMove(System.Windows.Forms.MouseEventArgs e)
+        {
+            base.OnMouseMove(e);
+            m_ItemContainer.InternalMouseMove(e);
+        }
+
+        protected override void OnClick(EventArgs e)
+        {
+            Point p = this.PointToClient(Control.MousePosition);
+            m_ItemContainer.InternalClick(Control.MouseButtons, new Point(p.X, p.Y));
+            base.OnClick(e);
+        }
+
+        protected override void OnResize(EventArgs e)
+        {
+            base.OnResize(e);
+            if(BarFunctions.IsHandleValid(this))
+                UpdateButtonPosition();
+        }
+
+        /// <summary>
+        /// Updates position of the title bar button to reflect any changes to the button that influence size of the button.
+        /// </summary>
+        public void UpdateButtonPosition()
+        {
+            m_ExpandChangeButton.FixedSize = Size.Empty;
+
+            m_ItemContainer.NeedRecalcSize = true;
+            m_ItemContainer.RecalcSize();
+
+            if (m_ItemContainer.HeightInternal >= this.Height && this.Height>8)
+            {
+                m_ExpandChangeButton.FixedSize = new Size(this.Height-2, this.Height-2);
+                m_ItemContainer.RecalcSize();
+            }
+
+            if (m_ButtonAlignment == eTitleButtonAlignment.Right)
+            {
+                m_ItemContainer.LeftInternal = this.Width - m_ItemContainer.WidthInternal - m_ButtonMargin;
+                m_ItemContainer.TopInternal = (this.Height - m_ItemContainer.HeightInternal) / 2;
+            }
+            else
+            {
+                m_ItemContainer.LeftInternal = m_ButtonMargin;
+                m_ItemContainer.TopInternal = (this.Height - m_ItemContainer.HeightInternal) / 2;
+            }
+            m_ItemContainer.RecalcSize();
+            m_ItemContainer.Displayed = true;
+            RefreshTextClientRectangle();
+        }
+
+        protected override void RefreshTextClientRectangle()
+        {
+            Rectangle r = this.DisplayRectangle;
+            r.Width -= (m_ItemContainer.WidthInternal + m_ButtonMargin);
+            if (m_ButtonAlignment == eTitleButtonAlignment.Left)
+            {
+                r.X += (m_ItemContainer.WidthInternal + m_ButtonMargin);
+            }
+            if (!m_DrawText)
+                r.Width = 0;
+            ClientTextRectangle = r;
+            ResizeMarkup();
+        }
+
+        protected override void OnPaint(System.Windows.Forms.PaintEventArgs e)
+        {
+            base.OnPaint(e);
+            ItemPaintArgs pa = new ItemPaintArgs(null, this, e.Graphics, this.ColorScheme);
+            m_ItemContainer.Paint(pa);
+        }
+
+        protected override void OnHandleCreated(EventArgs e)
+        {
+            base.OnHandleCreated(e);
+            UpdateButtonPosition();
+        }
+        #endregion
+
+        #region Internal Implementation
+        void m_ExpandChangeButton_Click(object sender, EventArgs e)
+        {
+            InvokeExpandedClick(e);
+        }
+
+        protected virtual void InvokeExpandedClick(EventArgs e)
+        {
+            if (ExpandedClick != null)
+                ExpandedClick(this, e);
+        }
+
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public ButtonItem ExpandChangeButton
+        {
+            get { return m_ExpandChangeButton; }
+        }
+
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool DrawText
+        {
+            get { return m_DrawText; }
+            set { m_DrawText = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether expand button is visible or not. Default value is true.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), Category("Expand Button"), Description("Indicates whether expand button is visible or not.")]
+        public bool ExpandButtonVisible
+        {
+            get { return m_ExpandChangeButton.Visible; }
+            set
+            { 
+                m_ExpandChangeButton.Visible = value;
+                this.UpdateButtonPosition();
+                this.Invalidate();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets alignment of the button.
+        /// </summary>
+        [Browsable(false), DefaultValue(eTitleButtonAlignment.Right), Category("Expand Button"), Description("Indicates the alignment of button."), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public eTitleButtonAlignment ButtonAlignment
+        {
+            get { return m_ButtonAlignment; }
+            set
+            {
+                m_ButtonAlignment = value;
+                this.UpdateButtonPosition();
+                this.Invalidate();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether text markup if it occupies less space than control provides uses the Style Alignment and LineAlignment properties to align the markup inside of the control. Default value is true.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), DefaultValue(true), Description("Indicates whether text markup if it occupies less space than control provides uses the Style Alignment and LineAlignment properties to align the markup inside of the control.")]
+        public override bool MarkupUsesStyleAlignment
+        {
+            get
+            {
+                return base.MarkupUsesStyleAlignment;
+            }
+            set
+            {
+                base.MarkupUsesStyleAlignment = value;
+            }
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/PopupContainer.cs b/PROMS/DotNetBar Source Code/PopupContainer.cs
new file mode 100644
index 00000000..932c4d0d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/PopupContainer.cs	
@@ -0,0 +1,137 @@
+using System;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Use as a popup container for DotNetBar objects.
+	/// </summary>
+	[System.ComponentModel.ToolboxItem(false),System.ComponentModel.DesignTimeVisible(false),System.Runtime.InteropServices.ComVisible(false)]
+	public class PopupContainer:Control
+	{
+		const int WM_MOUSEACTIVATE = 0x21;
+		const int MA_NOACTIVATE = 3;
+		const int MA_NOACTIVATEANDEAT = 4;
+		const uint WS_POPUP=0x80000000;
+		const uint WS_CLIPSIBLINGS=0x04000000;
+		const uint WS_CLIPCHILDREN=0x02000000;
+		const int WS_EX_TOPMOST=0x00000008;
+		const int WS_EX_TOOLWINDOW=0x00000080;
+
+		private PopupShadow m_DropShadow=null;
+		private bool m_ShowDropShadow=false;
+
+		const int SHADOW_OFFSET=5;
+
+		public PopupContainer()
+		{
+			this.IsAccessible=false;
+			this.SetStyle(ControlStyles.Selectable,false);
+		}
+
+		protected override void Dispose(bool disposing)
+		{
+			if(m_DropShadow!=null)
+			{
+				m_DropShadow.Hide();
+				m_DropShadow.Dispose();
+				m_DropShadow=null;
+			}
+			base.Dispose(disposing);
+		}
+
+		private MenuPanel HostedMenu
+		{
+			get
+			{
+				if(this.Controls.Count>0 && this.Controls[0] is MenuPanel)
+					return this.Controls[0] as MenuPanel;
+				return null;
+			}
+		}
+
+		private Bar HostedBar
+		{
+			get
+			{
+				if(this.Controls.Count>0 && this.Controls[0] is Bar)
+					return this.Controls[0] as Bar;
+				return null;
+			}
+		}
+
+		protected override void OnVisibleChanged(EventArgs e)
+		{
+			base.OnVisibleChanged(e);
+			if(!this.Visible && m_DropShadow!=null)
+			{
+				m_DropShadow.Hide();
+				m_DropShadow.Dispose();
+				m_DropShadow=null;
+			}
+		}
+
+		protected override CreateParams CreateParams
+		{
+			get
+			{
+				CreateParams p=base.CreateParams;
+				p.Style=unchecked((int)(WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN));
+                // Moving to Tool Window only because of Windows 8 and UIAccess=true causing menu not to show
+                // Enforcing TopMost in ShowShadow();
+                p.ExStyle = WS_EX_TOOLWINDOW; // (int)(WS_EX_TOPMOST | WS_EX_TOOLWINDOW);
+				p.Caption=""; // Setting caption would show window under tasks in Windows Task Manager
+				return p;
+			}
+		}
+		
+		protected override void WndProc(ref Message m)
+		{
+			if(m.Msg==WM_MOUSEACTIVATE)
+			{
+				m.Result=new System.IntPtr(MA_NOACTIVATE);
+				return;
+			}
+			base.WndProc(ref m);
+		}
+		
+		public void ShowShadow()
+		{
+            NativeFunctions.SetWindowPos(this.Handle, new IntPtr(NativeFunctions.HWND_TOPMOST), 0, 0, 0, 0,
+                NativeFunctions.SWP_NOACTIVATE | NativeFunctions.SWP_NOMOVE | NativeFunctions.SWP_NOSIZE);
+			if(m_ShowDropShadow)
+			{
+				if(m_DropShadow!=null)
+				{
+					m_DropShadow.Hide();
+					m_DropShadow.Dispose();
+                    m_DropShadow = null;
+				}
+
+                if (this.Width > 5 && this.Height > 5)
+                {
+                    m_DropShadow = new PopupShadow(true);
+                    m_DropShadow.CreateControl();
+                    NativeFunctions.SetWindowPos(m_DropShadow.Handle, new IntPtr(NativeFunctions.HWND_NOTOPMOST), this.Left + SHADOW_OFFSET, this.Top + SHADOW_OFFSET, this.Width - 2, this.Height - 2, NativeFunctions.SWP_SHOWWINDOW | NativeFunctions.SWP_NOACTIVATE);
+                    m_DropShadow.UpdateShadow();
+                }
+			}
+		}
+
+		public bool ShowDropShadow
+		{
+			get {return m_ShowDropShadow;}
+			set {m_ShowDropShadow=value;}
+		}
+
+		protected override void OnResize(EventArgs e)
+		{
+			if(m_DropShadow!=null)
+			{
+				NativeFunctions.SetWindowPos(m_DropShadow.Handle,new IntPtr(NativeFunctions.HWND_NOTOPMOST),this.Left+SHADOW_OFFSET,this.Top+SHADOW_OFFSET,this.Width-2,this.Height-2,NativeFunctions.SWP_SHOWWINDOW | NativeFunctions.SWP_NOACTIVATE);
+				m_DropShadow.UpdateShadow();
+			}
+			base.OnResize(e);
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/PopupContainerControl.cs b/PROMS/DotNetBar Source Code/PopupContainerControl.cs
new file mode 100644
index 00000000..08be67bb
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/PopupContainerControl.cs	
@@ -0,0 +1,316 @@
+using System;
+using System.Windows.Forms;
+using System.Drawing;
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Summary description for PopupContainer.
+	/// </summary>
+	[System.ComponentModel.ToolboxItem(false),System.ComponentModel.DesignTimeVisible(false)]
+	public class PopupContainerControl:UserControl
+	{
+		private BaseItem m_Parent=null;
+		private bool m_DesignMode=false;
+		private object m_Owner;
+		private Point m_ParentScreenPos=Point.Empty;
+		private PopupShadow m_DropShadow=null;
+
+		public PopupContainerControl()
+		{
+			this.Font=System.Windows.Forms.SystemInformation.MenuFont.Clone() as Font;
+			this.SetStyle(ControlStyles.Selectable,false);
+			//this.ControlBox=false;
+			//this.MinimizeBox=false;
+			//this.MaximizeBox=false;
+			//this.Text="";
+		}
+
+		protected override void Dispose(bool disposing)
+		{
+			if(m_DropShadow!=null)
+			{
+				m_DropShadow.Hide();
+				m_DropShadow.Dispose();
+				m_DropShadow=null;
+			}
+			base.Dispose(disposing);
+		}
+
+		protected override CreateParams CreateParams
+		{
+			get
+			{
+				CreateParams p=base.CreateParams;
+				p.Style=unchecked((int)(NativeFunctions.WS_POPUP | NativeFunctions.WS_CLIPSIBLINGS | NativeFunctions.WS_CLIPCHILDREN));
+				p.ExStyle=(int)(NativeFunctions.WS_EX_TOPMOST | NativeFunctions.WS_EX_TOOLWINDOW);
+				p.Caption="";
+				return p;
+			}
+		}
+
+		protected override void WndProc(ref Message m)
+		{
+			if(m.Msg==NativeFunctions.WM_MOUSEACTIVATE)
+			{
+				m.Result=new System.IntPtr(NativeFunctions.MA_NOACTIVATE);
+				return;
+			}
+			base.WndProc(ref m);
+		}
+
+		public BaseItem ParentItem
+		{
+			get
+			{
+				return m_Parent;
+			}
+			set
+			{
+				m_Parent=value;
+				// Get the parent's screen position
+				if(m_Parent.Displayed)
+				{
+					System.Windows.Forms.Control objCtrl=m_Parent.ContainerControl as System.Windows.Forms.Control;
+					if(BaseItem.IsHandleValid(objCtrl))
+					{
+						m_ParentScreenPos=objCtrl.PointToScreen(new Point(m_Parent.LeftInternal,m_Parent.TopInternal));
+						objCtrl=null;
+					}
+				}
+			}
+		}
+
+		internal void SetDesignMode(bool b)
+		{
+			m_DesignMode=b;
+		}
+
+		public void RecalcSize()
+		{
+			
+		}
+
+		public object Owner
+		{
+			get
+			{
+				return m_Owner;
+			}
+			set
+			{
+				m_Owner=value;
+			}
+		}
+
+		public new Rectangle ClientRectangle
+		{
+			get
+			{
+				Rectangle r=base.ClientRectangle;
+				if(IsGradientStyle)
+				{
+					if(this.DisplayShadow && this.AlphaShadow || !this.DisplayShadow)
+					{
+						r.Inflate(-1,-1);
+					}
+					else
+					{
+						r.Inflate(-2,-2);
+						r.Width-=1;
+						r.Height-=1;
+					}
+				}
+				else
+					r.Inflate(-2,-2);
+
+				return r;
+			}
+		}
+
+		public new Size ClientSize
+		{
+			get
+			{
+				return this.ClientRectangle.Size;
+			}
+			set
+			{
+				System.Drawing.Size v=value;
+				if(IsGradientStyle)
+				{
+					if(this.DisplayShadow && this.AlphaShadow || !this.DisplayShadow)
+					{
+						v.Width+=2;
+						v.Height+=2;
+					}
+					else
+					{
+						v.Width+=5;
+						v.Height+=5;
+					}
+				}
+				else
+				{
+					v.Width+=4;
+					v.Height+=4;
+				}
+				base.ClientSize=v;
+			}
+		}
+
+        private bool IsGradientStyle
+        {
+            get
+            {
+                if (m_Parent != null)
+                {
+                    return m_Parent.EffectiveStyle == eDotNetBarStyle.OfficeXP ||
+                        m_Parent.EffectiveStyle == eDotNetBarStyle.Office2003 ||
+                        m_Parent.EffectiveStyle == eDotNetBarStyle.VS2005 ||
+                        BarFunctions.IsOffice2007Style(m_Parent.EffectiveStyle);
+                }
+                return true;
+            }
+        }
+
+		protected override void OnPaint(PaintEventArgs e)
+		{
+			Graphics g=e.Graphics;
+			if(IsGradientStyle)
+			{
+				if(this.DisplayShadow && !this.AlphaShadow)
+					SetupRegion();
+				Pen p=null;
+				if(m_Parent!=null && m_Parent.ContainerControl is Bar)
+					p=new Pen(((Bar)m_Parent.ContainerControl).ColorScheme.ItemHotBorder,1);
+				else if(m_Parent!=null && m_Parent.ContainerControl is MenuPanel && ((MenuPanel)m_Parent.ContainerControl).ColorScheme!=null)
+					p=new Pen(((MenuPanel)m_Parent.ContainerControl).ColorScheme.ItemHotBorder,1);
+				else
+					p=new Pen(ColorFunctions.MenuFocusBorderColor(g),1);
+				// TODO Beta 2 Fix --> g.DrawRectangle(p,0,0,this.ClientSize.Width-2,this.ClientSize.Height-2);
+				if(this.DisplayShadow && !this.AlphaShadow)
+					NativeFunctions.DrawRectangle(g,p,0,0,base.ClientSize.Width-2,base.ClientSize.Height-2);
+				else
+					NativeFunctions.DrawRectangle(g,p,0,0,base.ClientSize.Width,base.ClientSize.Height);
+
+
+				// Shadow
+				if(this.DisplayShadow && !this.AlphaShadow)
+				{
+					p.Dispose();
+					p=new Pen(SystemColors.ControlDark,2);
+					Point[] pt=new Point[3];
+					pt[0].X=2;
+					pt[0].Y=base.ClientSize.Height-1;
+					pt[1].X=base.ClientSize.Width-1;
+					pt[1].Y=base.ClientSize.Height-1;
+					pt[2].X=base.ClientSize.Width-1;
+					pt[2].Y=2;
+					g.DrawLines(p,pt);
+				}
+
+                if (m_Parent is ButtonItem && m_Parent.Displayed && !BarFunctions.IsOffice2007Style(m_Parent.EffectiveStyle))
+				{
+					// Determine where to draw the line based on parent position
+					if(m_ParentScreenPos.Y<this.Location.Y)
+					{
+						Point p1=new Point((m_ParentScreenPos.X-this.Location.X)+1,0);
+						Point p2=new Point(p1.X+m_Parent.WidthInternal-5,0);
+						g.DrawLine(new Pen(ColorFunctions.ToolMenuFocusBackColor(g),1),p1,p2);
+					}
+				}
+			}
+			else
+			{
+				ControlPaint.DrawBorder3D(g,base.ClientRectangle,Border3DStyle.Raised,(Border3DSide.Left | Border3DSide.Right | Border3DSide.Top | Border3DSide.Bottom));
+			}
+		}
+
+		private void SetupRegion()
+		{
+			if(this.DisplayShadow && this.AlphaShadow || !this.DisplayShadow)
+				return;
+			if(m_Parent!=null)
+			{
+				Rectangle r=new Rectangle(0,0,this.Width,this.Height);
+				System.Drawing.Region rgn=new System.Drawing.Region(r);
+				r.X=this.Width-2;
+				r.Y=0;
+				r.Width=2;
+				r.Height=2;
+				rgn.Xor(r);
+				r.X=0;
+				r.Y=this.Height-2;
+				r.Width=2;
+				r.Height=2;
+				rgn.Xor(r);
+				this.Region=rgn;
+			}
+		}
+
+		protected override void OnVisibleChanged(EventArgs e)
+		{
+			base.OnVisibleChanged(e);
+			if(!this.Visible && m_DropShadow!=null)
+			{
+				m_DropShadow.Hide();
+				m_DropShadow.Dispose();
+				m_DropShadow=null;
+			}
+		}
+		public new void Show()
+		{
+			if(this.DisplayShadow && this.AlphaShadow)
+			{
+				if(m_DropShadow!=null)
+				{
+					m_DropShadow.Hide();
+					m_DropShadow.Dispose();
+				}
+				m_DropShadow=new PopupShadow(true);
+				m_DropShadow.CreateControl();
+				NativeFunctions.SetWindowPos(m_DropShadow.Handle,new IntPtr(NativeFunctions.HWND_NOTOPMOST),this.Left+5,this.Top+5,this.Width-2,this.Height-2,NativeFunctions.SWP_SHOWWINDOW | NativeFunctions.SWP_NOACTIVATE);
+			}
+			base.Show();
+		}
+
+		private bool DisplayShadow
+		{
+			get
+			{
+				IOwnerMenuSupport ownersupport=m_Parent.GetOwner() as IOwnerMenuSupport;
+				if(ownersupport!=null)
+				{
+                    if (m_Parent != null && m_Parent.EffectiveStyle == eDotNetBarStyle.Office2000)
+					{
+						if(ownersupport.MenuDropShadow==eMenuDropShadow.Show)
+							return true;
+						else
+							return false;
+					}
+					return ownersupport.ShowPopupShadow;
+				}
+				else
+				{
+                    if (m_Parent != null && m_Parent.EffectiveStyle == eDotNetBarStyle.Office2000)
+						return false;
+				}
+
+				return true;
+			}
+		}
+
+		private bool AlphaShadow
+		{
+			get
+			{
+				if(Environment.OSVersion.Version.Major<5)
+					return false;
+				IOwnerMenuSupport ownersupport=m_Owner as IOwnerMenuSupport;
+				if(ownersupport!=null && !ownersupport.AlphaBlendShadow)
+					return false;
+				return NativeFunctions.CursorShadow;
+			}
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/PopupDelayedClose.cs b/PROMS/DotNetBar Source Code/PopupDelayedClose.cs
new file mode 100644
index 00000000..0dc0a413
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/PopupDelayedClose.cs	
@@ -0,0 +1,142 @@
+using System;
+using System.Text;
+using System.Windows.Forms;
+using System.Collections;
+
+
+namespace DevComponents.DotNetBar
+{
+    internal class PopupDelayedClose
+    {
+        #region Private Variables
+        private Timer m_Timer = null;
+        private ArrayList m_Popups = new ArrayList();
+        private System.Threading.ReaderWriterLock m_PopupsLock = new System.Threading.ReaderWriterLock();
+        #endregion
+
+        public PopupDelayedClose()
+        {
+            m_Timer = new Timer();
+            m_Timer.Enabled = false;
+            m_Timer.Interval = 800;
+            m_Timer.Tick += new EventHandler(TimerDelayedClose);
+        }
+
+        void TimerDelayedClose(object sender, EventArgs e)
+        {
+            m_Timer.Stop();
+            CloseAllPopups();
+        }
+
+        public void Dispose()
+        {
+            if (m_Timer != null)
+            {
+                m_Timer.Stop();
+                CloseAllPopups();
+
+                m_Timer.Dispose();
+                m_Timer = null;
+            }
+        }
+
+        private void CloseAllPopups()
+        {
+            if (m_Popups.Count > 0)
+            {
+                bool readerLockHeld = m_PopupsLock.IsReaderLockHeld;
+                System.Threading.LockCookie cookie1 = new System.Threading.LockCookie();
+                if (readerLockHeld)
+                {
+                    cookie1 = m_PopupsLock.UpgradeToWriterLock(-1);
+                }
+                else
+                {
+                    m_PopupsLock.AcquireWriterLock(-1);
+                }
+
+                try
+                {
+                    foreach (PopupItem item in m_Popups)
+                        item.ClosePopup();
+                    m_Popups.Clear();
+                }
+                finally
+                {
+                    if (readerLockHeld)
+                    {
+                        m_PopupsLock.DowngradeFromWriterLock(ref cookie1);
+                    }
+                    else
+                    {
+                        m_PopupsLock.ReleaseWriterLock();
+                    }
+                }
+            }
+        }
+
+        public void DelayClose(PopupItem item)
+        {
+            if (m_Timer == null)
+                return;
+
+            bool readerLockHeld = m_PopupsLock.IsReaderLockHeld;
+            System.Threading.LockCookie cookie1 = new System.Threading.LockCookie();
+            if (readerLockHeld)
+            {
+                cookie1 = m_PopupsLock.UpgradeToWriterLock(-1);
+            }
+            else
+            {
+                m_PopupsLock.AcquireWriterLock(-1);
+            }
+
+            try
+            {
+                m_Popups.Add(item);
+                m_Timer.Start();
+            }
+            finally
+            {
+                if (readerLockHeld)
+                {
+                    m_PopupsLock.DowngradeFromWriterLock(ref cookie1);
+                }
+                else
+                {
+                    m_PopupsLock.ReleaseWriterLock();
+                }
+            }
+        }
+
+        public void EraseDelayClose()
+        {
+            bool readerLockHeld = m_PopupsLock.IsReaderLockHeld;
+            System.Threading.LockCookie cookie1 = new System.Threading.LockCookie();
+            if (readerLockHeld)
+            {
+                cookie1 = m_PopupsLock.UpgradeToWriterLock(-1);
+            }
+            else
+            {
+                m_PopupsLock.AcquireWriterLock(-1);
+            }
+
+            try
+            {
+                m_Popups.Clear();
+            }
+            finally
+            {
+                if (readerLockHeld)
+                {
+                    m_PopupsLock.DowngradeFromWriterLock(ref cookie1);
+                }
+                else
+                {
+                    m_PopupsLock.ReleaseWriterLock();
+                }
+            }
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/PopupItem.cs b/PROMS/DotNetBar Source Code/PopupItem.cs
new file mode 100644
index 00000000..2c15bee8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/PopupItem.cs	
@@ -0,0 +1,1799 @@
+namespace DevComponents.DotNetBar
+{
+	using System;
+	using System.Drawing;
+    using System.ComponentModel;
+    using DevComponents.DotNetBar.Rendering;
+    using DevComponents.DotNetBar.Events;
+
+	/// <summary>
+	///		PopupItem Class can pop-up it's subitems on either the popup Bar
+	///		or menu.
+	/// </summary>
+	[System.ComponentModel.ToolboxItem(false),System.ComponentModel.DesignTimeVisible(false)]
+	public abstract class PopupItem:ImageItem,IDesignTimeProvider
+	{
+		#region Events
+		/// <summary>
+		/// Occurs when popup container is loading. Use this event to assign control to the popup container. If you want to use same control
+        /// that you added to the popup container after popup is closed you must handle the PopupContainerUnload event and remove the control
+        /// from the popup container so it is not disposed with the container.
+		/// </summary>
+		public event EventHandler PopupContainerLoad;
+		/// <summary>
+		/// Occurs when popup container is unloading. Use this event to save any state associated with the control that was contained by the container or
+        /// to remove the control from the container so it is not disposed with container.
+		/// </summary>
+		public event EventHandler PopupContainerUnload;
+		/// <summary>
+		/// Occurs when popup item is about to open.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when popup item is about to open.")]
+		public event DotNetBarManager.PopupOpenEventHandler PopupOpen;
+
+		/// <summary>
+		/// Occurs while popup item is closing.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when popup item is closing.")]
+		public event EventHandler PopupClose;
+
+        /// <summary>
+        /// Occurs while popup item is closing.
+        /// </summary>
+        [System.ComponentModel.Description("Occurs before popup is closed and allows you to cancel closing.")]
+        public event CancelableEventSourceHandler QueryPopupClose;
+
+		/// <summary>
+		/// Occurs after popup item has been closed.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs after popup item has been closed.")]
+		public event EventHandler PopupFinalized;
+
+		/// <summary>
+		/// Occurs just before popup window is shown.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs just before popup window is shown.")]
+		public event EventHandler PopupShowing;
+		#endregion
+
+		private MenuPanel m_PopupMenu;
+		private Bar m_PopupBar;
+		private PopupContainerControl m_PopupContainer=null;
+		private bool m_FilterInstalled;
+		protected SideBarImage m_SideBar;
+		private ePopupType m_PopupType;
+		private bool m_WasParentFocused;
+		private Size m_OldSubItemsImageSize;  // For menus we need minimum sub items image size of 16x16 default is 12x12
+		private int m_PopupWidth=200;
+		private ePersonalizedMenus m_PersonalizedMenus=ePersonalizedMenus.Disabled;
+		private Point m_PopupLocation=Point.Empty;
+		private ePopupAnimation m_PopupAnimation=ePopupAnimation.ManagerControlled;
+		private System.Drawing.Font m_PopupFont=null;
+		private System.Windows.Forms.Control m_SourceControl=null;
+		private ePopupSide m_PopupSide=ePopupSide.Default;
+        private bool m_PopupPositionAdjusted = false;
+
+		/// <summary>
+		/// Creates new instance of PopupItem.
+		/// </summary>
+		public PopupItem():this("","") {}
+		/// <summary>
+		/// Creates new instance of PopupItem and assigns the name to it.
+		/// </summary>
+		/// <param name="sName">Item name</param>
+		public PopupItem(string sName):this(sName,""){}
+		/// <summary>
+		/// Creates new instance of PopupItem and assigns the name and text to it.
+		/// </summary>
+		/// <param name="sName">Item name.</param>
+		/// <param name="ItemText">Item text.</param>
+		public PopupItem(string sName, string ItemText):base(sName, ItemText)
+		{
+			m_PopupMenu=null;
+			m_PopupBar=null;
+			m_FilterInstalled=false;
+			m_PopupType=ePopupType.Menu;
+			m_SideBar=new SideBarImage();
+			m_WasParentFocused=false;
+			m_OldSubItemsImageSize=Size.Empty;
+		}
+
+        protected override void Dispose(bool disposing)
+		{
+			if(this.Expanded) ClosePopup();
+			base.Dispose(disposing);
+		}
+
+		/// <summary>
+		/// Copies the PopupItem specific properties to new instance of the item.
+		/// </summary>
+		/// <param name="copy">New ButtonItem instance.</param>
+		protected override void CopyToItem(BaseItem copy)
+		{
+			base.CopyToItem(copy);
+
+			PopupItem popupItem=copy as PopupItem;
+		    
+			popupItem.PersonalizedMenus=this.PersonalizedMenus;
+			popupItem.PopUpSideBar=this.PopUpSideBar;
+			popupItem.PopupAnimation=this.PopupAnimation;
+			popupItem.PopupSide=this.PopupSide;
+            popupItem.PopupWidth=this.PopupWidth;
+            if(this.PopupClose!=null)
+                popupItem.PopupClose = (EventHandler)this.PopupClose.Clone();
+            if (this.PopupContainerLoad != null)
+                popupItem.PopupContainerLoad = (EventHandler)this.PopupContainerLoad.Clone();
+            if (this.PopupContainerUnload != null)
+                popupItem.PopupContainerUnload = (EventHandler)this.PopupContainerUnload.Clone();
+		    if (this.PopupFinalized != null)
+		        popupItem.PopupFinalized = (EventHandler) this.PopupFinalized.Clone();
+            if(this.PopupOpen!=null)
+                popupItem.PopupOpen = (DotNetBarManager.PopupOpenEventHandler)this.PopupOpen.Clone();
+		    if (this.PopupShowing != null)
+		        popupItem.PopupShowing = (EventHandler) this.PopupShowing.Clone();
+            popupItem.PopupType = this.PopupType;
+            popupItem.PopupWidth = this.PopupWidth;
+		}
+
+		protected internal override void OnItemAdded(BaseItem objItem)
+		{
+			base.OnItemAdded(objItem);
+			// Popup items don't need to recalculate size
+			if(this.SubItems.Count>1)
+				m_NeedRecalcSize=false;
+		}
+
+		/*public override void AddSubItem(BaseItem objItem, int Position)
+		{
+			base.AddSubItem(objItem, Position);
+			// Popup items don't need to recalculate size
+			if(this.SubItemsCount>1)
+				m_NeedRecalcSize=false;
+		}*/
+
+		protected internal override void Serialize(ItemSerializationContext context)
+		{
+			base.Serialize(context);
+            System.Xml.XmlElement ThisItem = context.ItemXmlElement;
+			ThisItem.SetAttribute("PopupType",System.Xml.XmlConvert.ToString(((int)m_PopupType)));
+			ThisItem.SetAttribute("PopupWidth",System.Xml.XmlConvert.ToString(m_PopupWidth));
+			ThisItem.SetAttribute("PersonalizedMenus",System.Xml.XmlConvert.ToString((int)m_PersonalizedMenus));
+			ThisItem.SetAttribute("panim",System.Xml.XmlConvert.ToString((int)m_PopupAnimation));
+
+			// Save Font information if needed
+			if(m_PopupFont!=null)
+			{
+				ThisItem.SetAttribute("fontname",m_PopupFont.Name);
+				ThisItem.SetAttribute("fontemsize",System.Xml.XmlConvert.ToString(m_PopupFont.Size));
+				ThisItem.SetAttribute("fontstyle",System.Xml.XmlConvert.ToString((int)m_PopupFont.Style));
+			}
+		}
+
+		public override void Deserialize(ItemSerializationContext context)
+		{
+			base.Deserialize(context);
+            System.Xml.XmlElement ItemXmlSource = context.ItemXmlElement;
+			m_PopupType=(ePopupType)System.Xml.XmlConvert.ToInt32(ItemXmlSource.GetAttribute("PopupType"));
+			m_PopupWidth=System.Xml.XmlConvert.ToInt32(ItemXmlSource.GetAttribute("PopupWidth"));
+			m_PersonalizedMenus=(ePersonalizedMenus)System.Xml.XmlConvert.ToInt32(ItemXmlSource.GetAttribute("PersonalizedMenus"));
+
+			if(ItemXmlSource.HasAttribute("panim"))
+				m_PopupAnimation=(ePopupAnimation)System.Xml.XmlConvert.ToInt32(ItemXmlSource.GetAttribute("panim"));
+			else
+				m_PopupAnimation=ePopupAnimation.SystemDefault;
+
+			m_PopupFont=null;
+			// Load font information if it exists
+			if(ItemXmlSource.HasAttribute("fontname"))
+			{
+				string FontName=ItemXmlSource.GetAttribute("fontname");
+				float FontSize=System.Xml.XmlConvert.ToSingle(ItemXmlSource.GetAttribute("fontemsize"));
+				System.Drawing.FontStyle FontStyle=(System.Drawing.FontStyle)System.Xml.XmlConvert.ToInt32(ItemXmlSource.GetAttribute("fontstyle"));
+				try
+				{
+					m_PopupFont=new Font(FontName,FontSize,FontStyle);
+				}
+				catch(Exception)
+				{
+					m_PopupFont=null;
+				}
+			}
+		}
+
+		public override void InternalKeyDown(System.Windows.Forms.KeyEventArgs objArg)
+		{
+			if(this.Expanded)
+			{
+				if(m_PopupMenu!=null)
+				{
+					if(m_PopupMenu.FocusedItem()!=null)
+						m_PopupMenu.FocusedItem().InternalKeyDown(objArg);
+					if(m_PopupMenu!=null)
+						m_PopupMenu.ExKeyDown(objArg);
+				}
+				else if(m_PopupBar!=null)
+				{
+					m_PopupBar.ExKeyDown(objArg);
+				}
+				else if(m_PopupContainer!=null)
+				{
+					
+				}
+				return;
+			}
+			base.InternalKeyDown(objArg);
+		}
+
+		/// <summary>
+		/// Occurs when the mouse pointer is moved over the item. This is used by internal implementation only.
+		/// </summary>
+		[System.ComponentModel.Browsable(false),System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+		public override void InternalMouseMove(System.Windows.Forms.MouseEventArgs objArg)
+		{
+			base.InternalMouseMove(objArg);
+			if(this.Expanded && m_PopupMenu!=null && !this.DesignMode)
+			{
+				System.Windows.Forms.Control container=this.ContainerControl as System.Windows.Forms.Control;
+                MenuPanel menuPanel = m_PopupMenu;
+                if (container != null)
+                {
+                    Point p = container.PointToScreen(new Point(objArg.X, objArg.Y));
+                    if (menuPanel != null && !menuPanel.IsDisposed)
+                    {
+                        p = menuPanel.PointToClient(p);
+                        menuPanel.InternalMouseMove(new System.Windows.Forms.MouseEventArgs(objArg.Button, objArg.Clicks, p.X, p.Y, objArg.Delta));
+                    }
+                }
+			}
+			else if(this.Expanded && m_PopupBar!=null && !this.DesignMode)
+			{
+				System.Windows.Forms.Control container=this.ContainerControl as System.Windows.Forms.Control;
+                Bar popupBar = m_PopupBar;
+				if(container!=null)
+				{
+					Point p=container.PointToScreen(new Point(objArg.X,objArg.Y));
+                    if (popupBar != null && !popupBar.IsDisposed)
+                    {
+                        p = popupBar.PointToClient(p);
+                        popupBar.InternalMouseMove(new System.Windows.Forms.MouseEventArgs(System.Windows.Forms.MouseButtons.None, objArg.Clicks, p.X, p.Y, objArg.Delta));
+                    }
+				}
+			}
+		}
+
+		/// <summary>
+		/// Occurs when the mouse pointer is over the item and a mouse button is released. This is used by internal implementation only.
+		/// </summary>
+		[System.ComponentModel.Browsable(false),System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+		public override void InternalMouseUp(System.Windows.Forms.MouseEventArgs objArg)
+		{
+			base.InternalMouseUp(objArg);
+			if(this.Expanded && m_PopupMenu!=null && !this.DesignMode)
+			{
+				System.Windows.Forms.Control container=this.ContainerControl as System.Windows.Forms.Control;
+				if(container!=null)
+				{
+					Point p=container.PointToScreen(new Point(objArg.X,objArg.Y));
+					p=m_PopupMenu.PointToClient(p);
+					m_PopupMenu.InternalMouseUp(new System.Windows.Forms.MouseEventArgs(objArg.Button,objArg.Clicks,p.X,p.Y,objArg.Delta));
+				}
+			}
+			else if(this.Expanded && m_PopupBar!=null && !this.DesignMode)
+			{
+				System.Windows.Forms.Control container=this.ContainerControl as System.Windows.Forms.Control;
+				if(container!=null)
+				{
+					Point p=container.PointToScreen(new Point(objArg.X,objArg.Y));
+					p=m_PopupBar.PointToClient(p);
+					m_PopupBar.InternalMouseUp(new System.Windows.Forms.MouseEventArgs(objArg.Button,objArg.Clicks,p.X,p.Y,objArg.Delta));
+				}
+			}
+		}
+
+		protected override void OnSubItemGotFocus(BaseItem objItem)
+		{
+			// Make sure to collapse any other item that might be expanded
+			foreach(BaseItem item in this.SubItems)
+			{
+				PopupItem popup=item as PopupItem;
+				if(popup!=null && popup.Expanded && objItem!=item)
+                    popup.Expanded=false;
+			}
+			base.OnSubItemGotFocus(objItem);
+		}
+
+		/*public override void KeyDown(System.Windows.Forms.KeyEventArgs objArg)
+		{
+			if(this.Expanded)
+			{
+				if(m_PopupMenu!=null)
+				{
+					m_PopupMenu.ExKeyDown(objArg);
+				}
+				else if(m_PopupBar!=null)
+				{
+					m_PopupBar.ExKeyDown(objArg);
+				}
+				return;
+			}
+			else if(objArg.KeyCode==System.Windows.Forms.Keys.Enter  || objArg.KeyCode==System.Windows.Forms.Keys.Return)
+			{
+				if(SubItemsCount>0)
+				{
+					if(m_Parent!=null)
+						m_Parent.AutoExpand=true;
+					this.Expanded=true;
+					objArg.Handled=true;
+					return;
+				}
+			}
+			else if(objArg.KeyCode==System.Windows.Forms.Keys.Escape)
+			{
+				if(SubItemsCount>0 && this.Expanded)
+				{
+					if(m_Parent!=null)
+						m_Parent.AutoExpand=false;
+					this.Expanded=false;
+					objArg.Handled=true;
+					return;
+				}
+			}
+
+			base.KeyDown(objArg);
+		}*/
+
+		public override void ContainerLostFocus(bool appLostFocus)
+		{
+            base.ContainerLostFocus(appLostFocus);
+			if(this.Expanded)
+			{
+				this.Expanded=false;
+				if(m_Parent!=null)
+					m_Parent.AutoExpand=false;
+			}
+		}
+
+		public override void SubItemSizeChanged(BaseItem objChildItem)
+		{
+			if(m_PopupMenu!=null)
+			{
+				m_PopupMenu.RecalcSize();
+				//m_PopupMenu.Refresh();
+			}
+			else if(m_PopupBar!=null)
+			{
+				m_PopupBar.RecalcLayout();
+				//m_PopupBar.Refresh();
+			}
+		}
+
+		protected internal override void OnExpandChange()
+		{
+			base.OnExpandChange();
+
+			if(!this.Expanded)
+				 m_PopupLocation=Point.Empty;
+
+			System.Windows.Forms.Control objCtrl=this.ContainerControl as System.Windows.Forms.Control;
+
+			if(!BaseItem.IsOnPopup(this) || this.Parent==null)
+			{
+				IOwner owner=this.GetOwner() as IOwner;
+				if(owner!=null && this.Name!="syscustomizepopupmenu")
+				{
+					if(this.Expanded)
+						owner.SetExpandedItem(this);
+					else if(owner.GetExpandedItem()==this)
+						owner.SetExpandedItem(null);
+					owner=null;
+				}
+				// Set/release focus to container so we can receive keyboard events...
+				if(objCtrl is Bar && !this.DesignMode)
+				{
+					if(this.Expanded)
+					{
+						m_WasParentFocused=false;
+						if(objCtrl.Focused)
+							m_WasParentFocused=true;
+						else
+						{
+							// TODO: To fix the focus menu expand comment this out
+							if(objCtrl is Bar)
+							{
+								Bar bar=objCtrl as Bar;
+								if(bar.BarState!=eBarState.Floating || bar.MenuBar)
+								{
+									bar.MenuFocus=true;
+									//objCtrl.Focus();
+								}
+							}
+							else
+								objCtrl.Focus();
+						}
+					}
+					else
+					{
+						if(!m_WasParentFocused)
+							((Bar)objCtrl).ReleaseFocus();
+						Bar bar=objCtrl as Bar;
+						if(bar.BarState!=eBarState.Floating && !bar.MenuBar)
+							bar.MenuFocus=false;
+						m_WasParentFocused=false;
+					}
+				}
+                else if (objCtrl is ItemControl && !this.DesignMode)
+                {
+                    if (this.Expanded)
+                    {
+                        m_WasParentFocused = false;
+                        if (objCtrl.Focused)
+                            m_WasParentFocused = true;
+                        else
+                        {
+                            ItemControl bar = objCtrl as ItemControl;
+                            bar.MenuFocus = true;
+                        }
+                    }
+                    else
+                    {
+                        // Close popup here instead of below since in some use cases setting MenuFocus=false
+                        // Will dispose this item and we will not be able to unregister popup
+                        if (!this.Expanded && (m_PopupMenu != null || m_PopupBar != null || m_PopupContainer != null))
+                        {
+                            ClosePopup();
+                        }
+
+                        if (!m_WasParentFocused)
+                            ((ItemControl)objCtrl).ReleaseFocus();
+						((ItemControl)objCtrl).MenuFocus=false;
+                        m_WasParentFocused = false;
+                    }
+                }
+			}
+
+			if(!this.Expanded && (m_PopupMenu!=null || m_PopupBar!=null || m_PopupContainer!=null))
+			{
+				ClosePopup();
+			}
+
+			if(objCtrl==null)
+				return;
+
+//			if(this.Expanded && !this.ShowSubItems)
+//				return;
+
+			if(IsHandleValid(objCtrl))
+			{
+				this.Refresh();
+			}
+
+			if(this.Expanded && m_PopupMenu==null && m_PopupBar==null && m_PopupContainer==null)
+			{
+				if(IsHandleValid(objCtrl))
+				{
+					if(m_PopupType==ePopupType.Menu)
+					{
+						Point p,ps;
+						if(!m_PopupLocation.IsEmpty)
+							p=m_PopupLocation;
+						else if(m_PopupSide!=ePopupSide.Default)
+							p=GetDisplayLocation();
+						else if(this.Parent is CustomizeItem || this is CustomizeItem)
+						{
+							if(this.IsRightHanded)
+								p=new Point(m_Rect.Left+3,m_Rect.Top);
+							else
+								p=new Point(m_Rect.Right-2,m_Rect.Top-2);
+						}
+						else if(this.IsOnMenu)
+						{
+							if(this.IsRightHanded)
+								p=new Point(m_Rect.Left+2,m_Rect.Top-2);
+							else
+								p=new Point(m_Rect.Right,m_Rect.Top-2);
+						}
+						else
+						{
+							if(m_Orientation==eOrientation.Horizontal)
+							{
+								if(this.IsRightHanded)
+									p=new Point(m_Rect.Right,m_Rect.Bottom);
+								else
+									p=new Point(m_Rect.Left,m_Rect.Bottom);
+							}
+							else
+							{
+								p=new Point(m_Rect.Right,m_Rect.Top);
+							}
+						}
+						ps=objCtrl.PointToScreen(p);
+						PopupMenu(ps);
+					}
+					else if(m_PopupType==ePopupType.ToolBar)
+					{
+						// Popup on Bar
+						Point p,ps;
+						if(!m_PopupLocation.IsEmpty)
+							p=m_PopupLocation;
+						else if(m_PopupSide!=ePopupSide.Default)
+							p=GetDisplayLocation();
+						else if(this.IsOnMenu)
+						{
+							if(this.IsRightHanded)
+								p=new Point(m_Rect.Left+2,m_Rect.Top-2);
+							else
+								p=new Point(m_Rect.Right,m_Rect.Top-2);
+						}
+						else
+						{
+							if(m_Orientation==eOrientation.Horizontal)
+							{
+								if(this.IsRightHanded)
+									p=new Point(m_Rect.Right,m_Rect.Bottom);
+								else
+									p=new Point(m_Rect.Left,m_Rect.Bottom);
+							}
+							else
+							{
+								p=new Point(m_Rect.Right,m_Rect.Top);
+							}
+						}
+						ps=objCtrl.PointToScreen(p);
+						PopupBar(ps);
+					}
+					else if(m_PopupType==ePopupType.Container)
+					{
+						Point p,ps;
+						if(!m_PopupLocation.IsEmpty)
+							p=m_PopupLocation;
+						else if(m_PopupSide!=ePopupSide.Default)
+							p=GetDisplayLocation();
+						else if(this.IsOnMenu)
+						{
+							if(this.IsRightHanded)
+								p=new Point(m_Rect.Left+2,m_Rect.Top-2);
+							else
+								p=new Point(m_Rect.Right,m_Rect.Top-2);
+
+						}
+						else
+						{
+							if(m_Orientation==eOrientation.Horizontal)
+							{
+								if(this.IsRightHanded)
+									p=new Point(m_Rect.Right,m_Rect.Bottom);
+								else
+									p=new Point(m_Rect.Left,m_Rect.Bottom);
+							}
+							else
+							{
+								p=new Point(m_Rect.Right,m_Rect.Top);
+							}
+						}
+						ps=objCtrl.PointToScreen(p);
+						PopupContainer(ps);
+					}
+				}
+			}
+			objCtrl=null;
+		}
+
+		protected internal override void OnSubItemExpandChange(BaseItem objItem)
+		{
+			base.OnSubItemExpandChange(objItem);
+			if(objItem.Expanded)
+			{
+				foreach(BaseItem objExp in this.SubItems)
+				{
+					if(objExp.Expanded && objExp!=objItem)
+						objExp.Expanded=false;
+				}
+			}
+		}
+
+        protected virtual bool IsRightHanded
+        {
+            get
+            {
+                return false;
+
+                //if (NativeFunctions.RightHandedMenus)
+                //    return true;
+                //System.Windows.Forms.Control c = this.ContainerControl as System.Windows.Forms.Control;
+                //if (c != null)
+                //    return (c.RightToLeft == System.Windows.Forms.RightToLeft.Yes);
+                //return false;
+            }
+        }
+
+		/// <summary>
+		/// Displays the sub-items on popup menu.
+		/// </summary>
+		/// <param name="p">Popup location.</param>
+		public void PopupMenu(Point p)
+		{
+			PopupMenu(p.X,p.Y);
+		}
+
+		protected internal IOwnerMenuSupport GetIOwnerMenuSupport()
+		{
+			return (this.GetOwner() as IOwnerMenuSupport);
+		}
+
+		/// <summary>
+		/// Gets the size of the popup before it is displayed.
+		/// </summary>
+		[System.ComponentModel.Browsable(false),System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
+		public System.Drawing.Size PopupSize
+		{
+			get
+			{
+				if(this.SubItemsImageSize.Width==ImageItem._InitalImageSize.Width && this.SubItemsImageSize.Height==ImageItem._InitalImageSize.Height)
+				{
+					m_OldSubItemsImageSize=this.SubItemsImageSize;
+					this.SubItemsImageSize=new Size(16,16);
+				}
+
+                if (m_PopupType == ePopupType.Container)
+                {
+                    CreatePopupContainer(true);
+                    if (m_PopupContainer != null)
+                        return m_PopupContainer.Size;
+                    return new Size(m_PopupWidth, 150);
+                }
+
+				foreach(BaseItem objItem in this.SubItems)
+					objItem.Orientation=eOrientation.Horizontal;
+
+				MenuPanel popupMenu=new MenuPanel();
+				System.Windows.Forms.Control objCtrl=this.ContainerControl as System.Windows.Forms.Control;
+				IOwnerMenuSupport ownerMenu=this.GetIOwnerMenuSupport();
+
+				popupMenu.Owner=this.GetOwner();
+				if(m_PopupFont!=null)
+					popupMenu.Font=m_PopupFont;
+				else if(objCtrl!=null && objCtrl.Font!=null)
+				    popupMenu.Font = objCtrl.Font; // (System.Drawing.Font)objCtrl.Font.Clone();
+				
+				if(ownerMenu!=null && ownerMenu.AlwaysShowFullMenus)
+					popupMenu.PersonalizedMenus=ePersonalizedMenus.Disabled;
+				else
+					popupMenu.PersonalizedMenus=m_PersonalizedMenus;
+				if(ownerMenu!=null && !ownerMenu.ShowFullMenusOnHover && (popupMenu.PersonalizedMenus==ePersonalizedMenus.DisplayOnHover || popupMenu.PersonalizedMenus==ePersonalizedMenus.Both))
+					popupMenu.PersonalizedMenus=ePersonalizedMenus.DisplayOnClick;
+
+				popupMenu.PopupAnimation=m_PopupAnimation;
+
+				if(ownerMenu!=null && (this.IsOnMenuBar || this.IsOnMenu))
+				{
+					popupMenu.PersonalizedAllVisible=ownerMenu.PersonalizedAllVisible;
+				}
+
+				if(this.Parent is CustomizeItem || this is CustomizeItem && !(this is QatCustomizeItem))
+					popupMenu.IsCustomizeMenu=true;
+
+				if(this.GetOwner() is DotNetBarManager && ((DotNetBarManager)this.GetOwner()).UseGlobalColorScheme)
+					popupMenu.ColorScheme=((DotNetBarManager)this.GetOwner()).ColorScheme;
+                if (objCtrl is Bar)
+                    popupMenu.ColorScheme = ((Bar)objCtrl).ColorScheme;
+                else if (objCtrl is MenuPanel)
+                    popupMenu.ColorScheme = ((MenuPanel)objCtrl).ColorScheme;
+                else if(objCtrl is PopupItemControl)
+                    popupMenu.ColorScheme = ((PopupItemControl)objCtrl).GetColorScheme();
+                else if (BarFunctions.IsOffice2007Style(this.EffectiveStyle) && Rendering.GlobalManager.Renderer is Office2007Renderer)
+                    popupMenu.ColorScheme = ((Office2007Renderer)Rendering.GlobalManager.Renderer).ColorTable.LegacyColors;
+                else
+                    popupMenu.ColorScheme = new ColorScheme(this.EffectiveStyle);
+
+				popupMenu.SideBar=m_SideBar;
+				popupMenu.ParentItem=this;
+				popupMenu.CreateControl();
+				popupMenu.RecalcSize();
+				System.Drawing.Size size=popupMenu.Size;
+				popupMenu.Dispose();
+				popupMenu=null;
+				return size;
+			}
+		}
+
+        /// <summary>
+        /// Invokes PopupOpen event.
+        /// </summary>
+        /// <param name="e"></param>
+        protected virtual void OnPopupOpen(PopupOpenEventArgs e)
+        {
+            if (PopupOpen != null)
+                PopupOpen(this, e);
+            if (!e.Cancel)
+            {
+                IOwnerMenuSupport ownerMenu = this.GetIOwnerMenuSupport();
+                if(ownerMenu!=null)
+                    ownerMenu.InvokePopupOpen(this, e);
+            }
+        }
+
+        private bool _VerifyPopupScreenPosition = true;
+        /// <summary>
+        /// Gets or sets whether popup on-screen position is verified and popup location adjusted so it does not cross boundaries of the screen.
+        /// </summary>
+        [DefaultValue(true), Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool VerifyPopupScreenPosition
+        {
+            get
+            {
+                return _VerifyPopupScreenPosition;
+            }
+            set
+            {
+                _VerifyPopupScreenPosition = value;
+            }
+        }
+
+        /// <summary>
+		/// Displays the sub-items on popup menu.
+		/// </summary>
+		/// <param name="x">Horizontal coordinate in pixels of the upper left corner of a popup.</param>
+		/// <param name="y">Vertical coordinate in pixels of the upper left corner of a popup.</param>
+        public virtual void PopupMenu(int x, int y)
+        {
+            PopupMenu(x, y, _VerifyPopupScreenPosition);
+        }
+
+		/// <summary>
+		/// Displays the sub-items on popup menu.
+		/// </summary>
+		/// <param name="x">Horizontal coordinate in pixels of the upper left corner of a popup.</param>
+		/// <param name="y">Vertical coordinate in pixels of the upper left corner of a popup.</param>
+        /// <param name="verifyScreenPosition">Indicates whether screen position of the menu is verified so the menu always appears on the screen.</param>
+		public virtual void PopupMenu(int x, int y, bool verifyScreenPosition)
+		{
+            PopupPositionAdjusted = false;
+			IOwnerMenuSupport ownerMenu=this.GetIOwnerMenuSupport();
+
+			//if(ownerMenu==null)
+			//	throw(new InvalidOperationException("Current owner is not assigned or it does not have popup menu support."));
+
+			System.Windows.Forms.Control objCtrl=this.ContainerControl as System.Windows.Forms.Control;
+
+			if(ownerMenu!=null)
+			{
+                PopupOpenEventArgs args=new PopupOpenEventArgs();
+                OnPopupOpen(args);
+				if(args.Cancel)
+				{
+					this.Expanded=false;
+					return;
+				}
+			}
+
+			if(this.SubItemsImageSize.Width==ImageItem._InitalImageSize.Width && this.SubItemsImageSize.Height==ImageItem._InitalImageSize.Height)
+			{
+				m_OldSubItemsImageSize=this.SubItemsImageSize;
+				this.SubItemsImageSize=new Size(16,16);
+			}
+
+			foreach(BaseItem objItem in this.SubItems)
+				objItem.Orientation=eOrientation.Horizontal;
+
+			if(m_PopupMenu==null)
+			{
+				m_PopupMenu=new MenuPanel();
+				m_PopupMenu.Owner=this.GetOwner();
+                m_PopupMenu.UseWholeScreenForSizeChecking = !verifyScreenPosition;
+
+				if(m_PopupFont!=null)
+					m_PopupMenu.Font=m_PopupFont;
+                else if (objCtrl != null && objCtrl.Font != null)
+                {
+                    if (objCtrl.GetType().Name.Contains("MetroTabStrip") && objCtrl.Parent != null && objCtrl.Parent.Font != null)
+                        m_PopupMenu.Font = objCtrl.Parent.Font;
+                    else
+                        m_PopupMenu.Font = objCtrl.Font; // (System.Drawing.Font)objCtrl.Font.Clone();
+                }
+				
+				if(ownerMenu!=null && ownerMenu.AlwaysShowFullMenus)
+					m_PopupMenu.PersonalizedMenus=ePersonalizedMenus.Disabled;
+				else
+                    m_PopupMenu.PersonalizedMenus=m_PersonalizedMenus;
+				if(ownerMenu!=null && !ownerMenu.ShowFullMenusOnHover && (m_PopupMenu.PersonalizedMenus==ePersonalizedMenus.DisplayOnHover || m_PopupMenu.PersonalizedMenus==ePersonalizedMenus.Both))
+					m_PopupMenu.PersonalizedMenus=ePersonalizedMenus.DisplayOnClick;
+
+				m_PopupMenu.PopupAnimation=m_PopupAnimation;
+
+				if(ownerMenu!=null && (this.IsOnMenuBar || this.IsOnMenu))
+				{
+					m_PopupMenu.PersonalizedAllVisible=ownerMenu.PersonalizedAllVisible;
+				}
+
+				if(this.Parent is CustomizeItem || this is CustomizeItem && !(this is QatCustomizeItem))
+					m_PopupMenu.IsCustomizeMenu=true;
+
+				if(objCtrl is Bar)
+				{
+                    Bar bar=(Bar)objCtrl;
+                    m_PopupMenu.ColorScheme = bar.GetColorScheme();
+                    m_PopupMenu.ShowToolTips = bar.ShowToolTips;
+                    m_PopupMenu.AntiAlias = bar.AntiAlias;
+                    if (objCtrl is ContextMenuBar)
+                        m_PopupMenu.UseWholeScreenForSizeChecking = true;
+				}
+				else if(objCtrl is MenuPanel)
+				{
+                    MenuPanel menuPanel = (MenuPanel)objCtrl;
+                    m_PopupMenu.ColorScheme = menuPanel.ColorScheme;
+                    m_PopupMenu.ShowToolTips = menuPanel.ShowToolTips;
+                    m_PopupMenu.AntiAlias = menuPanel.AntiAlias;
+				}
+				else if(objCtrl is SideBar)
+					m_PopupMenu.ColorScheme=((SideBar)objCtrl).ColorScheme;
+                else if (objCtrl is ExplorerBar)
+                {
+                    ExplorerBar eb = objCtrl as ExplorerBar;
+                    m_PopupMenu.ColorScheme = eb.ColorScheme;
+                    m_PopupMenu.AntiAlias = eb.AntiAlias;
+                }
+                else if (objCtrl is BarBaseControl)
+                    m_PopupMenu.ColorScheme = ((BarBaseControl)objCtrl).ColorScheme;
+                else if (objCtrl is ItemControl)
+                {
+                    ItemControl ic = (ItemControl)objCtrl;
+                    m_PopupMenu.ColorScheme = ic.GetColorSchemeInternal();
+                    m_PopupMenu.AntiAlias = ic.AntiAlias;
+                }
+                else if (objCtrl is PopupItemControl)
+                {
+                    PopupItemControl bx = (PopupItemControl)objCtrl;
+                    m_PopupMenu.ColorScheme = bx.GetColorScheme();
+                    m_PopupMenu.AntiAlias = bx.AntiAlias;
+                }
+                else
+                {
+                    if (this.Style == eDotNetBarStyle.StyleManagerControlled && GlobalManager.Renderer is Office2007Renderer)
+                    {
+                        m_PopupMenu.ColorScheme = ((Office2007Renderer)GlobalManager.Renderer).ColorTable.LegacyColors;
+                    }
+                    else
+                    {
+                        m_PopupMenu.ColorScheme = new ColorScheme(this.EffectiveStyle);
+                    }
+                    object own = this.GetOwner();
+                    if (own is ItemControl)
+                    {
+                        m_PopupMenu.AntiAlias = ((ItemControl)own).AntiAlias;
+                    }
+                    else if (own is Bar)
+                    {
+                        m_PopupMenu.AntiAlias = ((Bar)own).AntiAlias;
+                    }
+                }
+
+                if (objCtrl != null)
+                    m_PopupMenu.RightToLeft = objCtrl.RightToLeft;
+
+				m_PopupMenu.SideBar=m_SideBar;
+				m_PopupMenu.ParentItem=this;
+				m_PopupMenu.CreateControl();
+				m_PopupMenu.RecalcSize();
+			}
+
+			// Make sure that menu is on-screen
+			ScreenInformation objScreen=BarFunctions.ScreenFromPoint(new Point(x,y));
+            if(objScreen == null && IsHandleValid(objCtrl))
+				objScreen=BarFunctions.ScreenFromControl(objCtrl);
+
+			Rectangle workingArea=objScreen.WorkingArea;
+            if (this.Parent == null)
+            {
+                workingArea = objScreen.Bounds;
+                m_PopupMenu.UseWholeScreenForSizeChecking = true;
+            }
+
+			if(this.IsRightHanded)
+			{
+				// When working with right-handed menus for TabletPC the coordinates passed here are
+				// the upper right x,y coordinates since menus are right aligned...
+				x-=m_PopupMenu.Width;
+                if (objScreen != null && x < workingArea.Left && verifyScreenPosition)
+				{
+                    PopupPositionAdjusted = true;
+					// Push it to the right side
+					if(this.Displayed && objCtrl!=null && (m_PopupMenu.IsCustomizeMenu || this.IsOnMenu))
+					{
+						Point p,ps;
+						
+						if(m_PopupMenu.IsCustomizeMenu)
+						{
+							p=new Point(m_Rect.Right,m_Rect.Bottom);
+						}
+						else
+						{
+							p=new Point(m_Rect.Right,m_Rect.Top);
+						}
+
+						ps=objCtrl.PointToScreen(p);
+						x=ps.X;
+                        if (x + m_PopupMenu.Width > workingArea.Right)
+                        {
+                            x = workingArea.Right - m_PopupMenu.Width;
+                        }
+					}
+					else
+						x=workingArea.Left;
+				}
+			}
+			else
+			{
+                if (objScreen != null && (x + m_PopupMenu.Width > workingArea.Right || x < workingArea.Left) && verifyScreenPosition)
+                {
+                    PopupPositionAdjusted = true;
+                    if (x + m_PopupMenu.Width > workingArea.Right)
+                    {
+                        // Push it to the right side
+                        if (this.Displayed && objCtrl != null && !(objCtrl is ContextMenuBar))
+                        {
+                            Point p, ps;
+
+                            if (m_PopupMenu.IsCustomizeMenu)
+                            {
+                                p = new Point(m_Rect.Left, m_Rect.Bottom);
+                            }
+                            else
+                            {
+                                if (this.IsOnMenu)
+                                    p = new Point(m_Rect.Left, m_Rect.Top);
+                                else
+                                    p = new Point(m_Rect.Right, m_Rect.Top);
+                            }
+
+                            ps = objCtrl.PointToScreen(p);
+                            x = ps.X - m_PopupMenu.Width;
+                            if (x + m_PopupMenu.Width > workingArea.Right)
+                                x = workingArea.Right - m_PopupMenu.Width;
+                        }
+                        else
+                            x = workingArea.Right - m_PopupMenu.Width;
+                    }
+                    else if (x < workingArea.Left)
+                        x = workingArea.Left;
+                }
+			}
+
+			// Try to fit whole popup menu "nicely"
+            if (objScreen != null && verifyScreenPosition)
+			{
+                if (y + m_PopupMenu.Height > workingArea.Bottom)
+                {
+                    // If this container is displayed then try to put it above the menu item
+                    if (this.Displayed && objCtrl != null && objCtrl.Visible)
+                    {
+                        Point p = new Point(m_Rect.Left, m_Rect.Bottom - 1), ps;
+                        ps = objCtrl.PointToScreen(p);
+                        ps.Y += 2;
+                        if (ps.Y - m_PopupMenu.Height >= workingArea.Top)
+                            y = Math.Min(workingArea.Bottom, ps.Y) - m_PopupMenu.Height;
+                        else if (this is ApplicationButton)
+                            y = workingArea.Bottom - m_PopupMenu.Height - 4;
+                        else if (this is DevComponents.DotNetBar.Metro.MetroAppButton)
+                            y = workingArea.Bottom - m_PopupMenu.Height - 4;
+                    }
+                    else
+                        y = workingArea.Bottom - m_PopupMenu.Height;
+                    if (y < workingArea.Top)
+                        y = workingArea.Top;
+                    PopupPositionAdjusted = true;
+                }
+			}
+            x += _PopupOffset.X;
+            y += _PopupOffset.Y;
+			// If it still does not fit at this point, container will scale itself properly
+			// And allow item scrolling
+			m_PopupMenu.Location=new Point(x,y);
+
+            OnPopupShowing(EventArgs.Empty);
+
+			m_PopupMenu.Show();
+
+            if (this.ContainerControl is IKeyTipsControl)
+            {
+                IKeyTipsControl kc = this.ContainerControl as IKeyTipsControl;
+                m_PopupMenu.ShowKeyTips = kc.ShowKeyTips;
+                kc.ShowKeyTips = false;
+            }
+
+			this.Expanded=true;
+			
+			if(ownerMenu!=null)
+			{
+				if(!(objCtrl is Bar) && !(objCtrl is MenuPanel))
+				{
+					ownerMenu.RegisterPopup(this);
+					m_FilterInstalled=true;
+				}
+				else if(objCtrl is Bar)
+				{
+					Bar bar=objCtrl as Bar;
+					if(bar.BarState!=eBarState.Popup)
+					{
+						ownerMenu.RegisterPopup(this);
+						m_FilterInstalled=true;
+					}		
+					bar=null;
+				}
+			}
+		}
+
+        /// <summary>
+        /// Raises PopupShowing event.
+        /// </summary>
+        /// <param name="e">Event arguments.</param>
+        protected virtual void OnPopupShowing(EventArgs e)
+        {
+            if (PopupShowing != null)
+                PopupShowing(this, e);
+
+            IOwnerMenuSupport ownerMenu = this.GetIOwnerMenuSupport();
+            if (ownerMenu != null)
+                ownerMenu.InvokePopupShowing(this, e);
+        }
+        /// <summary>
+		/// Displays the sub-items on popup toolbar.
+		/// </summary>
+		/// <param name="p">Popup location.</param>
+		public void PopupBar(Point p)
+		{
+			PopupBar(p.X,p.Y);
+		}
+		
+		/// <summary>
+		/// Displays the sub-items on popup toolbar.
+		/// </summary>
+		/// <param name="x">Horizontal coordinate in pixels of the upper left corner of a popup.</param>
+		/// <param name="y">Vertical coordinate in pixels of the upper left corner of a popup.</param>
+		public virtual void PopupBar(int x, int y)
+		{
+			//DotNetBarManager owner=this.GetOwner();
+			IOwnerMenuSupport ownerMenu=this.GetIOwnerMenuSupport();
+			//if(ownerMenu==null)
+			//	throw(new InvalidOperationException("Current owner is not assigned or it does not have popup bar support."));
+
+			System.Windows.Forms.Control objCtrl=this.ContainerControl as System.Windows.Forms.Control;
+
+			if(ownerMenu!=null)
+			{
+				PopupOpenEventArgs args=new PopupOpenEventArgs();
+				if(PopupOpen!=null)
+					PopupOpen(this,args);
+				if(!args.Cancel)
+					ownerMenu.InvokePopupOpen(this,args);
+				if(args.Cancel)
+				{
+					this.Expanded=false;
+					return;
+				}
+			}
+
+			foreach(BaseItem objItem in this.SubItems)
+				objItem.Orientation=eOrientation.Horizontal;
+
+			if(m_PopupBar==null)
+			{
+				m_PopupBar=new Bar();
+
+				if(m_PopupFont!=null)
+					m_PopupBar.Font=m_PopupFont;
+				else if(objCtrl!=null && objCtrl.Font!=null)
+					m_PopupBar.Font=(System.Drawing.Font)objCtrl.Font.Clone();
+				if(objCtrl is Bar && ((Bar)objCtrl).ColorScheme!=null)
+					m_PopupBar.ColorScheme=((Bar)objCtrl).ColorScheme;
+				else if(objCtrl is MenuPanel && ((MenuPanel)objCtrl).ColorScheme!=null)
+					m_PopupBar.ColorScheme=((MenuPanel)objCtrl).ColorScheme;
+                else if (objCtrl is ItemControl && ((ItemControl)objCtrl).ColorScheme != null)
+                    m_PopupBar.ColorScheme = ((ItemControl)objCtrl).ColorScheme;
+                else if (objCtrl is ButtonX && ((ButtonX)objCtrl).ColorScheme != null)
+                    m_PopupBar.ColorScheme = ((ButtonX)objCtrl).ColorScheme;
+				else
+                    m_PopupBar.ColorScheme = new ColorScheme(this.EffectiveStyle);
+				m_PopupBar.SetBarState(eBarState.Popup);
+				m_PopupBar.PopupAnimation=m_PopupAnimation;
+				m_PopupBar.Owner=this.GetOwner();
+				m_PopupBar.ParentItem=this;
+                if(objCtrl!=null)
+                    m_PopupBar.RightToLeft = objCtrl.RightToLeft;
+				m_PopupBar.CreateControl();
+				m_PopupBar.SetDesignMode(this.DesignMode);
+				m_PopupBar.ThemeAware=this.ThemeAware;
+				
+				if(objCtrl is IBarImageSize)
+					m_PopupBar.ImageSize=((IBarImageSize)objCtrl).ImageSize;					
+
+				m_PopupBar.PopupWidth=m_PopupWidth;
+
+				m_PopupBar.RecalcSize();
+			}
+
+			// Make sure that menu is on-screen
+			ScreenInformation objScreen=null;
+			if(IsHandleValid(objCtrl))
+			{
+				objScreen=BarFunctions.ScreenFromControl(objCtrl);
+			}
+			else
+			{
+				objScreen=BarFunctions.ScreenFromPoint(new Point(x,y));
+			}
+
+			if(this.IsRightHanded)
+				x-=m_PopupBar.Width;
+
+			if(objScreen!=null && x+m_PopupBar.Width>objScreen.WorkingArea.Right)
+			{
+				// Push it to the right side
+				x=objScreen.WorkingArea.Right-m_PopupBar.Width;
+			}
+			else if(objScreen!=null && x<objScreen.WorkingArea.Left)
+				x=objScreen.WorkingArea.Left;
+
+			// Try to fit whole popup menu "nicely"
+			if(objScreen!=null && y+m_PopupBar.Height>objScreen.WorkingArea.Bottom)
+			{
+				// If this container is displayed then try to put it above the menu item
+				if(this.Displayed && objCtrl!=null)
+				{
+					Point p=new Point(m_Rect.Left,m_Rect.Bottom), ps;
+					ps=objCtrl.PointToScreen(p);
+					ps.Y+=2;
+					if(ps.Y-m_PopupBar.Height>=objScreen.WorkingArea.Top)
+						y=ps.Y-m_PopupBar.Height;
+				}
+			}
+
+            x += _PopupOffset.X;
+            y += _PopupOffset.Y;
+
+			// If it still does not fit at this point, container will scale itself properly
+			// And allow item scrolling
+			m_PopupBar.Location=new Point(x,y);
+			if(ownerMenu!=null)
+				ownerMenu.InvokePopupShowing(this,new EventArgs());
+			m_PopupBar.ShowBar();
+			this.Expanded=true;
+			
+			if(ownerMenu!=null)
+			{
+				if(!(objCtrl is Bar) && !(objCtrl is MenuPanel))
+				{
+					ownerMenu.RegisterPopup(this);
+					m_FilterInstalled=true;
+				}
+				else if(objCtrl is Bar)
+				{
+					Bar bar=objCtrl as Bar;
+					if(bar.BarState!=eBarState.Popup)
+					{
+						ownerMenu.RegisterPopup(this);
+						m_FilterInstalled=true;
+					}		
+					bar=null;
+				}
+			}
+		}
+
+		/// <summary>
+		/// Displays popup container.
+		/// </summary>
+		/// <param name="p">Popup location.</param>
+		public void PopupContainer(Point p)
+		{
+			PopupContainer(p.X,p.Y);
+		}
+
+        /// <summary>
+        /// Creates the popup container control which is a parent/holder control for the controls you want to display on the popup.
+        /// This method can be used if you do not wish to handle the PopupContainerLoad to add controls to the popup container.
+        /// After calling this method you can access PopupContainerControl property to add your controls to be displayed on the popup.
+        /// </summary>
+        /// <param name="fireLoadEvents">Indicates whether PopupContainerLoad events are fired.</param>
+        public virtual void CreatePopupContainer(bool fireLoadEvents)
+        {
+            if (this.PopupType != ePopupType.Container)
+                throw new InvalidOperationException("Method can only be called for PopupType set to ePopupType.Container");
+
+            if (m_PopupContainer == null)
+            {
+                m_PopupContainer = new PopupContainerControl();
+                m_PopupContainer.Owner = this.GetOwner();
+                m_PopupContainer.ParentItem = this;
+                m_PopupContainer.CreateControl();
+                m_PopupContainer.SetDesignMode(this.DesignMode);
+                m_PopupContainer.Width = m_PopupWidth;
+
+                if (fireLoadEvents)
+                {
+                    IOwnerMenuSupport ownerMenu = this.GetIOwnerMenuSupport();
+                    // Fire off events
+                    if (PopupContainerLoad != null)
+                        PopupContainerLoad(this, new EventArgs());
+                    if (ownerMenu != null)
+                        ownerMenu.InvokePopupContainerLoad(this, new EventArgs());
+
+                    // Recalc Size would go here...
+                    m_PopupContainer.RecalcSize();
+                }
+            }
+        }
+
+		/// <summary>
+		/// Displays popup container.
+		/// </summary>
+		/// <param name="x">Horizontal coordinate in pixels of the upper left corner of a popup.</param>
+		/// <param name="y">Vertical coordinate in pixels of the upper left corner of a popup.</param>
+		public virtual void PopupContainer(int x, int y)
+		{
+			//DotNetBarManager owner=this.GetOwner();
+			IOwnerMenuSupport ownerMenu=this.GetIOwnerMenuSupport();
+			if(ownerMenu==null)
+				throw(new InvalidOperationException("Current owner is not assigned or it does not have popup bar support."));
+
+            CreatePopupContainer(true);
+			
+			// Make sure that container is on-screen
+			System.Windows.Forms.Control objCtrl=this.ContainerControl as System.Windows.Forms.Control;
+			ScreenInformation objScreen=null;
+			if(IsHandleValid(objCtrl))
+			{
+				objScreen=BarFunctions.ScreenFromControl(objCtrl);
+			}
+			else
+			{
+				objScreen=BarFunctions.ScreenFromPoint(new Point(x,y));
+			}
+
+			if(this.IsRightHanded)
+				x-=m_PopupContainer.Width;
+
+			if(objScreen!=null && x+m_PopupContainer.Width>objScreen.WorkingArea.Right)
+			{
+				// Push it to the right side
+				x=objScreen.WorkingArea.Right-m_PopupContainer.Width;
+			}
+			else if(objScreen!=null && x<objScreen.WorkingArea.Left)
+				x=objScreen.WorkingArea.Left;
+
+			// Try to fit whole popup menu "nicely"
+			if(objScreen!=null && y+m_PopupContainer.Height>objScreen.WorkingArea.Bottom)
+			{
+				// If this container is displayed then try to put it above the menu item
+				if(this.Displayed && objCtrl!=null)
+				{
+					Point p=new Point(m_Rect.Left,m_Rect.Top), ps;
+					ps=objCtrl.PointToScreen(p);
+					ps.Y+=2;
+					if(ps.Y-m_PopupContainer.Height>=objScreen.WorkingArea.Top)
+						y=ps.Y-m_PopupContainer.Height;
+				}
+			}
+
+            x += _PopupOffset.X;
+            y += _PopupOffset.Y;
+
+			// If it still does not fit at this point, container will scale itself properly
+			// And allow item scrolling
+			m_PopupContainer.Location=new Point(x,y);
+			if(ownerMenu!=null)
+				ownerMenu.InvokePopupShowing(this,new EventArgs());
+			m_PopupContainer.Show();
+			this.Expanded=true;
+			
+			if(ownerMenu!=null)
+			{
+				if(!(objCtrl is Bar) && !(objCtrl is MenuPanel))
+				{
+					ownerMenu.RegisterPopup(this);
+					m_FilterInstalled=true;
+				}
+				else if(objCtrl is Bar)
+				{
+					Bar bar=objCtrl as Bar;
+					if(bar.BarState!=eBarState.Popup)
+					{
+						ownerMenu.RegisterPopup(this);
+						m_FilterInstalled=true;
+					}		
+					bar=null;
+				}
+			}
+		}
+
+		/// <summary>
+		/// Displays the sub-items on popup specified by PopupType.
+		/// </summary>
+		/// <param name="p">Popup location.</param>
+		public virtual void Popup(Point p)
+		{
+			this.Popup(p.X,p.Y);
+		}
+
+		/// <summary>
+		/// Displays the sub-items on popup specified by PopupType.
+		/// </summary>
+		/// <param name="x">Horizontal coordinate in pixels of the upper left corner of a popup.</param>
+		/// <param name="y">Vertical coordinate in pixels of the upper left corner of a popup.</param>
+		public virtual void Popup(int x, int y)
+		{
+			if(m_PopupBar!=null || m_PopupMenu!=null || m_PopupContainer!=null)
+				ClosePopup();
+			switch(m_PopupType)
+			{
+				case ePopupType.Container:
+					this.PopupContainer(x,y);
+					break;
+				case ePopupType.Menu:
+					this.PopupMenu(x,y);
+					break;
+				case ePopupType.ToolBar:
+					this.PopupBar(x,y);
+					break;
+			}
+		}
+
+        /// <summary>
+        /// Raises PopupClose event.
+        /// </summary>
+        /// <param name="e">Event arguments.</param>
+        protected virtual void OnPopupClose(EventArgs e)
+        {
+            IOwnerMenuSupport ownerMenu = this.GetIOwnerMenuSupport();
+            if (PopupClose != null)
+                PopupClose(this, e);
+
+            if (ownerMenu != null)
+                ownerMenu.InvokePopupClose(this, e);
+        }
+
+        /// <summary>
+        /// Queries whether popup can be closed.
+        /// </summary>
+        /// <param name="eventSource">Source of closing request.</param>
+        /// <returns>true if popup can be closed otherwise false.</returns>
+        internal bool QueryPopupClosing(eEventSource eventSource)
+        {
+            CancelableEventSourceHandler handler = QueryPopupClose;
+            if (handler != null)
+            {
+                CancelableEventSourceArgs e = new CancelableEventSourceArgs(eventSource);
+                handler(this, e);
+                return !e.Cancel;
+            }
+            return true;
+        }
+
+		/// <summary>
+		/// Closes the currently open popup.
+		/// </summary>
+		public virtual void ClosePopup()
+		{
+			if(m_OldSubItemsImageSize!=Size.Empty)
+			{
+				this.SubItemsImageSize=m_OldSubItemsImageSize;
+				m_OldSubItemsImageSize=Size.Empty;
+			}
+
+			//DotNetBarManager owner=this.GetOwner();
+			IOwnerMenuSupport ownerMenu=this.GetIOwnerMenuSupport();
+
+			if(ownerMenu!=null)
+				ownerMenu.UnregisterPopup(this);
+			m_FilterInstalled=false;
+
+			// Fire off events
+			if(m_PopupContainer!=null)
+			{
+				if(PopupContainerUnload!=null)
+					PopupContainerUnload(this,new EventArgs());
+				
+				if(ownerMenu!=null)
+					ownerMenu.InvokePopupContainerUnload(this,new EventArgs());
+			}
+
+			if((m_PopupBar!=null || m_PopupMenu!=null || m_PopupContainer!=null) && ownerMenu!=null)
+			{
+                OnPopupClose(EventArgs.Empty);
+			}
+
+			if(m_PopupMenu!=null)
+			{
+                if (this.ContainerControl is IKeyTipsControl)
+                {
+                    IKeyTipsControl kc = this.ContainerControl as IKeyTipsControl;
+                    kc.ShowKeyTips = m_PopupMenu.ShowKeyTips;
+                    m_PopupMenu.ShowKeyTips = false;
+                }
+                m_PopupMenu.Close();
+				m_PopupMenu.Dispose();
+				m_PopupMenu=null;
+			}
+			if(m_PopupBar!=null)
+			{
+				m_PopupBar.Hide();
+				m_PopupBar.Dispose();
+				m_PopupBar=null;
+			}
+			if(m_PopupContainer!=null)
+			{
+				m_PopupContainer.Hide();
+				m_PopupContainer.Dispose();
+				m_PopupContainer=null;
+			}
+			this.Expanded=false;
+
+			IOwner owner=this.GetOwner() as IOwner;
+			if(owner!=null && owner.ParentForm!=null)
+			{
+				owner.ParentForm.Update();
+			}
+
+            OnPopupFinalized(EventArgs.Empty);
+		}
+
+        /// <summary>
+        /// Raises PopupFinalized event.
+        /// </summary>
+        /// <param name="e">Event arguments.</param>
+        protected virtual void OnPopupFinalized(EventArgs e)
+        {
+            if (PopupFinalized != null)
+                PopupFinalized(this, e);
+        }
+        /// <summary>
+		/// Indicates whether sub-items are shown on popup Bar or popup menu.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Appearance"),System.ComponentModel.Description("Indicates whether sub-items are shown on popup Bar or popup menu."),System.ComponentModel.DefaultValue(ePopupType.Menu)]
+		public virtual ePopupType PopupType
+		{
+			get
+			{
+				return m_PopupType;
+			}
+			set
+			{
+				if(m_PopupType==value)
+					return;
+				m_PopupType=value;
+                if(ShouldSyncProperties)
+                    BarFunctions.SyncProperty(this, "PopupType");
+				NeedRecalcSize=true;
+				this.Refresh();
+			}
+		}
+
+		/// <summary>
+		/// Indicates the font that will be used on the popup window.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Appearance"),System.ComponentModel.Description("Indicates the font that will be used on the popup window."),System.ComponentModel.DefaultValue(null)]
+		public virtual System.Drawing.Font PopupFont
+		{
+			get
+			{
+				return m_PopupFont;
+			}
+			set
+			{
+				if(m_PopupFont==value)
+					return;
+				m_PopupFont=value;
+			}
+		}
+
+		/// <summary>
+		/// Indicates side bar for pop-up window.
+		/// </summary>
+		[System.ComponentModel.Browsable(false),System.ComponentModel.Category("Appearance"),System.ComponentModel.Description("Indicates side bar for pop-up window.")]
+		public virtual SideBarImage PopUpSideBar
+		{
+			get
+			{
+				return m_SideBar;
+			}
+			set
+			{
+				m_SideBar=value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the location of popup in relation to it's parent.
+		/// </summary>
+        [Browsable(true), DevCoBrowsable(false), DefaultValue(ePopupSide.Default), Description("Indicates location of popup in relation to it's parent.")]
+		public virtual ePopupSide PopupSide
+		{
+			get {return m_PopupSide;}
+			set
+            {
+                m_PopupSide=value;
+                OnAppearanceChanged();
+            }
+		}
+
+		private System.Drawing.Point GetDisplayLocation()
+		{
+			System.Drawing.Point p=System.Drawing.Point.Empty;
+			if(this.Parent==null && !(this.ContainerControl is ButtonX))
+				return p;
+
+			if(m_PopupSide==ePopupSide.Right)
+			{
+				p.X=m_Rect.Right;
+				p.Y=m_Rect.Top;
+			}
+			else if(m_PopupSide==ePopupSide.Left)
+			{
+				System.Drawing.Size ps=this.PopupSize;
+				p.X=m_Rect.Left-ps.Width;
+				p.Y=m_Rect.Top;
+			}
+			else if(m_PopupSide==ePopupSide.Top)
+			{
+				System.Drawing.Size ps=this.PopupSize;
+				p.Y=m_Rect.Top-ps.Height;
+				//if(p.Y<0)
+				//	p.Y=m_Rect.Bottom;
+				if(ps.Width>m_Rect.Width)
+					p.X=m_Rect.Left;
+				else
+					p.X=m_Rect.Right-ps.Width;
+			}
+			else if(m_PopupSide==ePopupSide.Bottom)
+			{
+				System.Drawing.Size ps=this.PopupSize;
+				p.Y=m_Rect.Bottom;
+				if(ps.Width>m_Rect.Width)
+					p.X=m_Rect.Left;
+				else
+					p.X=m_Rect.Right-ps.Width;
+			}
+			return p;
+		}
+
+        private static readonly Point DefaultPopupOffset = Point.Empty;
+        private Point _PopupOffset = DefaultPopupOffset;
+        /// <summary>
+        /// Gets or sets the popup offset.
+        /// </summary>
+        [Category("Behavior"), Description("Indicates popup offset.")]
+        public Point PopupOffset
+        {
+        	get {	return _PopupOffset; }
+        	set { _PopupOffset = value;	}
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializePopupOffset()
+        {
+            return _PopupOffset != DefaultPopupOffset;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetPopupOffset()
+        {
+            this.PopupOffset =  DefaultPopupOffset;
+        }
+
+		/// <summary>
+		/// Gets or sets the popup location.
+		/// </summary>
+		[System.ComponentModel.Browsable(false),System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
+		public Point PopupLocation
+		{
+			get
+			{
+				if(m_PopupMenu!=null)
+					return m_PopupMenu.Location;
+				else if(m_PopupBar!=null)
+					return m_PopupBar.Location;
+				else if(m_PopupContainer!=null)
+					return m_PopupContainer.Location;
+				return m_PopupLocation;
+			}
+			set
+			{
+				m_PopupLocation=value;
+				if(m_PopupMenu!=null)
+					m_PopupMenu.Location=value;
+                else if(m_PopupBar!=null)
+					m_PopupBar.Location=value;
+				else if(m_PopupContainer!=null)
+					m_PopupContainer.Location=value;
+			}
+		}
+
+		protected internal override void OnBeforeItemRemoved(BaseItem objItem)
+		{
+			base.OnBeforeItemRemoved(objItem);
+			if(m_PopupBar!=null && objItem!=null)
+				m_PopupBar.Items.Remove(objItem);
+		}
+
+        protected internal override void OnAfterItemRemoved(BaseItem objItem, int itemIndex)
+		{
+			base.OnAfterItemRemoved(objItem, itemIndex);
+			if(this.Expanded && objItem==null)
+				this.Expanded=false;
+			if(m_PopupMenu!=null && !this.SuspendLayout)
+				m_PopupMenu.RecalcSize();
+            else if (m_PopupBar != null && !this.SuspendLayout)
+				m_PopupBar.RecalcLayout();
+		}
+
+		/// <summary>
+		/// Indicates when menu items are displayed when MenuVisiblity is set to VisibleIfRecentlyUsed and RecentlyUsed is true.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Appearance"),System.ComponentModel.Description("Indicates when menu items are displayed when MenuVisiblity is set to VisibleIfRecentlyUsed and RecentlyUsed is true."),System.ComponentModel.DefaultValue(ePersonalizedMenus.Disabled)]
+		public virtual ePersonalizedMenus PersonalizedMenus
+		{
+			get
+			{
+				return m_PersonalizedMenus;
+			}
+			set
+			{
+				m_PersonalizedMenus=value;
+			}
+		}
+
+		/// <summary>
+		/// Indicates Animation type for Popups.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Behavior"),System.ComponentModel.Description("Indicates Animation type for Popups."),System.ComponentModel.DefaultValue(ePopupAnimation.ManagerControlled)]
+		public virtual ePopupAnimation PopupAnimation
+		{
+			get
+			{
+				return m_PopupAnimation;
+			}
+			set
+			{
+				m_PopupAnimation=value;
+			}
+		}
+
+		internal bool FilterInstalled
+		{
+			get
+			{
+				return m_FilterInstalled;
+			}
+			set
+			{
+				m_FilterInstalled=true;
+			}
+		}
+
+		protected internal override bool IsAnyOnHandle(IntPtr iHandle)
+		{
+			bool bRet=base.IsAnyOnHandle(iHandle);
+			if(!bRet && m_PopupContainer!=null && m_PopupContainer.Handle==iHandle)
+				bRet=true;
+			return bRet;
+		}
+
+		//***********************************************
+		// IDesignTimeProvider Implementation
+		//***********************************************
+		public InsertPosition GetInsertPosition(Point pScreen, BaseItem DragItem)
+		{
+			if(!this.Expanded)
+				return null;
+			if(m_PopupMenu!=null)
+				return m_PopupMenu.GetInsertPosition(pScreen,DragItem);
+			else if(m_PopupBar!=null)
+				return ((IDesignTimeProvider)m_PopupBar.ItemsContainer).GetInsertPosition(pScreen, DragItem);
+			return null;
+		}
+		public void DrawReversibleMarker(int iPos, bool Before)
+		{
+			if(!this.Expanded)
+				return;
+			if(m_PopupMenu!=null)
+				m_PopupMenu.DrawReversibleMarker(iPos, Before);
+			else if(m_PopupBar!=null)
+				((IDesignTimeProvider)m_PopupBar.Items).DrawReversibleMarker(iPos, Before);
+		}
+		public void InsertItemAt(BaseItem objItem, int iPos, bool Before)
+		{
+			if(!this.Expanded)
+				return;
+			if(m_PopupMenu!=null)
+				m_PopupMenu.InsertItemAt(objItem, iPos, Before);
+			else
+				((IDesignTimeProvider)m_PopupBar.Items).InsertItemAt(objItem, iPos, Before);
+		}
+
+		/// <summary>
+		/// Specifies the inital width for the Bar that hosts pop-up items. Applies to PopupType.Toolbar only.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Layout"),System.ComponentModel.Description("Specifies the inital width for the Bar that hosts pop-up items. Applies to PopupType.Toolbar only."),System.ComponentModel.DefaultValue(200)]
+		public virtual int PopupWidth
+		{
+			get
+			{
+				return m_PopupWidth;
+			}
+			set
+			{
+				if(m_PopupWidth!=value && value>0)
+				{
+					m_PopupWidth=value;
+                    if(ShouldSyncProperties)
+                        BarFunctions.SyncProperty(this, "PopupWidth");
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets the control that is displaying the context menu.
+		/// </summary>
+		[System.ComponentModel.Browsable(false),DevCoBrowsable(false),System.ComponentModel.Description("Gets the control that is displaying the context menu.")]
+		public System.Windows.Forms.Control SourceControl
+		{
+			get
+			{
+				return m_SourceControl;
+			}
+		}
+
+        /// <summary>
+        /// Sets the SourceControl for popup menu or toolbar.
+        /// </summary>
+        /// <param name="ctrl">Control that popup menu or toolbar was invoked for.</param>
+		public void SetSourceControl(System.Windows.Forms.Control ctrl)
+		{
+			m_SourceControl=ctrl;
+		}
+
+		/// <summary>
+		/// Gets the reference to the internal host PopupContainerControl control.
+		/// </summary>
+		[System.ComponentModel.Browsable(false)]
+		public PopupContainerControl PopupContainerControl
+		{
+			get
+			{
+				return m_PopupContainer;
+			}
+		}
+
+		[System.ComponentModel.Browsable(false)/*,System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)*/]
+		public System.Windows.Forms.Control PopupControl
+		{
+			get
+			{
+				if(m_PopupMenu!=null)
+					return m_PopupMenu;
+				else if(m_PopupBar!=null)
+					return m_PopupBar;
+				else if(m_PopupContainer!=null)
+					return m_PopupContainer;
+				return null;
+			}
+		}
+
+		protected override void OnDisplayedChanged()
+		{
+			if(!this.Displayed && this.Expanded)
+                this.Expanded=false;				
+		}
+
+        internal virtual bool PopupPositionAdjusted
+        {
+            get { return m_PopupPositionAdjusted; }
+            set
+            {
+                m_PopupPositionAdjusted = value;
+            }
+        }
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/PopupItemControl.cs b/PROMS/DotNetBar Source Code/PopupItemControl.cs
new file mode 100644
index 00000000..65d05178
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/PopupItemControl.cs	
@@ -0,0 +1,1560 @@
+using System;
+using System.Text;
+using System.Windows.Forms;
+using System.Collections;
+using System.ComponentModel;
+using System.Drawing;
+using DevComponents.DotNetBar.Rendering;
+
+namespace DevComponents.DotNetBar
+{
+    public abstract class PopupItemControl: Control, IThemeCache, IMessageHandlerClient,
+        IOwnerMenuSupport, IOwner, IRenderingSupport, IAccessibilitySupport, IOwnerLocalize
+    {
+        #region Events
+        /// <summary>
+        /// Occurs when popup of type container is loading.
+        /// </summary>
+        [Description("Occurs when popup of type container is loading.")]
+        public event EventHandler PopupContainerLoad;
+
+        /// <summary>
+        /// Occurs when popup of type container is unloading.
+        /// </summary>
+        [Description("Occurs when popup of type container is unloading.")]
+        public event EventHandler PopupContainerUnload;
+
+        /// <summary>
+        /// Occurs when popup item is about to open.
+        /// </summary>
+        [Description("Occurs when popup item is about to open.")]
+        public event EventHandler PopupOpen;
+
+        /// <summary>
+        /// Occurs when popup item is closing.
+        /// </summary>
+        [Description("Occurs when popup item is closing.")]
+        public event EventHandler PopupClose;
+
+        /// <summary>
+        /// Occurs just before popup window is shown.
+        /// </summary>
+        [Description("Occurs just before popup window is shown.")]
+        public event EventHandler PopupShowing;
+
+        /// <summary>
+        /// Occurs when Control is looking for translated text for one of the internal text that are
+        /// displayed on menus, toolbars and customize forms. You need to set Handled=true if you want
+        /// your custom text to be used instead of the built-in system value.
+        /// </summary>
+        public event DotNetBarManager.LocalizeStringEventHandler LocalizeString;
+        #endregion
+
+        #region Private Variables
+        private PopupItem m_PopupItem = null;
+        private ColorScheme m_ColorScheme = null;
+        private bool m_AntiAlias = false;
+        private bool m_FilterInstalled = false;
+        private bool m_MenuEventSupport = false;
+        private bool m_MenuFocus = false;
+        private Timer m_ActiveWindowTimer = null;
+        private IntPtr m_ForegroundWindow = IntPtr.Zero;
+        private IntPtr m_ActiveWindow = IntPtr.Zero;
+        private Hashtable m_ShortcutTable = new Hashtable();
+        private BaseItem m_ExpandedItem = null;
+        private BaseItem m_FocusItem = null;
+		private System.Windows.Forms.ImageList m_ImageList=null;
+		private System.Windows.Forms.ImageList m_ImageListMedium=null;
+		private System.Windows.Forms.ImageList m_ImageListLarge=null;
+        private bool m_DisabledImagesGrayScale = true;
+
+        // Theme Caching Support
+        private ThemeWindow m_ThemeWindow = null;
+        private ThemeRebar m_ThemeRebar = null;
+        private ThemeToolbar m_ThemeToolbar = null;
+        private ThemeHeader m_ThemeHeader = null;
+        private ThemeScrollBar m_ThemeScrollBar = null;
+        private ThemeExplorerBar m_ThemeExplorerBar = null;
+        private ThemeProgress m_ThemeProgress = null;
+        private ThemeButton m_ThemeButton = null;
+        private BaseItem m_DoDefaultActionItem = null;
+        
+        #endregion
+
+        #region Constructor
+        public PopupItemControl()
+        {
+            PainterFactory.InitFactory();
+            if (!ColorFunctions.ColorsLoaded)
+            {
+                NativeFunctions.RefreshSettings();
+                NativeFunctions.OnDisplayChange();
+                ColorFunctions.LoadColors();
+            }
+            
+            m_PopupItem = CreatePopupItem();
+            m_PopupItem.GlobalItem = false;
+            m_PopupItem.ContainerControl = this;
+            m_PopupItem.Style = eDotNetBarStyle.Office2007;
+            m_PopupItem.SetOwner(this);
+            m_ColorScheme = new ColorScheme(m_PopupItem.EffectiveStyle);
+
+            this.SetStyle(ControlStyles.UserPaint, true);
+            this.SetStyle(ControlStyles.AllPaintingInWmPaint, true);
+            this.SetStyle(ControlStyles.Opaque, true);
+            this.SetStyle(ControlStyles.ResizeRedraw, true);
+            this.SetStyle(DisplayHelp.DoubleBufferFlag, true);
+            this.SetStyle(ControlStyles.SupportsTransparentBackColor, true);
+            this.SetStyle(ControlStyles.ContainerControl, false);
+
+            this.SetStyle(ControlStyles.Selectable, true);
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                if (m_PopupItem != null)
+                {
+                    m_PopupItem.Dispose();
+                    //m_PopupItem = null; In designer the control keeps on being used after it has been disposed and can generate unpredictable results crashing the designer.
+                }
+            }
+            base.Dispose(disposing);
+        }
+
+        protected abstract PopupItem CreatePopupItem();
+
+        /// <summary>
+        /// Notifies the accessibility client applications of the specified AccessibleEvents for the specified child control.
+        /// </summary>
+        /// <param name="accEvent">The AccessibleEvents object to notify the accessibility client applications of. </param>
+        /// <param name="childID">The child Control to notify of the accessible event.</param>
+        internal void InternalAccessibilityNotifyClients(AccessibleEvents accEvent, int childID)
+        {
+            this.AccessibilityNotifyClients(accEvent, childID);
+        }
+        #endregion
+
+        #region Internal Implementation
+        protected override void ScaleControl(SizeF factor, BoundsSpecified specified)
+        {
+            if (Dpi.RecordScalePerControl)
+                Dpi.SetScaling(factor);
+            base.ScaleControl(factor, specified);
+        }
+
+        #if FRAMEWORK20
+        protected override void OnBindingContextChanged(EventArgs e)
+        {
+            base.OnBindingContextChanged(e);
+            if (m_PopupItem != null) m_PopupItem.UpdateBindings();
+        }
+        #endif
+        protected override void OnFontChanged(EventArgs e)
+        {
+            if (m_PopupItem != null)
+                BarUtilities.InvalidateFontChange(m_PopupItem);
+            base.OnFontChanged(e);
+            this.RecalcLayout();
+        }
+        
+        protected override void OnEnabledChanged(EventArgs e)
+        {
+            if (m_PopupItem != null) m_PopupItem.Enabled = this.Enabled;
+            base.OnEnabledChanged(e);
+        }
+       
+        protected internal virtual ColorScheme GetColorScheme()
+        {
+            if (BarFunctions.IsOffice2007Style(this.Style))
+            {
+                BaseRenderer r = GetRenderer();
+                if (r is Office2007Renderer)
+                    return ((Office2007Renderer)r).ColorTable.LegacyColors;
+            }
+            return m_ColorScheme;
+        }
+
+        /// <summary>
+        /// Forces the button to perform internal layout.
+        /// </summary>
+        public void RecalcLayout()
+        {
+            RecalcSize();
+            this.Invalidate();
+        }
+
+        protected abstract void RecalcSize();
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void SetDesignMode(bool value)
+        {
+            if (m_PopupItem != null)
+                m_PopupItem.SetDesignMode(value);
+        }
+
+        /// <summary>
+        /// Gets/Sets the visual style for the button.
+        /// </summary>
+        [Category("Appearance"), Description("Specifies the visual style of the button."), DefaultValue(eDotNetBarStyle.Office2007)]
+        public virtual eDotNetBarStyle Style
+        {
+            get { return (InternalStyle); }
+            set { InternalStyle = value; }
+        }
+
+        protected eDotNetBarStyle InternalStyle
+        {
+            get
+            {
+                return m_PopupItem.Style;
+            }
+            set
+            {
+                m_ColorScheme.Style = value;
+                m_PopupItem.Style = value;
+                OnDotNetBarStyleChanged();
+                this.RecalcLayout();
+            }
+        }
+
+        protected virtual void OnDotNetBarStyleChanged() { }
+        /// <summary>
+        /// Creates the Graphics object for the control.
+        /// </summary>
+        /// <returns>The Graphics object for the control.</returns>
+        public new Graphics CreateGraphics()
+        {
+            Graphics g = base.CreateGraphics();
+            if (m_AntiAlias)
+            {
+                g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.AntiAlias;
+				#if FRAMEWORK20
+                if (!SystemInformation.IsFontSmoothingEnabled)
+                #endif
+                    g.TextRenderingHint = DisplayHelp.AntiAliasTextRenderingHint;
+            }
+            return g;
+        }
+
+        internal virtual ItemPaintArgs GetItemPaintArgs(Graphics g)
+        {
+            ItemPaintArgs pa = new ItemPaintArgs(this, this, g, GetColorScheme());
+            pa.Renderer = this.GetRenderer();
+            pa.ButtonStringFormat = pa.ButtonStringFormat & ~(pa.ButtonStringFormat & eTextFormat.SingleLine);
+            pa.ButtonStringFormat |= (eTextFormat.WordBreak | eTextFormat.EndEllipsis);
+            return pa;
+        }
+
+        private Rendering.BaseRenderer m_DefaultRenderer = null;
+        private Rendering.BaseRenderer m_Renderer = null;
+        private eRenderMode m_RenderMode = eRenderMode.Global;
+        /// <summary>
+        /// Returns the renderer control will be rendered with.
+        /// </summary>
+        /// <returns>The current renderer.</returns>
+        public virtual Rendering.BaseRenderer GetRenderer()
+        {
+            if (m_RenderMode == eRenderMode.Global && Rendering.GlobalManager.Renderer != null)
+                return Rendering.GlobalManager.Renderer;
+            else if (m_RenderMode == eRenderMode.Custom && m_Renderer != null)
+                return m_Renderer;
+
+            if (m_DefaultRenderer == null)
+            {
+                if (BarFunctions.IsOffice2007Style(this.Style))
+                    m_DefaultRenderer = new Rendering.Office2007Renderer();
+                //else
+                //    m_DefaultRenderer = new Rendering.Office12Renderer();
+            }
+
+            return m_Renderer;
+        }
+
+        /// <summary>
+        /// Gets or sets the rendering mode used by control. Default value is eRenderMode.Global which means that static GlobalManager.Renderer is used. If set to Custom then Renderer property must
+        /// also be set to the custom renderer that will be used.
+        /// </summary>
+        [Browsable(false), DefaultValue(eRenderMode.Global)]
+        public eRenderMode RenderMode
+        {
+            get { return m_RenderMode; }
+            set
+            {
+                if (m_RenderMode != value)
+                {
+                    m_RenderMode = value;
+                    this.Invalidate(true);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the custom renderer used by the items on this control. RenderMode property must also be set to eRenderMode.Custom in order renderer
+        /// specified here to be used.
+        /// </summary>
+        [Browsable(false), DefaultValue(null)]
+        public DevComponents.DotNetBar.Rendering.BaseRenderer Renderer
+        {
+            get
+            {
+                return m_Renderer;
+            }
+            set { m_Renderer = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether anti-alias smoothing is used while painting. Default value is false.
+        /// </summary>
+        [DefaultValue(false), Browsable(true), Category("Appearance"), Description("Gets or sets whether anti-aliasing is used while painting.")]
+        public bool AntiAlias
+        {
+            get { return m_AntiAlias; }
+            set
+            {
+                if (m_AntiAlias != value)
+                {
+                    m_AntiAlias = value;
+                    InvalidateAutoSize();
+                    this.Invalidate();
+                }
+            }
+        }
+
+        protected virtual void InvalidateAutoSize()
+        {
+        }
+
+        /// <summary>
+        /// Gets or sets button Color Scheme. ColorScheme does not apply to Office2007 styled buttons.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), Category("Appearance"), Description("Gets or sets Bar Color Scheme."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ColorScheme ColorScheme
+        {
+            get { return m_ColorScheme; }
+            set
+            {
+                if (value == null)
+                    throw new ArgumentException("NULL is not a valid value for this property.");
+                m_ColorScheme = value;
+                if (this.Visible)
+                    this.Invalidate();
+            }
+        }
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeColorScheme()
+        {
+            return m_ColorScheme.SchemeChanged;
+        }
+
+        /// <summary>
+        /// Specifies whether button is drawn using Windows Themes when running on OS that supports themes like Windows XP.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), DefaultValue(false), Category("Appearance"), Description("Specifies whether button is drawn using Themes when running on OS that supports themes like Windows XP.")]
+        public virtual bool ThemeAware
+        {
+            get { return m_PopupItem.ThemeAware; }
+            set
+            {
+                m_PopupItem.ThemeAware = value;
+                this.RecalcLayout();
+            }
+        }
+
+        /// <summary>
+        /// Gets whether Windows Themes should be used to draw the button.
+        /// </summary>
+        protected bool IsThemed
+        {
+            get
+            {
+                if (ThemeAware && m_PopupItem.EffectiveStyle != eDotNetBarStyle.Office2000 && BarFunctions.ThemedOS && Themes.ThemesActive)
+                    return true;
+                return false;
+            }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never), Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public BaseItem InternalItem
+        {
+            get { return m_PopupItem; }
+        }
+
+        #endregion
+
+        #region IOwnerMenuSupport Implementation
+        private bool m_UseHook = false;
+        /// <summary>
+        /// Gets or sets whether hooks are used for internal DotNetBar system functionality. Using hooks is recommended only if DotNetBar is used in hybrid environments like Visual Studio designers or IE.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), DefaultValue(false), System.ComponentModel.Category("Behavior"), System.ComponentModel.Description("Gets or sets whether hooks are used for internal DotNetBar system functionality. Using hooks is recommended only if DotNetBar is used in hybrid environments like Visual Studio designers or IE.")]
+        public bool UseHook
+        {
+            get
+            {
+                return m_UseHook;
+            }
+            set
+            {
+                m_UseHook = value;
+            }
+        }
+
+        private bool GetDesignMode()
+        {
+            return this.DesignMode;
+        }
+        private Hook m_Hook = null;
+        // IOwnerMenuSupport
+        private ArrayList m_RegisteredPopups = new ArrayList();
+        bool IOwnerMenuSupport.PersonalizedAllVisible { get { return false; } set { } }
+        bool IOwnerMenuSupport.ShowFullMenusOnHover { get { return true; } set { } }
+        bool IOwnerMenuSupport.AlwaysShowFullMenus { get { return false; } set { } }
+
+        void IOwnerMenuSupport.RegisterPopup(PopupItem objPopup)
+        {
+            this.MenuFocus = true;
+
+            if (m_RegisteredPopups.Contains(objPopup))
+                return;
+
+            if (!this.GetDesignMode() && !m_UseHook)
+            {
+                if (!m_FilterInstalled)
+                {
+                    MessageHandler.RegisterMessageClient(this);
+                    m_FilterInstalled = true;
+                }
+            }
+            else
+            {
+                if (m_Hook == null)
+                {
+                    m_Hook = new Hook(this);
+                }
+            }
+
+            if (!m_MenuEventSupport)
+                MenuEventSupportHook();
+
+            if (m_RegisteredPopups.Count == 0)
+                PopupManager.RegisterPopup((IOwnerMenuSupport)this);
+
+            m_RegisteredPopups.Add(objPopup);
+            if (objPopup.GetOwner() != this)
+                objPopup.SetOwner(this);
+        }
+        void IOwnerMenuSupport.UnregisterPopup(PopupItem objPopup)
+        {
+            if (m_RegisteredPopups.Contains(objPopup))
+                m_RegisteredPopups.Remove(objPopup);
+            if (m_RegisteredPopups.Count == 0)
+            {
+                MenuEventSupportUnhook();
+                if (m_Hook != null)
+                {
+                    m_Hook.Dispose();
+                    m_Hook = null;
+                }
+                PopupManager.UnregisterPopup((IOwnerMenuSupport)this);
+                this.MenuFocus = false;
+            }
+        }
+        bool IOwnerMenuSupport.RelayMouseHover()
+        {
+            foreach (PopupItem popup in m_RegisteredPopups)
+            {
+                Control ctrl = popup.PopupControl;
+                if (ctrl != null && ctrl.DisplayRectangle.Contains(MousePosition))
+                {
+                    if (ctrl is MenuPanel)
+                        ((MenuPanel)ctrl).InternalMouseHover();
+                    else if (ctrl is Bar)
+                        ((Bar)ctrl).InternalMouseHover();
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        void IOwnerMenuSupport.ClosePopups()
+        {
+            ClosePopups();
+        }
+
+        private void ClosePopups()
+        {
+            ArrayList popupList = new ArrayList(m_RegisteredPopups);
+            foreach (PopupItem objPopup in popupList)
+                objPopup.ClosePopup();
+        }
+
+        // Events
+        void IOwnerMenuSupport.InvokePopupClose(PopupItem item, EventArgs e)
+        {
+            if (PopupClose != null)
+                PopupClose(item, e);
+        }
+        void IOwnerMenuSupport.InvokePopupContainerLoad(PopupItem item, EventArgs e)
+        {
+            if (PopupContainerLoad != null)
+                PopupContainerLoad(item, e);
+        }
+        void IOwnerMenuSupport.InvokePopupContainerUnload(PopupItem item, EventArgs e)
+        {
+            if (PopupContainerUnload != null)
+                PopupContainerUnload(item, e);
+        }
+        void IOwnerMenuSupport.InvokePopupOpen(PopupItem item, PopupOpenEventArgs e)
+        {
+            if (PopupOpen != null)
+                PopupOpen(item, e);
+        }
+        void IOwnerMenuSupport.InvokePopupShowing(PopupItem item, EventArgs e)
+        {
+            if (PopupShowing != null)
+                PopupShowing(item, e);
+        }
+        bool IOwnerMenuSupport.ShowPopupShadow { get { return true; } }
+        eMenuDropShadow IOwnerMenuSupport.MenuDropShadow { get { return eMenuDropShadow.SystemDefault; } set { } }
+        ePopupAnimation IOwnerMenuSupport.PopupAnimation { get { return ePopupAnimation.SystemDefault; } set { } }
+        bool IOwnerMenuSupport.AlphaBlendShadow { get { return true; } set { } }
+
+        internal bool MenuFocus
+        {
+            get
+            {
+                return m_MenuFocus;
+            }
+            set
+            {
+                if (m_MenuFocus != value)
+                {
+                    m_MenuFocus = value;
+                    if (m_MenuFocus)
+                    {
+                        SetupActiveWindowTimer();
+                    }
+                    else
+                    {
+                        ReleaseActiveWindowTimer();
+                        ClosePopups();
+                    }
+                    this.Invalidate();
+                }
+            }
+        }
+        #endregion
+
+        #region Active Window Changed Handling
+        /// <summary>
+        /// Sets up timer that watches when active window changes.
+        /// </summary>
+        protected virtual void SetupActiveWindowTimer()
+        {
+            if (m_ActiveWindowTimer != null)
+                return;
+            m_ActiveWindowTimer = new Timer();
+            m_ActiveWindowTimer.Interval = 100;
+            m_ActiveWindowTimer.Tick += new EventHandler(ActiveWindowTimer_Tick);
+
+            m_ForegroundWindow = NativeFunctions.GetForegroundWindow();
+            m_ActiveWindow = NativeFunctions.GetActiveWindow();
+
+            m_ActiveWindowTimer.Start();
+        }
+
+        private void ActiveWindowTimer_Tick(object sender, EventArgs e)
+        {
+            if (m_ActiveWindowTimer == null)
+                return;
+
+            IntPtr f = NativeFunctions.GetForegroundWindow();
+            IntPtr a = NativeFunctions.GetActiveWindow();
+
+            if (f != m_ForegroundWindow || a != m_ActiveWindow)
+            {
+                Control c = Control.FromChildHandle(a);
+                if (c != null)
+                {
+                    do
+                    {
+                        if ((c is MenuPanel || c is Bar || c is PopupContainer || c is PopupContainerControl))
+                            return;
+                        c = c.Parent;
+                    } while (c!=null && c.Parent != null);
+                }
+                m_ActiveWindowTimer.Stop();
+                OnActiveWindowChanged();
+            }
+        }
+
+        /// <summary>
+        /// Called after change of active window has been detected. SetupActiveWindowTimer must be called to enable detection.
+        /// </summary>
+        protected virtual void OnActiveWindowChanged()
+        {
+            if (this.MenuFocus)
+                this.MenuFocus = false;
+        }
+
+        /// <summary>
+        /// Releases and disposes the active window watcher timer.
+        /// </summary>
+        protected virtual void ReleaseActiveWindowTimer()
+        {
+            if (m_ActiveWindowTimer != null)
+            {
+                Timer timer = m_ActiveWindowTimer;
+                m_ActiveWindowTimer = null;
+                timer.Stop();
+                timer.Tick -= new EventHandler(ActiveWindowTimer_Tick);
+                timer.Dispose();
+            }
+        }
+        #endregion
+
+        #region IMessageHandlerClient Implementation
+        bool IMessageHandlerClient.IsModal
+        {
+            get
+            {
+                Form form = this.FindForm();
+                if (form != null && form.Modal && Form.ActiveForm == form)
+                    return true;
+                return false;
+            }
+        }
+
+        bool IMessageHandlerClient.OnMouseWheel(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+            return OnMouseWheel(hWnd, wParam, lParam);
+        }
+
+        protected virtual bool OnMouseWheel(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+            return false;
+        }
+
+        bool IMessageHandlerClient.OnKeyDown(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+            return OnKeyDown(hWnd, wParam, lParam);
+        }
+
+        protected virtual bool EatMenuFilterKeyDown
+        {
+            get
+            {
+                return true;
+            }
+        }
+        protected virtual bool OnKeyDown(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+            int wParamInt = WinApi.ToInt(wParam);
+            if (m_RegisteredPopups.Count > 0)
+            {
+                if (((BaseItem)m_RegisteredPopups[m_RegisteredPopups.Count - 1]).Parent == null)
+                {
+                    PopupItem objItem = (PopupItem)m_RegisteredPopups[m_RegisteredPopups.Count - 1];
+
+                    Control ctrl = objItem.PopupControl as Control;
+                    Control ctrl2 = FromChildHandle(hWnd);
+
+                    if (ctrl2 != null)
+                    {
+                        while (ctrl2.Parent != null)
+                            ctrl2 = ctrl2.Parent;
+                    }
+
+                    bool bIsOnHandle = false;
+                    if (ctrl2 != null && objItem != null)
+                        bIsOnHandle = objItem.IsAnyOnHandle(ctrl2.Handle);
+
+                    bool bNoEat = ctrl != null && ctrl2 != null && ctrl.Handle == ctrl2.Handle || bIsOnHandle;
+
+                    if (!bIsOnHandle)
+                    {
+                        Keys key = (Keys)NativeFunctions.MapVirtualKey((uint)wParam, 2);
+                        if (key == Keys.None)
+                            key = (Keys)wParamInt;
+                        
+                        KeyEventArgs keyArgs = new KeyEventArgs(key | Control.ModifierKeys);
+                        objItem.InternalKeyDown(keyArgs);
+                        
+                        if (keyArgs.Handled) bNoEat = false;
+                        if (!EatMenuFilterKeyDown) bNoEat = true;
+                    }
+
+                    // Don't eat the message if the pop-up window has focus
+                    if (bNoEat)
+                        return false;
+                    return true;
+                }
+            }
+
+            if (this.MenuFocus)
+            {
+                bool bPassToMenu = true;
+                Control ctrl2 = Control.FromChildHandle(hWnd);
+                if (ctrl2 != null)
+                {
+                    while (ctrl2.Parent != null)
+                        ctrl2 = ctrl2.Parent;
+                    if ((ctrl2 is MenuPanel || ctrl2 is ItemControl || ctrl2 is PopupContainer || ctrl2 is PopupContainerControl) && ctrl2.Handle != hWnd)
+                        bPassToMenu = false;
+                }
+
+                if (bPassToMenu)
+                {
+                    Keys key = (Keys)NativeFunctions.MapVirtualKey((uint)wParam, 2);
+                    if (key == Keys.None)
+                        key = (Keys)wParamInt;
+                    m_PopupItem.InternalKeyDown(new KeyEventArgs(key));
+                    return true;
+                }
+            }
+
+            if (!this.IsParentFormActive)
+                return false;
+
+            if (wParamInt >= 0x70 || ModifierKeys != Keys.None || (WinApi.ToInt(lParam) & 0x1000000000) != 0 || wParamInt == 0x2E || wParamInt == 0x2D) // 2E=VK_DELETE, 2D=VK_INSERT
+            {
+                int i = (int)ModifierKeys | wParamInt;
+                return ProcessShortcut((eShortcut)i);
+            }
+            return false;
+        }
+
+        private bool ProcessShortcut(eShortcut key)
+        {
+            foreach (eShortcut k in m_PopupItem.Shortcuts)
+            {
+                if (k == key)
+                {
+                    PerformClick();
+                    return true;
+                }
+            }
+            return BarFunctions.ProcessItemsShortcuts(key, m_ShortcutTable);
+        }
+
+        /// <summary>
+        /// Generates a Click event for the control.
+        /// </summary>
+        public abstract void PerformClick();
+
+        protected bool IsParentFormActive
+        {
+            get
+            {
+                // Process only if parent form is active
+                Form form = this.FindForm();
+                if (form == null)
+                    return false;
+                if (form.IsMdiChild)
+                {
+                    if (form.MdiParent == null)
+                        return false;
+                    if (form.MdiParent.ActiveMdiChild != form)
+                        return false;
+                }
+                else if (form != Form.ActiveForm)
+                    return false;
+                return true;
+            }
+        }
+
+        private PopupDelayedClose m_DelayClose = null;
+        private PopupDelayedClose GetDelayClose()
+        {
+            if (m_DelayClose == null)
+                m_DelayClose = new PopupDelayedClose();
+            return m_DelayClose;
+        }
+
+        internal void DesignerNewItemAdded()
+        {
+            this.GetDelayClose().EraseDelayClose();
+        }
+
+        bool IMessageHandlerClient.OnMouseDown(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+            if (m_RegisteredPopups.Count == 0)
+                return false;
+
+            BaseItem[] popups = new BaseItem[m_RegisteredPopups.Count];
+            m_RegisteredPopups.CopyTo(popups);
+            for (int i = popups.Length - 1; i >= 0; i--)
+            {
+                PopupItem objPopup = popups[i] as PopupItem;
+                bool bChildHandle = objPopup.IsAnyOnHandle(hWnd);
+
+                if (!bChildHandle)
+                {
+                    System.Windows.Forms.Control cTmp = System.Windows.Forms.Control.FromChildHandle(hWnd);
+                    if (cTmp != null)
+                    {
+                        if (cTmp is MenuPanel)
+                        {
+                            bChildHandle = true;
+                        }
+                        else
+                        {
+                            while (cTmp.Parent != null)
+                            {
+                                cTmp = cTmp.Parent;
+                                if (cTmp.GetType().FullName.IndexOf("DropDownHolder") >= 0 || cTmp is MenuPanel || cTmp is PopupContainerControl)
+                                {
+                                    bChildHandle = true;
+                                    break;
+                                }
+                            }
+                        }
+                        if (!bChildHandle)
+                            bChildHandle = objPopup.IsAnyOnHandle(cTmp.Handle);
+                    }
+                    else
+                    {
+                        string s = NativeFunctions.GetClassName(hWnd);
+                        s = s.ToLower();
+                        if (s.IndexOf("combolbox") >= 0)
+                            bChildHandle = true;
+                    }
+                }
+
+                if (!bChildHandle)
+                {
+                    Control popupContainer = objPopup.PopupControl;
+                    if (popupContainer != null)
+                        while (popupContainer.Parent != null) popupContainer = popupContainer.Parent;
+                    if (popupContainer != null && popupContainer.Bounds.Contains(Control.MousePosition))
+                        bChildHandle = true;
+                }
+
+                if (bChildHandle)
+                    break;
+
+                if (objPopup.Displayed)
+                {
+                    // Do not close if mouse is inside the popup parent button
+                    Point p = this.PointToClient(MousePosition);
+                    if (objPopup.DisplayRectangle.Contains(p))
+                        break;
+                }
+
+                if (this.GetDesignMode())
+                {
+                    this.GetDelayClose().DelayClose(objPopup);
+                }
+                else if(QueryPopupCloseMouseDown())
+                    objPopup.ClosePopup();
+
+                if (m_RegisteredPopups.Count == 0)
+                    break;
+            }
+            if (m_RegisteredPopups.Count == 0)
+                this.MenuFocus = false;
+            return false;
+        }
+        protected virtual bool QueryPopupCloseMouseDown()
+        {
+            return true;
+        }
+        bool IMessageHandlerClient.OnMouseMove(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+            if (m_RegisteredPopups.Count > 0)
+            {
+                foreach (BaseItem item in m_RegisteredPopups)
+                {
+                    if (item.Parent == null)
+                    {
+                        Control ctrl = ((PopupItem)item).PopupControl;
+                        if (ctrl != null && ctrl.Handle != hWnd && !item.IsAnyOnHandle(hWnd) && !(ctrl.Parent != null && ctrl.Parent.Handle != hWnd))
+                            return true;
+                    }
+                }
+            }
+            return false;
+        }
+        bool IMessageHandlerClient.OnSysKeyDown(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+            return OnSysKeyDown(hWnd, wParam, lParam);
+        }
+
+        protected virtual bool OnSysKeyDown(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+            if (!this.GetDesignMode())
+            {
+                // Check Shortcuts
+                int wParamInt = WinApi.ToInt(wParam);
+                if (ModifierKeys != Keys.None || wParamInt >= (int)eShortcut.F1 && wParamInt <= (int)eShortcut.F12)
+                {
+                    int i = (int)ModifierKeys | wParamInt;
+                    if (ProcessShortcut((eShortcut)i))
+                        return true;
+                }
+            }
+            return false;
+        }
+
+        bool IMessageHandlerClient.OnSysKeyUp(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+            return OnSysKeyUp(hWnd, wParam, lParam);
+        }
+
+        protected virtual bool OnSysKeyUp(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+            return false;
+        }
+
+        private void MenuEventSupportHook()
+        {
+            if (m_MenuEventSupport)
+                return;
+            m_MenuEventSupport = true;
+
+            Form parentForm = this.FindForm();
+            if (parentForm == null)
+            {
+                m_MenuEventSupport = false;
+                return;
+            }
+
+            parentForm.Resize += new EventHandler(this.ParentResize);
+            parentForm.Deactivate += new EventHandler(this.ParentDeactivate);
+
+            DotNetBarManager.RegisterParentMsgHandler(this, parentForm);
+        }
+
+        private void MenuEventSupportUnhook()
+        {
+            if (!m_MenuEventSupport)
+                return;
+            m_MenuEventSupport = false;
+
+            Form parentForm = this.FindForm();
+            if (parentForm == null)
+                return;
+            DotNetBarManager.UnRegisterParentMsgHandler(this, parentForm);
+            parentForm.Resize -= new EventHandler(this.ParentResize);
+            parentForm.Deactivate -= new EventHandler(this.ParentDeactivate);
+        }
+        private void ParentResize(object sender, EventArgs e)
+        {
+            Form parentForm = this.FindForm();
+            if (parentForm != null && parentForm.WindowState == FormWindowState.Minimized)
+                ((IOwner)this).OnApplicationDeactivate();
+        }
+        private void ParentDeactivate(object sender, EventArgs e)
+        {
+            Form parentForm = this.FindForm();
+            if (parentForm != null && parentForm.WindowState == FormWindowState.Minimized)
+                ((IOwner)this).OnApplicationDeactivate();
+        }
+        #endregion
+
+        #region IThemeCache Implementation
+        protected override void WndProc(ref Message m)
+        {
+            if (m.Msg == NativeFunctions.WM_THEMECHANGED)
+            {
+                this.RefreshThemes();
+            }
+            else if (m.Msg == NativeFunctions.WM_USER + 107)
+            {
+                if (m_DoDefaultActionItem != null)
+                {
+                    if (!m_DoDefaultActionItem._AccessibleExpandAction)
+                        this.PerformClick();
+                    m_DoDefaultActionItem.DoAccesibleDefaultAction();
+                    m_DoDefaultActionItem = null;
+                }
+            }
+            base.WndProc(ref m);
+        }
+        protected void RefreshThemes()
+        {
+            if (m_ThemeWindow != null)
+            {
+                m_ThemeWindow.Dispose();
+                m_ThemeWindow = new ThemeWindow(this);
+            }
+            if (m_ThemeRebar != null)
+            {
+                m_ThemeRebar.Dispose();
+                m_ThemeRebar = new ThemeRebar(this);
+            }
+            if (m_ThemeToolbar != null)
+            {
+                m_ThemeToolbar.Dispose();
+                m_ThemeToolbar = new ThemeToolbar(this);
+            }
+            if (m_ThemeHeader != null)
+            {
+                m_ThemeHeader.Dispose();
+                m_ThemeHeader = new ThemeHeader(this);
+            }
+            if (m_ThemeScrollBar != null)
+            {
+                m_ThemeScrollBar.Dispose();
+                m_ThemeScrollBar = new ThemeScrollBar(this);
+            }
+            if (m_ThemeProgress != null)
+            {
+                m_ThemeProgress.Dispose();
+                m_ThemeProgress = new ThemeProgress(this);
+            }
+            if (m_ThemeExplorerBar != null)
+            {
+                m_ThemeExplorerBar.Dispose();
+                m_ThemeExplorerBar = new ThemeExplorerBar(this);
+            }
+            if (m_ThemeButton != null)
+            {
+                m_ThemeButton.Dispose();
+                m_ThemeButton = new ThemeButton(this);
+            }
+        }
+        private void DisposeThemes()
+        {
+            if (m_ThemeWindow != null)
+            {
+                m_ThemeWindow.Dispose();
+                m_ThemeWindow = null;
+            }
+            if (m_ThemeRebar != null)
+            {
+                m_ThemeRebar.Dispose();
+                m_ThemeRebar = null;
+            }
+            if (m_ThemeToolbar != null)
+            {
+                m_ThemeToolbar.Dispose();
+                m_ThemeToolbar = null;
+            }
+            if (m_ThemeHeader != null)
+            {
+                m_ThemeHeader.Dispose();
+                m_ThemeHeader = null;
+            }
+            if (m_ThemeScrollBar != null)
+            {
+                m_ThemeScrollBar.Dispose();
+                m_ThemeScrollBar = null;
+            }
+            if (m_ThemeProgress != null)
+            {
+                m_ThemeProgress.Dispose();
+                m_ThemeProgress = null;
+            }
+            if (m_ThemeExplorerBar != null)
+            {
+                m_ThemeExplorerBar.Dispose();
+                m_ThemeExplorerBar = null;
+            }
+            if (m_ThemeButton != null)
+            {
+                m_ThemeButton.Dispose();
+                m_ThemeButton = null;
+            }
+        }
+        protected override void OnHandleCreated(EventArgs e)
+        {
+            base.OnHandleCreated(e);
+
+            if (!m_FilterInstalled && !this.DesignMode)
+            {
+                MessageHandler.RegisterMessageClient(this);
+                m_FilterInstalled = true;
+            }
+
+#if FRAMEWORK20
+            if (this.AutoSize)
+                this.AdjustSize();
+#endif
+            this.RecalcLayout();
+        }
+#if FRAMEWORK20
+        protected virtual void AdjustSize() { }
+#endif
+        protected override void OnHandleDestroyed(EventArgs e)
+        {
+            DisposeThemes();
+            MenuEventSupportUnhook();
+            base.OnHandleDestroyed(e);
+
+            if (m_FilterInstalled)
+            {
+                MessageHandler.UnregisterMessageClient(this);
+                m_FilterInstalled = false;
+            }
+        }
+        ThemeWindow IThemeCache.ThemeWindow
+        {
+            get
+            {
+                if (m_ThemeWindow == null)
+                    m_ThemeWindow = new ThemeWindow(this);
+                return m_ThemeWindow;
+            }
+        }
+        ThemeRebar IThemeCache.ThemeRebar
+        {
+            get
+            {
+                if (m_ThemeRebar == null)
+                    m_ThemeRebar = new ThemeRebar(this);
+                return m_ThemeRebar;
+            }
+        }
+        ThemeToolbar IThemeCache.ThemeToolbar
+        {
+            get
+            {
+                if (m_ThemeToolbar == null)
+                    m_ThemeToolbar = new ThemeToolbar(this);
+                return m_ThemeToolbar;
+            }
+        }
+        ThemeHeader IThemeCache.ThemeHeader
+        {
+            get
+            {
+                if (m_ThemeHeader == null)
+                    m_ThemeHeader = new ThemeHeader(this);
+                return m_ThemeHeader;
+            }
+        }
+        ThemeScrollBar IThemeCache.ThemeScrollBar
+        {
+            get
+            {
+                if (m_ThemeScrollBar == null)
+                    m_ThemeScrollBar = new ThemeScrollBar(this);
+                return m_ThemeScrollBar;
+            }
+        }
+        ThemeExplorerBar IThemeCache.ThemeExplorerBar
+        {
+            get
+            {
+                if (m_ThemeExplorerBar == null)
+                    m_ThemeExplorerBar = new ThemeExplorerBar(this);
+                return m_ThemeExplorerBar;
+            }
+        }
+        ThemeProgress IThemeCache.ThemeProgress
+        {
+            get
+            {
+                if (m_ThemeProgress == null)
+                    m_ThemeProgress = new ThemeProgress(this);
+                return m_ThemeProgress;
+            }
+        }
+        ThemeButton IThemeCache.ThemeButton
+        {
+            get
+            {
+                if (m_ThemeButton == null)
+                    m_ThemeButton = new ThemeButton(this);
+                return m_ThemeButton;
+            }
+        }
+
+        #endregion
+
+        #region IOwner Implementation
+        /// <summary>
+        /// Gets or sets the form button is attached to.
+        /// </summary>
+        Form IOwner.ParentForm
+        {
+            get
+            {
+                return base.FindForm();
+            }
+            set { }
+        }
+
+        /// <summary>
+        /// Returns the collection of items with the specified name. This member is not implemented and should not be used.
+        /// </summary>
+        /// <param name="ItemName">Item name to look for.</param>
+        /// <returns></returns>
+        ArrayList IOwner.GetItems(string ItemName)
+        {
+            ArrayList list = new ArrayList(15);
+            BarFunctions.GetSubItemsByName(m_PopupItem, ItemName, list);
+            return list;
+        }
+
+        /// <summary>
+        /// Returns the collection of items with the specified name and type. This member is not implemented and should not be used.
+        /// </summary>
+        /// <param name="ItemName">Item name to look for.</param>
+        /// <param name="itemType">Item type to look for.</param>
+        /// <returns></returns>
+        ArrayList IOwner.GetItems(string ItemName, Type itemType)
+        {
+            ArrayList list = new ArrayList(15);
+            BarFunctions.GetSubItemsByNameAndType(m_PopupItem, ItemName, list, itemType);
+            return list;
+        }
+
+        /// <summary>
+        /// Returns the collection of items with the specified name and type. This member is not implemented and should not be used.
+        /// </summary>
+        /// <param name="ItemName">Item name to look for.</param>
+        /// <param name="itemType">Item type to look for.</param>
+        /// <param name="useGlobalName">Indicates whether GlobalName property is used for searching.</param>
+        /// <returns></returns>
+        ArrayList IOwner.GetItems(string ItemName, Type itemType, bool useGlobalName)
+        {
+            ArrayList list = new ArrayList(15);
+            BarFunctions.GetSubItemsByNameAndType(m_PopupItem, ItemName, list, itemType, useGlobalName);
+            return list;
+        }
+
+        /// <summary>
+        /// Returns the first item that matches specified name.  This member is not implemented and should not be used.
+        /// </summary>
+        /// <param name="ItemName">Item name to look for.</param>
+        /// <returns></returns>
+        BaseItem IOwner.GetItem(string ItemName)
+        {
+            BaseItem item = BarFunctions.GetSubItemByName(m_PopupItem, ItemName);
+            if (item != null)
+                return item;
+            return null;
+        }
+
+        // Only one Popup Item can be expanded at a time. This is used
+        // to track the currently expanded popup item and to close the popup item
+        // if another item is expanding.
+        void IOwner.SetExpandedItem(BaseItem objItem)
+        {
+            if (objItem != null && objItem.Parent is PopupItem)
+                return;
+            if (m_ExpandedItem != null)
+            {
+                if(objItem == null)
+                    BaseItem.CollapseSubItemsTree(m_ExpandedItem);
+                if (m_ExpandedItem.Expanded)
+                    m_ExpandedItem.Expanded = false;
+                m_ExpandedItem = null;
+            }
+            m_ExpandedItem = objItem;
+        }
+
+        BaseItem IOwner.GetExpandedItem()
+        {
+            return m_ExpandedItem;
+        }
+
+        // Currently we are using this to communicate "focus" when control is in
+        // design mode. This can be used later if we decide to add focus
+        // handling to our BaseItem class.
+        void IOwner.SetFocusItem(BaseItem objFocusItem)
+        {
+            if (m_FocusItem != null && m_FocusItem != objFocusItem)
+            {
+                m_FocusItem.OnLostFocus();
+            }
+            m_FocusItem = objFocusItem;
+            if (m_FocusItem != null)
+                m_FocusItem.OnGotFocus();
+        }
+
+        BaseItem IOwner.GetFocusItem()
+        {
+            return m_FocusItem;
+        }
+
+        void IOwner.DesignTimeContextMenu(BaseItem objItem)
+        {
+        }
+
+        bool IOwner.DesignMode
+        {
+            get { return this.GetDesignMode(); }
+        }
+
+        void IOwner.RemoveShortcutsFromItem(BaseItem objItem)
+        {
+            ShortcutTableEntry objEntry = null;
+            if (objItem.ShortcutString != "")
+            {
+                foreach (eShortcut key in objItem.Shortcuts)
+                {
+                    if (m_ShortcutTable.ContainsKey(key))
+                    {
+                        objEntry = (ShortcutTableEntry)m_ShortcutTable[key];
+                        try
+                        {
+                            objEntry.Items.Remove(objItem.Id);
+                            if (objEntry.Items.Count == 0)
+                                m_ShortcutTable.Remove(objEntry.Shortcut);
+                        }
+                        catch (ArgumentException) { }
+                    }
+                }
+            }
+            IOwner owner = this as IOwner;
+            foreach (BaseItem objTmp in objItem.SubItems)
+                owner.RemoveShortcutsFromItem(objTmp);
+        }
+
+        void IOwner.AddShortcutsFromItem(BaseItem objItem)
+        {
+            ShortcutTableEntry objEntry = null;
+            if (objItem.ShortcutString != "")
+            {
+                foreach (eShortcut key in objItem.Shortcuts)
+                {
+                    if (m_ShortcutTable.ContainsKey(key))
+                        objEntry = (ShortcutTableEntry)m_ShortcutTable[objItem.Shortcuts[0]];
+                    else
+                    {
+                        objEntry = new ShortcutTableEntry(key);
+                        m_ShortcutTable.Add(objEntry.Shortcut, objEntry);
+                    }
+                    try
+                    {
+                        objEntry.Items.Add(objItem.Id, objItem);
+                    }
+                    catch (ArgumentException) { }
+                }
+            }
+            IOwner owner = this as IOwner;
+            foreach (BaseItem objTmp in objItem.SubItems)
+                owner.AddShortcutsFromItem(objTmp);
+        }
+
+        Form IOwner.ActiveMdiChild
+        {
+            get
+            {
+                Form form = base.FindForm();
+                if (form == null)
+                    return null;
+                if (form.IsMdiContainer)
+                {
+                    return form.ActiveMdiChild;
+                }
+                return null;
+            }
+        }
+
+        bool IOwner.AlwaysDisplayKeyAccelerators
+        {
+            get { return true; }
+            set { }
+        }
+
+        /// <summary>
+        /// Invokes the DotNetBar Customize dialog.
+        /// </summary>
+        void IOwner.Customize()
+        {
+        }
+
+        void IOwner.InvokeResetDefinition(BaseItem item, EventArgs e)
+        {
+        }
+
+        /// <summary>
+        /// Indicates whether Reset buttons is shown that allows end-user to reset the toolbar state.
+        /// </summary>
+        bool IOwner.ShowResetButton
+        {
+            get { return false; }
+            set { }
+        }
+
+        void IOwner.OnApplicationActivate() { }
+        void IOwner.OnApplicationDeactivate()
+        {
+            ClosePopups();
+        }
+        void IOwner.OnParentPositionChanging() { }
+
+        void IOwner.StartItemDrag(BaseItem item) { }
+
+        bool IOwner.DragInProgress
+        {
+            get { return false; }
+        }
+
+        BaseItem IOwner.DragItem
+        {
+            get { return null; }
+        }
+
+        void IOwner.InvokeUserCustomize(object sender, EventArgs e)  {}
+
+        void IOwner.InvokeEndUserCustomize(object sender, EndUserCustomizeEventArgs e) { }
+
+        MdiClient IOwner.GetMdiClient(Form MdiForm)
+        {
+            return BarFunctions.GetMdiClient(MdiForm);
+        }
+
+		/// <summary>
+		/// ImageList for images used on Items. Images specified here will always be used on menu-items and are by default used on all Bars.
+		/// </summary>
+		[System.ComponentModel.Browsable(false),System.ComponentModel.Category("Data"),DefaultValue(null),System.ComponentModel.Description("ImageList for images used on Items. Images specified here will always be used on menu-items and are by default used on all Bars.")]
+		public System.Windows.Forms.ImageList Images
+		{
+			get
+			{
+				return m_ImageList;
+			}
+			set
+			{
+				if(m_ImageList!=null)
+					m_ImageList.Disposed-=new EventHandler(this.ImageListDisposed);
+				m_ImageList=value;
+				if(m_ImageList!=null)
+					m_ImageList.Disposed+=new EventHandler(this.ImageListDisposed);
+			}
+		}
+
+		/// <summary>
+		/// ImageList for medium-sized images used on Items.
+		/// </summary>
+		[System.ComponentModel.Browsable(false),System.ComponentModel.Category("Data"),DefaultValue(null),System.ComponentModel.Description("ImageList for medium-sized images used on Items.")]
+		public System.Windows.Forms.ImageList ImagesMedium
+		{
+			get
+			{
+				return m_ImageListMedium;
+			}
+			set
+			{
+				if(m_ImageListMedium!=null)
+					m_ImageListMedium.Disposed-=new EventHandler(this.ImageListDisposed);
+				m_ImageListMedium=value;
+				if(m_ImageListMedium!=null)
+					m_ImageListMedium.Disposed+=new EventHandler(this.ImageListDisposed);
+			}
+		}
+
+		/// <summary>
+		/// ImageList for large-sized images used on Items.
+		/// </summary>
+		[System.ComponentModel.Browsable(false),System.ComponentModel.Category("Data"),DefaultValue(null),System.ComponentModel.Description("ImageList for large-sized images used on Items.")]
+		public System.Windows.Forms.ImageList ImagesLarge
+		{
+			get
+			{
+				return m_ImageListLarge;
+			}
+			set
+			{
+				if(m_ImageListLarge!=null)
+					m_ImageListLarge.Disposed-=new EventHandler(this.ImageListDisposed);
+				m_ImageListLarge=value;
+				if(m_ImageListLarge!=null)
+					m_ImageListLarge.Disposed+=new EventHandler(this.ImageListDisposed);
+			}
+		}
+
+		private void ImageListDisposed(object sender, EventArgs e)
+		{
+			if(sender==m_ImageList)
+			{
+				m_ImageList=null;
+			}
+			else if(sender==m_ImageListLarge)
+			{
+				m_ImageListLarge=null;
+			}
+			else if(sender==m_ImageListMedium)
+			{
+				m_ImageListMedium=null;
+			}
+		}
+
+
+        protected override void OnParentChanged(EventArgs e)
+        {
+            base.OnParentChanged(e);
+            if (this.DesignMode)
+                m_PopupItem.SetDesignMode(this.DesignMode);
+        }
+
+        void IOwner.InvokeDefinitionLoaded(object sender, EventArgs e) {}
+
+        /// <summary>
+        /// Indicates whether Tooltips are shown on Bars and menus.
+        /// </summary>
+        //[Browsable(false), DefaultValue(true), Category("Run-time Behavior"), Description("Indicates whether Tooltips are shown on Bars and menus.")]
+        bool IOwner.ShowToolTips
+        {
+            get
+            {
+                return true;
+            }
+            set
+            {
+                //m_ShowToolTips = value;
+            }
+        }
+
+        /// <summary>
+        /// Indicates whether item shortcut is displayed in Tooltips.
+        /// </summary>
+        //[Browsable(false), DefaultValue(false), Category("Run-time Behavior"), Description("Indicates whether item shortcut is displayed in Tooltips.")]
+        bool IOwner.ShowShortcutKeysInToolTips
+        {
+            get
+            {
+                return true;
+            }
+            set
+            {
+                //m_ShowShortcutKeysInToolTips = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether gray-scale algorithm is used to create automatic gray-scale images. Default is true.
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Appearance"), Description("Gets or sets whether gray-scale algorithm is used to create automatic gray-scale images.")]
+        public virtual bool DisabledImagesGrayScale
+        {
+            get
+            {
+                return m_DisabledImagesGrayScale;
+            }
+            set
+            {
+                m_DisabledImagesGrayScale = value;
+            }
+        }
+        #endregion
+
+        #region IOwnerLocalize Members
+        void IOwnerLocalize.InvokeLocalizeString(LocalizeEventArgs e)
+        {
+            if (LocalizeString != null)
+                LocalizeString(this, e);
+        }
+        #endregion
+
+        #region IAccessibilitySupport Members
+
+        BaseItem IAccessibilitySupport.DoDefaultActionItem
+        {
+            get
+            {
+                return m_DoDefaultActionItem;
+            }
+            set
+            {
+                m_DoDefaultActionItem = value; ;
+            }
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/PopupManager.cs b/PROMS/DotNetBar Source Code/PopupManager.cs
new file mode 100644
index 00000000..b0f4422e
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/PopupManager.cs	
@@ -0,0 +1,172 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Class that tracks lists of all controls that host currently open popups.
+    /// </summary>
+    public static class PopupManager
+    {
+        #region Constructor
+        private static List<WeakReference> _RegisteredPopups = new List<WeakReference>();
+        private static ReaderWriterLock ReadWritePopupsListLock;
+
+        static PopupManager()
+        {
+            PopupManager.ReadWritePopupsListLock = new ReaderWriterLock();
+        }
+        #endregion
+
+        #region Implementation
+        /// <summary>
+        /// Registers IOwnerMenuSupport popup host in response to host displaying its first popup.
+        /// </summary>
+        /// <param name="popupHost">IOwnerMenuSupport host to register</param>
+        public static void RegisterPopup(IOwnerMenuSupport popupHost)
+        {
+            if (popupHost == null) return;
+            if (GetHostReference(popupHost) == null)
+            {
+                WeakReference reference = new WeakReference(popupHost);
+                reference.Target = popupHost;
+
+                LockCookie cookie1 = new LockCookie();
+                bool readerLockHeld = PopupManager.ReadWritePopupsListLock.IsReaderLockHeld;
+                if (readerLockHeld)
+                {
+                    cookie1 = PopupManager.ReadWritePopupsListLock.UpgradeToWriterLock(-1);
+                }
+                else
+                {
+                    PopupManager.ReadWritePopupsListLock.AcquireWriterLock(-1);
+                }
+                try
+                {
+                    _RegisteredPopups.Add(reference);
+                }
+                finally
+                {
+                    if (readerLockHeld)
+                    {
+                        PopupManager.ReadWritePopupsListLock.DowngradeFromWriterLock(ref cookie1);
+                    }
+                    else
+                    {
+                        PopupManager.ReadWritePopupsListLock.ReleaseWriterLock();
+                    }
+                }
+
+                popupHost = null;
+            }
+        }
+
+        private static WeakReference GetHostReference(IOwnerMenuSupport host)
+        {
+            List<WeakReference> registeredControls = _RegisteredPopups;
+            if (registeredControls == null) return null;
+
+            PopupManager.ReadWritePopupsListLock.AcquireReaderLock(-1);
+            try
+            {
+                foreach (WeakReference item in registeredControls)
+                {
+                    object target = item.Target;
+                    if (target != null && target.Equals(host))
+                        return item;
+                }
+            }
+            finally
+            {
+                PopupManager.ReadWritePopupsListLock.ReleaseReaderLock();
+            }
+            return null;
+        }
+        /// <summary>
+        /// Unregisters IOwnerMenuSupport popup host in response to host closing its last popup.
+        /// </summary>
+        /// <param name="popupHost">IOwnerMenuSupport host to unregister</param>
+        public static void UnregisterPopup(IOwnerMenuSupport popupHost)
+        {
+            if (popupHost == null) return;
+            LockCookie cookie1 = new LockCookie();
+            bool readerLockHeld = PopupManager.ReadWritePopupsListLock.IsReaderLockHeld;
+            if (readerLockHeld)
+            {
+                cookie1 = PopupManager.ReadWritePopupsListLock.UpgradeToWriterLock(-1);
+            }
+            else
+            {
+                PopupManager.ReadWritePopupsListLock.AcquireWriterLock(-1);
+            }
+            try
+            {
+
+                foreach (WeakReference item in _RegisteredPopups)
+                {
+                    object target = item.Target;
+                    if (target != null && target.Equals(popupHost))
+                    {
+                        _RegisteredPopups.Remove(item);
+                        break;
+                    }
+                }
+            }
+            finally
+            {
+                if (readerLockHeld)
+                {
+                    PopupManager.ReadWritePopupsListLock.DowngradeFromWriterLock(ref cookie1);
+                }
+                else
+                {
+                    PopupManager.ReadWritePopupsListLock.ReleaseWriterLock();
+                }
+            }
+        }
+        /// <summary>
+        /// Closes all currently open popups.
+        /// </summary>
+        public static void CloseAllPopups()
+        {
+            CloseAllPopups(null);
+        }
+        /// <summary>
+        /// Closes all currently open popups excluding specified popup host.
+        /// </summary>
+        /// <param name="excludeHost">IOwnerMenuSupport host to exclude from closing or null</param>
+        public static void CloseAllPopups(IOwnerMenuSupport excludeHost)
+        {
+            WeakReference[] references;
+            PopupManager.ReadWritePopupsListLock.AcquireReaderLock(-1);
+            try
+            {
+                references = new WeakReference[_RegisteredPopups.Count];
+                _RegisteredPopups.CopyTo(references);
+            }
+            finally
+            {
+                PopupManager.ReadWritePopupsListLock.ReleaseReaderLock();
+            }
+
+            foreach (WeakReference reference in references)
+            {
+                object target = reference.Target;
+                if (reference.IsAlive)
+                {
+                    if (target != null)
+                    {
+                        IOwnerMenuSupport popupHost = target as IOwnerMenuSupport;
+                        if (popupHost != null && popupHost != excludeHost)
+                        {
+                            popupHost.ClosePopups();
+                        }
+                    }
+                }
+            }
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/PopupShadow.cs b/PROMS/DotNetBar Source Code/PopupShadow.cs
new file mode 100644
index 00000000..0f764e04
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/PopupShadow.cs	
@@ -0,0 +1,222 @@
+using System;
+using System.Drawing;
+using System.Collections;
+using System.ComponentModel;
+using System.Windows.Forms;
+using System.Drawing.Imaging;
+using System.Drawing.Drawing2D;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Summary description for PopupShadow.
+	/// </summary>
+	internal class PopupShadow : System.Windows.Forms.Control
+	{
+		private bool m_AlphaShadow=true;
+		public PopupShadow(bool bAlphaShadow)
+		{
+			m_AlphaShadow=bAlphaShadow;
+			this.Visible=false;
+			this.SuspendLayout();
+			if(!m_AlphaShadow)
+				this.BackColor=SystemColors.ControlDark;
+			//this.ControlBox = false;
+			//this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+			//this.MaximizeBox = false;
+			//this.MinimizeBox = false;
+			//this.Opacity = 0.4;
+			//this.ShowInTaskbar = false;
+			//this.AutoScale=false;
+			this.Size=new Size(12,12);
+			//this.StartPosition=FormStartPosition.Manual;
+			//this.MinimumSize=new Size(4,4);  // This was the key to fix the black box that was showing up for smaller windows
+
+			this.SetStyle(ControlStyles.ContainerControl,false);
+			//this.TopLevel=false;
+
+			this.SetStyle(ControlStyles.Selectable,false);
+			if(m_AlphaShadow)
+			{
+				this.SetStyle(ControlStyles.AllPaintingInWmPaint,true);
+				this.SetStyle(DisplayHelp.DoubleBufferFlag,false);
+			}
+			this.ResumeLayout();
+		}
+
+		protected override void OnHandleCreated(EventArgs e)
+		{
+			base.OnHandleCreated(e);
+            //NativeFunctions.SetLayeredWindowAttributes(this.Handle,Color.Black.ToArgb(),102,NativeFunctions.LWA_ALPHA);
+			// We want to make the entire bitmap opaque 
+		}
+		
+		private void PaintShadow()
+		{
+            if(this.Width <= 0 || this.Height <= 0) return;
+
+			// Create bitmap for drawing onto
+            using (Bitmap memoryBitmap = new Bitmap(this.Width, this.Height, PixelFormat.Format32bppArgb))
+            {
+                using (Graphics g = Graphics.FromImage(memoryBitmap))
+                {
+                    Rectangle area = new Rectangle(0, 0, this.Width, this.Height);
+
+                    System.Drawing.Region reg = new System.Drawing.Region();
+                    System.Drawing.Drawing2D.GraphicsPath path = new System.Drawing.Drawing2D.GraphicsPath();
+                    Rectangle r = this.ClientRectangle;
+                    const int TRIANGLESIZE = 5;
+                    path.StartFigure();
+                    path.AddLine(r.Right - TRIANGLESIZE, r.Top, r.Right, r.Top);
+                    path.AddLine(r.Right, r.Top, r.Right, r.Top + TRIANGLESIZE);
+                    path.AddLine(r.Right, r.Top + TRIANGLESIZE, r.Right - TRIANGLESIZE, r.Top);
+                    path.CloseFigure();
+                    path.StartFigure();
+                    path.AddLine(r.Left, r.Bottom - TRIANGLESIZE - 1, r.Left, r.Bottom);
+                    path.AddLine(r.Left, r.Bottom, r.Left + TRIANGLESIZE, r.Bottom);
+                    path.AddLine(r.Left + TRIANGLESIZE, r.Bottom, r.Left, r.Bottom - TRIANGLESIZE);
+                    path.CloseFigure();
+                    path.StartFigure();
+                    path.AddRectangle(new Rectangle(0, 0, r.Width - TRIANGLESIZE, r.Height - TRIANGLESIZE));
+                    path.CloseFigure();
+                    reg.Xor(path);
+                    g.SetClip(reg, System.Drawing.Drawing2D.CombineMode.Replace);
+                    path.Dispose();
+                    path = null;
+                    reg.Dispose();
+                    reg = null;
+                    // Draw the background area
+                    g.Clear(Color.Transparent);
+                    g.CompositingMode = System.Drawing.Drawing2D.CompositingMode.SourceCopy;
+                    // Draw Actual Shadow
+                    g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.AntiAlias;
+                    g.Clear(Color.Black);
+                    const int EDGE = 4;
+                    r.Width--;
+                    r.Height--;
+                    Color[] clr = new Color[]{
+										   Color.FromArgb(14,Color.Black),
+										   Color.FromArgb(43,Color.Black),
+										   Color.FromArgb(84,Color.Black),
+										   Color.FromArgb(113,Color.Black),
+										   Color.FromArgb(128,Color.Black)};
+
+                    for (int i = 0; i < EDGE; i++)
+                    {
+                        using (Pen pen = new Pen(clr[i], 1))
+                        {
+                            using (GraphicsPath tempPath = GetPath(r, EDGE - i))
+                                g.DrawPath(pen, tempPath);
+                            r.Inflate(-1, -1);
+                        }
+                    }
+
+                    // Get hold of the screen DC
+                    IntPtr hDC = NativeFunctions.GetDC(IntPtr.Zero);
+
+                    // Create a memory based DC compatible with the screen DC
+                    IntPtr memoryDC = WinApi.CreateCompatibleDC(hDC);
+
+                    // Get access to the bitmap handle contained in the Bitmap object
+                    IntPtr hBitmap = memoryBitmap.GetHbitmap(Color.FromArgb(0));
+
+                    // Select this bitmap for updating the window presentation
+                    IntPtr oldBitmap = WinApi.SelectObject(memoryDC, hBitmap);
+
+                    // New window size
+                    NativeFunctions.SIZE ulwsize;
+                    ulwsize.cx = this.Width;
+                    ulwsize.cy = this.Height;
+
+                    // New window position
+                    NativeFunctions.POINT topPos;
+                    topPos.x = this.Left;
+                    topPos.y = this.Top;
+
+                    // Offset into memory bitmap is always zero
+                    NativeFunctions.POINT pointSource;
+                    pointSource.x = 0;
+                    pointSource.y = 0;
+
+                    // We want to make the entire bitmap opaque 
+                    NativeFunctions.BLENDFUNCTION blend = new NativeFunctions.BLENDFUNCTION();
+                    blend.BlendOp = (byte)NativeFunctions.Win23AlphaFlags.AC_SRC_OVER;
+                    blend.BlendFlags = 0;
+                    blend.SourceConstantAlpha = 255;
+                    blend.AlphaFormat = (byte)NativeFunctions.Win23AlphaFlags.AC_SRC_ALPHA;
+
+                    // Tell operating system to use our bitmap for painting
+                    NativeFunctions.UpdateLayeredWindow(Handle, hDC, ref topPos, ref ulwsize,
+                        memoryDC, ref pointSource, 0, ref blend,
+                        (int)NativeFunctions.Win32UpdateLayeredWindowsFlags.ULW_ALPHA);
+
+                    // Put back the old bitmap handle
+                    WinApi.SelectObject(memoryDC, oldBitmap);
+
+                    // Cleanup resources
+                    WinApi.ReleaseDC(IntPtr.Zero, hDC);
+                    WinApi.DeleteObject(hBitmap);
+                    WinApi.DeleteDC(memoryDC);
+                }
+            }
+		}
+
+		public void UpdateShadow()
+		{
+			if(!m_AlphaShadow)
+				return;
+			PaintShadow();
+		}
+
+		private System.Drawing.Drawing2D.GraphicsPath GetPath(Rectangle r, int pathSize)
+		{
+			System.Drawing.Drawing2D.GraphicsPath path=new System.Drawing.Drawing2D.GraphicsPath();
+			path.AddArc(r.Right-pathSize,r.Y,pathSize,pathSize,270,90);
+			path.AddLine(r.Right,r.Y+pathSize,r.Right,r.Bottom-pathSize);
+			path.AddArc(r.Right-pathSize,r.Bottom-pathSize,pathSize,pathSize,0,90);
+			path.AddLine(r.Right-pathSize,r.Bottom,r.X,r.Bottom);
+			path.AddLine(r.X,r.Bottom,r.X,r.Top);
+			return path;
+		}
+
+		protected override void OnPaint(PaintEventArgs e)
+		{
+			if(!m_AlphaShadow)
+			{
+				e.Graphics.Clear(this.BackColor);
+				return;
+			}
+		}
+
+		protected override void WndProc(ref Message m)
+		{
+			const int WM_MOUSEACTIVATE = 0x21;
+			const int MA_NOACTIVATE = 3;
+			//const int MA_NOACTIVATEANDEAT = 4;
+			if(m.Msg==WM_MOUSEACTIVATE)
+			{
+				m.Result=new System.IntPtr(MA_NOACTIVATE);
+				return;
+			}
+			base.WndProc(ref m);
+		}
+
+		protected override CreateParams CreateParams
+		{
+			get
+			{
+				const uint WS_POPUP=0x80000000;
+				const uint WS_CLIPSIBLINGS=0x04000000;
+				const uint WS_CLIPCHILDREN=0x02000000;
+				const int WS_EX_TOPMOST=0x00000008;
+				const int WS_EX_LAYERED=0x00080000;
+				const int WS_EX_TOOLWINDOW=0x00000080;
+				CreateParams p=base.CreateParams;
+				p.ExStyle=(p.ExStyle | WS_EX_TOPMOST | (m_AlphaShadow?WS_EX_LAYERED:0) | WS_EX_TOOLWINDOW);
+				p.Style=unchecked((int)(WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN));
+				p.Caption="";  // Setting caption would show window under tasks in Windows Task Manager
+				return p;
+			}
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/PopupsCollection.cs b/PROMS/DotNetBar Source Code/PopupsCollection.cs
new file mode 100644
index 00000000..70e01eb4
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/PopupsCollection.cs	
@@ -0,0 +1,82 @@
+using System;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Summary description for Popups.
+	/// </summary>
+	public class PopupsCollection:System.Collections.CollectionBase
+	{
+		private DotNetBarManager m_Owner;
+		public PopupsCollection(DotNetBarManager owner)
+		{
+			m_Owner=owner;
+		}
+		public int Add(BaseItem item)
+		{
+			item.SetOwner(m_Owner);
+			item.Visible=false;
+			item.Displayed=false;
+			return List.Add(item);
+		}
+		public BaseItem this[int index]
+		{
+			get {return (BaseItem)(List[index]);}
+			set {List[index] = value;}
+		}
+		public BaseItem this[string name]
+		{
+			get {return (BaseItem)(List[this.IndexOf(name)]);}
+			set {List[this.IndexOf(name)] = value;}
+		}
+
+		public void Insert(int index, BaseItem value) 
+		{
+			value.Visible=false;
+			value.Displayed=false;
+			List.Insert(index, value);
+		}
+
+		public int IndexOf(BaseItem value) 
+		{
+			return List.IndexOf(value);
+		}
+
+		public int IndexOf(string name)
+		{
+			int i=-1;
+			foreach(BaseItem item in List)
+			{
+				i++;
+				if(item.Name==name)
+					return i;
+			}
+			return -1;
+		}
+
+		public bool Contains(BaseItem value) 
+		{
+			return List.Contains(value);
+		}
+
+		public bool Contains(string name)
+		{
+			foreach(BaseItem item in List)
+			{
+				if(item.Name==name)
+					return true;
+			}
+			return false;
+		}
+
+		public void Remove(BaseItem value) 
+		{
+			List.Remove(value);
+		}
+
+		public void CopyTo(BaseItem[] array, int index) 
+		{
+			List.CopyTo(array, index);
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/Presentation/Line.cs b/PROMS/DotNetBar Source Code/Presentation/Line.cs
new file mode 100644
index 00000000..57d1fa07
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Presentation/Line.cs	
@@ -0,0 +1,73 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Presentation
+{
+    /// <summary>
+    /// Represents the line drawn between start and end point.
+    /// </summary>
+    internal class Line : Shape
+    {
+        #region Private Variables
+        private Location m_StartPoint = new Location();
+        private Location m_EndPoint = new Location();
+        private ShapeBorder m_Border = new ShapeBorder();
+        #endregion
+
+        #region Internal Implementation
+        public Line() { }
+        public Line(Location startPoint, Location endPoint, ShapeBorder border)
+        {
+            m_StartPoint = startPoint;
+            m_EndPoint = endPoint;
+            m_Border = border;
+        }
+
+        /// <summary>
+        /// Gets the start point of the line.
+        /// </summary>
+        public Location StartPoint
+        {
+            get { return m_StartPoint; }
+        }
+
+        /// <summary>
+        /// Gets the end point of the line.
+        /// </summary>
+        public Location EndPoint
+        {
+            get { return m_EndPoint; }
+        }
+
+        /// <summary>
+        /// Gets the line border.
+        /// </summary>
+        public ShapeBorder Border
+        {
+            get { return m_Border; }
+        }
+
+        public override void Paint(ShapePaintInfo p)
+        {
+            System.Drawing.Point start = GetLocation(p.Bounds, m_StartPoint);
+            System.Drawing.Point end = GetLocation(p.Bounds, m_EndPoint);
+            Graphics g = p.Graphics;
+
+            if (m_Border.Color2.IsEmpty)
+            {
+                if (!m_Border.Color1.IsEmpty)
+                {
+                    DisplayHelp.DrawLine(g, start, end, m_Border.Color1, m_Border.Width);
+                }
+            }
+            else
+            {
+                DisplayHelp.DrawGradientLine(g, start, end, m_Border.Color1, m_Border.Color2, m_Border.GradientAngle, m_Border.Width);
+            }
+
+            base.Paint(p);
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Presentation/Location.cs b/PROMS/DotNetBar Source Code/Presentation/Location.cs
new file mode 100644
index 00000000..c79f78ce
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Presentation/Location.cs	
@@ -0,0 +1,54 @@
+using System;
+using System.Text;
+
+namespace DevComponents.DotNetBar.Presentation
+{
+    /// <summary>
+    /// Describes the shape location.
+    /// </summary>
+    internal class Location
+    {
+        public Location() { }
+        public Location(int x, int y)
+        {
+            this.X = x;
+            this.Y = y;
+        }
+        public Location(int x, int y, eRelativeLocation relativeX, eRelativeLocation relativeY)
+        {
+            this.X = x;
+            this.Y = y;
+            this.RelativeX = relativeX;
+            this.RelativeY = relativeY;
+        }
+
+        /// <summary>
+        /// Gets or sets the X location of the shape relative to it's parent.
+        /// </summary>
+        public int X = 0;
+        /// <summary>
+        /// Gets or sets the Y location of the shape relative to it's parent.
+        /// </summary>
+        public int Y = 0;
+        /// <summary>
+        /// Gets or sets the relative X position.
+        /// </summary>
+        public eRelativeLocation RelativeX = eRelativeLocation.NotSet;
+        /// <summary>
+        /// Gets or sets the relative Y position.
+        /// </summary>
+        public eRelativeLocation RelativeY = eRelativeLocation.NotSet;
+    }
+
+    /// <summary>
+    /// Describes the relative location.
+    /// </summary>
+    internal enum eRelativeLocation
+    {
+        NotSet,
+        Top,
+        Left,
+        Right,
+        Bottom
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Presentation/PaddingInfo.cs b/PROMS/DotNetBar Source Code/Presentation/PaddingInfo.cs
new file mode 100644
index 00000000..4de3c58a
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Presentation/PaddingInfo.cs	
@@ -0,0 +1,60 @@
+using System;
+using System.Text;
+
+namespace DevComponents.DotNetBar.Presentation
+{
+    /// <summary>
+    /// Describes the padding for the shape. Padding is the space inside the shape and between it's child shapes.
+    /// </summary>
+    internal class PaddingInfo
+    {
+        /// <summary>
+        /// Creates new instance of the class.
+        /// </summary>
+        public PaddingInfo() { }
+
+        /// <summary>
+        /// Creates new instance of the class and initializes it with default values.
+        /// </summary>
+        public PaddingInfo(int left, int top, int right, int bottom)
+        {
+            this.Left = left;
+            this.Top = top;
+            this.Right = right;
+            this.Bottom = bottom;
+        }
+
+        /// <summary>
+        /// Gets or sets the left padding in pixels.
+        /// </summary>
+        public int Left = 0;
+        /// <summary>
+        /// Gets or sets the right padding in pixels.
+        /// </summary>
+        public int Right = 0;
+        /// <summary>
+        /// Gets or sets the top padding in pixels.
+        /// </summary>
+        public int Top = 0;
+        /// <summary>
+        /// Gets or sets the bottom padding in pixels.
+        /// </summary>
+        public int Bottom = 0;
+
+        /// <summary>
+        /// Gets the total horizontal padding.
+        /// </summary>
+        public int HorizontalPadding
+        {
+            get { return Left + Right; }
+        }
+
+        /// <summary>
+        /// Gets the total vertical padding.
+        /// </summary>
+        public int VerticalPadding
+        {
+            get { return Top + Bottom; }
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Presentation/Rectangle.cs b/PROMS/DotNetBar Source Code/Presentation/Rectangle.cs
new file mode 100644
index 00000000..76d0b1ee
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Presentation/Rectangle.cs	
@@ -0,0 +1,216 @@
+using System;
+using System.Text;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+
+namespace DevComponents.DotNetBar.Presentation
+{
+    internal class Rectangle : Shape
+    {
+        #region Private Variables
+        private int m_CornerSize = 0;
+        private ShapeBorder m_Border = new ShapeBorder();
+        private ShapeFill m_Fill = new ShapeFill();
+        private eCornerType m_TopLeftCornerType = eCornerType.Square;
+        private eCornerType m_TopRightCornerType = eCornerType.Square;
+        private eCornerType m_BottomLeftCornerType = eCornerType.Square;
+        private eCornerType m_BottomRightCornerType = eCornerType.Square;
+        #endregion
+
+        #region Internal Implementation
+        public Rectangle() { }
+        public Rectangle(ShapeBorder border)
+        {
+            m_Border = border;
+        }
+        public Rectangle(ShapeBorder border, int cornerSize, eCornerType cornerType)
+        {
+            m_Border = border;
+            m_CornerSize = cornerSize;
+            this.CornerType = cornerType;
+        }
+        public Rectangle(ShapeBorder border, ShapeFill fill)
+        {
+            m_Border = border;
+            m_Fill = fill;
+        }
+        public Rectangle(ShapeBorder border, ShapeFill fill,int cornerSize, eCornerType cornerType)
+        {
+            m_Border = border;
+            m_Fill = fill;
+            m_CornerSize = cornerSize;
+            this.CornerType = cornerType;
+        }
+        public Rectangle(ShapeBorder border, ShapeFill fill, int cornerSize, eCornerType cornerType, PaddingInfo padding)
+        {
+            m_Border = border;
+            m_Fill = fill;
+            m_CornerSize = cornerSize;
+            this.Padding = padding;
+            this.CornerType = cornerType;
+        }
+        public Rectangle(ShapeFill fill)
+        {
+            m_Fill = fill;
+        }
+        public override void Paint(ShapePaintInfo p)
+        {
+            System.Drawing.Rectangle bounds = this.GetBounds(p.Bounds);
+            Graphics g = p.Graphics;
+
+            PaintFill(g, bounds);
+            PaintBorder(g, bounds);
+
+            base.Paint(p);
+        }
+
+        /// <summary>
+        /// Paints the border.
+        /// </summary>
+        protected virtual void PaintBorder(Graphics g, System.Drawing.Rectangle r)
+        {
+            if (m_Border.Width == 0 || m_Border.Color1.IsEmpty || r.Width <= 0 || r.Height <= 0)
+                return;
+            
+            int roundCornerSize = m_CornerSize;
+            ShapeBorder border = m_Border;
+
+            // Workaround for GDI+ bug
+            r.Width--;
+            r.Height--;
+
+            using (System.Drawing.Drawing2D.GraphicsPath path = DisplayHelp.GetRoundedRectanglePath(r, m_CornerSize, eStyleBackgroundPathPart.Complete,
+                m_TopLeftCornerType, m_TopRightCornerType, m_BottomLeftCornerType, m_BottomRightCornerType))
+            {
+
+                using (Pen pen = new Pen(border.Color1, border.Width))
+                    path.Widen(pen);
+
+                if (border.Color2.IsEmpty)
+                {
+                    using (SolidBrush brush = new SolidBrush(border.Color1))
+                        g.FillPath(brush, path);
+                }
+                else
+                {
+                    using (System.Drawing.Drawing2D.LinearGradientBrush brush = DisplayHelp.CreateLinearGradientBrush(r, border.Color1, border.Color2, border.GradientAngle))
+                        g.FillPath(brush, path);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Paints the border.
+        /// </summary>
+        protected virtual void PaintFill(Graphics g, System.Drawing.Rectangle r)
+        {
+            if (r.Width <= 0 || r.Height <= 0)
+                return;
+
+            int roundCornerSize = m_CornerSize;
+
+            if (roundCornerSize > 0)
+            {
+                using (System.Drawing.Drawing2D.GraphicsPath path = DisplayHelp.GetRoundedRectanglePath(r, m_CornerSize, eStyleBackgroundPathPart.Complete,
+                m_TopLeftCornerType, m_TopRightCornerType, m_BottomLeftCornerType, m_BottomRightCornerType))
+                {
+                    Brush brush = m_Fill.CreateBrush(System.Drawing.Rectangle.Ceiling(path.GetBounds()));
+                    if (brush != null)
+                    {
+                        DisplayHelp.FillPath(g, path, m_Fill.Color1, m_Fill.Color2, m_Fill.GradientAngle);
+                        brush.Dispose();
+                    }
+                }
+            }
+            else
+            {
+                Brush brush = m_Fill.CreateBrush(r);
+                if (brush != null)
+                {
+                    g.FillRectangle(brush, r);
+                    brush.Dispose();
+                }
+            }
+        }
+
+        protected override Region ClipChildren(Graphics g, System.Drawing.Rectangle childBounds)
+        {
+            if (m_CornerSize > 0)
+            {
+                Region clip = g.Clip;
+                using (GraphicsPath path = DisplayHelp.GetRoundedRectanglePath(childBounds, m_CornerSize, 
+                    eStyleBackgroundPathPart.Complete, m_TopLeftCornerType, m_TopRightCornerType, m_BottomLeftCornerType, m_BottomRightCornerType))
+                {
+                    g.SetClip(path);
+                }
+                return clip;
+            }
+
+            return base.ClipChildren(g, childBounds);
+        }
+
+        /// <summary>
+        /// Gets or sets the rounded corner size.
+        /// </summary>
+        public int CornerSize
+        {
+            get { return m_CornerSize; }
+            set {m_CornerSize = value;}
+        }
+
+        /// <summary>
+        /// Gets the shape border.
+        /// </summary>
+        public ShapeBorder Border
+        {
+            get { return m_Border; }
+            set { m_Border = value; }
+        }
+
+        /// <summary>
+        /// Gets the shape fill.
+        /// </summary>
+        public ShapeFill Fill
+        {
+            get { return m_Fill; }
+            set { m_Fill = value; }
+        }
+
+        public eCornerType CornerType
+        {
+            get { return m_TopLeftCornerType; }
+            set
+            {
+                m_TopLeftCornerType = value;
+                m_TopRightCornerType = value;
+                m_BottomLeftCornerType = value;
+                m_BottomRightCornerType = value;
+            }
+        }
+
+        public eCornerType TopLeftCornerType
+        {
+            get { return m_TopLeftCornerType; }
+            set { m_TopLeftCornerType = value; }
+        }
+
+        public eCornerType TopRightCornerType
+        {
+            get { return m_TopRightCornerType; }
+            set { m_TopRightCornerType = value; }
+        }
+
+        public eCornerType BottomLeftCornerType
+        {
+            get { return m_BottomLeftCornerType; }
+            set { m_BottomLeftCornerType = value; }
+        }
+
+        public eCornerType BottomRightCornerType
+        {
+            get { return m_BottomRightCornerType; }
+            set { m_BottomRightCornerType = value; }
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Presentation/Shape.cs b/PROMS/DotNetBar Source Code/Presentation/Shape.cs
new file mode 100644
index 00000000..42a5afe1
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Presentation/Shape.cs	
@@ -0,0 +1,194 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Presentation
+{
+    internal class Shape
+    {
+        #region Private Variables
+        private Location m_Location = new Location();
+        private SizeInfo m_Size = new SizeInfo();
+        private ShapeCollection m_Children = null;
+        private PaddingInfo m_Padding = null;
+        private bool m_SetChildClip = false;
+        #endregion
+
+        #region Internal Implementation
+        /// <summary>
+        /// Gets the location of the shape.
+        /// </summary>
+        public Location Location
+        {
+            get { return m_Location; }
+        }
+
+        /// <summary>
+        /// Gets the size of the shape.
+        /// </summary>
+        public SizeInfo Size
+        {
+            get { return m_Size; }
+        }
+
+        /// <summary>
+        /// Gets the shape padding. Padding is the inside spacing between shape and it's child shapes.
+        /// </summary>
+        public PaddingInfo Padding
+        {
+            get { return m_Padding; }
+            set
+            {
+                m_Padding = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the collection of child shapes.
+        /// </summary>
+        public ShapeCollection Children
+        {
+            get
+            {
+                if (m_Children == null)
+                    m_Children = new ShapeCollection();
+                return m_Children;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether this shape will set the ShapePaintInfo.ChildContentClip property to the region that represents the inside content of the shape.
+        /// This is used when there is inside content of the shape which is not part of the shape itself and calling routine needs
+        /// access to the region that defines the shape inside bounds.
+        /// </summary>
+        public bool SetChildClip
+        {
+            get { return m_SetChildClip; }
+            set { m_SetChildClip = value; }
+        }
+
+        /// <summary>
+        /// Paints the shape on canvas. If overriden base implementation must be called to paint any child shapes.
+        /// </summary>
+        /// <param name="p">Shape paint information.</param>
+        public virtual void Paint(ShapePaintInfo p)
+        {
+            if (m_Children != null && m_Children.Count > 0)
+            {
+                System.Drawing.Rectangle originalBounds = p.Bounds;
+                System.Drawing.Rectangle bounds = new System.Drawing.Rectangle(this.GetLocation(p.Bounds), this.GetSize(p.Bounds));
+
+                if (m_Padding != null)
+                {
+                    bounds.Width -= m_Padding.HorizontalPadding;
+                    bounds.Height -= m_Padding.VerticalPadding;
+                    bounds.X += m_Padding.Left;
+                    bounds.Y += m_Padding.Top;
+                }
+
+                p.Bounds = bounds;
+                Region clip = ClipChildren(p.Graphics, bounds);
+                if (m_SetChildClip && p.Graphics.Clip!=null)
+                {
+                    p.ChildContentClip = p.Graphics.Clip as Region;
+                }
+
+                foreach (Shape shape in m_Children)
+                {
+                    shape.Paint(p);
+                }
+                if (p.ChildContentClip != null)
+                {
+                    p.ChildContentClip.Dispose();
+                    p.ChildContentClip = null;
+                }
+                if (clip != null)
+                {
+                    p.Graphics.Clip = clip;
+                    clip.Dispose();
+                }
+                else
+                    p.Graphics.ResetClip();
+                p.Bounds = originalBounds;
+                if (clip != null) clip.Dispose();
+            }
+        }
+
+        protected virtual Region ClipChildren(Graphics g, System.Drawing.Rectangle childBounds)
+        {
+            Region clip = g.Clip;
+            g.SetClip(childBounds);
+            return clip;
+        }
+
+        /// <summary>
+        /// Returns absolute location of the shape based on parent bounds.
+        /// </summary>
+        /// <param name="bounds">Parent absolute bounds.</param>
+        /// <returns>Absolute location of the shape</returns>
+        protected virtual Point GetLocation(System.Drawing.Rectangle bounds)
+        {
+            return GetLocation(bounds, m_Location);
+        }
+
+        protected virtual Point GetLocation(System.Drawing.Rectangle bounds, Location refLocation)
+        {
+            Point loc = bounds.Location;
+
+            if (refLocation.RelativeX == eRelativeLocation.Right)
+                loc.X = bounds.Right;
+            else if (refLocation.RelativeX == eRelativeLocation.Top)
+                loc.X = bounds.Y;
+            else if (refLocation.RelativeX == eRelativeLocation.Bottom)
+                loc.X = bounds.Bottom;
+
+            if (refLocation.RelativeY == eRelativeLocation.Bottom)
+                loc.Y = bounds.Bottom;
+            else if (refLocation.RelativeY == eRelativeLocation.Right)
+                loc.Y = bounds.Right;
+            else if (refLocation.RelativeY == eRelativeLocation.Left)
+                loc.Y = bounds.X;
+
+            loc.Offset(refLocation.X, refLocation.Y);
+
+            return loc;
+        }
+
+        /// <summary>
+        /// Returns absolute size of the shape based on the parent bounds.
+        /// </summary>
+        /// <param name="bounds">Absolute parent bounds.</param>
+        /// <returns>Absolute size of the shape.</returns>
+        protected virtual Size GetSize(System.Drawing.Rectangle bounds)
+        {
+            Size size = bounds.Size;
+
+            if (m_Size.RelativeWidth == eRelativeSize.Width)
+                size.Width = bounds.Width + m_Size.Width;
+            else if (m_Size.RelativeWidth == eRelativeSize.Height)
+                size.Width = bounds.Height + m_Size.Height;
+            else if (m_Size.Width != 0)
+                size.Width = m_Size.Width;
+
+            if (m_Size.RelativeHeight == eRelativeSize.Height)
+                size.Height = bounds.Height + m_Size.Height;
+            else if (m_Size.RelativeHeight == eRelativeSize.Width)
+                size.Height = bounds.Width + m_Size.Height;
+            else if (m_Size.Height != 0)
+                size.Height = m_Size.Height;
+
+            return size;
+        }
+
+        /// <summary>
+        /// Gets the absolute bounds of the shape.
+        /// </summary>
+        /// <param name="parentBounds">Parent bounds.</param>
+        /// <returns>Absolute bounds of the shape.</returns>
+        protected virtual System.Drawing.Rectangle GetBounds(System.Drawing.Rectangle parentBounds)
+        {
+            return new System.Drawing.Rectangle(GetLocation(parentBounds), GetSize(parentBounds));
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Presentation/ShapeBorder.cs b/PROMS/DotNetBar Source Code/Presentation/ShapeBorder.cs
new file mode 100644
index 00000000..053fee05
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Presentation/ShapeBorder.cs	
@@ -0,0 +1,77 @@
+using System;
+using System.Text;
+using System.Drawing;
+using DevComponents.DotNetBar.Rendering;
+
+namespace DevComponents.DotNetBar.Presentation
+{
+    /// <summary>
+    /// Defines the shape border.
+    /// </summary>
+    internal class ShapeBorder
+    {
+        #region Properties
+        /// <summary>
+        /// Gets or sets the border width in pixels.
+        /// </summary>
+        public int Width = 0;
+
+        /// <summary>
+        /// Gets or sets the border color.
+        /// </summary>
+        public Color Color1 = Color.Empty;
+
+        /// <summary>
+        /// Gets or sets the ending gradient border color.
+        /// </summary>
+        public Color Color2 = Color.Empty;
+
+        /// <summary>
+        /// Gets or sets the gradient angle. Default value is 90.
+        /// </summary>
+        public int GradientAngle = 90;
+        #endregion
+
+        #region Internal Implementation
+        public ShapeBorder() {}
+        public ShapeBorder(int borderWidth) { Width = borderWidth; }
+        public ShapeBorder(LinearGradientColorTable table)
+        {
+            this.Color1 = table.Start;
+            this.Color2 = table.End;
+            this.Width = 1;
+        }
+        public ShapeBorder(LinearGradientColorTable table, int width)
+        {
+            this.Color1 = table.Start;
+            this.Color2 = table.End;
+            this.Width = width;
+        }
+        public void Apply(LinearGradientColorTable table)
+        {
+            if (table == null)
+            {
+                this.Color1 = Color.Empty;
+                this.Color2 = Color.Empty;
+            }
+            else
+            {
+                this.Color1 = table.Start;
+                this.Color2 = table.End;
+            }
+        }
+        public ShapeBorder(Color color1, Color color2, int width)
+        {
+            this.Color1 = color1;
+            this.Color2 = color2;
+            this.Width = width;
+        }
+        public ShapeBorder(Color color1, int width)
+        {
+            this.Color1 = color1;
+            this.Color2 = Color.Empty;
+            this.Width = width;
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Presentation/ShapeCollection.cs b/PROMS/DotNetBar Source Code/Presentation/ShapeCollection.cs
new file mode 100644
index 00000000..8e54c5ec
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Presentation/ShapeCollection.cs	
@@ -0,0 +1,103 @@
+using System;
+using System.Text;
+using System.Collections;
+
+namespace DevComponents.DotNetBar.Presentation
+{
+    internal class ShapeCollection : CollectionBase
+    {
+        #region Internal Implementation
+        /// <summary>Creates new instance of the class.</summary>
+        public ShapeCollection()
+		{
+		}
+
+        /// <summary>
+		/// Adds new object to the collection.
+		/// </summary>
+		/// <param name="Shape">Object to add.</param>
+		/// <returns>Index of newly added object.</returns>
+		public int Add(Shape shape)
+		{
+			return List.Add(shape);
+		}
+		/// <summary>
+		/// Returns reference to the object in collection based on it's index.
+		/// </summary>
+		public Shape this[int index]
+		{
+			get {return (Shape)(List[index]);}
+			set {List[index] = value;}
+		}
+
+		/// <summary>
+		/// Inserts new object into the collection.
+		/// </summary>
+		/// <param name="index">Position of the object.</param>
+		/// <param name="value">Object to insert.</param>
+		public void Insert(int index, Shape value) 
+		{
+			List.Insert(index, value);
+		}
+
+		/// <summary>
+		/// Returns index of the object inside of the collection.
+		/// </summary>
+		/// <param name="value">Reference to the object.</param>
+		/// <returns>Index of the object.</returns>
+		public int IndexOf(Shape value) 
+		{
+			return List.IndexOf(value);
+		}
+
+		/// <summary>
+		/// Returns whether collection contains specified object.
+		/// </summary>
+		/// <param name="value">Object to look for.</param>
+		/// <returns>true if object is part of the collection, otherwise false.</returns>
+		public bool Contains(Shape value) 
+		{
+			return List.Contains(value);
+		}
+
+		/// <summary>
+		/// Removes specified object from the collection.
+		/// </summary>
+		/// <param name="value"></param>
+		public void Remove(Shape value) 
+		{
+			List.Remove(value);
+		}
+
+        //protected override void OnRemoveComplete(int index,object value)
+        //{
+        //    base.OnRemoveComplete(index,value);
+        //    Shape me=value as Shape;
+        //}
+        //protected override void OnInsertComplete(int index,object value)
+        //{
+        //    base.OnInsertComplete(index,value);
+        //    Shape me=value as Shape;
+        //}
+
+		/// <summary>
+		/// Copies collection into the specified array.
+		/// </summary>
+		/// <param name="array">Array to copy collection to.</param>
+		/// <param name="index">Starting index.</param>
+		public void CopyTo(Shape[] array, int index) 
+		{
+			List.CopyTo(array, index);
+		}
+
+		/// <summary>
+		/// Copies contained items to the Shape array.
+		/// </summary>
+		/// <param name="array">Array to copy to.</param>
+		internal void CopyTo(Shape[] array)
+		{
+			List.CopyTo(array,0);
+		}
+		#endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Presentation/ShapeFill.cs b/PROMS/DotNetBar Source Code/Presentation/ShapeFill.cs
new file mode 100644
index 00000000..3920da56
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Presentation/ShapeFill.cs	
@@ -0,0 +1,105 @@
+using System;
+using System.Drawing.Drawing2D;
+using System.Text;
+using System.Drawing;
+using DevComponents.DotNetBar.Rendering;
+
+namespace DevComponents.DotNetBar.Presentation
+{
+    internal class ShapeFill : Shape
+    {
+        #region Properties
+        /// <summary>
+        /// Gets or sets the starting fill color.
+        /// </summary>
+        public Color Color1 = Color.Empty;
+
+        /// <summary>
+        /// Gets or sets the end fill color.
+        /// </summary>
+        public Color Color2 = Color.Empty;
+
+        /// <summary>
+        /// Gets or sets the gradient angle.
+        /// </summary>
+        public int GradientAngle = 90;
+        
+        /// <summary>
+        /// Gets or sets the background color collection blend.
+        /// </summary>
+        public BackgroundColorBlendCollection BackgroundColorBlend = null;
+
+        /// <summary>
+        /// Gets or sets the fill gradient type.
+        /// </summary>
+        public eGradientType GradientType = eGradientType.Linear;
+        #endregion
+
+        #region Internal Implementation
+        public ShapeFill() { }
+        public ShapeFill(Color color1, Color color2)
+        {
+            this.Color1 = color1;
+            this.Color2 = color2;
+        }
+        public ShapeFill(LinearGradientColorTable table)
+        {
+            this.Color1 = table.Start;
+            this.Color2 = table.End;
+        }
+        public ShapeFill(Color color1)
+        {
+            this.Color1 = color1;
+            this.Color2 = Color.Empty;
+        }
+        
+        public void Apply(LinearGradientColorTable table)
+        {
+            if (table == null)
+            {
+                this.Color1 = Color.Empty;
+                this.Color2 = Color.Empty;
+                this.GradientAngle = 90;
+            }
+            else
+            {
+                this.Color1 = table.Start;
+                this.Color2 = table.End;
+                this.GradientAngle = table.GradientAngle;
+            }
+        }
+        
+        public Brush CreateBrush(System.Drawing.Rectangle r)
+        {
+            if (r.Width <= 0 || r.Height <= 0)
+                return null;
+
+            if(this.BackgroundColorBlend!=null && BackgroundColorBlend.Count>0)
+            {
+                return DisplayHelp.CreateBrush(r, BackgroundColorBlend, GradientAngle, GradientType);
+            }
+            else if(Color2.IsEmpty && !Color1.IsEmpty)
+            {
+                return new SolidBrush(Color1);
+            }
+            else if (!Color2.IsEmpty && !Color1.IsEmpty)
+            {
+                if (GradientType == eGradientType.Linear)
+                    return new LinearGradientBrush(r, Color1, Color2, GradientAngle);
+                else
+                {
+                    int d = (int)Math.Sqrt(r.Width * r.Width + r.Height * r.Height) + 4;
+                    GraphicsPath fillPath = new GraphicsPath();
+                    fillPath.AddEllipse(r.X - (d - r.Width) / 2, r.Y - (d - r.Height) / 2, d, d);
+                    PathGradientBrush brush = new PathGradientBrush(fillPath);
+                    brush.CenterColor = this.Color1;
+                    brush.SurroundColors = new Color[] { this.Color2 };
+                    return brush;
+                }
+            }
+            return null;
+        }
+        #endregion
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Presentation/ShapePaintInfo.cs b/PROMS/DotNetBar Source Code/Presentation/ShapePaintInfo.cs
new file mode 100644
index 00000000..5fc78155
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Presentation/ShapePaintInfo.cs	
@@ -0,0 +1,19 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Presentation
+{
+    internal class ShapePaintInfo
+    {
+        public ShapePaintInfo(Graphics g, System.Drawing.Rectangle bounds)
+        {
+            this.Graphics = g;
+            this.Bounds = bounds;
+        }
+
+        public Graphics Graphics;
+        public System.Drawing.Rectangle Bounds = System.Drawing.Rectangle.Empty;
+        public Region ChildContentClip = null;
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Presentation/ShapePath.cs b/PROMS/DotNetBar Source Code/Presentation/ShapePath.cs
new file mode 100644
index 00000000..a28a76e5
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Presentation/ShapePath.cs	
@@ -0,0 +1,134 @@
+using System;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Text;
+
+namespace DevComponents.DotNetBar.Presentation
+{
+    internal class ShapePath : Shape
+    {
+        #region Private Variables
+        private ShapeBorder m_Border = null;
+        private ShapeFill m_Fill = null;
+        private GraphicsPath m_Path = null;
+        #endregion
+
+        #region Internal Implementation
+        public ShapePath() { }
+        public ShapePath(ShapeBorder border)
+        {
+            m_Border = border;
+        }
+        public ShapePath(ShapeFill fill)
+        {
+            m_Fill = fill;
+        }
+        public ShapePath(ShapeBorder border, ShapeFill fill)
+        {
+            m_Border = border;
+            m_Fill = fill;
+        }
+
+        public GraphicsPath Path
+        {
+            get { return m_Path; }
+            set { m_Path = value; }
+        }
+
+        public override void Paint(ShapePaintInfo p)
+        {
+            if(m_Path == null)
+                return;
+            
+            System.Drawing.Rectangle bounds = this.GetBounds(p.Bounds);
+            Graphics g = p.Graphics;
+
+            if (m_Fill != null)
+                PaintFill(g, bounds);
+
+            if (m_Border != null)
+                PaintBorder(g, bounds);
+
+            base.Paint(p);
+        }
+
+        /// <summary>
+        /// Paints the border.
+        /// </summary>
+        protected virtual void PaintBorder(Graphics g, System.Drawing.Rectangle r)
+        {
+            if (m_Border.Color1.IsEmpty)
+                return;
+
+            ShapeBorder border = m_Border;
+
+            using (GraphicsPath path = m_Path.Clone() as GraphicsPath)
+            {
+                path.Transform(new Matrix(1, 0, 0, 1, r.X, r.Y));
+                DisplayHelp.DrawGradientPathBorder(g, path, border.Color1, border.Color2, border.GradientAngle, border.Width);
+            }
+        }
+
+        /// <summary>
+        /// Paints the border.
+        /// </summary>
+        protected virtual void PaintFill(Graphics g, System.Drawing.Rectangle r)
+        {
+            if (r.Width <= 0 || r.Height <= 0 || m_Fill==null)
+                return;
+
+
+            using (GraphicsPath path = m_Path.Clone() as GraphicsPath)
+            {
+                // Center path inside of the bounds by default
+                System.Drawing.Rectangle pathBounds = System.Drawing.Rectangle.Ceiling(path.GetBounds());
+                int w = r.X + (int)Math.Ceiling((double)(Math.Max(r.Width, pathBounds.Width) - pathBounds.Width) / 2);
+                int h = r.Y + (r.Height - pathBounds.Height) / 2;
+                using (Matrix matrix = new Matrix(1, 0, 0, 1, w, h))
+                    path.Transform(matrix);
+                pathBounds = System.Drawing.Rectangle.Ceiling(path.GetBounds());
+
+                Brush brush = m_Fill.CreateBrush(pathBounds);
+                if (brush != null)
+                {
+                    g.FillPath(brush, path);
+
+                    brush.Dispose();
+                }
+            }
+        }
+
+        //protected override Region ClipChildren(Graphics g, System.Drawing.Rectangle childBounds)
+        //{
+        //    if (m_CornerSize > 0)
+        //    {
+        //        Region clip = g.Clip;
+        //        g.SetClip(DisplayHelp.GetRoundedRectanglePath(childBounds, m_CornerSize, eStyleBackgroundPathPart.Complete, m_TopLeftCornerType,
+        //            m_TopRightCornerType, m_BottomLeftCornerType, m_BottomRightCornerType));
+        //        return clip;
+        //    }
+
+        //    return base.ClipChildren(g, childBounds);
+        //}
+
+        /// <summary>
+        /// Gets the shape border.
+        /// </summary>
+        public ShapeBorder Border
+        {
+            get { return m_Border; }
+            set { m_Border = value; }
+        }
+
+        /// <summary>
+        /// Gets the shape fill.
+        /// </summary>
+        public ShapeFill Fill
+        {
+            get { return m_Fill; }
+            set { m_Fill = value; }
+        }
+        #endregion
+        
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Presentation/SizeInfo.cs b/PROMS/DotNetBar Source Code/Presentation/SizeInfo.cs
new file mode 100644
index 00000000..7b756db8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Presentation/SizeInfo.cs	
@@ -0,0 +1,35 @@
+using System;
+using System.Text;
+
+namespace DevComponents.DotNetBar.Presentation
+{
+    /// <summary>
+    /// Describes shape size.
+    /// </summary>
+    internal class SizeInfo
+    {
+        /// <summary>
+        /// Gets or sets the width of the shape. When RelativeWidth is specified then number specifed here is added to the actual shape width.
+        /// </summary>
+        public int Width = 0;
+        /// <summary>
+        /// Gets or sets the height of the shape. When RelativeHeight is specified the number specified here is added to the actual shape height.
+        /// </summary>
+        public int Height = 0;
+        /// <summary>
+        /// Gets or sets the relative shape width.
+        /// </summary>
+        public eRelativeSize RelativeWidth = eRelativeSize.NotSet;
+        /// <summary>
+        /// Gets or sets the relative shape height.
+        /// </summary>
+        public eRelativeSize RelativeHeight = eRelativeSize.NotSet;
+    }
+
+    internal enum eRelativeSize
+    {
+        NotSet,
+        Width,
+        Height
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Primitives/CustomCollection.cs b/PROMS/DotNetBar Source Code/Primitives/CustomCollection.cs
new file mode 100644
index 00000000..22405722
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Primitives/CustomCollection.cs	
@@ -0,0 +1,1336 @@
+using System;
+using System.Collections.Generic;
+using System.Collections;
+using System.Diagnostics;
+using System.Runtime.InteropServices;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar.Primitives
+{
+    /// <summary>
+    /// Represents custom collection with INotifyPropertyChanged and INotifyCollectionChanged interface support.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    [Serializable, DebuggerDisplay("Count = {Count}"), ComVisible(false)]
+    public class CustomCollection<T> : IList<T>, IList, INotifyPropertyChanged, INotifyCollectionChanged
+    {
+        #region Events
+        /// <summary>
+        /// Occurs when property value has changed.
+        /// </summary>
+        public event PropertyChangedEventHandler PropertyChanged;
+        #endregion
+
+        #region Private variables
+
+        private SimpleMonitor _monitor;
+        private object _SyncRoot;
+        private readonly IList<T> _Items;
+        private bool _FloatLastItem;
+
+        #endregion
+
+        #region Constructors
+
+        /// <summary>
+        /// Creates new instance of object.
+        /// </summary>
+        public CustomCollection()
+        {
+            _monitor = new SimpleMonitor();
+            _Items = new List<T>();
+        }
+
+        public void Dispose()
+        {
+            _monitor.Dispose();
+        }
+
+        /// <summary>
+        /// Creates new instance of object.
+        /// </summary>
+        public CustomCollection(int capacity)
+        {
+            _monitor = new SimpleMonitor();
+            _Items = new List<T>(capacity);
+        }
+
+        /// <summary>
+        /// Creates new instance of object.
+        /// </summary>
+        /// <param name="list">List to initialize collection with.</param>
+        public CustomCollection(IList<T> list)
+        {
+            if (list == null)
+                throw new ArgumentNullException("list");
+
+            _monitor = new SimpleMonitor();
+            _Items = list;
+        }
+
+        #endregion
+
+        #region Add
+
+        /// <summary>
+        /// Add item to collection.
+        /// </summary>
+        /// <param name="item">Item to add.</param>
+        public void Add(T item)
+        {
+            if (_Items.IsReadOnly)
+                throw new NotSupportedException("collection is read-only");
+
+            InsertItem(_Items.Count, item);
+        }
+
+        #endregion
+
+        #region Sort
+        //
+        // Summary:
+        //     Sorts the elements in the entire collection using
+        //     the default comparer.
+        //
+        // Exceptions:
+        //   System.InvalidOperationException:
+        //     The default comparer System.Collections.Generic.Comparer<T>.Default cannot
+        //     find an implementation of the System.IComparable<T> generic interface or
+        //     the System.IComparable interface for type T.
+        public void Sort()
+        {
+            if (_Items.IsReadOnly)
+                throw new NotSupportedException("collection is read-only");
+            if(!(_Items is List<T>))
+                throw new NotSupportedException("collection must be default List collection");
+            ((List<T>)_Items).Sort();
+            OnCollectionChanged(NotifyCollectionChangedAction.Reset, null, -1);
+        }
+
+        //
+        // Summary:
+        //     Reverse sorts the elements in the entire collection.
+        //
+        public void SortReverse()
+        {
+            if (_Items.IsReadOnly)
+                throw new NotSupportedException("collection is read-only");
+            if (!(_Items is List<T>))
+                throw new NotSupportedException("collection must be default List collection");
+            ((List<T>)_Items).Sort();
+            ((List<T>)_Items).Reverse();
+            OnCollectionChanged(NotifyCollectionChangedAction.Reset, null, -1);
+        }
+
+        //
+        // Summary:
+        //     Sorts the elements in the entire collection using
+        //     the specified System.Comparison<T>.
+        //
+        // Parameters:
+        //   comparison:
+        //     The System.Comparison<T> to use when comparing elements.
+        //
+        // Exceptions:
+        //   System.ArgumentNullException:
+        //     comparison is null.
+        //
+        //   System.ArgumentException:
+        //     The implementation of comparison caused an error during the sort. For example,
+        //     comparison might not return 0 when comparing an item with itself.
+        public void Sort(Comparison<T> comparison)
+        {
+            if (_Items.IsReadOnly)
+                throw new NotSupportedException("collection is read-only");
+            if (!(_Items is List<T>))
+                throw new NotSupportedException("collection must be default List collection");
+            ((List<T>)_Items).Sort(comparison);
+            OnCollectionChanged(NotifyCollectionChangedAction.Reset, null, -1);
+        }
+        //
+        // Summary:
+        //     Sorts the elements in the entire System.Collections.Generic.List<T> using
+        //     the specified comparer.
+        //
+        // Parameters:
+        //   comparer:
+        //     The System.Collections.Generic.IComparer<T> implementation to use when comparing
+        //     elements, or null to use the default comparer System.Collections.Generic.Comparer<T>.Default.
+        //
+        // Exceptions:
+        //   System.InvalidOperationException:
+        //     comparer is null, and the default comparer System.Collections.Generic.Comparer<T>.Default
+        //     cannot find implementation of the System.IComparable<T> generic interface
+        //     or the System.IComparable interface for type T.
+        //
+        //   System.ArgumentException:
+        //     The implementation of comparer caused an error during the sort. For example,
+        //     comparer might not return 0 when comparing an item with itself.
+        public void Sort(IComparer<T> comparer)
+        {
+            if (_Items.IsReadOnly)
+                throw new NotSupportedException("collection is read-only");
+            if (!(_Items is List<T>))
+                throw new NotSupportedException("collection must be default List collection");
+            ((List<T>)_Items).Sort(comparer);
+            OnCollectionChanged(NotifyCollectionChangedAction.Reset, null, -1);
+        }
+        //
+        // Summary:
+        //     Sorts the elements in a range of elements in System.Collections.Generic.List<T>
+        //     using the specified comparer.
+        //
+        // Parameters:
+        //   index:
+        //     The zero-based starting index of the range to sort.
+        //
+        //   count:
+        //     The length of the range to sort.
+        //
+        //   comparer:
+        //     The System.Collections.Generic.IComparer<T> implementation to use when comparing
+        //     elements, or null to use the default comparer System.Collections.Generic.Comparer<T>.Default.
+        //
+        // Exceptions:
+        //   System.ArgumentOutOfRangeException:
+        //     index is less than 0.-or-count is less than 0.
+        //
+        //   System.ArgumentException:
+        //     index and count do not specify a valid range in the System.Collections.Generic.List<T>.-or-The
+        //     implementation of comparer caused an error during the sort. For example,
+        //     comparer might not return 0 when comparing an item with itself.
+        //
+        //   System.InvalidOperationException:
+        //     comparer is null, and the default comparer System.Collections.Generic.Comparer<T>.Default
+        //     cannot find implementation of the System.IComparable<T> generic interface
+        //     or the System.IComparable interface for type T.
+        public void Sort(int index, int count, IComparer<T> comparer)
+        {
+            if (_Items.IsReadOnly)
+                throw new NotSupportedException("collection is read-only");
+            if (!(_Items is List<T>))
+                throw new NotSupportedException("collection must be default List collection");
+            ((List<T>)_Items).Sort(index, count, comparer);
+            OnCollectionChanged(NotifyCollectionChangedAction.Reset, null, -1);
+        }
+        #endregion
+
+        #region Clear
+
+        /// <summary>
+        /// Remove all items from collection.
+        /// </summary>
+        public void Clear()
+        {
+            if (_Items.IsReadOnly)
+                throw new NotSupportedException("collection is read-only");
+
+            ClearItems();
+        }
+
+        /// <summary>
+        /// Remove all items from collection.
+        /// </summary>
+        protected virtual void ClearItems()
+        {
+            CheckReentrancy();
+
+            T item = default(T);
+
+            if (_FloatLastItem == true)
+            {
+                if (_Items.Count > 0)
+                    item = _Items[_Items.Count - 1];
+            }
+
+            _Items.Clear();
+
+            OnPropertyChanged(new PropertyChangedEventArgs(CountString));
+            OnPropertyChanged(new PropertyChangedEventArgs(ItemString));
+
+            OnCollectionReset();
+
+            if (_FloatLastItem == true)
+                _Items.Add(item);
+        }
+
+        #endregion
+
+        #region Contains
+
+        /// <summary>
+        /// Checks whether collection contains item.
+        /// </summary>
+        /// <param name="item">Item to look for.</param>
+        /// <returns>true if item is in collection.</returns>
+        public bool Contains(T item)
+        {
+            OnCollectionReadAccess();
+
+            return (_Items.Contains(item));
+        }
+
+        #endregion
+
+        #region CopyTo
+
+        /// <summary>
+        /// Copy collection to array.
+        /// </summary>
+        /// <param name="array">Array to copy to.</param>
+        /// <param name="index">Index to copy from.</param>
+        public void CopyTo(T[] array, int index)
+        {
+            OnCollectionReadAccess();
+
+            _Items.CopyTo(array, index);
+        }
+        /// <summary>
+        /// Copy collection to array.
+        /// </summary>
+        /// <param name="array">Array to copy to.</param>
+        public void CopyTo(T[] array)
+        {
+            CopyTo(array, 0);
+        }
+
+        #endregion
+
+        #region Count
+
+        /// <summary>
+        /// Returns number of items in collection.
+        /// </summary>
+        public int Count
+        {
+            get
+            {
+                OnCollectionReadAccess();
+
+                return (_Items.Count);
+            }
+        }
+
+        #endregion
+
+        #region CountString
+
+        private string CountString
+        {
+            get { return ("Count"); }
+        }
+
+        #endregion
+
+        #region FloatLastItem
+
+        internal bool FloatLastItem
+        {
+            get { return (_FloatLastItem); }
+            set { _FloatLastItem = value; }
+        }
+
+        #endregion
+
+        #region GetEnumerator
+
+        /// <summary>
+        /// Gets enumerator for collection.
+        /// </summary>
+        /// <returns>Enumerator.</returns>
+        public IEnumerator<T> GetEnumerator()
+        {
+            OnCollectionReadAccess();
+
+            return (_Items.GetEnumerator());
+        }
+
+        #endregion
+
+        #region Indexer[int]
+
+        /// <summary>
+        /// Returns item at index.
+        /// </summary>
+        /// <param name="index">Index of item.</param>
+        /// <returns>Item at index.</returns>
+        public T this[int index]
+        {
+            get
+            {
+                OnCollectionReadAccess();
+
+                return (_Items[index]);
+            }
+
+            set
+            {
+                if (_Items.IsReadOnly)
+                    throw new NotSupportedException("collection is read-only");
+
+                if ((index < 0) || (index >= _Items.Count))
+                    throw new ArgumentOutOfRangeException();
+
+                SetItem(index, value);
+            }
+        }
+
+        #endregion
+
+        #region IndexOf
+
+        /// <summary>
+        /// Returns index of an item.
+        /// </summary>
+        /// <param name="item">Reference to item.</param>
+        /// <returns>Index of item.</returns>
+        public int IndexOf(T item)
+        {
+            OnCollectionReadAccess();
+            return (_Items.IndexOf(item));
+        }
+
+        #endregion
+
+        #region Insert
+
+        /// <summary>
+        /// Insert item at specified location.
+        /// </summary>
+        /// <param name="index">Index to insert item in.</param>
+        /// <param name="item">Item to insert.</param>
+        public void Insert(int index, T item)
+        {
+            if ((index < 0) || (index > this._Items.Count))
+                throw new ArgumentOutOfRangeException("index");
+
+            InsertItem(index, item);
+        }
+
+        #endregion
+
+        #region InsertItem
+
+        /// <summary>
+        /// Inserts item.
+        /// </summary>
+        /// <param name="index">Index to insert item at.</param>
+        /// <param name="item">Reference to item.</param>
+        protected virtual void InsertItem(int index, T item)
+        {
+            CheckReentrancy();
+
+            if (_FloatLastItem == true)
+            {
+                if (_Items.Count > 0 && index == _Items.Count)
+                    index--;
+            }
+
+            _Items.Insert(index, item);
+
+            OnPropertyChanged(new PropertyChangedEventArgs(CountString));
+            OnCollectionChanged(NotifyCollectionChangedAction.Add, item, index);
+        }
+
+        #endregion
+
+        #region IsCompatibleObject
+
+        private static bool IsCompatibleObject(object value)
+        {
+            return (value is T) || (value == null && !typeof(T).IsValueType);
+        }
+
+        #endregion
+
+        #region ItemString
+
+        private string ItemString
+        {
+            get { return ("Item[]"); }
+        }
+
+        #endregion
+
+        #region Remove
+
+        /// <summary>
+        /// Removes item from collection.
+        /// </summary>
+        /// <param name="item">Item to remove.</param>
+        /// <returns>true if item was removed.</returns>
+        public bool Remove(T item)
+        {
+            if (_Items.IsReadOnly)
+                throw new NotSupportedException("collection is read-only");
+
+            int index = _Items.IndexOf(item);
+
+            if (index < 0)
+                return (false);
+
+            RemoveItem(index);
+
+            return (true);
+        }
+
+        #endregion
+
+        #region RemoveAt
+
+        /// <summary>
+        /// Remove item at specified location.
+        /// </summary>
+        /// <param name="index">Index of item to remove.</param>
+        public void RemoveAt(int index)
+        {
+            if (_Items.IsReadOnly)
+                throw new NotSupportedException("collection is read-only");
+
+            if ((index < 0) || (index >= _Items.Count))
+                throw new ArgumentOutOfRangeException();
+
+            RemoveItem(index);
+        }
+
+        #endregion
+
+        #region RemoveItem
+
+        /// <summary>
+        /// Remove item at specified location.
+        /// </summary>
+        /// <param name="index">Index of item to remove.</param>
+        protected virtual void RemoveItem(int index)
+        {
+            CheckReentrancy();
+
+            object item = _Items[index];
+            _Items.RemoveAt(index);
+
+            OnPropertyChanged(new PropertyChangedEventArgs(CountString));
+            OnCollectionChanged(NotifyCollectionChangedAction.Remove, item, index);
+        }
+
+        #endregion
+
+        #region SetItem
+
+        /// <summary>
+        /// Set item on location.
+        /// </summary>
+        /// <param name="index">Index</param>
+        /// <param name="item">Item to assign.</param>
+        protected virtual void SetItem(int index, T item)
+        {
+            CheckReentrancy();
+
+            T oldItem = _Items[index];
+            _Items[index] = item;
+
+            OnPropertyChanged(new PropertyChangedEventArgs(CountString));
+            OnPropertyChanged(new PropertyChangedEventArgs(ItemString));
+
+            OnCollectionChanged(NotifyCollectionChangedAction.Replace, oldItem, item, index);
+        }
+
+        #endregion
+
+        #region IList support
+
+        #region Add
+
+        int IList.Add(object value)
+        {
+            if (_Items.IsReadOnly)
+                throw new NotSupportedException("collection is read-only");
+
+            VerifyValueType(value);
+
+            Add((T)value);
+
+            return (Count - 1);
+        }
+
+        #endregion
+
+        #region Contains
+
+        bool IList.Contains(object value)
+        {
+            return (IsCompatibleObject(value) && Contains((T)value));
+        }
+
+        #endregion
+
+        #region GetItemsDirect
+
+        /// <summary>
+        /// Returns items directly without checks.
+        /// </summary>
+        /// <returns>List of items.</returns>
+        protected IList<T> GetItemsDirect()
+        {
+            return (_Items);
+        }
+
+        #endregion
+
+        #region Indexer[int]
+
+        object IList.this[int index]
+        {
+            get
+            {
+                OnCollectionReadAccess();
+                return this._Items[index];
+            }
+            set
+            {
+                VerifyValueType(value);
+                this[index] = (T)value;
+            }
+        }
+
+        #region IndexOf
+
+        int IList.IndexOf(object value)
+        {
+            OnCollectionReadAccess();
+
+            return (IsCompatibleObject(value) ? IndexOf((T)value) : -1);
+        }
+
+        #endregion
+
+        #region Insert
+
+        void IList.Insert(int index, object value)
+        {
+            if (this._Items.IsReadOnly)
+                throw new NotSupportedException("collection is read-only");
+
+            VerifyValueType(value);
+
+            Insert(index, (T)value);
+        }
+
+        #endregion
+
+        #region IsFixedSize
+
+        bool IList.IsFixedSize
+        {
+            get
+            {
+                IList items = _Items as IList;
+
+                return ((items != null) && items.IsFixedSize);
+            }
+        }
+
+        #endregion
+
+        #region IsReadOnly
+
+        bool IList.IsReadOnly
+        {
+            get { return (_Items.IsReadOnly); }
+        }
+
+        #endregion
+
+        #region Items
+
+        /// <summary>
+        /// Returns the IList interface for items in collection.
+        /// </summary>
+        protected IList<T> Items
+        {
+            get
+            {
+                OnCollectionReadAccess();
+
+                return (_Items);
+            }
+        }
+
+        #endregion
+
+        #region Remove
+
+        void IList.Remove(object value)
+        {
+            if (_Items.IsReadOnly)
+                throw new NotSupportedException("collection is read-only");
+
+            if (IsCompatibleObject(value))
+                Remove((T)value);
+        }
+
+        #endregion
+
+
+
+        #endregion
+
+        #region VerifyValueType
+
+        private static void VerifyValueType(object value)
+        {
+            if (!IsCompatibleObject(value))
+                throw new ArgumentException("value is of wrong type");
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IEnumerable.GetEnumerator
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            OnCollectionReadAccess();
+
+            return (_Items.GetEnumerator());
+        }
+
+        #endregion
+
+        #region ICollection support
+
+        #region CopyTo
+
+        void ICollection.CopyTo(Array array, int index)
+        {
+            CheckReentrancy();
+            OnCollectionReadAccess();
+
+            if (array == null)
+                throw new ArgumentNullException("array");
+
+            if (array.Rank != 1)
+                throw new ArgumentException("Argument array.Rank multi-dimensional not supported");
+
+            if (array.GetLowerBound(0) != 0)
+                throw new ArgumentException("Argument array non zero lower bound not supported");
+
+            if (index < 0)
+                throw new ArgumentOutOfRangeException("index", "index must be non-negative number");
+
+            if ((array.Length - index) < this.Count)
+                throw new ArgumentException("array too small");
+
+            T[] localArray = array as T[];
+
+            if (localArray != null)
+            {
+                _Items.CopyTo(localArray, index);
+            }
+            else
+            {
+                Type elementType = array.GetType().GetElementType();
+                Type c = typeof(T);
+
+                if (elementType == null ||
+                    (!elementType.IsAssignableFrom(c) && !c.IsAssignableFrom(elementType)))
+                {
+                    throw new ArgumentException("Argument array of invalid type");
+                }
+
+                object[] objArray = array as object[];
+
+                if (objArray == null)
+                    throw new ArgumentException("Argument array invalid type");
+
+                int count = this._Items.Count;
+
+                try
+                {
+                    for (int i = 0; i < count; i++)
+                        objArray[index++] = this._Items[i];
+                }
+                catch (ArrayTypeMismatchException)
+                {
+                    throw new ArgumentException("Argument array invalid type");
+                }
+            }
+        }
+
+        #endregion
+
+        #region IsSynchronized
+
+        bool ICollection.IsSynchronized
+        {
+            get { return false; }
+        }
+
+        #endregion
+
+        #region IsReadOnly
+
+        bool ICollection<T>.IsReadOnly
+        {
+            get { return this._Items.IsReadOnly; }
+        }
+
+        #endregion
+
+        #region SyncRoot
+
+        object ICollection.SyncRoot
+        {
+            get
+            {
+                if (_SyncRoot == null)
+                {
+                    ICollection items = _Items as ICollection;
+
+                    if (items != null)
+                        _SyncRoot = items.SyncRoot;
+                    else
+                        System.Threading.Interlocked.CompareExchange(ref _SyncRoot, new object(), null);
+                }
+
+                return (_SyncRoot);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region OnCollectionReadAccess
+
+        /// <summary>
+        /// Occurs when collection is read.
+        /// </summary>
+        protected virtual void OnCollectionReadAccess()
+        {
+        }
+
+        #endregion
+
+        #region OnPropertyChanged
+
+        /// <summary>
+        /// Occurs when collection property has changed.
+        /// </summary>
+        /// <param name="e">Event arguments.</param>
+        protected virtual void OnPropertyChanged(PropertyChangedEventArgs e)
+        {
+            if (PropertyChanged != null)
+                PropertyChanged(this, e);
+        }
+
+        #endregion
+
+        #region BlockReentrancy
+
+        /// <summary>
+        /// Blocks the collection reentrancy.
+        /// </summary>
+        /// <returns>IDisposable to end re-entrancy</returns>
+        protected IDisposable BlockReentrancy()
+        {
+            _monitor.Enter();
+
+            return (_monitor);
+        }
+
+        #endregion
+
+        #region CheckReentrancy
+
+        /// <summary>
+        /// Checks whether call creates reentrancy.
+        /// </summary>
+        protected void CheckReentrancy()
+        {
+            if ((_monitor.Busy && (CollectionChanged != null)) &&
+                (CollectionChanged.GetInvocationList().Length > 1))
+            {
+                throw new InvalidOperationException("CustomCollectionReentrancyNotAllowed");
+            }
+        }
+
+        #endregion
+
+        #region SimpleMonitor
+
+        [Serializable]
+        private class SimpleMonitor : IDisposable
+        {
+            // Fields
+            private int _BusyCount;
+
+            // Methods
+            public void Dispose()
+            {
+                _BusyCount--;
+            }
+
+            public void Enter()
+            {
+                _BusyCount++;
+            }
+
+            // Properties
+            public bool Busy
+            {
+                get { return (_BusyCount > 0); }
+            }
+        }
+        #endregion
+
+        #region INotifyCollectionChanged Members
+
+        /// <summary>
+        /// Occurs when collection has changed.
+        /// </summary>
+        public event NotifyCollectionChangedEventHandler CollectionChanged;
+
+        private void OnCollectionChanged(NotifyCollectionChangedAction action, object item, int index)
+        {
+            this.OnCollectionChanged(new NotifyCollectionChangedEventArgs(action, item, index));
+        }
+
+        private void OnCollectionChanged(NotifyCollectionChangedAction action, object oldItem, object newItem, int index)
+        {
+            this.OnCollectionChanged(new NotifyCollectionChangedEventArgs(action, newItem, oldItem, index));
+        }
+
+        private void OnCollectionReset()
+        {
+            this.OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset));
+        }
+
+        /// <summary>
+        /// Called when collection has changed.
+        /// </summary>
+        /// <param name="e">Event arguments.</param>
+        protected virtual void OnCollectionChanged(NotifyCollectionChangedEventArgs e)
+        {
+            if (this.CollectionChanged != null)
+            {
+                using (this.BlockReentrancy())
+                {
+                    this.CollectionChanged(this, e);
+                }
+            }
+        }
+        #endregion
+    }
+
+    #region INotifyCollectionChanged
+    /// <summary>
+    /// Represents collection changed notification interface.
+    /// </summary>
+    public interface INotifyCollectionChanged
+    {
+        /// <summary>
+        /// Occurs when collection changed.
+        /// </summary>
+        event NotifyCollectionChangedEventHandler CollectionChanged;
+    }
+    /// <summary>
+    /// Defines change actions.
+    /// </summary>
+    public enum NotifyCollectionChangedAction
+    {
+        /// <summary>
+        /// Items were added.
+        /// </summary>
+        Add,
+        /// <summary>
+        /// Items were removed.
+        /// </summary>
+        Remove,
+        /// <summary>
+        /// Items were replaced.
+        /// </summary>
+        Replace,
+        /// <summary>
+        /// Items were moved.
+        /// </summary>
+        Move,
+        /// <summary>
+        /// Collection was reset.
+        /// </summary>
+        Reset
+    }
+    /// <summary>
+    /// Defines delegate for collection notification events.
+    /// </summary>
+    /// <param name="sender">Event sender.</param>
+    /// <param name="e">Event arguments.</param>
+    public delegate void NotifyCollectionChangedEventHandler(object sender, NotifyCollectionChangedEventArgs e);
+    /// <summary>
+    /// Defines collection change notification event arguments.
+    /// </summary>
+    public class NotifyCollectionChangedEventArgs : EventArgs
+    {
+        #region Private Vars
+
+        private NotifyCollectionChangedAction _Action;
+        private IList _NewItems;
+        private int _NewStartingIndex;
+        private IList _OldItems;
+        private int _OldStartingIndex;
+
+        #endregion
+
+        /// <summary>
+        /// Create new instance of object.
+        /// </summary>
+        /// <param name="action">Action</param>
+        public NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction action)
+        {
+            this._NewStartingIndex = -1;
+            this._OldStartingIndex = -1;
+            if (action != NotifyCollectionChangedAction.Reset)
+            {
+                throw new ArgumentException("WrongActionForCtor");
+            }
+            this.InitializeAdd(action, null, -1);
+        }
+        /// <summary>
+        /// Creates new instance of object.
+        /// </summary>
+        /// <param name="action">Specifies action.</param>
+        /// <param name="changedItems">List of changed items.</param>
+        public NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction action, IList changedItems)
+        {
+            this._NewStartingIndex = -1;
+            this._OldStartingIndex = -1;
+            if (((action != NotifyCollectionChangedAction.Add) && (action != NotifyCollectionChangedAction.Remove)) && (action != NotifyCollectionChangedAction.Reset))
+            {
+                throw new ArgumentException("MustBeResetAddOrRemoveActionForCtor");
+            }
+            if (action == NotifyCollectionChangedAction.Reset)
+            {
+                if (changedItems != null)
+                {
+                    throw new ArgumentException("ResetActionRequiresNullItem");
+                }
+                this.InitializeAdd(action, null, -1);
+            }
+            else
+            {
+                if (changedItems == null)
+                {
+                    throw new ArgumentNullException("changedItems");
+                }
+                this.InitializeAddOrRemove(action, changedItems, -1);
+            }
+        }
+        /// <summary>
+        /// Creates new instance of object.
+        /// </summary>
+        /// <param name="action">Specifies action.</param>
+        /// <param name="changedItem">Item that was changed.</param>
+        public NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction action, object changedItem)
+        {
+            this._NewStartingIndex = -1;
+            this._OldStartingIndex = -1;
+            if (((action != NotifyCollectionChangedAction.Add) && (action != NotifyCollectionChangedAction.Remove)) && (action != NotifyCollectionChangedAction.Reset))
+            {
+                throw new ArgumentException("MustBeResetAddOrRemoveActionForCtor");
+            }
+            if (action == NotifyCollectionChangedAction.Reset)
+            {
+                if (changedItem != null)
+                {
+                    throw new ArgumentException("ResetActionRequiresNullItem");
+                }
+                this.InitializeAdd(action, null, -1);
+            }
+            else
+            {
+                this.InitializeAddOrRemove(action, new object[] { changedItem }, -1);
+            }
+        }
+
+        /// <summary>
+        /// Creates new instance of object.
+        /// </summary>
+        /// <param name="action">Action.</param>
+        /// <param name="newItems">New items in collection.</param>
+        /// <param name="oldItems">Old items in collection.</param>
+        public NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction action, IList newItems, IList oldItems)
+        {
+            this._NewStartingIndex = -1;
+            this._OldStartingIndex = -1;
+            if (action != NotifyCollectionChangedAction.Replace)
+            {
+                throw new ArgumentException("WrongActionForCtor");
+            }
+            if (newItems == null)
+            {
+                throw new ArgumentNullException("newItems");
+            }
+            if (oldItems == null)
+            {
+                throw new ArgumentNullException("oldItems");
+            }
+            this.InitializeMoveOrReplace(action, newItems, oldItems, -1, -1);
+        }
+        /// <summary>
+        /// Creates new instance of object.
+        /// </summary>
+        /// <param name="action">Action.</param>
+        /// <param name="changedItems">List of changed items.</param>
+        /// <param name="startingIndex">Starting index of change.</param>
+        public NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction action, IList changedItems, int startingIndex)
+        {
+            this._NewStartingIndex = -1;
+            this._OldStartingIndex = -1;
+            if (((action != NotifyCollectionChangedAction.Add) && (action != NotifyCollectionChangedAction.Remove)) && (action != NotifyCollectionChangedAction.Reset))
+            {
+                throw new ArgumentException("MustBeResetAddOrRemoveActionForCtor");
+            }
+            if (action == NotifyCollectionChangedAction.Reset)
+            {
+                if (changedItems != null)
+                {
+                    throw new ArgumentException("ResetActionRequiresNullItem");
+                }
+                if (startingIndex != -1)
+                {
+                    throw new ArgumentException("ResetActionRequiresIndexMinus1");
+                }
+                this.InitializeAdd(action, null, -1);
+            }
+            else
+            {
+                if (changedItems == null)
+                {
+                    throw new ArgumentNullException("changedItems");
+                }
+                if (startingIndex < -1)
+                {
+                    throw new ArgumentException("IndexCannotBeNegative");
+                }
+                this.InitializeAddOrRemove(action, changedItems, startingIndex);
+            }
+        }
+        /// <summary>
+        /// Creates new instance of object.
+        /// </summary>
+        /// <param name="action">Action</param>
+        /// <param name="changedItem">Changed item</param>
+        /// <param name="index">Index of change</param>
+        public NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction action, object changedItem, int index)
+        {
+            this._NewStartingIndex = -1;
+            this._OldStartingIndex = -1;
+            if (((action != NotifyCollectionChangedAction.Add) && (action != NotifyCollectionChangedAction.Remove)) && (action != NotifyCollectionChangedAction.Reset))
+            {
+                throw new ArgumentException("MustBeResetAddOrRemoveActionForCtor");
+            }
+            if (action == NotifyCollectionChangedAction.Reset)
+            {
+                if (changedItem != null)
+                {
+                    throw new ArgumentException("ResetActionRequiresNullItem");
+                }
+                if (index != -1)
+                {
+                    throw new ArgumentException("ResetActionRequiresIndexMinus1");
+                }
+                this.InitializeAdd(action, null, -1);
+            }
+            else
+            {
+                this.InitializeAddOrRemove(action, new object[] { changedItem }, index);
+            }
+        }
+        /// <summary>
+        /// Creates new instance of object.
+        /// </summary>
+        /// <param name="action">Action</param>
+        /// <param name="newItem">New item</param>
+        /// <param name="oldItem">Old item</param>
+        public NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction action, object newItem, object oldItem)
+        {
+            this._NewStartingIndex = -1;
+            this._OldStartingIndex = -1;
+            if (action != NotifyCollectionChangedAction.Replace)
+            {
+                throw new ArgumentException("WrongActionForCtor");
+            }
+            this.InitializeMoveOrReplace(action, new object[] { newItem }, new object[] { oldItem }, -1, -1);
+        }
+        /// <summary>
+        /// Creates new instance of object.
+        /// </summary>
+        /// <param name="action">Action</param>
+        /// <param name="newItems">New items.</param>
+        /// <param name="oldItems">Removed items.</param>
+        /// <param name="startingIndex">Starting index of change.</param>
+        public NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction action, IList newItems, IList oldItems, int startingIndex)
+        {
+            this._NewStartingIndex = -1;
+            this._OldStartingIndex = -1;
+            if (action != NotifyCollectionChangedAction.Replace)
+            {
+                throw new ArgumentException("WrongActionForCtor");
+            }
+            if (newItems == null)
+            {
+                throw new ArgumentNullException("newItems");
+            }
+            if (oldItems == null)
+            {
+                throw new ArgumentNullException("oldItems");
+            }
+            this.InitializeMoveOrReplace(action, newItems, oldItems, startingIndex, startingIndex);
+        }
+        /// <summary>
+        /// Creates new instance of object.
+        /// </summary>
+        /// <param name="action">Action</param>
+        /// <param name="changedItems">Changed items</param>
+        /// <param name="index">New index</param>
+        /// <param name="oldIndex">Old index</param>
+        public NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction action, IList changedItems, int index, int oldIndex)
+        {
+            this._NewStartingIndex = -1;
+            this._OldStartingIndex = -1;
+            if (action != NotifyCollectionChangedAction.Move)
+            {
+                throw new ArgumentException("WrongActionForCtor");
+            }
+            if (index < 0)
+            {
+                throw new ArgumentException("IndexCannotBeNegative");
+            }
+            this.InitializeMoveOrReplace(action, changedItems, changedItems, index, oldIndex);
+        }
+        /// <summary>
+        /// Creates new instance of object.
+        /// </summary>
+        /// <param name="action">Action</param>
+        /// <param name="changedItem">Changed item</param>
+        /// <param name="index">New index</param>
+        /// <param name="oldIndex">Old index</param>
+        public NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction action, object changedItem, int index, int oldIndex)
+        {
+            this._NewStartingIndex = -1;
+            this._OldStartingIndex = -1;
+            if (action != NotifyCollectionChangedAction.Move)
+            {
+                throw new ArgumentException("WrongActionForCtor");
+            }
+            if (index < 0)
+            {
+                throw new ArgumentException("IndexCannotBeNegative");
+            }
+            object[] newItems = new object[] { changedItem };
+            this.InitializeMoveOrReplace(action, newItems, newItems, index, oldIndex);
+        }
+        /// <summary>
+        /// Creates new instance of object.
+        /// </summary>
+        /// <param name="action">Action.</param>
+        /// <param name="newItem">New item</param>
+        /// <param name="oldItem">Old item</param>
+        /// <param name="index">New index</param>
+        public NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction action, object newItem, object oldItem, int index)
+        {
+            this._NewStartingIndex = -1;
+            this._OldStartingIndex = -1;
+            if (action != NotifyCollectionChangedAction.Replace)
+            {
+                throw new ArgumentException("WrongActionForCtor");
+            }
+            this.InitializeMoveOrReplace(action, new object[] { newItem }, new object[] { oldItem }, index, index);
+        }
+
+        private void InitializeAdd(NotifyCollectionChangedAction action, IList newItems, int newStartingIndex)
+        {
+            this._Action = action;
+            this._NewItems = (newItems == null) ? null : ArrayList.ReadOnly(newItems);
+            this._NewStartingIndex = newStartingIndex;
+        }
+
+        private void InitializeAddOrRemove(NotifyCollectionChangedAction action, IList changedItems, int startingIndex)
+        {
+            if (action == NotifyCollectionChangedAction.Add)
+            {
+                this.InitializeAdd(action, changedItems, startingIndex);
+            }
+            else if (action == NotifyCollectionChangedAction.Remove)
+            {
+                this.InitializeRemove(action, changedItems, startingIndex);
+            }
+        }
+
+        private void InitializeMoveOrReplace(NotifyCollectionChangedAction action, IList newItems, IList oldItems, int startingIndex, int oldStartingIndex)
+        {
+            this.InitializeAdd(action, newItems, startingIndex);
+            this.InitializeRemove(action, oldItems, oldStartingIndex);
+        }
+
+        private void InitializeRemove(NotifyCollectionChangedAction action, IList oldItems, int oldStartingIndex)
+        {
+            this._Action = action;
+            this._OldItems = (oldItems == null) ? null : ArrayList.ReadOnly(oldItems);
+            this._OldStartingIndex = oldStartingIndex;
+        }
+
+        /// <summary>
+        /// Gets the type of the collection change action.
+        /// </summary>
+        public NotifyCollectionChangedAction Action
+        {
+            get
+            {
+                return this._Action;
+            }
+        }
+        /// <summary>
+        /// Gets list of newly added items.
+        /// </summary>
+        public IList NewItems
+        {
+            get
+            {
+                return this._NewItems;
+            }
+        }
+        /// <summary>
+        /// Gets new starting index.
+        /// </summary>
+        public int NewStartingIndex
+        {
+            get
+            {
+                return this._NewStartingIndex;
+            }
+        }
+        /// <summary>
+        /// Gets list of removed items.
+        /// </summary>
+        public IList OldItems
+        {
+            get
+            {
+                return this._OldItems;
+            }
+        }
+        /// <summary>
+        /// Old starting index.
+        /// </summary>
+        public int OldStartingIndex
+        {
+            get
+            {
+                return this._OldStartingIndex;
+            }
+        }
+    }
+    #endregion
+
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/ProgressBarItem.cs b/PROMS/DotNetBar Source Code/ProgressBarItem.cs
new file mode 100644
index 00000000..56c4fc2c
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/ProgressBarItem.cs	
@@ -0,0 +1,1055 @@
+using System;
+using System.Drawing;
+using System.ComponentModel;
+using System.Drawing.Drawing2D;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represents a progress bar item.
+    /// </summary>
+    [ToolboxItem(false), Designer("DevComponents.DotNetBar.Design.SimpleItemDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+    public class ProgressBarItem : ImageItem, IPersonalizedMenuItem
+    {
+        // IPersonalizedMenuItem Implementation
+        private eMenuVisibility m_MenuVisibility = eMenuVisibility.VisibleAlways;
+        private bool m_RecentlyUsed = false;
+        private int m_Maximum = 100;
+        private int m_Minimum = 0;
+        private int m_Value = 0;
+        private int m_Step = 1;
+        private bool m_TextVisible = false;
+        public event EventHandler ValueChanged;
+        private int m_Width = 96;
+        private int m_Height = 0;
+        //private ItemStyle m_BackgroundStyle = new ItemStyle();
+        private ElementStyle m_BackgroundStyle = null;
+        private Color m_ChunkColor = Color.Empty;
+        private Color m_ChunkColor2 = Color.Empty;
+        private float m_ChunkGradientAngle = 0;
+        private eProgressItemType m_ProgressType = eProgressItemType.Standard;
+        private int m_MarqueeAnimationSpeed = 100;
+        private int m_MarqueeValue = 0;
+        private eProgressBarItemColor m_ColorTable = eProgressBarItemColor.Normal;
+
+        /// <summary>
+        /// Creates new instance of ProgressBarItem.
+        /// </summary>
+        public ProgressBarItem() : this("", "") { }
+        /// <summary>
+        /// Creates new instance of ProgressBarItem and assigns the name to it.
+        /// </summary>
+        /// <param name="sItemName">Item name.</param>
+        public ProgressBarItem(string sItemName) : this(sItemName, "") { }
+        /// <summary>
+        /// Creates new instance of ProgressBarItem and assigns the name and text to it.
+        /// </summary>
+        /// <param name="sItemName">Item name.</param>
+        /// <param name="ItemText">item text.</param>
+        public ProgressBarItem(string sItemName, string ItemText)
+            : base(sItemName, ItemText)
+        {
+            ResetBackgroundStyle();
+        }
+        /// <summary>
+        /// Returns copy of the item.
+        /// </summary>
+        public override BaseItem Copy()
+        {
+            ProgressBarItem objCopy = new ProgressBarItem(m_Name);
+            this.CopyToItem(objCopy);
+            return objCopy;
+        }
+
+        /// <summary>
+        /// Copies the ProgressBarItem specific properties to new instance of the item.
+        /// </summary>
+        /// <param name="copy">New ProgressBarItem instance.</param>
+        internal void InternalCopyToItem(ProgressBarItem copy)
+        {
+            CopyToItem(copy);
+        }
+
+        /// <summary>
+        /// Copies the ProgressBarItem specific properties to new instance of the item.
+        /// </summary>
+        /// <param name="copy">New ProgressBarItem instance.</param>
+        protected override void CopyToItem(BaseItem copy)
+        {
+            ProgressBarItem objCopy = copy as ProgressBarItem;
+            base.CopyToItem(objCopy);
+
+            objCopy.Minimum = this.Minimum;
+            objCopy.Maximum = this.Maximum;
+            objCopy.Step = this.Step;
+            objCopy.TextVisible = this.TextVisible;
+            objCopy.Width = this.Width;
+            objCopy.Style = this.Style;
+            objCopy.Value = this.Value;
+
+            objCopy.ChunkColor = ChunkColor;
+            objCopy.ChunkColor2 = ChunkColor2;
+            objCopy.ChunkGradientAngle = ChunkGradientAngle;
+            objCopy.ColorTable = ColorTable;
+        }
+
+        private Brush GetChunkBrush(Rectangle rect, ColorDescription cd)
+        {
+            if (cd.ChunkColor2.IsEmpty)
+                return new SolidBrush(cd.ChunkColor);
+            
+            return DisplayHelp.CreateLinearGradientBrush(rect, cd.ChunkColor, cd.ChunkColor2, cd.ChunkGradientAngle);
+        }
+
+        /// <summary>
+        /// Overriden. Draws the item.
+        /// </summary>
+        /// <param name="g">Target Graphics object.</param>
+        public override void Paint(ItemPaintArgs pa)
+        {
+            const float chunkFraction = .65f;
+            const int chunkSpacing = 2;
+
+            if (this.SuspendLayout)
+                return;
+
+            if (this.IsThemed && PaintThemed(pa))
+                return;
+
+            ColorDescription cd = GetColorDescription();
+            cd.BackgroundStyle.SetColorScheme(pa.Colors);
+            
+            Graphics g = pa.Graphics;
+
+            Font font = this.GetFont();
+
+            if (BarFunctions.IsOffice2007Style(this.EffectiveStyle))
+            {
+                Rendering.BaseRenderer renderer = pa.Renderer;
+                if (renderer != null)
+                {
+                    renderer.DrawProgressBarItem(new ProgressBarItemRenderEventArgs(pa.Graphics, this, pa.Font, pa.RightToLeft));
+                }
+            }
+            else
+            {
+                Rectangle rect = m_Rect;
+
+                //rect.Inflate(-1, 0);
+
+                // Paint Background
+                ElementStyleDisplay.Paint(new ElementStyleDisplayInfo(cd.BackgroundStyle, g, rect));
+                
+                // Paint progress
+                rect.Inflate(-ElementStyleLayout.HorizontalStyleWhiteSpace(cd.BackgroundStyle), -ElementStyleLayout.VerticalStyleWhiteSpace(cd.BackgroundStyle));
+
+                switch (this.EffectiveStyle)
+                {
+                    case eDotNetBarStyle.OfficeXP:
+                        {
+                            Rectangle origRect = rect;
+                            // Bar progress
+                            int chunkWidth = (int)Math.Floor(rect.Height * chunkFraction);
+                            if (chunkWidth <= 0)
+                                chunkWidth = 2;
+                            int chunk100 = (int)Math.Ceiling((double)rect.Width / (chunkWidth + chunkSpacing));
+                            Region oldClip = g.Clip;
+                            g.SetClip(rect, CombineMode.Intersect);
+                            int chunkCount = (int)(chunk100 * ((float)(m_Value - m_Minimum) / (float)(m_Maximum - m_Minimum)));
+
+                            int startX = rect.X;
+                            if (m_ProgressType == eProgressItemType.Marquee)
+                            {
+                                chunkCount = 5;
+                                startX += rect.Width * m_MarqueeValue / 100 - (int)(chunkWidth * chunkCount * .65);
+                            }
+
+                            using(Brush brush = GetChunkBrush(origRect, cd))
+                            {
+                                int x = startX;
+                                for (int i = 0; i < chunkCount; i++)
+                                {
+                                    g.FillRectangle(brush, x, rect.Y, chunkWidth, rect.Height);
+                                    x += (chunkWidth + chunkSpacing);
+                                    if (m_ProgressType == eProgressItemType.Marquee && x > rect.Right)
+                                        x = rect.X;
+                                }
+                            }
+
+                            g.Clip = oldClip;
+                            break;
+                        }
+                    case eDotNetBarStyle.Office2000:
+                        {
+                            // Simple Progress Bar
+                            Region oldClip = g.Clip;
+                            g.SetClip(rect, CombineMode.Intersect);
+
+                            Rectangle origRect = rect;
+                            if (m_ProgressType == eProgressItemType.Marquee)
+                            {
+                                rect.Width = (int)(rect.Width * .29);
+                                rect.X += origRect.Width * m_MarqueeValue / 100 - (int)(rect.Width/2);
+                            }
+                            else
+                                rect.Width = (int)(rect.Width * ((float)(m_Value - m_Minimum) / (float)(m_Maximum - m_Minimum)));
+
+                            using(Brush brush = GetChunkBrush(origRect, cd))
+                            {
+                                g.FillRectangle(brush, rect);
+                                if (m_ProgressType == eProgressItemType.Marquee && rect.Right > origRect.Right + 4)
+                                {
+                                    rect = new Rectangle(origRect.X, origRect.Y, rect.Right - origRect.Right - 4, origRect.Height);
+                                    g.FillRectangle(brush, rect);
+                                }
+                            }
+
+                            g.Clip = oldClip;
+                            break;
+                        }
+                    case eDotNetBarStyle.Office2003:
+                    case eDotNetBarStyle.VS2005:
+                        {
+                            // Bar progress
+                            int chunkWidth = (int)Math.Floor(rect.Height * chunkFraction);
+                            if (chunkWidth <= 0)
+                                chunkWidth = 2;
+                            int chunk100 = (int)Math.Ceiling((double)rect.Width / (chunkWidth + chunkSpacing));
+                            Region oldClip = g.Clip;
+                            g.SetClip(rect, CombineMode.Intersect);
+                            int chunkCount = (int)(chunk100 * ((float)(m_Value - m_Minimum) / (float)(m_Maximum - m_Minimum)));
+
+                            int startX = rect.X;
+                            if (m_ProgressType == eProgressItemType.Marquee)
+                            {
+                                chunkCount = 5;
+                                startX += rect.Width * m_MarqueeValue / 100 - (int)(chunkWidth * chunkCount * .65);
+                            }
+
+                            Brush brush = null;
+                            if (cd.ChunkColor2.IsEmpty)
+                                brush = new SolidBrush(cd.ChunkColor);
+                            else
+                            {
+                                LinearGradientBrush lg = DisplayHelp.CreateLinearGradientBrush(new Rectangle(0, 0, chunkWidth, rect.Height), cd.ChunkColor, cd.ChunkColor2, cd.ChunkGradientAngle);
+                                lg.SetBlendTriangularShape(.1f);
+                                brush = lg;
+                            }
+                            try
+                            {
+                                int x = startX;
+                                for (int i = 0; i < chunkCount; i++)
+                                {
+                                    g.FillRectangle(brush, x, rect.Y, chunkWidth, rect.Height);
+                                    x += (chunkWidth + chunkSpacing);
+                                    if (m_ProgressType == eProgressItemType.Marquee && x > rect.Right)
+                                        x = rect.X;
+                                }
+                            }
+                            finally
+                            {
+                                brush.Dispose();
+                            }
+                            
+                            g.Clip = oldClip;
+                            break;
+                        }
+                }
+            }
+
+            // Paint Text On Top
+            if (m_TextVisible)
+                ElementStyleDisplay.PaintText(new ElementStyleDisplayInfo(cd.BackgroundStyle, g, m_Rect), m_Text, font);
+
+            if (this.DesignMode && this.Focused)
+            {
+                Rectangle r = m_Rect;
+                r.Inflate(-1, -1);
+                DesignTime.DrawDesignTimeSelection(g, r, pa.Colors.ItemDesignTimeBorder);
+            }
+        }
+
+        private bool PaintThemed(ItemPaintArgs pa)
+        {
+            if (this.SuspendLayout)
+                return true;
+            if (m_NeedRecalcSize)
+                RecalcSize();
+
+            System.Drawing.Graphics g = pa.Graphics;
+
+            ThemeProgress theme = pa.ThemeProgress;
+            if (theme == null)
+                return false;
+            ThemeProgressParts part = ThemeProgressParts.Bar;
+
+            Rectangle r = m_Rect;
+            r.Inflate(-1, -1);
+            theme.DrawBackground(g, part, ThemeProgressStates.Normal, r);
+
+            part = ThemeProgressParts.Chunk;
+            r.Width = (int)(r.Width * ((float)(m_Value - m_Minimum) / (float)(m_Maximum - m_Minimum)));
+            if (r.Width > 5)
+            {
+                r.Inflate(-4, -4);
+                theme.DrawBackground(g, part, ThemeProgressStates.Normal, r);
+            }
+
+            if (this.DesignMode && this.Focused)
+            {
+                r = m_Rect;
+                r.Inflate(-1, -1);
+                DesignTime.DrawDesignTimeSelection(g, r, pa.Colors.ItemDesignTimeBorder);
+            }
+
+            return true;
+        }
+
+        protected virtual Font GetFont()
+        {
+            // TODO: Check performance implications of cloning the font all the time instead of
+            // getting the stored copy all the time
+            System.Windows.Forms.Control objCtrl = this.ContainerControl as System.Windows.Forms.Control;
+            if (objCtrl != null)
+                return (Font)objCtrl.Font;
+            return SystemFonts.DefaultFont; // (Font)System.Windows.Forms.SystemInformation.MenuFont;
+        }
+
+        /// <summary>
+        /// Overriden. Recalculates the size of the item.
+        /// </summary>
+        public override void RecalcSize()
+        {
+            if (this.SuspendLayout)
+                return;
+
+            int height = Dpi.Height(m_Height), width = Dpi.Width(m_Width);
+
+            if ((m_Width == 0 || m_Height == 0) && m_TextVisible)
+            {
+                // Auto-size item
+                System.Windows.Forms.Control objCtrl = this.ContainerControl as System.Windows.Forms.Control;
+                if (!IsHandleValid(objCtrl))
+                    return;
+
+                Graphics g = BarFunctions.CreateGraphics(objCtrl);
+                try
+                {
+                    ElementStyle backgroundStyle = GetBackgroundStyle();
+                    // Measure string
+                    Font objCurrentFont = GetFont();
+
+                    Size objStringSize = Size.Empty;
+                    eTextFormat objStringFormat = backgroundStyle.TextFormat;
+
+                    if (m_Text != "")
+                    {
+                        objStringSize = TextDrawing.MeasureString(g, m_Text, objCurrentFont, 0, objStringFormat);
+                        objStringSize.Width += 4;
+                    }
+                    else
+                    {
+                        objStringSize = TextDrawing.MeasureString(g, " ", objCurrentFont, 0, objStringFormat);
+                        objStringSize.Width += 4;
+                    }
+                    if (backgroundStyle.Border != eStyleBorderType.None)
+                        objStringSize.Width += 4;
+
+                    objStringSize.Height += Dpi.Height6;
+
+                    if (m_Width == 0)
+                        width = (int)objStringSize.Width;
+                    if (m_Height == 0)
+                        height = (int)objStringSize.Height;
+                }
+                finally
+                {
+                    g.TextRenderingHint = System.Drawing.Text.TextRenderingHint.SystemDefault;
+                    g.SmoothingMode = SmoothingMode.Default;
+                    g.Dispose();
+                }
+            }
+            else
+            {
+                if (m_Height == 0)
+                    height = Dpi.Height(this.ImageSize.Height);
+                else
+                    height = Dpi.Height(m_Height);
+                if (m_Width == 0)
+                    width = Dpi.Width(96);
+                else
+                    width = Dpi.Width(m_Width);
+            }
+
+            if (this.Orientation == eOrientation.Horizontal)
+            {
+                this.HeightInternal = height;
+                this.WidthInternal = width;
+            }
+            else
+            {
+                this.HeightInternal = width;
+                this.WidthInternal = height;
+            }
+
+            base.RecalcSize();
+        }
+
+        /// <summary>
+        /// Gets or sets the item background style.
+        /// </summary>
+        [Obsolete("BackgroundStyle property is replaced with the BackStyle property"), Browsable(false), Category("Style"), Description("Gets or sets the background style."), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public ItemStyle BackgroundStyle
+        {
+            get { return null; }
+            set { }
+        }
+
+        /// <summary>
+        /// Specifies the background style of the item.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Category("Style"), Description("Gets or sets bar background style."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ElementStyle BackStyle
+        {
+            get { return m_BackgroundStyle; }
+            set
+            {
+                if (value == null)
+                    throw new InvalidOperationException("Null is not valid value for this property.");
+                m_BackgroundStyle = value;
+            }
+        }
+
+        /// <summary>
+        /// Resets style to default value. Used by windows forms designer.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetBackgroundStyle()
+        {
+            if(m_BackgroundStyle!=null)
+                m_BackgroundStyle.StyleChanged -= new EventHandler(this.VisualPropertyChanged);
+            m_BackgroundStyle = new ElementStyle();
+            m_BackgroundStyle.StyleChanged += new EventHandler(this.VisualPropertyChanged);
+            this.Refresh();
+        }
+
+        private void VisualPropertyChanged(object sender, EventArgs e)
+        {
+            this.OnAppearanceChanged();
+        }
+
+        private class ColorDescription
+        {
+            public ElementStyle BackgroundStyle = null;
+            public Color ChunkColor = Color.Empty;
+            public Color ChunkColor2 = Color.Empty;
+            public int ChunkGradientAngle = 0;
+            public ColorDescription() { }
+            public ColorDescription(ElementStyle style, Color chunkColor, Color chunkColor2, int chunkGradientAngle)
+            {
+                this.BackgroundStyle = style;
+                this.ChunkColor = chunkColor;
+                this.ChunkColor2 = chunkColor2;
+                this.ChunkGradientAngle = chunkGradientAngle;
+            }
+        }
+
+        private ColorDescription GetColorDescription()
+        {
+            ElementStyle style = null;
+            Color chunkColor = Color.Empty;
+            Color chunkColor2 = Color.Empty;
+            int chunkGradientAngle = (int)m_ChunkGradientAngle;
+            if (m_BackgroundStyle.Custom)
+                style = m_BackgroundStyle;
+            else
+                style = GetBackgroundStyle();
+
+            if (!m_ChunkColor.IsEmpty)
+            {
+                chunkColor = m_ChunkColor;
+                chunkColor2 = m_ChunkColor2;
+            }
+            else
+            {
+                switch (this.EffectiveStyle)
+                {
+                    case eDotNetBarStyle.Office2000:
+                    case eDotNetBarStyle.OfficeXP:
+                        {
+                            chunkColor = SystemColors.Highlight;
+                            chunkColor2 = Color.Empty;
+                            break;
+                        }
+                    default:
+                        {
+                            ColorScheme scheme = GetColorScheme();
+                            chunkGradientAngle = 90;
+                            chunkColor = scheme.ItemPressedBackground;
+                            chunkColor2 = scheme.ItemPressedBackground2;
+                            break;
+                        }
+                }
+            }
+
+            if (this.Orientation == eOrientation.Vertical)
+                style.TextOrientation = eOrientation.Vertical;
+            else
+                style.TextOrientation = eOrientation.Horizontal;
+
+            return new ColorDescription(style, chunkColor, chunkColor2, chunkGradientAngle);
+        }
+
+        private ColorScheme GetColorScheme()
+        {
+            ColorScheme scheme = null;
+            Control cc = this.ContainerControl as Control;
+            if (cc is Bar)
+                scheme = ((Bar)cc).ColorScheme;
+            else if (cc is MenuPanel)
+                scheme = ((MenuPanel)cc).ColorScheme;
+            else if (cc is ItemControl)
+                scheme = ((ItemControl)cc).ColorScheme;
+            else if (cc is BaseItemControl)
+                scheme = ((BaseItemControl)cc).ColorScheme;
+
+            if (scheme == null)
+                scheme = new ColorScheme(this.EffectiveStyle);
+
+            return scheme;
+        }
+        private ElementStyle m_CachedStyle = null;
+        private ElementStyle GetBackgroundStyle()
+        {
+            if (m_CachedStyle != null)
+                return m_CachedStyle;
+
+            ElementStyle style = new ElementStyle();
+
+            if (this.EffectiveStyle == eDotNetBarStyle.Office2000 || this.EffectiveStyle == eDotNetBarStyle.OfficeXP)
+            {
+                style.Border = eStyleBorderType.Solid;
+                style.BorderWidth = 1;
+                style.BorderColor = SystemColors.ControlDark;
+                style.BackColor = SystemColors.Control;
+                style.TextColor = SystemColors.ControlText;
+            }
+            else if (this.EffectiveStyle == eDotNetBarStyle.Office2003 || this.EffectiveStyle == eDotNetBarStyle.VS2005 || BarFunctions.IsOffice2007Style(this.EffectiveStyle))
+            {
+                ColorScheme scheme = null;
+                if (this.ContainerControl is Bar)
+                    scheme = ((Bar)this.ContainerControl).ColorScheme;
+                else if (this.ContainerControl is MenuPanel)
+                    scheme = ((MenuPanel)this.ContainerControl).ColorScheme;
+                if (scheme == null)
+                    scheme = new ColorScheme(this.EffectiveStyle);
+
+                style.Border = eStyleBorderType.Solid;
+                style.BorderWidth = 1;
+                style.BorderColorSchemePart = eColorSchemePart.BarDockedBorder;
+                style.BackColorSchemePart = eColorSchemePart.BarBackground;
+                style.BackColor2SchemePart = eColorSchemePart.BarBackground2;
+                style.BackColorGradientAngle = 90;
+                style.TextColorSchemePart = eColorSchemePart.ItemText;
+            }
+            style.TextLineAlignment = eStyleTextAlignment.Center;
+            style.TextAlignment = eStyleTextAlignment.Center;
+            m_CachedStyle = style;
+
+            return m_CachedStyle;
+        }
+
+        protected override void OnStyleChanged()
+        {
+            m_CachedStyle = null;
+            base.OnStyleChanged();
+        }
+
+        /// <summary>
+        /// Gets or sets the maximum value of the range of the control.
+        /// </summary>
+        [DevCoBrowsable(true), Browsable(true), Description("Gets or sets the maximum value of the range of the control."), Category("Behavior"), DefaultValue(100)]
+        public int Maximum
+        {
+            get
+            {
+                return m_Maximum;
+            }
+            set
+            {
+                m_Maximum = value;
+                this.Refresh();
+                OnAppearanceChanged();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the minimum value of the range of the control.
+        /// </summary>
+        [DevCoBrowsable(true), Browsable(true), Description("Gets or sets the minimum value of the range of the control."), Category("Behavior"), DefaultValue(0)]
+        public int Minimum
+        {
+            get
+            {
+                return m_Minimum;
+            }
+            set
+            {
+                m_Minimum = value;
+                this.Refresh();
+                OnAppearanceChanged();
+            }
+        }
+        /// <summary>
+        /// Gets or sets the current position of the progress bar.
+        /// </summary>
+        [DevCoBrowsable(true), Browsable(true), Description("Gets or sets the current position of the progress bar."), Category("Behavior"), DefaultValue(0)]
+        public int Value
+        {
+            get { return m_Value; }
+            set
+            {
+                int oldValue = m_Value;
+
+                if (value < m_Minimum)
+                    m_Value = m_Minimum;
+                else if (value > m_Maximum)
+                    m_Value = m_Maximum;
+                else
+                    m_Value = value;
+                if (ValueChanged != null)
+                    ValueChanged(this, new EventArgs());
+
+                if (GetNeedVisualUpdate(oldValue, m_Value))
+                {
+                    this.Refresh();
+                    OnAppearanceChanged();
+                    Control c = this.ContainerControl as Control;
+                    if (c != null) c.Update();
+                }
+            }
+        }
+
+        private bool GetNeedVisualUpdate(int oldValue, int newValue)
+        {
+            int oldW = (int)(this.WidthInternal * ((float)oldValue / (m_Maximum - m_Minimum)));
+            int newW = (int)(this.WidthInternal * ((float)newValue / (m_Maximum - m_Minimum)));
+            return oldW != newW;
+        }
+
+        /// <summary>
+        /// Gets or sets the amount by which a call to the PerformStep method increases the current position of the progress bar.
+        /// </summary>
+        [DevCoBrowsable(true), Browsable(true), Description("Gets or sets the amount by which a call to the PerformStep method increases the current position of the progress bar."), Category("Behavior"), DefaultValue(1)]
+        public int Step
+        {
+            get
+            {
+                return m_Step;
+            }
+            set
+            {
+                m_Step = value;
+            }
+        }
+
+        /// <summary>
+        /// Advances the current position of the progress bar by the amount of the Step property.
+        /// </summary>
+        public void PerformStep()
+        {
+            this.Value += m_Step;
+        }
+
+        /// <summary>
+        /// Advances the current position of the progress bar by the specified amount.
+        /// </summary>
+        /// <param name="value">The amount by which to increment the progress bar's current position. </param>
+        public void Increment(int value)
+        {
+            this.Value += value;
+        }
+
+        /// <summary>
+        /// Gets or sets whether the text inside the progress bar is displayed.
+        /// </summary>
+        [DevCoBrowsable(true), Browsable(true), Description("Gets or sets whether the text inside the progress bar is displayed."), Category("Behavior"), DefaultValue(false)]
+        public bool TextVisible
+        {
+            get
+            {
+                return m_TextVisible;
+            }
+            set
+            {
+                m_TextVisible = value;
+                this.Refresh();
+                OnAppearanceChanged();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the width of the item in pixels. 0 value indicates the auto-sizing item based on the text contained in it.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), DefaultValue(96), System.ComponentModel.Category("Layout"), System.ComponentModel.Description("Indicates the width of the label in pixels.")]
+        public int Width
+        {
+            get
+            {
+                return m_Width;
+            }
+            set
+            {
+                if (m_Width == value)
+                    return;
+                m_Width = value;
+                NeedRecalcSize = true;
+                this.Refresh();
+                OnAppearanceChanged();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the height of the label. 0 value indicates the auto-sizing item based on the text height.
+        /// </summary>
+        [System.ComponentModel.Browsable(true), DevCoBrowsable(true), System.ComponentModel.DefaultValue(0), System.ComponentModel.Category("Layout"), System.ComponentModel.Description("Indicates height of the label in pixels.")]
+        public int Height
+        {
+            get
+            {
+                return m_Height;
+            }
+            set
+            {
+                if (m_Height == value)
+                    return;
+                m_Height = value;
+                NeedRecalcSize = true;
+                this.Refresh();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the color of the progress chunk.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Category("Appearance"), Description("Gets or sets the color of the progress chunk.")]
+        public Color ChunkColor
+        {
+            get
+            {
+                return m_ChunkColor;
+            }
+            set
+            {
+                m_ChunkColor = value;
+                OnAppearanceChanged();
+                this.Refresh();
+            }
+        }
+        /// <summary>
+        /// Gets whether ChunkColor property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeChunkColor()
+        {
+            return (!m_ChunkColor.IsEmpty);
+        }
+        /// <summary>
+        /// Resets the ChunkColor property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetChunkColor()
+        {
+            m_ChunkColor = Color.Empty;
+        }
+
+        /// <summary>
+        /// Gets or sets the target gradient color of the progress chunk.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Category("Appearance"), Description("Gets or sets the target gradient color of the progress chunk.")]
+        public Color ChunkColor2
+        {
+            get
+            {
+                return m_ChunkColor2;
+            }
+            set
+            {
+                m_ChunkColor2 = value;
+                OnAppearanceChanged();
+                this.Refresh();
+            }
+        }
+        /// <summary>
+        /// Gets whether ChunkColor property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeChunkColor2()
+        {
+            return (!m_ChunkColor2.IsEmpty);
+        }
+        /// <summary>
+        /// Resets the ChunkColor property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetChunkColor2()
+        {
+            m_ChunkColor2 = Color.Empty;
+        }
+
+        /// <summary>
+        /// Gets or sets the gradient angle of the progress chunk.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Category("Appearance"), Description("Gets or sets the gradient angle of the progress chunk."), DefaultValue(0)]
+        public float ChunkGradientAngle
+        {
+            get
+            {
+                return m_ChunkGradientAngle;
+            }
+            set
+            {
+                m_ChunkGradientAngle = value;
+                if (!m_ChunkColor2.IsEmpty)
+                    this.Refresh();
+                OnAppearanceChanged();
+            }
+        }
+
+        /// <summary>
+        /// Overloaded. Deserializes the Item from the XmlElement.
+        /// </summary>
+        /// <param name="ItemXmlSource">Source XmlElement.</param>
+        public override void Deserialize(ItemSerializationContext context)
+        {
+            base.Deserialize(context);
+
+            System.Xml.XmlElement ItemXmlSource = context.ItemXmlElement;
+
+            m_Width = System.Xml.XmlConvert.ToInt32(ItemXmlSource.GetAttribute("width"));
+            m_Height = System.Xml.XmlConvert.ToInt32(ItemXmlSource.GetAttribute("height"));
+            m_Value = System.Xml.XmlConvert.ToInt32(ItemXmlSource.GetAttribute("value"));
+            m_Minimum = System.Xml.XmlConvert.ToInt32(ItemXmlSource.GetAttribute("min"));
+            m_Maximum = System.Xml.XmlConvert.ToInt32(ItemXmlSource.GetAttribute("max"));
+            m_TextVisible = System.Xml.XmlConvert.ToBoolean(ItemXmlSource.GetAttribute("textvisible"));
+            m_Step = System.Xml.XmlConvert.ToInt32(ItemXmlSource.GetAttribute("step"));
+            if (ItemXmlSource.HasAttribute("chunkcolor"))
+                m_ChunkColor = BarFunctions.ColorFromString(ItemXmlSource.GetAttribute("chunkcolor"));
+            if (ItemXmlSource.HasAttribute("chunkcolor2"))
+                m_ChunkColor2 = BarFunctions.ColorFromString(ItemXmlSource.GetAttribute("chunkcolor2"));
+            m_ChunkGradientAngle = System.Xml.XmlConvert.ToSingle(ItemXmlSource.GetAttribute("chunkga"));
+
+            foreach (System.Xml.XmlElement xmlElem in ItemXmlSource.ChildNodes)
+            {
+                switch (xmlElem.Name)
+                {
+                    case "backstyle2":
+                        {
+                            ElementSerializer.Deserialize(m_BackgroundStyle, xmlElem);
+                            break;
+                        }
+                }
+            }
+        }
+        /// <summary>
+        /// Overloaded. Serializes the item and all sub-items into the XmlElement.
+        /// </summary>
+        /// <param name="ThisItem">XmlElement to serialize the item to.</param>
+        protected internal override void Serialize(ItemSerializationContext context)
+        {
+            base.Serialize(context);
+
+            System.Xml.XmlElement ThisItem = context.ItemXmlElement;
+
+            ThisItem.SetAttribute("width", System.Xml.XmlConvert.ToString(m_Width));
+            ThisItem.SetAttribute("height", System.Xml.XmlConvert.ToString(m_Height));
+            ThisItem.SetAttribute("value", System.Xml.XmlConvert.ToString(m_Value));
+            ThisItem.SetAttribute("min", System.Xml.XmlConvert.ToString(m_Minimum));
+            ThisItem.SetAttribute("max", System.Xml.XmlConvert.ToString(m_Maximum));
+            ThisItem.SetAttribute("textvisible", System.Xml.XmlConvert.ToString(m_TextVisible));
+            ThisItem.SetAttribute("step", System.Xml.XmlConvert.ToString(m_Step));
+            if (!m_ChunkColor.IsEmpty)
+                ThisItem.SetAttribute("chunkcolor", BarFunctions.ColorToString(m_ChunkColor));
+            if (!m_ChunkColor2.IsEmpty)
+                ThisItem.SetAttribute("chunkcolor2", BarFunctions.ColorToString(m_ChunkColor2));
+            ThisItem.SetAttribute("chunkga", System.Xml.XmlConvert.ToString(m_ChunkGradientAngle));
+
+            if (m_BackgroundStyle.Custom)
+            {
+                System.Xml.XmlElement style = ThisItem.OwnerDocument.CreateElement("backstyle2");
+                ThisItem.AppendChild(style);
+                ElementSerializer.Serialize(m_BackgroundStyle, style);
+            }
+
+        }
+
+        // IPersonalizedMenuItem Impementation
+        /// <summary>
+        /// Indicates item's visiblity when on pop-up menu.
+        /// </summary>
+        [System.ComponentModel.Browsable(true), DevCoBrowsable(true), System.ComponentModel.Category("Appearance"), System.ComponentModel.Description("Indicates item's visiblity when on pop-up menu.")]
+        public eMenuVisibility MenuVisibility
+        {
+            get
+            {
+                return m_MenuVisibility;
+            }
+            set
+            {
+                if (m_MenuVisibility != value)
+                {
+                    m_MenuVisibility = value;
+                    if (ShouldSyncProperties)
+                        BarFunctions.SyncProperty(this, "MenuVisibility");
+                }
+            }
+        }
+        /// <summary>
+        /// Indicates whether item was recently used.
+        /// </summary>
+        [System.ComponentModel.Browsable(false)]
+        public bool RecentlyUsed
+        {
+            get
+            {
+                return m_RecentlyUsed;
+            }
+            set
+            {
+                if (m_RecentlyUsed != value)
+                {
+                    m_RecentlyUsed = value;
+                    if (ShouldSyncProperties)
+                        BarFunctions.SyncProperty(this, "RecentlyUsed");
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the type of progress bar used to indicate progress. The Standard style displays the progress based on Minimum, Maximum and current Value.
+        /// The Marquee type is automatically moving progress bar that is used to indicate an ongoing operation for which the actual duration cannot be estimated.
+        /// </summary>
+        [Browsable(true), Category("Behavior"), DefaultValue(eProgressItemType.Standard), Description("Indicates type of progress bar used to indicate progress.")]
+        public eProgressItemType ProgressType
+        {
+            get { return m_ProgressType; }
+            set
+            {
+                m_ProgressType = value;
+                OnProgressTypeChanged();
+            }
+        }
+
+        protected override void OnDesignModeChanged()
+        {
+            if (this.DesignMode)
+            {
+                if (m_ProgressType == eProgressItemType.Marquee)
+                    DisposeTimer();
+            }
+
+            base.OnDesignModeChanged();
+        }
+
+        private void OnProgressTypeChanged()
+        {
+            if (this.DesignMode) return;
+
+            DisposeTimer();
+            if (m_ProgressType == eProgressItemType.Marquee)
+                SetupTimer();
+            this.OnAppearanceChanged();
+            this.Refresh();
+        }
+
+        protected internal override void OnVisibleChanged(bool newValue)
+        {
+            base.OnVisibleChanged(newValue);
+            if (m_ProgressType == eProgressItemType.Marquee && m_MarqueeTimer!=null)
+            {
+                if (newValue)
+                    m_MarqueeTimer.Start();
+                else
+                    m_MarqueeTimer.Stop();
+            }
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            DisposeTimer();
+            base.Dispose(disposing);
+        }
+
+        private Timer m_MarqueeTimer = null;
+        private void DisposeTimer()
+        {
+            if (m_MarqueeTimer != null)
+            {
+                m_MarqueeTimer.Tick -= MarqueeTimer_Tick;
+                m_MarqueeTimer.Stop();
+                m_MarqueeTimer.Dispose();
+                m_MarqueeTimer = null;
+            }
+        }
+
+        private void SetupTimer()
+        {
+            if (m_MarqueeTimer != null) DisposeTimer();
+
+            m_MarqueeValue = 0;
+            if (m_MarqueeAnimationSpeed == 0) return;
+
+            m_MarqueeTimer = new Timer();
+            m_MarqueeTimer.Interval = m_MarqueeAnimationSpeed;
+            m_MarqueeTimer.Tick += MarqueeTimer_Tick;
+            if (this.Visible)
+                m_MarqueeTimer.Start();
+        }
+
+        private void MarqueeTimer_Tick(object sender, EventArgs e)
+        {
+            m_MarqueeValue+=5;
+            if (m_MarqueeValue > 100)
+                m_MarqueeValue = 0;
+            this.Refresh();
+        }
+
+        internal int MarqueeValue
+        {
+            get { return m_MarqueeValue; }
+        }
+
+        /// <summary>
+        /// Gets or sets the marquee animation speed in milliseconds.
+        /// </summary>
+        [Browsable(true), DefaultValue(100), Category("Behavior"), Description("Indicates marquee animation speed in milliseconds.")]
+        public int MarqueeAnimationSpeed
+        {
+            get { return m_MarqueeAnimationSpeed; }
+            set
+            {
+                m_MarqueeAnimationSpeed = value;
+                OnProgressTypeChanged();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the predefined color state table for progress bar. Color specified applies to items with Office 2007 style only. It does not have
+        /// any effect on other styles. You can use ColorTable to indicate the state of the operation that Progress Bar is tracking. Default value is eProgressBarItemColor.Normal.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(false), DefaultValue(eProgressBarItemColor.Normal), Category("Appearance"), Description("Indicates predefined color of item when Office 2007 style is used.")]
+        public eProgressBarItemColor ColorTable
+        {
+            get { return m_ColorTable; }
+            set
+            {
+                if (m_ColorTable != value)
+                {
+                    m_ColorTable = value;
+                    this.Refresh();
+                }
+            }
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/ProgressSteps.ico b/PROMS/DotNetBar Source Code/ProgressSteps.ico
new file mode 100644
index 00000000..8b9f0f4b
Binary files /dev/null and b/PROMS/DotNetBar Source Code/ProgressSteps.ico differ
diff --git a/PROMS/DotNetBar Source Code/Properties/Resources.Designer.cs b/PROMS/DotNetBar Source Code/Properties/Resources.Designer.cs
new file mode 100644
index 00000000..24d8b216
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Properties/Resources.Designer.cs	
@@ -0,0 +1,63 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace DevComponents.DotNetBar.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DevComponents.DotNetBar.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Properties/Resources.resx b/PROMS/DotNetBar Source Code/Properties/Resources.resx
new file mode 100644
index 00000000..7080a7d1
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Properties/Resources.resx	
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/PropertyGrid/AdvPropertyGrid.cs b/PROMS/DotNetBar Source Code/PropertyGrid/AdvPropertyGrid.cs
new file mode 100644
index 00000000..7a5cae00
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/PropertyGrid/AdvPropertyGrid.cs	
@@ -0,0 +1,2045 @@
+#if FRAMEWORK20
+using System;
+using System.Text;
+using System.Windows.Forms;
+using System.ComponentModel;
+using DevComponents.AdvTree;
+using System.Drawing;
+using System.Collections.Generic;
+using DevComponents.DotNetBar.Controls;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represents advanced property grid control.
+    /// </summary>
+    [ToolboxItem(true), ToolboxBitmap(typeof(AdvPropertyGrid), "AdvPropertyGrid.ico")]
+    public class AdvPropertyGrid : ContainerControl, INotifyPropertyChanged, IPropertyGridLocalizer, IPropertyElementStyleProvider, ISupportInitialize
+    {
+        private const string STR_DefaultNodeStyle = "DefaultNodeStyle";
+
+        #region Constructors
+        private Bar _Toolbar = null;
+        private AdvTree.AdvTree _PropertyTree = null;
+        private ExpandableSplitter _ExpandableSplitter = null;
+        private PanelControl _HelpPanel = null;
+        private SuperTooltip _SuperTooltip = null;
+        private ElementStyle _CategoryStyle = null;
+        private ElementStyle _ReadOnlyStyle = null;
+        private ElementStyle _ValueChangedStyle = null;
+        private ElementStyle _DefaultEditCellStyle = null;
+        private AdvPropertyGridLocalization _SystemText = null;
+        private TextBoxItem _SearchTextBox = null;
+
+        /// <summary>
+        /// Initializes a new instance of the AdvPropertyGrid class.
+        /// </summary>
+        public AdvPropertyGrid()
+        {
+            _SystemText = new AdvPropertyGridLocalization();
+            _SystemText.PropertyChanged += new PropertyChangedEventHandler(SystemTextPropertyChanged);
+
+            _Appearance = new AdvPropertyGridAppearance();
+            _Appearance.PropertyChanged += new PropertyChangedEventHandler(AppearancePropertyChanged);
+
+            _PropertySettings = new PropertySettingsCollection(this);
+
+            _Toolbar = CreateToolbar();
+            _PropertyTree = CreatePropertyTree();
+            _SuperTooltip = CreateSuperTooltip();
+            _ExpandableSplitter = CreateExpandableSplitter();
+            _HelpPanel = CreateHelpPanel();
+            _ExpandableSplitter.ExpandableControl = _HelpPanel;
+
+            this.Controls.Add(_PropertyTree);
+            this.Controls.Add(_Toolbar);
+            this.Controls.Add(_ExpandableSplitter);
+            this.Controls.Add(_HelpPanel);
+            _ExpandableSplitter.Visible = false;
+            _HelpPanel.Visible = false;
+        }
+
+        internal bool HasValidatePropertyValueHandlers
+        {
+            get
+            {
+                return (ValidatePropertyValue != null);
+            }
+        }
+        internal void InvokeValidatePropertyValue(ValidatePropertyValueEventArgs args)
+        {
+            ValidatePropertyValueEventHandler h = ValidatePropertyValue;
+            if (h != null) h(this, args);
+        }
+
+        internal bool InvokePropertyValueChanging(string propertyName, object newValue, PropertyDescriptor propertyDesc, string propertyPath)
+        {
+            PropertyValueChangingEventArgs e = new PropertyValueChangingEventArgs(propertyName, newValue, propertyDesc, propertyPath);
+            OnPropertyValueChanging(e);
+            return e.Handled;
+        }
+        /// <summary>
+        /// Invokes PropertyValueChanging event.
+        /// </summary>
+        /// <param name="e">Event data.</param>
+        protected virtual void OnPropertyValueChanging(PropertyValueChangingEventArgs e)
+        {
+            PropertyValueChangingEventHandler handler = PropertyValueChanging;
+            if (handler != null) handler(this, e);
+        }
+        /// <summary>
+        /// Invokes PropertyValueChanged event handler.
+        /// </summary>
+        /// <param name="propertyName">Name of the property that has changed.</param>
+        /// <param name="newValue">New property value.</param>
+        /// <param name="oldValue">Old property value.</param>
+        public void InvokePropertyValueChanged(string propertyName, object newValue, object oldValue)
+        {
+            OnPropertyValueChanged(propertyName);
+        }
+        /// <summary>
+        /// Invokes PropertyValueChanged event.
+        /// </summary>
+        /// <param name="propertyName">Name of property that has changed</param>
+        protected virtual void OnPropertyValueChanged(string propertyName)
+        {
+            PropertyChangedEventHandler handler = PropertyValueChanged;
+            if(handler!=null)
+                handler(this, new PropertyChangedEventArgs(propertyName));
+        }
+        private void SystemTextPropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            if (e.PropertyName == "CategorizeToolbarTooltip")
+                _CategoryToolbarButton.Tooltip = _SystemText.CategorizeToolbarTooltip;
+            else if (e.PropertyName == "AlphabeticalToolbarTooltip")
+                _SortToolbarButton.Tooltip = _SystemText.AlphabeticalToolbarTooltip;
+            else if (e.PropertyName=="SearchBoxWatermarkText")
+            	_SearchTextBox.WatermarkText = _SystemText.SearchBoxWatermarkText;
+        }
+
+        private ExpandableSplitter CreateExpandableSplitter()
+        {
+            ExpandableSplitter splitter = new ExpandableSplitter();
+            splitter.Style = eSplitterStyle.Office2007;
+            splitter.Dock = DockStyle.Bottom;
+            splitter.Height = 6;
+            return splitter;
+        }
+        private PanelControl CreateHelpPanel()
+        {
+            PanelControl panel = new PanelControl();
+            panel.Dock = DockStyle.Bottom;
+            panel.Height = 42;
+            panel.ApplyPanelStyle(eDotNetBarStyle.Office2007);
+            panel.Style.BackColor = Color.White;
+            panel.Style.BackColor2 = Color.Empty;
+            panel.Style.TextColor = Color.Black;
+            panel.Style.WordWrap = true;
+            panel.Style.TextAlignment = eStyleTextAlignment.Near;
+            return panel;
+        }
+
+        private SuperTooltip CreateSuperTooltip()
+        {
+            SuperTooltip tooltip = new SuperTooltip();
+#if (!TRIAL)
+            tooltip.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F";
+#endif
+            tooltip.PositionBelowControl = false;
+            tooltip.ShowTooltipImmediately = false;
+            return tooltip;
+        }
+
+        private ButtonItem _CategoryToolbarButton = null;
+        private ButtonItem _SortToolbarButton = null;
+        private Bar CreateToolbar()
+        {
+            Bar bar = new Bar();
+            bar.Dock = DockStyle.Top;
+            bar.RoundCorners = false;
+
+            ButtonItem item = new ButtonItem("sys_Category");
+            item.Image = BarFunctions.LoadBitmap("SystemImages.Category.png");
+            item.OptionGroup = "sorting";
+            item.Checked = true;
+            item.OptionGroupChanging += new OptionGroupChangingEventHandler(SortToolbarButtonOptionGroupChanging);
+            item.Tooltip = _SystemText.CategorizeToolbarTooltip;
+            bar.Items.Add(item);
+            _CategoryToolbarButton = item;
+
+            item = new ButtonItem("sys_Sort");
+            item.Image = BarFunctions.LoadBitmap("SystemImages.Sort.png");
+            item.OptionGroup = "sorting";
+            item.OptionGroupChanging += new OptionGroupChangingEventHandler(SortToolbarButtonOptionGroupChanging);
+            item.Tooltip = _SystemText.AlphabeticalToolbarTooltip;
+            bar.Items.Add(item);
+            _SortToolbarButton = item;
+
+            TextBoxItem textBox = new TextBoxItem();
+            textBox.WatermarkEnabled = true;
+            textBox.WatermarkText = _SystemText.SearchBoxWatermarkText;
+            textBox.WatermarkBehavior = eWatermarkBehavior.HideNonEmpty;
+            textBox.TextBoxWidth = 90;
+            textBox.BeginGroup = true;
+            textBox.InputTextChanged += new DevComponents.DotNetBar.TextBoxItem.TextChangedEventHandler(SearchTextChanged);
+            textBox.TextBox.GotFocus += new EventHandler(SearchTextBoxGotFocus);
+            textBox.Enabled = false;
+            _SearchTextBox = textBox;
+            bar.Items.Add(textBox);
+
+            bar.Style = eDotNetBarStyle.Office2007;
+
+            return bar;
+        }
+
+        private void SearchTextBoxGotFocus(object sender, EventArgs e)
+        {
+            if (!string.IsNullOrEmpty(_SearchTextBox.ControlText))
+                _SearchTextBox.TextBox.SelectAll();
+        }
+
+        private bool _IsFiltered = false;
+        private List<Node> _HiddenNodes = new List<Node>();
+        private void SearchTextChanged(object sender)
+        {
+            string searchText = _SearchTextBox.ControlText.ToLower();
+            if (string.IsNullOrEmpty(searchText) && !_IsFiltered) return;
+
+            if (string.IsNullOrEmpty(searchText))
+            {
+                _PropertyTree.BeginUpdate();
+                foreach (Node item in _HiddenNodes)
+                {
+                    item.Visible = true;
+                }
+                _PropertyTree.EndUpdate();
+                _IsFiltered = false;
+                _HiddenNodes.Clear();
+                return;
+            }
+
+            _PropertyTree.BeginUpdate();
+            foreach (Node item in _HiddenNodes)
+            {
+                item.Visible = true;
+            }
+            FilterNodes(_PropertyTree.Nodes, _HiddenNodes, searchText);
+            _IsFiltered = _HiddenNodes.Count > 0;
+            _PropertyTree.EndUpdate();
+        }
+
+        private void FilterNodes(NodeCollection nodeCollection, List<Node> hiddenNodes, string searchText)
+        {
+            searchText = searchText.ToUpper();
+            foreach (Node item in nodeCollection)
+            {
+                PropertyNode propertyNode = item as PropertyNode;
+                if (propertyNode != null && !propertyNode.Text.ToUpper().Contains(searchText))
+                {
+                    propertyNode.Visible = false;
+                    hiddenNodes.Add(propertyNode);
+                }
+                if (item.HasChildNodes)
+                    FilterNodes(item.Nodes, hiddenNodes, searchText);
+            }
+        }
+
+        private void SortToolbarButtonOptionGroupChanging(object sender, OptionGroupChangingEventArgs e)
+        {
+            if (e.NewChecked == _CategoryToolbarButton)
+            {
+                if (PropertySort != ePropertySort.CategorizedAlphabetical)
+                    PropertySort = ePropertySort.CategorizedAlphabetical;
+            }
+            else if (e.NewChecked == _SortToolbarButton)
+            {
+                if (PropertySort != ePropertySort.Alphabetical)
+                    PropertySort = ePropertySort.Alphabetical;
+            }
+        }
+
+        private AdvTree.AdvTree CreatePropertyTree()
+        {
+
+            AdvTree.AdvTree tree = new DevComponents.AdvTree.AdvTree();
+#if (!TRIAL)
+            tree.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F";
+#endif
+            // Default node style
+            ElementStyle elementStyle1 = new ElementStyle();
+            elementStyle1.Name = STR_DefaultNodeStyle;
+            elementStyle1.TextColor = System.Drawing.SystemColors.ControlText;
+            elementStyle1.TextTrimming = eStyleTextTrimming.None;
+            elementStyle1.TextLineAlignment = eStyleTextAlignment.Center;
+            tree.Styles.Add(elementStyle1);
+            tree.NodeStyle = elementStyle1;
+
+            _ReadOnlyStyle = new ElementStyle();
+            _ReadOnlyStyle.Name = "ReadOnlyStyle";
+            _ReadOnlyStyle.TextColor = SystemColors.ControlDark;
+            _ReadOnlyStyle.TextTrimming = eStyleTextTrimming.None;
+            tree.Styles.Add(_ReadOnlyStyle);
+
+            // Category style
+            _CategoryStyle = new ElementStyle();
+            _CategoryStyle.Name = "CategoryStyle";
+            _CategoryStyle.TextColor = System.Drawing.SystemColors.ControlText;
+            _CategoryStyle.BackColorSchemePart = eColorSchemePart.PanelBackground;
+            _CategoryStyle.Font = new Font(this.Font, FontStyle.Bold);
+            tree.Styles.Add(_CategoryStyle);
+
+            // Value Changed Style
+            _ValueChangedStyle = new ElementStyle();
+            _ValueChangedStyle.Name = "ValueChangedStyle";
+            _ValueChangedStyle.Font = new Font(this.Font, FontStyle.Bold);
+            tree.Styles.Add(_ValueChangedStyle);
+
+            tree.AccessibleRole = System.Windows.Forms.AccessibleRole.Outline;
+            tree.AllowDrop = false;
+            tree.DragDropEnabled = false;
+            tree.BackColor = System.Drawing.SystemColors.Window;
+            tree.BackgroundStyle.Class = "TreeBorderKey";
+            tree.Name = "propertyTree";
+            tree.PathSeparator = ";";
+            tree.Size = new System.Drawing.Size(150, 100);
+            tree.TabIndex = 0;
+            tree.ExpandWidth = 12;
+            tree.ExpandButtonType = eExpandButtonType.Triangle;
+            tree.Indent = 0;
+            tree.GridRowLines = true;
+            tree.GridColumnLines = true;
+            tree.GridColumnLineResizeEnabled = true;
+            tree.GridLinesColor = Color.WhiteSmoke;
+            tree.HScrollBarVisible = false;
+            tree.SelectionPerCell = true;
+            tree.SelectionBoxStyle = eSelectionStyle.FullRowSelect;
+            tree.SelectionFocusAware = false;
+            tree.CellHorizontalSpacing = 2;
+            tree.BeforeNodeSelect += new AdvTreeNodeCancelEventHandler(PropertyTreeBeforeNodeSelect);
+            tree.KeyboardSearchEnabled = false;
+            tree.KeyPress += new KeyPressEventHandler(PropertyTreeKeyPress);
+            tree.ColumnResizing += new EventHandler(PropertyTreeColumnResized);
+            tree.DoubleClick += new EventHandler(PropertyTreeDoubleClick);
+            tree.Leave += new EventHandler(PropertyTreeLeave);
+
+            AdvTree.ColumnHeader header = new DevComponents.AdvTree.ColumnHeader();
+            header.Name = "propertyName";
+            header.Width.Relative = 50;
+            tree.Columns.Add(header);
+
+            header = new DevComponents.AdvTree.ColumnHeader();
+            header.Name = "propertyValue";
+            header.Width.Relative = 50;
+            tree.Columns.Add(header);
+
+            tree.ColumnsVisible = false;
+
+            tree.Dock = DockStyle.Fill;
+            return tree;
+        }
+
+        private void PropertyTreeLeave(object sender, EventArgs e)
+        {
+            if (_EditedNode != null)
+                _EditedNode.ApplyEdit();
+        }
+
+        private PropertyNode _EditedNode = null;
+        internal void OnPropertyIsEditingChanged(PropertyNode node)
+        {
+            if (node.IsEditing)
+                _EditedNode = node;
+            else
+                _EditedNode = null;
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            base.Dispose(disposing);
+            ClearPropertyTree();
+            DisposeStyleFont(_CategoryStyle);
+            DisposeStyleFont(_ValueChangedStyle);
+        }
+        private void DisposeStyleFont(ElementStyle style)
+        {
+            if (style == null) return;
+            if (style.Font != null)
+            {
+                style.Font.Dispose();
+                style.Font = null;
+            }
+        }
+        #endregion
+
+        #region Events
+        /// <summary>
+        /// Occurs when property grid needs property names translated for UI.
+        /// </summary>
+        [Description("Occurs when property grid needs property names translated for UI.")]
+        public event LocalizeEventHandler Localize;
+        /// <summary>
+        /// Occurs when Super Tooltip that is displayed for the error that occurred when property is being set is being assigned to a property node.
+        /// This event allows you to customize the super tooltip displayed.
+        /// </summary>
+        [Description("Occurs when Super Tooltip that is displayed for the error that occurred when property is being set is being assigned to a property node.")]
+        public event PropertyErrorTooltipEventHandler PrepareErrorSuperTooltip;
+        /// <summary>
+        /// Occurs when property value is being converted to text representation for display. You can handle this event
+        /// to provide custom conversion for property values. You must set IsConverted=true on event arguments to indicate that you have performed value conversion.
+        /// </summary>
+        [Description("Occurs when property value is being converted to text representation for display.")]
+        public event ConvertValueEventHandler ConvertPropertyValueToString;
+        /// <summary>
+        /// Occurs when text entered by user is being converted to typed property value to be assigned to the property. You can handle this event
+        /// to provide custom conversion for property values. You must set IsConverted=true on event arguments to indicate that you have performed value conversion.
+        /// </summary>
+        [Description("Occurs when text entered by user is being converted to typed property value to be assigned to the property.")]
+        public event ConvertValueEventHandler ConvertFromStringToPropertyValue;
+        /// <summary>
+        /// Occurs when property looks for the list of valid values for the property to show on either drop-down or use
+        /// in auto-complete list. For example when property type is enum the internal implementation will convert available enum
+        /// values into string list and use on drop-down and in auto-complete list. You can use this event to provide
+        /// custom value list in combination with ConvertPropertyValueToString, ConvertFromStringToPropertyValue events.
+        /// You must set IsListValid=true on event arguments to indicate that list your provided should be used.
+        /// </summary>
+        [Description("Occurs when property looks for the list of valid values for the property to show on either drop-down or use in auto-complete list.")]
+        public event PropertyValueListEventHandler ProvidePropertyValueList;
+        /// <summary>
+        /// Occurs when property node needs the UITypeEditor for the property. You can handle this event and provide your own UITypeEditor to be used instead of the one specified on the property.
+        /// </summary>
+        [Description("Occurs when property node needs the UITypeEditor for the property. You can handle this event and provide your own UITypeEditor to be used instead of the one specified on the property.")]
+        public event ProvideUITypeEditorEventHandler ProvideUITypeEditor;
+        /// <summary>
+        /// Occurs when user changes the value of the property in property grid.
+        /// </summary>
+        [Description("Occurs when user changes the value of the property in property grid.")]
+        public event PropertyChangedEventHandler PropertyValueChanged;
+
+        /// <summary>
+        /// Occurs before property value entered by the user is set on the property. You can cancel internal assignment by property grid by setting Handled=true on event arguments.
+        /// </summary>
+        [Description("Occurs before property value entered by the user is set on the property. You can cancel internal assignment by property grid by setting Handled=true on event arguments.")]
+        public event PropertyValueChangingEventHandler PropertyValueChanging;
+
+        /// <summary>
+        /// Occurs when users changes the property value and attempts to commit the changes. This even allows you to validate the value and show error message if value is invalid and cancel its application.
+        /// </summary>
+        [Description("Occurs when users changes the property value and attempts to commit the changes. This even allows you to validate the value and show error message if value is invalid and cancel its application.")]
+        public event ValidatePropertyValueEventHandler ValidatePropertyValue;
+        /// <summary>
+        /// Raises ValidatePropertyValue event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnValidatePropertyValue(ValidatePropertyValueEventArgs e)
+        {
+            ValidatePropertyValueEventHandler handler = ValidatePropertyValue;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        /// <summary>
+        /// Occurs after properties have been loaded into the property grid.
+        /// </summary>
+        [Description("Occurs after properties have been loaded into the property grid.")]
+        public event EventHandler PropertiesLoaded;
+        /// <summary>
+        /// Raises PropertiesLoaded event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnPropertiesLoaded(EventArgs e)
+        {
+            EventHandler handler = PropertiesLoaded;
+            if (handler != null)
+                handler(this, e);
+        }
+        #endregion
+
+        #region Internal Implementation
+        /// <summary>
+        /// Commits any property edits that are currently in progress by applying the current entered value to the property.
+        /// Returns true if edit was applied.
+        /// </summary>
+        public bool CommitEdit()
+        {
+            PropertyNode node = _PropertyTree.SelectedNode as PropertyNode;
+            if (node != null && node.IsEditing)
+                return node.ApplyEdit();
+            return false;
+        }
+
+
+        private object[] _SelectedObjects;
+        /// <summary>
+        /// Gets or sets the currently selected objects.
+        /// </summary>
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), Browsable(false)]
+        public object[] SelectedObjects
+        {
+            get { return _SelectedObjects; }
+            set
+            {
+                if (value != _SelectedObjects)
+                {
+                    object[] oldValue = _SelectedObjects;
+                    _SelectedObjects = value;
+                    OnSelectedObjectsChanged(oldValue, value);
+                }
+            }
+        }
+
+        private void OnSelectedObjectsChanged(object[] oldValue, object[] newValue)
+        {
+            if (oldValue != null)
+            {
+                if (oldValue.Length == 1 && oldValue[0] is INotifyPropertyChanged)
+                {
+                    ((INotifyPropertyChanged)oldValue[0]).PropertyChanged -= SelectedObjectPropertyChanged;
+                }
+            }
+
+            OnPropertyChanged(new PropertyChangedEventArgs("SelectedObjects"));
+
+            Reload(true);
+
+            if (newValue != null && newValue.Length > 0)
+            {
+                if (newValue.Length == 1 && newValue[0] is INotifyPropertyChanged)
+                {
+                    ((INotifyPropertyChanged)_SelectedObjects[0]).PropertyChanged += SelectedObjectPropertyChanged;
+                }
+            }
+        }
+
+        private void SelectedObjectPropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            UpdatePropertyValue(e.PropertyName);
+        }
+
+        private void UpdatePropertyValue(Node item, string propertyName)
+        {
+            if (this.InvokeRequired)
+                this.BeginInvoke(new MethodInvoker(delegate { UpdatePropertyValueInternal(item, propertyName); }));
+            else
+                UpdatePropertyValueInternal(item, propertyName);
+        }
+
+        private void UpdatePropertyValueInternal(Node item, string propertyName)
+        {
+            PropertyNode node = item as PropertyNode;
+            if (node != null && node.PropertyDescriptor != null && node.PropertyDescriptor.Name == propertyName)
+            {
+                node.UpdateDisplayedValue();
+            }
+
+            foreach (Node child in item.Nodes)
+            {
+                UpdatePropertyValue(child, propertyName);
+            }
+        }
+
+        /// <summary>
+        /// Updates specified property value in property grid.
+        /// </summary>
+        /// <param name="propertyName">Property Name to update value for.</param>
+        public void UpdatePropertyValue(string propertyName)
+        {
+            foreach (Node item in _PropertyTree.Nodes)
+            {
+                UpdatePropertyValue(item, propertyName);
+            }
+        }
+
+        private void ClearPropertyTree()
+        {
+            _PropertyTree.BeginUpdate();
+            foreach (Node node in _PropertyTree.Nodes)
+            {
+                ClearPropertyNode(node, this);
+            }
+            _PropertyTree.Nodes.Clear();
+            _PropertyTree.EndUpdate(false);
+            //object[] keys = new object[_SuperTooltip.SuperTooltipInfoTable.Count];
+            //_SuperTooltip.SuperTooltipInfoTable.Keys.CopyTo(keys, 0);
+            //foreach (object key in keys)
+            //{
+            //    if(key is IComponent)
+            //        _SuperTooltip.SetSuperTooltip((IComponent)key, null);
+            //}
+        }
+
+        internal static void ClearPropertyNode(Node node, AdvPropertyGrid propertyGrid)
+        {
+            node.Style = null;
+            PropertyNode propNode = node as PropertyNode;
+            if (propNode != null)
+            {
+                propNode.IsDisposing = true;
+                if (propNode.IsEditing)
+                {
+                    propNode.CancelEdit();
+                    propNode.ExitEditorMode(eTreeAction.Code);
+                }
+                propNode.PropertySettings = null;
+                propNode.TargetComponent = null;
+                propNode.PropertyDescriptor = null;
+                propertyGrid.SuperTooltip.SetSuperTooltip(node, null);
+            }
+            if (node.HasChildNodes)
+            {
+                foreach (Node item in node.Nodes)
+                {
+                    ClearPropertyNode(item, propertyGrid);
+                }
+            }
+            node.Dispose();
+            if (propNode != null) propNode.IsDisposing = false;
+        }
+
+        private PropertyParser GetPropertyParser(object selectedObject)
+        {
+            if (selectedObject == null) throw new ArgumentNullException("selectedObject argument cannot be null");
+
+            Attribute[] attributes = new Attribute[this.BrowsableAttributes.Count];
+            this.BrowsableAttributes.CopyTo(attributes, 0);
+            PropertyParser parser = new PropertyParser(selectedObject,
+                                        attributes,
+                                        GetPropertyNodeFactory(),
+                                        new List<string>(_IgnoredProperties),
+                                        new List<string>(_IgnoredCategories),
+                                        this,
+                                        _PropertySettings);
+            parser.HelpType = _HelpType;
+
+            return parser;
+        }
+        private PropertyParser GetPropertyParser(object[] selectedObjects)
+        {
+            if (selectedObjects == null) throw new ArgumentNullException("selectedObject argument cannot be null");
+
+            Attribute[] attributes = new Attribute[this.BrowsableAttributes.Count];
+            this.BrowsableAttributes.CopyTo(attributes, 0);
+            PropertyParser parser = new PropertyParser(selectedObjects,
+                                        attributes,
+                                        GetPropertyNodeFactory(),
+                                        new List<string>(_IgnoredProperties),
+                                        new List<string>(_IgnoredCategories),
+                                        this,
+                                        _PropertySettings);
+            parser.HelpType = _HelpType;
+            return parser;
+        }
+
+        internal PropertyNodeFactory GetPropertyNodeFactory()
+        {
+            return new PropertyNodeFactory((IPropertyElementStyleProvider)this);
+        }
+        /// <summary>
+        /// Gets or sets the currently selected object.
+        /// </summary>
+        [DefaultValue(null), Browsable(false)]
+        public object SelectedObject
+        {
+            get
+            {
+                if (_SelectedObjects == null) return null;
+                return _SelectedObjects[0];
+            }
+            set
+            {
+                if (value != null)
+                {
+                    SelectedObjects = new object[] { value };
+                }
+                else
+                    SelectedObjects = null;
+            }
+        }
+
+        private AttributeCollection _BrowsableAttributes = null;
+        /// <summary>
+        /// Gets or sets the browsable attributes associated with the object that the property grid is attached to.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), EditorBrowsable(EditorBrowsableState.Advanced)]
+        public AttributeCollection BrowsableAttributes
+        {
+            get
+            {
+                if (_BrowsableAttributes == null)
+                {
+                    _BrowsableAttributes = new AttributeCollection(new Attribute[] { new BrowsableAttribute(true) });
+                }
+                return _BrowsableAttributes;
+            }
+            set
+            {
+                if ((value == null) || (value == AttributeCollection.Empty))
+                {
+                    _BrowsableAttributes = new AttributeCollection(new Attribute[] { BrowsableAttribute.Yes });
+                }
+                else
+                {
+                    Attribute[] array = new Attribute[value.Count];
+                    value.CopyTo(array, 0);
+                    _BrowsableAttributes = new AttributeCollection(array);
+                }
+                if (_SelectedObjects != null && _SelectedObjects.Length > 0)
+                    this.Reload(false);
+
+            }
+        }
+
+        /// <summary>
+        /// Refreshes the display of all property values in the grid.
+        /// </summary>
+        public void RefreshPropertyValues()
+        {
+            foreach (Node item in _PropertyTree.Nodes)
+            {
+                RefreshPropertyValues(item);
+            }
+        }
+
+        internal void RefreshPropertyValues(Node parentNode)
+        {
+            if (parentNode is PropertyNode)
+                ((PropertyNode)parentNode).UpdateDisplayedValue();
+            foreach (Node item in parentNode.Nodes)
+            {
+                RefreshPropertyValues(item);
+            }
+        }
+
+        /// <summary>
+        /// Reloads all properties from selected object.
+        /// </summary>
+        public void RefreshProperties()
+        {
+            Reload(false);
+        }
+        /// <summary>
+        /// Collapses all the categories in the AdvPropertyGrid.
+        /// </summary>
+        public void CollapseAllGridItems()
+        {
+            if (_PropertyTree == null || _PropertyTree.Nodes.Count == 0) return;
+            _PropertyTree.CollapseAll();
+        }
+        /// <summary>
+        /// Expands all the categories in the AdvPropertyGrid.
+        /// </summary>
+        public void ExpandAllGridItems()
+        {
+            if (_PropertyTree == null || _PropertyTree.Nodes.Count == 0) return;
+            _PropertyTree.ExpandAll();
+        }
+
+        private bool _ReloadPending = false;
+        private void Reload(bool selectedObjectChanged)
+        {
+            if (_IsInitializing)
+            {
+                _ReloadPending = true;
+                return;
+            }
+            _ReloadPending = false;
+
+            string lastSelectedProperty = null;
+            if (!selectedObjectChanged && _PropertyTree.SelectedNode is PropertyNode)
+            {
+                PropertyNode propNode = (PropertyNode)_PropertyTree.SelectedNode;
+                lastSelectedProperty = propNode.Text;
+            }
+
+            ClearPropertyTree();
+            _HelpPanel.Text = "";
+
+            if (_SelectedObjects != null && _SelectedObjects.Length > 0)
+            {
+                PropertyParser parser = null;
+                if (_SelectedObjects.Length == 1)
+                    parser = GetPropertyParser(_SelectedObjects[0]);
+                else
+                    parser = GetPropertyParser(_SelectedObjects);
+
+                _PropertyTree.BeginUpdate();
+                try
+                {
+                    parser.Parse(_PropertyTree.Nodes, _PropertySort, _SuperTooltip);
+                    if (!string.IsNullOrEmpty(lastSelectedProperty))
+                    {
+                        Node node = _PropertyTree.FindNodeByText(lastSelectedProperty);
+                        if (node != null)
+                            _PropertyTree.SelectedNode = node;
+                    }
+                }
+                finally
+                {
+                    _PropertyTree.EndUpdate();
+                }
+                _SearchTextBox.Enabled = true;
+            }
+            else
+                _SearchTextBox.Enabled = false;
+
+            OnPropertiesLoaded(EventArgs.Empty);
+        }
+
+        protected override void OnFontChanged(EventArgs e)
+        {
+            if (_CategoryStyle != null)
+            {
+                DisposeStyleFont(_CategoryStyle);
+                _CategoryStyle.Font = new Font(this.Font, FontStyle.Bold);
+
+                DisposeStyleFont(_ValueChangedStyle);
+                _ValueChangedStyle.Font = new Font(this.Font, FontStyle.Bold);
+            }
+            base.OnFontChanged(e);
+        }
+
+        void PropertyTreeBeforeNodeSelect(object sender, AdvTreeNodeCancelEventArgs e)
+        {
+            PropertyNode propertyNode = _PropertyTree.SelectedNode as PropertyNode;
+            if (propertyNode == null) return;
+
+            if (propertyNode.IsEditing)
+            {
+                if (!propertyNode.ApplyEdit())
+                    e.Cancel = true;
+            }
+        }
+
+        private static bool _HighlightPropertyOnUpdate = true;
+        /// <summary>
+        /// Gets or sets whether property is highlighted to confirm the value update by user. Default value is true.
+        /// </summary>
+        public static bool HighlightPropertyOnUpdate
+        {
+            get { return _HighlightPropertyOnUpdate; }
+            set
+            {
+                _HighlightPropertyOnUpdate = value;
+            }
+        }
+
+        private string[] _IgnoredProperties = new string[0];
+        /// <summary>
+        /// Gets or sets the list of property names that are not loaded into property grid regardless of their Browsable attribute setting.
+        /// </summary>
+        [Description("List of property names that are not loaded into property grid regardless of their Browsable attribute setting."), Category("Behavior")]
+        public string[] IgnoredProperties
+        {
+            get { return _IgnoredProperties; }
+            set
+            {
+                if (value == null) value = new string[0];
+                _IgnoredProperties = value;
+                Reload(false);
+            }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeIgnoredProperties()
+        {
+            return _IgnoredProperties != null && _IgnoredProperties.Length > 0;
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetIgnoredProperties()
+        {
+            IgnoredProperties = new string[0];
+            List<string> strings = new List<string>();
+        }
+
+        private string[] _IgnoredCategories = new string[0];
+        /// <summary>
+        /// Gets or sets the list of category names properties below to that are not loaded into property grid regardless of the property Browsable attribute setting.
+        /// </summary>
+        [Description("List of category names properties below to that are not loaded into property grid regardless of the property Browsable attribute setting."), Category("Behavior")]
+        public string[] IgnoredCategories
+        {
+            get { return _IgnoredCategories; }
+            set
+            {
+                if (value == null) value = new string[0];
+                _IgnoredCategories = value;
+                Reload(false);
+            }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeIgnoredCategories()
+        {
+            return _IgnoredCategories != null && _IgnoredCategories.Length > 0;
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetIgnoredCategories()
+        {
+            IgnoredCategories = new string[0];
+            List<string> strings = new List<string>();
+        }
+
+        /// <summary>
+        /// Returns reference to internal SuperTooltip component used by AdvPropertyGrid.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public SuperTooltip SuperTooltip
+        {
+            get { return _SuperTooltip; }
+            internal set { _SuperTooltip = value; }
+        }
+
+        internal void InvokePrepareErrorSuperTooltip(SuperTooltipInfo info, string propertyName, Exception exception, object value)
+        {
+            OnPrepareErrorSuperTooltip(new PropertyErrorTooltipEventArgs(info, propertyName, exception, value));
+        }
+        /// <summary>
+        /// Raises the PrepareErrorSuperTooltip event.
+        /// </summary>
+        /// <param name="e">Provides information about event.</param>
+        protected virtual void OnPrepareErrorSuperTooltip(PropertyErrorTooltipEventArgs e)
+        {
+            PropertyErrorTooltipEventHandler handler = PrepareErrorSuperTooltip;
+            if (handler != null) handler(this, e);
+        }
+
+        private void PropertyTreeKeyPress(object sender, KeyPressEventArgs e)
+        {
+            if ((char.IsLetterOrDigit(e.KeyChar) || char.IsPunctuation(e.KeyChar) || char.IsSeparator(e.KeyChar)) && _PropertyTree.SelectedNode is PropertyNode)
+            {
+                PropertyNode node = (PropertyNode)_PropertyTree.SelectedNode;
+                TextBoxDropDown editor = node.GetEditor();
+                if (editor != null && !editor.TextBox.Focused && !editor.TextBox.ReadOnly)
+                {
+                    if (editor.TextBox.Focus())
+                    {
+                        editor.Text = e.KeyChar.ToString();
+                        editor.TextBox.SelectionStart = 1;
+                    }
+                }
+            }
+            else if (char.IsWhiteSpace(e.KeyChar) && _PropertyTree.SelectedNode is PropertyCheckBoxNode)
+            {
+                PropertyCheckBoxNode node = (PropertyCheckBoxNode)_PropertyTree.SelectedNode;
+                if (!node.IsReadOnly)
+                    node.SelectNextValue();
+            }
+        }
+
+        /// <summary>
+        /// Sets the property grid column width.
+        /// </summary>
+        /// <param name="columnIndex">Column index</param>
+        /// <param name="width">Width of column in pixels</param>
+        public void SetPropertyColumnWidth(int columnIndex, int width)
+        {
+            _PropertyTree.Columns[columnIndex].Width.Absolute = width;
+            UpdateRelativeTreeColumnWidth();
+        }
+
+        private void UpdateRelativeTreeColumnWidth()
+        {
+            if (_PropertyTree.Columns[0].Width.Absolute != 0 || _PropertyTree.Columns[1].Width.Absolute != 0)
+            {
+                int column1 = 0;
+                if (_PropertyTree.Columns[0].Width.Absolute > 0)
+                    column1 = Math.Min(95, Math.Max(5, (int)Math.Floor(100 * (_PropertyTree.Columns[0].Width.Absolute / (float)(_PropertyTree.NodeLayout.ClientArea.Width - 0)))));
+                else
+                    column1 = _PropertyTree.Columns[0].Width.Relative;
+                int column2 = 100 - column1;
+                _PropertyTree.Columns[0].Width.Absolute = 0;
+                _PropertyTree.Columns[1].Width.Absolute = 0;
+                _PropertyTree.Columns[0].Width.Relative = column1;
+                _PropertyTree.Columns[1].Width.Relative = column2;
+            }
+        }
+        private void PropertyTreeColumnResized(object sender, EventArgs e)
+        {
+            UpdateRelativeTreeColumnWidth();
+        }
+
+        private void PropertyTreeDoubleClick(object sender, EventArgs e)
+        {
+            MouseEventArgs mouseArgs = e as MouseEventArgs;
+            if (mouseArgs == null) return;
+            if (_PropertyTree.SelectedNode != null && _PropertyTree.SelectedNode.Bounds.Contains(mouseArgs.X, mouseArgs.Y)) return;
+
+            Node node = _PropertyTree.GetNodeAt(mouseArgs.Y);
+            if (node is PropertyCategoryNode)
+                node.Toggle();
+        }
+
+        private AdvPropertyGridAppearance _Appearance = null;
+        /// <summary>
+        /// Defines the appearance of the control.
+        /// </summary>
+        [Category("Appearance"), Description("Defines appearance of the control."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public AdvPropertyGridAppearance Appearance
+        {
+            get { return _Appearance; }
+        }
+        private void AppearancePropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            if (e.PropertyName == "DefaultPropertyStyle")
+            {
+                if (_Appearance.DefaultPropertyStyle != null)
+                    _PropertyTree.NodeStyle = _Appearance.DefaultPropertyStyle;
+                else
+                    _PropertyTree.NodeStyle = _PropertyTree.Styles[STR_DefaultNodeStyle];
+            }
+        }
+        /// <summary>
+        /// Raises the ConvertPropertyValueToString event.
+        /// </summary>
+        /// <param name="e">Provides event data</param>
+        protected virtual void OnConvertPropertyValueToString(ConvertValueEventArgs e)
+        {
+            ConvertValueEventHandler handler = ConvertPropertyValueToString;
+            if (handler != null)
+                handler(this, e);
+        }
+        internal void InvokeConvertPropertyValueToString(ConvertValueEventArgs e)
+        {
+            OnConvertPropertyValueToString(e);
+        }
+        internal bool HasConvertPropertyValueToStringHandler
+        {
+            get
+            {
+                return ConvertPropertyValueToString != null;
+            }
+        }
+
+        /// <summary>
+        /// Raises the ConvertFromStringToPropertyValue event.
+        /// </summary>
+        /// <param name="e">Provides event data</param>
+        protected virtual void OnConvertFromStringToPropertyValue(ConvertValueEventArgs e)
+        {
+            ConvertValueEventHandler handler = ConvertFromStringToPropertyValue;
+            if (handler != null)
+                handler(this, e);
+        }
+        internal void InvokeConvertFromStringToPropertyValue(ConvertValueEventArgs e)
+        {
+            OnConvertFromStringToPropertyValue(e);
+        }
+        internal bool HasConvertFromStringToPropertyValueHandler
+        {
+            get
+            {
+                return ConvertFromStringToPropertyValue != null;
+            }
+        }
+
+        /// <summary>
+        /// Raises the ProvidePropertyValueList event.
+        /// </summary>
+        /// <param name="e">Provides event data</param>
+        protected virtual void OnProvidePropertyValueList(PropertyValueListEventArgs e)
+        {
+            PropertyValueListEventHandler handler = ProvidePropertyValueList;
+            if (handler != null)
+                handler(this, e);
+        }
+        internal void InvokeProvidePropertyValueList(PropertyValueListEventArgs e)
+        {
+            OnProvidePropertyValueList(e);
+        }
+        internal bool HasProvidePropertyValueListHandler
+        {
+            get
+            {
+                return ProvidePropertyValueList != null;
+            }
+        }
+
+        /// <summary>
+        /// Raises the ProvideUITypeEditor event.
+        /// </summary>
+        /// <param name="e">Provides event data</param>
+        protected virtual void OnProvideUITypeEditor(ProvideUITypeEditorEventArgs e)
+        {
+            ProvideUITypeEditorEventHandler handler = ProvideUITypeEditor;
+            if (handler != null)
+                handler(this, e);
+        }
+        internal void InvokeProvideUITypeEditor(ProvideUITypeEditorEventArgs e)
+        {
+            OnProvideUITypeEditor(e);
+        }
+        internal bool HasProvideUITypeEditorHandler
+        {
+            get
+            {
+                return ProvideUITypeEditor != null;
+            }
+        }
+
+        internal void PropertySettingsItemAdded(PropertySettings item)
+        {
+            item.PropertyChanged += new PropertyChangedEventHandler(PropertySettingChanged);
+        }
+
+        private void PropertySettingChanged(object sender, PropertyChangedEventArgs e)
+        {
+
+        }
+
+        internal void PropertySettingsItemRemoved(PropertySettings item)
+        {
+            item.PropertyChanged -= new PropertyChangedEventHandler(PropertySettingChanged);
+        }
+
+        private PropertySettingsCollection _PropertySettings = null;
+        public PropertySettingsCollection PropertySettings
+        {
+            get
+            {
+                return _PropertySettings;
+            }
+        }
+
+
+        private ePropertySort _PropertySort = ePropertySort.CategorizedAlphabetical;
+        /// <summary>
+        /// Gets or sets the property sorting inside of the grid.
+        /// </summary>
+        [DefaultValue(ePropertySort.CategorizedAlphabetical), Category("Appearance"), Description("Indicates property sorting inside of the grid.")]
+        public ePropertySort PropertySort
+        {
+            get { return _PropertySort; }
+            set
+            {
+                if (value != _PropertySort)
+                {
+                    ePropertySort oldValue = _PropertySort;
+                    _PropertySort = value;
+                    OnPropertySortChanged(oldValue, value);
+                }
+            }
+        }
+        private void OnPropertySortChanged(ePropertySort oldValue, ePropertySort newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("PropertySort"));
+            if (newValue == ePropertySort.Alphabetical)
+                _SortToolbarButton.Checked = true;
+            else if (newValue != ePropertySort.NoSort)
+                _CategoryToolbarButton.Checked = true;
+            else
+            {
+                _SortToolbarButton.Checked = false;
+                _CategoryToolbarButton.Checked = false;
+            }
+            Reload(false);
+        }
+
+        private ePropertyGridHelpType _HelpType = ePropertyGridHelpType.SuperTooltip;
+        /// <summary>
+        /// Gets or sets the help type that is provided by the control. Default help type is SuperTooltip which shows tooltip over each property
+        /// that provides property description.
+        /// </summary>
+        [DefaultValue(ePropertyGridHelpType.SuperTooltip), Category("Appearance"), Description("Indicates help type that is provided by the control.")]
+        public ePropertyGridHelpType HelpType
+        {
+            get { return _HelpType; }
+            set
+            {
+                if (value != _HelpType)
+                {
+                    ePropertyGridHelpType oldValue = _HelpType;
+                    _HelpType = value;
+                    OnHelpTypeChanged(oldValue, value);
+                }
+            }
+        }
+
+        private void OnHelpTypeChanged(ePropertyGridHelpType oldValue, ePropertyGridHelpType newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("HelpType"));
+            if (newValue != ePropertyGridHelpType.Panel)
+            {
+                _ExpandableSplitter.Visible = false;
+                _HelpPanel.Visible = false;
+            }
+            else
+            {
+                _ExpandableSplitter.Visible = true;
+                _HelpPanel.Visible = true;
+            }
+
+            if (newValue == ePropertyGridHelpType.SuperTooltip || oldValue == ePropertyGridHelpType.SuperTooltip)
+            {
+                Reload(false);
+            }
+        }
+
+        /// <summary>
+        /// Gets reference to the help panel that is displayed below property grid and which provides selected property description.
+        /// </summary>
+        [Browsable(false)]
+        public PanelControl HelpPanel
+        {
+            get
+            {
+                return _HelpPanel;
+            }
+        }
+        /// <summary>
+        /// Gets reference to the expandable splitter that is displayed above the help panel and allows resizing of the panel.
+        /// </summary>
+        [Browsable(false)]
+        public ExpandableSplitter HelpExpandableSplitter
+        {
+            get
+            {
+                return _ExpandableSplitter; ;
+            }
+        }
+
+        /// <summary>
+        /// Gets reference to internal AdvTree control that displays properties.
+        /// </summary>
+        [Browsable(false)]
+        public AdvTree.AdvTree PropertyTree
+        {
+            get { return _PropertyTree; }
+        }
+
+        /// <summary>
+        /// Gets or sets the grid lines color.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates grid lines color.")]
+        public Color GridLinesColor
+        {
+            get { return _PropertyTree.GridLinesColor; }
+            set { _PropertyTree.GridLinesColor = value; }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeGridLinesColor()
+        {
+            return _PropertyTree.ShouldSerializeGridLinesColor();
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetGridLinesColor()
+        {
+            _PropertyTree.ResetGridLinesColor();
+        }
+
+        /// <summary>
+        /// Gets the reference to the internal toolbar control displayed above the property grid.
+        /// </summary>
+        [Browsable(false)]
+        public Bar Toolbar
+        {
+            get { return _Toolbar; }
+        }
+
+        private bool _ToolbarVisible = true;
+        /// <summary>
+        /// Gets or sets whether toolbar is visible. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance"), Description("Indicates whether toolbar is visible.")]
+        public bool ToolbarVisible
+        {
+            get { return _ToolbarVisible; }
+            set
+            {
+                if (value != _ToolbarVisible)
+                {
+                    bool oldValue = _ToolbarVisible;
+                    _ToolbarVisible = value;
+                    OnToolbarVisibleChanged(oldValue, value);
+                }
+            }
+        }
+
+        private void OnToolbarVisibleChanged(bool oldValue, bool newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("ToolbarVisible"));
+            if (_Toolbar != null) _Toolbar.Visible = newValue;
+        }
+
+        private bool _SearchBoxVisible = true;
+        /// <summary>
+        /// Gets or sets whether search text box that allows property filtering is visible. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance"), Description("Indicates whether search text box that allows property filtering is visible")]
+        public bool SearchBoxVisible
+        {
+            get { return _SearchBoxVisible; }
+            set
+            {
+                if (value != _SearchBoxVisible)
+                {
+                    bool oldValue = _SearchBoxVisible;
+                    _SearchBoxVisible = value;
+                    OnSearchBoxVisibleChanged(oldValue, value);
+                }
+            }
+        }
+        private void OnSearchBoxVisibleChanged(bool oldValue, bool newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("SearchBoxVisible"));
+            _SearchTextBox.Visible = _SearchBoxVisible;
+        }
+
+        /// <summary>
+        /// Gets reference to internal TextBoxItem that represents search text box.
+        /// </summary>
+        [Browsable(false)]
+        public TextBoxItem SearchTextBoxItem
+        {
+            get { return _SearchTextBox; }
+        }
+
+        /// <summary>
+        /// Gets the reference to the property gird localization object which holds all system text used by the component.
+        /// </summary>
+        [Browsable(true), NotifyParentPropertyAttribute(true), Category("Localization"), Description("Gets system text used by the component."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public AdvPropertyGridLocalization SystemText
+        {
+            get { return _SystemText; }
+        }
+
+
+        private bool _TabKeyNavigation = true;
+        /// <summary>
+        /// Gets or sets whether Tab key navigates between property nodes. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether Tab key navigates between property nodes.")]
+        public bool TabKeyNavigation
+        {
+            get { return _TabKeyNavigation; }
+            set
+            {
+                _TabKeyNavigation = value;
+            }
+        }
+
+        /// <summary>
+        /// Find PropertyNode using the property name.
+        /// </summary>
+        /// <param name="propertyName">Property to name</param>
+        /// <returns>PropertyNode or null if not found</returns>
+        public PropertyNode GetPropertyNode(string propertyName)
+        {
+            PropertyNode node = FindPropertyNodeByText(_PropertyTree, propertyName, null, true) as PropertyNode;
+            return node;
+        }
+
+        private static Node FindPropertyNodeByText(DevComponents.AdvTree.AdvTree advTree, string text, Node startFromNode, bool ignoreCase)
+        {
+            if (startFromNode == null)
+                startFromNode = NodeOperations.GetFirstVisibleNode(advTree);
+            else
+                startFromNode = NodeOperations.GetAnyNextNode(startFromNode);
+            if (startFromNode == null) return null;
+
+            Node node = startFromNode;
+            StringComparison comparison = ignoreCase ? StringComparison.CurrentCultureIgnoreCase : StringComparison.CurrentCulture;
+            while (node != null)
+            {
+                if (node is PropertyNode && ((PropertyNode)node).PropertyName.StartsWith(text, comparison))
+                    return node;
+                else if (node.Text.StartsWith(text, comparison))
+                    return node;
+                node = NodeOperations.GetAnyNextNode(node);
+            }
+
+            return null;
+        }
+
+        protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
+        {
+            if (_TabKeyNavigation)
+            {
+                Keys keyPressed = (Keys)(keyData & ~Keys.Modifiers); // Must remove modifiers
+                if (keyPressed == Keys.Tab || keyPressed == Keys.Tab && (keyData & Keys.Shift) == Keys.Shift)
+                {
+                    Node node = null;
+                    if ((keyData & Keys.Shift) == Keys.Shift)
+                        node = GetPreviousPropertyNode();
+                    else
+                        node = GetNextPropertyNode();
+                    if (node != null)
+                    {
+                        bool processTab=true;
+                        if (_PropertyTree.SelectedNode is PropertyNode)
+                        {
+                            PropertyNode propertyNode = (PropertyNode)_PropertyTree.SelectedNode;
+                            if (propertyNode.IsEditing && !propertyNode.ApplyEdit())
+                                processTab = false;
+                        }
+
+                        if (processTab)
+                        {
+                            _PropertyTree.SelectNode(node, eTreeAction.Keyboard);
+                        }
+                        return true;
+                    }
+                }
+            }
+            return base.ProcessCmdKey(ref msg, keyData);
+        }
+        private Node GetNextPropertyNode()
+        {
+            if (_PropertyTree.Nodes.Count == 0) return null;
+
+            Node current = _PropertyTree.SelectedNode;
+            if (current == null)
+            {
+                current = _PropertyTree.Nodes[0];
+                if (current is PropertyNode && !((PropertyNode)current).IsReadOnly)
+                    return current;
+            }
+
+            while (current != null)
+            {
+                current = NodeOperations.GetNextVisibleNode(current);
+                if (current is PropertyNode && !((PropertyNode)current).IsReadOnly)
+                    return current;
+            }
+
+            return null;
+        }
+        private Node GetPreviousPropertyNode()
+        {
+            if (_PropertyTree.Nodes.Count == 0) return null;
+
+            Node current = _PropertyTree.SelectedNode;
+            if (current == null)
+            {
+                current = _PropertyTree.Nodes[_PropertyTree.Nodes.Count - 1];
+                if (current is PropertyNode && !((PropertyNode)current).IsReadOnly)
+                    return current;
+            }
+
+            while (current != null)
+            {
+                current = NodeOperations.GetPreviousVisibleNode(current);
+                if (current is PropertyNode && !((PropertyNode)current).IsReadOnly)
+                    return current;
+            }
+
+            return null;
+        }
+
+        private static char _PasswordChar = '*';
+        /// <summary>
+        /// Gets or sets the password character used by the property values that are marked with PropertyPasswordText attribute. 
+        /// </summary>
+        public static char PasswordChar
+        {
+            get { return _PasswordChar; }
+            set
+            {
+                _PasswordChar = value;
+            }
+        }
+
+        private ePropertySort _SubPropertiesDefaultSort = ePropertySort.Alphabetical;
+        /// <summary>
+        /// Gets or sets the sub property default sorting. Default value is Alphabetical.
+        /// </summary>
+        [DefaultValue(ePropertySort.Alphabetical), Category("Behavior"), Description("Indicates sub property default sorting.")]
+        public ePropertySort SubPropertiesDefaultSort
+        {
+            get { return _SubPropertiesDefaultSort; }
+            set
+            {
+                if (value != _SubPropertiesDefaultSort)
+                {
+                    ePropertySort oldValue = _SubPropertiesDefaultSort;
+                    _SubPropertiesDefaultSort = value;
+                    OnSubPropertiesDefaultSortChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when SubPropertiesDefaultSort property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnSubPropertiesDefaultSortChanged(ePropertySort oldValue, ePropertySort newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("SubPropertiesDefaultSort"));
+        }
+        #endregion
+
+        #region INotifyPropertyChanged Members
+        /// <summary>
+        /// Occurs when property defined by AdvPropertyGrid control has changed.
+        /// </summary>
+        public event PropertyChangedEventHandler PropertyChanged;
+        /// <summary>
+        /// Raises the PropertyChanged event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnPropertyChanged(PropertyChangedEventArgs e)
+        {
+            PropertyChangedEventHandler handler = PropertyChanged;
+            if (handler != null) handler(this, e);
+        }
+        #endregion
+
+        #region IPropertyGridLocalizer Members
+
+        string IPropertyGridLocalizer.GetPropertyName(string propertyName)
+        {
+            LocalizeEventHandler handler = Localize;
+            if (handler != null)
+            {
+                AdvPropertyGridLocalizeEventArgs e = new AdvPropertyGridLocalizeEventArgs(propertyName, ePropertyGridLocalizationType.PropertyName);
+                handler(this, e);
+                return e.LocalizedValue;
+            }
+            return null;
+        }
+
+        string IPropertyGridLocalizer.GetCategoryName(string categoryName)
+        {
+            LocalizeEventHandler handler = Localize;
+            if (handler != null)
+            {
+                AdvPropertyGridLocalizeEventArgs e = new AdvPropertyGridLocalizeEventArgs(categoryName, ePropertyGridLocalizationType.Category);
+                handler(this, e);
+                return e.LocalizedValue;
+            }
+            return null;
+
+        }
+
+        string IPropertyGridLocalizer.GetErrorTooltipMessage(string message)
+        {
+            LocalizeEventHandler handler = Localize;
+            if (handler != null)
+            {
+                AdvPropertyGridLocalizeEventArgs e = new AdvPropertyGridLocalizeEventArgs("ErrorBody", ePropertyGridLocalizationType.ErrorTooltip);
+                e.LocalizedValue = message;
+                handler(this, e);
+                return e.LocalizedValue;
+            }
+            return message;
+        }
+        #endregion
+
+        #region IPropertyElementStyleProvider Members
+        /// <summary>
+        /// Gets the style that is applied to property node when it is in read-only state.
+        /// </summary>
+        ElementStyle IPropertyElementStyleProvider.ReadOnlyStyle
+        {
+            get
+            {
+                if (_Appearance.ReadOnlyPropertyStyle != null && _Appearance.ReadOnlyPropertyStyle.Custom)
+                    return _Appearance.ReadOnlyPropertyStyle;
+                return _ReadOnlyStyle;
+            }
+        }
+        /// <summary>
+        /// Gets the style that is applied to property node when its value has changed from the default value for the property.
+        /// </summary>
+        ElementStyle IPropertyElementStyleProvider.ValueChangedStyle
+        {
+            get
+            {
+                if (_Appearance.ValueChangedPropertyStyle != null && _Appearance.ValueChangedPropertyStyle.Custom)
+                    return _Appearance.ValueChangedPropertyStyle;
+                return _ValueChangedStyle;
+            }
+        }
+        /// <summary>
+        /// Gets the style that is applied to property edit cell when its displaying unchanged property value.
+        /// </summary>
+        ElementStyle IPropertyElementStyleProvider.DefaultEditCellStyle
+        {
+            get
+            {
+                if (_Appearance.DefaultEditCellStyle != null && _Appearance.DefaultEditCellStyle.Custom)
+                    return _Appearance.DefaultEditCellStyle;
+                return _DefaultEditCellStyle;
+            }
+        }
+        /// <summary>
+        /// Gets the property category style.
+        /// </summary>
+        ElementStyle IPropertyElementStyleProvider.CategoryStyle
+        {
+            get
+            {
+                if (_Appearance.CategoryStyle != null && _Appearance.CategoryStyle.Custom)
+                    return _Appearance.CategoryStyle;
+                return _CategoryStyle;
+            }
+        }
+
+        #endregion
+
+        #region ISupportInitialize Members
+        private bool _IsInitializing = false;
+        /// <summary>
+        /// Signals the object that initialization is starting.
+        /// </summary>
+        public void BeginInit()
+        {
+            _PropertyTree.BeginUpdate();
+            _IsInitializing = true;
+        }
+        /// <summary>
+        /// Signals the object that initialization is ending.
+        /// </summary>
+        public void EndInit()
+        {
+            _PropertyTree.EndUpdate();
+            _IsInitializing = false;
+            if (_ReloadPending)
+            {
+                Reload(false);
+            }
+        }
+
+        #endregion
+    }
+
+    #region ePropertySort
+    /// <summary>
+    /// Defines the sorting for the AdvPropertyGrid properties.
+    /// </summary>
+    public enum ePropertySort
+    {
+        NoSort,
+        Alphabetical,
+        Categorized,
+        CategorizedAlphabetical
+    }
+    #endregion
+
+    #region eHelpType
+    /// <summary>
+    /// Specifies help types property grid uses to display help for selected property.
+    /// </summary>
+    public enum ePropertyGridHelpType
+    {
+        /// <summary>
+        /// No help is visible.
+        /// </summary>
+        HelpHidden,
+        /// <summary>
+        /// SuperTooltip with property description is displayed when mouse is over the property.
+        /// </summary>
+        SuperTooltip,
+        /// <summary>
+        /// Panel below property grid is displayed which shows the description for the selected property.
+        /// </summary>
+        Panel
+    }
+    #endregion
+
+    #region Localizer
+    /// <summary>
+    /// Defines an interface that is used by advanced property grid parser to localize property names.
+    /// </summary>
+    public interface IPropertyGridLocalizer
+    {
+        /// <summary>
+        /// Gets localized property name.
+        /// </summary>
+        /// <param name="propertyName">Property name to retrieve localized name for.</param>
+        /// <returns>Localized Property name or null to use default.</returns>
+        string GetPropertyName(string propertyName);
+        /// <summary>
+        /// Gets localized category name.
+        /// </summary>
+        /// <param name="categoryName">Category to retrieve localized value for.</param>
+        /// <returns>Localized Category name or null to use default.</returns>
+        string GetCategoryName(string categoryName);
+        /// <summary>
+        /// Gets localized message for Tooltip body when error setting the property value has occurred.
+        /// </summary>
+        /// <param name="message">Default system message.</param>
+        /// <returns>Localized message or null to use default.</returns>
+        string GetErrorTooltipMessage(string message);
+    }
+    /// <summary>
+    /// Defines delegate for Localize AdvPropertyGrid event.
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    public delegate void LocalizeEventHandler(object sender, AdvPropertyGridLocalizeEventArgs e);
+    /// <summary>
+    /// Defines data for Localize AdvPropertyGrid event.
+    /// </summary>
+    public class AdvPropertyGridLocalizeEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets the property name or category name localization is performed for. Inspect LocalizationType property to get localization type which
+        /// determines value specified in this property.
+        /// </summary>
+        public readonly string Key;
+        /// <summary>
+        /// Gets the localization type being performed.
+        /// </summary>
+        public readonly ePropertyGridLocalizationType LocalizationType;
+
+        /// <summary>
+        /// Gets or sets the localized value to be used. Set to null or empty string to use default value.
+        /// </summary>
+        public string LocalizedValue = null;
+
+        /// <summary>
+        /// Initializes a new instance of the AdvPropertyGridLocalizeEventArgs class.
+        /// </summary>
+        /// <param name="key">Key value event is raised for.</param>
+        /// <param name="localizationType">Localization Type being performed.</param>
+        public AdvPropertyGridLocalizeEventArgs(string key, ePropertyGridLocalizationType localizationType)
+        {
+            Key = key;
+            LocalizationType = localizationType;
+        }
+    }
+    /// <summary>
+    /// Defines the localization types for AdvPropertyGrid control.
+    /// </summary>
+    public enum ePropertyGridLocalizationType
+    {
+        /// <summary>
+        /// Property name is localized.
+        /// </summary>
+        PropertyName,
+        /// <summary>
+        /// Category is localized.
+        /// </summary>
+        Category,
+        /// <summary>
+        /// Error super tooltip parts are being localized.
+        /// </summary>
+        ErrorTooltip
+    }
+    #endregion
+
+    #region Error SuperTooltip Event
+    /// <summary>
+    /// Defines delegate for Localize AdvPropertyGrid event.
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    public delegate void PropertyErrorTooltipEventHandler(object sender, PropertyErrorTooltipEventArgs e);
+    /// <summary>
+    /// Defines data for PrepareErrorTooltip AdvPropertyGrid event.
+    /// </summary>
+    public class PropertyErrorTooltipEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets or sets the SuperTooltipInfo that represent tooltip that will be displayed to provide error information.
+        /// </summary>
+        public SuperTooltipInfo TooltipInfo = null;
+        /// <summary>
+        /// Gets the name of the property tooltip is displayed for.
+        /// </summary>
+        public readonly string PropertyName;
+        /// <summary>
+        /// Gets reference to the exception that was thrown when property was set.
+        /// </summary>
+        public readonly Exception Exception;
+        /// <summary>
+        /// Gets the value that was set and caused the error.
+        /// </summary>
+        public readonly object Value;
+
+        /// <summary>
+        /// Initializes a new instance of the PropertyErrorTooltipEventArgs class.
+        /// </summary>
+        /// <param name="tooltipInfo">SuperTooltipInfo for error tooltip</param>
+        /// <param name="propertyName">Property that caused error</param>
+        /// <param name="exception">Exception that was raised when property was set</param>
+        /// <param name="value">Value that caused the error.</param>
+        public PropertyErrorTooltipEventArgs(SuperTooltipInfo tooltipInfo, string propertyName, Exception exception, object value)
+        {
+            TooltipInfo = tooltipInfo;
+            PropertyName = propertyName;
+            Exception = exception;
+            Value = value;
+        }
+    }
+    #endregion
+
+    #region Value Conversion
+    /// <summary>
+    /// Defines delegate for Convert Value events.
+    /// </summary>
+    /// <param name="sender">Sender</param>
+    /// <param name="e">Event data.</param>
+    public delegate void ConvertValueEventHandler(object sender, ConvertValueEventArgs e);
+    /// <summary>
+    /// Defines data for Convert Value events that allows custom value conversion for property grid.
+    /// </summary>
+    public class ConvertValueEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets or sets the string property value.
+        /// </summary>
+        public string StringValue = null;
+        /// <summary>
+        /// Gets or sets the typed property value.
+        /// </summary>
+        public object TypedValue = null;
+        /// <summary>
+        /// Gets the property name for which conversion is being done.
+        /// </summary>
+        public readonly string PropertyName;
+        /// <summary>
+        /// Gets the target component that property is on.
+        /// </summary>
+        public readonly object TargetComponent;
+        /// <summary>
+        /// Gets or sets whether converted value is used. You need to set this property to true to indicate that you have performed value conversion.
+        /// </summary>
+        public bool IsConverted = false;
+        /// <summary>
+        /// Gets the property descriptor that describes property.
+        /// </summary>
+        public readonly PropertyDescriptor PropertyDescriptor; 
+
+        /// <summary>
+        /// Initializes a new instance of the ConvertValueEventArgs class.
+        /// </summary>
+        /// <param name="stringValue"></param>
+        /// <param name="typedValue"></param>
+        /// <param name="propertyName"></param>
+        /// <param name="targetComponent"></param>
+        public ConvertValueEventArgs(string stringValue, object typedValue, string propertyName, object targetComponent, PropertyDescriptor descriptor)
+        {
+            StringValue = stringValue;
+            TypedValue = typedValue;
+            PropertyName = propertyName;
+            TargetComponent = targetComponent;
+            PropertyDescriptor = descriptor;
+        }
+    }
+    #endregion
+
+    #region Property Value List
+    /// <summary>
+    /// Defines delegate for Convert Value events.
+    /// </summary>
+    /// <param name="sender">Sender</param>
+    /// <param name="e">Event data.</param>
+    public delegate void PropertyValueListEventHandler(object sender, PropertyValueListEventArgs e);
+    /// <summary>
+    /// Defines data for Convert Value events that allows custom value conversion for property grid.
+    /// </summary>
+    public class PropertyValueListEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets the property name value list is needed for.
+        /// </summary>
+        public readonly string PropertyName;
+        /// <summary>
+        /// Gets the target component that property is on.
+        /// </summary>
+        public readonly object TargetComponent;
+        /// <summary>
+        /// Gets or sets whether property ValueList provided is valid. You must set this property to true in order for the list to be used.
+        /// </summary>
+        public bool IsListValid = false;
+        /// <summary>
+        /// Gets or sets the list of valid property values.
+        /// </summary>
+        public List<string> ValueList = null;
+        /// <summary>
+        /// Gets the property descriptor that describes property.
+        /// </summary>
+        public readonly PropertyDescriptor PropertyDescriptor; 
+
+        /// <summary>
+        /// Initializes a new instance of the PropertyValueListEventArgs class.
+        /// </summary>
+        /// <param name="propertyName"></param>
+        /// <param name="targetComponent"></param>
+        public PropertyValueListEventArgs(string propertyName, object targetComponent, PropertyDescriptor descriptor)
+        {
+            PropertyName = propertyName;
+            TargetComponent = targetComponent;
+            PropertyDescriptor = descriptor;
+        }
+    }
+    #endregion
+
+    #region Element Style Provider
+    public interface IPropertyElementStyleProvider
+    {
+        /// <summary>
+        /// Gets the style that is applied to property node when it is in read-only state.
+        /// </summary>
+        ElementStyle ReadOnlyStyle { get;}
+        /// <summary>
+        /// Gets the style that is applied to property node when its value has changed from the default value for the property.
+        /// </summary>
+        ElementStyle ValueChangedStyle { get;}
+        /// <summary>
+        /// Gets the property category style.
+        /// </summary>
+        ElementStyle CategoryStyle { get;}
+        /// <summary>
+        /// Gets the default style for unchanged value edit cell.
+        /// </summary>
+        ElementStyle DefaultEditCellStyle { get;}
+    }
+    #endregion
+
+    #region Custom UITypeEditor  Event
+    /// <summary>
+    /// Defines delegate for Localize AdvPropertyGrid event.
+    /// </summary>
+    /// <param name="sender">Sender of event.</param>
+    /// <param name="e">Event data.</param>
+    public delegate void ProvideUITypeEditorEventHandler(object sender, ProvideUITypeEditorEventArgs e);
+    /// <summary>
+    /// Defines data for PrepareErrorTooltip AdvPropertyGrid event.
+    /// </summary>
+    public class ProvideUITypeEditorEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets the property name UITypeEditor is looked for.
+        /// </summary>
+        public readonly string PropertyName;
+        /// <summary>
+        /// Gets the property descriptor for property UITypeEditor is looked for.
+        /// </summary>
+        public readonly PropertyDescriptor PropertyDescriptor;
+        /// <summary>
+        /// Gets or sets the instance of UITypeEditor to be used for the property. You set this property to the UITypeEditor that you want
+        /// used for the property while editing. Note that you must set EditorSpecified = true in order for this value to be used.
+        /// </summary>
+        public System.Drawing.Design.UITypeEditor UITypeEditor = null;
+        /// <summary>
+        /// Gets or sets whether the value specified in UITypeEditor property is used. You must set this value to true in order for
+        /// UITypeEditor property value to be used.
+        /// </summary>
+        public bool EditorSpecified = false;
+
+        /// <summary>
+        /// Initializes a new instance of the ProvideUITypeEditorEventArgs class.
+        /// </summary>
+        /// <param name="propertyName">Property Name</param>
+        /// <param name="propertyDescriptor">Property Descriptor</param>
+        public ProvideUITypeEditorEventArgs(string propertyName, PropertyDescriptor propertyDescriptor)
+        {
+            PropertyName = propertyName;
+            PropertyDescriptor = propertyDescriptor;
+        }
+    }
+    #endregion
+
+    #region PropertyValueChanging
+    /// <summary>
+    /// Defines delegate for PropertyValueChanging event.
+    /// </summary>
+    /// <param name="sender">Event sender.</param>
+    /// <param name="e">Event data.</param>
+    public delegate void PropertyValueChangingEventHandler(object sender, PropertyValueChangingEventArgs e);
+    /// <summary>
+    /// Defines arguments for PropertyValueChanging event.
+    /// </summary>
+    public class PropertyValueChangingEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets the name of the property which value is changing.
+        /// </summary>
+        public readonly string PropertyName;
+        /// <summary>
+        /// Gets the new value that is being set on property.
+        /// </summary>
+        public readonly object NewValue;
+        /// <summary>
+        /// Gets or sets whether value assignment was handled by your code. Set to true to cancel internal AdvPropertyGrid property value assignment.
+        /// </summary>
+        public bool Handled = false;
+        /// <summary>
+        /// Gets the PropertyDescriptor for the property being changed.
+        /// </summary>
+        public readonly PropertyDescriptor PropertyDescriptor;
+        /// <summary>
+        /// Gets the full property path up to the selected object.
+        /// </summary>
+        public readonly string PropertyPath;
+        /// <summary>
+        /// Initializes a new instance of the PropertyValueChangingEventArgs class.
+        /// </summary>
+        /// <param name="propertyName"></param>
+        /// <param name="newValue"></param>
+        public PropertyValueChangingEventArgs(string propertyName, object newValue)
+        {
+            PropertyName = propertyName;
+            NewValue = newValue;
+            PropertyDescriptor = null;
+            PropertyPath = null;
+        }
+        /// <summary>
+        /// Initializes a new instance of the PropertyValueChangingEventArgs class.
+        /// </summary>
+        /// <param name="propertyName"></param>
+        /// <param name="newValue"></param>
+        public PropertyValueChangingEventArgs(string propertyName, object newValue, PropertyDescriptor propertyDesc, string propertyPath)
+        {
+            PropertyName = propertyName;
+            NewValue = newValue;
+            PropertyDescriptor = propertyDesc;
+            PropertyPath = propertyPath;
+        }
+    }
+    #endregion
+
+    #region ValidatePropertyValue
+    /// <summary>
+    /// Defines delegate for ValidatePropertyValue event.
+    /// </summary>
+    /// <param name="sender">Sender</param>
+    /// <param name="e">ValidatePropertyValue event arguments</param>
+    public delegate void ValidatePropertyValueEventHandler(object sender, ValidatePropertyValueEventArgs e);
+    /// <summary>
+    /// Defines event arguments for ValidatePropertyValue event.
+    /// </summary>
+    public class ValidatePropertyValueEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets or sets whether validation failed. Set to true to cancel property value assignment.
+        /// </summary>
+        public bool Cancel = false;
+        /// <summary>
+        /// Gets the name of the property which value is changing.
+        /// </summary>
+        public readonly string PropertyName;
+        /// <summary>
+        /// Gets the new value that is being set on property.
+        /// </summary>
+        public readonly object NewValue;
+        /// <summary>
+        /// Gets the target object on which property value is set.
+        /// </summary>
+        public readonly object Target;
+        /// <summary>
+        /// Gets or sets the message that is displayed to user if validation fails, i.e. Cancel=true.
+        /// </summary>
+        public string Message = string.Empty;
+
+        /// <summary>
+        /// Initializes a new instance of the ValidatePropertyValueEventArgs class.
+        /// </summary>
+        /// <param name="propertyName"></param>
+        /// <param name="newValue"></param>
+        /// <param name="target"></param>
+        public ValidatePropertyValueEventArgs(string propertyName, object newValue, object target)
+        {
+            PropertyName = propertyName;
+            NewValue = newValue;
+            Target = target;
+        }
+    }
+    #endregion
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/PropertyGrid/AdvPropertyGridAppearance.cs b/PROMS/DotNetBar Source Code/PropertyGrid/AdvPropertyGridAppearance.cs
new file mode 100644
index 00000000..73930d42
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/PropertyGrid/AdvPropertyGridAppearance.cs	
@@ -0,0 +1,257 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar
+{
+    [System.ComponentModel.ToolboxItem(false), System.ComponentModel.DesignTimeVisible(false), TypeConverter(typeof(System.ComponentModel.ExpandableObjectConverter))]
+    public class AdvPropertyGridAppearance : Component, INotifyPropertyChanged
+    {
+        #region Internal Implementation
+        protected override void Dispose(bool disposing)
+        {
+            if (BarUtilities.DisposeItemImages && !this.DesignMode)
+            {
+                BarUtilities.DisposeImage(ref _PropertyValueErrorImage);
+            }
+            base.Dispose(disposing);
+        }
+        private Color _ErrorHighlightColor = ColorScheme.GetColor(0xD99694);
+        /// <summary>
+        /// Gets or sets the color of the node highlight when error has occurred while setting property value. 
+        /// </summary>
+        [Category("Colors"), Description("Indicates color of the node highlight when error has occurred while setting property value.")]
+        public Color ErrorHighlightColor
+        {
+            get { return _ErrorHighlightColor; }
+            set
+            {
+                _ErrorHighlightColor = value;
+                OnPropertyChanged(new PropertyChangedEventArgs("ErrorHighlightColor"));
+            }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeErrorHighlightColor()
+        {
+            return !_ErrorHighlightColor.Equals(ColorScheme.GetColor(0xD99694));
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetErrorHighlightColor()
+        {
+            this.ErrorHighlightColor = ColorScheme.GetColor(0xD99694);
+        }
+
+        private Color _SuccessHighlightColor = ColorScheme.GetColor(0x9BBB59);
+        /// <summary>
+        /// Gets or sets the color of the node highlight when property update was successful.
+        /// </summary>
+        [Category("Colors"), Description("Indicates color of node highlight when property update was successful.")]
+        public Color SuccessHighlightColor
+        {
+            get { return _SuccessHighlightColor; }
+            set
+            {
+                _SuccessHighlightColor = value;
+                OnPropertyChanged(new PropertyChangedEventArgs("SuccessHighlightColor"));
+            }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeSuccessHighlightColor()
+        {
+            return !_SuccessHighlightColor.Equals(ColorScheme.GetColor(0x9BBB59));
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetSuccessHighlightColor()
+        {
+            this.SuccessHighlightColor = ColorScheme.GetColor(0x9BBB59);
+        }
+
+        private ElementStyle _DefaultPropertyStyle = null;
+        /// <summary>
+        /// Gets or sets default style for property node.
+        /// </summary>
+        /// <value>
+        /// Default value is null.
+        /// </value>
+        [DefaultValue(null), /*Editor("DevComponents.AdvTree.Design.ElementStyleTypeEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)),*/ Description("Gets or sets default style for property node.")]
+        public ElementStyle DefaultPropertyStyle
+        {
+            get { return _DefaultPropertyStyle; }
+            set
+            {
+                if (_DefaultPropertyStyle != value)
+                {
+                    if (_DefaultPropertyStyle != null)
+                        _DefaultPropertyStyle.StyleChanged -= new EventHandler(this.DefaultPropertyStyleChanged);
+                    if (value != null)
+                        value.StyleChanged += new EventHandler(DefaultPropertyStyleChanged);
+                    _DefaultPropertyStyle = value;
+                    OnPropertyChanged(new PropertyChangedEventArgs("DefaultPropertyStyle"));
+                }
+            }
+        }
+        private void DefaultPropertyStyleChanged(object sender, EventArgs e)
+        {
+            
+        }
+
+        private ElementStyle _ReadOnlyPropertyStyle = null;
+        /// <summary>
+        /// Gets or sets style for property node when in read-only state.
+        /// </summary>
+        /// <value>
+        /// Default value is null.
+        /// </value>
+        [DefaultValue(null), /*Editor("DevComponents.AdvTree.Design.ElementStyleTypeEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)),*/ Description("Gets or sets style for property node when in read-only state.")]
+        public ElementStyle ReadOnlyPropertyStyle
+        {
+            get { return _ReadOnlyPropertyStyle; }
+            set
+            {
+                if (_ReadOnlyPropertyStyle != value)
+                {
+                    if (_ReadOnlyPropertyStyle != null)
+                        _ReadOnlyPropertyStyle.StyleChanged -= this.ReadOnlyPropertyStyleChanged;
+                    if (value != null)
+                        value.StyleChanged += ReadOnlyPropertyStyleChanged;
+                    _ReadOnlyPropertyStyle = value;
+                    OnPropertyChanged(new PropertyChangedEventArgs("ReadOnlyPropertyStyle"));
+                }
+            }
+        }
+        private void ReadOnlyPropertyStyleChanged(object sender, EventArgs e)
+        {
+
+        }
+
+        private ElementStyle _ValueChangedPropertyStyle = null;
+        /// <summary>
+        /// Gets or sets style for property node when in read-only state.
+        /// </summary>
+        /// <value>
+        /// Default value is null.
+        /// </value>
+        [DefaultValue(null), /*Editor("DevComponents.AdvTree.Design.ElementStyleTypeEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)),*/ Description("Gets or sets style for property node when in read-only state.")]
+        public ElementStyle ValueChangedPropertyStyle
+        {
+            get { return _ValueChangedPropertyStyle; }
+            set
+            {
+                if (_ValueChangedPropertyStyle != value)
+                {
+                    if (_ValueChangedPropertyStyle != null)
+                        _ValueChangedPropertyStyle.StyleChanged -= this.ValueChangedPropertyStyleChanged;
+                    if (value != null)
+                        value.StyleChanged += ValueChangedPropertyStyleChanged;
+                    _ValueChangedPropertyStyle = value;
+                    OnPropertyChanged(new PropertyChangedEventArgs("ValueChangedPropertyStyle"));
+                }
+            }
+        }
+        private void ValueChangedPropertyStyleChanged(object sender, EventArgs e)
+        {
+
+        }
+
+        private ElementStyle _DefaultEditCellStyle = null;
+        /// <summary>
+        /// Gets or sets style for property node edit cell when displaying unchanged property value.
+        /// </summary>
+        /// <value>
+        /// Default value is null.
+        /// </value>
+        [DefaultValue(null), /*Editor("DevComponents.AdvTree.Design.ElementStyleTypeEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)),*/ Description("Indicates style for property node edit cell when displaying unchanged property value.")]
+        public ElementStyle DefaultEditCellStyle
+        {
+            get { return _DefaultEditCellStyle; }
+            set
+            {
+                if (_DefaultEditCellStyle != value)
+                {
+                    if (_DefaultEditCellStyle != null)
+                        _DefaultEditCellStyle.StyleChanged -= this.DefaultEditCellStyleChanged;
+                    if (value != null)
+                        value.StyleChanged += ValueChangedPropertyStyleChanged;
+                    _DefaultEditCellStyle = value;
+                    OnPropertyChanged(new PropertyChangedEventArgs("DefaultEditCellStyle"));
+                }
+            }
+        }
+        private void DefaultEditCellStyleChanged(object sender, EventArgs e)
+        {
+
+        }
+
+        private ElementStyle _CategoryStyle = null;
+        /// <summary>
+        /// Gets or sets style for property node when in read-only state.
+        /// </summary>
+        /// <value>
+        /// Default value is null.
+        /// </value>
+        [DefaultValue(null), /*Editor("DevComponents.AdvTree.Design.ElementStyleTypeEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)),*/ Description("Gets or sets style for property node when in read-only state.")]
+        public ElementStyle CategoryStyle
+        {
+            get { return _CategoryStyle; }
+            set
+            {
+                if (_CategoryStyle != value)
+                {
+                    if (_CategoryStyle != null)
+                        _CategoryStyle.StyleChanged -= this.CategoryStyleChanged;
+                    if (value != null)
+                        value.StyleChanged += CategoryStyleChanged;
+                    _CategoryStyle = value;
+                    OnPropertyChanged(new PropertyChangedEventArgs("CategoryStyle"));
+                }
+            }
+        }
+        private void CategoryStyleChanged(object sender, EventArgs e)
+        {
+
+        }
+
+        private Image _PropertyValueErrorImage = null;
+        /// <summary>
+        /// Gets or sets the image that is displayed in property name cell when property value has failed the validation.
+        /// </summary>
+        [DefaultValue(null), Category("Appearance"), Description("Indicates image that is displayed in property name cell when property value has failed the validation.")]
+        public Image PropertyValueErrorImage
+        {
+            get { return _PropertyValueErrorImage; }
+            set
+            {
+                if (_PropertyValueErrorImage == value) return;
+                _PropertyValueErrorImage = value;
+                OnPropertyChanged(new PropertyChangedEventArgs("PropertyValueErrorImage"));
+            }
+        }
+        #endregion
+
+        #region INotifyPropertyChanged Members
+        private void OnPropertyChanged(PropertyChangedEventArgs e)
+        {
+            PropertyChangedEventHandler handler = PropertyChanged;
+            if (handler != null)
+                handler(this, e);
+        }
+        public event PropertyChangedEventHandler PropertyChanged;
+        #endregion
+    }
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/PropertyGrid/AdvPropertyGridLocalization.cs b/PROMS/DotNetBar Source Code/PropertyGrid/AdvPropertyGridLocalization.cs
new file mode 100644
index 00000000..76c9cc13
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/PropertyGrid/AdvPropertyGridLocalization.cs	
@@ -0,0 +1,130 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represents the class that stores text used by property grid control for localization purposes.
+    /// </summary>
+    [ToolboxItem(false), TypeConverter(typeof(System.ComponentModel.ExpandableObjectConverter))]
+    public class AdvPropertyGridLocalization : INotifyPropertyChanged
+    {
+        #region Internal Implementation
+        private string _CategorizeToolbarTooltip = "Categorized";
+        /// <summary>
+        /// Gets or sets tooltip used by Categorized toolbar button.
+        /// </summary>
+        [DefaultValue("Categorized"), Description("Tooltip used by Categorize toolbar button"), Localizable(true)]
+        public string CategorizeToolbarTooltip
+        {
+            get { return _CategorizeToolbarTooltip; }
+            set
+            {
+                if (value != _CategorizeToolbarTooltip)
+                {
+                    string oldValue = _CategorizeToolbarTooltip;
+                    _CategorizeToolbarTooltip = value;
+                    OnCategorizeToolbarTooltipChanged(oldValue, value);
+                }
+            }
+        }
+        private void OnCategorizeToolbarTooltipChanged(string oldValue, string newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("CategorizeToolbarTooltip"));
+        }
+
+        private string _AlphabeticalToolbarTooltip = "Alphabetical";
+        /// <summary>
+        /// Gets or sets tooltip used by Alphabetical toolbar button.
+        /// </summary>
+        [DefaultValue("Alphabetical"), Description("Tooltip used by Alphabetical toolbar button"), Localizable(true)]
+        public string AlphabeticalToolbarTooltip
+        {
+            get { return _AlphabeticalToolbarTooltip; }
+            set
+            {
+                if (value != _AlphabeticalToolbarTooltip)
+                {
+                    string oldValue = _AlphabeticalToolbarTooltip;
+                    _AlphabeticalToolbarTooltip = value;
+                    OnAplhabeticalToolbarTooltipChanged(oldValue, value);
+                }
+            }
+        }
+        private void OnAplhabeticalToolbarTooltipChanged(string oldValue, string newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("AlphabeticalToolbarTooltip"));
+        }
+
+        private string _ErrorSettingPropertyValueTooltip = "Error setting the value. ";
+        /// <summary>
+        /// Gets or sets the tooltip text used in tooltip when error occurred during property value setting.
+        /// </summary>
+        [DefaultValue("Error setting the value. "), Description(""), Localizable(true)]
+        public string ErrorSettingPropertyValueTooltip
+        {
+            get { return _ErrorSettingPropertyValueTooltip; }
+            set
+            {
+                if (value != _ErrorSettingPropertyValueTooltip)
+                {
+                    string oldValue = _ErrorSettingPropertyValueTooltip;
+                    _ErrorSettingPropertyValueTooltip = value;
+                    OnErrorSettingPropertyValueTooltipChanged(oldValue, value);
+                }
+            }
+        }
+        private void OnErrorSettingPropertyValueTooltipChanged(string oldValue, string newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("ErrorSettingPropertyValueTooltip"));
+            
+        }
+
+        private string _SearchBoxWatermarkText = "Quick Search";
+        /// <summary>
+        /// Gets or sets the watermark text displayed in search text-box.
+        /// </summary>
+        [DefaultValue("Quick Search"), Localizable(true), Description("Indicates watermark text displayed in search text-box.")]
+        public string SearchBoxWatermarkText
+        {
+            get { return _SearchBoxWatermarkText; }
+            set
+            {
+                if (value != _SearchBoxWatermarkText)
+                {
+                    string oldValue = _SearchBoxWatermarkText;
+                    _SearchBoxWatermarkText = value;
+                    OnSearchBoxWatermarkTextChanged(oldValue, value);
+                }
+            }
+        }
+
+        private void OnSearchBoxWatermarkTextChanged(string oldValue, string newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("SearchBoxWatermarkText"));
+            
+        }
+        #endregion
+
+        #region INotifyPropertyChanged Members
+        /// <summary>
+        /// Raises the PropertyChanged event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnPropertyChanged(PropertyChangedEventArgs e)
+        {
+            PropertyChangedEventHandler handler = PropertyChanged;
+            if (handler != null) handler(this, e);
+        }
+        /// <summary>
+        /// Occurs when property defined by AdvPropertyGridLocalization class has changed.
+        /// </summary>
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        #endregion
+    }
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/PropertyGrid/PropertyCategoryNode.cs b/PROMS/DotNetBar Source Code/PropertyGrid/PropertyCategoryNode.cs
new file mode 100644
index 00000000..8f7005a8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/PropertyGrid/PropertyCategoryNode.cs	
@@ -0,0 +1,16 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represents the property category in AdvPropertyGrid.
+    /// </summary>
+    public class PropertyCategoryNode : DevComponents.AdvTree.Node
+    {
+
+    }
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/PropertyGrid/PropertyCheckBoxNode.cs b/PROMS/DotNetBar Source Code/PropertyGrid/PropertyCheckBoxNode.cs
new file mode 100644
index 00000000..b9310fd9
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/PropertyGrid/PropertyCheckBoxNode.cs	
@@ -0,0 +1,77 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel;
+using DevComponents.AdvTree;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represents check-box style property node in AdvPropertyGrid.
+    /// </summary>
+    public class PropertyCheckBoxNode : PropertyNode
+    {
+        #region Internal Implementation
+        /// <summary>
+        /// Initializes a new instance of the PropertyNode class.
+        /// </summary>
+        /// <param name="property"></param>
+        public PropertyCheckBoxNode(PropertyDescriptor property):base(property)
+        {
+        }
+
+        internal override void OnLoaded()
+        {
+            base.OnLoaded();
+            Cell cell = this.EditCell;
+            cell.CheckBoxStyle = eCheckBoxStyle.CheckBox;
+            cell.CheckBoxAlignment = eCellPartAlignment.NearCenter;
+            cell.CheckBoxVisible = true;
+        }
+
+        protected override void UpdateDisplayedValue(object propertyValue, bool refreshSubProperties)
+        {
+            base.UpdateDisplayedValue(propertyValue, refreshSubProperties);
+            if (propertyValue is bool)
+            {
+                this.EditCell.Checked = (bool)propertyValue;
+            }
+            else
+                this.EditCell.Checked = false;
+        }
+
+        public override void EnterEditorMode(eTreeAction action, bool focusEditor)
+        {
+        }
+
+        protected override void OnBeforeCellCheck(Cell cell, AdvTreeCellBeforeCheckEventArgs e)
+        {
+            if (this.IsReadOnly && e.Action != eTreeAction.Code)
+                e.Cancel = true;
+            else
+            {
+                if (e.Action != eTreeAction.Code)
+                {
+                    bool newValue = (e.NewCheckState == System.Windows.Forms.CheckState.Checked);
+                    e.Cancel = !ApplyValue(newValue, null);
+                }
+            }
+            base.OnBeforeCellCheck(cell, e);
+        }
+
+        protected internal override void InvokeNodeClick(object sender, EventArgs e)
+        {
+            base.InvokeNodeClick(sender, e);
+            if (e is TreeNodeMouseEventArgs)
+            {
+                Cell editCell = EditCell;
+                TreeNodeMouseEventArgs me = (TreeNodeMouseEventArgs)e;
+                if (editCell.Bounds.Contains(me.X, me.Y) && !editCell.CheckBoxBounds.Contains(me.X, me.Y))
+                    editCell.SetChecked(!editCell.Checked, eTreeAction.Mouse);
+            }
+        }
+        #endregion
+    }
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/PropertyGrid/PropertyDateTimeEditor.cs b/PROMS/DotNetBar Source Code/PropertyGrid/PropertyDateTimeEditor.cs
new file mode 100644
index 00000000..90af7efe
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/PropertyGrid/PropertyDateTimeEditor.cs	
@@ -0,0 +1,225 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using DevComponents.Editors;
+using DevComponents.Editors.DateTimeAdv;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Defines a attribute which applies an date-time editor to a property when used with AdvPropertyGrid control. Applies to DateTime property types only.
+    /// </summary>
+    public class PropertyDateTimeEditor : PropertyValueEditor
+    {
+        #region Implementation
+        /// <summary>
+        /// Gets or sets pre-defined format for date-time input.
+        /// </summary>
+        public eDateTimePickerFormat Format = eDateTimePickerFormat.Short;
+        /// <summary>
+        /// Gets or sets custom format for date-time input.
+        /// </summary>
+        public string CustomFormat = "";
+        /// <summary>
+        /// Gets or sets whether empty null/nothing state of the control is allowed. Default value is false.
+        /// </summary>
+        public bool AllowEmptyState = false;
+        /// <summary>
+        /// Gets or sets whether drop-down button that shows calendar is visible. Default value is true.
+        /// </summary>
+        public bool ShowDropDownButton = true;
+        /// <summary>
+        /// Gets or sets the minimum date that control accepts.
+        /// </summary>
+        public DateTime MinDate = DateTimeGroup.MinDateTime;
+        /// <summary>
+        /// Gets or sets the maximum date that control accepts.
+        /// </summary>
+        public DateTime MaxDate = DateTimeGroup.MaxDateTime;
+
+        /// <summary>
+        /// Initializes a new instance of the PropertyDateTimeEditor class.
+        /// </summary>
+        /// <param name="format"></param>
+        public PropertyDateTimeEditor(eDateTimePickerFormat format)
+        {
+            Format = format;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the PropertyDateTimeEditor class.
+        /// </summary>
+        /// <param name="minDate"></param>
+        /// <param name="maxDate"></param>
+        public PropertyDateTimeEditor(DateTime minDate, DateTime maxDate)
+        {
+            MinDate = minDate;
+            MaxDate = maxDate;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the PropertyDateTimeEditor class.
+        /// </summary>
+        /// <param name="format"></param>
+        /// <param name="minDate"></param>
+        /// <param name="maxDate"></param>
+        public PropertyDateTimeEditor(eDateTimePickerFormat format, DateTime minDate, DateTime maxDate)
+        {
+            Format = format;
+            MinDate = minDate;
+            MaxDate = maxDate;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the PropertyDateTimeEditor class.
+        /// </summary>
+        /// <param name="format"></param>
+        /// <param name="customFormat"></param>
+        /// <param name="allowEmptyState"></param>
+        /// <param name="showDropDownButton"></param>
+        /// <param name="minDate"></param>
+        /// <param name="maxDate"></param>
+        public PropertyDateTimeEditor(eDateTimePickerFormat format, string customFormat, bool allowEmptyState, bool showDropDownButton, DateTime minDate, DateTime maxDate)
+        {
+            Format = format;
+            CustomFormat = customFormat;
+            AllowEmptyState = allowEmptyState;
+            ShowDropDownButton = showDropDownButton;
+            MinDate = minDate;
+            MaxDate = maxDate;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the PropertyDateTimeEditor class.
+        /// </summary>
+        /// <param name="format"></param>
+        /// <param name="allowEmptyState"></param>
+        public PropertyDateTimeEditor(eDateTimePickerFormat format, bool allowEmptyState)
+        {
+            Format = format;
+            AllowEmptyState = allowEmptyState;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the PropertyDateTimeEditor class.
+        /// </summary>
+        /// <param name="customFormat"></param>
+        public PropertyDateTimeEditor(string customFormat)
+        {
+            CustomFormat = customFormat;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the PropertyDateTimeEditor class.
+        /// </summary>
+        /// <param name="customFormat"></param>
+        /// <param name="allowEmptyState"></param>
+        public PropertyDateTimeEditor(string customFormat, bool allowEmptyState)
+        {
+            CustomFormat = customFormat;
+            AllowEmptyState = allowEmptyState;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the PropertyDateTimeEditor class.
+        /// </summary>
+        public PropertyDateTimeEditor()
+        {
+            
+        }
+
+        public override IPropertyValueEditor CreateEditor(System.ComponentModel.PropertyDescriptor propertyDescriptor, object targetObject)
+        {
+            if (propertyDescriptor.PropertyType != typeof(DateTime) && propertyDescriptor.PropertyType != typeof(DateTime?))
+                throw new InvalidOperationException("PropertyDateTimeEditor works only with DateTime type properties");
+
+            DateTimeValueEditor editor = new DateTimeValueEditor();
+            editor.AutoBorderSize = 1;
+
+            if (!string.IsNullOrEmpty(CustomFormat))
+            {
+                editor.Format = eDateTimePickerFormat.Custom;
+                editor.CustomFormat = CustomFormat;
+            }
+            else
+                editor.Format = Format;
+            editor.AllowEmptyState = AllowEmptyState;
+            editor.BackgroundStyle.Class = "";
+            editor.BackgroundStyle.BackColor = Color.White;
+            editor.MinDate = this.MinDate;
+            editor.MaxDate = this.MaxDate;
+            
+            if (AllowEmptyState)
+            {
+                editor.ButtonClear.Visible = true;
+                editor.ButtonDropDown.DisplayPosition = 1;
+            }
+            editor.Height = Dpi.Height14;
+            editor.ButtonDropDown.Visible = ShowDropDownButton;
+
+            return editor;
+        }
+        #endregion
+
+        #region DateTimeValueEditor
+        private class DateTimeValueEditor : DateTimeInput, IPropertyValueEditor
+        {
+            #region IPropertyValueEditor Members
+
+            public System.Drawing.Font EditorFont
+            {
+                get
+                {
+                    return this.Font;
+                }
+                set
+                {
+                    this.Font = value;
+                }
+            }
+
+            public bool IsEditorFocused
+            {
+                get { return this.Focused; }
+            }
+
+            public void FocusEditor()
+            {
+                this.Focus();
+            }
+
+            public object EditValue
+            {
+                get
+                {
+                    return this.ValueObject;
+                }
+                set
+                {
+                    if (value == null)
+                        this.ValueObject = null;
+                    else if (this.Value != (DateTime)value)
+                        this.Value = (DateTime)value;
+                }
+            }
+
+            protected override void OnValueChanged(EventArgs e)
+            {
+                OnEditValueChanged(e);
+                base.OnValueChanged(e);
+            }
+
+            private void OnEditValueChanged(EventArgs e)
+            {
+                EventHandler ev = EditValueChanged;
+                if (ev != null) ev(this, e);
+            }
+
+            public event EventHandler EditValueChanged;
+
+            #endregion
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/PropertyGrid/PropertyDoubleEditor.cs b/PROMS/DotNetBar Source Code/PropertyGrid/PropertyDoubleEditor.cs
new file mode 100644
index 00000000..3c96ddff
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/PropertyGrid/PropertyDoubleEditor.cs	
@@ -0,0 +1,184 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using DevComponents.Editors;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Defines a attribute which applies an double type numeric editor to a property when used with AdvPropertyGrid control. Applies to double property types only.
+    /// </summary>
+    public class PropertyDoubleEditor : PropertyValueEditor
+    {
+        #region Implementation
+        /// <summary>
+        /// Gets or sets whether up/down button is shown.
+        /// </summary>
+        public bool ShowUpDownButton = true;
+        /// <summary>
+        /// Gets or sets the display format for the control when control does not have input focus.
+        /// </summary>
+        public string DisplayFormat = "";
+        /// <summary>
+        /// Gets or sets the minimum value that can be entered.
+        /// </summary>
+        public double MinValue = double.MinValue;
+        /// <summary>
+        /// Gets or sets the maximum value that can be entered.
+        /// </summary>
+        public double MaxValue = double.MaxValue;
+        /// <summary>
+        /// Gets or sets whether empty state i.e. null/nothing value is allowed when editor is used with nullable types.
+        /// </summary>
+        public bool AllowEmptyState = false;
+
+        /// <summary>
+        /// Initializes a new instance of the PropertyDoubleEditor class.
+        /// </summary>
+        public PropertyDoubleEditor()
+        {
+
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the PropertyDoubleEditor class.
+        /// </summary>
+        /// <param name="showUpDownButton"></param>
+        public PropertyDoubleEditor(bool showUpDownButton)
+        {
+            ShowUpDownButton = showUpDownButton;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the PropertyDoubleEditor class.
+        /// </summary>
+        /// <param name="minValue"></param>
+        /// <param name="maxValue"></param>
+        public PropertyDoubleEditor(double minValue, double maxValue)
+        {
+            MinValue = minValue;
+            MaxValue = maxValue;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the PropertyDoubleEditor class.
+        /// </summary>
+        /// <param name="showUpDownButton"></param>
+        /// <param name="minValue"></param>
+        /// <param name="maxValue"></param>
+        public PropertyDoubleEditor(bool showUpDownButton, double minValue, double maxValue)
+        {
+            ShowUpDownButton = showUpDownButton;
+            MinValue = minValue;
+            MaxValue = maxValue;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the PropertyDoubleEditor class.
+        /// </summary>
+        /// <param name="showUpDownButton"></param>
+        /// <param name="displayFormat"></param>
+        /// <param name="minValue"></param>
+        /// <param name="maxValue"></param>
+        public PropertyDoubleEditor(bool showUpDownButton, string displayFormat, double minValue, double maxValue)
+        {
+            ShowUpDownButton = showUpDownButton;
+            DisplayFormat = displayFormat;
+            MinValue = minValue;
+            MaxValue = maxValue;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the PropertyDoubleEditor class.
+        /// </summary>
+        /// <param name="showUpDownButton"></param>
+        /// <param name="displayFormat"></param>
+        public PropertyDoubleEditor(bool showUpDownButton, string displayFormat)
+        {
+            ShowUpDownButton = showUpDownButton;
+            DisplayFormat = displayFormat;
+        }
+
+        public override IPropertyValueEditor CreateEditor(System.ComponentModel.PropertyDescriptor propertyDescriptor, object targetObject)
+        {
+            if (propertyDescriptor.PropertyType != typeof(double) && propertyDescriptor.PropertyType != typeof(double?))
+                throw new InvalidOperationException("PropertyDateTimeEditor works only with double type properties");
+
+            DoubleValueEditor editor = new DoubleValueEditor();
+            editor.AutoBorderSize = 1;
+
+            if (!string.IsNullOrEmpty(DisplayFormat))
+            {
+                editor.DisplayFormat = DisplayFormat;
+            }
+            editor.ShowUpDown = ShowUpDownButton;
+            editor.Height = Dpi.Height14;
+            editor.BackgroundStyle.Class = "";
+            editor.BackgroundStyle.BackColor = Color.White;
+            editor.MinValue = MinValue;
+            editor.MaxValue = MaxValue;
+            editor.AllowEmptyState = AllowEmptyState;
+            return editor;
+        }
+        #endregion
+
+        private class DoubleValueEditor : DoubleInput, IPropertyValueEditor
+        {
+            #region IPropertyValueEditor Members
+
+            public System.Drawing.Font EditorFont
+            {
+                get
+                {
+                    return this.Font;
+                }
+                set
+                {
+                    this.Font = value;
+                }
+            }
+
+            public bool IsEditorFocused
+            {
+                get { return this.Focused; }
+            }
+
+            public void FocusEditor()
+            {
+                this.Focus();
+            }
+
+            public object EditValue
+            {
+                get
+                {
+                    return this.ValueObject;
+                }
+                set
+                {
+                    if (value == null)
+                        this.ValueObject = null;
+                    else
+                        this.Value = (double)value;
+                }
+            }
+
+            protected override void OnValueChanged(EventArgs e)
+            {
+                OnEditValueChanged(e);
+                base.OnValueChanged(e);
+            }
+
+            private void OnEditValueChanged(EventArgs e)
+            {
+                EventHandler ev = EditValueChanged;
+                if (ev != null) ev(this, e);
+            }
+
+            public event EventHandler EditValueChanged;
+
+            #endregion
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/PropertyGrid/PropertyIntegerEditor.cs b/PROMS/DotNetBar Source Code/PropertyGrid/PropertyIntegerEditor.cs
new file mode 100644
index 00000000..23a4b5eb
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/PropertyGrid/PropertyIntegerEditor.cs	
@@ -0,0 +1,194 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using DevComponents.Editors;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Defines a attribute which applies an integer type numeric editor to a property when used with AdvPropertyGrid control. Applies to int property types only.
+    /// </summary>
+    public class PropertyIntegerEditor : PropertyValueEditor
+    {
+        #region Implementation
+        /// <summary>
+        /// Gets or sets whether up/down button is shown.
+        /// </summary>
+        public bool ShowUpDownButton = true;
+        /// <summary>
+        /// Gets or sets the display format for the control when control does not have input focus.
+        /// </summary>
+        public string DisplayFormat = "";
+        /// <summary>
+        /// Gets or sets the minimum value that can be entered.
+        /// </summary>
+        public int MinValue = int.MinValue;
+        /// <summary>
+        /// Gets or sets the maximum value that can be entered.
+        /// </summary>
+        public int MaxValue = int.MaxValue;
+        /// <summary>
+        /// Gets or sets whether empty state i.e. null/nothing value is allowed when editor is used with nullable types.
+        /// </summary>
+        public bool AllowEmptyState = false;
+
+        /// <summary>
+        /// Initializes a new instance of the PropertyIntegerEditor class.
+        /// </summary>
+        public PropertyIntegerEditor()
+        {
+
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the PropertyIntegerEditor class.
+        /// </summary>
+        /// <param name="showUpDownButton"></param>
+        public PropertyIntegerEditor(bool showUpDownButton)
+        {
+            ShowUpDownButton = showUpDownButton;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the PropertyIntegerEditor class.
+        /// </summary>
+        /// <param name="minValue"></param>
+        /// <param name="maxValue"></param>
+        public PropertyIntegerEditor(int minValue, int maxValue)
+        {
+            MinValue = minValue;
+            MaxValue = maxValue;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the PropertyIntegerEditor class.
+        /// </summary>
+        /// <param name="showUpDownButton"></param>
+        /// <param name="minValue"></param>
+        /// <param name="maxValue"></param>
+        public PropertyIntegerEditor(bool showUpDownButton, int minValue, int maxValue)
+        {
+            ShowUpDownButton = showUpDownButton;
+            MinValue = minValue;
+            MaxValue = maxValue;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the PropertyIntegerEditor class.
+        /// </summary>
+        /// <param name="showUpDownButton"></param>
+        /// <param name="displayFormat"></param>
+        /// <param name="minValue"></param>
+        /// <param name="maxValue"></param>
+        public PropertyIntegerEditor(bool showUpDownButton, string displayFormat, int minValue, int maxValue)
+        {
+            ShowUpDownButton = showUpDownButton;
+            DisplayFormat = displayFormat;
+            MinValue = minValue;
+            MaxValue = maxValue;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the PropertyIntegerEditor class.
+        /// </summary>
+        /// <param name="showUpDownButton"></param>
+        /// <param name="displayFormat"></param>
+        public PropertyIntegerEditor(bool showUpDownButton, string displayFormat)
+        {
+            ShowUpDownButton = showUpDownButton;
+            DisplayFormat = displayFormat;
+        }
+
+        public override IPropertyValueEditor CreateEditor(System.ComponentModel.PropertyDescriptor propertyDescriptor, object targetObject)
+        {
+            if (propertyDescriptor.PropertyType != typeof(int) && propertyDescriptor.PropertyType != typeof(int?) &&
+                propertyDescriptor.PropertyType != typeof(byte) && propertyDescriptor.PropertyType != typeof(byte?))
+                throw new InvalidOperationException("PropertyIntegerEditor works only with int or byte type properties");
+
+            IntegerValueEditor editor = new IntegerValueEditor();
+            editor.AutoBorderSize = 1;
+
+            if (!string.IsNullOrEmpty(DisplayFormat))
+            {
+                editor.DisplayFormat = DisplayFormat;
+            }
+            editor.ShowUpDown = ShowUpDownButton;
+            editor.Height = Dpi.Height14;
+            editor.BackgroundStyle.Class = "";
+            editor.BackgroundStyle.BackColor = Color.White;
+            editor.AllowEmptyState = this.AllowEmptyState;
+            if (propertyDescriptor.PropertyType == typeof(byte) || propertyDescriptor.PropertyType == typeof(byte?))
+            {
+                editor.MinValue = Math.Max(byte.MinValue, MinValue);
+                editor.MaxValue = Math.Min(byte.MaxValue, MaxValue);
+            }
+            else
+            {
+                editor.MinValue = MinValue;
+                editor.MaxValue = MaxValue;
+            }
+
+            return editor;
+        }
+        #endregion
+
+        private class IntegerValueEditor : IntegerInput, IPropertyValueEditor
+        {
+            #region IPropertyValueEditor Members
+
+            public System.Drawing.Font EditorFont
+            {
+                get
+                {
+                    return this.Font;
+                }
+                set
+                {
+                    this.Font = value;
+                }
+            }
+
+            public bool IsEditorFocused
+            {
+                get { return this.Focused; }
+            }
+
+            public void FocusEditor()
+            {
+                this.Focus();
+            }
+
+            public object EditValue
+            {
+                get
+                {
+                    return this.ValueObject;
+                }
+                set
+                {
+                    if (value == null)
+                        this.ValueObject = null;
+                    else
+                        this.Value = (int)value;
+                }
+            }
+
+            protected override void OnValueChanged(EventArgs e)
+            {
+                OnEditValueChanged(e);
+                base.OnValueChanged(e);
+            }
+
+            private void OnEditValueChanged(EventArgs e)
+            {
+                EventHandler ev = EditValueChanged;
+                if (ev != null) ev(this, e);
+            }
+
+            public event EventHandler EditValueChanged;
+
+            #endregion
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/PropertyGrid/PropertyMultiChoiceEditor.cs b/PROMS/DotNetBar Source Code/PropertyGrid/PropertyMultiChoiceEditor.cs
new file mode 100644
index 00000000..c949a964
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/PropertyGrid/PropertyMultiChoiceEditor.cs	
@@ -0,0 +1,341 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Defines multiple choice, option or check-boxes, in-line AdvPropertyGrid property value editor.
+    /// </summary>
+    public class PropertyMultiChoiceEditor : PropertyValueEditor
+    {
+        private KeyValuePair<object, string>[] _Items = null;
+        private Color _TextColor = Color.Black;
+        private bool _MultiSelect = false;
+
+        /// <summary>
+        /// Initializes a new instance of the PropertyMultiChoiceEditor class.
+        /// </summary>
+        public PropertyMultiChoiceEditor()
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the PropertyMultiChoiceEditor class.
+        /// </summary>
+        /// <param name="items"></param>
+        public PropertyMultiChoiceEditor(KeyValuePair<object, string>[] items)
+        {
+            _Items = items;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the PropertyMultiChoiceEditor class.
+        /// </summary>
+        /// <param name="items"></param>
+        /// <param name="textColor"></param>
+        public PropertyMultiChoiceEditor(KeyValuePair<object, string>[] items, Color textColor)
+        {
+            _Items = items;
+            _TextColor = textColor;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the PropertyMultiChoiceEditor class.
+        /// </summary>
+        /// <param name="items"></param>
+        /// <param name="textColor"></param>
+        public PropertyMultiChoiceEditor(KeyValuePair<object, string>[] items, Color textColor, bool multiSelect)
+        {
+            _Items = items;
+            _TextColor = textColor;
+            _MultiSelect = multiSelect;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the PropertyMultiChoiceEditor class.
+        /// </summary>
+        /// <param name="items"></param>
+        /// <param name="textColor"></param>
+        public PropertyMultiChoiceEditor(KeyValuePair<object, string>[] items, bool multiSelect)
+        {
+            _Items = items;
+            _MultiSelect = multiSelect;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the PropertyMultiChoiceEditor class.
+        /// </summary>
+        /// <param name="commaSeparatedItemList"></param>
+        public PropertyMultiChoiceEditor(string commaSeparetedItemList)
+            : this(commaSeparetedItemList, Color.Black)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the PropertyMultiChoiceEditor class.
+        /// </summary>
+        /// <param name="commaSeparatedItemList"></param>
+        public PropertyMultiChoiceEditor(string commaSeparetedItemList, bool multiSelect)
+            : this(commaSeparetedItemList, Color.Black, multiSelect)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the PropertyMultiChoiceEditor class.
+        /// </summary>
+        /// <param name="items"></param>
+        /// <param name="textColor"></param>
+        public PropertyMultiChoiceEditor(string commaSeparatedItemList, Color textColor) : 
+            this(commaSeparatedItemList, textColor, false)
+        {
+        
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the PropertyMultiChoiceEditor class.
+        /// </summary>
+        /// <param name="items"></param>
+        /// <param name="textColor"></param>
+        public PropertyMultiChoiceEditor(string commaSeparatedItemList, Color textColor, bool multiSelect)
+        {
+            string[] items = commaSeparatedItemList.Split(',');
+            _Items = new KeyValuePair<object, string>[items.Length];
+            for (int i = 0; i < items.Length; i++)
+            {
+                _Items[i] = new KeyValuePair<object, string>(items[i], items[i]);
+            }
+
+            _TextColor = textColor;
+            _MultiSelect = multiSelect;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the PropertyMultiChoiceEditor class.
+        /// </summary>
+        /// <param name="values"></param>
+        /// <param name="keys"></param>
+        public PropertyMultiChoiceEditor(string[] values, object[] keys)
+            : this(values, keys, Color.Black)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the PropertyMultiChoiceEditor class.
+        /// </summary>
+        /// <param name="displayValues"></param>
+        /// <param name="keys"></param>
+        /// <param name="textColor"></param>
+        public PropertyMultiChoiceEditor(string[] displayValues, object[] keys, Color textColor)
+        {
+            if (displayValues.Length != keys.Length)
+                throw new ArgumentException("values.Length must be same as keys.Length");
+            if (displayValues.Length == 0)
+                throw new ArgumentException("values.Length must be greater than 0");
+
+            _Items = new KeyValuePair<object, string>[displayValues.Length];
+            for (int i = 0; i < displayValues.Length; i++)
+            {
+                _Items[i] = new KeyValuePair<object, string>(keys[i], displayValues[i]);
+            }
+
+            _TextColor = textColor;
+        }
+
+
+        public override IPropertyValueEditor CreateEditor(System.ComponentModel.PropertyDescriptor propertyDescriptor, object targetObject)
+        {
+            KeyValuePair<object, string>[] items = null;
+            bool isMultiSelect = _MultiSelect;
+            string selectedValue = string.Empty;
+            if (_Items == null)
+            {
+                if (propertyDescriptor.PropertyType.IsEnum)
+                {
+                    string[] enumNames = Enum.GetNames(propertyDescriptor.PropertyType);
+                    Array enumValue = Enum.GetValues(propertyDescriptor.PropertyType);
+                    items = new KeyValuePair<object, string>[enumNames.Length];
+                    for (int i = 0; i < enumValue.Length; i++)
+                    {
+                        items[i] = new KeyValuePair<object, string>(enumValue.GetValue(i), enumNames[i]);
+                    }
+                    FlagsAttribute flags = propertyDescriptor.Attributes[typeof(FlagsAttribute)] as FlagsAttribute;
+                    if (flags != null) isMultiSelect = true;                        
+                }
+                else
+                {
+                    items = new KeyValuePair<object, string>[1];
+                    items[0] = new KeyValuePair<object, string>(null, "Values not provided");
+                }
+            }
+            else
+                items = _Items;
+
+            if (targetObject != null)
+            {
+                if (propertyDescriptor.PropertyType.IsEnum)
+                    selectedValue = (string)Enum.GetName(propertyDescriptor.PropertyType, propertyDescriptor.GetValue(targetObject));
+                else
+                    selectedValue = (string)propertyDescriptor.GetValue(targetObject);
+            }
+
+            
+            PropertyMultiChoiceItemEditor editor = new PropertyMultiChoiceItemEditor(items, isMultiSelect, _TextColor, selectedValue);
+            return editor;
+        }
+
+        private class PropertyMultiChoiceItemEditor : ItemContainer, IPropertyValueEditor
+        {
+            private KeyValuePair<object, string>[] _ItemsDefinition = null;
+            private bool _IsMultiChoice = false;
+            private Color _TextColor = Color.Black;
+            #region Internal Implementation
+            /// <summary>
+            /// Initializes a new instance of the PropertyMultiChoiceItemEditor class.
+            /// </summary>
+            /// <param name="itemsDefinition"></param>
+            /// <param name="isMultiChoice"></param>
+            public PropertyMultiChoiceItemEditor(KeyValuePair<object, string>[] itemsDefinition, bool isMultiChoice, Color textColor, string initialSelection)
+            {
+                _ItemsDefinition = itemsDefinition;
+                _IsMultiChoice = isMultiChoice;
+                _TextColor = textColor;
+                CreateItems(initialSelection);
+            }
+
+            private void CreateItems(string initialSelection)
+            {
+                this.LayoutOrientation = eOrientation.Vertical;
+                this.SubItems.Clear();
+                this.ItemSpacing = 0;
+
+                foreach (KeyValuePair<object, string> definition in _ItemsDefinition)
+                {
+                    CheckBoxItem item = new CheckBoxItem();
+                    item.Text = definition.Value;
+                    if (item.Text == initialSelection) item.Checked = true;
+                    item.Tag = definition.Key;
+                    item.TextColor = _TextColor;
+                    if (_IsMultiChoice)
+                        item.CheckBoxStyle = eCheckBoxStyle.CheckBox;
+                    else
+                        item.CheckBoxStyle = eCheckBoxStyle.RadioButton;
+                    item.CheckedChanged += new CheckBoxChangeEventHandler(ItemCheckedChanged);
+                    this.SubItems.Add(item);
+                }
+                this.Style = eDotNetBarStyle.StyleManagerControlled;
+            }
+
+            private void ItemCheckedChanged(object sender, CheckBoxChangeEventArgs e)
+            {
+                if (_SettingEditValue) return;
+                OnEditValueChanged(EventArgs.Empty);
+            }
+            #endregion
+
+            #region IPropertyValueEditor Members
+
+            public System.Drawing.Font EditorFont
+            {
+                get
+                {
+                    return null;
+                }
+                set
+                {
+
+                }
+            }
+
+            public bool IsEditorFocused
+            {
+                get { return false; }
+            }
+
+            public void FocusEditor()
+            {
+
+            }
+
+            private bool _SettingEditValue = false;
+            private char StringValueSeparator = ',';
+            public object EditValue
+            {
+                get
+                {
+                    object value = null;
+                    foreach (CheckBoxItem item in this.SubItems)
+                    {
+                        if (item.Checked)
+                        {
+                            if (_IsMultiChoice)
+                            {
+                                if (value == null)
+                                    value = item.Tag;
+                                else if (value is string)
+                                    value = (string)value + StringValueSeparator + (string)item.Tag;
+                                else if (value is uint)
+                                    value = (uint)value | (uint)item.Tag;
+                                else if (value is int)
+                                    value = (int)value | (int)item.Tag;
+                                else if (value is long)
+                                    value = (long)value | (long)item.Tag;
+                            }
+                            else
+                            {
+                                value = item.Tag;
+                                break;
+                            }
+                        }
+                    }
+                    return value;
+                }
+                set
+                {
+                    _SettingEditValue = true;
+                    List<string> valueList = null;
+                    if (_IsMultiChoice)
+                    {
+                        if (value is string)
+                            valueList = new List<string>(value.ToString().Split(StringValueSeparator));
+                        else if (value is string[])
+                            valueList = new List<string>((string[])value);
+                    }
+                    foreach (CheckBoxItem item in this.SubItems)
+                    {
+                        if (_IsMultiChoice)
+                        {
+                            if (valueList != null && valueList.Contains(item.Tag.ToString()))
+                                item.Checked = true;
+                            else if (item.Checked)
+                                item.Checked = false;
+                        }
+                        else
+                        {
+                            if (value == item.Tag || value!=null && value.Equals(item.Tag))
+                            {
+                                item.Checked = true;
+                                break;
+                            }
+                            else
+                            {
+                                item.Checked = false;
+                            }
+                        }
+                    }
+                    _SettingEditValue = false;
+                }
+            }
+
+            private void OnEditValueChanged(EventArgs e)
+            {
+                EventHandler ev = EditValueChanged;
+                if (ev != null) ev(this, e);
+            }
+            public event EventHandler EditValueChanged;
+
+            #endregion
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/PropertyGrid/PropertyNode.cs b/PROMS/DotNetBar Source Code/PropertyGrid/PropertyNode.cs
new file mode 100644
index 00000000..d1c78165
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/PropertyGrid/PropertyNode.cs	
@@ -0,0 +1,2502 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+using DevComponents.AdvTree;
+using System.ComponentModel;
+using System.Reflection;
+using DevComponents.DotNetBar.Controls;
+using System.Drawing;
+using System.Windows.Forms;
+using System.Drawing.Design;
+using System.Windows.Forms.Design;
+using System.Drawing.Imaging;
+using System.Collections;
+using System.Threading;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represents a property node in AdvPropertyGrid.
+    /// </summary>
+    public class PropertyNode : Node, ITypeDescriptorContext, IWindowsFormsEditorService
+    {
+        #region Private Variables
+        private const string ID_UITypeEditorImage = "UITypeEditorImage";
+        #endregion
+
+        #region Constructors
+        private PropertyDescriptor _Property = null;
+        /// <summary>
+        /// Initializes a new instance of the PropertyNode class.
+        /// </summary>
+        /// <param name="property"></param>
+        public PropertyNode(PropertyDescriptor property)
+        {
+            _Property = property;
+            this.CellNavigationEnabled = false;
+
+            PasswordPropertyTextAttribute passwordAttribute = _Property.Attributes[typeof(PasswordPropertyTextAttribute)] as PasswordPropertyTextAttribute;
+            if (passwordAttribute != null && passwordAttribute.Password)
+                IsPassword = true;
+        }
+        #endregion
+
+        #region Internal Implementation
+        public virtual void UpdateDisplayedValue()
+        {
+            UpdateDisplayedValue(true);
+        }
+        public virtual void UpdateDisplayedValue(bool refreshSubProperties)
+        {
+            if (_IsDisposed || _IsDisposing) return;
+            object propertyValue = PropertyValue;
+            UpdateDisplayedValue(propertyValue, refreshSubProperties);
+        }
+
+        protected virtual void UpdateDisplayedValue(object propertyValue)
+        {
+            UpdateDisplayedValue(propertyValue, true);
+        }
+        protected virtual void UpdateDisplayedValue(object propertyValue, bool refreshSubProperties)
+        {
+            if (_IsDisposed || _IsDisposing) return;
+
+            // Value cell
+            Cell cell = this.EditCell;
+            cell.Text = GetPropertyTextValue(propertyValue);
+            if (GetIsDefaultValue(propertyValue))
+            {
+                cell.StyleNormal = EditCellStyle;
+            }
+            else
+            {
+                cell.StyleNormal = ValueChangedStyle;
+            }
+
+            RevertEditorValue();
+
+            if (IsTypeEditorPaintValueSupported)
+            {
+                UITypeEditor typeEditor = GetTypeEditor();
+                if (typeEditor != null && typeEditor.GetPaintValueSupported(this))
+                {
+                    Rectangle r = new Rectangle(0, 0, 20, 13);
+                    Bitmap image = new Bitmap(r.Width, r.Height, PixelFormat.Format32bppArgb);
+                    image.Tag = ID_UITypeEditorImage;
+                    using (Graphics g = Graphics.FromImage(image))
+                    {
+                        bool error = false;
+                        try
+                        {
+                            typeEditor.PaintValue(new PaintValueEventArgs(this, propertyValue, g, r));
+                            //typeEditor.PaintValue(propertyValue, g, r);
+                        }
+                        catch
+                        {
+                            error = true;
+                        }
+                        if (error)
+                            DisplayHelp.FillRectangle(g, r, Color.White);
+
+                        DisplayHelp.DrawRectangle(g, SwatchBorderColor, r);
+                    }
+                    cell.Images.Image = image;
+                }
+                else
+                {
+                    if (cell.Images.Image != null && cell.Images.Image.Tag is string && (string)cell.Images.Image.Tag == ID_UITypeEditorImage)
+                    {
+                        Image image = cell.Images.Image;
+                        cell.Images.Image = null;
+                        image.Dispose();
+                    }
+                }
+            }
+
+            if (refreshSubProperties)
+            {
+                UpdateChildProperties();
+                //if (this.HasChildNodes && this.Expanded)
+                //    LoadChildProperties();
+            }
+        }
+        private Color _SwatchBorderColor = Color.Black;
+        private Color SwatchBorderColor
+        {
+            get
+            {
+                return _SwatchBorderColor;
+            }
+        }
+        protected virtual bool IsTypeEditorPaintValueSupported
+        {
+            get
+            {
+                return true;
+            }
+        }
+
+        private string GetPropertyTextValue()
+        {
+            return GetPropertyTextValue(this.PropertyValue);
+        }
+
+        protected string GetPropertyTextValue(object propertyValue)
+        {
+            if (_PropertySettings != null && _PropertySettings.HasConvertPropertyValueToStringHandler)
+            {
+                ConvertValueEventArgs e = new ConvertValueEventArgs(null, propertyValue, GetPropertyName(), GetTargetComponent(), PropertyDescriptor);
+                _PropertySettings.InvokeConvertPropertyValueToString(e);
+                if (e.IsConverted && e.StringValue != null)
+                    return e.StringValue;
+            }
+
+            AdvPropertyGrid grid = AdvPropertyGrid;
+            if (grid != null && grid.HasConvertPropertyValueToStringHandler)
+            {
+                ConvertValueEventArgs e = new ConvertValueEventArgs(null, propertyValue, GetPropertyName(), GetTargetComponent(), PropertyDescriptor);
+                grid.InvokeConvertPropertyValueToString(e);
+                if (e.IsConverted && e.StringValue != null)
+                    return e.StringValue;
+            }
+
+            string textValue = null;
+            TypeConverter typeConverter = this.TypeConverter;
+            try
+            {
+                textValue = typeConverter.ConvertToString(this, propertyValue);
+            }
+            catch (Exception)
+            {
+            }
+            if (textValue == null)
+            {
+                textValue = string.Empty;
+            }
+            if (IsPassword)
+            {
+                textValue = StringHelper.Repeat(AdvPropertyGrid.PasswordChar, textValue.Length);
+            }
+            return textValue;
+        }
+
+        private TypeConverter _TypeConverter = null;
+        internal virtual TypeConverter TypeConverter
+        {
+            get
+            {
+                if (_PropertySettings != null && _PropertySettings.TypeConverter != null)
+                    return _PropertySettings.TypeConverter;
+                if (_TypeConverter == null)
+                {
+                    _TypeConverter = GetPropertyDescriptor().Converter;
+                }
+                return _TypeConverter;
+            }
+        }
+
+        public virtual Type PropertyType
+        {
+            get
+            {
+                object propertyValue = this.PropertyValue;
+                if (propertyValue != null)
+                {
+                    return propertyValue.GetType();
+                }
+                else
+                    return _Property.PropertyType;
+                return null;
+            }
+        }
+
+        public virtual object PropertyValue
+        {
+            get
+            {
+                try
+                {
+                    object propertyValue = this.GetPropertyValue(this.GetTargetComponent());
+                    return propertyValue;
+                }
+                catch (Exception exception)
+                {
+                    return exception;
+                }
+            }
+            set
+            {
+                ApplyValue(value, null);
+            }
+        }
+
+        protected virtual bool GetIsDefaultValue()
+        {
+            return GetIsDefaultValue(PropertyValue);
+        }
+
+        private bool GetIsDefaultValue(object propertyValue)
+        {
+            DefaultValueAttribute defaultValueAttribute = GetPropertyDescriptor().Attributes[typeof(DefaultValueAttribute)] as DefaultValueAttribute;
+            if (defaultValueAttribute != null)
+            {
+                if (defaultValueAttribute.Value != null)
+                    return (defaultValueAttribute.Value.Equals(propertyValue));
+                return defaultValueAttribute.Value == propertyValue;
+            }
+
+            if (propertyValue != null)
+            {
+                string strfunct = "ShouldSerialize" + GetPropertyName();
+                PropertyDescriptor propDesc = GetPropertyDescriptor();
+                if (propDesc != null && propDesc.ComponentType != null && propDesc.ComponentType.GetMethod(strfunct, BindingFlags.Default | BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance) != null)
+                {
+                    MethodInfo mi = propDesc.ComponentType.GetMethod(strfunct, BindingFlags.Default | BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance);
+                    object target = GetTargetComponent();
+                    if (mi.DeclaringType.IsInstanceOfType(target)) // If method is injected by designer code we need to detect that to avoid Invalid Target Exception from RunTimeMethodInfo.CheckConsistency
+                    {
+                        object result = mi.Invoke(GetTargetComponent(), null);
+                        if (result is bool && ((bool)result))
+                            return false;
+                    }
+                }
+            }
+
+            return true;
+        }
+
+        protected virtual object GetTargetComponent()
+        {
+            if (_TargetComponent != null) return _TargetComponent;
+
+            Node node = this.Parent as Node;
+            while (node != null)
+            {
+                if (node is PropertyNode)
+                    return ((PropertyNode)node).GetTargetComponent();
+                node = node.Parent as Node;
+            }
+
+            return _TargetComponent;
+        }
+
+        private object _TargetComponent;
+        internal object TargetComponent
+        {
+            get { return _TargetComponent; }
+            set
+            {
+                object oldValue = _TargetComponent;
+                _TargetComponent = value;
+                OnTargetComponentChanged(oldValue, value);
+            }
+        }
+        private bool _PropertyChangedEventHandled = false;
+        protected virtual void OnTargetComponentChanged(object oldValue, object newValue)
+        {
+            string eventName = GetPropertyName() + "Changed";
+            if (oldValue != null && _PropertyChangedEventHandled)
+            {
+                try
+                {
+                    if (oldValue is ICustomTypeDescriptor)
+                    {
+                        EventDescriptor item = GetEventDescriptor(oldValue, eventName);
+                        if (item != null)
+                            item.RemoveEventHandler(oldValue, this.PropertyValueChangedEventHandler);
+                    }
+                    else
+                    {
+                        EventInfo info = oldValue.GetType().GetEvent(eventName);
+                        if (info != null)
+                            info.RemoveEventHandler(oldValue, this.PropertyValueChangedEventHandler);
+                    }
+                }
+                finally
+                {
+                    _PropertyChangedEventHandled = false;
+                }
+            }
+
+            if (newValue != null && GetPropertyDescriptor() != null)
+            {
+                // Check whether object has PropertyNameChanged event handler...
+                if (newValue is ICustomTypeDescriptor)
+                {
+                    EventDescriptor item = GetEventDescriptor(newValue, eventName);
+                    if (item != null)
+                    {
+                        try
+                        {
+                            item.AddEventHandler(newValue, PropertyValueChangedEventHandler);
+                            _PropertyChangedEventHandled = true;
+                        }
+                        catch
+                        {
+                            _PropertyChangedEventHandled = false;
+                        }
+                    }
+                }
+                else
+                {
+                    EventInfo info = newValue.GetType().GetEvent(eventName);
+                    if (info != null && info.EventHandlerType == typeof(EventHandler))
+                    {
+                        try
+                        {
+                            info.AddEventHandler(newValue, PropertyValueChangedEventHandler);
+                            _PropertyChangedEventHandled = true;
+                        }
+                        catch
+                        {
+                            _PropertyChangedEventHandled = false;
+                        }
+                    }
+                }
+
+            }
+        }
+
+        private EventDescriptor GetEventDescriptor(object value, string eventName)
+        {
+            EventDescriptorCollection col = ((ICustomTypeDescriptor)value).GetEvents();
+            foreach (EventDescriptor item in col)
+            {
+                if (item.Name == eventName)
+                {
+                    if (item.EventType == typeof(EventHandler))
+                    {
+                        return item;
+                    }
+                    break;
+                }
+            }
+            return null;
+        }
+
+        private void PropertyValueChanged(object sender, EventArgs e)
+        {
+            UpdateDisplayedValue();
+        }
+
+        private EventHandler _PropertyValueChangedEventHandler = null;
+        private EventHandler PropertyValueChangedEventHandler
+        {
+            get
+            {
+                if (_PropertyValueChangedEventHandler == null)
+                    _PropertyValueChangedEventHandler = new EventHandler(PropertyValueChanged);
+                return _PropertyValueChangedEventHandler;
+            }
+        }
+
+        protected virtual object GetPropertyValue(object target)
+        {
+            PropertyDescriptor propertyDescriptor = GetPropertyDescriptor();
+            if (propertyDescriptor == null)
+            {
+                return null;
+            }
+
+            if (_IsMultiObject)
+            {
+                object[] targets = (object[])target;
+                object returnValue = GetPropertyValueCore(targets[0], propertyDescriptor);
+                TypeConverter converter = this.TypeConverter;
+                for (int i = 1; i < targets.Length; i++)
+                {
+                    object value = null;
+                    if (propertyDescriptor.ComponentType.IsAssignableFrom(targets[i].GetType()))
+                        value = GetPropertyValueCore(targets[i], propertyDescriptor);
+                    else
+                    {
+                        //PropertyDescriptor desc2 = PropertyParser.GetProperty(propertyDescriptor.Name, targets[i], converter.GetPropertiesSupported(this) ? converter : null);
+                        PropertyDescriptor desc2 = PropertyParser.GetProperty(propertyDescriptor.Name, targets[i], null);
+                        value = GetPropertyValueCore(targets[i], desc2);
+                    }
+                    if (returnValue != null && !returnValue.Equals(value) || returnValue == null && value != null)
+                    {
+                        returnValue = null;
+                        break;
+                    }
+                }
+                return returnValue;
+            }
+            else
+            {
+                return GetPropertyValueCore(target, propertyDescriptor);
+            }
+        }
+
+        protected virtual object GetPropertyValueCore(object target, PropertyDescriptor propertyDescriptor)
+        {
+            object propertyValue;
+
+            if (target is ICustomTypeDescriptor)
+            {
+                target = ((ICustomTypeDescriptor)target).GetPropertyOwner(propertyDescriptor);
+            }
+            try
+            {
+                propertyValue = propertyDescriptor.GetValue(target);
+            }
+            catch
+            {
+                throw;
+            }
+            return propertyValue;
+        }
+
+        public PropertyDescriptor PropertyDescriptor
+        {
+            get
+            {
+                return _Property;
+            }
+            internal set
+            {
+                _Property = value;
+                UpdateValueInlineEditor();
+            }
+        }
+
+        protected override void OnParentChanged()
+        {
+            UpdateValueInlineEditor();
+            base.OnParentChanged();
+        }
+
+        private bool IsEditorReadOnly
+        {
+            get
+            {
+                PropertyDescriptor propDesc = PropertyDescriptor;
+                if (propDesc != null) return propDesc.IsReadOnly;
+                return false;
+            }
+        }
+        /// <summary>
+        /// Releases the inline editor used by the node.
+        /// </summary>
+        public virtual void ReleaseInlineEditor()
+        {
+            UpdateValueInlineEditor();
+        }
+
+        private bool _IsUsingInlineEditor = false;
+        private void UpdateValueInlineEditor()
+        {
+            if (_IsUsingInlineEditor)
+            {
+                Cell editCell = this.EditCell;
+                Control editor = editCell.HostedControl;
+                if (editor != null)
+                {
+                    editCell.HostedControl = null;
+                    if (editor is IPropertyValueEditor)
+                        ((IPropertyValueEditor)editor).EditValueChanged -= ValueEditorEditValueChanged;
+                    editor.Dispose();
+                }
+                else if (editCell.HostedItem != null)
+                {
+                    BaseItem item = editCell.HostedItem;
+                    editCell.HostedItem = null;
+                    if (item is IPropertyValueEditor)
+                        ((IPropertyValueEditor)item).EditValueChanged -= ValueEditorEditValueChanged;
+                    item.Dispose();
+                }
+            }
+
+            _IsUsingInlineEditor = false;
+
+            if (_Property == null || IsDisposing) return;
+
+            PropertyValueEditor valueEditor;
+            if (_PropertySettings != null && _PropertySettings.ValueEditor != null)
+                valueEditor = _PropertySettings.ValueEditor;
+            else
+                valueEditor = _Property.Attributes[typeof(PropertyValueEditor)] as PropertyValueEditor;
+
+            if (valueEditor != null)
+            {
+                IPropertyValueEditor editorCustom = valueEditor.CreateEditor(_Property, _TargetComponent);
+                editorCustom.EditValueChanged += ValueEditorEditValueChanged;
+                _Editor = editorCustom;
+                if (editorCustom is Control)
+                {
+                    this.EditCell.HostedControl = (Control)_Editor;
+                    if (this.IsReadOnly || this.IsEditorReadOnly) this.EditCell.HostedControl.Enabled = false;
+                }
+                else if (editorCustom is BaseItem)
+                {
+                    this.EditCell.HostedItem = (BaseItem)_Editor;
+                    if (this.IsReadOnly || this.IsEditorReadOnly) this.EditCell.Enabled = false;
+                }
+                else
+                    throw new ArgumentException("PropertyValueEditor must inherit from Control or BaseItem.");
+                _IsUsingInlineEditor = true;
+            }
+        }
+
+        private ElementStyle _ValueChangedStyle = null;
+        public ElementStyle ValueChangedStyle
+        {
+            get
+            {
+                if (_ValueChangedStyle == null)
+                {
+                    IPropertyElementStyleProvider styleProvider = StyleProvider;
+                    if (styleProvider != null) return styleProvider.ValueChangedStyle;
+                }
+                return _ValueChangedStyle;
+            }
+            set
+            {
+                _ValueChangedStyle = value;
+            }
+        }
+        private ElementStyle _EditCellStyle = null;
+        public ElementStyle EditCellStyle
+        {
+            get
+            {
+                if (_EditCellStyle == null)
+                {
+                    IPropertyElementStyleProvider styleProvider = StyleProvider;
+                    if (styleProvider != null) return styleProvider.DefaultEditCellStyle;
+                }
+                return _EditCellStyle;
+            }
+            set
+            {
+                if (_EditCellStyle != value)
+                {
+                    _EditCellStyle = value;
+                    UpdateDisplayedValue();
+                }
+            }
+        }
+
+        object _Editor = null;
+        protected override void OnSelected(eTreeAction action)
+        {
+            if (_IsDisposed || _IsDisposing) return;
+
+            UpdateDisplayedValue();
+
+            AdvTree.AdvTree tree = this.TreeControl;
+            bool focusEditor = false;
+            Point pos = Point.Empty;
+            if (tree != null)
+            {
+                pos = tree.PointToClient(Control.MousePosition);
+                if (this.EditCell.Bounds.Contains(pos))
+                    focusEditor = true;
+            }
+
+            if (action == eTreeAction.Keyboard && WinApi.HIWORD(WinApi.GetKeyState(9)) != 0)
+                focusEditor = true;
+
+            if (this.Enabled && (!this.IsReadOnly && CanEditPropertyContent()))
+            {
+                EnterEditorMode(action, focusEditor);
+                if (focusEditor && !pos.IsEmpty && _Editor is TextBoxDropDown)
+                {
+                    ((TextBoxDropDown)_Editor).TextBox.SelectAll();
+                }
+            }
+
+            AdvPropertyGrid grid = AdvPropertyGrid;
+            if (grid != null)
+            {
+                string description = GetDescriptionAttributeValue();
+
+                if (!string.IsNullOrEmpty(description))
+                {
+                    bool replaceNewLineCharacters = false;
+                    if (!TextMarkup.MarkupParser.IsMarkup(ref description))
+                        replaceNewLineCharacters = true;
+                    description = description.Replace("<", "&lt;"); description = description.Replace(">", "&gt;");
+                    description = "<b>" + this.Text + "</b><br/>" + description;
+                    if (replaceNewLineCharacters)
+                        description = description.Replace("\n", "<br/>");
+                }
+                grid.HelpPanel.Text = description;
+            }
+
+            base.OnSelected(action);
+        }
+
+        private string _Description = null;
+        private string GetDescriptionAttributeValue()
+        {
+            if (_PropertySettings != null && _PropertySettings.Description != null)
+                return _PropertySettings.Description;
+
+            if (_Description == null)
+            {
+                _Description = _Property.Description;
+                //DescriptionAttribute att = _Property.Attributes[typeof(DescriptionAttribute)] as DescriptionAttribute;
+                //if (att != null)
+                //    _Description = att.Description;
+                //else
+                //    _Description = "";
+            }
+            return _Description;
+        }
+
+        internal TextBoxDropDown GetEditor()
+        {
+            return _Editor as TextBoxDropDown;
+        }
+
+        private bool IsUsingPropertyEditor()
+        {
+            if (_Property != null && !_Property.PropertyType.IsPrimitive && !_Property.PropertyType.IsEnum && !(_Property.PropertyType == typeof(string)))
+            {
+                UITypeEditor editor = GetTypeEditor();
+                if (editor != null) //  && (editor.GetEditStyle(this) == UITypeEditorEditStyle.Modal || editor.GetEditStyle(this) == UITypeEditorEditStyle.None)
+                    return true;
+            }
+            return false;
+        }
+
+        private bool CanEditPropertyContent()
+        {
+            if (_Property != null && !_Property.PropertyType.IsPrimitive && !_Property.PropertyType.IsEnum && !(_Property.PropertyType == typeof(string)))
+            {
+                UITypeEditor editor = GetTypeEditor();
+                if (editor != null) //  && (editor.GetEditStyle(this) == UITypeEditorEditStyle.Modal || editor.GetEditStyle(this) == UITypeEditorEditStyle.None)
+                    return true;
+                else
+                {
+                    if (this.TypeConverter != null && this.TypeConverter.CanConvertFrom(typeof(string)))
+                        return true;
+
+                    return false;
+                }
+            }
+            return true;
+        }
+        private bool _IsReadOnly = false;
+        /// <summary>
+        /// Gets or sets whether property text box is read only. Default value is false.
+        /// </summary>
+        public bool IsReadOnly
+        {
+            get { return _IsReadOnly; }
+            set
+            {
+                if (_IsReadOnly == value) return;
+
+                _IsReadOnly = value;
+                if (_IsReadOnly)
+                    this.Style = GetReadOnlyStyle();
+                else
+                    this.Style = GetDefaultStyle();
+                OnIsReadOnlyChanged();
+            }
+        }
+
+        protected virtual void OnIsReadOnlyChanged()
+        {
+            Cell editCell = this.EditCell;
+            if (editCell == null) return;
+
+            if (editCell.HostedControl is IPropertyValueEditor)
+                editCell.HostedControl.Enabled = !_IsReadOnly;
+            if (editCell.HostedItem is IPropertyValueEditor)
+                editCell.HostedItem.Enabled = !_IsReadOnly;
+        }
+
+        private ElementStyle GetReadOnlyStyle()
+        {
+            if (_PropertySettings != null && _PropertySettings.ReadOnlyStyle != null)
+                return _PropertySettings.ReadOnlyStyle;
+
+            IPropertyElementStyleProvider styleProvider = this.StyleProvider;
+            if (styleProvider != null)
+            {
+                return styleProvider.ReadOnlyStyle;
+            }
+            return null;
+        }
+
+        public IPropertyElementStyleProvider StyleProvider
+        {
+            get
+            {
+                return AdvPropertyGrid as IPropertyElementStyleProvider;
+            }
+        }
+        private ElementStyle GetDefaultStyle()
+        {
+            if (_PropertySettings != null && _PropertySettings.Style != null)
+                return _PropertySettings.Style;
+            return null;
+        }
+
+        protected virtual Cell EditCell
+        {
+            get
+            {
+                return this.Cells[1];
+            }
+        }
+
+        protected override bool CanKeyboardNavigate(KeyEventArgs e)
+        {
+            return !IsEditing || IsEditing && (_Editor is TextBoxDropDown && !((TextBoxDropDown)_Editor).TextBox.Focused ||
+                _Editor is IPropertyValueEditor && ((IPropertyValueEditor)_Editor).IsEditorFocused);
+        }
+
+        /// <summary>
+        /// Gets whether node is in editing mode.
+        /// </summary>
+        public bool IsEditing
+        {
+            get
+            {
+                return _IsEditing;
+            }
+            internal set
+            {
+                if (_IsEditing != value)
+                {
+                    _IsEditing = value;
+                    AdvPropertyGrid grid = AdvPropertyGrid;
+                    if (grid != null)
+                        grid.OnPropertyIsEditingChanged(this);
+                }
+            }
+        }
+
+        private bool _IsEditing = false;
+        /// <summary>
+        /// Places the node into the editing mode if possible, raises the exception if node is read-only.
+        /// </summary>
+        /// <param name="action">Action that caused the edit mode.</param>
+        /// <param name="focusEditor">Indicates whether to focus the editor.</param>
+        public virtual void EnterEditorMode(eTreeAction action, bool focusEditor)
+        {
+            if (IsEditing)
+                throw new InvalidOperationException("Node is already in edit mode.");
+            if (!Enabled)
+                throw new InvalidOperationException("Node is disabled. Cannot enter edit mode.");
+
+            if (_IsUsingInlineEditor)
+            {
+                if (_Editor is IPropertyValueEditor)
+                    ((IPropertyValueEditor)_Editor).EditValue = PropertyValue;
+                IsEditing = true;
+                if (focusEditor)
+                {
+                    if (_Editor is IPropertyValueEditor)
+                        ((IPropertyValueEditor)_Editor).FocusEditor();
+                }
+                EditValueChanged = false;
+                return;
+            }
+
+            if (_Editor == null)
+            {
+                _Editor = CreateNodeEditor();
+                TextBoxDropDown editor = _Editor as TextBoxDropDown;
+
+                if (editor != null)
+                {
+                    if (IsPassword)
+                    {
+                        editor.PasswordChar = AdvPropertyGrid.PasswordChar;
+                        editor.Text = GetPropertyTextValue();
+                    }
+                    else
+                    {
+                        editor.PasswordChar = '\0';
+                        editor.Text = this.EditCell.Text;
+                    }
+                }
+                else if (_Editor is IPropertyValueEditor)
+                {
+                    ((IPropertyValueEditor)_Editor).EditValue = PropertyValue;
+                    if (!IsReadOnly)
+                        ((Control)_Editor).Enabled = false;
+                }
+
+                ElementStyle valueChangedStyle = this.ValueChangedStyle;
+                if (this.EditCell.StyleNormal == valueChangedStyle && valueChangedStyle.Font != null)
+                {
+                    if (editor != null)
+                        editor.TextBox.Font = valueChangedStyle.Font;
+                    else if (_Editor is IPropertyValueEditor)
+                        ((IPropertyValueEditor)_Editor).EditorFont = valueChangedStyle.Font;
+                }
+                this.EditCell.HostedControl = (Control)_Editor;
+                IsEditing = true;
+                if (focusEditor)
+                {
+                    if (editor != null)
+                        editor.Focus();
+                    else if (_Editor is IPropertyValueEditor)
+                        ((IPropertyValueEditor)_Editor).FocusEditor();
+                }
+                EditValueChanged = false;
+            }
+        }
+
+        protected virtual Control CreateNodeEditor()
+        {
+            bool isReadOnly = GetEffectiveReadOnly();
+
+            //PropertyValueEditor valueEditor = _Property.Attributes[typeof(PropertyValueEditor)] as PropertyValueEditor;
+            //if (valueEditor != null)
+            //{
+            //    IPropertyValueEditor editorCustom = valueEditor.CreateEditor(_Property, _TargetComponent);
+            //    editorCustom.EditValueChanged += ValueEditorEditValueChanged;
+            //    return (Control)editorCustom;
+            //}
+
+            TextBoxDropDown editor = new TextBoxDropDown();
+            if (BarUtilities.UseTextRenderer)
+                editor.BackgroundStyle.MarginLeft = 3;
+            AdvPropertyGrid grid = this.AdvPropertyGrid;
+            if (grid != null) editor.Font = grid.Font;
+            editor.Size = new Size(32, editor.PreferredHeight);
+            editor.Visible = true;
+            editor.TextBox.KeyDown += new KeyEventHandler(EditorKeyDown);
+            editor.TextBox.TextChanged += new EventHandler(EditorTextChanged);
+            editor.TextBox.ReadOnly = isReadOnly;
+            editor.TextBox.PreventEnterBeep = true;
+            UITypeEditor typeEditor = GetTypeEditor();
+            UITypeEditorEditStyle editStyle = UITypeEditorEditStyle.None;
+            if (typeEditor != null)
+            {
+                editStyle = typeEditor.GetEditStyle(this);
+                if (editStyle == UITypeEditorEditStyle.Modal)
+                {
+                    editor.ButtonCustom.Visible = true;
+                    editor.ButtonCustomClick += new EventHandler(EditorButtonCustomClick);
+                }
+                else if (editStyle == UITypeEditorEditStyle.DropDown)
+                {
+                    editor.ButtonDropDown.Visible = true;
+                    editor.ButtonDropDownClick += new CancelEventHandler(EditorButtonDropDownClick);
+                }
+                if (!IsReadOnly)
+                {
+                    PropertyDescriptor propertyDescriptor = GetPropertyDescriptor();
+                    if (propertyDescriptor != null && !propertyDescriptor.PropertyType.IsAssignableFrom(typeof(string)) &&
+                        propertyDescriptor.Converter != null && !propertyDescriptor.Converter.CanConvertFrom(typeof(string)))
+                        editor.TextBox.ReadOnly = true;
+                }
+            }
+
+            if (typeEditor == null || editStyle == UITypeEditorEditStyle.None)
+            {
+                if (!isReadOnly)
+                {
+                    SetupEditorAutoCompleteList(editor);
+                    if (!SetupEditorPopup(editor))
+                        editor.ButtonDropDown.Visible = false;
+                    else
+                    {
+                        editor.ButtonDropDown.Visible = true;
+                    }
+                }
+            }
+
+            if (AfterEditorCreated != null)
+                AfterEditorCreated(this, editor);
+
+            return editor;
+        }
+        /// <summary>
+        /// Defines delegate that is called after property editor is created.
+        /// </summary>
+        /// <param name="sender">PropertyNode sender.</param>
+        /// <param name="editor">Reference to editor.</param>
+        public delegate void AfterEditorCreatedDelegate(object sender, object editor);
+        /// <summary>
+        /// Called after property editor is created.
+        /// </summary>
+        public AfterEditorCreatedDelegate AfterEditorCreated;
+
+        void ValueEditorEditValueChanged(object sender, EventArgs e)
+        {
+            EditValueChanged = true;
+            if (IsEditing)
+                ApplyEdit();
+        }
+
+        private bool ProcessEditorDropDownClick()
+        {
+            UITypeEditor typeEditor = GetTypeEditor();
+            if (typeEditor != null && typeEditor.GetEditStyle(this) == UITypeEditorEditStyle.DropDown)
+            {
+                object value = typeEditor.EditValue(this, this, this.PropertyValue);
+                ApplyValue(value, null);
+                return true;
+            }
+            return false;
+        }
+        private void EditorButtonDropDownClick(object sender, CancelEventArgs e)
+        {
+            ProcessEditorDropDownClick();
+            e.Cancel = true;
+        }
+
+        private bool GetEffectiveReadOnly()
+        {
+            return this.IsReadOnly;
+        }
+        private UITypeEditor GetTypeEditor()
+        {
+            PropertyDescriptor propertyDescriptor = GetPropertyDescriptor();
+
+            if (_PropertySettings != null && _PropertySettings.UITypeEditor != null)
+            {
+                return _PropertySettings.UITypeEditor;
+            }
+
+            AdvPropertyGrid grid = AdvPropertyGrid;
+            if (grid != null && grid.HasProvideUITypeEditorHandler)
+            {
+                ProvideUITypeEditorEventArgs args = new ProvideUITypeEditorEventArgs(GetPropertyName(), propertyDescriptor);
+                grid.InvokeProvideUITypeEditor(args);
+                if (args.EditorSpecified) return args.UITypeEditor;
+            }
+
+            object value = PropertyValue;
+            if (value is ICustomTypeDescriptor)
+            {
+                ICustomTypeDescriptor descriptor = (ICustomTypeDescriptor)value;
+                UITypeEditor editor = (UITypeEditor)descriptor.GetEditor(typeof(UITypeEditor));
+                if (editor != null)
+                    return editor;
+            }
+            return (UITypeEditor)propertyDescriptor.GetEditor(typeof(UITypeEditor));
+        }
+
+        internal string PropertyName
+        {
+            get
+            {
+                return GetPropertyName();
+            }
+        }
+
+        protected virtual string GetPropertyName()
+        {
+            return GetPropertyDescriptor().Name;
+        }
+
+        protected virtual PropertyDescriptor GetPropertyDescriptor()
+        {
+            return _Property;
+        }
+
+        private void EditorButtonCustomClick(object sender, EventArgs e)
+        {
+            // Invoke this delayed and out of loop since MFC dialogs did not get focus when shown directly from this event handler.
+            BarUtilities.InvokeDelayed(new MethodInvoker(delegate
+            {
+                UITypeEditor typeEditor = GetTypeEditor();
+                if (typeEditor == null) return;
+                object value = null;
+                try
+                {
+                    value = typeEditor.EditValue(this, this, this.PropertyValue);
+                }
+                catch (Exception ex)
+                {
+                    MessageBoxEx.Show(ex.Message);
+                    return;
+                }
+                ApplyValue(value, null);
+            }));
+        }
+
+        protected virtual bool SetupEditorPopup(TextBoxDropDown editor)
+        {
+            if (this.PropertyType == null) return false;
+            string[] items = GetPopupListContent();
+            if (items == null || items.Length == 0) return false;
+
+            TextBoxDropDown textBox = editor;
+            ListBox list = new ListBox();
+            list.SelectedIndexChanged += new EventHandler(PopupListSelectedIndexChanged);
+            list.BorderStyle = BorderStyle.None;
+            list.Items.AddRange(items);
+            if (!string.IsNullOrEmpty(editor.Text))
+                list.SelectedItem = editor.Text;
+            textBox.DropDownControl = list;
+            list.Size = GetPreferredListBoxSize(ref items);
+
+            return true;
+        }
+
+        private void PopupListSelectedIndexChanged(object sender, EventArgs e)
+        {
+            ListBox list = (ListBox)sender;
+            if (!list.Visible || list.SelectedItem == null) return;
+            TextBoxDropDown editor = _Editor as TextBoxDropDown;
+            editor.Text = (string)list.SelectedItem;
+            editor.CloseDropDown();
+            EditValueChanged = true;
+            if (ApplyEdit())
+            {
+                AdvTree.AdvTree tree = this.TreeControl;
+                if (tree != null) tree.Focus();
+                this.SelectedCell = this.Cells[0];
+            }
+        }
+
+        private Size _CachedPreferredListBoxSize = Size.Empty;
+        private int _LastCacheListBoxItemCount = -1;
+        protected virtual Size GetPreferredListBoxSize(ref string[] items)
+        {
+            if (items == null || items.Length == 0) return new Size(96, 32);
+            AdvTree.AdvTree tree = this.TreeControl;
+            if (tree == null) return new Size(96, 32);
+            if (!_CachedPreferredListBoxSize.IsEmpty && _LastCacheListBoxItemCount == items.Length) return _CachedPreferredListBoxSize;
+
+            Size totalSize = Size.Empty;
+            using (Graphics g = tree.CreateGraphics())
+            {
+                Font font = tree.Font;
+                for (int i = 0; i < items.Length; i++)
+                {
+                    Size itemSize = TextDrawing.MeasureString(g, items[i], font);
+                    if (itemSize.Width == 0) itemSize.Width = this.EditCell.Bounds.Width - 8;
+                    if (itemSize.Height == 0) itemSize.Height = font.Height;
+                    totalSize.Width = Math.Max(itemSize.Width, totalSize.Width);
+                    if (totalSize.Height < 320)
+                        totalSize.Height += itemSize.Height;
+                    else
+                    {
+                        if (totalSize.Width < 120) totalSize.Width = 128;
+                        break;
+                    }
+                }
+            }
+            if (totalSize.Width < this.EditCell.Bounds.Width - 8)
+                totalSize.Width = this.EditCell.Bounds.Width - 8;
+            _CachedPreferredListBoxSize = totalSize;
+            _LastCacheListBoxItemCount = items.Length;
+            return totalSize;
+        }
+
+        protected virtual string[] GetPopupListContent()
+        {
+            if (_PropertySettings != null && _PropertySettings.HasProvidePropertyValueListHandler)
+            {
+                PropertyValueListEventArgs args = new PropertyValueListEventArgs(GetPropertyName(), GetTargetComponent(), PropertyDescriptor);
+                _PropertySettings.InvokeProvidePropertyValueList(args);
+                if (args.IsListValid)
+                {
+                    if (args.ValueList == null) return null;
+                    return args.ValueList.ToArray();
+                }
+            }
+
+            AdvPropertyGrid grid = AdvPropertyGrid;
+            if (grid != null && grid.HasProvidePropertyValueListHandler)
+            {
+                PropertyValueListEventArgs args = new PropertyValueListEventArgs(GetPropertyName(), GetTargetComponent(), PropertyDescriptor);
+                grid.InvokeProvidePropertyValueList(args);
+                if (args.IsListValid)
+                {
+                    if (args.ValueList == null) return null;
+                    return args.ValueList.ToArray();
+                }
+            }
+
+            TypeConverter converter = this.TypeConverter;
+            if (converter != null && converter.GetStandardValuesSupported(this))
+            {
+                System.ComponentModel.TypeConverter.StandardValuesCollection stdValues = converter.GetStandardValues(this);
+                if (stdValues != null && stdValues.Count > 0)
+                {
+                    string[] values = new string[stdValues.Count];
+                    for (int i = 0; i < stdValues.Count; i++)
+                    {
+                        object item = stdValues[i];
+                        values[i] = converter.ConvertToString(item);
+                    }
+                    return values;
+                }
+            }
+
+            if (this.PropertyType.IsEnum)
+            {
+                return Enum.GetNames(this.PropertyType);
+            }
+            else if (this.PropertyType == typeof(bool))
+            {
+                string[] items = new string[2];
+
+                if (converter != null && converter.CanConvertTo(typeof(string)))
+                {
+                    items[0] = (string)converter.ConvertTo(false, typeof(string));
+                    items[1] = (string)converter.ConvertTo(true, typeof(string));
+                }
+                else
+                {
+                    items[0] = bool.FalseString;
+                    items[1] = bool.TrueString;
+                }
+                return items;
+            }
+            return null;
+        }
+
+        protected virtual void SetupEditorAutoCompleteList(TextBoxDropDown editor)
+        {
+            if (this.PropertyType == null) return;
+
+            TextBox textBox = editor.TextBox;
+            TypeConverter converter = this.TypeConverter;
+            //if (converter != null && converter.GetStandardValuesExclusive(this))
+            //    editor.InternalReadOnly = true;
+            //else
+            //    editor.InternalReadOnly = false;
+
+
+
+            string[] items = GetPopupListContent();
+            if (items != null && items.Length > 0)
+            {
+                textBox.AutoCompleteMode = AutoCompleteMode.SuggestAppend;
+                textBox.AutoCompleteSource = AutoCompleteSource.CustomSource;
+                textBox.AutoCompleteCustomSource.Clear();
+                textBox.AutoCompleteCustomSource.AddRange(items);
+                if (converter != null && converter.GetStandardValuesSupported() &&
+                    converter.GetStandardValuesExclusive())
+                    textBox.ReadOnly = true;
+                else
+                    textBox.ReadOnly = false;
+            }
+        }
+
+        protected override void OnNodeDoubleClick(EventArgs e)
+        {
+            base.OnNodeDoubleClick(e);
+            if (GetEffectiveReadOnly()) return;
+            if (!SelectNextValue())
+            {
+                if (_Editor is TextBoxDropDown)
+                {
+                    ((TextBoxDropDown)_Editor).TextBox.SelectAll();
+                    ((TextBoxDropDown)_Editor).Focus();
+                }
+                else if (_Editor is IPropertyValueEditor)
+                    ((IPropertyValueEditor)_Editor).FocusEditor();
+            }
+        }
+
+        public virtual bool SelectNextValue()
+        {
+            string[] listArray = GetPopupListContent();
+            if (listArray == null || listArray.Length == 0) return false;
+            List<string> list = new List<string>(listArray);
+            string currentValue = this.EditCell.Text;
+            if (string.IsNullOrEmpty(currentValue) || !list.Contains(currentValue))
+            {
+                currentValue = list[0];
+            }
+            else
+            {
+                int index = list.IndexOf(currentValue) + 1;
+                if (index >= list.Count)
+                    index = 0;
+                currentValue = list[index];
+            }
+            Exception valueException = null;
+            object value = GetValueFromString(currentValue, out valueException);
+            if (valueException != null) return false;
+            SetPropertyValue(this.GetTargetComponent(), value);
+            RefreshPropertyValuesCheck();
+            UpdateDisplayedValue();
+
+            bool reportSuccess = AdvPropertyGrid.HighlightPropertyOnUpdate && !_IsUsingInlineEditor;
+            if (reportSuccess)
+            {
+                this.IsSelectionVisible = false;
+                StartHighlight(SuccessHighlightColor);
+            }
+
+            return true;
+        }
+
+        void EditorTextChanged(object sender, EventArgs e)
+        {
+            this.EditValueChanged = true;
+        }
+
+
+        protected virtual void EditorKeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode == Keys.Escape)
+            {
+                CancelEdit();
+                AdvTree.AdvTree tree = this.TreeControl;
+                if (tree != null) tree.Focus();
+                this.SetSelectedCell(this.Cells[0], eTreeAction.Keyboard);
+            }
+            else if (e.KeyCode == Keys.Enter)
+            {
+                if (ApplyEdit() && !(_IsDisposed || _IsDisposing))
+                {
+                    this.SetSelectedCell(this.Cells[0], eTreeAction.Keyboard);
+                    AdvTree.AdvTree tree = this.TreeControl;
+                    if (tree != null) tree.Focus();
+                }
+            }
+            else if (e.KeyCode == Keys.Delete && !this.IsReadOnly && this.IsPropertyValueNullable && this.PropertyValue != null)
+            {
+                bool reset = true;
+                TextBox textBox = sender as TextBox;
+                if (textBox != null && textBox.SelectionLength != textBox.TextLength)
+                    reset = false;
+
+                if (reset)
+                    ApplyValue(null, null);
+            }
+        }
+
+        protected override void OnKeyDown(KeyEventArgs e)
+        {
+            if (e.KeyCode == Keys.Down && e.Modifiers == Keys.Alt)
+            {
+                if (!ProcessEditorDropDownClick())
+                {
+                    TextBoxDropDown editor = _Editor as TextBoxDropDown;
+                    if (editor != null && editor.ButtonDropDown.Visible && editor.DropDownControl != null && !editor.IsPopupOpen)
+                        editor.IsPopupOpen = true;
+                }
+            }
+            base.OnKeyDown(e);
+        }
+
+        protected virtual bool IsPropertyValueNullable
+        {
+            get
+            {
+                return !_Property.PropertyType.IsValueType;
+            }
+        }
+
+        private bool _EditValueChanged = false;
+        public bool EditValueChanged
+        {
+            get { return _EditValueChanged; }
+            set
+            {
+                _EditValueChanged = value;
+            }
+        }
+
+
+        protected override void OnDeselected(eTreeAction action)
+        {
+            if (this.IsEditing)
+            {
+                if (this.EditValueChanged && !IsReadOnly)
+                    ApplyEdit();
+                ExitEditorMode(action);
+            }
+            base.OnDeselected(action);
+        }
+
+        /// <summary>
+        /// Exits the editor mode.
+        /// </summary>
+        /// <param name="action">Action that caused the editor mode exit.</param>
+        public virtual void ExitEditorMode(eTreeAction action)
+        {
+            if (!IsEditing) return;
+
+            Control editor = _Editor as Control;
+
+            if (!_IsUsingInlineEditor)
+            {
+                _Editor = null;
+                this.EditCell.HostedControl = null;
+            }
+
+            if (editor is TextBoxDropDown && !_IsUsingInlineEditor)
+            {
+                TextBoxDropDown editorDropDown = (TextBoxDropDown)editor;
+                if (editorDropDown.IsPopupOpen)
+                    editorDropDown.CloseDropDown();
+
+                if (editorDropDown.DropDownControl != null && !_UITypeEditorDropDownControl)
+                {
+                    Control c = editorDropDown.DropDownControl;
+                    editorDropDown.DropDownControl = null;
+                    c.Dispose();
+                }
+
+                editorDropDown.ButtonCustomClick -= EditorButtonCustomClick;
+                editorDropDown.ButtonDropDownClick -= EditorButtonDropDownClick;
+                editorDropDown.TextBox.KeyDown -= new KeyEventHandler(EditorKeyDown);
+                editorDropDown.TextBox.TextChanged -= new EventHandler(EditorTextChanged);
+                editorDropDown.Dispose();
+            }
+            else if (editor != null && !_IsUsingInlineEditor)
+            {
+                if (editor is IPropertyValueEditor)
+                    ((IPropertyValueEditor)editor).EditValueChanged -= ValueEditorEditValueChanged;
+                editor.Dispose();
+            }
+
+            if (_HighlightWorker != null && _HighlightWorker.IsBusy) _HighlightWorker.CancelAsync();
+            IsEditing = false;
+        }
+
+        /// <summary>
+        /// Called when visual part of the node has changed due to the changes of its properties or properties of the cells contained by node.
+        /// </summary>
+        internal override void OnDisplayChanged()
+        {
+            if (!IsDisposing && !IsDisposed)
+                base.OnDisplayChanged();
+        }
+
+        /// <summary>
+        /// Cancel the edit changes and applies the old property value.
+        /// </summary>
+        public virtual void CancelEdit()
+        {
+            if (!IsEditing) return;
+            UpdateDisplayedValue();
+            ClearErrorMarkings();
+            _EditValueChanged = false;
+            if (_HighlightWorker != null && _HighlightWorker.IsBusy) _HighlightWorker.CancelAsync();
+        }
+
+        protected virtual void RevertEditorValue()
+        {
+            Cell cell = this.EditCell;
+
+            if (_Editor is TextBoxDropDown)
+            {
+                TextBoxDropDown editor = (TextBoxDropDown)_Editor;
+                editor.Text = cell.Text;
+                EditValueChanged = false;
+                ElementStyle valueChangedStyle = this.ValueChangedStyle;
+                if (valueChangedStyle != null && cell.StyleNormal == valueChangedStyle && valueChangedStyle.Font != null)
+                    editor.TextBox.Font = valueChangedStyle.Font;
+                else
+                    editor.TextBox.Font = null;
+            }
+            else if (_Editor is IPropertyValueEditor)
+            {
+                IPropertyValueEditor editor = (IPropertyValueEditor)_Editor;
+                if (!object.Equals(editor.EditValue, PropertyValue))  //if (editor.EditValue != PropertyValue)
+                    editor.EditValue = PropertyValue;
+                EditValueChanged = false;
+                ElementStyle valueChangedStyle = this.ValueChangedStyle;
+                if (valueChangedStyle != null && cell.StyleNormal == valueChangedStyle && valueChangedStyle.Font != null)
+                    editor.EditorFont = valueChangedStyle.Font;
+                else
+                    editor.EditorFont = null;
+            }
+        }
+
+        /// <summary>
+        /// Attempts to apply current edit value to the property.
+        /// </summary>
+        public virtual bool ApplyEdit()
+        {
+            if (!IsEditing)
+                throw new InvalidOperationException("Node is not in edit mode.");
+            if (!EditValueChanged) return true;
+
+            if (_Editor is TextBoxDropDown)
+                return ApplyEdit(((TextBoxDropDown)_Editor).Text);
+            else
+                return ApplyEdit(((IPropertyValueEditor)_Editor).EditValue);
+        }
+
+        protected virtual bool ApplyEdit(object text)
+        {
+            Exception valueException = null;
+
+            object value = null;
+            if (text is string)
+                value = GetValueFromString((string)text, out valueException);
+            else
+                value = text;
+
+            return ApplyValue(value, valueException);
+        }
+        /// <summary>
+        /// Returns the full property path to the root of the selected object.
+        /// </summary>
+        /// <returns>Full property path.</returns>
+        public string GetPropertyPath()
+        {
+            string path = GetPropertyName();
+            Node parent = this.Parent;
+            while (parent != null)
+            {
+                PropertyNode propNode = parent as PropertyNode;
+                if (propNode != null)
+                {
+                    if (propNode.PropertyDescriptor != null)
+                        path = propNode.GetPropertyName() + "." + path;
+                }
+                parent = parent.Parent;
+            }
+            return path;
+        }
+        protected virtual bool ApplyValue(object value, Exception valueException)
+        {
+            bool valueApplied = false;
+            if (GetPropertyValue(GetTargetComponent()) == value && valueException == null) return true;
+
+            if (valueException == null)
+            {
+                AdvPropertyGrid grid = this.AdvPropertyGrid;
+                if (grid != null)
+                {
+                    valueApplied = grid.InvokePropertyValueChanging(GetPropertyName(), value, _Property, GetPropertyPath());
+                }
+
+                if (!valueApplied)
+                {
+                    try
+                    {
+                        SetPropertyValue(this.GetTargetComponent(), value);
+                        valueApplied = true;
+                        if (_IsDisposed || _IsDisposing) return true;
+                    }
+                    catch (Exception e)
+                    {
+                        valueException = e;
+                    }
+                }
+            }
+
+            if (!valueApplied)
+            {
+                // Set error state...
+                if (_PropertySettings == null || _PropertySettings.Image == null)
+                    this.Image = GetErrorImage();
+                this.IsSelectionVisible = false;
+                // Get SuperTooltip to display error tip
+                SuperTooltip tooltip = GetSuperTooltip();
+                if (tooltip != null)
+                    AttachErrorTooltip(tooltip, valueException, value);
+
+                StartHighlight(ErrorHighlightColor);
+            }
+            else
+            {
+                // if for some reason property value was not set we'll return false
+                if (value != null && !value.Equals(PropertyValue) && PropertyType.IsPrimitive) valueApplied = false;
+
+                bool reportSuccess = AdvPropertyGrid.HighlightPropertyOnUpdate && !_IsUsingInlineEditor;
+                if (_ErrorTooltipAttached)
+                    reportSuccess = true;
+                ClearErrorMarkings();
+                UpdateDisplayedValue();
+                if (reportSuccess)
+                    this.IsSelectionVisible = false;
+                if (reportSuccess && valueApplied)
+                    StartHighlight(SuccessHighlightColor);
+                _EditValueChanged = false;
+
+                if (_Property != null && valueApplied)
+                {
+                    RefreshPropertyValuesCheck();
+                }
+
+            }
+
+            return valueApplied;
+        }
+
+        private void RefreshPropertyValuesCheck()
+        {
+            if (_Property == null) return;
+
+            RefreshPropertiesAttribute refreshAttribute = GetRefreshPropertiesAttribute();
+            RefreshPropertiesAttribute parentRefresh = null;
+            if (this.Parent is PropertyNode)
+                parentRefresh = ((PropertyNode)this.Parent).GetRefreshPropertiesAttribute();
+
+            if (parentRefresh != null && parentRefresh.RefreshProperties == RefreshProperties.All)
+            {
+                AdvPropertyGrid.RefreshPropertyValues(this.Parent);
+            }
+            else if (refreshAttribute != null)
+            {
+                if (refreshAttribute.RefreshProperties == RefreshProperties.Repaint)
+                {
+                    AdvPropertyGrid.RefreshPropertyValues();
+                }
+                else if (refreshAttribute.RefreshProperties == RefreshProperties.All)
+                {
+                    AdvPropertyGrid.RefreshProperties();
+                }
+            }
+
+            if (this.Parent is PropertyNode)
+                ((PropertyNode)this.Parent).UpdateDisplayedValue(false);
+        }
+        internal RefreshPropertiesAttribute GetRefreshPropertiesAttribute()
+        {
+            RefreshPropertiesAttribute refreshAttribute = _Property.Attributes[typeof(RefreshPropertiesAttribute)] as RefreshPropertiesAttribute;
+            return refreshAttribute;
+        }
+
+        private Color ErrorHighlightColor
+        {
+            get
+            {
+                AdvPropertyGrid grid = AdvPropertyGrid;
+                if (grid != null)
+                {
+                    return grid.Appearance.ErrorHighlightColor;
+                }
+                return ColorScheme.GetColor(0xD99694);
+            }
+        }
+        private Color SuccessHighlightColor
+        {
+            get
+            {
+                AdvPropertyGrid grid = AdvPropertyGrid;
+                if (grid != null)
+                {
+                    return grid.Appearance.SuccessHighlightColor;
+                }
+                return ColorScheme.GetColor(0x9BBB59);
+            }
+        }
+
+        private void ClearErrorMarkings()
+        {
+            SuperTooltip tooltip = GetSuperTooltip();
+            if (tooltip != null)
+                EraseErrorTooltip(tooltip);
+            if (_PropertySettings == null || _PropertySettings.Image == null)
+                this.Image = null;
+            if (_PropertySettings != null) UpdatePropertySettings();
+        }
+        private bool _ErrorTooltipAttached = false;
+        private void AttachErrorTooltip(SuperTooltip tooltip, Exception valueException, object value)
+        {
+            SuperTooltipInfo info = new SuperTooltipInfo();
+            info.HeaderText = this.Text;
+            string s = GetErrorString();
+            bool showTooltip = false;
+            if (valueException is InvalidPropertyValueException && !string.IsNullOrEmpty(valueException.Message))
+            {
+                s = valueException.Message;
+                showTooltip = true;
+            }
+            else if (valueException != null)
+            {
+                if (!s.EndsWith(" ")) s += " ";
+                s += valueException.Message;
+            }
+            info.BodyText = s;
+            AdvPropertyGrid grid = AdvPropertyGrid;
+            if (grid != null)
+            {
+                grid.InvokePrepareErrorSuperTooltip(info, GetPropertyName(), valueException, value);
+            }
+            tooltip.SetSuperTooltip(this, info);
+            if (showTooltip)
+            {
+                // Show tooltip below the node
+                Rectangle r = this.Cells[0].Bounds;
+                AdvTree.AdvTree tree = this.TreeControl;
+                if (tree != null)
+                    r.Location = tree.PointToScreen(r.Location);
+                tooltip.ShowTooltip(this, new Point(r.Right - 18, r.Bottom));
+            }
+            _ErrorTooltipAttached = true;
+        }
+        private string GetErrorString()
+        {
+            string s = "Error setting the value. ";
+
+            AdvPropertyGrid grid = AdvPropertyGrid;
+            if (grid != null) s = grid.SystemText.ErrorSettingPropertyValueTooltip;
+
+            IPropertyGridLocalizer localizer = this.PropertyGridLocalizer;
+            if (localizer != null)
+            {
+                return localizer.GetErrorTooltipMessage(s) ?? s;
+            }
+            return s ?? "";
+        }
+        private void EraseErrorTooltip(SuperTooltip tooltip)
+        {
+            tooltip.HideTooltip();
+            tooltip.SetSuperTooltip(this, null);
+            _ErrorTooltipAttached = false;
+        }
+
+        private Image _ErrorImage = null;
+        private Image GetErrorImage()
+        {
+            AdvPropertyGrid propertyGrid = this.AdvPropertyGrid;
+            if (propertyGrid != null && propertyGrid.Appearance.PropertyValueErrorImage != null)
+                return propertyGrid.Appearance.PropertyValueErrorImage;
+            if (_ErrorImage == null)
+                _ErrorImage = BarFunctions.LoadBitmap("SystemImages.ErrorIcon.png");
+            return _ErrorImage;
+        }
+
+        private BackgroundWorker _HighlightWorker = null;
+        private ElementStyle _HighlightStyle = null;
+        /// <summary>
+        /// Starts fade background color style highlight for the property node.
+        /// </summary>
+        /// <param name="color">Specifies the fade background color.</param>
+        public void StartHighlight(Color color)
+        {
+            if (_HighlightWorker == null)
+            {
+                _HighlightWorker = new BackgroundWorker();
+                _HighlightWorker.WorkerSupportsCancellation = true;
+                _HighlightWorker.DoWork += new DoWorkEventHandler(HighlightWorkerDoWork);
+                _HighlightWorker.RunWorkerCompleted += new RunWorkerCompletedEventHandler(HighlightWorkerCompleted);
+                if (this.Style != null)
+                {
+                    _HighlightStyle = this.Style.Copy();
+                }
+                else
+                {
+                    AdvTree.AdvTree tree = this.TreeControl;
+                    if (tree != null && tree.NodeStyle != null)
+                        _HighlightStyle = tree.NodeStyle.Copy();
+                    else
+                        _HighlightStyle = new ElementStyle();
+                }
+            }
+            else if (_HighlightWorker.IsBusy)
+            {
+                _HighlightWorker.CancelAsync();
+                return;
+            }
+
+            _HighlightStyle.BackColor = color;
+            this.Style = _HighlightStyle;
+            _HighlightWorker.RunWorkerAsync(this.TreeControl);
+        }
+
+        private SuperTooltip GetSuperTooltip()
+        {
+            AdvPropertyGrid grid = this.AdvPropertyGrid;
+            if (grid != null) return grid.SuperTooltip;
+            return null;
+        }
+
+        internal void SetHelpTooltip(SuperTooltip superTooltip)
+        {
+            string description = GetDescriptionAttributeValue();
+            if (string.IsNullOrEmpty(description))
+                superTooltip.SetSuperTooltip(this, null);
+            else
+            {
+                SuperTooltipInfo info = new SuperTooltipInfo(this.Text, "", description, null, null, eTooltipColor.System, true, false, Size.Empty);
+                superTooltip.SetSuperTooltip(this, info);
+            }
+        }
+
+        private void HighlightWorkerCompleted(object sender, RunWorkerCompletedEventArgs e)
+        {
+            this.Style = GetDefaultStyle();
+            this.IsSelectionVisible = true;
+        }
+
+        private void HighlightWorkerDoWork(object sender, DoWorkEventArgs e)
+        {
+            for (int i = 255; i > 0; i -= 25)
+            {
+                if (e.Cancel) break;
+                Control control = e.Argument as Control;
+                if (control.IsHandleCreated && !control.IsDisposed)
+                    control.BeginInvoke(new ChangeHighlightStyleDelegate(ChangeHighlightStyle), new object[] { i });
+                try
+                {
+                    using (
+                                        System.Threading.ManualResetEvent wait =
+                                            new System.Threading.ManualResetEvent(false))
+                        wait.WaitOne(80);
+                    //Thread.Sleep(80);
+                }
+                catch 
+                {
+                    break;
+                }
+            }
+        }
+
+        private void ChangeHighlightStyle(int alpha)
+        {
+            _HighlightStyle.BackColor = Color.FromArgb(alpha, _HighlightStyle.BackColor.R, _HighlightStyle.BackColor.G, _HighlightStyle.BackColor.B);
+        }
+        private delegate void ChangeHighlightStyleDelegate(int alpha);
+
+        protected virtual object GetValueFromString(string text, out Exception exception)
+        {
+            object value = null;
+            exception = null;
+
+            if (_PropertySettings != null && _PropertySettings.HasConvertFromStringToPropertyValueHandler)
+            {
+                ConvertValueEventArgs args = new ConvertValueEventArgs(text, null, GetPropertyName(), GetTargetComponent(), PropertyDescriptor);
+                try
+                {
+                    _PropertySettings.InvokeConvertFromStringToPropertyValue(args);
+                }
+                catch (Exception e)
+                {
+                    exception = e;
+                }
+                if (args.IsConverted)
+                    return args.TypedValue;
+            }
+
+            AdvPropertyGrid grid = AdvPropertyGrid;
+            if (grid != null && grid.HasConvertFromStringToPropertyValueHandler)
+            {
+                ConvertValueEventArgs args = new ConvertValueEventArgs(text, null, GetPropertyName(), GetTargetComponent(), PropertyDescriptor);
+                try
+                {
+                    grid.InvokeConvertFromStringToPropertyValue(args);
+                }
+                catch (Exception e)
+                {
+                    exception = e;
+                }
+                if (args.IsConverted)
+                    return args.TypedValue;
+            }
+
+            TypeConverter conv = this.TypeConverter;
+            try
+            {
+                value = conv.ConvertFromString(this, text);
+            }
+            catch (Exception e)
+            {
+                exception = e;
+            }
+
+            return value;
+        }
+
+        protected virtual void SetPropertyValue(object target, object value)
+        {
+            PropertyDescriptor propertyDescriptor = GetPropertyDescriptor();
+            if (propertyDescriptor == null)
+            {
+                return;
+            }
+
+            if (_IsMultiObject)
+            {
+                TypeConverter converter = this.TypeConverter;
+                object[] targets = (object[])target;
+                foreach (object item in targets)
+                {
+                    if (propertyDescriptor.PropertyType.IsAssignableFrom(item.GetType()))
+                        SetPropertyValueCore(item, value, propertyDescriptor);
+                    else
+                    {
+                        PropertyDescriptor desc2 = PropertyParser.GetProperty(propertyDescriptor.Name, item, converter.GetPropertiesSupported(this) ? converter : null);
+                        if (desc2 == null)
+                            desc2 = PropertyParser.GetProperty(propertyDescriptor.Name, item, null);
+                        SetPropertyValueCore(item, value, desc2);
+                    }
+                }
+            }
+            else
+            {
+                SetPropertyValueCore(target, value, propertyDescriptor);
+            }
+        }
+
+        private void ValidatePropertyValue(object target, object value, PropertyDescriptor propertyDescriptor)
+        {
+            AdvPropertyGrid pg = this.AdvPropertyGrid;
+            if (pg == null) return;
+            if (!pg.HasValidatePropertyValueHandlers) return;
+            ValidatePropertyValueEventArgs args = new ValidatePropertyValueEventArgs(propertyDescriptor.Name, value, target);
+            pg.InvokeValidatePropertyValue(args);
+            if (args.Cancel)
+                throw new InvalidPropertyValueException(args.Message);
+        }
+
+        protected virtual void SetPropertyValueCore(object target, object value, PropertyDescriptor propertyDescriptor)
+        {
+            ValidatePropertyValue(target, value, propertyDescriptor);
+
+            bool useCreateInstance = false;
+            PropertyNode parent = this.Parent as PropertyNode;
+            if (parent != null)
+            {
+                TypeConverter parentConverter = parent.TypeConverter;
+                if (parentConverter != null && parentConverter.GetCreateInstanceSupported(this))
+                    useCreateInstance = true;
+            }
+
+            if (useCreateInstance)
+            {
+                if (target is ICustomTypeDescriptor)
+                {
+                    target = ((ICustomTypeDescriptor)target).GetPropertyOwner(propertyDescriptor);
+                }
+
+                object valueOwner = parent.GetTargetComponent();
+                TypeConverter parentTypeConverter = parent.TypeConverter;
+                PropertyDescriptorCollection properties = parentTypeConverter.GetProperties(parent, valueOwner);
+                Dictionary<string, object> propertyValues = new Dictionary<string, object>(properties.Count);
+                object newValueInstance = null;
+                for (int i = 0; i < properties.Count; i++)
+                {
+                    string propertyName = GetPropertyName();
+                    if (propertyName != null && propertyName.Equals(properties[i].Name))
+                    {
+                        propertyValues[properties[i].Name] = value;
+                    }
+                    else
+                    {
+                        propertyValues[properties[i].Name] = properties[i].GetValue(target);
+                    }
+                }
+                try
+                {
+                    newValueInstance = parentTypeConverter.CreateInstance(parent, propertyValues);
+                }
+                catch (Exception exception)
+                {
+                    if (string.IsNullOrEmpty(exception.Message))
+                    {
+                        throw new TargetInvocationException("Exception Creating New Instance Of Object For Property " + this.Text + " " + parent.PropertyType.FullName + " " + exception.ToString(), exception);
+                    }
+                    throw;
+                }
+                if (newValueInstance != null)
+                {
+                    parent.PropertyValue = newValueInstance;
+                }
+            }
+            else
+            {
+                if (target is ICustomTypeDescriptor)
+                {
+                    target = ((ICustomTypeDescriptor)target).GetPropertyOwner(propertyDescriptor);
+                }
+                try
+                {
+                    propertyDescriptor.SetValue(target, value);
+                }
+                catch
+                {
+                    throw;
+                }
+            }
+
+            AdvPropertyGrid grid = this.AdvPropertyGrid;
+            if (grid != null)
+                grid.InvokePropertyValueChanged(GetPropertyName(), value, null);
+        }
+
+        private bool _IsDisposing;
+        internal bool IsDisposing
+        {
+            get { return _IsDisposing; }
+            set
+            {
+                _IsDisposing = value;
+            }
+        }
+
+        internal bool IsDisposed
+        {
+            get
+            {
+                return _IsDisposed;
+            }
+        }
+
+        private bool _IsDisposed = false;
+        protected override void Dispose(bool disposing)
+        {
+            _IsDisposed = true;
+
+            if (this.IsEditing)
+                CancelEdit();
+
+            BackgroundWorker worker = _HighlightWorker;
+            _HighlightWorker = null;
+            if (worker != null) worker.Dispose();
+
+            if (_ErrorImage != null) _ErrorImage.Dispose();
+
+            base.Dispose(disposing);
+        }
+
+        protected virtual AdvPropertyGrid AdvPropertyGrid
+        {
+            get
+            {
+                AdvTree.AdvTree tree = this.TreeControl;
+                if (tree == null) return null;
+                Control parent = tree.Parent;
+                while (parent != null)
+                {
+                    if (parent is AdvPropertyGrid) return (AdvPropertyGrid)parent;
+                    parent = parent.Parent;
+                }
+                return null;
+            }
+        }
+
+        internal virtual void OnLoaded()
+        {
+            UpdateChildProperties();
+            UpdatePropertySettings();
+        }
+
+        private void UpdateChildProperties()
+        {
+            if (HasChildProperties)
+            {
+                this.ExpandVisibility = eNodeExpandVisibility.Visible;
+                if (this.Expanded)
+                    LoadChildProperties();
+            }
+            else
+            {
+                if (this.HasChildNodes)
+                {
+                    AdvPropertyGrid propertyGrid = AdvPropertyGrid;
+                    foreach (Node child in this.Nodes)
+                        AdvPropertyGrid.ClearPropertyNode(child, propertyGrid);
+                    this.Nodes.Clear();
+                }
+                this.Expanded = false;
+                this.ExpandVisibility = eNodeExpandVisibility.Auto;
+            }
+        }
+        public bool HasChildProperties
+        {
+            get
+            {
+                TypeConverter converter = this.TypeConverter;
+                if (converter != null && converter.GetPropertiesSupported())
+                {
+                    PropertyDescriptorCollection childProps = PropertyParser.GetProperties(this, AttributeFilter, this.PropertyValue, converter.GetPropertiesSupported(this) ? converter : null);
+                    if (childProps != null && childProps.Count > 0)
+                        return true;
+                }
+                return false;
+            }
+        }
+        protected virtual Attribute[] AttributeFilter
+        {
+            get
+            {
+                AdvPropertyGrid grid = AdvPropertyGrid;
+                if (grid != null)
+                {
+                    Attribute[] attributes = new Attribute[grid.BrowsableAttributes.Count];
+                    grid.BrowsableAttributes.CopyTo(attributes, 0);
+                    return attributes;
+                }
+                return null;
+            }
+        }
+
+        protected virtual void LoadChildProperties()
+        {
+            string lastSelectedProperty = null;
+            AdvTree.AdvTree tree = this.TreeControl;
+            ePropertySort childPropertySort = ePropertySort.Alphabetical;
+            if (tree != null)
+            {
+                tree.BeginUpdate();
+                if (tree.Parent is AdvPropertyGrid)
+                    childPropertySort = ((AdvPropertyGrid)tree.Parent).SubPropertiesDefaultSort;
+            }
+
+            try
+            {
+                if (this.HasChildNodes)
+                {
+                    if (tree != null && tree.SelectedNode != null && this.Nodes.Contains(tree.SelectedNode))
+                        lastSelectedProperty = tree.SelectedNode.Text;
+                }
+
+                ClearChildNodes();
+
+                TypeConverter converter = this.TypeConverter;
+                if (converter != null && converter.GetPropertiesSupported())
+                {
+                    Attribute[] attributes = AttributeFilter;
+                    List<string> ignoredProperties = this.IgnoredProperties;
+                    List<string> ignoredCategories = this.IgnoredCategories;
+                    IPropertyGridLocalizer localizer = this.PropertyGridLocalizer;
+                    PropertyDescriptorCollection childProps = PropertyParser.GetProperties(this, attributes, this.PropertyValue, converter.GetPropertiesSupported(this) ? converter : null);
+                    PropertyNodeFactory factory = this.NodeFactory;
+                    if (childProps != null && childProps.Count > 0)
+                    {
+                        PropertyParser parser = new PropertyParser(
+                                                    this,
+                                                    this.PropertyValue,
+                                                    attributes,
+                                                    factory,
+                                                    ignoredProperties,
+                                                    ignoredCategories,
+                                                    localizer,
+                                                    this.PropertySettingsCollection);
+                        parser.HelpType = AdvPropertyGrid.HelpType;
+                        parser.TypeConverter = converter.GetPropertiesSupported(this) ? converter : null;
+                        parser.Parse(this.Nodes, childPropertySort, GetSuperTooltip());
+                    }
+                }
+
+                if (!string.IsNullOrEmpty(lastSelectedProperty) && this.HasChildNodes && tree != null)
+                {
+                    foreach (Node item in this.Nodes)
+                    {
+                        if (item.Text == lastSelectedProperty)
+                        {
+                            tree.SelectedNode = item;
+                            break;
+                        }
+                    }
+                }
+            }
+            finally
+            {
+                if (tree != null) tree.EndUpdate();
+            }
+        }
+        private void ClearChildNodes()
+        {
+            if (!this.HasChildNodes) return;
+            AdvPropertyGrid propertyGrid = AdvPropertyGrid;
+            foreach (Node item in this.Nodes)
+            {
+                AdvPropertyGrid.ClearPropertyNode(item, propertyGrid);
+                if (item.IsSelected && propertyGrid.PropertyTree != null)
+                    propertyGrid.PropertyTree.SelectedNode = null;
+            }
+            this.Nodes.Clear();
+        }
+        internal PropertyNodeFactory NodeFactory
+        {
+            get
+            {
+                AdvPropertyGrid grid = this.AdvPropertyGrid;
+                if (grid != null)
+                    return grid.GetPropertyNodeFactory();
+                else
+                    return new PropertyNodeFactory(null);
+            }
+        }
+        public IPropertyGridLocalizer PropertyGridLocalizer
+        {
+            get
+            {
+                return AdvPropertyGrid;
+            }
+        }
+        public PropertySettingsCollection PropertySettingsCollection
+        {
+            get
+            {
+                AdvPropertyGrid grid = AdvPropertyGrid;
+                if (grid != null) return grid.PropertySettings;
+                return null;
+            }
+        }
+
+        private PropertySettings _PropertySettings = null;
+        /// <summary>
+        /// Gets or sets the property settings that are applied to this property node.
+        /// </summary>
+        public PropertySettings PropertySettings
+        {
+            get { return _PropertySettings; }
+            set
+            {
+                if (_PropertySettings == value) return;
+                if (_PropertySettings != null)
+                    _PropertySettings.PropertyChanged -= new PropertyChangedEventHandler(PropertySettingsChanged);
+                _PropertySettings = value;
+                if (_PropertySettings != null)
+                    _PropertySettings.PropertyChanged += new PropertyChangedEventHandler(PropertySettingsChanged);
+                UpdateValueInlineEditor();
+            }
+        }
+
+        private void PropertySettingsChanged(object sender, PropertyChangedEventArgs e)
+        {
+            if (e.PropertyName != PropertySettings.NamePropertyName && e.PropertyName != PropertySettings.NamePropertyDescriptor)
+                UpdatePropertySettings();
+            if (e.PropertyName == "ValueEditor")
+                UpdateValueInlineEditor();
+        }
+
+        private bool IsCollection
+        {
+            get
+            {
+                if (_Property == null) return false;
+                if (_Property.PropertyType.GetInterface("IList") != null && !_Property.PropertyType.IsArray && _Property.IsReadOnly)
+                    return true;
+                return false;
+            }
+        }
+        /// <summary>
+        /// Applies PropertySettings to this node.
+        /// </summary>
+        public virtual void UpdatePropertySettings()
+        {
+            bool parentCreateInstanceSupported = false;
+            TypeConverter parentConverter = null;
+            if (this.Parent is PropertyNode)
+            {
+                PropertyNode parent = (PropertyNode)this.Parent;
+                parentConverter = parent.TypeConverter;
+                if (parentConverter != null && parentConverter.GetCreateInstanceSupported(this))
+                    parentCreateInstanceSupported = true;
+            }
+
+            if (_PropertySettings == null)
+            {
+                if (!this.Visible) this.Visible = true;
+
+                bool readOnlyAtt = false;
+                if (parentConverter == null | !parentCreateInstanceSupported)
+                    readOnlyAtt = PropertyParser.GetReadOnlyAttribute(_Property, this.GetTargetComponent());
+                if (readOnlyAtt && !IsCollection)
+                    this.IsReadOnly = readOnlyAtt;
+                else if (parentCreateInstanceSupported || IsUsingPropertyEditor())
+                    this.IsReadOnly = false;
+
+                this.Text = GetDefaultPropertyName();
+                this.ImageAlignment = eCellPartAlignment.FarCenter;
+                this.Image = null;
+                if (!_ErrorTooltipAttached)
+                {
+                    SuperTooltip tooltip = GetSuperTooltip();
+                    if (tooltip != null)
+                    {
+                        tooltip.SetSuperTooltip(this, null);
+                    }
+                }
+                return;
+            }
+
+            if (this.Visible != _PropertySettings.Visible)
+                this.Visible = _PropertySettings.Visible;
+
+            if (this.IsReadOnly != _PropertySettings.ReadOnly)
+                this.IsReadOnly = _PropertySettings.ReadOnly;
+            else if (!_ErrorTooltipAttached && !this.IsReadOnly)
+                this.Style = GetDefaultStyle();
+
+            if (!_ErrorTooltipAttached && this.IsReadOnly && _PropertySettings.ReadOnlyTooltip != null)
+            {
+                SuperTooltip tooltip = GetSuperTooltip();
+                if (tooltip != null)
+                {
+                    tooltip.SetSuperTooltip(this, _PropertySettings.ReadOnlyTooltip);
+                }
+            }
+
+            if (_PropertySettings.Image != null)
+            {
+                this.Image = _PropertySettings.Image;
+                this.ImageAlignment = _PropertySettings.ImageAlignment;
+            }
+            else
+            {
+                this.ImageAlignment = eCellPartAlignment.FarCenter;
+                this.Image = null;
+            }
+
+            if (!string.IsNullOrEmpty(_PropertySettings.DisplayName))
+                this.Text = _PropertySettings.DisplayName;
+            else
+                this.Text = GetDefaultPropertyName();
+
+            if (!_ErrorTooltipAttached && _PropertySettings.Tooltip != null && !(_PropertySettings.ReadOnly && _PropertySettings.ReadOnlyTooltip != null))
+            {
+                SuperTooltip tooltip = GetSuperTooltip();
+                if (tooltip != null)
+                {
+                    tooltip.SetSuperTooltip(this, _PropertySettings.Tooltip);
+                }
+            }
+        }
+
+        private string GetDefaultPropertyName()
+        {
+            string text = _Property.DisplayName;
+            IPropertyGridLocalizer localizer = this.PropertyGridLocalizer;
+            if (localizer != null)
+            {
+                string name = localizer.GetPropertyName(_Property.Name);
+                if (!string.IsNullOrEmpty(name)) text = name;
+            }
+            return text;
+        }
+        public List<string> IgnoredCategories
+        {
+            get
+            {
+                List<string> categories = new List<string>();
+                AdvPropertyGrid grid = AdvPropertyGrid;
+                if (grid != null)
+                {
+                    categories.AddRange(grid.IgnoredCategories);
+                }
+                return categories;
+            }
+        }
+        public List<string> IgnoredProperties
+        {
+            get
+            {
+                List<string> props = new List<string>();
+                AdvPropertyGrid grid = AdvPropertyGrid;
+                if (grid != null)
+                {
+                    props.AddRange(grid.IgnoredProperties);
+                }
+                return props;
+            }
+        }
+
+        protected override void OnExpandChanging(bool expanded, eTreeAction action)
+        {
+            if (expanded)
+            {
+                LoadChildProperties();
+            }
+
+            base.OnExpandChanging(expanded, action);
+        }
+
+        private bool _IsMultiObject = false;
+        /// <summary>
+        /// Gets or sets whether property node represents property for multiple objects.
+        /// </summary>
+        public bool IsMultiObject
+        {
+            get { return _IsMultiObject; }
+            internal set
+            {
+                _IsMultiObject = value;
+            }
+        }
+
+        protected override void OnKeyboardCopy(KeyEventArgs args)
+        {
+            Clipboard.SetText(this.EditCell.Text);
+            base.OnKeyboardCopy(args);
+        }
+
+        protected override void OnKeyboardPaste(KeyEventArgs args)
+        {
+            if (Clipboard.ContainsText() && !this.IsReadOnly)
+            {
+                ApplyEdit(Clipboard.GetText());
+            }
+            base.OnKeyboardPaste(args);
+        }
+
+        private bool _IsPassword = false;
+        /// <summary>
+        /// Gets or sets whether property is password property which value is not displayed as plain text.
+        /// </summary>
+        public bool IsPassword
+        {
+            get
+            {
+                return _IsPassword;
+            }
+            set
+            {
+                _IsPassword = value;
+            }
+        }
+        #endregion
+
+        #region ITypeDescriptorContext Members
+        public virtual IComponent Component
+        {
+            get
+            {
+                object valueOwner = GetTargetComponent();
+                if (valueOwner is IComponent)
+                {
+                    return (IComponent)valueOwner;
+                }
+
+                return null;
+            }
+        }
+
+        IContainer ITypeDescriptorContext.Container
+        {
+            get
+            {
+                IComponent component = this.Component;
+                if (component != null)
+                {
+                    ISite site = component.Site;
+                    if (site != null)
+                    {
+                        return site.Container;
+                    }
+                }
+                return null;
+            }
+        }
+
+        object ITypeDescriptorContext.Instance
+        {
+            get { return GetTargetComponent(); }
+        }
+
+        void ITypeDescriptorContext.OnComponentChanged()
+        {
+
+        }
+
+        bool ITypeDescriptorContext.OnComponentChanging()
+        {
+            return true;
+        }
+
+        PropertyDescriptor ITypeDescriptorContext.PropertyDescriptor
+        {
+            get { return GetPropertyDescriptor(); }
+        }
+
+        #endregion
+
+        #region IServiceProvider Members
+
+        object IServiceProvider.GetService(Type serviceType)
+        {
+            //Console.WriteLine(serviceType);
+            if (serviceType == typeof(PropertyNode) || serviceType == typeof(IWindowsFormsEditorService))
+            {
+                return this;
+            }
+            AdvPropertyGrid grid = AdvPropertyGrid;
+            if (grid != null)
+            {
+                if (grid.Site != null) return grid.Site.GetService(serviceType);
+                if (grid.Parent != null && grid.Parent.Site != null) return grid.Parent.Site.GetService(serviceType);
+            }
+            return null;
+        }
+
+        #endregion
+
+        #region IWindowsFormsEditorService Members
+
+        void IWindowsFormsEditorService.CloseDropDown()
+        {
+            TextBoxDropDown editor = _Editor as TextBoxDropDown;
+            if (editor != null && editor.IsPopupOpen)
+                editor.CloseDropDown();
+        }
+        private bool _UITypeEditorDropDownControl = false;
+        [System.Runtime.InteropServices.DllImport("user32.dll", CharSet = System.Runtime.InteropServices.CharSet.Auto, ExactSpelling = true)]
+        private static extern int MsgWaitForMultipleObjectsEx(int nCount, IntPtr pHandles, int dwMilliseconds, int dwWakeMask, int dwFlags);
+        void IWindowsFormsEditorService.DropDownControl(Control control)
+        {
+            Type type = typeof(Application);
+            TextBoxDropDown editor = _Editor as TextBoxDropDown;
+
+            MethodInfo mi = type.GetMethod("DoEventsModal", BindingFlags.Static | BindingFlags.NonPublic);
+            if (mi == null || editor == null) return;
+            editor.DropDownControl = control;
+            _UITypeEditorDropDownControl = true;
+
+            editor.ShowDropDown();
+
+            while (editor != null && editor.IsPopupOpen)
+            {
+                mi.Invoke(null, null);
+                MsgWaitForMultipleObjectsEx(0, IntPtr.Zero, 250, 0xff, 4);
+            }
+
+            if (editor != null)
+            {
+                editor.ProcessMouseUpOnGroup();
+                editor.DropDownControl = null;
+            }
+            _UITypeEditorDropDownControl = false;
+        }
+
+        DialogResult IWindowsFormsEditorService.ShowDialog(Form dialog)
+        {
+            return dialog.ShowDialog();
+        }
+
+        #endregion
+    }
+
+    /// <summary>
+    /// Defines an interface that is implemented by the control that will be used by AdvPropertyGrid control to edit property value.
+    /// </summary>
+    public interface IPropertyValueEditor
+    {
+        /// <summary>
+        /// Gets or sets the font used by the edit part of the control. Font might be used to visually indicate that property value has changed. Implementing this property is optional.
+        /// </summary>
+        Font EditorFont { get;set;}
+        /// <summary>
+        /// Gets whether the edit part of the control is focused.
+        /// </summary>
+        bool IsEditorFocused { get;}
+        /// <summary>
+        /// Focus the edit part of the control.
+        /// </summary>
+        void FocusEditor();
+        /// <summary>
+        /// Gets or sets the value being edited.
+        /// </summary>
+        object EditValue { get;set;}
+        /// <summary>
+        /// Occurs when EditValue changes. Raising this even will cause the property value to be updated with the EditValue.
+        /// </summary>
+        event EventHandler EditValueChanged;
+    }
+
+    /// <summary>
+    /// Defines exception which is thrown when property value fails the validation in AdvPropertyGrid.ValidatePropertyValue event.
+    /// </summary>
+    public class InvalidPropertyValueException : Exception
+    {
+        /// <summary>
+        /// Initializes a new instance of the InvalidPropertyValueException class.
+        /// </summary>
+        public InvalidPropertyValueException(string message)
+            : base(message)
+        {
+
+        }
+    }
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/PropertyGrid/PropertyNodeColor.cs b/PROMS/DotNetBar Source Code/PropertyGrid/PropertyNodeColor.cs
new file mode 100644
index 00000000..11b49f88
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/PropertyGrid/PropertyNodeColor.cs	
@@ -0,0 +1,145 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel;
+using System.Drawing;
+using DevComponents.AdvTree;
+using System.Drawing.Imaging;
+using System.Drawing.Drawing2D;
+using DevComponents.DotNetBar.Controls;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Defines Advanced Property Grid Node for Color type.
+    /// </summary>
+    public class PropertyNodeColor : PropertyNode
+    {
+        #region Constructors
+        /// <summary>
+        /// Initializes a new instance of the PropertyNode class.
+        /// </summary>
+        /// <param name="property"></param>
+        public PropertyNodeColor(PropertyDescriptor property) : base(property)
+        {
+            
+        }
+        #endregion
+
+        #region Internal Implementation
+        private Image _SwatchImage = null;
+        protected override void UpdateDisplayedValue(object propertyValue, bool refreshSubProperties)
+        {
+            base.UpdateDisplayedValue(propertyValue, refreshSubProperties);
+            if (IsDisposing || IsDisposed) return;
+
+            Cell cell = this.EditCell;
+            if (propertyValue is Color)
+            {
+                Color color = (Color)propertyValue;
+                if (_SwatchImage == null || !((Color)_SwatchImage.Tag).Equals(color))
+                {
+                    DisposeSwatchImage();
+                    _SwatchImage = CreateSwatchImage(color);
+                    cell.Images.Image = _SwatchImage;
+                }
+            }
+            else
+            {
+                DisposeSwatchImage();
+                cell.Images.Image = null;
+            }
+        }
+        protected override bool IsTypeEditorPaintValueSupported
+        {
+            get
+            {
+                return false;
+            }
+        }
+        private Image CreateSwatchImage(Color color)
+        {
+            Rectangle r = new Rectangle(0, 0, 20, 13);
+            Bitmap image = new Bitmap(r.Width, r.Height, PixelFormat.Format32bppArgb);
+            using (Graphics g = Graphics.FromImage(image))
+            {
+                DisplayHelp.DrawRectangle(g, SwatchBorderColor, r);
+                r.Inflate(-1, -1);
+
+                if (color == Color.Empty)
+                {
+                    using (HatchBrush brush = new HatchBrush(HatchStyle.BackwardDiagonal, SwatchHatchForeColor, SwatchBackColor))
+                        g.FillRectangle(brush, r);
+                }
+                else if (color == Color.Transparent || color.A < 255)
+                {
+                    using (HatchBrush brush = new HatchBrush(HatchStyle.LargeCheckerBoard, SwatchHatchForeColor, SwatchBackColor))
+                        g.FillRectangle(brush, r);
+
+                    if (color != Color.Transparent)
+                    {
+                        using (SolidBrush brush = new SolidBrush(color))
+                            g.FillRectangle(brush, r);
+                    }
+                }
+                else
+                {
+                    using (SolidBrush brush = new SolidBrush(color))
+                        g.FillRectangle(brush, r);
+                }
+
+            }
+            image.Tag = color;
+            return image;
+        }
+
+        private Color _SwatchHatchForeColor = ColorScheme.GetColor(0xC5C5C5);
+        private Color SwatchHatchForeColor
+        {
+            get
+            {
+                return _SwatchHatchForeColor;
+            }
+        }
+
+        private Color _SwatchBorderColor = Color.Black;
+        private Color SwatchBorderColor
+        {
+            get
+            {
+                return _SwatchBorderColor;
+            }
+        }
+        private Color _SwatchBackColor = Color.White;
+        private Color SwatchBackColor
+        {
+            get
+            {
+                return _SwatchBackColor;
+            }
+        }
+
+        private void DisposeSwatchImage()
+        {
+            if (_SwatchImage != null)
+            {
+                _SwatchImage.Dispose();
+                _SwatchImage = null;
+                Cell cell = this.EditCell;
+                if (cell != null)
+                    cell.Images.Image = null;
+            }
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            DisposeSwatchImage();
+            base.Dispose(disposing);
+        }
+        #endregion
+
+
+    }
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/PropertyGrid/PropertyNodeFactory.cs b/PROMS/DotNetBar Source Code/PropertyGrid/PropertyNodeFactory.cs
new file mode 100644
index 00000000..beae4292
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/PropertyGrid/PropertyNodeFactory.cs	
@@ -0,0 +1,95 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+using DevComponents.AdvTree;
+using System.ComponentModel;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar
+{
+    internal class PropertyNodeFactory
+    {
+        #region Constructors
+        /// <summary>
+        /// Initializes a new instance of the PropertyNodeFactory class.
+        /// </summary>
+        /// <param name="categoryStyle"></param>
+        public PropertyNodeFactory(IPropertyElementStyleProvider styleProvider)
+        {
+            _StyleProvider = styleProvider;
+        }
+        #endregion
+
+        #region Internal Implementation
+        public PropertyNode CreatePropertyNode(PropertyDescriptor item, object targetComponent, IPropertyGridLocalizer localizer, PropertySettingsCollection propertySettings, bool isMultiObject)
+        {
+            PropertySettings settings = propertySettings[item, item.Name];
+            return CreatePropertyNode(item, targetComponent, localizer, settings, isMultiObject);
+        }
+        public PropertyNode CreatePropertyNode(PropertyDescriptor item, object targetComponent, IPropertyGridLocalizer localizer, PropertySettings settings, bool isMultiObject)
+        {
+            PropertyNode node = null;
+
+            if (item.PropertyType == typeof(Color) && (settings == null || settings.ValueEditor == null))
+                node = new PropertyNodeColor(item);
+            else if (item.PropertyType == typeof(bool) && (settings == null || settings.ValueEditor == null))
+                node = new PropertyCheckBoxNode(item);
+            else if (settings != null && settings.PropertyNodeType == ePropertyNodeType.RadioButtonList)
+                node = new PropertyOptionListNode(item);
+            else
+                node = new PropertyNode(item);
+
+            node.IsMultiObject = isMultiObject;
+            node.NodesIndent = _ChildPropertiesIndent;
+            node.ImageAlignment = eCellPartAlignment.FarCenter;
+            string name = localizer.GetPropertyName(item.Name);
+            if (string.IsNullOrEmpty(name)) name = item.DisplayName;
+            node.Text = name;
+            node.TargetComponent = targetComponent;
+            Cell cell = new Cell();
+            cell.Selectable = false;
+            cell.TextMarkupEnabled = false;
+            node.Cells.Add(cell);
+            
+            node.PropertySettings = settings;
+
+            return node;
+        }
+        public Node CreateCategoryNode(string category, IPropertyGridLocalizer localizer)
+        {
+            PropertyCategoryNode node = new PropertyCategoryNode();
+            if (_StyleProvider != null)
+                node.Style = _StyleProvider.CategoryStyle;
+            string name = localizer.GetCategoryName(category);
+            if (string.IsNullOrEmpty(name)) name = category;
+            node.Text = name;
+            node.Expanded = true;
+            node.FullRowBackground = true;
+            node.Selectable = true;
+            node.CellNavigationEnabled = false;
+            return node;
+        }
+
+        private int _ChildPropertiesIndent = 9;
+        public int ChildPropertiesIndent
+        {
+            get { return _ChildPropertiesIndent; }
+            set
+            {
+                _ChildPropertiesIndent = value;
+            }
+        }
+
+        private IPropertyElementStyleProvider _StyleProvider;
+        public IPropertyElementStyleProvider StyleProvider
+        {
+            get { return _StyleProvider; }
+            set { _StyleProvider = value; }
+        }
+        #endregion
+
+
+    }
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/PropertyGrid/PropertyOptionListNode.cs b/PROMS/DotNetBar Source Code/PropertyGrid/PropertyOptionListNode.cs
new file mode 100644
index 00000000..f2e9b019
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/PropertyGrid/PropertyOptionListNode.cs	
@@ -0,0 +1,99 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+using DevComponents.AdvTree;
+using System.Drawing;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represents the option list property node for AdvPropertyGrid.
+    /// </summary>
+    public class PropertyOptionListNode : PropertyNode
+    {
+        #region Internal Implementation
+        /// <summary>
+        /// Initializes a new instance of the PropertyNode class.
+        /// </summary>
+        /// <param name="property"></param>
+        public PropertyOptionListNode(PropertyDescriptor property)
+            : base(property)
+        {
+        }
+
+        internal override void OnLoaded()
+        {
+            base.OnLoaded();
+
+            Cell cell = this.EditCell;
+
+            ItemContainer container = new ItemContainer();
+            container.LayoutOrientation = eOrientation.Vertical;
+
+            string[] optionsList = GetPopupListContent();
+            foreach (string optionText in optionsList)
+            {
+                CheckBoxItem item = new CheckBoxItem();
+                item.CheckBoxStyle = eCheckBoxStyle.RadioButton;
+                item.Text = optionText;
+                item.TextColor = Color.Black;
+                item.VerticalPadding = 0;
+                item.CheckSignSize = new Size(11, 11);
+                item.CheckedChanging += ItemCheckedChanging;
+                container.SubItems.Add(item);
+            }
+            container.Style = eDotNetBarStyle.Office2007;
+            cell.HostedItem = container;
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            BaseItem container = this.EditCell.HostedItem;
+            if (container != null)
+            {
+                this.EditCell.HostedItem = null;
+                foreach (BaseItem item in container.SubItems)
+                {
+                    CheckBoxItem checkItem = item as CheckBoxItem;
+                    if (checkItem != null) checkItem.CheckedChanging -= ItemCheckedChanging;
+                }
+                container.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        void ItemCheckedChanging(object sender, CheckBoxChangeEventArgs e)
+        {
+            if (e.EventSource != eEventSource.Code)
+            {
+                Exception valueException = null;
+                object value = GetValueFromString(((CheckBoxItem)sender).Text, out valueException);
+                e.Cancel = !ApplyValue(value, valueException);
+            }
+        }
+
+        protected override void UpdateDisplayedValue(object propertyValue, bool refreshSubProperties)
+        {
+            base.UpdateDisplayedValue(propertyValue, refreshSubProperties);
+            string text = GetPropertyTextValue(propertyValue);
+            Cell cell = this.EditCell;
+            if (cell.HostedItem == null) return;
+            foreach (BaseItem item in cell.HostedItem.SubItems)
+            {
+                CheckBoxItem checkItem = item as CheckBoxItem;
+                if (checkItem != null)
+                    checkItem.Checked = checkItem.Text.Equals(text);
+            }
+        }
+
+        public override void EnterEditorMode(eTreeAction action, bool focusEditor)
+        {
+        }
+
+        
+        #endregion
+    }
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/PropertyGrid/PropertyParser.cs b/PROMS/DotNetBar Source Code/PropertyGrid/PropertyParser.cs
new file mode 100644
index 00000000..34717f0a
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/PropertyGrid/PropertyParser.cs	
@@ -0,0 +1,340 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel;
+using DevComponents.AdvTree;
+using System.Collections;
+
+namespace DevComponents.DotNetBar
+{
+    internal class PropertyParser
+    {
+        private const string STR_Misc = "Misc.";
+
+        #region Constructors
+        private object _SelectedObject = null;
+        private object[] _SelectedObjects = null;
+        private TypeConverter _Converter = null;
+        private Attribute[] _AttributeFilter = null;
+        private PropertyNodeFactory _PropertyNodeFactory = null;
+        private List<string> _IgnoredProperties = null;
+        private List<string> _IgnoredCategories = null;
+        private IPropertyGridLocalizer _Localizer = null;
+        private PropertySettingsCollection _PropertySettings = null;
+        private ITypeDescriptorContext _TypeDescriptorContext = null;
+        /// <summary>
+        /// Initializes a new instance of the PropertyParser class.
+        /// </summary>
+        /// <param name="selectedObject"></param>
+        public PropertyParser(object selectedObject,
+            Attribute[] attributeFilter,
+            PropertyNodeFactory nodeFactory,
+            List<string> ignoredProperties,
+            List<string> ignoredCategories,
+            IPropertyGridLocalizer localizer,
+            PropertySettingsCollection propertySettings)
+        {
+            _SelectedObject = selectedObject;
+            _AttributeFilter = attributeFilter;
+            _PropertyNodeFactory = nodeFactory;
+            _IgnoredProperties = ignoredProperties;
+            _IgnoredCategories = ignoredCategories;
+            _Localizer = localizer;
+            _PropertySettings = propertySettings;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the PropertyParser class.
+        /// </summary>
+        /// <param name="selectedObject"></param>
+        public PropertyParser(
+            ITypeDescriptorContext context, 
+            object selectedObject,
+            Attribute[] attributeFilter,
+            PropertyNodeFactory nodeFactory,
+            List<string> ignoredProperties,
+            List<string> ignoredCategories,
+            IPropertyGridLocalizer localizer,
+            PropertySettingsCollection propertySettings)
+        {
+            _TypeDescriptorContext = context;
+            _SelectedObject = selectedObject;
+            _AttributeFilter = attributeFilter;
+            _PropertyNodeFactory = nodeFactory;
+            _IgnoredProperties = ignoredProperties;
+            _IgnoredCategories = ignoredCategories;
+            _Localizer = localizer;
+            _PropertySettings = propertySettings;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the PropertyParser class.
+        /// </summary>
+        /// <param name="selectedObject"></param>
+        public PropertyParser(object[] selectedObjects,
+            Attribute[] attributeFilter,
+            PropertyNodeFactory nodeFactory,
+            List<string> ignoredProperties,
+            List<string> ignoredCategories,
+            IPropertyGridLocalizer localizer,
+            PropertySettingsCollection propertySettings)
+        {
+            _SelectedObjects = selectedObjects;
+            _AttributeFilter = attributeFilter;
+            _PropertyNodeFactory = nodeFactory;
+            _IgnoredProperties = ignoredProperties;
+            _IgnoredCategories = ignoredCategories;
+            _Localizer = localizer;
+            _PropertySettings = propertySettings;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the PropertyParser class.
+        /// </summary>
+        /// <param name="selectedObject"></param>
+        public PropertyParser(
+            ITypeDescriptorContext context,
+            object[] selectedObjects,
+            Attribute[] attributeFilter,
+            PropertyNodeFactory nodeFactory,
+            List<string> ignoredProperties,
+            List<string> ignoredCategories,
+            IPropertyGridLocalizer localizer,
+            PropertySettingsCollection propertySettings)
+        {
+            _TypeDescriptorContext = context;
+            _SelectedObjects = selectedObjects;
+            _AttributeFilter = attributeFilter;
+            _PropertyNodeFactory = nodeFactory;
+            _IgnoredProperties = ignoredProperties;
+            _IgnoredCategories = ignoredCategories;
+            _Localizer = localizer;
+            _PropertySettings = propertySettings;
+        }
+        #endregion
+
+        #region Internal Implementation
+        internal void Parse(NodeCollection nodeCollection, ePropertySort propertySort, SuperTooltip helpTooltip)
+        {
+            PropertyDescriptorCollection propertyCollection = GetProperties();
+            bool hasIgnoredProperties = _IgnoredProperties.Count > 0;
+            bool hasIgnoredCategories = _IgnoredCategories.Count > 0;
+
+            if (propertySort == ePropertySort.Categorized || propertySort == ePropertySort.CategorizedAlphabetical)
+            {
+                Dictionary<string, Node> table = new Dictionary<string, Node>();
+                foreach (PropertyDescriptor item in propertyCollection)
+                {
+                    if (item == null || hasIgnoredProperties && _IgnoredProperties.Contains(item.Name)) continue;
+
+                    string category = GetCategory(item);
+                    PropertySettings settings = _PropertySettings[item, item.Name];
+                    if (settings != null && settings.Category != null)
+                        category = settings.Category;
+                        
+                    if (hasIgnoredCategories && !string.IsNullOrEmpty(category) && _IgnoredCategories.Contains(category)) continue;
+
+                    Node categoryNode = null;
+                    if (!table.TryGetValue(category, out categoryNode))
+                    {
+                        categoryNode = _PropertyNodeFactory.CreateCategoryNode(category, _Localizer);
+                        nodeCollection.Add(categoryNode);
+                        table.Add(category, categoryNode);
+                    }
+                    PropertyNode node = _PropertyNodeFactory.CreatePropertyNode(item, _SelectedObject ?? _SelectedObjects, _Localizer, settings, _SelectedObjects != null);
+                    categoryNode.Nodes.Add(node);
+                    node.OnLoaded();
+                    if (_HelpType == ePropertyGridHelpType.SuperTooltip && helpTooltip != null)
+                        node.SetHelpTooltip(helpTooltip);
+                    node.UpdateDisplayedValue();
+                }
+
+                if (propertySort == ePropertySort.CategorizedAlphabetical)
+                {
+                    foreach (Node item in table.Values)
+                    {
+                        item.Nodes.Sort();
+                    }
+
+                    nodeCollection.Sort();
+                }
+            }
+            else
+            {
+                foreach (PropertyDescriptor item in propertyCollection)
+                {
+                    if (item == null || _IgnoredProperties.Contains(item.Name)) continue;
+
+                    PropertyNode node = _PropertyNodeFactory.CreatePropertyNode(item, _SelectedObject ?? _SelectedObjects, _Localizer, _PropertySettings, _SelectedObjects != null);
+                    nodeCollection.Add(node);
+                    node.OnLoaded();
+                    if (_HelpType == ePropertyGridHelpType.SuperTooltip && helpTooltip != null)
+                        node.SetHelpTooltip(helpTooltip);
+                    node.UpdateDisplayedValue();
+                }
+                if (propertySort == ePropertySort.Alphabetical)
+                    nodeCollection.Sort();
+            }
+        }
+
+        internal static bool GetReadOnlyAttribute(PropertyDescriptor item, object instance)
+        {
+            bool readOnly = TypeDescriptor.GetAttributes(instance).Contains(InheritanceAttribute.InheritedReadOnly);
+            // if (item.Attributes[typeof(ReadOnlyAttribute)].Equals(ReadOnlyAttribute.Yes))
+            if (TypeDescriptor.GetAttributes(instance).Contains(ReadOnlyAttribute.Yes))
+            {
+                readOnly |= true;
+            }
+            //if(_Converter!=null && _Converter)
+            
+            ReadOnlyAttribute readOnlyAttribute = item.Attributes[typeof(ReadOnlyAttribute)] as ReadOnlyAttribute;
+            if (!readOnly && readOnlyAttribute != null && readOnlyAttribute.IsReadOnly && !readOnlyAttribute.IsDefaultAttribute())
+                readOnly |= true;
+
+            if (!readOnly)
+            {
+                readOnly = item.IsReadOnly;
+            }
+            //if (item.Attributes[typeof(ImmutableObjectAttribute)].Equals(ImmutableObjectAttribute.Yes))
+            //    readOnly |= true;
+
+            return readOnly; // item.IsReadOnly;
+        }
+
+        private static CategoryAttribute _CategoryAttribute = new CategoryAttribute();
+        private string GetCategory(PropertyDescriptor item)
+        {
+            string s = item.Category;
+            if (!string.IsNullOrEmpty(s)) return s;
+            
+            CategoryAttribute cat = item.Attributes[_CategoryAttribute.GetType()] as CategoryAttribute;
+            if (cat != null && !string.IsNullOrEmpty(cat.Category)) return cat.Category;
+            
+            return STR_Misc;
+        }
+
+        private TypeConverter GetConverter(object component)
+        {
+            if (_Converter != null && _SelectedObject != null) return _Converter;
+
+            TypeConverter converter = TypeDescriptor.GetConverter(component);
+            if(converter.GetPropertiesSupported())
+                return converter;
+            return null;
+        }
+        private PropertyDescriptorCollection GetProperties()
+        {
+            Attribute[] attributes = _AttributeFilter;
+
+            if (_SelectedObject != null)
+            {
+                object component = _SelectedObject;
+                return GetProperties(_TypeDescriptorContext, attributes, component, GetConverter(component));
+            }
+
+            int selectedObjectsCount = _SelectedObjects.Length;
+            List<PropertyDescriptor> mergedProperties = new List<PropertyDescriptor>();
+
+            List<PropertyDescriptorCollection> allProperties = new List<PropertyDescriptorCollection>(selectedObjectsCount);
+            foreach (object selectedObject in _SelectedObjects)
+            {
+                allProperties.Add(GetProperties(_TypeDescriptorContext, attributes, selectedObject, GetConverter(selectedObject)));
+            }
+
+            PropertyDescriptorCollection col1 = allProperties[0];
+
+            for (int i = 0; i < col1.Count; i++)
+            {
+                PropertyDescriptor propDesc = col1[i];
+                bool mergable = propDesc.Attributes[typeof(MergablePropertyAttribute)].IsDefaultAttribute();
+                if (!mergable) continue;
+
+                int childPropertyOccurrenceCount = 1;
+                for (int j = 1; j < allProperties.Count; j++)
+                {
+                    PropertyDescriptorCollection col2 = allProperties[j];
+                    foreach (PropertyDescriptor propDesc2 in col2)
+                    {
+                        if (ArePropertiesSame(propDesc2, propDesc) && propDesc.Attributes[typeof(MergablePropertyAttribute)].IsDefaultAttribute())
+                        {
+                            childPropertyOccurrenceCount++;
+                            break;
+                        }
+                    }
+                }
+
+                if (childPropertyOccurrenceCount == selectedObjectsCount)
+                {
+                    mergedProperties.Add(propDesc);
+                }
+            }
+
+            return new PropertyDescriptorCollection(mergedProperties.ToArray());
+        }
+
+        private bool ArePropertiesSame(PropertyDescriptor propDesc2, PropertyDescriptor propDesc)
+        {
+            return propDesc2.Name == propDesc.Name && propDesc2.PropertyType == propDesc.PropertyType;
+        }
+        public static PropertyDescriptor GetProperty(string propertyName, object component, TypeConverter converter)
+        {
+            PropertyDescriptorCollection col = GetProperties(null, component, converter);
+            foreach (PropertyDescriptor item in col)
+            {
+                if (item.Name == propertyName)
+                    return item;
+            }
+            return null;
+        }
+        
+        public static PropertyDescriptorCollection GetProperties(Attribute[] attributes, object component, TypeConverter converter)
+        {
+            return GetProperties(null, attributes, component, converter);
+        }
+
+         public static PropertyDescriptorCollection GetProperties(ITypeDescriptorContext context, Attribute[] attributes, object component, TypeConverter converter)
+        {
+            if (component == null) return null;
+
+            if (component is ICustomTypeDescriptor)
+            {
+                ICustomTypeDescriptor descriptor = (ICustomTypeDescriptor)component;
+                if (attributes != null)
+                    return descriptor.GetProperties(attributes);
+                return descriptor.GetProperties();
+            }
+
+            // Note that this assumes that converter supports GetProperties!
+            if (converter != null)
+            {
+                return converter.GetProperties(context, component, attributes);
+            }
+
+            Type type = component.GetType();
+            
+            if (attributes != null)
+                return TypeDescriptor.GetProperties(component, attributes);
+
+            return TypeDescriptor.GetProperties(component);
+        }
+
+        private ePropertyGridHelpType _HelpType = ePropertyGridHelpType.HelpHidden;
+        public ePropertyGridHelpType HelpType
+        {
+            get { return _HelpType; }
+            set { _HelpType = value; }
+        }
+
+        public TypeConverter TypeConverter
+        {
+            get { return _Converter; }
+            set { _Converter = value; }
+        }
+        #endregion
+
+
+
+    }
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/PropertyGrid/PropertySettings.cs b/PROMS/DotNetBar Source Code/PropertyGrid/PropertySettings.cs
new file mode 100644
index 00000000..828cf9e6
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/PropertyGrid/PropertySettings.cs	
@@ -0,0 +1,608 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel;
+using System.Drawing;
+using DevComponents.AdvTree;
+using System.Drawing.Design;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Describes the property settings applied to the property on AdvPropertyGrid control.
+    /// </summary>
+    [ToolboxItem(false)]
+    public class PropertySettings : Component, INotifyPropertyChanged
+    {
+        #region Events
+        /// <summary>
+        /// Occurs when property value is being converted to text representation for display. You can handle this event
+        /// to provide custom conversion for property values. You must set IsConverted=true on event arguments to indicate that you have performed value conversion.
+        /// </summary>
+        [Description("Occurs when property value is being converted to text representation for display.")]
+        public event ConvertValueEventHandler ConvertPropertyValueToString;
+
+        /// <summary>
+        /// Occurs when text entered by user is being converted to typed property value to be assigned to the property. You can handle this event
+        /// to provide custom conversion for property values. You must set IsConverted=true on event arguments to indicate that you have performed value conversion.
+        /// </summary>
+        [Description("Occurs when text entered by user is being converted to typed property value to be assigned to the property.")]
+        public event ConvertValueEventHandler ConvertFromStringToPropertyValue;
+
+        /// <summary>
+        /// Occurs when property looks for the list of valid values for the property to show on either drop-down or use
+        /// in auto-complete list. For example when property type is enum the internal implementation will convert available enum
+        /// values into string list and use on drop-down and in auto-complete list. You can use this event to provide
+        /// custom value list in combination with ConvertPropertyValueToString, ConvertFromStringToPropertyValue events.
+        /// You must set IsListValid=true on event arguments to indicate that list your provided should be used.
+        /// </summary>
+        [Description("Occurs when property looks for the list of valid values for the property to show on either drop-down or use in auto-complete list.")]
+        public event PropertyValueListEventHandler ProvidePropertyValueList;
+        #endregion
+
+        #region Constructors
+        /// <summary>
+        /// Initializes a new instance of the PropertySettings class.
+        /// </summary>
+        public PropertySettings()
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the PropertySettings class.
+        /// </summary>
+        /// <param name="propertyName"></param>
+        public PropertySettings(string propertyName)
+        {
+            _PropertyName = propertyName;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the PropertySettings class.
+        /// </summary>
+        /// <param name="propertyDescriptor"></param>
+        public PropertySettings(PropertyDescriptor propertyDescriptor)
+        {
+            _PropertyDescriptor = propertyDescriptor;
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            if (BarUtilities.DisposeItemImages && !this.DesignMode)
+            {
+                BarUtilities.DisposeImage(ref _Image);
+            }
+            base.Dispose(disposing);
+        }
+        #endregion
+
+        #region Internal Implementation
+        private ElementStyle _ReadOnlyStyle = null;
+        /// <summary>
+        /// Gets or sets read-only property style.
+        /// </summary>
+        /// <value>
+        /// Default value is null.
+        /// </value>
+        [DefaultValue(null), /*Editor("DevComponents.AdvTree.Design.ElementStyleTypeEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)),*/ Description("Indicates read-only property style.")]
+        public ElementStyle ReadOnlyStyle
+        {
+            get { return _ReadOnlyStyle; }
+            set
+            {
+                if (_ReadOnlyStyle != value)
+                {
+                    if (_ReadOnlyStyle != null)
+                        _ReadOnlyStyle.StyleChanged -= ReadOnlyStyleChanged;
+                    if (value != null)
+                        value.StyleChanged += ReadOnlyStyleChanged;
+                    _ReadOnlyStyle = value;
+                    OnPropertyChanged(new PropertyChangedEventArgs("ReadOnlyStyle"));
+                }
+            }
+        }
+        private void ReadOnlyStyleChanged(object sender, EventArgs e)
+        {
+
+        }
+        private bool _ReadOnly = false;
+        /// <summary>
+        /// Gets or sets whether property is in read-only state. Default value is false.
+        /// </summary>
+        [DefaultValue(false), Description("Indicates whether property is in read-only state."), Category("Behavior")]
+        public bool ReadOnly
+        {
+            get { return _ReadOnly; }
+            set
+            {
+                if (value != _ReadOnly)
+                {
+                    bool oldValue = _ReadOnly;
+                    _ReadOnly = value;
+                    OnReadOnlyChanged(oldValue, value);
+                }
+            }
+        }
+        private void OnReadOnlyChanged(bool oldValue, bool newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("ReadOnly"));
+        }
+
+        private SuperTooltipInfo _ReadOnlyTooltip;
+        /// <summary>
+        /// Gets or sets the SuperTooltip that is displayed when property is in read-only state (ReadOnly=true).
+        /// </summary>
+        [DefaultValue(null), Description("Indicates SuperTooltip that is displayed when property is in read-only state (ReadOnly=true)"), Category("Behavior")]
+        public SuperTooltipInfo ReadOnlyTooltip
+        {
+            get { return _ReadOnlyTooltip; }
+            set
+            {
+                if (value != _ReadOnlyTooltip)
+                {
+                    SuperTooltipInfo oldValue = _ReadOnlyTooltip;
+                    _ReadOnlyTooltip = value;
+                    OnReadOnlyTooltipChanged(oldValue, value);
+                }
+            }
+        }
+        private void OnReadOnlyTooltipChanged(SuperTooltipInfo oldValue, SuperTooltipInfo newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("ReadOnlyTooltip"));
+            
+        }
+
+        /// <summary>
+        /// Raises the ConvertPropertyValueToString event.
+        /// </summary>
+        /// <param name="e">Provides event data</param>
+        protected virtual void OnConvertPropertyValueToString(ConvertValueEventArgs e)
+        {
+            ConvertValueEventHandler handler = ConvertPropertyValueToString;
+            if (handler != null)
+                handler(this, e);
+        }
+        internal void InvokeConvertPropertyValueToString(ConvertValueEventArgs e)
+        {
+            OnConvertPropertyValueToString(e);
+        }
+        internal bool HasConvertPropertyValueToStringHandler
+        {
+            get
+            {
+                return ConvertPropertyValueToString != null;
+            }
+        }
+
+        /// <summary>
+        /// Raises the ConvertFromStringToPropertyValue event.
+        /// </summary>
+        /// <param name="e">Provides event data</param>
+        protected virtual void OnConvertFromStringToPropertyValue(ConvertValueEventArgs e)
+        {
+            ConvertValueEventHandler handler = ConvertFromStringToPropertyValue;
+            if (handler != null)
+                handler(this, e);
+        }
+        internal void InvokeConvertFromStringToPropertyValue(ConvertValueEventArgs e)
+        {
+            OnConvertFromStringToPropertyValue(e);
+        }
+        internal bool HasConvertFromStringToPropertyValueHandler
+        {
+            get
+            {
+                return ConvertFromStringToPropertyValue != null;
+            }
+        }
+
+        /// <summary>
+        /// Raises the ProvidePropertyValueList event.
+        /// </summary>
+        /// <param name="e">Provides event data</param>
+        protected virtual void OnProvidePropertyValueList(PropertyValueListEventArgs e)
+        {
+            PropertyValueListEventHandler handler = ProvidePropertyValueList;
+            if (handler != null)
+                handler(this, e);
+        }
+        internal void InvokeProvidePropertyValueList(PropertyValueListEventArgs e)
+        {
+            OnProvidePropertyValueList(e);
+        }
+        internal bool HasProvidePropertyValueListHandler
+        {
+            get
+            {
+                return ProvidePropertyValueList != null;
+            }
+        }
+
+        private SuperTooltipInfo _Tooltip = null;
+        /// <summary>
+        /// Gets or sets the SuperTooltip that is assigned to the property.
+        /// </summary>
+        [DefaultValue(null), Localizable(true), Category("Appearance"), Description("Indicates SuperTooltip that is assigned to the property.")]
+        public SuperTooltipInfo Tooltip
+        {
+            get { return _Tooltip; }
+            set
+            {
+                if (value != _Tooltip)
+                {
+                    SuperTooltipInfo oldValue = _Tooltip;
+                    _Tooltip = value;
+                    OnTooltipChanged(oldValue, value);
+                }
+            }
+        }
+        private void OnTooltipChanged(SuperTooltipInfo oldValue, SuperTooltipInfo newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("Tooltip"));
+        }
+
+        private Image _Image = null;
+        /// <summary>
+        /// Gets or sets the image that is displayed next to the property name in the grid.
+        /// </summary>
+        [DefaultValue(null), Category("Appearance"), Localizable(true), Description("Indicates image that is displayed next to the property name in the grid.")]
+        public Image Image
+        {
+            get { return _Image; }
+            set
+            {
+                if (value != _Image)
+                {
+                    Image oldValue = _Image;
+                    _Image = value;
+                    OnImageChanged(oldValue, value);
+                }
+            }
+        }
+        private void OnImageChanged(Image oldValue, Image newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("Image"));   
+        }
+
+        private eCellPartAlignment _ImageAlignment = eCellPartAlignment.NearCenter;
+        /// <summary>
+        /// Gets or sets the image alignment in relation to the property name inside of the grid cell.
+        /// </summary>
+        [DefaultValue(eCellPartAlignment.NearCenter), Category("Appearance"), Description("Indicates image alignment in relation to the property name inside of the grid cell.")]
+        public eCellPartAlignment ImageAlignment
+        {
+            get { return _ImageAlignment; }
+            set
+            {
+                if (value != _ImageAlignment)
+                {
+                    eCellPartAlignment oldValue = _ImageAlignment;
+                    _ImageAlignment = value;
+                    OnImageAlignmentChanged(oldValue, value);
+                }
+            }
+        }
+
+        private void OnImageAlignmentChanged(eCellPartAlignment oldValue, eCellPartAlignment newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("ImageAlignment"));
+        }
+
+        private string _Category = null;
+        /// <summary>
+        /// Gets or sets the custom category node will be placed in instead of category specified by Category attribute.
+        /// </summary>
+        [DefaultValue(null), Category("Appearance"), Localizable(true), Description("Indicates custom category node will be placed in instead of category specified by Category attribute.")]
+        public string Category
+        {
+            get { return _Category; }
+            set
+            {
+                if (value != _Category)
+                {
+                    string oldValue = _Category;
+                    _Category = value;
+                    OnCategoryChanged(oldValue, value);
+                }
+            }
+        }
+
+        private void OnCategoryChanged(string oldValue, string newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("Category"));
+        }
+
+        private string _DisplayName = null;
+        /// <summary>
+        /// Gets or sets the custom property name that is displayed in the grid instead of the real property name.
+        /// </summary>
+        [DefaultValue(null), Category("Appearance"), Localizable(true), Description("Indicates custom property name that is displayed in the grid instead of the real property name.")]
+        public string DisplayName
+        {
+            get { return _DisplayName; }
+            set
+            {
+                if (value != _DisplayName)
+                {
+                    string oldValue = _DisplayName;
+                    _DisplayName = value;
+                    OnDisplayNameChanged(oldValue, value);
+                }
+            }
+        }
+        private void OnDisplayNameChanged(string oldValue, string newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("DisplayName"));
+        }
+
+        private string _PropertyName = "";
+        /// <summary>
+        /// Gets or sets the name of the property that is managed by this informational object. If you set PropertyDescriptor than that is the value 
+        /// that will be used by the control regardless of PropertyName value. 
+        /// If you set PropertyName but not PropertyDescriptor then all properties with given name
+        /// regardless of type will use these settings.
+        /// </summary>
+        [DefaultValue("Indicates the name of the properties that settings are applied to.")]
+        public string PropertyName
+        {
+            get
+            {
+                if (_PropertyDescriptor != null) return _PropertyDescriptor.Name;
+                return _PropertyName;
+            }
+            set
+            {
+                if (_PropertyName == value) return;
+                _PropertyName = value;
+                OnPropertyNameChanged();
+            }
+        }
+        private void OnPropertyNameChanged()
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("PropertyName"));
+        }
+
+        private PropertyDescriptor _PropertyDescriptor = null;
+        /// <summary>
+        /// Gets or sets property descriptor that identifies the property settings apply to. If you set PropertyDescriptor than that is the value 
+        /// that will be used by the control regardless of PropertyName value. 
+        /// If you set PropertyName but not PropertyDescriptor then all properties with given name
+        /// regardless of type will use these settings.
+        /// </summary>
+        [DefaultValue(null), Description("Indicates property descriptor that identifies the property that uses these settings.")]
+        public PropertyDescriptor PropertyDescriptor
+        {
+            get { return _PropertyDescriptor; }
+            set
+            {
+                if (_PropertyDescriptor != value)
+                {
+                    _PropertyDescriptor = value;
+                    OnPropertyDescriptorChanged();
+                }
+            }
+        }
+        private void OnPropertyDescriptorChanged()
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("PropertyDescriptor"));
+        }
+
+        private ElementStyle _Style = null;
+        /// <summary>
+        /// Gets or sets default property style.
+        /// </summary>
+        /// <value>
+        /// Default value is null.
+        /// </value>
+        [DefaultValue(null), /*Editor("DevComponents.AdvTree.Design.ElementStyleTypeEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)),*/ Description("Indicates default property style.")]
+        public ElementStyle Style
+        {
+            get { return _Style; }
+            set
+            {
+                if (_Style != value)
+                {
+                    if (_Style != null)
+                        _Style.StyleChanged -= StyleChanged;
+                    if (value != null)
+                        value.StyleChanged += StyleChanged;
+                    _Style = value;
+                    OnPropertyChanged(new PropertyChangedEventArgs("Style"));
+                }
+            }
+        }
+        private void StyleChanged(object sender, EventArgs e)
+        {
+
+        }
+
+        private UITypeEditor _UITypeEditor = null;
+        /// <summary>
+        /// Gets or sets the UITypeEditor used to edit the property.
+        /// </summary>
+        [DefaultValue(null), Category("Behavior"), Browsable(false)]
+        public UITypeEditor UITypeEditor
+        {
+            get { return _UITypeEditor; }
+            set
+            {
+                if (value != _UITypeEditor)
+                {
+                    UITypeEditor oldValue = _UITypeEditor;
+                    _UITypeEditor = value;
+                    OnUITypeEditorChanged(oldValue, value);
+                }
+            }
+        }
+        private void OnUITypeEditorChanged(UITypeEditor oldValue, UITypeEditor newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("UITypeEditor"));   
+        }
+
+        private PropertyValueEditor _ValueEditor = null;
+        /// <summary>
+        /// Gets or sets the custom in-line property value editor. Property value editor is created by inheriting from PropertyValueEditor class.
+        /// </summary>
+        [DefaultValue(null), Browsable(false)]
+        public PropertyValueEditor ValueEditor
+        {
+            get { return _ValueEditor; }
+            set
+            {
+                if (value != _ValueEditor)
+                {
+                    PropertyValueEditor oldValue = _ValueEditor;
+                    _ValueEditor = value;
+                    OnValueEditorChanged(oldValue, value);
+                }
+            }
+        }
+        private void OnValueEditorChanged(PropertyValueEditor oldValue, PropertyValueEditor newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("ValueEditor"));
+            
+        }
+
+        private bool _Visible = true;
+        /// <summary>
+        /// Gets or sets whether node is visible in property grid. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance"), Description("Indicates whether node is visible in property grid.")]
+        public bool Visible
+        {
+            get { return _Visible; }
+            set
+            {
+                if (value != _Visible)
+                {
+                    bool oldValue = _Visible;
+                    _Visible = value;
+                    OnVisibleChanged(oldValue, value);
+                }
+            }
+        }
+        private void OnVisibleChanged(bool oldValue, bool newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("Visible"));
+            
+        }
+
+        private ePropertyNodeType _PropertyNodeType = ePropertyNodeType.Default;
+        /// <summary>
+        /// Gets or sets the property node type that is used to edit this property value. Note that content of property grid would need to be
+        /// reloaded to apply any changes to this property.
+        /// </summary>
+        [DefaultValue(ePropertyNodeType.Default), Description("Indicates property node type that is used to edit this property value.")]
+        public ePropertyNodeType PropertyNodeType
+        {
+            get { return _PropertyNodeType; }
+            set
+            {
+                if (value != _PropertyNodeType)
+                {
+                    ePropertyNodeType oldValue = _PropertyNodeType;
+                    _PropertyNodeType = value;
+                    OnPropertyNodeTypeChanged(oldValue, value);
+                }
+            }
+        }
+        private void OnPropertyNodeTypeChanged(ePropertyNodeType oldValue, ePropertyNodeType newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("PropertyNodeType"));
+        }
+
+        private string _Description = null;
+        /// <summary>
+        /// Gets or sets the property description that overrides description specified on property through DescriptionAttribute. 
+        /// Default value is null.
+        /// </summary>
+        [DefaultValue(null), Description("Indicates property description that overrides description specified on property through DescriptionAttribute. "), Localizable(true)]
+        public string Description
+        {
+            get { return _Description; }
+            set
+            {
+                if (value != _Description)
+                {
+                    string oldValue = _Description;
+                    _Description = value;
+                    OnDescriptionChanged(oldValue, value);
+                }
+            }
+        }
+        private void OnDescriptionChanged(string oldValue, string newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("Description"));   
+        }
+
+        private TypeConverter _TypeConverter = null;
+        /// <summary>
+        /// Gets or sets custom TypeConverter assigned to the property which will override any TypeConverter that is returned by the PropertyDescriptor.
+        /// </summary>
+        [Browsable(false), DefaultValue(null)]
+        public TypeConverter TypeConverter
+        {
+            get { return _TypeConverter; }
+            set
+            {
+                if (value != _TypeConverter)
+                {
+                    TypeConverter oldValue = _TypeConverter;
+                    _TypeConverter = value;
+                    OnTypeConverterChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when TypeConverter property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnTypeConverterChanged(TypeConverter oldValue, TypeConverter newValue)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs("TypeConverter"));
+            
+        }
+
+        internal static string NamePropertyName = "PropertyName";
+        internal static string NamePropertyDescriptor = "PropertyDescriptor";
+        internal static string NameVisible = "Visible";
+        #endregion
+
+        #region INotifyPropertyChanged Members
+        /// <summary>
+        /// Raises PropertyChanged event.
+        /// </summary>
+        /// <param name="e">Event data.</param>
+        protected virtual void OnPropertyChanged(PropertyChangedEventArgs e)
+        {
+            PropertyChangedEventHandler handler = PropertyChanged;
+            if (handler != null)
+                handler(this, e);
+        }
+        /// <summary>
+        /// Occurs when property value on the object changes.
+        /// </summary>
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        #endregion
+    }
+
+    /// <summary>
+    /// Defines the type of the property node in grid that is assigned to property.
+    /// </summary>
+    public enum ePropertyNodeType
+    {
+        /// <summary>
+        /// Specifies default node type for the property.
+        /// </summary>
+        Default,
+        /// <summary>
+        /// Specifies the node type that is constructed as group of option buttons that represent all values for the property. Works best
+        /// for smaller set of Enum values.
+        /// </summary>
+        RadioButtonList
+    }
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/PropertyGrid/PropertySettingsCollection.cs b/PROMS/DotNetBar Source Code/PropertyGrid/PropertySettingsCollection.cs
new file mode 100644
index 00000000..988ffd25
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/PropertyGrid/PropertySettingsCollection.cs	
@@ -0,0 +1,138 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar
+{
+    public class PropertySettingsCollection : Collection<PropertySettings>
+    {
+        #region Constructor
+        /// <summary>
+        /// Initializes a new instance of the PropertyGridInfoCollection class.
+        /// </summary>
+        /// <param name="owner"></param>
+        public PropertySettingsCollection(AdvPropertyGrid owner)
+        {
+            _Owner = owner;
+        }
+        #endregion
+
+        #region Internal Implementation
+        protected override void InsertItem(int index, PropertySettings item)
+        {
+            base.InsertItem(index, item);
+            OnAfterItemAdded(item);
+        }
+
+        private void OnAfterItemAdded(PropertySettings item)
+        {
+            _Owner.PropertySettingsItemAdded(item);
+        }
+
+        protected override void ClearItems()
+        {
+            PropertySettings[] items = new PropertySettings[this.Count];
+            this.CopyTo(items, 0);
+            
+            base.ClearItems();
+
+            foreach (PropertySettings item in items)
+            {
+                OnAfterItemRemoved(item);
+            }
+        }
+
+        protected override void RemoveItem(int index)
+        {
+            PropertySettings info = this[index];
+            base.RemoveItem(index);
+            OnAfterItemRemoved(info);
+        }
+
+        private void OnAfterItemRemoved(PropertySettings info)
+        {
+            _Owner.PropertySettingsItemRemoved(info);
+        }
+
+        protected override void SetItem(int index, PropertySettings item)
+        {
+            PropertySettings oldItem = this[index];
+            base.SetItem(index, item);
+
+            OnAfterItemRemoved(oldItem);
+            OnAfterItemAdded(item);
+        }
+
+        /// <summary>
+        /// Gets property info object based on property name.
+        /// </summary>
+        /// <param name="propertyName">Property name.</param>
+        /// <returns>PropertyGridInfo instance or null if it cannot be found.</returns>
+        public virtual PropertySettings this[string propertyName]
+        {
+            get
+            {
+                foreach (PropertySettings item in this)
+                {
+                    if (item.PropertyName == propertyName) return item;
+                }
+                return null;
+            }
+        }
+
+        private Dictionary<PropertyDescriptor, PropertySettings> _DictionaryByDescriptor = new Dictionary<PropertyDescriptor, PropertySettings>();
+        /// <summary>
+        /// Gets property info object based on property descriptor.
+        /// </summary>
+        /// <param name="propertyDescriptor">Property descriptor.</param>
+        /// <returns>PropertyGridInfo instance or null if it cannot be found.</returns>
+        public virtual PropertySettings this[PropertyDescriptor propertyDescriptor]
+        {
+            get
+            {
+                foreach (PropertySettings item in this)
+                {
+                    if (item.PropertyDescriptor.Equals(propertyDescriptor)) return item;
+                }
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Returns property setting based on property descriptor or name if property descriptor is not set on property settings
+        /// Property descriptor takes precedence.
+        /// </summary>
+        /// <param name="propertyDescriptor">Property descriptor to look for.</param>
+        /// <param name="propertyName">Property Name to look for.</param>
+        /// <returns>Property settings instance or null</returns>
+        public virtual PropertySettings this[PropertyDescriptor propertyDescriptor, string propertyName]
+        {
+            get
+            {
+                PropertySettings settingByName = null;
+                foreach (PropertySettings item in this)
+                {
+                    if (item.PropertyDescriptor != null && item.PropertyDescriptor.Equals(propertyDescriptor))
+                        return item;
+                    else if (item.PropertyName == propertyName)
+                        settingByName = item;
+                }
+                return settingByName;
+            }
+        }
+
+        private AdvPropertyGrid _Owner = null;
+        /// <summary>
+        /// Gets the owner of the collection.
+        /// </summary>
+        public AdvPropertyGrid Owner
+        {
+            get { return _Owner; }
+        }
+        #endregion
+    }
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/PropertyGrid/PropertySliderEditor.cs b/PROMS/DotNetBar Source Code/PropertyGrid/PropertySliderEditor.cs
new file mode 100644
index 00000000..e8655b7f
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/PropertyGrid/PropertySliderEditor.cs	
@@ -0,0 +1,218 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using DevComponents.DotNetBar.Controls;
+using System.Drawing;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Defines base attribute for custom AdvPropertyGrid in-line property value editors.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Property | AttributeTargets.Field)]
+    public abstract class PropertyValueEditor : Attribute
+    {
+        /// <summary>
+        /// Creates a control that is used as property value in-line editor. Control must implement IPropertyValueEditor interface.
+        /// </summary>
+        /// <param name="propertyDescriptor">PropertyDescriptor for the property being edited.</param>
+        /// <param name="targetObject">Target object that owns the property.</param>
+        /// <returns>Control that represents in-line editor.</returns>
+        public abstract IPropertyValueEditor CreateEditor(PropertyDescriptor propertyDescriptor, object targetObject);
+    }
+
+
+    /// <summary>
+    /// Defines a attribute which applies an slider in-line editor to a property when used with AdvPropertyGrid control.
+    /// </summary>
+    public class PropertySliderEditor : PropertyValueEditor
+    {
+        /// <summary>
+        /// Gets or sets the minimum slider value.
+        /// </summary>
+        public int MinValue = 0;
+        /// <summary>
+        /// Gets or sets the maximum slider value.
+        /// </summary>
+        public int MaxValue = 100;
+        /// <summary>
+        /// Gets or sets whether slider text label is visible.
+        /// </summary>
+        public bool LabelVisible = true;
+        /// <summary>
+        /// Gets or sets the slider label width. Default value is 18.
+        /// </summary>
+        public int LabelWidth = 22;
+        /// <summary>
+        /// Gets or sets label text color.
+        /// </summary>
+        public Color TextColor = Color.Black;
+
+        /// <summary>
+        /// Initializes a new instance of the PropertySliderEditor class.
+        /// </summary>
+        /// <param name="minValue">Minimum value for slider.</param>
+        /// <param name="maxValue">Maximum value for slider.</param>
+        public PropertySliderEditor(int minValue, int maxValue)
+        {
+            MinValue = minValue;
+            MaxValue = maxValue;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the PropertySliderEditor class.
+        /// </summary>
+        /// <param name="minValue"></param>
+        /// <param name="maxValue"></param>
+        /// <param name="textColor"></param>
+        public PropertySliderEditor(int minValue, int maxValue, Color textColor)
+        {
+            MinValue = minValue;
+            MaxValue = maxValue;
+            TextColor = textColor;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the PropertySliderEditor class.
+        /// </summary>
+        /// <param name="minValue"></param>
+        /// <param name="maxValue"></param>
+        /// <param name="labelVisible"></param>
+        /// <param name="labelWidth"></param>
+        /// <param name="textColor"></param>
+        public PropertySliderEditor(int minValue, int maxValue, bool labelVisible, int labelWidth, Color textColor)
+        {
+            MinValue = minValue;
+            MaxValue = maxValue;
+            LabelVisible = labelVisible;
+            LabelWidth = labelWidth;
+            TextColor = textColor;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the PropertySliderEditor class.
+        /// </summary>
+        /// <param name="minValue"></param>
+        /// <param name="maxValue"></param>
+        /// <param name="labelVisible"></param>
+        public PropertySliderEditor(int minValue, int maxValue, bool labelVisible)
+        {
+            MinValue = minValue;
+            MaxValue = maxValue;
+            LabelVisible = labelVisible;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the PropertySliderEditor class.
+        /// </summary>
+        /// <param name="minValue"></param>
+        /// <param name="maxValue"></param>
+        /// <param name="labelVisible"></param>
+        /// <param name="labelWidth"></param>
+        public PropertySliderEditor(int minValue, int maxValue, bool labelVisible, int labelWidth)
+        {
+            MinValue = minValue;
+            MaxValue = maxValue;
+            LabelVisible = labelVisible;
+            LabelWidth = labelWidth;
+        }
+
+        /// <summary>
+        /// Creates a control that is used as property value in-line editor. Control must implement IPropertyValueEditor interface.
+        /// </summary>
+        /// <param name="propertyDescriptor">PropertyDescriptor for the property being edited.</param>
+        /// <param name="targetObject">Target object that owns the property.</param>
+        /// <returns>Control that represents in-line editor.</returns>
+        public override IPropertyValueEditor CreateEditor(PropertyDescriptor propertyDescriptor, object targetObject)
+        {
+            SliderPropertyEditor editor = new SliderPropertyEditor();
+            editor.Style = eDotNetBarStyle.StyleManagerControlled;
+            editor.LabelVisible = LabelVisible;
+            editor.LabelWidth = LabelWidth;
+            editor.Minimum = MinValue;
+            editor.Maximum = MaxValue;
+            editor.Height = Dpi.Height16;
+            editor.FocusCuesEnabled = false;
+            if (!TextColor.IsEmpty)
+                editor.TextColor = TextColor;
+            return editor;
+        }
+
+        private class SliderPropertyEditor : Slider, IPropertyValueEditor
+        {
+            #region IPropertyValueEditor Members
+
+            public System.Drawing.Font EditorFont
+            {
+                get
+                {
+                    return this.Font;
+                }
+                set
+                {
+                    this.Font = value;
+                }
+            }
+
+            public bool IsEditorFocused
+            {
+                get { return this.Focused; }
+            }
+
+            public void FocusEditor()
+            {
+                this.Focus();
+            }
+
+            public object EditValue
+            {
+                get
+                {
+                    return this.Value;
+                }
+                set
+                {
+                    if (value is int)
+                        this.Value = (int)value;
+                    else if (value is double)
+                        this.Value = (int)(double)value;
+                    else if (value is float)
+                        this.Value = (int)(float)value;
+                    else if (value is decimal)
+                        this.Value = (int)(decimal)value;
+                    else if (value is byte)
+                        this.Value = (int)(byte)value;
+                    else if (value is long)
+                        this.Value = (int)(long)value;
+                    else if (value is Single)
+                        this.Value = (int)(Single)value;
+                    this.Text = this.Value.ToString();
+                }
+            }
+
+            //protected override void OnValueChanged()
+            //{
+            //    this.Text = this.Value.ToString();
+            //    OnEditValueChanged(EventArgs.Empty);
+            //    base.OnValueChanged();
+            //}
+
+            protected override void OnValueChanged(EventArgs e)
+            {
+                this.Text = this.Value.ToString();
+                OnEditValueChanged(e);
+                base.OnValueChanged(e);
+            }
+
+            private void OnEditValueChanged(EventArgs e)
+            {
+                EventHandler ev = EditValueChanged;
+                if (ev != null) ev(this, e);
+            }
+            public event EventHandler EditValueChanged;
+
+            #endregion
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/RadialMenu.ico b/PROMS/DotNetBar Source Code/RadialMenu.ico
new file mode 100644
index 00000000..b56c70b8
Binary files /dev/null and b/PROMS/DotNetBar Source Code/RadialMenu.ico differ
diff --git a/PROMS/DotNetBar Source Code/RadialMenu/RadialMenu.cs b/PROMS/DotNetBar Source Code/RadialMenu/RadialMenu.cs
new file mode 100644
index 00000000..66624f64
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/RadialMenu/RadialMenu.cs	
@@ -0,0 +1,1751 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows.Forms;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using DevComponents.DotNetBar.Events;
+using System.Collections;
+using DevComponents.DotNetBar.Rendering;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Defines Radial Menu control.
+    /// </summary>
+    [ToolboxItem(true), DefaultEvent("ItemClick"), System.Runtime.InteropServices.ComVisible(false), Designer("DevComponents.DotNetBar.Design.RadialMenuDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf"), ToolboxBitmap(typeof(ToolboxIconResFinder), "RadialMenu.ico")]
+    public class RadialMenu : Control, IMessageHandlerClient, IOwner, IOwnerItemEvents
+    {
+        #region Constructor
+        private RadialMenuContainer _MenuContainer = null;
+        /// <summary>
+        /// Initializes a new instance of the RadialMenu class.
+        /// </summary>
+        public RadialMenu()
+        {
+            _MenuContainer = new RadialMenuContainer();
+            _MenuContainer.RadialMenu = this;
+            _MenuContainer.Opened += new EventHandler(RadialMenuOpened);
+            _MenuContainer.Closed += new EventHandler(RadialMenuClosed);
+
+            this.SetStyle(
+                ControlStyles.UserPaint |
+                ControlStyles.AllPaintingInWmPaint |
+                ControlStyles.Opaque |
+                ControlStyles.ResizeRedraw |
+                DisplayHelp.DoubleBufferFlag |
+                ControlStyles.SupportsTransparentBackColor, true);
+            _MenuContainer.SetOwner(this);
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            _MenuContainer.Dispose();
+            base.Dispose(disposing);
+        }
+        private bool _AccessibleObjectCreated = false;
+        protected override AccessibleObject CreateAccessibilityInstance()
+        {
+            _AccessibleObjectCreated = true;
+            return new RadialMenuAccessibleObject(this);
+        }
+        #endregion
+
+        #region Events
+        /// <summary>
+        /// Occurs before menu is closed and allows you to cancel closing.
+        /// </summary>
+        [Description("Occurs before menu is closed and allows you to cancel closing.")]
+        public event CancelableEventSourceHandler BeforeMenuClose;
+        /// <summary>
+        /// Raises BeforeMenuClose event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnBeforeMenuClose(CancelableEventSourceArgs e)
+        {
+            CancelableEventSourceHandler handler = BeforeMenuClose;
+            if (handler != null)
+                handler(this, e);
+        }
+        /// <summary>
+        /// Occurs before menu has been opened and allows you to cancel opening
+        /// </summary>
+        [Description("Occurs before menu has been opened and allows you to cancel opening.")]
+        public event CancelableEventSourceHandler BeforeMenuOpen;
+        /// <summary>
+        /// Raises BeforeMenuOpen event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnBeforeMenuOpen(CancelableEventSourceArgs e)
+        {
+            CancelableEventSourceHandler handler = BeforeMenuOpen;
+            if (handler != null)
+                handler(this, e);
+        }
+        /// <summary>
+        /// Occurs after menu has been opened.
+        /// </summary>
+        [Description("Occurs after menu has been opened.")]
+        public event EventHandler MenuOpened;
+        /// <summary>
+        /// Raises MenuOpened event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnMenuOpened(EventArgs e)
+        {
+            EventHandler handler = MenuOpened;
+            if (handler != null)
+                handler(this, e);
+        }
+        /// <summary>
+        /// Occurs after menu is closed.Occurs after menu is closed.
+        /// </summary>
+        [Description("Occurs after menu is closed.")]
+        public event EventHandler MenuClosed;
+        /// <summary>
+        /// Raises MenuClosed event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnMenuClosed(EventArgs e)
+        {
+            EventHandler handler = MenuClosed;
+            if (handler != null)
+                handler(this, e);
+        }
+        #endregion
+
+        #region Implementation
+        /// <summary>
+        /// Specifies the width of the sub-menu edge around the radial menu.
+        /// </summary>
+        [DefaultValue(18), Category("Appearance"), Description("Specifies the width of the sub-menu edge around the radial menu.")]
+        public int SubMenuEdgeWidth
+        {
+            get { return _MenuContainer.SubMenuEdgeWidth; }
+            set { _MenuContainer.SubMenuEdgeWidth = value; }
+        }
+        /// <summary>
+        /// Indicates spacing between sub-menu marking edge and the item.
+        /// </summary>
+        [DefaultValue(3), Category("Appearance"), Description("Indicates spacing between sub-menu marking edge and the item.")]
+        public int SubMenuEdgeItemSpacing
+        {
+            get { return _MenuContainer.SubMenuEdgeItemSpacing; }
+            set { _MenuContainer.SubMenuEdgeItemSpacing = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets radial menu diameter. Minimum value is 64.
+        /// </summary>
+        [DefaultValue(180), Category("Appearance"), Description("Radial menu diameter.")]
+        public int Diameter
+        {
+            get { return _MenuContainer.Diameter; }
+            set { _MenuContainer.Diameter = value; }
+        }
+
+        /// <summary>
+        /// Gets reference to colors used by the radial menu.
+        /// </summary>
+        [Category("Appearance"), Description("Gets reference to colors used by the radial menu."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public RadialMenuColorTable Colors
+        {
+            get
+            {
+                return _MenuContainer.Colors;
+            }
+        }
+
+        /// <summary>
+        /// Indicates the size of the back symbol that is displayed on center of radial menu
+        /// </summary>
+        [DefaultValue(18), Browsable(false), Description("Indicates the size of the back symbol that is displayed on center of radial menu")]
+        public int BackButtonSymbolSize
+        {
+            get { return _MenuContainer.BackButtonSymbolSize; }
+            set { _MenuContainer.BackButtonSymbolSize = value; }
+        }
+
+        /// <summary>
+        /// Specifies the back button symbol.
+        /// </summary>
+        [DefaultValue("\uf060"), Category("Appearance"), Description("Specifies the back button symbol.")]
+        [Editor("DevComponents.DotNetBar.Design.SymbolTypeEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor))]
+        public string BackButtonSymbol
+        {
+            get { return _MenuContainer.BackButtonSymbol; }
+            set { _MenuContainer.BackButtonSymbol = value; }
+        }
+        /// <summary>
+        /// Gets or sets the symbol set used to represent the Symbol.
+        /// </summary>
+        [Browsable(false), DefaultValue(eSymbolSet.Awesome)]
+        public eSymbolSet BackButtonSymbolSet
+        {
+            get { return _MenuContainer.BackButtonSymbolSet; }
+            set
+            {
+                _MenuContainer.BackButtonSymbolSet = value;
+            }
+        }
+
+        /// <summary>
+        /// Indicates diameter of center button of radial menu.
+        /// </summary>
+        [DefaultValue(32), Category("Appearance"), Description("Indicates diameter of center button of radial menu.")]
+        public int CenterButtonDiameter
+        {
+            get { return _MenuContainer.CenterButtonDiameter; }
+            set { _MenuContainer.CenterButtonDiameter = value; }
+        }
+
+        /// <summary>
+        /// Specifies the maximum pie part angle an item will occupy. Maximum is 180, minimum is 1 degree.
+        /// </summary>
+        [DefaultValue(90), Category("Appearance"), Description("Specifies the maximum pie part angle an item will occupy. Maximum is 180, minimum is 1 degree.")]
+        public int MaxItemPieAngle
+        {
+            get { return _MenuContainer.MaxItemPieAngle; }
+            set { _MenuContainer.MaxItemPieAngle = value; }
+        }
+
+        /// <summary>
+        /// Indicates maximum radial angle single item in menu can consume. By default this property is set to zero which indicates that
+        /// radial menu is equally divided between visible menu items.
+        /// </summary>
+        [DefaultValue(0), Category("Appearance"), Description("Indicates maximum radial angle single item in menu can consume. Max value is 180.")]
+        public int MaxItemRadialAngle
+        {
+            get { return _MenuContainer.MaxItemRadialAngle; }
+            set { _MenuContainer.MaxItemRadialAngle = value; }
+        }
+
+        /// <summary>
+        /// Indicates the position of top-left corner of radial menu when shown in screen coordinates
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), Category("Behavior"), Description("Indicates the position of top-left corner of radial menu when shown in screen coordinates")]
+        public Point MenuLocation
+        {
+            get { return _MenuContainer.MenuLocation; }
+            set { _MenuContainer.MenuLocation = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether radial menu is open.
+        /// </summary>
+        //[Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        //public bool IsMenuOpen
+        //{
+        //    get
+        //    {
+        //        return _MenuContainer.Expanded;
+        //    }
+        //    set
+        //    {
+        //        if (_MenuContainer.Expanded != value)
+        //            _MenuContainer.Expanded = value;
+        //    }
+        //}
+
+        private Image _Image = null;
+        /// <summary>
+        /// Indicates image displayed in center of the radial menu.
+        /// </summary>
+        [DefaultValue(null), Description("Indicates image displayed in center of the radial menu."), Category("Appearance")]
+        public Image Image
+        {
+            get { return _Image; }
+            set
+            {
+                if (value != _Image)
+                {
+                    Image oldValue = _Image;
+                    _Image = value;
+                    OnImageChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when Image property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnImageChanged(Image oldValue, Image newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("Image"));
+            this.Invalidate();
+        }
+
+        /// <summary>
+        /// Indicates symbol displayed in center of the radial menu. When set, it overrides any Image settings.
+        /// </summary>
+        [DefaultValue(""), Description("Indicates image displayed in center of the radial menu.  When set, it overrides any Image settings."), Category("Appearance")]
+        [Editor("DevComponents.DotNetBar.Design.SymbolTypeEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor))]
+        public string Symbol
+        {
+            get { return _MenuContainer.Symbol; }
+            set { _MenuContainer.Symbol = value; _SymbolTextSize = Size.Empty; this.Invalidate(); }
+        }
+        /// <summary>
+        /// Gets or sets the symbol set used to represent the Symbol.
+        /// </summary>
+        [Browsable(false), DefaultValue(eSymbolSet.Awesome)]
+        public eSymbolSet SymbolSet
+        {
+            get { return _MenuContainer.SymbolSet; }
+            set
+            {
+                _MenuContainer.SymbolSet = value;
+            }
+        }
+
+        /// <summary>
+        /// Indicates the size of the symbol in points.
+        /// </summary>
+        [DefaultValue(0f), Category("Appearance"), Description("Indicates the size of the symbol in points.")]
+        public float SymbolSize
+        {
+            get { return _MenuContainer.SymbolSize; }
+            set { _MenuContainer.SymbolSize = value; _SymbolTextSize = Size.Empty; this.Invalidate(); }
+        }
+
+        private bool _IsOpen;
+        /// <summary>
+        /// Gets or sets whether radial menu is open.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsOpen
+        {
+            get { return _IsOpen; }
+            set
+            {
+                if (value != _IsOpen)
+                {
+                    SetIsOpen(value, eEventSource.Code);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when IsOpen property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnIsOpenChanged(bool oldValue, bool newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("IsOpen"));
+        }
+        /// <summary>
+        /// Sets whether radial menu is open and provides the source of the action.
+        /// </summary>
+        /// <param name="isOpen">true to open menu, false to close it.</param>
+        /// <param name="source">Source of the action.</param>
+        public void SetIsOpen(bool isOpen, eEventSource source)
+        {
+            if (isOpen == _IsOpen) return;
+
+            if (isOpen)
+            {
+                CancelableEventSourceArgs cancel = new CancelableEventSourceArgs(source);
+                OnBeforeMenuOpen(cancel);
+                if (cancel.Cancel) return;
+            }
+            else
+            {
+                CancelableEventSourceArgs cancel = new CancelableEventSourceArgs(source);
+                OnBeforeMenuClose(cancel);
+                if (cancel.Cancel) return;
+            }
+
+            bool oldValue = _IsOpen;
+            _IsOpen = isOpen;
+            _MenuContainer.Expanded = isOpen;
+            OnIsOpenChanged(oldValue, isOpen);
+        }
+        /// <summary>
+        /// Returns collection of items on a bar.
+        /// </summary>
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content), Browsable(false)]
+        public SubItemsCollection Items
+        {
+            get
+            {
+                return _MenuContainer.SubItems;
+            }
+        }
+
+        protected override void OnClick(EventArgs e)
+        {
+            SetIsOpen(!this.IsOpen, eEventSource.Mouse);
+            base.OnClick(e);
+        }
+
+        private Size _SymbolTextSize = Size.Empty;
+        private bool _Painting = false;
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            if (_Painting) return; // Stops painting when using transparent backgrounds since paint on parent paints this control too
+
+            _Painting = true;
+            try
+            {
+                RadialMenuColorTable renderTable = RadialMenuContainer.GetColorTable();
+                RadialMenuColorTable localTable = _MenuContainer.Colors;
+
+                Color symbolColor = ColorScheme.GetColor(0x2B579A);
+                Color backColor = Color.White;
+
+                if (!localTable.RadialMenuButtonBorder.IsEmpty)
+                    symbolColor = localTable.RadialMenuButtonBorder;
+                else if (renderTable != null && !renderTable.RadialMenuButtonBorder.IsEmpty)
+                    symbolColor = renderTable.RadialMenuButtonBorder;
+
+                if (!localTable.RadialMenuButtonBackground.IsEmpty)
+                    backColor = localTable.RadialMenuButtonBackground;
+                else if (renderTable != null && !renderTable.RadialMenuButtonBackground.IsEmpty)
+                    backColor = renderTable.RadialMenuButtonBackground;
+
+                SolidBrush backBrush = new SolidBrush(backColor);
+
+                Graphics g = e.Graphics;
+
+                g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.AntiAlias;
+                g.TextRenderingHint = System.Drawing.Text.TextRenderingHint.AntiAliasGridFit;
+                g.InterpolationMode = InterpolationMode.HighQualityBicubic;
+
+                Rectangle r = this.ClientRectangle;
+                r.Inflate(1, 1);
+                if (!this.BackColor.IsEmpty && this.BackColor != Color.Transparent)
+                {
+                    using (SolidBrush brush = new SolidBrush(this.BackColor))
+                        g.FillRectangle(brush, r);
+                }
+                else if (this.BackColor == Color.Transparent)
+                    PaintParentControlOnBackground(e.Graphics);
+
+                r = this.ClientRectangle;
+                r.Width--;
+                r.Height--;
+
+                Rectangle fill = r;
+                fill.Inflate(-1, -1);
+                g.FillEllipse(backBrush, fill);
+                if (_SymbolBorderEnabled)
+                {
+                    using (GraphicsPath path = new GraphicsPath())
+                    {
+                        path.AddEllipse(r);
+                        r.Inflate(-2, -2);
+                        path.AddEllipse(r);
+                        using (SolidBrush brush = new SolidBrush(symbolColor))
+                            g.FillPath(brush, path);
+                    }
+                }
+
+                if (!string.IsNullOrEmpty(_MenuContainer.SymbolRealized))
+                {
+                    float symbolSize = _MenuContainer.SymbolSize;
+                    Font symFont = Symbols.GetFont(symbolSize, _MenuContainer.SymbolSet);
+                    if (_SymbolTextSize.IsEmpty)
+                    {
+                        _SymbolTextSize = TextDrawing.MeasureStringLegacy(g, _MenuContainer.SymbolRealized, Symbols.GetFont(symbolSize, _MenuContainer.SymbolSet), Size.Empty, eTextFormat.Default);
+                        int descent = (int)Math.Ceiling((symFont.FontFamily.GetCellDescent(symFont.Style) *
+                        symFont.Size / symFont.FontFamily.GetEmHeight(symFont.Style)));
+                        _SymbolTextSize.Height -= descent;
+                    }
+
+                    TextDrawing.DrawStringLegacy(g, _MenuContainer.SymbolRealized, Symbols.GetFont(symbolSize, _MenuContainer.SymbolSet),
+                        symbolColor, new Rectangle(this.ClientRectangle.Width / 2, r.Y + (r.Height - _SymbolTextSize.Height) / 2, 0, 0),
+                        eTextFormat.HorizontalCenter);
+                }
+                else if (_Image != null)
+                {
+                    r = this.ClientRectangle;
+                    ImageHelper.DrawImageCenteredDpiAware(g, _Image, r);
+                }
+
+                backBrush.Dispose(); backBrush = null;
+            }
+            finally
+            {
+                _Painting = false;
+            }
+            base.OnPaint(e);
+        }
+
+        private void PaintParentControlOnBackground(Graphics g)
+        {
+            Control parent = this.Parent;
+            if (parent != null)
+            {
+                g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.AntiAlias;
+                g.TextRenderingHint = System.Drawing.Text.TextRenderingHint.AntiAliasGridFit;
+                g.InterpolationMode = InterpolationMode.HighQualityBicubic;
+                using (Bitmap bmp = new Bitmap(parent.Width, parent.Height, g))
+                {
+                    parent.DrawToBitmap(bmp, parent.ClientRectangle);
+                    g.TranslateTransform(-Left, -Top);
+                    g.DrawImage(bmp, Point.Empty);
+                    g.TranslateTransform(Left, Top);
+                }
+            }
+        }
+
+        private bool _SymbolBorderEnabled = true;
+
+        /// <summary>
+        /// Indicates whether border, a circle is rendered around the selected symbol which represents radial menu. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance"), Description("Indicates whether border, a circle is rendered around the selected symbol which represents radial menu.")]
+        public bool SymbolBorderEnabled
+        {
+            get { return _SymbolBorderEnabled; }
+            set { _SymbolBorderEnabled = value; this.Invalidate();}
+        }
+
+        protected override Size DefaultSize
+        {
+            get
+            {
+                return new Size(28, 28);
+            }
+        }
+        public override System.Drawing.Size GetPreferredSize(System.Drawing.Size proposedSize)
+        {
+            if (proposedSize.Width <= 0) return new System.Drawing.Size(26, 26);
+
+            return new System.Drawing.Size(proposedSize.Width, proposedSize.Height);
+        }
+
+        void RadialMenuClosed(object sender, EventArgs e)
+        {
+            _IsOpen = false;
+            RaiseAccessibilityEvent(AccessibleEvents.SystemMenuPopupEnd);
+            RaiseAccessibilityEvent(AccessibleEvents.SystemMenuEnd);
+            OnMenuClosed(EventArgs.Empty);
+        }
+
+        private void RadialMenuOpened(object sender, EventArgs e)
+        {
+            RaiseAccessibilityEvent(AccessibleEvents.SystemMenuStart);
+            RaiseAccessibilityEvent(AccessibleEvents.SystemMenuPopupStart);
+            OnMenuOpened(EventArgs.Empty);
+        }
+
+        private void RaiseAccessibilityEvent(AccessibleEvents e)
+        {
+            if (!_AccessibleObjectCreated) return;
+            RadialMenuAccessibleObject acc = (RadialMenuAccessibleObject)this.AccessibilityObject;
+            acc.GenerateEvent(e);
+        }
+
+        private bool _ShortcutsEnabled = true;
+        /// <summary>
+        /// Gets or sets whether shortcut processing for the items hosted by this control is enabled. Default value is true.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool ShortcutsEnabled
+        {
+            get { return _ShortcutsEnabled; }
+            set { _ShortcutsEnabled = value; }
+        }
+
+        private bool _CloseMenuOnAppDeactivate = true;
+        /// <summary>
+        /// Indicates whether radial menu is closed automatically when app is deactivated. Default value is true, if set to false
+        /// you are responsible for closing the menu.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether radial menu is closed automatically when app is deactivated"), Browsable(false)]
+        public bool CloseMenuOnAppDeactivate
+        {
+            get { return _CloseMenuOnAppDeactivate; }
+            set
+            {
+                _CloseMenuOnAppDeactivate = value;
+            }
+        }
+
+        private bool _UseHook = false;
+        /// <summary>
+        /// Gets or sets whether hooks are used for internal DotNetBar system functionality. Using hooks is recommended only if DotNetBar is used in hybrid environments like Visual Studio designers or IE.
+        /// </summary>
+        [Browsable(false), DefaultValue(false), Category("Behavior"), Description("Gets or sets whether hooks are used for internal DotNetBar system functionality. Using hooks is recommended only if DotNetBar is used in hybrid environments like Visual Studio designers or IE.")]
+        public bool UseHook
+        {
+            get
+            {
+                return _UseHook;
+            }
+            set
+            {
+                _UseHook = value;
+            }
+        }
+
+        private bool _MenuEventSupport = false;
+        private Hook _Hook = null;
+        private bool _FilterInstalled = false;
+        protected override void OnHandleCreated(EventArgs e)
+        {
+            if (!_FilterInstalled && !this.DesignMode)
+            {
+                MessageHandler.RegisterMessageClient(this);
+                _FilterInstalled = true;
+            }
+
+            if (!this.GetDesignMode() && !_UseHook)
+            {
+                if (!_MenuEventSupport)
+                    MenuEventSupportHook();
+            }
+            else
+            {
+                if (_Hook == null)
+                {
+                    _Hook = new Hook(this);
+                }
+            }
+
+            UpdateScaleFactor();
+            base.OnHandleCreated(e);
+        }
+        protected override void OnHandleDestroyed(EventArgs e)
+        {
+            MenuEventSupportUnhook();
+
+            base.OnHandleDestroyed(e);
+
+            if (_FilterInstalled)
+            {
+                MessageHandler.UnregisterMessageClient(this);
+                _FilterInstalled = false;
+            }
+
+            if (_Hook != null)
+            {
+                _Hook.Dispose();
+                _Hook = null;
+            }
+        }
+        private void MenuEventSupportUnhook()
+        {
+            if (!_MenuEventSupport)
+                return;
+            _MenuEventSupport = false;
+
+            Form parentForm = this.FindForm();
+            if (parentForm == null)
+                return;
+            if (parentForm.IsMdiChild && parentForm.MdiParent != null)
+                parentForm = parentForm.MdiParent;
+
+            DotNetBarManager.UnRegisterParentMsgHandler(this, parentForm);
+            parentForm.Resize -= new EventHandler(this.ParentResize);
+            parentForm.Deactivate -= new EventHandler(this.ParentDeactivate);
+        }
+
+        /// <summary>
+        /// Indicates the radial menu type. eRadialMenuType.Segment menu type allows for display of image, text and any sub-menu items.
+        /// eRadialMenuType.Circular allows only for display of Symbol or Image and it does not display either text or sub-menu items. 
+        /// eRadialMenuType.Circular is designed to be used for single level menus only that don't need text.
+        /// </summary>
+        [DefaultValue(eRadialMenuType.Segment), Category("Appearance"), Description("Indicates the radial menu type.")]
+        public eRadialMenuType MenuType
+        {
+            get { return _MenuContainer.MenuType; }
+            set { _MenuContainer.MenuType = value; }
+        }
+
+        private bool _AutoScale = true;
+        /// <summary>
+        /// Indicates whether control automatically scales the items if the parent Form performs scaling due to AutoScale settings.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether control automatically scales the items if the parent Form performs scaling due to AutoScale settings.")]
+        public bool AutoScale
+        {
+            get { return _AutoScale; }
+            set
+            {
+                _AutoScale = value;
+                UpdateScaleFactor();
+            }
+        }
+
+        private void UpdateScaleFactor()
+        {
+            if (!this.IsHandleCreated)
+                return;
+            if (_AutoScale)
+            {
+                using (Graphics g = this.CreateGraphics())
+                {
+                    SizeF factor = new SizeF(g.DpiX / 96, g.DpiY / 96);
+                    if (factor.Width != 1f)
+                        _MenuContainer.ScaleFactor = factor;
+                }
+            }
+            else
+                _MenuContainer.ScaleFactor = new SizeF(1, 1);
+        }
+
+        protected override void WndProc(ref Message m)
+        {
+            if (m.Msg == (int)WinApi.WindowsMessages.WM_DPICHANGED)
+                UpdateScaleFactor();
+            base.WndProc(ref m);
+        }
+
+        private string _AccessibleHelp = "";
+        /// <summary>
+        /// Indicates accessibility help string
+        /// </summary>
+        [DefaultValue(""), Category("Accessibility"), Description("Indicates accessibility help string")]
+        public string AccessibleHelp
+        {
+            get { return _AccessibleHelp; }
+            set
+            {
+                _AccessibleHelp = value;
+            }
+        }
+        
+        #endregion
+
+        #region IMessageHandlerClient Implementation
+        bool IMessageHandlerClient.IsModal
+        {
+            get
+            {
+                Form form = this.FindForm();
+                if (form != null)
+                    return form.Modal;
+                return false;
+            }
+        }
+
+        bool IMessageHandlerClient.OnMouseWheel(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+            return OnMouseWheel(hWnd, wParam, lParam);
+        }
+
+        protected virtual bool OnMouseWheel(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+            return false;
+        }
+
+        bool IMessageHandlerClient.OnKeyDown(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+            return OnKeyDown(hWnd, wParam, lParam);
+        }
+
+        /// <summary>
+        /// Returns whether control has any popups registered.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never), Browsable(false)]
+        public bool HasRegisteredPopups
+        {
+            get
+            {
+                return _MenuContainer.Expanded;
+            }
+        }
+
+        #region OnKeyDown
+        private bool _DesignModeInternal = false;
+        protected bool GetDesignMode()
+        {
+            if (!_DesignModeInternal)
+                return this.DesignMode;
+            return _DesignModeInternal;
+        }
+        [EditorBrowsable(EditorBrowsableState.Never), Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public void SetDesignMode(bool mode)
+        {
+            _DesignModeInternal = mode;
+            _MenuContainer.SetDesignMode(mode);
+        }
+        protected virtual bool OnKeyDown(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+            bool designMode = this.GetDesignMode();
+
+            int wParamInt = WinApi.ToInt(wParam);
+
+            if (_MenuContainer.Expanded && wParamInt == 27) // Escape
+            {
+                this.SetIsOpen(false, eEventSource.Keyboard);
+                return true;
+            }
+            if (_MenuContainer.Expanded && _MenuContainer.Popup != null && _MenuContainer.Popup.Handle == hWnd)
+            {
+                Keys key = (Keys)NativeFunctions.MapVirtualKey((uint)wParam, 2);
+                if (key == Keys.None)
+                    key = (Keys)wParamInt;
+                _MenuContainer.InternalKeyDown(new KeyEventArgs(key));
+                return false;
+            }
+
+            if (!this.IsParentFormActive)
+                return false;
+
+            if (wParamInt >= 0x70 || ModifierKeys != Keys.None || (WinApi.ToInt(lParam) & 0x1000000000) != 0 || wParamInt == 0x2E || wParamInt == 0x2D) // 2E=VK_DELETE, 2D=VK_INSERT
+            {
+                int i = (int)ModifierKeys | wParamInt;
+                return ProcessShortcut((eShortcut)i) && !designMode;
+            }
+            return false;
+        }
+        #endregion
+
+        private bool _DispatchShortcuts = false;
+        /// <summary>
+        /// Indicates whether shortcuts handled by items are dispatched to the next handler or control.
+        /// </summary>
+        [Browsable(false), DefaultValue(false), Category("Behavior"), Description("Indicates whether shortucts handled by items are dispatched to the next handler or control.")]
+        public bool DispatchShortcuts
+        {
+            get { return _DispatchShortcuts; }
+            set { _DispatchShortcuts = value; }
+        }
+        private bool ProcessShortcut(eShortcut key)
+        {
+            if (!_ShortcutsEnabled || !this.Enabled) return false;
+
+            Form form = this.FindForm();
+            if (form == null || (form != Form.ActiveForm && form.MdiParent == null ||
+                form.MdiParent != null && form.MdiParent.ActiveMdiChild != form) && !form.IsMdiContainer || Form.ActiveForm != null && Form.ActiveForm.Modal && Form.ActiveForm != form)
+                return false;
+
+            bool eat = BarFunctions.ProcessItemsShortcuts(key, _ShortcutTable);
+            return !_DispatchShortcuts && eat;
+        }
+        protected bool IsParentFormActive
+        {
+            get
+            {
+                // Process only if parent form is active
+                Form form = this.FindForm();
+                if (form == null)
+                    return false;
+                if (form.IsMdiChild)
+                {
+                    if (form.MdiParent == null)
+                        return false;
+                    if (form.MdiParent.ActiveMdiChild != form)
+                        return false;
+                }
+                else if (form != Form.ActiveForm)
+                    return false;
+                return true;
+            }
+        }
+
+        private PopupDelayedClose m_DelayClose = null;
+        private PopupDelayedClose GetDelayClose()
+        {
+            if (m_DelayClose == null)
+                m_DelayClose = new PopupDelayedClose();
+            return m_DelayClose;
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void DesignerNewItemAdded()
+        {
+            this.GetDelayClose().EraseDelayClose();
+        }
+        private ArrayList _RegisteredPopups = new ArrayList();
+        protected virtual bool OnSysMouseDown(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+            if (!_IsOpen || this.GetDesignMode() || _MenuContainer.Popup == null)
+                return false;
+
+            if (!_MenuContainer.Popup.Bounds.Contains(MousePosition))
+            {
+                SetIsOpen(false, eEventSource.Mouse);
+            }
+
+            return false;
+        }
+        bool IMessageHandlerClient.OnMouseDown(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+            return OnSysMouseDown(hWnd, wParam, lParam);
+        }
+        bool IMessageHandlerClient.OnMouseMove(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+            if (_IsOpen && _MenuContainer.Popup != null && _MenuContainer.Popup.Handle != hWnd) return true; // Eat mouse messages for other windows while popup is open
+            return false;
+        }
+        bool IMessageHandlerClient.OnSysKeyDown(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+            return OnSysKeyDown(hWnd, wParam, lParam);
+        }
+
+        protected virtual bool OnSysKeyDown(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+            if (!this.GetDesignMode())
+            {
+                int wParamInt = WinApi.ToInt(wParam);
+                if (wParamInt == 18 && System.Windows.Forms.Control.ModifierKeys == System.Windows.Forms.Keys.Alt)
+                    this.SetIsOpen(false, eEventSource.Keyboard);
+
+                // Check Shortcuts
+                if (ModifierKeys != Keys.None || wParamInt >= (int)eShortcut.F1 && wParamInt <= (int)eShortcut.F12)
+                {
+                    int i = (int)ModifierKeys | wParamInt;
+                    if (ProcessShortcut((eShortcut)i))
+                        return true;
+                }
+            }
+            return false;
+        }
+
+        bool IMessageHandlerClient.OnSysKeyUp(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+            return OnSysKeyUp(hWnd, wParam, lParam);
+        }
+
+        protected virtual bool OnSysKeyUp(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+            return false;
+        }
+        private void MenuEventSupportHook()
+        {
+            if (_MenuEventSupport)
+                return;
+            _MenuEventSupport = true;
+
+            Form parentForm = this.FindForm();
+            if (parentForm == null)
+            {
+                _MenuEventSupport = false;
+                return;
+            }
+
+            if (parentForm.IsMdiChild && parentForm.MdiParent != null)
+                parentForm = parentForm.MdiParent;
+
+            parentForm.Resize += new EventHandler(this.ParentResize);
+            parentForm.Deactivate += new EventHandler(this.ParentDeactivate);
+
+            DotNetBarManager.RegisterParentMsgHandler(this, parentForm);
+        }
+
+        private void ParentResize(object sender, EventArgs e)
+        {
+            Form parentForm = this.FindForm();
+            if (parentForm != null && parentForm.WindowState == FormWindowState.Minimized)
+                ((IOwner)this).OnApplicationDeactivate();
+        }
+        private void ParentDeactivate(object sender, EventArgs e)
+        {
+            Form parentForm = this.FindForm();
+            if (parentForm != null && parentForm.WindowState == FormWindowState.Minimized)
+                ((IOwner)this).OnApplicationDeactivate();
+        }
+        #endregion
+
+        #region IOwner Members
+
+        Form IOwner.ParentForm
+        {
+            get
+            {
+                return base.FindForm();
+            }
+            set { }
+        }
+        /// <summary>
+        /// Returns the collection of items with the specified name.
+        /// </summary>
+        /// <param name="ItemName">Item name to look for.</param>
+        /// <returns></returns>
+        System.Collections.ArrayList IOwner.GetItems(string ItemName)
+        {
+            ArrayList list = new ArrayList(15);
+            BarFunctions.GetSubItemsByName(_MenuContainer, ItemName, list);
+            return list;
+        }
+        /// <summary>
+        /// Returns the collection of items with the specified name and type.
+        /// </summary>
+        /// <param name="ItemName">Item name to look for.</param>
+        /// <param name="itemType">Item type to look for.</param>
+        /// <returns></returns>
+        System.Collections.ArrayList IOwner.GetItems(string ItemName, Type itemType)
+        {
+            ArrayList list = new ArrayList(15);
+            BarFunctions.GetSubItemsByNameAndType(_MenuContainer, ItemName, list, itemType);
+            return list;
+        }
+        /// <summary>
+        /// Returns the collection of items with the specified name and type.
+        /// </summary>
+        /// <param name="ItemName">Item name to look for.</param>
+        /// <param name="itemType">Item type to look for.</param>
+        /// <param name="useGlobalName">Indicates whether GlobalName property is used for searching.</param>
+        /// <returns></returns>
+        System.Collections.ArrayList IOwner.GetItems(string ItemName, Type itemType, bool useGlobalName)
+        {
+            ArrayList list = new ArrayList(15);
+            BarFunctions.GetSubItemsByNameAndType(_MenuContainer, ItemName, list, itemType, useGlobalName);
+            return list;
+        }
+        /// <summary>
+        /// Returns the first item that matches specified name.
+        /// </summary>
+        /// <param name="ItemName">Item name to look for.</param>
+        /// <returns></returns>
+        BaseItem IOwner.GetItem(string ItemName)
+        {
+            BaseItem item = BarFunctions.GetSubItemByName(_MenuContainer, ItemName);
+            if (item != null)
+                return item;
+            return null;
+        }
+
+        private BaseItem _ExpandedItem = null;
+        void IOwner.SetExpandedItem(BaseItem objItem)
+        {
+            if (objItem != null && (objItem.Parent is RadialMenuContainer || objItem.Parent is RadialMenu))
+                return;
+            if (_ExpandedItem != null)
+            {
+                if (_ExpandedItem.Expanded)
+                    _ExpandedItem.Expanded = false;
+                _ExpandedItem = null;
+            }
+            _ExpandedItem = objItem;
+        }
+
+        BaseItem IOwner.GetExpandedItem()
+        {
+            return _ExpandedItem;
+        }
+
+        private BaseItem _FocusItem = null;
+        // Currently we are using this to communicate "focus" when control is in
+        // design mode. This can be used later if we decide to add focus
+        // handling to our BaseItem class.
+        void IOwner.SetFocusItem(BaseItem objFocusItem)
+        {
+            if (_FocusItem != null && _FocusItem != objFocusItem)
+            {
+                _FocusItem.OnLostFocus();
+            }
+            OnSetFocusItem(objFocusItem);
+            _FocusItem = objFocusItem;
+            if (_FocusItem != null)
+                _FocusItem.OnGotFocus();
+        }
+        protected virtual void OnSetFocusItem(BaseItem objFocusItem)
+        {
+        }
+        BaseItem IOwner.GetFocusItem()
+        {
+            return _FocusItem;
+        }
+
+        void IOwner.DesignTimeContextMenu(BaseItem objItem) { }
+
+        private Hashtable _ShortcutTable = new Hashtable();
+        void IOwner.RemoveShortcutsFromItem(BaseItem objItem)
+        {
+            ShortcutTableEntry objEntry = null;
+            if (objItem.ShortcutString != "")
+            {
+                foreach (eShortcut key in objItem.Shortcuts)
+                {
+                    if (_ShortcutTable.ContainsKey(key))
+                    {
+                        objEntry = (ShortcutTableEntry)_ShortcutTable[key];
+                        try
+                        {
+                            objEntry.Items.Remove(objItem.Id);
+                            if (objEntry.Items.Count == 0)
+                                _ShortcutTable.Remove(objEntry.Shortcut);
+                        }
+                        catch (ArgumentException) { }
+                    }
+                }
+            }
+            IOwner owner = this as IOwner;
+            foreach (BaseItem objTmp in objItem.SubItems)
+                owner.RemoveShortcutsFromItem(objTmp);
+        }
+
+        void IOwner.AddShortcutsFromItem(BaseItem objItem)
+        {
+            ShortcutTableEntry objEntry = null;
+            if (objItem.ShortcutString != "")
+            {
+                foreach (eShortcut key in objItem.Shortcuts)
+                {
+                    if (_ShortcutTable.ContainsKey(key))
+                        objEntry = (ShortcutTableEntry)_ShortcutTable[objItem.Shortcuts[0]];
+                    else
+                    {
+                        objEntry = new ShortcutTableEntry(key);
+                        _ShortcutTable.Add(objEntry.Shortcut, objEntry);
+                    }
+                    try
+                    {
+                        objEntry.Items.Add(objItem.Id, objItem);
+                    }
+                    catch (ArgumentException) { }
+                }
+            }
+            IOwner owner = this as IOwner;
+            foreach (BaseItem objTmp in objItem.SubItems)
+                owner.AddShortcutsFromItem(objTmp);
+        }
+
+        ImageList IOwner.Images
+        {
+            get { return null; }
+            set { }
+        }
+
+        ImageList IOwner.ImagesMedium
+        {
+            get { return null; }
+            set { }
+        }
+
+        ImageList IOwner.ImagesLarge
+        {
+            get { return null; }
+            set { }
+        }
+
+        void IOwner.StartItemDrag(BaseItem objItem)
+        {
+            throw new Exception("The method or operation is not implemented.");
+        }
+
+        BaseItem IOwner.DragItem
+        {
+            get { throw new Exception("The method or operation is not implemented."); }
+        }
+
+        bool IOwner.DragInProgress
+        {
+            get { throw new Exception("The method or operation is not implemented."); }
+        }
+
+        private bool _ShowToolTips = true;
+        /// <summary>
+        /// Indicates whether items show tooltips.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether items show tooltips.")]
+        public bool ShowToolTips
+        {
+            get
+            {
+                return _ShowToolTips;
+            }
+            set
+            {
+                _ShowToolTips = value;
+            }
+        }
+
+        private bool _ShowShortcutKeysInToolTips = false;
+        /// <summary>
+        /// Indicates whether item shortcut is displayed in Tooltips.
+        /// </summary>
+        [Browsable(true), DefaultValue(false), Category("Behavior"), Description("Indicates whether item shortcut is displayed in Tooltips.")]
+        public virtual bool ShowShortcutKeysInToolTips
+        {
+            get
+            {
+                return _ShowShortcutKeysInToolTips;
+            }
+            set
+            {
+                _ShowShortcutKeysInToolTips = value;
+            }
+        }
+
+
+        private bool _AlwaysDisplayKeyAccelerators = false;
+        /// <summary>
+        /// Gets or sets whether accelerator letters on buttons are underlined. Default value is false which indicates that system setting is used
+        /// to determine whether accelerator letters are underlined. Setting this property to true
+        /// will always display accelerator letter underlined.
+        /// </summary>
+        [Browsable(true), DefaultValue(false), Category("Behavior"), Description("Indicates whether accelerator letters for buttons are underlined regardless of current Windows settings.")]
+        public bool AlwaysDisplayKeyAccelerators
+        {
+            get { return _AlwaysDisplayKeyAccelerators; }
+            set
+            {
+                if (_AlwaysDisplayKeyAccelerators != value)
+                {
+                    _AlwaysDisplayKeyAccelerators = value;
+                    this.Invalidate();
+                }
+            }
+        }
+
+        Form IOwner.ActiveMdiChild
+        {
+            get
+            {
+                Form form = base.FindForm();
+                if (form == null)
+                    return null;
+                if (form.IsMdiContainer)
+                {
+                    return form.ActiveMdiChild;
+                }
+                return null;
+            }
+        }
+
+        MdiClient IOwner.GetMdiClient(Form MdiForm)
+        {
+            return BarFunctions.GetMdiClient(MdiForm);
+        }
+
+        void IOwner.Customize()
+        {
+            throw new Exception("The method or operation is not implemented.");
+        }
+
+        void IOwner.InvokeResetDefinition(BaseItem item, EventArgs e)
+        {
+
+        }
+
+        bool IOwner.ShowResetButton
+        {
+            get
+            {
+                return false;
+            }
+            set
+            {
+                throw new Exception("The method or operation is not implemented.");
+            }
+        }
+
+        void IOwner.InvokeDefinitionLoaded(object sender, EventArgs e)
+        {
+
+        }
+
+        void IOwner.InvokeUserCustomize(object sender, EventArgs e)
+        {
+
+        }
+
+        void IOwner.InvokeEndUserCustomize(object sender, EndUserCustomizeEventArgs e)
+        {
+
+        }
+
+        void IOwner.OnApplicationActivate()
+        {
+
+        }
+
+        void IOwner.OnApplicationDeactivate()
+        {
+            if (this.IsOpen && _CloseMenuOnAppDeactivate) this.IsOpen = false;
+        }
+
+        void IOwner.OnParentPositionChanging()
+        {
+            if (this.IsOpen) this.IsOpen = false;
+        }
+
+        bool IOwner.DesignMode
+        {
+            get { return this.DesignMode; }
+        }
+
+        private bool _DisabledImagesGrayScale = true;
+        /// <summary>
+        /// Gets or sets whether gray-scale algorithm is used to create automatic gray-scale images. Default is true.
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Appearance"), Description("Gets or sets whether gray-scale algorithm is used to create automatic gray-scale images.")]
+        public bool DisabledImagesGrayScale
+        {
+            get
+            {
+                return _DisabledImagesGrayScale;
+            }
+            set
+            {
+                _DisabledImagesGrayScale = value;
+            }
+        }
+        #endregion
+
+        #region IOwnerItemEvents Members
+        /// <summary>
+        /// Occurs after an item has been added to items collection.
+        /// </summary>
+        [Description("Occurs after an item has been added to items collection.")]
+        public event EventHandler ItemAdded;
+        /// <summary>
+        /// Raises ItemAdded event.
+        /// </summary>
+        /// <param name="source">Reference to item.</param>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnItemAdded(BaseItem source, EventArgs e)
+        {
+            EventHandler handler = ItemAdded;
+            if (handler != null)
+                handler(source, e);
+        }
+        void IOwnerItemEvents.InvokeItemAdded(BaseItem item, EventArgs e)
+        {
+            OnItemAdded(item, e);
+        }
+
+        /// <summary>
+        /// Occurs after an item has been removed from items collection.
+        /// </summary>
+        [Description("Occurs after an item has been removed from items collection.")]
+        public event DevComponents.DotNetBar.ItemControl.ItemRemovedEventHandler ItemRemoved;
+        /// <summary>
+        /// Raises ItemRemoved event.
+        /// </summary>
+        /// <param name="source">Reference to item.</param>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnItemRemoved(BaseItem source, ItemRemovedEventArgs e)
+        {
+            DevComponents.DotNetBar.ItemControl.ItemRemovedEventHandler handler = ItemRemoved;
+            if (handler != null)
+                handler(source, e);
+        }
+        void IOwnerItemEvents.InvokeItemRemoved(BaseItem item, BaseItem parent, int itemIndex)
+        {
+            OnItemRemoved(item, new ItemRemovedEventArgs(parent, itemIndex));
+        }
+
+        /// <summary>
+        /// Occurs when mouse pointer enters boundaries of an item.
+        /// </summary>
+        [Description("Occurs when mouse pointer enters boundaries of an item.")]
+        public event EventHandler ItemMouseEnter;
+        /// <summary>
+        /// Raises ItemMouseEnter event.
+        /// </summary>
+        /// <param name="source">Reference to item.</param>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnItemMouseEnter(BaseItem source, EventArgs e)
+        {
+            EventHandler handler = ItemMouseEnter;
+            if (handler != null)
+                handler(source, e);
+        }
+        void IOwnerItemEvents.InvokeMouseEnter(BaseItem item, EventArgs e)
+        {
+            OnItemMouseEnter(item, e);
+        }
+
+        /// <summary>
+        /// Occurs when mouse pointer hovers over an item.
+        /// </summary>
+        [Description("Occurs when mouse pointer hovers over an item.")]
+        public event EventHandler ItemMouseHover;
+        /// <summary>
+        /// Raises ItemMouseHover event.
+        /// </summary>
+        /// <param name="source">Reference to item.</param>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnItemMouseHover(BaseItem source, EventArgs e)
+        {
+            EventHandler handler = ItemMouseHover;
+            if (handler != null)
+                handler(source, e);
+        }
+        void IOwnerItemEvents.InvokeMouseHover(BaseItem item, EventArgs e)
+        {
+            OnItemMouseHover(item, e);
+        }
+
+        /// <summary>
+        /// Occurs when mouse pointer leaves boundaries of an item.
+        /// </summary>
+        [Description("Occurs when mouse pointer leaves boundaries of an item.")]
+        public event EventHandler ItemMouseLeave;
+        /// <summary>
+        /// Raises ItemMouseLeave event.
+        /// </summary>
+        /// <param name="source">Reference to item.</param>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnItemMouseLeave(BaseItem source, EventArgs e)
+        {
+            EventHandler handler = ItemMouseLeave;
+            if (handler != null)
+                handler(source, e);
+        }
+        void IOwnerItemEvents.InvokeMouseLeave(BaseItem item, EventArgs e)
+        {
+            OnItemMouseLeave(item, e);
+        }
+
+        /// <summary>
+        /// Occurs when mouse button is pressed on item.
+        /// </summary>
+        [Description("Occurs when mouse button is pressed on item.")]
+        public event MouseEventHandler ItemMouseDown;
+        /// <summary>
+        /// Raises ItemMouseDown event.
+        /// </summary>
+        /// <param name="source">Reference to item.</param>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnItemMouseDown(BaseItem source, MouseEventArgs e)
+        {
+            MouseEventHandler handler = ItemMouseDown;
+            if (handler != null)
+                handler(source, e);
+        }
+        void IOwnerItemEvents.InvokeMouseDown(BaseItem item, MouseEventArgs e)
+        {
+            OnItemMouseDown(item, e);
+        }
+
+        /// <summary>
+        /// Occurs when mouse button is released on item.
+        /// </summary>
+        [Description("Occurs when mouse button is released on item.")]
+        public event MouseEventHandler ItemMouseUp;
+        /// <summary>
+        /// Raises ItemMouseUp event.
+        /// </summary>
+        /// <param name="source">Reference to item.</param>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnItemMouseUp(BaseItem source, MouseEventArgs e)
+        {
+            MouseEventHandler handler = ItemMouseUp;
+            if (handler != null)
+                handler(source, e);
+        }
+        void IOwnerItemEvents.InvokeMouseUp(BaseItem item, MouseEventArgs e)
+        {
+            OnItemMouseUp(item, e);
+        }
+
+        /// <summary>
+        /// Occurs when mouse moves over an item.
+        /// </summary>
+        [Description("Occurs when mouse moves over an item.")]
+        public event MouseEventHandler ItemMouseMove;
+        /// <summary>
+        /// Raises ItemMouseMove event.
+        /// </summary>
+        /// <param name="source">Reference to item.</param>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnItemMouseMove(BaseItem source, MouseEventArgs e)
+        {
+            MouseEventHandler handler = ItemMouseMove;
+            if (handler != null)
+                handler(source, e);
+        }
+        void IOwnerItemEvents.InvokeMouseMove(BaseItem item, MouseEventArgs e)
+        {
+            OnItemMouseMove(item, e);
+        }
+
+        /// <summary>
+        /// Occurs when an item is clicked.
+        /// </summary>
+        [Description("Occurs when an item is clicked.")]
+        public event EventHandler ItemClick;
+        /// <summary>
+        /// Raises ItemClick event.
+        /// </summary>
+        /// <param name="source">Reference to item.</param>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnItemClick(BaseItem source, EventArgs e)
+        {
+            EventHandler handler = ItemClick;
+            if (handler != null)
+                handler(source, e);
+        }
+        void IOwnerItemEvents.InvokeItemClick(BaseItem objItem)
+        {
+            OnItemClick(objItem, EventArgs.Empty);
+        }
+
+        /// <summary>
+        /// Occurs when an item is double-clicked.
+        /// </summary>
+        [Description("Occurs when an item is double-clicked.")]
+        public event MouseEventHandler ItemDoubleClick;
+        /// <summary>
+        /// Raises ItemDoubleClick event.
+        /// </summary>
+        /// <param name="source">Reference to item.</param>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnItemDoubleClick(BaseItem source, MouseEventArgs e)
+        {
+            MouseEventHandler handler = ItemDoubleClick;
+            if (handler != null)
+                handler(source, e);
+        }
+        void IOwnerItemEvents.InvokeItemDoubleClick(BaseItem objItem, MouseEventArgs e)
+        {
+            OnItemDoubleClick(objItem, e);
+        }
+
+        void IOwnerItemEvents.InvokeGotFocus(BaseItem item, EventArgs e)
+        {
+
+        }
+
+        void IOwnerItemEvents.InvokeLostFocus(BaseItem item, EventArgs e)
+        {
+
+        }
+
+        /// <summary>
+        /// Occurs when an item Expanded property value has changed.
+        /// </summary>
+        [Description("Occurs when an item Expanded property value has changed.")]
+        public event EventHandler ItemExpandedChanged;
+        /// <summary>
+        /// Raises ItemExpandedChanged event.
+        /// </summary>
+        /// <param name="source">Reference to item.</param>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnItemExpandedChanged(BaseItem source, EventArgs e)
+        {
+            EventHandler handler = ItemExpandedChanged;
+            if (handler != null)
+                handler(source, e);
+        }
+        void IOwnerItemEvents.InvokeExpandedChange(BaseItem item, EventArgs e)
+        {
+            OnItemExpandedChanged(item, e);
+        }
+
+        /// <summary>
+        /// Occurs when an item Text property value has changed.
+        /// </summary>
+        [Description("Occurs when an item Text property value has changed.")]
+        public event EventHandler ItemTextChanged;
+        /// <summary>
+        /// Raises ItemTextChanged event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnItemTextChanged(BaseItem source, EventArgs e)
+        {
+            EventHandler handler = ItemTextChanged;
+            if (handler != null)
+                handler(source, e);
+        }
+        void IOwnerItemEvents.InvokeItemTextChanged(BaseItem item, EventArgs e)
+        {
+            OnItemTextChanged(item, e);
+        }
+
+        void IOwnerItemEvents.InvokeContainerControlDeserialize(BaseItem item, ControlContainerSerializationEventArgs e)
+        {
+
+        }
+
+        void IOwnerItemEvents.InvokeContainerControlSerialize(BaseItem item, ControlContainerSerializationEventArgs e)
+        {
+
+        }
+
+        void IOwnerItemEvents.InvokeContainerLoadControl(BaseItem item, EventArgs e)
+        {
+
+        }
+
+        void IOwnerItemEvents.InvokeOptionGroupChanging(BaseItem item, OptionGroupChangingEventArgs e)
+        {
+
+        }
+
+        /// <summary>
+        /// Occurs when tooltip for an item is about to be displayed.
+        /// </summary>
+        [Description("Occurs when tooltip for an item is about to be displayed.")]
+        public event EventHandler ItemTooltipShowing;
+        /// <summary>
+        /// Raises ItemTooltipShowing event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnItemTooltipShowing(object source, EventArgs e)
+        {
+            EventHandler handler = ItemTooltipShowing;
+            if (handler != null)
+                handler(source, e);
+        }
+        void IOwnerItemEvents.InvokeToolTipShowing(object item, EventArgs e)
+        {
+            OnItemTooltipShowing(item, e);
+        }
+
+        void IOwnerItemEvents.InvokeCheckedChanged(ButtonItem item, EventArgs e)
+        {
+
+        }
+
+        #endregion
+
+        #region RadialMenuAccessibleObject
+        public class RadialMenuAccessibleObject : System.Windows.Forms.Control.ControlAccessibleObject
+        {
+            RadialMenu _Owner = null;
+            public RadialMenuAccessibleObject(RadialMenu owner)
+                : base(owner)
+            {
+                _Owner = owner;
+            }
+
+            internal void GenerateEvent(BaseItem sender, System.Windows.Forms.AccessibleEvents e)
+            {
+                int iChild = _Owner.Items.IndexOf(sender);
+                if (iChild >= 0)
+                {
+                    if (_Owner != null && !_Owner.IsDisposed)
+                        _Owner.AccessibilityNotifyClients(e, iChild);
+                }
+            }
+
+            internal void GenerateEvent(System.Windows.Forms.AccessibleEvents e)
+            {
+                if (_Owner == null)
+                    return;
+                _Owner.AccessibilityNotifyClients(e, -1);
+            }
+
+            public override AccessibleRole Role
+            {
+                get
+                {
+                    if (_Owner != null && !_Owner.IsDisposed)
+                        return _Owner.AccessibleRole;
+                    return System.Windows.Forms.AccessibleRole.None;
+                }
+            }
+
+            public override AccessibleObject Parent
+            {
+                get
+                {
+                    if (_Owner != null && !_Owner.IsDisposed)
+                        return _Owner.Parent.AccessibilityObject;
+                    return null;
+                }
+            }
+
+            public override Rectangle Bounds
+            {
+                get
+                {
+                    if (_Owner != null && !_Owner.IsDisposed && _Owner.Parent != null)
+                    {
+                        return this._Owner.Parent.RectangleToScreen(_Owner.Bounds);
+                    }
+                    return Rectangle.Empty;
+                }
+            }
+
+            public override int GetChildCount()
+            {
+                if (_Owner != null && !_Owner.IsDisposed && _Owner.Items != null)
+                    return _Owner.Items.Count;
+                return 0;
+            }
+
+            public override System.Windows.Forms.AccessibleObject GetChild(int iIndex)
+            {
+                if (_Owner != null && !_Owner.IsDisposed && _Owner.Items != null)
+                    return _Owner.Items[iIndex].AccessibleObject;
+                return null;
+            }
+
+            public override AccessibleStates State
+            {
+                get
+                {
+                    AccessibleStates state = AccessibleStates.Default;
+                    if (_Owner == null || _Owner.IsDisposed)
+                        return AccessibleStates.None;
+                    if (_Owner.Focused)
+                        state = AccessibleStates.Focused;
+                    if (_Owner.IsOpen)
+                        state = AccessibleStates.Expanded;
+
+                    return state;
+                }
+            }
+
+            public override string DefaultAction
+            {
+                get
+                {
+                    if (!string.IsNullOrEmpty(_Owner.AccessibleDefaultActionDescription))
+                        return _Owner.AccessibleDefaultActionDescription;
+                    return "Open";
+                }
+            }
+
+            public override string Description
+            {
+                get
+                {
+                    if (!string.IsNullOrEmpty(_Owner.AccessibleDescription))
+                        return _Owner.AccessibleDescription;
+                    return "Radial Menu";
+                }
+            }
+
+            public override void DoDefaultAction() 
+            {
+                if (_Owner != null && !_Owner.IsDisposed)
+                    _Owner.IsOpen = !_Owner.IsOpen;
+            }
+
+            public override string Help
+            {
+                get
+                {
+                    if (!string.IsNullOrEmpty(_Owner.AccessibleHelp))
+                        return _Owner.AccessibleHelp;
+                    return "";
+                }
+            }
+
+            public override string Name
+            {
+                get
+                {
+                    return _Owner.Name;
+                }
+                set
+                {
+                    _Owner.Name = value;
+                }
+            }
+
+            public override string Value
+            {
+                get
+                {
+                    return _Owner.Text;
+                }
+                set
+                {
+                    _Owner.Text = value;
+                }
+            }
+
+            public override string KeyboardShortcut
+            {
+                get
+                {
+                    return "";
+                }
+            }
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/RadialMenu/RadialMenuColorTable.cs b/PROMS/DotNetBar Source Code/RadialMenu/RadialMenuColorTable.cs
new file mode 100644
index 00000000..623cfe20
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/RadialMenu/RadialMenuColorTable.cs	
@@ -0,0 +1,435 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    /// <summary>
+    /// Defines colors used by Radial Menu Component.
+    /// </summary>
+    [ToolboxItem(false), DesignTimeVisible(false), TypeConverter(typeof(System.ComponentModel.ExpandableObjectConverter))]
+    public class RadialMenuColorTable : Component, INotifyPropertyChanged
+    {
+        #region Implementation
+        public void Apply(RadialMenuColorTable table)
+        {
+            table.CircularBackColor = this.CircularBackColor;
+            table.CircularBorderColor = this.CircularBorderColor;
+            table.CircularForeColor = this.CircularForeColor;
+            table.RadialMenuBackground = this.RadialMenuBackground;
+            table.RadialMenuBorder = this.RadialMenuBorder;
+            table.RadialMenuButtonBackground = this.RadialMenuButtonBackground;
+            table.RadialMenuButtonBorder = this.RadialMenuButtonBorder;
+            table.RadialMenuExpandForeground = this.RadialMenuExpandForeground;
+            table.RadialMenuInactiveBorder = this.RadialMenuInactiveBorder;
+            table.RadialMenuItemForeground = this.RadialMenuItemForeground;
+            table.RadialMenuItemDisabledForeground = this.RadialMenuItemDisabledForeground;
+            table.RadialMenuItemMouseOverBackground = this.RadialMenuItemMouseOverBackground;
+            table.RadialMenuItemMouseOverForeground = this.RadialMenuItemMouseOverForeground;
+            table.RadialMenuMouseOverBorder = this.RadialMenuMouseOverBorder;
+        }
+        private void OnPropertyChanged(string propertyName)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs(propertyName));
+        }
+
+        private Color _RadialMenuButtonBackground = Color.Empty;
+        /// <summary>
+        /// Gets or sets the color of the Radial Menu button background.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates color of Radial Menu button background.")]
+        public Color RadialMenuButtonBackground
+        {
+            get { return _RadialMenuButtonBackground; }
+            set { _RadialMenuButtonBackground = value; OnPropertyChanged("RadialMenuButtonBorder"); }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeRadialMenuButtonBackground()
+        {
+            return !_RadialMenuButtonBackground.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetRadialMenuButtonBackground()
+        {
+            this.RadialMenuButtonBackground = Color.Empty;
+        }
+
+        private Color _RadialMenuButtonBorder = Color.Empty;
+        /// <summary>
+        /// Gets or sets the color of the radial menu button border.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates color of Radial Menu Button border.")]
+        public Color RadialMenuButtonBorder
+        {
+            get { return _RadialMenuButtonBorder; }
+            set { _RadialMenuButtonBorder = value; OnPropertyChanged("RadialMenuButtonBorder"); }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeRadialMenuButtonBorder()
+        {
+            return !_RadialMenuButtonBorder.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetRadialMenuButtonBorder()
+        {
+            this.RadialMenuButtonBorder = Color.Empty;
+        }
+
+        private Color _RadialMenuBackground = Color.Empty;
+        /// <summary>
+        /// Gets or sets the color of the Radial Menu background.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates color of Radial Menu background.")]
+        public Color RadialMenuBackground
+        {
+            get { return _RadialMenuBackground; }
+            set { _RadialMenuBackground = value; OnPropertyChanged("RadialMenuBackground"); }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeRadialMenuBackground()
+        {
+            return !_RadialMenuBackground.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetRadialMenuBackground()
+        {
+            this.RadialMenuBackground = Color.Empty;
+        }
+
+        private Color _RadialMenuBorder = Color.Empty;
+        /// <summary>
+        /// Gets or sets the color of the Radial Menu border
+        /// </summary>
+        [Category("Appearance"), Description("Indicates color of Radial Menu border.")]
+        public Color RadialMenuBorder
+        {
+            get { return _RadialMenuBorder; }
+            set { _RadialMenuBorder = value; OnPropertyChanged("RadialMenuBorder"); }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeRadialMenuBorder()
+        {
+            return !_RadialMenuBorder.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetRadialMenuBorder()
+        {
+            this.RadialMenuBorder = Color.Empty;
+        }
+
+        private Color _RadialMenuMouseOverBorder = Color.Empty;
+        /// <summary>
+        /// Gets or sets the color of border for mouse over state for the radial menu item expand part.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates color of border for mouse over state for the radial menu items expand part.")]
+        public Color RadialMenuMouseOverBorder
+        {
+            get { return _RadialMenuMouseOverBorder; }
+            set { _RadialMenuMouseOverBorder = value; OnPropertyChanged("RadialMenuMouseOverBorder"); }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeRadialMenuMouseOverBorder()
+        {
+            return !_RadialMenuMouseOverBorder.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetRadialMenuMouseOverBorder()
+        {
+            this.RadialMenuMouseOverBorder = Color.Empty;
+        }
+
+        private Color _RadialMenuInactiveBorder = Color.Empty;
+        /// <summary>
+        /// Gets or sets the color of the radial menu border for parts where items do not have sub-items, i.e. non-active area of the border.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates color of radial menu border for parts where items do not have sub-items, i.e. non-active area of the border..")]
+        public Color RadialMenuInactiveBorder
+        {
+            get { return _RadialMenuInactiveBorder; }
+            set { _RadialMenuInactiveBorder = value; OnPropertyChanged("RadialMenuInactiveBorder"); }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeRadialMenuInactiveBorder()
+        {
+            return !_RadialMenuInactiveBorder.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetRadialMenuInactiveBorder()
+        {
+            this.RadialMenuInactiveBorder = Color.Empty;
+        }
+
+        private Color _RadialMenuExpandForeground = Color.Empty;
+        /// <summary>
+        /// Gets or sets the color of the expand sign which shows menu item sub-items.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates color of expand sign which shows menu item sub-items..")]
+        public Color RadialMenuExpandForeground
+        {
+            get { return _RadialMenuExpandForeground; }
+            set { _RadialMenuExpandForeground = value; OnPropertyChanged("RadialMenuExpandForeground"); }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeRadialMenuExpandForeground()
+        {
+            return !_RadialMenuExpandForeground.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetRadialMenuExpandForeground()
+        {
+            this.RadialMenuExpandForeground = Color.Empty;
+        }
+
+        private Color _RadialMenuItemForeground = Color.Empty;
+        /// <summary>
+        /// Gets or sets the color of the radial menu item text.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates color of radial menu item text.")]
+        public Color RadialMenuItemForeground
+        {
+            get { return _RadialMenuItemForeground; }
+            set { _RadialMenuItemForeground = value; OnPropertyChanged("RadialMenuItemForeground"); }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeRadialMenuItemForeground()
+        {
+            return !_RadialMenuItemForeground.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetRadialMenuItemForeground()
+        {
+            this.RadialMenuItemForeground = Color.Empty;
+        }
+
+        private Color _RadialMenuItemMouseOverBackground = Color.Empty;
+        /// <summary>
+        /// Gets or sets the color of the radial menu item mouse over background.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates color of radial menu item mouse over background.")]
+        public Color RadialMenuItemMouseOverBackground
+        {
+            get { return _RadialMenuItemMouseOverBackground; }
+            set { _RadialMenuItemMouseOverBackground = value; OnPropertyChanged("RadialMenuItemMouseOverBackground"); }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeRadialMenuItemMouseOverBackground()
+        {
+            return !_RadialMenuItemMouseOverBackground.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetRadialMenuItemMouseOverBackground()
+        {
+            this.RadialMenuItemMouseOverBackground = Color.Empty;
+        }
+
+        private Color _RadialMenuItemMouseOverForeground = Color.Empty;
+        /// <summary>
+        /// Gets or sets the color of the radial menu item mouse over foreground.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates color of radial menu item mouse over foreground.")]
+        public Color RadialMenuItemMouseOverForeground
+        {
+            get { return _RadialMenuItemMouseOverForeground; }
+            set { _RadialMenuItemMouseOverForeground = value; OnPropertyChanged("RadialMenuItemMouseOverForeground"); }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeRadialMenuItemMouseOverForeground()
+        {
+            return !_RadialMenuItemMouseOverForeground.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetRadialMenuItemMouseOverForeground()
+        {
+            this.RadialMenuItemMouseOverForeground = Color.Empty;
+        }
+
+        private Color _RadialMenuItemDisabledForeground = Color.Empty;
+        /// <summary>
+        /// Gets or sets the color of the radial menu item foreground when disabled.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates color of radial menu item foreground when disabled.")]
+        public Color RadialMenuItemDisabledForeground
+        {
+            get { return _RadialMenuItemDisabledForeground; }
+            set { _RadialMenuItemDisabledForeground = value; OnPropertyChanged("_RadialMenuItemDisabledForeground"); }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerialize_RadialMenuItemDisabledForeground()
+        {
+            return !_RadialMenuItemDisabledForeground.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void Reset_RadialMenuItemDisabledForeground()
+        {
+            this.RadialMenuItemDisabledForeground = Color.Empty;
+        }
+        #endregion
+
+        #region Circular Menu Type
+        private Color _CircularBackColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets background color of the circular menu item type. Applies only to circular menu types.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates background color of the circular menu item type.")]
+        public Color CircularBackColor
+        {
+            get { return _CircularBackColor; }
+            set { _CircularBackColor = value; OnPropertyChanged("CircularBackColor"); }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeCircularBackColor()
+        {
+            return !_CircularBackColor.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetCircularBackColor()
+        {
+            this.CircularBackColor = Color.Empty;
+        }
+
+        private Color _CircularForeColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets text color of the circular menu item type. Applies only to circular menu types.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates text color of the circular menu item type.")]
+        public Color CircularForeColor
+        {
+            get { return _CircularForeColor; }
+            set { _CircularForeColor = value; OnPropertyChanged("CircularForeColor"); }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeCircularForeColor()
+        {
+            return !_CircularForeColor.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetCircularForeColor()
+        {
+            this.CircularForeColor = Color.Empty;
+        }
+
+        private Color _CircularBorderColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets border color of the circular menu item type. Applies only to circular menu types.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates border color of the circular menu item type.")]
+        public Color CircularBorderColor
+        {
+            get { return _CircularBorderColor; }
+            set { _CircularBorderColor = value; OnPropertyChanged("CircularBorderColor"); }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeCircularBorderColor()
+        {
+            return !_CircularBorderColor.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetCircularBorderColor()
+        {
+            this.CircularBorderColor = Color.Empty;
+        }
+        #endregion        
+
+        #region INotifyPropertyChanged Members
+        /// <summary>
+        /// Occurs when property value has changed.
+        /// </summary>
+        public event PropertyChangedEventHandler PropertyChanged;
+        /// <summary>
+        /// Raises the PropertyChanged event.
+        /// </summary>
+        /// <param name="e">Event arguments</param>
+        protected virtual void OnPropertyChanged(PropertyChangedEventArgs e)
+        {
+            PropertyChangedEventHandler eh = PropertyChanged;
+            if (eh != null) eh(this, e);
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/RadialMenu/RadialMenuContainer.cs b/PROMS/DotNetBar Source Code/RadialMenu/RadialMenuContainer.cs
new file mode 100644
index 00000000..5475363e
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/RadialMenu/RadialMenuContainer.cs	
@@ -0,0 +1,1695 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel;
+using System.Drawing.Drawing2D;
+using System.Drawing;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.Rendering;
+
+namespace DevComponents.DotNetBar
+{
+    public class RadialMenuContainer : BaseItem
+    {
+        #region Constructor
+        /// <summary>
+        /// Initializes a new instance of the RadialMenuContainer class.
+        /// </summary>
+        public RadialMenuContainer()
+        {
+            _Colors = new RadialMenuColorTable();
+            _Colors.PropertyChanged += new PropertyChangedEventHandler(ColorsPropertyChanged);
+            m_IsContainer = true;
+
+            this.AutoCollapseOnClick = false;
+            this.AccessibleRole = System.Windows.Forms.AccessibleRole.Grouping;
+        }
+
+        void ColorsPropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            this.Invalidate();
+        }
+        /// <summary>
+        /// Returns copy of the item.
+        /// </summary>
+        public override BaseItem Copy()
+        {
+            RadialMenuContainer copy = new RadialMenuContainer();
+            this.CopyToItem(copy);
+            return copy;
+        }
+
+        /// <summary>
+        /// Copies the RadialMenuItem specific properties to new instance of the item.
+        /// </summary>
+        /// <param name="copy">New ProgressBarItem instance.</param>
+        internal void InternalCopyToItem(RadialMenuContainer copy)
+        {
+            CopyToItem(copy);
+        }
+
+        /// <summary>
+        /// Copies the RadialMenuItem specific properties to new instance of the item.
+        /// </summary>
+        /// <param name="copy">New RadialMenuItem instance.</param>
+        protected override void CopyToItem(BaseItem copy)
+        {
+            base.CopyToItem(copy);
+
+            RadialMenuContainer item = copy as RadialMenuContainer;
+            item.BackButtonSymbol = _BackSymbol;
+            item.BackButtonSymbolSize = _BackSymbolSize;
+            item.BackButtonSymbolSet = _BackButtonSymbolSet;
+            item.CenterButtonDiameter = _CenterButtonDiameter;
+            item.Colors.Apply(_Colors);
+            item.Diameter = _Diameter;
+            item.MenuLocation = _MenuLocation;
+            item.MenuType = _MenuType;
+            item.SubMenuEdgeItemSpacing = _SubMenuEdgeItemSpacing;
+            item.SubMenuEdgeWidth = _SubMenuEdgeWidth;
+
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            if (_Popup != null)
+            {
+                _Popup.Dispose();
+                _Popup = null;
+            }
+
+            if (_PopupProxy != null)
+            {
+                _PopupProxy._ParentRadialMenu = null;
+                _PopupProxy.Dispose();
+                _PopupProxy = null;
+            }
+
+            if (_CurrentAnimation != null) _CurrentAnimation.Stop();
+            base.Dispose(disposing);
+        }
+        #endregion
+
+        #region Events
+        /// <summary>
+        /// Occurs after radial menu is opened.
+        /// </summary>
+        [Description("Occurs after radial menu is opened.")]
+        public event EventHandler Opened;
+        /// <summary>
+        /// Raises Opened event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnOpened(EventArgs e)
+        {
+            EventHandler handler = Opened;
+            if (handler != null)
+                handler(this, e);
+        }
+        /// <summary>
+        /// Occurs after radial menu is closed.
+        /// </summary>
+        [Description("Occurs after radial menu is closed.")]
+        public event EventHandler Closed;
+        /// <summary>
+        /// Raises Closed event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnClosed(EventArgs e)
+        {
+            EventHandler handler = Closed;
+            if (handler != null)
+                handler(this, e);
+        }
+        #endregion
+
+        #region Implementation
+        private SizeF _ScaleFactor = new SizeF(1, 1);
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public SizeF ScaleFactor
+        {
+            get { return _ScaleFactor; }
+            set { _ScaleFactor = value; }
+        }
+        private RadialSubItemInfo[] _SubItemsInfo = null;
+        private bool _RecalcSizeInProgress = false;
+        private const int MinItemRadialAngle = 18; // Minimum space in angles that can be occupied by single item. 18 gives 20 items on radial menu.
+        public override void RecalcSize()
+        {
+            if (_RecalcSizeInProgress) return; // Prevent re-entrancy
+            _RecalcSizeInProgress = true;
+
+            try
+            {
+                DisposeSubItemsInfo();
+
+                int diameter = ActualDiameter;
+                m_Rect = new Rectangle(0, 0, diameter, diameter);
+                //this.WidthInternal = _Diameter;
+                //this.HeightInternal = _Diameter;
+
+                Rectangle bounds = new Rectangle(this.LeftInternal, this.TopInternal, diameter, diameter);
+                bounds.Width--;
+                bounds.Height--;
+                Rectangle radialMenuBounds = bounds;
+
+                Rectangle centerBounds = bounds;
+                int centerButtonDiameter = ActualCenterButtonDiameter;
+
+                centerBounds.Inflate(-((diameter - centerButtonDiameter) / 2 + 1), -((diameter - centerButtonDiameter) / 2 + 1));
+
+                int subMenuEdgeItemSpacing = Dpi.Width(_SubMenuEdgeItemSpacing);
+                if (_MenuType == eRadialMenuType.Segment)
+                {
+                    int subMenuEdgeWidth = Dpi.Width(_SubMenuEdgeWidth);
+                    bounds.Inflate(-subMenuEdgeWidth, -subMenuEdgeWidth);
+                    bounds.Inflate(-subMenuEdgeItemSpacing, -subMenuEdgeItemSpacing);
+                }
+
+                SubItemsCollection displayCollection = GetDisplayCollection();
+
+                int visibleCount = GetVisibleItemsCount(displayCollection);
+                if (visibleCount > 0)
+                {
+                    int maxItemRadialAngle = _MaxItemRadialAngle;
+                    if (maxItemRadialAngle == 0) maxItemRadialAngle = 180;
+                    int itemPieAngle = Math.Max(MinItemRadialAngle, Math.Min(maxItemRadialAngle, 360 / visibleCount));
+                    if (itemPieAngle > _MaxItemPieAngle) itemPieAngle = _MaxItemPieAngle; // Single item can consume at most half of the circle
+                    int currentAngle = -90 - itemPieAngle / 2;
+
+                    _SubItemsInfo = new RadialSubItemInfo[displayCollection.Count];
+                    for (int i = 0; i < displayCollection.Count; i++)
+                    {
+                        BaseItem item = displayCollection[i];
+                        if (!item.Visible) continue;
+                        RadialMenuItem menuItem = item as RadialMenuItem;
+                        if (menuItem != null)
+                        {
+                            menuItem.RecalcSize();
+                            GraphicsPath path = new GraphicsPath();
+                            path.AddArc(bounds, currentAngle, itemPieAngle);
+                            Rectangle cb = centerBounds;
+                            cb.Inflate(4, 4);
+                            path.AddArc(cb, currentAngle + itemPieAngle, -itemPieAngle);
+                            path.CloseAllFigures();
+                            menuItem.DisplayPath = path;
+                            menuItem.OutterBounds = bounds;
+                            menuItem.CenterBounds = centerBounds;
+                            menuItem.ItemAngle = currentAngle;
+                            menuItem.ItemPieAngle = itemPieAngle;
+                            menuItem.Bounds = Rectangle.Round(path.GetBounds());
+                        }
+                        else
+                        {
+                            item.RecalcSize();
+                            // Position item along the imaginary inner circle
+                            Rectangle innerCircle = bounds;
+                            innerCircle.Width -= item.WidthInternal;
+                            innerCircle.Height -= item.HeightInternal;
+                            if (innerCircle.Width < centerBounds.Width) innerCircle.Inflate((centerBounds.Width - innerCircle.Width) / 2, 0);
+                            if (innerCircle.Height < centerBounds.Height) innerCircle.Inflate(0, (centerBounds.Height - innerCircle.Height) / 2);
+                            Point p = new Point(innerCircle.X + (int)((innerCircle.Width / 2) * Math.Cos((currentAngle + itemPieAngle / 2) * (Math.PI / 180))),
+                                innerCircle.Y + (int)((innerCircle.Height / 2) * Math.Sin((currentAngle + itemPieAngle / 2) * (Math.PI / 180))));
+                            p.Offset(innerCircle.Width / 2, innerCircle.Height / 2);
+
+                            item.TopInternal = p.Y;
+                            item.LeftInternal = p.X;
+                        }
+
+                        if (item != null && AnyVisibleSubItems(item))
+                        {
+                            Rectangle outerBounds = bounds;
+                            outerBounds.Inflate(subMenuEdgeItemSpacing, subMenuEdgeItemSpacing);
+                            GraphicsPath subPath = new GraphicsPath();
+                            int expandAngle = currentAngle + 1;
+                            int expandPieAngle = itemPieAngle - 1;
+                            subPath.AddArc(outerBounds, expandAngle, expandPieAngle);
+                            subPath.AddArc(radialMenuBounds, expandAngle + expandPieAngle, -expandPieAngle);
+                            subPath.CloseAllFigures();
+                            Rectangle signPathBounds = radialMenuBounds;
+                            signPathBounds.Inflate(-4, -4);
+                            Point p = new Point(signPathBounds.X + (int)((signPathBounds.Width / 2) * Math.Cos((currentAngle + itemPieAngle / 2) * (Math.PI / 180))),
+                                signPathBounds.Y + (int)((signPathBounds.Height / 2) * Math.Sin((currentAngle + itemPieAngle / 2) * (Math.PI / 180))));
+                            p.Offset(signPathBounds.Width / 2, signPathBounds.Height / 2);
+                            GraphicsPath signPath = UIGraphics.GetTrianglePath(new Point(-6, -6), 12, eTriangleDirection.Right);
+                            Matrix m = new Matrix();
+                            if (currentAngle + itemPieAngle / 2 != 0)
+                            {
+                                m.Rotate(currentAngle + itemPieAngle / 2);
+                                m.Translate(p.X, p.Y, MatrixOrder.Append);
+                            }
+                            else
+                                m.Translate(p.X, p.Y);
+                            signPath.Transform(m);
+                            _SubItemsInfo[i] = new RadialSubItemInfo(subPath, signPath, currentAngle, itemPieAngle);
+                        }
+
+                        currentAngle += itemPieAngle;
+                        item.Displayed = true;
+                    }
+                }
+            }
+            finally
+            {
+                _RecalcSizeInProgress = false;
+            }
+
+            base.RecalcSize();
+        }
+
+        private SubItemsCollection GetDisplayCollection()
+        {
+            SubItemsCollection displayCollection = this.SubItems;
+            BaseItem expanded = this.ExpandedItem();
+            if (expanded != null) displayCollection = expanded.SubItems;
+            return displayCollection;
+        }
+
+        Rectangle _InnerBounds = Rectangle.Empty;
+        public override void Paint(ItemPaintArgs p)
+        {
+            p.ContextData = _Colors; // Pass to the children
+            p.ContextData2 = _MenuType;
+
+#if TRIAL
+            if (NativeFunctions.ColorExpAlt())
+			{
+				StringFormat format=new StringFormat(StringFormat.GenericDefault);
+				format.Alignment=StringAlignment.Center;
+				format.FormatFlags=format.FormatFlags & ~(format.FormatFlags & StringFormatFlags.NoWrap);	
+				p.Graphics.DrawString("Trial period is over.",p.Font,SystemBrushes.Highlight,this.Bounds,format);
+				format.Dispose();
+				return;
+			}
+#endif
+
+            if (_MenuType == eRadialMenuType.Circular)
+            {
+                PaintCircular(p);
+                return;
+            }
+
+            Graphics g = p.Graphics;
+            if (_OpenState < 100)  // Open animation transform setup
+            {
+                //p.Graphics.RotateTransform(-45 * (float)(100 - _OpenState) / 100);
+                int openState = Math.Max(5, _OpenState);
+                g.ScaleTransform(((float)openState) / 100, ((float)openState) / 100, MatrixOrder.Append);
+                g.TranslateTransform((this.WidthInternal / 2) * (float)(100 - openState) / 100, (this.HeightInternal / 2) * (float)(100 - openState) / 100, MatrixOrder.Append);
+            }
+            bool drawBackButton = (this.ExpandedItem() != null);
+
+            RadialMenuColorTable renderTable = RadialMenuContainer.GetColorTable();
+            RadialMenuColorTable localTable = _Colors;
+
+            Color borderColor = ColorScheme.GetColor(0x2B579A);
+            Color borderInactiveColor = Color.FromArgb(128, borderColor);
+            Color expandSignForeground = Color.White;
+            Color expandMouseOverColor = Color.FromArgb(200, borderColor);
+            Color backColor = Color.White;
+
+            if (!localTable.RadialMenuBorder.IsEmpty)
+                borderColor = localTable.RadialMenuBorder;
+            else if (renderTable != null && !renderTable.RadialMenuBorder.IsEmpty)
+                borderColor = renderTable.RadialMenuBorder;
+
+            if (!localTable.RadialMenuBackground.IsEmpty)
+                backColor = localTable.RadialMenuBackground;
+            else if (renderTable != null && !renderTable.RadialMenuBackground.IsEmpty)
+                backColor = renderTable.RadialMenuBackground;
+
+            if (!localTable.RadialMenuInactiveBorder.IsEmpty)
+                borderInactiveColor = localTable.RadialMenuInactiveBorder;
+            else if (renderTable != null && !renderTable.RadialMenuInactiveBorder.IsEmpty)
+                borderInactiveColor = renderTable.RadialMenuInactiveBorder;
+
+            if (!localTable.RadialMenuExpandForeground.IsEmpty)
+                expandSignForeground = localTable.RadialMenuExpandForeground;
+            else if (renderTable != null && !renderTable.RadialMenuExpandForeground.IsEmpty)
+                expandSignForeground = renderTable.RadialMenuExpandForeground;
+
+            if (!localTable.RadialMenuMouseOverBorder.IsEmpty)
+                expandMouseOverColor = localTable.RadialMenuMouseOverBorder;
+            else if (renderTable != null && !renderTable.RadialMenuMouseOverBorder.IsEmpty)
+                expandMouseOverColor = renderTable.RadialMenuMouseOverBorder;
+
+
+            Brush expandSignBrush = new SolidBrush(expandSignForeground);
+            Brush expandMouseOverBrush = new SolidBrush(expandMouseOverColor);
+            Brush borderBrush = new SolidBrush(borderColor);
+
+
+            Rectangle radialMenuBounds = this.Bounds;
+            radialMenuBounds.Width--;
+            radialMenuBounds.Height--;
+
+            using (GraphicsPath path = new GraphicsPath())
+            {
+                Rectangle b = radialMenuBounds;
+                path.AddEllipse(b);
+                Rectangle inner = b;
+                int diameter = ActualDiameter;
+                int centerButtonDiameter = ActualCenterButtonDiameter;
+                inner.Inflate(-(diameter - centerButtonDiameter) / 2, -(diameter - centerButtonDiameter) / 2);
+                _InnerBounds = inner;
+                int subMenuEdgeWidth = Dpi.Width(_SubMenuEdgeWidth);
+                b.Inflate(-subMenuEdgeWidth, -subMenuEdgeWidth);
+                using (GraphicsPath clipPath = new GraphicsPath())
+                {
+                    if (!drawBackButton && this.Parent == null && string.IsNullOrEmpty(_SymbolRealized) && _Image == null)
+                    {
+                        clipPath.AddEllipse(inner);
+                        g.SetClip(clipPath, CombineMode.Exclude);
+                    }
+                    using (SolidBrush brush = new SolidBrush(backColor))
+                        p.Graphics.FillPath(brush, path);
+                    if (!drawBackButton)
+                        g.ResetClip();
+                }
+                int subMenuEdgeWidthAnimated = Dpi.Width(_SubMenuEdgeWidthAnimated);
+                b.Inflate(-subMenuEdgeWidthAnimated, -subMenuEdgeWidthAnimated); // Used by animation to show transition from to sub-items
+                path.AddEllipse(b);
+                //p.Graphics.DrawEllipse(Pens.Red, this.Bounds);
+                using (Brush brush = new SolidBrush(borderInactiveColor))
+                {
+                    g.FillPath(brush, path);
+                    using (Pen pen = new Pen(borderColor, 2))
+                        g.DrawEllipse(pen, inner);
+                }
+
+                if (drawBackButton)
+                {
+                    Font symFont = Symbols.GetFont(_BackSymbolSize, _BackButtonSymbolSet);
+                    Size symSize = TextDrawing.MeasureString(g, _BackSymbol, symFont);
+                    int descent = (int)Math.Ceiling((symFont.FontFamily.GetCellDescent(symFont.Style) *
+                        symFont.Size / symFont.FontFamily.GetEmHeight(symFont.Style)));
+                    symSize.Height -= descent;
+                    TextDrawing.DrawStringLegacy(g, _BackSymbol, symFont, borderColor,
+                        new Rectangle(inner.X + (inner.Width - symSize.Width) / 2, inner.Y + (inner.Height - symSize.Height) / 2, 0, 0),
+                        eTextFormat.Default);
+                }
+                else if (!string.IsNullOrEmpty(_SymbolRealized))
+                {
+                    Font symFont = Symbols.GetFont(_SymbolSize, _SymbolSet);
+                    if (_SymbolTextSize.IsEmpty)
+                    {
+                        _SymbolTextSize = TextDrawing.MeasureString(g, _SymbolRealized, symFont);
+                        int descent = (int)Math.Ceiling((symFont.FontFamily.GetCellDescent(symFont.Style) *
+                            symFont.Size / symFont.FontFamily.GetEmHeight(symFont.Style)));
+                        _SymbolTextSize.Height -= descent;
+                    }
+                    TextDrawing.DrawStringLegacy(g, _SymbolRealized, symFont, borderColor,
+                        new Rectangle(inner.X + (inner.Width - _SymbolTextSize.Width) / 2 + 1, inner.Y + (inner.Height - _SymbolTextSize.Height) / 2 + 1, 0, 0),
+                        eTextFormat.Default);
+                }
+                else if (_Image != null)
+                {
+                    g.DrawImage(_Image, inner.X + (inner.Width - _Image.Width) / 2, inner.Y + (inner.Height - _Image.Height) / 2);
+                }
+            }
+
+            if (_OpenState < 100)  // Open animation transform setup
+            {
+                g.ResetTransform();
+                g.RotateTransform(-16 * (float)(100 - _OpenState) / 100);
+                g.ScaleTransform(((float)Math.Max(1, _OpenState)) / 100, ((float)Math.Max(1, _OpenState)) / 100, MatrixOrder.Append);
+                g.TranslateTransform((this.WidthInternal / 2) * (float)(100 - _OpenState) / 100, (this.HeightInternal / 2) * (float)(100 - _OpenState) / 100, MatrixOrder.Append);
+            }
+            else if (_InnerScale < 100) // For expand animation of inner content
+            {
+                int openState = _InnerScale;
+                g.ScaleTransform(((float)openState) / 100, ((float)openState) / 100, MatrixOrder.Append);
+                g.TranslateTransform((this.WidthInternal / 2) * (float)(100 - openState) / 100, (this.HeightInternal / 2) * (float)(100 - openState) / 100, MatrixOrder.Append);
+            }
+            SubItemsCollection displayCollection = GetDisplayCollection();
+            for (int i = 0; i < displayCollection.Count; i++)
+            {
+                BaseItem item = displayCollection[i];
+                if (item.Visible && item.Displayed)
+                {
+                    if (p.ClipRectangle.IsEmpty || p.ClipRectangle.IntersectsWith(item.DisplayRectangle))
+                    {
+                        Region oldClip = g.Clip as Region;
+                        g.SetClip(item.DisplayRectangle, CombineMode.Intersect);
+                        if (!g.IsClipEmpty)
+                            item.Paint(p);
+                        g.Clip = oldClip;
+                        if (oldClip != null) oldClip.Dispose();
+                    }
+                    if (_SubItemsInfo != null && _SubItemsInfo[i] != null)
+                    {
+                        if (_HotSubItemInfoIndex == i)
+                        {
+                            g.FillPath(expandMouseOverBrush, _SubItemsInfo[i].Path);
+                            g.FillPath(expandSignBrush, _SubItemsInfo[i].SignPath);
+                        }
+                        else
+                        {
+                            g.FillPath(borderBrush, _SubItemsInfo[i].Path);
+                            g.FillPath(expandSignBrush, _SubItemsInfo[i].SignPath);
+                        }
+                    }
+                }
+            }
+
+            expandSignBrush.Dispose();
+            expandSignBrush = null;
+            expandMouseOverBrush.Dispose();
+            expandMouseOverBrush = null;
+            borderBrush.Dispose();
+            borderBrush = null;
+
+            g.ResetTransform();
+        }
+
+        private void PaintCircular(ItemPaintArgs p)
+        {
+            Graphics g = p.Graphics;
+
+            Rectangle radialMenuBounds = this.Bounds;
+            radialMenuBounds.Width--;
+            radialMenuBounds.Height--;
+
+            if (_OpenState < 100)  // Open animation transform setup
+            {
+                g.ResetTransform();
+                g.RotateTransform(-16 * (float)(100 - _OpenState) / 100);
+                g.ScaleTransform(((float)Math.Max(1, _OpenState)) / 100, ((float)Math.Max(1, _OpenState)) / 100, MatrixOrder.Append);
+                g.TranslateTransform((this.WidthInternal / 2) * (float)(100 - _OpenState) / 100, (this.HeightInternal / 2) * (float)(100 - _OpenState) / 100, MatrixOrder.Append);
+            }
+            else if (_InnerScale < 100) // For expand animation of inner content
+            {
+                int openState = _InnerScale;
+                g.ScaleTransform(((float)openState) / 100, ((float)openState) / 100, MatrixOrder.Append);
+                g.TranslateTransform((this.WidthInternal / 2) * (float)(100 - openState) / 100, (this.HeightInternal / 2) * (float)(100 - openState) / 100, MatrixOrder.Append);
+            }
+            SubItemsCollection displayCollection = GetDisplayCollection();
+            for (int i = 0; i < displayCollection.Count; i++)
+            {
+                BaseItem item = displayCollection[i];
+                if (item.Visible && item.Displayed)
+                {
+                    if (p.ClipRectangle.IsEmpty || p.ClipRectangle.IntersectsWith(item.DisplayRectangle))
+                    {
+                        Region oldClip = g.Clip as Region;
+                        g.SetClip(item.DisplayRectangle, CombineMode.Intersect);
+                        if (!g.IsClipEmpty)
+                            item.Paint(p);
+                        g.Clip = oldClip;
+                        if (oldClip != null) oldClip.Dispose();
+                    }
+                    //if (_SubItemsInfo != null && _SubItemsInfo[i] != null)
+                    //{
+                    //    if (_HotSubItemInfoIndex == i)
+                    //    {
+                    //        g.FillPath(expandMouseOverBrush, _SubItemsInfo[i].Path);
+                    //        g.FillPath(expandSignBrush, _SubItemsInfo[i].SignPath);
+                    //    }
+                    //    else
+                    //    {
+                    //        g.FillPath(borderBrush, _SubItemsInfo[i].Path);
+                    //        g.FillPath(expandSignBrush, _SubItemsInfo[i].SignPath);
+                    //    }
+                    //}
+                }
+            }
+
+            g.ResetTransform();
+        }
+
+        private bool AnyVisibleSubItems(BaseItem item)
+        {
+            if (!item.ShowSubItems) return false;
+            foreach (BaseItem t in item.SubItems)
+            {
+                if (t.Visible) return true;
+            }
+            return false;
+        }
+        private int GetVisibleItemsCount(SubItemsCollection displayCollection)
+        {
+            int c = 0;
+            foreach (BaseItem item in displayCollection)
+            {
+                if (item.Visible) c++;
+            }
+            return c;
+        }
+        private void DisposeSubItemsInfo()
+        {
+            if (_SubItemsInfo != null)
+            {
+                for (int i = 0; i < _SubItemsInfo.Length; i++)
+                {
+                    if (_SubItemsInfo[i] != null) _SubItemsInfo[i].Dispose();
+                }
+            }
+            _SubItemsInfo = null;
+        }
+        protected internal override void OnExpandChange()
+        {
+            if (this.Expanded)
+                Open();
+            else
+            {
+                if (HotSubItem != null) HotSubItem.InternalMouseLeave();
+                Close();
+                // Collapse all sub-items
+                CollapseRecursively(this);
+            }
+            base.OnExpandChange();
+        }
+
+        private void CollapseRecursively(BaseItem item)
+        {
+            foreach (BaseItem sub in item.SubItems)
+            {
+                sub.Expanded = false;
+                CollapseRecursively(sub);
+            }
+        }
+        private int _OpenState = 0;
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), EditorBrowsable(EditorBrowsableState.Never)]
+        public int OpenState
+        {
+            get { return _OpenState; }
+            set
+            {
+                RadialMenuPopup popup = _Popup;
+                if (this.IsDisposed | popup == null || popup != null && popup.IsDisposed)
+                {
+                    _OpenState = value;
+                    return;
+                }
+                if (popup != null && popup.InvokeRequired && !popup.IsDisposed)
+                {
+                    try
+                    {
+                        popup.Invoke(new MethodInvoker(delegate { this.OpenState = value; }));
+                    }
+                    catch (ObjectDisposedException)
+                    { }
+                    return;
+                }
+                if (value < 0)
+                    value = 0;
+                else if (value > 100)
+                    value = 100;
+                if (value != _OpenState)
+                {
+                    int oldValue = _OpenState;
+                    _OpenState = value;
+                    OnOpenStateChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when OpenState property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnOpenStateChanged(int oldValue, int newValue)
+        {
+            //Application.DoEvents();
+            //OnPropertyChanged(new PropertyChangedEventArgs("OpenState"));
+            this.Refresh();
+
+            if (newValue == 0)
+            {
+                RadialMenuPopup popup = _Popup;
+                _Popup = null;
+                if (popup != null)
+                {
+                    popup.Hide();
+                    popup.Dispose();
+                }
+                OnClosed(EventArgs.Empty);
+            }
+            else if (newValue == 100)
+            {
+                OnOpened(EventArgs.Empty);
+            }
+        }
+
+        private int _InnerScale = 100;
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), EditorBrowsable(EditorBrowsableState.Never)]
+        public int InnerScale
+        {
+            get { return _InnerScale; }
+            set
+            {
+                if (value > 100)
+                    value = 100;
+                else if (value < 0)
+                    value = 0;
+                if (_InnerScale != value)
+                {
+                    _InnerScale = value;
+                    this.Refresh();
+                }
+            }
+        }
+
+        //private bool _IsOpen;
+        //internal bool IsOpen
+        //{
+        //    get { return _IsOpen; }
+        //    set
+        //    {
+        //        if (_IsOpen != value)
+        //        {
+        //            _IsOpen = value;
+        //            if (_IsOpen)
+        //                Open();
+        //            else
+        //                Close();
+        //        }
+        //    }
+        //}
+        /// <summary>
+        /// Returns internal popup control for radial menu.
+        /// </summary>
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Advanced)]
+        public RadialMenuPopup Popup
+        {
+            get
+            {
+                return _Popup;
+            }
+        }
+
+        private Animation.Animation _CurrentAnimation = null;
+        private RadialMenuPopup _Popup = null;
+        private bool _IsOpening = false;
+        private RadialMenuPopupProxy _PopupProxy = null;
+        private int _DelayCount = 0;
+        #region Open
+        internal void Open()
+        {
+            if (_IsOpening) return;
+            if (_OpenState > 0 && _DelayCount < 2)
+            {
+                BarUtilities.InvokeDelayed(new MethodInvoker(delegate { this.Open(); }), 300);
+                return;
+            }
+            try
+            {
+                _DelayCount = 0;
+                _IsOpening = true;
+                this.Displayed = true;
+
+                WaitForCurrentAnimationToComplete();
+
+                if (this.Parent != null) // Hosted elsewhere other than RadialMenu
+                {
+                    IOwnerMenuSupport ownerMenu = this.GetIOwnerMenuSupport();
+                    if (ownerMenu != null)
+                    {
+                        if (_PopupProxy == null) _PopupProxy = new RadialMenuPopupProxy(this);
+                        _PopupProxy.Expanded = true;
+                        ownerMenu.RegisterPopup(_PopupProxy);
+                    }
+                }
+
+
+                RadialMenuPopup popup = _Popup;
+                if (popup == null)
+                {
+                    popup = new RadialMenuPopup();
+                    popup.DisplayItem = this;
+                    if (_Font != null)
+                        popup.Font = _Font;
+                    else if (_RadialMenu != null)
+                        popup.Font = _RadialMenu.Font;
+                    popup.CreateControl();
+                }
+
+                if (_MenuLocation.IsEmpty)
+                {
+                    int diameter = ActualDiameter;
+                    if (_RadialMenu != null)
+                    {
+                        Point p = _RadialMenu.PointToScreen(
+                            new Point(_RadialMenu.Width / 2, _RadialMenu.Height / 2));
+                        p.X -= diameter / 2;
+                        p.Y -= diameter / 2;
+                        popup.Location = p;
+                    }
+                    else
+                    {
+                        Point p = Control.MousePosition;
+                        p.X -= diameter / 2;
+                        p.Y -= diameter / 2;
+                        popup.Location = p;
+                    }
+                }
+                else
+                    popup.Location = _MenuLocation;
+                popup.Visible = true;
+                popup.Refresh();
+                _Popup = popup;
+
+                Animation.AnimationInt anim = new DevComponents.DotNetBar.Animation.AnimationInt(
+                       new Animation.AnimationRequest(this, "OpenState", 0, 100),
+                       Animation.AnimationEasing.EaseOutCubic, 300);
+                anim.AutoDispose = true;
+                _CurrentAnimation = anim;
+                anim.Start();
+            }
+            finally
+            {
+                _IsOpening = false;
+            }
+        }
+        #endregion
+
+        private void WaitForCurrentAnimationToComplete()
+        {
+            if (_CurrentAnimation != null)
+            {
+                DateTime start = DateTime.Now;
+                while (!_CurrentAnimation.IsDisposed)
+                {
+                    Application.DoEvents();
+                    if (DateTime.Now.Subtract(start).TotalMilliseconds > 1000)
+                    {
+                        AbortCurrentAnimation();
+                        break;
+                    }
+                }
+                _CurrentAnimation = null;
+            }
+        }
+
+        private void AbortCurrentAnimation()
+        {
+            Animation.Animation anim = _CurrentAnimation;
+            _CurrentAnimation = null;
+            if (anim != null)
+            {
+                anim.Stop();
+                anim.Dispose();
+            }
+        }
+
+        protected override bool ShouldCollapseParentItem()
+        {
+            if (this.HotSubItem != null) return HotSubItem.AutoCollapseOnClick;
+            return base.ShouldCollapseParentItem();
+        }
+
+        /// <summary>
+        /// Closes currently open popup.
+        /// </summary>
+        internal void Close()
+        {
+            WaitForCurrentAnimationToComplete();
+
+            Animation.AnimationInt anim = new DevComponents.DotNetBar.Animation.AnimationInt(
+                   new Animation.AnimationRequest(this, "OpenState", 100, 0),
+                   Animation.AnimationEasing.EaseOutCubic, 300);
+            anim.AutoDispose = true;
+            anim.Start();
+            //_CurrentAnimation = anim;
+
+            RadialMenuPopupProxy popupProxy = _PopupProxy;
+            if (popupProxy != null) // Hosted elsewhere other than RadialMenu
+            {
+                IOwnerMenuSupport ownerMenu = this.GetIOwnerMenuSupport();
+                if (ownerMenu != null)
+                {
+                    ownerMenu.UnregisterPopup(popupProxy);
+                    popupProxy.Expanded = false;
+                }
+            }
+        }
+
+        protected internal IOwnerMenuSupport GetIOwnerMenuSupport()
+        {
+            return (this.GetOwner() as IOwnerMenuSupport);
+        }
+
+        private int _MaxItemRadialAngle = 0;
+        /// <summary>
+        /// Indicates maximum radial angle single item in menu can consume. By default this property is set to zero which indicates that
+        /// radial menu is equally divided between visible menu items.
+        /// </summary>
+        [DefaultValue(0), Category("Appearance"), Description("Indicates maximum radial angle single item in menu can consume. Max value is 180.")]
+        public int MaxItemRadialAngle
+        {
+            get { return _MaxItemRadialAngle; }
+            set
+            {
+                if (value < 0)
+                    value = 0;
+                else if (value > 180)
+                    value = 180;
+                if (value != _MaxItemRadialAngle)
+                {
+                    int oldValue = _MaxItemRadialAngle;
+                    _MaxItemRadialAngle = value;
+                    OnMaxItemRadialAngleChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when MaxItemRadialAngle property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnMaxItemRadialAngleChanged(int oldValue, int newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("MaxItemRadialAngle"));
+            NeedRecalcSize = true;
+            this.Refresh();
+        }
+
+        /// <summary>
+        /// Returns diameter which takes in account current scaling factor.
+        /// </summary>
+        private int ActualDiameter
+        {
+            get
+            {
+                return (int)(_Diameter * _ScaleFactor.Height);
+            }
+        }
+
+        private int _Diameter = 180;
+        /// <summary>
+        /// Gets or sets radial menu diameter. Minimum value is 64.
+        /// </summary>
+        [DefaultValue(180), Category("Appearance"), Description("Radial menu diameter.")]
+        public int Diameter
+        {
+            get { return _Diameter; }
+            set
+            {
+                if (value < 64) value = 64;
+                if (value != _Diameter)
+                {
+                    int oldValue = _Diameter;
+                    _Diameter = value;
+                    OnDiameterChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when Diameter property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnDiameterChanged(int oldValue, int newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("Diameter"));
+            NeedRecalcSize = true;
+            this.Refresh();
+        }
+
+        /// <summary>
+        /// Returns actual center button diameter which takes in account current scale factor.
+        /// </summary>
+        private int ActualCenterButtonDiameter
+        {
+            get
+            {
+                return (int)(_CenterButtonDiameter * _ScaleFactor.Height);
+            }
+        }
+
+        private int _CenterButtonDiameter = 32;
+        /// <summary>
+        /// Indicates diameter of center button of radial menu.
+        /// </summary>
+        [DefaultValue(32), Category("Appearance"), Description("Indicates diameter of center button of radial menu.")]
+        public int CenterButtonDiameter
+        {
+            get { return _CenterButtonDiameter; }
+            set
+            {
+                if (value != _CenterButtonDiameter)
+                {
+                    int oldValue = _CenterButtonDiameter;
+                    _CenterButtonDiameter = value;
+                    OnCenterButtonDiameterChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when CenterButtonDiameter property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnCenterButtonDiameterChanged(int oldValue, int newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("CenterButtonDiameter"));
+
+        }
+
+        private int _SubMenuEdgeWidth = 18;
+        /// <summary>
+        /// Specifies the width of the sub-menu edge around the radial menu.
+        /// </summary>
+        [DefaultValue(18), Category("Appearance"), Description("Specifies the width of the sub-menu edge around the radial menu.")]
+        public int SubMenuEdgeWidth
+        {
+            get { return _SubMenuEdgeWidth; }
+            set
+            {
+                if (value < 0) value = 0;
+                if (value != _SubMenuEdgeWidth)
+                {
+                    int oldValue = _SubMenuEdgeWidth;
+                    _SubMenuEdgeWidth = value;
+                    OnSubMenuEdgeWidthChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when SubMenuEdgeWidth property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnSubMenuEdgeWidthChanged(int oldValue, int newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("SubMenuEdgeWidth"));
+            NeedRecalcSize = true;
+            this.Refresh();
+        }
+
+        private int _SubMenuEdgeItemSpacing = 3;
+        /// <summary>
+        /// Indicates spacing between sub-menu marking edge and the item.
+        /// </summary>
+        [DefaultValue(3), Category("Appearance"), Description("Indicates spacing between sub-menu marking edge and the item.")]
+        public int SubMenuEdgeItemSpacing
+        {
+            get { return _SubMenuEdgeItemSpacing; }
+            set
+            {
+                if (value != _SubMenuEdgeItemSpacing)
+                {
+                    int oldValue = _SubMenuEdgeItemSpacing;
+                    _SubMenuEdgeItemSpacing = value;
+                    OnSubMenuEdgeItemSpacingChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when SubMenuEdgeItemSpacing property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnSubMenuEdgeItemSpacingChanged(int oldValue, int newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("SubMenuEdgeItemSpacing"));
+            NeedRecalcSize = true;
+            this.Refresh();
+        }
+
+        /// <summary>
+        /// Return Sub Item at specified location
+        /// </summary>
+        public override BaseItem ItemAtLocation(int x, int y)
+        {
+            SubItemsCollection subItems = GetDisplayCollection();
+            foreach (BaseItem item in subItems)
+            {
+                if (!item.Visible || !item.Displayed) continue;
+                RadialMenuItem rm = item as RadialMenuItem;
+                if (rm != null)
+                {
+                    if (rm.DisplayPath.IsVisible(x, y))
+                        return rm;
+                }
+                else if ((item.Visible || IsOnCustomizeMenu) && item.Displayed && item.DisplayRectangle.Contains(x, y))
+                {
+                    if (m_ViewRectangle.IsEmpty || m_ViewRectangle.Contains(x, y))
+                        return item;
+                }
+            }
+            return null;
+            //return base.ItemAtLocation(x, y);
+        }
+
+        protected override void Invalidate(Control containerControl)
+        {
+            if (this.DesignMode)
+            {
+                if (containerControl.InvokeRequired)
+                    containerControl.BeginInvoke(new MethodInvoker(delegate { containerControl.Invalidate(); }));
+                else
+                    containerControl.Invalidate();
+            }
+            else
+            {
+                if (containerControl.InvokeRequired)
+                    containerControl.BeginInvoke(new MethodInvoker(delegate { containerControl.Invalidate(m_Rect, true); }));
+                else
+                    containerControl.Invalidate(m_Rect, true);
+            }
+        }
+
+        private Point _MenuLocation = Point.Empty;
+        /// <summary>
+        /// Indicates the position of top-left corner of radial menu when shown in screen coordinates
+        /// </summary>
+        [Category("Behavior"), Description("Indicates the position of top-left corner of radial menu when shown in screen coordinates")]
+        public Point MenuLocation
+        {
+            get { return _MenuLocation; }
+            set
+            {
+                if (value != _MenuLocation)
+                {
+                    Point oldValue = _MenuLocation;
+                    _MenuLocation = value;
+                    OnMenuLocationChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when MenuLocation property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnMenuLocationChanged(Point oldValue, Point newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("MenuLocation"));
+            if (_Popup != null) _Popup.Location = newValue;
+        }
+
+        private RadialMenu _RadialMenu;
+        internal RadialMenu RadialMenu
+        {
+            get { return _RadialMenu; }
+            set
+            {
+                if (value != _RadialMenu)
+                {
+                    RadialMenu oldValue = _RadialMenu;
+                    _RadialMenu = value;
+                    OnRadialMenuChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when RadialMenu property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnRadialMenuChanged(RadialMenu oldValue, RadialMenu newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("RadialMenu"));
+
+        }
+
+        public override void InternalMouseMove(MouseEventArgs objArg)
+        {
+            base.InternalMouseMove(objArg);
+            UpateHotSubItemInfoIndex(objArg);
+        }
+        private void UpateHotSubItemInfoIndex(MouseEventArgs objArg)
+        {
+            if (HotSubItem == null && _SubItemsInfo != null)
+            {
+                bool found = false;
+                // Check sub items
+                for (int i = 0; i < _SubItemsInfo.Length; i++)
+                {
+                    RadialSubItemInfo info = _SubItemsInfo[i];
+                    if (info != null && info.Path.IsVisible(objArg.X, objArg.Y))
+                    {
+                        HotSubItemInfoIndex = i;
+                        found = true;
+                        break;
+                    }
+                }
+                if (!found)
+                    HotSubItemInfoIndex = -1;
+            }
+            else
+                HotSubItemInfoIndex = -1;
+        }
+        public override void InternalMouseLeave()
+        {
+            HotSubItemInfoIndex = -1;
+            base.InternalMouseLeave();
+        }
+        public override void InternalMouseDown(MouseEventArgs objArg)
+        {
+            UpateHotSubItemInfoIndex(objArg);
+            int hotSubItemInfoIndex = HotSubItemInfoIndex;
+            if (hotSubItemInfoIndex >= 0)
+            {
+                SubItemsCollection displayCollection = GetDisplayCollection();
+                if (hotSubItemInfoIndex < displayCollection.Count)
+                {
+                    BaseItem expand = displayCollection[hotSubItemInfoIndex];
+                    if (expand.ShowSubItems && expand.VisibleSubItems > 0)
+                    {
+                        expand.Expanded = true;
+                        return;
+                    }
+                }
+            }
+            else if (ExpandedItem() == null && _InnerBounds.Contains(objArg.Location))
+            {
+                this.Expanded = false;
+            }
+
+            base.InternalMouseDown(objArg);
+        }
+
+        Animation.Storyline _CurrentStoryline = null;
+        private void RunExpandItemAnimation()
+        {
+            Animation.Storyline story = new DevComponents.DotNetBar.Animation.Storyline();
+            story.AutoDispose = true;
+            Animation.AnimationInt anim = new DevComponents.DotNetBar.Animation.AnimationInt(
+                   new Animation.AnimationRequest(this, "InnerScale", 100, 85),
+                   Animation.AnimationEasing.EaseInCubic, 250);
+            anim.Animations.Add(new DevComponents.DotNetBar.Animation.AnimationRequest(this, "SubMenuEdgeWidthAnimated", 0, 12));
+            anim.AutoDispose = true;
+            story.Animations.Add(anim);
+            anim = new DevComponents.DotNetBar.Animation.AnimationInt(
+                   new Animation.AnimationRequest(this, "InnerScale", 85, 100),
+                   Animation.AnimationEasing.EaseOutCubic, 250);
+            anim.Animations.Add(new DevComponents.DotNetBar.Animation.AnimationRequest(this, "SubMenuEdgeWidthAnimated", 12, 0));
+            anim.AutoDispose = true;
+            story.Animations.Add(anim);
+            _CurrentStoryline = story;
+            story.Run();
+        }
+        protected internal override void OnSubItemExpandChange(BaseItem item)
+        {
+            NeedRecalcSize = true;
+            if (this.Expanded)
+            {
+                if (_CurrentStoryline == null || _CurrentStoryline.IsDisposed)
+                {
+                    WaitForCurrentAnimationToComplete();
+                    RunExpandItemAnimation();
+                }
+                else
+                    this.Invalidate();
+            }
+            HotSubItemInfoIndex = -1;
+            base.OnSubItemExpandChange(item);
+        }
+        private int _HotSubItemInfoIndex = -1;
+        private int HotSubItemInfoIndex
+        {
+            get { return _HotSubItemInfoIndex; }
+            set
+            {
+                if (_HotSubItemInfoIndex != value)
+                {
+                    _HotSubItemInfoIndex = value;
+                    this.Refresh();
+                }
+            }
+        }
+
+        private int _SubMenuEdgeWidthAnimated = 0;
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), EditorBrowsable(EditorBrowsableState.Never)]
+        public int SubMenuEdgeWidthAnimated
+        {
+            get { return _SubMenuEdgeWidthAnimated; }
+            set
+            {
+                if (_SubMenuEdgeWidthAnimated != value)
+                {
+                    _SubMenuEdgeWidthAnimated = value;
+                    this.Refresh();
+                }
+            }
+        }
+
+        protected internal override void OnContainerChanged(object objOldContainer)
+        {
+            object newContainer = this.ContainerControl;
+            SetContainerRecursevly(this, newContainer);
+            //base.OnContainerChanged(objOldContainer);
+        }
+        private void SetContainerRecursevly(BaseItem item, object newContainer)
+        {
+            foreach (BaseItem c in item.SubItems)
+            {
+                c.ContainerControl = newContainer;
+                SetContainerRecursevly(c, newContainer);
+            }
+        }
+
+        /// <summary>
+        /// Gets the current expanded subitem.
+        /// </summary>
+        /// <returns></returns>
+        protected internal override BaseItem ExpandedItem()
+        {
+            return GetExpandedItemRecursevly(this);
+        }
+        private BaseItem GetExpandedItemRecursevly(BaseItem item)
+        {
+            foreach (BaseItem sub in item.SubItems)
+            {
+                if (sub.Expanded)
+                {
+                    BaseItem inner = GetExpandedItemRecursevly(sub);
+                    if (inner != null) return inner;
+                    return sub;
+                }
+            }
+            return null;
+        }
+
+        private int _BackSymbolSize = 18;
+        /// <summary>
+        /// Indicates the size of the back symbol that is displayed on center of radial menu
+        /// </summary>
+        [DefaultValue(18), Browsable(false), Description("Indicates the size of the back symbol that is displayed on center of radial menu")]
+        public int BackButtonSymbolSize
+        {
+            get { return _BackSymbolSize; }
+            set
+            {
+                if (value != _BackSymbolSize)
+                {
+                    int oldValue = _BackSymbolSize;
+                    _BackSymbolSize = value;
+                    OnBackSymbolSizeChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when BackSymbolSize property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnBackSymbolSizeChanged(int oldValue, int newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("BackSymbolSize"));
+            this.Invalidate();
+        }
+
+        private string _BackSymbol = "\uf060";
+        /// <summary>
+        /// Specifies the back button symbol.
+        /// </summary>
+        [DefaultValue("\uf060"), Category("Appearance"), Description("Specifies the back button symbol.")]
+        [Editor("DevComponents.DotNetBar.Design.SymbolTypeEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor))]
+        public string BackButtonSymbol
+        {
+            get { return _BackSymbol; }
+            set
+            {
+                if (value != _BackSymbol)
+                {
+                    string oldValue = _BackSymbol;
+                    _BackSymbol = value;
+                    OnBackSymbolChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when BackSymbol property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnBackSymbolChanged(string oldValue, string newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("BackSymbol"));
+            this.Invalidate();
+        }
+
+        private eSymbolSet _BackButtonSymbolSet = eSymbolSet.Awesome;
+        /// <summary>
+        /// Gets or sets the symbol set used to represent the Symbol.
+        /// </summary>
+        [Browsable(false), DefaultValue(eSymbolSet.Awesome)]
+        public eSymbolSet BackButtonSymbolSet
+        {
+            get { return _BackButtonSymbolSet; }
+            set
+            {
+                if (_BackButtonSymbolSet != value)
+                {
+                    eSymbolSet oldValue = _BackButtonSymbolSet;
+                    _BackButtonSymbolSet = value;
+                    OnBackButtonSymbolSetChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when BackButtonSymbolSet property value changes.
+        /// </summary>
+        /// <param name="oldValue">Indciates old value</param>
+        /// <param name="newValue">Indicates new value</param>
+        protected virtual void OnBackButtonSymbolSetChanged(eSymbolSet oldValue, eSymbolSet newValue)
+        {
+            NeedRecalcSize = true;
+            OnAppearanceChanged();
+            this.Refresh();
+        }
+
+        private int _MaxItemPieAngle = 90;
+        /// <summary>
+        /// Specifies the maximum pie part angle an item will occupy. Maximum is 180, minimum is 1 degree.
+        /// </summary>
+        [DefaultValue(90), Category("Appearance"), Description("Specifies the maximum pie part angle an item will occupy. Maximum is 180, minimum is 1 degree.")]
+        public int MaxItemPieAngle
+        {
+            get { return _MaxItemPieAngle; }
+            set
+            {
+                if (value < 0) value = 90;
+                if (value > 180) value = 180;
+                if (value != _MaxItemPieAngle)
+                {
+                    int oldValue = _MaxItemPieAngle;
+                    _MaxItemPieAngle = value;
+                    OnMaxItemPieAngleChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when MaxItemPieAngle property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnMaxItemPieAngleChanged(int oldValue, int newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("MaxItemPieAngle"));
+            NeedRecalcSize = true;
+            this.Refresh();
+        }
+
+        private RadialMenuColorTable _Colors = null;
+        /// <summary>
+        /// Gets reference to colors used by the radial menu.
+        /// </summary>
+        [Category("Appearance"), Description("Gets reference to colors used by the radial menu."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public RadialMenuColorTable Colors
+        {
+            get
+            {
+                return _Colors;
+            }
+        }
+
+        internal static RadialMenuColorTable GetColorTable()
+        {
+            if (GlobalManager.Renderer is Office2007Renderer)
+                return ((Office2007Renderer)GlobalManager.Renderer).ColorTable.RadialMenu;
+            else
+                return null;
+        }
+
+        private eRadialMenuType _MenuType = eRadialMenuType.Segment;
+        /// <summary>
+        /// Indicates the radial menu type. eRadialMenuType.Radial menu type allows for display of image, text and any sub-menu items.
+        /// eRadialMenuType.Circular allows only for display of Symbol or Image and it does not display either text or sub-menu items. 
+        /// eRadialMenuType.Circular is designed to be used for single level menus only that don't need text.
+        /// </summary>
+        [DefaultValue(eRadialMenuType.Segment), Category("Appearance"), Description("Indicates the radial menu type.")]
+        public eRadialMenuType MenuType
+        {
+            get { return _MenuType; }
+            set
+            {
+                if (value != _MenuType)
+                {
+                    eRadialMenuType oldValue = _MenuType;
+                    _MenuType = value;
+                    OnMenuTypeChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when MenuType property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnMenuTypeChanged(eRadialMenuType oldValue, eRadialMenuType newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("MenuType"));
+            this.Refresh();
+        }
+
+        private Size _SymbolTextSize = Size.Empty;
+        /// <summary>
+        /// Gets the realized symbol string.
+        /// </summary>
+        [Browsable(false)]
+        public string SymbolRealized
+        {
+            get { return _SymbolRealized; }
+        }
+        private string _Symbol = "", _SymbolRealized = "";
+        /// <summary>
+        /// Indicates the symbol displayed on face of the button instead of the image. Setting the symbol overrides the image setting.
+        /// </summary>
+        [DefaultValue(""), Category("Appearance"), Description("Indicates the symbol displayed on face of the button instead of the image. Setting the symbol overrides the image setting.")]
+        [Editor("DevComponents.DotNetBar.Design.SymbolTypeEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor))]
+        public string Symbol
+        {
+            get { return _Symbol; }
+            set
+            {
+                if (value != _Symbol)
+                {
+                    string oldValue = _Symbol;
+                    _Symbol = value;
+                    OnSymbolChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when Symbol property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnSymbolChanged(string oldValue, string newValue)
+        {
+            if (string.IsNullOrEmpty(newValue))
+                _SymbolRealized = "";
+            else
+                _SymbolRealized = Symbols.GetSymbol(newValue);
+            //OnPropertyChanged(new PropertyChangedEventArgs("Symbol"));
+            _SymbolTextSize = Size.Empty;
+            NeedRecalcSize = true;
+            OnAppearanceChanged();
+            this.Refresh();
+        }
+
+        private eSymbolSet _SymbolSet = eSymbolSet.Awesome;
+        /// <summary>
+        /// Gets or sets the symbol set used to represent the Symbol.
+        /// </summary>
+        [Browsable(false), DefaultValue(eSymbolSet.Awesome)]
+        public eSymbolSet SymbolSet
+        {
+            get { return _SymbolSet; }
+            set
+            {
+                if (_SymbolSet != value)
+                {
+                    eSymbolSet oldValue = _SymbolSet;
+                    _SymbolSet = value;
+                    OnSymbolSetChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when SymbolSet property value changes.
+        /// </summary>
+        /// <param name="oldValue">Indciates old value</param>
+        /// <param name="newValue">Indicates new value</param>
+        protected virtual void OnSymbolSetChanged(eSymbolSet oldValue, eSymbolSet newValue)
+        {
+            NeedRecalcSize = true;
+            OnAppearanceChanged();
+            this.Refresh();
+        }
+
+        private float _SymbolSize = 0f;
+        /// <summary>
+        /// Indicates the size of the symbol in points.
+        /// </summary>
+        [DefaultValue(0f), Category("Appearance"), Description("Indicates the size of the symbol in points.")]
+        public float SymbolSize
+        {
+            get { return _SymbolSize; }
+            set
+            {
+                if (value != _SymbolSize)
+                {
+                    float oldValue = _SymbolSize;
+                    _SymbolSize = value;
+                    OnSymbolSizeChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when SymbolSize property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnSymbolSizeChanged(float oldValue, float newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("SymbolSize"));
+            _SymbolTextSize = Size.Empty;
+            NeedRecalcSize = true;
+            OnAppearanceChanged();
+            this.Refresh();
+        }
+
+        private Image _Image;
+        /// <summary>
+        /// Gets or sets the image displayed on the item.
+        /// </summary>
+        [DefaultValue(null), Category("Appearance"), Description("Indicates image displayed on the item.")]
+        public Image Image
+        {
+            get { return _Image; }
+            set
+            {
+                if (value != _Image)
+                {
+                    Image oldValue = _Image;
+                    _Image = value;
+                    OnImageChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when Image property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnImageChanged(Image oldValue, Image newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("Image"));
+            NeedRecalcSize = true;
+            OnAppearanceChanged();
+            this.Refresh();
+        }
+
+        #region RadialSubItemInfo
+        private class RadialSubItemInfo
+        {
+            /// <summary>
+            /// Initializes a new instance of the RadialSubItemInfo class.
+            /// </summary>
+            /// <param name="path"></param>
+            /// <param name="signPath"></param>
+            /// <param name="itemAngle"></param>
+            /// <param name="itemPieAngle"></param>
+            public RadialSubItemInfo(GraphicsPath path, GraphicsPath signPath, int itemAngle, int itemPieAngle)
+            {
+                Path = path;
+                SignPath = signPath;
+                ItemAngle = itemAngle;
+                ItemPieAngle = itemPieAngle;
+            }
+            public GraphicsPath Path;
+            public GraphicsPath SignPath;
+            public int ItemAngle;
+            public int ItemPieAngle;
+
+            public void Dispose()
+            {
+                if (Path != null)
+                    Path.Dispose();
+                if (SignPath != null)
+                    SignPath.Dispose();
+                Path = null;
+            }
+        }
+        #endregion
+        #endregion
+
+        #region RadialMenuPopupProxy
+        private class RadialMenuPopupProxy : PopupItem
+        {
+            internal RadialMenuContainer _ParentRadialMenu = null;
+            /// <summary>
+            /// Initializes a new instance of the RadialMenuPopupProxy class.
+            /// </summary>
+            /// <param name="parentRadialMenu"></param>
+            public RadialMenuPopupProxy(RadialMenuContainer parentRadialMenu)
+            {
+                _ParentRadialMenu = parentRadialMenu;
+            }
+            protected internal override bool IsAnyOnHandle(IntPtr iHandle)
+            {
+                if (_ParentRadialMenu._Popup != null && _ParentRadialMenu._Popup.Handle == iHandle)
+                    return true;
+                return false;
+            }
+            private bool _Expanded = false;
+            public override bool Expanded
+            {
+                get
+                {
+                    return _Expanded;
+                }
+                set
+                {
+                    if (_Expanded != value)
+                    {
+                        _Expanded = value;
+                        if (!_Expanded && _ParentRadialMenu.Expanded)
+                            _ParentRadialMenu.Expanded = false;
+                    }
+                }
+            }
+            public override void Paint(ItemPaintArgs p)
+            {
+            }
+            public override BaseItem Copy()
+            {
+                return new RadialMenuPopupProxy(_ParentRadialMenu);
+            }
+        }
+
+        private Font _Font;
+        /// <summary>
+        /// Specifies font for menu items.
+        /// </summary>
+        [DefaultValue(null), Description("Specifies font for menu items."), Category("Appearance")]
+        public Font Font
+        {
+            get { return _Font; }
+            set
+            {
+                if (value != _Font)
+                {
+                    Font oldValue = _Font;
+                    _Font = value;
+                    OnFontChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when Font property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnFontChanged(Font oldValue, Font newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("Font"));
+            if (_Popup != null && this.Expanded) _Popup.Invalidate();
+        }
+        #endregion
+    }
+
+    /// <summary>
+    /// Defines available radial menu type.
+    /// </summary>
+    public enum eRadialMenuType
+    {
+        Segment,
+        Circular
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/RadialMenu/RadialMenuItem.cs b/PROMS/DotNetBar Source Code/RadialMenu/RadialMenuItem.cs
new file mode 100644
index 00000000..a0f0fafe
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/RadialMenu/RadialMenuItem.cs	
@@ -0,0 +1,946 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing.Drawing2D;
+using System.Drawing;
+using System.ComponentModel;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.Rendering;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Defines Radial Menu Item.
+    /// </summary>
+    [ToolboxItem(false), DesignTimeVisible(false), Designer("DevComponents.DotNetBar.Design.RadialMenuItemDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+    public class RadialMenuItem : BaseItem
+    {
+        #region Constructor
+        protected override void Dispose(bool disposing)
+        {
+            if (_DisplayPath != null)
+            {
+                _DisplayPath.Dispose();
+                _DisplayPath = null;
+            }
+            base.Dispose(disposing);
+        }
+        #endregion
+
+        #region Events
+        /// <summary>
+        /// Occurs after Checked property has changed.
+        /// </summary>
+        [Description("Occurs after Checked property has changed.")]
+        public event EventHandler CheckedChanged;
+        /// <summary>
+        /// Raises CheckedChanged event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnCheckedChanged(EventArgs e)
+        {
+            EventHandler handler = CheckedChanged;
+            if (handler != null)
+                handler(this, e);
+        }
+        #endregion
+
+        #region Implementation
+        public override void Paint(ItemPaintArgs p)
+        {
+            Image image = (this.Enabled || _DisabledImage == null) ? _Image : _DisabledImage;
+            if (string.IsNullOrEmpty(this.Text) && string.IsNullOrEmpty(this.SymbolRealized) && image == null) return; // This is just spacer item
+
+            if ((eRadialMenuType)p.ContextData2 == eRadialMenuType.Circular)
+            {
+                PaintCircularItem(p);
+                return;
+            }
+
+            Graphics g = p.Graphics;
+
+            RadialMenuColorTable renderTable = RadialMenuContainer.GetColorTable();
+            RadialMenuColorTable localTable = (RadialMenuColorTable)p.ContextData;
+
+            Color foreColor = ColorScheme.GetColor(0x2B579A);
+            Color mouseOverColor = Color.FromArgb(72, foreColor);
+
+            if (!this.Enabled &&
+                (!localTable.RadialMenuItemDisabledForeground.IsEmpty ||
+                 renderTable != null && !renderTable.RadialMenuItemDisabledForeground.IsEmpty))
+            {
+                if (!localTable.RadialMenuItemDisabledForeground.IsEmpty)
+                    foreColor = localTable.RadialMenuItemDisabledForeground;
+                else if (renderTable != null && !renderTable.RadialMenuItemDisabledForeground.IsEmpty)
+                    foreColor = renderTable.RadialMenuItemDisabledForeground;
+            }
+            else if (_IsMouseOver && _TracksMouse && (!localTable.RadialMenuItemMouseOverForeground.IsEmpty || renderTable != null && !renderTable.RadialMenuItemMouseOverForeground.IsEmpty))
+            {
+                if (!localTable.RadialMenuItemMouseOverForeground.IsEmpty)
+                    foreColor = localTable.RadialMenuItemMouseOverForeground;
+                else if (renderTable != null && !renderTable.RadialMenuItemMouseOverForeground.IsEmpty)
+                    foreColor = renderTable.RadialMenuItemMouseOverForeground;
+            }
+            else
+            {
+                if (!localTable.RadialMenuItemForeground.IsEmpty)
+                    foreColor = localTable.RadialMenuItemForeground;
+                else if (renderTable != null && !renderTable.RadialMenuItemForeground.IsEmpty)
+                    foreColor = renderTable.RadialMenuItemForeground;
+            }
+
+            if (!localTable.RadialMenuItemMouseOverBackground.IsEmpty)
+                mouseOverColor = localTable.RadialMenuItemMouseOverBackground;
+            else if (renderTable != null && !renderTable.RadialMenuItemMouseOverBackground.IsEmpty)
+                mouseOverColor = renderTable.RadialMenuItemMouseOverBackground;
+
+            Size imageSize = Size.Empty;
+            Size itemSize = Size.Empty;
+            if (!string.IsNullOrEmpty(_SymbolRealized))
+            {
+                imageSize = _SymbolTextSize;
+            }
+            else if (image != null)
+            {
+                imageSize = image.Size;
+                if(this.Parent is RadialMenuContainer)
+                {
+                    RadialMenuContainer cont = (RadialMenuContainer)this.Parent;
+                    imageSize.Width = (int)(imageSize.Width * cont.ScaleFactor.Width);
+                    imageSize.Height = (int)(imageSize.Height * cont.ScaleFactor.Height);
+                }
+            }
+            itemSize = imageSize;
+            if (!string.IsNullOrEmpty(Text) && _TextVisible)
+            {
+                itemSize.Width = Math.Max(itemSize.Width, _TextSize.Width);
+                itemSize.Height += _TextSize.Height + 1;
+            }
+            itemSize.Width += 2; // Padding
+            itemSize.Height += 2;
+
+            if (_IsMouseOver && _TracksMouse)
+            {
+                using (SolidBrush brush = new SolidBrush(mouseOverColor))
+                    g.FillPath(brush, _DisplayPath);
+            }
+
+
+            // Calculate position for image/Symbol
+            // Position item along the imaginary inner circle
+            Rectangle innerCircle = _OutterBounds;
+            innerCircle.Width -= itemSize.Width;
+            innerCircle.Height -= itemSize.Height;
+            innerCircle.Inflate(-2, -2); // Pad it
+            if (innerCircle.Width < _CenterBounds.Width) innerCircle.Inflate((_CenterBounds.Width - innerCircle.Width) / 2, 0);
+            if (innerCircle.Height < _CenterBounds.Height) innerCircle.Inflate(0, (_CenterBounds.Height - innerCircle.Height) / 2);
+            Point imageLoc = new Point(innerCircle.X + (int)((innerCircle.Width / 2) * Math.Cos((_ItemAngle + _ItemPieAngle / 2) * (Math.PI / 180))),
+                innerCircle.Y + (int)((innerCircle.Height / 2) * Math.Sin((_ItemAngle + _ItemPieAngle / 2) * (Math.PI / 180))));
+            imageLoc.Offset(innerCircle.Width / 2, innerCircle.Height / 2);
+
+            if (!string.IsNullOrEmpty(_SymbolRealized))
+            {
+                TextDrawing.DrawStringLegacy(g, _SymbolRealized, Symbols.GetFont(this.SymbolSize, this.SymbolSet),
+                    foreColor, new Rectangle(imageLoc.X + itemSize.Width / 2, imageLoc.Y + 2, 0, 0), eTextFormat.HorizontalCenter);
+            }
+            else if (image != null)
+            {
+                if (g.DpiX != 96f || g.DpiY != 96f)
+                {
+                    float scaleX = g.DpiX / 96f;
+                    float scaleY = g.DpiY / 96f;
+                    g.DrawImage(image, imageLoc.X + (itemSize.Width - imageSize.Width) / 2, imageLoc.Y, image.Width * scaleX, image.Height * scaleY);
+                }
+                else
+                    g.DrawImage(image, imageLoc.X + (itemSize.Width - imageSize.Width) / 2, imageLoc.Y, image.Width, image.Height);
+            }
+
+            if (!string.IsNullOrEmpty(Text) && _TextVisible)
+            {
+                TextDrawing.DrawString(g, GetText(this.Text), p.Font, foreColor, imageLoc.X + itemSize.Width / 2 + _TextOffset.X, imageLoc.Y + imageSize.Height + 3 + _TextOffset.Y, eTextFormat.HorizontalCenter);
+            }
+
+            if (_Checked)
+            {
+                using (Pen pen = new Pen(foreColor, 2))
+                    g.DrawArc(pen, _OutterBounds, _ItemAngle, _ItemPieAngle);
+            }
+        }
+
+        protected override void OnClick()
+        {
+            base.OnClick();
+            ExecuteCommand();
+        }
+
+        private void PaintCircularItem(ItemPaintArgs p)
+        {
+            Graphics g = p.Graphics;
+
+            RadialMenuColorTable renderTable = RadialMenuContainer.GetColorTable();
+            RadialMenuColorTable localTable = (RadialMenuColorTable)p.ContextData;
+
+            Color backColor = ColorScheme.GetColor(0xD44F2E);
+            Color foreColor = Color.White;
+            Color borderColor = Color.White;
+
+            if (!_CircularForeColor.IsEmpty)
+                foreColor = _CircularForeColor;
+            else if (!localTable.CircularForeColor.IsEmpty)
+                foreColor = localTable.CircularForeColor;
+            else if (renderTable != null && !renderTable.CircularForeColor.IsEmpty)
+                foreColor = renderTable.CircularForeColor;
+
+            if (!_CircularBackColor.IsEmpty)
+                backColor = _CircularBackColor;
+            else if (!localTable.CircularBackColor.IsEmpty)
+                backColor = localTable.CircularBackColor;
+            else if (renderTable != null && !renderTable.CircularBackColor.IsEmpty)
+                backColor = renderTable.CircularBackColor;
+
+            if (!_CircularBorderColor.IsEmpty)
+                borderColor = _CircularBorderColor;
+            else if (!localTable.CircularBorderColor.IsEmpty)
+                borderColor = localTable.CircularBorderColor;
+            else if (renderTable != null && !renderTable.CircularBorderColor.IsEmpty)
+                borderColor = renderTable.CircularBorderColor;
+
+            Color mouseOverColor = Color.FromArgb(192, backColor);
+
+            if (_TracksMouse && _IsMouseOver)
+                backColor = mouseOverColor;
+
+            Size imageSize = Size.Empty;
+            if (!string.IsNullOrEmpty(_SymbolRealized))
+            {
+                imageSize = new Size(_SymbolTextSize.Height, _SymbolTextSize.Height); // For consistency use height as guideline
+            }
+            else if (_Image != null)
+            {
+                imageSize = _Image.Size;
+            }
+
+            if (imageSize.Width > imageSize.Height)
+                imageSize.Height = imageSize.Width;
+            else if (imageSize.Height > imageSize.Width)
+                imageSize.Width = imageSize.Height;
+
+            imageSize.Width = (int)Math.Sqrt((Math.Pow(imageSize.Width, 2) + Math.Pow(imageSize.Height, 2)));
+            imageSize.Height = imageSize.Width;
+
+            imageSize.Width += 1;
+            imageSize.Height += 1;
+            int circularMenuDiameter = Dpi.Width(_CircularMenuDiameter);
+            if (circularMenuDiameter > 0)
+            {
+                imageSize.Width = circularMenuDiameter;
+                imageSize.Height = circularMenuDiameter;
+            }
+
+            // Calculate position for image/Symbol
+            // Position item along the imaginary inner circle
+            Rectangle innerCircle = _OutterBounds;
+            innerCircle.Inflate(-1, -1);
+            innerCircle.Inflate(-imageSize.Width, -imageSize.Height);
+            if (innerCircle.Width < _CenterBounds.Width) innerCircle.Inflate((_CenterBounds.Width - innerCircle.Width) / 2, 0);
+            if (innerCircle.Height < _CenterBounds.Height) innerCircle.Inflate(0, (_CenterBounds.Height - innerCircle.Height) / 2);
+            Point imageLoc = new Point(innerCircle.X + (int)((innerCircle.Width / 2) * Math.Cos((_ItemAngle + _ItemPieAngle / 2) * (Math.PI / 180))),
+                innerCircle.Y + (int)((innerCircle.Height / 2) * Math.Sin((_ItemAngle + _ItemPieAngle / 2) * (Math.PI / 180))));
+            imageLoc.Offset(innerCircle.Width/2, innerCircle.Height/2);
+            Rectangle r = new Rectangle(imageLoc, Size.Empty);
+            r.Inflate(imageSize);
+            r.Inflate(-1, -1);
+            //if (this.Parent is RadialMenuContainer)
+            //{
+            //    r.Width = (int)(r.Width * ((RadialMenuContainer)this.Parent).ScaleFactor.Width);
+            //    r.Height = (int)(r.Height * ((RadialMenuContainer)this.Parent).ScaleFactor.Width);
+            //}
+
+            if (backColor.A < 255)
+                g.FillEllipse(Brushes.White, r);
+            using (SolidBrush brush = new SolidBrush(backColor))
+                g.FillEllipse(brush, r);
+            r.Inflate(1, 1);
+            using (Pen pen = new Pen(borderColor, 3))
+                g.DrawEllipse(pen, r);
+
+            if (!string.IsNullOrEmpty(_SymbolRealized))
+            {
+                TextDrawing.DrawStringLegacy(g, _SymbolRealized, Symbols.GetFont(this.SymbolSize, this.SymbolSet),
+                    foreColor, new RectangleF(r.X + r.Width / 2, r.Y + r.Height / 2 + 2, 0, 0), eTextFormat.HorizontalCenter | eTextFormat.VerticalCenter | eTextFormat.SingleLine);
+            }
+            else if (_Image != null)
+            {
+                ImageHelper.DrawImageCenteredDpiAware(g, _Image, r);
+                //g.DrawImage(_Image, r.X + (r.Width - _Image.Width) / 2, r.Y + (r.Height - _Image.Height) / 2);
+            }
+        }
+        
+        private Size _SymbolTextSize = Size.Empty;
+        private Size _TextSize = Size.Empty;
+        public override void RecalcSize()
+        {
+            _SymbolTextSize = Size.Empty;
+            _TextSize = Size.Empty;
+
+            Control c = this.ContainerControl as Control;
+            if (c == null || !BarFunctions.IsHandleValid(c)) return;
+
+            Graphics g = BarFunctions.CreateGraphics(c);
+            if (g == null) return;
+
+            try
+            {
+                if (!string.IsNullOrEmpty(_SymbolRealized))
+                {
+                    Font symFont = Symbols.GetFont(_SymbolSize, _SymbolSet);
+                    _SymbolTextSize = TextDrawing.MeasureStringLegacy(g, _SymbolRealized, Symbols.GetFont(this.SymbolSize, this.SymbolSet), Size.Empty, eTextFormat.Default);
+                    int descent = (int)Math.Ceiling((symFont.FontFamily.GetCellDescent(symFont.Style) *
+                    symFont.Size / symFont.FontFamily.GetEmHeight(symFont.Style)));
+                    _SymbolTextSize.Height -= descent;
+                    //_SymbolTextSize.Width += 4; // Add some padding
+                    //_SymbolTextSize.Height += 4; // Add some padding
+                }
+                if (!string.IsNullOrEmpty(Text) && _TextVisible)
+                {
+                    string text = GetText(this.Text);
+                    _TextSize = TextDrawing.MeasureString(g, text, c.Font, Size.Empty, eTextFormat.Default);
+                    _TextSize.Width += 2; // Add some padding
+                }
+            }
+            finally
+            {
+                g.Dispose();
+            }
+
+            base.RecalcSize();
+        }
+
+        private string GetText(string text)
+        {
+            if (text.Contains("\\r\\n")) text = text.Replace("\\r\\n", "\r\n"); // Escaped by designer fix it
+            return text;
+        }
+        private GraphicsPath _DisplayPath;
+        /// <summary>
+        /// Gets display path of the item.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public GraphicsPath DisplayPath
+        {
+            get { return _DisplayPath; }
+            internal set
+            {
+                if (value != _DisplayPath)
+                {
+                    GraphicsPath oldValue = _DisplayPath;
+                    _DisplayPath = value;
+                    OnDisplayPathChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when DisplayPath property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnDisplayPathChanged(GraphicsPath oldValue, GraphicsPath newValue)
+        {
+            if (oldValue != null && oldValue != newValue) oldValue.Dispose();
+            //this.Refresh();
+            //OnPropertyChanged(new PropertyChangedEventArgs("DisplayPath"));
+        }
+
+        /// <summary>
+        /// Returns copy of the item.
+        /// </summary>
+        public override BaseItem Copy()
+        {
+            RadialMenuItem copy = new RadialMenuItem();
+            this.CopyToItem(copy);
+            return copy;
+        }
+
+        /// <summary>
+        /// Copies the RadialMenuItem specific properties to new instance of the item.
+        /// </summary>
+        /// <param name="copy">New ProgressBarItem instance.</param>
+        internal void InternalCopyToItem(RadialMenuItem copy)
+        {
+            CopyToItem(copy);
+        }
+
+        /// <summary>
+        /// Copies the RadialMenuItem specific properties to new instance of the item.
+        /// </summary>
+        /// <param name="copy">New RadialMenuItem instance.</param>
+        protected override void CopyToItem(BaseItem copy)
+        {
+            base.CopyToItem(copy);
+
+            RadialMenuItem item = copy as RadialMenuItem;
+            item.Checked = _Checked;
+            item.Symbol = _Symbol;
+            item.SymbolSet = _SymbolSet;
+            item.SymbolSize = _SymbolSize;
+            item.TextVisible = _TextVisible;
+            item.TracksMouse = _TracksMouse;
+            item.CircularBackColor = _CircularBackColor;
+            item.CircularBorderColor = _CircularBorderColor;
+            item.CircularForeColor = _CircularForeColor;
+            item.CircularMenuDiameter = _CircularMenuDiameter;
+            item.Image = _Image;
+        }
+
+        /// <summary>
+        /// Gets the realized symbol string.
+        /// </summary>
+        [Browsable(false)]
+        public string SymbolRealized
+        {
+            get { return _SymbolRealized; }
+        }
+        private string _Symbol = "", _SymbolRealized = "";
+        /// <summary>
+        /// Indicates the symbol displayed on face of the button instead of the image. Setting the symbol overrides the image setting.
+        /// </summary>
+        [DefaultValue(""), Category("Appearance"), Description("Indicates the symbol displayed on face of the button instead of the image. Setting the symbol overrides the image setting.")]
+        [Editor("DevComponents.DotNetBar.Design.SymbolTypeEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor))]
+        public string Symbol
+        {
+            get { return _Symbol; }
+            set
+            {
+                if (value != _Symbol)
+                {
+                    string oldValue = _Symbol;
+                    _Symbol = value;
+                    OnSymbolChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when Symbol property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnSymbolChanged(string oldValue, string newValue)
+        {
+            if (string.IsNullOrEmpty(newValue))
+                _SymbolRealized = "";
+            else
+                _SymbolRealized = Symbols.GetSymbol(newValue);
+            //OnPropertyChanged(new PropertyChangedEventArgs("Symbol"));
+            NeedRecalcSize = true;
+            OnAppearanceChanged();
+            this.Refresh();
+        }
+
+        private eSymbolSet _SymbolSet = eSymbolSet.Awesome;
+        /// <summary>
+        /// Gets or sets the symbol set used to represent the Symbol.
+        /// </summary>
+        [Browsable(false), DefaultValue(eSymbolSet.Awesome)]
+        public eSymbolSet SymbolSet
+        {
+            get { return _SymbolSet; }
+            set
+            {
+                if (_SymbolSet != value)
+                {
+                    eSymbolSet oldValue = _SymbolSet;
+                    _SymbolSet = value;
+                    OnSymbolSetChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when SymbolSet property value changes.
+        /// </summary>
+        /// <param name="oldValue">Indciates old value</param>
+        /// <param name="newValue">Indicates new value</param>
+        protected virtual void OnSymbolSetChanged(eSymbolSet oldValue, eSymbolSet newValue)
+        {
+            NeedRecalcSize = true;
+            OnAppearanceChanged();
+            this.Refresh();
+        }
+
+        private float _SymbolSize = 0f;
+        /// <summary>
+        /// Indicates the size of the symbol in points.
+        /// </summary>
+        [DefaultValue(0f), Category("Appearance"), Description("Indicates the size of the symbol in points.")]
+        public float SymbolSize
+        {
+            get { return _SymbolSize; }
+            set
+            {
+                if (value != _SymbolSize)
+                {
+                    float oldValue = _SymbolSize;
+                    _SymbolSize = value;
+                    OnSymbolSizeChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when SymbolSize property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnSymbolSizeChanged(float oldValue, float newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("SymbolSize"));
+            NeedRecalcSize = true;
+            OnAppearanceChanged();
+            this.Refresh();
+        }
+
+        private Image _Image;
+        /// <summary>
+        /// Gets or sets the image displayed on the item.
+        /// </summary>
+        [DefaultValue(null), Category("Appearance"), Description("Indicates image displayed on the item.")]
+        public Image Image
+        {
+            get { return _Image; }
+            set
+            {
+                if (value != _Image)
+                {
+                    Image oldValue = _Image;
+                    _Image = value;
+                    OnImageChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when Image property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnImageChanged(Image oldValue, Image newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("Image"));
+            NeedRecalcSize = true;
+            OnAppearanceChanged();
+            this.Refresh();
+        }
+
+        private Image _DisabledImage;
+        /// <summary>
+        /// Gets or sets the disabled image for the item when Enabled is set to false.
+        /// </summary>
+        [DefaultValue(null), Category("Appearance"), Description("Indicates disabled image displayed on the item when Enabled is set to false.")]
+        public Image DisabledImage
+        {
+            get { return _DisabledImage; }
+            set
+            {
+                if (value != _DisabledImage)
+                {
+                    Image oldValue = _DisabledImage;
+                    _DisabledImage = value;
+                    OnDisabledImageChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when DisabledImage property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnDisabledImageChanged(Image oldValue, Image newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("Image"));
+            NeedRecalcSize = true;
+            OnAppearanceChanged();
+            this.Refresh();
+        }
+
+        private Rectangle _OutterBounds;
+        internal Rectangle OutterBounds
+        {
+            get { return _OutterBounds; }
+            set { _OutterBounds = value; }
+        }
+
+        private Rectangle _CenterBounds;
+        internal Rectangle CenterBounds
+        {
+            get { return _CenterBounds; }
+            set { _CenterBounds = value; }
+        }
+
+        private int _ItemAngle;
+        internal int ItemAngle
+        {
+            get { return _ItemAngle; }
+            set { _ItemAngle = value; }
+        }
+
+        private int _ItemPieAngle;
+        internal int ItemPieAngle
+        {
+            get { return _ItemPieAngle; }
+            set { _ItemPieAngle = value; }
+        }
+
+        private bool _TextVisible = true;
+        /// <summary>
+        /// Indicates whether text on item is visible.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance"), Description("Indicates whether text on item is visible")]
+        public bool TextVisible
+        {
+            get { return _TextVisible; }
+            set
+            {
+                if (value != _TextVisible)
+                {
+                    bool oldValue = _TextVisible;
+                    _TextVisible = value;
+                    OnTextVisibleChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when TextVisible property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnTextVisibleChanged(bool oldValue, bool newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("TextVisible"));
+            NeedRecalcSize = true;
+            OnAppearanceChanged();
+            this.Refresh();
+        }
+
+        public override void InternalMouseMove(MouseEventArgs objArg)
+        {
+            if (!_IsMouseOver)
+                IsMouseOver = true;
+            base.InternalMouseMove(objArg);
+        }
+
+        public override void InternalMouseLeave()
+        {
+            if (_IsMouseOver)
+                IsMouseOver = false;
+            base.InternalMouseLeave();
+        }
+
+        private bool _IsMouseOver;
+        /// <summary>
+        /// Gets whether mouse is over the item.
+        /// </summary>
+        [Browsable(false)]
+        public bool IsMouseOver
+        {
+            get { return _IsMouseOver; }
+            internal set
+            {
+                _IsMouseOver = value;
+                OnIsMouseOverChanged();
+            }
+        }
+
+        protected virtual void OnIsMouseOverChanged()
+        {
+            this.Refresh();
+        }
+
+        private bool _TracksMouse = true;
+        /// <summary>
+        /// Indicates whether item changes its appearance when mouse is over it or pressed
+        /// </summary>
+        [DefaultValue(true), Description("Indicates whether item changes its appearance when mouse is over it or pressed"), Category("Behavior")]
+        public bool TracksMouse
+        {
+            get { return _TracksMouse; }
+            set
+            {
+                if (value != _TracksMouse)
+                {
+                    bool oldValue = _TracksMouse;
+                    _TracksMouse = value;
+                    OnTracksMouseChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when TracksMouse property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnTracksMouseChanged(bool oldValue, bool newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("TracksMouse"));
+
+        }
+
+        protected internal override void OnExpandChange()
+        {
+            NeedRecalcSize = true;
+            if (!this.Expanded && HotSubItem != null) HotSubItem.InternalMouseLeave();
+            base.OnExpandChange();
+        }
+
+        private bool _Checked = false;
+        /// <summary>
+        /// Indicates whether item is in checked state.
+        /// </summary>
+        [DefaultValue(false), Category("Appearance"), Description("Indicates whether item is in checked state.")]
+        public bool Checked
+        {
+            get { return _Checked; }
+            set
+            {
+                if (value != _Checked)
+                {
+                    bool oldValue = _Checked;
+                    _Checked = value;
+                    OnCheckedChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when Checked property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnCheckedChanged(bool oldValue, bool newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("Checked"));
+            OnCheckedChanged(EventArgs.Empty);
+            this.Refresh();
+        }
+
+        protected internal override void OnSubItemExpandChange(BaseItem item)
+        {
+            if (this.Parent != null)
+                this.Parent.OnSubItemExpandChange(item); // Pass it up the chain
+            base.OnSubItemExpandChange(item);
+        }
+
+        private Point _TextOffset = Point.Empty;
+        /// <summary>
+        /// Gets or sets the optional text offset for the item.
+        /// </summary>
+        [Category("Appearance"), Description("Specifies optional text offset.")]
+        public Point TextOffset
+        {
+            get { return _TextOffset; }
+            set
+            {
+                if (value != _TextOffset)
+                {
+                    Point oldValue = _TextOffset;
+                    _TextOffset = value;
+                    OnTextOffsetChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when TextOffset property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnTextOffsetChanged(Point oldValue, Point newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("TextOffset"));
+            //NeedRecalcSize = true;
+            this.Invalidate();
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeTextOffset()
+        {
+            return !_TextOffset.IsEmpty;
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetTextOffset()
+        {
+            TextOffset = Point.Empty;
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the item is expanded or not. For Popup items this would indicate whether the item is popped up or not.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), System.ComponentModel.DefaultValue(false), System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
+        public override bool Expanded
+        {
+            get { return base.Expanded; }
+
+            set
+            {
+                if (base.Expanded != value)
+                {
+                    if (value)
+                        OnBeforeMenuOpened(EventArgs.Empty);
+                    else
+                        OnBeforeMenuClosed(EventArgs.Empty);
+
+                    base.Expanded = value;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Occurs before radial menu item is expanded and its sub-items displayed.
+        /// </summary>
+        [Description("Occurs before radial menu item is expanded and its sub-items displayed.")]
+        public event EventHandler BeforeMenuOpened;
+        /// <summary>
+        /// Raises BeforeMenuOpened event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnBeforeMenuOpened(EventArgs e)
+        {
+            EventHandler handler = BeforeMenuOpened;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        /// <summary>
+        /// Occurs before radial menu item is closed
+        /// </summary>
+        [Description("Occurs before radial menu item is closed.")]
+        public event EventHandler BeforeMenuClosed;
+        /// <summary>
+        /// Raises BeforeMenuClosed event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnBeforeMenuClosed(EventArgs e)
+        {
+            EventHandler handler = BeforeMenuClosed;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        /// <summary>
+        /// Control Container (System.Windows.Forms.Control or its descendant)
+        /// </summary>
+        [System.ComponentModel.Browsable(false), System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
+        public override object ContainerControl
+        {
+            get { return GetContainerControl(false); }
+            set { base.ContainerControl = value; }
+        }
+
+        #region Circular Menu
+        private int _CircularMenuDiameter = 0;
+        /// <summary>
+        /// Specifies explicit circular menu type diameter. Applies to circular menu type only.
+        /// </summary>
+        [DefaultValue(0), Category("Appearance"), Description("Specifies explicit circular menu type diameter. Applies to circular menu type only.")]
+        public int CircularMenuDiameter
+        {
+            get { return _CircularMenuDiameter; }
+            set
+            {
+                if (value < 0) value = 0;
+                if (value != _CircularMenuDiameter)
+                {
+                    int oldValue = _CircularMenuDiameter;
+                    _CircularMenuDiameter = value;
+                    OnCircularMenuDiameterChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when CircularMenuDiameter property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnCircularMenuDiameterChanged(int oldValue, int newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("CircularMenuDiameter"));
+            this.Refresh();
+        }
+
+        private Color _CircularBackColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets background color of the circular menu item type. Applies only to circular menu types.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates background color of the circular menu item type.")]
+        public Color CircularBackColor
+        {
+            get { return _CircularBackColor; }
+            set { _CircularBackColor = value; this.Invalidate(); /*OnPropertyChanged("CircularBackColor");*/ }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeCircularBackColor()
+        {
+            return !_CircularBackColor.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetCircularBackColor()
+        {
+            this.CircularBackColor = Color.Empty;
+        }
+
+        private Color _CircularForeColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets text color of the circular menu item type. Applies only to circular menu types.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates text color of the circular menu item type.")]
+        public Color CircularForeColor
+        {
+            get { return _CircularForeColor; }
+            set { _CircularForeColor = value; this.Invalidate(); /*OnPropertyChanged("CircularForeColor");*/ }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeCircularForeColor()
+        {
+            return !_CircularForeColor.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetCircularForeColor()
+        {
+            this.CircularForeColor = Color.Empty;
+        }
+
+        private Color _CircularBorderColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets border color of the circular menu item type. Applies only to circular menu types.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates border color of the circular menu item type.")]
+        public Color CircularBorderColor
+        {
+            get { return _CircularBorderColor; }
+            set { _CircularBorderColor = value; this.Invalidate(); /*OnPropertyChanged("CircularBorderColor");*/ }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeCircularBorderColor()
+        {
+            return !_CircularBorderColor.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetCircularBorderColor()
+        {
+            this.CircularBorderColor = Color.Empty;
+        }
+        #endregion
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/RadialMenu/RadialMenuPopup.cs b/PROMS/DotNetBar Source Code/RadialMenu/RadialMenuPopup.cs
new file mode 100644
index 00000000..2c87f025
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/RadialMenu/RadialMenuPopup.cs	
@@ -0,0 +1,377 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows.Forms;
+using System.Drawing;
+using System.ComponentModel;
+using System.Drawing.Imaging;
+using DevComponents.DotNetBar.Rendering;
+
+namespace DevComponents.DotNetBar
+{
+    [ToolboxItem(false)]
+    public class RadialMenuPopup : Control
+    {
+        #region Constructor
+        /// <summary>
+        /// Initializes a new instance of the RadialMenuPopup class.
+        /// </summary>
+        public RadialMenuPopup()
+        {
+            //this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.Text = "RadialMenuPopup";
+            //this.ShowInTaskbar = false;
+            this.SetStyle(ControlStyles.Selectable, false);
+            //this.StartPosition = FormStartPosition.Manual;
+            //this.TopMost = true;
+        }
+        protected override void OnLocationChanged(EventArgs e)
+        {
+            base.OnLocationChanged(e);
+        }
+        #endregion
+
+        #region Implementation
+        private bool _Painting = false;
+        protected override void OnInvalidated(InvalidateEventArgs e)
+        {
+            if (!this.IsHandleCreated || this.IsDisposed || _DisplayItem == null || _Painting) return;
+            _Painting = true;
+            try
+            {
+                if (_DisplayItem.NeedRecalcSize)
+                    _DisplayItem.RecalcSize();
+                Bitmap oldContent = this.ContentImage;
+                Bitmap b = null;
+                bool clearBitmap = false;
+                if (oldContent != null && oldContent.Width == _DisplayItem.WidthInternal && oldContent.Height == _DisplayItem.HeightInternal)
+                {
+                    b = oldContent;
+                    clearBitmap = true;
+                }
+                else
+                {
+                    if (oldContent != null) oldContent.Dispose();
+                    b = new Bitmap(_DisplayItem.WidthInternal, _DisplayItem.HeightInternal, PixelFormat.Format32bppArgb);
+                }
+
+                using (Graphics g = Graphics.FromImage(b))
+                {
+                    if (clearBitmap) g.Clear(Color.Transparent);
+                    g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.HighQuality;
+                    g.TextRenderingHint = DisplayHelp.AntiAliasTextRenderingHint;
+                    ItemPaintArgs p = GetItemPaintArgs(g);
+                    _DisplayItem.Paint(p);
+                }
+                this.ContentImage = b;
+                //if (oldContent != null) oldContent.Dispose();
+            }
+            finally
+            {
+                _Painting = false;
+            }
+            base.OnInvalidated(e);
+        }
+
+        internal ItemPaintArgs GetItemPaintArgs(System.Drawing.Graphics g)
+        {
+            ItemPaintArgs pa = new ItemPaintArgs(this as IOwner, this, g, GetColorScheme());
+            pa.Renderer = this.GetRenderer();
+            if (_DisplayItem.DesignMode)
+            {
+                ISite site = this.GetSite();
+                if (site != null && site.DesignMode)
+                    pa.DesignerSelection = true;
+            }
+            pa.GlassEnabled = !this.DesignMode && WinApi.IsGlassEnabled;
+            return pa;
+        }
+        private ISite GetSite()
+        {
+            ISite site = null;
+
+            if (site == null && _DisplayItem != null)
+            {
+                BaseItem item = _DisplayItem;
+                while (site == null && item != null)
+                {
+                    if (item.Site != null && item.Site.DesignMode)
+                        site = item.Site;
+                    else
+                        item = item.Parent;
+                }
+            }
+
+            return site;
+        }
+
+        private RadialMenuContainer _DisplayItem;
+        /// <summary>
+        /// Identifies the item displayed by this popup.
+        /// </summary>
+        public RadialMenuContainer DisplayItem
+        {
+            get { return _DisplayItem; }
+            set
+            {
+                if (value != _DisplayItem)
+                {
+                    RadialMenuContainer oldValue = _DisplayItem;
+                    _DisplayItem = value;
+                    OnDisplayItemChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when DisplayItem property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnDisplayItemChanged(RadialMenuContainer oldValue, RadialMenuContainer newValue)
+        {
+            if (oldValue != null)
+                oldValue.ContainerControl = null;
+            if (newValue != null)
+            {
+                newValue.ContainerControl = this;
+            }
+            this.Invalidate();
+            //OnPropertyChanged(new PropertyChangedEventArgs("DisplayItem"));
+        }
+
+        const uint WS_POPUP = 0x80000000;
+        const uint WS_CLIPSIBLINGS = 0x04000000;
+        const uint WS_CLIPCHILDREN = 0x02000000;
+        const uint WS_EX_TOPMOST = 0x00000008;
+        const uint WS_EX_TOOLWINDOW = 0x00000080;
+        protected override CreateParams CreateParams
+        {
+            get
+            {
+                CreateParams cp = base.CreateParams;
+                //cp.ExStyle |= 0x00080000; // Sets WS_EX_LAYERED extended style
+
+                cp.Style = unchecked((int)(WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN));
+                cp.ExStyle = (int)(WS_EX_TOPMOST | WS_EX_TOOLWINDOW | 0x00080000); // Sets WS_EX_LAYERED extended style
+                cp.Caption = ""; // Setting caption would show window under tasks in Windows Task Manager
+
+                return cp;
+            }
+        }
+
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            PaintLayeredWindow(_ContentImage);
+        }
+
+        private Bitmap _ContentImage = null;
+        /// <summary>
+        /// Gets or sets the content image displayed on the window.
+        /// </summary>
+        public Bitmap ContentImage
+        {
+            get { return _ContentImage; }
+            set
+            {
+                _ContentImage = value;
+                if (_ContentImage != null && _ContentImage.Size != this.Size)
+                    this.Size = _ContentImage.Size;
+                PaintLayeredWindow(_ContentImage);
+            }
+        }
+
+        private void PaintLayeredWindow(Bitmap windowContentImage)
+        {
+            if (!this.IsHandleCreated) return;
+
+            IntPtr screenDc = NativeFunctions.GetDC(IntPtr.Zero);
+            IntPtr memDc = WinApi.CreateCompatibleDC(screenDc);
+            IntPtr hBitmap = IntPtr.Zero;
+            IntPtr oldBitmap = IntPtr.Zero;
+
+            try
+            {
+                //Display-image
+                hBitmap = windowContentImage.GetHbitmap(Color.FromArgb(0));  //Set the fact that background is transparent
+                oldBitmap = WinApi.SelectObject(memDc, hBitmap);
+
+                //Display-rectangle
+                Size size = windowContentImage.Size;
+                Point pointSource = new Point(0, 0);
+                Point topPos = new Point(this.Left, this.Top);
+
+                //Set up blending options
+                NativeFunctions.BLENDFUNCTION blend = new NativeFunctions.BLENDFUNCTION();
+                blend.BlendOp = (byte)NativeFunctions.Win23AlphaFlags.AC_SRC_OVER;
+                blend.BlendFlags = 0;
+                blend.SourceConstantAlpha = 255;
+                blend.AlphaFormat = (byte)NativeFunctions.Win23AlphaFlags.AC_SRC_ALPHA;
+
+                NativeFunctions.UpdateLayeredWindow(this.Handle, screenDc, ref topPos, ref size,
+                    memDc, ref pointSource, 0, ref blend, (int)NativeFunctions.Win32UpdateLayeredWindowsFlags.ULW_ALPHA);
+
+                //Clean-up
+                WinApi.ReleaseDC(IntPtr.Zero, screenDc);
+                if (hBitmap != IntPtr.Zero)
+                {
+                    WinApi.SelectObject(memDc, oldBitmap);
+                    WinApi.DeleteObject(hBitmap);
+                }
+                WinApi.DeleteDC(memDc);
+            }
+            catch (Exception)
+            {
+            }
+        }
+
+        protected override void WndProc(ref Message m)
+        {
+            if (m.Msg == (int)WinApi.WindowsMessages.WM_MOUSEACTIVATE)
+            {
+                m.Result = new System.IntPtr(NativeFunctions.MA_NOACTIVATE);
+                return;
+            }
+            base.WndProc(ref m);
+        }
+
+        #region BaseItem Forwarding
+        protected override void OnClick(EventArgs e)
+        {
+            Point p = this.PointToClient(MousePosition);
+            InternalOnClick(MouseButtons, p);
+            base.OnClick(e);
+        }
+
+        protected virtual void InternalOnClick(MouseButtons mb, Point mousePos)
+        {
+            _DisplayItem.InternalClick(mb, mousePos);
+        }
+
+        protected override void OnDoubleClick(EventArgs e)
+        {
+            _DisplayItem.InternalDoubleClick(MouseButtons, MousePosition);
+            base.OnDoubleClick(e);
+        }
+
+        protected override void OnKeyDown(KeyEventArgs e)
+        {
+            ExKeyDown(e);
+            base.OnKeyDown(e);
+        }
+
+        internal virtual void ExKeyDown(KeyEventArgs e)
+        {
+            _DisplayItem.InternalKeyDown(e);
+        }
+
+        protected override void OnMouseDown(MouseEventArgs e)
+        {
+            _DisplayItem.InternalMouseDown(e);
+            base.OnMouseDown(e);
+        }
+
+        protected override void OnMouseHover(EventArgs e)
+        {
+            base.OnMouseHover(e);
+            _DisplayItem.InternalMouseHover();
+        }
+
+        protected override void OnMouseLeave(EventArgs e)
+        {
+            _DisplayItem.InternalMouseLeave();
+            base.OnMouseLeave(e);
+        }
+
+        protected override void OnMouseUp(MouseEventArgs e)
+        {
+            base.OnMouseUp(e);
+            _DisplayItem.InternalMouseUp(e);
+        }
+
+        protected override void OnMouseMove(MouseEventArgs e)
+        {
+            base.OnMouseMove(e);
+            InternalMouseMove(e);
+        }
+
+        protected virtual void InternalMouseMove(MouseEventArgs e)
+        {
+            _DisplayItem.InternalMouseMove(e);
+        }        
+        #endregion
+
+        #region Renderer Handling
+        private Rendering.BaseRenderer m_DefaultRenderer = null;
+        private Rendering.BaseRenderer m_Renderer = null;
+        private eRenderMode m_RenderMode = eRenderMode.Global;
+        /// <summary>
+        /// Returns the renderer control will be rendered with.
+        /// </summary>
+        /// <returns>The current renderer.</returns>
+        public virtual Rendering.BaseRenderer GetRenderer()
+        {
+            if (m_RenderMode == eRenderMode.Global && Rendering.GlobalManager.Renderer != null)
+                return Rendering.GlobalManager.Renderer;
+            else if (m_RenderMode == eRenderMode.Custom && m_Renderer != null)
+                return m_Renderer;
+
+            if (m_DefaultRenderer == null)
+                m_DefaultRenderer = new Rendering.Office2007Renderer();
+
+            return m_DefaultRenderer;
+        }
+
+        /// <summary>
+        /// Gets or sets the rendering mode used by control. Default value is eRenderMode.Global which means that static GlobalManager.Renderer is used. If set to Custom then Renderer property must
+        /// also be set to the custom renderer that will be used.
+        /// </summary>
+        [Browsable(false), DefaultValue(eRenderMode.Global)]
+        public eRenderMode RenderMode
+        {
+            get { return m_RenderMode; }
+            set
+            {
+                if (m_RenderMode != value)
+                {
+                    m_RenderMode = value;
+                    this.Invalidate(true);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the custom renderer used by the items on this control. RenderMode property must also be set to eRenderMode.Custom in order renderer
+        /// specified here to be used.
+        /// </summary>
+        [Browsable(false), DefaultValue(null)]
+        public DevComponents.DotNetBar.Rendering.BaseRenderer Renderer
+        {
+            get
+            {
+                return m_Renderer;
+            }
+            set
+            {
+                m_Renderer = value;
+            }
+        }
+
+        private ColorScheme m_ColorScheme = null;
+        /// <summary>
+        /// Returns the color scheme used by control. Color scheme for Office2007 style will be retrieved from the current renderer instead of
+        /// local color scheme referenced by ColorScheme property.
+        /// </summary>
+        /// <returns>An instance of ColorScheme object.</returns>
+        protected virtual ColorScheme GetColorScheme()
+        {
+            BaseRenderer r = GetRenderer();
+            if (r is Office2007Renderer)
+                return ((Office2007Renderer)r).ColorTable.LegacyColors;
+            if (m_ColorScheme == null)
+                m_ColorScheme = new ColorScheme(eDotNetBarStyle.Metro);
+            return m_ColorScheme;
+        }
+        #endregion
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/RatingItem.cs b/PROMS/DotNetBar Source Code/RatingItem.cs
new file mode 100644
index 00000000..c0d57219
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/RatingItem.cs	
@@ -0,0 +1,1431 @@
+using System;
+using System.Text;
+using System.Collections;
+using System.ComponentModel;
+using System.Drawing;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.Rendering;
+using DevComponents.Editors;
+using DevComponents.DotNetBar.Ribbon;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represents rating item control which provides rating functionality.
+    /// </summary>
+    [ToolboxItem(false), DesignTimeVisible(false), DefaultEvent("RatingChanged"), Designer("DevComponents.DotNetBar.Design.RatingItemDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+    public class RatingItem : PopupItem
+    {
+        #region Constructors
+        /// <summary>
+        /// Initializes a new instance of the RatingItem class.
+        /// </summary>
+        public RatingItem()
+        {
+            _BackgroundStyle.StyleChanged += new EventHandler(BackgroundStyleChanged);
+            _CustomImages = new RatingImages(this);
+            this.AutoCollapseOnClick = false;
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            if (BarUtilities.DisposeItemImages && !this.DesignMode)
+            {
+                BarUtilities.DisposeImage(ref _DefaultImage);
+                _CustomImages.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+        #endregion
+
+        #region Events
+        /// <summary>
+        /// Occurs when Rating property has changed.
+        /// </summary>
+        [Description("Occurs when Rating property has changed.")]
+        public event EventHandler RatingChanged;
+        /// <summary>
+        /// Occurs when RatingValue property has changed.
+        /// </summary>
+        [Description("Occurs when Rating property has changed.")]
+        public event EventHandler RatingValueChanged;
+        /// <summary>
+        /// Occurs when Rating property is about to be changed and provides opportunity to cancel the change.
+        /// </summary>
+        [Description("Occurs when Rating property has changed.")]
+        public event RatingChangeEventHandler RatingChanging;
+        /// <summary>
+        /// Occurs when AverageRating property has changed.
+        /// </summary>
+        [Description("Occurs when AverageRating property has changed.")]
+        public event EventHandler AverageRatingChanged;
+        /// <summary>
+        /// Occurs when AverageRatingValue property has changed.
+        /// </summary>
+        [Description("Occurs when AverageRatingValue property has changed.")]
+        public event EventHandler AverageRatingValueChanged;
+        /// <summary>
+        /// Occurs when text markup link is clicked. Markup links can be created using "a" tag, for example:
+        /// <a name="MyLink">Markup link</a>
+        /// </summary>
+        public event MarkupLinkClickEventHandler MarkupLinkClick;
+        /// <summary>
+        /// Occurs when RatingValue property is set and it allows you to provide custom parsing for the values.
+        /// </summary>
+        public event ParseIntegerValueEventHandler ParseRatingValue;
+        /// <summary>
+        /// Occurs when AverageRatingValue property is set and it allows you to provide custom parsing for the values.
+        /// </summary>
+        public event ParseDoubleValueEventHandler ParseAverageRatingValue;
+        #endregion
+
+        #region Internal Implementation
+        public override BaseItem Copy()
+        {
+            RatingItem objCopy = new RatingItem();
+            objCopy.Name = this.Name;
+            this.CopyToItem(objCopy);
+            return objCopy;
+        }
+        /// <summary>
+        /// Copies the ButtonItem specific properties to new instance of the item.
+        /// </summary>
+        /// <param name="copy">New ButtonItem instance.</param>
+        protected override void CopyToItem(BaseItem copy)
+        {
+            RatingItem objCopy = copy as RatingItem;
+            objCopy.AverageRating = this.AverageRating;
+            objCopy.Rating = this.Rating;
+            objCopy.RatingOrientation = this.RatingOrientation;
+            objCopy.IsEditable = this.IsEditable;
+            objCopy.TextSpacing = this.TextSpacing;
+            objCopy.TextColor = this.TextColor;
+            objCopy.TextVisible = this.TextVisible;
+            base.CopyToItem(objCopy);
+        }
+
+        private double _AverageRating = 0;
+        /// <summary>
+        /// Gets or sets the average rating shown by control. Control will display average rating (if set) when no explicit
+        /// Rating value is set through Rating property. Minimum value is 0 and Maximum value is controlled by NumberOfStars property value.
+        /// </summary>
+        [DefaultValue(0d), Category("Data"), Description("Indicates average rating shown by control.")]
+        public double AverageRating
+        {
+            get { return _AverageRating; }
+            set
+            {
+                if (value < 0) value = 0;
+                if (value > _NumberOfStars) value = _NumberOfStars;
+                if (value != _AverageRating)
+                {
+                    _AverageRating = value;
+                    OnAverageRatingChanged(EventArgs.Empty);
+                    this.Refresh();
+                }
+            }
+        }
+        /// <summary>
+        /// Raises the AverageRatingChanged event.
+        /// </summary>
+        /// <param name="eventArgs">Event data.</param>
+        protected virtual void OnAverageRatingChanged(EventArgs eventArgs)
+        {
+            if (AverageRatingChanged != null) AverageRatingChanged(this, eventArgs);
+            if (AverageRatingValueChanged != null) AverageRatingValueChanged(this, eventArgs);
+        }
+        /// <summary>
+        /// Gets or sets the AverageRating property. This property is provided for Data-Binding with NULL value support.
+        /// </summary>
+        [Bindable(true), Browsable(false), RefreshProperties(RefreshProperties.All), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), System.ComponentModel.TypeConverter(typeof(System.ComponentModel.StringConverter))]
+        public object AverageRatingValue
+        {
+            get
+            {
+                return AverageRating;
+            }
+            set
+            {
+                if (AcceptCustomAverageRatingValue(value))
+                    return;
+                else if (IsNull(value))
+                    this.AverageRating = 0;
+                else if (value is double || value is int || value is float)
+                {
+                    this.AverageRating = (double)value;
+                }
+                else if (value is long)
+                {
+                    string t = value.ToString();
+                    this.AverageRating = double.Parse(t);
+                }
+                else if (value is string)
+                {
+                    double i = 0;
+#if FRAMEWORK20
+                    if (double.TryParse(value.ToString(), out i))
+                        this.AverageRating = i;
+                    else
+                        throw new ArgumentException("AverageRatingValue property expects either null/nothing value or double type.");
+#else
+					this.AverageRating = double.Parse(value.ToString());
+#endif
+                }
+                else
+                    throw new ArgumentException("AverageRatingValue property expects either null/nothing value or double type.");
+            }
+        }
+        private bool AcceptCustomAverageRatingValue(object value)
+        {
+            ParseDoubleValueEventArgs e = new ParseDoubleValueEventArgs(value);
+            OnParseAverageRatingValue(e);
+            if (e.IsParsed)
+            {
+                this.AverageRating = e.ParsedValue;
+            }
+
+            return e.IsParsed;
+        }
+        /// <summary>
+        /// Raises the ParseAverageRatingValue event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnParseAverageRatingValue(ParseDoubleValueEventArgs e)
+        {
+            if (ParseAverageRatingValue != null)
+                ParseAverageRatingValue(this, e);
+        }
+
+        /// <summary>
+        /// Sets the Rating value of the control and provides information about source of the rating change.
+        /// </summary>
+        /// <param name="newRating">New Rating value.</param>
+        /// <param name="eEventSource">Source of this change.</param>
+        public void SetRating(int newRating, eEventSource source)
+        {
+            if (newRating == _Rating) return;
+            RatingChangeEventArgs e = new RatingChangeEventArgs(newRating, _Rating, source);
+            OnRatingChanging(e);
+            if (e.Cancel) return;
+            newRating = e.NewRating;
+            _Rating = newRating;
+            OnRatingChanged(e);
+            ExecuteCommand();
+            this.Refresh();
+        }
+
+        /// <summary>
+        /// Raises RatingChanging event.
+        /// </summary>
+        /// <param name="e">Event data</param>
+        protected virtual void OnRatingChanging(RatingChangeEventArgs e)
+        {
+            if (RatingChanging != null)
+                RatingChanging(this, e);
+        }
+
+        private int _Rating = 0;
+        /// <summary>
+        /// Gets or sets the rating value represented by the control. Default value is 0 which indicates
+        /// that there is no rating set. Maximum value is controlled by NumberOfStars property.
+        /// </summary>
+        [DefaultValue(0), Category("Data"), Description("Indicates rating value represented by the control.")]
+        public int Rating
+        {
+            get { return _Rating; }
+            set
+            {
+                if (value < 0) value = 0;
+                if (_Initialized && value > _NumberOfStars) value = _NumberOfStars;
+                if (_Rating != value)
+                {
+                    SetRating(value, eEventSource.Code);
+                }
+            }
+        }
+        /// <summary>
+        /// Raises the RatingChanged event.
+        /// </summary>
+        /// <param name="eventArgs">Event data.</param>
+        protected virtual void OnRatingChanged(EventArgs eventArgs)
+        {
+            EventHandler handler = RatingChanged;
+            if (handler != null) handler(this, eventArgs);
+
+            handler = RatingValueChanged;
+            if (handler != null) handler(this, eventArgs);
+        }
+        /// <summary>
+        /// Gets or sets the Rating property value. This property is provided for Data-Binding with NULL value support.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), RefreshProperties(RefreshProperties.All), Bindable(true)]
+        public object RatingValue
+        {
+            get { return _Rating; }
+            set 
+            {
+                if (AcceptCustomRatingValue(value))
+                    return;
+                else if (IsNull(value))
+                    this.Rating = 0;
+                else if (value is int)
+                {
+                    this.Rating = (int)value;
+                }
+                else if (value is string)
+                {
+                    int i = 0;
+#if FRAMEWORK20
+                    if (int.TryParse(value.ToString(), out i))
+                        this.Rating = i;
+                    else
+                        throw new ArgumentException("RatingValue property expects either null/nothing value or int type.");
+#else
+					this.Rating = int.Parse(value.ToString());
+#endif
+                }
+                else
+                    throw new ArgumentException("RatingValue property expects either null/nothing value or int type.");
+            }
+        }
+        protected virtual bool IsNull(object value)
+        {
+            if (value == null || value is DBNull) return true;
+            return false;
+        }
+        private bool AcceptCustomRatingValue(object value)
+        {
+            ParseIntegerValueEventArgs e = new ParseIntegerValueEventArgs(value);
+            OnParseRatingValue(e);
+            if (e.IsParsed)
+            {
+                this.Rating = e.ParsedValue;
+            }
+
+            return e.IsParsed;
+        }
+        /// <summary>
+        /// Raises the ParseRating event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnParseRatingValue(ParseIntegerValueEventArgs e)
+        {
+            if (ParseRatingValue != null)
+                ParseRatingValue(this, e);
+        }
+
+        private bool _IsEditable = true;
+        /// <summary>
+        /// Gets or sets whether rating can be edited. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether rating can be edited.")]
+        public bool IsEditable
+        {
+            get { return _IsEditable; }
+            set
+            {
+                if (_IsEditable != value)
+                {
+                    _IsEditable = value;
+                    SetMouseOverIndex(-1);
+                }
+            }
+        }
+
+        private bool _Initialized = false; // Gets set to true when control is first painted
+        RatingInfo[] _RatingInfo = new RatingInfo[5]; // Default number of stars
+        private Size _DefaultImageSize = new Size(13, 13);
+        public override void Paint(ItemPaintArgs p)
+        {
+            _Initialized = true;
+
+            PaintBackground(p);
+
+            Rectangle bounds = this.DisplayRectangle;
+            if (_RenderMenuSide)
+                PaintMenuItemSide(p, ref bounds);
+            bounds = GetClientRectangle(bounds);
+            if (_TextVisible && !_TextSize.IsEmpty)
+                PaintText(p, bounds);
+
+            Graphics g = p.Graphics;
+
+            if (_MouseOverRatingIndex >= 0)
+            {
+                RatingImage rated = GetRatedMouseOverImage();
+                RatingImage unrated = GetUnratedMouseOverImage();
+                for (int i = 0; i < _NumberOfStars; i++)
+                {
+                    if (_RatingInfo[i].IsMouseOver)
+                        g.DrawImage(rated.Image, _RatingInfo[i].Bounds, rated.SourceBounds, GraphicsUnit.Pixel);
+                    else
+                        g.DrawImage(unrated.Image, _RatingInfo[i].Bounds, unrated.SourceBounds, GraphicsUnit.Pixel);
+                }
+            }
+            else
+            {
+                int rating = Math.Min(_Rating, _NumberOfStars);
+                if (_AverageRating > 0 && rating == 0)
+                {
+                    RatingImage rated = GetAverageRatedImage();
+                    RatingImage unrated = GetUnratedImage();
+                    for (int i = 0; i < _NumberOfStars; i++)
+                    {
+                        if (i + 1 <= _AverageRating)
+                            g.DrawImage(rated.Image, _RatingInfo[i].Bounds, rated.SourceBounds, GraphicsUnit.Pixel);
+                        else if (i + 1 == Math.Ceiling(_AverageRating))
+                        {
+                            int size = (int)((RatingOrientation == eOrientation.Horizontal ? _RatingInfo[i].Bounds.Width : _RatingInfo[i].Bounds.Height) * (_AverageRating - Math.Floor(_AverageRating)));
+                            g.DrawImage(unrated.Image, _RatingInfo[i].Bounds, unrated.SourceBounds, GraphicsUnit.Pixel);
+                            if (size > 0)
+                            {
+                                Region oldClip = g.Clip;
+                                if (RatingOrientation == eOrientation.Horizontal)
+                                    g.SetClip(new Rectangle(_RatingInfo[i].Bounds.X, _RatingInfo[i].Bounds.Y, size, _RatingInfo[i].Bounds.Height), System.Drawing.Drawing2D.CombineMode.Intersect);
+                                else
+                                    g.SetClip(new Rectangle(_RatingInfo[i].Bounds.X + (_RatingInfo[i].Bounds.Height - size), _RatingInfo[i].Bounds.Y, _RatingInfo[i].Bounds.Width, size), System.Drawing.Drawing2D.CombineMode.Intersect);
+                                g.DrawImage(rated.Image, _RatingInfo[i].Bounds, rated.SourceBounds, GraphicsUnit.Pixel);
+                                g.Clip = oldClip;
+                            }
+                        }
+                        else
+                            g.DrawImage(unrated.Image, _RatingInfo[i].Bounds, unrated.SourceBounds, GraphicsUnit.Pixel);
+                    }
+                }
+                else
+                {
+                    RatingImage rated = GetRatedImage();
+                    RatingImage unrated = GetUnratedImage();
+                    for (int i = 0; i < _NumberOfStars; i++)
+                    {
+                        if (rating > 0 && i + 1 <= rating)
+                            g.DrawImage(rated.Image, _RatingInfo[i].Bounds, rated.SourceBounds, GraphicsUnit.Pixel);
+                        else
+                            g.DrawImage(unrated.Image, _RatingInfo[i].Bounds, unrated.SourceBounds, GraphicsUnit.Pixel);
+                    }
+                }
+            }
+
+            if (this.Focused && this.DesignMode)
+            {
+                Rectangle r = this.DisplayRectangle;
+                r.Inflate(-1, -1);
+                DesignTime.DrawDesignTimeSelection(g, r, p.Colors.ItemDesignTimeBorder);
+            }
+        }
+
+        private void PaintText(ItemPaintArgs p, Rectangle bounds)
+        {
+            Color textColor = Color.Empty;
+            if (!_TextColor.IsEmpty)
+                textColor = _TextColor;
+            else
+                textColor = GetTextColor(p);
+            bool rtl = p.RightToLeft;
+            Rectangle textRect = bounds;
+            if (_BackgroundStyle.TextAlignment == eStyleTextAlignment.Far && !rtl || rtl && _BackgroundStyle.TextAlignment == eStyleTextAlignment.Near)
+            {
+                textRect.X = textRect.Right - _TextSize.Width;
+                textRect.Width = _TextSize.Width;
+            }
+            else
+                textRect.Width = _TextSize.Width;
+            Graphics g = p.Graphics;
+            Font font = p.Font;
+            eTextFormat textFormat = _BackgroundStyle.TextFormat;
+
+            if (_TextVisible && this.Text != "" && !textRect.IsEmpty && !textColor.IsEmpty)
+            {
+                if (this.TextMarkupBody != null)
+                {
+                    TextMarkup.MarkupDrawContext d = new TextMarkup.MarkupDrawContext(g, font, textColor, rtl);
+                    d.HotKeyPrefixVisible = !((textFormat & eTextFormat.HidePrefix) == eTextFormat.HidePrefix);
+                    if ((textFormat & eTextFormat.VerticalCenter) == eTextFormat.VerticalCenter)
+                        textRect.Y = this.TopInternal + (this.Bounds.Height - textRect.Height) / 2;
+                    else if ((textFormat & eTextFormat.Bottom) == eTextFormat.Bottom)
+                        textRect.Y += (this.Bounds.Height - textRect.Height) + 1;
+
+                    this.TextMarkupBody.Bounds = textRect;
+                    this.TextMarkupBody.Render(d);
+                }
+                else
+                {
+#if FRAMEWORK20
+                    if (p.GlassEnabled && this.Parent is CaptionItemContainer && !(p.ContainerControl is QatToolbar))
+                    {
+                        if (!p.CachedPaint)
+                            Office2007RibbonControlPainter.PaintTextOnGlass(g, this.Text, font, textRect, TextDrawing.GetTextFormat(textFormat));
+                    }
+                    else
+#endif
+                        TextDrawing.DrawString(g, this.Text, font, textColor, textRect, textFormat);
+                }
+            }
+        }
+
+        private Color GetTextColor(ItemPaintArgs pa)
+        {
+            if (BarFunctions.IsOffice2007Style(this.EffectiveStyle) && pa.Renderer is Rendering.Office2007Renderer)
+            {
+                if ((pa.IsOnMenu || pa.IsOnPopupBar) && ((Rendering.Office2007Renderer)pa.Renderer).ColorTable.ButtonItemColors.Count > 0)
+                {
+                    return GetEnabled(pa.ContainerControl) ? ((Rendering.Office2007Renderer)pa.Renderer).ColorTable.ButtonItemColors[0].Default.Text : pa.Colors.ItemDisabledText;
+                }
+                else
+                {
+                    if ((pa.ContainerControl is RibbonStrip || pa.ContainerControl is Bar) && ((Rendering.Office2007Renderer)pa.Renderer).ColorTable.RibbonTabItemColors.Count > 0)
+                        return ((Rendering.Office2007Renderer)pa.Renderer).ColorTable.RibbonTabItemColors[0].Default.Text;
+                    Rendering.Office2007ButtonItemColorTable ct = ((Rendering.Office2007Renderer)pa.Renderer).ColorTable.ButtonItemColors[Enum.GetName(typeof(eButtonColor), eButtonColor.Orange)];
+                    if (ct != null && !ct.Default.Text.IsEmpty)
+                        return GetEnabled(pa.ContainerControl) ? ct.Default.Text : pa.Colors.ItemDisabledText;
+                }
+            }
+            else
+                return pa.Colors.ItemText;
+
+            return _TextColor;
+        }
+
+        private void PaintMenuItemSide(ItemPaintArgs pa, ref Rectangle r)
+        {
+            bool isOnMenu = this.IsOnMenu && !(this.Parent is ItemContainer);
+            Size objImageSize = GetMaxImageSize();
+
+            if (isOnMenu && (this.EffectiveStyle == eDotNetBarStyle.OfficeXP || this.EffectiveStyle == eDotNetBarStyle.Office2003 || this.EffectiveStyle == eDotNetBarStyle.VS2005 || BarFunctions.IsOffice2007Style(this.EffectiveStyle)))
+            {
+                Graphics g = pa.Graphics;
+
+                objImageSize.Width += 7;
+                r.Width -= objImageSize.Width + _MenuIndent;
+                if (!pa.RightToLeft)
+                    r.X += objImageSize.Width + _MenuIndent;
+                if (this.IsOnCustomizeMenu)
+                    objImageSize.Width += objImageSize.Height + 8;
+                Rectangle sideRect = new Rectangle(m_Rect.Left, m_Rect.Top, objImageSize.Width, m_Rect.Height);
+                if (pa.RightToLeft)
+                    sideRect.X = m_Rect.Right - sideRect.Width;
+                // Draw side bar
+                //if (this.MenuVisibility == eMenuVisibility.VisibleIfRecentlyUsed && !this.RecentlyUsed)
+                //{
+                //    if (!pa.Colors.MenuUnusedSide2.IsEmpty)
+                //    {
+                //        System.Drawing.Drawing2D.LinearGradientBrush gradient = BarFunctions.CreateLinearGradientBrush(new Rectangle(m_Rect.Left, m_Rect.Top, objImageSize.Width, m_Rect.Height), pa.Colors.MenuUnusedSide, pa.Colors.MenuUnusedSide2, pa.Colors.MenuUnusedSideGradientAngle);
+                //        g.FillRectangle(gradient, sideRect);
+                //        gradient.Dispose();
+                //    }
+                //    else
+                //        g.FillRectangle(new SolidBrush(pa.Colors.MenuUnusedSide), sideRect);
+                //}
+                //else
+                {
+                    if (!pa.Colors.MenuSide2.IsEmpty)
+                    {
+                        System.Drawing.Drawing2D.LinearGradientBrush gradient = BarFunctions.CreateLinearGradientBrush(sideRect, pa.Colors.MenuSide, pa.Colors.MenuSide2, pa.Colors.MenuSideGradientAngle);
+                        g.FillRectangle(gradient, sideRect);
+                        gradient.Dispose();
+                    }
+                    else
+                        g.FillRectangle(new SolidBrush(pa.Colors.MenuSide), sideRect);
+                }
+                if (BarFunctions.IsOffice2007Style(this.EffectiveStyle) && GlobalManager.Renderer is Office2007Renderer)
+                {
+                    Office2007MenuColorTable mt = ((Office2007Renderer)GlobalManager.Renderer).ColorTable.Menu;
+                    if (mt != null && !mt.SideBorder.IsEmpty)
+                    {
+                        if (pa.RightToLeft)
+                            DisplayHelp.DrawGradientLine(g, sideRect.X, sideRect.Y, sideRect.X, sideRect.Bottom - 1, mt.SideBorder, 1);
+                        else
+                            DisplayHelp.DrawGradientLine(g, sideRect.Right - 2, sideRect.Y, sideRect.Right - 2, sideRect.Bottom - 1, mt.SideBorder, 1);
+                    }
+                    if (mt != null && !mt.SideBorderLight.IsEmpty)
+                    {
+                        if (pa.RightToLeft)
+                            DisplayHelp.DrawGradientLine(g, sideRect.X + 1, sideRect.Y, sideRect.X + 1, sideRect.Bottom - 1, mt.SideBorderLight, 1);
+                        else
+                            DisplayHelp.DrawGradientLine(g, sideRect.Right - 1, sideRect.Y, sideRect.Right - 1, sideRect.Bottom - 1, mt.SideBorderLight, 1);
+                    }
+                }
+            }
+
+            if (this.IsOnCustomizeMenu)
+            {
+                if (this.EffectiveStyle == eDotNetBarStyle.OfficeXP || this.EffectiveStyle == eDotNetBarStyle.Office2003 || this.EffectiveStyle == eDotNetBarStyle.VS2005 || BarFunctions.IsOffice2007Style(this.EffectiveStyle))
+                {
+                    r.X += (objImageSize.Height + 8);
+                    r.Width -= (objImageSize.Height + 8);
+                }
+                else
+                {
+                    r.X += (objImageSize.Height + 4);
+                    r.Width -= (objImageSize.Height + 4);
+                }
+            }
+        }
+
+        private RatingImage GetAverageRatedImage()
+        {
+            if (_CustomImages.AverageRated != null)
+                return new RatingImage(_CustomImages.AverageRated, new Rectangle(Point.Empty, _CustomImages.AverageRated.Size));
+            EnsureDefaultImage();
+            return new RatingImage(_DefaultImage, new Rectangle(0, 52, _DefaultImageSize.Width, _DefaultImageSize.Height));
+        }
+
+        private RatingImage GetRatedImage()
+        {
+            if (_CustomImages.Rated != null)
+                return new RatingImage(_CustomImages.Rated, new Rectangle(Point.Empty, _CustomImages.Rated.Size));
+            EnsureDefaultImage();
+            return new RatingImage(_DefaultImage, new Rectangle(0, 26, _DefaultImageSize.Width, _DefaultImageSize.Height));
+        }
+
+        private RatingImage GetUnratedImage()
+        {
+            if (_CustomImages.Unrated != null)
+                return new RatingImage(_CustomImages.Unrated, new Rectangle(Point.Empty, _CustomImages.Unrated.Size));
+            EnsureDefaultImage();
+            return new RatingImage(_DefaultImage, new Rectangle(0, 0, _DefaultImageSize.Width, _DefaultImageSize.Height));
+        }
+
+        private RatingImage GetUnratedMouseOverImage()
+        {
+            if (_CustomImages.UnratedMouseOver != null)
+                return new RatingImage(_CustomImages.UnratedMouseOver, new Rectangle(Point.Empty, _CustomImages.UnratedMouseOver.Size));
+            EnsureDefaultImage();
+            return new RatingImage(_DefaultImage, new Rectangle(0, 13, _DefaultImageSize.Width, _DefaultImageSize.Height));
+        }
+
+        private RatingImage GetRatedMouseOverImage()
+        {
+            if (_CustomImages.RatedMouseOver != null)
+                return new RatingImage(_CustomImages.RatedMouseOver, new Rectangle(Point.Empty, _CustomImages.RatedMouseOver.Size));
+            EnsureDefaultImage();
+            return new RatingImage(_DefaultImage, new Rectangle(0, 39, _DefaultImageSize.Width, _DefaultImageSize.Height));
+        }
+
+        private Image _DefaultImage = null;
+        private void EnsureDefaultImage()
+        {
+            if (_DefaultImage == null)
+                _DefaultImage = BarFunctions.LoadBitmap("SystemImages.Rating.png");
+        }
+
+        private struct RatingImage
+        {
+            /// <summary>
+            /// Initializes a new instance of the RatingImage structure.
+            /// </summary>
+            /// <param name="image"></param>
+            /// <param name="sourceBounds"></param>
+            public RatingImage(Image image, Rectangle sourceBounds)
+            {
+                Image = image;
+                SourceBounds = sourceBounds;
+            }
+            public Image Image;
+            public Rectangle SourceBounds;
+        }
+
+        private struct RatingInfo
+        {
+            public Rectangle Bounds;
+            public bool IsMouseOver;
+        }
+
+        public override void InternalMouseMove(System.Windows.Forms.MouseEventArgs e)
+        {
+            if (_IsEditable)
+            {
+                int mouseOverIndex = -1;
+                if (RatingOrientation == eOrientation.Horizontal)
+                {
+                    for (int i = 0; i < _NumberOfStars; i++)
+                    {
+                        if (e.X >= _RatingInfo[i].Bounds.X && e.X <= _RatingInfo[i].Bounds.Right)
+                        {
+                            mouseOverIndex = i;
+                            break;
+                        }
+                    }
+                }
+                else
+                {
+                    for (int i = 0; i < _NumberOfStars; i++)
+                    {
+                        if (e.Y >= _RatingInfo[i].Bounds.Y && e.Y <= _RatingInfo[i].Bounds.Bottom && (!_TextVisible || _TextSize.IsEmpty) ||
+                            _RatingInfo[i].Bounds.Contains(e.X, e.Y))
+                        {
+                            mouseOverIndex = i;
+                            break;
+                        }
+                    }
+                }
+
+                SetMouseOverIndex(mouseOverIndex);
+            }
+            else
+                SetMouseOverIndex(-1);
+
+            base.InternalMouseMove(e);
+        }
+
+        public override void InternalClick(System.Windows.Forms.MouseButtons buttons, Point position)
+        {
+            if (_MouseOverRatingIndex >= 0)
+                SetRating(_MouseOverRatingIndex + 1, eEventSource.Mouse);
+            base.InternalClick(buttons, position);
+        }
+
+        private int _MouseOverRatingIndex = -1;
+        private void SetMouseOverIndex(int mouseOverIndex)
+        {
+            if (mouseOverIndex == _MouseOverRatingIndex) return;
+            _MouseOverRatingIndex=mouseOverIndex;
+
+            for (int i = 0; i < _NumberOfStars; i++)
+            {
+                _RatingInfo[i].IsMouseOver = (mouseOverIndex >= 0 && i <= mouseOverIndex);
+            }
+            Refresh();
+        }
+
+        public override void InternalMouseLeave()
+        {
+            if (_IsEditable)
+            {
+                SetMouseOverIndex(-1);
+            }
+            base.InternalMouseLeave();
+        }
+
+        private Rectangle GetClientRectangle()
+        {
+            return GetClientRectangle(this.DisplayRectangle);
+        }
+        private Rectangle GetClientRectangle(Rectangle bounds)
+        {
+            bounds.X += ElementStyleLayout.LeftWhiteSpace(_BackgroundStyle);
+            bounds.Y += ElementStyleLayout.TopWhiteSpace(_BackgroundStyle);
+            bounds.Width -= ElementStyleLayout.HorizontalStyleWhiteSpace(_BackgroundStyle);
+            bounds.Height -= ElementStyleLayout.VerticalStyleWhiteSpace(_BackgroundStyle);
+            return bounds;
+        }
+
+        private void UpdateRatingBounds()
+        {
+            Rectangle bounds = GetClientRectangle();
+
+            if (_TextVisible && !_TextSize.IsEmpty)
+            {
+                if (_BackgroundStyle.TextAlignment == eStyleTextAlignment.Far && this.IsRightToLeft || !this.IsRightToLeft && _BackgroundStyle.TextAlignment == eStyleTextAlignment.Near)
+                    bounds.X += (_TextSpacing + _TextSize.Width + (_RenderMenuSide ? _MenuIndent : 0));
+            }
+            if (_RenderMenuSide)
+            {
+                if (_BackgroundStyle.TextAlignment == eStyleTextAlignment.Far && this.IsRightToLeft || !this.IsRightToLeft && _BackgroundStyle.TextAlignment == eStyleTextAlignment.Near)
+                {
+                    Size objImageSize = GetMaxImageSize();
+                    // Get the right image size that we will use for calculation
+                    bounds.X += (objImageSize.Width + Dpi.Width7);
+                    if (this.IsOnCustomizeMenu)
+                        bounds.X += (bounds.Height + Dpi.Width2);
+                }
+            }
+
+            Size size = Dpi.ImageSize(DisplayHelp.MaxSize(_DefaultImageSize, _CustomImages.LargestImageSize));
+            if (bounds.Height > size.Height && this.RatingOrientation == eOrientation.Horizontal)
+                bounds.Y += (bounds.Height - size.Height) / 2;
+
+            if (this.RatingOrientation == eOrientation.Horizontal)
+            {
+                Point p = bounds.Location;
+                for (int i = 0; i < _NumberOfStars; i++)
+                {
+                    _RatingInfo[i].Bounds = new Rectangle(p, size);
+                    p.X += size.Width;
+                }
+            }
+            else
+            {
+                Point p = new Point(bounds.X, bounds.Bottom - size.Height);
+                for (int i = 0; i < _NumberOfStars; i++)
+                {
+                    _RatingInfo[i].Bounds = new Rectangle(p, size);
+                    p.Y -= size.Height;
+                }
+            }
+        }
+
+        private int _MenuIndent = 8;
+        private Size _TextSize = Size.Empty;
+        private bool _RenderMenuSide = false;
+        private Size _CalcSize = Size.Empty;
+        public override void RecalcSize()
+        {
+            Rectangle bounds = this.DisplayRectangle;
+            Size size = Dpi.ImageSize(DisplayHelp.MaxSize(_DefaultImageSize, _CustomImages.LargestImageSize));
+
+            if (this.RatingOrientation == eOrientation.Horizontal)
+            {
+                size.Width *= _NumberOfStars;
+            }
+            else
+            {
+                size.Height *= _NumberOfStars;
+            }
+
+            size.Width += ElementStyleLayout.HorizontalStyleWhiteSpace(_BackgroundStyle);
+            size.Height += ElementStyleLayout.VerticalStyleWhiteSpace(_BackgroundStyle);
+
+            _RenderMenuSide = false;
+            bool isOnMenu = this.IsOnMenu && !(this.Parent is ItemContainer);
+            if (isOnMenu && (this.EffectiveStyle == eDotNetBarStyle.OfficeXP || this.EffectiveStyle == eDotNetBarStyle.Office2003 || this.EffectiveStyle == eDotNetBarStyle.VS2005 || BarFunctions.IsOffice2007Style(this.EffectiveStyle)))
+            {
+                Size objImageSize = GetMaxImageSize();
+                // Get the right image size that we will use for calculation
+                size.Width += (objImageSize.Width + Dpi.Width7);
+                if (this.IsOnCustomizeMenu)
+                    size.Width += (size.Height + Dpi.Width2);
+                size.Width += _MenuIndent;
+                _RenderMenuSide = true;
+            }
+            _TextSize = Size.Empty;
+            if (_TextVisible)
+            {
+                Control objCtrl = this.ContainerControl as Control;
+                if (objCtrl == null || objCtrl.Disposing || objCtrl.IsDisposed)
+                    return;
+
+                Graphics g = BarFunctions.CreateGraphics(objCtrl);
+                if (g == null) return;
+                try
+                {
+                    Size textSize = ButtonItemLayout.MeasureItemText(this, g, 0, objCtrl.Font, eTextFormat.Default, objCtrl.RightToLeft == RightToLeft.Yes);
+                    textSize.Width += Dpi.Width1;
+                    size.Width += _TextSpacing + textSize.Width;
+                    size.Height = Math.Max(size.Height, textSize.Height);
+                    _TextSize = textSize;
+                }
+                finally
+                {
+                    g.Dispose();
+                }
+            }
+
+            _CalcSize = size;
+            bounds.Size = size;
+
+            if(!(this.ContainerControl is DevComponents.DotNetBar.Controls.RatingStar))
+                m_Rect = bounds;
+            UpdateRatingBounds();
+            base.RecalcSize();
+        }
+
+        internal Size CalcSize
+        {
+            get { return (_CalcSize); }
+        }
+
+        private Size GetMaxImageSize()
+        {
+            if (m_Parent != null)
+            {
+                ImageItem objParentImageItem = m_Parent as ImageItem;
+                if (objParentImageItem != null)
+                    return objParentImageItem.SubItemsImageSize;
+                else
+                    return this.ImageSize;
+            }
+            else
+                return this.ImageSize;
+        }
+
+        public override Rectangle Bounds
+        {
+            get { return (base.Bounds); }
+
+            set
+            {
+                if (base.Bounds.Equals(value) == false)
+                {
+                    base.Bounds = value;
+
+                    UpdateRatingBounds();
+                }
+            }
+        }
+
+        protected override void OnLeftLocationChanged(int oldValue)
+        {
+            UpdateRatingBounds();
+            base.OnLeftLocationChanged(oldValue);
+        }
+
+        protected override void OnTopLocationChanged(int oldValue)
+        {
+            UpdateRatingBounds();
+            base.OnTopLocationChanged(oldValue);
+        }
+
+        //protected override void OnExternalSizeChange()
+        //{
+        //    UpdateRatingBounds();
+        //    base.OnExternalSizeChange();
+        //}
+
+        protected virtual void PaintBackground(ItemPaintArgs p)
+        {
+            _BackgroundStyle.SetColorScheme(p.Colors);
+            Graphics g = p.Graphics;
+            ElementStyleDisplay.Paint(new ElementStyleDisplayInfo(_BackgroundStyle, g, this.DisplayRectangle));
+        }
+
+        internal void SetBackgroundStyle(ElementStyle elementStyle)
+        {
+            _BackgroundStyle.StyleChanged -= new EventHandler(BackgroundStyleChanged);
+            _BackgroundStyle = elementStyle;
+            _BackgroundStyle.StyleChanged += new EventHandler(BackgroundStyleChanged);
+        }
+
+        private ElementStyle _BackgroundStyle = new ElementStyle();
+        /// <summary>
+        /// Specifies the control background style. Default value is an empty style which means that container does not display any background.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Category("Style"), Description("Gets or sets control background style."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ElementStyle BackgroundStyle
+        {
+            get { return _BackgroundStyle; }
+        }
+        private void BackgroundStyleChanged(object sender, EventArgs e)
+        {
+            this.NeedRecalcSize = true;
+            this.OnAppearanceChanged();
+        }
+
+        private RatingImages _CustomImages;
+        /// <summary>
+        /// Gets the reference to custom rating images.
+        /// </summary>
+        [Browsable(true), Category("Images"), Description("Gets the reference to custom rating images."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public RatingImages CustomImages
+        {
+            get { return _CustomImages; }
+        }
+
+        private bool _TextVisible = true;
+        /// <summary>
+        /// Gets or sets whether text assigned to the check box is visible. Default value is true.
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Appearance"), Description("Indicates whether text assigned to the check box is visible.")]
+        public bool TextVisible
+        {
+            get { return _TextVisible; }
+            set
+            {
+                _TextVisible = value;
+                this.NeedRecalcSize = true;
+                OnAppearanceChanged();
+            }
+        }
+
+        private Color _TextColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets the text color. Default value is Color.Empty which indicates that default color is used.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), Description("Indicates text color.")]
+        public Color TextColor
+        {
+            get { return _TextColor; }
+            set
+            {
+                _TextColor = value;
+                OnAppearanceChanged();
+            }
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeTextColor()
+        {
+            return !_TextColor.IsEmpty;
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetTextColor()
+        {
+            this.TextColor = Color.Empty;
+        }
+
+        private int _TextSpacing = 0;
+        /// <summary>
+        /// Gets or sets the spacing between optional text and the rating.
+        /// </summary>
+        [DefaultValue(0), Category("Appearance"), Description("Gets or sets the spacing between optional text and the rating.")]
+        public int TextSpacing
+        {
+            get { return _TextSpacing; }
+            set
+            {
+                if (_TextSpacing != value)
+                {
+                    _TextSpacing = value;
+                    NeedRecalcSize = true;
+                    this.Refresh();
+                }
+            }
+        }
+
+        private eOrientation _RatingOrientation = eOrientation.Horizontal;
+        /// <summary>
+        /// Gets or sets the orientation of rating control.
+        /// </summary>
+        [DefaultValue(eOrientation.Horizontal), Category("Appearance"), Description("Gets or sets the orientation of rating control.")]
+        public eOrientation RatingOrientation
+        {
+            get { return _RatingOrientation; }
+            set 
+            {
+                if (_RatingOrientation != value)
+                {
+                    _RatingOrientation = value;
+                    NeedRecalcSize = true;
+                    this.Refresh();
+                }
+            }
+        }
+
+        private int _NumberOfStars = 5;
+        /// <summary>
+        /// Indicates number of stars used for the rating. Minium value is 2 stars.
+        /// </summary>
+        [DefaultValue(5), Category("Appearance"), Description("Indicates number of stars used for the rating.")]
+        public int NumberOfStars
+        {
+            get { return _NumberOfStars; }
+            set 
+            {
+                if (_NumberOfStars < 2) _NumberOfStars = 2;
+                if (_NumberOfStars != value)
+                {
+                    _NumberOfStars = value;
+                    if (_Rating > _NumberOfStars) _Rating = _NumberOfStars;
+                    _RatingInfo = new RatingInfo[_NumberOfStars];
+                    NeedRecalcSize = true;
+                    this.Refresh();
+                }
+            }
+        }
+        #endregion
+
+        #region Markup Implementation
+        /// <summary>
+        /// Gets whether item supports text markup. Default is false.
+        /// </summary>
+        protected override bool IsMarkupSupported
+        {
+            get { return _EnableMarkup; }
+        }
+
+        private bool _EnableMarkup = true;
+        /// <summary>
+        /// Gets or sets whether text-markup support is enabled for items Text property. Default value is true.
+        /// Set this property to false to display HTML or other markup in the item instead of it being parsed as text-markup.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance"), Description("Indicates whether text-markup support is enabled for items Text property.")]
+        public bool EnableMarkup
+        {
+            get { return _EnableMarkup; }
+            set
+            {
+                if (_EnableMarkup != value)
+                {
+                    _EnableMarkup = value;
+                    NeedRecalcSize = true;
+                    OnTextChanged();
+                }
+            }
+        }
+
+        protected override void TextMarkupLinkClick(object sender, EventArgs e)
+        {
+            TextMarkup.HyperLink link = sender as TextMarkup.HyperLink;
+            if (link != null)
+                OnMarkupLinkClick(new MarkupLinkClickEventArgs(link.Name, link.HRef));
+            base.TextMarkupLinkClick(sender, e);
+        }
+
+        protected virtual void OnMarkupLinkClick(MarkupLinkClickEventArgs e)
+        {
+            if (this.MarkupLinkClick != null)
+                MarkupLinkClick(this, e);
+        }
+        #endregion
+
+        #region Property Hiding
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override SubItemsCollection SubItems
+        {
+            get
+            {
+                return base.SubItems;
+            }
+        }
+
+        [Browsable(false)]
+        public override bool ClickAutoRepeat
+        {
+            get
+            {
+                return base.ClickAutoRepeat;
+            }
+            set
+            {
+                base.ClickAutoRepeat = value;
+            }
+        }
+        [Browsable(false)]
+        public override int ClickRepeatInterval
+        {
+            get
+            {
+                return base.ClickRepeatInterval;
+            }
+            set
+            {
+                base.ClickRepeatInterval = value;
+            }
+        }
+        [Browsable(false)]
+        public override ePersonalizedMenus PersonalizedMenus
+        {
+            get
+            {
+                return base.PersonalizedMenus;
+            }
+            set
+            {
+                base.PersonalizedMenus = value;
+            }
+        }
+        [Browsable(false)]
+        public override ePopupAnimation PopupAnimation
+        {
+            get
+            {
+                return base.PopupAnimation;
+            }
+            set
+            {
+                base.PopupAnimation = value;
+            }
+        }
+        [Browsable(false)]
+        public override Font PopupFont
+        {
+            get
+            {
+                return base.PopupFont;
+            }
+            set
+            {
+                base.PopupFont = value;
+            }
+        }
+        [Browsable(false)]
+        public override ePopupSide PopupSide
+        {
+            get
+            {
+                return base.PopupSide;
+            }
+            set
+            {
+                base.PopupSide = value;
+            }
+        }
+        [Browsable(false)]
+        public override ePopupType PopupType
+        {
+            get
+            {
+                return base.PopupType;
+            }
+            set
+            {
+                base.PopupType = value;
+            }
+        }
+        [Browsable(false)]
+        public override int PopupWidth
+        {
+            get
+            {
+                return base.PopupWidth;
+            }
+            set
+            {
+                base.PopupWidth = value;
+            }
+        }
+        [Browsable(false)]
+        public override ShortcutsCollection Shortcuts
+        {
+            get
+            {
+                return base.Shortcuts;
+            }
+            set
+            {
+                base.Shortcuts = value;
+            }
+        }
+        [Browsable(false)]
+        public override bool ShowSubItems
+        {
+            get
+            {
+                return base.ShowSubItems;
+            }
+            set
+            {
+                base.ShowSubItems = value;
+            }
+        }
+        [Browsable(false)]
+        public override bool Stretch
+        {
+            get
+            {
+                return base.Stretch;
+            }
+            set
+            {
+                base.Stretch = value;
+            }
+        }
+        [Browsable(false)]
+        public override bool ThemeAware
+        {
+            get
+            {
+                return base.ThemeAware;
+            }
+            set
+            {
+                base.ThemeAware = value;
+            }
+        }
+        [DefaultValue(false)]
+        public override bool AutoCollapseOnClick
+        {
+            get
+            {
+                return base.AutoCollapseOnClick;
+            }
+            set
+            {
+                base.AutoCollapseOnClick = value;
+            }
+        }
+        #endregion
+    }
+
+    #region RatingImages
+    /// <summary>
+    /// Defines the custom rating images for Rating control.
+    /// </summary>
+    [ToolboxItem(false), TypeConverter(typeof(System.ComponentModel.ExpandableObjectConverter))]
+    public class RatingImages
+    {
+        private RatingItem _Parent = null;
+        /// <summary>
+        /// Initializes a new instance of the RatingImages class.
+        /// </summary>
+        internal RatingImages(RatingItem parentItem)
+        {
+            _Parent = parentItem;
+        }
+
+        public void Dispose()
+        {
+            BarUtilities.DisposeImage(ref _AverageRated);
+            BarUtilities.DisposeImage(ref _Rated);
+            BarUtilities.DisposeImage(ref _RatedMouseOver);
+            BarUtilities.DisposeImage(ref _Unrated);
+            BarUtilities.DisposeImage(ref _UnratedMouseOver);
+        }
+
+        private Image _Unrated = null;
+        /// <summary>
+        /// Gets or sets the image used for unrated rating part.
+        /// </summary>
+        [DefaultValue(null), Description("Gets or sets the image used for unrated rating part.")]
+        public Image Unrated
+        {
+            get
+            {
+                return _Unrated;
+            }
+            set
+            {
+                if (_Unrated != value)
+                {
+                    _Unrated = value;
+                    OnImageChanged();
+                }
+            }
+        }
+
+        private Image _UnratedMouseOver = null;
+        /// <summary>
+        /// Gets or sets the image used for unrated rating part when mouse is over the control.
+        /// </summary>
+        [DefaultValue(null), Description("Gets or sets the image used for unrated rating part when mouse is over the control.")]
+        public Image UnratedMouseOver
+        {
+            get
+            {
+                return _UnratedMouseOver;
+            }
+            set
+            {
+                if (_UnratedMouseOver != value)
+                {
+                    _UnratedMouseOver = value;
+                    OnImageChanged();
+                }
+            }
+        }
+
+        private Image _Rated = null;
+        /// <summary>
+        /// Gets or sets the image used for rated part of the control.
+        /// </summary>
+        [DefaultValue(null), Description("Gets or sets the image used for rated part of the control.")]
+        public Image Rated
+        {
+            get
+            {
+                return _Rated;
+            }
+            set
+            {
+                if (_Rated != value)
+                {
+                    _Rated = value;
+                    OnImageChanged();
+                }
+            }
+        }
+
+        private Image _AverageRated = null;
+        /// <summary>
+        /// Gets or sets the image used for Average Rated part of the control.
+        /// </summary>
+        [DefaultValue(null), Description("Gets or sets the image used for Average Rated part of the control.")]
+        public Image AverageRated
+        {
+            get
+            {
+                return _AverageRated;
+            }
+            set
+            {
+                if (_AverageRated != value)
+                {
+                    _AverageRated = value;
+                    OnImageChanged();
+                }
+            }
+        }
+
+        private Image _RatedMouseOver = null;
+        /// <summary>
+        /// Gets or sets the image used for rated part of the control when mouse is over the control.
+        /// </summary>
+        [DefaultValue(null), Description("Gets or sets the image used for rated part of the control when mouse is over the control.")]
+        public Image RatedMouseOver
+        {
+            get
+            {
+                return _RatedMouseOver;
+            }
+            set
+            {
+                if (_RatedMouseOver != value)
+                {
+                    _RatedMouseOver = value;
+                    OnImageChanged();
+                }
+            }
+        }
+
+        private Size _LargestImageSize = Size.Empty;
+        internal Size LargestImageSize
+        {
+            get
+            {
+                return _LargestImageSize;
+            }
+        }
+
+        private void OnImageChanged()
+        {
+            _LargestImageSize = new Size();
+            if (_Unrated != null)
+                _LargestImageSize = DisplayHelp.MaxSize(_LargestImageSize, _Unrated.Size);
+            if (_UnratedMouseOver != null)
+                _LargestImageSize = DisplayHelp.MaxSize(_LargestImageSize, _UnratedMouseOver.Size);
+            if (_Rated != null)
+                _LargestImageSize = DisplayHelp.MaxSize(_LargestImageSize, _Rated.Size);
+            if (_RatedMouseOver != null)
+                _LargestImageSize = DisplayHelp.MaxSize(_LargestImageSize, _RatedMouseOver.Size);
+            if (_AverageRated != null)
+                _LargestImageSize = DisplayHelp.MaxSize(_LargestImageSize, _AverageRated.Size);
+
+            if (_Parent != null)
+            {
+                _Parent.NeedRecalcSize = true;
+                _Parent.OnAppearanceChanged();
+            }
+        }
+    }
+    #endregion
+
+    /// <summary>
+    /// Delegate for Rating change events.
+    /// </summary>
+    public delegate void RatingChangeEventHandler(object sender, RatingChangeEventArgs e);
+
+    #region CheckBoxChangeEventArgs
+    /// <summary>
+    /// Represents event arguments for Rating change events.
+    /// </summary>
+    public class RatingChangeEventArgs : CancelEventArgs
+    {
+        /// <summary>
+        /// New Rating value being assigned.
+        /// </summary>
+        public int NewRating;
+        /// <summary>
+        /// Previous or current value (if RatingChanging event).
+        /// </summary>
+        public readonly int OldRating;
+        /// <summary>
+        /// Indicates the action that has caused the event.
+        /// </summary>
+        public readonly eEventSource EventSource = eEventSource.Code;
+
+        /// <summary>
+        /// Initializes a new instance of the RatingChangeEventArgs class.
+        /// </summary>
+        /// <param name="newRating"></param>
+        /// <param name="oldRating"></param>
+        /// <param name="eventSource"></param>
+        public RatingChangeEventArgs(int newRating, int oldRating, eEventSource eventSource)
+        {
+            NewRating = newRating;
+            OldRating = oldRating;
+            EventSource = eventSource;
+        }
+    }
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/RemindForm.cs b/PROMS/DotNetBar Source Code/RemindForm.cs
new file mode 100644
index 00000000..903a269c
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/RemindForm.cs	
@@ -0,0 +1,286 @@
+using System;
+using System.Drawing;
+using System.Collections;
+using System.ComponentModel;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Summary description for RemindForm.
+	/// </summary>
+	internal class RemindForm : System.Windows.Forms.Form
+	{
+		private System.Windows.Forms.Label label1;
+		private System.Windows.Forms.Label label2;
+		private System.Windows.Forms.Button button1;
+		private System.Windows.Forms.Button button2;
+		private System.Windows.Forms.Timer timer1;
+		private System.Windows.Forms.Label label3;
+		private System.Windows.Forms.Label label4;
+		private System.Windows.Forms.GroupBox groupBox1;
+		private System.Windows.Forms.Label label5;
+		private System.Windows.Forms.Label label6;
+		private System.Windows.Forms.LinkLabel linkOrder;
+		private System.Windows.Forms.Label label7;
+		private System.Windows.Forms.LinkLabel linkEmail;
+		private System.Windows.Forms.LinkLabel linkHome;
+		private System.ComponentModel.IContainer components;
+
+		public RemindForm()
+		{
+			//
+			// Required for Windows Form Designer support
+			//
+			InitializeComponent();
+
+			label2.Text="(c) "+System.DateTime.Now.Year.ToString()+" by DevComponents, All Rights Reserved.";
+		}
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		protected override void Dispose( bool disposing )
+		{
+			if( disposing )
+			{
+				if(components != null)
+				{
+					components.Dispose();
+				}
+			}
+			base.Dispose( disposing );
+		}
+
+        static DateTime _LastShown = DateTime.MinValue;
+        public new void ShowDialog()
+        {
+            if (_LastShown != DateTime.MinValue)
+            {
+                if (_LastShown.Subtract(DateTime.Now).TotalMinutes < 15)
+                    return;
+            }
+            _LastShown = DateTime.Now;
+            base.ShowDialog();
+        }
+
+		#region Windows Form 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.label1 = new System.Windows.Forms.Label();
+			this.label2 = new System.Windows.Forms.Label();
+			this.button1 = new System.Windows.Forms.Button();
+			this.button2 = new System.Windows.Forms.Button();
+			this.timer1 = new System.Windows.Forms.Timer(this.components);
+			this.linkEmail = new System.Windows.Forms.LinkLabel();
+			this.label3 = new System.Windows.Forms.Label();
+			this.label4 = new System.Windows.Forms.Label();
+			this.linkHome = new System.Windows.Forms.LinkLabel();
+			this.groupBox1 = new System.Windows.Forms.GroupBox();
+			this.label7 = new System.Windows.Forms.Label();
+			this.linkOrder = new System.Windows.Forms.LinkLabel();
+			this.label6 = new System.Windows.Forms.Label();
+			this.label5 = new System.Windows.Forms.Label();
+			this.groupBox1.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// label1
+			// 
+			this.label1.AutoSize = true;
+			this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((System.Byte)(0)));
+			this.label1.Location = new System.Drawing.Point(12, 8);
+			this.label1.Name = "label1";
+			this.label1.Size = new System.Drawing.Size(252, 15);
+			this.label1.TabIndex = 0;
+			this.label1.Text = "DevComponents DotNetBar Component";
+			// 
+			// label2
+			// 
+			this.label2.AutoSize = true;
+			this.label2.Location = new System.Drawing.Point(10, 32);
+			this.label2.Name = "label2";
+			this.label2.Size = new System.Drawing.Size(307, 13);
+			this.label2.TabIndex = 1;
+			this.label2.Text = "(c) 2001-2004 by DevComponents.com, All Rights Reserved";
+			// 
+			// button1
+			// 
+			this.button1.Enabled = false;
+			this.button1.Location = new System.Drawing.Point(10, 242);
+			this.button1.Name = "button1";
+			this.button1.Size = new System.Drawing.Size(72, 24);
+			this.button1.TabIndex = 0;
+			this.button1.Text = "OK";
+			this.button1.Click += new System.EventHandler(this.button1_Click);
+			// 
+			// button2
+			// 
+			this.button2.Location = new System.Drawing.Point(89, 242);
+			this.button2.Name = "button2";
+			this.button2.Size = new System.Drawing.Size(72, 24);
+			this.button2.TabIndex = 3;
+			this.button2.Text = "Buy Now";
+			this.button2.Click += new System.EventHandler(this.button2_Click);
+			// 
+			// timer1
+			// 
+			this.timer1.Enabled = true;
+			this.timer1.Interval = 800;
+			this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
+			// 
+			// linkEmail
+			// 
+			this.linkEmail.Location = new System.Drawing.Point(52, 200);
+			this.linkEmail.Name = "linkEmail";
+			this.linkEmail.Size = new System.Drawing.Size(145, 16);
+			this.linkEmail.TabIndex = 4;
+			this.linkEmail.TabStop = true;
+			this.linkEmail.Text = "info@devcomponents.com";
+			this.linkEmail.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkEmail_LinkClicked);
+			// 
+			// label3
+			// 
+			this.label3.AutoSize = true;
+			this.label3.Location = new System.Drawing.Point(12, 201);
+			this.label3.Name = "label3";
+			this.label3.Size = new System.Drawing.Size(40, 13);
+			this.label3.TabIndex = 5;
+			this.label3.Text = "E-Mail:";
+			// 
+			// label4
+			// 
+			this.label4.AutoSize = true;
+			this.label4.Location = new System.Drawing.Point(13, 217);
+			this.label4.Name = "label4";
+			this.label4.Size = new System.Drawing.Size(31, 13);
+			this.label4.TabIndex = 7;
+			this.label4.Text = "Web:";
+			// 
+			// linkHome
+			// 
+			this.linkHome.Location = new System.Drawing.Point(53, 216);
+			this.linkHome.Name = "linkHome";
+			this.linkHome.Size = new System.Drawing.Size(145, 16);
+			this.linkHome.TabIndex = 6;
+			this.linkHome.TabStop = true;
+			this.linkHome.Text = "www.devcomponents.com";
+			this.linkHome.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkHome_LinkClicked);
+			// 
+			// groupBox1
+			// 
+			this.groupBox1.Controls.AddRange(new System.Windows.Forms.Control[] {
+																					this.label7,
+																					this.linkOrder,
+																					this.label6,
+																					this.label5});
+			this.groupBox1.Location = new System.Drawing.Point(14, 55);
+			this.groupBox1.Name = "groupBox1";
+			this.groupBox1.Size = new System.Drawing.Size(294, 135);
+			this.groupBox1.TabIndex = 8;
+			this.groupBox1.TabStop = false;
+			// 
+			// label7
+			// 
+			this.label7.Location = new System.Drawing.Point(3, 104);
+			this.label7.Name = "label7";
+			this.label7.Size = new System.Drawing.Size(285, 12);
+			this.label7.TabIndex = 3;
+			this.label7.Text = "Order at:";
+			this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+			// 
+			// linkOrder
+			// 
+			this.linkOrder.Location = new System.Drawing.Point(6, 116);
+			this.linkOrder.Name = "linkOrder";
+			this.linkOrder.Size = new System.Drawing.Size(280, 15);
+			this.linkOrder.TabIndex = 2;
+			this.linkOrder.TabStop = true;
+			this.linkOrder.Text = "http://www.devcomponents.com/dotnetbar/order.html";
+			this.linkOrder.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+			this.linkOrder.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkOrder_LinkClicked);
+			// 
+			// label6
+			// 
+			this.label6.Location = new System.Drawing.Point(9, 72);
+			this.label6.Name = "label6";
+			this.label6.Size = new System.Drawing.Size(276, 31);
+			this.label6.TabIndex = 1;
+			this.label6.Text = "For pricing and licensing information please visit our web site. ";
+			// 
+			// label5
+			// 
+			this.label5.ForeColor = System.Drawing.Color.Maroon;
+			this.label5.Location = new System.Drawing.Point(8, 20);
+			this.label5.Name = "label5";
+			this.label5.Size = new System.Drawing.Size(276, 41);
+			this.label5.TabIndex = 0;
+			this.label5.Text = "This component is not registered and it is provided for evaluation purposes only." +
+				" This message will not appear after you register the component.";
+			// 
+			// RemindForm
+			// 
+			this.BackColor=Color.WhiteSmoke;
+			this.AcceptButton = this.button1;
+			this.AutoScaleBaseSize = new System.Drawing.Size(5, 13);
+			this.ClientSize = new System.Drawing.Size(321, 273);
+			this.ControlBox = false;
+			this.Controls.AddRange(new System.Windows.Forms.Control[] {
+																		  this.groupBox1,
+																		  this.label4,
+																		  this.label3,
+																		  this.label2,
+																		  this.label1,
+																		  this.linkHome,
+																		  this.linkEmail,
+																		  this.button2,
+																		  this.button1});
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.Name = "RemindForm";
+			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+			this.Text = "Component not registered";
+			this.groupBox1.ResumeLayout(false);
+			this.ResumeLayout(false);
+
+		}
+		#endregion
+
+		private void timer1_Tick(object sender, System.EventArgs e)
+		{
+			timer1.Enabled=false;
+			button1.Enabled=true;
+			button1.Focus();
+		}
+
+		private void button2_Click(object sender, System.EventArgs e)
+		{
+			System.Diagnostics.Process.Start(linkOrder.Text);
+		}
+
+		private void button1_Click(object sender, System.EventArgs e)
+		{
+			this.Close();
+		}
+
+		private void linkHome_LinkClicked(object sender, System.Windows.Forms.LinkLabelLinkClickedEventArgs e)
+		{
+			System.Diagnostics.Process.Start("http://www.devcomponents.com");
+		}
+
+		private void linkEmail_LinkClicked(object sender, System.Windows.Forms.LinkLabelLinkClickedEventArgs e)
+		{
+			System.Diagnostics.Process.Start("mailto:support@devcomponents.com");
+		}
+
+		private void linkOrder_LinkClicked(object sender, System.Windows.Forms.LinkLabelLinkClickedEventArgs e)
+		{
+			System.Diagnostics.Process.Start(linkOrder.Text);
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/RemindForm.resx b/PROMS/DotNetBar Source Code/RemindForm.resx
new file mode 100644
index 00000000..55578e95
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/RemindForm.resx	
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+            Microsoft ResX Schema 
+        
+            Version 1.3
+                
+            The primary goals of this format is to allow a simple XML format 
+            that is mostly human readable. The generation and parsing of the 
+            various data types are done through the TypeConverter classes 
+            associated with the data types.
+        
+            Example:
+        
+                ... ado.net/XML headers & schema ...
+                <resheader name="resmimetype">text/microsoft-resx</resheader>
+                <resheader name="version">1.3</resheader>
+                <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+                <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+                <data name="Name1">this is my long string</data>
+                <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+                <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+                    [base64 mime encoded serialized .NET Framework object]
+                </data>
+                <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+                    [base64 mime encoded string representing a byte array form of the .NET Framework object]
+                </data>
+        
+            There are any number of "resheader" rows that contain simple 
+            name/value pairs.
+            
+            Each data row contains a name, and value. The row also contains a 
+            type or mimetype. Type corresponds to a .NET class that support 
+            text/value conversion through the TypeConverter architecture. 
+            Classes that don't support this are serialized and stored with the 
+            mimetype set.
+                     
+            The mimetype is used for serialized objects, and tells the 
+            ResXResourceReader how to depersist the object. This is currently not 
+            extensible. For a given mimetype the value must be set accordingly:
+        
+            Note - application/x-microsoft.net.object.binary.base64 is the format 
+                   that the ResXResourceWriter will generate, however the reader can 
+                   read any of the formats listed below.
+        
+            mimetype: application/x-microsoft.net.object.binary.base64
+            value   : The object must be serialized with 
+                    : System.Serialization.Formatters.Binary.BinaryFormatter
+                    : and then encoded with base64 encoding.
+        
+            mimetype: application/x-microsoft.net.object.soap.base64
+            value   : The object must be serialized with 
+                    : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+                    : and then encoded with base64 encoding.
+            mimetype: application/x-microsoft.net.object.bytearray.base64
+            value   : The object must be serialized into a byte array 
+                    : using a System.ComponentModel.TypeConverter
+                    : and then encoded with base64 encoding.
+        -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>1.3</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="timer1.Location" type="System.Drawing.Point, System.Drawing, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </data>
+  <data name="$this.Name">
+    <value>RemindForm</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/Rendering/BaseRenderer.cs b/PROMS/DotNetBar Source Code/Rendering/BaseRenderer.cs
new file mode 100644
index 00000000..ea872690
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/BaseRenderer.cs	
@@ -0,0 +1,947 @@
+using DevComponents.DotNetBar.Controls;
+using System;
+using System.Text;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    /// <summary>
+    /// Represents bases class that defines a renderer.
+    /// </summary>
+    public abstract class BaseRenderer
+    {
+        #region Events
+        /// <summary>
+        /// Occurs when KeyTip is rendered.
+        /// </summary>
+        public event KeyTipsRendererEventHandler RenderKeyTips;
+
+        /// <summary>
+        /// Occurs when ribbon tab group is rendered.
+        /// </summary>
+        public event RibbonTabGroupRendererEventHandler RenderRibbonTabGroup;
+
+        /// <summary>
+        /// Occurs when ItemContainer is rendered.
+        /// </summary>
+        public event ItemContainerRendererEventHandler RenderItemContainer;
+
+        /// <summary>
+        /// Occurs when separator is drawn for an item inside of ItemContainer.
+        /// </summary>
+        public event ItemContainerSeparatorRendererEventHandler RenderItemContainerSeparator;
+
+        /// <summary>
+        /// Occurs when ButtonItem is rendered.
+        /// </summary>
+        public event ButtonItemRendererEventHandler RenderButtonItem;
+
+        /// <summary>
+        /// Occurs when RibbonTabItem is rendered.
+        /// </summary>
+        public event RibbonTabItemRendererEventHandler RenderRibbonTabItem;
+
+        /// <summary>
+        /// Occurs when docked or floating toolbar is rendered.
+        /// </summary>
+        public event ToolbarRendererEventHandler RenderToolbarBackground;
+
+        /// <summary>
+        /// Occurs when popup toolbar is rendered.
+        /// </summary>
+        public event ToolbarRendererEventHandler RenderPopupToolbarBackground;
+
+        /// <summary>
+        /// Occurs when dialog launcher button on ribbon bar is rendered.
+        /// </summary>
+        public event RibbonBarRendererEventHandler RenderRibbonDialogLauncher;
+
+        /// <summary>
+        /// Occurs when Ribbon Control background is rendered.
+        /// </summary>
+        public event RibbonControlRendererEventHandler RenderRibbonControlBackground;
+
+        /// <summary>
+        /// Occurs when form caption text on ribbon control is rendered.
+        /// </summary>
+        public event RibbonControlRendererEventHandler RenderRibbonFormCaptionText;
+
+        /// <summary>
+        /// Occurs when Quick Access Toolbar background is rendered.
+        /// </summary>
+        public event RibbonControlRendererEventHandler RenderQuickAccessToolbarBackground;
+
+        ///// <summary>
+        ///// Occurs when ribbon bar background is rendered.
+        ///// </summary>
+        //public event RibbonBarRendererEventHandler RenderRibbonBarBackground;
+
+        ///// <summary>
+        ///// Occurs when ribbon bar title is rendered.
+        ///// </summary>
+        //public event RibbonBarRendererEventHandler RenderRibbonBarTitle;
+
+        /// <summary>
+        /// Occurs when ColorItem is rendered.
+        /// </summary>
+        public event ColorItemRendererEventHandler RenderColorItem;
+
+        /// <summary>
+        /// Occurs when SystemCaptionItem is rendered.
+        /// </summary>
+        public event SystemCaptionItemRendererEventHandler RenderSystemCaptionItem;
+
+        /// <summary>
+        /// Occurs when MdiSystemItem is rendered.
+        /// </summary>
+        public event MdiSystemItemRendererEventHandler RenderMdiSystemItem;
+
+        /// <summary>
+        /// Occurs when form caption is background is being rendered.
+        /// </summary>
+        public event FormCaptionRendererEventHandler RenderFormCaptionBackground;
+
+        /// <summary>
+        /// Occurs when quick access toolbar overflow item is being rendered.
+        /// </summary>
+        public event QatOverflowItemRendererEventHandler RenderQatOverflowItem;
+
+        /// <summary>
+        /// Occurs when quick access toolbar customize item is being rendered.
+        /// </summary>
+        public event QatCustomizeItemRendererEventHandler RenderQatCustomizeItem;
+
+        /// <summary>
+        /// Occurs when CheckBoxItem is being rendered.
+        /// </summary>
+        public event CheckBoxItemRendererEventHandler RenderCheckBoxItem;
+
+        /// <summary>
+        /// Occurs when ProgressBarItem is being rendered.
+        /// </summary>
+        public event ProgressBarItemRendererEventHandler RenderProgressBarItem;
+
+        /// <summary>
+        /// Occurs when Navigation pane button background is being rendered.
+        /// </summary>
+        public event NavPaneRendererEventHandler RenderNavPaneButtonBackground;
+
+        /// <summary>
+        /// Occurs when Slider item is being rendered.
+        /// </summary>
+        public event SliderItemRendererEventHandler RenderSliderItem;
+
+        /// <summary>
+        /// Occurs when Range Slider item is being rendered.
+        /// </summary>
+        public event RangeSliderItemRendererEventHandler RenderRangeSliderItem;
+
+        /// <summary>
+        /// Occurs when SideBar control is being rendered.
+        /// </summary>
+        public event SideBarRendererEventHandler RenderSideBar;
+        /// <summary>
+        /// Occurs when SideBarPanelItem control is being rendered.
+        /// </summary>
+        public event SideBarPanelItemRendererEventHandler RenderSideBarPanelItem;
+
+        /// <summary>
+        /// Occurs when CrumbBarItemView is rendered.
+        /// </summary>
+        public event ButtonItemRendererEventHandler RenderCrumbBarItemView;
+        /// <summary>
+        /// Occurs when CrumbBarOverflowButton is rendered.
+        /// </summary>
+        public event ButtonItemRendererEventHandler RenderCrumbBarOverflowItem;
+
+        /// <summary>
+        /// Occurs when Slider item is being rendered.
+        /// </summary>
+        public event SwitchButtonRendererEventHandler RenderSwitchButton;
+
+        /// <summary>
+        /// Occurs when StepItem is being rendered.
+        /// </summary>
+        public event StepItemRendererEventHandler RenderStepItem;
+        /// <summary>
+        /// Occurs when ListBoxItem is being rendered.
+        /// </summary>
+        public event ListBoxItemRendererEventHandler RenderListBoxItem;
+        /// <summary>
+        /// Occurs when SideNavItem is being rendered.
+        /// </summary>
+        public event SideNavItemRendererEventHandler RenderSideNavItem;
+
+        /// <summary>
+        /// Occurs when TabStrip is being rendered.
+        /// </summary>
+        public event TabFormStripRendererEventHandler RenderTabFormStrip;
+
+        /// <summary>
+        /// Occurs when TabFormItem is rendered.
+        /// </summary>
+        public event ButtonItemRendererEventHandler RenderTabFormItem;
+        /// <summary>
+        /// Occurs when NewTabFormItem is rendered.
+        /// </summary>
+        public event ButtonItemRendererEventHandler RenderNewTabFormItem;
+
+        /// <summary>
+        /// Occurs when TabParentForm is being rendered.
+        /// </summary>
+        public event TabFormRendererEventHandler RenderTabParentForm;
+        #endregion
+
+        #region Internal Implementation
+        /// <summary>
+        /// Raises RenderKeyTips event.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        protected virtual void OnRenderKeyTips(KeyTipsRendererEventArgs e)
+        {
+            if (RenderKeyTips != null)
+                RenderKeyTips(this, e);
+        }
+        /// <summary>
+        /// Draws KeyTip for an object. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+        /// do not want default rendering to occur do not call the base implementation. You can call OnRenderKeyTips method so events can occur.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        public virtual void DrawKeyTips(KeyTipsRendererEventArgs e)
+        {
+            OnRenderKeyTips(e);
+        }
+
+        /// <summary>
+        /// Raises RenderRibbonTabGroup event.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        protected virtual void OnRenderRibbonTabGroup(RibbonTabGroupRendererEventArgs e)
+        {
+            if (RenderRibbonTabGroup != null)
+                RenderRibbonTabGroup(this, e);
+        }
+        /// <summary>
+        /// Draws ribbon tab group. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+        /// do not want default rendering to occur do not call the base implementation. You can call OnRenderRibbonTabGroup method so events can occur.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        public virtual void DrawRibbonTabGroup(RibbonTabGroupRendererEventArgs e)
+        {
+            OnRenderRibbonTabGroup(e);
+        }
+
+        /// <summary>
+        /// Raises RenderItemContainer event.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        protected virtual void OnRenderItemContainer(ItemContainerRendererEventArgs e)
+        {
+            if (RenderItemContainer != null)
+                RenderItemContainer(this, e);
+        }
+
+        /// <summary>
+        /// Draws the separator for an item inside of item container. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+        /// do not want default rendering to occur do not call the base implementation. You can call OnRenderItemContainerSeparator method so events can occur.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        public virtual void DrawItemContainerSeparator(ItemContainerSeparatorRendererEventArgs e)
+        {
+            OnRenderItemContainerSeparator(e);
+        }
+
+        /// <summary>
+        /// Raises RenderItemContainer event.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        protected virtual void OnRenderItemContainerSeparator(ItemContainerSeparatorRendererEventArgs e)
+        {
+            if (RenderItemContainerSeparator != null)
+                RenderItemContainerSeparator(this, e);
+        }
+        /// <summary>
+        /// Draws item container. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+        /// do not want default rendering to occur do not call the base implementation. You can call OnRenderItemContainer method so events can occur.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        public virtual void DrawItemContainer(ItemContainerRendererEventArgs e)
+        {
+            OnRenderItemContainer(e);
+        }
+
+        /// <summary>
+        /// Raises RenderButtonItem event.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        protected virtual void OnRenderButtonItem(ButtonItemRendererEventArgs e)
+        {
+            if (RenderButtonItem != null)
+                RenderButtonItem(this, e);
+        }
+        /// <summary>
+        /// Draws ButtonItem. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+        /// do not want default rendering to occur do not call the base implementation. You can call OnRenderButtonItem method so events can occur.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        public virtual void DrawButtonItem(ButtonItemRendererEventArgs e)
+        {
+            OnRenderButtonItem(e);
+        }
+
+        /// <summary>
+        /// Raises RenderRibbonTabItem event.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        protected virtual void OnRenderRibbonTabItem(RibbonTabItemRendererEventArgs e)
+        {
+            if (RenderRibbonTabItem != null)
+                RenderRibbonTabItem(this, e);
+        }
+        /// <summary>
+        /// Draws RibbonTabItem. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+        /// do not want default rendering to occur do not call the base implementation. You can call OnRenderRibbonTabItem method so events can occur.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        public virtual void DrawRibbonTabItem(RibbonTabItemRendererEventArgs e)
+        {
+            OnRenderRibbonTabItem(e);
+        }
+
+        /// <summary>
+        /// Raises RenderToolbarBackground event.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        protected virtual void OnRenderToolbarBackground(ToolbarRendererEventArgs e)
+        {
+            if (RenderToolbarBackground != null)
+                RenderToolbarBackground(this, e);
+        }
+        /// <summary>
+        /// Draws docked or floating toolbar background. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+        /// do not want default rendering to occur do not call the base implementation. You can call OnRenderToolbarBackground method so events can occur.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        public virtual void DrawToolbarBackground(ToolbarRendererEventArgs e)
+        {
+            OnRenderToolbarBackground(e);
+        }
+
+        /// <summary>
+        /// Raises RenderPopupToolbarBackground event.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        protected virtual void OnRenderPopupToolbarBackground(ToolbarRendererEventArgs e)
+        {
+            if (RenderPopupToolbarBackground != null)
+                RenderPopupToolbarBackground(this, e);
+        }
+        /// <summary>
+        /// Draws popup toolbar background. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+        /// do not want default rendering to occur do not call the base implementation. You can call OnRenderPopupToolbarBackground method so events can occur.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        public virtual void DrawPopupToolbarBackground(ToolbarRendererEventArgs e)
+        {
+            OnRenderPopupToolbarBackground(e);
+        }
+
+        /// <summary>
+        /// Raises RenderRibbonDialogLauncher event.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        protected virtual void OnRenderRibbonDialogLauncher(RibbonBarRendererEventArgs e)
+        {
+            if (RenderRibbonDialogLauncher != null)
+                RenderRibbonDialogLauncher(this, e);
+        }
+        /// <summary>
+        /// Draws ribbon bar dialog launcher button. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+        /// do not want default rendering to occur do not call the base implementation. You can call OnRenderRibbonDialogLauncher method so events can occur.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        public virtual void DrawRibbonDialogLauncher(RibbonBarRendererEventArgs e)
+        {
+            OnRenderRibbonDialogLauncher(e);
+        }
+
+        /// <summary>
+        /// Raises RenderColorItem event event.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        protected virtual void OnRenderColorItem(ColorItemRendererEventArgs e)
+        {
+            if (RenderColorItem != null)
+                RenderColorItem(this, e);
+        }
+        /// <summary>
+        /// Draws ColorItem. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+        /// do not want default rendering to occur do not call the base implementation. You can call OnRenderColorItem method so events can occur.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        public virtual void DrawColorItem(ColorItemRendererEventArgs e)
+        {
+            OnRenderColorItem(e);
+        }
+
+        ///// <summary>
+        ///// Raises RenderRibbonBarBackground event.
+        ///// </summary>
+        ///// <param name="e">Provides context information.</param>
+        //protected virtual void OnRenderRibbonBarBackground(RibbonBarRendererEventArgs e)
+        //{
+        //    if (RenderRibbonBarBackground != null)
+        //        RenderRibbonBarBackground(this, e);
+        //}
+        ///// <summary>
+        ///// Draws ribbon bar background. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+        ///// do not want default rendering to occur do not call the base implementation. You can call OnRenderRibbonBarBackground method so events can occur.
+        ///// </summary>
+        ///// <param name="e">Provides context information.</param>
+        //public virtual void DrawRibbonBarBackground(RibbonBarRendererEventArgs e)
+        //{
+        //    OnRenderRibbonBarBackground(e);
+        //}
+
+        ///// <summary>
+        ///// Raises RenderRibbonBarTitle event.
+        ///// </summary>
+        ///// <param name="e">Provides context information.</param>
+        //protected virtual void OnRenderRibbonBarTitle(RibbonBarRendererEventArgs e)
+        //{
+        //    if (RenderRibbonBarTitle != null)
+        //        RenderRibbonBarTitle(this, e);
+        //}
+        ///// <summary>
+        ///// Draws ribbon bar title. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+        ///// do not want default rendering to occur do not call the base implementation. You can call OnRenderRibbonBarTitle method so events can occur.
+        ///// </summary>
+        ///// <param name="e">Provides context information.</param>
+        //public virtual void DrawRibbonBarTitle(RibbonBarRendererEventArgs e)
+        //{
+        //    OnRenderRibbonBarTitle(e);
+        //}
+
+        /// <summary>
+        /// Raises RenderRibbonControlBackground event event.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        protected virtual void OnRenderRibbonControlBackground(RibbonControlRendererEventArgs e)
+        {
+            if (RenderRibbonControlBackground != null)
+                RenderRibbonControlBackground(this, e);
+        }
+        /// <summary>
+        /// Draws the background of the Ribbon Control. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+        /// do not want default rendering to occur do not call the base implementation. You can call OnRenderRibbonControlBackground method so events can occur.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        public virtual void DrawRibbonControlBackground(RibbonControlRendererEventArgs e)
+        {
+            OnRenderRibbonControlBackground(e);
+        }
+
+        /// <summary>
+        /// Raises RenderSystemCaptionItem event event.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        protected virtual void OnRenderSystemCaptionItem(SystemCaptionItemRendererEventArgs e)
+        {
+            if (RenderSystemCaptionItem != null)
+                RenderSystemCaptionItem(this, e);
+        }
+        /// <summary>
+        /// Draws the SystemCaptionItem. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+        /// do not want default rendering to occur do not call the base implementation. You can call OnRenderSystemCaptionItem method so events can occur.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        public virtual void DrawSystemCaptionItem(SystemCaptionItemRendererEventArgs e)
+        {
+            OnRenderSystemCaptionItem(e);
+        }
+
+        /// <summary>
+        /// Raises RenderRibbonFormCaptionText event event.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        protected virtual void OnRenderRibbonFormCaptionText(RibbonControlRendererEventArgs e)
+        {
+            if (RenderRibbonFormCaptionText != null)
+                RenderRibbonFormCaptionText(this, e);
+        }
+        /// <summary>
+        /// Draws the form caption text for the Ribbon Control. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+        /// do not want default rendering to occur do not call the base implementation. You can call OnRenderRibbonFormCaptionText method so events can occur.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        public virtual void DrawRibbonFormCaptionText(RibbonControlRendererEventArgs e)
+        {
+            OnRenderRibbonFormCaptionText(e);
+        }
+
+        /// <summary>
+        /// Raises RenderQuickAccessToolbarBackground event event.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        protected virtual void OnRenderQuickAccessToolbarBackground(RibbonControlRendererEventArgs e)
+        {
+            if (RenderQuickAccessToolbarBackground != null)
+                RenderQuickAccessToolbarBackground(this, e);
+        }
+        /// <summary>
+        /// Draws the background of Quick Access Toolbar on Ribbon Control. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+        /// do not want default rendering to occur do not call the base implementation. You can call OnRenderQuickAccessToolbarBackground method so events can occur.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        public virtual void DrawQuickAccessToolbarBackground(RibbonControlRendererEventArgs e)
+        {
+            OnRenderQuickAccessToolbarBackground(e);
+        }
+
+        /// <summary>
+        /// Raises RenderMdiSystemItem event.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        protected virtual void OnRenderMdiSystemItem(MdiSystemItemRendererEventArgs e)
+        {
+            if (RenderMdiSystemItem != null)
+                RenderMdiSystemItem(this, e);
+        }
+        /// <summary>
+        /// Draws the MdiSystemItem. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+        /// do not want default rendering to occur do not call the base implementation. You can call OnRenderMdiSystemItem method so events can occur.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        public virtual void DrawMdiSystemItem(MdiSystemItemRendererEventArgs e)
+        {
+            OnRenderMdiSystemItem(e);
+        }
+        #endregion
+
+        #region Form Caption
+        /// <summary>
+        /// Raises RenderFormCaptionBackground event.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        protected virtual void OnRenderFormCaptionBackground(FormCaptionRendererEventArgs e)
+        {
+            if (RenderFormCaptionBackground != null)
+                RenderFormCaptionBackground(this, e);
+        }
+        /// <summary>
+        /// Draws the form caption background. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+        /// do not want default rendering to occur do not call the base implementation. You can call OnRenderFormCaptionBackground method so events can occur.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        public virtual void DrawFormCaptionBackground(FormCaptionRendererEventArgs e)
+        {
+            OnRenderFormCaptionBackground(e);
+        }
+        #endregion
+
+        #region QAT Overflow/Customize Item
+        /// <summary>
+        /// Raises RenderQatOverflowItem event.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        protected virtual void OnRenderQatOverflowItem(QatOverflowItemRendererEventArgs e)
+        {
+            if (RenderQatOverflowItem != null)
+                RenderQatOverflowItem(this, e);
+        }
+        /// <summary>
+        /// Draws the Quick Access Toolbar Overflow item. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+        /// do not want default rendering to occur do not call the base implementation. You can call OnRenderQatOverflowItem method so events can occur.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        public virtual void DrawQatOverflowItem(QatOverflowItemRendererEventArgs e)
+        {
+            OnRenderQatOverflowItem(e);
+        }
+
+        /// <summary>
+        /// Raises RenderQatCustomizeItem event.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        protected virtual void OnRenderQatCustomizeItem(QatCustomizeItemRendererEventArgs e)
+        {
+            if (RenderQatCustomizeItem != null)
+                RenderQatCustomizeItem(this, e);
+        }
+        /// <summary>
+        /// Draws the Quick Access Toolbar Customize Item. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+        /// do not want default rendering to occur do not call the base implementation. You can call OnRenderQatCustomizeItem method so events can occur.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        public virtual void DrawQatCustomizeItem(QatCustomizeItemRendererEventArgs e)
+        {
+            OnRenderQatCustomizeItem(e);
+        }
+        #endregion
+
+        #region CheckBoxItem
+        /// <summary>
+        /// Raises RenderCheckBoxItem event.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        protected virtual void OnRenderCheckBoxItem(CheckBoxItemRenderEventArgs e)
+        {
+            if (RenderCheckBoxItem != null)
+                RenderCheckBoxItem(this, e);
+        }
+        /// <summary>
+        /// Draws the CheckBoxItem. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+        /// do not want default rendering to occur do not call the base implementation. You can call OnRenderCheckBoxItem method so events can occur.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        public virtual void DrawCheckBoxItem(CheckBoxItemRenderEventArgs e)
+        {
+            OnRenderCheckBoxItem(e);
+        }
+        #endregion
+
+        #region ProgressBarItem
+        /// <summary>
+        /// Raises RenderCheckBoxItem event.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        protected virtual void OnRenderProgressBarItem(ProgressBarItemRenderEventArgs e)
+        {
+            if (RenderProgressBarItem != null)
+                RenderProgressBarItem(this, e);
+        }
+        /// <summary>
+        /// Draws the ProgressBarItem. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+        /// do not want default rendering to occur do not call the base implementation. You can call OnRenderProgressBarItem method so events can occur.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        public virtual void DrawProgressBarItem(ProgressBarItemRenderEventArgs e)
+        {
+            OnRenderProgressBarItem(e);
+        }
+        #endregion
+
+        #region Navigation Pane
+        /// <summary>
+        /// Raises RenderNavPaneButtonBackground event.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        protected virtual void OnRenderNavPaneButtonBackground(NavPaneRenderEventArgs e)
+        {
+            if (RenderNavPaneButtonBackground != null)
+                RenderNavPaneButtonBackground(this, e);
+        }
+
+        /// <summary>
+        /// Draws the Navigation Pane button background. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+        /// do not want default rendering to occur do not call the base implementation. You can call OnRenderNavPaneButtonBackground method so events can occur.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        public virtual void DrawNavPaneButtonBackground(NavPaneRenderEventArgs e)
+        {
+            OnRenderNavPaneButtonBackground(e);
+        }
+        #endregion
+
+        #region SliderItem
+        /// <summary>
+        /// Raises RenderSliderItem event.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        protected virtual void OnRenderSliderItem(SliderItemRendererEventArgs e)
+        {
+            if (RenderSliderItem!= null)
+                RenderSliderItem(this, e);
+        }
+
+        /// <summary>
+        /// Draws the Slider item. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+        /// do not want default rendering to occur do not call the base implementation. You can call OnRenderSliderItem method so events can occur.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        public virtual void DrawSliderItem(SliderItemRendererEventArgs e)
+        {
+            OnRenderSliderItem(e);
+        }
+        #endregion
+
+        #region SideBar Control
+        /// <summary>
+        /// Raises RenderSideBar event.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        protected virtual void OnRenderSideBar(SideBarRendererEventArgs e)
+        {
+            if (RenderSideBar != null)
+                RenderSideBar(this, e);
+        }
+
+        /// <summary>
+        /// Draws the SideBar control. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+        /// do not want default rendering to occur do not call the base implementation. You can call OnRenderSideBar method so events can occur.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        public virtual void DrawSideBar(SideBarRendererEventArgs e)
+        {
+            OnRenderSideBar(e);
+        }
+
+        /// <summary>
+        /// Raises RenderSideBarPanelItem event.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        protected virtual void OnRenderSideBarPanelItem(SideBarPanelItemRendererEventArgs e)
+        {
+            if (RenderSideBarPanelItem != null)
+                RenderSideBarPanelItem(this, e);
+        }
+
+        /// <summary>
+        /// Draws the SideBar control. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+        /// do not want default rendering to occur do not call the base implementation. You can call OnRenderSideBarPanelItem method so events can occur.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        public virtual void DrawSideBarPanelItem(SideBarPanelItemRendererEventArgs e)
+        {
+            OnRenderSideBarPanelItem(e);
+        }
+        #endregion
+
+        #region CrumbBar
+        /// <summary>
+        /// Raises RenderCrumbBarItemView event.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        protected virtual void OnRenderCrumbBarItemView(ButtonItemRendererEventArgs e)
+        {
+            if (RenderCrumbBarItemView != null)
+                RenderCrumbBarItemView(this, e);
+        }
+        /// <summary>
+        /// Draws CrumbBarItemView. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+        /// do not want default rendering to occur do not call the base implementation. You can call OnRenderCrumbBarItemView method so events can occur.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        public virtual void DrawCrumbBarItemView(ButtonItemRendererEventArgs e)
+        {
+            OnRenderCrumbBarItemView(e);
+        }
+
+        /// <summary>
+        /// Raises RenderCrumbBarOverflowItem event.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        protected virtual void OnRenderCrumbBarOverflowItem(ButtonItemRendererEventArgs e)
+        {
+            if (RenderCrumbBarOverflowItem != null)
+                RenderCrumbBarOverflowItem(this, e);
+        }
+        /// <summary>
+        /// Draws CrumbBarOverflowButton. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+        /// do not want default rendering to occur do not call the base implementation. You can call OnRenderCrumbBarOverflowItem method so events can occur.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        public virtual void DrawCrumbBarOverflowItem(ButtonItemRendererEventArgs e)
+        {
+            OnRenderCrumbBarOverflowItem(e);
+        }
+        #endregion
+
+        #region SwitchButton
+        /// <summary>
+        /// Raises RenderSwitchButton event.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        protected virtual void OnRenderSwitchButton(SwitchButtonRenderEventArgs e)
+        {
+            if (RenderSwitchButton != null)
+                RenderSwitchButton(this, e);
+        }
+
+        /// <summary>
+        /// Draws the Switch Button. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+        /// do not want default rendering to occur do not call the base implementation. You can call OnRenderSwitchButton method so events can occur.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        public virtual void DrawSwitchButton(SwitchButtonRenderEventArgs e)
+        {
+            OnRenderSwitchButton(e);
+        }
+        #endregion
+
+        #region RangeSliderItem
+        /// <summary>
+        /// Raises RenderRangeSliderItem event.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        protected virtual void OnRenderRangeSliderItem(RangeSliderItemRendererEventArgs e)
+        {
+            if (RenderRangeSliderItem != null)
+                RenderRangeSliderItem(this, e);
+        }
+
+        /// <summary>
+        /// Draws the Range Slider item. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+        /// do not want default rendering to occur do not call the base implementation. You can call OnRenderRangeSliderItem method so events can occur.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        public virtual void DrawRangeSliderItem(RangeSliderItemRendererEventArgs e)
+        {
+            OnRenderRangeSliderItem(e);
+        }
+        #endregion
+
+        #region StepItem
+        /// <summary>
+        /// Raises RenderStepItem event.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        protected virtual void OnRenderStepItem(StepItemRendererEventArgs e)
+        {
+            if (RenderStepItem != null)
+                RenderStepItem(this, e);
+        }
+
+        /// <summary>
+        /// Draws the Step item. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+        /// do not want default rendering to occur do not call the base implementation. You can call OnRenderStepItem method so events can occur.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        public virtual void DrawStepItem(StepItemRendererEventArgs e)
+        {
+            OnRenderStepItem(e);
+        }
+        #endregion
+
+        #region ListBoxItem
+        /// <summary>
+        /// Raises RenderListBoxItem event.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        protected virtual void OnRenderListBoxItem(ListBoxItemRendererEventArgs e)
+        {
+            if (RenderListBoxItem != null)
+                RenderListBoxItem(this, e);
+        }
+
+        /// <summary>
+        /// Draws the ListBoxItem. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+        /// do not want default rendering to occur do not call the base implementation. You can call OnRenderListBoxItem method so events can occur.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        public virtual void DrawListBoxItem(ListBoxItemRendererEventArgs e)
+        {
+            OnRenderListBoxItem(e);
+        }
+        #endregion
+
+        #region SideNavItem
+        /// <summary>
+        /// Raises RenderListBoxItem event.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        protected virtual void OnRenderSideNavItem(SideNavItemRendererEventArgs e)
+        {
+            if (RenderSideNavItem != null)
+                RenderSideNavItem(this, e);
+        }
+
+        /// <summary>
+        /// Draws the ListBoxItem. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+        /// do not want default rendering to occur do not call the base implementation. You can call OnRenderListBoxItem method so events can occur.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        public virtual void DrawSideNavItem(SideNavItemRendererEventArgs e)
+        {
+            OnRenderSideNavItem(e);
+        }
+        #endregion
+
+        #region TabStrip
+        /// <summary>
+        /// Raises RenderTabFormStrip event.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        protected virtual void OnRenderTabFormStrip(TabFormStripPainterArgs e)
+        {
+            if (RenderTabFormStrip != null)
+                RenderTabFormStrip(this, e);
+        }
+
+        /// <summary>
+        /// Draws the TabStrip. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+        /// do not want default rendering to occur do not call the base implementation. You can call OnRenderTabFormStrip method so events can occur.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        public virtual void DrawTabFormStrip(TabFormStripPainterArgs e)
+        {
+            OnRenderTabFormStrip(e);
+        }
+        #endregion
+
+        #region TabFormItem
+        /// <summary>
+        /// Raises RenderTabFormItem event.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        protected virtual void OnRenderTabFormItem(ButtonItemRendererEventArgs e)
+        {
+            if (RenderTabFormItem != null)
+                RenderTabFormItem(this, e);
+        }
+
+        /// <summary>
+        /// Draws the TabStrip. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+        /// do not want default rendering to occur do not call the base implementation. You can call OnRenderTabFormStrip method so events can occur.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        public virtual void DrawTabFormItem(ButtonItemRendererEventArgs e)
+        {
+            OnRenderTabFormItem(e);
+        }
+        #endregion
+
+        #region NewTabFormItem
+        /// <summary>
+        /// Raises RenderNewTabFormItem event.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        protected virtual void OnRenderNewTabFormItem(ButtonItemRendererEventArgs e)
+        {
+            if (RenderNewTabFormItem != null)
+                RenderNewTabFormItem(this, e);
+        }
+
+        /// <summary>
+        /// Draws the NewTabFormItem. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+        /// do not want default rendering to occur do not call the base implementation. You can call OnRenderTabFormStrip method so events can occur.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        public virtual void DrawNewTabFormItem(ButtonItemRendererEventArgs e)
+        {
+            OnRenderNewTabFormItem(e);
+        }
+        #endregion
+
+        #region TabParentForm
+        /// <summary>
+        /// Raises RenderTabParentForm event.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        protected virtual void OnRenderTabParentForm(TabFormPainterArgs e)
+        {
+            if (RenderTabParentForm != null)
+                RenderTabParentForm(this, e);
+        }
+
+        /// <summary>
+        /// Draws the TabParentForm. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+        /// do not want default rendering to occur do not call the base implementation. You can call OnRenderTabParentForm method so events can occur.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        public virtual void DrawTabParentForm(TabFormPainterArgs e)
+        {
+            OnRenderTabParentForm(e);
+        }
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/Rendering/ButtonItemStaticColorTables.cs b/PROMS/DotNetBar Source Code/Rendering/ButtonItemStaticColorTables.cs
new file mode 100644
index 00000000..798ea37e
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/ButtonItemStaticColorTables.cs	
@@ -0,0 +1,104 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    public class ButtonItemStaticColorTables
+    {
+        public static Office2007ButtonItemColorTable CreateBlueOrbColorTable()
+        {
+            return CreateBlueOrbColorTable(new ColorFactory());
+        }
+
+        public static Office2007ButtonItemColorTable CreateBlueOrbColorTable(ColorFactory factory)
+        {
+            DevComponents.DotNetBar.Rendering.Office2007ButtonItemColorTable table = new DevComponents.DotNetBar.Rendering.Office2007ButtonItemColorTable();
+            table.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.BlueOrb);
+
+            // Define standard colors when mouse is not over the button
+            table.Default = new DevComponents.DotNetBar.Rendering.Office2007ButtonItemStateColorTable();
+            table.Default.OuterBorder.Start = factory.GetColor(0x5273AF);
+            table.Default.OuterBorder.End = factory.GetColor(0x08387F);
+            table.Default.InnerBorder.Start = factory.GetColor(0xD6DFEF);
+            table.Default.InnerBorder.End = factory.GetColor(192, 0x5699D4);
+            table.Default.TopBackground.Start = factory.GetColor(0xB5BEDE);
+            table.Default.TopBackground.End = factory.GetColor(0x3568B1);
+            table.Default.BottomBackground.Start = factory.GetColor(0x001B5F);
+            table.Default.BottomBackground.End = factory.GetColor(0x4BD6FF);
+            table.Default.BottomBackgroundHighlight.Start = factory.GetColor(0x56DAFF);
+            table.Default.BottomBackgroundHighlight.End = Color.Transparent;
+            table.Default.Text = factory.GetColor(0xFFFFFF);
+
+            // Define colors when mouse is over the button
+            table.MouseOver = new DevComponents.DotNetBar.Rendering.Office2007ButtonItemStateColorTable();
+            table.MouseOver.OuterBorder.Start = factory.GetColor(0x5185C8);
+            table.MouseOver.OuterBorder.End = factory.GetColor(0x0754D2);
+            table.MouseOver.InnerBorder.Start = factory.GetColor(0xDBE7F7);
+            table.MouseOver.InnerBorder.End = factory.GetColor(128, 0x6677AB);
+            table.MouseOver.TopBackground.Start = factory.GetColor(0xB5CAEB);
+            table.MouseOver.TopBackground.End = factory.GetColor(0x448BD6);
+            table.MouseOver.BottomBackground.Start = factory.GetColor(0x003B91);
+            table.MouseOver.BottomBackground.End = factory.GetColor(0x68C5FB);
+            table.MouseOver.BottomBackgroundHighlight.Start = factory.GetColor(0xBDFFFF);
+            table.MouseOver.BottomBackgroundHighlight.End = Color.Transparent;
+            table.MouseOver.Text = factory.GetColor(0xFFFFFF);
+
+            // Define colors when mouse is pressed
+            table.Pressed = new DevComponents.DotNetBar.Rendering.Office2007ButtonItemStateColorTable();
+            table.Pressed.OuterBorder.Start = factory.GetColor(0x303949);
+            table.Pressed.OuterBorder.End = factory.GetColor(0x022963);
+            table.Pressed.InnerBorder.Start = factory.GetColor(0x9CA8BD);
+            table.Pressed.InnerBorder.End = Color.Transparent;
+            table.Pressed.TopBackground.Start = factory.GetColor(0x747C95);
+            table.Pressed.TopBackground.End = factory.GetColor(0x324D7B);
+            table.Pressed.BottomBackground.Start = factory.GetColor(0x003A70);
+            table.Pressed.BottomBackground.End = factory.GetColor(0x00599B);
+            table.Pressed.BottomBackgroundHighlight.Start = factory.GetColor(0x61DAFF);
+            table.Pressed.BottomBackgroundHighlight.End = Color.Transparent;
+            table.Pressed.Text = factory.GetColor(0xFFFFFF);
+
+            // Define disabled button colors
+            table.Disabled = new DevComponents.DotNetBar.Rendering.Office2007ButtonItemStateColorTable();
+            table.Disabled.OuterBorder.Start = factory.GetColor(0x8498A9);
+            table.Disabled.OuterBorder.End = factory.GetColor(0x343947);
+            table.Disabled.InnerBorder.Start = Color.Transparent;
+            table.Disabled.InnerBorder.End = factory.GetColor(0xD7E4F3);
+            table.Disabled.TopBackground.Start = factory.GetColor(0xF4F7FA);
+            table.Disabled.TopBackground.End = factory.GetColor(0xC5D9E8);
+            table.Disabled.BottomBackground.Start = factory.GetColor(0xAEC2D8);
+            table.Disabled.BottomBackground.End = factory.GetColor(0xBED2E8);
+            table.Disabled.Text = factory.GetColor(0xDCEAF2);
+
+            // Define colors button is expanded
+            table.Expanded = new DevComponents.DotNetBar.Rendering.Office2007ButtonItemStateColorTable();
+            table.Expanded.OuterBorder.Start = factory.GetColor(0x5273AF);
+            table.Expanded.OuterBorder.End = factory.GetColor(0x08387F);
+            table.Expanded.InnerBorder.Start = factory.GetColor(0xD6DFEF);
+            table.Expanded.InnerBorder.End = factory.GetColor(192, 0x5699D4);
+            table.Expanded.TopBackground.Start = factory.GetColor(0xB5BEDE);
+            table.Expanded.TopBackground.End = factory.GetColor(0x3568B1);
+            table.Expanded.BottomBackground.Start = factory.GetColor(0x001656);
+            table.Expanded.BottomBackground.End = factory.GetColor(0x4BD6FF);
+            table.Expanded.BottomBackgroundHighlight.Start = factory.GetColor(0x56DAFF);
+            table.Expanded.BottomBackgroundHighlight.End = Color.Transparent;
+            table.Expanded.Text = factory.GetColor(0xFFFFFF);
+
+            // Define colors when mouse is pressed
+            table.Checked = new DevComponents.DotNetBar.Rendering.Office2007ButtonItemStateColorTable();
+            table.Checked.OuterBorder.Start = factory.GetColor(0x303949);
+            table.Checked.OuterBorder.End = factory.GetColor(0x022963);
+            table.Checked.InnerBorder.Start = factory.GetColor(0x9CA8BD);
+            table.Checked.InnerBorder.End = Color.Transparent;
+            table.Checked.TopBackground.Start = factory.GetColor(0xB5BEDE);
+            table.Checked.TopBackground.End = factory.GetColor(0x3568B1);
+            table.Checked.BottomBackground.Start = factory.GetColor(0x000636);
+            table.Checked.BottomBackground.End = factory.GetColor(0x00599B);
+            table.Checked.BottomBackgroundHighlight.Start = factory.GetColor(0x61DAFF);
+            table.Checked.BottomBackgroundHighlight.End = Color.Transparent;
+            table.Checked.Text = factory.GetColor(0xFFFFFF);
+
+            return table;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/ColorFactory.cs b/PROMS/DotNetBar Source Code/Rendering/ColorFactory.cs
new file mode 100644
index 00000000..0729ba46
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/ColorFactory.cs	
@@ -0,0 +1,140 @@
+using System;
+using System.Drawing;
+using System.Text;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    /// <summary>
+    /// Represents the class used to create Color objects.
+    /// </summary>
+    public class ColorFactory
+    {
+        #region Private Variables
+        #endregion
+
+        #region Constructor
+        /// <summary>
+        /// Creates new instance of the object.
+        /// </summary>
+        public ColorFactory() { }
+        #endregion
+
+        #region Internal Implementation
+        public virtual Color GetColor(int color)
+        {
+            return ColorScheme.GetColor(color);
+        }
+
+        public virtual Color GetColor(int alpha, int color)
+        {
+            return ColorScheme.GetColor(alpha, color);
+        }
+
+        public virtual Color GetColor(int alpha, Color color)
+        {
+            return Color.FromArgb(alpha, color);
+        }
+
+        public virtual Color GetColor(Color color)
+        {
+            return color;
+        }
+
+        public virtual Color GetColor(string argb)
+        {
+            return ColorScheme.GetColor(argb);
+        }
+
+        public static readonly ColorFactory Empty = new ColorFactory();
+        #endregion
+
+    }
+
+    /// <summary>
+    /// Represents the class used to create Color objects blended based on base color.
+    /// </summary>
+    public class ColorBlendFactory : ColorFactory
+    {
+        #region Private Variables
+        private Color m_BlendColor = Color.Empty;
+        #endregion
+
+        #region Constructor
+        /// <summary>
+        /// Creates new instance of the object.
+        /// </summary>
+        public ColorBlendFactory(Color blendColor)
+        {
+            m_BlendColor = blendColor;
+        }
+        #endregion
+
+        #region Internal Implementation
+        /// <summary>
+        /// Converts integer color representation to Color type.
+        /// </summary>
+        /// <param name="rgb">Color representation as 32-bit RGB value.</param>
+        /// <returns>Reference to Color object.</returns>
+        public override Color GetColor(int rgb)
+        {
+            if (rgb == -1) return Color.Empty;
+            return Color.FromArgb(SoftLight((rgb & 0xFF0000) >> 16, m_BlendColor.R), SoftLight((rgb & 0xFF00) >> 8, m_BlendColor.G), SoftLight(rgb & 0xFF, m_BlendColor.B));
+        }
+
+        /// <summary>
+        /// Converts integer color representation to Color type.
+        /// </summary>
+        /// <param name="rgb">Color representation as 32-bit RGB value.</param>
+        /// <returns>Reference to Color object.</returns>
+        public override Color GetColor(int alpha, int rgb)
+        {
+            if (rgb == -1) return Color.Empty;
+            return Color.FromArgb(alpha, SoftLight((rgb & 0xFF0000) >> 16, m_BlendColor.R), SoftLight((rgb & 0xFF00) >> 8, m_BlendColor.G), SoftLight(rgb & 0xFF, m_BlendColor.B));
+        }
+
+        /// <summary>
+        /// Converts integer color representation to Color type.
+        /// </summary>
+        /// <param name="c">Color value.</param>
+        /// <returns>Reference to Color object.</returns>
+        public override Color GetColor(Color c)
+        {
+            if (c.IsEmpty) return Color.Empty;
+            return Color.FromArgb(c.A, SoftLight(c.R, m_BlendColor.R), SoftLight(c.G, m_BlendColor.G), SoftLight(c.B, m_BlendColor.B));
+        }
+        /// <summary>
+        /// Converts color representation to alpha Color type.
+        /// </summary>
+        /// <param name="c">Color value.</param>
+        /// <returns>Reference to Color object.</returns>
+        public override Color GetColor(int alpha, Color c)
+        {
+            if (c.IsEmpty) return Color.Empty;
+            return Color.FromArgb(alpha, SoftLight(c.R, m_BlendColor.R), SoftLight(c.G, m_BlendColor.G), SoftLight(c.B, m_BlendColor.B));
+        }
+
+        /// <summary>
+        /// Converts integer color representation to Color type.
+        /// </summary>
+        /// <param name="c">Color value.</param>
+        /// <returns>Reference to Color object.</returns>
+        public override Color GetColor(string argb)
+        {
+            return GetColor(ColorScheme.GetColor(argb));
+        }
+
+        internal static int SoftLight(int a, int b)
+        {
+            int c = 0;
+            c = a * b / 255;
+            return c + a * (255 - ((255 - a) * (255 - b) / 255) - c) / 255;
+        }
+
+        internal static Color SoftLight(Color c, Color light)
+        {
+            return Color.FromArgb(SoftLight(c.R, light.R), SoftLight(c.G, light.G), SoftLight(c.B, light.B));
+        }
+        #endregion
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/ColorItemPainter.cs b/PROMS/DotNetBar Source Code/Rendering/ColorItemPainter.cs
new file mode 100644
index 00000000..6401bfc7
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/ColorItemPainter.cs	
@@ -0,0 +1,10 @@
+using System;
+using System.Text;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    internal abstract class ColorItemPainter
+    {
+        public abstract void PaintColorItem(ColorItemRendererEventArgs e);
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/CrumbBarItemViewColorTable.cs b/PROMS/DotNetBar Source Code/Rendering/CrumbBarItemViewColorTable.cs
new file mode 100644
index 00000000..24b6ec07
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/CrumbBarItemViewColorTable.cs	
@@ -0,0 +1,28 @@
+using System;
+using System.Text;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    /// <summary>
+    /// Represents color table for CrumbBarItemView.
+    /// </summary>
+    public class CrumbBarItemViewColorTable
+    {
+        /// <summary>
+        /// Gets or sets the default state color table.
+        /// </summary>
+        public CrumbBarItemViewStateColorTable Default = null;
+        /// <summary>
+        /// Gets or sets active mouse over color table.
+        /// </summary>
+        public CrumbBarItemViewStateColorTable MouseOver = null;
+        /// <summary>
+        /// Gets or sets inactive part mouse over color table.
+        /// </summary>
+        public CrumbBarItemViewStateColorTable MouseOverInactive = null;
+        /// <summary>
+        /// Gets or sets the pressed color table.
+        /// </summary>
+        public CrumbBarItemViewStateColorTable Pressed = null;
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/CrumbBarItemViewStateColorTable.cs b/PROMS/DotNetBar Source Code/Rendering/CrumbBarItemViewStateColorTable.cs
new file mode 100644
index 00000000..d1005a55
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/CrumbBarItemViewStateColorTable.cs	
@@ -0,0 +1,29 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    /// <summary>
+    /// Defines state color table for CrumbBarItemView
+    /// </summary>
+    public class CrumbBarItemViewStateColorTable
+    {
+        /// <summary>
+        /// Gets or sets foreground/text color.
+        /// </summary>
+        public Color Foreground = Color.Empty;
+        /// <summary>
+        /// Gets or sets the background color blend collection.
+        /// </summary>
+        public BackgroundColorBlendCollection Background = null;
+        /// <summary>
+        /// Gets or sets the border color.
+        /// </summary>
+        public Color Border = Color.Empty;
+        /// <summary>
+        /// Gets or sets the border color.
+        /// </summary>
+        public Color BorderLight = Color.Empty;
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/ElementStyleClassKeys.cs b/PROMS/DotNetBar Source Code/Rendering/ElementStyleClassKeys.cs
new file mode 100644
index 00000000..4b71cebb
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/ElementStyleClassKeys.cs	
@@ -0,0 +1,168 @@
+using System;
+using System.Text;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    /// <summary>
+    /// Defines the names for the ElementStyle.Class style classes.
+    /// </summary>
+    public class ElementStyleClassKeys
+    {
+        /// <summary>
+        /// Gets the key for the GalleryContainer background style class.
+        /// </summary>
+        public static readonly string RibbonGalleryContainerKey = "RibbonGalleryContainer";
+
+        /// <summary>
+        /// Gets the key for the Ribbon File menu outer container background style class.
+        /// </summary>
+        public static readonly string RibbonFileMenuContainerKey = "RibbonFileMenuContainer";
+
+        /// <summary>
+        /// Gets the key for the Ribbon File menu two column container background style class.
+        /// </summary>
+        public static readonly string RibbonFileMenuTwoColumnContainerKey = "RibbonFileMenuTwoColumnContainer";
+
+        /// <summary>
+        /// Gets the key for the Ribbon File menu first column container background style class.
+        /// </summary>
+        public static readonly string RibbonFileMenuColumnOneContainerKey = "RibbonFileMenuColumnOneContainer";
+
+        /// <summary>
+        /// Gets the key for the Ribbon File menu second column container background style class.
+        /// </summary>
+        public static readonly string RibbonFileMenuColumnTwoContainerKey = "RibbonFileMenuColumnTwoContainer";
+
+        /// <summary>
+        /// Gets the key for the Ribbon File menu bottom container background style class.
+        /// </summary>
+        public static readonly string RibbonFileMenuBottomContainerKey = "RibbonFileMenuBottomContainer";
+
+        /// <summary>
+        /// Gets the key for the text box border style class.
+        /// </summary>
+        public static readonly string TextBoxBorderKey = "TextBoxBorder";
+
+        /// <summary>
+        /// Gets the key for the RichTextBox control border style class.
+        /// </summary>
+        public static readonly string RichTextBoxBorderKey = "RichTextBoxBorder";
+
+        /// <summary>
+        /// Gets the key for the ItemPanel style class.
+        /// </summary>
+        public static readonly string ItemPanelKey = "ItemPanel";
+
+        /// <summary>
+        /// Gets the key for the ListBoxAdv style class.
+        /// </summary>
+        public static readonly string ListBoxAdvKey = "ListBoxAdv";
+
+        /// <summary>
+        /// Gets the key for the date time input background style class.
+        /// </summary>
+        public static readonly string DateTimeInputBackgroundKey = "DateTimeInputBackground";
+
+        /// <summary>
+        /// Gets the style key for the Ribbon client panel.
+        /// </summary>
+        public static readonly string RibbonClientPanelKey = "RibbonClientPanel";
+
+        /// <summary>
+        /// Gets the style key for the ListView control border style.
+        /// </summary>
+        public static readonly string ListViewBorderKey = "ListViewBorder";
+
+        /// <summary>
+        /// Gets the style key for the Office2007 Status Bar alternative background.
+        /// </summary>
+        public static readonly string Office2007StatusBarBackground2Key = "Office2007StatusBarBackground2";
+
+#if !NOTREE
+        /// <summary>
+        /// Gets the style key for the AdvTree control border and background.
+        /// </summary>
+        public static readonly string TreeBorderKey = "TreeBorderKey";
+        /// <summary>
+        /// Gets the style key for the AdvTree control columns header.
+        /// </summary>
+        public static readonly string TreeColumnsHeaderKey = "TreeColumnsHeaderKey";
+        /// <summary>
+        /// Gets the style key for the AdvTree control columns header for the child nodes.
+        /// </summary>
+        public static readonly string TreeNodesColumnsHeaderKey = "TreeNodesColumnsHeaderKey";
+        /// <summary>
+        /// Gets the style key for the AdvTree control column.
+        /// </summary>
+        public static readonly string TreeColumnKey = "TreeColumnKey";
+#endif
+        /// <summary>
+        /// Gets the style key for the CrumbBar background style.
+        /// </summary>
+        public static readonly string CrumbBarBackgroundKey = "CrumbBarBackgroundKey";
+        /// <summary>
+        /// Gets the key for the DataGridView border style class.
+        /// </summary>
+        public static readonly string DataGridViewBorderKey = "DataGridViewBorder";
+        /// <summary>
+        /// Gets the key for the DataGridViewNumeric border style class.
+        /// </summary>
+        public static readonly string DataGridViewNumericBorderKey = "DataGridViewNumericBorder";
+        /// <summary>
+        /// Gets the key for the DataGridViewDateTime border style class.
+        /// </summary>
+        public static readonly string DataGridViewDateTimeBorderKey = "DataGridViewDateTimeBorder";
+        /// <summary>
+        /// Gets the key for the DataGridViewIpAddress border style class.
+        /// </summary>
+        public static readonly string DataGridViewIpAddressBorderKey = "DataGridViewIpAddressBorder";
+        /// <summary>
+        /// Gets the key for SlidePanel slide-out button style.
+        /// </summary>
+        public static string SlideOutButtonKey = "SlideOutButtonKey";
+
+        /// <summary>
+        /// Gets the key for the MetroTilePanel style class.
+        /// </summary>
+        public static readonly string MetroTilePanelKey = "MetroTilePanel";
+        /// <summary>
+        /// Gets the key for Metro tile group container title class.
+        /// </summary>
+        public static string MetroTileGroupTitleKey = "MetroTileGroupTitle";
+
+        /// <summary>
+        /// Gets the style key for the MonthCalendarAdv control.
+        /// </summary>
+        public static string MonthCalendarAdvKey = "MonthCalendarAdv";
+        /// <summary>
+        /// Gets the style key for the ProgressSteps control.
+        /// </summary>
+        public static string ProgressStepsKey = "ProgressSteps";
+        /// <summary>
+        /// Gets the style key for the SideNavStrip control.
+        /// </summary>
+        public static string SideNavStripKey = "SideNavStrip";
+        /// <summary>
+        /// Gets the style key for the TabFormPanel control.
+        /// </summary>
+        public static string TabFormPanelKey = "TabFormPanel";
+
+        /// <summary>
+        /// Gets the style key for the ToolboxGroup title.
+        /// </summary>
+        public static string ToolboxGroupTitleKey = "ToolboxGroupTitle";
+        /// <summary>
+        /// Gets the style key for the ToolboxGroup title mouse over.
+        /// </summary>
+        public static string ToolboxGroupTitleMouseOverKey = "ToolboxGroupTitleMouseOver";
+        /// <summary>
+        /// Gets the style key for the ToolboxGroup title group expanded state.
+        /// </summary>
+        public static string ToolboxGroupExpandedTitleKey = "ToolboxGroupExpandedTitle";
+        /// <summary>
+        /// Gets the style key for the ToolboxControl.
+        /// </summary>
+        public static string ToolboxControlKey = "ToolboxControl";
+        
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/GlobalManager.cs b/PROMS/DotNetBar Source Code/Rendering/GlobalManager.cs
new file mode 100644
index 00000000..a114bdca
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/GlobalManager.cs	
@@ -0,0 +1,29 @@
+using System;
+using System.Text;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    /// <summary>
+    /// Represents a static class that maintains the global rendering properties for all controls when eRenderMode is set to global.
+    /// </summary>
+    public class GlobalManager
+    {
+        private static BaseRenderer m_Renderer = null;
+
+        /// <summary>
+        /// Gets or sets the global renderer used by all controls that have RenderMode set to eRenderMode.Global.
+        /// </summary>
+        public static BaseRenderer Renderer
+        {
+            get
+            {
+                if (m_Renderer == null)
+                    m_Renderer = new Office2007Renderer();
+
+                return m_Renderer;
+            }
+            set { m_Renderer = value; }
+        }
+        
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/GradientColorTable.cs b/PROMS/DotNetBar Source Code/Rendering/GradientColorTable.cs
new file mode 100644
index 00000000..92af6981
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/GradientColorTable.cs	
@@ -0,0 +1,109 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represents complex gradient color table.
+    /// </summary>
+    public class GradientColorTable
+    {
+        /// <summary>
+        /// Creates new instance of the object.
+        /// </summary>
+        public GradientColorTable() { }
+
+        /// <summary>
+        /// Creates new instance of the object and initializes it with default values.
+        /// </summary>
+        /// <param name="color1">Start color</param>
+        /// <param name="color2">End color</param>
+        public GradientColorTable(Color color)
+        {
+            BackgroundColorBlendCollection.InitializeCollection(Colors, color);
+        }
+
+        /// <summary>
+        /// Creates new instance of the object and initializes it with default values.
+        /// </summary>
+        /// <param name="color1">Start color</param>
+        /// <param name="color2">End color</param>
+        public GradientColorTable(int color1, int color2)
+            : this(color1, color2, 90)
+        {
+        }
+
+        /// <summary>
+        /// Creates new instance of the object and initializes it with default values.
+        /// </summary>
+        /// <param name="color1">Start color</param>
+        /// <param name="color2">End color</param>
+        public GradientColorTable(Color color1, Color color2)
+            : this(color1, color2, 90)
+        {
+        }
+
+        /// <summary>
+        /// Creates new instance of the object and initializes it with default values.
+        /// </summary>
+        /// <param name="color1">Start color</param>
+        /// <param name="color2">End color</param>
+        /// <param name="linearGradientAngle">Linear gradient angle</param>
+        public GradientColorTable(int color1, int color2, int linearGradientAngle)
+        {
+            BackgroundColorBlendCollection.InitializeCollection(Colors, color1, color2);
+            this.LinearGradientAngle = linearGradientAngle;
+        }
+
+        /// <summary>
+        /// Creates new instance of the object and initializes it with default values.
+        /// </summary>
+        /// <param name="color1">Start color</param>
+        /// <param name="color2">End color</param>
+        /// <param name="linearGradientAngle">Linear gradient angle</param>
+        public GradientColorTable(Color color1, Color color2, int linearGradientAngle)
+        {
+            BackgroundColorBlendCollection.InitializeCollection(Colors, color1, color2);
+            this.LinearGradientAngle = linearGradientAngle;
+        }
+
+        public bool IsEmpty
+        {
+            get
+            {
+                return Colors.Count == 0;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the color collection blend that describes the gradient.
+        /// </summary>
+        public BackgroundColorBlendCollection Colors = new BackgroundColorBlendCollection();
+
+        /// <summary>
+        /// Gets or sets the gradient type.
+        /// </summary>
+        public eGradientType GradientType = eGradientType.Linear;
+
+        /// <summary>
+        /// Gets or sets the linear gradient angle.
+        /// </summary>
+        public int LinearGradientAngle = 90;
+
+        /// <summary>
+        /// Creates a copy of table.
+        /// </summary>
+        /// <returns>A copy.</returns>
+        public GradientColorTable Clone()
+        {
+            GradientColorTable table = new GradientColorTable();
+            foreach (BackgroundColorBlend item in this.Colors)
+            {
+                table.Colors.Add(new BackgroundColorBlend(item.Color, item.Position));
+            }
+            table.LinearGradientAngle = this.LinearGradientAngle;
+            return table;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/IOffice2007Painter.cs b/PROMS/DotNetBar Source Code/Rendering/IOffice2007Painter.cs
new file mode 100644
index 00000000..76756b95
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/IOffice2007Painter.cs	
@@ -0,0 +1,10 @@
+using System;
+using System.Text;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    internal interface IOffice2007Painter
+    {
+        Office2007ColorTable ColorTable { get;set;}
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/LinearGradientColorTable.cs b/PROMS/DotNetBar Source Code/Rendering/LinearGradientColorTable.cs
new file mode 100644
index 00000000..cf4fd369
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/LinearGradientColorTable.cs	
@@ -0,0 +1,163 @@
+using System.ComponentModel;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    /// <summary>
+    /// Represents the color table of linear gradient.
+    /// </summary>
+    public class LinearGradientColorTable
+    {
+        public static readonly LinearGradientColorTable Empty = new LinearGradientColorTable();
+
+        #region Private variables
+
+        private Color _Start = Color.Empty;
+        private Color _End = Color.Empty;
+        private int _GradientAngle = 90;
+
+        #endregion
+
+        #region Constructors
+
+        /// <summary>
+        /// Creates new instance of the object.
+        /// </summary>
+        public LinearGradientColorTable() { }
+        /// <summary>
+        /// Creates new instance of the object.
+        /// </summary>
+        /// <param name="start">Start color.</param>
+        public LinearGradientColorTable(Color start)
+        {
+            this.Start = start;
+        }
+
+        /// <summary>
+        /// Creates new instance of the object.
+        /// </summary>
+        /// <param name="start">Start color.</param>
+        /// <param name="end">End color.</param>
+        public LinearGradientColorTable(Color start, Color end)
+        {
+            this.Start = start;
+            this.End = end;
+        }
+
+        /// <summary>
+        /// Creates new instance of the object.
+        /// </summary>
+        /// <param name="start">Start color in hexadecimal representation like FFFFFF.</param>
+        /// <param name="end">End color in hexadecimal representation like FFFFFF.</param>
+        public LinearGradientColorTable(string start, string end)
+        {
+            this.Start = ColorScheme.GetColor(start);
+            this.End = ColorScheme.GetColor(end);
+        }
+
+        /// <summary>
+        /// Creates new instance of the object.
+        /// </summary>
+        /// <param name="start">Start color in 32-bit RGB representation.</param>
+        public LinearGradientColorTable(int start)
+        {
+            this.Start = ColorScheme.GetColor(start);
+        }
+
+        /// <summary>
+        /// Creates new instance of the object.
+        /// </summary>
+        /// <param name="start">Start color in 32-bit RGB representation.</param>
+        /// <param name="end">End color in 32-bit RGB representation.</param>
+        public LinearGradientColorTable(int start, int end)
+        {
+            this.Start = ColorScheme.GetColor(start);
+            this.End = ColorScheme.GetColor(end);
+        }
+
+        /// <summary>
+        /// Creates new instance of the object.
+        /// </summary>
+        /// <param name="start">Start color in 32-bit RGB representation.</param>
+        /// <param name="end">End color in 32-bit RGB representation.</param>
+        /// <param name="gradientAngle">Gradient angle.</param>
+        public LinearGradientColorTable(int start, int end, int gradientAngle)
+        {
+            this.Start = ColorScheme.GetColor(start);
+            this.End = ColorScheme.GetColor(end);
+            this.GradientAngle = gradientAngle;
+        }
+
+        /// <summary>
+        /// Creates new instance of the object.
+        /// </summary>
+        /// <param name="start">Start color.</param>
+        /// <param name="end">End color.</param>
+        /// <param name="gradientAngle">Gradient angle.</param>
+        public LinearGradientColorTable(Color start, Color end, int gradientAngle)
+        {
+            this.Start = start;
+            this.End = end;
+            this.GradientAngle = gradientAngle;
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region Start
+
+        /// <summary>
+        /// Gets or sets the start color.
+        /// </summary>
+        public Color Start
+        {
+            get { return (_Start); }
+            set { _Start = value; }
+        }
+
+        #endregion
+
+        #region End
+
+        /// <summary>
+        /// Gets or sets the end color.
+        /// </summary>
+        public Color End
+        {
+            get { return (_End); }
+            set { _End = value; } 
+        }
+
+        #endregion
+
+        #region GradientAngle
+
+        /// <summary>
+        /// Gets or sets the gradient angle. Default value is 90.
+        /// </summary>
+        public int GradientAngle
+        {
+            get { return (_GradientAngle); }
+            set { _GradientAngle = value; } 
+        }
+
+        #endregion
+
+        #region IsEmpty
+
+        /// <summary>
+        /// Gets whether both colors assigned are empty.
+        /// </summary>
+        [Browsable(false)]
+        public virtual bool IsEmpty
+        {
+            get { return (Start.IsEmpty && End.IsEmpty && GradientAngle == 90); }
+        }
+
+        #endregion
+
+        #endregion
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/NavigationPanePainter.cs b/PROMS/DotNetBar Source Code/Rendering/NavigationPanePainter.cs
new file mode 100644
index 00000000..c9251cb0
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/NavigationPanePainter.cs	
@@ -0,0 +1,11 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    internal abstract class NavigationPanePainter
+    {
+        public abstract void PaintButtonBackground(NavPaneRenderEventArgs e);
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/NotificationMarkPainter.cs b/PROMS/DotNetBar Source Code/Rendering/NotificationMarkPainter.cs
new file mode 100644
index 00000000..6da18256
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/NotificationMarkPainter.cs	
@@ -0,0 +1,176 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Collections;
+using DevComponents.DotNetBar.Metro.Helpers;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    internal class NotificationMarkPainter
+    {
+        #region Implementation
+        private static readonly Size MarkSize = new Size(16, 16);
+        private static readonly Point MarkOffset = new Point(3, 3);
+        private static readonly Color DefaultBackColor1 = ColorScheme.GetColor(0xE80000);
+        private static readonly Color DefaultBackColor2 = ColorScheme.GetColor(0xC50103);
+        private static readonly Color DefaultTextColor = Color.White;
+
+        public static Rectangle Paint(Graphics g, Rectangle targetBounds, eNotificationMarkPosition pos, string text)
+        {
+            return Paint(g, targetBounds, pos, text, MarkSize, MarkOffset);
+        }
+        public static Rectangle Paint(Graphics g, Rectangle targetBounds, eNotificationMarkPosition pos, string text, int markSize)
+        {
+            return Paint(g, targetBounds, pos, text, (markSize > 0 ? new Size(markSize, markSize) : MarkSize), MarkOffset);
+        }
+        public static Rectangle Paint(Graphics g, Rectangle targetBounds, eNotificationMarkPosition pos, string text, int markSize, Color markColor)
+        {
+            if (markColor.IsEmpty)
+                return Paint(g, targetBounds, pos, text, (markSize > 0 ? new Size(markSize, markSize) : MarkSize), MarkOffset, DefaultBackColor1, DefaultBackColor2, DefaultTextColor);
+            else
+            {
+                Color textColor, backColor1, backColor2;
+                CreateColors(markColor, out backColor1, out backColor2, out textColor);
+                return Paint(g, targetBounds, pos, text, (markSize > 0 ? new Size(markSize, markSize) : MarkSize), MarkOffset, backColor1, backColor2, textColor);
+            }
+        }
+        private static void CreateColors(Color markColor, out Color backColor1, out Color backColor2, out Color textColor)
+        {
+            HSVColor baseHsv = ColorHelpers.ColorToHSV(markColor);
+            ColorFunctions.HLSColor hslColor = ColorFunctions.RGBToHSL(markColor);
+            textColor = hslColor.Lightness < .65 ? Color.White : Color.Black;
+            backColor1 = ColorHelpers.HSVToColor(baseHsv.Hue, baseHsv.Saturation, baseHsv.Value + .1f);
+            backColor2 = ColorHelpers.HSVToColor(baseHsv.Hue, baseHsv.Saturation, baseHsv.Value + .2f);
+        }
+        public static Rectangle Paint(Graphics g, Rectangle targetBounds, eNotificationMarkPosition pos, string text, Size markSize, Point offset)
+        {
+            return Paint(g, targetBounds, pos, text, markSize, offset, DefaultBackColor1, DefaultBackColor2, DefaultTextColor);
+        }
+        public static Rectangle Paint(Graphics g, Rectangle targetBounds, eNotificationMarkPosition pos, string text, Size markSize, Point offset, Color markColor)
+        {
+            if (markColor.IsEmpty)
+                return Paint(g, targetBounds, pos, text, markSize, offset, DefaultBackColor1, DefaultBackColor2, DefaultTextColor);
+            else
+            {
+                Color textColor, backColor1, backColor2;
+                CreateColors(markColor, out backColor1, out backColor2, out textColor);
+                return Paint(g, targetBounds, pos, text, markSize, offset, backColor1, backColor2, textColor);
+            }
+        }
+        public static Rectangle Paint(Graphics g, Rectangle targetBounds, eNotificationMarkPosition pos, string text, Size markSize, Point offset, Color markColor, Rectangle containerClipRect)
+        {
+            if (markColor.IsEmpty)
+                return Paint(g, targetBounds, pos, text, markSize, offset, DefaultBackColor1, DefaultBackColor2, DefaultTextColor, containerClipRect);
+            else
+            {
+                Color textColor, backColor1, backColor2;
+                CreateColors(markColor, out backColor1, out backColor2, out textColor);
+                return Paint(g, targetBounds, pos, text, markSize, offset, backColor1, backColor2, textColor, containerClipRect);
+            }
+        }
+        public static Rectangle Paint(Graphics g, Rectangle targetBounds, eNotificationMarkPosition pos, string text, Size markSize, Point offset, Color backColor1, Color backColor2, Color textColor)
+        {
+            return Paint(g, targetBounds, pos, text, markSize, offset, backColor1, backColor2, textColor, Rectangle.Empty);
+        }
+        public static Rectangle Paint(Graphics g, Rectangle targetBounds, eNotificationMarkPosition pos, string text, Size markSize, Point offset, Color backColor1, Color backColor2, Color textColor, Rectangle containerClipRect)
+        {
+            if (markSize.IsEmpty) markSize = MarkSize; // Default it if empty
+            Color borderColor = Color.White;
+            int borderSize = Dpi.Width2;
+
+            markSize = Dpi.Size(markSize);
+            offset = Dpi.Size(offset);
+            //Color backColor1 = DefaultBackColor1;
+            //Color backColor2 = DefaultBackColor2;
+            //Color textColor = DefaultTextColor;
+            Font textFont = new Font("Microsoft Sans Serif", text.Length > 1 ? 6.75f : 8.25f, FontStyle.Bold);
+
+            Rectangle r;
+            if (pos == eNotificationMarkPosition.TopRight)
+                r = new Rectangle(targetBounds.Right - markSize.Width - 1 + offset.X, targetBounds.Y - offset.Y, markSize.Width, markSize.Height);
+            else if (pos == eNotificationMarkPosition.TopLeft)
+                r = new Rectangle(targetBounds.X - offset.X, targetBounds.Y - offset.Y, markSize.Width, markSize.Height);
+            else if (pos == eNotificationMarkPosition.BottomLeft)
+                r = new Rectangle(targetBounds.X - offset.X, targetBounds.Bottom - markSize.Height - 1 + offset.Y, markSize.Width, markSize.Height);
+            else // eNotificationMarkPosition.BottomRight
+                r = new Rectangle(targetBounds.Right - markSize.Width - 1 + offset.X, targetBounds.Bottom - markSize.Height + offset.Y, markSize.Width, markSize.Height);
+            
+            SmoothingMode sm = g.SmoothingMode;
+            System.Drawing.Text.TextRenderingHint th = g.TextRenderingHint;
+            g.SmoothingMode = SmoothingMode.HighQuality;
+            g.TextRenderingHint = System.Drawing.Text.TextRenderingHint.ClearTypeGridFit;
+            Region oldClip = g.Clip;
+            if (containerClipRect.IsEmpty)
+                g.ResetClip();
+            else
+                g.SetClip(containerClipRect);
+
+            // Drop shadow
+            Rectangle shadow = r;
+            shadow.Inflate(1, 1);
+            shadow.Offset(0, 3);
+            using (GraphicsPath shadowPath = new GraphicsPath())
+            {
+                shadowPath.AddEllipse(shadow);
+                using (PathGradientBrush brush = new PathGradientBrush(shadowPath))
+                {
+                    brush.CenterColor = Color.FromArgb(148, Color.Black);
+                    brush.SurroundColors = new Color[] { Color.FromArgb(4,Color.Black)};
+                    g.FillPath(brush, shadowPath);
+                }
+            }
+
+            using (LinearGradientBrush brush = new LinearGradientBrush(r, backColor1, backColor2, 90))
+                g.FillEllipse(brush, r);
+
+            // Highlight
+            Rectangle hr = new Rectangle(r.X - (int)(r.Width * .15), r.Y - (int)(r.Height * .15), (int)(r.Width * 1.3), (int)(r.Height * 1.32) / 2);
+            using (LinearGradientBrush brush = new LinearGradientBrush(hr, Color.FromArgb(128, Color.White), Color.FromArgb(8, Color.White), 90))
+            {
+                GraphicsPath clipPath = new GraphicsPath();
+                clipPath.AddEllipse(r);
+                if (containerClipRect.IsEmpty)
+                    g.SetClip(clipPath);
+                else
+                    g.SetClip(clipPath, CombineMode.Intersect);
+                g.FillEllipse(brush, hr);
+                if(containerClipRect.IsEmpty)
+                    g.ResetClip();
+                else
+                    g.SetClip(containerClipRect);
+                clipPath.Dispose();
+            }
+
+            // Border
+            using (Pen pen = new Pen(borderColor, borderSize))
+                g.DrawEllipse(pen, r);
+
+            if (!string.IsNullOrEmpty(text))
+            {
+                // Text
+                Rectangle textBounds = r;
+                if (text.Length == 1)
+                    textBounds.Y++;
+                using (StringFormat sf = (StringFormat)StringFormat.GenericDefault.Clone())
+                {
+
+                    sf.LineAlignment = StringAlignment.Center;
+                    sf.Alignment = StringAlignment.Center;
+                    using (SolidBrush brush = new SolidBrush(textColor))
+                        g.DrawString(text, textFont, brush, textBounds, sf);
+                }
+            }
+
+            // Cleanup
+            g.Clip = oldClip; oldClip.Dispose();
+            textFont.Dispose();
+            g.SmoothingMode = sm;
+            g.TextRenderingHint = th;
+
+            return r;
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/Office2007BarColorTable.cs b/PROMS/DotNetBar Source Code/Rendering/Office2007BarColorTable.cs
new file mode 100644
index 00000000..bd5d1c04
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/Office2007BarColorTable.cs	
@@ -0,0 +1,51 @@
+using System;
+using System.Drawing;
+using System.Text;
+using DevComponents.DotNetBar.Rendering;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represents color table for Bar objects in various states.
+    /// </summary>
+    public class Office2007BarColorTable
+    {
+        /// <summary>
+        /// Gets or sets the colors for top part of toolbar background.
+        /// </summary>
+        public LinearGradientColorTable ToolbarTopBackground = new LinearGradientColorTable(ColorScheme.GetColor("D7E6F9"), ColorScheme.GetColor("C7DCF8"));
+
+        /// <summary>
+        /// Gets or sets the colors for bottom part of toolbar background.
+        /// </summary>
+        public LinearGradientColorTable ToolbarBottomBackground = new LinearGradientColorTable(ColorScheme.GetColor("B3D0F5"), ColorScheme.GetColor("D7E5F7"));
+
+        /// <summary>
+        /// Gets or sets the color of the bottom border.
+        /// </summary>
+        public Color ToolbarBottomBorder = ColorScheme.GetColor("BAD4F7");
+
+        /// <summary>
+        /// Gets or sets the popup toolbar background color.
+        /// </summary>
+        public LinearGradientColorTable PopupToolbarBackground = new LinearGradientColorTable(ColorScheme.GetColor("FAFAFA"), Color.Empty);
+
+        /// <summary>
+        /// Gets or sets the color of popup toolbar border.
+        /// </summary>
+        public Color PopupToolbarBorder = ColorScheme.GetColor("868686");
+
+        /// <summary>
+        /// Gets or sets the status bar top border color.
+        /// </summary>
+        public Color StatusBarTopBorder = Color.Empty;
+        /// <summary>
+        /// Gets or sets the status bar top border light color.
+        /// </summary>
+        public Color StatusBarTopBorderLight = Color.Empty;
+        /// <summary>
+        /// Gets or sets the alternative background colors for the status bar.
+        /// </summary>
+        public BackgroundColorBlendCollection StatusBarAltBackground = new BackgroundColorBlendCollection();
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/Office2007ButtonItemColorTable.cs b/PROMS/DotNetBar Source Code/Rendering/Office2007ButtonItemColorTable.cs
new file mode 100644
index 00000000..6ab3a8a5
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/Office2007ButtonItemColorTable.cs	
@@ -0,0 +1,55 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    /// <summary>
+    /// Represents color table for ButtonItem object.
+    /// </summary>
+    public class Office2007ButtonItemColorTable
+    {
+        #region Properties
+        /// <summary>
+        /// Gets or sets the name of the color table.
+        /// </summary>
+        public string Name = "";
+
+        /// <summary>
+        /// Gets or sets the color table applied for button in default state.
+        /// </summary>
+        public Office2007ButtonItemStateColorTable Default = null;
+
+        /// <summary>
+        /// Gets or sets the color table applied when mouse is over the button.
+        /// </summary>
+        public Office2007ButtonItemStateColorTable MouseOver = null;
+
+        /// <summary>
+        /// Gets or sets the color table applied when mouse is over the buttons inactive split part. Applies to split button appearance only.
+        /// </summary>
+        public Office2007ButtonItemStateColorTable MouseOverSplitInactive = null;
+
+        /// <summary>
+        /// Gets or sets the color table applied when mouse is pressed over the button.
+        /// </summary>
+        public Office2007ButtonItemStateColorTable Pressed = null;
+
+        /// <summary>
+        /// Gets or sets the color table applied when mouse is pressed over the button.
+        /// </summary>
+        public Office2007ButtonItemStateColorTable Checked = null;
+
+        /// <summary>
+        /// Gets or sets the color table applied when button is expanded.
+        /// </summary>
+        public Office2007ButtonItemStateColorTable Expanded = null;
+
+        /// <summary>
+        /// Gets or sets the color table applied when cursor is over button on a menu.
+        /// </summary>
+        public Office2007ButtonItemStateColorTable Disabled = null;
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/Office2007ButtonItemColorTableCollection.cs b/PROMS/DotNetBar Source Code/Rendering/Office2007ButtonItemColorTableCollection.cs
new file mode 100644
index 00000000..8762e875
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/Office2007ButtonItemColorTableCollection.cs	
@@ -0,0 +1,148 @@
+using System;
+using System.Text;
+using System.Collections;
+
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    /// <summary>
+    /// Represents typed collection of Office2007ButtonItemColorTable type.
+    /// </summary>
+    public class Office2007ButtonItemColorTableCollection : CollectionBase
+    {
+        #region Internal Implementation
+        private Hashtable m_Keys = new Hashtable();
+        /// <summary>Creates new instance of the class.</summary>
+        public Office2007ButtonItemColorTableCollection() { }
+
+		/// <summary>
+		/// Adds new object to the collection.
+		/// </summary>
+		/// <param name="Office2007ButtonItemColorTable">Object to add.</param>
+		/// <returns>Index of newly added object.</returns>
+		public int Add(Office2007ButtonItemColorTable colorTable)
+		{
+            return List.Add(colorTable);
+		}
+		/// <summary>
+		/// Returns reference to the object in collection based on it's index.
+		/// </summary>
+		public Office2007ButtonItemColorTable this[int index]
+		{
+			get {return (Office2007ButtonItemColorTable)(List[index]);}
+			set {List[index] = value;}
+		}
+
+        /// <summary>
+        /// Returns reference to the object in collection based on it's index.
+        /// </summary>
+        public Office2007ButtonItemColorTable this[string name]
+        {
+            get
+            {
+                return m_Keys[name] as Office2007ButtonItemColorTable;
+                //foreach (Office2007ButtonItemColorTable ct in this.List)
+                //{
+                //    if (ct.Name == name)
+                //        return ct;
+                //}
+                //return null;
+            }
+        }
+
+		/// <summary>
+		/// Inserts new object into the collection.
+		/// </summary>
+		/// <param name="index">Position of the object.</param>
+		/// <param name="value">Object to insert.</param>
+		public void Insert(int index, Office2007ButtonItemColorTable value) 
+		{
+			List.Insert(index, value);
+		}
+
+		/// <summary>
+		/// Returns index of the object inside of the collection.
+		/// </summary>
+		/// <param name="value">Reference to the object.</param>
+		/// <returns>Index of the object.</returns>
+		public int IndexOf(Office2007ButtonItemColorTable value) 
+		{
+			return List.IndexOf(value);
+		}
+
+		/// <summary>
+		/// Returns whether collection contains specified object.
+		/// </summary>
+		/// <param name="value">Object to look for.</param>
+		/// <returns>true if object is part of the collection, otherwise false.</returns>
+		public bool Contains(Office2007ButtonItemColorTable value) 
+		{
+			return List.Contains(value);
+		}
+
+        /// <summary>
+        /// Returns whether collection contains object with specified name.
+        /// </summary>
+        /// <param name="name">Name of the object to look for</param>
+        /// <returns>true if object with given name is part of the collection otherwise false</returns>
+        public bool Contains(string name)
+        {
+            return m_Keys.ContainsKey(name);
+            //foreach (Office2007ButtonItemColorTable ct in this.List)
+            //{
+            //    if (ct.Name == name)
+            //        return true;
+            //}
+            //return false;
+        }
+
+		/// <summary>
+		/// Removes specified object from the collection.
+		/// </summary>
+		/// <param name="value"></param>
+		public void Remove(Office2007ButtonItemColorTable value) 
+		{
+			List.Remove(value);
+		}
+
+        protected override void OnRemoveComplete(int index, object value)
+        {
+            base.OnRemoveComplete(index, value);
+            Office2007ButtonItemColorTable me = value as Office2007ButtonItemColorTable;
+            m_Keys.Remove(me.Name);
+        }
+        protected override void OnInsertComplete(int index, object value)
+        {
+            base.OnInsertComplete(index, value);
+            Office2007ButtonItemColorTable me = value as Office2007ButtonItemColorTable;
+            m_Keys.Add(me.Name, me);
+        }
+
+		/// <summary>
+		/// Copies collection into the specified array.
+		/// </summary>
+		/// <param name="array">Array to copy collection to.</param>
+		/// <param name="index">Starting index.</param>
+		public void CopyTo(Office2007ButtonItemColorTable[] array, int index) 
+		{
+			List.CopyTo(array, index);
+		}
+
+		/// <summary>
+		/// Copies contained items to the Office2007ButtonItemColorTable array.
+		/// </summary>
+		/// <param name="array">Array to copy to.</param>
+		internal void CopyTo(Office2007ButtonItemColorTable[] array)
+		{
+			List.CopyTo(array,0);
+		}
+
+		protected override void OnClear()
+		{
+            m_Keys.Clear();
+			base.OnClear();
+		}
+
+		#endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/Office2007ButtonItemStateColorTable.cs b/PROMS/DotNetBar Source Code/Rendering/Office2007ButtonItemStateColorTable.cs
new file mode 100644
index 00000000..e7a140b9
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/Office2007ButtonItemStateColorTable.cs	
@@ -0,0 +1,75 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    /// <summary>
+    /// Represents a color table for ButtonItem in certain state like but not limited to mouse over, checked or pressed.
+    /// </summary>
+    public class Office2007ButtonItemStateColorTable
+    {
+        #region Internal Implementation
+        /// <summary>
+        /// Gets or sets the outer border colors.
+        /// </summary>
+        public LinearGradientColorTable OuterBorder = new LinearGradientColorTable();
+        /// <summary>
+        /// Gets or sets the outer border width. Default is 1.
+        /// </summary>
+        public int OuterBorderWidth = 1;
+        /// <summary>
+        /// Gets or sets the inner border colors.
+        /// </summary>
+        public LinearGradientColorTable InnerBorder = new LinearGradientColorTable();
+
+        /// <summary>
+        /// Gets or sets top part background colors.
+        /// </summary>
+        public LinearGradientColorTable TopBackground = new LinearGradientColorTable();
+
+        /// <summary>
+        /// Gets or sets highlight colors for the top background part.
+        /// </summary>
+        public LinearGradientColorTable TopBackgroundHighlight = new LinearGradientColorTable();
+
+        /// <summary>
+        /// Gets or sets bottom part background colors.
+        /// </summary>
+        public LinearGradientColorTable BottomBackground = new LinearGradientColorTable();
+
+        /// <summary>
+        /// Gets or sets highlight colors for the bottom background part.
+        /// </summary>
+        public LinearGradientColorTable BottomBackgroundHighlight = new LinearGradientColorTable();
+
+        /// <summary>
+        /// Gets or sets the split border colors that divides button text and image from expand part of the button.
+        /// </summary>
+        public LinearGradientColorTable SplitBorder = new LinearGradientColorTable();
+
+        /// <summary>
+        /// Gets or sets the split border light colors that divides button text and image from expand part of the button.
+        /// </summary>
+        public LinearGradientColorTable SplitBorderLight = new LinearGradientColorTable();
+
+        /// <summary>
+        /// Gets or sets the text color.
+        /// </summary>
+        public Color Text = Color.Empty;
+
+        /// <summary>
+        /// Gets or sets the background color of the expand sign.
+        /// </summary>
+        public Color ExpandBackground = Color.Empty;
+        /// <summary>
+        /// Gets or sets the outline light color of the expand sign.
+        /// </summary>
+        public Color ExpandLight = Color.Empty;
+        /// <summary>
+        /// Gets or sets the single gradient background for the button. When specified it is used instead of TopBackground and BottomBackground for rendering.
+        /// </summary>
+        public LinearGradientColorTable Background = null;
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/Office2007CalendarViewColorTable.cs b/PROMS/DotNetBar Source Code/Rendering/Office2007CalendarViewColorTable.cs
new file mode 100644
index 00000000..2683b4fc
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/Office2007CalendarViewColorTable.cs	
@@ -0,0 +1,18 @@
+using System;
+using System.Text;
+using System.Drawing;
+using DevComponents.DotNetBar.Schedule;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    /// <summary>
+    /// Represents the color table for Office 2007 Style CalendarView Control.
+    /// </summary>
+    public class Office2007CalendarViewColorTable
+    {
+        public ColorDef[] TimeRulerColors = null;
+        public ColorDef[] MonthViewColors = null;
+        public ColorDef[] WeekDayViewColors = null;
+        public ColorDef[] AppointmentColors = null;
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/Office2007CheckBoxColorTable.cs b/PROMS/DotNetBar Source Code/Rendering/Office2007CheckBoxColorTable.cs
new file mode 100644
index 00000000..c260f4ea
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/Office2007CheckBoxColorTable.cs	
@@ -0,0 +1,31 @@
+using System;
+using System.Text;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    /// <summary>
+    /// Represent the color table for the CheckBoxItem.
+    /// </summary>
+    public class Office2007CheckBoxColorTable
+    {
+        /// <summary>
+        /// Gets or sets the colors for the item in default state.
+        /// </summary>
+        public Office2007CheckBoxStateColorTable Default = new Office2007CheckBoxStateColorTable();
+
+        /// <summary>
+        /// Gets or sets the colors for the item when mouse is over the item.
+        /// </summary>
+        public Office2007CheckBoxStateColorTable MouseOver = new Office2007CheckBoxStateColorTable();
+
+        /// <summary>
+        /// Gets or sets the colors for the item when mouse is pressed over the item.
+        /// </summary>
+        public Office2007CheckBoxStateColorTable Pressed = new Office2007CheckBoxStateColorTable();
+
+        /// <summary>
+        /// Gets or sets the colors for the item when item is disabled.
+        /// </summary>
+        public Office2007CheckBoxStateColorTable Disabled = new Office2007CheckBoxStateColorTable();
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/Office2007CheckBoxStateColorTable.cs b/PROMS/DotNetBar Source Code/Rendering/Office2007CheckBoxStateColorTable.cs
new file mode 100644
index 00000000..df23e73c
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/Office2007CheckBoxStateColorTable.cs	
@@ -0,0 +1,42 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    /// <summary>
+    /// Defines the colors for the single CheckBoxItem state.
+    /// </summary>
+    public class Office2007CheckBoxStateColorTable
+    {
+        /// <summary>
+        /// Gets or sets the background colors of the check box.
+        /// </summary>
+        public LinearGradientColorTable CheckBackground = null;
+
+        /// <summary>
+        /// Gets or sets the color of the check border.
+        /// </summary>
+        public Color CheckBorder = Color.Empty;
+
+        /// <summary>
+        /// Gets or sets the inner color of check box border.
+        /// </summary>
+        public Color CheckInnerBorder = Color.Empty;
+
+        /// <summary>
+        /// Gets or sets the inner background color of check box.
+        /// </summary>
+        public LinearGradientColorTable CheckInnerBackground = null;
+
+        /// <summary>
+        /// Gets or sets the color of the check sign that is drawn when item is checked.
+        /// </summary>
+        public LinearGradientColorTable CheckSign = null;
+
+        /// <summary>
+        /// Gets or sets the text color.
+        /// </summary>
+        public Color Text = Color.Empty;
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/Office2007ColorItemColorTable.cs b/PROMS/DotNetBar Source Code/Rendering/Office2007ColorItemColorTable.cs
new file mode 100644
index 00000000..e78a4ce9
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/Office2007ColorItemColorTable.cs	
@@ -0,0 +1,27 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    /// <summary>
+    /// Defines color table for ColorItem.
+    /// </summary>
+    public class Office2007ColorItemColorTable
+    {
+        #region ColorItem Colors
+        /// <summary>
+        /// Gets or sets the border that is drawn around each individual color item or color item group.
+        /// </summary>
+        public Color Border = ColorScheme.GetColor("ECE9D8");
+        /// <summary>
+        /// Gets or sets the inner mouse over color.
+        /// </summary>
+        public Color MouseOverInnerBorder = ColorScheme.GetColor("FFE294");
+        /// <summary>
+        /// Gets or sets the outer mouse over color.
+        /// </summary>
+        public Color MouseOverOuterBorder = ColorScheme.GetColor("F29436");
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/Office2007ColorItemPainter.cs b/PROMS/DotNetBar Source Code/Rendering/Office2007ColorItemPainter.cs
new file mode 100644
index 00000000..fa9d795b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/Office2007ColorItemPainter.cs	
@@ -0,0 +1,103 @@
+using System;
+using System.Drawing;
+using System.Text;
+
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    /// <summary>
+    /// Represents the painter for ColorItem in Office 2007 style
+    /// </summary>
+    internal class Office2007ColorItemPainter : ColorItemPainter, IOffice2007Painter
+    {
+        #region IOffice2007Painter
+        private Office2007ColorTable m_ColorTable = null; //new Office2007ColorTable();
+
+        /// <summary>
+        /// Gets or sets color table used by renderer.
+        /// </summary>
+        public Office2007ColorTable ColorTable
+        {
+            get { return m_ColorTable; }
+            set { m_ColorTable = value; }
+        }
+        #endregion
+
+        #region Internal Implementation
+        public override void PaintColorItem(ColorItemRendererEventArgs e)
+        {
+            Graphics g = e.Graphics;
+            ColorItem item = e.ColorItem;
+            Rectangle r = item.Bounds;
+            Color borderColor = m_ColorTable.ColorItem.Border;
+            Color outerHotColor = m_ColorTable.ColorItem.MouseOverOuterBorder;
+            Color innerHotColor = m_ColorTable.ColorItem.MouseOverInnerBorder;
+
+            System.Drawing.Drawing2D.SmoothingMode sm = g.SmoothingMode;
+            g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.Default;
+
+            Region clip = g.Clip;
+            g.SetClip(r);
+            Color selectedColor = Color.Empty;
+            ColorPickerDropDown cpd = null;
+            BaseItem parent = item.Parent;
+            while (parent != null)
+            {
+                if (parent is ColorPickerDropDown)
+                {
+                    cpd = parent as ColorPickerDropDown;
+                    break;
+                }
+                parent = parent.Parent;
+            }
+            if (cpd != null)
+                selectedColor = cpd.SelectedColor;
+            try
+            {
+                if (!item.Color.IsEmpty)
+                {
+                    Rectangle fill = r;
+                    fill.Inflate(1, 1);
+                    DisplayHelp.FillRectangle(g, fill, item.Color, Color.Empty);
+                }
+
+                if (item.IsMouseOver || selectedColor == item.Color)
+                {
+                    Rectangle inner = r;
+                    inner.Inflate(-1, -1);
+                    DisplayHelp.DrawRectangle(g, innerHotColor, inner);
+                    DisplayHelp.DrawRectangle(g, outerHotColor, r);
+                }
+                else
+                {
+                    eColorItemBorder border = item.Border;
+                    if (border == eColorItemBorder.All)
+                        DisplayHelp.DrawRectangle(g, borderColor, r);
+                    else if (border != eColorItemBorder.None)
+                    {
+                        using (Pen pen = new Pen(borderColor))
+                        {
+                            if ((border & eColorItemBorder.Left) == eColorItemBorder.Left)
+                                g.DrawLine(pen, r.X, r.Y, r.X, r.Bottom - 1);
+                            if ((border & eColorItemBorder.Right) == eColorItemBorder.Right)
+                                g.DrawLine(pen, r.Right - 1, r.Y, r.Right - 1, r.Bottom - 1);
+                            if ((border & eColorItemBorder.Top) == eColorItemBorder.Top)
+                                g.DrawLine(pen, r.X, r.Y, r.Right - 1, r.Y);
+                            if ((border & eColorItemBorder.Bottom) == eColorItemBorder.Bottom)
+                                g.DrawLine(pen, r.X, r.Bottom - 1, r.Right - 1, r.Bottom - 1);
+                        }
+                    }
+                }
+            }
+            finally
+            {
+                if (clip != null)
+                    g.Clip = clip;
+                else
+                    g.ResetClip();
+            }
+            g.SmoothingMode = sm;
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/Office2007ColorTable.cs b/PROMS/DotNetBar Source Code/Rendering/Office2007ColorTable.cs
new file mode 100644
index 00000000..2cbf7cb5
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/Office2007ColorTable.cs	
@@ -0,0 +1,2169 @@
+using System;
+using System.Text;
+using System.Drawing;
+using System.Collections;
+using DevComponents.DotNetBar.Schedule;
+using System.Collections.Generic;
+using DevComponents.DotNetBar.Controls;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    /// <summary>
+    /// Represents color table for Office 2007 style.
+    /// </summary>
+    public class Office2007ColorTable: IElementStyleClassProvider, IDisposable
+    {
+        #region Private Variables
+        private Office2007ButtonItemColorTableCollection m_ButtonItemColors = new Office2007ButtonItemColorTableCollection();
+        private Office2007ButtonItemColorTableCollection m_RibbonButtonItemColors = new Office2007ButtonItemColorTableCollection();
+        private Office2007ButtonItemColorTableCollection m_MenuButtonItemColors = new Office2007ButtonItemColorTableCollection();
+        private Office2007ButtonItemColorTableCollection _ApplicationButtonColors = new Office2007ButtonItemColorTableCollection();
+        private Office2007ButtonItemColorTableCollection _BackstageButtonColors = new Office2007ButtonItemColorTableCollection();
+        private Office2007ButtonItemColorTableCollection _NavigationPaneButtonItemColors = new Office2007ButtonItemColorTableCollection();
+        private Office2007RibbonTabItemColorTableCollection m_RibbonTabItemColors = new Office2007RibbonTabItemColorTableCollection();
+        private Office2007RibbonTabGroupColorTableCollection m_RibbonTabGroupColors = new Office2007RibbonTabGroupColorTableCollection();
+        private eOffice2007ColorScheme m_ColorScheme = eOffice2007ColorScheme.Blue;
+        private Hashtable m_StyleClasses = new Hashtable();
+        private Dictionary<string, object> m_ContextualTables = new Dictionary<string, object>();
+        private ColorFactory m_ColorFactory = new ColorFactory();
+        #endregion
+
+        #region Constructor
+        /// <summary>
+        /// Creates new instance of the object.
+        /// </summary>
+        public Office2007ColorTable()
+        {
+            InitializeBlueColorTable(m_ColorFactory);
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the Office2007ColorTable class.
+        /// </summary>
+        /// <param name="colorFactory">Specifies the color factory for the color table.</param>
+        public Office2007ColorTable(ColorFactory colorFactory)
+        {
+            m_ColorFactory = colorFactory;
+            InitializeBlueColorTable(m_ColorFactory);
+        }
+
+        private void InitializeBlueColorTable(ColorFactory factory)
+        {
+            #region RibbonControl Start Images
+            this.RibbonControl.StartButtonDefault = BarFunctions.LoadBitmap("SystemImages.BlankStartButtonNormal.png");
+            this.RibbonControl.StartButtonMouseOver = BarFunctions.LoadBitmap("SystemImages.BlankStartButtonHot.png");
+            this.RibbonControl.StartButtonPressed = BarFunctions.LoadBitmap("SystemImages.BlankStartButtonPressed.png");
+            #endregion
+
+            #region RibbonControl
+            this.RibbonControl.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x8DB2E3), factory.GetColor(0x88A1C2));
+            this.RibbonControl.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xE7EFF8), factory.GetColor(0xC0F9FF));
+            this.RibbonControl.TabsBackground = new LinearGradientColorTable(factory.GetColor(0xBFDBFF), Color.Empty);
+            this.RibbonControl.TabDividerBorder = factory.GetColor(0xAECAF0);
+            this.RibbonControl.TabDividerBorderLight = factory.GetColor(0xD4E3F5);
+            this.RibbonControl.CornerSize = 3;
+            this.RibbonControl.PanelTopBackgroundHeight = 15;
+            this.RibbonControl.PanelTopBackground = new LinearGradientColorTable(factory.GetColor(0xDBE6F4), factory.GetColor(0xCFDDEF));
+            this.RibbonControl.PanelBottomBackground = new LinearGradientColorTable(factory.GetColor(0xC9D9ED), factory.GetColor(0xE7F2FF));
+            #endregion
+
+            #region Item Group
+            this.ItemGroup.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x99B6E0), factory.GetColor(0x7394BD));
+            this.ItemGroup.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xD5E3F1), factory.GetColor(0xE3EDFB));
+            this.ItemGroup.TopBackground = new LinearGradientColorTable(factory.GetColor(0xC8DBEE), factory.GetColor(0xC9DDF6));
+            this.ItemGroup.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xBCD0E9), factory.GetColor(0xD0E1F7));
+            this.ItemGroup.ItemGroupDividerDark = Color.FromArgb(196, factory.GetColor(0xB8C8DC));
+            this.ItemGroup.ItemGroupDividerLight = Color.FromArgb(128, factory.GetColor(0xFFFFFF));
+            #endregion
+
+            #region RibbonBar
+            RibbonBar.Default = Office2007ColorTableFactory.GetRibbonBarBlue(factory);
+            RibbonBar.MouseOver = Office2007ColorTableFactory.GetRibbonBarBlueMouseOver(factory);
+            RibbonBar.Expanded = Office2007ColorTableFactory.GetRibbonBarBlueExpanded(factory);
+            #endregion
+
+            #region ButtonItem Colors Initialization
+            // Orange
+            Office2007ButtonItemColorTable cb = Office2007ColorTableFactory.GetButtonItemBlueOrange(factory);
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Orange);
+            m_ButtonItemColors.Add(cb);
+            // Orange with background
+            cb = Office2007ColorTableFactory.GetButtonItemBlueOrangeWithBackground(factory);
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.OrangeWithBackground);
+            m_ButtonItemColors.Add(cb);
+            // Blue
+            cb = Office2007ColorTableFactory.GetButtonItemBlueBlue(factory);
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Blue);
+            m_ButtonItemColors.Add(cb);
+            // Blue with background
+            cb = Office2007ColorTableFactory.GetButtonItemBlueBlueWithBackground(factory);
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.BlueWithBackground);
+            m_ButtonItemColors.Add(cb);
+            // Magenta
+            cb = Office2007ColorTableFactory.GetButtonItemBlueMagenta(factory);
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Magenta);
+            m_ButtonItemColors.Add(cb);
+            // Blue with background
+            cb = Office2007ColorTableFactory.GetButtonItemBlueMagentaWithBackground(factory);
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.MagentaWithBackground);
+            m_ButtonItemColors.Add(cb);
+
+            cb = Office2007ColorTableFactory.GetButtonItemOffice2007WithBackground(factory);
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Office2007WithBackground);
+            m_ButtonItemColors.Add(cb);
+
+            m_ButtonItemColors.Add(ButtonItemStaticColorTables.CreateBlueOrbColorTable(factory));
+            #endregion
+
+            #region RibbonTabItem Colors Initialization
+            Office2007RibbonTabItemColorTable rt = Office2007ColorTableFactory.GetRibbonTabItemBlueDefault(factory);
+            rt.Name = Enum.GetName(typeof(eRibbonTabColor), eRibbonTabColor.Default);
+            m_RibbonTabItemColors.Add(rt);
+
+            // Magenta
+            rt = Office2007ColorTableFactory.GetRibbonTabItemBlueMagenta(factory);
+            rt.Name = Enum.GetName(typeof(eRibbonTabColor), eRibbonTabColor.Magenta);
+            m_RibbonTabItemColors.Add(rt);
+
+            // Green
+            rt = Office2007ColorTableFactory.GetRibbonTabItemBlueGreen(factory);
+            rt.Name = Enum.GetName(typeof(eRibbonTabColor), eRibbonTabColor.Green);
+            m_RibbonTabItemColors.Add(rt);
+
+            // Orange
+            rt = Office2007ColorTableFactory.GetRibbonTabItemBlueOrange(factory);
+            rt.Name = Enum.GetName(typeof(eRibbonTabColor), eRibbonTabColor.Orange);
+            m_RibbonTabItemColors.Add(rt);
+            #endregion
+
+            #region RibbonTabItemGroup Colors Initialization
+            // Default
+            Office2007RibbonTabGroupColorTable tg = Office2007ColorTableFactory.GetRibbonTabGroupBlueDefault(factory);
+            tg.Name = Enum.GetName(typeof(eRibbonTabGroupColor), eRibbonTabGroupColor.Default);
+            m_RibbonTabGroupColors.Add(tg);
+
+            // Magenta
+            tg = Office2007ColorTableFactory.GetRibbonTabGroupBlueMagenta(factory);
+            tg.Name = Enum.GetName(typeof(eRibbonTabGroupColor), eRibbonTabGroupColor.Magenta);
+            m_RibbonTabGroupColors.Add(tg);
+
+            // Green
+            tg = Office2007ColorTableFactory.GetRibbonTabGroupBlueGreen(factory);
+            tg.Name = Enum.GetName(typeof(eRibbonTabGroupColor), eRibbonTabGroupColor.Green);
+            m_RibbonTabGroupColors.Add(tg);
+
+            // Orange
+            tg = Office2007ColorTableFactory.GetRibbonTabGroupBlueOrange(factory);
+            tg.Name = Enum.GetName(typeof(eRibbonTabGroupColor), eRibbonTabGroupColor.Orange);
+            m_RibbonTabGroupColors.Add(tg);
+            #endregion
+
+            #region Initialize Bar
+            Bar.ToolbarTopBackground = new LinearGradientColorTable(factory.GetColor(0xD7E6F9), factory.GetColor(0xC7DCF8));
+            Bar.ToolbarBottomBackground = new LinearGradientColorTable(factory.GetColor(0xB3D0F5), factory.GetColor(0xD7E5F7));
+            Bar.ToolbarBottomBorder = factory.GetColor(0xBAD4F7);
+            Bar.PopupToolbarBackground = new LinearGradientColorTable(factory.GetColor(0xFAFAFA), Color.Empty);
+            Bar.PopupToolbarBorder = factory.GetColor(0x868686);
+            Bar.StatusBarTopBorder = factory.GetColor(0x567DB0);
+            Bar.StatusBarTopBorderLight = factory.GetColor(Color.FromArgb(148, Color.White));
+            Bar.StatusBarAltBackground.Clear();
+            Bar.StatusBarAltBackground.Add(new BackgroundColorBlend(factory.GetColor(0xC5DCF8), 0f));
+            Bar.StatusBarAltBackground.Add(new BackgroundColorBlend(factory.GetColor(0xA9CAF7), 0.4f));
+            Bar.StatusBarAltBackground.Add(new BackgroundColorBlend(factory.GetColor(0x90B6EA), 0.4f));
+            Bar.StatusBarAltBackground.Add(new BackgroundColorBlend(factory.GetColor(0x7495C2), 1f));
+            #endregion
+
+            #region Menu
+            this.Menu.Background = new LinearGradientColorTable(factory.GetColor(0xFAFAFA), Color.Empty);
+            this.Menu.Border = new LinearGradientColorTable(factory.GetColor(0x868686), Color.Empty);
+            this.Menu.Side = new LinearGradientColorTable(factory.GetColor(0xE9EEEE), Color.Empty);
+            this.Menu.SideBorder = new LinearGradientColorTable(factory.GetColor(0xC5C5C5), Color.Empty);
+            this.Menu.SideBorderLight = new LinearGradientColorTable(factory.GetColor(0xF5F5F5), Color.Empty);
+            this.Menu.SideUnused = new LinearGradientColorTable(factory.GetColor(0xE5E5E5), Color.Empty);
+            this.Menu.FileBackgroundBlend.Clear();
+            this.Menu.FileBackgroundBlend.AddRange(new DevComponents.DotNetBar.BackgroundColorBlend[] {
+                new DevComponents.DotNetBar.BackgroundColorBlend(System.Drawing.Color.FromArgb(((int)(((byte)(215)))), ((int)(((byte)(229)))), ((int)(((byte)(247))))), 0F),
+                new DevComponents.DotNetBar.BackgroundColorBlend(System.Drawing.Color.FromArgb(((int)(((byte)(218)))), ((int)(((byte)(231)))), ((int)(((byte)(247))))), 4F),
+                new DevComponents.DotNetBar.BackgroundColorBlend(System.Drawing.Color.FromArgb(((int)(((byte)(207)))), ((int)(((byte)(223)))), ((int)(((byte)(243))))), 4F),
+                new DevComponents.DotNetBar.BackgroundColorBlend(System.Drawing.Color.FromArgb(((int)(((byte)(189)))), ((int)(((byte)(211)))), ((int)(((byte)(239))))), 1F)});
+            this.Menu.FileContainerBorder = Color.White;
+            this.Menu.FileContainerBorderLight = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(175)))), ((int)(((byte)(202)))));
+            this.Menu.FileColumnOneBackground = factory.GetColor(0xFAFAFA);
+            this.Menu.FileColumnOneBorder = factory.GetColor(0xC5C5C5);
+            this.Menu.FileColumnTwoBackground = factory.GetColor(0xE9EAEE);
+            this.Menu.FileBottomContainerBackgroundBlend.Clear();
+            this.Menu.FileBottomContainerBackgroundBlend.AddRange(new DevComponents.DotNetBar.BackgroundColorBlend[] {
+                new DevComponents.DotNetBar.BackgroundColorBlend(System.Drawing.Color.FromArgb(((int)(((byte)(189)))), ((int)(((byte)(211)))), ((int)(((byte)(239))))), 0F),
+                new DevComponents.DotNetBar.BackgroundColorBlend(System.Drawing.Color.FromArgb(((int)(((byte)(190)))), ((int)(((byte)(212)))), ((int)(((byte)(240))))), 0.4F),
+                new DevComponents.DotNetBar.BackgroundColorBlend(System.Drawing.Color.FromArgb(((int)(((byte)(176)))), ((int)(((byte)(201)))), ((int)(((byte)(234))))), 0.4F),
+                new DevComponents.DotNetBar.BackgroundColorBlend(System.Drawing.Color.FromArgb(((int)(((byte)(207)))), ((int)(((byte)(224)))), ((int)(((byte)(245))))), 1F)});
+            #endregion
+
+            #region ComboBox
+            this.ComboBox.Default.Background = factory.GetColor(0xEAF2FB);
+            this.ComboBox.Default.Border = factory.GetColor(0xABC1DE);
+            this.ComboBox.Default.ExpandBackground = new LinearGradientColorTable();
+            this.ComboBox.Default.ExpandBorderInner = new LinearGradientColorTable();
+            this.ComboBox.Default.ExpandBorderOuter = new LinearGradientColorTable();
+            this.ComboBox.Default.ExpandText = factory.GetColor(0x15428B);
+            this.ComboBox.DefaultStandalone.Background = factory.GetColor(0xFFFFFF);
+            int editBorderColor = 0xB3C7E1;
+            this.ComboBox.DefaultStandalone.Border = factory.GetColor(editBorderColor);
+            this.ComboBox.DefaultStandalone.ExpandBackground = new LinearGradientColorTable(factory.GetColor(0xE4F0FE), factory.GetColor(0xCFDFF3), 90);
+            this.ComboBox.DefaultStandalone.ExpandBorderInner = new LinearGradientColorTable();
+            this.ComboBox.DefaultStandalone.ExpandBorderOuter = new LinearGradientColorTable(factory.GetColor(0xAFC4DF), Color.Empty, 90);
+            this.ComboBox.DefaultStandalone.ExpandText = factory.GetColor(0x15428B);
+            this.ComboBox.MouseOver.Background = factory.GetColor(0xFFFFFF);
+            this.ComboBox.MouseOver.Border = factory.GetColor(editBorderColor);
+            this.ComboBox.MouseOver.ExpandBackground = new LinearGradientColorTable(factory.GetColor(0xFFFCE2), factory.GetColor(0xFFE7A5), 90);
+            this.ComboBox.MouseOver.ExpandBorderInner = new LinearGradientColorTable(factory.GetColor(0xFFFFFB), factory.GetColor(0xFFFCF3), 90);
+            this.ComboBox.MouseOver.ExpandBorderOuter = new LinearGradientColorTable(factory.GetColor(0xDBCE99), Color.Empty, 90);
+            this.ComboBox.MouseOver.ExpandText = factory.GetColor(0x15428B);
+            this.ComboBox.DroppedDown.Background = factory.GetColor(0xFFFFFF);
+            this.ComboBox.DroppedDown.Border = factory.GetColor(editBorderColor);
+            this.ComboBox.DroppedDown.ExpandBackground = new LinearGradientColorTable(factory.GetColor(0xEAE0BF), factory.GetColor(0xFFD456), 90);
+            this.ComboBox.DroppedDown.ExpandBorderInner = new LinearGradientColorTable(factory.GetColor(0xF1EBD5), factory.GetColor(0xFFE694), 90);
+            this.ComboBox.DroppedDown.ExpandBorderOuter = new LinearGradientColorTable(factory.GetColor(0x9A8F63), Color.Empty, 90);
+            this.ComboBox.DroppedDown.ExpandText = factory.GetColor(0x15428B);
+            #endregion
+
+            #region Dialog Launcher
+            this.DialogLauncher.Default.DialogLauncher = factory.GetColor(0x668EAF);
+            this.DialogLauncher.Default.DialogLauncherShade = factory.GetColor(0xFFFFFF);
+
+            this.DialogLauncher.MouseOver.DialogLauncher = factory.GetColor(0x668EAF);
+            this.DialogLauncher.MouseOver.DialogLauncherShade = Color.FromArgb(192, factory.GetColor(0xFFFFFF));
+            this.DialogLauncher.MouseOver.TopBackground = new LinearGradientColorTable(factory.GetColor(0xFFFCDF), factory.GetColor(0xFFEFA7));
+            this.DialogLauncher.MouseOver.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xFFD975), factory.GetColor(0xFFE398));
+            this.DialogLauncher.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFFFFFB), factory.GetColor(0xFFFBF2));
+            this.DialogLauncher.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xDBCE99), Color.Empty);
+
+            this.DialogLauncher.Pressed.DialogLauncher = factory.GetColor(0x668EAF);
+            this.DialogLauncher.Pressed.DialogLauncherShade = Color.FromArgb(192, factory.GetColor(0xFFFFFF));
+            this.DialogLauncher.Pressed.TopBackground = new LinearGradientColorTable(factory.GetColor(0xE8DEBD), factory.GetColor(0xEAC68D));
+            this.DialogLauncher.Pressed.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xFFA738), factory.GetColor(0xFFCC4E));
+            this.DialogLauncher.Pressed.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xF0EAD4), factory.GetColor(0xFFE391));
+            this.DialogLauncher.Pressed.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x9A8F63), factory.GetColor(0xB0A472));
+            #endregion
+
+            #region System Button, Form
+            // Default state no background
+            this.SystemButton.Default = new Office2007SystemButtonStateColorTable();
+            this.SystemButton.Default.Foreground = new LinearGradientColorTable(factory.GetColor(0x798DA7), factory.GetColor(0x8BA7CC));
+            this.SystemButton.Default.LightShade = factory.GetColor(0xF8F9FA);
+            this.SystemButton.Default.DarkShade = factory.GetColor(0x656565);
+
+            // Mouse over state
+            this.SystemButton.MouseOver = new Office2007SystemButtonStateColorTable();
+            this.SystemButton.MouseOver.Foreground = new LinearGradientColorTable(factory.GetColor(0x798DA7), factory.GetColor(0x8BA7CC));
+            this.SystemButton.MouseOver.LightShade = factory.GetColor(0xF8F9FA);
+            this.SystemButton.MouseOver.DarkShade = factory.GetColor(0x656565);
+            this.SystemButton.MouseOver.TopBackground = new LinearGradientColorTable(factory.GetColor(0xF5F8FE), factory.GetColor(0xEAF2FF));
+            this.SystemButton.MouseOver.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xD2E4FE), factory.GetColor(0xD1E2FB));
+            this.SystemButton.MouseOver.TopHighlight = new LinearGradientColorTable(factory.GetColor(0xFBFCFF), Color.Transparent);
+            this.SystemButton.MouseOver.BottomHighlight = new LinearGradientColorTable(factory.GetColor(0xFBFCFF), Color.Transparent);
+            this.SystemButton.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xC1D4EE), factory.GetColor(0xAAC4E9));
+            this.SystemButton.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFEFEFF), factory.GetColor(0xE6F4FE));
+
+            // Pressed
+            this.SystemButton.Pressed = new Office2007SystemButtonStateColorTable();
+            this.SystemButton.Pressed.Foreground = new LinearGradientColorTable(factory.GetColor(0x798DA7), factory.GetColor(0x8BA7CC));
+            this.SystemButton.Pressed.LightShade = factory.GetColor(0xF8F9FA);
+            this.SystemButton.Pressed.DarkShade = factory.GetColor(0x656565);
+            this.SystemButton.Pressed.TopBackground = new LinearGradientColorTable(factory.GetColor(0xBAD5F8), factory.GetColor(0x9EC2ED));
+            this.SystemButton.Pressed.TopHighlight = new LinearGradientColorTable(factory.GetColor(0xB8CEE9), Color.Transparent);
+            this.SystemButton.Pressed.BottomBackground = new LinearGradientColorTable(factory.GetColor(0x84B2E9), factory.GetColor(0xAFD6F7));
+            this.SystemButton.Pressed.BottomHighlight = new LinearGradientColorTable(factory.GetColor(0xC6EAFD), Color.Transparent);
+            this.SystemButton.Pressed.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xA1BFE5), factory.GetColor(0xB2CAE7));
+            this.SystemButton.Pressed.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xD3E6FF), factory.GetColor(0xDCE9FB));
+
+            // Form border
+            this.Form.Active.BorderColors = new Color[] {
+                factory.GetColor(0x3B5A82),
+                factory.GetColor(0xB1C6E1),
+                factory.GetColor(0xC2D9F7),
+                factory.GetColor(0xBFDBFF),
+                factory.GetColor(0xBFDBFF)};
+
+            this.Form.Inactive.BorderColors = new Color[] {
+                factory.GetColor(0xC0C6CE),
+                factory.GetColor(0xCCD6E2),
+                factory.GetColor(0xD4DEEC),
+                factory.GetColor(0xBFDBFF),
+                factory.GetColor(0xBFDBFF)};
+
+            // Form Caption Active
+            this.Form.Active.CaptionTopBackground = new LinearGradientColorTable(factory.GetColor(0xE4EBF6), factory.GetColor(0xDAE9FD));
+            this.Form.Active.CaptionBottomBackground = new LinearGradientColorTable(factory.GetColor(0xCADEF7), factory.GetColor(0xE4EFFD));
+            this.Form.Active.CaptionBottomBorder = new Color[] { factory.GetColor(0xDCF4FE), factory.GetColor(0xB0CFF7) };
+            this.Form.Active.CaptionText = factory.GetColor(0x3E6AAA);
+            this.Form.Active.CaptionTextExtra = factory.GetColor(0x697079);
+
+            // Form Caption Inactive
+            this.Form.Inactive.CaptionTopBackground = new LinearGradientColorTable(factory.GetColor(0xE3E7EC), factory.GetColor(0xDEE5ED));
+            this.Form.Inactive.CaptionBottomBackground = new LinearGradientColorTable(factory.GetColor(0xD8E1EC), factory.GetColor(0xE3E8EF));
+            this.Form.Inactive.CaptionText = factory.GetColor(0xA0A0A0);
+            this.Form.Inactive.CaptionTextExtra = factory.GetColor(0xA0A0A0);
+
+            this.Form.BackColor = factory.GetColor(0xC2D9F7);
+            this.Form.TextColor = factory.GetColor(0x15428B);
+            #endregion
+
+            #region Quick Access Toolbar Background
+            this.QuickAccessToolbar.Active.TopBackground = new LinearGradientColorTable(factory.GetColor(0xDEE7F4), factory.GetColor(0xE6EEF9));
+            this.QuickAccessToolbar.Active.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xDBE7F7), factory.GetColor(0xC9D9EE));
+            this.QuickAccessToolbar.Active.OutterBorderColor = factory.GetColor(0xF6F9FC);
+            this.QuickAccessToolbar.Active.MiddleBorderColor = factory.GetColor(0x9AB3D5);
+            this.QuickAccessToolbar.Active.InnerBorderColor = Color.Empty; //  factory.GetColor(0xD2E3F9);
+
+            this.QuickAccessToolbar.Inactive.TopBackground = new LinearGradientColorTable(factory.GetColor(0xE6ECF3), factory.GetColor(0xCED8E6));
+            this.QuickAccessToolbar.Inactive.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xCED8E6), factory.GetColor(0xC8D3E3));
+            this.QuickAccessToolbar.Inactive.OutterBorderColor = factory.GetColor(0xF6F9FC);
+            this.QuickAccessToolbar.Inactive.MiddleBorderColor = factory.GetColor(0x9AB3D5);
+            this.QuickAccessToolbar.Inactive.InnerBorderColor = Color.Empty;
+
+            this.QuickAccessToolbar.Standalone.TopBackground = new LinearGradientColorTable();
+            this.QuickAccessToolbar.Standalone.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xB2CDED), factory.GetColor(0xAAC5EA));
+            this.QuickAccessToolbar.Standalone.OutterBorderColor = factory.GetColor(0x7EA1CD);
+            this.QuickAccessToolbar.Standalone.MiddleBorderColor = Color.Empty;
+            this.QuickAccessToolbar.Standalone.InnerBorderColor = factory.GetColor(0xDCE8F7);
+
+            this.QuickAccessToolbar.QatCustomizeMenuLabelBackground = factory.GetColor(0xDDE7EE);
+            this.QuickAccessToolbar.QatCustomizeMenuLabelText = factory.GetColor(0x00156E);
+
+            this.QuickAccessToolbar.Active.GlassBorder = new LinearGradientColorTable(factory.GetColor(Color.FromArgb(132, Color.Black)), Color.FromArgb(80, Color.Black));
+            this.QuickAccessToolbar.Inactive.GlassBorder = new LinearGradientColorTable(factory.GetColor(Color.FromArgb(132, Color.Black)), Color.FromArgb(80, Color.Black));
+            #endregion
+
+            #region Tab Colors
+            this.TabControl.Default = new Office2007TabItemStateColorTable();
+            this.TabControl.Default.TopBackground = new LinearGradientColorTable(factory.GetColor(0xD7E6F9), factory.GetColor(0xC7DCF8));
+            this.TabControl.Default.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xB3D0F5), factory.GetColor(0xD7E5F7));
+            this.TabControl.Default.InnerBorder = factory.GetColor(0xF3F7FD);
+            this.TabControl.Default.OuterBorder = factory.GetColor(0x92A5C7);
+            this.TabControl.Default.Text = factory.GetColor(0x154A93);
+
+            this.TabControl.MouseOver = new Office2007TabItemStateColorTable();
+            this.TabControl.MouseOver.TopBackground = new LinearGradientColorTable(factory.GetColor(0xFFFDEB), factory.GetColor(0xFFECA8));
+            this.TabControl.MouseOver.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xFFDA59), factory.GetColor(0xFFE68D));
+            this.TabControl.MouseOver.InnerBorder = factory.GetColor(0xFFFFFB);
+            this.TabControl.MouseOver.OuterBorder = factory.GetColor(0xB69D73);
+            this.TabControl.MouseOver.Text = factory.GetColor(0x154A93);
+
+            this.TabControl.Selected = new Office2007TabItemStateColorTable();
+            //this.TabControl.Selected.TopBackground = new LinearGradientColorTable(factory.GetColor(0xFFD29B), factory.GetColor(0xFFBB6E));
+            this.TabControl.Selected.TopBackground = new LinearGradientColorTable(factory.GetColor(Color.White), factory.GetColor(0xFDFDFE));
+            //this.TabControl.Selected.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xFFAF44), factory.GetColor(0xFEDC75));
+            this.TabControl.Selected.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xFDFDFE), factory.GetColor(0xFDFDFE));
+            //this.TabControl.Selected.InnerBorder = factory.GetColor(0xCDB69C);
+            this.TabControl.Selected.InnerBorder = factory.GetColor(Color.White);
+            //this.TabControl.Selected.OuterBorder = factory.GetColor(0x95774A);
+            this.TabControl.Selected.OuterBorder = factory.GetColor(0x92A5C7);
+            this.TabControl.Selected.Text = factory.GetColor(0x154A93);
+
+            this.TabControl.TabBackground = new LinearGradientColorTable(factory.GetColor(0xE3EFFF), factory.GetColor(0xB0D2FF));
+            this.TabControl.TabPanelBackground = new LinearGradientColorTable(factory.GetColor(0xFDFDFE), factory.GetColor(0x9DBCE3));
+            this.TabControl.TabPanelBorder = factory.GetColor(0x92A5C7);
+            #endregion
+
+            #region CheckBoxItem
+            Office2007CheckBoxColorTable chk = this.CheckBoxItem;
+            chk.Default.CheckBackground = new LinearGradientColorTable(factory.GetColor(0xF4F4F4), Color.Empty);
+            chk.Default.CheckBorder = factory.GetColor(0xABC1DE);
+            chk.Default.CheckInnerBackground = new LinearGradientColorTable(Color.FromArgb(192, factory.GetColor(0xA2ACB9)), Color.FromArgb(164, factory.GetColor(0xF6F6F6)));
+            chk.Default.CheckInnerBorder = factory.GetColor(0xA2ACB9);
+            chk.Default.CheckSign = new LinearGradientColorTable(factory.GetColor(0x4A6B96), Color.Empty);
+            chk.Default.Text = factory.GetColor(0x15428B);
+
+            chk.MouseOver.CheckBackground = new LinearGradientColorTable(factory.GetColor(0xDEEAFA), Color.Empty);
+            chk.MouseOver.CheckBorder = factory.GetColor(0x5577A3);
+            chk.MouseOver.CheckInnerBackground = new LinearGradientColorTable(Color.FromArgb(192, factory.GetColor(0xFAD57A)), Color.FromArgb(128, factory.GetColor(0xFEF8E7)));
+            chk.MouseOver.CheckInnerBorder = factory.GetColor(0xFAD57A);
+            chk.MouseOver.CheckSign = new LinearGradientColorTable(factory.GetColor(0x4A6B96), Color.Empty);
+            chk.MouseOver.Text = factory.GetColor(0x15428B);
+
+            chk.Pressed.CheckBackground = new LinearGradientColorTable(factory.GetColor(0xC1D8F5), Color.Empty);
+            chk.Pressed.CheckBorder = factory.GetColor(0x5577A3);
+            chk.Pressed.CheckInnerBackground = new LinearGradientColorTable(Color.FromArgb(192, factory.GetColor(0xF28926)), Color.FromArgb(164, factory.GetColor(0xFFF4D5)));
+            chk.Pressed.CheckInnerBorder = factory.GetColor(0xF28926);
+            chk.Pressed.CheckSign = new LinearGradientColorTable(factory.GetColor(0x4A6B96), Color.Empty);
+            chk.Pressed.Text = factory.GetColor(0x15428B);
+
+            chk.Disabled.CheckBackground = new LinearGradientColorTable(factory.GetColor(0xFFFFFF), Color.Empty);
+            chk.Disabled.CheckBorder = factory.GetColor(0xAEB1B5);
+            chk.Disabled.CheckInnerBackground = new LinearGradientColorTable(Color.FromArgb(192, factory.GetColor(0xE0E2E5)), Color.FromArgb(164, factory.GetColor(0xFBFBFB)));
+            chk.Disabled.CheckInnerBorder = factory.GetColor(0xE0E2E5);
+            chk.Disabled.CheckSign = new LinearGradientColorTable(factory.GetColor(0x8D8D8D), Color.Empty);
+            chk.Disabled.Text = factory.GetColor(0x8D8D8D);
+            #endregion
+
+            #region Scroll Bar Colors
+            Office2007ColorTableFactory.InitializeScrollBarColorTable(this, factory);
+            Office2007ColorTableFactory.InitializeAppBlueScrollBarColorTable(this, factory);
+            #endregion
+
+            #region ProgressBarItem
+            Office2007ProgressBarColorTable pct = this.ProgressBarItem;
+            pct.BackgroundColors = new GradientColorTable(0xC6CBD5, 0xE0E4ED);
+            pct.OuterBorder = factory.GetColor(0xDEE2EC);
+            pct.InnerBorder = factory.GetColor(0x7496C2);
+            pct.Chunk = new GradientColorTable(0x69922A, 0xE7F2D4, 0);
+            pct.ChunkOverlay = new GradientColorTable();
+            pct.ChunkOverlay.LinearGradientAngle = 90;
+            pct.ChunkOverlay.Colors.AddRange(new BackgroundColorBlend[] {
+                new BackgroundColorBlend(Color.FromArgb(192, factory.GetColor(0xEEFFD7)), 0f),
+                new BackgroundColorBlend(Color.FromArgb(128, factory.GetColor(0x8DB254)), .5f),
+                new BackgroundColorBlend(Color.FromArgb(64, factory.GetColor(0x69922B)), .5f),
+                new BackgroundColorBlend(Color.Transparent, 1f),
+            });
+            pct.ChunkShadow = new GradientColorTable(0xB2B9C8, 0xD5DAE5, 0);
+
+            // Paused State
+            pct = this.ProgressBarItemPaused;
+            pct.BackgroundColors = new GradientColorTable(0xC6CBD5, 0xE0E4ED);
+            pct.OuterBorder = factory.GetColor(0xDEE2EC);
+            pct.InnerBorder = factory.GetColor(0x7496C2);
+            pct.Chunk = new GradientColorTable(0xAEA700, 0xFFFDCD, 0);
+            pct.ChunkOverlay = new GradientColorTable();
+            pct.ChunkOverlay.LinearGradientAngle = 90;
+            pct.ChunkOverlay.Colors.AddRange(new BackgroundColorBlend[] {
+                new BackgroundColorBlend(Color.FromArgb(192, factory.GetColor(0xFFFBA3)), 0f),
+                new BackgroundColorBlend(Color.FromArgb(128, factory.GetColor(0xD2CA00)), .5f),
+                new BackgroundColorBlend(Color.FromArgb(64, factory.GetColor(0xFEF400)), .5f),
+                new BackgroundColorBlend(Color.Transparent, 1f),
+            });
+            pct.ChunkShadow = new GradientColorTable(0xB2B9C8, 0xD5DAE5, 0);
+
+            // Error State
+            pct = this.ProgressBarItemError;
+            pct.BackgroundColors = new GradientColorTable(0xC6CBD5, 0xE0E4ED);
+            pct.OuterBorder = factory.GetColor(0xDEE2EC);
+            pct.InnerBorder = factory.GetColor(0x7496C2);
+            pct.Chunk = new GradientColorTable(0xD20000, 0xFFCDCD, 0);
+            pct.ChunkOverlay = new GradientColorTable();
+            pct.ChunkOverlay.LinearGradientAngle = 90;
+            pct.ChunkOverlay.Colors.AddRange(new BackgroundColorBlend[] {
+                new BackgroundColorBlend(Color.FromArgb(192, factory.GetColor(0xFF8F8F)), 0f),
+                new BackgroundColorBlend(Color.FromArgb(128, factory.GetColor(0xD20000)), .5f),
+                new BackgroundColorBlend(Color.FromArgb(64, factory.GetColor(0xFE0000)), .5f),
+                new BackgroundColorBlend(Color.Transparent, 1f),
+            });
+            pct.ChunkShadow = new GradientColorTable(0xB2B9C8, 0xD5DAE5, 0);
+            #endregion
+
+            #region Gallery
+            Office2007GalleryColorTable gallery = this.Gallery;
+            gallery.GroupLabelBackground = factory.GetColor(0xDDE7EE);
+            gallery.GroupLabelText = factory.GetColor(0x00156E);
+            gallery.GroupLabelBorder = factory.GetColor(0xC5C5C5);
+            #endregion
+
+            #region Legacy Colors
+            this.LegacyColors.BarBackground = factory.GetColor(0xE3EFFF);
+            this.LegacyColors.BarBackground2 = factory.GetColor(0xA9CEFE);
+            this.LegacyColors.BarStripeColor = factory.GetColor(0x6F9DD9);
+            this.LegacyColors.BarCaptionBackground = factory.GetColor(0x6593CF);
+            this.LegacyColors.BarCaptionBackground2 = factory.GetColor(0x3764A0);
+            this.LegacyColors.BarCaptionInactiveBackground = factory.GetColor(0xE3EFFF);
+            this.LegacyColors.BarCaptionInactiveBackground2 = factory.GetColor(0xAFD2FF);
+            this.LegacyColors.BarCaptionInactiveText = factory.GetColor(0x083772);
+            this.LegacyColors.BarCaptionText = factory.GetColor(0xFFFFFF);
+            this.LegacyColors.BarFloatingBorder = factory.GetColor(0x3764A0);
+            this.LegacyColors.BarPopupBackground = factory.GetColor(0xF6F6F6);
+            this.LegacyColors.BarPopupBorder = factory.GetColor(0x6593CF);
+            this.LegacyColors.ItemBackground = Color.Empty;
+            this.LegacyColors.ItemBackground2 = Color.Empty;
+            this.LegacyColors.ItemCheckedBackground = factory.GetColor(0xFCD578);
+            this.LegacyColors.ItemCheckedBackground2 = factory.GetColor(0xFBC84F);
+            this.LegacyColors.ItemCheckedBorder = factory.GetColor(0xBB5503);
+            this.LegacyColors.ItemCheckedText = factory.GetColor(0x000000);
+            this.LegacyColors.ItemDisabledBackground = Color.Empty;
+            this.LegacyColors.ItemDisabledText = factory.GetColor(0x8D8D8D);
+            this.LegacyColors.ItemExpandedShadow = Color.Empty;
+            this.LegacyColors.ItemExpandedBackground = factory.GetColor(0xE3EFFE);
+            this.LegacyColors.ItemExpandedBackground2 = factory.GetColor(0x99BFF0);
+            this.LegacyColors.ItemExpandedText = factory.GetColor(0x000000);
+            this.LegacyColors.ItemHotBackground = factory.GetColor(0xFFF5CC);
+            this.LegacyColors.ItemHotBackground2 = factory.GetColor(0xFFDB75);
+            this.LegacyColors.ItemHotBorder = factory.GetColor(0xFFBD69);
+            this.LegacyColors.ItemHotText = factory.GetColor(0x000000);
+            this.LegacyColors.ItemPressedBackground = factory.GetColor(0xFC973D);
+            this.LegacyColors.ItemPressedBackground2 = factory.GetColor(0xFFB85E);
+            this.LegacyColors.ItemPressedBorder = factory.GetColor(0xFB8C3C);
+            this.LegacyColors.ItemPressedText = factory.GetColor(0x000000);
+            this.LegacyColors.ItemSeparator = Color.FromArgb(80, factory.GetColor(0x9AC6FF));
+            this.LegacyColors.ItemSeparatorShade = Color.FromArgb(250, factory.GetColor(0xFFFFFF));
+            this.LegacyColors.ItemText = factory.GetColor(0x000000); // SystemColors.ControlTet;
+            this.LegacyColors.MenuBackground = factory.GetColor(0xF6F6F6);
+            this.LegacyColors.MenuBackground2 = Color.Empty; // Color.White;
+            this.LegacyColors.MenuBarBackground = factory.GetColor(0xBFDBFF);
+            this.LegacyColors.MenuBorder = factory.GetColor(0x6593CF);
+            this.LegacyColors.ItemExpandedBorder = this.LegacyColors.MenuBorder;
+            this.LegacyColors.MenuSide = factory.GetColor(0xE9EEEE);
+            this.LegacyColors.MenuSide2 = Color.Empty; // factory.GetColor(0xDDE0E8);
+            this.LegacyColors.MenuUnusedBackground = this.LegacyColors.MenuBackground;
+            this.LegacyColors.MenuUnusedSide = factory.GetColor(0xDADADA);
+            this.LegacyColors.MenuUnusedSide2 = Color.Empty;// System.Windows.Forms.ControlPaint.Light(this.LegacyColors.MenuSide2);
+            this.LegacyColors.ItemDesignTimeBorder = Color.Black;
+            this.LegacyColors.BarDockedBorder = factory.GetColor(0x6F9DD9);
+            this.LegacyColors.DockSiteBackColor = factory.GetColor(0xBFDBFF);
+            this.LegacyColors.DockSiteBackColor2 = Color.Empty;
+            this.LegacyColors.CustomizeBackground = factory.GetColor(0xD7E8FF);
+            this.LegacyColors.CustomizeBackground2 = factory.GetColor(0x6F9DD9);
+            this.LegacyColors.CustomizeText = factory.GetColor(0x000000);
+            this.LegacyColors.PanelBackground = factory.GetColor(0xE3EFFF);
+            this.LegacyColors.PanelBackground2 = factory.GetColor(0xAFD2FF);
+            this.LegacyColors.PanelText = factory.GetColor(0x083772);
+            this.LegacyColors.PanelBorder = factory.GetColor(0x6593CF);
+            this.LegacyColors.ExplorerBarBackground = factory.GetColor(0xC4C8D4);
+            this.LegacyColors.ExplorerBarBackground2 = factory.GetColor(0xB1B3C8);
+            #endregion
+
+            #region Navigation Pane
+            this.NavigationPane.ButtonBackground = new GradientColorTable();
+            this.NavigationPane.ButtonBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xE3EFFF), 0));
+            this.NavigationPane.ButtonBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xC4DDFF), .4f));
+            this.NavigationPane.ButtonBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xADD1FF), .4f));
+            this.NavigationPane.ButtonBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xC0DBFF), 1));
+            #endregion
+
+            #region SuperTooltip
+            this.SuperTooltip.BackgroundColors = new LinearGradientColorTable(factory.GetColor(0xFFFFFF), factory.GetColor(0xC9D9EF));
+            this.SuperTooltip.TextColor = factory.GetColor(0x4C4C4C);
+            #endregion
+
+            #region Slider
+            Office2007SliderColorTable sl = this.Slider;
+            sl.Default.LabelColor = factory.GetColor(0x0A207D);
+            sl.Default.SliderLabelColor = factory.GetColor(0x1E395B);
+            sl.Default.PartBackground = new GradientColorTable();
+            sl.Default.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFFFFFF), 0));
+            sl.Default.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xF1F6FC), .15f));
+            sl.Default.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xAEC9EE), .5f));
+            sl.Default.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0x6A98D0), .5f));
+            sl.Default.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xF1F6FC), 1f));
+            sl.Default.PartBorderColor = factory.GetColor(0x2F578D);
+            sl.Default.PartBorderLightColor = Color.FromArgb(96, factory.GetColor(0xFFFFFF));
+            sl.Default.PartForeColor = factory.GetColor(0x566375);
+            sl.Default.PartForeLightColor = Color.FromArgb(168, factory.GetColor(0xE7F0F9));
+            sl.Default.TrackLineColor = factory.GetColor(0x7496C2);
+            sl.Default.TrackLineLightColor = factory.GetColor(0xDEE2EC);
+
+            sl.MouseOver.LabelColor = factory.GetColor(0x092061);
+            sl.MouseOver.SliderLabelColor = factory.GetColor(0x1E395B);
+            sl.MouseOver.PartBackground = new GradientColorTable();
+            sl.MouseOver.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFFFFFF), 0));
+            sl.MouseOver.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFFFDF5), .2f));
+            sl.MouseOver.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFFDF83), .5f));
+            sl.MouseOver.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xDDA70D), .5f));
+            sl.MouseOver.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFFF4CE), .85f));
+            sl.MouseOver.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFFF4CE), 1f));
+            sl.MouseOver.PartBorderColor = factory.GetColor(0x2F578D);
+            sl.MouseOver.PartBorderLightColor = Color.FromArgb(96, factory.GetColor(0xFFFFFF));
+            sl.MouseOver.PartForeColor = factory.GetColor(0x67624A);
+            sl.MouseOver.PartForeLightColor = Color.FromArgb(168, factory.GetColor(0xE7F0F9));
+            sl.MouseOver.TrackLineColor = factory.GetColor(0x7496C2);
+            sl.MouseOver.TrackLineLightColor = factory.GetColor(0xDEE2EC);
+
+            sl.Pressed.LabelColor = factory.GetColor(0x092061);
+            sl.Pressed.SliderLabelColor = factory.GetColor(0x1E395B);
+            sl.Pressed.PartBackground = new GradientColorTable();
+            sl.Pressed.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xDB7518), 0));
+            sl.Pressed.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xF7902F), .2f));
+            sl.Pressed.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xF9C18B), .5f));
+            sl.Pressed.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xED7400), .5f));
+            sl.Pressed.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFFC188), .85f));
+            sl.Pressed.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xF2D2B5), 1f));
+            sl.Pressed.PartBorderColor = factory.GetColor(0x2F578D);
+            sl.Pressed.PartBorderLightColor = Color.FromArgb(96, factory.GetColor(0xFFFFFF));
+            sl.Pressed.PartForeColor = factory.GetColor(0x67513E);
+            sl.Pressed.PartForeLightColor = Color.FromArgb(168, factory.GetColor(0xE7F0F9));
+            sl.Pressed.TrackLineColor = factory.GetColor(0x7496C2);
+            sl.Pressed.TrackLineLightColor = factory.GetColor(0xDEE2EC);
+
+            ColorBlendFactory df = new ColorBlendFactory(ColorScheme.GetColor(0xCFCFCF));
+            sl.Disabled.LabelColor = factory.GetColor(0x8D8D8D);
+            sl.Disabled.SliderLabelColor = factory.GetColor(0x8D8D8D);
+            sl.Disabled.PartBackground = new GradientColorTable();
+            foreach (BackgroundColorBlend b in sl.Default.PartBackground.Colors)
+                sl.Disabled.PartBackground.Colors.Add(new BackgroundColorBlend(df.GetColor(b.Color), b.Position));
+            sl.Disabled.PartBorderColor = df.GetColor(sl.Default.PartBorderColor);
+            sl.Disabled.PartBorderLightColor = df.GetColor(sl.Default.PartBorderLightColor);
+            sl.Disabled.PartForeColor = df.GetColor(sl.Default.PartForeColor);
+            sl.Disabled.PartForeLightColor = df.GetColor(sl.Default.PartForeLightColor);
+            sl.Disabled.TrackLineColor = df.GetColor(sl.Default.TrackLineColor);
+            sl.Disabled.TrackLineLightColor = df.GetColor(sl.Default.TrackLineLightColor);
+            #endregion
+
+            #region RangeSlider
+            InitRangeSlider(this, factory);
+            
+            #endregion
+
+            #region ListViewEx
+            this.ListViewEx.Border = factory.GetColor(editBorderColor);
+            this.ListViewEx.ColumnBackground = new LinearGradientColorTable(factory.GetColor(0xFFFFFF), factory.GetColor(0xC4DDFF));
+            this.ListViewEx.ColumnSeparator = factory.GetColor(0x9AC6FF);
+            this.ListViewEx.ColumnForeColor = factory.GetColor(0x15428B);
+            this.ListViewEx.SelectionBackground = new LinearGradientColorTable(factory.GetColor(0xA7CDF0), Color.Empty);
+            this.ListViewEx.SelectionBorder = factory.GetColor(0xE3EFFF);
+            #endregion
+
+            #region DataGridView
+            this.DataGridView.ColumnHeaderNormalBorder = factory.GetColor(0x9EB6CE);
+            this.DataGridView.ColumnHeaderNormalBackground = new LinearGradientColorTable(factory.GetColor(0xF9FCFD), factory.GetColor(0xD3DBE9), 90);
+            this.DataGridView.ColumnHeaderSelectedBackground = new LinearGradientColorTable(factory.GetColor(0xF9D99F), factory.GetColor(0xF1C15F), 90);
+            this.DataGridView.ColumnHeaderSelectedBorder = factory.GetColor(0xF29536);
+            this.DataGridView.ColumnHeaderSelectedMouseOverBackground = new LinearGradientColorTable(factory.GetColor(0xFFD58D), factory.GetColor(0xF2923A), 90);
+            this.DataGridView.ColumnHeaderSelectedMouseOverBorder = factory.GetColor(0xF29536);
+            this.DataGridView.ColumnHeaderMouseOverBackground = new LinearGradientColorTable(factory.GetColor(0xDFE2E4), factory.GetColor(0xBCC5D2), 90);
+            this.DataGridView.ColumnHeaderMouseOverBorder = factory.GetColor(0x879FB7);
+            this.DataGridView.ColumnHeaderPressedBackground = new LinearGradientColorTable(factory.GetColor(0xBCC5D2), factory.GetColor(0xDFE2E4), 90);
+            this.DataGridView.ColumnHeaderPressedBorder = factory.GetColor(0xFFFFFF);
+
+            this.DataGridView.RowNormalBackground = new LinearGradientColorTable(factory.GetColor(0xE4ECF7));
+            this.DataGridView.RowNormalBorder = factory.GetColor(0x9EB6CE);
+            this.DataGridView.RowSelectedBackground = new LinearGradientColorTable(factory.GetColor(0xFFD58D));
+            this.DataGridView.RowSelectedBorder = factory.GetColor(0xF29536);
+            this.DataGridView.RowSelectedMouseOverBackground = new LinearGradientColorTable(factory.GetColor(0xF1C05C));
+            this.DataGridView.RowSelectedMouseOverBorder = factory.GetColor(0xF29536);
+            this.DataGridView.RowMouseOverBackground = new LinearGradientColorTable(factory.GetColor(0xF1C05C));
+            this.DataGridView.RowMouseOverBorder = factory.GetColor(0xF29536);
+            this.DataGridView.RowPressedBackground = new LinearGradientColorTable(factory.GetColor(0xBBC4D1));
+            this.DataGridView.RowPressedBorder = factory.GetColor(0xFFFFFF);
+
+            this.DataGridView.GridColor = factory.GetColor(0xD0D7E5);
+
+            this.DataGridView.SelectorBackground = new LinearGradientColorTable(factory.GetColor(0xA9C4E9));
+            this.DataGridView.SelectorBorder = factory.GetColor(0x9EB6CE);
+            this.DataGridView.SelectorBorderDark = factory.GetColor(0xB0CFF7);
+            this.DataGridView.SelectorBorderLight = factory.GetColor(0xD5E4F2);
+            this.DataGridView.SelectorSign = new LinearGradientColorTable(factory.GetColor(0xF9FAFB), factory.GetColor(0xD7DAE2));
+
+            this.DataGridView.SelectorMouseOverBackground = new LinearGradientColorTable(factory.GetColor(0x8BA0B5));
+            this.DataGridView.SelectorMouseOverBorder = factory.GetColor(0x9EB6CE);
+            this.DataGridView.SelectorMouseOverBorderDark = factory.GetColor(0xB0CFF7);
+            this.DataGridView.SelectorMouseOverBorderLight = factory.GetColor(0xD5E4F2);
+            this.DataGridView.SelectorMouseOverSign = new LinearGradientColorTable(factory.GetColor(0xF9FAFB), factory.GetColor(0xD7DAE2));
+            #endregion
+
+            #region SideBar
+            this.SideBar.Background = new LinearGradientColorTable(factory.GetColor(Color.White));
+            this.SideBar.Border = factory.GetColor(0x6593CF);
+            this.SideBar.SideBarPanelItemText = factory.GetColor(0x15428B);
+            this.SideBar.SideBarPanelItemDefault = new GradientColorTable();
+            this.SideBar.SideBarPanelItemDefault.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xE3EFFF), 0));
+            this.SideBar.SideBarPanelItemDefault.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xC4DDFF), .4f));
+            this.SideBar.SideBarPanelItemDefault.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xADD1FF), .4f));
+            this.SideBar.SideBarPanelItemDefault.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xC0DBFF), 1));
+            // Expanded
+            this.SideBar.SideBarPanelItemExpanded = new GradientColorTable();
+            this.SideBar.SideBarPanelItemExpanded.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFBDBB5), 0));
+            this.SideBar.SideBarPanelItemExpanded.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFEC778), .4f));
+            this.SideBar.SideBarPanelItemExpanded.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFEB456), .4f));
+            this.SideBar.SideBarPanelItemExpanded.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFDEB9F), 1));
+            // MouseOver
+            this.SideBar.SideBarPanelItemMouseOver = new GradientColorTable();
+            this.SideBar.SideBarPanelItemMouseOver.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFFFCD9), 0));
+            this.SideBar.SideBarPanelItemMouseOver.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFFE78D), .4f));
+            this.SideBar.SideBarPanelItemMouseOver.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFFD748), .4f));
+            this.SideBar.SideBarPanelItemMouseOver.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFFE793), 1));
+            // Pressed
+            this.SideBar.SideBarPanelItemPressed = new GradientColorTable();
+            this.SideBar.SideBarPanelItemPressed.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xF8B869), 0));
+            this.SideBar.SideBarPanelItemPressed.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFDA361), .4f));
+            this.SideBar.SideBarPanelItemPressed.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFB8A3C), .4f));
+            this.SideBar.SideBarPanelItemPressed.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFEBB60), 1));
+            #endregion
+
+            #region AdvTree
+#if !NOTREE
+            this.AdvTree = new DevComponents.AdvTree.Display.TreeColorTable();
+            DevComponents.AdvTree.Display.ColorTableInitializer.InitOffice2007Blue(this.AdvTree, factory);
+#endif
+            #endregion
+
+            #region CrumbBar
+            this.CrumbBarItemView = new CrumbBarItemViewColorTable();
+            CrumbBarItemViewStateColorTable crumbBarViewTable = new CrumbBarItemViewStateColorTable();
+            this.CrumbBarItemView.Default = crumbBarViewTable;
+            crumbBarViewTable.Foreground = factory.GetColor(0x15428B);
+            crumbBarViewTable = new CrumbBarItemViewStateColorTable();
+            this.CrumbBarItemView.MouseOver = crumbBarViewTable;
+            crumbBarViewTable.Foreground = factory.GetColor(0x15428B);
+            crumbBarViewTable.Background = new BackgroundColorBlendCollection();
+            crumbBarViewTable.Background.AddRange(new BackgroundColorBlend[]{
+                new BackgroundColorBlend(factory.GetColor("FFFCD9"), 0f),
+                new BackgroundColorBlend(factory.GetColor("FFE78D"), .4f),
+                new BackgroundColorBlend(factory.GetColor("FFD748"), .4f),
+                new BackgroundColorBlend(factory.GetColor("FFE793"), 1f)});
+            crumbBarViewTable.Border = factory.GetColor("FFB8A98E");
+            crumbBarViewTable.BorderLight = factory.GetColor("90FFFFFF");
+            crumbBarViewTable = new CrumbBarItemViewStateColorTable();
+            this.CrumbBarItemView.MouseOverInactive = crumbBarViewTable;
+            crumbBarViewTable.Foreground = factory.GetColor(0x15428B);
+            crumbBarViewTable.Background = new BackgroundColorBlendCollection();
+            crumbBarViewTable.Background.AddRange(new BackgroundColorBlend[]{
+                new BackgroundColorBlend(factory.GetColor("FFFFFDEC"), 0f),
+                new BackgroundColorBlend(factory.GetColor("FFFFF4CA"), .4f),
+                new BackgroundColorBlend(factory.GetColor("FFFFEBA6"), .4f),
+                new BackgroundColorBlend(factory.GetColor("FFFFF2C5"), 1f)});
+            crumbBarViewTable.Border = factory.GetColor("FF8E8F8F");
+            crumbBarViewTable.BorderLight = factory.GetColor("90FFFFFF");
+            crumbBarViewTable = new CrumbBarItemViewStateColorTable();
+            this.CrumbBarItemView.Pressed = crumbBarViewTable;
+            crumbBarViewTable.Foreground = factory.GetColor(0x15428B);
+            crumbBarViewTable.Background = new BackgroundColorBlendCollection();
+            crumbBarViewTable.Background.AddRange(new BackgroundColorBlend[]{
+                new BackgroundColorBlend(factory.GetColor("FFC59B61"), 0f),
+                new BackgroundColorBlend(factory.GetColor("FFEEB469"), .1f),
+                new BackgroundColorBlend(factory.GetColor("FFFCA060"), .6f),
+                new BackgroundColorBlend(factory.GetColor("FFFB8E3D"), .6f),
+                new BackgroundColorBlend(factory.GetColor("FFFEBB60"), 1f)});
+            crumbBarViewTable.Border = factory.GetColor("FF8B7654");
+            crumbBarViewTable.BorderLight = factory.GetColor("408B7654");
+
+            #endregion
+
+            #region WarningBox
+            this.WarningBox.BackColor = factory.GetColor(Color.FromArgb(255, 196, 219, 249));
+            this.WarningBox.WarningBorderColor = factory.GetColor(Color.FromArgb(255, 162, 188, 213));
+            this.WarningBox.WarningBackColor1 = factory.GetColor(Color.FromArgb(255, 255, 255, 255));
+            this.WarningBox.WarningBackColor2 = factory.GetColor(Color.FromArgb(255, 229, 244, 254));
+            #endregion
+
+            #region CalendarView
+
+            #region WeekDayViewColors
+
+            this.CalendarView.WeekDayViewColors = new ColorDef[]
+            {
+                new ColorDef(factory.GetColor(0x5D8CC9)),           // DayViewBorder
+                new ColorDef(factory.GetColor(0x000000)),           // DayHeaderForeground - 0x15428B
+
+                new ColorDef(new Color[] {factory.GetColor(0xE4ECF6), factory.GetColor(0xD6E2F1), factory.GetColor(0xC2D4EB), factory.GetColor(0xD0DEEF)},
+                new float[] {0f, .55f, .58f, 1f}, 90f),             // DayHeaderBackground
+
+                new ColorDef(factory.GetColor(0x8DAED9)),           // DayHeaderBorder
+
+                new ColorDef(factory.GetColor(0xFFFFFF)),           // DayWorkHoursBackground
+                new ColorDef(factory.GetColor(0x8DAED9)),           // DayAllDayEventBackground
+                new ColorDef(factory.GetColor(0xE6EDF7)),           // DayOffWorkHoursBackground
+
+                new ColorDef(factory.GetColor(0xA5BFE1)),           // DayHourBorder
+                new ColorDef(factory.GetColor(0xD5E1F1)),           // DayHalfHourBorder
+
+                new ColorDef(factory.GetColor(0x294C7A)),           // SelectionBackground
+                
+                new ColorDef(factory.GetColor(0x5D8CC9)),           // OwnerTabBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xBBCFE9), factory.GetColor(0x8DAED9)},
+                new float[] {0f, 1f}, 90f),                         // OwnerTabBackground
+
+                new ColorDef(factory.GetColor(0x000000)),           // OwnerTabForeground
+                new ColorDef(factory.GetColor(0x8DAED9)),           // OwnerTabContentBackground
+                new ColorDef(factory.GetColor(0x000000)),           // OwnerTabSelectedForeground
+                new ColorDef(factory.GetColor(0xFFFFFF)),           // OwnerTabSelectionBackground
+
+                new ColorDef(factory.GetColor(0xF5F5F5)),           // CondensedViewBackground
+
+                new ColorDef(factory.GetColor(0xEB8900)),           // NowDayViewBorder
+                new ColorDef(factory.GetColor(0x000000)),           // NowDayHeaderForeground - 0x15428B
+
+                new ColorDef(new Color[] {factory.GetColor(0xFFED79), factory.GetColor(0xFFD86B), factory.GetColor(0xFFBB00), factory.GetColor(0xFFEA77)},
+                new float[] {0f, .55f ,58f, 1f}, 90f),              // NowDayHeaderBackground
+
+                new ColorDef(new Color[] {factory.GetColor(0xFFED79), factory.GetColor(0xFFD86B), factory.GetColor(0xFFBB00), factory.GetColor(0xFFEA77)},
+                new float[] {0f, .55f ,58f, 1f}, 90f),              // TimeIndicator
+
+                new ColorDef(factory.GetColor(0xEB8900)),           // TimeIndicatorBorder
+            };
+
+            #endregion
+
+            #region TimeRulerColors
+
+            this.CalendarView.TimeRulerColors = new ColorDef[]
+            {
+                new ColorDef(factory.GetColor(0xE3EFFF)),           // TimeRulerBackground
+                new ColorDef(factory.GetColor(0x6593CF)),           // TimeRulerForeground
+                new ColorDef(factory.GetColor(0x6593CF)),           // TimeRulerBorder
+                new ColorDef(factory.GetColor(0x6593CF)),           // TimeRulerTickBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xFFED79), factory.GetColor(0xFFD86B), factory.GetColor(0xFFBB00), factory.GetColor(0xFFEA77)},
+                new float[] {0f, .55f ,58f, 1f}, 90f),              // TimeRulerIndicator
+
+                new ColorDef(factory.GetColor(0xEB8900)),           // TimeRulerIndicatorBorder
+            };
+
+            #endregion
+
+            #region MonthViewColors
+
+            this.CalendarView.MonthViewColors = new ColorDef[]
+            {
+                new ColorDef(factory.GetColor(0x8DAED9)),           // DayOfWeekHeaderBorder
+
+                new ColorDef(new Color[] { factory.GetColor(0xE1E9F4), factory.GetColor(0xD6E2F1), factory.GetColor(0xC2D4EB), factory.GetColor(0xD0DEEF) },
+                new float[] { 0, .6f, .6f, 1 }),                    // DayOfWeekHeaderBackground
+
+                new ColorDef(factory.GetColor(0x000000)),           // DayOfWeekHeaderForeground - 0x15428B
+                new ColorDef(factory.GetColor(0x5D8CC9)),           // SideBarBorder
+
+                new ColorDef(new Color[] { factory.GetColor(0xE1E9F4), factory.GetColor(0xD6E2F1), factory.GetColor(0xC2D4EB), factory.GetColor(0xD0DEEF) },
+                new float[] { 0, .6f, .6f, 1 }, 0),                 // SideBarBackground
+
+                new ColorDef(factory.GetColor(0x000000)),           // SideBarForeground - 0x15428B
+                new ColorDef(factory.GetColor(0x5D8CC9)),           // DayHeaderBorder
+
+                new ColorDef(new Color[] { factory.GetColor(0xE1E9F4), factory.GetColor(0xD6E2F1), factory.GetColor(0xC2D4EB), factory.GetColor(0xD0DEEF) },
+                new float[] { 0, .6f, .6f, 1 }),                    // DayHeaderBackground
+
+                new ColorDef(factory.GetColor(0x000000)),           // DayHeaderForeground
+                new ColorDef(factory.GetColor(0x8DAED9)),           // DayContentBorder
+                new ColorDef(factory.GetColor(0xE6EDF7)),           // DayContentSelectionBackground
+                new ColorDef(factory.GetColor(0xFFFFFF)),           // DayContentActiveDayBackground
+                new ColorDef(factory.GetColor(0xA5BFE1)),           // DayContentInactiveDayBackground
+                
+                new ColorDef(factory.GetColor(0x5D8CC9)),           // OwnerTabBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xBBCFE9), factory.GetColor(0x8DAED9)},    // OwnerTabBackground
+                new float[] {0f, 1f}, 90f),
+
+                new ColorDef(factory.GetColor(0x000000)),           // OwnerTabForeground
+                new ColorDef(factory.GetColor(0x8DAED9)),           // OwnerTabContentBackground
+                new ColorDef(factory.GetColor(0x000000)),           // OwnerTabSelectedForeground
+                new ColorDef(factory.GetColor(0xFFFFFF)),           // OwnerTabSelectionBackground
+
+                new ColorDef(factory.GetColor(0xEB8900)),           // NowDayViewBorder
+                new ColorDef(factory.GetColor(0x000000)),           // NowDayHeaderForeground - 0x15428B
+
+                new ColorDef(new Color[] {factory.GetColor(0xFFED79), factory.GetColor(0xFFD86B), factory.GetColor(0xFFBB00), factory.GetColor(0xFFEA77)},
+                new float[] {0f, .55f ,58f, 1f}, 90f),              // NowDayHeaderBackground
+
+                new ColorDef(factory.GetColor(0x000000)),           // ContentLinkForeground - DayHeaderForeground
+                new ColorDef(factory.GetColor(0xFFFFFF)),           // ContentLinkBackground - DayContentActiveDayBackground
+            };
+
+            #endregion
+
+            #region AppointmentColors
+
+            this.CalendarView.AppointmentColors = new ColorDef[]
+            {
+                new ColorDef(factory.GetColor(0x4B71A2)),           // DefaultBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xFDFEFF), factory.GetColor(0xC1D3EA)},
+                             new float[] {0f, 1f}, 90f),            // DefaultBackground
+
+                new ColorDef(factory.GetColor(0x28518E)),           // BlueBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xB1C5EC), factory.GetColor(0x759DDA)}, 
+                             new float[] {0f, 1f}, 90f),            // BlueBackground
+
+                new ColorDef(factory.GetColor(0x2C6524)),           // GreenBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xC2E8BC), factory.GetColor(0x84D17B)},
+                             new float[] {0f, 1f}, 90f),            // GreenBackground
+
+                new ColorDef(factory.GetColor(0x8B3E0A)),           // OrangeBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xF9C7A0), factory.GetColor(0xF49758)},
+                             new float[] {0f, 1f}, 90f),            // OrangeBackground
+
+                new ColorDef(factory.GetColor(0x3E2771)),           // PurpleBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xC5B5E6), factory.GetColor(0x957BD2)},
+                             new float[] {0f, 1f}, 90f),            // PurpleBackground
+
+                new ColorDef(factory.GetColor(0x86171C)),           // RedBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xF1AAAC), factory.GetColor(0xE5676E)},
+                             new float[] {0f, 1f}, 90f),            // RedBackground
+
+                new ColorDef(factory.GetColor(0x7C7814)),           // YellowBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xFFFCAA), factory.GetColor(0xFFF958)},
+                             new float[] {0f, 1f}, 90f),            // YellowBackground
+
+                new ColorDef(factory.GetColor(-1)),                 // BusyTimeMarker
+                new ColorDef(factory.GetColor(0xFFFFFF)),           // FreeTimeMarker
+                new ColorDef(factory.GetColor(0x800080))            // OutOfOfficeTimeMarker
+            };
+
+            #endregion
+
+            #endregion
+
+            #region SuperTab
+
+            #region SuperTab
+            SuperTab = Office2007ColorTableFactory.GetSuperTabBlueDefault(factory);
+            #endregion
+
+            #region SuperTabItem
+            SuperTabItem = Office2007ColorTableFactory.GetSuperTabItemBlueDefault(factory);
+            #endregion
+
+            #region SuperTabPanel
+            SuperTabPanel = Office2007ColorTableFactory.GetSuperTabPanelBlueDefault(factory);
+            #endregion
+
+            #endregion
+
+            #region Backstage
+
+            #region Backstage
+            Backstage = Office2007ColorTableFactory.GetBackstageBlueDefault(factory);
+            #endregion
+
+            #region BackstageItem
+            BackstageItem = Office2007ColorTableFactory.GetBackstageItemBlueDefault(factory);
+            #endregion
+
+            #region BackstagePanel
+            BackstagePanel = Office2007ColorTableFactory.GetBackstagePanelBlueDefault(factory);
+            #endregion
+
+            #endregion
+
+            #region SwitchButton
+            SwitchButtonColorTable sbt = new SwitchButtonColorTable();
+            sbt.BorderColor = factory.GetColor(0xABC1DE);
+            sbt.OffBackColor = factory.GetColor(0xDAE5F3);
+            sbt.OffTextColor = factory.GetColor(0x15428B);
+            sbt.OnBackColor = factory.GetColor(0x92D050);
+            sbt.OnTextColor = factory.GetColor(0x15428B);
+            sbt.SwitchBackColor = factory.GetColor(0xC1D8F0);
+            sbt.SwitchBorderColor = factory.GetColor(0x86A5CF);
+            sbt.TextColor = factory.GetColor(0x15428B);
+            this.SwitchButton = new SwitchButtonColors();
+            this.SwitchButton.Default = sbt;
+            this.SwitchButton.Disabled.BorderColor = this.CheckBoxItem.Disabled.CheckBorder;
+            this.SwitchButton.Disabled.SwitchBorderColor = this.SwitchButton.Disabled.BorderColor;
+            this.SwitchButton.Disabled.OffTextColor = this.CheckBoxItem.Disabled.Text;
+            this.SwitchButton.Disabled.OnTextColor = this.SwitchButton.Disabled.OffTextColor;
+            this.SwitchButton.Disabled.TextColor = this.SwitchButton.Disabled.OffTextColor;
+            this.SwitchButton.Disabled.SwitchBackColor = this.CheckBoxItem.Disabled.CheckInnerBackground.Start;
+            this.SwitchButton.Disabled.OffBackColor = this.CheckBoxItem.Disabled.CheckInnerBackground.Start;
+            this.SwitchButton.Disabled.OnBackColor = this.SwitchButton.Disabled.OffBackColor;
+            #endregion
+
+            #region ElementStyle Classes
+            ElementStyle style = new ElementStyle();
+            style.Class = ElementStyleClassKeys.RibbonGalleryContainerKey;
+            style.BorderColor = factory.GetColor(0xB9D0ED);
+            style.Border = eStyleBorderType.Solid;
+            style.BorderWidth = 1;
+            style.CornerDiameter = 2;
+            style.CornerType = eCornerType.Rounded;
+            style.BackColor = factory.GetColor(0xD4E6F8);
+            m_StyleClasses.Add(style.Class, style);
+            // FileMenuContainer
+            style = Office2007ColorTableFactory.GetFileMenuContainerStyle(this);
+            m_StyleClasses.Add(style.Class, style);
+            // Two Column File Menu Container
+            style = Office2007ColorTableFactory.GetTwoColumnMenuContainerStyle(this);
+            m_StyleClasses.Add(style.Class, style);
+            // Column one File Menu Container
+            style = Office2007ColorTableFactory.GetMenuColumnOneContainerStyle(this);
+            m_StyleClasses.Add(style.Class, style);
+            // Column two File Menu Container
+            style = Office2007ColorTableFactory.GetMenuColumnTwoContainerStyle(this);
+            m_StyleClasses.Add(style.Class, style);
+            // Bottom File Menu Container
+            style = Office2007ColorTableFactory.GetMenuBottomContainer(this);
+            m_StyleClasses.Add(style.Class, style);
+            // TextBox border
+            style = Office2007ColorTableFactory.GetTextBoxStyle(factory.GetColor(editBorderColor));
+            m_StyleClasses.Add(style.Class, style);
+            // RichTextBox border
+            style = Office2007ColorTableFactory.GetRichTextBoxStyle(factory.GetColor(editBorderColor));
+            m_StyleClasses.Add(style.Class, style);
+            // ItemPanel
+            style = Office2007ColorTableFactory.GetItemPanelStyle(factory.GetColor(editBorderColor));
+            m_StyleClasses.Add(style.Class, style);
+            // ListBoxAdv
+            style = Office2007ColorTableFactory.GetListBoxAdvStyle(factory.GetColor(editBorderColor));
+            m_StyleClasses.Add(style.Class, style);
+            // DateTimeInput background
+            style = Office2007ColorTableFactory.GetDateTimeInputBackgroundStyle(factory.GetColor(editBorderColor), SystemColors.Window);
+            m_StyleClasses.Add(style.Class, style);
+            // Ribbon Client Panel
+            style = Office2007ColorTableFactory.GetRibbonClientPanelStyle(factory, eOffice2007ColorScheme.Blue);
+            m_StyleClasses.Add(style.Class, style);
+            // ListView Border
+            style = Office2007ColorTableFactory.GetListViewBorderStyle(this.ListViewEx);
+            m_StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetStatusBarAltStyle(this.Bar);
+            m_StyleClasses.Add(style.Class, style);
+#if !NOTREE
+            // Tree Border/Background
+            style = Office2007ColorTableFactory.GetAdvTreeStyle(factory.GetColor(editBorderColor), Color.Empty);
+            m_StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetAdvTreeColumnsHeaderStyle(factory.GetColor(0xF9FCFD), factory.GetColor(0xD3DBE9), factory.GetColor(0x9EB6CE));
+            m_StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetAdvTreeNodesColumnsHeaderStyle(factory.GetColor(0xF9FCFD), factory.GetColor(0xD3DBE9), factory.GetColor(0x9EB6CE));
+            m_StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetAdvTreeColumnStyle(factory.GetColor(0x000000));
+            m_StyleClasses.Add(style.Class, style);
+            // CrumbBar
+            style = Office2007ColorTableFactory.GetCrumbBarBackgroundStyle(factory.GetColor(Color.White), factory.GetColor("FF567DB0"), factory.GetColor("FF2F578D"));
+            m_StyleClasses.Add(style.Class, style);
+            // DataGridView border
+            style = Office2007ColorTableFactory.GetDataGridViewStyle();
+            m_StyleClasses.Add(style.Class, style);
+            // DataGridViewDateTime border
+            style = Office2007ColorTableFactory.GetDataGridViewDateTimeStyle();
+            m_StyleClasses.Add(style.Class, style);
+            // DataGridViewNumeric border
+            style = Office2007ColorTableFactory.GetDataGridViewNumericStyle();
+            m_StyleClasses.Add(style.Class, style);
+            // DataGridViewIpAddress border
+            style = Office2007ColorTableFactory.GetDataGridViewIpAddressStyle();
+            m_StyleClasses.Add(style.Class, style);
+
+            // Slide-out Button
+            style = Office2007ColorTableFactory.GetSlideOutButtonStyle(this.CheckBoxItem.Default.CheckBorder);
+            m_StyleClasses.Add(style.Class, style);
+
+            // MetroTilePanel
+            style = Office2007ColorTableFactory.GetMetroTilePanelStyle(factory.GetColor(Color.White));
+            m_StyleClasses.Add(style.Class, style);
+            // MetroTileGroup
+            style = Office2007ColorTableFactory.GetMetroTileGroupStyle(factory.GetColor(Color.DarkGray));
+            m_StyleClasses.Add(style.Class, style);
+
+            // MonthCalendarAdv
+            style = Office2007ColorTableFactory.GetMonthCalendarStyle(SystemColors.Window);
+            m_StyleClasses.Add(style.Class, style);
+
+            // ProgressSteps control
+            style = Office2007ColorTableFactory.GetProgressStepsStyle(this);
+            m_StyleClasses.Add(style.Class, style);
+
+            // SideNavStrip
+            style = Office2007ColorTableFactory.GetSideNavStripStyle(this);
+            m_StyleClasses.Add(style.Class, style);
+
+            // TabFormPanel
+            style = Office2007ColorTableFactory.GetTabFormPanelStyle(factory.GetColor(0xF5F6F7));
+            m_StyleClasses.Add(style.Class, style);
+
+            // Toolbox Control
+            style = Office2007ColorTableFactory.GetToolboxControlStyle(factory.GetColor(this.LegacyColors.PanelBorder), Color.Empty);
+            m_StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetToolboxGroupTitle(factory.GetColor(0x15428B));
+            m_StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetToolboxGroupTitleMouseOver(factory.GetColor(0x15428B), factory.GetColor(0xE4EBF6));
+            m_StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetToolboxGroupExpandedTitle(factory.GetColor(Color.White), factory.GetColor(0x3B5A82));
+            m_StyleClasses.Add(style.Class, style);
+#endif
+            #endregion
+
+            #region App Button Colors
+            Office2010ColorTable.InitAppButtonColors(this, ColorFactory.Empty);
+            #endregion
+
+            #region StepIndicator
+            this.StepIndicator.BackgroundColor = factory.GetColor(ColorFunctions.GetShade(this.Form.BackColor, 10));
+            this.StepIndicator.IndicatorColor = factory.GetColor(0xA4CC28);
+            #endregion
+
+            #region RadialMenu
+            this.RadialMenu = new RadialMenuColorTable(); // This will force built-in default colors to be used, blue
+            #endregion
+
+            #region StepItem
+            this.StepItem.Default = new OfficeStepItemStateColorTable(new Color[]{
+                    factory.GetColor(0xE3EFFF), 
+                    factory.GetColor(0xC4DDFF), 
+                    factory.GetColor(0xADD1FF), 
+                    factory.GetColor(0xC0DBFF)
+                    },
+                    90,
+                    new float[] { 0f, .5f, .5f, 1f },
+                factory.GetColor(0x15428B),
+                new Color[] {
+                    factory.GetColor(0x7793B9), factory.GetColor(0xFFFFF7) });
+            this.StepItem.Progress = new OfficeStepItemStateColorTable(new Color[]{
+                    factory.GetColor(0xD8F577), 
+                    factory.GetColor(0x75C300),
+                    factory.GetColor(0x75C300),
+                    factory.GetColor(0xA9E923)
+                    },
+                    90,
+                    new float[] { 0f, .6f, .6f, 1f },
+                Color.Empty,
+                new Color[0]);
+            this.StepItem.MouseOver = new OfficeStepItemStateColorTable(new Color[]{
+                    factory.GetColor(0xFFFCD9), 
+                    factory.GetColor(0xFFE78D),
+                    factory.GetColor(0xFFD748), 
+                    factory.GetColor(0xFFE793)
+                    },
+                    90,
+                    new float[] { 0f, .5f, .5f, 1f },
+                factory.GetColor(0x15428B),
+                new Color[] {
+                    factory.GetColor(0xC0A776), factory.GetColor(0xFFF2BE) });
+            this.StepItem.Pressed = new OfficeStepItemStateColorTable(new Color[]{
+                    factory.GetColor(0xF8B869), 
+                    factory.GetColor(0xFDA361),
+                    factory.GetColor(0xFB8A3C), 
+                    factory.GetColor(0xFEBB60)
+                    },
+                    90,
+                    new float[] { 0f, .5f, .5f, 1f },
+                factory.GetColor(0x00156E),
+                new Color[] {
+                    factory.GetColor(0x5F7FB6), factory.GetColor(0xB1905D) });
+            #endregion
+
+            #region ListBoxItem
+            this.ListBoxItem.Default = new OfficeListBoxItemStateColorTable(factory.GetColor(0x000000));
+            this.ListBoxItem.MouseOver = new OfficeListBoxItemStateColorTable(factory.GetColor(0x000000), new Color[]{
+                    factory.GetColor(0xFFFCD9), 
+                    factory.GetColor(0xFFE793)
+                    },
+                    90,
+                    new float[] { 0f, 1f });
+            this.ListBoxItem.Selected = new OfficeListBoxItemStateColorTable(factory.GetColor(0x000000), new Color[]{
+                    factory.GetColor(0xFCD578), 
+                    factory.GetColor(0xFBC84F)
+                    },
+                    90,
+                    new float[] { 0f, 1f });
+            #endregion
+
+            #region Flyout
+            this.Flyout.BorderColor = this.Form.Active.BorderColors[0];
+            #endregion
+
+            #region SideNav
+            this.SideNav.SideNavItem.Default=new SideNavItemStateColorTable(factory.GetColor(0x15428B));
+            this.SideNav.SideNavItem.MouseOver = new SideNavItemStateColorTable(factory.GetColor(0x15428B),
+                new Color[]
+                {
+                    factory.GetColor(0xFFFCD9), factory.GetColor(0xFFE78D), factory.GetColor(0xFFD748),
+                    factory.GetColor(0xFFE793)
+                },
+                new Color[] {factory.GetColor(0xC0A776), factory.GetColor(0xFFF2BE)},
+                2);
+            this.SideNav.SideNavItem.Pressed = new SideNavItemStateColorTable(factory.GetColor(0x15428B),
+                new Color[]
+                {
+                    factory.GetColor(0xF8B869), factory.GetColor(0xFDA361), factory.GetColor(0xFB8A3C),
+                    factory.GetColor(0xFEBB60)
+                },
+                new Color[] { factory.GetColor(0x5F7FB6), factory.GetColor(0xFDAD11) },
+                2);
+            this.SideNav.SideNavItem.Selected = new SideNavItemStateColorTable(factory.GetColor(0x15428B),
+                new Color[] { this.Form.BackColor },
+                new Color[] { Color.Empty, factory.GetColor(0x8DB2E3), Color.Empty, factory.GetColor(0x8DB2E3) });
+            this.SideNav.BorderColors = new Color[] {factory.GetColor(0x8DB2E3)};
+            this.SideNav.TitleBackColor = factory.GetColor(0xDBE6F5);
+            this.SideNav.TitleBorderColors = new Color[]
+                {Color.Empty, Color.Empty, Color.Empty, factory.GetColor(0x8DB2E3)};
+            this.SideNav.PanelBackColor = this.Form.BackColor;
+
+            #endregion
+
+            #region TabForm
+            this.TabForm.Active.CaptionText = factory.GetColor(0x3E6AAA);
+            this.TabForm.Inactive.CaptionText = factory.GetColor(0xA0A0A0);
+            this.TabForm.Active.CaptionBackColors=new Color[]{factory.GetColor(Color.White)};
+            this.TabForm.Inactive.CaptionBackColors=new Color[]{factory.GetColor(Color.White)};
+            TabFormItemColorTables.Add(TabFormItem.DefaultColorTableKey, CreateDefaultTabFormItemColorTable(factory, 0x15428B));
+            TabFormItemColorTables.Add(TabFormItem.BlueColorTableKey, Office2007ColorTable.CreateBlueTabFormItemColorTable(factory));
+            TabFormItemColorTables.Add(TabFormItem.YellowColorTableKey, Office2007ColorTable.CreateYellowTabFormItemColorTable(factory));
+            TabFormItemColorTables.Add(TabFormItem.PurpleColorTableKey, Office2007ColorTable.CreatePurpleTabFormItemColorTable(factory));
+            TabFormItemColorTables.Add(TabFormItem.CyanColorTableKey, Office2007ColorTable.CreateCyanTabFormItemColorTable(factory));
+            TabFormItemColorTables.Add(TabFormItem.BlueMistColorTableKey, Office2007ColorTable.CreateBlueMistTabFormItemColorTable(factory));
+            TabFormItemColorTables.Add(TabFormItem.PurpleMistColorTableKey, Office2007ColorTable.CreatePurpleMistTabFormItemColorTable(factory));
+            TabFormItemColorTables.Add(TabFormItem.TanColorTableKey, Office2007ColorTable.CreateTanTabFormItemColorTable(factory));
+            TabFormItemColorTables.Add(TabFormItem.LemonLimeColorTableKey, Office2007ColorTable.CreateLemonLimeTabFormItemColorTable(factory));
+            TabFormItemColorTables.Add(TabFormItem.AppleColorTableKey, Office2007ColorTable.CreateAppleTabFormItemColorTable(factory));
+            TabFormItemColorTables.Add(TabFormItem.TealColorTableKey, Office2007ColorTable.CreateTealTabFormItemColorTable(factory));
+            TabFormItemColorTables.Add(TabFormItem.RedChalkColorTableKey, Office2007ColorTable.CreateRedChalkTabFormItemColorTable(factory));
+            TabFormItemColorTables.Add(TabFormItem.SilverColorTableKey, Office2007ColorTable.CreateSilverTabFormItemColorTable(factory));
+            TabFormItemColorTables.Add(TabFormItem.OrangeColorTableKey, Office2007ColorTable.CreateOrangeTabFormItemColorTable(factory));
+            TabFormItemColorTables.Add(TabFormItem.GreenColorTableKey, Office2007ColorTable.CreateGreenTabFormItemColorTable(factory));
+            TabFormItemColorTables.Add(TabFormItem.MagentaColorTableKey, Office2007ColorTable.CreateMagentaTabFormItemColorTable(factory));
+            TabFormItemColorTables.Add(TabFormItem.RedColorTableKey, Office2007ColorTable.CreateRedTabFormItemColorTable(factory));
+            #endregion
+        }
+
+        internal static TabFormItemColorTable CreateDefaultTabFormItemColorTable(ColorFactory factory, int textColor)
+        {
+            TabFormItemColorTable t=new TabFormItemColorTable();
+            t.Default.BorderColors = new Color[] {factory.GetColor(0xC2C2C2), factory.GetColor(64, Color.White)};
+            t.Default.BackColors = new Color[] { factory.GetColor(0xDEE2E7), factory.GetColor(0xCDD2D8) };
+            t.Default.TextColor = factory.GetColor(textColor);
+            t.Disabled = t.Default.Clone();
+            t.Disabled.TextColor = factory.GetColor(0xA8A8A8);
+            t.MouseOver = t.Default;
+            t.Selected=new TabFormItemStateColorTable();
+            t.Selected.BackColors = new Color[] { factory.GetColor(Color.White), factory.GetColor(0xF5F6F7) };
+            t.Selected.BorderColors = new Color[] { factory.GetColor(0xB2B2B2) };
+            t.Selected.TextColor = factory.GetColor(textColor);
+            t.Name = TabFormItem.DefaultColorTableKey;
+            return t;
+        }
+
+        internal static TabFormItemColorTable CreateDefaultTabFormItemColorTable(ColorFactory factory, Color[] defaultTabBackColors, Color[] defaultTabBorderColors, Color defaultTabTextColor, Color[] selectedTabBackColors, Color[] selectedTabBorderColors, Color selectedTabTextColor)
+        {
+            TabFormItemColorTable t = new TabFormItemColorTable();
+            t.Default.BorderColors = defaultTabBorderColors;
+            t.Default.BackColors = defaultTabBackColors;
+            t.Default.TextColor = defaultTabTextColor;
+            t.Disabled = t.Default.Clone();
+            t.Disabled.TextColor = factory.GetColor(0xA8A8A8);
+            t.MouseOver = new TabFormItemStateColorTable();
+            t.MouseOver.BorderColors = defaultTabBorderColors;
+            t.MouseOver.BackColors = defaultTabBackColors;
+            t.MouseOver.TextColor = selectedTabTextColor;
+            t.Selected = new TabFormItemStateColorTable();
+            t.Selected.BackColors = selectedTabBackColors;
+            t.Selected.BorderColors = selectedTabBorderColors;
+            t.Selected.TextColor = selectedTabTextColor;
+            t.Name = TabFormItem.DefaultColorTableKey;
+            return t;
+        }
+
+        internal static TabFormItemColorTable CreateBlueTabFormItemColorTable(ColorFactory factory)
+        {
+            TabFormItemColorTable t = new TabFormItemColorTable();
+            t.Default.BackColors = new Color[] { factory.GetColor(128,0x9AC0E6) };
+            t.Default.BorderColors = new Color[] { factory.GetColor(0x8AB6E2) };
+            t.Default.TextColor = factory.GetColor(0x444444);
+            t.Disabled = t.Default.Clone();
+            t.Disabled.TextColor = factory.GetColor(0xA8A8A8);
+            t.Selected = new TabFormItemStateColorTable();
+            t.Selected.BackColors = new Color[] { factory.GetColor(0x9AC0E6) };
+            t.Selected.BorderColors = new Color[] { factory.GetColor(0x8AB6E2) };
+            t.Selected.TextColor = factory.GetColor(0x222222);
+            t.MouseOver = new TabFormItemStateColorTable();
+            t.MouseOver.BackColors = new Color[] { factory.GetColor(0xCCDFF2) };
+            t.MouseOver.BorderColors = new Color[] { factory.GetColor(0xB8D2ED) };
+            t.MouseOver.TextColor = t.Selected.TextColor; //factory.GetColor(0x444444);
+            t.Name = TabFormItem.BlueColorTableKey;
+            return t;
+        }
+        internal static TabFormItemColorTable CreateYellowTabFormItemColorTable(ColorFactory factory)
+        {
+            TabFormItemColorTable t = new TabFormItemColorTable();
+            t.Default.BackColors = new Color[] { factory.GetColor(128,0xF3D275) };
+            t.Default.BorderColors = new Color[] { factory.GetColor(0xF1CA5D) };
+            t.Default.TextColor = factory.GetColor(0x444444);
+            t.Disabled = t.Default.Clone();
+            t.Disabled.TextColor = factory.GetColor(0xA8A8A8);
+            t.Selected = new TabFormItemStateColorTable();
+            t.Selected.BackColors = new Color[] { factory.GetColor(0xF3D275) };
+            t.Selected.BorderColors = new Color[] { factory.GetColor(0xF1CA5D) };
+            t.Selected.TextColor = factory.GetColor(0x222222);
+            t.MouseOver = new TabFormItemStateColorTable();
+            t.MouseOver.BackColors = new Color[] { factory.GetColor(0xF9E9B9) };
+            t.MouseOver.BorderColors = new Color[] { factory.GetColor(0xF7DE9D) };
+            t.MouseOver.TextColor = t.Selected.TextColor; // factory.GetColor(0x444444);
+            t.Name = TabFormItem.YellowColorTableKey;
+            return t;
+        }
+        internal static TabFormItemColorTable CreateRedTabFormItemColorTable(ColorFactory factory)
+        {
+            TabFormItemColorTable t = new TabFormItemColorTable();
+            t.Default.BackColors = new Color[] { factory.GetColor(128, 0xF4A6A6) };
+            t.Default.BorderColors = new Color[] { factory.GetColor(0xF39B9B) };
+            t.Default.TextColor = factory.GetColor(0x444444);
+            t.Disabled = t.Default.Clone();
+            t.Disabled.TextColor = factory.GetColor(0xA8A8A8);
+            t.Selected = new TabFormItemStateColorTable();
+            t.Selected.BackColors = new Color[] { factory.GetColor(0xF4A6A6) };
+            t.Selected.BorderColors = new Color[] { factory.GetColor(0xF39B9B) };
+            t.Selected.TextColor = factory.GetColor(0x222222);
+            t.MouseOver = new TabFormItemStateColorTable();
+            t.MouseOver.BackColors = new Color[] { factory.GetColor(0xFAD1D1) };
+            t.MouseOver.BorderColors = new Color[] { factory.GetColor(0xF8C2C2) };
+            t.MouseOver.TextColor = t.Selected.TextColor;// factory.GetColor(0x444444);
+            t.Name = TabFormItem.RedColorTableKey;
+            return t;
+        }
+        internal static TabFormItemColorTable CreatePurpleTabFormItemColorTable(ColorFactory factory)
+        {
+            TabFormItemColorTable t = new TabFormItemColorTable();
+            t.Default.BackColors = new Color[] { factory.GetColor(128, 0xD6A6D3) };
+            t.Default.BorderColors = new Color[] { factory.GetColor(0xD399CF) };
+            t.Default.TextColor = factory.GetColor(0x444444);
+            t.Disabled = t.Default.Clone();
+            t.Disabled.TextColor = factory.GetColor(0xA8A8A8);
+            t.Selected = new TabFormItemStateColorTable();
+            t.Selected.BackColors = new Color[] { factory.GetColor(0xD6A6D3) };
+            t.Selected.BorderColors = new Color[] { factory.GetColor(0xD399CF) };
+            t.Selected.TextColor = factory.GetColor(0x222222);
+            t.MouseOver = new TabFormItemStateColorTable();
+            t.MouseOver.BackColors = new Color[] { factory.GetColor(0xEAD2E8) };
+            t.MouseOver.BorderColors = new Color[] { factory.GetColor(0xE4C0E1) };
+            t.MouseOver.TextColor = t.Selected.TextColor;// factory.GetColor(0x444444);
+            t.Name = TabFormItem.PurpleColorTableKey;
+            return t;
+        }
+        internal static TabFormItemColorTable CreateCyanTabFormItemColorTable(ColorFactory factory)
+        {
+            TabFormItemColorTable t = new TabFormItemColorTable();
+            t.Default.BackColors = new Color[] { factory.GetColor(128, 0x99D0DF) };
+            t.Default.BorderColors = new Color[] { factory.GetColor(0x87C9D9) };
+            t.Default.TextColor = factory.GetColor(0x444444);
+            t.Disabled = t.Default.Clone();
+            t.Disabled.TextColor = factory.GetColor(0xA8A8A8);
+            t.Selected = new TabFormItemStateColorTable();
+            t.Selected.BackColors = new Color[] { factory.GetColor(0x99D0DF) };
+            t.Selected.BorderColors = new Color[] { factory.GetColor(0x87C9D9) };
+            t.Selected.TextColor = factory.GetColor(0x222222);
+            t.MouseOver = new TabFormItemStateColorTable();
+            t.MouseOver.BackColors = new Color[] { factory.GetColor(0xCBE7EF) };
+            t.MouseOver.BorderColors = new Color[] { factory.GetColor(0xB7DEE8) };
+            t.MouseOver.TextColor = t.Selected.TextColor; // factory.GetColor(0x444444);
+            t.Name = TabFormItem.CyanColorTableKey;
+            return t;
+        }
+        internal static TabFormItemColorTable CreateOrangeTabFormItemColorTable(ColorFactory factory)
+        {
+            TabFormItemColorTable t = new TabFormItemColorTable();
+            t.Default.BackColors = new Color[] { factory.GetColor(128, 0xF1B87F) };
+            t.Default.BorderColors = new Color[] { factory.GetColor(0xF1B06F) };
+            t.Default.TextColor = factory.GetColor(0x444444);
+            t.Disabled = t.Default.Clone();
+            t.Disabled.TextColor = factory.GetColor(0xA8A8A8);
+            t.Selected = new TabFormItemStateColorTable();
+            t.Selected.BackColors = new Color[] { factory.GetColor(0xF1B87F) };
+            t.Selected.BorderColors = new Color[] { factory.GetColor(0xF1B06F) };
+            t.Selected.TextColor = factory.GetColor(0x222222);
+            t.MouseOver = new TabFormItemStateColorTable();
+            t.MouseOver.BackColors = new Color[] { factory.GetColor(0xF8DBBE) };
+            t.MouseOver.BorderColors = new Color[] { factory.GetColor(0xF7CFA8) };
+            t.MouseOver.TextColor = t.Selected.TextColor; // factory.GetColor(0x444444);
+            t.Name = TabFormItem.OrangeColorTableKey;
+            return t;
+        }
+        internal static TabFormItemColorTable CreateGreenTabFormItemColorTable(ColorFactory factory)
+        {
+            TabFormItemColorTable t = new TabFormItemColorTable();
+            t.Default.BackColors = new Color[] { factory.GetColor(128,0x8AD293) };
+            t.Default.BorderColors = new Color[] { factory.GetColor(0x7ACC93) };
+            t.Default.TextColor = factory.GetColor(0x444444);
+            t.Disabled = t.Default.Clone();
+            t.Disabled.TextColor = factory.GetColor(0xA8A8A8);
+            t.Selected = new TabFormItemStateColorTable();
+            t.Selected.BackColors = new Color[] { factory.GetColor(0x8AD293) };
+            t.Selected.BorderColors = new Color[] { factory.GetColor(0x7ACC93) };
+            t.Selected.TextColor = factory.GetColor(0x222222);
+            t.MouseOver = new TabFormItemStateColorTable();
+            t.MouseOver.BackColors = new Color[] { factory.GetColor(0xC5E9C9) };
+            t.MouseOver.BorderColors = new Color[] { factory.GetColor(0xADE0BC) };
+            t.MouseOver.TextColor = t.Selected.TextColor; // factory.GetColor(0x444444);
+            t.Name = TabFormItem.GreenColorTableKey;
+            return t;
+        }
+        internal static TabFormItemColorTable CreateMagentaTabFormItemColorTable(ColorFactory factory)
+        {
+            TabFormItemColorTable t = new TabFormItemColorTable();
+            t.Default.BackColors = new Color[] { factory.GetColor(128, 0xF2A8D1) };
+            t.Default.BorderColors = new Color[] { factory.GetColor(0xD399CF) };
+            t.Default.TextColor = factory.GetColor(0x444444);
+            t.Disabled = t.Default.Clone();
+            t.Disabled.TextColor = factory.GetColor(0xA8A8A8);
+            t.Selected = new TabFormItemStateColorTable();
+            t.Selected.BackColors = new Color[] { factory.GetColor(0xF2A8D1) };
+            t.Selected.BorderColors = new Color[] { factory.GetColor(0xD399CF) };
+            t.Selected.TextColor = factory.GetColor(0x222222);
+            t.MouseOver = new TabFormItemStateColorTable();
+            t.MouseOver.BackColors = new Color[] { factory.GetColor(0xF9D2E8) };
+            t.MouseOver.BorderColors = new Color[] { factory.GetColor(0xF3C5DE) };
+            t.MouseOver.TextColor = t.Selected.TextColor;// factory.GetColor(0x444444);
+            t.Name = TabFormItem.MagentaColorTableKey;
+            return t;
+        }
+        internal static TabFormItemColorTable CreateBlueMistTabFormItemColorTable(ColorFactory factory)
+        {
+            TabFormItemColorTable t = new TabFormItemColorTable();
+            t.Default.BackColors = new Color[] { factory.GetColor(128, 0x9FB2E1) };
+            t.Default.BorderColors = new Color[] { factory.GetColor(0x96ABDE) };
+            t.Default.TextColor = factory.GetColor(0x444444);
+            t.Disabled = t.Default.Clone();
+            t.Disabled.TextColor = factory.GetColor(0xA8A8A8);
+            t.Selected = new TabFormItemStateColorTable();
+            t.Selected.BackColors = new Color[] { factory.GetColor(0x9FB2E1) };
+            t.Selected.BorderColors = new Color[] { factory.GetColor(0x96ABDE) };
+            t.Selected.TextColor = factory.GetColor(0x222222);
+            t.MouseOver = new TabFormItemStateColorTable();
+            t.MouseOver.BackColors = new Color[] { factory.GetColor(0xCED9F0) };
+            t.MouseOver.BorderColors = new Color[] { factory.GetColor(0xC0CDEB) };
+            t.MouseOver.TextColor = t.Selected.TextColor;// factory.GetColor(0x444444);
+            t.Name = TabFormItem.BlueMistColorTableKey;
+            return t;
+        }
+        internal static TabFormItemColorTable CreatePurpleMistTabFormItemColorTable(ColorFactory factory)
+        {
+            TabFormItemColorTable t = new TabFormItemColorTable();
+            t.Default.BackColors = new Color[] { factory.GetColor(128, 0xB4AFDF) };
+            t.Default.BorderColors = new Color[] { factory.GetColor(0xAAA5DB) };
+            t.Default.TextColor = factory.GetColor(0x444444);
+            t.Disabled = t.Default.Clone();
+            t.Disabled.TextColor = factory.GetColor(0xA8A8A8);
+            t.Selected = new TabFormItemStateColorTable();
+            t.Selected.BackColors = new Color[] { factory.GetColor(0xB4AFDF) };
+            t.Selected.BorderColors = new Color[] { factory.GetColor(0xAAA5DB) };
+            t.Selected.TextColor = factory.GetColor(0x222222);
+            t.MouseOver = new TabFormItemStateColorTable();
+            t.MouseOver.BackColors = new Color[] { factory.GetColor(0xD8D6EF) };
+            t.MouseOver.BorderColors = new Color[] { factory.GetColor(0xCCC9E9) };
+            t.MouseOver.TextColor = t.Selected.TextColor;// factory.GetColor(0x444444);
+            t.Name = TabFormItem.PurpleMistColorTableKey;
+            return t;
+        }
+        internal static TabFormItemColorTable CreateTanTabFormItemColorTable(ColorFactory factory)
+        {
+            TabFormItemColorTable t = new TabFormItemColorTable();
+            t.Default.BackColors = new Color[] { factory.GetColor(128, 0xD4B298) };
+            t.Default.BorderColors = new Color[] { factory.GetColor(0xCDA485) };
+            t.Default.TextColor = factory.GetColor(0x444444);
+            t.Disabled = t.Default.Clone();
+            t.Disabled.TextColor = factory.GetColor(0xA8A8A8);
+            t.Selected = new TabFormItemStateColorTable();
+            t.Selected.BackColors = new Color[] { factory.GetColor(0xD4B298) };
+            t.Selected.BorderColors = new Color[] { factory.GetColor(0xCDA485) };
+            t.Selected.TextColor = factory.GetColor(0x222222);
+            t.MouseOver = new TabFormItemStateColorTable();
+            t.MouseOver.BackColors = new Color[] { factory.GetColor(0xE9D8CB) };
+            t.MouseOver.BorderColors = new Color[] { factory.GetColor(0xE0C8B6) };
+            t.MouseOver.TextColor = t.Selected.TextColor;// factory.GetColor(0x444444);
+            t.Name = TabFormItem.TanColorTableKey;
+            return t;
+        }
+        internal static TabFormItemColorTable CreateLemonLimeTabFormItemColorTable(ColorFactory factory)
+        {
+            TabFormItemColorTable t = new TabFormItemColorTable();
+            t.Default.BackColors = new Color[] { factory.GetColor(128, 0xC1DA82) };
+            t.Default.BorderColors = new Color[] { factory.GetColor(0xB4D367) };
+            t.Default.TextColor = factory.GetColor(0x444444);
+            t.Disabled = t.Default.Clone();
+            t.Disabled.TextColor = factory.GetColor(0xA8A8A8);
+            t.Selected = new TabFormItemStateColorTable();
+            t.Selected.BackColors = new Color[] { factory.GetColor(0xC1DA82) };
+            t.Selected.BorderColors = new Color[] { factory.GetColor(0xB4D367) };
+            t.Selected.TextColor = factory.GetColor(0x222222);
+            t.MouseOver = new TabFormItemStateColorTable();
+            t.MouseOver.BackColors = new Color[] { factory.GetColor(0xE0EDC0) };
+            t.MouseOver.BorderColors = new Color[] { factory.GetColor(0xD2E4A3) };
+            t.MouseOver.TextColor = t.Selected.TextColor; // factory.GetColor(0x444444);
+            t.Name = TabFormItem.LemonLimeColorTableKey;
+            return t;
+        }
+        internal static TabFormItemColorTable CreateAppleTabFormItemColorTable(ColorFactory factory)
+        {
+            TabFormItemColorTable t = new TabFormItemColorTable();
+            t.Default.BackColors = new Color[] { factory.GetColor(128, 0xABD58B) };
+            t.Default.BorderColors = new Color[] { factory.GetColor(0x9DCE78) };
+            t.Default.TextColor = factory.GetColor(0x444444);
+            t.Disabled = t.Default.Clone();
+            t.Disabled.TextColor = factory.GetColor(0xA8A8A8);
+            t.Selected = new TabFormItemStateColorTable();
+            t.Selected.BackColors = new Color[] { factory.GetColor(0xABD58B) };
+            t.Selected.BorderColors = new Color[] { factory.GetColor(0x9DCE78) };
+            t.Selected.TextColor = factory.GetColor(0x222222);
+            t.MouseOver = new TabFormItemStateColorTable();
+            t.MouseOver.BackColors = new Color[] { factory.GetColor(0xD5EAC6) };
+            t.MouseOver.BorderColors = new Color[] { factory.GetColor(0xC2E1AC) };
+            t.MouseOver.TextColor = t.Selected.TextColor;// factory.GetColor(0x444444);
+            t.Name = TabFormItem.AppleColorTableKey;
+            return t;
+        }
+        internal static TabFormItemColorTable CreateTealTabFormItemColorTable(ColorFactory factory)
+        {
+            TabFormItemColorTable t = new TabFormItemColorTable();
+            t.Default.BackColors = new Color[] { factory.GetColor(128, 0x88D4C2) };
+            t.Default.BorderColors = new Color[] { factory.GetColor(0x75CDB8) };
+            t.Default.TextColor = factory.GetColor(0x444444);
+            t.Disabled = t.Default.Clone();
+            t.Disabled.TextColor = factory.GetColor(0xA8A8A8);
+            t.Selected = new TabFormItemStateColorTable();
+            t.Selected.BackColors = new Color[] { factory.GetColor(0x88D4C2) };
+            t.Selected.BorderColors = new Color[] { factory.GetColor(0x75CDB8) };
+            t.Selected.TextColor = factory.GetColor(0x222222);
+            t.MouseOver = new TabFormItemStateColorTable();
+            t.MouseOver.BackColors = new Color[] { factory.GetColor(0xC4EAE1) };
+            t.MouseOver.BorderColors = new Color[] { factory.GetColor(0xACE1D5) };
+            t.MouseOver.TextColor = t.Selected.TextColor;// factory.GetColor(0x444444);
+            t.Name = TabFormItem.TealColorTableKey;
+            return t;
+        }
+        internal static TabFormItemColorTable CreateSilverTabFormItemColorTable(ColorFactory factory)
+        {
+            TabFormItemColorTable t = new TabFormItemColorTable();
+            t.Default.BackColors = new Color[] { factory.GetColor(128, 0xC3C9CF) };
+            t.Default.BorderColors = new Color[] { factory.GetColor(0xB9C0C7) };
+            t.Default.TextColor = factory.GetColor(0x444444);
+            t.Disabled = t.Default.Clone();
+            t.Disabled.TextColor = factory.GetColor(0xA8A8A8);
+            t.Selected = new TabFormItemStateColorTable();
+            t.Selected.BackColors = new Color[] { factory.GetColor(0xC3C9CF) };
+            t.Selected.BorderColors = new Color[] { factory.GetColor(0xB9C0C7) };
+            t.Selected.TextColor = factory.GetColor(0x222222);
+            t.MouseOver = new TabFormItemStateColorTable();
+            t.MouseOver.BackColors = new Color[] { factory.GetColor(0xE0E3E7) };
+            t.MouseOver.BorderColors = new Color[] { factory.GetColor(0xD5D9DD) };
+            t.MouseOver.TextColor = t.Selected.TextColor; // factory.GetColor(0x444444);
+            t.Name = TabFormItem.SilverColorTableKey;
+            return t;
+        }
+        internal static TabFormItemColorTable CreateRedChalkTabFormItemColorTable(ColorFactory factory)
+        {
+            TabFormItemColorTable t = new TabFormItemColorTable();
+            t.Default.BackColors = new Color[] { factory.GetColor(128,0xF2A8D1) };
+            t.Default.BorderColors = new Color[] { factory.GetColor(0xEB9FC9) };
+            t.Default.TextColor = factory.GetColor(0x444444);
+            t.Disabled = t.Default.Clone();
+            t.Disabled.TextColor = factory.GetColor(0xA8A8A8);
+            t.Selected = new TabFormItemStateColorTable();
+            t.Selected.BackColors = new Color[] { factory.GetColor(0xF2A8D1) };
+            t.Selected.BorderColors = new Color[] { factory.GetColor(0xEB9FC9) };
+            t.Selected.TextColor = factory.GetColor(0x222222);
+            t.MouseOver = new TabFormItemStateColorTable();
+            t.MouseOver.BackColors = new Color[] { factory.GetColor(0xF9D2CF) };
+            t.MouseOver.BorderColors = new Color[] { factory.GetColor(0xF3C5DE) };
+            t.MouseOver.TextColor = t.Selected.TextColor; // factory.GetColor(0x444444);
+            t.Name = TabFormItem.RedChalkColorTableKey;
+            return t;
+        }
+        internal static void InitRangeSlider(Office2007ColorTable table, ColorFactory factory)
+        {
+            Office2010RangeSliderColorTable rsl = table.RangeSlider;
+            Office2007SliderColorTable sl = table.Slider;
+            rsl.TickLineColor = sl.Default.TrackLineColor;
+
+            rsl.RangeBackground = sl.Default.PartBackground.Clone();
+            rsl.RangeLineColor = sl.Default.PartBorderColor;
+            rsl.RangeValueBackground = new GradientColorTable();
+            rsl.RangeValueBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xE1F8D4), 0));
+            rsl.RangeValueBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0x95E56A), .8f));
+            rsl.RangeValueBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0x95E56A), .85f));
+            rsl.RangeValueBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xB4EE95), 1));
+            rsl.RangeValueLineColor = rsl.RangeLineColor;
+
+            rsl.MinRangeSlider.Default.Background = sl.Default.PartBackground.Clone();
+            rsl.MinRangeSlider.Default.BorderColor = sl.Default.PartBorderColor;
+            rsl.MinRangeSlider.Default.BorderLightColor = sl.Default.PartBorderLightColor;
+            rsl.MinRangeSlider.Disabled.Background = sl.Disabled.PartBackground.Clone();
+            rsl.MinRangeSlider.Disabled.BorderColor = sl.Disabled.PartBorderColor;
+            rsl.MinRangeSlider.Disabled.BorderLightColor = sl.Disabled.PartBorderLightColor;
+            rsl.MinRangeSlider.MouseOver.Background = sl.MouseOver.PartBackground.Clone();
+            rsl.MinRangeSlider.MouseOver.BorderColor = sl.MouseOver.PartBorderColor;
+            rsl.MinRangeSlider.MouseOver.BorderLightColor = sl.MouseOver.PartBorderLightColor;
+            rsl.MinRangeSlider.Pressed.Background = sl.Pressed.PartBackground.Clone();
+            rsl.MinRangeSlider.Pressed.BorderColor = sl.Pressed.PartBorderColor;
+            rsl.MinRangeSlider.Pressed.BorderLightColor = sl.Pressed.PartBorderLightColor;
+
+            rsl.MaxRangeSlider = rsl.MinRangeSlider;
+        }
+        /// <summary>
+        /// Creates new instance of the object.
+        /// </summary>
+        public Office2007ColorTable(eOffice2007ColorScheme scheme)
+        {
+            if (scheme == eOffice2007ColorScheme.Black)
+                Office2007ColorTableFactory.InitializeVistaBlackColorTable(this, m_ColorFactory);
+            else if (scheme == eOffice2007ColorScheme.Silver)
+                Office2007SilverColorTableFactory.InitializeColorTable(this, m_ColorFactory);
+            else if (scheme == eOffice2007ColorScheme.VistaGlass)
+                Office2007VistaBlackColorTableFactory.InitializeVistaBlackColorTable(this, m_ColorFactory);
+            else
+                InitializeBlueColorTable(m_ColorFactory);
+            m_ColorScheme = scheme;
+        }
+
+        /// <summary>
+        /// Creates new instance of the object.
+        /// </summary>
+        public Office2007ColorTable(eOffice2007ColorScheme scheme, ColorFactory colorFactory)
+        {
+            m_ColorFactory = colorFactory;
+            if (scheme == eOffice2007ColorScheme.Black)
+                Office2007ColorTableFactory.InitializeVistaBlackColorTable(this, m_ColorFactory);
+            else if (scheme == eOffice2007ColorScheme.Silver)
+                Office2007SilverColorTableFactory.InitializeColorTable(this, m_ColorFactory);
+            else if (scheme == eOffice2007ColorScheme.VistaGlass)
+                Office2007VistaBlackColorTableFactory.InitializeVistaBlackColorTable(this, m_ColorFactory);
+            else
+                InitializeBlueColorTable(m_ColorFactory);
+            m_ColorScheme = scheme;
+        }
+        
+        /// <summary>
+        /// Creates new instance of the color table and initializes it with custom color scheme.
+        /// </summary>
+        /// <param name="scheme">Predefined color scheme to be used as starting color scheme.</param>
+        /// <param name="baseSchemeColor">Color to use as basis for new color scheme</param>
+        public Office2007ColorTable(eOffice2007ColorScheme scheme, Color baseSchemeColor)
+        {
+            if (baseSchemeColor.IsEmpty)
+                m_ColorFactory = ColorFactory.Empty;
+            else
+                m_ColorFactory = new ColorBlendFactory(baseSchemeColor);
+            if (scheme == eOffice2007ColorScheme.Black)
+                Office2007ColorTableFactory.InitializeVistaBlackColorTable(this, m_ColorFactory);
+            else if (scheme == eOffice2007ColorScheme.Silver)
+                Office2007SilverColorTableFactory.InitializeColorTable(this, m_ColorFactory);
+            else if (scheme == eOffice2007ColorScheme.VistaGlass)
+                Office2007VistaBlackColorTableFactory.InitializeVistaBlackColorTable(this, m_ColorFactory);
+            else
+                InitializeBlueColorTable(m_ColorFactory);
+            m_ColorScheme = scheme;
+        }
+        #endregion
+
+        #region Ribbon Bar Colors
+        /// <summary>
+        /// Gets or sets the RibbonBar color table.
+        /// </summary>
+        public Office2007RibbonBarColorTable RibbonBar = new Office2007RibbonBarColorTable();
+        #endregion
+
+        #region ButtonItem
+        /// <summary>
+        /// Gets the reference to collection of Office2007ButtonItemColorTable objects the describe colors used by a button with Office 2007 style.
+        /// The collection by default has elements that are created to
+        /// represents the members of eButtonColor enumeration. The name of each color table object is the same as the string
+        /// enum representation. You can add custom members to this collection or modify the existing ones. Note that you must specify the
+        /// unique name for the new color table elements. Name specified there can be used in ButtonItem.CustomColorName property to specify
+        /// custom color table for an ButtonItem.
+        /// </summary>
+        public Office2007ButtonItemColorTableCollection ButtonItemColors
+        {
+            get { return m_ButtonItemColors; }
+        }
+
+        /// <summary>
+        /// Gets the reference to collection of Office2007ButtonItemColorTable objects the describe colors used by a button with Office 2007 style when
+        /// button is on RibbonBar control. When collection is empty the values from the ButtonItemColors collections are used instead.
+        /// </summary>
+        public Office2007ButtonItemColorTableCollection RibbonButtonItemColors
+        {
+            get { return m_RibbonButtonItemColors; }
+        }
+
+        /// <summary>
+        /// Gets the reference to collection of Office2007ButtonItemColorTable objects the describe colors used by a button with Office 2007 style when
+        /// button is on menu bar. When collection is empty the values from the ButtonItemColors collections are used instead.
+        /// </summary>
+        public Office2007ButtonItemColorTableCollection MenuButtonItemColors
+        {
+            get { return m_MenuButtonItemColors; }
+        }
+
+        /// <summary>
+        /// Gets the reference to collection of Office2007ButtonItemColorTable objects the describe colors used by Ribbon Application Menu Button in Office 2010 style.
+        /// </summary>
+        public Office2007ButtonItemColorTableCollection ApplicationButtonColors
+        {
+            get { return _ApplicationButtonColors; }
+        }
+
+        /// <summary>
+        /// Gets the reference to collection of Office2007ButtonItemColorTable objects the describe colors used by buttons that are on Backstage tab-strip.
+        /// </summary>
+        public Office2007ButtonItemColorTableCollection BackstageButtonItemColors
+        {
+            get { return _BackstageButtonColors; }
+        }
+
+         /// <summary>
+        /// Gets the reference to collection of Office2007ButtonItemColorTable objects the describe colors used by buttons that are on NavigationPane control. Currently used for Office 2010 style only. When empty ButtonItemColors is used.
+        /// </summary>
+        public Office2007ButtonItemColorTableCollection NavigationPaneButtonItemColors
+        {
+            get { return _NavigationPaneButtonItemColors; }
+        }
+
+        private static Office2007ButtonItemColorTable FallBackButtonItemColorTable = null;
+        internal static Office2007ButtonItemColorTable GetFallBackButtonItemColorTable()
+        {
+            if (FallBackButtonItemColorTable != null) return FallBackButtonItemColorTable;
+
+            Office2007ButtonItemColorTable cb = Office2007ColorTableFactory.GetButtonItemBlueOrange(ColorFactory.Empty);
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Orange);
+
+            FallBackButtonItemColorTable = cb;
+            return cb;
+        }
+        
+        #endregion
+
+        #region RibbonTabItem
+        /// <summary>
+        /// Gets the reference to collection of Office2007RibbonTabItemColorTable objects the describe colors used by a ribbon tab with Office 2007 style.
+        /// The collection by default has elements that are created to
+        /// represents the members of eRibbonTabColor enumeration. The name of each color table object is the same as the string
+        /// enum representation. You can add custom members to this collection or modify the existing ones. Note that you must specify the
+        /// unique name for the new color table elements. Name specified there can be used in RibbonTabItem.CustomColorName property to specify
+        /// custom color table for an ButtonItem.
+        /// </summary>
+        public Office2007RibbonTabItemColorTableCollection RibbonTabItemColors
+        {
+            get { return m_RibbonTabItemColors; }
+        }
+        #endregion
+
+        #region RibbonTabItemGroup
+        /// <summary>
+        /// Gets the reference to collection of Office2007RibbonTabGroupColorTableCollection objects the describe colors used by a ribbon tab groups with Office 2007 style.
+        /// The collection by default has elements that are created to
+        /// represents the members of eRibbonTabGroupColor enumeration. The name of each color table object is the same as the string
+        /// enum representation. You can add custom members to this collection or modify the existing ones. Note that you must specify the
+        /// unique name for the new color table elements.
+        /// </summary>
+        public Office2007RibbonTabGroupColorTableCollection RibbonTabGroupColors
+        {
+            get { return m_RibbonTabGroupColors; }
+        }
+        #endregion
+
+        #region Item Group
+        /// <summary>
+        /// Gets or sets the background colors for the ItemContainer with BeginGroup property set to true.
+        /// </summary>
+        public Office2007ItemGroupColorTable ItemGroup = new Office2007ItemGroupColorTable();
+        #endregion
+
+        #region Bar
+        /// <summary>
+        /// Gets or sets the background colors for the Bar object.
+        /// </summary>
+        public Office2007BarColorTable Bar = new Office2007BarColorTable();
+        #endregion
+
+        #region Ribbon Control
+        /// <summary>
+        /// Gets or sets the colors for the RibbonControl.
+        /// </summary>
+        public Office2007RibbonColorTable RibbonControl = new Office2007RibbonColorTable();
+        #endregion
+
+        #region ColorItem
+        /// <summary>
+        /// Gets or sets the colors for the ColorItem which is used by drop-down Color Picker.
+        /// </summary>
+        public Office2007ColorItemColorTable ColorItem = new Office2007ColorItemColorTable();
+        #endregion
+
+        #region Menu
+        /// <summary>
+        /// Gets or sets the color table for menus.
+        /// </summary>
+        public Office2007MenuColorTable Menu = new Office2007MenuColorTable();
+        #endregion
+
+        #region ComboBox
+        /// <summary>
+        /// Gets or sets the color table for ComboBoxItem.
+        /// </summary>
+        public Office2007ComboBoxColorTable ComboBox = new Office2007ComboBoxColorTable();
+        #endregion
+
+        #region Dialog Launcher
+        /// <summary>
+        /// Gets or sets the colors for the Ribbon Bar dialog launcher button.
+        /// </summary>
+        public Office2007DialogLauncherColorTable DialogLauncher = new Office2007DialogLauncherColorTable();
+        #endregion
+
+        #region Legacy ColorScheme
+        /// <summary>
+        /// Gets or sets the legacy color scheme object that applies to the user interface elements not covered by color table.
+        /// </summary>
+        public ColorScheme LegacyColors = new ColorScheme(eDotNetBarStyle.Office2007);
+        #endregion
+
+        #region System Button
+        /// <summary>
+        /// Gets or sets the color table of the system buttons displayed in form caption.
+        /// </summary>
+        public Office2007SystemButtonColorTable SystemButton = new Office2007SystemButtonColorTable();
+        /// <summary>
+        /// Gets or sets the color table of the close system button displayed in form caption. Applies to Office 2010 styles and later only.
+        /// </summary>
+        public Office2007SystemButtonColorTable SystemButtonClose = null;
+
+        /// <summary>
+        /// Gets or sets the color table for the form caption.
+        /// </summary>
+        public Office2007FormColorTable Form = new Office2007FormColorTable();
+        #endregion
+
+        #region Quick Access Toolbar Background
+        /// <summary>
+        /// Gets or sets the bacgkround colors for the quick access toolbar.
+        /// </summary>
+        public Office2007QuickAccessToolbarColorTable QuickAccessToolbar = new Office2007QuickAccessToolbarColorTable();
+        #endregion
+
+        #region Tab Control
+        /// <summary>
+        /// Gets or sets the colors for the tab and tab strip control.
+        /// </summary>
+        public Office2007TabColorTable TabControl = new Office2007TabColorTable();
+        /// <summary>
+        /// Gets or sets the colors for the tab strip control used on docking windows. When not set TabControl color scheme is used.
+        /// </summary>
+        public Office2007TabColorTable DockTabStrip = null;
+        #endregion
+
+        #region KeyTips
+        /// <summary>
+        /// Gets or sets the KeyTips color table.
+        /// </summary>
+        public Office2007KeyTipsColorTable KeyTips = new Office2007KeyTipsColorTable();
+        #endregion
+
+        #region CheckBoxItem Colors
+        /// <summary>
+        /// Gets or sets the color table for the CheckBoxItem.
+        /// </summary>
+        public Office2007CheckBoxColorTable CheckBoxItem = new Office2007CheckBoxColorTable();
+        #endregion
+
+        #region Scrollbar Colors
+        /// <summary>
+        /// Gets or sets the scroll bar colors.
+        /// </summary>
+        public Office2007ScrollBarColorTable ScrollBar = new Office2007ScrollBarColorTable();
+        /// <summary>
+        /// Gets or sets the application style scroll bar colors.
+        /// </summary>
+        public Office2007ScrollBarColorTable AppScrollBar = new Office2007ScrollBarColorTable();
+        #endregion
+
+        #region ProgressBarItem Colors
+        /// <summary>
+        /// Gets or sets the color table for the ProgressBarItem.
+        /// </summary>
+        public Office2007ProgressBarColorTable ProgressBarItem = new Office2007ProgressBarColorTable();
+
+        /// <summary>
+        /// Gets or sets the color table for the paused ProgressBarItem.
+        /// </summary>
+        public Office2007ProgressBarColorTable ProgressBarItemPaused = new Office2007ProgressBarColorTable();
+
+        /// <summary>
+        /// Gets or sets the color table for the error state of ProgressBarItem.
+        /// </summary>
+        public Office2007ProgressBarColorTable ProgressBarItemError = new Office2007ProgressBarColorTable();
+        #endregion
+
+        #region Gallery
+        /// <summary>
+        /// Gets or sets the color table for the galleries.
+        /// </summary>
+        public Office2007GalleryColorTable Gallery = new Office2007GalleryColorTable();
+        #endregion
+
+        #region Navigation Pane
+        /// <summary>
+        /// Gets or sets the color table for the NavigationPane control.
+        /// </summary>
+        public Office2007NavigationPaneColorTable NavigationPane = new Office2007NavigationPaneColorTable();
+        #endregion
+
+        #region Slider
+        /// <summary>
+        /// Gets or sets the color table for the Slider item.
+        /// </summary>
+        public Office2007SliderColorTable Slider = new Office2007SliderColorTable();
+        #endregion
+
+        #region RangeSlider
+        /// <summary>
+        /// Gets or sets the color table for the Range Slider item.
+        /// </summary>
+        public Office2010RangeSliderColorTable RangeSlider = new Office2010RangeSliderColorTable();
+        #endregion
+
+        #region SuperTooltip
+        /// <summary>
+        /// Gets the SuperTooltip color table.
+        /// </summary>
+        public Office2007SuperTooltipColorTable SuperTooltip = new Office2007SuperTooltipColorTable();
+        #endregion
+
+        #region ListViewEx
+        /// <summary>
+        /// Gets the color table for the ListViewEx control.
+        /// </summary>
+        public Office2007ListViewColorTable ListViewEx = new Office2007ListViewColorTable();
+        #endregion
+
+        #region DataGridView
+        /// <summary>
+        /// Gets the color table for the ListViewEx control.
+        /// </summary>
+        public Office2007DataGridViewColorTable DataGridView = new Office2007DataGridViewColorTable();
+        #endregion
+
+        #region SideBar
+        /// <summary>
+        /// Gets the color table used by SideBar control.
+        /// </summary>
+        public Office2007SideBarColorTable SideBar = new Office2007SideBarColorTable();
+        #endregion
+
+        #region AdvTree
+#if !NOTREE
+        /// <summary>
+        /// Gets or sets the color table for AdvTree control.
+        /// </summary>
+        public DevComponents.AdvTree.Display.TreeColorTable AdvTree = null;
+#endif
+        #endregion
+
+        #region CrumbBar
+        /// <summary>
+        /// Gets or sets the CrumBarItem color table.
+        /// </summary>
+        public CrumbBarItemViewColorTable CrumbBarItemView = null;
+        #endregion
+
+        #region WarningBox
+        public Office2007WarningBoxColorTable WarningBox = new Office2007WarningBoxColorTable();
+        #endregion
+
+        #region CalendarView
+        /// <summary>
+        /// Gets the color table used by Schedule control.
+        /// </summary>
+        public Office2007CalendarViewColorTable CalendarView = new Office2007CalendarViewColorTable();
+        #endregion
+
+        #region SuperTabControl
+
+        #region Office2007 Style
+        public SuperTabColorTable SuperTab = new SuperTabColorTable();
+        public SuperTabItemColorTable SuperTabItem = new SuperTabItemColorTable();
+        public SuperTabPanelColorTable SuperTabPanel = new SuperTabPanelColorTable();
+        #endregion
+
+        #region BackStage Style
+        public SuperTabColorTable Backstage = new SuperTabColorTable();
+        public SuperTabItemColorTable BackstageItem = new SuperTabItemColorTable();
+        public SuperTabPanelColorTable BackstagePanel = new SuperTabPanelColorTable();
+        #endregion
+
+        #endregion
+
+        #region SwitchButton
+        /// <summary>
+        /// Gets or sets SwitchButton color table.
+        /// </summary>
+        public SwitchButtonColors SwitchButton = null;
+        #endregion
+
+        #region LabelItem Contextual Colors
+        public Dictionary<string, LabelColors> LabelItemColors = new Dictionary<string, LabelColors>();
+        #endregion
+
+        #region StepIndicator
+        public StepIndicatorColorTable StepIndicator = new StepIndicatorColorTable();
+        #endregion
+
+        #region StepItem
+        /// <summary>
+        /// Gets or sets the colors for the StepItem used in ProgressSteps control.
+        /// </summary>
+        public OfficeStepItemColorTable StepItem = new OfficeStepItemColorTable();
+        #endregion
+
+        #region ListBoxItem
+        /// <summary>
+        /// Gets or sets the colors for the ListBoxItem used in ListBoxAdv control.
+        /// </summary>
+        public OfficeListBoxItemColorTable ListBoxItem = new OfficeListBoxItemColorTable();
+        #endregion
+
+        #region RadialMenuColorTable
+        /// <summary>
+        /// Gets or sets the color table for the radial menu.
+        /// </summary>
+        public RadialMenuColorTable RadialMenu = new RadialMenuColorTable();
+        #endregion
+
+        #region TokenEditorColorTable
+        /// <summary>
+        /// Gets or sets color table for TokenEditor control tokens.
+        /// </summary>
+        public TokenEditorColorTable TokenEditor = new TokenEditorColorTable();
+        #endregion
+
+        #region FlyoutColorTable
+        /// <summary>
+        /// Gets or sets color table for Flyout control.
+        /// </summary>
+        public FlyoutColorTable Flyout = new FlyoutColorTable();
+        #endregion
+
+        #region ListBoxItem
+        /// <summary>
+        /// Gets or sets the colors for the SideNav control.
+        /// </summary>
+        public SideNavColorTable SideNav = new SideNavColorTable();
+        #endregion
+
+        #region TabParentForm
+
+        public TabFormColorTable TabForm = new TabFormColorTable();
+        #endregion
+
+        #region TabFormItem
+        /// <summary>
+        /// Gets or sets the color tables for the TabFormItem. The key is the string representation of a eTabFormItemColor value.
+        /// </summary>
+        public Dictionary<string, TabFormItemColorTable> TabFormItemColorTables=new Dictionary<string, TabFormItemColorTable>();
+        #endregion
+
+        /// <summary>
+        /// Returns the color scheme table was initialized with.
+        /// </summary>
+        public eOffice2007ColorScheme InitialColorScheme
+        {
+            get { return m_ColorScheme; }
+        }
+
+        #region IElementStyleClassProvider Members
+        /// <summary>
+        /// Returns the instance of the ElementStyle with given class name or null if there is no class with that name defined.
+        /// </summary>
+        /// <param name="className">Class name. See static members of ElementStyleClassKeys class for the list of available keys.</param>
+        /// <returns>Instance of ElementStyle for given class name or null if class cannot be found.</returns>
+        public ElementStyle GetClass(string className)
+        {
+            if (m_StyleClasses.ContainsKey(className))
+                return (ElementStyle)m_StyleClasses[className];
+            return null;
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Get the reference to the collection that holds system cached styles. In most cases there is no need for you to modify members of this collection.
+        /// </summary>
+        public Hashtable StyleClasses
+        {
+            get { return m_StyleClasses; }
+        }
+
+        private static bool _CloneImagesOnAccess = false;
+        /// <summary>
+        /// Gets or sets whether images like Start button image, are cloned when painted. This is reduces the performance but is necessary if they can be accessed from multiple threads.
+        /// </summary>
+        public static bool CloneImagesOnAccess
+        {
+            get { return _CloneImagesOnAccess; }
+            set
+            {
+                _CloneImagesOnAccess = value;
+            }
+        }
+        /// <summary>
+        /// Gets the reference to collection of contextual color tables that are based on items Control container type and other context properties.
+        /// When contextual color table is defined it overrides the default color table.
+        /// </summary>
+        public Dictionary<string, object> ContextualTables
+        {
+            get { return m_ContextualTables; }
+        }
+
+        #region IDisposable Members
+
+        public void Dispose()
+        {
+            if (this.RibbonControl.StartButtonDefault != null)
+            {
+                this.RibbonControl.StartButtonDefault.Dispose();
+                this.RibbonControl.StartButtonDefault = null;
+            }
+            if (this.RibbonControl.StartButtonMouseOver != null)
+            {
+                this.RibbonControl.StartButtonMouseOver.Dispose();
+                this.RibbonControl.StartButtonMouseOver = null;
+            }
+            if (this.RibbonControl.StartButtonPressed != null)
+            {
+                this.RibbonControl.StartButtonPressed.Dispose();
+                this.RibbonControl.StartButtonPressed = null;
+            }
+        }
+
+        #endregion
+
+        public static string GetContextualKey(Type colorTableType, Type containerType)
+        {
+            return colorTableType.Name + "+" + containerType.FullName;
+        }
+        public static string GetContextualKey(Type colorTableType, string containerQualifier)
+        {
+            return colorTableType.Name + "+" + containerQualifier;
+        }
+        public static string GetContextualKey(Type colorTableType)
+        {
+            return colorTableType.Name;
+        }
+
+    }
+
+    /// <summary>
+    /// Defines the color scheme type for the Office2007ColorTable.
+    /// </summary>
+    public enum eOffice2007ColorScheme
+    {
+        /// <summary>
+        /// Blue color scheme.
+        /// </summary>
+        Blue,
+        /// <summary>
+        /// Black color scheme.
+        /// </summary>
+        Black,
+        /// <summary>
+        /// Silver color scheme.
+        /// </summary>
+        Silver,
+        /// <summary>
+        /// Windows Vista Glass inspired color scheme.
+        /// </summary>
+        VistaGlass
+    }
+
+    /// <summary>
+    /// Defines the delegate which retrieves the color for specific integer value.
+    /// </summary>
+    /// <param name="rgb">color represented as integer.</param>
+    /// <returns>Reference to Color object.</returns>
+    public delegate Color GetColorDelegate(int rgb);
+
+    /// <summary>
+    /// Defines contextual label colors.
+    /// </summary>
+    public struct LabelColors
+    {
+        public Color Text;
+        public Color DisabledText;
+        /// <summary>
+        /// Initializes a new instance of the LabelColors structure.
+        /// </summary>
+        /// <param name="text"></param>
+        /// <param name="disabledText"></param>
+        public LabelColors(Color text, Color disabledText)
+        {
+            Text = text;
+            DisabledText = disabledText;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/Office2007ColorTableFactory.cs b/PROMS/DotNetBar Source Code/Rendering/Office2007ColorTableFactory.cs
new file mode 100644
index 00000000..6c9277bd
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/Office2007ColorTableFactory.cs	
@@ -0,0 +1,3423 @@
+using System;
+using System.Drawing;
+using DevComponents.DotNetBar.Schedule;
+using DevComponents.DotNetBar.Controls;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    internal class Office2007ColorTableFactory
+    {
+        #region Luna Blue
+
+        #region ButtonItem Colors Initialization
+        public static void SetBlueExpandColors(Office2007ButtonItemColorTable ct, ColorFactory factory)
+        {
+            Color cb = factory.GetColor(0x567DB1);
+            Color cl = factory.GetColor(0xEAF2F9);
+            ct.Default.ExpandBackground = cb;
+            ct.Default.ExpandLight = cl;
+            
+            ct.Checked.ExpandBackground = cb;
+            ct.Checked.ExpandLight = cl;
+
+            //ct.Disabled.ExpandBackground = factory.GetColor(0xB7B7B7);
+            //ct.Disabled.ExpandLight = factory.GetColor(0xEDEDED);
+
+            ct.Expanded.ExpandBackground = cb;
+            ct.Expanded.ExpandLight = cl;
+
+            ct.MouseOver.ExpandBackground = cb;
+            ct.MouseOver.ExpandLight = cl;
+
+            ct.Pressed.ExpandBackground = cb;
+            ct.Pressed.ExpandLight = cl;
+        }
+
+        public static void SetBlackExpandColors(Office2007ButtonItemColorTable ct, ColorFactory factory)
+        {
+            Color cb = factory.GetColor(0x464646);
+            Color cl = factory.GetColor(0xDBDBDC);
+            ct.Default.ExpandBackground = cb;
+            ct.Default.ExpandLight = cl;
+
+            ct.Checked.ExpandBackground = cb;
+            ct.Checked.ExpandLight = cl;
+
+            //ct.Disabled.ExpandBackground = factory.GetColor(0xB7B7B7);
+            //ct.Disabled.ExpandLight = factory.GetColor(0xEDEDED);
+
+            ct.Expanded.ExpandBackground = cb;
+            ct.Expanded.ExpandLight = cl;
+
+            ct.MouseOver.ExpandBackground = cb;
+            ct.MouseOver.ExpandLight = cl;
+
+            ct.Pressed.ExpandBackground = cb;
+            ct.Pressed.ExpandLight = cl;
+        }
+        public static Office2007ButtonItemColorTable GetButtonItemBlueOrange(ColorFactory factory)
+        {
+            Office2007ButtonItemColorTable cb = new Office2007ButtonItemColorTable();
+            cb.Default = new Office2007ButtonItemStateColorTable();
+            cb.Default.Text = factory.GetColor(0x15428B);
+
+            // Button mouse over
+            cb.MouseOver = new Office2007ButtonItemStateColorTable();
+            cb.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xDDCF9B), factory.GetColor(0xC0A776));
+            cb.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFFFFF7), factory.GetColor(0xFFF2BE));
+            cb.MouseOver.TopBackground = new LinearGradientColorTable(factory.GetColor(0xFFFCD9), factory.GetColor(0xFFE78D));
+            cb.MouseOver.TopBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(192, Color.White), Color.Transparent);
+            cb.MouseOver.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xFFD748), factory.GetColor(0xFFE793));
+            cb.MouseOver.BottomBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(132, Color.White), Color.Transparent);
+            cb.MouseOver.SplitBorder = new LinearGradientColorTable(factory.GetColor(0xDBC374), factory.GetColor(0xDBC373));
+            cb.MouseOver.SplitBorderLight = new LinearGradientColorTable(factory.GetColor(0xFFF0BF), factory.GetColor(0xFFF4D9));
+            cb.MouseOver.Text = factory.GetColor(0x15428B);
+
+            // Pressed
+            cb.Pressed = new Office2007ButtonItemStateColorTable();
+            cb.Pressed.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x5F7FB6), factory.GetColor(0xC4B9A8));
+            cb.Pressed.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xB1905D), factory.GetColor(0xFDAD11));
+            cb.Pressed.TopBackground = new LinearGradientColorTable(factory.GetColor(0xF8B869), factory.GetColor(0xFDA361));
+            cb.Pressed.TopBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(64, Color.White), Color.Transparent);
+            cb.Pressed.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xFB8A3C), factory.GetColor(0xFEBB60));
+            cb.Pressed.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xFFDCA6), Color.Transparent);
+            cb.Pressed.SplitBorder = new LinearGradientColorTable(factory.GetColor(0xB07D4B), factory.GetColor(0x907853));
+            cb.Pressed.SplitBorderLight = new LinearGradientColorTable(factory.GetColor(0xFAC094), factory.GetColor(0xFFD9AC));
+            cb.Pressed.Text = factory.GetColor(0x00156E);
+
+            // Checked
+            cb.Checked = new Office2007ButtonItemStateColorTable();
+            cb.Checked.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xCBB499), factory.GetColor(0xFFE47F));
+            cb.Checked.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xEBD1B4), Color.Transparent);
+            cb.Checked.TopBackground = new LinearGradientColorTable(factory.GetColor(0xFBDBB5), factory.GetColor(0xFEC778));
+            cb.Checked.TopBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(32, Color.White), Color.Transparent);
+            cb.Checked.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xFEB456), factory.GetColor(0xFDEB9F));
+            cb.Checked.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xFDEB9F), Color.Transparent);
+            cb.Checked.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Checked.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Checked.Text = factory.GetColor(0x00156E);
+
+            // Expanded button
+            cb.Expanded = new Office2007ButtonItemStateColorTable();
+            cb.Expanded.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x8E8165), factory.GetColor(0xC6C0B2));
+            cb.Expanded.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xE5AE55), factory.GetColor(0xFFCF2D));
+            cb.Expanded.TopBackground = new LinearGradientColorTable(factory.GetColor(0xFCD3A7), factory.GetColor(0xFAA85B));
+            cb.Expanded.TopBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(64, Color.White), Color.Transparent);
+            cb.Expanded.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xF88E2A), factory.GetColor(0xFBE196));
+            cb.Expanded.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xFDF1B0), Color.Transparent);
+            cb.Expanded.SplitBorder = new LinearGradientColorTable(factory.GetColor(0xB07D4B), factory.GetColor(0x907853));
+            cb.Expanded.SplitBorderLight = new LinearGradientColorTable(factory.GetColor(0xFAC094), factory.GetColor(0xFFD9AC));
+            cb.Expanded.Text = factory.GetColor(0x00156E);
+
+
+            //// Menu mouse over
+            //cb.MenuMouseOver = new Office2007ButtonItemStateColorTable();
+            //cb.MenuMouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xDDCF9B), factory.GetColor(0xC0A776));
+            //cb.MenuMouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFFFFFB), factory.GetColor(0xFFFCD1));
+            //cb.MenuMouseOver.TopBackground = new LinearGradientColorTable(factory.GetColor(0xFFFCE4), factory.GetColor(0xFFECA1));
+            //cb.MenuMouseOver.TopBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(192, Color.White), Color.Transparent);
+            //cb.MenuMouseOver.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xFFD842), factory.GetColor(0xFFE47B));
+            //cb.MenuMouseOver.BottomBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(164, Color.White), Color.Transparent);
+            //cb.MenuMouseOver.SplitBorder = new LinearGradientColorTable(factory.GetColor(0xDBC374), factory.GetColor(0xC8BB8C));
+            //cb.MenuMouseOver.SplitBorderLight = new LinearGradientColorTable(factory.GetColor(0xFFF0BF), factory.GetColor(0xFFF6DF));
+            //cb.MenuMouseOver.Text = factory.GetColor(0x15428B);
+            SetBlueExpandColors(cb, factory);
+
+            return cb;
+        }
+
+        public static Office2007ButtonItemColorTable GetButtonItemBlueOrangeWithBackground(ColorFactory factory)
+        {
+            Office2007ButtonItemColorTable cb = GetButtonItemBlueOrange(factory);
+            cb.Default.TopBackground = new LinearGradientColorTable(factory.GetColor(0xE3EFFF), factory.GetColor(0xC4DDFF));
+            cb.Default.TopBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xADD1FF), factory.GetColor(0xC0DBFF));
+            cb.Default.BottomBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.InnerBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x7793B9), Color.Empty);
+            cb.Default.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+
+            // Same as default
+            cb.Disabled = new Office2007ButtonItemStateColorTable();
+            cb.Disabled.TopBackground = new LinearGradientColorTable(factory.GetColor(0xE8F1FC), factory.GetColor(0xE9F1FC));
+            cb.Disabled.TopBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xD2E1F4), factory.GetColor(0xEBF3FD));
+            cb.Disabled.BottomBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.InnerBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x7793B9), Color.Empty);
+            cb.Disabled.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.Text = factory.GetColor(0x8D8D8D);
+            return cb;
+        }
+
+        public static Office2007ButtonItemColorTable GetButtonItemBlueBlue(ColorFactory factory)
+        {
+            Office2007ButtonItemColorTable cb = new Office2007ButtonItemColorTable();
+            cb.Default = new Office2007ButtonItemStateColorTable();
+            cb.Default.Text = factory.GetColor(0x15428B);
+
+            // Button mouse over
+            cb.MouseOver = new Office2007ButtonItemStateColorTable();
+            cb.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x3B5A82), Color.Empty);
+            cb.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFFFFFB), factory.GetColor(0xE0EEFF));
+            cb.MouseOver.TopBackground = new LinearGradientColorTable(factory.GetColor(0xC0DCFF), factory.GetColor(0xA9CEFF));
+            cb.MouseOver.TopBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(192, Color.White), Color.Transparent);
+            cb.MouseOver.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xA6CDFF), factory.GetColor(0xCAE1FF));
+            cb.MouseOver.BottomBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(124, Color.White), Color.Transparent);
+            cb.MouseOver.SplitBorder = new LinearGradientColorTable(factory.GetColor(0x7495C2), factory.GetColor(0x90AFD6));
+            cb.MouseOver.SplitBorderLight = new LinearGradientColorTable(factory.GetColor(0xD6E3F3), factory.GetColor(0x83A5D0));
+            cb.MouseOver.Text = factory.GetColor(0x15428B);
+
+            // Pressed
+            cb.Pressed = new Office2007ButtonItemStateColorTable();
+            cb.Pressed.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x3B5A82), Color.Empty);
+            cb.Pressed.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFFFFFB), factory.GetColor(0xE0EEFF));
+            cb.Pressed.TopBackground = new LinearGradientColorTable(factory.GetColor(0xC5DCF8), factory.GetColor(0xA9CAF7));
+            cb.Pressed.TopBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(96, Color.White), Color.Transparent);
+            cb.Pressed.BottomBackground = new LinearGradientColorTable(factory.GetColor(0x90B6EA), factory.GetColor(0x7495C2));
+            cb.Pressed.BottomBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(184, Color.White), Color.Transparent);
+            cb.Pressed.SplitBorder = new LinearGradientColorTable(factory.GetColor(0x7495C2), factory.GetColor(0x90AFD6));
+            cb.Pressed.SplitBorderLight = new LinearGradientColorTable(factory.GetColor(0xD6E3F3), factory.GetColor(0x83A5D0));
+            cb.Pressed.Text = factory.GetColor(0x00156E);
+
+            // Checked
+            cb.Checked = new Office2007ButtonItemStateColorTable();
+            cb.Checked.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x567DB0), factory.GetColor(0x567DB0));
+            cb.Checked.InnerBorder = new LinearGradientColorTable(factory.GetColor(0x90B6EA), factory.GetColor(0x7495C2));
+            cb.Checked.TopBackground = new LinearGradientColorTable(factory.GetColor(0xD7E6F9), factory.GetColor(0xC7DCF8));
+            cb.Checked.TopBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(64, Color.White), Color.Transparent);
+            cb.Checked.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xB3D0F5), factory.GetColor(0xD7E5F7));
+            cb.Checked.BottomBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(92, Color.White), Color.Transparent);
+            cb.Checked.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Checked.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Checked.Text = factory.GetColor(0x00156E);
+
+            // Expanded button
+            cb.Expanded = new Office2007ButtonItemStateColorTable();
+            cb.Expanded.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x6187B7), factory.GetColor(0x4C83C8));
+            cb.Expanded.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xA2B4CD), Color.Transparent);
+            cb.Expanded.TopBackground = new LinearGradientColorTable(factory.GetColor(0xD7E6F9), factory.GetColor(0xC7DCF8));
+            cb.Expanded.TopBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(192, Color.White), Color.Transparent);
+            cb.Expanded.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xB3D0F5), factory.GetColor(0xD7E5F7));
+            cb.Expanded.BottomBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(164, Color.White), Color.Transparent);
+            cb.Expanded.SplitBorder = new LinearGradientColorTable(factory.GetColor(0x537EB8), factory.GetColor(0x6985AA));
+            cb.Expanded.SplitBorderLight = new LinearGradientColorTable(factory.GetColor(0x9AC0F5), factory.GetColor(0xB9D7FF));
+            cb.Expanded.Text = factory.GetColor(0x00156E);
+
+
+            //// Menu mouse over
+            //cb.MenuMouseOver = new Office2007ButtonItemStateColorTable();
+            //cb.MenuMouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xAAC2E0), factory.GetColor(0x6591CD));
+            //cb.MenuMouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFFFFFB), factory.GetColor(0xE0EEFF));
+            //cb.MenuMouseOver.TopBackground = new LinearGradientColorTable(factory.GetColor(0xECF4FF), factory.GetColor(0xB0D3FF));
+            //cb.MenuMouseOver.TopBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(192, Color.White), Color.Transparent);
+            //cb.MenuMouseOver.BottomBackground = new LinearGradientColorTable(factory.GetColor(0x89BDFF), factory.GetColor(0x2983FF));
+            //cb.MenuMouseOver.BottomBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(164, Color.White), Color.Transparent);
+            //cb.MenuMouseOver.SplitBorder = new LinearGradientColorTable(factory.GetColor(0x7495C2), factory.GetColor(0x90AFD6));
+            //cb.MenuMouseOver.SplitBorderLight = new LinearGradientColorTable(factory.GetColor(0xD6E3F3), factory.GetColor(0x83A5D0));
+            //cb.MenuMouseOver.Text = factory.GetColor(0x15428B);
+            SetBlueExpandColors(cb, factory);
+
+            return cb;
+        }
+
+        public static Office2007ButtonItemColorTable GetButtonItemBlueBlueWithBackground(ColorFactory factory)
+        {
+            Office2007ButtonItemColorTable cb = GetButtonItemBlueBlue(factory);
+            cb.Default.TopBackground = new LinearGradientColorTable(factory.GetColor(0xE3EFFF), factory.GetColor(0xC4DDFF));
+            cb.Default.TopBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xADD1FF), factory.GetColor(0xC0DBFF));
+            cb.Default.BottomBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.InnerBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x7793B9), Color.Empty);
+            cb.Default.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            //cb.Default.TopBackground = new LinearGradientColorTable(factory.GetColor(0xE8F1FC), factory.GetColor(0xE9F1FC));
+            //cb.Default.TopBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            //cb.Default.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xD2E1F4), factory.GetColor(0xEBF3FD));
+            //cb.Default.BottomBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            //cb.Default.InnerBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            //cb.Default.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x7793B9), Color.Empty);
+            //cb.Default.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            //cb.Default.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+
+            // Same as default
+            cb.Disabled = new Office2007ButtonItemStateColorTable();
+            cb.Disabled.TopBackground = new LinearGradientColorTable(factory.GetColor(0xE8F1FC), factory.GetColor(0xE9F1FC));
+            cb.Disabled.TopBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xD2E1F4), factory.GetColor(0xEBF3FD));
+            cb.Disabled.BottomBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.InnerBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x7793B9), Color.Empty);
+            cb.Disabled.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.Text = factory.GetColor(0x8D8D8D);
+            return cb;
+        }
+
+        public static Office2007ButtonItemColorTable GetButtonItemBlueMagenta(ColorFactory factory)
+        {
+            Office2007ButtonItemColorTable cb = new Office2007ButtonItemColorTable();
+            cb.Default = new Office2007ButtonItemStateColorTable();
+            cb.Default.Text = factory.GetColor(0x15428B);
+
+            // Button mouse over
+            cb.MouseOver = new Office2007ButtonItemStateColorTable();
+            cb.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x6B0060), factory.GetColor(0x56014D));
+            cb.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xECE7F3), factory.GetColor(0xE8D6FF));
+            cb.MouseOver.TopBackground = new LinearGradientColorTable(factory.GetColor(0xF2DFEB), factory.GetColor(0xE6C6DB));
+            cb.MouseOver.TopBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(96, Color.White), Color.Transparent);
+            cb.MouseOver.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xEAA8D4), factory.GetColor(0xE181C1));
+            cb.MouseOver.BottomBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(164, Color.White), Color.Transparent);
+            cb.MouseOver.SplitBorder = new LinearGradientColorTable(factory.GetColor(0xA37BD1), factory.GetColor(0x8868AE));
+            cb.MouseOver.SplitBorderLight = new LinearGradientColorTable(factory.GetColor(0xD9C2F3), factory.GetColor(0xBBA6D3));
+            cb.MouseOver.Text = factory.GetColor(0x000000);
+
+            // Pressed
+            cb.Pressed = new Office2007ButtonItemStateColorTable();
+            cb.Pressed.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x6B0060), factory.GetColor(0x56014D));
+            cb.Pressed.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xECE7F3), factory.GetColor(0xE8D6FF));
+            cb.Pressed.TopBackground = new LinearGradientColorTable(factory.GetColor(0xD2B0C6), factory.GetColor(0xCBADC1));
+            cb.Pressed.TopBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(64, Color.White), Color.Transparent);
+            cb.Pressed.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xD27AB5), factory.GetColor(0xC84C9F));
+            cb.Pressed.BottomBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(184, Color.White), Color.Transparent);
+            cb.Pressed.SplitBorder = new LinearGradientColorTable(factory.GetColor(0xA37BD1), factory.GetColor(0x8868AE));
+            cb.Pressed.SplitBorderLight = new LinearGradientColorTable(factory.GetColor(0xD9C2F3), factory.GetColor(0xBBA6D3));
+            cb.Pressed.Text = factory.GetColor(0x000000);
+
+            // Checked
+            cb.Checked = new Office2007ButtonItemStateColorTable();
+            cb.Checked.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x6B0060), factory.GetColor(0x56014D));
+            cb.Checked.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xECE7F3), factory.GetColor(0xE8D6FF));
+            cb.Checked.TopBackground = new LinearGradientColorTable(factory.GetColor(0xE9D7E2), factory.GetColor(0xE2B0D1));
+            cb.Checked.TopBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(164, Color.White), Color.Transparent);
+            cb.Checked.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xCF90BA), factory.GetColor(0xCF73B0));
+            cb.Checked.BottomBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(92, Color.White), Color.Transparent);
+            cb.Checked.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Checked.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Checked.Text = factory.GetColor(0x00156E);
+
+            // Expanded button
+            cb.Expanded = new Office2007ButtonItemStateColorTable();
+            cb.Expanded.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x6B0060), factory.GetColor(0x56014D));
+            cb.Expanded.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xECE7F3), factory.GetColor(0xE8D6FF));
+            cb.Expanded.TopBackground = new LinearGradientColorTable(factory.GetColor(0xE9D7E2), factory.GetColor(0xE2B0D1));
+            cb.Expanded.TopBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(192, Color.White), Color.Transparent);
+            cb.Expanded.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xCF90BA), factory.GetColor(0xCF73B0));
+            cb.Expanded.BottomBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(192, Color.White), Color.Transparent);
+            cb.Expanded.SplitBorder = new LinearGradientColorTable(factory.GetColor(0xA37BD1), factory.GetColor(0x8868AE));
+            cb.Expanded.SplitBorderLight = new LinearGradientColorTable(factory.GetColor(0xD9C2F3), factory.GetColor(0xBBA6D3));
+            cb.Expanded.Text = factory.GetColor(0x000000);
+
+
+            //// Menu mouse over
+            //cb.MenuMouseOver = new Office2007ButtonItemStateColorTable();
+            //cb.MenuMouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xDE9ECC), factory.GetColor(0xBD71A8));
+            //cb.MenuMouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xECE7F3), factory.GetColor(0xE8D6FF));
+            //cb.MenuMouseOver.TopBackground = new LinearGradientColorTable(factory.GetColor(0xF3EAFF), factory.GetColor(0xDBBCFF));
+            //cb.MenuMouseOver.TopBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(192, Color.White), Color.Transparent);
+            //cb.MenuMouseOver.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xAF6BFF), factory.GetColor(0xD3AEFF));
+            //cb.MenuMouseOver.BottomBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(164, Color.White), Color.Transparent);
+            //cb.MenuMouseOver.SplitBorder = new LinearGradientColorTable(factory.GetColor(0xA37BD1), factory.GetColor(0x8868AE));
+            //cb.MenuMouseOver.SplitBorderLight = new LinearGradientColorTable(factory.GetColor(0xD9C2F3), factory.GetColor(0xBBA6D3));
+            //cb.MenuMouseOver.Text = factory.GetColor(0x15428B);
+            SetBlueExpandColors(cb, factory);
+
+            return cb;
+        }
+
+        public static Office2007ButtonItemColorTable GetButtonItemBlueMagentaWithBackground(ColorFactory factory)
+        {
+            Office2007ButtonItemColorTable cb = GetButtonItemBlueMagenta(factory);
+            cb.Default.TopBackground = new LinearGradientColorTable(factory.GetColor(0xE3EFFF), factory.GetColor(0xC4DDFF));
+            cb.Default.TopBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xADD1FF), factory.GetColor(0xC0DBFF));
+            cb.Default.BottomBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.InnerBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x7793B9), Color.Empty);
+            cb.Default.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+
+            // Same as default
+            cb.Disabled = new Office2007ButtonItemStateColorTable();
+            cb.Disabled.TopBackground = new LinearGradientColorTable(factory.GetColor(0xE8F1FC), factory.GetColor(0xE9F1FC));
+            cb.Disabled.TopBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xD2E1F4), factory.GetColor(0xEBF3FD));
+            cb.Disabled.BottomBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.InnerBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x7793B9), Color.Empty);
+            cb.Disabled.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.Text = factory.GetColor(0x8D8D8D);
+            return cb;
+        }
+        public static Office2007ButtonItemColorTable GetButtonItemOffice2007WithBackground(ColorFactory factory)
+        {
+            Office2007ButtonItemColorTable cb = new Office2007ButtonItemColorTable();
+            cb.Default = new Office2007ButtonItemStateColorTable();
+
+            cb.Default.TopBackground = new LinearGradientColorTable(factory.GetColor(0xCBF0FB), factory.GetColor(0x6FBBE5));
+            cb.Default.TopBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.BottomBackground = new LinearGradientColorTable(factory.GetColor(0x66B5DF), factory.GetColor(0xA2EDF6));
+            cb.Default.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xB1FCFF), Color.Empty);
+            cb.Default.InnerBorder = new LinearGradientColorTable(Color.White, Color.Empty);
+            cb.Default.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x799DB6), Color.Empty);
+            cb.Default.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+
+            // Same as default
+            cb.Disabled = new Office2007ButtonItemStateColorTable();
+            cb.Disabled.TopBackground = new LinearGradientColorTable(factory.GetColor(Color.WhiteSmoke), factory.GetColor(Color.LightGray));
+            cb.Disabled.TopBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.BottomBackground = new LinearGradientColorTable(factory.GetColor(Color.Silver), factory.GetColor(0xEBF3FD));
+            cb.Disabled.BottomBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.InnerBorder = new LinearGradientColorTable(Color.WhiteSmoke, Color.Empty);
+            cb.Disabled.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x799DB6), Color.Empty);
+            cb.Disabled.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.Text = factory.GetColor(0x8D8D8D);
+
+            cb.MouseOver = new Office2007ButtonItemStateColorTable();
+            cb.MouseOver.TopBackground = new LinearGradientColorTable(factory.GetColor(0xFCF9E2), factory.GetColor(0xFBEDBF));
+            cb.MouseOver.TopBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.MouseOver.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xFAD84A), factory.GetColor(0xFCE595));
+            cb.MouseOver.BottomBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.MouseOver.InnerBorder = new LinearGradientColorTable(Color.White, Color.Empty);
+            cb.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xBFA779), Color.Empty);
+            cb.MouseOver.SplitBorder = new LinearGradientColorTable(factory.GetColor(0xBFA779), Color.Empty);
+            cb.MouseOver.SplitBorderLight = new LinearGradientColorTable(Color.FromArgb(64, Color.White), Color.Empty);
+
+            cb.Pressed = new Office2007ButtonItemStateColorTable();
+            cb.Pressed.TopBackground = new LinearGradientColorTable(factory.GetColor(0xF8BA78), factory.GetColor(0xFCB24E));
+            cb.Pressed.TopBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Pressed.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xFC9C0F), factory.GetColor(0xFCBA37));
+            cb.Pressed.BottomBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Pressed.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xF1A74A), Color.Empty);
+            cb.Pressed.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x937D5A), Color.Empty);
+            cb.Pressed.SplitBorder = new LinearGradientColorTable(factory.GetColor(0x937D5A), Color.Empty);
+            cb.Pressed.SplitBorderLight = new LinearGradientColorTable(Color.FromArgb(64, Color.White), Color.Empty);
+
+            cb.Checked = new Office2007ButtonItemStateColorTable();
+            cb.Checked.TopBackground = new LinearGradientColorTable(factory.GetColor(0xFCF9E2), factory.GetColor(0xFBEDBF));
+            cb.Checked.TopBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Checked.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xFAD84A), factory.GetColor(0xFCE595));
+            cb.Checked.BottomBackgroundHighlight = new LinearGradientColorTable(Color.White, Color.Empty);
+            cb.Checked.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xF1A74A), Color.Empty);
+            cb.Checked.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x937D5A), Color.Empty);
+            cb.Checked.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Checked.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+
+            cb.Expanded = new Office2007ButtonItemStateColorTable();
+            cb.Expanded.TopBackground = new LinearGradientColorTable(factory.GetColor(0xFCBA37), factory.GetColor(0xFC9C0F));
+            cb.Expanded.TopBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Expanded.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xFCB24E), factory.GetColor(0xF8BA78)); 
+            cb.Expanded.BottomBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Expanded.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xF1A74A), Color.Empty);
+            cb.Expanded.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x937D5A), Color.Empty);
+            cb.Expanded.SplitBorder = new LinearGradientColorTable(factory.GetColor(0x937D5A), Color.Empty);
+            cb.Expanded.SplitBorderLight = new LinearGradientColorTable(Color.FromArgb(64, Color.White), Color.Empty);
+            return cb;
+        }
+        #endregion
+
+        #region RibbonBar Initialization
+        public static Office2007RibbonBarStateColorTable GetRibbonBarBlue(ColorFactory factory)
+        {
+            Office2007RibbonBarStateColorTable rb = new Office2007RibbonBarStateColorTable();
+            rb.TopBackgroundHeight = 15;
+            rb.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xC5D2DF), factory.GetColor(0x9EBFDB));
+            rb.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xE7EEF7), factory.GetColor(0xF1F7FD));
+            rb.TopBackground = new LinearGradientColorTable(factory.GetColor(0xDEE8F5), factory.GetColor(0xD1DFF0));
+            rb.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xC7D8ED), factory.GetColor(0xD8E8F5));
+            rb.TitleBackground = new LinearGradientColorTable(factory.GetColor(0xC2D8F1), factory.GetColor(0xC0D8EF));
+            rb.TitleText = factory.GetColor(0x3E6AAA);
+            return rb;
+        }
+
+        public static Office2007RibbonBarStateColorTable GetRibbonBarBlueMouseOver(ColorFactory factory)
+        {
+            Office2007RibbonBarStateColorTable rb = new Office2007RibbonBarStateColorTable();
+            rb.TopBackgroundHeight = 15;
+            rb.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xADC7DE), factory.GetColor(0x7EADD3));
+            rb.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFFFFFF), factory.GetColor(0xFFFFFF));
+            rb.TopBackground = new LinearGradientColorTable(factory.GetColor(0xE4EFFD), factory.GetColor(0xE8F0FC));
+            rb.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xDCEAFB), factory.GetColor(0xDCE8F8));
+            rb.TitleBackground = new LinearGradientColorTable(factory.GetColor(0xC8E0FF), factory.GetColor(0xD6EDFF));
+            rb.TitleText = factory.GetColor(0x3E6AB9);
+
+            return rb;
+        }
+
+        public static Office2007RibbonBarStateColorTable GetRibbonBarBlueExpanded(ColorFactory factory)
+        {
+            Office2007RibbonBarStateColorTable rb = new Office2007RibbonBarStateColorTable();
+            rb.TopBackgroundHeight = 15;
+            rb.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x869BAE), factory.GetColor(0xB1C7D9));
+            rb.InnerBorder = new LinearGradientColorTable(Color.FromArgb(32, Color.White), Color.Transparent);
+            rb.TopBackground = new LinearGradientColorTable(factory.GetColor(0xADC1DC), factory.GetColor(0x88A7D0));
+            rb.BottomBackground = new LinearGradientColorTable(factory.GetColor(0x7699C8), factory.GetColor(0xB4D5FD));
+            rb.TitleBackground = new LinearGradientColorTable(factory.GetColor(0xC3D9F2), Color.Empty);
+            rb.TitleText = Color.Empty;
+            return rb;
+        }
+        #endregion
+
+        #region RibbonTabItem
+        public static Office2007RibbonTabItemColorTable GetRibbonTabItemBlueDefault(ColorFactory factory)
+        {
+            Office2007RibbonTabItemColorTable rt = new Office2007RibbonTabItemColorTable();
+            rt.Default.Text = factory.GetColor(0x15428B);
+
+            // Selected Tab
+            rt.Selected = new Office2007RibbonTabItemStateColorTable();
+            rt.Selected.Background = new LinearGradientColorTable(factory.GetColor(0xF0F6FE), factory.GetColor(0xDBE6F5));
+            rt.Selected.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(64, Color.White), Color.Transparent);
+            rt.Selected.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xF8FBFF), factory.GetColor(0xBFFAFF));
+            rt.Selected.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x97B9E6), factory.GetColor(0x8DB2E3));
+            rt.Selected.Text = factory.GetColor(0x15428B);
+
+            // Selected Tab Mouse Over
+            rt.SelectedMouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.SelectedMouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xEBF3FE), factory.GetColor(0xE1EAF6));
+            rt.SelectedMouseOver.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(32, Color.White), Color.Transparent);
+            rt.SelectedMouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFAEDC6), factory.GetColor(0xFFFFBD));
+            rt.SelectedMouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xD7BC8A), factory.GetColor(0xFED15E));
+            rt.SelectedMouseOver.Text = factory.GetColor(0x15428B);
+
+            // Tab Mouse Over
+            rt.MouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.MouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xCDDAE0), factory.GetColor(0xE4D097));
+            rt.MouseOver.BackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xC4DEFF), Color.Transparent);
+            rt.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xDFEDFF), factory.GetColor(0xC7DFFF));
+            rt.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x98BBE9), factory.GetColor(0x98BBE9));
+            rt.MouseOver.Text = factory.GetColor(0x15428B);
+
+            return rt;
+        }
+
+        public static Office2007RibbonTabItemColorTable GetRibbonTabItemBlueMagenta(ColorFactory factory)
+        {
+            Office2007RibbonTabItemColorTable rt = new Office2007RibbonTabItemColorTable();
+            rt.Default.Text = factory.GetColor(0x15428B);
+            // Selected Tab
+            rt.Selected = new Office2007RibbonTabItemStateColorTable();
+            rt.Selected.Background = new LinearGradientColorTable(factory.GetColor(0xD4C8E2), factory.GetColor(0xECE7F2));
+            rt.Selected.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(64, Color.White), Color.Transparent);
+            rt.Selected.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xECE7F3), factory.GetColor(0xCDC2DF));
+            rt.Selected.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xBEBAC1), factory.GetColor(0xC0BFC1));
+            rt.Selected.Text = factory.GetColor(0x15428B);
+
+            // Selected Tab Mouse Over
+            rt.SelectedMouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.SelectedMouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xD4C8E2), factory.GetColor(0xECE7F2));
+            rt.SelectedMouseOver.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(32, Color.White), Color.Transparent);
+            rt.SelectedMouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xECE7F3), factory.GetColor(0xCDC2DF));
+            rt.SelectedMouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xBEBAC1), factory.GetColor(0xC0BFC1));
+            rt.SelectedMouseOver.Text = factory.GetColor(0x15428B);
+
+            // Tab Mouse Over
+            rt.MouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.MouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xC4D5F8), factory.GetColor(0xC2BCE8));
+            rt.MouseOver.BackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xDEECFF), Color.Transparent);
+            rt.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xE0EEFF), factory.GetColor(0xC7DFFF));
+            rt.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xC1C8D1), factory.GetColor(0xC0C7D0));
+            rt.MouseOver.Text = factory.GetColor(0x15428B);
+
+            return rt;
+        }
+
+        public static Office2007RibbonTabItemColorTable GetRibbonTabItemBlueGreen(ColorFactory factory)
+        {
+            Office2007RibbonTabItemColorTable rt = new Office2007RibbonTabItemColorTable();
+            rt.Default.Text = factory.GetColor(0x15428B);
+
+            // Selected Tab
+            rt.Selected = new Office2007RibbonTabItemStateColorTable();
+            rt.Selected.Background = new LinearGradientColorTable(factory.GetColor(0xE4F3E0), factory.GetColor(0xE4F2DF));
+            rt.Selected.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(64, Color.White), Color.Transparent);
+            rt.Selected.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xD5EAD3), factory.GetColor(0xB8DEB1));
+            rt.Selected.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xB9C1B7), factory.GetColor(0xBFC1BE));
+            rt.Selected.Text = factory.GetColor(0x15428B);
+
+            // Selected Tab Mouse Over
+            rt.SelectedMouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.SelectedMouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xE4F3E0), factory.GetColor(0xE4F2DF));
+            rt.SelectedMouseOver.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(32, Color.White), Color.Transparent);
+            rt.SelectedMouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xD5EAD3), factory.GetColor(0xB8DEB1));
+            rt.SelectedMouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xB9C1B7), factory.GetColor(0xBFC1BE));
+            rt.SelectedMouseOver.Text = factory.GetColor(0x15428B);
+
+            // Tab Mouse Over
+            rt.MouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.MouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xB3DEE3), factory.GetColor(0x8ADE9F));
+            rt.MouseOver.BackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xDEECFF), Color.Transparent);
+            rt.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xE2EFFF), factory.GetColor(0xC7DFFF));
+            rt.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xC1C8D1), factory.GetColor(0xC0C7D0));
+            rt.MouseOver.Text = factory.GetColor(0x15428B);
+
+            return rt;
+        }
+
+        public static Office2007RibbonTabItemColorTable GetRibbonTabItemBlueOrange(ColorFactory factory)
+        {
+            Office2007RibbonTabItemColorTable rt = new Office2007RibbonTabItemColorTable();
+            rt.Default.Text = factory.GetColor(0x15428B);
+
+            // Selected Tab
+            rt.Selected = new Office2007RibbonTabItemStateColorTable();
+            rt.Selected.Background = new LinearGradientColorTable(factory.GetColor(0xFFF59F), factory.GetColor(0xFFFAD5));
+            rt.Selected.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(64, Color.White), Color.Transparent);
+            rt.Selected.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFFFBD6), factory.GetColor(0xFDF28C));
+            rt.Selected.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xCAC7AC), factory.GetColor(0xC2C2C2));
+            rt.Selected.Text = factory.GetColor(0x15428B);
+
+            // Selected Tab Mouse Over
+            rt.SelectedMouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.SelectedMouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xFFF59F), factory.GetColor(0xFFFAD5));
+            rt.SelectedMouseOver.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(32, Color.White), Color.Transparent);
+            rt.SelectedMouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFFFBD6), factory.GetColor(0xFDF28C));
+            rt.SelectedMouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xCAC7AC), factory.GetColor(0xC2C2C2));
+            rt.SelectedMouseOver.Text = factory.GetColor(0x15428B);
+
+            // Tab Mouse Over
+            rt.MouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.MouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xCFE0E1), factory.GetColor(0xE9E799));
+            rt.MouseOver.BackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xCBE2FF), Color.Transparent);
+            rt.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xE2EFFF), factory.GetColor(0xC7DFFF));
+            rt.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xC1C8D1), factory.GetColor(0xC0C7D0));
+            rt.MouseOver.Text = factory.GetColor(0x15428B);
+
+            return rt;
+        }
+        #endregion
+
+        #region RibbonTabItemGroup
+        public static Office2007RibbonTabGroupColorTable GetRibbonTabGroupBlueDefault(ColorFactory factory)
+        {
+            Office2007RibbonTabGroupColorTable tg = new Office2007RibbonTabGroupColorTable();
+            tg.Background = new LinearGradientColorTable(Color.Transparent /*factory.GetColor(0xCADBF3)*/, factory.GetColor(0xCDBFD7));
+            tg.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(64, factory.GetColor(0xD068C9)), Color.Transparent);
+            tg.Text = factory.GetColor(0x15428B);
+            tg.Border = new LinearGradientColorTable(Color.FromArgb(16, Color.DarkGray), Color.FromArgb(192, Color.DarkGray));
+
+            return tg;
+        }
+
+        public static Office2007RibbonTabGroupColorTable GetRibbonTabGroupBlueMagenta(ColorFactory factory)
+        {
+            return GetRibbonTabGroupBlueDefault(factory);
+        }
+
+        public static Office2007RibbonTabGroupColorTable GetRibbonTabGroupBlueGreen(ColorFactory factory)
+        {
+            Office2007RibbonTabGroupColorTable tg = new Office2007RibbonTabGroupColorTable();
+
+            tg.Background = new LinearGradientColorTable(Color.Transparent /*factory.GetColor(0xC8DDF2)*/, factory.GetColor(0xA6E28E));
+            tg.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(64, factory.GetColor(0x6BB954)), Color.Transparent);
+            tg.Border = new LinearGradientColorTable(Color.FromArgb(16, Color.DarkGray), Color.FromArgb(192, Color.DarkGray));
+            tg.Text = factory.GetColor(0x15428B);
+
+            return tg;
+        }
+
+        public static Office2007RibbonTabGroupColorTable GetRibbonTabGroupBlueOrange(ColorFactory factory)
+        {
+            Office2007RibbonTabGroupColorTable tg = new Office2007RibbonTabGroupColorTable();
+
+            tg.Background = new LinearGradientColorTable(Color.Transparent /*factory.GetColor(0xCDDFF1)*/, factory.GetColor(0xECEFA9));
+            tg.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(64, factory.GetColor(0xFFE619)), Color.Transparent);
+            tg.Border = new LinearGradientColorTable(Color.FromArgb(16, Color.DarkGray), Color.FromArgb(192, Color.DarkGray));
+            tg.Text = factory.GetColor(0x15428B);
+
+            return tg;
+        }
+        #endregion
+
+        #region SuperTab
+
+        #region SuperTab
+
+        public static SuperTabColorTable GetSuperTabBlueDefault(ColorFactory factory)
+        {
+            SuperTabColorTable ct = new SuperTabColorTable();
+
+            ct.Background = new SuperTabLinearGradientColorTable(factory.GetColor(0xBFDBFF));
+            ct.InnerBorder = factory.GetColor(0xBFFAFF);
+            ct.OuterBorder = factory.GetColor(0x8DB2E3);
+
+            ct.ControlBoxDefault.Image = factory.GetColor(0xFF, 0x000000);
+
+            ct.ControlBoxMouseOver.Background = factory.GetColor(0xFFE7A2);
+            ct.ControlBoxMouseOver.Border = factory.GetColor(0xFFBD69);
+            ct.ControlBoxMouseOver.Image = factory.GetColor(0xFF, 0x000000);
+
+            ct.ControlBoxPressed.Background = factory.GetColor(0xFB8C3C);
+            ct.ControlBoxPressed.Border = factory.GetColor(0xFFBD69);
+            ct.ControlBoxPressed.Image = factory.GetColor(0xFF, 0x000000);
+
+            ct.InsertMarker = factory.GetColor(0xFF, 0x000080);
+
+            return (ct);
+        }
+
+        #endregion
+
+        #region SuperTabItem
+
+        public static SuperTabItemColorTable GetSuperTabItemBlueDefault(ColorFactory factory)
+        {
+            SuperTabItemColorTable ct = new SuperTabItemColorTable();
+
+            // Top Default
+
+            ct.Default.Normal.Background = new SuperTabLinearGradientColorTable();
+            ct.Default.Normal.Text = factory.GetColor(0x15428B);
+            ct.Default.Normal.CloseMarker = factory.GetColor(0x406F9F);
+
+            // Top Selected
+
+            ct.Default.Selected.Background = new SuperTabLinearGradientColorTable(
+                new Color[] { factory.GetColor(0xF0F6FE), factory.GetColor(0xDBE6F5) },
+                new float[] { 0, .15f, .15f, 1 });
+
+            ct.Default.Selected.InnerBorder = factory.GetColor(0xBFFAFF);
+            ct.Default.Selected.OuterBorder = factory.GetColor(0x8DB2E3);
+            ct.Default.Selected.Text = factory.GetColor(0x15428B);
+            ct.Default.Selected.CloseMarker = factory.GetColor(0x406F9F);
+
+            // Top SelectedMouseOver
+
+            ct.Default.SelectedMouseOver.Background = new SuperTabLinearGradientColorTable(
+                new Color[] { factory.GetColor(0xEBF3FE), factory.GetColor(0xE1EAF6) },
+                new float[] { 0, .07f, .07f, 1 });
+
+            ct.Default.SelectedMouseOver.InnerBorder = factory.GetColor(0xFFFFBD);
+            ct.Default.SelectedMouseOver.OuterBorder = factory.GetColor(0xD7B77F);
+            ct.Default.SelectedMouseOver.Text = factory.GetColor(0x15428B);
+            ct.Default.SelectedMouseOver.CloseMarker = factory.GetColor(0x406F9F);
+
+            // Top MouseOver
+
+            ct.Default.MouseOver.Background = new SuperTabLinearGradientColorTable(
+                factory.GetColor(0xBFDBFF), factory.GetColor(0xE3D198));
+
+            ct.Default.MouseOver.InnerBorder = factory.GetColor(0xEFF6FF);
+            ct.Default.MouseOver.OuterBorder = factory.GetColor(0x99BBE8);
+            ct.Default.MouseOver.Text = factory.GetColor(0x15428B);
+            ct.Default.MouseOver.CloseMarker = factory.GetColor(0x406F9F);
+
+            // Left, Bottom, Right
+
+            ct.Left = ct.Default;
+            ct.Bottom = ct.Default;
+            ct.Right = ct.Default;
+
+            return (ct);
+        }
+
+        #endregion
+
+        #region SuperTabPanel
+
+        public static SuperTabPanelColorTable GetSuperTabPanelBlueDefault(ColorFactory factory)
+        {
+            SuperTabPanelColorTable ct = new SuperTabPanelColorTable();
+
+            ct.Default.Background = new SuperTabLinearGradientColorTable(
+                factory.GetColor(0xF0F6FE), factory.GetColor(0xDBE6F5));
+
+            ct.Default.InnerBorder = factory.GetColor(0xBFFAFF);
+            ct.Default.OuterBorder = factory.GetColor(0x8DB2E3);
+
+            ct.Left = ct.Default;
+            ct.Bottom = ct.Default;
+            ct.Right = ct.Default;
+
+            return (ct);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Backstage
+
+        #region Backstage
+
+        public static SuperTabColorTable GetBackstageBlueDefault(ColorFactory factory)
+        {
+            return (SuperTabStyleColorFactory.GetOffice2010BackstageBlueColorTable(null, factory));
+        }
+
+        #endregion
+
+        #region BackstageItem
+
+        public static SuperTabItemColorTable GetBackstageItemBlueDefault(ColorFactory factory)
+        {
+            return (SuperTabStyleColorFactory.GetOffice2010BackstageBlueItemColorTable(null, factory));
+        }
+
+        #endregion
+
+        #region BackstagePanel
+
+        public static SuperTabPanelColorTable GetBackstagePanelBlueDefault(ColorFactory factory)
+        {
+            return (SuperTabStyleColorFactory.GetOffice2010BackstageBluePanelColorTable(null, factory));
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region Vista Black
+
+        #region RibbonBar
+        public static Office2007RibbonBarStateColorTable GetRibbonBarBlack(ColorFactory factory)
+        {
+            Office2007RibbonBarStateColorTable rb = new Office2007RibbonBarStateColorTable();
+            rb.TopBackgroundHeight = 15;
+            rb.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xAEB0B4), factory.GetColor(0x818181));
+            rb.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xE9EBEE), factory.GetColor(0xEBEBEB));
+            rb.TopBackground = new LinearGradientColorTable(factory.GetColor(0xCED3DA), factory.GetColor(0xC1C6CF));
+            rb.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xB4BBC5), factory.GetColor(0xE5ECEC));
+            rb.TitleBackground = new LinearGradientColorTable(factory.GetColor(0xB6B8B8), factory.GetColor(0x9C9E9E));
+            rb.TitleText = factory.GetColor(0xFFFFFF);
+            return rb;
+        }
+
+        public static Office2007RibbonBarStateColorTable GetRibbonBarBlackMouseOver(ColorFactory factory)
+        {
+            Office2007RibbonBarStateColorTable rb = new Office2007RibbonBarStateColorTable();
+            rb.TopBackgroundHeight = 15;
+            rb.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xAEB0B4), factory.GetColor(0x818181));
+            rb.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xF5F6F7), factory.GetColor(0xF1F5F6));
+            rb.TopBackground = new LinearGradientColorTable(factory.GetColor(0xECEEF0), factory.GetColor(0xE7E9EC));
+            rb.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xE3E5E9), factory.GetColor(0xF4F6F6));
+            rb.TitleBackground = new LinearGradientColorTable(factory.GetColor(0xAAABAB), factory.GetColor(0x6D6E6E));
+            rb.TitleText = factory.GetColor(0xFFFFFF);
+
+            return rb;
+        }
+
+        public static Office2007RibbonBarStateColorTable GetRibbonBarBlackExpanded(ColorFactory factory)
+        {
+            Office2007RibbonBarStateColorTable rb = new Office2007RibbonBarStateColorTable();
+            rb.TopBackgroundHeight = 15;
+            rb.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x7C7C7C), factory.GetColor(0xBABABA));
+            rb.InnerBorder = new LinearGradientColorTable(Color.FromArgb(64, Color.White), Color.Transparent);
+            rb.TopBackground = new LinearGradientColorTable(factory.GetColor(0xC0C0C0), factory.GetColor(0xADB1B8));
+            rb.BottomBackground = new LinearGradientColorTable(factory.GetColor(0x9EA3AC), factory.GetColor(0xD5D7D8));
+            rb.TitleBackground = new LinearGradientColorTable(factory.GetColor(0xC2C2C2), Color.Empty);
+            rb.TitleText = Color.Empty;
+
+            return rb;
+        }
+        #endregion
+
+        #region RibbonTabItem
+        public static Office2007RibbonTabItemColorTable GetRibbonTabItemBlackDefault(ColorFactory factory)
+        {
+            Office2007RibbonTabItemColorTable rt = new Office2007RibbonTabItemColorTable();
+            rt.Default.Text = factory.GetColor(0xFFFFFF);
+
+            // Selected Tab
+            rt.Selected = new Office2007RibbonTabItemStateColorTable();
+            rt.Selected.Background = new LinearGradientColorTable(factory.GetColor(0xEEEEEF), factory.GetColor(0xCED2D9));
+            rt.Selected.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(64, Color.White), Color.Transparent);
+            rt.Selected.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xF3F5F5), factory.GetColor(0xB8F6FC));
+            rt.Selected.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xBEBEBE), factory.GetColor(0xBEBEBE));
+            rt.Selected.Text = factory.GetColor(0x000000);
+
+            // Selected Tab Mouse Over
+            rt.SelectedMouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.SelectedMouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xEDEEEF), factory.GetColor(0xCACFD6));
+            rt.SelectedMouseOver.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(92, Color.White), Color.Transparent);
+            rt.SelectedMouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFAEBC2), factory.GetColor(0xFFFFBD));
+            rt.SelectedMouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xE8BB72), factory.GetColor(0xFED15E));
+            rt.SelectedMouseOver.Text = factory.GetColor(0x000000);
+
+            // Tab Mouse Over
+            rt.MouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.MouseOver.Background = new LinearGradientColorTable(factory.GetColor(0x949392), factory.GetColor(0x8E824F));
+            rt.MouseOver.BackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xEDC227), Color.Transparent);
+            rt.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0x979695), factory.GetColor(0x93854D));
+            rt.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x969695), factory.GetColor(0xB0A986));
+            rt.MouseOver.Text = factory.GetColor(0xFFFFFF);
+
+            return rt;
+        }
+
+        public static Office2007RibbonTabItemColorTable GetRibbonTabItemBlackMagenta(ColorFactory factory)
+        {
+            Office2007RibbonTabItemColorTable rt = new Office2007RibbonTabItemColorTable();
+            rt.Default.Text = factory.GetColor(0xFFFFFF);
+            // Selected Tab
+            rt.Selected = new Office2007RibbonTabItemStateColorTable();
+            rt.Selected.Background = new LinearGradientColorTable(factory.GetColor(0xD4C8E2), factory.GetColor(0xEBE5F2));
+            rt.Selected.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(64, Color.White), Color.Transparent);
+            rt.Selected.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xE1D9EB), factory.GetColor(0xCDC2DF));
+            rt.Selected.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xBCB9C1), factory.GetColor(0xC2C2C2));
+            rt.Selected.Text = factory.GetColor(0x000000);
+
+            // Selected Tab Mouse Over
+            rt.SelectedMouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.SelectedMouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xD4C8E2), factory.GetColor(0xEBE5F2));
+            rt.SelectedMouseOver.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(64, Color.White), Color.Transparent);
+            rt.SelectedMouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xC6B6D9), factory.GetColor(0xCDC2DF));
+            rt.SelectedMouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xBCB9C1), factory.GetColor(0xC2C2C2));
+            rt.SelectedMouseOver.Text = factory.GetColor(0x000000);
+
+            // Tab Mouse Over
+            rt.MouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.MouseOver.Background = new LinearGradientColorTable(factory.GetColor(0x8B8D91), factory.GetColor(0x7F7495));
+            rt.MouseOver.BackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0x89769D), Color.Transparent);
+            rt.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0x8A8B8F), factory.GetColor(0x7F7495));
+            rt.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x99989A), factory.GetColor(0xA09EA2));
+            rt.MouseOver.Text = factory.GetColor(0xFFFFFF);
+            return rt;
+        }
+
+        public static Office2007RibbonTabItemColorTable GetRibbonTabItemBlackGreen(ColorFactory factory)
+        {
+            Office2007RibbonTabItemColorTable rt = new Office2007RibbonTabItemColorTable();
+            rt.Default.Text = factory.GetColor(0xFFFFFF);
+
+            // Selected Tab
+            rt.Selected = new Office2007RibbonTabItemStateColorTable();
+            rt.Selected.Background = new LinearGradientColorTable(factory.GetColor(0xC1E2B8), factory.GetColor(0xE3F1DD));
+            rt.Selected.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(64, Color.White), Color.Transparent);
+            rt.Selected.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xE4F3E0), factory.GetColor(0xB8DEB1));
+            rt.Selected.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xB0C0AC), factory.GetColor(0xC2C2C2));
+            rt.Selected.Text = factory.GetColor(0x000000);
+
+            // Selected Tab Mouse Over
+            rt.SelectedMouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xC1E2B8), factory.GetColor(0xE3F1DD));
+            rt.SelectedMouseOver.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(64, Color.White), Color.Transparent);
+            rt.SelectedMouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xA4D496), factory.GetColor(0xB8DEB1));
+            rt.SelectedMouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xB0C0AC), factory.GetColor(0xC2C2C2));
+            rt.SelectedMouseOver.Text = factory.GetColor(0x000000);
+
+            // Tab Mouse Over
+            rt.MouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.MouseOver.Background = new LinearGradientColorTable(factory.GetColor(0x899087), factory.GetColor(0x659258));
+            rt.MouseOver.BackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0x6C9D5C), Color.Transparent);
+            rt.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0x878C86), factory.GetColor(0x659257));
+            rt.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x979997), factory.GetColor(0x9DA39B));
+            rt.MouseOver.Text = factory.GetColor(0xFFFFFF);
+            return rt;
+        }
+
+        public static Office2007RibbonTabItemColorTable GetRibbonTabItemBlackOrange(ColorFactory factory)
+        {
+            Office2007RibbonTabItemColorTable rt = new Office2007RibbonTabItemColorTable();
+            rt.Default.Text = factory.GetColor(0xFFFFFF);
+
+            // Selected Tab
+            rt.Selected = new Office2007RibbonTabItemStateColorTable();
+            rt.Selected.Background = new LinearGradientColorTable(factory.GetColor(0xFFF59F), factory.GetColor(0xFFFAD5));
+            rt.Selected.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(64, Color.White), Color.Transparent);
+            rt.Selected.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFFFBD6), factory.GetColor(0xFCF395));
+            rt.Selected.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xCAC7AB), factory.GetColor(0xC2C2C2));
+            rt.Selected.Text = factory.GetColor(0x000000);
+
+            // Selected Tab Mouse Over
+            rt.SelectedMouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.SelectedMouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xFFF59F), factory.GetColor(0xFFFAD5));
+            rt.SelectedMouseOver.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(64, Color.White), Color.Transparent);
+            rt.SelectedMouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFFF071), factory.GetColor(0xFCF395));
+            rt.SelectedMouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xCAC7AB), factory.GetColor(0xC2C2C2));
+            rt.SelectedMouseOver.Text = factory.GetColor(0x000000);
+
+            // Tab Mouse Over
+            rt.MouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.MouseOver.Background = new LinearGradientColorTable(factory.GetColor(0x929083), factory.GetColor(0xB6A933));
+            rt.MouseOver.BackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xC2B531), Color.Transparent);
+            rt.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0x8F8D83), factory.GetColor(0xB1A433));
+            rt.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x9C9B96), factory.GetColor(0xBEBEBE));
+            rt.MouseOver.Text = factory.GetColor(0xFFFFFF);
+
+            return rt;
+        }
+        #endregion
+
+        #region ButtonItem
+        public static Office2007ButtonItemColorTable GetButtonItemBlackOrange(bool ribbonBar, ColorFactory factory)
+        {
+            Office2007ButtonItemColorTable cb = new Office2007ButtonItemColorTable();
+            cb.Default = new Office2007ButtonItemStateColorTable();
+            //if(ribbonBar)
+            cb.Default.Text = factory.GetColor(0x000000);  //factory.GetColor(0x464646);
+            //else
+            //    cb.Default.Text = factory.GetColor(0xFFFFFF);
+
+            // Button mouse over
+            cb.MouseOver = new Office2007ButtonItemStateColorTable();
+            cb.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xDDCF9B), factory.GetColor(0xC0A877));
+            cb.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFFFFF7), factory.GetColor(0xFFF796));
+            cb.MouseOver.TopBackground = new LinearGradientColorTable(factory.GetColor(0xFFFCD9), factory.GetColor(0xFFE78D));
+            cb.MouseOver.TopBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(192, Color.White), Color.Transparent);
+            cb.MouseOver.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xFFD748), factory.GetColor(0xFFE793));
+            cb.MouseOver.BottomBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(164, Color.White), Color.Transparent);
+            cb.MouseOver.SplitBorder = new LinearGradientColorTable(factory.GetColor(0xDBC374), factory.GetColor(0xC8BB8C));
+            cb.MouseOver.SplitBorderLight = new LinearGradientColorTable(factory.GetColor(0xFFF0BF), factory.GetColor(0xFFF6DF));
+            cb.MouseOver.Text = factory.GetColor(0x000000);
+
+            // Pressed
+            cb.Pressed = new Office2007ButtonItemStateColorTable();
+            cb.Pressed.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x8B7654), factory.GetColor(0xC4B9A8));
+            cb.Pressed.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xE9A861), factory.GetColor(0xFDAD11));
+            cb.Pressed.TopBackground = new LinearGradientColorTable(factory.GetColor(0xF8B56A), factory.GetColor(0xFCA060));
+            cb.Pressed.TopBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(64, Color.White), Color.Transparent);
+            cb.Pressed.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xFB8A3C), factory.GetColor(0xFEBD62));
+            cb.Pressed.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xFFE0AF), Color.Transparent);
+            cb.Pressed.SplitBorder = new LinearGradientColorTable(factory.GetColor(0xB07D4B), factory.GetColor(0x907853));
+            cb.Pressed.SplitBorderLight = new LinearGradientColorTable(factory.GetColor(0xFAC094), factory.GetColor(0xFFD9AC));
+            cb.Pressed.Text = factory.GetColor(0x000000);
+
+            // Checked
+            cb.Checked = new Office2007ButtonItemStateColorTable();
+            cb.Checked.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x9F7559), factory.GetColor(0xFFCF2D));
+            cb.Checked.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xEBD1B4), Color.Transparent);
+            cb.Checked.TopBackground = new LinearGradientColorTable(factory.GetColor(0xFBDBB5), factory.GetColor(0xFEC778));
+            cb.Checked.TopBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(32, Color.White), Color.Transparent);
+            cb.Checked.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xFEB456), factory.GetColor(0xFDEB9F));
+            cb.Checked.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xFFF59F), Color.Transparent);
+            cb.Checked.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Checked.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Checked.Text = factory.GetColor(0x000000);
+
+            // Expanded button
+            cb.Expanded = new Office2007ButtonItemStateColorTable();
+            cb.Expanded.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x8E8165), factory.GetColor(0xC6C0B2));
+            cb.Expanded.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xE5AE55), factory.GetColor(0xFFD64A));
+            cb.Expanded.TopBackground = new LinearGradientColorTable(factory.GetColor(0xFCD3A7), factory.GetColor(0xFAA85B));
+            cb.Expanded.TopBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(128, Color.White), Color.Transparent);
+            cb.Expanded.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xF88D29), factory.GetColor(0xFDE499));
+            cb.Expanded.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xFFF6C9), Color.Transparent);
+            cb.Expanded.SplitBorder = new LinearGradientColorTable(factory.GetColor(0xB07D4B), factory.GetColor(0x8B7654));
+            cb.Expanded.SplitBorderLight = new LinearGradientColorTable(factory.GetColor(0xFAC094), factory.GetColor(0xFFD8AB));
+            cb.Expanded.Text = factory.GetColor(0x000000);
+
+            SetBlackExpandColors(cb, factory);
+            return cb;
+        }
+
+        public static Office2007ButtonItemColorTable GetButtonItemBlackOrangeWithBackground(ColorFactory factory)
+        {
+            Office2007ButtonItemColorTable cb = GetButtonItemBlackOrange(false, factory);
+            cb.Default.TopBackground = new LinearGradientColorTable(factory.GetColor(0xF8F8F9), factory.GetColor(0xDFE2E4));
+            cb.Default.TopBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xC7CBD1), factory.GetColor(0xDBDEE2));
+            cb.Default.BottomBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(128, Color.White), Color.Transparent);
+            cb.Default.InnerBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x898785), Color.Empty);
+            cb.Default.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+
+            // Copy of the default theme
+            cb.Disabled = new Office2007ButtonItemStateColorTable();
+            cb.Disabled.TopBackground = new LinearGradientColorTable(factory.GetColor(0xCED3DA), factory.GetColor(0xC1C6CF));
+            cb.Disabled.TopBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xB4BBC5), factory.GetColor(0xE5ECEC));
+            cb.Disabled.BottomBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.InnerBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xC5D1DE), Color.Empty);
+            cb.Disabled.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.Text = factory.GetColor(0x8D8D8D);
+            return cb;
+        }
+
+        public static Office2007ButtonItemColorTable GetButtonItemBlackBlue(bool ribbonBar, ColorFactory factory)
+        {
+            Office2007ButtonItemColorTable cb = new Office2007ButtonItemColorTable();
+            cb.Default = new Office2007ButtonItemStateColorTable();
+            //if (ribbonBar)
+            cb.Default.Text = factory.GetColor(0x000000);  //factory.GetColor(0x15428B);
+            //else
+            //    cb.Default.Text = factory.GetColor(0xFFFFFF);
+
+            // Button mouse over
+            cb.MouseOver = new Office2007ButtonItemStateColorTable();
+            cb.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x3B5A82), Color.Empty);
+            cb.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFFFFFB), factory.GetColor(0xE0EEFF));
+            cb.MouseOver.TopBackground = new LinearGradientColorTable(factory.GetColor(0xC0DCFF), factory.GetColor(0xA9CEFF));
+            cb.MouseOver.TopBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(192, Color.White), Color.Transparent);
+            cb.MouseOver.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xA6CDFF), factory.GetColor(0xCAE1FF));
+            cb.MouseOver.BottomBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(124, Color.White), Color.Transparent);
+            cb.MouseOver.SplitBorder = new LinearGradientColorTable(factory.GetColor(0x7495C2), factory.GetColor(0x90AFD6));
+            cb.MouseOver.SplitBorderLight = new LinearGradientColorTable(factory.GetColor(0xD6E3F3), factory.GetColor(0x83A5D0));
+            cb.MouseOver.Text = factory.GetColor(0x000000);
+
+            // Pressed
+            cb.Pressed = new Office2007ButtonItemStateColorTable();
+            cb.Pressed.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x3B5A82), Color.Empty);
+            cb.Pressed.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFFFFFB), factory.GetColor(0xE0EEFF));
+            cb.Pressed.TopBackground = new LinearGradientColorTable(factory.GetColor(0xC5DCF8), factory.GetColor(0xA9CAF7));
+            cb.Pressed.TopBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(96, Color.White), Color.Transparent);
+            cb.Pressed.BottomBackground = new LinearGradientColorTable(factory.GetColor(0x90B6EA), factory.GetColor(0x7495C2));
+            cb.Pressed.BottomBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(184, Color.White), Color.Transparent);
+            cb.Pressed.SplitBorder = new LinearGradientColorTable(factory.GetColor(0x7495C2), factory.GetColor(0x90AFD6));
+            cb.Pressed.SplitBorderLight = new LinearGradientColorTable(factory.GetColor(0xD6E3F3), factory.GetColor(0x83A5D0));
+            cb.Pressed.Text = factory.GetColor(0x000000);
+
+            // Checked
+            cb.Checked = new Office2007ButtonItemStateColorTable();
+            cb.Checked.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x567DB0), factory.GetColor(0x567DB0));
+            cb.Checked.InnerBorder = new LinearGradientColorTable(factory.GetColor(0x90B6EA), factory.GetColor(0x7495C2));
+            cb.Checked.TopBackground = new LinearGradientColorTable(factory.GetColor(0xD7E6F9), factory.GetColor(0xC7DCF8));
+            cb.Checked.TopBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(64, Color.White), Color.Transparent);
+            cb.Checked.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xB3D0F5), factory.GetColor(0xD7E5F7));
+            cb.Checked.BottomBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(92, Color.White), Color.Transparent);
+            cb.Checked.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Checked.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Checked.Text = factory.GetColor(0x000000);
+
+            // Expanded button
+            cb.Expanded = new Office2007ButtonItemStateColorTable();
+            cb.Expanded.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x6187B7), factory.GetColor(0x4C83C8));
+            cb.Expanded.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xA2B4CD), Color.Transparent);
+            cb.Expanded.TopBackground = new LinearGradientColorTable(factory.GetColor(0xD7E6F9), factory.GetColor(0xC7DCF8));
+            cb.Expanded.TopBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(192, Color.White), Color.Transparent);
+            cb.Expanded.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xB3D0F5), factory.GetColor(0xD7E5F7));
+            cb.Expanded.BottomBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(164, Color.White), Color.Transparent);
+            cb.Expanded.SplitBorder = new LinearGradientColorTable(factory.GetColor(0x537EB8), factory.GetColor(0x6985AA));
+            cb.Expanded.SplitBorderLight = new LinearGradientColorTable(factory.GetColor(0x9AC0F5), factory.GetColor(0xB9D7FF));
+            cb.Expanded.Text = factory.GetColor(0x000000);
+
+
+            //// Menu mouse over
+            //cb.MenuMouseOver = new Office2007ButtonItemStateColorTable();
+            //cb.MenuMouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xAAC2E0), factory.GetColor(0x6591CD));
+            //cb.MenuMouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFFFFFB), factory.GetColor(0xE0EEFF));
+            //cb.MenuMouseOver.TopBackground = new LinearGradientColorTable(factory.GetColor(0xECF4FF), factory.GetColor(0xB0D3FF));
+            //cb.MenuMouseOver.TopBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(192, Color.White), Color.Transparent);
+            //cb.MenuMouseOver.BottomBackground = new LinearGradientColorTable(factory.GetColor(0x89BDFF), factory.GetColor(0x2983FF));
+            //cb.MenuMouseOver.BottomBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(164, Color.White), Color.Transparent);
+            //cb.MenuMouseOver.SplitBorder = new LinearGradientColorTable(factory.GetColor(0x7495C2), factory.GetColor(0x90AFD6));
+            //cb.MenuMouseOver.SplitBorderLight = new LinearGradientColorTable(factory.GetColor(0xD6E3F3), factory.GetColor(0x83A5D0));
+            //cb.MenuMouseOver.Text = factory.GetColor(0x15428B);
+            SetBlackExpandColors(cb, factory);
+            return cb;
+        }
+
+        public static Office2007ButtonItemColorTable GetButtonItemBlackBlueWithBackground(ColorFactory factory)
+        {
+            Office2007ButtonItemColorTable cb = GetButtonItemBlackBlue(false, factory);
+            cb.Default.TopBackground = new LinearGradientColorTable(factory.GetColor(0xF8F8F9), factory.GetColor(0xDFE2E4));
+            cb.Default.TopBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xC7CBD1), factory.GetColor(0xDBDEE2));
+            cb.Default.BottomBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(128, Color.White), Color.Transparent);
+            cb.Default.InnerBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x898785), Color.Empty);
+            cb.Default.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            //cb.Default.TopBackground = new LinearGradientColorTable(factory.GetColor(0xFFFFFF), factory.GetColor(0xE0E5EB));
+            //cb.Default.TopBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            //cb.Default.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xCBD5DF), factory.GetColor(0xFFFFFF));
+            //cb.Default.BottomBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(128, Color.White), Color.Transparent);
+            //cb.Default.InnerBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            //cb.Default.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x898785), Color.Empty);
+            //cb.Default.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            //cb.Default.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+
+            // Copy of the default theme
+            cb.Disabled = new Office2007ButtonItemStateColorTable();
+            cb.Disabled.TopBackground = new LinearGradientColorTable(factory.GetColor(0xCED3DA), factory.GetColor(0xC1C6CF));
+            cb.Disabled.TopBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xB4BBC5), factory.GetColor(0xE5ECEC));
+            cb.Disabled.BottomBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.InnerBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xC5D1DE), Color.Empty);
+            cb.Disabled.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.Text = factory.GetColor(0x8D8D8D);
+            return cb;
+        }
+
+        public static Office2007ButtonItemColorTable GetButtonItemBlackMagenta(bool ribbonBar, ColorFactory factory)
+        {
+            Office2007ButtonItemColorTable cb = new Office2007ButtonItemColorTable();
+            cb.Default = new Office2007ButtonItemStateColorTable();
+            cb.Default.Text = factory.GetColor(0x000000);
+
+            // Button mouse over
+            cb.MouseOver = new Office2007ButtonItemStateColorTable();
+            cb.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x6B0060), factory.GetColor(0x56014D));
+            cb.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xECE7F3), factory.GetColor(0xE8D6FF));
+            cb.MouseOver.TopBackground = new LinearGradientColorTable(factory.GetColor(0xF2DFEB), factory.GetColor(0xE6C6DB));
+            cb.MouseOver.TopBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(96, Color.White), Color.Transparent);
+            cb.MouseOver.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xEAA8D4), factory.GetColor(0xE181C1));
+            cb.MouseOver.BottomBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(164, Color.White), Color.Transparent);
+            cb.MouseOver.SplitBorder = new LinearGradientColorTable(factory.GetColor(0xA37BD1), factory.GetColor(0x8868AE));
+            cb.MouseOver.SplitBorderLight = new LinearGradientColorTable(factory.GetColor(0xD9C2F3), factory.GetColor(0xBBA6D3));
+            cb.MouseOver.Text = factory.GetColor(0x000000);
+
+            // Pressed
+            cb.Pressed = new Office2007ButtonItemStateColorTable();
+            cb.Pressed.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x6B0060), factory.GetColor(0x56014D));
+            cb.Pressed.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xECE7F3), factory.GetColor(0xE8D6FF));
+            cb.Pressed.TopBackground = new LinearGradientColorTable(factory.GetColor(0xD2B0C6), factory.GetColor(0xCBADC1));
+            cb.Pressed.TopBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(64, Color.White), Color.Transparent);
+            cb.Pressed.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xD27AB5), factory.GetColor(0xC84C9F));
+            cb.Pressed.BottomBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(184, Color.White), Color.Transparent);
+            cb.Pressed.SplitBorder = new LinearGradientColorTable(factory.GetColor(0xA37BD1), factory.GetColor(0x8868AE));
+            cb.Pressed.SplitBorderLight = new LinearGradientColorTable(factory.GetColor(0xD9C2F3), factory.GetColor(0xBBA6D3));
+            cb.Pressed.Text = factory.GetColor(0x000000);
+
+            // Checked
+            cb.Checked = new Office2007ButtonItemStateColorTable();
+            cb.Checked.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x6B0060), factory.GetColor(0x56014D));
+            cb.Checked.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xECE7F3), factory.GetColor(0xE8D6FF));
+            cb.Checked.TopBackground = new LinearGradientColorTable(factory.GetColor(0xE9D7E2), factory.GetColor(0xE2B0D1));
+            cb.Checked.TopBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(164, Color.White), Color.Transparent);
+            cb.Checked.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xCF90BA), factory.GetColor(0xCF73B0));
+            cb.Checked.BottomBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(92, Color.White), Color.Transparent);
+            cb.Checked.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Checked.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Checked.Text = factory.GetColor(0x000000);
+
+            // Expanded button
+            cb.Expanded = new Office2007ButtonItemStateColorTable();
+            cb.Expanded.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x6B0060), factory.GetColor(0x56014D));
+            cb.Expanded.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xECE7F3), factory.GetColor(0xE8D6FF));
+            cb.Expanded.TopBackground = new LinearGradientColorTable(factory.GetColor(0xE9D7E2), factory.GetColor(0xE2B0D1));
+            cb.Expanded.TopBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(192, Color.White), Color.Transparent);
+            cb.Expanded.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xCF90BA), factory.GetColor(0xCF73B0));
+            cb.Expanded.BottomBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(192, Color.White), Color.Transparent);
+            cb.Expanded.SplitBorder = new LinearGradientColorTable(factory.GetColor(0xA37BD1), factory.GetColor(0x8868AE));
+            cb.Expanded.SplitBorderLight = new LinearGradientColorTable(factory.GetColor(0xD9C2F3), factory.GetColor(0xBBA6D3));
+            cb.Expanded.Text = factory.GetColor(0x000000);
+
+
+            //// Menu mouse over
+            //cb.MenuMouseOver = new Office2007ButtonItemStateColorTable();
+            //cb.MenuMouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xDE9ECC), factory.GetColor(0xBD71A8));
+            //cb.MenuMouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xECE7F3), factory.GetColor(0xE8D6FF));
+            //cb.MenuMouseOver.TopBackground = new LinearGradientColorTable(factory.GetColor(0xF3EAFF), factory.GetColor(0xDBBCFF));
+            //cb.MenuMouseOver.TopBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(192, Color.White), Color.Transparent);
+            //cb.MenuMouseOver.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xAF6BFF), factory.GetColor(0xD3AEFF));
+            //cb.MenuMouseOver.BottomBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(164, Color.White), Color.Transparent);
+            //cb.MenuMouseOver.SplitBorder = new LinearGradientColorTable(factory.GetColor(0xA37BD1), factory.GetColor(0x8868AE));
+            //cb.MenuMouseOver.SplitBorderLight = new LinearGradientColorTable(factory.GetColor(0xD9C2F3), factory.GetColor(0xBBA6D3));
+            //cb.MenuMouseOver.Text = factory.GetColor(0x15428B);
+            SetBlackExpandColors(cb, factory);
+
+            return cb;
+        }
+
+        public static Office2007ButtonItemColorTable GetButtonItemBlackMagentaWithBackground(ColorFactory factory)
+        {
+            Office2007ButtonItemColorTable cb = GetButtonItemBlackMagenta(false, factory);
+            cb.Default.TopBackground = new LinearGradientColorTable(factory.GetColor(0xF8F8F9), factory.GetColor(0xDFE2E4));
+            cb.Default.TopBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xC7CBD1), factory.GetColor(0xDBDEE2));
+            cb.Default.BottomBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(128, Color.White), Color.Transparent);
+            cb.Default.InnerBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x898785), Color.Empty);
+            cb.Default.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+
+            // Copy of the default theme
+            cb.Disabled = new Office2007ButtonItemStateColorTable();
+            cb.Disabled.TopBackground = new LinearGradientColorTable(factory.GetColor(0xCED3DA), factory.GetColor(0xC1C6CF));
+            cb.Disabled.TopBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xB4BBC5), factory.GetColor(0xE5ECEC));
+            cb.Disabled.BottomBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.InnerBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x4B4B4B), Color.Empty);
+            cb.Disabled.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.Text = factory.GetColor(0x8D8D8D);
+            return cb;
+        }
+        #endregion
+
+        #region RibbonTabItemGroup
+        public static Office2007RibbonTabGroupColorTable GetRibbonTabGroupBlackDefault(ColorFactory factory)
+        {
+            Office2007RibbonTabGroupColorTable tg = new Office2007RibbonTabGroupColorTable();
+            tg.Background = new LinearGradientColorTable(Color.Transparent /*factory.GetColor(0x3C3B3C)*/, factory.GetColor(0xA0A0A0));
+            tg.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(64, factory.GetColor(0xCDCDCD)), Color.Transparent);
+            tg.Text = factory.GetColor(0xFFFFFF);
+            tg.Border = new LinearGradientColorTable(Color.FromArgb(16, Color.DarkGray), Color.FromArgb(192, Color.DarkGray));
+
+            return tg;
+        }
+
+        public static Office2007RibbonTabGroupColorTable GetRibbonTabGroupBlackMagenta(ColorFactory factory)
+        {
+            Office2007RibbonTabGroupColorTable tg = new Office2007RibbonTabGroupColorTable();
+            tg.Background = new LinearGradientColorTable(Color.Transparent /*factory.GetColor(0x3C3B3C)*/, factory.GetColor(0x90708F));
+            tg.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(64, factory.GetColor(0xAF7DA2)), Color.Transparent);
+            tg.Text = factory.GetColor(0xFFFFFF);
+            tg.Border = new LinearGradientColorTable(Color.FromArgb(16, Color.DarkGray), Color.FromArgb(192, Color.DarkGray));
+
+            return tg;
+        }
+
+        public static Office2007RibbonTabGroupColorTable GetRibbonTabGroupBlackGreen(ColorFactory factory)
+        {
+            Office2007RibbonTabGroupColorTable tg = new Office2007RibbonTabGroupColorTable();
+
+            tg.Background = new LinearGradientColorTable(Color.Transparent /*factory.GetColor(0x3A3D3B)*/, factory.GetColor(0x6E9F5D));
+            tg.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(64, factory.GetColor(0x6BB954)), Color.Transparent);
+            tg.Border = new LinearGradientColorTable(Color.FromArgb(16, Color.DarkGray), Color.FromArgb(192, Color.DarkGray));
+            tg.Text = factory.GetColor(0xFFFFFF);
+
+            return tg;
+        }
+
+        public static Office2007RibbonTabGroupColorTable GetRibbonTabGroupBlackOrange(ColorFactory factory)
+        {
+            Office2007RibbonTabGroupColorTable tg = new Office2007RibbonTabGroupColorTable();
+
+            tg.Background = new LinearGradientColorTable(Color.Transparent /*factory.GetColor(0x414038)*/, factory.GetColor(0xA69B41));
+            tg.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(255, factory.GetColor(0xFFE300)), Color.Transparent);
+            tg.Border = new LinearGradientColorTable(Color.FromArgb(16, Color.DarkGray), Color.FromArgb(192, Color.DarkGray));
+            tg.Text = factory.GetColor(0xFFFFFF);
+
+            return tg;
+        }
+        #endregion
+
+        #region Scroll Bar
+        public static void InitializeScrollBarColorTable(Office2007ColorTable t, ColorFactory factory)
+        {
+            Office2007ScrollBarStateColorTable sct = t.ScrollBar.Default;
+            sct.Background = new LinearGradientColorTable(factory.GetColor(0xFCFCFC), factory.GetColor(0xF0F0F0), 0);
+            sct.Border = new LinearGradientColorTable(factory.GetColor(0xEBEDEF), Color.Empty);
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(0x6E7EA6), factory.GetColor(0x424B63), 90);
+            sct.TrackBackground.Clear();
+            sct.TrackBackground.AddRange(new BackgroundColorBlend[] { new BackgroundColorBlend(factory.GetColor(0xEBEEF0),0f), 
+                new BackgroundColorBlend(factory.GetColor(0xE6E9F0),0.5f),
+                new BackgroundColorBlend(factory.GetColor(0xD1DAE4),0.5f),
+                new BackgroundColorBlend(factory.GetColor(0xBECADB),1f)});
+            sct.TrackInnerBorder = new LinearGradientColorTable(factory.GetColor(0xE8E9E9), factory.GetColor(0xE9ECF2));
+            sct.TrackOuterBorder = new LinearGradientColorTable(factory.GetColor(0x5F6E93), Color.Empty);
+            sct.TrackSignBackground = new LinearGradientColorTable(Color.FromArgb(180, factory.GetColor(0x606060)), Color.FromArgb(64, Color.White));
+
+            // Mouse Over
+            sct = t.ScrollBar.MouseOver;
+            sct.Background = t.ScrollBar.Default.Background;
+            sct.Border = t.ScrollBar.Default.Border;
+            sct.ThumbBackground.Clear();
+            sct.ThumbBackground.AddRange(new BackgroundColorBlend[] { new BackgroundColorBlend(factory.GetColor(0xBFD1EA),0f), 
+                new BackgroundColorBlend(factory.GetColor(0xCADFFA),0.4f),
+                new BackgroundColorBlend(factory.GetColor(0xAACBF6),0.4f),
+                new BackgroundColorBlend(factory.GetColor(0xAACBF6),0.7f),
+                new BackgroundColorBlend(factory.GetColor(0xD3E4FA),1f)});
+            sct.ThumbInnerBorder = new LinearGradientColorTable(factory.GetColor(0xFAFCFF), factory.GetColor(0xEEF4FC));
+            sct.ThumbOuterBorder = new LinearGradientColorTable(factory.GetColor(0x8C97A5), factory.GetColor(0x66717F));
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(0x333C54), factory.GetColor(0x55658D));
+            sct.TrackBackground.Clear();
+            sct.TrackBackground.AddRange(new BackgroundColorBlend[] { new BackgroundColorBlend(factory.GetColor(0xBFD1EA),0f), 
+                new BackgroundColorBlend(factory.GetColor(0xCADFFA),0.5f),
+                new BackgroundColorBlend(factory.GetColor(0xAACBF6),0.5f),
+                new BackgroundColorBlend(factory.GetColor(0xD3E4FA),1f)});
+            sct.TrackInnerBorder = new LinearGradientColorTable(factory.GetColor(0xE9E9EB), factory.GetColor(0xFCFDFF));
+            sct.TrackOuterBorder = new LinearGradientColorTable(factory.GetColor(0x3C6EB0), Color.Empty);
+            sct.TrackSignBackground = new LinearGradientColorTable(Color.FromArgb(180, factory.GetColor(0x606060)), Color.FromArgb(64, Color.White));
+
+            // Control Mouse Over
+            sct = t.ScrollBar.MouseOverControl;
+            sct.Background = t.ScrollBar.Default.Background;
+            sct.Border = t.ScrollBar.Default.Border;
+            sct.ThumbBackground.Clear();
+            sct.ThumbBackground.AddRange(new BackgroundColorBlend[] { new BackgroundColorBlend(factory.GetColor(0xF4F9FF),0f), 
+                new BackgroundColorBlend(factory.GetColor(0xF4F9FF),0.5f),
+                new BackgroundColorBlend(factory.GetColor(0xCFE1F8),0.5f),
+                new BackgroundColorBlend(factory.GetColor(0xDFECFC),1f)});
+            sct.ThumbInnerBorder = new LinearGradientColorTable(factory.GetColor(0xFBFDFF), Color.Empty);
+            sct.ThumbOuterBorder = new LinearGradientColorTable(factory.GetColor(0x8C97A5), factory.GetColor(0x66717F));
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(0x6E7EA6), factory.GetColor(0x424B63));
+            sct.TrackBackground.Clear();
+            sct.TrackBackground.AddRange(new BackgroundColorBlend[] { new BackgroundColorBlend(factory.GetColor(0xEBEEF0),0f), 
+                new BackgroundColorBlend(factory.GetColor(0xE6E9F0),0.5f),
+                new BackgroundColorBlend(factory.GetColor(0xD1DAE4),0.5f),
+                new BackgroundColorBlend(factory.GetColor(0xBECADB),1f)});
+            sct.TrackInnerBorder = new LinearGradientColorTable(factory.GetColor(0xE8E9E9), factory.GetColor(0xE9EDF2));
+            sct.TrackOuterBorder = new LinearGradientColorTable(factory.GetColor(0x5F6E93), Color.Empty);
+            sct.TrackSignBackground = new LinearGradientColorTable(Color.FromArgb(180, factory.GetColor(0x606060)), Color.FromArgb(64, Color.White));
+            // Pressed
+            sct = t.ScrollBar.Pressed;
+            sct.Background = t.ScrollBar.Default.Background;
+            sct.Border = t.ScrollBar.Default.Border;
+            sct.ThumbBackground.Clear();
+            sct.ThumbBackground.AddRange(new BackgroundColorBlend[] { 
+                new BackgroundColorBlend(factory.GetColor(0xE6E9EC),0f), 
+                new BackgroundColorBlend(factory.GetColor(0xE2E4E6),0.6f),
+                new BackgroundColorBlend(factory.GetColor(0xC3CAD2),0.6f),
+                new BackgroundColorBlend(factory.GetColor(0xD7DCE1),1f)});
+            sct.ThumbInnerBorder = new LinearGradientColorTable(factory.GetColor(0xF5F7F8), Color.Empty);
+            sct.ThumbOuterBorder = new LinearGradientColorTable(factory.GetColor(0x8C97A5), factory.GetColor(0x65707F));
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(0x6E7EA6), factory.GetColor(0x424B63));
+            sct.TrackBackground.Clear();
+            sct.TrackBackground.AddRange(new BackgroundColorBlend[] {
+                new BackgroundColorBlend(factory.GetColor(0x9EBEE9),0f), 
+                new BackgroundColorBlend(factory.GetColor(0xABCCF6),0.5f),
+                new BackgroundColorBlend(factory.GetColor(0x6EA6F0),0.5f),
+                new BackgroundColorBlend(factory.GetColor(0xB5D1F7),1f)});
+            sct.TrackInnerBorder = new LinearGradientColorTable(factory.GetColor(0xC2D3E7), factory.GetColor(0xDDEBFB));
+            sct.TrackOuterBorder = new LinearGradientColorTable(factory.GetColor(0x17498A), Color.Empty);
+            sct.TrackSignBackground = new LinearGradientColorTable(Color.FromArgb(180, factory.GetColor(0x606060)), Color.FromArgb(64, Color.White));
+            // Disabled
+            sct = t.ScrollBar.Disabled;
+            sct.Background = t.ScrollBar.Default.Background;
+            sct.Border = t.ScrollBar.Default.Border;
+            sct.ThumbBackground.Clear();
+            sct.ThumbInnerBorder = new LinearGradientColorTable();
+            sct.ThumbOuterBorder = new LinearGradientColorTable();
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(0xBFCFF7), factory.GetColor(0x727C94));
+            sct.TrackBackground.Clear();
+            sct.TrackInnerBorder = new LinearGradientColorTable();
+            sct.TrackOuterBorder = new LinearGradientColorTable();
+            sct.TrackSignBackground = new LinearGradientColorTable();
+        }
+
+        public static void InitializeAppBlueScrollBarColorTable(Office2007ColorTable t, ColorFactory factory)
+        {
+            Office2007ScrollBarStateColorTable sct = t.AppScrollBar.Default;
+            sct.Background = new LinearGradientColorTable(factory.GetColor(0x95B0D2), factory.GetColor(0x7C9BC1), 0);
+            sct.Border = new LinearGradientColorTable(factory.GetColor(0xB2D0F6));
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(0x6E7EA6), factory.GetColor(0x424B63), 90);
+            sct.TrackBackground.Clear();
+            sct.TrackBackground.AddRange(new BackgroundColorBlend[] { new BackgroundColorBlend(factory.GetColor(0xE3E5E7),0f), 
+                new BackgroundColorBlend(factory.GetColor(0xE3E9F0),0.4f),
+                new BackgroundColorBlend(factory.GetColor(0xC8D4E1),0.4f),
+                new BackgroundColorBlend(factory.GetColor(0xB6C4D8),.8f),
+                new BackgroundColorBlend(factory.GetColor(0xB6C4D8),.8f),
+                new BackgroundColorBlend(factory.GetColor(0xE1E7EF),1f)});
+            sct.TrackInnerBorder = new LinearGradientColorTable(factory.GetColor(0xE3E5E7), factory.GetColor(0xE1E7EF));
+            sct.TrackOuterBorder = new LinearGradientColorTable(factory.GetColor(0x596991), Color.Empty);
+            sct.TrackSignBackground = new LinearGradientColorTable(Color.FromArgb(180, factory.GetColor(0x8B8E90)), Color.FromArgb(64, Color.White));
+
+            // Mouse Over
+            sct = t.AppScrollBar.MouseOver;
+            sct.Background = t.AppScrollBar.Default.Background;
+            sct.Border = t.AppScrollBar.Default.Border;
+            sct.ThumbBackground.Clear();
+            sct.ThumbBackground.AddRange(new BackgroundColorBlend[] { new BackgroundColorBlend(factory.GetColor(0xBFD1EA),0f), 
+                new BackgroundColorBlend(factory.GetColor(0xCADFFA),0.4f),
+                new BackgroundColorBlend(factory.GetColor(0xAACBF6),0.4f),
+                new BackgroundColorBlend(factory.GetColor(0xAACBF6),0.7f),
+                new BackgroundColorBlend(factory.GetColor(0xD3E4FA),1f)});
+            sct.ThumbInnerBorder = new LinearGradientColorTable(factory.GetColor(0xE9E9EB), factory.GetColor(0xFCFDFF));
+            sct.ThumbOuterBorder = new LinearGradientColorTable(factory.GetColor(0x3C6EB0), Color.Empty);
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(0x6E7EA6), factory.GetColor(0x424B63), 90);
+            sct.TrackBackground.Clear();
+            sct.TrackBackground.CopyFrom(sct.ThumbBackground);
+            sct.TrackInnerBorder = sct.ThumbInnerBorder;
+            sct.TrackOuterBorder = sct.ThumbOuterBorder;
+            sct.TrackSignBackground = new LinearGradientColorTable(Color.FromArgb(180, factory.GetColor(0x7D8692)), Color.FromArgb(64, Color.White));
+
+            // Control Mouse Over
+            sct = t.AppScrollBar.MouseOverControl;
+            sct.Background = t.AppScrollBar.Default.Background;
+            sct.Border = t.AppScrollBar.Default.Border;
+            sct.ThumbBackground.Clear();
+            sct.ThumbBackground.CopyFrom(t.AppScrollBar.Default.TrackBackground);
+            sct.ThumbInnerBorder = t.AppScrollBar.Default.TrackInnerBorder;
+            sct.ThumbOuterBorder = t.AppScrollBar.Default.TrackOuterBorder;
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(0x55658D), factory.GetColor(0x333C54));
+            sct.TrackBackground.Clear();
+            sct.TrackBackground.CopyFrom(t.AppScrollBar.Default.TrackBackground);
+            sct.TrackInnerBorder = t.AppScrollBar.Default.TrackInnerBorder;
+            sct.TrackOuterBorder = t.AppScrollBar.Default.TrackOuterBorder;
+            sct.TrackSignBackground = t.AppScrollBar.Default.TrackSignBackground;
+
+            // Pressed
+            sct = t.AppScrollBar.Pressed;
+            sct.Background = t.AppScrollBar.Default.Background;
+            sct.Border = t.AppScrollBar.Default.Border;
+            sct.ThumbBackground.Clear();
+            sct.ThumbBackground.AddRange(new BackgroundColorBlend[] { 
+                new BackgroundColorBlend(factory.GetColor(0x9DBDE7),0f), 
+                new BackgroundColorBlend(factory.GetColor(0xABCCF6),0.4f),
+                new BackgroundColorBlend(factory.GetColor(0x6EA6F0),0.4f),
+                new BackgroundColorBlend(factory.GetColor(0x6EA6F0),0.7f),
+                new BackgroundColorBlend(factory.GetColor(0xB5D1F7),1f)});
+            sct.ThumbInnerBorder = new LinearGradientColorTable(factory.GetColor(0xC2D3E7), factory.GetColor(0xDDEBFB));
+            sct.ThumbOuterBorder = new LinearGradientColorTable(factory.GetColor(0x17498A), Color.Empty);
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(0x6E7EA6), factory.GetColor(0x424B63), 90);
+            sct.TrackBackground.Clear();
+            sct.TrackBackground.CopyFrom(sct.ThumbBackground);
+            //sct.TrackBackground.AddRange(new BackgroundColorBlend[] {
+            //    new BackgroundColorBlend(factory.GetColor(0x9DBDE7),0f), 
+            //    new BackgroundColorBlend(factory.GetColor(0xABCCF6),0.4f),
+            //    new BackgroundColorBlend(factory.GetColor(0x79ADF1),0.4f),
+            //    new BackgroundColorBlend(factory.GetColor(0xBBD5F8),1f)});
+            sct.TrackInnerBorder = new LinearGradientColorTable(factory.GetColor(0xC2D3E7), factory.GetColor(0xDDEBFB));
+            sct.TrackOuterBorder = new LinearGradientColorTable(factory.GetColor(0x17498A), Color.Empty);
+            sct.TrackSignBackground = new LinearGradientColorTable(Color.FromArgb(180, factory.GetColor(0x818181)), Color.FromArgb(64, Color.White));
+            // Disabled
+            sct = t.AppScrollBar.Disabled;
+            sct.Background = t.AppScrollBar.Default.Background;
+            sct.Border = t.AppScrollBar.Default.Border;
+            sct.ThumbBackground.Clear();
+            sct.ThumbInnerBorder = new LinearGradientColorTable();
+            sct.ThumbOuterBorder = new LinearGradientColorTable();
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(0xBFCFF7), factory.GetColor(0x727C94));
+            sct.TrackBackground.Clear();
+            sct.TrackInnerBorder = new LinearGradientColorTable();
+            sct.TrackOuterBorder = new LinearGradientColorTable();
+            sct.TrackSignBackground = new LinearGradientColorTable();
+        }
+
+        public static void InitializeAppSilverScrollBarColorTable(Office2007ColorTable t, ColorFactory factory)
+        {
+            Office2007ScrollBarStateColorTable sct = t.AppScrollBar.Default;
+            sct.Background = new LinearGradientColorTable(factory.GetColor(0xB4B7BF));
+            sct.Border = new LinearGradientColorTable(factory.GetColor(0x9D9FA6));
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(0x7D848E), factory.GetColor(0x4B4F55), 90);
+            sct.TrackBackground.Clear();
+            sct.TrackBackground.AddRange(new BackgroundColorBlend[] {
+                new BackgroundColorBlend(factory.GetColor(0xF5F5F6),0f), 
+                new BackgroundColorBlend(factory.GetColor(0xEAEAEC),0.4f),
+                new BackgroundColorBlend(factory.GetColor(0xDADBDD),0.4f),
+                new BackgroundColorBlend(factory.GetColor(0xC1C1C5),1f)});
+            sct.TrackInnerBorder = new LinearGradientColorTable(factory.GetColor(0xF9F9F9), factory.GetColor(0xCFCFD2));
+            sct.TrackOuterBorder = new LinearGradientColorTable(factory.GetColor(0x6E6F73), Color.Empty);
+            sct.TrackSignBackground = new LinearGradientColorTable(Color.FromArgb(180, factory.GetColor(0x6F6F6F)), Color.FromArgb(64, Color.White));
+
+            // Mouse Over
+            sct = t.AppScrollBar.MouseOver;
+            sct.Background = t.AppScrollBar.Default.Background;
+            sct.Border = t.AppScrollBar.Default.Border;
+            sct.ThumbBackground.Clear();
+            sct.ThumbBackground.AddRange(new BackgroundColorBlend[] {
+                new BackgroundColorBlend(factory.GetColor(0xDCF0FB),0f), 
+                new BackgroundColorBlend(factory.GetColor(0xC9E9FA),0.4f),
+                new BackgroundColorBlend(factory.GetColor(0xA9DBF6),0.4f),
+                new BackgroundColorBlend(factory.GetColor(0xA9DBF6),0.7f),
+                new BackgroundColorBlend(factory.GetColor(0x94C0D8),1f)});
+            sct.ThumbInnerBorder = new LinearGradientColorTable(factory.GetColor(0xFDFEFF), factory.GetColor(0xDBDDDF));
+            sct.ThumbOuterBorder = new LinearGradientColorTable(factory.GetColor(0x3C7FB1), Color.Empty);
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(0x7D848E), factory.GetColor(0x4B4F55), 90);
+            sct.TrackBackground.Clear();
+            sct.TrackBackground.CopyFrom(sct.ThumbBackground);
+            sct.TrackInnerBorder = sct.ThumbInnerBorder;
+            sct.TrackOuterBorder = sct.ThumbOuterBorder;
+            sct.TrackSignBackground = new LinearGradientColorTable(Color.FromArgb(180, factory.GetColor(0x6F6F6F)), Color.FromArgb(64, Color.White));
+
+            // Control Mouse Over
+            sct = t.AppScrollBar.MouseOverControl;
+            sct.Background = t.AppScrollBar.Default.Background;
+            sct.Border = t.AppScrollBar.Default.Border;
+            sct.ThumbBackground.Clear();
+            sct.ThumbBackground.CopyFrom(t.AppScrollBar.Default.TrackBackground);
+            sct.ThumbInnerBorder = t.AppScrollBar.Default.TrackInnerBorder;
+            sct.ThumbOuterBorder = t.AppScrollBar.Default.TrackOuterBorder;
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(0x7D848E), factory.GetColor(0x4B4F55), 90);
+            sct.TrackBackground.Clear();
+            sct.TrackBackground.CopyFrom(t.AppScrollBar.Default.TrackBackground);
+            sct.TrackInnerBorder = t.AppScrollBar.Default.TrackInnerBorder;
+            sct.TrackOuterBorder = t.AppScrollBar.Default.TrackOuterBorder;
+            sct.TrackSignBackground = t.AppScrollBar.Default.TrackSignBackground;
+
+            // Pressed
+            sct = t.AppScrollBar.Pressed;
+            sct.Background = t.AppScrollBar.Default.Background;
+            sct.Border = t.AppScrollBar.Default.Border;
+            sct.ThumbBackground.Clear();
+            sct.ThumbBackground.AddRange(new BackgroundColorBlend[] { 
+                new BackgroundColorBlend(factory.GetColor(0xC4E9F9),0f), 
+                new BackgroundColorBlend(factory.GetColor(0xA5DEF6),0.4f),
+                new BackgroundColorBlend(factory.GetColor(0x6FCAF0),0.4f),
+                new BackgroundColorBlend(factory.GetColor(0x6FCAF0),0.7f),
+                new BackgroundColorBlend(factory.GetColor(0x62B1D3),1f)});
+            sct.ThumbInnerBorder = new LinearGradientColorTable(factory.GetColor(0xE3F5FC), factory.GetColor(0x9EC7D9));
+            sct.ThumbOuterBorder = new LinearGradientColorTable(factory.GetColor(0x18598A), Color.Empty);
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(0x7D848E), factory.GetColor(0x4B4F55), 90);
+            sct.TrackBackground.Clear();
+            sct.TrackBackground.CopyFrom(sct.ThumbBackground);
+            //sct.TrackBackground.AddRange(new BackgroundColorBlend[] {
+            //    new BackgroundColorBlend(factory.GetColor(0x9DBDE7),0f), 
+            //    new BackgroundColorBlend(factory.GetColor(0xABCCF6),0.4f),
+            //    new BackgroundColorBlend(factory.GetColor(0x79ADF1),0.4f),
+            //    new BackgroundColorBlend(factory.GetColor(0xBBD5F8),1f)});
+            sct.TrackInnerBorder = new LinearGradientColorTable(factory.GetColor(0xE3F5FC), factory.GetColor(0x9EC7D9));
+            sct.TrackOuterBorder = new LinearGradientColorTable(factory.GetColor(0x18598A), Color.Empty);
+            sct.TrackSignBackground = new LinearGradientColorTable(Color.FromArgb(180, factory.GetColor(0x818181)), Color.FromArgb(64, Color.White));
+            // Disabled
+            sct = t.AppScrollBar.Disabled;
+            sct.Background = t.AppScrollBar.Default.Background;
+            sct.Border = t.AppScrollBar.Default.Border;
+            sct.ThumbBackground.Clear();
+            sct.ThumbInnerBorder = new LinearGradientColorTable();
+            sct.ThumbOuterBorder = new LinearGradientColorTable();
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(0xBFCFF7), factory.GetColor(0x727C94));
+            sct.TrackBackground.Clear();
+            sct.TrackInnerBorder = new LinearGradientColorTable();
+            sct.TrackOuterBorder = new LinearGradientColorTable();
+            sct.TrackSignBackground = new LinearGradientColorTable();
+        }
+
+        public static void InitializeAppBlackScrollBarColorTable(Office2007ColorTable t, ColorFactory factory)
+        {
+            Office2007ScrollBarStateColorTable sct = t.AppScrollBar.Default;
+            sct.Background = new LinearGradientColorTable(factory.GetColor(0x404040));
+            sct.Border = new LinearGradientColorTable(factory.GetColor(0x626262));
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(0xCACACA), factory.GetColor(0x797979), 90);
+            sct.TrackBackground.Clear();
+            sct.TrackBackground.AddRange(new BackgroundColorBlend[] {
+                new BackgroundColorBlend(factory.GetColor(0xF9F9F9),0f), 
+                new BackgroundColorBlend(factory.GetColor(0xEAEAEC),0.4f),
+                new BackgroundColorBlend(factory.GetColor(0xDADBDD),0.4f),
+                new BackgroundColorBlend(factory.GetColor(0xC1C1C5),1f)});
+            sct.TrackInnerBorder = new LinearGradientColorTable(factory.GetColor(0xF9F9F9), factory.GetColor(0xCFCFD2));
+            sct.TrackOuterBorder = new LinearGradientColorTable(factory.GetColor(0x2F2F2F), Color.Empty);
+            sct.TrackSignBackground = new LinearGradientColorTable(Color.FromArgb(180, factory.GetColor(0x6F6F6F)), Color.FromArgb(64, Color.White));
+
+            // Mouse Over
+            sct = t.AppScrollBar.MouseOver;
+            sct.Background = t.AppScrollBar.Default.Background;
+            sct.Border = t.AppScrollBar.Default.Border;
+            sct.ThumbBackground.Clear();
+            sct.ThumbBackground.AddRange(new BackgroundColorBlend[] {
+                new BackgroundColorBlend(factory.GetColor(0xDCF0FB),0f), 
+                new BackgroundColorBlend(factory.GetColor(0xC9E9FA),0.4f),
+                new BackgroundColorBlend(factory.GetColor(0xA9DBF6),0.4f),
+                new BackgroundColorBlend(factory.GetColor(0xA9DBF6),0.7f),
+                new BackgroundColorBlend(factory.GetColor(0x94C0D8),1f)});
+            sct.ThumbInnerBorder = new LinearGradientColorTable(factory.GetColor(0xFDFEFF), factory.GetColor(0xDBDDDF));
+            sct.ThumbOuterBorder = new LinearGradientColorTable(factory.GetColor(0x3C7FB1), Color.Empty);
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(0x838383), factory.GetColor(0x4E4E4E), 90);
+            sct.TrackBackground.Clear();
+            sct.TrackBackground.CopyFrom(sct.ThumbBackground);
+            sct.TrackInnerBorder = sct.ThumbInnerBorder;
+            sct.TrackOuterBorder = sct.ThumbOuterBorder;
+            sct.TrackSignBackground = new LinearGradientColorTable(Color.FromArgb(180, factory.GetColor(0x6F6F6F)), Color.FromArgb(64, Color.White));
+
+            // Control Mouse Over
+            sct = t.AppScrollBar.MouseOverControl;
+            sct.Background = t.AppScrollBar.Default.Background;
+            sct.Border = t.AppScrollBar.Default.Border;
+            sct.ThumbBackground.Clear();
+            sct.ThumbBackground.CopyFrom(t.AppScrollBar.Default.TrackBackground);
+            sct.ThumbInnerBorder = t.AppScrollBar.Default.TrackInnerBorder;
+            sct.ThumbOuterBorder = t.AppScrollBar.Default.TrackOuterBorder;
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(0x838383), factory.GetColor(0x4E4E4E), 90);
+            sct.TrackBackground.Clear();
+            sct.TrackBackground.CopyFrom(t.AppScrollBar.Default.TrackBackground);
+            sct.TrackInnerBorder = t.AppScrollBar.Default.TrackInnerBorder;
+            sct.TrackOuterBorder = t.AppScrollBar.Default.TrackOuterBorder;
+            sct.TrackSignBackground = t.AppScrollBar.Default.TrackSignBackground;
+
+            // Pressed
+            sct = t.AppScrollBar.Pressed;
+            sct.Background = t.AppScrollBar.Default.Background;
+            sct.Border = t.AppScrollBar.Default.Border;
+            sct.ThumbBackground.Clear();
+            sct.ThumbBackground.AddRange(new BackgroundColorBlend[] { 
+                new BackgroundColorBlend(factory.GetColor(0xC4E9F9),0f), 
+                new BackgroundColorBlend(factory.GetColor(0xA5DEF6),0.4f),
+                new BackgroundColorBlend(factory.GetColor(0x6FCAF0),0.4f),
+                new BackgroundColorBlend(factory.GetColor(0x6FCAF0),0.7f),
+                new BackgroundColorBlend(factory.GetColor(0x62B1D3),1f)});
+            sct.ThumbInnerBorder = new LinearGradientColorTable(factory.GetColor(0xE3F5FC), factory.GetColor(0x9EC7D9));
+            sct.ThumbOuterBorder = new LinearGradientColorTable(factory.GetColor(0x18598A), Color.Empty);
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(0x7D848E), factory.GetColor(0x4B4F55), 90);
+            sct.TrackBackground.Clear();
+            sct.TrackBackground.CopyFrom(sct.ThumbBackground);
+            //sct.TrackBackground.AddRange(new BackgroundColorBlend[] {
+            //    new BackgroundColorBlend(factory.GetColor(0x9DBDE7),0f), 
+            //    new BackgroundColorBlend(factory.GetColor(0xABCCF6),0.4f),
+            //    new BackgroundColorBlend(factory.GetColor(0x79ADF1),0.4f),
+            //    new BackgroundColorBlend(factory.GetColor(0xBBD5F8),1f)});
+            sct.TrackInnerBorder = new LinearGradientColorTable(factory.GetColor(0xE3F5FC), factory.GetColor(0x9EC7D9));
+            sct.TrackOuterBorder = new LinearGradientColorTable(factory.GetColor(0x18598A), Color.Empty);
+            sct.TrackSignBackground = new LinearGradientColorTable(Color.FromArgb(180, factory.GetColor(0x818181)), Color.FromArgb(64, Color.White));
+            // Disabled
+            sct = t.AppScrollBar.Disabled;
+            sct.Background = t.AppScrollBar.Default.Background;
+            sct.Border = t.AppScrollBar.Default.Border;
+            sct.ThumbBackground.Clear();
+            sct.ThumbInnerBorder = new LinearGradientColorTable();
+            sct.ThumbOuterBorder = new LinearGradientColorTable();
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(0xBFCFF7), factory.GetColor(0x727C94));
+            sct.TrackBackground.Clear();
+            sct.TrackInnerBorder = new LinearGradientColorTable();
+            sct.TrackOuterBorder = new LinearGradientColorTable();
+            sct.TrackSignBackground = new LinearGradientColorTable();
+        }
+        #endregion
+
+        public static void InitializeVistaBlackColorTable(Office2007ColorTable table, ColorFactory factory)
+        {
+            #region Ribbon Bar
+            table.RibbonBar.Default = GetRibbonBarBlack(factory);
+            table.RibbonBar.MouseOver = GetRibbonBarBlackMouseOver(factory);
+            table.RibbonBar.Expanded = GetRibbonBarBlackExpanded(factory);
+            #endregion
+
+            #region RibbonTabItem
+            // RibbonTabItem Default
+            table.RibbonTabItemColors.Clear();
+            Office2007RibbonTabItemColorTable rt = Office2007ColorTableFactory.GetRibbonTabItemBlackDefault(factory);
+            rt.Name = Enum.GetName(typeof(eRibbonTabColor), eRibbonTabColor.Default);
+            table.RibbonTabItemColors.Add(rt);
+            // Green
+
+            rt = Office2007ColorTableFactory.GetRibbonTabItemBlackGreen(factory);
+            rt.Name = Enum.GetName(typeof(eRibbonTabColor), eRibbonTabColor.Green);
+            table.RibbonTabItemColors.Add(rt);
+            // Magenta
+
+            rt = Office2007ColorTableFactory.GetRibbonTabItemBlackMagenta(factory);
+            rt.Name = Enum.GetName(typeof(eRibbonTabColor), eRibbonTabColor.Magenta);
+            table.RibbonTabItemColors.Add(rt);
+            // Orange
+
+            rt = Office2007ColorTableFactory.GetRibbonTabItemBlackOrange(factory);
+            rt.Name = Enum.GetName(typeof(eRibbonTabColor), eRibbonTabColor.Orange);
+            table.RibbonTabItemColors.Add(rt);
+            #endregion
+
+            #region Ribbon Control
+            table.RibbonControl = new Office2007RibbonColorTable();
+            table.RibbonControl.TabsBackground = new LinearGradientColorTable(factory.GetColor(0x535353), factory.GetColor(0x535353));
+            //t.RibbonControl.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xD7DADF), factory.GetColor(0x3A3A3A));
+            //t.RibbonControl.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xBEBEBE), factory.GetColor(0xBEBEBE));
+            table.RibbonControl.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xCED2D9), factory.GetColor(0xBEBEBE));
+            table.RibbonControl.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x535353), factory.GetColor(0x4F4F4F));
+            table.RibbonControl.TabDividerBorder = factory.GetColor(0x414141);
+            table.RibbonControl.TabDividerBorderLight = factory.GetColor(0x666666);
+            table.RibbonControl.PanelTopBackground = new LinearGradientColorTable(factory.GetColor(0xD7DBE0), factory.GetColor(0xC1C6CF));
+            table.RibbonControl.PanelBottomBackground = new LinearGradientColorTable(factory.GetColor(0xB4BBC5), factory.GetColor(0xEBEBEB));
+            table.RibbonControl.StartButtonDefault = BarFunctions.LoadBitmap("SystemImages.BlankStartButtonNormalBlack.png");
+            table.RibbonControl.StartButtonMouseOver = BarFunctions.LoadBitmap("SystemImages.BlankStartButtonHotBlack.png");
+            table.RibbonControl.StartButtonPressed = BarFunctions.LoadBitmap("SystemImages.BlankStartButtonPressedBlack.png");
+            #endregion
+
+            #region ItemContainer
+            table.ItemGroup.TopBackground = new LinearGradientColorTable(factory.GetColor(0xD6DEDF), factory.GetColor(0xDBE2E4));
+            table.ItemGroup.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xD3D8DA), factory.GetColor(0xE0E5E7));
+            table.ItemGroup.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xDFE6E6), factory.GetColor(0xEDF0F1));
+            table.ItemGroup.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xADB7BB), factory.GetColor(0x8C959A));
+            table.ItemGroup.ItemGroupDividerDark = Color.FromArgb(196, factory.GetColor(0xCECECE));
+            table.ItemGroup.ItemGroupDividerLight = Color.FromArgb(128, factory.GetColor(0xFFFFFF));
+            #endregion
+
+            #region Bar
+            table.Bar.ToolbarTopBackground = new LinearGradientColorTable(factory.GetColor(0x333333), factory.GetColor(0x3B3E46));
+            table.Bar.ToolbarBottomBackground = new LinearGradientColorTable(factory.GetColor(0x2F3030), factory.GetColor(0x454545));
+            table.Bar.ToolbarBottomBorder = factory.GetColor(0x4C4C4C);
+            table.Bar.PopupToolbarBackground = new LinearGradientColorTable(factory.GetColor(0xFAFAFA), Color.Empty);
+            table.Bar.PopupToolbarBorder = factory.GetColor(0x2F2F2F);
+            table.Bar.StatusBarTopBorder = factory.GetColor(0x333333);
+            table.Bar.StatusBarTopBorderLight = Color.Empty;
+            table.Bar.StatusBarAltBackground.Clear();
+            table.Bar.StatusBarAltBackground.Add(new BackgroundColorBlend(factory.GetColor(0xC6C5C6), 0f));
+            table.Bar.StatusBarAltBackground.Add(new BackgroundColorBlend(factory.GetColor(0xB4B4B4), 0.4f));
+            table.Bar.StatusBarAltBackground.Add(new BackgroundColorBlend(factory.GetColor(0x979898), 0.4f));
+            table.Bar.StatusBarAltBackground.Add(new BackgroundColorBlend(factory.GetColor(0x484C52), 1f));
+            #endregion
+
+            #region ButtonItem Colors Initialization
+            table.ButtonItemColors.Clear();
+            table.RibbonButtonItemColors.Clear();
+            table.MenuButtonItemColors.Clear();
+            // Orange
+            Office2007ButtonItemColorTable cb = Office2007ColorTableFactory.GetButtonItemBlackOrange(false, factory);
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Orange);
+            table.ButtonItemColors.Add(cb);
+            // Orange with background
+            cb = Office2007ColorTableFactory.GetButtonItemBlackOrangeWithBackground(factory);
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.OrangeWithBackground);
+            table.ButtonItemColors.Add(cb);
+            // Blue
+            cb = Office2007ColorTableFactory.GetButtonItemBlackBlue(false, factory);
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Blue);
+            table.ButtonItemColors.Add(cb);
+            // Blue with background
+            cb = Office2007ColorTableFactory.GetButtonItemBlackBlueWithBackground(factory);
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.BlueWithBackground);
+            table.ButtonItemColors.Add(cb);
+            // Magenta
+            cb = Office2007ColorTableFactory.GetButtonItemBlackMagenta(false, factory);
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Magenta);
+            table.ButtonItemColors.Add(cb);
+            // Magenta with background
+            cb = Office2007ColorTableFactory.GetButtonItemBlackMagentaWithBackground(factory);
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.MagentaWithBackground);
+            table.ButtonItemColors.Add(cb);
+
+            // RibbonBar buttons
+            cb = Office2007ColorTableFactory.GetButtonItemBlackOrange(true, factory);
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Orange);
+            table.RibbonButtonItemColors.Add(cb);
+            // Orange with background
+            cb = Office2007ColorTableFactory.GetButtonItemBlackOrangeWithBackground(factory);
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.OrangeWithBackground);
+            table.RibbonButtonItemColors.Add(cb);
+            // Blue
+            cb = Office2007ColorTableFactory.GetButtonItemBlackBlue(true, factory);
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Blue);
+            table.RibbonButtonItemColors.Add(cb);
+            // Blue with background
+            cb = Office2007ColorTableFactory.GetButtonItemBlackBlueWithBackground(factory);
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.BlueWithBackground);
+            table.RibbonButtonItemColors.Add(cb);
+            // Magenta
+            cb = Office2007ColorTableFactory.GetButtonItemBlackMagenta(true, factory);
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Magenta);
+            table.RibbonButtonItemColors.Add(cb);
+            // Magenta with background
+            cb = Office2007ColorTableFactory.GetButtonItemBlackMagentaWithBackground(factory);
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.MagentaWithBackground);
+            table.RibbonButtonItemColors.Add(cb);
+
+            // MENU Orange
+            cb = Office2007ColorTableFactory.GetButtonItemBlackOrange(true, factory);
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Orange);
+            cb.Default.Text = factory.GetColor(0xFFFFFF);
+            cb.MouseOver.Text = factory.GetColor(0x000000);
+            cb.Checked.Text = factory.GetColor(0x000000);
+            cb.Expanded.Text = factory.GetColor(0x000000);
+            cb.Pressed.Text = factory.GetColor(0x000000);
+            table.MenuButtonItemColors.Add(cb);
+
+            cb = Office2007ColorTableFactory.GetButtonItemOffice2007WithBackground(factory);
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Office2007WithBackground);
+            table.ButtonItemColors.Add(cb);
+
+            table.ButtonItemColors.Add(ButtonItemStaticColorTables.CreateBlueOrbColorTable(factory));
+            #endregion
+
+            #region RibbonTabItemGroup Colors Initialization
+            table.RibbonTabGroupColors.Clear();
+            // Default
+            Office2007RibbonTabGroupColorTable tg = Office2007ColorTableFactory.GetRibbonTabGroupBlackDefault(factory);
+            tg.Name = Enum.GetName(typeof(eRibbonTabGroupColor), eRibbonTabGroupColor.Default);
+            table.RibbonTabGroupColors.Add(tg);
+
+            // Magenta
+            tg = Office2007ColorTableFactory.GetRibbonTabGroupBlackMagenta(factory);
+            tg.Name = Enum.GetName(typeof(eRibbonTabGroupColor), eRibbonTabGroupColor.Magenta);
+            table.RibbonTabGroupColors.Add(tg);
+
+            // Green
+            tg = Office2007ColorTableFactory.GetRibbonTabGroupBlackGreen(factory);
+            tg.Name = Enum.GetName(typeof(eRibbonTabGroupColor), eRibbonTabGroupColor.Green);
+            table.RibbonTabGroupColors.Add(tg);
+
+            // Orange
+            tg = Office2007ColorTableFactory.GetRibbonTabGroupBlackOrange(factory);
+            tg.Name = Enum.GetName(typeof(eRibbonTabGroupColor), eRibbonTabGroupColor.Orange);
+            table.RibbonTabGroupColors.Add(tg);
+            #endregion
+
+            #region Menu
+            table.Menu.Background = new LinearGradientColorTable(factory.GetColor(0xFAFAFA), Color.Empty);
+            table.Menu.Border = new LinearGradientColorTable(factory.GetColor(0x868686), Color.Empty);
+            table.Menu.Side = new LinearGradientColorTable(factory.GetColor(0xE9EEEE), Color.Empty);
+            table.Menu.SideBorder = new LinearGradientColorTable(factory.GetColor(0xC5C5C5), Color.Empty);
+            table.Menu.SideBorderLight = new LinearGradientColorTable(factory.GetColor(0xF5F5F5), Color.Empty);
+            table.Menu.SideUnused = new LinearGradientColorTable(factory.GetColor(0xE5E5E5), Color.Empty);
+
+            table.Menu.FileBackgroundBlend.Clear();
+            table.Menu.FileBackgroundBlend.AddRange(new DevComponents.DotNetBar.BackgroundColorBlend[] {
+                new DevComponents.DotNetBar.BackgroundColorBlend(factory.GetColor(0x515050), 0F),
+                new DevComponents.DotNetBar.BackgroundColorBlend(factory.GetColor(0x4E4E4F), 1F)});
+            table.Menu.FileContainerBorder = factory.GetColor(0x6B6C71);
+            table.Menu.FileContainerBorderLight = factory.GetColor(0x6B6C71);
+            table.Menu.FileColumnOneBackground = factory.GetColor(0xFAFAFA);
+            table.Menu.FileColumnOneBorder = factory.GetColor(0xC5C5C5);
+            table.Menu.FileColumnTwoBackground = factory.GetColor(0xE9EAEE);
+            table.Menu.FileBottomContainerBackgroundBlend.Clear();
+            table.Menu.FileBottomContainerBackgroundBlend.AddRange(new DevComponents.DotNetBar.BackgroundColorBlend[] {
+                new DevComponents.DotNetBar.BackgroundColorBlend(factory.GetColor(0x434652), 0F),
+                new DevComponents.DotNetBar.BackgroundColorBlend(factory.GetColor(0x3C404A), 0.4F),
+                new DevComponents.DotNetBar.BackgroundColorBlend(factory.GetColor(0x2F2F2F), 0.4F),
+                new DevComponents.DotNetBar.BackgroundColorBlend(factory.GetColor(0x404040), 1F)});
+            #endregion
+
+            #region ComboBox
+            table.ComboBox.Default.Background = factory.GetColor(0xE8E8E8);
+            int editBorderColor = 0x898989;
+            table.ComboBox.Default.Border = factory.GetColor(editBorderColor);
+            table.ComboBox.Default.ExpandBackground = new LinearGradientColorTable();
+            table.ComboBox.Default.ExpandBorderInner = new LinearGradientColorTable();
+            table.ComboBox.Default.ExpandBorderOuter = new LinearGradientColorTable();
+            table.ComboBox.Default.ExpandText = factory.GetColor(0x7C7C7C);
+
+            table.ComboBox.DefaultStandalone.Background = factory.GetColor(0xFFFFFF);
+            table.ComboBox.DefaultStandalone.Border = factory.GetColor(editBorderColor);
+            table.ComboBox.DefaultStandalone.ExpandBackground = new LinearGradientColorTable(factory.GetColor(0xECF0F5), factory.GetColor(0xDFE4EB), 90);
+            table.ComboBox.DefaultStandalone.ExpandBorderInner = new LinearGradientColorTable();
+            table.ComboBox.DefaultStandalone.ExpandBorderOuter = new LinearGradientColorTable(factory.GetColor(0xB7B7B7), Color.Empty, 90);
+            table.ComboBox.DefaultStandalone.ExpandText = factory.GetColor(0x000000);
+
+            table.ComboBox.MouseOver.Background = factory.GetColor(0xFFFFFF);
+            table.ComboBox.MouseOver.Border = factory.GetColor(editBorderColor);
+            table.ComboBox.MouseOver.ExpandBackground = new LinearGradientColorTable(factory.GetColor(0xFFFCE2), factory.GetColor(0xFFE7A5), 90);
+            table.ComboBox.MouseOver.ExpandBorderInner = new LinearGradientColorTable(factory.GetColor(0xFFFFFB), factory.GetColor(0xFFFCF3), 90);
+            table.ComboBox.MouseOver.ExpandBorderOuter = new LinearGradientColorTable(factory.GetColor(0xDBCE99), Color.Empty, 90);
+            table.ComboBox.MouseOver.ExpandText = factory.GetColor(0x000000);
+            table.ComboBox.DroppedDown.Background = factory.GetColor(0xFFFFFF);
+            table.ComboBox.DroppedDown.Border = factory.GetColor(editBorderColor);
+            table.ComboBox.DroppedDown.ExpandBackground = new LinearGradientColorTable(factory.GetColor(0xEAE0BF), factory.GetColor(0xFFD456), 90);
+            table.ComboBox.DroppedDown.ExpandBorderInner = new LinearGradientColorTable(factory.GetColor(0xF1EBD5), factory.GetColor(0xFFE694), 90);
+            table.ComboBox.DroppedDown.ExpandBorderOuter = new LinearGradientColorTable(factory.GetColor(0x9A8F63), Color.Empty, 90);
+            table.ComboBox.DroppedDown.ExpandText = factory.GetColor(0x000000);
+            #endregion
+
+            #region Dialog Launcher
+            table.DialogLauncher.Default.DialogLauncher = factory.GetColor(0x656870);
+            table.DialogLauncher.Default.DialogLauncherShade = factory.GetColor(0xEBEBEB);
+
+            table.DialogLauncher.MouseOver.DialogLauncher = factory.GetColor(0x656870);
+            table.DialogLauncher.MouseOver.DialogLauncherShade = factory.GetColor(0xEBEBEB);
+            table.DialogLauncher.MouseOver.TopBackground = new LinearGradientColorTable(factory.GetColor(0xFFFCDF), factory.GetColor(0xFFEFA7));
+            table.DialogLauncher.MouseOver.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xFFD975), factory.GetColor(0xFFE398));
+            table.DialogLauncher.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFFFFFB), factory.GetColor(0xFFFBF2));
+            table.DialogLauncher.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xDBCE99), Color.Empty);
+
+            table.DialogLauncher.Pressed.DialogLauncher = factory.GetColor(0x656870);
+            table.DialogLauncher.Pressed.DialogLauncherShade = factory.GetColor(0xEBEBEB);
+            table.DialogLauncher.Pressed.TopBackground = new LinearGradientColorTable(factory.GetColor(0xE8DEBD), factory.GetColor(0xEAC68D));
+            table.DialogLauncher.Pressed.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xFFA738), factory.GetColor(0xFFCC4E));
+            table.DialogLauncher.Pressed.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xF0EAD4), factory.GetColor(0xFFE391));
+            table.DialogLauncher.Pressed.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x9A8F63), factory.GetColor(0xB0A472));
+            #endregion
+
+            #region Legacy Color Scheme
+            InitializeBlackLegacyColors(table.LegacyColors, factory);
+            #endregion
+
+            #region System Button, Form
+
+            // Default state no background
+            table.SystemButton.Default = new Office2007SystemButtonStateColorTable();
+            table.SystemButton.Default.Foreground = new LinearGradientColorTable(factory.GetColor(0x848C95), factory.GetColor(0x9FA9B7));
+            table.SystemButton.Default.LightShade = factory.GetColor(0x9FA9B7);
+            table.SystemButton.Default.DarkShade = factory.GetColor(0x818080);
+
+            // Mouse over state
+            table.SystemButton.MouseOver = new Office2007SystemButtonStateColorTable();
+            table.SystemButton.MouseOver.Foreground = new LinearGradientColorTable(factory.GetColor(0x363535), factory.GetColor(0x4F5763));
+            table.SystemButton.MouseOver.LightShade = factory.GetColor(0x9BA1A8);
+            table.SystemButton.MouseOver.DarkShade = factory.GetColor(0x454C56);
+            table.SystemButton.MouseOver.TopBackground = new LinearGradientColorTable(factory.GetColor(0xB1B8C1), factory.GetColor(0x8894A1));
+            table.SystemButton.MouseOver.BottomBackground = new LinearGradientColorTable(factory.GetColor(0x687585), factory.GetColor(0x9DB1C1));
+            table.SystemButton.MouseOver.TopHighlight = new LinearGradientColorTable(factory.GetColor(0xCDD3DA), Color.Transparent);
+            table.SystemButton.MouseOver.BottomHighlight = new LinearGradientColorTable(factory.GetColor(0xB5DDF4), Color.Transparent);
+            table.SystemButton.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x57606D), factory.GetColor(0x5C6269));
+            table.SystemButton.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xCDD3DA), factory.GetColor(0xDADFE3));
+
+            // Pressed
+            table.SystemButton.Pressed = new Office2007SystemButtonStateColorTable();
+            table.SystemButton.Pressed.Foreground = new LinearGradientColorTable(factory.GetColor(0x6D6C6C), factory.GetColor(0x8B96A4));
+            table.SystemButton.Pressed.LightShade = factory.GetColor(0x7F8894);
+            table.SystemButton.Pressed.DarkShade = factory.GetColor(0x6D6C6C);
+            table.SystemButton.Pressed.TopBackground = new LinearGradientColorTable(factory.GetColor(0x373737), factory.GetColor(0x2B2B2B));
+            table.SystemButton.Pressed.TopHighlight = new LinearGradientColorTable(factory.GetColor(0x686868), Color.Transparent);
+            table.SystemButton.Pressed.BottomBackground = new LinearGradientColorTable(factory.GetColor(0x000000), factory.GetColor(0x07090B));
+            table.SystemButton.Pressed.BottomHighlight = new LinearGradientColorTable(factory.GetColor(0x516982), Color.Transparent);
+            table.SystemButton.Pressed.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x222429), factory.GetColor(0x191919));
+            table.SystemButton.Pressed.InnerBorder = new LinearGradientColorTable(factory.GetColor(0x464646), factory.GetColor(0x333333));
+
+            // Form border
+            table.Form.Active.BorderColors = new Color[] {
+                factory.GetColor(0x2F2F2F),
+                factory.GetColor(0x4D4D4D),
+                factory.GetColor(0x535353),
+                factory.GetColor(0x535353),
+                factory.GetColor(0x535353)};
+            table.Form.Inactive.BorderColors = new Color[] {
+                factory.GetColor(0x929292),
+                factory.GetColor(0x9F9F9F),
+                factory.GetColor(0xABABAB),
+                factory.GetColor(0x535353),
+                factory.GetColor(0x535353)};
+
+
+            // Form Caption Active
+            table.Form.Active.CaptionTopBackground = new LinearGradientColorTable(factory.GetColor(0x434752), factory.GetColor(0x3A3D45));
+            table.Form.Active.CaptionBottomBackground = new LinearGradientColorTable(factory.GetColor(0x2F3030), factory.GetColor(0x3E3E3E));
+            table.Form.Active.CaptionBottomBorder = new Color[] { factory.GetColor(0x484848), factory.GetColor(0x4A4A4A) };
+            table.Form.Active.CaptionText = factory.GetColor(0xAED1FF);
+            table.Form.Active.CaptionTextExtra = factory.GetColor(0xFFFFFF);
+
+            // Form Caption Inactive
+            table.Form.Inactive.CaptionTopBackground = new LinearGradientColorTable(factory.GetColor(0x9A9CA1), factory.GetColor(0x97989C));
+            table.Form.Inactive.CaptionBottomBackground = new LinearGradientColorTable(factory.GetColor(0x929292), factory.GetColor(0x9A9A9A));
+            table.Form.Inactive.CaptionText = factory.GetColor(0xE1E1E1);
+            table.Form.Inactive.CaptionTextExtra = factory.GetColor(0xE1E1E1);
+
+            table.Form.BackColor = factory.GetColor(0x7D7D7D);
+            table.Form.TextColor = factory.GetColor(0xFFFFFF);
+            #endregion
+
+            #region Quick Access Toolbar Background
+            table.QuickAccessToolbar.Active.TopBackground = new LinearGradientColorTable(factory.GetColor(0x7B7E84), factory.GetColor(0x797B80));
+            table.QuickAccessToolbar.Active.BottomBackground = new LinearGradientColorTable(factory.GetColor(0x6D6E6E), factory.GetColor(0x444444));
+            table.QuickAccessToolbar.Active.OutterBorderColor = factory.GetColor(0x474747);
+            table.QuickAccessToolbar.Active.MiddleBorderColor = factory.GetColor(0x353535);
+            table.QuickAccessToolbar.Active.InnerBorderColor = Color.Empty;
+
+            table.QuickAccessToolbar.Inactive.TopBackground = new LinearGradientColorTable(factory.GetColor(0xA7A7AA), factory.GetColor(0xB3B3B6));
+            table.QuickAccessToolbar.Inactive.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xADADAD), factory.GetColor(0x959595));
+            table.QuickAccessToolbar.Inactive.OutterBorderColor = factory.GetColor(0xA9A9A9);
+            table.QuickAccessToolbar.Inactive.MiddleBorderColor = factory.GetColor(0x5D5D5D);
+            table.QuickAccessToolbar.Inactive.InnerBorderColor = Color.Empty;
+
+            table.QuickAccessToolbar.Standalone.TopBackground = new LinearGradientColorTable();
+            table.QuickAccessToolbar.Standalone.BottomBackground = new LinearGradientColorTable(factory.GetColor(0x8D9093), factory.GetColor(0x858789));
+            table.QuickAccessToolbar.Standalone.OutterBorderColor = factory.GetColor(0x5D6064);
+            table.QuickAccessToolbar.Standalone.MiddleBorderColor = Color.Empty;
+            table.QuickAccessToolbar.Standalone.InnerBorderColor = factory.GetColor(0xCBCCCE);
+
+            table.QuickAccessToolbar.QatCustomizeMenuLabelBackground = factory.GetColor(0xEBEBEB);
+            table.QuickAccessToolbar.QatCustomizeMenuLabelText = factory.GetColor(0x464646);
+
+            table.QuickAccessToolbar.Active.GlassBorder = new LinearGradientColorTable(factory.GetColor(Color.FromArgb(132, Color.Black)), Color.FromArgb(80, Color.Black));
+            table.QuickAccessToolbar.Inactive.GlassBorder = new LinearGradientColorTable(factory.GetColor(Color.FromArgb(132, Color.Black)), Color.FromArgb(80, Color.Black));
+            #endregion
+
+            #region Tab Colors
+            table.TabControl.Default = new Office2007TabItemStateColorTable();
+            table.TabControl.Default.TopBackground = new LinearGradientColorTable(factory.GetColor(0xD8DCE2), factory.GetColor(0xB4BDC7));
+            table.TabControl.Default.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xD4D9DF), factory.GetColor(0xEBEBEB));
+            table.TabControl.Default.InnerBorder = factory.GetColor(0xEBEBEB);
+            table.TabControl.Default.OuterBorder = factory.GetColor(0x464646);
+            table.TabControl.Default.Text = factory.GetColor(0x303030);
+
+            table.TabControl.MouseOver = new Office2007TabItemStateColorTable();
+            table.TabControl.MouseOver.TopBackground = new LinearGradientColorTable(factory.GetColor(0xFFFDEB), factory.GetColor(0xFFECA8));
+            table.TabControl.MouseOver.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xFFDA59), factory.GetColor(0xFFE68D));
+            table.TabControl.MouseOver.InnerBorder = factory.GetColor(0xFFFFFB);
+            table.TabControl.MouseOver.OuterBorder = factory.GetColor(0xB69D73);
+            table.TabControl.MouseOver.Text = factory.GetColor(0x363636);
+
+            table.TabControl.Selected = new Office2007TabItemStateColorTable();
+            //t.TabControl.Selected.TopBackground = new LinearGradientColorTable(factory.GetColor(0xFFD29B), factory.GetColor(0xFFBB6E));
+            //t.TabControl.Selected.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xFFAF44), factory.GetColor(0xFEDC75));
+            //t.TabControl.Selected.InnerBorder = factory.GetColor(0xCDB69C);
+            //t.TabControl.Selected.OuterBorder = factory.GetColor(0x95774A);
+            table.TabControl.Selected.TopBackground = new LinearGradientColorTable(factory.GetColor(Color.White), factory.GetColor(0xF7F7F7));
+            table.TabControl.Selected.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xF7F7F7), factory.GetColor(0xF7F7F7));
+            table.TabControl.Selected.InnerBorder = factory.GetColor(Color.White);
+            table.TabControl.Selected.OuterBorder = factory.GetColor(0x464646);
+            table.TabControl.Selected.Text = factory.GetColor(0x272727);
+
+            table.TabControl.TabBackground = new LinearGradientColorTable(factory.GetColor(0xFDFDFD), factory.GetColor(0xC3C3C3));
+            table.TabControl.TabPanelBackground = new LinearGradientColorTable(factory.GetColor(0xF7F7F7), factory.GetColor(0xC3C3C3));
+            table.TabControl.TabPanelBorder = factory.GetColor(0x464646);
+            #endregion
+
+            #region CheckBoxItem
+            Office2007CheckBoxColorTable chk = table.CheckBoxItem;
+            chk.Default.CheckBackground = new LinearGradientColorTable(factory.GetColor(0xF4F4F4), Color.Empty);
+            chk.Default.CheckBorder = factory.GetColor(0x848484);
+            chk.Default.CheckInnerBackground = new LinearGradientColorTable(Color.FromArgb(192, factory.GetColor(0xA2ACB9)), Color.FromArgb(164, factory.GetColor(0xF6F6F6)));
+            chk.Default.CheckInnerBorder = factory.GetColor(0xA2ACB9);
+            chk.Default.CheckSign = new LinearGradientColorTable(factory.GetColor(0x4F687D), Color.Empty);
+            chk.Default.Text = factory.GetColor(0x000000);
+
+            chk.MouseOver.CheckBackground = new LinearGradientColorTable(factory.GetColor(0xF4F4F4), Color.Empty);
+            chk.MouseOver.CheckBorder = factory.GetColor(0x848484);
+            chk.MouseOver.CheckInnerBackground = new LinearGradientColorTable(Color.FromArgb(192, factory.GetColor(0xFAD57A)), Color.FromArgb(128, factory.GetColor(0xFEF8E7)));
+            chk.MouseOver.CheckInnerBorder = factory.GetColor(0xFAD57A);
+            chk.MouseOver.CheckSign = new LinearGradientColorTable(factory.GetColor(0x4F687D), Color.Empty);
+            chk.MouseOver.Text = factory.GetColor(0x000000);
+
+            chk.Pressed.CheckBackground = new LinearGradientColorTable(factory.GetColor(0xE5ECF7), Color.Empty);
+            chk.Pressed.CheckBorder = factory.GetColor(0x848484);
+            chk.Pressed.CheckInnerBackground = new LinearGradientColorTable(Color.FromArgb(192, factory.GetColor(0xF28926)), Color.FromArgb(164, factory.GetColor(0xFFF4D5)));
+            chk.Pressed.CheckInnerBorder = factory.GetColor(0xF28926);
+            chk.Pressed.CheckSign = new LinearGradientColorTable(factory.GetColor(0x4F687D), Color.Empty);
+            chk.Pressed.Text = factory.GetColor(0x000000);
+
+            chk.Disabled.CheckBackground = new LinearGradientColorTable(factory.GetColor(0xFFFFFF), Color.Empty);
+            chk.Disabled.CheckBorder = factory.GetColor(0xAEB1B5);
+            chk.Disabled.CheckInnerBackground = new LinearGradientColorTable(Color.FromArgb(192, factory.GetColor(0xE0E2E5)), Color.FromArgb(164, factory.GetColor(0xFBFBFB)));
+            chk.Disabled.CheckInnerBorder = factory.GetColor(0xE0E2E5);
+            chk.Disabled.CheckSign = new LinearGradientColorTable(factory.GetColor(0x8D8D8D), Color.Empty);
+            chk.Disabled.Text = factory.GetColor(0x8D8D8D);
+            #endregion
+
+            #region Scroll Bar
+            InitializeScrollBarColorTable(table, factory);
+            InitializeAppBlackScrollBarColorTable(table, factory);
+            #endregion
+
+            #region ProgressBarItem
+            Office2007ProgressBarColorTable pct = table.ProgressBarItem;
+            pct.BackgroundColors = new GradientColorTable(0x87898B, 0x979897);
+            pct.OuterBorder = factory.GetColor(0xCCCCCC);
+            pct.InnerBorder = factory.GetColor(0x252525);
+            pct.Chunk = new GradientColorTable(0x679720, 0xC2FF56, 0);
+            pct.ChunkOverlay = new GradientColorTable();
+            pct.ChunkOverlay.LinearGradientAngle = 90;
+            pct.ChunkOverlay.Colors.AddRange(new BackgroundColorBlend[] {
+                new BackgroundColorBlend(Color.FromArgb(164, factory.GetColor(0xEEFFD7)), 0f),
+                new BackgroundColorBlend(Color.FromArgb(128, factory.GetColor(0x8DB254)), .5f),
+                new BackgroundColorBlend(Color.FromArgb(64, factory.GetColor(0x69922B)), .5f),
+                new BackgroundColorBlend(Color.Transparent, 1f),
+            });
+            pct.ChunkShadow = new GradientColorTable(0x858585, 0x909190, 0);
+
+            // Paused
+            pct = table.ProgressBarItemPaused;
+            pct.BackgroundColors = new GradientColorTable(0x87898B, 0x979897);
+            pct.OuterBorder = factory.GetColor(0xCCCCCC);
+            pct.InnerBorder = factory.GetColor(0x252525);
+            pct.Chunk = new GradientColorTable(0xAEA700, 0xFFFDCD, 0);
+            pct.ChunkOverlay = new GradientColorTable();
+            pct.ChunkOverlay.LinearGradientAngle = 90;
+            pct.ChunkOverlay.Colors.AddRange(new BackgroundColorBlend[] {
+                new BackgroundColorBlend(Color.FromArgb(192, factory.GetColor(0xFFFBA3)), 0f),
+                new BackgroundColorBlend(Color.FromArgb(128, factory.GetColor(0xD2CA00)), .5f),
+                new BackgroundColorBlend(Color.FromArgb(64, factory.GetColor(0xFEF400)), .5f),
+                new BackgroundColorBlend(Color.Transparent, 1f),
+            });
+            pct.ChunkShadow = new GradientColorTable(0x858585, 0x909190, 0);
+
+            // Error
+            pct = table.ProgressBarItemError;
+            pct.BackgroundColors = new GradientColorTable(0x87898B, 0x979897);
+            pct.OuterBorder = factory.GetColor(0xCCCCCC);
+            pct.InnerBorder = factory.GetColor(0x252525);
+            pct.Chunk = new GradientColorTable(0xD20000, 0xFFCDCD, 0);
+            pct.ChunkOverlay = new GradientColorTable();
+            pct.ChunkOverlay.LinearGradientAngle = 90;
+            pct.ChunkOverlay.Colors.AddRange(new BackgroundColorBlend[] {
+                new BackgroundColorBlend(Color.FromArgb(192, factory.GetColor(0xFF8F8F)), 0f),
+                new BackgroundColorBlend(Color.FromArgb(128, factory.GetColor(0xD20000)), .5f),
+                new BackgroundColorBlend(Color.FromArgb(64, factory.GetColor(0xFE0000)), .5f),
+                new BackgroundColorBlend(Color.Transparent, 1f),
+            });
+            pct.ChunkShadow = new GradientColorTable(0x858585, 0x909190, 0);
+            #endregion
+
+            #region Gallery
+            Office2007GalleryColorTable gallery = table.Gallery;
+            gallery.GroupLabelBackground = factory.GetColor(0xEBEBEB);
+            gallery.GroupLabelText = factory.GetColor(0x000000);
+            gallery.GroupLabelBorder = factory.GetColor(0xC5C5C5);
+            #endregion
+
+            #region ListViewEx
+            table.ListViewEx.Border = factory.GetColor(editBorderColor);
+            table.ListViewEx.ColumnBackground = new LinearGradientColorTable(factory.GetColor(0xFFFFFF), factory.GetColor(0xD4D7DB));
+            table.ListViewEx.ColumnSeparator = factory.GetColor(0x9199A4);
+            table.ListViewEx.ColumnForeColor = factory.GetColor(0x000000);
+            table.ListViewEx.SelectionBackground = new LinearGradientColorTable(factory.GetColor(0xA7CDF0), Color.Empty);
+            table.ListViewEx.SelectionBorder = factory.GetColor(0xE3EFFF);
+            #endregion
+
+            #region Navigation Pane
+            table.NavigationPane.ButtonBackground = new GradientColorTable();
+            table.NavigationPane.ButtonBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xF8F8F9), 0));
+            table.NavigationPane.ButtonBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xDFE2E4), .4f));
+            table.NavigationPane.ButtonBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xC7CBD1), .4f));
+            table.NavigationPane.ButtonBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xDBDEE2), 1));
+            #endregion
+
+            #region SuperTooltip
+            table.SuperTooltip.BackgroundColors = new LinearGradientColorTable(factory.GetColor(0xFFFFFF), factory.GetColor(0xE4E4F0));
+            table.SuperTooltip.TextColor = factory.GetColor(0x4C4C4C);
+            #endregion
+
+            #region Slider
+            Office2007SliderColorTable sl = table.Slider;
+            sl.Default.LabelColor = factory.GetColor(0xFFFFFF);
+            sl.Default.SliderLabelColor = factory.GetColor(0x000000);
+            sl.Default.PartBackground = new GradientColorTable();
+            sl.Default.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFFFFFF), 0));
+            sl.Default.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xEFEFEF), .15f));
+            sl.Default.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xBEC2C3), .5f));
+            sl.Default.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0x6C7178), .5f));
+            sl.Default.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xDCDCDE), .85f));
+            sl.Default.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFFFFFF), 1f));
+            sl.Default.PartBorderColor = factory.GetColor(0x393F46);
+            sl.Default.PartBorderLightColor = Color.FromArgb(28, factory.GetColor(0xFFFFFF));
+            sl.Default.PartForeColor = factory.GetColor(0x5B636C);
+            sl.Default.PartForeLightColor = Color.FromArgb(168, factory.GetColor(0xEAEAEA));
+            sl.Default.TrackLineColor = factory.GetColor(0x252525);
+            sl.Default.TrackLineLightColor = factory.GetColor(0xCCCCCC);
+
+            sl.MouseOver.LabelColor = factory.GetColor(0xFFFFFF);
+            sl.MouseOver.SliderLabelColor = factory.GetColor(0x000000);
+            sl.MouseOver.PartBackground = new GradientColorTable();
+            sl.MouseOver.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFFFFFF), 0));
+            sl.MouseOver.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFFFFFE), .2f));
+            sl.MouseOver.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xF4DB93), .5f));
+            sl.MouseOver.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xEEBA27), .5f));
+            sl.MouseOver.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFCEEBF), .85f));
+            sl.MouseOver.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFAF0D2), 1f));
+            sl.MouseOver.PartBorderColor = factory.GetColor(0x2D2D2D);
+            sl.MouseOver.PartBorderLightColor = Color.FromArgb(28, factory.GetColor(0xFFFFFF));
+            sl.MouseOver.PartForeColor = factory.GetColor(0x676249);
+            sl.MouseOver.PartForeLightColor = Color.FromArgb(168, factory.GetColor(0xFFF4D4));
+            sl.MouseOver.TrackLineColor = factory.GetColor(0x252525);
+            sl.MouseOver.TrackLineLightColor = factory.GetColor(0xCCCCCC);
+
+            sl.Pressed.LabelColor = factory.GetColor(0xFFFFFF);
+            sl.Pressed.SliderLabelColor = factory.GetColor(0x000000);
+            sl.Pressed.PartBackground = new GradientColorTable();
+            sl.Pressed.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xE68C3A), 0));
+            sl.Pressed.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xF2A253), .2f));
+            sl.Pressed.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xF9C18B), .5f));
+            sl.Pressed.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xF38317), .5f));
+            sl.Pressed.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xF8BD86), .85f));
+            sl.Pressed.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xF3D2B4), 1f));
+            sl.Pressed.PartBorderColor = factory.GetColor(0x2D2D2D);
+            sl.Pressed.PartBorderLightColor = Color.FromArgb(28, factory.GetColor(0xFFFFFF));
+            sl.Pressed.PartForeColor = factory.GetColor(0x675343);
+            sl.Pressed.PartForeLightColor = Color.FromArgb(168, factory.GetColor(0xFFDCBB));
+            sl.Pressed.TrackLineColor = factory.GetColor(0x252525);
+            sl.Pressed.TrackLineLightColor = factory.GetColor(0xCCCCCC);
+
+            ColorBlendFactory df = new ColorBlendFactory(ColorScheme.GetColor(0xCFCFCF));
+            sl.Disabled.LabelColor = factory.GetColor(0x8D8D8D);
+            sl.Disabled.SliderLabelColor = factory.GetColor(0x8D8D8D);
+            sl.Disabled.PartBackground = new GradientColorTable();
+            foreach (BackgroundColorBlend b in sl.Default.PartBackground.Colors)
+                sl.Disabled.PartBackground.Colors.Add(new BackgroundColorBlend(df.GetColor(b.Color), b.Position));
+            sl.Disabled.PartBorderColor = df.GetColor(sl.Default.PartBorderColor);
+            sl.Disabled.PartBorderLightColor = df.GetColor(sl.Default.PartBorderLightColor);
+            sl.Disabled.PartForeColor = df.GetColor(sl.Default.PartForeColor);
+            sl.Disabled.PartForeLightColor = df.GetColor(sl.Default.PartForeLightColor);
+            sl.Disabled.TrackLineColor = df.GetColor(sl.Default.TrackLineColor);
+            sl.Disabled.TrackLineLightColor = df.GetColor(sl.Default.TrackLineLightColor);
+            #endregion
+
+            #region RangeSlider
+            Office2007ColorTable.InitRangeSlider(table, factory);
+            #endregion
+
+            #region DataGridView
+            table.DataGridView.ColumnHeaderNormalBorder = factory.GetColor(0xB6B6B6);
+            table.DataGridView.ColumnHeaderNormalBackground = new LinearGradientColorTable(factory.GetColor(0xF8F8F8), factory.GetColor(0xDEDEDE), 90);
+            table.DataGridView.ColumnHeaderSelectedBackground = new LinearGradientColorTable(factory.GetColor(0xF9D99F), factory.GetColor(0xF1C15F), 90);
+            table.DataGridView.ColumnHeaderSelectedBorder = factory.GetColor(0xF29536);
+            table.DataGridView.ColumnHeaderSelectedMouseOverBackground = new LinearGradientColorTable(factory.GetColor(0xFFD58D), factory.GetColor(0xF2923A), 90);
+            table.DataGridView.ColumnHeaderSelectedMouseOverBorder = factory.GetColor(0xF29536);
+            table.DataGridView.ColumnHeaderMouseOverBackground = new LinearGradientColorTable(factory.GetColor(0xE0E0E0), factory.GetColor(0xC3C3C3), 90);
+            table.DataGridView.ColumnHeaderMouseOverBorder = factory.GetColor(0xB6B6B6);
+            table.DataGridView.ColumnHeaderPressedBackground = new LinearGradientColorTable(factory.GetColor(0xE0E0E0), factory.GetColor(0xC3C3C3), 90);
+            table.DataGridView.ColumnHeaderPressedBorder = factory.GetColor(0xFFFFFF);
+
+            table.DataGridView.RowNormalBackground = new LinearGradientColorTable(factory.GetColor(0xEDEDED));
+            table.DataGridView.RowNormalBorder = factory.GetColor(0xB6B6B6);
+            table.DataGridView.RowSelectedBackground = new LinearGradientColorTable(factory.GetColor(0xFFD58D));
+            table.DataGridView.RowSelectedBorder = factory.GetColor(0xF29536);
+            table.DataGridView.RowSelectedMouseOverBackground = new LinearGradientColorTable(factory.GetColor(0xF1C05C));
+            table.DataGridView.RowSelectedMouseOverBorder = factory.GetColor(0xF29536);
+            table.DataGridView.RowMouseOverBackground = new LinearGradientColorTable(factory.GetColor(0xF1C05C));
+            table.DataGridView.RowMouseOverBorder = factory.GetColor(0xB6B6B6);
+            table.DataGridView.RowPressedBackground = new LinearGradientColorTable(factory.GetColor(0xF1C05C));
+            table.DataGridView.RowPressedBorder = factory.GetColor(0xFFFFFF);
+
+            table.DataGridView.GridColor = factory.GetColor(0xD0D7E5);
+
+            table.DataGridView.SelectorBackground = new LinearGradientColorTable(factory.GetColor(0xC9C9C9));
+            table.DataGridView.SelectorBorder = factory.GetColor(0xB6B6B6);
+            table.DataGridView.SelectorBorderDark = factory.GetColor(0xCCCCCC);
+            table.DataGridView.SelectorBorderLight = factory.GetColor(0xEBEBEB);
+            table.DataGridView.SelectorSign = new LinearGradientColorTable(factory.GetColor(0x7D7D7D), factory.GetColor(0x676767));
+
+            table.DataGridView.SelectorMouseOverBackground = new LinearGradientColorTable(factory.GetColor(0xADADAD), factory.GetColor(0x9F9F9F));
+            table.DataGridView.SelectorMouseOverBorder = factory.GetColor(0xB6B6B6);
+            table.DataGridView.SelectorMouseOverBorderDark = factory.GetColor(0xCCCCCC);
+            table.DataGridView.SelectorMouseOverBorderLight = factory.GetColor(0xEBEBEB);
+            table.DataGridView.SelectorMouseOverSign = new LinearGradientColorTable(factory.GetColor(0x7D7D7D), factory.GetColor(0x676767));
+            #endregion
+
+            #region AdvTree
+#if !NOTREE
+            table.AdvTree = new DevComponents.AdvTree.Display.TreeColorTable();
+            DevComponents.AdvTree.Display.ColorTableInitializer.InitOffice2007Black(table.AdvTree, factory);
+#endif
+            #endregion
+
+            #region CrumbBar
+            table.CrumbBarItemView = new CrumbBarItemViewColorTable();
+            CrumbBarItemViewStateColorTable crumbBarViewTable = new CrumbBarItemViewStateColorTable();
+            table.CrumbBarItemView.Default = crumbBarViewTable;
+            crumbBarViewTable.Foreground = factory.GetColor(0x000000);
+            crumbBarViewTable = new CrumbBarItemViewStateColorTable();
+            table.CrumbBarItemView.MouseOver = crumbBarViewTable;
+            crumbBarViewTable.Foreground = factory.GetColor(0x000000);
+            crumbBarViewTable.Background = new BackgroundColorBlendCollection();
+            crumbBarViewTable.Background.AddRange(new BackgroundColorBlend[]{
+                new BackgroundColorBlend(factory.GetColor("FFFFFCD9"), 0f),
+                new BackgroundColorBlend(factory.GetColor("FFFFE78F"), .4f),
+                new BackgroundColorBlend(factory.GetColor("FFFFD74A"), .4f),
+                new BackgroundColorBlend(factory.GetColor("FFFFE794"), 1f)});
+            crumbBarViewTable.Border = factory.GetColor("FFDDCF9B");
+            crumbBarViewTable.BorderLight = factory.GetColor("80FFFFFF");
+            crumbBarViewTable = new CrumbBarItemViewStateColorTable();
+            table.CrumbBarItemView.MouseOverInactive = crumbBarViewTable;
+            crumbBarViewTable.Foreground = factory.GetColor(0x000000);
+            crumbBarViewTable.Background = new BackgroundColorBlendCollection();
+            crumbBarViewTable.Background.AddRange(new BackgroundColorBlend[]{
+                new BackgroundColorBlend(factory.GetColor("FFFFFDEC"), 0f),
+                new BackgroundColorBlend(factory.GetColor("FFFFF4CA"), .4f),
+                new BackgroundColorBlend(factory.GetColor("FFFFEBA6"), .4f),
+                new BackgroundColorBlend(factory.GetColor("FFFFF2C5"), 1f)});
+            crumbBarViewTable.Border = factory.GetColor("FF8E8F8F");
+            crumbBarViewTable.BorderLight = factory.GetColor("90FFFFFF");
+            crumbBarViewTable = new CrumbBarItemViewStateColorTable();
+            table.CrumbBarItemView.Pressed = crumbBarViewTable;
+            crumbBarViewTable.Foreground = factory.GetColor(0x000000);
+            crumbBarViewTable.Background = new BackgroundColorBlendCollection();
+            crumbBarViewTable.Background.AddRange(new BackgroundColorBlend[]{
+                new BackgroundColorBlend(factory.GetColor("FFC89861"), 0f),
+                new BackgroundColorBlend(factory.GetColor("FFEDAE68"), .1f),
+                new BackgroundColorBlend(factory.GetColor("FFFCA160"), .6f),
+                new BackgroundColorBlend(factory.GetColor("FFFC8F3D"), .6f),
+                new BackgroundColorBlend(factory.GetColor("FFFEBD61"), 1f)});
+            crumbBarViewTable.Border = factory.GetColor("FF8B7654");
+            crumbBarViewTable.BorderLight = factory.GetColor("408B7654");
+
+            #endregion
+
+            #region ElementStyle Classes
+            table.StyleClasses.Clear();
+            ElementStyle style = new ElementStyle();
+            style.Class = ElementStyleClassKeys.RibbonGalleryContainerKey;
+            style.BorderColor = factory.GetColor(0xACACAC);
+            style.Border = eStyleBorderType.Solid;
+            style.BorderWidth = 1;
+            style.CornerDiameter = 2;
+            style.CornerType = eCornerType.Rounded;
+            style.BackColor = factory.GetColor(0xDAE2E2);
+            table.StyleClasses.Add(style.Class, style);
+            // FileMenuContainer
+            style = Office2007ColorTableFactory.GetFileMenuContainerStyle(table);
+            table.StyleClasses.Add(style.Class, style);
+            // Two Column File Menu Container
+            style = Office2007ColorTableFactory.GetTwoColumnMenuContainerStyle(table);
+            table.StyleClasses.Add(style.Class, style);
+            // Column one File Menu Container
+            style = Office2007ColorTableFactory.GetMenuColumnOneContainerStyle(table);
+            table.StyleClasses.Add(style.Class, style);
+            // Column two File Menu Container
+            style = Office2007ColorTableFactory.GetMenuColumnTwoContainerStyle(table);
+            table.StyleClasses.Add(style.Class, style);
+            // Bottom File Menu Container
+            style = Office2007ColorTableFactory.GetMenuBottomContainer(table);
+            table.StyleClasses.Add(style.Class, style);
+            // TextBox border
+            style = Office2007ColorTableFactory.GetTextBoxStyle(factory.GetColor(editBorderColor));
+            table.StyleClasses.Add(style.Class, style);
+            // RichTextBox border
+            style = Office2007ColorTableFactory.GetRichTextBoxStyle(factory.GetColor(editBorderColor));
+            table.StyleClasses.Add(style.Class, style);
+            // ItemPanel
+            style = Office2007ColorTableFactory.GetItemPanelStyle(factory.GetColor(editBorderColor));
+            table.StyleClasses.Add(style.Class, style);
+            // ListBoxAdv
+            style = Office2007ColorTableFactory.GetListBoxAdvStyle(factory.GetColor(editBorderColor));
+            table.StyleClasses.Add(style.Class, style);
+            // DateTimeInput background
+            style = Office2007ColorTableFactory.GetDateTimeInputBackgroundStyle(factory.GetColor(editBorderColor), SystemColors.Window);
+            table.StyleClasses.Add(style.Class, style);
+            // Ribbon Client Panel
+            style = Office2007ColorTableFactory.GetRibbonClientPanelStyle(factory, eOffice2007ColorScheme.Black);
+            table.StyleClasses.Add(style.Class, style);
+            // ListView Border
+            style = Office2007ColorTableFactory.GetListViewBorderStyle(table.ListViewEx);
+            table.StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetStatusBarAltStyle(table.Bar);
+            table.StyleClasses.Add(style.Class, style);
+
+#if !NOTREE
+            // Tree Border/Background
+            style = Office2007ColorTableFactory.GetAdvTreeStyle(factory.GetColor(editBorderColor), Color.Empty);
+            table.StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetAdvTreeColumnsHeaderStyle(factory.GetColor(0xF8F8F8), factory.GetColor(0xDEDEDE), factory.GetColor(0xB6B6B6));
+            table.StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetAdvTreeNodesColumnsHeaderStyle(factory.GetColor(0xF8F8F8), factory.GetColor(0xDEDEDE), factory.GetColor(0xB6B6B6));
+            table.StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetAdvTreeColumnStyle(factory.GetColor(0x000000));
+            table.StyleClasses.Add(style.Class, style);
+#endif
+            // CrumbBar
+            style = Office2007ColorTableFactory.GetCrumbBarBackgroundStyle(factory.GetColor(Color.White), factory.GetColor("FF333333"), factory.GetColor("FF252525"));
+            table.StyleClasses.Add(style.Class, style);
+            // DataGridView border
+            style = Office2007ColorTableFactory.GetDataGridViewStyle();
+            table.StyleClasses.Add(style.Class, style);
+            // DataGridViewDateTime border
+            style = Office2007ColorTableFactory.GetDataGridViewDateTimeStyle();
+            table.StyleClasses.Add(style.Class, style);
+            // DataGridViewNumeric border
+            style = Office2007ColorTableFactory.GetDataGridViewNumericStyle();
+            table.StyleClasses.Add(style.Class, style);
+            // DataGridViewIpAddress border
+            style = Office2007ColorTableFactory.GetDataGridViewIpAddressStyle();
+            table.StyleClasses.Add(style.Class, style);
+
+            // Slide-out Button
+            style = Office2007ColorTableFactory.GetSlideOutButtonStyle(table.CheckBoxItem.Default.CheckBorder);
+            table.StyleClasses.Add(style.Class, style);
+
+            // MetroTilePanel
+            style = Office2007ColorTableFactory.GetMetroTilePanelStyle(factory.GetColor(Color.White));
+            table.StyleClasses.Add(style.Class, style);
+            // MetroTileGroup
+            style = Office2007ColorTableFactory.GetMetroTileGroupStyle(factory.GetColor(Color.DarkGray));
+            table.StyleClasses.Add(style.Class, style);
+
+            // MonthCalendarAdv
+            style = Office2007ColorTableFactory.GetMonthCalendarStyle(SystemColors.Window);
+            table.StyleClasses.Add(style.Class, style);
+
+            // ProgressSteps control
+            style = Office2007ColorTableFactory.GetProgressStepsStyle(table);
+            table.StyleClasses.Add(style.Class, style);
+
+            // SideNavStrip
+            style = Office2007ColorTableFactory.GetSideNavStripStyle(factory.GetColor(0x535353));
+            table.StyleClasses.Add(style.Class, style);
+
+            // TabFormPanel
+            style = Office2007ColorTableFactory.GetTabFormPanelStyle(factory.GetColor(0xF5F6F7));
+            table.StyleClasses.Add(style.Class, style);
+
+            // Toolbox Control
+            style = Office2007ColorTableFactory.GetToolboxControlStyle(factory.GetColor(table.LegacyColors.PanelBorder), Color.Empty);
+            table.StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetToolboxGroupTitle(factory.GetColor(0x000000));
+            table.StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetToolboxGroupTitleMouseOver(factory.GetColor(0x000000), factory.GetColor(0xDDCF9B));
+            table.StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetToolboxGroupExpandedTitle(factory.GetColor(0x000000), factory.GetColor(0xB6B8B8));
+            table.StyleClasses.Add(style.Class, style);            
+            #endregion
+
+            #region SideBar
+            table.SideBar.Background = new LinearGradientColorTable(factory.GetColor(Color.White));
+            table.SideBar.Border = factory.GetColor(0xA7ADB6);
+            table.SideBar.SideBarPanelItemText = factory.GetColor(Color.Black);
+            table.SideBar.SideBarPanelItemDefault = new GradientColorTable();
+            table.SideBar.SideBarPanelItemDefault.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xF8F8F9), 0));
+            table.SideBar.SideBarPanelItemDefault.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xDFE2E4), .4f));
+            table.SideBar.SideBarPanelItemDefault.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xC7CBD1), .4f));
+            table.SideBar.SideBarPanelItemDefault.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xDBDEE2), 1));
+            // Expanded
+            table.SideBar.SideBarPanelItemExpanded = new GradientColorTable();
+            table.SideBar.SideBarPanelItemExpanded.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFBDBB5), 0));
+            table.SideBar.SideBarPanelItemExpanded.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFEC778), .4f));
+            table.SideBar.SideBarPanelItemExpanded.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFEB456), .4f));
+            table.SideBar.SideBarPanelItemExpanded.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFDEB9F), 1));
+            // MouseOver
+            table.SideBar.SideBarPanelItemMouseOver = new GradientColorTable();
+            table.SideBar.SideBarPanelItemMouseOver.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFFFCD9), 0));
+            table.SideBar.SideBarPanelItemMouseOver.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFFE78D), .4f));
+            table.SideBar.SideBarPanelItemMouseOver.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFFD748), .4f));
+            table.SideBar.SideBarPanelItemMouseOver.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFFE793), 1));
+            // Pressed
+            table.SideBar.SideBarPanelItemPressed = new GradientColorTable();
+            table.SideBar.SideBarPanelItemPressed.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xF8B869), 0));
+            table.SideBar.SideBarPanelItemPressed.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFDA361), .4f));
+            table.SideBar.SideBarPanelItemPressed.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFB8A3C), .4f));
+            table.SideBar.SideBarPanelItemPressed.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFEBB60), 1));
+            #endregion
+
+            #region WarningBox
+            table.WarningBox.BackColor = factory.GetColor(Color.FromArgb(64, 64, 64));
+            table.WarningBox.WarningBorderColor = factory.GetColor(Color.FromArgb(86, 86, 86));
+            table.WarningBox.WarningBackColor1 = factory.GetColor(Color.FromArgb(255, 255, 255));
+            table.WarningBox.WarningBackColor2 = factory.GetColor(Color.FromArgb(234, 234, 234));
+            #endregion
+
+            #region CalendarView
+
+            #region WeekDayViewColors
+
+            table.CalendarView.WeekDayViewColors = new ColorDef[]
+            {
+                new ColorDef(factory.GetColor(0x9199A4)),           // DayViewBorder
+                new ColorDef(factory.GetColor(0x000000)),           // DayHeaderForeground
+
+                new ColorDef(new Color[] {factory.GetColor(0xDCDFE2), factory.GetColor(0xD3D6DA), factory.GetColor(0xB4BAC1), factory.GetColor(0xCBCED4)},
+                new float[] {0f, .55f, .58f, 1f}, 90f),             // DayHeaderBackground
+
+                new ColorDef(factory.GetColor(0x9199A4)),           // DayHeaderBorder
+
+                new ColorDef(factory.GetColor(0xFFFFFF)),           // DayWorkHoursBackground
+                new ColorDef(factory.GetColor(0xC7CBD1)),           // DayAllDayEventBackground
+                new ColorDef(factory.GetColor(0xE8EAEC)),           // DayOffWorkHoursBackground
+
+                new ColorDef(factory.GetColor(0xC7CBD1)),           // DayHourBorder
+                new ColorDef(factory.GetColor(0xE8EAEC)),           // DayHalfHourBorder
+
+                new ColorDef(factory.GetColor(0x4C535C)),           // SelectionBackground
+
+                new ColorDef(factory.GetColor(0x9199A4)),           // OwnerTabBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xDCDFE2), factory.GetColor(0xB4BAC1)},    // OwnerTabBackground
+                new float[] {0f, 1f}, 90f),
+
+                new ColorDef(factory.GetColor(0x000000)),           // OwnerTabForeground
+                new ColorDef(factory.GetColor(0xB4BAC1)),           // OwnerTabContentBackground
+                new ColorDef(factory.GetColor(0x000000)),           // OwnerTabSelectedForeground
+                new ColorDef(factory.GetColor(0xFFFFFF)),           // OwnerTabSelectionBackground
+
+                new ColorDef(factory.GetColor(0xF5F5F5)),           // CondensedViewBackground
+
+                new ColorDef(factory.GetColor(0xEB8900)),           // NowDayViewBorder
+                new ColorDef(factory.GetColor(0x000000)),           // NowDayHeaderForeground - 0x15428B
+
+                new ColorDef(new Color[] {factory.GetColor(0xFFED79), factory.GetColor(0xFFD86B), factory.GetColor(0xFFBB00), factory.GetColor(0xFFEA77)},
+                new float[] {0f, .55f ,58f, 1f}, 90f),              // NowDayHeaderBackground
+                
+                new ColorDef(new Color[] {factory.GetColor(0xFFED79), factory.GetColor(0xFFD86B), factory.GetColor(0xFFBB00), factory.GetColor(0xFFEA77)},
+                new float[] {0f, .55f ,58f, 1f}, 90f),              // TimeIndicator
+
+                new ColorDef(factory.GetColor(0xEB8900)),           // TimeIndicatorBorder
+            };
+
+            #endregion
+
+            #region HourRulerColors
+
+            table.CalendarView.TimeRulerColors = new ColorDef[]
+            {
+                new ColorDef(factory.GetColor(0xF0F1F2)),           // TimeRulerBackground
+                new ColorDef(factory.GetColor(0x333333)),           // TimeRulerForeground
+                new ColorDef(factory.GetColor(0x333333)),           // TimeRulerBorder
+                new ColorDef(factory.GetColor(0x333333)),           // TimeRulerTickBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xFFED79), factory.GetColor(0xFFD86B), factory.GetColor(0xFFBB00), factory.GetColor(0xFFEA77)},
+                new float[] {0f, .55f ,58f, 1f}, 90f),              // TimeRulerIndicator
+
+                new ColorDef(factory.GetColor(0xEB8900)),           // TimeRulerIndicatorBorder
+            };
+
+            #endregion
+
+            #region MonthViewColors
+
+            table.CalendarView.MonthViewColors = new ColorDef[]
+            {
+                new ColorDef(factory.GetColor(0x9199A4)),           // DayOfWeekHeaderBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xDCDFE2), factory.GetColor(0xD3D6DA), factory.GetColor(0xB4BAC1), factory.GetColor(0xCBCED4)},
+                new float[] {0f, .55f, .58f, 1f}, 90f),             // DayOfWeekHeaderBackground
+
+                new ColorDef(factory.GetColor(0x000000)),           // DayOfWeekHeaderForeground
+                new ColorDef(factory.GetColor(0x9199A4)),           // SideBarBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xDCDFE2), factory.GetColor(0xD3D6DA), factory.GetColor(0xB4BAC1), factory.GetColor(0xCBCED4)},
+                new float[] {0f, .55f, .58f, 1f}, 0),               // SideBarBackground
+                
+                new ColorDef(factory.GetColor(0x000000)),           // SideBarForeground
+                new ColorDef(factory.GetColor(0x9199A4)),           // DayHeaderBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xDCDFE2), factory.GetColor(0xD3D6DA), factory.GetColor(0xB4BAC1), factory.GetColor(0xCBCED4)},
+                new float[] {0f, .55f, .58f, 1f}),                  // DayHeaderBackground
+                
+                new ColorDef(factory.GetColor(0x000000)),           // DayHeaderForeground
+                new ColorDef(factory.GetColor(0xB0B6BE)),           // DayContentBorder
+                new ColorDef(factory.GetColor(0xE8EAEC)),           // DayContentSelectionBackground
+                new ColorDef(factory.GetColor(0xFFFFFF)),           // DayContentActiveDayBackground
+                new ColorDef(factory.GetColor(0xC7CBD1)),           // DayContentInactiveDayBackground
+
+                new ColorDef(factory.GetColor(0x9199A4)),           // OwnerTabBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xDCDFE2), factory.GetColor(0xB4BAC1)},    // OwnerTabBackground
+                new float[] {0f, 1f}, 90f),
+
+                new ColorDef(factory.GetColor(0x000000)),           // OwnerTabForeground
+                new ColorDef(factory.GetColor(0xB4BAC1)),           // OwnerTabContentBackground
+                new ColorDef(factory.GetColor(0x000000)),           // OwnerTabSelectedForeground
+                new ColorDef(factory.GetColor(0xFFFFFF)),           // OwnerTabSelectionBackground
+
+                new ColorDef(factory.GetColor(0xEB8900)),           // NowDayViewBorder
+                new ColorDef(factory.GetColor(0x000000)),           // NowDayHeaderForeground - 0x15428B
+
+                new ColorDef(new Color[] {factory.GetColor(0xFFED79), factory.GetColor(0xFFD86B), factory.GetColor(0xFFBB00), factory.GetColor(0xFFEA77)},
+                new float[] {0f, .55f ,58f, 1f}, 90f),              // NowDayHeaderBackground
+
+                new ColorDef(factory.GetColor(0x000000)),           // ContentLinkForeground - DayHeaderForeground
+                new ColorDef(factory.GetColor(0xFFFFFF)),           // ContentLinkBackground - DayContentActiveDayBackground
+            };
+
+            #endregion
+
+            #region AppointmentColors
+
+            table.CalendarView.AppointmentColors = new ColorDef[]
+            {
+                new ColorDef(factory.GetColor(0x4B71A2)),           // DefaultBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xFDFEFF), factory.GetColor(0xC1D3EA)},
+                             new float[] {0f, 1f}, 90f),            // DefaultBackground
+
+                new ColorDef(factory.GetColor(0x28518E)),           // BlueBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xB1C5EC), factory.GetColor(0x759DDA)}, 
+                             new float[] {0f, 1f}, 90f),            // BlueBackground
+
+                new ColorDef(factory.GetColor(0x2C6524)),           // GreenBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xC2E8BC), factory.GetColor(0x84D17B)},
+                             new float[] {0f, 1f}, 90f),            // GreenBackground
+
+                new ColorDef(factory.GetColor(0x8B3E0A)),           // OrangeBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xF9C7A0), factory.GetColor(0xF49758)},
+                             new float[] {0f, 1f}, 90f),            // OrangeBackground
+
+                new ColorDef(factory.GetColor(0x3E2771)),           // PurpleBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xC5B5E6), factory.GetColor(0x957BD2)},
+                             new float[] {0f, 1f}, 90f),            // PurpleBackground
+
+                new ColorDef(factory.GetColor(0x86171C)),           // RedBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xF1AAAC), factory.GetColor(0xE5676E)},
+                             new float[] {0f, 1f}, 90f),            // RedBackground
+
+                new ColorDef(factory.GetColor(0x7C7814)),           // YellowBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xFFFCAA), factory.GetColor(0xFFF958)},
+                             new float[] {0f, 1f}, 90f),            // YellowBackground
+
+                new ColorDef(factory.GetColor(-1)),                 // BusyTimeMarker
+                new ColorDef(factory.GetColor(0xFFFFFF)),           // FreeTimeMarker
+                new ColorDef(factory.GetColor(0x800080))            // OutOfOfficeTimeMarker
+            };
+
+            #endregion
+
+            #endregion
+
+            #region SuperTab
+
+            #region SuperTab
+
+            table.SuperTab.Background = new SuperTabLinearGradientColorTable(
+                factory.GetColor(0xCED2D9));
+
+            table.SuperTab.InnerBorder = factory.GetColor(0xF3F5F5);
+            table.SuperTab.OuterBorder = factory.GetColor(0xBEBEBE);
+
+            table.SuperTab.ControlBoxDefault.Image = factory.GetColor(0xFF, 0x000000);
+
+            table.SuperTab.ControlBoxMouseOver.Background = factory.GetColor(0xFFE7A2);
+            table.SuperTab.ControlBoxMouseOver.Border = factory.GetColor(0xFFBD69);
+            table.SuperTab.ControlBoxMouseOver.Image = factory.GetColor(0xFF, 0x000000);
+
+            table.SuperTab.ControlBoxPressed.Background = factory.GetColor(0xFB8C3C);
+            table.SuperTab.ControlBoxPressed.Border = factory.GetColor(0xFFBD69);
+            table.SuperTab.ControlBoxPressed.Image = factory.GetColor(0xFF, 0x000000);
+
+            table.SuperTab.InsertMarker = factory.GetColor(0xFF, 0x000080);
+
+            #endregion
+
+            #region SuperTabItem
+
+            // Top Default
+
+            table.SuperTabItem.Default.Normal.Background = new SuperTabLinearGradientColorTable();
+
+            table.SuperTabItem.Default.Normal.Text = factory.GetColor(0x000000);
+            table.SuperTabItem.Default.Normal.CloseMarker = factory.GetColor(0x000000);
+
+            // Disabled
+            table.SuperTabItem.Default.Disabled.Text = factory.GetColor(0x8D8D8D);
+            table.SuperTabItem.Default.Disabled.Background.AdaptiveGradient = false;
+            table.SuperTabItem.Default.Disabled.CloseMarker = factory.GetColor(0x8D8D8D);
+
+            // Top Selected
+
+            table.SuperTabItem.Default.Selected.Background = new SuperTabLinearGradientColorTable(
+                new Color[] { factory.GetColor(0xEEEEEF), factory.GetColor(0xCED2D9) },
+                new float[] { 0, 1 });
+
+            table.SuperTabItem.Default.Selected.InnerBorder = factory.GetColor(0xF3F5F5);
+            table.SuperTabItem.Default.Selected.OuterBorder = factory.GetColor(0xBEBEBE);
+            table.SuperTabItem.Default.Selected.Text = factory.GetColor(0x000000);
+            table.SuperTabItem.Default.Selected.CloseMarker = factory.GetColor(0x000000);
+
+            // Top SelectedMouseOver
+
+            table.SuperTabItem.Default.SelectedMouseOver.Background = new SuperTabLinearGradientColorTable(
+                new Color[] { factory.GetColor(0xEDEEEF), factory.GetColor(0xCACFD6) },
+                new float[] { 0, 1 });
+
+            table.SuperTabItem.Default.SelectedMouseOver.InnerBorder = factory.GetColor(0xFAEBC2);
+            table.SuperTabItem.Default.SelectedMouseOver.OuterBorder = factory.GetColor(0xE8BB72);
+            table.SuperTabItem.Default.SelectedMouseOver.Text = factory.GetColor(0x000000);
+            table.SuperTabItem.Default.SelectedMouseOver.CloseMarker = factory.GetColor(0x000000);
+
+            // Top MouseOver
+            table.SuperTabItem.Default.MouseOver.Background = new SuperTabLinearGradientColorTable(
+                new Color[] { factory.GetColor(0xDBD4C3), factory.GetColor(0xE9CE8D) },
+                new float[] { 0, 1 });
+
+            table.SuperTabItem.Default.MouseOver.InnerBorder = factory.GetColor(0xE8EAEE);
+            table.SuperTabItem.Default.MouseOver.OuterBorder = factory.GetColor(0xBDBEC1);
+            table.SuperTabItem.Default.MouseOver.Text = factory.GetColor(0x000000);
+            table.SuperTabItem.Default.MouseOver.CloseMarker = factory.GetColor(0x000000);
+
+            // Left, Bottom, Right
+
+            table.SuperTabItem.Left = table.SuperTabItem.Default;
+            table.SuperTabItem.Bottom = table.SuperTabItem.Default;
+            table.SuperTabItem.Right = table.SuperTabItem.Default;
+
+            #endregion
+
+            #region SuperTabPanel
+
+            table.SuperTabPanel.Default.Background = new SuperTabLinearGradientColorTable(
+                factory.GetColor(0xCED2D9));
+
+            table.SuperTabPanel.Default.InnerBorder = factory.GetColor(0xF3F5F5);
+            table.SuperTabPanel.Default.OuterBorder = factory.GetColor(0xBEBEBE);
+
+            table.SuperTabPanel.Left = table.SuperTabPanel.Default;
+            table.SuperTabPanel.Bottom = table.SuperTabPanel.Default;
+            table.SuperTabPanel.Right = table.SuperTabPanel.Default;
+
+            #endregion
+
+            #endregion
+
+            #region Backstage
+
+            #region Backstage
+            SuperTabStyleColorFactory.GetOffice2010BackstageBlackColorTable(table.Backstage, factory);
+            #endregion
+
+            #region BackstageItem
+            SuperTabStyleColorFactory.GetOffice2010BackstageBlackItemColorTable(table.BackstageItem, factory);
+            #endregion
+
+            #region BackstagePanel
+            SuperTabStyleColorFactory.GetOffice2010BackstageBlackPanelColorTable(table.BackstagePanel, factory);
+            #endregion
+
+            #endregion
+
+            #region SwitchButton
+            SwitchButtonColorTable sbt = new SwitchButtonColorTable();
+            sbt.BorderColor = factory.GetColor(editBorderColor);
+            sbt.OffBackColor = factory.GetColor(0xC9CED6);
+            sbt.OffTextColor = factory.GetColor(0x000000);
+            sbt.OnBackColor = factory.GetColor(0x92D050);
+            sbt.OnTextColor = factory.GetColor(0x000000);
+            sbt.SwitchBackColor = factory.GetColor(0xB4B6B6);
+            sbt.SwitchBorderColor = factory.GetColor(0x898A8B);
+            sbt.TextColor = factory.GetColor(0x000000);
+            table.SwitchButton = new SwitchButtonColors();
+            table.SwitchButton.Default = sbt;
+            table.SwitchButton.Disabled.BorderColor = table.CheckBoxItem.Disabled.CheckBorder;
+            table.SwitchButton.Disabled.SwitchBorderColor = table.SwitchButton.Disabled.BorderColor;
+            table.SwitchButton.Disabled.OffTextColor = table.CheckBoxItem.Disabled.Text;
+            table.SwitchButton.Disabled.OnTextColor = table.SwitchButton.Disabled.OffTextColor;
+            table.SwitchButton.Disabled.TextColor = table.SwitchButton.Disabled.OffTextColor;
+            table.SwitchButton.Disabled.SwitchBackColor = table.CheckBoxItem.Disabled.CheckInnerBackground.Start;
+            table.SwitchButton.Disabled.OffBackColor = table.CheckBoxItem.Disabled.CheckInnerBackground.Start;
+            table.SwitchButton.Disabled.OnBackColor = table.SwitchButton.Disabled.OffBackColor;
+            #endregion
+
+            #region StepIndicator
+            table.StepIndicator.BackgroundColor = factory.GetColor(ColorFunctions.GetShade(table.Form.BackColor, 10));
+            table.StepIndicator.IndicatorColor = factory.GetColor(0xA4CC28);
+            #endregion
+
+            #region RadialMenu
+            table.RadialMenu = new RadialMenuColorTable(); // This will force built-in default colors to be used, blue
+            table.RadialMenu.CircularBackColor = factory.GetColor(0xD44F2E);
+            table.RadialMenu.CircularBorderColor = factory.GetColor(0xFFFFFF);
+            table.RadialMenu.CircularForeColor = factory.GetColor(0xFFFFFF);
+            table.RadialMenu.RadialMenuBackground = factory.GetColor(0xFFFFFF);
+            table.RadialMenu.RadialMenuBorder = factory.GetColor(0x3B3E46);
+            table.RadialMenu.RadialMenuButtonBackground = factory.GetColor(0xFFFFFF);
+            table.RadialMenu.RadialMenuButtonBorder = factory.GetColor(0x3B3E46);
+            table.RadialMenu.RadialMenuExpandForeground = factory.GetColor(0xFFFFFF);
+            table.RadialMenu.RadialMenuInactiveBorder = Color.FromArgb(128, table.RadialMenu.RadialMenuBorder);
+            table.RadialMenu.RadialMenuItemForeground = factory.GetColor(0x3B3E46);
+            table.RadialMenu.RadialMenuItemDisabledForeground = factory.GetColor(0x8D8D8D);
+            table.RadialMenu.RadialMenuItemMouseOverBackground = Color.FromArgb(72, table.RadialMenu.RadialMenuItemForeground);
+            table.RadialMenu.RadialMenuItemMouseOverForeground = factory.GetColor(0x3B3E46);
+            table.RadialMenu.RadialMenuMouseOverBorder = Color.FromArgb(200, table.RadialMenu.RadialMenuBorder);
+            #endregion
+
+            #region StepItem
+            table.StepItem.Default = new OfficeStepItemStateColorTable(new Color[]{
+                    factory.GetColor(0xF8F8F9), 
+                    factory.GetColor(0xDFE2E4), 
+                    factory.GetColor(0xC7CBD1), 
+                    factory.GetColor(0xDBDEE2)
+                    },
+                    90,
+                    new float[] { 0f, .5f, .5f, 1f },
+                factory.GetColor(0x000000),
+                new Color[] {
+                    factory.GetColor(0x898785) });
+            table.StepItem.Progress = new OfficeStepItemStateColorTable(new Color[]{
+                    factory.GetColor(0xD8F577), 
+                    factory.GetColor(0x75C300),
+                    factory.GetColor(0x75C300),
+                    factory.GetColor(0xA9E923)
+                    },
+                    90,
+                    new float[] { 0f, .6f, .6f, 1f },
+                Color.Empty,
+                new Color[0]);
+            table.StepItem.MouseOver = new OfficeStepItemStateColorTable(new Color[]{
+                    factory.GetColor(0xFFFCD9), 
+                    factory.GetColor(0xFFE78D),
+                    factory.GetColor(0xFFD748), 
+                    factory.GetColor(0xFFE793)
+                    },
+                    90,
+                    new float[] { 0f, .5f, .5f, 1f },
+                factory.GetColor(0x000000),
+                new Color[] {
+                    factory.GetColor(0xDDCF9B) });
+            table.StepItem.Pressed = new OfficeStepItemStateColorTable(new Color[]{
+                    factory.GetColor(0xF8B56A), 
+                    factory.GetColor(0xFCA060),
+                    factory.GetColor(0xFB8A3C), 
+                    factory.GetColor(0xFEBD62)
+                    },
+                    90,
+                    new float[] { 0f, .5f, .5f, 1f },
+                factory.GetColor(0x000000),
+                new Color[] {
+                    factory.GetColor(0x8B7654) });
+            #endregion
+
+            #region ListBoxItem
+            table.ListBoxItem.Default = new OfficeListBoxItemStateColorTable(factory.GetColor(0x000000));
+            table.ListBoxItem.MouseOver = new OfficeListBoxItemStateColorTable(factory.GetColor(0x000000), new Color[]{
+                    factory.GetColor(0xFFFCD9),
+                    factory.GetColor(0xFFE793)
+                    },
+                    90,
+                    new float[] { 0f, 1f });
+            table.ListBoxItem.Selected = new OfficeListBoxItemStateColorTable(factory.GetColor(0x000000), new Color[]{
+                    factory.GetColor(0xFCD578),
+                    factory.GetColor(0xFBC84F)
+                    },
+                    90,
+                    new float[] { 0f, 1f });
+            #endregion
+
+            #region TokenEditor
+            table.TokenEditor = new TokenEditorColorTable(0xFFFFFF, 0x3C4251, 0xFFFFFF, 0x1C1E26, 0xFFFFFF, 0x2F5EA9);
+            #endregion
+
+            #region Flyout
+            table.Flyout.BorderColor = table.Form.Active.BorderColors[0];
+            #endregion
+
+            #region SideNav
+            table.SideNav.SideNavItem.Default = new SideNavItemStateColorTable(factory.GetColor(0x000000));
+            table.SideNav.SideNavItem.MouseOver = new SideNavItemStateColorTable(factory.GetColor(0x000000),
+                new Color[]
+                {
+                    factory.GetColor(0xFFFCD9), factory.GetColor(0xFFE78D), factory.GetColor(0xFFD748),
+                    factory.GetColor(0xFFE793)
+                },
+                new Color[] { factory.GetColor(0xC0A776), factory.GetColor(0xFFF2BE) },
+                2);
+            table.SideNav.SideNavItem.Pressed = new SideNavItemStateColorTable(factory.GetColor(0x000000),
+                new Color[]
+                {
+                    factory.GetColor(0xF8B869), factory.GetColor(0xFDA361), factory.GetColor(0xFB8A3C),
+                    factory.GetColor(0xFEBB60)
+                },
+                new Color[] { factory.GetColor(0x5F7FB6), factory.GetColor(0xFDAD11) },
+                2);
+            table.SideNav.SideNavItem.Selected = new SideNavItemStateColorTable(factory.GetColor(0x000000),
+                new Color[] { table.Form.BackColor },
+                new Color[] { Color.Empty, factory.GetColor(0xBEBEBE), Color.Empty, factory.GetColor(0xBEBEBE) });
+            table.SideNav.BorderColors = new Color[] { factory.GetColor(0xBEBEBE) };
+            table.SideNav.TitleBackColor = factory.GetColor(0x414141);
+            table.SideNav.TitleBorderColors = new Color[] { Color.Empty, Color.Empty, Color.Empty, factory.GetColor(0xBEBEBE) };
+            table.SideNav.PanelBackColor = table.Form.BackColor;
+
+            #endregion
+
+            #region TabForm
+            table.TabForm.Active.CaptionText = factory.GetColor(0x000000);
+            table.TabForm.Inactive.CaptionText = factory.GetColor(0x7D7D7D);
+            table.TabForm.Active.CaptionBackColors = new Color[] { factory.GetColor(0xF5F6F7) };
+            table.TabForm.Inactive.CaptionBackColors = new Color[] { factory.GetColor(0xF5F6F7) };
+            table.TabFormItemColorTables.Add(TabFormItem.DefaultColorTableKey, Office2007ColorTable.CreateDefaultTabFormItemColorTable(factory, 0x000000));
+            table.TabFormItemColorTables.Add(TabFormItem.BlueColorTableKey, Office2007ColorTable.CreateBlueTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.YellowColorTableKey, Office2007ColorTable.CreateYellowTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.PurpleColorTableKey, Office2007ColorTable.CreatePurpleTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.CyanColorTableKey, Office2007ColorTable.CreateCyanTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.BlueMistColorTableKey, Office2007ColorTable.CreateBlueMistTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.PurpleMistColorTableKey, Office2007ColorTable.CreatePurpleMistTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.TanColorTableKey, Office2007ColorTable.CreateTanTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.LemonLimeColorTableKey, Office2007ColorTable.CreateLemonLimeTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.AppleColorTableKey, Office2007ColorTable.CreateAppleTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.TealColorTableKey, Office2007ColorTable.CreateTealTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.RedChalkColorTableKey, Office2007ColorTable.CreateRedChalkTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.SilverColorTableKey, Office2007ColorTable.CreateSilverTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.OrangeColorTableKey, Office2007ColorTable.CreateOrangeTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.GreenColorTableKey, Office2007ColorTable.CreateGreenTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.MagentaColorTableKey, Office2007ColorTable.CreateMagentaTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.RedColorTableKey, Office2007ColorTable.CreateRedTabFormItemColorTable(factory));
+            #endregion
+        }
+
+        /// <summary>
+        /// Initializes ColorScheme object with the black color scheme.
+        /// </summary>
+        /// <param name="c">ColorScheme object to initialize.</param>
+        public static void InitializeBlackLegacyColors(ColorScheme c, ColorFactory factory)
+        {
+            c.BarBackground = factory.GetColor(0xCDD0D5);
+            c.BarBackground2 = factory.GetColor(0x8B929B);
+            c.BarStripeColor = factory.GetColor(0x373C43);
+            c.BarCaptionBackground = factory.GetColor(0x76808E);
+            c.BarCaptionBackground2 = factory.GetColor(0x4C535C);
+            c.BarCaptionInactiveBackground = factory.GetColor(0xF0F1F2);
+            c.BarCaptionInactiveBackground2 = factory.GetColor(0xBDC2C9);
+            c.BarCaptionInactiveText = factory.GetColor(0x373C43);
+            c.BarCaptionText = factory.GetColor(0xFFFFFF);
+            c.BarFloatingBorder = factory.GetColor(0x373C43);
+            c.BarPopupBackground = factory.GetColor(0xF6F6F6);
+            c.BarPopupBorder = factory.GetColor(0x9199A4);
+            c.ItemBackground = Color.Empty;
+            c.ItemBackground2 = Color.Empty;
+            c.ItemCheckedBackground = factory.GetColor(0xFFD36A);
+            c.ItemCheckedBackground2 = factory.GetColor(0xFBC84F);
+            c.ItemCheckedBorder = factory.GetColor(0xBB5503);
+            c.ItemCheckedText = factory.GetColor(0x000000);
+            c.ItemDisabledBackground = Color.Empty;
+            c.ItemDisabledText = factory.GetColor(0x8D8D8D);
+            c.ItemExpandedShadow = Color.Empty;
+            c.ItemExpandedBackground = factory.GetColor(0x9199A4);
+            c.ItemExpandedBackground2 = factory.GetColor(0x656E7A);
+            c.ItemExpandedText = factory.GetColor(0x000000);
+            c.ItemHotBackground = factory.GetColor(0xFFF5CC);
+            c.ItemHotBackground2 = factory.GetColor(0xFFDB75);
+            c.ItemHotBorder = factory.GetColor(0xFFBD69);
+            c.ItemHotText = factory.GetColor(0x000000);
+            c.ItemPressedBackground = factory.GetColor(0xFC973D);
+            c.ItemPressedBackground2 = factory.GetColor(0xFFB85E);
+            c.ItemPressedBorder = factory.GetColor(0xFB8C3C);
+            c.ItemPressedText = factory.GetColor(0x000000);
+            c.ItemSeparator = Color.FromArgb(225, factory.GetColor(0x9199A4));
+            c.ItemSeparatorShade = Color.FromArgb(180, factory.GetColor(0xFFFFFF));
+            c.ItemText = factory.GetColor(0x000000); // SystemColors.ControlText;
+            c.MenuBackground = factory.GetColor(0xF6F6F6);
+            c.MenuBackground2 = Color.Empty; // Color.White;
+            c.MenuBarBackground = factory.GetColor(0x535353);
+            c.MenuBorder = factory.GetColor(0x9199A4);
+            c.ItemExpandedBorder = c.MenuBorder;
+            c.MenuSide = factory.GetColor(0xEFEFEF);
+            c.MenuSide2 = Color.Empty; // factory.GetColor(0xDDE0E8);
+            c.MenuUnusedBackground = c.MenuBackground;
+            c.MenuUnusedSide = factory.GetColor(0xE9E9E9);
+            c.MenuUnusedSide2 = Color.Empty;// System.Windows.Forms.ControlPaint.Light(c.MenuSide2);
+            c.ItemDesignTimeBorder = Color.Black;
+            c.BarDockedBorder = factory.GetColor(0x4C535C);
+
+            c.DockSiteBackColor = factory.GetColor(0x535353);
+            c.DockSiteBackColor2 = Color.Empty;
+
+            c.CustomizeBackground = factory.GetColor(0xB2B7BF);
+            c.CustomizeBackground2 = factory.GetColor(0x515862);
+            c.CustomizeText = factory.GetColor(0x000000);
+
+            c.PanelBackground = factory.GetColor(0xF0F1F2);
+            c.PanelBackground2 = factory.GetColor(0xBDC2C9);
+            c.PanelText = Color.Black;
+            c.PanelBorder = factory.GetColor(0xA7ADB6);
+
+            c.ExplorerBarBackground = factory.GetColor(0xF0F1F2);
+            c.ExplorerBarBackground2 = factory.GetColor(0xBDC2C9);
+
+            c.MdiSystemItemForeground = Color.LightGray;
+            c.SplitterBackground = c.PanelBackground;
+            c.SplitterBackground2 = c.PanelBackground2;
+            c.SplitterText = c.PanelText;
+            c.SplitterBorder = c.PanelBorder;
+        }
+        #endregion
+
+        #region Style Class Creation
+        public static ElementStyle GetFileMenuContainerStyle(Office2007ColorTable table)
+        {
+            ElementStyle style = new ElementStyle();
+            style.Class = ElementStyleClassKeys.RibbonFileMenuContainerKey;
+            Rendering.Office2007MenuColorTable mc = table.Menu;
+            
+            style.PaddingBottom = 3;
+            style.PaddingLeft = 3;
+            style.PaddingRight = 3;
+            style.PaddingTop = 12;
+            BackgroundColorBlend[] blend = new BackgroundColorBlend[mc.FileBackgroundBlend.Count];
+            mc.FileBackgroundBlend.CopyTo(blend);
+            style.BackColorBlend.Clear();
+            style.BackColorBlend.AddRange(blend);
+            style.BackColorGradientAngle = 90;
+            return style;
+        }
+
+        public static ElementStyle GetTwoColumnMenuContainerStyle(Office2007ColorTable table)
+        {
+            ElementStyle style = new ElementStyle();
+            style.Class = ElementStyleClassKeys.RibbonFileMenuTwoColumnContainerKey;
+            Rendering.Office2007MenuColorTable mc = table.Menu;
+
+            style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Double;
+            style.BorderBottomWidth = 1;
+            style.BorderColor = mc.FileContainerBorder;
+            style.BorderColorLight = mc.FileContainerBorderLight;
+            style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Double;
+            style.BorderLeftWidth = 1;
+            style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Double;
+            style.BorderRightWidth = 1;
+            style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Double;
+            style.BorderTopWidth = 1;
+            style.PaddingBottom = 1;
+            style.PaddingLeft = 1;
+            style.PaddingRight = 1;
+            style.PaddingTop = 1;
+
+            return style;
+        }
+
+        public static ElementStyle GetMenuColumnOneContainerStyle(Office2007ColorTable table)
+        {
+            ElementStyle style = new ElementStyle();
+            style.Class = ElementStyleClassKeys.RibbonFileMenuColumnOneContainerKey;
+            Rendering.Office2007MenuColorTable mc = table.Menu;
+
+            style.BackColor = mc.FileColumnOneBackground;
+            style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            style.BorderRightColor = mc.FileColumnOneBorder;
+            style.BorderRightWidth = 1;
+            style.PaddingRight = 1;
+
+            return style;
+        }
+
+        public static ElementStyle GetMenuColumnTwoContainerStyle(Office2007ColorTable table)
+        {
+            ElementStyle style = new ElementStyle();
+            style.Class = ElementStyleClassKeys.RibbonFileMenuColumnTwoContainerKey;
+            Rendering.Office2007MenuColorTable mc = table.Menu;
+
+            style.BackColor = mc.FileColumnTwoBackground;
+
+            return style;
+        }
+
+        public static ElementStyle GetMenuBottomContainer(Office2007ColorTable table)
+        {
+            ElementStyle style = new ElementStyle();
+            style.Class = ElementStyleClassKeys.RibbonFileMenuBottomContainerKey;
+            Rendering.Office2007MenuColorTable mc = table.Menu;
+
+            BackgroundColorBlend[] blend = new BackgroundColorBlend[mc.FileBottomContainerBackgroundBlend.Count];
+            mc.FileBottomContainerBackgroundBlend.CopyTo(blend);
+            style.BackColorBlend.Clear();
+            style.BackColorBlend.AddRange(blend);
+            style.BackColorGradientAngle = 90;
+            return style;
+        }
+
+        public static ElementStyle GetTextBoxStyle(Color borderColor)
+        {
+            ElementStyle style = new ElementStyle();
+            style.Class = ElementStyleClassKeys.TextBoxBorderKey;
+            style.BorderColor = borderColor;
+            style.BorderWidth = 1;
+            style.Border = eStyleBorderType.Solid;
+            style.PaddingBottom = 2;
+            style.PaddingTop = 2;
+            style.PaddingLeft = 2;
+            style.PaddingRight = 2;
+            return style;
+        }
+
+        public static ElementStyle GetRichTextBoxStyle(Color borderColor)
+        {
+            ElementStyle style = new ElementStyle();
+            style.Class = ElementStyleClassKeys.RichTextBoxBorderKey;
+            style.BorderColor = borderColor;
+            style.BorderWidth = 1;
+            style.Border = eStyleBorderType.Solid;
+            return style;
+        }
+
+        public static ElementStyle GetItemPanelStyle(Color borderColor, Color backColor)
+        {
+            ElementStyle style = new ElementStyle();
+            style.Class = ElementStyleClassKeys.ItemPanelKey;
+            style.BorderColor = borderColor;
+            style.BorderWidth = 1;
+            style.Border = eStyleBorderType.Solid;
+            style.PaddingLeft = 1;
+            style.PaddingRight = 1;
+            style.PaddingTop = 1;
+            style.PaddingBottom = 1;
+            style.BackColor = backColor;
+            return style;
+        }
+
+        public static ElementStyle GetListBoxAdvStyle(Color borderColor, Color backColor)
+        {
+            ElementStyle style = new ElementStyle();
+            style.Class = ElementStyleClassKeys.ListBoxAdvKey;
+            style.BorderColor = borderColor;
+            style.BorderWidth = 1;
+            style.Border = eStyleBorderType.Solid;
+            style.PaddingLeft = 1;
+            style.PaddingRight = 1;
+            style.PaddingTop = 1;
+            style.PaddingBottom = 1;
+            style.BackColor = backColor;
+            return style;
+        }
+
+        public static ElementStyle GetMetroTilePanelStyle(Color backColor)
+        {
+            ElementStyle style = new ElementStyle();
+            style.Class = ElementStyleClassKeys.MetroTilePanelKey;
+            style.PaddingLeft = 16;
+            style.PaddingRight = 16;
+            style.PaddingTop = 16;
+            style.PaddingBottom = 16;
+            style.BackColor = backColor;
+            return style;
+        }
+        public static ElementStyle GetMetroTileGroupStyle(Color textColor)
+        {
+            ElementStyle style = new ElementStyle();
+            style.Class = ElementStyleClassKeys.MetroTileGroupTitleKey;
+            style.TextColor = textColor;
+            style.Font = new System.Drawing.Font("Segoe UI Semibold", 27.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            return style;
+        }
+
+        public static ElementStyle GetItemPanelStyle(Color borderColor)
+        {
+            return GetItemPanelStyle(borderColor, Color.White);
+        }
+        public static ElementStyle GetListBoxAdvStyle(Color borderColor)
+        {
+            return GetListBoxAdvStyle(borderColor, Color.White);
+        }
+        public static ElementStyle GetAdvTreeStyle(Color borderColor, Color backColor)
+        {
+            ElementStyle style = new ElementStyle();
+            style.Class = ElementStyleClassKeys.TreeBorderKey;
+            style.BorderColor = borderColor;
+            style.BorderWidth = 1;
+            style.Border = eStyleBorderType.Solid;
+            style.BackColor = backColor;
+            return style;
+        }
+
+        public static ElementStyle GetAdvTreeColumnsHeaderStyle(Color backColor1, Color backColor2, Color borderColor)
+        {
+            ElementStyle style = new ElementStyle();
+            style.Class = ElementStyleClassKeys.TreeColumnsHeaderKey;
+            style.BackColor = backColor1;
+            style.BackColor2 = backColor2;
+            style.BackColorGradientAngle = 90;
+            style.TextColor = Color.Black;
+            style.BorderColor = borderColor;
+            style.BorderBottom = eStyleBorderType.Solid;
+            style.BorderBottomWidth = 1;
+            return style;
+        }
+
+        public static ElementStyle GetAdvTreeNodesColumnsHeaderStyle(Color backColor1, Color backColor2, Color borderColor)
+        {
+            ElementStyle style = new ElementStyle();
+            style.Class = ElementStyleClassKeys.TreeNodesColumnsHeaderKey;
+            style.BackColor = backColor1;
+            style.BackColor2 = backColor2;
+            style.BackColorGradientAngle = 90;
+            style.TextColor = Color.Black;
+            style.BorderColor = borderColor;
+            style.BorderBottom = eStyleBorderType.Solid;
+            style.BorderBottomWidth = 1;
+            style.BorderLeft = eStyleBorderType.Solid;
+            style.BorderLeftWidth = 1;
+            style.BorderTop = eStyleBorderType.Solid;
+            style.BorderTopWidth = 1;
+
+            return style;
+        }
+
+        public static ElementStyle GetAdvTreeColumnStyle(Color textColor)
+        {
+            ElementStyle style = new ElementStyle();
+            style.Class = ElementStyleClassKeys.TreeColumnKey;
+            style.TextColor = textColor;
+            return style;
+        }
+
+        public static ElementStyle GetDateTimeInputBackgroundStyle(Color borderColor, Color backColor)
+        {
+            ElementStyle style = new ElementStyle();
+            style.Class = ElementStyleClassKeys.DateTimeInputBackgroundKey;
+            style.BorderColor = borderColor;
+            style.BorderWidth = 1;
+            style.Border = eStyleBorderType.Solid;
+            style.BackColor = backColor;
+            style.PaddingLeft = 1;
+            style.PaddingRight = 1;
+            style.PaddingTop = 1;
+            style.PaddingBottom = 1;
+            return style;
+        }
+
+        public static ElementStyle GetRibbonClientPanelStyle(ColorFactory f, eOffice2007ColorScheme cs)
+        {
+            ElementStyle style = new ElementStyle();
+            style.Class = ElementStyleClassKeys.RibbonClientPanelKey;
+
+            style.BackColorGradientAngle = 90;
+
+            if (cs == eOffice2007ColorScheme.Blue)
+            {
+                style.BackColorBlend.Add(new BackgroundColorBlend(f.GetColor(0xBED4F0), 0));
+                style.BackColorBlend.Add(new BackgroundColorBlend(f.GetColor(0x567DB1), .8f));
+                style.BackColorBlend.Add(new BackgroundColorBlend(f.GetColor(0x6591CD), 1));
+            }
+            else if (cs == eOffice2007ColorScheme.Silver)
+            {
+                style.BackColorBlend.Add(new BackgroundColorBlend(f.GetColor(0xCCCFD8), 0));
+                style.BackColorBlend.Add(new BackgroundColorBlend(f.GetColor(0xABAEB6), .8f));
+                style.BackColorBlend.Add(new BackgroundColorBlend(f.GetColor(0x9B9FA6), 1));
+            }
+            else if (cs == eOffice2007ColorScheme.Black)
+            {
+                style.BackColorBlend.Add(new BackgroundColorBlend(f.GetColor(0x7E7E7E), 0));
+                style.BackColorBlend.Add(new BackgroundColorBlend(f.GetColor(0x363636), .8f));
+                style.BackColorBlend.Add(new BackgroundColorBlend(f.GetColor(0x0A0A0A), 1));
+            }
+
+            return style;
+        }
+
+        public static ElementStyle GetListViewBorderStyle(Office2007ListViewColorTable lvct)
+        {
+            ElementStyle style = new ElementStyle();
+            style.Class = ElementStyleClassKeys.ListViewBorderKey;
+
+            style.Border = eStyleBorderType.Solid;
+            style.BorderWidth = 1;
+            style.CornerType = eCornerType.Square;
+            style.BorderColor = lvct.Border;
+            
+            return style;
+        }
+
+        public static ElementStyle GetStatusBarAltStyle(Office2007BarColorTable t)
+        {
+            ElementStyle style = new ElementStyle();
+            style.Class = ElementStyleClassKeys.Office2007StatusBarBackground2Key;
+            style.PaddingLeft = 4;
+            style.BorderLeft = eStyleBorderType.Etched;
+            style.BorderLeftWidth = 1;
+            style.BorderLeftColor = Color.FromArgb(196, t.StatusBarTopBorder);
+            style.BorderColorLight = Color.FromArgb(128, Color.White);
+            if (t.StatusBarAltBackground.Count > 0)
+            {
+                style.BackColorBlend.CopyFrom(t.StatusBarAltBackground);
+                style.BackColorGradientAngle = 90;
+            }
+
+            return style;
+        }
+
+        public static ElementStyle GetCrumbBarBackgroundStyle(Color backColor, Color borderColor1, Color borderColor2)
+        {
+            ElementStyle style = new ElementStyle();
+            style.Class = ElementStyleClassKeys.CrumbBarBackgroundKey;
+            style.BackColor = backColor;
+            style.BorderColor = borderColor1;
+            style.BorderColor2 = borderColor2;
+            style.Border = eStyleBorderType.Solid;
+            style.BorderWidth = 1;
+
+            return style;
+        }
+
+        public static ElementStyle GetDataGridViewStyle()
+        {
+            ElementStyle style = new ElementStyle();
+
+            style.Class = ElementStyleClassKeys.DataGridViewBorderKey;
+
+            style.BorderWidth = 0;
+            style.Border = eStyleBorderType.None;
+
+            style.PaddingBottom = 3;
+            style.PaddingTop = 3;
+            style.PaddingLeft = 3;
+            style.PaddingRight = 3;
+
+            return (style);
+        }
+
+        public static ElementStyle GetDataGridViewNumericStyle()
+        {
+            ElementStyle style = new ElementStyle();
+
+            style.Class = ElementStyleClassKeys.DataGridViewNumericBorderKey;
+
+            style.BorderWidth = 0;
+            style.Border = eStyleBorderType.None;
+
+            style.PaddingBottom = 1;
+            style.PaddingTop = 1;
+            style.PaddingLeft = 2;
+            style.PaddingRight = 2;
+
+            return (style);
+        }
+
+        public static ElementStyle GetDataGridViewDateTimeStyle()
+        {
+            ElementStyle style = new ElementStyle();
+
+            style.Class = ElementStyleClassKeys.DataGridViewDateTimeBorderKey;
+
+            style.BorderWidth = 0;
+            style.Border = eStyleBorderType.None;
+
+            style.PaddingBottom = 1;
+            style.PaddingTop = 1;
+            style.PaddingLeft = 1;
+            style.PaddingRight = 1;
+
+            return (style);
+        }
+
+        public static ElementStyle GetDataGridViewIpAddressStyle()
+        {
+            ElementStyle style = new ElementStyle();
+
+            style.Class = ElementStyleClassKeys.DataGridViewIpAddressBorderKey;
+
+            style.BorderWidth = 0;
+            style.Border = eStyleBorderType.None;
+
+            style.PaddingBottom = 2;
+            style.PaddingTop = 2;
+            style.PaddingLeft = 2;
+            style.PaddingRight = 2;
+
+            return (style);
+        }
+
+        public static ElementStyle GetSlideOutButtonStyle(Color backColor)
+        {
+            ElementStyle style = new ElementStyle(ElementStyleClassKeys.SlideOutButtonKey);
+            style.BackColor = backColor;
+            style.TextColor = Color.White;
+            return style;
+        }
+
+        public static ElementStyle GetMonthCalendarStyle(Color backColor)
+        {
+            ElementStyle style = new ElementStyle(ElementStyleClassKeys.MonthCalendarAdvKey);
+            style.BackColor = backColor;
+            style.Border = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+            style.BorderWidth = 1;
+            return style;
+        }
+
+        public static ElementStyle GetProgressStepsStyle(DevComponents.DotNetBar.Rendering.Office2007ColorTable table)
+        {
+            ElementStyle style = new ElementStyle(ElementStyleClassKeys.ProgressStepsKey);
+            style.BackColor = table.Form.BackColor;
+            //style.BackColor2 = table.Form.BackColor
+            //style.BackColorGradientAngle = table.LegacyColors.BarBackgroundGradientAngle;
+            return style;
+        }
+
+        public static ElementStyle GetSideNavStripStyle(DevComponents.DotNetBar.Rendering.Office2007ColorTable table)
+        {
+            ElementStyle style = new ElementStyle(ElementStyleClassKeys.SideNavStripKey);
+            style.BackColor = table.RibbonControl.TabDividerBorder;
+            return style;
+        }
+        public static ElementStyle GetSideNavStripStyle(Color backColor)
+        {
+            ElementStyle style = new ElementStyle(ElementStyleClassKeys.SideNavStripKey);
+            style.BackColor = backColor;
+            return style;
+        }
+        public static ElementStyle GetTabFormPanelStyle(Color backColor)
+        {
+            ElementStyle style = new ElementStyle(ElementStyleClassKeys.TabFormPanelKey);
+            style.BackColor = backColor;
+            return style;
+        }
+        #endregion
+
+        #region Toolbox Control ElementStyle
+        public static ElementStyle GetToolboxControlStyle(Color borderColor, Color backColor)
+        {
+            ElementStyle style = new ElementStyle();
+            style.Class = ElementStyleClassKeys.ToolboxControlKey;
+            style.BorderColor = borderColor;
+            style.BorderWidth = 1;
+            style.Border = eStyleBorderType.Solid;
+            style.BackColor = backColor;
+            return style;
+        }
+        private const int ToolboxGroupPadding = 5;
+        public static ElementStyle GetToolboxGroupTitle(Color textColor)
+        {
+            ElementStyle style=new ElementStyle(textColor);
+            style.Class = ElementStyleClassKeys.ToolboxGroupTitleKey;
+            style.PaddingBottom = ToolboxGroupPadding;
+            style.PaddingTop = ToolboxGroupPadding;
+            style.PaddingLeft = ToolboxGroupPadding;
+            style.PaddingRight = ToolboxGroupPadding;
+            style.MarginBottom = ToolboxGroupPadding;
+            return style;
+        }
+
+        public static ElementStyle GetToolboxGroupTitleMouseOver(Color textColor, Color backColor)
+        {
+            ElementStyle style = new ElementStyle(textColor, backColor);
+            style.Class = ElementStyleClassKeys.ToolboxGroupTitleMouseOverKey;
+            style.PaddingBottom = ToolboxGroupPadding;
+            style.PaddingTop = ToolboxGroupPadding;
+            style.PaddingLeft = ToolboxGroupPadding;
+            style.PaddingRight = ToolboxGroupPadding;
+            style.MarginBottom = ToolboxGroupPadding;
+            return style;
+        }
+
+        public static ElementStyle GetToolboxGroupExpandedTitle(Color textColor, Color backColor)
+        {
+            ElementStyle style = new ElementStyle(textColor, backColor);
+            style.Class = ElementStyleClassKeys.ToolboxGroupExpandedTitleKey;
+            style.PaddingBottom = ToolboxGroupPadding;
+            style.PaddingTop = ToolboxGroupPadding;
+            style.PaddingLeft = ToolboxGroupPadding;
+            style.PaddingRight = ToolboxGroupPadding;
+            style.MarginBottom = ToolboxGroupPadding;
+            return style;
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/Office2007ComboBoxColorTable.cs b/PROMS/DotNetBar Source Code/Rendering/Office2007ComboBoxColorTable.cs
new file mode 100644
index 00000000..2d7d684d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/Office2007ComboBoxColorTable.cs	
@@ -0,0 +1,31 @@
+using System;
+using System.Text;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    /// <summary>
+    /// Defines the color table for the combo box.
+    /// </summary>
+    public class Office2007ComboBoxColorTable
+    {
+        /// <summary>
+        /// Gets or sets the color for combo box in default state.
+        /// </summary>
+        public Office2007ComboBoxStateColorTable Default = new Office2007ComboBoxStateColorTable();
+
+        /// <summary>
+        /// Gets or sets the color for standalone combo box in default state. Standalone combo box is a control not used by ComboBoxItem.
+        /// </summary>
+        public Office2007ComboBoxStateColorTable DefaultStandalone = new Office2007ComboBoxStateColorTable();
+
+        /// <summary>
+        /// Gets or sets the colors when mouse is over the control.
+        /// </summary>
+        public Office2007ComboBoxStateColorTable MouseOver = new Office2007ComboBoxStateColorTable();
+
+        /// <summary>
+        /// Gets or sets the colors when control is dropped down.
+        /// </summary>
+        public Office2007ComboBoxStateColorTable DroppedDown = new Office2007ComboBoxStateColorTable();
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/Office2007ComboBoxStateColorTable.cs b/PROMS/DotNetBar Source Code/Rendering/Office2007ComboBoxStateColorTable.cs
new file mode 100644
index 00000000..29739676
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/Office2007ComboBoxStateColorTable.cs	
@@ -0,0 +1,37 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    /// <summary>
+    /// Defines the combo box colors for a particular state.
+    /// </summary>
+    public class Office2007ComboBoxStateColorTable
+    {
+        /// <summary>
+        /// Gets or sets the border color.
+        /// </summary>
+        public Color Border = Color.Empty;
+        /// <summary>
+        /// Gets or sets the background color.
+        /// </summary>
+        public Color Background = Color.Empty;
+        /// <summary>
+        /// Gets or sets the outer expand button border.
+        /// </summary>
+        public LinearGradientColorTable ExpandBorderOuter = null;
+        /// <summary>
+        /// Gets or sets the inner expand button border.
+        /// </summary>
+        public LinearGradientColorTable ExpandBorderInner = null;
+        /// <summary>
+        /// Gets or sets the background color of the expand button.
+        /// </summary>
+        public LinearGradientColorTable ExpandBackground = null;
+        /// <summary>
+        /// Gets or sets the foreground color of the expand button.
+        /// </summary>
+        public Color ExpandText = Color.Empty;
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/Office2007DataGridViewColorTable.cs b/PROMS/DotNetBar Source Code/Rendering/Office2007DataGridViewColorTable.cs
new file mode 100644
index 00000000..9706bc87
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/Office2007DataGridViewColorTable.cs	
@@ -0,0 +1,169 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    /// <summary>
+    /// Defines color table for the Office 2007 style DataGridView control.
+    /// </summary>
+    public class Office2007DataGridViewColorTable
+    {
+        /// <summary>
+        /// Gets or sets grid background color.
+        /// </summary>
+        public Color BackgroundColor = SystemColors.AppWorkspace;
+        /// <summary>
+        /// Gets or sets default cell color.
+        /// </summary>
+        public Color DefaultCellBackground = SystemColors.Window;
+        /// <summary>
+        /// Gets or sets default cell text color.
+        /// </summary>
+        public Color DefaultCellText = SystemColors.WindowText;
+        /// <summary>
+        /// Gets or sets the background color for the column headers in normal state.
+        /// </summary>
+        public LinearGradientColorTable ColumnHeaderNormalBackground = null;
+        /// <summary>
+        /// Gets or sets the normal column text color.
+        /// </summary>
+        public Color ColumnHeaderNormalText = SystemColors.WindowText;
+        /// <summary>
+        /// Gets or sets the column header border color.
+        /// </summary>
+        public Color ColumnHeaderNormalBorder = Color.Empty;
+        /// <summary>
+        /// Gets or sets the background color for the column headers in mouse over state.
+        /// </summary>
+        public LinearGradientColorTable ColumnHeaderMouseOverBackground = null;
+        /// <summary>
+        /// Gets or sets the column header border color when mouse is over the column.
+        /// </summary>
+        public Color ColumnHeaderMouseOverBorder = Color.Empty;
+
+        /// <summary>
+        /// Gets or sets the selected column header text color.
+        /// </summary>
+        public Color ColumnHeaderSelectedText = SystemColors.WindowText;
+        /// <summary>
+        /// Gets or sets the background color for the column headers in selected state.
+        /// </summary>
+        public LinearGradientColorTable ColumnHeaderSelectedBackground = null;
+        /// <summary>
+        /// Gets or sets the border color for the column headers in selected state.
+        /// </summary>
+        public Color ColumnHeaderSelectedBorder = Color.Empty;
+
+        /// <summary>
+        /// Gets or sets the background color for the column headers in selected mouse over state.
+        /// </summary>
+        public LinearGradientColorTable ColumnHeaderSelectedMouseOverBackground = null;
+        /// <summary>
+        /// Gets or sets the border color for the column headers in selected mouse over state.
+        /// </summary>
+        public Color ColumnHeaderSelectedMouseOverBorder = Color.Empty;
+
+        /// <summary>
+        /// Gets or sets the background color for the column headers in pressed state.
+        /// </summary>
+        public LinearGradientColorTable ColumnHeaderPressedBackground = null;
+        /// <summary>
+        /// Gets or sets the border color for the column headers in pressed state.
+        /// </summary>
+        public Color ColumnHeaderPressedBorder = Color.Empty;
+
+        /// <summary>
+        /// Gets or sets the column header foreground color.
+        /// </summary>
+        public Color ColumnHeaderForeground = Color.Empty;
+
+        /// <summary>
+        /// Gets or sets the background color for row marker background.
+        /// </summary>
+        public LinearGradientColorTable RowNormalBackground = null;
+        /// <summary>
+        /// Gets or sets the border color for row marker.
+        /// </summary>
+        public Color RowNormalBorder = Color.Empty;
+        /// <summary>
+        /// Gets or sets the background color for row marker background.
+        /// </summary>
+        public LinearGradientColorTable RowMouseOverBackground = null;
+        /// <summary>
+        /// Gets or sets the border color for row marker.
+        /// </summary>
+        public Color RowMouseOverBorder = Color.Empty;
+        /// <summary>
+        /// Gets or sets the background color for row marker background.
+        /// </summary>
+        public LinearGradientColorTable RowSelectedMouseOverBackground = null;
+        /// <summary>
+        /// Gets or sets the border color for row marker.
+        /// </summary>
+        public Color RowSelectedMouseOverBorder = Color.Empty;
+        /// <summary>
+        /// Gets or sets the background color for row marker background.
+        /// </summary>
+        public LinearGradientColorTable RowSelectedBackground = null;
+        /// <summary>
+        /// Gets or sets the border color for row marker.
+        /// </summary>
+        public Color RowSelectedBorder = Color.Empty;
+        /// <summary>
+        /// Gets or sets the background color for row marker background.
+        /// </summary>
+        public LinearGradientColorTable RowPressedBackground = null;
+        /// <summary>
+        /// Gets or sets the border color for row marker.
+        /// </summary>
+        public Color RowPressedBorder = Color.Empty;
+
+        /// <summary>
+        /// Gets or sets the color of the grid lines.
+        /// </summary>
+        public Color GridColor = SystemColors.ControlDark;
+
+        /// <summary>
+        /// Gets or sets the background color of selector cell usually located in top-left corner.
+        /// </summary>
+        public LinearGradientColorTable SelectorBackground = null;
+        /// <summary>
+        /// Gets or sets the border color of selector cell usually located in top-left corner.
+        /// </summary>
+        public Color SelectorBorder = Color.Empty;
+        /// <summary>
+        /// Gets or sets the light border color of selector cell usually located in top-left corner.
+        /// </summary>
+        public Color SelectorBorderLight = Color.Empty;
+        /// <summary>
+        /// Gets or sets the dark border color of selector cell usually located in top-left corner.
+        /// </summary>
+        public Color SelectorBorderDark = Color.Empty;
+        /// <summary>
+        /// Gets or sets the sign color of selector cell usually located in top-left corner.
+        /// </summary>
+        public LinearGradientColorTable SelectorSign = null;
+
+        /// <summary>
+        /// Gets or sets the background color of selector cell usually located in top-left corner.
+        /// </summary>
+        public LinearGradientColorTable SelectorMouseOverBackground = null;
+        /// <summary>
+        /// Gets or sets the border color of selector cell usually located in top-left corner.
+        /// </summary>
+        public Color SelectorMouseOverBorder = Color.Empty;
+        /// <summary>
+        /// Gets or sets the light border color of selector cell usually located in top-left corner.
+        /// </summary>
+        public Color SelectorMouseOverBorderLight = Color.Empty;
+        /// <summary>
+        /// Gets or sets the dark border color of selector cell usually located in top-left corner.
+        /// </summary>
+        public Color SelectorMouseOverBorderDark = Color.Empty;
+        /// <summary>
+        /// Gets or sets the sign color of selector cell usually located in top-left corner.
+        /// </summary>
+        public LinearGradientColorTable SelectorMouseOverSign = null;
+    }
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/Rendering/Office2007DialogLauncherColorTable.cs b/PROMS/DotNetBar Source Code/Rendering/Office2007DialogLauncherColorTable.cs
new file mode 100644
index 00000000..f5d3e5db
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/Office2007DialogLauncherColorTable.cs	
@@ -0,0 +1,27 @@
+using System;
+using System.Drawing;
+using System.Text;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    /// <summary>
+    /// Defines color table for the Dialog Launcher button.
+    /// </summary>
+    public class Office2007DialogLauncherColorTable
+    {
+        /// <summary>
+        /// Gets or sets the colors for the default state.
+        /// </summary>
+        public Office2007DialogLauncherStateColorTable Default = new Office2007DialogLauncherStateColorTable();
+
+        /// <summary>
+        /// Gets or sets the colors for the mouse over state.
+        /// </summary>
+        public Office2007DialogLauncherStateColorTable MouseOver = new Office2007DialogLauncherStateColorTable();
+
+        /// <summary>
+        /// Gets or sets the colors for the pressed state.
+        /// </summary>
+        public Office2007DialogLauncherStateColorTable Pressed = new Office2007DialogLauncherStateColorTable();
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/Office2007DialogLauncherStateColorTable.cs b/PROMS/DotNetBar Source Code/Rendering/Office2007DialogLauncherStateColorTable.cs
new file mode 100644
index 00000000..4b9b25d6
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/Office2007DialogLauncherStateColorTable.cs	
@@ -0,0 +1,39 @@
+using System;
+using System.Drawing;
+using System.Text;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    /// <summary>
+    /// Defines the color table for dialog launcher state.
+    /// </summary>
+    public class Office2007DialogLauncherStateColorTable
+    {
+        /// <summary>
+        /// Gets or sets the color of dialog launcher symbol.
+        /// </summary>
+        public Color DialogLauncher = ColorScheme.GetColor("668EAF");
+        /// <summary>
+        /// Gets or sets the shade color of dialog launcher symbol.
+        /// </summary>
+        public Color DialogLauncherShade = Color.White;
+
+        /// <summary>
+        /// Gets or sets the background color for the top part of the element.
+        /// </summary>
+        public LinearGradientColorTable TopBackground = new LinearGradientColorTable();
+        /// <summary>
+        /// Gets or sets the background color for the bottom part of the element.
+        /// </summary>
+        public LinearGradientColorTable BottomBackground = new LinearGradientColorTable();
+
+        /// <summary>
+        /// Gets or sets the outer border colors.
+        /// </summary>
+        public LinearGradientColorTable OuterBorder = new LinearGradientColorTable();
+        /// <summary>
+        /// Gets or sets the inner border colors.
+        /// </summary>
+        public LinearGradientColorTable InnerBorder = new LinearGradientColorTable();
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/Office2007FormCaptionColorTable.cs b/PROMS/DotNetBar Source Code/Rendering/Office2007FormCaptionColorTable.cs
new file mode 100644
index 00000000..dbed5886
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/Office2007FormCaptionColorTable.cs	
@@ -0,0 +1,37 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    /// <summary>
+    /// Defines the color table for all states of Office 2007 style form caption.
+    /// </summary>
+    public class Office2007FormColorTable
+    {
+        /// <summary>
+        /// Gets or sets the color table for caption in active state.
+        /// </summary>
+        public Office2007FormStateColorTable Active = new Office2007FormStateColorTable();
+
+        /// <summary>
+        /// Gets or sets the color table for caption in inactive state.
+        /// </summary>
+        public Office2007FormStateColorTable Inactive = new Office2007FormStateColorTable();
+
+        /// <summary>
+        /// Gets or sets the background color of the form.
+        /// </summary>
+        public Color BackColor = Color.Empty;
+
+        /// <summary>
+        /// Gets or sets the text color of the form.
+        /// </summary>
+        public Color TextColor = Color.Empty;
+
+        /// <summary>
+        /// Gets or sets the MDI Client Background image.
+        /// </summary>
+        public Image MdiClientBackgroundImage = null;
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/Office2007FormCaptionStateColorTable.cs b/PROMS/DotNetBar Source Code/Rendering/Office2007FormCaptionStateColorTable.cs
new file mode 100644
index 00000000..90e7996a
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/Office2007FormCaptionStateColorTable.cs	
@@ -0,0 +1,42 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    /// <summary>
+    /// Defines color table for the Office 2007 style Form caption color state.
+    /// </summary>
+    public class Office2007FormStateColorTable
+    {
+        /// <summary>
+        /// Gets or sets the colors for the top part of the background.
+        /// </summary>
+        public LinearGradientColorTable CaptionTopBackground = null;
+
+        /// <summary>
+        /// Gets or sets the colors for the bottom part of the background.
+        /// </summary>
+        public LinearGradientColorTable CaptionBottomBackground = null;
+
+        /// <summary>
+        /// Gets or sets the array of colors used to draw the border that separates the form caption and the form content. Applies only to the Office2007Form rendering.
+        /// </summary>
+        public Color[] CaptionBottomBorder = null;
+
+        /// <summary>
+        /// Gets or sets the color of caption text.
+        /// </summary>
+        public Color CaptionText = Color.Empty;
+
+        /// <summary>
+        /// Gets or sets the color of caption extra text that is appended to the caption.
+        /// </summary>
+        public Color CaptionTextExtra = Color.Empty;
+
+        /// <summary>
+        /// Gets or sets the array of colors that represents the border colors. Outer border is at index 0.
+        /// </summary>
+        public Color[] BorderColors = null; // OuterBorder = Color.Empty;
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/Office2007GalleryColorTable.cs b/PROMS/DotNetBar Source Code/Rendering/Office2007GalleryColorTable.cs
new file mode 100644
index 00000000..b2972f48
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/Office2007GalleryColorTable.cs	
@@ -0,0 +1,27 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    /// <summary>
+    /// Represents the color table used by the Gallery container.
+    /// </summary>
+    public class Office2007GalleryColorTable
+    {
+        /// <summary>
+        /// Gets or sets the background color of the Gallery Group label when gallery is displayed on popup.
+        /// </summary>
+        public Color GroupLabelBackground = Color.Empty;
+
+        /// <summary>
+        /// Gets or sets the text color of the Gallery Group label when gallery is displayed on popup.
+        /// </summary>
+        public Color GroupLabelText = Color.Empty;
+
+        /// <summary>
+        /// Gets or sets the border color of the Gallery Group label when gallery is displayed on popup.
+        /// </summary>
+        public Color GroupLabelBorder = Color.Empty;
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/Office2007ItemGroupColorTable.cs b/PROMS/DotNetBar Source Code/Rendering/Office2007ItemGroupColorTable.cs
new file mode 100644
index 00000000..3ba6c07c
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/Office2007ItemGroupColorTable.cs	
@@ -0,0 +1,41 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    /// <summary>
+    /// Represents color table for ItemContainer object with BeginGroup set to true.
+    /// </summary>
+    public class Office2007ItemGroupColorTable
+    {
+        /// <summary>
+        /// Gets or sets the outer border colors.
+        /// </summary>
+        public LinearGradientColorTable OuterBorder = new LinearGradientColorTable(ColorScheme.GetColor("99B6E0"), ColorScheme.GetColor("7394BD"));
+        /// <summary>
+        /// Gets or sets the inner border colors.
+        /// </summary>
+        public LinearGradientColorTable InnerBorder = new LinearGradientColorTable(ColorScheme.GetColor("D5E3F1"), ColorScheme.GetColor("E3EDFB"));
+
+        /// <summary>
+        /// Gets or sets the top background colors.
+        /// </summary>
+        public LinearGradientColorTable TopBackground = new LinearGradientColorTable(ColorScheme.GetColor("C8DBEE"), ColorScheme.GetColor("C9DDF6"));
+        /// <summary>
+        /// Gets or sets the bottom background colors.
+        /// </summary>
+        public LinearGradientColorTable BottomBackground = new LinearGradientColorTable(ColorScheme.GetColor("BCD0E9"), ColorScheme.GetColor("D0E1F7"));
+
+        /// <summary>
+        /// Gets or sets the dark color of item devider for items inside of the ItemContainer.
+        /// </summary>
+        public Color ItemGroupDividerDark = Color.FromArgb(196, ColorScheme.GetColor("B8C8DC"));
+
+        /// <summary>
+        /// Gets or sets the light color of item devider for items inside of the ItemContainer.
+        /// </summary>
+        public Color ItemGroupDividerLight = Color.FromArgb(128, ColorScheme.GetColor("FFFFFF"));
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/Office2007KeyTipsColorTable.cs b/PROMS/DotNetBar Source Code/Rendering/Office2007KeyTipsColorTable.cs
new file mode 100644
index 00000000..e496e811
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/Office2007KeyTipsColorTable.cs	
@@ -0,0 +1,25 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    /// <summary>
+    /// Represents the color table for key tips.
+    /// </summary>
+    public class Office2007KeyTipsColorTable
+    {
+        /// <summary>
+        /// Gets or sets KeyTip Text color.
+        /// </summary>
+        public Color KeyTipText = ColorScheme.GetColor(0x4C4C4C);
+        /// <summary>
+        /// Gets or sets KeyTip border color.
+        /// </summary>
+        public Color KeyTipBorder = ColorScheme.GetColor(0x767676);
+        /// <summary>
+        /// Gets or sets KeyTip Background color.
+        /// </summary>
+        public Color KeyTipBackground = ColorScheme.GetColor(0xFDFDFE);
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/Office2007ListViewColorTable.cs b/PROMS/DotNetBar Source Code/Rendering/Office2007ListViewColorTable.cs
new file mode 100644
index 00000000..9caf3661
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/Office2007ListViewColorTable.cs	
@@ -0,0 +1,47 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    /// <summary>
+    /// Represents color table for ListViewEx control.
+    /// </summary>
+    public class Office2007ListViewColorTable
+    {
+        /// <summary>
+        /// Gets or sets the background color of the columns.
+        /// </summary>
+        public LinearGradientColorTable ColumnBackground = null;
+
+        /// <summary>
+        /// Gets or sets the color of the column separator.
+        /// </summary>
+        public Color ColumnSeparator = Color.Empty;
+
+        /// <summary>
+        /// Gets or sets the color of the column text.
+        /// </summary>
+        public Color ColumnForeColor = Color.Empty;
+
+        /// <summary>
+        /// Gets or sets the color of the control border.
+        /// </summary>
+        public Color Border = Color.Empty;
+
+        /// <summary>
+        /// Gets or sets the background colors for the selected item.
+        /// </summary>
+        public LinearGradientColorTable SelectionBackground = null;
+
+        /// <summary>
+        /// Gets or sets the color of the selected item border that is draw on top and bottom of the selection.
+        /// </summary>
+        public Color SelectionBorder = Color.Empty;
+
+        /// <summary>
+        /// Gets or sets the text color for selected item.
+        /// </summary>
+        public Color SelectionForeColor = Color.Empty;
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/Office2007MenuColorTable.cs b/PROMS/DotNetBar Source Code/Rendering/Office2007MenuColorTable.cs
new file mode 100644
index 00000000..1f65fded
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/Office2007MenuColorTable.cs	
@@ -0,0 +1,82 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    /// <summary>
+    /// Defines the color table for the menus.
+    /// </summary>
+    public class Office2007MenuColorTable
+    {
+        /// <summary>
+        /// Gets or sets the menu background colors.
+        /// </summary>
+        public LinearGradientColorTable Background = null;
+
+        /// <summary>
+        /// Gets or sets the menu side background colors.
+        /// </summary>
+        public LinearGradientColorTable Side = null;
+
+        /// <summary>
+        /// Gets or sets the menu side background colors for the items that were not recently used.
+        /// </summary>
+        public LinearGradientColorTable SideUnused = null;
+
+        /// <summary>
+        /// Gets or sets the menu border background colors.
+        /// </summary>
+        public LinearGradientColorTable Border = null;
+
+        /// <summary>
+        /// Gets or sets the menu side border.
+        /// </summary>
+        public LinearGradientColorTable SideBorder = null;
+
+        /// <summary>
+        /// Gets or sets the light menu side border.
+        /// </summary>
+        public LinearGradientColorTable SideBorderLight = null;
+
+        /// <summary>
+        /// Gets or sets the background color blend for the special file menu background.
+        /// </summary>
+        public BackgroundColorBlendCollection FileBackgroundBlend = new BackgroundColorBlendCollection();
+
+        /// <summary>
+        /// Gets or sets the two column container border color.
+        /// </summary>
+        public Color FileContainerBorder = Color.Empty;
+
+        /// <summary>
+        /// Gets or sets the two column container light border color.
+        /// </summary>
+        public Color FileContainerBorderLight = Color.Empty;
+
+        /// <summary>
+        /// Gets or sets the background color of first file column.
+        /// </summary>
+        public Color FileColumnOneBackground = Color.Empty;
+
+        /// <summary>
+        /// Gets or sets the border color of first file column.
+        /// </summary>
+        public Color FileColumnOneBorder = Color.Empty;
+
+        /// <summary>
+        /// Gets or sets the background color of first file column.
+        /// </summary>
+        public Color FileColumnTwoBackground = Color.Empty;
+
+        ///// <summary>
+        ///// Gets or sets the border color of first file column.
+        ///// </summary>
+        //public Color FileColumnTwoBorder = Color.Empty;
+
+        /// <summary>
+        /// Gets or sets the background color blend for the bottom container on file menu.
+        /// </summary>
+        public BackgroundColorBlendCollection FileBottomContainerBackgroundBlend = new BackgroundColorBlendCollection();
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/Office2007NavigationPaneColorTable.cs b/PROMS/DotNetBar Source Code/Rendering/Office2007NavigationPaneColorTable.cs
new file mode 100644
index 00000000..acef0119
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/Office2007NavigationPaneColorTable.cs	
@@ -0,0 +1,16 @@
+using System;
+using System.Text;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    /// <summary>
+    /// Defines the color table for the NavigationPane control.
+    /// </summary>
+    public class Office2007NavigationPaneColorTable
+    {
+        /// <summary>
+        /// Gets or sets the background color collection blend for the button background.
+        /// </summary>
+        public GradientColorTable ButtonBackground = null;
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/Office2007NavigationPanePainter.cs b/PROMS/DotNetBar Source Code/Rendering/Office2007NavigationPanePainter.cs
new file mode 100644
index 00000000..73a1ad44
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/Office2007NavigationPanePainter.cs	
@@ -0,0 +1,34 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    internal class Office2007NavigationPanePainter : NavigationPanePainter, IOffice2007Painter
+    {
+        #region IOffice2007Painter
+        private Office2007ColorTable m_ColorTable = null;
+
+        /// <summary>
+        /// Gets or sets color table used by renderer.
+        /// </summary>
+        public Office2007ColorTable ColorTable
+        {
+            get { return m_ColorTable; }
+            set { m_ColorTable = value; }
+        }
+        #endregion
+
+        public override void PaintButtonBackground(NavPaneRenderEventArgs e)
+        {
+            Graphics g = e.Graphics;
+            Rectangle r = e.Bounds;
+            Office2007NavigationPaneColorTable ct = m_ColorTable.NavigationPane;
+
+            using (Brush brush = DisplayHelp.CreateBrush(r, ct.ButtonBackground))
+            {
+                g.FillRectangle(brush, r);
+            }
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/Office2007ProgressBarColorTable.cs b/PROMS/DotNetBar Source Code/Rendering/Office2007ProgressBarColorTable.cs
new file mode 100644
index 00000000..61871731
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/Office2007ProgressBarColorTable.cs	
@@ -0,0 +1,42 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    /// <summary>
+    /// Defines color table for the Office 2007 style ProgressBarItem.
+    /// </summary>
+    public class Office2007ProgressBarColorTable
+    {
+        /// <summary>
+        /// Gets or sets the background color collection blend for the item background.
+        /// </summary>
+        public GradientColorTable BackgroundColors = null;
+
+        /// <summary>
+        /// Gets or sets the outer border color.
+        /// </summary>
+        public Color OuterBorder = Color.Empty;
+
+        /// <summary>
+        /// Gets or sets the inner border color.
+        /// </summary>
+        public Color InnerBorder = Color.Empty;
+
+        /// <summary>
+        /// Gets or sets the color collection blend for the current progress part of the item.
+        /// </summary>
+        public GradientColorTable Chunk = null;
+
+        /// <summary>
+        /// Gets or sets the color collection blend for overlay for the current progress of the item.
+        /// </summary>
+        public GradientColorTable ChunkOverlay = null;
+
+        /// <summary>
+        /// Gets or sets the color collection blend of shadow for the current progress of the item.
+        /// </summary>
+        public GradientColorTable ChunkShadow = null;
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/Office2007ProgressBarItemPainter.cs b/PROMS/DotNetBar Source Code/Rendering/Office2007ProgressBarItemPainter.cs
new file mode 100644
index 00000000..24095be4
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/Office2007ProgressBarItemPainter.cs	
@@ -0,0 +1,162 @@
+using System;
+using System.Text;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    internal class Office2007ProgressBarItemPainter : ProgressBarItemPainter, IOffice2007Painter
+    {
+        #region IOffice2007Painter
+        private Office2007ColorTable m_ColorTable = null; //new Office2007ColorTable();
+
+        /// <summary>
+        /// Gets or sets color table used by renderer.
+        /// </summary>
+        public Office2007ColorTable ColorTable
+        {
+            get { return m_ColorTable; }
+            set { m_ColorTable = value; }
+        }
+        #endregion
+
+        #region Internal Implementation
+        public override void Paint(ProgressBarItemRenderEventArgs e)
+        {
+            Rectangle r = e.ProgressBarItem.DisplayRectangle;
+            if (r.Width <= 0 || r.Height <= 0)
+                return;
+
+            ProgressBarItem item = e.ProgressBarItem;
+            Office2007ProgressBarColorTable ct = m_ColorTable.ProgressBarItem;
+            if(item.ColorTable == eProgressBarItemColor.Paused)
+                ct = m_ColorTable.ProgressBarItemPaused;
+            else if (item.ColorTable == eProgressBarItemColor.Error)
+                ct = m_ColorTable.ProgressBarItemError;
+            
+            Graphics g = e.Graphics;
+
+            SmoothingMode sm = g.SmoothingMode;
+            g.SmoothingMode = SmoothingMode.Default;
+
+            if (StyleManager.IsMetro(item.EffectiveStyle))
+            {
+                DisplayHelp.DrawRectangle(g, ct.OuterBorder, r);
+            }
+            else
+                DisplayHelp.DrawRoundedRectangle(g, ct.OuterBorder, r, 2);
+            r.Inflate(-Dpi.Width1, -Dpi.Height1);
+
+            
+            Brush brush = DisplayHelp.CreateBrush(r, ct.BackgroundColors);
+            if (brush != null)
+            {
+                g.FillRectangle(brush, r);
+                brush.Dispose();
+            }
+            g.SmoothingMode = sm;
+            if (!ct.InnerBorder.IsEmpty)
+                DisplayHelp.DrawRoundedRectangle(g, ct.InnerBorder, r, 2);
+            r.Inflate(-Dpi.Width1, -Dpi.Height1);
+            
+            Region oldClip = g.Clip;
+            try
+            {
+                g.SetClip(r, CombineMode.Intersect);
+
+                Rectangle chunkRect = r;
+                if (item.ProgressType == eProgressItemType.Marquee)
+                {
+                    // Horizontal
+                    if (item.Orientation == eOrientation.Horizontal)
+                    {
+                        chunkRect.Width = (int)(chunkRect.Width * .3);
+                        chunkRect.X += r.Width * item.MarqueeValue / 100 - (int)(chunkRect.Width / 2);
+                    }
+                    // Vertical
+                    else if (item.Orientation == eOrientation.Vertical)
+                    {
+                        chunkRect.Height = (int)(chunkRect.Height * .3);
+                        chunkRect.Y += r.Height * item.MarqueeValue / 100 - (int)(chunkRect.Height / 2);
+                    }
+                }
+                else
+                {
+                    // Horizontal
+                    if (item.Orientation == eOrientation.Horizontal)
+                        chunkRect.Width = (int)(chunkRect.Width * ((float)(item.Value - item.Minimum) / (float)(item.Maximum - item.Minimum)));
+                    // Vertical
+                    else if (item.Orientation == eOrientation.Vertical)
+                    {
+                        int height = (int)(chunkRect.Height * ((float)(item.Value - item.Minimum) / (float)(item.Maximum - item.Minimum)));
+                        chunkRect.Y = chunkRect.Bottom - height;
+                        chunkRect.Height = height;
+                    }
+                }
+                if (chunkRect.Width <= 0 || chunkRect.Height<=0) return;
+                
+                brush = DisplayHelp.CreateBrush(chunkRect, ct.Chunk);
+                if (brush != null)
+                {
+                    g.SmoothingMode = SmoothingMode.None;
+                    g.FillRectangle(brush, chunkRect);
+                    brush.Dispose();
+                    g.SmoothingMode = sm;
+                }
+                GradientColorTable overlay = ct.ChunkOverlay;
+                if (item.Orientation == eOrientation.Horizontal)
+                    overlay.LinearGradientAngle = 90;
+                else
+                    overlay.LinearGradientAngle = 0;
+                brush = DisplayHelp.CreateBrush(chunkRect, overlay);
+                if (brush != null)
+                {
+                    g.FillRectangle(brush, chunkRect);
+
+                    if (item.ProgressType == eProgressItemType.Marquee)
+                    {
+                        // Horizontal
+                        if (item.Orientation == eOrientation.Horizontal && chunkRect.Right > r.Right + 4)
+                            chunkRect = new Rectangle(r.X, r.Y, chunkRect.Right - r.Right - 4, r.Height);
+                        // Vertical
+                        else if (item.Orientation == eOrientation.Vertical && chunkRect.Bottom > r.Bottom + 4)
+                            chunkRect = new Rectangle(r.X, r.Y, r.Height, chunkRect.Bottom - r.Bottom - 4);
+                        g.FillRectangle(brush, chunkRect);
+                    }
+
+                    brush.Dispose();
+                }
+                // Horizontal
+                if (item.Orientation == eOrientation.Horizontal && chunkRect.Right + 4 <= r.Right)
+                {
+                    chunkRect.X = chunkRect.Right;
+                    chunkRect.Width = 4;
+                    brush = DisplayHelp.CreateBrush(chunkRect, ct.ChunkShadow);
+                    if (brush != null)
+                    {
+                        g.FillRectangle(brush, chunkRect);
+                        brush.Dispose();
+                    }
+                }
+                // Vertical
+                else if (item.Orientation == eOrientation.Vertical && chunkRect.Y - 3 >= r.Y)
+                {
+                    chunkRect.Y = chunkRect.Y - 3;
+                    chunkRect.Height = 3;
+                    brush = DisplayHelp.CreateBrush(chunkRect, ct.ChunkShadow.Colors, ct.ChunkShadow.LinearGradientAngle-90, ct.ChunkShadow.GradientType);
+                    if (brush != null)
+                    {
+                        g.FillRectangle(brush, chunkRect);
+                        brush.Dispose();
+                    }
+                }
+            }
+            finally
+            {
+                g.Clip = oldClip;
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/Office2007QatCustomizeItemPainter.cs b/PROMS/DotNetBar Source Code/Rendering/Office2007QatCustomizeItemPainter.cs
new file mode 100644
index 00000000..d6da995c
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/Office2007QatCustomizeItemPainter.cs	
@@ -0,0 +1,99 @@
+using System;
+using System.Text;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    /// <summary>
+    /// Defines painter for the Office 2007 style QAT Customize Item.
+    /// </summary>
+    internal class Office2007QatCustomizeItemPainter : QatCustomizeItemPainter, IOffice2007Painter
+    {
+        #region IOffice2007Painter
+        private Office2007ColorTable m_ColorTable = null; //new Office2007ColorTable();
+
+        /// <summary>
+        /// Gets or sets color table used by renderer.
+        /// </summary>
+        public Office2007ColorTable ColorTable
+        {
+            get { return m_ColorTable; }
+            set { m_ColorTable = value; }
+        }
+        #endregion
+
+        #region Internal Implementation
+        public override void Paint(QatCustomizeItemRendererEventArgs e)
+        {
+            Graphics g = e.Graphics;
+            QatCustomizeItem item = e.CustomizeItem;
+            Rectangle r = item.DisplayRectangle;
+            Region oldClip = null;
+            if (g.Clip != null) oldClip = g.Clip as Region;
+            g.SetClip(item.DisplayRectangle, CombineMode.Intersect);
+
+
+            Office2007ButtonItemColorTable buttonColorTable = GetColorTable();
+            Office2007ButtonItemStateColorTable state = buttonColorTable.Default;
+
+            if (item.Expanded)
+                state = buttonColorTable.Expanded;
+            else if (item.IsMouseOver)
+                state = buttonColorTable.MouseOver;
+
+            if(StyleManager.IsMetro(item.EffectiveStyle))
+                Office2007ButtonItemPainter.PaintBackground(g, state, r, RoundRectangleShapeDescriptor.RectangleShape);
+            else
+                Office2007ButtonItemPainter.PaintBackground(g, state, r, RoundRectangleShapeDescriptor.RoundCorner2);
+
+            SmoothingMode sm = g.SmoothingMode;
+            g.SmoothingMode = SmoothingMode.Default;
+            
+            Color color = state.ExpandBackground;
+            Color colorLight = state.ExpandLight;
+
+            Presentation.Shape shape = new Presentation.Shape();
+            Presentation.ShapeBorder bl = new Presentation.ShapeBorder(colorLight, 1);
+            Presentation.ShapeBorder b = new Presentation.ShapeBorder(color, 1);
+            shape.Children.Add(new Presentation.Line(new Presentation.Location(0, 0), new Presentation.Location(Dpi.Width4, 0), b));
+            shape.Children.Add(new Presentation.Line(new Presentation.Location(0, Dpi.Height1), new Presentation.Location(Dpi.Width4, Dpi.Height1), bl));
+
+            shape.Children.Add(new Presentation.Line(new Presentation.Location(0, Dpi.Height3), new Presentation.Location(Dpi.Width4, Dpi.Height3), b));
+            shape.Children.Add(new Presentation.Line(new Presentation.Location(Dpi.Width4, Dpi.Height3), new Presentation.Location(Dpi.Width2, Dpi.Height5), b));
+            shape.Children.Add(new Presentation.Line(new Presentation.Location(Dpi.Width2, Dpi.Height5), new Presentation.Location(0, Dpi.Height3), b));
+            shape.Children.Add(new Presentation.Line(new Presentation.Location(Dpi.Width1, Dpi.Height4), new Presentation.Location(Dpi.Width3, Dpi.Height4), b));
+            shape.Children.Add(new Presentation.Line(new Presentation.Location(Dpi.Width4, Dpi.Height4), new Presentation.Location(Dpi.Width2, Dpi.Height6), bl));
+            shape.Children.Add(new Presentation.Line(new Presentation.Location(Dpi.Width2, Dpi.Height6), new Presentation.Location(0, Dpi.Height4), bl));
+
+            Rectangle sr = new Rectangle(r.X + (r.Width - Dpi.Width5) / 2, r.Y + (r.Height - Dpi.Height7) / 2, Dpi.Width5, Dpi.Height7);
+            Presentation.ShapePaintInfo pi = new Presentation.ShapePaintInfo(g, sr);
+            shape.Paint(pi);
+
+            g.SmoothingMode = sm;
+
+            if (oldClip != null)
+            {
+                g.Clip = oldClip;
+                oldClip.Dispose();
+            }
+            else
+                g.ResetClip();
+        }
+
+        protected virtual Office2007ButtonItemColorTable GetColorTable()
+        {
+            Office2007ColorTable colorTable = this.ColorTable;
+            Office2007ButtonItemColorTable buttonColorTable = null;
+
+            eButtonColor color = eButtonColor.Orange;
+            buttonColorTable = colorTable.ButtonItemColors[Enum.GetName(typeof(eButtonColor), color)];
+
+            if (buttonColorTable == null)
+                return colorTable.ButtonItemColors[0];
+
+            return buttonColorTable;
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/Office2007QatOverflowPainter.cs b/PROMS/DotNetBar Source Code/Rendering/Office2007QatOverflowPainter.cs
new file mode 100644
index 00000000..df96ea37
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/Office2007QatOverflowPainter.cs	
@@ -0,0 +1,91 @@
+using System;
+using System.Text;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    /// <summary>
+    /// Defines Office 2007 style QAT painter.
+    /// </summary>
+    internal class Office2007QatOverflowPainter : QatOverflowPainter, IOffice2007Painter
+    {
+        #region IOffice2007Painter
+        private Office2007ColorTable m_ColorTable = null; //new Office2007ColorTable();
+
+        /// <summary>
+        /// Gets or sets color table used by renderer.
+        /// </summary>
+        public Office2007ColorTable ColorTable
+        {
+            get { return m_ColorTable; }
+            set { m_ColorTable = value; }
+        }
+        #endregion
+
+        #region Internal Implementation
+        public override void Paint(QatOverflowItemRendererEventArgs e)
+        {
+            Graphics g = e.Graphics;
+            QatOverflowItem item = e.OverflowItem;
+            Rectangle r = item.DisplayRectangle;
+            Region oldClip = null;
+            if(g.Clip!=null) oldClip = g.Clip.Clone() as Region;
+            g.SetClip(item.DisplayRectangle, CombineMode.Intersect);
+
+            
+            Office2007ButtonItemColorTable buttonColorTable = GetColorTable();
+            Office2007ButtonItemStateColorTable state = buttonColorTable.Default;
+            
+            if (item.Expanded)
+                state = buttonColorTable.Expanded;
+            else if (item.IsMouseOver)
+                state = buttonColorTable.MouseOver;
+
+            Office2007ButtonItemPainter.PaintBackground(g, state, r, RoundRectangleShapeDescriptor.RoundCorner2);
+
+            SmoothingMode sm = g.SmoothingMode;
+            g.SmoothingMode = SmoothingMode.Default;
+
+            Color color = state.ExpandBackground;
+            Color colorLight = state.ExpandLight;
+
+            Presentation.Shape shape = new Presentation.Shape();
+            Presentation.ShapeBorder bl = new Presentation.ShapeBorder(colorLight, 1);
+            Presentation.ShapeBorder b = new Presentation.ShapeBorder(color, 1);
+            shape.Children.Add(new Presentation.Line(new Presentation.Location(0, 0), new Presentation.Location(2, 2), bl));
+            shape.Children.Add(new Presentation.Line(new Presentation.Location(2, 2), new Presentation.Location(0, 4), bl));
+            shape.Children.Add(new Presentation.Line(new Presentation.Location(0, 1), new Presentation.Location(1, 2), b));
+            shape.Children.Add(new Presentation.Line(new Presentation.Location(1, 2), new Presentation.Location(0, 3), b));
+            shape.Children.Add(new Presentation.Line(new Presentation.Location(0, 3), new Presentation.Location(0, 1), b));
+
+            Rectangle sr = new Rectangle(r.X + (r.Width - 5)/2, r.Y + (r.Height - 4) / 2, 3, 6);
+            Presentation.ShapePaintInfo pi = new Presentation.ShapePaintInfo(g, sr);
+            shape.Paint(pi);
+            sr.Offset(4, 0);
+            pi.Bounds = sr;
+            shape.Paint(pi);
+            g.SmoothingMode = sm;
+
+            if (oldClip != null)
+                g.Clip = oldClip;
+            else
+                g.ResetClip();
+        }
+
+        protected virtual Office2007ButtonItemColorTable GetColorTable()
+        {
+            Office2007ColorTable colorTable = this.ColorTable;
+            Office2007ButtonItemColorTable buttonColorTable = null;
+
+            eButtonColor color = eButtonColor.Orange;
+            buttonColorTable = colorTable.ButtonItemColors[Enum.GetName(typeof(eButtonColor), color)];
+
+            if (buttonColorTable == null)
+                return colorTable.ButtonItemColors[0];
+
+            return buttonColorTable;
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/Office2007QuickAccessToolbarColorTable.cs b/PROMS/DotNetBar Source Code/Rendering/Office2007QuickAccessToolbarColorTable.cs
new file mode 100644
index 00000000..dd1b319c
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/Office2007QuickAccessToolbarColorTable.cs	
@@ -0,0 +1,38 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    /// <summary>
+    /// Defines the color table for the quick access toolbar in all states.
+    /// </summary>
+    public class Office2007QuickAccessToolbarColorTable
+    {
+        /// <summary>
+        /// Gets or sets the colors for the quick access toolbar background when hosted in ribbon control caption and form is active
+        /// or the background colors when toolbar is hosted below the ribbon control.
+        /// </summary>
+        public Office2007QuickAccessToolbarStateColorTable Active = new Office2007QuickAccessToolbarStateColorTable();
+
+        /// <summary>
+        /// Gets or sets the colors for the quick access toolbar background when hosted in ribbon control caption and form is inactive
+        /// </summary>
+        public Office2007QuickAccessToolbarStateColorTable Inactive = new Office2007QuickAccessToolbarStateColorTable();
+
+        /// <summary>
+        /// Gets or sets the colors for the quick access toolbar background when positioned below the ribbon bar.
+        /// </summary>
+        public Office2007QuickAccessToolbarStateColorTable Standalone = new Office2007QuickAccessToolbarStateColorTable();
+
+        /// <summary>
+        /// Gets or sets the background color of Customize Quick Access Toolbar menu label displayed on customize quick access toolbar menu.
+        /// </summary>
+        public Color QatCustomizeMenuLabelBackground = Color.Empty;
+
+        /// <summary>
+        /// Gets or sets the text color of Customize Quick Access Toolbar menu label displayed on customize quick access toolbar menu.
+        /// </summary>
+        public Color QatCustomizeMenuLabelText = Color.Empty;
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/Office2007QuickAccessToolbarStateColorTable.cs b/PROMS/DotNetBar Source Code/Rendering/Office2007QuickAccessToolbarStateColorTable.cs
new file mode 100644
index 00000000..7bc686e9
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/Office2007QuickAccessToolbarStateColorTable.cs	
@@ -0,0 +1,42 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    /// <summary>
+    /// Defines the color table for the Quick Access toolbar.
+    /// </summary>
+    public class Office2007QuickAccessToolbarStateColorTable
+    {
+        /// <summary>
+        /// Gets or sets the colors of the top background.
+        /// </summary>
+        public LinearGradientColorTable TopBackground = null;
+
+        /// <summary>
+        /// Gets or sets the colors of the bottom background.
+        /// </summary>
+        public LinearGradientColorTable BottomBackground = null;
+
+        /// <summary>
+        /// Gets or sets the outer border color.
+        /// </summary>
+        public Color OutterBorderColor = Color.Empty;
+
+        /// <summary>
+        /// Gets or sets the middle border color.
+        /// </summary>
+        public Color MiddleBorderColor = Color.Empty;
+
+        /// <summary>
+        /// Gets or sets the inner border color.
+        /// </summary>
+        public Color InnerBorderColor = Color.Empty;
+
+        /// <summary>
+        /// Gets or sets the border when Windows Vista Glass is enabled.
+        /// </summary>
+        public LinearGradientColorTable GlassBorder = null;
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/Office2007Renderer.cs b/PROMS/DotNetBar Source Code/Rendering/Office2007Renderer.cs
new file mode 100644
index 00000000..cbd0ea9e
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/Office2007Renderer.cs	
@@ -0,0 +1,805 @@
+using System;
+using System.Text;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using DevComponents.DotNetBar.Controls;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    /// <summary>
+    /// Represents Office 2007 Control renderer.
+    /// </summary>
+    public class Office2007Renderer : BaseRenderer
+    {
+        #region Events
+        /// <summary>
+        ///  Occurs when color table is changed by setting the ColorTable property on the renderer.
+        /// </summary>
+        public event EventHandler ColorTableChanged;
+        #endregion
+
+        #region Private Variables
+        //private Office12ColorTable m_ColorTable12 = null;
+        private Office2007ColorTable m_ColorTable = null;
+        #endregion
+
+        #region Constructor
+        public Office2007Renderer()
+        {
+            //m_ColorTable12 = new Office12ColorTable();
+            m_ColorTable = new Office2007ColorTable();
+        }
+        #endregion
+
+        #region Properties
+        /// <summary>
+        /// Gets or sets color table used by renderer.
+        /// </summary>
+        public Office2007ColorTable ColorTable
+        {
+            get { return m_ColorTable; }
+            set
+            {
+                m_ColorTable = value;
+                if (ColorTableChanged != null)
+                    ColorTableChanged(this, new EventArgs());
+            }
+        }
+        #endregion
+
+        #region Key Tips Rendering
+        /// <summary>
+        /// Draws KeyTip for an object. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+        /// do not want default rendering to occur do not call the base implementation. You can call OnRenderKeyTips method so events can occur.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        public override void DrawKeyTips(KeyTipsRendererEventArgs e)
+        {
+            KeyTipsPainter painter = PainterFactory.CreateKeyTipsPainter();
+            if (painter is IOffice2007Painter)
+                ((IOffice2007Painter)painter).ColorTable = m_ColorTable;
+
+            painter.PaintKeyTips(e);
+
+            base.DrawKeyTips(e);
+        }
+        #endregion
+
+        #region Rendering Tab Group Rendering
+        /// <summary>
+        /// Draws ribbon tab group. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+        /// do not want default rendering to occur do not call the base implementation. You can call OnRenderRibbonTabGroup method so events can occur.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        public override void DrawRibbonTabGroup(RibbonTabGroupRendererEventArgs e)
+        {
+            RibbonTabGroupPainter painter = PainterFactory.CreateRibbonTabGroupPainter(e.EffectiveStyle);
+            if (painter is IOffice2007Painter)
+                ((IOffice2007Painter)painter).ColorTable = m_ColorTable;
+            painter.PaintTabGroup(e);
+
+            base.DrawRibbonTabGroup(e);
+        }
+        #endregion
+
+        #region ItemContainer Rendering
+        /// <summary>
+        /// Draws item container. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+        /// do not want default rendering to occur do not call the base implementation. You can call OnRenderItemContainer method so events can occur.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        public override void DrawItemContainer(ItemContainerRendererEventArgs e)
+        {
+            ItemContainerPainter painter = PainterFactory.CreateItemContainerPainter(e.ItemContainer);
+            if (painter != null)
+            {
+                if (painter is IOffice2007Painter)
+                    ((IOffice2007Painter)painter).ColorTable = m_ColorTable;
+                painter.PaintBackground(e);
+            }
+
+            base.DrawItemContainer(e);
+        }
+
+        /// <summary>
+        /// Draws the separator for an item inside of item container. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+        /// do not want default rendering to occur do not call the base implementation. You can call OnRenderItemContainerSeparator method so events can occur.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        public override void DrawItemContainerSeparator(ItemContainerSeparatorRendererEventArgs e)
+        {
+            base.DrawItemContainerSeparator(e);
+
+            ItemContainerPainter painter = PainterFactory.CreateItemContainerPainter(e.ItemContainer);
+            if (painter != null)
+            {
+                if (painter is IOffice2007Painter)
+                    ((IOffice2007Painter)painter).ColorTable = m_ColorTable;
+                painter.PaintItemSeparator(e);
+            }
+        }
+        #endregion
+
+        #region ButtonItem Rendering
+        /// <summary>
+        /// Draws ButtonItem. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+        /// do not want default rendering to occur do not call the base implementation. You can call OnRenderButtonItem method so events can occur.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        public override void DrawButtonItem(ButtonItemRendererEventArgs e)
+        {
+            ButtonItemPainter painter = PainterFactory.CreateButtonPainter(e.ButtonItem);
+            if (painter != null)
+            {
+                if (painter is IOffice2007Painter)
+                    ((IOffice2007Painter)painter).ColorTable = m_ColorTable;
+                painter.PaintButton(e.ButtonItem, e.ItemPaintArgs);
+            }
+
+            base.DrawButtonItem(e);
+        }
+        #endregion
+
+        #region RibbonTabItem Rendering
+        /// <summary>
+        /// Draws RibbonTabItem. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+        /// do not want default rendering to occur do not call the base implementation. You can call OnRenderRibbonTabItem method so events can occur.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        public override void DrawRibbonTabItem(RibbonTabItemRendererEventArgs e)
+        {
+            ButtonItemPainter painter = PainterFactory.CreateRibbonTabItemPainter(e.RibbonTabItem);
+            if (painter != null)
+            {
+                if (painter is IOffice2007Painter)
+                    ((IOffice2007Painter)painter).ColorTable = m_ColorTable;
+                painter.PaintButton(e.RibbonTabItem, e.ItemPaintArgs);
+            }
+
+            base.DrawRibbonTabItem(e);
+        }
+        #endregion
+
+        #region Popup Toolbar Rendering
+        /// <summary>
+        /// Draws popup toolbar background. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+        /// do not want default rendering to occur do not call the base implementation. You can call OnRenderPopupToolbarBackground method so events can occur.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        public override void DrawPopupToolbarBackground(ToolbarRendererEventArgs e)
+        {
+            BarBackgroundPainter painter = PainterFactory.CreateBarBackgroundPainter(e.Bar);
+
+            if (painter is IOffice2007Painter)
+                ((IOffice2007Painter)painter).ColorTable = m_ColorTable;
+
+            painter.PaintPopupBackground(e);
+
+            base.DrawPopupToolbarBackground(e);
+        }
+        #endregion
+
+        #region Docked or Floating Toolbar Rendering
+        /// <summary>
+        /// Draws docked or floating toolbar background. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+        /// do not want default rendering to occur do not call the base implementation. You can call OnRenderToolbarBackground method so events can occur.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        public override void DrawToolbarBackground(ToolbarRendererEventArgs e)
+        {
+            BarBackgroundPainter painter = PainterFactory.CreateBarBackgroundPainter(e.Bar);
+
+            if (painter is IOffice2007Painter)
+                ((IOffice2007Painter)painter).ColorTable = m_ColorTable;
+
+            if (e.Bar.BarState == eBarState.Docked)
+                painter.PaintDockedBackground(e);
+            else if (e.Bar.BarState == eBarState.Floating)
+                painter.PaintFloatingBackground(e);
+
+            base.DrawToolbarBackground(e);
+        }
+
+        /// <summary>
+        /// Draws floating toolbar background.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        protected virtual void DrawFloatingToolbarBackground(ToolbarRendererEventArgs e)
+        {
+
+        }
+        #endregion
+
+        #region Ribbon Rendering
+        /// <summary>
+        /// Draws ribbon bar dialog launcher button. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+        /// do not want default rendering to occur do not call the base implementation. You can call OnRenderPopupToolbarBackground method so events can occur.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        public override void DrawRibbonDialogLauncher(RibbonBarRendererEventArgs e)
+        {
+            DialogLauncherPainter painter = PainterFactory.CreateRibbonBarPainter(e.RibbonBar);
+            if (painter is IOffice2007Painter)
+                ((IOffice2007Painter)painter).ColorTable = m_ColorTable;
+            painter.PaintDialogLauncher(e);
+
+            base.DrawRibbonDialogLauncher(e);
+        }
+
+        ///// <summary>
+        ///// Draws ribbon bar background. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+        ///// do not want default rendering to occur do not call the base implementation. You can call OnRenderRibbonBarBackground method so events can occur.
+        ///// </summary>
+        ///// <param name="e">Provides context information.</param>
+        //public override void DrawRibbonBarBackground(RibbonBarRendererEventArgs e)
+        //{
+        //    base.DrawRibbonBarBackground(e);
+
+        //    RibbonBarPainter painter = PainterFactory.CreateRibbonBarPainter(e.RibbonBar);
+        //    if (painter is IOffice2007Painter)
+        //        ((IOffice2007Painter)painter).ColorTable = m_ColorTable;
+        //    else if (painter is IOffice12Painter)
+        //        ((IOffice12Painter)painter).ColorTable = m_ColorTable12;
+        //    painter.PaintBackground(e);
+        //}
+
+        ///// <summary>
+        ///// Draws ribbon bar title. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+        ///// do not want default rendering to occur do not call the base implementation. You can call OnRenderRibbonBarTitle method so events can occur.
+        ///// </summary>
+        ///// <param name="e">Provides context information.</param>
+        //public override void DrawRibbonBarTitle(RibbonBarRendererEventArgs e)
+        //{
+        //    base.DrawRibbonBarTitle(e);
+
+        //    RibbonBarPainter painter = PainterFactory.CreateRibbonBarPainter(e.RibbonBar);
+        //    if (painter is IOffice2007Painter)
+        //        ((IOffice2007Painter)painter).ColorTable = m_ColorTable;
+        //    else if (painter is IOffice12Painter)
+        //        ((IOffice12Painter)painter).ColorTable = m_ColorTable12;
+        //    painter.PaintTitle(e);
+        //}
+        #endregion
+
+        #region ColorItem rendering
+        /// <summary>
+        /// Draws ColorItem. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+        /// do not want default rendering to occur do not call the base implementation. You can call OnRenderColorItem method so events can occur.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        public override void DrawColorItem(ColorItemRendererEventArgs e)
+        {
+            Rendering.ColorItemPainter painter = PainterFactory.CreateColorItemPainter(e.ColorItem);
+            if (painter is IOffice2007Painter)
+                ((IOffice2007Painter)painter).ColorTable = m_ColorTable;
+            painter.PaintColorItem(e);
+
+            base.DrawColorItem(e);
+        }
+        #endregion
+
+        #region Ribbon Control Rendering
+        /// <summary>
+        /// Draws the background of the Ribbon Control. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+        /// do not want default rendering to occur do not call the base implementation. You can call OnRenderRibbonControlBackground method so events can occur.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        public override void DrawRibbonControlBackground(RibbonControlRendererEventArgs e)
+        {
+            RibbonControlPainter painter = PainterFactory.CreateRibbonControlPainter(e.RibbonControl);
+            if (painter == null)
+                return;
+
+            if (painter is IOffice2007Painter)
+                ((IOffice2007Painter)painter).ColorTable = m_ColorTable;
+
+            painter.PaintBackground(e);
+
+            base.DrawRibbonControlBackground(e);
+        }
+
+        /// <summary>
+        /// Draws the form caption text for the Ribbon Control. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+        /// do not want default rendering to occur do not call the base implementation. You can call OnRenderRibbonFormCaptionText method so events can occur.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        public override void DrawRibbonFormCaptionText(RibbonControlRendererEventArgs e)
+        {
+            base.DrawRibbonFormCaptionText(e);
+
+            RibbonControlPainter painter = PainterFactory.CreateRibbonControlPainter(e.RibbonControl);
+            if (painter == null)
+                return;
+
+            if (painter is IOffice2007Painter)
+                ((IOffice2007Painter)painter).ColorTable = m_ColorTable;
+
+            painter.PaintCaptionText(e);
+        }
+
+        /// <summary>
+        /// Draws the background of Quick Access Toolbar on Ribbon Control. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+        /// do not want default rendering to occur do not call the base implementation. You can call OnRenderQuickAccessToolbarBackground method so events can occur.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        public override void DrawQuickAccessToolbarBackground(RibbonControlRendererEventArgs e)
+        {
+            base.DrawQuickAccessToolbarBackground(e);
+
+            RibbonControlPainter painter = PainterFactory.CreateRibbonControlPainter(e.RibbonControl);
+            if (painter == null)
+                return;
+
+            if (painter is IOffice2007Painter)
+                ((IOffice2007Painter)painter).ColorTable = m_ColorTable;
+
+            painter.PaintQuickAccessToolbarBackground(e);
+        }
+        #endregion
+
+        #region SystemCaptionItem Rendering
+        /// <summary>
+        /// Draws the SystemCaptionItem. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+        /// do not want default rendering to occur do not call the base implementation. You can call OnRenderSystemCaptionItem method so events can occur.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        public override void DrawSystemCaptionItem(SystemCaptionItemRendererEventArgs e)
+        {
+            SystemCaptionItemPainter painter = PainterFactory.CreateSystemCaptionItemPainter(e.SystemCaptionItem);
+
+            if (painter == null)
+                return;
+
+            if (painter is IOffice2007Painter)
+                ((IOffice2007Painter)painter).ColorTable = m_ColorTable;
+
+            painter.Paint(e);
+
+            base.DrawSystemCaptionItem(e);
+        }
+        #endregion
+
+        #region MdiSystemItem Rendering
+        /// <summary>
+        /// Draws the MdiSystemItem. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+        /// do not want default rendering to occur do not call the base implementation. You can call OnRenderMdiSystemItem method so events can occur.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        public override void DrawMdiSystemItem(MdiSystemItemRendererEventArgs e)
+        {
+            MdiSystemItemPainter painter = PainterFactory.CreateMdiSystemItemPainter(e.MdiSystemItem);
+
+            if (painter == null)
+                return;
+
+            if (painter is IOffice2007Painter)
+                ((IOffice2007Painter)painter).ColorTable = m_ColorTable;
+
+            painter.Paint(e);
+
+            base.DrawMdiSystemItem(e);
+        }
+        #endregion
+
+        #region Form Caption
+        /// <summary>
+        /// Draws the form caption background. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+        /// do not want default rendering to occur do not call the base implementation. You can call OnRenderFormCaptionBackground method so events can occur.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        public override void DrawFormCaptionBackground(FormCaptionRendererEventArgs e)
+        {
+            FormCaptionPainter painter = PainterFactory.CreateFormCaptionPainter(e.Form);
+
+            if (painter == null)
+                return;
+
+            if (painter is IOffice2007Painter)
+                ((IOffice2007Painter)painter).ColorTable = m_ColorTable;
+
+            painter.PaintCaptionBackground(e);
+
+            base.DrawFormCaptionBackground(e);
+        }
+        #endregion
+
+        #region QAT Overflow/Customize Item rendering
+        /// <summary>
+        /// Draws the Quick Access Toolbar Overflow item. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+        /// do not want default rendering to occur do not call the base implementation. You can call OnRenderQatOverflowItem method so events can occur.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        public override void DrawQatOverflowItem(QatOverflowItemRendererEventArgs e)
+        {
+            QatOverflowPainter painter = PainterFactory.CreateQatOverflowItemPainter(e.OverflowItem);
+
+            if (painter == null)
+                return;
+
+            if (painter is IOffice2007Painter)
+                ((IOffice2007Painter)painter).ColorTable = m_ColorTable;
+
+            painter.Paint(e);
+
+            base.DrawQatOverflowItem(e);
+        }
+
+        /// <summary>
+        /// Draws the Quick Access Toolbar Overflow item. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+        /// do not want default rendering to occur do not call the base implementation. You can call OnRenderQatOverflowItem method so events can occur.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        public override void DrawQatCustomizeItem(QatCustomizeItemRendererEventArgs e)
+        {
+            QatCustomizeItemPainter painter = PainterFactory.CreateQatCustomizeItemPainter(e.CustomizeItem);
+
+            if (painter == null)
+                return;
+
+            if (painter is IOffice2007Painter)
+                ((IOffice2007Painter)painter).ColorTable = m_ColorTable;
+
+            painter.Paint(e);
+
+            base.DrawQatCustomizeItem(e);
+        }
+        #endregion
+
+        #region CheckBoxItem
+        public override void DrawCheckBoxItem(CheckBoxItemRenderEventArgs e)
+        {
+            CheckBoxItemPainter painter = PainterFactory.CreateCheckBoxItemPainter(e.CheckBoxItem);
+
+            if (painter == null)
+                return;
+
+            if (painter is IOffice2007Painter)
+                ((IOffice2007Painter)painter).ColorTable = m_ColorTable;
+
+            painter.Paint(e);
+
+            base.DrawCheckBoxItem(e);
+        }
+        #endregion
+
+        #region ProgressBarItem
+        /// <summary>
+        /// Draws the ProgressBarItem. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+        /// do not want default rendering to occur do not call the base implementation. You can call OnRenderProgressBarItem method so events can occur.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        public override void DrawProgressBarItem(ProgressBarItemRenderEventArgs e)
+        {
+            ProgressBarItemPainter painter = PainterFactory.CreateProgressBarItemPainter(e.ProgressBarItem);
+
+            if (painter == null)
+                return;
+
+            if (painter is IOffice2007Painter)
+                ((IOffice2007Painter)painter).ColorTable = m_ColorTable;
+
+            painter.Paint(e);
+
+            base.DrawProgressBarItem(e);
+        }
+        #endregion
+
+        #region Navigation Pane
+        /// <summary>
+        /// Draws the Navigation Pane button background. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+        /// do not want default rendering to occur do not call the base implementation. You can call OnRenderNavPaneButtonBackground method so events can occur.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        public override void DrawNavPaneButtonBackground(NavPaneRenderEventArgs e)
+        {
+            NavigationPanePainter painter = PainterFactory.CreateNavigationPanePainter();
+
+            if (painter == null)
+                return;
+
+            if (painter is IOffice2007Painter)
+                ((IOffice2007Painter)painter).ColorTable = m_ColorTable;
+
+            painter.PaintButtonBackground(e);
+
+
+            base.DrawNavPaneButtonBackground(e);
+        }
+        #endregion
+
+        #region SliderItem
+        /// <summary>
+        /// Draws the Slider item. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+        /// do not want default rendering to occur do not call the base implementation. You can call OnRenderSliderItem method so events can occur.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        public override void DrawSliderItem(SliderItemRendererEventArgs e)
+        {
+            SliderPainter painter = PainterFactory.CreateSliderPainter(e.SliderItem);
+
+            if (painter == null)
+                return;
+
+            if (painter is IOffice2007Painter)
+                ((IOffice2007Painter)painter).ColorTable = m_ColorTable;
+
+            painter.Paint(e);
+
+            base.DrawSliderItem(e);
+        }
+        #endregion
+
+        #region SideBar
+        /// <summary>
+        /// Draws the SideBar control. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+        /// do not want default rendering to occur do not call the base implementation. You can call OnRenderSideBar method so events can occur.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        public override void DrawSideBar(SideBarRendererEventArgs e)
+        {
+            SideBarPainter painter = PainterFactory.CreateSideBarPainter();
+
+            if (painter == null)
+                return;
+
+            if (painter is IOffice2007Painter)
+                ((IOffice2007Painter)painter).ColorTable = m_ColorTable;
+
+            painter.PaintSideBar(e);
+
+            base.DrawSideBar(e);
+        }
+
+        /// <summary>
+        /// Draws the SideBar control. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+        /// do not want default rendering to occur do not call the base implementation. You can call OnRenderSideBarPanelItem method so events can occur.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        public override void DrawSideBarPanelItem(SideBarPanelItemRendererEventArgs e)
+        {
+            SideBarPainter painter = PainterFactory.CreateSideBarPainter();
+
+            if (painter == null)
+                return;
+
+            if (painter is IOffice2007Painter)
+                ((IOffice2007Painter)painter).ColorTable = m_ColorTable;
+
+            painter.PaintSideBarPanelItem(e);
+
+            base.DrawSideBarPanelItem(e);
+        }
+        #endregion
+
+        #region CrumbBar
+        /// <summary>
+        /// Draws CrumbBarItemView. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+        /// do not want default rendering to occur do not call the base implementation. You can call OnRenderButtonItem method so events can occur.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        public override void DrawCrumbBarItemView(ButtonItemRendererEventArgs e)
+        {
+            CrumbBarItemViewPainter painter = PainterFactory.GetCrumbBarItemViewPainter(e.ButtonItem);
+            if (painter != null)
+            {
+                if (painter is IOffice2007Painter)
+                    ((IOffice2007Painter)painter).ColorTable = m_ColorTable;
+                painter.Paint(e.ButtonItem, e.ItemPaintArgs);
+            }
+
+            base.DrawCrumbBarItemView(e);
+        }
+
+        /// <summary>
+        /// Draws CrumbBarOverflowButton. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+        /// do not want default rendering to occur do not call the base implementation. You can call OnRenderCrumbBarOverflowItem method so events can occur.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        public override void DrawCrumbBarOverflowItem(ButtonItemRendererEventArgs e)
+        {
+            CrumbBarItemViewPainter painter = PainterFactory.GetCrumbBarItemViewPainter(e.ButtonItem);
+            if (painter != null)
+            {
+                if (painter is IOffice2007Painter)
+                    ((IOffice2007Painter)painter).ColorTable = m_ColorTable;
+                painter.PaintOverflowButton(e.ButtonItem, e.ItemPaintArgs);
+            }
+            base.DrawCrumbBarOverflowItem(e);
+        }
+        #endregion
+
+        #region SwitchButton
+        /// <summary>
+        /// Draws SwitchButton. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+        /// do not want default rendering to occur do not call the base implementation. You can call OnRenderButtonItem method so events can occur.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        public override void DrawSwitchButton(SwitchButtonRenderEventArgs e)
+        {
+            SwitchButtonPainter painter = PainterFactory.CreateSwitchButtonPainter(e.SwitchButtonItem);
+            if (painter != null)
+            {
+                if (painter is IOffice2007Painter)
+                    ((IOffice2007Painter)painter).ColorTable = m_ColorTable;
+                painter.Paint(e);
+            }
+
+            base.DrawSwitchButton(e);
+        }
+        #endregion
+
+        #region RangeSliderItem
+        /// <summary>
+        /// Draws the Slider item. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+        /// do not want default rendering to occur do not call the base implementation. You can call OnRenderSliderItem method so events can occur.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        public override void DrawRangeSliderItem(RangeSliderItemRendererEventArgs e)
+        {
+            RangeSliderPainter painter = PainterFactory.CreateRangeSliderPainter(e.SliderItem);
+
+            if (painter == null)
+                return;
+
+            if (painter is IOffice2007Painter)
+                ((IOffice2007Painter)painter).ColorTable = m_ColorTable;
+
+            painter.Paint(e);
+
+            base.DrawRangeSliderItem(e);
+        }
+        #endregion
+
+        #region StepItem
+        /// <summary>
+        /// Draws the Step item. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+        /// do not want default rendering to occur do not call the base implementation. You can call OnRenderStepItem method so events can occur.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        public override void DrawStepItem(StepItemRendererEventArgs e)
+        {
+            StepItemPainter painter = PainterFactory.CreateStepItemPainter(e.Item);
+
+            if (painter == null)
+                return;
+
+            if (painter is IOffice2007Painter)
+                ((IOffice2007Painter)painter).ColorTable = m_ColorTable;
+
+            painter.Paint(e);
+
+            base.DrawStepItem(e);
+        }
+        #endregion
+
+        #region ListBoxItem
+        /// <summary>
+        /// Draws the ListBoxItem. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+        /// do not want default rendering to occur do not call the base implementation. You can call OnRenderListBoxItem method so events can occur.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        public override void DrawListBoxItem(ListBoxItemRendererEventArgs e)
+        {
+            ListBoxItemPainter painter = PainterFactory.CreateListBoxItemPainter(e.Item);
+
+            if (painter == null)
+                return;
+
+            if (painter is IOffice2007Painter)
+                ((IOffice2007Painter)painter).ColorTable = m_ColorTable;
+
+            painter.Paint(e);
+
+            base.DrawListBoxItem(e);
+        }
+        #endregion
+
+        #region SideNavItem
+        /// <summary>
+        /// Draws the ListBoxItem. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+        /// do not want default rendering to occur do not call the base implementation. You can call OnRenderListBoxItem method so events can occur.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        public override void DrawSideNavItem(SideNavItemRendererEventArgs e)
+        {
+            base.DrawSideNavItem(e);
+            if (e.Cancel) return;
+
+            SideNavItemPainter painter = PainterFactory.CreateSideNavItemPainter(e.Item);
+
+            if (painter == null)
+                return;
+
+            if (painter is IOffice2007Painter)
+                ((IOffice2007Painter)painter).ColorTable = m_ColorTable;
+
+            painter.Paint(e);
+
+        }
+        #endregion
+
+        #region TabStrip
+
+        /// <summary>
+        /// Draws the TabStrip. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+        /// do not want default rendering to occur do not call the base implementation. You can call OnRenderTabFormStrip method so events can occur.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        public override void DrawTabFormStrip(TabFormStripPainterArgs e)
+        {
+            base.DrawTabFormStrip(e);
+            if (e.Cancel) return;
+
+            TabFormStripPainter painter = PainterFactory.CreateTabFormStripPainter(e.TabFormStrip);
+            if (painter == null)
+                return;
+
+            if (painter is IOffice2007Painter)
+                ((IOffice2007Painter)painter).ColorTable = m_ColorTable;
+
+            painter.Paint(e);
+        }
+        #endregion
+
+        #region TabFormItem
+        /// <summary>
+        /// Draws the TabStrip. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+        /// do not want default rendering to occur do not call the base implementation. You can call OnRenderTabFormStrip method so events can occur.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        public override void DrawTabFormItem(ButtonItemRendererEventArgs e)
+        {
+            base.DrawTabFormItem(e);
+            if (e.Cancel) return;
+
+            ButtonItemPainter painter = PainterFactory.CreateButtonPainter(e.ButtonItem);
+            if (painter != null)
+            {
+                if (painter is IOffice2007Painter)
+                    ((IOffice2007Painter)painter).ColorTable = m_ColorTable;
+                painter.PaintButton(e.ButtonItem, e.ItemPaintArgs);
+            }
+        }
+        #endregion
+
+        #region NewTabFormItem
+        /// <summary>
+        /// Draws the TabStrip. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+        /// do not want default rendering to occur do not call the base implementation. You can call OnRenderTabFormStrip method so events can occur.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        public override void DrawNewTabFormItem(ButtonItemRendererEventArgs e)
+        {
+            base.DrawNewTabFormItem(e);
+            if (e.Cancel) return;
+
+            ButtonItemPainter painter = PainterFactory.CreateButtonPainter(e.ButtonItem);
+            if (painter != null)
+            {
+                if (painter is IOffice2007Painter)
+                    ((IOffice2007Painter)painter).ColorTable = m_ColorTable;
+                painter.PaintButton(e.ButtonItem, e.ItemPaintArgs);
+            }
+        }
+        #endregion
+
+        #region TabParentForm
+        
+        /// <summary>
+        /// Draws the TabParentForm. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+        /// do not want default rendering to occur do not call the base implementation. You can call OnRenderTabParentForm method so events can occur.
+        /// </summary>
+        /// <param name="e">Provides context information.</param>
+        public override void DrawTabParentForm(TabFormPainterArgs e)
+        {
+            base.DrawTabParentForm(e);
+            if (e.Cancel) return;
+
+            TabFormPainter painter = PainterFactory.CreateTabFormPainter(e.TabParentForm);
+            if (painter is IOffice2007Painter)
+                ((IOffice2007Painter)painter).ColorTable = m_ColorTable;
+            painter.Paint(e);
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/Office2007RibbonBarColorTable.cs b/PROMS/DotNetBar Source Code/Rendering/Office2007RibbonBarColorTable.cs
new file mode 100644
index 00000000..e15cfe8a
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/Office2007RibbonBarColorTable.cs	
@@ -0,0 +1,26 @@
+using System;
+using System.Text;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    /// <summary>
+    /// Defines color table for RibbonBar in various states.
+    /// </summary>
+    public class Office2007RibbonBarColorTable
+    {
+        /// <summary>
+        /// Gets or sets the colors for the default RibbonBar state.
+        /// </summary>
+        public Office2007RibbonBarStateColorTable Default = new Office2007RibbonBarStateColorTable();
+
+        /// <summary>
+        /// Gets or sets the colors for RibbonBar when mouse is over the control.
+        /// </summary>
+        public Office2007RibbonBarStateColorTable MouseOver = new Office2007RibbonBarStateColorTable();
+
+        /// <summary>
+        /// Gets or sets the colors for RibbonBar when ribbon bar is in overflow state and expanded to show all the items.
+        /// </summary>
+        public Office2007RibbonBarStateColorTable Expanded = new Office2007RibbonBarStateColorTable();
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/Office2007RibbonBarStateColorTable.cs b/PROMS/DotNetBar Source Code/Rendering/Office2007RibbonBarStateColorTable.cs
new file mode 100644
index 00000000..7dfa5046
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/Office2007RibbonBarStateColorTable.cs	
@@ -0,0 +1,45 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    /// <summary>
+    /// Represents the color table of RibbonBar for Office 2007 style. Default values represent blue Luna theme.
+    /// </summary>
+    public class Office2007RibbonBarStateColorTable
+    {
+        #region Color Definition
+        /// <summary>
+        /// Gets or sets the height in pixels of top background part.
+        /// </summary>
+        public float TopBackgroundHeight = 15;
+        /// <summary>
+        /// Gets or sets the outer border colors.
+        /// </summary>
+        public LinearGradientColorTable OuterBorder = new LinearGradientColorTable(0xC6D2DF, 0x9FC1DB);
+        /// <summary>
+        /// Gets or sets the inner border colors.
+        /// </summary>
+        public LinearGradientColorTable InnerBorder = new LinearGradientColorTable(0xEFF4FA, 0xF3F9FF);
+
+        /// <summary>
+        /// Gets or sets the top background colors.
+        /// </summary>
+        public LinearGradientColorTable TopBackground = new LinearGradientColorTable(0xDEE8F5, 0xD1DFF0);
+        /// <summary>
+        /// Gets or sets the bottom background colors.
+        /// </summary>
+        public LinearGradientColorTable BottomBackground = new LinearGradientColorTable(0xC7D8ED, 0xE7F2FF);
+
+        /// <summary>
+        /// Gets or sets the title background colors.
+        /// </summary>
+        public LinearGradientColorTable TitleBackground = new LinearGradientColorTable(0xC2D9F1, 0xC1D9F0);
+        /// <summary>
+        /// Gets or sets the color of title text.
+        /// </summary>
+        public Color TitleText = ColorScheme.GetColor(0x3E6AAA);
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/Office2007RibbonColorTable.cs b/PROMS/DotNetBar Source Code/Rendering/Office2007RibbonColorTable.cs
new file mode 100644
index 00000000..6e9b6026
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/Office2007RibbonColorTable.cs	
@@ -0,0 +1,74 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    /// <summary>
+    /// Defines color table for Ribbon Control.
+    /// </summary>
+    public class Office2007RibbonColorTable
+    {
+        /// <summary>
+        /// Gets or sets the colors for the outer border.
+        /// </summary>
+        public LinearGradientColorTable OuterBorder = new LinearGradientColorTable(ColorScheme.GetColor("8DB2E3"), ColorScheme.GetColor("88A1C2"));
+
+        /// <summary>
+        /// Gets or sets the colors for the inner border.
+        /// </summary>
+        public LinearGradientColorTable InnerBorder = new LinearGradientColorTable(ColorScheme.GetColor("E7EFF8"), ColorScheme.GetColor("C0F9FF"));
+
+        /// <summary>
+        /// Gets or sets the colors for the tabs background area.
+        /// </summary>
+        public LinearGradientColorTable TabsBackground = new LinearGradientColorTable(ColorScheme.GetColor("BFDBFF"), Color.Empty);
+
+        /// <summary>
+        /// Gets or sets the colors for the tabs background area when Windows Glass is enabled.
+        /// </summary>
+        public LinearGradientColorTable TabsGlassBackground = new LinearGradientColorTable(ColorScheme.GetColor("BFDBFF"), Color.Empty);
+
+        /// <summary>
+        /// Gets or sets the color of border which is drawn above the tab.
+        /// </summary>
+        public Color TabDividerBorder = ColorScheme.GetColor("AECAF0");
+        /// <summary>
+        /// Gets or sets the light color of border which is drawn above the tab.
+        /// </summary>
+        public Color TabDividerBorderLight = ColorScheme.GetColor("D4E3F5");
+
+        /// <summary>
+        /// Gets or sets the round corner size for the ribbon control parts.
+        /// </summary>
+        public int CornerSize = 3;
+
+        /// <summary>
+        /// Gets or sets the height in pixels of top background part.
+        /// </summary>
+        public float PanelTopBackgroundHeight = 15;
+        /// <summary>
+        /// Gets or sets the top background colors.
+        /// </summary>
+        public LinearGradientColorTable PanelTopBackground = new LinearGradientColorTable(ColorScheme.GetColor("DBE6F4"), ColorScheme.GetColor("CFDDEF"));
+        /// <summary>
+        /// Gets or sets the bottom background colors.
+        /// </summary>
+        public LinearGradientColorTable PanelBottomBackground = new LinearGradientColorTable(ColorScheme.GetColor("C9D9ED"), ColorScheme.GetColor("E7F2FF"));
+
+        /// <summary>
+        /// Gets or sets the background image used on Office 2007 style start button displayed in top-left corner of ribbon control.
+        /// Note that image assigned to all StartButton properties must be the same size. The size for the button will be determined by image
+        /// size set on this property.
+        /// </summary>
+        public Image StartButtonDefault = null;
+        /// <summary>
+        /// Gets or sets the background image used on Office 2007 style start button displayed in top-left corner of ribbon control when mouse is over the button.
+        /// </summary>
+        public Image StartButtonMouseOver = null;
+        /// <summary>
+        /// Gets or sets the background image used on Office 2007 style start button displayed in top-left corner of ribbon control when button is pressed.
+        /// </summary>
+        public Image StartButtonPressed = null;
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/Office2007RibbonOverflowPainter.cs b/PROMS/DotNetBar Source Code/Rendering/Office2007RibbonOverflowPainter.cs
new file mode 100644
index 00000000..b72fad5a
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/Office2007RibbonOverflowPainter.cs	
@@ -0,0 +1,90 @@
+using System;
+using System.Text;
+using System.Drawing;
+using System.Drawing.Imaging;
+using System.Drawing.Drawing2D;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    /// <summary>
+    /// Represents painter for Office 2007 style ribbon overflow button.
+    /// </summary>
+    internal class Office2007RibbonOverflowPainter : Office2007ButtonItemPainter
+    {
+        public override Rectangle GetImageRectangle(ButtonItem button, ItemPaintArgs pa, CompositeImage image)
+        {
+            Rectangle imageRect = Rectangle.Empty;
+            bool isOnMenu = IsOnMenu(button, pa);
+
+            // Calculate image position
+            if (image != null)
+            {
+                imageRect.Width = image.Width + 16;
+                imageRect.Height = image.Height + 16;
+                imageRect.X = button.DisplayRectangle.X + (button.DisplayRectangle.Width - imageRect.Width) / 2;
+                imageRect.Y = button.DisplayRectangle.Y + 3;
+            }
+
+            return imageRect;
+        }
+
+        public override void PaintButtonImage(ButtonItem button, ItemPaintArgs pa, CompositeImage image, Rectangle imagebounds)
+        {
+            if (imagebounds.Width <= 0 || imagebounds.Height <= 0) return;
+
+            // Paint image background
+            RibbonOverflowButtonItem overflow = button as RibbonOverflowButtonItem;
+            if (overflow == null || overflow.RibbonBar==null)
+            {
+                base.PaintButtonImage(button, pa, image, imagebounds);
+                return;
+            }
+            ElementStyle backStyle = overflow.RibbonBar.GetPaintBackgroundStyle();
+            ElementStyle titleStyle = overflow.RibbonBar.TitleStyle;
+
+            int cornerSize = 3;
+
+            if (backStyle.BackColorBlend.Count > 0)
+                DisplayHelp.FillRoundedRectangle(pa.Graphics, imagebounds, cornerSize, backStyle.BackColorBlend[0].Color, backStyle.BackColorBlend[backStyle.BackColorBlend.Count-1].Color, overflow.RibbonBar.BackgroundStyle.BackColorGradientAngle);
+            else
+                DisplayHelp.FillRoundedRectangle(pa.Graphics, imagebounds, cornerSize, backStyle.BackColor, backStyle.BackColor2, backStyle.BackColorGradientAngle);
+            if(!button.Expanded)
+                DisplayHelp.FillRectangle(pa.Graphics, new Rectangle(imagebounds.X+1, imagebounds.Bottom - 8, imagebounds.Width-2, 7), titleStyle.BackColor, titleStyle.BackColor2, titleStyle.BackColorGradientAngle);
+            
+            if (!backStyle.BorderColor.IsEmpty)
+            {
+                using (GraphicsPath path = new GraphicsPath())
+                {
+                    path.AddLine(imagebounds.X, imagebounds.Bottom - 8, imagebounds.Right, imagebounds.Bottom - 8);
+                    ElementStyleDisplay.AddCornerArc(path, imagebounds, cornerSize, eCornerArc.BottomRight);
+                    ElementStyleDisplay.AddCornerArc(path, imagebounds, cornerSize, eCornerArc.BottomLeft);
+                    path.CloseAllFigures();
+                    using (SolidBrush brush = new SolidBrush(Color.FromArgb(192, backStyle.BorderColor)))
+                        pa.Graphics.FillPath(brush, path);
+                }
+            }
+
+            DisplayHelp.DrawRoundGradientRectangle(pa.Graphics, imagebounds, backStyle.BorderColor, backStyle.BorderColor2, backStyle.BorderGradientAngle, 1, cornerSize);
+
+            imagebounds.X += (imagebounds.Width - image.Width) / 2;
+            imagebounds.Y += 4;
+            imagebounds.Width = image.Width;
+            imagebounds.Height = image.Height;
+
+            image.DrawImage(pa.Graphics, imagebounds);
+        }
+
+        protected override Rectangle GetTextRectangle(ButtonItem button, ItemPaintArgs pa, eTextFormat stringFormat, CompositeImage image)
+        {
+            Rectangle r = base.GetTextRectangle(button, pa, stringFormat, image);
+            r.Offset(0, 12);
+            //r.Height -= 18;
+            return r;
+        }
+
+        protected override void PaintState(ButtonItem button, ItemPaintArgs pa, CompositeImage image, Rectangle r, bool isMouseDown)
+        {
+            
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/Office2007RibbonTabGroupColorTable.cs b/PROMS/DotNetBar Source Code/Rendering/Office2007RibbonTabGroupColorTable.cs
new file mode 100644
index 00000000..0c254d86
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/Office2007RibbonTabGroupColorTable.cs	
@@ -0,0 +1,37 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    /// <summary>
+    /// Defines the color table for the Ribbon Tab Group.
+    /// </summary>
+    public class Office2007RibbonTabGroupColorTable
+    {
+        /// <summary>
+        /// Gets or sets the name of the color table.
+        /// </summary>
+        public string Name = "";
+
+        /// <summary>
+        /// Gets or sets the background color.
+        /// </summary>
+        public LinearGradientColorTable Background = new LinearGradientColorTable(ColorScheme.GetColor(0xCADBF3), ColorScheme.GetColor(0xCDBFD7));
+
+        /// <summary>
+        /// Gets or sets the background highlight colors.
+        /// </summary>
+        public LinearGradientColorTable BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(192, ColorScheme.GetColor(0xD068C9)), Color.Transparent);
+
+        /// <summary>
+        /// Gets or sets the text color.
+        /// </summary>
+        public Color Text = ColorScheme.GetColor(0x15428B);
+
+        /// <summary>
+        /// Gets or sets the border color
+        /// </summary>
+        public LinearGradientColorTable Border = new LinearGradientColorTable(Color.FromArgb(16, Color.DarkGray), Color.FromArgb(192, Color.DarkGray));
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/Office2007RibbonTabGroupColorTableCollection.cs b/PROMS/DotNetBar Source Code/Rendering/Office2007RibbonTabGroupColorTableCollection.cs
new file mode 100644
index 00000000..3ceff11b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/Office2007RibbonTabGroupColorTableCollection.cs	
@@ -0,0 +1,151 @@
+using System;
+using System.Collections;
+using System.Text;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    /// <summary>
+    /// Collection for Office2007RibbonTabGroupColorTable type.
+    /// </summary>
+    public class Office2007RibbonTabGroupColorTableCollection : CollectionBase
+    {
+        #region Internal Implementation
+        /// <summary>Creates new instance of the class.</summary>
+        public Office2007RibbonTabGroupColorTableCollection() { }
+
+		/// <summary>
+		/// Adds new object to the collection.
+		/// </summary>
+		/// <param name="Office2007RibbonTabItemColorTable">Object to add.</param>
+		/// <returns>Index of newly added object.</returns>
+		public int Add(Office2007RibbonTabGroupColorTable colorTable)
+		{
+            return List.Add(colorTable);
+		}
+		/// <summary>
+		/// Returns reference to the object in collection based on it's index.
+		/// </summary>
+		public Office2007RibbonTabGroupColorTable this[int index]
+		{
+			get {return (Office2007RibbonTabGroupColorTable)(List[index]);}
+			set {List[index] = value;}
+		}
+
+        /// <summary>
+        /// Returns reference to the object in collection based on it's index.
+        /// </summary>
+        public Office2007RibbonTabGroupColorTable this[string name]
+        {
+            get
+            {
+                foreach (Office2007RibbonTabGroupColorTable ct in this.List)
+                {
+                    if (ct.Name == name)
+                        return ct;
+                }
+                return null;
+            }
+        }
+
+		/// <summary>
+		/// Inserts new object into the collection.
+		/// </summary>
+		/// <param name="index">Position of the object.</param>
+		/// <param name="value">Object to insert.</param>
+		public void Insert(int index, Office2007RibbonTabGroupColorTable value) 
+		{
+			List.Insert(index, value);
+		}
+
+		/// <summary>
+		/// Returns index of the object inside of the collection.
+		/// </summary>
+		/// <param name="value">Reference to the object.</param>
+		/// <returns>Index of the object.</returns>
+		public int IndexOf(Office2007RibbonTabGroupColorTable value) 
+		{
+			return List.IndexOf(value);
+		}
+
+		/// <summary>
+		/// Returns whether collection contains specified object.
+		/// </summary>
+		/// <param name="value">Object to look for.</param>
+		/// <returns>true if object is part of the collection, otherwise false.</returns>
+		public bool Contains(Office2007RibbonTabGroupColorTable value) 
+		{
+			return List.Contains(value);
+		}
+
+        /// <summary>
+        /// Returns whether collection contains object with specified name.
+        /// </summary>
+        /// <param name="name">Name of the object to look for</param>
+        /// <returns>true if object with given name is part of the collection otherwise false</returns>
+        public bool Contains(string name)
+        {
+            foreach (Office2007RibbonTabGroupColorTable ct in this.List)
+            {
+                if (ct.Name == name)
+                    return true;
+            }
+            return false;
+        }
+
+		/// <summary>
+		/// Removes specified object from the collection.
+		/// </summary>
+		/// <param name="value"></param>
+		public void Remove(Office2007RibbonTabGroupColorTable value) 
+		{
+			List.Remove(value);
+		}
+
+        //protected override void OnRemoveComplete(int index,object value)
+        //{
+        //    base.OnRemoveComplete(index,value);
+        //    Office2007RibbonTabItemColorTable me=value as Office2007RibbonTabItemColorTable;
+        //    if (m_Parent != null)
+        //    {
+        //        me.SetParent(null);
+        //        m_Parent.IsSizeValid = false;
+        //    }
+        //}
+        //protected override void OnInsertComplete(int index,object value)
+        //{
+        //    base.OnInsertComplete(index,value);
+        //    Office2007RibbonTabItemColorTable me=value as Office2007RibbonTabItemColorTable;
+        //    if (m_Parent != null)
+        //    {
+        //        me.SetParent(m_Parent);
+        //        m_Parent.IsSizeValid = false;
+        //    }
+        //}
+
+		/// <summary>
+		/// Copies collection into the specified array.
+		/// </summary>
+		/// <param name="array">Array to copy collection to.</param>
+		/// <param name="index">Starting index.</param>
+		public void CopyTo(Office2007RibbonTabGroupColorTable[] array, int index) 
+		{
+			List.CopyTo(array, index);
+		}
+
+		/// <summary>
+		/// Copies contained items to the Office2007RibbonTabItemColorTable array.
+		/// </summary>
+		/// <param name="array">Array to copy to.</param>
+		internal void CopyTo(Office2007RibbonTabGroupColorTable[] array)
+		{
+			List.CopyTo(array,0);
+		}
+
+		protected override void OnClear()
+		{
+			base.OnClear();
+		}
+
+		#endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/Office2007RibbonTabItemColorTable.cs b/PROMS/DotNetBar Source Code/Rendering/Office2007RibbonTabItemColorTable.cs
new file mode 100644
index 00000000..5800d194
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/Office2007RibbonTabItemColorTable.cs	
@@ -0,0 +1,37 @@
+using System;
+using System.Text;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    /// <summary>
+    /// Defines the color table for RibbonTabItem states.
+    /// </summary>
+    public class Office2007RibbonTabItemColorTable
+    {
+        /// <summary>
+        /// Gets or sets the name of the color table.
+        /// </summary>
+        public string Name = "";
+        /// <summary>
+        /// Gets or sets the default tab colors.
+        /// </summary>
+        public Office2007RibbonTabItemStateColorTable Default = new Office2007RibbonTabItemStateColorTable();
+        /// <summary>
+        /// Gets or sets the selected tab colors.
+        /// </summary>
+        public Office2007RibbonTabItemStateColorTable Selected = new Office2007RibbonTabItemStateColorTable();
+        /// <summary>
+        /// Gets or sets the selected tab colors when mouse is over the tab.
+        /// </summary>
+        public Office2007RibbonTabItemStateColorTable SelectedMouseOver = new Office2007RibbonTabItemStateColorTable();
+        /// <summary>
+        /// Gets or sets the colors when mouse is over the tab but tab is not selected.
+        /// </summary>
+        public Office2007RibbonTabItemStateColorTable MouseOver = new Office2007RibbonTabItemStateColorTable();
+
+        /// <summary>
+        /// Gets or sets the round corner size for the top part of the ribbon tab item.
+        /// </summary>
+        public int CornerSize = 3;
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/Office2007RibbonTabItemColorTableCollection.cs b/PROMS/DotNetBar Source Code/Rendering/Office2007RibbonTabItemColorTableCollection.cs
new file mode 100644
index 00000000..14c782aa
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/Office2007RibbonTabItemColorTableCollection.cs	
@@ -0,0 +1,130 @@
+using System;
+using System.Text;
+using System.Collections;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    /// <summary>
+    /// Defines collection for Office2007RibbonTabItemColorTable items.
+    /// </summary>
+    public class Office2007RibbonTabItemColorTableCollection : CollectionBase
+    {
+        #region Internal Implementation
+        /// <summary>Creates new instance of the class.</summary>
+        public Office2007RibbonTabItemColorTableCollection() { }
+
+		/// <summary>
+		/// Adds new object to the collection.
+		/// </summary>
+		/// <param name="Office2007ButtonItemColorTable">Object to add.</param>
+		/// <returns>Index of newly added object.</returns>
+		public int Add(Office2007RibbonTabItemColorTable colorTable)
+		{
+            return List.Add(colorTable);
+		}
+		/// <summary>
+		/// Returns reference to the object in collection based on it's index.
+		/// </summary>
+		public Office2007RibbonTabItemColorTable this[int index]
+		{
+			get {return (Office2007RibbonTabItemColorTable)(List[index]);}
+			set {List[index] = value;}
+		}
+
+        /// <summary>
+        /// Returns reference to the object in collection based on it's index.
+        /// </summary>
+        public Office2007RibbonTabItemColorTable this[string name]
+        {
+            get
+            {
+                foreach (Office2007RibbonTabItemColorTable ct in this.List)
+                {
+                    if (ct.Name == name)
+                        return ct;
+                }
+                return null;
+            }
+        }
+
+		/// <summary>
+		/// Inserts new object into the collection.
+		/// </summary>
+		/// <param name="index">Position of the object.</param>
+		/// <param name="value">Object to insert.</param>
+		public void Insert(int index, Office2007RibbonTabItemColorTable value) 
+		{
+			List.Insert(index, value);
+		}
+
+		/// <summary>
+		/// Returns index of the object inside of the collection.
+		/// </summary>
+		/// <param name="value">Reference to the object.</param>
+		/// <returns>Index of the object.</returns>
+		public int IndexOf(Office2007RibbonTabItemColorTable value) 
+		{
+			return List.IndexOf(value);
+		}
+
+		/// <summary>
+		/// Returns whether collection contains specified object.
+		/// </summary>
+		/// <param name="value">Object to look for.</param>
+		/// <returns>true if object is part of the collection, otherwise false.</returns>
+		public bool Contains(Office2007RibbonTabItemColorTable value) 
+		{
+			return List.Contains(value);
+		}
+
+        /// <summary>
+        /// Returns whether collection contains object with specified name.
+        /// </summary>
+        /// <param name="name">Name of the object to look for</param>
+        /// <returns>true if object with given name is part of the collection otherwise false</returns>
+        public bool Contains(string name)
+        {
+            foreach (Office2007RibbonTabItemColorTable ct in this.List)
+            {
+                if (ct.Name == name)
+                    return true;
+            }
+            return false;
+        }
+
+		/// <summary>
+		/// Removes specified object from the collection.
+		/// </summary>
+		/// <param name="value"></param>
+		public void Remove(Office2007RibbonTabItemColorTable value) 
+		{
+			List.Remove(value);
+		}
+
+		/// <summary>
+		/// Copies collection into the specified array.
+		/// </summary>
+		/// <param name="array">Array to copy collection to.</param>
+		/// <param name="index">Starting index.</param>
+		public void CopyTo(Office2007RibbonTabItemColorTable[] array, int index) 
+		{
+			List.CopyTo(array, index);
+		}
+
+		/// <summary>
+		/// Copies contained items to the Office2007ButtonItemColorTable array.
+		/// </summary>
+		/// <param name="array">Array to copy to.</param>
+		internal void CopyTo(Office2007RibbonTabItemColorTable[] array)
+		{
+			List.CopyTo(array,0);
+		}
+
+		protected override void OnClear()
+		{
+			base.OnClear();
+		}
+
+		#endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/Office2007RibbonTabItemStateColorTable.cs b/PROMS/DotNetBar Source Code/Rendering/Office2007RibbonTabItemStateColorTable.cs
new file mode 100644
index 00000000..e8fbe0ce
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/Office2007RibbonTabItemStateColorTable.cs	
@@ -0,0 +1,40 @@
+using System;
+using System.Drawing;
+using System.Text;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    /// <summary>
+    /// Defines the colors for the RibbonTabItem state like but not limited to selected, mouse over etc.
+    /// </summary>
+    public class Office2007RibbonTabItemStateColorTable
+    {
+        /// <summary>
+        /// Gets or sets the colors for the outer border.
+        /// </summary>
+        public LinearGradientColorTable OuterBorder = new LinearGradientColorTable();
+        /// <summary>
+        /// Gets or sets the colors for the inner border.
+        /// </summary>
+        public LinearGradientColorTable InnerBorder = new LinearGradientColorTable();
+
+        /// <summary>
+        /// Gets or sets the background colors.
+        /// </summary>
+        public LinearGradientColorTable Background = new LinearGradientColorTable();
+
+        /// <summary>
+        /// Gets or sets the background highlight colors.
+        /// </summary>
+        public LinearGradientColorTable BackgroundHighlight = new LinearGradientColorTable();
+
+        /// <summary>
+        /// Gets or sets the text color.
+        /// </summary>
+        public Color Text = Color.Empty;
+        /// <summary>
+        /// Gets or sets the text color when rendered on Windows Glass.
+        /// </summary>
+        public Color GlassText = Color.Empty;
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/Office2007ScrollBarColorTable.cs b/PROMS/DotNetBar Source Code/Rendering/Office2007ScrollBarColorTable.cs
new file mode 100644
index 00000000..01aa1aa3
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/Office2007ScrollBarColorTable.cs	
@@ -0,0 +1,36 @@
+using System;
+using System.Text;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    /// <summary>
+    /// Defines the colors for the scroll bar control.
+    /// </summary>
+    public class Office2007ScrollBarColorTable
+    {
+        /// <summary>
+        /// Gets or sets the colors for the control default state.
+        /// </summary>
+        public Office2007ScrollBarStateColorTable Default = new Office2007ScrollBarStateColorTable();
+
+        /// <summary>
+        /// Gets or sets the colors for the control when mouse is pressed over the control.
+        /// </summary>
+        public Office2007ScrollBarStateColorTable Pressed = new Office2007ScrollBarStateColorTable();
+
+        /// <summary>
+        /// Gets or sets the colors for the control when mouse is over the control but not over an active part of the control like scroll buttons.
+        /// </summary>
+        public Office2007ScrollBarStateColorTable MouseOverControl = new Office2007ScrollBarStateColorTable();
+
+        /// <summary>
+        /// Gets or sets the colors for the control when mouse is over the active part of the control like scroll buttons.
+        /// </summary>
+        public Office2007ScrollBarStateColorTable MouseOver = new Office2007ScrollBarStateColorTable();
+
+        /// <summary>
+        /// Gets or sets the colors for the control when control is disabled.
+        /// </summary>
+        public Office2007ScrollBarStateColorTable Disabled = new Office2007ScrollBarStateColorTable();
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/Office2007ScrollBarStateColorTable.cs b/PROMS/DotNetBar Source Code/Rendering/Office2007ScrollBarStateColorTable.cs
new file mode 100644
index 00000000..3cc8837d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/Office2007ScrollBarStateColorTable.cs	
@@ -0,0 +1,61 @@
+using System;
+using System.Text;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    /// <summary>
+    /// Represents the color table for the Scroll bar in single state.
+    /// </summary>
+    public class Office2007ScrollBarStateColorTable
+    {
+        /// <summary>
+        /// Gets or sets the outer border color for the scroll bar thumb.
+        /// </summary>
+        public LinearGradientColorTable ThumbOuterBorder = null;
+
+        /// <summary>
+        /// Gets or sets the inner border color for the scroll bar thumb.
+        /// </summary>
+        public LinearGradientColorTable ThumbInnerBorder = null;
+        
+        /// <summary>
+        /// Gets or sets the thumb background color blend collection.
+        /// </summary>
+        public BackgroundColorBlendCollection ThumbBackground = new BackgroundColorBlendCollection();
+
+        /// <summary>
+        /// Gets or sets the directional sign background color for the scroll bar thumb.
+        /// </summary>
+        public LinearGradientColorTable ThumbSignBackground = null;
+
+        /// <summary>
+        /// Gets or sets the outer border color for the scroll bar track button.
+        /// </summary>
+        public LinearGradientColorTable TrackOuterBorder = null;
+
+        /// <summary>
+        /// Gets or sets the inner border color for the scroll bar track button.
+        /// </summary>
+        public LinearGradientColorTable TrackInnerBorder = null;
+
+        /// <summary>
+        /// Gets or sets the track background color blend collection.
+        /// </summary>
+        public BackgroundColorBlendCollection TrackBackground = new BackgroundColorBlendCollection();
+
+        /// <summary>
+        /// Gets or sets the background color for the track signs.
+        /// </summary>
+        public LinearGradientColorTable TrackSignBackground = null;
+
+        /// <summary>
+        /// Gets or sets the background colors for the entire control.
+        /// </summary>
+        public LinearGradientColorTable Background = null;
+
+        /// <summary>
+        /// Gets or sets the border colors for the entire control.
+        /// </summary>
+        public LinearGradientColorTable Border = null;
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/Office2007SideBarColorTable.cs b/PROMS/DotNetBar Source Code/Rendering/Office2007SideBarColorTable.cs
new file mode 100644
index 00000000..8face84f
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/Office2007SideBarColorTable.cs	
@@ -0,0 +1,46 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    /// <summary>
+    /// Represents the color table for Office 2007 Style Side Bar Control.
+    /// </summary>
+    public class Office2007SideBarColorTable
+    {
+        /// <summary>
+        /// Gets or sets the background color of the control.
+        /// </summary>
+        public LinearGradientColorTable Background = null;
+        /// <summary>
+        /// Gets or sets the control border color.
+        /// </summary>
+        public Color Border = Color.Empty;
+
+        /// <summary>
+        /// Gets or sets the color of SideBarPanelItem text.
+        /// </summary>
+        public Color SideBarPanelItemText = Color.Empty;
+
+        /// <summary>
+        /// Gets or sets the color table for SideBarPanelItem in default state.
+        /// </summary>
+        public GradientColorTable SideBarPanelItemDefault = null;
+
+        /// <summary>
+        /// Gets or sets the color table for SideBarPanelItem in mouse over state.
+        /// </summary>
+        public GradientColorTable SideBarPanelItemMouseOver = null;
+
+        /// <summary>
+        /// Gets or sets the color table for SideBarPanelItem in expanded state.
+        /// </summary>
+        public GradientColorTable SideBarPanelItemExpanded = null;
+
+        /// <summary>
+        /// Gets or sets the color table for SideBarPanelItem when mouse button is pressed on the item.
+        /// </summary>
+        public GradientColorTable SideBarPanelItemPressed = null;
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/Office2007SideBarPainter.cs b/PROMS/DotNetBar Source Code/Rendering/Office2007SideBarPainter.cs
new file mode 100644
index 00000000..74109fc8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/Office2007SideBarPainter.cs	
@@ -0,0 +1,118 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    internal class Office2007SideBarPainter : SideBarPainter, IOffice2007Painter
+    {
+        #region IOffice2007Painter
+        private Office2007ColorTable m_ColorTable = null;
+        /// <summary>
+        /// Gets or sets color table used by renderer.
+        /// </summary>
+        public Office2007ColorTable ColorTable
+        {
+            get { return m_ColorTable; }
+            set { m_ColorTable = value; }
+        }
+        #endregion
+
+        #region Internal Implementation
+        public override void PaintSideBar(SideBarRendererEventArgs e)
+        {
+            Graphics g = e.Graphics;
+            SideBar sb = e.SideBar;
+            Office2007SideBarColorTable ct = m_ColorTable.SideBar;
+            LinearGradientColorTable background = ct.Background;
+            //if (sb.BackColor != SystemColors.Control)
+            //{
+            //    background.Start = sb.BackColor;
+            //    background.End = Color.Empty;
+            //}
+
+            Rectangle r = new Rectangle(Point.Empty, sb.Size);
+            DisplayHelp.FillRectangle(g, r, background);
+
+            Color border = ct.Border;
+
+            DisplayHelp.DrawRectangle(g, border, r);
+
+            base.PaintSideBar(e);
+        }
+
+        public override void PaintSideBarPanelItem(SideBarPanelItemRendererEventArgs e)
+        {
+            Graphics g = e.Graphics;
+            SideBarPanelItem sb = e.SideBarPanelItem;
+            Office2007SideBarColorTable ct = m_ColorTable.SideBar;
+            GradientColorTable stateColorTable = sb.Expanded ? ct.SideBarPanelItemExpanded : ct.SideBarPanelItemDefault;
+            if (sb.IsMouseDown)
+                stateColorTable = ct.SideBarPanelItemPressed;
+            else if (sb.IsMouseOver)
+                stateColorTable = ct.SideBarPanelItemMouseOver;
+
+            if (!sb.BackgroundStyle.BackColor1.IsEmpty || sb.BackgroundStyle.BackgroundImage != null)
+                sb.BackgroundStyle.Paint(g, sb.DisplayRectangle);
+
+            Rectangle r = sb.PanelRect;
+            Rectangle bounds = sb.DisplayRectangle;
+            r.Offset(bounds.Location);
+
+            if (stateColorTable != null)
+            {
+                using (Brush brush = DisplayHelp.CreateBrush(r, stateColorTable))
+                {
+                    g.FillRectangle(brush, r);
+                }
+            }
+
+            if (sb.Expanded)
+            {
+                DisplayHelp.DrawLine(g, r.X, r.Bottom, r.Right, r.Bottom, ct.Border, 1);
+            }
+
+            DisplayHelp.DrawLine(g, bounds.X, bounds.Bottom, bounds.Right, bounds.Bottom, ct.Border, 1);
+
+            Font font = sb.GetFont();
+            CompositeImage image = sb.GetImage();
+
+            if (image != null)
+            {
+                r.X += 2;
+                r.Width -= 2;
+                image.DrawImage(g, new Rectangle(r.X, r.Y + (r.Height - image.Height) / 2, image.Width, image.Height));
+                r.X += (image.Width + 4);
+                r.Width -= (image.Width + 8);
+            }
+
+            Rectangle rText = Rectangle.Empty;
+            if (sb.Text.Length > 0)
+            {
+                Color textColor = ct.SideBarPanelItemText;
+                if (!sb.ForeColor.IsEmpty) textColor = sb.ForeColor;
+                if (sb.IsMouseOver && !sb.HotForeColor.IsEmpty) textColor = sb.HotForeColor;
+                TextDrawing.DrawString(g, sb.Text, font, textColor, r, sb.GetStringFormat());
+                rText = r;
+            }
+
+            if (sb.Focused)
+            {
+                if (sb.DesignMode)
+                {
+                    Rectangle rFocus = sb.PanelRect;
+                    rFocus.Offset(sb.DisplayRectangle.Location);
+                    rFocus.Inflate(-2, -2);
+                    DesignTime.DrawDesignTimeSelection(g, rFocus, e.ItemPaintArgs.Colors.ItemDesignTimeBorder);
+                }
+                else if (!rText.IsEmpty)
+                {
+                    System.Windows.Forms.ControlPaint.DrawFocusRectangle(g, rText);
+                }
+            }
+
+            base.PaintSideBarPanelItem(e);
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/Office2007SilverColorTableFactory.cs b/PROMS/DotNetBar Source Code/Rendering/Office2007SilverColorTableFactory.cs
new file mode 100644
index 00000000..7f293ee3
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/Office2007SilverColorTableFactory.cs	
@@ -0,0 +1,1937 @@
+using System;
+using System.Drawing;
+using System.Text;
+using DevComponents.DotNetBar.Schedule;
+using DevComponents.DotNetBar.Controls;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    /// <summary>
+    /// Populates Office 2007 Color Table with Silver color scheme
+    /// </summary>
+    internal class Office2007SilverColorTableFactory
+    {
+        #region Silver Color Scheme
+        #region RibbonBar
+        public static Office2007RibbonBarStateColorTable GetRibbonBar(ColorFactory factory)
+        {
+            Office2007RibbonBarStateColorTable rb = new Office2007RibbonBarStateColorTable();
+            rb.TopBackgroundHeight = 15;
+            rb.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xBDBFC1), factory.GetColor(0x858585));
+            rb.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xF6F7F9), factory.GetColor(0xFAFAFA));
+            rb.TopBackground = new LinearGradientColorTable(factory.GetColor(0xEEF1F6), factory.GetColor(0xE1E6EE));
+            rb.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xD5DBE7), factory.GetColor(0xEEF4F4));
+            rb.TitleBackground = new LinearGradientColorTable(factory.GetColor(0xDFE3EF), factory.GetColor(0xC3C7D1));
+            rb.TitleText = factory.GetColor(0x333333);
+            return rb;
+        }
+
+        public static Office2007RibbonBarStateColorTable GetRibbonBarMouseOver(ColorFactory factory)
+        {
+            Office2007RibbonBarStateColorTable rb = new Office2007RibbonBarStateColorTable();
+            rb.TopBackgroundHeight = 15;
+            rb.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xBDBFC1), factory.GetColor(0x858585));
+            rb.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFAFBFC), factory.GetColor(0xFAFAFA));
+            rb.TopBackground = new LinearGradientColorTable(factory.GetColor(0xF7F8FA), factory.GetColor(0xF3F4F7));
+            rb.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xEEF0F5), factory.GetColor(0xF7F9F9));
+            rb.TitleBackground = new LinearGradientColorTable(factory.GetColor(0xDEE2EE), factory.GetColor(0xB3B9C7));
+            rb.TitleText = factory.GetColor(0x333333);
+
+            return rb;
+        }
+
+        public static Office2007RibbonBarStateColorTable GetRibbonBarExpanded(ColorFactory factory)
+        {
+            Office2007RibbonBarStateColorTable rb = new Office2007RibbonBarStateColorTable();
+            rb.TopBackgroundHeight = 15;
+            rb.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x7D7D7D), factory.GetColor(0x949494));
+            rb.InnerBorder = new LinearGradientColorTable(Color.FromArgb(128, factory.GetColor(0x989899)), Color.Transparent);
+            rb.TopBackground = new LinearGradientColorTable(factory.GetColor(0xE5E5E6), factory.GetColor(0xBFC3CC));
+            rb.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xB3B9C3), factory.GetColor(0xDEE4E4));
+            rb.TitleBackground = new LinearGradientColorTable(factory.GetColor(0xDEE4E4), Color.Empty);
+            rb.TitleText = Color.Empty;
+
+            return rb;
+        }
+        #endregion
+
+        #region RibbonTabItem
+        public static Office2007RibbonTabItemColorTable GetRibbonTabItemDefault(ColorFactory factory)
+        {
+            Office2007RibbonTabItemColorTable rt = new Office2007RibbonTabItemColorTable();
+            rt.Default.Text = factory.GetColor(0x333333);
+
+            // Selected Tab
+            rt.Selected = new Office2007RibbonTabItemStateColorTable();
+            rt.Selected.Background = new LinearGradientColorTable(factory.GetColor(0xF2F2F4), factory.GetColor(0xE3E7EF));
+            rt.Selected.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(64, Color.White), Color.Transparent);
+            rt.Selected.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xEFF9F9), factory.GetColor(0xB5F9FF));
+            rt.Selected.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xBEBEBE), factory.GetColor(0xBEBEBE));
+            rt.Selected.Text = factory.GetColor(0x333333);
+
+            // Selected Tab Mouse Over
+            rt.SelectedMouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.SelectedMouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xF2F7FA), factory.GetColor(0xE1E6EF));
+            rt.SelectedMouseOver.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(92, Color.White), Color.Transparent);
+            rt.SelectedMouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFAECC2), factory.GetColor(0xFFFFBD));
+            rt.SelectedMouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xE8BB72), factory.GetColor(0xFED15E));
+            rt.SelectedMouseOver.Text = factory.GetColor(0x333333);
+
+            // Tab Mouse Over
+            rt.MouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.MouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xDBD4C3), factory.GetColor(0xE9CE8D));
+            rt.MouseOver.BackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xD3D7DF), Color.Transparent);
+            rt.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xE8EAEE), factory.GetColor(0xDADDE4));
+            rt.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xBDBEC1), factory.GetColor(0xBDBEC1));
+            rt.MouseOver.Text = factory.GetColor(0x333333);
+
+            return rt;
+        }
+
+        public static Office2007RibbonTabItemColorTable GetRibbonTabItemMagenta(ColorFactory factory)
+        {
+            Office2007RibbonTabItemColorTable rt = new Office2007RibbonTabItemColorTable();
+            rt.Default.Text = factory.GetColor(0x333333);
+            // Selected Tab
+            rt.Selected = new Office2007RibbonTabItemStateColorTable();
+            rt.Selected.Background = new LinearGradientColorTable(factory.GetColor(0xEBC7C7), factory.GetColor(0xF6DFDD));
+            rt.Selected.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(64, Color.White), Color.Transparent);
+            rt.Selected.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xF6E6E6), factory.GetColor(0xE6BBBB));
+            rt.Selected.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xC3BCBC), factory.GetColor(0xC2C2C2));
+            rt.Selected.Text = factory.GetColor(0x333333);
+
+            // Selected Tab Mouse Over
+            rt.SelectedMouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.SelectedMouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xFBDE9A), factory.GetColor(0xFDF1D4));
+            rt.SelectedMouseOver.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(64, Color.White), Color.Transparent);
+            rt.SelectedMouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFAD57E), factory.GetColor(0xF8DC94));
+            rt.SelectedMouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xD7BC7D), factory.GetColor(0xC2C2C2));
+            rt.SelectedMouseOver.Text = factory.GetColor(0x333333);
+
+            // Tab Mouse Over
+            rt.MouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.MouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xE1D5D9), factory.GetColor(0xE68985));
+            rt.MouseOver.BackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xE0D8DD), Color.Transparent);
+            rt.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xE1D3D7), factory.GetColor(0xE78885));
+            rt.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xBDBEC1), factory.GetColor(0xBEBEBE));
+            rt.MouseOver.Text = factory.GetColor(0x333333);
+            return rt;
+        }
+
+        public static Office2007RibbonTabItemColorTable GetRibbonTabItemGreen(ColorFactory factory)
+        {
+            Office2007RibbonTabItemColorTable rt = new Office2007RibbonTabItemColorTable();
+            rt.Default.Text = factory.GetColor(0x333333);
+
+            // Selected Tab
+            rt.Selected = new Office2007RibbonTabItemStateColorTable();
+            rt.Selected.Background = new LinearGradientColorTable(factory.GetColor(0xC1E2B8), factory.GetColor(0xE1F1DB));
+            rt.Selected.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(64, Color.White), Color.Transparent);
+            rt.Selected.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xE4F3E0), factory.GetColor(0xB8DEB1));
+            rt.Selected.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xBEC2BD), factory.GetColor(0xC2C2C2));
+            rt.Selected.Text = factory.GetColor(0x333333);
+
+            // Selected Tab Mouse Over
+            rt.SelectedMouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xFBDF9E), factory.GetColor(0xFDF1D4));
+            rt.SelectedMouseOver.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(64, Color.White), Color.Transparent);
+            rt.SelectedMouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFDF2D5), factory.GetColor(0xF8D88A));
+            rt.SelectedMouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xC7C1B2), factory.GetColor(0xC2C2C2));
+            rt.SelectedMouseOver.Text = factory.GetColor(0x333333);
+
+            // Tab Mouse Over
+            rt.MouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.MouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xD8DFE1), factory.GetColor(0x9AC892));
+            rt.MouseOver.BackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xD9DEDF), Color.Transparent);
+            rt.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xD8DFE1), factory.GetColor(0x9AC892));
+            rt.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xBDBEC1), factory.GetColor(0xBEBEBE));
+            rt.MouseOver.Text = factory.GetColor(0x333333);
+            return rt;
+        }
+
+        public static Office2007RibbonTabItemColorTable GetRibbonTabItemOrange(ColorFactory factory)
+        {
+            Office2007RibbonTabItemColorTable rt = new Office2007RibbonTabItemColorTable();
+            rt.Default.Text = factory.GetColor(0x333333);
+
+            // Selected Tab
+            rt.Selected = new Office2007RibbonTabItemStateColorTable();
+            rt.Selected.Background = new LinearGradientColorTable(factory.GetColor(0xFFF59F), factory.GetColor(0xFFFAD5));
+            rt.Selected.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(64, Color.White), Color.Transparent);
+            rt.Selected.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFFFBD6), factory.GetColor(0xFDF28C));
+            rt.Selected.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xC7C5B4), factory.GetColor(0xC2C2C2));
+            rt.Selected.Text = factory.GetColor(0x333333);
+
+            // Selected Tab Mouse Over
+            rt.SelectedMouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.SelectedMouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xFBDE9A), factory.GetColor(0xFDF1D4));
+            rt.SelectedMouseOver.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(64, Color.White), Color.Transparent);
+            rt.SelectedMouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xF9D276), factory.GetColor(0xF8D88A));
+            rt.SelectedMouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xD7BC7D), factory.GetColor(0xC2C2C2));
+            rt.SelectedMouseOver.Text = factory.GetColor(0x333333);
+
+            // Tab Mouse Over
+            rt.MouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.MouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xE0E1DC), factory.GetColor(0xB6A933));
+            rt.MouseOver.BackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xE0E1DC), Color.Transparent);
+            rt.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xE0E1DC), factory.GetColor(0xEADF6D));
+            rt.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xBDBEC1), factory.GetColor(0xBDBEC1));
+            rt.MouseOver.Text = factory.GetColor(0x333333);
+
+            return rt;
+        }
+        #endregion
+
+        #region ButtonItem
+        public static void SetExpandColors(Office2007ButtonItemColorTable ct, ColorFactory factory)
+        {
+            Color cb = factory.GetColor(0x7F7F7F);
+            Color cl = factory.GetColor(0xE4E6E8);
+            ct.Default.ExpandBackground = cb;
+            ct.Default.ExpandLight = cl;
+
+            ct.Checked.ExpandBackground = cb;
+            ct.Checked.ExpandLight = cl;
+
+            //ct.Disabled.ExpandBackground = factory.GetColor(0xB7B7B7);
+            //ct.Disabled.ExpandLight = factory.GetColor(0xEDEDED);
+
+            ct.Expanded.ExpandBackground = cb;
+            ct.Expanded.ExpandLight = cl;
+
+            ct.MouseOver.ExpandBackground = cb;
+            ct.MouseOver.ExpandLight = cl;
+
+            ct.Pressed.ExpandBackground = cb;
+            ct.Pressed.ExpandLight = cl;
+        }
+
+        public static Office2007ButtonItemColorTable GetButtonItemOrange(bool ribbonBar, ColorFactory factory)
+        {
+            Office2007ButtonItemColorTable cb = new Office2007ButtonItemColorTable();
+            cb.Default = new Office2007ButtonItemStateColorTable();
+            //if(ribbonBar)
+            cb.Default.Text = factory.GetColor(0x333333);  //factory.GetColor(0x464646);
+            //else
+            //    cb.Default.Text = factory.GetColor(0xFFFFFF);
+
+            // Button mouse over
+            cb.MouseOver = new Office2007ButtonItemStateColorTable();
+            cb.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xDDCF9B), factory.GetColor(0xC0A776));
+            cb.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFFFFF7), factory.GetColor(0xFFF796));
+            cb.MouseOver.TopBackground = new LinearGradientColorTable(factory.GetColor(0xFFFBD7), factory.GetColor(0xFFE78D));
+            cb.MouseOver.TopBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(192, Color.White), Color.Transparent);
+            cb.MouseOver.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xFFD748), factory.GetColor(0xFFE793));
+            cb.MouseOver.BottomBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(164, Color.White), Color.Transparent);
+            cb.MouseOver.SplitBorder = new LinearGradientColorTable(factory.GetColor(0xDBC374), factory.GetColor(0xC8BB8C));
+            cb.MouseOver.SplitBorderLight = new LinearGradientColorTable(factory.GetColor(0xFFF0BF), factory.GetColor(0xFFF6DF));
+            cb.MouseOver.Text = factory.GetColor(0x333333);
+
+            // Pressed
+            cb.Pressed = new Office2007ButtonItemStateColorTable();
+            cb.Pressed.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x8B7654), factory.GetColor(0xC4B9A8));
+            cb.Pressed.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xE9A861), factory.GetColor(0xFDAD11));
+            cb.Pressed.TopBackground = new LinearGradientColorTable(factory.GetColor(0xF8B56A), factory.GetColor(0xFCA060));
+            cb.Pressed.TopBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(64, Color.White), Color.Transparent);
+            cb.Pressed.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xFB8A3C), factory.GetColor(0xFEBD62));
+            cb.Pressed.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xFFE0AF), Color.Transparent);
+            cb.Pressed.SplitBorder = new LinearGradientColorTable(factory.GetColor(0xB07D4B), factory.GetColor(0x907853));
+            cb.Pressed.SplitBorderLight = new LinearGradientColorTable(factory.GetColor(0xFAC094), factory.GetColor(0xFFD9AC));
+            cb.Pressed.Text = factory.GetColor(0x333333);
+
+            // Checked
+            cb.Checked = new Office2007ButtonItemStateColorTable();
+            cb.Checked.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x9F7559), factory.GetColor(0xFFCF2D));
+            cb.Checked.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xEBD1B4), Color.Transparent);
+            cb.Checked.TopBackground = new LinearGradientColorTable(factory.GetColor(0xFBDBB5), factory.GetColor(0xFEC778));
+            cb.Checked.TopBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(32, Color.White), Color.Transparent);
+            cb.Checked.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xFEB456), factory.GetColor(0xFDEB9F));
+            cb.Checked.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xFFF59F), Color.Transparent);
+            cb.Checked.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Checked.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Checked.Text = factory.GetColor(0x333333);
+
+            // Expanded button
+            cb.Expanded = new Office2007ButtonItemStateColorTable();
+            cb.Expanded.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x8E8165), factory.GetColor(0xC6C0B2));
+            cb.Expanded.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xE5AE55), factory.GetColor(0xFFD64A));
+            cb.Expanded.TopBackground = new LinearGradientColorTable(factory.GetColor(0xFCD3A7), factory.GetColor(0xFAA85B));
+            cb.Expanded.TopBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(128, Color.White), Color.Transparent);
+            cb.Expanded.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xF88D29), factory.GetColor(0xFDE499));
+            cb.Expanded.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xFFF6C9), Color.Transparent);
+            cb.Expanded.SplitBorder = new LinearGradientColorTable(factory.GetColor(0xB07D4B), factory.GetColor(0x8B7654));
+            cb.Expanded.SplitBorderLight = new LinearGradientColorTable(factory.GetColor(0xFAC094), factory.GetColor(0xFFD8AB));
+            cb.Expanded.Text = factory.GetColor(0x333333);
+
+            SetExpandColors(cb, factory);
+            return cb;
+        }
+
+        public static Office2007ButtonItemColorTable GetButtonItemOrangeWithBackground(ColorFactory factory)
+        {
+            Office2007ButtonItemColorTable cb = GetButtonItemOrange(false, factory);
+            cb.Default.TopBackground = new LinearGradientColorTable(factory.GetColor(0xEBEEFA), factory.GetColor(0xD6DAE4));
+            cb.Default.TopBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xC5C7D1), factory.GetColor(0xD4D8E2));
+            cb.Default.BottomBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(64, Color.White), Color.Transparent);
+            cb.Default.InnerBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x8D949D), Color.Empty);
+            cb.Default.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+
+            // Copy of the default theme
+            cb.Disabled = new Office2007ButtonItemStateColorTable();
+            cb.Disabled.TopBackground = new LinearGradientColorTable(factory.GetColor(0xE3E8EE), factory.GetColor(0xCBD2DB));
+            cb.Disabled.TopBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xCBD2DB), factory.GetColor(0xCBD2DB));
+            cb.Disabled.BottomBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.InnerBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xB3B3B3), Color.Empty);
+            cb.Disabled.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+
+            return cb;
+        }
+
+        public static Office2007ButtonItemColorTable GetButtonItemBlue(bool ribbonBar, ColorFactory factory)
+        {
+            Office2007ButtonItemColorTable cb = new Office2007ButtonItemColorTable();
+            cb.Default = new Office2007ButtonItemStateColorTable();
+            //if (ribbonBar)
+            cb.Default.Text = factory.GetColor(0x333333);  //factory.GetColor(0x15428B);
+            //else
+            //    cb.Default.Text = factory.GetColor(0xFFFFFF);
+
+            // Button mouse over
+            cb.MouseOver = new Office2007ButtonItemStateColorTable();
+            cb.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x3B5A82), Color.Empty);
+            cb.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFFFFFB), factory.GetColor(0xE0EEFF));
+            cb.MouseOver.TopBackground = new LinearGradientColorTable(factory.GetColor(0xC0DCFF), factory.GetColor(0xA9CEFF));
+            cb.MouseOver.TopBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(192, Color.White), Color.Transparent);
+            cb.MouseOver.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xA6CDFF), factory.GetColor(0xCAE1FF));
+            cb.MouseOver.BottomBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(124, Color.White), Color.Transparent);
+            cb.MouseOver.SplitBorder = new LinearGradientColorTable(factory.GetColor(0x7495C2), factory.GetColor(0x90AFD6));
+            cb.MouseOver.SplitBorderLight = new LinearGradientColorTable(factory.GetColor(0xD6E3F3), factory.GetColor(0x83A5D0));
+            cb.MouseOver.Text = factory.GetColor(0x333333);
+
+            // Pressed
+            cb.Pressed = new Office2007ButtonItemStateColorTable();
+            cb.Pressed.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x3B5A82), Color.Empty);
+            cb.Pressed.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFFFFFB), factory.GetColor(0xE0EEFF));
+            cb.Pressed.TopBackground = new LinearGradientColorTable(factory.GetColor(0xC5DCF8), factory.GetColor(0xA9CAF7));
+            cb.Pressed.TopBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(96, Color.White), Color.Transparent);
+            cb.Pressed.BottomBackground = new LinearGradientColorTable(factory.GetColor(0x90B6EA), factory.GetColor(0x7495C2));
+            cb.Pressed.BottomBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(184, Color.White), Color.Transparent);
+            cb.Pressed.SplitBorder = new LinearGradientColorTable(factory.GetColor(0x7495C2), factory.GetColor(0x90AFD6));
+            cb.Pressed.SplitBorderLight = new LinearGradientColorTable(factory.GetColor(0xD6E3F3), factory.GetColor(0x83A5D0));
+            cb.Pressed.Text = factory.GetColor(0x333333);
+
+            // Checked
+            cb.Checked = new Office2007ButtonItemStateColorTable();
+            cb.Checked.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x567DB0), factory.GetColor(0x567DB0));
+            cb.Checked.InnerBorder = new LinearGradientColorTable(factory.GetColor(0x90B6EA), factory.GetColor(0x7495C2));
+            cb.Checked.TopBackground = new LinearGradientColorTable(factory.GetColor(0xD7E6F9), factory.GetColor(0xC7DCF8));
+            cb.Checked.TopBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(64, Color.White), Color.Transparent);
+            cb.Checked.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xB3D0F5), factory.GetColor(0xD7E5F7));
+            cb.Checked.BottomBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(92, Color.White), Color.Transparent);
+            cb.Checked.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Checked.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Checked.Text = factory.GetColor(0x333333);
+
+            // Expanded button
+            cb.Expanded = new Office2007ButtonItemStateColorTable();
+            cb.Expanded.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x6187B7), factory.GetColor(0x4C83C8));
+            cb.Expanded.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xA2B4CD), Color.Transparent);
+            cb.Expanded.TopBackground = new LinearGradientColorTable(factory.GetColor(0xD7E6F9), factory.GetColor(0xC7DCF8));
+            cb.Expanded.TopBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(192, Color.White), Color.Transparent);
+            cb.Expanded.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xB3D0F5), factory.GetColor(0xD7E5F7));
+            cb.Expanded.BottomBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(164, Color.White), Color.Transparent);
+            cb.Expanded.SplitBorder = new LinearGradientColorTable(factory.GetColor(0x537EB8), factory.GetColor(0x6985AA));
+            cb.Expanded.SplitBorderLight = new LinearGradientColorTable(factory.GetColor(0x9AC0F5), factory.GetColor(0xB9D7FF));
+            cb.Expanded.Text = factory.GetColor(0x333333);
+
+
+            //// Menu mouse over
+            //cb.MenuMouseOver = new Office2007ButtonItemStateColorTable();
+            //cb.MenuMouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xAAC2E0), factory.GetColor(0x6591CD));
+            //cb.MenuMouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFFFFFB), factory.GetColor(0xE0EEFF));
+            //cb.MenuMouseOver.TopBackground = new LinearGradientColorTable(factory.GetColor(0xECF4FF), factory.GetColor(0xB0D3FF));
+            //cb.MenuMouseOver.TopBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(192, Color.White), Color.Transparent);
+            //cb.MenuMouseOver.BottomBackground = new LinearGradientColorTable(factory.GetColor(0x89BDFF), factory.GetColor(0x2983FF));
+            //cb.MenuMouseOver.BottomBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(164, Color.White), Color.Transparent);
+            //cb.MenuMouseOver.SplitBorder = new LinearGradientColorTable(factory.GetColor(0x7495C2), factory.GetColor(0x90AFD6));
+            //cb.MenuMouseOver.SplitBorderLight = new LinearGradientColorTable(factory.GetColor(0xD6E3F3), factory.GetColor(0x83A5D0));
+            //cb.MenuMouseOver.Text = factory.GetColor(0x15428B);
+            SetExpandColors(cb, factory);
+            return cb;
+        }
+
+        public static Office2007ButtonItemColorTable GetButtonItemBlueWithBackground(ColorFactory factory)
+        {
+            Office2007ButtonItemColorTable cb = GetButtonItemBlue(false, factory);
+
+            cb.Default.TopBackground = new LinearGradientColorTable(factory.GetColor(0xEBEEFA), factory.GetColor(0xD6DAE4));
+            cb.Default.TopBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xC5C7D1), factory.GetColor(0xD4D8E2));
+            cb.Default.BottomBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(64, Color.White), Color.Transparent);
+            cb.Default.InnerBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x8D949D), Color.Empty);
+            cb.Default.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+
+            // Copy of the default theme
+            cb.Disabled = new Office2007ButtonItemStateColorTable();
+            cb.Disabled.TopBackground = new LinearGradientColorTable(factory.GetColor(0xE3E8EE), factory.GetColor(0xCBD2DB));
+            cb.Disabled.TopBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xCBD2DB), factory.GetColor(0xCBD2DB));
+            cb.Disabled.BottomBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.InnerBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xB3B3B3), Color.Empty);
+            cb.Disabled.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+
+            return cb;
+        }
+
+        public static Office2007ButtonItemColorTable GetButtonItemMagenta(bool ribbonBar, ColorFactory factory)
+        {
+            Office2007ButtonItemColorTable cb = new Office2007ButtonItemColorTable();
+            cb.Default = new Office2007ButtonItemStateColorTable();
+            cb.Default.Text = factory.GetColor(0x000000);
+
+            // Button mouse over
+            cb.MouseOver = new Office2007ButtonItemStateColorTable();
+            cb.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x6B0060), factory.GetColor(0x56014D));
+            cb.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xECE7F3), factory.GetColor(0xE8D6FF));
+            cb.MouseOver.TopBackground = new LinearGradientColorTable(factory.GetColor(0xF2DFEB), factory.GetColor(0xE6C6DB));
+            cb.MouseOver.TopBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(96, Color.White), Color.Transparent);
+            cb.MouseOver.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xEAA8D4), factory.GetColor(0xE181C1));
+            cb.MouseOver.BottomBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(164, Color.White), Color.Transparent);
+            cb.MouseOver.SplitBorder = new LinearGradientColorTable(factory.GetColor(0xA37BD1), factory.GetColor(0x8868AE));
+            cb.MouseOver.SplitBorderLight = new LinearGradientColorTable(factory.GetColor(0xD9C2F3), factory.GetColor(0xBBA6D3));
+            cb.MouseOver.Text = factory.GetColor(0x000000);
+
+            // Pressed
+            cb.Pressed = new Office2007ButtonItemStateColorTable();
+            cb.Pressed.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x6B0060), factory.GetColor(0x56014D));
+            cb.Pressed.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xECE7F3), factory.GetColor(0xE8D6FF));
+            cb.Pressed.TopBackground = new LinearGradientColorTable(factory.GetColor(0xD2B0C6), factory.GetColor(0xCBADC1));
+            cb.Pressed.TopBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(64, Color.White), Color.Transparent);
+            cb.Pressed.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xD27AB5), factory.GetColor(0xC84C9F));
+            cb.Pressed.BottomBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(184, Color.White), Color.Transparent);
+            cb.Pressed.SplitBorder = new LinearGradientColorTable(factory.GetColor(0xA37BD1), factory.GetColor(0x8868AE));
+            cb.Pressed.SplitBorderLight = new LinearGradientColorTable(factory.GetColor(0xD9C2F3), factory.GetColor(0xBBA6D3));
+            cb.Pressed.Text = factory.GetColor(0x000000);
+
+            // Checked
+            cb.Checked = new Office2007ButtonItemStateColorTable();
+            cb.Checked.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x6B0060), factory.GetColor(0x56014D));
+            cb.Checked.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xECE7F3), factory.GetColor(0xE8D6FF));
+            cb.Checked.TopBackground = new LinearGradientColorTable(factory.GetColor(0xE9D7E2), factory.GetColor(0xE2B0D1));
+            cb.Checked.TopBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(164, Color.White), Color.Transparent);
+            cb.Checked.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xCF90BA), factory.GetColor(0xCF73B0));
+            cb.Checked.BottomBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(92, Color.White), Color.Transparent);
+            cb.Checked.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Checked.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Checked.Text = factory.GetColor(0x000000);
+
+            // Expanded button
+            cb.Expanded = new Office2007ButtonItemStateColorTable();
+            cb.Expanded.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x6B0060), factory.GetColor(0x56014D));
+            cb.Expanded.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xECE7F3), factory.GetColor(0xE8D6FF));
+            cb.Expanded.TopBackground = new LinearGradientColorTable(factory.GetColor(0xE9D7E2), factory.GetColor(0xE2B0D1));
+            cb.Expanded.TopBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(192, Color.White), Color.Transparent);
+            cb.Expanded.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xCF90BA), factory.GetColor(0xCF73B0));
+            cb.Expanded.BottomBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(192, Color.White), Color.Transparent);
+            cb.Expanded.SplitBorder = new LinearGradientColorTable(factory.GetColor(0xA37BD1), factory.GetColor(0x8868AE));
+            cb.Expanded.SplitBorderLight = new LinearGradientColorTable(factory.GetColor(0xD9C2F3), factory.GetColor(0xBBA6D3));
+            cb.Expanded.Text = factory.GetColor(0x000000);
+
+
+            //// Menu mouse over
+            //cb.MenuMouseOver = new Office2007ButtonItemStateColorTable();
+            //cb.MenuMouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xDE9ECC), factory.GetColor(0xBD71A8));
+            //cb.MenuMouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xECE7F3), factory.GetColor(0xE8D6FF));
+            //cb.MenuMouseOver.TopBackground = new LinearGradientColorTable(factory.GetColor(0xF3EAFF), factory.GetColor(0xDBBCFF));
+            //cb.MenuMouseOver.TopBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(192, Color.White), Color.Transparent);
+            //cb.MenuMouseOver.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xAF6BFF), factory.GetColor(0xD3AEFF));
+            //cb.MenuMouseOver.BottomBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(164, Color.White), Color.Transparent);
+            //cb.MenuMouseOver.SplitBorder = new LinearGradientColorTable(factory.GetColor(0xA37BD1), factory.GetColor(0x8868AE));
+            //cb.MenuMouseOver.SplitBorderLight = new LinearGradientColorTable(factory.GetColor(0xD9C2F3), factory.GetColor(0xBBA6D3));
+            //cb.MenuMouseOver.Text = factory.GetColor(0x15428B);
+            Office2007ColorTableFactory.SetBlackExpandColors(cb, factory);
+
+            return cb;
+        }
+
+        public static Office2007ButtonItemColorTable GetButtonItemMagentaWithBackground(ColorFactory factory)
+        {
+            Office2007ButtonItemColorTable cb = GetButtonItemMagenta(false, factory);
+
+            cb.Default.TopBackground = new LinearGradientColorTable(factory.GetColor(0xEBEEFA), factory.GetColor(0xD6DAE4));
+            cb.Default.TopBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xC5C7D1), factory.GetColor(0xD4D8E2));
+            cb.Default.BottomBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(64, Color.White), Color.Transparent);
+            cb.Default.InnerBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x8D949D), Color.Empty);
+            cb.Default.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+
+            // Copy of the default theme
+            cb.Disabled = new Office2007ButtonItemStateColorTable();
+            cb.Disabled.TopBackground = new LinearGradientColorTable(factory.GetColor(0xE3E8EE), factory.GetColor(0xCBD2DB));
+            cb.Disabled.TopBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xCBD2DB), factory.GetColor(0xCBD2DB));
+            cb.Disabled.BottomBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.InnerBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xB3B3B3), Color.Empty);
+            cb.Disabled.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+
+            return cb;
+        }
+        #endregion
+
+        #region RibbonTabItemGroup
+        public static Office2007RibbonTabGroupColorTable GetRibbonTabGroupDefault(ColorFactory factory)
+        {
+            Office2007RibbonTabGroupColorTable tg = new Office2007RibbonTabGroupColorTable();
+            tg.Background = new LinearGradientColorTable(Color.Transparent /*factory.GetColor(0xC1C6C1)*/, factory.GetColor(0xF3EB96));
+            tg.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(64, factory.GetColor(0xFEE51D)), Color.Transparent);
+            tg.Text = factory.GetColor(0x333333);
+            tg.Border = new LinearGradientColorTable(Color.FromArgb(16, Color.DarkGray), Color.FromArgb(192, Color.DarkGray));
+
+            return tg;
+        }
+
+        public static Office2007RibbonTabGroupColorTable GetRibbonTabGroupMagenta(ColorFactory factory)
+        {
+            Office2007RibbonTabGroupColorTable tg = new Office2007RibbonTabGroupColorTable();
+            tg.Background = new LinearGradientColorTable(Color.Transparent /*factory.GetColor(0xBDBBC2)*/, factory.GetColor(0xDFADB1));
+            tg.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(64, factory.GetColor(0xF26259)), Color.Transparent);
+            tg.Text = factory.GetColor(0x333333);
+            tg.Border = new LinearGradientColorTable(Color.FromArgb(16, Color.DarkGray), Color.FromArgb(192, Color.DarkGray));
+
+            return tg;
+        }
+
+        public static Office2007RibbonTabGroupColorTable GetRibbonTabGroupGreen(ColorFactory factory)
+        {
+            Office2007RibbonTabGroupColorTable tg = new Office2007RibbonTabGroupColorTable();
+
+            tg.Background = new LinearGradientColorTable(Color.Transparent /*factory.GetColor(0xB7C2C5)*/, factory.GetColor(0xB5DAB0));
+            tg.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(64, factory.GetColor(0x6CB954)), Color.Transparent);
+            tg.Border = new LinearGradientColorTable(Color.FromArgb(16, Color.DarkGray), Color.FromArgb(192, Color.DarkGray));
+            tg.Text = factory.GetColor(0x333333);
+
+            return tg;
+        }
+
+        public static Office2007RibbonTabGroupColorTable GetRibbonTabGroupOrange(ColorFactory factory)
+        {
+            Office2007RibbonTabGroupColorTable tg = new Office2007RibbonTabGroupColorTable();
+
+            tg.Background = new LinearGradientColorTable(Color.Transparent /*factory.GetColor(0xC0C3C0)*/, factory.GetColor(0xEFDDA0));
+            tg.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(64, factory.GetColor(0xF3B51B)), Color.Transparent);
+            tg.Border = new LinearGradientColorTable(Color.FromArgb(16, Color.DarkGray), Color.FromArgb(192, Color.DarkGray));
+            tg.Text = factory.GetColor(0x333333);
+
+            return tg;
+        }
+        #endregion
+
+        #region Scroll Bar
+        public static void InitializeScrollBarColorTable(Office2007ColorTable t, ColorFactory factory)
+        {
+            Office2007ScrollBarStateColorTable sct = t.ScrollBar.Default;
+            sct.Background = new LinearGradientColorTable(factory.GetColor(0xFCFCFC), factory.GetColor(0xF0F0F0), 0);
+            sct.Border = new LinearGradientColorTable(factory.GetColor(0xEBEDEF), Color.Empty);
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(0x6E7EA6), factory.GetColor(0x424B63), 90);
+            sct.TrackBackground.Clear();
+            sct.TrackBackground.AddRange(new BackgroundColorBlend[] { new BackgroundColorBlend(factory.GetColor(0xEBEEF0),0f), 
+                new BackgroundColorBlend(factory.GetColor(0xE6E9F0),0.5f),
+                new BackgroundColorBlend(factory.GetColor(0xD1DAE4),0.5f),
+                new BackgroundColorBlend(factory.GetColor(0xBECADB),1f)});
+            sct.TrackInnerBorder = new LinearGradientColorTable(factory.GetColor(0xE8E9E9), factory.GetColor(0xE9ECF2));
+            sct.TrackOuterBorder = new LinearGradientColorTable(factory.GetColor(0x5F6E93), Color.Empty);
+            sct.TrackSignBackground = new LinearGradientColorTable(Color.FromArgb(180, factory.GetColor(0x606060)), Color.FromArgb(64, Color.White));
+
+            // Mouse Over
+            sct = t.ScrollBar.MouseOver;
+            sct.Background = t.ScrollBar.Default.Background;
+            sct.Border = t.ScrollBar.Default.Border;
+            sct.ThumbBackground.Clear();
+            sct.ThumbBackground.AddRange(new BackgroundColorBlend[] { new BackgroundColorBlend(factory.GetColor(0xF1F6FE),0f), 
+                new BackgroundColorBlend(factory.GetColor(0xDFEAF7),0.5f),
+                new BackgroundColorBlend(factory.GetColor(0xBAD0EB),0.5f),
+                new BackgroundColorBlend(factory.GetColor(0xCDDEF3),1f)});
+            sct.ThumbInnerBorder = new LinearGradientColorTable(factory.GetColor(0xFAFCFF), factory.GetColor(0xEEF4FC));
+            sct.ThumbOuterBorder = new LinearGradientColorTable(factory.GetColor(0x8C97A5), factory.GetColor(0x66717F));
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(0x333C54), factory.GetColor(0x55658D));
+            sct.TrackBackground.Clear();
+            sct.TrackBackground.AddRange(new BackgroundColorBlend[] { new BackgroundColorBlend(factory.GetColor(0xBFD1EA),0f), 
+                new BackgroundColorBlend(factory.GetColor(0xCADFFA),0.5f),
+                new BackgroundColorBlend(factory.GetColor(0xAACBF6),0.5f),
+                new BackgroundColorBlend(factory.GetColor(0xD3E4FA),1f)});
+            sct.TrackInnerBorder = new LinearGradientColorTable(factory.GetColor(0xE9E9EB), factory.GetColor(0xFCFDFF));
+            sct.TrackOuterBorder = new LinearGradientColorTable(factory.GetColor(0x3C6EB0), Color.Empty);
+            sct.TrackSignBackground = new LinearGradientColorTable(Color.FromArgb(180, factory.GetColor(0x606060)), Color.FromArgb(64, Color.White));
+
+            // Control Mouse Over
+            sct = t.ScrollBar.MouseOverControl;
+            sct.Background = t.ScrollBar.Default.Background;
+            sct.Border = t.ScrollBar.Default.Border;
+            sct.ThumbBackground.Clear();
+            sct.ThumbBackground.AddRange(new BackgroundColorBlend[] { new BackgroundColorBlend(factory.GetColor(0xF4F9FF),0f), 
+                new BackgroundColorBlend(factory.GetColor(0xF4F9FF),0.5f),
+                new BackgroundColorBlend(factory.GetColor(0xCFE1F8),0.5f),
+                new BackgroundColorBlend(factory.GetColor(0xDFECFC),1f)});
+            sct.ThumbInnerBorder = new LinearGradientColorTable(factory.GetColor(0xFBFDFF), Color.Empty);
+            sct.ThumbOuterBorder = new LinearGradientColorTable(factory.GetColor(0x8C97A5), factory.GetColor(0x66717F));
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(0x6E7EA6), factory.GetColor(0x424B63));
+            sct.TrackBackground.Clear();
+            sct.TrackBackground.AddRange(new BackgroundColorBlend[] { new BackgroundColorBlend(factory.GetColor(0xEBEEF0),0f), 
+                new BackgroundColorBlend(factory.GetColor(0xE6E9F0),0.5f),
+                new BackgroundColorBlend(factory.GetColor(0xD1DAE4),0.5f),
+                new BackgroundColorBlend(factory.GetColor(0xBECADB),1f)});
+            sct.TrackInnerBorder = new LinearGradientColorTable(factory.GetColor(0xE8E9E9), factory.GetColor(0xE9EDF2));
+            sct.TrackOuterBorder = new LinearGradientColorTable(factory.GetColor(0x5F6E93), Color.Empty);
+            sct.TrackSignBackground = new LinearGradientColorTable(Color.FromArgb(180, factory.GetColor(0x606060)), Color.FromArgb(64, Color.White));
+            // Pressed
+            sct = t.ScrollBar.Pressed;
+            sct.Background = t.ScrollBar.Default.Background;
+            sct.Border = t.ScrollBar.Default.Border;
+            sct.ThumbBackground.Clear();
+            sct.ThumbBackground.AddRange(new BackgroundColorBlend[] { 
+                new BackgroundColorBlend(factory.GetColor(0xE6E9EC),0f), 
+                new BackgroundColorBlend(factory.GetColor(0xE2E4E6),0.6f),
+                new BackgroundColorBlend(factory.GetColor(0xC3CAD2),0.6f),
+                new BackgroundColorBlend(factory.GetColor(0xD7DCE1),1f)});
+            sct.ThumbInnerBorder = new LinearGradientColorTable(factory.GetColor(0xF5F7F8), Color.Empty);
+            sct.ThumbOuterBorder = new LinearGradientColorTable(factory.GetColor(0x8C97A5), factory.GetColor(0x65707F));
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(0x6E7EA6), factory.GetColor(0x424B63));
+            sct.TrackBackground.Clear();
+            sct.TrackBackground.AddRange(new BackgroundColorBlend[] {
+                new BackgroundColorBlend(factory.GetColor(0x9EBEE9),0f), 
+                new BackgroundColorBlend(factory.GetColor(0xABCCF6),0.5f),
+                new BackgroundColorBlend(factory.GetColor(0x6EA6F0),0.5f),
+                new BackgroundColorBlend(factory.GetColor(0xB5D1F7),1f)});
+            sct.TrackInnerBorder = new LinearGradientColorTable(factory.GetColor(0xC2D3E7), factory.GetColor(0xDDEBFB));
+            sct.TrackOuterBorder = new LinearGradientColorTable(factory.GetColor(0x17498A), Color.Empty);
+            sct.TrackSignBackground = new LinearGradientColorTable(Color.FromArgb(180, factory.GetColor(0x606060)), Color.FromArgb(64, Color.White));
+            // Disabled
+            sct = t.ScrollBar.Disabled;
+            sct.Background = t.ScrollBar.Default.Background;
+            sct.Border = t.ScrollBar.Default.Border;
+            sct.ThumbBackground.Clear();
+            sct.ThumbInnerBorder = new LinearGradientColorTable();
+            sct.ThumbOuterBorder = new LinearGradientColorTable();
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(0xBFCFF7), factory.GetColor(0x727C94));
+            sct.TrackBackground.Clear();
+            sct.TrackInnerBorder = new LinearGradientColorTable();
+            sct.TrackOuterBorder = new LinearGradientColorTable();
+            sct.TrackSignBackground = new LinearGradientColorTable();
+        }
+        #endregion
+
+        public static void InitializeColorTable(Office2007ColorTable table, ColorFactory factory)
+        {
+            #region Ribbon Bar
+            table.RibbonBar.Default = GetRibbonBar(factory);
+            table.RibbonBar.MouseOver = GetRibbonBarMouseOver(factory);
+            table.RibbonBar.Expanded = GetRibbonBarExpanded(factory);
+            #endregion
+
+            #region RibbonTabItem
+            // RibbonTabItem Default
+            table.RibbonTabItemColors.Clear();
+            Office2007RibbonTabItemColorTable rt = GetRibbonTabItemDefault(factory);
+            rt.Name = Enum.GetName(typeof(eRibbonTabColor), eRibbonTabColor.Default);
+            table.RibbonTabItemColors.Add(rt);
+            // Green
+
+            rt = GetRibbonTabItemGreen(factory);
+            rt.Name = Enum.GetName(typeof(eRibbonTabColor), eRibbonTabColor.Green);
+            table.RibbonTabItemColors.Add(rt);
+            // Magenta
+
+            rt = GetRibbonTabItemMagenta(factory);
+            rt.Name = Enum.GetName(typeof(eRibbonTabColor), eRibbonTabColor.Magenta);
+            table.RibbonTabItemColors.Add(rt);
+            // Orange
+
+            rt = GetRibbonTabItemOrange(factory);
+            rt.Name = Enum.GetName(typeof(eRibbonTabColor), eRibbonTabColor.Orange);
+            table.RibbonTabItemColors.Add(rt);
+            #endregion
+
+            #region Ribbon Control
+            table.RibbonControl = new Office2007RibbonColorTable();
+            table.RibbonControl.TabsBackground = new LinearGradientColorTable(factory.GetColor(0xD0D4DD), factory.GetColor(0xD0D4DD));
+            table.RibbonControl.InnerBorder = new LinearGradientColorTable(); //factory.GetColor(0xD7DADF), factory.GetColor(0x3A3A3A));
+            table.RibbonControl.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xBEBEBE), factory.GetColor(0xBEBEBE));
+            table.RibbonControl.TabDividerBorder = factory.GetColor(0xACAFB7);
+            table.RibbonControl.TabDividerBorderLight = Color.Empty; // factory.GetColor(0x666666);
+            table.RibbonControl.PanelTopBackground = new LinearGradientColorTable(factory.GetColor(0xEEF0F4), factory.GetColor(0xE1E6EE));
+            table.RibbonControl.PanelBottomBackground = new LinearGradientColorTable(factory.GetColor(0xD5DBE7), factory.GetColor(0xF0FAFB));
+            table.RibbonControl.StartButtonDefault = BarFunctions.LoadBitmap("SystemImages.BlankStartButtonNormalSilver.png");
+            table.RibbonControl.StartButtonMouseOver = BarFunctions.LoadBitmap("SystemImages.BlankStartButtonHotSilver.png");
+            table.RibbonControl.StartButtonPressed = BarFunctions.LoadBitmap("SystemImages.BlankStartButtonPressedSilver.png");
+            #endregion
+
+            #region ItemContainer
+            table.ItemGroup.TopBackground = new LinearGradientColorTable(factory.GetColor(0xF1F3F3), factory.GetColor(0xF0F2F2));
+            table.ItemGroup.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xE7EAEE), factory.GetColor(0xF6F7F8));
+            table.ItemGroup.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xF9F9F9), factory.GetColor(0xFFFFFF));
+            table.ItemGroup.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xC5C6C7), factory.GetColor(0xC4C6C6));
+            table.ItemGroup.ItemGroupDividerDark = Color.FromArgb(196, factory.GetColor(0xCECECE));
+            table.ItemGroup.ItemGroupDividerLight = Color.FromArgb(128, factory.GetColor(0xFFFFFF));
+            #endregion
+
+            #region Bar
+            table.Bar.ToolbarTopBackground = new LinearGradientColorTable(factory.GetColor(0xE7E8EB), factory.GetColor(0xB5BBC7));
+            table.Bar.ToolbarBottomBackground = new LinearGradientColorTable(factory.GetColor(0xA9AFB6), factory.GetColor(0xC7C9CE));
+            table.Bar.ToolbarBottomBorder = factory.GetColor(0x727880);
+            table.Bar.PopupToolbarBackground = new LinearGradientColorTable(factory.GetColor(0xFAFAFA), Color.Empty);
+            table.Bar.PopupToolbarBorder = factory.GetColor(0x2F2F2F);
+            table.Bar.StatusBarTopBorder = factory.GetColor(0xACAFB7);
+            table.Bar.StatusBarTopBorderLight = factory.GetColor(Color.FromArgb(148, Color.White));
+            table.Bar.StatusBarAltBackground.Clear();
+            table.Bar.StatusBarAltBackground.Add(new BackgroundColorBlend(factory.GetColor(0xE7E8EB), 0f));
+            table.Bar.StatusBarAltBackground.Add(new BackgroundColorBlend(factory.GetColor(0xB6BBC7), 0.4f));
+            table.Bar.StatusBarAltBackground.Add(new BackgroundColorBlend(factory.GetColor(0xA5ABAF), 0.4f));
+            table.Bar.StatusBarAltBackground.Add(new BackgroundColorBlend(factory.GetColor(0xAEB4BA), 1f));
+            #endregion
+
+            #region ButtonItem Colors Initialization
+            table.ButtonItemColors.Clear();
+            table.RibbonButtonItemColors.Clear();
+            table.MenuButtonItemColors.Clear();
+            // Orange
+            Office2007ButtonItemColorTable cb = GetButtonItemOrange(false, factory);
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Orange);
+            table.ButtonItemColors.Add(cb);
+            // Orange with background
+            cb = GetButtonItemOrangeWithBackground(factory);
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.OrangeWithBackground);
+            table.ButtonItemColors.Add(cb);
+            // Blue
+            cb = GetButtonItemBlue(false, factory);
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Blue);
+            table.ButtonItemColors.Add(cb);
+            // Blue with background
+            cb = GetButtonItemBlueWithBackground(factory);
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.BlueWithBackground);
+            table.ButtonItemColors.Add(cb);
+            // Magenta
+            cb = GetButtonItemMagenta(false, factory);
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Magenta);
+            table.ButtonItemColors.Add(cb);
+            // Magenta with background
+            cb = GetButtonItemMagentaWithBackground(factory);
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.MagentaWithBackground);
+            table.ButtonItemColors.Add(cb);
+
+            // RibbonBar buttons
+            cb = GetButtonItemOrange(true, factory);
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Orange);
+            table.RibbonButtonItemColors.Add(cb);
+            // Orange with background
+            cb = GetButtonItemOrangeWithBackground(factory);
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.OrangeWithBackground);
+            table.RibbonButtonItemColors.Add(cb);
+            // Blue
+            cb = GetButtonItemBlue(true, factory);
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Blue);
+            table.RibbonButtonItemColors.Add(cb);
+            // Blue with background
+            cb = GetButtonItemBlueWithBackground(factory);
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.BlueWithBackground);
+            table.RibbonButtonItemColors.Add(cb);
+            // Magenta
+            cb = GetButtonItemMagenta(true, factory);
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Magenta);
+            table.RibbonButtonItemColors.Add(cb);
+            // Magenta with background
+            cb = GetButtonItemMagentaWithBackground(factory);
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.MagentaWithBackground);
+            table.RibbonButtonItemColors.Add(cb);
+
+            // MENU Orange
+            cb = Office2007ColorTableFactory.GetButtonItemBlackOrange(true, factory);
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Orange);
+            cb.Default.Text = factory.GetColor(0x333333);
+            cb.MouseOver.Text = factory.GetColor(0x333333);
+            cb.Checked.Text = factory.GetColor(0x333333);
+            cb.Expanded.Text = factory.GetColor(0x333333);
+            cb.Pressed.Text = factory.GetColor(0x333333);
+            table.MenuButtonItemColors.Add(cb);
+
+            cb = Office2007ColorTableFactory.GetButtonItemOffice2007WithBackground(factory);
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Office2007WithBackground);
+            table.ButtonItemColors.Add(cb);
+
+            table.ButtonItemColors.Add(ButtonItemStaticColorTables.CreateBlueOrbColorTable(factory));
+            #endregion
+
+            #region RibbonTabItemGroup Colors Initialization
+            table.RibbonTabGroupColors.Clear();
+            // Default
+            Office2007RibbonTabGroupColorTable tg = GetRibbonTabGroupDefault(factory);
+            tg.Name = Enum.GetName(typeof(eRibbonTabGroupColor), eRibbonTabGroupColor.Default);
+            table.RibbonTabGroupColors.Add(tg);
+
+            // Magenta
+            tg = GetRibbonTabGroupMagenta(factory);
+            tg.Name = Enum.GetName(typeof(eRibbonTabGroupColor), eRibbonTabGroupColor.Magenta);
+            table.RibbonTabGroupColors.Add(tg);
+
+            // Green
+            tg = GetRibbonTabGroupGreen(factory);
+            tg.Name = Enum.GetName(typeof(eRibbonTabGroupColor), eRibbonTabGroupColor.Green);
+            table.RibbonTabGroupColors.Add(tg);
+
+            // Orange
+            tg = GetRibbonTabGroupOrange(factory);
+            tg.Name = Enum.GetName(typeof(eRibbonTabGroupColor), eRibbonTabGroupColor.Orange);
+            table.RibbonTabGroupColors.Add(tg);
+            #endregion
+
+            #region Menu
+            table.Menu.Background = new LinearGradientColorTable(factory.GetColor(0xFAFAFA), Color.Empty);
+            table.Menu.Border = new LinearGradientColorTable(factory.GetColor(0x868686), Color.Empty);
+            table.Menu.Side = new LinearGradientColorTable(factory.GetColor(0xEFEFEF), Color.Empty);
+            table.Menu.SideBorder = new LinearGradientColorTable(factory.GetColor(0xC5C5C5), Color.Empty);
+            table.Menu.SideBorderLight = new LinearGradientColorTable(factory.GetColor(0xF5F5F5), Color.Empty);
+            table.Menu.SideUnused = new LinearGradientColorTable(factory.GetColor(0xE5E5E5), Color.Empty);
+
+            table.Menu.FileBackgroundBlend.Clear();
+            table.Menu.FileBackgroundBlend.AddRange(new DevComponents.DotNetBar.BackgroundColorBlend[] {
+                new DevComponents.DotNetBar.BackgroundColorBlend(factory.GetColor(0xDEE2E5), 0F),
+                new DevComponents.DotNetBar.BackgroundColorBlend(factory.GetColor(0xD2D7DC), 1F)});
+            table.Menu.FileContainerBorder = factory.GetColor(0xA9AEB4);
+            table.Menu.FileContainerBorderLight = factory.GetColor(0xF3F4F4);
+            table.Menu.FileColumnOneBackground = factory.GetColor(0xFAFAFA);
+            table.Menu.FileColumnOneBorder = factory.GetColor(0xA9AEB4);
+            table.Menu.FileColumnTwoBackground = factory.GetColor(0xFAFAFA);
+            table.Menu.FileBottomContainerBackgroundBlend.Clear();
+            table.Menu.FileBottomContainerBackgroundBlend.AddRange(new DevComponents.DotNetBar.BackgroundColorBlend[] {
+                new DevComponents.DotNetBar.BackgroundColorBlend(factory.GetColor(0xCAD0D7), 0F),
+                new DevComponents.DotNetBar.BackgroundColorBlend(factory.GetColor(0xCCD1D8), 0.4F),
+                new DevComponents.DotNetBar.BackgroundColorBlend(factory.GetColor(0xC2C8D0), 0.4F),
+                new DevComponents.DotNetBar.BackgroundColorBlend(factory.GetColor(0xD9E2E6), 1F)});
+            #endregion
+
+            #region ComboBox
+            table.ComboBox.Default.Background = factory.GetColor(0xE8EAEC);
+            table.ComboBox.Default.Border = factory.GetColor(0xA9B1B8);
+            table.ComboBox.Default.ExpandBackground = new LinearGradientColorTable();
+            table.ComboBox.Default.ExpandBorderInner = new LinearGradientColorTable();
+            table.ComboBox.Default.ExpandBorderOuter = new LinearGradientColorTable();
+            table.ComboBox.Default.ExpandText = factory.GetColor(0x7C7C7C);
+            table.ComboBox.DefaultStandalone.Background = factory.GetColor(0xFFFFFF);
+            int editoBorderColor = 0xA4A4A4;
+            table.ComboBox.DefaultStandalone.Border = factory.GetColor(editoBorderColor);
+            table.ComboBox.DefaultStandalone.ExpandBackground = new LinearGradientColorTable(factory.GetColor(0xECF0F5), factory.GetColor(0xDFE4EB), 90);
+            table.ComboBox.DefaultStandalone.ExpandBorderInner = new LinearGradientColorTable();
+            table.ComboBox.DefaultStandalone.ExpandBorderOuter = new LinearGradientColorTable(factory.GetColor(0xB7B7B7), Color.Empty, 90);
+            table.ComboBox.DefaultStandalone.ExpandText = factory.GetColor(0x000000);
+            table.ComboBox.MouseOver.Background = factory.GetColor(0xFFFFFF);
+            table.ComboBox.MouseOver.Border = factory.GetColor(editoBorderColor);
+            table.ComboBox.MouseOver.ExpandBackground = new LinearGradientColorTable(factory.GetColor(0xFFFCE2), factory.GetColor(0xFFE7A5), 90);
+            table.ComboBox.MouseOver.ExpandBorderInner = new LinearGradientColorTable(factory.GetColor(0xFFFFFB), factory.GetColor(0xFFFCF3), 90);
+            table.ComboBox.MouseOver.ExpandBorderOuter = new LinearGradientColorTable(factory.GetColor(0xDBCE99), Color.Empty, 90);
+            table.ComboBox.MouseOver.ExpandText = factory.GetColor(0x000000);
+            table.ComboBox.DroppedDown.Background = factory.GetColor(0xFFFFFF);
+            table.ComboBox.DroppedDown.Border = factory.GetColor(0x898989);
+            table.ComboBox.DroppedDown.ExpandBackground = new LinearGradientColorTable(factory.GetColor(0xEAE0BF), factory.GetColor(0xFFD456), 90);
+            table.ComboBox.DroppedDown.ExpandBorderInner = new LinearGradientColorTable(factory.GetColor(0xF1EBD5), factory.GetColor(0xFFE694), 90);
+            table.ComboBox.DroppedDown.ExpandBorderOuter = new LinearGradientColorTable(factory.GetColor(0x9A8F63), Color.Empty, 90);
+            table.ComboBox.DroppedDown.ExpandText = factory.GetColor(0x000000);
+            #endregion
+
+            #region Dialog Launcher
+            table.DialogLauncher.Default.DialogLauncher = factory.GetColor(0x656870);
+            table.DialogLauncher.Default.DialogLauncherShade = factory.GetColor(0xEBEBEB);
+
+            table.DialogLauncher.MouseOver.DialogLauncher = factory.GetColor(0x656870);
+            table.DialogLauncher.MouseOver.DialogLauncherShade = factory.GetColor(0xEBEBEB);
+            table.DialogLauncher.MouseOver.TopBackground = new LinearGradientColorTable(factory.GetColor(0xFFFCDF), factory.GetColor(0xFFEFA7));
+            table.DialogLauncher.MouseOver.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xFFD975), factory.GetColor(0xFFE398));
+            table.DialogLauncher.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFFFFFB), factory.GetColor(0xFFFBF2));
+            table.DialogLauncher.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xDBCE99), Color.Empty);
+
+            table.DialogLauncher.Pressed.DialogLauncher = factory.GetColor(0x656870);
+            table.DialogLauncher.Pressed.DialogLauncherShade = factory.GetColor(0xEBEBEB);
+            table.DialogLauncher.Pressed.TopBackground = new LinearGradientColorTable(factory.GetColor(0xE8DEBD), factory.GetColor(0xEAC68D));
+            table.DialogLauncher.Pressed.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xFFA738), factory.GetColor(0xFFCC4E));
+            table.DialogLauncher.Pressed.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xF0EAD4), factory.GetColor(0xFFE391));
+            table.DialogLauncher.Pressed.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x9A8F63), factory.GetColor(0xB0A472));
+            #endregion
+
+            #region Legacy Color Scheme
+            InitializeBlackLegacyColors(table.LegacyColors, factory);
+            #endregion
+
+            #region System Button, Form
+
+            // Default state no background
+            table.SystemButton.Default = new Office2007SystemButtonStateColorTable();
+            table.SystemButton.Default.Foreground = new LinearGradientColorTable(factory.GetColor(0x6D7989), factory.GetColor(0x8899B1));
+            table.SystemButton.Default.LightShade = factory.GetColor(0xFDFDFF);
+            table.SystemButton.Default.DarkShade = factory.GetColor(0x454545);
+
+            // Mouse over state
+            table.SystemButton.MouseOver = new Office2007SystemButtonStateColorTable();
+            table.SystemButton.MouseOver.Foreground = new LinearGradientColorTable(factory.GetColor(0x6D7989), factory.GetColor(0x8899B1));
+            table.SystemButton.MouseOver.LightShade = factory.GetColor(0xFDFDFF);
+            table.SystemButton.MouseOver.DarkShade = factory.GetColor(0x454545);
+            table.SystemButton.MouseOver.TopBackground = new LinearGradientColorTable(factory.GetColor(0xF7F9FB), factory.GetColor(0xF1F5FA));
+            table.SystemButton.MouseOver.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xE3EAF4), factory.GetColor(0xE2E8F2));
+            table.SystemButton.MouseOver.TopHighlight = new LinearGradientColorTable(factory.GetColor(0xFBFBFD), Color.Transparent);
+            table.SystemButton.MouseOver.BottomHighlight = new LinearGradientColorTable(factory.GetColor(0xF9FAFC), Color.Transparent);
+            table.SystemButton.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xC8CDD4), factory.GetColor(0xB9C2D0));
+            table.SystemButton.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFEFEFF), factory.GetColor(0xFCFDFE));
+
+            // Pressed
+            table.SystemButton.Pressed = new Office2007SystemButtonStateColorTable();
+            table.SystemButton.Pressed.Foreground = new LinearGradientColorTable(factory.GetColor(0x6D7989), factory.GetColor(0x8899B1));
+            table.SystemButton.Pressed.LightShade = factory.GetColor(0xFDFDFF);
+            table.SystemButton.Pressed.DarkShade = factory.GetColor(0x454545);
+            table.SystemButton.Pressed.TopBackground = new LinearGradientColorTable(factory.GetColor(0xCACED3), factory.GetColor(0xAAAFB6));
+            table.SystemButton.Pressed.TopHighlight = new LinearGradientColorTable(factory.GetColor(0xE4E7EA), Color.Transparent);
+            table.SystemButton.Pressed.BottomBackground = new LinearGradientColorTable(factory.GetColor(0x899097), factory.GetColor(0xC3CDD4));
+            table.SystemButton.Pressed.BottomHighlight = new LinearGradientColorTable(factory.GetColor(0xD5E2E9), Color.Transparent);
+            table.SystemButton.Pressed.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x979CA0), factory.GetColor(0xADB2B8));
+            table.SystemButton.Pressed.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xEEF1F5), factory.GetColor(0xFBFDFF));
+
+            // Form border
+            table.Form.Active.BorderColors = new Color[] {
+                factory.GetColor(0x727880),
+                factory.GetColor(0xBBBABA),
+                factory.GetColor(0xD0D4DD),
+                factory.GetColor(0xD0D4DD),
+                factory.GetColor(0xD0D4DD)};
+            table.Form.Inactive.BorderColors = new Color[] {
+                factory.GetColor(0xB4B9C1),
+                factory.GetColor(0xF0F0F0),
+                factory.GetColor(0xE0E0E0),
+                factory.GetColor(0xD0D4DD),
+                factory.GetColor(0xD0D4DD)};
+
+
+            // Form Caption Active
+            table.Form.Active.CaptionTopBackground = new LinearGradientColorTable(factory.GetColor(0xE7E8EB), factory.GetColor(0xCACDD1));
+            table.Form.Active.CaptionBottomBackground = new LinearGradientColorTable(factory.GetColor(0xBAC1CA), factory.GetColor(0xE9EEF7));
+            table.Form.Active.CaptionBottomBorder = new Color[] { factory.GetColor(0xE9EEF7), factory.GetColor(0xACAFB7) };
+            table.Form.Active.CaptionText = factory.GetColor(0x4D5259);
+            table.Form.Active.CaptionTextExtra = factory.GetColor(0x356EB1);
+
+            // Form Caption Inactive
+            table.Form.Inactive.CaptionTopBackground = new LinearGradientColorTable(factory.GetColor(0xEEEFF0), factory.GetColor(0xE5E6E8));
+            table.Form.Inactive.CaptionBottomBackground = new LinearGradientColorTable(factory.GetColor(0xDDE0E5), factory.GetColor(0xF4F7FB));
+            table.Form.Inactive.CaptionText = factory.GetColor(0x444444);
+            table.Form.Inactive.CaptionTextExtra = factory.GetColor(0x444444);
+
+            table.Form.BackColor = factory.GetColor(0xCACDD6);
+            table.Form.TextColor = factory.GetColor(0x000000);
+            #endregion
+
+            #region Quick Access Toolbar Background
+            table.QuickAccessToolbar.Active.TopBackground = new LinearGradientColorTable(factory.GetColor(0xD7D9DB), factory.GetColor(0xDEDFE2));
+            table.QuickAccessToolbar.Active.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xD2D7DD), factory.GetColor(0xDADCE0));
+            table.QuickAccessToolbar.Active.OutterBorderColor = Color.Empty; // factory.GetColor(0xAEAEB0);
+            table.QuickAccessToolbar.Active.MiddleBorderColor = factory.GetColor(0xAEAEB0);
+            table.QuickAccessToolbar.Active.InnerBorderColor = Color.Empty;
+
+            table.QuickAccessToolbar.Inactive.TopBackground = new LinearGradientColorTable(factory.GetColor(0xE7E7E8), factory.GetColor(0xEEEFF0));
+            table.QuickAccessToolbar.Inactive.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xE8EAED), factory.GetColor(0xD9DADC));
+            table.QuickAccessToolbar.Inactive.OutterBorderColor = Color.Empty; // factory.GetColor(0xCECECF);
+            table.QuickAccessToolbar.Inactive.MiddleBorderColor = factory.GetColor(0xB1B1B2);
+            table.QuickAccessToolbar.Inactive.InnerBorderColor = Color.Empty;
+
+            table.QuickAccessToolbar.Standalone.TopBackground = new LinearGradientColorTable();
+            table.QuickAccessToolbar.Standalone.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xD9DEE6), factory.GetColor(0xD6DBE3));
+            table.QuickAccessToolbar.Standalone.OutterBorderColor = factory.GetColor(0xC2C9D4);
+            table.QuickAccessToolbar.Standalone.MiddleBorderColor = Color.Empty;
+            table.QuickAccessToolbar.Standalone.InnerBorderColor = factory.GetColor(0xEDEFF3);
+
+            table.QuickAccessToolbar.QatCustomizeMenuLabelBackground = factory.GetColor(0xEBEBEB);
+            table.QuickAccessToolbar.QatCustomizeMenuLabelText = factory.GetColor(0x4C535C);
+
+            table.QuickAccessToolbar.Active.GlassBorder = new LinearGradientColorTable(factory.GetColor(Color.FromArgb(132, Color.Black)), Color.FromArgb(80, Color.Black));
+            table.QuickAccessToolbar.Inactive.GlassBorder = new LinearGradientColorTable(factory.GetColor(Color.FromArgb(132, Color.Black)), Color.FromArgb(80, Color.Black));
+            #endregion
+
+            #region Tab Colors
+            table.TabControl.Default = new Office2007TabItemStateColorTable();
+            table.TabControl.Default.TopBackground = new LinearGradientColorTable(factory.GetColor(0xDCE0E5), factory.GetColor(0xD8DDE2));
+            table.TabControl.Default.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xC3C3C3), factory.GetColor(0xDFDFDF));
+            table.TabControl.Default.InnerBorder = factory.GetColor(0xEDF3F4);
+            table.TabControl.Default.OuterBorder = factory.GetColor(0x6F7074);
+            table.TabControl.Default.Text = factory.GetColor(0x000000);
+
+            table.TabControl.MouseOver = new Office2007TabItemStateColorTable();
+            table.TabControl.MouseOver.TopBackground = new LinearGradientColorTable(factory.GetColor(0xFFFDEB), factory.GetColor(0xFFECA8));
+            table.TabControl.MouseOver.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xFFDA59), factory.GetColor(0xFFE68D));
+            table.TabControl.MouseOver.InnerBorder = factory.GetColor(0xFFFFFB);
+            table.TabControl.MouseOver.OuterBorder = factory.GetColor(0xB69D73);
+            table.TabControl.MouseOver.Text = factory.GetColor(0x000000);
+
+            table.TabControl.Selected = new Office2007TabItemStateColorTable();
+            //t.TabControl.Selected.TopBackground = new LinearGradientColorTable(factory.GetColor(0xFFD29B), factory.GetColor(0xFFBB6E));
+            //t.TabControl.Selected.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xFFAF44), factory.GetColor(0xFEDC75));
+            //t.TabControl.Selected.InnerBorder = factory.GetColor(0xCDB69C);
+            //t.TabControl.Selected.OuterBorder = factory.GetColor(0x95774A);
+            table.TabControl.Selected.TopBackground = new LinearGradientColorTable(factory.GetColor(Color.White), factory.GetColor(0xE8EAEE));
+            table.TabControl.Selected.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xE8EAEE), factory.GetColor(0xE8EAEE));
+            table.TabControl.Selected.InnerBorder = factory.GetColor(Color.White);
+            table.TabControl.Selected.OuterBorder = factory.GetColor(0x6F7074);
+            table.TabControl.Selected.Text = factory.GetColor(0x000000);
+
+            table.TabControl.TabBackground = new LinearGradientColorTable(factory.GetColor(0xC7CAD3), factory.GetColor(0xC7CAD3));
+            table.TabControl.TabPanelBackground = new LinearGradientColorTable(factory.GetColor(0xE8EAEE), factory.GetColor(0xD4D7E0));
+            table.TabControl.TabPanelBorder = factory.GetColor(0x6F7074);
+            #endregion
+
+            #region CheckBoxItem
+            Office2007CheckBoxColorTable chk = table.CheckBoxItem;
+            chk.Default.CheckBackground = new LinearGradientColorTable(factory.GetColor(0xF4F4F4), Color.Empty);
+            chk.Default.CheckBorder = factory.GetColor(0x9B9DA0);
+            chk.Default.CheckInnerBackground = new LinearGradientColorTable(Color.FromArgb(192, factory.GetColor(0xCACFD5)), Color.FromArgb(164, factory.GetColor(0xF6F6F6)));
+            chk.Default.CheckInnerBorder = factory.GetColor(0xA2ACB9);
+            chk.Default.CheckSign = new LinearGradientColorTable(factory.GetColor(0x4F6B88), Color.Empty);
+            chk.Default.Text = factory.GetColor(0x333333);
+
+            chk.MouseOver.CheckBackground = new LinearGradientColorTable(factory.GetColor(0xF4F4F4), Color.Empty);
+            chk.MouseOver.CheckBorder = factory.GetColor(0x9B9DA0);
+            chk.MouseOver.CheckInnerBackground = new LinearGradientColorTable(Color.FromArgb(192, factory.GetColor(0xFCE7AF)), Color.FromArgb(128, factory.GetColor(0xFEF8E7)));
+            chk.MouseOver.CheckInnerBorder = factory.GetColor(0xFAD57A);
+            chk.MouseOver.CheckSign = new LinearGradientColorTable(factory.GetColor(0x4F6B88), Color.Empty);
+            chk.MouseOver.Text = factory.GetColor(0x333333);
+
+            chk.Pressed.CheckBackground = new LinearGradientColorTable(factory.GetColor(0xE5ECF7), Color.Empty);
+            chk.Pressed.CheckBorder = factory.GetColor(0x9B9DA0);
+            chk.Pressed.CheckInnerBackground = new LinearGradientColorTable(Color.FromArgb(192, factory.GetColor(0xFFD067)), Color.FromArgb(164, factory.GetColor(0xFFF4D5)));
+            chk.Pressed.CheckInnerBorder = factory.GetColor(0xF28926);
+            chk.Pressed.CheckSign = new LinearGradientColorTable(factory.GetColor(0x4F6B88), Color.Empty);
+            chk.Pressed.Text = factory.GetColor(0x333333);
+
+            chk.Disabled.CheckBackground = new LinearGradientColorTable(factory.GetColor(0xFFFFFF), Color.Empty);
+            chk.Disabled.CheckBorder = factory.GetColor(0xD5D8DB);
+            chk.Disabled.CheckInnerBackground = new LinearGradientColorTable(Color.FromArgb(192, factory.GetColor(0xEEF0F2)), Color.FromArgb(164, factory.GetColor(0xFBFBFB)));
+            chk.Disabled.CheckInnerBorder = factory.GetColor(0xE0E2E5);
+            chk.Disabled.CheckSign = new LinearGradientColorTable(factory.GetColor(0x8D8D8D), Color.Empty);
+            chk.Disabled.Text = factory.GetColor(0x8D8D8D);
+            #endregion
+
+            #region Scroll Bar
+            InitializeScrollBarColorTable(table, factory);
+            Office2007ColorTableFactory.InitializeAppSilverScrollBarColorTable(table, factory);
+            #endregion
+
+            #region ProgressBarItem
+            Office2007ProgressBarColorTable pct = table.ProgressBarItem;
+            pct.BackgroundColors = new GradientColorTable(0xC6CBD5, 0xE0E4ED);
+            pct.OuterBorder = factory.GetColor(0xF8FBFF);
+            pct.InnerBorder = factory.GetColor(0xC0C0C0);
+            pct.Chunk = new GradientColorTable(0x649021, 0xE5FCBC, 0);
+            pct.ChunkOverlay = new GradientColorTable();
+            pct.ChunkOverlay.LinearGradientAngle = 90;
+            pct.ChunkOverlay.Colors.AddRange(new BackgroundColorBlend[] {
+                new BackgroundColorBlend(Color.FromArgb(164, factory.GetColor(0xD8E6C3)), 0f),
+                new BackgroundColorBlend(Color.FromArgb(128, factory.GetColor(0x88B048)), .5f),
+                new BackgroundColorBlend(Color.FromArgb(64, factory.GetColor(0x6A9D1F)), .5f),
+                new BackgroundColorBlend(Color.Transparent, 1f),
+            });
+            pct.ChunkShadow = new GradientColorTable(0xB2B9C8, 0xD5DAE5, 0);
+
+            // Paused State
+            pct = table.ProgressBarItemPaused;
+            pct.BackgroundColors = new GradientColorTable(0xC6CBD5, 0xE0E4ED);
+            pct.OuterBorder = factory.GetColor(0xF8FBFF);
+            pct.InnerBorder = factory.GetColor(0xC0C0C0);
+            pct.Chunk = new GradientColorTable(0xAEA700, 0xFFFDCD, 0);
+            pct.ChunkOverlay = new GradientColorTable();
+            pct.ChunkOverlay.LinearGradientAngle = 90;
+            pct.ChunkOverlay.Colors.AddRange(new BackgroundColorBlend[] {
+                new BackgroundColorBlend(Color.FromArgb(192, factory.GetColor(0xFFFBA3)), 0f),
+                new BackgroundColorBlend(Color.FromArgb(128, factory.GetColor(0xD2CA00)), .5f),
+                new BackgroundColorBlend(Color.FromArgb(64, factory.GetColor(0xFEF400)), .5f),
+                new BackgroundColorBlend(Color.Transparent, 1f),
+            });
+            pct.ChunkShadow = new GradientColorTable(0xB2B9C8, 0xD5DAE5, 0);
+
+            // Error State
+            pct = table.ProgressBarItemError;
+            pct.BackgroundColors = new GradientColorTable(0xC6CBD5, 0xE0E4ED);
+            pct.OuterBorder = factory.GetColor(0xF8FBFF);
+            pct.InnerBorder = factory.GetColor(0xC0C0C0);
+            pct.Chunk = new GradientColorTable(0xD20000, 0xFFCDCD, 0);
+            pct.ChunkOverlay = new GradientColorTable();
+            pct.ChunkOverlay.LinearGradientAngle = 90;
+            pct.ChunkOverlay.Colors.AddRange(new BackgroundColorBlend[] {
+                new BackgroundColorBlend(Color.FromArgb(192, factory.GetColor(0xFF8F8F)), 0f),
+                new BackgroundColorBlend(Color.FromArgb(128, factory.GetColor(0xD20000)), .5f),
+                new BackgroundColorBlend(Color.FromArgb(64, factory.GetColor(0xFE0000)), .5f),
+                new BackgroundColorBlend(Color.Transparent, 1f),
+            });
+            pct.ChunkShadow = new GradientColorTable(0xB2B9C8, 0xD5DAE5, 0);
+            #endregion
+
+            #region Gallery
+            Office2007GalleryColorTable gallery = table.Gallery;
+            gallery.GroupLabelBackground = factory.GetColor(0xEBEBEB);
+            gallery.GroupLabelText = factory.GetColor(0x4C535C);
+            gallery.GroupLabelBorder = factory.GetColor(0xC5C5C5);
+            #endregion
+
+            #region ListViewEx
+            table.ListViewEx.Border = factory.GetColor(editoBorderColor);
+            table.ListViewEx.ColumnBackground = new LinearGradientColorTable(factory.GetColor(0xFFFFFF), factory.GetColor(0xD4D7DB));
+            table.ListViewEx.ColumnSeparator = factory.GetColor(0x6E6D8F);
+            table.ListViewEx.ColumnForeColor = factory.GetColor(0x333333);
+            table.ListViewEx.SelectionBackground = new LinearGradientColorTable(factory.GetColor(0xA7CDF0), Color.Empty);
+            table.ListViewEx.SelectionBorder = factory.GetColor(0xE3EFFF);
+            #endregion
+
+            #region Navigation Pane
+            table.NavigationPane.ButtonBackground = new GradientColorTable();
+            table.NavigationPane.ButtonBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xEBEEFA), 0));
+            table.NavigationPane.ButtonBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xD6DAE4), .4f));
+            table.NavigationPane.ButtonBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xC5C7D1), .4f));
+            table.NavigationPane.ButtonBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xD4D8E2), 1));
+            #endregion
+
+            #region SuperTooltip
+            table.SuperTooltip.BackgroundColors = new LinearGradientColorTable(factory.GetColor(0xFFFFFF), factory.GetColor(0xE4E4F0));
+            table.SuperTooltip.TextColor = factory.GetColor(0x4C4C4C);
+            #endregion
+
+            #region Slider
+            Office2007SliderColorTable sl = table.Slider;
+            sl.Default.LabelColor = factory.GetColor(0x23262A);
+            sl.Default.SliderLabelColor = factory.GetColor(0x333333);
+            sl.Default.PartBackground = new GradientColorTable();
+            sl.Default.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFFFFFF), 0));
+            sl.Default.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xF1F1F2), .15f));
+            sl.Default.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xBDC0C3), .5f));
+            sl.Default.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0x787D85), .5f));
+            sl.Default.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xF8F8F9), .85f));
+            sl.Default.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFFFFFF), 1f));
+            sl.Default.PartBorderColor = factory.GetColor(0x3D434B);
+            sl.Default.PartBorderLightColor = Color.FromArgb(28, factory.GetColor(0xFFFFFF));
+            sl.Default.PartForeColor = factory.GetColor(0x5F6771);
+            sl.Default.PartForeLightColor = Color.FromArgb(168, factory.GetColor(0xEBEBEC));
+            sl.Default.TrackLineColor = factory.GetColor(0x252525);
+            sl.Default.TrackLineLightColor = factory.GetColor(0xCCCCCC);
+
+            sl.MouseOver.LabelColor = factory.GetColor(0x23262A);
+            sl.MouseOver.SliderLabelColor = factory.GetColor(0x333333);
+            sl.MouseOver.PartBackground = new GradientColorTable();
+            sl.MouseOver.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFFFFFF), 0));
+            sl.MouseOver.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFFFDF5), .2f));
+            sl.MouseOver.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFFDF83), .5f));
+            sl.MouseOver.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xDDA70D), .5f));
+            sl.MouseOver.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFFF4CE), .85f));
+            sl.MouseOver.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFFF4CE), 1f));
+            sl.MouseOver.PartBorderColor = factory.GetColor(0x2F2F2F);
+            sl.MouseOver.PartBorderLightColor = Color.FromArgb(28, factory.GetColor(0xFFFFFF));
+            sl.MouseOver.PartForeColor = factory.GetColor(0x676249);
+            sl.MouseOver.PartForeLightColor = Color.FromArgb(168, factory.GetColor(0xFFFEFB));
+            sl.MouseOver.TrackLineColor = factory.GetColor(0x252525);
+            sl.MouseOver.TrackLineLightColor = factory.GetColor(0xCCCCCC);
+
+            sl.Pressed.LabelColor = factory.GetColor(0x23262A);
+            sl.Pressed.SliderLabelColor = factory.GetColor(0x333333);
+            sl.Pressed.PartBackground = new GradientColorTable();
+            sl.Pressed.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xF38622), 0));
+            sl.Pressed.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xF2A253), .2f));
+            sl.Pressed.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xF9C18B), .5f));
+            sl.Pressed.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xF07E10), .5f));
+            sl.Pressed.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xF3C69C), .85f));
+            sl.Pressed.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFCE0C7), 1f));
+            sl.Pressed.PartBorderColor = factory.GetColor(0x2F2F2F);
+            sl.Pressed.PartBorderLightColor = Color.FromArgb(28, factory.GetColor(0xFFFFFF));
+            sl.Pressed.PartForeColor = factory.GetColor(0x675241);
+            sl.Pressed.PartForeLightColor = Color.FromArgb(168, factory.GetColor(0xFFE6CE));
+            sl.Pressed.TrackLineColor = factory.GetColor(0x252525);
+            sl.Pressed.TrackLineLightColor = factory.GetColor(0xCCCCCC);
+
+            ColorBlendFactory df = new ColorBlendFactory(ColorScheme.GetColor(0xCFCFCF));
+            sl.Disabled.LabelColor = factory.GetColor(0x8D8D8D);
+            sl.Disabled.SliderLabelColor = factory.GetColor(0x8D8D8D);
+            sl.Disabled.PartBackground = new GradientColorTable();
+            foreach (BackgroundColorBlend b in sl.Default.PartBackground.Colors)
+                sl.Disabled.PartBackground.Colors.Add(new BackgroundColorBlend(df.GetColor(b.Color), b.Position));
+            sl.Disabled.PartBorderColor = df.GetColor(sl.Default.PartBorderColor);
+            sl.Disabled.PartBorderLightColor = df.GetColor(sl.Default.PartBorderLightColor);
+            sl.Disabled.PartForeColor = df.GetColor(sl.Default.PartForeColor);
+            sl.Disabled.PartForeLightColor = df.GetColor(sl.Default.PartForeLightColor);
+            sl.Disabled.TrackLineColor = df.GetColor(sl.Default.TrackLineColor);
+            sl.Disabled.TrackLineLightColor = df.GetColor(sl.Default.TrackLineLightColor);
+            #endregion
+
+            #region RangeSlider
+            Office2007ColorTable.InitRangeSlider(table, factory);
+            #endregion
+
+            #region DataGridView
+            table.DataGridView.ColumnHeaderNormalBorder = factory.GetColor(0x909192);
+            table.DataGridView.ColumnHeaderNormalBackground = new LinearGradientColorTable(factory.GetColor(0xF1F3F3), factory.GetColor(0xC8C9CA), 90);
+            table.DataGridView.ColumnHeaderSelectedBackground = new LinearGradientColorTable(factory.GetColor(0xFFCC99), factory.GetColor(0xFF9B68), 90);
+            table.DataGridView.ColumnHeaderSelectedBorder = factory.GetColor(0xD4763D);
+            table.DataGridView.ColumnHeaderSelectedMouseOverBackground = new LinearGradientColorTable(factory.GetColor(0xD7D7D7), factory.GetColor(editoBorderColor), 90);
+            table.DataGridView.ColumnHeaderSelectedMouseOverBorder = factory.GetColor(0xD4763D);
+            table.DataGridView.ColumnHeaderMouseOverBackground = new LinearGradientColorTable(factory.GetColor(0xD0D0D0), factory.GetColor(0xA6A6A6), 90);
+            table.DataGridView.ColumnHeaderMouseOverBorder = factory.GetColor(0x9DA3A9);
+            table.DataGridView.ColumnHeaderPressedBackground = new LinearGradientColorTable(factory.GetColor(0xD0D0D0), factory.GetColor(0xA6A6A6), 90);
+            table.DataGridView.ColumnHeaderPressedBorder = factory.GetColor(0xFFFFFF);
+
+            table.DataGridView.RowNormalBackground = new LinearGradientColorTable(factory.GetColor(0xE7E7E7));
+            table.DataGridView.RowNormalBorder = factory.GetColor(0x909192);
+            table.DataGridView.RowSelectedBackground = new LinearGradientColorTable(factory.GetColor(0xF5C795));
+            table.DataGridView.RowSelectedBorder = factory.GetColor(0xD4763D);
+            table.DataGridView.RowSelectedMouseOverBackground = new LinearGradientColorTable(factory.GetColor(0xED8B4E));
+            table.DataGridView.RowSelectedMouseOverBorder = factory.GetColor(0xD4763D);
+            table.DataGridView.RowMouseOverBackground = new LinearGradientColorTable(factory.GetColor(0xB8BFC4));
+            table.DataGridView.RowMouseOverBorder = factory.GetColor(0x9DA3A9);
+            table.DataGridView.RowPressedBackground = new LinearGradientColorTable(factory.GetColor(0xB8BFC4));
+            table.DataGridView.RowPressedBorder = factory.GetColor(0xFFFFFF);
+
+            table.DataGridView.GridColor = factory.GetColor(0xD0D7E5);
+
+            table.DataGridView.SelectorBackground = new LinearGradientColorTable(factory.GetColor(0xC6C6C6));
+            table.DataGridView.SelectorBorder = factory.GetColor(0x909192);
+            table.DataGridView.SelectorBorderDark = factory.GetColor(0xC3C3C3);
+            table.DataGridView.SelectorBorderLight = factory.GetColor(0xF9F9F9);
+            table.DataGridView.SelectorSign = new LinearGradientColorTable(factory.GetColor(0xFDFDFD), factory.GetColor(0xEFEFEF));
+
+            table.DataGridView.SelectorMouseOverBackground = new LinearGradientColorTable(factory.GetColor(0xA1A1A1));
+            table.DataGridView.SelectorMouseOverBorder = factory.GetColor(0x909192);
+            table.DataGridView.SelectorMouseOverBorderDark = factory.GetColor(0xC3C3C3);
+            table.DataGridView.SelectorMouseOverBorderLight = factory.GetColor(0xF9F9F9);
+            table.DataGridView.SelectorMouseOverSign = new LinearGradientColorTable(factory.GetColor(0xFDFDFD), factory.GetColor(0xEFEFEF));
+            #endregion
+
+            #region SideBar
+            table.SideBar.Background = new LinearGradientColorTable(factory.GetColor(Color.White));
+            table.SideBar.Border = factory.GetColor(0x6F7074);
+            table.SideBar.SideBarPanelItemText = factory.GetColor(0x333333);
+            table.SideBar.SideBarPanelItemDefault = new GradientColorTable();
+            table.SideBar.SideBarPanelItemDefault.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xEBEEFA), 0));
+            table.SideBar.SideBarPanelItemDefault.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xD6DAE4), .4f));
+            table.SideBar.SideBarPanelItemDefault.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xC5C7D1), .4f));
+            table.SideBar.SideBarPanelItemDefault.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xD4D8E2), 1));
+            // Expanded
+            table.SideBar.SideBarPanelItemExpanded = new GradientColorTable();
+            table.SideBar.SideBarPanelItemExpanded.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFBDBB5), 0));
+            table.SideBar.SideBarPanelItemExpanded.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFEC778), .4f));
+            table.SideBar.SideBarPanelItemExpanded.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFEB456), .4f));
+            table.SideBar.SideBarPanelItemExpanded.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFDEB9F), 1));
+            // MouseOver
+            table.SideBar.SideBarPanelItemMouseOver = new GradientColorTable();
+            table.SideBar.SideBarPanelItemMouseOver.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFFFCD9), 0));
+            table.SideBar.SideBarPanelItemMouseOver.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFFE78D), .4f));
+            table.SideBar.SideBarPanelItemMouseOver.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFFD748), .4f));
+            table.SideBar.SideBarPanelItemMouseOver.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFFE793), 1));
+            // Pressed
+            table.SideBar.SideBarPanelItemPressed = new GradientColorTable();
+            table.SideBar.SideBarPanelItemPressed.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xF8B869), 0));
+            table.SideBar.SideBarPanelItemPressed.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFDA361), .4f));
+            table.SideBar.SideBarPanelItemPressed.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFB8A3C), .4f));
+            table.SideBar.SideBarPanelItemPressed.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFEBB60), 1));
+            #endregion
+
+            #region AdvTree
+#if !NOTREE
+            table.AdvTree = new DevComponents.AdvTree.Display.TreeColorTable();
+            DevComponents.AdvTree.Display.ColorTableInitializer.InitOffice2007Silver(table.AdvTree, factory);
+#endif
+            #endregion
+
+            #region CrumbBar
+            table.CrumbBarItemView = new CrumbBarItemViewColorTable();
+            CrumbBarItemViewStateColorTable crumbBarViewTable = new CrumbBarItemViewStateColorTable();
+            table.CrumbBarItemView.Default = crumbBarViewTable;
+            crumbBarViewTable.Foreground = factory.GetColor(0x333333);
+            crumbBarViewTable = new CrumbBarItemViewStateColorTable();
+            table.CrumbBarItemView.MouseOver = crumbBarViewTable;
+            crumbBarViewTable.Foreground = factory.GetColor(0x333333);
+            crumbBarViewTable.Background = new BackgroundColorBlendCollection();
+            crumbBarViewTable.Background.AddRange(new BackgroundColorBlend[]{
+                new BackgroundColorBlend(factory.GetColor("FFFFFCE4"), 0f),
+                new BackgroundColorBlend(factory.GetColor("FFFFECA1"), .4f),
+                new BackgroundColorBlend(factory.GetColor("FFFFD842"), .4f),
+                new BackgroundColorBlend(factory.GetColor("FFFFE47B"), 1f)});
+            crumbBarViewTable.Border = factory.GetColor("FFDBCE99");
+            crumbBarViewTable.BorderLight = factory.GetColor("90FFFFFF");
+            crumbBarViewTable = new CrumbBarItemViewStateColorTable();
+            table.CrumbBarItemView.MouseOverInactive = crumbBarViewTable;
+            crumbBarViewTable.Foreground = factory.GetColor(0x333333);
+            crumbBarViewTable.Background = new BackgroundColorBlendCollection();
+            crumbBarViewTable.Background.AddRange(new BackgroundColorBlend[]{
+                new BackgroundColorBlend(factory.GetColor("FFFFFDEC"), 0f),
+                new BackgroundColorBlend(factory.GetColor("FFFFF4CA"), .4f),
+                new BackgroundColorBlend(factory.GetColor("FFFFEBA6"), .4f),
+                new BackgroundColorBlend(factory.GetColor("FFFFF2C5"), 1f)});
+            crumbBarViewTable.Border = factory.GetColor("FF8E8F8F");
+            crumbBarViewTable.BorderLight = factory.GetColor("90FFFFFF");
+            crumbBarViewTable = new CrumbBarItemViewStateColorTable();
+            table.CrumbBarItemView.Pressed = crumbBarViewTable;
+            crumbBarViewTable.Foreground = factory.GetColor(0x333333);
+            crumbBarViewTable.Background = new BackgroundColorBlendCollection();
+            crumbBarViewTable.Background.AddRange(new BackgroundColorBlend[]{
+                new BackgroundColorBlend(factory.GetColor("FFDCA36F"), 0f),
+                new BackgroundColorBlend(factory.GetColor("FFF2B077"), .1f),
+                new BackgroundColorBlend(factory.GetColor("FFE57840"), .6f),
+                new BackgroundColorBlend(factory.GetColor("FFDE550A"), .6f),
+                new BackgroundColorBlend(factory.GetColor("FFEF7D31"), 1f)});
+            crumbBarViewTable.Border = factory.GetColor("FF8B7654");
+            crumbBarViewTable.BorderLight = factory.GetColor("408B7654");
+
+            #endregion
+
+            #region WarningBox
+            table.WarningBox.BackColor = factory.GetColor(Color.FromArgb(255, 212, 216, 219));
+            table.WarningBox.WarningBorderColor = factory.GetColor(Color.FromArgb(180, 180, 180));
+            table.WarningBox.WarningBackColor1 = factory.GetColor(Color.FromArgb(255, 255, 255, 255));
+            table.WarningBox.WarningBackColor2 = factory.GetColor(Color.FromArgb(255, 234, 234, 234));
+            #endregion
+
+            #region CalendarView
+
+            #region WeekDayViewColors
+
+            table.CalendarView.WeekDayViewColors = new ColorDef[]
+            {
+                new ColorDef(factory.GetColor(0x616A76)),           // DayViewBorder
+                new ColorDef(factory.GetColor(0x616A76)),           // DayHeaderForeground
+
+                new ColorDef(new Color[] {factory.GetColor(0xDCDFE2), factory.GetColor(0xD3D6DA), factory.GetColor(0xB4BAC1), factory.GetColor(0xCBCED4)},
+                new float[] {0f, .55f, .58f, 1f}, 90f),             // DayHeaderBackground
+
+                new ColorDef(factory.GetColor(0x9199A4)),           // DayHeaderBorder
+
+                new ColorDef(factory.GetColor(0xFFFFFF)),           // DayWorkHoursBackground
+                new ColorDef(factory.GetColor(0xC7CBD1)),           // DayAllDayEventBackground
+                new ColorDef(factory.GetColor(0xE8EAEC)),           // DayOffWorkHoursBackground
+
+                new ColorDef(factory.GetColor(0xC7CBD1)),           // DayHourBorder
+                new ColorDef(factory.GetColor(0xE8EAEC)),           // DayHalfHourBorder
+
+                new ColorDef(factory.GetColor(0x365362)),           // SelectionBackground
+
+                new ColorDef(factory.GetColor(0x9199A4)),           // OwnerTabBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xCFD2D8), factory.GetColor(0xB0B6BE)},    // OwnerTabBackground
+                new float[] {0f, 1f}, 90f),
+
+                new ColorDef(factory.GetColor(0x000000)),           // OwnerTabForeground
+                new ColorDef(factory.GetColor(0xB0B6BE)),           // OwnerTabContentBackground
+                new ColorDef(factory.GetColor(0x000000)),           // OwnerTabSelectedForeground
+                new ColorDef(factory.GetColor(0xFFFFFF)),           // OwnerTabSelectionBackground
+
+                new ColorDef(factory.GetColor(0xF5F5F5)),           // CondensedViewBackground
+
+                new ColorDef(factory.GetColor(0xEB8900)),           // NowDayViewBorder
+                new ColorDef(factory.GetColor(0x000000)),           // NowDayHeaderForeground - 0x15428B
+
+                new ColorDef(new Color[] {factory.GetColor(0xFFED79), factory.GetColor(0xFFD86B), factory.GetColor(0xFFBB00), factory.GetColor(0xFFEA77)},
+                new float[] {0f, .55f ,58f, 1f}, 90f),              // NowDayHeaderBackground
+                
+                new ColorDef(new Color[] {factory.GetColor(0xFFED79), factory.GetColor(0xFFD86B), factory.GetColor(0xFFBB00), factory.GetColor(0xFFEA77)},
+                new float[] {0f, .55f ,58f, 1f}, 90f),              // TimeIndicator
+
+                new ColorDef(factory.GetColor(0xEB8900)),           // TimeIndicatorBorder
+            };
+
+            #endregion
+
+            #region HourRulerColors
+
+            table.CalendarView.TimeRulerColors = new ColorDef[]
+            {
+                new ColorDef(factory.GetColor(0xF0F1F2)),       // TimeRulerBackground
+                new ColorDef(factory.GetColor(0x6F7074)),       // TimeRulerForeground
+                new ColorDef(factory.GetColor(0x6F7074)),       // TimeRulerBorder
+                new ColorDef(factory.GetColor(0x6F7074)),       // TimeRulerTickBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xFFED79), factory.GetColor(0xFFD86B), factory.GetColor(0xFFBB00), factory.GetColor(0xFFEA77)},
+                new float[] {0f, .55f ,58f, 1f}, 90f),          // TimeRulerIndicator
+
+                new ColorDef(factory.GetColor(0xEB8900)),       // TimeRulerIndicatorBorder
+           };
+
+            #endregion
+
+            #region MonthViewColors
+
+            table.CalendarView.MonthViewColors = new ColorDef[]
+            {
+              new ColorDef(factory.GetColor(0x9199A4)),           // DayOfWeekHeaderBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xDCDFE2), factory.GetColor(0xD3D6DA), factory.GetColor(0xB4BAC1), factory.GetColor(0xCBCED4)},
+                new float[] {0, .55f, .58f, 1}),                    // DayOfWeekHeaderBackground
+
+                new ColorDef(factory.GetColor(0x616A76)),           // DayOfWeekHeaderForeground
+                new ColorDef(factory.GetColor(0x9199A4)),           // SideBarBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xDCDFE2), factory.GetColor(0xD2D5DA), factory.GetColor(0xB7BCC3), factory.GetColor(0xCACED4)},
+                new float[] {0, .6f, .6f, 1}, 0),                   // SideBarBackground
+
+                new ColorDef(factory.GetColor(0x000000)),           // SideBarForeground
+                new ColorDef(factory.GetColor(0x9199A4)),           // DayHeaderBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xDCDFE2), factory.GetColor(0xD3D6DA), factory.GetColor(0xB4BAC1), factory.GetColor(0xCBCED4)},
+                new float[] {0, .55f, .58f, 1}),                    // DayHeaderBackground
+
+                new ColorDef(factory.GetColor(0x000000)),           // DayHeaderForeground
+                new ColorDef(factory.GetColor(0x9199A4)),           // DayContentBorder
+                new ColorDef(factory.GetColor(0xE8EAEC)),           // DayContentSelectionBackground
+                new ColorDef(factory.GetColor(0xFFFFFF)),           // DayContentActiveDayBackground
+                new ColorDef(factory.GetColor(0xC7CBD1)),           // DayContentInactiveDayBackground
+
+                new ColorDef(factory.GetColor(0x9199A4)),           // OwnerTabBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xCFD2D8), factory.GetColor(0xB0B6BE)},    // OwnerTabBackground
+                new float[] {0f, 1f}, 90f),
+
+                new ColorDef(factory.GetColor(0x000000)),           // OwnerTabForeground
+                new ColorDef(factory.GetColor(0xB0B6BE)),           // OwnerTabContentBackground
+                new ColorDef(factory.GetColor(0x000000)),           // OwnerTabSelectedForeground
+                new ColorDef(factory.GetColor(0xFFFFFF)),           // OwnerTabSelectionBackground
+
+                new ColorDef(factory.GetColor(0xEB8900)),           // NowDayViewBorder
+                new ColorDef(factory.GetColor(0x000000)),           // NowDayHeaderForeground - 0x15428B
+
+                new ColorDef(new Color[] {factory.GetColor(0xFFED79), factory.GetColor(0xFFD86B), factory.GetColor(0xFFBB00), factory.GetColor(0xFFEA77)},
+                new float[] {0f, .55f ,58f, 1f}, 90f),              // NowDayHeaderBackground
+
+                new ColorDef(factory.GetColor(0x000000)),           // ContentLinkForeground - DayHeaderForeground
+                new ColorDef(factory.GetColor(0xFFFFFF)),           // ContentLinkBackground - DayContentActiveDayBackground
+            };
+
+            #endregion
+
+            #region AppointmentColors
+
+            table.CalendarView.AppointmentColors = new ColorDef[]
+            {
+                new ColorDef(factory.GetColor(0x4B71A2)),           // DefaultBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xFDFEFF), factory.GetColor(0xC1D3EA)},
+                             new float[] {0f, 1f}, 90f),            // DefaultBackground
+
+                new ColorDef(factory.GetColor(0x28518E)),           // BlueBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xB1C5EC), factory.GetColor(0x759DDA)}, 
+                             new float[] {0f, 1f}, 90f),            // BlueBackground
+
+                new ColorDef(factory.GetColor(0x2C6524)),           // GreenBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xC2E8BC), factory.GetColor(0x84D17B)},
+                             new float[] {0f, 1f}, 90f),            // GreenBackground
+
+                new ColorDef(factory.GetColor(0x8B3E0A)),           // OrangeBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xF9C7A0), factory.GetColor(0xF49758)},
+                             new float[] {0f, 1f}, 90f),            // OrangeBackground
+
+                new ColorDef(factory.GetColor(0x3E2771)),           // PurpleBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xC5B5E6), factory.GetColor(0x957BD2)},
+                             new float[] {0f, 1f}, 90f),            // PurpleBackground
+
+                new ColorDef(factory.GetColor(0x86171C)),           // RedBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xF1AAAC), factory.GetColor(0xE5676E)},
+                             new float[] {0f, 1f}, 90f),            // RedBackground
+
+                new ColorDef(factory.GetColor(0x7C7814)),           // YellowBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xFFFCAA), factory.GetColor(0xFFF958)},
+                             new float[] {0f, 1f}, 90f),            // YellowBackground
+
+                new ColorDef(factory.GetColor(-1)),                 // BusyTimeMarker
+                new ColorDef(factory.GetColor(0xFFFFFF)),           // FreeTimeMarker
+                new ColorDef(factory.GetColor(0x800080))            // OutOfOfficeTimeMarker
+            };
+
+            #endregion
+
+            #endregion
+
+            #region SuperTab
+
+            #region SuperTab
+
+            table.SuperTab.Background = new SuperTabLinearGradientColorTable(
+                factory.GetColor(0xD0D4DD));
+
+            table.SuperTab.InnerBorder = factory.GetColor(0xEFF9F9);
+            table.SuperTab.OuterBorder = factory.GetColor(0xBEBEBE);
+
+            table.SuperTab.ControlBoxDefault.Image = factory.GetColor(0x333333);
+
+            table.SuperTab.ControlBoxMouseOver.Background = factory.GetColor(0xFFE7A2);
+            table.SuperTab.ControlBoxMouseOver.Border = factory.GetColor(0xFFBD69);
+            table.SuperTab.ControlBoxMouseOver.Image = factory.GetColor(0xFF, 0x000000);
+
+            table.SuperTab.ControlBoxPressed.Background = factory.GetColor(0xFB8C3C);
+            table.SuperTab.ControlBoxPressed.Border = factory.GetColor(0xFFBD69);
+            table.SuperTab.ControlBoxPressed.Image = factory.GetColor(0xFF, 0x000000);
+
+            table.SuperTab.InsertMarker = factory.GetColor(0xFF, 0x000080);
+
+            #endregion
+
+            #region SuperTabItem
+
+            // Top Default
+
+            table.SuperTabItem.Default.Normal.Background = new SuperTabLinearGradientColorTable();
+
+            table.SuperTabItem.Default.Normal.Text = factory.GetColor(0x333333);
+            table.SuperTabItem.Default.Normal.CloseMarker = factory.GetColor(0x333333);
+
+            // Disabled
+            table.SuperTabItem.Default.Disabled.Text = factory.GetColor(0x8D8D8D);
+            table.SuperTabItem.Default.Disabled.Background.AdaptiveGradient = false;
+            table.SuperTabItem.Default.Disabled.CloseMarker = factory.GetColor(0x8D8D8D);
+
+            // Top Selected
+
+            table.SuperTabItem.Default.Selected.Background = new SuperTabLinearGradientColorTable(
+                new Color[] { factory.GetColor(0xF2F2F4), factory.GetColor(0xE3E7EF) },
+                new float[] { 0, 1 });
+
+            table.SuperTabItem.Default.Selected.InnerBorder = factory.GetColor(0xEFF9F9);
+            table.SuperTabItem.Default.Selected.OuterBorder = factory.GetColor(0xBEBEBE);
+            table.SuperTabItem.Default.Selected.Text = factory.GetColor(0x333333);
+            table.SuperTabItem.Default.Selected.CloseMarker = factory.GetColor(0x333333);
+
+            // Top SelectedMouseOver
+
+            table.SuperTabItem.Default.SelectedMouseOver.Background = new SuperTabLinearGradientColorTable(
+                new Color[] { factory.GetColor(0xF2F7FA), factory.GetColor(0xE1E6EF) },
+                new float[] { 0, 1 });
+
+            table.SuperTabItem.Default.SelectedMouseOver.InnerBorder = factory.GetColor(0xFAECC2);
+            table.SuperTabItem.Default.SelectedMouseOver.OuterBorder = factory.GetColor(0xE8BB72);
+            table.SuperTabItem.Default.SelectedMouseOver.Text = factory.GetColor(0x333333);
+            table.SuperTabItem.Default.SelectedMouseOver.CloseMarker = factory.GetColor(0x333333);
+
+            // Top MouseOver
+
+            table.SuperTabItem.Default.MouseOver.Background = new SuperTabLinearGradientColorTable(
+                new Color[] { factory.GetColor(0xDBD4C3), factory.GetColor(0xE9CE8D) },
+                new float[] { 0, 1 });
+
+            table.SuperTabItem.Default.MouseOver.InnerBorder = factory.GetColor(0xE8EAEE);
+            table.SuperTabItem.Default.MouseOver.OuterBorder = factory.GetColor(0xBDBEC1);
+            table.SuperTabItem.Default.MouseOver.Text = factory.GetColor(0x333333);
+            table.SuperTabItem.Default.MouseOver.CloseMarker = factory.GetColor(0x333333);
+
+            // Left, Bottom, Right
+
+            table.SuperTabItem.Left = table.SuperTabItem.Default;
+            table.SuperTabItem.Bottom = table.SuperTabItem.Default;
+            table.SuperTabItem.Right = table.SuperTabItem.Default;
+
+            #endregion
+
+            #region SuperTabPanel
+
+            table.SuperTabPanel.Default.Background = new SuperTabLinearGradientColorTable(
+                factory.GetColor(0xE8EAEE));
+
+            table.SuperTabPanel.Default.InnerBorder = factory.GetColor(0xEFF9F9);
+            table.SuperTabPanel.Default.OuterBorder = factory.GetColor(0xBEBEBE);
+
+            table.SuperTabPanel.Left = table.SuperTabPanel.Default;
+            table.SuperTabPanel.Bottom = table.SuperTabPanel.Default;
+            table.SuperTabPanel.Right = table.SuperTabPanel.Default;
+
+            #endregion
+
+            #endregion
+
+            #region Backstage
+
+            #region Backstage
+
+            SuperTabStyleColorFactory.GetOffice2010BackstageSilverColorTable(table.Backstage, factory);
+
+            #endregion
+
+            #region BackstageItem
+
+            SuperTabStyleColorFactory.GetOffice2010BackstageSilverItemColorTable(table.BackstageItem, factory);
+
+            #endregion
+
+            #region BackstagePanel
+
+            SuperTabStyleColorFactory.GetOffice2010BackstageSilverPanelColorTable(table.BackstagePanel, factory);
+
+            #endregion
+
+            #endregion
+
+            #region SwitchButton
+            SwitchButtonColorTable sbt = new SwitchButtonColorTable();
+            sbt.BorderColor = factory.GetColor(0xA9B1B8);
+            sbt.OffBackColor = factory.GetColor(0xE9EDF3);
+            sbt.OffTextColor = factory.GetColor(0x333333);
+            sbt.OnBackColor = factory.GetColor(0x92D050);
+            sbt.OnTextColor = factory.GetColor(0x333333);
+            sbt.SwitchBackColor = factory.GetColor(0xD3D7E2);
+            sbt.SwitchBorderColor = factory.GetColor(0x8C8C8D);
+            sbt.TextColor = factory.GetColor(0x333333);
+            table.SwitchButton = new SwitchButtonColors();
+            table.SwitchButton.Default = sbt;
+            table.SwitchButton.Disabled.BorderColor = table.CheckBoxItem.Disabled.CheckBorder;
+            table.SwitchButton.Disabled.SwitchBorderColor = table.SwitchButton.Disabled.BorderColor;
+            table.SwitchButton.Disabled.OffTextColor = table.CheckBoxItem.Disabled.Text;
+            table.SwitchButton.Disabled.OnTextColor = table.SwitchButton.Disabled.OffTextColor;
+            table.SwitchButton.Disabled.TextColor = table.SwitchButton.Disabled.OffTextColor;
+            table.SwitchButton.Disabled.SwitchBackColor = table.CheckBoxItem.Disabled.CheckInnerBackground.Start;
+            table.SwitchButton.Disabled.OffBackColor = table.CheckBoxItem.Disabled.CheckInnerBackground.Start;
+            table.SwitchButton.Disabled.OnBackColor = table.SwitchButton.Disabled.OffBackColor;
+            #endregion
+
+            #region ElementStyle Classes
+            table.StyleClasses.Clear();
+            ElementStyle style = new ElementStyle();
+            style.Class = ElementStyleClassKeys.RibbonGalleryContainerKey;
+            style.BorderColor = factory.GetColor(0xA9B1B8);
+            style.Border = eStyleBorderType.Solid;
+            style.BorderWidth = 1;
+            style.CornerDiameter = 2;
+            style.CornerType = eCornerType.Rounded;
+            style.BackColor = factory.GetColor(0xE8EAEC);
+            table.StyleClasses.Add(style.Class, style);
+            // FileMenuContainer
+            style = Office2007ColorTableFactory.GetFileMenuContainerStyle(table);
+            table.StyleClasses.Add(style.Class, style);
+            // Two Column File Menu Container
+            style = Office2007ColorTableFactory.GetTwoColumnMenuContainerStyle(table);
+            table.StyleClasses.Add(style.Class, style);
+            // Column one File Menu Container
+            style = Office2007ColorTableFactory.GetMenuColumnOneContainerStyle(table);
+            table.StyleClasses.Add(style.Class, style);
+            // Column two File Menu Container
+            style = Office2007ColorTableFactory.GetMenuColumnTwoContainerStyle(table);
+            table.StyleClasses.Add(style.Class, style);
+            // Bottom File Menu Container
+            style = Office2007ColorTableFactory.GetMenuBottomContainer(table);
+            table.StyleClasses.Add(style.Class, style);
+            // TextBox border
+            style = Office2007ColorTableFactory.GetTextBoxStyle(factory.GetColor(editoBorderColor));
+            table.StyleClasses.Add(style.Class, style);
+            // RichTextBox border
+            style = Office2007ColorTableFactory.GetRichTextBoxStyle(factory.GetColor(editoBorderColor));
+            table.StyleClasses.Add(style.Class, style);
+            // ItemPanel
+            style = Office2007ColorTableFactory.GetItemPanelStyle(factory.GetColor(editoBorderColor));
+            table.StyleClasses.Add(style.Class, style);
+            // ListBoxAdv
+            style = Office2007ColorTableFactory.GetListBoxAdvStyle(factory.GetColor(editoBorderColor));
+            table.StyleClasses.Add(style.Class, style);
+            // DateTimeInput background
+            style = Office2007ColorTableFactory.GetDateTimeInputBackgroundStyle(factory.GetColor(editoBorderColor), SystemColors.Window);
+            table.StyleClasses.Add(style.Class, style);
+            // Ribbon Client Panel
+            style = Office2007ColorTableFactory.GetRibbonClientPanelStyle(factory, eOffice2007ColorScheme.Silver);
+            table.StyleClasses.Add(style.Class, style);
+            // ListView Border
+            style = Office2007ColorTableFactory.GetListViewBorderStyle(table.ListViewEx);
+            table.StyleClasses.Add(style.Class, style);
+            // Status bar alt background
+            style = Office2007ColorTableFactory.GetStatusBarAltStyle(table.Bar);
+            table.StyleClasses.Add(style.Class, style);
+
+#if !NOTREE
+            // Tree Border/Background
+            style = Office2007ColorTableFactory.GetAdvTreeStyle(factory.GetColor(editoBorderColor), Color.Empty);
+            table.StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetAdvTreeColumnsHeaderStyle(factory.GetColor(0xF1F3F3), factory.GetColor(0xC8C9CA), factory.GetColor(0x909192));
+            table.StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetAdvTreeNodesColumnsHeaderStyle(factory.GetColor(0xF1F3F3), factory.GetColor(0xC8C9CA), factory.GetColor(0x909192));
+            table.StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetAdvTreeColumnStyle(factory.GetColor(0x000000));
+            table.StyleClasses.Add(style.Class, style);
+#endif
+
+            // CrumbBar
+            style = Office2007ColorTableFactory.GetCrumbBarBackgroundStyle(factory.GetColor(Color.White), factory.GetColor("FFACAFB7"), factory.GetColor("FF5A5B5C"));
+            table.StyleClasses.Add(style.Class, style);
+            // DataGridView border
+            style = Office2007ColorTableFactory.GetDataGridViewStyle();
+            table.StyleClasses.Add(style.Class, style);
+            // DataGridViewDateTime border
+            style = Office2007ColorTableFactory.GetDataGridViewDateTimeStyle();
+            table.StyleClasses.Add(style.Class, style);
+            // DataGridViewNumeric border
+            style = Office2007ColorTableFactory.GetDataGridViewNumericStyle();
+            table.StyleClasses.Add(style.Class, style);
+            // DataGridViewIpAddress border
+            style = Office2007ColorTableFactory.GetDataGridViewIpAddressStyle();
+            table.StyleClasses.Add(style.Class, style);
+
+            // Slide-out Button
+            style = Office2007ColorTableFactory.GetSlideOutButtonStyle(table.CheckBoxItem.Default.CheckBorder);
+            table.StyleClasses.Add(style.Class, style);
+            // MetroTilePanel
+            style = Office2007ColorTableFactory.GetMetroTilePanelStyle(factory.GetColor(Color.White));
+            table.StyleClasses.Add(style.Class, style);
+            // MetroTileGroup
+            style = Office2007ColorTableFactory.GetMetroTileGroupStyle(factory.GetColor(Color.DarkGray));
+            table.StyleClasses.Add(style.Class, style);
+            // MonthCalendarAdv
+            style = Office2007ColorTableFactory.GetMonthCalendarStyle(SystemColors.Window);
+            table.StyleClasses.Add(style.Class, style);
+            // ProgressSteps control
+            style = Office2007ColorTableFactory.GetProgressStepsStyle(table);
+            table.StyleClasses.Add(style.Class, style);
+            // SideNavStrip
+            style = Office2007ColorTableFactory.GetSideNavStripStyle(table);
+            table.StyleClasses.Add(style.Class, style);
+            // TabFormPanel
+            style = Office2007ColorTableFactory.GetTabFormPanelStyle(factory.GetColor(0xF5F6F7));
+            table.StyleClasses.Add(style.Class, style);
+
+            // Toolbox Control
+            style = Office2007ColorTableFactory.GetToolboxControlStyle(factory.GetColor(table.LegacyColors.PanelBorder), Color.Empty);
+            table.StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetToolboxGroupTitle(factory.GetColor(0x333333));
+            table.StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetToolboxGroupTitleMouseOver(factory.GetColor(0x333333), factory.GetColor(0xD5DBE7));
+            table.StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetToolboxGroupExpandedTitle(factory.GetColor(0x333333), factory.GetColor(Color.DarkGray));
+            table.StyleClasses.Add(style.Class, style);           
+            #endregion
+
+            #region StepIndicator
+            table.StepIndicator.BackgroundColor = factory.GetColor(ColorFunctions.GetShade(table.Form.BackColor, 10));
+            table.StepIndicator.IndicatorColor = factory.GetColor(0xA4CC28);
+            #endregion
+
+            #region RadialMenu
+            table.RadialMenu = new RadialMenuColorTable();
+            table.RadialMenu.CircularBackColor = factory.GetColor(0xD44F2E);
+            table.RadialMenu.CircularBorderColor = factory.GetColor(0xFFFFFF);
+            table.RadialMenu.CircularForeColor = factory.GetColor(0xFFFFFF);
+            table.RadialMenu.RadialMenuBackground = factory.GetColor(0xFFFFFF);
+            table.RadialMenu.RadialMenuBorder = factory.GetColor(0x6D7989);
+            table.RadialMenu.RadialMenuButtonBackground = factory.GetColor(0xFFFFFF);
+            table.RadialMenu.RadialMenuButtonBorder = factory.GetColor(0x6D7989);
+            table.RadialMenu.RadialMenuExpandForeground = factory.GetColor(0xFFFFFF);
+            table.RadialMenu.RadialMenuInactiveBorder = Color.FromArgb(128, table.RadialMenu.RadialMenuBorder);
+            table.RadialMenu.RadialMenuItemForeground = factory.GetColor(0x6D7989);
+            table.RadialMenu.RadialMenuItemDisabledForeground = factory.GetColor(0x8D8D8D);
+            table.RadialMenu.RadialMenuItemMouseOverBackground = Color.FromArgb(72, table.RadialMenu.RadialMenuItemForeground);
+            table.RadialMenu.RadialMenuItemMouseOverForeground = factory.GetColor(0x6D7989);
+            table.RadialMenu.RadialMenuMouseOverBorder = Color.FromArgb(200, table.RadialMenu.RadialMenuBorder);
+            #endregion
+
+            #region StepItem
+            table.StepItem.Default = new OfficeStepItemStateColorTable(new Color[]{
+                    factory.GetColor(0xEBEEFA), 
+                    factory.GetColor(0xD6DAE4), 
+                    factory.GetColor(0xC5C7D1), 
+                    factory.GetColor(0xD4D8E2)
+                    },
+                    90,
+                    new float[] { 0f, .5f, .5f, 1f },
+                factory.GetColor(0x333333),
+                new Color[] {
+                    factory.GetColor(0x8D949D) });
+            table.StepItem.Progress = new OfficeStepItemStateColorTable(new Color[]{
+                    factory.GetColor(0xD8F577), 
+                    factory.GetColor(0x75C300),
+                    factory.GetColor(0x75C300),
+                    factory.GetColor(0xA9E923)
+                    },
+                    90,
+                    new float[] { 0f, .6f, .6f, 1f },
+                Color.Empty,
+                new Color[0]);
+            table.StepItem.MouseOver = new OfficeStepItemStateColorTable(new Color[]{
+                    factory.GetColor(0xFFFBD7), 
+                    factory.GetColor(0xFFE78D),
+                    factory.GetColor(0xFFD748), 
+                    factory.GetColor(0xFFE793)
+                    },
+                    90,
+                    new float[] { 0f, .5f, .5f, 1f },
+                factory.GetColor(0x333333),
+                new Color[] {
+                    factory.GetColor(0xDDCF9B), factory.GetColor(0xFFF796) });
+            table.StepItem.Pressed = new OfficeStepItemStateColorTable(new Color[]{
+                    factory.GetColor(0xF8B56A), 
+                    factory.GetColor(0xFCA060),
+                    factory.GetColor(0xFB8A3C), 
+                    factory.GetColor(0xFEBD62)
+                    },
+                    90,
+                    new float[] { 0f, .5f, .5f, 1f },
+                factory.GetColor(0x333333),
+                new Color[] {
+                    factory.GetColor(0x8B7654), factory.GetColor(0xFDAD11) });
+            #endregion
+
+            #region ListBoxItem
+            table.ListBoxItem.Default = new OfficeListBoxItemStateColorTable(factory.GetColor(0x000000));
+            table.ListBoxItem.MouseOver = new OfficeListBoxItemStateColorTable(factory.GetColor(0x000000), new Color[]{
+                    factory.GetColor(0xFFFCD9), 
+                    factory.GetColor(0xFFE793)
+                    },
+                    90,
+                    new float[] { 0f, 1f });
+            table.ListBoxItem.Selected = new OfficeListBoxItemStateColorTable(factory.GetColor(0x000000), new Color[]{
+                    factory.GetColor(0xFCD578), 
+                    factory.GetColor(0xFBC84F)
+                    },
+                    90,
+                    new float[] { 0f, 1f });
+            #endregion
+
+            #region TokenEditor
+            table.TokenEditor = new TokenEditorColorTable(0x000000, 0xEBEDF2, 0x000000, 0xBBC2CB, 0xFFFFFF, 0x0072C6);
+            #endregion
+
+            #region Flyout
+            table.Flyout.BorderColor = table.Form.Active.BorderColors[0];
+            #endregion
+
+            #region SideNav
+            table.SideNav.SideNavItem.Default = new SideNavItemStateColorTable(factory.GetColor(0x333333));
+            table.SideNav.SideNavItem.MouseOver = new SideNavItemStateColorTable(factory.GetColor(0x333333),
+                new Color[]
+                {
+                    factory.GetColor(0xFFFBD7), factory.GetColor(0xFFE78D), factory.GetColor(0xFFD748),
+                    factory.GetColor(0xFFE793)
+                },
+                new Color[] { factory.GetColor(0xC0A776), factory.GetColor(0xFFF2BE) },
+                2);
+            table.SideNav.SideNavItem.Pressed = new SideNavItemStateColorTable(factory.GetColor(0x333333),
+                new Color[]
+                {
+                    factory.GetColor(0xF8B869), factory.GetColor(0xFDA361), factory.GetColor(0xFB8A3C),
+                    factory.GetColor(0xFEBB60)
+                },
+                new Color[] { factory.GetColor(0x5F7FB6), factory.GetColor(0xFDAD11) },
+                2);
+            table.SideNav.SideNavItem.Selected = new SideNavItemStateColorTable(factory.GetColor(0x333333),
+                new Color[] { table.Form.BackColor },
+                new Color[] { Color.Empty, factory.GetColor(0xBEBEBE), Color.Empty, factory.GetColor(0xBEBEBE) });
+            table.SideNav.BorderColors = new Color[] { factory.GetColor(0xBEBEBE) };
+            table.SideNav.TitleBackColor = factory.GetColor(0xE3E7EF);
+            table.SideNav.TitleBorderColors = new Color[] { Color.Empty, Color.Empty, Color.Empty, factory.GetColor(0xBEBEBE) };
+            table.SideNav.PanelBackColor = table.Form.BackColor;
+
+            #endregion
+
+            #region TabForm
+            table.TabForm.Active.CaptionText = factory.GetColor(0x4D5259);
+            table.TabForm.Inactive.CaptionText = factory.GetColor(0x444444);
+            table.TabForm.Active.CaptionBackColors = new Color[] { factory.GetColor(0xF5F6F7) };
+            table.TabForm.Inactive.CaptionBackColors = new Color[] { factory.GetColor(0xF5F6F7) };
+            table.TabFormItemColorTables.Add(TabFormItem.DefaultColorTableKey, Office2007ColorTable.CreateDefaultTabFormItemColorTable(factory, 0x333333));
+            table.TabFormItemColorTables.Add(TabFormItem.BlueColorTableKey, Office2007ColorTable.CreateBlueTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.YellowColorTableKey, Office2007ColorTable.CreateYellowTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.PurpleColorTableKey, Office2007ColorTable.CreatePurpleTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.CyanColorTableKey, Office2007ColorTable.CreateCyanTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.BlueMistColorTableKey, Office2007ColorTable.CreateBlueMistTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.PurpleMistColorTableKey, Office2007ColorTable.CreatePurpleMistTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.TanColorTableKey, Office2007ColorTable.CreateTanTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.LemonLimeColorTableKey, Office2007ColorTable.CreateLemonLimeTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.AppleColorTableKey, Office2007ColorTable.CreateAppleTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.TealColorTableKey, Office2007ColorTable.CreateTealTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.RedChalkColorTableKey, Office2007ColorTable.CreateRedChalkTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.SilverColorTableKey, Office2007ColorTable.CreateSilverTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.OrangeColorTableKey, Office2007ColorTable.CreateOrangeTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.GreenColorTableKey, Office2007ColorTable.CreateGreenTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.MagentaColorTableKey, Office2007ColorTable.CreateMagentaTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.RedColorTableKey, Office2007ColorTable.CreateRedTabFormItemColorTable(factory));
+            #endregion
+        }
+
+        /// <summary>
+        /// Initializes ColorScheme object with the black color scheme.
+        /// </summary>
+        /// <param name="c">ColorScheme object to initialize.</param>
+        public static void InitializeBlackLegacyColors(ColorScheme c, ColorFactory factory)
+        {
+            c.BarBackground = factory.GetColor(0xF2F2F9);
+            c.BarBackground2 = factory.GetColor(0x9997B5);
+            c.BarStripeColor = factory.GetColor(0x6E6D8F);
+            c.BarCaptionBackground = factory.GetColor(0x7A7999);
+            c.BarCaptionBackground2 = factory.GetColor(0x626179);
+            c.BarCaptionInactiveBackground = factory.GetColor(0xF6F7F8);
+            c.BarCaptionInactiveBackground2 = factory.GetColor(0xDADFE6);
+            c.BarCaptionInactiveText = factory.GetColor(0x333333);
+            c.BarCaptionText = factory.GetColor(0xFFFFFF);
+            c.BarFloatingBorder = factory.GetColor(0x7A7999);
+            c.BarPopupBackground = factory.GetColor(0xFDFAFF);
+            c.BarPopupBorder = factory.GetColor(0x7A7999);
+            c.ItemBackground = Color.Empty;
+            c.ItemBackground2 = Color.Empty;
+            c.ItemCheckedBackground = factory.GetColor(0xFFCF92);
+            c.ItemCheckedBackground2 = factory.GetColor(0xFFAF49);
+            c.ItemCheckedBorder = factory.GetColor(0xFFAB3F);
+            c.ItemCheckedText = factory.GetColor(0x000000);
+            c.ItemDisabledBackground = Color.Empty;
+            c.ItemDisabledText = factory.GetColor(0x8D8D8D);
+            c.ItemExpandedShadow = Color.Empty;
+            c.ItemExpandedBackground = factory.GetColor(0xE8E9F1);
+            c.ItemExpandedBackground2 = factory.GetColor(0xBAB9CD);
+            c.ItemExpandedText = factory.GetColor(0x000000);
+            c.ItemHotBackground = factory.GetColor(0xFFF5CC);
+            c.ItemHotBackground2 = factory.GetColor(0xFFDF84);
+            c.ItemHotBorder = factory.GetColor(0xFFBD69);
+            c.ItemHotText = factory.GetColor(0x000000);
+            c.ItemPressedBackground = factory.GetColor(0xFC973D);
+            c.ItemPressedBackground2 = factory.GetColor(0xFFB85E);
+            c.ItemPressedBorder = factory.GetColor(0xFB8C3C);
+            c.ItemPressedText = factory.GetColor(0x000000);
+            c.ItemSeparator = Color.FromArgb(225, factory.GetColor(0x6E6D8F));
+            c.ItemSeparatorShade = Color.FromArgb(180, factory.GetColor(0xFFFFFF));
+            c.ItemText = factory.GetColor(0x000000); // SystemColors.ControlText;
+            c.MenuBackground = factory.GetColor(0xFDFAFF);
+            c.MenuBackground2 = Color.Empty; // Color.White;
+            c.MenuBarBackground = factory.GetColor(0xE5E5EE);
+            c.MenuBorder = factory.GetColor(0x7C7C94);
+            c.ItemExpandedBorder = c.MenuBorder;
+            c.MenuSide = factory.GetColor(0xEFEFEF);
+            c.MenuSide2 = Color.Empty; // factory.GetColor(0xDDE0E8);
+            c.MenuUnusedBackground = c.MenuBackground;
+            c.MenuUnusedSide = factory.GetColor(0xE9E9E9);
+            c.MenuUnusedSide2 = Color.Empty;// System.Windows.Forms.ControlPaint.Light(c.MenuSide2);
+            c.ItemDesignTimeBorder = Color.Black;
+            c.BarDockedBorder = factory.GetColor(0x6F7074);
+
+            c.DockSiteBackColor = factory.GetColor(0xD7D7E5);
+            c.DockSiteBackColor2 = factory.GetColor(0xF3F3F7);
+
+            c.CustomizeBackground = factory.GetColor(0xB3B2C8);
+            c.CustomizeBackground2 = factory.GetColor(0x767492);
+            c.CustomizeText = factory.GetColor(0x000000);
+
+            c.PanelBackground = factory.GetColor(0xF0F1F2);
+            c.PanelBackground2 = factory.GetColor(0xBDC2C9);
+            c.PanelText = Color.Black;
+            c.PanelBorder = factory.GetColor(0x6F7074);
+
+            c.ExplorerBarBackground = factory.GetColor(0xF3F3F7);
+            c.ExplorerBarBackground2 = factory.GetColor(0xD7D7E5);
+
+            c.SplitterBackground = c.PanelBackground;
+            c.SplitterBackground2 = c.PanelBackground2;
+            c.SplitterText = c.PanelText;
+            c.SplitterBorder = c.PanelBorder;
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/Office2007SliderColorTable.cs b/PROMS/DotNetBar Source Code/Rendering/Office2007SliderColorTable.cs
new file mode 100644
index 00000000..c690fd86
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/Office2007SliderColorTable.cs	
@@ -0,0 +1,65 @@
+using System;
+using System.Text;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    /// <summary>
+    /// Defines the color table for the slider item.
+    /// </summary>
+    public class Office2007SliderColorTable
+    {
+        /// <summary>
+        /// Gets or sets the default state colors.
+        /// </summary>
+        public Office2007SliderStateColorTable Default = new Office2007SliderStateColorTable();
+
+        /// <summary>
+        /// Gets or sets the mouse over state colors.
+        /// </summary>
+        public Office2007SliderStateColorTable MouseOver = new Office2007SliderStateColorTable();
+
+        /// <summary>
+        /// Gets or sets the mouse pressed colors.
+        /// </summary>
+        public Office2007SliderStateColorTable Pressed = new Office2007SliderStateColorTable();
+
+        /// <summary>
+        /// Gets or sets the disabled colors.
+        /// </summary>
+        public Office2007SliderStateColorTable Disabled = new Office2007SliderStateColorTable();
+
+        /// <summary>
+        /// Gets or sets the optional color table for Thumb part of the slider. When set to null default values from Office2007SliderColorTable are used.
+        /// </summary>
+        public Office2007SliderPartColorTable TrackPart = null;
+        /// <summary>
+        /// Gets or sets the optional color table for Increase button part of the slider. When set to null default values from Office2007SliderColorTable are used.
+        /// </summary>
+        public Office2007SliderPartColorTable IncreaseButtonPart = null;
+        /// <summary>
+        /// Gets or sets the optional color table for Decrease button part of the slider. When set to null default values from Office2007SliderColorTable are used.
+        /// </summary>
+        public Office2007SliderPartColorTable DecreaseButtonPart = null;
+    }
+
+    /// <summary>
+    /// Defines set of color tables for single slider part.
+    /// </summary>
+    public class Office2007SliderPartColorTable
+    {
+        /// <summary>
+        /// Gets or sets the default state colors.
+        /// </summary>
+        public Office2007SliderStateColorTable Default = new Office2007SliderStateColorTable();
+
+        /// <summary>
+        /// Gets or sets the mouse over state colors.
+        /// </summary>
+        public Office2007SliderStateColorTable MouseOver = new Office2007SliderStateColorTable();
+
+        /// <summary>
+        /// Gets or sets the mouse pressed colors.
+        /// </summary>
+        public Office2007SliderStateColorTable Pressed = new Office2007SliderStateColorTable();
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/Office2007SliderPainter.cs b/PROMS/DotNetBar Source Code/Rendering/Office2007SliderPainter.cs
new file mode 100644
index 00000000..4d2fb5de
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/Office2007SliderPainter.cs	
@@ -0,0 +1,480 @@
+using System;
+using System.Text;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using DevComponents.DotNetBar.Ribbon;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    internal class Office2007SliderPainter : SliderPainter, IOffice2007Painter
+    {
+        #region IOffice2007Painter
+        private Office2007ColorTable m_ColorTable = null; //new Office2007ColorTable();
+
+        /// <summary>
+        /// Gets or sets color table used by renderer.
+        /// </summary>
+        public Office2007ColorTable ColorTable
+        {
+            get { return m_ColorTable; }
+            set { m_ColorTable = value; }
+        }
+        #endregion
+
+        #region Internal Implementation
+        protected virtual Office2007SliderColorTable GetColorTable(SliderItem item, System.Windows.Forms.Control container)
+        {
+            if (item.ColorTable != null)
+                return item.ColorTable;
+
+            if (container == null)
+                return m_ColorTable.Slider;
+
+            Office2007ColorTable table = m_ColorTable;
+
+            string key = Office2007ColorTable.GetContextualKey(typeof(Office2007SliderColorTable), container.GetType());
+            object st = null;
+
+            if (container is Bar)
+            {
+                if (table.ContextualTables.TryGetValue(key + "+" + ((Bar)container).BarType.ToString(), out st))
+                    return (Office2007SliderColorTable)st;
+            }
+
+            if (table.ContextualTables.TryGetValue(key, out st))
+                return (Office2007SliderColorTable)st;
+
+            return m_ColorTable.Slider;
+        }
+
+        public override void Paint(SliderItemRendererEventArgs e)
+        {
+            SliderItem item = e.SliderItem;
+            Office2007SliderColorTable ct = GetColorTable(item, e.ItemPaintArgs.ContainerControl);
+            Office2007SliderStateColorTable decreaseCt = null;
+            Office2007SliderStateColorTable increaseCt = null;
+            Office2007SliderStateColorTable trackCt = null;
+            eDotNetBarStyle effectiveStyle = item.EffectiveStyle;
+
+            if (item.GetEnabled())
+            {
+                decreaseCt = ct.Default;
+                increaseCt = ct.Default;
+                trackCt = ct.Default;
+
+                if (ct.DecreaseButtonPart != null)
+                    decreaseCt = ct.DecreaseButtonPart.Default;
+                if (ct.IncreaseButtonPart != null)
+                    increaseCt = ct.IncreaseButtonPart.Default;
+                if (ct.TrackPart != null)
+                    trackCt = ct.TrackPart.Default;
+
+                if (item.MouseDownPart == eSliderPart.DecreaseButton)
+                {
+                    if (ct.DecreaseButtonPart != null)
+                        decreaseCt = ct.DecreaseButtonPart.Pressed;
+                    else
+                        decreaseCt = ct.Pressed;
+                }
+                else if (item.MouseDownPart == eSliderPart.IncreaseButton)
+                {
+                    if (ct.IncreaseButtonPart != null)
+                        increaseCt = ct.IncreaseButtonPart.Pressed;
+                    else
+                        increaseCt = ct.Pressed;
+                }
+                else if (item.MouseDownPart == eSliderPart.TrackArea)
+                {
+                    if (ct.TrackPart != null)
+                        trackCt = ct.TrackPart.Pressed;
+                    else
+                        trackCt = ct.Pressed;
+                }
+                else if (item.MouseOverPart == eSliderPart.DecreaseButton)
+                {
+                    if (ct.DecreaseButtonPart != null)
+                        decreaseCt = ct.DecreaseButtonPart.MouseOver;
+                    else
+                        decreaseCt = ct.MouseOver;
+                }
+                else if (item.MouseOverPart == eSliderPart.IncreaseButton)
+                {
+                    if (ct.IncreaseButtonPart != null)
+                        increaseCt = ct.IncreaseButtonPart.MouseOver;
+                    else
+                        increaseCt = ct.MouseOver;
+                }
+                else if (item.MouseOverPart == eSliderPart.TrackArea)
+                {
+                    if (ct.TrackPart != null)
+                        trackCt = ct.TrackPart.MouseOver;
+                    else
+                        trackCt = ct.MouseOver;
+                }
+            }
+            else
+            {
+                decreaseCt = ct.Disabled;
+                increaseCt = ct.Disabled;
+                trackCt = ct.Disabled;
+            }
+
+            Rectangle itemRect = item.DisplayRectangle;
+            Rectangle r = item.LabelBounds;
+            Graphics g = e.Graphics;
+
+            string text = GetText(item);
+            if (!r.IsEmpty && text.Length > 0)
+            {
+                r.Offset(itemRect.Location);
+                eTextFormat tf = eTextFormat.Default | eTextFormat.WordEllipsis;
+                if (item.LabelPosition == eSliderLabelPosition.Left)
+                    tf |= eTextFormat.Left | eTextFormat.VerticalCenter;
+                else if (item.LabelPosition == eSliderLabelPosition.Right)
+                    tf |= eTextFormat.Right | eTextFormat.VerticalCenter;
+                else if (item.LabelPosition == eSliderLabelPosition.Top)
+                    tf |= eTextFormat.HorizontalCenter | eTextFormat.Top | eTextFormat.WordBreak;
+                else if (item.LabelPosition == eSliderLabelPosition.Bottom)
+                    tf |= eTextFormat.HorizontalCenter | eTextFormat.Bottom | eTextFormat.WordBreak;
+
+                Color cl = trackCt.LabelColor;
+                if (e.ItemPaintArgs.ContainerControl is DevComponents.DotNetBar.Controls.Slider)
+                    cl = trackCt.SliderLabelColor;
+
+                if (!item.TextColor.IsEmpty)
+                    cl = item.TextColor;
+                if (item.TextMarkupBody == null)
+                {
+#if FRAMEWORK20
+                    if (e.ItemPaintArgs != null && e.ItemPaintArgs.GlassEnabled && item.Parent is CaptionItemContainer && !(e.ItemPaintArgs.ContainerControl is QatToolbar))
+                    {
+                        if (!e.ItemPaintArgs.CachedPaint)
+                            Office2007RibbonControlPainter.PaintTextOnGlass(g, GetText(item), e.ItemPaintArgs.Font, r, TextDrawing.GetTextFormat(tf));
+                    }
+                    else
+#endif
+                    {
+                        if (item.SliderOrientation == eOrientation.Vertical)
+                        {
+                            g.RotateTransform(90);
+                            TextDrawing.DrawString(g, GetText(item), e.ItemPaintArgs.Font, cl, new Rectangle(r.Top, -r.Right, r.Height, r.Width), tf);
+                            g.ResetTransform();
+                        }
+                        else
+                            TextDrawing.DrawString(g, GetText(item), e.ItemPaintArgs.Font, cl, r, tf);
+                    }
+                }
+                else
+                {
+                    if (item.SliderOrientation == eOrientation.Vertical)
+                    {
+                        g.RotateTransform(90);
+                        TextMarkup.MarkupDrawContext d = new TextMarkup.MarkupDrawContext(g, e.ItemPaintArgs.Font, cl, e.ItemPaintArgs.RightToLeft);
+                        d.HotKeyPrefixVisible = !((tf & eTextFormat.HidePrefix) == eTextFormat.HidePrefix);
+                        item.TextMarkupBody.Bounds = new Rectangle(r.Top, -r.Right, item.TextMarkupBody.Bounds.Width, item.TextMarkupBody.Bounds.Height);
+                        item.TextMarkupBody.Render(d);
+                        g.ResetTransform();
+                    }
+                    else
+                    {
+                        TextMarkup.MarkupDrawContext d = new TextMarkup.MarkupDrawContext(g, e.ItemPaintArgs.Font, cl, e.ItemPaintArgs.RightToLeft);
+                        d.HotKeyPrefixVisible = !((tf & eTextFormat.HidePrefix) == eTextFormat.HidePrefix);
+                        item.TextMarkupBody.Bounds = r;
+                        item.TextMarkupBody.Render(d);
+                    }
+                }
+            }
+
+            r = item.SlideBounds;
+            int penWidth = Dpi.Width1;
+            if (!r.IsEmpty)
+            {
+                SmoothingMode sm = g.SmoothingMode;
+                g.SmoothingMode = SmoothingMode.None;
+                r.Offset(itemRect.Location);
+                if (item.SliderOrientation == eOrientation.Horizontal)
+                {
+                    // Draw the track line
+                    int ty = r.Y + r.Height / 2 - 1;
+                    int tmx = r.X + r.Width / 2;
+                    if (!trackCt.TrackLineColor.IsEmpty)
+                    {
+                        using (Pen pen = new Pen(trackCt.TrackLineColor, penWidth))
+                        {
+                            g.DrawLine(pen, r.X - 1, ty, r.Right, ty);
+                        }
+                    }
+
+                    if (!trackCt.TrackLineLightColor.IsEmpty)
+                    {
+                        ty++;
+                        tmx++;
+                        using (Pen pen = new Pen(trackCt.TrackLineLightColor, penWidth))
+                        {
+                            if (item.TrackMarker)
+                                g.DrawLine(pen, tmx, ty - 3, tmx, ty + 3);
+                            g.DrawLine(pen, r.X - 1, ty, r.Right, ty);
+                        }
+                    }
+
+                    if (!trackCt.TrackLineColor.IsEmpty && item.TrackMarker)
+                    {
+                        ty--;
+                        tmx--;
+                        using (Pen pen = new Pen(trackCt.TrackLineColor, penWidth))
+                        {
+                            g.DrawLine(pen, tmx, ty - 3, tmx, ty + 3);
+                        }
+                    }
+                    g.SmoothingMode = sm;
+
+                    int tx = 0;
+                    if (e.ItemPaintArgs.RightToLeft)
+                        tx = (int)((r.Width - Dpi.Width11) * (1 - ((item.Maximum - item.Minimum == 0) ? 0 : (float)(item.Value - item.Minimum) / (item.Maximum - item.Minimum))));
+                    else
+                        tx = (int)((r.Width - Dpi.Width11) * ((item.Maximum - item.Minimum == 0) ? 0 : (float)(item.Value - item.Minimum) / (item.Maximum - item.Minimum)));
+
+                    // Draw the tracker
+                    Rectangle trackRect = r;
+                    trackRect.X += tx;
+                    trackRect.Width = Dpi.Width11;
+                    trackRect.Height = Dpi.Height15;
+                    trackRect.Y += (r.Height - trackRect.Height) / 2;
+                    PaintSliderPart(trackCt, trackRect, g, eSliderPart.TrackArea, item.SliderOrientation, effectiveStyle);
+                    item.TrackBounds = trackRect;
+                }
+                else
+                {
+                    // Draw the track line
+                    int tx = r.X + r.Width / 2 - 1;
+                    int tmy = r.Y + r.Height / 2;
+                    if (!trackCt.TrackLineColor.IsEmpty)
+                    {
+                        using (Pen pen = new Pen(trackCt.TrackLineColor, penWidth))
+                        {
+                            g.DrawLine(pen, tx, r.Y - 1, tx, r.Bottom);
+                        }
+                    }
+
+                    if (!trackCt.TrackLineLightColor.IsEmpty)
+                    {
+                        tx++;
+                        tmy++;
+                        using (Pen pen = new Pen(trackCt.TrackLineLightColor, penWidth))
+                        {
+                            if (item.TrackMarker)
+                                g.DrawLine(pen, tx - 3, tmy, tx + 3, tmy);
+                            g.DrawLine(pen, tx, r.Y - 1, tx, r.Bottom);
+                        }
+                    }
+
+                    if (!trackCt.TrackLineColor.IsEmpty && item.TrackMarker)
+                    {
+                        tx--;
+                        tmy--;
+                        using (Pen pen = new Pen(trackCt.TrackLineColor, penWidth))
+                        {
+                            g.DrawLine(pen, tx - 3, tmy, tx + 3, tmy);
+                        }
+                    }
+                    g.SmoothingMode = sm;
+
+                    int ty = 0;
+                    ty = (r.Height - 16) - (int)((r.Height - 11) * ((item.Maximum - item.Minimum == 0) ? 0 : (float)(item.Value - item.Minimum) / (item.Maximum - item.Minimum)));
+
+                    // Draw the tracker
+                    Rectangle trackRect = r;
+                    trackRect.Y += ty;
+                    trackRect.Width = Dpi.Width15;
+                    trackRect.Height = Dpi.Height11;
+                    trackRect.X += (r.Width - trackRect.Width) / 2;
+                    PaintSliderPart(trackCt, trackRect, g, eSliderPart.TrackArea, item.SliderOrientation, effectiveStyle);
+                    item.TrackBounds = trackRect;
+                }
+            }
+
+            r = item.DecreaseBounds;
+            if (!r.IsEmpty)
+            {
+                r.Offset(itemRect.Location);
+                r.Width--;
+                r.Height--;
+                PaintSliderPart(decreaseCt, r, g, eSliderPart.DecreaseButton, item.SliderOrientation, effectiveStyle);
+            }
+
+            r = item.IncreaseBounds;
+            if (!r.IsEmpty)
+            {
+                r.Offset(itemRect.Location);
+                r.Width--;
+                r.Height--;
+                PaintSliderPart(increaseCt, r, g, eSliderPart.IncreaseButton, item.SliderOrientation, effectiveStyle);
+            }
+
+            base.Paint(e);
+        }
+
+        private string GetText(SliderItem item)
+        {
+            return item.Text;
+        }
+
+        //private void PaintSliderPart(Office2007SliderStateColorTable ct, Rectangle r, Graphics g, eSliderPart part)
+        //{
+        //    PaintSliderPart(ct, r, g, part, eOrientation.Horizontal, eDotNetBarStyle.Office2010);
+        //}
+
+        private void PaintSliderPart(Office2007SliderStateColorTable ct, Rectangle r, Graphics g, eSliderPart part, eOrientation orientation, eDotNetBarStyle effectiveStyle)
+        {
+            if (r.Width <= 0 || r.Height <= 0) return;
+
+            if (part == eSliderPart.DecreaseButton || part == eSliderPart.IncreaseButton)
+            {
+                r.Inflate(-1, -1);
+                SmoothingMode sm = g.SmoothingMode;
+                g.SmoothingMode = SmoothingMode.AntiAlias;
+                if (ct.PartBackground.Colors.Count > 0)
+                {
+                    using (Brush brush = DisplayHelp.CreateBrush(r, ct.PartBackground))
+                    {
+                        g.FillEllipse(brush, r);
+                    }
+                }
+
+                if (!ct.PartBorderColor.IsEmpty)
+                {
+                    using (Pen pen = new Pen(ct.PartBorderColor, 1))
+                        g.DrawEllipse(pen, r);
+                }
+
+                r.Inflate(1, 1);
+                if (!ct.PartBorderLightColor.IsEmpty)
+                {
+                    using (Pen pen = new Pen(ct.PartBorderLightColor, 1))
+                        g.DrawEllipse(pen, r);
+                }
+                g.SmoothingMode = SmoothingMode.None;
+
+                if (part == eSliderPart.DecreaseButton)
+                {
+                    Size ps = new Size(Dpi.Width9, Dpi.Height3);
+                    Rectangle rp = new Rectangle(r.X + (r.Width - ps.Width) / 2, r.Y + (r.Height - ps.Height) / 2, ps.Width, ps.Height);
+                    if (!ct.PartForeLightColor.IsEmpty)
+                    {
+                        using (Pen pen = new Pen(ct.PartForeLightColor, 1))
+                            g.DrawRectangle(pen, rp);
+                    }
+
+                    if (!ct.PartForeColor.IsEmpty)
+                    {
+                        rp.Offset(1, 1);
+                        rp.Width--;
+                        rp.Height--;
+                        using (SolidBrush brush = new SolidBrush(ct.PartForeColor))
+                            g.FillRectangle(brush, rp);
+                    }
+                }
+                else if (part == eSliderPart.IncreaseButton)
+                {
+                    Size ps = new Size(Dpi.Width8, Dpi.Height8);
+                    Rectangle rp = new Rectangle(r.X + (r.Width - ps.Width) / 2, r.Y + (r.Height - ps.Height) / 2, ps.Width, ps.Height);
+                    if (!ct.TrackLineLightColor.IsEmpty)
+                    {
+                        using (SolidBrush brush = new SolidBrush(ct.PartForeLightColor))
+                        {
+                            g.FillRectangle(brush, new Rectangle(rp.X, rp.Y + Dpi.Height3, rp.Width + Dpi.Width2, Dpi.Height4));
+                            g.FillRectangle(brush, new Rectangle(rp.X + Dpi.Width3, rp.Y, Dpi.Width4, Dpi.Height3));
+                            g.FillRectangle(brush, new Rectangle(rp.X + Dpi.Width3, rp.Bottom - Dpi.Height1, Dpi.Width4, Dpi.Height3));
+                        }
+                    }
+
+                    if (!ct.TrackLineColor.IsEmpty)
+                    {
+                        using (SolidBrush brush = new SolidBrush(ct.PartForeColor))
+                        {
+                            g.FillRectangle(brush, new Rectangle(rp.X + Dpi.Width1, rp.Y + Dpi.Width4, rp.Width, Dpi.Width2));
+                            g.FillRectangle(brush, new Rectangle(rp.X + Dpi.Width4, rp.Y + Dpi.Height1, Dpi.Width2, Dpi.Height4));
+                            g.FillRectangle(brush, new Rectangle(rp.X + Dpi.Width4, rp.Bottom - Dpi.Width2, Dpi.Width2, Dpi.Height3));
+                        }
+                    }
+                }
+                g.SmoothingMode = sm;
+            }
+            else if (part == eSliderPart.TrackArea)
+            {
+                if (orientation == eOrientation.Vertical)
+                {
+                    // Left
+                    Matrix m = new Matrix();
+                    m.RotateAt(-90, new PointF(r.X, r.Bottom));
+                    m.Translate(r.Height, r.Width - r.Height, MatrixOrder.Append);
+                    g.Transform = m;
+                }
+                if (StyleManager.IsMetro(effectiveStyle))
+                {
+                    if (!ct.PartBackground.IsEmpty)
+                    {
+                        SmoothingMode sm = g.SmoothingMode;
+                        g.SmoothingMode = SmoothingMode.Default;
+                        Rectangle slideBounds = new Rectangle(r.X + (r.Width - Dpi.Width3) / 2, r.Y + Dpi.Width2, Dpi.Width3, r.Height - Dpi.Width4);
+                        using (Brush brush = DisplayHelp.CreateBrush(slideBounds, ct.PartBackground))
+                        {
+                            g.FillRectangle(brush, slideBounds);
+                        }
+                        g.SmoothingMode = sm;
+                    }
+                }
+                else
+                {
+                    using (GraphicsPath path = new GraphicsPath())
+                    {
+                        int x1 = Dpi.Width11;
+                        path.AddLine(r.X, r.Y, r.X + x1, r.Y);
+                        path.AddLine(r.X + x1, r.Y, r.X + x1, r.Y + Dpi.Height9);
+                        path.AddLine(r.X + x1, r.Y + Dpi.Height9, r.X + Dpi.Width6, r.Y + Dpi.Height15);
+                        path.AddLine(r.X + Dpi.Width5, r.Y + Dpi.Height15, r.X, r.Y + Dpi.Width10);
+                        path.CloseAllFigures();
+                        using (SolidBrush brush = new SolidBrush(ct.PartBorderLightColor))
+                            g.FillPath(brush, path);
+                    }
+
+                    SmoothingMode sm = g.SmoothingMode;
+                    g.SmoothingMode = SmoothingMode.AntiAlias;
+                    r.Offset(1, 1);
+                    using (GraphicsPath path = new GraphicsPath())
+                    {
+                        int n2 = Dpi.Width8;
+                        path.AddLine(r.X, r.Y, r.X + n2, r.Y);
+                        path.AddLine(r.X + n2, r.Y + n2, r.X + n2/2, r.Y + Dpi.Height12);
+                        path.AddLine(r.X, r.Y + n2, r.X, r.Y);
+                        path.CloseAllFigures();
+
+                        if (ct.PartBackground.Colors.Count > 0)
+                        {
+                            using (Brush brush = DisplayHelp.CreateBrush(Rectangle.Ceiling(path.GetBounds()), ct.PartBackground))
+                            {
+                                g.FillPath(brush, path);
+                            }
+                        }
+
+                        using (Pen pen = new Pen(ct.PartBorderColor, 1))
+                            g.DrawPath(pen, path);
+                    }
+
+                    using (Pen pen = new Pen(Color.FromArgb(200, ct.PartForeColor), 1))
+                        g.DrawLine(pen, r.X + Dpi.Width4, r.Y + Dpi.Height3, r.X + Dpi.Width4, r.Y + Dpi.Height8);
+
+                    using (Pen pen = new Pen(ct.PartForeLightColor, 1))
+                        g.DrawLine(pen, r.X + Dpi.Width5, r.Y + Dpi.Height4, r.X + Dpi.Width5, r.Y + Dpi.Height7);
+
+                    g.SmoothingMode = sm;
+                }
+
+                if (orientation == eOrientation.Vertical)
+                    g.ResetTransform();
+            }
+
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/Office2007SliderStateColorTable.cs b/PROMS/DotNetBar Source Code/Rendering/Office2007SliderStateColorTable.cs
new file mode 100644
index 00000000..1757c649
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/Office2007SliderStateColorTable.cs	
@@ -0,0 +1,57 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    /// <summary>
+    /// Defines the color table for the Slider Item in single state.
+    /// </summary>
+    public class Office2007SliderStateColorTable
+    {
+        /// <summary>
+        /// Gets or sets the part background colors.
+        /// </summary>
+        public GradientColorTable PartBackground = null;
+
+        /// <summary>
+        /// Gets or sets the part border color
+        /// </summary>
+        public Color PartBorderColor = Color.Empty;
+
+        /// <summary>
+        /// Gets or sets the part border light color
+        /// </summary>
+        public Color PartBorderLightColor = Color.Empty;
+
+        /// <summary>
+        /// Gets or sets the part foreground color.
+        /// </summary>
+        public Color PartForeColor = Color.Empty;
+
+        /// <summary>
+        /// Gets or sets the part foreground light color.
+        /// </summary>
+        public Color PartForeLightColor = Color.Empty;
+
+        /// <summary>
+        /// Gets or sets the track line color.
+        /// </summary>
+        public Color TrackLineColor = Color.Empty;
+
+        /// <summary>
+        /// Gets or sets the track line light color.
+        /// </summary>
+        public Color TrackLineLightColor = Color.Empty;
+
+        /// <summary>
+        /// Gets or sets the track label color.
+        /// </summary>
+        public Color LabelColor = Color.Empty;
+
+        /// <summary>
+        /// Gets or sets the track label color when on Slider control.
+        /// </summary>
+        public Color SliderLabelColor = Color.Empty;
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/Office2007SuperTooltipColorTable.cs b/PROMS/DotNetBar Source Code/Rendering/Office2007SuperTooltipColorTable.cs
new file mode 100644
index 00000000..b8e38a77
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/Office2007SuperTooltipColorTable.cs	
@@ -0,0 +1,23 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    /// <summary>
+    /// Defines the color table for the SuperTooltip.
+    /// </summary>
+    public class Office2007SuperTooltipColorTable
+    {
+        /// <summary>
+        /// Gets or sets the background colors.
+        /// </summary>
+        public LinearGradientColorTable BackgroundColors = null;
+
+        /// <summary>
+        /// Gets or sets the text color.
+        /// </summary>
+        public Color TextColor = Color.Empty;
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/Office2007SystemButtonColorTable.cs b/PROMS/DotNetBar Source Code/Rendering/Office2007SystemButtonColorTable.cs
new file mode 100644
index 00000000..8d3c4eb3
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/Office2007SystemButtonColorTable.cs	
@@ -0,0 +1,27 @@
+using System;
+using System.Text;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    /// <summary>
+    /// Represents color table for Office 2007 style system button displayed in form caption.
+    /// </summary>
+    public class Office2007SystemButtonColorTable
+    {
+        /// <summary>
+        /// Gets or sets the color table of default button state.
+        /// </summary>
+        public Office2007SystemButtonStateColorTable Default = null;
+
+        /// <summary>
+        /// Gets or sets the color table of button state when mouse is over the button.
+        /// </summary>
+        public Office2007SystemButtonStateColorTable MouseOver = null;
+
+        /// <summary>
+        /// Gets or sets the color table of button state when mouse is pressed over the button.
+        /// </summary>
+        public Office2007SystemButtonStateColorTable Pressed = null;
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/Office2007SystemButtonStateColorTable.cs b/PROMS/DotNetBar Source Code/Rendering/Office2007SystemButtonStateColorTable.cs
new file mode 100644
index 00000000..2220fd38
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/Office2007SystemButtonStateColorTable.cs	
@@ -0,0 +1,56 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    /// <summary>
+    /// Represents color table for single state of Office 2007 style system button displayed in form caption.
+    /// </summary>
+    public class Office2007SystemButtonStateColorTable
+    {
+        /// <summary>
+        /// Gets or sets the outer border colors.
+        /// </summary>
+        public LinearGradientColorTable OuterBorder = new LinearGradientColorTable();
+        /// <summary>
+        /// Gets or sets the inner border colors.
+        /// </summary>
+        public LinearGradientColorTable InnerBorder = new LinearGradientColorTable();
+
+        /// <summary>
+        /// Gets or sets top part background colors.
+        /// </summary>
+        public LinearGradientColorTable TopBackground = new LinearGradientColorTable();
+
+        /// <summary>
+        /// Gets or sets bottom part background colors.
+        /// </summary>
+        public LinearGradientColorTable BottomBackground = new LinearGradientColorTable();
+
+        /// <summary>
+        /// Gets or sets highlight colors for the top background part.
+        /// </summary>
+        public LinearGradientColorTable TopHighlight = new LinearGradientColorTable();
+
+        /// <summary>
+        /// Gets or sets highlight colors for the bottom background part.
+        /// </summary>
+        public LinearGradientColorTable BottomHighlight = new LinearGradientColorTable();
+
+        /// <summary>
+        /// Gets or sets the foreground color for the button.
+        /// </summary>
+        public LinearGradientColorTable Foreground = new LinearGradientColorTable();
+
+        /// <summary>
+        /// Gets or sets the dark shading color for the foreground.
+        /// </summary>
+        public Color DarkShade = Color.Empty;
+
+        /// <summary>
+        /// Gets or sets the light shading color for the foreground.
+        /// </summary>
+        public Color LightShade = Color.Empty;
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/Office2007TabColorTable.cs b/PROMS/DotNetBar Source Code/Rendering/Office2007TabColorTable.cs
new file mode 100644
index 00000000..547b74d1
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/Office2007TabColorTable.cs	
@@ -0,0 +1,47 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    /// <summary>
+    /// Represents the color table for the tab control.
+    /// </summary>
+    public class Office2007TabColorTable
+    {
+        /// <summary>
+        /// Gets or sets the default tab item colors.
+        /// </summary>
+        public Office2007TabItemStateColorTable Default = new Office2007TabItemStateColorTable();
+
+        /// <summary>
+        /// Gets or sets the mouse over tab item colors.
+        /// </summary>
+        public Office2007TabItemStateColorTable MouseOver = new Office2007TabItemStateColorTable();
+
+        /// <summary>
+        /// Gets or sets the selected tab item colors.
+        /// </summary>
+        public Office2007TabItemStateColorTable Selected = new Office2007TabItemStateColorTable();
+
+        /// <summary>
+        /// Gets or sets the color of the tab background colors.
+        /// </summary>
+        public LinearGradientColorTable TabBackground = new LinearGradientColorTable();
+
+        /// <summary>
+        /// Gets or sets the tab-strip background image.
+        /// </summary>
+        public Image TabBackgroundImage = null;
+
+        /// <summary>
+        /// Gets or sets the color of the tab panel background colors.
+        /// </summary>
+        public LinearGradientColorTable TabPanelBackground = new LinearGradientColorTable();
+
+        /// <summary>
+        /// Gets or sets the color of tab panel border.
+        /// </summary>
+        public Color TabPanelBorder = Color.Empty;
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/Office2007TabItemStateColorTable.cs b/PROMS/DotNetBar Source Code/Rendering/Office2007TabItemStateColorTable.cs
new file mode 100644
index 00000000..a7831f0b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/Office2007TabItemStateColorTable.cs	
@@ -0,0 +1,37 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    /// <summary>
+    /// Represents the color table for the tab item.
+    /// </summary>
+    public class Office2007TabItemStateColorTable
+    {
+        /// <summary>
+        /// Gets or sets top part background colors.
+        /// </summary>
+        public LinearGradientColorTable TopBackground = new LinearGradientColorTable();
+
+        /// <summary>
+        /// Gets or sets the bottom part background colors.
+        /// </summary>
+        public LinearGradientColorTable BottomBackground = new LinearGradientColorTable();
+
+        /// <summary>
+        /// Gets or sets the outer border colors.
+        /// </summary>
+        public Color OuterBorder = Color.Empty;
+
+        /// <summary>
+        /// Gets or sets the inner border colors.
+        /// </summary>
+        public Color InnerBorder = Color.Empty;
+
+        /// <summary>
+        /// Gets or sets the text colors.
+        /// </summary>
+        public Color Text = Color.Empty;
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/Office2007VistaBlackColorTableFactory.cs b/PROMS/DotNetBar Source Code/Rendering/Office2007VistaBlackColorTableFactory.cs
new file mode 100644
index 00000000..9912b922
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/Office2007VistaBlackColorTableFactory.cs	
@@ -0,0 +1,2581 @@
+using System;
+using System.Text;
+using System.Drawing;
+using DevComponents.DotNetBar.Schedule;
+using DevComponents.DotNetBar.Controls;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    public class Office2007VistaBlackColorTableFactory
+    {
+        #region Luna Blue
+
+        #region ButtonItem Colors Initialization
+        public static void SetBlueExpandColors(Office2007ButtonItemColorTable ct, ColorFactory factory)
+        {
+            Color cb = factory.GetColor(0x567DB1);
+            Color cl = factory.GetColor(0xEAF2F9);
+            ct.Default.ExpandBackground = cb;
+            ct.Default.ExpandLight = cl;
+
+            ct.Checked.ExpandBackground = cb;
+            ct.Checked.ExpandLight = cl;
+
+            //ct.Disabled.ExpandBackground = factory.GetColor(0xB7B7B7);
+            //ct.Disabled.ExpandLight = factory.GetColor(0xEDEDED);
+
+            ct.Expanded.ExpandBackground = cb;
+            ct.Expanded.ExpandLight = cl;
+
+            ct.MouseOver.ExpandBackground = cb;
+            ct.MouseOver.ExpandLight = cl;
+
+            ct.Pressed.ExpandBackground = cb;
+            ct.Pressed.ExpandLight = cl;
+        }
+
+        public static void SetBlackExpandColors(Office2007ButtonItemColorTable ct, ColorFactory factory)
+        {
+            Color cb = factory.GetColor(0x464646);
+            Color cl = factory.GetColor(0xDBDBDC);
+            ct.Default.ExpandBackground = cb;
+            ct.Default.ExpandLight = cl;
+
+            ct.Checked.ExpandBackground = cb;
+            ct.Checked.ExpandLight = cl;
+
+            //ct.Disabled.ExpandBackground = factory.GetColor(0xB7B7B7);
+            //ct.Disabled.ExpandLight = factory.GetColor(0xEDEDED);
+
+            ct.Expanded.ExpandBackground = cb;
+            ct.Expanded.ExpandLight = cl;
+
+            ct.MouseOver.ExpandBackground = cb;
+            ct.MouseOver.ExpandLight = cl;
+
+            ct.Pressed.ExpandBackground = cb;
+            ct.Pressed.ExpandLight = cl;
+        }
+        
+
+        public static Office2007ButtonItemColorTable GetButtonItemOffice2007WithBackground(ColorFactory factory)
+        {
+            Office2007ButtonItemColorTable cb = new Office2007ButtonItemColorTable();
+            cb.Default = new Office2007ButtonItemStateColorTable();
+
+            cb.Default.TopBackground = new LinearGradientColorTable(factory.GetColor(0xCBF0FB), factory.GetColor(0x6FBBE5));
+            cb.Default.TopBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.BottomBackground = new LinearGradientColorTable(factory.GetColor(0x66B5DF), factory.GetColor(0xA2EDF6));
+            cb.Default.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xB1FCFF), Color.Empty);
+            cb.Default.InnerBorder = new LinearGradientColorTable(Color.White, Color.Empty);
+            cb.Default.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x799DB6), Color.Empty);
+            cb.Default.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+
+            // Same as default
+            cb.Disabled = new Office2007ButtonItemStateColorTable();
+            cb.Disabled.TopBackground = new LinearGradientColorTable(factory.GetColor(Color.WhiteSmoke), factory.GetColor(Color.LightGray));
+            cb.Disabled.TopBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.BottomBackground = new LinearGradientColorTable(factory.GetColor(Color.Silver), factory.GetColor(0xEBF3FD));
+            cb.Disabled.BottomBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.InnerBorder = new LinearGradientColorTable(Color.WhiteSmoke, Color.Empty);
+            cb.Disabled.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x799DB6), Color.Empty);
+            cb.Disabled.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.Text = factory.GetColor(0x8D8D8D);
+
+            cb.MouseOver = new Office2007ButtonItemStateColorTable();
+            cb.MouseOver.TopBackground = new LinearGradientColorTable(factory.GetColor(0xFCF9E2), factory.GetColor(0xFBEDBF));
+            cb.MouseOver.TopBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.MouseOver.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xFAD84A), factory.GetColor(0xFCE595));
+            cb.MouseOver.BottomBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.MouseOver.InnerBorder = new LinearGradientColorTable(Color.White, Color.Empty);
+            cb.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xBFA779), Color.Empty);
+            cb.MouseOver.SplitBorder = new LinearGradientColorTable(factory.GetColor(0xBFA779), Color.Empty);
+            cb.MouseOver.SplitBorderLight = new LinearGradientColorTable(Color.FromArgb(64, Color.White), Color.Empty);
+
+            cb.Pressed = new Office2007ButtonItemStateColorTable();
+            cb.Pressed.TopBackground = new LinearGradientColorTable(factory.GetColor(0xF8BA78), factory.GetColor(0xFCB24E));
+            cb.Pressed.TopBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Pressed.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xFC9C0F), factory.GetColor(0xFCBA37));
+            cb.Pressed.BottomBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Pressed.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xF1A74A), Color.Empty);
+            cb.Pressed.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x937D5A), Color.Empty);
+            cb.Pressed.SplitBorder = new LinearGradientColorTable(factory.GetColor(0x937D5A), Color.Empty);
+            cb.Pressed.SplitBorderLight = new LinearGradientColorTable(Color.FromArgb(64, Color.White), Color.Empty);
+
+            cb.Checked = new Office2007ButtonItemStateColorTable();
+            cb.Checked.TopBackground = new LinearGradientColorTable(factory.GetColor(0xFCF9E2), factory.GetColor(0xFBEDBF));
+            cb.Checked.TopBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Checked.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xFAD84A), factory.GetColor(0xFCE595));
+            cb.Checked.BottomBackgroundHighlight = new LinearGradientColorTable(Color.White, Color.Empty);
+            cb.Checked.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xF1A74A), Color.Empty);
+            cb.Checked.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x937D5A), Color.Empty);
+            cb.Checked.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Checked.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+
+            cb.Expanded = new Office2007ButtonItemStateColorTable();
+            cb.Expanded.TopBackground = new LinearGradientColorTable(factory.GetColor(0xFCBA37), factory.GetColor(0xFC9C0F));
+            cb.Expanded.TopBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Expanded.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xFCB24E), factory.GetColor(0xF8BA78));
+            cb.Expanded.BottomBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Expanded.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xF1A74A), Color.Empty);
+            cb.Expanded.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x937D5A), Color.Empty);
+            cb.Expanded.SplitBorder = new LinearGradientColorTable(factory.GetColor(0x937D5A), Color.Empty);
+            cb.Expanded.SplitBorderLight = new LinearGradientColorTable(Color.FromArgb(64, Color.White), Color.Empty);
+            return cb;
+        }
+        #endregion
+
+        #region RibbonBar Initialization
+        public static Office2007RibbonBarStateColorTable GetRibbonBarBlue(ColorFactory factory)
+        {
+            Office2007RibbonBarStateColorTable rb = new Office2007RibbonBarStateColorTable();
+            rb.TopBackgroundHeight = 15;
+            rb.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xC5D2DF), factory.GetColor(0x9EBFDB));
+            rb.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xE7EEF7), factory.GetColor(0xF1F7FD));
+            rb.TopBackground = new LinearGradientColorTable(factory.GetColor(0xDEE8F5), factory.GetColor(0xD1DFF0));
+            rb.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xC7D8ED), factory.GetColor(0xD8E8F5));
+            rb.TitleBackground = new LinearGradientColorTable(factory.GetColor(0xC2D8F1), factory.GetColor(0xC0D8EF));
+            rb.TitleText = factory.GetColor(0x3E6AAA);
+            return rb;
+        }
+
+        public static Office2007RibbonBarStateColorTable GetRibbonBarBlueMouseOver(ColorFactory factory)
+        {
+            Office2007RibbonBarStateColorTable rb = new Office2007RibbonBarStateColorTable();
+            rb.TopBackgroundHeight = 15;
+            rb.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xADC7DE), factory.GetColor(0x7EADD3));
+            rb.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFFFFFF), factory.GetColor(0xFFFFFF));
+            rb.TopBackground = new LinearGradientColorTable(factory.GetColor(0xE4EFFD), factory.GetColor(0xE8F0FC));
+            rb.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xDCEAFB), factory.GetColor(0xDCE8F8));
+            rb.TitleBackground = new LinearGradientColorTable(factory.GetColor(0xC8E0FF), factory.GetColor(0xD6EDFF));
+            rb.TitleText = factory.GetColor(0x3E6AB9);
+
+            return rb;
+        }
+
+        public static Office2007RibbonBarStateColorTable GetRibbonBarBlueExpanded(ColorFactory factory)
+        {
+            Office2007RibbonBarStateColorTable rb = new Office2007RibbonBarStateColorTable();
+            rb.TopBackgroundHeight = 15;
+            rb.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x869BAE), factory.GetColor(0xB1C7D9));
+            rb.InnerBorder = new LinearGradientColorTable(Color.FromArgb(32, Color.White), Color.Transparent);
+            rb.TopBackground = new LinearGradientColorTable(factory.GetColor(0xADC1DC), factory.GetColor(0x88A7D0));
+            rb.BottomBackground = new LinearGradientColorTable(factory.GetColor(0x7699C8), factory.GetColor(0xB4D5FD));
+            rb.TitleBackground = new LinearGradientColorTable(factory.GetColor(0xC3D9F2), Color.Empty);
+            rb.TitleText = Color.Empty;
+            return rb;
+        }
+        #endregion
+
+        #region RibbonTabItem
+        public static Office2007RibbonTabItemColorTable GetRibbonTabItemBlueDefault(ColorFactory factory)
+        {
+            Office2007RibbonTabItemColorTable rt = new Office2007RibbonTabItemColorTable();
+            rt.Default.Text = factory.GetColor(0x15428B);
+
+            // Selected Tab
+            rt.Selected = new Office2007RibbonTabItemStateColorTable();
+            rt.Selected.Background = new LinearGradientColorTable(factory.GetColor(0xF0F6FE), factory.GetColor(0xDBE6F5));
+            rt.Selected.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(64, Color.White), Color.Transparent);
+            rt.Selected.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xF8FBFF), factory.GetColor(0xBFFAFF));
+            rt.Selected.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x97B9E6), factory.GetColor(0x8DB2E3));
+            rt.Selected.Text = factory.GetColor(0x15428B);
+
+            // Selected Tab Mouse Over
+            rt.SelectedMouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.SelectedMouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xEBF3FE), factory.GetColor(0xE1EAF6));
+            rt.SelectedMouseOver.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(32, Color.White), Color.Transparent);
+            rt.SelectedMouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFAEDC6), factory.GetColor(0xFFFFBD));
+            rt.SelectedMouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xD7BC8A), factory.GetColor(0xFED15E));
+            rt.SelectedMouseOver.Text = factory.GetColor(0x15428B);
+
+            // Tab Mouse Over
+            rt.MouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.MouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xCDDAE0), factory.GetColor(0xE4D097));
+            rt.MouseOver.BackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xC4DEFF), Color.Transparent);
+            rt.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xDFEDFF), factory.GetColor(0xC7DFFF));
+            rt.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x98BBE9), factory.GetColor(0x98BBE9));
+            rt.MouseOver.Text = factory.GetColor(0x15428B);
+
+            return rt;
+        }
+
+        public static Office2007RibbonTabItemColorTable GetRibbonTabItemBlueMagenta(ColorFactory factory)
+        {
+            Office2007RibbonTabItemColorTable rt = new Office2007RibbonTabItemColorTable();
+            rt.Default.Text = factory.GetColor(0x15428B);
+            // Selected Tab
+            rt.Selected = new Office2007RibbonTabItemStateColorTable();
+            rt.Selected.Background = new LinearGradientColorTable(factory.GetColor(0xD4C8E2), factory.GetColor(0xECE7F2));
+            rt.Selected.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(64, Color.White), Color.Transparent);
+            rt.Selected.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xECE7F3), factory.GetColor(0xCDC2DF));
+            rt.Selected.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xBEBAC1), factory.GetColor(0xC0BFC1));
+            rt.Selected.Text = factory.GetColor(0x15428B);
+
+            // Selected Tab Mouse Over
+            rt.SelectedMouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.SelectedMouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xD4C8E2), factory.GetColor(0xECE7F2));
+            rt.SelectedMouseOver.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(32, Color.White), Color.Transparent);
+            rt.SelectedMouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xECE7F3), factory.GetColor(0xCDC2DF));
+            rt.SelectedMouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xBEBAC1), factory.GetColor(0xC0BFC1));
+            rt.SelectedMouseOver.Text = factory.GetColor(0x15428B);
+
+            // Tab Mouse Over
+            rt.MouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.MouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xC4D5F8), factory.GetColor(0xC2BCE8));
+            rt.MouseOver.BackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xDEECFF), Color.Transparent);
+            rt.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xE0EEFF), factory.GetColor(0xC7DFFF));
+            rt.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xC1C8D1), factory.GetColor(0xC0C7D0));
+            rt.MouseOver.Text = factory.GetColor(0x15428B);
+
+            return rt;
+        }
+
+        public static Office2007RibbonTabItemColorTable GetRibbonTabItemBlueGreen(ColorFactory factory)
+        {
+            Office2007RibbonTabItemColorTable rt = new Office2007RibbonTabItemColorTable();
+            rt.Default.Text = factory.GetColor(0x15428B);
+
+            // Selected Tab
+            rt.Selected = new Office2007RibbonTabItemStateColorTable();
+            rt.Selected.Background = new LinearGradientColorTable(factory.GetColor(0xE4F3E0), factory.GetColor(0xE4F2DF));
+            rt.Selected.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(64, Color.White), Color.Transparent);
+            rt.Selected.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xD5EAD3), factory.GetColor(0xB8DEB1));
+            rt.Selected.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xB9C1B7), factory.GetColor(0xBFC1BE));
+            rt.Selected.Text = factory.GetColor(0x15428B);
+
+            // Selected Tab Mouse Over
+            rt.SelectedMouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.SelectedMouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xE4F3E0), factory.GetColor(0xE4F2DF));
+            rt.SelectedMouseOver.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(32, Color.White), Color.Transparent);
+            rt.SelectedMouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xD5EAD3), factory.GetColor(0xB8DEB1));
+            rt.SelectedMouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xB9C1B7), factory.GetColor(0xBFC1BE));
+            rt.SelectedMouseOver.Text = factory.GetColor(0x15428B);
+
+            // Tab Mouse Over
+            rt.MouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.MouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xB3DEE3), factory.GetColor(0x8ADE9F));
+            rt.MouseOver.BackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xDEECFF), Color.Transparent);
+            rt.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xE2EFFF), factory.GetColor(0xC7DFFF));
+            rt.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xC1C8D1), factory.GetColor(0xC0C7D0));
+            rt.MouseOver.Text = factory.GetColor(0x15428B);
+
+            return rt;
+        }
+
+        public static Office2007RibbonTabItemColorTable GetRibbonTabItemBlueOrange(ColorFactory factory)
+        {
+            Office2007RibbonTabItemColorTable rt = new Office2007RibbonTabItemColorTable();
+            rt.Default.Text = factory.GetColor(0x15428B);
+
+            // Selected Tab
+            rt.Selected = new Office2007RibbonTabItemStateColorTable();
+            rt.Selected.Background = new LinearGradientColorTable(factory.GetColor(0xFFF59F), factory.GetColor(0xFFFAD5));
+            rt.Selected.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(64, Color.White), Color.Transparent);
+            rt.Selected.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFFFBD6), factory.GetColor(0xFDF28C));
+            rt.Selected.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xCAC7AC), factory.GetColor(0xC2C2C2));
+            rt.Selected.Text = factory.GetColor(0x15428B);
+
+            // Selected Tab Mouse Over
+            rt.SelectedMouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.SelectedMouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xFFF59F), factory.GetColor(0xFFFAD5));
+            rt.SelectedMouseOver.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(32, Color.White), Color.Transparent);
+            rt.SelectedMouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFFFBD6), factory.GetColor(0xFDF28C));
+            rt.SelectedMouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xCAC7AC), factory.GetColor(0xC2C2C2));
+            rt.SelectedMouseOver.Text = factory.GetColor(0x15428B);
+
+            // Tab Mouse Over
+            rt.MouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.MouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xCFE0E1), factory.GetColor(0xE9E799));
+            rt.MouseOver.BackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xCBE2FF), Color.Transparent);
+            rt.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xE2EFFF), factory.GetColor(0xC7DFFF));
+            rt.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xC1C8D1), factory.GetColor(0xC0C7D0));
+            rt.MouseOver.Text = factory.GetColor(0x15428B);
+
+            return rt;
+        }
+        #endregion
+
+        #region RibbonTabItemGroup
+        public static Office2007RibbonTabGroupColorTable GetRibbonTabGroupBlueDefault(ColorFactory factory)
+        {
+            Office2007RibbonTabGroupColorTable tg = new Office2007RibbonTabGroupColorTable();
+            tg.Background = new LinearGradientColorTable(Color.Transparent /*factory.GetColor(0xCADBF3)*/, factory.GetColor(0xCDBFD7));
+            tg.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(64, factory.GetColor(0xD068C9)), Color.Transparent);
+            tg.Text = factory.GetColor(0x15428B);
+            tg.Border = new LinearGradientColorTable(Color.FromArgb(16, Color.DarkGray), Color.FromArgb(192, Color.DarkGray));
+
+            return tg;
+        }
+
+        public static Office2007RibbonTabGroupColorTable GetRibbonTabGroupBlueMagenta(ColorFactory factory)
+        {
+            return GetRibbonTabGroupBlueDefault(factory);
+        }
+
+        public static Office2007RibbonTabGroupColorTable GetRibbonTabGroupBlueGreen(ColorFactory factory)
+        {
+            Office2007RibbonTabGroupColorTable tg = new Office2007RibbonTabGroupColorTable();
+
+            tg.Background = new LinearGradientColorTable(Color.Transparent /*factory.GetColor(0xC8DDF2)*/, factory.GetColor(0xA6E28E));
+            tg.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(64, factory.GetColor(0x6BB954)), Color.Transparent);
+            tg.Border = new LinearGradientColorTable(Color.FromArgb(16, Color.DarkGray), Color.FromArgb(192, Color.DarkGray));
+            tg.Text = factory.GetColor(0x15428B);
+
+            return tg;
+        }
+
+        public static Office2007RibbonTabGroupColorTable GetRibbonTabGroupBlueOrange(ColorFactory factory)
+        {
+            Office2007RibbonTabGroupColorTable tg = new Office2007RibbonTabGroupColorTable();
+
+            tg.Background = new LinearGradientColorTable(Color.Transparent /*factory.GetColor(0xCDDFF1)*/, factory.GetColor(0xECEFA9));
+            tg.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(64, factory.GetColor(0xFFE619)), Color.Transparent);
+            tg.Border = new LinearGradientColorTable(Color.FromArgb(16, Color.DarkGray), Color.FromArgb(192, Color.DarkGray));
+            tg.Text = factory.GetColor(0x15428B);
+
+            return tg;
+        }
+        #endregion
+
+        #endregion
+
+        #region Vista Black
+
+        #region RibbonBar
+        public static Office2007RibbonBarStateColorTable GetRibbonBarBlack(ColorFactory factory)
+        {
+            Office2007RibbonBarStateColorTable rb = new Office2007RibbonBarStateColorTable();
+            rb.TopBackgroundHeight = 15;
+            //rb.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x000000), factory.GetColor(0x000000));
+            //rb.InnerBorder = new LinearGradientColorTable(factory.GetColor(0x757D95), factory.GetColor(0x757D95));
+            rb.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x5C6672), factory.GetColor(0x5C6672));
+            rb.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xD6E5F8), factory.GetColor(0xD6E5F8));
+            //rb.TopBackground = new LinearGradientColorTable(factory.GetColor(0x626C88), factory.GetColor(0x3F4756));
+            //rb.BottomBackground = new LinearGradientColorTable(factory.GetColor(0x151516), factory.GetColor(0x3C476F));
+            rb.TopBackground = new LinearGradientColorTable(factory.GetColor(0xEDF6FF), factory.GetColor(0xBDD3EB));
+            rb.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xA0B7D2), factory.GetColor(0xF0F0F0));
+            
+            //rb.TitleBackground = new LinearGradientColorTable(factory.GetColor(0x0D1D5A), factory.GetColor(0x000000));
+            //rb.TitleText = factory.GetColor(0xFFFFFF);
+            rb.TitleBackground = new LinearGradientColorTable(factory.GetColor(0x8290A0), factory.GetColor(0x616C76));
+            rb.TitleText = factory.GetColor(0xFFFFFF);
+            return rb;
+        }
+
+        public static Office2007RibbonBarStateColorTable GetRibbonBarBlackMouseOver(ColorFactory factory)
+        {
+            Office2007RibbonBarStateColorTable rb = new Office2007RibbonBarStateColorTable();
+            rb.TopBackgroundHeight = 15;
+            //rb.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x000000), factory.GetColor(0x000000));
+            //rb.InnerBorder = new LinearGradientColorTable(factory.GetColor(0x757D95), factory.GetColor(0x757D95));
+            //rb.TopBackground = new LinearGradientColorTable(factory.GetColor(0x8E9EC6), factory.GetColor(0x6B7A93));
+            //rb.BottomBackground = new LinearGradientColorTable(factory.GetColor(0x222325), factory.GetColor(0x526092));
+            //rb.TitleBackground = new LinearGradientColorTable(factory.GetColor(0x132B86), factory.GetColor(0x030612));
+            //rb.TitleText = factory.GetColor(0xFFFFFF);
+            rb.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x5C6672), factory.GetColor(0x5C6672));
+            rb.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xD6E5F8), factory.GetColor(0xD6E5F8));
+            rb.TopBackground = new LinearGradientColorTable(factory.GetColor(0xEDF6FF), factory.GetColor(0xCBE3FC));
+            rb.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xB5D1EE), factory.GetColor(0xF0F0F0));
+            rb.TitleBackground = new LinearGradientColorTable(factory.GetColor(0x9BACC0), factory.GetColor(0x616C76));
+            rb.TitleText = factory.GetColor(0xFFFFFF);
+
+            return rb;
+        }
+
+        public static Office2007RibbonBarStateColorTable GetRibbonBarBlackExpanded(ColorFactory factory)
+        {
+            Office2007RibbonBarStateColorTable rb = new Office2007RibbonBarStateColorTable();
+            rb.TopBackgroundHeight = 15;
+            rb.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x5C6672), factory.GetColor(0x5C6672));
+            rb.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xD6E5F8), factory.GetColor(0xD6E5F8));
+            rb.TopBackground = new LinearGradientColorTable(factory.GetColor(0xEDF6FF), factory.GetColor(0xCBE3FC));
+            rb.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xB5D1EE), factory.GetColor(0xF0F0F0));
+            rb.TitleBackground = new LinearGradientColorTable(factory.GetColor(0x9BACC0), factory.GetColor(0x616C76));
+            rb.TitleText = Color.Empty;
+
+            return rb;
+        }
+        #endregion
+
+        #region RibbonTabItem
+        public static Office2007RibbonTabItemColorTable GetRibbonTabItemBlackDefault(ColorFactory factory)
+        {
+            Office2007RibbonTabItemColorTable rt = new Office2007RibbonTabItemColorTable();
+            rt.Default.Text = factory.GetColor(0xFFFFFF);
+
+            // Selected Tab
+            rt.Selected = new Office2007RibbonTabItemStateColorTable();
+            rt.Selected.Background = new LinearGradientColorTable(factory.GetColor(0x799EE1), factory.GetColor(0x1E449F));
+            rt.Selected.BackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0x57C6EF), Color.Transparent);
+            rt.Selected.InnerBorder = new LinearGradientColorTable(factory.GetColor(0x84A9EB), factory.GetColor(0x1C667C));
+            rt.Selected.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x000000), factory.GetColor(0x000000));
+            rt.Selected.Text = factory.GetColor(0xFFFFFF);
+
+            // Selected Tab Mouse Over
+            rt.SelectedMouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.SelectedMouseOver.Background = new LinearGradientColorTable(factory.GetColor(0x5B93FF), factory.GetColor(0x0E3DC7));
+            rt.SelectedMouseOver.BackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0x6FD4FF), Color.Transparent);
+            rt.SelectedMouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0x84A9EB), factory.GetColor(0x2992AA));
+            rt.SelectedMouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x000000), factory.GetColor(0x000000));
+            rt.SelectedMouseOver.Text = factory.GetColor(0xFFFFFF);
+
+            // Tab Mouse Over
+            rt.MouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.MouseOver.Background = new LinearGradientColorTable(factory.GetColor(0x9098AA), factory.GetColor(0x3F588D));
+            rt.MouseOver.BackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0x3C81CE), Color.Transparent);
+            rt.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xBFC4CE), factory.GetColor(0x566794));
+            rt.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x000000), factory.GetColor(0x000000));
+            rt.MouseOver.Text = factory.GetColor(0xFFFFFF);
+
+            return rt;
+        }
+
+        public static Office2007RibbonTabItemColorTable GetRibbonTabItemBlackMagenta(ColorFactory factory)
+        {
+            Office2007RibbonTabItemColorTable rt = new Office2007RibbonTabItemColorTable();
+            rt.Default.Text = factory.GetColor(0xFFFFFF);
+            // Selected Tab
+            rt.Selected = new Office2007RibbonTabItemStateColorTable();
+            rt.Selected.Background = new LinearGradientColorTable(factory.GetColor(0xD4C8E2), factory.GetColor(0xEBE5F2));
+            rt.Selected.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(64, Color.White), Color.Transparent);
+            rt.Selected.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xE1D9EB), factory.GetColor(0xCDC2DF));
+            rt.Selected.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xBCB9C1), factory.GetColor(0xC2C2C2));
+            rt.Selected.Text = factory.GetColor(0x000000);
+
+            // Selected Tab Mouse Over
+            rt.SelectedMouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.SelectedMouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xD4C8E2), factory.GetColor(0xEBE5F2));
+            rt.SelectedMouseOver.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(64, Color.White), Color.Transparent);
+            rt.SelectedMouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xC6B6D9), factory.GetColor(0xCDC2DF));
+            rt.SelectedMouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xBCB9C1), factory.GetColor(0xC2C2C2));
+            rt.SelectedMouseOver.Text = factory.GetColor(0x000000);
+
+            // Tab Mouse Over
+            rt.MouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.MouseOver.Background = new LinearGradientColorTable(factory.GetColor(0x8B8D91), factory.GetColor(0x7F7495));
+            rt.MouseOver.BackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0x89769D), Color.Transparent);
+            rt.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0x8A8B8F), factory.GetColor(0x7F7495));
+            rt.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x99989A), factory.GetColor(0xA09EA2));
+            rt.MouseOver.Text = factory.GetColor(0xFFFFFF);
+            return rt;
+        }
+
+        public static Office2007RibbonTabItemColorTable GetRibbonTabItemBlackGreen(ColorFactory factory)
+        {
+            Office2007RibbonTabItemColorTable rt = new Office2007RibbonTabItemColorTable();
+            rt.Default.Text = factory.GetColor(0xFFFFFF);
+
+            // Selected Tab
+            rt.Selected = new Office2007RibbonTabItemStateColorTable();
+            rt.Selected.Background = new LinearGradientColorTable(factory.GetColor(0xC1E2B8), factory.GetColor(0xE3F1DD));
+            rt.Selected.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(64, Color.White), Color.Transparent);
+            rt.Selected.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xE4F3E0), factory.GetColor(0xB8DEB1));
+            rt.Selected.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xB0C0AC), factory.GetColor(0xC2C2C2));
+            rt.Selected.Text = factory.GetColor(0x000000);
+
+            // Selected Tab Mouse Over
+            rt.SelectedMouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xC1E2B8), factory.GetColor(0xE3F1DD));
+            rt.SelectedMouseOver.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(64, Color.White), Color.Transparent);
+            rt.SelectedMouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xA4D496), factory.GetColor(0xB8DEB1));
+            rt.SelectedMouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xB0C0AC), factory.GetColor(0xC2C2C2));
+            rt.SelectedMouseOver.Text = factory.GetColor(0x000000);
+
+            // Tab Mouse Over
+            rt.MouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.MouseOver.Background = new LinearGradientColorTable(factory.GetColor(0x899087), factory.GetColor(0x659258));
+            rt.MouseOver.BackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0x6C9D5C), Color.Transparent);
+            rt.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0x878C86), factory.GetColor(0x659257));
+            rt.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x979997), factory.GetColor(0x9DA39B));
+            rt.MouseOver.Text = factory.GetColor(0xFFFFFF);
+            return rt;
+        }
+
+        public static Office2007RibbonTabItemColorTable GetRibbonTabItemBlackOrange(ColorFactory factory)
+        {
+            Office2007RibbonTabItemColorTable rt = new Office2007RibbonTabItemColorTable();
+            rt.Default.Text = factory.GetColor(0xFFFFFF);
+
+            // Selected Tab
+            rt.Selected = new Office2007RibbonTabItemStateColorTable();
+            rt.Selected.Background = new LinearGradientColorTable(factory.GetColor(0xFFF59F), factory.GetColor(0xFFFAD5));
+            rt.Selected.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(64, Color.White), Color.Transparent);
+            rt.Selected.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFFFBD6), factory.GetColor(0xFCF395));
+            rt.Selected.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xCAC7AB), factory.GetColor(0xC2C2C2));
+            rt.Selected.Text = factory.GetColor(0x000000);
+
+            // Selected Tab Mouse Over
+            rt.SelectedMouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.SelectedMouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xFFF59F), factory.GetColor(0xFFFAD5));
+            rt.SelectedMouseOver.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(64, Color.White), Color.Transparent);
+            rt.SelectedMouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFFF071), factory.GetColor(0xFCF395));
+            rt.SelectedMouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xCAC7AB), factory.GetColor(0xC2C2C2));
+            rt.SelectedMouseOver.Text = factory.GetColor(0x000000);
+
+            // Tab Mouse Over
+            rt.MouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.MouseOver.Background = new LinearGradientColorTable(factory.GetColor(0x929083), factory.GetColor(0xB6A933));
+            rt.MouseOver.BackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xC2B531), Color.Transparent);
+            rt.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0x8F8D83), factory.GetColor(0xB1A433));
+            rt.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x9C9B96), factory.GetColor(0xBEBEBE));
+            rt.MouseOver.Text = factory.GetColor(0xFFFFFF);
+
+            return rt;
+        }
+        #endregion
+
+        #region ButtonItem
+        public static Office2007ButtonItemColorTable GetMenuItemBlue(bool p, ColorFactory factory)
+        {
+            Office2007ButtonItemColorTable cb = new Office2007ButtonItemColorTable();
+            cb.Default = new Office2007ButtonItemStateColorTable();
+            
+            cb.Default.Text = factory.GetColor(0x000000);
+
+            // Button mouse over
+            cb.MouseOver = new Office2007ButtonItemStateColorTable();
+            cb.MouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xE5F3FA), factory.GetColor(0xD0ECFC), 90);
+            cb.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xB3E4F9));
+            cb.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xF0F7FB), factory.GetColor(0xE3F3FC));
+            cb.MouseOver.SplitBorder = new LinearGradientColorTable(factory.GetColor(0xBEBEBE));
+            cb.MouseOver.SplitBorderLight = new LinearGradientColorTable(factory.GetColor(0xDBFDF9));
+            cb.MouseOver.Text = factory.GetColor(0x000000);
+
+            // Pressed
+            cb.Pressed = new Office2007ButtonItemStateColorTable();
+            cb.Pressed.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x2C628B));
+            cb.Pressed.InnerBorder = new LinearGradientColorTable(factory.GetColor(0x9EB0BA), Color.Transparent);
+            cb.Pressed.TopBackground = new LinearGradientColorTable(factory.GetColor(0xE5F4FC), factory.GetColor(0xC4E5F6));
+            cb.Pressed.TopBackgroundHighlight = new LinearGradientColorTable();
+            cb.Pressed.BottomBackground = new LinearGradientColorTable(factory.GetColor(0x98D1EF), factory.GetColor(0x68B3DB));
+            cb.Pressed.BottomBackgroundHighlight = new LinearGradientColorTable();
+            cb.Pressed.SplitBorder = new LinearGradientColorTable(factory.GetColor(0xBEBEBE));
+            cb.Pressed.SplitBorderLight = new LinearGradientColorTable(factory.GetColor(0xDBFDF9));
+            cb.Pressed.Text = factory.GetColor(0x000000);
+
+            // Checked
+            cb.Checked = new Office2007ButtonItemStateColorTable();
+            cb.Checked.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x3C7FB1));
+            cb.Checked.InnerBorder = new LinearGradientColorTable(Color.FromArgb(96, Color.White));
+            cb.Checked.TopBackground = new LinearGradientColorTable(factory.GetColor(0xEBF5FB), factory.GetColor(0xE5F2FA));
+            cb.Checked.TopBackgroundHighlight = new LinearGradientColorTable();
+            cb.Checked.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xCBE6F5), factory.GetColor(0xB9DCF0));
+            cb.Checked.BottomBackgroundHighlight = new LinearGradientColorTable();
+            cb.Checked.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Checked.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Checked.Text = factory.GetColor(0x000000);
+
+            // Expanded button
+            cb.Expanded = new Office2007ButtonItemStateColorTable();
+            cb.Expanded.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x3C7FB1));
+            cb.Expanded.InnerBorder = new LinearGradientColorTable(Color.FromArgb(96, Color.White));
+            cb.Expanded.TopBackground = new LinearGradientColorTable(factory.GetColor(0xEBF5FB), factory.GetColor(0xE5F2FA));
+            cb.Expanded.TopBackgroundHighlight = new LinearGradientColorTable();
+            cb.Expanded.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xCBE6F5), factory.GetColor(0xB9DCF0));
+            cb.Expanded.BottomBackgroundHighlight = new LinearGradientColorTable();
+            cb.Expanded.SplitBorder = new LinearGradientColorTable(factory.GetColor(0xBEBEBE));
+            cb.Expanded.SplitBorderLight = new LinearGradientColorTable(factory.GetColor(0xDBFDF9));
+            cb.Expanded.Text = factory.GetColor(0x000000);
+
+            SetBlackExpandColors(cb, factory);
+            return cb;
+        }
+
+        public static Office2007ButtonItemColorTable GetButtonItemBlackOrange(bool ribbonBar, ColorFactory factory)
+        {
+            Office2007ButtonItemColorTable cb = new Office2007ButtonItemColorTable();
+            cb.Default = new Office2007ButtonItemStateColorTable();
+            //if(ribbonBar)
+            cb.Default.Text = factory.GetColor(0x000000);  //factory.GetColor(0x464646);
+            //else
+            //    cb.Default.Text = factory.GetColor(0xFFFFFF);
+
+            // Button mouse over
+            //cb.MouseOver = new Office2007ButtonItemStateColorTable();
+            //cb.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x333333), factory.GetColor(0x000000));
+            //cb.MouseOver.InnerBorder = new LinearGradientColorTable(Color.FromArgb(128, Color.White));
+            //cb.MouseOver.TopBackground = new LinearGradientColorTable(factory.GetColor(0xACABA8), factory.GetColor(0x8F7E5D));
+            //cb.MouseOver.TopBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(255, factory.GetColor(0xAA8F5C)), Color.Transparent);
+            //cb.MouseOver.BottomBackground = new LinearGradientColorTable(factory.GetColor(0x1F1200), factory.GetColor(0x623C25));
+            //cb.MouseOver.BottomBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(164, factory.GetColor(0xDFD44E)), Color.Transparent);
+            //cb.MouseOver.SplitBorder = new LinearGradientColorTable(factory.GetColor(0x333333));
+            //cb.MouseOver.SplitBorderLight = new LinearGradientColorTable(factory.GetColor(0x9A9890));
+            //cb.MouseOver.Text = factory.GetColor(0xFFFFFF);
+            cb.MouseOver = new Office2007ButtonItemStateColorTable();
+            cb.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xA5A5A5), factory.GetColor(0x959595));
+            cb.MouseOver.InnerBorder = new LinearGradientColorTable(Color.FromArgb(128, Color.White));
+            cb.MouseOver.TopBackground = new LinearGradientColorTable(factory.GetColor(0xE9F7FE), factory.GetColor(0xDDF2FD));
+            cb.MouseOver.TopBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(255, factory.GetColor(0xDEF3FB)), Color.Transparent);
+            cb.MouseOver.BottomBackground = new LinearGradientColorTable(factory.GetColor(0x95BED5), factory.GetColor(0xB5E4FF));
+            cb.MouseOver.BottomBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(164, factory.GetColor(0xD3FFFF)), Color.Transparent);
+            cb.MouseOver.SplitBorder = new LinearGradientColorTable(factory.GetColor(0xBEBEBE));
+            cb.MouseOver.SplitBorderLight = new LinearGradientColorTable(factory.GetColor(0xDBFDF9));
+            cb.MouseOver.Text = factory.GetColor(0x000000);
+
+            // Pressed
+            cb.Pressed = new Office2007ButtonItemStateColorTable();
+            cb.Pressed.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xA5A5A5), factory.GetColor(0x959595));
+            cb.Pressed.InnerBorder = new LinearGradientColorTable(Color.FromArgb(128, Color.White));
+            cb.Pressed.TopBackground = new LinearGradientColorTable(factory.GetColor(0xE9F7FE), factory.GetColor(0xC5E9FB));
+            cb.Pressed.TopBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(64, Color.White), Color.Transparent);
+            cb.Pressed.BottomBackground = new LinearGradientColorTable(factory.GetColor(0x649EBF), factory.GetColor(0x87D3FF));
+            cb.Pressed.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xD3FFFF), Color.Transparent);
+            cb.Pressed.SplitBorder = new LinearGradientColorTable(factory.GetColor(0xBEBEBE));
+            cb.Pressed.SplitBorderLight = new LinearGradientColorTable(factory.GetColor(0xDBFDF9));
+            cb.Pressed.Text = factory.GetColor(0x000000);
+
+            // Checked
+            //cb.Checked = new Office2007ButtonItemStateColorTable();
+            //cb.Checked.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x5C2C00), factory.GetColor(0x290000));
+            //cb.Checked.InnerBorder = new LinearGradientColorTable(Color.FromArgb(96, Color.White));
+            //cb.Checked.TopBackground = new LinearGradientColorTable(factory.GetColor(0xDBAB6E), factory.GetColor(0xA47437));
+            //cb.Checked.TopBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(32, Color.White), Color.Transparent);
+            //cb.Checked.BottomBackground = new LinearGradientColorTable(factory.GetColor(0x290000), factory.GetColor(0x3B0C00));
+            //cb.Checked.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xFFF59F), Color.Transparent);
+            //cb.Checked.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            //cb.Checked.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            //cb.Checked.Text = factory.GetColor(0xFFFFFF);
+            cb.Checked = new Office2007ButtonItemStateColorTable();
+            cb.Checked.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x8F8E8E), factory.GetColor(0x636363));
+            cb.Checked.InnerBorder = new LinearGradientColorTable(Color.FromArgb(96, Color.White));
+            cb.Checked.TopBackground = new LinearGradientColorTable(factory.GetColor(0xF0F0F0), factory.GetColor(0xC8CAC8));
+            cb.Checked.TopBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(32, Color.White), Color.Transparent);
+            cb.Checked.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xB7B5B5), factory.GetColor(0xBEC1BE));
+            cb.Checked.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xECECEC), Color.Transparent);
+            cb.Checked.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Checked.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Checked.Text = factory.GetColor(0x000000);
+
+            // Expanded button
+            cb.Expanded = new Office2007ButtonItemStateColorTable();
+            cb.Expanded.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xA5A5A5), factory.GetColor(0x636363));
+            cb.Expanded.InnerBorder = new LinearGradientColorTable(Color.FromArgb(96, Color.White));
+            cb.Expanded.TopBackground = new LinearGradientColorTable(factory.GetColor(0xE9F7FE), factory.GetColor(0xDDF2FD));
+            cb.Expanded.TopBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(128, Color.White), Color.Transparent);
+            cb.Expanded.BottomBackground = new LinearGradientColorTable(factory.GetColor(0x95BED5), factory.GetColor(0xB5E4FF));
+            cb.Expanded.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xDFF2FD), Color.Transparent);
+            cb.Expanded.SplitBorder = new LinearGradientColorTable(factory.GetColor(0xBEBEBE));
+            cb.Expanded.SplitBorderLight = new LinearGradientColorTable(factory.GetColor(0xDBFDF9));
+            cb.Expanded.Text = factory.GetColor(0x000000);
+
+            SetBlackExpandColors(cb, factory);
+            return cb;
+        }
+
+        public static Office2007ButtonItemColorTable GetButtonItemBlackOrangeWithBackground(ColorFactory factory)
+        {
+            Office2007ButtonItemColorTable cb = GetButtonItemBlackOrange(false, factory);
+            cb.Default.TopBackground = new LinearGradientColorTable(factory.GetColor(0xFFFFFF), factory.GetColor(0xDBDBDB));
+            cb.Default.TopBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(228, Color.White), Color.Empty);
+            cb.Default.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xDBDBDB), factory.GetColor(0xCDCFD2));
+            cb.Default.BottomBackgroundHighlight = new LinearGradientColorTable(Color.White, Color.Transparent);
+            cb.Default.InnerBorder = new LinearGradientColorTable(Color.FromArgb(128, Color.White));
+            cb.Default.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x7D7D7D), factory.GetColor(0x616161));
+            cb.Default.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+
+            // Copy of the default theme
+            cb.Disabled = new Office2007ButtonItemStateColorTable();
+            cb.Disabled.TopBackground = new LinearGradientColorTable(factory.GetColor(0xCED3DA), factory.GetColor(0xC1C6CF));
+            cb.Disabled.TopBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xB4BBC5), factory.GetColor(0xE5ECEC));
+            cb.Disabled.BottomBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.InnerBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xC5D1DE), Color.Empty);
+            cb.Disabled.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.Text = factory.GetColor(0x8D8D8D);
+            return cb;
+        }
+
+        public static Office2007ButtonItemColorTable GetButtonItemBlackBlue(bool ribbonBar, ColorFactory factory)
+        {
+            Office2007ButtonItemColorTable cb = new Office2007ButtonItemColorTable();
+            cb.Default = new Office2007ButtonItemStateColorTable();
+            //if (ribbonBar)
+            cb.Default.Text = factory.GetColor(0xFFFFFF);  //factory.GetColor(0x15428B);
+            //else
+            //    cb.Default.Text = factory.GetColor(0xFFFFFF);
+
+            // Button mouse over
+            cb.MouseOver = new Office2007ButtonItemStateColorTable();
+            cb.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(Color.FromArgb(128, Color.White)), Color.Empty);
+            cb.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0x000000), factory.GetColor(0x153158));
+            cb.MouseOver.TopBackground = new LinearGradientColorTable(factory.GetColor(0x9398AA), factory.GetColor(0x373E4A));
+            cb.MouseOver.TopBackgroundHighlight = new LinearGradientColorTable();
+            cb.MouseOver.BottomBackground = new LinearGradientColorTable(factory.GetColor(0x111520), factory.GetColor(0x566E91));
+            cb.MouseOver.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0x3C81CE), Color.Transparent);
+            cb.MouseOver.SplitBorder = new LinearGradientColorTable(factory.GetColor(0x000000));
+            cb.MouseOver.SplitBorderLight = new LinearGradientColorTable(factory.GetColor(Color.FromArgb(128, Color.White)));
+            cb.MouseOver.Text = factory.GetColor(0xFFFFFF);
+
+            // Pressed
+            cb.Pressed = new Office2007ButtonItemStateColorTable();
+            cb.Pressed.OuterBorder = new LinearGradientColorTable(factory.GetColor(Color.FromArgb(96, Color.White)), Color.Empty);
+            cb.Pressed.InnerBorder = new LinearGradientColorTable(factory.GetColor(0x000000), factory.GetColor(0x153158));
+            cb.Pressed.TopBackground = new LinearGradientColorTable(factory.GetColor(0x505976), factory.GetColor(0x344560));
+            cb.Pressed.TopBackgroundHighlight = new LinearGradientColorTable();
+            cb.Pressed.BottomBackground = new LinearGradientColorTable(factory.GetColor(0x0F0F14), factory.GetColor(0x192C4C));
+            cb.Pressed.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0x3176D4), Color.Transparent);
+            cb.Pressed.SplitBorder = new LinearGradientColorTable(factory.GetColor(0x000000));
+            cb.Pressed.SplitBorderLight = new LinearGradientColorTable(factory.GetColor(Color.FromArgb(96, Color.White)));
+            cb.Pressed.Text = factory.GetColor(0xFFFFFF);
+
+            // Checked
+            cb.Checked = new Office2007ButtonItemStateColorTable();
+            cb.Checked.OuterBorder = new LinearGradientColorTable(factory.GetColor(Color.FromArgb(64, Color.White)), Color.Empty);
+            cb.Checked.InnerBorder = new LinearGradientColorTable(factory.GetColor(0x000000));
+            cb.Checked.TopBackground = new LinearGradientColorTable(factory.GetColor(0x759BE1), factory.GetColor(0x5B78BF));
+            cb.Checked.TopBackgroundHighlight = new LinearGradientColorTable();
+            cb.Checked.BottomBackground = new LinearGradientColorTable(factory.GetColor(0x173499), factory.GetColor(0x299FD2));
+            cb.Checked.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0x57C6EF), Color.Transparent);
+            cb.Checked.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Checked.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Checked.Text = factory.GetColor(0xFFFFFF);
+
+            // Expanded button
+            cb.Expanded = new Office2007ButtonItemStateColorTable();
+            cb.Expanded.OuterBorder = new LinearGradientColorTable(factory.GetColor(Color.FromArgb(96, Color.White)), Color.Empty);
+            cb.Expanded.InnerBorder = new LinearGradientColorTable(factory.GetColor(0x000000), factory.GetColor(0x162F52));
+            cb.Expanded.TopBackground = new LinearGradientColorTable(factory.GetColor(0x505976), factory.GetColor(0x344B6E));
+            cb.Expanded.TopBackgroundHighlight = new LinearGradientColorTable();
+            cb.Expanded.BottomBackground = new LinearGradientColorTable(factory.GetColor(0x10141D), factory.GetColor(0x1D355C));
+            cb.Expanded.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0x3278D7), Color.Transparent);
+            cb.Expanded.SplitBorder = new LinearGradientColorTable(factory.GetColor(0x000000));
+            cb.Expanded.SplitBorderLight = new LinearGradientColorTable(factory.GetColor(Color.FromArgb(96, Color.White)));
+            cb.Expanded.Text = factory.GetColor(0xFFFFFF);
+
+
+            //// Menu mouse over
+            //cb.MenuMouseOver = new Office2007ButtonItemStateColorTable();
+            //cb.MenuMouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xAAC2E0), factory.GetColor(0x6591CD));
+            //cb.MenuMouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFFFFFB), factory.GetColor(0xE0EEFF));
+            //cb.MenuMouseOver.TopBackground = new LinearGradientColorTable(factory.GetColor(0xECF4FF), factory.GetColor(0xB0D3FF));
+            //cb.MenuMouseOver.TopBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(192, Color.White), Color.Transparent);
+            //cb.MenuMouseOver.BottomBackground = new LinearGradientColorTable(factory.GetColor(0x89BDFF), factory.GetColor(0x2983FF));
+            //cb.MenuMouseOver.BottomBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(164, Color.White), Color.Transparent);
+            //cb.MenuMouseOver.SplitBorder = new LinearGradientColorTable(factory.GetColor(0x7495C2), factory.GetColor(0x90AFD6));
+            //cb.MenuMouseOver.SplitBorderLight = new LinearGradientColorTable(factory.GetColor(0xD6E3F3), factory.GetColor(0x83A5D0));
+            //cb.MenuMouseOver.Text = factory.GetColor(0x15428B);
+            SetBlackExpandColors(cb, factory);
+            return cb;
+        }
+
+        public static Office2007ButtonItemColorTable GetButtonItemBlackBlueWithBackground(ColorFactory factory)
+        {
+            Office2007ButtonItemColorTable cb = GetButtonItemBlackBlue(false, factory);
+            cb.Default.TopBackground = new LinearGradientColorTable(factory.GetColor(0x626C88), factory.GetColor(0x3F4756));
+            cb.Default.TopBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.BottomBackground = new LinearGradientColorTable(factory.GetColor(0x151516), factory.GetColor(0x3C476F));
+            cb.Default.BottomBackgroundHighlight = new LinearGradientColorTable();
+            cb.Default.InnerBorder = new LinearGradientColorTable(factory.GetColor(0x7A8295), factory.GetColor(0x646C89));
+            cb.Default.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x566976), factory.GetColor(0x000000));
+            cb.Default.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.Text = Color.White;
+            //cb.Default.TopBackground = new LinearGradientColorTable(factory.GetColor(0xFFFFFF), factory.GetColor(0xE0E5EB));
+            //cb.Default.TopBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            //cb.Default.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xCBD5DF), factory.GetColor(0xFFFFFF));
+            //cb.Default.BottomBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(128, Color.White), Color.Transparent);
+            //cb.Default.InnerBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            //cb.Default.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x898785), Color.Empty);
+            //cb.Default.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            //cb.Default.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+
+            // Copy of the default theme
+            cb.Disabled = new Office2007ButtonItemStateColorTable();
+            cb.Disabled.TopBackground = new LinearGradientColorTable(factory.GetColor(0x626C88), factory.GetColor(0x3F4756));
+            cb.Disabled.TopBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.BottomBackground = new LinearGradientColorTable(factory.GetColor(0x3F4756));
+            cb.Disabled.BottomBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.InnerBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xC5D1DE), Color.Empty);
+            cb.Disabled.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.Text = factory.GetColor(0xC6C6C6);
+            return cb;
+        }
+
+        public static Office2007ButtonItemColorTable GetButtonItemBlackMagenta(bool ribbonBar, ColorFactory factory)
+        {
+            Office2007ButtonItemColorTable cb = new Office2007ButtonItemColorTable();
+            cb.Default = new Office2007ButtonItemStateColorTable();
+            cb.Default.Text = factory.GetColor(0x000000);
+
+            // Button mouse over
+            cb.MouseOver = new Office2007ButtonItemStateColorTable();
+            cb.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x6B0060), factory.GetColor(0x56014D));
+            cb.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xECE7F3), factory.GetColor(0xE8D6FF));
+            cb.MouseOver.TopBackground = new LinearGradientColorTable(factory.GetColor(0xF2DFEB), factory.GetColor(0xE6C6DB));
+            cb.MouseOver.TopBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(96, Color.White), Color.Transparent);
+            cb.MouseOver.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xEAA8D4), factory.GetColor(0xE181C1));
+            cb.MouseOver.BottomBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(164, Color.White), Color.Transparent);
+            cb.MouseOver.SplitBorder = new LinearGradientColorTable(factory.GetColor(0xA37BD1), factory.GetColor(0x8868AE));
+            cb.MouseOver.SplitBorderLight = new LinearGradientColorTable(factory.GetColor(0xD9C2F3), factory.GetColor(0xBBA6D3));
+            cb.MouseOver.Text = factory.GetColor(0x000000);
+
+            // Pressed
+            cb.Pressed = new Office2007ButtonItemStateColorTable();
+            cb.Pressed.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x6B0060), factory.GetColor(0x56014D));
+            cb.Pressed.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xECE7F3), factory.GetColor(0xE8D6FF));
+            cb.Pressed.TopBackground = new LinearGradientColorTable(factory.GetColor(0xD2B0C6), factory.GetColor(0xCBADC1));
+            cb.Pressed.TopBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(64, Color.White), Color.Transparent);
+            cb.Pressed.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xD27AB5), factory.GetColor(0xC84C9F));
+            cb.Pressed.BottomBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(184, Color.White), Color.Transparent);
+            cb.Pressed.SplitBorder = new LinearGradientColorTable(factory.GetColor(0xA37BD1), factory.GetColor(0x8868AE));
+            cb.Pressed.SplitBorderLight = new LinearGradientColorTable(factory.GetColor(0xD9C2F3), factory.GetColor(0xBBA6D3));
+            cb.Pressed.Text = factory.GetColor(0x000000);
+
+            // Checked
+            cb.Checked = new Office2007ButtonItemStateColorTable();
+            cb.Checked.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x6B0060), factory.GetColor(0x56014D));
+            cb.Checked.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xECE7F3), factory.GetColor(0xE8D6FF));
+            cb.Checked.TopBackground = new LinearGradientColorTable(factory.GetColor(0xE9D7E2), factory.GetColor(0xE2B0D1));
+            cb.Checked.TopBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(164, Color.White), Color.Transparent);
+            cb.Checked.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xCF90BA), factory.GetColor(0xCF73B0));
+            cb.Checked.BottomBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(92, Color.White), Color.Transparent);
+            cb.Checked.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Checked.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Checked.Text = factory.GetColor(0x000000);
+
+            // Expanded button
+            cb.Expanded = new Office2007ButtonItemStateColorTable();
+            cb.Expanded.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x6B0060), factory.GetColor(0x56014D));
+            cb.Expanded.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xECE7F3), factory.GetColor(0xE8D6FF));
+            cb.Expanded.TopBackground = new LinearGradientColorTable(factory.GetColor(0xE9D7E2), factory.GetColor(0xE2B0D1));
+            cb.Expanded.TopBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(192, Color.White), Color.Transparent);
+            cb.Expanded.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xCF90BA), factory.GetColor(0xCF73B0));
+            cb.Expanded.BottomBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(192, Color.White), Color.Transparent);
+            cb.Expanded.SplitBorder = new LinearGradientColorTable(factory.GetColor(0xA37BD1), factory.GetColor(0x8868AE));
+            cb.Expanded.SplitBorderLight = new LinearGradientColorTable(factory.GetColor(0xD9C2F3), factory.GetColor(0xBBA6D3));
+            cb.Expanded.Text = factory.GetColor(0x000000);
+
+
+            //// Menu mouse over
+            //cb.MenuMouseOver = new Office2007ButtonItemStateColorTable();
+            //cb.MenuMouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xDE9ECC), factory.GetColor(0xBD71A8));
+            //cb.MenuMouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xECE7F3), factory.GetColor(0xE8D6FF));
+            //cb.MenuMouseOver.TopBackground = new LinearGradientColorTable(factory.GetColor(0xF3EAFF), factory.GetColor(0xDBBCFF));
+            //cb.MenuMouseOver.TopBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(192, Color.White), Color.Transparent);
+            //cb.MenuMouseOver.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xAF6BFF), factory.GetColor(0xD3AEFF));
+            //cb.MenuMouseOver.BottomBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(164, Color.White), Color.Transparent);
+            //cb.MenuMouseOver.SplitBorder = new LinearGradientColorTable(factory.GetColor(0xA37BD1), factory.GetColor(0x8868AE));
+            //cb.MenuMouseOver.SplitBorderLight = new LinearGradientColorTable(factory.GetColor(0xD9C2F3), factory.GetColor(0xBBA6D3));
+            //cb.MenuMouseOver.Text = factory.GetColor(0x15428B);
+            SetBlackExpandColors(cb, factory);
+
+            return cb;
+        }
+
+        public static Office2007ButtonItemColorTable GetButtonItemBlackMagentaWithBackground(ColorFactory factory)
+        {
+            Office2007ButtonItemColorTable cb = GetButtonItemBlackMagenta(false, factory);
+            cb.Default.TopBackground = new LinearGradientColorTable(factory.GetColor(0xF8F8F9), factory.GetColor(0xDFE2E4));
+            cb.Default.TopBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xC7CBD1), factory.GetColor(0xDBDEE2));
+            cb.Default.BottomBackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(128, Color.White), Color.Transparent);
+            cb.Default.InnerBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x898785), Color.Empty);
+            cb.Default.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+
+            // Copy of the default theme
+            cb.Disabled = new Office2007ButtonItemStateColorTable();
+            cb.Disabled.TopBackground = new LinearGradientColorTable(factory.GetColor(0xCED3DA), factory.GetColor(0xC1C6CF));
+            cb.Disabled.TopBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xB4BBC5), factory.GetColor(0xE5ECEC));
+            cb.Disabled.BottomBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.InnerBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x4B4B4B), Color.Empty);
+            cb.Disabled.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.Text = factory.GetColor(0x8D8D8D);
+            return cb;
+        }
+        #endregion
+
+        #region RibbonTabItemGroup
+        //public static Office2007RibbonTabGroupColorTable GetRibbonTabGroupBlackDefault(ColorFactory factory)
+        //{
+        //    Office2007RibbonTabGroupColorTable tg = new Office2007RibbonTabGroupColorTable();
+        //    tg.Background = new LinearGradientColorTable(Color.Transparent /*factory.GetColor(0x3C3B3C)*/, factory.GetColor(0xA0A0A0));
+        //    tg.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(64, factory.GetColor(0xCDCDCD)), Color.Transparent);
+        //    tg.Text = factory.GetColor(0xFFFFFF);
+        //    tg.Border = new LinearGradientColorTable(Color.FromArgb(16, Color.DarkGray), Color.FromArgb(192, Color.DarkGray));
+
+        //    return tg;
+        //}
+
+        //public static Office2007RibbonTabGroupColorTable GetRibbonTabGroupBlackMagenta(ColorFactory factory)
+        //{
+        //    Office2007RibbonTabGroupColorTable tg = new Office2007RibbonTabGroupColorTable();
+        //    tg.Background = new LinearGradientColorTable(Color.Transparent /*factory.GetColor(0x3C3B3C)*/, factory.GetColor(0x90708F));
+        //    tg.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(64, factory.GetColor(0xAF7DA2)), Color.Transparent);
+        //    tg.Text = factory.GetColor(0xFFFFFF);
+        //    tg.Border = new LinearGradientColorTable(Color.FromArgb(16, Color.DarkGray), Color.FromArgb(192, Color.DarkGray));
+
+        //    return tg;
+        //}
+
+        //public static Office2007RibbonTabGroupColorTable GetRibbonTabGroupBlackGreen(ColorFactory factory)
+        //{
+        //    Office2007RibbonTabGroupColorTable tg = new Office2007RibbonTabGroupColorTable();
+
+        //    tg.Background = new LinearGradientColorTable(Color.Transparent /*factory.GetColor(0x3A3D3B)*/, factory.GetColor(0x6E9F5D));
+        //    tg.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(64, factory.GetColor(0x6BB954)), Color.Transparent);
+        //    tg.Border = new LinearGradientColorTable(Color.FromArgb(16, Color.DarkGray), Color.FromArgb(192, Color.DarkGray));
+        //    tg.Text = factory.GetColor(0xFFFFFF);
+
+        //    return tg;
+        //}
+
+        //public static Office2007RibbonTabGroupColorTable GetRibbonTabGroupBlackOrange(ColorFactory factory)
+        //{
+        //    Office2007RibbonTabGroupColorTable tg = new Office2007RibbonTabGroupColorTable();
+
+        //    tg.Background = new LinearGradientColorTable(Color.Transparent /*factory.GetColor(0x414038)*/, factory.GetColor(0xA69B41));
+        //    tg.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(64, factory.GetColor(0xFFE619)), Color.Transparent);
+        //    tg.Border = new LinearGradientColorTable(Color.FromArgb(16, Color.DarkGray), Color.FromArgb(192, Color.DarkGray));
+        //    tg.Text = factory.GetColor(0xFFFFFF);
+
+        //    return tg;
+        //}
+        #endregion
+
+        #region Scroll Bar
+        public static void InitializeScrollBarColorTable(Office2007ColorTable t, ColorFactory factory)
+        {
+            Office2007ScrollBarStateColorTable sct = t.ScrollBar.Default;
+            sct.Background = new LinearGradientColorTable(factory.GetColor(0xFCFCFC), factory.GetColor(0xF0F0F0), 0);
+            sct.Border = new LinearGradientColorTable(factory.GetColor(0xEBEDEF), Color.Empty);
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(0x6E7EA6), factory.GetColor(0x424B63), 90);
+            sct.TrackBackground.Clear();
+            sct.TrackBackground.AddRange(new BackgroundColorBlend[] { new BackgroundColorBlend(factory.GetColor(0xEBEEF0),0f), 
+                new BackgroundColorBlend(factory.GetColor(0xE6E9F0),0.5f),
+                new BackgroundColorBlend(factory.GetColor(0xD1DAE4),0.5f),
+                new BackgroundColorBlend(factory.GetColor(0xBECADB),1f)});
+            sct.TrackInnerBorder = new LinearGradientColorTable(factory.GetColor(0xE8E9E9), factory.GetColor(0xE9ECF2));
+            sct.TrackOuterBorder = new LinearGradientColorTable(factory.GetColor(0x5F6E93), Color.Empty);
+            sct.TrackSignBackground = new LinearGradientColorTable(Color.FromArgb(180, factory.GetColor(0x606060)), Color.FromArgb(64, Color.White));
+
+            // Mouse Over
+            sct = t.ScrollBar.MouseOver;
+            sct.Background = t.ScrollBar.Default.Background;
+            sct.Border = t.ScrollBar.Default.Border;
+            sct.ThumbBackground.Clear();
+            sct.ThumbBackground.AddRange(new BackgroundColorBlend[] { new BackgroundColorBlend(factory.GetColor(0xBFD1EA),0f), 
+                new BackgroundColorBlend(factory.GetColor(0xCADFFA),0.4f),
+                new BackgroundColorBlend(factory.GetColor(0xAACBF6),0.4f),
+                new BackgroundColorBlend(factory.GetColor(0xAACBF6),0.7f),
+                new BackgroundColorBlend(factory.GetColor(0xD3E4FA),1f)});
+            sct.ThumbInnerBorder = new LinearGradientColorTable(factory.GetColor(0xFAFCFF), factory.GetColor(0xEEF4FC));
+            sct.ThumbOuterBorder = new LinearGradientColorTable(factory.GetColor(0x8C97A5), factory.GetColor(0x66717F));
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(0x333C54), factory.GetColor(0x55658D));
+            sct.TrackBackground.Clear();
+            sct.TrackBackground.AddRange(new BackgroundColorBlend[] { new BackgroundColorBlend(factory.GetColor(0xBFD1EA),0f), 
+                new BackgroundColorBlend(factory.GetColor(0xCADFFA),0.5f),
+                new BackgroundColorBlend(factory.GetColor(0xAACBF6),0.5f),
+                new BackgroundColorBlend(factory.GetColor(0xD3E4FA),1f)});
+            sct.TrackInnerBorder = new LinearGradientColorTable(factory.GetColor(0xE9E9EB), factory.GetColor(0xFCFDFF));
+            sct.TrackOuterBorder = new LinearGradientColorTable(factory.GetColor(0x3C6EB0), Color.Empty);
+            sct.TrackSignBackground = new LinearGradientColorTable(Color.FromArgb(180, factory.GetColor(0x606060)), Color.FromArgb(64, Color.White));
+
+            // Control Mouse Over
+            sct = t.ScrollBar.MouseOverControl;
+            sct.Background = t.ScrollBar.Default.Background;
+            sct.Border = t.ScrollBar.Default.Border;
+            sct.ThumbBackground.Clear();
+            sct.ThumbBackground.AddRange(new BackgroundColorBlend[] { new BackgroundColorBlend(factory.GetColor(0xF4F9FF),0f), 
+                new BackgroundColorBlend(factory.GetColor(0xF4F9FF),0.5f),
+                new BackgroundColorBlend(factory.GetColor(0xCFE1F8),0.5f),
+                new BackgroundColorBlend(factory.GetColor(0xDFECFC),1f)});
+            sct.ThumbInnerBorder = new LinearGradientColorTable(factory.GetColor(0xFBFDFF), Color.Empty);
+            sct.ThumbOuterBorder = new LinearGradientColorTable(factory.GetColor(0x8C97A5), factory.GetColor(0x66717F));
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(0x6E7EA6), factory.GetColor(0x424B63));
+            sct.TrackBackground.Clear();
+            sct.TrackBackground.AddRange(new BackgroundColorBlend[] { new BackgroundColorBlend(factory.GetColor(0xEBEEF0),0f), 
+                new BackgroundColorBlend(factory.GetColor(0xE6E9F0),0.5f),
+                new BackgroundColorBlend(factory.GetColor(0xD1DAE4),0.5f),
+                new BackgroundColorBlend(factory.GetColor(0xBECADB),1f)});
+            sct.TrackInnerBorder = new LinearGradientColorTable(factory.GetColor(0xE8E9E9), factory.GetColor(0xE9EDF2));
+            sct.TrackOuterBorder = new LinearGradientColorTable(factory.GetColor(0x5F6E93), Color.Empty);
+            sct.TrackSignBackground = new LinearGradientColorTable(Color.FromArgb(180, factory.GetColor(0x606060)), Color.FromArgb(64, Color.White));
+            // Pressed
+            sct = t.ScrollBar.Pressed;
+            sct.Background = t.ScrollBar.Default.Background;
+            sct.Border = t.ScrollBar.Default.Border;
+            sct.ThumbBackground.Clear();
+            sct.ThumbBackground.AddRange(new BackgroundColorBlend[] { 
+                new BackgroundColorBlend(factory.GetColor(0xE6E9EC),0f), 
+                new BackgroundColorBlend(factory.GetColor(0xE2E4E6),0.6f),
+                new BackgroundColorBlend(factory.GetColor(0xC3CAD2),0.6f),
+                new BackgroundColorBlend(factory.GetColor(0xD7DCE1),1f)});
+            sct.ThumbInnerBorder = new LinearGradientColorTable(factory.GetColor(0xF5F7F8), Color.Empty);
+            sct.ThumbOuterBorder = new LinearGradientColorTable(factory.GetColor(0x8C97A5), factory.GetColor(0x65707F));
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(0x6E7EA6), factory.GetColor(0x424B63));
+            sct.TrackBackground.Clear();
+            sct.TrackBackground.AddRange(new BackgroundColorBlend[] {
+                new BackgroundColorBlend(factory.GetColor(0x9EBEE9),0f), 
+                new BackgroundColorBlend(factory.GetColor(0xABCCF6),0.5f),
+                new BackgroundColorBlend(factory.GetColor(0x6EA6F0),0.5f),
+                new BackgroundColorBlend(factory.GetColor(0xB5D1F7),1f)});
+            sct.TrackInnerBorder = new LinearGradientColorTable(factory.GetColor(0xC2D3E7), factory.GetColor(0xDDEBFB));
+            sct.TrackOuterBorder = new LinearGradientColorTable(factory.GetColor(0x17498A), Color.Empty);
+            sct.TrackSignBackground = new LinearGradientColorTable(Color.FromArgb(180, factory.GetColor(0x606060)), Color.FromArgb(64, Color.White));
+            // Disabled
+            sct = t.ScrollBar.Disabled;
+            sct.Background = t.ScrollBar.Default.Background;
+            sct.Border = t.ScrollBar.Default.Border;
+            sct.ThumbBackground.Clear();
+            sct.ThumbInnerBorder = new LinearGradientColorTable();
+            sct.ThumbOuterBorder = new LinearGradientColorTable();
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(0xBFCFF7), factory.GetColor(0x727C94));
+            sct.TrackBackground.Clear();
+            sct.TrackInnerBorder = new LinearGradientColorTable();
+            sct.TrackOuterBorder = new LinearGradientColorTable();
+            sct.TrackSignBackground = new LinearGradientColorTable();
+        }
+
+        public static void InitializeAppBlueScrollBarColorTable(Office2007ColorTable t, ColorFactory factory)
+        {
+            Office2007ScrollBarStateColorTable sct = t.AppScrollBar.Default;
+            sct.Background = new LinearGradientColorTable(factory.GetColor(0x95B0D2), factory.GetColor(0x7C9BC1), 0);
+            sct.Border = new LinearGradientColorTable(factory.GetColor(0xB2D0F6));
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(0x6E7EA6), factory.GetColor(0x424B63), 90);
+            sct.TrackBackground.Clear();
+            sct.TrackBackground.AddRange(new BackgroundColorBlend[] { new BackgroundColorBlend(factory.GetColor(0xE3E5E7),0f), 
+                new BackgroundColorBlend(factory.GetColor(0xE3E9F0),0.4f),
+                new BackgroundColorBlend(factory.GetColor(0xC8D4E1),0.4f),
+                new BackgroundColorBlend(factory.GetColor(0xB6C4D8),.8f),
+                new BackgroundColorBlend(factory.GetColor(0xB6C4D8),.8f),
+                new BackgroundColorBlend(factory.GetColor(0xE1E7EF),1f)});
+            sct.TrackInnerBorder = new LinearGradientColorTable(factory.GetColor(0xE3E5E7), factory.GetColor(0xE1E7EF));
+            sct.TrackOuterBorder = new LinearGradientColorTable(factory.GetColor(0x596991), Color.Empty);
+            sct.TrackSignBackground = new LinearGradientColorTable(Color.FromArgb(180, factory.GetColor(0x8B8E90)), Color.FromArgb(64, Color.White));
+
+            // Mouse Over
+            sct = t.AppScrollBar.MouseOver;
+            sct.Background = t.AppScrollBar.Default.Background;
+            sct.Border = t.AppScrollBar.Default.Border;
+            sct.ThumbBackground.Clear();
+            sct.ThumbBackground.AddRange(new BackgroundColorBlend[] { new BackgroundColorBlend(factory.GetColor(0xBFD1EA),0f), 
+                new BackgroundColorBlend(factory.GetColor(0xCADFFA),0.4f),
+                new BackgroundColorBlend(factory.GetColor(0xAACBF6),0.4f),
+                new BackgroundColorBlend(factory.GetColor(0xAACBF6),0.7f),
+                new BackgroundColorBlend(factory.GetColor(0xD3E4FA),1f)});
+            sct.ThumbInnerBorder = new LinearGradientColorTable(factory.GetColor(0xE9E9EB), factory.GetColor(0xFCFDFF));
+            sct.ThumbOuterBorder = new LinearGradientColorTable(factory.GetColor(0x3C6EB0), Color.Empty);
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(0x6E7EA6), factory.GetColor(0x424B63), 90);
+            sct.TrackBackground.Clear();
+            sct.TrackBackground.CopyFrom(sct.ThumbBackground);
+            sct.TrackInnerBorder = sct.ThumbInnerBorder;
+            sct.TrackOuterBorder = sct.ThumbOuterBorder;
+            sct.TrackSignBackground = new LinearGradientColorTable(Color.FromArgb(180, factory.GetColor(0x7D8692)), Color.FromArgb(64, Color.White));
+
+            // Control Mouse Over
+            sct = t.AppScrollBar.MouseOverControl;
+            sct.Background = t.AppScrollBar.Default.Background;
+            sct.Border = t.AppScrollBar.Default.Border;
+            sct.ThumbBackground.Clear();
+            sct.ThumbBackground.CopyFrom(t.AppScrollBar.Default.TrackBackground);
+            sct.ThumbInnerBorder = t.AppScrollBar.Default.TrackInnerBorder;
+            sct.ThumbOuterBorder = t.AppScrollBar.Default.TrackOuterBorder;
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(0x55658D), factory.GetColor(0x333C54));
+            sct.TrackBackground.Clear();
+            sct.TrackBackground.CopyFrom(t.AppScrollBar.Default.TrackBackground);
+            sct.TrackInnerBorder = t.AppScrollBar.Default.TrackInnerBorder;
+            sct.TrackOuterBorder = t.AppScrollBar.Default.TrackOuterBorder;
+            sct.TrackSignBackground = t.AppScrollBar.Default.TrackSignBackground;
+
+            // Pressed
+            sct = t.AppScrollBar.Pressed;
+            sct.Background = t.AppScrollBar.Default.Background;
+            sct.Border = t.AppScrollBar.Default.Border;
+            sct.ThumbBackground.Clear();
+            sct.ThumbBackground.AddRange(new BackgroundColorBlend[] { 
+                new BackgroundColorBlend(factory.GetColor(0x9DBDE7),0f), 
+                new BackgroundColorBlend(factory.GetColor(0xABCCF6),0.4f),
+                new BackgroundColorBlend(factory.GetColor(0x6EA6F0),0.4f),
+                new BackgroundColorBlend(factory.GetColor(0x6EA6F0),0.7f),
+                new BackgroundColorBlend(factory.GetColor(0xB5D1F7),1f)});
+            sct.ThumbInnerBorder = new LinearGradientColorTable(factory.GetColor(0xC2D3E7), factory.GetColor(0xDDEBFB));
+            sct.ThumbOuterBorder = new LinearGradientColorTable(factory.GetColor(0x17498A), Color.Empty);
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(0x6E7EA6), factory.GetColor(0x424B63), 90);
+            sct.TrackBackground.Clear();
+            sct.TrackBackground.CopyFrom(sct.ThumbBackground);
+            //sct.TrackBackground.AddRange(new BackgroundColorBlend[] {
+            //    new BackgroundColorBlend(factory.GetColor(0x9DBDE7),0f), 
+            //    new BackgroundColorBlend(factory.GetColor(0xABCCF6),0.4f),
+            //    new BackgroundColorBlend(factory.GetColor(0x79ADF1),0.4f),
+            //    new BackgroundColorBlend(factory.GetColor(0xBBD5F8),1f)});
+            sct.TrackInnerBorder = new LinearGradientColorTable(factory.GetColor(0xC2D3E7), factory.GetColor(0xDDEBFB));
+            sct.TrackOuterBorder = new LinearGradientColorTable(factory.GetColor(0x17498A), Color.Empty);
+            sct.TrackSignBackground = new LinearGradientColorTable(Color.FromArgb(180, factory.GetColor(0x818181)), Color.FromArgb(64, Color.White));
+            // Disabled
+            sct = t.AppScrollBar.Disabled;
+            sct.Background = t.AppScrollBar.Default.Background;
+            sct.Border = t.AppScrollBar.Default.Border;
+            sct.ThumbBackground.Clear();
+            sct.ThumbInnerBorder = new LinearGradientColorTable();
+            sct.ThumbOuterBorder = new LinearGradientColorTable();
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(0xBFCFF7), factory.GetColor(0x727C94));
+            sct.TrackBackground.Clear();
+            sct.TrackInnerBorder = new LinearGradientColorTable();
+            sct.TrackOuterBorder = new LinearGradientColorTable();
+            sct.TrackSignBackground = new LinearGradientColorTable();
+        }
+
+        public static void InitializeAppSilverScrollBarColorTable(Office2007ColorTable t, ColorFactory factory)
+        {
+            Office2007ScrollBarStateColorTable sct = t.AppScrollBar.Default;
+            sct.Background = new LinearGradientColorTable(factory.GetColor(0xB4B7BF));
+            sct.Border = new LinearGradientColorTable(factory.GetColor(0x9D9FA6));
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(0x7D848E), factory.GetColor(0x4B4F55), 90);
+            sct.TrackBackground.Clear();
+            sct.TrackBackground.AddRange(new BackgroundColorBlend[] {
+                new BackgroundColorBlend(factory.GetColor(0xF5F5F6),0f), 
+                new BackgroundColorBlend(factory.GetColor(0xEAEAEC),0.4f),
+                new BackgroundColorBlend(factory.GetColor(0xDADBDD),0.4f),
+                new BackgroundColorBlend(factory.GetColor(0xC1C1C5),1f)});
+            sct.TrackInnerBorder = new LinearGradientColorTable(factory.GetColor(0xF9F9F9), factory.GetColor(0xCFCFD2));
+            sct.TrackOuterBorder = new LinearGradientColorTable(factory.GetColor(0x6E6F73), Color.Empty);
+            sct.TrackSignBackground = new LinearGradientColorTable(Color.FromArgb(180, factory.GetColor(0x6F6F6F)), Color.FromArgb(64, Color.White));
+
+            // Mouse Over
+            sct = t.AppScrollBar.MouseOver;
+            sct.Background = t.AppScrollBar.Default.Background;
+            sct.Border = t.AppScrollBar.Default.Border;
+            sct.ThumbBackground.Clear();
+            sct.ThumbBackground.AddRange(new BackgroundColorBlend[] {
+                new BackgroundColorBlend(factory.GetColor(0xDCF0FB),0f), 
+                new BackgroundColorBlend(factory.GetColor(0xC9E9FA),0.4f),
+                new BackgroundColorBlend(factory.GetColor(0xA9DBF6),0.4f),
+                new BackgroundColorBlend(factory.GetColor(0xA9DBF6),0.7f),
+                new BackgroundColorBlend(factory.GetColor(0x94C0D8),1f)});
+            sct.ThumbInnerBorder = new LinearGradientColorTable(factory.GetColor(0xFDFEFF), factory.GetColor(0xDBDDDF));
+            sct.ThumbOuterBorder = new LinearGradientColorTable(factory.GetColor(0x3C7FB1), Color.Empty);
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(0x7D848E), factory.GetColor(0x4B4F55), 90);
+            sct.TrackBackground.Clear();
+            sct.TrackBackground.CopyFrom(sct.ThumbBackground);
+            sct.TrackInnerBorder = sct.ThumbInnerBorder;
+            sct.TrackOuterBorder = sct.ThumbOuterBorder;
+            sct.TrackSignBackground = new LinearGradientColorTable(Color.FromArgb(180, factory.GetColor(0x6F6F6F)), Color.FromArgb(64, Color.White));
+
+            // Control Mouse Over
+            sct = t.AppScrollBar.MouseOverControl;
+            sct.Background = t.AppScrollBar.Default.Background;
+            sct.Border = t.AppScrollBar.Default.Border;
+            sct.ThumbBackground.Clear();
+            sct.ThumbBackground.CopyFrom(t.AppScrollBar.Default.TrackBackground);
+            sct.ThumbInnerBorder = t.AppScrollBar.Default.TrackInnerBorder;
+            sct.ThumbOuterBorder = t.AppScrollBar.Default.TrackOuterBorder;
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(0x7D848E), factory.GetColor(0x4B4F55), 90);
+            sct.TrackBackground.Clear();
+            sct.TrackBackground.CopyFrom(t.AppScrollBar.Default.TrackBackground);
+            sct.TrackInnerBorder = t.AppScrollBar.Default.TrackInnerBorder;
+            sct.TrackOuterBorder = t.AppScrollBar.Default.TrackOuterBorder;
+            sct.TrackSignBackground = t.AppScrollBar.Default.TrackSignBackground;
+
+            // Pressed
+            sct = t.AppScrollBar.Pressed;
+            sct.Background = t.AppScrollBar.Default.Background;
+            sct.Border = t.AppScrollBar.Default.Border;
+            sct.ThumbBackground.Clear();
+            sct.ThumbBackground.AddRange(new BackgroundColorBlend[] { 
+                new BackgroundColorBlend(factory.GetColor(0xC4E9F9),0f), 
+                new BackgroundColorBlend(factory.GetColor(0xA5DEF6),0.4f),
+                new BackgroundColorBlend(factory.GetColor(0x6FCAF0),0.4f),
+                new BackgroundColorBlend(factory.GetColor(0x6FCAF0),0.7f),
+                new BackgroundColorBlend(factory.GetColor(0x62B1D3),1f)});
+            sct.ThumbInnerBorder = new LinearGradientColorTable(factory.GetColor(0xE3F5FC), factory.GetColor(0x9EC7D9));
+            sct.ThumbOuterBorder = new LinearGradientColorTable(factory.GetColor(0x18598A), Color.Empty);
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(0x7D848E), factory.GetColor(0x4B4F55), 90);
+            sct.TrackBackground.Clear();
+            sct.TrackBackground.CopyFrom(sct.ThumbBackground);
+            //sct.TrackBackground.AddRange(new BackgroundColorBlend[] {
+            //    new BackgroundColorBlend(factory.GetColor(0x9DBDE7),0f), 
+            //    new BackgroundColorBlend(factory.GetColor(0xABCCF6),0.4f),
+            //    new BackgroundColorBlend(factory.GetColor(0x79ADF1),0.4f),
+            //    new BackgroundColorBlend(factory.GetColor(0xBBD5F8),1f)});
+            sct.TrackInnerBorder = new LinearGradientColorTable(factory.GetColor(0xE3F5FC), factory.GetColor(0x9EC7D9));
+            sct.TrackOuterBorder = new LinearGradientColorTable(factory.GetColor(0x18598A), Color.Empty);
+            sct.TrackSignBackground = new LinearGradientColorTable(Color.FromArgb(180, factory.GetColor(0x818181)), Color.FromArgb(64, Color.White));
+            // Disabled
+            sct = t.AppScrollBar.Disabled;
+            sct.Background = t.AppScrollBar.Default.Background;
+            sct.Border = t.AppScrollBar.Default.Border;
+            sct.ThumbBackground.Clear();
+            sct.ThumbInnerBorder = new LinearGradientColorTable();
+            sct.ThumbOuterBorder = new LinearGradientColorTable();
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(0xBFCFF7), factory.GetColor(0x727C94));
+            sct.TrackBackground.Clear();
+            sct.TrackInnerBorder = new LinearGradientColorTable();
+            sct.TrackOuterBorder = new LinearGradientColorTable();
+            sct.TrackSignBackground = new LinearGradientColorTable();
+        }
+
+        public static void InitializeAppBlackScrollBarColorTable(Office2007ColorTable t, ColorFactory factory)
+        {
+            Office2007ScrollBarStateColorTable sct = t.AppScrollBar.Default;
+            sct.Background = new LinearGradientColorTable(factory.GetColor(0x404040));
+            sct.Border = new LinearGradientColorTable(factory.GetColor(0x626262));
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(0xCACACA), factory.GetColor(0x797979), 90);
+            sct.TrackBackground.Clear();
+            sct.TrackBackground.AddRange(new BackgroundColorBlend[] {
+                new BackgroundColorBlend(factory.GetColor(0xF9F9F9),0f), 
+                new BackgroundColorBlend(factory.GetColor(0xEAEAEC),0.4f),
+                new BackgroundColorBlend(factory.GetColor(0xDADBDD),0.4f),
+                new BackgroundColorBlend(factory.GetColor(0xC1C1C5),1f)});
+            sct.TrackInnerBorder = new LinearGradientColorTable(factory.GetColor(0xF9F9F9), factory.GetColor(0xCFCFD2));
+            sct.TrackOuterBorder = new LinearGradientColorTable(factory.GetColor(0x2F2F2F), Color.Empty);
+            sct.TrackSignBackground = new LinearGradientColorTable(Color.FromArgb(180, factory.GetColor(0x6F6F6F)), Color.FromArgb(64, Color.White));
+
+            // Mouse Over
+            sct = t.AppScrollBar.MouseOver;
+            sct.Background = t.AppScrollBar.Default.Background;
+            sct.Border = t.AppScrollBar.Default.Border;
+            sct.ThumbBackground.Clear();
+            sct.ThumbBackground.AddRange(new BackgroundColorBlend[] {
+                new BackgroundColorBlend(factory.GetColor(0xDCF0FB),0f), 
+                new BackgroundColorBlend(factory.GetColor(0xC9E9FA),0.4f),
+                new BackgroundColorBlend(factory.GetColor(0xA9DBF6),0.4f),
+                new BackgroundColorBlend(factory.GetColor(0xA9DBF6),0.7f),
+                new BackgroundColorBlend(factory.GetColor(0x94C0D8),1f)});
+            sct.ThumbInnerBorder = new LinearGradientColorTable(factory.GetColor(0xFDFEFF), factory.GetColor(0xDBDDDF));
+            sct.ThumbOuterBorder = new LinearGradientColorTable(factory.GetColor(0x3C7FB1), Color.Empty);
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(0x838383), factory.GetColor(0x4E4E4E), 90);
+            sct.TrackBackground.Clear();
+            sct.TrackBackground.CopyFrom(sct.ThumbBackground);
+            sct.TrackInnerBorder = sct.ThumbInnerBorder;
+            sct.TrackOuterBorder = sct.ThumbOuterBorder;
+            sct.TrackSignBackground = new LinearGradientColorTable(Color.FromArgb(180, factory.GetColor(0x6F6F6F)), Color.FromArgb(64, Color.White));
+
+            // Control Mouse Over
+            sct = t.AppScrollBar.MouseOverControl;
+            sct.Background = t.AppScrollBar.Default.Background;
+            sct.Border = t.AppScrollBar.Default.Border;
+            sct.ThumbBackground.Clear();
+            sct.ThumbBackground.CopyFrom(t.AppScrollBar.Default.TrackBackground);
+            sct.ThumbInnerBorder = t.AppScrollBar.Default.TrackInnerBorder;
+            sct.ThumbOuterBorder = t.AppScrollBar.Default.TrackOuterBorder;
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(0x838383), factory.GetColor(0x4E4E4E), 90);
+            sct.TrackBackground.Clear();
+            sct.TrackBackground.CopyFrom(t.AppScrollBar.Default.TrackBackground);
+            sct.TrackInnerBorder = t.AppScrollBar.Default.TrackInnerBorder;
+            sct.TrackOuterBorder = t.AppScrollBar.Default.TrackOuterBorder;
+            sct.TrackSignBackground = t.AppScrollBar.Default.TrackSignBackground;
+
+            // Pressed
+            sct = t.AppScrollBar.Pressed;
+            sct.Background = t.AppScrollBar.Default.Background;
+            sct.Border = t.AppScrollBar.Default.Border;
+            sct.ThumbBackground.Clear();
+            sct.ThumbBackground.AddRange(new BackgroundColorBlend[] { 
+                new BackgroundColorBlend(factory.GetColor(0xC4E9F9),0f), 
+                new BackgroundColorBlend(factory.GetColor(0xA5DEF6),0.4f),
+                new BackgroundColorBlend(factory.GetColor(0x6FCAF0),0.4f),
+                new BackgroundColorBlend(factory.GetColor(0x6FCAF0),0.7f),
+                new BackgroundColorBlend(factory.GetColor(0x62B1D3),1f)});
+            sct.ThumbInnerBorder = new LinearGradientColorTable(factory.GetColor(0xE3F5FC), factory.GetColor(0x9EC7D9));
+            sct.ThumbOuterBorder = new LinearGradientColorTable(factory.GetColor(0x18598A), Color.Empty);
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(0x7D848E), factory.GetColor(0x4B4F55), 90);
+            sct.TrackBackground.Clear();
+            sct.TrackBackground.CopyFrom(sct.ThumbBackground);
+            //sct.TrackBackground.AddRange(new BackgroundColorBlend[] {
+            //    new BackgroundColorBlend(factory.GetColor(0x9DBDE7),0f), 
+            //    new BackgroundColorBlend(factory.GetColor(0xABCCF6),0.4f),
+            //    new BackgroundColorBlend(factory.GetColor(0x79ADF1),0.4f),
+            //    new BackgroundColorBlend(factory.GetColor(0xBBD5F8),1f)});
+            sct.TrackInnerBorder = new LinearGradientColorTable(factory.GetColor(0xE3F5FC), factory.GetColor(0x9EC7D9));
+            sct.TrackOuterBorder = new LinearGradientColorTable(factory.GetColor(0x18598A), Color.Empty);
+            sct.TrackSignBackground = new LinearGradientColorTable(Color.FromArgb(180, factory.GetColor(0x818181)), Color.FromArgb(64, Color.White));
+            // Disabled
+            sct = t.AppScrollBar.Disabled;
+            sct.Background = t.AppScrollBar.Default.Background;
+            sct.Border = t.AppScrollBar.Default.Border;
+            sct.ThumbBackground.Clear();
+            sct.ThumbInnerBorder = new LinearGradientColorTable();
+            sct.ThumbOuterBorder = new LinearGradientColorTable();
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(0xBFCFF7), factory.GetColor(0x727C94));
+            sct.TrackBackground.Clear();
+            sct.TrackInnerBorder = new LinearGradientColorTable();
+            sct.TrackOuterBorder = new LinearGradientColorTable();
+            sct.TrackSignBackground = new LinearGradientColorTable();
+        }
+        #endregion
+
+        public static void InitializeVistaBlackColorTable(Office2007ColorTable table, ColorFactory factory)
+        {
+            #region Ribbon Bar
+            table.RibbonBar.Default = GetRibbonBarBlack(factory);
+            table.RibbonBar.MouseOver = GetRibbonBarBlackMouseOver(factory);
+            table.RibbonBar.Expanded = GetRibbonBarBlackExpanded(factory);
+            #endregion
+
+            #region RibbonTabItem
+            // RibbonTabItem Default
+            table.RibbonTabItemColors.Clear();
+            Office2007RibbonTabItemColorTable rt = GetRibbonTabItemBlackDefault(factory);
+            rt.Name = Enum.GetName(typeof(eRibbonTabColor), eRibbonTabColor.Default);
+            table.RibbonTabItemColors.Add(rt);
+            // Green
+
+            rt = Office2007ColorTableFactory.GetRibbonTabItemBlackGreen(factory);
+            rt.Name = Enum.GetName(typeof(eRibbonTabColor), eRibbonTabColor.Green);
+            table.RibbonTabItemColors.Add(rt);
+            // Magenta
+
+            rt = Office2007ColorTableFactory.GetRibbonTabItemBlackMagenta(factory);
+            rt.Name = Enum.GetName(typeof(eRibbonTabColor), eRibbonTabColor.Magenta);
+            table.RibbonTabItemColors.Add(rt);
+            // Orange
+
+            rt = Office2007ColorTableFactory.GetRibbonTabItemBlackOrange(factory);
+            rt.Name = Enum.GetName(typeof(eRibbonTabColor), eRibbonTabColor.Orange);
+            table.RibbonTabItemColors.Add(rt);
+            #endregion
+
+            #region Ribbon Control
+            table.RibbonControl = new Office2007RibbonColorTable();
+            table.RibbonControl.TabsBackground = new LinearGradientColorTable(factory.GetColor(0x3C4251));
+            //t.RibbonControl.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xD7DADF), factory.GetColor(0x3A3A3A));
+            //t.RibbonControl.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xBEBEBE), factory.GetColor(0xBEBEBE));
+            table.RibbonControl.InnerBorder = new LinearGradientColorTable(factory.GetColor(0x7A8295), factory.GetColor(0x646C89));
+            table.RibbonControl.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x111216), factory.GetColor(0x000000));
+            table.RibbonControl.TabDividerBorder = factory.GetColor(0x646C89);
+            table.RibbonControl.TabDividerBorderLight = factory.GetColor(0x222222);
+            //t.RibbonControl.PanelTopBackground = new LinearGradientColorTable(factory.GetColor(0x626C88), factory.GetColor(0x3F4756));
+            //t.RibbonControl.PanelBottomBackground = new LinearGradientColorTable(factory.GetColor(0x151516), factory.GetColor(0x3C476F));
+            table.RibbonControl.PanelTopBackground = new LinearGradientColorTable(factory.GetColor(0xEDF6FF), factory.GetColor(0xBDD3EB));
+            table.RibbonControl.PanelBottomBackground = new LinearGradientColorTable(factory.GetColor(0xA0B7D2), factory.GetColor(0xF0F0F0));
+            table.RibbonControl.StartButtonDefault = BarFunctions.LoadBitmap("SystemImages.BlankStartButtonNormalVistaBlack.png");
+            table.RibbonControl.StartButtonMouseOver = BarFunctions.LoadBitmap("SystemImages.BlankStartButtonHotVistaBlack.png");
+            table.RibbonControl.StartButtonPressed = BarFunctions.LoadBitmap("SystemImages.BlankStartButtonPressedVistaBlack.png");
+            #endregion
+
+            #region ItemContainer
+            table.ItemGroup.TopBackground = new LinearGradientColorTable(factory.GetColor(0xFEFEFF), factory.GetColor(0xE5EAF5));
+            table.ItemGroup.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xD4DBED), factory.GetColor(0xE1E6F6));
+            table.ItemGroup.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFFFFFF));
+            table.ItemGroup.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xB2BDC7));
+            table.ItemGroup.ItemGroupDividerDark = Color.FromArgb(196, factory.GetColor(0xCECECE));
+            table.ItemGroup.ItemGroupDividerLight = Color.FromArgb(128, factory.GetColor(0xFFFFFF));
+            #endregion
+
+            #region Bar
+            table.Bar.ToolbarTopBackground = new LinearGradientColorTable(factory.GetColor(0x5A6487), factory.GetColor(0x353A45));
+            table.Bar.ToolbarBottomBackground = new LinearGradientColorTable(factory.GetColor(0x0F0F14), factory.GetColor(0x4C5E8B));
+            table.Bar.ToolbarBottomBorder = factory.GetColor(0xAAB5D0);
+            table.Bar.PopupToolbarBackground = new LinearGradientColorTable(factory.GetColor(0xFAFAFA), Color.Empty);
+            table.Bar.PopupToolbarBorder = factory.GetColor(0x2F2F2F);
+            table.Bar.StatusBarTopBorder = factory.GetColor(0x333333);
+            table.Bar.StatusBarTopBorderLight = Color.Empty;
+            table.Bar.StatusBarAltBackground.Clear();
+            table.Bar.StatusBarAltBackground.Add(new BackgroundColorBlend(factory.GetColor(0xA8ABAB), 0f));
+            table.Bar.StatusBarAltBackground.Add(new BackgroundColorBlend(factory.GetColor(0x5C6F79), 0.4f));
+            table.Bar.StatusBarAltBackground.Add(new BackgroundColorBlend(factory.GetColor(0x00304B), 0.4f));
+            table.Bar.StatusBarAltBackground.Add(new BackgroundColorBlend(factory.GetColor(0x2C466B), 1f));
+            #endregion
+
+            #region ButtonItem Colors Initialization
+            table.ButtonItemColors.Clear();
+            table.RibbonButtonItemColors.Clear();
+            table.MenuButtonItemColors.Clear();
+            // Orange
+            Office2007ButtonItemColorTable cb = GetMenuItemBlue(false, factory);
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Orange);
+            table.ButtonItemColors.Add(cb);
+            // Orange with background
+            cb = GetButtonItemBlackOrangeWithBackground(factory);
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.OrangeWithBackground);
+            table.ButtonItemColors.Add(cb);
+            // Blue
+            cb = GetButtonItemBlackBlue(false, factory);
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Blue);
+            table.ButtonItemColors.Add(cb);
+            // Blue with background
+            cb = GetButtonItemBlackBlueWithBackground(factory);
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.BlueWithBackground);
+            table.ButtonItemColors.Add(cb);
+            // Magenta
+            cb = GetButtonItemBlackMagenta(false, factory);
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Magenta);
+            table.ButtonItemColors.Add(cb);
+            // Magenta with background
+            cb = GetButtonItemBlackMagentaWithBackground(factory);
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.MagentaWithBackground);
+            table.ButtonItemColors.Add(cb);
+
+            // RibbonBar buttons
+            cb = GetButtonItemBlackOrange(true, factory);
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Orange);
+            table.RibbonButtonItemColors.Add(cb);
+            // Orange with background
+            cb = GetButtonItemBlackOrangeWithBackground(factory);
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.OrangeWithBackground);
+            table.RibbonButtonItemColors.Add(cb);
+            // Blue
+            cb = GetButtonItemBlackBlue(true, factory);
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Blue);
+            table.RibbonButtonItemColors.Add(cb);
+            // Blue with background
+            cb = GetButtonItemBlackBlueWithBackground(factory);
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.BlueWithBackground);
+            table.RibbonButtonItemColors.Add(cb);
+            // Magenta
+            cb = GetButtonItemBlackMagenta(true, factory);
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Magenta);
+            table.RibbonButtonItemColors.Add(cb);
+            // Magenta with background
+            cb = GetButtonItemBlackMagentaWithBackground(factory);
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.MagentaWithBackground);
+            table.RibbonButtonItemColors.Add(cb);
+
+            // MENU Orange
+            cb = GetMenuItemBlue(true, factory);
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Orange);
+            table.MenuButtonItemColors.Add(cb);
+
+            cb = Office2007ColorTableFactory.GetButtonItemOffice2007WithBackground(factory);
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Office2007WithBackground);
+            table.ButtonItemColors.Add(cb);
+
+            table.ButtonItemColors.Add(ButtonItemStaticColorTables.CreateBlueOrbColorTable(factory));
+            #endregion
+
+            #region RibbonTabItemGroup Colors Initialization
+            table.RibbonTabGroupColors.Clear();
+            // Default
+            Office2007RibbonTabGroupColorTable tg = Office2007ColorTableFactory.GetRibbonTabGroupBlackDefault(factory);
+            tg.Name = Enum.GetName(typeof(eRibbonTabGroupColor), eRibbonTabGroupColor.Default);
+            table.RibbonTabGroupColors.Add(tg);
+
+            // Magenta
+            tg = Office2007ColorTableFactory.GetRibbonTabGroupBlackMagenta(factory);
+            tg.Name = Enum.GetName(typeof(eRibbonTabGroupColor), eRibbonTabGroupColor.Magenta);
+            table.RibbonTabGroupColors.Add(tg);
+
+            // Green
+            tg = Office2007ColorTableFactory.GetRibbonTabGroupBlackGreen(factory);
+            tg.Name = Enum.GetName(typeof(eRibbonTabGroupColor), eRibbonTabGroupColor.Green);
+            table.RibbonTabGroupColors.Add(tg);
+
+            // Orange
+            tg = Office2007ColorTableFactory.GetRibbonTabGroupBlackOrange(factory);
+            tg.Name = Enum.GetName(typeof(eRibbonTabGroupColor), eRibbonTabGroupColor.Orange);
+            table.RibbonTabGroupColors.Add(tg);
+            #endregion
+
+            #region Menu
+            table.Menu.Background = new LinearGradientColorTable(factory.GetColor(0xF0F0F0), Color.Empty);
+            table.Menu.Border = new LinearGradientColorTable(factory.GetColor(0x646464), Color.Empty);
+            table.Menu.Side = new LinearGradientColorTable(factory.GetColor(0xF1F1F1), Color.Empty);
+            table.Menu.SideBorder = new LinearGradientColorTable(factory.GetColor(0xE2E3E3), Color.Empty);
+            table.Menu.SideBorderLight = new LinearGradientColorTable(factory.GetColor(0xFFFFFF), Color.Empty);
+            table.Menu.SideUnused = new LinearGradientColorTable(factory.GetColor(0xE5E5E5), Color.Empty);
+
+            table.Menu.FileBackgroundBlend.Clear();
+            table.Menu.FileBackgroundBlend.AddRange(new DevComponents.DotNetBar.BackgroundColorBlend[] {
+                new DevComponents.DotNetBar.BackgroundColorBlend(factory.GetColor(0x626C88), 0F),
+                new DevComponents.DotNetBar.BackgroundColorBlend(factory.GetColor(0x393F4D), .01F),
+                new DevComponents.DotNetBar.BackgroundColorBlend(factory.GetColor(0x393F4D), 1F)});
+            table.Menu.FileContainerBorder = factory.GetColor(0x222222);
+            table.Menu.FileContainerBorderLight = factory.GetColor(0x7A8295);
+            table.Menu.FileColumnOneBackground = factory.GetColor(0xFAFAFA);
+            table.Menu.FileColumnOneBorder = factory.GetColor(0xC5C5C5);
+            table.Menu.FileColumnTwoBackground = factory.GetColor(0xE9EAEE);
+            table.Menu.FileBottomContainerBackgroundBlend.Clear();
+            table.Menu.FileBottomContainerBackgroundBlend.AddRange(new DevComponents.DotNetBar.BackgroundColorBlend[] {
+                new DevComponents.DotNetBar.BackgroundColorBlend(factory.GetColor(0x626C88), 0F),
+                new DevComponents.DotNetBar.BackgroundColorBlend(factory.GetColor(0x3F4756), 0.5F),
+                new DevComponents.DotNetBar.BackgroundColorBlend(factory.GetColor(0x151516), 0.5F),
+                new DevComponents.DotNetBar.BackgroundColorBlend(factory.GetColor(0x3C476F), 1F)});
+            #endregion
+
+            #region ComboBox
+            table.ComboBox.Default.Background = factory.GetColor(0xF2F2F2);
+            int editBorderColor = 0x8D93A0;
+            table.ComboBox.Default.Border = factory.GetColor(editBorderColor);
+            table.ComboBox.Default.ExpandBackground = new LinearGradientColorTable();
+            table.ComboBox.Default.ExpandBorderInner = new LinearGradientColorTable();
+            table.ComboBox.Default.ExpandBorderOuter = new LinearGradientColorTable();
+            table.ComboBox.Default.ExpandText = factory.GetColor(0x7C7C7C);
+
+            table.ComboBox.DefaultStandalone.Background = factory.GetColor(0xFFFFFF);
+            table.ComboBox.DefaultStandalone.Border = factory.GetColor(0x707070);
+            table.ComboBox.DefaultStandalone.ExpandBackground = new LinearGradientColorTable(factory.GetColor(0xF2F2F2), factory.GetColor(0xCFCFCF), 90);
+            table.ComboBox.DefaultStandalone.ExpandBorderInner = new LinearGradientColorTable();
+            table.ComboBox.DefaultStandalone.ExpandBorderOuter = new LinearGradientColorTable(factory.GetColor(0x707070), Color.Empty, 90);
+            table.ComboBox.DefaultStandalone.ExpandText = factory.GetColor(0x000000);
+
+            table.ComboBox.MouseOver.Background = factory.GetColor(0xFFFFFF);
+            table.ComboBox.MouseOver.Border = factory.GetColor(0x3C7FB1);
+            table.ComboBox.MouseOver.ExpandBackground = new LinearGradientColorTable(factory.GetColor(0xEAF6FD), factory.GetColor(0xA7D9F5), 90);
+            table.ComboBox.MouseOver.ExpandBorderInner = new LinearGradientColorTable(factory.GetColor(0xFAFDFE));
+            table.ComboBox.MouseOver.ExpandBorderOuter = new LinearGradientColorTable(factory.GetColor(0x3C7FB1), Color.Empty, 90);
+            table.ComboBox.MouseOver.ExpandText = factory.GetColor(0x000000);
+            table.ComboBox.DroppedDown.Background = factory.GetColor(0xFFFFFF);
+            table.ComboBox.DroppedDown.Border = factory.GetColor(0x2C628B);
+            table.ComboBox.DroppedDown.ExpandBackground = new LinearGradientColorTable(factory.GetColor(0xE5F4FC), factory.GetColor(0x68B3DB), 90);
+            table.ComboBox.DroppedDown.ExpandBorderInner = new LinearGradientColorTable(factory.GetColor(0x9EB0BA), Color.Transparent, 90);
+            table.ComboBox.DroppedDown.ExpandBorderOuter = new LinearGradientColorTable(factory.GetColor(0x2C628B), Color.Empty, 90);
+            table.ComboBox.DroppedDown.ExpandText = factory.GetColor(0x000000);
+            #endregion
+
+            #region Dialog Launcher
+            table.DialogLauncher.Default.DialogLauncher = factory.GetColor(0x3C476F);
+            table.DialogLauncher.Default.DialogLauncherShade = factory.GetColor(0xEBEBEB);
+
+            table.DialogLauncher.MouseOver.DialogLauncher = factory.GetColor(0x3C476F);
+            table.DialogLauncher.MouseOver.DialogLauncherShade = factory.GetColor(0xEBEBEB);
+            table.DialogLauncher.MouseOver.TopBackground = new LinearGradientColorTable(factory.GetColor(0xE9F7FE), factory.GetColor(0xDDF2FD));
+            table.DialogLauncher.MouseOver.BottomBackground = new LinearGradientColorTable(factory.GetColor(0x95BED5), factory.GetColor(0xB5E4FF));
+            table.DialogLauncher.MouseOver.InnerBorder = new LinearGradientColorTable(Color.FromArgb(128, Color.White));
+            table.DialogLauncher.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xA5A5A5), factory.GetColor(0x959595));
+
+            table.DialogLauncher.Pressed.DialogLauncher = factory.GetColor(0x3C476F);
+            table.DialogLauncher.Pressed.DialogLauncherShade = factory.GetColor(0xEBEBEB);
+            table.DialogLauncher.Pressed.TopBackground = new LinearGradientColorTable(factory.GetColor(0xE9F7FE), factory.GetColor(0xC5E9FB));
+            table.DialogLauncher.Pressed.BottomBackground = new LinearGradientColorTable(factory.GetColor(0x649EBF), factory.GetColor(0x87D3FF));
+            table.DialogLauncher.Pressed.InnerBorder = new LinearGradientColorTable(Color.FromArgb(128, Color.White));
+            table.DialogLauncher.Pressed.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xA5A5A5), factory.GetColor(0x959595));
+            #endregion
+
+            #region Legacy Color Scheme
+            InitializeBlackLegacyColors(table.LegacyColors, factory);
+            #endregion
+
+            #region System Button, Form
+
+            // Default state no background
+            table.SystemButton.Default = new Office2007SystemButtonStateColorTable();
+            table.SystemButton.Default.Foreground = new LinearGradientColorTable(factory.GetColor(0x848C95), factory.GetColor(0x9FA9B7));
+            table.SystemButton.Default.LightShade = factory.GetColor(0x9FA9B7);
+            table.SystemButton.Default.DarkShade = factory.GetColor(0x818080);
+
+            // Mouse over state
+            table.SystemButton.MouseOver = new Office2007SystemButtonStateColorTable();
+            table.SystemButton.MouseOver.Foreground = new LinearGradientColorTable(factory.GetColor(0x363535), factory.GetColor(0x4F5763));
+            table.SystemButton.MouseOver.LightShade = factory.GetColor(0x9BA1A8);
+            table.SystemButton.MouseOver.DarkShade = factory.GetColor(0x454C56);
+            table.SystemButton.MouseOver.TopBackground = new LinearGradientColorTable(factory.GetColor(0xB1B8C1), factory.GetColor(0x8894A1));
+            table.SystemButton.MouseOver.BottomBackground = new LinearGradientColorTable(factory.GetColor(0x687585), factory.GetColor(0x9DB1C1));
+            table.SystemButton.MouseOver.TopHighlight = new LinearGradientColorTable(factory.GetColor(0xCDD3DA), Color.Transparent);
+            table.SystemButton.MouseOver.BottomHighlight = new LinearGradientColorTable(factory.GetColor(0xB5DDF4), Color.Transparent);
+            table.SystemButton.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x57606D), factory.GetColor(0x5C6269));
+            table.SystemButton.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xCDD3DA), factory.GetColor(0xDADFE3));
+
+            // Pressed
+            table.SystemButton.Pressed = new Office2007SystemButtonStateColorTable();
+            table.SystemButton.Pressed.Foreground = new LinearGradientColorTable(factory.GetColor(0x6D6C6C), factory.GetColor(0x8B96A4));
+            table.SystemButton.Pressed.LightShade = factory.GetColor(0x7F8894);
+            table.SystemButton.Pressed.DarkShade = factory.GetColor(0x6D6C6C);
+            table.SystemButton.Pressed.TopBackground = new LinearGradientColorTable(factory.GetColor(0x373737), factory.GetColor(0x2B2B2B));
+            table.SystemButton.Pressed.TopHighlight = new LinearGradientColorTable(factory.GetColor(0x686868), Color.Transparent);
+            table.SystemButton.Pressed.BottomBackground = new LinearGradientColorTable(factory.GetColor(0x000000), factory.GetColor(0x07090B));
+            table.SystemButton.Pressed.BottomHighlight = new LinearGradientColorTable(factory.GetColor(0x516982), Color.Transparent);
+            table.SystemButton.Pressed.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x222429), factory.GetColor(0x191919));
+            table.SystemButton.Pressed.InnerBorder = new LinearGradientColorTable(factory.GetColor(0x464646), factory.GetColor(0x333333));
+
+            // Form border
+            table.Form.Active.BorderColors = new Color[] {
+                factory.GetColor(0x101111),
+                factory.GetColor(0x222222),
+                factory.GetColor(0x4B4B4B),
+                factory.GetColor(0x3C4251),
+                factory.GetColor(0x3C4251)};
+            table.Form.Inactive.BorderColors = new Color[] {
+                factory.GetColor(0x101111),
+                factory.GetColor(0x222222),
+                factory.GetColor(0x4B4B4B),
+                factory.GetColor(0x3C4251),
+                factory.GetColor(0x3C4251)};
+
+
+            // Form Caption Active
+            table.Form.Active.CaptionTopBackground = new LinearGradientColorTable(factory.GetColor(0x626C88), factory.GetColor(0x393F4D));
+            table.Form.Active.CaptionBottomBackground = new LinearGradientColorTable(factory.GetColor(0x151516), factory.GetColor(0x3C476F));
+            table.Form.Active.CaptionBottomBorder = new Color[] { factory.GetColor(0x646C89), factory.GetColor(0x222222) };
+            table.Form.Active.CaptionText = factory.GetColor(0xFFFFFF);
+            table.Form.Active.CaptionTextExtra = factory.GetColor(0x14C2DC);
+
+            // Form Caption Inactive
+            table.Form.Inactive.CaptionTopBackground = new LinearGradientColorTable(factory.GetColor(0x626C88), factory.GetColor(0x393F4D));
+            table.Form.Inactive.CaptionBottomBackground = new LinearGradientColorTable(factory.GetColor(0x393F4D), factory.GetColor(0x393F4D));
+            table.Form.Inactive.CaptionText = factory.GetColor(0xE1E1E1);
+            table.Form.Inactive.CaptionTextExtra = factory.GetColor(0xE1E1E1);
+
+            table.Form.BackColor = factory.GetColor(0xEEF3FA);
+            table.Form.TextColor = factory.GetColor(0x000000);
+            #endregion
+
+            #region Quick Access Toolbar Background
+            table.QuickAccessToolbar.Active.TopBackground = new LinearGradientColorTable(factory.GetColor(0x626C88), factory.GetColor(0x5A637C));
+            table.QuickAccessToolbar.Active.BottomBackground = new LinearGradientColorTable(factory.GetColor(0x5A637C), factory.GetColor(0x393F4D));
+            table.QuickAccessToolbar.Active.OutterBorderColor = factory.GetColor(Color.FromArgb(32, Color.White));
+            table.QuickAccessToolbar.Active.MiddleBorderColor = factory.GetColor(0x222222);
+            table.QuickAccessToolbar.Active.InnerBorderColor = Color.Empty;
+
+            table.QuickAccessToolbar.Inactive.TopBackground = new LinearGradientColorTable(factory.GetColor(0x626C88), factory.GetColor(0x5A637C));
+            table.QuickAccessToolbar.Inactive.BottomBackground = new LinearGradientColorTable(factory.GetColor(0x5A637C), factory.GetColor(0x393F4D));
+            table.QuickAccessToolbar.Inactive.OutterBorderColor = Color.Transparent;
+            table.QuickAccessToolbar.Inactive.MiddleBorderColor = factory.GetColor(0x222222);
+            table.QuickAccessToolbar.Inactive.InnerBorderColor = Color.Empty;
+
+            table.QuickAccessToolbar.Standalone.TopBackground = new LinearGradientColorTable();
+            table.QuickAccessToolbar.Standalone.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xFEFEFF), factory.GetColor(0xE5EAF5));
+            table.QuickAccessToolbar.Standalone.OutterBorderColor = factory.GetColor(0x474E56);
+            table.QuickAccessToolbar.Standalone.MiddleBorderColor = Color.Empty;
+            table.QuickAccessToolbar.Standalone.InnerBorderColor = factory.GetColor(0xCBCCCE);
+
+            table.QuickAccessToolbar.QatCustomizeMenuLabelBackground = factory.GetColor(0xD4DBED);
+            table.QuickAccessToolbar.QatCustomizeMenuLabelText = factory.GetColor(0x000000);
+
+            table.QuickAccessToolbar.Active.GlassBorder = new LinearGradientColorTable(factory.GetColor(Color.FromArgb(132, Color.Black)), Color.FromArgb(80, Color.Black));
+            table.QuickAccessToolbar.Inactive.GlassBorder = new LinearGradientColorTable(factory.GetColor(Color.FromArgb(132, Color.Black)), Color.FromArgb(80, Color.Black));
+            #endregion
+
+            #region Tab Colors
+            table.TabControl.Default = new Office2007TabItemStateColorTable();
+            table.TabControl.Default.TopBackground = new LinearGradientColorTable(factory.GetColor(0xF2F5FA), factory.GetColor(0xE5EAF5));
+            table.TabControl.Default.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xCFD7EB), factory.GetColor(0xECEEFC));
+            table.TabControl.Default.InnerBorder = factory.GetColor(0xFCFDFD);
+            table.TabControl.Default.OuterBorder = factory.GetColor(0x9196A2);
+            table.TabControl.Default.Text = factory.GetColor(0x000000);
+
+            table.TabControl.MouseOver = new Office2007TabItemStateColorTable();
+            table.TabControl.MouseOver.TopBackground = new LinearGradientColorTable(factory.GetColor(0xEDF3FC), factory.GetColor(0xC6DCF7));
+            table.TabControl.MouseOver.BottomBackground = new LinearGradientColorTable(factory.GetColor(0x99C6EE), factory.GetColor(0xD9E9F9));
+            table.TabControl.MouseOver.InnerBorder = factory.GetColor(0xFEFEFF);
+            table.TabControl.MouseOver.OuterBorder = factory.GetColor(0x9196A2);
+            table.TabControl.MouseOver.Text = factory.GetColor(0x000000);
+
+            table.TabControl.Selected = new Office2007TabItemStateColorTable();
+            //t.TabControl.Selected.TopBackground = new LinearGradientColorTable(factory.GetColor(0xFFD29B), factory.GetColor(0xFFBB6E));
+            //t.TabControl.Selected.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xFFAF44), factory.GetColor(0xFEDC75));
+            //t.TabControl.Selected.InnerBorder = factory.GetColor(0xCDB69C);
+            //t.TabControl.Selected.OuterBorder = factory.GetColor(0x95774A);
+            table.TabControl.Selected.TopBackground = new LinearGradientColorTable(factory.GetColor(0xFBFDFE), factory.GetColor(0xE7F5FB));
+            table.TabControl.Selected.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xCFE7FA), factory.GetColor(0xB9D1FA));
+            table.TabControl.Selected.InnerBorder = factory.GetColor(0xFCFEFF);
+            table.TabControl.Selected.OuterBorder = factory.GetColor(0x9196A2);
+            table.TabControl.Selected.Text = factory.GetColor(0x000000);
+
+            table.TabControl.TabBackground = new LinearGradientColorTable(factory.GetColor(0xFFFFFF), factory.GetColor(0xE3E8F4));
+            table.TabControl.TabPanelBackground = new LinearGradientColorTable(factory.GetColor(0xFFFFFF));
+            table.TabControl.TabPanelBorder = factory.GetColor(editBorderColor);
+            #endregion
+
+            #region CheckBoxItem
+            Office2007CheckBoxColorTable chk = table.CheckBoxItem;
+            chk.Default.CheckBackground = new LinearGradientColorTable(factory.GetColor(0xF4F4F4), Color.Empty);
+            chk.Default.CheckBorder = factory.GetColor(0x616161);
+            chk.Default.CheckInnerBackground = new LinearGradientColorTable(Color.FromArgb(192, factory.GetColor(0xA2ACB9)), Color.FromArgb(164, factory.GetColor(0xF6F6F6)));
+            chk.Default.CheckInnerBorder = factory.GetColor(0xA2ACB9);
+            chk.Default.CheckSign = new LinearGradientColorTable(factory.GetColor(0x4F687D), Color.Empty);
+            chk.Default.Text = factory.GetColor(0x000000);
+
+            chk.MouseOver.CheckBackground = new LinearGradientColorTable(factory.GetColor(0xF4F4F4), Color.Empty);
+            chk.MouseOver.CheckBorder = factory.GetColor(0x616161);
+            chk.MouseOver.CheckInnerBackground = new LinearGradientColorTable(factory.GetColor(0xAEE4FF), factory.GetColor(0xD0ECFC), 90);
+            chk.MouseOver.CheckInnerBorder = factory.GetColor(0xB3E4F9);
+            chk.MouseOver.CheckSign = new LinearGradientColorTable(factory.GetColor(0x4F687D), Color.Empty);
+            chk.MouseOver.Text = factory.GetColor(0x000000);
+
+            chk.Pressed.CheckBackground = new LinearGradientColorTable(factory.GetColor(0xE5ECF7), Color.Empty);
+            chk.Pressed.CheckBorder = factory.GetColor(0x616161);
+            chk.Pressed.CheckInnerBackground = new LinearGradientColorTable(Color.FromArgb(192, factory.GetColor(0x68B3DB)), Color.FromArgb(164, factory.GetColor(0xE5F4FC)));
+            chk.Pressed.CheckInnerBorder = factory.GetColor(0x2C628B);
+            chk.Pressed.CheckSign = new LinearGradientColorTable(factory.GetColor(0x4F687D), Color.Empty);
+            chk.Pressed.Text = factory.GetColor(0x000000);
+
+            chk.Disabled.CheckBackground = new LinearGradientColorTable(factory.GetColor(0xFFFFFF), Color.Empty);
+            chk.Disabled.CheckBorder = factory.GetColor(0xAEB1B5);
+            chk.Disabled.CheckInnerBackground = new LinearGradientColorTable(Color.FromArgb(192, factory.GetColor(0xE0E2E5)), Color.FromArgb(164, factory.GetColor(0xFBFBFB)));
+            chk.Disabled.CheckInnerBorder = factory.GetColor(0xE0E2E5);
+            chk.Disabled.CheckSign = new LinearGradientColorTable(factory.GetColor(0x8D8D8D), Color.Empty);
+            chk.Disabled.Text = factory.GetColor(0x8D8D8D);
+            #endregion
+
+            #region Scroll Bar
+            InitializeScrollBarColorTable(table, factory);
+            InitializeAppBlackScrollBarColorTable(table, factory);
+            #endregion
+
+            #region ProgressBarItem
+            Office2007ProgressBarColorTable pct = table.ProgressBarItem;
+            pct.BackgroundColors = new GradientColorTable(0x87898B, 0x979897);
+            pct.OuterBorder = factory.GetColor(0xCCCCCC);
+            pct.InnerBorder = factory.GetColor(0x252525);
+            pct.Chunk = new GradientColorTable(0x679720, 0xC2FF56, 0);
+            pct.ChunkOverlay = new GradientColorTable();
+            pct.ChunkOverlay.LinearGradientAngle = 90;
+            pct.ChunkOverlay.Colors.AddRange(new BackgroundColorBlend[] {
+                new BackgroundColorBlend(Color.FromArgb(164, factory.GetColor(0xEEFFD7)), 0f),
+                new BackgroundColorBlend(Color.FromArgb(128, factory.GetColor(0x8DB254)), .5f),
+                new BackgroundColorBlend(Color.FromArgb(64, factory.GetColor(0x69922B)), .5f),
+                new BackgroundColorBlend(Color.Transparent, 1f),
+            });
+            pct.ChunkShadow = new GradientColorTable(0x858585, 0x909190, 0);
+
+            // Paused
+            pct = table.ProgressBarItemPaused;
+            pct.BackgroundColors = new GradientColorTable(0x87898B, 0x979897);
+            pct.OuterBorder = factory.GetColor(0xCCCCCC);
+            pct.InnerBorder = factory.GetColor(0x252525);
+            pct.Chunk = new GradientColorTable(0xAEA700, 0xFFFDCD, 0);
+            pct.ChunkOverlay = new GradientColorTable();
+            pct.ChunkOverlay.LinearGradientAngle = 90;
+            pct.ChunkOverlay.Colors.AddRange(new BackgroundColorBlend[] {
+                new BackgroundColorBlend(Color.FromArgb(192, factory.GetColor(0xFFFBA3)), 0f),
+                new BackgroundColorBlend(Color.FromArgb(128, factory.GetColor(0xD2CA00)), .5f),
+                new BackgroundColorBlend(Color.FromArgb(64, factory.GetColor(0xFEF400)), .5f),
+                new BackgroundColorBlend(Color.Transparent, 1f),
+            });
+            pct.ChunkShadow = new GradientColorTable(0x858585, 0x909190, 0);
+
+            // Error
+            pct = table.ProgressBarItemError;
+            pct.BackgroundColors = new GradientColorTable(0x87898B, 0x979897);
+            pct.OuterBorder = factory.GetColor(0xCCCCCC);
+            pct.InnerBorder = factory.GetColor(0x252525);
+            pct.Chunk = new GradientColorTable(0xD20000, 0xFFCDCD, 0);
+            pct.ChunkOverlay = new GradientColorTable();
+            pct.ChunkOverlay.LinearGradientAngle = 90;
+            pct.ChunkOverlay.Colors.AddRange(new BackgroundColorBlend[] {
+                new BackgroundColorBlend(Color.FromArgb(192, factory.GetColor(0xFF8F8F)), 0f),
+                new BackgroundColorBlend(Color.FromArgb(128, factory.GetColor(0xD20000)), .5f),
+                new BackgroundColorBlend(Color.FromArgb(64, factory.GetColor(0xFE0000)), .5f),
+                new BackgroundColorBlend(Color.Transparent, 1f),
+            });
+            pct.ChunkShadow = new GradientColorTable(0x858585, 0x909190, 0);
+            #endregion
+
+            #region Gallery
+            Office2007GalleryColorTable gallery = table.Gallery;
+            gallery.GroupLabelBackground = factory.GetColor(0xD4DBED);
+            gallery.GroupLabelText = factory.GetColor(0x000000);
+            gallery.GroupLabelBorder = factory.GetColor(0xC5C5C5);
+            #endregion
+
+            #region ListViewEx
+            table.ListViewEx.Border = factory.GetColor(editBorderColor);
+            table.ListViewEx.ColumnBackground = new LinearGradientColorTable(factory.GetColor(0xFFFFFF), factory.GetColor(0xF1F2F4));
+            table.ListViewEx.ColumnSeparator = factory.GetColor(0xD5D5D5);
+            table.ListViewEx.ColumnForeColor = factory.GetColor(0x000000);
+            table.ListViewEx.SelectionBackground = new LinearGradientColorTable(factory.GetColor(0xF1F8FD), factory.GetColor(0xD5EFFC));
+            table.ListViewEx.SelectionBorder = factory.GetColor(0x99DEFD);
+            #endregion
+
+            #region Navigation Pane
+            table.NavigationPane.ButtonBackground = new GradientColorTable();
+            table.NavigationPane.ButtonBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xF9F9F9), 0));
+            table.NavigationPane.ButtonBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xDADADC), .4f));
+            table.NavigationPane.ButtonBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xCACACC), .4f));
+            table.NavigationPane.ButtonBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xF4F4F6), 1));
+            #endregion
+
+            #region SuperTooltip
+            table.SuperTooltip.BackgroundColors = new LinearGradientColorTable(factory.GetColor(0xFFFFFF), factory.GetColor(0xEDF6FF));
+            table.SuperTooltip.TextColor = factory.GetColor(0x000000);
+            #endregion
+
+            #region Slider
+            Office2007SliderColorTable sl = table.Slider;
+            sl.Default.LabelColor = factory.GetColor(0xFFFFFF);
+            sl.Default.SliderLabelColor = factory.GetColor(0x000000);
+            sl.Default.PartBackground = new GradientColorTable();
+            sl.Default.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFFFFFF), 0));
+            sl.Default.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xEFEFEF), .15f));
+            sl.Default.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xBEC2C3), .5f));
+            sl.Default.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0x6C7178), .5f));
+            sl.Default.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xDCDCDE), .85f));
+            sl.Default.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFFFFFF), 1f));
+            sl.Default.PartBorderColor = factory.GetColor(0x393F46);
+            sl.Default.PartBorderLightColor = Color.FromArgb(28, factory.GetColor(0xFFFFFF));
+            sl.Default.PartForeColor = factory.GetColor(0x5B636C);
+            sl.Default.PartForeLightColor = Color.FromArgb(168, factory.GetColor(0xEAEAEA));
+            sl.Default.TrackLineColor = factory.GetColor(0x252525);
+            sl.Default.TrackLineLightColor = factory.GetColor(0xCCCCCC);
+
+            sl.MouseOver.LabelColor = factory.GetColor(0xFFFFFF);
+            sl.MouseOver.SliderLabelColor = factory.GetColor(0x000000);
+            sl.MouseOver.PartBackground = new GradientColorTable();
+            sl.MouseOver.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFFFFFF), 0));
+            sl.MouseOver.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xF1F8FD), .1f));
+            sl.MouseOver.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0x99DEFD), .9f));
+            sl.MouseOver.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xE7F5FD), 1f));
+            sl.MouseOver.PartBorderColor = factory.GetColor(0x2D2D2D);
+            sl.MouseOver.PartBorderLightColor = Color.FromArgb(28, factory.GetColor(0xFFFFFF));
+            sl.MouseOver.PartForeColor = factory.GetColor(0x676249);
+            sl.MouseOver.PartForeLightColor = Color.FromArgb(168, factory.GetColor(0xFFF4D4));
+            sl.MouseOver.TrackLineColor = factory.GetColor(0x252525);
+            sl.MouseOver.TrackLineLightColor = factory.GetColor(0xCCCCCC);
+
+            sl.Pressed.LabelColor = factory.GetColor(0xFFFFFF);
+            sl.Pressed.SliderLabelColor = factory.GetColor(0x000000);
+            sl.Pressed.PartBackground = new GradientColorTable();
+            sl.Pressed.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xE5F4FC), 0));
+            sl.Pressed.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xC4E5F6), .5f));
+            sl.Pressed.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0x98D1EF), .5f));
+            sl.Pressed.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0x68B1D8), 1f));
+            sl.Pressed.PartBorderColor = factory.GetColor(0x2D2D2D);
+            sl.Pressed.PartBorderLightColor = Color.FromArgb(28, factory.GetColor(0xFFFFFF));
+            sl.Pressed.PartForeColor = factory.GetColor(0x675343);
+            sl.Pressed.PartForeLightColor = Color.FromArgb(32, factory.GetColor(0xFFDCBB));
+            sl.Pressed.TrackLineColor = factory.GetColor(0x252525);
+            sl.Pressed.TrackLineLightColor = factory.GetColor(0xCCCCCC);
+
+            ColorBlendFactory df = new ColorBlendFactory(ColorScheme.GetColor(0xCFCFCF));
+            sl.Disabled.LabelColor = factory.GetColor(0x8D8D8D);
+            sl.Default.SliderLabelColor = factory.GetColor(0x8d8d8d);
+            sl.Disabled.PartBackground = new GradientColorTable();
+            foreach (BackgroundColorBlend b in sl.Default.PartBackground.Colors)
+                sl.Disabled.PartBackground.Colors.Add(new BackgroundColorBlend(df.GetColor(b.Color), b.Position));
+            sl.Disabled.PartBorderColor = df.GetColor(sl.Default.PartBorderColor);
+            sl.Disabled.PartBorderLightColor = df.GetColor(sl.Default.PartBorderLightColor);
+            sl.Disabled.PartForeColor = df.GetColor(sl.Default.PartForeColor);
+            sl.Disabled.PartForeLightColor = df.GetColor(sl.Default.PartForeLightColor);
+            sl.Disabled.TrackLineColor = df.GetColor(sl.Default.TrackLineColor);
+            sl.Disabled.TrackLineLightColor = df.GetColor(sl.Default.TrackLineLightColor);
+            #endregion
+
+            #region RangeSlider
+            Office2007ColorTable.InitRangeSlider(table, factory);
+            #endregion
+
+            #region DataGridView
+            table.DataGridView.ColumnHeaderNormalBorder = factory.GetColor(0xB6B6B6);
+            table.DataGridView.ColumnHeaderNormalBackground = new LinearGradientColorTable(factory.GetColor(0xF8F8F8), factory.GetColor(0xDEDEDE), 90);
+            table.DataGridView.ColumnHeaderSelectedBackground = new LinearGradientColorTable(factory.GetColor(0xF9D99F), factory.GetColor(0xF1C15F), 90);
+            table.DataGridView.ColumnHeaderSelectedBorder = factory.GetColor(0xF29536);
+            table.DataGridView.ColumnHeaderSelectedMouseOverBackground = new LinearGradientColorTable(factory.GetColor(0xFFD58D), factory.GetColor(0xF2923A), 90);
+            table.DataGridView.ColumnHeaderSelectedMouseOverBorder = factory.GetColor(0xF29536);
+            table.DataGridView.ColumnHeaderMouseOverBackground = new LinearGradientColorTable(factory.GetColor(0xE0E0E0), factory.GetColor(0xC3C3C3), 90);
+            table.DataGridView.ColumnHeaderMouseOverBorder = factory.GetColor(0xB6B6B6);
+            table.DataGridView.ColumnHeaderPressedBackground = new LinearGradientColorTable(factory.GetColor(0xE0E0E0), factory.GetColor(0xC3C3C3), 90);
+            table.DataGridView.ColumnHeaderPressedBorder = factory.GetColor(0xFFFFFF);
+
+            table.DataGridView.RowNormalBackground = new LinearGradientColorTable(factory.GetColor(0xEDEDED));
+            table.DataGridView.RowNormalBorder = factory.GetColor(0xB6B6B6);
+            table.DataGridView.RowSelectedBackground = new LinearGradientColorTable(factory.GetColor(0xF6FBFD), factory.GetColor(0xD5EFFC));
+            table.DataGridView.RowSelectedBorder = factory.GetColor(0x99DEFD);
+            table.DataGridView.RowSelectedMouseOverBackground = new LinearGradientColorTable(factory.GetColor(0xE8F6FD), factory.GetColor(0xC4E8FA));
+            table.DataGridView.RowSelectedMouseOverBorder = factory.GetColor(0xB6E6FB);
+            table.DataGridView.RowMouseOverBackground = new LinearGradientColorTable(factory.GetColor(0xF5FAFD), factory.GetColor(0xE8F5FD));
+            table.DataGridView.RowMouseOverBorder = factory.GetColor(0xD8F0FA);
+            table.DataGridView.RowPressedBackground = new LinearGradientColorTable(factory.GetColor(0xBCE4F9), factory.GetColor(0x8AD1F5));
+            table.DataGridView.RowPressedBorder = factory.GetColor(0x4E91AE);
+
+            table.DataGridView.GridColor = factory.GetColor(0xD0D7E5);
+
+            table.DataGridView.SelectorBackground = new LinearGradientColorTable(factory.GetColor(0xC9C9C9));
+            table.DataGridView.SelectorBorder = factory.GetColor(0xB6B6B6);
+            table.DataGridView.SelectorBorderDark = factory.GetColor(0xCCCCCC);
+            table.DataGridView.SelectorBorderLight = factory.GetColor(0xEBEBEB);
+            table.DataGridView.SelectorSign = new LinearGradientColorTable(factory.GetColor(0x7D7D7D), factory.GetColor(0x676767));
+
+            table.DataGridView.SelectorMouseOverBackground = new LinearGradientColorTable(factory.GetColor(0xADADAD), factory.GetColor(0x9F9F9F));
+            table.DataGridView.SelectorMouseOverBorder = factory.GetColor(0xB6B6B6);
+            table.DataGridView.SelectorMouseOverBorderDark = factory.GetColor(0xCCCCCC);
+            table.DataGridView.SelectorMouseOverBorderLight = factory.GetColor(0xEBEBEB);
+            table.DataGridView.SelectorMouseOverSign = new LinearGradientColorTable(factory.GetColor(0x7D7D7D), factory.GetColor(0x676767));
+            #endregion
+
+            #region AdvTree
+#if !NOTREE
+            table.AdvTree = new DevComponents.AdvTree.Display.TreeColorTable();
+            DevComponents.AdvTree.Display.ColorTableInitializer.InitOffice2007VistaGlass(table.AdvTree, factory);
+#endif
+            #endregion
+
+            #region CrumbBar
+            table.CrumbBarItemView = CrumbBar.GetCrumbBarVistaColorTable(factory);
+            #endregion
+
+            #region ElementStyle Classes
+            table.StyleClasses.Clear();
+            ElementStyle style = new ElementStyle();
+            style.Class = ElementStyleClassKeys.RibbonGalleryContainerKey;
+            style.BorderColor = factory.GetColor(0x5C6672);
+            style.Border = eStyleBorderType.Solid;
+            style.BorderWidth = 1;
+            style.CornerDiameter = 2;
+            style.CornerType = eCornerType.Rounded;
+            style.BackColor = factory.GetColor(0xEAF4FE);
+            table.StyleClasses.Add(style.Class, style);
+            // FileMenuContainer
+            style = Office2007ColorTableFactory.GetFileMenuContainerStyle(table);
+            table.StyleClasses.Add(style.Class, style);
+            // Two Column File Menu Container
+            style = Office2007ColorTableFactory.GetTwoColumnMenuContainerStyle(table);
+            table.StyleClasses.Add(style.Class, style);
+            // Column one File Menu Container
+            style = Office2007ColorTableFactory.GetMenuColumnOneContainerStyle(table);
+            table.StyleClasses.Add(style.Class, style);
+            // Column two File Menu Container
+            style = Office2007ColorTableFactory.GetMenuColumnTwoContainerStyle(table);
+            table.StyleClasses.Add(style.Class, style);
+            // Bottom File Menu Container
+            style = Office2007ColorTableFactory.GetMenuBottomContainer(table);
+            table.StyleClasses.Add(style.Class, style);
+            // TextBox border
+            style = Office2007ColorTableFactory.GetTextBoxStyle(factory.GetColor(editBorderColor));
+            table.StyleClasses.Add(style.Class, style);
+            // RichTextBox border
+            style = Office2007ColorTableFactory.GetRichTextBoxStyle(factory.GetColor(editBorderColor));
+            table.StyleClasses.Add(style.Class, style);
+            // ItemPanel
+            style = Office2007ColorTableFactory.GetItemPanelStyle(factory.GetColor(editBorderColor));
+            table.StyleClasses.Add(style.Class, style);
+            // ListBoxAdv
+            style = Office2007ColorTableFactory.GetListBoxAdvStyle(factory.GetColor(editBorderColor));
+            table.StyleClasses.Add(style.Class, style);
+            // DateTimeInput background
+            style = Office2007ColorTableFactory.GetDateTimeInputBackgroundStyle(factory.GetColor(editBorderColor), SystemColors.Window);
+            table.StyleClasses.Add(style.Class, style);
+            // Ribbon Client Panel
+            style = Office2007ColorTableFactory.GetRibbonClientPanelStyle(factory, eOffice2007ColorScheme.Black);
+            table.StyleClasses.Add(style.Class, style);
+            // ListView Border
+            style = Office2007ColorTableFactory.GetListViewBorderStyle(table.ListViewEx);
+            table.StyleClasses.Add(style.Class, style);
+            style = GetStatusBarAltStyle(table.Bar);
+            table.StyleClasses.Add(style.Class, style);
+
+#if !NOTREE
+            // Tree Border/Background
+            style = Office2007ColorTableFactory.GetAdvTreeStyle(factory.GetColor(editBorderColor), Color.Empty);
+            table.StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetAdvTreeColumnsHeaderStyle(factory.GetColor(0xF8F8F8), factory.GetColor(0xDEDEDE), factory.GetColor(0xB6B6B6));
+            table.StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetAdvTreeNodesColumnsHeaderStyle(factory.GetColor(0xF8F8F8), factory.GetColor(0xDEDEDE), factory.GetColor(0xB6B6B6));
+            table.StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetAdvTreeColumnStyle(factory.GetColor(0x000000));
+            table.StyleClasses.Add(style.Class, style);
+#endif
+            // CrumbBar
+            style = Office2007ColorTableFactory.GetCrumbBarBackgroundStyle(factory.GetColor(Color.White), factory.GetColor("FF333333"), factory.GetColor("FF252525"));
+            table.StyleClasses.Add(style.Class, style);
+            // DataGridView border
+            style = Office2007ColorTableFactory.GetDataGridViewStyle();
+            table.StyleClasses.Add(style.Class, style);
+            // DataGridViewDateTime border
+            style = Office2007ColorTableFactory.GetDataGridViewDateTimeStyle();
+            table.StyleClasses.Add(style.Class, style);
+            // DataGridViewNumeric border
+            style = Office2007ColorTableFactory.GetDataGridViewNumericStyle();
+            table.StyleClasses.Add(style.Class, style);
+            // DataGridViewIpAddress border
+            style = Office2007ColorTableFactory.GetDataGridViewIpAddressStyle();
+            table.StyleClasses.Add(style.Class, style);
+
+            // Slide-out Button
+            style = Office2007ColorTableFactory.GetSlideOutButtonStyle(table.CheckBoxItem.Default.CheckBorder);
+            table.StyleClasses.Add(style.Class, style);
+            // MetroTilePanel
+            style = Office2007ColorTableFactory.GetMetroTilePanelStyle(factory.GetColor(Color.White));
+            table.StyleClasses.Add(style.Class, style);
+            // MetroTileGroup
+            style = Office2007ColorTableFactory.GetMetroTileGroupStyle(factory.GetColor(Color.DarkGray));
+            table.StyleClasses.Add(style.Class, style);
+            // MonthCalendarAdv
+            style = Office2007ColorTableFactory.GetMonthCalendarStyle(SystemColors.Window);
+            table.StyleClasses.Add(style.Class, style);
+            // ProgressSteps control
+            style = Office2007ColorTableFactory.GetProgressStepsStyle(table);
+            table.StyleClasses.Add(style.Class, style);
+            // SideNavStrip
+            style = Office2007ColorTableFactory.GetSideNavStripStyle(factory.GetColor(0x3C4251));
+            table.StyleClasses.Add(style.Class, style);
+            // TabFormPanel
+            style = Office2007ColorTableFactory.GetTabFormPanelStyle(factory.GetColor(0xF5F6F7));
+            table.StyleClasses.Add(style.Class, style);
+
+            // Toolbox Control
+            style = Office2007ColorTableFactory.GetToolboxControlStyle(factory.GetColor(table.LegacyColors.PanelBorder), Color.Empty);
+            table.StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetToolboxGroupTitle(factory.GetColor(0x000000));
+            table.StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetToolboxGroupTitleMouseOver(factory.GetColor(0x000000), factory.GetColor(0xB5E4FF));
+            table.StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetToolboxGroupExpandedTitle(factory.GetColor(0xFFFFFF), factory.GetColor(0x616C76));
+            table.StyleClasses.Add(style.Class, style);
+            #endregion
+
+            #region SideBar
+            table.SideBar.Background = new LinearGradientColorTable(factory.GetColor(Color.White));
+            table.SideBar.Border = factory.GetColor(editBorderColor);
+            table.SideBar.SideBarPanelItemText = factory.GetColor(Color.Black);
+            table.SideBar.SideBarPanelItemDefault = new GradientColorTable();
+            table.SideBar.SideBarPanelItemDefault.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xF8F8F9), 0));
+            table.SideBar.SideBarPanelItemDefault.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xDFE2E4), .4f));
+            table.SideBar.SideBarPanelItemDefault.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xC7CBD1), .4f));
+            table.SideBar.SideBarPanelItemDefault.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xDBDEE2), 1));
+            // Expanded
+            table.SideBar.SideBarPanelItemExpanded = new GradientColorTable();
+            table.SideBar.SideBarPanelItemExpanded.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xE3F7FF), 0));
+            table.SideBar.SideBarPanelItemExpanded.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xE3F7FF), .4f));
+            table.SideBar.SideBarPanelItemExpanded.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xBDEDFF), .4f));
+            table.SideBar.SideBarPanelItemExpanded.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xB7E7FB), 1));
+            // MouseOver
+            table.SideBar.SideBarPanelItemMouseOver = new GradientColorTable();
+            table.SideBar.SideBarPanelItemMouseOver.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xE5F3FA), 0));
+            table.SideBar.SideBarPanelItemMouseOver.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xD0ECFC), 1));
+            // Pressed
+            table.SideBar.SideBarPanelItemPressed = new GradientColorTable();
+            table.SideBar.SideBarPanelItemPressed.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xE5F4FC), 0));
+            table.SideBar.SideBarPanelItemPressed.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xC4E5F6), .4f));
+            table.SideBar.SideBarPanelItemPressed.Colors.Add(new BackgroundColorBlend(factory.GetColor(0x98D1EF), .4f));
+            table.SideBar.SideBarPanelItemPressed.Colors.Add(new BackgroundColorBlend(factory.GetColor(0x68B3DB), 1));
+            #endregion
+
+            #region WarningBox
+            table.WarningBox.BackColor = factory.GetColor(Color.FromArgb(64, 64, 64));
+            table.WarningBox.WarningBorderColor = factory.GetColor(Color.FromArgb(86, 86, 86));
+            table.WarningBox.WarningBackColor1 = factory.GetColor(Color.FromArgb(255, 255, 255));
+            table.WarningBox.WarningBackColor2 = factory.GetColor(Color.FromArgb(234, 234, 234));
+            #endregion
+
+            #region CalendarView
+
+            #region WeekDayViewColors
+
+            table.CalendarView.WeekDayViewColors = new ColorDef[]
+            {
+                new ColorDef(factory.GetColor(0x9199A4)),           // DayViewBorder
+                new ColorDef(factory.GetColor(0x000000)),           // DayHeaderForeground
+
+                new ColorDef(new Color[] {factory.GetColor(0xDCDFE2), factory.GetColor(0xD3D6DA), factory.GetColor(0xB4BAC1), factory.GetColor(0xCBCED4)},
+                new float[] {0f, .55f, .58f, 1f}, 90f),             // DayHeaderBackground
+
+                new ColorDef(factory.GetColor(0xB0B6BE)),           // DayHeaderBorder
+
+                new ColorDef(factory.GetColor(0xFFFFFF)),           // DayWorkHoursBackground
+                new ColorDef(factory.GetColor(0xC7CBD1)),           // DayAllDayEventBackground
+                new ColorDef(factory.GetColor(0xE8EAEC)),           // DayOffWorkHoursBackground
+
+                new ColorDef(factory.GetColor(0xC7CBD1)),           // DayHourBorder
+                new ColorDef(factory.GetColor(0xE8EAEC)),           // DayHalfHourBorder
+
+                new ColorDef(factory.GetColor(0x4C535C)),           // SelectionBackground
+
+                new ColorDef(factory.GetColor(0x6197B1)),           // OwnerTabBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xBCD2DE), factory.GetColor(0x90B6C8)},    // OwnerTabBackground
+                new float[] {0f, 1f}, 90f),
+
+                new ColorDef(factory.GetColor(0x000000)),           // OwnerTabForeground
+                new ColorDef(factory.GetColor(0x90B6C8)),           // OwnerTabContentBackground
+                new ColorDef(factory.GetColor(0x000000)),           // OwnerTabSelectedForeground
+                new ColorDef(factory.GetColor(0xFFFFFF)),           // OwnerTabSelectionBackground
+
+                new ColorDef(factory.GetColor(0xF5F5F5)),           // CondensedViewBackground
+
+                new ColorDef(factory.GetColor(0xEB8900)),           // NowDayViewBorder
+                new ColorDef(factory.GetColor(0x000000)),           // NowDayHeaderForeground - 0x15428B
+
+                new ColorDef(new Color[] {factory.GetColor(0xFFED79), factory.GetColor(0xFFD86B), factory.GetColor(0xFFBB00), factory.GetColor(0xFFEA77)},
+                new float[] {0f, .55f ,58f, 1f}, 90f),              // NowDayHeaderBackground
+               
+                new ColorDef(new Color[] {factory.GetColor(0xFFED79), factory.GetColor(0xFFD86B), factory.GetColor(0xFFBB00), factory.GetColor(0xFFEA77)},
+                new float[] {0f, .55f ,58f, 1f}, 90f),              // TimeIndicator
+
+                new ColorDef(factory.GetColor(0xEB8900)),           // TimeIndicatorBorder
+            };
+
+            #endregion
+
+            #region HourRulerColors
+
+            table.CalendarView.TimeRulerColors = new ColorDef[]
+            {
+                new ColorDef(factory.GetColor(0xF0F1F2)),           // TimeRulerBackground
+                new ColorDef(factory.GetColor(0x333333)),           // TimeRulerForeground
+                new ColorDef(factory.GetColor(0x333333)),           // TimeRulerBorder
+                new ColorDef(factory.GetColor(0x333333)),           // TimeRulerTickBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xFFED79), factory.GetColor(0xFFD86B), factory.GetColor(0xFFBB00), factory.GetColor(0xFFEA77)},
+                new float[] {0f, .55f ,58f, 1f}, 90f),              // TimeRulerIndicator
+
+                new ColorDef(factory.GetColor(0xEB8900)),           // TimeRulerIndicatorBorder
+            };
+
+            #endregion
+
+            #region MonthViewColors
+
+            table.CalendarView.MonthViewColors = new ColorDef[]
+            {
+                new ColorDef(factory.GetColor(0x6197B1)),           // DayOfWeekHeaderBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xE5EEF2), factory.GetColor(0xD8E5EB), factory.GetColor(0xC3D7E1), factory.GetColor(0xD2E2E9)}, 
+                new float[] {0, .55f, .58f, 1}),                    // DayOfWeekHeaderBackground
+
+                new ColorDef(factory.GetColor(0x446A96)),           // DayOfWeekHeaderForeground
+                new ColorDef(factory.GetColor(0x6197B1)),           // SideBarBorder
+
+                new ColorDef(new Color[] { factory.GetColor(0xE5EEF2), factory.GetColor(0xD8E5EB), factory.GetColor(0xC3D7E1), factory.GetColor(0xD2E2E9) },
+                new float[] { 0, .55f, .58f, 1 }, 0),               // SideBarBackground
+                
+                new ColorDef(factory.GetColor(0x000000)),           // SideBarForeground
+                new ColorDef(factory.GetColor(0x446A7C)),           // DayHeaderBorder
+
+                new ColorDef(new Color[] { factory.GetColor(0xE5EEF2), factory.GetColor(0xD8E5EB), factory.GetColor(0xC3D7E1), factory.GetColor(0xD2E2E9) },
+                new float[] { 0, .55f, .58f, 1 }),                  // DayHeaderBackground
+                
+                new ColorDef(factory.GetColor(0x000000)),           // DayHeaderForeground
+                new ColorDef(factory.GetColor(0x6197B1)),           // DayContentBorder
+                new ColorDef(factory.GetColor(0xE7EFF3)),           // DayContentSelectionBackground
+                new ColorDef(factory.GetColor(0xFFFFFF)),           // DayContentActiveDayBackground
+                new ColorDef(factory.GetColor(0xA8C5D4)),           // DayContentInactiveDayBackground
+
+                new ColorDef(factory.GetColor(0x6197B1)),           // OwnerTabBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xBCD2DE), factory.GetColor(0x90B6C8)},    // OwnerTabBackground
+                new float[] {0f, 1f}, 90f),
+
+                new ColorDef(factory.GetColor(0x000000)),           // OwnerTabForeground
+                new ColorDef(factory.GetColor(0x90B6C8)),           // OwnerTabContentBackground
+                new ColorDef(factory.GetColor(0x000000)),           // OwnerTabSelectedForeground
+                new ColorDef(factory.GetColor(0xFFFFFF)),           // OwnerTabSelectionBackground
+ 
+                new ColorDef(factory.GetColor(0xEB8900)),           // NowDayViewBorder
+                new ColorDef(factory.GetColor(0x000000)),           // NowDayHeaderForeground - 0x15428B
+
+                new ColorDef(new Color[] {factory.GetColor(0xFFED79), factory.GetColor(0xFFD86B), factory.GetColor(0xFFBB00), factory.GetColor(0xFFEA77)},
+                new float[] {0f, .55f ,58f, 1f}, 90f),              // NowDayHeaderBackground
+
+                new ColorDef(factory.GetColor(0x000000)),           // ContentLinkForeground - DayHeaderForeground
+                new ColorDef(factory.GetColor(0xFFFFFF)),           // ContentLinkBackground - DayContentActiveDayBackground
+           };
+
+            #endregion
+
+            #region AppointmentColors
+
+            table.CalendarView.AppointmentColors = new ColorDef[]
+            {
+                new ColorDef(factory.GetColor(0x4B71A2)),           // DefaultBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xFDFEFF), factory.GetColor(0xC1D3EA)},
+                             new float[] {0f, 1f}, 90f),            // DefaultBackground
+
+                new ColorDef(factory.GetColor(0x28518E)),           // BlueBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xB1C5EC), factory.GetColor(0x759DDA)}, 
+                             new float[] {0f, 1f}, 90f),            // BlueBackground
+
+                new ColorDef(factory.GetColor(0x2C6524)),           // GreenBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xC2E8BC), factory.GetColor(0x84D17B)},
+                             new float[] {0f, 1f}, 90f),            // GreenBackground
+
+                new ColorDef(factory.GetColor(0x8B3E0A)),           // OrangeBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xF9C7A0), factory.GetColor(0xF49758)},
+                             new float[] {0f, 1f}, 90f),            // OrangeBackground
+
+                new ColorDef(factory.GetColor(0x3E2771)),           // PurpleBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xC5B5E6), factory.GetColor(0x957BD2)},
+                             new float[] {0f, 1f}, 90f),            // PurpleBackground
+
+                new ColorDef(factory.GetColor(0x86171C)),           // RedBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xF1AAAC), factory.GetColor(0xE5676E)},
+                             new float[] {0f, 1f}, 90f),            // RedBackground
+
+                new ColorDef(factory.GetColor(0x7C7814)),           // YellowBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xFFFCAA), factory.GetColor(0xFFF958)},
+                             new float[] {0f, 1f}, 90f),            // YellowBackground
+
+                new ColorDef(factory.GetColor(-1)),                 // BusyTimeMarker
+                new ColorDef(factory.GetColor(0xFFFFFF)),           // FreeTimeMarker
+                new ColorDef(factory.GetColor(0x800080))            // OutOfOfficeTimeMarker
+            };
+
+            #endregion
+
+            #endregion
+
+            #region SuperTab
+
+            #region SuperTab
+
+            table.SuperTab.Background = new SuperTabLinearGradientColorTable(
+                factory.GetColor(0xFFFFFF), factory.GetColor(0xE3E8F4));
+
+            table.SuperTab.InnerBorder = factory.GetColor(0xFCFEFF);
+            table.SuperTab.OuterBorder = factory.GetColor(0x9196A2);
+
+            table.SuperTab.ControlBoxDefault.Image = factory.GetColor(0xFF, 0x000000);
+
+            table.SuperTab.ControlBoxMouseOver.Background = factory.GetColor(0xFFE7A2);
+            table.SuperTab.ControlBoxMouseOver.Border = factory.GetColor(0xFFBD69);
+            table.SuperTab.ControlBoxMouseOver.Image = factory.GetColor(0xFF, 0x000000);
+
+            table.SuperTab.ControlBoxPressed.Background = factory.GetColor(0xFB8C3C);
+            table.SuperTab.ControlBoxPressed.Border = factory.GetColor(0xFFBD69);
+            table.SuperTab.ControlBoxPressed.Image = factory.GetColor(0xFF, 0x000000);
+
+            table.SuperTab.InsertMarker = factory.GetColor(0xFF, 0x000080);
+
+            #endregion
+
+            #region SuperTabItem
+
+            // Top Default
+
+            table.SuperTabItem.Default.Normal.Background = new SuperTabLinearGradientColorTable(
+                new Color[] { factory.GetColor(0xF2F5FA), factory.GetColor(0xE5EAF5), factory.GetColor(0xCFD7EB), factory.GetColor(0xECEEFC) },
+                new float[] { 0, .5f, .5f, 1 });
+
+            table.SuperTabItem.Default.Normal.InnerBorder = factory.GetColor(0xFCFDFD);
+            table.SuperTabItem.Default.Normal.OuterBorder = factory.GetColor(0x9196A2);
+            table.SuperTabItem.Default.Normal.Text = factory.GetColor(0x000000);
+            table.SuperTabItem.Default.Normal.CloseMarker = factory.GetColor(0x406F9F);
+
+            // Disabled
+            table.SuperTabItem.Default.Disabled.Text = factory.GetColor(0x8D8D8D);
+            table.SuperTabItem.Default.Disabled.Background.AdaptiveGradient = false;
+            table.SuperTabItem.Default.Disabled.CloseMarker = factory.GetColor(0x8D8D8D);
+
+            // Top Selected
+
+            table.SuperTabItem.Default.Selected.Background = new SuperTabLinearGradientColorTable(
+                new Color[] { factory.GetColor(0xFBFDFE), factory.GetColor(0xE7F5FB), factory.GetColor(0xCFE7FA), factory.GetColor(0xB9D1FA) },
+                new float[] { 0, .5f, .5f, 1 });
+
+            table.SuperTabItem.Default.Selected.InnerBorder = factory.GetColor(0xFCFEFF);
+            table.SuperTabItem.Default.Selected.OuterBorder = factory.GetColor(0x9196A2);
+            table.SuperTabItem.Default.Selected.Text = factory.GetColor(0x000000);
+            table.SuperTabItem.Default.Selected.CloseMarker = factory.GetColor(0x406F9F);
+
+            // Top SelectedMouseOver
+
+            table.SuperTabItem.Default.SelectedMouseOver.Background = new SuperTabLinearGradientColorTable(
+                new Color[] { factory.GetColor(0xEDF3FC), factory.GetColor(0xC6DCF7), factory.GetColor(0x99C6EE), factory.GetColor(0xD9E9F9) },
+                new float[] { 0, .5f, .5f, 1 });
+
+            table.SuperTabItem.Default.SelectedMouseOver.InnerBorder = factory.GetColor(0xFEFEFF);
+            table.SuperTabItem.Default.SelectedMouseOver.OuterBorder = factory.GetColor(0x9196A2);
+            table.SuperTabItem.Default.SelectedMouseOver.Text = factory.GetColor(0x000000);
+            table.SuperTabItem.Default.SelectedMouseOver.CloseMarker = factory.GetColor(0x406F9F);
+
+            // Top MouseOver
+
+            table.SuperTabItem.Default.MouseOver.Background = new SuperTabLinearGradientColorTable(
+                new Color[] { factory.GetColor(0xEDF3FC), factory.GetColor(0xC6DCF7), factory.GetColor(0x99C6EE), factory.GetColor(0xD9E9F9) },
+                new float[] { 0, .5f, .5f, 1 });
+
+            table.SuperTabItem.Default.MouseOver.InnerBorder = factory.GetColor(0xFEFEFF);
+            table.SuperTabItem.Default.MouseOver.OuterBorder = factory.GetColor(0x9196A2);
+            table.SuperTabItem.Default.MouseOver.Text = factory.GetColor(0x000000);
+            table.SuperTabItem.Default.MouseOver.CloseMarker = factory.GetColor(0x406F9F);
+
+            // Left, Bottom, Right
+
+            table.SuperTabItem.Left = table.SuperTabItem.Default;
+            table.SuperTabItem.Bottom = table.SuperTabItem.Default;
+            table.SuperTabItem.Right = table.SuperTabItem.Default;
+
+            #endregion
+
+            #region SuperTabPanel
+
+            table.SuperTabPanel.Default.Background = new SuperTabLinearGradientColorTable(factory.GetColor(0xFFFFFF));
+            table.SuperTabPanel.Default.InnerBorder = factory.GetColor(0xFCFEFF);
+            table.SuperTabPanel.Default.OuterBorder = factory.GetColor(editBorderColor);
+
+            table.SuperTabPanel.Left = table.SuperTabPanel.Default;
+            table.SuperTabPanel.Bottom = table.SuperTabPanel.Default;
+            table.SuperTabPanel.Right = table.SuperTabPanel.Default;
+
+            #endregion
+
+            #endregion
+
+            #region Backstage
+
+            #region Backstage
+            SuperTabStyleColorFactory.GetOffice2007BackstageVistaGlassColorTable(table.Backstage, factory);
+            #endregion
+
+            #region BackstageItem
+            SuperTabStyleColorFactory.GetOffice2007BackstageVistaGlassItemColorTable(table.BackstageItem, factory);
+            #endregion
+
+            #region BackstagePanel
+            SuperTabStyleColorFactory.GetOffice2007BackstageVistaGlassPanelColorTable(table.BackstagePanel, factory);
+            #endregion
+
+            #endregion
+
+            #region SwitchButton
+            SwitchButtonColorTable sbt = new SwitchButtonColorTable();
+            sbt.BorderColor = factory.GetColor(editBorderColor);
+            sbt.OffBackColor = factory.GetColor(0xD5E5F5);
+            sbt.OffTextColor = factory.GetColor(0x000000);
+            sbt.OnBackColor = factory.GetColor(0x92D050);
+            sbt.OnTextColor = factory.GetColor(0x000000);
+            sbt.SwitchBackColor = factory.GetColor(0xA2B9D3);
+            sbt.SwitchBorderColor = factory.GetColor(0x5C6672);
+            sbt.TextColor = factory.GetColor(0x000000);
+            table.SwitchButton = new SwitchButtonColors();
+            table.SwitchButton.Default = sbt;
+            table.SwitchButton.Disabled.BorderColor = table.CheckBoxItem.Disabled.CheckBorder;
+            table.SwitchButton.Disabled.SwitchBorderColor = table.SwitchButton.Disabled.BorderColor;
+            table.SwitchButton.Disabled.OffTextColor = table.CheckBoxItem.Disabled.Text;
+            table.SwitchButton.Disabled.OnTextColor = table.SwitchButton.Disabled.OffTextColor;
+            table.SwitchButton.Disabled.TextColor = table.SwitchButton.Disabled.OffTextColor;
+            table.SwitchButton.Disabled.SwitchBackColor = table.CheckBoxItem.Disabled.CheckInnerBackground.Start;
+            table.SwitchButton.Disabled.OffBackColor = table.CheckBoxItem.Disabled.CheckInnerBackground.Start;
+            table.SwitchButton.Disabled.OnBackColor = table.SwitchButton.Disabled.OffBackColor;
+            #endregion
+
+            #region StepIndicator
+            table.StepIndicator.BackgroundColor = factory.GetColor(ColorFunctions.GetShade(table.Form.BackColor, 10));
+            table.StepIndicator.IndicatorColor = factory.GetColor(0xA4CC28);
+            #endregion
+
+            #region RadialMenu
+            table.RadialMenu = new RadialMenuColorTable();
+            table.RadialMenu.CircularBackColor = factory.GetColor(0xD44F2E);
+            table.RadialMenu.CircularBorderColor = factory.GetColor(0xFFFFFF);
+            table.RadialMenu.CircularForeColor = factory.GetColor(0xFFFFFF);
+            table.RadialMenu.RadialMenuBackground = factory.GetColor(0xFFFFFF);
+            table.RadialMenu.RadialMenuBorder = factory.GetColor(0x5A6487);
+            table.RadialMenu.RadialMenuButtonBackground = factory.GetColor(0xFFFFFF);
+            table.RadialMenu.RadialMenuButtonBorder = factory.GetColor(0x5A6487);
+            table.RadialMenu.RadialMenuExpandForeground = factory.GetColor(0xFFFFFF);
+            table.RadialMenu.RadialMenuInactiveBorder = Color.FromArgb(128, table.RadialMenu.RadialMenuBorder);
+            table.RadialMenu.RadialMenuItemForeground = factory.GetColor(0x5A6487);
+            table.RadialMenu.RadialMenuItemDisabledForeground = factory.GetColor(0x8D8D8D);
+            table.RadialMenu.RadialMenuItemMouseOverBackground = Color.FromArgb(72, table.RadialMenu.RadialMenuItemForeground);
+            table.RadialMenu.RadialMenuItemMouseOverForeground = factory.GetColor(0x5A6487);
+            table.RadialMenu.RadialMenuMouseOverBorder = Color.FromArgb(200, table.RadialMenu.RadialMenuBorder);
+            #endregion
+
+            #region StepItem
+            table.StepItem.Default = new OfficeStepItemStateColorTable(new Color[]{
+                    factory.GetColor(0xFFFFFF), 
+                    factory.GetColor(0xDBDBDB), 
+                    factory.GetColor(0xDBDBDB), 
+                    factory.GetColor(0xCDCFD2)
+                    },
+                    90,
+                    new float[] { 0f, .5f, .5f, 1f },
+                factory.GetColor(0x000000),
+                new Color[] {
+                    factory.GetColor(0x8D949D) });
+            table.StepItem.Progress = new OfficeStepItemStateColorTable(new Color[]{
+                    factory.GetColor(0xD8F577), 
+                    factory.GetColor(0x75C300),
+                    factory.GetColor(0x75C300),
+                    factory.GetColor(0xA9E923)
+                    },
+                    90,
+                    new float[] { 0f, .6f, .6f, 1f },
+                Color.Empty,
+                new Color[0]);
+            table.StepItem.MouseOver = new OfficeStepItemStateColorTable(new Color[]{
+                    factory.GetColor(0xE9F7FE), 
+                    factory.GetColor(0xDDF2FD),
+                    factory.GetColor(0x95BED5), 
+                    factory.GetColor(0xB5E4FF)
+                    },
+                    90,
+                    new float[] { 0f, .5f, .5f, 1f },
+                factory.GetColor(0x000000),
+                new Color[] {
+                    factory.GetColor(0x959595), factory.GetColor(Color.FromArgb(128, Color.White)) });
+            table.StepItem.Pressed = new OfficeStepItemStateColorTable(new Color[]{
+                    factory.GetColor(0xE9F7FE), 
+                    factory.GetColor(0xC5E9FB),
+                    factory.GetColor(0x649EBF), 
+                    factory.GetColor(0x87D3FF)
+                    },
+                    90,
+                    new float[] { 0f, .5f, .5f, 1f },
+                factory.GetColor(0x000000),
+                new Color[] {
+                    factory.GetColor(0x959595), factory.GetColor(Color.FromArgb(128, Color.White)) });
+            #endregion
+
+            #region ListBoxItem
+            table.ListBoxItem.Default = new OfficeListBoxItemStateColorTable(factory.GetColor(0x000000));
+            table.ListBoxItem.MouseOver = new OfficeListBoxItemStateColorTable(factory.GetColor(0x000000), new Color[]{
+                    factory.GetColor(0xFFFCD9),
+                    factory.GetColor(0xFFE793)
+                    },
+                    90,
+                    new float[] { 0f, 1f });
+            table.ListBoxItem.Selected = new OfficeListBoxItemStateColorTable(factory.GetColor(0x000000), new Color[]{
+                    factory.GetColor(0xFCD578),
+                    factory.GetColor(0xFBC84F)
+                    },
+                    90,
+                    new float[] { 0f, 1f });
+            #endregion
+
+            #region TokenEditor
+            table.TokenEditor = new TokenEditorColorTable(0xFFFFFF, 0x3C4251, 0xFFFFFF, 0x1C1E26, 0xFFFFFF, 0x2F5EA9);
+            #endregion
+
+            #region Flyout
+            table.Flyout.BorderColor = table.Form.Active.BorderColors[0];
+            #endregion
+
+            #region SideNav
+            table.SideNav.SideNavItem.Default = new SideNavItemStateColorTable(factory.GetColor(0xFFFFFF));
+            table.SideNav.SideNavItem.MouseOver = new SideNavItemStateColorTable(factory.GetColor(0xFFFFFF),
+                new Color[]
+                {
+                    factory.GetColor(0x9398AA), factory.GetColor(0x373E4A), factory.GetColor(0x111520),
+                    factory.GetColor(0x566E91)
+                },
+                new Color[] { factory.GetColor(Color.FromArgb(128, Color.White)), factory.GetColor(0x153158) },
+                0);
+            table.SideNav.SideNavItem.Pressed = new SideNavItemStateColorTable(factory.GetColor(0xFFFFFF),
+                new Color[]
+                {
+                    factory.GetColor(0x505976), factory.GetColor(0x344560), factory.GetColor(0x0F0F14),
+                    factory.GetColor(0x192C4C)
+                },
+                new Color[] { factory.GetColor(Color.FromArgb(96, Color.White)), factory.GetColor(0x153158) },
+                0);
+            table.SideNav.SideNavItem.Selected = new SideNavItemStateColorTable(factory.GetColor(0x111216),
+                new Color[] { table.Form.BackColor },
+                new Color[] { Color.Empty, factory.GetColor(0x111216), Color.Empty, factory.GetColor(0x111216) });
+            table.SideNav.BorderColors = new Color[] { factory.GetColor(0x111216) };
+            table.SideNav.TitleBackColor = factory.GetColor(0x3C4251);
+            table.SideNav.TitleBorderColors = new Color[] { Color.Empty, Color.Empty, Color.Empty, factory.GetColor(0x111216) };
+            table.SideNav.PanelBackColor = table.Form.BackColor;
+
+            #endregion
+
+            #region TabForm
+            table.TabForm.Active.CaptionText = factory.GetColor(0x4D5259);
+            table.TabForm.Inactive.CaptionText = factory.GetColor(0x444444);
+            table.TabForm.Active.CaptionBackColors = new Color[] { factory.GetColor(0xF5F6F7) };
+            table.TabForm.Inactive.CaptionBackColors = new Color[] { factory.GetColor(0xF5F6F7) };
+            table.TabFormItemColorTables.Add(TabFormItem.DefaultColorTableKey, Office2007ColorTable.CreateDefaultTabFormItemColorTable(factory, 0x333333));
+            table.TabFormItemColorTables.Add(TabFormItem.BlueColorTableKey, Office2007ColorTable.CreateBlueTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.YellowColorTableKey, Office2007ColorTable.CreateYellowTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.PurpleColorTableKey, Office2007ColorTable.CreatePurpleTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.CyanColorTableKey, Office2007ColorTable.CreateCyanTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.BlueMistColorTableKey, Office2007ColorTable.CreateBlueMistTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.PurpleMistColorTableKey, Office2007ColorTable.CreatePurpleMistTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.TanColorTableKey, Office2007ColorTable.CreateTanTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.LemonLimeColorTableKey, Office2007ColorTable.CreateLemonLimeTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.AppleColorTableKey, Office2007ColorTable.CreateAppleTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.TealColorTableKey, Office2007ColorTable.CreateTealTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.RedChalkColorTableKey, Office2007ColorTable.CreateRedChalkTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.SilverColorTableKey, Office2007ColorTable.CreateSilverTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.OrangeColorTableKey, Office2007ColorTable.CreateOrangeTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.GreenColorTableKey, Office2007ColorTable.CreateGreenTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.MagentaColorTableKey, Office2007ColorTable.CreateMagentaTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.RedColorTableKey, Office2007ColorTable.CreateRedTabFormItemColorTable(factory));
+            #endregion
+        }
+
+        /// <summary>
+        /// Initializes ColorScheme object with the black color scheme.
+        /// </summary>
+        /// <param name="c">ColorScheme object to initialize.</param>
+        public static void InitializeBlackLegacyColors(ColorScheme c, ColorFactory factory)
+        {
+            c.BarBackground = factory.GetColor(0xFEFEFF);
+            c.BarBackground2 = factory.GetColor(0xD4DBED);
+            c.BarStripeColor = factory.GetColor(0x66707C);
+            c.BarCaptionBackground = factory.GetColor(0x5C5C5C);
+            c.BarCaptionBackground2 = factory.GetColor(0x000000);
+            c.BarCaptionInactiveBackground = factory.GetColor(0x626C88);
+            c.BarCaptionInactiveBackground2 = factory.GetColor(0x393F4D);
+            c.BarCaptionInactiveText = factory.GetColor(0xFFFFFF);
+            c.BarCaptionText = factory.GetColor(0xFFFFFF);
+            c.BarFloatingBorder = factory.GetColor(0x485057);
+            c.BarPopupBackground = factory.GetColor(0xF2F2F2);
+            c.BarPopupBorder = factory.GetColor(0x646464);
+            c.ItemBackground = Color.Empty;
+            c.ItemBackground2 = Color.Empty;
+            c.ItemCheckedBackground = factory.GetColor(0xEBF5FB);
+            c.ItemCheckedBackground2 = factory.GetColor(0xCBE6F5);
+            c.ItemCheckedBorder = factory.GetColor(0x3C7FB1);
+            c.ItemCheckedText = factory.GetColor(0x000000);
+            c.ItemDisabledBackground = Color.Empty;
+            c.ItemDisabledText = factory.GetColor(0x8D8D8D);
+            c.ItemExpandedShadow = Color.Empty;
+            c.ItemExpandedBackground = factory.GetColor(0xEBF5FB);
+            c.ItemExpandedBackground2 = factory.GetColor(0xCBE6F5);
+            c.ItemExpandedText = factory.GetColor(0x000000);
+            c.ItemHotBackground = factory.GetColor(0xE5F3FA);
+            c.ItemHotBackground2 = factory.GetColor(0xD0ECFC);
+            c.ItemHotBorder = factory.GetColor(0x96DBFA);
+            c.ItemHotText = factory.GetColor(0x000000);
+            c.ItemPressedBackground = factory.GetColor(0xE5F4FC);
+            c.ItemPressedBackground2 = factory.GetColor(0x68B3DB);
+            c.ItemPressedBorder = factory.GetColor(0x2C628B);
+            c.ItemPressedText = factory.GetColor(0x000000);
+            c.ItemSeparator = Color.FromArgb(225, factory.GetColor(0x9199A4));
+            c.ItemSeparatorShade = Color.FromArgb(180, factory.GetColor(0xFFFFFF));
+            c.ItemText = factory.GetColor(0x000000); // SystemColors.ControlText;
+            c.MenuBackground = factory.GetColor(0xF0F0F0);
+            c.MenuBackground2 = Color.Empty; // Color.White;
+            c.MenuBarBackground = factory.GetColor(0xE5EAF5);
+            c.MenuBorder = factory.GetColor(0x646464);
+            c.ItemExpandedBorder = c.MenuBorder;
+            c.MenuSide = factory.GetColor(0xF1F1F1);
+            c.MenuSide2 = Color.Empty;
+            c.MenuUnusedBackground = c.MenuBackground;
+            c.MenuUnusedSide = factory.GetColor(0xE5E5E5);
+            c.MenuUnusedSide2 = Color.Empty;
+            c.ItemDesignTimeBorder = Color.Black;
+            c.BarDockedBorder = factory.GetColor(0x65707B);
+
+            c.DockSiteBackColor = factory.GetColor(0xEEF3FA);
+            c.DockSiteBackColor2 = Color.Empty;
+
+            c.CustomizeBackground = factory.GetColor(0x82AABF);
+            c.CustomizeBackground2 = factory.GetColor(0x1E5E81);
+            c.CustomizeText = factory.GetColor(0xFFFFFF);
+
+            c.PanelBackground = factory.GetColor(0xFEFEFF);
+            c.PanelBackground2 = factory.GetColor(0xE5EAF5);
+            c.PanelText = Color.Black;
+            c.PanelBorder = factory.GetColor(0x646E79);
+
+            c.ExplorerBarBackground = factory.GetColor(0xD4DBED);
+            c.ExplorerBarBackground2 = factory.GetColor(0xE1E6F6);
+
+            c.MdiSystemItemForeground = Color.LightGray;
+        }
+        #endregion
+
+        #region Style Class Creation
+
+        public static ElementStyle GetStatusBarAltStyle(Office2007BarColorTable t)
+        {
+            ElementStyle style = new ElementStyle();
+            style.Class = ElementStyleClassKeys.Office2007StatusBarBackground2Key;
+            style.PaddingLeft = 4;
+            style.BorderLeft = eStyleBorderType.Etched;
+            style.BorderLeftWidth = 1;
+            style.BorderLeftColor = Color.FromArgb(196, t.StatusBarTopBorder);
+            style.BorderColorLight = Color.FromArgb(128, Color.White);
+            if (t.StatusBarAltBackground.Count > 0)
+            {
+                style.BackColorBlend.CopyFrom(t.StatusBarAltBackground);
+                style.BackColorGradientAngle = 90;
+            }
+
+            return style;
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/Office2007WarningBoxColorTable.cs b/PROMS/DotNetBar Source Code/Rendering/Office2007WarningBoxColorTable.cs
new file mode 100644
index 00000000..526217b3
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/Office2007WarningBoxColorTable.cs	
@@ -0,0 +1,88 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    /// <summary>
+    /// Defines colors for the WarningBox control.
+    /// </summary>
+    public class Office2007WarningBoxColorTable
+    {
+        #region Default
+        /// <summary>
+        /// Gets or sets the background color of WarningBox control.
+        /// </summary>
+        public Color BackColor = Color.FromArgb(255, 196, 219, 249);
+        /// <summary>
+        /// Gets or sets the border color of the warning panel.
+        /// </summary>
+        public Color WarningBorderColor = Color.FromArgb(255, 162, 188, 213);
+        /// <summary>
+        /// Gets or sets the back color of the warning panel.
+        /// </summary>
+        public Color WarningBackColor1 = Color.FromArgb(255, 255, 255, 255);
+        /// <summary>
+        /// Gets or sets the end gradient back color of the warning panel.
+        /// </summary>
+        public Color WarningBackColor2 = Color.FromArgb(255, 229, 244, 254);
+        #endregion
+
+        #region Green
+        /// <summary>
+        /// Gets or sets the background color of WarningBox control.
+        /// </summary>
+        public Color GreenBackColor = ColorScheme.GetColor(0xC6E5B8);
+        /// <summary>
+        /// Gets or sets the border color of the warning panel.
+        /// </summary>
+        public Color GreenWarningBorderColor = ColorScheme.GetColor(0x72A45A);
+        /// <summary>
+        /// Gets or sets the back color of the warning panel.
+        /// </summary>
+        public Color GreenWarningBackColor1 = ColorScheme.GetColor(0xC3D9B9);
+        /// <summary>
+        /// Gets or sets the end gradient back color of the warning panel.
+        /// </summary>
+        public Color GreenWarningBackColor2 = ColorScheme.GetColor(0x9CBF8B);
+        #endregion
+
+        #region Yellow
+        /// <summary>
+        /// Gets or sets the background color of WarningBox control.
+        /// </summary>
+        public Color YellowBackColor = ColorScheme.GetColor(0xFFE69F);
+        /// <summary>
+        /// Gets or sets the border color of the warning panel.
+        /// </summary>
+        public Color YellowWarningBorderColor = ColorScheme.GetColor(0xEE9311);
+        /// <summary>
+        /// Gets or sets the back color of the warning panel.
+        /// </summary>
+        public Color YellowWarningBackColor1 = ColorScheme.GetColor(0xFFEBB6);
+        /// <summary>
+        /// Gets or sets the end gradient back color of the warning panel.
+        /// </summary>
+        public Color YellowWarningBackColor2 = ColorScheme.GetColor(0xFFDF86);
+        #endregion
+
+        #region Red
+        /// <summary>
+        /// Gets or sets the background color of WarningBox control.
+        /// </summary>
+        public Color RedBackColor = ColorScheme.GetColor(0xDDACAC);
+        /// <summary>
+        /// Gets or sets the border color of the warning panel.
+        /// </summary>
+        public Color RedWarningBorderColor = ColorScheme.GetColor(0xC16969);
+        /// <summary>
+        /// Gets or sets the back color of the warning panel.
+        /// </summary>
+        public Color RedWarningBackColor1 = ColorScheme.GetColor(0xE5BFBF);
+        /// <summary>
+        /// Gets or sets the end gradient back color of the warning panel.
+        /// </summary>
+        public Color RedWarningBackColor2 = ColorScheme.GetColor(0xD39696);
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/Office2010AppButtonPainter.cs b/PROMS/DotNetBar Source Code/Rendering/Office2010AppButtonPainter.cs
new file mode 100644
index 00000000..e06acca4
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/Office2010AppButtonPainter.cs	
@@ -0,0 +1,128 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing.Drawing2D;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    internal class Office2010AppButtonPainter : Office2007ButtonItemPainter
+    {
+        public override Office2007ButtonItemColorTable GetColorTable(ButtonItem button, eButtonContainer buttonCont)
+        {
+            Office2007ColorTable colorTable = this.ColorTable;
+            Office2007ButtonItemColorTable buttonColorTable = null;
+
+            if (button.CustomColorName != "")
+                buttonColorTable = colorTable.ApplicationButtonColors[button.CustomColorName];
+
+            if (buttonColorTable == null)
+                buttonColorTable = colorTable.ApplicationButtonColors[button.GetColorTableName()];
+
+            if (buttonColorTable == null && colorTable.ApplicationButtonColors.Count > 0)
+                buttonColorTable = colorTable.ApplicationButtonColors[0];
+
+            if (buttonColorTable == null) // Return fall-back color table
+                buttonColorTable = Office2010ColorTable.GetFallBackAppButtonColorTable();
+
+            return buttonColorTable;
+        }
+
+        public override void PaintButtonText(ButtonItem button, ItemPaintArgs pa, Color textColor, CompositeImage image)
+        {
+            Rectangle r = button.DisplayRectangle;
+            r.Inflate(-1, -1);
+            r.Width--;
+
+            Office2007ButtonItemColorTable colorTable = GetColorTable(button, eButtonContainer.RibbonStrip);
+            Color shadowColor = Color.FromArgb(32, Color.Black);
+            if (colorTable.Default != null && colorTable.Default.OuterBorder != null && !colorTable.Default.OuterBorder.IsEmpty)
+                shadowColor = colorTable.Default.OuterBorder.Start;
+            if (pa.GlassEnabled)
+            {
+                ThemeTextFormat textFormat = ThemeTextFormat.Center | ThemeTextFormat.VCenter | ThemeTextFormat.HidePrefix | ThemeTextFormat.SingleLine;
+                Office2007RibbonControlPainter.PaintShadowTextOnGlass(pa.Graphics, button.Text, pa.Font, r, textFormat,textColor, shadowColor , true);
+            }
+            else
+            {
+                eTextFormat format = eTextFormat.HorizontalCenter | eTextFormat.VerticalCenter | eTextFormat.HidePrefix;
+                // Shadow
+                r.Offset(1, 1);
+                TextDrawing.DrawString(pa.Graphics, button.Text, pa.Font, shadowColor, r, format);
+                r.Offset(-1, -1);
+                TextDrawing.DrawString(pa.Graphics, button.Text, pa.Font, textColor, r, format);
+            }
+        }
+
+        protected override Color GetTextColor(ButtonItem button, ItemPaintArgs pa)
+        {
+            return base.GetTextColor(button, pa, GetColorTable(button, eButtonContainer.RibbonStrip));
+        }
+
+        public override void PaintButtonImage(ButtonItem button, ItemPaintArgs pa, CompositeImage image, Rectangle imagebounds)
+        {
+            if (!string.IsNullOrEmpty(button.Text)) return;
+            Rectangle r = button.DisplayRectangle;
+            r.X = r.X + (r.Width - imagebounds.Width) / 2;
+            r.Y = r.Y + (r.Height - imagebounds.Height) / 2;
+            r.Width = imagebounds.Width;
+            r.Height = imagebounds.Height;
+            base.PaintButtonImage(button, pa, image, r);
+        }
+
+        public override void PaintButtonBackground(ButtonItem button, ItemPaintArgs pa, CompositeImage image)
+        {
+            Office2007ButtonItemColorTable colors = GetColorTable(button, eButtonContainer.RibbonStrip);
+            Office2007ButtonItemStateColorTable stateColors = colors.Default;
+            if (button.IsMouseDown)
+                stateColors = colors.Pressed;
+            else if (button.IsMouseOver)
+                stateColors = colors.MouseOver;
+            Rectangle bounds = button.DisplayRectangle;
+            bounds.Width--;
+            Graphics g = pa.Graphics;
+
+            using (GraphicsPath borderPath = DisplayHelp.GetRoundedRectanglePath(bounds, 2, 2, 0, 0))
+            {
+                DisplayHelp.FillPath(g, borderPath, stateColors.Background);
+
+                if (stateColors.BottomBackgroundHighlight != null && !stateColors.BottomBackgroundHighlight.IsEmpty)
+                {
+                    Rectangle ellipse = new Rectangle(bounds.X - 12, bounds.Y + bounds.Height / 2 - 4, bounds.Width + 24, bounds.Height + 4);
+                    using (GraphicsPath path = new GraphicsPath())
+                    {
+                        path.AddEllipse(ellipse);
+                        using (PathGradientBrush brush = new PathGradientBrush(path))
+                        {
+                            brush.CenterColor = stateColors.BottomBackgroundHighlight.Start;
+                            brush.SurroundColors = new Color[] { stateColors.BottomBackgroundHighlight.End };
+                            brush.CenterPoint = new PointF(ellipse.X + ellipse.Width / 2, bounds.Bottom - 1);
+                            
+                            g.FillRectangle(brush, bounds);
+                        }
+                    }
+                }
+
+                if (stateColors.InnerBorder != null && !stateColors.InnerBorder.IsEmpty)
+                {
+                    Rectangle innerBorder = bounds;
+                    innerBorder.Y += 1;
+                    innerBorder.Width -= 1;
+                    innerBorder.X++;
+                    DisplayHelp.DrawGradientRectangle(g, innerBorder, stateColors.InnerBorder, 1);
+                    //using (GraphicsPath innerBorderPath = DisplayHelp.GetRoundedRectanglePath(innerBorder, 1, 1, 0, 0))
+                    //{
+                    //    DisplayHelp.DrawGradientPathBorder(g, innerBorderPath, stateColors.InnerBorder, 1);
+                    //}
+                    using (Pen pen = new Pen(ColorScheme.GetColor(10, 0xffffff)))
+                    {
+                        g.DrawLine(pen, innerBorder.X + 1, innerBorder.Y + 1, innerBorder.X + 1, innerBorder.Bottom - 1);
+                        g.DrawLine(pen, innerBorder.Right - 2, innerBorder.Y + 1, innerBorder.Right - 2, innerBorder.Bottom - 1);
+                    }
+                }
+
+                DisplayHelp.DrawGradientPathBorder(g, borderPath, stateColors.OuterBorder, 1);
+            }
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/Office2010BlackFactory.cs b/PROMS/DotNetBar Source Code/Rendering/Office2010BlackFactory.cs
new file mode 100644
index 00000000..6d87b024
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/Office2010BlackFactory.cs	
@@ -0,0 +1,1933 @@
+using System;
+using System.Text;
+using System.Drawing;
+using DevComponents.DotNetBar.Controls;
+using DevComponents.DotNetBar.Schedule;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    internal static class Office2010BlackFactory
+    {
+        public static void InitializeColorTable(Office2007ColorTable table, ColorFactory factory)
+        {
+            #region RibbonControl Start Images
+            table.RibbonControl.StartButtonDefault = BarFunctions.LoadBitmap("SystemImages.BlankOffice2010NormalSilver.png");
+            table.RibbonControl.StartButtonMouseOver = BarFunctions.LoadBitmap("SystemImages.BlankOffice2010HotSilver.png");
+            table.RibbonControl.StartButtonPressed = BarFunctions.LoadBitmap("SystemImages.BlankOffice2010PressedSilver.png");
+            #endregion
+
+            #region RibbonControl
+            table.RibbonControl.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x3E3F3F), factory.GetColor(0x4E4E4E));
+            table.RibbonControl.InnerBorder = LinearGradientColorTable.Empty;
+            table.RibbonControl.TabsBackground = new LinearGradientColorTable(factory.GetColor(0x717171));
+            table.RibbonControl.TabsGlassBackground = new LinearGradientColorTable(Color.Transparent, factory.GetColor(0x494949));
+            table.RibbonControl.TabDividerBorder = Color.Empty; // factory.GetColor(0xA7BAD1);
+            table.RibbonControl.TabDividerBorderLight = Color.Empty; // factory.GetColor(0xF4F8FD);
+            table.RibbonControl.CornerSize = 1;
+            table.RibbonControl.PanelTopBackgroundHeight = 0;
+            table.RibbonControl.PanelTopBackground = new LinearGradientColorTable(factory.GetColor(0xC9C9C9), factory.GetColor(0xA3A3A3));
+            table.RibbonControl.PanelBottomBackground = null;
+            #endregion
+
+            #region Item Group
+            table.ItemGroup.OuterBorder = LinearGradientColorTable.Empty; //new LinearGradientColorTable(factory.GetColor(0xC0C3C8));
+            table.ItemGroup.InnerBorder = LinearGradientColorTable.Empty;
+            table.ItemGroup.TopBackground = LinearGradientColorTable.Empty;
+            table.ItemGroup.BottomBackground = LinearGradientColorTable.Empty;
+            table.ItemGroup.ItemGroupDividerDark = Color.Empty;
+            table.ItemGroup.ItemGroupDividerLight = Color.Empty;
+            #endregion
+
+            #region RibbonBar
+            table.RibbonBar.Default = GetRibbonBar(factory);
+            table.RibbonBar.MouseOver = GetRibbonBarMouseOver(factory);
+            table.RibbonBar.Expanded = GetRibbonBarExpanded(factory);
+            #endregion
+
+            #region ButtonItem Colors Initialization
+            table.RibbonButtonItemColors.Clear();
+            table.ButtonItemColors.Clear();
+            table.MenuButtonItemColors.Clear();
+            // Orange
+            Office2007ButtonItemColorTable cb = GetButtonItemBlueOrange(factory);
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Orange);
+            table.ButtonItemColors.Add(cb);
+            // Orange with background
+            cb = GetButtonItemBlueOrangeWithBackground(factory);
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.OrangeWithBackground);
+            table.ButtonItemColors.Add(cb);
+            // Blue
+            cb = Office2007ColorTableFactory.GetButtonItemBlueBlue(factory);
+            cb.MouseOverSplitInactive = new Office2007ButtonItemStateColorTable();
+            cb.MouseOverSplitInactive.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xB1BAC4));
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Blue);
+            table.ButtonItemColors.Add(cb);
+            // Blue with background
+            cb = Office2007ColorTableFactory.GetButtonItemBlueBlueWithBackground(factory);
+            cb.MouseOverSplitInactive = new Office2007ButtonItemStateColorTable();
+            cb.MouseOverSplitInactive.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xB1BAC4));
+            cb.MouseOverSplitInactive = cb.Default;
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.BlueWithBackground);
+            table.ButtonItemColors.Add(cb);
+            // Magenta
+            cb = Office2007ColorTableFactory.GetButtonItemBlueMagenta(factory);
+            cb.MouseOverSplitInactive = new Office2007ButtonItemStateColorTable();
+            cb.MouseOverSplitInactive.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xB1BAC4));
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Magenta);
+            table.ButtonItemColors.Add(cb);
+            // Blue with background
+            cb = Office2007ColorTableFactory.GetButtonItemBlueMagentaWithBackground(factory);
+            cb.MouseOverSplitInactive = new Office2007ButtonItemStateColorTable();
+            cb.MouseOverSplitInactive.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xB1BAC4));
+            cb.MouseOverSplitInactive = cb.Default;
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.MagentaWithBackground);
+            table.ButtonItemColors.Add(cb);
+
+            cb = Office2010BlueFactory.GetButtonItemOffice2007WithBackground(factory);
+            cb.MouseOverSplitInactive = new Office2007ButtonItemStateColorTable();
+            cb.MouseOverSplitInactive.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xB1BAC4));
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Office2007WithBackground);
+            table.ButtonItemColors.Add(cb);
+
+            table.ButtonItemColors.Add(ButtonItemStaticColorTables.CreateBlueOrbColorTable(factory));
+
+            table.BackstageButtonItemColors.Clear();
+            table.BackstageButtonItemColors.Add(GetButtonItemBackstageDefault(factory));
+
+            table.ContextualTables.Add(Office2007ColorTable.GetContextualKey(typeof(Office2007ButtonItemColorTable), "StatusBar"), 
+                GetButtonItemStatusBar(factory));
+            #endregion
+
+            #region NavigationPane ButtonItem Initialization
+            table.NavigationPaneButtonItemColors.Clear();
+            table.NavigationPaneButtonItemColors.Add(GetNavigationPaneButtonItemTable(factory));
+            #endregion
+
+            #region RibbonTabItem Colors Initialization
+            table.RibbonTabItemColors.Clear();
+            Office2007RibbonTabItemColorTable rt = GetRibbonTabItemDefault(factory);
+            rt.Name = Enum.GetName(typeof(eRibbonTabColor), eRibbonTabColor.Default);
+            table.RibbonTabItemColors.Add(rt);
+
+            // Magenta
+            rt = GetRibbonTabItemMagenta(factory);
+            rt.CornerSize = 2;
+            rt.Name = Enum.GetName(typeof(eRibbonTabColor), eRibbonTabColor.Magenta);
+            table.RibbonTabItemColors.Add(rt);
+
+            // Green
+            rt = GetRibbonTabItemBlueGreen(factory);
+            rt.CornerSize = 2;
+            rt.Name = Enum.GetName(typeof(eRibbonTabColor), eRibbonTabColor.Green);
+            table.RibbonTabItemColors.Add(rt);
+
+            // Orange
+            rt = GetRibbonTabItemBlueOrange(factory);
+            rt.CornerSize = 2;
+            rt.Name = Enum.GetName(typeof(eRibbonTabColor), eRibbonTabColor.Orange);
+            table.RibbonTabItemColors.Add(rt);
+            #endregion
+
+            #region RibbonTabItemGroup Colors Initialization
+            table.RibbonTabGroupColors.Clear();
+            // Default
+            Office2007RibbonTabGroupColorTable tg = Office2010BlueFactory.GetRibbonTabGroupDefault(factory);
+            tg.Name = Enum.GetName(typeof(eRibbonTabGroupColor), eRibbonTabGroupColor.Default);
+            table.RibbonTabGroupColors.Add(tg);
+
+            // Magenta
+            tg = Office2010BlueFactory.GetRibbonTabGroupMagenta(factory);
+            tg.Name = Enum.GetName(typeof(eRibbonTabGroupColor), eRibbonTabGroupColor.Magenta);
+            table.RibbonTabGroupColors.Add(tg);
+
+            // Green
+            tg = Office2010BlueFactory.GetRibbonTabGroupGreen(factory);
+            tg.Name = Enum.GetName(typeof(eRibbonTabGroupColor), eRibbonTabGroupColor.Green);
+            table.RibbonTabGroupColors.Add(tg);
+
+            // Orange
+            tg = Office2010BlueFactory.GetRibbonTabGroupOrange(factory);
+            tg.Name = Enum.GetName(typeof(eRibbonTabGroupColor), eRibbonTabGroupColor.Orange);
+            table.RibbonTabGroupColors.Add(tg);
+            #endregion
+
+            #region Initialize Bar
+            table.Bar.ToolbarTopBackground = new LinearGradientColorTable(factory.GetColor(0x4B4B4B), factory.GetColor(0x3F3F3F));
+            table.Bar.ToolbarBottomBackground = new LinearGradientColorTable(factory.GetColor(0x3F3F3F), factory.GetColor(0x333333));
+            table.Bar.ToolbarBottomBorder = factory.GetColor(0x525252);
+            table.Bar.PopupToolbarBackground = new LinearGradientColorTable(factory.GetColor(0xFFFFFF), Color.Empty);
+            table.Bar.PopupToolbarBorder = factory.GetColor(0xA7ABB0);
+            table.Bar.StatusBarTopBorder = factory.GetColor(0x2C2C2C);
+            table.Bar.StatusBarTopBorderLight = factory.GetColor(Color.FromArgb(32, Color.White));
+            table.Bar.StatusBarAltBackground.Clear();
+            table.Bar.StatusBarAltBackground.Add(new BackgroundColorBlend(factory.GetColor(0x4B4B4B), 0f));
+            table.Bar.StatusBarAltBackground.Add(new BackgroundColorBlend(factory.GetColor(0x333333), 1f));
+            #endregion
+
+            #region Menu
+            table.Menu.Background = new LinearGradientColorTable(factory.GetColor(0xFFFFFF), Color.Empty);
+            table.Menu.Border = new LinearGradientColorTable(factory.GetColor(0xA7ABB0), Color.Empty);
+            table.Menu.Side = new LinearGradientColorTable(factory.GetColor(0xFFFFFF), Color.Empty);
+            table.Menu.SideBorder = new LinearGradientColorTable(factory.GetColor(0xE2E4E7), Color.Empty);
+            table.Menu.SideBorderLight = new LinearGradientColorTable(factory.GetColor(0xFFFFFF), Color.Empty);
+            table.Menu.SideUnused = new LinearGradientColorTable(factory.GetColor(0xE5E5E5), Color.Empty);
+            table.Menu.FileBackgroundBlend.Clear();
+            table.Menu.FileBackgroundBlend.AddRange(new DevComponents.DotNetBar.BackgroundColorBlend[] {
+                new DevComponents.DotNetBar.BackgroundColorBlend(factory.GetColor(0xFFFFFF), 0F),
+                new DevComponents.DotNetBar.BackgroundColorBlend(factory.GetColor(0xFFFFFF), 1F)});
+            table.Menu.FileContainerBorder = factory.GetColor(0xA7ABB0);
+            table.Menu.FileContainerBorderLight = Color.Transparent;
+            table.Menu.FileColumnOneBackground = factory.GetColor(0xFFFFFF);
+            table.Menu.FileColumnOneBorder = factory.GetColor(0xA7ABB0);
+            table.Menu.FileColumnTwoBackground = factory.GetColor(0xFFFFFF);
+            table.Menu.FileBottomContainerBackgroundBlend.Clear();
+            //table.Menu.FileBottomContainerBackgroundBlend.AddRange(new DevComponents.DotNetBar.BackgroundColorBlend[] {
+            //    new DevComponents.DotNetBar.BackgroundColorBlend(factory.GetColor(0xEBF3FC), 0F),
+            //    new DevComponents.DotNetBar.BackgroundColorBlend(factory.GetColor(0xEBF3FC), 1F)});
+            #endregion
+
+            #region ComboBox
+            table.ComboBox.Default.Background = factory.GetColor(0xC6C6C6);
+            table.ComboBox.Default.Border = factory.GetColor(0x919191);
+            table.ComboBox.Default.ExpandBackground = new LinearGradientColorTable();
+            table.ComboBox.Default.ExpandBorderInner = new LinearGradientColorTable();
+            table.ComboBox.Default.ExpandBorderOuter = new LinearGradientColorTable();
+            table.ComboBox.Default.ExpandText = factory.GetColor(0x505153);
+            table.ComboBox.DefaultStandalone.Background = factory.GetColor(0xFFFFFF);
+            int editBorderColor = 0x313131;
+            table.ComboBox.DefaultStandalone.Border = factory.GetColor(editBorderColor);
+            table.ComboBox.DefaultStandalone.ExpandBackground = new LinearGradientColorTable(factory.GetColor(0xE2E2E2), factory.GetColor(0xC4C4C4), 90);
+            table.ComboBox.DefaultStandalone.ExpandBorderInner = LinearGradientColorTable.Empty;// new LinearGradientColorTable(factory.GetColor(0xFFFFFF));
+            table.ComboBox.DefaultStandalone.ExpandBorderOuter = new LinearGradientColorTable(factory.GetColor(0x919191), Color.Empty, 90);
+            table.ComboBox.DefaultStandalone.ExpandText = factory.GetColor(0x555658);
+            table.ComboBox.MouseOver.Background = factory.GetColor(0xFFFFFF);
+            table.ComboBox.MouseOver.Border = factory.GetColor(0x919191);
+            table.ComboBox.MouseOver.ExpandBackground = new LinearGradientColorTable(factory.GetColor(0xF5E4A1), factory.GetColor(0xF6EEC9), 90);
+            table.ComboBox.MouseOver.ExpandBorderInner = new LinearGradientColorTable(factory.GetColor(0xFBF6E3));
+            table.ComboBox.MouseOver.ExpandBorderOuter = new LinearGradientColorTable(factory.GetColor(0xE8C14F), Color.Empty, 90);
+            table.ComboBox.MouseOver.ExpandText = factory.GetColor(0x5C5641);
+            table.ComboBox.DroppedDown.Background = factory.GetColor(0xFFFFFF);
+            table.ComboBox.DroppedDown.Border = factory.GetColor(0x919191);
+            table.ComboBox.DroppedDown.ExpandBackground = new LinearGradientColorTable(factory.GetColor(0xE4C9A7), factory.GetColor(0xEFBC61), 90);
+            table.ComboBox.DroppedDown.ExpandBorderInner = new LinearGradientColorTable(factory.GetColor(0xD4C0A9), factory.GetColor(0xEFF1B9), 90);
+            table.ComboBox.DroppedDown.ExpandBorderOuter = new LinearGradientColorTable(factory.GetColor(0xC2923B), Color.Empty, 90);
+            table.ComboBox.DroppedDown.ExpandText = factory.GetColor(0x454F5A);
+            #endregion
+
+            #region Dialog Launcher
+            table.DialogLauncher.Default.DialogLauncher = factory.GetColor(0x6B6B6B);
+            table.DialogLauncher.Default.DialogLauncherShade = Color.Transparent;// factory.GetColor(172, 0xFFFFFF);
+
+            table.DialogLauncher.MouseOver.DialogLauncher = factory.GetColor(0x968C64);
+            table.DialogLauncher.MouseOver.DialogLauncherShade = Color.Transparent;
+            table.DialogLauncher.MouseOver.TopBackground = new LinearGradientColorTable(factory.GetColor(0xF1DF99), factory.GetColor(0xF1D77B));
+            table.DialogLauncher.MouseOver.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xF1D77B), factory.GetColor(0xF1E3AF));
+            table.DialogLauncher.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFAF5E2), factory.GetColor(0xFAF7EE));
+            table.DialogLauncher.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xE5BF4B), Color.Empty);
+
+            table.DialogLauncher.Pressed.DialogLauncher = factory.GetColor(0x6B737D);
+            table.DialogLauncher.Pressed.DialogLauncherShade = Color.FromArgb(128, factory.GetColor(0xFFFFFF));
+            table.DialogLauncher.Pressed.TopBackground = new LinearGradientColorTable(factory.GetColor(0xE4C8A5), factory.GetColor(0xEDC891));
+            table.DialogLauncher.Pressed.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xEEBC62), factory.GetColor(0xEEE48B));
+            table.DialogLauncher.Pressed.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xD4BFA8), factory.GetColor(0xEFF1C2));
+            table.DialogLauncher.Pressed.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xC2923B), factory.GetColor(0xC2B462));
+            #endregion
+
+            #region System Button, Form
+            // Default state no background
+            table.SystemButton.Default = new Office2007SystemButtonStateColorTable();
+            table.SystemButton.Default.Foreground = new LinearGradientColorTable(factory.GetColor(0xDCDCDC));
+            table.SystemButton.Default.LightShade = Color.Empty;
+            table.SystemButton.Default.DarkShade = factory.GetColor(0x525565);
+
+            // Mouse over state
+            table.SystemButton.MouseOver = new Office2007SystemButtonStateColorTable();
+            table.SystemButton.MouseOver.Foreground = new LinearGradientColorTable(factory.GetColor(0xDCDCDC));
+            table.SystemButton.MouseOver.LightShade = Color.Empty;
+            table.SystemButton.MouseOver.DarkShade = factory.GetColor(0x525565);
+            table.SystemButton.MouseOver.TopBackground = new LinearGradientColorTable(factory.GetColor(0x949494), factory.GetColor(0x8B8B8B));
+            table.SystemButton.MouseOver.BottomBackground = new LinearGradientColorTable(factory.GetColor(0x8B8B8B), factory.GetColor(0x777777));
+            table.SystemButton.MouseOver.TopHighlight = null; // new LinearGradientColorTable(factory.GetColor(0xFBFCFF), Color.Transparent);
+            table.SystemButton.MouseOver.BottomHighlight = null; // new LinearGradientColorTable(factory.GetColor(0xFBFCFF), Color.Transparent);
+            table.SystemButton.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x515151));
+            table.SystemButton.MouseOver.InnerBorder = LinearGradientColorTable.Empty;
+
+            // Pressed
+            table.SystemButton.Pressed = new Office2007SystemButtonStateColorTable();
+            table.SystemButton.Pressed.Foreground = new LinearGradientColorTable(factory.GetColor(0xDCDCDC));
+            table.SystemButton.Pressed.LightShade = Color.Empty;
+            table.SystemButton.Pressed.DarkShade = factory.GetColor(0x525565);
+            table.SystemButton.Pressed.TopBackground = new LinearGradientColorTable(factory.GetColor(0x686868));
+            table.SystemButton.Pressed.TopHighlight = null;// new LinearGradientColorTable(factory.GetColor(0xB8CEE9), Color.Transparent);
+            table.SystemButton.Pressed.BottomBackground = new LinearGradientColorTable(factory.GetColor(0x717171));
+            table.SystemButton.Pressed.BottomHighlight = null; // new LinearGradientColorTable(factory.GetColor(0xC6EAFD), Color.Transparent);
+            table.SystemButton.Pressed.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x515151));
+            table.SystemButton.Pressed.InnerBorder = new LinearGradientColorTable(factory.GetColor(0x636363));
+
+            // CLOSE Default state no background
+            table.SystemButtonClose = new Office2007SystemButtonColorTable();
+            table.SystemButtonClose.Default = new Office2007SystemButtonStateColorTable();
+            table.SystemButtonClose.Default.Foreground = new LinearGradientColorTable(factory.GetColor(0xDCDCDC));
+            table.SystemButtonClose.Default.LightShade = Color.Empty;
+            table.SystemButtonClose.Default.DarkShade = factory.GetColor(0x525565);
+
+            // Mouse over state
+            table.SystemButtonClose.MouseOver = new Office2007SystemButtonStateColorTable();
+            table.SystemButtonClose.MouseOver.Foreground = new LinearGradientColorTable(factory.GetColor(0xDCDCDC));
+            table.SystemButtonClose.MouseOver.LightShade = Color.Empty;
+            table.SystemButtonClose.MouseOver.DarkShade = factory.GetColor(0x9B3D3D);
+            table.SystemButtonClose.MouseOver.TopBackground = new LinearGradientColorTable(factory.GetColor(0xFF8482), factory.GetColor(0xFB7F7E));
+            table.SystemButtonClose.MouseOver.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xF67979), factory.GetColor(0xE36162));
+            table.SystemButtonClose.MouseOver.TopHighlight = null; // new LinearGradientColorTable(factory.GetColor(0xFBFCFF), Color.Transparent);
+            table.SystemButtonClose.MouseOver.BottomHighlight = null; // new LinearGradientColorTable(factory.GetColor(0xFBFCFF), Color.Transparent);
+            table.SystemButtonClose.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x9B3D3D));
+            table.SystemButtonClose.MouseOver.InnerBorder = LinearGradientColorTable.Empty;
+
+            // Pressed
+            table.SystemButtonClose.Pressed = new Office2007SystemButtonStateColorTable();
+            table.SystemButtonClose.Pressed.Foreground = new LinearGradientColorTable(factory.GetColor(0xDCDCDC));
+            table.SystemButtonClose.Pressed.LightShade = Color.Empty;
+            table.SystemButtonClose.Pressed.DarkShade = factory.GetColor(0x9B3D3D);
+            table.SystemButtonClose.Pressed.TopBackground = new LinearGradientColorTable(factory.GetColor(0xF27776));
+            table.SystemButtonClose.Pressed.TopHighlight = null;// new LinearGradientColorTable(factory.GetColor(0xB8CEE9), Color.Transparent);
+            table.SystemButtonClose.Pressed.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xF27776));
+            table.SystemButtonClose.Pressed.BottomHighlight = null; // new LinearGradientColorTable(factory.GetColor(0xC6EAFD), Color.Transparent);
+            table.SystemButtonClose.Pressed.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x9B3D3D));
+            table.SystemButtonClose.Pressed.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xDA6163));
+
+            // Form border
+            table.Form.Active.BorderColors = new Color[] {
+                factory.GetColor(0x636363),
+                factory.GetColor(0x838383),
+                factory.GetColor(0x777777),
+                factory.GetColor(0x777777),
+                factory.GetColor(0x777777)
+            };
+
+            table.Form.Inactive.BorderColors = new Color[] {
+                factory.GetColor(0x777777),
+                factory.GetColor(0x9E9E9E),
+                factory.GetColor(0x9E9E9E),
+                factory.GetColor(0x9E9E9E),
+                factory.GetColor(0x9E9E9E)
+            };
+
+            // Form Caption Active
+            table.Form.Active.CaptionTopBackground = new LinearGradientColorTable(factory.GetColor(0x797979), factory.GetColor(0x797979));
+            table.Form.Active.CaptionBottomBackground = new LinearGradientColorTable(factory.GetColor(0x787878), factory.GetColor(0x717171));
+            table.Form.Active.CaptionBottomBorder = new Color[] { factory.GetColor(0x5E5E5E), factory.GetColor(0x838383) };
+            table.Form.Active.CaptionText = factory.GetColor(0xFFFFFF);
+            table.Form.Active.CaptionTextExtra = factory.GetColor(0xE2E2E2);
+
+            // Form Caption Inactive
+            table.Form.Inactive.CaptionTopBackground = new LinearGradientColorTable(factory.GetColor(0x9E9E9E));
+            table.Form.Inactive.CaptionBottomBackground = new LinearGradientColorTable(factory.GetColor(0x9E9E9E));
+            table.Form.Inactive.CaptionText = factory.GetColor(0xD4D4D4);
+            table.Form.Inactive.CaptionTextExtra = factory.GetColor(0xD4D4D4);
+
+            table.Form.BackColor = factory.GetColor(0xD3D3D3);
+            table.Form.TextColor = factory.GetColor(0x000000);
+
+            table.Form.MdiClientBackgroundImage = BarFunctions.LoadBitmap("SystemImages.Office2010BlackClientBackground.png");
+            #endregion
+
+            #region Quick Access Toolbar Background
+            table.QuickAccessToolbar.Active.TopBackground = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(0xDEE7F4), factory.GetColor(0xE6EEF9));
+            table.QuickAccessToolbar.Active.BottomBackground = LinearGradientColorTable.Empty; //new LinearGradientColorTable(factory.GetColor(0xDBE7F7), factory.GetColor(0xC9D9EE));
+            table.QuickAccessToolbar.Active.OutterBorderColor = Color.Empty; // factory.GetColor(0xF6F9FC);
+            table.QuickAccessToolbar.Active.MiddleBorderColor = Color.Empty; // factory.GetColor(0x9AB3D5);
+            table.QuickAccessToolbar.Active.InnerBorderColor = Color.Empty; //  factory.GetColor(0xD2E3F9);
+
+            table.QuickAccessToolbar.Inactive.TopBackground = LinearGradientColorTable.Empty; //new LinearGradientColorTable(factory.GetColor(0xE6ECF3), factory.GetColor(0xCED8E6));
+            table.QuickAccessToolbar.Inactive.BottomBackground = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(0xCED8E6), factory.GetColor(0xC8D3E3));
+            table.QuickAccessToolbar.Inactive.OutterBorderColor = Color.Empty; // factory.GetColor(0xF6F9FC);
+            table.QuickAccessToolbar.Inactive.MiddleBorderColor = Color.Empty; // factory.GetColor(0x9AB3D5);
+            table.QuickAccessToolbar.Inactive.InnerBorderColor = Color.Empty;
+
+            table.QuickAccessToolbar.Standalone.TopBackground = new LinearGradientColorTable();
+            table.QuickAccessToolbar.Standalone.BottomBackground = new LinearGradientColorTable(factory.GetColor(0x797979));
+            table.QuickAccessToolbar.Standalone.OutterBorderColor = factory.GetColor(0x848484);
+            table.QuickAccessToolbar.Standalone.MiddleBorderColor = Color.Empty;
+            table.QuickAccessToolbar.Standalone.InnerBorderColor = Color.Empty; // factory.GetColor(0xDCE8F7);
+
+            table.QuickAccessToolbar.QatCustomizeMenuLabelBackground = factory.GetColor(0xF0F2F5);
+            table.QuickAccessToolbar.QatCustomizeMenuLabelText = factory.GetColor(0x3B3B3B);
+
+            table.QuickAccessToolbar.Active.GlassBorder = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(Color.FromArgb(132, Color.Black)), Color.FromArgb(80, Color.Black));
+            table.QuickAccessToolbar.Inactive.GlassBorder = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(Color.FromArgb(132, Color.Black)), Color.FromArgb(80, Color.Black));
+            #endregion
+
+            #region Tab Colors
+            table.TabControl.Default = new Office2007TabItemStateColorTable();
+            table.TabControl.Default.TopBackground = new LinearGradientColorTable(factory.GetColor(0x919191), factory.GetColor(0x7E7E7E));
+            table.TabControl.Default.BottomBackground = new LinearGradientColorTable(factory.GetColor(0x7E7E7E), factory.GetColor(0x6C6C6C));
+            table.TabControl.Default.InnerBorder = factory.GetColor(0x919191);
+            table.TabControl.Default.OuterBorder = factory.GetColor(editBorderColor);
+            table.TabControl.Default.Text = factory.GetColor(0xFFFFFF);
+
+            table.TabControl.MouseOver = new Office2007TabItemStateColorTable();
+            table.TabControl.MouseOver.TopBackground = new LinearGradientColorTable(factory.GetColor(0xC1C1C1), factory.GetColor(0xAEAEAE));
+            table.TabControl.MouseOver.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xAEAEAE), factory.GetColor(0x919191));
+            table.TabControl.MouseOver.InnerBorder = factory.GetColor(0x919191);
+            table.TabControl.MouseOver.OuterBorder = factory.GetColor(0x343434);
+            table.TabControl.MouseOver.Text = factory.GetColor(0x000000);
+
+            table.TabControl.Selected = new Office2007TabItemStateColorTable();
+            table.TabControl.Selected.TopBackground = new LinearGradientColorTable(factory.GetColor(0x919191), factory.GetColor(0xFFFFFF));
+            table.TabControl.Selected.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xFFFFFF), factory.GetColor(0xFFFFFF));
+            table.TabControl.Selected.InnerBorder = factory.GetColor(0x919191);
+            table.TabControl.Selected.OuterBorder = factory.GetColor(0x343434);
+            table.TabControl.Selected.Text = factory.GetColor(0x000000);
+
+            table.TabControl.TabBackground = new LinearGradientColorTable(factory.GetColor(0x6A6A6A), Color.Empty);
+            table.TabControl.TabPanelBackground = new LinearGradientColorTable(factory.GetColor(0xFFFFFF), Color.Empty);
+            table.TabControl.TabPanelBorder = factory.GetColor(editBorderColor);
+            #endregion
+
+            #region CheckBoxItem
+            Office2007CheckBoxColorTable chk = table.CheckBoxItem;
+            chk.Default.CheckBackground = new LinearGradientColorTable(factory.GetColor(0xF2F3F5), Color.Empty);
+            chk.Default.CheckBorder = factory.GetColor(0x898B8C);
+            chk.Default.CheckInnerBackground = new LinearGradientColorTable(factory.GetColor(0xE8E9EB), factory.GetColor(0xF3F3F4));
+            chk.Default.CheckInnerBorder = factory.GetColor(0xB6B8BA);
+            chk.Default.CheckSign = new LinearGradientColorTable(factory.GetColor(0x717374), Color.Empty);
+            chk.Default.Text = factory.GetColor(0x000000);
+
+            chk.MouseOver.CheckBackground = new LinearGradientColorTable(factory.GetColor(0xFCF1C2), Color.Empty);
+            chk.MouseOver.CheckBorder = factory.GetColor(0xCF9037);
+            chk.MouseOver.CheckInnerBackground = new LinearGradientColorTable(factory.GetColor(0xFAECC8), factory.GetColor(0xFCF3DD));
+            chk.MouseOver.CheckInnerBorder = factory.GetColor(0xFCAD5D);
+            chk.MouseOver.CheckSign = new LinearGradientColorTable(factory.GetColor(0x4B4944), Color.Empty);
+            chk.MouseOver.Text = factory.GetColor(0x000000);
+
+            chk.Pressed.CheckBackground = new LinearGradientColorTable(factory.GetColor(0xFCE7BD));
+            chk.Pressed.CheckBorder = factory.GetColor(0xC26D1D);
+            chk.Pressed.CheckInnerBackground = new LinearGradientColorTable(factory.GetColor(0xFAE0A2), factory.GetColor(0xFDF2D7));
+            chk.Pressed.CheckInnerBorder = factory.GetColor(0xFCA558);
+            chk.Pressed.CheckSign = new LinearGradientColorTable(factory.GetColor(0x4B4944), Color.Empty);
+            chk.Pressed.Text = factory.GetColor(0x3B3B3B);
+
+            chk.Disabled.CheckBackground = new LinearGradientColorTable(factory.GetColor(0xFFFFFF), Color.Empty);
+            chk.Disabled.CheckBorder = factory.GetColor(0xB6B8BA);
+            chk.Disabled.CheckInnerBackground = new LinearGradientColorTable(factory.GetColor(0xF8F8F9));
+            chk.Disabled.CheckInnerBorder = factory.GetColor(0xDFE0E0);
+            chk.Disabled.CheckSign = new LinearGradientColorTable(factory.GetColor(0xB1B3B4), Color.Empty);
+            chk.Disabled.Text = factory.GetColor(0x8D8D8D);
+            #endregion
+
+            #region Scroll Bar Colors
+            InitializeScrollBarColorTable(table, factory);
+            InitializeAppScrollBarColorTable(table, factory);
+            #endregion
+
+            #region ProgressBarItem
+            Office2007ProgressBarColorTable pct = table.ProgressBarItem;
+            pct.BackgroundColors = new GradientColorTable(0x87898B, 0x979897);
+            pct.OuterBorder = factory.GetColor(0x373739);
+            pct.InnerBorder = factory.GetColor(0xA6A6A6);
+            pct.Chunk = new GradientColorTable(0x69922A, 0xE7F2D4, 0);
+            pct.ChunkOverlay = new GradientColorTable();
+            pct.ChunkOverlay.LinearGradientAngle = 90;
+            pct.ChunkOverlay.Colors.AddRange(new BackgroundColorBlend[] {
+                new BackgroundColorBlend(Color.FromArgb(192, factory.GetColor(0xEEFFD7)), 0f),
+                new BackgroundColorBlend(Color.FromArgb(128, factory.GetColor(0x8DB254)), .5f),
+                new BackgroundColorBlend(Color.FromArgb(64, factory.GetColor(0x69922B)), .5f),
+                new BackgroundColorBlend(Color.Transparent, 1f),
+            });
+            pct.ChunkShadow = new GradientColorTable(0x7D7E7F, 0x909190, 0);
+
+            // Paused State
+            pct = table.ProgressBarItemPaused;
+            pct.BackgroundColors = new GradientColorTable(0x87898B, 0x979897);
+            pct.OuterBorder = factory.GetColor(0x373739);
+            pct.InnerBorder = factory.GetColor(0xA6A6A6);
+            pct.Chunk = new GradientColorTable(0xAEA700, 0xFFFDCD, 0);
+            pct.ChunkOverlay = new GradientColorTable();
+            pct.ChunkOverlay.LinearGradientAngle = 90;
+            pct.ChunkOverlay.Colors.AddRange(new BackgroundColorBlend[] {
+                new BackgroundColorBlend(Color.FromArgb(192, factory.GetColor(0xFFFBA3)), 0f),
+                new BackgroundColorBlend(Color.FromArgb(128, factory.GetColor(0xD2CA00)), .5f),
+                new BackgroundColorBlend(Color.FromArgb(64, factory.GetColor(0xFEF400)), .5f),
+                new BackgroundColorBlend(Color.Transparent, 1f),
+            });
+            pct.ChunkShadow = new GradientColorTable(0x7D7E7F, 0x909190, 0);
+
+            // Error State
+            pct = table.ProgressBarItemError;
+            pct.BackgroundColors = new GradientColorTable(0x87898B, 0x979897);
+            pct.OuterBorder = factory.GetColor(0x373739);
+            pct.InnerBorder = factory.GetColor(0xA6A6A6);
+            pct.Chunk = new GradientColorTable(0xD20000, 0xFFCDCD, 0);
+            pct.ChunkOverlay = new GradientColorTable();
+            pct.ChunkOverlay.LinearGradientAngle = 90;
+            pct.ChunkOverlay.Colors.AddRange(new BackgroundColorBlend[] {
+                new BackgroundColorBlend(Color.FromArgb(192, factory.GetColor(0xFF8F8F)), 0f),
+                new BackgroundColorBlend(Color.FromArgb(128, factory.GetColor(0xD20000)), .5f),
+                new BackgroundColorBlend(Color.FromArgb(64, factory.GetColor(0xFE0000)), .5f),
+                new BackgroundColorBlend(Color.Transparent, 1f),
+            });
+            pct.ChunkShadow = new GradientColorTable(0x7D7E7F, 0x909190, 0);
+            #endregion
+
+            #region Gallery
+            Office2007GalleryColorTable gallery = table.Gallery;
+            gallery.GroupLabelBackground = factory.GetColor(0xF0F2F5);
+            gallery.GroupLabelText = factory.GetColor(0x3B3B3B);
+            gallery.GroupLabelBorder = factory.GetColor(0xF0F2F5);
+            #endregion
+
+            #region Legacy Colors
+            table.LegacyColors.BarBackground = factory.GetColor(0xC9C9C9);
+            table.LegacyColors.BarBackground2 = factory.GetColor(0xA3A3A3);
+            table.LegacyColors.BarStripeColor = factory.GetColor(0x525252);
+            table.LegacyColors.BarCaptionBackground = factory.GetColor(0x686868);
+            table.LegacyColors.BarCaptionBackground2 = Color.Empty;
+            table.LegacyColors.BarCaptionInactiveBackground = factory.GetColor(0x7c7c7c);
+            table.LegacyColors.BarCaptionInactiveBackground2 = Color.Empty;
+            table.LegacyColors.BarCaptionInactiveText = factory.GetColor(0xFFFFFF);
+            table.LegacyColors.BarCaptionText = factory.GetColor(0xFFFFFF);
+            table.LegacyColors.BarFloatingBorder = factory.GetColor(0x444444);
+            table.LegacyColors.BarPopupBackground = factory.GetColor(0xFFFFFF);
+            table.LegacyColors.BarPopupBorder = factory.GetColor(0xA7ABB0);
+            table.LegacyColors.ItemBackground = Color.Empty;
+            table.LegacyColors.ItemBackground2 = Color.Empty;
+            table.LegacyColors.ItemCheckedBackground = factory.GetColor(0xFCD578);
+            table.LegacyColors.ItemCheckedBackground2 = factory.GetColor(0xFBC84F);
+            table.LegacyColors.ItemCheckedBorder = factory.GetColor(0xBB5503);
+            table.LegacyColors.ItemCheckedText = factory.GetColor(0x000000);
+            table.LegacyColors.ItemDisabledBackground = Color.Empty;
+            table.LegacyColors.ItemDisabledText = factory.GetColor(0x8D8D8D);
+            table.LegacyColors.ItemExpandedShadow = Color.Empty;
+            table.LegacyColors.ItemExpandedBackground = factory.GetColor(0xE3EFFE);
+            table.LegacyColors.ItemExpandedBackground2 = factory.GetColor(0x99BFF0);
+            table.LegacyColors.ItemExpandedText = factory.GetColor(0x000000);
+            table.LegacyColors.ItemHotBackground = factory.GetColor(0xFFF5CC);
+            table.LegacyColors.ItemHotBackground2 = factory.GetColor(0xFFDB75);
+            table.LegacyColors.ItemHotBorder = factory.GetColor(0xFFBD69);
+            table.LegacyColors.ItemHotText = factory.GetColor(0x3B3B3B);
+            table.LegacyColors.ItemPressedBackground = factory.GetColor(0xFC973D);
+            table.LegacyColors.ItemPressedBackground2 = factory.GetColor(0xFFB85E);
+            table.LegacyColors.ItemPressedBorder = factory.GetColor(0xFB8C3C);
+            table.LegacyColors.ItemPressedText = factory.GetColor(0x3B3B3B);
+            table.LegacyColors.ItemSeparator = factory.GetColor(0x868B91);
+            table.LegacyColors.ItemSeparatorShade = Color.FromArgb(192, factory.GetColor(0xFDFDFE));
+            table.LegacyColors.ItemText = factory.GetColor(0x000000); // SystemColors.ControlTet;
+            table.LegacyColors.MenuBackground = factory.GetColor(0xFFFFFF);
+            table.LegacyColors.MenuBackground2 = Color.Empty; // Color.White;
+            table.LegacyColors.MenuBarBackground = factory.GetColor(0xC9C9C9);
+            table.LegacyColors.MenuBorder = factory.GetColor(0xA7ABB0);
+            table.LegacyColors.ItemExpandedBorder = table.LegacyColors.MenuBorder;
+            table.LegacyColors.MenuSide = factory.GetColor(0xFFFFFF);
+            table.LegacyColors.MenuSide2 = Color.Empty; // factory.GetColor(0xDDE0E8);
+            table.LegacyColors.MenuUnusedBackground = table.LegacyColors.MenuBackground;
+            table.LegacyColors.MenuUnusedSide = factory.GetColor(0xDADADA);
+            table.LegacyColors.MenuUnusedSide2 = Color.Empty;// System.Windows.Forms.ControlPaint.Light(table.LegacyColors.MenuSide2);
+            table.LegacyColors.ItemDesignTimeBorder = Color.Black;
+            table.LegacyColors.BarDockedBorder = factory.GetColor(0x5E5E5E);
+            table.LegacyColors.DockSiteBackColor = factory.GetColor(0xC9C9C9);
+            table.LegacyColors.DockSiteBackColor2 = Color.Empty;
+            table.LegacyColors.CustomizeBackground = factory.GetColor(0x848484);
+            table.LegacyColors.CustomizeBackground2 = factory.GetColor(0x797979);
+            table.LegacyColors.CustomizeText = factory.GetColor(0x000000);
+            table.LegacyColors.PanelBackground = factory.GetColor(0xC9C9C9);
+            table.LegacyColors.PanelBackground2 = factory.GetColor(0xA3A3A3);
+            table.LegacyColors.PanelText = factory.GetColor(0x000000);
+            table.LegacyColors.PanelBorder = factory.GetColor(0x303030);
+            table.LegacyColors.ExplorerBarBackground = factory.GetColor(0xCFCFCF);
+            table.LegacyColors.ExplorerBarBackground2 = factory.GetColor(0xC9C9C9);
+            table.LegacyColors.SplitterBackground = factory.GetColor(0x666666);
+            table.LegacyColors.SplitterBackground2 = factory.GetColor(0x515151);
+            table.LegacyColors.SplitterBorder = factory.GetColor(0x303030);
+            table.LegacyColors.SplitterText = table.LegacyColors.SplitterBorder;
+            #endregion
+
+            #region Navigation Pane
+            table.NavigationPane.ButtonBackground = new GradientColorTable();
+            table.NavigationPane.ButtonBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0x5B5B5B), 0));
+            #endregion
+
+            #region SuperTooltip
+            table.SuperTooltip.BackgroundColors = new LinearGradientColorTable(factory.GetColor(0xFFFFFF), factory.GetColor(0xE4E4F0));
+            table.SuperTooltip.TextColor = factory.GetColor(0x4C4C4C);
+            #endregion
+
+            #region Slider
+            table.Slider = GetSliderTable(factory);
+            table.ContextualTables.Add(Office2007ColorTable.GetContextualKey(typeof(Office2007SliderColorTable), typeof(Bar)) + "+StatusBar",
+                GetSliderTableStatusBar(factory));
+            #endregion
+
+            #region RangeSlider
+            Office2007ColorTable.InitRangeSlider(table, factory);
+            #endregion
+
+            #region ListViewEx
+            table.ListViewEx.Border = factory.GetColor(editBorderColor);
+            table.ListViewEx.ColumnBackground = new LinearGradientColorTable(factory.GetColor(0xEAEAEA), factory.GetColor(0xDFDFDF));
+            table.ListViewEx.ColumnSeparator = factory.GetColor(0x3B3B3B);
+            table.ListViewEx.ColumnForeColor = factory.GetColor(0x000000);
+            table.ListViewEx.SelectionBackground = new LinearGradientColorTable(factory.GetColor(0xA7CDF0), Color.Empty);
+            table.ListViewEx.SelectionBorder = factory.GetColor(0x58320F);
+            #endregion
+
+            #region DataGridView
+            table.DataGridView.ColumnHeaderNormalBorder = factory.GetColor(0x868B91);
+            table.DataGridView.ColumnHeaderNormalBackground = new LinearGradientColorTable(factory.GetColor(0xEBEDF0), factory.GetColor(0xD5D8DC), 90);
+            table.DataGridView.ColumnHeaderSelectedBackground = new LinearGradientColorTable(factory.GetColor(0xF9D99F), factory.GetColor(0xF1C15F), 90);
+            table.DataGridView.ColumnHeaderSelectedBorder = factory.GetColor(0xF29536);
+            table.DataGridView.ColumnHeaderSelectedMouseOverBackground = new LinearGradientColorTable(factory.GetColor(0xFFD58D), factory.GetColor(0xF2923A), 90);
+            table.DataGridView.ColumnHeaderSelectedMouseOverBorder = factory.GetColor(0xF29536);
+            table.DataGridView.ColumnHeaderMouseOverBackground = new LinearGradientColorTable(factory.GetColor(0xDFE2E4), factory.GetColor(0xBCC5D2), 90);
+            table.DataGridView.ColumnHeaderMouseOverBorder = factory.GetColor(0x879FB7);
+            table.DataGridView.ColumnHeaderPressedBackground = new LinearGradientColorTable(factory.GetColor(0xBCC5D2), factory.GetColor(0xDFE2E4), 90);
+            table.DataGridView.ColumnHeaderPressedBorder = factory.GetColor(0xFFFFFF);
+
+            table.DataGridView.RowNormalBackground = new LinearGradientColorTable(factory.GetColor(0xEBEDF0));
+            table.DataGridView.RowNormalBorder = factory.GetColor(0x868B91);
+            table.DataGridView.RowSelectedBackground = new LinearGradientColorTable(factory.GetColor(0xFFD58D));
+            table.DataGridView.RowSelectedBorder = factory.GetColor(0xF29536);
+            table.DataGridView.RowSelectedMouseOverBackground = new LinearGradientColorTable(factory.GetColor(0xF1C05C));
+            table.DataGridView.RowSelectedMouseOverBorder = factory.GetColor(0xF29536);
+            table.DataGridView.RowMouseOverBackground = new LinearGradientColorTable(factory.GetColor(0xDFE2E4));
+            table.DataGridView.RowMouseOverBorder = factory.GetColor(0x879FB7);
+            table.DataGridView.RowPressedBackground = new LinearGradientColorTable(factory.GetColor(0xBBC4D1));
+            table.DataGridView.RowPressedBorder = factory.GetColor(0xFFFFFF);
+
+            table.DataGridView.GridColor = factory.GetColor(0xAAAAAA);
+
+            table.DataGridView.SelectorBackground = new LinearGradientColorTable(factory.GetColor(0xC6C6C6));
+            table.DataGridView.SelectorBorder = factory.GetColor(0x909192);
+            table.DataGridView.SelectorBorderDark = factory.GetColor(0xC3C3C3);
+            table.DataGridView.SelectorBorderLight = factory.GetColor(0xF9F9F9);
+            table.DataGridView.SelectorSign = new LinearGradientColorTable(factory.GetColor(0xF2F2F2));
+
+            table.DataGridView.SelectorMouseOverBackground = new LinearGradientColorTable(factory.GetColor(0x8BA0B5));
+            table.DataGridView.SelectorMouseOverBorder = factory.GetColor(0x9EB6CE);
+            table.DataGridView.SelectorMouseOverBorderDark = factory.GetColor(0xB0CFF7);
+            table.DataGridView.SelectorMouseOverBorderLight = factory.GetColor(0xD5E4F2);
+            table.DataGridView.SelectorMouseOverSign = new LinearGradientColorTable(factory.GetColor(0xF9FAFB), factory.GetColor(0xD7DAE2));
+            #endregion
+
+            #region SideBar
+            table.SideBar.Background = new LinearGradientColorTable(factory.GetColor(Color.White));
+            table.SideBar.Border = factory.GetColor(editBorderColor);
+            table.SideBar.SideBarPanelItemText = factory.GetColor(0x3B3B3B);
+            table.SideBar.SideBarPanelItemDefault = new GradientColorTable();
+            table.SideBar.SideBarPanelItemDefault.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xDBE1E7), 0));
+            table.SideBar.SideBarPanelItemDefault.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xBBC3CD), 1));
+            // Expanded
+            table.SideBar.SideBarPanelItemExpanded = new GradientColorTable();
+            table.SideBar.SideBarPanelItemExpanded.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFBDBB5), 0));
+            table.SideBar.SideBarPanelItemExpanded.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFEC778), .4f));
+            table.SideBar.SideBarPanelItemExpanded.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFEB456), .4f));
+            table.SideBar.SideBarPanelItemExpanded.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFDEB9F), 1));
+            // MouseOver
+            table.SideBar.SideBarPanelItemMouseOver = new GradientColorTable();
+            table.SideBar.SideBarPanelItemMouseOver.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFFFCD9), 0));
+            table.SideBar.SideBarPanelItemMouseOver.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFFE78D), .4f));
+            table.SideBar.SideBarPanelItemMouseOver.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFFD748), .4f));
+            table.SideBar.SideBarPanelItemMouseOver.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFFE793), 1));
+            // Pressed
+            table.SideBar.SideBarPanelItemPressed = new GradientColorTable();
+            table.SideBar.SideBarPanelItemPressed.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xF8B869), 0));
+            table.SideBar.SideBarPanelItemPressed.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFDA361), .4f));
+            table.SideBar.SideBarPanelItemPressed.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFB8A3C), .4f));
+            table.SideBar.SideBarPanelItemPressed.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFEBB60), 1));
+            #endregion
+
+            #region AdvTree
+#if !NOTREE
+            table.AdvTree = new DevComponents.AdvTree.Display.TreeColorTable();
+            DevComponents.AdvTree.Display.ColorTableInitializer.InitOffice2007Blue(table.AdvTree, factory);
+#endif
+            #endregion
+
+            #region CrumbBar
+            table.CrumbBarItemView = new CrumbBarItemViewColorTable();
+            CrumbBarItemViewStateColorTable crumbBarViewTable = new CrumbBarItemViewStateColorTable();
+            table.CrumbBarItemView.Default = crumbBarViewTable;
+            crumbBarViewTable.Foreground = factory.GetColor(0x3B3B3B);
+            crumbBarViewTable = new CrumbBarItemViewStateColorTable();
+            table.CrumbBarItemView.MouseOver = crumbBarViewTable;
+            crumbBarViewTable.Foreground = factory.GetColor(0x3B3B3B);
+            crumbBarViewTable.Background = new BackgroundColorBlendCollection();
+            crumbBarViewTable.Background.AddRange(new BackgroundColorBlend[]{
+                new BackgroundColorBlend(factory.GetColor("FFFCD9"), 0f),
+                new BackgroundColorBlend(factory.GetColor("FFE78D"), .4f),
+                new BackgroundColorBlend(factory.GetColor("FFD748"), .4f),
+                new BackgroundColorBlend(factory.GetColor("FFE793"), 1f)});
+            crumbBarViewTable.Border = factory.GetColor("FFB8A98E");
+            crumbBarViewTable.BorderLight = factory.GetColor("90FFFFFF");
+            crumbBarViewTable = new CrumbBarItemViewStateColorTable();
+            table.CrumbBarItemView.MouseOverInactive = crumbBarViewTable;
+            crumbBarViewTable.Foreground = factory.GetColor(0x3B3B3B);
+            crumbBarViewTable.Background = new BackgroundColorBlendCollection();
+            crumbBarViewTable.Background.AddRange(new BackgroundColorBlend[]{
+                new BackgroundColorBlend(factory.GetColor("FFFFFDEC"), 0f),
+                new BackgroundColorBlend(factory.GetColor("FFFFF4CA"), .4f),
+                new BackgroundColorBlend(factory.GetColor("FFFFEBA6"), .4f),
+                new BackgroundColorBlend(factory.GetColor("FFFFF2C5"), 1f)});
+            crumbBarViewTable.Border = factory.GetColor("FF8E8F8F");
+            crumbBarViewTable.BorderLight = factory.GetColor("90FFFFFF");
+            crumbBarViewTable = new CrumbBarItemViewStateColorTable();
+            table.CrumbBarItemView.Pressed = crumbBarViewTable;
+            crumbBarViewTable.Foreground = factory.GetColor(0x3B3B3B);
+            crumbBarViewTable.Background = new BackgroundColorBlendCollection();
+            crumbBarViewTable.Background.AddRange(new BackgroundColorBlend[]{
+                new BackgroundColorBlend(factory.GetColor("FFC59B61"), 0f),
+                new BackgroundColorBlend(factory.GetColor("FFEEB469"), .1f),
+                new BackgroundColorBlend(factory.GetColor("FFFCA060"), .6f),
+                new BackgroundColorBlend(factory.GetColor("FFFB8E3D"), .6f),
+                new BackgroundColorBlend(factory.GetColor("FFFEBB60"), 1f)});
+            crumbBarViewTable.Border = factory.GetColor("FF8B7654");
+            crumbBarViewTable.BorderLight = factory.GetColor("408B7654");
+
+            #endregion
+
+            #region WarningBox
+            table.WarningBox.BackColor = factory.GetColor(factory.GetColor(0xD3D3D3));
+            table.WarningBox.WarningBorderColor = factory.GetColor(editBorderColor);
+            table.WarningBox.WarningBackColor1 = factory.GetColor(0xfefefe);
+            table.WarningBox.WarningBackColor2 = factory.GetColor(0xE5E9EE);
+            #endregion
+
+            #region CalendarView
+
+            #region WeekDayViewColors
+
+            table.CalendarView.WeekDayViewColors = new ColorDef[]
+            {
+                new ColorDef(factory.GetColor(0xB0B6BE)),           // DayViewBorder
+                new ColorDef(factory.GetColor(0x363636)),           // DayHeaderForeground
+
+                new ColorDef(factory.GetColor(0xC7CBD1)),             // DayHeaderBackground
+
+                new ColorDef(factory.GetColor(0xB0B6BE)),           // DayHeaderBorder
+
+                new ColorDef(factory.GetColor(0xFFFFFF)),           // DayWorkHoursBackground
+                new ColorDef(factory.GetColor(0xC7CBD1)),           // DayAllDayEventBackground
+                new ColorDef(factory.GetColor(0xE8EAEC)),           // DayOffWorkHoursBackground
+
+                new ColorDef(factory.GetColor(0xC7CBD1)),           // DayHourBorder
+                new ColorDef(factory.GetColor(0xE8EAEC)),           // DayHalfHourBorder
+
+                new ColorDef(factory.GetColor(0x4C535C)),           // SelectionBackground
+
+                new ColorDef(factory.GetColor(0x9199A4)),           // OwnerTabBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xCFD2D8), factory.GetColor(0xB0B6BE)},    // OwnerTabBackground
+                new float[] {0f, 1f}, 90f),
+
+                new ColorDef(factory.GetColor(0x000000)),           // OwnerTabForeground
+                new ColorDef(factory.GetColor(0xB0B6BE)),           // OwnerTabContentBackground
+                new ColorDef(factory.GetColor(0x000000)),           // OwnerTabSelectedForeground
+                new ColorDef(factory.GetColor(0xFFFFFF)),           // OwnerTabSelectionBackground
+
+                new ColorDef(factory.GetColor(0xF5F5F5)),           // CondensedViewBackground
+
+                new ColorDef(factory.GetColor(0xEB8900)),           // NowDayViewBorder
+                new ColorDef(factory.GetColor(0x000000)),           // NowDayHeaderForeground - 0x15428B
+
+                new ColorDef(new Color[] {factory.GetColor(0xFFED79), factory.GetColor(0xFFD86B), factory.GetColor(0xFFBB00), factory.GetColor(0xFFEA77)},
+                new float[] {0f, .55f ,58f, 1f}, 90f),              // NowDayHeaderBackground
+                
+                new ColorDef(new Color[] {factory.GetColor(0xFFED79), factory.GetColor(0xFFD86B), factory.GetColor(0xFFBB00), factory.GetColor(0xFFEA77)},
+                new float[] {0f, .55f ,58f, 1f}, 90f),              // TimeIndicator
+
+                new ColorDef(factory.GetColor(0xEB8900)),           // TimeIndicatorBorder
+            };
+
+            #endregion
+
+            #region HourRulerColors
+
+            table.CalendarView.TimeRulerColors = new ColorDef[]
+            {
+                new ColorDef(factory.GetColor(0xFFFFFF)),           // TimeRulerBackground
+                new ColorDef(factory.GetColor(0x363636)),           // TimeRulerForeground
+                new ColorDef(factory.GetColor(0xB8B8B8)),           // TimeRulerBorder
+                new ColorDef(factory.GetColor(0xB8B8B8)),           // TimeRulerTickBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xFFED79), factory.GetColor(0xFFD86B), factory.GetColor(0xFFBB00), factory.GetColor(0xFFEA77)},
+                new float[] {0f, .55f ,58f, 1f}, 90f),              // TimeRulerIndicator
+
+                new ColorDef(factory.GetColor(0xEB8900)),           // TimeRulerIndicatorBorder
+            };
+
+            #endregion
+
+            #region MonthViewColors
+
+            table.CalendarView.MonthViewColors = new ColorDef[]
+            {
+              new ColorDef(factory.GetColor(0x9199A4)),           // DayOfWeekHeaderBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xDCDFE2), factory.GetColor(0xD3D6DA), factory.GetColor(0xB4BAC1), factory.GetColor(0xCBCED4)},
+                new float[] {0, .55f, .58f, 1}),                    // DayOfWeekHeaderBackground
+
+                new ColorDef(factory.GetColor(0x616A76)),           // DayOfWeekHeaderForeground
+                new ColorDef(factory.GetColor(0x9199A4)),           // SideBarBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xDCDFE2), factory.GetColor(0xD2D5DA), factory.GetColor(0xB7BCC3), factory.GetColor(0xCACED4)},
+                new float[] {0, .6f, .6f, 1}, 0),                   // SideBarBackground
+
+                new ColorDef(factory.GetColor(0x000000)),           // SideBarForeground
+                new ColorDef(factory.GetColor(0x9199A4)),           // DayHeaderBorder
+
+                new ColorDef(factory.GetColor(0xC7CBD1)),           // DayHeaderBackground
+
+                new ColorDef(factory.GetColor(0x000000)),           // DayHeaderForeground
+                new ColorDef(factory.GetColor(0x9199A4)),           // DayContentBorder
+                new ColorDef(factory.GetColor(0xE8EAEC)),           // DayContentSelectionBackground
+                new ColorDef(factory.GetColor(0xFFFFFF)),           // DayContentActiveDayBackground
+                new ColorDef(factory.GetColor(0xC7CBD1)),           // DayContentInactiveDayBackground
+
+                new ColorDef(factory.GetColor(0x9199A4)),           // OwnerTabBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xCFD2D8), factory.GetColor(0xB0B6BE)},    // OwnerTabBackground
+                new float[] {0f, 1f}, 90f),
+
+                new ColorDef(factory.GetColor(0x000000)),           // OwnerTabForeground
+                new ColorDef(factory.GetColor(0xB0B6BE)),           // OwnerTabContentBackground
+                new ColorDef(factory.GetColor(0x000000)),           // OwnerTabSelectedForeground
+                new ColorDef(factory.GetColor(0xFFFFFF)),           // OwnerTabSelectionBackground
+
+                new ColorDef(factory.GetColor(0xEB8900)),           // NowDayViewBorder
+                new ColorDef(factory.GetColor(0x000000)),           // NowDayHeaderForeground - 0x15428B
+
+                new ColorDef(new Color[] {factory.GetColor(0xFFED79), factory.GetColor(0xFFD86B), factory.GetColor(0xFFBB00), factory.GetColor(0xFFEA77)},
+                new float[] {0f, .55f ,58f, 1f}, 90f),              // NowDayHeaderBackground
+
+                new ColorDef(factory.GetColor(0x000000)),           // ContentLinkForeground - DayHeaderForeground
+                new ColorDef(factory.GetColor(0xFFFFFF)),           // ContentLinkBackground - DayContentActiveDayBackground
+            };
+
+            #endregion
+
+            #region AppointmentColors
+
+            table.CalendarView.AppointmentColors = new ColorDef[]
+            {
+                new ColorDef(factory.GetColor(0x4B71A2)),           // DefaultBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xFDFEFF), factory.GetColor(0xC1D3EA)},
+                             new float[] {0f, 1f}, 90f),            // DefaultBackground
+
+                new ColorDef(factory.GetColor(0x28518E)),           // BlueBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xB1C5EC), factory.GetColor(0x759DDA)}, 
+                             new float[] {0f, 1f}, 90f),            // BlueBackground
+
+                new ColorDef(factory.GetColor(0x2C6524)),           // GreenBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xC2E8BC), factory.GetColor(0x84D17B)},
+                             new float[] {0f, 1f}, 90f),            // GreenBackground
+
+                new ColorDef(factory.GetColor(0x8B3E0A)),           // OrangeBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xF9C7A0), factory.GetColor(0xF49758)},
+                             new float[] {0f, 1f}, 90f),            // OrangeBackground
+
+                new ColorDef(factory.GetColor(0x3E2771)),           // PurpleBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xC5B5E6), factory.GetColor(0x957BD2)},
+                             new float[] {0f, 1f}, 90f),            // PurpleBackground
+
+                new ColorDef(factory.GetColor(0x86171C)),           // RedBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xF1AAAC), factory.GetColor(0xE5676E)},
+                             new float[] {0f, 1f}, 90f),            // RedBackground
+
+                new ColorDef(factory.GetColor(0x7C7814)),           // YellowBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xFFFCAA), factory.GetColor(0xFFF958)},
+                             new float[] {0f, 1f}, 90f),            // YellowBackground
+
+                new ColorDef(factory.GetColor(-1)),                 // BusyTimeMarker
+                new ColorDef(factory.GetColor(0xFFFFFF)),           // FreeTimeMarker
+                new ColorDef(factory.GetColor(0x800080))            // OutOfOfficeTimeMarker
+            };
+
+            #endregion
+
+            #endregion
+
+            #region SuperTab
+
+            #region SuperTab
+
+            table.SuperTab.Background = new SuperTabLinearGradientColorTable(
+                factory.GetColor(0xE5E9ED), Color.Empty);
+
+            table.SuperTab.InnerBorder = factory.GetColor(0xDFE3E8);
+            table.SuperTab.OuterBorder = factory.GetColor(0x7F8388);
+
+            table.SuperTab.ControlBoxDefault.Image = factory.GetColor(0xFF, 0x000000);
+
+            table.SuperTab.ControlBoxMouseOver.Background = factory.GetColor(0xFFE7A2);
+            table.SuperTab.ControlBoxMouseOver.Border = factory.GetColor(0xFFBD69);
+            table.SuperTab.ControlBoxMouseOver.Image = factory.GetColor(0xFF, 0x000000);
+
+            table.SuperTab.ControlBoxPressed.Background = factory.GetColor(0xFB8C3C);
+            table.SuperTab.ControlBoxPressed.Border = factory.GetColor(0xFFBD69);
+            table.SuperTab.ControlBoxPressed.Image = factory.GetColor(0xFF, 0x000000);
+
+            table.SuperTab.InsertMarker = factory.GetColor(0xFF, 0x000080);
+
+            #endregion
+
+            #region SuperTabItem
+
+            // Top Default
+
+            table.SuperTabItem.Default.Normal.Background = new SuperTabLinearGradientColorTable(
+                new Color[] { factory.GetColor(0xEFF1F3), factory.GetColor(0xE1E4E9), factory.GetColor(0xEDEFF2), factory.GetColor(0xEFF1F3) },
+                new float[] { 0, .5f, .5f, 1 });
+
+            table.SuperTabItem.Default.Normal.InnerBorder = factory.GetColor(0xDFE3E8);
+            table.SuperTabItem.Default.Normal.OuterBorder = factory.GetColor(0x7F8388);
+            table.SuperTabItem.Default.Normal.Text = factory.GetColor(0x4D5359);
+            table.SuperTabItem.Default.Normal.CloseMarker = factory.GetColor(0x406F9F);
+
+            // Disabled
+            table.SuperTabItem.Default.Disabled.Text = factory.GetColor(0x8D8D8D);
+            table.SuperTabItem.Default.Disabled.Background.AdaptiveGradient = false;
+            table.SuperTabItem.Default.Disabled.CloseMarker = factory.GetColor(0x8D8D8D);
+
+            // Top Selected
+
+            table.SuperTabItem.Default.Selected.Background = new SuperTabLinearGradientColorTable(
+                new Color[] { factory.GetColor(0xE2E6EB), factory.GetColor(0xF9FAFB), factory.GetColor(0xF9FAFB), factory.GetColor(0xFFFFFF) },
+                new float[] { 0, .5f, .5f, 1 });
+
+            table.SuperTabItem.Default.Selected.InnerBorder = factory.GetColor(0xDFE3E8);
+            table.SuperTabItem.Default.Selected.OuterBorder = factory.GetColor(0x7F8388);
+            table.SuperTabItem.Default.Selected.Text = factory.GetColor(0x4D5359);
+            table.SuperTabItem.Default.Selected.CloseMarker = factory.GetColor(0x406F9F);
+
+            // Top SelectedMouseOver
+
+            table.SuperTabItem.Default.SelectedMouseOver.Background = new SuperTabLinearGradientColorTable(
+                new Color[] { factory.GetColor(0xDFE3E8), factory.GetColor(0xF7F8F9), factory.GetColor(0xF7F8F9), factory.GetColor(0xFEFEFF) },
+                new float[] { 0, .5f, .5f, 1 });
+
+            table.SuperTabItem.Default.SelectedMouseOver.InnerBorder = factory.GetColor(0xF3F4F6);
+            table.SuperTabItem.Default.SelectedMouseOver.OuterBorder = factory.GetColor(0x868B91);
+            table.SuperTabItem.Default.SelectedMouseOver.Text = factory.GetColor(0x4D5359);
+            table.SuperTabItem.Default.SelectedMouseOver.CloseMarker = factory.GetColor(0x406F9F);
+
+            // Top MouseOver
+
+            table.SuperTabItem.Default.MouseOver.Background = new SuperTabLinearGradientColorTable(
+                new Color[] { factory.GetColor(0xDFE3E8), factory.GetColor(0xF7F8F9), factory.GetColor(0xF7F8F9), factory.GetColor(0xFEFEFF) },
+                new float[] { 0, .5f, .5f, 1 });
+
+            table.SuperTabItem.Default.MouseOver.InnerBorder = factory.GetColor(0xF3F4F6);
+            table.SuperTabItem.Default.MouseOver.OuterBorder = factory.GetColor(0x868B91);
+            table.SuperTabItem.Default.MouseOver.Text = factory.GetColor(0x4D5359);
+            table.SuperTabItem.Default.MouseOver.CloseMarker = factory.GetColor(0x406F9F);
+
+            // Left, Bottom, Right
+
+            table.SuperTabItem.Left = table.SuperTabItem.Default;
+            table.SuperTabItem.Bottom = table.SuperTabItem.Default;
+            table.SuperTabItem.Right = table.SuperTabItem.Default;
+
+            #endregion
+
+            #region SuperTabPanel
+
+            table.SuperTabPanel.Default.Background = new SuperTabLinearGradientColorTable(factory.GetColor(0xFFFFFF), Color.Empty);
+            table.SuperTabPanel.Default.InnerBorder = factory.GetColor(0xDFE3E8);
+            table.SuperTabPanel.Default.OuterBorder = factory.GetColor(0x4D5359);
+
+            table.SuperTabPanel.Left = table.SuperTabPanel.Default;
+            table.SuperTabPanel.Bottom = table.SuperTabPanel.Default;
+            table.SuperTabPanel.Right = table.SuperTabPanel.Default;
+
+            #endregion
+
+            #endregion
+
+            #region Backstage
+
+            #region Backstage
+            SuperTabStyleColorFactory.GetOffice2010BackstageBlackColorTable(table.Backstage, factory);
+            #endregion
+
+            #region BackstageItem
+            SuperTabStyleColorFactory.GetOffice2010BackstageBlackItemColorTable(table.BackstageItem, factory);
+            #endregion
+
+            #region BackstagePanel
+            SuperTabStyleColorFactory.GetOffice2010BackstageBlackPanelColorTable(table.BackstagePanel, factory);
+            #endregion
+
+            #endregion
+
+            #region SwitchButton
+            SwitchButtonColorTable sbt = new SwitchButtonColorTable();
+            sbt.BorderColor = factory.GetColor(0x919191);
+            sbt.OffBackColor = factory.GetColor(0xC9C9C9);
+            sbt.OffTextColor = factory.GetColor(0x000000);
+            sbt.OnBackColor = factory.GetColor(0x92D050);
+            sbt.OnTextColor = factory.GetColor(0x000000);
+            sbt.SwitchBackColor = factory.GetColor(0xA4A4A4);
+            sbt.SwitchBorderColor = factory.GetColor(0x555555);
+            sbt.TextColor = factory.GetColor(0x000000);
+            table.SwitchButton = new SwitchButtonColors();
+            table.SwitchButton.Default = sbt;
+            table.SwitchButton.Disabled.BorderColor = table.CheckBoxItem.Disabled.CheckBorder;
+            table.SwitchButton.Disabled.SwitchBorderColor = table.SwitchButton.Disabled.BorderColor;
+            table.SwitchButton.Disabled.OffTextColor = table.CheckBoxItem.Disabled.Text;
+            table.SwitchButton.Disabled.OnTextColor = table.SwitchButton.Disabled.OffTextColor;
+            table.SwitchButton.Disabled.TextColor = table.SwitchButton.Disabled.OffTextColor;
+            table.SwitchButton.Disabled.SwitchBackColor = table.CheckBoxItem.Disabled.CheckInnerBackground.Start;
+            table.SwitchButton.Disabled.OffBackColor = table.CheckBoxItem.Disabled.CheckInnerBackground.Start;
+            table.SwitchButton.Disabled.OnBackColor = table.SwitchButton.Disabled.OffBackColor;
+            #endregion
+
+            #region ElementStyle Classes
+            table.StyleClasses.Clear();
+            ElementStyle style = new ElementStyle();
+            style.Class = ElementStyleClassKeys.RibbonGalleryContainerKey;
+            style.BorderColor = factory.GetColor(0x848484);
+            style.Border = eStyleBorderType.Solid;
+            style.BorderWidth = 1;
+            style.CornerDiameter = 2;
+            style.CornerType = eCornerType.Rounded;
+            style.BackColor = factory.GetColor(0xBBBBBB);
+            table.StyleClasses.Add(style.Class, style);
+            // FileMenuContainer
+            style = GetFileMenuContainerStyle(table);
+            table.StyleClasses.Add(style.Class, style);
+            // Two Column File Menu Container
+            style = GetTwoColumnMenuContainerStyle(table);
+            table.StyleClasses.Add(style.Class, style);
+            // Column one File Menu Container
+            style = GetMenuColumnOneContainerStyle(table);
+            table.StyleClasses.Add(style.Class, style);
+            // Column two File Menu Container
+            style = GetMenuColumnTwoContainerStyle(table);
+            table.StyleClasses.Add(style.Class, style);
+            // Bottom File Menu Container
+            style = GetMenuBottomContainer(table);
+            table.StyleClasses.Add(style.Class, style);
+            // TextBox border
+            style = Office2007ColorTableFactory.GetTextBoxStyle(factory.GetColor(editBorderColor));
+            table.StyleClasses.Add(style.Class, style);
+            // RichTextBox border
+            style = Office2007ColorTableFactory.GetRichTextBoxStyle(factory.GetColor(editBorderColor));
+            table.StyleClasses.Add(style.Class, style);
+            // ItemPanel
+            style = Office2007ColorTableFactory.GetItemPanelStyle(factory.GetColor(editBorderColor));
+            table.StyleClasses.Add(style.Class, style);
+            // ListBoxAdv
+            style = Office2007ColorTableFactory.GetListBoxAdvStyle(factory.GetColor(editBorderColor));
+            table.StyleClasses.Add(style.Class, style);
+            // DateTimeInput background
+            style = Office2007ColorTableFactory.GetDateTimeInputBackgroundStyle(factory.GetColor(editBorderColor), SystemColors.Window);
+            table.StyleClasses.Add(style.Class, style);
+            // Ribbon Client Panel
+            style = Office2010BlueFactory.GetRibbonClientPanelStyle(factory, eOffice2010ColorScheme.Black);
+            table.StyleClasses.Add(style.Class, style);
+            // ListView Border
+            style = Office2007ColorTableFactory.GetListViewBorderStyle(table.ListViewEx);
+            table.StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetStatusBarAltStyle(table.Bar);
+            table.StyleClasses.Add(style.Class, style);
+#if !NOTREE
+            // Tree Border/Background
+            style = Office2007ColorTableFactory.GetAdvTreeStyle(factory.GetColor(editBorderColor), Color.Empty);
+            table.StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetAdvTreeColumnsHeaderStyle(table.DataGridView.ColumnHeaderNormalBackground.Start, table.DataGridView.ColumnHeaderNormalBackground.End, table.DataGridView.ColumnHeaderNormalBorder);
+            table.StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetAdvTreeNodesColumnsHeaderStyle(table.DataGridView.ColumnHeaderNormalBackground.Start, table.DataGridView.ColumnHeaderNormalBackground.End, table.DataGridView.ColumnHeaderNormalBorder);
+            table.StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetAdvTreeColumnStyle(factory.GetColor(editBorderColor));
+            table.StyleClasses.Add(style.Class, style);
+            // CrumbBar
+            style = Office2007ColorTableFactory.GetCrumbBarBackgroundStyle(factory.GetColor(Color.White), factory.GetColor("FF567DB0"), factory.GetColor("FF2F578D"));
+            table.StyleClasses.Add(style.Class, style);
+#endif
+            // DataGridView border
+            style = Office2007ColorTableFactory.GetDataGridViewStyle();
+            table.StyleClasses.Add(style.Class, style);
+            // DataGridViewDateTime border
+            style = Office2007ColorTableFactory.GetDataGridViewDateTimeStyle();
+            table.StyleClasses.Add(style.Class, style);
+            // DataGridViewNumeric border
+            style = Office2007ColorTableFactory.GetDataGridViewNumericStyle();
+            table.StyleClasses.Add(style.Class, style);
+            // DataGridViewIpAddress border
+            style = Office2007ColorTableFactory.GetDataGridViewIpAddressStyle();
+            table.StyleClasses.Add(style.Class, style);
+
+            // Slide-out Button
+            style = Office2007ColorTableFactory.GetSlideOutButtonStyle(table.CheckBoxItem.Default.CheckBorder);
+            table.StyleClasses.Add(style.Class, style);
+            // MetroTilePanel
+            style = Office2007ColorTableFactory.GetMetroTilePanelStyle(factory.GetColor(Color.White));
+            table.StyleClasses.Add(style.Class, style);
+            // MetroTileGroup
+            style = Office2007ColorTableFactory.GetMetroTileGroupStyle(factory.GetColor(Color.DarkGray));
+            table.StyleClasses.Add(style.Class, style);
+            // MonthCalendarAdv
+            style = Office2007ColorTableFactory.GetMonthCalendarStyle(SystemColors.Window);
+            table.StyleClasses.Add(style.Class, style);
+            // ProgressSteps control
+            style = Office2007ColorTableFactory.GetProgressStepsStyle(table);
+            table.StyleClasses.Add(style.Class, style);
+            // SideNavStrip
+            style = Office2007ColorTableFactory.GetSideNavStripStyle(factory.GetColor(0xA3A3A3));
+            table.StyleClasses.Add(style.Class, style);
+            // TabFormPanel
+            style = Office2007ColorTableFactory.GetTabFormPanelStyle(factory.GetColor(0xF5F6F7));
+            table.StyleClasses.Add(style.Class, style);
+
+            // Toolbox Control
+            style = Office2007ColorTableFactory.GetToolboxControlStyle(factory.GetColor(table.LegacyColors.PanelBorder), Color.Empty);
+            table.StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetToolboxGroupTitle(factory.GetColor(0x242424));
+            table.StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetToolboxGroupTitleMouseOver(factory.GetColor(0x242424), factory.GetColor(0xFFE37C));
+            table.StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetToolboxGroupExpandedTitle(factory.GetColor(0x242424), factory.GetColor(0xA3A3A3));
+            table.StyleClasses.Add(style.Class, style);
+            #endregion
+
+            #region StepIndicator
+            table.StepIndicator.BackgroundColor = factory.GetColor(ColorFunctions.GetShade(table.Form.BackColor, 10));
+            table.StepIndicator.IndicatorColor = factory.GetColor(0xA4CC28);
+            #endregion
+
+            #region RadialMenu
+            table.RadialMenu = new RadialMenuColorTable();
+            table.RadialMenu.CircularBackColor = factory.GetColor(0xD44F2E);
+            table.RadialMenu.CircularBorderColor = factory.GetColor(0xFFFFFF);
+            table.RadialMenu.CircularForeColor = factory.GetColor(0xFFFFFF);
+            table.RadialMenu.RadialMenuBackground = factory.GetColor(0xFFFFFF);
+            table.RadialMenu.RadialMenuBorder = factory.GetColor(0x656769);
+            table.RadialMenu.RadialMenuButtonBackground = factory.GetColor(0xFFFFFF);
+            table.RadialMenu.RadialMenuButtonBorder = factory.GetColor(0x656769);
+            table.RadialMenu.RadialMenuExpandForeground = factory.GetColor(0xFFFFFF);
+            table.RadialMenu.RadialMenuInactiveBorder = Color.FromArgb(128, table.RadialMenu.RadialMenuBorder);
+            table.RadialMenu.RadialMenuItemForeground = factory.GetColor(0x656769);
+            table.RadialMenu.RadialMenuItemDisabledForeground = factory.GetColor(0x8D8D8D);
+            table.RadialMenu.RadialMenuItemMouseOverBackground = Color.FromArgb(72, table.RadialMenu.RadialMenuItemForeground);
+            table.RadialMenu.RadialMenuItemMouseOverForeground = factory.GetColor(0x656769);
+            table.RadialMenu.RadialMenuMouseOverBorder = Color.FromArgb(200, table.RadialMenu.RadialMenuBorder);
+            #endregion
+
+            #region Contextual Label Colors
+            table.LabelItemColors.Clear();
+            table.LabelItemColors.Add(string.Empty, new LabelColors(factory.GetColor(0x000000), factory.GetColor(0x8D8D8D)));
+            table.LabelItemColors.Add(Office2007ColorTable.GetContextualKey(typeof(Bar), "StatusBar"), new LabelColors(factory.GetColor(0xFFFFFF), factory.GetColor(0x8D8D8D)));
+            #endregion
+
+            #region StepItem
+            table.StepItem.Default = new OfficeStepItemStateColorTable(new Color[]{
+                    factory.GetColor(0xE2E2E2), 
+                    factory.GetColor(0xD9D9D9), 
+                    factory.GetColor(0xD9D9D9), 
+                    factory.GetColor(0xC4C4C4)
+                    },
+                    90,
+                    new float[] { 0f, .5f, .5f, 1f },
+                factory.GetColor(0x000000),
+                new Color[] {
+                    factory.GetColor(0x919191) });
+            table.StepItem.Progress = new OfficeStepItemStateColorTable(new Color[]{
+                    factory.GetColor(0xD8F577), 
+                    factory.GetColor(0x75C300),
+                    factory.GetColor(0x75C300),
+                    factory.GetColor(0xA9E923)
+                    },
+                    90,
+                    new float[] { 0f, .6f, .6f, 1f },
+                Color.Empty,
+                new Color[0]);
+            table.StepItem.MouseOver = new OfficeStepItemStateColorTable(new Color[]{
+                    factory.GetColor(0xFFEEA8), 
+                    factory.GetColor(0xFFE37C),
+                    factory.GetColor(0xFFE37C), 
+                    factory.GetColor(0xFFFCE0)
+                    },
+                    90,
+                    new float[] { 0f, .5f, .5f, 1f },
+                factory.GetColor(0x464646),
+                new Color[] {
+                    factory.GetColor(0xF7C840) });
+            table.StepItem.Pressed = new OfficeStepItemStateColorTable(new Color[]{
+                    factory.GetColor(0xFBD678), 
+                    factory.GetColor(0xFFE48A),
+                    factory.GetColor(0xFFE48A), 
+                    factory.GetColor(0xFEE287)
+                    },
+                    90,
+                    new float[] { 0f, .5f, .5f, 1f },
+                factory.GetColor(0x464646),
+                new Color[] {
+                    factory.GetColor(0xC2762B) });
+            #endregion
+
+            #region SideNav
+            table.SideNav.SideNavItem.Default = new SideNavItemStateColorTable(factory.GetColor(0x000000));
+            table.SideNav.SideNavItem.MouseOver = new SideNavItemStateColorTable(factory.GetColor(0x000000),
+                new Color[]
+                {
+                    factory.GetColor(0xFFEEA8), factory.GetColor(0xFFE37C), factory.GetColor(0xFFE37C),
+                    factory.GetColor(0xFFFCE0)
+                },
+                new Color[] { factory.GetColor(0xF7C840), factory.GetColor(0xFFFFF0) },
+                0);
+            table.SideNav.SideNavItem.Pressed = new SideNavItemStateColorTable(factory.GetColor(0x000000),
+                new Color[]
+                {
+                    factory.GetColor(0xFBD678), factory.GetColor(0xFFE48A), factory.GetColor(0xFFE48A),
+                    factory.GetColor(0xFEE287)
+                },
+                new Color[] { factory.GetColor(0xC2762B), factory.GetColor(0xF6C867) },
+                0);
+            table.SideNav.SideNavItem.Selected = new SideNavItemStateColorTable(factory.GetColor(0x000000),
+                new Color[] { table.Form.BackColor },
+                new Color[] { Color.Empty, factory.GetColor(0x5E5E5E), Color.Empty, factory.GetColor(0x5E5E5E) });
+            table.SideNav.BorderColors = new Color[] { factory.GetColor(0x5E5E5E) };
+            table.SideNav.TitleBackColor = factory.GetColor(0x4B4B4B);
+            table.SideNav.TitleBorderColors = new Color[] { Color.Empty, Color.Empty, Color.Empty, factory.GetColor(0x5E5E5E) };
+            table.SideNav.PanelBackColor = table.Form.BackColor;
+
+            #endregion
+
+            #region TabForm
+            table.TabForm.Active.CaptionText = factory.GetColor(0xFFFFFF);
+            table.TabForm.Inactive.CaptionText = factory.GetColor(0xFFFFFF);
+            table.TabForm.Active.CaptionBackColors = new Color[] { factory.GetColor(0x717171) };
+            table.TabForm.Inactive.CaptionBackColors = new Color[] { factory.GetColor(0x717171) };
+            table.TabFormItemColorTables.Clear();
+            table.TabFormItemColorTables.Add(TabFormItem.DefaultColorTableKey,
+                Office2007ColorTable.CreateDefaultTabFormItemColorTable(factory,
+                new Color[] { factory.GetColor(0x717171) },
+                new Color[] { factory.GetColor(0x717171) },
+                factory.GetColor(0xFFFFFF),
+                new Color[] { factory.GetColor(0xCFCFCF), factory.GetColor(0xF5F6F7) },
+                new Color[] { factory.GetColor(0x5E5E5E)},
+                factory.GetColor(0x000000)
+                ));
+            table.TabFormItemColorTables.Add(TabFormItem.BlueColorTableKey, Office2007ColorTable.CreateBlueTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.YellowColorTableKey, Office2007ColorTable.CreateYellowTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.PurpleColorTableKey, Office2007ColorTable.CreatePurpleTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.CyanColorTableKey, Office2007ColorTable.CreateCyanTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.BlueMistColorTableKey, Office2007ColorTable.CreateBlueMistTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.PurpleMistColorTableKey, Office2007ColorTable.CreatePurpleMistTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.TanColorTableKey, Office2007ColorTable.CreateTanTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.LemonLimeColorTableKey, Office2007ColorTable.CreateLemonLimeTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.AppleColorTableKey, Office2007ColorTable.CreateAppleTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.TealColorTableKey, Office2007ColorTable.CreateTealTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.RedChalkColorTableKey, Office2007ColorTable.CreateRedChalkTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.SilverColorTableKey, Office2007ColorTable.CreateSilverTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.OrangeColorTableKey, Office2007ColorTable.CreateOrangeTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.GreenColorTableKey, Office2007ColorTable.CreateGreenTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.MagentaColorTableKey, Office2007ColorTable.CreateMagentaTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.RedColorTableKey, Office2007ColorTable.CreateRedTabFormItemColorTable(factory));
+            #endregion
+        }
+
+        #region RibbonBar
+        public static Office2007RibbonBarStateColorTable GetRibbonBar(ColorFactory factory)
+        {
+            Office2007RibbonBarStateColorTable rb = new Office2007RibbonBarStateColorTable();
+            rb.TopBackgroundHeight = 0.8f;
+            rb.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xB8B8B8), factory.GetColor(0x525252));
+            rb.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xCBCBCB), factory.GetColor(0xAFAFAF));
+            rb.TopBackground = new LinearGradientColorTable(factory.GetColor(0xC9C9C9), factory.GetColor(0xA3A3A3));
+            rb.BottomBackground = null; // new LinearGradientColorTable(factory.GetColor(0xC1C1C1), factory.GetColor(0xA3A3A3));
+            rb.TitleBackground = null;// new LinearGradientColorTable(factory.GetColor(0xC2D8F1), factory.GetColor(0xC0D8EF));
+            rb.TitleText = factory.GetColor(0x242424);
+            return rb;
+        }
+
+        public static Office2007RibbonBarStateColorTable GetRibbonBarMouseOver(ColorFactory factory)
+        {
+            return GetRibbonBar(factory);
+        }
+
+        public static Office2007RibbonBarStateColorTable GetRibbonBarExpanded(ColorFactory factory)
+        {
+            Office2007RibbonBarStateColorTable rb = new Office2007RibbonBarStateColorTable();
+            rb.TopBackgroundHeight = 0.8f;
+            rb.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xB8B8B8), factory.GetColor(0x525252));
+            rb.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xCBCBCB), factory.GetColor(0xAFAFAF));
+            rb.TopBackground = new LinearGradientColorTable(factory.GetColor(0xC9C9C9), factory.GetColor(0xA3A3A3));
+            rb.BottomBackground = null; // new LinearGradientColorTable(factory.GetColor(0xC1C1C1), factory.GetColor(0xA3A3A3));
+            rb.TitleBackground = null;// new LinearGradientColorTable(factory.GetColor(0xC2D8F1), factory.GetColor(0xC0D8EF));
+            rb.TitleText = factory.GetColor(0x242424);
+            return rb;
+        }
+        #endregion
+
+        #region Buttons
+        private static Office2007ButtonItemColorTable GetButtonItemBackstageDefault(ColorFactory factory)
+        {
+            Office2007ButtonItemColorTable ct = Office2010BlueFactory.GetButtonItemBackstageDefault(factory);
+            ct.Default.Text = factory.GetColor(0xFFFFFF);
+            ct.Checked.Text = factory.GetColor(0xFFFFFF);
+            ct.Expanded.Text = factory.GetColor(0xFFFFFF);
+            ct.MouseOver.Text = factory.GetColor(0xFFFFFF);
+            ct.Pressed.Text = factory.GetColor(0xFFFFFF);
+            return ct;
+        }
+        public static Office2007ButtonItemColorTable GetButtonItemStatusBar(ColorFactory factory)
+        {
+            Office2007ButtonItemColorTable table = GetButtonItemBlueOrange(factory);
+            table.Default.Text = factory.GetColor(0xFFFFFF);
+            return table;
+        }
+        public static Office2007ButtonItemColorTable GetButtonItemBlueOrange(ColorFactory factory)
+        {
+            Office2007ButtonItemColorTable cb = new Office2007ButtonItemColorTable();
+            cb.Default = new Office2007ButtonItemStateColorTable();
+            cb.Default.Text = factory.GetColor(0x000000);
+
+            // Button mouse over
+            cb.MouseOver = new Office2007ButtonItemStateColorTable();
+            cb.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xF7C840), factory.GetColor(0xF8D427));
+            cb.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFFFAE6), factory.GetColor(0xFFFFF0));
+            cb.MouseOver.TopBackground = new LinearGradientColorTable(factory.GetColor(0xFFEEA8), factory.GetColor(0xFFE37C));
+            cb.MouseOver.TopBackgroundHighlight = LinearGradientColorTable.Empty; //new LinearGradientColorTable(Color.FromArgb(192, Color.White), Color.Transparent);
+            cb.MouseOver.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xFFE37C), factory.GetColor(0xFFFCE0));
+            cb.MouseOver.BottomBackgroundHighlight = LinearGradientColorTable.Empty;// new LinearGradientColorTable(factory.GetColor(0xFFFD9C), Color.Transparent);
+            cb.MouseOver.SplitBorder = new LinearGradientColorTable(factory.GetColor(0xE8C04E), Color.Empty);
+            cb.MouseOver.SplitBorderLight = new LinearGradientColorTable(factory.GetColor(0xFFFAE8), Color.Empty);
+            cb.MouseOver.Text = factory.GetColor(0x464646);
+
+            cb.MouseOverSplitInactive = new Office2007ButtonItemStateColorTable();
+            cb.MouseOverSplitInactive.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xF7C740));
+
+            // Pressed
+            cb.Pressed = new Office2007ButtonItemStateColorTable();
+            cb.Pressed.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xC2762B), factory.GetColor(0xC29E47));
+            cb.Pressed.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xF6C867));
+            cb.Pressed.TopBackground = new LinearGradientColorTable(factory.GetColor(0xFBD678), factory.GetColor(0xFFE48A));
+            cb.Pressed.TopBackgroundHighlight = LinearGradientColorTable.Empty;
+            cb.Pressed.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xFFE48A), factory.GetColor(0xFEE287));
+            cb.Pressed.BottomBackgroundHighlight = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(0xEFF1BD), Color.Transparent);
+            cb.Pressed.SplitBorder = new LinearGradientColorTable(factory.GetColor(0xE8C04E), Color.Empty);
+            cb.Pressed.SplitBorderLight = new LinearGradientColorTable(factory.GetColor(0xFFFAE8), Color.Empty);
+            cb.Pressed.Text = factory.GetColor(0x464646);
+
+            // Checked
+            cb.Checked = new Office2007ButtonItemStateColorTable();
+            cb.Checked.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xC28A30), factory.GetColor(0xC2A44D));
+            cb.Checked.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFFE575), Color.Transparent);
+            cb.Checked.TopBackground = new LinearGradientColorTable(factory.GetColor(0xFFE575), factory.GetColor(0xFFD86B));
+            cb.Checked.TopBackgroundHighlight = LinearGradientColorTable.Empty;
+            cb.Checked.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xFFD86B), factory.GetColor(0xFFEC79));
+            cb.Checked.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xFFF480), Color.Transparent);
+            cb.Checked.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Checked.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Checked.Text = factory.GetColor(0x464646);
+
+            // Expanded button
+            cb.Expanded = new Office2007ButtonItemStateColorTable();
+            cb.Expanded.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xC28A30), factory.GetColor(0xC2A44D));
+            cb.Expanded.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFFE575), Color.Transparent);
+            cb.Expanded.TopBackground = new LinearGradientColorTable(factory.GetColor(0xFFE575), factory.GetColor(0xFFD86B));
+            cb.Expanded.TopBackgroundHighlight = LinearGradientColorTable.Empty;
+            cb.Expanded.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xFFD86B), factory.GetColor(0xFFED7A));
+            cb.Expanded.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xFFF480), Color.Transparent);
+            cb.Expanded.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Expanded.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Expanded.Text = factory.GetColor(0x464646);
+
+            SetBlueExpandColors(cb, factory);
+
+            return cb;
+        }
+
+        public static Office2007ButtonItemColorTable GetButtonItemBlueOrangeWithBackground(ColorFactory factory)
+        {
+            Office2007ButtonItemColorTable cb = GetButtonItemBlueOrange(factory);
+
+            cb.Default.TopBackground = new LinearGradientColorTable(factory.GetColor(0xE2E2E2), factory.GetColor(0xD9D9D9));
+            cb.Default.TopBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xD9D9D9), factory.GetColor(0xC4C4C4));
+            cb.Default.BottomBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.InnerBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x919191));
+            cb.Default.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.MouseOverSplitInactive = cb.Default;
+
+            // Same as default
+            cb.Disabled = new Office2007ButtonItemStateColorTable();
+            cb.Disabled.TopBackground = new LinearGradientColorTable(factory.GetColor(0xF5F5F5), factory.GetColor(0xECECEC));
+            cb.Disabled.TopBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xE5E5E5), factory.GetColor(0xE7E7E7));
+            cb.Disabled.BottomBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.InnerBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xBCBCBC), Color.Empty);
+            cb.Disabled.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.Text = factory.GetColor(0x8D8D8D);
+            return cb;
+        }
+
+        public static void SetBlueExpandColors(Office2007ButtonItemColorTable ct, ColorFactory factory)
+        {
+            Color cb = factory.GetColor(0x5E563D);
+            Color cl = Color.Empty; // Color.FromArgb(192, Color.White);
+            ct.Default.ExpandBackground = cb;
+            ct.Default.ExpandLight = cl;
+
+            ct.Checked.ExpandBackground = cb;
+            ct.Checked.ExpandLight = cl;
+
+            //ct.Disabled.ExpandBackground = factory.GetColor(0xB7B7B7);
+            //ct.Disabled.ExpandLight = factory.GetColor(0xEDEDED);
+
+            ct.Expanded.ExpandBackground = cb;
+            ct.Expanded.ExpandLight = cl;
+
+            ct.MouseOver.ExpandBackground = cb;
+            ct.MouseOver.ExpandLight = cl;
+
+            ct.Pressed.ExpandBackground = cb;
+            ct.Pressed.ExpandLight = cl;
+        }
+
+        public static Office2007ButtonItemColorTable GetNavigationPaneButtonItemTable(ColorFactory factory)
+        {
+            Office2007ButtonItemColorTable cb = new Office2007ButtonItemColorTable();
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Orange);
+            cb.Default = new Office2007ButtonItemStateColorTable();
+            cb.Default.Text = factory.GetColor(0xFFFFFF);
+
+            // Button mouse over
+            cb.MouseOver = new Office2007ButtonItemStateColorTable();
+            cb.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x262626));
+            cb.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xA7A7A7));
+            cb.MouseOver.TopBackground = LinearGradientColorTable.Empty;
+            cb.MouseOver.TopBackgroundHighlight = LinearGradientColorTable.Empty; //new LinearGradientColorTable(Color.FromArgb(192, Color.White), Color.Transparent);
+            cb.MouseOver.BottomBackground = LinearGradientColorTable.Empty;
+            cb.MouseOver.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0x898989), Color.Transparent);
+            cb.MouseOver.Background = new LinearGradientColorTable(factory.GetColor(0x7E7E7E), factory.GetColor(0x515151));
+            cb.MouseOver.SplitBorder = LinearGradientColorTable.Empty;
+            cb.MouseOver.SplitBorderLight = LinearGradientColorTable.Empty;
+            cb.MouseOver.Text = factory.GetColor(0xFFFFFF);
+
+            cb.MouseOverSplitInactive = new Office2007ButtonItemStateColorTable();
+            cb.MouseOverSplitInactive.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x262626));
+
+            // Pressed
+            cb.Pressed = new Office2007ButtonItemStateColorTable();
+            cb.Pressed.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x282828));
+            cb.Pressed.InnerBorder = new LinearGradientColorTable(factory.GetColor(0x3E3E3E));
+            cb.Pressed.TopBackground = LinearGradientColorTable.Empty;
+            cb.Pressed.TopBackgroundHighlight = LinearGradientColorTable.Empty; //new LinearGradientColorTable(Color.FromArgb(192, Color.White), Color.Transparent);
+            cb.Pressed.BottomBackground = LinearGradientColorTable.Empty;
+            cb.Pressed.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0x484848), Color.Transparent);
+            cb.Pressed.Background = new LinearGradientColorTable(factory.GetColor(0x484848));
+            cb.Pressed.SplitBorder = LinearGradientColorTable.Empty;
+            cb.Pressed.SplitBorderLight = LinearGradientColorTable.Empty;
+            cb.Pressed.Text = factory.GetColor(0xFFFFFF);
+
+            // Checked
+            cb.Checked = new Office2007ButtonItemStateColorTable();
+            cb.Checked.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x2E2E2E));
+            cb.Checked.InnerBorder = new LinearGradientColorTable(factory.GetColor(0x6C6C6A));
+            cb.Checked.TopBackground = LinearGradientColorTable.Empty;
+            cb.Checked.TopBackgroundHighlight = LinearGradientColorTable.Empty; //new LinearGradientColorTable(Color.FromArgb(192, Color.White), Color.Transparent);
+            cb.Checked.BottomBackground = LinearGradientColorTable.Empty;
+            cb.Checked.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0x7E7E7E), Color.Transparent);
+            cb.Checked.Background = new LinearGradientColorTable(factory.GetColor(0x5B5B5B), factory.GetColor(0x555555));
+            cb.Checked.SplitBorder = LinearGradientColorTable.Empty;
+            cb.Checked.SplitBorderLight = LinearGradientColorTable.Empty;
+            cb.Checked.Text = factory.GetColor(0xFFFFFF);
+
+            // Expanded button
+            cb.Expanded = cb.Checked;
+
+            return cb;
+        }
+        #endregion
+
+        #region RibbonTabItem
+        public static Office2007RibbonTabItemColorTable GetRibbonTabItemDefault(ColorFactory factory)
+        {
+            Office2007RibbonTabItemColorTable rt = new Office2007RibbonTabItemColorTable();
+            rt.Default.GlassText = factory.GetColor(0x000000);
+            rt.Default.Text = factory.GetColor(0xFFFFFF);
+            rt.CornerSize = 2;
+
+            // Selected Tab
+            rt.Selected = new Office2007RibbonTabItemStateColorTable();
+            rt.Selected.Background = new LinearGradientColorTable(factory.GetColor(0xCFCFCF), factory.GetColor(0xC9C9C9));
+            rt.Selected.BackgroundHighlight = LinearGradientColorTable.Empty; // new LinearGradientColorTable(Color.FromArgb(32, Color.White), Color.Transparent);
+            rt.Selected.InnerBorder = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(0xFFFFFF));
+            rt.Selected.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x5E5E5E));
+            rt.Selected.Text = factory.GetColor(0x000000);
+
+            // Selected Tab Mouse Over
+            rt.SelectedMouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.SelectedMouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xCFCFCF), factory.GetColor(0xC9C9C9));
+            rt.SelectedMouseOver.BackgroundHighlight = LinearGradientColorTable.Empty; //new LinearGradientColorTable(Color.FromArgb(32, Color.White), Color.Transparent);
+            rt.SelectedMouseOver.InnerBorder = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(0xFFFFFF));
+            rt.SelectedMouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x5E5E5E));
+            rt.SelectedMouseOver.Text = factory.GetColor(0x000000);
+
+            // Tab Mouse Over
+            rt.MouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.MouseOver.Background = new LinearGradientColorTable(factory.GetColor(0x8B8C8E), factory.GetColor(0x575757));
+            rt.MouseOver.BackgroundHighlight = LinearGradientColorTable.Empty;
+            rt.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xB2B2B2), factory.GetColor(0xA4A4A4));
+            rt.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x5E5E5E));
+            rt.MouseOver.Text = factory.GetColor(0xFFFFFF);
+            rt.MouseOver.GlassText = factory.GetColor(0x000000);
+
+            return rt;
+        }
+
+        public static Office2007RibbonTabItemColorTable GetRibbonTabItemMagenta(ColorFactory factory)
+        {
+            Office2007RibbonTabItemColorTable rt = new Office2007RibbonTabItemColorTable();
+            rt.Default.Text = factory.GetColor(0xFFFFFF);
+            rt.Default.GlassText = factory.GetColor(0x000000);
+            rt.CornerSize = 2;
+
+            // Selected Tab
+            rt.Selected = new Office2007RibbonTabItemStateColorTable();
+            rt.Selected.Background = new LinearGradientColorTable(factory.GetColor(0xB9A2B1), factory.GetColor(0xC9C9C9));
+            rt.Selected.BackgroundHighlight = LinearGradientColorTable.Empty; // new LinearGradientColorTable(Color.FromArgb(64, Color.White), Color.Transparent);
+            rt.Selected.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xC8C7C8), Color.Transparent);
+            rt.Selected.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xB06195), factory.GetColor(0x9C2F77));
+            rt.Selected.Text = factory.GetColor(0x000000);
+
+            // Selected Tab Mouse Over
+            rt.SelectedMouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.SelectedMouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xB9A2B1), factory.GetColor(0xC9C9C9));
+            rt.SelectedMouseOver.BackgroundHighlight = LinearGradientColorTable.Empty; // new LinearGradientColorTable(Color.FromArgb(64, Color.White), Color.Transparent);
+            rt.SelectedMouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xC8C7C8), Color.Transparent);
+            rt.SelectedMouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xB06195), factory.GetColor(0x9C2F77));
+            rt.SelectedMouseOver.Text = factory.GetColor(0x000000);
+
+            // Tab Mouse Over
+            rt.MouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.MouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xA68098), factory.GetColor(0x595457));
+            rt.MouseOver.BackgroundHighlight = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(0xFCFBFB), Color.Transparent);
+            rt.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xB58CA5), factory.GetColor(0x8C8088));
+            rt.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x9C2F77));
+            rt.MouseOver.Text = factory.GetColor(0xFFFFFF);
+            rt.MouseOver.GlassText = factory.GetColor(0x000000);
+
+            return rt;
+        }
+
+        public static Office2007RibbonTabItemColorTable GetRibbonTabItemBlueGreen(ColorFactory factory)
+        {
+            Office2007RibbonTabItemColorTable rt = new Office2007RibbonTabItemColorTable();
+            rt.Default.Text = factory.GetColor(0xFFFFFF);
+            rt.Default.GlassText = factory.GetColor(0x000000);
+            rt.CornerSize = 2;
+
+            // Selected Tab
+            rt.Selected = new Office2007RibbonTabItemStateColorTable();
+            rt.Selected.Background = new LinearGradientColorTable(factory.GetColor(0xB0C0AC), factory.GetColor(0xC9C9C9));
+            rt.Selected.BackgroundHighlight = LinearGradientColorTable.Empty;// new LinearGradientColorTable(Color.FromArgb(64, Color.White), Color.Transparent);
+            rt.Selected.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xC8C7C8), Color.Transparent);
+            rt.Selected.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x589D53), factory.GetColor(0x117311));
+            rt.Selected.Text = factory.GetColor(0x000000);
+
+            // Selected Tab Mouse Over
+            rt.SelectedMouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.SelectedMouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xB0C0AC), factory.GetColor(0xC9C9C9));
+            rt.SelectedMouseOver.BackgroundHighlight = LinearGradientColorTable.Empty;// new LinearGradientColorTable(Color.FromArgb(64, Color.White), Color.Transparent);
+            rt.SelectedMouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xC8C7C8), Color.Transparent);
+            rt.SelectedMouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x589D53), factory.GetColor(0x117311));
+            rt.SelectedMouseOver.Text = factory.GetColor(0x000000);
+
+            // Tab Mouse Over
+            rt.MouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.MouseOver.Background = new LinearGradientColorTable(factory.GetColor(0x84A47C), factory.GetColor(0x545A53));
+            rt.MouseOver.BackgroundHighlight = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(0xDEECFF), Color.Transparent);
+            rt.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0x8DB482), factory.GetColor(0x7E9475));
+            rt.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x007E00), factory.GetColor(0x007E00));
+            rt.MouseOver.Text = factory.GetColor(0xFFFFFF);
+            rt.MouseOver.GlassText = factory.GetColor(0x000000);
+
+            return rt;
+        }
+
+        public static Office2007RibbonTabItemColorTable GetRibbonTabItemBlueOrange(ColorFactory factory)
+        {
+            Office2007RibbonTabItemColorTable rt = new Office2007RibbonTabItemColorTable();
+            rt.Default.Text = factory.GetColor(0xFFFFFF);
+            rt.Default.GlassText = factory.GetColor(0x000000);
+            rt.CornerSize = 2;
+
+            // Selected Tab
+            rt.Selected = new Office2007RibbonTabItemStateColorTable();
+            rt.Selected.Background = new LinearGradientColorTable(factory.GetColor(0xBAABA4), factory.GetColor(0xC9C9C9));
+            rt.Selected.BackgroundHighlight = LinearGradientColorTable.Empty; // new LinearGradientColorTable(Color.FromArgb(64, Color.White), Color.Transparent);
+            rt.Selected.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xC8C7C8), Color.Transparent);
+            rt.Selected.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xA0662B), factory.GetColor(0xA85600));
+            rt.Selected.Text = factory.GetColor(0x000000);
+
+            // Selected Tab Mouse Over
+            rt.SelectedMouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.SelectedMouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xBAABA4), factory.GetColor(0xC9C9C9));
+            rt.SelectedMouseOver.BackgroundHighlight = LinearGradientColorTable.Empty; // new LinearGradientColorTable(Color.FromArgb(64, Color.White), Color.Transparent);
+            rt.SelectedMouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xC8C7C8), Color.Transparent);
+            rt.SelectedMouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xA0662B), factory.GetColor(0xA85600));
+            rt.SelectedMouseOver.Text = factory.GetColor(0x000000);
+
+            // Tab Mouse Over
+            rt.MouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.MouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xAE976B), factory.GetColor(0x5D594E));
+            rt.MouseOver.BackgroundHighlight = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(0xCBE2FF), Color.Transparent);
+            rt.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xC1AB62), factory.GetColor(0x9E955A));
+            rt.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xA85600));
+            rt.MouseOver.Text = factory.GetColor(0xFFFFFF);
+            rt.MouseOver.GlassText = factory.GetColor(0x000000);
+
+            return rt;
+        }
+        #endregion
+
+        #region Style Class Creation
+        public static ElementStyle GetFileMenuContainerStyle(Office2007ColorTable table)
+        {
+            ElementStyle style = new ElementStyle();
+            style.Class = ElementStyleClassKeys.RibbonFileMenuContainerKey;
+            Rendering.Office2007MenuColorTable mc = table.Menu;
+
+            style.PaddingBottom = 3;
+            style.PaddingLeft = 0;
+            style.PaddingRight = 0;
+            style.PaddingTop = 22;
+            style.Border = eStyleBorderType.Solid;
+            style.CornerType = eCornerType.Rounded;
+            style.BorderWidth = 1;
+            style.BorderColor = Color.Transparent;
+            style.CornerDiameter = 3;
+            BackgroundColorBlend[] blend = new BackgroundColorBlend[mc.FileBackgroundBlend.Count];
+            mc.FileBackgroundBlend.CopyTo(blend);
+            style.BackColorBlend.Clear();
+            style.BackColorBlend.AddRange(blend);
+            style.BackColorGradientAngle = 90;
+            return style;
+        }
+
+        public static ElementStyle GetTwoColumnMenuContainerStyle(Office2007ColorTable table)
+        {
+            ElementStyle style = new ElementStyle();
+            style.Class = ElementStyleClassKeys.RibbonFileMenuTwoColumnContainerKey;
+            Rendering.Office2007MenuColorTable mc = table.Menu;
+
+            style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Double;
+            style.BorderBottomWidth = 0;
+            style.BorderColor = mc.FileContainerBorder;
+            //style.BorderColorLight = mc.FileContainerBorderLight;
+            style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.None;
+            style.BorderLeftWidth = 0;
+            style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.None;
+            style.BorderRightWidth = 0;
+            style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            style.BorderTopWidth = 1;
+            style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            style.BorderBottomWidth = 1;
+            style.PaddingBottom = 0;
+            style.PaddingLeft = 0;
+            style.PaddingRight = 0;
+            style.PaddingTop = 0;
+
+            return style;
+        }
+
+        public static ElementStyle GetMenuColumnOneContainerStyle(Office2007ColorTable table)
+        {
+            ElementStyle style = new ElementStyle();
+            style.Class = ElementStyleClassKeys.RibbonFileMenuColumnOneContainerKey;
+            Rendering.Office2007MenuColorTable mc = table.Menu;
+
+            style.BackColor = mc.FileColumnOneBackground;
+            style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            style.BorderRightColor = mc.FileColumnOneBorder;
+            style.BorderRightWidth = 1;
+            style.PaddingRight = 1;
+
+            return style;
+        }
+
+        public static ElementStyle GetMenuColumnTwoContainerStyle(Office2007ColorTable table)
+        {
+            ElementStyle style = new ElementStyle();
+            style.Class = ElementStyleClassKeys.RibbonFileMenuColumnTwoContainerKey;
+            Rendering.Office2007MenuColorTable mc = table.Menu;
+
+            style.BackColor = mc.FileColumnTwoBackground;
+
+            return style;
+        }
+
+        public static ElementStyle GetMenuBottomContainer(Office2007ColorTable table)
+        {
+            ElementStyle style = new ElementStyle();
+            style.Class = ElementStyleClassKeys.RibbonFileMenuBottomContainerKey;
+            Rendering.Office2007MenuColorTable mc = table.Menu;
+
+            //BackgroundColorBlend[] blend = new BackgroundColorBlend[mc.FileBottomContainerBackgroundBlend.Count];
+            //mc.FileBottomContainerBackgroundBlend.CopyTo(blend);
+            //style.BackColorBlend.Clear();
+            //style.BackColorBlend.AddRange(blend);
+            //style.BackColorGradientAngle = 90;
+            style.MarginTop = 2;
+            style.MarginRight = 2;
+            return style;
+        }
+        #endregion
+
+        #region Scroll Bar
+        public static void InitializeScrollBarColorTable(Office2007ColorTable t, ColorFactory factory)
+        {
+            Office2007ScrollBarStateColorTable sct = t.ScrollBar.Default;
+            sct.Background = new LinearGradientColorTable(factory.GetColor(0xEFEFEF), factory.GetColor(0xFCFCFC), 0);
+            sct.Border = new LinearGradientColorTable(factory.GetColor(0xEBEDEF), Color.Empty);
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(0x6E7EA6), factory.GetColor(0x424B63), 90);
+            sct.TrackBackground.Clear();
+            sct.TrackBackground.AddRange(new BackgroundColorBlend[] { new BackgroundColorBlend(factory.GetColor(0xF2F3F3),0f), 
+                new BackgroundColorBlend(factory.GetColor(0xF0F0F0),0.5f),
+                new BackgroundColorBlend(factory.GetColor(0xEBEBEC),0.5f),
+                new BackgroundColorBlend(factory.GetColor(0xE6E7E8),1f)});
+            sct.TrackInnerBorder = LinearGradientColorTable.Empty;
+            sct.TrackOuterBorder = new LinearGradientColorTable(factory.GetColor(0xB6BABF), Color.Empty);
+            sct.TrackSignBackground = new LinearGradientColorTable(Color.FromArgb(180, factory.GetColor(0x8F8F8F)), Color.FromArgb(64, Color.White));
+
+            // Mouse Over
+            sct = t.ScrollBar.MouseOver;
+            sct.Background = t.ScrollBar.Default.Background;
+            sct.Border = t.ScrollBar.Default.Border;
+            sct.ThumbBackground.Clear();
+            sct.ThumbBackground.AddRange(new BackgroundColorBlend[] { new BackgroundColorBlend(factory.GetColor(0xFFFFFF),0f), 
+                new BackgroundColorBlend(factory.GetColor(0xFCFDFD),0.8f),
+                new BackgroundColorBlend(factory.GetColor(0xF2F3F4),0.8f),
+                new BackgroundColorBlend(factory.GetColor(0xF2F3F4),1f)});
+            sct.ThumbInnerBorder = LinearGradientColorTable.Empty;
+            sct.ThumbOuterBorder = new LinearGradientColorTable(factory.GetColor(0xB6BABF));
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(0x6E7EA6), factory.GetColor(0x424B63), 90);
+            sct.TrackBackground.Clear();
+            sct.TrackBackground.AddRange(new BackgroundColorBlend[] { new BackgroundColorBlend(factory.GetColor(0xFFFFFF),0f), 
+                new BackgroundColorBlend(factory.GetColor(0xFCFDFD),0.8f),
+                new BackgroundColorBlend(factory.GetColor(0xF2F3F4),0.8f),
+                new BackgroundColorBlend(factory.GetColor(0xF2F3F4),1f)});
+            sct.TrackInnerBorder = LinearGradientColorTable.Empty;
+            sct.TrackOuterBorder = new LinearGradientColorTable(factory.GetColor(0xAEB3B8), Color.Empty);
+            sct.TrackSignBackground = new LinearGradientColorTable(factory.GetColor(0x8F8F8F));
+
+            // Control Mouse Over
+            sct = t.ScrollBar.MouseOverControl;
+            sct.Background = t.ScrollBar.Default.Background;
+            sct.Border = t.ScrollBar.Default.Border;
+            sct.ThumbBackground.Clear();
+            sct.ThumbBackground.AddRange(new BackgroundColorBlend[] { new BackgroundColorBlend(factory.GetColor(0xFFFFFF),0f), 
+                new BackgroundColorBlend(factory.GetColor(0xFCFDFD),0.8f),
+                new BackgroundColorBlend(factory.GetColor(0xF2F3F4),0.8f),
+                new BackgroundColorBlend(factory.GetColor(0xF2F3F4),1f)});
+            sct.ThumbInnerBorder = LinearGradientColorTable.Empty;
+            sct.ThumbOuterBorder = new LinearGradientColorTable(factory.GetColor(0xB6BABF));
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(0x6E7EA6), factory.GetColor(0x424B63), 90);
+            sct.TrackBackground.Clear();
+            sct.TrackBackground.AddRange(new BackgroundColorBlend[] { new BackgroundColorBlend(factory.GetColor(0xFFFFFF),0f), 
+                new BackgroundColorBlend(factory.GetColor(0xFCFDFD),0.8f),
+                new BackgroundColorBlend(factory.GetColor(0xF2F3F4),0.8f),
+                new BackgroundColorBlend(factory.GetColor(0xF2F3F4),1f)});
+            sct.TrackInnerBorder = LinearGradientColorTable.Empty;
+            sct.TrackOuterBorder = new LinearGradientColorTable(factory.GetColor(0xAEB3B8), Color.Empty);
+            sct.TrackSignBackground = new LinearGradientColorTable(factory.GetColor(0x8F8F8F));
+
+            // Pressed
+            sct = t.ScrollBar.Pressed;
+            sct.Background = t.ScrollBar.Default.Background;
+            sct.Border = t.ScrollBar.Default.Border;
+            sct.ThumbBackground.Clear();
+            sct.ThumbBackground.AddRange(new BackgroundColorBlend[] { 
+                new BackgroundColorBlend(factory.GetColor(0xE1E2E3),0f), 
+                new BackgroundColorBlend(factory.GetColor(0xE1E2E3),1f)
+            });
+            sct.ThumbInnerBorder = LinearGradientColorTable.Empty;
+            sct.ThumbOuterBorder = new LinearGradientColorTable(factory.GetColor(0xAEB3B8));
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(0x888889));
+            sct.TrackBackground.Clear();
+            sct.TrackBackground.AddRange(new BackgroundColorBlend[] {
+                new BackgroundColorBlend(factory.GetColor(0xE1E2E3),0f), 
+                new BackgroundColorBlend(factory.GetColor(0xE1E2E3),1f)
+            });
+            sct.TrackInnerBorder = LinearGradientColorTable.Empty;
+            sct.TrackOuterBorder = new LinearGradientColorTable(factory.GetColor(0xAEB3B8), Color.Empty);
+            sct.TrackSignBackground = new LinearGradientColorTable(factory.GetColor(0x8F8F8F));
+            // Disabled
+            sct = t.ScrollBar.Disabled;
+            sct.Background = t.ScrollBar.Default.Background;
+            sct.Border = t.ScrollBar.Default.Border;
+            sct.ThumbBackground.Clear();
+            sct.ThumbInnerBorder = new LinearGradientColorTable();
+            sct.ThumbOuterBorder = new LinearGradientColorTable();
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(0xBFCFF7), factory.GetColor(0x727C94));
+            sct.TrackBackground.Clear();
+            sct.TrackInnerBorder = new LinearGradientColorTable();
+            sct.TrackOuterBorder = new LinearGradientColorTable();
+            sct.TrackSignBackground = new LinearGradientColorTable();
+        }
+
+        public static void InitializeAppScrollBarColorTable(Office2007ColorTable t, ColorFactory factory)
+        {
+            Office2007ScrollBarStateColorTable sct = t.AppScrollBar.Default;
+            sct.Background = new LinearGradientColorTable(factory.GetColor(0x636363), factory.GetColor(0x686868), 0);
+            sct.Border = new LinearGradientColorTable(factory.GetColor(0x4E4E4E));
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(0x343434), factory.GetColor(0x1F1F1F), 90);
+            sct.TrackBackground.Clear();
+            sct.TrackBackground.AddRange(new BackgroundColorBlend[] { 
+                new BackgroundColorBlend(factory.GetColor(0x747474),0f), 
+                new BackgroundColorBlend(factory.GetColor(0x606060),.8f),
+                new BackgroundColorBlend(factory.GetColor(0x595959),1f)});
+            sct.TrackInnerBorder = LinearGradientColorTable.Empty;
+            sct.TrackOuterBorder = new LinearGradientColorTable(factory.GetColor(0x242424), Color.Empty);
+            sct.TrackSignBackground = new LinearGradientColorTable(factory.GetColor(0x989898));
+
+            // Mouse Over
+            sct = t.AppScrollBar.MouseOver;
+            sct.Background = t.AppScrollBar.Default.Background;
+            sct.Border = t.AppScrollBar.Default.Border;
+            sct.ThumbBackground.Clear();
+            sct.ThumbBackground.AddRange(new BackgroundColorBlend[] { 
+                new BackgroundColorBlend(factory.GetColor(0x7F7F7F),0f), 
+                new BackgroundColorBlend(factory.GetColor(0x626262),1f)});
+            sct.ThumbInnerBorder = new LinearGradientColorTable(factory.GetColor(0x7F7F7F), factory.GetColor(0x6E6E6E));
+            sct.ThumbOuterBorder = new LinearGradientColorTable(factory.GetColor(0x242424), Color.Empty);
+            sct.ThumbSignBackground = t.AppScrollBar.Default.ThumbSignBackground;
+            sct.TrackBackground.Clear();
+            sct.TrackBackground.CopyFrom(sct.ThumbBackground);
+            sct.TrackInnerBorder = sct.ThumbInnerBorder;
+            sct.TrackOuterBorder = sct.ThumbOuterBorder;
+            sct.TrackSignBackground = new LinearGradientColorTable(factory.GetColor(0x989898));
+
+            // Control Mouse Over
+            sct = t.AppScrollBar.MouseOverControl;
+            sct.Background = t.AppScrollBar.Default.Background;
+            sct.Border = t.AppScrollBar.Default.Border;
+            sct.ThumbBackground.Clear();
+            sct.ThumbBackground.CopyFrom(t.AppScrollBar.Default.TrackBackground);
+            sct.ThumbInnerBorder = t.AppScrollBar.Default.TrackInnerBorder;
+            sct.ThumbOuterBorder = t.AppScrollBar.Default.TrackOuterBorder;
+            sct.ThumbSignBackground = t.AppScrollBar.Default.ThumbSignBackground;
+            sct.TrackBackground.Clear();
+            sct.TrackBackground.CopyFrom(t.AppScrollBar.Default.TrackBackground);
+            sct.TrackInnerBorder = t.AppScrollBar.Default.TrackInnerBorder;
+            sct.TrackOuterBorder = t.AppScrollBar.Default.TrackOuterBorder;
+            sct.TrackSignBackground = t.AppScrollBar.Default.TrackSignBackground;
+
+            // Pressed
+            sct = t.AppScrollBar.Pressed;
+            sct.Background = t.AppScrollBar.Default.Background;
+            sct.Border = t.AppScrollBar.Default.Border;
+            sct.ThumbBackground.Clear();
+            sct.ThumbBackground.AddRange(new BackgroundColorBlend[] { 
+                new BackgroundColorBlend(factory.GetColor(0x6B6B6B),0f), 
+                new BackgroundColorBlend(factory.GetColor(0x4E4E4E),1f)});
+            sct.ThumbInnerBorder = LinearGradientColorTable.Empty;
+            sct.ThumbOuterBorder = new LinearGradientColorTable(factory.GetColor(0x242424), Color.Empty);
+            sct.ThumbSignBackground = t.AppScrollBar.Default.ThumbSignBackground;
+            sct.TrackBackground.Clear();
+            sct.TrackBackground.CopyFrom(sct.ThumbBackground);
+            sct.TrackInnerBorder = LinearGradientColorTable.Empty;
+            sct.TrackOuterBorder = new LinearGradientColorTable(factory.GetColor(0x242424), Color.Empty);
+            sct.TrackSignBackground = t.AppScrollBar.Default.TrackSignBackground;
+            // Disabled
+            sct = t.AppScrollBar.Disabled;
+            sct.Background = t.AppScrollBar.Default.Background;
+            sct.Border = t.AppScrollBar.Default.Border;
+            sct.ThumbBackground.Clear();
+            sct.ThumbInnerBorder = new LinearGradientColorTable();
+            sct.ThumbOuterBorder = new LinearGradientColorTable();
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(0xBFCFF7), factory.GetColor(0x727C94));
+            sct.TrackBackground.Clear();
+            sct.TrackInnerBorder = new LinearGradientColorTable();
+            sct.TrackOuterBorder = new LinearGradientColorTable();
+            sct.TrackSignBackground = new LinearGradientColorTable();
+        }
+        #endregion
+
+        #region Slider
+        private static Office2007SliderColorTable GetSliderTableStatusBar(ColorFactory factory)
+        {
+            Office2007SliderColorTable sl = GetSliderTable(factory);
+            sl.Default.LabelColor = factory.GetColor(0xFFFFFF);
+            sl.MouseOver.LabelColor = factory.GetColor(0xFFFFFF);
+            sl.Pressed.LabelColor = factory.GetColor(0xFFFFFF);
+            return sl;
+        }
+        private static Office2007SliderColorTable GetSliderTable(ColorFactory factory)
+        {
+            Office2007SliderColorTable sl = new Office2007SliderColorTable();
+            sl.Default.LabelColor = factory.GetColor(0x000000);
+            sl.Default.SliderLabelColor = factory.GetColor(0x000000);
+            sl.Default.PartBackground = new GradientColorTable();
+            sl.Default.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xC0C0C0), 0));
+            sl.Default.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0x7C7C7C), 1f));
+            sl.Default.PartBorderColor = factory.GetColor(0x262626);
+            sl.Default.PartBorderLightColor = Color.Transparent; // Color.FromArgb(96, factory.GetColor(0xFFFFFF));
+            sl.Default.PartForeColor = factory.GetColor(0x333333);
+            sl.Default.PartForeLightColor = Color.Empty;
+            sl.Default.TrackLineColor = factory.GetColor(0x262626);
+            sl.Default.TrackLineLightColor = Color.FromArgb(96, factory.GetColor(0xFFFFFF));
+
+            sl.MouseOver.LabelColor = factory.GetColor(0x000000);
+            sl.MouseOver.SliderLabelColor = factory.GetColor(0x000000);
+            sl.MouseOver.PartBackground = new GradientColorTable();
+            sl.MouseOver.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFFFFFF), 0));
+            sl.MouseOver.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFFFDF5), .2f));
+            sl.MouseOver.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFFDF83), .5f));
+            sl.MouseOver.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xDDA70D), .5f));
+            sl.MouseOver.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFFF4CE), .85f));
+            sl.MouseOver.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFFF4CE), 1f));
+            sl.MouseOver.PartBorderColor = factory.GetColor(0x7F8994);
+            sl.MouseOver.PartBorderLightColor = Color.FromArgb(96, factory.GetColor(0xFFFFFF));
+            sl.MouseOver.PartForeColor = factory.GetColor(0x4E5052);
+            sl.MouseOver.PartForeLightColor = Color.Empty;
+            sl.MouseOver.TrackLineColor = factory.GetColor(0x262626);
+            sl.MouseOver.TrackLineLightColor = factory.GetColor(0xCCCCCC);
+
+            sl.Pressed.LabelColor = factory.GetColor(0x000000);
+            sl.Pressed.SliderLabelColor = factory.GetColor(0x000000);
+            sl.Pressed.PartBackground = new GradientColorTable();
+            sl.Pressed.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xDB7518), 0));
+            sl.Pressed.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xF7902F), .2f));
+            sl.Pressed.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xF9C18B), .5f));
+            sl.Pressed.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xED7400), .5f));
+            sl.Pressed.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFFC188), .85f));
+            sl.Pressed.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xF2D2B5), 1f));
+            sl.Pressed.PartBorderColor = factory.GetColor(0x7F8994);
+            sl.Pressed.PartBorderLightColor = Color.FromArgb(96, factory.GetColor(0xFFFFFF));
+            sl.Pressed.PartForeColor = factory.GetColor(0x4E5052);
+            sl.Pressed.PartForeLightColor = Color.Empty;
+            sl.Pressed.TrackLineColor = factory.GetColor(0x262626);
+            sl.Pressed.TrackLineLightColor = factory.GetColor(0xCCCCCC);
+
+            ColorBlendFactory df = new ColorBlendFactory(ColorScheme.GetColor(0xCFCFCF));
+            sl.Disabled.LabelColor = factory.GetColor(0x8D8D8D);
+            sl.Disabled.SliderLabelColor = factory.GetColor(0x8D8D8D);
+            sl.Disabled.PartBackground = new GradientColorTable();
+            foreach (BackgroundColorBlend b in sl.Default.PartBackground.Colors)
+                sl.Disabled.PartBackground.Colors.Add(new BackgroundColorBlend(df.GetColor(b.Color), b.Position));
+            sl.Disabled.PartBorderColor = df.GetColor(sl.Default.PartBorderColor);
+            sl.Disabled.PartBorderLightColor = df.GetColor(sl.Default.PartBorderLightColor);
+            sl.Disabled.PartForeColor = df.GetColor(sl.Default.PartForeColor);
+            sl.Disabled.PartForeLightColor = df.GetColor(sl.Default.PartForeLightColor);
+            sl.Disabled.TrackLineColor = df.GetColor(sl.Default.TrackLineColor);
+            sl.Disabled.TrackLineLightColor = df.GetColor(sl.Default.TrackLineLightColor);
+
+            return sl;
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/Office2010BlueFactory.cs b/PROMS/DotNetBar Source Code/Rendering/Office2010BlueFactory.cs
new file mode 100644
index 00000000..23b96de1
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/Office2010BlueFactory.cs	
@@ -0,0 +1,2085 @@
+using System;
+using System.Drawing;
+using DevComponents.DotNetBar.Controls;
+using DevComponents.DotNetBar.Schedule;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    internal static class Office2010BlueFactory
+    {
+        public static void InitializeColorTable(Office2007ColorTable table, ColorFactory factory)
+        {
+            #region RibbonControl Start Images
+            table.RibbonControl.StartButtonDefault = BarFunctions.LoadBitmap("SystemImages.BlankOffice2010NormalSilver.png");
+            table.RibbonControl.StartButtonMouseOver = BarFunctions.LoadBitmap("SystemImages.BlankOffice2010HotSilver.png");
+            table.RibbonControl.StartButtonPressed = BarFunctions.LoadBitmap("SystemImages.BlankOffice2010PressedSilver.png");
+            #endregion
+
+            #region RibbonControl
+            int editBorderColor = 0x849DBD;
+            table.RibbonControl.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x728EAD), factory.GetColor(editBorderColor));
+            table.RibbonControl.InnerBorder = null; // new LinearGradientColorTable(factory.GetColor(0xEFF6FD), factory.GetColor(0xD8E4F2));
+            table.RibbonControl.TabsBackground = new LinearGradientColorTable(factory.GetColor(0xBBCEE6));
+            table.RibbonControl.TabsGlassBackground = new LinearGradientColorTable(Color.Transparent, factory.GetColor(0xFAFAFA));
+            table.RibbonControl.TabDividerBorder = Color.Empty; // factory.GetColor(0xA7BAD1);
+            table.RibbonControl.TabDividerBorderLight = Color.Empty; // factory.GetColor(0xF4F8FD);
+            table.RibbonControl.CornerSize = 1;
+            table.RibbonControl.PanelTopBackgroundHeight = 0;
+            table.RibbonControl.PanelTopBackground = new LinearGradientColorTable(factory.GetColor(0xEFF6FD), factory.GetColor(0xD8E4F2));
+            table.RibbonControl.PanelBottomBackground = null; // new LinearGradientColorTable(factory.GetColor(0xE7F1FA), factory.GetColor(0xD8E4F2));
+            #endregion
+
+            #region Item Group
+            table.ItemGroup.OuterBorder = LinearGradientColorTable.Empty;
+            table.ItemGroup.InnerBorder = LinearGradientColorTable.Empty;
+            table.ItemGroup.TopBackground = LinearGradientColorTable.Empty;
+            table.ItemGroup.BottomBackground = LinearGradientColorTable.Empty;
+            table.ItemGroup.ItemGroupDividerDark = Color.Empty;
+            table.ItemGroup.ItemGroupDividerLight = Color.Empty;
+            #endregion
+
+            #region RibbonBar
+            table.RibbonBar.Default = GetRibbonBar(factory);
+            table.RibbonBar.MouseOver = GetRibbonBarMouseOver(factory);
+            table.RibbonBar.Expanded = GetRibbonBarExpanded(factory);
+            #endregion
+
+            #region ButtonItem Colors Initialization
+            table.RibbonButtonItemColors.Clear();
+            table.ButtonItemColors.Clear();
+            table.MenuButtonItemColors.Clear();
+            // Orange
+            Office2007ButtonItemColorTable cb = GetButtonItemBlueOrange(factory);
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Orange);
+            table.ButtonItemColors.Add(cb);
+            // Orange with background
+            cb = GetButtonItemBlueOrangeWithBackground(factory);
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.OrangeWithBackground);
+            table.ButtonItemColors.Add(cb);
+            // Blue
+            cb = Office2007ColorTableFactory.GetButtonItemBlueBlue(factory);
+            cb.MouseOverSplitInactive = new Office2007ButtonItemStateColorTable();
+            cb.MouseOverSplitInactive.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xB1BAC4));
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Blue);
+            table.ButtonItemColors.Add(cb);
+            // Blue with background
+            cb = GetButtonItemBlueBlueWithBackground(factory);
+            cb.MouseOverSplitInactive = new Office2007ButtonItemStateColorTable();
+            cb.MouseOverSplitInactive.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xB1BAC4));
+            cb.MouseOverSplitInactive = cb.Default;
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.BlueWithBackground);
+            table.ButtonItemColors.Add(cb);
+            // Magenta
+            cb = Office2007ColorTableFactory.GetButtonItemBlueMagenta(factory);
+            cb.MouseOverSplitInactive = new Office2007ButtonItemStateColorTable();
+            cb.MouseOverSplitInactive.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xB1BAC4));
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Magenta);
+            table.ButtonItemColors.Add(cb);
+            // Blue with background
+            cb = GetButtonItemBlueMagentaWithBackground(factory);
+            cb.MouseOverSplitInactive = new Office2007ButtonItemStateColorTable();
+            cb.MouseOverSplitInactive.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xB1BAC4));
+            cb.MouseOverSplitInactive = cb.Default;
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.MagentaWithBackground);
+            table.ButtonItemColors.Add(cb);
+
+            cb = GetButtonItemOffice2007WithBackground(factory);
+            cb.MouseOverSplitInactive = new Office2007ButtonItemStateColorTable();
+            cb.MouseOverSplitInactive.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xB1BAC4));
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Office2007WithBackground);
+            table.ButtonItemColors.Add(cb);
+
+            table.ButtonItemColors.Add(ButtonItemStaticColorTables.CreateBlueOrbColorTable(factory));
+
+            table.BackstageButtonItemColors.Add(GetButtonItemBackstageDefault(factory));
+            #endregion
+
+            #region NavigationPane ButtonItem Initialization
+            table.NavigationPaneButtonItemColors.Clear();
+            table.NavigationPaneButtonItemColors.Add(GetNavigationPaneButtonItemTable(factory));
+            #endregion
+
+            #region RibbonTabItem Colors Initialization
+            table.RibbonTabItemColors.Clear();
+            Office2007RibbonTabItemColorTable rt = GetRibbonTabItemBlueDefault(factory);
+            rt.Name = Enum.GetName(typeof(eRibbonTabColor), eRibbonTabColor.Default);
+            table.RibbonTabItemColors.Add(rt);
+
+            // Magenta
+            rt = GetRibbonTabItemBlueMagenta(factory);
+            rt.CornerSize = 2;
+            rt.Name = Enum.GetName(typeof(eRibbonTabColor), eRibbonTabColor.Magenta);
+            table.RibbonTabItemColors.Add(rt);
+
+            // Green
+            rt = GetRibbonTabItemBlueGreen(factory);
+            rt.CornerSize = 2;
+            rt.Name = Enum.GetName(typeof(eRibbonTabColor), eRibbonTabColor.Green);
+            table.RibbonTabItemColors.Add(rt);
+
+            // Orange
+            rt = GetRibbonTabItemBlueOrange(factory);
+            rt.CornerSize = 2;
+            rt.Name = Enum.GetName(typeof(eRibbonTabColor), eRibbonTabColor.Orange);
+            table.RibbonTabItemColors.Add(rt);
+            #endregion
+
+            #region RibbonTabItemGroup Colors Initialization
+            table.RibbonTabGroupColors.Clear();
+            // Default
+            Office2007RibbonTabGroupColorTable tg = GetRibbonTabGroupDefault(factory);
+            tg.Name = Enum.GetName(typeof(eRibbonTabGroupColor), eRibbonTabGroupColor.Default);
+            table.RibbonTabGroupColors.Add(tg);
+
+            // Magenta
+            tg = GetRibbonTabGroupMagenta(factory);
+            tg.Name = Enum.GetName(typeof(eRibbonTabGroupColor), eRibbonTabGroupColor.Magenta);
+            table.RibbonTabGroupColors.Add(tg);
+
+            // Green
+            tg = GetRibbonTabGroupGreen(factory);
+            tg.Name = Enum.GetName(typeof(eRibbonTabGroupColor), eRibbonTabGroupColor.Green);
+            table.RibbonTabGroupColors.Add(tg);
+
+            // Orange
+            tg = GetRibbonTabGroupOrange(factory);
+            tg.Name = Enum.GetName(typeof(eRibbonTabGroupColor), eRibbonTabGroupColor.Orange);
+            table.RibbonTabGroupColors.Add(tg);
+            #endregion
+
+            #region Initialize Bar
+            table.Bar.ToolbarTopBackground = new LinearGradientColorTable(factory.GetColor(0xDCE8F6), factory.GetColor(0xC8D6E8));
+            table.Bar.ToolbarBottomBackground = new LinearGradientColorTable(factory.GetColor(0xC8D6E8), factory.GetColor(0xB3C4D8));
+            table.Bar.ToolbarBottomBorder = factory.GetColor(editBorderColor);
+            table.Bar.PopupToolbarBackground = new LinearGradientColorTable(factory.GetColor(0xFFFFFF), Color.Empty);
+            table.Bar.PopupToolbarBorder = factory.GetColor(0xA7ABB0);
+            table.Bar.StatusBarTopBorder = factory.GetColor(editBorderColor);
+            table.Bar.StatusBarTopBorderLight = factory.GetColor(Color.FromArgb(128, Color.White));
+            table.Bar.StatusBarAltBackground.Clear();
+            table.Bar.StatusBarAltBackground.Add(new BackgroundColorBlend(factory.GetColor(0xDCE8F6), 0f));
+            table.Bar.StatusBarAltBackground.Add(new BackgroundColorBlend(factory.GetColor(0xB3C4D8), 1f));
+            #endregion
+
+            #region Menu
+            table.Menu.Background = new LinearGradientColorTable(factory.GetColor(0xFFFFFF), Color.Empty);
+            table.Menu.Border = new LinearGradientColorTable(factory.GetColor(0xA7ABB0), Color.Empty);
+            table.Menu.Side = new LinearGradientColorTable(factory.GetColor(0xFFFFFF), Color.Empty);
+            table.Menu.SideBorder = new LinearGradientColorTable(factory.GetColor(0xE2E4E7), Color.Empty);
+            table.Menu.SideBorderLight = new LinearGradientColorTable(factory.GetColor(0xF5F5F5), Color.Empty);
+            table.Menu.SideUnused = new LinearGradientColorTable(factory.GetColor(0xE5E5E5), Color.Empty);
+            table.Menu.FileBackgroundBlend.Clear();
+            table.Menu.FileBackgroundBlend.AddRange(new DevComponents.DotNetBar.BackgroundColorBlend[] {
+                new DevComponents.DotNetBar.BackgroundColorBlend(factory.GetColor(0xFFFFFF), 0F),
+                new DevComponents.DotNetBar.BackgroundColorBlend(factory.GetColor(0xFFFFFF), 1F)});
+            table.Menu.FileContainerBorder = factory.GetColor(0xA7ABB0);
+            table.Menu.FileContainerBorderLight = Color.Transparent;
+            table.Menu.FileColumnOneBackground = factory.GetColor(0xFFFFFF);
+            table.Menu.FileColumnOneBorder = factory.GetColor(0xA7ABB0);
+            table.Menu.FileColumnTwoBackground = factory.GetColor(0xFFFFFF);
+            table.Menu.FileBottomContainerBackgroundBlend.Clear();
+            //table.Menu.FileBottomContainerBackgroundBlend.AddRange(new DevComponents.DotNetBar.BackgroundColorBlend[] {
+            //    new DevComponents.DotNetBar.BackgroundColorBlend(factory.GetColor(0xEBF3FC), 0F),
+            //    new DevComponents.DotNetBar.BackgroundColorBlend(factory.GetColor(0xEBF3FC), 1F)});
+            #endregion
+
+            #region ComboBox
+            table.ComboBox.Default.Background = factory.GetColor(0xEDF5FD);
+            table.ComboBox.Default.Border = factory.GetColor(0xB1C0D6);
+            table.ComboBox.Default.ExpandBackground = new LinearGradientColorTable();
+            table.ComboBox.Default.ExpandBorderInner = new LinearGradientColorTable();
+            table.ComboBox.Default.ExpandBorderOuter = new LinearGradientColorTable();
+            table.ComboBox.Default.ExpandText = factory.GetColor(0x5A5D61);
+            table.ComboBox.DefaultStandalone.Background = factory.GetColor(0xFFFFFF);
+            table.ComboBox.DefaultStandalone.Border = factory.GetColor(editBorderColor);
+            table.ComboBox.DefaultStandalone.ExpandBackground = new LinearGradientColorTable(factory.GetColor(0xE1EDFA), factory.GetColor(0xD0DFEE), 90);
+            table.ComboBox.DefaultStandalone.ExpandBorderInner = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(0xFFFFFF));
+            table.ComboBox.DefaultStandalone.ExpandBorderOuter = new LinearGradientColorTable(factory.GetColor(0xABBAD0), Color.Empty, 90);
+            table.ComboBox.DefaultStandalone.ExpandText = factory.GetColor(0x5A5D61);
+            table.ComboBox.MouseOver.Background = factory.GetColor(0xFFFFFF);
+            table.ComboBox.MouseOver.Border = factory.GetColor(editBorderColor);
+            table.ComboBox.MouseOver.ExpandBackground = new LinearGradientColorTable(factory.GetColor(0xF9E187), factory.GetColor(0xFAF3CF), 90);
+            table.ComboBox.MouseOver.ExpandBorderInner = new LinearGradientColorTable(factory.GetColor(0xFCF8E5), factory.GetColor(0xFDFCEF), 90);
+            table.ComboBox.MouseOver.ExpandBorderOuter = new LinearGradientColorTable(factory.GetColor(0xEEC858), Color.Empty, 90);
+            table.ComboBox.MouseOver.ExpandText = factory.GetColor(0x5A5D61);
+            table.ComboBox.DroppedDown.Background = factory.GetColor(0xFFFFFF);
+            table.ComboBox.DroppedDown.Border = factory.GetColor(editBorderColor);
+            table.ComboBox.DroppedDown.ExpandBackground = new LinearGradientColorTable(factory.GetColor(0xFAD577), factory.GetColor(0xFFE48A), 90);
+            table.ComboBox.DroppedDown.ExpandBorderInner = new LinearGradientColorTable(factory.GetColor(0xF3C462), factory.GetColor(0xF9D77B), 90);
+            table.ComboBox.DroppedDown.ExpandBorderOuter = new LinearGradientColorTable(factory.GetColor(0xC2772B), factory.GetColor(0xC2772B), 90);
+            table.ComboBox.DroppedDown.ExpandText = factory.GetColor(0x5A5D61);
+            #endregion
+
+            #region Dialog Launcher
+            table.DialogLauncher.Default.DialogLauncher = factory.GetColor(0x858B95);
+            table.DialogLauncher.Default.DialogLauncherShade = Color.Empty;// factory.GetColor(172, 0xFFFFFF);
+
+            table.DialogLauncher.MouseOver.DialogLauncher = factory.GetColor(0x858B95);
+            table.DialogLauncher.MouseOver.DialogLauncherShade = Color.Empty; // Color.FromArgb(192, factory.GetColor(0xFFFFFF));
+            table.DialogLauncher.MouseOver.TopBackground = new LinearGradientColorTable(factory.GetColor(0xFDEEDE), factory.GetColor(0xFDE0BD));
+            table.DialogLauncher.MouseOver.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xFFD26F), factory.GetColor(0xFFF599));
+            table.DialogLauncher.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFEF9F3), factory.GetColor(0xFFFFF3));
+            table.DialogLauncher.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xFFB700), Color.Empty);
+
+            table.DialogLauncher.Pressed.DialogLauncher = factory.GetColor(0x858B95);
+            table.DialogLauncher.Pressed.DialogLauncherShade = Color.Empty; // Color.FromArgb(128, factory.GetColor(0xFFFFFF));
+            table.DialogLauncher.Pressed.TopBackground = new LinearGradientColorTable(factory.GetColor(0xE4C8A5), factory.GetColor(0xEDC891));
+            table.DialogLauncher.Pressed.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xEEBC62), factory.GetColor(0xEEE48B));
+            table.DialogLauncher.Pressed.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xD4BFA8), factory.GetColor(0xEFF1C2));
+            table.DialogLauncher.Pressed.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xC2923B), factory.GetColor(0xC2B462));
+            #endregion
+
+            #region System Button, Form
+            // Default state no background
+            table.SystemButton.Default = new Office2007SystemButtonStateColorTable();
+            table.SystemButton.Default.Foreground = new LinearGradientColorTable(factory.GetColor(0xEAF0F6));
+            table.SystemButton.Default.LightShade = Color.Empty;
+            table.SystemButton.Default.DarkShade = factory.GetColor(0x525565);
+
+            // Mouse over state
+            table.SystemButton.MouseOver = new Office2007SystemButtonStateColorTable();
+            table.SystemButton.MouseOver.Foreground = new LinearGradientColorTable(factory.GetColor(0xEDF2F9));
+            table.SystemButton.MouseOver.LightShade = Color.Empty;
+            table.SystemButton.MouseOver.DarkShade = factory.GetColor(0x525565);
+            table.SystemButton.MouseOver.TopBackground = new LinearGradientColorTable(factory.GetColor(0xD4E8FF), factory.GetColor(0xCBDFF6));
+            table.SystemButton.MouseOver.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xCBDFF6), factory.GetColor(0xBFD2EA));
+            table.SystemButton.MouseOver.TopHighlight = null; // new LinearGradientColorTable(factory.GetColor(0xFBFCFF), Color.Transparent);
+            table.SystemButton.MouseOver.BottomHighlight = null; // new LinearGradientColorTable(factory.GetColor(0xFBFCFF), Color.Transparent);
+            table.SystemButton.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x8FA5BF));
+            table.SystemButton.MouseOver.InnerBorder = LinearGradientColorTable.Empty;
+
+            // Pressed
+            table.SystemButton.Pressed = new Office2007SystemButtonStateColorTable();
+            table.SystemButton.Pressed.Foreground = new LinearGradientColorTable(factory.GetColor(0xE9EFF6));
+            table.SystemButton.Pressed.LightShade = Color.Empty;
+            table.SystemButton.Pressed.DarkShade = factory.GetColor(0x525565);
+            table.SystemButton.Pressed.TopBackground = new LinearGradientColorTable(factory.GetColor(0xB7CAE2));
+            table.SystemButton.Pressed.TopHighlight = null;// new LinearGradientColorTable(factory.GetColor(0xB8CEE9), Color.Transparent);
+            table.SystemButton.Pressed.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xB7CAE2));
+            table.SystemButton.Pressed.BottomHighlight = null; // new LinearGradientColorTable(factory.GetColor(0xC6EAFD), Color.Transparent);
+            table.SystemButton.Pressed.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x8FA5BF));
+            table.SystemButton.Pressed.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xADC1DA));
+
+            // CLOSE Default state no background
+            table.SystemButtonClose = new Office2007SystemButtonColorTable();
+            table.SystemButtonClose.Default = new Office2007SystemButtonStateColorTable();
+            table.SystemButtonClose.Default.Foreground = new LinearGradientColorTable(factory.GetColor(0xEAF0F6));
+            table.SystemButtonClose.Default.LightShade = Color.Empty;
+            table.SystemButtonClose.Default.DarkShade = factory.GetColor(0x525565);
+
+            // Mouse over state
+            table.SystemButtonClose.MouseOver = new Office2007SystemButtonStateColorTable();
+            table.SystemButtonClose.MouseOver.Foreground = new LinearGradientColorTable(factory.GetColor(0xFCD7D7));
+            table.SystemButtonClose.MouseOver.LightShade = Color.Empty;
+            table.SystemButtonClose.MouseOver.DarkShade = factory.GetColor(0x9B3D3D);
+            table.SystemButtonClose.MouseOver.TopBackground = new LinearGradientColorTable(factory.GetColor(0xFF8482), factory.GetColor(0xFB7F7E));
+            table.SystemButtonClose.MouseOver.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xF67979), factory.GetColor(0xE36162));
+            table.SystemButtonClose.MouseOver.TopHighlight = null; // new LinearGradientColorTable(factory.GetColor(0xFBFCFF), Color.Transparent);
+            table.SystemButtonClose.MouseOver.BottomHighlight = null; // new LinearGradientColorTable(factory.GetColor(0xFBFCFF), Color.Transparent);
+            table.SystemButtonClose.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x9B3D3D));
+            table.SystemButtonClose.MouseOver.InnerBorder = LinearGradientColorTable.Empty;
+
+            // Pressed
+            table.SystemButtonClose.Pressed = new Office2007SystemButtonStateColorTable();
+            table.SystemButtonClose.Pressed.Foreground = new LinearGradientColorTable(factory.GetColor(0xF8D4D5));
+            table.SystemButtonClose.Pressed.LightShade = Color.Empty;
+            table.SystemButtonClose.Pressed.DarkShade = factory.GetColor(0x9B3D3D);
+            table.SystemButtonClose.Pressed.TopBackground = new LinearGradientColorTable(factory.GetColor(0xF27776));
+            table.SystemButtonClose.Pressed.TopHighlight = null;// new LinearGradientColorTable(factory.GetColor(0xB8CEE9), Color.Transparent);
+            table.SystemButtonClose.Pressed.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xF27776));
+            table.SystemButtonClose.Pressed.BottomHighlight = null; // new LinearGradientColorTable(factory.GetColor(0xC6EAFD), Color.Transparent);
+            table.SystemButtonClose.Pressed.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x9B3D3D));
+            table.SystemButtonClose.Pressed.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xDA6163));
+
+            // Form border
+            table.Form.Active.BorderColors = new Color[] {
+                factory.GetColor(0x909AA6),
+                factory.GetColor(0xD4E6F5),
+                factory.GetColor(0xBBCEE6),
+                factory.GetColor(0xBBCEE6),
+                factory.GetColor(0xBBCEE6)
+            };
+
+            table.Form.Inactive.BorderColors = new Color[] {
+                factory.GetColor(0xA2ADB9),
+                factory.GetColor(0xBBCEE6),
+                factory.GetColor(0xBBCEE6),
+                factory.GetColor(0xBBCEE6),
+                factory.GetColor(0xBBCEE6)
+            };
+
+            // Form Caption Active
+            table.Form.Active.CaptionTopBackground = new LinearGradientColorTable(factory.GetColor(0xC1D4EC), factory.GetColor(0xC0D3EA));
+            table.Form.Active.CaptionBottomBackground = new LinearGradientColorTable(factory.GetColor(0xC0D3EA), factory.GetColor(0xBBCEE6));
+            table.Form.Active.CaptionBottomBorder = new Color[] { factory.GetColor(0x909AA6), factory.GetColor(0xD4E6F5) };
+            table.Form.Active.CaptionText = factory.GetColor(0x1F3975);
+            table.Form.Active.CaptionTextExtra = factory.GetColor(0x1F3975);
+
+            // Form Caption Inactive
+            table.Form.Inactive.CaptionTopBackground = new LinearGradientColorTable(factory.GetColor(0xDFEBF7));
+            table.Form.Inactive.CaptionBottomBackground = new LinearGradientColorTable(factory.GetColor(0xDFEBF7));
+            table.Form.Inactive.CaptionText = factory.GetColor(0x6A80A8);
+            table.Form.Inactive.CaptionTextExtra = factory.GetColor(0x6A80A8);
+
+            table.Form.BackColor = factory.GetColor(0xCFDDEE);
+            table.Form.TextColor = factory.GetColor(0x1E395B);
+
+            table.Form.MdiClientBackgroundImage = BarFunctions.LoadBitmap("SystemImages.Office2010BlueClientBackground.png");
+            #endregion
+
+            #region Quick Access Toolbar Background
+            table.QuickAccessToolbar.Active.TopBackground = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(0xDEE7F4), factory.GetColor(0xE6EEF9));
+            table.QuickAccessToolbar.Active.BottomBackground = LinearGradientColorTable.Empty; //new LinearGradientColorTable(factory.GetColor(0xDBE7F7), factory.GetColor(0xC9D9EE));
+            table.QuickAccessToolbar.Active.OutterBorderColor = Color.Empty; // factory.GetColor(0xF6F9FC);
+            table.QuickAccessToolbar.Active.MiddleBorderColor = Color.Empty; // factory.GetColor(0x9AB3D5);
+            table.QuickAccessToolbar.Active.InnerBorderColor = Color.Empty; //  factory.GetColor(0xD2E3F9);
+
+            table.QuickAccessToolbar.Inactive.TopBackground = LinearGradientColorTable.Empty; //new LinearGradientColorTable(factory.GetColor(0xE6ECF3), factory.GetColor(0xCED8E6));
+            table.QuickAccessToolbar.Inactive.BottomBackground = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(0xCED8E6), factory.GetColor(0xC8D3E3));
+            table.QuickAccessToolbar.Inactive.OutterBorderColor = Color.Empty; // factory.GetColor(0xF6F9FC);
+            table.QuickAccessToolbar.Inactive.MiddleBorderColor = Color.Empty; // factory.GetColor(0x9AB3D5);
+            table.QuickAccessToolbar.Inactive.InnerBorderColor = Color.Empty;
+
+            table.QuickAccessToolbar.Standalone.TopBackground = new LinearGradientColorTable();
+            table.QuickAccessToolbar.Standalone.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xCDDFF5));
+            table.QuickAccessToolbar.Standalone.OutterBorderColor = factory.GetColor(0x90A6C1);
+            table.QuickAccessToolbar.Standalone.MiddleBorderColor = factory.GetColor(0xD5E8FE);
+            table.QuickAccessToolbar.Standalone.InnerBorderColor = Color.Empty; // factory.GetColor(0xDCE8F7);
+
+            table.QuickAccessToolbar.QatCustomizeMenuLabelBackground = factory.GetColor(0xF0F2F5);
+            table.QuickAccessToolbar.QatCustomizeMenuLabelText = factory.GetColor(0x1E395B);
+
+            table.QuickAccessToolbar.Active.GlassBorder = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(Color.FromArgb(132, Color.Black)), Color.FromArgb(80, Color.Black));
+            table.QuickAccessToolbar.Inactive.GlassBorder = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(Color.FromArgb(132, Color.Black)), Color.FromArgb(80, Color.Black));
+            #endregion
+
+            #region Tab Colors
+            table.TabControl.Default = new Office2007TabItemStateColorTable();
+            table.TabControl.Default.TopBackground = new LinearGradientColorTable(factory.GetColor(0xC8DCF4), factory.GetColor(0xAFD2FE));
+            table.TabControl.Default.BottomBackground = new LinearGradientColorTable(factory.GetColor(0x96BFF3), factory.GetColor(0xB5CCE9));
+            table.TabControl.Default.InnerBorder = factory.GetColor(0xE3EFFF);
+            table.TabControl.Default.OuterBorder = factory.GetColor(editBorderColor);
+            table.TabControl.Default.Text = factory.GetColor(0x3C5478);
+
+            table.TabControl.MouseOver = new Office2007TabItemStateColorTable();
+            table.TabControl.MouseOver.TopBackground = new LinearGradientColorTable(factory.GetColor(0xE0EDFF), factory.GetColor(0xD7E8FF));
+            table.TabControl.MouseOver.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xB0D2FF), factory.GetColor(0xBEDAFF));
+            table.TabControl.MouseOver.InnerBorder = factory.GetColor(0xFFFFFF);
+            table.TabControl.MouseOver.OuterBorder = factory.GetColor(0x658CBF);
+            table.TabControl.MouseOver.Text = factory.GetColor(0x3C5478);
+
+            table.TabControl.Selected = new Office2007TabItemStateColorTable();
+            table.TabControl.Selected.TopBackground = new LinearGradientColorTable(factory.GetColor(0xEBE3D9), factory.GetColor(0xFDBD74));
+            table.TabControl.Selected.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xF9B459), factory.GetColor(0xFFFFFF));
+            table.TabControl.Selected.InnerBorder = factory.GetColor(0xCDB69C);
+            table.TabControl.Selected.OuterBorder = factory.GetColor(editBorderColor);
+            table.TabControl.Selected.Text = factory.GetColor(0x1E395B);
+
+            table.TabControl.TabBackground = new LinearGradientColorTable(factory.GetColor(0xCFDDEE), Color.Empty);
+            table.TabControl.TabPanelBackground = new LinearGradientColorTable(factory.GetColor(0xFFFFFF), Color.Empty);
+            table.TabControl.TabPanelBorder = factory.GetColor(editBorderColor);
+            #endregion
+
+            #region CheckBoxItem
+            Office2007CheckBoxColorTable chk = table.CheckBoxItem;
+            chk.Default.CheckBackground = new LinearGradientColorTable(factory.GetColor(0xF4F4F4), Color.Empty);
+            chk.Default.CheckBorder = factory.GetColor(0xABC1DE);
+            chk.Default.CheckInnerBackground = new LinearGradientColorTable(factory.GetColor(0xE8E9EB), factory.GetColor(0xF2F2F3));
+            chk.Default.CheckInnerBorder = factory.GetColor(0xBEC4CC);
+            chk.Default.CheckSign = new LinearGradientColorTable(factory.GetColor(0x4A6B96), Color.Empty);
+            chk.Default.Text = factory.GetColor(0x1E395B);
+
+            chk.MouseOver.CheckBackground = new LinearGradientColorTable(factory.GetColor(0xFCF1C2), Color.Empty);
+            chk.MouseOver.CheckBorder = factory.GetColor(0xCF9037);
+            chk.MouseOver.CheckInnerBackground = new LinearGradientColorTable(factory.GetColor(0xFAECC8), factory.GetColor(0xFDF6E4));
+            chk.MouseOver.CheckInnerBorder = factory.GetColor(0xFCAD5D);
+            chk.MouseOver.CheckSign = new LinearGradientColorTable(factory.GetColor(0x4A6B96), Color.Empty);
+            chk.MouseOver.Text = factory.GetColor(0x1E395B);
+
+            chk.Pressed.CheckBackground = new LinearGradientColorTable(factory.GetColor(0xFCE7BD));
+            chk.Pressed.CheckBorder = factory.GetColor(0xC26D1D);
+            chk.Pressed.CheckInnerBackground = new LinearGradientColorTable(factory.GetColor(0xFAE0A2), factory.GetColor(0xFDF2D7));
+            chk.Pressed.CheckInnerBorder = factory.GetColor(0xFCA558);
+            chk.Pressed.CheckSign = new LinearGradientColorTable(factory.GetColor(0x4A6B96), Color.Empty);
+            chk.Pressed.Text = factory.GetColor(0x1E395B);
+
+            chk.Disabled.CheckBackground = new LinearGradientColorTable(factory.GetColor(0xFFFFFF), Color.Empty);
+            chk.Disabled.CheckBorder = factory.GetColor(0xB6B8BA);
+            chk.Disabled.CheckInnerBackground = new LinearGradientColorTable(factory.GetColor(0xF8F8F9));
+            chk.Disabled.CheckInnerBorder = factory.GetColor(0xDFE0E0);
+            chk.Disabled.CheckSign = new LinearGradientColorTable(factory.GetColor(0xB1B3B4), Color.Empty);
+            chk.Disabled.Text = factory.GetColor(0x87929F);
+            #endregion
+
+            #region Scroll Bar Colors
+            InitializeScrollBarColorTable(table, factory);
+            InitializeAppBlueScrollBarColorTable(table, factory);
+            #endregion
+
+            #region ProgressBarItem
+            Office2007ProgressBarColorTable pct = table.ProgressBarItem;
+            pct.BackgroundColors = new GradientColorTable(0xEBEDF0, 0xD5D8DC);
+            pct.OuterBorder = factory.GetColor(0x6E97CC);
+            pct.InnerBorder = factory.GetColor(0xFFFFFF);
+            pct.Chunk = new GradientColorTable(0x69922A, 0xE7F2D4, 0);
+            pct.ChunkOverlay = new GradientColorTable();
+            pct.ChunkOverlay.LinearGradientAngle = 90;
+            pct.ChunkOverlay.Colors.AddRange(new BackgroundColorBlend[] {
+                new BackgroundColorBlend(Color.FromArgb(192, factory.GetColor(0xEEFFD7)), 0f),
+                new BackgroundColorBlend(Color.FromArgb(128, factory.GetColor(0x8DB254)), .5f),
+                new BackgroundColorBlend(Color.FromArgb(64, factory.GetColor(0x69922B)), .5f),
+                new BackgroundColorBlend(Color.Transparent, 1f),
+            });
+            pct.ChunkShadow = new GradientColorTable(0xB2B9C8, 0xD5DAE5, 0);
+
+            // Paused State
+            pct = table.ProgressBarItemPaused;
+            pct.BackgroundColors = new GradientColorTable(0xEBEDF0, 0xD5D8DC);
+            pct.OuterBorder = factory.GetColor(0x6E97CC);
+            pct.InnerBorder = factory.GetColor(0xFFFFFF);
+            pct.Chunk = new GradientColorTable(0xAEA700, 0xFFFDCD, 0);
+            pct.ChunkOverlay = new GradientColorTable();
+            pct.ChunkOverlay.LinearGradientAngle = 90;
+            pct.ChunkOverlay.Colors.AddRange(new BackgroundColorBlend[] {
+                new BackgroundColorBlend(Color.FromArgb(192, factory.GetColor(0xFFFBA3)), 0f),
+                new BackgroundColorBlend(Color.FromArgb(128, factory.GetColor(0xD2CA00)), .5f),
+                new BackgroundColorBlend(Color.FromArgb(64, factory.GetColor(0xFEF400)), .5f),
+                new BackgroundColorBlend(Color.Transparent, 1f),
+            });
+            pct.ChunkShadow = new GradientColorTable(0xB2B9C8, 0xD5DAE5, 0);
+
+            // Error State
+            pct = table.ProgressBarItemError;
+            pct.BackgroundColors = new GradientColorTable(0xEBEDF0, 0xD5D8DC);
+            pct.OuterBorder = factory.GetColor(0x6E97CC);
+            pct.InnerBorder = factory.GetColor(0xFFFFFF);
+            pct.Chunk = new GradientColorTable(0xD20000, 0xFFCDCD, 0);
+            pct.ChunkOverlay = new GradientColorTable();
+            pct.ChunkOverlay.LinearGradientAngle = 90;
+            pct.ChunkOverlay.Colors.AddRange(new BackgroundColorBlend[] {
+                new BackgroundColorBlend(Color.FromArgb(192, factory.GetColor(0xFF8F8F)), 0f),
+                new BackgroundColorBlend(Color.FromArgb(128, factory.GetColor(0xD20000)), .5f),
+                new BackgroundColorBlend(Color.FromArgb(64, factory.GetColor(0xFE0000)), .5f),
+                new BackgroundColorBlend(Color.Transparent, 1f),
+            });
+            pct.ChunkShadow = new GradientColorTable(0xB2B9C8, 0xD5DAE5, 0);
+            #endregion
+
+            #region Gallery
+            Office2007GalleryColorTable gallery = table.Gallery;
+            gallery.GroupLabelBackground = factory.GetColor(0xF0F2F5);
+            gallery.GroupLabelText = factory.GetColor(0x1E395B);
+            gallery.GroupLabelBorder = factory.GetColor(0xF0F2F5);
+            #endregion
+
+            #region Legacy Colors
+            table.LegacyColors.BarBackground = factory.GetColor(0xDCE8F6);
+            table.LegacyColors.BarBackground2 = factory.GetColor(0xB3C4D8);
+            table.LegacyColors.BarStripeColor = factory.GetColor(0x788DA5);
+            table.LegacyColors.BarCaptionBackground = factory.GetColor(0x9CADC1);
+            table.LegacyColors.BarCaptionBackground2 = Color.Empty;
+            table.LegacyColors.BarCaptionText = factory.GetColor(0x1F396D);
+            table.LegacyColors.BarCaptionInactiveBackground = factory.GetColor(0xB1C3D9);
+            table.LegacyColors.BarCaptionInactiveBackground2 = Color.Empty;
+            table.LegacyColors.BarCaptionInactiveText = factory.GetColor(0x1F3972);
+            table.LegacyColors.BarFloatingBorder = factory.GetColor(editBorderColor);
+            table.LegacyColors.BarPopupBackground = factory.GetColor(0xFFFFFF);
+            table.LegacyColors.BarPopupBorder = factory.GetColor(0xA7ABB0);
+            table.LegacyColors.ItemBackground = Color.Empty;
+            table.LegacyColors.ItemBackground2 = Color.Empty;
+            table.LegacyColors.ItemCheckedBackground = factory.GetColor(0xFFE575);
+            table.LegacyColors.ItemCheckedBackground2 = factory.GetColor(0xFFE975);
+            table.LegacyColors.ItemCheckedBorder = factory.GetColor(0xC28A30);
+            table.LegacyColors.ItemCheckedText = factory.GetColor(0x1F3978);
+            table.LegacyColors.ItemDisabledBackground = Color.Empty;
+            table.LegacyColors.ItemDisabledText = factory.GetColor(0x8D8D8D);
+            table.LegacyColors.ItemExpandedShadow = Color.Empty;
+            table.LegacyColors.ItemExpandedBackground = factory.GetColor(0xFFE575);
+            table.LegacyColors.ItemExpandedBackground2 = factory.GetColor(0xFFDC6E);
+            table.LegacyColors.ItemExpandedText = factory.GetColor(0x1F3978);
+            table.LegacyColors.ItemHotBackground = factory.GetColor(0xF8E187);
+            table.LegacyColors.ItemHotBackground2 = factory.GetColor(0xF8F1CC);
+            table.LegacyColors.ItemHotBorder = factory.GetColor(0xF1D449);
+            table.LegacyColors.ItemHotText = factory.GetColor(0x1F3978);
+            table.LegacyColors.ItemPressedBackground = factory.GetColor(0xF6C867);
+            table.LegacyColors.ItemPressedBackground2 = factory.GetColor(0xFEE287);
+            table.LegacyColors.ItemPressedBorder = factory.GetColor(0xC2762B);
+            table.LegacyColors.ItemPressedText = factory.GetColor(0x1F3978);
+            table.LegacyColors.ItemSeparator = factory.GetColor(0x92A6C2);
+            table.LegacyColors.ItemSeparatorShade = Color.FromArgb(128, factory.GetColor(0xFFFFFF));
+            table.LegacyColors.ItemText = factory.GetColor(0x1F3978);
+            table.LegacyColors.MenuBackground = factory.GetColor(0xFFFFFF);
+            table.LegacyColors.MenuBackground2 = Color.Empty; // Color.White;
+            table.LegacyColors.MenuBarBackground = factory.GetColor(0xCFDDEE);
+            table.LegacyColors.MenuBorder = factory.GetColor(0xA7ABB0);
+            table.LegacyColors.ItemExpandedBorder = table.LegacyColors.MenuBorder;
+            table.LegacyColors.MenuSide = factory.GetColor(0xFFFFFF);
+            table.LegacyColors.MenuSide2 = Color.Empty; // factory.GetColor(0xDDE0E8);
+            table.LegacyColors.MenuUnusedBackground = table.LegacyColors.MenuBackground;
+            table.LegacyColors.MenuUnusedSide = factory.GetColor(0xDADADA);
+            table.LegacyColors.MenuUnusedSide2 = Color.Empty;// System.Windows.Forms.ControlPaint.Light(table.LegacyColors.MenuSide2);
+            table.LegacyColors.ItemDesignTimeBorder = Color.DarkGray;
+            table.LegacyColors.BarDockedBorder = factory.GetColor(editBorderColor);
+            table.LegacyColors.DockSiteBackColor = factory.GetColor(0xCFDDEE);
+            table.LegacyColors.DockSiteBackColor2 = Color.Empty;
+            table.LegacyColors.CustomizeBackground = factory.GetColor(0x91ABC9);
+            table.LegacyColors.CustomizeBackground2 = factory.GetColor(0xB9CEE6);
+            table.LegacyColors.CustomizeText = factory.GetColor(0x1F3978);
+            table.LegacyColors.PanelBackground = factory.GetColor(0xEFF6FD);
+            table.LegacyColors.PanelBackground2 = factory.GetColor(0xD8E4F2);
+            table.LegacyColors.PanelText = factory.GetColor(0x1F3978);
+            table.LegacyColors.PanelBorder = factory.GetColor(0x5D6C7A);
+            table.LegacyColors.ExplorerBarBackground = factory.GetColor(0xC7DAF0);
+            table.LegacyColors.ExplorerBarBackground2 = factory.GetColor(0x88A4C2);
+            table.LegacyColors.SplitterBackground = factory.GetColor(0xDBEBFF);
+            table.LegacyColors.SplitterBackground2 = factory.GetColor(0xB4C4D6);
+            table.LegacyColors.SplitterBorder = factory.GetColor(0x859EBF);
+            table.LegacyColors.SplitterText = table.LegacyColors.SplitterBorder;
+            #endregion
+
+            #region Navigation Pane
+            table.NavigationPane.ButtonBackground = new GradientColorTable();
+            table.NavigationPane.ButtonBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xCFDDEE), 0));
+            #endregion
+
+            #region SuperTooltip
+            table.SuperTooltip.BackgroundColors = new LinearGradientColorTable(factory.GetColor(0xFFFFFF), factory.GetColor(0xC9D9EF));
+            table.SuperTooltip.TextColor = factory.GetColor(0x4C4C4C);
+            #endregion
+
+            #region Slider
+            Office2007SliderColorTable sl = table.Slider;
+            sl.Default.LabelColor = factory.GetColor(0x1E395B);
+            sl.Default.SliderLabelColor = factory.GetColor(0x1E395B);
+            sl.Default.PartBackground = new GradientColorTable();
+            sl.Default.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xF7FBFE), 0));
+            sl.Default.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xE3ECF8), .5f));
+            sl.Default.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xBCCADD), 1f));
+            sl.Default.PartBorderColor = factory.GetColor(0x76869D);
+            sl.Default.PartBorderLightColor = Color.FromArgb(96, factory.GetColor(0xFFFFFF));
+            sl.Default.PartForeColor = factory.GetColor(0x7E8287);
+            sl.Default.PartForeLightColor = Color.Empty;
+            sl.Default.TrackLineColor = factory.GetColor(0x8A9CB8);
+            sl.Default.TrackLineLightColor = factory.GetColor(0xDEEAF7);
+
+            sl.MouseOver.LabelColor = factory.GetColor(0x1E395B);
+            sl.MouseOver.SliderLabelColor = factory.GetColor(0x1E395B);
+            sl.MouseOver.PartBackground = new GradientColorTable();
+            sl.MouseOver.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xF6E49C), 0));
+            sl.MouseOver.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xF6E59A), .5f));
+            sl.MouseOver.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFAF5D5), 1f));
+            sl.MouseOver.PartBorderColor = factory.GetColor(0xEDC23E);
+            sl.MouseOver.PartBorderLightColor = Color.FromArgb(96, factory.GetColor(0xFFFFFF));
+            sl.MouseOver.PartForeColor = factory.GetColor(0x7E8287);
+            sl.MouseOver.PartForeLightColor = Color.Empty;
+            sl.MouseOver.TrackLineColor = factory.GetColor(0x8A9CB8);
+            sl.MouseOver.TrackLineLightColor = factory.GetColor(0xDEEAF7);
+
+            sl.Pressed.LabelColor = factory.GetColor(0x1E395B);
+            sl.Pressed.SliderLabelColor = factory.GetColor(0x1E395B);
+            sl.Pressed.PartBackground = new GradientColorTable();
+            sl.Pressed.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFBD677), 0));
+            sl.Pressed.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFFE489), .5f));
+            sl.Pressed.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFFE489), 1f));
+            sl.Pressed.PartBorderColor = factory.GetColor(0xC27D36);
+            sl.Pressed.PartBorderLightColor = factory.GetColor(0xF1C15F);
+            sl.Pressed.PartForeColor = factory.GetColor(0x7E8287);
+            sl.Pressed.PartForeLightColor = Color.Empty;
+            sl.Pressed.TrackLineColor = factory.GetColor(0x8A9CB8);
+            sl.Pressed.TrackLineLightColor = factory.GetColor(0xDEEAF7);
+
+            ColorBlendFactory df = new ColorBlendFactory(ColorScheme.GetColor(0xCFCFCF));
+            sl.Disabled.LabelColor = factory.GetColor(0x8D8D8D);
+            sl.Disabled.SliderLabelColor = factory.GetColor(0x8D8D8D);
+            sl.Disabled.PartBackground = new GradientColorTable();
+            foreach (BackgroundColorBlend b in sl.Default.PartBackground.Colors)
+                sl.Disabled.PartBackground.Colors.Add(new BackgroundColorBlend(df.GetColor(b.Color), b.Position));
+            sl.Disabled.PartBorderColor = df.GetColor(sl.Default.PartBorderColor);
+            sl.Disabled.PartBorderLightColor = df.GetColor(sl.Default.PartBorderLightColor);
+            sl.Disabled.PartForeColor = df.GetColor(sl.Default.PartForeColor);
+            sl.Disabled.PartForeLightColor = df.GetColor(sl.Default.PartForeLightColor);
+            sl.Disabled.TrackLineColor = df.GetColor(sl.Default.TrackLineColor);
+            sl.Disabled.TrackLineLightColor = df.GetColor(sl.Default.TrackLineLightColor);
+            #endregion
+
+            #region RangeSlider
+            Office2007ColorTable.InitRangeSlider(table, factory);
+            #endregion
+
+            #region ListViewEx
+            table.ListViewEx.Border = factory.GetColor(editBorderColor);
+            table.ListViewEx.ColumnBackground = new LinearGradientColorTable(factory.GetColor(0xEFF5FB), factory.GetColor(0xE1ECFA));
+            table.ListViewEx.ColumnSeparator = factory.GetColor(editBorderColor);
+            table.ListViewEx.ColumnForeColor = factory.GetColor(0x1E395B);
+            table.ListViewEx.SelectionBackground = new LinearGradientColorTable(factory.GetColor(0xA7CDF0), Color.Empty);
+            table.ListViewEx.SelectionBorder = factory.GetColor(0xE3EFFF);
+            #endregion
+
+            #region DataGridView
+            table.DataGridView.ColumnHeaderNormalBorder = factory.GetColor(editBorderColor);
+            table.DataGridView.ColumnHeaderNormalBackground = new LinearGradientColorTable(factory.GetColor(0xEFF5FB), factory.GetColor(0xE1ECFA), 90);
+            table.DataGridView.ColumnHeaderSelectedBackground = new LinearGradientColorTable(factory.GetColor(0xF9D99F), factory.GetColor(0xF1C15F), 90);
+            table.DataGridView.ColumnHeaderSelectedBorder = factory.GetColor(0xF29536);
+            table.DataGridView.ColumnHeaderSelectedMouseOverBackground = new LinearGradientColorTable(factory.GetColor(0xFFD58D), factory.GetColor(0xF2923A), 90);
+            table.DataGridView.ColumnHeaderSelectedMouseOverBorder = factory.GetColor(0xF29536);
+            table.DataGridView.ColumnHeaderMouseOverBackground = new LinearGradientColorTable(factory.GetColor(0xD4E4F7), factory.GetColor(0xC3D6EC), 90);
+            table.DataGridView.ColumnHeaderMouseOverBorder = factory.GetColor(editBorderColor);
+            table.DataGridView.ColumnHeaderPressedBackground = new LinearGradientColorTable(factory.GetColor(0xB5CBE3), factory.GetColor(0xA5BCD7), 90);
+            table.DataGridView.ColumnHeaderPressedBorder = factory.GetColor(editBorderColor);
+
+            table.DataGridView.RowNormalBackground = new LinearGradientColorTable(factory.GetColor(0xE4ECF7));
+            table.DataGridView.RowNormalBorder = factory.GetColor(editBorderColor);
+            table.DataGridView.RowSelectedBackground = new LinearGradientColorTable(factory.GetColor(0xFFD58D));
+            table.DataGridView.RowSelectedBorder = factory.GetColor(0xF29536);
+            table.DataGridView.RowSelectedMouseOverBackground = new LinearGradientColorTable(factory.GetColor(0xF1C05C));
+            table.DataGridView.RowSelectedMouseOverBorder = factory.GetColor(0xF29536);
+            table.DataGridView.RowMouseOverBackground = new LinearGradientColorTable(factory.GetColor(0xF1C05C));
+            table.DataGridView.RowMouseOverBorder = factory.GetColor(0xF29536);
+            table.DataGridView.RowPressedBackground = new LinearGradientColorTable(factory.GetColor(0xB5CBE3), factory.GetColor(0xA5BCD7), 90);
+            table.DataGridView.RowPressedBorder = factory.GetColor(editBorderColor);
+
+            table.DataGridView.GridColor = factory.GetColor(0xAAAAAA);
+
+            table.DataGridView.SelectorBackground = new LinearGradientColorTable(factory.GetColor(0xA5BCD7));
+            table.DataGridView.SelectorBorder = factory.GetColor(editBorderColor);
+            table.DataGridView.SelectorBorderDark = factory.GetColor(0xC3C3C3);
+            table.DataGridView.SelectorBorderLight = factory.GetColor(0xF9F9F9);
+            table.DataGridView.SelectorSign = new LinearGradientColorTable(factory.GetColor(0xF2F2F2));
+
+            table.DataGridView.SelectorMouseOverBackground = new LinearGradientColorTable(factory.GetColor(0x8BA0B5));
+            table.DataGridView.SelectorMouseOverBorder = factory.GetColor(0x9EB6CE);
+            table.DataGridView.SelectorMouseOverBorderDark = factory.GetColor(0xB0CFF7);
+            table.DataGridView.SelectorMouseOverBorderLight = factory.GetColor(0xD5E4F2);
+            table.DataGridView.SelectorMouseOverSign = new LinearGradientColorTable(factory.GetColor(0xF9FAFB), factory.GetColor(0xD7DAE2));
+            #endregion
+
+            #region SideBar
+            table.SideBar.Background = new LinearGradientColorTable(factory.GetColor(Color.White));
+            table.SideBar.Border = factory.GetColor(editBorderColor);
+            table.SideBar.SideBarPanelItemText = factory.GetColor(0x1E395B);
+            table.SideBar.SideBarPanelItemDefault = new GradientColorTable();
+            table.SideBar.SideBarPanelItemDefault.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xEDF5FD), 0));
+            table.SideBar.SideBarPanelItemDefault.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xD8E4F2), 1));
+            // Expanded
+            table.SideBar.SideBarPanelItemExpanded = new GradientColorTable();
+            table.SideBar.SideBarPanelItemExpanded.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFBDBB5), 0));
+            table.SideBar.SideBarPanelItemExpanded.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFEC778), .4f));
+            table.SideBar.SideBarPanelItemExpanded.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFEB456), .4f));
+            table.SideBar.SideBarPanelItemExpanded.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFDEB9F), 1));
+            // MouseOver
+            table.SideBar.SideBarPanelItemMouseOver = new GradientColorTable();
+            table.SideBar.SideBarPanelItemMouseOver.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFFFCD9), 0));
+            table.SideBar.SideBarPanelItemMouseOver.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFFE78D), .4f));
+            table.SideBar.SideBarPanelItemMouseOver.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFFD748), .4f));
+            table.SideBar.SideBarPanelItemMouseOver.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFFE793), 1));
+            // Pressed
+            table.SideBar.SideBarPanelItemPressed = new GradientColorTable();
+            table.SideBar.SideBarPanelItemPressed.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xF8B869), 0));
+            table.SideBar.SideBarPanelItemPressed.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFDA361), .4f));
+            table.SideBar.SideBarPanelItemPressed.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFB8A3C), .4f));
+            table.SideBar.SideBarPanelItemPressed.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFEBB60), 1));
+            #endregion
+
+            #region AdvTree
+#if !NOTREE
+            table.AdvTree = new DevComponents.AdvTree.Display.TreeColorTable();
+            DevComponents.AdvTree.Display.ColorTableInitializer.InitOffice2007Blue(table.AdvTree, factory);
+#endif
+            #endregion
+
+            #region CrumbBar
+            table.CrumbBarItemView = new CrumbBarItemViewColorTable();
+            CrumbBarItemViewStateColorTable crumbBarViewTable = new CrumbBarItemViewStateColorTable();
+            table.CrumbBarItemView.Default = crumbBarViewTable;
+            crumbBarViewTable.Foreground = factory.GetColor(0x1E395B);
+            crumbBarViewTable = new CrumbBarItemViewStateColorTable();
+            table.CrumbBarItemView.MouseOver = crumbBarViewTable;
+            crumbBarViewTable.Foreground = factory.GetColor(0x1E395B);
+            crumbBarViewTable.Background = new BackgroundColorBlendCollection();
+            crumbBarViewTable.Background.AddRange(new BackgroundColorBlend[]{
+                new BackgroundColorBlend(factory.GetColor("F9E8A1"), 0f),
+                new BackgroundColorBlend(factory.GetColor("FAF2CD"), 1f)});
+            crumbBarViewTable.Border = factory.GetColor("EEC955");
+            crumbBarViewTable.BorderLight = factory.GetColor("90FFFFFF");
+            crumbBarViewTable = new CrumbBarItemViewStateColorTable();
+            table.CrumbBarItemView.MouseOverInactive = crumbBarViewTable;
+            crumbBarViewTable.Foreground = factory.GetColor(0x1E395B);
+            crumbBarViewTable.Background = new BackgroundColorBlendCollection();
+            crumbBarViewTable.Background.AddRange(new BackgroundColorBlend[]{
+                new BackgroundColorBlend(factory.GetColor("FFFFFDEC"), 0f),
+                new BackgroundColorBlend(factory.GetColor("FFFFF4CA"), .4f),
+                new BackgroundColorBlend(factory.GetColor("FFFFEBA6"), .4f),
+                new BackgroundColorBlend(factory.GetColor("FFFFF2C5"), 1f)});
+            crumbBarViewTable.Border = factory.GetColor("FF8E8F8F");
+            crumbBarViewTable.BorderLight = factory.GetColor("90FFFFFF");
+            crumbBarViewTable = new CrumbBarItemViewStateColorTable();
+            table.CrumbBarItemView.Pressed = crumbBarViewTable;
+            crumbBarViewTable.Foreground = factory.GetColor(0x1E395B);
+            crumbBarViewTable.Background = new BackgroundColorBlendCollection();
+            crumbBarViewTable.Background.AddRange(new BackgroundColorBlend[]{
+                new BackgroundColorBlend(factory.GetColor("FFC59B61"), 0f),
+                new BackgroundColorBlend(factory.GetColor("FFEEB469"), .1f),
+                new BackgroundColorBlend(factory.GetColor("FFFCA060"), .6f),
+                new BackgroundColorBlend(factory.GetColor("FFFB8E3D"), .6f),
+                new BackgroundColorBlend(factory.GetColor("FFFEBB60"), 1f)});
+            crumbBarViewTable.Border = factory.GetColor("FF8B7654");
+            crumbBarViewTable.BorderLight = factory.GetColor("408B7654");
+
+            #endregion
+
+            #region WarningBox
+            table.WarningBox.BackColor = factory.GetColor(factory.GetColor(0xCDDFF5));
+            table.WarningBox.WarningBorderColor = factory.GetColor(editBorderColor);
+            table.WarningBox.WarningBackColor1 = factory.GetColor(0xC7D6E9);
+            table.WarningBox.WarningBackColor2 = factory.GetColor(0xAFC3DC);
+            #endregion
+
+            #region CalendarView
+
+            #region WeekDayViewColors
+
+            table.CalendarView.WeekDayViewColors = new ColorDef[]
+            {
+                new ColorDef(factory.GetColor(editBorderColor)),           // DayViewBorder
+                new ColorDef(factory.GetColor(0x1E395B)),           // DayHeaderForeground
+
+                new ColorDef(factory.GetColor(0xA5BFE1)),           // DayHeaderBackground
+
+                new ColorDef(factory.GetColor(0x8DAED9)),           // DayHeaderBorder
+
+                new ColorDef(factory.GetColor(0xFFFFFF)),           // DayWorkHoursBackground
+                new ColorDef(factory.GetColor(0xA5BFE1)),           // DayAllDayEventBackground
+                new ColorDef(factory.GetColor(0xE6EDF7)),           // DayOffWorkHoursBackground
+
+                new ColorDef(factory.GetColor(0xA5BFE1)),           // DayHourBorder
+                new ColorDef(factory.GetColor(0xD5E1F1)),           // DayHalfHourBorder
+
+                new ColorDef(factory.GetColor(0x294C7A)),           // SelectionBackground
+
+                new ColorDef(factory.GetColor(0x9199A4)),           // OwnerTabBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xCFD2D8), factory.GetColor(0xB0B6BE)},    // OwnerTabBackground
+                new float[] {0f, 1f}, 90f),
+
+                new ColorDef(factory.GetColor(0x000000)),           // OwnerTabForeground
+                new ColorDef(factory.GetColor(0xB0B6BE)),           // OwnerTabContentBackground
+                new ColorDef(factory.GetColor(0x000000)),           // OwnerTabSelectedForeground
+                new ColorDef(factory.GetColor(0xFFFFFF)),           // OwnerTabSelectionBackground
+
+                new ColorDef(factory.GetColor(0xFFFFFF)),           // CondensedViewBackground
+
+                new ColorDef(factory.GetColor(0xEB8900)),           // NowDayViewBorder
+                new ColorDef(factory.GetColor(0x000000)),           // NowDayHeaderForeground - 0x15428B
+
+                new ColorDef(new Color[] {factory.GetColor(0xFFED79), factory.GetColor(0xFFD86B), factory.GetColor(0xFFBB00), factory.GetColor(0xFFEA77)},
+                new float[] {0f, .55f ,58f, 1f}, 90f),              // NowDayHeaderBackground
+                
+                new ColorDef(new Color[] {factory.GetColor(0xFFED79), factory.GetColor(0xFFD86B), factory.GetColor(0xFFBB00), factory.GetColor(0xFFEA77)},
+                new float[] {0f, .55f ,58f, 1f}, 90f),              // TimeIndicator
+
+                new ColorDef(factory.GetColor(0xEB8900)),           // TimeIndicatorBorder
+            };
+
+            #endregion
+
+            #region HourRulerColors
+
+            table.CalendarView.TimeRulerColors = new ColorDef[]
+            {
+                new ColorDef(factory.GetColor(0xFFFFFF)),           // TimeRulerBackground
+                new ColorDef(factory.GetColor(0x1E395B)),           // TimeRulerForeground
+                new ColorDef(factory.GetColor(editBorderColor)),           // TimeRulerBorder
+                new ColorDef(factory.GetColor(editBorderColor)),           // TimeRulerTickBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xFFED79), factory.GetColor(0xFFD86B), factory.GetColor(0xFFBB00), factory.GetColor(0xFFEA77)},
+                new float[] {0f, .55f ,58f, 1f}, 90f),              // TimeRulerIndicator
+
+                new ColorDef(factory.GetColor(0xEB8900)),           // TimeRulerIndicatorBorder
+            };
+
+            #endregion
+
+            #region MonthViewColors
+
+            table.CalendarView.MonthViewColors = new ColorDef[]
+            {
+              new ColorDef(factory.GetColor(editBorderColor)),           // DayOfWeekHeaderBorder
+
+                new ColorDef(factory.GetColor(0xFFFFFF)),         // DayOfWeekHeaderBackground
+
+                new ColorDef(factory.GetColor(0x1E395B)),           // DayOfWeekHeaderForeground
+                new ColorDef(factory.GetColor(0x8DAED9)),           // SideBarBorder
+
+                new ColorDef(factory.GetColor(0xE6EDF7)),           // SideBarBackground
+
+                new ColorDef(factory.GetColor(0x000000)),           // SideBarForeground
+                new ColorDef(factory.GetColor(editBorderColor)),           // DayHeaderBorder
+
+                new ColorDef(factory.GetColor(0xA5BFE1)),           // DayHeaderBackground
+
+                new ColorDef(factory.GetColor(0x1F3979)),           // DayHeaderForeground
+                new ColorDef(factory.GetColor(0x8DAED9)),           // DayContentBorder
+                new ColorDef(factory.GetColor(0xE6EDF7)),           // DayContentSelectionBackground
+                new ColorDef(factory.GetColor(0xFFFFFF)),           // DayContentActiveDayBackground
+                new ColorDef(factory.GetColor(0xA5BFE1)),           // DayContentInactiveDayBackground
+
+                new ColorDef(factory.GetColor(0x9199A4)),           // OwnerTabBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xCFD2D8), factory.GetColor(0xB0B6BE)},    // OwnerTabBackground
+                new float[] {0f, 1f}, 90f),
+
+                new ColorDef(factory.GetColor(0x000000)),           // OwnerTabForeground
+                new ColorDef(factory.GetColor(0xB0B6BE)),           // OwnerTabContentBackground
+                new ColorDef(factory.GetColor(0x000000)),           // OwnerTabSelectedForeground
+                new ColorDef(factory.GetColor(0xFFFFFF)),           // OwnerTabSelectionBackground
+ 
+                new ColorDef(factory.GetColor(0xEB8900)),           // NowDayViewBorder
+                new ColorDef(factory.GetColor(0x000000)),           // NowDayHeaderForeground - 0x15428B
+
+                new ColorDef(new Color[] {factory.GetColor(0xFFED79), factory.GetColor(0xFFD86B), factory.GetColor(0xFFBB00), factory.GetColor(0xFFEA77)},
+                new float[] {0f, .55f ,58f, 1f}, 90f),              // NowDayHeaderBackground
+
+                new ColorDef(factory.GetColor(0x1F3979)),           // ContentLinkForeground - DayHeaderForeground
+                new ColorDef(factory.GetColor(0xFFFFFF)),           // ContentLinkBackground - DayContentActiveDayBackground
+           };
+
+            #endregion
+
+            #region AppointmentColors
+
+            table.CalendarView.AppointmentColors = new ColorDef[]
+            {
+                new ColorDef(factory.GetColor(0x8DAED9)),           // DefaultBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xE0E9F6), factory.GetColor(0xB3C9E6)},
+                             new float[] {0f, 1f}, 90f),            // DefaultBackground
+
+                new ColorDef(factory.GetColor(0x28518E)),           // BlueBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xB1C5EC), factory.GetColor(0x759DDA)}, 
+                             new float[] {0f, 1f}, 90f),            // BlueBackground
+
+                new ColorDef(factory.GetColor(0x2C6524)),           // GreenBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xC2E8BC), factory.GetColor(0x84D17B)},
+                             new float[] {0f, 1f}, 90f),            // GreenBackground
+
+                new ColorDef(factory.GetColor(0x8B3E0A)),           // OrangeBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xF9C7A0), factory.GetColor(0xF49758)},
+                             new float[] {0f, 1f}, 90f),            // OrangeBackground
+
+                new ColorDef(factory.GetColor(0x3E2771)),           // PurpleBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xC5B5E6), factory.GetColor(0x957BD2)},
+                             new float[] {0f, 1f}, 90f),            // PurpleBackground
+
+                new ColorDef(factory.GetColor(0x86171C)),           // RedBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xF1AAAC), factory.GetColor(0xE5676E)},
+                             new float[] {0f, 1f}, 90f),            // RedBackground
+
+                new ColorDef(factory.GetColor(0x7C7814)),           // YellowBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xFFFCAA), factory.GetColor(0xFFF958)},
+                             new float[] {0f, 1f}, 90f),            // YellowBackground
+
+                new ColorDef(factory.GetColor(-1)),                 // BusyTimeMarker
+                new ColorDef(factory.GetColor(0xFFFFFF)),           // FreeTimeMarker
+                new ColorDef(factory.GetColor(0x800080))            // OutOfOfficeTimeMarker
+            };
+
+            #endregion
+
+            #endregion
+
+            #region SuperTab
+
+            #region SuperTab
+
+            table.SuperTab.Background = new SuperTabLinearGradientColorTable(factory.GetColor(0xBBCEE6));
+            table.SuperTab.InnerBorder = factory.GetColor(Color.Transparent);
+            table.SuperTab.OuterBorder = factory.GetColor(0x9FB2C7);
+
+            table.SuperTab.ControlBoxDefault.Image = factory.GetColor(0x1E395B);
+
+            table.SuperTab.ControlBoxMouseOver.Background = factory.GetColor(0xCEEDFA);
+            table.SuperTab.ControlBoxMouseOver.Border = factory.GetColor(0x3399FF);
+            table.SuperTab.ControlBoxMouseOver.Image = factory.GetColor(0xFF, 0x1E395B);
+
+            table.SuperTab.ControlBoxPressed.Background = factory.GetColor(0xB7CAE0);
+            table.SuperTab.ControlBoxPressed.Border = factory.GetColor(0x3399FF);
+            table.SuperTab.ControlBoxPressed.Image = factory.GetColor(0xFF, 0x1E395B);
+
+            table.SuperTab.InsertMarker = factory.GetColor(0xFF, 0x000000);
+
+            #endregion
+
+            #region SuperTabItem
+
+            // Top Default
+
+            table.SuperTabItem.Default.Normal.Background = new SuperTabLinearGradientColorTable();
+            table.SuperTabItem.Default.Normal.Text = factory.GetColor(0x1E395B);
+            table.SuperTabItem.Default.Normal.CloseMarker = factory.GetColor(0x1E395B);
+
+            // Disabled
+            table.SuperTabItem.Default.Disabled.Text = factory.GetColor(0x87929F);
+            table.SuperTabItem.Default.Disabled.Background.AdaptiveGradient = false;
+            table.SuperTabItem.Default.Disabled.CloseMarker = factory.GetColor(0x87929F);
+
+            // Top Selected
+            table.SuperTabItem.Default.Selected.Background = new SuperTabLinearGradientColorTable(
+                new Color[] { factory.GetColor(0xF5FAFF), factory.GetColor(0xEFF6FD) },
+                new float[] { 0, 1 });
+
+            table.SuperTabItem.Default.Selected.InnerBorder = Color.Transparent;
+            table.SuperTabItem.Default.Selected.OuterBorder = factory.GetColor(0x9FB2C7);
+            table.SuperTabItem.Default.Selected.Text = factory.GetColor(0x1E395B);
+            table.SuperTabItem.Default.Selected.CloseMarker = factory.GetColor(0x1E395B);
+
+            // Top SelectedMouseOver
+
+            table.SuperTabItem.Default.SelectedMouseOver.Background = new SuperTabLinearGradientColorTable(
+                new Color[] { factory.GetColor(0xF5FAFF), factory.GetColor(0xEFF6FD) },
+                new float[] { 0, 1 });
+
+            table.SuperTabItem.Default.SelectedMouseOver.InnerBorder = Color.Transparent;
+            table.SuperTabItem.Default.SelectedMouseOver.OuterBorder = factory.GetColor(0x9FB2C7);
+            table.SuperTabItem.Default.SelectedMouseOver.Text = factory.GetColor(0x1E395B);
+            table.SuperTabItem.Default.SelectedMouseOver.CloseMarker = factory.GetColor(0x1E395B);
+
+            // Top MouseOver
+
+            table.SuperTabItem.Default.MouseOver.Background = new SuperTabLinearGradientColorTable(
+                new Color[] { factory.GetColor(48, 0xFFFFFF), factory.GetColor(180, 0xFFFFFF) },
+                new float[] { 0, 1 });
+
+            table.SuperTabItem.Default.MouseOver.InnerBorder = factory.GetColor(190, 0xFFFFFF);
+            table.SuperTabItem.Default.MouseOver.OuterBorder = factory.GetColor(0xB1B5BA);
+            table.SuperTabItem.Default.MouseOver.Text = factory.GetColor(0x1E395B);
+            table.SuperTabItem.Default.MouseOver.CloseMarker = factory.GetColor(0x1E395B);
+
+            // Left, Bottom, Right
+
+            table.SuperTabItem.Left = table.SuperTabItem.Default;
+            table.SuperTabItem.Bottom = table.SuperTabItem.Default;
+            table.SuperTabItem.Right = table.SuperTabItem.Right;
+
+            #endregion
+
+            #region SuperTabPanel
+
+            table.SuperTabPanel.Default.Background = new SuperTabLinearGradientColorTable(factory.GetColor(0xEFF6FD));
+            table.SuperTabPanel.Default.OuterBorder = factory.GetColor(0x9FB2C7);
+            table.SuperTabPanel.Default.InnerBorder = factory.GetColor(Color.Transparent);
+
+            table.SuperTabPanel.Left = table.SuperTabPanel.Default;
+            table.SuperTabPanel.Bottom = table.SuperTabPanel.Default;
+            table.SuperTabPanel.Right = table.SuperTabPanel.Default;
+
+            #endregion
+
+            #endregion
+
+            #region Backstage
+
+            #region Backstage
+            SuperTabStyleColorFactory.GetOffice2010BackstageBlueColorTable(table.Backstage, factory);
+            #endregion
+
+            #region BackstageItem
+            SuperTabStyleColorFactory.GetOffice2010BackstageBlueItemColorTable(table.BackstageItem, factory);
+            #endregion
+
+            #region BackstagePanel
+            SuperTabStyleColorFactory.GetOffice2010BackstageBluePanelColorTable(table.BackstagePanel, factory);
+            #endregion
+
+            #endregion
+
+            #region SwitchButton
+            table.SwitchButton = new SwitchButtonColors();
+            table.SwitchButton.Disabled.BorderColor = table.CheckBoxItem.Disabled.CheckBorder;
+            table.SwitchButton.Disabled.SwitchBorderColor = table.SwitchButton.Disabled.BorderColor;
+            table.SwitchButton.Disabled.OffTextColor = table.CheckBoxItem.Disabled.Text;
+            table.SwitchButton.Disabled.OnTextColor = table.SwitchButton.Disabled.OffTextColor;
+            table.SwitchButton.Disabled.TextColor = table.SwitchButton.Disabled.OffTextColor;
+            table.SwitchButton.Disabled.SwitchBackColor = table.CheckBoxItem.Disabled.CheckInnerBackground.Start;
+            table.SwitchButton.Disabled.OffBackColor = table.CheckBoxItem.Disabled.CheckInnerBackground.Start;
+            table.SwitchButton.Disabled.OnBackColor = table.SwitchButton.Disabled.OffBackColor;
+            #endregion
+
+            #region ElementStyle Classes
+            table.StyleClasses.Clear();
+            ElementStyle style = new ElementStyle();
+            style.Class = ElementStyleClassKeys.RibbonGalleryContainerKey;
+            style.BorderColor = factory.GetColor(0xC6CACD);
+            style.Border = eStyleBorderType.Solid;
+            style.BorderWidth = 1;
+            style.CornerDiameter = 2;
+            style.CornerType = eCornerType.Rounded;
+            style.BackColor = factory.GetColor(0xFFFFFF);
+            table.StyleClasses.Add(style.Class, style);
+            // FileMenuContainer
+            style = GetFileMenuContainerStyle(table);
+            table.StyleClasses.Add(style.Class, style);
+            // Two Column File Menu Container
+            style = GetTwoColumnMenuContainerStyle(table);
+            table.StyleClasses.Add(style.Class, style);
+            // Column one File Menu Container
+            style = GetMenuColumnOneContainerStyle(table);
+            table.StyleClasses.Add(style.Class, style);
+            // Column two File Menu Container
+            style = GetMenuColumnTwoContainerStyle(table);
+            table.StyleClasses.Add(style.Class, style);
+            // Bottom File Menu Container
+            style = GetMenuBottomContainer(table);
+            table.StyleClasses.Add(style.Class, style);
+            // TextBox border
+            style = Office2007ColorTableFactory.GetTextBoxStyle(factory.GetColor(editBorderColor));
+            table.StyleClasses.Add(style.Class, style);
+            // RichTextBox border
+            style = Office2007ColorTableFactory.GetRichTextBoxStyle(factory.GetColor(editBorderColor));
+            table.StyleClasses.Add(style.Class, style);
+            // ItemPanel
+            style = Office2007ColorTableFactory.GetItemPanelStyle(factory.GetColor(editBorderColor));
+            table.StyleClasses.Add(style.Class, style);
+            // ListBoxAdv
+            style = Office2007ColorTableFactory.GetListBoxAdvStyle(factory.GetColor(editBorderColor));
+            table.StyleClasses.Add(style.Class, style);
+            // DateTimeInput background
+            style = Office2007ColorTableFactory.GetDateTimeInputBackgroundStyle(factory.GetColor(editBorderColor), SystemColors.Window);
+            table.StyleClasses.Add(style.Class, style);
+            // Ribbon Client Panel
+            style = GetRibbonClientPanelStyle(factory, eOffice2010ColorScheme.Blue);
+            table.StyleClasses.Add(style.Class, style);
+            // ListView Border
+            style = Office2007ColorTableFactory.GetListViewBorderStyle(table.ListViewEx);
+            table.StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetStatusBarAltStyle(table.Bar);
+            table.StyleClasses.Add(style.Class, style);
+#if !NOTREE
+            // Tree Border/Background
+            style = Office2007ColorTableFactory.GetAdvTreeStyle(factory.GetColor(editBorderColor), Color.Empty);
+            table.StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetAdvTreeColumnsHeaderStyle(factory.GetColor(0xEFF5FB), factory.GetColor(0xE1ECFA), factory.GetColor(0x9EB6CE));
+            table.StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetAdvTreeNodesColumnsHeaderStyle(factory.GetColor(0xF9FCFD), factory.GetColor(0xD3DBE9), factory.GetColor(0x9EB6CE));
+            table.StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetAdvTreeColumnStyle(factory.GetColor(0x000000));
+            table.StyleClasses.Add(style.Class, style);
+            // CrumbBar
+            style = Office2007ColorTableFactory.GetCrumbBarBackgroundStyle(factory.GetColor(Color.White), factory.GetColor("FF567DB0"), factory.GetColor("FF2F578D"));
+            table.StyleClasses.Add(style.Class, style);
+#endif
+
+            // DataGridView border
+            style = Office2007ColorTableFactory.GetDataGridViewStyle();
+            table.StyleClasses.Add(style.Class, style);
+            // DataGridViewDateTime border
+            style = Office2007ColorTableFactory.GetDataGridViewDateTimeStyle();
+            table.StyleClasses.Add(style.Class, style);
+            // DataGridViewNumeric border
+            style = Office2007ColorTableFactory.GetDataGridViewNumericStyle();
+            table.StyleClasses.Add(style.Class, style);
+            // DataGridViewIpAddress border
+            style = Office2007ColorTableFactory.GetDataGridViewIpAddressStyle();
+            table.StyleClasses.Add(style.Class, style);
+
+            // Slide-out Button
+            style = Office2007ColorTableFactory.GetSlideOutButtonStyle(table.CheckBoxItem.Default.CheckBorder);
+            table.StyleClasses.Add(style.Class, style);
+            // MetroTilePanel
+            style = Office2007ColorTableFactory.GetMetroTilePanelStyle(factory.GetColor(Color.White));
+            table.StyleClasses.Add(style.Class, style);
+            // MetroTileGroup
+            style = Office2007ColorTableFactory.GetMetroTileGroupStyle(factory.GetColor(Color.DarkGray));
+            table.StyleClasses.Add(style.Class, style);
+            // MonthCalendarAdv
+            style = Office2007ColorTableFactory.GetMonthCalendarStyle(SystemColors.Window);
+            table.StyleClasses.Add(style.Class, style);
+            // ProgressSteps control
+            style = Office2007ColorTableFactory.GetProgressStepsStyle(table);
+            table.StyleClasses.Add(style.Class, style);
+            // SideNavStrip
+            style = Office2007ColorTableFactory.GetSideNavStripStyle(factory.GetColor(0xBBCEE6));
+            table.StyleClasses.Add(style.Class, style);
+            // TabFormPanel
+            style = Office2007ColorTableFactory.GetTabFormPanelStyle(factory.GetColor(0xF5F6F7));
+            table.StyleClasses.Add(style.Class, style);
+
+            // Toolbox Control
+            style = Office2007ColorTableFactory.GetToolboxControlStyle(factory.GetColor(table.LegacyColors.PanelBorder), Color.Empty);
+            table.StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetToolboxGroupTitle(factory.GetColor(0x384E73));
+            table.StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetToolboxGroupTitleMouseOver(factory.GetColor(0x384E73), factory.GetColor(0xF8E496));
+            table.StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetToolboxGroupExpandedTitle(factory.GetColor(0x384E73), factory.GetColor(0xD8E4F2));
+            table.StyleClasses.Add(style.Class, style);
+            #endregion
+
+            #region StepIndicator
+            table.StepIndicator.BackgroundColor = factory.GetColor(ColorFunctions.GetShade(table.Form.BackColor, 10));
+            table.StepIndicator.IndicatorColor = factory.GetColor(0xA4CC28);
+            #endregion
+
+            #region RadialMenu
+            table.RadialMenu = new RadialMenuColorTable();
+            table.RadialMenu.CircularBackColor = factory.GetColor(0xD44F2E);
+            table.RadialMenu.CircularBorderColor = factory.GetColor(0xFFFFFF);
+            table.RadialMenu.CircularForeColor = factory.GetColor(0xFFFFFF);
+            table.RadialMenu.RadialMenuBackground = factory.GetColor(0xFFFFFF);
+            table.RadialMenu.RadialMenuBorder = factory.GetColor(0x60676E);
+            table.RadialMenu.RadialMenuButtonBackground = factory.GetColor(0xFFFFFF);
+            table.RadialMenu.RadialMenuButtonBorder = factory.GetColor(0x60676E);
+            table.RadialMenu.RadialMenuExpandForeground = factory.GetColor(0xFFFFFF);
+            table.RadialMenu.RadialMenuInactiveBorder = Color.FromArgb(128, table.RadialMenu.RadialMenuBorder);
+            table.RadialMenu.RadialMenuItemForeground = factory.GetColor(0x60676E);
+            table.RadialMenu.RadialMenuItemDisabledForeground = factory.GetColor(0x8D8D8D);
+            table.RadialMenu.RadialMenuItemMouseOverBackground = Color.FromArgb(72, table.RadialMenu.RadialMenuItemForeground);
+            table.RadialMenu.RadialMenuItemMouseOverForeground = factory.GetColor(0x60676E);
+            table.RadialMenu.RadialMenuMouseOverBorder = Color.FromArgb(200, table.RadialMenu.RadialMenuBorder);
+            #endregion
+
+            #region StepItem
+            table.StepItem.Default = new OfficeStepItemStateColorTable(new Color[]{
+                    factory.GetColor(0xE1EDFA), 
+                    factory.GetColor(0xDCE8F5), 
+                    factory.GetColor(0xDCE8F5), 
+                    factory.GetColor(0xD0DFEE)
+                    },
+                    90,
+                    new float[] { 0f, .5f, .5f, 1f },
+                factory.GetColor(0x000000),
+                new Color[] {
+                    factory.GetColor(0x1E395B) });
+            table.StepItem.Progress = new OfficeStepItemStateColorTable(new Color[]{
+                    factory.GetColor(0xD8F577), 
+                    factory.GetColor(0x75C300),
+                    factory.GetColor(0x75C300),
+                    factory.GetColor(0xA9E923)
+                    },
+                    90,
+                    new float[] { 0f, .6f, .6f, 1f },
+                Color.Empty,
+                new Color[0]);
+            table.StepItem.MouseOver = new OfficeStepItemStateColorTable(new Color[]{
+                    factory.GetColor(0xFBEDB3), 
+                    factory.GetColor(0xF9E186),
+                    factory.GetColor(0xF9E186), 
+                    factory.GetColor(0xF8E496)
+                    },
+                    90,
+                    new float[] { 0f, .5f, .5f, 1f },
+                factory.GetColor(0x1E395B),
+                new Color[] {
+                    factory.GetColor(0xEEC958) });
+            table.StepItem.Pressed = new OfficeStepItemStateColorTable(new Color[]{
+                    factory.GetColor(0xFBD678), 
+                    factory.GetColor(0xFFE48A),
+                    factory.GetColor(0xFFE48A), 
+                    factory.GetColor(0xFEE287)
+                    },
+                    90,
+                    new float[] { 0f, .5f, .5f, 1f },
+                factory.GetColor(0x1E395B),
+                new Color[] {
+                    factory.GetColor(0xC2762B) });
+            #endregion
+
+            #region TokenEditor
+            table.TokenEditor = new TokenEditorColorTable(0x3B5371, 0xF2F8FE, 0x3B5371, 0xBBCEE6, 0xFFFFFF, 0x0072C6);
+            #endregion
+
+            #region Flyout
+            table.Flyout.BorderColor = table.Form.Active.BorderColors[0];
+            #endregion
+
+            #region SideNav
+            table.SideNav.SideNavItem.Default = new SideNavItemStateColorTable(factory.GetColor(0x1E395B));
+            table.SideNav.SideNavItem.MouseOver = new SideNavItemStateColorTable(factory.GetColor(0x1E395B),
+                new Color[]
+                {
+                    factory.GetColor(0xFBEDB3), factory.GetColor(0xF9E186), factory.GetColor(0xF9E186),
+                    factory.GetColor(0xF8E496)
+                },
+                new Color[] { factory.GetColor(0xEEC958), factory.GetColor(0xF1D449) },
+                0);
+            table.SideNav.SideNavItem.Pressed = new SideNavItemStateColorTable(factory.GetColor(0x1E395B),
+                new Color[]
+                {
+                    factory.GetColor(0xFBD678), factory.GetColor(0xFFE48A), factory.GetColor(0xFFE48A),
+                    factory.GetColor(0xFEE287)
+                },
+                new Color[] { factory.GetColor(0xC2762B), factory.GetColor(0xF6C867) },
+                0);
+            table.SideNav.SideNavItem.Selected = new SideNavItemStateColorTable(factory.GetColor(0x1E395B),
+                new Color[] { table.Form.BackColor },
+                new Color[] { Color.Empty, factory.GetColor(0x9FB2C7), Color.Empty, factory.GetColor(0x9FB2C7) });
+            table.SideNav.BorderColors = new Color[] { factory.GetColor(0x9FB2C7) };
+            table.SideNav.TitleBackColor = factory.GetColor(0xEFF6FD);
+            table.SideNav.TitleBorderColors = new Color[] { Color.Empty, Color.Empty, Color.Empty, factory.GetColor(0x9FB2C7) };
+            table.SideNav.PanelBackColor = table.Form.BackColor;
+
+            #endregion
+
+            #region TabForm
+            table.TabForm.Active.CaptionText = factory.GetColor(0x1E395B);
+            table.TabForm.Inactive.CaptionText = factory.GetColor(0x1E395B);
+            table.TabForm.Active.CaptionBackColors = new Color[] { factory.GetColor(0xBBCEE6) };
+            table.TabForm.Inactive.CaptionBackColors = new Color[] { factory.GetColor(0xBBCEE6) };
+            table.TabFormItemColorTables.Clear();
+            table.TabFormItemColorTables.Add(TabFormItem.DefaultColorTableKey, 
+                Office2007ColorTable.CreateDefaultTabFormItemColorTable(factory, 
+                new Color[] { factory.GetColor(0xBBCEE6) }, 
+                new Color[] { factory.GetColor(0xBBCEE6) },
+                factory.GetColor(0x1E395B),
+                new Color[] { factory.GetColor(0xF5FAFF), factory.GetColor(0xEFF6FD) },
+                new Color[] { factory.GetColor(0xB8C9DB), factory.GetColor(0x9FB2C7) },
+                factory.GetColor(0x1E395B)
+                ));
+            table.TabFormItemColorTables.Add(TabFormItem.BlueColorTableKey, Office2007ColorTable.CreateBlueTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.YellowColorTableKey, Office2007ColorTable.CreateYellowTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.PurpleColorTableKey, Office2007ColorTable.CreatePurpleTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.CyanColorTableKey, Office2007ColorTable.CreateCyanTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.BlueMistColorTableKey, Office2007ColorTable.CreateBlueMistTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.PurpleMistColorTableKey, Office2007ColorTable.CreatePurpleMistTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.TanColorTableKey, Office2007ColorTable.CreateTanTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.LemonLimeColorTableKey, Office2007ColorTable.CreateLemonLimeTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.AppleColorTableKey, Office2007ColorTable.CreateAppleTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.TealColorTableKey, Office2007ColorTable.CreateTealTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.RedChalkColorTableKey, Office2007ColorTable.CreateRedChalkTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.SilverColorTableKey, Office2007ColorTable.CreateSilverTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.OrangeColorTableKey, Office2007ColorTable.CreateOrangeTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.GreenColorTableKey, Office2007ColorTable.CreateGreenTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.MagentaColorTableKey, Office2007ColorTable.CreateMagentaTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.RedColorTableKey, Office2007ColorTable.CreateRedTabFormItemColorTable(factory));
+            #endregion
+        }
+
+        #region RibbonBar
+        public static Office2007RibbonBarStateColorTable GetRibbonBar(ColorFactory factory)
+        {
+            Office2007RibbonBarStateColorTable rb = new Office2007RibbonBarStateColorTable();
+            rb.TopBackgroundHeight = 0.8f;
+            rb.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xE2ECF7), factory.GetColor(0x93A7C3));
+            rb.InnerBorder = new LinearGradientColorTable(factory.GetColor(20, 0xFFFFFF), factory.GetColor(60, 0xFFFFFF));
+            rb.TopBackground = new LinearGradientColorTable(factory.GetColor(0xEFF6FD), factory.GetColor(0xD8E4F2));
+            rb.BottomBackground = null; // new LinearGradientColorTable(factory.GetColor(0xE7F1FA), factory.GetColor(0xD8E4F2));
+            rb.TitleBackground = null;// new LinearGradientColorTable(factory.GetColor(0xC2D8F1), factory.GetColor(0xC0D8EF));
+            rb.TitleText = factory.GetColor(0x384E73);
+            return rb;
+        }
+
+        public static Office2007RibbonBarStateColorTable GetRibbonBarMouseOver(ColorFactory factory)
+        {
+            return GetRibbonBar(factory);
+            //Office2007RibbonBarStateColorTable rb = new Office2007RibbonBarStateColorTable();
+            //rb.TopBackgroundHeight = 0.8f;
+            //rb.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xE2ECF7), factory.GetColor(0x93A7C3));
+            //rb.InnerBorder = new LinearGradientColorTable(factory.GetColor(40, 0xFFFFFF), factory.GetColor(120, 0xFFFFFF));
+            //rb.TopBackground = new LinearGradientColorTable(factory.GetColor(0xEFF6FD), factory.GetColor(0xE7F1FA));
+            //rb.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xE7F1FA), factory.GetColor(0xD8E4F2));
+            //rb.TitleBackground = null;// new LinearGradientColorTable(factory.GetColor(0xC2D8F1), factory.GetColor(0xC0D8EF));
+            //rb.TitleText = factory.GetColor(0x384E73);
+            //return rb;
+        }
+
+        public static Office2007RibbonBarStateColorTable GetRibbonBarExpanded(ColorFactory factory)
+        {
+            Office2007RibbonBarStateColorTable rb = new Office2007RibbonBarStateColorTable();
+            rb.TopBackgroundHeight = 0.8f;
+            rb.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xE2ECF7), factory.GetColor(0x93A7C3));
+            rb.InnerBorder = new LinearGradientColorTable(factory.GetColor(40, 0xFFFFFF), factory.GetColor(120, 0xFFFFFF));
+            rb.TopBackground = new LinearGradientColorTable(factory.GetColor(0xEFF6FD), factory.GetColor(0xE7F1FA));
+            rb.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xE7F1FA), factory.GetColor(0xD8E4F2));
+            rb.TitleBackground = null;// new LinearGradientColorTable(factory.GetColor(0xC2D8F1), factory.GetColor(0xC0D8EF));
+            rb.TitleText = Color.Empty;
+            return rb;
+        }
+        #endregion
+
+        #region Buttons
+        public static Office2007ButtonItemColorTable GetButtonItemBlueOrange(ColorFactory factory)
+        {
+            Office2007ButtonItemColorTable cb = new Office2007ButtonItemColorTable();
+            cb.Default = new Office2007ButtonItemStateColorTable();
+            cb.Default.Text = factory.GetColor(0x1E395B);
+
+            // Button mouse over
+            cb.MouseOver = new Office2007ButtonItemStateColorTable();
+            cb.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xEEC958), factory.GetColor(0xF1D449));
+            cb.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFDF9E8), factory.GetColor(0xFCFBF5));
+            cb.MouseOver.TopBackground = new LinearGradientColorTable(factory.GetColor(0xFBEDB3), factory.GetColor(0xF9E186));
+            cb.MouseOver.TopBackgroundHighlight = LinearGradientColorTable.Empty; //new LinearGradientColorTable(Color.FromArgb(192, Color.White), Color.Transparent);
+            cb.MouseOver.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xF9E186), factory.GetColor(0xF8E496));
+            cb.MouseOver.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xFBF9DF), Color.Transparent);
+            cb.MouseOver.SplitBorder = new LinearGradientColorTable(factory.GetColor(0xEEC757), Color.Empty);
+            cb.MouseOver.SplitBorderLight = new LinearGradientColorTable(factory.GetColor(0xFDFBEA), Color.Empty);
+            cb.MouseOver.Text = factory.GetColor(0x1E395B);
+
+            cb.MouseOverSplitInactive = new Office2007ButtonItemStateColorTable();
+            cb.MouseOverSplitInactive.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xEEC757));
+
+            // Pressed
+            cb.Pressed = new Office2007ButtonItemStateColorTable();
+            cb.Pressed.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xC2762B), factory.GetColor(0xC29B45));
+            cb.Pressed.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xF6C867));
+            cb.Pressed.TopBackground = new LinearGradientColorTable(factory.GetColor(0xFBD678), factory.GetColor(0xFFE48A));
+            cb.Pressed.TopBackgroundHighlight = LinearGradientColorTable.Empty;
+            cb.Pressed.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xFFE48A), factory.GetColor(0xFEE287));
+            cb.Pressed.BottomBackgroundHighlight = LinearGradientColorTable.Empty;
+            cb.Pressed.SplitBorder = new LinearGradientColorTable(factory.GetColor(0xC29F47), Color.Empty);
+            cb.Pressed.SplitBorderLight = new LinearGradientColorTable(factory.GetColor(0xFAD77A), Color.Empty);
+            cb.Pressed.Text = factory.GetColor(0x1E395B);
+
+            // Checked
+            cb.Checked = new Office2007ButtonItemStateColorTable();
+            cb.Checked.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xC28A30), factory.GetColor(0xC3A34C));
+            cb.Checked.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xE2C9AE), Color.Transparent);
+            cb.Checked.TopBackground = new LinearGradientColorTable(factory.GetColor(0xF4D4B1), factory.GetColor(0xFDD08D));
+            cb.Checked.TopBackgroundHighlight = LinearGradientColorTable.Empty;
+            cb.Checked.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xFFC45E), factory.GetColor(0xFDE894));
+            cb.Checked.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xFFFFC5), Color.Transparent);
+            cb.Checked.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Checked.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Checked.Text = factory.GetColor(0x1E395B);
+
+            // Expanded button
+            cb.Expanded = new Office2007ButtonItemStateColorTable();
+            cb.Expanded.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xC2923B), factory.GetColor(0xC2B14F));
+            cb.Expanded.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFFE575), Color.Transparent);
+            cb.Expanded.TopBackground = new LinearGradientColorTable(factory.GetColor(0xFFE575), factory.GetColor(0xFFD96C));
+            cb.Expanded.TopBackgroundHighlight = LinearGradientColorTable.Empty;
+            cb.Expanded.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xFFD96C), factory.GetColor(0xFFE976));
+            cb.Expanded.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xFFF480), Color.Transparent);
+            cb.Expanded.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Expanded.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Expanded.Text = factory.GetColor(0x1E395B);
+
+            SetBlueExpandColors(cb, factory);
+
+            return cb;
+        }
+
+        public static Office2007ButtonItemColorTable GetButtonItemBlueOrangeWithBackground(ColorFactory factory)
+        {
+            Office2007ButtonItemColorTable cb = GetButtonItemBlueOrange(factory);
+
+            cb.Default.TopBackground = new LinearGradientColorTable(factory.GetColor(0xE1EDFA), factory.GetColor(0xDCE8F5));
+            cb.Default.TopBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xDCE8F5), factory.GetColor(0xD0DFEE));
+            cb.Default.BottomBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.InnerBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xABBAD0));
+            cb.Default.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.MouseOverSplitInactive = cb.Default;
+
+            // Same as default
+            cb.Disabled = new Office2007ButtonItemStateColorTable();
+            cb.Disabled.TopBackground = new LinearGradientColorTable(factory.GetColor(0xEDF5FD));
+            cb.Disabled.TopBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xEDF5FD));
+            cb.Disabled.BottomBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.InnerBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xCEDDED), Color.Empty);
+            cb.Disabled.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.Text = factory.GetColor(0xA7A7A7);
+            return cb;
+        }
+        public static Office2007ButtonItemColorTable GetButtonItemOffice2007WithBackground(ColorFactory factory)
+        {
+            Office2007ButtonItemColorTable cb = GetButtonItemBlueOrange(factory);
+
+            cb.Default.Text = factory.GetColor(0x262626);
+            cb.Checked.Text = cb.Default.Text;
+            cb.Expanded.Text = cb.Default.Text;
+            cb.MouseOver.Text = cb.Default.Text;
+            cb.MouseOverSplitInactive.Text = cb.Default.Text;
+            cb.Pressed.Text = cb.Default.Text;
+
+            cb.Default.TopBackground = new LinearGradientColorTable(factory.GetColor(0xFFFFFF), factory.GetColor(0xFCFCFD));
+            cb.Default.TopBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xFCFCFD), factory.GetColor(0xEDEFF1));
+            cb.Default.BottomBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.InnerBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xDEDFE0), factory.GetColor(0xA1A2A4));
+            cb.Default.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.MouseOverSplitInactive = cb.Default;
+
+            // Same as default
+            cb.Disabled = new Office2007ButtonItemStateColorTable();
+            cb.Disabled.TopBackground = new LinearGradientColorTable(factory.GetColor(0xEDF5FD));
+            cb.Disabled.TopBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xEDF5FD));
+            cb.Disabled.BottomBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.InnerBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xCEDDED), Color.Empty);
+            cb.Disabled.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.Text = factory.GetColor(0xA7A7A7);
+            return cb;
+        }
+
+        public static Office2007ButtonItemColorTable GetButtonItemBlueBlueWithBackground(ColorFactory factory)
+        {
+            Office2007ButtonItemColorTable cb = Office2007ColorTableFactory.GetButtonItemBlueBlue(factory);
+
+            cb.Default.TopBackground = new LinearGradientColorTable(factory.GetColor(0x3E7DDB), factory.GetColor(0x2B63B5));
+            cb.Default.TopBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.BottomBackground = new LinearGradientColorTable(factory.GetColor(0x2960B3), factory.GetColor(0x2D70CF));
+            cb.Default.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0x4588DE), Color.Transparent);
+            cb.Default.InnerBorder = new LinearGradientColorTable(factory.GetColor(0x4387E4), Color.Empty);
+            cb.Default.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x1F48A1), factory.GetColor(0x244FA6));
+            cb.Default.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.Text = factory.GetColor(0xFFFFFF);
+            cb.MouseOverSplitInactive = cb.Default;
+
+            // Same as default
+            cb.Disabled = new Office2007ButtonItemStateColorTable();
+            cb.Disabled.TopBackground = new LinearGradientColorTable(factory.GetColor(0xEDF5FD));
+            cb.Disabled.TopBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xEDF5FD));
+            cb.Disabled.BottomBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.InnerBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xCEDDED), Color.Empty);
+            cb.Disabled.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.Text = factory.GetColor(0xA7A7A7);
+
+            return cb;
+        }
+
+        public static Office2007ButtonItemColorTable GetButtonItemBlueMagentaWithBackground(ColorFactory factory)
+        {
+            Office2007ButtonItemColorTable cb = Office2007ColorTableFactory.GetButtonItemBlueMagenta(factory);
+            cb.Default.TopBackground = new LinearGradientColorTable(factory.GetColor(0xB50C53), factory.GetColor(0xAF074D));
+            cb.Default.TopBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xAF074D), factory.GetColor(0xE8447F));
+            cb.Default.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xE4417C), Color.Transparent);
+            cb.Default.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xBF185E), factory.GetColor(0xE84683));
+            cb.Default.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x8E023A), factory.GetColor(0x92033D));
+            cb.Default.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.Text = factory.GetColor(0xFFFFFF);
+
+            // Same as default
+            cb.Disabled = new Office2007ButtonItemStateColorTable();
+            cb.Disabled.TopBackground = new LinearGradientColorTable(factory.GetColor(0xEDF5FD));
+            cb.Disabled.TopBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xEDF5FD));
+            cb.Disabled.BottomBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.InnerBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xCEDDED), Color.Empty);
+            cb.Disabled.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.Text = factory.GetColor(0xA7A7A7);
+
+            return cb;
+        }
+
+        public static void SetBlueExpandColors(Office2007ButtonItemColorTable ct, ColorFactory factory)
+        {
+            Color cb = factory.GetColor(0x63676B);
+            Color cl = Color.Empty;// Color.FromArgb(192, Color.White);
+            ct.Default.ExpandBackground = cb;
+            ct.Default.ExpandLight = cl;
+
+            ct.Checked.ExpandBackground = cb;
+            ct.Checked.ExpandLight = cl;
+
+            //ct.Disabled.ExpandBackground = factory.GetColor(0xB7B7B7);
+            //ct.Disabled.ExpandLight = factory.GetColor(0xEDEDED);
+
+            ct.Expanded.ExpandBackground = cb;
+            ct.Expanded.ExpandLight = cl;
+
+            ct.MouseOver.ExpandBackground = cb;
+            ct.MouseOver.ExpandLight = cl;
+
+            ct.Pressed.ExpandBackground = cb;
+            ct.Pressed.ExpandLight = cl;
+        }
+
+        public static Office2007ButtonItemColorTable GetNavigationPaneButtonItemTable(ColorFactory factory)
+        {
+            Office2007ButtonItemColorTable cb = new Office2007ButtonItemColorTable();
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Orange);
+            cb.Default = new Office2007ButtonItemStateColorTable();
+            cb.Default.Text = factory.GetColor(0x001938);
+
+            // Button mouse over
+            cb.MouseOver = new Office2007ButtonItemStateColorTable();
+            cb.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x859EBF));
+            cb.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xF7FFFF));
+            cb.MouseOver.TopBackground = LinearGradientColorTable.Empty;
+            cb.MouseOver.TopBackgroundHighlight = LinearGradientColorTable.Empty; //new LinearGradientColorTable(Color.FromArgb(192, Color.White), Color.Transparent);
+            cb.MouseOver.BottomBackground = LinearGradientColorTable.Empty;
+            cb.MouseOver.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xE5F1FB), Color.Transparent);
+            cb.MouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xE5F1FC), factory.GetColor(0xC2DBF1));
+            cb.MouseOver.SplitBorder = LinearGradientColorTable.Empty;
+            cb.MouseOver.SplitBorderLight = LinearGradientColorTable.Empty;
+            cb.MouseOver.Text = factory.GetColor(0x001938);
+
+            cb.MouseOverSplitInactive = new Office2007ButtonItemStateColorTable();
+            cb.MouseOverSplitInactive.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xB1BAC4));
+
+            // Pressed
+            cb.Pressed = new Office2007ButtonItemStateColorTable();
+            cb.Pressed.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x758EAB));
+            cb.Pressed.InnerBorder = new LinearGradientColorTable(factory.GetColor(0x8AA3C2));
+            cb.Pressed.TopBackground = LinearGradientColorTable.Empty;
+            cb.Pressed.TopBackgroundHighlight = LinearGradientColorTable.Empty; //new LinearGradientColorTable(Color.FromArgb(192, Color.White), Color.Transparent);
+            cb.Pressed.BottomBackground = LinearGradientColorTable.Empty;
+            cb.Pressed.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0x9FB7D6), Color.Transparent);
+            cb.Pressed.Background = new LinearGradientColorTable(factory.GetColor(0x9FB7D6));
+            cb.Pressed.SplitBorder = LinearGradientColorTable.Empty;
+            cb.Pressed.SplitBorderLight = LinearGradientColorTable.Empty;
+            cb.Pressed.Text = factory.GetColor(0x001938);
+
+            // Checked
+            cb.Checked = new Office2007ButtonItemStateColorTable();
+            cb.Checked.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x859EBF));
+            cb.Checked.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xDDE9F7));
+            cb.Checked.TopBackground = LinearGradientColorTable.Empty;
+            cb.Checked.TopBackgroundHighlight = LinearGradientColorTable.Empty; //new LinearGradientColorTable(Color.FromArgb(192, Color.White), Color.Transparent);
+            cb.Checked.BottomBackground = LinearGradientColorTable.Empty;
+            cb.Checked.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xDCEBF6), Color.Transparent);
+            cb.Checked.Background = new LinearGradientColorTable(factory.GetColor(0xC8DBEF), factory.GetColor(0xB4CBE5));
+            cb.Checked.SplitBorder = LinearGradientColorTable.Empty;
+            cb.Checked.SplitBorderLight = LinearGradientColorTable.Empty;
+            cb.Checked.Text = factory.GetColor(0x001938);
+
+            // Expanded button
+            cb.Expanded = cb.Checked;
+
+            return cb;
+        }
+        #endregion
+
+        #region RibbonTabItem
+        public static Office2007RibbonTabItemColorTable GetRibbonTabItemBlueDefault(ColorFactory factory)
+        {
+            Office2007RibbonTabItemColorTable rt = new Office2007RibbonTabItemColorTable();
+            rt.Default.Text = factory.GetColor(0x1E395B);
+            rt.CornerSize = 2;
+
+            // Selected Tab
+            rt.Selected = new Office2007RibbonTabItemStateColorTable();
+            rt.Selected.Background = new LinearGradientColorTable(factory.GetColor(0xF5FAFF), factory.GetColor(0xEFF6FD));
+            rt.Selected.BackgroundHighlight = LinearGradientColorTable.Empty;
+            rt.Selected.InnerBorder = LinearGradientColorTable.Empty;
+            rt.Selected.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xB8C9DB), factory.GetColor(0x9FB2C7));
+            rt.Selected.Text = factory.GetColor(0x1E395B);
+
+            // Selected Tab Mouse Over
+            rt.SelectedMouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.SelectedMouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xF5FAFF), factory.GetColor(0xEFF6FD));
+            rt.SelectedMouseOver.BackgroundHighlight = LinearGradientColorTable.Empty;
+            rt.SelectedMouseOver.InnerBorder = LinearGradientColorTable.Empty;
+            rt.SelectedMouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xB8C9DB), factory.GetColor(0x9FB2C7));
+            rt.SelectedMouseOver.Text = factory.GetColor(0x1E395B);
+
+            // Tab Mouse Over
+            rt.MouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.MouseOver.Background = new LinearGradientColorTable(factory.GetColor(48,0xFFFFFF), factory.GetColor(180, 0xFFFFFF));
+            rt.MouseOver.BackgroundHighlight = LinearGradientColorTable.Empty;
+            rt.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(190, 0xFFFFFF), Color.Empty);
+            rt.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xB1B5BA), Color.Empty);
+            rt.MouseOver.Text = factory.GetColor(0x1E395B);
+
+            return rt;
+        }
+
+        public static Office2007RibbonTabItemColorTable GetRibbonTabItemBlueMagenta(ColorFactory factory)
+        {
+            Office2007RibbonTabItemColorTable rt = new Office2007RibbonTabItemColorTable();
+            rt.Default.Text = factory.GetColor(0x1E395B);
+            rt.CornerSize = 2;
+
+            // Selected Tab
+            rt.Selected = new Office2007RibbonTabItemStateColorTable();
+            rt.Selected.Background = new LinearGradientColorTable(factory.GetColor(0xF2DCF1), factory.GetColor(0xEFF6FD));
+            rt.Selected.BackgroundHighlight = LinearGradientColorTable.Empty;
+            rt.Selected.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xEEF5FD), Color.Transparent);
+            rt.Selected.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xE58ABD), factory.GetColor(0xDE66A6));
+            rt.Selected.Text = factory.GetColor(0x1E395B);
+
+            // Selected Tab Mouse Over
+            rt.SelectedMouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.SelectedMouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xF2DCF1), factory.GetColor(0xEFF6FD));
+            rt.SelectedMouseOver.BackgroundHighlight = LinearGradientColorTable.Empty;
+            rt.SelectedMouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xEEF5FD), Color.Transparent);
+            rt.SelectedMouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xE58ABD), factory.GetColor(0xDE66A6));
+            rt.SelectedMouseOver.Text = factory.GetColor(0x1E395B);
+
+            // Tab Mouse Over
+            rt.MouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.MouseOver.Background = new LinearGradientColorTable(factory.GetColor(48, 0xE33991), factory.GetColor(180, 0xFFFFFF));
+            rt.MouseOver.BackgroundHighlight = LinearGradientColorTable.Empty;
+            rt.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(190, 0xFAD8F0), Color.Empty);
+            rt.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xE33991), Color.Empty);
+            rt.MouseOver.Text = factory.GetColor(0x1E395B);
+
+            return rt;
+        }
+
+        public static Office2007RibbonTabItemColorTable GetRibbonTabItemBlueGreen(ColorFactory factory)
+        {
+            Office2007RibbonTabItemColorTable rt = new Office2007RibbonTabItemColorTable();
+            rt.Default.Text = factory.GetColor(0x1E395B);
+            rt.CornerSize = 2;
+
+            // Selected Tab
+            rt.Selected = new Office2007RibbonTabItemStateColorTable();
+            rt.Selected.Background = new LinearGradientColorTable(factory.GetColor(0xF2DCF1), factory.GetColor(0xEFF6FD));
+            rt.Selected.BackgroundHighlight = LinearGradientColorTable.Empty;
+            rt.Selected.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xEEF5FD), Color.Transparent);
+            rt.Selected.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x64BF5F), factory.GetColor(0x53C24E));
+            rt.Selected.Text = factory.GetColor(0x1E395B);
+
+            // Selected Tab Mouse Over
+            rt.SelectedMouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.SelectedMouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xF2DCF1), factory.GetColor(0xEFF6FD));
+            rt.SelectedMouseOver.BackgroundHighlight = LinearGradientColorTable.Empty;
+            rt.SelectedMouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xEEF5FD), Color.Transparent);
+            rt.SelectedMouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x64BF5F), factory.GetColor(0x53C24E));
+            rt.SelectedMouseOver.Text = factory.GetColor(0x1E395B);
+
+            // Tab Mouse Over
+            rt.MouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.MouseOver.Background = new LinearGradientColorTable(factory.GetColor(48, 0x26B023), factory.GetColor(180, 0xFFFFFF));
+            rt.MouseOver.BackgroundHighlight = LinearGradientColorTable.Empty;
+            rt.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(190, 0xC8F8B1), Color.Empty);
+            rt.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x26B023), Color.Empty);
+            rt.MouseOver.Text = factory.GetColor(0x1E395B);
+
+            return rt;
+        }
+
+        public static Office2007RibbonTabItemColorTable GetRibbonTabItemBlueOrange(ColorFactory factory)
+        {
+            Office2007RibbonTabItemColorTable rt = new Office2007RibbonTabItemColorTable();
+            rt.Default.Text = factory.GetColor(0x1E395B);
+            rt.CornerSize = 2;
+
+            // Selected Tab
+            rt.Selected = new Office2007RibbonTabItemStateColorTable();
+            rt.Selected.Background = new LinearGradientColorTable(factory.GetColor(0xF3E8EB), factory.GetColor(0xEFF6FD));
+            rt.Selected.BackgroundHighlight = LinearGradientColorTable.Empty;
+            rt.Selected.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xEDF5FD), Color.Transparent);
+            rt.Selected.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xF2A765), factory.GetColor(0xF2A000));
+            rt.Selected.Text = factory.GetColor(0x1E395B);
+
+            // Selected Tab Mouse Over
+            rt.SelectedMouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.SelectedMouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xF3E8EB), factory.GetColor(0xEFF6FD));
+            rt.SelectedMouseOver.BackgroundHighlight = LinearGradientColorTable.Empty;
+            rt.SelectedMouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xEDF5FD), Color.Transparent);
+            rt.SelectedMouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xF2A765), factory.GetColor(0xF2A000));
+            rt.SelectedMouseOver.Text = factory.GetColor(0x1E395B);
+
+            // Tab Mouse Over
+            rt.MouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.MouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xF5D290), factory.GetColor(180, 0xFFFFFF));
+            rt.MouseOver.BackgroundHighlight = LinearGradientColorTable.Empty;
+            rt.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(190, 0xFBE66F), Color.Empty);
+            rt.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xF07D06), factory.GetColor(0xEF7E08));
+            rt.MouseOver.Text = factory.GetColor(0x1E395B);
+
+            return rt;
+        }
+
+        public static Office2007RibbonTabGroupColorTable GetRibbonTabGroupDefault(ColorFactory factory)
+        {
+            Office2007RibbonTabGroupColorTable tg = new Office2007RibbonTabGroupColorTable();
+            tg.Background = new LinearGradientColorTable(factory.GetColor(0x4488E5), Color.Transparent);
+            tg.BackgroundHighlight = LinearGradientColorTable.Empty;
+            tg.Text = factory.GetColor(0x000000);
+            tg.Border = new LinearGradientColorTable(factory.GetColor(0x1F48A1), Color.Transparent);
+
+            return tg;
+        }
+
+        public static Office2007RibbonTabGroupColorTable GetRibbonTabGroupMagenta(ColorFactory factory)
+        {
+            Office2007RibbonTabGroupColorTable tg = new Office2007RibbonTabGroupColorTable();
+            tg.Background = new LinearGradientColorTable(factory.GetColor(0xC55790), Color.Transparent);
+            tg.BackgroundHighlight = LinearGradientColorTable.Empty;
+            tg.Text = factory.GetColor(0x000000);
+            tg.Border = new LinearGradientColorTable(factory.GetColor(0xC90077), Color.Transparent);
+
+            return tg;
+        }
+
+        public static Office2007RibbonTabGroupColorTable GetRibbonTabGroupGreen(ColorFactory factory)
+        {
+            Office2007RibbonTabGroupColorTable tg = new Office2007RibbonTabGroupColorTable();
+            tg.Background = new LinearGradientColorTable(factory.GetColor(192,0x26B023), Color.Transparent);
+            tg.BackgroundHighlight = LinearGradientColorTable.Empty;
+            tg.Text = factory.GetColor(0x000000);
+            tg.Border = new LinearGradientColorTable(factory.GetColor(0x21941D), Color.Transparent);
+
+            return tg;
+        }
+
+        public static Office2007RibbonTabGroupColorTable GetRibbonTabGroupOrange(ColorFactory factory)
+        {
+            Office2007RibbonTabGroupColorTable tg = new Office2007RibbonTabGroupColorTable();
+            tg.Background = new LinearGradientColorTable(factory.GetColor(192, 0xFF9D00), Color.Transparent);
+            tg.BackgroundHighlight = LinearGradientColorTable.Empty;
+            tg.Text = factory.GetColor(0x000000);
+            tg.Border = new LinearGradientColorTable(factory.GetColor(0xD67519), Color.Transparent);
+
+            return tg;
+        }
+        #endregion
+
+        #region Style Class Creation
+        public static ElementStyle GetFileMenuContainerStyle(Office2007ColorTable table)
+        {
+            ElementStyle style = new ElementStyle();
+            style.Class = ElementStyleClassKeys.RibbonFileMenuContainerKey;
+            Rendering.Office2007MenuColorTable mc = table.Menu;
+
+            style.PaddingBottom = 3;
+            style.PaddingLeft = 0;
+            style.PaddingRight = 0;
+            style.PaddingTop = 22;
+            style.Border = eStyleBorderType.Solid;
+            style.CornerType = eCornerType.Rounded;
+            style.BorderWidth = 1;
+            style.BorderColor = Color.Transparent;
+            style.CornerDiameter = 3;
+            BackgroundColorBlend[] blend = new BackgroundColorBlend[mc.FileBackgroundBlend.Count];
+            mc.FileBackgroundBlend.CopyTo(blend);
+            style.BackColorBlend.Clear();
+            style.BackColorBlend.AddRange(blend);
+            style.BackColorGradientAngle = 90;
+            return style;
+        }
+
+        public static ElementStyle GetTwoColumnMenuContainerStyle(Office2007ColorTable table)
+        {
+            ElementStyle style = new ElementStyle();
+            style.Class = ElementStyleClassKeys.RibbonFileMenuTwoColumnContainerKey;
+            Rendering.Office2007MenuColorTable mc = table.Menu;
+
+            style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Double;
+            style.BorderBottomWidth = 0;
+            style.BorderColor = mc.FileContainerBorder;
+            //style.BorderColorLight = mc.FileContainerBorderLight;
+            style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.None;
+            style.BorderLeftWidth = 0;
+            style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.None;
+            style.BorderRightWidth = 0;
+            style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            style.BorderTopWidth = 1;
+            style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            style.BorderBottomWidth = 1;
+            style.PaddingBottom = 0;
+            style.PaddingLeft = 0;
+            style.PaddingRight = 0;
+            style.PaddingTop = 0;
+
+            return style;
+        }
+
+        public static ElementStyle GetMenuColumnOneContainerStyle(Office2007ColorTable table)
+        {
+            ElementStyle style = new ElementStyle();
+            style.Class = ElementStyleClassKeys.RibbonFileMenuColumnOneContainerKey;
+            Rendering.Office2007MenuColorTable mc = table.Menu;
+
+            style.BackColor = mc.FileColumnOneBackground;
+            style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            style.BorderRightColor = mc.FileColumnOneBorder;
+            style.BorderRightWidth = 1;
+            style.PaddingRight = 1;
+
+            return style;
+        }
+
+        public static ElementStyle GetMenuColumnTwoContainerStyle(Office2007ColorTable table)
+        {
+            ElementStyle style = new ElementStyle();
+            style.Class = ElementStyleClassKeys.RibbonFileMenuColumnTwoContainerKey;
+            Rendering.Office2007MenuColorTable mc = table.Menu;
+
+            style.BackColor = mc.FileColumnTwoBackground;
+
+            return style;
+        }
+
+        public static ElementStyle GetMenuBottomContainer(Office2007ColorTable table)
+        {
+            ElementStyle style = new ElementStyle();
+            style.Class = ElementStyleClassKeys.RibbonFileMenuBottomContainerKey;
+            Rendering.Office2007MenuColorTable mc = table.Menu;
+
+            //BackgroundColorBlend[] blend = new BackgroundColorBlend[mc.FileBottomContainerBackgroundBlend.Count];
+            //mc.FileBottomContainerBackgroundBlend.CopyTo(blend);
+            //style.BackColorBlend.Clear();
+            //style.BackColorBlend.AddRange(blend);
+            //style.BackColorGradientAngle = 90;
+            style.MarginTop = 2;
+            style.MarginRight = 2;
+            return style;
+        }
+        #endregion
+
+        #region Scroll Bar
+        public static void InitializeAppBlueScrollBarColorTable(Office2007ColorTable t, ColorFactory factory)
+        {
+            Office2007ScrollBarStateColorTable sct = t.AppScrollBar.Default;
+            sct.Background = new LinearGradientColorTable(factory.GetColor(0xA9BED5), factory.GetColor(0xBBCEE4), 0);
+            sct.Border = new LinearGradientColorTable(factory.GetColor(0x728EAD), Color.Empty);
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(0x6E7EA6), factory.GetColor(0x424B63), 90);
+            sct.TrackBackground.Clear();
+            sct.TrackBackground.AddRange(new BackgroundColorBlend[] { new BackgroundColorBlend(factory.GetColor(0xB9CEE6),0f), 
+                new BackgroundColorBlend(factory.GetColor(0x91ABC9),1f)});
+            sct.TrackInnerBorder = LinearGradientColorTable.Empty;
+            sct.TrackOuterBorder = new LinearGradientColorTable(factory.GetColor(0x5C7796), Color.Empty);
+            sct.TrackSignBackground = new LinearGradientColorTable(Color.FromArgb(180, factory.GetColor(0x8F8F8F)), Color.FromArgb(64, Color.White));
+
+            // Mouse Over
+            sct = t.AppScrollBar.MouseOver;
+            sct.Background = t.AppScrollBar.Default.Background;
+            sct.Border = t.AppScrollBar.Default.Border;
+            sct.ThumbBackground.Clear();
+            sct.ThumbBackground.AddRange(new BackgroundColorBlend[] { new BackgroundColorBlend(factory.GetColor(0xC1D7F0),0f), 
+                new BackgroundColorBlend(factory.GetColor(0xB4CDE7),0.5f),
+                new BackgroundColorBlend(factory.GetColor(0xA3BEDB),1f)});
+            sct.ThumbInnerBorder = LinearGradientColorTable.Empty;
+            sct.ThumbOuterBorder = new LinearGradientColorTable(factory.GetColor(0x5C7796));
+            sct.ThumbSignBackground = t.AppScrollBar.Default.ThumbSignBackground;
+            sct.TrackBackground.Clear();
+            sct.TrackBackground.AddRange(new BackgroundColorBlend[] { new BackgroundColorBlend(factory.GetColor(0xC1D7F0),0f), 
+                new BackgroundColorBlend(factory.GetColor(0xB4CDE7),0.5f),
+                new BackgroundColorBlend(factory.GetColor(0xA3BEDB),1f)});
+            sct.TrackInnerBorder = LinearGradientColorTable.Empty;
+            sct.TrackOuterBorder = new LinearGradientColorTable(factory.GetColor(0x5C7796), Color.Empty);
+            sct.TrackSignBackground = new LinearGradientColorTable(factory.GetColor(0x8F8F8F));
+
+            // Control Mouse Over
+            sct = t.AppScrollBar.MouseOverControl;
+            sct.Background = t.AppScrollBar.Default.Background;
+            sct.Border = t.AppScrollBar.Default.Border;
+            sct.ThumbBackground.Clear();
+            sct.ThumbBackground.AddRange(new BackgroundColorBlend[] { new BackgroundColorBlend(factory.GetColor(0xB9CEE6),0f), 
+                new BackgroundColorBlend(factory.GetColor(0xA9C1DB),0.5f),
+                new BackgroundColorBlend(factory.GetColor(0x91ABC9),1f)});
+            sct.ThumbInnerBorder = LinearGradientColorTable.Empty;
+            sct.ThumbOuterBorder = new LinearGradientColorTable(factory.GetColor(0x5C7796));
+            sct.ThumbSignBackground = t.AppScrollBar.Default.ThumbSignBackground;
+            sct.TrackBackground.Clear();
+            sct.TrackBackground.AddRange(new BackgroundColorBlend[] { new BackgroundColorBlend(factory.GetColor(0xB9CEE6),0f), 
+                new BackgroundColorBlend(factory.GetColor(0xA9C1DB),0.5f),
+                new BackgroundColorBlend(factory.GetColor(0x91ABC9),1f)});
+            sct.TrackInnerBorder = LinearGradientColorTable.Empty;
+            sct.TrackOuterBorder = new LinearGradientColorTable(factory.GetColor(0x5C7796), Color.Empty);
+            sct.TrackSignBackground = new LinearGradientColorTable(factory.GetColor(0x8F8F8F));
+
+            // Pressed
+            sct = t.AppScrollBar.Pressed;
+            sct.Background = t.AppScrollBar.Default.Background;
+            sct.Border = t.AppScrollBar.Default.Border;
+            sct.ThumbBackground.Clear();
+            sct.ThumbBackground.AddRange(new BackgroundColorBlend[] { 
+                new BackgroundColorBlend(factory.GetColor(0xB0C7DE),0f), 
+                new BackgroundColorBlend(factory.GetColor(0x89A4C1),1f)
+            });
+            sct.ThumbInnerBorder = LinearGradientColorTable.Empty;
+            sct.ThumbOuterBorder = new LinearGradientColorTable(factory.GetColor(0x5C7796));
+            sct.ThumbSignBackground = t.AppScrollBar.Default.ThumbSignBackground;
+            sct.TrackBackground.Clear();
+            sct.TrackBackground.AddRange(new BackgroundColorBlend[] { 
+                new BackgroundColorBlend(factory.GetColor(0xB0C7DE),0f), 
+                new BackgroundColorBlend(factory.GetColor(0x89A4C1),1f)
+            });
+            sct.TrackInnerBorder = LinearGradientColorTable.Empty;
+            sct.TrackOuterBorder = new LinearGradientColorTable(factory.GetColor(0x5C7796), Color.Empty);
+            sct.TrackSignBackground = t.AppScrollBar.Default.TrackSignBackground;
+
+            // Disabled
+            sct = t.AppScrollBar.Disabled;
+            sct.Background = t.AppScrollBar.Default.Background;
+            sct.Border = t.AppScrollBar.Default.Border;
+            sct.ThumbBackground.Clear();
+            sct.ThumbInnerBorder = new LinearGradientColorTable();
+            sct.ThumbOuterBorder = new LinearGradientColorTable();
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(0xBFCFF7), factory.GetColor(0x727C94));
+            sct.TrackBackground.Clear();
+            sct.TrackInnerBorder = new LinearGradientColorTable();
+            sct.TrackOuterBorder = new LinearGradientColorTable();
+            sct.TrackSignBackground = new LinearGradientColorTable();
+        }
+
+        public static void InitializeScrollBarColorTable(Office2007ColorTable t, ColorFactory factory)
+        {
+            Office2007ScrollBarStateColorTable sct = t.ScrollBar.Default;
+            sct.Background = new LinearGradientColorTable(factory.GetColor(0xF4F4F4), factory.GetColor(0xFCFCFC), 0);
+            sct.Border = new LinearGradientColorTable(factory.GetColor(0xE6ECF2));
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(0x747576), factory.GetColor(0x454647), 90);
+            sct.TrackBackground.Clear();
+            sct.TrackBackground.AddRange(new BackgroundColorBlend[] { 
+                new BackgroundColorBlend(factory.GetColor(0xF0F4F8),0f), 
+                new BackgroundColorBlend(factory.GetColor(0xEAEEF3),.8f),
+                new BackgroundColorBlend(factory.GetColor(0xE0E4E9),.8f),
+                new BackgroundColorBlend(factory.GetColor(0xD7DBE1),1f)});
+            sct.TrackInnerBorder = LinearGradientColorTable.Empty;
+            sct.TrackOuterBorder = new LinearGradientColorTable(factory.GetColor(0x8A9199), Color.Empty);
+            sct.TrackSignBackground = new LinearGradientColorTable(factory.GetColor(0x7D7D7D));
+
+            // Mouse Over
+            sct = t.ScrollBar.MouseOver;
+            sct.Background = t.ScrollBar.Default.Background;
+            sct.Border = t.ScrollBar.Default.Border;
+            sct.ThumbBackground.Clear();
+            sct.ThumbBackground.AddRange(new BackgroundColorBlend[] { 
+                new BackgroundColorBlend(factory.GetColor(0xFCFDFE),0f), 
+                new BackgroundColorBlend(factory.GetColor(0xF3F6F9),0.8f),
+                new BackgroundColorBlend(factory.GetColor(0xEAEDF1),0.8f),
+                new BackgroundColorBlend(factory.GetColor(0xE4E8EC),1f)});
+            sct.ThumbInnerBorder = new LinearGradientColorTable(factory.GetColor(0xFCFDFE), factory.GetColor(0xF1F3F5));
+            sct.ThumbOuterBorder = new LinearGradientColorTable(factory.GetColor(0x8A9199), Color.Empty);
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(0x747576), factory.GetColor(0x454647), 90);
+            sct.TrackBackground.Clear();
+            sct.TrackBackground.CopyFrom(sct.ThumbBackground);
+            sct.TrackInnerBorder = sct.ThumbInnerBorder;
+            sct.TrackOuterBorder = sct.ThumbOuterBorder;
+            sct.TrackSignBackground = new LinearGradientColorTable(factory.GetColor(0x7D7D7D));
+
+            // Control Mouse Over
+            sct = t.ScrollBar.MouseOverControl;
+            sct.Background = t.ScrollBar.Default.Background;
+            sct.Border = t.ScrollBar.Default.Border;
+            sct.ThumbBackground.Clear();
+            sct.ThumbBackground.CopyFrom(t.ScrollBar.Default.TrackBackground);
+            sct.ThumbInnerBorder = t.ScrollBar.Default.TrackInnerBorder;
+            sct.ThumbOuterBorder = t.ScrollBar.Default.TrackOuterBorder;
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(0x747576), factory.GetColor(0x454647));
+            sct.TrackBackground.Clear();
+            sct.TrackBackground.CopyFrom(t.ScrollBar.Default.TrackBackground);
+            sct.TrackInnerBorder = t.ScrollBar.Default.TrackInnerBorder;
+            sct.TrackOuterBorder = t.ScrollBar.Default.TrackOuterBorder;
+            sct.TrackSignBackground = t.ScrollBar.Default.TrackSignBackground;
+
+            // Pressed
+            sct = t.ScrollBar.Pressed;
+            sct.Background = t.ScrollBar.Default.Background;
+            sct.Border = t.ScrollBar.Default.Border;
+            sct.ThumbBackground.Clear();
+            sct.ThumbBackground.AddRange(new BackgroundColorBlend[] { 
+                new BackgroundColorBlend(factory.GetColor(0xEBEFF3),0f), 
+                new BackgroundColorBlend(factory.GetColor(0xE5E8ED),0.8f),
+                new BackgroundColorBlend(factory.GetColor(0xDADEE3),0.8f),
+                new BackgroundColorBlend(factory.GetColor(0xD0D4DA),1f)});
+            sct.ThumbInnerBorder = LinearGradientColorTable.Empty;
+            sct.ThumbOuterBorder = new LinearGradientColorTable(factory.GetColor(0x8A9199), Color.Empty);
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(0x6E7EA6), factory.GetColor(0x424B63), 90);
+            sct.TrackBackground.Clear();
+            sct.TrackBackground.CopyFrom(sct.ThumbBackground);
+            sct.TrackInnerBorder = LinearGradientColorTable.Empty;
+            sct.TrackOuterBorder = new LinearGradientColorTable(factory.GetColor(0x8A9199), Color.Empty);
+            sct.TrackSignBackground = t.ScrollBar.Default.TrackSignBackground;
+            // Disabled
+            sct = t.ScrollBar.Disabled;
+            sct.Background = t.ScrollBar.Default.Background;
+            sct.Border = t.ScrollBar.Default.Border;
+            sct.ThumbBackground.Clear();
+            sct.ThumbInnerBorder = new LinearGradientColorTable();
+            sct.ThumbOuterBorder = new LinearGradientColorTable();
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(0xBFCFF7), factory.GetColor(0x727C94));
+            sct.TrackBackground.Clear();
+            sct.TrackInnerBorder = new LinearGradientColorTable();
+            sct.TrackOuterBorder = new LinearGradientColorTable();
+            sct.TrackSignBackground = new LinearGradientColorTable();
+        }
+        #endregion
+
+        #region RibbonClientPanel
+
+        public static ElementStyle GetRibbonClientPanelStyle(ColorFactory f, eOffice2010ColorScheme cs)
+        {
+            ElementStyle style = new ElementStyle();
+            style.Class = ElementStyleClassKeys.RibbonClientPanelKey;
+
+            style.BackColorGradientAngle = 90;
+
+            if (cs == eOffice2010ColorScheme.Blue)
+            {
+                style.BackColorBlend.Add(new BackgroundColorBlend(f.GetColor(0xC7DAF0), 0));
+                style.BackColorBlend.Add(new BackgroundColorBlend(f.GetColor(0x9AB3CF), .7f));
+                style.BackColorBlend.Add(new BackgroundColorBlend(f.GetColor(0x85A1C0), 1));
+            }
+            else if (cs == eOffice2010ColorScheme.Silver)
+            {
+                style.BackColorBlend.Add(new BackgroundColorBlend(f.GetColor(0xCDD1D6), 0));
+                style.BackColorBlend.Add(new BackgroundColorBlend(f.GetColor(0xC0C4C8), .7f));
+                style.BackColorBlend.Add(new BackgroundColorBlend(f.GetColor(0xBABEC2), 1));
+            }
+            else if (cs == eOffice2010ColorScheme.Black)
+            {
+                style.BackColorBlend.Add(new BackgroundColorBlend(f.GetColor(0x6F6F6F), 0));
+                style.BackColorBlend.Add(new BackgroundColorBlend(f.GetColor(0x4F4F4F), .7f));
+                style.BackColorBlend.Add(new BackgroundColorBlend(f.GetColor(0x3F3F3F), 1));
+            }
+
+            return style;
+        }
+        #endregion
+
+        #region Backstage Buttons
+        public static Office2007ButtonItemColorTable GetButtonItemBackstageDefault(ColorFactory factory)
+        {
+            Office2007ButtonItemColorTable cb = new Office2007ButtonItemColorTable();
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Blue);
+            cb.Default = new Office2007ButtonItemStateColorTable();
+            cb.Default.Text = factory.GetColor(0x000000);
+
+            // Button mouse over
+            cb.MouseOver = new Office2007ButtonItemStateColorTable();
+            cb.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x527DE0));
+            cb.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(135, 0xFFFFFF));
+            cb.MouseOver.TopBackground = new LinearGradientColorTable(factory.GetColor(32, 0x007FFF));
+            cb.MouseOver.TopBackgroundHighlight = LinearGradientColorTable.Empty; //new LinearGradientColorTable(Color.FromArgb(192, Color.White), Color.Transparent);
+            cb.MouseOver.BottomBackground = new LinearGradientColorTable(factory.GetColor(32, 0x007FFF));
+            cb.MouseOver.BottomBackgroundHighlight = LinearGradientColorTable.Empty;
+            cb.MouseOver.SplitBorder = new LinearGradientColorTable(factory.GetColor(0x527DE0), Color.Empty);
+            cb.MouseOver.SplitBorderLight = new LinearGradientColorTable(factory.GetColor(135, 0xFFFFFF), Color.Empty);
+            cb.MouseOver.Text = factory.GetColor(0x000000);
+
+            cb.MouseOverSplitInactive = new Office2007ButtonItemStateColorTable();
+            cb.MouseOverSplitInactive.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x527DE0));
+
+            // Pressed
+            cb.Pressed = new Office2007ButtonItemStateColorTable();
+            cb.Pressed.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x527DE0));
+            cb.Pressed.InnerBorder = new LinearGradientColorTable(factory.GetColor(192, 0xFFFFFF));
+            cb.Pressed.TopBackground = new LinearGradientColorTable(factory.GetColor(32, 0x007FFF));
+            cb.Pressed.TopBackgroundHighlight = LinearGradientColorTable.Empty; //new LinearGradientColorTable(Color.FromArgb(192, Color.White), Color.Transparent);
+            cb.Pressed.BottomBackground = new LinearGradientColorTable(factory.GetColor(32, 0x007FFF));
+            cb.Pressed.BottomBackgroundHighlight = LinearGradientColorTable.Empty;
+            cb.Pressed.SplitBorder = new LinearGradientColorTable(factory.GetColor(0x527DE0), Color.Empty);
+            cb.Pressed.SplitBorderLight = new LinearGradientColorTable(factory.GetColor(135, 0xFFFFFF), Color.Empty);
+            cb.Pressed.Text = factory.GetColor(0x000000);
+
+            // Checked
+            cb.Checked = cb.Pressed;
+
+            // Expanded button
+            cb.Expanded = cb.MouseOver;
+
+            SetBlueExpandColors(cb, factory);
+
+            return cb;
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/Office2010ColorTable.cs b/PROMS/DotNetBar Source Code/Rendering/Office2010ColorTable.cs
new file mode 100644
index 00000000..e09cdb2e
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/Office2010ColorTable.cs	
@@ -0,0 +1,295 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    /// <summary>
+    /// Represents color table for Office 2010 style.
+    /// </summary>
+    public class Office2010ColorTable : Office2007ColorTable
+    {
+        /// <summary>
+        /// Initializes a new instance of the Office2010ColorTable class.
+        /// </summary>
+        public Office2010ColorTable()
+        {
+            Office2010BlueFactory.InitializeColorTable(this, ColorFactory.Empty);
+            InitAppButtonColors(this, ColorFactory.Empty);
+        }
+
+        public Office2010ColorTable(eOffice2010ColorScheme color)
+        {
+            if(color == eOffice2010ColorScheme.Blue)
+                Office2010BlueFactory.InitializeColorTable(this, ColorFactory.Empty);
+            else if(color == eOffice2010ColorScheme.Silver)
+                Office2010SilverFactory.InitializeColorTable(this, ColorFactory.Empty);
+            else if (color == eOffice2010ColorScheme.Black)
+                Office2010BlackFactory.InitializeColorTable(this, ColorFactory.Empty);
+            else if (color == eOffice2010ColorScheme.VS2010)
+                VisualStudio2010Factory.InitializeColorTable(this, ColorFactory.Empty);
+            InitAppButtonColors(this, ColorFactory.Empty);
+            _ColorScheme = color;
+        }
+
+        public Office2010ColorTable(eOffice2010ColorScheme color, Color blendColor)
+        {
+            ColorFactory factory = blendColor.IsEmpty ? ColorFactory.Empty : new ColorBlendFactory(blendColor);
+            if (color == eOffice2010ColorScheme.Blue)
+                Office2010BlueFactory.InitializeColorTable(this, factory);
+            else if (color == eOffice2010ColorScheme.Silver)
+                Office2010SilverFactory.InitializeColorTable(this, factory);
+            else if (color == eOffice2010ColorScheme.Black)
+                Office2010BlackFactory.InitializeColorTable(this, factory);
+            else if (color == eOffice2010ColorScheme.VS2010)
+                VisualStudio2010Factory.InitializeColorTable(this, factory);
+            InitAppButtonColors(this, factory);
+            _ColorScheme = color;
+        }
+
+        private eOffice2010ColorScheme _ColorScheme;
+        /// <summary>
+        /// Gets the color scheme color table is initialized with.
+        /// </summary>
+        public eOffice2010ColorScheme ColorScheme
+        {
+            get { return _ColorScheme; }
+        }
+
+        #region Application Button Colors
+        private static Office2007ButtonItemColorTable FallBackAppButtonColorTable = null;
+        internal static Office2007ButtonItemColorTable GetFallBackAppButtonColorTable()
+        {
+            if (FallBackAppButtonColorTable != null) return FallBackAppButtonColorTable;
+
+            // Blue default
+            Office2007ButtonItemColorTable table = new Office2007ButtonItemColorTable();
+            table.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Blue);
+
+            Office2007ButtonItemStateColorTable ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(0x3E7DDB, 0x265FB2);
+            ct.BottomBackgroundHighlight = new LinearGradientColorTable(DevComponents.DotNetBar.ColorScheme.GetColor(64, 0xFFFFFF), Color.Transparent);
+            ct.OuterBorder = new LinearGradientColorTable(0x1E48A0, 0x244FA6);
+            ct.InnerBorder = new LinearGradientColorTable(32, 0xFFFFFF);
+            ct.Text = DevComponents.DotNetBar.ColorScheme.GetColor(0xFFFFFF);
+            table.Default = ct;
+
+            ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(0x4786E5, 0x2D65BC);
+            ct.BottomBackgroundHighlight = new LinearGradientColorTable(DevComponents.DotNetBar.ColorScheme.GetColor(82, 0xFFFFFF), Color.Transparent);
+            ct.OuterBorder = new LinearGradientColorTable(0x1F48A1, 0x2954A9);
+            ct.InnerBorder = new LinearGradientColorTable(DevComponents.DotNetBar.ColorScheme.GetColor(72, 0xFFFFFF), DevComponents.DotNetBar.ColorScheme.GetColor(48, 0xFFFFFF));
+            ct.Text = DevComponents.DotNetBar.ColorScheme.GetColor(0xFFFFFF);
+            table.MouseOver = ct;
+
+            ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(0x2861B6, 0x1D5AB2);
+            ct.BottomBackgroundHighlight = new LinearGradientColorTable(DevComponents.DotNetBar.ColorScheme.GetColor(82, 0xFFFFFF), Color.Transparent);
+            ct.OuterBorder = new LinearGradientColorTable(0x1F48A1, 0x224EA6);
+            ct.InnerBorder = new LinearGradientColorTable(DevComponents.DotNetBar.ColorScheme.GetColor(72, 0xFFFFFF), DevComponents.DotNetBar.ColorScheme.GetColor(48, 0xFFFFFF));
+            ct.Text = DevComponents.DotNetBar.ColorScheme.GetColor(0xFFFFFF);
+            table.Pressed = ct;
+
+            table.Expanded = table.Pressed;
+            table.Checked = table.Pressed;
+
+            FallBackAppButtonColorTable = table;
+            return table;
+        }
+        internal static void InitAppButtonColors(Office2007ColorTable colorTable, ColorFactory factory)
+        {
+            Office2007ButtonItemColorTableCollection colors = colorTable.ApplicationButtonColors;
+            colors.Clear();
+
+            // Blue default
+            Office2007ButtonItemColorTable table = new Office2007ButtonItemColorTable();
+            table.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Blue);
+
+            Office2007ButtonItemStateColorTable ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(factory.GetColor(0x3E7DDB), factory.GetColor(0x265FB2));
+            ct.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(64, 0xFFFFFF), Color.Transparent);
+            ct.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x1E48A0), factory.GetColor(0x244FA6));
+            ct.InnerBorder = new LinearGradientColorTable(factory.GetColor(32, 0xFFFFFF));
+            ct.Text = factory.GetColor(0xFFFFFF);
+            table.Default = ct;
+
+            ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(factory.GetColor(0x4786E5), factory.GetColor(0x2D65BC));
+            ct.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(82, 0xFFFFFF), Color.Transparent);
+            ct.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x1F48A1), factory.GetColor(0x2954A9));
+            ct.InnerBorder = new LinearGradientColorTable(factory.GetColor(72, 0xFFFFFF), factory.GetColor(48, 0xFFFFFF)); //new LinearGradientColorTable(factory.GetColor(0x55A1F3), factory.GetColor(0x4F9EEE));
+            ct.Text = factory.GetColor(0xFFFFFF);
+            table.MouseOver = ct;
+
+            ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(factory.GetColor(0x2861B6), factory.GetColor(0x1D5AB2));
+            ct.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(82, 0xFFFFFF), Color.Transparent);
+            ct.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x1F48A1), factory.GetColor(0x224EA6));
+            ct.InnerBorder = new LinearGradientColorTable(factory.GetColor(72, 0xFFFFFF), factory.GetColor(48, 0xFFFFFF)); //new LinearGradientColorTable(factory.GetColor(0x55A1F3), factory.GetColor(0x4F9EEE));
+            ct.Text = factory.GetColor(0xFFFFFF);
+            table.Pressed = ct;
+
+            table.Expanded = table.Pressed;
+            table.Checked = table.Pressed;
+
+            colors.Add(table);
+
+            // Magenta
+            table = new Office2007ButtonItemColorTable();
+            table.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Magenta);
+
+            ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(factory.GetColor(0xCC256B), factory.GetColor(0xB10851));
+            ct.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(64, 0xFFFFFF), Color.Transparent);
+            ct.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x8F013C), factory.GetColor(0x940741));
+            ct.InnerBorder = new LinearGradientColorTable(factory.GetColor(32, 0xFFFFFF));
+            ct.Text = factory.GetColor(0xFFFFFF);
+            table.Default = ct;
+
+            ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(factory.GetColor(0xD63272), factory.GetColor(0xB10B52));
+            ct.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(82, 0xFFFFFF), Color.Transparent);
+            ct.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x8F013C), factory.GetColor(0x950942));
+            ct.InnerBorder = new LinearGradientColorTable(factory.GetColor(72, 0xFFFFFF), factory.GetColor(48, 0xFFFFFF)); //new LinearGradientColorTable(factory.GetColor(0x55A1F3), factory.GetColor(0x4F9EEE));
+            ct.Text = factory.GetColor(0xFFFFFF);
+            table.MouseOver = ct;
+
+            ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(factory.GetColor(0xB50C53), factory.GetColor(0xB00B52));
+            ct.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(82, 0xFFFFFF), Color.Transparent);
+            ct.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x8F013D), factory.GetColor(0x950741));
+            ct.InnerBorder = new LinearGradientColorTable(factory.GetColor(72, 0xFFFFFF), factory.GetColor(48, 0xFFFFFF)); //new LinearGradientColorTable(factory.GetColor(0x55A1F3), factory.GetColor(0x4F9EEE));
+            ct.Text = factory.GetColor(0xFFFFFF);
+            table.Pressed = ct;
+
+            table.Expanded = table.Pressed;
+            table.Checked = table.Pressed;
+
+            colors.Add(table);
+
+            // Orange
+            table = new Office2007ButtonItemColorTable();
+            table.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Orange);
+
+            ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(factory.GetColor(0xF27350), factory.GetColor(0xE5552F));
+            ct.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xF89E42), Color.Transparent);
+            ct.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xCC2B12), factory.GetColor(0xCF3415));
+            ct.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xF68954), factory.GetColor(0xF78B3E));
+            ct.Text = factory.GetColor(0xFFFFFF);
+            table.Default = ct;
+
+            ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(factory.GetColor(0xF87E4D), factory.GetColor(0xE6552E));
+            ct.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xFBBD5E), Color.Transparent);
+            ct.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xCA2810), factory.GetColor(0xCD3217));
+            ct.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFBAA5A), factory.GetColor(0xFCB857)); //new LinearGradientColorTable(factory.GetColor(0x55A1F3), factory.GetColor(0x4F9EEE));
+            ct.Text = factory.GetColor(0xFFFFFF);
+            table.MouseOver = ct;
+
+            ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(factory.GetColor(0xE3531D), factory.GetColor(0xE04E19));
+            ct.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xFDAF4C), Color.Transparent);
+            ct.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xCA2810), factory.GetColor(0xCD3013));
+            ct.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xE86229), factory.GetColor(0xFB8D44)); //new LinearGradientColorTable(factory.GetColor(0x55A1F3), factory.GetColor(0x4F9EEE));
+            ct.Text = factory.GetColor(0xFFFFFF);
+            table.Pressed = ct;
+
+            table.Expanded = table.Pressed;
+            table.Checked = table.Pressed;
+
+            colors.Add(table);
+
+            // Green
+            table = new Office2007ButtonItemColorTable();
+            table.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.BlueWithBackground);
+
+            ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(factory.GetColor(0x459731), factory.GetColor(0x2B7F2C));
+            ct.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0x6BCA45), Color.Transparent);
+            ct.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x186337), factory.GetColor(0x1E6A39));
+            ct.InnerBorder = new LinearGradientColorTable(factory.GetColor(0x4CA231), factory.GetColor(0x53B331));
+            ct.Text = factory.GetColor(0xFFFFFF);
+            table.Default = ct;
+
+            ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(factory.GetColor(0x469734), factory.GetColor(0x267C2B));
+            ct.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0x89D668), Color.Transparent);
+            ct.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x196437), factory.GetColor(0x216B3C));
+            ct.InnerBorder = new LinearGradientColorTable(factory.GetColor(0x65B943), factory.GetColor(0x70CC4A));
+            ct.Text = factory.GetColor(0xFFFFFF);
+            table.MouseOver = ct;
+
+            ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(factory.GetColor(0x2F822A), factory.GetColor(0x2A7E2C));
+            ct.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0x68CB38), Color.Transparent);
+            ct.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x186437), factory.GetColor(0x1D6A38));
+            ct.InnerBorder = new LinearGradientColorTable(factory.GetColor(0x368F2B), factory.GetColor(0x59BD2D)); //new LinearGradientColorTable(factory.GetColor(0x55A1F3), factory.GetColor(0x4F9EEE));
+            ct.Text = factory.GetColor(0xFFFFFF);
+            table.Pressed = ct;
+
+            table.Expanded = table.Pressed;
+            table.Checked = table.Pressed;
+
+            colors.Add(table);
+
+            // Teal
+            table = new Office2007ButtonItemColorTable();
+            table.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.MagentaWithBackground);
+
+            ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(factory.GetColor(0x159795), factory.GetColor(0x018281));
+            ct.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0x20B7B4), Color.Transparent);
+            ct.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x055E5E), factory.GetColor(0x076464));
+            ct.InnerBorder = new LinearGradientColorTable(factory.GetColor(0x1BA29D), factory.GetColor(0x1FB1A9));
+            ct.Text = factory.GetColor(0xFFFFFF);
+            table.Default = ct;
+
+            ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(factory.GetColor(0x1F9C99), factory.GetColor(0x038584));
+            ct.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0x36CDCA), Color.Transparent);
+            ct.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x055E5E), factory.GetColor(0x096767));
+            ct.InnerBorder = new LinearGradientColorTable(factory.GetColor(0x30B8B3), factory.GetColor(0x34C2BE));
+            ct.Text = factory.GetColor(0xFFFFFF);
+            table.MouseOver = ct;
+
+            ct = new Office2007ButtonItemStateColorTable();
+            ct.Background = new LinearGradientColorTable(factory.GetColor(0x028482), factory.GetColor(0x028081));
+            ct.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0x2CC2BE), Color.Transparent);
+            ct.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x055E5E), factory.GetColor(0x086565));
+            ct.InnerBorder = new LinearGradientColorTable(factory.GetColor(0x028F8D), factory.GetColor(0x1DB4AD)); //new LinearGradientColorTable(factory.GetColor(0x55A1F3), factory.GetColor(0x4F9EEE));
+            ct.Text = factory.GetColor(0xFFFFFF);
+            table.Pressed = ct;
+
+            table.Expanded = table.Pressed;
+            table.Checked = table.Pressed;
+
+            colors.Add(table);
+        }
+        #endregion
+    }
+
+    /// <summary>
+    /// Defines the color scheme type for the Office2010ColorTable.
+    /// </summary>
+    public enum eOffice2010ColorScheme
+    {
+        /// <summary>
+        /// Silver color scheme.
+        /// </summary>
+        Silver,
+        /// <summary>
+        /// Blue color scheme.
+        /// </summary>
+        Blue,
+        /// <summary>
+        /// Black color scheme.
+        /// </summary>
+        Black,
+        /// <summary>
+        /// Visual Studio 2010 Blue color scheme.
+        /// </summary>
+        VS2010
+    }
+
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/Office2010NavPaneButtonPainter.cs b/PROMS/DotNetBar Source Code/Rendering/Office2010NavPaneButtonPainter.cs
new file mode 100644
index 00000000..d2edfcc1
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/Office2010NavPaneButtonPainter.cs	
@@ -0,0 +1,51 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    internal class Office2010NavPaneButtonPainter : Office2007ButtonItemPainter
+    {
+        protected override void PaintStateBackground(ButtonItem button, Graphics g, Office2007ButtonItemStateColorTable stateColors, Rectangle r, IShapeDescriptor shape, bool isDefault, bool paintBorder)
+        {
+            if (stateColors == null || stateColors.Background == null || stateColors.Background.IsEmpty)
+                return;
+
+            Rectangle shadowRect = r;
+            ShadowPaintInfo spi = new ShadowPaintInfo();
+            spi.Graphics = g;
+            spi.Rectangle = shadowRect;
+            ShadowPainter.Paint3(spi);
+
+            r.Width -= 4;
+            r.Height -= 4;
+            r.Offset(1, 1);
+
+            DisplayHelp.FillRectangle(g, r, stateColors.Background);
+            if (stateColors.BottomBackgroundHighlight != null && !stateColors.BottomBackgroundHighlight.IsEmpty)
+            {
+                Rectangle ellipse = new Rectangle(r.X, r.Y + r.Height / 2 - 2, r.Width, r.Height + 4);
+                GraphicsPath path = new GraphicsPath();
+                path.AddEllipse(ellipse);
+                PathGradientBrush brush = new PathGradientBrush(path);
+                brush.CenterColor = stateColors.BottomBackgroundHighlight.Start;
+                brush.SurroundColors = new Color[] { stateColors.BottomBackgroundHighlight.End };
+                brush.CenterPoint = new PointF(ellipse.X + ellipse.Width / 2, r.Bottom);
+                Blend blend = new Blend();
+                blend.Factors = new float[] { 0f, .5f, .6f };
+                blend.Positions = new float[] { .0f, .4f, 1f };
+                brush.Blend = blend;
+
+                g.FillRectangle(brush, r);
+                brush.Dispose();
+                path.Dispose();
+            }
+
+            DisplayHelp.DrawGradientRectangle(g, r, stateColors.OuterBorder, 1);
+            r.Inflate(-1, -1);
+            DisplayHelp.DrawGradientRectangle(g, r, stateColors.InnerBorder, 1);
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/Office2010RangeSliderColorTable.cs b/PROMS/DotNetBar Source Code/Rendering/Office2010RangeSliderColorTable.cs
new file mode 100644
index 00000000..a761f34b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/Office2010RangeSliderColorTable.cs	
@@ -0,0 +1,112 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    /// <summary>
+    /// Defines the color table for the Range Slider Item in single state.
+    /// </summary>
+    public class Office2010RangeSliderColorTable
+    {
+        /// <summary>
+        /// Gets or sets the colors for the slider which changes the minimum value of the range.
+        /// </summary>
+        public Office2010RangeSliderPartStateColorTable MinRangeSlider = new Office2010RangeSliderPartStateColorTable();
+        /// <summary>
+        /// Gets or sets the colors for the slider which changes the maximum value of the range.
+        /// </summary>
+        public Office2010RangeSliderPartStateColorTable MaxRangeSlider = new Office2010RangeSliderPartStateColorTable();
+
+        /// <summary>
+        /// Gets or sets the tick line color.
+        /// </summary>
+        public Color TickLineColor = Color.Empty;
+        /// <summary>
+        
+        /// <summary>
+        /// Gets or sets the color for the line which indicates current range value.
+        /// </summary>
+        public Color RangeValueLineColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets the background colors of the current range value.
+        /// </summary>
+        public GradientColorTable RangeValueBackground = null;
+
+        /// <summary>
+        /// Gets or sets the color for the line showing control range.
+        /// </summary>
+        public Color RangeLineColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets the background colors for the line showing control range.
+        /// </summary>
+        public GradientColorTable RangeBackground = null;
+        /// <summary>
+        /// Gets or sets the corner radius for the range rectangle.
+        /// </summary>
+        public int RangeCornerRadius = 1;
+    }
+
+    /// <summary>
+    /// Defines the color table for the Range Slider Item in single state.
+    /// </summary>
+    public class Office2010RangeSliderPartStateColorTable
+    {
+        /// <summary>
+        /// Gets or sets the default state colors.
+        /// </summary>
+        public Office2010RangeChangePartColorTable Default = new Office2010RangeChangePartColorTable();
+
+        /// <summary>
+        /// Gets or sets the mouse over state colors.
+        /// </summary>
+        public Office2010RangeChangePartColorTable MouseOver = new Office2010RangeChangePartColorTable();
+
+        /// <summary>
+        /// Gets or sets the mouse pressed colors.
+        /// </summary>
+        public Office2010RangeChangePartColorTable Pressed = new Office2010RangeChangePartColorTable();
+
+        /// <summary>
+        /// Gets or sets the disabled colors.
+        /// </summary>
+        public Office2010RangeChangePartColorTable Disabled = new Office2010RangeChangePartColorTable();
+    }
+
+    public class Office2010RangeChangePartColorTable
+    {
+        /// <summary>
+        /// Initializes a new instance of the Office2010RangeChangePartColorTable class.
+        /// </summary>
+        public Office2010RangeChangePartColorTable()
+        {
+        }
+        /// <summary>
+        /// Initializes a new instance of the Office2010RangeChangePartColorTable class.
+        /// </summary>
+        /// <param name="background"></param>
+        /// <param name="borderColor"></param>
+        /// <param name="borderLightColor"></param>
+        public Office2010RangeChangePartColorTable(GradientColorTable background, Color borderColor, Color borderLightColor)
+        {
+            Background = background;
+            BorderColor = borderColor;
+            BorderLightColor = borderLightColor;
+        }
+        /// <summary>
+        /// Gets or sets the part background colors.
+        /// </summary>
+        public GradientColorTable Background = null;
+
+        /// <summary>
+        /// Gets or sets the part border color
+        /// </summary>
+        public Color BorderColor = Color.Empty;
+
+        /// <summary>
+        /// Gets or sets the part border light color
+        /// </summary>
+        public Color BorderLightColor = Color.Empty;
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/Office2010RangeSliderPainter.cs b/PROMS/DotNetBar Source Code/Rendering/Office2010RangeSliderPainter.cs
new file mode 100644
index 00000000..9c1b5296
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/Office2010RangeSliderPainter.cs	
@@ -0,0 +1,463 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing.Drawing2D;
+using System.Drawing;
+using System.Threading;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    internal class Office2010RangeSliderPainter : RangeSliderPainter, IOffice2007Painter
+    {
+        #region IOffice2007Painter
+        private Office2007ColorTable _ColorTable = null; //new Office2007ColorTable();
+
+        /// <summary>
+        /// Gets or sets color table used by renderer.
+        /// </summary>
+        public Office2007ColorTable ColorTable
+        {
+            get { return _ColorTable; }
+            set { _ColorTable = value; }
+        }
+        #endregion
+
+        #region Implementation
+        public override void Paint(RangeSliderItemRendererEventArgs e)
+        {
+            RangeSliderItem item = e.SliderItem;
+            ItemPaintArgs p = e.ItemPaintArgs;
+            Graphics g = e.Graphics;
+            Office2010RangeSliderColorTable table = GetColorTable(item, p.ContainerControl);
+            eOrientation sliderOrientation = item.SliderOrientation;
+            RangeValue minmaxValue = item.GetNormalizedMinMaxValues();
+            int min = minmaxValue.Min;
+            int max = minmaxValue.Max;
+            RangeValue value = item.GetNormalizedRangeValue();
+
+            if (table == null)
+            {
+                g.FillRectangle(Brushes.Gray, item.Bounds);
+                return;
+            }
+
+            if (item.RangeLineHeight > 0)
+            {
+                Rectangle rangeBounds;
+                if (item.SliderOrientation == eOrientation.Horizontal)
+                {
+                    rangeBounds = new Rectangle(item.TicksBounds.X,
+                        item.RangeButtonMinBounds.Y + (item.RangeButtonMinBounds.Height - item.RangeLineHeight) / 2 + 1,
+                        item.TicksBounds.Width, item.RangeLineHeight);
+                }
+                else
+                {
+                    rangeBounds = new Rectangle(
+                        item.RangeButtonMinBounds.X + (item.RangeButtonMinBounds.Width - item.RangeLineHeight) / 2,
+                        item.TicksBounds.Y,
+                        item.RangeLineHeight, item.TicksBounds.Height);
+                }
+                if (table.RangeBackground != null)
+                {
+                    table.RangeBackground.LinearGradientAngle = (item.SliderOrientation == eOrientation.Horizontal) ? 90 : 180;
+                    Rectangle rb = rangeBounds;
+                    rb.Offset(item.Bounds.Location);
+                    rb.Height--;
+                    using (Brush brush = DisplayHelp.CreateBrush(rb, table.RangeBackground))
+                        DisplayHelp.FillRoundedRectangle(g, brush, rb, table.RangeCornerRadius);
+                    rb.Height++;
+                    if (!table.RangeLineColor.IsEmpty)
+                        DisplayHelp.DrawRoundedRectangle(g, table.RangeLineColor, rb, table.RangeCornerRadius);
+                }
+                if (table.RangeValueBackground != null)
+                {
+                    if (item.SliderOrientation == eOrientation.Horizontal)
+                    {
+                        rangeBounds.X = item.RangeButtonMinBounds.Right;
+                        rangeBounds.Width = item.RangeButtonMaxBounds.X - item.RangeButtonMinBounds.Right;
+                    }
+                    else
+                    {
+                        rangeBounds.Y = item.RangeButtonMinBounds.Bottom;
+                        rangeBounds.Height = item.RangeButtonMaxBounds.Y - item.RangeButtonMinBounds.Bottom;
+                    }
+                    Rectangle rb = rangeBounds;
+                    rb.Offset(item.Bounds.Location);
+                    table.RangeValueBackground.LinearGradientAngle = (item.SliderOrientation == eOrientation.Horizontal) ? 90 : 180;
+                    rb.Height--;
+                    if (item.RangeValueColor.IsEmpty)
+                    {
+                        using (Brush brush = DisplayHelp.CreateBrush(rb, table.RangeValueBackground))
+                            g.FillRectangle(brush, rb);
+                    }
+                    else
+                    {
+                        using(SolidBrush brush=new SolidBrush(item.RangeValueColor))
+                            g.FillRectangle(brush, rb);
+                    }
+                    rb.Height++;
+                    if (!table.RangeValueLineColor.IsEmpty)
+                    {
+                        using (Pen pen = new Pen(table.RangeValueLineColor))
+                        {
+                            if (item.SliderOrientation == eOrientation.Horizontal)
+                            {
+                                g.DrawLine(pen, rb.X, rb.Y, rb.Right, rb.Y);
+                                g.DrawLine(pen, rb.X, rb.Bottom - 1, rb.Right, rb.Bottom - 1);
+                            }
+                            else
+                            {
+                                g.DrawLine(pen, rb.X, rb.Y, rb.X, rb.Bottom);
+                                g.DrawLine(pen, rb.Right - 1, rb.Y, rb.Right - 1, rb.Bottom);
+                            }
+                        }
+                    }
+                }
+            }
+
+            if (item.TicksVisible && !table.TickLineColor.IsEmpty)
+            {
+                Rectangle ticksBounds = item.TicksBounds;
+                ticksBounds.Offset(item.Bounds.Location);
+                int steps = item.TicksStep;
+                //g.FillRectangle(Brushes.Yellow, ticksBounds);
+                if (sliderOrientation == eOrientation.Horizontal)
+                {
+                    DrawHTicks(g, table, min, max, ticksBounds, steps);
+                    if (!item.TicksBounds2.IsEmpty)
+                    {
+                        ticksBounds = item.TicksBounds2;
+                        ticksBounds.Offset(item.Bounds.Location);
+                        DrawHTicks(g, table, min, max, ticksBounds, steps);
+                    }
+                }
+                else
+                {
+                    DrawVTicks(g, table, min, max, ticksBounds, steps);
+                    if (!item.TicksBounds2.IsEmpty)
+                    {
+                        ticksBounds = item.TicksBounds2;
+                        ticksBounds.Offset(item.Bounds.Location);
+                        DrawVTicks(g, table, min, max, ticksBounds, steps);
+                    }
+                }
+            }
+            g.ResetClip();
+            if (item.MinRangeSliderImage != null)
+            {
+                Rectangle br = item.RangeButtonMinBounds;
+                br.Offset(item.Bounds.Location);
+                g.DrawImage(item.MinRangeSliderImage, br);
+            }
+            else
+            {
+                Office2010RangeChangePartColorTable ct = table.MinRangeSlider.Default;
+                if (!item.GetEnabled() && table.MinRangeSlider.Disabled != null)
+                    ct = table.MinRangeSlider.Disabled;
+                else if (item.MouseDownPart == eRangeSliderPart.MinRangeSlider && table.MinRangeSlider.Pressed != null)
+                    ct = table.MinRangeSlider.Pressed;
+                else if (item.MouseOverPart == eRangeSliderPart.MinRangeSlider && table.MinRangeSlider.MouseOver != null)
+                    ct = table.MinRangeSlider.MouseOver;
+                if (ct.Background != null)
+                    ct.Background.LinearGradientAngle = (item.SliderOrientation == eOrientation.Horizontal) ? 90 : 0;
+                Rectangle br = item.RangeButtonMinBounds;
+                br.Offset(item.Bounds.Location);
+                using (GraphicsPath sliderButtonPath = CreateMinSlider(br, item.TicksPosition, item.SliderOrientation))
+                {
+                    using (Brush brush = DisplayHelp.CreateBrush(br, ct.Background))
+                        g.FillPath(brush, sliderButtonPath);
+                    if (!ct.BorderLightColor.IsEmpty)
+                    {
+                        br.Inflate(-1, -1);
+                        using (GraphicsPath borderPath = CreateMinSlider(br, item.TicksPosition, item.SliderOrientation))
+                        {
+                            using (Pen pen = new Pen(ct.BorderLightColor, 1))
+                                g.DrawPath(pen, sliderButtonPath);
+                        }
+                    }
+                    if (!ct.BorderColor.IsEmpty)
+                    {
+                        using (Pen pen = new Pen(ct.BorderColor, 1))
+                            g.DrawPath(pen, sliderButtonPath);
+                    }
+                }
+            }
+
+            if (item.MaxRangeSliderImage != null)
+            {
+                Rectangle br = item.RangeButtonMaxBounds;
+                br.Offset(item.Bounds.Location);
+                g.DrawImage(item.MaxRangeSliderImage, br);
+            }
+            else
+            {
+                Office2010RangeChangePartColorTable ct = table.MaxRangeSlider.Default;
+                if (!item.GetEnabled() && table.MaxRangeSlider.Disabled != null)
+                    ct = table.MaxRangeSlider.Disabled;
+                else if (item.MouseDownPart == eRangeSliderPart.MaxRangeSlider && table.MaxRangeSlider.Pressed != null)
+                    ct = table.MaxRangeSlider.Pressed;
+                else if (item.MouseOverPart == eRangeSliderPart.MaxRangeSlider && table.MaxRangeSlider.MouseOver != null)
+                    ct = table.MaxRangeSlider.MouseOver;
+                if (ct.Background != null)
+                    ct.Background.LinearGradientAngle = (item.SliderOrientation == eOrientation.Horizontal) ? 90 : 0;
+                Rectangle br = item.RangeButtonMaxBounds;
+                br.Offset(item.Bounds.Location);
+                using (GraphicsPath sliderButtonPath = CreateMaxSlider(br, item.TicksPosition, item.SliderOrientation))
+                {
+                    using (Brush brush = DisplayHelp.CreateBrush(br, ct.Background))
+                        g.FillPath(brush, sliderButtonPath);
+                    if (!ct.BorderLightColor.IsEmpty)
+                    {
+                        br.Inflate(-1, -1);
+                        using (GraphicsPath borderPath = CreateMaxSlider(br, item.TicksPosition, item.SliderOrientation))
+                        {
+                            using (Pen pen = new Pen(ct.BorderLightColor, 1))
+                                g.DrawPath(pen, sliderButtonPath);
+                        }
+                    }
+                    if (!ct.BorderColor.IsEmpty)
+                    {
+                        using (Pen pen = new Pen(ct.BorderColor, 1))
+                            g.DrawPath(pen, sliderButtonPath);
+                    }
+                }
+
+                //using (GraphicsPath sliderButtonPath = CreateMaxSlider(item.RangeButtonMaxBounds, item.TicksPosition, item.SliderOrientation))
+                //{
+                //    g.FillPath(Brushes.Red, sliderButtonPath);
+                //    g.DrawPath(Pens.BlanchedAlmond, sliderButtonPath);
+                //}
+            }
+        }
+
+        private static void DrawHTicks(Graphics g, Office2010RangeSliderColorTable table, int min, int max, Rectangle ticksBounds, int steps)
+        {
+            SmoothingMode sm = g.SmoothingMode;
+            g.SmoothingMode = SmoothingMode.None;
+
+            if (ticksBounds.Width / 2 < Math.Abs(max - min) / steps)
+                steps = (int)Math.Max(2, Math.Ceiling(Math.Abs(max - min) / ((float)ticksBounds.Width / 2)));
+            int xstep = (int)RangeSliderItem.GetXStep(ticksBounds.Width, min, max, steps);
+            int x = ticksBounds.X;
+            using (Pen linePen = new Pen(table.TickLineColor))
+            {
+                for (int i = min; i <= max; i += steps)
+                {
+                    g.DrawLine(linePen, x, ticksBounds.Y, x, ticksBounds.Bottom - 1);
+                    x += xstep;
+                }
+            }
+            g.SmoothingMode = sm;
+        }
+        private static void DrawVTicks(Graphics g, Office2010RangeSliderColorTable table, int min, int max, Rectangle ticksBounds, int steps)
+        {
+            SmoothingMode sm = g.SmoothingMode;
+            g.SmoothingMode = SmoothingMode.None;
+            if (ticksBounds.Height / 2 < Math.Abs(max - min) / steps)
+                steps = Math.Max(2, Math.Abs(max - min) / (ticksBounds.Height / 2));
+            int y = ticksBounds.Y;
+            int  ystep = (int)RangeSliderItem.GetXStep(ticksBounds.Height, min, max, steps);
+            using (Pen linePen = new Pen(table.TickLineColor))
+            {
+                for (int i = min; i <= max; i += steps)
+                {
+                    g.DrawLine(linePen, ticksBounds.X, y, ticksBounds.Right - 1, y);
+                    y += ystep;
+                }
+            }
+            g.SmoothingMode = sm;
+        }
+
+        //private void PaintTrackPart(Office2010RangeChangePartColorTable ct, Rectangle r, Graphics g, eOrientation orientation, eDotNetBarStyle effectiveStyle)
+        //{
+        //    if (r.Width <= 0 || r.Height <= 0) return;
+
+        //    if (orientation == eOrientation.Vertical)
+        //    {
+        //        // Left
+        //        Matrix m = new Matrix();
+        //        m.RotateAt(-90, new PointF(r.X, r.Bottom));
+        //        m.Translate(r.Height, r.Width - r.Height, MatrixOrder.Append);
+        //        g.Transform = m;
+        //    }
+        //    if (StyleManager.IsMetro(effectiveStyle))
+        //    {
+        //        if (!ct.PartBackground.IsEmpty)
+        //        {
+        //            SmoothingMode sm = g.SmoothingMode;
+        //            g.SmoothingMode = SmoothingMode.Default;
+        //            Rectangle slideBounds = new Rectangle(r.X + (r.Width - 3) / 2, r.Y + 2, 3, r.Height - 4);
+        //            using (Brush brush = DisplayHelp.CreateBrush(slideBounds, ct.Background))
+        //            {
+        //                g.FillRectangle(brush, slideBounds);
+        //            }
+        //            g.SmoothingMode = sm;
+        //        }
+        //    }
+        //    else
+        //    {
+        //        using (GraphicsPath path = new GraphicsPath())
+        //        {
+        //            path.AddLine(r.X, r.Y, r.X + 11, r.Y);
+        //            path.AddLine(r.X + 11, r.Y, r.X + 11, r.Y + 9);
+        //            path.AddLine(r.X + 11, r.Y + 9, r.X + 6, r.Y + 15);
+        //            path.AddLine(r.X + 5, r.Y + 15, r.X, r.Y + 10);
+        //            path.CloseAllFigures();
+        //            using (SolidBrush brush = new SolidBrush(ct.BorderLightColor))
+        //                g.FillPath(brush, path);
+        //        }
+
+        //        SmoothingMode sm = g.SmoothingMode;
+        //        g.SmoothingMode = SmoothingMode.AntiAlias;
+        //        r.Offset(1, 1);
+        //        using (GraphicsPath path = new GraphicsPath())
+        //        {
+        //            path.AddLine(r.X, r.Y, r.X + 8, r.Y);
+        //            path.AddLine(r.X + 8, r.Y + 8, r.X + 4, r.Y + 12);
+        //            path.AddLine(r.X, r.Y + 8, r.X, r.Y);
+        //            path.CloseAllFigures();
+
+        //            if (ct.PartBackground.Colors.Count > 0)
+        //            {
+        //                using (Brush brush = DisplayHelp.CreateBrush(Rectangle.Ceiling(path.GetBounds()), ct.Background))
+        //                {
+        //                    g.FillPath(brush, path);
+        //                }
+        //            }
+
+        //            using (Pen pen = new Pen(ct.PartBorderColor, 1))
+        //                g.DrawPath(pen, path);
+        //        }
+
+        //        using (Pen pen = new Pen(Color.FromArgb(200, ct.PartForeColor), 1))
+        //            g.DrawLine(pen, r.X + 4, r.Y + 3, r.X + 4, r.Y + 8);
+
+        //        using (Pen pen = new Pen(ct.PartForeLightColor, 1))
+        //            g.DrawLine(pen, r.X + 5, r.Y + 4, r.X + 5, r.Y + 7);
+
+        //        g.SmoothingMode = sm;
+        //    }
+
+        //    if (orientation == eOrientation.Vertical)
+        //        g.ResetTransform();
+        //}
+
+        private GraphicsPath CreateMinSlider(Rectangle r, eTicksPosition position, eOrientation sliderOrientation)
+        {
+            GraphicsPath path = new GraphicsPath();
+            if (sliderOrientation == eOrientation.Horizontal)
+            {
+                if (position == eTicksPosition.Top)
+                {
+                    path.AddLine(r.Right, r.Y, r.Right, r.Bottom);
+                    path.AddLine(r.Right, r.Bottom, r.X, r.Bottom);
+                    path.AddLine(r.X, r.Bottom, r.X, r.Y + r.Width);
+                    path.CloseAllFigures();
+                }
+                else if (position == eTicksPosition.Bottom)
+                {
+                    path.AddLine(r.Right, r.Bottom, r.Right, r.Y);
+                    path.AddLine(r.Right, r.Y, r.X, r.Y);
+                    path.AddLine(r.X, r.Y, r.X, r.Bottom - r.Width);
+                    path.CloseAllFigures();
+                }
+                else
+                {
+                    path.AddRectangle(r);
+                }
+            }
+            else
+            {
+                if (position == eTicksPosition.Top)
+                {
+                    path.AddLine(r.X, r.Bottom, r.Right, r.Bottom);
+                    path.AddLine(r.Right, r.Bottom, r.Right, r.Y);
+                    path.AddLine(r.Right, r.Y, r.X + r.Height, r.Y);
+                    path.CloseAllFigures();
+                }
+                else if (position == eTicksPosition.Bottom)
+                {
+                    path.AddLine(r.Right, r.Bottom, r.X, r.Bottom);
+                    path.AddLine(r.X, r.Bottom, r.X, r.Y);
+                    path.AddLine(r.X, r.Y, r.Right - r.Height, r.Y);
+                    path.CloseAllFigures();
+                }
+                else
+                {
+                    path.AddRectangle(r);
+                }
+            }
+            return path;
+        }
+        private GraphicsPath CreateMaxSlider(Rectangle r, eTicksPosition position, eOrientation sliderOrientation)
+        {
+            GraphicsPath path = new GraphicsPath();
+
+            if (sliderOrientation == eOrientation.Horizontal)
+            {
+                if (position == eTicksPosition.Top)
+                {
+                    path.AddLine(r.X, r.Y, r.X, r.Bottom);
+                    path.AddLine(r.X, r.Bottom, r.Right, r.Bottom);
+                    path.AddLine(r.Right, r.Bottom, r.Right, r.Y + r.Width);
+                    path.CloseAllFigures();
+                }
+                else if (position == eTicksPosition.Bottom)
+                {
+                    path.AddLine(r.X, r.Bottom, r.X, r.Y);
+                    path.AddLine(r.X, r.Y, r.Right, r.Y);
+                    path.AddLine(r.Right, r.Y, r.Right, r.Bottom - r.Width);
+                    path.CloseAllFigures();
+                }
+                else
+                {
+                    path.AddRectangle(r);
+                }
+            }
+            else
+            {
+                if (position == eTicksPosition.Top)
+                {
+                    path.AddLine(r.X, r.Y, r.Right, r.Y);
+                    path.AddLine(r.Right, r.Y, r.Right, r.Bottom);
+                    path.AddLine(r.Right, r.Bottom, r.X + r.Height, r.Bottom);
+                    path.CloseAllFigures();
+                }
+                else if (position == eTicksPosition.Bottom)
+                {
+                    path.AddLine(r.Right, r.Y, r.X, r.Y);
+                    path.AddLine(r.X, r.Y, r.X, r.Bottom);
+                    path.AddLine(r.X, r.Bottom, r.Right - r.Height, r.Bottom);
+                    path.CloseAllFigures();
+                }
+                else
+                {
+                    path.AddRectangle(r);
+                }
+            }
+            return path;
+        }
+        protected virtual Office2010RangeSliderColorTable GetColorTable(RangeSliderItem item, System.Windows.Forms.Control container)
+        {
+            if (container == null)
+                return _ColorTable.RangeSlider;
+
+            Office2007ColorTable table = _ColorTable;
+
+            string key = Office2007ColorTable.GetContextualKey(typeof(Office2010RangeSliderColorTable), container.GetType());
+            object st = null;
+
+            if (container is Bar)
+            {
+                if (table.ContextualTables.TryGetValue(key + "+" + ((Bar)container).BarType.ToString(), out st))
+                    return (Office2010RangeSliderColorTable)st;
+            }
+
+            if (table.ContextualTables.TryGetValue(key, out st))
+                return (Office2010RangeSliderColorTable)st;
+
+            return _ColorTable.RangeSlider;
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/Office2010RibbonTabGroupPainter.cs b/PROMS/DotNetBar Source Code/Rendering/Office2010RibbonTabGroupPainter.cs
new file mode 100644
index 00000000..0e10f803
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/Office2010RibbonTabGroupPainter.cs	
@@ -0,0 +1,82 @@
+using System;
+using System.Text;
+using DevComponents.DotNetBar.Rendering;
+using System.Drawing.Drawing2D;
+using System.Drawing;
+using System.Runtime.InteropServices;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    internal class Office2010RibbonTabGroupPainter : Office2007RibbonTabGroupPainter
+    {
+        #region Internal Implementation
+        protected override void PaintTabGroupBackground(System.Drawing.Graphics g, Office2007RibbonTabGroupColorTable colorTable, System.Drawing.Rectangle bounds, System.Drawing.Rectangle groupBounds, bool glassEnabled)
+        {
+            if (colorTable == null)
+                return;
+
+            // Draw title rectangle part of the group
+            Rectangle r = bounds;
+            r.Height -= 2;
+
+            // GDI+ bug
+            Rectangle rFill = r;
+            rFill.Width--;
+            rFill.Height--;
+
+            // First draw background
+            DisplayHelp.FillRectangle(g, rFill, colorTable.Background);//.Start, colorTable.Background.End, 90, new float[] { 0f, 1f, 1f }, new float[] { 0f, .4f, 1f });
+
+            r = bounds;
+            SmoothingMode sm = g.SmoothingMode;
+            g.SmoothingMode = SmoothingMode.Default;
+
+            Rectangle rAll = groupBounds;
+
+            if (!colorTable.Border.IsEmpty)
+            {
+                r.Height += 18;
+                using (SolidBrush brush = new SolidBrush(colorTable.Border.Start))
+                {
+                    // Draw border top
+                    g.FillRectangle(brush, rAll.X+1, rAll.Y, rAll.Width-2, 4);
+                }
+
+                // Draw border ... Left first
+                DisplayHelp.FillRectangle(g, new Rectangle(rAll.X+1, r.Y, 1, r.Height), colorTable.Border);
+                // Then right
+                DisplayHelp.FillRectangle(g, new Rectangle(rAll.Right - 1, r.Y, 1, r.Height), colorTable.Border);
+                
+                using (Pen pen = new Pen(Color.FromArgb(92, Color.White)))
+                {
+                    g.DrawLine(pen, rAll.X, r.Y, rAll.X, r.Height - 2);
+                    g.DrawLine(pen, rAll.Right, r.Y, rAll.Right, r.Height - 2);
+                }
+            }
+            g.SmoothingMode = sm;
+        }
+
+        protected override ThemeTextFormat GetThemeFormat()
+        {
+            ThemeTextFormat tf = ThemeTextFormat.Center | ThemeTextFormat.EndEllipsis | ThemeTextFormat.Top | ThemeTextFormat.SingleLine;
+            return tf;
+        }
+        protected override eTextFormat GetTextFormat()
+        {
+            return eTextFormat.Top;
+        }
+        protected override Themes.RECT GetThemeTextBounds(Rectangle rect)
+        {
+            Themes.RECT bounds = new Themes.RECT(new Rectangle(0, 6, rect.Width, rect.Height - 6));
+            return bounds;
+        }
+        protected override Rectangle GetTextBounds(RibbonTabGroupRendererEventArgs e)
+        {
+            Rectangle r = e.Bounds;
+            r.Y += 6;
+            r.Height -= 6;
+            return r;
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/Office2010SilverFactory.cs b/PROMS/DotNetBar Source Code/Rendering/Office2010SilverFactory.cs
new file mode 100644
index 00000000..f7d415c8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/Office2010SilverFactory.cs	
@@ -0,0 +1,1913 @@
+using System;
+using System.Text;
+using System.Drawing;
+using DevComponents.DotNetBar.Controls;
+using DevComponents.DotNetBar.Schedule;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    internal static class Office2010SilverFactory
+    {
+        public static void InitializeColorTable(Office2007ColorTable table, ColorFactory factory)
+        {
+            #region RibbonControl Start Images
+            table.RibbonControl.StartButtonDefault = BarFunctions.LoadBitmap("SystemImages.BlankOffice2010NormalSilver.png");
+            table.RibbonControl.StartButtonMouseOver = BarFunctions.LoadBitmap("SystemImages.BlankOffice2010HotSilver.png");
+            table.RibbonControl.StartButtonPressed = BarFunctions.LoadBitmap("SystemImages.BlankOffice2010PressedSilver.png");
+            #endregion
+
+            #region RibbonControl
+            int editBorderColor = 0x8B9097;
+            table.RibbonControl.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xBABEC3), factory.GetColor(editBorderColor));
+            table.RibbonControl.InnerBorder = null; // new LinearGradientColorTable(factory.GetColor(0xFEFEFE), factory.GetColor(0xE5E9EE));
+            table.RibbonControl.TabsBackground = new LinearGradientColorTable(factory.GetColor(0xE3E6E8));
+            table.RibbonControl.TabsGlassBackground = new LinearGradientColorTable(Color.Transparent, factory.GetColor(0xFAFAFA));
+            table.RibbonControl.TabDividerBorder = Color.Empty; // factory.GetColor(0xA7BAD1);
+            table.RibbonControl.TabDividerBorderLight = Color.Empty; // factory.GetColor(0xF4F8FD);
+            table.RibbonControl.CornerSize = 1;
+            table.RibbonControl.PanelTopBackgroundHeight = 0;
+            table.RibbonControl.PanelTopBackground = new LinearGradientColorTable(factory.GetColor(0xFEFEFE), factory.GetColor(0xE5E9EE));
+            table.RibbonControl.PanelBottomBackground = null; // new LinearGradientColorTable(factory.GetColor(0xF6F7F8), factory.GetColor(0xE5E9EE));
+            #endregion
+
+            #region Item Group
+            table.ItemGroup.OuterBorder = LinearGradientColorTable.Empty; //new LinearGradientColorTable(factory.GetColor(0xC0C3C8));
+            table.ItemGroup.InnerBorder = LinearGradientColorTable.Empty;
+            table.ItemGroup.TopBackground = LinearGradientColorTable.Empty;
+            table.ItemGroup.BottomBackground = LinearGradientColorTable.Empty;
+            table.ItemGroup.ItemGroupDividerDark = Color.Empty;
+            table.ItemGroup.ItemGroupDividerLight = Color.Empty;
+            #endregion
+
+            #region RibbonBar
+            table.RibbonBar.Default = GetRibbonBar(factory);
+            table.RibbonBar.MouseOver = GetRibbonBarMouseOver(factory);
+            table.RibbonBar.Expanded = GetRibbonBarExpanded(factory);
+            #endregion
+
+            #region ButtonItem Colors Initialization
+            table.RibbonButtonItemColors.Clear();
+            table.ButtonItemColors.Clear();
+            table.MenuButtonItemColors.Clear();
+            // Orange
+            Office2007ButtonItemColorTable cb = GetButtonItemBlueOrange(factory);
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Orange);
+            table.ButtonItemColors.Add(cb);
+            // Orange with background
+            cb = GetButtonItemBlueOrangeWithBackground(factory);
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.OrangeWithBackground);
+            table.ButtonItemColors.Add(cb);
+            // Blue
+            cb = Office2007ColorTableFactory.GetButtonItemBlueBlue(factory);
+            cb.MouseOverSplitInactive = new Office2007ButtonItemStateColorTable();
+            cb.MouseOverSplitInactive.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xB1BAC4));
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Blue);
+            table.ButtonItemColors.Add(cb);
+            // Blue with background
+            cb = Office2007ColorTableFactory.GetButtonItemBlueBlueWithBackground(factory);
+            cb.MouseOverSplitInactive = new Office2007ButtonItemStateColorTable();
+            cb.MouseOverSplitInactive.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xB1BAC4));
+            cb.MouseOverSplitInactive = cb.Default;
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.BlueWithBackground);
+            table.ButtonItemColors.Add(cb);
+            // Magenta
+            cb = Office2007ColorTableFactory.GetButtonItemBlueMagenta(factory);
+            cb.MouseOverSplitInactive = new Office2007ButtonItemStateColorTable();
+            cb.MouseOverSplitInactive.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xB1BAC4));
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Magenta);
+            table.ButtonItemColors.Add(cb);
+            // Blue with background
+            cb = Office2007ColorTableFactory.GetButtonItemBlueMagentaWithBackground(factory);
+            cb.MouseOverSplitInactive = new Office2007ButtonItemStateColorTable();
+            cb.MouseOverSplitInactive.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xB1BAC4));
+            cb.MouseOverSplitInactive = cb.Default;
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.MagentaWithBackground);
+            table.ButtonItemColors.Add(cb);
+
+            cb = Office2010BlueFactory.GetButtonItemOffice2007WithBackground(factory);
+            cb.MouseOverSplitInactive = new Office2007ButtonItemStateColorTable();
+            cb.MouseOverSplitInactive.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xB1BAC4));
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Office2007WithBackground);
+            table.ButtonItemColors.Add(cb);
+
+            table.ButtonItemColors.Add(ButtonItemStaticColorTables.CreateBlueOrbColorTable(factory));
+
+            table.BackstageButtonItemColors.Clear();
+            table.BackstageButtonItemColors.Add(GetButtonItemBackstageDefault(factory));
+            #endregion
+
+            #region NavigationPane ButtonItem Initialization
+            table.NavigationPaneButtonItemColors.Clear();
+            table.NavigationPaneButtonItemColors.Add(GetNavigationPaneButtonItemTable(factory));
+            #endregion
+
+            #region RibbonTabItem Colors Initialization
+            table.RibbonTabItemColors.Clear();
+            Office2007RibbonTabItemColorTable rt = GetRibbonTabItemBlueDefault(factory);
+            rt.Name = Enum.GetName(typeof(eRibbonTabColor), eRibbonTabColor.Default);
+            table.RibbonTabItemColors.Add(rt);
+
+            // Magenta
+            rt = GetRibbonTabItemBlueMagenta(factory);
+            rt.CornerSize = 2;
+            rt.Name = Enum.GetName(typeof(eRibbonTabColor), eRibbonTabColor.Magenta);
+            table.RibbonTabItemColors.Add(rt);
+
+            // Green
+            rt = GetRibbonTabItemBlueGreen(factory);
+            rt.CornerSize = 2;
+            rt.Name = Enum.GetName(typeof(eRibbonTabColor), eRibbonTabColor.Green);
+            table.RibbonTabItemColors.Add(rt);
+
+            // Orange
+            rt = GetRibbonTabItemBlueOrange(factory);
+            rt.CornerSize = 2;
+            rt.Name = Enum.GetName(typeof(eRibbonTabColor), eRibbonTabColor.Orange);
+            table.RibbonTabItemColors.Add(rt);
+            #endregion
+
+            #region RibbonTabItemGroup Colors Initialization
+            table.RibbonTabGroupColors.Clear();
+            // Default
+            Office2007RibbonTabGroupColorTable tg = Office2010BlueFactory.GetRibbonTabGroupDefault(factory);
+            tg.Name = Enum.GetName(typeof(eRibbonTabGroupColor), eRibbonTabGroupColor.Default);
+            table.RibbonTabGroupColors.Add(tg);
+
+            // Magenta
+            tg = Office2010BlueFactory.GetRibbonTabGroupMagenta(factory);
+            tg.Name = Enum.GetName(typeof(eRibbonTabGroupColor), eRibbonTabGroupColor.Magenta);
+            table.RibbonTabGroupColors.Add(tg);
+
+            // Green
+            tg = Office2010BlueFactory.GetRibbonTabGroupGreen(factory);
+            tg.Name = Enum.GetName(typeof(eRibbonTabGroupColor), eRibbonTabGroupColor.Green);
+            table.RibbonTabGroupColors.Add(tg);
+
+            // Orange
+            tg = Office2010BlueFactory.GetRibbonTabGroupOrange(factory);
+            tg.Name = Enum.GetName(typeof(eRibbonTabGroupColor), eRibbonTabGroupColor.Orange);
+            table.RibbonTabGroupColors.Add(tg);
+            #endregion
+
+            #region Initialize Bar
+            table.Bar.ToolbarTopBackground = new LinearGradientColorTable(factory.GetColor(0xEBEDF0), factory.GetColor(0xEBEDF0));
+            table.Bar.ToolbarBottomBackground = new LinearGradientColorTable(factory.GetColor(0xEBEDF0), factory.GetColor(0xD5D8DC));
+            table.Bar.ToolbarBottomBorder = factory.GetColor(0x5B5B5B);
+            table.Bar.PopupToolbarBackground = new LinearGradientColorTable(factory.GetColor(0xFCFCFC), Color.Empty);
+            table.Bar.PopupToolbarBorder = factory.GetColor(0xA7ABB0);
+            table.Bar.StatusBarTopBorder = factory.GetColor(0x868B91);
+            table.Bar.StatusBarTopBorderLight = factory.GetColor(Color.FromArgb(148, Color.White));
+            table.Bar.StatusBarAltBackground.Clear();
+            table.Bar.StatusBarAltBackground.Add(new BackgroundColorBlend(factory.GetColor(0xEBEDF0), 0f));
+            table.Bar.StatusBarAltBackground.Add(new BackgroundColorBlend(factory.GetColor(0xD5D8DC), 1f));
+            #endregion
+
+            #region Menu
+            table.Menu.Background = new LinearGradientColorTable(factory.GetColor(0xFFFFFF), Color.Empty);
+            table.Menu.Border = new LinearGradientColorTable(factory.GetColor(0xA7ABB0), Color.Empty);
+            table.Menu.Side = new LinearGradientColorTable(factory.GetColor(0xFFFFFF), Color.Empty);
+            table.Menu.SideBorder = new LinearGradientColorTable(factory.GetColor(0xE2E4E7), Color.Empty);
+            table.Menu.SideBorderLight = new LinearGradientColorTable(factory.GetColor(0xF5F5F5), Color.Empty);
+            table.Menu.SideUnused = new LinearGradientColorTable(factory.GetColor(0xE5E5E5), Color.Empty);
+            table.Menu.FileBackgroundBlend.Clear();
+            table.Menu.FileBackgroundBlend.AddRange(new DevComponents.DotNetBar.BackgroundColorBlend[] {
+                new DevComponents.DotNetBar.BackgroundColorBlend(factory.GetColor(0xFFFFFF), 0F),
+                new DevComponents.DotNetBar.BackgroundColorBlend(factory.GetColor(0xFFFFFF), 1F)});
+            table.Menu.FileContainerBorder = factory.GetColor(0xA7ABB0);
+            table.Menu.FileContainerBorderLight = Color.Transparent;
+            table.Menu.FileColumnOneBackground = factory.GetColor(0xFFFFFF);
+            table.Menu.FileColumnOneBorder = factory.GetColor(0xA7ABB0);
+            table.Menu.FileColumnTwoBackground = factory.GetColor(0xFFFFFF);
+            table.Menu.FileBottomContainerBackgroundBlend.Clear();
+            //table.Menu.FileBottomContainerBackgroundBlend.AddRange(new DevComponents.DotNetBar.BackgroundColorBlend[] {
+            //    new DevComponents.DotNetBar.BackgroundColorBlend(factory.GetColor(0xEBF3FC), 0F),
+            //    new DevComponents.DotNetBar.BackgroundColorBlend(factory.GetColor(0xEBF3FC), 1F)});
+            #endregion
+
+            #region ComboBox
+            table.ComboBox.Default.Background = factory.GetColor(0xFFFFFF);
+            table.ComboBox.Default.Border = factory.GetColor(0xD4D6D9);
+            table.ComboBox.Default.ExpandBackground = new LinearGradientColorTable();
+            table.ComboBox.Default.ExpandBorderInner = new LinearGradientColorTable();
+            table.ComboBox.Default.ExpandBorderOuter = new LinearGradientColorTable();
+            table.ComboBox.Default.ExpandText = factory.GetColor(0x454F5A);
+            table.ComboBox.DefaultStandalone.Background = factory.GetColor(0xFFFFFF);
+            table.ComboBox.DefaultStandalone.Border = factory.GetColor(editBorderColor);
+            table.ComboBox.DefaultStandalone.ExpandBackground = new LinearGradientColorTable(factory.GetColor(0xFFFFFF), factory.GetColor(0xEDEFF1), 90);
+            table.ComboBox.DefaultStandalone.ExpandBorderInner = new LinearGradientColorTable(factory.GetColor(0xFFFFFF));
+            table.ComboBox.DefaultStandalone.ExpandBorderOuter = new LinearGradientColorTable(factory.GetColor(0xDEDFE0), Color.Empty, 90);
+            table.ComboBox.DefaultStandalone.ExpandText = factory.GetColor(0x454F5A);
+            table.ComboBox.MouseOver.Background = factory.GetColor(0xFFFFFF);
+            table.ComboBox.MouseOver.Border = factory.GetColor(0xA4A4A4);
+            table.ComboBox.MouseOver.ExpandBackground = new LinearGradientColorTable(factory.GetColor(0xFDE8D1), factory.GetColor(0xFFD168), 90);
+            table.ComboBox.MouseOver.ExpandBorderInner = new LinearGradientColorTable(factory.GetColor(0xFFFFFB), factory.GetColor(0xFFFCF3), 90);
+            table.ComboBox.MouseOver.ExpandBorderOuter = new LinearGradientColorTable(factory.GetColor(0xA4A4A4), Color.Empty, 90);
+            table.ComboBox.MouseOver.ExpandText = factory.GetColor(0x454F5A);
+            table.ComboBox.DroppedDown.Background = factory.GetColor(0xFFFFFF);
+            table.ComboBox.DroppedDown.Border = factory.GetColor(editBorderColor);
+            table.ComboBox.DroppedDown.ExpandBackground = new LinearGradientColorTable(factory.GetColor(0xE4C9A7), factory.GetColor(0xEFBC61), 90);
+            table.ComboBox.DroppedDown.ExpandBorderInner = new LinearGradientColorTable(factory.GetColor(0xD4C0A9), factory.GetColor(0xEFF1B9), 90);
+            table.ComboBox.DroppedDown.ExpandBorderOuter = new LinearGradientColorTable(factory.GetColor(0xC2923B), Color.Empty, 90);
+            table.ComboBox.DroppedDown.ExpandText = factory.GetColor(0x454F5A);
+            #endregion
+
+            #region Dialog Launcher
+            table.DialogLauncher.Default.DialogLauncher = factory.GetColor(0x6B737D);
+            table.DialogLauncher.Default.DialogLauncherShade = factory.GetColor(172, 0xFFFFFF);
+
+            table.DialogLauncher.MouseOver.DialogLauncher = factory.GetColor(0x989C9D);
+            table.DialogLauncher.MouseOver.DialogLauncherShade = Color.FromArgb(192, factory.GetColor(0xFFFFFF));
+            table.DialogLauncher.MouseOver.TopBackground = new LinearGradientColorTable(factory.GetColor(0xFDEEDE), factory.GetColor(0xFDE0BD));
+            table.DialogLauncher.MouseOver.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xFFD26F), factory.GetColor(0xFFF599));
+            table.DialogLauncher.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFEF9F3), factory.GetColor(0xFFFFF3));
+            table.DialogLauncher.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xFFB700), Color.Empty);
+
+            table.DialogLauncher.Pressed.DialogLauncher = factory.GetColor(0x6B737D);
+            table.DialogLauncher.Pressed.DialogLauncherShade = Color.FromArgb(128, factory.GetColor(0xFFFFFF));
+            table.DialogLauncher.Pressed.TopBackground = new LinearGradientColorTable(factory.GetColor(0xE4C8A5), factory.GetColor(0xEDC891));
+            table.DialogLauncher.Pressed.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xEEBC62), factory.GetColor(0xEEE48B));
+            table.DialogLauncher.Pressed.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xD4BFA8), factory.GetColor(0xEFF1C2));
+            table.DialogLauncher.Pressed.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xC2923B), factory.GetColor(0xC2B462));
+            #endregion
+
+            #region System Button, Form
+            // Default state no background
+            table.SystemButton.Default = new Office2007SystemButtonStateColorTable();
+            table.SystemButton.Default.Foreground = new LinearGradientColorTable(factory.GetColor(0xFAFAFA));
+            table.SystemButton.Default.LightShade = Color.Empty;
+            table.SystemButton.Default.DarkShade = factory.GetColor(0x525565);
+
+            // Mouse over state
+            table.SystemButton.MouseOver = new Office2007SystemButtonStateColorTable();
+            table.SystemButton.MouseOver.Foreground = new LinearGradientColorTable(factory.GetColor(0xFAFAFA));
+            table.SystemButton.MouseOver.LightShade = Color.Empty;
+            table.SystemButton.MouseOver.DarkShade = factory.GetColor(0x525565);
+            table.SystemButton.MouseOver.TopBackground = new LinearGradientColorTable(factory.GetColor(0xFFFFFF), factory.GetColor(0xF8F8F8));
+            table.SystemButton.MouseOver.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xF8F8F8), factory.GetColor(0xE7E8E9));
+            table.SystemButton.MouseOver.TopHighlight = null; // new LinearGradientColorTable(factory.GetColor(0xFBFCFF), Color.Transparent);
+            table.SystemButton.MouseOver.BottomHighlight = null; // new LinearGradientColorTable(factory.GetColor(0xFBFCFF), Color.Transparent);
+            table.SystemButton.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xA6ACB3));
+            table.SystemButton.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFFFFFF));
+
+            // Pressed
+            table.SystemButton.Pressed = new Office2007SystemButtonStateColorTable();
+            table.SystemButton.Pressed.Foreground = new LinearGradientColorTable(factory.GetColor(0xFAFAFA));
+            table.SystemButton.Pressed.LightShade = Color.Empty;
+            table.SystemButton.Pressed.DarkShade = factory.GetColor(0x525565);
+            table.SystemButton.Pressed.TopBackground = new LinearGradientColorTable(factory.GetColor(0xDFE4EB));
+            table.SystemButton.Pressed.TopHighlight = null;// new LinearGradientColorTable(factory.GetColor(0xB8CEE9), Color.Transparent);
+            table.SystemButton.Pressed.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xDFE4EB));
+            table.SystemButton.Pressed.BottomHighlight = null; // new LinearGradientColorTable(factory.GetColor(0xC6EAFD), Color.Transparent);
+            table.SystemButton.Pressed.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xFFFFFF));
+            table.SystemButton.Pressed.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xA6ACB3));
+
+            // CLOSE Default state no background
+            table.SystemButtonClose = new Office2007SystemButtonColorTable();
+            table.SystemButtonClose.Default = new Office2007SystemButtonStateColorTable();
+            table.SystemButtonClose.Default.Foreground = new LinearGradientColorTable(factory.GetColor(0xFAFAFA));
+            table.SystemButtonClose.Default.LightShade = Color.Empty;
+            table.SystemButtonClose.Default.DarkShade = factory.GetColor(0x525565);
+
+            // Mouse over state
+            table.SystemButtonClose.MouseOver = new Office2007SystemButtonStateColorTable();
+            table.SystemButtonClose.MouseOver.Foreground = new LinearGradientColorTable(factory.GetColor(0xFCD7D7));
+            table.SystemButtonClose.MouseOver.LightShade = Color.Empty;
+            table.SystemButtonClose.MouseOver.DarkShade = factory.GetColor(0x9B3D3D);
+            table.SystemButtonClose.MouseOver.TopBackground = new LinearGradientColorTable(factory.GetColor(0xFF8482), factory.GetColor(0xFB7F7E));
+            table.SystemButtonClose.MouseOver.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xF67979), factory.GetColor(0xE36162));
+            table.SystemButtonClose.MouseOver.TopHighlight = null; // new LinearGradientColorTable(factory.GetColor(0xFBFCFF), Color.Transparent);
+            table.SystemButtonClose.MouseOver.BottomHighlight = null; // new LinearGradientColorTable(factory.GetColor(0xFBFCFF), Color.Transparent);
+            table.SystemButtonClose.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x9B3D3D));
+            table.SystemButtonClose.MouseOver.InnerBorder = LinearGradientColorTable.Empty;
+
+            // Pressed
+            table.SystemButtonClose.Pressed = new Office2007SystemButtonStateColorTable();
+            table.SystemButtonClose.Pressed.Foreground = new LinearGradientColorTable(factory.GetColor(0xF8D4D5));
+            table.SystemButtonClose.Pressed.LightShade = Color.Empty;
+            table.SystemButtonClose.Pressed.DarkShade = factory.GetColor(0x9B3D3D);
+            table.SystemButtonClose.Pressed.TopBackground = new LinearGradientColorTable(factory.GetColor(0xF27776));
+            table.SystemButtonClose.Pressed.TopHighlight = null;// new LinearGradientColorTable(factory.GetColor(0xB8CEE9), Color.Transparent);
+            table.SystemButtonClose.Pressed.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xF27776));
+            table.SystemButtonClose.Pressed.BottomHighlight = null; // new LinearGradientColorTable(factory.GetColor(0xC6EAFD), Color.Transparent);
+            table.SystemButtonClose.Pressed.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x9B3D3D));
+            table.SystemButtonClose.Pressed.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xDA6163));
+
+            // Form border
+            table.Form.Active.BorderColors = new Color[] {
+                factory.GetColor(0x656D75),
+                factory.GetColor(0xFFFFFF),
+                factory.GetColor(0xE3E6E8),
+                factory.GetColor(0xE3E6E8),
+                factory.GetColor(0xE3E6E8)
+            };
+
+            table.Form.Inactive.BorderColors = new Color[] {
+                factory.GetColor(0x868B91),
+                factory.GetColor(0xFCFCFC),
+                factory.GetColor(0xFCFCFC),
+                factory.GetColor(0xFAFAFA),
+                factory.GetColor(0xFAFAFA)
+            };
+
+            // Form Caption Active
+            table.Form.Active.CaptionTopBackground = new LinearGradientColorTable(factory.GetColor(0xEBEDF0), factory.GetColor(0xE9EBEE));
+            table.Form.Active.CaptionBottomBackground = new LinearGradientColorTable(factory.GetColor(0xE9EBEE), factory.GetColor(0xE3E6E8));
+            table.Form.Active.CaptionBottomBorder = new Color[] { factory.GetColor(0x6B7B84), factory.GetColor(0xFFFFFF) };
+            table.Form.Active.CaptionText = factory.GetColor(0x2E2E2E);
+            table.Form.Active.CaptionTextExtra = factory.GetColor(0x454F5A);
+
+            // Form Caption Inactive
+            table.Form.Inactive.CaptionTopBackground = new LinearGradientColorTable(factory.GetColor(0xFCFCFC));
+            table.Form.Inactive.CaptionBottomBackground = new LinearGradientColorTable(factory.GetColor(0xFCFCFC));
+            table.Form.Inactive.CaptionText = factory.GetColor(0x8A8A8A);
+            table.Form.Inactive.CaptionTextExtra = factory.GetColor(0x8A8A8A);
+
+            table.Form.BackColor = factory.GetColor(0xE0E4E9);
+            table.Form.TextColor = factory.GetColor(0x2E2E2E);
+            table.Form.MdiClientBackgroundImage = BarFunctions.LoadBitmap("SystemImages.Office2010SilverClientBackground.png");
+            #endregion
+
+            #region Quick Access Toolbar Background
+            table.QuickAccessToolbar.Active.TopBackground = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(0xDEE7F4), factory.GetColor(0xE6EEF9));
+            table.QuickAccessToolbar.Active.BottomBackground = LinearGradientColorTable.Empty; //new LinearGradientColorTable(factory.GetColor(0xDBE7F7), factory.GetColor(0xC9D9EE));
+            table.QuickAccessToolbar.Active.OutterBorderColor = Color.Empty; // factory.GetColor(0xF6F9FC);
+            table.QuickAccessToolbar.Active.MiddleBorderColor = Color.Empty; // factory.GetColor(0x9AB3D5);
+            table.QuickAccessToolbar.Active.InnerBorderColor = Color.Empty; //  factory.GetColor(0xD2E3F9);
+
+            table.QuickAccessToolbar.Inactive.TopBackground = LinearGradientColorTable.Empty; //new LinearGradientColorTable(factory.GetColor(0xE6ECF3), factory.GetColor(0xCED8E6));
+            table.QuickAccessToolbar.Inactive.BottomBackground = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(0xCED8E6), factory.GetColor(0xC8D3E3));
+            table.QuickAccessToolbar.Inactive.OutterBorderColor = Color.Empty; // factory.GetColor(0xF6F9FC);
+            table.QuickAccessToolbar.Inactive.MiddleBorderColor = Color.Empty; // factory.GetColor(0x9AB3D5);
+            table.QuickAccessToolbar.Inactive.InnerBorderColor = Color.Empty;
+
+            table.QuickAccessToolbar.Standalone.TopBackground = new LinearGradientColorTable();
+            table.QuickAccessToolbar.Standalone.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xDADFE6));
+            table.QuickAccessToolbar.Standalone.OutterBorderColor = factory.GetColor(0x98A1AB);
+            table.QuickAccessToolbar.Standalone.MiddleBorderColor = Color.Empty;
+            table.QuickAccessToolbar.Standalone.InnerBorderColor = Color.Empty; // factory.GetColor(0xDCE8F7);
+
+            table.QuickAccessToolbar.QatCustomizeMenuLabelBackground = factory.GetColor(0xF0F2F5);
+            table.QuickAccessToolbar.QatCustomizeMenuLabelText = factory.GetColor(0x4C535C);
+
+            table.QuickAccessToolbar.Active.GlassBorder = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(Color.FromArgb(132, Color.Black)), Color.FromArgb(80, Color.Black));
+            table.QuickAccessToolbar.Inactive.GlassBorder = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(Color.FromArgb(132, Color.Black)), Color.FromArgb(80, Color.Black));
+            #endregion
+
+            #region Tab Colors
+            table.TabControl.Default = new Office2007TabItemStateColorTable();
+            table.TabControl.Default.TopBackground = new LinearGradientColorTable(factory.GetColor(0xEFF1F3), factory.GetColor(0xE1E4E9));
+            table.TabControl.Default.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xEDEFF2), factory.GetColor(0xEFF1F3));
+            table.TabControl.Default.InnerBorder = factory.GetColor(0xDFE3E8);
+            table.TabControl.Default.OuterBorder = factory.GetColor(0x7F8388);
+            table.TabControl.Default.Text = factory.GetColor(0x4D5359);
+
+            table.TabControl.MouseOver = new Office2007TabItemStateColorTable();
+            table.TabControl.MouseOver.TopBackground = new LinearGradientColorTable(factory.GetColor(0xDFE3E8), factory.GetColor(0xF7F8F9));
+            table.TabControl.MouseOver.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xF7F8F9), factory.GetColor(0xFEFEFF));
+            table.TabControl.MouseOver.InnerBorder = factory.GetColor(0xF3F4F6);
+            table.TabControl.MouseOver.OuterBorder = factory.GetColor(0x868B91);
+            table.TabControl.MouseOver.Text = factory.GetColor(0x4D5359);
+
+            table.TabControl.Selected = new Office2007TabItemStateColorTable();
+            table.TabControl.Selected.TopBackground = new LinearGradientColorTable(factory.GetColor(0xE2E6EB), factory.GetColor(0xF9FAFB));
+            table.TabControl.Selected.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xF9FAFB), factory.GetColor(0xFFFFFF));
+            table.TabControl.Selected.InnerBorder = factory.GetColor(0xDFE3E8);
+            table.TabControl.Selected.OuterBorder = factory.GetColor(0x7F8388);
+            table.TabControl.Selected.Text = factory.GetColor(0x4D5359);
+
+            table.TabControl.TabBackground = new LinearGradientColorTable(factory.GetColor(0xE5E9ED), Color.Empty);
+            table.TabControl.TabPanelBackground = new LinearGradientColorTable(factory.GetColor(0xFFFFFF), Color.Empty);
+            table.TabControl.TabPanelBorder = factory.GetColor(0x4D5359);
+            #endregion
+
+            #region CheckBoxItem
+            Office2007CheckBoxColorTable chk = table.CheckBoxItem;
+            chk.Default.CheckBackground = new LinearGradientColorTable(factory.GetColor(0xF2F3F5), Color.Empty);
+            chk.Default.CheckBorder = factory.GetColor(0x898B8C);
+            chk.Default.CheckInnerBackground = new LinearGradientColorTable(factory.GetColor(0xE8E9EB), factory.GetColor(0xF2F2F3));
+            chk.Default.CheckInnerBorder = factory.GetColor(0xB6B8BA);
+            chk.Default.CheckSign = new LinearGradientColorTable(factory.GetColor(0x717374), Color.Empty);
+            chk.Default.Text = factory.GetColor(0x2E2E2E);
+
+            chk.MouseOver.CheckBackground = new LinearGradientColorTable(factory.GetColor(0xFCF1C2), Color.Empty);
+            chk.MouseOver.CheckBorder = factory.GetColor(0xCF9037);
+            chk.MouseOver.CheckInnerBackground = new LinearGradientColorTable(factory.GetColor(0xFAECC8), factory.GetColor(0xFCF3DD));
+            chk.MouseOver.CheckInnerBorder = factory.GetColor(0xFCAD5D);
+            chk.MouseOver.CheckSign = new LinearGradientColorTable(factory.GetColor(0x4B4944), Color.Empty);
+            chk.MouseOver.Text = factory.GetColor(0x2E2E2E);
+
+            chk.Pressed.CheckBackground = new LinearGradientColorTable(factory.GetColor(0xFCE7BD));
+            chk.Pressed.CheckBorder = factory.GetColor(0xC26D1D);
+            chk.Pressed.CheckInnerBackground = new LinearGradientColorTable(factory.GetColor(0xFAE0A2), factory.GetColor(0xFDF2D7));
+            chk.Pressed.CheckInnerBorder = factory.GetColor(0xFCA558);
+            chk.Pressed.CheckSign = new LinearGradientColorTable(factory.GetColor(0x4B4944), Color.Empty);
+            chk.Pressed.Text = factory.GetColor(0x2E2E2E);
+
+            chk.Disabled.CheckBackground = new LinearGradientColorTable(factory.GetColor(0xFFFFFF), Color.Empty);
+            chk.Disabled.CheckBorder = factory.GetColor(0xB6B8BA);
+            chk.Disabled.CheckInnerBackground = new LinearGradientColorTable(factory.GetColor(0xF8F8F9));
+            chk.Disabled.CheckInnerBorder = factory.GetColor(0xDFE0E0);
+            chk.Disabled.CheckSign = new LinearGradientColorTable(factory.GetColor(0xB1B3B4), Color.Empty);
+            chk.Disabled.Text = factory.GetColor(0x8D8D8D);
+            #endregion
+
+            #region Scroll Bar Colors
+            InitializeScrollBarColorTable(table, factory);
+            InitializeAppBlueScrollBarColorTable(table, factory);
+            #endregion
+
+            #region ProgressBarItem
+            Office2007ProgressBarColorTable pct = table.ProgressBarItem;
+            pct.BackgroundColors = new GradientColorTable(0xEBEDF0, 0xD5D8DC);
+            pct.OuterBorder = factory.GetColor(0x868B91);
+            pct.InnerBorder = factory.GetColor(0xFFFFFF);
+            pct.Chunk = new GradientColorTable(0x69922A, 0xE7F2D4, 0);
+            pct.ChunkOverlay = new GradientColorTable();
+            pct.ChunkOverlay.LinearGradientAngle = 90;
+            pct.ChunkOverlay.Colors.AddRange(new BackgroundColorBlend[] {
+                new BackgroundColorBlend(Color.FromArgb(192, factory.GetColor(0xEEFFD7)), 0f),
+                new BackgroundColorBlend(Color.FromArgb(128, factory.GetColor(0x8DB254)), .5f),
+                new BackgroundColorBlend(Color.FromArgb(64, factory.GetColor(0x69922B)), .5f),
+                new BackgroundColorBlend(Color.Transparent, 1f),
+            });
+            pct.ChunkShadow = new GradientColorTable(0xB2B9C8, 0xD5DAE5, 0);
+
+            // Paused State
+            pct = table.ProgressBarItemPaused;
+            pct.BackgroundColors = new GradientColorTable(0xEBEDF0, 0xD5D8DC);
+            pct.OuterBorder = factory.GetColor(0x868B91);
+            pct.InnerBorder = factory.GetColor(0xFFFFFF);
+            pct.Chunk = new GradientColorTable(0xAEA700, 0xFFFDCD, 0);
+            pct.ChunkOverlay = new GradientColorTable();
+            pct.ChunkOverlay.LinearGradientAngle = 90;
+            pct.ChunkOverlay.Colors.AddRange(new BackgroundColorBlend[] {
+                new BackgroundColorBlend(Color.FromArgb(192, factory.GetColor(0xFFFBA3)), 0f),
+                new BackgroundColorBlend(Color.FromArgb(128, factory.GetColor(0xD2CA00)), .5f),
+                new BackgroundColorBlend(Color.FromArgb(64, factory.GetColor(0xFEF400)), .5f),
+                new BackgroundColorBlend(Color.Transparent, 1f),
+            });
+            pct.ChunkShadow = new GradientColorTable(0xB2B9C8, 0xD5DAE5, 0);
+
+            // Error State
+            pct = table.ProgressBarItemError;
+            pct.BackgroundColors = new GradientColorTable(0xEBEDF0, 0xD5D8DC);
+            pct.OuterBorder = factory.GetColor(0x868B91);
+            pct.InnerBorder = factory.GetColor(0xFFFFFF);
+            pct.Chunk = new GradientColorTable(0xD20000, 0xFFCDCD, 0);
+            pct.ChunkOverlay = new GradientColorTable();
+            pct.ChunkOverlay.LinearGradientAngle = 90;
+            pct.ChunkOverlay.Colors.AddRange(new BackgroundColorBlend[] {
+                new BackgroundColorBlend(Color.FromArgb(192, factory.GetColor(0xFF8F8F)), 0f),
+                new BackgroundColorBlend(Color.FromArgb(128, factory.GetColor(0xD20000)), .5f),
+                new BackgroundColorBlend(Color.FromArgb(64, factory.GetColor(0xFE0000)), .5f),
+                new BackgroundColorBlend(Color.Transparent, 1f),
+            });
+            pct.ChunkShadow = new GradientColorTable(0xB2B9C8, 0xD5DAE5, 0);
+            #endregion
+
+            #region Gallery
+            Office2007GalleryColorTable gallery = table.Gallery;
+            gallery.GroupLabelBackground = factory.GetColor(0xF0F2F5);
+            gallery.GroupLabelText = factory.GetColor(0x4C535C);
+            gallery.GroupLabelBorder = factory.GetColor(0xF0F2F5);
+            #endregion
+
+            #region Legacy Colors
+            table.LegacyColors.BarBackground = factory.GetColor(0xFEFEFE);
+            table.LegacyColors.BarBackground2 = factory.GetColor(0xE5E9EE);
+            table.LegacyColors.BarStripeColor = factory.GetColor(0xBABEC3);
+            table.LegacyColors.BarCaptionBackground = factory.GetColor(0xACB5BF);
+            table.LegacyColors.BarCaptionBackground2 = Color.Empty;
+            table.LegacyColors.BarCaptionInactiveBackground = factory.GetColor(0xDADFE6);
+            table.LegacyColors.BarCaptionInactiveBackground2 = Color.Empty;
+            table.LegacyColors.BarCaptionInactiveText = factory.GetColor(0x565F6D);
+            table.LegacyColors.BarCaptionText = factory.GetColor(0x2E2E2E);
+            table.LegacyColors.BarFloatingBorder = factory.GetColor(0x8D949D);
+            table.LegacyColors.BarPopupBackground = factory.GetColor(0xFFFFFF);
+            table.LegacyColors.BarPopupBorder = factory.GetColor(0xA7ABB0);
+            table.LegacyColors.ItemBackground = Color.Empty;
+            table.LegacyColors.ItemBackground2 = Color.Empty;
+            table.LegacyColors.ItemCheckedBackground = factory.GetColor(0xFCD578);
+            table.LegacyColors.ItemCheckedBackground2 = factory.GetColor(0xFBC84F);
+            table.LegacyColors.ItemCheckedBorder = factory.GetColor(0xBB5503);
+            table.LegacyColors.ItemCheckedText = factory.GetColor(0x000000);
+            table.LegacyColors.ItemDisabledBackground = Color.Empty;
+            table.LegacyColors.ItemDisabledText = factory.GetColor(0x8D8D8D);
+            table.LegacyColors.ItemExpandedShadow = Color.Empty;
+            table.LegacyColors.ItemExpandedBackground = factory.GetColor(0xE3EFFE);
+            table.LegacyColors.ItemExpandedBackground2 = factory.GetColor(0x99BFF0);
+            table.LegacyColors.ItemExpandedText = factory.GetColor(0x000000);
+            table.LegacyColors.ItemHotBackground = factory.GetColor(0xFFF5CC);
+            table.LegacyColors.ItemHotBackground2 = factory.GetColor(0xFFDB75);
+            table.LegacyColors.ItemHotBorder = factory.GetColor(0xFFBD69);
+            table.LegacyColors.ItemHotText = factory.GetColor(0x2E2E2E);
+            table.LegacyColors.ItemPressedBackground = factory.GetColor(0xFC973D);
+            table.LegacyColors.ItemPressedBackground2 = factory.GetColor(0xFFB85E);
+            table.LegacyColors.ItemPressedBorder = factory.GetColor(0xFB8C3C);
+            table.LegacyColors.ItemPressedText = factory.GetColor(0x2E2E2E);
+            table.LegacyColors.ItemSeparator = factory.GetColor(0x868B91);
+            table.LegacyColors.ItemSeparatorShade = Color.FromArgb(192, factory.GetColor(0xFDFDFE));
+            table.LegacyColors.ItemText = factory.GetColor(0x2E2E2E); // SystemColors.ControlTet;
+            table.LegacyColors.MenuBackground = factory.GetColor(0xFFFFFF);
+            table.LegacyColors.MenuBackground2 = Color.Empty; // Color.White;
+            table.LegacyColors.MenuBarBackground = factory.GetColor(0xF6F6F6);
+            table.LegacyColors.MenuBorder = factory.GetColor(0xA7ABB0);
+            table.LegacyColors.ItemExpandedBorder = table.LegacyColors.MenuBorder;
+            table.LegacyColors.MenuSide = factory.GetColor(0xFFFFFF);
+            table.LegacyColors.MenuSide2 = Color.Empty; // factory.GetColor(0xDDE0E8);
+            table.LegacyColors.MenuUnusedBackground = table.LegacyColors.MenuBackground;
+            table.LegacyColors.MenuUnusedSide = factory.GetColor(0xDADADA);
+            table.LegacyColors.MenuUnusedSide2 = Color.Empty;// System.Windows.Forms.ControlPaint.Light(table.LegacyColors.MenuSide2);
+            table.LegacyColors.ItemDesignTimeBorder = Color.Black;
+            table.LegacyColors.BarDockedBorder = factory.GetColor(0x868B91);
+            table.LegacyColors.DockSiteBackColor = factory.GetColor(0xDCE2E8);
+            table.LegacyColors.DockSiteBackColor2 = Color.Empty;
+            table.LegacyColors.CustomizeBackground = factory.GetColor(0xDCE2E8);
+            table.LegacyColors.CustomizeBackground2 = factory.GetColor(0x98A1AB);
+            table.LegacyColors.CustomizeText = factory.GetColor(0x000000);
+            table.LegacyColors.PanelBackground = factory.GetColor(0xFEFEFE);
+            table.LegacyColors.PanelBackground2 = factory.GetColor(0xE5E9EE);
+            //table.LegacyColors.PanelBackground = factory.GetColor(0xDCE0E5);
+            //table.LegacyColors.PanelBackground2 = Color.Empty;
+            table.LegacyColors.PanelText = factory.GetColor(0x2E2E2E);
+            table.LegacyColors.PanelBorder = factory.GetColor(0x98A1AB);
+            table.LegacyColors.ExplorerBarBackground = factory.GetColor(0xDCE2E8);
+            table.LegacyColors.ExplorerBarBackground2 = factory.GetColor(0xEBEDF0);
+            table.LegacyColors.SplitterBackground = factory.GetColor(0xF7FBFF);
+            table.LegacyColors.SplitterBackground2 = factory.GetColor(0xC4C8CC);
+            table.LegacyColors.SplitterBorder = factory.GetColor(0xA4ABB2);
+            table.LegacyColors.SplitterText = table.LegacyColors.SplitterBorder;
+            #endregion
+
+            #region Navigation Pane
+            table.NavigationPane.ButtonBackground = new GradientColorTable();
+            table.NavigationPane.ButtonBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xE0E4E9), 0));
+            #endregion
+
+            #region SuperTooltip
+            table.SuperTooltip.BackgroundColors = new LinearGradientColorTable(factory.GetColor(0xFFFFFF), factory.GetColor(0xE4E4F0));
+            table.SuperTooltip.TextColor = factory.GetColor(0x4C4C4C);
+            #endregion
+
+            #region Slider
+            Office2007SliderColorTable sl = table.Slider;
+            sl.Default.LabelColor = factory.GetColor(0x7F8994);
+            sl.Default.SliderLabelColor = factory.GetColor(0x2E2E2E);
+            sl.Default.PartBackground = new GradientColorTable();
+            sl.Default.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xF6F7F8), 0));
+            sl.Default.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xF5F7F9), .5f));
+            sl.Default.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xF5F7F9), .5f));
+            sl.Default.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xD2D5D9), 1f));
+            sl.Default.PartBorderColor = factory.GetColor(0x7F8994);
+            sl.Default.PartBorderLightColor = Color.FromArgb(96, factory.GetColor(0xFFFFFF));
+            sl.Default.PartForeColor = factory.GetColor(0x4E5052);
+            sl.Default.PartForeLightColor = Color.Empty;
+            sl.Default.TrackLineColor = factory.GetColor(0x252525);
+            sl.Default.TrackLineLightColor = factory.GetColor(0xCCCCCC);
+
+            sl.MouseOver.LabelColor = factory.GetColor(0x7F8994);
+            sl.MouseOver.SliderLabelColor = factory.GetColor(0x2E2E2E);
+            sl.MouseOver.PartBackground = new GradientColorTable();
+            sl.MouseOver.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFFFFFF), 0));
+            sl.MouseOver.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFFFDF5), .2f));
+            sl.MouseOver.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFFDF83), .5f));
+            sl.MouseOver.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xDDA70D), .5f));
+            sl.MouseOver.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFFF4CE), .85f));
+            sl.MouseOver.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFFF4CE), 1f));
+            sl.MouseOver.PartBorderColor = factory.GetColor(0x7F8994);
+            sl.MouseOver.PartBorderLightColor = Color.FromArgb(96, factory.GetColor(0xFFFFFF));
+            sl.MouseOver.PartForeColor = factory.GetColor(0x4E5052);
+            sl.MouseOver.PartForeLightColor = Color.Empty;
+            sl.MouseOver.TrackLineColor = factory.GetColor(0x252525);
+            sl.MouseOver.TrackLineLightColor = factory.GetColor(0xCCCCCC);
+
+            sl.Pressed.LabelColor = factory.GetColor(0x7F8994);
+            sl.Pressed.SliderLabelColor = factory.GetColor(0x2E2E2E);
+            sl.Pressed.PartBackground = new GradientColorTable();
+            sl.Pressed.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xDB7518), 0));
+            sl.Pressed.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xF7902F), .2f));
+            sl.Pressed.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xF9C18B), .5f));
+            sl.Pressed.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xED7400), .5f));
+            sl.Pressed.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFFC188), .85f));
+            sl.Pressed.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xF2D2B5), 1f));
+            sl.Pressed.PartBorderColor = factory.GetColor(0x7F8994);
+            sl.Pressed.PartBorderLightColor = Color.FromArgb(96, factory.GetColor(0xFFFFFF));
+            sl.Pressed.PartForeColor = factory.GetColor(0x4E5052);
+            sl.Pressed.PartForeLightColor = Color.Empty;
+            sl.Pressed.TrackLineColor = factory.GetColor(0x252525);
+            sl.Pressed.TrackLineLightColor = factory.GetColor(0xCCCCCC);
+
+            ColorBlendFactory df = new ColorBlendFactory(ColorScheme.GetColor(0xCFCFCF));
+            sl.Disabled.LabelColor = factory.GetColor(0x8D8D8D);
+            sl.Disabled.SliderLabelColor = factory.GetColor(0x8D8D8D);
+            sl.Disabled.PartBackground = new GradientColorTable();
+            foreach (BackgroundColorBlend b in sl.Default.PartBackground.Colors)
+                sl.Disabled.PartBackground.Colors.Add(new BackgroundColorBlend(df.GetColor(b.Color), b.Position));
+            sl.Disabled.PartBorderColor = df.GetColor(sl.Default.PartBorderColor);
+            sl.Disabled.PartBorderLightColor = df.GetColor(sl.Default.PartBorderLightColor);
+            sl.Disabled.PartForeColor = df.GetColor(sl.Default.PartForeColor);
+            sl.Disabled.PartForeLightColor = df.GetColor(sl.Default.PartForeLightColor);
+            sl.Disabled.TrackLineColor = df.GetColor(sl.Default.TrackLineColor);
+            sl.Disabled.TrackLineLightColor = df.GetColor(sl.Default.TrackLineLightColor);
+            #endregion
+
+            #region RangeSlider
+            Office2007ColorTable.InitRangeSlider(table, factory);
+            #endregion
+
+            #region ListViewEx
+            table.ListViewEx.Border = factory.GetColor(editBorderColor);
+            table.ListViewEx.ColumnBackground = new LinearGradientColorTable(factory.GetColor(0xFFFFFF), factory.GetColor(0xDCE2E8));
+            table.ListViewEx.ColumnSeparator = factory.GetColor(0x868B91);
+            table.ListViewEx.ColumnForeColor = factory.GetColor(0x2E2E2E);
+            table.ListViewEx.SelectionBackground = new LinearGradientColorTable(factory.GetColor(0xA7CDF0), Color.Empty);
+            table.ListViewEx.SelectionBorder = factory.GetColor(0xE3EFFF);
+            #endregion
+
+            #region DataGridView
+            table.DataGridView.ColumnHeaderNormalBorder = factory.GetColor(0x868B91);
+            table.DataGridView.ColumnHeaderNormalBackground = new LinearGradientColorTable(factory.GetColor(0xEBEDF0), factory.GetColor(0xD5D8DC), 90);
+            table.DataGridView.ColumnHeaderSelectedBackground = new LinearGradientColorTable(factory.GetColor(0xF9D99F), factory.GetColor(0xF1C15F), 90);
+            table.DataGridView.ColumnHeaderSelectedBorder = factory.GetColor(0xF29536);
+            table.DataGridView.ColumnHeaderSelectedMouseOverBackground = new LinearGradientColorTable(factory.GetColor(0xFFD58D), factory.GetColor(0xF2923A), 90);
+            table.DataGridView.ColumnHeaderSelectedMouseOverBorder = factory.GetColor(0xF29536);
+            table.DataGridView.ColumnHeaderMouseOverBackground = new LinearGradientColorTable(factory.GetColor(0xDFE2E4), factory.GetColor(0xBCC5D2), 90);
+            table.DataGridView.ColumnHeaderMouseOverBorder = factory.GetColor(0x879FB7);
+            table.DataGridView.ColumnHeaderPressedBackground = new LinearGradientColorTable(factory.GetColor(0xBCC5D2), factory.GetColor(0xDFE2E4), 90);
+            table.DataGridView.ColumnHeaderPressedBorder = factory.GetColor(0xFFFFFF);
+
+            table.DataGridView.RowNormalBackground = new LinearGradientColorTable(factory.GetColor(0xEBEDF0));
+            table.DataGridView.RowNormalBorder = factory.GetColor(0x868B91);
+            table.DataGridView.RowSelectedBackground = new LinearGradientColorTable(factory.GetColor(0xFFD58D));
+            table.DataGridView.RowSelectedBorder = factory.GetColor(0xF29536);
+            table.DataGridView.RowSelectedMouseOverBackground = new LinearGradientColorTable(factory.GetColor(0xF1C05C));
+            table.DataGridView.RowSelectedMouseOverBorder = factory.GetColor(0xF29536);
+            table.DataGridView.RowMouseOverBackground = new LinearGradientColorTable(factory.GetColor(0xF1C05C));
+            table.DataGridView.RowMouseOverBorder = factory.GetColor(0xF29536);
+            table.DataGridView.RowPressedBackground = new LinearGradientColorTable(factory.GetColor(0xBBC4D1));
+            table.DataGridView.RowPressedBorder = factory.GetColor(0xFFFFFF);
+
+            table.DataGridView.GridColor = factory.GetColor(0xAAAAAA);
+
+            table.DataGridView.SelectorBackground = new LinearGradientColorTable(factory.GetColor(0xC6C6C6));
+            table.DataGridView.SelectorBorder = factory.GetColor(0x909192);
+            table.DataGridView.SelectorBorderDark = factory.GetColor(0xC3C3C3);
+            table.DataGridView.SelectorBorderLight = factory.GetColor(0xF9F9F9);
+            table.DataGridView.SelectorSign = new LinearGradientColorTable(factory.GetColor(0xF2F2F2));
+
+            table.DataGridView.SelectorMouseOverBackground = new LinearGradientColorTable(factory.GetColor(0x8BA0B5));
+            table.DataGridView.SelectorMouseOverBorder = factory.GetColor(0x9EB6CE);
+            table.DataGridView.SelectorMouseOverBorderDark = factory.GetColor(0xB0CFF7);
+            table.DataGridView.SelectorMouseOverBorderLight = factory.GetColor(0xD5E4F2);
+            table.DataGridView.SelectorMouseOverSign = new LinearGradientColorTable(factory.GetColor(0xF9FAFB), factory.GetColor(0xD7DAE2));
+            #endregion
+
+            #region SideBar
+            table.SideBar.Background = new LinearGradientColorTable(factory.GetColor(Color.White));
+            table.SideBar.Border = factory.GetColor(editBorderColor);
+            table.SideBar.SideBarPanelItemText = factory.GetColor(0x2E2E2E);
+            table.SideBar.SideBarPanelItemDefault = new GradientColorTable();
+            table.SideBar.SideBarPanelItemDefault.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xDBE1E7), 0));
+            table.SideBar.SideBarPanelItemDefault.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xBBC3CD), 1));
+            // Expanded
+            table.SideBar.SideBarPanelItemExpanded = new GradientColorTable();
+            table.SideBar.SideBarPanelItemExpanded.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFBDBB5), 0));
+            table.SideBar.SideBarPanelItemExpanded.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFEC778), .4f));
+            table.SideBar.SideBarPanelItemExpanded.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFEB456), .4f));
+            table.SideBar.SideBarPanelItemExpanded.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFDEB9F), 1));
+            // MouseOver
+            table.SideBar.SideBarPanelItemMouseOver = new GradientColorTable();
+            table.SideBar.SideBarPanelItemMouseOver.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFFFCD9), 0));
+            table.SideBar.SideBarPanelItemMouseOver.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFFE78D), .4f));
+            table.SideBar.SideBarPanelItemMouseOver.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFFD748), .4f));
+            table.SideBar.SideBarPanelItemMouseOver.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFFE793), 1));
+            // Pressed
+            table.SideBar.SideBarPanelItemPressed = new GradientColorTable();
+            table.SideBar.SideBarPanelItemPressed.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xF8B869), 0));
+            table.SideBar.SideBarPanelItemPressed.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFDA361), .4f));
+            table.SideBar.SideBarPanelItemPressed.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFB8A3C), .4f));
+            table.SideBar.SideBarPanelItemPressed.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFEBB60), 1));
+            #endregion
+
+            #region AdvTree
+#if !NOTREE
+            table.AdvTree = new DevComponents.AdvTree.Display.TreeColorTable();
+            DevComponents.AdvTree.Display.ColorTableInitializer.InitOffice2007Blue(table.AdvTree, factory);
+#endif
+            #endregion
+
+            #region CrumbBar
+            table.CrumbBarItemView = new CrumbBarItemViewColorTable();
+            CrumbBarItemViewStateColorTable crumbBarViewTable = new CrumbBarItemViewStateColorTable();
+            table.CrumbBarItemView.Default = crumbBarViewTable;
+            crumbBarViewTable.Foreground = factory.GetColor(0x2E2E2E);
+            crumbBarViewTable = new CrumbBarItemViewStateColorTable();
+            table.CrumbBarItemView.MouseOver = crumbBarViewTable;
+            crumbBarViewTable.Foreground = factory.GetColor(0x2E2E2E);
+            crumbBarViewTable.Background = new BackgroundColorBlendCollection();
+            crumbBarViewTable.Background.AddRange(new BackgroundColorBlend[]{
+                new BackgroundColorBlend(factory.GetColor("FFFCD9"), 0f),
+                new BackgroundColorBlend(factory.GetColor("FFE78D"), .4f),
+                new BackgroundColorBlend(factory.GetColor("FFD748"), .4f),
+                new BackgroundColorBlend(factory.GetColor("FFE793"), 1f)});
+            crumbBarViewTable.Border = factory.GetColor("FFB8A98E");
+            crumbBarViewTable.BorderLight = factory.GetColor("90FFFFFF");
+            crumbBarViewTable = new CrumbBarItemViewStateColorTable();
+            table.CrumbBarItemView.MouseOverInactive = crumbBarViewTable;
+            crumbBarViewTable.Foreground = factory.GetColor(0x2E2E2E);
+            crumbBarViewTable.Background = new BackgroundColorBlendCollection();
+            crumbBarViewTable.Background.AddRange(new BackgroundColorBlend[]{
+                new BackgroundColorBlend(factory.GetColor("FFFFFDEC"), 0f),
+                new BackgroundColorBlend(factory.GetColor("FFFFF4CA"), .4f),
+                new BackgroundColorBlend(factory.GetColor("FFFFEBA6"), .4f),
+                new BackgroundColorBlend(factory.GetColor("FFFFF2C5"), 1f)});
+            crumbBarViewTable.Border = factory.GetColor("FF8E8F8F");
+            crumbBarViewTable.BorderLight = factory.GetColor("90FFFFFF");
+            crumbBarViewTable = new CrumbBarItemViewStateColorTable();
+            table.CrumbBarItemView.Pressed = crumbBarViewTable;
+            crumbBarViewTable.Foreground = factory.GetColor(0x2E2E2E);
+            crumbBarViewTable.Background = new BackgroundColorBlendCollection();
+            crumbBarViewTable.Background.AddRange(new BackgroundColorBlend[]{
+                new BackgroundColorBlend(factory.GetColor("FFC59B61"), 0f),
+                new BackgroundColorBlend(factory.GetColor("FFEEB469"), .1f),
+                new BackgroundColorBlend(factory.GetColor("FFFCA060"), .6f),
+                new BackgroundColorBlend(factory.GetColor("FFFB8E3D"), .6f),
+                new BackgroundColorBlend(factory.GetColor("FFFEBB60"), 1f)});
+            crumbBarViewTable.Border = factory.GetColor("FF8B7654");
+            crumbBarViewTable.BorderLight = factory.GetColor("408B7654");
+
+            #endregion
+
+            #region WarningBox
+            table.WarningBox.BackColor = factory.GetColor(factory.GetColor(0xDBE1E7));
+            table.WarningBox.WarningBorderColor = factory.GetColor(editBorderColor);
+            table.WarningBox.WarningBackColor1 = factory.GetColor(0xfefefe);
+            table.WarningBox.WarningBackColor2 = factory.GetColor(0xE5E9EE);
+            #endregion
+
+            #region CalendarView
+
+            #region WeekDayViewColors
+
+            table.CalendarView.WeekDayViewColors = new ColorDef[]
+            {
+                new ColorDef(factory.GetColor(0x616A76)),           // DayViewBorder
+                new ColorDef(factory.GetColor(0x616A76)),           // DayHeaderForeground
+
+                new ColorDef(new Color[] {factory.GetColor(0xDCDFE2), factory.GetColor(0xD3D6DA), factory.GetColor(0xB4BAC1), factory.GetColor(0xCBCED4)},
+                new float[] {0f, .55f, .58f, 1f}, 90f),             // DayHeaderBackground
+
+                new ColorDef(factory.GetColor(0x9199A4)),           // DayHeaderBorder
+
+                new ColorDef(factory.GetColor(0xFFFFFF)),           // DayWorkHoursBackground
+                new ColorDef(factory.GetColor(0xC7CBD1)),           // DayAllDayEventBackground
+                new ColorDef(factory.GetColor(0xE8EAEC)),           // DayOffWorkHoursBackground
+
+                new ColorDef(factory.GetColor(0xC7CBD1)),           // DayHourBorder
+                new ColorDef(factory.GetColor(0xE8EAEC)),           // DayHalfHourBorder
+
+                new ColorDef(factory.GetColor(0x365362)),           // SelectionBackground
+
+                new ColorDef(factory.GetColor(0x9199A4)),           // OwnerTabBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xCFD2D8), factory.GetColor(0xB0B6BE)},    // OwnerTabBackground
+                new float[] {0f, 1f}, 90f),
+
+                new ColorDef(factory.GetColor(0x000000)),           // OwnerTabForeground
+                new ColorDef(factory.GetColor(0xB0B6BE)),           // OwnerTabContentBackground
+                new ColorDef(factory.GetColor(0x000000)),           // OwnerTabSelectedForeground
+                new ColorDef(factory.GetColor(0xFFFFFF)),           // OwnerTabSelectionBackground
+
+                new ColorDef(factory.GetColor(0xF5F5F5)),           // CondensedViewBackground
+
+                new ColorDef(factory.GetColor(0xEB8900)),           // NowDayViewBorder
+                new ColorDef(factory.GetColor(0x000000)),           // NowDayHeaderForeground - 0x15428B
+
+                new ColorDef(new Color[] {factory.GetColor(0xFFED79), factory.GetColor(0xFFD86B), factory.GetColor(0xFFBB00), factory.GetColor(0xFFEA77)},
+                new float[] {0f, .55f ,58f, 1f}, 90f),              // NowDayHeaderBackground
+                
+                new ColorDef(new Color[] {factory.GetColor(0xFFED79), factory.GetColor(0xFFD86B), factory.GetColor(0xFFBB00), factory.GetColor(0xFFEA77)},
+                new float[] {0f, .55f ,58f, 1f}, 90f),              // TimeIndicator
+
+                new ColorDef(factory.GetColor(0xEB8900)),           // TimeIndicatorBorder
+            };
+
+            #endregion
+
+            #region HourRulerColors
+
+            table.CalendarView.TimeRulerColors = new ColorDef[]
+            {
+                new ColorDef(factory.GetColor(0xF0F1F2)),           // TimeRulerBackground
+                new ColorDef(factory.GetColor(0x6F7074)),           // TimeRulerForeground
+                new ColorDef(factory.GetColor(0x6F7074)),           // TimeRulerBorder
+                new ColorDef(factory.GetColor(0x6F7074)),           // TimeRulerTickBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xFFED79), factory.GetColor(0xFFD86B), factory.GetColor(0xFFBB00), factory.GetColor(0xFFEA77)},
+                new float[] {0f, .55f ,58f, 1f}, 90f),              // TimeRulerIndicator
+
+                new ColorDef(factory.GetColor(0xEB8900)),           // TimeRulerIndicatorBorder
+            };
+
+            #endregion
+
+            #region MonthViewColors
+
+            table.CalendarView.MonthViewColors = new ColorDef[]
+            {
+              new ColorDef(factory.GetColor(0x9199A4)),           // DayOfWeekHeaderBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xDCDFE2), factory.GetColor(0xD3D6DA), factory.GetColor(0xB4BAC1), factory.GetColor(0xCBCED4)},
+                new float[] {0, .55f, .58f, 1}),                    // DayOfWeekHeaderBackground
+
+                new ColorDef(factory.GetColor(0x616A76)),           // DayOfWeekHeaderForeground
+                new ColorDef(factory.GetColor(0x9199A4)),           // SideBarBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xDCDFE2), factory.GetColor(0xD2D5DA), factory.GetColor(0xB7BCC3), factory.GetColor(0xCACED4)},
+                new float[] {0, .6f, .6f, 1}, 0),                   // SideBarBackground
+
+                new ColorDef(factory.GetColor(0x000000)),           // SideBarForeground
+                new ColorDef(factory.GetColor(0x9199A4)),           // DayHeaderBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xDCDFE2), factory.GetColor(0xD3D6DA), factory.GetColor(0xB4BAC1), factory.GetColor(0xCBCED4)},
+                new float[] {0, .55f, .58f, 1}),                    // DayHeaderBackground
+
+                new ColorDef(factory.GetColor(0x000000)),           // DayHeaderForeground
+                new ColorDef(factory.GetColor(0x9199A4)),           // DayContentBorder
+                new ColorDef(factory.GetColor(0xE8EAEC)),           // DayContentSelectionBackground
+                new ColorDef(factory.GetColor(0xFFFFFF)),           // DayContentActiveDayBackground
+                new ColorDef(factory.GetColor(0xC7CBD1)),           // DayContentInactiveDayBackground
+
+                new ColorDef(factory.GetColor(0x9199A4)),           // OwnerTabBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xCFD2D8), factory.GetColor(0xB0B6BE)},    // OwnerTabBackground
+                new float[] {0f, 1f}, 90f),
+
+                new ColorDef(factory.GetColor(0x000000)),           // OwnerTabForeground
+                new ColorDef(factory.GetColor(0xB0B6BE)),           // OwnerTabContentBackground
+                new ColorDef(factory.GetColor(0x000000)),           // OwnerTabSelectedForeground
+                new ColorDef(factory.GetColor(0xFFFFFF)),           // OwnerTabSelectionBackground
+
+                new ColorDef(factory.GetColor(0xEB8900)),           // NowDayViewBorder
+                new ColorDef(factory.GetColor(0x000000)),           // NowDayHeaderForeground - 0x15428B
+
+                new ColorDef(new Color[] {factory.GetColor(0xFFED79), factory.GetColor(0xFFD86B), factory.GetColor(0xFFBB00), factory.GetColor(0xFFEA77)},
+                new float[] {0f, .55f ,58f, 1f}, 90f),              // NowDayHeaderBackground
+
+                new ColorDef(factory.GetColor(0x000000)),           // ContentLinkForeground - DayHeaderForeground
+                new ColorDef(factory.GetColor(0xFFFFFF)),           // ContentLinkBackground - DayContentActiveDayBackground
+            };
+
+            #endregion
+
+            #region AppointmentColors
+
+            table.CalendarView.AppointmentColors = new ColorDef[]
+            {
+                new ColorDef(factory.GetColor(0x4B71A2)),           // DefaultBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xFDFEFF), factory.GetColor(0xC1D3EA)},
+                             new float[] {0f, 1f}, 90f),            // DefaultBackground
+
+                new ColorDef(factory.GetColor(0x28518E)),           // BlueBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xB1C5EC), factory.GetColor(0x759DDA)}, 
+                             new float[] {0f, 1f}, 90f),            // BlueBackground
+
+                new ColorDef(factory.GetColor(0x2C6524)),           // GreenBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xC2E8BC), factory.GetColor(0x84D17B)},
+                             new float[] {0f, 1f}, 90f),            // GreenBackground
+
+                new ColorDef(factory.GetColor(0x8B3E0A)),           // OrangeBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xF9C7A0), factory.GetColor(0xF49758)},
+                             new float[] {0f, 1f}, 90f),            // OrangeBackground
+
+                new ColorDef(factory.GetColor(0x3E2771)),           // PurpleBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xC5B5E6), factory.GetColor(0x957BD2)},
+                             new float[] {0f, 1f}, 90f),            // PurpleBackground
+
+                new ColorDef(factory.GetColor(0x86171C)),           // RedBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xF1AAAC), factory.GetColor(0xE5676E)},
+                             new float[] {0f, 1f}, 90f),            // RedBackground
+
+                new ColorDef(factory.GetColor(0x7C7814)),           // YellowBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xFFFCAA), factory.GetColor(0xFFF958)},
+                             new float[] {0f, 1f}, 90f),            // YellowBackground
+
+                new ColorDef(factory.GetColor(-1)),                 // BusyTimeMarker
+                new ColorDef(factory.GetColor(0xFFFFFF)),           // FreeTimeMarker
+                new ColorDef(factory.GetColor(0x800080))            // OutOfOfficeTimeMarker
+            };
+
+            #endregion
+
+            #endregion
+
+            #region SuperTab
+
+            #region SuperTab
+
+            table.SuperTab.Background = new SuperTabLinearGradientColorTable(
+                factory.GetColor(0xE5E9ED), Color.Empty);
+
+            table.SuperTab.InnerBorder = factory.GetColor(0xDFE3E8);
+            table.SuperTab.OuterBorder = factory.GetColor(0x7F8388);
+
+            table.SuperTab.ControlBoxDefault.Image = factory.GetColor(0xFF, 0x000000);
+
+            table.SuperTab.ControlBoxMouseOver.Background = factory.GetColor(0xFFE7A2);
+            table.SuperTab.ControlBoxMouseOver.Border = factory.GetColor(0xFFBD69);
+            table.SuperTab.ControlBoxMouseOver.Image = factory.GetColor(0xFF, 0x000000);
+
+            table.SuperTab.ControlBoxPressed.Background = factory.GetColor(0xFB8C3C);
+            table.SuperTab.ControlBoxPressed.Border = factory.GetColor(0xFFBD69);
+            table.SuperTab.ControlBoxPressed.Image = factory.GetColor(0xFF, 0x000000);
+
+            table.SuperTab.InsertMarker = factory.GetColor(0xFF, 0x000080);
+
+            #endregion
+
+            #region SuperTabItem
+
+            // Top Default
+
+            table.SuperTabItem.Default.Normal.Background = new SuperTabLinearGradientColorTable(
+                new Color[] { factory.GetColor(0xEFF1F3), factory.GetColor(0xE1E4E9), factory.GetColor(0xEDEFF2), factory.GetColor(0xEFF1F3) },
+                new float[] { 0, .5f, .5f, 1 });
+
+            table.SuperTabItem.Default.Normal.InnerBorder = factory.GetColor(0xDFE3E8);
+            table.SuperTabItem.Default.Normal.OuterBorder = factory.GetColor(0x7F8388);
+            table.SuperTabItem.Default.Normal.Text = factory.GetColor(0x4D5359);
+            table.SuperTabItem.Default.Normal.CloseMarker = factory.GetColor(0x406F9F);
+
+            // Disabled
+            table.SuperTabItem.Default.Disabled.Text = factory.GetColor(0x8d8d8d);
+            table.SuperTabItem.Default.Disabled.Background.AdaptiveGradient = false;
+            table.SuperTabItem.Default.Disabled.CloseMarker = factory.GetColor(0x8d8d8d);
+
+            // Top Selected
+
+            table.SuperTabItem.Default.Selected.Background = new SuperTabLinearGradientColorTable(
+                new Color[] { factory.GetColor(0xE2E6EB), factory.GetColor(0xF9FAFB), factory.GetColor(0xF9FAFB), factory.GetColor(0xFFFFFF) },
+                new float[] { 0, .5f, .5f, 1 });
+
+            table.SuperTabItem.Default.Selected.InnerBorder = factory.GetColor(0xDFE3E8);
+            table.SuperTabItem.Default.Selected.OuterBorder = factory.GetColor(0x7F8388);
+            table.SuperTabItem.Default.Selected.Text = factory.GetColor(0x4D5359);
+            table.SuperTabItem.Default.Selected.CloseMarker = factory.GetColor(0x406F9F);
+
+            // Top SelectedMouseOver
+
+            table.SuperTabItem.Default.SelectedMouseOver.Background = new SuperTabLinearGradientColorTable(
+                new Color[] { factory.GetColor(0xDFE3E8), factory.GetColor(0xF7F8F9), factory.GetColor(0xF7F8F9), factory.GetColor(0xFEFEFF) },
+                new float[] { 0, .5f, .5f, 1 });
+
+            table.SuperTabItem.Default.SelectedMouseOver.InnerBorder = factory.GetColor(0xF3F4F6);
+            table.SuperTabItem.Default.SelectedMouseOver.OuterBorder = factory.GetColor(0x868B91);
+            table.SuperTabItem.Default.SelectedMouseOver.Text = factory.GetColor(0x4D5359);
+            table.SuperTabItem.Default.SelectedMouseOver.CloseMarker = factory.GetColor(0x406F9F);
+
+            // Top MouseOver
+
+            table.SuperTabItem.Default.MouseOver.Background = new SuperTabLinearGradientColorTable(
+                new Color[] { factory.GetColor(0xDFE3E8), factory.GetColor(0xF7F8F9), factory.GetColor(0xF7F8F9), factory.GetColor(0xFEFEFF) },
+                new float[] { 0, .5f, .5f, 1 });
+
+            table.SuperTabItem.Default.MouseOver.InnerBorder = factory.GetColor(0xF3F4F6);
+            table.SuperTabItem.Default.MouseOver.OuterBorder = factory.GetColor(0x868B91);
+            table.SuperTabItem.Default.MouseOver.Text = factory.GetColor(0x4D5359);
+            table.SuperTabItem.Default.MouseOver.CloseMarker = factory.GetColor(0x406F9F);
+
+            // Left, Bottom, Right
+
+            table.SuperTabItem.Left = table.SuperTabItem.Default;
+            table.SuperTabItem.Bottom = table.SuperTabItem.Default;
+            table.SuperTabItem.Right = table.SuperTabItem.Default;
+
+            #endregion
+
+            #region SuperTabPanel
+
+            table.SuperTabPanel.Default.Background = new SuperTabLinearGradientColorTable(factory.GetColor(0xFFFFFF), Color.Empty);
+            table.SuperTabPanel.Default.InnerBorder = factory.GetColor(0xDFE3E8);
+            table.SuperTabPanel.Default.OuterBorder = factory.GetColor(0x4D5359);
+
+            table.SuperTabPanel.Left = table.SuperTabPanel.Default;
+            table.SuperTabPanel.Bottom = table.SuperTabPanel.Default;
+            table.SuperTabPanel.Right = table.SuperTabPanel.Default;
+
+            #endregion
+
+            #endregion
+
+            #region Backstage
+
+            #region Backstage
+            SuperTabStyleColorFactory.GetOffice2010BackstageSilverColorTable(table.Backstage, factory);
+            #endregion
+
+            #region BackstageItem
+            SuperTabStyleColorFactory.GetOffice2010BackstageSilverItemColorTable(table.BackstageItem, factory);
+            #endregion
+
+            #region BackstagePanel
+            SuperTabStyleColorFactory.GetOffice2010BackstageSilverPanelColorTable(table.BackstagePanel, factory);
+            #endregion
+
+            #endregion
+
+            #region SwitchButton
+            SwitchButtonColorTable sbt = new SwitchButtonColorTable();
+            sbt.BorderColor = factory.GetColor(0xD4D6D9);
+            sbt.OffBackColor = factory.GetColor(0xFFFFFF);
+            sbt.OffTextColor = factory.GetColor(0x2E2E2E);
+            sbt.OnBackColor = factory.GetColor(0x92D050);
+            sbt.OnTextColor = factory.GetColor(0x2E2E2E);
+            sbt.SwitchBackColor = factory.GetColor(0xE7EAEF);
+            sbt.SwitchBorderColor = factory.GetColor(0xB2B8BE);
+            sbt.TextColor = factory.GetColor(0x2E2E2E);
+            table.SwitchButton = new SwitchButtonColors();
+            table.SwitchButton.Default = sbt;
+            table.SwitchButton.Disabled.BorderColor = table.CheckBoxItem.Disabled.CheckBorder;
+            table.SwitchButton.Disabled.SwitchBorderColor = table.SwitchButton.Disabled.BorderColor;
+            table.SwitchButton.Disabled.OffTextColor = table.CheckBoxItem.Disabled.Text;
+            table.SwitchButton.Disabled.OnTextColor = table.SwitchButton.Disabled.OffTextColor;
+            table.SwitchButton.Disabled.TextColor = table.SwitchButton.Disabled.OffTextColor;
+            table.SwitchButton.Disabled.SwitchBackColor = table.CheckBoxItem.Disabled.CheckInnerBackground.Start;
+            table.SwitchButton.Disabled.OffBackColor = table.CheckBoxItem.Disabled.CheckInnerBackground.Start;
+            table.SwitchButton.Disabled.OnBackColor = table.SwitchButton.Disabled.OffBackColor;
+            #endregion
+
+            #region ElementStyle Classes
+            table.StyleClasses.Clear();
+            ElementStyle style = new ElementStyle();
+            style.Class = ElementStyleClassKeys.RibbonGalleryContainerKey;
+            style.BorderColor = factory.GetColor(0xC6CACD);
+            style.Border = eStyleBorderType.Solid;
+            style.BorderWidth = 1;
+            style.CornerDiameter = 2;
+            style.CornerType = eCornerType.Rounded;
+            style.BackColor = factory.GetColor(0xFFFFFF);
+            table.StyleClasses.Add(style.Class, style);
+            // FileMenuContainer
+            style = GetFileMenuContainerStyle(table);
+            table.StyleClasses.Add(style.Class, style);
+            // Two Column File Menu Container
+            style = GetTwoColumnMenuContainerStyle(table);
+            table.StyleClasses.Add(style.Class, style);
+            // Column one File Menu Container
+            style = GetMenuColumnOneContainerStyle(table);
+            table.StyleClasses.Add(style.Class, style);
+            // Column two File Menu Container
+            style = GetMenuColumnTwoContainerStyle(table);
+            table.StyleClasses.Add(style.Class, style);
+            // Bottom File Menu Container
+            style = GetMenuBottomContainer(table);
+            table.StyleClasses.Add(style.Class, style);
+            // TextBox border
+            style = Office2007ColorTableFactory.GetTextBoxStyle(factory.GetColor(editBorderColor));
+            table.StyleClasses.Add(style.Class, style);
+            // RichTextBox border
+            style = Office2007ColorTableFactory.GetRichTextBoxStyle(factory.GetColor(editBorderColor));
+            table.StyleClasses.Add(style.Class, style);
+            // ItemPanel
+            style = Office2007ColorTableFactory.GetItemPanelStyle(factory.GetColor(editBorderColor));
+            table.StyleClasses.Add(style.Class, style);
+            // ListBoxAdv
+            style = Office2007ColorTableFactory.GetListBoxAdvStyle(factory.GetColor(editBorderColor));
+            table.StyleClasses.Add(style.Class, style);
+            // DateTimeInput background
+            style = Office2007ColorTableFactory.GetDateTimeInputBackgroundStyle(factory.GetColor(editBorderColor), SystemColors.Window);
+            table.StyleClasses.Add(style.Class, style);
+            // Ribbon Client Panel
+            style = Office2010BlueFactory.GetRibbonClientPanelStyle(factory, eOffice2010ColorScheme.Silver);
+            table.StyleClasses.Add(style.Class, style);
+            // ListView Border
+            style = Office2007ColorTableFactory.GetListViewBorderStyle(table.ListViewEx);
+            table.StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetStatusBarAltStyle(table.Bar);
+            table.StyleClasses.Add(style.Class, style);
+#if !NOTREE
+            // Tree Border/Background
+            style = Office2007ColorTableFactory.GetAdvTreeStyle(factory.GetColor(editBorderColor), Color.Empty);
+            table.StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetAdvTreeColumnsHeaderStyle(factory.GetColor(0xF9FCFD), factory.GetColor(0xD3DBE9), factory.GetColor(0x9EB6CE));
+            table.StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetAdvTreeNodesColumnsHeaderStyle(factory.GetColor(0xF9FCFD), factory.GetColor(0xD3DBE9), factory.GetColor(0x9EB6CE));
+            table.StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetAdvTreeColumnStyle(factory.GetColor(0x000000));
+            table.StyleClasses.Add(style.Class, style);
+            // CrumbBar
+            style = Office2007ColorTableFactory.GetCrumbBarBackgroundStyle(factory.GetColor(Color.White), factory.GetColor("FF567DB0"), factory.GetColor("FF2F578D"));
+            table.StyleClasses.Add(style.Class, style);
+#endif
+            // DataGridView border
+            style = Office2007ColorTableFactory.GetDataGridViewStyle();
+            table.StyleClasses.Add(style.Class, style);
+            // DataGridViewDateTime border
+            style = Office2007ColorTableFactory.GetDataGridViewDateTimeStyle();
+            table.StyleClasses.Add(style.Class, style);
+            // DataGridViewNumeric border
+            style = Office2007ColorTableFactory.GetDataGridViewNumericStyle();
+            table.StyleClasses.Add(style.Class, style);
+            // DataGridViewIpAddress border
+            style = Office2007ColorTableFactory.GetDataGridViewIpAddressStyle();
+            table.StyleClasses.Add(style.Class, style);
+
+            // Slide-out Button
+            style = Office2007ColorTableFactory.GetSlideOutButtonStyle(table.CheckBoxItem.Default.CheckBorder);
+            table.StyleClasses.Add(style.Class, style);
+            // MetroTilePanel
+            style = Office2007ColorTableFactory.GetMetroTilePanelStyle(factory.GetColor(Color.White));
+            table.StyleClasses.Add(style.Class, style);
+            // MetroTileGroup
+            style = Office2007ColorTableFactory.GetMetroTileGroupStyle(factory.GetColor(Color.DarkGray));
+            table.StyleClasses.Add(style.Class, style);
+            // MonthCalendarAdv
+            style = Office2007ColorTableFactory.GetMonthCalendarStyle(SystemColors.Window);
+            table.StyleClasses.Add(style.Class, style);
+            // ProgressSteps control
+            style = Office2007ColorTableFactory.GetProgressStepsStyle(table);
+            table.StyleClasses.Add(style.Class, style);
+            // SideNavStrip
+            style = Office2007ColorTableFactory.GetSideNavStripStyle(factory.GetColor(0xD5D8DC));
+            table.StyleClasses.Add(style.Class, style);
+            // TabFormPanel
+            style = Office2007ColorTableFactory.GetTabFormPanelStyle(factory.GetColor(0xFEFEFE));
+            table.StyleClasses.Add(style.Class, style);
+
+            // Toolbox Control
+            style = Office2007ColorTableFactory.GetToolboxControlStyle(factory.GetColor(table.LegacyColors.PanelBorder), Color.Empty);
+            table.StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetToolboxGroupTitle(factory.GetColor(0x2E2E2E));
+            table.StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetToolboxGroupTitleMouseOver(factory.GetColor(0x2E2E2E), factory.GetColor(0xFDE488));
+            table.StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetToolboxGroupExpandedTitle(factory.GetColor(0x2E2E2E), factory.GetColor(Color.DarkGray));
+            table.StyleClasses.Add(style.Class, style);
+            #endregion
+
+            #region StepIndicator
+            table.StepIndicator.BackgroundColor = factory.GetColor(ColorFunctions.GetShade(table.Form.BackColor, 10));
+            table.StepIndicator.IndicatorColor = factory.GetColor(0xA4CC28);
+            #endregion
+
+            #region RadialMenu
+            table.RadialMenu = new RadialMenuColorTable();
+            table.RadialMenu.CircularBackColor = factory.GetColor(0xD44F2E);
+            table.RadialMenu.CircularBorderColor = factory.GetColor(0xFFFFFF);
+            table.RadialMenu.CircularForeColor = factory.GetColor(0xFFFFFF);
+            table.RadialMenu.RadialMenuBackground = factory.GetColor(0xFFFFFF);
+            table.RadialMenu.RadialMenuBorder = factory.GetColor(0x656769);
+            table.RadialMenu.RadialMenuButtonBackground = factory.GetColor(0xFFFFFF);
+            table.RadialMenu.RadialMenuButtonBorder = factory.GetColor(0x656769);
+            table.RadialMenu.RadialMenuExpandForeground = factory.GetColor(0xFFFFFF);
+            table.RadialMenu.RadialMenuInactiveBorder = Color.FromArgb(128, table.RadialMenu.RadialMenuBorder);
+            table.RadialMenu.RadialMenuItemForeground = factory.GetColor(0x656769);
+            table.RadialMenu.RadialMenuItemDisabledForeground = factory.GetColor(0x8D8D8D);
+            table.RadialMenu.RadialMenuItemMouseOverBackground = Color.FromArgb(72, table.RadialMenu.RadialMenuItemForeground);
+            table.RadialMenu.RadialMenuItemMouseOverForeground = factory.GetColor(0x656769);
+            table.RadialMenu.RadialMenuMouseOverBorder = Color.FromArgb(200, table.RadialMenu.RadialMenuBorder);
+            #endregion
+
+            #region StepItem
+            table.StepItem.Default = new OfficeStepItemStateColorTable(new Color[]{
+                    factory.GetColor(0xFFFFFF), 
+                    factory.GetColor(0xFBFBFC), 
+                    factory.GetColor(0xFBFBFC), 
+                    factory.GetColor(0xEDEFF1)
+                    },
+                    90,
+                    new float[] { 0f, .5f, .5f, 1f },
+                factory.GetColor(0x2E2E2E),
+                new Color[] {
+                    factory.GetColor(0x8B9097) });
+            table.StepItem.Progress = new OfficeStepItemStateColorTable(new Color[]{
+                    factory.GetColor(0xD8F577), 
+                    factory.GetColor(0x75C300),
+                    factory.GetColor(0x75C300),
+                    factory.GetColor(0xA9E923)
+                    },
+                    90,
+                    new float[] { 0f, .6f, .6f, 1f },
+                Color.Empty,
+                new Color[0]);
+            table.StepItem.MouseOver = new OfficeStepItemStateColorTable(new Color[]{
+                    factory.GetColor(0xFDEEB3), 
+                    factory.GetColor(0xFDE488),
+                    factory.GetColor(0xFDE488), 
+                    factory.GetColor(0xFDF8DE)
+                    },
+                    90,
+                    new float[] { 0f, .5f, .5f, 1f },
+                factory.GetColor(0x2E2E2E),
+                new Color[] {
+                    factory.GetColor(0xF1CA58) });
+            table.StepItem.Pressed = new OfficeStepItemStateColorTable(new Color[]{
+                    factory.GetColor(0xFBD678), 
+                    factory.GetColor(0xFFE48A),
+                    factory.GetColor(0xFFE48A), 
+                    factory.GetColor(0xFEE287)
+                    },
+                    90,
+                    new float[] { 0f, .5f, .5f, 1f },
+                factory.GetColor(0x2E2E2E),
+                new Color[] {
+                    factory.GetColor(0xC2762B) });
+            #endregion
+
+            #region TokenEditor
+            table.TokenEditor = new TokenEditorColorTable(0x000000, 0xEBEDF2, 0x000000, 0xBBC2CB, 0xFFFFFF, 0x0072C6);
+            #endregion
+
+            #region Flyout
+            table.Flyout.BorderColor = table.Form.Active.BorderColors[0];
+            #endregion
+
+            #region SideNav
+            table.SideNav.SideNavItem.Default = new SideNavItemStateColorTable(factory.GetColor(0x2E2E2E));
+            table.SideNav.SideNavItem.MouseOver = new SideNavItemStateColorTable(factory.GetColor(0x2E2E2E),
+                new Color[]
+                {
+                    factory.GetColor(0xFBEDB3), factory.GetColor(0xF9E186), factory.GetColor(0xF9E186),
+                    factory.GetColor(0xF8E496)
+                },
+                new Color[] { factory.GetColor(0xEEC958), factory.GetColor(0xF1D449) },
+                0);
+            table.SideNav.SideNavItem.Pressed = new SideNavItemStateColorTable(factory.GetColor(0x1E395B),
+                new Color[]
+                {
+                    factory.GetColor(0xFBD678), factory.GetColor(0xFFE48A), factory.GetColor(0xFFE48A),
+                    factory.GetColor(0xFEE287)
+                },
+                new Color[] { factory.GetColor(0xC2762B), factory.GetColor(0xF6C867) },
+                0);
+            table.SideNav.SideNavItem.Selected = new SideNavItemStateColorTable(factory.GetColor(0x2E2E2E),
+                new Color[] { table.Form.BackColor },
+                new Color[] { Color.Empty, factory.GetColor(0xBABEC3), Color.Empty, factory.GetColor(0xBABEC3) });
+            table.SideNav.BorderColors = new Color[] { factory.GetColor(0xBABEC3) };
+            table.SideNav.TitleBackColor = factory.GetColor(0xE5E9EE);
+            table.SideNav.TitleBorderColors = new Color[] { Color.Empty, Color.Empty, Color.Empty, factory.GetColor(0xBABEC3) };
+            table.SideNav.PanelBackColor = table.Form.BackColor;
+
+            #endregion
+
+            #region TabForm
+            table.TabForm.Active.CaptionText = factory.GetColor(0x2E2E2E);
+            table.TabForm.Inactive.CaptionText = factory.GetColor(0x2E2E2E);
+            table.TabForm.Active.CaptionBackColors = new Color[] { factory.GetColor(0xE3E6E8) };
+            table.TabForm.Inactive.CaptionBackColors = new Color[] { factory.GetColor(0xE3E6E8) };
+            table.TabFormItemColorTables.Clear();
+            table.TabFormItemColorTables.Add(TabFormItem.DefaultColorTableKey,
+                Office2007ColorTable.CreateDefaultTabFormItemColorTable(factory,
+                new Color[] { factory.GetColor(0xFEFEFE) },
+                new Color[] { factory.GetColor(0xBABEC3) },
+                factory.GetColor(0x2E2E2E),
+                new Color[] { factory.GetColor(0xFFFFFF), factory.GetColor(0xFEFEFE) },
+                new Color[] { factory.GetColor(0xB6BABF)},
+                factory.GetColor(0x2E2E2E)
+                ));
+            table.TabFormItemColorTables.Add(TabFormItem.BlueColorTableKey, Office2007ColorTable.CreateBlueTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.YellowColorTableKey, Office2007ColorTable.CreateYellowTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.PurpleColorTableKey, Office2007ColorTable.CreatePurpleTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.CyanColorTableKey, Office2007ColorTable.CreateCyanTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.BlueMistColorTableKey, Office2007ColorTable.CreateBlueMistTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.PurpleMistColorTableKey, Office2007ColorTable.CreatePurpleMistTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.TanColorTableKey, Office2007ColorTable.CreateTanTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.LemonLimeColorTableKey, Office2007ColorTable.CreateLemonLimeTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.AppleColorTableKey, Office2007ColorTable.CreateAppleTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.TealColorTableKey, Office2007ColorTable.CreateTealTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.RedChalkColorTableKey, Office2007ColorTable.CreateRedChalkTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.SilverColorTableKey, Office2007ColorTable.CreateSilverTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.OrangeColorTableKey, Office2007ColorTable.CreateOrangeTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.GreenColorTableKey, Office2007ColorTable.CreateGreenTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.MagentaColorTableKey, Office2007ColorTable.CreateMagentaTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.RedColorTableKey, Office2007ColorTable.CreateRedTabFormItemColorTable(factory));
+            #endregion
+        }
+
+        #region RibbonBar
+        public static Office2007RibbonBarStateColorTable GetRibbonBar(ColorFactory factory)
+        {
+            Office2007RibbonBarStateColorTable rb = new Office2007RibbonBarStateColorTable();
+            rb.TopBackgroundHeight = 0.8f;
+            rb.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xF6F7F8), factory.GetColor(0xB0B6BC));
+            rb.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFFFFFF), factory.GetColor(120,0xFFFFFF));
+            rb.TopBackground = new LinearGradientColorTable(factory.GetColor(0xFEFEFE), factory.GetColor(0xE5E9EE));
+            rb.BottomBackground = null; // new LinearGradientColorTable(factory.GetColor(0xF6F7F8), factory.GetColor(0xE5E9EE));
+            rb.TitleBackground = null;// new LinearGradientColorTable(factory.GetColor(0xC2D8F1), factory.GetColor(0xC0D8EF));
+            rb.TitleText = factory.GetColor(0x565F6D);
+            return rb;
+        }
+
+        public static Office2007RibbonBarStateColorTable GetRibbonBarMouseOver(ColorFactory factory)
+        {
+            return GetRibbonBar(factory);
+            //Office2007RibbonBarStateColorTable rb = new Office2007RibbonBarStateColorTable();
+            //rb.TopBackgroundHeight = 0.8f;
+            //rb.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xEFF1F2), factory.GetColor(0xCDD2D7));
+            //rb.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFFFFFF), factory.GetColor(120, 0xFFFFFF));
+            //rb.TopBackground = new LinearGradientColorTable(factory.GetColor(0xFEFEFE), factory.GetColor(0xDEE4EB));
+            //rb.BottomBackground = null;// new LinearGradientColorTable(factory.GetColor(0xC7D8ED), factory.GetColor(0xD8E8F5));
+            //rb.TitleBackground = new LinearGradientColorTable(factory.GetColor(0xF8FAFB), Color.Transparent);
+            //rb.TitleText = factory.GetColor(0x565F6D);
+            //return rb;
+        }
+
+        public static Office2007RibbonBarStateColorTable GetRibbonBarExpanded(ColorFactory factory)
+        {
+            Office2007RibbonBarStateColorTable rb = new Office2007RibbonBarStateColorTable();
+            rb.TopBackgroundHeight = 15;
+            rb.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xEFF1F2), factory.GetColor(0xCDD2D7));
+            rb.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFFFFFF), factory.GetColor(120, 0xFFFFFF));
+            rb.TopBackground = new LinearGradientColorTable(factory.GetColor(0xFEFEFE), factory.GetColor(0xDEE4EB));
+            rb.BottomBackground = null;// new LinearGradientColorTable(factory.GetColor(0xC7D8ED), factory.GetColor(0xD8E8F5));
+            rb.TitleBackground = new LinearGradientColorTable(factory.GetColor(0xF8FAFB), Color.Transparent);
+            rb.TitleText = Color.Empty;
+            return rb;
+        }
+        #endregion 
+
+        #region Buttons
+        private static Office2007ButtonItemColorTable GetButtonItemBackstageDefault(ColorFactory factory)
+        {
+            Office2007ButtonItemColorTable ct = Office2010BlueFactory.GetButtonItemBackstageDefault(factory);
+            return ct;
+        }
+        public static Office2007ButtonItemColorTable GetButtonItemBlueOrange(ColorFactory factory)
+        {
+            Office2007ButtonItemColorTable cb = new Office2007ButtonItemColorTable();
+            cb.Default = new Office2007ButtonItemStateColorTable();
+            cb.Default.Text = factory.GetColor(0x2E2E2E);
+
+            // Button mouse over
+            cb.MouseOver = new Office2007ButtonItemStateColorTable();
+            cb.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xF1CA58), factory.GetColor(0xF7D84B));
+            cb.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFDF9E8), factory.GetColor(0xFDFCF5));
+            cb.MouseOver.TopBackground = new LinearGradientColorTable(factory.GetColor(0xFDEEB3), factory.GetColor(0xFDE488));
+            cb.MouseOver.TopBackgroundHighlight = LinearGradientColorTable.Empty; //new LinearGradientColorTable(Color.FromArgb(192, Color.White), Color.Transparent);
+            cb.MouseOver.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xFDE488), factory.GetColor(0xFDF8DE));
+            cb.MouseOver.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xFDFAE0), Color.Transparent);
+            cb.MouseOver.SplitBorder = new LinearGradientColorTable(factory.GetColor(0xF1CA58), Color.Empty);
+            cb.MouseOver.SplitBorderLight = new LinearGradientColorTable(factory.GetColor(0xFDF9E8), Color.Empty);
+            cb.MouseOver.Text = factory.GetColor(0x2E2E2E);
+
+            cb.MouseOverSplitInactive = new Office2007ButtonItemStateColorTable();
+            cb.MouseOverSplitInactive.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xB1BAC4));
+
+            // Pressed
+            cb.Pressed = new Office2007ButtonItemStateColorTable();
+            cb.Pressed.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xC2762B), factory.GetColor(0xC29E47));
+            cb.Pressed.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xF6C867), factory.GetColor(0xFAD77A));
+            cb.Pressed.TopBackground = new LinearGradientColorTable(factory.GetColor(0xFBD678), factory.GetColor(0xFFE48A));
+            cb.Pressed.TopBackgroundHighlight = LinearGradientColorTable.Empty;
+            cb.Pressed.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xFFE48A), factory.GetColor(0xFEE287));
+            cb.Pressed.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xFFE48A), Color.Transparent);
+            cb.Pressed.SplitBorder = new LinearGradientColorTable(factory.GetColor(0xC2762B), Color.Empty);
+            cb.Pressed.SplitBorderLight = new LinearGradientColorTable(factory.GetColor(0xF6C867), Color.Empty);
+            cb.Pressed.Text = factory.GetColor(0x2E2E2E);
+
+            // Checked
+            cb.Checked = new Office2007ButtonItemStateColorTable();
+            cb.Checked.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xC28A30), factory.GetColor(0xC2A44D));
+            cb.Checked.InnerBorder = LinearGradientColorTable.Empty;
+            cb.Checked.TopBackground = new LinearGradientColorTable(factory.GetColor(0xFFE575), factory.GetColor(0xFFD86B));
+            cb.Checked.TopBackgroundHighlight = LinearGradientColorTable.Empty;
+            cb.Checked.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xFFD86B), factory.GetColor(0xFFEC79));
+            cb.Checked.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xFFF480), Color.Transparent);
+            cb.Checked.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Checked.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Checked.Text = factory.GetColor(0x2E2E2E);
+
+            // Expanded button
+            cb.Expanded = new Office2007ButtonItemStateColorTable();
+            cb.Expanded.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xC28A30), factory.GetColor(0xC2A44D));
+            cb.Expanded.InnerBorder = LinearGradientColorTable.Empty;
+            cb.Expanded.TopBackground = new LinearGradientColorTable(factory.GetColor(0xFFE575), factory.GetColor(0xFFD86B));
+            cb.Expanded.TopBackgroundHighlight = LinearGradientColorTable.Empty;
+            cb.Expanded.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xFFD86B), factory.GetColor(0xFFEC79));
+            cb.Expanded.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xFFF480), Color.Transparent);
+            cb.Expanded.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Expanded.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Expanded.Text = factory.GetColor(0x2E2E2E);
+
+            SetBlueExpandColors(cb, factory);
+
+            return cb;
+        }
+
+        public static Office2007ButtonItemColorTable GetButtonItemBlueOrangeWithBackground(ColorFactory factory)
+        {
+            Office2007ButtonItemColorTable cb = GetButtonItemBlueOrange(factory);
+
+            cb.Default.TopBackground = new LinearGradientColorTable(factory.GetColor(0xFFFFFF), factory.GetColor(0xFBFBFC));
+            cb.Default.TopBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xFBFBFC), factory.GetColor(0xEDEFF1));
+            cb.Default.BottomBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.InnerBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x8B9097));
+            cb.Default.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.MouseOverSplitInactive = cb.Default;
+
+            // Same as default
+            cb.Disabled = new Office2007ButtonItemStateColorTable();
+            cb.Disabled.TopBackground = new LinearGradientColorTable(factory.GetColor(0xF5F5F5), factory.GetColor(0xECECEC));
+            cb.Disabled.TopBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xE5E5E5), factory.GetColor(0xE7E7E7));
+            cb.Disabled.BottomBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.InnerBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xBCBCBC), Color.Empty);
+            cb.Disabled.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.Text = factory.GetColor(0x8D8D8D);
+            return cb;
+        }
+
+        public static void SetBlueExpandColors(Office2007ButtonItemColorTable ct, ColorFactory factory)
+        {
+            Color cb = factory.GetColor(0x454F5A);
+            Color cl = Color.FromArgb(192, Color.White);
+            ct.Default.ExpandBackground = cb;
+            ct.Default.ExpandLight = cl;
+
+            ct.Checked.ExpandBackground = cb;
+            ct.Checked.ExpandLight = cl;
+
+            //ct.Disabled.ExpandBackground = factory.GetColor(0xB7B7B7);
+            //ct.Disabled.ExpandLight = factory.GetColor(0xEDEDED);
+
+            ct.Expanded.ExpandBackground = cb;
+            ct.Expanded.ExpandLight = cl;
+
+            ct.MouseOver.ExpandBackground = cb;
+            ct.MouseOver.ExpandLight = cl;
+
+            ct.Pressed.ExpandBackground = cb;
+            ct.Pressed.ExpandLight = cl;
+        }
+
+        public static Office2007ButtonItemColorTable GetNavigationPaneButtonItemTable(ColorFactory factory)
+        {
+            Office2007ButtonItemColorTable cb = new Office2007ButtonItemColorTable();
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Orange);
+            cb.Default = new Office2007ButtonItemStateColorTable();
+            cb.Default.Text = factory.GetColor(0x000000);
+
+            // Button mouse over
+            cb.MouseOver = new Office2007ButtonItemStateColorTable();
+            cb.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xA1A9B3));
+            cb.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFFFFFF));
+            cb.MouseOver.TopBackground = LinearGradientColorTable.Empty;
+            cb.MouseOver.TopBackgroundHighlight = LinearGradientColorTable.Empty; //new LinearGradientColorTable(Color.FromArgb(192, Color.White), Color.Transparent);
+            cb.MouseOver.BottomBackground = LinearGradientColorTable.Empty;
+            cb.MouseOver.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xF6F7F9), Color.Transparent);
+            cb.MouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xF4F6F9), factory.GetColor(0xE2E6EC));
+            cb.MouseOver.SplitBorder = LinearGradientColorTable.Empty;
+            cb.MouseOver.SplitBorderLight = LinearGradientColorTable.Empty;
+            cb.MouseOver.Text = factory.GetColor(0x000000);
+
+            cb.MouseOverSplitInactive = new Office2007ButtonItemStateColorTable();
+            cb.MouseOverSplitInactive.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xB1BAC4));
+
+            // Pressed
+            cb.Pressed = new Office2007ButtonItemStateColorTable();
+            cb.Pressed.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x8E98A3));
+            cb.Pressed.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xB2B8C0));
+            cb.Pressed.TopBackground = LinearGradientColorTable.Empty;
+            cb.Pressed.TopBackgroundHighlight = LinearGradientColorTable.Empty; //new LinearGradientColorTable(Color.FromArgb(192, Color.White), Color.Transparent);
+            cb.Pressed.BottomBackground = LinearGradientColorTable.Empty;
+            cb.Pressed.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xC0C7CF), Color.Transparent);
+            cb.Pressed.Background = new LinearGradientColorTable(factory.GetColor(0xC0C7CF));
+            cb.Pressed.SplitBorder = LinearGradientColorTable.Empty;
+            cb.Pressed.SplitBorderLight = LinearGradientColorTable.Empty;
+            cb.Pressed.Text = factory.GetColor(0x000000);
+
+            // Checked
+            cb.Checked = new Office2007ButtonItemStateColorTable();
+            cb.Checked.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xA1A9B3));
+            cb.Checked.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xEFF1F5));
+            cb.Checked.TopBackground = LinearGradientColorTable.Empty;
+            cb.Checked.TopBackgroundHighlight = LinearGradientColorTable.Empty; //new LinearGradientColorTable(Color.FromArgb(192, Color.White), Color.Transparent);
+            cb.Checked.BottomBackground = LinearGradientColorTable.Empty;
+            cb.Checked.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xECEFF4), Color.Transparent);
+            cb.Checked.Background = new LinearGradientColorTable(factory.GetColor(0xDEE3EA), factory.GetColor(0xCFD7DE));
+            cb.Checked.SplitBorder = LinearGradientColorTable.Empty;
+            cb.Checked.SplitBorderLight = LinearGradientColorTable.Empty;
+            cb.Checked.Text = factory.GetColor(0x000000);
+
+            // Expanded button
+            cb.Expanded = cb.Checked;
+
+            return cb;
+        }
+        #endregion
+
+        #region RibbonTabItem
+        public static Office2007RibbonTabItemColorTable GetRibbonTabItemBlueDefault(ColorFactory factory)
+        {
+            Office2007RibbonTabItemColorTable rt = new Office2007RibbonTabItemColorTable();
+            rt.Default.Text = factory.GetColor(0x2E2E2E);
+            rt.CornerSize = 2;
+
+            // Selected Tab
+            rt.Selected = new Office2007RibbonTabItemStateColorTable();
+            rt.Selected.Background = new LinearGradientColorTable(factory.GetColor(0xFFFFFF), factory.GetColor(0xFEFEFE));
+            rt.Selected.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(32, Color.White), Color.Transparent);
+            rt.Selected.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFFFFFF));
+            rt.Selected.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xB6BABF), factory.GetColor(0xBABEC3));
+            rt.Selected.Text = factory.GetColor(0x2E2E2E);
+
+            // Selected Tab Mouse Over
+            rt.SelectedMouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.SelectedMouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xFFFFFF), factory.GetColor(0xFEFEFE));
+            rt.SelectedMouseOver.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(32, Color.White), Color.Transparent);
+            rt.SelectedMouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFFFFFF));
+            rt.SelectedMouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xB6BABF), factory.GetColor(0xBABEC3));
+            rt.SelectedMouseOver.Text = factory.GetColor(0x2E2E2E);
+
+            // Tab Mouse Over
+            rt.MouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.MouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xD9D9D9), factory.GetColor(0xFBFBFB));
+            rt.MouseOver.BackgroundHighlight = LinearGradientColorTable.Empty;
+            rt.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xF6F6F6), factory.GetColor(0xFBFBFB));
+            rt.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xB5B5B5), factory.GetColor(0xB1B5BA));
+            rt.MouseOver.Text = factory.GetColor(0x2E2E2E);
+
+            return rt;
+        }
+
+        public static Office2007RibbonTabItemColorTable GetRibbonTabItemBlueMagenta(ColorFactory factory)
+        {
+            Office2007RibbonTabItemColorTable rt = new Office2007RibbonTabItemColorTable();
+            rt.Default.Text = factory.GetColor(0x2E2E2E);
+            rt.CornerSize = 2;
+
+            // Selected Tab
+            rt.Selected = new Office2007RibbonTabItemStateColorTable();
+            rt.Selected.Background = new LinearGradientColorTable(factory.GetColor(0xF4DEEE), factory.GetColor(0xFEFEFE));
+            rt.Selected.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(64, Color.White), Color.Transparent);
+            rt.Selected.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFFFFFF), Color.Transparent);
+            rt.Selected.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xE088C0), factory.GetColor(0xDF6DAA));
+            rt.Selected.Text = factory.GetColor(0x2E2E2E);
+
+            // Selected Tab Mouse Over
+            rt.SelectedMouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.SelectedMouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xF4DEEE), factory.GetColor(0xFEFEFE));
+            rt.SelectedMouseOver.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(64, Color.White), Color.Transparent);
+            rt.SelectedMouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFFFFFF), Color.Transparent);
+            rt.SelectedMouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xE088C0), factory.GetColor(0xDF6DAA));
+            rt.SelectedMouseOver.Text = factory.GetColor(0x2E2E2E);
+
+            // Tab Mouse Over
+            rt.MouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.MouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xEDB5D8), factory.GetColor(0xFCFBFB));
+            rt.MouseOver.BackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xFCFBFB), Color.Transparent);
+            rt.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xF9D7EE), factory.GetColor(0xFDEDF8));
+            rt.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xE33991));
+            rt.MouseOver.Text = factory.GetColor(0x2E2E2E);
+
+            return rt;
+        }
+
+        public static Office2007RibbonTabItemColorTable GetRibbonTabItemBlueGreen(ColorFactory factory)
+        {
+            Office2007RibbonTabItemColorTable rt = new Office2007RibbonTabItemColorTable();
+            rt.Default.Text = factory.GetColor(0x2E2E2E);
+            rt.CornerSize = 2;
+
+            // Selected Tab
+            rt.Selected = new Office2007RibbonTabItemStateColorTable();
+            rt.Selected.Background = new LinearGradientColorTable(factory.GetColor(0xE4F3E0), factory.GetColor(0xE4F2DF));
+            rt.Selected.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(64, Color.White), Color.Transparent);
+            rt.Selected.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xD5EAD3), factory.GetColor(0xB8DEB1));
+            rt.Selected.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xB9C1B7), factory.GetColor(0xBFC1BE));
+            rt.Selected.Text = factory.GetColor(0x2E2E2E);
+
+            // Selected Tab Mouse Over
+            rt.SelectedMouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.SelectedMouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xE4F3E0), factory.GetColor(0xE4F2DF));
+            rt.SelectedMouseOver.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(32, Color.White), Color.Transparent);
+            rt.SelectedMouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xD5EAD3), factory.GetColor(0xB8DEB1));
+            rt.SelectedMouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xB9C1B7), factory.GetColor(0xBFC1BE));
+            rt.SelectedMouseOver.Text = factory.GetColor(0x2E2E2E);
+
+            // Tab Mouse Over
+            rt.MouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.MouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xB3DEE3), factory.GetColor(0x8ADE9F));
+            rt.MouseOver.BackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xDEECFF), Color.Transparent);
+            rt.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xE2EFFF), factory.GetColor(0xC7DFFF));
+            rt.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xC1C8D1), factory.GetColor(0xC0C7D0));
+            rt.MouseOver.Text = factory.GetColor(0x2E2E2E);
+
+            return rt;
+        }
+
+        public static Office2007RibbonTabItemColorTable GetRibbonTabItemBlueOrange(ColorFactory factory)
+        {
+            Office2007RibbonTabItemColorTable rt = new Office2007RibbonTabItemColorTable();
+            rt.Default.Text = factory.GetColor(0x2E2E2E);
+            rt.CornerSize = 2;
+
+            // Selected Tab
+            rt.Selected = new Office2007RibbonTabItemStateColorTable();
+            rt.Selected.Background = new LinearGradientColorTable(factory.GetColor(0xFFF59F), factory.GetColor(0xFFFAD5));
+            rt.Selected.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(64, Color.White), Color.Transparent);
+            rt.Selected.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFFFBD6), factory.GetColor(0xFDF28C));
+            rt.Selected.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xCAC7AC), factory.GetColor(0xC2C2C2));
+            rt.Selected.Text = factory.GetColor(0x2E2E2E);
+
+            // Selected Tab Mouse Over
+            rt.SelectedMouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.SelectedMouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xFFF59F), factory.GetColor(0xFFFAD5));
+            rt.SelectedMouseOver.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(32, Color.White), Color.Transparent);
+            rt.SelectedMouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFFFBD6), factory.GetColor(0xFDF28C));
+            rt.SelectedMouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xCAC7AC), factory.GetColor(0xC2C2C2));
+            rt.SelectedMouseOver.Text = factory.GetColor(0x2E2E2E);
+
+            // Tab Mouse Over
+            rt.MouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.MouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xCFE0E1), factory.GetColor(0xE9E799));
+            rt.MouseOver.BackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xCBE2FF), Color.Transparent);
+            rt.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xE2EFFF), factory.GetColor(0xC7DFFF));
+            rt.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xC1C8D1), factory.GetColor(0xC0C7D0));
+            rt.MouseOver.Text = factory.GetColor(0x2E2E2E);
+
+            return rt;
+        }
+        #endregion
+
+        #region Style Class Creation
+        public static ElementStyle GetFileMenuContainerStyle(Office2007ColorTable table)
+        {
+            ElementStyle style = new ElementStyle();
+            style.Class = ElementStyleClassKeys.RibbonFileMenuContainerKey;
+            Rendering.Office2007MenuColorTable mc = table.Menu;
+
+            style.PaddingBottom = 3;
+            style.PaddingLeft = 0;
+            style.PaddingRight = 0;
+            style.PaddingTop = 22;
+            style.Border = eStyleBorderType.Solid;
+            style.CornerType = eCornerType.Rounded;
+            style.BorderWidth = 1;
+            style.BorderColor = Color.Transparent;
+            style.CornerDiameter = 3;
+            BackgroundColorBlend[] blend = new BackgroundColorBlend[mc.FileBackgroundBlend.Count];
+            mc.FileBackgroundBlend.CopyTo(blend);
+            style.BackColorBlend.Clear();
+            style.BackColorBlend.AddRange(blend);
+            style.BackColorGradientAngle = 90;
+            return style;
+        }
+
+        public static ElementStyle GetTwoColumnMenuContainerStyle(Office2007ColorTable table)
+        {
+            ElementStyle style = new ElementStyle();
+            style.Class = ElementStyleClassKeys.RibbonFileMenuTwoColumnContainerKey;
+            Rendering.Office2007MenuColorTable mc = table.Menu;
+
+            style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Double;
+            style.BorderBottomWidth = 0;
+            style.BorderColor = mc.FileContainerBorder;
+            //style.BorderColorLight = mc.FileContainerBorderLight;
+            style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.None;
+            style.BorderLeftWidth = 0;
+            style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.None;
+            style.BorderRightWidth = 0;
+            style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            style.BorderTopWidth =1;
+            style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            style.BorderBottomWidth = 1;
+            style.PaddingBottom = 0;
+            style.PaddingLeft = 0;
+            style.PaddingRight = 0;
+            style.PaddingTop = 0;
+
+            return style;
+        }
+
+        public static ElementStyle GetMenuColumnOneContainerStyle(Office2007ColorTable table)
+        {
+            ElementStyle style = new ElementStyle();
+            style.Class = ElementStyleClassKeys.RibbonFileMenuColumnOneContainerKey;
+            Rendering.Office2007MenuColorTable mc = table.Menu;
+
+            style.BackColor = mc.FileColumnOneBackground;
+            style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            style.BorderRightColor = mc.FileColumnOneBorder;
+            style.BorderRightWidth = 1;
+            style.PaddingRight = 1;
+
+            return style;
+        }
+
+        public static ElementStyle GetMenuColumnTwoContainerStyle(Office2007ColorTable table)
+        {
+            ElementStyle style = new ElementStyle();
+            style.Class = ElementStyleClassKeys.RibbonFileMenuColumnTwoContainerKey;
+            Rendering.Office2007MenuColorTable mc = table.Menu;
+
+            style.BackColor = mc.FileColumnTwoBackground;
+
+            return style;
+        }
+
+        public static ElementStyle GetMenuBottomContainer(Office2007ColorTable table)
+        {
+            ElementStyle style = new ElementStyle();
+            style.Class = ElementStyleClassKeys.RibbonFileMenuBottomContainerKey;
+            Rendering.Office2007MenuColorTable mc = table.Menu;
+
+            //BackgroundColorBlend[] blend = new BackgroundColorBlend[mc.FileBottomContainerBackgroundBlend.Count];
+            //mc.FileBottomContainerBackgroundBlend.CopyTo(blend);
+            //style.BackColorBlend.Clear();
+            //style.BackColorBlend.AddRange(blend);
+            //style.BackColorGradientAngle = 90;
+            style.MarginTop = 2;
+            style.MarginRight = 2;
+            return style;
+        }
+        #endregion
+
+        #region Scroll Bar
+        public static void InitializeScrollBarColorTable(Office2007ColorTable t, ColorFactory factory)
+        {
+            Office2007ScrollBarStateColorTable sct = t.ScrollBar.Default;
+            sct.Background = new LinearGradientColorTable(factory.GetColor(0xEFEFEF), factory.GetColor(0xFCFCFC), 0);
+            sct.Border = new LinearGradientColorTable(factory.GetColor(0xEBEDEF), Color.Empty);
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(0x6E7EA6), factory.GetColor(0x424B63), 90);
+            sct.TrackBackground.Clear();
+            sct.TrackBackground.AddRange(new BackgroundColorBlend[] { new BackgroundColorBlend(factory.GetColor(0xF2F3F3),0f), 
+                new BackgroundColorBlend(factory.GetColor(0xF0F0F0),0.5f),
+                new BackgroundColorBlend(factory.GetColor(0xEBEBEC),0.5f),
+                new BackgroundColorBlend(factory.GetColor(0xE6E7E8),1f)});
+            sct.TrackInnerBorder = LinearGradientColorTable.Empty;
+            sct.TrackOuterBorder = new LinearGradientColorTable(factory.GetColor(0xB6BABF), Color.Empty);
+            sct.TrackSignBackground = new LinearGradientColorTable(Color.FromArgb(180, factory.GetColor(0x8F8F8F)), Color.FromArgb(64, Color.White));
+
+            // Mouse Over
+            sct = t.ScrollBar.MouseOver;
+            sct.Background = t.ScrollBar.Default.Background;
+            sct.Border = t.ScrollBar.Default.Border;
+            sct.ThumbBackground.Clear();
+            sct.ThumbBackground.AddRange(new BackgroundColorBlend[] { new BackgroundColorBlend(factory.GetColor(0xFFFFFF),0f), 
+                new BackgroundColorBlend(factory.GetColor(0xFCFDFD),0.8f),
+                new BackgroundColorBlend(factory.GetColor(0xF2F3F4),0.8f),
+                new BackgroundColorBlend(factory.GetColor(0xF2F3F4),1f)});
+            sct.ThumbInnerBorder = LinearGradientColorTable.Empty;
+            sct.ThumbOuterBorder = new LinearGradientColorTable(factory.GetColor(0xB6BABF));
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(0x6E7EA6), factory.GetColor(0x424B63), 90);
+            sct.TrackBackground.Clear();
+            sct.TrackBackground.AddRange(new BackgroundColorBlend[] { new BackgroundColorBlend(factory.GetColor(0xFFFFFF),0f), 
+                new BackgroundColorBlend(factory.GetColor(0xFCFDFD),0.8f),
+                new BackgroundColorBlend(factory.GetColor(0xF2F3F4),0.8f),
+                new BackgroundColorBlend(factory.GetColor(0xF2F3F4),1f)});
+            sct.TrackInnerBorder = LinearGradientColorTable.Empty;
+            sct.TrackOuterBorder = new LinearGradientColorTable(factory.GetColor(0xAEB3B8), Color.Empty);
+            sct.TrackSignBackground = new LinearGradientColorTable(factory.GetColor(0x8F8F8F));
+
+            // Control Mouse Over
+            sct = t.ScrollBar.MouseOverControl;
+            sct.Background = t.ScrollBar.Default.Background;
+            sct.Border = t.ScrollBar.Default.Border;
+            sct.ThumbBackground.Clear();
+            sct.ThumbBackground.AddRange(new BackgroundColorBlend[] { new BackgroundColorBlend(factory.GetColor(0xFFFFFF),0f), 
+                new BackgroundColorBlend(factory.GetColor(0xFCFDFD),0.8f),
+                new BackgroundColorBlend(factory.GetColor(0xF2F3F4),0.8f),
+                new BackgroundColorBlend(factory.GetColor(0xF2F3F4),1f)});
+            sct.ThumbInnerBorder = LinearGradientColorTable.Empty;
+            sct.ThumbOuterBorder = new LinearGradientColorTable(factory.GetColor(0xB6BABF));
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(0x6E7EA6), factory.GetColor(0x424B63), 90);
+            sct.TrackBackground.Clear();
+            sct.TrackBackground.AddRange(new BackgroundColorBlend[] { new BackgroundColorBlend(factory.GetColor(0xFFFFFF),0f), 
+                new BackgroundColorBlend(factory.GetColor(0xFCFDFD),0.8f),
+                new BackgroundColorBlend(factory.GetColor(0xF2F3F4),0.8f),
+                new BackgroundColorBlend(factory.GetColor(0xF2F3F4),1f)});
+            sct.TrackInnerBorder = LinearGradientColorTable.Empty;
+            sct.TrackOuterBorder = new LinearGradientColorTable(factory.GetColor(0xAEB3B8), Color.Empty);
+            sct.TrackSignBackground = new LinearGradientColorTable(factory.GetColor(0x8F8F8F));
+
+            // Pressed
+            sct = t.ScrollBar.Pressed;
+            sct.Background = t.ScrollBar.Default.Background;
+            sct.Border = t.ScrollBar.Default.Border;
+            sct.ThumbBackground.Clear();
+            sct.ThumbBackground.AddRange(new BackgroundColorBlend[] { 
+                new BackgroundColorBlend(factory.GetColor(0xE1E2E3),0f), 
+                new BackgroundColorBlend(factory.GetColor(0xE1E2E3),1f)
+            });
+            sct.ThumbInnerBorder = LinearGradientColorTable.Empty;
+            sct.ThumbOuterBorder = new LinearGradientColorTable(factory.GetColor(0xAEB3B8));
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(0x888889));
+            sct.TrackBackground.Clear();
+            sct.TrackBackground.AddRange(new BackgroundColorBlend[] {
+                new BackgroundColorBlend(factory.GetColor(0xE1E2E3),0f), 
+                new BackgroundColorBlend(factory.GetColor(0xE1E2E3),1f)
+            });
+            sct.TrackInnerBorder = LinearGradientColorTable.Empty;
+            sct.TrackOuterBorder = new LinearGradientColorTable(factory.GetColor(0xAEB3B8), Color.Empty);
+            sct.TrackSignBackground = new LinearGradientColorTable(factory.GetColor(0x8F8F8F));
+            // Disabled
+            sct = t.ScrollBar.Disabled;
+            sct.Background = t.ScrollBar.Default.Background;
+            sct.Border = t.ScrollBar.Default.Border;
+            sct.ThumbBackground.Clear();
+            sct.ThumbInnerBorder = new LinearGradientColorTable();
+            sct.ThumbOuterBorder = new LinearGradientColorTable();
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(0xBFCFF7), factory.GetColor(0x727C94));
+            sct.TrackBackground.Clear();
+            sct.TrackInnerBorder = new LinearGradientColorTable();
+            sct.TrackOuterBorder = new LinearGradientColorTable();
+            sct.TrackSignBackground = new LinearGradientColorTable();
+        }
+
+        public static void InitializeAppBlueScrollBarColorTable(Office2007ColorTable t, ColorFactory factory)
+        {
+            Office2007ScrollBarStateColorTable sct = t.AppScrollBar.Default;
+            sct.Background = new LinearGradientColorTable(factory.GetColor(0xD6DCE2), factory.GetColor(0xD8DEE4), 0);
+            sct.Border = new LinearGradientColorTable(factory.GetColor(0xE6ECF2));
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(0x747576), factory.GetColor(0x454647), 90);
+            sct.TrackBackground.Clear();
+            sct.TrackBackground.AddRange(new BackgroundColorBlend[] { 
+                new BackgroundColorBlend(factory.GetColor(0xF0F4F8),0f), 
+                new BackgroundColorBlend(factory.GetColor(0xEAEEF3),.8f),
+                new BackgroundColorBlend(factory.GetColor(0xE0E4E9),.8f),
+                new BackgroundColorBlend(factory.GetColor(0xD7DBE1),1f)});
+            sct.TrackInnerBorder = LinearGradientColorTable.Empty;
+            sct.TrackOuterBorder = new LinearGradientColorTable(factory.GetColor(0x8A9199), Color.Empty);
+            sct.TrackSignBackground = new LinearGradientColorTable(factory.GetColor(0x7D7D7D));
+
+            // Mouse Over
+            sct = t.AppScrollBar.MouseOver;
+            sct.Background = t.AppScrollBar.Default.Background;
+            sct.Border = t.AppScrollBar.Default.Border;
+            sct.ThumbBackground.Clear();
+            sct.ThumbBackground.AddRange(new BackgroundColorBlend[] { 
+                new BackgroundColorBlend(factory.GetColor(0xFCFDFE),0f), 
+                new BackgroundColorBlend(factory.GetColor(0xF3F6F9),0.8f),
+                new BackgroundColorBlend(factory.GetColor(0xEAEDF1),0.8f),
+                new BackgroundColorBlend(factory.GetColor(0xE4E8EC),1f)});
+            sct.ThumbInnerBorder = new LinearGradientColorTable(factory.GetColor(0xFCFDFE), factory.GetColor(0xF1F3F5));
+            sct.ThumbOuterBorder = new LinearGradientColorTable(factory.GetColor(0x8A9199), Color.Empty);
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(0x747576), factory.GetColor(0x454647), 90);
+            sct.TrackBackground.Clear();
+            sct.TrackBackground.CopyFrom(sct.ThumbBackground);
+            sct.TrackInnerBorder = sct.ThumbInnerBorder;
+            sct.TrackOuterBorder = sct.ThumbOuterBorder;
+            sct.TrackSignBackground = new LinearGradientColorTable(factory.GetColor(0x7D7D7D));
+
+            // Control Mouse Over
+            sct = t.AppScrollBar.MouseOverControl;
+            sct.Background = t.AppScrollBar.Default.Background;
+            sct.Border = t.AppScrollBar.Default.Border;
+            sct.ThumbBackground.Clear();
+            sct.ThumbBackground.CopyFrom(t.AppScrollBar.Default.TrackBackground);
+            sct.ThumbInnerBorder = t.AppScrollBar.Default.TrackInnerBorder;
+            sct.ThumbOuterBorder = t.AppScrollBar.Default.TrackOuterBorder;
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(0x747576), factory.GetColor(0x454647));
+            sct.TrackBackground.Clear();
+            sct.TrackBackground.CopyFrom(t.AppScrollBar.Default.TrackBackground);
+            sct.TrackInnerBorder = t.AppScrollBar.Default.TrackInnerBorder;
+            sct.TrackOuterBorder = t.AppScrollBar.Default.TrackOuterBorder;
+            sct.TrackSignBackground = t.AppScrollBar.Default.TrackSignBackground;
+
+            // Pressed
+            sct = t.AppScrollBar.Pressed;
+            sct.Background = t.AppScrollBar.Default.Background;
+            sct.Border = t.AppScrollBar.Default.Border;
+            sct.ThumbBackground.Clear();
+            sct.ThumbBackground.AddRange(new BackgroundColorBlend[] { 
+                new BackgroundColorBlend(factory.GetColor(0xEBEFF3),0f), 
+                new BackgroundColorBlend(factory.GetColor(0xE5E8ED),0.8f),
+                new BackgroundColorBlend(factory.GetColor(0xDADEE3),0.8f),
+                new BackgroundColorBlend(factory.GetColor(0xD0D4DA),1f)});
+            sct.ThumbInnerBorder = LinearGradientColorTable.Empty;
+            sct.ThumbOuterBorder = new LinearGradientColorTable(factory.GetColor(0x8A9199), Color.Empty);
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(0x6E7EA6), factory.GetColor(0x424B63), 90);
+            sct.TrackBackground.Clear();
+            sct.TrackBackground.CopyFrom(sct.ThumbBackground);
+            sct.TrackInnerBorder = LinearGradientColorTable.Empty;
+            sct.TrackOuterBorder = new LinearGradientColorTable(factory.GetColor(0x8A9199), Color.Empty);
+            sct.TrackSignBackground = t.AppScrollBar.Default.TrackSignBackground;
+            // Disabled
+            sct = t.AppScrollBar.Disabled;
+            sct.Background = t.AppScrollBar.Default.Background;
+            sct.Border = t.AppScrollBar.Default.Border;
+            sct.ThumbBackground.Clear();
+            sct.ThumbInnerBorder = new LinearGradientColorTable();
+            sct.ThumbOuterBorder = new LinearGradientColorTable();
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(0xBFCFF7), factory.GetColor(0x727C94));
+            sct.TrackBackground.Clear();
+            sct.TrackInnerBorder = new LinearGradientColorTable();
+            sct.TrackOuterBorder = new LinearGradientColorTable();
+            sct.TrackSignBackground = new LinearGradientColorTable();
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/Office2010SystemCaptionItemPainter.cs b/PROMS/DotNetBar Source Code/Rendering/Office2010SystemCaptionItemPainter.cs
new file mode 100644
index 00000000..8236d0c5
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/Office2010SystemCaptionItemPainter.cs	
@@ -0,0 +1,188 @@
+using System;
+using System.Text;
+using DevComponents.DotNetBar.Rendering;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Drawing.Text;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    internal class Office2010SystemCaptionItemPainter : Office2007SystemCaptionItemPainter
+    {
+        #region Internal Implementation
+        protected override void PaintMinimize(Graphics g, Rectangle r, Office2007SystemButtonStateColorTable ct, bool isEnabled, LinearGradientColorTable foregroundOverride)
+        {
+            //SmoothingMode sm = g.SmoothingMode;
+            //g.SmoothingMode = SmoothingMode.AntiAlias;
+
+            Size s = new Size(Dpi.Width11, Dpi.Height5);
+            Rectangle rm = GetSignRect(r, s);
+
+            DisplayHelp.DrawRoundedRectangle(g, ct.DarkShade, (foregroundOverride ?? ct.Foreground), rm, 1);
+
+            //g.SmoothingMode = sm;
+        }
+
+        protected override void PaintRestore(Graphics g, Rectangle r, Office2007SystemButtonStateColorTable ct, bool isEnabled, LinearGradientColorTable foregroundOverride)
+        {
+            //SmoothingMode sm = g.SmoothingMode;
+            //g.SmoothingMode = SmoothingMode.Default;
+
+            Size s = new Size(Dpi.Width12, Dpi.Height11);
+            Rectangle rm = GetSignRect(r, s);
+            Region oldClip = g.Clip;
+
+            LinearGradientColorTable foreground = foregroundOverride ?? ct.Foreground;
+            using (Brush fill = DisplayHelp.CreateBrush(rm, foreground))
+            {
+                using (Pen pen = new Pen(ct.DarkShade))
+                {
+                    using (GraphicsPath path = DisplayHelp.GetRoundedRectanglePath(new Rectangle(rm.X + Dpi.Width5, rm.Y, Dpi.Width8, Dpi.Height8), 1))
+                    {
+                        Rectangle inner = new Rectangle(rm.X + Dpi.Width7, rm.Y + Dpi.Height4, Dpi.Width4, Dpi.Width2);
+                        g.SetClip(inner, CombineMode.Exclude);
+                        g.SetClip(new Rectangle(rm.X, rm.Y + Dpi.Height3, Dpi.Width8, Dpi.Height8), CombineMode.Exclude);
+                        g.FillPath(fill, path);
+                        g.DrawPath(pen, path);
+                        g.ResetClip();
+                        g.DrawRectangle(pen, inner);
+                    }
+                    using (GraphicsPath path = DisplayHelp.GetRoundedRectanglePath(new Rectangle(rm.X, rm.Y + Dpi.Height3, Dpi.Width8, Dpi.Height8), 1))
+                    {
+                        Rectangle inner = new Rectangle(rm.X + Dpi.Width2, rm.Y + Dpi.Height7, Dpi.Width4, Dpi.Width2);
+                        g.SetClip(inner, CombineMode.Exclude);
+                        g.FillPath(fill, path);
+                        g.DrawPath(pen, path);
+                        g.ResetClip();
+                        g.DrawRectangle(pen, inner);
+                    }
+                }
+            }
+            if (oldClip != null)
+            {
+                g.Clip = oldClip;
+                oldClip.Dispose();
+            }
+            //g.SmoothingMode = sm;
+        }
+
+        protected override void PaintMaximize(Graphics g, Rectangle r, Office2007SystemButtonStateColorTable ct, bool isEnabled, LinearGradientColorTable foregroundOverride)
+        {
+            Size s = new Size(Dpi.Width11, Dpi.Height9);
+            Rectangle rm = GetSignRect(r, s);
+            Region oldClip = g.Clip;
+
+            LinearGradientColorTable foreground = foregroundOverride ?? ct.Foreground;
+            using (Brush fill = DisplayHelp.CreateBrush(rm, foreground))
+            {
+                using (Pen pen = new Pen(ct.DarkShade))
+                {
+                    Rectangle inner = new Rectangle(rm.X + Dpi.Width3, rm.Y + Dpi.Height3, Dpi.Width(ct.DarkShade.IsEmpty ? 5 : 4), Dpi.Height(ct.DarkShade.IsEmpty ? 3 : 2));
+                    g.SetClip(inner, CombineMode.Exclude);
+                    DisplayHelp.DrawRoundedRectangle(g, pen, fill, rm.X, rm.Y, rm.Width, rm.Height, 1);
+                    g.ResetClip();
+                    g.DrawRectangle(pen, inner);
+                }
+            }
+
+            if (oldClip != null)
+            {
+                g.Clip = oldClip;
+                oldClip.Dispose();
+            }
+        }
+
+        protected override void PaintClose(Graphics g, Rectangle r, Office2007SystemButtonStateColorTable ct, bool isEnabled, LinearGradientColorTable foregroundOverride)
+        {
+            SmoothingMode sm = g.SmoothingMode;
+            g.SmoothingMode = SmoothingMode.Default;
+
+            Size s = new Size(Dpi.Width11, Dpi.Height9);
+            Rectangle rm = GetSignRect(r, s);
+
+            Rectangle r1 = rm;
+            r1.Inflate(-1, 0);
+            r1.Height--;
+
+            using (GraphicsPath path = new GraphicsPath())
+            {
+                path.AddLine(r1.X + Dpi.Width1, r1.Y, r1.X + Dpi.Width3, r1.Y);
+                path.AddLine(r1.X + Dpi.Width3, r1.Y, r1.X + Dpi.Width5, r1.Y + Dpi.Width2);
+                path.AddLine(r1.X + Dpi.Width5, r1.Y + Dpi.Width2, r1.X + Dpi.Width7, r1.Y);
+                path.AddLine(r1.X + Dpi.Width7, r1.Y, r1.X + Dpi.Width9, r1.Y);
+                path.AddLine(r1.X + Dpi.Width10, r1.Y + Dpi.Height1, r1.X + Dpi.Width7, r1.Y + Dpi.Height4);
+                path.AddLine(r1.X + Dpi.Width7, r1.Y + Dpi.Height4, r1.X + Dpi.Width10, r1.Y + Dpi.Height7);
+                path.AddLine(r1.X + Dpi.Width10, r1.Y + Dpi.Height7, r1.X + Dpi.Width9, r1.Y + Dpi.Height8);
+                path.AddLine(r1.X + Dpi.Width9, r1.Y + Dpi.Height8, r1.X + Dpi.Width7, r1.Y + Dpi.Height8);
+                path.AddLine(r1.X + Dpi.Width7, r1.Y + Dpi.Height8, r1.X + Dpi.Width5, r1.Y + Dpi.Height6);
+                path.AddLine(r1.X + Dpi.Width5, r1.Y + Dpi.Height6, r1.X + Dpi.Width3, r1.Y + Dpi.Height8);
+                path.AddLine(r1.X + Dpi.Width3, r1.Y + Dpi.Height8, r1.X + Dpi.Width1, r1.Y + Dpi.Height8);
+                path.AddLine(r1.X, r1.Y + Dpi.Height7, r1.X + Dpi.Width3, r1.Y + Dpi.Height4);
+                path.AddLine(r1.X + Dpi.Width3, r1.Y + Dpi.Height4, r1.X, r1.Y + Dpi.Height1);
+
+                LinearGradientColorTable foreground = foregroundOverride ?? ct.Foreground;
+                if (isEnabled)
+                {
+                    DisplayHelp.FillPath(g, path, foreground);
+                    if (!ct.DarkShade.IsEmpty)
+                    {
+                        using (Pen pen = new Pen(ct.DarkShade))
+                        {
+                            g.DrawPath(pen, path);
+                        }
+                    }
+                    else
+                    {
+                        using (Pen pen = new Pen(foreground.Start))
+                        {
+                            g.DrawPath(pen, path);
+                        }
+                    }
+                }
+                else
+                {
+                    LinearGradientColorTable lg = new LinearGradientColorTable(foreground.Start.IsEmpty ? foreground.Start : Color.FromArgb(128, foreground.Start),
+                        foreground.End.IsEmpty ? foreground.End : Color.FromArgb(128, foreground.End),
+                        foreground.GradientAngle);
+                    DisplayHelp.FillPath(g, path, lg);
+                    DisplayHelp.DrawGradientPathBorder(g, path, lg, 1);
+                }
+            }
+
+            g.SmoothingMode = sm;
+        }
+
+        protected override void PaintHelp(Graphics g, Rectangle r, Office2007SystemButtonStateColorTable ct, bool isEnabled, LinearGradientColorTable foregroundOverride)
+        {
+            SmoothingMode sm = g.SmoothingMode;
+            TextRenderingHint th = g.TextRenderingHint;
+            g.SmoothingMode = SmoothingMode.Default;
+            g.TextRenderingHint = TextRenderingHint.ClearTypeGridFit;
+#if FRAMEWORK20
+            using (Font font = new Font(SystemFonts.DefaultFont, FontStyle.Bold))
+#else
+			using(Font font = new Font("Arial", 10, FontStyle.Bold))
+#endif
+            {
+                Size s = TextDrawing.MeasureString(g, "?", font);
+                s.Width += 4;
+                s.Height -= 2;
+                Rectangle rm = GetSignRect(r, s);
+
+                rm.Offset(1, 1);
+                using (SolidBrush brush = new SolidBrush(ct.DarkShade))
+                    g.DrawString("?", font, brush, rm);
+                rm.Offset(-1, -1);
+                LinearGradientColorTable foreground = foregroundOverride ?? ct.Foreground;
+                using (SolidBrush brush = new SolidBrush(foreground.Start))
+                    g.DrawString("?", font, brush, rm);
+
+            }
+            g.SmoothingMode = sm;
+            g.TextRenderingHint = th;
+        }
+        
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/ProgressBarItemPainter.cs b/PROMS/DotNetBar Source Code/Rendering/ProgressBarItemPainter.cs
new file mode 100644
index 00000000..9c6f91c8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/ProgressBarItemPainter.cs	
@@ -0,0 +1,13 @@
+using System;
+using System.Text;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    /// <summary>
+    /// Defines abstract class for the ProgressBarItem painter.
+    /// </summary>
+    internal abstract class ProgressBarItemPainter
+    {
+        public abstract void Paint(ProgressBarItemRenderEventArgs e);
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/QatCustomizeItemPainter.cs b/PROMS/DotNetBar Source Code/Rendering/QatCustomizeItemPainter.cs
new file mode 100644
index 00000000..d698a0bd
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/QatCustomizeItemPainter.cs	
@@ -0,0 +1,13 @@
+using System;
+using System.Text;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    /// <summary>
+    /// Defines base class for QAT customize item painter.
+    /// </summary>
+    internal abstract class QatCustomizeItemPainter
+    {
+        public abstract void Paint(QatCustomizeItemRendererEventArgs e);
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/QatOverflowPainter.cs b/PROMS/DotNetBar Source Code/Rendering/QatOverflowPainter.cs
new file mode 100644
index 00000000..69db0b16
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/QatOverflowPainter.cs	
@@ -0,0 +1,13 @@
+using System;
+using System.Text;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    /// <summary>
+    /// Defines base class for QAT overflow item painter.
+    /// </summary>
+    internal abstract class QatOverflowPainter
+    {
+        public abstract void Paint(QatOverflowItemRendererEventArgs e);
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/ResizeHandlePainter.cs b/PROMS/DotNetBar Source Code/Rendering/ResizeHandlePainter.cs
new file mode 100644
index 00000000..f32a374b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/ResizeHandlePainter.cs	
@@ -0,0 +1,60 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    internal static class ResizeHandlePainter
+    {
+        internal static void DrawResizeHandle(Graphics g, Rectangle statusBarBounds, Color lightColor, Color color, bool rightToLeft)
+        {
+            int direction = 1;
+            Point startLoc = new Point(statusBarBounds.Right, statusBarBounds.Bottom);
+            if (rightToLeft)
+            {
+                direction = -1;
+                startLoc = new Point(0, statusBarBounds.Bottom - Dpi.Width2);
+            }
+
+            using (Pen pen = new Pen(lightColor, Dpi.Width1))
+            {
+                g.DrawLine(pen, startLoc.X - Dpi.Width2 * direction, startLoc.Y - Dpi.Height2,
+                    startLoc.X - Dpi.Width3 * direction, startLoc.Y - Dpi.Height2);
+                g.DrawLine(pen, startLoc.X - Dpi.Width6 * direction, startLoc.Y - Dpi.Height2,
+                    startLoc.X - Dpi.Width7 * direction, startLoc.Y - Dpi.Height2);
+                g.DrawLine(pen, startLoc.X - Dpi.Width10 * direction, startLoc.Y - Dpi.Height2,
+                    startLoc.X - Dpi.Width11 * direction, startLoc.Y - Dpi.Height2);
+                g.DrawLine(pen, startLoc.X - Dpi.Width2 * direction, startLoc.Y - Dpi.Height2,
+                    startLoc.X - Dpi.Width2 * direction, startLoc.Y - Dpi.Height3);
+                g.DrawLine(pen, startLoc.X - Dpi.Width6 * direction, startLoc.Y - Dpi.Height2,
+                    startLoc.X - Dpi.Width6 * direction, startLoc.Y - Dpi.Height3);
+                g.DrawLine(pen, startLoc.X - Dpi.Width10 * direction, startLoc.Y - Dpi.Height2,
+                    startLoc.X - Dpi.Width10 * direction, startLoc.Y - Dpi.Height3);
+                g.DrawLine(pen, startLoc.X - Dpi.Width2 * direction, startLoc.Y - Dpi.Height6,
+                    startLoc.X - Dpi.Width3 * direction, startLoc.Y - Dpi.Height6);
+                g.DrawLine(pen, startLoc.X - Dpi.Width6 * direction, startLoc.Y - Dpi.Height6,
+                    startLoc.X - Dpi.Width7 * direction, startLoc.Y - Dpi.Height6);
+                g.DrawLine(pen, startLoc.X - Dpi.Width2 * direction, startLoc.Y - Dpi.Height6,
+                    startLoc.X - Dpi.Width2 * direction, startLoc.Y - Dpi.Height7);
+                g.DrawLine(pen, startLoc.X - Dpi.Width6 * direction, startLoc.Y - Dpi.Height6,
+                    startLoc.X - Dpi.Width6 * direction, startLoc.Y - Dpi.Height7);
+                g.DrawLine(pen, startLoc.X - Dpi.Width2 * direction, startLoc.Y - Dpi.Height10,
+                    startLoc.X - Dpi.Width3 * direction, startLoc.Y - Dpi.Height10);
+                g.DrawLine(pen, startLoc.X - Dpi.Width2 * direction, startLoc.Y - Dpi.Height10,
+                    startLoc.X - Dpi.Width2 * direction, startLoc.Y - Dpi.Height11);
+            }
+
+            // draw dark squares
+            using (Pen pen = new Pen(color, Dpi.Width1))
+            {
+                g.DrawRectangle(pen, startLoc.X - Dpi.Width4 * direction, startLoc.Y - Dpi.Height4, Dpi.Width1, Dpi.Width1);
+                g.DrawRectangle(pen, startLoc.X - Dpi.Width8 * direction, startLoc.Y - Dpi.Height4, Dpi.Width1, Dpi.Width1);
+                g.DrawRectangle(pen, startLoc.X - Dpi.Width12 * direction, startLoc.Y - Dpi.Height4, Dpi.Width1, Dpi.Width1);
+                g.DrawRectangle(pen, startLoc.X - Dpi.Width4 * direction, startLoc.Y - Dpi.Height8, Dpi.Width1, Dpi.Width1);
+                g.DrawRectangle(pen, startLoc.X - Dpi.Width8 * direction, startLoc.Y - Dpi.Height8, Dpi.Width1, Dpi.Width1);
+                g.DrawRectangle(pen, startLoc.X - Dpi.Width4 * direction, startLoc.Y - Dpi.Height12, Dpi.Width1, Dpi.Width1);
+            }
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/SideBarPainter.cs b/PROMS/DotNetBar Source Code/Rendering/SideBarPainter.cs
new file mode 100644
index 00000000..e8e1a9e0
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/SideBarPainter.cs	
@@ -0,0 +1,12 @@
+using System;
+using System.Text;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    internal class SideBarPainter
+    {
+        public virtual void PaintSideBar(SideBarRendererEventArgs e){}
+
+        public virtual void PaintSideBarPanelItem(SideBarPanelItemRendererEventArgs e) { }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/SliderPainter.cs b/PROMS/DotNetBar Source Code/Rendering/SliderPainter.cs
new file mode 100644
index 00000000..76fd0bfa
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/SliderPainter.cs	
@@ -0,0 +1,21 @@
+using System;
+using System.Text;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    /// <summary>
+    /// Renders the Slider items.
+    /// </summary>
+    internal class SliderPainter
+    {
+        public virtual void Paint(SliderItemRendererEventArgs e) { }
+    }
+
+    /// <summary>
+    /// Renders the Range Slider items.
+    /// </summary>
+    internal class RangeSliderPainter
+    {
+        public virtual void Paint(RangeSliderItemRendererEventArgs e) { }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/StepIndicatorColorTable.cs b/PROMS/DotNetBar Source Code/Rendering/StepIndicatorColorTable.cs
new file mode 100644
index 00000000..86ba46dc
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/StepIndicatorColorTable.cs	
@@ -0,0 +1,39 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    /// <summary>
+    /// Specifies colors for StepIndicator control.
+    /// </summary>
+    public class StepIndicatorColorTable
+    {
+        /// <summary>
+        /// Initializes a new instance of the StepIndicatorColorTable class.
+        /// </summary>
+        public StepIndicatorColorTable()
+        {
+            
+        }
+        /// <summary>
+        /// Initializes a new instance of the StepIndicatorColorTable class.
+        /// </summary>
+        /// <param name="backgroundColor"></param>
+        /// <param name="indicatorColor"></param>
+        public StepIndicatorColorTable(Color backgroundColor, Color indicatorColor)
+        {
+            BackgroundColor = backgroundColor;
+            IndicatorColor = indicatorColor;
+        }
+        /// <summary>
+        /// Gets or sets Background color of the control.
+        /// </summary>
+        public Color BackgroundColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets indicator color.
+        /// </summary>
+        public Color IndicatorColor = Color.Empty;
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/SuperTabColorTable.cs b/PROMS/DotNetBar Source Code/Rendering/SuperTabColorTable.cs
new file mode 100644
index 00000000..a4c47e35
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/SuperTabColorTable.cs	
@@ -0,0 +1,506 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Globalization;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    /// <summary>
+    /// Defines the color table for SuperTab states
+    /// </summary>
+    [TypeConverter(typeof(SuperTabColorTableConvertor))]
+    public class SuperTabColorTable : ICloneable, IDisposable
+    {
+        #region Events
+
+        /// <summary>
+        /// Event raised when the SuperTabColorTable is changed
+        /// </summary>
+        [Description("Event raised when the SuperTabColorTable is changed")]
+        public event EventHandler<EventArgs> ColorTableChanged;
+
+        #endregion
+
+        #region Private variables
+
+        private Color _OuterBorder = Color.Empty;
+        private Color _InnerBorder = Color.Empty;
+        private SuperTabLinearGradientColorTable _Background;
+
+        private SuperTabControlBoxStateColorTable _ControlBoxDefault;
+        private SuperTabControlBoxStateColorTable _ControlBoxMouseOver;
+        private SuperTabControlBoxStateColorTable _ControlBoxPressed;
+
+        private Color _InsertMarker = Color.Empty;
+        private Color _SelectionMarker = Color.Empty;
+
+        #endregion
+
+        public SuperTabColorTable()
+        {
+            _Background = new SuperTabLinearGradientColorTable();
+            _Background.ColorTableChanged += SctColorTableChanged;
+
+            _ControlBoxDefault = new SuperTabControlBoxStateColorTable();
+            _ControlBoxDefault.ColorTableChanged += SctColorTableChanged;
+
+            _ControlBoxMouseOver = new SuperTabControlBoxStateColorTable();
+            _ControlBoxMouseOver.ColorTableChanged += SctColorTableChanged;
+
+            _ControlBoxPressed = new SuperTabControlBoxStateColorTable();
+            _ControlBoxPressed.ColorTableChanged += SctColorTableChanged;
+        }
+
+        #region Public properties
+
+        #region Background
+
+        /// <summary>
+        /// Gets or sets the Background color
+        /// </summary>
+        [Browsable(true), Category("Appearance")]
+        [Description("Indicates the Background color.")]
+        [NotifyParentProperty(true)]
+        public SuperTabLinearGradientColorTable Background
+        {
+            get { return (_Background); }
+
+            set
+            {
+                if (_Background.Equals(value) == false)
+                {
+                    if (_Background != null)
+                        _Background.ColorTableChanged -= SctColorTableChanged;
+
+                    _Background = value;
+
+                    if (_Background != null)
+                        _Background.ColorTableChanged += SctColorTableChanged;
+
+                    OnColorTableChanged();
+                }
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeBackground()
+        {
+            return (_Background.IsEmpty == false);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetBackground()
+        {
+            Background = new SuperTabLinearGradientColorTable();
+        }
+
+        #endregion
+
+        #region OuterBorder
+
+        /// <summary>
+        /// Gets or sets the colors for the outer border.
+        /// </summary>
+        [Browsable(true), Category("Appearance")]
+        [Description("Indicates the colors for the outer border.")]
+        [NotifyParentProperty(true)]
+        public Color OuterBorder
+        {
+            get { return (_OuterBorder); }
+
+            set
+            {
+                if (_OuterBorder != value)
+                {
+                    _OuterBorder = value;
+
+                    OnColorTableChanged();
+                }
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeOuterBorder()
+        {
+            return (_OuterBorder != Color.Empty);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetOuterBorder()
+        {
+            _OuterBorder = Color.Empty;
+        }
+
+        #endregion
+
+        #region InnerBorder
+
+        /// <summary>
+        /// Gets or sets the colors for the inner border.
+        /// </summary>
+        [Browsable(true), Category("Appearance")]
+        [Description("Indicates the colors for the inner border.")]
+        [NotifyParentProperty(true)]
+        public Color InnerBorder
+        {
+            get { return (_InnerBorder); }
+
+            set
+            {
+                if (_InnerBorder != value)
+                {
+                    _InnerBorder = value;
+
+                    OnColorTableChanged();
+                }
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeInnerBorder()
+        {
+            return (_InnerBorder != Color.Empty);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetInnerBorder()
+        {
+            _InnerBorder = Color.Empty;
+        }
+
+        #endregion
+
+        #region ControlBoxDefault
+
+        /// <summary>
+        /// Gets or sets the ControlBoxDefault colors
+        /// </summary>
+        [Browsable(true), Category("Appearance")]
+        [Description("Indicates the ControlBoxDefault colors.")]
+        [NotifyParentProperty(true)]
+        public SuperTabControlBoxStateColorTable ControlBoxDefault
+        {
+            get { return (_ControlBoxDefault); }
+
+            set
+            {
+                if (_ControlBoxDefault.Equals(value) == false)
+                {
+                    if (_ControlBoxDefault != null)
+                        _ControlBoxDefault.ColorTableChanged -= SctColorTableChanged;
+
+                    _ControlBoxDefault = value;
+
+                    if (_ControlBoxDefault != null)
+                        _ControlBoxDefault.ColorTableChanged += SctColorTableChanged;
+
+                    OnColorTableChanged();
+                }
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeControlBoxDefault()
+        {
+            return (_ControlBoxDefault.IsEmpty == false);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetControlBoxDefault()
+        {
+            ControlBoxDefault = new SuperTabControlBoxStateColorTable();
+        }
+
+        #endregion
+
+        #region ControlBoxDefault
+
+        /// <summary>
+        /// Gets or sets the ControlBoxMouseOver colors
+        /// </summary>
+        [Browsable(true), Category("Appearance")]
+        [Description("Indicates the ControlBoxMouseOver colors.")]
+        [NotifyParentProperty(true)]
+        public SuperTabControlBoxStateColorTable ControlBoxMouseOver
+        {
+            get { return (_ControlBoxMouseOver); }
+
+            set
+            {
+                if (_ControlBoxMouseOver.Equals(value) == false)
+                {
+                    if (_ControlBoxMouseOver != null)
+                        _ControlBoxMouseOver.ColorTableChanged -= SctColorTableChanged;
+
+                    _ControlBoxMouseOver = value;
+
+                    if (_ControlBoxMouseOver != null)
+                        _ControlBoxMouseOver.ColorTableChanged += SctColorTableChanged;
+
+                    OnColorTableChanged();
+                }
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeControlBoxMouseOver()
+        {
+            return (_ControlBoxMouseOver.IsEmpty == false);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetControlBoxMouseOver()
+        {
+            ControlBoxMouseOver = new SuperTabControlBoxStateColorTable();
+        }
+
+        #endregion
+
+        #region ControlBoxPressed
+
+        /// <summary>
+        /// Gets or sets the ControlBoxPressed colors
+        /// </summary>
+        [Browsable(true), Category("Appearance")]
+        [Description("Indicates the ControlBoxPressed colors.")]
+        [NotifyParentProperty(true)]
+        public SuperTabControlBoxStateColorTable ControlBoxPressed
+        {
+            get { return (_ControlBoxPressed); }
+
+            set
+            {
+                if (_ControlBoxPressed.Equals(value) == false)
+                {
+                    if (_ControlBoxPressed != null)
+                        _ControlBoxPressed.ColorTableChanged -= SctColorTableChanged;
+
+                    _ControlBoxPressed = value;
+
+                    if (_ControlBoxPressed != null)
+                        _ControlBoxPressed.ColorTableChanged += SctColorTableChanged;
+
+                    OnColorTableChanged();
+                }
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeControlBoxPressed()
+        {
+            return (_ControlBoxPressed.IsEmpty == false);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetControlBoxPressed()
+        {
+            ControlBoxPressed = new SuperTabControlBoxStateColorTable();
+        }
+
+        #endregion
+
+        #region InsertMarker
+
+        /// <summary>
+        /// Gets or sets the colors for the InsertMarker.
+        /// </summary>
+        [Browsable(true), Category("Appearance")]
+        [Description("Indicates the color for the InsertMarker.")]
+        [NotifyParentProperty(true)]
+        public Color InsertMarker
+        {
+            get { return (_InsertMarker); }
+
+            set
+            {
+                if (_InsertMarker != value)
+                {
+                    _InsertMarker = value;
+
+                    OnColorTableChanged();
+                }
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeInsertMarker()
+        {
+            return (_InsertMarker != Color.Empty);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetInsertMarker()
+        {
+            _InsertMarker = Color.Empty;
+        }
+
+        #endregion
+
+        #region SelectionMarker
+
+        /// <summary>
+        /// Gets or sets the color for the SelectionMarker.
+        /// </summary>
+        [Browsable(true), Category("Appearance")]
+        [Description("Indicates the color for the SelectionMarker.")]
+        [NotifyParentProperty(true)]
+        public Color SelectionMarker
+        {
+            get { return (_SelectionMarker); }
+
+            set
+            {
+                if (_SelectionMarker != value)
+                {
+                    _SelectionMarker = value;
+
+                    OnColorTableChanged();
+                }
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeSelectionMarker()
+        {
+            return (_SelectionMarker != Color.Empty);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetSelectionMarker()
+        {
+            _SelectionMarker = Color.Empty;
+        }
+
+        #endregion
+
+        #region IsEmpty
+
+        /// <summary>
+        /// Gets whether the ColorTable is empty.
+        /// </summary>
+        [Browsable(false)]
+        public bool IsEmpty
+        {
+            get
+            {
+                if (_Background.IsEmpty == false)
+                    return (false);
+
+                if (_OuterBorder != Color.Empty)
+                    return (false);
+
+                if (_InnerBorder != Color.Empty)
+                    return (false);
+
+                if (_ControlBoxDefault.IsEmpty == false)
+                    return (false);
+
+                if (_ControlBoxMouseOver.IsEmpty == false)
+                    return (false);
+
+                if (_ControlBoxPressed.IsEmpty == false)
+                    return (false);
+
+                if (_InsertMarker != Color.Empty)
+                    return (false);
+
+                if (_SelectionMarker != Color.Empty)
+                    return (false);
+
+                return (true);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region SctColorTableChanged
+
+        void SctColorTableChanged(object sender, EventArgs e)
+        {
+            OnColorTableChanged();
+        }
+
+        #endregion
+
+        #region OnColorTableChanged
+
+        private void OnColorTableChanged()
+        {
+            if (ColorTableChanged != null)
+                ColorTableChanged(this, EventArgs.Empty);
+        }
+
+        #endregion
+
+        #region ICloneable Members
+
+        public object Clone()
+        {
+            SuperTabColorTable sct = new SuperTabColorTable();
+
+            sct.Background = (SuperTabLinearGradientColorTable)Background.Clone();
+            sct.OuterBorder = OuterBorder;
+            sct.InnerBorder = InnerBorder;
+
+            sct.ControlBoxDefault = (SuperTabControlBoxStateColorTable)ControlBoxDefault.Clone();
+            sct.ControlBoxMouseOver = (SuperTabControlBoxStateColorTable)ControlBoxMouseOver.Clone();
+            sct.ControlBoxPressed = (SuperTabControlBoxStateColorTable)ControlBoxPressed.Clone();
+
+            sct.InsertMarker = InsertMarker;
+            sct.SelectionMarker = SelectionMarker;
+
+            return (sct);
+        }
+
+        #endregion
+
+        #region IDisposable Members
+
+        public void Dispose()
+        {
+            Background = null;
+            ControlBoxDefault = null;
+            ControlBoxMouseOver = null;
+            ControlBoxPressed = null;
+        }
+
+        #endregion
+    }
+
+    #region SuperTabColorTableConvertor
+
+    public class SuperTabColorTableConvertor : ExpandableObjectConverter
+    {
+        public override object ConvertTo(
+            ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+        {
+            if (destinationType == typeof(string))
+            {
+                SuperTabColorTable sct = value as SuperTabColorTable;
+
+                if (sct != null)
+                {
+                    ColorConverter cvt = new ColorConverter();
+
+                    if (sct.Background.Colors != null)
+                        return (cvt.ConvertToString(sct.Background.Colors));
+
+                    if (sct.InnerBorder.IsEmpty == false)
+                        return (cvt.ConvertToString(sct.InnerBorder));
+
+                    if (sct.OuterBorder.IsEmpty == false)
+                        return (cvt.ConvertToString(sct.OuterBorder));
+
+                    return (String.Empty);
+                }
+            }
+
+            return (base.ConvertTo(context, culture, value, destinationType));
+        }
+    }
+
+    #endregion
+
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/SuperTabControlBoxStatesColorTable.cs b/PROMS/DotNetBar Source Code/Rendering/SuperTabControlBoxStatesColorTable.cs
new file mode 100644
index 00000000..0c933c85
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/SuperTabControlBoxStatesColorTable.cs	
@@ -0,0 +1,225 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Globalization;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    /// <summary>
+    /// Defines the colors for the SuperTabControlBox states
+    /// </summary>
+    [TypeConverter(typeof(SuperTabControlBoxStateColorTableConvertor))]
+    public class SuperTabControlBoxStateColorTable : ICloneable
+    {
+        #region Events
+
+        /// <summary>
+        /// Event raised when the SuperTabControlBoxStateColorTable is changed
+        /// </summary>
+        [Description("Event raised when the SuperTabControlBoxStateColorTable is changed")]
+        public event EventHandler<EventArgs> ColorTableChanged;
+
+        #endregion
+
+        #region Private variables
+
+        private Color _Background;
+        private Color _Border = Color.Empty;
+        private Color _Image = Color.Empty;
+
+        #endregion
+
+        #region Public properties
+
+        #region Background
+
+        /// <summary>
+        /// Gets or sets the colors for the background.
+        /// </summary>
+        [Browsable(true)]
+        [NotifyParentProperty(true)]
+        public Color Background
+        {
+            get { return (_Background); }
+
+            set
+            {
+                if (_Background != value)
+                {
+                    _Background = value;
+
+                    OnColorTableChanged();
+                }
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeBackground()
+        {
+            return (_Background != Color.Empty);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetBackground()
+        {
+            _Background = Color.Empty;
+        }
+
+        #endregion
+
+        #region Border
+
+        /// <summary>
+        /// Gets or sets the colors for the border.
+        /// </summary>
+        [Browsable(true)]
+        [NotifyParentProperty(true)]
+        public Color Border
+        {
+            get { return (_Border); }
+
+            set
+            {
+                if (_Border != value)
+                {
+                    _Border = value;
+
+                    OnColorTableChanged();
+                }
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeBorder()
+        {
+            return (_Border != Color.Empty);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetBorder()
+        {
+            _Border = Color.Empty;
+        }
+
+        #endregion
+
+        #region Image
+
+        /// <summary>
+        /// Gets or sets the colors for the drawn image.
+        /// </summary>
+        [Browsable(true)]
+        [NotifyParentProperty(true)]
+        public Color Image
+        {
+            get { return (_Image); }
+
+            set
+            {
+                if (_Image != value)
+                {
+                    _Image = value;
+
+                    OnColorTableChanged();
+                }
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeImage()
+        {
+            return (_Image != Color.Empty);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetImage()
+        {
+            _Image = Color.Empty;
+        }
+
+        #endregion
+
+        #region IsEmpty
+
+        [Browsable(false)]
+        public bool IsEmpty
+        {
+            get
+            {
+                if (_Background.IsEmpty == false)
+                    return (false);
+
+                if (_Border != Color.Empty)
+                    return (false);
+
+                if (_Image != Color.Empty)
+                    return (false);
+
+                return (true);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region OnColorTableChanged
+
+        private void OnColorTableChanged()
+        {
+            if (ColorTableChanged != null)
+                ColorTableChanged(this, EventArgs.Empty);
+        }
+
+        #endregion
+
+        #region ICloneable Members
+
+        public object Clone()
+        {
+            SuperTabControlBoxStateColorTable sct = new SuperTabControlBoxStateColorTable();
+
+            sct.Background = Background;
+            sct.Border = Border;
+            sct.Image = Image;
+
+            return (sct);
+        }
+
+        #endregion
+    }
+
+    #region SuperTabItemStateColorTableConvertor
+
+    public class SuperTabControlBoxStateColorTableConvertor : ExpandableObjectConverter
+    {
+        public override object ConvertTo(
+            ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+        {
+            if (destinationType == typeof(string))
+            {
+                SuperTabControlBoxStateColorTable sct = value as SuperTabControlBoxStateColorTable;
+
+                if (sct != null)
+                {
+                    ColorConverter cvt = new ColorConverter();
+
+                    if (sct.Background.IsEmpty == false)
+                        return (cvt.ConvertToString(sct.Background));
+
+                    if (sct.Border.IsEmpty == false)
+                        return (cvt.ConvertToString(sct.Border));
+
+                    if (sct.Image.IsEmpty == false)
+                        return (cvt.ConvertToString(sct.Image));
+
+                    return (String.Empty);
+                }
+            }
+
+            return (base.ConvertTo(context, culture, value, destinationType));
+        }
+    }
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/SuperTabItemColorTable.cs b/PROMS/DotNetBar Source Code/Rendering/SuperTabItemColorTable.cs
new file mode 100644
index 00000000..56fea65b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/SuperTabItemColorTable.cs	
@@ -0,0 +1,542 @@
+using System;
+using System.ComponentModel;
+using System.Globalization;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    /// <summary>
+    /// Defines the color table for SuperTabItem states
+    /// </summary>
+    [TypeConverter(typeof(SuperTabItemColorTableConvertor))]
+    public class SuperTabItemColorTable : ICloneable, IDisposable
+    {
+        #region Events
+
+        /// <summary>
+        /// Event raised when the SuperTabItemColorTable is changed
+        /// </summary>
+        [Description("Event raised when the SuperTabItemColorTable is changed")]
+        public event EventHandler<EventArgs> ColorTableChanged;
+
+        #endregion
+
+        #region Private variables
+
+        private SuperTabColorStates _Default;
+        private SuperTabColorStates _Left;
+        private SuperTabColorStates _Bottom;
+        private SuperTabColorStates _Right;
+
+        #endregion
+
+        public SuperTabItemColorTable()
+        {
+            _Default = new SuperTabColorStates();
+            _Default.ColorTableChanged += SctColorTableChanged;
+
+            _Left = new SuperTabColorStates();
+            _Left.ColorTableChanged += SctColorTableChanged;
+
+            _Bottom = new SuperTabColorStates();
+            _Bottom.ColorTableChanged += SctColorTableChanged;
+
+            _Right = new SuperTabColorStates();
+            _Right.ColorTableChanged += SctColorTableChanged;
+        }
+
+        #region Public properties
+
+        #region Default
+
+        /// <summary>
+        /// Gets or sets the Default tab color settings
+        /// </summary>
+        [Browsable(true)]
+        [NotifyParentProperty(true)]
+        [Description("Indicates the Default tab color settings.")]
+        public SuperTabColorStates Default
+        {
+            get { return (_Default); }
+            set { SetNewColorTable(ref _Default, value); }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeDefault()
+        {
+            return (_Default.IsEmpty == false);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetDefault()
+        {
+            Default = new SuperTabColorStates();
+        }
+
+        #endregion
+
+        #region Left
+
+        /// <summary>
+        /// Gets or sets the Left Aligned tab color settings
+        /// </summary>
+        [Browsable(true)]
+        [NotifyParentProperty(true)]
+        [Description("Indicates the Left Aligned tab color settings.")]
+        public SuperTabColorStates Left
+        {
+            get { return (_Left); }
+            set { SetNewColorTable(ref _Left, value); }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeLeft()
+        {
+            return (_Left.IsEmpty == false);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetLeft()
+        {
+            Left = new SuperTabColorStates();
+        }
+
+        #endregion
+
+        #region Bottom
+
+        /// <summary>
+        /// Gets or sets the Bottom Aligned tab color settings
+        /// </summary>
+        [Browsable(true)]
+        [NotifyParentProperty(true)]
+        [Description("Indicates the Bottom Aligned tab color settings.")]
+        public SuperTabColorStates Bottom
+        {
+            get { return (_Bottom); }
+            set { SetNewColorTable(ref _Bottom, value); }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeBottom()
+        {
+            return (_Bottom.IsEmpty == false);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetBottom()
+        {
+            Bottom = new SuperTabColorStates();
+        }
+
+        #endregion
+
+        #region Right
+
+        /// <summary>
+        /// Gets or sets the Right Aligned tab color settings
+        /// </summary>
+        [Browsable(true)]
+        [NotifyParentProperty(true)]
+        [Description("Indicates the Right Aligned tab color settings.")]
+        public SuperTabColorStates Right
+        {
+            get { return (_Right); }
+            set { SetNewColorTable(ref _Right, value); }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeRight()
+        {
+            return (_Right.IsEmpty == false);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetRight()
+        {
+            Right = new SuperTabColorStates();
+        }
+
+        #endregion
+
+        #region IsEmpty
+
+        [Browsable(false)]
+        public bool IsEmpty
+        {
+            get
+            {
+                return (_Default.IsEmpty == true  && _Left.IsEmpty == true  &&
+                    _Bottom.IsEmpty == true && _Right.IsEmpty == true);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region SetNewColorTable
+
+        private void SetNewColorTable(
+            ref SuperTabColorStates sct, SuperTabColorStates newSct)
+        {
+            if (sct != null)
+                sct.ColorTableChanged -= SctColorTableChanged;
+
+            sct = newSct;
+
+            if (sct != null)
+                sct.ColorTableChanged += SctColorTableChanged;
+
+            OnColorTableChanged();
+        }
+
+        #endregion
+
+        #region SctColorTableChanged
+
+        void SctColorTableChanged(object sender, EventArgs e)
+        {
+            OnColorTableChanged();
+        }
+
+        #endregion
+
+        #region OnColorTableChanged
+
+        private void OnColorTableChanged()
+        {
+            if (ColorTableChanged != null)
+                ColorTableChanged(this, EventArgs.Empty);
+        }
+
+        #endregion
+
+        #region ICloneable Members
+
+        public object Clone()
+        {
+            SuperTabItemColorTable sct = new SuperTabItemColorTable();
+
+            sct.Default = (SuperTabColorStates) Default.Clone();
+            sct.Left = (SuperTabColorStates) Left.Clone();
+            sct.Bottom = (SuperTabColorStates) Bottom.Clone();
+            sct.Right = (SuperTabColorStates) Right.Clone();
+
+            return (sct);
+        }
+
+        #endregion
+
+        #region IDisposable Members
+
+        public void Dispose()
+        {
+            Default = null;
+            Left = null;
+            Bottom = null;
+            Right = null;
+        }
+
+        #endregion
+    }
+
+    #region SuperTabColorStates
+
+    [TypeConverter(typeof(SuperTabItemColorTableConvertor))]
+    public class SuperTabColorStates
+    {
+        #region Events
+
+        /// <summary>
+        /// Event raised when the SuperTabColorStates is changed
+        /// </summary>
+        [Description("Event raised when the SuperTabColorStates is changed")]
+        public event EventHandler<EventArgs> ColorTableChanged;
+
+        #endregion
+
+        #region Private data
+
+        private SuperTabItemStateColorTable _Normal;
+        private SuperTabItemStateColorTable _Selected;
+        private SuperTabItemStateColorTable _MouseOver;
+        private SuperTabItemStateColorTable _SelectedMouseOver;
+
+        private SuperTabItemStateColorTable _Disabled;
+
+        #endregion
+
+        public SuperTabColorStates()
+        {
+            _Normal = new SuperTabItemStateColorTable();
+            _Normal.ColorTableChanged += SctColorTableChanged;
+
+            _Selected = new SuperTabItemStateColorTable();
+            _Selected.ColorTableChanged += SctColorTableChanged;
+
+            _MouseOver = new SuperTabItemStateColorTable();
+            _MouseOver.ColorTableChanged += SctColorTableChanged;
+
+            _SelectedMouseOver = new SuperTabItemStateColorTable();
+            _SelectedMouseOver.ColorTableChanged += SctColorTableChanged;
+
+            _Disabled = new SuperTabItemStateColorTable();
+            _Disabled.ColorTableChanged += SctColorTableChanged;
+        }
+
+        #region Public properties
+
+        #region Normal
+
+        /// <summary>
+        /// Gets or sets the tab colors when the tab is not selected, and the mouse is not over it
+        /// </summary>
+        [Browsable(true)]
+        [NotifyParentProperty(true)]
+        [Description("Indicates the tab colors when the tab is not selected, and the mouse is not over it.")]
+        public SuperTabItemStateColorTable Normal
+        {
+            get { return (_Normal); }
+            set { SetNewColorTable(ref _Normal, value); }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeNormal()
+        {
+            return (_Normal.IsEmpty == false);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetNormal()
+        {
+            Normal = new SuperTabItemStateColorTable();
+        }
+
+        #endregion
+
+        #region Selected
+
+        /// <summary>
+        /// Gets or sets the tab colors when the tab is selected, but the mouse is not over the it
+        /// </summary>
+        [Browsable(true)]
+        [NotifyParentProperty(true)]
+        [Description("Indicates the tab colors when the tab is selected, but the mouse is not over the it.")]
+        public SuperTabItemStateColorTable Selected
+        {
+            get { return (_Selected); }
+            set { SetNewColorTable(ref _Selected, value); }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeSelected()
+        {
+            return (_Selected.IsEmpty == false);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetSelected()
+        {
+            Selected = new SuperTabItemStateColorTable();
+        }
+
+        #endregion
+
+        #region MouseOver
+
+        /// <summary>
+        /// Gets or sets the tab colors when the tab is not selected, but the mouse is over it
+        /// </summary>
+        [Browsable(true)]
+        [NotifyParentProperty(true)]
+        [Description("Indicates the tab colors when the tab is not selected, but the mouse is over it.")]
+        public SuperTabItemStateColorTable MouseOver
+        {
+            get { return (_MouseOver); }
+            set { SetNewColorTable(ref _MouseOver, value); }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeMouseOver()
+        {
+            return (_MouseOver.IsEmpty == false);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetMouseOver()
+        {
+            MouseOver = new SuperTabItemStateColorTable();
+        }
+
+        #endregion
+
+        #region SelectedMouseOver
+
+        /// <summary>
+        /// Gets or sets the tab colors when the tab is selected, and the mouse is over it
+        /// </summary>
+        [Browsable(true)]
+        [NotifyParentProperty(true)]
+        [Description("Indicates the tab colors when the tab is selected, and the mouse is over it.")]
+        public SuperTabItemStateColorTable SelectedMouseOver
+        {
+            get { return (_SelectedMouseOver); }
+            set { SetNewColorTable(ref _SelectedMouseOver, value); }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeSelectedMouseOver()
+        {
+            return (_SelectedMouseOver.IsEmpty == false);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetSelectedMouseOver()
+        {
+            SelectedMouseOver = new SuperTabItemStateColorTable();
+        }
+
+        #endregion
+
+        #region Disabled
+
+        /// <summary>
+        /// Gets or sets the tab colors when the tab
+        /// is disabled, is not selected, and the mouse is not over it
+        /// </summary>
+        [Browsable(true)]
+        [NotifyParentProperty(true)]
+        [Description("Indicates the tab colors when the tab is disabled, is not selected, and the mouse is not over it.")]
+        public SuperTabItemStateColorTable Disabled
+        {
+            get { return (_Disabled); }
+            set { SetNewColorTable(ref _Disabled, value); }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeDisabled()
+        {
+            return (_Disabled.IsEmpty == false);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetDisabled()
+        {
+            Disabled = new SuperTabItemStateColorTable();
+        }
+
+        #endregion
+
+        #region IsEmpty
+
+        [Browsable(false)]
+        public bool IsEmpty
+        {
+            get
+            {
+                if (_Normal.IsEmpty == false)
+                    return (false);
+
+                if (_Selected.IsEmpty == false)
+                    return (false);
+
+                if (_MouseOver.IsEmpty == false)
+                    return (false);
+
+                if (_SelectedMouseOver.IsEmpty == false)
+                    return (false);
+
+                if (_Disabled.IsEmpty == false)
+                    return (false);
+
+                return (true);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region SetNewColorTable
+
+        private void SetNewColorTable(
+            ref SuperTabItemStateColorTable sct, SuperTabItemStateColorTable newSct)
+        {
+            if (sct != null)
+                sct.ColorTableChanged -= SctColorTableChanged;
+
+            sct = newSct;
+
+            if (sct != null)
+                sct.ColorTableChanged += SctColorTableChanged;
+
+            OnColorTableChanged();
+        }
+
+        #endregion
+
+        #region SctColorTableChanged
+
+        void SctColorTableChanged(object sender, EventArgs e)
+        {
+            OnColorTableChanged();
+        }
+
+        #endregion
+
+        #region OnColorTableChanged
+
+        private void OnColorTableChanged()
+        {
+            if (ColorTableChanged != null)
+                ColorTableChanged(this, EventArgs.Empty);
+        }
+
+        #endregion
+
+        #region ICloneable Members
+
+        public object Clone()
+        {
+            SuperTabColorStates sct = new SuperTabColorStates();
+
+            sct.Normal = (SuperTabItemStateColorTable)Normal.Clone();
+            sct.Selected = (SuperTabItemStateColorTable)Selected.Clone();
+            sct.MouseOver = (SuperTabItemStateColorTable)MouseOver.Clone();
+            sct.SelectedMouseOver = (SuperTabItemStateColorTable)SelectedMouseOver.Clone();
+            sct.Disabled = (SuperTabItemStateColorTable)Disabled.Clone();
+
+            return (sct);
+        }
+
+        #endregion
+
+        #region IDisposable Members
+
+        public void Dispose()
+        {
+            Normal = null;
+            MouseOver = null;
+            SelectedMouseOver = null;
+            Selected = null;
+            Disabled = null;
+        }
+
+        #endregion
+    }
+
+    #region SuperTabItemColorTableConvertor
+
+    public class SuperTabItemColorTableConvertor : ExpandableObjectConverter
+    {
+        public override object ConvertTo(
+            ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+        {
+            return (String.Empty);
+        }
+    }
+
+    #endregion
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/SuperTabItemStateColorTable.cs b/PROMS/DotNetBar Source Code/Rendering/SuperTabItemStateColorTable.cs
new file mode 100644
index 00000000..ce07f32f
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/SuperTabItemStateColorTable.cs	
@@ -0,0 +1,380 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Globalization;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    /// <summary>
+    /// Defines the colors for the SuperTabItem states
+    /// </summary>
+    [TypeConverter(typeof(SuperTabItemStateColorTableConvertor))]
+    public class SuperTabItemStateColorTable : ICloneable
+    {
+        #region Events
+
+        /// <summary>
+        /// Event raised when the SuperTabItemStateColorTable is changed
+        /// </summary>
+        [Description("Event raised when the SuperTabItemStateColorTable is changed")]
+        public event EventHandler<EventArgs> ColorTableChanged;
+
+        #endregion
+
+        #region Private variables
+
+        private Color _Text = Color.Empty;
+        private Color _InnerBorder = Color.Empty;
+        private Color _OuterBorder = Color.Empty;
+        private Color _CloseMarker = Color.Empty;
+        private Color _SelectionMarker = Color.Empty;
+
+        private SuperTabLinearGradientColorTable _Background;
+
+        #endregion
+
+        public SuperTabItemStateColorTable()
+        {
+            _Background = new SuperTabLinearGradientColorTable();
+            _Background.ColorTableChanged += Background_ColorTableChanged;
+        }
+
+        #region Public properties
+
+        #region Background
+
+        /// <summary>
+        /// Gets or sets the background colors.
+        /// </summary>
+        [Browsable(true)]
+        [NotifyParentProperty(true)]
+        [Description("Indicates the background colors.")]
+        public SuperTabLinearGradientColorTable Background
+        {
+            get { return (_Background); }
+
+            set
+            {
+                if (_Background.Equals(value) == false)
+                {
+                    if (_Background != null)
+                        _Background.ColorTableChanged -= Background_ColorTableChanged;
+
+                    _Background = value;
+
+                    if (_Background != null)
+                        _Background.ColorTableChanged += Background_ColorTableChanged;
+
+                    OnColorTableChanged();
+                }
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeBackground()
+        {
+            return (_Background.IsEmpty == false);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetBackground()
+        {
+            Background = new SuperTabLinearGradientColorTable();
+        }
+
+        #endregion
+
+        #region OuterBorder
+
+        /// <summary>
+        /// Gets or sets the outer border color.
+        /// </summary>
+        [Browsable(true)]
+        [NotifyParentProperty(true)]
+        [Description("Indicates the outer border color.")]
+        public Color OuterBorder
+        {
+            get { return (_OuterBorder); }
+
+            set
+            {
+                if (_OuterBorder != value)
+                {
+                    _OuterBorder = value;
+
+                    OnColorTableChanged();
+                }
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeOuterBorder()
+        {
+            return (_OuterBorder != Color.Empty);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetOuterBorder()
+        {
+            OuterBorder = Color.Empty;
+        }
+
+        #endregion
+
+        #region InnerBorder
+
+        /// <summary>
+        /// Gets or sets the inner border color.
+        /// </summary>
+        [Browsable(true)]
+        [NotifyParentProperty(true)]
+        [Description("Indicates the inner border color.")]
+        public Color InnerBorder
+        {
+            get { return (_InnerBorder); }
+
+            set
+            {
+                if (_InnerBorder != value)
+                {
+                    _InnerBorder = value;
+
+                    OnColorTableChanged();
+                }
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeInnerBorder()
+        {
+            return (_InnerBorder != Color.Empty);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetInnerBorder()
+        {
+            InnerBorder = Color.Empty;
+        }
+
+        #endregion
+
+        #region Text
+
+        /// <summary>
+        /// Gets or sets the text color.
+        /// </summary>
+        [Browsable(true)]
+        [NotifyParentProperty(true)]
+        [Description("Indicates the Text color.")]
+        public Color Text
+        {
+            get { return (_Text); }
+
+            set
+            {
+                if (_Text != value)
+                {
+                    _Text = value;
+
+                    OnColorTableChanged();
+                }
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeText()
+        {
+            return (_Text.IsEmpty == false);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetText()
+        {
+            Text = Color.Empty;
+        }
+
+        #endregion
+
+        #region CloseMarker
+
+        /// <summary>
+        /// Gets or sets the Close Marker color.
+        /// </summary>
+        [Browsable(true)]
+        [NotifyParentProperty(true)]
+        [Description("Indicates the Close Marker color.")]
+        public Color CloseMarker
+        {
+            get { return (_CloseMarker); }
+
+            set
+            {
+                if (_CloseMarker != value)
+                {
+                    _CloseMarker = value;
+
+                    OnColorTableChanged();
+                }
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeCloseMarker()
+        {
+            return (_CloseMarker != Color.Empty);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetCloseMarker()
+        {
+            CloseMarker = Color.Empty;
+        }
+
+        #endregion
+
+        #region SelectionMarker
+
+        /// <summary>
+        /// Gets or sets the Selection Marker color.
+        /// </summary>
+        [Browsable(true)]
+        [NotifyParentProperty(true)]
+        [Description("Indicates the Selection Marker color.")]
+        public Color SelectionMarker
+        {
+            get { return (_SelectionMarker); }
+
+            set
+            {
+                if (_SelectionMarker != value)
+                {
+                    _SelectionMarker = value;
+
+                    OnColorTableChanged();
+                }
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeSelectionMarker()
+        {
+            return (_SelectionMarker != Color.Empty);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetSelectionMarker()
+        {
+            SelectionMarker = Color.Empty;
+        }
+
+        #endregion
+
+        #region IsEmpty
+
+        [Browsable(false)]
+        public bool IsEmpty
+        {
+            get
+            {
+                if (_Background.IsEmpty == false)
+                    return (false);
+
+                if (_OuterBorder != Color.Empty)
+                    return (false);
+
+                if (_InnerBorder != Color.Empty)
+                    return (false);
+
+                if (_Text != Color.Empty)
+                    return (false);
+
+                if (_CloseMarker != Color.Empty)
+                    return (false);
+
+                if (_SelectionMarker != Color.Empty)
+                    return (false);
+
+                return (true);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Background_ColorTableChanged
+
+        void Background_ColorTableChanged(object sender, EventArgs e)
+        {
+            OnColorTableChanged();
+        }
+
+        #endregion
+
+        #region OnColorTableChanged
+
+        private void OnColorTableChanged()
+        {
+            if (ColorTableChanged != null)
+                ColorTableChanged(this, EventArgs.Empty);
+        }
+
+        #endregion
+
+        #region ICloneable Members
+
+        public object Clone()
+        {
+            SuperTabItemStateColorTable sct = new SuperTabItemStateColorTable();
+
+            sct.Background = (SuperTabLinearGradientColorTable)Background.Clone();
+
+            sct.Text = Text;
+            sct.OuterBorder = OuterBorder;
+            sct.InnerBorder = InnerBorder;
+            sct.CloseMarker = CloseMarker;
+            sct.SelectionMarker = SelectionMarker;
+
+            return (sct);
+        }
+
+        #endregion
+    }
+
+    #region SuperTabItemStateColorTableConvertor
+
+    public class SuperTabItemStateColorTableConvertor : ExpandableObjectConverter
+    {
+        public override object ConvertTo(
+            ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+        {
+            if (destinationType == typeof(string))
+            {
+                SuperTabItemStateColorTable sct = value as SuperTabItemStateColorTable;
+
+                if (sct != null)
+                {
+                    ColorConverter cvt = new ColorConverter();
+
+                    if (sct.Background.Colors != null)
+                        return (cvt.ConvertToString(sct.Background.Colors[0]));
+
+                    if (sct.InnerBorder.IsEmpty == false)
+                        return (cvt.ConvertToString(sct.InnerBorder));
+
+                    if (sct.OuterBorder.IsEmpty == false)
+                        return (cvt.ConvertToString(sct.OuterBorder));
+
+                    if (sct.Text.IsEmpty == false)
+                        return (cvt.ConvertToString(sct.Text));
+
+                    return (String.Empty);
+                }
+            }
+
+            return (base.ConvertTo(context, culture, value, destinationType));
+        }
+    }
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/SuperTabLinearGradientColorTable.cs b/PROMS/DotNetBar Source Code/Rendering/SuperTabLinearGradientColorTable.cs
new file mode 100644
index 00000000..3faa690d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/SuperTabLinearGradientColorTable.cs	
@@ -0,0 +1,339 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Globalization;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    [TypeConverter(typeof(SuperTabLinearGradientColorTableConvertor))]
+    public class SuperTabLinearGradientColorTable
+    {
+        #region Events
+
+        /// <summary>
+        /// Event raised when the SuperTabLinearGradientColorTable is changed
+        /// </summary>
+        [Description("Event raised when the SuperTabLinearGradientColorTable is changed")]
+        public event EventHandler<EventArgs> ColorTableChanged;
+
+        #endregion
+
+        #region Private variables
+
+        private Color[] _Colors;
+        private float[] _Positions;
+        private int _GradientAngle = 90;
+        private bool? _AdaptiveGradient;
+
+        #endregion
+
+        #region Constructors
+
+        public SuperTabLinearGradientColorTable()
+        {
+        }
+
+        public SuperTabLinearGradientColorTable(Color color)
+        {
+            _Colors = new Color[1];
+
+            _Colors[0] = color;
+        }
+
+        public SuperTabLinearGradientColorTable(Color start, Color end)
+        {
+            _Colors = new Color[2];
+
+            _Colors[0] = start;
+            _Colors[1] = end;
+        }
+
+        public SuperTabLinearGradientColorTable(Color start, Color end, int gradient)
+        {
+            _Colors = new Color[2];
+
+            _Colors[0] = start;
+            _Colors[1] = end;
+            _GradientAngle = gradient;
+        }
+
+        public SuperTabLinearGradientColorTable(Color[] colors, float[] positions)
+        {
+            _Colors = colors;
+            _Positions = positions;
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region Colors
+
+        /// <summary>
+        /// Gets or sets the Gradient Colors
+        /// </summary>
+        [Browsable(true), DefaultValue(null)]
+        [NotifyParentProperty(true)]
+        [Description("Indicates the Gradient Colors.")]
+        public Color[] Colors
+        {
+            get { return (_Colors); }
+
+            set
+            {
+                if (_Colors != value)
+                {
+                    _Colors = value;
+
+                    OnColorTableChanged();
+                }
+            }
+        }
+
+        #endregion
+
+        #region Positions
+
+        /// <summary>
+        /// Gets or sets the Gradient Color Positions
+        /// </summary>
+        [Browsable(true), DefaultValue(null)]
+        [NotifyParentProperty(true)]
+        [Description("Indicates the Gradient Color Positions.")]
+        public float[] Positions
+        {
+            get { return (_Positions); }
+
+            set
+            {
+                if (_Positions != value)
+                {
+                    _Positions = value;
+
+                    OnColorTableChanged();
+                }
+            }
+        }
+
+        #endregion
+
+        #region GradientAngle
+
+        /// <summary>
+        /// Gets or sets the Gradient angle
+        /// </summary>
+        [Browsable(true), DefaultValue(90)]
+        [NotifyParentProperty(true)]
+        [Description("Indicates the Gradient angle.")]
+        public int GradientAngle
+        {
+            get { return (_GradientAngle); }
+
+            set
+            {
+                if (_GradientAngle != value)
+                {
+                    _GradientAngle = value;
+
+                    OnColorTableChanged();
+                }
+            }
+        }
+
+        #endregion
+
+        #region AdaptiveGradient
+
+        /// <summary>
+        /// Gets or sets whether the Gradient will adapt to changes in the TabAlignment
+        /// </summary>
+        [Browsable(true), DefaultValue(null)]
+        [NotifyParentProperty(true)]
+        [Description("Indicates whether the Gradient will adapt to changes in the TabAlignment.")]
+        public bool? AdaptiveGradient
+        {
+            get { return (_AdaptiveGradient); }
+
+            set
+            {
+                if (_AdaptiveGradient != value)
+                {
+                    _AdaptiveGradient = value;
+
+                    OnColorTableChanged();
+                }
+            }
+        }
+
+        #endregion
+
+        #region IsEmpty
+
+        /// <summary>
+        /// Gets whether color definition is empty
+        /// </summary>
+        [Browsable(false)]
+        public bool IsEmpty
+        {
+            get
+            {
+                return ((_Colors == null || _Colors.Length == 0) && 
+                    (_Positions == null || _Positions.Length == 0) &&
+                    _GradientAngle == 90 && _AdaptiveGradient.HasValue == false);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region OnColorTableChanged
+
+        protected void OnColorTableChanged()
+        {
+            if (ColorTableChanged != null)
+                ColorTableChanged(this, EventArgs.Empty);
+        }
+
+        #endregion
+
+        #region GetBrush
+
+        public Brush GetBrush(Rectangle r)
+        {
+            return (GetBrush(r, _GradientAngle));
+        }
+
+        public Brush GetBrush(Rectangle r, int angle)
+        {
+            if (_Colors != null && _Colors.Length > 0)
+            {
+                if (_Colors.Length == 1)
+                    return (new SolidBrush(Colors[0]));
+
+                LinearGradientBrush lbr =
+                    new LinearGradientBrush(r, Color.White, Color.White, angle);
+
+                lbr.InterpolationColors = GetColorBlend();
+
+                return (lbr);
+            }
+
+            return (null);
+        }
+
+        #region GetColorBlend
+
+        private ColorBlend GetColorBlend()
+        {
+            ColorBlend cb = new ColorBlend(_Colors.Length);
+            float[] cp = _Positions;
+
+            if (cp == null || cp.Length != _Colors.Length)
+            {
+                cp = new float[_Colors.Length];
+
+                float f = 1 / _Colors.Length;
+
+                for (int i = 0; i < cp.Length; i++)
+                    cp[i] = i * f;
+
+                cp[_Colors.Length - 1] = 1;
+            }
+
+            for (int i = 0; i < _Colors.Length; i++)
+                cb.Colors[i] = _Colors[i];
+
+            cb.Positions = cp;
+
+            return (cb);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetColorBlendCollection
+
+        public BackgroundColorBlendCollection GetColorBlendCollection()
+        {
+            BackgroundColorBlendCollection cbc = new BackgroundColorBlendCollection();
+
+            float[] cp = _Positions;
+
+            if (cp == null || cp.Length != _Colors.Length)
+            {
+                cp = new float[_Colors.Length];
+
+                float f = 1 / _Colors.Length;
+
+                for (int i = 0; i < cp.Length; i++)
+                    cp[i] = i * f;
+
+                cp[_Colors.Length - 1] = 1;
+            }
+
+            for (int i = 0; i < _Colors.Length; i++)
+                cbc.Add(new BackgroundColorBlend(_Colors[i], cp[i]));
+
+            return (cbc);
+        }
+
+        #endregion
+
+        #region ICloneable Members
+
+        public object Clone()
+        {
+            SuperTabLinearGradientColorTable gct = new SuperTabLinearGradientColorTable();
+
+            gct.Colors = Colors;
+            gct.Positions = Positions;
+            gct.GradientAngle = GradientAngle;
+            gct.AdaptiveGradient = AdaptiveGradient;
+
+            return (gct);
+        }
+
+        #endregion
+    }
+
+    #region SuperTabLinearGradientColorTableConvertor
+
+    public class SuperTabLinearGradientColorTableConvertor : ExpandableObjectConverter
+    {
+        public override object ConvertTo(
+            ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+        {
+            if (destinationType == typeof(string))
+            {
+                SuperTabLinearGradientColorTable lct =
+                    value as SuperTabLinearGradientColorTable;
+
+                if (lct != null)
+                {
+                    ColorConverter cvt = new ColorConverter();
+
+                    if (lct.Colors != null)
+                    {
+                        if (lct.Colors[0] != Color.Empty)
+                            return (cvt.ConvertToString(lct.Colors[0]));
+
+                        if (lct.Colors.Length > 1 && lct.Colors[1] != Color.Empty)
+                            return (cvt.ConvertToString(lct.Colors[1]));
+                    }
+
+                    if (lct.GradientAngle != 90)
+                        return (lct.GradientAngle.ToString());
+
+                    return (String.Empty);
+                }
+            }
+
+            return (base.ConvertTo(context, culture, value, destinationType));
+        }
+    }
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/SuperTabPanelColorTable.cs b/PROMS/DotNetBar Source Code/Rendering/SuperTabPanelColorTable.cs
new file mode 100644
index 00000000..1bca1893
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/SuperTabPanelColorTable.cs	
@@ -0,0 +1,485 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Globalization;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    /// <summary>
+    /// Defines the colors for the SuperTabPanel
+    /// </summary>
+    [TypeConverter(typeof(SuperTabPanelColorTableConvertor))]
+    public class SuperTabPanelColorTable : ICloneable
+    {
+        #region Events
+
+        /// <summary>
+        /// Event raised when the SuperTabPanelColorTable is changed
+        /// </summary>
+        [Description("Event raised when the SuperTabPanelColorTable is changed")]
+        public event EventHandler<EventArgs> ColorTableChanged;
+
+        #endregion
+
+        #region Private variables
+
+        private SuperTabPanelItemColorTable _Default;
+        private SuperTabPanelItemColorTable _Left;
+        private SuperTabPanelItemColorTable _Bottom;
+        private SuperTabPanelItemColorTable _Right;
+
+        #endregion
+
+        public SuperTabPanelColorTable()
+        {
+            _Default = new SuperTabPanelItemColorTable();
+            _Default.ColorTableChanged += PctColorTableChanged;
+
+            _Left = new SuperTabPanelItemColorTable();
+            _Left.ColorTableChanged += PctColorTableChanged;
+
+            _Bottom = new SuperTabPanelItemColorTable();
+            _Bottom.ColorTableChanged += PctColorTableChanged;
+
+            _Right = new SuperTabPanelItemColorTable();
+            _Right.ColorTableChanged += PctColorTableChanged;
+        }
+
+        #region Public properties
+
+        #region Default
+
+        /// <summary>
+        /// Gets or sets the Default tab panel color settings
+        /// </summary>
+        [Browsable(true)]
+        [NotifyParentProperty(true)]
+        [Description("Indicates the Default tab panel color settings.")]
+        public SuperTabPanelItemColorTable Default
+        {
+            get { return (_Default); }
+            set { SetNewColorTable(ref _Default, value); }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeDefault()
+        {
+            return (_Default.IsEmpty == false);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetDefault()
+        {
+            Default = new SuperTabPanelItemColorTable();
+        }
+
+        #endregion
+
+        #region Left
+
+        /// <summary>
+        /// Gets or sets the Left Aligned tab panel color settings
+        /// </summary>
+        [Browsable(true)]
+        [NotifyParentProperty(true)]
+        [Description("Indicates the Left Aligned tab panel color settings.")]
+        public SuperTabPanelItemColorTable Left
+        {
+            get { return (_Left); }
+            set { SetNewColorTable(ref _Left, value); }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeLeft()
+        {
+            return (_Left.IsEmpty == false);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetLeft()
+        {
+            Left = new SuperTabPanelItemColorTable();
+        }
+
+        #endregion
+
+        #region Bottom
+
+        /// <summary>
+        /// Gets or sets the Bottom Aligned tab panel color settings
+        /// </summary>
+        [Browsable(true)]
+        [NotifyParentProperty(true)]
+        [Description("Indicates the Bottom Aligned tab panel color settings.")]
+        public SuperTabPanelItemColorTable Bottom
+        {
+            get { return (_Bottom); }
+            set { SetNewColorTable(ref _Bottom, value); }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeBottom()
+        {
+            return (_Bottom.IsEmpty == false);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetBottom()
+        {
+            Bottom = new SuperTabPanelItemColorTable();
+        }
+
+        #endregion
+
+        #region Right
+
+        /// <summary>
+        /// Gets or sets the Right Aligned tab panel color settings
+        /// </summary>
+        [Browsable(true)]
+        [NotifyParentProperty(true)]
+        [Description("Indicates the Right Aligned tab panel color settings.")]
+        public SuperTabPanelItemColorTable Right
+        {
+            get { return (_Right); }
+            set { SetNewColorTable(ref _Right, value); }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeRight()
+        {
+            return (_Right.IsEmpty == false);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetRight()
+        {
+            Right = new SuperTabPanelItemColorTable();
+        }
+
+        #endregion
+
+        #region IsEmpty
+
+        [Browsable(false)]
+        public bool IsEmpty
+        {
+            get
+            {
+                return (_Default.IsEmpty == true && _Left.IsEmpty == true &&
+                    _Bottom.IsEmpty == true && _Right.IsEmpty == true);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region SetNewColorTable
+
+        private void SetNewColorTable(
+            ref SuperTabPanelItemColorTable sct, SuperTabPanelItemColorTable newSct)
+        {
+            if (sct != null)
+                sct.ColorTableChanged -= PctColorTableChanged;
+
+            sct = newSct;
+
+            if (sct != null)
+                sct.ColorTableChanged += PctColorTableChanged;
+
+            OnColorTableChanged();
+        }
+
+        #endregion
+
+        #region PctColorTableChanged
+
+        void PctColorTableChanged(object sender, EventArgs e)
+        {
+            OnColorTableChanged();
+        }
+
+        #endregion
+
+        #region OnColorTableChanged
+
+        private void OnColorTableChanged()
+        {
+            if (ColorTableChanged != null)
+                ColorTableChanged(this, EventArgs.Empty);
+        }
+
+        #endregion
+
+        #region ICloneable Members
+
+        public object Clone()
+        {
+            SuperTabPanelColorTable pct = new SuperTabPanelColorTable();
+
+            pct.Default = (SuperTabPanelItemColorTable)Default.Clone();
+            pct.Left = (SuperTabPanelItemColorTable)Left.Clone();
+            pct.Bottom = (SuperTabPanelItemColorTable)Bottom.Clone();
+            pct.Right = (SuperTabPanelItemColorTable)Right.Clone();
+
+            return (pct);
+        }
+
+        #endregion
+    }
+
+    #region SuperTabPaneColorTableConvertor
+
+    public class SuperTabPanelColorTableConvertor : ExpandableObjectConverter
+    {
+        public override object ConvertTo(
+            ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+        {
+            return (String.Empty);
+        }
+    }
+
+    #endregion
+
+    #region SuperTabPanelItemColorTable
+
+    [TypeConverter(typeof(SuperTabPanelItemColorTableConvertor))]
+    public class SuperTabPanelItemColorTable : ICloneable
+    {
+        #region Events
+
+        /// <summary>
+        /// Event raised when the SuperTabPanelItemColorTable is changed
+        /// </summary>
+        [Description("Event raised when the SuperTabPanelItemColorTable is changed")]
+        public event EventHandler<EventArgs> ColorTableChanged;
+
+        #endregion
+
+        #region Private variables
+
+        private Color _OuterBorder = Color.Empty;
+        private Color _InnerBorder = Color.Empty;
+        private SuperTabLinearGradientColorTable _Background;
+
+        #endregion
+
+        public SuperTabPanelItemColorTable()
+        {
+            _Background = new SuperTabLinearGradientColorTable();
+            _Background.ColorTableChanged += Background_ColorTableChanged;
+        }
+
+        #region Public properties
+
+        #region Background
+
+        /// <summary>
+        /// Gets or sets the background colors.
+        /// </summary>
+        [Browsable(true)]
+        [NotifyParentProperty(true)]
+        public SuperTabLinearGradientColorTable Background
+        {
+            get { return (_Background); }
+
+            set
+            {
+                if (_Background.Equals(value) == false)
+                {
+                    if (_Background != null)
+                        _Background.ColorTableChanged -= Background_ColorTableChanged;
+
+                    _Background = value;
+
+                    if (_Background != null)
+                        _Background.ColorTableChanged += Background_ColorTableChanged;
+
+                    OnColorTableChanged();
+                }
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeBackground()
+        {
+            return (_Background.IsEmpty == false);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetBackground()
+        {
+            Background = new SuperTabLinearGradientColorTable();
+        }
+
+        #endregion
+
+        #region OuterBorder
+
+        /// <summary>
+        /// Gets or sets the colors for the outer border.
+        /// </summary>
+        [Browsable(true)]
+        [NotifyParentProperty(true)]
+        public Color OuterBorder
+        {
+            get { return (_OuterBorder); }
+
+            set
+            {
+                if (_OuterBorder != value)
+                {
+                    _OuterBorder = value;
+
+                    OnColorTableChanged();
+                }
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeOuterBorder()
+        {
+            return (_OuterBorder != Color.Empty);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetOuterBorder()
+        {
+            _OuterBorder = Color.Empty;
+        }
+
+        #endregion
+
+        #region InnerBorder
+
+        /// <summary>
+        /// Gets or sets the colors for the inner border.
+        /// </summary>
+        [Browsable(true)]
+        [NotifyParentProperty(true)]
+        public Color InnerBorder
+        {
+            get { return (_InnerBorder); }
+
+            set
+            {
+                if (_InnerBorder != value)
+                {
+                    _InnerBorder = value;
+
+                    OnColorTableChanged();
+                }
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeInnerBorder()
+        {
+            return (_InnerBorder != Color.Empty);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetInnerBorder()
+        {
+            _InnerBorder = Color.Empty;
+        }
+
+        #endregion
+
+        #region IsEmpty
+
+        [Browsable(false)]
+        public bool IsEmpty
+        {
+            get
+            {
+                if (_Background.IsEmpty == false)
+                    return (false);
+
+                if (_OuterBorder != Color.Empty)
+                    return (false);
+
+                if (_InnerBorder != Color.Empty)
+                    return (false);
+
+                return (true);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Background_ColorTableChanged
+
+        void Background_ColorTableChanged(object sender, EventArgs e)
+        {
+            OnColorTableChanged();
+        }
+
+        #endregion
+
+        #region OnColorTableChanged
+
+        private void OnColorTableChanged()
+        {
+            if (ColorTableChanged != null)
+                ColorTableChanged(this, EventArgs.Empty);
+        }
+
+        #endregion
+
+        #region ICloneable Members
+
+        public object Clone()
+        {
+            SuperTabPanelItemColorTable sct = new SuperTabPanelItemColorTable();
+
+            sct.Background = (SuperTabLinearGradientColorTable)Background.Clone();
+
+            sct.OuterBorder = OuterBorder;
+            sct.InnerBorder = InnerBorder;
+
+            return (sct);
+        }
+
+        #endregion
+    }
+
+    #region SuperTabPanelItemColorTableConvertor
+
+    public class SuperTabPanelItemColorTableConvertor : ExpandableObjectConverter
+    {
+        public override object ConvertTo(
+            ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+        {
+            if (destinationType == typeof(string))
+            {
+                SuperTabPanelItemColorTable sct = value as SuperTabPanelItemColorTable;
+
+                if (sct != null)
+                {
+                    ColorConverter cvt = new ColorConverter();
+
+                    if (sct.Background.Colors != null)
+                        return (cvt.ConvertToString(sct.Background.Colors[0]));
+
+                    if (sct.InnerBorder.IsEmpty == false)
+                        return (cvt.ConvertToString(sct.InnerBorder));
+
+                    if (sct.OuterBorder.IsEmpty == false)
+                        return (cvt.ConvertToString(sct.OuterBorder));
+
+                    return (String.Empty);
+                }
+            }
+
+            return (base.ConvertTo(context, culture, value, destinationType));
+        }
+    }
+
+    #endregion
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/SuperTabStyleColorFactory.cs b/PROMS/DotNetBar Source Code/Rendering/SuperTabStyleColorFactory.cs
new file mode 100644
index 00000000..832c14cc
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/SuperTabStyleColorFactory.cs	
@@ -0,0 +1,1874 @@
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    internal static class SuperTabStyleColorFactory
+    {
+        #region GetColorTable
+
+        public static SuperTabColorTable GetColorTable(eSuperTabStyle style, ColorFactory factory)
+        {
+            switch (style)
+            {
+                case eSuperTabStyle.Office2007:
+                    return (GetOffice2007ColorTable());
+
+                case eSuperTabStyle.Office2010BackstageBlue:
+                    return (GetOffice2010BackstageColorTable());
+
+                case eSuperTabStyle.OneNote2007:
+                    return (GetOneNote2007ColorTable(factory));
+
+                case eSuperTabStyle.VisualStudio2008Dock:
+                    return (GetVisualStudio2008DockColorTable(factory));
+
+                case eSuperTabStyle.VisualStudio2008Document:
+                    return (GetVisualStudio2008DocumentColorTable(factory));
+
+                case eSuperTabStyle.WinMediaPlayer12:
+                    return (GetWinMediaPlayer12ColorTable(factory));
+
+                case eSuperTabStyle.OfficeMobile2014:
+                    return (GetOfficeMobile2014ColorTable(factory));
+            }
+
+            return (GetOffice2007ColorTable());
+        }
+
+        #endregion
+
+        #region GetItemColorTable
+
+        public static SuperTabItemColorTable GetItemColorTable(eSuperTabStyle style, ColorFactory factory)
+        {
+            switch (style)
+            {
+                case eSuperTabStyle.Office2007:
+                    return (GetOffice2007ItemColorTable());
+
+                case eSuperTabStyle.Office2010BackstageBlue:
+                    return (GetOffice2010BackstageItemColorTable());
+
+                case eSuperTabStyle.OneNote2007:
+                    return (GetOneNote2007ItemColorTable(factory));
+
+                case eSuperTabStyle.VisualStudio2008Dock:
+                    return (GetVisualStudio2008DockItemColorTable(factory));
+
+                case eSuperTabStyle.VisualStudio2008Document:
+                    return (GetVisualStudio2008DocumentItemColorTable(factory));
+
+                case eSuperTabStyle.WinMediaPlayer12:
+                    return (GetWinMediaPlayer12ItemColorTable(factory));
+
+                case eSuperTabStyle.OfficeMobile2014:
+                    return (GetOfficeMobile2014ItemColorTable(factory));
+            }
+
+            return (GetOffice2007ItemColorTable());
+        }
+
+        #endregion
+
+        #region GetPanelColorTable
+
+        public static SuperTabPanelColorTable GetPanelColorTable(eSuperTabStyle style, ColorFactory factory)
+        {
+            switch (style)
+            {
+                case eSuperTabStyle.Office2007:
+                    return (GetOffice2007PanelColorTable());
+
+                case eSuperTabStyle.Office2010BackstageBlue:
+                    return (GetOffice2010BackstagePanelColorTable());
+
+                case eSuperTabStyle.OneNote2007:
+                    return (GetOneNote2007PanelColorTable(factory));
+
+                case eSuperTabStyle.VisualStudio2008Dock:
+                    return (GetVisualStudio2008DockPanelColorTable(factory));
+
+                case eSuperTabStyle.VisualStudio2008Document:
+                    return (GetVisualStudio2008DocumentPanelColorTable(factory));
+
+                case eSuperTabStyle.WinMediaPlayer12:
+                    return (GetWinMediaPlayer12PanelColorTable(factory));
+
+                case eSuperTabStyle.OfficeMobile2014:
+                    return (GetOfficeMobile2014PanelColorTable(factory));
+           }
+
+            return (GetOffice2007PanelColorTable());
+        }
+
+        #endregion
+
+        #region Office2007
+
+        #region GetOffice2007ColorTable
+
+        private static SuperTabColorTable GetOffice2007ColorTable()
+        {
+            Office2007Renderer r = GlobalManager.Renderer as Office2007Renderer;
+
+            return (r != null ?
+                r.ColorTable.SuperTab : new SuperTabColorTable());
+        }
+
+        #endregion
+
+        #region GetOffice2007ItemColorTable
+
+        private static SuperTabItemColorTable GetOffice2007ItemColorTable()
+        {
+            Office2007Renderer r = GlobalManager.Renderer as Office2007Renderer;
+
+            return (r != null
+                        ? r.ColorTable.SuperTabItem
+                        : new SuperTabItemColorTable());
+        }
+
+        #endregion
+
+        #region GetOffice2007PanelColorTable
+
+        private static SuperTabPanelColorTable GetOffice2007PanelColorTable()
+        {
+            Office2007Renderer r = GlobalManager.Renderer as Office2007Renderer;
+
+            return (r != null
+                        ? r.ColorTable.SuperTabPanel
+                        : new SuperTabPanelColorTable());
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Office2010Backstage
+
+        #region Office2010BackstageColorTable
+
+        #region GetOffice2010BackstageColorTable
+
+        /// <summary>
+        /// GetOffice2010BackstageColorTable
+        /// </summary>
+        /// <returns>Office2010BackstageColorTable</returns>
+        private static SuperTabColorTable GetOffice2010BackstageColorTable()
+        {
+            Office2007Renderer r = GlobalManager.Renderer as Office2007Renderer;
+
+            return (r != null ?
+                r.ColorTable.Backstage : new SuperTabColorTable());
+        }
+
+        #endregion
+
+        #region GetOffice2010BackstageBlueColorTable
+
+        /// <summary>
+        /// GetOffice2010BackstageBlueColorTable
+        /// </summary>
+        /// <param name="ct"></param>
+        /// <param name="factory"></param>
+        /// <returns>Office2010BackstageBlueColorTable</returns>
+        internal static SuperTabColorTable GetOffice2010BackstageBlueColorTable(
+            SuperTabColorTable ct, ColorFactory factory)
+        {
+            if (ct == null)
+                ct = new SuperTabColorTable();
+
+            ct.Background = new SuperTabLinearGradientColorTable(
+                factory.GetColor(0xE4EEF8), factory.GetColor(0xBBD0EA));
+
+            ct.InnerBorder = factory.GetColor(0xABBCCD);
+            ct.OuterBorder = factory.GetColor(0xCAD5E4);
+
+            ct.ControlBoxDefault.Image = factory.GetColor(0x000000);
+
+            ct.ControlBoxMouseOver.Background = factory.GetColor(0xCEEDFA);
+            ct.ControlBoxMouseOver.Border = factory.GetColor(0x3399FF);
+            ct.ControlBoxMouseOver.Image = factory.GetColor(0xFF, 0x000000);
+
+            ct.ControlBoxPressed.Background = factory.GetColor(0xB7CAE0);
+            ct.ControlBoxPressed.Border = factory.GetColor(0x3399FF);
+            ct.ControlBoxPressed.Image = factory.GetColor(0xFF, 0x000000);
+
+            ct.InsertMarker = factory.GetColor(0xFF, 0x000000);
+            ct.SelectionMarker = factory.GetColor(0xFF, 0x000000);
+
+            return (ct);
+        }
+
+        #endregion
+
+        #region GetOffice2010BackstageBlueColorTable
+
+        /// <summary>
+        /// GetVS2010BackstageBlueColorTable
+        /// </summary>
+        /// <param name="ct"></param>
+        /// <param name="factory"></param>
+        /// <returns>Office2010BackstageBlueColorTable</returns>
+        internal static SuperTabColorTable GetVS2010BackstageBlueColorTable(
+            SuperTabColorTable ct, ColorFactory factory)
+        {
+            if (ct == null)
+                ct = new SuperTabColorTable();
+
+            ct.Background = new SuperTabLinearGradientColorTable(
+                factory.GetColor(0xCAD3E2), factory.GetColor(0xAEB9CD));
+
+            ct.InnerBorder = factory.GetColor(0xABBCCD);
+            ct.OuterBorder = factory.GetColor(0xCAD5E4);
+
+            ct.ControlBoxDefault.Image = factory.GetColor(0x000000);
+
+            ct.ControlBoxMouseOver.Background = factory.GetColor(0xCEEDFA);
+            ct.ControlBoxMouseOver.Border = factory.GetColor(0x3399FF);
+            ct.ControlBoxMouseOver.Image = factory.GetColor(0xFF, 0x000000);
+
+            ct.ControlBoxPressed.Background = factory.GetColor(0xB7CAE0);
+            ct.ControlBoxPressed.Border = factory.GetColor(0x3399FF);
+            ct.ControlBoxPressed.Image = factory.GetColor(0xFF, 0x000000);
+
+            ct.InsertMarker = factory.GetColor(0xFF, 0x000000);
+            ct.SelectionMarker = factory.GetColor(0xFF, 0x000000);
+
+            return (ct);
+        }
+
+        #endregion
+
+        #region GetOffice2010BackstageBlackColorTable
+
+        /// <summary>
+        /// GetOffice2010BackstageBlackColorTable
+        /// </summary>
+        /// <param name="ct"></param>
+        /// <param name="factory"></param>
+        /// <returns>Office2010BackstageBlackColorTable</returns>
+        internal static SuperTabColorTable GetOffice2010BackstageBlackColorTable(
+            SuperTabColorTable ct, ColorFactory factory)
+        {
+            if (ct == null)
+                ct = new SuperTabColorTable();
+
+            ct.Background = new SuperTabLinearGradientColorTable(
+                factory.GetColor(0x717171), factory.GetColor(0x3A3A3A));
+
+            ct.InnerBorder = factory.GetColor(0x2C2C2C);
+            ct.OuterBorder = factory.GetColor(0x444444);
+
+            ct.ControlBoxDefault.Image = factory.GetColor(0xFFFFFF);
+
+            ct.ControlBoxMouseOver.Background = factory.GetColor(0xCEEDFA);
+            ct.ControlBoxMouseOver.Border = factory.GetColor(0x3399FF);
+            ct.ControlBoxMouseOver.Image = factory.GetColor(0x000000);
+
+            ct.ControlBoxPressed.Background = factory.GetColor(0xB7CAE0);
+            ct.ControlBoxPressed.Border = factory.GetColor(0x3399FF);
+            ct.ControlBoxPressed.Image = factory.GetColor(0x000000);
+
+            ct.InsertMarker = factory.GetColor(0xFFFFFF);
+            ct.SelectionMarker = factory.GetColor(0xFFFFFF);
+
+            return (ct);
+        }
+
+        #endregion
+
+        #region GetOffice2010BackstageSilverColorTable
+
+        /// <summary>
+        /// GetOffice2010BackstageSilverColorTable
+        /// </summary>
+        /// <param name="ct"></param>
+        /// <param name="factory"></param>
+        /// <returns>Office2010BackstageSilverColorTable</returns>
+        internal static SuperTabColorTable GetOffice2010BackstageSilverColorTable(
+            SuperTabColorTable ct, ColorFactory factory)
+        {
+            if (ct == null)
+                ct = new SuperTabColorTable();
+
+            ct.Background = new SuperTabLinearGradientColorTable(
+                factory.GetColor(0xFBFCFD), factory.GetColor(0xE0E3E7));
+
+            ct.InnerBorder = factory.GetColor(0xCCCDCE);
+            ct.OuterBorder = factory.GetColor(0xE4E6E8);
+
+            ct.ControlBoxDefault.Image = factory.GetColor(0x000000);
+
+            ct.ControlBoxMouseOver.Background = factory.GetColor(0xCEEDFA);
+            ct.ControlBoxMouseOver.Border = factory.GetColor(0x3399FF);
+            ct.ControlBoxMouseOver.Image = factory.GetColor(0x000000);
+
+            ct.ControlBoxPressed.Background = factory.GetColor(0xB7CAE0);
+            ct.ControlBoxPressed.Border = factory.GetColor(0x3399FF);
+            ct.ControlBoxPressed.Image = factory.GetColor(0x000000);
+
+            ct.InsertMarker = factory.GetColor(0x000000);
+            ct.SelectionMarker = factory.GetColor(0x000000);
+
+            return (ct);
+        }
+
+        #endregion
+
+        #region GetOffice2007BackstageVistaGlassColorTable
+
+        /// <summary>
+        /// GetOffice2007BackstageVistaGlassColorTable
+        /// </summary>
+        /// <param name="ct"></param>
+        /// <param name="factory"></param>
+        /// <returns>Office2010BackstageVistaGlassColorTable</returns>
+        internal static SuperTabColorTable GetOffice2007BackstageVistaGlassColorTable(
+            SuperTabColorTable ct, ColorFactory factory)
+        {
+            if (ct == null)
+                ct = new SuperTabColorTable();
+
+            ct.Background = new SuperTabLinearGradientColorTable(
+                factory.GetColor(0x2F3A4F), factory.GetColor(0x3F4F6E));
+
+            ct.InnerBorder = Color.Empty;
+            ct.OuterBorder = factory.GetColor(0x3B4A67);
+
+            ct.ControlBoxDefault.Image = factory.GetColor(0xFFFFFF);
+
+            ct.ControlBoxMouseOver.Background = factory.GetColor(0xCEEDFA);
+            ct.ControlBoxMouseOver.Border = factory.GetColor(0x3399FF);
+            ct.ControlBoxMouseOver.Image = factory.GetColor(0xFF, 0x000000);
+
+            ct.ControlBoxPressed.Background = factory.GetColor(0xB7CAE0);
+            ct.ControlBoxPressed.Border = factory.GetColor(0x3399FF);
+            ct.ControlBoxPressed.Image = factory.GetColor(0xFF, 0x000000);
+
+            ct.InsertMarker = factory.GetColor(0xFF, 0xFFFFFF);
+            ct.SelectionMarker = factory.GetColor(0xFF, 0xFFFFFF);
+
+            return (ct);
+        }
+
+        #endregion
+
+        #region GetMetroBackstageColorTable
+
+        /// <summary>
+        /// GetOffice2010BackstageSilverColorTable
+        /// </summary>
+        /// <param name="ct"></param>
+        /// <param name="factory"></param>
+        /// <returns>Office2010BackstageSilverColorTable</returns>
+        internal static SuperTabColorTable GetMetroBackstageColorTable(
+            SuperTabColorTable ct, ColorFactory factory, DevComponents.DotNetBar.Metro.ColorTables.MetroPartColors metroColors)
+        {
+            if (ct == null)
+                ct = new SuperTabColorTable();
+
+            ct.Background = new SuperTabLinearGradientColorTable(
+                factory.GetColor(metroColors.BaseColor));
+
+            ct.InnerBorder = Color.Empty;// factory.GetColor(metroColors.BaseColor);
+            ct.OuterBorder = Color.Empty; // factory.GetColor(metroColors.BaseColor);
+
+            ct.ControlBoxDefault.Image = factory.GetColor(metroColors.BaseTextColor);
+
+            ct.ControlBoxMouseOver.Background = factory.GetColor(metroColors.BaseColorDark);
+            ct.ControlBoxMouseOver.Border = factory.GetColor(metroColors.BaseColorDark);
+            ct.ControlBoxMouseOver.Image = factory.GetColor(metroColors.BaseTextColor);
+
+            ct.ControlBoxPressed.Background = factory.GetColor(metroColors.BaseColorDark);
+            ct.ControlBoxPressed.Border = factory.GetColor(metroColors.BaseColorDark);
+            ct.ControlBoxPressed.Image = factory.GetColor(metroColors.BaseTextColor);
+
+            ct.InsertMarker = factory.GetColor(metroColors.BaseTextColor);
+            ct.SelectionMarker = Color.Empty; // factory.GetColor(metroColors.BaseTextColor);
+
+            return (ct);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetOffice2010BackstageItemColorTable
+
+        #region GetOffice2010BackstageItemColorTable
+
+        /// <summary>
+        /// GetOffice2010BackstageItemColorTable
+        /// </summary>
+        /// <returns>Office2010BackstageItemColorTable</returns>
+        private static SuperTabItemColorTable GetOffice2010BackstageItemColorTable()
+        {
+            Office2007Renderer r = GlobalManager.Renderer as Office2007Renderer;
+
+            return (r != null
+                        ? r.ColorTable.BackstageItem
+                        : new SuperTabItemColorTable());
+        }
+
+        #endregion
+
+        #region GetOffice2010BackstageBlueItemColorTable
+
+        /// <summary>
+        /// GetOffice2010BackstageBlueItemColorTable
+        /// </summary>
+        /// <param name="ct"></param>
+        /// <param name="factory"></param>
+        /// <returns>Office2010BackstageBlueItemColorTable</returns>
+        internal static SuperTabItemColorTable GetOffice2010BackstageBlueItemColorTable(
+            SuperTabItemColorTable ct, ColorFactory factory)
+        {
+            if (ct == null)
+                ct = new SuperTabItemColorTable();
+
+            // Top Default
+
+            ct.Default.Normal.Text = factory.GetColor(0x000000);
+            ct.Default.Normal.Background.AdaptiveGradient = false;
+            ct.Default.Normal.CloseMarker = factory.GetColor(0x000000);
+
+            // Top Selected
+
+            ct.Default.Selected.Background = new SuperTabLinearGradientColorTable(factory.GetColor(0x094DAD));
+
+            ct.Default.Selected.Background.AdaptiveGradient = false;
+            ct.Default.Selected.InnerBorder = Color.Empty;
+            ct.Default.Selected.OuterBorder = factory.GetColor(0x073F97);
+            ct.Default.Selected.Text = factory.GetColor(0xFFFFFF);
+            ct.Default.Selected.CloseMarker = factory.GetColor(0xFFFFFF);
+            ct.Default.Selected.SelectionMarker = factory.GetColor(0xFFFFFF);
+
+            // Top SelectedMouseOver
+
+            ct.Default.SelectedMouseOver = ct.Default.Selected;
+
+            // Top MouseOver
+
+            ct.Default.MouseOver.Background = new SuperTabLinearGradientColorTable(factory.GetColor(0xDDEBFA));
+            ct.Default.MouseOver.Background.AdaptiveGradient = false;
+            ct.Default.MouseOver.InnerBorder = factory.GetColor(0xF0F5FC);
+            ct.Default.MouseOver.OuterBorder = factory.GetColor(0x527DE0);
+            ct.Default.MouseOver.Text = factory.GetColor(0x000000);
+            ct.Default.MouseOver.CloseMarker = factory.GetColor(0x000000);
+
+            // Top Disabled
+
+            ct.Default.Disabled.Text = factory.GetColor(0xE0E0E0);
+            ct.Default.Disabled.Background.AdaptiveGradient = false;
+            ct.Default.Disabled.CloseMarker = factory.GetColor(0xE0E0E0);
+
+            // Left, Bottom, Right
+
+            ct.Left = ct.Default;
+            ct.Bottom = ct.Default;
+            ct.Right = ct.Right;
+
+            return (ct);
+        }
+
+        #endregion
+
+        #region GetOffice2010BackstageBlackItemColorTable
+
+        /// <summary>
+        /// GetOffice2010BackstageBlackItemColorTable
+        /// </summary>
+        /// <param name="ct"></param>
+        /// <param name="factory"></param>
+        /// <returns>Office2010BackstageBlackItemColorTable</returns>
+        internal static SuperTabItemColorTable GetOffice2010BackstageBlackItemColorTable(
+            SuperTabItemColorTable ct, ColorFactory factory)
+        {
+            if (ct == null)
+                ct = new SuperTabItemColorTable();
+
+            // Top Default
+
+            ct.Default.Normal.Text = factory.GetColor(0xFFFFFF);
+            ct.Default.Normal.Background.AdaptiveGradient = false;
+            ct.Default.Normal.CloseMarker = factory.GetColor(0xFFFFFF);
+
+            // Top Selected
+
+            ct.Default.Selected.Background = new SuperTabLinearGradientColorTable(factory.GetColor(0x094DAD));
+
+            ct.Default.Selected.Background.AdaptiveGradient = false;
+            ct.Default.Selected.InnerBorder = Color.Empty;
+            ct.Default.Selected.OuterBorder = factory.GetColor(0x073F97);
+            ct.Default.Selected.Text = factory.GetColor(0xFFFFFF);
+            ct.Default.Selected.CloseMarker = factory.GetColor(0xFFFFFF);
+            ct.Default.Selected.SelectionMarker = factory.GetColor(0xFFFFFF);
+
+            // Top SelectedMouseOver
+
+            ct.Default.SelectedMouseOver = ct.Default.Selected;
+
+            // Top MouseOver
+
+            ct.Default.MouseOver.Background = new SuperTabLinearGradientColorTable(factory.GetColor(0x54657D));
+            ct.Default.MouseOver.Background.AdaptiveGradient = false;
+            ct.Default.MouseOver.InnerBorder = factory.GetColor(0x55667E);
+            ct.Default.MouseOver.OuterBorder = factory.GetColor(0x4991F5);
+            ct.Default.MouseOver.Text = factory.GetColor(0xFFFFFF);
+            ct.Default.MouseOver.CloseMarker = factory.GetColor(0xFFFFFF);
+
+            // Left, Bottom, Right
+
+            ct.Left = ct.Default;
+            ct.Bottom = ct.Default;
+            ct.Right = ct.Right;
+
+            return (ct);
+        }
+
+        #endregion
+
+        #region GetOffice2010BackstageSilverItemColorTable
+
+        /// <summary>
+        /// GetOffice2010BackstageSilverItemColorTable
+        /// </summary>
+        /// <param name="ct"></param>
+        /// <param name="factory"></param>
+        /// <returns>Office2010BackstageSilverItemColorTable</returns>
+        internal static SuperTabItemColorTable GetOffice2010BackstageSilverItemColorTable(
+            SuperTabItemColorTable ct, ColorFactory factory)
+        {
+            if (ct == null)
+                ct = new SuperTabItemColorTable();
+
+            // Top Default
+
+            ct.Default.Normal.Text = factory.GetColor(0x000000);
+            ct.Default.Normal.Background.AdaptiveGradient = false;
+            ct.Default.Normal.CloseMarker = factory.GetColor(0x000000);
+
+            // Top Selected
+
+            ct.Default.Selected.Background = new SuperTabLinearGradientColorTable(factory.GetColor(0x094DAD));
+
+            ct.Default.Selected.Background.AdaptiveGradient = false;
+            ct.Default.Selected.InnerBorder = Color.Empty;
+            ct.Default.Selected.OuterBorder = factory.GetColor(0x073F97);
+            ct.Default.Selected.Text = factory.GetColor(0xFFFFFF);
+            ct.Default.Selected.CloseMarker = factory.GetColor(0xFFFFFF);
+            ct.Default.Selected.SelectionMarker = factory.GetColor(0xFFFFFF);
+
+            // Top SelectedMouseOver
+
+            ct.Default.SelectedMouseOver = ct.Default.Selected;
+
+            // Top MouseOver
+
+            ct.Default.MouseOver.Background = new SuperTabLinearGradientColorTable(factory.GetColor(0xDDEBFA));
+            ct.Default.MouseOver.Background.AdaptiveGradient = false;
+            ct.Default.MouseOver.InnerBorder = factory.GetColor(0xF0F5FC);
+            ct.Default.MouseOver.OuterBorder = factory.GetColor(0x527DE0);
+            ct.Default.MouseOver.Text = factory.GetColor(0x000000);
+            ct.Default.MouseOver.CloseMarker = factory.GetColor(0x000000);
+
+            // Left, Bottom, Right
+
+            ct.Left = ct.Default;
+            ct.Bottom = ct.Default;
+            ct.Right = ct.Right;
+
+            return (ct);
+        }
+
+        #endregion
+
+        #region GetOffice2007BackstageVistaGlassItemColorTable
+
+        /// <summary>
+        /// GetOffice2007BackstageVistaGlassItemColorTable
+        /// </summary>
+        /// <param name="ct"></param>
+        /// <param name="factory"></param>
+        /// <returns>Office2010BackstageVistaGlassItemColorTable</returns>
+        internal static SuperTabItemColorTable GetOffice2007BackstageVistaGlassItemColorTable(
+            SuperTabItemColorTable ct, ColorFactory factory)
+        {
+            if (ct == null)
+                ct = new SuperTabItemColorTable();
+
+            // Top Default
+
+            ct.Default.Normal.Text = factory.GetColor(0xFFFFFF);
+            ct.Default.Normal.Background.AdaptiveGradient = false;
+            ct.Default.Normal.CloseMarker = factory.GetColor(0xFFFFFF);
+
+            // Top Selected
+
+            ct.Default.Selected.Background = new SuperTabLinearGradientColorTable(
+                factory.GetColor(0x597FDF), factory.GetColor(0x2E57AF));
+
+            ct.Default.Selected.Background.AdaptiveGradient = false;
+            ct.Default.Selected.InnerBorder = factory.GetColor(0x6889EC);
+            ct.Default.Selected.OuterBorder = factory.GetColor(0x242D3D);
+            ct.Default.Selected.Text = factory.GetColor(0xFFFFFF);
+            ct.Default.Selected.CloseMarker = factory.GetColor(0xFFFFFF);
+            ct.Default.Selected.SelectionMarker = factory.GetColor(0xFFFFFF);
+
+            // Top SelectedMouseOver
+
+            ct.Default.SelectedMouseOver.Background = new SuperTabLinearGradientColorTable(
+                factory.GetColor(0x597FDF), factory.GetColor(0x2E57AF));
+
+            ct.Default.SelectedMouseOver.Background.AdaptiveGradient = false;
+            ct.Default.SelectedMouseOver.InnerBorder = factory.GetColor(0x6889EC);
+            ct.Default.SelectedMouseOver.OuterBorder = factory.GetColor(0x242D3D);
+            ct.Default.SelectedMouseOver.Text = factory.GetColor(0xFFFFFF);
+            ct.Default.SelectedMouseOver.CloseMarker = factory.GetColor(0xFFFFFF);
+            ct.Default.SelectedMouseOver.SelectionMarker = factory.GetColor(0xFFFFFF);
+
+            // Top MouseOver
+
+            ct.Default.MouseOver.Background = new SuperTabLinearGradientColorTable(
+                new Color[] { factory.GetColor(0x3B4F7C), factory.GetColor(0x364872), factory.GetColor(0x364872), factory.GetColor(0x293857) },
+                new float[] { 0, 095f, .95f, 1 });
+
+            ct.Default.MouseOver.Background.AdaptiveGradient = false;
+            ct.Default.MouseOver.InnerBorder = factory.GetColor(0x739AFF);
+            ct.Default.MouseOver.OuterBorder = factory.GetColor(0x0B1E54);
+            ct.Default.MouseOver.Text = factory.GetColor(0xFFFFFF);
+            ct.Default.MouseOver.CloseMarker = factory.GetColor(0xFFFFFF);
+
+            // Left, Bottom, Right
+
+            ct.Left = ct.Default;
+            ct.Bottom = ct.Default;
+            ct.Right = ct.Right;
+
+            return (ct);
+        }
+
+        #endregion
+
+        #region GetMetroBackstageItemColorTable
+
+        /// <summary>
+        /// GetOffice2010BackstageSilverItemColorTable
+        /// </summary>
+        /// <param name="ct"></param>
+        /// <param name="factory"></param>
+        /// <param name="metroColors"></param>
+        /// <returns>Office2010BackstageSilverItemColorTable</returns>
+        internal static SuperTabItemColorTable GetMetroBackstageItemColorTable(
+            SuperTabItemColorTable ct, ColorFactory factory, Metro.ColorTables.MetroPartColors metroColors)
+        {
+            if (ct == null)
+                ct = new SuperTabItemColorTable();
+
+            // Top Default
+
+            ct.Default.Normal.Text = factory.GetColor(metroColors.BaseTextColor);
+            ct.Default.Normal.Background.AdaptiveGradient = false;
+            ct.Default.Normal.CloseMarker = factory.GetColor(metroColors.BaseTextColor);
+
+            // Top Selected
+
+            ct.Default.Selected.Background = new SuperTabLinearGradientColorTable(factory.GetColor(metroColors.BaseColorLight1));
+            ct.Default.Selected.Background.AdaptiveGradient = false;
+            ct.Default.Selected.InnerBorder = Color.Empty;
+            ct.Default.Selected.OuterBorder = Color.Empty;
+            ct.Default.Selected.Text = factory.GetColor(metroColors.BaseTextColor);
+            ct.Default.Selected.CloseMarker = factory.GetColor(metroColors.BaseTextColor);
+            ct.Default.Selected.SelectionMarker = Color.Empty;
+
+            // Top SelectedMouseOver
+            ct.Default.SelectedMouseOver = new SuperTabItemStateColorTable();
+            ct.Default.SelectedMouseOver.Background = new SuperTabLinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            ct.Default.SelectedMouseOver.Background.AdaptiveGradient = false;
+            ct.Default.SelectedMouseOver.InnerBorder = Color.Empty;
+            ct.Default.SelectedMouseOver.OuterBorder = Color.Empty;
+            ct.Default.SelectedMouseOver.Text = factory.GetColor(metroColors.BaseTextColor);
+            ct.Default.SelectedMouseOver.CloseMarker = factory.GetColor(metroColors.BaseTextColor);
+            ct.Default.SelectedMouseOver.SelectionMarker = Color.Empty;
+            
+            // Top MouseOver
+
+            ct.Default.MouseOver.Background = new SuperTabLinearGradientColorTable(factory.GetColor(metroColors.BaseColorDark));
+            ct.Default.MouseOver.Background.AdaptiveGradient = false;
+            ct.Default.MouseOver.InnerBorder = Color.Empty;
+            ct.Default.MouseOver.OuterBorder = Color.Empty;
+            ct.Default.MouseOver.Text = factory.GetColor(metroColors.BaseTextColor);
+            ct.Default.MouseOver.CloseMarker = factory.GetColor(metroColors.BaseTextColor);
+
+            // Top Disabled
+
+            ct.Default.Disabled.Text = factory.GetColor(metroColors.TextDisabledColor);
+            ct.Default.Disabled.Background.AdaptiveGradient = false;
+            ct.Default.Disabled.CloseMarker = factory.GetColor(metroColors.TextDisabledColor);
+
+            // Left, Bottom, Right
+
+            ct.Left = ct.Default;
+            ct.Bottom = ct.Default;
+            ct.Right = ct.Right;
+
+            return (ct);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetOffice2010BackstagePanelColorTable
+
+        #region GetOffice2010BackstagePanelColorTable
+
+        /// <summary>
+        /// GetOffice2010BackstagePanelColorTable
+        /// </summary>
+        /// <returns>Office2010BackstagePanelColorTable</returns>
+        private static SuperTabPanelColorTable GetOffice2010BackstagePanelColorTable()
+        {
+            Office2007Renderer r = GlobalManager.Renderer as Office2007Renderer;
+
+            return (r != null
+                        ? r.ColorTable.BackstagePanel
+                        : new SuperTabPanelColorTable());
+        }
+
+        #endregion
+
+        #region GetOffice2010BackstageBluePanelColorTable
+
+        /// <summary>
+        /// GetOffice2010BackstageBluePanelColorTable
+        /// </summary>
+        /// <param name="ct"></param>
+        /// <param name="factory"></param>
+        /// <returns>Office2010BackstageBluePanelColorTable</returns>
+        internal static SuperTabPanelColorTable GetOffice2010BackstageBluePanelColorTable(
+            SuperTabPanelColorTable ct, ColorFactory factory)
+        {
+            if (ct == null)
+                ct = new SuperTabPanelColorTable();
+
+            ct.Default.Background = new SuperTabLinearGradientColorTable(
+                factory.GetColor(0xFFFFFF), factory.GetColor(0xFFFFFF));
+
+            ct.Default.InnerBorder = Color.Empty;
+            ct.Default.OuterBorder = factory.GetColor(0xABBCCD);
+            ct.Default.Background.AdaptiveGradient = false;
+
+            ct.Left = ct.Default;
+            ct.Bottom = ct.Default;
+            ct.Right = ct.Default;
+
+            return (ct);
+        }
+
+        #endregion
+
+        #region GetOffice2010BackstageBlackPanelColorTable
+
+        /// <summary>
+        /// GetOffice2010BackstageBlackPanelColorTable
+        /// </summary>
+        /// <param name="ct"></param>
+        /// <param name="factory"></param>
+        /// <returns>Office2010BackstageBlackPanelColorTable</returns>
+        internal static SuperTabPanelColorTable GetOffice2010BackstageBlackPanelColorTable(
+            SuperTabPanelColorTable ct, ColorFactory factory)
+        {
+            if (ct == null)
+                ct = new SuperTabPanelColorTable();
+
+            ct.Default.Background = new SuperTabLinearGradientColorTable(
+                factory.GetColor(0xFFFFFF), factory.GetColor(0xFFFFFF));
+
+            ct.Default.InnerBorder = Color.Empty;
+            ct.Default.OuterBorder = factory.GetColor(0x2C2C2C);
+            ct.Default.Background.AdaptiveGradient = false;
+
+            ct.Left = ct.Default;
+            ct.Bottom = ct.Default;
+            ct.Right = ct.Default;
+
+            return (ct);
+        }
+
+        #endregion
+
+        #region GetOffice2010BackstageSilverPanelColorTable
+
+        /// <summary>
+        /// GetOffice2010BackstageSilverPanelColorTable
+        /// </summary>
+        /// <param name="ct"></param>
+        /// <param name="factory"></param>
+        /// <returns>Office2010BackstageSilverPanelColorTable</returns>
+        internal static SuperTabPanelColorTable GetOffice2010BackstageSilverPanelColorTable(
+            SuperTabPanelColorTable ct, ColorFactory factory)
+        {
+            if (ct == null)
+                ct = new SuperTabPanelColorTable();
+
+            ct.Default.Background = new SuperTabLinearGradientColorTable(
+                factory.GetColor(0xFFFFFF), factory.GetColor(0xFFFFFF));
+
+            ct.Default.InnerBorder = Color.Empty;
+            ct.Default.OuterBorder = factory.GetColor(0xCCCDCE);
+            ct.Default.Background.AdaptiveGradient = false;
+
+            ct.Left = ct.Default;
+            ct.Bottom = ct.Default;
+            ct.Right = ct.Default;
+
+            return (ct);
+        }
+
+        #endregion
+
+        #region GetOffice2007BackstageVistaGlassPanelColorTable
+
+        /// <summary>
+        /// GetOffice2007BackstageVistaGlassPanelColorTable
+        /// </summary>
+        /// <param name="ct"></param>
+        /// <param name="factory"></param>
+        /// <returns>Office2010BackstageVistaGlassPanelColorTable</returns>
+        internal static SuperTabPanelColorTable GetOffice2007BackstageVistaGlassPanelColorTable(
+            SuperTabPanelColorTable ct, ColorFactory factory)
+        {
+            if (ct == null)
+                ct = new SuperTabPanelColorTable();
+
+            ct.Default.Background = new SuperTabLinearGradientColorTable(
+                factory.GetColor(0xFFFFFF), factory.GetColor(0xFFFFFF));
+
+            ct.Default.OuterBorder = factory.GetColor(0x3F4F6E);
+            ct.Default.InnerBorder = factory.GetColor(0x3F4F6E);
+            ct.Default.Background.AdaptiveGradient = false;
+
+            ct.Left = ct.Default;
+            ct.Bottom = ct.Default;
+            ct.Right = ct.Default;
+
+            return (ct);
+        }
+
+        #endregion
+
+        #region GetMetroBackstagePanelColorTable
+
+        /// <summary>
+        /// GetOffice2010BackstageSilverPanelColorTable
+        /// </summary>
+        /// <param name="ct"></param>
+        /// <param name="factory"></param>
+        /// <returns>Office2010BackstageSilverPanelColorTable</returns>
+        internal static SuperTabPanelColorTable GetMetroBackstagePanelColorTable(
+            SuperTabPanelColorTable ct, ColorFactory factory, DevComponents.DotNetBar.Metro.ColorTables.MetroPartColors metroColors)
+        {
+            if (ct == null)
+                ct = new SuperTabPanelColorTable();
+
+            ct.Default.Background = new SuperTabLinearGradientColorTable(
+                factory.GetColor(metroColors.CanvasColor), factory.GetColor(metroColors.CanvasColor));
+
+            ct.Default.InnerBorder = Color.Empty;
+            ct.Default.OuterBorder = factory.GetColor(metroColors.CanvasColor);
+            ct.Default.Background.AdaptiveGradient = false;
+
+            ct.Left = ct.Default;
+            ct.Bottom = ct.Default;
+            ct.Right = ct.Default;
+
+            return (ct);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region OneNote2007
+
+        #region GetOneNote2007ColorTable
+
+        private static SuperTabColorTable GetOneNote2007ColorTable(ColorFactory factory)
+        {
+            SuperTabColorTable ct = new SuperTabColorTable();
+
+            ct.Background = new SuperTabLinearGradientColorTable(Color.White);
+            ct.InnerBorder = factory.GetColor(0xFFFFFF);
+            ct.OuterBorder = factory.GetColor(0x7C7C94);
+
+            ct.ControlBoxDefault.Image = factory.GetColor(0xFF, 0x000000);
+
+            ct.ControlBoxMouseOver.Background = factory.GetColor(0xFFE7A2);
+            ct.ControlBoxMouseOver.Border = factory.GetColor(0xFFBD69);
+            ct.ControlBoxMouseOver.Image = factory.GetColor(0xFF, 0x000000);
+
+            ct.ControlBoxPressed.Background = factory.GetColor(0xFB8C3C);
+            ct.ControlBoxPressed.Border = factory.GetColor(0xFFBD69);
+            ct.ControlBoxPressed.Image = factory.GetColor(0xFF, 0x000000);
+
+            ct.InsertMarker = factory.GetColor(0xFF, 0x000080);
+
+            return (ct);
+        }
+
+        #endregion
+
+        #region GetOneNote2007ItemColorTable
+
+        private static SuperTabItemColorTable GetOneNote2007ItemColorTable(ColorFactory factory)
+        {
+            SuperTabItemColorTable ct = new SuperTabItemColorTable();
+
+            // Top
+            // Default
+
+            ct.Default.Normal = new SuperTabItemStateColorTable();
+
+            ct.Default.Normal.Background = new SuperTabLinearGradientColorTable(
+                new Color[] { factory.GetColor(0xE1E9F9), factory.GetColor(0xC8D6F3), factory.GetColor(0x96B1E7), factory.GetColor(0x96B1E7) },
+                new float[] { 0, .5f, .5f, 1 });
+
+            ct.Default.Normal.InnerBorder = factory.GetColor(0xFFFFFF);
+            ct.Default.Normal.OuterBorder = factory.GetColor(0x767492);
+            ct.Default.Normal.Text = factory.GetColor(0xFF, 0x000000);
+            ct.Default.Normal.CloseMarker = factory.GetColor(0x406F9F);
+
+            // Selected
+
+            ct.Default.Selected = new SuperTabItemStateColorTable();
+
+            ct.Default.Selected.Background = new SuperTabLinearGradientColorTable(
+                new Color[] { factory.GetColor(0xF0F4FB), factory.GetColor(0xDBE4F7), factory.GetColor(0xC5D4F2), factory.GetColor(0xC5D4F2) },
+                new float[] { 0, .5f, .5f, 1 });
+
+            ct.Default.Selected.InnerBorder = factory.GetColor(0xFFFFFF);
+            ct.Default.Selected.OuterBorder = factory.GetColor(0x7C7C94);
+            ct.Default.Selected.Text = factory.GetColor(0xFF, 0x000000);
+            ct.Default.Selected.CloseMarker = factory.GetColor(0x406F9F);
+
+            // Selected MouseOver
+
+            ct.Default.SelectedMouseOver = new SuperTabItemStateColorTable();
+
+            ct.Default.SelectedMouseOver.Background = new SuperTabLinearGradientColorTable(
+                factory.GetColor(0xFFFBF0), factory.GetColor(0xFFF0C8));
+
+            ct.Default.SelectedMouseOver.InnerBorder = factory.GetColor(0xFFFFFF);
+            ct.Default.SelectedMouseOver.OuterBorder = factory.GetColor(0x4B4B6F);
+            ct.Default.SelectedMouseOver.Text = factory.GetColor(0xFF, 0x000000);
+            ct.Default.SelectedMouseOver.CloseMarker = factory.GetColor(0x406F9F);
+
+            // MouseOver
+
+            ct.Default.MouseOver = new SuperTabItemStateColorTable();
+
+            ct.Default.MouseOver.Background = new SuperTabLinearGradientColorTable(
+                factory.GetColor(0xFFFBF0), factory.GetColor(0xFFF0C8));
+
+            ct.Default.MouseOver.InnerBorder = factory.GetColor(0xFFFFFF);
+            ct.Default.MouseOver.OuterBorder = factory.GetColor(0x4B4B6F);
+            ct.Default.MouseOver.Text = factory.GetColor(0xFF, 0x000000);
+            ct.Default.MouseOver.CloseMarker = factory.GetColor(0x406F9F);
+
+            // Left
+            // Default
+
+            ct.Left.Normal = new SuperTabItemStateColorTable();
+
+            ct.Left.Normal.Background = new SuperTabLinearGradientColorTable(factory.GetColor(0xE1E9F9), factory.GetColor(0x96B1E7));
+            ct.Left.Normal.InnerBorder = factory.GetColor(0xFFFFFF);
+            ct.Left.Normal.OuterBorder = factory.GetColor(0x767492);
+            ct.Left.Normal.Text = factory.GetColor(0xFF, 0x000000);
+            ct.Left.Normal.CloseMarker = factory.GetColor(0x406F9F);
+
+            // Selected
+
+            ct.Left.Selected = new SuperTabItemStateColorTable();
+
+            ct.Left.Selected.Background = new SuperTabLinearGradientColorTable(factory.GetColor(0xF0F4FB), factory.GetColor(0xC5D4F2));
+            ct.Left.Selected.InnerBorder = factory.GetColor(0xFFFFFF);
+            ct.Left.Selected.OuterBorder = factory.GetColor(0x7C7C94);
+            ct.Left.Selected.Text = factory.GetColor(0xFF, 0x000000);
+            ct.Left.Selected.CloseMarker = factory.GetColor(0x406F9F);
+
+            // SelectedMouseOver
+
+            ct.Left.SelectedMouseOver = ct.Default.SelectedMouseOver;
+
+            // MouseOver
+
+            ct.Left.MouseOver = ct.Default.MouseOver;
+
+            // Bottom, Right
+
+            ct.Bottom = ct.Default;
+            ct.Right = ct.Left;
+
+            return (ct);
+        }
+
+        #endregion
+
+        #region GetOneNote2007PanelColorTable
+
+        private static SuperTabPanelColorTable GetOneNote2007PanelColorTable(ColorFactory factory)
+        {
+            SuperTabPanelColorTable ct = new SuperTabPanelColorTable();
+
+            ct.Default.Background = new SuperTabLinearGradientColorTable(
+                new Color[] { factory.GetColor(0xC4D3F1), factory.GetColor(0x8AA8E4), factory.GetColor(0x8AA8E4), factory.GetColor(0xC4D3F1) },
+                new float[] { 0f, .5f, .5f, 1 });
+
+            ct.Default.InnerBorder = factory.GetColor(0xFFFFFF);
+            ct.Default.OuterBorder = factory.GetColor(0x7C7C94);
+
+            ct.Left.Background = new SuperTabLinearGradientColorTable(factory.GetColor(0xC4D3F1), factory.GetColor(0xC4D3F1));
+            ct.Left.InnerBorder = factory.GetColor(0xFFFFFF);
+            ct.Left.OuterBorder = factory.GetColor(0x7C7C94);
+
+            ct.Bottom = ct.Default;
+            ct.Right = ct.Left;
+
+            return (ct);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region OfficeMobile2014
+
+        #region GetOfficeMobile2014ColorTable
+
+        private static SuperTabColorTable GetOfficeMobile2014ColorTable(ColorFactory factory)
+        {
+            SuperTabColorTable ct = new SuperTabColorTable();
+
+            ct.InnerBorder = Color.Empty;
+            ct.OuterBorder = Color.Empty;
+            ct.Background = new SuperTabLinearGradientColorTable(Color.White);
+
+            ct.ControlBoxDefault.Image = factory.GetColor(0xFF, 0x000000);
+
+            ct.ControlBoxMouseOver.Background = factory.GetColor(0xFFE7A2);
+            ct.ControlBoxMouseOver.Border = factory.GetColor(0xFFBD69);
+            ct.ControlBoxMouseOver.Image = factory.GetColor(0xFF, 0x000000);
+
+            ct.ControlBoxPressed.Background = factory.GetColor(0xFB8C3C);
+            ct.ControlBoxPressed.Border = factory.GetColor(0xFFBD69);
+            ct.ControlBoxPressed.Image = factory.GetColor(0xFF, 0x000000);
+
+            ct.InsertMarker = factory.GetColor(0xFF, 0x000080);
+
+            return (ct);
+        }
+
+        #endregion
+
+        #region GetOfficeMobile2014ItemColorTable
+
+        private static SuperTabItemColorTable GetOfficeMobile2014ItemColorTable(ColorFactory factory)
+        {
+            return (GetPredefinedTabColors(eTabItemColor.OfficeMobile2014Teal, factory));
+        }
+
+        #endregion
+
+        #region GetOfficeMobile2014PanelColorTable
+
+        private static SuperTabPanelColorTable GetOfficeMobile2014PanelColorTable(ColorFactory factory)
+        {
+            SuperTabPanelColorTable ct = new SuperTabPanelColorTable();
+
+            SuperTabLinearGradientColorTable lgt =
+                GetPredefinedSelectedBackground(eTabItemColor.OfficeMobile2014Teal, factory);
+
+            Color color = (lgt.Colors != null && lgt.Colors.Length > 0)
+                ? lgt.Colors[lgt.Colors.Length - 1] : Color.DimGray;
+
+            ct.Default.InnerBorder = color;
+            ct.Default.OuterBorder = color;
+            ct.Default.Background = new SuperTabLinearGradientColorTable(Color.White);
+
+            ct.Left = ct.Default;
+            ct.Bottom = ct.Default;
+            ct.Right = ct.Left;
+
+            return (ct);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region VisualStudio2008Dock
+
+        #region GetVisualStudio2008DockColorTable
+
+        private static SuperTabColorTable GetVisualStudio2008DockColorTable(ColorFactory factory)
+        {
+            SuperTabColorTable ct = new SuperTabColorTable();
+
+            ct.Background = new SuperTabLinearGradientColorTable(Color.White);
+            ct.InnerBorder = factory.GetColor(0xFFFFFF);
+            ct.OuterBorder = factory.GetColor(0x7C7C94);
+
+            ct.ControlBoxDefault.Image = factory.GetColor(0xFF, 0x000000);
+
+            ct.ControlBoxMouseOver.Background = factory.GetColor(0xCEEDFA);
+            ct.ControlBoxMouseOver.Border = factory.GetColor(0x3399FF);
+            ct.ControlBoxMouseOver.Image = factory.GetColor(0xFF, 0x000000);
+
+            ct.ControlBoxPressed.Background = factory.GetColor(0xB7CAE0);
+            ct.ControlBoxPressed.Border = factory.GetColor(0x3399FF);
+            ct.ControlBoxPressed.Image = factory.GetColor(0xFF, 0x000000);
+
+            ct.InsertMarker = factory.GetColor(0xFF, 0x000080);
+
+            return (ct);
+        }
+
+        #endregion
+
+        #region GetVisualStudio2008DockItemColorTable
+
+        private static SuperTabItemColorTable GetVisualStudio2008DockItemColorTable(ColorFactory factory)
+        {
+            SuperTabItemColorTable ct = new SuperTabItemColorTable();
+
+            // Top
+            // Default
+
+            ct.Default.Normal = new SuperTabItemStateColorTable();
+
+            ct.Default.Normal.Background = new SuperTabLinearGradientColorTable(
+                new Color[] { factory.GetColor(0xF2F2F2), factory.GetColor(0xEBEBEB), factory.GetColor(0xDDDDDD), factory.GetColor(0xCFCFCF) },
+                new float[] { 0, .5f, .5f, 1 });
+
+            ct.Default.Normal.InnerBorder = factory.GetColor(0xFCFCFC);
+            ct.Default.Normal.OuterBorder = factory.GetColor(0x898C95);
+            ct.Default.Normal.Text = factory.GetColor(0x555564);
+            ct.Default.Normal.CloseMarker = factory.GetColor(0x1A4875);
+
+            // Selected
+
+            ct.Default.Selected = new SuperTabItemStateColorTable();
+
+            ct.Default.Selected.Background = new SuperTabLinearGradientColorTable(factory.GetColor(0xFFFFFF));
+            ct.Default.Selected.InnerBorder = Color.Empty;
+            ct.Default.Selected.OuterBorder = factory.GetColor(0x898C95);
+            ct.Default.Selected.Text = factory.GetColor(0xFF, 0x000000);
+            ct.Default.Selected.CloseMarker = factory.GetColor(0x1A4875);
+
+            // SelectedMouseOver
+
+            ct.Default.SelectedMouseOver = new SuperTabItemStateColorTable();
+
+            ct.Default.SelectedMouseOver.Background = new SuperTabLinearGradientColorTable(factory.GetColor(0xFFFFFF));
+            ct.Default.SelectedMouseOver.InnerBorder = Color.Empty;
+            ct.Default.SelectedMouseOver.OuterBorder = factory.GetColor(0x898C95);
+            ct.Default.SelectedMouseOver.Text = factory.GetColor(0xFF, 0x000000);
+            ct.Default.SelectedMouseOver.CloseMarker = factory.GetColor(0x1A4875);
+
+            // MouseOver
+
+            ct.Default.MouseOver = new SuperTabItemStateColorTable();
+
+            ct.Default.MouseOver.Background = new SuperTabLinearGradientColorTable(
+                new Color[] { factory.GetColor(0xEAF6FD), factory.GetColor(0xD9F0FC), factory.GetColor(0xBEE6FD), factory.GetColor(0xA7D9F5) },
+                new float[] { 0, .5f, .5f, 1 });
+
+            ct.Default.MouseOver.InnerBorder = factory.GetColor(0xFAFDFE);
+            ct.Default.MouseOver.OuterBorder = factory.GetColor(0x3C7FB1);
+            ct.Default.MouseOver.Text = factory.GetColor(0x555564);
+            ct.Default.MouseOver.CloseMarker = factory.GetColor(0x1A4875);
+
+            // Bottom
+
+            ct.Bottom = ct.Default;
+
+            // Left, Right 
+
+            ct.Left = (SuperTabColorStates) ct.Default.Clone();
+
+            ct.Left.Normal.Background.AdaptiveGradient = false;
+            ct.Left.MouseOver.Background.AdaptiveGradient = false;
+            ct.Left.Selected.Background.AdaptiveGradient = false;
+            ct.Left.SelectedMouseOver.Background.AdaptiveGradient = false;
+
+            ct.Right = ct.Left;
+
+            return (ct);
+        }
+
+        #endregion
+
+        #region GetVisualStudio2008DockPanelColorTable
+
+        private static SuperTabPanelColorTable GetVisualStudio2008DockPanelColorTable(ColorFactory factory)
+        {
+            SuperTabPanelColorTable ct = new SuperTabPanelColorTable();
+
+            ct.Default.Background = new SuperTabLinearGradientColorTable(factory.GetColor(0xFFFFFF));
+            ct.Default.InnerBorder = factory.GetColor(0xFFFFFF);
+            ct.Default.OuterBorder = factory.GetColor(0x898C95);
+
+            ct.Left = ct.Default;
+            ct.Bottom = ct.Default;
+            ct.Right = ct.Default;
+
+            return (ct);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region VisualStudio2008Document
+
+        #region GetVisualStudio2008DocumentColorTable
+
+        private static SuperTabColorTable GetVisualStudio2008DocumentColorTable(ColorFactory factory)
+        {
+            SuperTabColorTable ct = new SuperTabColorTable();
+
+            ct.Background = new SuperTabLinearGradientColorTable(Color.White);
+            ct.InnerBorder = factory.GetColor(0xFFFFFF);
+            ct.OuterBorder = factory.GetColor(0x69A1BF);
+
+            ct.ControlBoxDefault.Image = factory.GetColor(0xFF, 0x000000);
+
+            ct.ControlBoxMouseOver.Background = factory.GetColor(0xCEEDFA);
+            ct.ControlBoxMouseOver.Border = factory.GetColor(0x3399FF);
+            ct.ControlBoxMouseOver.Image = factory.GetColor(0xFF, 0x000000);
+
+            ct.ControlBoxPressed.Background = factory.GetColor(0xB7CAE0);
+            ct.ControlBoxPressed.Border = factory.GetColor(0x3399FF);
+            ct.ControlBoxPressed.Image = factory.GetColor(0xFF, 0x000000);
+
+            ct.InsertMarker = factory.GetColor(0xFF, 0x000080);
+
+            return (ct);
+        }
+
+        #endregion
+
+        #region GetVisualStudio2008DocumentItemColorTable
+
+        private static SuperTabItemColorTable GetVisualStudio2008DocumentItemColorTable(ColorFactory factory)
+        {
+            SuperTabItemColorTable ct = new SuperTabItemColorTable();
+
+            // Top
+            // Default
+
+            ct.Default.Normal = new SuperTabItemStateColorTable();
+
+            ct.Default.Normal.Background = new SuperTabLinearGradientColorTable(factory.GetColor(0xE6F1F9), factory.GetColor(0x98B4D2));
+            ct.Default.Normal.InnerBorder = factory.GetColor(0xF2FAFF);
+            ct.Default.Normal.OuterBorder = factory.GetColor(0x9196A2);
+            ct.Default.Normal.Text = factory.GetColor(0xFF, 0x000000);
+            ct.Default.Normal.CloseMarker = factory.GetColor(0x1A4875);
+
+            // Selected
+
+            ct.Default.Selected = new SuperTabItemStateColorTable();
+
+            ct.Default.Selected.Background = new SuperTabLinearGradientColorTable(factory.GetColor(0xFCFDFE), factory.GetColor(0xD2E6FA));
+            ct.Default.Selected.InnerBorder = factory.GetColor(0xFFFFFF);
+            ct.Default.Selected.OuterBorder = factory.GetColor(0x69A1BF);
+            ct.Default.Selected.Text = factory.GetColor(0xFF, 0x000000);
+            ct.Default.Selected.CloseMarker = factory.GetColor(0x1A4875);
+
+            // SelectedMouseOver
+
+            ct.Default.SelectedMouseOver = new SuperTabItemStateColorTable();
+
+            ct.Default.SelectedMouseOver.Background = new SuperTabLinearGradientColorTable(factory.GetColor(0xFCFDFE), factory.GetColor(0xD2E6FA));
+            ct.Default.SelectedMouseOver.InnerBorder = factory.GetColor(0xFFFFFF);
+            ct.Default.SelectedMouseOver.OuterBorder = factory.GetColor(0x69A1BF);
+            ct.Default.SelectedMouseOver.Text = factory.GetColor(0xFF, 0x000000);
+            ct.Default.SelectedMouseOver.CloseMarker = factory.GetColor(0x1A4875);
+
+            // MouseOver
+
+            ct.Default.MouseOver = new SuperTabItemStateColorTable();
+
+            ct.Default.MouseOver.Background = new SuperTabLinearGradientColorTable(factory.GetColor(0xF7FCFE), factory.GetColor(0x81D0F1));
+            ct.Default.MouseOver.InnerBorder = factory.GetColor(0xFFFFFF);
+            ct.Default.MouseOver.OuterBorder = factory.GetColor(0x69A1BF);
+            ct.Default.MouseOver.Text = factory.GetColor(0xFF, 0x000000);
+            ct.Default.MouseOver.CloseMarker = factory.GetColor(0x1A4875);
+
+            // Left, Bottom, Right
+
+            ct.Left = ct.Default;
+            ct.Bottom = ct.Default;
+            ct.Right = ct.Default;
+
+            return (ct);
+        }
+
+        #endregion
+
+        #region GetVisualStudio2008DocumentPanelColorTable
+
+        private static SuperTabPanelColorTable GetVisualStudio2008DocumentPanelColorTable(ColorFactory factory)
+        {
+            SuperTabPanelColorTable ct = new SuperTabPanelColorTable();
+
+            ct.Default.Background = new SuperTabLinearGradientColorTable(factory.GetColor(0xD2E6FA));
+            ct.Default.InnerBorder = factory.GetColor(0xFFFFFF);
+            ct.Default.OuterBorder = factory.GetColor(0x69A1BF);
+
+            ct.Left = ct.Default;
+            ct.Bottom = ct.Default;
+            ct.Right = ct.Default;
+
+            return (ct);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region WinMediaPlayer12
+
+        #region GetWinMediaPlayer12ColorTable
+
+        private static SuperTabColorTable
+            GetWinMediaPlayer12ColorTable(ColorFactory factory)
+        {
+            SuperTabColorTable ct = new SuperTabColorTable();
+
+            ct.Background = new SuperTabLinearGradientColorTable(factory.GetColor(0xE1EBF7));
+            ct.InnerBorder = factory.GetColor(0xFFFFFF);
+            ct.OuterBorder = factory.GetColor(0xBCCBDD);
+
+            ct.ControlBoxDefault.Image = factory.GetColor(0xFF, 0x000000);
+
+            ct.ControlBoxMouseOver.Background = factory.GetColor(0xCEEDFA);
+            ct.ControlBoxMouseOver.Border = factory.GetColor(0x3399FF);
+            ct.ControlBoxMouseOver.Image = factory.GetColor(0xFF, 0x000000);
+
+            ct.ControlBoxPressed.Background = factory.GetColor(0xB7CAE0);
+            ct.ControlBoxPressed.Border = factory.GetColor(0x3399FF);
+            ct.ControlBoxPressed.Image = factory.GetColor(0xFF, 0x000000);
+
+            ct.InsertMarker = factory.GetColor(0xFF, 0x000080);
+
+            return (ct);
+        }
+
+        #endregion
+
+        #region GetWinMediaPlayer12ItemColorTable
+
+        private static SuperTabItemColorTable
+            GetWinMediaPlayer12ItemColorTable(ColorFactory factory)
+        {
+            SuperTabItemColorTable ct = new SuperTabItemColorTable();
+
+            // Top
+            // Default
+
+            ct.Default.Normal = new SuperTabItemStateColorTable();
+
+            ct.Default.Normal.Background = new SuperTabLinearGradientColorTable(factory.GetColor(0xD9E0E8), factory.GetColor(0xEAF2FA));
+            ct.Default.Normal.Background.AdaptiveGradient = false;
+            ct.Default.Normal.InnerBorder = factory.GetColor(0xEEEEEF);
+            ct.Default.Normal.OuterBorder = factory.GetColor(0xA6BAD0);
+            ct.Default.Normal.Text = factory.GetColor(0xFF, 0x000000);
+            ct.Default.Normal.CloseMarker = factory.GetColor(0x1A4875);
+
+            // Selected
+
+            ct.Default.Selected = new SuperTabItemStateColorTable();
+
+            ct.Default.Selected.Background = new SuperTabLinearGradientColorTable(factory.GetColor(0xF4F9FF), factory.GetColor(0xEFF6FD));
+            ct.Default.Selected.Background.AdaptiveGradient = false;
+            ct.Default.Selected.InnerBorder = factory.GetColor(0xFFFFFF);
+            ct.Default.Selected.OuterBorder = factory.GetColor(0xBCCBDD);
+            ct.Default.Selected.Text = factory.GetColor(0x002963);
+            ct.Default.Selected.CloseMarker = factory.GetColor(0x1A4875);
+
+            // Selected MouseOver
+
+            ct.Default.SelectedMouseOver = new SuperTabItemStateColorTable();
+
+            ct.Default.SelectedMouseOver.Background = new SuperTabLinearGradientColorTable(factory.GetColor(0xFFFFFF), factory.GetColor(0xF2F8FD));
+            ct.Default.SelectedMouseOver.Background.AdaptiveGradient = false;
+            ct.Default.SelectedMouseOver.InnerBorder = factory.GetColor(0xFFFFFF);
+            ct.Default.SelectedMouseOver.OuterBorder = factory.GetColor(0xBCCBDD);
+            ct.Default.SelectedMouseOver.Text = factory.GetColor(0x002963);
+            ct.Default.SelectedMouseOver.CloseMarker = factory.GetColor(0x1A4875);
+
+            // MouseOver
+
+            ct.Default.MouseOver = new SuperTabItemStateColorTable();
+
+            ct.Default.MouseOver.Background = new SuperTabLinearGradientColorTable(factory.GetColor(0xFFFFFF), factory.GetColor(0xF2F8FD));
+            ct.Default.MouseOver.Background.AdaptiveGradient = false;
+            ct.Default.MouseOver.InnerBorder = factory.GetColor(0xFFFFFF);
+            ct.Default.MouseOver.OuterBorder = factory.GetColor(0xBCCBDD);
+            ct.Default.MouseOver.Text = factory.GetColor(0x002963);
+            ct.Default.MouseOver.CloseMarker = factory.GetColor(0x1A4875);
+
+            // Left, Right, Bottom
+
+            ct.Left = ct.Default;
+            ct.Bottom = ct.Default;
+            ct.Right = ct.Default;
+
+            return (ct);
+        }
+
+        #endregion
+
+        #region GetWinMediaPlayer12PanelColorTable
+
+        private static SuperTabPanelColorTable GetWinMediaPlayer12PanelColorTable(ColorFactory factory)
+        {
+            SuperTabPanelColorTable ct = new SuperTabPanelColorTable();
+
+            ct.Default.Background = new SuperTabLinearGradientColorTable(factory.GetColor(0xEFF6FD));
+            ct.Default.Background.AdaptiveGradient = false;
+            ct.Default.InnerBorder = factory.GetColor(0xFFFFFF);
+            ct.Default.OuterBorder = factory.GetColor(0xBCCBDD);
+
+            ct.Left = ct.Default;
+            ct.Bottom = ct.Default;
+            ct.Right = ct.Default;
+
+            return (ct);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetPredefinedTabColors
+
+        public static SuperTabItemColorTable GetPredefinedTabColors(eTabItemColor c, ColorFactory factory)
+        {
+            SuperTabItemColorTable sct = new SuperTabItemColorTable();
+
+            sct.Default = new SuperTabColorStates();
+
+            sct.Default.Normal = GetPredefinedDefaultColors(c, factory);
+            sct.Default.Selected = GetPredefinedSelectedColors(c, factory);
+            sct.Default.MouseOver = GetPredefinedMouseOverColors(c, factory);
+            sct.Default.SelectedMouseOver = GetPredefinedSelectedMouseOverColors(c, factory);
+
+            sct.Left = sct.Default;
+            sct.Right = sct.Default;
+            sct.Bottom = sct.Default;
+
+            return (sct);
+        }
+
+        #region GetPredefinedDefaultColors
+
+        internal static SuperTabItemStateColorTable GetPredefinedDefaultColors(
+            eTabItemColor c, ColorFactory factory)
+        {
+            SuperTabItemStateColorTable ct = new SuperTabItemStateColorTable();
+
+            ct.InnerBorder = Color.Empty;
+            ct.OuterBorder = Color.Empty;
+            ct.CloseMarker = factory.GetColor(0x406F9F);
+
+            ct.Background = GetPredefinedDefaultBackground(c, factory);
+
+            switch (c)
+            {
+                case eTabItemColor.OfficeMobile2014Teal:
+                    ct.Text = factory.GetColor(0x00516D);
+                    break;
+
+                case eTabItemColor.OfficeMobile2014Blue:
+                    ct.Text = factory.GetColor(0x074680);
+                    break;
+
+                case eTabItemColor.OfficeMobile2014Gold:
+                    ct.Text = factory.GetColor(0x9D5A03);
+                    break;
+
+                case eTabItemColor.OfficeMobile2014Green:
+                    ct.Text = factory.GetColor(0x44894F);
+                    break;
+
+                case eTabItemColor.OfficeMobile2014Coral:
+                    ct.Text = factory.GetColor(0xBB4E43);
+                    break;
+
+                case eTabItemColor.OfficeMobile2014Lilac:
+                    ct.Text = factory.GetColor(0x884D85);
+                    break;
+
+                case eTabItemColor.OfficeMobile2014Orange:
+                    ct.Text = factory.GetColor(0x09D3900);
+                    break;
+
+                case eTabItemColor.OfficeMobile2014Pink:
+                    ct.Text = factory.GetColor(0x89205A);
+                    break;
+
+                default:
+                    ct.Text = Color.Black;
+                    ct.InnerBorder = Color.White;
+                    ct.OuterBorder = Color.DimGray;
+                    break;
+            }
+
+            return (ct);
+        }
+
+        #endregion
+
+        #region GetPredefinedSelectedColors
+
+        internal static SuperTabItemStateColorTable GetPredefinedSelectedColors(
+            eTabItemColor c, ColorFactory factory)
+        {
+            SuperTabItemStateColorTable ct = new SuperTabItemStateColorTable();
+
+            ct.CloseMarker = factory.GetColor(0x406F9F);
+            ct.SelectionMarker = factory.GetColor(0xFF, 0xFFFFFF);
+
+            ct.Background = GetPredefinedSelectedBackground(c, factory);
+            
+            switch (c)
+            {
+                case eTabItemColor.OfficeMobile2014Teal:
+                case eTabItemColor.OfficeMobile2014Blue:
+                case eTabItemColor.OfficeMobile2014Gold:
+                case eTabItemColor.OfficeMobile2014Green:
+                case eTabItemColor.OfficeMobile2014Coral:
+                case eTabItemColor.OfficeMobile2014Lilac:
+                case eTabItemColor.OfficeMobile2014Orange:
+                case eTabItemColor.OfficeMobile2014Pink:
+                    ct.Text = factory.GetColor(Color.White);
+                    ct.InnerBorder = Color.Empty;
+                    ct.OuterBorder = Color.Empty;
+                    break;
+
+                default:
+                    ct.Text = Color.Black;
+                    ct.InnerBorder = Color.White;
+                    ct.OuterBorder = Color.DimGray;
+                    break;
+            }
+
+            return (ct);
+        }
+
+        #endregion
+
+        #region GetPredefinedMouseOverColors
+
+        internal static SuperTabItemStateColorTable GetPredefinedMouseOverColors(
+            eTabItemColor c, ColorFactory factory)
+        {
+            switch (c)
+            {
+                case eTabItemColor.OfficeMobile2014Teal:
+                case eTabItemColor.OfficeMobile2014Blue:
+                case eTabItemColor.OfficeMobile2014Gold:
+                case eTabItemColor.OfficeMobile2014Green:
+                case eTabItemColor.OfficeMobile2014Coral:
+                case eTabItemColor.OfficeMobile2014Lilac:
+                case eTabItemColor.OfficeMobile2014Orange:
+                case eTabItemColor.OfficeMobile2014Pink:
+                    return (GetPredefinedDefaultColors(c, factory));
+
+                default:
+                    SuperTabItemStateColorTable ct = new SuperTabItemStateColorTable();
+
+                    ct.Text = Color.Black;
+                    ct.InnerBorder = Color.White;
+                    ct.OuterBorder = Color.DimGray;
+                    ct.CloseMarker = factory.GetColor(0x406F9F);
+                    ct.SelectionMarker = factory.GetColor(0xFF, 0xFFFFFF);
+
+                    ct.Background = new 
+                        SuperTabLinearGradientColorTable(factory.GetColor(0xFFFBF0), factory.GetColor(0xFFF0C8));
+
+                    return (ct);
+            }
+        }
+
+        #endregion
+
+        #region GetPredefinedSelectedMouseOverColors
+
+        internal static SuperTabItemStateColorTable GetPredefinedSelectedMouseOverColors(
+            eTabItemColor c, ColorFactory factory)
+        {
+            switch (c)
+            {
+                case eTabItemColor.OfficeMobile2014Teal:
+                case eTabItemColor.OfficeMobile2014Blue:
+                case eTabItemColor.OfficeMobile2014Gold:
+                case eTabItemColor.OfficeMobile2014Green:
+                case eTabItemColor.OfficeMobile2014Coral:
+                case eTabItemColor.OfficeMobile2014Lilac:
+                case eTabItemColor.OfficeMobile2014Orange:
+                case eTabItemColor.OfficeMobile2014Pink:
+                    return (GetPredefinedSelectedColors(c, factory));
+
+                default:
+                    SuperTabItemStateColorTable ct = new SuperTabItemStateColorTable();
+
+                    ct.Text = Color.Black;
+                    ct.InnerBorder = Color.White;
+                    ct.OuterBorder = Color.DimGray;
+                    ct.CloseMarker = factory.GetColor(0x406F9F);
+                    ct.SelectionMarker = factory.GetColor(0xFF, 0xFFFFFF);
+
+                    ct.Background = new
+                        SuperTabLinearGradientColorTable(factory.GetColor(0xFFFBF0), factory.GetColor(0xFFF0C8));
+
+                    return (ct);
+            }
+        }
+
+        #endregion
+
+        #region GetPredefinedPanelColors
+
+        public static SuperTabPanelItemColorTable GetPredefinedPanelColors(eTabItemColor c, ColorFactory factory)
+        {
+            SuperTabPanelItemColorTable pct = new SuperTabPanelItemColorTable();
+
+            SuperTabItemColorTable sct = GetPredefinedTabColors(c, factory);
+            SuperTabLinearGradientColorTable lgt = sct.Default.Selected.Background;
+
+            Color color = (lgt.Colors != null && lgt.Colors.Length > 0)
+                ? lgt.Colors[lgt.Colors.Length - 1] : Color.DimGray;
+
+            switch (c)
+            {
+                case eTabItemColor.OfficeMobile2014Teal:
+                case eTabItemColor.OfficeMobile2014Blue:
+                case eTabItemColor.OfficeMobile2014Gold:
+                case eTabItemColor.OfficeMobile2014Green:
+                case eTabItemColor.OfficeMobile2014Coral:
+                case eTabItemColor.OfficeMobile2014Lilac:
+                case eTabItemColor.OfficeMobile2014Orange:
+                case eTabItemColor.OfficeMobile2014Pink:
+                    pct.InnerBorder = color;
+                    pct.OuterBorder = color;
+
+                    pct.Background = new SuperTabLinearGradientColorTable(Color.White);
+                    break;
+
+                default:
+                    pct.InnerBorder = sct.Default.Selected.InnerBorder;
+                    pct.OuterBorder = sct.Default.Selected.OuterBorder;
+
+                    pct.Background = new SuperTabLinearGradientColorTable(color);
+                    break;
+            }
+
+            return (pct);
+        }
+
+        #endregion
+
+        #region GetPredefinedDefaultBackground
+
+        internal static SuperTabLinearGradientColorTable
+            GetPredefinedDefaultBackground(eTabItemColor c, ColorFactory factory)
+        {
+            switch (c)
+            {
+                case eTabItemColor.Apple:
+                    return (new SuperTabLinearGradientColorTable(factory.GetColor(0xDAF4CD), factory.GetColor(0xB1E898)));
+
+                case eTabItemColor.Blue:
+                    return (new SuperTabLinearGradientColorTable(factory.GetColor(0xDDE6F7), factory.GetColor(0x8AA8E4)));
+
+                case eTabItemColor.BlueMist:
+                    return (new SuperTabLinearGradientColorTable(factory.GetColor(0xD2E0EB), factory.GetColor(0xA1BFD4)));
+
+                case eTabItemColor.Cyan:
+                    return (new SuperTabLinearGradientColorTable(factory.GetColor(0xCDDFDB), factory.GetColor(0x97BEB2)));
+
+                case eTabItemColor.Green:
+                    return (new SuperTabLinearGradientColorTable(factory.GetColor(0xDEE6CF), factory.GetColor(0xBBCC9D)));
+
+                case eTabItemColor.Lemon:
+                    return (new SuperTabLinearGradientColorTable(factory.GetColor(0xFBFDBD), factory.GetColor(0xF5F977)));
+
+                case eTabItemColor.Magenta:
+                    return (new SuperTabLinearGradientColorTable(factory.GetColor(0xECD6E0), factory.GetColor(0xD7A9BF)));
+
+                case eTabItemColor.Orange:
+                    return (new SuperTabLinearGradientColorTable(factory.GetColor(0xFBDBC2), factory.GetColor(0xF6B47F)));
+
+                case eTabItemColor.Purple:
+                    return (new SuperTabLinearGradientColorTable(factory.GetColor(0xDDD3F1), factory.GetColor(0xB8A3E0)));
+
+                case eTabItemColor.PurpleMist:
+                    return (new SuperTabLinearGradientColorTable(factory.GetColor(0xD9D2DE), factory.GetColor(0xAFA1BB)));
+
+                case eTabItemColor.Red:
+                    return (new SuperTabLinearGradientColorTable(factory.GetColor(0xF7CFCF), factory.GetColor(0xEF9B9D)));
+
+                case eTabItemColor.Silver:
+                    return (new SuperTabLinearGradientColorTable(factory.GetColor(0xCFCFD9), factory.GetColor(0x9B9BAE)));
+
+                case eTabItemColor.Tan:
+                    return (new SuperTabLinearGradientColorTable(factory.GetColor(0xF5EBD0), factory.GetColor(0xE9D49F)));
+
+                case eTabItemColor.Teal:
+                    return (new SuperTabLinearGradientColorTable(factory.GetColor(0xCDECF0), factory.GetColor(0x4EBCCA)));
+
+                case eTabItemColor.OfficeMobile2014Teal:
+                    return (new SuperTabLinearGradientColorTable(factory.GetColor(0x9CCDDA)));
+
+                case eTabItemColor.OfficeMobile2014Blue:
+                    return (new SuperTabLinearGradientColorTable(factory.GetColor(0xA9C7E3)));
+
+                case eTabItemColor.OfficeMobile2014Gold:
+                    return (new SuperTabLinearGradientColorTable(factory.GetColor(0xF0D08A)));
+
+                case eTabItemColor.OfficeMobile2014Green:
+                    return (new SuperTabLinearGradientColorTable(factory.GetColor(0xA6D0AD)));
+
+                case eTabItemColor.OfficeMobile2014Coral:
+                    return (new SuperTabLinearGradientColorTable(factory.GetColor(0xF0AEA8)));
+
+                case eTabItemColor.OfficeMobile2014Lilac:
+                    return (new SuperTabLinearGradientColorTable(factory.GetColor(0xD9B9D8)));
+
+                case eTabItemColor.OfficeMobile2014Orange:
+                    return (new SuperTabLinearGradientColorTable(factory.GetColor(0xF1C196)));
+
+                case eTabItemColor.OfficeMobile2014Pink:
+                    return (new SuperTabLinearGradientColorTable(factory.GetColor(0xE8B5D1)));
+
+                default:
+                    return (new SuperTabLinearGradientColorTable(factory.GetColor(0xFFF5D9), factory.GetColor(0xFFDC78)));
+            }
+        }
+
+        #endregion
+
+        #region GetPredefinedSelectedBackground
+
+        internal static SuperTabLinearGradientColorTable
+            GetPredefinedSelectedBackground(eTabItemColor c, ColorFactory factory)
+        {
+            switch (c)
+            {
+                case eTabItemColor.Apple:
+                    return (new SuperTabLinearGradientColorTable(factory.GetColor(0xEDFAE7), factory.GetColor(0xD6F3C8)));
+
+                case eTabItemColor.Blue:
+                    return (new SuperTabLinearGradientColorTable(factory.GetColor(0xDDE6F7), factory.GetColor(0x8AA8E4)));
+
+                case eTabItemColor.BlueMist:
+                    return (new SuperTabLinearGradientColorTable(factory.GetColor(0xE9F0F5), factory.GetColor(0xCDDDE8)));
+
+                case eTabItemColor.Cyan:
+                    return (new SuperTabLinearGradientColorTable(factory.GetColor(0xE7F0EE), factory.GetColor(0xC8DCD6)));
+
+                case eTabItemColor.Green:
+                    return (new SuperTabLinearGradientColorTable(factory.GetColor(0xF0F3E8), factory.GetColor(0xDBE4CB)));
+
+                case eTabItemColor.Lemon:
+                    return (new SuperTabLinearGradientColorTable(factory.GetColor(0xFDFEDF), factory.GetColor(0xFAFCB7)));
+
+                case eTabItemColor.Magenta:
+                    return (new SuperTabLinearGradientColorTable(factory.GetColor(0xF6EBF0), factory.GetColor(0xEAD1DD)));
+
+                case eTabItemColor.Orange:
+                    return (new SuperTabLinearGradientColorTable(factory.GetColor(0xFDEEE1), factory.GetColor(0xFAD7BB)));
+
+                case eTabItemColor.Purple:
+                    return (new SuperTabLinearGradientColorTable(factory.GetColor(0xEFEAF7), factory.GetColor(0xD9CEEE)));
+
+                case eTabItemColor.PurpleMist:
+                    return (new SuperTabLinearGradientColorTable(factory.GetColor(0xECE9F0), factory.GetColor(0xD5CDDB)));
+
+                case eTabItemColor.Red:
+                    return (new SuperTabLinearGradientColorTable(factory.GetColor(0xFCE8E8), factory.GetColor(0xF6CACB)));
+
+                case eTabItemColor.Silver:
+                    return (new SuperTabLinearGradientColorTable(factory.GetColor(0xE8E8EC), factory.GetColor(0xCACAD4)));
+
+                case eTabItemColor.Tan:
+                    return (new SuperTabLinearGradientColorTable(factory.GetColor(0xFAF5E9), factory.GetColor(0xF3E8CC)));
+
+                case eTabItemColor.Teal:
+                    return (new SuperTabLinearGradientColorTable(factory.GetColor(0xCDECF0), factory.GetColor(0x4EBCCA)));
+
+                case eTabItemColor.OfficeMobile2014Teal:
+                    return (new SuperTabLinearGradientColorTable(factory.GetColor(0x3196B2)));
+
+                case eTabItemColor.OfficeMobile2014Blue:
+                    return (new SuperTabLinearGradientColorTable(factory.GetColor(0x4C8BC5)));
+
+                case eTabItemColor.OfficeMobile2014Gold:
+                    return (new SuperTabLinearGradientColorTable(factory.GetColor(0xE09D0C)));
+
+                case eTabItemColor.OfficeMobile2014Green:
+                    return (new SuperTabLinearGradientColorTable(factory.GetColor(0x469C54)));
+
+                case eTabItemColor.OfficeMobile2014Coral:
+                    return (new SuperTabLinearGradientColorTable(factory.GetColor(0xDF5749)));
+
+                case eTabItemColor.OfficeMobile2014Lilac:
+                    return (new SuperTabLinearGradientColorTable(factory.GetColor(0xB16DAD)));
+
+                case eTabItemColor.OfficeMobile2014Orange:
+                    return (new SuperTabLinearGradientColorTable(factory.GetColor(0xE27E24)));
+
+                case eTabItemColor.OfficeMobile2014Pink:
+                    return (new SuperTabLinearGradientColorTable(factory.GetColor(0xCE659F)));
+
+                default:
+                    return (new SuperTabLinearGradientColorTable(factory.GetColor(0xFFFAEC), factory.GetColor(0xFFEAB3)));
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IsOfficeMobile2014Color
+
+        public static bool IsOfficeMobile2014Color(eTabItemColor ec)
+        {
+            switch (ec)
+            {
+                case eTabItemColor.OfficeMobile2014Teal:
+                case eTabItemColor.OfficeMobile2014Blue:
+                case eTabItemColor.OfficeMobile2014Gold:
+                case eTabItemColor.OfficeMobile2014Green:
+                case eTabItemColor.OfficeMobile2014Coral:
+                case eTabItemColor.OfficeMobile2014Lilac:
+                case eTabItemColor.OfficeMobile2014Orange:
+                case eTabItemColor.OfficeMobile2014Pink:
+                    return (true);
+
+                default:
+                    return (false);
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/SwitchButtonColorTable.cs b/PROMS/DotNetBar Source Code/Rendering/SwitchButtonColorTable.cs
new file mode 100644
index 00000000..beaf2eb9
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/SwitchButtonColorTable.cs	
@@ -0,0 +1,83 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    /// <summary>
+    /// Defines color table for the SwitchButton control.
+    /// </summary>
+    public class SwitchButtonColorTable
+    {
+        /// <summary>
+        /// Gets or set the text/caption color.
+        /// </summary>
+        public Color TextColor = ColorScheme.GetColor(0x1E395B);
+        /// <summary>
+        /// Gets or sets the OFF text color.
+        /// </summary>
+        public Color OffTextColor = ColorScheme.GetColor(0x66788E);
+        /// <summary>
+        /// Gets or sets the ON text color.
+        /// </summary>
+        public Color OnTextColor = ColorScheme.GetColor(0x66788E);
+        /// <summary>
+        /// Gets or sets the button border color.
+        /// </summary>
+        public Color BorderColor = ColorScheme.GetColor(0xB1C0D6);
+        /// <summary>
+        /// Gets or sets background color of OFF switch part.
+        /// </summary>
+        public Color OffBackColor = ColorScheme.GetColor(0xEFF6FD);
+        /// <summary>
+        /// Gets or sets background color of ON switch part.
+        /// </summary>
+        public Color OnBackColor = ColorScheme.GetColor(0x92D050);
+        /// <summary>
+        /// Gets or sets the switch border color.
+        /// </summary>
+        public Color SwitchBorderColor = ColorScheme.GetColor(0x95A8C4);
+        /// <summary>
+        /// Gets or sets the switch background color.
+        /// </summary>
+        public Color SwitchBackColor = ColorScheme.GetColor(0xDBE7F4);
+        /// <summary>
+        /// Gets or sets the switch background color when in ON state, i.e. Value=true. When set to Color.Empty SwitchBackColor is always used.
+        /// </summary>
+        public Color SwitchOnBackColor = Color.Empty;
+
+        /// <summary>
+        /// Gets default disabled color scheme for the switch button.
+        /// </summary>
+        public static SwitchButtonColorTable Disabled
+        {
+            get
+            {
+                SwitchButtonColorTable disabled = new SwitchButtonColorTable();
+                disabled.BorderColor = ColorScheme.GetColor(0xD0D0D0);
+                disabled.OffBackColor = ColorScheme.GetColor(0xE6E6E6);
+                disabled.OffTextColor = ColorScheme.GetColor(0xD0D0D0);
+                disabled.OnBackColor = ColorScheme.GetColor(0xE6E6E6);
+                disabled.OnTextColor = ColorScheme.GetColor(0xD0D0D0);
+                disabled.SwitchBackColor = ColorScheme.GetColor(0xE6E6E6);
+                disabled.SwitchBorderColor = ColorScheme.GetColor(0xD0D0D0);
+                disabled.TextColor = ColorScheme.GetColor(0x87929F);
+
+                return disabled;
+            }
+        }
+    }
+
+    public class SwitchButtonColors
+    {
+        /// <summary>
+        /// Gets or sets default Switch Button color table.
+        /// </summary>
+        public SwitchButtonColorTable Default = new SwitchButtonColorTable();
+        /// <summary>
+        /// Gets or sets the disabled Switch Button color table.
+        /// </summary>
+        public SwitchButtonColorTable Disabled = SwitchButtonColorTable.Disabled;
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/VisualStudio2010Factory.cs b/PROMS/DotNetBar Source Code/Rendering/VisualStudio2010Factory.cs
new file mode 100644
index 00000000..740e2c67
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/VisualStudio2010Factory.cs	
@@ -0,0 +1,2095 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+using DevComponents.DotNetBar.Controls;
+using DevComponents.DotNetBar.Schedule;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    internal static class VisualStudio2010Factory
+    {
+        public static void InitializeColorTable(Office2007ColorTable table, ColorFactory factory)
+        {
+            #region RibbonControl Start Images
+            table.RibbonControl.StartButtonDefault = BarFunctions.LoadBitmap("SystemImages.BlankOffice2010NormalSilver.png");
+            table.RibbonControl.StartButtonMouseOver = BarFunctions.LoadBitmap("SystemImages.BlankOffice2010HotSilver.png");
+            table.RibbonControl.StartButtonPressed = BarFunctions.LoadBitmap("SystemImages.BlankOffice2010PressedSilver.png");
+            #endregion
+
+            #region RibbonControl
+            table.RibbonControl.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x8894A8));
+            table.RibbonControl.InnerBorder = null; // new LinearGradientColorTable(factory.GetColor(0xC9D2E1));
+            table.RibbonControl.TabsBackground = new LinearGradientColorTable(factory.GetColor(0xBCC7D8));
+            table.RibbonControl.TabsGlassBackground = new LinearGradientColorTable(Color.Transparent, factory.GetColor(0xBCC7D8));
+            table.RibbonControl.TabDividerBorder = Color.Empty; // factory.GetColor(0xA7BAD1);
+            table.RibbonControl.TabDividerBorderLight = Color.Empty; // factory.GetColor(0xF4F8FD);
+            table.RibbonControl.CornerSize = 1;
+            table.RibbonControl.PanelTopBackgroundHeight = 0;
+            table.RibbonControl.PanelTopBackground = new LinearGradientColorTable(factory.GetColor(0xCAD3E2), factory.GetColor(0xAEB9CD));
+            table.RibbonControl.PanelBottomBackground = null; // new LinearGradientColorTable(factory.GetColor(0xE7F1FA), factory.GetColor(0xD8E4F2));
+            #endregion
+
+            #region Item Group
+            table.ItemGroup.OuterBorder = LinearGradientColorTable.Empty;
+            table.ItemGroup.InnerBorder = LinearGradientColorTable.Empty;
+            table.ItemGroup.TopBackground = LinearGradientColorTable.Empty;
+            table.ItemGroup.BottomBackground = LinearGradientColorTable.Empty;
+            table.ItemGroup.ItemGroupDividerDark = Color.Empty;
+            table.ItemGroup.ItemGroupDividerLight = Color.Empty;
+            #endregion
+
+            #region RibbonBar
+            table.RibbonBar.Default = GetRibbonBar(factory);
+            table.RibbonBar.MouseOver = GetRibbonBarMouseOver(factory);
+            table.RibbonBar.Expanded = GetRibbonBarExpanded(factory);
+            #endregion
+
+            #region ButtonItem Colors Initialization
+            table.RibbonButtonItemColors.Clear();
+            table.ButtonItemColors.Clear();
+            table.MenuButtonItemColors.Clear();
+            // Orange
+            Office2007ButtonItemColorTable cb = GetButtonItemBlueOrange(factory);
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Orange);
+            table.ButtonItemColors.Add(cb);
+            // Orange with background
+            cb = GetButtonItemBlueOrangeWithBackground(factory);
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.OrangeWithBackground);
+            table.ButtonItemColors.Add(cb);
+            // Blue
+            cb = Office2007ColorTableFactory.GetButtonItemBlueBlue(factory);
+            cb.MouseOverSplitInactive = new Office2007ButtonItemStateColorTable();
+            cb.MouseOverSplitInactive.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xB1BAC4));
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Blue);
+            table.ButtonItemColors.Add(cb);
+            // Blue with background
+            cb = GetButtonItemBlueBlueWithBackground(factory);
+            cb.MouseOverSplitInactive = new Office2007ButtonItemStateColorTable();
+            cb.MouseOverSplitInactive.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xB1BAC4));
+            cb.MouseOverSplitInactive = cb.Default;
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.BlueWithBackground);
+            table.ButtonItemColors.Add(cb);
+            // Magenta
+            cb = Office2007ColorTableFactory.GetButtonItemBlueMagenta(factory);
+            cb.MouseOverSplitInactive = new Office2007ButtonItemStateColorTable();
+            cb.MouseOverSplitInactive.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xB1BAC4));
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Magenta);
+            table.ButtonItemColors.Add(cb);
+            // Blue with background
+            cb = GetButtonItemBlueMagentaWithBackground(factory);
+            cb.MouseOverSplitInactive = new Office2007ButtonItemStateColorTable();
+            cb.MouseOverSplitInactive.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xB1BAC4));
+            cb.MouseOverSplitInactive = cb.Default;
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.MagentaWithBackground);
+            table.ButtonItemColors.Add(cb);
+
+            cb = GetButtonItemOffice2007WithBackground(factory);
+            cb.MouseOverSplitInactive = new Office2007ButtonItemStateColorTable();
+            cb.MouseOverSplitInactive.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xB1BAC4));
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Office2007WithBackground);
+            table.ButtonItemColors.Add(cb);
+
+            table.ButtonItemColors.Add(ButtonItemStaticColorTables.CreateBlueOrbColorTable(factory));
+
+            table.BackstageButtonItemColors.Add(GetButtonItemBackstageDefault(factory));
+            #endregion
+
+            #region NavigationPane ButtonItem Initialization
+            table.NavigationPaneButtonItemColors.Clear();
+            table.NavigationPaneButtonItemColors.Add(GetNavigationPaneButtonItemTable(factory));
+            #endregion
+
+            #region RibbonTabItem Colors Initialization
+            table.RibbonTabItemColors.Clear();
+            Office2007RibbonTabItemColorTable rt = GetRibbonTabItemBlueDefault(factory);
+            rt.Name = Enum.GetName(typeof(eRibbonTabColor), eRibbonTabColor.Default);
+            table.RibbonTabItemColors.Add(rt);
+
+            // Magenta
+            rt = GetRibbonTabItemBlueMagenta(factory);
+            rt.CornerSize = 2;
+            rt.Name = Enum.GetName(typeof(eRibbonTabColor), eRibbonTabColor.Magenta);
+            table.RibbonTabItemColors.Add(rt);
+
+            // Green
+            rt = GetRibbonTabItemBlueGreen(factory);
+            rt.CornerSize = 2;
+            rt.Name = Enum.GetName(typeof(eRibbonTabColor), eRibbonTabColor.Green);
+            table.RibbonTabItemColors.Add(rt);
+
+            // Orange
+            rt = GetRibbonTabItemBlueOrange(factory);
+            rt.CornerSize = 2;
+            rt.Name = Enum.GetName(typeof(eRibbonTabColor), eRibbonTabColor.Orange);
+            table.RibbonTabItemColors.Add(rt);
+            #endregion
+
+            #region RibbonTabItemGroup Colors Initialization
+            table.RibbonTabGroupColors.Clear();
+            // Default
+            Office2007RibbonTabGroupColorTable tg = GetRibbonTabGroupDefault(factory);
+            tg.Name = Enum.GetName(typeof(eRibbonTabGroupColor), eRibbonTabGroupColor.Default);
+            table.RibbonTabGroupColors.Add(tg);
+
+            // Magenta
+            tg = GetRibbonTabGroupMagenta(factory);
+            tg.Name = Enum.GetName(typeof(eRibbonTabGroupColor), eRibbonTabGroupColor.Magenta);
+            table.RibbonTabGroupColors.Add(tg);
+
+            // Green
+            tg = GetRibbonTabGroupGreen(factory);
+            tg.Name = Enum.GetName(typeof(eRibbonTabGroupColor), eRibbonTabGroupColor.Green);
+            table.RibbonTabGroupColors.Add(tg);
+
+            // Orange
+            tg = GetRibbonTabGroupOrange(factory);
+            tg.Name = Enum.GetName(typeof(eRibbonTabGroupColor), eRibbonTabGroupColor.Orange);
+            table.RibbonTabGroupColors.Add(tg);
+            #endregion
+
+            #region Initialize Bar
+            table.Bar.ToolbarTopBackground = new LinearGradientColorTable(factory.GetColor(0xBCC7D8));
+            table.Bar.ToolbarBottomBackground = new LinearGradientColorTable(factory.GetColor(0xBCC7D8));
+            table.Bar.ToolbarBottomBorder = factory.GetColor(0x9CAAC1);
+            table.Bar.PopupToolbarBackground = new LinearGradientColorTable(factory.GetColor(0xE7EAED), Color.Empty);
+            table.Bar.PopupToolbarBorder = factory.GetColor(0x9BA7B7);
+            table.Bar.StatusBarTopBorder = factory.GetColor(0x9CAAC1);
+            table.Bar.StatusBarTopBorderLight = Color.Empty;
+            table.Bar.StatusBarAltBackground.Clear();
+            table.Bar.StatusBarAltBackground.Add(new BackgroundColorBlend(factory.GetColor(0x9CAAC1), 0f));
+            table.Bar.StatusBarAltBackground.Add(new BackgroundColorBlend(factory.GetColor(0x9CAAC1), 1f));
+            #endregion
+
+            #region Menu
+            table.Menu.Background = new LinearGradientColorTable(factory.GetColor(0xE9ECEE), factory.GetColor(0xD0D7E2));
+            table.Menu.Border = new LinearGradientColorTable(factory.GetColor(0x9BA7B7), Color.Empty);
+            table.Menu.Side = new LinearGradientColorTable(factory.GetColor(0xE9ECEE), Color.Empty);
+            table.Menu.SideBorder = LinearGradientColorTable.Empty;
+            table.Menu.SideBorderLight = LinearGradientColorTable.Empty;
+            table.Menu.SideUnused = new LinearGradientColorTable(factory.GetColor(0xBCC7D8), Color.Empty);
+            table.Menu.FileBackgroundBlend.Clear();
+            table.Menu.FileBackgroundBlend.AddRange(new DevComponents.DotNetBar.BackgroundColorBlend[] {
+                new DevComponents.DotNetBar.BackgroundColorBlend(factory.GetColor(0xE9ECEE), 0F),
+                new DevComponents.DotNetBar.BackgroundColorBlend(factory.GetColor(0xD0D7E2), 1F)});
+            table.Menu.FileContainerBorder = factory.GetColor(0x9BA7B7);
+            table.Menu.FileContainerBorderLight = Color.Transparent;
+            table.Menu.FileColumnOneBackground = factory.GetColor(0xE9ECEE);
+            table.Menu.FileColumnOneBorder = factory.GetColor(0xBEC3CB);
+            table.Menu.FileColumnTwoBackground = Color.Empty;
+            table.Menu.FileBottomContainerBackgroundBlend.Clear();
+            //table.Menu.FileBottomContainerBackgroundBlend.AddRange(new DevComponents.DotNetBar.BackgroundColorBlend[] {
+            //    new DevComponents.DotNetBar.BackgroundColorBlend(factory.GetColor(0xEBF3FC), 0F),
+            //    new DevComponents.DotNetBar.BackgroundColorBlend(factory.GetColor(0xEBF3FC), 1F)});
+            #endregion
+
+            #region ComboBox
+            table.ComboBox.Default.Background = factory.GetColor(0xF1F3F8);
+            int editBorderColor = 0x8591A2;
+            table.ComboBox.Default.Border = factory.GetColor(editBorderColor);
+            table.ComboBox.Default.ExpandBackground = new LinearGradientColorTable();
+            table.ComboBox.Default.ExpandBorderInner = new LinearGradientColorTable();
+            table.ComboBox.Default.ExpandBorderOuter = new LinearGradientColorTable();
+            table.ComboBox.Default.ExpandText = factory.GetColor(0x5A5D61);
+            table.ComboBox.DefaultStandalone.Background = factory.GetColor(0xFFFFFF);
+            table.ComboBox.DefaultStandalone.Border = factory.GetColor(editBorderColor);
+            table.ComboBox.DefaultStandalone.ExpandBackground = new LinearGradientColorTable(factory.GetColor(0xCAD3E2), factory.GetColor(0xAEB9CD), 90);
+            table.ComboBox.DefaultStandalone.ExpandBorderInner = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(0xFFFFFF));
+            table.ComboBox.DefaultStandalone.ExpandBorderOuter = new LinearGradientColorTable(factory.GetColor(0xABBAD0), Color.Empty, 90);
+            table.ComboBox.DefaultStandalone.ExpandText = factory.GetColor(0x1B293E);
+            table.ComboBox.MouseOver.Background = factory.GetColor(0xFFFFFF);
+            table.ComboBox.MouseOver.Border = factory.GetColor(0xE5C365);
+            table.ComboBox.MouseOver.ExpandBackground = new LinearGradientColorTable(factory.GetColor(0xFFFCF2), factory.GetColor(0xFFECB5), 90);
+            table.ComboBox.MouseOver.ExpandBorderInner = LinearGradientColorTable.Empty;
+            table.ComboBox.MouseOver.ExpandBorderOuter = new LinearGradientColorTable(factory.GetColor(0xE5C365), Color.Empty, 90);
+            table.ComboBox.MouseOver.ExpandText = factory.GetColor(0x000000);
+            table.ComboBox.DroppedDown.Background = factory.GetColor(0xFFFFFF);
+            table.ComboBox.DroppedDown.Border = factory.GetColor(0xE5C365);
+            table.ComboBox.DroppedDown.ExpandBackground = new LinearGradientColorTable(factory.GetColor(0xFFE8A6), factory.GetColor(0xFFE8A6), 90);
+            table.ComboBox.DroppedDown.ExpandBorderInner = LinearGradientColorTable.Empty;
+            table.ComboBox.DroppedDown.ExpandBorderOuter = new LinearGradientColorTable(factory.GetColor(0xE5C365));
+            table.ComboBox.DroppedDown.ExpandText = factory.GetColor(0x000000);
+            #endregion
+
+            #region Dialog Launcher
+            table.DialogLauncher.Default.DialogLauncher = factory.GetColor(0x5D6570);
+            table.DialogLauncher.Default.DialogLauncherShade = Color.Empty;// factory.GetColor(172, 0xFFFFFF);
+
+            table.DialogLauncher.MouseOver.DialogLauncher = factory.GetColor(0x5D6570);
+            table.DialogLauncher.MouseOver.DialogLauncherShade = Color.Empty; // Color.FromArgb(192, factory.GetColor(0xFFFFFF));
+            table.DialogLauncher.MouseOver.TopBackground = new LinearGradientColorTable(factory.GetColor(0xFFFBF1), factory.GetColor(0xFFEFC1));
+            table.DialogLauncher.MouseOver.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xFFEFC1), factory.GetColor(0xFFECB5));
+            table.DialogLauncher.MouseOver.InnerBorder = LinearGradientColorTable.Empty;
+            table.DialogLauncher.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xE5C365), Color.Empty);
+
+            table.DialogLauncher.Pressed.DialogLauncher = factory.GetColor(0x5D6570);
+            table.DialogLauncher.Pressed.DialogLauncherShade = Color.Empty; // Color.FromArgb(128, factory.GetColor(0xFFFFFF));
+            table.DialogLauncher.Pressed.TopBackground = new LinearGradientColorTable(factory.GetColor(0xE4C8A5), factory.GetColor(0xEDC891));
+            table.DialogLauncher.Pressed.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xEEBC62), factory.GetColor(0xEEE48B));
+            table.DialogLauncher.Pressed.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xD4BFA8), factory.GetColor(0xEFF1C2));
+            table.DialogLauncher.Pressed.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xC2923B), factory.GetColor(0xC2B462));
+            #endregion
+
+            #region System Button, Form
+            // Default state no background
+            table.SystemButton.Default = new Office2007SystemButtonStateColorTable();
+            table.SystemButton.Default.Foreground = new LinearGradientColorTable(factory.GetColor(0xEAF0F6));
+            table.SystemButton.Default.LightShade = Color.Empty;
+            table.SystemButton.Default.DarkShade = factory.GetColor(0x525565);
+
+            // Mouse over state
+            table.SystemButton.MouseOver = new Office2007SystemButtonStateColorTable();
+            table.SystemButton.MouseOver.Foreground = new LinearGradientColorTable(factory.GetColor(0xEDF2F9));
+            table.SystemButton.MouseOver.LightShade = Color.Empty;
+            table.SystemButton.MouseOver.DarkShade = factory.GetColor(0x525565);
+            table.SystemButton.MouseOver.TopBackground = new LinearGradientColorTable(factory.GetColor(0xCAD3E2), factory.GetColor(0xBDC7D7));
+            table.SystemButton.MouseOver.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xBDC7D7), factory.GetColor(0xAEB9CD));
+            table.SystemButton.MouseOver.TopHighlight = null; // new LinearGradientColorTable(factory.GetColor(0xFBFCFF), Color.Transparent);
+            table.SystemButton.MouseOver.BottomHighlight = null; // new LinearGradientColorTable(factory.GetColor(0xFBFCFF), Color.Transparent);
+            table.SystemButton.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x9BA7B7));
+            table.SystemButton.MouseOver.InnerBorder = LinearGradientColorTable.Empty;
+
+            // Pressed
+            table.SystemButton.Pressed = new Office2007SystemButtonStateColorTable();
+            table.SystemButton.Pressed.Foreground = new LinearGradientColorTable(factory.GetColor(0xE9EFF6));
+            table.SystemButton.Pressed.LightShade = Color.Empty;
+            table.SystemButton.Pressed.DarkShade = factory.GetColor(0x525565);
+            table.SystemButton.Pressed.TopBackground = new LinearGradientColorTable(factory.GetColor(0xAEB9CD));
+            table.SystemButton.Pressed.TopHighlight = null;// new LinearGradientColorTable(factory.GetColor(0xB8CEE9), Color.Transparent);
+            table.SystemButton.Pressed.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xAEB9CD));
+            table.SystemButton.Pressed.BottomHighlight = null; // new LinearGradientColorTable(factory.GetColor(0xC6EAFD), Color.Transparent);
+            table.SystemButton.Pressed.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x8FA5BF));
+            table.SystemButton.Pressed.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xADC1DA));
+
+            // CLOSE Default state no background
+            table.SystemButtonClose = new Office2007SystemButtonColorTable();
+            table.SystemButtonClose.Default = new Office2007SystemButtonStateColorTable();
+            table.SystemButtonClose.Default.Foreground = new LinearGradientColorTable(factory.GetColor(0xEAF0F6));
+            table.SystemButtonClose.Default.LightShade = Color.Empty;
+            table.SystemButtonClose.Default.DarkShade = factory.GetColor(0x525565);
+
+            // Mouse over state
+            table.SystemButtonClose.MouseOver = new Office2007SystemButtonStateColorTable();
+            table.SystemButtonClose.MouseOver.Foreground = new LinearGradientColorTable(factory.GetColor(0xFCD7D7));
+            table.SystemButtonClose.MouseOver.LightShade = Color.Empty;
+            table.SystemButtonClose.MouseOver.DarkShade = factory.GetColor(0x9B3D3D);
+            table.SystemButtonClose.MouseOver.TopBackground = new LinearGradientColorTable(factory.GetColor(0xFF8482), factory.GetColor(0xFB7F7E));
+            table.SystemButtonClose.MouseOver.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xF67979), factory.GetColor(0xE36162));
+            table.SystemButtonClose.MouseOver.TopHighlight = null; // new LinearGradientColorTable(factory.GetColor(0xFBFCFF), Color.Transparent);
+            table.SystemButtonClose.MouseOver.BottomHighlight = null; // new LinearGradientColorTable(factory.GetColor(0xFBFCFF), Color.Transparent);
+            table.SystemButtonClose.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x9B3D3D));
+            table.SystemButtonClose.MouseOver.InnerBorder = LinearGradientColorTable.Empty;
+
+            // Pressed
+            table.SystemButtonClose.Pressed = new Office2007SystemButtonStateColorTable();
+            table.SystemButtonClose.Pressed.Foreground = new LinearGradientColorTable(factory.GetColor(0xF8D4D5));
+            table.SystemButtonClose.Pressed.LightShade = Color.Empty;
+            table.SystemButtonClose.Pressed.DarkShade = factory.GetColor(0x9B3D3D);
+            table.SystemButtonClose.Pressed.TopBackground = new LinearGradientColorTable(factory.GetColor(0xF27776));
+            table.SystemButtonClose.Pressed.TopHighlight = null;// new LinearGradientColorTable(factory.GetColor(0xB8CEE9), Color.Transparent);
+            table.SystemButtonClose.Pressed.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xF27776));
+            table.SystemButtonClose.Pressed.BottomHighlight = null; // new LinearGradientColorTable(factory.GetColor(0xC6EAFD), Color.Transparent);
+            table.SystemButtonClose.Pressed.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x9B3D3D));
+            table.SystemButtonClose.Pressed.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xDA6163));
+
+            // Form border
+            table.Form.Active.BorderColors = new Color[] {
+                factory.GetColor(0x909AA6),
+                factory.GetColor(0xD4E6F5),
+                factory.GetColor(0xBBCEE6),
+                factory.GetColor(0xBBCEE6),
+                factory.GetColor(0xBBCEE6)
+            };
+
+            table.Form.Inactive.BorderColors = new Color[] {
+                factory.GetColor(0xA2ADB9),
+                factory.GetColor(0xBBCEE6),
+                factory.GetColor(0xBBCEE6),
+                factory.GetColor(0xBBCEE6),
+                factory.GetColor(0xBBCEE6)
+            };
+
+            // Form Caption Active
+            table.Form.Active.CaptionTopBackground = new LinearGradientColorTable(factory.GetColor(0xBCC7D8), factory.GetColor(0xBCC7D8));
+            table.Form.Active.CaptionBottomBackground = new LinearGradientColorTable(factory.GetColor(0xBCC7D8), factory.GetColor(0xBCC7D8));
+            table.Form.Active.CaptionBottomBorder = new Color[] { factory.GetColor(0x9CAAC1), factory.GetColor(0xC9D2E1) };
+            table.Form.Active.CaptionText = factory.GetColor(0x1B293E);
+            table.Form.Active.CaptionTextExtra = factory.GetColor(0x1B293E);
+
+            // Form Caption Inactive
+            table.Form.Inactive.CaptionTopBackground = new LinearGradientColorTable(factory.GetColor(0xC9D2E1));
+            table.Form.Inactive.CaptionBottomBackground = new LinearGradientColorTable(factory.GetColor(0xC9D2E1));
+            table.Form.Inactive.CaptionText = factory.GetColor(0x56465A);
+            table.Form.Inactive.CaptionTextExtra = factory.GetColor(0x56465A);
+
+            table.Form.BackColor = factory.GetColor(0xD0D7E2);
+            table.Form.TextColor = factory.GetColor(0x1B293E);
+            table.Form.MdiClientBackgroundImage = BarFunctions.LoadBitmap("SystemImages.VS2010ClientBackground.png");
+            #endregion
+
+            #region Quick Access Toolbar Background
+            table.QuickAccessToolbar.Active.TopBackground = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(0xDEE7F4), factory.GetColor(0xE6EEF9));
+            table.QuickAccessToolbar.Active.BottomBackground = LinearGradientColorTable.Empty; //new LinearGradientColorTable(factory.GetColor(0xDBE7F7), factory.GetColor(0xC9D9EE));
+            table.QuickAccessToolbar.Active.OutterBorderColor = Color.Empty; // factory.GetColor(0xF6F9FC);
+            table.QuickAccessToolbar.Active.MiddleBorderColor = Color.Empty; // factory.GetColor(0x9AB3D5);
+            table.QuickAccessToolbar.Active.InnerBorderColor = Color.Empty; //  factory.GetColor(0xD2E3F9);
+
+            table.QuickAccessToolbar.Inactive.TopBackground = LinearGradientColorTable.Empty; //new LinearGradientColorTable(factory.GetColor(0xE6ECF3), factory.GetColor(0xCED8E6));
+            table.QuickAccessToolbar.Inactive.BottomBackground = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(0xCED8E6), factory.GetColor(0xC8D3E3));
+            table.QuickAccessToolbar.Inactive.OutterBorderColor = Color.Empty; // factory.GetColor(0xF6F9FC);
+            table.QuickAccessToolbar.Inactive.MiddleBorderColor = Color.Empty; // factory.GetColor(0x9AB3D5);
+            table.QuickAccessToolbar.Inactive.InnerBorderColor = Color.Empty;
+
+            table.QuickAccessToolbar.Standalone.TopBackground = new LinearGradientColorTable();
+            table.QuickAccessToolbar.Standalone.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xBCC7D8));
+            table.QuickAccessToolbar.Standalone.OutterBorderColor = factory.GetColor(0x9CAAC1);
+            table.QuickAccessToolbar.Standalone.MiddleBorderColor = Color.Empty; //factory.GetColor(0xC9D2E1);
+            table.QuickAccessToolbar.Standalone.InnerBorderColor = Color.Empty; // factory.GetColor(0xDCE8F7);
+
+            table.QuickAccessToolbar.QatCustomizeMenuLabelBackground = factory.GetColor(0xCAD3E2);
+            table.QuickAccessToolbar.QatCustomizeMenuLabelText = factory.GetColor(0x1B293E);
+
+            table.QuickAccessToolbar.Active.GlassBorder = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(Color.FromArgb(132, Color.Black)), Color.FromArgb(80, Color.Black));
+            table.QuickAccessToolbar.Inactive.GlassBorder = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(Color.FromArgb(132, Color.Black)), Color.FromArgb(80, Color.Black));
+            #endregion
+
+            #region Tab Colors
+            table.TabControl.Default = new Office2007TabItemStateColorTable();
+            table.TabControl.Default.TopBackground = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(0xC8DCF4), factory.GetColor(0xAFD2FE));
+            table.TabControl.Default.BottomBackground = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(0x96BFF3), factory.GetColor(0xB5CCE9));
+            table.TabControl.Default.InnerBorder = Color.Empty; // factory.GetColor(0xE3EFFF);
+            table.TabControl.Default.OuterBorder = Color.Empty; // factory.GetColor(0x8591A2);
+            table.TabControl.Default.Text = factory.GetColor(0xFFFFFF);
+
+            table.TabControl.MouseOver = new Office2007TabItemStateColorTable();
+            table.TabControl.MouseOver.TopBackground = new LinearGradientColorTable(factory.GetColor(0x6F7776), factory.GetColor(0x616C75));
+            table.TabControl.MouseOver.BottomBackground = new LinearGradientColorTable(factory.GetColor(0x5D6975), factory.GetColor(0x4F5F74));
+            table.TabControl.MouseOver.InnerBorder = Color.Empty; // factory.GetColor(0xFFFFFF);
+            table.TabControl.MouseOver.OuterBorder = factory.GetColor(0x9BA7B7);
+            table.TabControl.MouseOver.Text = factory.GetColor(0xFFFFFF);
+
+            table.TabControl.Selected = new Office2007TabItemStateColorTable();
+            table.TabControl.Selected.TopBackground = new LinearGradientColorTable(factory.GetColor(0xFFFCF2), factory.GetColor(0xFFF3CF));
+            table.TabControl.Selected.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xFFE8A6), factory.GetColor(0xFFE8A6));
+            table.TabControl.Selected.InnerBorder = Color.Empty;
+            table.TabControl.Selected.OuterBorder = Color.Empty; // factory.GetColor(0x293955);
+            table.TabControl.Selected.Text = factory.GetColor(0x000000);
+
+            table.TabControl.TabBackground = LinearGradientColorTable.Empty;// new LinearGradientColorTable(factory.GetColor(0x2B3C59), Color.Empty);
+            table.TabControl.TabBackgroundImage = BarFunctions.LoadBitmap("SystemImages.VS2010ClientBackground.png");
+            table.TabControl.TabPanelBackground = new LinearGradientColorTable(factory.GetColor(0xFFFFFF), Color.Empty);
+            table.TabControl.TabPanelBorder = factory.GetColor(editBorderColor);
+            #endregion
+
+            #region CheckBoxItem
+            Office2007CheckBoxColorTable chk = table.CheckBoxItem;
+            chk.Default.CheckBackground = new LinearGradientColorTable(factory.GetColor(0xF4F4F4), Color.Empty);
+            chk.Default.CheckBorder = factory.GetColor(0xABC1DE);
+            chk.Default.CheckInnerBackground = new LinearGradientColorTable(factory.GetColor(0xE8E9EB), factory.GetColor(0xF2F2F3));
+            chk.Default.CheckInnerBorder = factory.GetColor(0xBEC4CC);
+            chk.Default.CheckSign = new LinearGradientColorTable(factory.GetColor(0x4A6B96), Color.Empty);
+            chk.Default.Text = factory.GetColor(0x1B293E);
+
+            chk.MouseOver.CheckBackground = new LinearGradientColorTable(factory.GetColor(0xFCF1C2), Color.Empty);
+            chk.MouseOver.CheckBorder = factory.GetColor(0xCF9037);
+            chk.MouseOver.CheckInnerBackground = new LinearGradientColorTable(factory.GetColor(0xFAECC8), factory.GetColor(0xFDF6E4));
+            chk.MouseOver.CheckInnerBorder = factory.GetColor(0xFCAD5D);
+            chk.MouseOver.CheckSign = new LinearGradientColorTable(factory.GetColor(0x4A6B96), Color.Empty);
+            chk.MouseOver.Text = factory.GetColor(0x1B293E);
+
+            chk.Pressed.CheckBackground = new LinearGradientColorTable(factory.GetColor(0xFCE7BD));
+            chk.Pressed.CheckBorder = factory.GetColor(0xC26D1D);
+            chk.Pressed.CheckInnerBackground = new LinearGradientColorTable(factory.GetColor(0xFAE0A2), factory.GetColor(0xFDF2D7));
+            chk.Pressed.CheckInnerBorder = factory.GetColor(0xFCA558);
+            chk.Pressed.CheckSign = new LinearGradientColorTable(factory.GetColor(0x4A6B96), Color.Empty);
+            chk.Pressed.Text = factory.GetColor(0x1B293E);
+
+            chk.Disabled.CheckBackground = new LinearGradientColorTable(factory.GetColor(0xFFFFFF), Color.Empty);
+            chk.Disabled.CheckBorder = factory.GetColor(0xB6B8BA);
+            chk.Disabled.CheckInnerBackground = new LinearGradientColorTable(factory.GetColor(0xF8F8F9));
+            chk.Disabled.CheckInnerBorder = factory.GetColor(0xDFE0E0);
+            chk.Disabled.CheckSign = new LinearGradientColorTable(factory.GetColor(0xB1B3B4), Color.Empty);
+            chk.Disabled.Text = factory.GetColor(0x87929F);
+            #endregion
+
+            #region Scroll Bar Colors
+            InitializeScrollBarColorTable(table, factory);
+            InitializeAppBlueScrollBarColorTable(table, factory);
+            #endregion
+
+            #region ProgressBarItem
+            Office2007ProgressBarColorTable pct = table.ProgressBarItem;
+            pct.BackgroundColors = new GradientColorTable(0xEBEDF0, 0xD5D8DC);
+            pct.OuterBorder = factory.GetColor(0x6E97CC);
+            pct.InnerBorder = factory.GetColor(0xFFFFFF);
+            pct.Chunk = new GradientColorTable(0x69922A, 0xE7F2D4, 0);
+            pct.ChunkOverlay = new GradientColorTable();
+            pct.ChunkOverlay.LinearGradientAngle = 90;
+            pct.ChunkOverlay.Colors.AddRange(new BackgroundColorBlend[] {
+                new BackgroundColorBlend(Color.FromArgb(192, factory.GetColor(0xEEFFD7)), 0f),
+                new BackgroundColorBlend(Color.FromArgb(128, factory.GetColor(0x8DB254)), .5f),
+                new BackgroundColorBlend(Color.FromArgb(64, factory.GetColor(0x69922B)), .5f),
+                new BackgroundColorBlend(Color.Transparent, 1f),
+            });
+            pct.ChunkShadow = new GradientColorTable(0xB2B9C8, 0xD5DAE5, 0);
+
+            // Paused State
+            pct = table.ProgressBarItemPaused;
+            pct.BackgroundColors = new GradientColorTable(0xEBEDF0, 0xD5D8DC);
+            pct.OuterBorder = factory.GetColor(0x6E97CC);
+            pct.InnerBorder = factory.GetColor(0xFFFFFF);
+            pct.Chunk = new GradientColorTable(0xAEA700, 0xFFFDCD, 0);
+            pct.ChunkOverlay = new GradientColorTable();
+            pct.ChunkOverlay.LinearGradientAngle = 90;
+            pct.ChunkOverlay.Colors.AddRange(new BackgroundColorBlend[] {
+                new BackgroundColorBlend(Color.FromArgb(192, factory.GetColor(0xFFFBA3)), 0f),
+                new BackgroundColorBlend(Color.FromArgb(128, factory.GetColor(0xD2CA00)), .5f),
+                new BackgroundColorBlend(Color.FromArgb(64, factory.GetColor(0xFEF400)), .5f),
+                new BackgroundColorBlend(Color.Transparent, 1f),
+            });
+            pct.ChunkShadow = new GradientColorTable(0xB2B9C8, 0xD5DAE5, 0);
+
+            // Error State
+            pct = table.ProgressBarItemError;
+            pct.BackgroundColors = new GradientColorTable(0xEBEDF0, 0xD5D8DC);
+            pct.OuterBorder = factory.GetColor(0x6E97CC);
+            pct.InnerBorder = factory.GetColor(0xFFFFFF);
+            pct.Chunk = new GradientColorTable(0xD20000, 0xFFCDCD, 0);
+            pct.ChunkOverlay = new GradientColorTable();
+            pct.ChunkOverlay.LinearGradientAngle = 90;
+            pct.ChunkOverlay.Colors.AddRange(new BackgroundColorBlend[] {
+                new BackgroundColorBlend(Color.FromArgb(192, factory.GetColor(0xFF8F8F)), 0f),
+                new BackgroundColorBlend(Color.FromArgb(128, factory.GetColor(0xD20000)), .5f),
+                new BackgroundColorBlend(Color.FromArgb(64, factory.GetColor(0xFE0000)), .5f),
+                new BackgroundColorBlend(Color.Transparent, 1f),
+            });
+            pct.ChunkShadow = new GradientColorTable(0xB2B9C8, 0xD5DAE5, 0);
+            #endregion
+
+            #region Gallery
+            Office2007GalleryColorTable gallery = table.Gallery;
+            gallery.GroupLabelBackground = factory.GetColor(0xF0F2F5);
+            gallery.GroupLabelText = factory.GetColor(0x1B293E);
+            gallery.GroupLabelBorder = factory.GetColor(0xF0F2F5);
+            #endregion
+
+            #region Legacy Colors
+            table.LegacyColors.BarBackground = factory.GetColor(0xBCC7D8);
+            table.LegacyColors.BarBackground2 = Color.Empty; // factory.GetColor(0xB3C4D8);
+            table.LegacyColors.BarStripeColor = factory.GetColor(0x60728C);
+            table.LegacyColors.BarCaptionBackground = factory.GetColor(0xFFFCF2);
+            table.LegacyColors.BarCaptionBackground2 = factory.GetColor(0xFFE8A6);
+            table.LegacyColors.BarCaptionText = factory.GetColor(0x000000);
+            table.LegacyColors.BarCaptionInactiveBackground = factory.GetColor(0x4D6082);
+            table.LegacyColors.BarCaptionInactiveBackground2 = factory.GetColor(0x3D5277);
+            table.LegacyColors.BarCaptionInactiveText = factory.GetColor(0xFFFFFF);
+            table.LegacyColors.BarFloatingBorder = factory.GetColor(0x2B3C59);
+            table.LegacyColors.BarPopupBackground = factory.GetColor(0xFFFFFF);
+            table.LegacyColors.BarPopupBorder = factory.GetColor(0x9BA7B7);
+            table.LegacyColors.ItemBackground = Color.Empty;
+            table.LegacyColors.ItemBackground2 = Color.Empty;
+            table.LegacyColors.ItemCheckedBackground = factory.GetColor(0xFFEFBB);
+            table.LegacyColors.ItemCheckedBackground2 = factory.GetColor(0xFFEFBB);
+            table.LegacyColors.ItemCheckedBorder = factory.GetColor(0xE5C365);
+            table.LegacyColors.ItemCheckedText = factory.GetColor(0x1B293E);
+            table.LegacyColors.ItemDisabledBackground = Color.Empty;
+            table.LegacyColors.ItemDisabledText = factory.GetColor(0x8D8D8D);
+            table.LegacyColors.ItemExpandedShadow = Color.Empty;
+            table.LegacyColors.ItemExpandedBackground = factory.GetColor(0xE9ECEE); //factory.GetColor(0xFFE8A6);
+            table.LegacyColors.ItemExpandedBackground2 = Color.Empty;// factory.GetColor(0xFFE8A6);
+            table.LegacyColors.ItemExpandedText = factory.GetColor(0x1B293E);
+            table.LegacyColors.ItemExpandedBorder = factory.GetColor(0x1B293E);
+            table.LegacyColors.ItemHotBackground = factory.GetColor(0xFFFCF2);
+            table.LegacyColors.ItemHotBackground2 = factory.GetColor(0xFFECB5);
+            table.LegacyColors.ItemHotBorder = factory.GetColor(0x9BA7B7);
+            table.LegacyColors.ItemHotText = factory.GetColor(0x1B293E);
+            table.LegacyColors.ItemPressedBackground = factory.GetColor(0xFFFCF2);
+            table.LegacyColors.ItemPressedBackground2 = factory.GetColor(0xFFECB5);
+            table.LegacyColors.ItemPressedBorder = factory.GetColor(0xE5C365);
+            table.LegacyColors.ItemPressedText = factory.GetColor(0x1B293E);
+            table.LegacyColors.ItemSeparator = factory.GetColor(0xBEC3CB);
+            table.LegacyColors.ItemSeparatorShade = Color.Empty; // Color.FromArgb(128, factory.GetColor(0xFFFFFF));
+            table.LegacyColors.ItemText = factory.GetColor(0x1B293E);
+            table.LegacyColors.MenuBackground = factory.GetColor(0xE9ECEE);
+            table.LegacyColors.MenuBackground2 = factory.GetColor(0xD0D7E2);
+            table.LegacyColors.MenuBarBackground = factory.GetColor(0xCAD3E2);
+            table.LegacyColors.MenuBarBackground2 = factory.GetColor(0xAEB9CD);
+            table.LegacyColors.MenuBorder = factory.GetColor(0x9BA7B7);
+            table.LegacyColors.ItemExpandedBorder = table.LegacyColors.MenuBorder;
+            table.LegacyColors.MenuSide = factory.GetColor(0xE9ECEE);
+            table.LegacyColors.MenuSide2 = Color.Empty; // factory.GetColor(0xDDE0E8);
+            table.LegacyColors.MenuUnusedBackground = table.LegacyColors.MenuBackground;
+            table.LegacyColors.MenuUnusedSide = factory.GetColor(0xBCC7D8);
+            table.LegacyColors.MenuUnusedSide2 = Color.Empty;// System.Windows.Forms.ControlPaint.Light(table.LegacyColors.MenuSide2);
+            table.LegacyColors.ItemDesignTimeBorder = Color.DarkGray;
+            table.LegacyColors.BarDockedBorder = factory.GetColor(0x9CAAC1);
+            table.LegacyColors.DockSiteBackColor = factory.GetColor(0x9CAAC1);
+            table.LegacyColors.DockSiteBackColor2 = Color.Empty;
+            table.LegacyColors.CustomizeBackground = factory.GetColor(0xD5DCE8);
+            table.LegacyColors.CustomizeBackground2 = Color.Empty; // factory.GetColor(0xB9CEE6);
+            table.LegacyColors.CustomizeText = factory.GetColor(0x1B293E);
+            table.LegacyColors.PanelBackground = factory.GetColor(0xCAD3E2);
+            table.LegacyColors.PanelBackground2 = factory.GetColor(0xAEB9CD);
+            table.LegacyColors.PanelText = factory.GetColor(0x1B293E);
+            table.LegacyColors.PanelBorder = factory.GetColor(editBorderColor);
+            table.LegacyColors.ExplorerBarBackground = factory.GetColor(0x4D6082);
+            table.LegacyColors.ExplorerBarBackground2 = factory.GetColor(0x3D5277);
+            table.LegacyColors.AutoHidePanelBackgroundImage = table.Form.MdiClientBackgroundImage;
+            table.LegacyColors.AutoHidePanelBackground = Color.Transparent;
+            table.LegacyColors.AutoHideTabBackground = factory.GetColor(0x4B5E81);
+            table.LegacyColors.AutoHideTabText = factory.GetColor(0xFFFFFF);
+            table.LegacyColors.AutoHideTabBorder = Color.Transparent;
+            table.LegacyColors.AutoHideSelectedTabBackground = factory.GetColor(0x4C5C74);
+            table.LegacyColors.AutoHideSelectedTabBackground2 = factory.GetColor(0x6F7776);
+            table.LegacyColors.AutoHideSelectedTabText = factory.GetColor(0xFFFFFF);
+            table.LegacyColors.AutoHideSelectedTabBorder = factory.GetColor(0x9BA7B7);
+            table.LegacyColors.SplitterBackground = factory.GetColor(0xDBEBFF);
+            table.LegacyColors.SplitterBackground2 = factory.GetColor(0xB4C4D6);
+            table.LegacyColors.SplitterBorder = factory.GetColor(0x859EBF);
+            table.LegacyColors.SplitterText = table.LegacyColors.SplitterBorder;
+            #endregion
+
+            #region Navigation Pane
+            table.NavigationPane.ButtonBackground = new GradientColorTable();
+            table.NavigationPane.ButtonBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xBCC7D8), 0));
+            #endregion
+
+            #region SuperTooltip
+            table.SuperTooltip.BackgroundColors = new LinearGradientColorTable(factory.GetColor(0xFDFDFE), factory.GetColor(0xE4E5F0));
+            table.SuperTooltip.TextColor = factory.GetColor(0x4C4C4C);
+            #endregion
+
+            #region Slider
+            Office2007SliderColorTable sl = table.Slider;
+            sl.Default.LabelColor = factory.GetColor(0x1B293E);
+            sl.Default.SliderLabelColor = factory.GetColor(0x1B293E);
+            sl.Default.PartBackground = new GradientColorTable();
+            sl.Default.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xF7FBFE), 0));
+            sl.Default.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xE3ECF8), .5f));
+            sl.Default.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xBCCADD), 1f));
+            sl.Default.PartBorderColor = factory.GetColor(0x76869D);
+            sl.Default.PartBorderLightColor = Color.FromArgb(96, factory.GetColor(0xFFFFFF));
+            sl.Default.PartForeColor = factory.GetColor(0x7E8287);
+            sl.Default.PartForeLightColor = Color.Empty;
+            sl.Default.TrackLineColor = factory.GetColor(0x8A9CB8);
+            sl.Default.TrackLineLightColor = factory.GetColor(0xDEEAF7);
+
+            sl.MouseOver.LabelColor = factory.GetColor(0x1B293E);
+            sl.MouseOver.SliderLabelColor = factory.GetColor(0x1B293E);
+            sl.MouseOver.PartBackground = new GradientColorTable();
+            sl.MouseOver.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xF6E49C), 0));
+            sl.MouseOver.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xF6E59A), .5f));
+            sl.MouseOver.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFAF5D5), 1f));
+            sl.MouseOver.PartBorderColor = factory.GetColor(0xEDC23E);
+            sl.MouseOver.PartBorderLightColor = Color.FromArgb(96, factory.GetColor(0xFFFFFF));
+            sl.MouseOver.PartForeColor = factory.GetColor(0x7E8287);
+            sl.MouseOver.PartForeLightColor = Color.Empty;
+            sl.MouseOver.TrackLineColor = factory.GetColor(0x8A9CB8);
+            sl.MouseOver.TrackLineLightColor = factory.GetColor(0xDEEAF7);
+
+            sl.Pressed.LabelColor = factory.GetColor(0x1B293E);
+            sl.Pressed.SliderLabelColor = factory.GetColor(0x1B293E);
+            sl.Pressed.PartBackground = new GradientColorTable();
+            sl.Pressed.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFBD677), 0));
+            sl.Pressed.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFFE489), .5f));
+            sl.Pressed.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFFE489), 1f));
+            sl.Pressed.PartBorderColor = factory.GetColor(0xC27D36);
+            sl.Pressed.PartBorderLightColor = factory.GetColor(0xF1C15F);
+            sl.Pressed.PartForeColor = factory.GetColor(0x7E8287);
+            sl.Pressed.PartForeLightColor = Color.Empty;
+            sl.Pressed.TrackLineColor = factory.GetColor(0x8A9CB8);
+            sl.Pressed.TrackLineLightColor = factory.GetColor(0xDEEAF7);
+
+            ColorBlendFactory df = new ColorBlendFactory(ColorScheme.GetColor(0xCFCFCF));
+            sl.Disabled.LabelColor = factory.GetColor(0x8D8D8D);
+            sl.Disabled.SliderLabelColor = factory.GetColor(0x8D8D8D);
+            sl.Disabled.PartBackground = new GradientColorTable();
+            foreach (BackgroundColorBlend b in sl.Default.PartBackground.Colors)
+                sl.Disabled.PartBackground.Colors.Add(new BackgroundColorBlend(df.GetColor(b.Color), b.Position));
+            sl.Disabled.PartBorderColor = df.GetColor(sl.Default.PartBorderColor);
+            sl.Disabled.PartBorderLightColor = df.GetColor(sl.Default.PartBorderLightColor);
+            sl.Disabled.PartForeColor = df.GetColor(sl.Default.PartForeColor);
+            sl.Disabled.PartForeLightColor = df.GetColor(sl.Default.PartForeLightColor);
+            sl.Disabled.TrackLineColor = df.GetColor(sl.Default.TrackLineColor);
+            sl.Disabled.TrackLineLightColor = df.GetColor(sl.Default.TrackLineLightColor);
+            #endregion
+
+            #region RangeSlider
+            Office2007ColorTable.InitRangeSlider(table, factory);
+            #endregion
+
+            #region ListViewEx
+            table.ListViewEx.Border = factory.GetColor(editBorderColor);
+            table.ListViewEx.ColumnBackground = new LinearGradientColorTable(factory.GetColor(0xEFF5FB), factory.GetColor(0xE1ECFA));
+            table.ListViewEx.ColumnSeparator = factory.GetColor(editBorderColor);
+            table.ListViewEx.ColumnForeColor = factory.GetColor(0x1B293E);
+            table.ListViewEx.SelectionBackground = new LinearGradientColorTable(factory.GetColor(0xA7CDF0), Color.Empty);
+            table.ListViewEx.SelectionBorder = factory.GetColor(0xE3EFFF);
+            #endregion
+
+            #region DataGridView
+            table.DataGridView.ColumnHeaderNormalBorder = factory.GetColor(editBorderColor);
+            table.DataGridView.ColumnHeaderNormalBackground = new LinearGradientColorTable(factory.GetColor(0xEFF5FB), factory.GetColor(0xE1ECFA), 90);
+            table.DataGridView.ColumnHeaderSelectedBackground = new LinearGradientColorTable(factory.GetColor(0xF9D99F), factory.GetColor(0xF1C15F), 90);
+            table.DataGridView.ColumnHeaderSelectedBorder = factory.GetColor(0xF29536);
+            table.DataGridView.ColumnHeaderSelectedMouseOverBackground = new LinearGradientColorTable(factory.GetColor(0xFFD58D), factory.GetColor(0xF2923A), 90);
+            table.DataGridView.ColumnHeaderSelectedMouseOverBorder = factory.GetColor(0xF29536);
+            table.DataGridView.ColumnHeaderMouseOverBackground = new LinearGradientColorTable(factory.GetColor(0xD4E4F7), factory.GetColor(0xC3D6EC), 90);
+            table.DataGridView.ColumnHeaderMouseOverBorder = factory.GetColor(editBorderColor);
+            table.DataGridView.ColumnHeaderPressedBackground = new LinearGradientColorTable(factory.GetColor(0xB5CBE3), factory.GetColor(0xA5BCD7), 90);
+            table.DataGridView.ColumnHeaderPressedBorder = factory.GetColor(editBorderColor);
+
+            table.DataGridView.RowNormalBackground = new LinearGradientColorTable(factory.GetColor(0xE4ECF7));
+            table.DataGridView.RowNormalBorder = factory.GetColor(editBorderColor);
+            table.DataGridView.RowSelectedBackground = new LinearGradientColorTable(factory.GetColor(0xFFD58D));
+            table.DataGridView.RowSelectedBorder = factory.GetColor(0xF29536);
+            table.DataGridView.RowSelectedMouseOverBackground = new LinearGradientColorTable(factory.GetColor(0xF1C05C));
+            table.DataGridView.RowSelectedMouseOverBorder = factory.GetColor(0xF29536);
+            table.DataGridView.RowMouseOverBackground = new LinearGradientColorTable(factory.GetColor(0xF1C05C));
+            table.DataGridView.RowMouseOverBorder = factory.GetColor(0xF29536);
+            table.DataGridView.RowPressedBackground = new LinearGradientColorTable(factory.GetColor(0xB5CBE3), factory.GetColor(0xA5BCD7), 90);
+            table.DataGridView.RowPressedBorder = factory.GetColor(editBorderColor);
+
+            table.DataGridView.GridColor = factory.GetColor(0xAAAAAA);
+
+            table.DataGridView.SelectorBackground = new LinearGradientColorTable(factory.GetColor(0xA5BCD7));
+            table.DataGridView.SelectorBorder = factory.GetColor(editBorderColor);
+            table.DataGridView.SelectorBorderDark = factory.GetColor(0xC3C3C3);
+            table.DataGridView.SelectorBorderLight = factory.GetColor(0xF9F9F9);
+            table.DataGridView.SelectorSign = new LinearGradientColorTable(factory.GetColor(0xF2F2F2));
+
+            table.DataGridView.SelectorMouseOverBackground = new LinearGradientColorTable(factory.GetColor(0x8BA0B5));
+            table.DataGridView.SelectorMouseOverBorder = factory.GetColor(0x9EB6CE);
+            table.DataGridView.SelectorMouseOverBorderDark = factory.GetColor(0xB0CFF7);
+            table.DataGridView.SelectorMouseOverBorderLight = factory.GetColor(0xD5E4F2);
+            table.DataGridView.SelectorMouseOverSign = new LinearGradientColorTable(factory.GetColor(0xF9FAFB), factory.GetColor(0xD7DAE2));
+            #endregion
+
+            #region SideBar
+            table.SideBar.Background = new LinearGradientColorTable(factory.GetColor(Color.White));
+            table.SideBar.Border = factory.GetColor(editBorderColor);
+            table.SideBar.SideBarPanelItemText = factory.GetColor(0x1B293E);
+            table.SideBar.SideBarPanelItemDefault = new GradientColorTable();
+            table.SideBar.SideBarPanelItemDefault.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xEDF5FD), 0));
+            table.SideBar.SideBarPanelItemDefault.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xD8E4F2), 1));
+            // Expanded
+            table.SideBar.SideBarPanelItemExpanded = new GradientColorTable();
+            table.SideBar.SideBarPanelItemExpanded.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFBDBB5), 0));
+            table.SideBar.SideBarPanelItemExpanded.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFEC778), .4f));
+            table.SideBar.SideBarPanelItemExpanded.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFEB456), .4f));
+            table.SideBar.SideBarPanelItemExpanded.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFDEB9F), 1));
+            // MouseOver
+            table.SideBar.SideBarPanelItemMouseOver = new GradientColorTable();
+            table.SideBar.SideBarPanelItemMouseOver.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFFFCD9), 0));
+            table.SideBar.SideBarPanelItemMouseOver.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFFE78D), .4f));
+            table.SideBar.SideBarPanelItemMouseOver.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFFD748), .4f));
+            table.SideBar.SideBarPanelItemMouseOver.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFFE793), 1));
+            // Pressed
+            table.SideBar.SideBarPanelItemPressed = new GradientColorTable();
+            table.SideBar.SideBarPanelItemPressed.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xF8B869), 0));
+            table.SideBar.SideBarPanelItemPressed.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFDA361), .4f));
+            table.SideBar.SideBarPanelItemPressed.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFB8A3C), .4f));
+            table.SideBar.SideBarPanelItemPressed.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFEBB60), 1));
+            #endregion
+
+            #region AdvTree
+#if !NOTREE
+            table.AdvTree = new DevComponents.AdvTree.Display.TreeColorTable();
+            DevComponents.AdvTree.Display.ColorTableInitializer.InitOffice2007Blue(table.AdvTree, factory);
+#endif
+            #endregion
+
+            #region CrumbBar
+            table.CrumbBarItemView = new CrumbBarItemViewColorTable();
+            CrumbBarItemViewStateColorTable crumbBarViewTable = new CrumbBarItemViewStateColorTable();
+            table.CrumbBarItemView.Default = crumbBarViewTable;
+            crumbBarViewTable.Foreground = factory.GetColor(0x1B293E);
+            crumbBarViewTable = new CrumbBarItemViewStateColorTable();
+            table.CrumbBarItemView.MouseOver = crumbBarViewTable;
+            crumbBarViewTable.Foreground = factory.GetColor(0x1B293E);
+            crumbBarViewTable.Background = new BackgroundColorBlendCollection();
+            crumbBarViewTable.Background.AddRange(new BackgroundColorBlend[]{
+                new BackgroundColorBlend(factory.GetColor("F9E8A1"), 0f),
+                new BackgroundColorBlend(factory.GetColor("FAF2CD"), 1f)});
+            crumbBarViewTable.Border = factory.GetColor("EEC955");
+            crumbBarViewTable.BorderLight = factory.GetColor("90FFFFFF");
+            crumbBarViewTable = new CrumbBarItemViewStateColorTable();
+            table.CrumbBarItemView.MouseOverInactive = crumbBarViewTable;
+            crumbBarViewTable.Foreground = factory.GetColor(0x1B293E);
+            crumbBarViewTable.Background = new BackgroundColorBlendCollection();
+            crumbBarViewTable.Background.AddRange(new BackgroundColorBlend[]{
+                new BackgroundColorBlend(factory.GetColor("FFFFFDEC"), 0f),
+                new BackgroundColorBlend(factory.GetColor("FFFFF4CA"), .4f),
+                new BackgroundColorBlend(factory.GetColor("FFFFEBA6"), .4f),
+                new BackgroundColorBlend(factory.GetColor("FFFFF2C5"), 1f)});
+            crumbBarViewTable.Border = factory.GetColor("FF8E8F8F");
+            crumbBarViewTable.BorderLight = factory.GetColor("90FFFFFF");
+            crumbBarViewTable = new CrumbBarItemViewStateColorTable();
+            table.CrumbBarItemView.Pressed = crumbBarViewTable;
+            crumbBarViewTable.Foreground = factory.GetColor(0x1B293E);
+            crumbBarViewTable.Background = new BackgroundColorBlendCollection();
+            crumbBarViewTable.Background.AddRange(new BackgroundColorBlend[]{
+                new BackgroundColorBlend(factory.GetColor("FFC59B61"), 0f),
+                new BackgroundColorBlend(factory.GetColor("FFEEB469"), .1f),
+                new BackgroundColorBlend(factory.GetColor("FFFCA060"), .6f),
+                new BackgroundColorBlend(factory.GetColor("FFFB8E3D"), .6f),
+                new BackgroundColorBlend(factory.GetColor("FFFEBB60"), 1f)});
+            crumbBarViewTable.Border = factory.GetColor("FF8B7654");
+            crumbBarViewTable.BorderLight = factory.GetColor("408B7654");
+
+            #endregion
+
+            #region WarningBox
+            table.WarningBox.BackColor = factory.GetColor(factory.GetColor(0xCDDFF5));
+            table.WarningBox.WarningBorderColor = factory.GetColor(editBorderColor);
+            table.WarningBox.WarningBackColor1 = factory.GetColor(0xC7D6E9);
+            table.WarningBox.WarningBackColor2 = factory.GetColor(0xAFC3DC);
+            #endregion
+
+            #region CalendarView
+
+            #region WeekDayViewColors
+
+            table.CalendarView.WeekDayViewColors = new ColorDef[]
+            {
+                new ColorDef(factory.GetColor(editBorderColor)),           // DayViewBorder
+                new ColorDef(factory.GetColor(0x1B293E)),           // DayHeaderForeground
+
+                new ColorDef(factory.GetColor(0xA5BFE1)),           // DayHeaderBackground
+
+                new ColorDef(factory.GetColor(0x8DAED9)),           // DayHeaderBorder
+
+                new ColorDef(factory.GetColor(0xFFFFFF)),           // DayWorkHoursBackground
+                new ColorDef(factory.GetColor(0xA5BFE1)),           // DayAllDayEventBackground
+                new ColorDef(factory.GetColor(0xE6EDF7)),           // DayOffWorkHoursBackground
+
+                new ColorDef(factory.GetColor(0xA5BFE1)),           // DayHourBorder
+                new ColorDef(factory.GetColor(0xD5E1F1)),           // DayHalfHourBorder
+
+                new ColorDef(factory.GetColor(0x294C7A)),           // SelectionBackground
+
+                new ColorDef(factory.GetColor(0x9199A4)),           // OwnerTabBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xCFD2D8), factory.GetColor(0xB0B6BE)},    // OwnerTabBackground
+                new float[] {0f, 1f}, 90f),
+
+                new ColorDef(factory.GetColor(0x000000)),           // OwnerTabForeground
+                new ColorDef(factory.GetColor(0xB0B6BE)),           // OwnerTabContentBackground
+                new ColorDef(factory.GetColor(0x000000)),           // OwnerTabSelectedForeground
+                new ColorDef(factory.GetColor(0xFFFFFF)),           // OwnerTabSelectionBackground
+
+                new ColorDef(factory.GetColor(0xFFFFFF)),           // CondensedViewBackground
+
+                new ColorDef(factory.GetColor(0xEB8900)),           // NowDayViewBorder
+                new ColorDef(factory.GetColor(0x000000)),           // NowDayHeaderForeground - 0x15428B
+
+                new ColorDef(new Color[] {factory.GetColor(0xFFED79), factory.GetColor(0xFFD86B), factory.GetColor(0xFFBB00), factory.GetColor(0xFFEA77)},
+                new float[] {0f, .55f ,58f, 1f}, 90f),              // NowDayHeaderBackground
+                
+                new ColorDef(new Color[] {factory.GetColor(0xFFED79), factory.GetColor(0xFFD86B), factory.GetColor(0xFFBB00), factory.GetColor(0xFFEA77)},
+                new float[] {0f, .55f ,58f, 1f}, 90f),              // TimeIndicator
+
+                new ColorDef(factory.GetColor(0xEB8900)),           // TimeIndicatorBorder
+            };
+
+            #endregion
+
+            #region HourRulerColors
+
+            table.CalendarView.TimeRulerColors = new ColorDef[]
+            {
+                new ColorDef(factory.GetColor(0xFFFFFF)),           // TimeRulerBackground
+                new ColorDef(factory.GetColor(0x1B293E)),           // TimeRulerForeground
+                new ColorDef(factory.GetColor(editBorderColor)),           // TimeRulerBorder
+                new ColorDef(factory.GetColor(editBorderColor)),           // TimeRulerTickBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xFFED79), factory.GetColor(0xFFD86B), factory.GetColor(0xFFBB00), factory.GetColor(0xFFEA77)},
+                new float[] {0f, .55f ,58f, 1f}, 90f),              // TimeRulerIndicator
+
+                new ColorDef(factory.GetColor(0xEB8900)),           // TimeRulerIndicatorBorder
+            };
+
+            #endregion
+
+            #region MonthViewColors
+
+            table.CalendarView.MonthViewColors = new ColorDef[]
+            {
+              new ColorDef(factory.GetColor(editBorderColor)),           // DayOfWeekHeaderBorder
+
+                new ColorDef(factory.GetColor(0xFFFFFF)),         // DayOfWeekHeaderBackground
+
+                new ColorDef(factory.GetColor(0x1B293E)),           // DayOfWeekHeaderForeground
+                new ColorDef(factory.GetColor(0x8DAED9)),           // SideBarBorder
+
+                new ColorDef(factory.GetColor(0xE6EDF7)),           // SideBarBackground
+
+                new ColorDef(factory.GetColor(0x000000)),           // SideBarForeground
+                new ColorDef(factory.GetColor(editBorderColor)),           // DayHeaderBorder
+
+                new ColorDef(factory.GetColor(0xA5BFE1)),           // DayHeaderBackground
+
+                new ColorDef(factory.GetColor(0x1F3979)),           // DayHeaderForeground
+                new ColorDef(factory.GetColor(0x8DAED9)),           // DayContentBorder
+                new ColorDef(factory.GetColor(0xE6EDF7)),           // DayContentSelectionBackground
+                new ColorDef(factory.GetColor(0xFFFFFF)),           // DayContentActiveDayBackground
+                new ColorDef(factory.GetColor(0xA5BFE1)),           // DayContentInactiveDayBackground
+
+                new ColorDef(factory.GetColor(0x9199A4)),           // OwnerTabBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xCFD2D8), factory.GetColor(0xB0B6BE)},    // OwnerTabBackground
+                new float[] {0f, 1f}, 90f),
+
+                new ColorDef(factory.GetColor(0x000000)),           // OwnerTabForeground
+                new ColorDef(factory.GetColor(0xB0B6BE)),           // OwnerTabContentBackground
+                new ColorDef(factory.GetColor(0x000000)),           // OwnerTabSelectedForeground
+                new ColorDef(factory.GetColor(0xFFFFFF)),           // OwnerTabSelectionBackground
+ 
+                new ColorDef(factory.GetColor(0xEB8900)),           // NowDayViewBorder
+                new ColorDef(factory.GetColor(0x000000)),           // NowDayHeaderForeground - 0x15428B
+
+                new ColorDef(new Color[] {factory.GetColor(0xFFED79), factory.GetColor(0xFFD86B), factory.GetColor(0xFFBB00), factory.GetColor(0xFFEA77)},
+                new float[] {0f, .55f ,58f, 1f}, 90f),              // NowDayHeaderBackground
+
+                new ColorDef(factory.GetColor(0x1F3979)),           // ContentLinkForeground - DayHeaderForeground
+                new ColorDef(factory.GetColor(0xFFFFFF)),           // ContentLinkBackground - DayContentActiveDayBackground
+
+           };
+
+            #endregion
+
+            #region AppointmentColors
+
+            table.CalendarView.AppointmentColors = new ColorDef[]
+            {
+                new ColorDef(factory.GetColor(0x8DAED9)),           // DefaultBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xE0E9F6), factory.GetColor(0xB3C9E6)},
+                             new float[] {0f, 1f}, 90f),            // DefaultBackground
+
+                new ColorDef(factory.GetColor(0x28518E)),           // BlueBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xB1C5EC), factory.GetColor(0x759DDA)}, 
+                             new float[] {0f, 1f}, 90f),            // BlueBackground
+
+                new ColorDef(factory.GetColor(0x2C6524)),           // GreenBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xC2E8BC), factory.GetColor(0x84D17B)},
+                             new float[] {0f, 1f}, 90f),            // GreenBackground
+
+                new ColorDef(factory.GetColor(0x8B3E0A)),           // OrangeBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xF9C7A0), factory.GetColor(0xF49758)},
+                             new float[] {0f, 1f}, 90f),            // OrangeBackground
+
+                new ColorDef(factory.GetColor(0x3E2771)),           // PurpleBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xC5B5E6), factory.GetColor(0x957BD2)},
+                             new float[] {0f, 1f}, 90f),            // PurpleBackground
+
+                new ColorDef(factory.GetColor(0x86171C)),           // RedBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xF1AAAC), factory.GetColor(0xE5676E)},
+                             new float[] {0f, 1f}, 90f),            // RedBackground
+
+                new ColorDef(factory.GetColor(0x7C7814)),           // YellowBorder
+
+                new ColorDef(new Color[] {factory.GetColor(0xFFFCAA), factory.GetColor(0xFFF958)},
+                             new float[] {0f, 1f}, 90f),            // YellowBackground
+
+                new ColorDef(factory.GetColor(-1)),                 // BusyTimeMarker
+                new ColorDef(factory.GetColor(0xFFFFFF)),           // FreeTimeMarker
+                new ColorDef(factory.GetColor(0x800080))            // OutOfOfficeTimeMarker
+            };
+
+            #endregion
+
+            #endregion
+
+            #region SuperTab
+
+            #region SuperTab
+
+            table.SuperTab.Background = new SuperTabLinearGradientColorTable(factory.GetColor(0xBBCEE6));
+            table.SuperTab.InnerBorder = factory.GetColor(Color.Transparent);
+            table.SuperTab.OuterBorder = factory.GetColor(0x9FB2C7);
+
+            table.SuperTab.ControlBoxDefault.Image = factory.GetColor(0x1B293E);
+
+            table.SuperTab.ControlBoxMouseOver.Background = factory.GetColor(0xCEEDFA);
+            table.SuperTab.ControlBoxMouseOver.Border = factory.GetColor(0x3399FF);
+            table.SuperTab.ControlBoxMouseOver.Image = factory.GetColor(0xFF, 0x1B293E);
+
+            table.SuperTab.ControlBoxPressed.Background = factory.GetColor(0xB7CAE0);
+            table.SuperTab.ControlBoxPressed.Border = factory.GetColor(0x3399FF);
+            table.SuperTab.ControlBoxPressed.Image = factory.GetColor(0xFF, 0x1B293E);
+
+            table.SuperTab.InsertMarker = factory.GetColor(0xFF, 0x000000);
+
+            #endregion
+
+            #region SuperTabItem
+
+            // Top Default
+
+            table.SuperTabItem.Default.Normal.Background = new SuperTabLinearGradientColorTable();
+            table.SuperTabItem.Default.Normal.Text = factory.GetColor(0x1B293E);
+            table.SuperTabItem.Default.Normal.CloseMarker = factory.GetColor(0x1B293E);
+
+            // Top Selected
+            table.SuperTabItem.Default.Selected.Background = new SuperTabLinearGradientColorTable(
+                new Color[] { factory.GetColor(0xF5FAFF), factory.GetColor(0xEFF6FD) },
+                new float[] { 0, 1 });
+
+            table.SuperTabItem.Default.Selected.InnerBorder = Color.Transparent;
+            table.SuperTabItem.Default.Selected.OuterBorder = factory.GetColor(0x9FB2C7);
+            table.SuperTabItem.Default.Selected.Text = factory.GetColor(0x1B293E);
+            table.SuperTabItem.Default.Selected.CloseMarker = factory.GetColor(0x1B293E);
+
+            // Disabled
+            table.SuperTabItem.Default.Disabled.Text = factory.GetColor(0x87929f);
+            table.SuperTabItem.Default.Disabled.Background.AdaptiveGradient = false;
+            table.SuperTabItem.Default.Disabled.CloseMarker = factory.GetColor(0x87929f);
+
+            // Top SelectedMouseOver
+
+            table.SuperTabItem.Default.SelectedMouseOver.Background = new SuperTabLinearGradientColorTable(
+                new Color[] { factory.GetColor(0xF5FAFF), factory.GetColor(0xEFF6FD) },
+                new float[] { 0, 1 });
+
+            table.SuperTabItem.Default.SelectedMouseOver.InnerBorder = Color.Transparent;
+            table.SuperTabItem.Default.SelectedMouseOver.OuterBorder = factory.GetColor(0x9FB2C7);
+            table.SuperTabItem.Default.SelectedMouseOver.Text = factory.GetColor(0x1B293E);
+            table.SuperTabItem.Default.SelectedMouseOver.CloseMarker = factory.GetColor(0x1B293E);
+
+            // Top MouseOver
+
+            table.SuperTabItem.Default.MouseOver.Background = new SuperTabLinearGradientColorTable(
+                new Color[] { factory.GetColor(48, 0xFFFFFF), factory.GetColor(180, 0xFFFFFF) },
+                new float[] { 0, 1 });
+
+            table.SuperTabItem.Default.MouseOver.InnerBorder = factory.GetColor(190, 0xFFFFFF);
+            table.SuperTabItem.Default.MouseOver.OuterBorder = factory.GetColor(0xB1B5BA);
+            table.SuperTabItem.Default.MouseOver.Text = factory.GetColor(0x1B293E);
+            table.SuperTabItem.Default.MouseOver.CloseMarker = factory.GetColor(0x1B293E);
+
+            // Left, Bottom, Right
+
+            table.SuperTabItem.Left = table.SuperTabItem.Default;
+            table.SuperTabItem.Bottom = table.SuperTabItem.Default;
+            table.SuperTabItem.Right = table.SuperTabItem.Right;
+
+            #endregion
+
+            #region SuperTabPanel
+
+            table.SuperTabPanel.Default.Background = new SuperTabLinearGradientColorTable(factory.GetColor(0xEFF6FD));
+            table.SuperTabPanel.Default.OuterBorder = factory.GetColor(0x9FB2C7);
+            table.SuperTabPanel.Default.InnerBorder = factory.GetColor(Color.Transparent);
+
+            table.SuperTabPanel.Left = table.SuperTabPanel.Default;
+            table.SuperTabPanel.Bottom = table.SuperTabPanel.Default;
+            table.SuperTabPanel.Right = table.SuperTabPanel.Default;
+
+            #endregion
+
+            #endregion
+
+            #region Backstage
+
+            #region Backstage
+            SuperTabStyleColorFactory.GetVS2010BackstageBlueColorTable(table.Backstage, factory);
+            #endregion
+
+            #region BackstageItem
+            SuperTabStyleColorFactory.GetOffice2010BackstageBlueItemColorTable(table.BackstageItem, factory);
+            #endregion
+
+            #region BackstagePanel
+            SuperTabStyleColorFactory.GetOffice2010BackstageBluePanelColorTable(table.BackstagePanel, factory);
+            #endregion
+
+            #endregion
+
+            #region SwitchButton
+            table.SwitchButton = new SwitchButtonColors();
+            table.SwitchButton.Disabled.BorderColor = table.CheckBoxItem.Disabled.CheckBorder;
+            table.SwitchButton.Disabled.SwitchBorderColor = table.SwitchButton.Disabled.BorderColor;
+            table.SwitchButton.Disabled.OffTextColor = table.CheckBoxItem.Disabled.Text;
+            table.SwitchButton.Disabled.OnTextColor = table.SwitchButton.Disabled.OffTextColor;
+            table.SwitchButton.Disabled.TextColor = table.SwitchButton.Disabled.OffTextColor;
+            table.SwitchButton.Disabled.SwitchBackColor = table.CheckBoxItem.Disabled.CheckInnerBackground.Start;
+            table.SwitchButton.Disabled.OffBackColor = table.CheckBoxItem.Disabled.CheckInnerBackground.Start;
+            table.SwitchButton.Disabled.OnBackColor = table.SwitchButton.Disabled.OffBackColor;
+            #endregion
+
+            #region ElementStyle Classes
+            table.StyleClasses.Clear();
+            ElementStyle style = new ElementStyle();
+            style.Class = ElementStyleClassKeys.RibbonGalleryContainerKey;
+            style.BorderColor = factory.GetColor(0x8894A8);
+            style.Border = eStyleBorderType.Solid;
+            style.BorderWidth = 1;
+            style.CornerDiameter = 2;
+            style.CornerType = eCornerType.Rounded;
+            style.BackColor = factory.GetColor(0xF1F3F8);
+            table.StyleClasses.Add(style.Class, style);
+            // FileMenuContainer
+            style = GetFileMenuContainerStyle(table);
+            table.StyleClasses.Add(style.Class, style);
+            // Two Column File Menu Container
+            style = GetTwoColumnMenuContainerStyle(table);
+            table.StyleClasses.Add(style.Class, style);
+            // Column one File Menu Container
+            style = GetMenuColumnOneContainerStyle(table);
+            table.StyleClasses.Add(style.Class, style);
+            // Column two File Menu Container
+            style = GetMenuColumnTwoContainerStyle(table);
+            table.StyleClasses.Add(style.Class, style);
+            // Bottom File Menu Container
+            style = GetMenuBottomContainer(table);
+            table.StyleClasses.Add(style.Class, style);
+            // TextBox border
+            style = Office2007ColorTableFactory.GetTextBoxStyle(factory.GetColor(editBorderColor));
+            table.StyleClasses.Add(style.Class, style);
+            // RichTextBox border
+            style = Office2007ColorTableFactory.GetRichTextBoxStyle(factory.GetColor(editBorderColor));
+            table.StyleClasses.Add(style.Class, style);
+            // ItemPanel
+            style = Office2007ColorTableFactory.GetItemPanelStyle(factory.GetColor(editBorderColor));
+            table.StyleClasses.Add(style.Class, style);
+            // ListBoxAdv
+            style = Office2007ColorTableFactory.GetListBoxAdvStyle(factory.GetColor(editBorderColor));
+            table.StyleClasses.Add(style.Class, style);
+            // DateTimeInput background
+            style = Office2007ColorTableFactory.GetDateTimeInputBackgroundStyle(factory.GetColor(editBorderColor), SystemColors.Window);
+            table.StyleClasses.Add(style.Class, style);
+            // Ribbon Client Panel
+            style = GetRibbonClientPanelStyle(factory, eOffice2010ColorScheme.Blue);
+            table.StyleClasses.Add(style.Class, style);
+            // ListView Border
+            style = Office2007ColorTableFactory.GetListViewBorderStyle(table.ListViewEx);
+            table.StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetStatusBarAltStyle(table.Bar);
+            table.StyleClasses.Add(style.Class, style);
+#if !NOTREE
+            // Tree Border/Background
+            style = Office2007ColorTableFactory.GetAdvTreeStyle(factory.GetColor(editBorderColor), Color.Empty);
+            table.StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetAdvTreeColumnsHeaderStyle(factory.GetColor(0xF9FCFD), factory.GetColor(0xD3DBE9), factory.GetColor(0x9EB6CE));
+            table.StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetAdvTreeNodesColumnsHeaderStyle(factory.GetColor(0xF9FCFD), factory.GetColor(0xD3DBE9), factory.GetColor(0x9EB6CE));
+            table.StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetAdvTreeColumnStyle(factory.GetColor(0x000000));
+            table.StyleClasses.Add(style.Class, style);
+            // CrumbBar
+            style = Office2007ColorTableFactory.GetCrumbBarBackgroundStyle(factory.GetColor(Color.White), factory.GetColor("FF567DB0"), factory.GetColor("FF2F578D"));
+            table.StyleClasses.Add(style.Class, style);
+#endif
+
+            // DataGridView border
+            style = Office2007ColorTableFactory.GetDataGridViewStyle();
+            table.StyleClasses.Add(style.Class, style);
+            // DataGridViewDateTime border
+            style = Office2007ColorTableFactory.GetDataGridViewDateTimeStyle();
+            table.StyleClasses.Add(style.Class, style);
+            // DataGridViewNumeric border
+            style = Office2007ColorTableFactory.GetDataGridViewNumericStyle();
+            table.StyleClasses.Add(style.Class, style);
+            // DataGridViewIpAddress border
+            style = Office2007ColorTableFactory.GetDataGridViewIpAddressStyle();
+            table.StyleClasses.Add(style.Class, style);
+
+            // Slide-out Button
+            style = Office2007ColorTableFactory.GetSlideOutButtonStyle(table.CheckBoxItem.Default.CheckBorder);
+            table.StyleClasses.Add(style.Class, style);
+            // MetroTilePanel
+            style = Office2007ColorTableFactory.GetMetroTilePanelStyle(factory.GetColor(Color.White));
+            table.StyleClasses.Add(style.Class, style);
+            // MetroTileGroup
+            style = Office2007ColorTableFactory.GetMetroTileGroupStyle(factory.GetColor(Color.DarkGray));
+            table.StyleClasses.Add(style.Class, style);
+            // MonthCalendarAdv
+            style = Office2007ColorTableFactory.GetMonthCalendarStyle(SystemColors.Window);
+            table.StyleClasses.Add(style.Class, style);
+            // ProgressSteps control
+            style = Office2007ColorTableFactory.GetProgressStepsStyle(table);
+            table.StyleClasses.Add(style.Class, style);
+
+            // SideNavStrip
+            style = Office2007ColorTableFactory.GetSideNavStripStyle(factory.GetColor(0xBCC7D8));
+            table.StyleClasses.Add(style.Class, style);
+            // TabFormPanel
+            style = Office2007ColorTableFactory.GetTabFormPanelStyle(factory.GetColor(0xCAD3E2));
+            table.StyleClasses.Add(style.Class, style);
+
+            // Toolbox Control
+            style = Office2007ColorTableFactory.GetToolboxControlStyle(factory.GetColor(table.LegacyColors.PanelBorder), Color.Empty);
+            table.StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetToolboxGroupTitle(factory.GetColor(0x1B293E));
+            table.StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetToolboxGroupTitleMouseOver(factory.GetColor(0x1B293E), factory.GetColor(0xFFECB5));
+            table.StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetToolboxGroupExpandedTitle(factory.GetColor(0x1B293E), factory.GetColor(0xAEB9CD));
+            table.StyleClasses.Add(style.Class, style);
+            #endregion
+
+            #region StepIndicator
+            table.StepIndicator.BackgroundColor = factory.GetColor(ColorFunctions.GetShade(table.Form.BackColor, 10));
+            table.StepIndicator.IndicatorColor = factory.GetColor(0xA4CC28);
+            #endregion
+
+            #region RadialMenu
+            table.RadialMenu = new RadialMenuColorTable();
+            table.RadialMenu.CircularBackColor = factory.GetColor(0xD44F2E);
+            table.RadialMenu.CircularBorderColor = factory.GetColor(0xFFFFFF);
+            table.RadialMenu.CircularForeColor = factory.GetColor(0xFFFFFF);
+            table.RadialMenu.RadialMenuBackground = factory.GetColor(0xFFFFFF);
+            table.RadialMenu.RadialMenuBorder = factory.GetColor(0x535F74);
+            table.RadialMenu.RadialMenuButtonBackground = factory.GetColor(0xFFFFFF);
+            table.RadialMenu.RadialMenuButtonBorder = factory.GetColor(0x535F74);
+            table.RadialMenu.RadialMenuExpandForeground = factory.GetColor(0xFFFFFF);
+            table.RadialMenu.RadialMenuInactiveBorder = Color.FromArgb(128, table.RadialMenu.RadialMenuBorder);
+            table.RadialMenu.RadialMenuItemForeground = factory.GetColor(0x535F74);
+            table.RadialMenu.RadialMenuItemDisabledForeground = factory.GetColor(0x8D8D8D);
+            table.RadialMenu.RadialMenuItemMouseOverBackground = Color.FromArgb(72, table.RadialMenu.RadialMenuItemForeground);
+            table.RadialMenu.RadialMenuItemMouseOverForeground = factory.GetColor(0x535F74);
+            table.RadialMenu.RadialMenuMouseOverBorder = Color.FromArgb(200, table.RadialMenu.RadialMenuBorder);
+            #endregion
+
+            #region StepItem
+            table.StepItem.Default = new OfficeStepItemStateColorTable(new Color[]{
+                    factory.GetColor(0xCAD3E2), 
+                    factory.GetColor(0xAEB9CD)
+                    },
+                    90,
+                    new float[0],
+                factory.GetColor(0x1B293E),
+                new Color[] {
+                    factory.GetColor(0x8894A8) });
+            table.StepItem.Progress = new OfficeStepItemStateColorTable(new Color[]{
+                    factory.GetColor(0xD8F577), 
+                    factory.GetColor(0x75C300),
+                    factory.GetColor(0x75C300),
+                    factory.GetColor(0xA9E923)
+                    },
+                    90,
+                    new float[] { 0f, .6f, .6f, 1f },
+                Color.Empty,
+                new Color[0]);
+            table.StepItem.MouseOver = new OfficeStepItemStateColorTable(new Color[]{
+                    factory.GetColor(0xFFFCF2), 
+                    factory.GetColor(0xFFF3CF),
+                    factory.GetColor(0xFFECB5), 
+                    factory.GetColor(0xFFECB5)
+                    },
+                    90,
+                    new float[] { 0f, .5f, .5f, 1f },
+                factory.GetColor(0x1B293E),
+                new Color[] {
+                    factory.GetColor(0xE5C365) });
+            table.StepItem.Pressed = new OfficeStepItemStateColorTable(new Color[]{
+                    factory.GetColor(0xFFE8A6), 
+                    factory.GetColor(0xFFE8A6)
+                    },
+                    90,
+                    new float[0],
+                factory.GetColor(0x1B293E),
+                new Color[] {
+                    factory.GetColor(0xE5C365) });
+            #endregion
+
+            #region TokenEditor
+            table.TokenEditor = new TokenEditorColorTable(0x3B5371, 0xF2F8FE, 0x3B5371, 0xBBCEE6, 0xFFFFFF, 0x0072C6);
+            #endregion
+
+            #region Flyout
+            table.Flyout.BorderColor = table.Form.Active.BorderColors[0];
+            #endregion
+
+            #region SideNav
+            table.SideNav.SideNavItem.Default = new SideNavItemStateColorTable(factory.GetColor(0x1B293E));
+            table.SideNav.SideNavItem.MouseOver = new SideNavItemStateColorTable(factory.GetColor(0x1B293E),
+                new Color[]
+                {
+                    factory.GetColor(0xFFFCF2), factory.GetColor(0xFFF3CF), factory.GetColor(0xFFECB5),
+                    factory.GetColor(0xFFECB5)
+                },
+                new Color[] { factory.GetColor(0xE5C365) },
+                0);
+            table.SideNav.SideNavItem.Pressed = new SideNavItemStateColorTable(factory.GetColor(0x1B293E),
+                new Color[]
+                {
+                    factory.GetColor(0xFFE8A6), factory.GetColor(0xFFE8A6)
+                },
+                new Color[] { factory.GetColor(0xE5C365) },
+                0);
+            table.SideNav.SideNavItem.Selected = new SideNavItemStateColorTable(factory.GetColor(0x1B293E),
+                new Color[] { table.Form.BackColor },
+                new Color[] { Color.Empty, factory.GetColor(0x8894A8), Color.Empty, factory.GetColor(0x8894A8) });
+            table.SideNav.BorderColors = new Color[] { factory.GetColor(0x8894A8) };
+            table.SideNav.TitleBackColor = factory.GetColor(0xCAD3E2);
+            table.SideNav.TitleBorderColors = new Color[] { Color.Empty, Color.Empty, Color.Empty, factory.GetColor(0x5E5E5E) };
+            table.SideNav.PanelBackColor = table.Form.BackColor;
+
+            #endregion
+
+            #region TabForm
+            table.TabForm.Active.CaptionText = factory.GetColor(0x1B293E);
+            table.TabForm.Inactive.CaptionText = factory.GetColor(0x1B293E);
+            table.TabForm.Active.CaptionBackColors = new Color[] { factory.GetColor(0xBCC7D8) };
+            table.TabForm.Inactive.CaptionBackColors = new Color[] { factory.GetColor(0xBCC7D8) };
+            table.TabFormItemColorTables.Clear();
+            table.TabFormItemColorTables.Add(TabFormItem.DefaultColorTableKey,
+                Office2007ColorTable.CreateDefaultTabFormItemColorTable(factory,
+                new Color[] { factory.GetColor(0xBBCEE6) },
+                new Color[] { factory.GetColor(0x8894A8) },
+                factory.GetColor(0x1B293E),
+                new Color[] { factory.GetColor(0xCAD3E2)},
+                new Color[] { factory.GetColor(0x8894A8) },
+                factory.GetColor(0x1B293E)
+                ));
+            table.TabFormItemColorTables.Add(TabFormItem.BlueColorTableKey, Office2007ColorTable.CreateBlueTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.YellowColorTableKey, Office2007ColorTable.CreateYellowTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.PurpleColorTableKey, Office2007ColorTable.CreatePurpleTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.CyanColorTableKey, Office2007ColorTable.CreateCyanTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.BlueMistColorTableKey, Office2007ColorTable.CreateBlueMistTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.PurpleMistColorTableKey, Office2007ColorTable.CreatePurpleMistTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.TanColorTableKey, Office2007ColorTable.CreateTanTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.LemonLimeColorTableKey, Office2007ColorTable.CreateLemonLimeTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.AppleColorTableKey, Office2007ColorTable.CreateAppleTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.TealColorTableKey, Office2007ColorTable.CreateTealTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.RedChalkColorTableKey, Office2007ColorTable.CreateRedChalkTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.SilverColorTableKey, Office2007ColorTable.CreateSilverTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.OrangeColorTableKey, Office2007ColorTable.CreateOrangeTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.GreenColorTableKey, Office2007ColorTable.CreateGreenTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.MagentaColorTableKey, Office2007ColorTable.CreateMagentaTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.RedColorTableKey, Office2007ColorTable.CreateRedTabFormItemColorTable(factory));
+            #endregion
+        }
+
+        #region RibbonBar
+        public static Office2007RibbonBarStateColorTable GetRibbonBar(ColorFactory factory)
+        {
+            Office2007RibbonBarStateColorTable rb = new Office2007RibbonBarStateColorTable();
+            rb.TopBackgroundHeight = 0.8f;
+            rb.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x9CAAC1));
+            rb.InnerBorder = new LinearGradientColorTable();
+            rb.TopBackground = new LinearGradientColorTable(factory.GetColor(0xCAD3E2), factory.GetColor(0xAEB9CD));
+            rb.BottomBackground = null; // new LinearGradientColorTable(factory.GetColor(0xE7F1FA), factory.GetColor(0xD8E4F2));
+            rb.TitleBackground = null;// new LinearGradientColorTable(factory.GetColor(0xC2D8F1), factory.GetColor(0xC0D8EF));
+            rb.TitleText = factory.GetColor(0x384E73);
+            return rb;
+        }
+
+        public static Office2007RibbonBarStateColorTable GetRibbonBarMouseOver(ColorFactory factory)
+        {
+            return GetRibbonBar(factory);
+            //Office2007RibbonBarStateColorTable rb = new Office2007RibbonBarStateColorTable();
+            //rb.TopBackgroundHeight = 0.8f;
+            //rb.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xE2ECF7), factory.GetColor(0x93A7C3));
+            //rb.InnerBorder = new LinearGradientColorTable(factory.GetColor(40, 0xFFFFFF), factory.GetColor(120, 0xFFFFFF));
+            //rb.TopBackground = new LinearGradientColorTable(factory.GetColor(0xEFF6FD), factory.GetColor(0xE7F1FA));
+            //rb.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xE7F1FA), factory.GetColor(0xD8E4F2));
+            //rb.TitleBackground = null;// new LinearGradientColorTable(factory.GetColor(0xC2D8F1), factory.GetColor(0xC0D8EF));
+            //rb.TitleText = factory.GetColor(0x384E73);
+            //return rb;
+        }
+
+        public static Office2007RibbonBarStateColorTable GetRibbonBarExpanded(ColorFactory factory)
+        {
+            Office2007RibbonBarStateColorTable rb = new Office2007RibbonBarStateColorTable();
+            rb.TopBackgroundHeight = 0.8f;
+            rb.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xE2ECF7), factory.GetColor(0x93A7C3));
+            rb.InnerBorder = new LinearGradientColorTable(factory.GetColor(40, 0xFFFFFF), factory.GetColor(120, 0xFFFFFF));
+            rb.TopBackground = new LinearGradientColorTable(factory.GetColor(0xEFF6FD), factory.GetColor(0xE7F1FA));
+            rb.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xE7F1FA), factory.GetColor(0xD8E4F2));
+            rb.TitleBackground = null;// new LinearGradientColorTable(factory.GetColor(0xC2D8F1), factory.GetColor(0xC0D8EF));
+            rb.TitleText = Color.Empty;
+            return rb;
+        }
+        #endregion
+
+        #region Buttons
+        public static Office2007ButtonItemColorTable GetButtonItemBlueOrange(ColorFactory factory)
+        {
+            Office2007ButtonItemColorTable cb = new Office2007ButtonItemColorTable();
+            cb.Default = new Office2007ButtonItemStateColorTable();
+            cb.Default.Text = factory.GetColor(0x1B293E);
+
+            // Button mouse over
+            cb.MouseOver = new Office2007ButtonItemStateColorTable();
+            cb.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xE5C365));
+            cb.MouseOver.InnerBorder = LinearGradientColorTable.Empty;
+            cb.MouseOver.TopBackground = new LinearGradientColorTable(factory.GetColor(0xFFFCF2), factory.GetColor(0xFFF3CF));
+            cb.MouseOver.TopBackgroundHighlight = LinearGradientColorTable.Empty; //new LinearGradientColorTable(Color.FromArgb(192, Color.White), Color.Transparent);
+            cb.MouseOver.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xFFECB5), factory.GetColor(0xFFECB5));
+            cb.MouseOver.BottomBackgroundHighlight = LinearGradientColorTable.Empty;
+            cb.MouseOver.SplitBorder = new LinearGradientColorTable(factory.GetColor(0xE5C365), Color.Empty);
+            cb.MouseOver.SplitBorderLight = LinearGradientColorTable.Empty;
+            cb.MouseOver.Text = factory.GetColor(0x1B293E);
+
+            cb.MouseOverSplitInactive = new Office2007ButtonItemStateColorTable();
+            cb.MouseOverSplitInactive.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xEEC757));
+
+            // Pressed
+            cb.Pressed = new Office2007ButtonItemStateColorTable();
+            cb.Pressed.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xE5C365));
+            cb.Pressed.InnerBorder = LinearGradientColorTable.Empty;
+            cb.Pressed.TopBackground = new LinearGradientColorTable(factory.GetColor(0xFFE8A6));
+            cb.Pressed.TopBackgroundHighlight = LinearGradientColorTable.Empty;
+            cb.Pressed.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xFFE8A6));
+            cb.Pressed.BottomBackgroundHighlight = LinearGradientColorTable.Empty;
+            cb.Pressed.SplitBorder = new LinearGradientColorTable(factory.GetColor(0xE5C365), Color.Empty);
+            cb.Pressed.SplitBorderLight = LinearGradientColorTable.Empty;
+            cb.Pressed.Text = factory.GetColor(0x1B293E);
+
+            // Checked
+            cb.Checked = new Office2007ButtonItemStateColorTable();
+            cb.Checked.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xE5C365));
+            cb.Checked.InnerBorder = LinearGradientColorTable.Empty;
+            cb.Checked.TopBackground = new LinearGradientColorTable(factory.GetColor(0xFFEFBB));
+            cb.Checked.TopBackgroundHighlight = LinearGradientColorTable.Empty;
+            cb.Checked.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xFFEFBB));
+            cb.Checked.BottomBackgroundHighlight = LinearGradientColorTable.Empty;
+            cb.Checked.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Checked.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Checked.Text = factory.GetColor(0x1B293E);
+
+            // Expanded button
+            cb.Expanded = new Office2007ButtonItemStateColorTable();
+            cb.Expanded.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xE5C365));
+            cb.Expanded.InnerBorder = LinearGradientColorTable.Empty;
+            cb.Expanded.TopBackground = new LinearGradientColorTable(factory.GetColor(0xFFE8A6));
+            cb.Expanded.TopBackgroundHighlight = LinearGradientColorTable.Empty;
+            cb.Expanded.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xFFE8A6));
+            cb.Expanded.BottomBackgroundHighlight = LinearGradientColorTable.Empty;
+            cb.Expanded.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Expanded.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Expanded.Text = factory.GetColor(0x1B293E);
+
+            SetBlueExpandColors(cb, factory);
+
+            return cb;
+        }
+
+        public static Office2007ButtonItemColorTable GetButtonItemBlueOrangeWithBackground(ColorFactory factory)
+        {
+            Office2007ButtonItemColorTable cb = GetButtonItemBlueOrange(factory);
+
+            cb.Default.TopBackground = new LinearGradientColorTable(factory.GetColor(0xCAD3E2));
+            cb.Default.TopBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xAEB9CD));
+            cb.Default.BottomBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.InnerBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x8894A8));
+            cb.Default.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.MouseOverSplitInactive = cb.Default;
+
+            // Same as default
+            cb.Disabled = new Office2007ButtonItemStateColorTable();
+            cb.Disabled.TopBackground = new LinearGradientColorTable(factory.GetColor(0xBCC7D8));
+            cb.Disabled.TopBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xBCC7D8));
+            cb.Disabled.BottomBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.InnerBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x9CAAC1), Color.Empty);
+            cb.Disabled.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.Text = factory.GetColor(0xA7A7A7);
+            return cb;
+        }
+        public static Office2007ButtonItemColorTable GetButtonItemOffice2007WithBackground(ColorFactory factory)
+        {
+            Office2007ButtonItemColorTable cb = GetButtonItemBlueOrange(factory);
+
+            cb.Default.Text = factory.GetColor(0x262626);
+            cb.Checked.Text = cb.Default.Text;
+            cb.Expanded.Text = cb.Default.Text;
+            cb.MouseOver.Text = cb.Default.Text;
+            cb.MouseOverSplitInactive.Text = cb.Default.Text;
+            cb.Pressed.Text = cb.Default.Text;
+
+            cb.Default.TopBackground = new LinearGradientColorTable(factory.GetColor(0xFFFFFF), factory.GetColor(0xFCFCFD));
+            cb.Default.TopBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xFCFCFD), factory.GetColor(0xEDEFF1));
+            cb.Default.BottomBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.InnerBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xDEDFE0), factory.GetColor(0xA1A2A4));
+            cb.Default.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.MouseOverSplitInactive = cb.Default;
+
+            // Same as default
+            cb.Disabled = new Office2007ButtonItemStateColorTable();
+            cb.Disabled.TopBackground = new LinearGradientColorTable(factory.GetColor(0xEDF5FD));
+            cb.Disabled.TopBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xEDF5FD));
+            cb.Disabled.BottomBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.InnerBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xCEDDED), Color.Empty);
+            cb.Disabled.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.Text = factory.GetColor(0xA7A7A7);
+            return cb;
+        }
+
+        public static Office2007ButtonItemColorTable GetButtonItemBlueBlueWithBackground(ColorFactory factory)
+        {
+            Office2007ButtonItemColorTable cb = Office2007ColorTableFactory.GetButtonItemBlueBlue(factory);
+
+            cb.Default.TopBackground = new LinearGradientColorTable(factory.GetColor(0x3E7DDB), factory.GetColor(0x2B63B5));
+            cb.Default.TopBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.BottomBackground = new LinearGradientColorTable(factory.GetColor(0x2960B3), factory.GetColor(0x2D70CF));
+            cb.Default.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0x4588DE), Color.Transparent);
+            cb.Default.InnerBorder = new LinearGradientColorTable(factory.GetColor(0x4387E4), Color.Empty);
+            cb.Default.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x1F48A1), factory.GetColor(0x244FA6));
+            cb.Default.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.Text = factory.GetColor(0xFFFFFF);
+            cb.MouseOverSplitInactive = cb.Default;
+
+            // Same as default
+            cb.Disabled = new Office2007ButtonItemStateColorTable();
+            cb.Disabled.TopBackground = new LinearGradientColorTable(factory.GetColor(0xEDF5FD));
+            cb.Disabled.TopBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xEDF5FD));
+            cb.Disabled.BottomBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.InnerBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xCEDDED), Color.Empty);
+            cb.Disabled.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.Text = factory.GetColor(0xA7A7A7);
+
+            return cb;
+        }
+
+        public static Office2007ButtonItemColorTable GetButtonItemBlueMagentaWithBackground(ColorFactory factory)
+        {
+            Office2007ButtonItemColorTable cb = Office2007ColorTableFactory.GetButtonItemBlueMagenta(factory);
+            cb.Default.TopBackground = new LinearGradientColorTable(factory.GetColor(0xB50C53), factory.GetColor(0xAF074D));
+            cb.Default.TopBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xAF074D), factory.GetColor(0xE8447F));
+            cb.Default.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xE4417C), Color.Transparent);
+            cb.Default.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xBF185E), factory.GetColor(0xE84683));
+            cb.Default.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x8E023A), factory.GetColor(0x92033D));
+            cb.Default.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.Text = factory.GetColor(0xFFFFFF);
+
+            // Same as default
+            cb.Disabled = new Office2007ButtonItemStateColorTable();
+            cb.Disabled.TopBackground = new LinearGradientColorTable(factory.GetColor(0xEDF5FD));
+            cb.Disabled.TopBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xEDF5FD));
+            cb.Disabled.BottomBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.InnerBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xCEDDED), Color.Empty);
+            cb.Disabled.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.Text = factory.GetColor(0xA7A7A7);
+
+            return cb;
+        }
+
+        public static void SetBlueExpandColors(Office2007ButtonItemColorTable ct, ColorFactory factory)
+        {
+            Color cb = factory.GetColor(0x1B293E);
+            Color cl = Color.Empty;// Color.FromArgb(192, Color.White);
+            ct.Default.ExpandBackground = cb;
+            ct.Default.ExpandLight = cl;
+
+            ct.Checked.ExpandBackground = cb;
+            ct.Checked.ExpandLight = cl;
+
+            //ct.Disabled.ExpandBackground = factory.GetColor(0xB7B7B7);
+            //ct.Disabled.ExpandLight = factory.GetColor(0xEDEDED);
+
+            ct.Expanded.ExpandBackground = cb;
+            ct.Expanded.ExpandLight = cl;
+
+            ct.MouseOver.ExpandBackground = cb;
+            ct.MouseOver.ExpandLight = cl;
+
+            ct.Pressed.ExpandBackground = cb;
+            ct.Pressed.ExpandLight = cl;
+        }
+
+        public static Office2007ButtonItemColorTable GetNavigationPaneButtonItemTable(ColorFactory factory)
+        {
+            Office2007ButtonItemColorTable cb = new Office2007ButtonItemColorTable();
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Orange);
+            cb.Default = new Office2007ButtonItemStateColorTable();
+            cb.Default.Text = factory.GetColor(0x001938);
+
+            // Button mouse over
+            cb.MouseOver = new Office2007ButtonItemStateColorTable();
+            cb.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x859EBF));
+            cb.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xF7FFFF));
+            cb.MouseOver.TopBackground = LinearGradientColorTable.Empty;
+            cb.MouseOver.TopBackgroundHighlight = LinearGradientColorTable.Empty; //new LinearGradientColorTable(Color.FromArgb(192, Color.White), Color.Transparent);
+            cb.MouseOver.BottomBackground = LinearGradientColorTable.Empty;
+            cb.MouseOver.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xE5F1FB), Color.Transparent);
+            cb.MouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xE5F1FC), factory.GetColor(0xC2DBF1));
+            cb.MouseOver.SplitBorder = LinearGradientColorTable.Empty;
+            cb.MouseOver.SplitBorderLight = LinearGradientColorTable.Empty;
+            cb.MouseOver.Text = factory.GetColor(0x001938);
+
+            cb.MouseOverSplitInactive = new Office2007ButtonItemStateColorTable();
+            cb.MouseOverSplitInactive.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xB1BAC4));
+
+            // Pressed
+            cb.Pressed = new Office2007ButtonItemStateColorTable();
+            cb.Pressed.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x758EAB));
+            cb.Pressed.InnerBorder = new LinearGradientColorTable(factory.GetColor(0x8AA3C2));
+            cb.Pressed.TopBackground = LinearGradientColorTable.Empty;
+            cb.Pressed.TopBackgroundHighlight = LinearGradientColorTable.Empty; //new LinearGradientColorTable(Color.FromArgb(192, Color.White), Color.Transparent);
+            cb.Pressed.BottomBackground = LinearGradientColorTable.Empty;
+            cb.Pressed.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0x9FB7D6), Color.Transparent);
+            cb.Pressed.Background = new LinearGradientColorTable(factory.GetColor(0x9FB7D6));
+            cb.Pressed.SplitBorder = LinearGradientColorTable.Empty;
+            cb.Pressed.SplitBorderLight = LinearGradientColorTable.Empty;
+            cb.Pressed.Text = factory.GetColor(0x001938);
+
+            // Checked
+            cb.Checked = new Office2007ButtonItemStateColorTable();
+            cb.Checked.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x859EBF));
+            cb.Checked.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xDDE9F7));
+            cb.Checked.TopBackground = LinearGradientColorTable.Empty;
+            cb.Checked.TopBackgroundHighlight = LinearGradientColorTable.Empty; //new LinearGradientColorTable(Color.FromArgb(192, Color.White), Color.Transparent);
+            cb.Checked.BottomBackground = LinearGradientColorTable.Empty;
+            cb.Checked.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xDCEBF6), Color.Transparent);
+            cb.Checked.Background = new LinearGradientColorTable(factory.GetColor(0xC8DBEF), factory.GetColor(0xB4CBE5));
+            cb.Checked.SplitBorder = LinearGradientColorTable.Empty;
+            cb.Checked.SplitBorderLight = LinearGradientColorTable.Empty;
+            cb.Checked.Text = factory.GetColor(0x001938);
+
+            // Expanded button
+            cb.Expanded = cb.Checked;
+
+            return cb;
+        }
+        #endregion
+
+        #region RibbonTabItem
+        public static Office2007RibbonTabItemColorTable GetRibbonTabItemBlueDefault(ColorFactory factory)
+        {
+            Office2007RibbonTabItemColorTable rt = new Office2007RibbonTabItemColorTable();
+            rt.Default.Text = factory.GetColor(0x1B293E);
+            rt.CornerSize = 2;
+
+            // Selected Tab
+            rt.Selected = new Office2007RibbonTabItemStateColorTable();
+            rt.Selected.Background = new LinearGradientColorTable(factory.GetColor(0xCAD3E2));
+            rt.Selected.BackgroundHighlight = LinearGradientColorTable.Empty;
+            rt.Selected.InnerBorder = LinearGradientColorTable.Empty;
+            rt.Selected.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x8894A8));
+            rt.Selected.Text = factory.GetColor(0x1B293E);
+
+            // Selected Tab Mouse Over
+            rt.SelectedMouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.SelectedMouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xCAD3E2));
+            rt.SelectedMouseOver.BackgroundHighlight = LinearGradientColorTable.Empty;
+            rt.SelectedMouseOver.InnerBorder = LinearGradientColorTable.Empty;
+            rt.SelectedMouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x8894A8));
+            rt.SelectedMouseOver.Text = factory.GetColor(0x1B293E);
+
+            // Tab Mouse Over
+            rt.MouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.MouseOver.Background = new LinearGradientColorTable(factory.GetColor(48, 0xFFFFFF), factory.GetColor(180, 0xFFFFFF));
+            rt.MouseOver.BackgroundHighlight = LinearGradientColorTable.Empty;
+            rt.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(190, 0xFFFFFF), Color.Empty);
+            rt.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x8894A8), Color.Empty);
+            rt.MouseOver.Text = factory.GetColor(0x1B293E);
+
+            return rt;
+        }
+
+        public static Office2007RibbonTabItemColorTable GetRibbonTabItemBlueMagenta(ColorFactory factory)
+        {
+            Office2007RibbonTabItemColorTable rt = new Office2007RibbonTabItemColorTable();
+            rt.Default.Text = factory.GetColor(0x1B293E);
+            rt.CornerSize = 2;
+
+            // Selected Tab
+            rt.Selected = new Office2007RibbonTabItemStateColorTable();
+            rt.Selected.Background = new LinearGradientColorTable(factory.GetColor(0xCAD3E2));
+            rt.Selected.BackgroundHighlight = LinearGradientColorTable.Empty;
+            rt.Selected.InnerBorder = LinearGradientColorTable.Empty; //new LinearGradientColorTable(factory.GetColor(0xEEF5FD), Color.Transparent);
+            rt.Selected.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xE58ABD), factory.GetColor(0xDE66A6));
+            rt.Selected.Text = factory.GetColor(0x1B293E);
+
+            // Selected Tab Mouse Over
+            rt.SelectedMouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.SelectedMouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xCAD3E2));
+            rt.SelectedMouseOver.BackgroundHighlight = LinearGradientColorTable.Empty;
+            rt.SelectedMouseOver.InnerBorder = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(0xEEF5FD), Color.Transparent);
+            rt.SelectedMouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xE58ABD), factory.GetColor(0xDE66A6));
+            rt.SelectedMouseOver.Text = factory.GetColor(0x1B293E);
+
+            // Tab Mouse Over
+            rt.MouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.MouseOver.Background = new LinearGradientColorTable(factory.GetColor(48, 0xE33991), factory.GetColor(180, 0xFFFFFF));
+            rt.MouseOver.BackgroundHighlight = LinearGradientColorTable.Empty;
+            rt.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(190, 0xFAD8F0), Color.Empty);
+            rt.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xE33991), Color.Empty);
+            rt.MouseOver.Text = factory.GetColor(0x1B293E);
+
+            return rt;
+        }
+
+        public static Office2007RibbonTabItemColorTable GetRibbonTabItemBlueGreen(ColorFactory factory)
+        {
+            Office2007RibbonTabItemColorTable rt = new Office2007RibbonTabItemColorTable();
+            rt.Default.Text = factory.GetColor(0x1B293E);
+            rt.CornerSize = 2;
+
+            // Selected Tab
+            rt.Selected = new Office2007RibbonTabItemStateColorTable();
+            rt.Selected.Background = new LinearGradientColorTable(factory.GetColor(0xCAD3E2));
+            rt.Selected.BackgroundHighlight = LinearGradientColorTable.Empty;
+            rt.Selected.InnerBorder = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(0xEEF5FD), Color.Transparent);
+            rt.Selected.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x64BF5F), factory.GetColor(0x53C24E));
+            rt.Selected.Text = factory.GetColor(0x1B293E);
+
+            // Selected Tab Mouse Over
+            rt.SelectedMouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.SelectedMouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xCAD3E2));
+            rt.SelectedMouseOver.BackgroundHighlight = LinearGradientColorTable.Empty;
+            rt.SelectedMouseOver.InnerBorder = LinearGradientColorTable.Empty; //new LinearGradientColorTable(factory.GetColor(0xEEF5FD), Color.Transparent);
+            rt.SelectedMouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x64BF5F), factory.GetColor(0x53C24E));
+            rt.SelectedMouseOver.Text = factory.GetColor(0x1B293E);
+
+            // Tab Mouse Over
+            rt.MouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.MouseOver.Background = new LinearGradientColorTable(factory.GetColor(48, 0x26B023), factory.GetColor(180, 0xFFFFFF));
+            rt.MouseOver.BackgroundHighlight = LinearGradientColorTable.Empty;
+            rt.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(190, 0xC8F8B1), Color.Empty);
+            rt.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x26B023), Color.Empty);
+            rt.MouseOver.Text = factory.GetColor(0x1B293E);
+
+            return rt;
+        }
+
+        public static Office2007RibbonTabItemColorTable GetRibbonTabItemBlueOrange(ColorFactory factory)
+        {
+            Office2007RibbonTabItemColorTable rt = new Office2007RibbonTabItemColorTable();
+            rt.Default.Text = factory.GetColor(0x1B293E);
+            rt.CornerSize = 2;
+
+            // Selected Tab
+            rt.Selected = new Office2007RibbonTabItemStateColorTable();
+            rt.Selected.Background = new LinearGradientColorTable(factory.GetColor(0xCAD3E2));
+            rt.Selected.BackgroundHighlight = LinearGradientColorTable.Empty;
+            rt.Selected.InnerBorder = LinearGradientColorTable.Empty; //new LinearGradientColorTable(factory.GetColor(0xEDF5FD), Color.Transparent);
+            rt.Selected.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xF2A765), factory.GetColor(0xF2A000));
+            rt.Selected.Text = factory.GetColor(0x1B293E);
+
+            // Selected Tab Mouse Over
+            rt.SelectedMouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.SelectedMouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xCAD3E2));
+            rt.SelectedMouseOver.BackgroundHighlight = LinearGradientColorTable.Empty;
+            rt.SelectedMouseOver.InnerBorder = LinearGradientColorTable.Empty; //new LinearGradientColorTable(factory.GetColor(0xEDF5FD), Color.Transparent);
+            rt.SelectedMouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xF2A765), factory.GetColor(0xF2A000));
+            rt.SelectedMouseOver.Text = factory.GetColor(0x1B293E);
+
+            // Tab Mouse Over
+            rt.MouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.MouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xF5D290), factory.GetColor(180, 0xFFFFFF));
+            rt.MouseOver.BackgroundHighlight = LinearGradientColorTable.Empty;
+            rt.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(190, 0xFBE66F), Color.Empty);
+            rt.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xF07D06), factory.GetColor(0xEF7E08));
+            rt.MouseOver.Text = factory.GetColor(0x1B293E);
+
+            return rt;
+        }
+
+        public static Office2007RibbonTabGroupColorTable GetRibbonTabGroupDefault(ColorFactory factory)
+        {
+            Office2007RibbonTabGroupColorTable tg = new Office2007RibbonTabGroupColorTable();
+            tg.Background = new LinearGradientColorTable(factory.GetColor(0x4488E5), Color.Transparent);
+            tg.BackgroundHighlight = LinearGradientColorTable.Empty;
+            tg.Text = factory.GetColor(0x000000);
+            tg.Border = new LinearGradientColorTable(factory.GetColor(0x1F48A1), Color.Transparent);
+
+            return tg;
+        }
+
+        public static Office2007RibbonTabGroupColorTable GetRibbonTabGroupMagenta(ColorFactory factory)
+        {
+            Office2007RibbonTabGroupColorTable tg = new Office2007RibbonTabGroupColorTable();
+            tg.Background = new LinearGradientColorTable(factory.GetColor(0xC55790), Color.Transparent);
+            tg.BackgroundHighlight = LinearGradientColorTable.Empty;
+            tg.Text = factory.GetColor(0x000000);
+            tg.Border = new LinearGradientColorTable(factory.GetColor(0xC90077), Color.Transparent);
+
+            return tg;
+        }
+
+        public static Office2007RibbonTabGroupColorTable GetRibbonTabGroupGreen(ColorFactory factory)
+        {
+            Office2007RibbonTabGroupColorTable tg = new Office2007RibbonTabGroupColorTable();
+            tg.Background = new LinearGradientColorTable(factory.GetColor(192, 0x26B023), Color.Transparent);
+            tg.BackgroundHighlight = LinearGradientColorTable.Empty;
+            tg.Text = factory.GetColor(0x000000);
+            tg.Border = new LinearGradientColorTable(factory.GetColor(0x21941D), Color.Transparent);
+
+            return tg;
+        }
+
+        public static Office2007RibbonTabGroupColorTable GetRibbonTabGroupOrange(ColorFactory factory)
+        {
+            Office2007RibbonTabGroupColorTable tg = new Office2007RibbonTabGroupColorTable();
+            tg.Background = new LinearGradientColorTable(factory.GetColor(192, 0xFF9D00), Color.Transparent);
+            tg.BackgroundHighlight = LinearGradientColorTable.Empty;
+            tg.Text = factory.GetColor(0x000000);
+            tg.Border = new LinearGradientColorTable(factory.GetColor(0xD67519), Color.Transparent);
+
+            return tg;
+        }
+        #endregion
+
+        #region Style Class Creation
+        public static ElementStyle GetFileMenuContainerStyle(Office2007ColorTable table)
+        {
+            ElementStyle style = new ElementStyle();
+            style.Class = ElementStyleClassKeys.RibbonFileMenuContainerKey;
+            Rendering.Office2007MenuColorTable mc = table.Menu;
+
+            style.PaddingBottom = 3;
+            style.PaddingLeft = 0;
+            style.PaddingRight = 0;
+            style.PaddingTop = 22;
+            style.Border = eStyleBorderType.Solid;
+            style.CornerType = eCornerType.Rounded;
+            style.BorderWidth = 1;
+            style.BorderColor = Color.Transparent;
+            style.CornerDiameter = 3;
+            BackgroundColorBlend[] blend = new BackgroundColorBlend[mc.FileBackgroundBlend.Count];
+            mc.FileBackgroundBlend.CopyTo(blend);
+            style.BackColorBlend.Clear();
+            style.BackColorBlend.AddRange(blend);
+            style.BackColorGradientAngle = 90;
+            return style;
+        }
+
+        public static ElementStyle GetTwoColumnMenuContainerStyle(Office2007ColorTable table)
+        {
+            ElementStyle style = new ElementStyle();
+            style.Class = ElementStyleClassKeys.RibbonFileMenuTwoColumnContainerKey;
+            Rendering.Office2007MenuColorTable mc = table.Menu;
+
+            style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Double;
+            style.BorderBottomWidth = 0;
+            style.BorderColor = mc.FileContainerBorder;
+            //style.BorderColorLight = mc.FileContainerBorderLight;
+            style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.None;
+            style.BorderLeftWidth = 0;
+            style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.None;
+            style.BorderRightWidth = 0;
+            style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            style.BorderTopWidth = 1;
+            style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            style.BorderBottomWidth = 1;
+            style.PaddingBottom = 0;
+            style.PaddingLeft = 0;
+            style.PaddingRight = 0;
+            style.PaddingTop = 0;
+
+            return style;
+        }
+
+        public static ElementStyle GetMenuColumnOneContainerStyle(Office2007ColorTable table)
+        {
+            ElementStyle style = new ElementStyle();
+            style.Class = ElementStyleClassKeys.RibbonFileMenuColumnOneContainerKey;
+            Rendering.Office2007MenuColorTable mc = table.Menu;
+
+            style.BackColor = mc.FileColumnOneBackground;
+            style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            style.BorderRightColor = mc.FileColumnOneBorder;
+            style.BorderRightWidth = 1;
+            style.PaddingRight = 1;
+
+            return style;
+        }
+
+        public static ElementStyle GetMenuColumnTwoContainerStyle(Office2007ColorTable table)
+        {
+            ElementStyle style = new ElementStyle();
+            style.Class = ElementStyleClassKeys.RibbonFileMenuColumnTwoContainerKey;
+            Rendering.Office2007MenuColorTable mc = table.Menu;
+
+            style.BackColor = mc.FileColumnTwoBackground;
+
+            return style;
+        }
+
+        public static ElementStyle GetMenuBottomContainer(Office2007ColorTable table)
+        {
+            ElementStyle style = new ElementStyle();
+            style.Class = ElementStyleClassKeys.RibbonFileMenuBottomContainerKey;
+            Rendering.Office2007MenuColorTable mc = table.Menu;
+
+            //BackgroundColorBlend[] blend = new BackgroundColorBlend[mc.FileBottomContainerBackgroundBlend.Count];
+            //mc.FileBottomContainerBackgroundBlend.CopyTo(blend);
+            //style.BackColorBlend.Clear();
+            //style.BackColorBlend.AddRange(blend);
+            //style.BackColorGradientAngle = 90;
+            style.MarginTop = 2;
+            style.MarginRight = 2;
+            return style;
+        }
+        #endregion
+
+        #region Scroll Bar
+        public static void InitializeAppBlueScrollBarColorTable(Office2007ColorTable t, ColorFactory factory)
+        {
+            Office2007ScrollBarStateColorTable sct = t.AppScrollBar.Default;
+            sct.Background = new LinearGradientColorTable(factory.GetColor(0xA9BED5), factory.GetColor(0xBBCEE4), 0);
+            sct.Border = new LinearGradientColorTable(factory.GetColor(0x728EAD), Color.Empty);
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(0x6E7EA6), factory.GetColor(0x424B63), 90);
+            sct.TrackBackground.Clear();
+            sct.TrackBackground.AddRange(new BackgroundColorBlend[] { new BackgroundColorBlend(factory.GetColor(0xB9CEE6),0f), 
+                new BackgroundColorBlend(factory.GetColor(0x91ABC9),1f)});
+            sct.TrackInnerBorder = LinearGradientColorTable.Empty;
+            sct.TrackOuterBorder = new LinearGradientColorTable(factory.GetColor(0x5C7796), Color.Empty);
+            sct.TrackSignBackground = new LinearGradientColorTable(Color.FromArgb(180, factory.GetColor(0x8F8F8F)), Color.FromArgb(64, Color.White));
+
+            // Mouse Over
+            sct = t.AppScrollBar.MouseOver;
+            sct.Background = t.AppScrollBar.Default.Background;
+            sct.Border = t.AppScrollBar.Default.Border;
+            sct.ThumbBackground.Clear();
+            sct.ThumbBackground.AddRange(new BackgroundColorBlend[] { new BackgroundColorBlend(factory.GetColor(0xC1D7F0),0f), 
+                new BackgroundColorBlend(factory.GetColor(0xB4CDE7),0.5f),
+                new BackgroundColorBlend(factory.GetColor(0xA3BEDB),1f)});
+            sct.ThumbInnerBorder = LinearGradientColorTable.Empty;
+            sct.ThumbOuterBorder = new LinearGradientColorTable(factory.GetColor(0x5C7796));
+            sct.ThumbSignBackground = t.AppScrollBar.Default.ThumbSignBackground;
+            sct.TrackBackground.Clear();
+            sct.TrackBackground.AddRange(new BackgroundColorBlend[] { new BackgroundColorBlend(factory.GetColor(0xC1D7F0),0f), 
+                new BackgroundColorBlend(factory.GetColor(0xB4CDE7),0.5f),
+                new BackgroundColorBlend(factory.GetColor(0xA3BEDB),1f)});
+            sct.TrackInnerBorder = LinearGradientColorTable.Empty;
+            sct.TrackOuterBorder = new LinearGradientColorTable(factory.GetColor(0x5C7796), Color.Empty);
+            sct.TrackSignBackground = new LinearGradientColorTable(factory.GetColor(0x8F8F8F));
+
+            // Control Mouse Over
+            sct = t.AppScrollBar.MouseOverControl;
+            sct.Background = t.AppScrollBar.Default.Background;
+            sct.Border = t.AppScrollBar.Default.Border;
+            sct.ThumbBackground.Clear();
+            sct.ThumbBackground.AddRange(new BackgroundColorBlend[] { new BackgroundColorBlend(factory.GetColor(0xB9CEE6),0f), 
+                new BackgroundColorBlend(factory.GetColor(0xA9C1DB),0.5f),
+                new BackgroundColorBlend(factory.GetColor(0x91ABC9),1f)});
+            sct.ThumbInnerBorder = LinearGradientColorTable.Empty;
+            sct.ThumbOuterBorder = new LinearGradientColorTable(factory.GetColor(0x5C7796));
+            sct.ThumbSignBackground = t.AppScrollBar.Default.ThumbSignBackground;
+            sct.TrackBackground.Clear();
+            sct.TrackBackground.AddRange(new BackgroundColorBlend[] { new BackgroundColorBlend(factory.GetColor(0xB9CEE6),0f), 
+                new BackgroundColorBlend(factory.GetColor(0xA9C1DB),0.5f),
+                new BackgroundColorBlend(factory.GetColor(0x91ABC9),1f)});
+            sct.TrackInnerBorder = LinearGradientColorTable.Empty;
+            sct.TrackOuterBorder = new LinearGradientColorTable(factory.GetColor(0x5C7796), Color.Empty);
+            sct.TrackSignBackground = new LinearGradientColorTable(factory.GetColor(0x8F8F8F));
+
+            // Pressed
+            sct = t.AppScrollBar.Pressed;
+            sct.Background = t.AppScrollBar.Default.Background;
+            sct.Border = t.AppScrollBar.Default.Border;
+            sct.ThumbBackground.Clear();
+            sct.ThumbBackground.AddRange(new BackgroundColorBlend[] { 
+                new BackgroundColorBlend(factory.GetColor(0xB0C7DE),0f), 
+                new BackgroundColorBlend(factory.GetColor(0x89A4C1),1f)
+            });
+            sct.ThumbInnerBorder = LinearGradientColorTable.Empty;
+            sct.ThumbOuterBorder = new LinearGradientColorTable(factory.GetColor(0x5C7796));
+            sct.ThumbSignBackground = t.AppScrollBar.Default.ThumbSignBackground;
+            sct.TrackBackground.Clear();
+            sct.TrackBackground.AddRange(new BackgroundColorBlend[] { 
+                new BackgroundColorBlend(factory.GetColor(0xB0C7DE),0f), 
+                new BackgroundColorBlend(factory.GetColor(0x89A4C1),1f)
+            });
+            sct.TrackInnerBorder = LinearGradientColorTable.Empty;
+            sct.TrackOuterBorder = new LinearGradientColorTable(factory.GetColor(0x5C7796), Color.Empty);
+            sct.TrackSignBackground = t.AppScrollBar.Default.TrackSignBackground;
+
+            // Disabled
+            sct = t.AppScrollBar.Disabled;
+            sct.Background = t.AppScrollBar.Default.Background;
+            sct.Border = t.AppScrollBar.Default.Border;
+            sct.ThumbBackground.Clear();
+            sct.ThumbInnerBorder = new LinearGradientColorTable();
+            sct.ThumbOuterBorder = new LinearGradientColorTable();
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(0xBFCFF7), factory.GetColor(0x727C94));
+            sct.TrackBackground.Clear();
+            sct.TrackInnerBorder = new LinearGradientColorTable();
+            sct.TrackOuterBorder = new LinearGradientColorTable();
+            sct.TrackSignBackground = new LinearGradientColorTable();
+        }
+
+        public static void InitializeScrollBarColorTable(Office2007ColorTable t, ColorFactory factory)
+        {
+            Office2007ScrollBarStateColorTable sct = t.ScrollBar.Default;
+            sct.Background = new LinearGradientColorTable(factory.GetColor(0xF4F4F4), factory.GetColor(0xFCFCFC), 0);
+            sct.Border = new LinearGradientColorTable(factory.GetColor(0xE6ECF2));
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(0x747576), factory.GetColor(0x454647), 90);
+            sct.TrackBackground.Clear();
+            sct.TrackBackground.AddRange(new BackgroundColorBlend[] { 
+                new BackgroundColorBlend(factory.GetColor(0xF0F4F8),0f), 
+                new BackgroundColorBlend(factory.GetColor(0xEAEEF3),.8f),
+                new BackgroundColorBlend(factory.GetColor(0xE0E4E9),.8f),
+                new BackgroundColorBlend(factory.GetColor(0xD7DBE1),1f)});
+            sct.TrackInnerBorder = LinearGradientColorTable.Empty;
+            sct.TrackOuterBorder = new LinearGradientColorTable(factory.GetColor(0x8A9199), Color.Empty);
+            sct.TrackSignBackground = new LinearGradientColorTable(factory.GetColor(0x7D7D7D));
+
+            // Mouse Over
+            sct = t.ScrollBar.MouseOver;
+            sct.Background = t.ScrollBar.Default.Background;
+            sct.Border = t.ScrollBar.Default.Border;
+            sct.ThumbBackground.Clear();
+            sct.ThumbBackground.AddRange(new BackgroundColorBlend[] { 
+                new BackgroundColorBlend(factory.GetColor(0xFCFDFE),0f), 
+                new BackgroundColorBlend(factory.GetColor(0xF3F6F9),0.8f),
+                new BackgroundColorBlend(factory.GetColor(0xEAEDF1),0.8f),
+                new BackgroundColorBlend(factory.GetColor(0xE4E8EC),1f)});
+            sct.ThumbInnerBorder = new LinearGradientColorTable(factory.GetColor(0xFCFDFE), factory.GetColor(0xF1F3F5));
+            sct.ThumbOuterBorder = new LinearGradientColorTable(factory.GetColor(0x8A9199), Color.Empty);
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(0x747576), factory.GetColor(0x454647), 90);
+            sct.TrackBackground.Clear();
+            sct.TrackBackground.CopyFrom(sct.ThumbBackground);
+            sct.TrackInnerBorder = sct.ThumbInnerBorder;
+            sct.TrackOuterBorder = sct.ThumbOuterBorder;
+            sct.TrackSignBackground = new LinearGradientColorTable(factory.GetColor(0x7D7D7D));
+
+            // Control Mouse Over
+            sct = t.ScrollBar.MouseOverControl;
+            sct.Background = t.ScrollBar.Default.Background;
+            sct.Border = t.ScrollBar.Default.Border;
+            sct.ThumbBackground.Clear();
+            sct.ThumbBackground.CopyFrom(t.ScrollBar.Default.TrackBackground);
+            sct.ThumbInnerBorder = t.ScrollBar.Default.TrackInnerBorder;
+            sct.ThumbOuterBorder = t.ScrollBar.Default.TrackOuterBorder;
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(0x747576), factory.GetColor(0x454647));
+            sct.TrackBackground.Clear();
+            sct.TrackBackground.CopyFrom(t.ScrollBar.Default.TrackBackground);
+            sct.TrackInnerBorder = t.ScrollBar.Default.TrackInnerBorder;
+            sct.TrackOuterBorder = t.ScrollBar.Default.TrackOuterBorder;
+            sct.TrackSignBackground = t.ScrollBar.Default.TrackSignBackground;
+
+            // Pressed
+            sct = t.ScrollBar.Pressed;
+            sct.Background = t.ScrollBar.Default.Background;
+            sct.Border = t.ScrollBar.Default.Border;
+            sct.ThumbBackground.Clear();
+            sct.ThumbBackground.AddRange(new BackgroundColorBlend[] { 
+                new BackgroundColorBlend(factory.GetColor(0xEBEFF3),0f), 
+                new BackgroundColorBlend(factory.GetColor(0xE5E8ED),0.8f),
+                new BackgroundColorBlend(factory.GetColor(0xDADEE3),0.8f),
+                new BackgroundColorBlend(factory.GetColor(0xD0D4DA),1f)});
+            sct.ThumbInnerBorder = LinearGradientColorTable.Empty;
+            sct.ThumbOuterBorder = new LinearGradientColorTable(factory.GetColor(0x8A9199), Color.Empty);
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(0x6E7EA6), factory.GetColor(0x424B63), 90);
+            sct.TrackBackground.Clear();
+            sct.TrackBackground.CopyFrom(sct.ThumbBackground);
+            sct.TrackInnerBorder = LinearGradientColorTable.Empty;
+            sct.TrackOuterBorder = new LinearGradientColorTable(factory.GetColor(0x8A9199), Color.Empty);
+            sct.TrackSignBackground = t.ScrollBar.Default.TrackSignBackground;
+            // Disabled
+            sct = t.ScrollBar.Disabled;
+            sct.Background = t.ScrollBar.Default.Background;
+            sct.Border = t.ScrollBar.Default.Border;
+            sct.ThumbBackground.Clear();
+            sct.ThumbInnerBorder = new LinearGradientColorTable();
+            sct.ThumbOuterBorder = new LinearGradientColorTable();
+            sct.ThumbSignBackground = new LinearGradientColorTable(factory.GetColor(0xBFCFF7), factory.GetColor(0x727C94));
+            sct.TrackBackground.Clear();
+            sct.TrackInnerBorder = new LinearGradientColorTable();
+            sct.TrackOuterBorder = new LinearGradientColorTable();
+            sct.TrackSignBackground = new LinearGradientColorTable();
+        }
+        #endregion
+
+        #region RibbonClientPanel
+
+        public static ElementStyle GetRibbonClientPanelStyle(ColorFactory f, eOffice2010ColorScheme cs)
+        {
+            ElementStyle style = new ElementStyle();
+            style.Class = ElementStyleClassKeys.RibbonClientPanelKey;
+
+            style.BackColorGradientAngle = 90;
+
+            if (cs == eOffice2010ColorScheme.Blue)
+            {
+                style.BackColorBlend.Add(new BackgroundColorBlend(f.GetColor(0xC7DAF0), 0));
+                style.BackColorBlend.Add(new BackgroundColorBlend(f.GetColor(0x9AB3CF), .7f));
+                style.BackColorBlend.Add(new BackgroundColorBlend(f.GetColor(0x85A1C0), 1));
+            }
+            else if (cs == eOffice2010ColorScheme.Silver)
+            {
+                style.BackColorBlend.Add(new BackgroundColorBlend(f.GetColor(0xCDD1D6), 0));
+                style.BackColorBlend.Add(new BackgroundColorBlend(f.GetColor(0xC0C4C8), .7f));
+                style.BackColorBlend.Add(new BackgroundColorBlend(f.GetColor(0xBABEC2), 1));
+            }
+            else if (cs == eOffice2010ColorScheme.Black)
+            {
+                style.BackColorBlend.Add(new BackgroundColorBlend(f.GetColor(0x6F6F6F), 0));
+                style.BackColorBlend.Add(new BackgroundColorBlend(f.GetColor(0x4F4F4F), .7f));
+                style.BackColorBlend.Add(new BackgroundColorBlend(f.GetColor(0x3F3F3F), 1));
+            }
+
+            return style;
+        }
+        #endregion
+
+        #region Backstage Buttons
+        public static Office2007ButtonItemColorTable GetButtonItemBackstageDefault(ColorFactory factory)
+        {
+            Office2007ButtonItemColorTable cb = new Office2007ButtonItemColorTable();
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Blue);
+            cb.Default = new Office2007ButtonItemStateColorTable();
+            cb.Default.Text = factory.GetColor(0x000000);
+
+            // Button mouse over
+            cb.MouseOver = new Office2007ButtonItemStateColorTable();
+            cb.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x527DE0));
+            cb.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(135, 0xFFFFFF));
+            cb.MouseOver.TopBackground = new LinearGradientColorTable(factory.GetColor(32, 0x007FFF));
+            cb.MouseOver.TopBackgroundHighlight = LinearGradientColorTable.Empty; //new LinearGradientColorTable(Color.FromArgb(192, Color.White), Color.Transparent);
+            cb.MouseOver.BottomBackground = new LinearGradientColorTable(factory.GetColor(32, 0x007FFF));
+            cb.MouseOver.BottomBackgroundHighlight = LinearGradientColorTable.Empty;
+            cb.MouseOver.SplitBorder = new LinearGradientColorTable(factory.GetColor(0x527DE0), Color.Empty);
+            cb.MouseOver.SplitBorderLight = new LinearGradientColorTable(factory.GetColor(135, 0xFFFFFF), Color.Empty);
+            cb.MouseOver.Text = factory.GetColor(0x000000);
+
+            cb.MouseOverSplitInactive = new Office2007ButtonItemStateColorTable();
+            cb.MouseOverSplitInactive.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x527DE0));
+
+            // Pressed
+            cb.Pressed = new Office2007ButtonItemStateColorTable();
+            cb.Pressed.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x527DE0));
+            cb.Pressed.InnerBorder = new LinearGradientColorTable(factory.GetColor(192, 0xFFFFFF));
+            cb.Pressed.TopBackground = new LinearGradientColorTable(factory.GetColor(32, 0x007FFF));
+            cb.Pressed.TopBackgroundHighlight = LinearGradientColorTable.Empty; //new LinearGradientColorTable(Color.FromArgb(192, Color.White), Color.Transparent);
+            cb.Pressed.BottomBackground = new LinearGradientColorTable(factory.GetColor(32, 0x007FFF));
+            cb.Pressed.BottomBackgroundHighlight = LinearGradientColorTable.Empty;
+            cb.Pressed.SplitBorder = new LinearGradientColorTable(factory.GetColor(0x527DE0), Color.Empty);
+            cb.Pressed.SplitBorderLight = new LinearGradientColorTable(factory.GetColor(135, 0xFFFFFF), Color.Empty);
+            cb.Pressed.Text = factory.GetColor(0x000000);
+
+            // Checked
+            cb.Checked = cb.Pressed;
+
+            // Expanded button
+            cb.Expanded = cb.MouseOver;
+
+            SetBlueExpandColors(cb, factory);
+
+            return cb;
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/Windows7BlueFactory.cs b/PROMS/DotNetBar Source Code/Rendering/Windows7BlueFactory.cs
new file mode 100644
index 00000000..58508be3
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/Windows7BlueFactory.cs	
@@ -0,0 +1,1429 @@
+using System;
+using System.Text;
+using System.Drawing;
+using DevComponents.DotNetBar.Controls;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    /// <summary>
+    /// Represents the Windows 7 blue style color initialization class.
+    /// </summary>
+    public class Windows7BlueFactory
+    {
+        public static void InitializeBlueColorTable(Office2007ColorTable table, ColorFactory factory)
+        {
+            #region RibbonControl Start Images
+            table.RibbonControl.StartButtonDefault = BarFunctions.LoadBitmap("SystemImages.BlankWin7NormalBlue.png");
+            table.RibbonControl.StartButtonMouseOver = BarFunctions.LoadBitmap("SystemImages.BlankWin7HotBlue.png");
+            table.RibbonControl.StartButtonPressed = BarFunctions.LoadBitmap("SystemImages.BlankWin7PressedBlue.png");
+            #endregion
+
+            #region RibbonControl
+            table.RibbonControl.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xBAC9DB), factory.GetColor(0x9FAEC2));
+            table.RibbonControl.InnerBorder = null; // new LinearGradientColorTable(factory.GetColor(0xFBFDFF), factory.GetColor(0xE5F0FB));
+            table.RibbonControl.TabsBackground = new LinearGradientColorTable(factory.GetColor(0xDFE9F5), Color.Empty);
+            table.RibbonControl.TabDividerBorder = factory.GetColor(0xA7BAD1);
+            table.RibbonControl.TabDividerBorderLight = factory.GetColor(0xF4F8FD);
+            table.RibbonControl.CornerSize = 1;
+            table.RibbonControl.PanelTopBackgroundHeight = 0;
+            table.RibbonControl.PanelTopBackground = new LinearGradientColorTable(factory.GetColor(0xF7FBFF), factory.GetColor(0xDCE7F5));
+            table.RibbonControl.PanelBottomBackground = null;// new LinearGradientColorTable(factory.GetColor(0xC9D9ED), factory.GetColor(0xE7F2FF));
+            #endregion
+
+            #region Item Group
+            table.ItemGroup.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xAEBDD0), factory.GetColor(0xB0C0D5));
+            table.ItemGroup.InnerBorder = LinearGradientColorTable.Empty;
+            table.ItemGroup.TopBackground = LinearGradientColorTable.Empty;
+            table.ItemGroup.BottomBackground = LinearGradientColorTable.Empty;
+            table.ItemGroup.ItemGroupDividerDark = Color.Empty;
+            table.ItemGroup.ItemGroupDividerLight = Color.Empty;
+            #endregion
+
+            #region RibbonBar
+            table.RibbonBar.Default = GetRibbonBar(factory);
+            table.RibbonBar.MouseOver = GetRibbonBar(factory); //GetRibbonBarMouseOver(factory);
+            table.RibbonBar.Expanded = Office2007ColorTableFactory.GetRibbonBarBlueExpanded(factory);
+            #endregion
+
+            #region ButtonItem Colors Initialization
+            table.RibbonButtonItemColors.Clear();
+            table.ButtonItemColors.Clear();
+            table.MenuButtonItemColors.Clear();
+            // Orange
+            Office2007ButtonItemColorTable cb = GetButtonItemBlueOrange(factory);
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Orange);
+            table.ButtonItemColors.Add(cb);
+            // Orange with background
+            cb = GetButtonItemBlueOrangeWithBackground(factory);
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.OrangeWithBackground);
+            table.ButtonItemColors.Add(cb);
+            // Blue
+            cb = Office2007ColorTableFactory.GetButtonItemBlueBlue(factory);
+            cb.MouseOverSplitInactive = new Office2007ButtonItemStateColorTable();
+            cb.MouseOverSplitInactive.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xADBDD2));
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Blue);
+            table.ButtonItemColors.Add(cb);
+            // Blue with background
+            cb = Office2007ColorTableFactory.GetButtonItemBlueBlueWithBackground(factory);
+            cb.MouseOverSplitInactive = new Office2007ButtonItemStateColorTable();
+            cb.MouseOverSplitInactive.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xADBDD2));
+            cb.MouseOverSplitInactive = cb.Default;
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.BlueWithBackground);
+            table.ButtonItemColors.Add(cb);
+            // Magenta
+            cb = Office2007ColorTableFactory.GetButtonItemBlueMagenta(factory);
+            cb.MouseOverSplitInactive = new Office2007ButtonItemStateColorTable();
+            cb.MouseOverSplitInactive.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xADBDD2));
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Magenta);
+            table.ButtonItemColors.Add(cb);
+            // Blue with background
+            cb = Office2007ColorTableFactory.GetButtonItemBlueMagentaWithBackground(factory);
+            cb.MouseOverSplitInactive = new Office2007ButtonItemStateColorTable();
+            cb.MouseOverSplitInactive.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xADBDD2));
+            cb.MouseOverSplitInactive = cb.Default;
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.MagentaWithBackground);
+            table.ButtonItemColors.Add(cb);
+
+            cb = Office2007ColorTableFactory.GetButtonItemOffice2007WithBackground(factory);
+            cb.MouseOverSplitInactive = new Office2007ButtonItemStateColorTable();
+            cb.MouseOverSplitInactive.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xADBDD2));
+            cb.MouseOverSplitInactive = cb.Default;
+            cb.Name = Enum.GetName(typeof(eButtonColor), eButtonColor.Office2007WithBackground);
+            table.ButtonItemColors.Add(cb);
+
+            table.ButtonItemColors.Add(ButtonItemStaticColorTables.CreateBlueOrbColorTable(factory));
+            #endregion
+
+            #region RibbonTabItem Colors Initialization
+            table.RibbonTabItemColors.Clear();
+            Office2007RibbonTabItemColorTable rt = GetRibbonTabItemBlueDefault(factory);
+            rt.Name = Enum.GetName(typeof(eRibbonTabColor), eRibbonTabColor.Default);
+            table.RibbonTabItemColors.Add(rt);
+
+            // Magenta
+            rt = GetRibbonTabItemBlueMagenta(factory);
+            rt.CornerSize = 2;
+            rt.Name = Enum.GetName(typeof(eRibbonTabColor), eRibbonTabColor.Magenta);
+            table.RibbonTabItemColors.Add(rt);
+
+            // Green
+            rt = GetRibbonTabItemBlueGreen(factory);
+            rt.CornerSize = 2;
+            rt.Name = Enum.GetName(typeof(eRibbonTabColor), eRibbonTabColor.Green);
+            table.RibbonTabItemColors.Add(rt);
+
+            // Orange
+            rt = GetRibbonTabItemBlueOrange(factory);
+            rt.CornerSize = 2;
+            rt.Name = Enum.GetName(typeof(eRibbonTabColor), eRibbonTabColor.Orange);
+            table.RibbonTabItemColors.Add(rt);
+            #endregion
+
+            #region RibbonTabItemGroup Colors Initialization
+            table.RibbonTabGroupColors.Clear();
+            // Default
+            Office2007RibbonTabGroupColorTable tg = Office2007ColorTableFactory.GetRibbonTabGroupBlueDefault(factory);
+            tg.Name = Enum.GetName(typeof(eRibbonTabGroupColor), eRibbonTabGroupColor.Default);
+            table.RibbonTabGroupColors.Add(tg);
+
+            // Magenta
+            tg = Office2007ColorTableFactory.GetRibbonTabGroupBlueMagenta(factory);
+            tg.Name = Enum.GetName(typeof(eRibbonTabGroupColor), eRibbonTabGroupColor.Magenta);
+            table.RibbonTabGroupColors.Add(tg);
+
+            // Green
+            tg = Office2007ColorTableFactory.GetRibbonTabGroupBlueGreen(factory);
+            tg.Name = Enum.GetName(typeof(eRibbonTabGroupColor), eRibbonTabGroupColor.Green);
+            table.RibbonTabGroupColors.Add(tg);
+
+            // Orange
+            tg = Office2007ColorTableFactory.GetRibbonTabGroupBlueOrange(factory);
+            tg.Name = Enum.GetName(typeof(eRibbonTabGroupColor), eRibbonTabGroupColor.Orange);
+            table.RibbonTabGroupColors.Add(tg);
+            #endregion
+
+            #region Initialize Bar
+            table.Bar.ToolbarTopBackground = new LinearGradientColorTable(factory.GetColor(0xFCFEFF), factory.GetColor(0xE8F1FB));
+            table.Bar.ToolbarBottomBackground = new LinearGradientColorTable(factory.GetColor(0xDCE6F4), factory.GetColor(0xDDE9F7));
+            table.Bar.ToolbarBottomBorder = factory.GetColor(0xA0AFC3);
+            table.Bar.PopupToolbarBackground = new LinearGradientColorTable(factory.GetColor(0xFCFCFC), Color.Empty);
+            int editBorderColor = 0x8492A6;
+            table.Bar.PopupToolbarBorder = factory.GetColor(editBorderColor);
+            table.Bar.StatusBarTopBorder = factory.GetColor(0xA0AFC3);
+            table.Bar.StatusBarTopBorderLight = factory.GetColor(Color.FromArgb(148, Color.White));
+            table.Bar.StatusBarAltBackground.Clear();
+            table.Bar.StatusBarAltBackground.Add(new BackgroundColorBlend(factory.GetColor(0xF7FBFF), 0f));
+            table.Bar.StatusBarAltBackground.Add(new BackgroundColorBlend(factory.GetColor(0xDCE7F5), 1f));
+            #endregion
+
+            #region Menu
+            table.Menu.Background = new LinearGradientColorTable(factory.GetColor(0xFCFCFC), Color.Empty);
+            table.Menu.Border = new LinearGradientColorTable(factory.GetColor(editBorderColor), Color.Empty);
+            table.Menu.Side = new LinearGradientColorTable(factory.GetColor(0xF3F7FB), Color.Empty);
+            table.Menu.SideBorder = new LinearGradientColorTable(factory.GetColor(0xCFDBEB), Color.Empty);
+            table.Menu.SideBorderLight = new LinearGradientColorTable(factory.GetColor(0xFFFFFF), Color.Empty);
+            table.Menu.SideUnused = new LinearGradientColorTable(factory.GetColor(0xE5E5E5), Color.Empty);
+            table.Menu.FileBackgroundBlend.Clear();
+            table.Menu.FileBackgroundBlend.AddRange(new DevComponents.DotNetBar.BackgroundColorBlend[] {
+                new DevComponents.DotNetBar.BackgroundColorBlend(factory.GetColor(0xFCFEFF), 0F),
+                new DevComponents.DotNetBar.BackgroundColorBlend(factory.GetColor(0xE8F1FB), 10F),
+                new DevComponents.DotNetBar.BackgroundColorBlend(factory.GetColor(0xDCE6F4), 10F),
+                new DevComponents.DotNetBar.BackgroundColorBlend(factory.GetColor(0xDDE9F7), 1F)});
+            table.Menu.FileContainerBorder = factory.GetColor(0xABB8C9);
+            table.Menu.FileContainerBorderLight = Color.Transparent;
+            table.Menu.FileColumnOneBackground = factory.GetColor(0xFCFCFC);
+            table.Menu.FileColumnOneBorder = factory.GetColor(0xCFDBEB);
+            table.Menu.FileColumnTwoBackground = factory.GetColor(0xEFF5FA);
+            table.Menu.FileBottomContainerBackgroundBlend.Clear();
+            table.Menu.FileBottomContainerBackgroundBlend.AddRange(new DevComponents.DotNetBar.BackgroundColorBlend[] {
+                new DevComponents.DotNetBar.BackgroundColorBlend(factory.GetColor(0xFAFDFF), 0F),
+                new DevComponents.DotNetBar.BackgroundColorBlend(factory.GetColor(0xE2EAF9), 1F)});
+            #endregion
+
+            #region ComboBox
+            table.ComboBox.Default.Background = factory.GetColor(0xF3F7FC);
+            table.ComboBox.Default.Border = factory.GetColor(0xAABBD2);
+            table.ComboBox.Default.ExpandBackground = new LinearGradientColorTable();
+            table.ComboBox.Default.ExpandBorderInner = new LinearGradientColorTable();
+            table.ComboBox.Default.ExpandBorderOuter = new LinearGradientColorTable();
+            table.ComboBox.Default.ExpandText = factory.GetColor(0x4C607A);
+            table.ComboBox.DefaultStandalone.Background = factory.GetColor(0xFFFFFF);
+            table.ComboBox.DefaultStandalone.Border = factory.GetColor(0x9FAEC2);
+            table.ComboBox.DefaultStandalone.ExpandBackground = new LinearGradientColorTable(factory.GetColor(0xE9F0F7), factory.GetColor(0xD7E1EF), 90);
+            table.ComboBox.DefaultStandalone.ExpandBorderInner = new LinearGradientColorTable(factory.GetColor(0xF4F6FA));
+            table.ComboBox.DefaultStandalone.ExpandBorderOuter = new LinearGradientColorTable(factory.GetColor(0xB6C4D7), Color.Empty, 90);
+            table.ComboBox.DefaultStandalone.ExpandText = factory.GetColor(0x4C607A);
+            table.ComboBox.MouseOver.Background = factory.GetColor(0xFFFFFF);
+            table.ComboBox.MouseOver.Border = factory.GetColor(0x9FAEC2);
+            table.ComboBox.MouseOver.ExpandBackground = new LinearGradientColorTable(factory.GetColor(0xFDE8D1), factory.GetColor(0xFFD168), 90);
+            table.ComboBox.MouseOver.ExpandBorderInner = new LinearGradientColorTable(factory.GetColor(0xFFFFFB), factory.GetColor(0xFFFCF3), 90);
+            table.ComboBox.MouseOver.ExpandBorderOuter = new LinearGradientColorTable(factory.GetColor(0xFFBF13), Color.Empty, 90);
+            table.ComboBox.MouseOver.ExpandText = factory.GetColor(0x4C607A);
+            table.ComboBox.DroppedDown.Background = factory.GetColor(0xFFFFFF);
+            table.ComboBox.DroppedDown.Border = factory.GetColor(0x9FAEC2);
+            table.ComboBox.DroppedDown.ExpandBackground = new LinearGradientColorTable(factory.GetColor(0xE4C9A7), factory.GetColor(0xEFBC61), 90);
+            table.ComboBox.DroppedDown.ExpandBorderInner = new LinearGradientColorTable(factory.GetColor(0xD4C0A9), factory.GetColor(0xEFF1B9), 90);
+            table.ComboBox.DroppedDown.ExpandBorderOuter = new LinearGradientColorTable(factory.GetColor(0xC2923B), Color.Empty, 90);
+            table.ComboBox.DroppedDown.ExpandText = factory.GetColor(0x4C607A);
+            #endregion
+
+            #region Dialog Launcher
+            table.DialogLauncher.Default.DialogLauncher = factory.GetColor(0x6B737D);
+            table.DialogLauncher.Default.DialogLauncherShade = factory.GetColor(172, 0xFFFFFF);
+
+            table.DialogLauncher.MouseOver.DialogLauncher = factory.GetColor(0x6B737D);
+            table.DialogLauncher.MouseOver.DialogLauncherShade = Color.FromArgb(192, factory.GetColor(0xFFFFFF));
+            table.DialogLauncher.MouseOver.TopBackground = new LinearGradientColorTable(factory.GetColor(0xFDEEDE), factory.GetColor(0xFDE0BD));
+            table.DialogLauncher.MouseOver.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xFFD26F), factory.GetColor(0xFFF599));
+            table.DialogLauncher.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFEF9F3), factory.GetColor(0xFFFFF3));
+            table.DialogLauncher.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xFFB700), Color.Empty);
+
+            table.DialogLauncher.Pressed.DialogLauncher = factory.GetColor(0x6B737D);
+            table.DialogLauncher.Pressed.DialogLauncherShade = Color.FromArgb(128, factory.GetColor(0xFFFFFF));
+            table.DialogLauncher.Pressed.TopBackground = new LinearGradientColorTable(factory.GetColor(0xE4C8A5), factory.GetColor(0xEDC891));
+            table.DialogLauncher.Pressed.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xEEBC62), factory.GetColor(0xEEE48B));
+            table.DialogLauncher.Pressed.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xD4BFA8), factory.GetColor(0xEFF1C2));
+            table.DialogLauncher.Pressed.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xC2923B), factory.GetColor(0xC2B462));
+            #endregion
+
+            #region System Button, Form
+            // Default state no background
+            table.SystemButton.Default = new Office2007SystemButtonStateColorTable();
+            table.SystemButton.Default.Foreground = new LinearGradientColorTable(factory.GetColor(0x798DA7), factory.GetColor(0x8BA7CC));
+            table.SystemButton.Default.LightShade = factory.GetColor(0xF8F9FA);
+            table.SystemButton.Default.DarkShade = factory.GetColor(0x656565);
+
+            // Mouse over state
+            table.SystemButton.MouseOver = new Office2007SystemButtonStateColorTable();
+            table.SystemButton.MouseOver.Foreground = new LinearGradientColorTable(factory.GetColor(0x798DA7), factory.GetColor(0x8BA7CC));
+            table.SystemButton.MouseOver.LightShade = factory.GetColor(0xF8F9FA);
+            table.SystemButton.MouseOver.DarkShade = factory.GetColor(0x656565);
+            table.SystemButton.MouseOver.TopBackground = new LinearGradientColorTable(factory.GetColor(0xF5F8FE), factory.GetColor(0xEAF2FF));
+            table.SystemButton.MouseOver.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xD2E4FE), factory.GetColor(0xD1E2FB));
+            table.SystemButton.MouseOver.TopHighlight = new LinearGradientColorTable(factory.GetColor(0xFBFCFF), Color.Transparent);
+            table.SystemButton.MouseOver.BottomHighlight = new LinearGradientColorTable(factory.GetColor(0xFBFCFF), Color.Transparent);
+            table.SystemButton.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xC1D4EE), factory.GetColor(0xAAC4E9));
+            table.SystemButton.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFEFEFF), factory.GetColor(0xE6F4FE));
+
+            // Pressed
+            table.SystemButton.Pressed = new Office2007SystemButtonStateColorTable();
+            table.SystemButton.Pressed.Foreground = new LinearGradientColorTable(factory.GetColor(0x798DA7), factory.GetColor(0x8BA7CC));
+            table.SystemButton.Pressed.LightShade = factory.GetColor(0xF8F9FA);
+            table.SystemButton.Pressed.DarkShade = factory.GetColor(0x656565);
+            table.SystemButton.Pressed.TopBackground = new LinearGradientColorTable(factory.GetColor(0xBAD5F8), factory.GetColor(0x9EC2ED));
+            table.SystemButton.Pressed.TopHighlight = new LinearGradientColorTable(factory.GetColor(0xB8CEE9), Color.Transparent);
+            table.SystemButton.Pressed.BottomBackground = new LinearGradientColorTable(factory.GetColor(0x84B2E9), factory.GetColor(0xAFD6F7));
+            table.SystemButton.Pressed.BottomHighlight = new LinearGradientColorTable(factory.GetColor(0xC6EAFD), Color.Transparent);
+            table.SystemButton.Pressed.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xA1BFE5), factory.GetColor(0xB2CAE7));
+            table.SystemButton.Pressed.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xD3E6FF), factory.GetColor(0xDCE9FB));
+
+            // Form border
+            table.Form.Active.BorderColors = new Color[] {
+                factory.GetColor(0x5A5859),
+                factory.GetColor(0xD4E6F5),
+                factory.GetColor(0xDFE9F5),
+                factory.GetColor(0xDFE9F5),
+                factory.GetColor(0xDFE9F5)
+            };
+
+            table.Form.Inactive.BorderColors = new Color[] {
+                factory.GetColor(0xC0C6CE),
+                factory.GetColor(0xCCD6E2),
+                factory.GetColor(0xDFE9F5),
+                factory.GetColor(0xDFE9F5),
+                factory.GetColor(0xDFE9F5)};
+
+            // Form Caption Active
+            table.Form.Active.CaptionTopBackground = new LinearGradientColorTable(factory.GetColor(0xF7FBFF), factory.GetColor(0xDFE9F5));
+            table.Form.Active.CaptionBottomBackground = new LinearGradientColorTable(factory.GetColor(0xDFE9F5), factory.GetColor(0xDFE9F5));
+            table.Form.Active.CaptionBottomBorder = new Color[] { factory.GetColor(0x9FAEC2), factory.GetColor(0xCEDBEB) };
+            table.Form.Active.CaptionText = factory.GetColor(0x1D221E);
+            table.Form.Active.CaptionTextExtra = factory.GetColor(0x254264);
+
+            // Form Caption Inactive
+            table.Form.Inactive.CaptionTopBackground = new LinearGradientColorTable(factory.GetColor(0xE3E7EC), factory.GetColor(0xDEE5ED));
+            table.Form.Inactive.CaptionBottomBackground = new LinearGradientColorTable(factory.GetColor(0xD8E1EC), factory.GetColor(0xE3E8EF));
+            table.Form.Inactive.CaptionText = factory.GetColor(0xA0A0A0);
+            table.Form.Inactive.CaptionTextExtra = factory.GetColor(0xA0A0A0);
+
+            table.Form.BackColor = factory.GetColor(0xFCFCFC);
+            table.Form.TextColor = factory.GetColor(0x000000);
+            #endregion
+
+            #region Quick Access Toolbar Background
+            table.QuickAccessToolbar.Active.TopBackground = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(0xDEE7F4), factory.GetColor(0xE6EEF9));
+            table.QuickAccessToolbar.Active.BottomBackground = LinearGradientColorTable.Empty; //new LinearGradientColorTable(factory.GetColor(0xDBE7F7), factory.GetColor(0xC9D9EE));
+            table.QuickAccessToolbar.Active.OutterBorderColor = Color.Empty; // factory.GetColor(0xF6F9FC);
+            table.QuickAccessToolbar.Active.MiddleBorderColor = Color.Empty; // factory.GetColor(0x9AB3D5);
+            table.QuickAccessToolbar.Active.InnerBorderColor = Color.Empty; //  factory.GetColor(0xD2E3F9);
+
+            table.QuickAccessToolbar.Inactive.TopBackground = LinearGradientColorTable.Empty; //new LinearGradientColorTable(factory.GetColor(0xE6ECF3), factory.GetColor(0xCED8E6));
+            table.QuickAccessToolbar.Inactive.BottomBackground = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(0xCED8E6), factory.GetColor(0xC8D3E3));
+            table.QuickAccessToolbar.Inactive.OutterBorderColor = Color.Empty; // factory.GetColor(0xF6F9FC);
+            table.QuickAccessToolbar.Inactive.MiddleBorderColor = Color.Empty; // factory.GetColor(0x9AB3D5);
+            table.QuickAccessToolbar.Inactive.InnerBorderColor = Color.Empty;
+
+            table.QuickAccessToolbar.Standalone.TopBackground = new LinearGradientColorTable();
+            table.QuickAccessToolbar.Standalone.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xDFE9F5));
+            table.QuickAccessToolbar.Standalone.OutterBorderColor = factory.GetColor(0xB2BFD2);
+            table.QuickAccessToolbar.Standalone.MiddleBorderColor = Color.Empty;
+            table.QuickAccessToolbar.Standalone.InnerBorderColor = Color.Empty; // factory.GetColor(0xDCE8F7);
+
+            table.QuickAccessToolbar.QatCustomizeMenuLabelBackground = factory.GetColor(0xEBF2F7);
+            table.QuickAccessToolbar.QatCustomizeMenuLabelText = factory.GetColor(0x4C607A);
+
+            table.QuickAccessToolbar.Active.GlassBorder = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(Color.FromArgb(132, Color.Black)), Color.FromArgb(80, Color.Black));
+            table.QuickAccessToolbar.Inactive.GlassBorder = LinearGradientColorTable.Empty; // new LinearGradientColorTable(factory.GetColor(Color.FromArgb(132, Color.Black)), Color.FromArgb(80, Color.Black));
+            #endregion
+
+            #region Tab Colors
+            table.TabControl.Default = new Office2007TabItemStateColorTable();
+            table.TabControl.Default.TopBackground = new LinearGradientColorTable(factory.GetColor(0xD7E6F9), factory.GetColor(0xC7DCF8));
+            table.TabControl.Default.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xB3D0F5), factory.GetColor(0xD7E5F7));
+            table.TabControl.Default.InnerBorder = factory.GetColor(0xF3F7FD);
+            table.TabControl.Default.OuterBorder = factory.GetColor(0x92A5C7);
+            table.TabControl.Default.Text = factory.GetColor(0x4C607A);
+
+            table.TabControl.MouseOver = new Office2007TabItemStateColorTable();
+            table.TabControl.MouseOver.TopBackground = new LinearGradientColorTable(factory.GetColor(0xFFFDEB), factory.GetColor(0xFFECA8));
+            table.TabControl.MouseOver.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xFFDA59), factory.GetColor(0xFFE68D));
+            table.TabControl.MouseOver.InnerBorder = factory.GetColor(0xFFFFFB);
+            table.TabControl.MouseOver.OuterBorder = factory.GetColor(0xB69D73);
+            table.TabControl.MouseOver.Text = factory.GetColor(0x4C607A);
+
+            table.TabControl.Selected = new Office2007TabItemStateColorTable();
+            table.TabControl.Selected.TopBackground = new LinearGradientColorTable(factory.GetColor(Color.White), factory.GetColor(0xFDFDFE));
+            table.TabControl.Selected.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xFDFDFE), factory.GetColor(0xFDFDFE));
+            table.TabControl.Selected.InnerBorder = factory.GetColor(Color.White);
+            table.TabControl.Selected.OuterBorder = factory.GetColor(0x92A5C7);
+            table.TabControl.Selected.Text = factory.GetColor(0x4C607A);
+
+            table.TabControl.TabBackground = new LinearGradientColorTable(factory.GetColor(0xDFE9F5), Color.Empty);
+            table.TabControl.TabPanelBackground = new LinearGradientColorTable(factory.GetColor(0xF7FBFF), Color.Empty);
+            table.TabControl.TabPanelBorder = factory.GetColor(0x92A5C7);
+            #endregion
+
+            #region CheckBoxItem
+            Office2007CheckBoxColorTable chk = table.CheckBoxItem;
+            chk.Default.CheckBackground = new LinearGradientColorTable(factory.GetColor(0xF4F4F4), Color.Empty);
+            chk.Default.CheckBorder = factory.GetColor(0xABC1DE);
+            chk.Default.CheckInnerBackground = new LinearGradientColorTable(Color.FromArgb(192, factory.GetColor(0xA2ACB9)), Color.FromArgb(164, factory.GetColor(0xF6F6F6)));
+            chk.Default.CheckInnerBorder = factory.GetColor(0xA2ACB9);
+            chk.Default.CheckSign = new LinearGradientColorTable(factory.GetColor(0x4A6B96), Color.Empty);
+            chk.Default.Text = factory.GetColor(0x254264);
+
+            chk.MouseOver.CheckBackground = new LinearGradientColorTable(factory.GetColor(0xDEEAFA), Color.Empty);
+            chk.MouseOver.CheckBorder = factory.GetColor(0x5577A3);
+            chk.MouseOver.CheckInnerBackground = new LinearGradientColorTable(Color.FromArgb(192, factory.GetColor(0xFAD57A)), Color.FromArgb(128, factory.GetColor(0xFEF8E7)));
+            chk.MouseOver.CheckInnerBorder = factory.GetColor(0xFAD57A);
+            chk.MouseOver.CheckSign = new LinearGradientColorTable(factory.GetColor(0x4A6B96), Color.Empty);
+            chk.MouseOver.Text = factory.GetColor(0x254264);
+
+            chk.Pressed.CheckBackground = new LinearGradientColorTable(factory.GetColor(0xC1D8F5), Color.Empty);
+            chk.Pressed.CheckBorder = factory.GetColor(0x5577A3);
+            chk.Pressed.CheckInnerBackground = new LinearGradientColorTable(Color.FromArgb(192, factory.GetColor(0xF28926)), Color.FromArgb(164, factory.GetColor(0xFFF4D5)));
+            chk.Pressed.CheckInnerBorder = factory.GetColor(0xF28926);
+            chk.Pressed.CheckSign = new LinearGradientColorTable(factory.GetColor(0x4A6B96), Color.Empty);
+            chk.Pressed.Text = factory.GetColor(0x254264);
+
+            chk.Disabled.CheckBackground = new LinearGradientColorTable(factory.GetColor(0xFFFFFF), Color.Empty);
+            chk.Disabled.CheckBorder = factory.GetColor(0xAEB1B5);
+            chk.Disabled.CheckInnerBackground = new LinearGradientColorTable(Color.FromArgb(192, factory.GetColor(0xE0E2E5)), Color.FromArgb(164, factory.GetColor(0xFBFBFB)));
+            chk.Disabled.CheckInnerBorder = factory.GetColor(0xE0E2E5);
+            chk.Disabled.CheckSign = new LinearGradientColorTable(factory.GetColor(0x8D8D8D), Color.Empty);
+            chk.Disabled.Text = factory.GetColor(0x8D8D8D);
+            #endregion
+
+            #region Scroll Bar Colors
+            Office2007ColorTableFactory.InitializeScrollBarColorTable(table, factory);
+            Office2007ColorTableFactory.InitializeAppBlueScrollBarColorTable(table, factory);
+            #endregion
+
+            #region ProgressBarItem
+            Office2007ProgressBarColorTable pct = table.ProgressBarItem;
+            pct.BackgroundColors = new GradientColorTable(0xC6CBD5, 0xE0E4ED);
+            pct.OuterBorder = factory.GetColor(0xDEE2EC);
+            pct.InnerBorder = factory.GetColor(0x7496C2);
+            pct.Chunk = new GradientColorTable(0x69922A, 0xE7F2D4, 0);
+            pct.ChunkOverlay = new GradientColorTable();
+            pct.ChunkOverlay.LinearGradientAngle = 90;
+            pct.ChunkOverlay.Colors.AddRange(new BackgroundColorBlend[] {
+                new BackgroundColorBlend(Color.FromArgb(192, factory.GetColor(0xEEFFD7)), 0f),
+                new BackgroundColorBlend(Color.FromArgb(128, factory.GetColor(0x8DB254)), .5f),
+                new BackgroundColorBlend(Color.FromArgb(64, factory.GetColor(0x69922B)), .5f),
+                new BackgroundColorBlend(Color.Transparent, 1f),
+            });
+            pct.ChunkShadow = new GradientColorTable(0xB2B9C8, 0xD5DAE5, 0);
+
+            // Paused State
+            pct = table.ProgressBarItemPaused;
+            pct.BackgroundColors = new GradientColorTable(0xC6CBD5, 0xE0E4ED);
+            pct.OuterBorder = factory.GetColor(0xDEE2EC);
+            pct.InnerBorder = factory.GetColor(0x7496C2);
+            pct.Chunk = new GradientColorTable(0xAEA700, 0xFFFDCD, 0);
+            pct.ChunkOverlay = new GradientColorTable();
+            pct.ChunkOverlay.LinearGradientAngle = 90;
+            pct.ChunkOverlay.Colors.AddRange(new BackgroundColorBlend[] {
+                new BackgroundColorBlend(Color.FromArgb(192, factory.GetColor(0xFFFBA3)), 0f),
+                new BackgroundColorBlend(Color.FromArgb(128, factory.GetColor(0xD2CA00)), .5f),
+                new BackgroundColorBlend(Color.FromArgb(64, factory.GetColor(0xFEF400)), .5f),
+                new BackgroundColorBlend(Color.Transparent, 1f),
+            });
+            pct.ChunkShadow = new GradientColorTable(0xB2B9C8, 0xD5DAE5, 0);
+
+            // Error State
+            pct = table.ProgressBarItemError;
+            pct.BackgroundColors = new GradientColorTable(0xC6CBD5, 0xE0E4ED);
+            pct.OuterBorder = factory.GetColor(0xDEE2EC);
+            pct.InnerBorder = factory.GetColor(0x7496C2);
+            pct.Chunk = new GradientColorTable(0xD20000, 0xFFCDCD, 0);
+            pct.ChunkOverlay = new GradientColorTable();
+            pct.ChunkOverlay.LinearGradientAngle = 90;
+            pct.ChunkOverlay.Colors.AddRange(new BackgroundColorBlend[] {
+                new BackgroundColorBlend(Color.FromArgb(192, factory.GetColor(0xFF8F8F)), 0f),
+                new BackgroundColorBlend(Color.FromArgb(128, factory.GetColor(0xD20000)), .5f),
+                new BackgroundColorBlend(Color.FromArgb(64, factory.GetColor(0xFE0000)), .5f),
+                new BackgroundColorBlend(Color.Transparent, 1f),
+            });
+            pct.ChunkShadow = new GradientColorTable(0xB2B9C8, 0xD5DAE5, 0);
+            #endregion
+
+            #region Gallery
+            Office2007GalleryColorTable gallery = table.Gallery;
+            gallery.GroupLabelBackground = factory.GetColor(0xDDE7EE);
+            gallery.GroupLabelText = factory.GetColor(0x00156E);
+            gallery.GroupLabelBorder = factory.GetColor(0xC5C5C5);
+            #endregion
+
+            #region Legacy Colors
+            table.LegacyColors.BarBackground = factory.GetColor(0xF6FBFF);
+            table.LegacyColors.BarBackground2 = factory.GetColor(0xDCE6F4);
+            table.LegacyColors.BarStripeColor = factory.GetColor(0x9FAEC2);
+            table.LegacyColors.BarCaptionBackground = factory.GetColor(0x8C97A7);
+            table.LegacyColors.BarCaptionBackground2 = Color.Empty;
+            table.LegacyColors.BarCaptionInactiveBackground = factory.GetColor(0xEFF6FD);
+            table.LegacyColors.BarCaptionInactiveBackground2 = Color.Empty;
+            table.LegacyColors.BarCaptionInactiveText = factory.GetColor(0x083772);
+            table.LegacyColors.BarCaptionText = factory.GetColor(0xFFFFFF);
+            table.LegacyColors.BarFloatingBorder = factory.GetColor(0x3764A0);
+            table.LegacyColors.BarPopupBackground = factory.GetColor(0xF6F6F6);
+            table.LegacyColors.BarPopupBorder = factory.GetColor(editBorderColor);
+            table.LegacyColors.ItemBackground = Color.Empty;
+            table.LegacyColors.ItemBackground2 = Color.Empty;
+            table.LegacyColors.ItemCheckedBackground = factory.GetColor(0xFCD578);
+            table.LegacyColors.ItemCheckedBackground2 = factory.GetColor(0xFBC84F);
+            table.LegacyColors.ItemCheckedBorder = factory.GetColor(0xBB5503);
+            table.LegacyColors.ItemCheckedText = factory.GetColor(0x254264);
+            table.LegacyColors.ItemDisabledBackground = Color.Empty;
+            table.LegacyColors.ItemDisabledText = factory.GetColor(0x8D8D8D);
+            table.LegacyColors.ItemExpandedShadow = Color.Empty;
+            table.LegacyColors.ItemExpandedBackground = factory.GetColor(0xE3EFFE);
+            table.LegacyColors.ItemExpandedBackground2 = factory.GetColor(0x99BFF0);
+            table.LegacyColors.ItemExpandedText = factory.GetColor(0x254264);
+            table.LegacyColors.ItemHotBackground = factory.GetColor(0xFFF5CC);
+            table.LegacyColors.ItemHotBackground2 = factory.GetColor(0xFFDB75);
+            table.LegacyColors.ItemHotBorder = factory.GetColor(0xFFBD69);
+            table.LegacyColors.ItemHotText = factory.GetColor(0x254264);
+            table.LegacyColors.ItemPressedBackground = factory.GetColor(0xFC973D);
+            table.LegacyColors.ItemPressedBackground2 = factory.GetColor(0xFFB85E);
+            table.LegacyColors.ItemPressedBorder = factory.GetColor(0xFB8C3C);
+            table.LegacyColors.ItemPressedText = factory.GetColor(0x254264);
+            table.LegacyColors.ItemSeparator = factory.GetColor(160, 0x505050);
+            table.LegacyColors.ItemSeparatorShade = Color.FromArgb(96, factory.GetColor(0xFFFFFF));
+            table.LegacyColors.ItemText = factory.GetColor(0x254264); // SystemColors.ControlTet;
+            table.LegacyColors.MenuBackground = factory.GetColor(0xF6F6F6);
+            table.LegacyColors.MenuBackground2 = Color.Empty; // Color.White;
+            table.LegacyColors.MenuBarBackground = factory.GetColor(0xBFDBFF);
+            table.LegacyColors.MenuBorder = factory.GetColor(editBorderColor);
+            table.LegacyColors.ItemExpandedBorder = table.LegacyColors.MenuBorder;
+            table.LegacyColors.MenuSide = factory.GetColor(0xE9EEEE);
+            table.LegacyColors.MenuSide2 = Color.Empty; // factory.GetColor(0xDDE0E8);
+            table.LegacyColors.MenuUnusedBackground = table.LegacyColors.MenuBackground;
+            table.LegacyColors.MenuUnusedSide = factory.GetColor(0xDADADA);
+            table.LegacyColors.MenuUnusedSide2 = Color.Empty;// System.Windows.Forms.ControlPaint.Light(table.LegacyColors.MenuSide2);
+            table.LegacyColors.ItemDesignTimeBorder = Color.Black;
+            table.LegacyColors.BarDockedBorder = factory.GetColor(0x4C607A);
+            table.LegacyColors.DockSiteBackColor = factory.GetColor(0xC7D1E0);
+            table.LegacyColors.DockSiteBackColor2 = Color.Empty;
+            table.LegacyColors.CustomizeBackground = factory.GetColor(0xCAD4E3);
+            table.LegacyColors.CustomizeBackground2 = factory.GetColor(0x919FB4);
+            table.LegacyColors.CustomizeText = factory.GetColor(0x4C607A);
+            table.LegacyColors.PanelBackground = factory.GetColor(0xF7FBFF);
+            table.LegacyColors.PanelBackground2 = factory.GetColor(0xDCE7F5);
+            table.LegacyColors.PanelText = factory.GetColor(0x254264);
+            table.LegacyColors.PanelBorder = factory.GetColor(editBorderColor);
+            table.LegacyColors.ExplorerBarBackground = factory.GetColor(0xC4C8D4);
+            table.LegacyColors.ExplorerBarBackground2 = factory.GetColor(0xB1B3C8);
+            table.LegacyColors.SplitterBackground = table.LegacyColors.PanelBackground;
+            table.LegacyColors.SplitterBackground2 = table.LegacyColors.PanelBackground2;
+            table.LegacyColors.SplitterText = table.LegacyColors.PanelText;
+            table.LegacyColors.SplitterBorder = table.LegacyColors.PanelBorder;
+            #endregion
+
+            #region Navigation Pane
+            table.NavigationPane.ButtonBackground = new GradientColorTable();
+            table.NavigationPane.ButtonBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xEFF6FD), 0));
+            table.NavigationPane.ButtonBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xE8F1FB), .4f));
+            table.NavigationPane.ButtonBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xDCE6F4), .4f));
+            table.NavigationPane.ButtonBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xDDE9F7), 1));
+            #endregion
+
+            #region SuperTooltip
+            table.SuperTooltip.BackgroundColors = new LinearGradientColorTable(factory.GetColor(0xFFFFFF), factory.GetColor(0xC9D9EF));
+            table.SuperTooltip.TextColor = factory.GetColor(0x4C4C4C);
+            #endregion
+
+            #region Slider
+            Office2007SliderColorTable sl = table.Slider;
+            sl.Default.LabelColor = factory.GetColor(0x0A207D);
+            sl.Default.SliderLabelColor = factory.GetColor(0x254264);
+            sl.Default.PartBackground = new GradientColorTable();
+            sl.Default.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFFFFFF), 0));
+            sl.Default.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xF1F6FC), .15f));
+            sl.Default.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xAEC9EE), .5f));
+            sl.Default.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0x6A98D0), .5f));
+            sl.Default.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFFFFFF), .85f));
+            sl.Default.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFFFFFF), 1f));
+            sl.Default.PartBorderColor = factory.GetColor(0x2F578D);
+            sl.Default.PartBorderLightColor = Color.FromArgb(96, factory.GetColor(0xFFFFFF));
+            sl.Default.PartForeColor = factory.GetColor(0x566375);
+            sl.Default.PartForeLightColor = Color.FromArgb(168, factory.GetColor(0xE7F0F9));
+            sl.Default.TrackLineColor = factory.GetColor(0x7496C2);
+            sl.Default.TrackLineLightColor = factory.GetColor(0xDEE2EC);
+
+            sl.MouseOver.LabelColor = factory.GetColor(0x092061);
+            sl.MouseOver.SliderLabelColor = factory.GetColor(0x254264);
+            sl.MouseOver.PartBackground = new GradientColorTable();
+            sl.MouseOver.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFFFFFF), 0));
+            sl.MouseOver.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFFFDF5), .2f));
+            sl.MouseOver.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFFDF83), .5f));
+            sl.MouseOver.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xDDA70D), .5f));
+            sl.MouseOver.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFFF4CE), .85f));
+            sl.MouseOver.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFFF4CE), 1f));
+            sl.MouseOver.PartBorderColor = factory.GetColor(0x2F578D);
+            sl.MouseOver.PartBorderLightColor = Color.FromArgb(96, factory.GetColor(0xFFFFFF));
+            sl.MouseOver.PartForeColor = factory.GetColor(0x67624A);
+            sl.MouseOver.PartForeLightColor = Color.FromArgb(168, factory.GetColor(0xE7F0F9));
+            sl.MouseOver.TrackLineColor = factory.GetColor(0x7496C2);
+            sl.MouseOver.TrackLineLightColor = factory.GetColor(0xDEE2EC);
+
+            sl.Pressed.LabelColor = factory.GetColor(0x092061);
+            sl.Pressed.SliderLabelColor = factory.GetColor(0x254264);
+            sl.Pressed.PartBackground = new GradientColorTable();
+            sl.Pressed.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xDB7518), 0));
+            sl.Pressed.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xF7902F), .2f));
+            sl.Pressed.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xF9C18B), .5f));
+            sl.Pressed.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xED7400), .5f));
+            sl.Pressed.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFFC188), .85f));
+            sl.Pressed.PartBackground.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xF2D2B5), 1f));
+            sl.Pressed.PartBorderColor = factory.GetColor(0x2F578D);
+            sl.Pressed.PartBorderLightColor = Color.FromArgb(96, factory.GetColor(0xFFFFFF));
+            sl.Pressed.PartForeColor = factory.GetColor(0x67513E);
+            sl.Pressed.PartForeLightColor = Color.FromArgb(168, factory.GetColor(0xE7F0F9));
+            sl.Pressed.TrackLineColor = factory.GetColor(0x7496C2);
+            sl.Pressed.TrackLineLightColor = factory.GetColor(0xDEE2EC);
+
+            ColorBlendFactory df = new ColorBlendFactory(ColorScheme.GetColor(0xCFCFCF));
+            sl.Disabled.LabelColor = factory.GetColor(0x8D8D8D);
+            sl.Disabled.SliderLabelColor = factory.GetColor(0x8D8D8D);
+            sl.Disabled.PartBackground = new GradientColorTable();
+            foreach (BackgroundColorBlend b in sl.Default.PartBackground.Colors)
+                sl.Disabled.PartBackground.Colors.Add(new BackgroundColorBlend(df.GetColor(b.Color), b.Position));
+            sl.Disabled.PartBorderColor = df.GetColor(sl.Default.PartBorderColor);
+            sl.Disabled.PartBorderLightColor = df.GetColor(sl.Default.PartBorderLightColor);
+            sl.Disabled.PartForeColor = df.GetColor(sl.Default.PartForeColor);
+            sl.Disabled.PartForeLightColor = df.GetColor(sl.Default.PartForeLightColor);
+            sl.Disabled.TrackLineColor = df.GetColor(sl.Default.TrackLineColor);
+            sl.Disabled.TrackLineLightColor = df.GetColor(sl.Default.TrackLineLightColor);
+            #endregion
+
+            #region RangeSlider
+            Office2007ColorTable.InitRangeSlider(table, factory);
+            #endregion
+
+            #region ListViewEx
+            table.ListViewEx.Border = factory.GetColor(editBorderColor);
+            table.ListViewEx.ColumnBackground = new LinearGradientColorTable(factory.GetColor(0xFFFFFF), factory.GetColor(0xC4DDFF));
+            table.ListViewEx.ColumnSeparator = factory.GetColor(0x9AC6FF);
+            table.ListViewEx.ColumnForeColor = factory.GetColor(0x254264);
+            table.ListViewEx.SelectionBackground = new LinearGradientColorTable(factory.GetColor(0xA7CDF0), Color.Empty);
+            table.ListViewEx.SelectionBorder = factory.GetColor(0xE3EFFF);
+            #endregion
+
+            #region DataGridView
+            table.DataGridView.ColumnHeaderNormalBorder = factory.GetColor(0x9EB6CE);
+            table.DataGridView.ColumnHeaderNormalBackground = new LinearGradientColorTable(factory.GetColor(0xF9FCFD), factory.GetColor(0xD3DBE9), 90);
+            table.DataGridView.ColumnHeaderSelectedBackground = new LinearGradientColorTable(factory.GetColor(0xF9D99F), factory.GetColor(0xF1C15F), 90);
+            table.DataGridView.ColumnHeaderSelectedBorder = factory.GetColor(0xF29536);
+            table.DataGridView.ColumnHeaderSelectedMouseOverBackground = new LinearGradientColorTable(factory.GetColor(0xFFD58D), factory.GetColor(0xF2923A), 90);
+            table.DataGridView.ColumnHeaderSelectedMouseOverBorder = factory.GetColor(0xF29536);
+            table.DataGridView.ColumnHeaderMouseOverBackground = new LinearGradientColorTable(factory.GetColor(0xDFE2E4), factory.GetColor(0xBCC5D2), 90);
+            table.DataGridView.ColumnHeaderMouseOverBorder = factory.GetColor(0x879FB7);
+            table.DataGridView.ColumnHeaderPressedBackground = new LinearGradientColorTable(factory.GetColor(0xBCC5D2), factory.GetColor(0xDFE2E4), 90);
+            table.DataGridView.ColumnHeaderPressedBorder = factory.GetColor(0xFFFFFF);
+
+            table.DataGridView.RowNormalBackground = new LinearGradientColorTable(factory.GetColor(0xE4ECF7));
+            table.DataGridView.RowNormalBorder = factory.GetColor(0x9EB6CE);
+            table.DataGridView.RowSelectedBackground = new LinearGradientColorTable(factory.GetColor(0xFFD58D));
+            table.DataGridView.RowSelectedBorder = factory.GetColor(0xF29536);
+            table.DataGridView.RowSelectedMouseOverBackground = new LinearGradientColorTable(factory.GetColor(0xF1C05C));
+            table.DataGridView.RowSelectedMouseOverBorder = factory.GetColor(0xF29536);
+            table.DataGridView.RowMouseOverBackground = new LinearGradientColorTable(factory.GetColor(0xF1C05C));
+            table.DataGridView.RowMouseOverBorder = factory.GetColor(0xF29536);
+            table.DataGridView.RowPressedBackground = new LinearGradientColorTable(factory.GetColor(0xBBC4D1));
+            table.DataGridView.RowPressedBorder = factory.GetColor(0xFFFFFF);
+
+            table.DataGridView.GridColor = factory.GetColor(0xD0D7E5);
+
+            table.DataGridView.SelectorBackground = new LinearGradientColorTable(factory.GetColor(0xA9C4E9));
+            table.DataGridView.SelectorBorder = factory.GetColor(0x9EB6CE);
+            table.DataGridView.SelectorBorderDark = factory.GetColor(0xB0CFF7);
+            table.DataGridView.SelectorBorderLight = factory.GetColor(0xD5E4F2);
+            table.DataGridView.SelectorSign = new LinearGradientColorTable(factory.GetColor(0xF9FAFB), factory.GetColor(0xD7DAE2));
+
+            table.DataGridView.SelectorMouseOverBackground = new LinearGradientColorTable(factory.GetColor(0x8BA0B5));
+            table.DataGridView.SelectorMouseOverBorder = factory.GetColor(0x9EB6CE);
+            table.DataGridView.SelectorMouseOverBorderDark = factory.GetColor(0xB0CFF7);
+            table.DataGridView.SelectorMouseOverBorderLight = factory.GetColor(0xD5E4F2);
+            table.DataGridView.SelectorMouseOverSign = new LinearGradientColorTable(factory.GetColor(0xF9FAFB), factory.GetColor(0xD7DAE2));
+            #endregion
+
+            #region SideBar
+            table.SideBar.Background = new LinearGradientColorTable(factory.GetColor(Color.White));
+            table.SideBar.Border = factory.GetColor(editBorderColor);
+            table.SideBar.SideBarPanelItemText = factory.GetColor(0x254264);
+            table.SideBar.SideBarPanelItemDefault = new GradientColorTable();
+            table.SideBar.SideBarPanelItemDefault.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xF9FCFD), 0));
+            table.SideBar.SideBarPanelItemDefault.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xE1EDF9), .4f));
+            table.SideBar.SideBarPanelItemDefault.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xD5E1F2), .4f));
+            table.SideBar.SideBarPanelItemDefault.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xD6E5F6), 1));
+            // Expanded
+            table.SideBar.SideBarPanelItemExpanded = new GradientColorTable();
+            table.SideBar.SideBarPanelItemExpanded.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFBDBB5), 0));
+            table.SideBar.SideBarPanelItemExpanded.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFEC778), .4f));
+            table.SideBar.SideBarPanelItemExpanded.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFEB456), .4f));
+            table.SideBar.SideBarPanelItemExpanded.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFDEB9F), 1));
+            // MouseOver
+            table.SideBar.SideBarPanelItemMouseOver = new GradientColorTable();
+            table.SideBar.SideBarPanelItemMouseOver.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFFFCD9), 0));
+            table.SideBar.SideBarPanelItemMouseOver.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFFE78D), .4f));
+            table.SideBar.SideBarPanelItemMouseOver.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFFD748), .4f));
+            table.SideBar.SideBarPanelItemMouseOver.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFFE793), 1));
+            // Pressed
+            table.SideBar.SideBarPanelItemPressed = new GradientColorTable();
+            table.SideBar.SideBarPanelItemPressed.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xF8B869), 0));
+            table.SideBar.SideBarPanelItemPressed.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFDA361), .4f));
+            table.SideBar.SideBarPanelItemPressed.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFB8A3C), .4f));
+            table.SideBar.SideBarPanelItemPressed.Colors.Add(new BackgroundColorBlend(factory.GetColor(0xFEBB60), 1));
+            #endregion
+
+            #region AdvTree
+#if !NOTREE
+            table.AdvTree = new DevComponents.AdvTree.Display.TreeColorTable();
+            DevComponents.AdvTree.Display.ColorTableInitializer.InitOffice2007Blue(table.AdvTree, factory);
+#endif
+            #endregion
+
+            #region CrumbBar
+            table.CrumbBarItemView = new CrumbBarItemViewColorTable();
+            CrumbBarItemViewStateColorTable crumbBarViewTable = new CrumbBarItemViewStateColorTable();
+            table.CrumbBarItemView.Default = crumbBarViewTable;
+            crumbBarViewTable.Foreground = factory.GetColor(0x254264);
+            crumbBarViewTable = new CrumbBarItemViewStateColorTable();
+            table.CrumbBarItemView.MouseOver = crumbBarViewTable;
+            crumbBarViewTable.Foreground = factory.GetColor(0x254264);
+            crumbBarViewTable.Background = new BackgroundColorBlendCollection();
+            crumbBarViewTable.Background.AddRange(new BackgroundColorBlend[]{
+                new BackgroundColorBlend(factory.GetColor("FFFCD9"), 0f),
+                new BackgroundColorBlend(factory.GetColor("FFE78D"), .4f),
+                new BackgroundColorBlend(factory.GetColor("FFD748"), .4f),
+                new BackgroundColorBlend(factory.GetColor("FFE793"), 1f)});
+            crumbBarViewTable.Border = factory.GetColor("FFB8A98E");
+            crumbBarViewTable.BorderLight = factory.GetColor("90FFFFFF");
+            crumbBarViewTable = new CrumbBarItemViewStateColorTable();
+            table.CrumbBarItemView.MouseOverInactive = crumbBarViewTable;
+            crumbBarViewTable.Foreground = factory.GetColor(0x254264);
+            crumbBarViewTable.Background = new BackgroundColorBlendCollection();
+            crumbBarViewTable.Background.AddRange(new BackgroundColorBlend[]{
+                new BackgroundColorBlend(factory.GetColor("FFFFFDEC"), 0f),
+                new BackgroundColorBlend(factory.GetColor("FFFFF4CA"), .4f),
+                new BackgroundColorBlend(factory.GetColor("FFFFEBA6"), .4f),
+                new BackgroundColorBlend(factory.GetColor("FFFFF2C5"), 1f)});
+            crumbBarViewTable.Border = factory.GetColor("FF8E8F8F");
+            crumbBarViewTable.BorderLight = factory.GetColor("90FFFFFF");
+            crumbBarViewTable = new CrumbBarItemViewStateColorTable();
+            table.CrumbBarItemView.Pressed = crumbBarViewTable;
+            crumbBarViewTable.Foreground = factory.GetColor(0x254264);
+            crumbBarViewTable.Background = new BackgroundColorBlendCollection();
+            crumbBarViewTable.Background.AddRange(new BackgroundColorBlend[]{
+                new BackgroundColorBlend(factory.GetColor("FFC59B61"), 0f),
+                new BackgroundColorBlend(factory.GetColor("FFEEB469"), .1f),
+                new BackgroundColorBlend(factory.GetColor("FFFCA060"), .6f),
+                new BackgroundColorBlend(factory.GetColor("FFFB8E3D"), .6f),
+                new BackgroundColorBlend(factory.GetColor("FFFEBB60"), 1f)});
+            crumbBarViewTable.Border = factory.GetColor("FF8B7654");
+            crumbBarViewTable.BorderLight = factory.GetColor("408B7654");
+
+            #endregion
+
+            #region WarningBox
+            table.WarningBox.BackColor = factory.GetColor(0xFCFCFC);
+            table.WarningBox.WarningBorderColor = factory.GetColor(editBorderColor);
+            table.WarningBox.WarningBackColor1 = factory.GetColor(0xF6FBFF);
+            table.WarningBox.WarningBackColor2 = factory.GetColor(0xDCE7F5);
+            #endregion
+
+            #region SuperTab
+
+            #region SuperTab
+
+            table.SuperTab.Background = new SuperTabLinearGradientColorTable(factory.GetColor(0xDFE9F5));
+            table.SuperTab.InnerBorder = factory.GetColor(0xFDFEFF);
+            table.SuperTab.OuterBorder = factory.GetColor(0xBAC9DB);
+
+            table.SuperTab.ControlBoxDefault.Image = factory.GetColor(0x254264);
+
+            table.SuperTab.ControlBoxMouseOver.Background = factory.GetColor(0xCEEDFA);
+            table.SuperTab.ControlBoxMouseOver.Border = factory.GetColor(0x3399FF);
+            table.SuperTab.ControlBoxMouseOver.Image = factory.GetColor(0xFF, 0x000000);
+
+            table.SuperTab.ControlBoxPressed.Background = factory.GetColor(0xB7CAE0);
+            table.SuperTab.ControlBoxPressed.Border = factory.GetColor(0x3399FF);
+            table.SuperTab.ControlBoxPressed.Image = factory.GetColor(0xFF, 0x000000);
+
+            table.SuperTab.InsertMarker = factory.GetColor(0xFF, 0x000000);
+
+            #endregion
+
+            #region SuperTabItem
+
+            // Top Default
+
+            table.SuperTabItem.Default.Normal.Background = new SuperTabLinearGradientColorTable();
+            table.SuperTabItem.Default.Normal.Text = factory.GetColor(0x254264);
+            table.SuperTabItem.Default.Normal.CloseMarker = factory.GetColor(0x254264);
+
+            // Disabled
+            table.SuperTabItem.Default.Disabled.Text = factory.GetColor(0x8d8d8d);
+            table.SuperTabItem.Default.Disabled.Background.AdaptiveGradient = false;
+            table.SuperTabItem.Default.Disabled.CloseMarker = factory.GetColor(0x8d8d8d);
+
+            // Top Selected
+
+            table.SuperTabItem.Default.Selected.Background = new SuperTabLinearGradientColorTable(
+                new Color[] { factory.GetColor(0xFDFEFF), factory.GetColor(0xF7FBFF) },
+                new float[] { 0, 1 });
+
+            table.SuperTabItem.Default.Selected.InnerBorder = factory.GetColor(0xFDFEFF);
+            table.SuperTabItem.Default.Selected.OuterBorder = factory.GetColor(0x92A5C7);
+            table.SuperTabItem.Default.Selected.Text = factory.GetColor(0x254264);
+            table.SuperTabItem.Default.Selected.CloseMarker = factory.GetColor(0x254264);
+
+            // Top SelectedMouseOver
+
+            table.SuperTabItem.Default.SelectedMouseOver.Background = new SuperTabLinearGradientColorTable(
+                new Color[] { factory.GetColor(0xFFFEFE), factory.GetColor(0xFFFAFC) },
+                new float[] { 0, 1 });
+
+            table.SuperTabItem.Default.SelectedMouseOver.InnerBorder = factory.GetColor(0xFFFEFE);
+            table.SuperTabItem.Default.SelectedMouseOver.OuterBorder = factory.GetColor(0xFFB700);
+            table.SuperTabItem.Default.SelectedMouseOver.Text = factory.GetColor(0x254264);
+            table.SuperTabItem.Default.SelectedMouseOver.CloseMarker = factory.GetColor(0x254264);
+
+            // Top MouseOver
+
+            table.SuperTabItem.Default.MouseOver.Background = new SuperTabLinearGradientColorTable(
+                new Color[] { factory.GetColor(0xE9F0F7), factory.GetColor(0xE9EFF8) },
+                new float[] { 0, 1 });
+
+            table.SuperTabItem.Default.MouseOver.InnerBorder = factory.GetColor(0xFFFEFC);
+            table.SuperTabItem.Default.MouseOver.OuterBorder = factory.GetColor(0xDEC067);
+            table.SuperTabItem.Default.MouseOver.Text = factory.GetColor(0x254264);
+            table.SuperTabItem.Default.MouseOver.CloseMarker = factory.GetColor(0x254264);
+
+            // Left, Bottom, Right
+
+            table.SuperTabItem.Left = table.SuperTabItem.Default;
+            table.SuperTabItem.Bottom = table.SuperTabItem.Default;
+            table.SuperTabItem.Right = table.SuperTabItem.Right;
+
+            #endregion
+
+            #region SuperTabPanel
+
+            table.SuperTabPanel.Default.Background = new SuperTabLinearGradientColorTable(factory.GetColor(0xF7FBFF), Color.Empty);
+            table.SuperTabPanel.Default.InnerBorder = factory.GetColor(Color.Empty);
+            table.SuperTabPanel.Default.OuterBorder = factory.GetColor(0x92A5C7);
+
+            table.SuperTabPanel.Left = table.SuperTabPanel.Default;
+            table.SuperTabPanel.Bottom = table.SuperTabPanel.Default;
+            table.SuperTabPanel.Right = table.SuperTabPanel.Default;
+
+            #endregion
+
+            #endregion
+
+            #region Backstage
+
+            #region Backstage
+
+            table.Backstage.Background = new SuperTabLinearGradientColorTable(factory.GetColor(0xDFE9F5));
+            table.Backstage.InnerBorder = factory.GetColor(0xFDFEFF);
+            table.Backstage.OuterBorder = factory.GetColor(0xBAC9DB);
+
+            table.Backstage.ControlBoxDefault.Image = factory.GetColor(0x254264);
+
+            table.Backstage.ControlBoxMouseOver.Background = factory.GetColor(0xCEEDFA);
+            table.Backstage.ControlBoxMouseOver.Border = factory.GetColor(0x3399FF);
+            table.Backstage.ControlBoxMouseOver.Image = factory.GetColor(0xFF, 0x000000);
+
+            table.Backstage.ControlBoxPressed.Background = factory.GetColor(0xB7CAE0);
+            table.Backstage.ControlBoxPressed.Border = factory.GetColor(0x3399FF);
+            table.Backstage.ControlBoxPressed.Image = factory.GetColor(0xFF, 0x000000);
+
+            table.Backstage.InsertMarker = factory.GetColor(0xFF, 0x000000);
+
+            #endregion
+
+            #region BackstageItem
+
+            // Top Default
+
+            table.BackstageItem.Default.Normal.Background = new SuperTabLinearGradientColorTable();
+            table.BackstageItem.Default.Normal.Text = factory.GetColor(0x254264);
+            table.BackstageItem.Default.Normal.CloseMarker = factory.GetColor(0x254264);
+
+            // Top Selected
+
+            table.BackstageItem.Default.Selected.Background = new SuperTabLinearGradientColorTable(
+                new Color[] { factory.GetColor(0xFDFEFF), factory.GetColor(0xF7FBFF) },
+                new float[] { 0, 1 });
+
+            table.BackstageItem.Default.Selected.InnerBorder = factory.GetColor(0xFDFEFF);
+            table.BackstageItem.Default.Selected.OuterBorder = factory.GetColor(0x92A5C7);
+            table.BackstageItem.Default.Selected.Text = factory.GetColor(0x254264);
+            table.BackstageItem.Default.Selected.CloseMarker = factory.GetColor(0x254264);
+
+            // Top SelectedMouseOver
+
+            table.BackstageItem.Default.SelectedMouseOver.Background = new SuperTabLinearGradientColorTable(
+                new Color[] { factory.GetColor(0xFFFEFE), factory.GetColor(0xFFFAFC) },
+                new float[] { 0, 1 });
+
+            table.BackstageItem.Default.SelectedMouseOver.InnerBorder = factory.GetColor(0xFFFEFE);
+            table.BackstageItem.Default.SelectedMouseOver.OuterBorder = factory.GetColor(0xFFB700);
+            table.BackstageItem.Default.SelectedMouseOver.Text = factory.GetColor(0x254264);
+            table.BackstageItem.Default.SelectedMouseOver.CloseMarker = factory.GetColor(0x254264);
+
+            // Top MouseOver
+
+            table.BackstageItem.Default.MouseOver.Background = new SuperTabLinearGradientColorTable(
+                new Color[] { factory.GetColor(0xE9F0F7), factory.GetColor(0xE9EFF8) },
+                new float[] { 0, 1 });
+
+            table.BackstageItem.Default.MouseOver.InnerBorder = factory.GetColor(0xFFFEFC);
+            table.BackstageItem.Default.MouseOver.OuterBorder = factory.GetColor(0xDEC067);
+            table.BackstageItem.Default.MouseOver.Text = factory.GetColor(0x254264);
+            table.BackstageItem.Default.MouseOver.CloseMarker = factory.GetColor(0x254264);
+
+            // Left, Bottom, Right
+
+            table.BackstageItem.Left = table.BackstageItem.Default;
+            table.BackstageItem.Bottom = table.BackstageItem.Default;
+            table.BackstageItem.Right = table.BackstageItem.Right;
+
+            #endregion
+
+            #region BackstagePanel
+
+            table.BackstagePanel.Default.Background = new SuperTabLinearGradientColorTable(factory.GetColor(0xF7FBFF), Color.Empty);
+            table.BackstagePanel.Default.InnerBorder = factory.GetColor(Color.Empty);
+            table.BackstagePanel.Default.OuterBorder = factory.GetColor(0x92A5C7);
+
+            table.BackstagePanel.Left = table.BackstagePanel.Default;
+            table.BackstagePanel.Bottom = table.BackstagePanel.Default;
+            table.BackstagePanel.Right = table.BackstagePanel.Default;
+
+            #endregion
+
+            #endregion
+
+            #region SwitchButton
+            SwitchButtonColorTable sbt = new SwitchButtonColorTable();
+            sbt.BorderColor = factory.GetColor(0xAABBD2);
+            sbt.OffBackColor = factory.GetColor(0xF6FBFF);
+            sbt.OffTextColor = factory.GetColor(0x254264);
+            sbt.OnBackColor = factory.GetColor(0x92D050);
+            sbt.OnTextColor = factory.GetColor(0x254264);
+            sbt.SwitchBackColor = factory.GetColor(0xDCE7F5);
+            sbt.SwitchBorderColor = factory.GetColor(0x9EB2C9);
+            sbt.TextColor = factory.GetColor(0x254264);
+            table.SwitchButton = new SwitchButtonColors();
+            table.SwitchButton.Default = sbt;
+            table.SwitchButton.Disabled.BorderColor = table.CheckBoxItem.Disabled.CheckBorder;
+            table.SwitchButton.Disabled.SwitchBorderColor = table.SwitchButton.Disabled.BorderColor;
+            table.SwitchButton.Disabled.OffTextColor = table.CheckBoxItem.Disabled.Text;
+            table.SwitchButton.Disabled.OnTextColor = table.SwitchButton.Disabled.OffTextColor;
+            table.SwitchButton.Disabled.TextColor = table.SwitchButton.Disabled.OffTextColor;
+            table.SwitchButton.Disabled.SwitchBackColor = table.CheckBoxItem.Disabled.CheckInnerBackground.Start;
+            table.SwitchButton.Disabled.OffBackColor = table.CheckBoxItem.Disabled.CheckInnerBackground.Start;
+            table.SwitchButton.Disabled.OnBackColor = table.SwitchButton.Disabled.OffBackColor;
+            #endregion
+
+            #region ElementStyle Classes
+            table.StyleClasses.Clear();
+            ElementStyle style = new ElementStyle();
+            style.Class = ElementStyleClassKeys.RibbonGalleryContainerKey;
+            style.BorderColor = factory.GetColor(0xAABBD2);
+            style.Border = eStyleBorderType.Solid;
+            style.BorderWidth = 1;
+            style.CornerDiameter = 2;
+            style.CornerType = eCornerType.Rounded;
+            style.BackColor = factory.GetColor(0xF3F7FC);
+            table.StyleClasses.Add(style.Class, style);
+            // FileMenuContainer
+            style = GetFileMenuContainerStyle(table);
+            table.StyleClasses.Add(style.Class, style);
+            // Two Column File Menu Container
+            style = GetTwoColumnMenuContainerStyle(table);
+            table.StyleClasses.Add(style.Class, style);
+            // Column one File Menu Container
+            style = GetMenuColumnOneContainerStyle(table);
+            table.StyleClasses.Add(style.Class, style);
+            // Column two File Menu Container
+            style = GetMenuColumnTwoContainerStyle(table);
+            table.StyleClasses.Add(style.Class, style);
+            // Bottom File Menu Container
+            style = GetMenuBottomContainer(table);
+            table.StyleClasses.Add(style.Class, style);
+            // TextBox border
+            style = Office2007ColorTableFactory.GetTextBoxStyle(factory.GetColor(editBorderColor));
+            table.StyleClasses.Add(style.Class, style);
+            // RichTextBox border
+            style = Office2007ColorTableFactory.GetRichTextBoxStyle(factory.GetColor(editBorderColor));
+            table.StyleClasses.Add(style.Class, style);
+            // ItemPanel
+            style = Office2007ColorTableFactory.GetItemPanelStyle(factory.GetColor(editBorderColor));
+            table.StyleClasses.Add(style.Class, style);
+            // ListBoxAdv
+            style = Office2007ColorTableFactory.GetListBoxAdvStyle(factory.GetColor(editBorderColor));
+            table.StyleClasses.Add(style.Class, style);
+            // DateTimeInput background
+            style = Office2007ColorTableFactory.GetDateTimeInputBackgroundStyle(factory.GetColor(editBorderColor), SystemColors.Window);
+            table.StyleClasses.Add(style.Class, style);
+            // Ribbon Client Panel
+            style = Office2007ColorTableFactory.GetRibbonClientPanelStyle(factory, eOffice2007ColorScheme.Blue);
+            table.StyleClasses.Add(style.Class, style);
+            // ListView Border
+            style = Office2007ColorTableFactory.GetListViewBorderStyle(table.ListViewEx);
+            table.StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetStatusBarAltStyle(table.Bar);
+            table.StyleClasses.Add(style.Class, style);
+#if !NOTREE
+            // Tree Border/Background
+            style = Office2007ColorTableFactory.GetAdvTreeStyle(factory.GetColor(editBorderColor), Color.Empty);
+            table.StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetAdvTreeColumnsHeaderStyle(factory.GetColor(0xF9FCFD), factory.GetColor(0xD3DBE9), factory.GetColor(0x9EB6CE));
+            table.StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetAdvTreeNodesColumnsHeaderStyle(factory.GetColor(0xF9FCFD), factory.GetColor(0xD3DBE9), factory.GetColor(0x9EB6CE));
+            table.StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetAdvTreeColumnStyle(factory.GetColor(0x000000));
+            table.StyleClasses.Add(style.Class, style);
+            // CrumbBar
+            style = Office2007ColorTableFactory.GetCrumbBarBackgroundStyle(factory.GetColor(Color.White), factory.GetColor("FF567DB0"), factory.GetColor("FF2F578D"));
+            table.StyleClasses.Add(style.Class, style);
+#endif
+            // DataGridView border
+            style = Office2007ColorTableFactory.GetDataGridViewStyle();
+            table.StyleClasses.Add(style.Class, style);
+            // DataGridViewDateTime border
+            style = Office2007ColorTableFactory.GetDataGridViewDateTimeStyle();
+            table.StyleClasses.Add(style.Class, style);
+            // DataGridViewNumeric border
+            style = Office2007ColorTableFactory.GetDataGridViewNumericStyle();
+            table.StyleClasses.Add(style.Class, style);
+            // DataGridViewIpAddress border
+            style = Office2007ColorTableFactory.GetDataGridViewIpAddressStyle();
+            table.StyleClasses.Add(style.Class, style);
+
+            // Slide-out Button
+            style = Office2007ColorTableFactory.GetSlideOutButtonStyle(table.CheckBoxItem.Default.CheckBorder);
+            table.StyleClasses.Add(style.Class, style);
+
+            // MetroTilePanel
+            style = Office2007ColorTableFactory.GetMetroTilePanelStyle(factory.GetColor(Color.White));
+            table.StyleClasses.Add(style.Class, style);
+            // MetroTileGroup
+            style = Office2007ColorTableFactory.GetMetroTileGroupStyle(factory.GetColor(Color.DarkGray));
+            table.StyleClasses.Add(style.Class, style);
+            // MonthCalendarAdv
+            style = Office2007ColorTableFactory.GetMonthCalendarStyle(SystemColors.Window);
+            table.StyleClasses.Add(style.Class, style);
+            // ProgressSteps control
+            style = Office2007ColorTableFactory.GetProgressStepsStyle(table);
+            table.StyleClasses.Add(style.Class, style);
+            // SideNavStrip
+            style = Office2007ColorTableFactory.GetSideNavStripStyle(factory.GetColor(0xBCC7D8));
+            table.StyleClasses.Add(style.Class, style);
+            // TabFormPanel
+            style = Office2007ColorTableFactory.GetTabFormPanelStyle(factory.GetColor(0xF7FBFF));
+            table.StyleClasses.Add(style.Class, style);
+
+            // Toolbox Control
+            style = Office2007ColorTableFactory.GetToolboxControlStyle(factory.GetColor(table.LegacyColors.PanelBorder), Color.Empty);
+            table.StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetToolboxGroupTitle(factory.GetColor(0x254264));
+            table.StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetToolboxGroupTitleMouseOver(factory.GetColor(0x254264), factory.GetColor(0xFFECB5));
+            table.StyleClasses.Add(style.Class, style);
+            style = Office2007ColorTableFactory.GetToolboxGroupExpandedTitle(factory.GetColor(0x254264), factory.GetColor(0xDCE7F5));
+            table.StyleClasses.Add(style.Class, style);
+            #endregion
+
+            #region StepIndicator
+            table.StepIndicator.BackgroundColor = factory.GetColor(ColorFunctions.GetShade(table.Form.BackColor, 10));
+            table.StepIndicator.IndicatorColor = factory.GetColor(0xA4CC28);
+            #endregion
+
+            #region TabForm
+            table.TabForm.Active.CaptionText = factory.GetColor(0x254264);
+            table.TabForm.Inactive.CaptionText = factory.GetColor(0x254264);
+            table.TabForm.Active.CaptionBackColors = new Color[] { factory.GetColor(0xDFE9F5) };
+            table.TabForm.Inactive.CaptionBackColors = new Color[] { factory.GetColor(0xDFE9F5) };
+            table.TabFormItemColorTables.Clear();
+            table.TabFormItemColorTables.Add(TabFormItem.DefaultColorTableKey,
+                Office2007ColorTable.CreateDefaultTabFormItemColorTable(factory,
+                new Color[] { factory.GetColor(0xDFE9F5) },
+                new Color[] { factory.GetColor(0xBAC9DB) },
+                factory.GetColor(0x254264),
+                new Color[] { factory.GetColor(0xFDFEFF), factory.GetColor(0xF7FBFF) },
+                new Color[] { factory.GetColor(0xBAC9DB) },
+                factory.GetColor(0x254264)
+                ));
+            table.TabFormItemColorTables.Add(TabFormItem.BlueColorTableKey, Office2007ColorTable.CreateBlueTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.YellowColorTableKey, Office2007ColorTable.CreateYellowTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.PurpleColorTableKey, Office2007ColorTable.CreatePurpleTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.CyanColorTableKey, Office2007ColorTable.CreateCyanTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.BlueMistColorTableKey, Office2007ColorTable.CreateBlueMistTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.PurpleMistColorTableKey, Office2007ColorTable.CreatePurpleMistTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.TanColorTableKey, Office2007ColorTable.CreateTanTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.LemonLimeColorTableKey, Office2007ColorTable.CreateLemonLimeTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.AppleColorTableKey, Office2007ColorTable.CreateAppleTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.TealColorTableKey, Office2007ColorTable.CreateTealTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.RedChalkColorTableKey, Office2007ColorTable.CreateRedChalkTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.SilverColorTableKey, Office2007ColorTable.CreateSilverTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.OrangeColorTableKey, Office2007ColorTable.CreateOrangeTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.GreenColorTableKey, Office2007ColorTable.CreateGreenTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.MagentaColorTableKey, Office2007ColorTable.CreateMagentaTabFormItemColorTable(factory));
+            table.TabFormItemColorTables.Add(TabFormItem.RedColorTableKey, Office2007ColorTable.CreateRedTabFormItemColorTable(factory));
+            #endregion
+        }
+
+        #region RibbonBar
+        public static Office2007RibbonBarStateColorTable GetRibbonBar(ColorFactory factory)
+        {
+            Office2007RibbonBarStateColorTable rb = new Office2007RibbonBarStateColorTable();
+            rb.TopBackgroundHeight = 15;
+            rb.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x9DB2C9), factory.GetColor(0xA5B8D0));
+            rb.InnerBorder = new LinearGradientColorTable(factory.GetColor(160, 0xFFFFFF));
+            rb.TopBackground = new LinearGradientColorTable(factory.GetColor(0xF7FBFF), factory.GetColor(0xDCE7F5));
+            rb.BottomBackground = null;// new LinearGradientColorTable(factory.GetColor(0xC7D8ED), factory.GetColor(0xD8E8F5));
+            rb.TitleBackground = null;// new LinearGradientColorTable(factory.GetColor(0xC2D8F1), factory.GetColor(0xC0D8EF));
+            rb.TitleText = factory.GetColor(0x738399);
+            return rb;
+        }
+
+        public static Office2007RibbonBarStateColorTable GetRibbonBarMouseOver(ColorFactory factory)
+        {
+            Office2007RibbonBarStateColorTable rb = new Office2007RibbonBarStateColorTable();
+            rb.TopBackgroundHeight = 15;
+            rb.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x9CB1C7), factory.GetColor(0xA4B7CF));
+            rb.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xF6F9FE), factory.GetColor(0xEBF0F9));
+            rb.TopBackground = new LinearGradientColorTable(factory.GetColor(0xF5F6FB), factory.GetColor(0xDCE7F5));
+            rb.BottomBackground = null;// new LinearGradientColorTable(factory.GetColor(0xC7D8ED), factory.GetColor(0xD8E8F5));
+            rb.TitleBackground = new LinearGradientColorTable(factory.GetColor(0xE7F9FC), Color.Transparent);
+            rb.TitleText = factory.GetColor(0x738399);
+            return rb;
+        }
+        #endregion
+
+        #region Buttons
+        public static Office2007ButtonItemColorTable GetButtonItemBlueOrange(ColorFactory factory)
+        {
+            Office2007ButtonItemColorTable cb = new Office2007ButtonItemColorTable();
+            cb.Default = new Office2007ButtonItemStateColorTable();
+            cb.Default.Text = factory.GetColor(0x254264);
+
+            // Button mouse over
+            cb.MouseOver = new Office2007ButtonItemStateColorTable();
+            cb.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xFFB700), factory.GetColor(0xFFB700));
+            cb.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFEF9F4), factory.GetColor(0xFFFEE8));
+            cb.MouseOver.TopBackground = new LinearGradientColorTable(factory.GetColor(0xFDECDB), factory.GetColor(0xFDDEB8));
+            cb.MouseOver.TopBackgroundHighlight = LinearGradientColorTable.Empty; //new LinearGradientColorTable(Color.FromArgb(192, Color.White), Color.Transparent);
+            cb.MouseOver.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xFFCE68), factory.GetColor(0xFFDE8D));
+            cb.MouseOver.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xFFFD9C), Color.Transparent);
+            cb.MouseOver.SplitBorder = new LinearGradientColorTable(factory.GetColor(0xFFB700), Color.Empty);
+            cb.MouseOver.SplitBorderLight = new LinearGradientColorTable(factory.GetColor(0xFEE9BA), Color.Empty);
+            cb.MouseOver.Text = factory.GetColor(0x254264);
+
+            cb.MouseOverSplitInactive = new Office2007ButtonItemStateColorTable();
+            cb.MouseOverSplitInactive.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xADBDD2));
+
+            // Pressed
+            cb.Pressed = new Office2007ButtonItemStateColorTable();
+            cb.Pressed.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xC2923B), factory.GetColor(0xC2B359));
+            cb.Pressed.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xD4C0AC), Color.Transparent);
+            cb.Pressed.TopBackground = new LinearGradientColorTable(factory.GetColor(0xE4CAAE), factory.GetColor(0xEDC78D));
+            cb.Pressed.TopBackgroundHighlight = LinearGradientColorTable.Empty;
+            cb.Pressed.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xEFBC61), factory.GetColor(0xEED084));
+            cb.Pressed.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xEFF1BD), Color.Transparent);
+            cb.Pressed.SplitBorder = new LinearGradientColorTable(factory.GetColor(0xC2A14D), Color.Empty);
+            cb.Pressed.SplitBorderLight = new LinearGradientColorTable(factory.GetColor(0xD6B36F), Color.Empty);
+            cb.Pressed.Text = factory.GetColor(0x254264);
+
+            // Checked
+            cb.Checked = new Office2007ButtonItemStateColorTable();
+            cb.Checked.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xC2923B), factory.GetColor(0xC2B14F));
+            cb.Checked.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xE2C9AE), Color.Transparent);
+            cb.Checked.TopBackground = new LinearGradientColorTable(factory.GetColor(0xF4D4B1), factory.GetColor(0xFDD08D));
+            cb.Checked.TopBackgroundHighlight = LinearGradientColorTable.Empty;
+            cb.Checked.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xFFC45E), factory.GetColor(0xFDE894));
+            cb.Checked.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xFFFFC5), Color.Transparent);
+            cb.Checked.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Checked.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Checked.Text = factory.GetColor(0x254264);
+
+            // Expanded button
+            cb.Expanded = new Office2007ButtonItemStateColorTable();
+            cb.Expanded.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xC2923B), factory.GetColor(0xC2B14F));
+            cb.Expanded.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xE2C9AE), Color.Transparent);
+            cb.Expanded.TopBackground = new LinearGradientColorTable(factory.GetColor(0xF4D4B1), factory.GetColor(0xFDD08D));
+            cb.Expanded.TopBackgroundHighlight = LinearGradientColorTable.Empty;
+            cb.Expanded.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xFFC45E), factory.GetColor(0xFDE894));
+            cb.Expanded.BottomBackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xFFFFC5), Color.Transparent);
+            cb.Expanded.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Expanded.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Expanded.Text = factory.GetColor(0x254264);
+
+            SetBlueExpandColors(cb, factory);
+
+            return cb;
+        }
+
+        public static Office2007ButtonItemColorTable GetButtonItemBlueOrangeWithBackground(ColorFactory factory)
+        {
+            Office2007ButtonItemColorTable cb = GetButtonItemBlueOrange(factory);
+            cb.Default.TopBackground = new LinearGradientColorTable(factory.GetColor(0xF9FCFD), factory.GetColor(0xE1EDF9));
+            cb.Default.TopBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xD5E1F2), factory.GetColor(0xD6E5F6));
+            cb.Default.BottomBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.InnerBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.OuterBorder = new LinearGradientColorTable(factory.GetColor(0x8D9FB7), Color.Empty);
+            cb.Default.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Default.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+
+            cb.MouseOverSplitInactive = cb.Default;
+
+            // Same as default
+            cb.Disabled = new Office2007ButtonItemStateColorTable();
+            cb.Disabled.TopBackground = new LinearGradientColorTable(factory.GetColor(0xF5F5F5), factory.GetColor(0xECECEC));
+            cb.Disabled.TopBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.BottomBackground = new LinearGradientColorTable(factory.GetColor(0xE5E5E5), factory.GetColor(0xE7E7E7));
+            cb.Disabled.BottomBackgroundHighlight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.InnerBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xBCBCBC), Color.Empty);
+            cb.Disabled.SplitBorder = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.SplitBorderLight = new LinearGradientColorTable(Color.Empty, Color.Empty);
+            cb.Disabled.Text = factory.GetColor(0x8D8D8D);
+            return cb;
+        }
+
+        public static void SetBlueExpandColors(Office2007ButtonItemColorTable ct, ColorFactory factory)
+        {
+            Color cb = factory.GetColor(0x4C607A);
+            Color cl = Color.FromArgb(192, Color.White);
+            ct.Default.ExpandBackground = cb;
+            ct.Default.ExpandLight = cl;
+
+            ct.Checked.ExpandBackground = cb;
+            ct.Checked.ExpandLight = cl;
+
+            //ct.Disabled.ExpandBackground = factory.GetColor(0xB7B7B7);
+            //ct.Disabled.ExpandLight = factory.GetColor(0xEDEDED);
+
+            ct.Expanded.ExpandBackground = cb;
+            ct.Expanded.ExpandLight = cl;
+
+            ct.MouseOver.ExpandBackground = cb;
+            ct.MouseOver.ExpandLight = cl;
+
+            ct.Pressed.ExpandBackground = cb;
+            ct.Pressed.ExpandLight = cl;
+        }
+        #endregion
+
+        #region RibbonTabItem
+        public static Office2007RibbonTabItemColorTable GetRibbonTabItemBlueDefault(ColorFactory factory)
+        {
+            Office2007RibbonTabItemColorTable rt = new Office2007RibbonTabItemColorTable();
+            rt.Default.Text = factory.GetColor(0x254264);
+            rt.CornerSize = 2;
+
+            // Selected Tab
+            rt.Selected = new Office2007RibbonTabItemStateColorTable();
+            rt.Selected.Background = new LinearGradientColorTable(factory.GetColor(0xFDFEFF), factory.GetColor(0xF7FBFF));
+            rt.Selected.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(32, Color.White), Color.Transparent);
+            rt.Selected.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFDFEFF), factory.GetColor(0xFCFEFF));
+            rt.Selected.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xBAC9DB), factory.GetColor(0xBAC9DB));
+            rt.Selected.Text = factory.GetColor(0x254264);
+
+            // Selected Tab Mouse Over
+            rt.SelectedMouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.SelectedMouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xFFFEFE), factory.GetColor(0xFFFAFC));
+            rt.SelectedMouseOver.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(32, Color.White), Color.Transparent);
+            rt.SelectedMouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFFFEFE), factory.GetColor(0xFFFDFD));
+            rt.SelectedMouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xFFB700), factory.GetColor(0xFFA84E));
+            rt.SelectedMouseOver.Text = factory.GetColor(0x254264);
+
+            // Tab Mouse Over
+            rt.MouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.MouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xE9F0F7), factory.GetColor(0xE9EFF8));
+            rt.MouseOver.BackgroundHighlight = LinearGradientColorTable.Empty;
+            rt.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFFFEFC), factory.GetColor(0xF2F5F9));
+            rt.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xFFB700), factory.GetColor(0xDEC067));
+            rt.MouseOver.Text = factory.GetColor(0x254264);
+
+            return rt;
+        }
+
+        public static Office2007RibbonTabItemColorTable GetRibbonTabItemBlueMagenta(ColorFactory factory)
+        {
+            Office2007RibbonTabItemColorTable rt = new Office2007RibbonTabItemColorTable();
+            rt.Default.Text = factory.GetColor(0x254264);
+            // Selected Tab
+            rt.Selected = new Office2007RibbonTabItemStateColorTable();
+            rt.Selected.Background = new LinearGradientColorTable(factory.GetColor(0xD4C8E2), factory.GetColor(0xECE7F2));
+            rt.Selected.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(64, Color.White), Color.Transparent);
+            rt.Selected.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xECE7F3), factory.GetColor(0xCDC2DF));
+            rt.Selected.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xBEBAC1), factory.GetColor(0xC0BFC1));
+            rt.Selected.Text = factory.GetColor(0x254264);
+
+            // Selected Tab Mouse Over
+            rt.SelectedMouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.SelectedMouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xD4C8E2), factory.GetColor(0xECE7F2));
+            rt.SelectedMouseOver.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(32, Color.White), Color.Transparent);
+            rt.SelectedMouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xECE7F3), factory.GetColor(0xCDC2DF));
+            rt.SelectedMouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xBEBAC1), factory.GetColor(0xC0BFC1));
+            rt.SelectedMouseOver.Text = factory.GetColor(0x254264);
+
+            // Tab Mouse Over
+            rt.MouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.MouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xC4D5F8), factory.GetColor(0xC2BCE8));
+            rt.MouseOver.BackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xDEECFF), Color.Transparent);
+            rt.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xE0EEFF), factory.GetColor(0xC7DFFF));
+            rt.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xC1C8D1), factory.GetColor(0xC0C7D0));
+            rt.MouseOver.Text = factory.GetColor(0x254264);
+
+            return rt;
+        }
+
+        public static Office2007RibbonTabItemColorTable GetRibbonTabItemBlueGreen(ColorFactory factory)
+        {
+            Office2007RibbonTabItemColorTable rt = new Office2007RibbonTabItemColorTable();
+            rt.Default.Text = factory.GetColor(0x254264);
+
+            // Selected Tab
+            rt.Selected = new Office2007RibbonTabItemStateColorTable();
+            rt.Selected.Background = new LinearGradientColorTable(factory.GetColor(0xE4F3E0), factory.GetColor(0xE4F2DF));
+            rt.Selected.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(64, Color.White), Color.Transparent);
+            rt.Selected.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xD5EAD3), factory.GetColor(0xB8DEB1));
+            rt.Selected.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xB9C1B7), factory.GetColor(0xBFC1BE));
+            rt.Selected.Text = factory.GetColor(0x254264);
+
+            // Selected Tab Mouse Over
+            rt.SelectedMouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.SelectedMouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xE4F3E0), factory.GetColor(0xE4F2DF));
+            rt.SelectedMouseOver.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(32, Color.White), Color.Transparent);
+            rt.SelectedMouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xD5EAD3), factory.GetColor(0xB8DEB1));
+            rt.SelectedMouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xB9C1B7), factory.GetColor(0xBFC1BE));
+            rt.SelectedMouseOver.Text = factory.GetColor(0x254264);
+
+            // Tab Mouse Over
+            rt.MouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.MouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xB3DEE3), factory.GetColor(0x8ADE9F));
+            rt.MouseOver.BackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xDEECFF), Color.Transparent);
+            rt.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xE2EFFF), factory.GetColor(0xC7DFFF));
+            rt.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xC1C8D1), factory.GetColor(0xC0C7D0));
+            rt.MouseOver.Text = factory.GetColor(0x254264);
+
+            return rt;
+        }
+
+        public static Office2007RibbonTabItemColorTable GetRibbonTabItemBlueOrange(ColorFactory factory)
+        {
+            Office2007RibbonTabItemColorTable rt = new Office2007RibbonTabItemColorTable();
+            rt.Default.Text = factory.GetColor(0x254264);
+
+            // Selected Tab
+            rt.Selected = new Office2007RibbonTabItemStateColorTable();
+            rt.Selected.Background = new LinearGradientColorTable(factory.GetColor(0xFFF59F), factory.GetColor(0xFFFAD5));
+            rt.Selected.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(64, Color.White), Color.Transparent);
+            rt.Selected.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFFFBD6), factory.GetColor(0xFDF28C));
+            rt.Selected.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xCAC7AC), factory.GetColor(0xC2C2C2));
+            rt.Selected.Text = factory.GetColor(0x254264);
+
+            // Selected Tab Mouse Over
+            rt.SelectedMouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.SelectedMouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xFFF59F), factory.GetColor(0xFFFAD5));
+            rt.SelectedMouseOver.BackgroundHighlight = new LinearGradientColorTable(Color.FromArgb(32, Color.White), Color.Transparent);
+            rt.SelectedMouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xFFFBD6), factory.GetColor(0xFDF28C));
+            rt.SelectedMouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xCAC7AC), factory.GetColor(0xC2C2C2));
+            rt.SelectedMouseOver.Text = factory.GetColor(0x254264);
+
+            // Tab Mouse Over
+            rt.MouseOver = new Office2007RibbonTabItemStateColorTable();
+            rt.MouseOver.Background = new LinearGradientColorTable(factory.GetColor(0xCFE0E1), factory.GetColor(0xE9E799));
+            rt.MouseOver.BackgroundHighlight = new LinearGradientColorTable(factory.GetColor(0xCBE2FF), Color.Transparent);
+            rt.MouseOver.InnerBorder = new LinearGradientColorTable(factory.GetColor(0xE2EFFF), factory.GetColor(0xC7DFFF));
+            rt.MouseOver.OuterBorder = new LinearGradientColorTable(factory.GetColor(0xC1C8D1), factory.GetColor(0xC0C7D0));
+            rt.MouseOver.Text = factory.GetColor(0x254264);
+
+            return rt;
+        }
+        #endregion
+
+        #region Style Class Creation
+        public static ElementStyle GetFileMenuContainerStyle(Office2007ColorTable table)
+        {
+            ElementStyle style = new ElementStyle();
+            style.Class = ElementStyleClassKeys.RibbonFileMenuContainerKey;
+            Rendering.Office2007MenuColorTable mc = table.Menu;
+
+            style.PaddingBottom = 0;
+            style.PaddingLeft = 0;
+            style.PaddingRight = 0;
+            style.PaddingTop = 22;
+            style.Border = eStyleBorderType.Solid;
+            style.CornerType = eCornerType.Rounded;
+            style.BorderWidth = 1;
+            style.BorderColor = Color.Transparent;
+            style.CornerDiameter = 3;
+            BackgroundColorBlend[] blend = new BackgroundColorBlend[mc.FileBackgroundBlend.Count];
+            mc.FileBackgroundBlend.CopyTo(blend);
+            style.BackColorBlend.Clear();
+            style.BackColorBlend.AddRange(blend);
+            style.BackColorGradientAngle = 90;
+            return style;
+        }
+
+        public static ElementStyle GetTwoColumnMenuContainerStyle(Office2007ColorTable table)
+        {
+            ElementStyle style = new ElementStyle();
+            style.Class = ElementStyleClassKeys.RibbonFileMenuTwoColumnContainerKey;
+            Rendering.Office2007MenuColorTable mc = table.Menu;
+
+            style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Double;
+            style.BorderBottomWidth = 0;
+            style.BorderColor = mc.FileContainerBorder;
+            //style.BorderColorLight = mc.FileContainerBorderLight;
+            style.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.None;
+            style.BorderLeftWidth = 0;
+            style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.None;
+            style.BorderRightWidth = 0;
+            style.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            style.BorderTopWidth = 1;
+            style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            style.BorderBottomWidth = 1;
+            style.PaddingBottom = 0;
+            style.PaddingLeft = 0;
+            style.PaddingRight = 0;
+            style.PaddingTop = 0;
+
+            return style;
+        }
+
+        public static ElementStyle GetMenuColumnOneContainerStyle(Office2007ColorTable table)
+        {
+            ElementStyle style = new ElementStyle();
+            style.Class = ElementStyleClassKeys.RibbonFileMenuColumnOneContainerKey;
+            Rendering.Office2007MenuColorTable mc = table.Menu;
+
+            style.BackColor = mc.FileColumnOneBackground;
+            style.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            style.BorderRightColor = mc.FileColumnOneBorder;
+            style.BorderRightWidth = 1;
+            style.PaddingRight = 1;
+
+            return style;
+        }
+
+        public static ElementStyle GetMenuColumnTwoContainerStyle(Office2007ColorTable table)
+        {
+            ElementStyle style = new ElementStyle();
+            style.Class = ElementStyleClassKeys.RibbonFileMenuColumnTwoContainerKey;
+            Rendering.Office2007MenuColorTable mc = table.Menu;
+
+            style.BackColor = mc.FileColumnTwoBackground;
+
+            return style;
+        }
+
+        public static ElementStyle GetMenuBottomContainer(Office2007ColorTable table)
+        {
+            ElementStyle style = new ElementStyle();
+            style.Class = ElementStyleClassKeys.RibbonFileMenuBottomContainerKey;
+            Rendering.Office2007MenuColorTable mc = table.Menu;
+
+            BackgroundColorBlend[] blend = new BackgroundColorBlend[mc.FileBottomContainerBackgroundBlend.Count];
+            mc.FileBottomContainerBackgroundBlend.CopyTo(blend);
+            style.BackColorBlend.Clear();
+            style.BackColorBlend.AddRange(blend);
+            style.BackColorGradientAngle = 90;
+            style.MarginTop = 0;
+            style.MarginRight = 2;
+            style.PaddingTop = 1;
+            return style;
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Rendering/Windows7ColorTable.cs b/PROMS/DotNetBar Source Code/Rendering/Windows7ColorTable.cs
new file mode 100644
index 00000000..5f8b1305
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Rendering/Windows7ColorTable.cs	
@@ -0,0 +1,41 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    /// <summary>
+    /// Represents color table for Windows 7 style.
+    /// </summary>
+    public class Windows7ColorTable : Office2007ColorTable
+    {
+        /// <summary>
+        /// Initializes a new instance of the Office2010ColorTable class.
+        /// </summary>
+        public Windows7ColorTable()
+        {
+            Windows7BlueFactory.InitializeBlueColorTable(this, ColorFactory.Empty);
+        }
+
+        public Windows7ColorTable(eWindows7ColorScheme color)
+        {
+            Windows7BlueFactory.InitializeBlueColorTable(this, ColorFactory.Empty);
+        }
+
+        public Windows7ColorTable(eWindows7ColorScheme color, Color blendColor)
+        {
+            Windows7BlueFactory.InitializeBlueColorTable(this, blendColor.IsEmpty ? ColorFactory.Empty : new ColorBlendFactory(blendColor));
+        }
+    }
+
+        /// <summary>
+    /// Defines the color scheme type for the Office2010ColorTable.
+    /// </summary>
+    public enum eWindows7ColorScheme
+    {
+        /// <summary>
+        /// Blue color scheme.
+        /// </summary>
+        Blue
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/ResXGen.exe b/PROMS/DotNetBar Source Code/ResXGen.exe
new file mode 100644
index 00000000..4ca4fdba
Binary files /dev/null and b/PROMS/DotNetBar Source Code/ResXGen.exe differ
diff --git a/PROMS/DotNetBar Source Code/Ribbon/ApplicationButton.cs b/PROMS/DotNetBar Source Code/Ribbon/ApplicationButton.cs
new file mode 100644
index 00000000..ad5dcfe1
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Ribbon/ApplicationButton.cs	
@@ -0,0 +1,572 @@
+using System;
+using System.Text;
+using System.ComponentModel;
+using System.Drawing;
+using DevComponents.DotNetBar.Rendering;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represents the Office Application Button displayed in the top-left corner of the Ribbon Control.
+    /// </summary>
+    [System.ComponentModel.ToolboxItem(false), System.ComponentModel.DesignTimeVisible(false), DefaultEvent("Click"), Designer("DevComponents.DotNetBar.Design.ApplicationButtonDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+    public class ApplicationButton : ButtonItem
+    {
+        private const string SysBackstageBackButtonName = "sys_backstage_back_button";
+        private const string SysBackstagePanelName = "sys_backstage_panel";
+        #region Private Variables
+        private bool m_ThumbTucked = false;
+        #endregion
+
+        #region Internal Implementation
+        protected override void Dispose(bool disposing)
+        {
+            if(_BackstageTab!=null)
+                _BackstageTab.Leave -= BackstageTabLeave;
+            base.Dispose(disposing);
+        }
+        public override void RecalcSize()
+        {
+            ButtonItemLayout.LayoutButton(this, true);
+            m_NeedRecalcSize = false;
+        }
+        /// <summary>
+        /// Gets or sets a value indicating whether the item is expanded or not. For Popup items this would indicate whether the item is popped up or not.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), System.ComponentModel.DefaultValue(false), System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
+        public override bool Expanded
+        {
+            get { return base.Expanded; }
+
+            set
+            {
+                if (base.Expanded != value)
+                {
+                    if (!value)
+                    {
+                        RibbonStrip container = this.ContainerControl as RibbonStrip;
+                        if (container != null && container.MouseDownOnCaption)
+                            return;
+                    }
+                    base.Expanded = value;
+                }
+            }
+        }
+
+        protected internal override void OnExpandChange()
+        {
+            m_ThumbTucked = false;
+            if (!this.DesignMode && this.Expanded && this.PopupLocation.IsEmpty && this.PopupSide == ePopupSide.Default &&
+                (this.Parent is CaptionItemContainer ||
+                this.Parent is RibbonTabItemContainer))
+            {
+                if (this.SubItems.Count > 0 && this.SubItems[0] is ItemContainer &&
+                    ((ItemContainer)this.SubItems[0]).BackgroundStyle.Class == ElementStyleClassKeys.RibbonFileMenuContainerKey)
+                {
+                    RibbonStrip rs = this.ContainerControl as RibbonStrip;
+                    if (rs != null)
+                    {
+                        if (this.Parent is RibbonTabItemContainer)
+                        {
+                            if (this.EffectiveStyle == eDotNetBarStyle.Windows7)
+                                this.PopupLocation = new Point(this.IsRightToLeft ? this.Bounds.Right : this.LeftInternal, this.TopInternal - 1);
+                            else if (StyleManager.IsMetro(this.EffectiveStyle))
+                            {
+                                this.PopupLocation = new Point(this.IsRightToLeft ? this.Bounds.Right : this.LeftInternal - 4, this.TopInternal);
+                            }
+                            else
+                                this.PopupLocation = new Point(this.IsRightToLeft ? this.Bounds.Right : this.LeftInternal, this.TopInternal);
+                        }
+                        else
+                            this.PopupLocation = new Point(this.IsRightToLeft ? this.Bounds.Right : this.LeftInternal, rs.GetItemContainerBounds().Y - 1);
+                        this.VerifyPopupScreenPosition = false;
+                        m_ThumbTucked = true;
+                    }
+                }
+            }
+
+            _WasMaximized = false;
+            if (_BackstageTab != null && _BackstageTabEnabled)
+            {
+                PopupManager.CloseAllPopups();
+                if (this.Expanded)
+                {
+                    PopupOpenEventArgs args = new PopupOpenEventArgs();
+                    OnPopupOpen(args);
+                    if (args.Cancel)
+                    {
+                        this.Expanded = false;
+                        return;
+                    }
+
+                    if (StyleManager.IsMetro(EffectiveStyle))
+                    {
+                        CreateBackstageBackButton();
+                        if (_BackstageTab.Parent is Form && ((Form)_BackstageTab.Parent).WindowState == FormWindowState.Maximized)
+                            _WasMaximized = true;
+                    }
+                    else
+                        RemoveBackstageBackButton();
+                    
+                    UpdateBackstageTabSize();
+
+                    if (this.ContainerControl is IKeyTipsControl)
+                    {
+                        IKeyTipsControl kc = this.ContainerControl as IKeyTipsControl;
+                        _BackstageTab.TabStrip.ShowKeyTips = kc.ShowKeyTips;
+                        kc.ShowKeyTips = false;
+                    }
+                    OnPopupShowing(EventArgs.Empty);
+                    _BackstageTab.Visible = true;
+                    _BackstageTab.BringToFront();
+                    _BackstageTab.Focus();
+
+                    if (_BackstageTab.SelectedPanel != null)
+                        _BackstageTab.SelectedPanel.BringToFront();
+                    
+                    RibbonStrip strip = this.RibbonStrip;
+                    if (StyleManager.IsMetro(EffectiveStyle) && strip != null)
+                    {
+                        ((RibbonStripContainerItem)strip.GetBaseItemContainer()).MetroBackstageOpen = true;
+                        strip.TabGroupPaintSuspended = true;
+                    }
+                    if (strip != null && strip.SelectedRibbonTabItem != null)
+                    {
+                        _LastSelectedRibbonTabItem = strip.SelectedRibbonTabItem;
+                        if (this.DesignMode)
+                            _LastSelectedRibbonTabItem.RenderTabState = false;
+                        else
+                            _LastSelectedRibbonTabItem.Checked = false;
+                    }
+
+
+                }
+                else
+                {
+                    OnPopupClose(EventArgs.Empty);
+                    if (_LastSelectedRibbonTabItem != null)
+                    {
+                        if (this.DesignMode)
+                            _LastSelectedRibbonTabItem.RenderTabState = true;
+                        else
+                            _LastSelectedRibbonTabItem.Checked = true;
+                        _LastSelectedRibbonTabItem = null;
+                    }
+                    if (this.ContainerControl is IKeyTipsControl)
+                    {
+                        IKeyTipsControl kc = this.ContainerControl as IKeyTipsControl;
+                        kc.ShowKeyTips = _BackstageTab.TabStrip.ShowKeyTips;
+                        _BackstageTab.TabStrip.ShowKeyTips = false;
+                    }
+                    _BackstageTab.Visible = false;
+                    RibbonStrip strip = this.ContainerControl as RibbonStrip;
+
+                    if (StyleManager.IsMetro(EffectiveStyle))
+                    {
+                        _BackstageTab.Resize -= BackstageTabResized;
+                        _BackstageTab.TabStrip.Resize -= BackstageTabResized;
+                        if (strip != null)
+                        {
+                            ((RibbonStripContainerItem)strip.GetBaseItemContainer()).MetroBackstageOpen = false;
+                            strip.TabGroupPaintSuspended = false;
+                        }
+                    }
+
+                    if (strip != null)
+                    {
+                        strip.BackstageTabClosed(_BackstageTab);
+                        strip.Invalidate();
+                    }
+                    OnPopupFinalized(EventArgs.Empty);
+                }
+                RaiseExpandChange(EventArgs.Empty);
+                return;
+            }
+
+            base.OnExpandChange();
+        }
+
+        private void CreateBackstageBackButton()
+        {
+            if (_BackstageTab.Tabs.Contains(SysBackstageBackButtonName))
+                return;
+            ButtonItem back = new ButtonItem(SysBackstageBackButtonName);
+            back.ColorTable = eButtonColor.BlueOrb;
+            back.Symbol = "\uf060";
+            back.Shape = new EllipticalShapeDescriptor();
+            back.Click += new EventHandler(BackButtonClick);
+            back.FixedSize = new Size(35, 35);
+            back.Margin = new Padding(10, 0, 15, 15);
+            back.SetSystemItem(true);
+            _BackstageTab.Tabs.Insert(0, back);
+            back.SetDesignMode(false);
+            // Insert top dock panel which is excluded by region but will move the tab content down
+            Panel panel = new Panel();
+            panel.Dock = DockStyle.Top;
+            panel.Name = SysBackstagePanelName;
+            _BackstageTab.Controls.Add(panel);
+            panel.BringToFront();
+        }
+        private void RemoveBackstageBackButton()
+        {
+            if (!_BackstageTab.Tabs.Contains(SysBackstageBackButtonName))
+                return;
+            _BackstageTab.Tabs.Remove(SysBackstageBackButtonName);
+            Panel panel = (Panel)_BackstageTab.Controls[SysBackstagePanelName];
+            _BackstageTab.Controls.Remove(panel);
+            panel.Dispose();
+        }
+
+        void BackButtonClick(object sender, EventArgs e)
+        {
+            this.Expanded = false;
+        }
+
+        public override void ContainerLostFocus(bool appLostFocus)
+        {
+            if (_BackstageTabEnabled && _BackstageTab != null && this.DesignMode && this.Expanded && appLostFocus) return;
+
+            base.ContainerLostFocus(appLostFocus);
+            
+        }
+
+        internal override bool PopupPositionAdjusted
+        {
+            get { return base.PopupPositionAdjusted; }
+            set
+            {
+                base.PopupPositionAdjusted = value;
+                if (base.PopupPositionAdjusted && m_ThumbTucked)
+                    m_ThumbTucked = false;
+            }
+        }
+
+        internal void OnMenuPaint(ItemPaintArgs pa)
+        {
+            if (!m_ThumbTucked) return;
+
+            Graphics g = pa.Graphics;
+            RibbonStrip rs = this.ContainerControl as RibbonStrip;
+            if (rs != null)
+            {
+                if (this.Parent is RibbonTabItemContainer)
+                {
+                    if (pa.RightToLeft)
+                        g.TranslateTransform(-(this.LeftInternal - pa.ContainerControl.Width + this.WidthInternal), -(this.TopInternal));
+                    else
+                    {
+                        if (this.EffectiveStyle == eDotNetBarStyle.Windows7)
+                            g.TranslateTransform(-this.LeftInternal, -(this.TopInternal - 1));
+                        else
+                            g.TranslateTransform(-this.LeftInternal, -(this.TopInternal));
+                    }
+                }
+                else
+                {
+                    if (pa.RightToLeft)
+                        g.TranslateTransform(-(this.LeftInternal - pa.ContainerControl.Width + this.WidthInternal), -(rs.GetItemContainerBounds().Y - 1));
+                    else
+                        g.TranslateTransform(-this.LeftInternal, -(rs.GetItemContainerBounds().Y - 1));
+                }
+
+                g.ResetClip();
+                Control c = pa.ContainerControl;
+                pa.ContainerControl = rs;
+                pa.IsOnMenu = false;
+                this.IgnoreAlpha = true;
+                bool oldGlassEnabled = pa.GlassEnabled;
+                pa.GlassEnabled = rs.IsGlassEnabled;
+                _MenuOverlayPaint = true;
+                this.Paint(pa);
+                _MenuOverlayPaint = false;
+                pa.GlassEnabled = oldGlassEnabled;
+                this.IgnoreAlpha = false;
+                pa.ContainerControl = c;
+                pa.IsOnMenu = true;
+                g.ResetTransform();
+            }
+        }
+        protected override void OnCommandChanged()
+        {
+        }
+
+        protected override bool IsRightHanded
+        {
+            get
+            {
+                return false;
+            }
+        }
+        private bool _MenuOverlayPaint = false;
+        internal bool IsMenuOverlayPaint
+        {
+            get
+            {
+                return _MenuOverlayPaint;
+            }
+        }
+
+        protected override void OnStyleChanged()
+        {
+            if (this.EffectiveStyle == eDotNetBarStyle.Office2010)
+            {
+                this.ImagePaddingHorizontal = 0;
+                this.ImagePaddingVertical = 0;
+            }
+            else if (this.EffectiveStyle == eDotNetBarStyle.Windows7)
+            {
+                this.ImagePaddingHorizontal = 0;
+                this.ImagePaddingVertical = 0;
+            }
+            else if (StyleManager.IsMetro(this.EffectiveStyle))
+            {
+                this.ImagePaddingHorizontal = 0;
+                this.ImagePaddingVertical = 1;
+            }
+            else
+            {
+                if (ImagePaddingVertical == 0) ImagePaddingVertical = 2;
+                if (ImagePaddingHorizontal == 0) ImagePaddingHorizontal = 2;
+            }
+            base.OnStyleChanged();
+        }
+
+        protected override bool IsPulseEnabed
+        {
+            get
+            {
+                if ((this.EffectiveStyle == eDotNetBarStyle.Office2010 || StyleManager.IsMetro(this.EffectiveStyle)) && WinApi.IsGlassEnabled) return false;
+                return base.IsPulseEnabed;
+            }
+        }
+
+        private void UpdateBackstageTabSize()
+        {
+            if (_BackstageTab == null) return;
+            Control parentForm = _BackstageTab.Parent;
+            if (parentForm == null) throw new InvalidOperationException("BackstageTab control does not have a parent");
+
+            Rectangle tabBounds = parentForm.ClientRectangle;
+            RibbonStrip strip = this.RibbonStrip;
+            if (strip != null)
+            {
+                if (StyleManager.IsMetro(this.EffectiveStyle))
+                {
+                    tabBounds = new Rectangle(1, 1, parentForm.Width - 2, parentForm.Height - 2);
+                    Form form = parentForm as Form;
+                    if (form != null && form.WindowState == FormWindowState.Maximized)
+                    {
+                        if (form is RibbonForm)
+                        {
+                            NonClientInfo nci = ((RibbonForm)form).GetNonClientInfo();
+                            tabBounds.Width -= nci.LeftBorder;
+                            tabBounds.Height -= nci.BottomBorder;
+                        }
+                        else
+                        {
+                            tabBounds.Width -= SystemInformation.FrameBorderSize.Width;
+                            tabBounds.Height -= SystemInformation.FrameBorderSize.Height;
+                        }
+                    }
+                }
+                else
+                {
+                    Point p = parentForm.PointToClient(strip.PointToScreen(this.Bounds.Location));
+                    p.Y += this.Bounds.Height;// +1;
+                    tabBounds = new Rectangle(p.X, p.Y, parentForm.ClientRectangle.Width, parentForm.ClientRectangle.Height - p.Y);
+                    RibbonForm ribbonForm = parentForm as RibbonForm;
+                    if (ribbonForm != null)
+                    {
+                        if (!ribbonForm.IsGlassEnabled)
+                        {
+                            tabBounds.Width -= ribbonForm.BorderSize * 2;
+                            tabBounds.Height -= ribbonForm.BorderSize;
+                        }
+                    }
+                }
+            }
+        
+            _BackstageTab.Bounds = tabBounds;
+            if (StyleManager.IsMetro(this.EffectiveStyle))
+            {
+                _BackstageTab.Resize += BackstageTabResized;
+                _BackstageTab.TabStrip.Resize += BackstageTabResized;
+                if (_BackstageTab.IsHandleCreated)
+                    UpdateBackstageTabSizeAndRegion();
+                else
+                    _BackstageTab.HandleCreated += new EventHandler(BackstageTabHandleCreated);
+            }
+            else if(_BackstageTab.Region != null)
+                _BackstageTab.Region = null;
+            _BackstageTab.Anchor = AnchorStyles.Left | AnchorStyles.Right | AnchorStyles.Bottom | AnchorStyles.Top;
+        }
+
+        private void UpdateBackstageTabSizeAndRegion()
+        {
+            _BackstageTab.RecalcLayout();
+            UpdateBackstageTabMetroRegion();
+        }
+        void BackstageTabHandleCreated(object sender, EventArgs e)
+        {
+            _BackstageTab.HandleCreated -= new EventHandler(BackstageTabHandleCreated);
+            BarUtilities.InvokeDelayed(new MethodInvoker(delegate { UpdateBackstageTabSizeAndRegion(); }), 50);
+        }
+        private bool _WasMaximized = false;
+        private void BackstageTabResized(object sender, EventArgs e)
+        {
+            if (StyleManager.IsMetro(this.EffectiveStyle))
+            {
+                Form parentForm = _BackstageTab.Parent as Form;
+                if (parentForm != null && parentForm.WindowState == FormWindowState.Maximized)
+                    _WasMaximized = true;
+                else if (_WasMaximized)
+                {
+                    _WasMaximized = false;
+                    UpdateBackstageTabSize();
+                    return;
+                }
+            }
+            UpdateBackstageTabMetroRegion();
+        }
+        private void UpdateBackstageTabMetroRegion()
+        {
+            int captionHeight = 28;
+            RibbonStrip strip = RibbonStrip;
+            if (strip != null) captionHeight = strip.GetTotalCaptionHeight();
+
+            _BackstageTab.Controls[SysBackstagePanelName].Height = captionHeight;
+
+            Rectangle tabBounds = _BackstageTab.ClientRectangle;
+            System.Drawing.Drawing2D.GraphicsPath path = new System.Drawing.Drawing2D.GraphicsPath();
+            path.AddLine(0, 0, _BackstageTab.TabStrip.Width, 0);
+            path.AddLine(_BackstageTab.TabStrip.Width, 0, _BackstageTab.TabStrip.Width, captionHeight);
+            path.AddLine(_BackstageTab.TabStrip.Width, captionHeight, tabBounds.Width, captionHeight);
+            path.AddLine(tabBounds.Width, tabBounds.Height, 0, tabBounds.Height);
+            path.CloseAllFigures();
+            Region reg = new Region(path);
+            _BackstageTab.Region = reg;
+            path.Dispose();
+        }
+        private RibbonTabItem _LastSelectedRibbonTabItem = null;
+        private RibbonStrip RibbonStrip
+        {
+            get
+            {
+                return this.ContainerControl as RibbonStrip;
+            }
+        }
+
+        private bool _BackstageTabEnabled = true;
+        /// <summary>
+        /// Gets or sets whether control set on BackstageTab property is used on application menu popup.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether control set on BackstageTab property is used on application menu popup.")]
+        public bool BackstageTabEnabled
+        {
+            get { return _BackstageTabEnabled; }
+            set
+            {
+                this.Expanded = false;
+                _BackstageTabEnabled = value;
+            }
+        }
+        
+
+        private SuperTabControl _BackstageTab = null;
+        /// <summary>
+        /// Gets or sets the backstage tab that is displayed instead of popup menu.
+        /// </summary>
+        [DefaultValue(null), Category("Behavior"), Description("Indicates backstage tab that is displayed instead of popup menu.")]
+        public SuperTabControl BackstageTab
+        {
+            get
+            {
+                return _BackstageTab;
+            }
+            set
+            {
+                SuperTabControl oldValue = _BackstageTab;
+                _BackstageTab = value;
+                OnBackstageTabChanged(oldValue, value);
+            }
+        }
+
+        private void OnBackstageTabChanged(SuperTabControl oldValue, SuperTabControl newValue)
+        {
+            if (oldValue != null)
+            {
+                oldValue.Leave -= BackstageTabLeave;
+                if (oldValue.TabStrip != null) oldValue.TabStrip.ApplicationButton = null;
+            }
+
+            if (this.Expanded) this.Expanded = false;
+            if (newValue != null)
+            {
+                newValue.Visible = false;
+                newValue.Leave += BackstageTabLeave;
+                if (newValue.TabStrip != null) newValue.TabStrip.ApplicationButton = this;
+            }
+        }
+
+        private void BackstageTabLeave(object sender, EventArgs e)
+        {
+            if (this.Expanded)
+                this.Expanded = false;
+        }
+
+        /// <summary>
+        /// Processes the Escape key when Application Button is hosting the backstage tab and uses it to close the tab if open.
+        /// This method is called from ProcessDialogKey method of Office2007RibbonForm.
+        /// </summary>
+        /// <param name="keyData">Key data</param>
+        /// <returns>true if key was used to close backstage tab</returns>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ProcessEscapeKey(Keys keyData)
+        {
+            if (keyData == Keys.Escape && this.Expanded)
+            {
+                this.Expanded = false;
+                return true;
+            }
+            return false;
+        }
+        internal void BackstageMnemonicProcessed(char charCode)
+        {
+        }
+
+        protected override bool CanShowPopup
+        {
+            get
+            {
+                return (this.ShowSubItems || ShouldAutoExpandOnClick) && (this.SubItems.Count > 0 || this.PopupType == ePopupType.Container || BackstageTab != null && BackstageTabEnabled);
+            }
+        }
+
+        public override void Refresh()
+        {
+            if (StyleManager.IsMetro(this.EffectiveStyle))
+            {
+                Control container = this.ContainerControl as Control;
+                if (container != null)
+                {
+                    RibbonForm form = container.FindForm() as RibbonForm;
+                    if (form != null)
+                    {
+                        Rectangle r = this.Bounds;
+                        r.Height++;
+                        r.Width++;
+                        r.Inflate(1, 1);
+                        form.Invalidate(r, true);
+                    } 
+                }
+            }
+            base.Refresh();
+        }
+        #endregion
+    }
+
+    public class Office2007StartButton : ApplicationButton
+    {
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Ribbon/BarBackgroundPainter.cs b/PROMS/DotNetBar Source Code/Ribbon/BarBackgroundPainter.cs
new file mode 100644
index 00000000..5826b027
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Ribbon/BarBackgroundPainter.cs	
@@ -0,0 +1,38 @@
+using System;
+using System.Text;
+
+namespace DevComponents.DotNetBar
+{
+    internal class BarBackgroundPainter
+    {
+        #region Docked Background
+        /// <summary>
+        /// Paints background of docked bar.
+        /// </summary>
+        /// <param name="e">Context information</param>
+        public virtual void PaintDockedBackground(ToolbarRendererEventArgs e)
+        {
+        }
+        #endregion
+
+        #region Floating Background
+        /// <summary>
+        /// Paints background of floating bar.
+        /// </summary>
+        /// <param name="e">Context information</param>
+        public virtual void PaintFloatingBackground(ToolbarRendererEventArgs e)
+        {
+        }
+        #endregion
+
+        #region Popup Background
+        /// <summary>
+        /// Paints background of popup bar.
+        /// </summary>
+        /// <param name="e">Context information</param>
+        public virtual void PaintPopupBackground(ToolbarRendererEventArgs e)
+        {
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Ribbon/BaseItemAutoSizeBag.cs b/PROMS/DotNetBar Source Code/Ribbon/BaseItemAutoSizeBag.cs
new file mode 100644
index 00000000..2d2ac112
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Ribbon/BaseItemAutoSizeBag.cs	
@@ -0,0 +1,131 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar
+{
+    #region BaseItemAutoSizeBag
+    internal class BaseItemAutoSizeBag
+    {
+        public BaseItem Item = null;
+        private bool m_SettingsRecorded;
+
+        protected bool SettingsRecorded
+        {
+            get
+            {
+                return m_SettingsRecorded;
+            }
+            set
+            {
+                m_SettingsRecorded = value;
+            }
+        }
+
+        public virtual void RecordSetting(BaseItem item)
+        {
+            this.Item = item;
+            m_SettingsRecorded = true;
+        }
+
+        public virtual void RestoreSettings()
+        {
+            m_SettingsRecorded = false;
+        }
+    }
+    #endregion
+
+    #region ItemContainerAutoSizeBag
+    internal class ItemContainerAutoSizeBag : BaseItemAutoSizeBag
+    {
+        private bool m_MultiLine = false;
+        private eOrientation m_LayoutOrientation = eOrientation.Horizontal;
+        private bool m_TitleVisible = false;
+        public override void RecordSetting(BaseItem item)
+        {
+            if (this.SettingsRecorded)
+                return;
+            
+            ItemContainer cont = item as ItemContainer;
+            m_MultiLine = cont.MultiLine;
+            m_LayoutOrientation = cont.LayoutOrientation;
+            m_TitleVisible = cont.TitleVisible;
+
+            base.RecordSetting(item);
+        }
+
+        public override void RestoreSettings()
+        {
+            if (!this.SettingsRecorded) return;
+
+            ItemContainer cont = this.Item as ItemContainer;
+            cont.MultiLine = m_MultiLine;
+            cont.LayoutOrientation = m_LayoutOrientation;
+            cont.TitleVisible = m_TitleVisible;
+
+            base.RestoreSettings();
+        }
+    }
+    #endregion
+
+    #region ButtonItemAutoSizeBag
+    internal class ButtonItemAutoSizeBag : BaseItemAutoSizeBag
+    {
+        private eButtonStyle m_ButtonStyle = eButtonStyle.Default;
+        private eImagePosition m_ImagePosition = eImagePosition.Left;
+        private Size m_ImageFixedSize = Size.Empty;
+        private string m_Text = null;
+
+        public override void RecordSetting(BaseItem item)
+        {
+            if (this.SettingsRecorded)
+                return;
+            
+            ButtonItem button = item as ButtonItem;
+            m_ButtonStyle = button.ButtonStyle;
+            m_ImagePosition = button.ImagePosition;
+            m_ImageFixedSize = button.ImageFixedSize;
+            if (button.TextMarkupBody != null && button.TextMarkupBody.HasExpandElement)
+                m_Text = button.Text;
+
+            base.RecordSetting(item);
+        }
+
+        public override void RestoreSettings()
+        {
+            if (!this.SettingsRecorded)
+                return;
+
+            ButtonItem button = this.Item as ButtonItem;
+            bool gi = button.GlobalItem;
+            button.GlobalItem = false;
+            button.ButtonStyle = m_ButtonStyle;
+            button.ImagePosition = m_ImagePosition;
+            button.ImageFixedSize = m_ImageFixedSize;
+            if (m_Text != null) button.Text = m_Text;
+
+            button.GlobalItem = gi;
+            base.RestoreSettings();
+        }
+    }
+    #endregion
+
+    #region AutoSizeBagFactory
+    internal class AutoSizeBagFactory
+    {
+        public static BaseItemAutoSizeBag CreateAutoSizeBag(ButtonItem item)
+        {
+            ButtonItemAutoSizeBag b = new ButtonItemAutoSizeBag();
+            b.Item = item;
+            return b;
+        }
+
+        public static ItemContainerAutoSizeBag CreateAutoSizeBag(ItemContainer item)
+        {
+            ItemContainerAutoSizeBag c = new ItemContainerAutoSizeBag();
+            c.Item = item;
+            return c;
+        }
+    }
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/Ribbon/ButtonItemPainter.cs b/PROMS/DotNetBar Source Code/Ribbon/ButtonItemPainter.cs
new file mode 100644
index 00000000..f7c94981
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Ribbon/ButtonItemPainter.cs	
@@ -0,0 +1,181 @@
+using System;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Summary description for ButtonItemPainter.
+	/// </summary>
+	internal abstract class ButtonItemPainter
+	{
+		public abstract void PaintButton(ButtonItem button, ItemPaintArgs pa);
+        public abstract void PaintButtonBackground(ButtonItem button, ItemPaintArgs pa, CompositeImage image);
+		public abstract void PaintButtonCheck(ButtonItem button, ItemPaintArgs pa, CompositeImage image, Rectangle r);
+		public abstract void PaintButtonImage(ButtonItem button, ItemPaintArgs pa, CompositeImage image, Rectangle imagebounds);
+		public abstract void PaintButtonMouseOver(ButtonItem button, ItemPaintArgs pa, CompositeImage image, Rectangle r);
+		public abstract void PaintButtonText(ButtonItem button, ItemPaintArgs pa, Color textColor, CompositeImage image);
+		public abstract void PaintCustomizeCheck(ButtonItem button, ItemPaintArgs pa, Rectangle r);
+		public abstract void PaintExpandButton(ButtonItem button, ItemPaintArgs pa);
+
+		public abstract Rectangle GetCheckRectangle(ButtonItem button, ItemPaintArgs pa, CompositeImage image);
+		public abstract Rectangle GetCustomizeMenuCheckRectangle(ButtonItem button, ItemPaintArgs pa);
+		public abstract Rectangle GetImageRectangle(ButtonItem button, ItemPaintArgs pa, CompositeImage image);
+		public abstract Rectangle GetMouseOverRectangle(ButtonItem button, ItemPaintArgs pa, CompositeImage image);
+
+		public abstract eTextFormat GetStringFormat(ButtonItem button, ItemPaintArgs pa, CompositeImage image);
+
+		public static string GetDrawText(string text)
+		{
+			return text; //.Replace(@"\n",Environment.NewLine);
+		}
+
+		public static bool IsItemEnabled(BaseItem item, ItemPaintArgs pa)
+		{
+            return item.GetEnabled(pa.ContainerControl);
+		}
+
+        public static Point[] GetExpandPolygon(Rectangle r, ePopupSide direction)
+        {
+            Point[] p = new Point[3];
+            Size defaultSize = new Size(Dpi.Width4, Dpi.Height3);
+            switch (direction)
+            {
+                case ePopupSide.Right:
+                    {
+                        p[0].X = r.Left + 1;
+                        p[0].Y = r.Top + (r.Height - defaultSize.Height) / 2 - 1;
+                        p[1].X = p[0].X;
+                        p[1].Y = p[0].Y + Dpi.Height6;
+                        p[2].X = p[0].X + Dpi.Width3;
+                        p[2].Y = p[0].Y + Dpi.Width3;
+                        break;
+                    }
+                case ePopupSide.Left:
+                    {
+                        p[0].X = r.Left + Dpi.Width3;
+                        p[0].Y = r.Top + (r.Height - defaultSize.Height) / 2 - 1;
+                        p[1].X = p[0].X;
+                        p[1].Y = p[0].Y + Dpi.Height6;
+                        p[2].X = p[0].X - Dpi.Width3;
+                        p[2].Y = p[0].Y + Dpi.Height3;
+                        break;
+                    }
+                case ePopupSide.Top:
+                    {
+                        p[0].X = r.Left + (r.Width - defaultSize.Width) / 2;
+                        p[0].Y = r.Top + (r.Height - defaultSize.Height) / 2 + defaultSize.Height;
+                        p[1].X = p[0].X + Dpi.Width5;
+                        p[1].Y = p[0].Y+1;
+                        p[2].X = p[0].X + Dpi.Width2;
+                        p[2].Y = p[0].Y - Dpi.Height3;
+                        //p[0].X = r.Left + (r.Width - defaultSize.Width) / 2 - Dpi.Width1;
+                        //p[0].Y = r.Top + (r.Height - defaultSize.Height) / 2 + defaultSize.Height;
+                        //p[1].X = p[0].X + Dpi.Width6;
+                        //p[1].Y = p[0].Y;
+                        //p[2].X = p[0].X + Dpi.Width3;
+                        //p[2].Y = p[0].Y - Dpi.Height4;
+                        break;
+                    }
+                case ePopupSide.Bottom:
+                case ePopupSide.Default:
+                    {
+                        p[0].X = r.Left + (r.Width - defaultSize.Width) / 2;
+                        p[0].Y = r.Top + (r.Height - defaultSize.Height) / 2 + 1;
+                        p[1].X = p[0].X + Dpi.Width5;
+                        p[1].Y = p[0].Y;
+                        p[2].X = p[0].X + Dpi.Width2;
+                        p[2].Y = p[0].Y + Dpi.Height3;
+                        break;
+                    }
+            }
+            return p;
+        }
+
+        public static void PaintButtonExpandIndicator(ButtonItem button, ItemPaintArgs pa)
+        {
+            Graphics g = pa.Graphics;
+            Rectangle itemRect = button.DisplayRectangle;
+            Point[] p = new Point[3];
+            Rectangle r = button.SubItemsRect;
+
+            if (button.PopupSide == ePopupSide.Default)
+            {
+                if (button.Orientation == eOrientation.Horizontal)
+                {
+                    p[0].X = itemRect.Left + r.Left + (r.Width - Dpi.Width5) / 2;
+                    p[0].Y = itemRect.Top + r.Top + (r.Height - Dpi.Height3) / 2 + 1;
+                    p[1].X = p[0].X + Dpi.Width5;
+                    p[1].Y = p[0].Y;
+                    p[2].X = p[0].X + Dpi.Width2;
+                    p[2].Y = p[0].Y + Dpi.Height3;
+                }
+                else
+                {
+                    p[0].X = itemRect.Left + r.Left + r.Width / 2;
+                    p[0].Y = itemRect.Top + r.Top + r.Height / 2 - Dpi.Height3;
+                    p[1].X = p[0].X;
+                    p[1].Y = p[0].Y + Dpi.Height6;
+                    p[2].X = p[0].X + Dpi.Width3;
+                    p[2].Y = p[0].Y + Dpi.Height3;
+                }
+            }
+            else
+            {
+                switch (button.PopupSide)
+                {
+                    case ePopupSide.Right:
+                        {
+                            p[0].X = itemRect.Left + r.Left + r.Width / 2;
+                            p[0].Y = itemRect.Top + r.Top + r.Height / 2 - Dpi.Height3;
+                            p[1].X = p[0].X;
+                            p[1].Y = p[0].Y + Dpi.Height6;
+                            p[2].X = p[0].X + Dpi.Width3;
+                            p[2].Y = p[0].Y + Dpi.Height3;
+                            break;
+                        }
+                    case ePopupSide.Left:
+                        {
+                            p[0].X = itemRect.Left + r.Left + r.Width / 2 + Dpi.Width3;
+                            p[0].Y = itemRect.Top + r.Top + r.Height / 2 - Dpi.Height3;
+                            p[1].X = p[0].X;
+                            p[1].Y = p[0].Y + Dpi.Height6;
+                            p[2].X = p[0].X - Dpi.Width3;
+                            p[2].Y = p[0].Y + Dpi.Height3;
+                            break;
+                        }
+                    case ePopupSide.Top:
+                        {
+                            p[0].X = itemRect.Left + r.Left + (r.Width - Dpi.Width5) / 2;
+                            p[0].Y = itemRect.Top + r.Top + (r.Height - Dpi.Height3) / 2 + Dpi.Height4;
+                            p[1].X = p[0].X + Dpi.Width6;
+                            p[1].Y = p[0].Y;
+                            p[2].X = p[0].X + Dpi.Width3;
+                            p[2].Y = p[0].Y - Dpi.Height4;
+                            break;
+                        }
+                    case ePopupSide.Bottom:
+                        {
+                            p[0].X = itemRect.Left + r.Left + (r.Width - Dpi.Width5) / 2 + 1;
+                            p[0].Y = itemRect.Top + r.Top + (r.Height - Dpi.Height3) / 2 + 1;
+                            p[1].X = p[0].X + Dpi.Width5;
+                            p[1].Y = p[0].Y;
+                            p[2].X = p[0].X + Dpi.Width2;
+                            p[2].Y = p[0].Y + Dpi.Height3;
+                            break;
+                        }
+                }
+            }
+            if (IsItemEnabled(button, pa))
+            {
+                using (SolidBrush mybrush = new SolidBrush(pa.Colors.ItemText))
+                    g.FillPolygon(mybrush, p);
+            }
+            else
+            {
+                using (SolidBrush mybrush = new SolidBrush(pa.Colors.ItemDisabledText))
+                    g.FillPolygon(mybrush, p);
+            }
+        }
+
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/Ribbon/ButtonItemPainterHelper.cs b/PROMS/DotNetBar Source Code/Ribbon/ButtonItemPainterHelper.cs
new file mode 100644
index 00000000..a6e9609c
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Ribbon/ButtonItemPainterHelper.cs	
@@ -0,0 +1,56 @@
+using System.Drawing;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Summary description for ButtonItemPainterHelper.
+	/// </summary>
+	internal class ButtonItemPainterHelper
+	{
+		public static Color GetTextColor(ButtonItem button, ItemPaintArgs pa)
+		{
+			Color textColor=SystemColors.ControlText;
+
+			if(!ButtonItemPainter.IsItemEnabled(button, pa))
+			{
+				if(!pa.Colors.ItemDisabledText.IsEmpty)
+					textColor=pa.Colors.ItemDisabledText;
+				else
+					textColor=SystemColors.ControlDark;
+			}
+			else if(button.IsMouseDown && !pa.Colors.ItemPressedText.IsEmpty)
+			{
+				textColor=pa.Colors.ItemPressedText;
+			}
+			else if(button.IsMouseOver)
+			{
+				if(!button.HotForeColor.IsEmpty)
+					textColor=button.HotForeColor;
+				else
+					textColor=pa.Colors.ItemHotText;
+			}
+			else if(button.Expanded && !pa.Colors.ItemExpandedText.IsEmpty)
+			{
+				textColor=pa.Colors.ItemExpandedText;
+			}
+			else if(button.Checked && !pa.Colors.ItemCheckedText.IsEmpty)
+			{
+				textColor=pa.Colors.ItemCheckedText;
+			}
+			else
+			{
+				if(!button.ForeColor.IsEmpty)
+					textColor=button.ForeColor;
+				else
+				{
+					if(button.IsThemed && button.IsOnMenuBar && pa.Colors.ItemText==SystemColors.ControlText)
+						textColor=SystemColors.MenuText;
+					else
+						textColor=pa.Colors.ItemText;
+				}
+			}
+
+			return textColor;
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/Ribbon/ButtonItemRendererEventArgs.cs b/PROMS/DotNetBar Source Code/Ribbon/ButtonItemRendererEventArgs.cs
new file mode 100644
index 00000000..d1ae2d01
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Ribbon/ButtonItemRendererEventArgs.cs	
@@ -0,0 +1,59 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Provides data for ButtonItem rendering.
+    /// </summary>
+    public class ButtonItemRendererEventArgs
+    {
+        /// <summary>
+        /// Gets or sets Graphics object group is rendered on.
+        /// </summary>
+        public Graphics Graphics = null;
+        /// <summary>
+        /// Gets the reference to ButtonItem instance being rendered.
+        /// </summary>
+        public ButtonItem ButtonItem = null;
+
+        /// <summary>
+        /// Reference to internal data.
+        /// </summary>
+        internal ItemPaintArgs ItemPaintArgs = null;
+
+        /// <summary>
+        /// Indicates whether to cancel system rendering of the item.
+        /// </summary>
+        public bool Cancel = false;
+
+        /// <summary>
+        /// Creates new instance of the object.
+        /// </summary>
+        public ButtonItemRendererEventArgs() { }
+
+        /// <summary>
+        /// Creates new instance of the object and initializes it with default values
+        /// </summary>
+        /// <param name="g">Reference to Graphics object.</param>
+        /// <param name="button">Reference to ButtonItem object.</param>
+        public ButtonItemRendererEventArgs(Graphics g, ButtonItem button)
+        {
+            this.Graphics = g;
+            this.ButtonItem = button;
+        }
+
+        /// <summary>
+        /// Creates new instance of the object and initializes it with default values
+        /// </summary>
+        /// <param name="g">Reference to Graphics object.</param>
+        /// <param name="button">Reference to ButtonItem object.</param>
+        internal ButtonItemRendererEventArgs(Graphics g, ButtonItem button, ItemPaintArgs pa)
+        {
+            this.Graphics = g;
+            this.ButtonItem = button;
+            this.ItemPaintArgs = pa;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Ribbon/CaptionItemContainer.cs b/PROMS/DotNetBar Source Code/Ribbon/CaptionItemContainer.cs
new file mode 100644
index 00000000..df3fa943
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Ribbon/CaptionItemContainer.cs	
@@ -0,0 +1,267 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Defines container for ribbon caption layout and quick access toolbar customization and overflow.
+    /// </summary>
+    internal class CaptionItemContainer : GenericItemContainer
+    {
+        #region Private Variables
+        private int m_MinTitleSize = 40;
+        private int m_MoreItemsLeft = 0;
+        private CustomizeItem m_CustomizeItem = null;
+        private int m_MaxItemHeight = 0;
+        #endregion
+
+        #region Constructor
+        public CaptionItemContainer():base()
+        {
+            this.FirstItemSpacing = 3;
+            this.ToolbarItemsAlign = eContainerVerticalAlignment.Top;
+        }
+        #endregion
+
+        #region Layout
+        public override void RecalcSize()
+        {
+            if (m_MoreItems != null && m_MoreItems.Expanded)
+                m_MoreItems.Expanded = false;
+
+            m_RecalculatingSize = true;
+            int width = m_MinTitleSize;
+            if (this.ContainerControl is Ribbon.QatToolbar)
+                width = 0;
+            int count = this.SubItems.Count;
+            int firstFarIndex = -1;
+            int maxHeight = 0;
+            int maxItemHeight = 0;
+            int moreItemsHeight = Dpi.Height22;
+            bool hasQatCustomizeItem = false;
+            for (int i = 0; i < count; i++)
+            {
+                BaseItem item = this.SubItems[i];
+                if (!item.Visible)
+                    continue;
+                item.RecalcSize();
+                item.Displayed = true;
+                width += (item.WidthInternal + (i==0?this.FirstItemSpacing:m_ItemSpacing));
+                
+                if (item.ItemAlignment == eItemAlignment.Far && firstFarIndex == -1)
+                    firstFarIndex = i;
+                if (firstFarIndex == -1)
+                    moreItemsHeight = item.HeightInternal;
+
+                if (item.HeightInternal > maxHeight)
+                    maxHeight = item.HeightInternal;
+                if (item.HeightInternal > maxItemHeight && !(item is ApplicationButton || item is SystemCaptionItem))
+                    maxItemHeight = item.HeightInternal;
+
+                if (item is QatCustomizeItem || item is QatOverflowItem)
+                    hasQatCustomizeItem = true;
+            }
+
+            if (hasQatCustomizeItem)
+                width += maxHeight / 2;
+
+            m_MaxItemHeight = maxItemHeight;
+            if (width < this.WidthInternal)
+            {
+                m_RecalculatingSize = false;
+                base.RecalcSize();
+                return;
+            }
+            if (firstFarIndex == -1)
+                firstFarIndex = this.SubItems.Count;
+            for (int i = firstFarIndex - 1; i >= 0; i--)
+            {
+                BaseItem item = this.SubItems[i];
+                if (!item.Visible)
+                    continue;
+                width -= item.WidthInternal;
+                item.Displayed = false;
+                if (width + DisplayMoreItem.FixedSize + maxHeight/2 < this.WidthInternal)
+                    break;
+            }
+
+            int x = this.LeftInternal + m_PaddingLeft;
+            int y = this.TopInternal + m_PaddingTop;
+            int loopTo = count;
+            if (firstFarIndex >= 0)
+                loopTo = firstFarIndex - 1;
+            bool oneNearVisible = false;
+            for (int i = 0; i < loopTo; i++)
+            {
+                BaseItem item = this.SubItems[i];
+                if (!item.Visible || !item.Displayed)
+                    continue;
+                oneNearVisible = true;
+                Rectangle rb = new Rectangle(x, y, item.WidthInternal, item.HeightInternal);
+                if (!(item is ApplicationButton || item is SystemCaptionItem))
+                    rb.Y += (maxItemHeight - item.HeightInternal) / 2;
+                item.Bounds = rb;
+                x += (item.WidthInternal + (i == 0 ? this.FirstItemSpacing : m_ItemSpacing));
+            }
+            m_MoreItemsLeft = x + maxHeight/2;
+
+            if (firstFarIndex >= 0)
+            {
+                x = this.DisplayRectangle.Right - m_PaddingRight;
+                for (int i = count - 1; i >= firstFarIndex; i--)
+                {
+                    BaseItem item = this.SubItems[i];
+                    if (!item.Visible || !item.Displayed)
+                        continue;
+                    x -= item.WidthInternal;
+                    item.Bounds = new Rectangle(x, y, item.WidthInternal, item.HeightInternal);
+                    x -= m_ItemSpacing;
+                }
+            }
+
+            m_Rect.Height = maxHeight + m_PaddingTop + m_PaddingBottom;
+            if (oneNearVisible)
+            {
+                // Add Display More item...
+                CreateMoreItemsButton(this.IsRightToLeft);
+
+                m_MoreItems.HeightInternal = moreItemsHeight;
+                m_MoreItems.RecalcSize();
+            }
+            else if(m_MoreItems!=null)
+            {
+                // Clean up, we don't need this anymore
+                m_MoreItems.Dispose();
+                m_MoreItems = null;
+            }
+
+            m_NeedRecalcSize = false;
+            m_RecalculatingSize = false;
+        }
+
+        protected override int GetItemLayoutWidth(BaseItem objItem)
+        {
+            if (objItem is QatCustomizeItem || objItem is QatOverflowItem)
+                return objItem.WidthInternal + this.HeightInternal / 2;
+            return base.GetItemLayoutWidth(objItem);
+        }
+
+        protected override int GetItemLayoutX(BaseItem objItem, int iX)
+        {
+            if (objItem is QatCustomizeItem || objItem is QatOverflowItem)
+                return iX + this.HeightInternal / 2;
+            return base.GetItemLayoutX(objItem, iX);
+        }
+
+        protected override int GetItemLayoutY(BaseItem objItem, int iY)
+        {
+            if (!(objItem is ApplicationButton || objItem is SystemCaptionItem || objItem is DevComponents.DotNetBar.Metro.MetroAppButton))
+                return iY + (m_MaxItemHeight - objItem.HeightInternal) / 2;
+            return base.GetItemLayoutY(objItem, iY);
+        }
+
+        internal int MaxItemHeight
+        {
+            get
+            {
+                return m_MaxItemHeight;
+            }
+        }
+
+        protected override Point GetMoreItemsLocation(bool isRightToLeft)
+        {
+            if (m_MoreItems == null)
+                return Point.Empty;
+            Point p = Point.Empty;
+            if (m_Orientation == eOrientation.Vertical)
+            {
+                p.X = m_Rect.Left + m_PaddingLeft;
+                p.Y = m_MoreItemsLeft;
+            }
+            else
+            {
+                if (isRightToLeft)
+                    p.X = m_Rect.X + m_PaddingLeft;
+                else
+                    p.X = m_MoreItemsLeft;
+                p.Y = m_Rect.Top + m_PaddingTop;
+            }
+
+            return p;
+        }
+
+        protected override void CreateMoreItemsButton(bool isRightToLeft)
+        {
+            if (m_MoreItems == null)
+            {
+                m_MoreItems = new QatOverflowItem();
+                m_MoreItems.Style = m_Style;
+                m_MoreItems.SetParent(this);
+                m_MoreItems.ThemeAware = this.ThemeAware;
+            }
+            if (this.MoreItemsOnMenu)
+                m_MoreItems.PopupType = ePopupType.Menu;
+            else
+                m_MoreItems.PopupType = ePopupType.ToolBar;
+            m_MoreItems.Orientation = m_Orientation;
+            m_MoreItems.Displayed = true;
+
+            if (m_Orientation == eOrientation.Vertical)
+            {
+                m_MoreItems.WidthInternal = m_Rect.Width - (m_PaddingLeft + m_PaddingRight);
+                m_MoreItems.RecalcSize();
+            }
+            else
+            {
+                m_MoreItems.HeightInternal = m_Rect.Height - (m_PaddingTop + m_PaddingBottom);
+                m_MoreItems.RecalcSize();
+            }
+
+            Point loc = GetMoreItemsLocation(isRightToLeft);
+            m_MoreItems.LeftInternal = loc.X;
+            m_MoreItems.TopInternal = loc.Y;
+        }
+        #endregion
+
+        #region Internal Implementation
+        protected internal override void OnItemAdded(BaseItem objItem)
+        {
+            base.OnItemAdded(objItem);
+
+            BaseItem item = objItem;
+            if (item is CustomizeItem)
+                m_CustomizeItem = (CustomizeItem)item;
+            else if (m_CustomizeItem != null)
+            {
+                bool added = false;
+                if(this.SubItems.Contains(m_CustomizeItem))
+                    this.SubItems._Remove(m_CustomizeItem);
+                for (int i = this.SubItems.Count - 1; i > 0; i--)
+                {
+                    if (this.SubItems[i].ItemAlignment == eItemAlignment.Near && !(this.SubItems[i] is SystemCaptionItem))
+                    {
+                        this.SubItems._Add(m_CustomizeItem, i+1);
+                        added = true;
+                        break;
+                    }
+                }
+                if (!added)
+                {
+                    if (this.SubItems.Count > 0 && this.SubItems[this.SubItems.Count - 1] is SystemCaptionItem)
+                        this.SubItems._Add(m_CustomizeItem, this.SubItems.Count - 2);
+                    else
+                        this.SubItems._Add(m_CustomizeItem);
+                }
+            }
+        }
+
+        protected internal override void OnAfterItemRemoved(BaseItem objItem, int itemIndex)
+        {
+            if (objItem == m_CustomizeItem)
+                m_CustomizeItem = null;
+            base.OnAfterItemRemoved(objItem, itemIndex);
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Ribbon/DesignTimeProviderContainer.cs b/PROMS/DotNetBar Source Code/Ribbon/DesignTimeProviderContainer.cs
new file mode 100644
index 00000000..f91cf25d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Ribbon/DesignTimeProviderContainer.cs	
@@ -0,0 +1,268 @@
+using System.Drawing;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Summary description for DesignTimeProviderContainer.
+	/// </summary>
+	public class DesignTimeProviderContainer
+	{
+		/// <summary>
+		/// Returns information about insertion position for an item given screen coordinates. Used internally for drag&drop support.
+		/// </summary>
+		/// <param name="containerItem">Container item</param>
+		/// <param name="pScreen">Screen coordinates</param>
+		/// <param name="DragItem">Item that is being dragged</param>
+		/// <returns>Information about insertion position or null if item cannot be inserted to the container.</returns>
+		public static InsertPosition GetInsertPosition(BaseItem containerItem, Point pScreen, BaseItem DragItem)
+		{
+			InsertPosition objInsertPos=null;
+            Control objContainer = null;
+
+            if (containerItem is PopupItem && containerItem.Expanded)
+                objContainer = ((PopupItem)containerItem).PopupControl;
+            else
+                objContainer = containerItem.ContainerControl as Control;
+
+            if (objContainer == null)
+				return null;
+
+			Point pClient=objContainer.PointToClient(pScreen);
+			Rectangle thisRect=containerItem.DisplayRectangle;
+            if (containerItem is PopupItem && containerItem.Expanded)
+                thisRect = objContainer.DisplayRectangle;
+			if(thisRect.Contains(pClient) || containerItem.SubItems.Count==0 && objContainer.ClientRectangle.Contains(pClient) || containerItem is ItemContainer && ((ItemContainer)containerItem).SystemContainer && objContainer.ClientRectangle.Contains(pClient))
+			{
+				Rectangle r;
+				BaseItem objItem;
+				// Check first inside any expanded items
+				objItem=containerItem.ExpandedItem();
+				if(objItem!=null)
+				{
+					IDesignTimeProvider provider=objItem as IDesignTimeProvider;
+					if(provider!=null)
+					{
+						objInsertPos=provider.GetInsertPosition(pScreen, DragItem);
+						if(objInsertPos!=null)
+							return objInsertPos;
+					}
+				}
+
+                bool dragItemPreviousItem = false;
+				for(int i=0;i<containerItem.SubItems.Count;i++)
+				{
+					objItem=containerItem.SubItems[i];
+					r=objItem.DisplayRectangle;
+					r.Inflate(2,2);
+					if(objItem.Visible && r.Contains(pClient))
+					{
+						if(objItem.SystemItem && containerItem.SubItems.Count!=1)
+						{
+							return null;
+						}
+						if(objItem==DragItem)
+							return new InsertPosition();
+						
+						if(objItem.IsContainer && objItem is IDesignTimeProvider)
+						{
+							Rectangle inner=r;
+							inner.Inflate(-8,-8);
+                            if (inner.Contains(pClient))
+                            {
+                                return ((IDesignTimeProvider)objItem).GetInsertPosition(pScreen, DragItem);
+                            }
+						}
+                        if (containerItem.AllowDrop)
+                        {
+                            objInsertPos = new InsertPosition();
+                            objInsertPos.TargetProvider = (IDesignTimeProvider)containerItem;
+                            objInsertPos.Position = i;
+                            if (!dragItemPreviousItem)
+                            {
+                                if (containerItem.Orientation == eOrientation.Horizontal && !objItem.IsOnMenu)
+                                {
+                                    if (pClient.X <= objItem.LeftInternal + objItem.WidthInternal / 2 || objItem.SystemItem)
+                                        objInsertPos.Before = true;
+                                }
+                                else
+                                {
+                                    if (pClient.Y <= objItem.TopInternal + objItem.HeightInternal / 2 || objItem.SystemItem)
+                                        objInsertPos.Before = true;
+                                }
+                            }
+
+                            // We need to collapse any expanded items that are not on this bar
+                            IOwner owner = containerItem.GetOwner() as IOwner;
+                            if (owner != null)
+                            {
+                                BaseItem objExp = owner.GetExpandedItem();
+                                if (objExp != null)
+                                {
+                                    while (objExp.Parent != null)
+                                        objExp = objExp.Parent;
+                                    BaseItem objParent = objItem;
+                                    while (objParent.Parent != null)
+                                        objParent = objParent.Parent;
+                                    if (objExp != objParent)
+                                        owner.SetExpandedItem(null);
+                                }
+                            }
+
+                            if (CanExpand(objItem))
+                            {
+                                if (!objItem.Expanded && objItem.CanCustomize)
+                                    objItem.Expanded = true;
+                            }
+                            else if(DragItem == null || objItem!=null && objItem != DragItem.Parent)
+                            {
+                                BaseItem.CollapseSubItems(containerItem);
+                            }
+                            break;
+                        }
+					}
+                    dragItemPreviousItem = (DragItem == objItem);
+				}
+				if(objInsertPos==null && containerItem.AllowDrop)
+				{
+					// Container is empty but it can contain the items
+					if(containerItem.SubItems.Count>1 && containerItem.SubItems[containerItem.SubItems.Count-1].SystemItem)
+						objInsertPos=new InsertPosition(containerItem.SubItems.Count-2,true,(IDesignTimeProvider)containerItem);
+					else
+						objInsertPos=new InsertPosition(containerItem.SubItems.Count-1,false,(IDesignTimeProvider)containerItem);
+				}
+			}
+			else
+			{
+				foreach(BaseItem objItem in containerItem.SubItems)
+				{
+					if(objItem==DragItem)
+						continue;
+					IDesignTimeProvider provider=objItem as IDesignTimeProvider;
+					if(provider!=null)
+					{
+						objInsertPos=provider.GetInsertPosition(pScreen, DragItem);
+						if(objInsertPos!=null)
+							break;
+					}
+				}				
+			}
+			return objInsertPos;
+		}
+
+	    private static bool CanExpand(BaseItem objItem)
+	    {
+	        return (objItem is PopupItem && (objItem.SubItems.Count > 0 || objItem.IsOnMenuBar)) || objItem is ItemContainer && ((ItemContainer)objItem).CanExpand;
+	    }
+
+	    /// <summary>
+		/// Draws reversible marker to indicates item drag&drop position
+		/// </summary>
+		/// <param name="containerItem">Container item</param>
+		/// <param name="iPos">Position to draw marker at</param>
+		/// <param name="Before">Indicates whether the marker is drawn before the reference position</param>
+		public static void DrawReversibleMarker(BaseItem containerItem, int iPos, bool Before)
+		{
+			Control objCtrl=containerItem.ContainerControl as Control;
+			if(objCtrl==null)
+				return;
+
+			BaseItem objItem=null;
+			if(iPos>=0)
+				objItem=containerItem.SubItems[iPos];
+			Rectangle r, rl,rr;
+			if(objItem!=null)
+			{
+				if(objItem.DesignInsertMarker!=eDesignInsertPosition.None)
+					objItem.DesignInsertMarker=eDesignInsertPosition.None;
+				else if(Before)
+					objItem.DesignInsertMarker=eDesignInsertPosition.Before;
+				else
+					objItem.DesignInsertMarker=eDesignInsertPosition.After;
+				return;
+			}
+			else
+			{
+				Rectangle rTmp=containerItem.DisplayRectangle;
+				rTmp.Inflate(-1,-1);
+				r=new Rectangle(rTmp.Left+2,rTmp.Top+2,1,rTmp.Height-4);
+				rl=new Rectangle(rTmp.Left,rTmp.Top+1,5,1);
+				rr=new Rectangle(rTmp.Left,rTmp.Bottom-2,5,1);
+			}
+            //r.Location=objCtrl.PointToScreen(r.Location);
+            //rl.Location=objCtrl.PointToScreen(rl.Location);
+            //rr.Location=objCtrl.PointToScreen(rr.Location);
+            //ControlPaint.DrawReversibleFrame(r,SystemColors.Control,FrameStyle.Thick);
+            //ControlPaint.DrawReversibleFrame(rl,SystemColors.Control,FrameStyle.Thick);
+            //ControlPaint.DrawReversibleFrame(rr,SystemColors.Control,FrameStyle.Thick);
+		}
+
+		/// <summary>
+		/// Inserts drag&drop item at specified position.
+		/// </summary>
+		/// <param name="containerItem">Container item.</param>
+		/// <param name="objItem">Item being inserted</param>
+		/// <param name="iPos">Insertion position</param>
+		/// <param name="Before">Indicates whether item is inserted before the specified insertion position</param>
+		public static void InsertItemAt(BaseItem containerItem, BaseItem objItem, int iPos, bool Before)
+		{
+			if(containerItem.ExpandedItem()!=null)
+			{
+				containerItem.ExpandedItem().Expanded=false;
+			}
+			if(!Before)
+			{
+				if(iPos+1>=containerItem.SubItems.Count)
+				{
+					containerItem.SubItems.Add(objItem,GetAppendPosition(containerItem));
+				}
+				else
+				{
+					containerItem.SubItems.Add(objItem,iPos+1);
+				}
+			}
+			else
+			{
+				if(iPos>=containerItem.SubItems.Count)
+				{
+					containerItem.SubItems.Add(objItem, GetAppendPosition(containerItem));
+				}
+				else
+				{
+					containerItem.SubItems.Add(objItem,iPos);
+				}
+			}
+			if(containerItem.ContainerControl is Bar)
+				((Bar)containerItem.ContainerControl).RecalcLayout();
+			else if(containerItem.ContainerControl is MenuPanel)
+				((MenuPanel)containerItem.ContainerControl).RecalcSize();
+			else if(containerItem.ContainerControl is BarBaseControl)
+				((BarBaseControl)containerItem.ContainerControl).RecalcLayout();
+			else if(containerItem.ContainerControl is ItemControl)
+				((ItemControl)containerItem.ContainerControl).RecalcLayout();
+			else
+			{
+				containerItem.RecalcSize();
+				containerItem.Refresh();
+			}
+		}
+
+		/// <summary>
+		/// Returns insertion index for an item taking in account any system items that are at the end of the collection.
+		/// </summary>
+		/// <param name="objParent">Parent item</param>
+		/// <returns>Returns the index at which an item should be inserted</returns>
+		public static int GetAppendPosition(BaseItem objParent)
+		{
+			int iPos=-1;
+			for(int i=objParent.SubItems.Count-1;i>=0;i--)
+			{
+				if(objParent.SubItems[i].SystemItem)
+					iPos=i;
+				else
+					break;
+			}
+			return iPos;
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/Ribbon/DialogLauncherPainter.cs b/PROMS/DotNetBar Source Code/Ribbon/DialogLauncherPainter.cs
new file mode 100644
index 00000000..97ed50c8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Ribbon/DialogLauncherPainter.cs	
@@ -0,0 +1,12 @@
+using System;
+using System.Text;
+
+namespace DevComponents.DotNetBar
+{
+    internal abstract class DialogLauncherPainter
+    {
+        public abstract void PaintDialogLauncher(RibbonBarRendererEventArgs e);
+        //public virtual void PaintBackground(RibbonBarRendererEventArgs e) { }
+        //public virtual void PaintTitle(RibbonBarRendererEventArgs e) { }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Ribbon/EventDelegates.cs b/PROMS/DotNetBar Source Code/Ribbon/EventDelegates.cs
new file mode 100644
index 00000000..a2ee7a2c
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Ribbon/EventDelegates.cs	
@@ -0,0 +1,158 @@
+using DevComponents.DotNetBar.Rendering;
+using System;
+using System.Text;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Defines delegate for RenderKeyTips event.
+    /// </summary>
+    public delegate void KeyTipsRendererEventHandler(object sender, KeyTipsRendererEventArgs e);
+
+    /// <summary>
+    /// Defines delegate for RenderRibbonTabGroup event.
+    /// </summary>
+    public delegate void RibbonTabGroupRendererEventHandler(object sender, RibbonTabGroupRendererEventArgs e);
+
+    /// <summary>
+    /// Defines delegate for RenderItemContainer event.
+    /// </summary>
+    public delegate void ItemContainerRendererEventHandler(object sender, ItemContainerRendererEventArgs e);
+
+    /// <summary>
+    /// Defines delegate for RenderItemContainerSeparator event.
+    /// </summary>
+    public delegate void ItemContainerSeparatorRendererEventHandler(object sender, ItemContainerSeparatorRendererEventArgs e);
+
+    /// <summary>
+    /// Defines delegate for ButtonItem rendering events.
+    /// </summary>
+    public delegate void ButtonItemRendererEventHandler(object sender, ButtonItemRendererEventArgs e);
+
+    /// <summary>
+    /// Defines delegate for RibbonTabItem rendering events.
+    /// </summary>
+    public delegate void RibbonTabItemRendererEventHandler(object sender, RibbonTabItemRendererEventArgs e);
+
+    /// <summary>
+    /// Defines delegate for toolbar rendering events.
+    /// </summary>
+    public delegate void ToolbarRendererEventHandler(object sender, ToolbarRendererEventArgs e);
+
+    /// <summary>
+    /// Defines delegate for Rendering dialog launcher button rendering events.
+    /// </summary>
+    public delegate void RibbonBarRendererEventHandler(object sender, RibbonBarRendererEventArgs e);
+
+    /// <summary>
+    /// Defines delegate for ColorItem rendering events.
+    /// </summary>
+    public delegate void ColorItemRendererEventHandler(object sender, ColorItemRendererEventArgs e);
+
+    /// <summary>
+    /// Defines delegate for RibbonControl rendering events.
+    /// </summary>
+    public delegate void RibbonControlRendererEventHandler(object sender, RibbonControlRendererEventArgs e);
+
+    /// <summary>
+    /// Defines delegate for SystemCaptionItem rendering events.
+    /// </summary>
+    public delegate void SystemCaptionItemRendererEventHandler(object sender, SystemCaptionItemRendererEventArgs e);
+
+    /// <summary>
+    /// Defines delegate for MdiSystemItem rendering events.
+    /// </summary>
+    public delegate void MdiSystemItemRendererEventHandler(object sender, MdiSystemItemRendererEventArgs e);
+
+    /// <summary>
+    /// Defines delegate for RenderFormCaptionBackground rendering events.
+    /// </summary>
+    public delegate void FormCaptionRendererEventHandler(object sender, FormCaptionRendererEventArgs e);
+
+    /// <summary>
+    /// Defines delegate for CustomizeMenuPopup events.
+    /// </summary>
+    public delegate void CustomizeMenuPopupEventHandler(object sender, RibbonCustomizeEventArgs e);
+
+    /// <summary>
+    /// Defines delegate for the Quick Access Overflow item rendering events.
+    /// </summary>
+    public delegate void QatOverflowItemRendererEventHandler(object sender, QatOverflowItemRendererEventArgs e);
+
+    /// <summary>
+    /// Defines delegate for the Quick Access Customize item rendering events.
+    /// </summary>
+    public delegate void QatCustomizeItemRendererEventHandler(object sender, QatCustomizeItemRendererEventArgs e);
+
+    /// <summary>
+    /// Defines delegate for the Quick Access Customization dialog events.
+    /// </summary>
+    public delegate void QatCustomizeDialogEventHandler(object sender, QatCustomizeDialogEventArgs e);
+
+    /// <summary>
+    /// Defines delegate for the CheckBoxItem rendering events.
+    /// </summary>
+    public delegate void CheckBoxItemRendererEventHandler(object sender, CheckBoxItemRenderEventArgs e);
+
+    /// <summary>
+    /// Defines delegate for the ProgressBarItem rendering events.
+    /// </summary>
+    public delegate void ProgressBarItemRendererEventHandler(object sender, ProgressBarItemRenderEventArgs e);
+
+    /// <summary>
+    /// Defines delegate for the Navigation Pane rendering events.
+    /// </summary>
+    public delegate void NavPaneRendererEventHandler(object sender, NavPaneRenderEventArgs e);
+
+    /// <summary>
+    /// Defines delegate for the BeforeRibbonPanelPopupClose event.
+    /// </summary>
+    public delegate void RibbonPopupCloseEventHandler(object sender, RibbonPopupCloseEventArgs e);
+
+    /// <summary>
+    /// Defines delegate for the Slider item rendering events.
+    /// </summary>
+    public delegate void SliderItemRendererEventHandler(object sender, SliderItemRendererEventArgs e);
+
+    /// <summary>
+    /// Defines delegate for the SideBar control rendering event.
+    /// </summary>
+    public delegate void SideBarRendererEventHandler(object sender, SideBarRendererEventArgs e);
+
+    /// <summary>
+    /// Defines delegate for the SideBarPanelItem control rendering event.
+    /// </summary>
+    public delegate void SideBarPanelItemRendererEventHandler(object sender, SideBarPanelItemRendererEventArgs e);
+
+    /// <summary>
+    /// Defines delegate for the SwitchButtonItem control rendering event.
+    /// </summary>
+    public delegate void SwitchButtonRendererEventHandler(object sender, DevComponents.DotNetBar.Rendering.SwitchButtonRenderEventArgs e);
+
+    /// <summary>
+    /// Defines delegate for the Slider item rendering events.
+    /// </summary>
+    public delegate void RangeSliderItemRendererEventHandler(object sender, RangeSliderItemRendererEventArgs e);
+
+    /// <summary>
+    /// Defines delegate for the StepItem rendering events.
+    /// </summary>
+    public delegate void StepItemRendererEventHandler(object sender, StepItemRendererEventArgs e);
+    /// <summary>
+    /// Defines delegate for the ListBoxItem rendering events.
+    /// </summary>
+    public delegate void ListBoxItemRendererEventHandler(object sender, ListBoxItemRendererEventArgs e);
+    /// <summary>
+    /// Defines delegate for the SideNavItem rendering events.
+    /// </summary>
+    public delegate void SideNavItemRendererEventHandler(object sender, SideNavItemRendererEventArgs e);
+    /// <summary>
+    /// Defines delegate for the TabStrip rendering events.
+    /// </summary>
+    public delegate void TabFormStripRendererEventHandler(object sender, TabFormStripPainterArgs e);
+    /// <summary>
+    /// Defines delegate for the TabParentForm rendering events.
+    /// </summary>
+    public delegate void TabFormRendererEventHandler(object sender, TabFormPainterArgs e);
+    
+}
diff --git a/PROMS/DotNetBar Source Code/Ribbon/FadeAnimator.cs b/PROMS/DotNetBar Source Code/Ribbon/FadeAnimator.cs
new file mode 100644
index 00000000..66654d26
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Ribbon/FadeAnimator.cs	
@@ -0,0 +1,223 @@
+using System;
+using System.Text;
+using System.Collections;
+using System.Threading;
+
+namespace DevComponents.DotNetBar
+{
+    internal class FadeAnimator
+    {
+        // Fields
+        private static Thread fadeThread;
+        private static ArrayList fadeInfoList;
+        private static ReaderWriterLock rwImgListLock;
+        [ThreadStatic]
+        private static int threadWriterLockWaitCount;
+
+        // Methods
+        static FadeAnimator()
+        {
+            FadeAnimator.rwImgListLock = new ReaderWriterLock();
+        }
+
+        private FadeAnimator() {}
+
+        public static void Fade(object caller, EventHandler onFadeChangedHandler)
+        {
+            if (!BarUtilities.FadeAnimatorEnabled) return;
+            if (caller != null)
+            {
+                FadeAnimator.FadeInfo fadeInfo = null;
+                lock (caller)
+                {
+                    fadeInfo = new FadeAnimator.FadeInfo(caller);
+                }
+                FadeAnimator.StopFade(caller, onFadeChangedHandler);
+                bool flag1 = FadeAnimator.rwImgListLock.IsReaderLockHeld;
+                LockCookie cookie1 = new LockCookie();
+                FadeAnimator.threadWriterLockWaitCount++;
+                try
+                {
+                    if (flag1)
+                    {
+                        cookie1 = FadeAnimator.rwImgListLock.UpgradeToWriterLock(-1);
+                    }
+                    else
+                    {
+                        FadeAnimator.rwImgListLock.AcquireWriterLock(-1);
+                    }
+                }
+                finally
+                {
+                    FadeAnimator.threadWriterLockWaitCount--;
+                }
+                try
+                {
+                    if (FadeAnimator.fadeInfoList == null)
+                    {
+                        FadeAnimator.fadeInfoList = new ArrayList();
+                    }
+                    fadeInfo.FadeChangedHandler = onFadeChangedHandler;
+                    FadeAnimator.fadeInfoList.Add((FadeAnimator.FadeInfo)fadeInfo);
+                    if (FadeAnimator.fadeThread == null)
+                    {
+                        FadeAnimator.fadeThread = new Thread(new ThreadStart(FadeAnimator.AnimateFade50ms));
+                        FadeAnimator.fadeThread.Name = typeof(FadeAnimator).Name;
+                        FadeAnimator.fadeThread.IsBackground = true;
+                        FadeAnimator.fadeThread.Start();
+                    }
+                }
+                finally
+                {
+                    if (flag1)
+                    {
+                        FadeAnimator.rwImgListLock.DowngradeFromWriterLock(ref cookie1);
+                    }
+                    else
+                    {
+                        FadeAnimator.rwImgListLock.ReleaseWriterLock();
+                    }
+                }
+            }
+        }
+
+        private static void AnimateFade50ms()
+        {
+            while (true)
+            {
+                FadeAnimator.rwImgListLock.AcquireReaderLock(-1);
+                try
+                {
+                    for (int num1 = 0; num1 < FadeAnimator.fadeInfoList.Count; num1++)
+                    {
+                        FadeAnimator.FadeInfo info1 = FadeAnimator.fadeInfoList[num1] as FadeAnimator.FadeInfo;
+                        info1.Fade();
+                    }
+                }
+                finally
+                {
+                    
+                    FadeAnimator.rwImgListLock.ReleaseReaderLock();
+                }
+                try
+                {
+                    using (
+                                        System.Threading.ManualResetEvent wait =
+                                            new System.Threading.ManualResetEvent(false))
+                        wait.WaitOne(40);
+                    //Thread.Sleep(40);
+                }
+                catch
+                {
+                }
+            }
+        }
+
+        public static void StopFade(object caller, EventHandler onFrameChangedHandler)
+        {
+            if (!BarUtilities.FadeAnimatorEnabled) return;
+
+            if ((caller != null) && (FadeAnimator.fadeInfoList != null))
+            {
+                bool readerLockHeld = FadeAnimator.rwImgListLock.IsReaderLockHeld;
+                LockCookie cookie1 = new LockCookie();
+                FadeAnimator.threadWriterLockWaitCount++;
+                try
+                {
+                    if (readerLockHeld)
+                    {
+                        cookie1 = FadeAnimator.rwImgListLock.UpgradeToWriterLock(-1);
+                    }
+                    else
+                    {
+                        FadeAnimator.rwImgListLock.AcquireWriterLock(-1);
+                    }
+                }
+                finally
+                {
+                    FadeAnimator.threadWriterLockWaitCount--;
+                }
+                try
+                {
+                    for (int num1 = 0; num1 < FadeAnimator.fadeInfoList.Count; num1++)
+                    {
+                        FadeAnimator.FadeInfo info1 = FadeAnimator.fadeInfoList[num1] as FadeAnimator.FadeInfo;
+                        if (caller == info1.Caller)
+                        {
+                            if ((onFrameChangedHandler == info1.FadeChangedHandler) || ((onFrameChangedHandler != null) && onFrameChangedHandler.Equals(info1.FadeChangedHandler)))
+                            {
+                                FadeAnimator.fadeInfoList.Remove((FadeAnimator.FadeInfo)info1);
+                                info1.FadeChangedHandler = null;
+                                info1.Caller = null;
+                            }
+                            return;
+                        }
+                    }
+                }
+                finally
+                {
+                    if (readerLockHeld)
+                    {
+                        FadeAnimator.rwImgListLock.DowngradeFromWriterLock(ref cookie1);
+                    }
+                    else
+                    {
+                        FadeAnimator.rwImgListLock.ReleaseWriterLock();
+                    }
+                }
+            }
+        }
+
+        // Nested Types
+        private class FadeInfo
+        {
+            private object m_Caller;
+            private EventHandler m_OnFadeChangedHandler;
+
+            // Methods
+            public FadeInfo(object caller)
+            {
+                this.m_Caller = caller;
+            }
+
+            protected void OnFadeChanged(EventArgs e)
+            {
+                if (m_OnFadeChangedHandler != null)
+                {
+                    m_OnFadeChangedHandler(m_Caller, e);
+                }
+            }
+
+            public void Fade()
+            {
+                this.OnFadeChanged(EventArgs.Empty);
+            }
+
+            public EventHandler FadeChangedHandler
+            {
+                get
+                {
+                    return this.m_OnFadeChangedHandler;
+                }
+                set
+                {
+                    this.m_OnFadeChangedHandler = value;
+                }
+            }
+
+            internal object Caller
+            {
+                get
+                {
+                    return m_Caller;
+                }
+                set
+                {
+                    m_Caller = value;
+                }
+            }
+
+        }
+    }
+
+}
diff --git a/PROMS/DotNetBar Source Code/Ribbon/GalleryContainer.cs b/PROMS/DotNetBar Source Code/Ribbon/GalleryContainer.cs
new file mode 100644
index 00000000..2d716e8e
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Ribbon/GalleryContainer.cs	
@@ -0,0 +1,1735 @@
+using System;
+using System.Text;
+using System.ComponentModel;
+using System.Drawing;
+using DevComponents.UI.ContentManager;
+using System.Collections;
+using System.Drawing.Drawing2D;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represents the class that provides Office 2007 style Gallery container with drop-down ability.
+    /// </summary>
+    [ToolboxItem(false), DesignTimeVisible(false), ProvideProperty("GalleryGroup", typeof(BaseItem)), Designer("DevComponents.DotNetBar.Design.GalleryContainerDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+    public class GalleryContainer : ItemContainer, IExtenderProvider
+    {
+        #region Private Variables
+        private bool m_EnableGalleryPopup = true;
+        private ButtonItem m_ScrollUp = null;
+        private ButtonItem m_ScrollDown = null;
+        private ButtonItem m_PopupGallery = null;
+        private Size m_ScrollButtonSize = new Size(15, 20);
+        private int m_ScrollButtonContentSpacing = 1;
+        private Size m_DefaultSize = Size.Empty;
+        private Point m_ScrollPosition = Point.Empty;
+        private Size m_PopupGallerySize = Size.Empty;
+        private ScrollBar.ScrollBarCore m_ScrollBar = null;
+        private bool m_PopupGalleryStyle = false;
+        private Rectangle m_ViewRectangle = Rectangle.Empty;
+        private Size m_RecommendedSize = Size.Empty;
+        private bool m_StretchGallery = false;
+        internal bool SystemGallery = false;
+        private bool m_IncrementalSizing = true;
+        private GalleryGroupCollection m_Groups = null;
+        private bool m_ScrollAnimation = true;
+        private ThreadUIOperation m_ThreadUI = null;
+        private bool m_PopupUsesStandardScrollbars = true;
+        #endregion
+
+        #region Events
+        /// <summary>
+        /// Occurs when Gallery popup item is about to open.
+        /// </summary>
+        [System.ComponentModel.Description("Occurs when Gallery popup item is about to open.")]
+        public event DotNetBarManager.PopupOpenEventHandler GalleryPopupOpen;
+
+        /// <summary>
+        /// Occurs just before Gallery popup window is shown.
+        /// </summary>
+        [System.ComponentModel.Description("Occurs just before Gallery popup window is shown.")]
+        public event EventHandler GalleryPopupShowing;
+
+        /// <summary>
+        /// Occurs before the Gallery popup item is closed.
+        /// </summary>
+        [System.ComponentModel.Description("Occurs before the Gallery popup item is closed")]
+        public event EventHandler GalleryPopupClose;
+
+        /// <summary>
+        /// Occurs after Gallery popup item has been closed.
+        /// </summary>
+        [System.ComponentModel.Description("Occurs after popup item has been closed.")]
+        public event EventHandler GalleryPopupFinalized;
+        #endregion
+
+        #region Constructor
+        /// <summary>
+        /// Creates new instance of the class
+        /// </summary>
+        public GalleryContainer()
+            : base()
+        {
+            m_DefaultSize = GetDefaultSize();
+            m_PopupGallerySize = GetDefaultPopupSize();
+            m_Groups = new GalleryGroupCollection();
+            m_Groups.Owner = this;
+            this.MultiLine = true;
+            //this.BackgroundStyle.Class = Rendering.ElementStyleClassKeys.RibbonGalleryContainerKey;
+            CreateButtons();
+            this.MinimumSize = new Size(Dpi.Width(42 + m_ScrollButtonSize.Width + m_ScrollButtonContentSpacing), Dpi.Height(m_DefaultSize.Height));
+            m_ThreadUI = new ThreadUIOperation(new EventHandler(this.RecordStartState), new EventHandler(this.UpdateThreadedUI), new EventHandler(this.CleanupState));
+        }
+
+        private Size GetDefaultSize()
+        {
+            return new Size(140 + m_ScrollButtonSize.Width + m_ScrollButtonContentSpacing, m_ScrollButtonSize.Height * 3 - 2);
+        }
+
+        private Size GetDefaultPopupSize()
+        {
+            return Size.Empty;
+        }
+
+        /// <summary>
+        /// Returns copy of the item.
+        /// </summary>
+        public override BaseItem Copy()
+        {
+            GalleryContainer objCopy = new GalleryContainer();
+            this.CopyToItem(objCopy);
+            return objCopy;
+        }
+        /// <summary>
+        /// Copies the ButtonItem specific properties to new instance of the item.
+        /// </summary>
+        /// <param name="c">New ButtonItem instance.</param>
+        protected override void CopyToItem(BaseItem c)
+        {
+            GalleryContainer copy = c as GalleryContainer;
+            copy.DefaultSize = this.DefaultSize;
+            copy.PopupGallerySize = this.PopupGallerySize;
+            copy.StretchGallery = this.StretchGallery;
+            copy.PopupUsesStandardScrollbars = this.PopupUsesStandardScrollbars;
+
+            foreach (BaseItem item in this.PopupGalleryItems)
+                copy.PopupGalleryItems.Add(item.Copy());
+
+            base.CopyToItem(copy);
+
+            foreach (BaseItem item in copy.SubItems)
+            {
+                item.CollapseAllBeforeRaisingClick = false; // This ensures that item is not disposed (Command then set to null) before its click event is raised and command executed
+            }
+
+            // Copy Gallery Groups
+            foreach (GalleryGroup group in this.GalleryGroups)
+            {
+                GalleryGroup groupCopy = new GalleryGroup();
+                groupCopy.Name = group.Name;
+                groupCopy.Text = group.Text;
+                groupCopy.DisplayOrder = group.DisplayOrder;
+                copy.GalleryGroups.Add(groupCopy);
+
+                foreach (BaseItem item in group.Items)
+                {
+                    copy.SetGalleryGroup(copy.SubItems[item.Name], groupCopy);
+                }
+            }
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            m_ScrollUp.Click -= ScrollUp_Click;
+            m_ScrollDown.Click -= ScrollDown_Click;
+            m_PopupGallery.Click -= PopupGallery_Click;
+            m_PopupGallery.PopupOpen -= PopupGallery_PopupOpen;
+            m_PopupGallery.PopupShowing -= PopupGallery_PopupShowing;
+            m_PopupGallery.PopupClose -= PopupGallery_PopupClose;
+            m_PopupGallery.PopupFinalized -= PopupGallery_PopupFinalized;
+
+            if (m_ScrollBar != null)
+            {
+                m_ScrollBar.Dispose();
+                m_ScrollBar = null;
+            }
+            m_ThreadUI.Stop();
+            base.Dispose(disposing);
+        }
+
+        private void CreateButtons()
+        {
+            m_ScrollUp = new ButtonItem("sysgalleryscrollup");
+            m_ScrollUp.Text = "<expand direction=\"top\"/>";
+            m_ScrollUp.Style = this.Style;
+            m_ScrollUp.ColorTable = eButtonColor.OrangeWithBackground;
+            m_ScrollUp.SetParent(this);
+            m_ScrollUp.Click += new EventHandler(ScrollUp_Click);
+            m_ScrollUp.ClickAutoRepeat = true;
+            m_ScrollUp.ClickRepeatInterval = 200;
+            m_ScrollUp.CanCustomize = false;
+            m_ScrollUp.AutoCollapseOnClick = false;
+
+            m_ScrollDown = new ButtonItem("sysgalleryscrolldown");
+            m_ScrollDown.Text = "<expand direction=\"bottom\"/>";
+            m_ScrollDown.Style = this.Style;
+            m_ScrollDown.ColorTable = eButtonColor.OrangeWithBackground;
+            m_ScrollDown.SetParent(this);
+            m_ScrollDown.Click += new EventHandler(ScrollDown_Click);
+            m_ScrollDown.ClickAutoRepeat = true;
+            m_ScrollDown.ClickRepeatInterval = 200;
+            m_ScrollDown.CanCustomize = false;
+            m_ScrollDown.AutoCollapseOnClick = false;
+
+            m_PopupGallery = new ButtonItem("sysgallerypopup");
+            m_PopupGallery.Text = "<expand direction=\"popup\"/>";
+            m_PopupGallery.ButtonStyle = eButtonStyle.TextOnlyAlways;
+            m_PopupGallery.Style = this.Style;
+            m_PopupGallery.ColorTable = eButtonColor.OrangeWithBackground;
+            m_PopupGallery.SetParent(this);
+            m_PopupGallery.Click += new EventHandler(PopupGallery_Click);
+            m_PopupGallery.CanCustomize = false;
+            m_PopupGallery.PopupOpen += new DotNetBarManager.PopupOpenEventHandler(PopupGallery_PopupOpen);
+            m_PopupGallery.PopupShowing += new EventHandler(PopupGallery_PopupShowing);
+            m_PopupGallery.PopupClose += new EventHandler(PopupGallery_PopupClose);
+            m_PopupGallery.PopupFinalized += new EventHandler(PopupGallery_PopupFinalized);
+        }
+
+        private void PopupGallery_PopupShowing(object sender, EventArgs e)
+        {
+            OnGalleryPopupShowing(sender, e);
+        }
+
+        private void PopupGallery_PopupOpen(object sender, PopupOpenEventArgs e)
+        {
+            OnGalleryPopupOpen(sender, e);
+        }
+        
+        private void PopupGallery_Click(object sender, EventArgs e)
+        {
+            PopupGallery();
+        }
+
+        private Size GetPopupGallerySize(Point screenPos)
+        {
+            Size size = Size.Empty;
+            if (this.DisplayRectangle.Width < this.DefaultSize.Width || m_ViewRectangle.Size.IsEmpty)
+            {
+                int width = this.DefaultSize.Width;
+                int itemBasedWidth = 0;
+                foreach (BaseItem item in this.SubItems)
+                {
+                    if (!item.Visible) continue;
+                    itemBasedWidth += item.WidthInternal + this.ItemSpacing;
+                    if (itemBasedWidth > width)
+                        break;
+                }
+                if (itemBasedWidth > 0)
+                {
+                    width = itemBasedWidth;
+                    if (m_PopupUsesStandardScrollbars)
+                        width += Dpi.Width(m_ScrollButtonContentSpacing + m_ScrollButtonSize.Width);
+                }
+                size = new Size(width, Math.Max(this.DefaultSize.Height, m_ViewRectangle.Height));
+            }
+            else
+                size = new Size(this.DisplayRectangle.Width, m_ViewRectangle.Height);
+
+            ScreenInformation screenInfo = null;
+            screenInfo = BarFunctions.ScreenFromPoint(screenPos);
+            
+            // Give the grouped gallery max size since we do not know yet how tall it is
+            if (m_Groups.Count > 0 && screenInfo!=null && screenInfo.WorkingArea.Bottom - screenPos.Y>size.Height)
+            {
+                size.Height = screenInfo.WorkingArea.Bottom - screenPos.Y;
+            }
+
+            if (screenInfo != null)
+            {
+                int red = 16;
+                red += this.PopupGalleryItems.Count * 26;
+                int yDiff= 0, xDiff = 0;
+                if (screenPos.Y + size.Height > screenInfo.WorkingArea.Bottom - red)
+                    yDiff = screenPos.Y + size.Height - (screenInfo.WorkingArea.Bottom - red);
+                if (screenPos.X + size.Width > screenInfo.WorkingArea.Right - red)
+                    xDiff = screenPos.X + size.Width - (screenInfo.WorkingArea.Right - red);
+                if (size.Width - xDiff > this.MinimumSize.Width)
+                    size.Width -= xDiff;
+                else
+                    size.Width = this.MinimumSize.Width + Dpi.Width(m_ScrollButtonContentSpacing + m_ScrollButtonSize.Width);
+                if (size.Height - yDiff > this.MinimumSize.Height)
+                    size.Height -= yDiff;
+                else
+                    size.Height = this.MinimumSize.Height;
+            }
+
+            return size;
+        }
+
+        internal bool PopupGalleryStyle
+        {
+            get { return m_PopupGalleryStyle; }
+            set
+            {
+                m_PopupGalleryStyle = value;
+                
+                if (m_ScrollBar != null)
+                {
+                    m_ScrollBar.Dispose();
+                    m_ScrollBar = null;
+                }
+
+                if (m_PopupGalleryStyle)
+                {
+                    if (m_PopupUsesStandardScrollbars)
+                    {
+                        m_ScrollBar = new ScrollBar.ScrollBarCore();
+                        m_ScrollBar.ValueChanged += new EventHandler(PopupScrollBar_ValueChanged);
+                    }
+                }
+            }
+        }
+
+        ///// <summary>
+        ///// Adds the items that are not visible to the overflow popup.
+        ///// </summary>
+        //private void AddItems(GalleryContainer c)
+        //{
+        //    BaseItem[] items = new BaseItem[this.SubItems.Count];
+        //    this.SubItems.CopyTo(items, 0);
+        //    foreach (BaseItem objItem in items)
+        //    {
+        //        c.SubItems._Add(objItem);
+        //        this.SubItems._Remove(objItem);
+        //        objItem.SetParent(c);
+        //        objItem.ContainerControl = null;
+        //    }
+
+        //    items = new BaseItem[m_PopupGalleryItems.Count];
+        //    m_PopupGalleryItems.CopyTo(items, 0);
+        //    foreach (BaseItem objItem in items)
+        //    {
+        //        m_PopupGallery.SubItems._Add(objItem);
+        //        m_PopupGalleryItems._Remove(objItem);
+        //        objItem.SetParent(c);
+        //        objItem.ContainerControl = null;
+        //    }
+
+        //    c.NeedRecalcSize = true;
+        //}
+
+        private void ClearPopupGalleryItems()
+        {
+            if (!this.DesignMode)
+            {
+                // When copy is made this ensures the proper cleanup
+                foreach (BaseItem item in m_PopupGallery.SubItems)
+                {
+                    GalleryContainer gc = item as GalleryContainer;
+                    if (gc != null && gc.SystemGallery)
+                    {
+                        m_PopupGallery.SubItems.Remove(gc);
+                        gc.Dispose();
+                        break;
+                    }
+                }
+            }
+        }
+
+        private void PopupGallery_PopupFinalized(object sender, EventArgs e)
+        {
+            OnGalleryPopupFinalized(sender, e);
+            ClearPopupGalleryItems();
+        }
+
+        private void PopupGallery_PopupClose(object sender, EventArgs e)
+        {
+            OnGalleryPopupClose(sender, e);
+            RestoreGalleryItems();
+        }
+
+        private void RestoreGalleryItems()
+        {
+            //GalleryContainer c = m_PopupGallery.SubItems[0] as GalleryContainer;
+            //if (c == null) return;
+            //BaseItem[] items = new BaseItem[c.SubItems.Count];
+            //c.SubItems.CopyTo(items, 0);
+            //foreach (BaseItem item in items)
+            //{
+            //    this.SubItems._Add(item);
+            //    c.SubItems._Remove(item);
+            //    item.SetParent(this);
+            //    item.ContainerControl = null;
+            //}
+
+            //for (int i = 1; i < m_PopupGallery.SubItems.Count; i++)
+            //{
+            //    BaseItem item = m_PopupGallery.SubItems[i];
+            //    m_PopupGalleryItems._Add(item);
+            //    item.SetParent(this);
+            //    item.ContainerControl = null;
+            //}
+
+            //m_PopupGallery.SubItems._Clear();
+            //this.NeedRecalcSize = true;
+        }
+
+        private void ScrollUp_Click(object sender, EventArgs e)
+        {
+            this.ScrollUp();
+        }
+
+        private void ScrollDown_Click(object sender, EventArgs e)
+        {
+            this.ScrollDown();
+        }
+
+        internal bool ScrollHitTest(int x, int y)
+        {
+            if (m_ScrollUp.Enabled && m_ScrollUp.DisplayRectangle.Contains(x, y))
+                return true;
+            else if (m_ScrollDown.Enabled && m_ScrollDown.DisplayRectangle.Contains(x,y))
+                return true;
+            else if (m_ScrollBar != null && m_ScrollBar.Visible)
+            {
+                if (m_ScrollBar.ThumbIncreaseRectangle.Contains(x,y))
+                    return true;
+                else if (m_ScrollBar.ThumbDecreaseRectangle.Contains(x,y))
+                    return true;
+            }
+            return false;
+        }
+
+        private bool m_MouseDownOnScrollBar = false;
+        public override void InternalMouseDown(System.Windows.Forms.MouseEventArgs objArg)
+        {
+            if (this.IsDisposed) return;
+
+            m_MouseDownOnScrollBar = false;
+            if (m_PopupGalleryStyle && m_PopupUsesStandardScrollbars)
+            {
+                m_ScrollBar.MouseDown(objArg);
+                if (m_ScrollBar.DisplayRectangle.Contains(objArg.X, objArg.Y))
+                    m_MouseDownOnScrollBar = true;
+            }
+
+            base.InternalMouseDown(objArg);
+
+            if (this.DesignMode)
+            {
+                if (m_ScrollUp.Enabled && m_ScrollUp.DisplayRectangle.Contains(objArg.X, objArg.Y))
+                    ScrollUp();
+                else if (m_ScrollDown.Enabled && m_ScrollDown.DisplayRectangle.Contains(objArg.X, objArg.Y))
+                    ScrollDown();
+                else if (m_PopupGallery.Enabled && m_PopupGallery.DisplayRectangle.Contains(objArg.X, objArg.Y))
+                    PopupGallery();
+                else if (m_ScrollBar != null && m_ScrollBar.Visible)
+                {
+                    if(m_ScrollBar.ThumbIncreaseRectangle.Contains(objArg.X, objArg.Y))
+                        ScrollDown();
+                    else if (m_ScrollBar.ThumbDecreaseRectangle.Contains(objArg.X, objArg.Y))
+                        ScrollUp();
+                }
+            }
+        }
+
+        public override void InternalMouseMove(System.Windows.Forms.MouseEventArgs objArg)
+        {
+            if (m_PopupGalleryStyle && !this.IsDisposed)
+            {
+                if (m_PopupUsesStandardScrollbars)
+                    m_ScrollBar.MouseMove(objArg);
+            }
+
+            base.InternalMouseMove(objArg);
+        }
+
+        public override void InternalMouseUp(System.Windows.Forms.MouseEventArgs objArg)
+        {
+            if (m_PopupGalleryStyle && m_PopupUsesStandardScrollbars && !this.IsDisposed)
+            {
+                m_ScrollBar.MouseUp(objArg);
+                if (m_ScrollBar.DisplayRectangle.Contains(objArg.X, objArg.Y) || m_MouseDownOnScrollBar)
+                {
+                    m_MouseDownOnScrollBar = false;
+                    return;
+                }
+            }
+            base.InternalMouseUp(objArg);
+        }
+
+        public override void InternalMouseLeave()
+        {
+            if (m_PopupGalleryStyle && !this.IsDisposed)
+            {
+                if (m_PopupUsesStandardScrollbars)
+                    m_ScrollBar.MouseLeave();
+                //else
+                //{
+                //    if (m_ScrollUp.IsMouseOver)
+                //        m_ScrollUp.InternalMouseLeave();
+                //    if (m_ScrollDown.IsMouseOver)
+                //        m_ScrollDown.InternalMouseLeave();
+                //}
+            }
+            base.InternalMouseLeave();
+        }
+
+        public override void InternalKeyDown(System.Windows.Forms.KeyEventArgs objArg)
+        {
+            if (this.IsGalleryPopupOpen)
+            {
+                m_PopupGallery.InternalKeyDown(objArg);
+                return;
+            }
+
+            //BaseItem oldHotSubItem = this.HotSubItem;
+            base.InternalKeyDown(objArg);
+            // Check whether new hot item is out of bounds and if it is scroll it into the view
+            //Rectangle displayRect = GetClientRectangle();
+            //if (this.HotSubItem != oldHotSubItem && this.HotSubItem != null && !displayRect.Contains(this.HotSubItem.Bounds))
+            //{
+            //    EnsureVisible(this.HotSubItem);
+            //}
+        }
+
+        protected override void OnHotSubItemChanged(BaseItem newValue, BaseItem oldValue)
+        {
+            base.OnHotSubItemChanged(newValue, oldValue);
+
+            if (newValue != null && newValue != oldValue)
+            {
+                Rectangle displayRect = GetClientRectangle();
+                if (!displayRect.Contains(newValue.Bounds))
+                {
+                    EnsureVisible(newValue);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Returns the client rectangle which is DisplayRectangle excluding scroll-bar bounds
+        /// </summary>
+        /// <returns></returns>
+        private Rectangle GetClientRectangle()
+        {
+            Rectangle r = this.DisplayRectangle;
+            if (m_ScrollBar != null)
+                r.Width -= m_ScrollBar.DisplayRectangle.Width;
+
+            if (m_PopupGalleryStyle && !m_PopupUsesStandardScrollbars)
+            {
+                if (m_ScrollUp != null)
+                {
+                    r.Y += m_ScrollUp.HeightInternal;
+                    r.Height -= m_ScrollUp.HeightInternal;
+                }
+                if (m_ScrollDown != null)
+                {
+                    r.Height -= m_ScrollDown.HeightInternal;
+                }
+            }
+            else
+            {
+                if (m_ScrollUp != null)
+                    r.Width -= m_ScrollUp.WidthInternal;
+            }
+
+            return r;
+        }
+
+        internal Size RecommendedSize
+        {
+            get { return m_RecommendedSize;  }
+            set { m_RecommendedSize = value;  }
+        }
+
+        /// <summary>
+        /// Invokes GalleryPopupOpen event.
+        /// </summary>
+        /// <param name="e"></param>
+        protected virtual void OnGalleryPopupOpen(object sender, PopupOpenEventArgs e)
+        {
+            if (GalleryPopupOpen != null)
+                GalleryPopupOpen(sender, e);
+        }
+
+        /// <summary>
+        /// Invokes GalleryPopupShowing event.
+        /// </summary>
+        /// <param name="e"></param>
+        protected virtual void OnGalleryPopupShowing(object sender, EventArgs e)
+        {
+            if (GalleryPopupShowing != null)
+                GalleryPopupShowing(sender, e);
+        }
+
+        /// <summary>
+        /// Invokes GalleryPopupClose event.
+        /// </summary>
+        /// <param name="e"></param>
+        protected virtual void OnGalleryPopupClose(object sender, EventArgs e)
+        {
+            if (GalleryPopupClose != null)
+                GalleryPopupClose(sender, e);
+        }
+
+        /// <summary>
+        /// Invokes GalleryPopupFinalized event.
+        /// </summary>
+        /// <param name="e"></param>
+        protected virtual void OnGalleryPopupFinalized(object sender, EventArgs e)
+        {
+            if (GalleryPopupFinalized != null)
+                GalleryPopupFinalized(sender, e);
+        }
+        [EditorBrowsable(EditorBrowsableState.Never), Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public Rectangle PopupGalleryButtonBounds
+        {
+            get { return m_PopupGallery.DisplayRectangle; }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never), Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public ButtonItem PopupGalleryItem
+        {
+            get { return m_PopupGallery; }
+        }
+        #endregion
+
+        #region Property Hidding
+        /// <summary>
+        /// Gets or sets orientation inside the container. GalleryContainer automatically manages the layout orientation and this property should not be changed from its default value.
+        /// </summary>
+        [Browsable(false), DefaultValue(eOrientation.Horizontal), DesignerSerializationVisibility(DesignerSerializationVisibility.Visible), Category("Layout")]
+        public override eOrientation LayoutOrientation
+        {
+            get { return base.LayoutOrientation; }
+            set { base.LayoutOrientation = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the item alignment when container is in horizontal layout. Default value is Left.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), EditorBrowsable(EditorBrowsableState.Never)]
+        public override eHorizontalItemsAlignment HorizontalItemAlignment
+        {
+            get { return base.HorizontalItemAlignment; }
+            set { base.HorizontalItemAlignment = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the item vertical alignment. Default value is Top.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), EditorBrowsable(EditorBrowsableState.Never)]
+        public override eVerticalItemsAlignment VerticalItemAlignment
+        {
+            get { return base.VerticalItemAlignment; }
+            set { base.VerticalItemAlignment = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether items in horizontal layout are wrapped into the new line when they cannot fit allotted container size. Default value is false.
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Layout"), Description("Indicates whether items in horizontal layout are wrapped into the new line when they cannot fit allotted container size.")]
+        public override bool MultiLine
+        {
+            get { return base.MultiLine; }
+            set { base.MultiLine = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether items contained by container are resized to fit the container bounds. When container is in horizontal
+        /// layout mode then all items will have the same height. When container is in vertical layout mode then all items
+        /// will have the same width. Default value is true.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool ResizeItemsToFit
+        {
+            get { return base.ResizeItemsToFit; }
+            set { base.ResizeItemsToFit = value; }
+        }
+        #endregion
+
+        #region Public Interface
+        /// <summary>
+        /// Gets or sets whether Gallery when on popup is using standard scrollbars to scroll the content.
+        /// Standard scrollbars are displayed on right hand side of the Gallery. Default value for this property is true.
+        /// When set to false the scroll buttons are displayed only when needed and two buttons on top and bottom
+        /// of the Gallery are used to indicate the scrolling possibility and enable scrolling. Buttons are only
+        /// visible when needed. This scrolling button style can be used for example on Application Menu
+        /// to enable scrolling of list of most recently used files.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), DefaultValue(true), Description("Indicates whether Gallery when on popup is using standard scrollbars to scroll the content.")]
+        public bool PopupUsesStandardScrollbars
+        {
+            get { return m_PopupUsesStandardScrollbars; }
+            set
+            {
+                m_PopupUsesStandardScrollbars = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether gallery is using incremental sizing when stretched. Default
+        /// value is true. Incremental sizing will resize the width of the gallery so it fits
+        /// completely the items it can contain in available space. That means that gallery will
+        /// occupy enough space to display the whole items within available space. When set to
+        /// false, it indicates that gallery will resize to fill all available space.
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Layout"), Description("Indicates whether gallery is using incremental sizing when stretched.")]
+        public bool IncrementalSizing
+        {
+            get { return m_IncrementalSizing; }
+            set
+            {
+                m_IncrementalSizing = value;
+                this.NeedRecalcSize = true;
+                OnAppearanceChanged();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether Gallery width is determined based on the RibbonBar width. This property is in effect when
+        /// Gallery is hosted directly the RibbonBar control. Default value is false.
+        /// When set to true the Gallery size is changed as the RibbonBar control is resized. The initial size of the Gallery is
+        /// determined by DefaultSize property. The MinimumSize property specifies the minimum size of the Gallery.
+        /// Note that only single Gallery can be stretched per RibbonBar control.
+        /// </summary>
+        [Browsable(true), DefaultValue(false), Category("Layout"), Description("Indicates whether Gallery width is determined based on the Ribbon container size.")]
+        public bool StretchGallery
+        {
+            get { return m_StretchGallery; }
+            set
+            {
+                if (m_StretchGallery != value)
+                {
+                    m_StretchGallery = value;
+                    
+                    RibbonBar bar = this.ContainerControl as RibbonBar;
+                    if (bar != null)
+                    {
+                        if (m_StretchGallery)
+                        {
+                            if (bar.GalleryStretch == null)
+                                bar.GalleryStretch = this;
+                        }
+                        else
+                        {
+                            if (bar.GalleryStretch == this)
+                                bar.GalleryStretch = null;
+                        }
+                    }
+
+                    NeedRecalcSize = true;
+                    OnAppearanceChanged();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets the collection of the items that are added to the popup gallery. The items displayed on the gallery are combined with the
+        /// items from this collection and they are displayed on the gallery popup. This collection can for example have items that are
+        /// customizing the choices of the commands in gallery etc.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Content)]
+        public SubItemsCollection PopupGalleryItems
+        {
+            get { return m_PopupGallery.SubItems; }
+        }
+        /// <summary>
+        /// Gets or sets the default size of the gallery. The gallery height will be always enforced so all scroll buttons can be displayed.
+        /// Gallery width should allow display of both scroll buttons and the gallery content.
+        /// </summary>
+        [Browsable(true), Category("Layout"), Description("Indicates the default size of the gallery.")]
+        public Size DefaultSize
+        {
+            get { return m_DefaultSize; }
+            set
+            {
+                m_DefaultSize = value;
+                this.NeedRecalcSize = true;
+                this.OnAppearanceChanged();
+            }
+        }
+        /// <summary>
+        /// Gets whether DefaultSize property is serialized by Windows Forms designer based on its current value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeDefaultSize()
+        {
+            return (m_DefaultSize != GetDefaultSize());
+        }
+        /// <summary>
+        /// Resets DefaultSize property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetDefaultSize()
+        {
+            TypeDescriptor.GetProperties(this)["DefaultSize"].SetValue(this, GetDefaultSize());
+        }
+
+        /// <summary>
+        /// Gets or sets the default size of the gallery when gallery is displayed on the popup menu.
+        /// </summary>
+        [Browsable(true), Category("Layout"), Description("Indicates the default size of the gallery when gallery is displayed on the popup menu.")]
+        public Size PopupGallerySize
+        {
+            get { return m_PopupGallerySize; }
+            set { m_PopupGallerySize = value; }
+        }
+        /// <summary>
+        /// Gets whether PopupGallerySize property is serialized by Windows Forms designer based on its current value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializePopupGallerySize()
+        {
+            return (m_PopupGallerySize != GetDefaultPopupSize());
+        }
+        /// <summary>
+        /// Resets PopupGallerySize property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetPopupGallerySize()
+        {
+            TypeDescriptor.GetProperties(this)["PopupGallerySize"].SetValue(this, GetDefaultPopupSize());
+        }
+
+        /// <summary>
+        /// Gets or sets whether gallery can be displayed on the popup. Default value is true.
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Gallery"), Description("Indicates whether gallery can be displayed on the popup.")]
+        public bool EnableGalleryPopup
+        {
+            get { return m_EnableGalleryPopup; }
+            set
+            {
+                m_EnableGalleryPopup = value;
+                this.NeedRecalcSize = true;
+                this.OnAppearanceChanged();
+            }
+        }
+
+        /// <summary>
+        /// Scrolls the gallery if necessary to ensures that item is visible.
+        /// </summary>
+        /// <param name="item">Reference to the items that is part of the gallery.</param>
+        public void EnsureVisible(BaseItem item)
+        {
+            if (item == null) throw new NullReferenceException("Item must be non null value.");
+
+            int scrollPositionY = GetScrollPosition().Y;
+            Rectangle clientRectangle = GetClientRectangle();
+            if (clientRectangle.IsEmpty) return;
+
+            if (item.TopInternal + scrollPositionY < clientRectangle.Y || item.Bounds.Bottom > clientRectangle.Bottom)
+            {
+                int i = clientRectangle.Top - item.TopInternal + scrollPositionY;
+                if (item.Bounds.Bottom > clientRectangle.Bottom)
+                    i = -((item.Bounds.Bottom - clientRectangle.Y) - clientRectangle.Height) + scrollPositionY;
+                if (Math.Abs(i) <= 4) i = 0;
+                SetScrollPosition(i);
+            }
+        }
+
+        /// <summary>
+        /// Scrolls gallery down to show next line of items.
+        /// </summary>
+        public void ScrollDown()
+        {
+            SetScrollPosition(GetNextScrollLine());
+        }
+
+        /// <summary>
+        /// Scrolls gallery up to show previous line of items.
+        /// </summary>
+        public void ScrollUp()
+        {
+            SetScrollPosition(GetPreviousScrollLine());
+        }
+        #endregion
+
+        #region Internal Implementation
+        public override BaseItem ItemAtLocation(int x, int y)
+        {
+            if (!this.DesignMode && (!m_PopupGalleryStyle || !m_PopupUsesStandardScrollbars))
+            {
+                if (m_ScrollUp.DisplayRectangle.Contains(x, y) && m_ScrollUp.Visible)
+                    return m_ScrollUp;
+                else if (m_ScrollDown.DisplayRectangle.Contains(x, y) && m_ScrollDown.Visible)
+                    return m_ScrollDown;
+                else if (m_EnableGalleryPopup && m_PopupGallery.DisplayRectangle.Contains(x, y))
+                    return m_PopupGallery;
+            }
+            else if (!this.DesignMode && m_PopupGalleryStyle && m_PopupUsesStandardScrollbars && !SystemGallery && IsOnPopup(this))
+            {
+                if (m_ScrollBar != null && (m_ScrollBar.DisplayRectangle.Contains(x, y) || m_ScrollBar.IsMouseDown)) return this;
+            }
+
+            if (m_MouseDownOnScrollBar)
+                return this;
+            return base.ItemAtLocation(x, y);
+        }
+
+        internal ScrollBar.ScrollBarCore ScrollBarControl
+        {
+            get
+            {
+                return m_ScrollBar;
+            }
+        }
+
+        void PopupScrollBar_ValueChanged(object sender, EventArgs e)
+        {
+            if (!_SettingScrollPosition)
+                SetScrollPosition(-m_ScrollBar.Value);
+        }
+
+        private bool _SettingScrollPosition = false;
+        private void SetScrollPosition(int y)
+        {
+            if (m_ScrollPosition.Y == y) return;
+
+            _SettingScrollPosition = true;
+            int diff = y - m_ScrollPosition.Y;
+            int start = m_ScrollPosition.Y;
+
+            m_ScrollPosition.Y = y;
+            OffsetSubItems(new Point(0, diff));
+
+            if (!m_PopupGalleryStyle || !m_PopupUsesStandardScrollbars) EnableScrollButtons(this.DisplayRectangle);
+            if (IsAnimationEnabled)
+                StartAnimation(start, y);
+            else
+                this.Refresh();
+            if (m_ScrollBar != null && m_ScrollBar.Value != -y)
+                m_ScrollBar.Value = -y;
+            _SettingScrollPosition = false;
+        }
+
+        public override void Paint(ItemPaintArgs p)
+        {
+            m_ThreadUI.StartReadOperation();
+            try
+            {
+                if (m_StateBitmap != null)
+                {
+                    base.PaintBackground(p);
+                    Graphics g = p.Graphics;
+                    Rectangle clip = GetClipRectangle();
+                    Region oldClip = g.Clip;
+                    g.SetClip(clip, CombineMode.Intersect);
+                    
+                    p.Graphics.DrawImage(m_StateBitmap, clip.X, clip.Y + m_AnimationCurrentPos);
+
+                    if (oldClip != null)
+                        g.Clip = oldClip;
+                    else
+                        g.ResetClip();
+                    
+                }
+                else
+                    base.Paint(p);
+            }
+            finally
+            {
+                m_ThreadUI.EndReadOperation();
+            }
+
+            //int cornerSize = 0;
+            //Office2007ButtonItemPainter painter = PainterFactory.CreateButtonPainter(m_ScrollUp) as Office2007ButtonItemPainter;
+            //if (painter != null)
+            //{
+            //    cornerSize = painter.CornerSize;
+            //    painter.CornerSize = 2;
+            //}
+
+            if (m_PopupGalleryStyle && m_PopupUsesStandardScrollbars)
+            {
+                if (m_ScrollBar.ParentControl == null) m_ScrollBar.ParentControl = p.ContainerControl;
+                m_ScrollBar.Paint(p);
+            }
+            else
+            {
+                if(m_ScrollUp.Visible)
+                    m_ScrollUp.Paint(p);
+                if (m_ScrollDown.Visible)
+                    m_ScrollDown.Paint(p);
+                if (m_EnableGalleryPopup)
+                    m_PopupGallery.Paint(p);
+            }
+
+            //if (painter != null)
+            //    painter.CornerSize = cornerSize;
+        }
+
+        private Point GetScrollPosition()
+        {
+            return m_ScrollPosition;
+        }
+
+        private Size GetLayoutSize()
+        {
+            if (!m_RecommendedSize.IsEmpty && m_RecommendedSize.Width >= this.MinimumSize.Width && m_RecommendedSize.Height >= this.MinimumSize.Height)
+                return m_RecommendedSize;
+            Size s = m_DefaultSize;
+            if (this.PopupGalleryStyle && !this.SystemGallery)
+            {
+                if (this.MinimumSize.Width > s.Width)
+                    s.Width = this.MinimumSize.Width;
+                if (this.MinimumSize.Height > s.Height)
+                    s.Height = this.MinimumSize.Height;
+            }
+            return Dpi.Size(s);
+        }
+
+        protected override System.Drawing.Rectangle GetLayoutRectangle(System.Drawing.Rectangle bounds)
+        {
+            Rectangle r = new Rectangle(bounds.Location, GetLayoutSize());
+
+            if (m_PopupUsesStandardScrollbars || !m_PopupGalleryStyle)
+            {
+                r.Width -= Dpi.Width(m_ScrollButtonSize.Width + m_ScrollButtonContentSpacing);
+                if (this.IsRightToLeft)
+                    r.X += Dpi.Width(m_ScrollButtonSize.Width + m_ScrollButtonContentSpacing);
+            }
+            bool disposeStyle = false;
+            ElementStyle style = ElementStyleDisplay.GetElementStyle(BackgroundStyle, out disposeStyle);
+            r.X += ElementStyleLayout.LeftWhiteSpace(style);
+            r.Y += ElementStyleLayout.TopWhiteSpace(style);
+            r.Width -= ElementStyleLayout.HorizontalStyleWhiteSpace(style);
+            r.Height -= ElementStyleLayout.VerticalStyleWhiteSpace(style);
+
+            r.Offset(GetScrollPosition());
+
+            if(disposeStyle) style.Dispose();
+
+            return r;
+        }
+
+        protected override Rectangle LayoutItems(Rectangle bounds)
+        {
+            m_ViewRectangle = base.LayoutItems(bounds);
+            if (m_ViewRectangle.Height < Math.Abs(m_ScrollPosition.Y)) SetScrollPosition(0);
+            Size size = GetLayoutSize();
+            if (this.SystemGallery && !this.EnableGalleryPopup || this.IsOnMenu)
+            {
+                if(size.Height > m_ViewRectangle.Height)
+                    size.Height = m_ViewRectangle.Height;
+            }
+            if (m_IncrementalSizing && !PopupGalleryStyle)
+                size.Width = m_ViewRectangle.Width + Dpi.Width(m_ScrollButtonSize.Width + m_ScrollButtonContentSpacing);
+            Rectangle r = new Rectangle(bounds.Location, size);
+
+            int minHeight = Dpi.Height(m_ScrollButtonSize.Height * 2) - 1;
+            if (m_EnableGalleryPopup) minHeight += Dpi.Height(m_ScrollButtonSize.Height) - 1;
+            r.Height = Math.Max(minHeight, r.Height);
+            RepositionButtons(r);
+
+            if (m_PopupGalleryStyle && m_PopupUsesStandardScrollbars)
+            {
+                if (m_ViewRectangle.Bottom - r.Bottom > 0)
+                {
+                    m_ScrollBar.Enabled = true;
+                    m_ScrollBar.Maximum = m_ViewRectangle.Bottom - r.Bottom;
+                    m_ScrollBar.Minimum = 0;
+                    m_ScrollBar.SmallChange = GetScrollLineHeight();
+                    m_ScrollBar.LargeChange = (int)(m_ScrollBar.Maximum * ((float)r.Height / (float)m_ViewRectangle.Height));
+                }
+                else
+                    m_ScrollBar.Enabled = false;
+            }
+            else
+            {
+                EnableScrollButtons(r);
+            }
+            return r;
+        }
+
+        protected override Size GetEmptyDesignTimeSize()
+        {
+            if (m_PopupGalleryStyle && !this.SystemGallery)
+            {
+                Size s = this.MinimumSize;
+                if(!s.IsEmpty)
+                    return s;
+            }
+
+            return base.GetEmptyDesignTimeSize();
+        }
+
+        internal bool IsAtMinimumSize
+        {
+            get
+            {
+                if (m_IncrementalSizing && this.SubItems.Count>0)
+                {
+                    return this.WidthInternal - this.SubItems[0].WidthInternal <= this.MinimumSize.Width;
+                }
+                else
+                {
+                    return this.WidthInternal <= this.MinimumSize.Width;
+                }
+            }
+        }
+
+        private void EnableScrollButtons(Rectangle displayRect)
+        {
+            if (GetScrollPosition().Y == 0)
+            {
+                m_ScrollUp.Enabled = false;
+            }
+            else
+                m_ScrollUp.Enabled = true;
+
+            if (m_PopupGalleryStyle && !m_PopupUsesStandardScrollbars)
+            {
+                m_ScrollUp.Visible = m_ScrollUp.Enabled;
+                m_ScrollUp.Displayed = m_ScrollUp.Enabled;
+            }
+
+            if (m_ViewRectangle.Bottom + GetScrollPosition().Y > displayRect.Bottom)
+                m_ScrollDown.Enabled = true;
+            else
+                m_ScrollDown.Enabled = false;
+
+            if (m_PopupGalleryStyle && !m_PopupUsesStandardScrollbars)
+            {
+                m_ScrollDown.Visible = m_ScrollDown.Enabled;
+                m_ScrollDown.Displayed = m_ScrollDown.Enabled;
+            }
+        }
+
+        protected override void OnExternalSizeChange()
+        {
+            if (this.PopupGalleryStyle)
+                RepositionButtons(this.DisplayRectangle);
+            base.OnExternalSizeChange();
+        }
+
+        private void RepositionButtons(Rectangle r)
+        {
+            int x = r.Right - Dpi.Width(m_ScrollButtonSize.Width);
+            int y = r.Y;
+            if (this.IsRightToLeft)
+                x = r.X + Dpi.Width(m_ScrollButtonSize.Width);
+            if (!m_ViewRectangle.IsEmpty)
+            {
+                if (m_ViewRectangle.Y != r.Y)
+                    m_ViewRectangle.Y = r.Y;
+                if (m_ViewRectangle.X != r.X)
+                    m_ViewRectangle.X = r.X;
+            }
+
+            if (m_PopupGalleryStyle && m_ScrollBar != null)
+            {
+                bool disposeStyle = false;
+                ElementStyle style = ElementStyleDisplay.GetElementStyle(BackgroundStyle, out disposeStyle);
+                x -= ElementStyleLayout.RightWhiteSpace(style);
+                y += ElementStyleLayout.TopWhiteSpace(style);
+                r.Height -= ElementStyleLayout.VerticalStyleWhiteSpace(style);
+                m_ScrollBar.DisplayRectangle = new Rectangle(x, y, Dpi.Width(m_ScrollButtonSize.Width), r.Height);
+
+                if(disposeStyle) style.Dispose();
+
+                return;
+            }
+            else if (m_PopupGalleryStyle && !m_PopupUsesStandardScrollbars)
+            {
+                Size buttonSize = new Size(r.Width, Dpi.Height12);
+                //m_ScrollUp.Displayed = false;
+                //m_ScrollUp.Visible = false;
+                m_ScrollUp.RecalcSize();
+                m_ScrollUp.Size = buttonSize;
+                m_ScrollUp.SetDisplayRectangle(new Rectangle(r.X, r.Y,
+                    buttonSize.Width, buttonSize.Height));
+
+                //m_ScrollDown.Displayed = false;
+                //m_ScrollDown.Visible = false;
+                m_ScrollDown.RecalcSize();
+                m_ScrollDown.Size = buttonSize;
+                m_ScrollDown.SetDisplayRectangle(new Rectangle(r.X, r.Bottom - buttonSize.Height,
+                    buttonSize.Width, buttonSize.Height));
+                return;
+            }
+
+            Rectangle buttonRect = new Rectangle(x, y, Dpi.Width(m_ScrollButtonSize.Width), Dpi.Height(m_ScrollButtonSize.Height));
+            m_ScrollUp.Displayed = true;
+            m_ScrollUp.RecalcSize();
+            m_ScrollUp.Size = buttonRect.Size;
+            m_ScrollUp.SetDisplayRectangle(buttonRect);
+            if (m_EnableGalleryPopup)
+            {
+                y = r.Bottom - Dpi.Height(m_ScrollButtonSize.Height);
+                buttonRect = new Rectangle(x, y, Dpi.Width(m_ScrollButtonSize.Width), Dpi.Height(m_ScrollButtonSize.Height));
+                m_PopupGallery.Displayed = true;
+                m_PopupGallery.RecalcSize();
+                m_PopupGallery.Size = buttonRect.Size;
+                m_PopupGallery.SetDisplayRectangle(buttonRect);
+                buttonRect.Offset(0, -(Dpi.Height(m_ScrollButtonSize.Height) - 1));
+            }
+            else
+            {
+                m_PopupGallery.Displayed = false;
+                y = r.Bottom - Dpi.Height(m_ScrollButtonSize.Height);
+                buttonRect = new Rectangle(x, y, Dpi.Width(m_ScrollButtonSize.Width), Dpi.Height(m_ScrollButtonSize.Height));
+            }
+
+            m_ScrollDown.Displayed = true;
+            m_ScrollDown.RecalcSize();
+            m_ScrollDown.Size = buttonRect.Size;
+            m_ScrollDown.SetDisplayRectangle(buttonRect);
+        }
+
+        // <summary>
+        /// Called after LeftInternal property has changed
+        /// </summary>
+        protected override void OnLeftLocationChanged(int oldValue)
+        {
+            base.OnLeftLocationChanged(oldValue);
+            RepositionButtons(this.DisplayRectangle);
+        }
+
+        public override Rectangle Bounds
+        {
+            get
+            {
+                return base.Bounds;
+            }
+            set
+            {
+                base.Bounds = value;
+                RepositionButtons(this.DisplayRectangle);
+            }
+        }
+
+        protected override void OnTopLocationChanged(int oldValue)
+        {
+            base.OnTopLocationChanged(oldValue);
+            RepositionButtons(this.DisplayRectangle);
+        }
+
+        protected override void OnStyleChanged()
+        {
+            m_ScrollUp.Style = this.Style;
+            m_ScrollDown.Style = this.Style;
+            m_PopupGallery.Style = this.Style;
+            if (BarFunctions.IsOffice2010Style(this.Style))
+            {
+                m_ScrollUp.Shape = new RoundRectangleShapeDescriptor();
+                m_ScrollDown.Shape = new RoundRectangleShapeDescriptor();
+                m_PopupGallery.Shape = new RoundRectangleShapeDescriptor();
+            }
+            else
+            {
+                m_ScrollUp.Shape = null;
+                m_ScrollDown.Shape = null;
+                m_PopupGallery.Shape = null;
+            }
+            base.OnStyleChanged();
+        }
+
+        private int GetScrollLineHeight()
+        {
+            int itemY = this.DisplayRectangle.Bottom + GetScrollPosition().Y;
+            foreach (BaseItem item in this.SubItems)
+            {
+                if (!item.Visible) continue;
+
+                if (item.TopInternal > itemY)
+                    return item.HeightInternal;
+            }
+            return 24;
+        }
+
+        private int GetNextScrollLine()
+        {
+            bool firstVisibleFound = false;
+            int itemY = 0;
+            foreach (BaseItem item in this.SubItems)
+            {
+                if (!item.Visible) continue;
+
+                if (firstVisibleFound && item.TopInternal > itemY)
+                    return GetScrollForItem(item);
+                if (!firstVisibleFound && item.TopInternal >= this.TopInternal)
+                {
+                    firstVisibleFound = true;
+                    itemY = item.TopInternal;
+                }
+            }
+
+            return GetScrollPosition().Y;
+        }
+
+        private int GetPreviousScrollLine()
+        {
+            if (GetScrollPosition().Y == 0)
+                return 0;
+
+            int c = this.SubItems.Count -1;
+            for (int i = c; i >= 0; i--)
+            {
+                BaseItem item = this.SubItems[i];
+                if (!item.Visible) continue;
+                if (item.TopInternal < this.TopInternal)
+                    return GetScrollForItem(item);
+            }
+
+            return 0;
+        }
+
+        private int GetScrollForItem(BaseItem item)
+        {
+            int i = this.DisplayRectangle.Top - item.TopInternal + GetScrollPosition().Y;
+            if (Math.Abs(i) <= 4) i = 0;
+            return i;
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the item is expanded or not. For Popup items this would indicate whether the item is popped up or not.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), System.ComponentModel.DefaultValue(false), System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
+        public override bool Expanded
+        {
+            get
+            {
+                return m_Expanded;
+            }
+            set
+            {
+                base.Expanded = value;
+                if (!value && m_PopupGallery.Expanded)
+                    m_PopupGallery.Expanded = false;
+            }
+        }
+
+        /// <summary>
+        /// Gets whether the Gallery popup is open.
+        /// </summary>
+        [Browsable(false)]
+        public bool IsGalleryPopupOpen
+        {
+            get
+            {
+                return m_PopupGallery.Expanded;
+            }
+        }
+
+        /// <summary>
+        /// Opens the Gallery popup menu.
+        /// </summary>
+        public void PopupGallery()
+        {
+            if (m_PopupGallery.Expanded)
+            {
+                m_PopupGallery.Expanded = false;
+            }
+            else
+            {
+                if (!this.DesignMode)
+                {
+                    System.Windows.Forms.Control ctrl = this.ContainerControl as System.Windows.Forms.Control;
+                    Point p = ctrl.PointToScreen(this.DisplayRectangle.Location);
+                    GalleryContainer c = null;
+                    if (m_Groups.Count > 0)
+                    {
+                        c = new GalleryContainer();
+                        c.DefaultSize = this.DefaultSize;
+                        c.StretchGallery = this.StretchGallery;
+                        c.MultiLine = false;
+                        c.LayoutOrientation = eOrientation.Vertical;
+
+                        foreach (BaseItem item in this.PopupGalleryItems)
+                            c.PopupGalleryItems.Add(item.Copy());
+
+                        ArrangePopupGroups(c);
+                    }
+                    else
+                        c = this.Copy() as GalleryContainer;
+                    c.EnableGalleryPopup = false;
+                    c.SystemGallery = true;
+                    c.IncrementalSizing = false;
+                    c.PopupUsesStandardScrollbars = m_PopupUsesStandardScrollbars;
+                    if (this.PopupGallerySize.IsEmpty)
+                        c.DefaultSize = GetPopupGallerySize(p);
+                    else
+                        c.DefaultSize = this.PopupGallerySize;
+                    c.BackgroundStyle.Reset();
+                    c.PopupGalleryStyle = true;
+                    m_PopupGallery.SubItems.Insert(0, c);
+                    m_PopupGallery.PopupMenu(p);
+                }
+                else
+                    m_PopupGallery.Expanded = true;
+            }
+        }
+
+        protected internal override void OnContainerChanged(object objOldContainer)
+        {
+            if (!this.SystemGallery)
+            {
+                if (BaseItem.IsOnPopup(this))
+                {
+                    SetScrollPosition(0);
+                    this.PopupGalleryStyle = true;
+                }
+            }
+            base.OnContainerChanged(objOldContainer);
+        }
+
+        private void ArrangePopupGroups(GalleryContainer gc)
+        {
+            ArrayList groupList = GetSortedGroupList();
+            foreach(GalleryGroup g in groupList)
+            {
+                if (g.Items.Count == 0)
+                    continue;
+
+                LabelItem label = CreateLabelForGroup(g);
+                gc.SubItems.Add(label);
+                ItemContainer cont = CreateContainerFormGroup(g);
+                gc.SubItems.Add(cont);
+            }
+        }
+
+        private ItemContainer CreateContainerFormGroup(GalleryGroup g)
+        {
+            ItemContainer c = new ItemContainer();
+            c.LayoutOrientation = eOrientation.Horizontal;
+            c.MultiLine = true;
+            c.Name = "container_" + g.Name;
+
+            foreach (BaseItem item in g.Items)
+            {
+                c.SubItems.Add(item.Copy());
+            }
+
+            return c;
+        }
+
+        private LabelItem CreateLabelForGroup(GalleryGroup g)
+        {
+            LabelItem l = new LabelItem("label_" + g.Name, g.Text);
+            if (Rendering.GlobalManager.Renderer is Rendering.Office2007Renderer)
+            {
+                Rendering.Office2007ColorTable ct = ((Rendering.Office2007Renderer)Rendering.GlobalManager.Renderer).ColorTable;
+                l.BackColor = ct.Gallery.GroupLabelBackground;
+                l.ForeColor = ct.Gallery.GroupLabelText;
+                l.SingleLineColor= ct.Gallery.GroupLabelBorder;
+                l.BorderType = eBorderType.SingleLine;
+                l.BorderSide = eBorderSide.Bottom;
+                l.PaddingTop = 1;
+                l.PaddingLeft = 10;
+                l.PaddingBottom = 1;
+            }
+            return l;
+        }
+
+        private ArrayList GetSortedGroupList()
+        {
+            ArrayList groups = new ArrayList(m_Groups.Count);
+            foreach(GalleryGroup g in m_Groups)
+                groups.Add(g);
+            groups.Sort(new GroupDisplayOrderComparer());
+
+            return groups;
+        }
+
+        private class GroupDisplayOrderComparer : IComparer
+        {
+            // Calls CaseInsensitiveComparer.Compare with the parameters reversed.
+            int IComparer.Compare(object x, object y)
+            {
+                if (x is GalleryGroup && y is GalleryGroup)
+                {
+                    return ((GalleryGroup)x).DisplayOrder - ((GalleryGroup)y).DisplayOrder;
+                }
+                else
+                    return ((new CaseInsensitiveComparer()).Compare(x, y));
+            }
+        }
+
+        protected override InsertPosition GetContainerInsertPosition(Point pScreen, BaseItem dragItem)
+        {
+            InsertPosition pos = DesignTimeProviderContainer.GetInsertPosition(this, pScreen, dragItem);
+            if (pos == null && m_PopupGallery.Expanded)
+                pos = m_PopupGallery.GetInsertPosition(pScreen, dragItem);
+            return pos;
+        }
+
+        protected override IContentLayout GetContentLayout()
+        {
+            SerialContentLayoutManager lm = base.GetContentLayout() as SerialContentLayoutManager;
+            if (lm != null)
+                lm.HorizontalFitContainerHeight = false;
+
+            return lm;
+        }
+
+        /// <summary>
+        /// Gets or sets the Key Tips access key or keys for the item when on Ribbon Control or Ribbon Bar. Use KeyTips property
+        /// when you want to assign the one or more letters to be used to access an item. For example assigning the FN to KeyTips property
+        /// will require the user to press F then N keys to select an item. Pressing the F letter will show only keytips for the items that start with letter F.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), DefaultValue(""), Description("Indicates the Key Tips access key or keys for the item when on Ribbon Control or Ribbon Bar.")]
+        public override string KeyTips
+        {
+            get { return base.KeyTips; }
+            set { base.KeyTips = value; }
+        }
+        #endregion
+
+        #region Scroll Animation
+        private Bitmap m_StateBitmap = null;
+        private int m_AnimationEndPos = 0;
+        private int m_AnimationCurrentPos = 0;
+        private int m_AnimationStep = 0;
+        private void StartAnimation(int start, int end)
+        {
+            m_AnimationEndPos = end;
+            m_AnimationCurrentPos = start;
+            m_AnimationStep = (int)Math.Max(8, Math.Abs(end - start) / 3);
+            //Console.WriteLine("Start ={0}  End = {1}   Step = {2}", start, end, m_AnimationStep);
+            if (end < start) m_AnimationStep *= -1;
+
+            m_ThreadUI.Start();
+
+        }
+
+        private void RecordStartState(object sender, EventArgs e)
+        {
+            m_StateBitmap = new Bitmap(m_ViewRectangle.Width, m_ViewRectangle.Height, System.Drawing.Imaging.PixelFormat.Format32bppPArgb);
+            Graphics g1 = Graphics.FromImage(m_StateBitmap);
+            BufferedBitmap bb = new BufferedBitmap(g1, new Rectangle(0, 0, m_ViewRectangle.Width, m_ViewRectangle.Height));
+            Graphics g = bb.Graphics;
+            Color transparentColor = Color.Empty;
+            try
+            {
+                bool disposeStyle = false;
+                ElementStyle style = ElementStyleDisplay.GetElementStyle(this.BackgroundStyle, out disposeStyle);
+                if (!style.BackColor.IsEmpty)
+                    transparentColor = style.BackColor;
+                else if (style.BackColorBlend.Count > 0 && !style.BackColorBlend[0].Color.IsEmpty)
+                    transparentColor = style.BackColorBlend[0].Color;
+                else
+                    transparentColor = Color.WhiteSmoke;
+
+                if (!transparentColor.IsEmpty)
+                {
+                    using (SolidBrush brush = new SolidBrush(transparentColor))
+                        g.FillRectangle(brush, 0, 0, m_StateBitmap.Width, m_StateBitmap.Height);
+                }
+                System.Windows.Forms.Control cc = this.ContainerControl as System.Windows.Forms.Control;
+                bool antiAlias = false;
+                ItemPaintArgs pa = null;
+                if (cc is ItemControl)
+                {
+                    antiAlias = ((ItemControl)cc).AntiAlias;
+                    pa = ((ItemControl)cc).GetItemPaintArgs(g);
+                }
+                else if (cc is Bar)
+                {
+                    antiAlias = ((Bar)cc).AntiAlias;
+                    pa = ((Bar)cc).GetItemPaintArgs(g);
+                }
+                else if (cc is ButtonX)
+                {
+                    antiAlias = ((ButtonX)cc).AntiAlias;
+                    pa = ((ButtonX)cc).GetItemPaintArgs(g);
+                }
+                else if (cc is MenuPanel)
+                {
+                    antiAlias = ((MenuPanel)cc).AntiAlias;
+                    pa = ((MenuPanel)cc).GetItemPaintArgs(g);
+                }
+
+                Rectangle clip = GetClipRectangle();
+                System.Drawing.Drawing2D.Matrix myMatrix = new System.Drawing.Drawing2D.Matrix();
+                myMatrix.Translate( -(clip.X + +m_ScrollPosition.X),
+                                    -(clip.Y + m_ScrollPosition.Y), 
+                                    System.Drawing.Drawing2D.MatrixOrder.Append);
+                g.Transform = myMatrix;
+
+                if (antiAlias)
+                {
+                    g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.AntiAlias;
+                    g.TextRenderingHint = DisplayHelp.AntiAliasTextRenderingHint;
+                }
+
+                if (pa == null)
+                {
+                    m_StateBitmap.Dispose();
+                    m_StateBitmap = null;
+                }
+
+                // Do not paint scrollbars just content
+                ItemDisplay display = GetItemDisplay();
+                display.Paint(this, pa);
+                bb.Render(g1);
+
+                if(disposeStyle) style.Dispose();
+            }
+            finally
+            {
+                g = null;
+                bb.Dispose();
+                g1.Dispose();
+            }
+            if (!transparentColor.IsEmpty)
+                m_StateBitmap.MakeTransparent(transparentColor);
+        }
+
+        private void CleanupState(object sender, EventArgs e)
+        {
+            if (m_StateBitmap != null)
+            {
+                m_StateBitmap.Dispose();
+                m_StateBitmap = null;
+            }
+        }
+
+        private void UpdateThreadedUI(object sender, EventArgs e)
+        {
+            m_AnimationCurrentPos += m_AnimationStep;
+
+            if (m_AnimationCurrentPos <= m_AnimationEndPos && m_AnimationEndPos < 0 && m_AnimationStep < 0 ||
+                m_AnimationCurrentPos >= m_AnimationEndPos && m_AnimationEndPos >= 0 && m_AnimationStep > 0 || 
+                m_AnimationCurrentPos >= m_AnimationEndPos && m_AnimationEndPos < 0 && m_AnimationStep > 0 ||
+                m_AnimationCurrentPos <= m_AnimationEndPos && m_AnimationEndPos >= 0 && m_AnimationStep < 0)
+                m_ThreadUI.Stop();
+
+            System.Windows.Forms.Control cc = this.ContainerControl as System.Windows.Forms.Control;
+            if (cc != null)
+                cc.Invalidate(this.DisplayRectangle);
+        }
+
+        private bool IsAnimationEnabled
+        {
+            get
+            {
+                if (this.DesignMode || !m_ScrollAnimation || !this.Displayed || TextDrawing.UseTextRenderer || NativeFunctions.IsTerminalSession())
+                    return false;
+                //System.Windows.Forms.Control cc = this.ContainerControl as System.Windows.Forms.Control;
+                //if (cc != null)
+                //{
+                //    if (cc is ItemControl)
+                //        return ((ItemControl)cc).IsFadeEnabled;
+                //    else if (cc is Bar)
+                //        return ((Bar)cc).IsFadeEnabled;
+                //    else if (cc is ButtonX)
+                //        return ((ButtonX)cc).IsFadeEnabled;
+                //}
+                return m_ScrollAnimation;
+            }
+        }
+
+        protected override void OnDisplayedChanged()
+        {
+            if(!this.Displayed && !this.SystemGallery && this.PopupGalleryStyle)
+                SetScrollPosition(0);
+            base.OnDisplayedChanged();
+        }
+
+        protected internal override void OnVisibleChanged(bool newValue)
+        {
+            base.OnVisibleChanged(newValue);
+            if (!newValue)
+            {
+                m_ThreadUI.Stop();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether scroll animation is enabled. Default value is true.
+        /// Scroll animation will be disabled if gallery is running under Remote Windows Terminal session or fade animation effect is disabled on the
+        /// container control.
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Animation"), Description("Indicates whether scroll animation is enabled.")]
+        public bool ScrollAnimation
+        {
+            get { return m_ScrollAnimation; }
+            set { m_ScrollAnimation = value; }
+        }
+
+        /// <summary>
+        /// Called on each item when ScaleControl method of parent control is called and gives opportunity to item to adjust its displayed based on current scaling.
+        /// </summary>
+        /// <param name="factor">Scale factor.</param>
+        protected override void ScaleItem(SizeF factor)
+        {
+            base.ScaleItem(factor);
+            if (m_PopupGallery == null) return;
+            m_PopupGallery.NotifyScaleItem(factor);
+        }
+        #endregion
+
+        #region IExtenderProvider Implementation, GalleryGroup property extender
+        /// <summary>
+        /// Returns whether Gallery can extend the object.
+        /// </summary>
+        /// <param name="extendee">Object to test extensibility for.</param>
+        /// <returns>Returns true if object can be extended otherwise false.</returns>
+        public bool CanExtend(object extendee)
+        {
+            BaseItem item = extendee as BaseItem;
+            if (item == null) return false;
+            return this.SubItems.Contains(item);
+        }
+
+        /// <summary>
+        /// Gets the GalleryGroup item is assigned to.
+        /// </summary>
+        /// <param name="item">Reference to item.</param>
+        /// <returns>An instance of GalleryGroup object or null if item is not assigned to the group</returns>
+        [Editor("DevComponents.DotNetBar.Design.GalleryGroupTypeEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), DefaultValue(null)]
+        public GalleryGroup GetGalleryGroup(BaseItem item)
+        {
+            if (item == null) return null;
+            return GetItemGalleryGroup(item);
+        }
+        /// <summary>
+        /// Assigns the item to the gallery group.
+        /// </summary>
+        /// <param name="item">Item to assign.</param>
+        /// <param name="group">Group to assign item to. Can be null to remove item assignment.</param>
+        public void SetGalleryGroup(BaseItem item, GalleryGroup group)
+        {
+            if (item == null)
+                throw new ArgumentNullException("item argument cannot be null.");
+
+            if (group == null)
+            {
+                GalleryGroup g = GetItemGalleryGroup(item);
+                if (g != null)
+                    g.Items.Remove(item);
+            }
+            else
+            {
+                GalleryGroup g = GetItemGalleryGroup(item);
+                if (g != null)
+                    g.Items.Remove(item);
+                group.Items.Add(item);
+            }
+        }
+
+        private GalleryGroup GetItemGalleryGroup(BaseItem item)
+        {
+            foreach (GalleryGroup g in m_Groups)
+            {
+                if (g.Items.Contains(item))
+                    return g;
+            }
+            return null;
+        }
+
+        /// <summary>
+        /// Gets the collection of GalleryGroup objects associated with this gallery. Groups are assigned optionally to one or more items
+        /// that are part of the GalleryContainer. Groups are used to visually group the items when gallery is displayed on the popup.
+        /// </summary>
+        [Editor("DevComponents.DotNetBar.Design.GalleryGroupCollectionEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), DesignerSerializationVisibility(DesignerSerializationVisibility.Content), Category("Groups"), Browsable(false), Description("Gets the collection of GalleryGroup objects associated with this gallery.")]
+        public GalleryGroupCollection GalleryGroups
+        {
+            get { return m_Groups; }
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Ribbon/GalleryGroup.cs b/PROMS/DotNetBar Source Code/Ribbon/GalleryGroup.cs
new file mode 100644
index 00000000..89a27ef2
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Ribbon/GalleryGroup.cs	
@@ -0,0 +1,116 @@
+using System;
+using System.Text;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represents the popup gallery group that groups set of items inside of gallery into the group.
+    /// </summary>
+    [DesignTimeVisible(false), ToolboxItem(false), TypeConverterAttribute("DevComponents.DotNetBar.Design.GalleryGroupConverter, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+    public class GalleryGroup : Component
+    {
+        #region Private Variables
+        private string m_Text = "";
+        private string m_Name = "";
+        private GalleryContainer m_ParentGallery = null;
+        private int m_DisplayOrder = 0;
+        private SubItemsCollection m_Items = null;
+        #endregion
+
+        #region Internal Implementation
+        /// <summary>
+        /// Creates new instance of the object.
+        /// </summary>
+        public GalleryGroup()
+        {
+            m_Items = new SubItemsCollection(null);
+            m_Items.IgnoreEvents = true;
+            m_Items.AllowParentRemove = false;
+        }
+
+        /// <summary>
+        /// Gets or sets title of the group that will be displayed on the group label when on popup gallery.
+        /// </summary>
+        [Browsable(true), DefaultValue(""), Editor("DevComponents.DotNetBar.Design.TextMarkupUIEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), Localizable(true), Description("Indicates title of the group that will be displayed on the group label when on popup gallery.")]
+        public string Text
+        {
+            get { return m_Text; }
+            set
+            {
+                if (value == null) value = "";
+                m_Text = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets name of the group that can be used to identify item from the code.
+        /// </summary>
+        [Browsable(false), Category("Design"), Description("Indicates the name used to identify the group.")]
+        public string Name
+        {
+            get
+            {
+                if (this.Site != null)
+                    m_Name = this.Site.Name;
+                return m_Name;
+            }
+            set
+            {
+                if (this.Site != null)
+                    this.Site.Name = value;
+                if (value == null)
+                    m_Name = "";
+                else
+                    m_Name = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the parent gallery for the group.
+        /// </summary>
+        [Browsable(false)]
+        public GalleryContainer ParentGallery
+        {
+            get
+            {
+                return m_ParentGallery;
+            }
+        }
+
+        internal void SetParentGallery(GalleryContainer value)
+        {
+            m_ParentGallery = value;
+        }
+
+        public override string ToString()
+        {
+            if (m_Text.Length > 0)
+                return m_Text;
+            return base.ToString();
+        }
+
+        /// <summary>
+        /// Gets or sets the display order for the group when displayed on the popup. Lower values are displayed closer to the top. Default value is 0. 
+        /// </summary>
+        [Browsable(true), DefaultValue(0), Description("Indicates display order for the group when displayed on the popup."), Category("Layout")]
+        public int DisplayOrder
+        {
+            get { return m_DisplayOrder; }
+            set
+            {
+                m_DisplayOrder = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the collection of the items assigned to this group.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public SubItemsCollection Items
+        {
+            get { return m_Items; }
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Ribbon/GalleryGroupCollection.cs b/PROMS/DotNetBar Source Code/Ribbon/GalleryGroupCollection.cs
new file mode 100644
index 00000000..74ccd5c5
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Ribbon/GalleryGroupCollection.cs	
@@ -0,0 +1,152 @@
+using System;
+using System.Text;
+using System.Collections;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represents the GalleryGroup typed collection.
+    /// </summary>
+    public class GalleryGroupCollection : CollectionBase
+    {
+        #region Private Variables and Events
+		public event EventHandler GroupRemoved;
+		public event EventHandler GroupAdded;
+		private GalleryContainer m_Owner=null;
+		#endregion
+
+		#region Internal Implementation
+		/// <summary>
+		/// Adds new object to the collection.
+		/// </summary>
+		/// <param name="tab">Object to add.</param>
+		/// <returns>Index of newly added object.</returns>
+		public int Add(GalleryGroup tab)
+		{
+			return List.Add(tab);
+		}
+
+		/// <summary>
+		/// Adds new objects to the collection.
+		/// </summary>
+		/// <param name="groups">Array of groups to add.</param>
+		public void AddRange(GalleryGroup[] groups)
+		{
+			foreach(GalleryGroup doc in groups)
+				List.Add(doc);
+		}
+
+		/// <summary>
+		/// Returns reference to the object in collection based on it's index.
+		/// </summary>
+		public GalleryGroup this[int index]
+		{
+			get {return (GalleryGroup)(List[index]);}
+			set {List[index] = value;}
+		}
+
+        /// <summary>
+        /// Returns reference to the object in collection based on it's name.
+        /// </summary>
+        public GalleryGroup this[string name]
+        {
+            get
+            {
+                foreach (GalleryGroup g in this.List)
+                {
+                    if (g.Name == name)
+                        return g;
+                }
+                return null;
+            }
+        }
+
+		/// <summary>
+		/// Inserts new object into the collection.
+		/// </summary>
+		/// <param name="index">Position of the object.</param>
+		/// <param name="value">Object to insert.</param>
+		public void Insert(int index, GalleryGroup value) 
+		{
+			List.Insert(index, value);
+		}
+
+		/// <summary>
+		/// Returns index of the object inside of the collection.
+		/// </summary>
+		/// <param name="value">Reference to the object.</param>
+		/// <returns>Index of the object.</returns>
+		public int IndexOf(GalleryGroup value) 
+		{
+			return List.IndexOf(value);
+		}
+
+		/// <summary>
+		/// Returns whether collection contains specified object.
+		/// </summary>
+		/// <param name="value">Object to look for.</param>
+		/// <returns>true if object is part of the collection, otherwise false.</returns>
+		public bool Contains(GalleryGroup value) 
+		{
+			return List.Contains(value);
+		}
+
+		/// <summary>
+		/// Removes specified object from the collection.
+		/// </summary>
+		/// <param name="value"></param>
+		public void Remove(GalleryGroup value) 
+		{
+			List.Remove(value);
+		}
+
+		protected override void OnRemoveComplete(int index,object value)
+		{
+			base.OnRemoveComplete(index,value);
+			GalleryGroup item=value as GalleryGroup;
+			item.SetParentGallery(null);
+			if(GroupRemoved!=null)
+				GroupRemoved(item,new EventArgs());
+		}
+		protected override void OnInsertComplete(int index,object value)
+		{
+			base.OnInsertComplete(index,value);
+			GalleryGroup item=value as GalleryGroup;
+			if(m_Owner!=null)
+				item.SetParentGallery(m_Owner);
+			if(GroupAdded!=null)
+				GroupAdded(item,new EventArgs());
+		}
+
+		/// <summary>
+		/// Copies collection into the specified array.
+		/// </summary>
+		/// <param name="array">Array to copy collection to.</param>
+		/// <param name="index">Starting index.</param>
+		public void CopyTo(GalleryGroup[] array, int index) 
+		{
+			List.CopyTo(array, index);
+		}
+
+		/// <summary>
+		/// Copies contained items to the GalleryGroup array.
+		/// </summary>
+		/// <param name="array">Array to copy to.</param>
+		internal void CopyTo(GalleryGroup[] array)
+		{
+			List.CopyTo(array,0);
+		}
+
+		internal GalleryContainer Owner
+		{
+			get {return m_Owner;}
+			set {m_Owner=value;}
+		}
+
+		protected override void OnClear()
+		{
+			base.OnClear();
+		}
+		#endregion
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/Ribbon/ISimpleElement.cs b/PROMS/DotNetBar Source Code/Ribbon/ISimpleElement.cs
new file mode 100644
index 00000000..1ef70181
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Ribbon/ISimpleElement.cs	
@@ -0,0 +1,26 @@
+using System;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Summary description for ISimpleElement.
+	/// </summary>
+	public interface ISimpleElement
+	{
+		Rectangle Bounds {get;set;}
+		int FixedWidth {get;set;}
+		bool ImageVisible {get;}
+		Size ImageLayoutSize {get;}
+		eSimplePartAlignment ImageAlignment {get;set;}
+		Rectangle ImageBounds {get;set;}
+		int ImageTextSpacing {get;}
+
+		bool TextVisible {get;}
+		string Text {get;set;}
+		Rectangle TextBounds {get;set;}
+		System.Drawing.Image Image {get;set;}
+        Size TextSize { get; set; }
+	}
+}
+
diff --git a/PROMS/DotNetBar Source Code/Ribbon/ItemBlockLayoutManager.cs b/PROMS/DotNetBar Source Code/Ribbon/ItemBlockLayoutManager.cs
new file mode 100644
index 00000000..7bba3a5a
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Ribbon/ItemBlockLayoutManager.cs	
@@ -0,0 +1,39 @@
+using System;
+using System.Collections;
+using DevComponents.UI.ContentManager;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Represents IBlock layout manager implementation
+	/// </summary>
+	public class ItemBlockLayoutManager:BlockLayoutManager
+	{
+		/// <summary>
+		/// Resizes the content block and sets it's Bounds property to reflect new size.
+		/// </summary>
+		/// <param name="block">Content block to resize.</param>
+        public override void Layout(IBlock block, Size availableSize)
+		{
+			if(block is BaseItem)
+			{
+				BaseItem item=block as BaseItem;
+                if (item is ItemContainer || item.IsContainer)
+                {
+                    item.SuspendLayout = true;
+                    item.WidthInternal = availableSize.Width;
+                    item.HeightInternal = availableSize.Height;
+                    item.SuspendLayout = false;
+                }
+                item.RecalcSize();
+				item.Displayed=item.Visible;
+			}
+		}
+
+        public override Rectangle FinalizeLayout(Rectangle containerBounds, Rectangle blocksBounds, ArrayList lines)
+        {
+            return (blocksBounds);
+        }
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/Ribbon/ItemContainer.cs b/PROMS/DotNetBar Source Code/Ribbon/ItemContainer.cs
new file mode 100644
index 00000000..5d456000
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Ribbon/ItemContainer.cs	
@@ -0,0 +1,1665 @@
+using System;
+using System.ComponentModel.Design;
+using System.Drawing;
+using System.ComponentModel;
+using System.Drawing.Drawing2D;
+using System.Windows.Forms;
+using System.Windows.Forms.Design;
+using DevComponents.UI.ContentManager;
+using System.Collections.ObjectModel;
+using System.Diagnostics;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represents item container that arranges items horizontally or vertically.
+    /// </summary>
+    [ToolboxItem(false), DesignTimeVisible(false), Designer("DevComponents.DotNetBar.Design.ItemContainerDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+    public class ItemContainer : ImageItem, IDesignTimeProvider, IBlockExtended
+    {
+        #region Private Variables & Constructor
+        private eOrientation m_LayoutOrientation = eOrientation.Horizontal;
+        private Size m_EmptyDesignTimeSize = new Size(24, 24);
+        private bool m_SystemContainer = false;
+        private int m_ItemSpacing = 1;
+        private Rectangle m_DesignerSelectionRectangle = Rectangle.Empty;
+        private bool m_ResizeItemsToFit = true;
+        private eHorizontalItemsAlignment m_HorizontalItemAlignment = eHorizontalItemsAlignment.Left;
+        private eVerticalItemsAlignment m_VerticalItemAlignment = eVerticalItemsAlignment.Top;
+        private Size m_MinimumSize = Size.Empty;
+        private ElementStyle m_BackgroundStyle = new ElementStyle();
+        private int m_BeginGroupSpacing = 0;
+        private bool m_MultiLine = false;
+
+        /// <summary>
+        /// Creates new instance of the ItemContainer object.
+        /// </summary>
+        public ItemContainer()
+        {
+            m_IsContainer = true;
+            this.AutoCollapseOnClick = true;
+            this.AccessibleRole = System.Windows.Forms.AccessibleRole.Grouping;
+
+            //m_Padding.SpacingChanged += new EventHandler(PaddingChanged);
+            //m_Margin.SpacingChanged += new EventHandler(MarginChanged);
+
+            m_BackgroundStyle.StyleChanged += BackgroundStyleChanged;
+
+            _TitleStyle = new ElementStyle();
+            _TitleStyle.StyleChanged += TitleStyleChanged;
+            _TitleMouseOverStyle = new ElementStyle();
+            _TitleMouseOverStyle.StyleChanged += TitleStyleChanged;
+        }
+        protected override void Dispose(bool disposing)
+        {
+            m_BackgroundStyle.StyleChanged -= BackgroundStyleChanged;
+            m_BackgroundStyle.Dispose();
+            _TitleStyle.StyleChanged -= TitleStyleChanged;
+            _TitleStyle.Dispose();
+            base.Dispose(disposing);
+        }
+        #endregion
+
+        #region Internal Implementation
+        private void MarginChanged(object sender, EventArgs e)
+        {
+            NeedRecalcSize = true;
+            OnAppearanceChanged();
+        }
+
+        private void PaddingChanged(object sender, EventArgs e)
+        {
+            NeedRecalcSize = true;
+            OnAppearanceChanged();
+        }
+
+        private void BackgroundStyleChanged(object sender, EventArgs e)
+        {
+            this.OnAppearanceChanged();
+        }
+
+        /// <summary>
+        /// Gets or sets the minimum size of the container. Either Width or Height can be set or both. Default value is 0,0 which means
+        /// that size is automatically calculated.
+        /// </summary>
+        public Size MinimumSize
+        {
+            get { return m_MinimumSize; }
+            set
+            {
+                m_MinimumSize = value;
+                this.NeedRecalcSize = true;
+                this.OnAppearanceChanged();
+            }
+        }
+
+        private bool ShouldSerializeMinimumSize()
+        {
+            return !m_MinimumSize.IsEmpty;
+        }
+
+        /// <summary>
+        /// Specifies the container background style. Default value is an empty style which means that container does not display any background.
+        /// BeginGroup property set to true will override this style on some styles.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Category("Style"), Description("Gets or sets container background style."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ElementStyle BackgroundStyle
+        {
+            get { return m_BackgroundStyle; }
+        }
+
+        /// <summary>
+        /// Gets or sets the item alignment when container is in horizontal layout. Default value is Left.
+        /// </summary>
+        [Browsable(true), DefaultValue(eHorizontalItemsAlignment.Left), Category("Layout"), Description("Indicates item alignment when container is in horizontal layout."), DevCoBrowsable(true)]
+        public virtual eHorizontalItemsAlignment HorizontalItemAlignment
+        {
+            get { return m_HorizontalItemAlignment; }
+            set
+            {
+                m_HorizontalItemAlignment = value;
+                this.NeedRecalcSize = true;
+                this.OnAppearanceChanged();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the item vertical alignment. Default value is Top.
+        /// </summary>
+        [Browsable(true), DefaultValue(eVerticalItemsAlignment.Top), Category("Layout"), Description("Indicates item item vertical alignment."), DevCoBrowsable(true)]
+        public virtual eVerticalItemsAlignment VerticalItemAlignment
+        {
+            get { return m_VerticalItemAlignment; }
+            set
+            {
+                m_VerticalItemAlignment = value;
+                this.NeedRecalcSize = true;
+                this.OnAppearanceChanged();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether items in horizontal layout are wrapped into the new line when they cannot fit allotted container size. Default value is false.
+        /// </summary>
+        [Browsable(true), DefaultValue(false), Category("Layout"), Description("Indicates whether items in horizontal layout are wrapped into the new line when they cannot fit allotted container size.")]
+        public virtual bool MultiLine
+        {
+            get { return m_MultiLine; }
+            set
+            {
+                m_MultiLine = value;
+                this.NeedRecalcSize = true;
+                this.OnAppearanceChanged();
+            }
+        }
+
+        /// <summary>
+        /// Gets whether container supports expanding of its content. Provided for system use.
+        /// </summary>
+        [Browsable(false)]
+        public virtual bool CanExpand
+        {
+            get { return false; }
+        }
+
+        /// <summary>
+        /// Gets or sets spacing in pixels between items. Default value is 0.
+        /// </summary>
+        [Browsable(true), DefaultValue(1), Category("Layout"), Description("Indicates spacing in pixels between items.")]
+        public int ItemSpacing
+        {
+            get { return m_ItemSpacing; }
+            set
+            {
+                if (m_ItemSpacing != value)
+                {
+                    m_ItemSpacing = value;
+                    this.NeedRecalcSize = true;
+                    this.OnAppearanceChanged();
+                }
+            }
+        }
+
+        protected virtual Rectangle GetClipRectangle()
+        {
+            Rectangle clip = this.DisplayRectangle;
+            bool disposeStyle = false;
+            ElementStyle style = ElementStyleDisplay.GetElementStyle(m_BackgroundStyle, out disposeStyle);
+            clip.X += ElementStyleLayout.LeftWhiteSpace(style);
+            clip.Width -= ElementStyleLayout.HorizontalStyleWhiteSpace(style);
+            clip.Y += ElementStyleLayout.TopWhiteSpace(style);
+            clip.Height -= ElementStyleLayout.VerticalStyleWhiteSpace(style);
+            if (disposeStyle) style.Dispose();
+            return clip;
+        }
+
+        internal void InternalPaintBackground(ItemPaintArgs p)
+        {
+            PaintBackground(p);
+        }
+
+        protected virtual void PaintBackground(ItemPaintArgs p)
+        {
+            m_BackgroundStyle.SetColorScheme(p.Colors);
+            Graphics g = p.Graphics;
+            Rendering.BaseRenderer renderer = p.Renderer;
+            if (renderer != null)
+            {
+                ItemContainerRendererEventArgs ie = new ItemContainerRendererEventArgs(p.Graphics, this);
+                ie.ItemPaintArgs = p;
+                renderer.DrawItemContainer(ie);
+            }
+            else
+                ElementStyleDisplay.Paint(new ElementStyleDisplayInfo(m_BackgroundStyle, g, this.DisplayRectangle));
+        }
+
+        private bool IsGroupingContainer
+        {
+            get
+            {
+                return BarFunctions.IsOffice2007StyleOnly(this.EffectiveStyle) && this.BeginGroup;
+            }
+        }
+
+        private bool _TitleMouseOver = false;
+        /// <summary>
+        /// Gets whether mouse is over the title if title is visible.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool TitleMouseOver
+        {
+            get { return _TitleMouseOver; }
+            set
+            {
+                if (_TitleMouseOver != value)
+                {
+                    _TitleMouseOver = value;
+                    if (_TitleMouseOverStyle.Custom)
+                        this.Invalidate();
+                }
+            }
+        }
+
+        private Rectangle _TitleRectangle = Rectangle.Empty;
+        /// <summary>
+        /// Gets the title rectangle if title is visible.
+        /// </summary>
+        [Browsable(false)]
+        public Rectangle TitleRectangle
+        {
+            get { return _TitleRectangle; }
+        }
+        private void PaintTitle(ItemPaintArgs p)
+        {
+            _TitleRectangle = Rectangle.Empty;
+            if (!IsTitleVisible) return;
+
+            Rectangle r = new Rectangle(this.DisplayRectangle.X, this.DisplayRectangle.Y, this.DisplayRectangle.Width, _TitleSize.Height);
+            if (_TitlePosition == eTitlePosition.Bottom)
+                r.Y = this.DisplayRectangle.Bottom - _TitleSize.Height;
+
+            Graphics g = p.Graphics;
+            Font font = p.Font;
+
+            ElementStyle titleStyle = GetActiveTitleStyle();
+            if (titleStyle.Custom)
+            {
+                bool dispose = false;
+                ElementStyle style = ElementStyleDisplay.GetElementStyle(titleStyle, out dispose);
+
+                ElementStyleDisplayInfo di = new ElementStyleDisplayInfo(style, g, r);
+                ElementStyleDisplay.Paint(di);
+                ElementStyleDisplay.PaintText(di, _TitleText, font);
+                if (dispose) style.Dispose();
+            }
+            else
+            {
+                TextDrawing.DrawString(g, _TitleText, font, SystemColors.ControlText, r, eTextFormat.Default);
+            }
+            _TitleRectangle = r;
+        }
+
+        protected virtual ElementStyle GetActiveTitleStyle()
+        {
+            if (_TitleMouseOver && _TitleMouseOverStyle.Custom)
+                return _TitleMouseOverStyle;
+            return _TitleStyle;
+        }
+        /// <summary>
+        /// Must be overridden by class that is inheriting to provide the painting for the item.
+        /// </summary>
+        public override void Paint(ItemPaintArgs p)
+        {
+            Graphics g = p.Graphics;
+            Region oldClip = null;
+            bool clipSet = false;
+
+            PaintBackground(p);
+
+            if (IsGroupingContainer)
+            {
+                Rectangle clip = this.DisplayRectangle;
+                clip.Inflate(-1, -1);
+                oldClip = g.Clip;
+                g.SetClip(clip, CombineMode.Replace);
+                clipSet = true;
+            }
+            else
+            {
+                Rectangle clip = GetClipRectangle();
+                oldClip = g.Clip;
+                g.SetClip(clip, CombineMode.Intersect);
+                clipSet = true;
+            }
+
+            PaintTitle(p);
+
+            ItemDisplay display = GetItemDisplay();
+            display.Paint(this, p);
+
+            if (clipSet)
+            {
+                if (oldClip != null)
+                    g.Clip = oldClip;
+                else
+                    g.ResetClip();
+            }
+
+            if (oldClip != null)
+                oldClip.Dispose();
+
+            if (this.DesignMode && !this.SystemContainer && p.DesignerSelection)
+            {
+                Rectangle r = this.DisplayRectangle;
+
+                Pen pen = null;
+                if (this.Focused)
+                    pen = new Pen(Color.FromArgb(190, Color.Navy), 1);
+                else
+                    pen = new Pen(Color.FromArgb(80, Color.Black), 1);
+
+                pen.DashStyle = DashStyle.Dot;
+                DisplayHelp.DrawRoundedRectangle(g, pen, r, 3);
+                pen.Dispose();
+                pen = null;
+
+                Image image = BarFunctions.LoadBitmap("SystemImages.AddMoreItemsContainer.png");
+
+                if (this.Parent is ItemContainer && !((ItemContainer)this.Parent).SystemContainer)
+                {
+                    ItemContainer pc = this.Parent as ItemContainer;
+                    while (pc != null && !pc.SystemContainer)
+                    {
+                        if (new Rectangle(pc.DisplayRectangle.Location, image.Size).Contains(this.DisplayRectangle.Location))
+                        {
+                            if (r.X + image.Width + 1 > this.DisplayRectangle.Right)
+                            {
+                                r.X = this.DisplayRectangle.X;
+                                if (r.Y + image.Height < this.DisplayRectangle.Bottom)
+                                    r.Y += image.Height + 1;
+                                else
+                                    break;
+                            }
+                            r.X += (image.Width + 1);
+                        }
+                        pc = pc.Parent as ItemContainer;
+                    }
+                }
+
+                m_DesignerSelectionRectangle = new Rectangle(r.X + 1, r.Y + 1, image.Width, image.Height);
+                g.DrawImageUnscaled(image, m_DesignerSelectionRectangle.Location);
+            }
+
+            this.DrawInsertMarker(p.Graphics);
+        }
+
+        /// <summary>
+        /// Returns empty container default design-time size.
+        /// </summary>
+        /// <returns>Size of an empty container.</returns>
+        protected virtual Size GetEmptyDesignTimeSize()
+        {
+            Size s = m_EmptyDesignTimeSize;
+            if (m_LayoutOrientation == eOrientation.Horizontal)
+                s.Width += 12;
+            else
+                s.Height += 12;
+
+            return s;
+        }
+
+        private Size _FixedSize = Size.Empty;
+        /// <summary>
+        /// Gets or sets the suggested fixed size of the container. Width or Height or Both may be set to suggest fixed size for the container.
+        /// </summary>
+        [Description("Indicates suggested fixed size of the container. Width or Height or both may be set to suggest fixed size for the container."), Category("Appearance")]
+        public Size FixedSize
+        {
+            get { return _FixedSize; }
+            set
+            {
+                if (value != _FixedSize)
+                {
+                    Size oldValue = _FixedSize;
+                    _FixedSize = value;
+                    OnFixedSizeChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Gets whether FixedSize property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeFixedSize()
+        {
+            return !_FixedSize.IsEmpty;
+        }
+        /// <summary>
+        /// Resets the property to default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetFixedSize()
+        {
+            TypeDescriptor.GetProperties(this)["FixedSize"].SetValue(this, Size.Empty);
+        }
+        /// <summary>
+        /// Called when FixedSize property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnFixedSizeChanged(Size oldValue, Size newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("FixedSize"));
+            if (oldValue.Width != newValue.Width || oldValue.Height != newValue.Height)
+            {
+                NeedRecalcSize = true;
+                this.Refresh();
+            }
+        }
+
+        /// <summary>
+        /// Recalculates the size of the container. Assumes that DisplayRectangle.Location is set to the upper left location of this container.
+        /// </summary>
+        public override void RecalcSize()
+        {
+            if (this.SuspendLayout)
+                return;
+
+            if (this.SubItems.Count == 0 && !IsTitleVisible)
+            {
+                if (this.DesignMode && !this.SystemContainer)
+                {
+                    m_Rect.Size = GetEmptyDesignTimeSize();
+                }
+                else
+                {
+                    if (!_FixedSize.IsEmpty)
+                    {
+                        m_Rect = new Rectangle(m_Rect.X, m_Rect.Y,
+                            Dpi.Width(_FixedSize.Width > 0 ? _FixedSize.Width : m_MinimumSize.Width),
+                            Dpi.Height(_FixedSize.Height > 0 ? _FixedSize.Height : m_MinimumSize.Height));
+                    }
+                    else if (m_MinimumSize.IsEmpty)
+                        m_Rect = Rectangle.Empty;
+                    else
+                        m_Rect = new Rectangle(m_Rect.X, m_Rect.Y, Dpi.Width(m_MinimumSize.Width), Dpi.Height(m_MinimumSize.Height));
+                }
+                base.RecalcSize();
+                return;
+            }
+
+            m_Rect = LayoutItems(m_Rect);
+
+            base.RecalcSize();
+        }
+
+        private bool _TitleWidthFill = false;
+        /// <summary>
+        /// Indicates whether title if sets always fills up the total width of the container. Defaul value is false.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool TitleWidthFill
+        {
+            get { return _TitleWidthFill; }
+            set { _TitleWidthFill = value;
+                this.NeedRecalcSize = true;
+            }
+        }
+
+        private Size _TitleSize = Size.Empty;
+        private void LayoutTitle(Rectangle bounds)
+        {
+            _TitleSize = Size.Empty;
+            if (!IsTitleVisible) return;
+
+            Control container = this.ContainerControl as Control;
+            if (container != null)
+            {
+                ElementStyle titleStyle = GetActiveTitleStyle();
+                if (titleStyle.Custom)
+                {
+                    bool dispose = false;
+                    ElementStyle style = ElementStyleDisplay.GetElementStyle(titleStyle, out dispose);
+                    Font font = container.Font;
+                    if (style.Font != null)
+                        font = style.Font;
+
+                    Size textSize = Size.Empty;
+                    using (Graphics g = BarFunctions.CreateGraphics(container))
+                        textSize = TextDrawing.MeasureString(g, _TitleText, font, bounds.Width - ElementStyleLayout.HorizontalStyleWhiteSpace(style), style.TextFormat);
+                    if (bounds.Width > 0 && _TitleWidthFill)
+                        _TitleSize.Width = bounds.Width;
+                    else
+                        _TitleSize.Width = textSize.Width;
+                    _TitleSize.Height = textSize.Height + ElementStyleLayout.VerticalStyleWhiteSpace(style);
+                    if (dispose)
+                        style.Dispose();
+                }
+                else
+                {
+                    Font font = container.Font;
+                    using (Graphics g = BarFunctions.CreateGraphics(container))
+                    {
+                        Size textSize = TextDrawing.MeasureString(g, _TitleText, font, bounds.Width);
+                        if (bounds.Width > 0 && _TitleWidthFill)
+                            _TitleSize.Width = bounds.Width;
+                        else
+                            _TitleSize.Width = textSize.Width;
+                        _TitleSize.Height = textSize.Height + 1;
+                    }
+                }
+            }
+        }
+
+        protected virtual Rectangle LayoutItems(Rectangle bounds)
+        {
+            IContentLayout layout = this.GetContentLayout();
+            BlockLayoutManager blockLayout = this.GetBlockLayoutManager();
+            LayoutTitle(bounds);
+            Rectangle r = GetLayoutRectangle(bounds);
+
+            BaseItem[] elements = new BaseItem[this.SubItems.Count];
+            if (_FitOversizeItemIntoAvailableWidth)
+            {
+                for (int i = 0; i < this.SubItems.Count; i++)
+                {
+                    ButtonItem button = this.SubItems[i] as ButtonItem;
+                    if (button != null)
+                    {
+                        button._FitContainer = true;
+                        button.WidthInternal = r.Width;
+                    }
+                    elements[i] = this.SubItems[i];
+                }
+            }
+            else
+                this.SubItems.CopyTo(elements, 0);
+
+            bool disposeStyle = false;
+            ElementStyle style = ElementStyleDisplay.GetElementStyle(m_BackgroundStyle, out disposeStyle);
+            r = layout.Layout(r, elements, blockLayout);
+
+            if (!this.Displayed)
+            {
+                for (int i = 0; i < this.SubItems.Count; i++)
+                    this.SubItems[i].Displayed = false;
+            }
+            if (!this.SystemContainer)
+            {
+                if (!_FixedSize.IsEmpty)
+                {
+                    r = new Rectangle(bounds.X, bounds.Y,
+                        _FixedSize.Width > 0 ? Dpi.Width(_FixedSize.Width) : r.Width,
+                        _FixedSize.Height > 0 ? Dpi.Height(_FixedSize.Height) : r.Height);
+                }
+                else
+                    r = new Rectangle(bounds.Location, r.Size);
+            }
+            r.Height += _TitleSize.Height;
+            if (_TitleSize.Width > r.Width) r.Width = _TitleSize.Width;
+
+            _ActualItemsBounds = r;
+
+            Size minimumSize = Dpi.Size(m_MinimumSize);
+            if (minimumSize.Width > 0 && minimumSize.Width > r.Width)
+                r.Width = minimumSize.Width;
+            else
+                r.Width += ElementStyleLayout.HorizontalStyleWhiteSpace(style);
+
+            if (minimumSize.Height > 0 && minimumSize.Height > r.Height)
+                r.Height = minimumSize.Height;
+            else
+                r.Height += ElementStyleLayout.VerticalStyleWhiteSpace(style);
+            if (disposeStyle) style.Dispose();
+            return r;
+        }
+
+        private Rectangle _ActualItemsBounds = Rectangle.Empty;
+
+        internal Rectangle ActualItemsBounds
+        {
+            get { return _ActualItemsBounds; }
+        }
+
+        protected virtual Rectangle GetLayoutRectangle(Rectangle bounds)
+        {
+            if (bounds.Width == 0)
+                bounds.Width = 16;
+            if (bounds.Height == 0)
+                bounds.Height = 16;
+
+            if (_FixedSize.Width > 0)
+                bounds.Width = Dpi.Width(_FixedSize.Width);
+            else if (m_MinimumSize.Width > 0)
+                bounds.Width = Dpi.Width(m_MinimumSize.Width);
+
+            if (_FixedSize.Height > 0)
+                bounds.Height = Dpi.Height(_FixedSize.Height);
+            else if (m_MinimumSize.Height > 0)
+                bounds.Height = Dpi.Height(m_MinimumSize.Height);
+
+            bool disposeStyle = false;
+            ElementStyle style = ElementStyleDisplay.GetElementStyle(m_BackgroundStyle, out disposeStyle);
+            bounds.X += ElementStyleLayout.LeftWhiteSpace(style); // m_BackgroundStyle.PaddingLeft + m_BackgroundStyle.MarginLeft;
+            bounds.Y += ElementStyleLayout.TopWhiteSpace(style); // m_BackgroundStyle.PaddingTop + m_BackgroundStyle.MarginTop;
+            bounds.Width -= ElementStyleLayout.HorizontalStyleWhiteSpace(style); //m_BackgroundStyle.PaddingHorizontal + m_BackgroundStyle.MarginHorizontal;
+            bounds.Height -= ElementStyleLayout.VerticalStyleWhiteSpace(style); //m_BackgroundStyle.PaddingVertical + m_BackgroundStyle.MarginVertical;
+            if (disposeStyle) style.Dispose();
+
+            if (!_TitleSize.IsEmpty)
+            {
+                if (_TitlePosition == eTitlePosition.Top)
+                {
+                    bounds.Y += _TitleSize.Height;
+                    bounds.Height -= _TitleSize.Height;
+                }
+                else if (_TitlePosition == eTitlePosition.Bottom)
+                {
+                    bounds.Height -= _TitleSize.Height;
+                }
+            }
+
+            return bounds;
+        }
+
+        protected override void OnExternalSizeChange()
+        {
+            base.OnExternalSizeChange();
+            if ((m_VerticalItemAlignment != eVerticalItemsAlignment.Top || IsRightToLeft) && this.SubItems.Count > 0 && !this.SuspendLayout)
+            {
+                LayoutItems(m_Rect);
+            }
+        }
+
+        private bool _FitOversizeItemIntoAvailableWidth = false;
+        internal bool FitOversizeItemIntoAvailableWidth
+        {
+            get { return _FitOversizeItemIntoAvailableWidth; }
+            set
+            {
+                _FitOversizeItemIntoAvailableWidth = value;
+            }
+        }
+
+        protected internal override void OnAfterItemRemoved(BaseItem item, int itemIndex)
+        {
+            if (item is ButtonItem && _FitOversizeItemIntoAvailableWidth)
+                ((ButtonItem)item)._FitContainer = false;
+            base.OnAfterItemRemoved(item, itemIndex);
+        }
+
+        /// <summary>
+        /// Occurs when the mouse pointer is over the item and a mouse button is pressed. This is used by internal implementation only.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+        public override void InternalMouseDown(System.Windows.Forms.MouseEventArgs objArg)
+        {
+            if (this.DesignMode && !this.SystemContainer)
+            {
+                BaseItem item = ItemAtLocation(objArg.X, objArg.Y);
+                if (item == this && !(item.DesignMode && !item.DesignTimeVisible))
+                {
+                    IOwner owner = this.GetOwner() as IOwner;
+                    if (owner != null)
+                    {
+                        owner.SetFocusItem(this);
+                        return;
+                    }
+                }
+            }
+            else if (!this.DisplayRectangle.Contains(objArg.X, objArg.Y))
+            {
+                if (this.DesignMode)
+                {
+                    IOwner owner = this.GetOwner() as IOwner;
+                    if (owner != null)
+                        owner.SetFocusItem(null);
+                    LeaveHotSubItem(null);
+                }
+                return;
+            }
+            base.InternalMouseDown(objArg);
+        }
+
+        public override void InternalMouseMove(MouseEventArgs objArg)
+        {
+            if (!this.DisplayRectangle.Contains(objArg.X, objArg.Y))
+            {
+                LeaveHotSubItem(null);
+                if (!this.SystemContainer)
+                    return;
+            }
+            else if (TitleVisible && _TitleRectangle.Contains(objArg.Location))
+            {
+                LeaveHotSubItem(null);
+                TitleMouseOver = true;
+            }
+            else
+                TitleMouseOver = false;
+            base.InternalMouseMove(objArg);
+        }
+
+        public override void InternalMouseLeave()
+        {
+            TitleMouseOver = false;
+            base.InternalMouseLeave();
+        }
+
+        public override void InternalMouseUp(MouseEventArgs objArg)
+        {
+            if (!this.DisplayRectangle.Contains(objArg.X, objArg.Y))
+                return;
+            base.InternalMouseUp(objArg);
+        }
+
+        /// <summary>
+        /// Return Sub Item at specified location
+        /// </summary>
+        public override BaseItem ItemAtLocation(int x, int y)
+        {
+            if (this.DesignMode && !this.SystemContainer && !m_DesignerSelectionRectangle.IsEmpty)
+            {
+                if (m_DesignerSelectionRectangle.Contains(x, y))
+                    return this;
+            }
+
+            if (!this.Visible || !this.DisplayRectangle.Contains(x, y))
+                return null;
+
+            if (m_SubItems != null)
+            {
+                foreach (BaseItem objSub in m_SubItems)
+                {
+                    if (objSub.IsContainer)
+                    {
+                        BaseItem item = objSub.ItemAtLocation(x, y);
+                        if (item != null)
+                            return item;
+                    }
+                    else
+                    {
+                        if ((objSub.Visible || this.IsOnCustomizeMenu) && objSub.Displayed && objSub.DisplayRectangle.Contains(x, y))
+                        {
+                            if (this.DesignMode && !this.DisplayRectangle.IntersectsWith(objSub.DisplayRectangle))
+                                continue;
+                            return objSub;
+                        }
+                    }
+                }
+            }
+
+            if (this.DisplayRectangle.Contains(x, y) && /*this.DesignMode &&*/ !this.SystemContainer)
+                return this;
+            return null;
+        }
+
+        /// <summary>
+        /// Gets or sets orientation inside the container. Do not change the value of this property. It is managed by system only.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override eOrientation Orientation
+        {
+            get { return eOrientation.Horizontal; }
+            set { }
+        }
+
+        /// <summary>
+        /// Gets or sets orientation inside the container.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), DefaultValue(eOrientation.Horizontal), DesignerSerializationVisibility(DesignerSerializationVisibility.Visible), Category("Layout")]
+        public virtual eOrientation LayoutOrientation
+        {
+            get { return m_LayoutOrientation; }
+            set
+            {
+                m_LayoutOrientation = value;
+                OnOrientationChanged();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether items contained by container are resized to fit the container bounds. When container is in horizontal
+        /// layout mode then all items will have the same height. When container is in vertical layout mode then all items
+        /// will have the same width. Default value is true.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), DefaultValue(true), Category("Layout"), Description("Indicates whether items contained by container are resized to fit the container bounds. When container is in horizontal layout mode then all items will have the same height. When container is in vertical layout mode then all items will have the same width.")]
+        public virtual bool ResizeItemsToFit
+        {
+            get { return m_ResizeItemsToFit; }
+            set
+            {
+                m_ResizeItemsToFit = value;
+                this.OnAppearanceChanged();
+            }
+        }
+
+        ///// <summary>
+        ///// Gets or sets vertical alignment of the items per line. Default value is top.
+        ///// </summary>
+        //[Browsable(true), DevCoBrowsable(true), DefaultValue(eContainerVerticalAlignment.Top), DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
+        //public virtual eContainerVerticalAlignment LineAlignment
+        //{
+        //    get { return m_LineAlignment; }
+        //    set
+        //    {
+        //        m_LineAlignment = value;
+        //        OnLineAlignmentChanged();
+        //    }
+        //}
+
+        private void OnLineAlignmentChanged()
+        {
+            NeedRecalcSize = true;
+            OnAppearanceChanged();
+        }
+
+        private void OnOrientationChanged()
+        {
+            NeedRecalcSize = true;
+            if (m_LayoutManager != null)
+                m_LayoutManager.ContentOrientation = (this.LayoutOrientation == eOrientation.Horizontal ? eContentOrientation.Horizontal : eContentOrientation.Vertical);
+            OnAppearanceChanged();
+        }
+
+        /// <summary>
+        /// IBlock member implementation
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), EditorBrowsable(EditorBrowsableState.Never)]
+        public override System.Drawing.Rectangle Bounds
+        {
+            get
+            {
+                return base.Bounds;
+            }
+            set
+            {
+                Point offset = new Point(value.X - m_Rect.X, value.Y - m_Rect.Y);
+                base.Bounds = value;
+
+                if (m_HorizontalItemAlignment != eHorizontalItemsAlignment.Left || m_LayoutManager != null && m_LayoutManager.RightToLeft)
+                {
+                    LayoutItems(value);
+                }
+                else
+                {
+                    if (!offset.IsEmpty)
+                    {
+                        OffsetSubItems(offset);
+                    }
+                }
+            }
+        }
+
+        private bool _Offsetting = false;
+        internal void OffsetSubItems(Point offset)
+        {
+            if (_Offsetting || offset.IsEmpty)
+                return;
+
+            try
+            {
+                _Offsetting = true;
+                BaseItem[] items = new BaseItem[this.SubItems.Count];
+                this.SubItems.CopyTo(items, 0);
+                foreach (IBlock b in items)
+                {
+                    Rectangle r = b.Bounds;
+                    r.Offset(offset);
+                    b.Bounds = r;
+                }
+            }
+            finally
+            {
+                _Offsetting = false;
+            }
+        }
+
+        /// <summary>
+        /// Called after TopInternal property has changed
+        /// </summary>
+        protected override void OnTopLocationChanged(int oldValue)
+        {
+            base.OnTopLocationChanged(oldValue);
+            Point offset = new Point(0, this.TopInternal - oldValue);
+            OffsetSubItems(offset);
+        }
+
+        /// <summary>
+        /// Called after LeftInternal property has changed
+        /// </summary>
+        protected override void OnLeftLocationChanged(int oldValue)
+        {
+            base.OnLeftLocationChanged(oldValue);
+            Point offset = new Point(this.LeftInternal - oldValue, 0);
+            OffsetSubItems(offset);
+        }
+
+        /// <summary>
+        /// Returns copy of the item.
+        /// </summary>
+        public override BaseItem Copy()
+        {
+            ItemContainer objCopy = new ItemContainer();
+            this.CopyToItem(objCopy);
+            return objCopy;
+        }
+        /// <summary>
+        /// Copies the ButtonItem specific properties to new instance of the item.
+        /// </summary>
+        /// <param name="c">New ButtonItem instance.</param>
+        protected override void CopyToItem(BaseItem c)
+        {
+            ItemContainer copy = c as ItemContainer;
+            copy.BackgroundStyle.ApplyStyle(m_BackgroundStyle);
+            copy.HorizontalItemAlignment = this.HorizontalItemAlignment;
+            copy.ItemSpacing = this.ItemSpacing;
+            copy.LayoutOrientation = this.LayoutOrientation;
+            copy.MinimumSize = this.MinimumSize;
+            copy.MultiLine = this.MultiLine;
+            copy.ResizeItemsToFit = this.ResizeItemsToFit;
+            copy.VerticalItemAlignment = this.VerticalItemAlignment;
+            base.CopyToItem(copy);
+
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the item is expanded or not. For Popup items this would indicate whether the item is popped up or not.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), System.ComponentModel.DefaultValue(false), System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
+        public override bool Expanded
+        {
+            get
+            {
+                return m_Expanded;
+            }
+            set
+            {
+                base.Expanded = value;
+                if (!value)
+                    BaseItem.CollapseSubItems(this);
+            }
+        }
+
+        /// <summary>
+        /// Occurs when sub item expanded state has changed.
+        /// </summary>
+        /// <param name="item">Sub item affected.</param>
+        protected internal override void OnSubItemExpandChange(BaseItem item)
+        {
+            base.OnSubItemExpandChange(item);
+            if (item.Expanded)
+                this.Expanded = true;
+        }
+
+        protected internal override void OnSubItemsClear()
+        {
+            this.RefreshImageSize();
+            base.OnSubItemsClear();
+        }
+
+        /// <summary>
+        /// Called when item Display state has changed.
+        /// </summary>
+        protected override void OnDisplayedChanged()
+        {
+            base.OnDisplayedChanged();
+
+
+            foreach (BaseItem item in this.SubItems)
+            {
+                if (item.Visible) item.Displayed = this.Displayed;
+            }
+
+            if (!this.Displayed)
+                this.InternalMouseLeave();
+        }
+
+        /// <summary>
+        /// Returns whether instance of the item container is used as system container internally by DotNetBar.
+        /// </summary>
+        [Browsable(false)]
+        public bool SystemContainer
+        {
+            get { return m_SystemContainer; }
+        }
+
+        /// <summary>
+        /// Sets whether container is used as system container internally by DotNetBar.
+        /// </summary>
+        /// <param name="b">true or false to indicate whether container is system container or not.</param>
+        internal void SetSystemContainer(bool b)
+        {
+            m_SystemContainer = b;
+        }
+
+        /// <summary>
+        /// Gets or sets the accessible role of the item.
+        /// </summary>
+        [DevCoBrowsable(true), Browsable(true), Category("Accessibility"), Description("Gets or sets the accessible role of the item."), DefaultValue(System.Windows.Forms.AccessibleRole.Grouping)]
+        public override System.Windows.Forms.AccessibleRole AccessibleRole
+        {
+            get { return base.AccessibleRole; }
+            set { base.AccessibleRole = value; }
+        }
+
+        private bool _ReserveLeftSpace = false;
+
+        /// <summary>
+        /// Indicates whether block elements inside of container when aligned center or right will reserve the space to the left. Default value is true.
+        /// </summary>
+        [DefaultValue(false), Category("Layout"), Description("Indicates whether block elements inside of container (affects span or div for example) when aligned center or right will reserve the space to the left.")]
+        public bool ReserveLeftSpace
+        {
+            get { return _ReserveLeftSpace; }
+            set { _ReserveLeftSpace = value; }
+        }
+        #endregion
+
+        #region Factories
+        private SerialContentLayoutManager m_LayoutManager = null;
+        protected virtual IContentLayout GetContentLayout()
+        {
+            if (m_LayoutManager == null)
+            {
+                m_LayoutManager = new SerialContentLayoutManager();
+                m_LayoutManager.BlockSpacing = 1;
+                m_LayoutManager.FitContainerOversize = false;
+                m_LayoutManager.FitContainer = false;
+                m_LayoutManager.BeforeNewBlockLayout += new LayoutManagerLayoutEventHandler(LayoutManager_BeforeNewBlockLayout);
+                
+            }
+            m_LayoutManager.EqualItemSize = _EqualItemSize;
+            m_LayoutManager.ReserveLeftSpace = _ReserveLeftSpace;
+            m_LayoutManager.MultiLine = m_MultiLine;
+            m_LayoutManager.EvenHeight = m_ResizeItemsToFit;
+
+            if (m_MinimumSize.Width > 0 && m_LayoutOrientation == eOrientation.Vertical)
+                m_LayoutManager.VerticalFitContainerWidth = true;
+            else
+                m_LayoutManager.VerticalFitContainerWidth = false;
+
+            if (m_MinimumSize.Height > 0 && m_LayoutOrientation == eOrientation.Horizontal)
+                m_LayoutManager.HorizontalFitContainerHeight = true;
+            else
+                m_LayoutManager.HorizontalFitContainerHeight = false;
+
+            m_LayoutManager.BlockLineAlignment = eContentVerticalAlignment.Top;
+            //if(m_LineAlignment==eContainerVerticalAlignment.Middle)
+            //    m_LayoutManager.BlockLineAlignment = eContentVerticalAlignment.Middle;
+            //else if (m_LineAlignment == eContainerVerticalAlignment.Bottom)
+            //    m_LayoutManager.BlockLineAlignment = eContentVerticalAlignment.Bottom;
+
+            m_LayoutManager.ContentAlignment = GetContentAlignment();
+            m_LayoutManager.ContentVerticalAlignment = GetVerticalContentAlignment(); // eContentVerticalAlignment.Top;
+            m_LayoutManager.ContentOrientation = (this.LayoutOrientation == eOrientation.Horizontal ? eContentOrientation.Horizontal : eContentOrientation.Vertical);
+            m_LayoutManager.RightToLeft = false;
+
+            Control containerControl = this.ContainerControl as Control;
+            if (containerControl != null && containerControl.RightToLeft == RightToLeft.Yes)
+                m_LayoutManager.RightToLeft = true;
+            else
+                m_LayoutManager.RightToLeft = false;
+
+            m_LayoutManager.BlockSpacing = Dpi.Width(m_ItemSpacing - (this.IsGroupingContainer ? 1 : 0));
+
+            return m_LayoutManager;
+        }
+
+        private void LayoutManager_BeforeNewBlockLayout(object sender, LayoutManagerLayoutEventArgs e)
+        {
+            BaseItem item = e.Block as BaseItem;
+            if (item != null && IsGroupingContainer && !(item is ItemContainer) && e.BlockVisibleIndex > 0)
+            {
+                if (m_LayoutOrientation == eOrientation.Horizontal)
+                    e.CurrentPosition.X += m_BeginGroupSpacing;
+                else
+                    e.CurrentPosition.Y += m_BeginGroupSpacing;
+            }
+        }
+
+
+        private eContentAlignment GetContentAlignment()
+        {
+            if (m_HorizontalItemAlignment == eHorizontalItemsAlignment.Left /*|| m_LayoutOrientation == eOrientation.Vertical*/)
+                return eContentAlignment.Left;
+            else if (m_HorizontalItemAlignment == eHorizontalItemsAlignment.Center)
+                return eContentAlignment.Center;
+            else
+                return eContentAlignment.Right;
+        }
+
+        private eContentVerticalAlignment GetVerticalContentAlignment()
+        {
+            if (m_VerticalItemAlignment == eVerticalItemsAlignment.Top)
+                return eContentVerticalAlignment.Top;
+            else if (m_VerticalItemAlignment == eVerticalItemsAlignment.Middle)
+                return eContentVerticalAlignment.Middle;
+            else if (m_VerticalItemAlignment == eVerticalItemsAlignment.Bottom)
+                return eContentVerticalAlignment.Bottom;
+
+            return eContentVerticalAlignment.Top;
+        }
+
+        private BlockLayoutManager GetBlockLayoutManager()
+        {
+            return new ItemBlockLayoutManager();
+        }
+
+        private bool _EqualItemSize = false;
+
+        /// <summary>
+        /// Gets or sets whether all items are equally sized based on the size of the largest item in the list.
+        /// </summary>
+        [DefaultValue(false), Category("Layout"), Description("Indicates whether all items are equally sized based on the size of the largest item in the list.")]
+        public virtual bool EqualItemSize
+        {
+            get { return _EqualItemSize; }
+            set { _EqualItemSize = value;
+                NeedRecalcSize = true;
+            }
+        }
+
+
+        private ItemDisplay m_ItemDisplay = null;
+        internal ItemDisplay GetItemDisplay()
+        {
+            if (m_ItemDisplay == null)
+                m_ItemDisplay = new ItemDisplay();
+            return m_ItemDisplay;
+        }
+
+        private ElementStyle _TitleStyle = null;
+        /// <summary>
+        /// Specifies the title background style.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Category("Style"), Description("Gets or sets title style."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ElementStyle TitleStyle
+        {
+            get { return _TitleStyle; }
+        }
+        private void TitleStyleChanged(object sender, EventArgs e)
+        {
+            this.OnAppearanceChanged();
+        }
+
+        private ElementStyle _TitleMouseOverStyle = null;
+        /// <summary>
+        /// Specifies the title mouse over background style.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Category("Style"), Description("Gets or sets title mouse over style."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ElementStyle TitleMouseOverStyle
+        {
+            get { return _TitleMouseOverStyle; }
+        }
+        private void TitleMouseOverStyleChanged(object sender, EventArgs e)
+        {
+            this.OnAppearanceChanged();
+        }
+
+        private bool IsTitleVisible
+        {
+            get
+            {
+                return _TitleVisible && !string.IsNullOrEmpty(_TitleText);
+            }
+        }
+
+        private bool _TitleVisible = true;
+        /// <summary>
+        /// Indicates whether TitleText is visible if set. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance"), Description("Indicates whether TitleText is visible if set.")]
+        public bool TitleVisible
+        {
+            get { return _TitleVisible; }
+            set
+            {
+                if (value != _TitleVisible)
+                {
+                    bool oldValue = _TitleVisible;
+                    _TitleVisible = value;
+                    OnTitleVisibleChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when TitleVisible property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnTitleVisibleChanged(bool oldValue, bool newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("TitleVisible"));
+            NeedRecalcSize = true;
+            OnAppearanceChanged();
+        }
+
+        private string _TitleText = "";
+        /// <summary>
+        /// Gets or sets the title text for the container.
+        /// </summary>
+        [DefaultValue(""), Category("Appearance"), Description("Indicates title text for the container.")]
+        public string TitleText
+        {
+            get { return _TitleText; }
+            set
+            {
+                if (value == null) value = "";
+                if (value != _TitleText)
+                {
+                    string oldValue = _TitleText;
+                    _TitleText = value;
+                    OnTitleTextChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when TitleText property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnTitleTextChanged(string oldValue, string newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("TitleText"));
+            NeedRecalcSize = true;
+            OnAppearanceChanged();
+        }
+
+        private eTitlePosition _TitlePosition = eTitlePosition.Top;
+        /// <summary>
+        /// Gets or sets position of title text.
+        /// </summary>
+        [DefaultValue(eTitlePosition.Top), Category("Appearance"), Description("Indicates the position of title text.")]
+        public eTitlePosition TitlePosition
+        {
+            get { return _TitlePosition; }
+            set
+            {
+                if (value != _TitlePosition)
+                {
+                    eTitlePosition oldValue = _TitlePosition;
+                    _TitlePosition = value;
+                    OnTitlePositionChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when TitlePosition property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnTitlePositionChanged(eTitlePosition oldValue, eTitlePosition newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("TitlePosition"));
+            NeedRecalcSize = true;
+            OnAppearanceChanged();
+        }
+        #endregion
+
+        #region IDesignTimeProvider Implementation
+        protected virtual InsertPosition GetContainerInsertPosition(Point pScreen, BaseItem dragItem)
+        {
+            return DesignTimeProviderContainer.GetInsertPosition(this, pScreen, dragItem);
+        }
+        InsertPosition IDesignTimeProvider.GetInsertPosition(Point pScreen, BaseItem dragItem)
+        {
+            return GetContainerInsertPosition(pScreen, dragItem);
+        }
+        void IDesignTimeProvider.DrawReversibleMarker(int iPos, bool Before)
+        {
+            DesignTimeProviderContainer.DrawReversibleMarker(this, iPos, Before);
+        }
+        void IDesignTimeProvider.InsertItemAt(BaseItem objItem, int iPos, bool Before)
+        {
+            DesignTimeProviderContainer.InsertItemAt(this, objItem, iPos, Before);
+        }
+
+        #endregion
+
+        #region Property Hiding From Design-time
+        /// <summary>
+        /// Gets or sets the Key Tips access key or keys for the item when on Ribbon Control or Ribbon Bar. Use KeyTips property
+        /// when you want to assign the one or more letters to be used to access an item. For example assigning the FN to KeyTips property
+        /// will require the user to press F then N keys to select an item. Pressing the F letter will show only keytips for the items that start with letter F.
+        /// </summary>
+        [Browsable(false), Category("Appearance"), DefaultValue(""), Description("Indicates the Key Tips access key or keys for the item when on Ribbon Control or Ribbon Bar.")]
+        public override string KeyTips
+        {
+            get { return base.KeyTips; }
+            set { base.KeyTips = value; }
+        }
+
+        /// <summary>
+        /// Indicates whether the item will auto-collapse (fold) when clicked. 
+        /// When item is on popup menu and this property is set to false, menu will not
+        /// close when item is clicked.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), DevCoBrowsable(false), System.ComponentModel.Category("Behavior"), System.ComponentModel.DefaultValue(true), System.ComponentModel.Description("Indicates whether the item will auto-collapse (fold) when clicked.")]
+        public override bool AutoCollapseOnClick
+        {
+            get { return base.AutoCollapseOnClick; }
+            set { base.AutoCollapseOnClick = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether item can be customized by end user.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), System.ComponentModel.DefaultValue(true), System.ComponentModel.Category("Behavior"), System.ComponentModel.Description("Indicates whether item can be customized by user.")]
+        public override bool CanCustomize
+        {
+            get { return base.CanCustomize; }
+            set { base.CanCustomize = value; }
+        }
+
+        /// <summary>
+        /// Returns category for this item. If item cannot be customzied using the
+        /// customize dialog category is empty string.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), DevCoBrowsable(false), System.ComponentModel.DefaultValue(""), System.ComponentModel.Category("Design"), System.ComponentModel.Description("Indicates item category used to group similar items at design-time.")]
+        public override string Category
+        {
+            get { return base.Category; }
+            set { base.Category = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether Click event will be auto repeated when mouse button is kept pressed over the item.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), DevCoBrowsable(false), System.ComponentModel.DefaultValue(false), System.ComponentModel.Category("Behavior"), System.ComponentModel.Description("Gets or sets whether Click event will be auto repeated when mouse button is kept pressed over the item.")]
+        public override bool ClickAutoRepeat
+        {
+            get { return base.ClickAutoRepeat; }
+            set { base.ClickAutoRepeat = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the auto-repeat interval for the click event when mouse button is kept pressed over the item.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), DevCoBrowsable(false), System.ComponentModel.DefaultValue(600), System.ComponentModel.Category("Behavior"), System.ComponentModel.Description("Gets or sets the auto-repeat interval for the click event when mouse button is kept pressed over the item.")]
+        public override int ClickRepeatInterval
+        {
+            get { return base.ClickRepeatInterval; }
+            set { base.ClickRepeatInterval = value; }
+        }
+
+        /// <summary>
+        /// Specifes the mouse cursor displayed when mouse is over the item.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), DevCoBrowsable(false), System.ComponentModel.DefaultValue(null), System.ComponentModel.Category("Appearance"), System.ComponentModel.Description("Specifies the mouse cursor displayed when mouse is over the item.")]
+        public override System.Windows.Forms.Cursor Cursor
+        {
+            get { return base.Cursor; }
+            set { base.Cursor = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets item description. This description is displayed in
+        /// Customize dialog to describe the item function in an application.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), DevCoBrowsable(false), System.ComponentModel.DefaultValue(""), System.ComponentModel.Category("Design"), System.ComponentModel.Description("Indicates description of the item that is displayed during design.")]
+        public override string Description
+        {
+            get { return base.Description; }
+            set { base.Description = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the item is enabled.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), DevCoBrowsable(false), System.ComponentModel.DefaultValue(true), System.ComponentModel.Category("Behavior"), System.ComponentModel.Description("Indicates whether is item enabled.")]
+        public override bool Enabled
+        {
+            get { return base.Enabled; }
+            set { base.Enabled = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether item is global or not.
+        /// This flag is used to propagate property changes to all items with the same name.
+        /// Setting for example Visible property on the item that has GlobalItem set to true will
+        /// set visible property to the same value on all items with the same name.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), DevCoBrowsable(false), System.ComponentModel.DefaultValue(true), System.ComponentModel.Category("Behavior"), System.ComponentModel.Description("Indicates whether certain global properties are propagated to all items with the same name when changed.")]
+        public override bool GlobalItem
+        {
+            get { return base.GlobalItem; }
+            set { base.GlobalItem = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets item alignment inside the container.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), DevCoBrowsable(false), System.ComponentModel.DefaultValue(eItemAlignment.Near), System.ComponentModel.Category("Appearance"), System.ComponentModel.Description("Determines alignment of the item inside the container.")]
+        public override eItemAlignment ItemAlignment
+        {
+            get { return base.ItemAlignment; }
+            set { base.ItemAlignment = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the collection of shortcut keys associated with the item.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), DevCoBrowsable(false), System.ComponentModel.Category("Design"), System.ComponentModel.Description("Indicates list of shortcut keys for this item."), System.ComponentModel.Editor("DevComponents.DotNetBar.Design.ShortcutsDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), System.ComponentModel.TypeConverter("DevComponents.DotNetBar.Design.ShortcutsConverter, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf"), System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Content)]
+        public override ShortcutsCollection Shortcuts
+        {
+            get { return base.Shortcuts; }
+            set { base.Shortcuts = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether item will display sub items.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), DevCoBrowsable(false), System.ComponentModel.DefaultValue(true), System.ComponentModel.Category("Behavior"), System.ComponentModel.Description("Determines whether sub-items are displayed.")]
+        public override bool ShowSubItems
+        {
+            get { return base.ShowSubItems; }
+            set { base.ShowSubItems = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether the item expands automatically to fill out the remaining space inside the container. Applies to Items on stretchable, no-wrap Bars only.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), DevCoBrowsable(false), System.ComponentModel.DefaultValue(false), System.ComponentModel.Category("Appearance"), System.ComponentModel.Description("Indicates whether item will stretch to consume empty space. Items on stretchable, no-wrap Bars only.")]
+        public override bool Stretch
+        {
+            get { return base.Stretch; }
+            set { base.Stretch = value; }
+        }
+
+        /// <summary>
+        /// Specifies whether item is drawn using Themes when running on OS that supports themes like Windows XP.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), DevCoBrowsable(false), System.ComponentModel.DefaultValue(false), System.ComponentModel.Category("Appearance"), System.ComponentModel.Description("Specifies whether item is drawn using Themes when running on OS that supports themes like Windows XP.")]
+        public override bool ThemeAware
+        {
+            get { return base.ThemeAware; }
+            set { base.ThemeAware = value; }
+        }
+
+        /// <summary>
+        /// Gets/Sets informational text (tooltip) for the item.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), DevCoBrowsable(false), System.ComponentModel.DefaultValue(""), System.ComponentModel.Category("Appearance"), System.ComponentModel.Description("Indicates the text that is displayed when mouse hovers over the item."), System.ComponentModel.Localizable(true)]
+        public override string Tooltip
+        {
+            get { return base.Tooltip; }
+            set { base.Tooltip = value; }
+        }
+
+        ///// <summary>
+        ///// Gets the container padding. Padding is the spacing inside of the container.
+        ///// </summary>
+        //[Browsable(true), DevCoBrowsable(true), Category("Appearance"), Description("Gets the container padding"), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        //public Spacing Padding
+        //{
+        //    get
+        //    {
+        //        return m_Padding;
+        //    }
+        //}
+
+        ///// <summary>
+        ///// Gets the container margin. Margin is the spacing outside of the container.
+        ///// </summary>
+        //[Browsable(true), DevCoBrowsable(true), Category("Appearance"), Description("Gets the container margin"), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        //public Spacing Margin
+        //{
+        //    get
+        //    {
+        //        return m_Margin;
+        //    }
+        //}
+
+        /// <summary>
+        /// Selects first visible item contained by the container by sending mouse over message.
+        /// </summary>
+        internal bool SelectFirstItem()
+        {
+            foreach (BaseItem item in this.SubItems)
+            {
+                if (item.Visible && item.Displayed)
+                {
+                    if (item is ItemContainer)
+                    {
+                        if (((ItemContainer)item).SelectFirstItem())
+                        {
+                            SetHotSubItem(null);
+                            HotSubItem = item;
+                            return true;
+                        }
+                    }
+                    else if (CanGetMouseFocus(item))
+                    {
+                        SetHotSubItem(item);
+                        return true;
+                    }
+                }
+            }
+
+            return false;
+        }
+
+        private bool CanGetMouseFocus(BaseItem item)
+        {
+            if (item is LabelItem)
+                return false;
+            return true;
+        }
+
+        /// <summary>
+        /// Sets the new hot-sub item for the container. This method is designed for internal use by the DotNetBar and should not be used.
+        /// </summary>
+        /// <param name="item">Reference to an instance of BaseItem or null.</param>
+        public void SetHotSubItem(BaseItem item)
+        {
+            if (item == m_HotSubItem)
+                return;
+
+            // Select next object
+            if (m_HotSubItem != null)
+            {
+                m_HotSubItem.InternalMouseLeave();
+                if (m_AutoExpand && m_HotSubItem.Expanded)
+                {
+                    m_HotSubItem.Expanded = false;
+                }
+                HotSubItem = null;
+            }
+
+            if (item != null)
+            {
+                HotSubItem = item;
+                m_HotSubItem.InternalMouseEnter();
+                m_HotSubItem.InternalMouseMove(new MouseEventArgs(MouseButtons.None, 0, m_HotSubItem.LeftInternal + 1, m_HotSubItem.TopInternal + 1, 0));
+                IScrollableItemControl isc = this.ContainerControl as IScrollableItemControl;
+                if (isc != null)
+                    isc.KeyboardItemSelected(m_HotSubItem);
+            }
+        }
+
+        ///// <summary>
+        ///// Gets the current expanded sub-item.
+        ///// </summary>
+        ///// <returns></returns>
+        //protected internal override BaseItem ExpandedItem()
+        //{
+        //    BaseItem exp = base.ExpandedItem();
+        //    if (exp != null) return exp;
+
+        //    foreach (BaseItem item in this.SubItems)
+        //    {
+        //        if (item is ItemContainer)
+        //        {
+        //            exp = item.ExpandedItem();
+        //            if (exp != null) return exp;
+        //        }
+        //    }
+
+        //    return null;
+        //}
+
+        public override void InternalKeyDown(System.Windows.Forms.KeyEventArgs objArg)
+        {
+            base.InternalKeyDown(objArg);
+            if (_KeyboardNavigationEnabled)
+                ContainerKeyboardNavigation.ProcessKeyDown(this, objArg);
+        }
+
+        private bool _KeyboardNavigationEnabled = true;
+        /// <summary>
+        /// Indicates whether container responds to keyboard presses and changes the active/mouse over item.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether container responds to keyboard presses and changes the active/mouse over item.")]
+        public bool KeyboardNavigationEnabled
+        {
+            get { return _KeyboardNavigationEnabled; }
+            set
+            {
+                _KeyboardNavigationEnabled = value;
+            }
+        }
+
+        #endregion
+
+        #region IBlockExtended Members
+
+        bool IBlockExtended.IsBlockElement
+        {
+            get { return false; }
+        }
+
+        bool IBlockExtended.IsNewLineAfterElement
+        {
+            get { return false; }
+        }
+
+        bool IBlockExtended.CanStartNewLine
+        {
+            get { return true; }
+        }
+        [Browsable(false)]
+        public bool IsBlockContainer
+        {
+            get { return true; }
+        }
+        #endregion
+
+        #region IBlock Members
+
+        Rectangle IBlock.Bounds
+        {
+            get
+            {
+                return this.Bounds;
+            }
+            set
+            {
+                this.Bounds = value;
+            }
+        }
+
+        bool IBlock.Visible
+        {
+            get
+            {
+                return this.Visible;
+            }
+            set
+            {
+                this.Visible = value;
+            }
+        }
+
+        #endregion
+
+    }
+
+    /// <summary>
+    /// Indicates container title location.
+    /// </summary>
+    public enum eTitlePosition
+    {
+        Top,
+        Bottom
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Ribbon/ItemContainerPainter.cs b/PROMS/DotNetBar Source Code/Ribbon/ItemContainerPainter.cs
new file mode 100644
index 00000000..ccc5a377
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Ribbon/ItemContainerPainter.cs	
@@ -0,0 +1,12 @@
+using System;
+using System.Text;
+
+namespace DevComponents.DotNetBar
+{
+    internal abstract class ItemContainerPainter
+    {
+        public abstract void PaintBackground(ItemContainerRendererEventArgs e);
+
+        public abstract void PaintItemSeparator(ItemContainerSeparatorRendererEventArgs e);
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Ribbon/ItemContainerRendererEventArgs.cs b/PROMS/DotNetBar Source Code/Ribbon/ItemContainerRendererEventArgs.cs
new file mode 100644
index 00000000..ddaa5ba6
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Ribbon/ItemContainerRendererEventArgs.cs	
@@ -0,0 +1,53 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Provides data for rendering ItemContainer.
+    /// </summary>
+    public class ItemContainerRendererEventArgs:EventArgs
+    {
+        /// <summary>
+        /// Gets or sets Graphics object group is rendered on.
+        /// </summary>
+        public Graphics Graphics = null;
+        /// <summary>
+        /// Gets the reference to ItemContainer instance being rendered.
+        /// </summary>
+        public ItemContainer ItemContainer = null;
+
+        internal ItemPaintArgs ItemPaintArgs = null;
+
+        /// <summary>
+        /// Creates new instance of the object.
+        /// </summary>
+        /// <param name="g">Reference to graphics object.</param>
+        /// <param name="container">Reference to ItemContainer object.</param>
+        public ItemContainerRendererEventArgs(Graphics g, ItemContainer container)
+        {
+            this.Graphics = g;
+            this.ItemContainer = container;
+        }
+    }
+
+    /// <summary>
+    /// Provides data for the item separator rendering inside of the ItemContainer.
+    /// </summary>
+    public class ItemContainerSeparatorRendererEventArgs : ItemContainerRendererEventArgs
+    {
+        /// <summary>
+        /// Gets or sets the reference to the item separator is being rendered for.
+        /// </summary>
+        public BaseItem Item = null;
+
+        /// <summary>
+        /// Creates new instance of the object.
+        /// </summary>
+        public ItemContainerSeparatorRendererEventArgs(Graphics g, ItemContainer container, BaseItem item): base(g, container)
+        {
+            this.Item = item;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Ribbon/ItemControl.cs b/PROMS/DotNetBar Source Code/Ribbon/ItemControl.cs
new file mode 100644
index 00000000..ac50b217
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Ribbon/ItemControl.cs	
@@ -0,0 +1,3788 @@
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.Drawing;
+using System.Runtime.InteropServices;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.Rendering;
+using System.Drawing.Drawing2D;
+using System.Drawing.Text;
+using System.Collections.Generic;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Represents base control for bars.
+	/// </summary>
+    [ToolboxItem(false), ComVisible(false), DefaultEvent("ItemClick")]
+	public abstract class ItemControl: ContainerControl,
+		IOwner, IOwnerMenuSupport, IMessageHandlerClient, IOwnerItemEvents,
+        IThemeCache, IOwnerLocalize, IBarDesignerServices,
+        IKeyTipsRenderer, IRenderingSupport, IAccessibilitySupport, IRibbonCustomize, IBarImageSize, IKeyTipsControl
+	{
+		// Events
+		#region Event Definition
+        /// <summary>
+        /// Occurs when Checked property of an button has changed.
+        /// </summary>
+        public event EventHandler ButtonCheckedChanged;
+
+		/// <summary>
+		/// Represents the method that will handle the ItemRemoved event.
+		/// </summary>
+		public delegate void ItemRemovedEventHandler(object sender, ItemRemovedEventArgs e);
+
+		/// <summary>
+		/// Occurs when Item is clicked.
+		/// </summary>
+		[Description("Occurs when Item is clicked.")]
+		public event EventHandler ItemClick;
+
+        /// <summary>
+        /// Occurs when Item is clicked.
+        /// </summary>
+        [Description("Occurs when Item is double-clicked.")]
+        public event MouseEventHandler ItemDoubleClick;
+
+		/// <summary>
+		/// Occurs when popup of type container is loading.
+		/// </summary>
+		[Description("Occurs when popup of type container is loading.")]
+		public event EventHandler PopupContainerLoad;
+
+		/// <summary>
+		/// Occurs when popup of type container is unloading.
+		/// </summary>
+		[Description("Occurs when popup of type container is unloading.")]
+		public event EventHandler PopupContainerUnload;
+
+		/// <summary>
+		/// Occurs when popup item is about to open.
+		/// </summary>
+		[Description("Occurs when popup item is about to open.")]
+		public event EventHandler PopupOpen;
+
+		/// <summary>
+		/// Occurs when popup item is closing.
+		/// </summary>
+		[Description("Occurs when popup item is closing.")]
+		public event EventHandler PopupClose;
+
+		/// <summary>
+		/// Occurs just before popup window is shown.
+		/// </summary>
+		[Description("Occurs just before popup window is shown.")]
+		public event EventHandler PopupShowing;
+
+		/// <summary>
+		/// Occurs when Item Expanded property has changed.
+		/// </summary>
+		[Description("Occurs when Item Expanded property has changed.")]
+		public event EventHandler ExpandedChange;
+
+		private MouseEventHandler EventMouseDown;
+		/// <summary>
+		/// Occurs when mouse button is pressed.
+		/// </summary>
+		[Description("Occurs when mouse button is pressed.")]
+		new public event MouseEventHandler MouseDown 
+		{
+			add { EventMouseDown += value; }
+			remove { EventMouseDown -= value; }
+		}
+
+		private MouseEventHandler EventMouseUp;
+		/// <summary>
+		/// Occurs when mouse button is released.
+		/// </summary>
+		[Description("Occurs when mouse button is released.")]
+		new public event MouseEventHandler MouseUp
+		{
+			add { EventMouseUp += value; }
+			remove { EventMouseUp -= value; }
+		}
+
+		private EventHandler EventMouseEnter;
+		/// <summary>
+		/// Occurs when mouse enters the item.
+		/// </summary>
+		[Description("Occurs when mouse enters the item.")]
+		new public event EventHandler MouseEnter
+		{
+			add { EventMouseEnter += value; }
+			remove { EventMouseEnter -= value; }
+		}
+		
+		private EventHandler EventMouseLeave;
+		/// <summary>
+		/// Occurs when mouse leaves the item.
+		/// </summary>
+		[Description("Occurs when mouse leaves the item.")]
+		new public event EventHandler MouseLeave
+		{
+			add { EventMouseLeave += value; }
+			remove { EventMouseLeave -= value; }
+		}
+
+		private MouseEventHandler EventMouseMove;
+		/// <summary>
+		/// Occurs when mouse moves over the item.
+		/// </summary>
+		[Description("Occurs when mouse moves over the item.")]
+		new public event MouseEventHandler MouseMove
+		{
+			add { EventMouseMove += value; }
+			remove { EventMouseMove -= value; }
+		}
+		
+		private EventHandler EventMouseHover;
+		/// <summary>
+		/// Occurs when mouse remains still inside an item for an amount of time.
+		/// </summary>
+		[Description("Occurs when mouse remains still inside an item for an amount of time.")]
+		new public event EventHandler MouseHover
+		{
+			add { EventMouseHover += value; }
+			remove { EventMouseHover -= value; }
+		}
+		
+		private EventHandler EventLostFocus;
+		/// <summary>
+		/// Occurs when item loses input focus.
+		/// </summary>
+		[Description("Occurs when item loses input focus.")]
+		new public event EventHandler LostFocus
+		{
+			add { EventLostFocus += value; }
+			remove { EventLostFocus -= value; }
+		}
+		
+		private EventHandler EventGotFocus;
+		/// <summary>
+		/// Occurs when item receives input focus.
+		/// </summary>
+		[Description("Occurs when item receives input focus.")]
+		new public event EventHandler GotFocus
+		{
+			add { EventGotFocus += value; }
+			remove { EventGotFocus -= value; }
+		}
+		
+		/// <summary>
+		/// Occurs when user changes the item position, removes the item, adds new item or creates new bar.
+		/// </summary>
+		[Description("Occurs when user changes the item position.")]
+		public event EventHandler UserCustomize;
+
+		/// <summary>
+		/// Occurs after an Item is removed from SubItemsCollection.
+		/// </summary>
+		[Description("Occurs after an Item is removed from SubItemsCollection.")]
+		public event ItemRemovedEventHandler ItemRemoved;
+
+		/// <summary>
+		/// Occurs after an Item has been added to the SubItemsCollection.
+		/// </summary>
+		[Description("Occurs after an Item has been added to the SubItemsCollection.")]
+		public event EventHandler ItemAdded;
+
+		/// <summary>
+		/// Occurs when ControlContainerControl is created and contained control is needed.
+		/// </summary>
+		[Description("Occurs when ControlContainerControl is created and contained control is needed.")]
+		public event EventHandler ContainerLoadControl;
+
+		/// <summary>
+		/// Occurs when Text property of an Item has changed.
+		/// </summary>
+		[Description("Occurs when Text property of an Item has changed.")]
+		public event EventHandler ItemTextChanged;
+
+		/// <summary>
+		/// Use this event if you want to serialize the hosted control state directly into the DotNetBar definition file.
+		/// </summary>
+		public event ControlContainerItem.ControlContainerSerializationEventHandler ContainerControlSerialize;
+		/// <summary>
+		/// Use this event if you want to deserialize the hosted control state directly from the DotNetBar definition file.
+		/// </summary>
+		public event ControlContainerItem.ControlContainerSerializationEventHandler ContainerControlDeserialize;
+
+		/// <summary>
+		/// Occurs after DotNetBar definition is loaded.
+		/// </summary>
+		[Description("Occurs after DotNetBar definition is loaded.")]
+		public event EventHandler DefinitionLoaded;
+
+		/// <summary>
+		/// Occurs when DotNetBar is looking for translated text for one of the internal text that are
+		/// displayed on menus, toolbars and customize forms. You need to set Handled=true if you want
+		/// your custom text to be used instead of the built-in system value.
+		/// </summary>
+		public event DotNetBarManager.LocalizeStringEventHandler LocalizeString;
+
+		/// <summary>
+		/// Occurs before an item in option group is checked and provides opportunity to cancel that.
+		/// </summary>
+		public event OptionGroupChangingEventHandler OptionGroupChanging;
+
+		/// <summary>
+		/// Occurs before tooltip for an item is shown. Sender could be the BaseItem or derived class for which tooltip is being displayed or it could be a ToolTip object itself it tooltip is not displayed for any item in particular.
+		/// </summary>
+		public event EventHandler ToolTipShowing;
+		#endregion
+
+		#region Private Variables
+		private BaseItem m_BaseItemContainer=null;
+		private BaseItem m_ExpandedItem=null;
+		private BaseItem m_FocusItem=null;
+		private Hashtable m_ShortcutTable=new Hashtable();
+		private ImageList m_ImageList;
+		private ImageList m_ImageListMedium=null;
+		private ImageList m_ImageListLarge=null;
+		private BaseItem m_DragItem=null;
+		private bool m_DragDropSupport=false;
+		private bool m_DragLeft=false;
+		private bool m_AllowExternalDrop=false;
+		private bool m_UseNativeDragDrop=false;
+		private bool m_DragInProgress=false;
+		private bool m_ExternalDragInProgress=false;
+		private Cursor m_MoveCursor /*, m_CopyCursor*/, m_NACursor;
+		private bool m_ShowToolTips=true;
+		private bool m_ShowShortcutKeysInToolTips=false;
+		private bool m_FilterInstalled=false;
+		private bool m_DispatchShortcuts=false;
+		private bool m_MenuEventSupport=false;
+		private IDesignTimeProvider m_DesignTimeProvider=null;
+		private int m_InsertPosition;
+		private bool m_InsertBefore=false;
+		private Timer m_ClickTimer=null;
+		private BaseItem m_ClickRepeatItem=null;
+		// Theme Caching Support
+		private ThemeWindow m_ThemeWindow=null;
+		private ThemeRebar m_ThemeRebar=null;
+		private ThemeToolbar m_ThemeToolbar=null;
+		private ThemeHeader m_ThemeHeader=null;
+		private ThemeScrollBar m_ThemeScrollBar=null;
+		private ThemeExplorerBar m_ThemeExplorerBar=null;
+		private ThemeProgress m_ThemeProgress=null;
+        private ThemeButton m_ThemeButton = null;
+
+		private ColorScheme m_ColorScheme=null;
+		private bool m_ThemeAware=false;
+		private string m_EmptyContainerDesignTimeHint="Right-click to add more items...";
+		private ElementStyle m_BackgroundStyle=new ElementStyle();
+		private bool m_DesignModeInternal=false;
+		private bool m_AntiAlias=true;
+		private bool m_AutoSize=false;
+		private bool m_DesignerSelection=false;
+		private IBarItemDesigner m_BarDesigner=null;
+        private bool m_ShowKeyTips = false;
+        private Font m_KeyTipsFont = null;
+        private string m_KeyTipsKeysStack = "";
+        private KeyTipsCanvasControl m_KeyTipsCanvas = null;
+        private bool m_MenuFocus = false;
+        private IntPtr m_LastFocusWindow = IntPtr.Zero;
+
+        private Timer m_ActiveWindowTimer = null;
+        private IntPtr m_ForegroundWindow = IntPtr.Zero;
+        private IntPtr m_ActiveWindow = IntPtr.Zero;
+        private bool m_FadeEffect = true;
+        private BaseItem m_DoDefaultActionItem = null;
+        private eBarImageSize m_ImageSize = eBarImageSize.Default;
+        private bool m_ShortcutsEnabled = true;
+        private bool m_UseHook = false;
+		#endregion
+
+		#region Constructor
+		public ItemControl()
+		{
+            // This forces the initialization out of paint loop which speeds up how fast components show up
+            BaseRenderer renderer = Rendering.GlobalManager.Renderer;
+
+			if(!ColorFunctions.ColorsLoaded)
+			{
+				NativeFunctions.RefreshSettings();
+				NativeFunctions.OnDisplayChange();
+				ColorFunctions.LoadColors();
+			}
+
+			this.SetStyle(ControlStyles.UserPaint,true);
+			this.SetStyle(ControlStyles.AllPaintingInWmPaint,true);
+			this.SetStyle(ControlStyles.Opaque,true);
+			this.SetStyle(ControlStyles.ResizeRedraw,true);
+			this.SetStyle(DisplayHelp.DoubleBufferFlag,true);
+            this.SetStyle(ControlStyles.SupportsTransparentBackColor, true);
+
+			m_MoveCursor=null;
+			m_NACursor=null;
+
+			m_ColorScheme=new ColorScheme(eDotNetBarStyle.Office2003);
+
+			m_BackgroundStyle.SetColorScheme(m_ColorScheme);
+			m_BackgroundStyle.StyleChanged+=new EventHandler(this.VisualPropertyChanged);
+
+			this.IsAccessible=true;
+		}
+
+		protected bool GetDesignMode()
+		{
+			if(!m_DesignModeInternal)
+				return this.DesignMode;
+			return m_DesignModeInternal;
+		}
+        [EditorBrowsable(EditorBrowsableState.Never), Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public void SetDesignMode(bool mode)
+		{
+			m_DesignModeInternal=mode;
+			m_BaseItemContainer.SetDesignMode(mode);
+		}
+
+		/// <summary>
+		/// Creates new accessibility instance.
+		/// </summary>
+		/// <returns>Reference to AccessibleObject.</returns>
+		protected override AccessibleObject CreateAccessibilityInstance()
+		{
+			return new ItemControlAccessibleObject(this);
+		}
+
+		/// <summary>
+		/// Notifies the accessibility client applications of the specified AccessibleEvents for the specified child control.
+		/// </summary>
+		/// <param name="accEvent">The AccessibleEvents object to notify the accessibility client applications of. </param>
+		/// <param name="childID">The child Control to notify of the accessible event.</param>
+		internal void InternalAccessibilityNotifyClients(AccessibleEvents accEvent,int childID)
+		{
+			this.AccessibilityNotifyClients(accEvent,childID);
+		}
+		#endregion
+
+		#region IOwner Implementation
+		/// <summary>
+		/// Gets or sets the form SideBar is attached to.
+		/// </summary>
+		Form IOwner.ParentForm
+		{
+			get
+			{
+				return base.FindForm();
+			}
+			set {}
+		}
+
+		/// <summary>
+		/// Returns the collection of items with the specified name.
+		/// </summary>
+		/// <param name="ItemName">Item name to look for.</param>
+		/// <returns></returns>
+		public virtual ArrayList GetItems(string ItemName)
+		{
+			ArrayList list=new ArrayList(15);
+			BarFunctions.GetSubItemsByName(m_BaseItemContainer,ItemName,list);
+			return list;
+		}
+
+		/// <summary>
+		/// Returns the collection of items with the specified name and type.
+		/// </summary>
+		/// <param name="ItemName">Item name to look for.</param>
+		/// <param name="itemType">Item type to look for.</param>
+		/// <returns></returns>
+		public virtual ArrayList GetItems(string ItemName, Type itemType)
+		{
+			ArrayList list=new ArrayList(15);
+			BarFunctions.GetSubItemsByNameAndType(m_BaseItemContainer,ItemName,list,itemType);
+			return list;
+		}
+
+        /// <summary>
+        /// Returns the collection of items with the specified name and type.
+        /// </summary>
+        /// <param name="ItemName">Item name to look for.</param>
+        /// <param name="itemType">Item type to look for.</param>
+        /// <param name="useGlobalName">Indicates whether GlobalName property is used for searching.</param>
+        /// <returns></returns>
+        public virtual ArrayList GetItems(string ItemName, Type itemType, bool useGlobalName)
+        {
+            ArrayList list = new ArrayList(15);
+            BarFunctions.GetSubItemsByNameAndType(m_BaseItemContainer, ItemName, list, itemType, useGlobalName);
+            return list;
+        }
+
+		/// <summary>
+		/// Returns the first item that matches specified name.
+		/// </summary>
+		/// <param name="ItemName">Item name to look for.</param>
+		/// <returns></returns>
+		public virtual BaseItem GetItem(string ItemName)
+		{
+			BaseItem item=BarFunctions.GetSubItemByName(m_BaseItemContainer,ItemName);
+			if(item!=null)
+				return item;
+			return null;
+		}
+
+		// Only one Popup Item can be expanded at a time. This is used
+		// to track the currently expanded popup item and to close the popup item
+		// if another item is expanding.
+		void IOwner.SetExpandedItem(BaseItem objItem)
+		{
+			if(objItem!=null && objItem.Parent is PopupItem)
+				return;
+			if(m_ExpandedItem!=null)
+			{
+				if(m_ExpandedItem.Expanded)
+					m_ExpandedItem.Expanded=false;
+				m_ExpandedItem=null;
+			}
+			m_ExpandedItem=objItem;
+		}
+
+		BaseItem IOwner.GetExpandedItem()
+		{
+			return m_ExpandedItem;
+		}
+
+		// Currently we are using this to communicate "focus" when control is in
+		// design mode. This can be used later if we decide to add focus
+		// handling to our BaseItem class.
+		void IOwner.SetFocusItem(BaseItem objFocusItem)
+		{
+			if(m_FocusItem!=null && m_FocusItem!=objFocusItem)
+			{
+				m_FocusItem.OnLostFocus();
+			}
+			OnSetFocusItem(objFocusItem);
+			m_FocusItem=objFocusItem;
+			if(m_FocusItem!=null)
+				m_FocusItem.OnGotFocus();
+		}
+
+		protected virtual void OnSetFocusItem(BaseItem objFocusItem)
+		{
+		}
+
+		BaseItem IOwner.GetFocusItem()
+		{
+			return m_FocusItem;
+		}
+
+		void IOwner.DesignTimeContextMenu(BaseItem objItem)
+		{
+		}
+
+		bool IOwner.DesignMode
+		{
+			get {return this.GetDesignMode();}
+		}
+
+		void IOwner.RemoveShortcutsFromItem(BaseItem objItem)
+		{
+			ShortcutTableEntry objEntry=null;
+			if(objItem.ShortcutString!="")
+			{
+				foreach(eShortcut key in objItem.Shortcuts)
+				{
+					if(m_ShortcutTable.ContainsKey(key))
+					{
+						objEntry=(ShortcutTableEntry)m_ShortcutTable[key];
+						try
+						{
+							objEntry.Items.Remove(objItem.Id);
+							if(objEntry.Items.Count==0)
+								m_ShortcutTable.Remove(objEntry.Shortcut);
+						}
+						catch(ArgumentException)	{}
+					}
+				}
+			}
+			IOwner owner=this as IOwner;
+			foreach(BaseItem objTmp in objItem.SubItems)
+				owner.RemoveShortcutsFromItem(objTmp);
+		}
+
+		void IOwner.AddShortcutsFromItem(BaseItem objItem)
+		{
+			ShortcutTableEntry objEntry=null;
+			if(objItem.ShortcutString!="")
+			{
+				foreach(eShortcut key in objItem.Shortcuts)
+				{
+					if(m_ShortcutTable.ContainsKey(key))
+						objEntry=(ShortcutTableEntry)m_ShortcutTable[objItem.Shortcuts[0]];
+					else
+					{
+						objEntry=new ShortcutTableEntry(key);
+						m_ShortcutTable.Add(objEntry.Shortcut,objEntry);
+					}
+					try
+					{
+						objEntry.Items.Add(objItem.Id,objItem);
+					}
+					catch(ArgumentException)	{}
+				}
+			}
+			IOwner owner=this as IOwner;
+			foreach(BaseItem objTmp in objItem.SubItems)
+				owner.AddShortcutsFromItem(objTmp);
+		}
+
+		Form IOwner.ActiveMdiChild
+		{
+			get
+			{
+				Form form=base.FindForm();
+				if(form==null)
+					return null;
+				if(form.IsMdiContainer)
+				{
+					return form.ActiveMdiChild;
+				}
+				return null;
+			}
+		}
+
+        private bool m_AlwaysDisplayKeyAccelerators = false;
+        /// <summary>
+        /// Gets or sets whether accelerator letters on buttons are underlined. Default value is false which indicates that system setting is used
+        /// to determine whether accelerator letters are underlined. Setting this property to true
+        /// will always display accelerator letter underlined.
+        /// </summary>
+        [Browsable(true), DefaultValue(false), Category("Run-time Behavior"), Description("Indicates whether accelerator letters for buttons are underlined regardless of current Windows settings.")]
+        public bool AlwaysDisplayKeyAccelerators
+        {
+            get { return m_AlwaysDisplayKeyAccelerators; }
+            set
+            {
+                if (m_AlwaysDisplayKeyAccelerators != value)
+                {
+                    m_AlwaysDisplayKeyAccelerators = value;
+                    this.Invalidate();
+                }
+            }
+        }
+
+		/// <summary>
+		/// Invokes the DotNetBar Customize dialog.
+		/// </summary>
+		void IOwner.Customize()
+		{
+		}
+
+		void IOwner.InvokeResetDefinition(BaseItem item,EventArgs e)
+		{
+		}
+
+		/// <summary>
+		/// Indicates whether Reset buttons is shown that allows end-user to reset the toolbar state.
+		/// </summary>
+		bool IOwner.ShowResetButton
+		{
+			get{return false;}
+			set {}
+		}
+
+		void IOwner.OnApplicationActivate(){}
+		void IOwner.OnApplicationDeactivate()
+		{
+            ClosePopups();
+
+            if (m_BaseItemContainer is GenericItemContainer)
+            {
+                ((GenericItemContainer)m_BaseItemContainer).ContainerLostFocus(true);
+            }
+            else if (m_BaseItemContainer is RibbonStripContainerItem)
+            {
+                ((RibbonStripContainerItem)m_BaseItemContainer).ContainerLostFocus(true);
+            }
+		}
+		void IOwner.OnParentPositionChanging(){}
+
+        /// <summary>
+        /// Occurs before an item drag &amp; drop operation is started and allows cancellation.
+        /// </summary>
+        [Description("Occurs before an item drag & drop operation is started and allows cancellation")]
+        public event CancelEventHandler BeforeItemDrag;
+        /// <summary>
+        /// Raises BeforeItemDrag event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnBeforeItemDrag(BaseItem itemSource, CancelEventArgs e)
+        {
+            CancelEventHandler handler = BeforeItemDrag;
+            if (handler != null)
+                handler(itemSource, e);
+        }
+        /// <summary>
+        /// Starts the drag & drop if enabled and supported by the control.
+        /// </summary>
+        /// <param name="item">Reference to the item that belongs to the control.</param>
+        public void StartItemDrag(BaseItem item)
+		{
+			if(!m_DragDropSupport)
+				return;
+
+            CancelEventArgs cea = new CancelEventArgs();
+            OnBeforeItemDrag(item, cea);
+            if (cea.Cancel) return;
+
+			if(m_DragItem==null)
+			{
+				if(!m_UseNativeDragDrop)
+				{
+                    m_DragItem = item;
+                    Point dragStartPoint = this.PointToClient(Control.MousePosition);
+                    dragStartPoint.X -= m_DragItem.LeftInternal;
+                    dragStartPoint.Y -= m_DragItem.TopInternal;
+                    if (dragStartPoint.IsEmpty)
+                        dragStartPoint.Offset(1, 1);
+                    m_DragItem.DragStartPoint = dragStartPoint;
+
+					this.Capture=true;
+					if(m_MoveCursor!=null)
+						Cursor.Current=m_MoveCursor;
+					else
+						Cursor.Current=Cursors.Hand;
+					DragInProgress=true;
+				}
+				else
+				{
+                    if(this.AllowDrop)
+    					DragInProgress=true;
+                    DragDropEffects dragAction = this.DoDragDrop(item, DragDropEffects.All);
+				}
+			}
+		}
+
+        /// <summary>
+        /// Gets whether drag & drop operation is current being performed by the control.
+        /// </summary>
+        [Browsable(false)]
+		public bool DragInProgress
+		{
+			get{ return m_DragInProgress;}
+            internal set
+                     {
+                         if (m_DragInProgress != value)
+                         {
+                             m_DragInProgress = value;
+                             OnDragInProgressChanged();
+                         }
+                     }
+		}
+
+        /// <summary>
+        /// Called when DragInProgress property value has changed.
+        /// </summary>
+        protected virtual void OnDragInProgressChanged()
+        {
+        }
+
+        /// <summary>
+        /// Gets whether external drag & drop operation is current being performed by the control.
+        /// </summary>
+        [Browsable(false)]
+        public bool ExternalDragInProgress
+        {
+            get { return m_ExternalDragInProgress; }
+            internal set
+            {
+                if (ExternalDragInProgress != value)
+                {
+                    ExternalDragInProgress = value;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets item that is being dragged.
+        /// </summary>
+        [Browsable(false)]
+        public BaseItem DragItem
+		{
+			get {return m_DragItem;}
+            internal set { m_DragItem = value; }
+		}
+
+	    internal IDesignTimeProvider DesignTimeProvider
+	    {
+	        get { return m_DesignTimeProvider; }
+	        set { m_DesignTimeProvider = value; }
+	    }
+
+	    internal int InsertPosition
+	    {
+	        get { return m_InsertPosition; }
+	        set { m_InsertPosition = value; }
+	    }
+
+	    internal bool InsertBefore
+	    {
+            get { return m_InsertBefore; }
+	        set { m_InsertBefore = value; }
+	    }
+
+		void IOwner.InvokeUserCustomize(object sender,EventArgs e)
+		{
+			if(UserCustomize!=null)
+				UserCustomize(sender,e);
+		}
+
+		void IOwner.InvokeEndUserCustomize(object sender,EndUserCustomizeEventArgs e){}
+
+		MdiClient IOwner.GetMdiClient(Form MdiForm)
+		{
+			return BarFunctions.GetMdiClient(MdiForm);
+		}
+
+		/// <summary>
+		/// ImageList for images used on Items. Images specified here will always be used on menu-items and are by default used on all Bars.
+		/// </summary>
+		[Browsable(true),Category("Data"),DefaultValue(null),Description("ImageList for images used on Items. Images specified here will always be used on menu-items and are by default used on all Bars.")]
+		public virtual ImageList Images
+		{
+			get
+			{
+				return m_ImageList;
+			}
+			set
+			{
+				if(m_ImageList!=null)
+					m_ImageList.Disposed-=new EventHandler(this.ImageListDisposed);
+				m_ImageList=value;
+				if(m_ImageList!=null)
+					m_ImageList.Disposed+=new EventHandler(this.ImageListDisposed);
+			}
+		}
+
+		/// <summary>
+		/// ImageList for medium-sized images used on Items.
+		/// </summary>
+		[Browsable(true),Category("Data"),DefaultValue(null),Description("ImageList for medium-sized images used on Items.")]
+		public virtual ImageList ImagesMedium
+		{
+			get
+			{
+				return m_ImageListMedium;
+			}
+			set
+			{
+				if(m_ImageListMedium!=null)
+					m_ImageListMedium.Disposed-=new EventHandler(this.ImageListDisposed);
+				m_ImageListMedium=value;
+				if(m_ImageListMedium!=null)
+					m_ImageListMedium.Disposed+=new EventHandler(this.ImageListDisposed);
+			}
+		}
+
+		/// <summary>
+		/// ImageList for large-sized images used on Items.
+		/// </summary>
+		[Browsable(true),Category("Data"),DefaultValue(null),Description("ImageList for large-sized images used on Items.")]
+		public virtual ImageList ImagesLarge
+		{
+			get
+			{
+				return m_ImageListLarge;
+			}
+			set
+			{
+				if(m_ImageListLarge!=null)
+					m_ImageListLarge.Disposed-=new EventHandler(this.ImageListDisposed);
+				m_ImageListLarge=value;
+				if(m_ImageListLarge!=null)
+					m_ImageListLarge.Disposed+=new EventHandler(this.ImageListDisposed);
+			}
+		}
+
+		private void ImageListDisposed(object sender, EventArgs e)
+		{
+			if(sender==m_ImageList)
+			{
+				m_ImageList=null;
+			}
+			else if(sender==m_ImageListLarge)
+			{
+				m_ImageListLarge=null;
+			}
+			else if(sender==m_ImageListMedium)
+			{
+				m_ImageListMedium=null;
+			}
+		}
+
+		protected override void OnParentChanged(EventArgs e)
+		{
+			base.OnParentChanged(e);
+			if(this.Parent!=null && (this.Images!=null || this.ImagesLarge!=null || this.ImagesMedium!=null))
+			{
+				foreach(BaseItem panel in m_BaseItemContainer.SubItems)
+				{
+					foreach(BaseItem item in panel.SubItems)
+					{
+						if(item is ImageItem)
+							((ImageItem)item).OnImageChanged();
+					}
+				}
+			}
+
+			if(this.DesignMode)
+				m_BaseItemContainer.SetDesignMode(this.DesignMode);
+		}
+
+		void IOwner.InvokeDefinitionLoaded(object sender,EventArgs e)
+		{
+			if(DefinitionLoaded!=null)
+				DefinitionLoaded(sender,e);
+		}
+
+		/// <summary>
+		/// Indicates whether Tooltips are shown on Bars and menus.
+		/// </summary>
+		[Browsable(true),DefaultValue(true),Category("Run-time Behavior"),Description("Indicates whether Tooltips are shown on Bars and menus.")]
+		public bool ShowToolTips
+		{
+			get
+			{
+				return m_ShowToolTips;
+			}
+			set
+			{
+				m_ShowToolTips=value;
+			}
+		}
+
+		/// <summary>
+		/// Indicates whether item shortcut is displayed in Tooltips.
+		/// </summary>
+		[Browsable(true),DefaultValue(false),Category("Run-time Behavior"),Description("Indicates whether item shortcut is displayed in Tooltips.")]
+		public virtual bool ShowShortcutKeysInToolTips
+		{
+			get
+			{
+				return m_ShowShortcutKeysInToolTips;
+			}
+			set
+			{
+				m_ShowShortcutKeysInToolTips=value;
+			}
+		}
+
+
+		#endregion
+
+		#region IOwnerMenuSupport Implementation
+        private Hook m_Hook = null;
+		// IOwnerMenuSupport
+		private ArrayList m_RegisteredPopups=new ArrayList();
+		bool IOwnerMenuSupport.PersonalizedAllVisible {get{return false;}set{}}
+		bool IOwnerMenuSupport.ShowFullMenusOnHover {get{return true;}set{}}
+		bool IOwnerMenuSupport.AlwaysShowFullMenus {get{return false;}set{}}
+        internal void InstallMessageFilter()
+        {
+            if (!m_FilterInstalled)
+            {
+                MessageHandler.RegisterMessageClient(this);
+                m_FilterInstalled = true;
+            }
+        }
+
+        /// <summary>
+		/// Gets or sets whether hooks are used for internal DotNetBar system functionality. Using hooks is recommended only if DotNetBar is used in hybrid environments like Visual Studio designers or IE.
+		/// </summary>
+        [System.ComponentModel.Browsable(false), DefaultValue(false), System.ComponentModel.Category("Behavior"), System.ComponentModel.Description("Gets or sets whether hooks are used for internal DotNetBar system functionality. Using hooks is recommended only if DotNetBar is used in hybrid environments like Visual Studio designers or IE.")]
+        public bool UseHook
+        {
+            get
+            {
+                return m_UseHook;
+            }
+            set
+            {
+                m_UseHook = value;
+            }
+        }
+
+		void IOwnerMenuSupport.RegisterPopup(PopupItem objPopup)
+		{
+			if(m_RegisteredPopups.Contains(objPopup))
+				return;
+
+            if (!this.GetDesignMode() && !m_UseHook)
+            {
+                InstallMessageFilter();
+
+                if (!m_MenuEventSupport)
+                    MenuEventSupportHook();
+            }
+            else
+            {
+                if (m_Hook == null)
+                {
+                    m_Hook = new Hook(this);
+                }
+            }
+		    if (m_RegisteredPopups.Count == 0)
+                PopupManager.RegisterPopup((IOwnerMenuSupport)this);
+			m_RegisteredPopups.Add(objPopup);
+			if(objPopup.GetOwner()!=this)
+				objPopup.SetOwner(this);
+		}
+		void IOwnerMenuSupport.UnregisterPopup(PopupItem objPopup)
+		{
+			if(m_RegisteredPopups.Contains(objPopup))
+				m_RegisteredPopups.Remove(objPopup);
+            if (m_RegisteredPopups.Count == 0)
+            {
+                MenuEventSupportUnhook();
+                if (m_Hook != null)
+                {
+                    m_Hook.Dispose();
+                    m_Hook = null;
+                }
+                PopupManager.UnregisterPopup((IOwnerMenuSupport)this);
+            }
+		}
+		bool IOwnerMenuSupport.RelayMouseHover()
+		{
+			foreach(PopupItem popup in m_RegisteredPopups)
+			{
+				Control ctrl=popup.PopupControl;
+				if(ctrl!=null && ctrl.DisplayRectangle.Contains(MousePosition))
+				{
+					if(ctrl is MenuPanel)
+						((MenuPanel)ctrl).InternalMouseHover();
+					else if(ctrl is Bar)
+						((Bar)ctrl).InternalMouseHover();
+					return true;
+				}
+			}
+			return false;
+		}
+
+		// Events
+		void IOwnerMenuSupport.InvokePopupClose(PopupItem item,EventArgs e)
+		{
+			if(PopupClose!=null)
+				PopupClose(item,e);
+		}
+		void IOwnerMenuSupport.InvokePopupContainerLoad(PopupItem item,EventArgs e)
+		{
+			if(PopupContainerLoad!=null)
+				PopupContainerLoad(item,e);
+		}
+		void IOwnerMenuSupport.InvokePopupContainerUnload(PopupItem item,EventArgs e)
+		{
+			if(PopupContainerUnload!=null)
+				PopupContainerUnload(item,e);
+		}
+		void IOwnerMenuSupport.InvokePopupOpen(PopupItem item,PopupOpenEventArgs e)
+		{
+			if(PopupOpen!=null)
+				PopupOpen(item,e);
+		}
+		void IOwnerMenuSupport.InvokePopupShowing(PopupItem item,EventArgs e)
+		{
+			if(PopupShowing!=null)
+				PopupShowing(item,e);
+		}
+		bool IOwnerMenuSupport.ShowPopupShadow {get{return true;}}
+		eMenuDropShadow IOwnerMenuSupport.MenuDropShadow{get{return eMenuDropShadow.Hide;}set{}}
+		ePopupAnimation IOwnerMenuSupport.PopupAnimation{get {return ePopupAnimation.SystemDefault;}set{}}
+		bool IOwnerMenuSupport.AlphaBlendShadow{get {return true;}set{}}
+        void IOwnerMenuSupport.ClosePopups()
+        {
+            ClosePopups();
+        }
+
+        internal void ClosePopups()
+        {
+            ArrayList popupList = new ArrayList(m_RegisteredPopups);
+            foreach (PopupItem objPopup in popupList)
+                objPopup.ClosePopup();
+        }
+
+        internal void ClosePopup(string popupName)
+        {
+            ArrayList popupList = new ArrayList(m_RegisteredPopups);
+            foreach (PopupItem objPopup in popupList)
+            {
+                if (objPopup.Name == popupName)
+                    objPopup.ClosePopup();
+            }
+        }
+
+        /// <summary>
+        /// Gets whether control is in menu mode.
+        /// </summary>
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public bool HasMenuFocus
+        {
+            get
+            {
+                return MenuFocus;
+            }
+        }
+
+        internal virtual bool MenuFocus
+        {
+            get
+            {
+                return m_MenuFocus;
+            }
+            set
+            {
+                if (m_MenuFocus != value)
+                {
+                    SetMenuFocus(value);
+                    if (m_MenuFocus)
+                    {
+                        if(m_BaseItemContainer is GenericItemContainer)
+                            ((GenericItemContainer)m_BaseItemContainer).SetSystemFocus();
+                        else if (m_BaseItemContainer is RibbonStripContainerItem)
+                            ((RibbonStripContainerItem)m_BaseItemContainer).SetSystemFocus();
+                        SetupActiveWindowTimer();
+                    }
+                    else
+                    {
+                        ReleaseActiveWindowTimer();
+                        if (m_BaseItemContainer is GenericItemContainer)
+                        {
+                            ((GenericItemContainer)m_BaseItemContainer).AutoExpand = false;
+                            ((GenericItemContainer)m_BaseItemContainer).ReleaseSystemFocus();
+                            ((GenericItemContainer)m_BaseItemContainer).ContainerLostFocus(false);
+                        }
+                        else if (m_BaseItemContainer is RibbonStripContainerItem)
+                        {
+                            ((RibbonStripContainerItem)m_BaseItemContainer).AutoExpand = false;
+                            ((RibbonStripContainerItem)m_BaseItemContainer).ReleaseSystemFocus();
+                            ((RibbonStripContainerItem)m_BaseItemContainer).ContainerLostFocus(false);
+                        }
+                    }
+                    this.Refresh();
+                }
+            }
+        }
+
+        internal void SetMenuFocus(bool focus)
+        {
+            m_MenuFocus = focus;
+        }
+
+        /// <summary>
+        /// Releases the focus from the bar and selects the control that had focus before bar was selected. If control that had focus could not be determined focus will stay on the bar.
+        /// This method is used by internal DotNetBar implementation and you should not use it.
+        /// </summary>
+        public void ReleaseFocus()
+        {
+            if (this.Focused && m_LastFocusWindow != IntPtr.Zero)
+            {
+                Control ctrl = Control.FromChildHandle(m_LastFocusWindow);
+                if (ctrl != null)
+                {
+                    ctrl.Select();
+                    if (!ctrl.Focused)
+                        NativeFunctions.SetFocus(m_LastFocusWindow);
+                }
+                else
+                {
+                    NativeFunctions.SetFocus(m_LastFocusWindow);
+                }
+                m_LastFocusWindow = IntPtr.Zero;
+                if(m_BaseItemContainer is GenericItemContainer)
+                    ((GenericItemContainer)m_BaseItemContainer).AutoExpand = false;
+            }
+        }
+
+        /// <summary>
+        /// Returns the reference to the control that last had input focus. This property should be used to
+        /// determine which control had input focus before bar gained the focus. Use it to apply
+        /// the menu command to active control.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public Control LastFocusControl
+        {
+            get
+            {
+                if (this.Focused && m_LastFocusWindow != IntPtr.Zero)
+                {
+                    Control ctrl = Control.FromChildHandle(m_LastFocusWindow);
+                    return ctrl;
+                }
+                return null;
+            }
+        }
+
+        //internal void SetSystemFocus()
+        //{
+        //    if (!this.Focused)
+        //    {
+        //        if (m_BaseItemContainer is GenericItemContainer)
+        //            ((GenericItemContainer)m_BaseItemContainer).SetSystemFocus();
+        //        this.Focus();
+        //    }
+        //}
+		#endregion
+
+		#region IOwnerItemEvents Implementation
+        protected void CopyIOwnerEvents(ItemControl target)
+        {
+            target.ItemClick = this.ItemClick;
+        }
+
+        protected virtual void OnItemAdded(BaseItem item, EventArgs e)
+        {
+            if (ItemAdded != null)
+                ItemAdded(item, e);
+        }
+
+		void IOwnerItemEvents.InvokeItemAdded(BaseItem item,EventArgs e)
+		{
+            OnItemAdded(item, e);
+		}
+
+        protected virtual void OnItemRemoved(BaseItem item, ItemRemovedEventArgs e)
+        {
+            if (ItemRemoved != null)
+            {
+                ItemRemoved(item, e);
+            }
+        }
+		void IOwnerItemEvents.InvokeItemRemoved(BaseItem item, BaseItem parent, int itemIndex)
+		{
+            OnItemRemoved(item, new ItemRemovedEventArgs(parent, itemIndex));
+		}
+		void IOwnerItemEvents.InvokeMouseEnter(BaseItem item,EventArgs e)
+		{
+			if(EventMouseEnter!=null)
+				EventMouseEnter(item,e);
+		}
+		void IOwnerItemEvents.InvokeMouseHover(BaseItem item,EventArgs e)
+		{
+			if(EventMouseHover!=null)
+				EventMouseHover(item,e);
+		}
+		void IOwnerItemEvents.InvokeMouseLeave(BaseItem item,EventArgs e)
+		{
+			if(EventMouseLeave!=null)
+				EventMouseLeave(item,e);
+		}
+        protected virtual void OnItemMouseDown(BaseItem item, MouseEventArgs e)
+        {
+            if (EventMouseDown != null)
+                EventMouseDown(item, e);
+            //if(this.MouseDown!=null)
+            //	this.MouseDown(item,e);
+            if (item.ClickAutoRepeat && e.Button == MouseButtons.Left)
+            {
+                m_ClickRepeatItem = item;
+                if (m_ClickTimer == null)
+                    m_ClickTimer = new Timer();
+                m_ClickTimer.Interval = item.ClickRepeatInterval;
+                m_ClickTimer.Tick += new EventHandler(this.ClickTimerTick);
+                m_ClickTimer.Start();
+            }
+        }
+        void IOwnerItemEvents.InvokeMouseDown(BaseItem item, MouseEventArgs e)
+		{
+            OnItemMouseDown(item, e);
+		}
+        protected virtual void OnItemMouseUp(BaseItem item, MouseEventArgs e)
+        {
+            if (EventMouseUp != null)
+                EventMouseUp(item, e);
+
+            if (m_ClickTimer != null && m_ClickTimer.Enabled)
+            {
+                m_ClickTimer.Stop();
+                m_ClickTimer.Enabled = false;
+            }
+        }
+        void IOwnerItemEvents.InvokeMouseUp(BaseItem item, MouseEventArgs e)
+		{
+            OnItemMouseUp(item, e);
+		}
+		private void ClickTimerTick(object sender, EventArgs e)
+		{
+			if(m_ClickRepeatItem!=null)
+				m_ClickRepeatItem.RaiseClick();
+			else
+				m_ClickTimer.Stop();
+		}
+		void IOwnerItemEvents.InvokeMouseMove(BaseItem item, MouseEventArgs e)
+		{
+			if(EventMouseMove!=null)
+				EventMouseMove(item,e);
+		}
+        void IOwnerItemEvents.InvokeItemDoubleClick(BaseItem objItem, MouseEventArgs e)
+        {
+            OnItemDoubleClick(objItem, e);
+        }
+        /// <summary>
+        /// Invokes ItemDoubleClick event.
+        /// </summary>
+        /// <param name="objItem">Reference to item double-clicked</param>
+        /// <param name="e">Event arguments</param>
+        protected virtual void OnItemDoubleClick(BaseItem objItem, MouseEventArgs e)
+        {
+            MouseEventHandler handler = ItemDoubleClick;
+            if (handler != null)
+                handler(objItem, e);
+        }
+        void IOwnerItemEvents.InvokeItemClick(BaseItem objItem)
+		{
+            OnItemClick(objItem);
+		}
+        /// <summary>
+        /// Invokes the ItemClick event.
+        /// </summary>
+        /// <param name="item">Reference to the item that was clicked.</param>
+        protected virtual void OnItemClick(BaseItem item)
+        {
+            RibbonControl rc = this.GetRibbonControl();
+            if (rc!=null)
+            {
+                rc.OnChildItemClick(item);
+            }
+
+            if (this.ShowKeyTips)
+            {
+                this.ShowKeyTips = false;
+            }
+
+            if (ItemClick != null)
+                ItemClick(item, new EventArgs());
+        }
+		void IOwnerItemEvents.InvokeGotFocus(BaseItem item,EventArgs e)
+		{
+			if(EventGotFocus!=null)
+				EventGotFocus(item,e);
+		}
+		void IOwnerItemEvents.InvokeLostFocus(BaseItem item,EventArgs e)
+		{
+			if(EventLostFocus!=null)
+				EventLostFocus(item,e);
+		}
+		void IOwnerItemEvents.InvokeExpandedChange(BaseItem item,EventArgs e)
+		{
+			if(ExpandedChange!=null)
+				ExpandedChange(item,e);
+		}
+		void IOwnerItemEvents.InvokeItemTextChanged(BaseItem item, EventArgs e)
+		{
+			if(ItemTextChanged!=null)
+				ItemTextChanged(item,e);
+		}
+
+		void IOwnerItemEvents.InvokeContainerControlDeserialize(BaseItem item,ControlContainerSerializationEventArgs e)
+		{
+			if(ContainerControlDeserialize!=null)
+				ContainerControlDeserialize(item,e);
+		}
+		void IOwnerItemEvents.InvokeContainerControlSerialize(BaseItem item,ControlContainerSerializationEventArgs e)
+		{
+			if(ContainerControlSerialize!=null)
+				ContainerControlSerialize(item,e);
+		}
+		void IOwnerItemEvents.InvokeContainerLoadControl(BaseItem item,EventArgs e)
+		{
+			if(ContainerLoadControl!=null)
+				ContainerLoadControl(item,e);
+		}
+
+		void IOwnerItemEvents.InvokeOptionGroupChanging(BaseItem item, OptionGroupChangingEventArgs e)
+		{
+			if(OptionGroupChanging!=null)
+				OptionGroupChanging(item,e);
+		}
+
+		void IOwnerItemEvents.InvokeToolTipShowing(object item, EventArgs e)
+		{
+			if(ToolTipShowing!=null)
+				ToolTipShowing(item,e);
+		}
+
+        protected virtual void OnButtonCheckedChanged(ButtonItem item, EventArgs e)
+        {
+            if (ButtonCheckedChanged != null)
+                ButtonCheckedChanged(item, e);
+        }
+        void IOwnerItemEvents.InvokeCheckedChanged(ButtonItem item, EventArgs e)
+        {
+            OnButtonCheckedChanged(item, e);
+        }
+		#endregion
+
+		#region IMessageHandlerClient Implementation
+		bool IMessageHandlerClient.IsModal
+		{
+			get
+			{
+				Form form=this.FindForm();
+				if(form!=null)
+					return form.Modal;
+				return false;
+			}
+		}
+
+        bool IMessageHandlerClient.OnMouseWheel(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+            return OnMouseWheel(hWnd, wParam, lParam);
+        }
+
+        protected virtual bool OnMouseWheel(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+            return false;
+        }
+
+		bool IMessageHandlerClient.OnKeyDown(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+		{
+            return OnKeyDown(hWnd, wParam, lParam);
+		}
+
+        /// <summary>
+        /// Returns whether control has any popups registered.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never), Browsable(false)]
+        public bool HasRegisteredPopups
+        {
+            get
+            {
+                return m_RegisteredPopups.Count > 0;
+            }
+        }
+
+        protected virtual bool OnKeyDown(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+            bool designMode = this.GetDesignMode();
+
+            int wParamInt = WinApi.ToInt(wParam);
+            if (m_RegisteredPopups.Count > 0)
+            {
+                if (((BaseItem)m_RegisteredPopups[m_RegisteredPopups.Count - 1]).Parent == null)
+                {
+                    PopupItem objItem = (PopupItem)m_RegisteredPopups[m_RegisteredPopups.Count - 1];
+
+                    Control ctrl = objItem.PopupControl as Control;
+                    Control ctrl2 = FromChildHandle(hWnd);
+
+                    if (ctrl2 != null)
+                    {
+                        while (ctrl2.Parent != null)
+                            ctrl2 = ctrl2.Parent;
+                    }
+
+                    bool bIsOnHandle = false;
+                    if (ctrl2 != null && objItem != null)
+                        bIsOnHandle = objItem.IsAnyOnHandle(ctrl2.Handle);
+
+                    bool bNoEat = ctrl != null && ctrl2 != null && ctrl.Handle == ctrl2.Handle || bIsOnHandle;
+
+                    if (!bIsOnHandle)
+                    {
+                        Keys key = (Keys)NativeFunctions.MapVirtualKey((uint)wParam, 2);
+                        if (key == Keys.None)
+                            key = (Keys)wParamInt;
+                        objItem.InternalKeyDown(new KeyEventArgs(key));
+                    }
+
+                    // Don't eat the message if the pop-up window has focus
+                    if (bNoEat)
+                        return false;
+                    return true && !designMode;
+                }
+            }
+
+            if (this.MenuFocus && !designMode)
+            {
+                bool bPassToMenu = true;
+                Control ctrl2 = Control.FromChildHandle(hWnd);
+                if (ctrl2 != null)
+                {
+                    while (ctrl2.Parent != null)
+                        ctrl2 = ctrl2.Parent;
+                    if ((ctrl2 is MenuPanel || ctrl2 is ItemControl || ctrl2 is PopupContainer || ctrl2 is PopupContainerControl) && ctrl2.Handle != hWnd)
+                        bPassToMenu = false;
+                }
+
+                if (bPassToMenu)
+                {
+                    Keys key = (Keys)NativeFunctions.MapVirtualKey((uint)wParam, 2);
+                    if (key == Keys.None)
+                        key = (Keys)wParamInt;
+                    this.ExKeyDown(new KeyEventArgs(key));
+                    return true && !designMode;
+                }
+            }
+
+            if (!this.IsParentFormActive)
+                return false;
+
+            if (wParamInt >= 0x70 || ModifierKeys != Keys.None || (WinApi.ToInt(lParam) & 0x1000000000) != 0 || wParamInt == 0x2E || wParamInt == 0x2D) // 2E=VK_DELETE, 2D=VK_INSERT
+            {
+                int i = (int)ModifierKeys | wParamInt;
+                return ProcessShortcut((eShortcut)i) && !designMode;
+            }
+            return false;
+        }
+
+		private bool ProcessShortcut(eShortcut key)
+		{
+            if (!m_ShortcutsEnabled || !this.Enabled) return false;
+
+            Form form = this.FindForm();
+            try
+            {
+                if (form == null || ((form != Form.ActiveForm && form.MdiParent == null ||
+                    form.MdiParent != null && form.MdiParent.ActiveMdiChild != form) && !form.IsMdiContainer) ||
+                    (Form.ActiveForm != null && Form.ActiveForm.Modal && Form.ActiveForm != form))
+                    return false;
+            }
+            catch (NullReferenceException) { return false; }
+
+			bool eat=BarFunctions.ProcessItemsShortcuts(key,m_ShortcutTable);
+			return !m_DispatchShortcuts && eat;
+		}
+		protected bool IsParentFormActive
+		{
+			get
+			{
+				// Process only if parent form is active
+				Form form=this.FindForm();
+				if(form==null)
+					return false;
+				if(form.IsMdiChild)
+				{
+					if(form.MdiParent==null)
+						return false;
+					if(form.MdiParent.ActiveMdiChild!=form)
+						return false;
+				}
+				else if(form!=Form.ActiveForm)
+					return false;
+				return true;
+			}
+		}
+
+        private PopupDelayedClose m_DelayClose = null;
+        private PopupDelayedClose GetDelayClose()
+        {
+            if (m_DelayClose == null)
+                m_DelayClose = new PopupDelayedClose();
+            return m_DelayClose;
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void DesignerNewItemAdded()
+        {
+            this.GetDelayClose().EraseDelayClose();
+        }
+        protected virtual bool OnSysMouseDown(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+            if (m_RegisteredPopups.Count == 0 || this.GetDesignMode())
+                return false;
+
+            BaseItem[] popups = new BaseItem[m_RegisteredPopups.Count];
+            m_RegisteredPopups.CopyTo(popups);
+            for (int i = popups.Length - 1; i >= 0; i--)
+            {
+                PopupItem objPopup = popups[i] as PopupItem;
+                bool bChildHandle = objPopup.IsAnyOnHandle(hWnd);
+
+                if (!bChildHandle)
+                {
+                    Control cTmp = FromChildHandle(hWnd);
+                    if (cTmp != null)
+                    {
+                        if (cTmp is MenuPanel)
+                            bChildHandle = true;
+                        else
+                        {
+                            while (cTmp.Parent != null)
+                            {
+                                cTmp = cTmp.Parent;
+                                if (cTmp.GetType().FullName.IndexOf("DropDownHolder") >= 0 || cTmp is MenuPanel || cTmp is PopupContainerControl)
+                                {
+                                    bChildHandle = true;
+                                    break;
+                                }
+                            }
+                            if (!bChildHandle)
+                                bChildHandle = objPopup.IsAnyOnHandle(cTmp.Handle);
+                        }
+                    }
+                    else
+                    {
+                        string s = NativeFunctions.GetClassName(hWnd);
+                        s = s.ToLower();
+                        if (s.IndexOf("combolbox") >= 0)
+                            bChildHandle = true;
+                    }
+                }
+
+                if (!bChildHandle)
+                {
+                    Control popupContainer = objPopup.PopupControl;
+                    if (popupContainer != null && popupContainer.Parent != null)
+                        popupContainer = popupContainer.Parent;
+                    if (popupContainer != null && popupContainer.Bounds.Contains(Control.MousePosition))
+                        bChildHandle = true;
+                }
+
+                if (bChildHandle)
+                    break;
+
+                if (objPopup.Displayed && !this.IsDisposed)
+                {
+                    // Do not close if mouse is inside the popup parent button
+                    Point p = this.PointToClient(MousePosition);
+                    if (objPopup.DisplayRectangle.Contains(p))
+                        break;
+                }
+
+                if (objPopup.PopupControl is IKeyTipsControl)
+                    ((IKeyTipsControl)objPopup.PopupControl).ShowKeyTips = false;
+
+                if (this.GetDesignMode())
+                {
+                    this.GetDelayClose().DelayClose(objPopup);
+                }
+                else
+                {
+                    objPopup.ClosePopup();
+                }
+
+                if (m_RegisteredPopups.Count == 0)
+                    break;
+            }
+            if (m_RegisteredPopups.Count == 0)
+                this.MenuFocus = false;
+            return false;
+        }
+		bool IMessageHandlerClient.OnMouseDown(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+		{
+            return OnSysMouseDown(hWnd, wParam, lParam);
+		}
+		bool IMessageHandlerClient.OnMouseMove(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+		{
+			if(m_RegisteredPopups.Count>0)
+			{
+				foreach(BaseItem item in m_RegisteredPopups)
+				{
+					if(item.Parent==null)
+					{
+						Control ctrl=((PopupItem)item).PopupControl;
+						if(ctrl!=null && ctrl.Handle!=hWnd && !item.IsAnyOnHandle(hWnd) && !(ctrl.Parent!=null && ctrl.Parent.Handle!=hWnd))
+							return true;
+					}
+				}
+			}
+			return false;
+		}
+		bool IMessageHandlerClient.OnSysKeyDown(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+		{
+            return OnSysKeyDown(hWnd, wParam, lParam);
+		}
+
+        protected virtual bool OnSysKeyDown(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+            if (!this.GetDesignMode())
+            {
+                int wParamInt = WinApi.ToInt(wParam);
+                if (wParamInt == 18 && System.Windows.Forms.Control.ModifierKeys == System.Windows.Forms.Keys.Alt)
+                    this.ClosePopups();
+
+                // Check Shortcuts
+                if (ModifierKeys != Keys.None || wParamInt >= (int)eShortcut.F1 && wParamInt <= (int)eShortcut.F12)
+                {
+                    int i = (int)ModifierKeys | wParamInt;
+                    if (ProcessShortcut((eShortcut)i))
+                        return true;
+                }
+            }
+            return false;
+        }
+
+		bool IMessageHandlerClient.OnSysKeyUp(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+		{
+			return OnSysKeyUp(hWnd, wParam, lParam);
+		}
+
+        protected virtual bool OnSysKeyUp(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+            return false;
+        }
+
+		private void MenuEventSupportHook()
+		{
+			if(m_MenuEventSupport)
+				return;
+			m_MenuEventSupport=true;
+			
+			Form parentForm=this.FindForm();
+			if(parentForm==null)
+			{
+				m_MenuEventSupport=false;
+				return;
+			}
+
+            parentForm.Resize += new EventHandler(this.ParentResize);
+            parentForm.Deactivate += new EventHandler(this.ParentDeactivate);
+
+			DotNetBarManager.RegisterParentMsgHandler(this,parentForm);
+		}
+
+		private void MenuEventSupportUnhook()
+		{
+			if(!m_MenuEventSupport)
+				return;
+			m_MenuEventSupport=false;
+
+			Form parentForm=this.FindForm();
+			if(parentForm==null)
+				return;
+            DotNetBarManager.UnRegisterParentMsgHandler(this, parentForm);
+            parentForm.Resize -= new EventHandler(this.ParentResize);
+            parentForm.Deactivate -= new EventHandler(this.ParentDeactivate);
+		}
+		private void ParentResize(object sender, EventArgs e)
+		{
+			Form parentForm=this.FindForm();
+			if(parentForm!=null && parentForm.WindowState==FormWindowState.Minimized)
+				((IOwner)this).OnApplicationDeactivate();
+		}
+		private void ParentDeactivate(object sender, EventArgs e)
+		{
+			Form parentForm=this.FindForm();
+			if(parentForm!=null && parentForm.WindowState==FormWindowState.Minimized)
+				((IOwner)this).OnApplicationDeactivate();
+		}
+		#endregion
+
+		#region IThemeCache Implementation
+        private const uint WM_GESTURENOTIFY = 0x011A;
+		protected override void WndProc(ref Message m)
+		{
+            if (m.Msg == NativeFunctions.WM_SETFOCUS)
+            {
+                IntPtr wnd = m.WParam;
+                Control objCtrl = Control.FromChildHandle(wnd);
+                if (objCtrl != null)
+                {
+                    if (!(objCtrl is DevComponents.DotNetBar.Bar) && !(objCtrl is MenuPanel) && !(objCtrl is Controls.TextBoxX) && !(objCtrl is Controls.ComboBoxEx))
+                    {
+                        Form form = objCtrl.FindForm();
+                        if (form == this.FindForm())
+                            m_LastFocusWindow = m.WParam;
+                        else if (form != null)
+                            m_LastFocusWindow = m.WParam;
+                    }
+                }
+            }
+            else if (m.Msg == NativeFunctions.WM_USER + 107)
+            {
+                if (m_DoDefaultActionItem != null)
+                {
+                    m_DoDefaultActionItem.DoAccesibleDefaultAction();
+                    m_DoDefaultActionItem = null;
+                }
+            }
+            else if (m.Msg == NativeFunctions.WM_THEMECHANGED)
+            {
+                this.RefreshThemes();
+            }
+            else if (m.Msg == WM_GESTURENOTIFY && _EnableGestureNotifyHandler)
+            {
+                Touch.WinApi.GESTURENOTIFYSTRUCT gest = (Touch.WinApi.GESTURENOTIFYSTRUCT)Marshal.PtrToStructure(m.LParam, typeof(Touch.WinApi.GESTURENOTIFYSTRUCT));
+                Point p = this.PointToClient(new Point(gest.ptsLocation.x, gest.ptsLocation.y));
+                m_BaseItemContainer.InternalMouseMove(new MouseEventArgs(System.Windows.Forms.MouseButtons.None, 0, 
+                    p.X, p.Y, 0));
+                m_BaseItemContainer.InternalMouseDown(new MouseEventArgs(System.Windows.Forms.MouseButtons.Left, 
+                    0, p.X, p.Y, 0));
+            }
+			base.WndProc(ref m);
+		}
+
+        private bool _EnableGestureNotifyHandler = false;
+        /// <summary>
+        /// Gets or sets whether internal WM_GESTURENOTIFY handler is enabled. Default value is false.
+        /// </summary>
+        [Browsable(false), DefaultValue(false)]
+        public bool EnableGestureNotifyHandler
+        {
+            get { return _EnableGestureNotifyHandler; }
+            set
+            {
+                _EnableGestureNotifyHandler = value;
+            }
+        }
+        
+		protected void RefreshThemes()
+		{
+			if(m_ThemeWindow!=null)
+			{
+				m_ThemeWindow.Dispose();
+				m_ThemeWindow=new ThemeWindow(this);
+			}
+			if(m_ThemeRebar!=null)
+			{
+				m_ThemeRebar.Dispose();
+				m_ThemeRebar=new ThemeRebar(this);
+			}
+			if(m_ThemeToolbar!=null)
+			{
+				m_ThemeToolbar.Dispose();
+				m_ThemeToolbar=new ThemeToolbar(this);
+			}
+			if(m_ThemeHeader!=null)
+			{
+				m_ThemeHeader.Dispose();
+				m_ThemeHeader=new ThemeHeader(this);
+			}
+			if(m_ThemeScrollBar!=null)
+			{
+				m_ThemeScrollBar.Dispose();
+				m_ThemeScrollBar=new ThemeScrollBar(this);
+			}
+			if(m_ThemeProgress!=null)
+			{
+				m_ThemeProgress.Dispose();
+				m_ThemeProgress=new ThemeProgress(this);
+			}
+			if(m_ThemeExplorerBar!=null)
+			{
+				m_ThemeExplorerBar.Dispose();
+				m_ThemeExplorerBar=new ThemeExplorerBar(this);
+			}
+            if (m_ThemeButton != null)
+            {
+                m_ThemeButton.Dispose();
+                m_ThemeButton = new ThemeButton(this);
+            }
+		}
+		private void DisposeThemes()
+		{
+			if(m_ThemeWindow!=null)
+			{
+				m_ThemeWindow.Dispose();
+				m_ThemeWindow=null;
+			}
+			if(m_ThemeRebar!=null)
+			{
+				m_ThemeRebar.Dispose();
+				m_ThemeRebar=null;
+			}
+			if(m_ThemeToolbar!=null)
+			{
+				m_ThemeToolbar.Dispose();
+				m_ThemeToolbar=null;
+			}
+			if(m_ThemeHeader!=null)
+			{
+				m_ThemeHeader.Dispose();
+				m_ThemeHeader=null;
+			}
+			if(m_ThemeScrollBar!=null)
+			{
+				m_ThemeScrollBar.Dispose();
+				m_ThemeScrollBar=null;
+			}
+            if (m_ThemeButton != null)
+            {
+                m_ThemeButton.Dispose();
+                m_ThemeButton = null;
+            }
+		}
+		protected override void OnHandleCreated(EventArgs e)
+		{
+			base.OnHandleCreated(e);
+
+			if(!m_FilterInstalled && !this.DesignMode)
+			{
+				MessageHandler.RegisterMessageClient(this);
+				m_FilterInstalled=true;
+			}
+            
+			this.RecalcLayout();
+		}
+		protected override void OnHandleDestroyed(EventArgs e)
+		{
+			DisposeThemes();
+			MenuEventSupportUnhook();
+			base.OnHandleDestroyed(e);
+
+			if(m_FilterInstalled)
+			{
+				MessageHandler.UnregisterMessageClient(this);
+				m_FilterInstalled=false;
+			}
+
+            if (m_Hook != null)
+            {
+                m_Hook.Dispose();
+                m_Hook = null;
+            }
+		}
+		ThemeWindow IThemeCache.ThemeWindow
+		{
+			get
+			{
+				if(m_ThemeWindow==null)
+					m_ThemeWindow=new ThemeWindow(this);
+				return m_ThemeWindow;
+			}
+		}
+		ThemeRebar IThemeCache.ThemeRebar
+		{
+			get
+			{
+				if(m_ThemeRebar==null)
+					m_ThemeRebar=new ThemeRebar(this);
+				return m_ThemeRebar;
+			}
+		}
+		ThemeToolbar IThemeCache.ThemeToolbar
+		{
+			get
+			{
+				if(m_ThemeToolbar==null)
+					m_ThemeToolbar=new ThemeToolbar(this);
+				return m_ThemeToolbar;
+			}
+		}
+		ThemeHeader IThemeCache.ThemeHeader
+		{
+			get
+			{
+				if(m_ThemeHeader==null)
+					m_ThemeHeader=new ThemeHeader(this);
+				return m_ThemeHeader;
+			}
+		}
+		ThemeScrollBar IThemeCache.ThemeScrollBar
+		{
+			get
+			{
+				if(m_ThemeScrollBar==null)
+					m_ThemeScrollBar=new ThemeScrollBar(this);
+				return m_ThemeScrollBar;
+			}
+		}
+		ThemeExplorerBar IThemeCache.ThemeExplorerBar
+		{
+			get
+			{
+				if(m_ThemeExplorerBar==null)
+					m_ThemeExplorerBar=new ThemeExplorerBar(this);
+				return m_ThemeExplorerBar;
+			}
+		}
+		ThemeProgress IThemeCache.ThemeProgress
+		{
+			get
+			{
+				if(m_ThemeProgress==null)
+					m_ThemeProgress=new ThemeProgress(this);
+				return m_ThemeProgress;
+			}
+		}
+        ThemeButton IThemeCache.ThemeButton
+        {
+            get
+            {
+                if (m_ThemeButton == null)
+                    m_ThemeButton = new ThemeButton(this);
+                return m_ThemeButton;
+            }
+        }
+		#endregion
+
+		#region Mouse & Keyboard Support
+		protected override void OnClick(EventArgs e)
+		{
+            Point p = this.PointToClient(MousePosition);
+			InternalOnClick(MouseButtons,p);
+			base.OnClick(e);
+		}
+
+		protected virtual void InternalOnClick(MouseButtons mb, Point mousePos)
+		{
+			m_BaseItemContainer.InternalClick(mb, mousePos);
+		}
+
+		protected override void OnDoubleClick(EventArgs e)
+		{
+            MouseButtons buttons = Control.MouseButtons;
+            if (e is MouseEventArgs)
+                buttons = ((MouseEventArgs)e).Button;
+            m_BaseItemContainer.InternalDoubleClick(buttons, MousePosition);
+			base.OnDoubleClick(e);
+		}
+
+		protected override void OnKeyDown(KeyEventArgs e)
+		{
+			ExKeyDown(e);
+			base.OnKeyDown(e);
+		}
+
+		internal virtual void ExKeyDown(KeyEventArgs e)
+		{
+			m_BaseItemContainer.InternalKeyDown(e);
+		}
+
+        //private Cursor _ControlCursor = null;
+        protected override void OnMouseEnter(EventArgs e)
+        {
+            EventHandler h = EventMouseEnter;
+            if (h != null)
+                h(this, e);
+            //_ControlCursor = this.Cursor;
+            base.OnMouseEnter(e);
+        }
+        
+		protected override void OnMouseDown(MouseEventArgs e)
+		{
+			m_BaseItemContainer.InternalMouseDown(e);
+			base.OnMouseDown(e);
+		}
+
+		protected override void OnMouseHover(EventArgs e)
+		{
+			base.OnMouseHover(e);
+			m_BaseItemContainer.InternalMouseHover();
+		}
+
+		protected override void OnMouseLeave(EventArgs e)
+		{
+			// If we had hot sub item pass the mouse leave message to it...
+            //if (this.Cursor != _ControlCursor)
+            //    this.Cursor = _ControlCursor;
+			m_BaseItemContainer.InternalMouseLeave();
+			base.OnMouseLeave(e);
+		}
+
+		protected override void OnMouseUp(MouseEventArgs e)
+		{
+			base.OnMouseUp(e);
+			if(m_DragDropSupport && !m_UseNativeDragDrop)
+				MouseDragDrop(e.X,e.Y,null);
+
+			m_BaseItemContainer.InternalMouseUp(e);
+		}
+
+		protected override void OnMouseMove(MouseEventArgs e)
+		{
+			base.OnMouseMove(e);
+            InternalMouseMove(e);
+		}
+
+        protected virtual void InternalMouseMove(MouseEventArgs e)
+        {
+            if(m_DragDropSupport && m_DragInProgress)
+			{
+				if(!m_UseNativeDragDrop)
+					MouseDragOver(e.X,e.Y,null);
+			}
+			else
+				m_BaseItemContainer.InternalMouseMove(e);
+        }
+
+		protected override void OnDragOver(DragEventArgs e)
+		{
+			if(m_DragDropSupport && (m_DragInProgress || m_ExternalDragInProgress))
+			{
+                e.Effect = DragDropEffects.Move;
+                base.OnDragOver(e);
+                if (e.Effect != DragDropEffects.None)
+                {
+                    Point p = this.PointToClient(new Point(e.X, e.Y));
+                    MouseDragOver(p.X, p.Y, e);
+                }
+				m_DragLeft=false;
+			}
+            else
+			    base.OnDragOver(e);
+		}
+
+		protected override void OnDragLeave(EventArgs e)
+		{
+			if(m_DragDropSupport)
+			{
+                if (m_DragInProgress || m_ExternalDragInProgress)
+                {
+                    if (Control.MouseButtons == MouseButtons.None)
+                        MouseDragDrop(-1, -1, null);
+                    else
+                        MouseDragOver(-1, -1, null);
+                    if(!m_UseNativeDragDrop)
+                        this.Capture = true;
+                }
+				m_DragLeft=true;
+				m_ExternalDragInProgress=false;
+			}
+			base.OnDragLeave(e);
+		}
+
+		protected override void OnDragEnter(DragEventArgs e)
+		{
+			base.OnDragEnter(e);
+			if(m_DragDropSupport)
+			{
+                if (m_DragInProgress && !m_AllowExternalDrop) // Cover drag & drop within the control
+                {
+                    BaseItem item = GetDragDataBaseItem(e);
+                    if (item != null && item.ContainerControl == this)
+                    {
+                        if ((e.AllowedEffect & DragDropEffects.Move) == DragDropEffects.Move)
+                            e.Effect = DragDropEffects.Move;
+                        return;
+                    }
+                }
+
+				if(m_DragInProgress || !m_AllowExternalDrop)
+					return;
+
+				if(e.Data.GetData(typeof(ButtonItem))==null)
+				{
+					if(e.Effect!=DragDropEffects.None)
+						m_ExternalDragInProgress=true;
+					return;
+				}
+				if((e.AllowedEffect & DragDropEffects.Move)==DragDropEffects.Move)
+					e.Effect=DragDropEffects.Move;
+				else if((e.AllowedEffect & DragDropEffects.Copy)==DragDropEffects.Copy)
+					e.Effect=DragDropEffects.Move;
+				else if((e.AllowedEffect & DragDropEffects.Link)==DragDropEffects.Link)
+					e.Effect=DragDropEffects.Move;
+				else
+					return;
+				m_ExternalDragInProgress=true;
+			}
+		}
+
+		protected override void OnDragDrop(DragEventArgs e)
+		{
+			if(m_DragDropSupport)
+			{
+				if(m_DragInProgress)
+				{
+					Point p=this.PointToClient(new Point(e.X,e.Y));
+					MouseDragDrop(p.X,p.Y,e);
+				}
+				else if(m_ExternalDragInProgress)
+				{
+					Point p=this.PointToClient(new Point(e.X,e.Y));
+					MouseDragDrop(p.X,p.Y,e);
+				}
+			}
+			base.OnDragDrop(e);
+		}
+
+		protected override void OnQueryContinueDrag(QueryContinueDragEventArgs e)
+		{
+            base.OnQueryContinueDrag(e);
+            if (m_DragDropSupport)
+            {
+                if (m_DragInProgress)
+                {
+                    if (m_DragLeft && e.Action == DragAction.Drop || e.Action == DragAction.Cancel)
+                        MouseDragDrop(-1, -1, null);
+                }
+            }
+		}
+
+	    private BaseItem GetDragDataBaseItem(DragEventArgs dragArgs)
+	    {
+            if(dragArgs == null) return null;
+
+	        string[] formats = dragArgs.Data.GetFormats();
+	        foreach (string s in formats)
+	        {
+	            BaseItem item = dragArgs.Data.GetData(s) as BaseItem;
+	            if (item != null)
+	                return item;
+	        }
+	        return null;
+	    }
+
+        private List<Type> _DragDropAllowedContainerTypes = new List<Type>();
+        /// <summary>
+        /// Gets the collection of allowed containers for the drag &amp; drop operations. Empty collection indicates that all targets are allowed.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public List<Type> DragDropAllowedContainerTypes
+        {
+            get { return _DragDropAllowedContainerTypes; }
+            internal set { _DragDropAllowedContainerTypes = value; }
+        }
+        private bool IsAllowedTargetContainer(object targetProvider)
+        {
+            if (_DragDropAllowedContainerTypes.Count == 0 || targetProvider == null) return true;
+            Type targetType = targetProvider.GetType();
+            foreach (Type t in _DragDropAllowedContainerTypes)
+            {
+                if (t.Equals(targetType))
+                    return true;
+            }
+            return false;
+        }
+        protected virtual void MouseDragOver(int x, int y, DragEventArgs dragArgs)
+		{
+			if(!m_DragInProgress && !m_ExternalDragInProgress)
+				return;
+			BaseItem dragItem=m_DragItem;
+
+		    if ( /*m_ExternalDragInProgress &&*/ dragArgs != null)
+		        dragItem = GetDragDataBaseItem(dragArgs); //dragArgs.Data.GetData(typeof(ButtonItem)) as BaseItem;
+
+			if(m_DesignTimeProvider!=null)
+			{
+				m_DesignTimeProvider.DrawReversibleMarker(m_InsertPosition,m_InsertBefore);
+				m_DesignTimeProvider=null;
+			}
+
+			if(m_ExternalDragInProgress && dragItem==null)
+				return;
+
+			Point pScreen=this.PointToScreen(new Point(x,y));
+            InsertPosition pos = ((IDesignTimeProvider)m_BaseItemContainer).GetInsertPosition(pScreen, dragItem);
+
+			if(pos!=null)
+			{
+                if (pos.TargetProvider == null || !IsAllowedTargetContainer(pos.TargetProvider))
+                {
+                    // Cursor is over drag item
+                    if (!m_UseNativeDragDrop)
+                    {
+                        if (m_NACursor != null)
+                            Cursor.Current = m_NACursor;
+                        else
+                            Cursor.Current = Cursors.No;
+                    }
+                    else if (dragArgs != null)
+                        dragArgs.Effect = DragDropEffects.None;
+                }
+                else
+                {
+                    pos.TargetProvider.DrawReversibleMarker(pos.Position, pos.Before);
+                    m_InsertPosition = pos.Position;
+                    m_InsertBefore = pos.Before;
+                    m_DesignTimeProvider = pos.TargetProvider;
+                    if (!m_UseNativeDragDrop)
+                    {
+                        if (m_MoveCursor != null)
+                            Cursor.Current = m_MoveCursor;
+                        else
+                            Cursor.Current = Cursors.Hand;
+                    }
+                    else if (dragArgs != null)
+                        dragArgs.Effect = DragDropEffects.Move;
+                }
+			}
+			else
+			{
+				if(!m_UseNativeDragDrop)
+				{
+					if(m_NACursor!=null)
+						Cursor.Current=m_NACursor;
+					else
+						Cursor.Current=Cursors.No;
+				}
+				else if(dragArgs!=null)
+					dragArgs.Effect=DragDropEffects.None;
+            }
+            OnMouseDragOverProcessed(x, y, dragArgs);
+		}
+        protected virtual void OnMouseDragOverProcessed(int x, int y, DragEventArgs dragArgs)
+        {
+        }
+
+        protected override bool ProcessMnemonic(char charCode)
+        {
+            if (this.Visible && ProcessMnemonicEx(charCode))
+                return true;
+            return base.ProcessMnemonic(charCode);
+        }
+
+        public virtual bool ProcessMnemonicEx(char charCode)
+        {
+            if (ProcessMnemonic(m_BaseItemContainer, charCode))
+                return true;
+            return false;
+        }
+
+        protected virtual bool ProcessMnemonic(BaseItem container, char charCode)
+        {
+            BaseItem item = GetItemForMnemonic(container, charCode, true, true);
+
+            return ProcessItemMnemonicKey(item);
+        }
+
+        protected virtual bool ProcessItemMnemonicKey(BaseItem item)
+        {
+            if (item != null && item.Visible && item.GetEnabled())
+            {
+                if (item is QatOverflowItem)
+                    ((QatOverflowItem)item).Expanded = true;
+                else if (item is ButtonItem && (item.ShowSubItems || ((ButtonItem)item).AutoExpandOnClick) && (item.SubItems.Count > 0 && item.VisibleSubItems > 0 || ((ButtonItem)item).PopupType == ePopupType.Container) && !item.Expanded)
+                {
+                    item.Expanded = true;
+                    // If it is a menu select first menu item inside...
+                    PopupItem popup = item as PopupItem;
+                    if (popup.PopupType == ePopupType.Menu && popup.PopupControl is MenuPanel)
+                    {
+                        ((MenuPanel)popup.PopupControl).SelectFirstItem();
+                    }
+                    if (m_BaseItemContainer is GenericItemContainer)
+                        m_BaseItemContainer.AutoExpand = true;
+                }
+                else if (item is ComboBoxItem)
+                {
+                    ((ComboBoxItem)item).ComboBoxEx.Focus();
+                    ((ComboBoxItem)item).ComboBoxEx.DroppedDown = true;
+                }
+                else if (item is TextBoxItem)
+                {
+                    ((TextBoxItem)item).TextBox.Focus();
+                }
+                else if (item is ControlContainerItem && ((ControlContainerItem)item).Control != null)
+                    ((ControlContainerItem)item).Control.Focus();
+                else if (item is GalleryContainer)
+                    ((GalleryContainer)item).PopupGallery();
+                else
+                    item.RaiseClick();
+                return true;
+            }
+
+            return false;
+        }
+
+        protected virtual BaseItem GetItemForMnemonic(BaseItem container, char charCode, bool deepScan, bool stackKeys)
+        {
+            bool partialMatch = false;
+            return GetItemForMnemonic(container, charCode, deepScan, stackKeys, ref partialMatch);
+        }
+
+        private BaseItem GetItemForMnemonic(BaseItem container, char charCode, bool deepScan, bool stackKeys, ref bool partialMatch)
+        {
+            string keyTipsString = m_KeyTipsKeysStack + charCode.ToString();
+            keyTipsString = keyTipsString.ToUpper();
+
+            CaptionItemContainer gc=container as CaptionItemContainer;
+            int count=container.SubItems.Count;
+            if(gc!=null && gc.MoreItems!=null && gc.MoreItems.Visible)
+                count++;
+            BaseItem[] items = new BaseItem[count];
+            container.SubItems.CopyTo(items,0);
+            if (gc != null && gc.MoreItems != null && gc.MoreItems.Visible) items[count - 1] = gc.MoreItems;
+
+            foreach (BaseItem item in items)
+            {
+                if (item.KeyTips != "" || m_KeyTipsKeysStack!="")
+                {
+                    if (item.KeyTips != "")
+                    {
+                        if (item.KeyTips == keyTipsString)
+                        {
+                            if (item.Visible && item.GetEnabled())
+                            {
+                                return item;
+                            }
+                        }
+                        else if (item.KeyTips.StartsWith(keyTipsString))
+                        {
+                            partialMatch = true;
+                        }
+                    }
+                }
+                else if (IsMnemonic(charCode, item.Text))
+                {
+                    if (item.Visible && item.GetEnabled())
+                    {
+                        return item;
+                    }
+                }
+
+                if (deepScan && item.IsContainer)
+                {
+                    BaseItem mItem = GetItemForMnemonic(item, charCode, deepScan, false, ref partialMatch);
+                    if (mItem!=null)
+                        return mItem;
+                }
+            }
+
+            if (partialMatch && stackKeys)
+            {
+                ((IKeyTipsControl)this).KeyTipsKeysStack += charCode.ToString().ToUpper();
+            }
+            
+            return null;
+        }
+
+        
+		#endregion
+
+		#region IOwnerLocalize Implementation
+		void IOwnerLocalize.InvokeLocalizeString(LocalizeEventArgs e)
+		{
+			if(LocalizeString!=null)
+				LocalizeString(this,e);
+		}
+        #endregion
+
+        #region Internal Implementation
+        protected override void ScaleControl(SizeF factor, BoundsSpecified specified)
+        {
+            if (Dpi.RecordScalePerControl)
+                Dpi.SetScaling(factor);
+            BaseItem cont = GetBaseItemContainer();
+            if (cont != null)
+            {
+                cont.NotifyScaleItem(factor);
+                cont.NeedRecalcSize = true;
+            }
+            base.ScaleControl(factor, specified);
+        }
+
+        private bool _ContainerControlProcessDialogKey = true;
+        /// <summary>
+        /// Gets or sets whether ProcessDialogKey method calls base ContainerControl implementation. 
+        /// By default base implementation is called but under certain conditions you might want to set
+        /// this property to true to receive KeyDown events for Arrow keys.
+        /// </summary>
+        [DefaultValue(false), Browsable(false)]
+        public bool ContainerControlProcessDialogKey
+        {
+            get { return _ContainerControlProcessDialogKey; }
+            set
+            {
+                _ContainerControlProcessDialogKey = value;
+            }
+        }
+        
+        protected override bool ProcessDialogKey(Keys keyData)
+        {
+            if (_ContainerControlProcessDialogKey) return base.ProcessDialogKey(keyData);
+            return false;
+        }
+#if FRAMEWORK20
+        protected override void OnBindingContextChanged(EventArgs e)
+        {
+            base.OnBindingContextChanged(e);
+            if (m_BaseItemContainer != null)
+                m_BaseItemContainer.UpdateBindings();
+        }
+#endif
+
+        /// <summary>
+        /// Gets or sets whether shortuct processing for the items hosted by this control is enabled. Default value is true.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool ShortcutsEnabled
+        {
+            get { return m_ShortcutsEnabled; }
+            set { m_ShortcutsEnabled = value; }
+        }
+
+        protected virtual RibbonControl GetRibbonControl()
+        {
+            Control parent = this.Parent;
+            while (parent != null && !(parent is RibbonControl))
+            {
+                if (parent is RibbonPanel && ((RibbonPanel)parent).GetRibbonControl() != null)
+                    return ((RibbonPanel)parent).GetRibbonControl();
+                parent = parent.Parent;
+            }
+
+            return parent as RibbonControl;
+        }
+
+	    /// <summary>
+	    /// Returns the item at specified coordinates or null if no item can be found.
+	    /// </summary>
+	    /// <param name="x">X - coordinate to test.</param>
+	    /// <param name="y">Y - coordinate to test.</param>
+	    /// <returns></returns>
+	    public virtual BaseItem HitTest(Point p)
+	    {
+	        return HitTest(p.X, p.Y);
+	    }
+
+	    /// <summary>
+        /// Returns the item at specified coordinates or null if no item can be found.
+        /// </summary>
+        /// <param name="x">X - coordinate to test.</param>
+        /// <param name="y">Y - coordinate to test.</param>
+        /// <returns></returns>
+        public virtual BaseItem HitTest(int x, int y)
+        {
+            return m_BaseItemContainer.ItemAtLocation(x, y);
+        }
+
+        /// <summary>
+        /// Gets or sets the item default accessibility action will be performed on.
+        /// </summary>
+        BaseItem IAccessibilitySupport.DoDefaultActionItem
+        {
+            get { return m_DoDefaultActionItem; }
+            set { m_DoDefaultActionItem = value; }
+        }
+
+		/// <summary>
+		/// Gets or sets whether control height is set automatically based on the content. Default value is false.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),Category("Layout"),Description("Indicates whether control height is set automatically."),DefaultValue(false)]
+#if FRAMEWORK20
+		public override bool AutoSize
+#else
+        public bool AutoSize
+#endif
+		{
+			get {return m_AutoSize;}
+			set
+			{
+				m_AutoSize=value;
+				OnAutoSizeChanged();
+			}
+		}
+		private void OnAutoSizeChanged()
+		{
+			AutoSyncSize();
+		}
+
+		private int m_SyncingSize=0;
+		/// <summary>
+		/// Sets the height of the control to the automatically calcualted height based on content.
+		/// </summary>
+		public virtual void AutoSyncSize()
+		{
+            if (!m_AutoSize || m_SyncingSize > 2 || m_BaseItemContainer == null)	
+				return;
+
+			if(m_BaseItemContainer.NeedRecalcSize)
+				return;
+
+			m_SyncingSize++;
+			try
+			{
+			    if (_AutoSyncSizeOrientation == eOrientation.Vertical)
+			    {
+			        int newHeight = GetAutoSizeHeight();
+			        if (this.Height != newHeight && m_BaseItemContainer.HeightInternal > 0)
+			        {
+			            this.Height = newHeight;
+			            this.RecalcSize();
+			        }
+			    }
+			    else
+			    {
+                    int newWidth = GetAutoSizeWidth();
+                    if (this.Width != newWidth && m_BaseItemContainer.WidthInternal > 0)
+                    {
+                        this.Width = newWidth;
+                        this.RecalcSize();
+                    }
+			    }
+			}
+			finally
+			{
+				m_SyncingSize--;
+			}
+		}
+
+        private eOrientation _AutoSyncSizeOrientation= eOrientation.Vertical;
+	    internal eOrientation AutoSyncSizeOrientation
+	    {
+	        get { return _AutoSyncSizeOrientation; }
+            set { _AutoSyncSizeOrientation = value; }
+	    }
+
+        protected virtual ElementStyle GetBackgroundStyle()
+        {
+            return m_BackgroundStyle;
+        }
+
+        internal ElementStyle GetPaintBackgroundStyle()
+        {
+            return GetBackgroundStyle();
+        }
+
+		/// <summary>
+		/// Returns automatically calculated height of the control given current content.
+		/// </summary>
+		/// <returns>Height in pixels.</returns>
+		public virtual int GetAutoSizeHeight()
+		{
+            return (m_BaseItemContainer.HeightInternal + ElementStyleLayout.VerticalStyleWhiteSpace(GetBackgroundStyle()));
+		}
+
+        /// <summary>
+        /// Returns automatically calculated width of the control given current content.
+        /// </summary>
+        /// <returns>Width in pixels.</returns>
+        public virtual int GetAutoSizeWidth()
+        {
+            return (m_BaseItemContainer.WidthInternal + ElementStyleLayout.HorizontalStyleWhiteSpace(GetBackgroundStyle()));
+        }
+
+		protected void SetBaseItemContainer(BaseItem item)
+		{
+			m_BaseItemContainer=item;
+		}
+        [EditorBrowsable(EditorBrowsableState.Never)]
+		public BaseItem GetBaseItemContainer()
+		{
+			return m_BaseItemContainer;
+		}
+
+		protected virtual string EmptyContainerDesignTimeHint
+		{
+			get {return m_EmptyContainerDesignTimeHint;}
+			set {m_EmptyContainerDesignTimeHint=value;}
+		}
+
+		/// <summary> 
+		/// Clean up any resources being used.
+		/// </summary>
+		protected override void Dispose( bool disposing )
+		{
+			if( disposing )
+			{
+				if(m_ClickTimer!=null)
+				{
+					m_ClickTimer.Stop();
+					m_ClickTimer.Dispose();
+					m_ClickTimer=null;
+				}
+
+                if (m_DelayClose != null)
+                {
+                    m_DelayClose.Dispose();
+                    m_DelayClose = null;
+                }
+                if (m_BaseItemContainer != null)
+                    m_BaseItemContainer.Dispose();
+
+                if (m_ImageList != null)
+                    m_ImageList.Disposed -= new EventHandler(this.ImageListDisposed);
+                if (m_ImageListMedium != null)
+                    m_ImageListMedium.Disposed -= new EventHandler(this.ImageListDisposed);
+                if (m_ImageListLarge != null)
+                    m_ImageListLarge.Disposed -= new EventHandler(this.ImageListDisposed);
+
+			}
+			base.Dispose( disposing );
+		}
+
+		/// <summary>
+		/// Specifies the background style of the control.
+		/// </summary>
+        [Browsable(true), DevCoBrowsable(true), Category("Style"), Description("Gets or sets bar background style."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+		public ElementStyle BackgroundStyle
+		{
+			get {return m_BackgroundStyle;}
+            //set
+            //{
+            //    if (value == null)
+            //        throw new InvalidOperationException("Null is not valid value for this property.");
+            //    m_BackgroundStyle = value;
+            //}
+		}
+
+        /// <summary>
+        /// Resets style to default value. Used by windows forms designer.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetBackgroundStyle()
+		{
+			m_BackgroundStyle.StyleChanged-=new EventHandler(this.VisualPropertyChanged);
+			m_BackgroundStyle=new ElementStyle();
+			m_BackgroundStyle.StyleChanged+=new EventHandler(this.VisualPropertyChanged);
+            this.Invalidate();
+		}
+
+		private void VisualPropertyChanged(object sender, EventArgs e)
+		{
+            OnVisualPropertyChanged();
+		}
+
+        protected virtual void OnVisualPropertyChanged()
+        {
+            if(this.GetDesignMode() || 
+                this.Parent!=null && this.Parent.Site!=null && this.Parent.Site.DesignMode)
+			{
+				this.RecalcLayout();
+			}
+        }
+
+		protected virtual void MouseDragDrop(int x, int y, DragEventArgs dragArgs)
+		{
+			if(!m_DragInProgress && !m_ExternalDragInProgress)
+				return;
+			BaseItem dragItem=m_DragItem;
+			if(dragItem == null)
+				dragItem=GetDragDataBaseItem(dragArgs);
+
+			if(dragItem!=null)
+				dragItem.InternalMouseLeave();
+
+			if(m_DesignTimeProvider!=null)
+			{
+				if(x==-1 && y==-1)
+				{
+					// Cancel state
+					m_DesignTimeProvider.DrawReversibleMarker(m_InsertPosition, m_InsertBefore);
+				}
+				else
+				{
+					m_DesignTimeProvider.DrawReversibleMarker(m_InsertPosition, m_InsertBefore);
+					if(dragItem!=null)
+					{
+						BaseItem objParent=dragItem.Parent;
+						if(objParent!=null)
+						{
+							if(objParent==(BaseItem)m_DesignTimeProvider && m_InsertPosition>0)
+							{
+								if(objParent.SubItems.IndexOf(dragItem)<m_InsertPosition)
+									m_InsertPosition--;
+							}
+							objParent.SubItems.Remove(dragItem);
+							objParent.Refresh();
+                            if (objParent.ContainerControl != this)
+                                BarUtilities.InvokeRecalcLayout(objParent.ContainerControl as Control);
+						}
+						m_DesignTimeProvider.InsertItemAt(dragItem,m_InsertPosition,m_InsertBefore);
+					    OnItemDragAndDropped(dragItem);
+						m_DesignTimeProvider=null;
+						((IOwner)this).InvokeUserCustomize(dragItem,new EventArgs());
+					}
+				}
+			}
+			m_DesignTimeProvider=null;
+			DragInProgress=false;
+			m_ExternalDragInProgress=false;
+			if(!m_UseNativeDragDrop)
+				Cursor.Current=Cursors.Default;
+			this.Capture=false;
+            if (dragItem != null)
+            {
+                dragItem._IgnoreClick = true;
+                dragItem.DragStartPoint = Point.Empty;
+            }
+			m_BaseItemContainer.InternalMouseUp(new MouseEventArgs(MouseButtons.Left,0,x,y,0));
+			if(dragItem!=null)
+				dragItem._IgnoreClick=false;
+
+			m_DragItem=null;
+
+            OnUserCustomize(EventArgs.Empty);
+		}
+
+	    protected virtual void OnUserCustomize(EventArgs e)
+	    {
+	        if (UserCustomize != null)
+	            UserCustomize(this, e);
+	    }
+
+	    protected virtual void OnItemDragAndDropped(BaseItem dragItem)
+	    {
+	    }
+
+	    /// <summary>
+		/// Indicates whether shortucts handled by items are dispatched to the next handler or control.
+		/// </summary>
+		[Browsable(true),DefaultValue(false),Category("Behavior"),Description("Indicates whether shortucts handled by items are dispatched to the next handler or control.")]
+		public bool DispatchShortcuts
+		{
+			get {return m_DispatchShortcuts;}
+			set {m_DispatchShortcuts=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets Bar Color Scheme.
+		/// </summary>
+		[Browsable(false),DevCoBrowsable(false),Category("Appearance"),Description("Gets or sets Bar Color Scheme."),DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+		public ColorScheme ColorScheme
+		{
+			get {return m_ColorScheme;}
+			set
+			{
+				if(value==null)
+					throw new ArgumentException("NULL is not a valid value for this property.");
+				m_ColorScheme=value;
+				if(this.Visible)
+					this.Refresh();
+			}
+		}
+		[Browsable(false),EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeColorScheme()
+		{
+			return m_ColorScheme.SchemeChanged;
+		}
+
+		/// <summary>
+		/// Gets or sets whether anti-alias smoothing is used while painting. Default value is true.
+		/// </summary>
+		[DefaultValue(true),Browsable(true),Category("Appearance"),Description("Gets or sets whether anti-aliasing is used while painting.")]
+		public bool AntiAlias
+		{
+			get {return m_AntiAlias;}
+			set
+			{
+				if(m_AntiAlias!=value)
+				{
+					m_AntiAlias=value;
+                    this.Invalidate();
+				}
+			}
+		}
+
+		protected bool IsThemed
+		{
+			get
+			{
+                if (m_ThemeAware && m_BaseItemContainer.EffectiveStyle != eDotNetBarStyle.Office2000 && BarFunctions.ThemedOS && Themes.ThemesActive)
+					return true;
+				return false;
+			}
+		}
+
+		private bool m_DisabledImagesGrayScale=true;
+		/// <summary>
+		/// Gets or sets whether gray-scale algorithm is used to create automatic gray-scale images. Default is true.
+		/// </summary>
+		[Browsable(true),DefaultValue(true),Category("Appearance"),Description("Gets or sets whether gray-scale algorithm is used to create automatic gray-scale images.")]
+		public bool DisabledImagesGrayScale
+		{
+			get
+			{
+				return m_DisabledImagesGrayScale;
+			}
+			set
+			{
+				m_DisabledImagesGrayScale=value;
+			}
+		}
+
+		/// <summary>
+		/// Specifies whether SideBar is drawn using Themes when running on OS that supports themes like Windows XP.
+		/// </summary>
+		[Browsable(false),DefaultValue(false),Category("Appearance"),Description("Specifies whether SideBar is drawn using Themes when running on OS that supports themes like Windows XP.")]
+		public virtual bool ThemeAware
+		{
+			get
+			{
+				return m_ThemeAware;
+			}
+			set
+			{
+				m_ThemeAware=value;
+				m_BaseItemContainer.ThemeAware=value;
+				if(this.GetDesignMode())
+					this.Refresh();
+			}
+		}
+
+		/// <summary>
+		/// Applies design-time defaults to control.
+		/// </summary>
+		public virtual void SetDesignTimeDefaults()
+		{
+		}
+        [EditorBrowsable(EditorBrowsableState.Never), Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public bool DesignerSelection
+		{
+			get {return m_DesignerSelection;}
+			set
+			{
+				if(m_DesignerSelection!=value)
+				{
+					m_DesignerSelection=value;
+					this.Refresh();
+				}
+			}
+		}
+
+        /// <summary>
+        /// Gets or sets whether Key Tips (accelerator keys) for items are displayed on top of them.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public virtual bool ShowKeyTips
+        {
+            get { return m_ShowKeyTips; }
+            set
+            {
+                if (m_ShowKeyTips != value)
+                {
+                    m_ShowKeyTips = value;
+                    this.OnShowKeyTipsChanged();
+                }
+            }
+        }
+
+        string IKeyTipsControl.KeyTipsKeysStack
+        {
+            get { return m_KeyTipsKeysStack; }
+            set
+            {
+                m_KeyTipsKeysStack = value;
+                if (m_KeyTipsCanvas != null && m_KeyTipsCanvas.Parent!=null)
+                {
+                    m_KeyTipsCanvas.Parent.Invalidate(true);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the font that is used to display Key Tips (accelerator keys) when they are displayed. Default value is null which means
+        /// that control Font is used for Key Tips display.
+        /// </summary>
+        [Browsable(true), DefaultValue(null), Category("Appearance"), Description("Indicates font that is used to display Key Tips (accelerator keys) when they are displayed.")]
+        public virtual Font KeyTipsFont
+        {
+            get { return m_KeyTipsFont; }
+            set { m_KeyTipsFont = value; }
+        }
+
+        protected virtual void OnShowKeyTipsChanged()
+        {
+            m_KeyTipsKeysStack = "";
+            if (this.ShowKeyTips)
+                CreateKeyTipCanvas();
+            else
+                DestroyKeyTipCanvas();
+        }
+		#endregion
+
+		#region Painting Support
+        /// <summary>
+        /// Creates the Graphics object for the control.
+        /// </summary>
+        /// <returns>The Graphics object for the control.</returns>
+        public new Graphics CreateGraphics()
+        {
+            Graphics g = base.CreateGraphics();
+            if (m_AntiAlias)
+            {
+                g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.AntiAlias;
+				#if FRAMEWORK20
+                if(!SystemInformation.IsFontSmoothingEnabled)
+                #endif
+                    g.TextRenderingHint = DisplayHelp.AntiAliasTextRenderingHint;
+            }
+            return g;
+        }
+
+        private bool _AnimateNextPaintRequest = false;
+        internal bool AnimateNextPaintRequest
+        {
+            get { return _AnimateNextPaintRequest; }
+            set
+            {
+                _AnimateNextPaintRequest = value;
+            }
+        }
+        
+
+        internal virtual ItemPaintArgs GetItemPaintArgs(Graphics g)
+        {
+            ItemPaintArgs pa = new ItemPaintArgs(this as IOwner, this, g, GetColorScheme());
+            pa.Renderer = this.GetRenderer();
+            pa.DesignerSelection = m_DesignerSelection;
+            pa.GlassEnabled = !this.DesignMode && IsGlassEnabled;
+            pa.DragInProgress = DragInProgress;
+            pa.AnimationEnabled = _AnimateNextPaintRequest;
+            if (_AnimateNextPaintRequest)
+                pa.AnimationRequests = new System.Collections.Generic.List<DevComponents.DotNetBar.Animation.AnimationRequest>();
+            _AnimateNextPaintRequest = false;
+            return pa;
+        }
+
+        internal virtual bool IsGlassEnabled
+        {
+            get
+            {
+                if (this.GetDesignMode()) return false;
+                return WinApi.IsGlassEnabled;
+            }
+        }
+
+
+        internal ColorScheme GetColorSchemeInternal()
+        {
+            return GetColorScheme();
+        }
+
+        /// <summary>
+        /// Returns the color scheme used by control. Color scheme for Office2007 style will be retrived from the current renderer instead of
+        /// local color scheme referenced by ColorScheme property.
+        /// </summary>
+        /// <returns>An instance of ColorScheme object.</returns>
+        protected virtual ColorScheme GetColorScheme()
+        {
+            if (BarFunctions.IsOffice2007Style(m_BaseItemContainer.EffectiveStyle))
+            {
+                BaseRenderer r = GetRenderer();
+                if (r is Office2007Renderer)
+                    return ((Office2007Renderer)r).ColorTable.LegacyColors;
+            }
+            return m_ColorScheme;
+        }
+
+        internal void InternalPaint(PaintEventArgs e)
+        {
+            OnPaint(e, true);
+        }
+
+		protected override void OnPaint(PaintEventArgs e)
+        {
+            OnPaint(e, false);
+            if (m_KeyTipsCanvas != null)
+            {
+                InvalidateKeyTipsCanvas();
+                InvalidateKeyTipsDelayed();
+            }
+            base.OnPaint(e);
+		}
+
+        private Timer m_KeyTipDelayRefreshTimer = null;
+        private void InvalidateKeyTipsDelayed()
+        {
+            if (m_KeyTipDelayRefreshTimer != null) return;
+            m_KeyTipDelayRefreshTimer = new Timer();
+            m_KeyTipDelayRefreshTimer.Tick+=new EventHandler(KeyTipDelayRefreshTimerTick);
+            m_KeyTipDelayRefreshTimer.Interval = 100;
+            m_KeyTipDelayRefreshTimer.Start();
+        }
+        private void KeyTipDelayRefreshTimerTick(object sender, EventArgs e)
+        {
+            Timer timer = m_KeyTipDelayRefreshTimer;
+            m_KeyTipDelayRefreshTimer = null;
+            timer.Stop();
+            timer.Tick -= new EventHandler(KeyTipDelayRefreshTimerTick);
+            timer.Dispose();
+            InvalidateKeyTipsCanvas();
+        }
+
+        internal void InvalidateKeyTipsCanvas()
+        {
+            if (m_KeyTipsCanvas != null) m_KeyTipsCanvas.Invalidate();
+            //if (this.Parent != null && this.Parent.Parent is RibbonControl) ((RibbonControl)this.Parent.Parent).RibbonStrip.InvalidateKeyTipsCanvas();
+        }
+
+        private bool m_FirstScrollPaint = true;
+        private bool _CanAnimate = false;
+        private void OnPaint(PaintEventArgs e, bool cashedPaint)
+        {
+            SmoothingMode sm = e.Graphics.SmoothingMode;
+            TextRenderingHint th = e.Graphics.TextRenderingHint;
+
+            if (this.BackColor.IsEmpty || this.BackColor == Color.Transparent)
+            {
+                base.OnPaintBackground(e);
+            }
+
+            if (m_BackgroundStyle != null)
+                m_BackgroundStyle.SetColorScheme(this.GetColorScheme());
+
+            ItemPaintArgs pa = GetItemPaintArgs(e.Graphics);
+            pa.PaintEventArgs = e;
+            pa.ClipRectangle = e.ClipRectangle;
+            if (_CanAnimate)
+            {
+                pa.AnimationEnabled = true;
+                pa.AnimationRequests = new System.Collections.Generic.List<DevComponents.DotNetBar.Animation.AnimationRequest>();
+            }
+            if (m_FirstScrollPaint && this.AutoScroll && this.Controls.Count > 0)
+            {
+                pa.ClipRectangle = Rectangle.Empty;
+                m_FirstScrollPaint = false;
+            }
+            pa.CachedPaint = cashedPaint;
+            PaintControl(pa);
+
+            e.Graphics.SmoothingMode = sm;
+            e.Graphics.TextRenderingHint = th;
+
+            // Kick off animations if needed
+            if (pa.AnimationEnabled && pa.AnimationRequests.Count > 0)
+            {
+                Animation.AnimationRectangle anim = new DevComponents.DotNetBar.Animation.AnimationRectangle(pa.AnimationRequests.ToArray(),
+                    Animation.AnimationEasing.EaseOutExpo, 500);
+                anim.AnimationUpdateControl = this;
+                _CanAnimate = false;
+                anim.AnimationCompleted += AnimationCompleted;
+                anim.Start();
+            }
+        }
+
+        private void AnimationCompleted(object sender, EventArgs e)
+        {
+            Animation.Animation anim = (Animation.Animation)sender;
+            anim.AnimationCompleted -= AnimationCompleted;
+            anim.Dispose();
+        }
+
+        protected virtual void ClearBackground(ItemPaintArgs pa)
+        {
+            using (SolidBrush brush = new SolidBrush(this.BackColor))
+                pa.Graphics.FillRectangle(brush, this.ClientRectangle);
+        }
+
+        protected virtual void PaintControl(ItemPaintArgs pa)
+        {
+            if (m_BaseItemContainer == null || this.IsDisposed)
+                return;
+
+            if (m_BaseItemContainer.NeedRecalcSize)
+                this.RecalcSize();
+
+            if (!this.BackColor.IsEmpty && this.BackColor!=Color.Transparent)
+            {
+                ClearBackground(pa);
+            }
+
+#if TRIAL
+				if(NativeFunctions.ColorExpAlt())
+				{
+					pa.Graphics.DrawString("Your DotNetBar trial has expired :-(",this.Font,SystemBrushes.ControlText,0,0);
+					return;
+				}
+#endif
+
+            if (m_AntiAlias)
+            {
+                pa.Graphics.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.AntiAlias;
+                pa.Graphics.TextRenderingHint = DisplayHelp.AntiAliasTextRenderingHint;
+            }
+
+            PaintControlBackground(pa);
+
+            Region oldClip = pa.Graphics.Clip;
+            pa.ContainerClipRectangle = GetInnerPaintBounds();
+            pa.Graphics.SetClip(pa.ContainerClipRectangle, CombineMode.Intersect);
+            PaintItemContainer(pa);
+            pa.Graphics.Clip = oldClip;
+            if (oldClip != null) oldClip.Dispose();
+            if (m_BaseItemContainer.SubItems.Count == 0 && this.GetDesignMode())
+                PaintDesignTimeEmptyHint(pa);
+        }
+
+        protected virtual Rectangle GetInnerPaintBounds()
+        {
+            ElementStyle style = GetBackgroundStyle();
+            if (style == null)
+                return this.ClientRectangle;
+
+            Rectangle r = this.ClientRectangle;
+            r.X += ElementStyleLayout.StyleSpacing(style, eSpacePart.Border, eStyleSide.Left);
+            r.Width -= ElementStyleLayout.StyleSpacing(style, eSpacePart.Border, eStyleSide.Left) + ElementStyleLayout.StyleSpacing(style, eSpacePart.Border, eStyleSide.Right);
+            r.Y += ElementStyleLayout.StyleSpacing(style, eSpacePart.Border, eStyleSide.Top);
+            r.Height -= ElementStyleLayout.StyleSpacing(style, eSpacePart.Border, eStyleSide.Top) + ElementStyleLayout.StyleSpacing(style, eSpacePart.Border, eStyleSide.Bottom);
+
+            return r;
+        }
+
+        protected virtual Rectangle GetPaintClipRectangle()
+        {
+            return this.GetItemContainerRectangle();
+        }
+
+        protected virtual Rectangle GetPaintControlBackgroundRectangle()
+        {
+            return this.ClientRectangle;
+        }
+        protected virtual void PaintControlBackground(ItemPaintArgs pa)
+		{
+            ElementStyle style = GetBackgroundStyle();
+			if(style!=null)
+			{
+                Rectangle r = GetPaintControlBackgroundRectangle();
+				ElementStyleDisplayInfo displayInfo=new ElementStyleDisplayInfo(style,pa.Graphics,r);
+				ElementStyleDisplay.Paint(displayInfo);
+			}
+		}
+
+		protected virtual void PaintItemContainer(ItemPaintArgs pa)
+		{
+			m_BaseItemContainer.Paint(pa);
+		}
+
+		protected virtual void PaintDesignTimeEmptyHint(ItemPaintArgs pa)
+		{
+			string info=m_EmptyContainerDesignTimeHint;
+			Rectangle rText=this.GetItemContainerRectangle();
+			rText.Inflate(-2,-2);
+			if(rText.Width<0 || rText.Height<0)
+				return;
+			StringFormat format=BarFunctions.CreateStringFormat(); //StringFormat.GenericDefault.Clone() as StringFormat;
+			format.Alignment=StringAlignment.Center;
+			format.LineAlignment=StringAlignment.Center;
+			pa.Graphics.DrawString(info,this.Font,SystemBrushes.ControlDark,rText,format);
+		}
+        
+        protected virtual void PaintKeyTips(Graphics g)
+        {
+            if (!m_ShowKeyTips)
+                return;
+
+            KeyTipsRendererEventArgs e = new KeyTipsRendererEventArgs(g, Rectangle.Empty, "", GetKeyTipFont(), null);
+            
+            Rendering.BaseRenderer renderer = GetRenderer();
+            PaintContainerKeyTips(m_BaseItemContainer, renderer, e);
+        }
+
+        protected virtual Font GetKeyTipFont()
+        {
+            Font font = this.Font;
+            if (m_KeyTipsFont != null)
+                font = m_KeyTipsFont;
+            return font;
+        }
+
+        internal virtual void PaintContainerKeyTips(BaseItem container, Rendering.BaseRenderer renderer, KeyTipsRendererEventArgs e)
+        {
+            foreach (BaseItem item in container.SubItems)
+            {
+                PaintItemKeyTip(item, renderer, e);
+            }
+
+            CaptionItemContainer gc = container as CaptionItemContainer;
+            if (gc != null && gc.MoreItems != null && gc.MoreItems.Visible)
+            {
+                PaintItemKeyTip(gc.MoreItems, renderer, e);
+            }
+        }
+
+        private void PaintItemKeyTip(BaseItem item, Rendering.BaseRenderer renderer, KeyTipsRendererEventArgs e)
+        {
+            if (!item.Visible || !item.Displayed)
+                return;
+
+            if (item.IsContainer)
+                PaintContainerKeyTips(item, renderer, e);
+
+            if (item.AccessKey == Char.MinValue && item.KeyTips == "" || m_KeyTipsKeysStack != "" && !item.KeyTips.StartsWith(m_KeyTipsKeysStack)
+                || item.KeyTips == "" && m_KeyTipsKeysStack != "")
+                return;
+
+            if (item.KeyTips != "")
+                e.KeyTip = item.KeyTips;
+            else
+                e.KeyTip = item.AccessKey.ToString().ToUpper();
+
+            e.Bounds = GetKeyTipRectangle(e.Graphics, item, e.Font, e.KeyTip);
+            e.ReferenceObject = item;
+
+            renderer.DrawKeyTips(e);
+        }
+
+        protected virtual Rectangle GetKeyTipRectangle(Graphics g, BaseItem item, Font font, string keyTip)
+        {
+            Size padding = KeyTipsPainter.KeyTipsPadding;
+            Size size = TextDrawing.MeasureString(g, keyTip, font);
+            size.Width += padding.Width;
+            size.Height += padding.Height;
+
+            Rectangle ib = item.DisplayRectangle;
+            Rectangle r = new Rectangle(ib.X + (ib.Width - size.Width) / 2, ib.Bottom - size.Height, size.Width, size.Height);
+            if (item is RibbonTabItem)
+                r.Y = ib.Bottom - 7;
+            
+            return r;
+        }
+
+        private Rendering.BaseRenderer m_DefaultRenderer = null;
+        private Rendering.BaseRenderer m_Renderer = null;
+        private eRenderMode m_RenderMode = eRenderMode.Global;
+        /// <summary>
+        /// Returns the renderer control will be rendered with.
+        /// </summary>
+        /// <returns>The current renderer.</returns>
+        public virtual Rendering.BaseRenderer GetRenderer()
+        {
+            if (m_RenderMode == eRenderMode.Global && Rendering.GlobalManager.Renderer != null)
+                return Rendering.GlobalManager.Renderer;
+            else if (m_RenderMode == eRenderMode.Custom && m_Renderer != null)
+                return m_Renderer;
+
+            if (m_DefaultRenderer == null)
+                m_DefaultRenderer = new Rendering.Office2007Renderer();
+                
+            return m_Renderer;
+        }
+
+        /// <summary>
+        /// Gets or sets the redering mode used by control. Default value is eRenderMode.Global which means that static GlobalManager.Renderer is used. If set to Custom then Renderer property must
+        /// also be set to the custom renderer that will be used.
+        /// </summary>
+        [Browsable(false), DefaultValue(eRenderMode.Global)]
+        public eRenderMode RenderMode
+        {
+            get { return m_RenderMode; }
+            set
+            {
+                if (m_RenderMode != value)
+                {
+                    m_RenderMode = value;
+                    this.Invalidate(true);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the custom renderer used by the items on this control. RenderMode property must also be set to eRenderMode.Custom in order renderer
+        /// specified here to be used.
+        /// </summary>
+        [Browsable(false), DefaultValue(null)]
+        public DevComponents.DotNetBar.Rendering.BaseRenderer Renderer
+        {
+            get
+            {
+                return m_Renderer;
+            }
+            set { m_Renderer = value; }
+        }
+
+        protected virtual Rectangle GetKeyTipCanvasBounds()
+        {
+            if (this.Parent != null)
+                return new Rectangle(this.Bounds.X, this.Bounds.Y, this.Bounds.Width, this.Bounds.Height + 16);
+            else
+                return new Rectangle(0, 0, this.Width, this.Height);
+        }
+
+        protected virtual void CreateKeyTipCanvas()
+        {
+            if (m_KeyTipsCanvas != null)
+            {
+                m_KeyTipsCanvas.BringToFront();
+                if(m_KeyTipsCanvas.Parent!=null)
+                    m_KeyTipsCanvas.Parent.Invalidate(m_KeyTipsCanvas.Bounds);
+                return;
+            }
+
+            m_KeyTipsCanvas = new KeyTipsCanvasControl(this);
+            m_KeyTipsCanvas.Bounds = GetKeyTipCanvasBounds();
+            m_KeyTipsCanvas.Visible = true;
+
+            RibbonControl rc = this.GetRibbonControl();
+            if (rc != null)
+            {
+                if (rc.Expanded && !NeedsTopLevelKeyTipCanvasParent)
+                {
+                    rc.Controls.Add(m_KeyTipsCanvas); 
+                }
+                else
+                {
+                    Form f = rc.FindForm();
+                    if (f != null)
+                        f.Controls.Add(m_KeyTipsCanvas);
+                    else
+                        rc.Controls.Add(m_KeyTipsCanvas); 
+                }
+            }
+            else
+                this.Controls.Add(m_KeyTipsCanvas);
+            m_KeyTipsCanvas.BringToFront();
+        }
+
+        protected virtual bool NeedsTopLevelKeyTipCanvasParent
+        {
+            get
+            {
+                return false;
+            }
+        }
+
+        internal void UpdateKeyTipsCanvas()
+        {
+            if (m_KeyTipsCanvas != null)
+            {
+                m_KeyTipsCanvas.Refresh();
+            }
+        }
+
+        protected virtual void DestroyKeyTipCanvas()
+        {
+            if (m_KeyTipsCanvas == null)
+                return;
+            m_KeyTipsCanvas.Visible = false;
+            if (m_KeyTipsCanvas.Parent != null) m_KeyTipsCanvas.Parent.Controls.Remove(m_KeyTipsCanvas);
+            m_KeyTipsCanvas.Dispose();
+            m_KeyTipsCanvas = null;
+        }
+
+        void IKeyTipsRenderer.PaintKeyTips(Graphics g)
+        {
+            this.PaintKeyTips(g);
+        }
+
+        /// <summary>
+        /// Gets or sets whether mouse over fade effect is enabled. Default value is true.
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Appearance"), Description("Indicates whether mouse over fade effect is enabled")]
+        public bool FadeEffect
+        {
+            get { return m_FadeEffect; }
+            set
+            {
+                m_FadeEffect = value;
+            }
+        }
+
+        internal bool IsFadeEnabled
+        {
+            get
+            {
+                if (this.DesignMode || (!BarFunctions.IsOffice2007Style(m_BaseItemContainer.EffectiveStyle)) ||
+                    m_FadeEffect && NativeFunctions.IsTerminalSession() || TextDrawing.UseTextRenderer || m_BaseItemContainer.EffectiveStyle == eDotNetBarStyle.Office2010
+                    || StyleManager.IsMetro(m_BaseItemContainer.EffectiveStyle))
+                    return false;
+                return m_FadeEffect;
+            }
+        }
+		#endregion
+
+		#region Layout Support
+        private int m_UpdateSuspendCount = 0;
+        /// <summary>
+        /// Indicates to control that all further update operations should not result in layout and refresh of control content.
+        /// Use this method to optimize the addition of new items to the control. This method supports nested calls meaning
+        /// that multiple calls are allowed but they must be ended with appropriate number of EndUpdate calls.
+        /// IsUpdateSuspended property returns whether update is suspended.
+        /// </summary>
+        public void BeginUpdate()
+        {
+            m_UpdateSuspendCount++;
+        }
+
+        /// <summary>
+        /// Indicates that update operation is complete and that control should perform layout and refresh to show changes. See BeginUpdate
+        /// for more details.
+        /// </summary>
+        public void EndUpdate()
+        {
+            EndUpdate(true);
+        }
+
+        /// <summary>
+        /// Indicates that update operation is complete and that control should perform layout and refresh to show changes. See BeginUpdate
+        /// for more details.
+        /// </summary>
+        public void EndUpdate(bool callRecalcLayout)
+        {
+            if (m_UpdateSuspendCount > 0)
+            {
+                m_UpdateSuspendCount--;
+                if (m_UpdateSuspendCount == 0 && callRecalcLayout)
+                    this.RecalcLayout();
+            }
+        }
+
+        /// <summary>
+        /// Gets whether control layout is suspended becouse of the call to BeginUpdate method.
+        /// </summary>
+        [Browsable(false)]
+        public bool IsUpdateSuspended
+        {
+            get { return m_UpdateSuspendCount > 0; }
+        }
+
+		protected virtual Rectangle GetItemContainerRectangle()
+		{
+            ElementStyle style = GetBackgroundStyle();
+			if(style==null)
+				return this.ClientRectangle;
+
+			Rectangle r=this.ClientRectangle;
+			r.X+=ElementStyleLayout.LeftWhiteSpace(style);
+			r.Width-=ElementStyleLayout.HorizontalStyleWhiteSpace(style);
+			r.Y+=ElementStyleLayout.TopWhiteSpace(style);
+			r.Height-=ElementStyleLayout.VerticalStyleWhiteSpace(style);
+			
+			return r;
+		}
+
+		protected virtual void RecalcSize()
+		{
+            if (!BarFunctions.IsHandleValid(this) || IsUpdateSuspended)
+				return;
+			if(m_BaseItemContainer.IsRecalculatingSize)
+				return;
+            Form f = this.FindForm();
+            if (f != null && f.WindowState == FormWindowState.Minimized)
+                return;
+            if (m_BaseItemContainer.NeedRecalcSize)
+            {
+                Rectangle r = this.GetItemContainerRectangle();
+                m_BaseItemContainer.SuspendLayout = true;
+                m_BaseItemContainer.IsRightToLeft = (this.RightToLeft == RightToLeft.Yes);
+                m_BaseItemContainer.LeftInternal = r.X;
+                m_BaseItemContainer.TopInternal = r.Y;
+                m_BaseItemContainer.WidthInternal = r.Width;
+                m_BaseItemContainer.HeightInternal = r.Height;
+                m_BaseItemContainer.SuspendLayout = false;
+                m_BaseItemContainer.RecalcSize();
+
+                OnItemLayoutUpdated(EventArgs.Empty);
+            }
+			AutoSyncSize();
+		}
+
+        /// <summary>
+        /// Occurs after internal item layout has been updated and items have valid bounds assigned.
+        /// </summary>
+        public event EventHandler ItemLayoutUpdated;
+        /// <summary>
+        /// Raises ItemLayoutUpdated event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnItemLayoutUpdated(EventArgs e)
+        {
+            EventHandler handler = ItemLayoutUpdated;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        protected override void OnFontChanged(EventArgs e)
+        {
+            this.InvalidateFontChange();
+            this.InvalidateLayout();
+            this.RecalcLayout();
+            base.OnFontChanged(e);
+        }
+
+        private void InvalidateFontChange()
+        {
+            BarUtilities.InvalidateFontChange(m_BaseItemContainer.SubItems);
+        }
+
+        /// <summary>
+        /// Invalidates the control layout and forces the control to recalculates the layout for the items it contains on next layout operation invoked using RecalcLayout method.
+        /// </summary>
+        /// <remarks>
+        ///     Call to this method is usually followed by the call to
+        ///     <see cref="RecalcLayout">RecalcLayout</see> method to perform the control layout.
+        /// </remarks>
+        public void InvalidateLayout()
+        {
+            m_BaseItemContainer.NeedRecalcSize = true;
+        }
+
+		/// <summary>
+		/// Applies any layout changes and repaint the control.
+		/// </summary>
+		public virtual void RecalcLayout()
+		{
+            if (this.InvokeRequired)
+            {
+                this.BeginInvoke(new MethodInvoker(delegate { this.RecalcLayout(); }));
+                return;
+            }
+
+			if(m_BaseItemContainer.IsRecalculatingSize || IsUpdateSuspended)
+				return;
+			this.RecalcSize();
+			this.Invalidate();
+		}
+
+		protected override void OnResize(System.EventArgs e)
+		{
+			base.OnResize (e);
+            if (this.Width == 0 || this.Height == 0)
+                return;
+            Form form = this.FindForm();
+            if (form != null && form.WindowState == FormWindowState.Minimized)
+                return;
+            m_BaseItemContainer.NeedRecalcSize = true;
+			this.RecalcSize();
+		}
+		#endregion
+
+		#region IBarDesignerServices
+		IBarItemDesigner IBarDesignerServices.Designer
+		{
+			get {return m_BarDesigner;}
+			set {m_BarDesigner=value;}
+		}
+		#endregion
+
+        #region Active Window Changed Handling
+        /// <summary>
+        /// Sets up timer that watches when active window changes.
+        /// </summary>
+        protected virtual void SetupActiveWindowTimer()
+        {
+            if (m_ActiveWindowTimer != null)
+                return;
+            m_ActiveWindowTimer = new Timer();
+            m_ActiveWindowTimer.Interval = 100;
+            m_ActiveWindowTimer.Tick += new EventHandler(ActiveWindowTimer_Tick);
+
+            m_ForegroundWindow = NativeFunctions.GetForegroundWindow();
+            m_ActiveWindow = NativeFunctions.GetActiveWindow();
+
+            m_ActiveWindowTimer.Start();
+        }
+
+        private void ActiveWindowTimer_Tick(object sender, EventArgs e)
+        {
+            if (m_ActiveWindowTimer == null)
+                return;
+
+            IntPtr f = NativeFunctions.GetForegroundWindow();
+            IntPtr a = NativeFunctions.GetActiveWindow();
+
+            if (f != m_ForegroundWindow || a != m_ActiveWindow)
+            {
+                if (a != IntPtr.Zero)
+                {
+                    Control c = Control.FromHandle(a);
+                    if (c is PopupContainer || c is PopupContainerControl)
+                        return;
+                }
+                m_ActiveWindowTimer.Stop();
+                OnActiveWindowChanged();
+            }
+        }
+
+        /// <summary>
+        /// Called after change of active window has been detected. SetupActiveWindowTimer must be called to enable detection.
+        /// </summary>
+        protected virtual void OnActiveWindowChanged()
+        {
+            if (this.MenuFocus)
+                this.MenuFocus = false;
+        }
+
+        /// <summary>
+        /// Releases and disposes the active window watcher timer.
+        /// </summary>
+        protected virtual void ReleaseActiveWindowTimer()
+        {
+            if (m_ActiveWindowTimer != null)
+            {
+                Timer timer = m_ActiveWindowTimer;
+                m_ActiveWindowTimer = null;
+                timer.Stop();
+                timer.Tick -= new EventHandler(ActiveWindowTimer_Tick);
+                timer.Dispose();
+            }
+        }
+        #endregion
+
+        #region IRibbonCustomize Members
+        /// <summary>
+        /// Called when item on popup container is right-clicked.
+        /// </summary>
+        /// <param name="item">Instance of the item that is right-clicked.</param>
+        void IRibbonCustomize.ItemRightClick(BaseItem item)
+        {
+            OnPopupItemRightClick(item);
+        }
+
+        /// <summary>
+        /// Called when item on popup container is right-clicked.
+        /// </summary>
+        /// <param name="item">Instance of the item that is right-clicked.</param>
+        protected virtual void OnPopupItemRightClick(BaseItem item) { }
+        #endregion
+
+        #region IBarImageSize Members
+
+        /// <summary>
+        /// Gets/Sets the Image size for all sub-items on the Bar.
+        /// </summary>
+        [System.ComponentModel.Browsable(true), DevCoBrowsable(true), System.ComponentModel.Category("Behavior"), System.ComponentModel.Description("Specifies the Image size that will be used by items on this bar."), DefaultValue(eBarImageSize.Default)]
+        public virtual eBarImageSize ImageSize
+        {
+            get
+            {
+                return m_ImageSize;
+            }
+            set
+            {
+                m_ImageSize = value;
+                if(m_BaseItemContainer is ImageItem)
+                    ((ImageItem)m_BaseItemContainer).RefreshImageSize();
+                this.RecalcLayout();
+            }
+        }
+
+        #endregion
+
+        #region Misc Properties
+        /// <summary>
+        /// Gets or sets whether external ButtonItem object is accepted in drag and drop operation. UseNativeDragDrop must be set to true in order for this property to be effective.
+        /// </summary>
+        [Browsable(false), DefaultValue(false), Category("Behavior"), Description("Gets or sets whether external ButtonItem object is accepted in drag and drop operation.")]
+        public virtual bool AllowExternalDrop
+        {
+            get { return m_AllowExternalDrop; }
+            set { m_AllowExternalDrop = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether native .NET Drag and Drop is used by control to perform drag and drop operations. AllowDrop must be set to true to allow drop of the items on control.
+        /// </summary>
+        [Browsable(false), DefaultValue(false), Category("Behavior"), Description("Specifies whether native .NET Drag and Drop is used by control to perform drag and drop operations.")]
+        public virtual bool UseNativeDragDrop
+        {
+            get { return m_UseNativeDragDrop; }
+            set { m_UseNativeDragDrop = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether control supports drag &amp; drop. Default value is false.
+        /// </summary>
+        [Browsable(false), DefaultValue(false), Category("Behavior"), Description("Indicates whether internal automatic drag & drop support is enabled")]
+        public virtual bool DragDropSupport
+        {
+            get { return m_DragDropSupport; }
+            set { m_DragDropSupport = value; }
+        }
+        #endregion
+    }
+
+	#region ItemControlAccessibleObject
+	/// <summary>
+	/// Represents class for Accessibility support.
+	/// </summary>
+	public class ItemControlAccessibleObject : System.Windows.Forms.Control.ControlAccessibleObject
+	{
+		private ItemControl m_Owner = null;
+		/// <summary>
+		/// Creates new instance of the object and initializes it with owner control.
+		/// </summary>
+		/// <param name="owner">Reference to owner control.</param>
+		public ItemControlAccessibleObject(ItemControl owner):base(owner)
+		{
+			m_Owner = owner;
+		}
+
+        protected ItemControl Owner
+        {
+            get { return m_Owner; }
+        }
+
+		internal void GenerateEvent(BaseItem sender, System.Windows.Forms.AccessibleEvents e)
+		{
+			int	iChild = m_Owner.GetBaseItemContainer().SubItems.IndexOf(sender);
+			if(iChild>=0)
+			{
+				if(m_Owner!=null && !m_Owner.IsDisposed)
+					m_Owner.InternalAccessibilityNotifyClients(e,iChild);
+			}
+		}
+
+        ///// <summary>
+        ///// Gets or sets accessible name.
+        ///// </summary>
+        //public override string Name 
+        //{
+        //    get
+        //    {
+        //        if(m_Owner!=null && !m_Owner.IsDisposed)
+        //            return m_Owner.AccessibleName;
+        //        return "";
+        //    }
+        //    set
+        //    {
+        //        if(m_Owner!=null && !m_Owner.IsDisposed)
+        //            m_Owner.AccessibleName = value;
+        //    }
+        //}
+
+        ///// <summary>
+        ///// Gets accessible description.
+        ///// </summary>
+        //public override string Description
+        //{
+        //    get
+        //    {
+        //        if(m_Owner!=null && !m_Owner.IsDisposed)
+        //            return m_Owner.AccessibleDescription;
+        //        return "";
+        //    }
+        //}
+
+		/// <summary>
+		/// Gets accessible role.
+		/// </summary>
+		public override AccessibleRole Role
+		{
+			get
+			{
+				if(m_Owner!=null && !m_Owner.IsDisposed)
+					return m_Owner.AccessibleRole;
+				return System.Windows.Forms.AccessibleRole.None;
+			}
+		}
+
+		/// <summary>
+		/// Gets parent accessibility object.
+		/// </summary>
+		public override AccessibleObject Parent 
+		{
+			get
+			{
+				if(m_Owner!=null && !m_Owner.IsDisposed)
+					return m_Owner.Parent.AccessibilityObject;
+				return null;
+			}
+		}
+
+		/// <summary>
+		/// Returns bounds of the control.
+		/// </summary>
+		public override Rectangle Bounds 
+		{
+			get
+			{
+				if(m_Owner!=null && !m_Owner.IsDisposed && m_Owner.Parent!=null)
+					return this.m_Owner.Parent.RectangleToScreen(m_Owner.Bounds);
+				return Rectangle.Empty;
+			}
+		}
+
+		/// <summary>
+		/// Returns number of child objects.
+		/// </summary>
+		/// <returns>Total number of child objects.</returns>
+		public override int GetChildCount()
+		{
+			if(m_Owner!=null && !m_Owner.IsDisposed && m_Owner.GetBaseItemContainer()!=null)
+				return m_Owner.GetBaseItemContainer().SubItems.Count;
+			return 0;
+		}
+
+		/// <summary>
+		/// Returns reference to child object given the index.
+		/// </summary>
+		/// <param name="iIndex">0 based index of child object.</param>
+		/// <returns>Reference to child object.</returns>
+		public override System.Windows.Forms.AccessibleObject GetChild(int iIndex)
+		{
+			if(m_Owner!=null && !m_Owner.IsDisposed && m_Owner.GetBaseItemContainer()!=null)
+				return m_Owner.GetBaseItemContainer().SubItems[iIndex].AccessibleObject;
+			return null;
+		}
+
+		/// <summary>
+		/// Returns current accessible state.
+		/// </summary>
+		public override AccessibleStates State
+		{
+			get
+			{
+				AccessibleStates state;
+				if(m_Owner==null || m_Owner.IsDisposed)
+					return AccessibleStates.None;
+
+				state=AccessibleStates.None;
+				return state;
+			}
+		}
+	}
+	#endregion
+}
diff --git a/PROMS/DotNetBar Source Code/Ribbon/ItemControl.resx b/PROMS/DotNetBar Source Code/Ribbon/ItemControl.resx
new file mode 100644
index 00000000..3f337e08
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Ribbon/ItemControl.resx	
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<root>
+	<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+		<xsd:element name="root" msdata:IsDataSet="true">
+			<xsd:complexType>
+				<xsd:choice maxOccurs="unbounded">
+					<xsd:element name="data">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+								<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" />
+							<xsd:attribute name="type" type="xsd:string" />
+							<xsd:attribute name="mimetype" type="xsd:string" />
+						</xsd:complexType>
+					</xsd:element>
+					<xsd:element name="resheader">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" use="required" />
+						</xsd:complexType>
+					</xsd:element>
+				</xsd:choice>
+			</xsd:complexType>
+		</xsd:element>
+	</xsd:schema>
+	<resheader name="ResMimeType">
+		<value>text/microsoft-resx</value>
+	</resheader>
+	<resheader name="Version">
+		<value>1.0.0.0</value>
+	</resheader>
+	<resheader name="Reader">
+		<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+	<resheader name="Writer">
+		<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+</root>
diff --git a/PROMS/DotNetBar Source Code/Ribbon/ItemDisplay.cs b/PROMS/DotNetBar Source Code/Ribbon/ItemDisplay.cs
new file mode 100644
index 00000000..e674cf53
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Ribbon/ItemDisplay.cs	
@@ -0,0 +1,88 @@
+using System;
+using System.Drawing.Drawing2D;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Represents class for item display.
+	/// </summary>
+	internal class ItemDisplay
+	{
+		public ItemDisplay()
+		{
+		}
+
+		public void Paint(ItemContainer container, ItemPaintArgs p)
+		{
+			foreach(BaseItem item in container.SubItems)
+			{
+				if(item.Visible && item.Displayed)
+				{
+                    if (item.BeginGroup)
+                    {
+                        if (p.Renderer != null)
+                            p.Renderer.DrawItemContainerSeparator(new ItemContainerSeparatorRendererEventArgs(p.Graphics, container, item));
+                    }
+                    if (p.ClipRectangle.IsEmpty || p.ClipRectangle.IntersectsWith(item.DisplayRectangle))
+                    {
+                        Region oldClip = p.Graphics.Clip as Region;
+                        p.Graphics.SetClip(item.DisplayRectangle, CombineMode.Intersect);
+                        if (!p.Graphics.IsClipEmpty)
+                            item.Paint(p);
+                        p.Graphics.Clip = oldClip;
+                        if (oldClip != null) oldClip.Dispose();
+                    }
+				}
+			}
+		}
+
+        public void Paint(BaseItem container, ItemPaintArgs p)
+        {
+            foreach (BaseItem item in container.SubItems)
+            {
+                if (item.Visible && item.Displayed)
+                {
+                    if (p.ClipRectangle.IsEmpty || p.ClipRectangle.IntersectsWith(item.DisplayRectangle))
+                    {
+                        Region oldClip = p.Graphics.Clip; //.Clone() as Region;
+                        p.Graphics.SetClip(item.DisplayRectangle, CombineMode.Intersect);
+                        item.Paint(p);
+                        p.Graphics.Clip = oldClip;
+                        if (oldClip != null)
+                            oldClip.Dispose();
+                    }
+                }
+            }
+        }
+
+        public void Paint(StepItemContainer container, ItemPaintArgs p)
+        {
+            StepItem mouseOverItem = null;
+            foreach (BaseItem item in container.SubItems)
+            {
+                if (item.Visible && item.Displayed)
+                {
+                    if (p.ClipRectangle.IsEmpty || p.ClipRectangle.IntersectsWith(item.DisplayRectangle))
+                    {
+                        if (item is StepItem && ((StepItem)item).IsMouseOver)
+                        {
+                            mouseOverItem = (StepItem)item;
+                            continue;
+                        }
+                        Region oldClip = p.Graphics.Clip;
+                        p.Graphics.SetClip(item.DisplayRectangle, CombineMode.Intersect);
+                        item.Paint(p);
+                        p.Graphics.Clip = oldClip;
+                        if (oldClip != null)
+                            oldClip.Dispose();
+                    }
+                }
+            }
+            if (mouseOverItem != null)
+            {
+                mouseOverItem.Paint(p);
+            }
+        }
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/Ribbon/ItemPanel.cs b/PROMS/DotNetBar Source Code/Ribbon/ItemPanel.cs
new file mode 100644
index 00000000..e394f929
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Ribbon/ItemPanel.cs	
@@ -0,0 +1,283 @@
+using System;
+using System.Text;
+using System.Windows.Forms;
+using System.ComponentModel;
+using System.Drawing;
+using System.Runtime.InteropServices;
+using System.Collections.Generic;
+using System.Collections;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represents generic item panel container control.
+    /// </summary>
+    [ToolboxBitmap(typeof(ItemPanel), "Ribbon.ItemPanel.ico"), ToolboxItem(true), Designer("DevComponents.DotNetBar.Design.ItemPanelDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf"), System.Runtime.InteropServices.ComVisible(false)]
+    public class ItemPanel : ItemPanelBase, IScrollableItemControl, IBindingSupport
+    {
+        #region Private Variables
+        #endregion
+
+        #region Constructor
+        public ItemPanel()
+        {
+        }
+        #endregion
+
+        #region Internal Implementation
+        /// <summary>
+        /// Returns first checked top-level button item.
+        /// </summary>
+        /// <returns>An ButtonItem object or null if no button could be found.</returns>
+        public ButtonItem GetChecked()
+        {
+            foreach (BaseItem item in this.Items)
+            {
+                if (item.Visible && item is ButtonItem && ((ButtonItem)item).Checked)
+                    return item as ButtonItem;
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Gets or sets default layout orientation inside the control. You can have multiple layouts inside of the control by adding
+        /// one or more instances of the ItemContainer object and chaning it's LayoutOrientation property.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Category("Layout"), DefaultValue(eOrientation.Horizontal), DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
+        public virtual eOrientation LayoutOrientation
+        {
+            get { return ItemContainer.LayoutOrientation; }
+            set
+            {
+                ItemContainer.LayoutOrientation = value;
+                if (this.DesignMode)
+                    this.RecalcLayout();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether items contained by container are resized to fit the container bounds. When container is in horizontal
+        /// layout mode then all items will have the same height. When container is in vertical layout mode then all items
+        /// will have the same width. Default value is true.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), DefaultValue(true), Category("Layout")]
+        public virtual bool ResizeItemsToFit
+        {
+            get { return ItemContainer.ResizeItemsToFit; }
+            set
+            {
+                ItemContainer.ResizeItemsToFit = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether ButtonItem buttons when in vertical layout are fit into the available width so any text inside of them
+        /// is wrapped if needed. Default value is false.
+        /// </summary>
+        [DefaultValue(false), Category("Layout"), Description("Indicates whether ButtonItem buttons when in vertical layout are fit into the available width so any text inside of them is wrapped if needed.")]
+        public bool FitButtonsToContainerWidth
+        {
+            get { return ItemContainer.FitOversizeItemIntoAvailableWidth; }
+            set
+            {
+                ItemContainer.FitOversizeItemIntoAvailableWidth = value;
+                if (this.DesignMode)
+                    RecalcLayout();
+            }
+        }
+
+
+        /// <summary>
+        /// Gets or sets the item alignment when container is in horizontal layout. Default value is Left.
+        /// </summary>
+        [Browsable(true), DefaultValue(eHorizontalItemsAlignment.Left), Category("Layout"), Description("Indicates item alignment when container is in horizontal layout."), DevCoBrowsable(true)]
+        public eHorizontalItemsAlignment HorizontalItemAlignment
+        {
+            get { return ItemContainer.HorizontalItemAlignment; }
+            set
+            {
+                ItemContainer.HorizontalItemAlignment = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether items in horizontal layout are wrapped into the new line when they cannot fit allotted container size. Default value is false.
+        /// </summary>
+        [Browsable(true), DefaultValue(false), Category("Layout"), Description("Indicates whether items in horizontal layout are wrapped into the new line when they cannot fit allotted container size.")]
+        public virtual bool MultiLine
+        {
+            get { return ItemContainer.MultiLine; }
+            set
+            {
+                ItemContainer.MultiLine = value;
+            }
+        }
+
+        /// <summary>
+        /// Returns collection of items on a bar.
+        /// </summary>
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content), Browsable(false)]
+        public SubItemsCollection Items
+        {
+            get
+            {
+                return m_ItemContainer.SubItems;
+            }
+        }
+
+        /// <summary>
+        /// Indicates whether block elements inside of container when aligned center or right will reserve the space to the left. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Indicates whether block elements inside of container (affects span or div for example) when aligned center or right will reserve the space to the left.")]
+        public bool ReserveLeftSpace
+        {
+            get { return ItemContainer.ReserveLeftSpace; }
+            set { ItemContainer.ReserveLeftSpace = value; }
+        }
+        #endregion
+
+        #region Binding and Templating Support
+        /// <summary>
+        /// Gets or sets the index specifying the currently selected item.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), Description("Gets or sets the index specifying the currently selected item.")]
+        public override int SelectedIndex
+        {
+            get
+            {
+                return _SelectedIndex;
+            }
+            set
+            {
+                if (value != _SelectedIndex)
+                {
+                    if (value == -1)
+                    {
+                        _SelectedIndex = -1;
+                        SetItemSelection(this.SelectedItem, false);
+                    }
+                    else
+                    {
+                        BaseItem item = null;
+                        if (_SelectedIndex >= this.Items.Count)
+                        {
+                            _SelectedIndex = -1;
+                            return;
+                        }
+                        if (_SelectedIndex > -1)
+                            item = this.Items[_SelectedIndex];
+                        SetItemSelection(this.SelectedItem, false);
+                        SetItemSelection(item, true);
+                        _SelectedIndex = value;
+                    }
+                    OnSelectedIndexChanged(EventArgs.Empty);
+                }
+            }
+        }
+
+        protected override void OnButtonCheckedChanged(ButtonItem item, EventArgs e)
+        {
+            if (item.Checked)
+            {
+                _SelectedIndex = this.Items.IndexOf(item);
+                OnSelectedIndexChanged(e);
+            }
+            base.OnButtonCheckedChanged(item, e);
+        }
+
+        /// <summary>
+        /// Adds new item to the ItemPanel based on specified ItemTemplate and sets its Text property.
+        /// </summary>
+        /// <param name="text">Text to assign to the item.</param>
+        /// <returns>reference to newly created item</returns>
+        public BaseItem AddItem(string text)
+        {
+            BaseItem template = GetItemTemplate();
+            if (template == null)
+                throw new NullReferenceException("ItemTemplate property not set.");
+            BaseItem item = template.Copy();
+            item.Text = text;
+            this.Items.Add(item);
+
+            return item;
+        }
+
+        /// <summary>
+        /// Gets the list of ButtonItem or CheckBoxItem controls that have their Checked property set to true.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public System.Collections.Generic.List<BaseItem> SelectedItems
+        {
+            get
+            {
+                System.Collections.Generic.List<BaseItem> items = new System.Collections.Generic.List<BaseItem>();
+                SubItemsCollection itemsCollection = this.Items;
+                GetSelectedItems(items, itemsCollection);
+                return items;
+            }
+        }
+
+        private static void GetSelectedItems(System.Collections.Generic.List<BaseItem> items, SubItemsCollection itemsCollection)
+        {
+            foreach (BaseItem item in itemsCollection)
+            {
+                if (item is ItemContainer)
+                {
+                    GetSelectedItems(items, item.SubItems);
+                    continue;
+                }
+                ButtonItem button = item as ButtonItem;
+                if (button != null && button.Checked)
+                    items.Add(button);
+                else
+                {
+                    CheckBoxItem cb = item as CheckBoxItem;
+                    if (cb != null && cb.Checked)
+                        items.Add(cb);
+                    else if (item is DevComponents.DotNetBar.Metro.MetroTileItem && ((DevComponents.DotNetBar.Metro.MetroTileItem)item).Checked)
+                        items.Add(item);
+
+                }
+            }
+        }
+        /// <summary>
+        /// Gets or sets ButtonItem or CheckBoxItem item that have their Checked property set to true.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public BaseItem SelectedItem
+        {
+            get
+            {
+                int i = this.SelectedIndex;
+                if (i == -1) return null;
+                return this.Items[i];
+            }
+            set
+            {
+                SetItemSelection(this.SelectedItem, false);
+                SetItemSelection(value, true);
+                if (value != null)
+                    _SelectedIndex = this.Items.IndexOf(value);
+                else
+                    _SelectedIndex = -1;
+            }
+        }
+        private bool SetItemSelection(BaseItem item, bool isSelected)
+        {
+            if (item == null) return false;
+            bool isSet = true;
+            if (item is CheckBoxItem)
+                ((CheckBoxItem)item).Checked = isSelected;
+            else if (item is ButtonItem)
+                ((ButtonItem)item).Checked = isSelected;
+            else if (item is DevComponents.DotNetBar.Metro.MetroTileItem)
+                ((DevComponents.DotNetBar.Metro.MetroTileItem)item).Checked = isSelected;
+            else
+                isSet = false;
+
+            return isSet;
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Ribbon/ItemPanel.ico b/PROMS/DotNetBar Source Code/Ribbon/ItemPanel.ico
new file mode 100644
index 00000000..4ed9c940
Binary files /dev/null and b/PROMS/DotNetBar Source Code/Ribbon/ItemPanel.ico differ
diff --git a/PROMS/DotNetBar Source Code/Ribbon/ItemPanelBase.cs b/PROMS/DotNetBar Source Code/Ribbon/ItemPanelBase.cs
new file mode 100644
index 00000000..c781c233
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Ribbon/ItemPanelBase.cs	
@@ -0,0 +1,1311 @@
+using System;
+using System.Text;
+using System.Windows.Forms;
+using System.ComponentModel;
+using System.Drawing;
+using System.Runtime.InteropServices;
+using System.Collections.Generic;
+using System.Collections;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represents generic base control for items container control.
+    /// </summary>
+    [ToolboxItem(false), System.Runtime.InteropServices.ComVisible(false)]
+    public class ItemPanelBase : ItemControl, IScrollableItemControl, IBindingSupport
+    {
+        #region Private Variables
+        protected ItemContainer m_ItemContainer = null;
+        private bool m_EnableDragDrop = false;
+        private Point m_MouseDownPoint = Point.Empty;
+        private Touch.TouchHandler _TouchHandler = null;
+        #endregion
+
+        #region Constructor
+        public ItemPanelBase()
+        {
+            m_ItemContainer = new ItemContainer();
+            m_ItemContainer.GlobalItem = false;
+            m_ItemContainer.ContainerControl = this;
+            m_ItemContainer.Stretch = false;
+            m_ItemContainer.Displayed = true;
+            m_ItemContainer.Style = eDotNetBarStyle.Office2007;
+            this.ColorScheme.Style = eDotNetBarStyle.Office2007;
+            m_ItemContainer.SetOwner(this);
+            m_ItemContainer.SetSystemContainer(true);
+
+            this.SetBaseItemContainer(m_ItemContainer);
+            m_ItemContainer.Style = eDotNetBarStyle.Office2007;
+
+            this.DragDropSupport = true;
+
+            if (BarFunctions.IsWindows7 && Touch.TouchHandler.IsTouchEnabled)
+            {
+                _TouchHandler = new DevComponents.DotNetBar.Touch.TouchHandler(this, Touch.eTouchHandlerType.Gesture);
+                _TouchHandler.PanBegin += new EventHandler<DevComponents.DotNetBar.Touch.GestureEventArgs>(TouchHandlerPanBegin);
+                _TouchHandler.Pan += new EventHandler<DevComponents.DotNetBar.Touch.GestureEventArgs>(TouchHandlerPan);
+                _TouchHandler.PanEnd += new EventHandler<DevComponents.DotNetBar.Touch.GestureEventArgs>(TouchHandlerPanEnd);
+            }
+        }
+        #endregion
+
+        #region Internal Implementation
+        /// <summary>
+        /// Indicates whether container responds to keyboard presses and changes the active/mouse over item.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether container responds to keyboard presses and changes the active/mouse over item.")]
+        public bool KeyboardNavigationEnabled
+        {
+            get { return m_ItemContainer.KeyboardNavigationEnabled; }
+            set
+            {
+                m_ItemContainer.KeyboardNavigationEnabled = value;
+            }
+        }
+
+        protected virtual ItemContainer ItemContainer
+        {
+            get { return m_ItemContainer; }
+        }
+
+        private eScrollBarAppearance _ScrollBarAppearance = eScrollBarAppearance.Default;
+        /// <summary>
+        /// Gets or sets the scroll-bar visual style.
+        /// </summary>
+        [DefaultValue(eScrollBarAppearance.Default), Category("Appearance"), Description("Gets or sets the scroll-bar visual style.")]
+        public eScrollBarAppearance ScrollBarAppearance
+        {
+            get { return _ScrollBarAppearance; }
+            set
+            {
+                _ScrollBarAppearance = value;
+                OnScrollBarAppearanceChanged();
+            }
+        }
+        private void OnScrollBarAppearanceChanged()
+        {
+            if (_VScrollBar != null) _VScrollBar.Appearance = _ScrollBarAppearance;
+            if (_HScrollBar != null) _HScrollBar.Appearance = _ScrollBarAppearance;
+        }
+
+        /// <summary>
+        /// Invalidates non-client area of the control. This method should be used
+        /// when you need to invalidate non-client area of the control.
+        /// </summary>
+        public void InvalidateNonClient()
+        {
+            if (BarFunctions.IsHandleValid(this))
+                WinApi.RedrawWindow(this.Handle, IntPtr.Zero, IntPtr.Zero, WinApi.RedrawWindowFlags.RDW_FRAME | WinApi.RedrawWindowFlags.RDW_INVALIDATE);
+        }
+
+        /// <summary>
+        /// Gets/Sets the visual style for items and color scheme.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Category("Appearance"), Description("Specifies the visual style of the control."), DefaultValue(eDotNetBarStyle.Office2007)]
+        public eDotNetBarStyle Style
+        {
+            get
+            {
+                return m_ItemContainer.Style;
+            }
+            set
+            {
+                //if(value == eDotNetBarStyle.Office2007)
+                //    m_NCPainter.SkinScrollbars = eScrollBarSkin.Optimized;
+                //else
+                //    m_NCPainter.SkinScrollbars = eScrollBarSkin.None;
+                this.ColorScheme.SwitchStyle(value);
+                m_ItemContainer.Style = value;
+                this.Invalidate();
+                this.RecalcLayout();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets spacing in pixels between items. Default value is 1.
+        /// </summary>
+        [Browsable(true), DefaultValue(1), Category("Layout"), Description("Indicates spacing in pixels between items.")]
+        public virtual int ItemSpacing
+        {
+            get { return m_ItemContainer.ItemSpacing; }
+            set
+            {
+                m_ItemContainer.ItemSpacing = value;
+            }
+        }
+
+        private bool HScrollBarVisible
+        {
+            get
+            {
+                return _HScrollBar != null && _HScrollBar.Visible;
+            }
+        }
+        private bool VScrollBarVisible
+        {
+            get
+            {
+                return _VScrollBar != null && _VScrollBar.Visible;
+            }
+        }
+        /// <summary>
+        /// Scrolls the control so that item is displayed within the visible bounds of the control. AutoScroll must be set to true for this method to work.
+        /// </summary>
+        /// <param name="item">Item to ensure visibility for. Item must belong to this control.</param>
+        public void EnsureVisible(BaseItem item)
+        {
+            if (item.ContainerControl != this || !this.AutoScroll)
+                return;
+
+            Rectangle r = item.DisplayRectangle;
+            Rectangle bounds = this.ClientRectangle;
+            //if (bounds.Width < m_ItemContainer.WidthInternal)
+            //    bounds.Width = m_ItemContainer.WidthInternal;
+            if (HScrollBarVisible)
+                bounds.Height -= SystemInformation.HorizontalScrollBarHeight;
+            if (bounds.Contains(r)) return;
+
+            Point p = this.AutoScrollPosition;
+            if (r.Y < bounds.Y || r.Bottom > bounds.Height)
+            {
+                if (r.Y < 0)
+                    p = new Point(p.X, Math.Abs(this.AutoScrollPosition.Y - r.Y) - 2);
+                else
+                    p = new Point(p.X,
+                        (r.Bottom + (HScrollBarVisible ? SystemInformation.HorizontalScrollBarHeight + 2 : 0)) - (this.AutoScrollPosition.Y + this.ClientRectangle.Height));
+
+            }
+            if ((r.X < bounds.X || r.Right > bounds.Width) && m_ItemContainer.LayoutOrientation == eOrientation.Horizontal)
+            {
+                if (r.X < 0)
+                    p = new Point(Math.Abs(this.AutoScrollPosition.X - r.X) - 2, p.Y);
+                else
+                    p = new Point((r.Right + (VScrollBarVisible ? SystemInformation.VerticalScrollBarWidth + 2 : 0)) - (this.AutoScrollPosition.X + this.ClientRectangle.Width), p.Y);
+            }
+
+            this.InvalidateLayout();
+            this.AutoScrollPosition = p;
+            this.RecalcLayout();
+        }
+
+        protected override Rectangle GetPaintClipRectangle()
+        {
+            Rectangle r = this.ClientRectangle;
+
+            if (this.BackgroundStyle == null)
+                return r;
+
+            r.X += ElementStyleLayout.LeftWhiteSpace(this.BackgroundStyle);
+            r.Width -= ElementStyleLayout.HorizontalStyleWhiteSpace(this.BackgroundStyle);
+            r.Y += ElementStyleLayout.TopWhiteSpace(this.BackgroundStyle);
+            r.Height -= ElementStyleLayout.VerticalStyleWhiteSpace(this.BackgroundStyle);
+            if (_VScrollBar != null) r.Width -= _VScrollBar.Width;
+            if (_HScrollBar != null) r.Height -= _HScrollBar.Height;
+
+            return r;
+        }
+
+        protected override Rectangle GetItemContainerRectangle()
+        {
+            Rectangle r = base.GetItemContainerRectangle();
+            if (this.AutoScroll && this.AutoScrollPosition.Y != 0)
+                r.Y += this.AutoScrollPosition.Y;
+            if (this.AutoScroll && this.AutoScrollPosition.X != 0)
+                r.X += this.AutoScrollPosition.X;
+
+            if (_VScrollBar != null)
+                r.Width -= _VScrollBar.Width;
+            if (_HScrollBar != null)
+                r.Height -= _HScrollBar.Height;
+
+            return r;
+        }
+
+        private void ApplyScrollChange()
+        {
+            if (!this.AutoScroll) return;
+
+            if (m_ItemContainer.NeedRecalcSize)
+            {
+                this.RecalcSize();
+                return;
+            }
+
+            Rectangle r = base.GetItemContainerRectangle();
+            if (this.AutoScrollPosition.Y != 0)
+                r.Y += this.AutoScrollPosition.Y;
+            if (this.AutoScrollPosition.X != 0)
+                r.X += this.AutoScrollPosition.X;
+            r.Height = m_ItemContainer.HeightInternal;
+            r.Width = m_ItemContainer.WidthInternal;
+            m_ItemContainer.Bounds = r;
+        }
+        private bool _MouseClientScrollEnabled = true;
+        /// <summary>
+        /// Indicates whether control can be scrolled when client area is dragged using mouse. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether control can be scrolled when client area is dragged using mouse.")]
+        public bool MouseClientScrollEnabled
+        {
+            get { return _MouseClientScrollEnabled; }
+            set
+            {
+                _MouseClientScrollEnabled = value;
+            }
+        }
+        private bool _MouseScrollDrag = false;
+        protected override void OnMouseDown(MouseEventArgs e)
+        {
+            if (!this.Focused && this.IsSelectable)
+                this.Select();
+
+            m_MouseDownPoint.X = e.X;
+            m_MouseDownPoint.Y = e.Y;
+
+            if (e.Button == MouseButtons.Left && _TouchHandler == null && _MouseClientScrollEnabled)
+            {
+                Rectangle inner = ElementStyleLayout.GetInnerRect(this.BackgroundStyle, this.ClientRectangle);
+                if (_AutoScrollMinSize.Width > inner.Width || _AutoScrollMinSize.Height > inner.Height)
+                {
+                    BaseItem item = HitTest(e.X, e.Y);
+                    if (item == null || item.IsContainer)
+                    {
+                        _MouseScrollDrag = true;
+                        _TouchInnerBounds = ElementStyleLayout.GetInnerRect(this.BackgroundStyle, this.ClientRectangle);
+                        _TouchStartLocation = e.Location;
+                        _TouchStartScrollPosition = _AutoScrollPosition;
+                    }
+                }
+            }
+
+            base.OnMouseDown(e);
+        }
+        protected override void OnMouseUp(MouseEventArgs e)
+        {
+            if (_MouseScrollDrag)
+            {
+                _MouseScrollDrag = false;
+                if (_AutoScrollMinSize.Width > _TouchInnerBounds.Width)
+                {
+                    if (_AutoScrollMinSize.Width - _TouchInnerBounds.Width < -_AutoScrollPosition.X)
+                        this.AutoScrollPosition = new Point(_AutoScrollMinSize.Width - _TouchInnerBounds.Width, 0);
+                    else if (-_AutoScrollPosition.X < 0)
+                        this.AutoScrollPosition = new Point(0, 0);
+                }
+                else if (_AutoScrollMinSize.Height > _TouchInnerBounds.Height)
+                {
+                    if (_AutoScrollMinSize.Height - _TouchInnerBounds.Height < -_AutoScrollPosition.Y)
+                        this.AutoScrollPosition = new Point(0, _AutoScrollMinSize.Height - _TouchInnerBounds.Height);
+                    else if (-_AutoScrollPosition.Y < 0)
+                        this.AutoScrollPosition = new Point(0, 0);
+                }
+                ApplyScrollChange();
+                return;
+            }
+            base.OnMouseUp(e);
+        }
+        private bool IsSelectable
+        {
+            get
+            {
+                return this.GetStyle(ControlStyles.Selectable);
+            }
+        }
+
+        protected override void OnMouseMove(MouseEventArgs e)
+        {
+            if (_MouseScrollDrag)
+            {
+                if (_AutoScrollMinSize.Width > _TouchInnerBounds.Width)
+                {
+                    int offset = (e.Location.X - _TouchStartLocation.X);
+                    int offsetChange = offset + _TouchStartScrollPosition.X;
+
+                    if (Math.Abs(offsetChange) + MaximumReversePageOffset > _AutoScrollMinSize.Width - _TouchInnerBounds.Width)
+                    {
+                        _AutoScrollPosition.X = -(_AutoScrollMinSize.Width + MaximumReversePageOffset - _TouchInnerBounds.Width);
+                    }
+                    else if (offsetChange > MaximumReversePageOffset)
+                    {
+                        _AutoScrollPosition.X = MaximumReversePageOffset;
+                    }
+                    else
+                        _AutoScrollPosition.X = offsetChange;
+                    this.Invalidate();
+                    ApplyScrollChange();
+                    Update();
+                }
+                else if (_AutoScrollMinSize.Height > _TouchInnerBounds.Height)
+                {
+                    int offset = (e.Location.Y - _TouchStartLocation.Y);
+                    int offsetChange = offset + _TouchStartScrollPosition.Y;
+
+                    if (Math.Abs(offsetChange) + MaximumReversePageOffset > _AutoScrollMinSize.Height - _TouchInnerBounds.Height)
+                    {
+                        _AutoScrollPosition.Y = -(_AutoScrollMinSize.Height + MaximumReversePageOffset - _TouchInnerBounds.Height);
+                    }
+                    else if (offsetChange > MaximumReversePageOffset)
+                    {
+                        _AutoScrollPosition.Y = MaximumReversePageOffset;
+                    }
+                    else
+                        _AutoScrollPosition.Y = offsetChange;
+                    this.Invalidate();
+                    ApplyScrollChange();
+                    Update();
+                }
+
+                if (_VScrollBar != null && _VScrollBar.Value != -_AutoScrollPosition.Y)
+                    _VScrollBar.Value = Math.Min(_VScrollBar.Maximum, Math.Max(0, -_AutoScrollPosition.Y));
+                if (_HScrollBar != null && _HScrollBar.Value != -_AutoScrollPosition.X)
+                    _HScrollBar.Value = Math.Min(_HScrollBar.Maximum, Math.Max(0, -_AutoScrollPosition.X));
+                return;
+            }
+
+            base.OnMouseMove(e);
+
+            if (m_EnableDragDrop && !this.DragInProgress && (e.Button == MouseButtons.Left || e.Button == System.Windows.Forms.MouseButtons.Right && _TouchHandler != null))
+            {
+                if (Math.Abs(e.X - m_MouseDownPoint.X) > SystemInformation.DragSize.Width ||
+                    Math.Abs(e.Y - m_MouseDownPoint.Y) > SystemInformation.DragSize.Height)
+                {
+                    BaseItem item = HitTest(e.X, e.Y);
+                    if (item != null && item.CanCustomize)
+                        ((IOwner)this).StartItemDrag(item);
+                }
+            }
+        }
+
+        protected override bool ProcessDialogKey(Keys keyData)
+        {
+            if (this.Focused)
+            {
+                KeyEventArgs e = new KeyEventArgs(keyData);
+                m_ItemContainer.InternalKeyDown(e);
+                if (e.Handled)
+                    return true;
+            }
+            return base.ProcessDialogKey(keyData);
+        }
+
+        protected override void OnMouseWheel(MouseEventArgs e)
+        {
+            if (_VScrollBar != null && _VScrollBar.Visible)
+            {
+                int newValue = _VScrollBar.Value + _VScrollBar.SmallChange * (e.Delta < 0 ? 1 : -1);
+                if (newValue > _VScrollBar.Maximum - _VScrollBar.LargeChange + 1)
+                    newValue = _VScrollBar.Maximum - _VScrollBar.LargeChange + 1;
+                if (newValue < _VScrollBar.Minimum) newValue = _VScrollBar.Minimum;
+                _VScrollBar.DoScroll(newValue, e.Delta < 0 ? ScrollEventType.SmallIncrement : ScrollEventType.SmallDecrement);
+
+            }
+            else if (_HScrollBar != null && _HScrollBar.Visible)
+            {
+                int newValue = _HScrollBar.Value + _HScrollBar.SmallChange * (e.Delta < 0 ? 1 : -1);
+                if (newValue > _HScrollBar.Maximum - _HScrollBar.LargeChange + 1)
+                    newValue = _HScrollBar.Maximum - _HScrollBar.LargeChange + 1;
+                if (newValue < _HScrollBar.Minimum) newValue = _HScrollBar.Minimum;
+                _HScrollBar.DoScroll(newValue, e.Delta < 0 ? ScrollEventType.SmallIncrement : ScrollEventType.SmallDecrement);
+            }
+            base.OnMouseWheel(e);
+        }
+
+        private int _EntryCount = 0;
+        protected override void RecalcSize()
+        {
+            _EntryCount++;
+            try
+            {
+                m_ItemContainer.MinimumSize = new Size(Dpi.DescaleWidth(this.GetItemContainerRectangle().Width), 0);
+                base.RecalcSize();
+
+                if (!this.AutoSize && this.AutoScroll)
+                {
+                    int containerHeight = m_ItemContainer.HeightInternal + ElementStyleLayout.TopWhiteSpace(this.BackgroundStyle, eSpacePart.Padding | eSpacePart.Margin) +
+                        ElementStyleLayout.BottomWhiteSpace(this.BackgroundStyle, eSpacePart.Padding | eSpacePart.Margin);
+                    int containerWidth = m_ItemContainer.WidthInternal + ElementStyleLayout.LeftWhiteSpace(this.BackgroundStyle, eSpacePart.Margin | eSpacePart.Padding) +
+                        ElementStyleLayout.RightWhiteSpace(this.BackgroundStyle, eSpacePart.Padding | eSpacePart.Margin);
+                    if (containerHeight > this.ClientRectangle.Height || containerWidth > this.ClientRectangle.Width)
+                    {
+                        Size areaSize = Size.Empty;
+                        int size = this.ClientRectangle.Height;
+                        if (containerWidth > this.ClientRectangle.Width)
+                            size -= SystemInformation.HorizontalScrollBarHeight;
+                        if (containerHeight > size)
+                            areaSize.Height = containerHeight;
+
+                        size = this.ClientRectangle.Width;
+                        if (containerHeight > this.ClientRectangle.Height)
+                            size -= SystemInformation.VerticalScrollBarWidth;
+                        if (containerWidth > size)
+                            areaSize.Width = containerWidth + SystemInformation.VerticalScrollBarWidth;
+
+                        if (this.BackgroundStyle != null)
+                        {
+                            areaSize.Width += ElementStyleLayout.HorizontalStyleWhiteSpace(this.BackgroundStyle);
+                            areaSize.Height += ElementStyleLayout.VerticalStyleWhiteSpace(this.BackgroundStyle);
+                            if (areaSize.Width > this.ClientRectangle.Width)
+                                areaSize.Height += SystemInformation.HorizontalScrollBarHeight + 1;
+                        }
+
+                        bool verticalScrollBarChange = _VScrollBar == null;
+                        bool horizontalScrollBarChange = _HScrollBar == null;
+                        if (this.AutoScrollMinSize != areaSize)
+                        {
+                            this.Invalidate();
+                            this.AutoScrollMinSize = areaSize;
+                        }
+                        verticalScrollBarChange ^= (_VScrollBar == null);
+                        horizontalScrollBarChange ^= (_HScrollBar == null);
+                        if (_EntryCount < 4 && (verticalScrollBarChange || horizontalScrollBarChange))
+                        {
+                            RecalcSize();
+                        }
+                    }
+                    else if (!this.AutoScrollMinSize.IsEmpty)
+                    {
+                        this.AutoScrollMinSize = Size.Empty;
+                    }
+                }
+            }
+            finally
+            {
+                _EntryCount--;
+            }
+
+            if (_EntryCount == 0)
+            {
+                if (_VScrollBar != null) _VScrollBar.Visible = true;
+                if (_HScrollBar != null) _HScrollBar.Visible = true;
+            }
+        }
+
+        protected override void OnResize(EventArgs e)
+        {
+            base.OnResize(e);
+            UpdateScrollBars();
+            RepositionScrollBars();
+            //m_NCPainter.PaintNonClientAreaBuffered();
+        }
+
+        protected override void OnLayout(LayoutEventArgs e)
+        {
+            base.OnLayout(e);
+            RepositionScrollBars();
+        }
+        #endregion
+
+        #region Scrolling Support
+        private DevComponents.DotNetBar.VScrollBarAdv _VScrollBar = null;
+        private DevComponents.DotNetBar.ScrollBar.HScrollBarAdv _HScrollBar = null;
+        private Control _Thumb = null;
+        /// <summary>
+        /// Gets the reference to internal vertical scroll-bar control if one is created or null if no scrollbar is visible.
+        /// </summary>
+        [Browsable(false)]
+        public DevComponents.DotNetBar.VScrollBarAdv VScrollBar
+        {
+            get
+            {
+                return _VScrollBar;
+            }
+        }
+
+        /// <summary>
+        /// Gets the reference to internal horizontal scroll-bar control if one is created or null if no scrollbar is visible.
+        /// </summary>
+        [Browsable(false)]
+        public DevComponents.DotNetBar.ScrollBar.HScrollBarAdv HScrollBar
+        {
+            get
+            {
+                return _HScrollBar;
+            }
+        }
+
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public new Size AutoScrollMargin
+        {
+            get { return base.AutoScrollMargin; }
+            set { base.AutoScrollMargin = value; }
+        }
+
+        private bool _AutoScroll = false;
+        /// <summary>
+        /// Gets or sets a value indicating whether the control enables the user to scroll to items placed outside of its visible boundaries.
+        /// </summary>
+        [Browsable(true), DefaultValue(false)]
+        public new virtual bool AutoScroll
+        {
+            get { return _AutoScroll; }
+            set
+            {
+                if (_AutoScroll != value)
+                {
+                    _AutoScroll = value;
+                    RecalcLayout();
+                    UpdateScrollBars();
+                }
+            }
+        }
+
+        private Size _AutoScrollMinSize = Size.Empty;
+        /// <summary>
+        /// Gets or sets the minimum size of the auto-scroll. Returns a Size that represents the minimum height and width of the scrolling area in pixels.
+        /// This property is managed internally by control and should not be modified.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public new Size AutoScrollMinSize
+        {
+            get { return _AutoScrollMinSize; }
+            set
+            {
+                _AutoScrollMinSize = value;
+                UpdateScrollBars();
+            }
+        }
+
+        private Point _AutoScrollPosition = Point.Empty;
+        /// <summary>
+        /// Gets or sets the location of the auto-scroll position.
+        /// </summary>
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), Browsable(false), Description("Indicates location of the auto-scroll position.")]
+        public new Point AutoScrollPosition
+        {
+            get
+            {
+                return _AutoScrollPosition;
+            }
+            set
+            {
+                if (value.X > 0) value.X = -value.X;
+                if (value.Y > 0) value.Y = -value.Y;
+                if (_AutoScrollPosition != value)
+                {
+                    _AutoScrollPosition = value;
+                    if (_AutoScroll)
+                    {
+                        if (_VScrollBar != null && _VScrollBar.Value != -_AutoScrollPosition.Y)
+                            _VScrollBar.Value = Math.Min(_VScrollBar.Maximum, -_AutoScrollPosition.Y);
+                        if (_HScrollBar != null && _HScrollBar.Value != -_AutoScrollPosition.X)
+                            _HScrollBar.Value = Math.Min(_HScrollBar.Maximum, -_AutoScrollPosition.X);
+                        //RepositionHostedControls(false);
+                        Invalidate();
+                    }
+                }
+            }
+        }
+
+        private void UpdateScrollBars()
+        {
+            if (!_AutoScroll)
+            {
+                RemoveHScrollBar();
+                RemoveVScrollBar();
+                if (_Thumb != null)
+                {
+                    this.Controls.Remove(_Thumb);
+                    _Thumb.Dispose();
+                    _Thumb = null;
+                }
+                return;
+            }
+
+            Rectangle innerBounds = ElementStyleLayout.GetInnerRect(this.BackgroundStyle, this.ClientRectangle);
+            // Check do we need vertical scrollbar
+            Size scrollSize = _AutoScrollMinSize;
+            if (scrollSize.Height > innerBounds.Height)
+            {
+                if (_VScrollBar == null)
+                {
+                    _VScrollBar = new DevComponents.DotNetBar.VScrollBarAdv();
+                    _VScrollBar.TabStop = false;
+                    _VScrollBar.Appearance = _ScrollBarAppearance;
+                    _VScrollBar.Width = SystemInformation.VerticalScrollBarWidth;
+                    if (_EntryCount > 0) _VScrollBar.Visible = false;
+                    this.Controls.Add(_VScrollBar);
+                    _VScrollBar.BringToFront();
+                    _VScrollBar.Scroll += new ScrollEventHandler(VScrollBarScroll);
+                }
+                if (_VScrollBar.Minimum != 0)
+                    _VScrollBar.Minimum = 0;
+                if (_VScrollBar.LargeChange != innerBounds.Height && innerBounds.Height > 0)
+                    _VScrollBar.LargeChange = innerBounds.Height;
+                _VScrollBar.SmallChange = 22;
+                if (_VScrollBar.Maximum != _AutoScrollMinSize.Height)
+                    _VScrollBar.Maximum = _AutoScrollMinSize.Height;
+                if (_VScrollBar.Value != -_AutoScrollPosition.Y)
+                    _VScrollBar.Value = (Math.Min(_VScrollBar.Maximum, Math.Abs(_AutoScrollPosition.Y)));
+            }
+            else
+                RemoveVScrollBar();
+
+            // Check horizontal scrollbar
+            if (scrollSize.Width > innerBounds.Width)
+            {
+                if (_HScrollBar == null)
+                {
+                    _HScrollBar = new DevComponents.DotNetBar.ScrollBar.HScrollBarAdv();
+                    _HScrollBar.Appearance = _ScrollBarAppearance;
+                    _HScrollBar.TabStop = false;
+                    _HScrollBar.Height = SystemInformation.HorizontalScrollBarHeight;
+                    if (_EntryCount > 0) _HScrollBar.Visible = false;
+                    this.Controls.Add(_HScrollBar);
+                    _HScrollBar.BringToFront();
+                    _HScrollBar.Scroll += new ScrollEventHandler(HScrollBarScroll);
+                }
+                if (_HScrollBar.Minimum != 0)
+                    _HScrollBar.Minimum = 0;
+                if (_HScrollBar.LargeChange != innerBounds.Width && innerBounds.Width > 0)
+                    _HScrollBar.LargeChange = innerBounds.Width;
+                if (_HScrollBar.Maximum != _AutoScrollMinSize.Width)
+                    _HScrollBar.Maximum = _AutoScrollMinSize.Width;
+                if (_HScrollBar.Value != -_AutoScrollPosition.X)
+                    _HScrollBar.Value = (Math.Min(_HScrollBar.Maximum, Math.Abs(_AutoScrollPosition.X)));
+                _HScrollBar.SmallChange = 22;
+            }
+            else
+                RemoveHScrollBar();
+            RepositionScrollBars();
+        }
+
+        private void VScrollBarScroll(object sender, ScrollEventArgs e)
+        {
+            _AutoScrollPosition.Y = -e.NewValue;
+            ApplyScrollChange();
+            this.Invalidate();
+#if FRAMEWORK20
+            OnScroll(e);
+#endif
+        }
+        private void HScrollBarScroll(object sender, ScrollEventArgs e)
+        {
+            _AutoScrollPosition.X = -e.NewValue;
+            ApplyScrollChange();
+            this.Invalidate();
+        }
+
+        private bool _RepositioningScrollbars = false;
+        private void RepositionScrollBars()
+        {
+            if (_RepositioningScrollbars) return;
+
+            _RepositioningScrollbars = true;
+            try
+            {
+                Rectangle innerBounds = ElementStyleLayout.GetInnerRect(this.BackgroundStyle, this.ClientRectangle);
+                if (_HScrollBar != null)
+                {
+                    int width = innerBounds.Width;
+                    if (_VScrollBar != null)
+                        width -= _VScrollBar.Width;
+                    _HScrollBar.Bounds = new Rectangle(innerBounds.X, innerBounds.Bottom - _HScrollBar.Height + 1, width, _HScrollBar.Height);
+                }
+
+                if (_VScrollBar != null)
+                {
+                    int height = innerBounds.Height;
+                    if (_HScrollBar != null)
+                        height -= _HScrollBar.Height;
+                    _VScrollBar.Bounds = new Rectangle(innerBounds.Right - _VScrollBar.Width + 1, innerBounds.Y, _VScrollBar.Width, height);
+                }
+
+                if (_VScrollBar != null && _HScrollBar != null)
+                {
+                    if (_Thumb == null)
+                    {
+                        _Thumb = new Control();
+                        if (this.BackColor.A == 255)
+                            _Thumb.BackColor = this.BackColor;
+                        else
+                            _Thumb.BackColor = Color.White;
+                        if (!this.BackgroundStyle.BackColor.IsEmpty && this.BackgroundStyle.BackColor.A == 255)
+                            _Thumb.BackColor = this.BackgroundStyle.BackColor;
+                        this.Controls.Add(_Thumb);
+                    }
+                    _Thumb.Bounds = new Rectangle(_HScrollBar.Bounds.Right, _VScrollBar.Bounds.Bottom, _VScrollBar.Width+1, _HScrollBar.Height+1);
+                    _Thumb.BringToFront();
+                }
+                else if (_Thumb != null)
+                {
+                    Control thumb = _Thumb;
+                    _Thumb = null;
+                    this.Controls.Remove(thumb);
+                    thumb.Dispose();
+                }
+            }
+            finally
+            {
+                _RepositioningScrollbars = false;
+            }
+        }
+
+        private void RemoveHScrollBar()
+        {
+            if (_HScrollBar != null)
+            {
+                Rectangle r = _HScrollBar.Bounds;
+                this.Controls.Remove(_HScrollBar);
+                _HScrollBar.Dispose();
+                _HScrollBar = null;
+                this.Invalidate(r);
+                _AutoScrollPosition.X = 0;
+                if (m_ItemContainer != null)
+                    m_ItemContainer.NeedRecalcSize = true;
+            }
+        }
+
+        private void RemoveVScrollBar()
+        {
+            if (_VScrollBar != null)
+            {
+                Rectangle r = _VScrollBar.Bounds;
+                this.Controls.Remove(_VScrollBar);
+                _VScrollBar.Dispose();
+                _VScrollBar = null;
+                this.Invalidate(r);
+                _AutoScrollPosition.Y = 0;
+                if (m_ItemContainer != null)
+                    m_ItemContainer.NeedRecalcSize = true;
+            }
+        }
+
+        private bool _SuspendPaint = false;
+        /// <summary>
+        /// Gets or sets whether all painting in control is suspended.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool SuspendPaint
+        {
+            get { return _SuspendPaint; }
+            set
+            {
+                _SuspendPaint = value;
+            }
+        }
+
+        #endregion
+
+        #region Licensing
+#if !TRIAL
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            if (_SuspendPaint) return;
+            base.OnPaint(e);
+            if (NativeFunctions.keyValidated2 != 266)
+                TextDrawing.DrawString(e.Graphics, "Invalid License", this.Font, Color.FromArgb(180, Color.Red), this.ClientRectangle, eTextFormat.Bottom | eTextFormat.HorizontalCenter);
+        }
+
+        private string m_LicenseKey = "";
+        [Browsable(false), DefaultValue("")]
+        public string LicenseKey
+        {
+            get { return m_LicenseKey; }
+            set
+            {
+                if (NativeFunctions.ValidateLicenseKey(value))
+                    return;
+                m_LicenseKey = (!NativeFunctions.CheckLicenseKey(value) ? "9dsjkhds7" : value);
+            }
+        }
+#else
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            if (NativeFunctions.ColorExpAlt() || !NativeFunctions.CheckedThrough)
+		    {
+			    e.Graphics.Clear(SystemColors.Control);
+                return;
+            }
+            if (_SuspendPaint) return;
+            base.OnPaint(e);
+        }
+#endif
+        #endregion
+
+        #region Binding and Templating Support
+        protected int _SelectedIndex = -1;
+        /// <summary>
+        /// Gets or sets the index specifying the currently selected item.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), Description("Gets or sets the index specifying the currently selected item.")]
+        public virtual int SelectedIndex
+        {
+            get
+            {
+                return _SelectedIndex;
+            }
+            set
+            {
+                _SelectedIndex = value;
+            }
+        }
+        /// <summary>
+        /// Returns collection of items on a bar for binding support.
+        /// </summary>
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), Browsable(false)]
+        IList IBindingSupport.ItemsCollection
+        {
+            get
+            {
+                return GetItemsCollection();
+            }
+        }
+
+        protected virtual IList GetItemsCollection()
+        {
+            return m_ItemContainer.SubItems;
+        }
+
+        private BaseItem _ItemTemplate = null;
+        /// <summary>
+        /// Gets or sets the item template that is repeated for each data-row when using data binding.
+        /// </summary>
+        [Browsable(true), DefaultValue(null), Editor("DevComponents.DotNetBar.Design.ItemSelectorTypeEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor))]
+        public BaseItem ItemTemplate
+        {
+            get { return _ItemTemplate; }
+            set
+            {
+                _ItemTemplate = value; OnItemTemplateChanged();
+            }
+        }
+
+        private void OnItemTemplateChanged()
+        {
+            if (_ItemTemplate != null) _ItemTemplate.GlobalItem = false;
+            if (_BindingGenerator != null)
+                _BindingGenerator.VisualTemplate = GetItemTemplate();
+        }
+        protected virtual BaseItem GetItemTemplate()
+        {
+            if (_ItemTemplate == null)
+                return GetDefaultItemTemplate();
+            return _ItemTemplate;
+        }
+
+        /// <summary>
+        /// Gets the collection of the binding applied to ItemTemplate visual when using data-binding.
+        /// </summary>
+        [Browsable(true), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public List<BindingDef> ItemTemplateBindings
+        {
+            get
+            {
+                EnsureBindingGenerator();
+                return _BindingGenerator.Bindings;
+            }
+        }
+
+        protected virtual BaseItem GetDefaultItemTemplate()
+        {
+            ButtonItem button = new ButtonItem();
+            button.Shape = new RoundRectangleShapeDescriptor();
+            button.OptionGroup = "items";
+            button.GlobalItem = false;
+            button.ColorTable = eButtonColor.Flat;
+            return button;
+        }
+        #endregion
+
+        #region IScrollableItemControl Members
+        /// <summary>
+        /// Indicates that item has been selected via keyboard.
+        /// </summary>
+        /// <param name="item">Reference to item being selected</param>
+        void IScrollableItemControl.KeyboardItemSelected(BaseItem item)
+        {
+            OnKeyboardItemSelected(item);
+        }
+
+        /// <summary>
+        /// Called when an item should be selected as result of the keyboard action.
+        /// </summary>
+        /// <param name="item">Item that is being selected.</param>
+        protected virtual void OnKeyboardItemSelected(BaseItem item)
+        {
+            if (item != null)
+                EnsureVisible(item);
+        }
+        #endregion
+
+        #region Misc Properties
+        /// <summary>
+        /// Gets or sets whether external ButtonItem object is accepted in drag and drop operation. UseNativeDragDrop must be set to true in order for this property to be effective.
+        /// </summary>
+        [Browsable(true), DefaultValue(false), Category("Behavior"), Description("Gets or sets whether external ButtonItem object is accepted in drag and drop operation.")]
+        public override bool AllowExternalDrop
+        {
+            get { return base.AllowExternalDrop; }
+            set { base.AllowExternalDrop = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether native .NET Drag and Drop is used by control to perform drag and drop operations. AllowDrop must be set to true to allow drop of the items on control.
+        /// </summary>
+        [Browsable(true), DefaultValue(false), Category("Behavior"), Description("Specifies whether native .NET Drag and Drop is used by control to perform drag and drop operations.")]
+        public override bool UseNativeDragDrop
+        {
+            get { return base.UseNativeDragDrop; }
+            set { base.UseNativeDragDrop = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether automatic drag &amp; drop support is enabled. Default value is false.
+        /// </summary>
+        [Browsable(true), DefaultValue(false), Category("Behavior"), Description("Specifies whether automatic drag & drop support is enabled.")]
+        public virtual bool EnableDragDrop
+        {
+            get { return m_EnableDragDrop; }
+            set { m_EnableDragDrop = value; }
+        }
+
+        protected override Size DefaultSize
+        {
+            get
+            {
+                return new Size(200, 200);
+            }
+        }
+        #endregion
+
+        #region Data-binding
+        private ItemVisualGenerator _BindingGenerator = null;
+        /// <summary>
+        /// Gets or sets the data source for the ComboTree. Expected is an object that implements the IList or IListSource interfaces, 
+        /// such as a DataSet or an Array. The default is null.
+        /// </summary>
+        [AttributeProvider(typeof(IListSource)), Description("Indicates data source for the ComboTree."), Category("Data"), DefaultValue(null), RefreshProperties(RefreshProperties.Repaint)]
+        public object DataSource
+        {
+            get
+            {
+                if (_BindingGenerator == null || _BindingGenerator.IsCustomCollection) return null;
+                return _BindingGenerator.DataSource;
+            }
+            set
+            {
+                OnDataSourceChanged(value);
+            }
+        }
+
+        protected virtual void OnDataSourceChanged(object newDataSource)
+        {
+            if (newDataSource == null && _BindingGenerator == null) return;
+            EnsureBindingGenerator();
+            if (_BindingGenerator.DataSource != newDataSource)
+            {
+                _BindingGenerator.DataSource = newDataSource;
+                OnDataSourceChanged(EventArgs.Empty);
+            }
+        }
+        protected virtual ItemVisualGenerator ItemGenerator
+        {
+            get { return _BindingGenerator; }
+            set { _BindingGenerator = value; }
+        }
+        protected virtual void EnsureBindingGenerator()
+        {
+            if (_BindingGenerator == null)
+            {
+                _BindingGenerator = new ItemVisualGenerator(this);
+                _BindingGenerator.VisualTemplate = GetItemTemplate();
+            }
+        }
+        /// <summary>
+        /// Occurs when the DataSource changes.
+        /// </summary>
+        [Description("Occurs when the DataSource changes.")]
+        public event EventHandler DataSourceChanged;
+        /// <summary>
+        /// Raises the DataSourceChanged event.
+        /// </summary>
+        /// <param name="e">An EventArgs that contains the event data. </param>
+        protected virtual void OnDataSourceChanged(EventArgs e)
+        {
+            EventHandler handler = DataSourceChanged;
+            if (handler != null)
+            {
+                handler(this, e);
+            }
+        }
+
+
+        /// <summary>
+        /// When overridden in a derived class, resynchronizes the item data with the contents of the data source.
+        /// </summary>
+        public virtual void RefreshItems()
+        {
+            if (_BindingGenerator != null)
+            {
+                _BindingGenerator.RefreshItems();
+            }
+        }
+
+        void IBindingSupport.InvokeDataNodeCreated(DataItemVisualEventArgs e)
+        {
+            OnDataNodeCreated(e);
+        }
+
+        /// <summary>
+        /// Occurs when a item for an data-bound object item has been created and provides you with opportunity to modify the created item.
+        /// </summary>
+        [Description("Occurs when a item for an data-bound object item has been created and provides you with opportunity to modify the created item")]
+        public event DataItemVisualEventHandler DataItemVisualCreated;
+        /// <summary>
+        /// Raises the DataNodeCreated event.
+        /// </summary>
+        /// <param name="dataNodeEventArgs">Provides event arguments.</param>
+        protected virtual void OnDataNodeCreated(DataItemVisualEventArgs dataNodeEventArgs)
+        {
+            if (DataItemVisualCreated != null) DataItemVisualCreated(this, dataNodeEventArgs);
+        }
+
+        private bool _AllowSelection = true;
+        bool IBindingSupport.AllowSelection
+        {
+            get { return _AllowSelection; }
+            set { _AllowSelection = value; }
+        }
+
+
+        private CurrencyManager _DataManager = null;
+        protected CurrencyManager DataManager
+        {
+            get
+            {
+                return _DataManager;
+            }
+        }
+
+        /// <summary>
+        /// Occurs when value of SelectedIndex property has changed.
+        /// </summary>
+        [Description("Occurs when value of SelectedIndex property has changed.")]
+        public event EventHandler SelectedIndexChanged;
+        /// <summary>
+        /// Raises the SelectedIndexChanged event.
+        /// </summary>
+        /// <param name="e">Event arguments.</param>
+        protected virtual void OnSelectedIndexChanged(EventArgs e)
+        {
+            EventHandler handler = SelectedIndexChanged;
+            if (handler != null)
+            {
+                handler(this, e);
+            }
+        }
+        #endregion
+
+        #region Touch Handling
+        private bool _TouchEnabled = true;
+        /// <summary>
+        /// Indicates whether touch support for scrolling is enabled.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether touch support for scrolling is enabled.")]
+        public bool TouchEnabled
+        {
+            get { return _TouchEnabled; }
+            set
+            {
+                if (value != _TouchEnabled)
+                {
+                    bool oldValue = _TouchEnabled;
+                    _TouchEnabled = value;
+                    OnTouchEnabledChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when TouchEnabled property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnTouchEnabledChanged(bool oldValue, bool newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("TouchEnabled"));
+        }
+        private int TriggerPageChangeOffset
+        {
+            get
+            {
+                return 32;
+            }
+        }
+        private int MaximumReversePageOffset
+        {
+            get
+            {
+                return Math.Min(32, this.Width / 6);
+            }
+        }
+        private bool _TouchDrag = false;
+        private Point _TouchStartLocation = Point.Empty;
+        private Point _TouchStartScrollPosition = Point.Empty;
+        private Rectangle _TouchInnerBounds = Rectangle.Empty;
+        private void TouchHandlerPanBegin(object sender, DevComponents.DotNetBar.Touch.GestureEventArgs e)
+        {
+            Rectangle inner = ElementStyleLayout.GetInnerRect(this.BackgroundStyle, this.ClientRectangle);
+            if (_TouchEnabled && ((m_ItemContainer.LayoutOrientation == eOrientation.Horizontal && _AutoScrollMinSize.Width > inner.Width) ||
+                (m_ItemContainer.LayoutOrientation == eOrientation.Vertical && _AutoScrollMinSize.Height > inner.Height)))
+            {
+                _TouchInnerBounds = inner;
+                _TouchStartLocation = e.Location;
+                _TouchStartScrollPosition = _AutoScrollPosition;
+                _TouchDrag = true;
+                e.Handled = true;
+            }
+        }
+
+        private void TouchHandlerPanEnd(object sender, DevComponents.DotNetBar.Touch.GestureEventArgs e)
+        {
+            if (_TouchDrag)
+            {
+                EndTouchPan();
+                e.Handled = true;
+            }
+        }
+
+        private void EndTouchPan()
+        {
+            _TouchDrag = false;
+            if (m_ItemContainer.LayoutOrientation == eOrientation.Horizontal)
+            {
+                if (_AutoScrollMinSize.Width - _TouchInnerBounds.Width < -_AutoScrollPosition.X)
+                    this.AutoScrollPosition = new Point(_AutoScrollMinSize.Width - _TouchInnerBounds.Width, 0);
+                else if (-_AutoScrollPosition.X < 0)
+                    this.AutoScrollPosition = new Point(0, 0);
+            }
+            else
+            {
+                if (_AutoScrollMinSize.Height - _TouchInnerBounds.Height < -_AutoScrollPosition.Y)
+                    this.AutoScrollPosition = new Point(0, _AutoScrollMinSize.Height - _TouchInnerBounds.Height);
+                else if (-_AutoScrollPosition.Y < 0)
+                    this.AutoScrollPosition = new Point(0, 0);
+            }
+            ApplyScrollChange();
+
+        }
+
+        private void TouchHandlerPan(object sender, DevComponents.DotNetBar.Touch.GestureEventArgs e)
+        {
+            if (_TouchDrag)
+            {
+                if (m_ItemContainer.LayoutOrientation == eOrientation.Horizontal)
+                {
+                    int offset = (e.Location.X - _TouchStartLocation.X);
+                    int offsetChange = offset + _TouchStartScrollPosition.X;
+
+                    bool overflow = false;
+                    if (Math.Abs(offsetChange) + MaximumReversePageOffset > _AutoScrollMinSize.Width - _TouchInnerBounds.Width)
+                    {
+                        _AutoScrollPosition.X = -(_AutoScrollMinSize.Width + MaximumReversePageOffset - _TouchInnerBounds.Width);
+                        overflow = true;
+                    }
+                    else if (offsetChange > MaximumReversePageOffset)
+                    {
+                        _AutoScrollPosition.X = MaximumReversePageOffset;
+                        overflow = true;
+                    }
+                    else
+                        _AutoScrollPosition.X = offsetChange;
+                    this.Invalidate();
+                    ApplyScrollChange();
+                    Update();
+                    if (overflow && e.IsInertia) EndTouchPan();
+
+                }
+                else
+                {
+                    int offset = (e.Location.Y - _TouchStartLocation.Y);
+                    int offsetChange = offset + _TouchStartScrollPosition.Y;
+                    //Console.WriteLine("offset={0}, offsetChange={1}", offset, offsetChange);
+                    bool overflow = false;
+                    if (offsetChange < 0 && Math.Abs(offsetChange) + MaximumReversePageOffset > _AutoScrollMinSize.Height - _TouchInnerBounds.Height)
+                    {
+                        _AutoScrollPosition.Y = -(_AutoScrollMinSize.Height + MaximumReversePageOffset - _TouchInnerBounds.Height);
+                        overflow = true;
+                    }
+                    else if (offsetChange > MaximumReversePageOffset)
+                    {
+                        _AutoScrollPosition.Y = MaximumReversePageOffset;
+                        overflow = true;
+                    }
+                    else
+                        _AutoScrollPosition.Y = offsetChange;
+                    
+                    this.Invalidate();
+                    ApplyScrollChange();
+                    Update();
+                    if (overflow && e.IsInertia) EndTouchPan();
+                }
+
+                if (_VScrollBar != null && _VScrollBar.Value != -_AutoScrollPosition.Y)
+                    _VScrollBar.Value = Math.Min(_VScrollBar.Maximum, Math.Max(0, -_AutoScrollPosition.Y));
+                if (_HScrollBar != null && _HScrollBar.Value != -_AutoScrollPosition.X)
+                    _HScrollBar.Value = Math.Min(_HScrollBar.Maximum, Math.Max(0, -_AutoScrollPosition.X));
+                e.Handled = true;
+            }
+        }
+        #endregion
+    }
+
+    /// <summary>
+    /// Provides information about the binding for the item.
+    /// </summary>
+    public class ItemBindingData
+    {
+        /// <summary>
+        /// Initializes a new instance of the ItemBindingInfo class.
+        /// </summary>
+        /// <param name="dataItem"></param>
+        /// <param name="bindingIndex"></param>
+        public ItemBindingData(object dataItem, int bindingIndex)
+        {
+            DataItem = dataItem;
+            _BindingIndex = bindingIndex;
+        }
+
+        private WeakReference _DataItem;
+        /// <summary>
+        /// Gets or sets the data row item is bound to.
+        /// </summary>
+        public object DataItem
+        {
+            get
+            {
+                if (_DataItem == null) return null;
+                if (_DataItem.IsAlive)
+                    return _DataItem.Target;
+                return null;
+            }
+            set
+            {
+                if (value != null)
+                    _DataItem = new WeakReference(value);
+                else
+                    _DataItem = null;
+            }
+        }
+
+        private int _BindingIndex;
+        /// <summary>
+        /// Gets or sets the data item index.
+        /// </summary>
+        public int BindingIndex
+        {
+            get { return _BindingIndex; }
+            set { _BindingIndex = value; }
+        }
+
+        private object _Tag;
+        /// <summary>
+        /// Gets or sets the additional data connected to this binding information.
+        /// </summary>
+        public object Tag
+        {
+            get { return _Tag; }
+            set { _Tag = value; }
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Ribbon/KeyTipsCanvasControl.cs b/PROMS/DotNetBar Source Code/Ribbon/KeyTipsCanvasControl.cs
new file mode 100644
index 00000000..68e49370
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Ribbon/KeyTipsCanvasControl.cs	
@@ -0,0 +1,111 @@
+using System;
+using System.Text;
+using System.Windows.Forms;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represents canvas for KeyTips
+    /// </summary>
+    internal class KeyTipsCanvasControl : Control
+    {
+        #region Private variables
+        private Control m_ParentControl=null;
+        private IKeyTipsRenderer m_Renderer=null;
+        #endregion
+
+        #region Internal Implementation
+        public KeyTipsCanvasControl(IKeyTipsRenderer renderer)
+        {
+            this.SetStyle(ControlStyles.UserPaint, true);
+            this.SetStyle(ControlStyles.AllPaintingInWmPaint, true);
+            this.SetStyle(ControlStyles.Opaque, true);
+            this.SetStyle(ControlStyles.ResizeRedraw, true);
+            this.SetStyle(ControlStyles.SupportsTransparentBackColor, true);
+            this.SetStyle(ControlStyles.ContainerControl, false);
+            this.SetStyle(ControlStyles.Selectable, false);
+            this.BackColor = Color.Transparent;
+            m_Renderer = renderer;
+
+        }
+        protected override void Dispose(bool disposing)
+        {
+            if (m_ParentControl != null)
+            {
+                m_ParentControl.Resize -= new EventHandler(ParentControlResize);
+                m_ParentControl = null;
+            }
+
+            base.Dispose(disposing);
+        }
+
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            if (m_Renderer != null)
+            {
+                m_Renderer.PaintKeyTips(e.Graphics);
+            }
+            base.OnPaint(e);
+        }
+
+        protected override void OnParentChanged(EventArgs e)
+        {
+            if (m_ParentControl != null)
+                m_ParentControl.Resize -= new EventHandler(ParentControlResize);
+            
+            m_ParentControl = this.Parent;
+            
+            if(m_ParentControl!=null)
+                m_ParentControl.Resize += new EventHandler(ParentControlResize);
+
+            base.OnParentChanged(e);
+        }
+
+        protected override void OnPaintBackground(PaintEventArgs e)
+        {
+        }
+
+        void ParentControlResize(object sender, EventArgs e)
+        {
+            if (m_ParentControl == null)
+                return;
+
+            this.Bounds = new Rectangle(0, 0, m_ParentControl.Width, m_ParentControl.Height);
+        }
+
+        protected override CreateParams CreateParams
+        {
+            get
+            {
+                const int WS_EX_TRANSPARENT = 0x020;
+                CreateParams p = base.CreateParams;
+                p.ExStyle = (p.ExStyle | WS_EX_TRANSPARENT);
+                return p;
+            }
+        }
+
+        protected override void WndProc(ref Message m)
+        {
+            if (m.Msg == (int)WinApi.WindowsMessages.WM_NCHITTEST)
+            {
+                m.Result = new IntPtr(-1);
+                return;
+            }
+            base.WndProc(ref m);
+        }
+        #endregion
+    }
+
+    internal interface IKeyTipsRenderer
+    {
+        void PaintKeyTips(Graphics g);
+    }
+
+    public interface IKeyTipsControl
+    {
+        bool ProcessMnemonicEx(char charCode);
+        bool ShowKeyTips { get;set;}
+        string KeyTipsKeysStack { get; set; }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Ribbon/KeyTipsPainter.cs b/PROMS/DotNetBar Source Code/Ribbon/KeyTipsPainter.cs
new file mode 100644
index 00000000..5b32cc40
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Ribbon/KeyTipsPainter.cs	
@@ -0,0 +1,13 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar
+{
+    internal abstract class KeyTipsPainter
+    {
+        public abstract void PaintKeyTips(KeyTipsRendererEventArgs e);
+
+        public static Size KeyTipsPadding = new Size(6, 4);
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Ribbon/KeyTipsRendererEventArgs.cs b/PROMS/DotNetBar Source Code/Ribbon/KeyTipsRendererEventArgs.cs
new file mode 100644
index 00000000..54ec3199
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Ribbon/KeyTipsRendererEventArgs.cs	
@@ -0,0 +1,46 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represents data for key tips rendering.
+    /// </summary>
+    public class KeyTipsRendererEventArgs:EventArgs
+    {
+        /// <summary>
+        /// Gets or sets the graphics object used for rendering.
+        /// </summary>
+        public Graphics Graphics=null;
+        /// <summary>
+        /// Gets or sets key tip bounds.
+        /// </summary>
+        public Rectangle Bounds = Rectangle.Empty;
+        /// <summary>
+        /// Gets or sets the text of key tip to be rendered.
+        /// </summary>
+        public string KeyTip = "";
+        /// <summary>
+        /// Gets or sets the font key tip should be rendered with.
+        /// </summary>
+        public Font Font = null;
+        /// <summary>
+        /// Reference object for which Key Tip is rendered. For example this could be reference to an instance of ButtonItem or BaseItem as well
+        /// as reference to System.Windows.Forms.Control object. Always test for type before accessing this reference.
+        /// </summary>
+        public object ReferenceObject = null;
+
+        /// <summary>
+        /// Creates new instance of the object and initializes it with default values.
+        /// </summary>
+        public KeyTipsRendererEventArgs(Graphics g, Rectangle bounds, string keyTip, Font font, object referenceObject)
+        {
+            this.Graphics = g;
+            this.Bounds = bounds;
+            this.KeyTip = keyTip;
+            this.Font = font;
+            this.ReferenceObject = referenceObject;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Ribbon/MdiSystemItemPainter.cs b/PROMS/DotNetBar Source Code/Ribbon/MdiSystemItemPainter.cs
new file mode 100644
index 00000000..fab1c9aa
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Ribbon/MdiSystemItemPainter.cs	
@@ -0,0 +1,17 @@
+using System;
+using System.Text;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represents painter for the MdiSystemItem.
+    /// </summary>
+    internal class MdiSystemItemPainter
+    {
+        /// <summary>
+        /// Paints MdiSystemItem.
+        /// </summary>
+        /// <param name="e">Provides arguments for the operation.</param>
+        public virtual void Paint(MdiSystemItemRendererEventArgs e) { }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Ribbon/MessageBoxDialog.cs b/PROMS/DotNetBar Source Code/Ribbon/MessageBoxDialog.cs
new file mode 100644
index 00000000..e8ca05f3
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Ribbon/MessageBoxDialog.cs	
@@ -0,0 +1,728 @@
+using System;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+using System.Runtime.InteropServices;
+using System.Globalization;
+
+namespace DevComponents.DotNetBar
+{
+    internal class MessageBoxDialog : OfficeForm
+    {
+        private ButtonX Button1;
+        private ButtonX Button2;
+        private ButtonX Button3;
+        private PictureBox PictureBox1;
+        private PanelEx TextPanel;
+        private PanelEx ButtonBackgroundPanel;
+        private eDotNetBarStyle m_Style = eDotNetBarStyle.Office2007;
+        private bool m_Button1Visible = true;
+        private bool m_Button2Visible = true;
+        private bool m_Button3Visible = true;
+        private MessageBoxButtons m_Buttons = MessageBoxButtons.OK;
+
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        public MessageBoxDialog()
+        {
+            InitializeComponent();
+            TextPanel.DisableSelection();
+        }
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                this.Button1.Click -= new System.EventHandler(this.Button1_Click);
+                this.Button2.Click -= new System.EventHandler(this.Button2_Click);
+                this.Button3.Click -= new System.EventHandler(this.Button3_Click);
+                this.TextPanel.MarkupLinkClick -= new MarkupLinkClickEventHandler(TextPanelMarkupLinkClick);
+            }
+
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form 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.Button1 = new DevComponents.DotNetBar.ButtonX();
+            this.Button2 = new DevComponents.DotNetBar.ButtonX();
+            this.Button3 = new DevComponents.DotNetBar.ButtonX();
+            this.PictureBox1 = new System.Windows.Forms.PictureBox();
+            this.TextPanel = new DevComponents.DotNetBar.PanelEx();
+            this.ButtonBackgroundPanel = new DevComponents.DotNetBar.PanelEx();
+            this.SuspendLayout();
+            // 
+            // Button1
+            // 
+            this.Button1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+            this.Button1.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+            this.Button1.Location = new System.Drawing.Point(26, 85);
+            this.Button1.Name = "Button1";
+            this.Button1.Size = new System.Drawing.Size(77, 24);
+            this.Button1.TabIndex = 0;
+            this.Button1.Text = "&OK";
+            this.Button1.Click += new System.EventHandler(this.Button1_Click);
+            // 
+            // Button2
+            // 
+            this.Button2.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+            this.Button2.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+            this.Button2.Location = new System.Drawing.Point(109, 85);
+            this.Button2.Name = "Button2";
+            this.Button2.Size = new System.Drawing.Size(77, 24);
+            this.Button2.TabIndex = 1;
+            this.Button2.Text = "&Cancel";
+            this.Button2.Click += new System.EventHandler(this.Button2_Click);
+            // 
+            // Button3
+            // 
+            this.Button3.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+            this.Button3.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+            this.Button3.Location = new System.Drawing.Point(192, 85);
+            this.Button3.Name = "Button3";
+            this.Button3.Size = new System.Drawing.Size(77, 24);
+            this.Button3.TabIndex = 2;
+            this.Button3.Text = "&Ignore";
+            this.Button3.Click += new System.EventHandler(this.Button3_Click);
+            // 
+            // PictureBox1
+            // 
+            this.PictureBox1.BackColor = System.Drawing.Color.Transparent;
+            this.PictureBox1.Location = new System.Drawing.Point(10, 10);
+            this.PictureBox1.Name = "PictureBox1";
+            this.PictureBox1.Size = new System.Drawing.Size(34, 34);
+            this.PictureBox1.TabIndex = 3;
+            this.PictureBox1.TabStop = false;
+            // 
+            // TextPanel
+            // 
+            this.TextPanel.AntiAlias = false;
+            this.TextPanel.CanvasColor = System.Drawing.SystemColors.Control;
+            this.TextPanel.Location = new System.Drawing.Point(53, 10);
+            this.TextPanel.Name = "TextPanel";
+            this.TextPanel.Size = new System.Drawing.Size(225, 53);
+            this.TextPanel.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+            this.TextPanel.Style.BorderWidth = 0;
+            this.TextPanel.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText;
+            this.TextPanel.Style.GradientAngle = 90;
+            this.TextPanel.Style.LineAlignment = System.Drawing.StringAlignment.Near;
+            this.TextPanel.TabIndex = 4;
+            this.TextPanel.TabStop = false;
+            this.TextPanel.Style.WordWrap = true;
+            this.TextPanel.MarkupLinkClick += new MarkupLinkClickEventHandler(TextPanelMarkupLinkClick);
+
+            // 
+            // ButtonBackgroundPanel
+            // 
+            this.ButtonBackgroundPanel.AntiAlias = false;
+            this.ButtonBackgroundPanel.CanvasColor = System.Drawing.SystemColors.Control;
+            this.ButtonBackgroundPanel.Location = new System.Drawing.Point(53, 10);
+            this.ButtonBackgroundPanel.Name = "ButtonBackgroundPanel";
+            this.ButtonBackgroundPanel.Size = new System.Drawing.Size(225, 42);
+            this.ButtonBackgroundPanel.Dock = DockStyle.Bottom;
+            this.ButtonBackgroundPanel.ColorSchemeStyle = eDotNetBarStyle.StyleManagerControlled;
+            this.ButtonBackgroundPanel.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+            this.ButtonBackgroundPanel.Style.BorderWidth = 1;
+            this.ButtonBackgroundPanel.Style.BorderSide = eBorderSide.Top;
+            this.ButtonBackgroundPanel.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText;
+            this.ButtonBackgroundPanel.Style.BackColor1.ColorSchemePart = eColorSchemePart.BarBackground;
+            this.ButtonBackgroundPanel.Style.BorderColor.ColorSchemePart = eColorSchemePart.BarDockedBorder;
+            this.ButtonBackgroundPanel.Style.GradientAngle = 90;
+            this.ButtonBackgroundPanel.Style.LineAlignment = System.Drawing.StringAlignment.Near;
+            this.ButtonBackgroundPanel.TabIndex = 4;
+            this.ButtonBackgroundPanel.TabStop = false;
+            // 
+            // MessageBoxDialog
+            // 
+#if FRAMEWORK20
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+            this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); // for design in 96 DPI
+#endif
+            this.ClientSize = new System.Drawing.Size(290, 121);
+            this.ShowInTaskbar = false;
+            this.Controls.Add(this.TextPanel);
+            this.Controls.Add(this.PictureBox1);
+            this.Controls.Add(this.Button3);
+            this.Controls.Add(this.Button2);
+            this.Controls.Add(this.Button1);
+            this.Controls.Add(this.ButtonBackgroundPanel);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.Name = "MessageBoxDialog";
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+        private void TextPanelMarkupLinkClick(object sender, MarkupLinkClickEventArgs e)
+        {
+            MessageBoxEx.InvokeMarkupLinkClick(sender, e);
+        }
+
+        /// <summary>
+        /// Gets or sets whether Text supports and renders text markup. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Gets or sets whether Text supports and renders text markup.")]
+        public bool TextMarkupEnabled
+        {
+            get { return TextPanel.TextMarkupEnabled; }
+            set
+            {
+                TextPanel.TextMarkupEnabled = value;
+            }
+        }
+
+        public DialogResult Show(IWin32Window owner, string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, MessageBoxDefaultButton defaultButton, bool topMost)
+        {
+            m_Buttons = buttons;
+            this.Text = caption;
+            TextPanel.Style.UseMnemonic = false;
+            TextPanel.Text = text;
+            if (icon != MessageBoxIcon.None)
+            {
+                Image iconImage= GetSystemImage(icon);
+                if (iconImage != null && iconImage.Width > PictureBox1.Width) PictureBox1.Width = iconImage.Width;
+                if (iconImage!=null && iconImage.Height > PictureBox1.Height) PictureBox1.Height = iconImage.Height;
+                PictureBox1.Image = iconImage;
+            }
+            else
+            {
+                PictureBox1.Image = null;
+                PictureBox1.Visible = false;
+            }
+
+            if (!BarFunctions.IsOffice2007Style(m_Style))
+                this.EnableCustomStyle = false;
+
+            if (buttons == MessageBoxButtons.OKCancel || buttons == MessageBoxButtons.RetryCancel || buttons == MessageBoxButtons.YesNo)
+            {
+                Button3.Visible = false;
+                m_Button3Visible = false;
+            }
+            else if (buttons == MessageBoxButtons.OK)
+            {
+                Button2.Visible = false;
+                Button3.Visible = false;
+                m_Button2Visible = false;
+                m_Button3Visible = false;
+            }
+
+            // Set Cancel and Accept buttons
+            if (buttons == MessageBoxButtons.OK)
+            {
+                this.AcceptButton = Button1;
+                this.CancelButton = Button1;
+            }
+            else if (buttons == MessageBoxButtons.OKCancel || buttons == MessageBoxButtons.RetryCancel || buttons == MessageBoxButtons.YesNo)
+            {
+                this.AcceptButton = Button1;
+                this.CancelButton = Button2;
+            }
+            else if (buttons == MessageBoxButtons.YesNoCancel)
+            {
+                this.AcceptButton = Button1;
+                this.CancelButton = Button3;
+            }
+
+            SetButtonText(buttons);
+
+            if (defaultButton == MessageBoxDefaultButton.Button1 && m_Button1Visible)
+            {
+                // Must invoke delayed or due to WinForms bug, if ShowDialog is called from Validated event for control will never lose focus
+                BarUtilities.InvokeDelayed(new MethodInvoker(delegate { Button1.Select(); }));
+                this.AcceptButton = Button1;
+            }
+            else if (defaultButton == MessageBoxDefaultButton.Button2 && m_Button2Visible)
+            {
+                this.AcceptButton = Button2;
+                // Must invoke delayed or due to WinForms bug, if ShowDialog is called from Validated event for control will never lose focus
+                BarUtilities.InvokeDelayed(new MethodInvoker(delegate { Button2.Select(); }));
+            }
+            else if (defaultButton == MessageBoxDefaultButton.Button3 && m_Button3Visible)
+            {
+                this.AcceptButton = Button3;
+                // Must invoke delayed or due to WinForms bug, if ShowDialog is called from Validated event for control will never lose focus
+                BarUtilities.InvokeDelayed(new MethodInvoker(delegate { Button3.Select(); }));
+            }
+
+            ResizeDialog();
+
+            SetupColors();
+
+#if FRAMEWORK20
+            if (icon == MessageBoxIcon.Question)
+                System.Media.SystemSounds.Question.Play(); // NativeFunctions.sndPlaySound("SystemQuestion", NativeFunctions.SND_ASYNC | NativeFunctions.SND_NODEFAULT);
+            else if (icon == MessageBoxIcon.Asterisk)
+                System.Media.SystemSounds.Asterisk.Play(); // NativeFunctions.sndPlaySound("SystemAsterisk", NativeFunctions.SND_ASYNC | NativeFunctions.SND_NODEFAULT);
+            else
+                System.Media.SystemSounds.Exclamation.Play(); // NativeFunctions.sndPlaySound("SystemExclamation", NativeFunctions.SND_ASYNC | NativeFunctions.SND_NODEFAULT);
+#else
+            if(icon == MessageBoxIcon.Question)
+                NativeFunctions.sndPlaySound("SystemQuestion", NativeFunctions.SND_ASYNC | NativeFunctions.SND_NODEFAULT);
+            else if(icon == MessageBoxIcon.Asterisk)
+                NativeFunctions.sndPlaySound("SystemAsterisk", NativeFunctions.SND_ASYNC | NativeFunctions.SND_NODEFAULT);
+            else
+                NativeFunctions.sndPlaySound("SystemExclamation", NativeFunctions.SND_ASYNC | NativeFunctions.SND_NODEFAULT);
+#endif
+            if (buttons == MessageBoxButtons.AbortRetryIgnore || buttons == MessageBoxButtons.YesNo)
+            {
+                this.CloseEnabled = false;
+            }
+
+            if(this.TopMost!=topMost)
+                this.TopMost = topMost;
+            return this.ShowDialog(owner);
+        }
+
+        public eDotNetBarStyle Style
+        {
+            get
+            {
+                return m_Style;
+            }
+            set
+            {
+            	m_Style = value;
+            }
+        }
+
+        private void SetupColors()
+        {
+            if (!_MessageTextColor.IsEmpty)
+            {
+                this.TextPanel.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.Custom;
+                this.TextPanel.Style.ForeColor.Color = _MessageTextColor;
+            }
+            else if (BarFunctions.IsOffice2007Style(m_Style) && Rendering.GlobalManager.Renderer is Rendering.Office2007Renderer)
+            {
+                if (WinApi.IsGlassEnabled)
+                {
+                    this.TextPanel.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.Custom;
+                    this.TextPanel.Style.ForeColor.Color = SystemColors.ControlText;
+                }
+                else
+                {
+                    Rendering.Office2007ColorTable ct = ((Rendering.Office2007Renderer)Rendering.GlobalManager.Renderer).ColorTable;
+                    this.TextPanel.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.Custom;
+                    this.TextPanel.Style.ForeColor.Color = ct.Form.TextColor;
+                }
+            }
+            
+            if (this.EnableGlass && WinApi.IsGlassEnabled)
+            {
+                Button1.ThemeAware = true;
+                Button2.ThemeAware = true;
+                Button3.ThemeAware = true;
+                this.ButtonBackgroundPanel.Style.BackColor1.Color = SystemColors.ControlLight;
+                this.ButtonBackgroundPanel.Style.BorderColor.Color = SystemColors.ControlDark;
+            }
+        }
+
+        private bool _ButtonsDividerVisible = true;
+        /// <summary>
+        /// Gets or sets whether divider panel that divides message box buttons and text content is visible. Default value is true.
+        /// </summary>
+        public bool ButtonsDividerVisible
+        {
+            get { return _ButtonsDividerVisible; }
+            set
+            {
+                if (_ButtonsDividerVisible != value)
+                {
+                    _ButtonsDividerVisible = value;
+                    this.ButtonBackgroundPanel.Visible = _ButtonsDividerVisible;
+                }
+            }
+        }
+        
+
+        private Color _MessageTextColor = Color.Empty;
+        public Color MessageTextColor
+        {
+            get { return _MessageTextColor; }
+            set { _MessageTextColor = value; }
+        }
+
+        private void SetButtonText(MessageBoxButtons buttons)
+        {
+            if (buttons == MessageBoxButtons.AbortRetryIgnore)
+            {
+                Button1.Text = GetString(SystemStrings.Abort);
+                Button2.Text = GetString(SystemStrings.Retry);
+                Button3.Text = GetString(SystemStrings.Ignore);
+            }
+            else if (buttons == MessageBoxButtons.OK)
+            {
+                Button1.Text = GetString(SystemStrings.OK);
+            }
+            else if (buttons == MessageBoxButtons.OKCancel)
+            {
+                Button1.Text = GetString(SystemStrings.OK);
+                Button2.Text = GetString(SystemStrings.Cancel);
+            }
+            else if (buttons == MessageBoxButtons.RetryCancel)
+            {
+                Button1.Text = GetString(SystemStrings.Retry);
+                Button2.Text = GetString(SystemStrings.Cancel);
+            }
+            else if (buttons == MessageBoxButtons.YesNo)
+            {
+                Button1.Text = GetString(SystemStrings.Yes);
+                Button2.Text = GetString(SystemStrings.No);
+            }
+            else if (buttons == MessageBoxButtons.YesNoCancel)
+            {
+                Button1.Text = GetString(SystemStrings.Yes);
+                Button2.Text = GetString(SystemStrings.No);
+                Button3.Text = GetString(SystemStrings.Cancel);
+            }
+        }
+
+        internal static Image GetSystemImage(MessageBoxIcon icon)
+        {
+            Icon ico = null;
+            if (icon == MessageBoxIcon.Asterisk)
+                ico = SystemIcons.Asterisk;
+            else if (icon == MessageBoxIcon.Error || icon == MessageBoxIcon.Stop)
+                ico = SystemIcons.Error;
+            else if (icon == MessageBoxIcon.Exclamation)
+                ico = SystemIcons.Exclamation;
+            else if (icon == MessageBoxIcon.Hand)
+                ico = SystemIcons.Hand;
+            else if (icon == MessageBoxIcon.Information)
+                ico = SystemIcons.Information;
+            else if (icon == MessageBoxIcon.Question)
+                ico = SystemIcons.Question;
+            else if (icon == MessageBoxIcon.Warning)
+                ico = SystemIcons.Warning;
+
+            Bitmap bmp = new Bitmap(ico.Width, ico.Height);
+            bmp.MakeTransparent();
+            using (Graphics g = Graphics.FromImage(bmp))
+            {
+                if (System.Environment.Version.Build <= 3705 && System.Environment.Version.Revision == 288 && System.Environment.Version.Major == 1 && System.Environment.Version.Minor == 0)
+                {
+                    IntPtr hdc = g.GetHdc();
+                    try
+                    {
+                        NativeFunctions.DrawIconEx(hdc, 0, 0, ico.Handle, ico.Width, ico.Height, 0, IntPtr.Zero, 3);
+                    }
+                    finally
+                    {
+                        g.ReleaseHdc(hdc);
+                    }
+                }
+                else if (ico.Handle != IntPtr.Zero)
+                {
+                    try
+                    {
+                        g.DrawIcon(ico, 0,0);
+                    }
+                    catch { }
+                }
+            }
+            return bmp;
+        }
+
+        private void ResizeDialog()
+        {
+            Size size = Size.Empty;
+            int buttonSpacing = Dpi.Width6;
+            int buttonMargin = Dpi.Width(40);
+            int textMargin = Dpi.Width10;
+            int minTextSize = Dpi.Width(110);
+
+            if (PictureBox1.Image!=null)
+            {
+                TextPanel.Left = PictureBox1.Bounds.Right + Dpi.Width16;
+            }
+            else
+                TextPanel.Left = PictureBox1.Left;
+
+            Rectangle workingArea = Screen.PrimaryScreen.WorkingArea;
+            TextPanel.Size = TextPanel.GetAutoSize(workingArea.Width);
+            
+            if (TextPanel.Size.Width > (double)workingArea.Width * .75d)
+                TextPanel.Size = TextPanel.GetAutoSize((int)((double)workingArea.Width * .75d));
+            else if (TextPanel.Size.Width < minTextSize)
+                TextPanel.Width = minTextSize;
+            
+            // Measure the caption size
+            if (this.Text.Length > 0)
+            {
+                Size captionSize = Size.Empty;
+                Font font = this.Font;
+                using (Graphics g = BarFunctions.CreateGraphics(this))
+                {
+                    size = TextDrawing.MeasureString(g, this.Text, font, 0, eTextFormat.NoPrefix);
+                }
+                size.Width += 2;
+                size.Height += 2;
+                if (size.Width > TextPanel.Width)
+                    TextPanel.Width = size.Width;
+            }
+
+            int y = Math.Max(TextPanel.Bounds.Bottom, PictureBox1.Bounds.Bottom);
+            y += Dpi.Height(19);
+
+            Button1.Top = y;
+            Button2.Top = y;
+            Button3.Top = y;
+
+            int buttonWidth = Button1.Width +
+                (m_Button2Visible ? Button2.Width + buttonSpacing : 0) +
+                (m_Button3Visible ? Button3.Width + buttonSpacing : 0);
+
+            int buttonArea = buttonWidth + buttonMargin * 2;
+            if (buttonWidth < TextPanel.Bounds.Right + textMargin)
+                buttonArea = TextPanel.Bounds.Right + textMargin;
+            else
+            {
+                TextPanel.Width += buttonArea - TextPanel.Bounds.Right - textMargin;
+            }
+           
+            // Arrange buttons inside of the available area
+            int x = (buttonArea - buttonWidth) / 2;
+            Button1.Left = x;
+            x += Button1.Width + buttonSpacing;
+
+            if (m_Button2Visible)
+            {
+                Button2.Left = x;
+                x += Button2.Width + buttonSpacing;
+            }
+
+            if (m_Button3Visible)
+            {
+                Button3.Left = x;
+                x += Button3.Width + buttonSpacing;
+            }
+            
+            NonClientInfo frameSize = GetNonClientInfo();
+
+            size = new Size(TextPanel.Bounds.Right + textMargin + frameSize.LeftBorder + frameSize.RightBorder,
+                Button1.Bounds.Bottom + textMargin + frameSize.CaptionTotalHeight + frameSize.BottomBorder);
+
+            this.Size = size;
+        }
+
+        private void Button1_Click(object sender, EventArgs e)
+        {
+            DialogResult r = DialogResult.OK;
+            if (m_Buttons == MessageBoxButtons.OK || m_Buttons == MessageBoxButtons.OKCancel)
+                r = DialogResult.OK;
+            else if (m_Buttons == MessageBoxButtons.YesNo || m_Buttons == MessageBoxButtons.YesNoCancel)
+                r = DialogResult.Yes;
+            else if (m_Buttons == MessageBoxButtons.AbortRetryIgnore)
+                r = DialogResult.Abort;
+            else if (m_Buttons == MessageBoxButtons.RetryCancel)
+                r = DialogResult.Retry;
+
+            this.DialogResult = r;
+        }
+
+        private void Button2_Click(object sender, EventArgs e)
+        {
+            DialogResult r = DialogResult.Cancel;
+            if (m_Buttons == MessageBoxButtons.OKCancel)
+                r = DialogResult.Cancel;
+            else if (m_Buttons == MessageBoxButtons.YesNo || m_Buttons == MessageBoxButtons.YesNoCancel)
+                r = DialogResult.No;
+            else if (m_Buttons == MessageBoxButtons.AbortRetryIgnore)
+                r = DialogResult.Retry;
+            else if (m_Buttons == MessageBoxButtons.RetryCancel)
+                r = DialogResult.Cancel;
+
+            this.DialogResult = r;
+        }
+
+        private void Button3_Click(object sender, EventArgs e)
+        {
+            DialogResult r = DialogResult.Cancel;
+            if (m_Buttons == MessageBoxButtons.AbortRetryIgnore)
+                r = DialogResult.Ignore;
+            else if (m_Buttons == MessageBoxButtons.YesNoCancel)
+                r = DialogResult.Cancel;
+
+            this.DialogResult = r;
+        }
+
+        protected override void WndProc(ref Message m)
+        {
+            int wParamInt = WinApi.ToInt(m.WParam);
+            if (m.Msg == NativeFunctions.WM_SYSCOMMAND && (wParamInt == NativeFunctions.SC_MAXIMIZE || wParamInt == NativeFunctions.SC_MINIMIZE))
+                return;
+            base.WndProc(ref m);
+        }
+
+        protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
+        {
+            if ((keyData & Keys.C) == Keys.C && (keyData & Keys.Control) == Keys.Control)
+            {
+                string s = "------------------------------" + "\r\n" + this.Text + "\r\n" + "------------------------------" +
+                    "\r\n" + TextPanel.Text +
+                    "\r\n" + "------------------------------" + "\r\n";
+                if (Button1.Visible)
+                    s += "[" + Button1.Text.Replace("&", "") + "]  ";
+                if (Button2.Visible)
+                    s += "[" + Button2.Text.Replace("&", "") + "]  ";
+                if (Button3.Visible)
+                    s += "[" + Button3.Text.Replace("&", "") + "]";
+                s += "\r\n------------------------------";
+#if (FRAMEWORK20)
+                Clipboard.SetText(s);
+#else
+                Clipboard.SetDataObject(s);
+#endif
+            }
+            return base.ProcessCmdKey(ref msg, keyData);
+        }
+
+        /// <summary>
+        /// Gets or sets the anti-alias setting for text-pane.
+        /// </summary>
+        public bool AntiAlias
+        {
+            get { return TextPanel.AntiAlias; }
+            set
+            {
+                TextPanel.AntiAlias = value;
+            }
+        }
+        
+
+        #region System Strings
+        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
+        private static extern string MB_GetString(int i);
+
+        private static string GetLocalizedText(SystemStrings sysString)
+        {
+            string key = "";
+            string result = null;
+            if (sysString == SystemStrings.Abort)
+            {
+                result = "&Abort";
+                key = LocalizationKeys.MessageBoxAbortButton;
+            }
+            else if (sysString == SystemStrings.Cancel)
+            {
+                result = "&Cancel";
+                key = LocalizationKeys.MessageBoxCancelButton;
+            }
+            else if (sysString == SystemStrings.Close)
+            {
+                result = "C&lose";
+                key = LocalizationKeys.MessageBoxCloseButton;
+            }
+            else if (sysString == SystemStrings.Continue)
+            {
+                result = "Co&ntinue";
+                key = LocalizationKeys.MessageBoxContinueButton;
+            }
+            else if (sysString == SystemStrings.Help)
+            {
+                result = "&Help";
+                key = LocalizationKeys.MessageBoxHelpButton;
+            }
+            else if (sysString == SystemStrings.Ignore)
+            {
+                result = "&Ignore";
+                key = LocalizationKeys.MessageBoxIgnoreButton;
+            }
+            else if (sysString == SystemStrings.No)
+            {
+                result = "&No";
+                key = LocalizationKeys.MessageBoxNoButton;
+            }
+            else if (sysString == SystemStrings.OK)
+            {
+                result = "&OK";
+                key = LocalizationKeys.MessageBoxOkButton;
+            }
+            else if (sysString == SystemStrings.Retry)
+            {
+                result = "&Retry";
+                key = LocalizationKeys.MessageBoxRetryButton;
+            }
+            else if (sysString == SystemStrings.TryAgain)
+            {
+                result = "&Try Again";
+                key = LocalizationKeys.MessageBoxTryAgainButton;
+            }
+            else if (sysString == SystemStrings.Yes)
+            {
+                result = "&Yes";
+                key = LocalizationKeys.MessageBoxYesButton;
+            }
+
+            if (key != null)
+            {
+                result = LocalizationManager.GetLocalizedString(key, result);
+            }
+
+            return result;
+        }
+        private static string GetString(SystemStrings sysString)
+        {
+            string result = "";
+
+            if (CultureInfo.CurrentUICulture.TwoLetterISOLanguageName.ToLower() != "en" && MessageBoxEx.UseSystemLocalizedString)
+            {
+                try
+                {
+                    result = MB_GetString((int)sysString);
+                }
+                catch
+                {
+                    result = "";
+                }
+            }
+
+            if (result == "")
+            {
+                result = GetLocalizedText(sysString);
+            }
+
+            return result;
+        }
+
+        /// <summary>
+        /// Enumeration of available common system strings.
+        /// </summary>
+        private enum SystemStrings
+        {
+            OK = 0,
+            Cancel = 1,
+            Abort = 2,
+            Retry = 3,
+            Ignore = 4,
+            Yes = 5,
+            No = 6,
+            Close = 7,
+            Help = 8,
+            TryAgain = 9,
+            Continue = 10
+        }
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/Ribbon/MessageBoxEx.cs b/PROMS/DotNetBar Source Code/Ribbon/MessageBoxEx.cs
new file mode 100644
index 00000000..175dbe3c
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Ribbon/MessageBoxEx.cs	
@@ -0,0 +1,314 @@
+using System;
+using System.Text;
+using System.Drawing;
+using System.Windows.Forms;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represents the class that provides MessageBox like functionality with the styled Office 2007 dialog and text markup support.
+    /// </summary>
+    public class MessageBoxEx
+    {
+        /// <summary>
+        /// Occurs when text markup link on Message Box is clicked. Markup links can be created using "a" tag, for example:
+        /// <a name="MyLink">Markup link</a>
+        /// </summary>
+        public static event MarkupLinkClickEventHandler MarkupLinkClick;
+
+        internal static void InvokeMarkupLinkClick(object sender, MarkupLinkClickEventArgs e)
+        {
+            MarkupLinkClickEventHandler h = MarkupLinkClick;
+            if (h != null)
+                h(sender, e);
+        }
+
+        /// <summary>
+        /// Displays a message box with specified text.
+        /// </summary>
+        /// <param name="text">The text to display in the message box.</param>
+        /// <returns>One of the DialogResult values.</returns>
+        public static DialogResult Show(string text)
+        {
+            return ShowInternal(null, text, "", MessageBoxButtons.OK, MessageBoxIcon.None, MessageBoxDefaultButton.Button1, false);
+        }
+
+        /// <summary>
+        /// Displays a message box in front of the specified object and with the specified text.
+        /// </summary>
+        /// <param name="owner">The IWin32Window the message box will display in front of. </param>
+        /// <param name="text">The text to display in the message box. </param>
+        /// <returns>One of the DialogResult values.</returns>
+        public static DialogResult Show(IWin32Window owner, string text)
+        {
+            return ShowInternal(owner, text, "", MessageBoxButtons.OK, MessageBoxIcon.None, MessageBoxDefaultButton.Button1, GetTopMost(owner));
+        }
+
+        /// <summary>
+        /// Displays a message box with specified text and caption.
+        /// </summary>
+        /// <param name="text">The text to display in the message box.</param>
+        /// <param name="caption">The text to display in the title bar of the message box.</param>
+        /// <returns>One of the DialogResult values.</returns>
+        public static DialogResult Show(string text, string caption)
+        {
+            return ShowInternal(null, text, caption, MessageBoxButtons.OK, MessageBoxIcon.None, MessageBoxDefaultButton.Button1, false);
+        }
+
+        /// <summary>
+        /// Displays a message box with specified text and caption.
+        /// </summary>
+        /// <param name="owner">The IWin32Window the message box will display in front of.</param>
+        /// <param name="text">The text to display in the message box.</param>
+        /// <param name="caption">The text to display in the title bar of the message box.</param>
+        /// <returns>One of the DialogResult values.</returns>
+        public static DialogResult Show(IWin32Window owner, string text, string caption)
+        {
+            return ShowInternal(owner, text, caption, MessageBoxButtons.OK, MessageBoxIcon.None, MessageBoxDefaultButton.Button1, GetTopMost(owner));
+        }
+
+        /// <summary>
+        /// Displays a message box with specified text, caption, and buttons.
+        /// </summary>
+        /// <param name="text">The text to display in the message box. </param>
+        /// <param name="caption">The text to display in the title bar of the message box.</param>
+        /// <param name="buttons">One of the MessageBoxButtons values that specifies which buttons to display in the message box. </param>
+        /// <returns>One of the DialogResult values.</returns>
+        public static DialogResult Show(string text, string caption, MessageBoxButtons buttons)
+        {
+            return ShowInternal(null, text, caption, buttons, MessageBoxIcon.None, MessageBoxDefaultButton.Button1, false);
+        }
+
+        /// <summary>
+        /// Displays a message box with specified text, caption, and buttons.
+        /// </summary>
+        /// <param name="owner">The IWin32Window the message box will display in front of.</param>
+        /// <param name="text">The text to display in the message box. </param>
+        /// <param name="caption">The text to display in the title bar of the message box.</param>
+        /// <param name="buttons">One of the MessageBoxButtons values that specifies which buttons to display in the message box. </param>
+        /// <returns>One of the DialogResult values.</returns>
+        public static DialogResult Show(IWin32Window owner, string text, string caption, MessageBoxButtons buttons)
+        {
+            return ShowInternal(owner, text, caption, buttons, MessageBoxIcon.None, MessageBoxDefaultButton.Button1, GetTopMost(owner));
+        }
+
+        /// <summary>
+        /// Displays a message box with specified text, caption, buttons, and icon.
+        /// </summary>
+        /// <param name="text">The text to display in the message box. </param>
+        /// <param name="caption">The text to display in the title bar of the message box.</param>
+        /// <param name="buttons">One of the MessageBoxButtons values that specifies which buttons to display in the message box.</param>
+        /// <param name="icon">One of the MessageBoxIcon values that specifies which icon to display in the message box.</param>
+        /// <returns>One of the DialogResult values.</returns>
+        public static DialogResult Show(string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon)
+        {
+            return ShowInternal(null, text, caption, buttons, icon, MessageBoxDefaultButton.Button1, false);
+        }
+
+        /// <summary>
+        /// Displays a message box with specified text, caption, buttons, and icon.
+        /// </summary>
+        /// <param name="owner">The IWin32Window the message box will display in front of.</param>
+        /// <param name="text">The text to display in the message box. </param>
+        /// <param name="caption">The text to display in the title bar of the message box.</param>
+        /// <param name="buttons">One of the MessageBoxButtons values that specifies which buttons to display in the message box.</param>
+        /// <param name="icon">One of the MessageBoxIcon values that specifies which icon to display in the message box.</param>
+        /// <returns>One of the DialogResult values.</returns>
+        public static DialogResult Show(IWin32Window owner, string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon)
+        {
+            return ShowInternal(owner, text, caption, buttons, icon, MessageBoxDefaultButton.Button1, GetTopMost(owner));
+        }
+
+        /// <summary>
+        /// Displays a message box with the specified text, caption, buttons, icon, and default button.
+        /// </summary>
+        /// <param name="text">The text to display in the message box. </param>
+        /// <param name="caption">The text to display in the title bar of the message box.</param>
+        /// <param name="buttons">One of the MessageBoxButtons values that specifies which buttons to display in the message box.</param>
+        /// <param name="icon">One of the MessageBoxIcon values that specifies which icon to display in the message box.</param>
+        /// <param name="defaultButton">One of the MessageBoxDefaultButton values that specifies the default button for the message box. </param>
+        /// <returns>One of the DialogResult values.</returns>
+        public static DialogResult Show(string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, MessageBoxDefaultButton defaultButton)
+        {
+            return ShowInternal(null, text, caption, buttons, icon, defaultButton, false);
+        }
+
+        /// <summary>
+        /// Displays a message box with the specified text, caption, buttons, icon, and default button.
+        /// </summary>
+        /// <param name="owner">The IWin32Window the message box will display in front of.</param>
+        /// <param name="text">The text to display in the message box. </param>
+        /// <param name="caption">The text to display in the title bar of the message box.</param>
+        /// <param name="buttons">One of the MessageBoxButtons values that specifies which buttons to display in the message box.</param>
+        /// <param name="icon">One of the MessageBoxIcon values that specifies which icon to display in the message box.</param>
+        /// <param name="defaultButton">One of the MessageBoxDefaultButton values that specifies the default button for the message box. </param>
+        /// <returns>One of the DialogResult values.</returns>
+        public static DialogResult Show(IWin32Window owner, string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, MessageBoxDefaultButton defaultButton)
+        {
+            return ShowInternal(owner, text, caption, buttons, icon, defaultButton, GetTopMost(owner));
+        }
+
+        /// <summary>
+        /// Displays a message box with the specified text, caption, buttons, icon, and default button.
+        /// </summary>
+        /// <param name="owner">The IWin32Window the message box will display in front of.</param>
+        /// <param name="text">The text to display in the message box. </param>
+        /// <param name="caption">The text to display in the title bar of the message box.</param>
+        /// <param name="buttons">One of the MessageBoxButtons values that specifies which buttons to display in the message box.</param>
+        /// <param name="icon">One of the MessageBoxIcon values that specifies which icon to display in the message box.</param>
+        /// <param name="defaultButton">One of the MessageBoxDefaultButton values that specifies the default button for the message box. </param>
+        /// <param name="topMost">Indicates value for Message Box dialog TopMost property. </param>
+        /// <returns>One of the DialogResult values.</returns>
+        public static DialogResult Show(IWin32Window owner, string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, MessageBoxDefaultButton defaultButton, bool topMost)
+        {
+            return ShowInternal(owner, text, caption, buttons, icon, defaultButton, topMost);
+        }
+
+        private static DialogResult ShowInternal(IWin32Window owner, string text, string caption, MessageBoxButtons buttons, MessageBoxIcon icon, MessageBoxDefaultButton defaultButton, bool topMost)
+        {
+            PopupManager.CloseAllPopups();
+
+            DialogResult r = DialogResult.OK;
+            if (StyleManager.IsMetro(StyleManager.Style))
+            {
+                DevComponents.DotNetBar.Metro.MetroMessageBoxDialog d = new DevComponents.DotNetBar.Metro.MetroMessageBoxDialog();
+                d.AntiAlias = _AntiAlias;
+                if (owner != null)
+                    d.StartPosition = _OwnerStartPosition; //FormStartPosition.CenterParent;
+                else
+                    d.StartPosition = _DefaultStartPosition; // FormStartPosition.CenterScreen;
+                d.MessageTextColor = _MessageBoxTextColor;
+                d.ButtonsDividerVisible = _ButtonsDividerVisible;
+                d.TextMarkupEnabled = _TextMarkupEnabled;
+                r = d.Show(owner, text, caption, buttons, icon, defaultButton, topMost);
+                d.Dispose();
+            }
+            else
+            {
+                MessageBoxDialog d = new MessageBoxDialog();
+                d.EnableGlass = _EnableGlass;
+                d.AntiAlias = _AntiAlias;
+                d.TextMarkupEnabled = _TextMarkupEnabled;
+                if (owner != null)
+                    d.StartPosition = _OwnerStartPosition; //FormStartPosition.CenterParent;
+                else
+                    d.StartPosition = _DefaultStartPosition; // FormStartPosition.CenterScreen;
+                d.MessageTextColor = _MessageBoxTextColor;
+                d.ButtonsDividerVisible = _ButtonsDividerVisible;
+                r = d.Show(owner, text, caption, buttons, icon, defaultButton, topMost);
+                d.Dispose();
+            }
+            return r;
+        }
+
+        private static bool GetTopMost(IWin32Window owner)
+        {
+            if (owner is Form)
+                return ((Form)owner).TopMost;
+            return false;
+        }
+
+        private static bool _UseSystemLocalizedString = false;
+        /// <summary>
+        /// Gets or sets whether MessageBoxEx is using Windows System API function to retrieve the localized strings used by MessageBoxEx. Set this to false
+        /// if you experience issues when using MessageBoxEx under certain conditions.
+        /// </summary>
+        public static bool UseSystemLocalizedString
+        {
+            get
+            {
+                return _UseSystemLocalizedString;
+            }
+            set
+            {
+                _UseSystemLocalizedString = value;
+            }
+        }
+
+        private static bool _EnableGlass = true;
+        /// <summary>
+        /// Gets or sets whether MessageBoxEx form has Windows Vista Glass enabled if running on 
+        /// Windows Vista with Glass enabled. Default value is true.
+        /// </summary>
+        public static bool EnableGlass
+        {
+            get { return _EnableGlass; }
+            set
+            {
+                _EnableGlass = value;
+            }
+        }
+
+        private static bool _AntiAlias = false;
+        /// <summary>
+        /// Gets or sets the anti-alias setting for message box text.
+        /// </summary>
+        public static bool AntiAlias
+        {
+            get { return _AntiAlias; }
+            set
+            {
+                _AntiAlias = value;
+            }
+        }
+
+        private static Color _MessageBoxTextColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets the text color for the message box text. Default value is Color.Empty which indicates that system colors are used.
+        /// </summary>
+        public static Color MessageBoxTextColor
+        {
+            get { return _MessageBoxTextColor; }
+            set
+            {
+                _MessageBoxTextColor = value;
+            }
+        }
+
+        private static bool _ButtonsDividerVisible = true;
+        /// <summary>
+        /// Gets or sets whether divider panel that divides message box buttons and text content is visible. Default value is true.
+        /// </summary>
+        public static bool ButtonsDividerVisible
+        {
+            get { return _ButtonsDividerVisible; }
+            set
+            {
+                _ButtonsDividerVisible = value;
+            }
+        }
+
+        private static FormStartPosition _DefaultStartPosition = FormStartPosition.CenterScreen;
+        /// <summary>
+        /// Gets or sets the message box start position when Owner is not specified. Default value is CenterScreen.
+        /// </summary>
+        public static FormStartPosition DefaultStartPosition
+        {
+            get { return _DefaultStartPosition; }
+            set { _DefaultStartPosition = value; }
+        }
+
+        private static FormStartPosition _OwnerStartPosition = FormStartPosition.CenterParent;
+        /// <summary>
+        /// Gets or sets the message box start position when Owner is specified. Default value is CenterParent.
+        /// </summary>
+        public static FormStartPosition OwnerStartPosition
+        {
+            get { return _OwnerStartPosition; }
+            set { _OwnerStartPosition = value; }
+        }
+
+        private static bool _TextMarkupEnabled = true;
+        /// <summary>
+        /// Gets or sets whether message box text renders text markup. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Gets or sets whether message box text renders text markup.")]
+        public static bool TextMarkupEnabled
+        {
+            get { return _TextMarkupEnabled; }
+            set { _TextMarkupEnabled = value; }
+        }
+        
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Ribbon/Office2003ButtonItemPainter.cs b/PROMS/DotNetBar Source Code/Ribbon/Office2003ButtonItemPainter.cs
new file mode 100644
index 00000000..931fde7f
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Ribbon/Office2003ButtonItemPainter.cs	
@@ -0,0 +1,827 @@
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Drawing.Imaging;
+using System.Drawing.Text;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.Rendering;
+using DevComponents.DotNetBar.Ribbon;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Summary description for Office2003ButtonItemPainter.
+	/// </summary>
+	internal class Office2003ButtonItemPainter:ButtonItemPainter
+    {
+        protected virtual Color GetTextColor(ButtonItem button, ItemPaintArgs pa)
+        {
+            return ButtonItemPainterHelper.GetTextColor(button, pa);
+        }
+        protected virtual Rectangle GetDisplayRectangle(ButtonItem button)
+        {
+            return button.DisplayRectangle;
+        }
+		public override void PaintButton(ButtonItem button, ItemPaintArgs pa)
+        {
+			bool isOnMenu=IsOnMenu(button, pa);
+            if(isOnMenu && button.Parent is ItemContainer)
+                isOnMenu=false;
+			bool bIsOnMenuBar=pa.IsOnMenuBar;
+			bool bThemed=button.IsThemed;
+            Graphics g = pa.Graphics;
+
+            Region oldClip = g.Clip as Region;
+            Rectangle itemRect = GetDisplayRectangle(button);
+
+            try
+            {
+                g.SetClip(itemRect, CombineMode.Intersect);
+
+                if (!pa.IsOnMenu && !bIsOnMenuBar && bThemed)
+                {
+                    if (pa.ContainerControl is ButtonX)
+                        ThemedButtonXPainter.PaintButton(button, pa);
+                    else
+                        ThemedButtonItemPainter.PaintButton(button, pa);
+                    return;
+                }
+
+                Color textColor = GetTextColor(button, pa);
+                CompositeImage image = button.GetImage(textColor);
+                Rectangle imageRect = GetImageRectangle(button, pa, image);
+
+                PaintButtonBackground(button, pa, image);
+
+                Rectangle customizeCheckRect = GetCustomizeMenuCheckRectangle(button, pa);
+                Rectangle checkRect = GetCheckRectangle(button, pa, image);
+                Rectangle mouseOverRect = GetMouseOverRectangle(button, pa, image);
+
+                bool mouseOver = button.IsMouseOver;
+                if (button.Expanded && !isOnMenu)
+                    mouseOver = false;
+                if (isOnMenu && button.Expanded && pa.ContainerControl != null && pa.ContainerControl.Parent != null)
+                {
+                    if (!pa.ContainerControl.Parent.Bounds.Contains(System.Windows.Forms.Control.MousePosition))
+                        mouseOver = true;
+                }
+
+                if (button.HotTrackingStyle != eHotTrackingStyle.None)
+                {
+                    if (mouseOver || button.IsMouseDown && !button.DesignMode)
+                        PaintButtonMouseOver(button, pa, image, mouseOverRect);
+                }
+
+                if (isOnMenu && button.IsOnCustomizeMenu && button.Visible && !button.SystemItem)
+                    PaintCustomizeCheck(button, pa, customizeCheckRect);
+
+                if (button.Checked && !button.IsOnCustomizeMenu && (button.GetEnabled(pa.ContainerControl) || isOnMenu))
+                    PaintButtonCheck(button, pa, image, checkRect);
+
+                if ((image != null || !string.IsNullOrEmpty(button.SymbolRealized)) && button.ButtonStyle != eButtonStyle.TextOnlyAlways)
+                    PaintButtonImage(button, pa, image, imageRect);
+
+                if (!(button is ApplicationButton) || button.EffectiveStyle == eDotNetBarStyle.Office2010 || StyleManager.IsMetro(button.EffectiveStyle))
+                    PaintButtonText(button, pa, textColor, image);
+
+                PaintExpandButton(button, pa);
+
+                if (button.Focused && button.DesignMode)
+                {
+                    Rectangle r = itemRect;
+                    r.Inflate(-1, -1);
+                    DesignTime.DrawDesignTimeSelection(g, r, pa.Colors.ItemDesignTimeBorder);
+                }
+
+                if (image != null)
+                    image.Dispose();
+            }
+            finally
+            {
+                if (oldClip != null)
+                {
+                    g.Clip = oldClip;
+                    oldClip.Dispose();
+                }
+                else
+                    g.ResetClip();
+            }
+		}
+
+        protected virtual bool IsOnMenu(ButtonItem button, ItemPaintArgs pa)
+        {
+            bool isOnMenu = pa.IsOnMenu;
+            if (isOnMenu && button.Parent is ItemContainer)
+                isOnMenu = false;
+            return isOnMenu;
+        }
+
+
+		public override void PaintButtonImage(ButtonItem button, ItemPaintArgs pa, CompositeImage image, Rectangle imagebounds)
+		{
+            bool isOnMenu = IsOnMenu(button, pa);
+            if (imagebounds.Width <= 0 || imagebounds.Height <= 0) return;
+
+            if (!string.IsNullOrEmpty(button.SymbolRealized))
+            {
+                Font font = Symbols.GetFont(button.SymbolSize, button.SymbolSet);
+                Color symbolColor = (button.SymbolColor.IsEmpty || !button.Enabled ? GetTextColor(button, pa) : button.SymbolColor);
+                if (isOnMenu)
+                    TextDrawing.DrawStringLegacy(pa.Graphics, button.SymbolRealized, font, symbolColor, new Rectangle(imagebounds.X + imagebounds.Width / 2, imagebounds.Y, 0, 0), eTextFormat.Default | eTextFormat.HorizontalCenter);
+                else
+                    TextDrawing.DrawStringLegacy(pa.Graphics, button.SymbolRealized, font, symbolColor, new Rectangle(imagebounds.X, imagebounds.Y - ((button.ImagePosition == eImagePosition.Bottom || Dpi.Factor.Width>1 || !pa.IsBackstageTab) ? 0 : 2), 0, 0), eTextFormat.Default);
+                return;
+            }
+            if (button.EnableImageAnimation && button.CanAnimateImage)
+            {
+                if (!button.CurrentlyAnimatingImage)
+                    button.StartImageAnimation(image.Image);
+                ImageAnimator.UpdateFrames();
+            }
+            if (isOnMenu)
+            {
+                image.DrawImage(pa.Graphics, imagebounds);
+            }
+            else if (!button.IsMouseOver && button.HotTrackingStyle == eHotTrackingStyle.Color)
+            {
+                // Draw gray-scale image for this hover style...
+                float[][] array = new float[5][];
+                array[0] = new float[5] { 0.2125f, 0.2125f, 0.2125f, 0, 0 };
+                array[1] = new float[5] { 0.5f, 0.5f, 0.5f, 0, 0 };
+                array[2] = new float[5] { 0.0361f, 0.0361f, 0.0361f, 0, 0 };
+                array[3] = new float[5] { 0, 0, 0, 1, 0 };
+                array[4] = new float[5] { 0.2f, 0.2f, 0.2f, 0, 1 };
+                ColorMatrix grayMatrix = new ColorMatrix(array);
+                ImageAttributes att = new ImageAttributes();
+                att.SetColorMatrix(grayMatrix);
+                image.DrawImage(pa.Graphics, imagebounds, 0, 0, image.ActualWidth, image.ActualHeight, GraphicsUnit.Pixel, att);
+            }
+            else
+            {
+                image.DrawImage(pa.Graphics, imagebounds);
+            }
+		}
+
+        public override Rectangle GetImageRectangle(ButtonItem button, ItemPaintArgs pa, CompositeImage image)
+        {
+            Rectangle imageRect = Rectangle.Empty;
+            bool isOnMenu = IsOnMenu(button, pa);
+
+            // Calculate image position
+            if (image != null || !string.IsNullOrEmpty(button.SymbolRealized))
+            {
+                Size imageSize = button.ImageSize;
+
+                Rectangle displayRect = GetDisplayRectangle(button);
+                if (pa.RightToLeft && isOnMenu)
+                {
+                    imageRect = new Rectangle(displayRect.Right - (button.ImageDrawRect.X + imageSize.Width + 2), button.ImageDrawRect.Y + displayRect.Y, imageSize.Width, imageSize.Height);
+                }
+                else
+                {
+                    if (!isOnMenu && (button.ImagePosition == eImagePosition.Top || button.ImagePosition == eImagePosition.Bottom))
+                        imageRect = new Rectangle(button.ImageDrawRect.X, button.ImageDrawRect.Y, displayRect.Width, button.ImageDrawRect.Height);
+                    else
+                        imageRect = new Rectangle(button.ImageDrawRect.X, button.ImageDrawRect.Y, button.ImageDrawRect.Width, button.ImageDrawRect.Height);
+                    imageRect.Offset(displayRect.Left, displayRect.Top);
+                    if ((button.EffectiveStyle == eDotNetBarStyle.Windows7 || button.EffectiveStyle == eDotNetBarStyle.Office2010 || StyleManager.IsMetro(button.EffectiveStyle)) && (button is ApplicationButton || button is DevComponents.DotNetBar.Metro.MetroAppButton))
+                        imageRect.Offset(14, (imageRect.Height - imageSize.Height) / 2);
+                    else
+                        imageRect.Offset((imageRect.Width - imageSize.Width) / 2, (imageRect.Height - imageSize.Height) / 2);
+
+                    imageRect.Width = imageSize.Width;
+                    imageRect.Height = imageSize.Height;
+                }
+            }
+
+            return imageRect;
+        }
+
+        public override Rectangle GetCheckRectangle(ButtonItem button, ItemPaintArgs pa, CompositeImage image)
+        {
+            Rectangle r = Rectangle.Empty;
+            bool isOnMenu = IsOnMenu(button, pa);
+
+            Rectangle displayRect = GetDisplayRectangle(button);
+            if (isOnMenu)
+            {
+                //r=new Rectangle(button.DisplayRectangle.X+1,button.DisplayRectangle.Y,button.ImageDrawRect.Width-2,button.DisplayRectangle.Height);
+                //r.Inflate(-1,-1);
+                // This modification fixes the bug of the checkbox appearing on the wrong side of the button item in RightToLeft mode, thanks Brian!
+                if (pa.RightToLeft)
+                {
+                    r = new Rectangle(displayRect.Right - button.ImageDrawRect.Width + 1, displayRect.Y, button.ImageDrawRect.Width - 2, displayRect.Height);
+                    r.Inflate(-1, -1);
+                }
+                else
+                {
+                    // LTR also adjusted by one pixel from original alignment to give more logical position.
+                    // TODO: Find out if MS Office 2007 positions like this or like the original. Original might be right.
+                    r = new Rectangle(displayRect.X, displayRect.Y, button.ImageDrawRect.Width - 2, displayRect.Height);
+                    r.Inflate(-1, -1);
+                }
+            }
+            else if (button.HotTrackingStyle == eHotTrackingStyle.Image && image != null)
+            {
+                r = GetImageRectangle(button, pa, image);
+                r.Inflate(2, 2);
+            }
+            else
+                r = displayRect;
+
+            return r;
+        }
+
+        public override Rectangle GetCustomizeMenuCheckRectangle(ButtonItem button, ItemPaintArgs pa)
+        {
+            bool isOnMenu = IsOnMenu(button, pa);
+            Rectangle r = Rectangle.Empty;
+            if (isOnMenu && button.IsOnCustomizeMenu && button.Visible && !button.SystemItem)
+            {
+                Rectangle displayRect = GetDisplayRectangle(button);
+                r = new Rectangle(displayRect.Left, displayRect.Top, displayRect.Height, displayRect.Height);
+                r.Inflate(-1, -1);
+                //System.Diagnostics.Trace.WriteLine("r="+r.ToString()+"  "+button.Text+"  "+button.ImageDrawRect.ToString()+"   "+button.DisplayRectangle.ToString());
+            }
+
+            return r;
+        }
+
+		public override void PaintCustomizeCheck(ButtonItem button, ItemPaintArgs pa, Rectangle r)
+		{
+			Color clr=pa.Colors.ItemCheckedBackground;
+			Graphics g=pa.Graphics;
+
+			if(button.IsMouseOver && !pa.Colors.ItemHotBackground2.IsEmpty)
+			{
+				using(LinearGradientBrush gradient=BarFunctions.CreateLinearGradientBrush(r,pa.Colors.ItemHotBackground,pa.Colors.ItemHotBackground2,pa.Colors.ItemHotBackgroundGradientAngle))
+				{
+					g.FillRectangle(gradient,r);
+				}
+			}
+			else
+			{
+				if(button.IsMouseOver)
+					clr=pa.Colors.ItemHotBackground;
+
+				if(!pa.Colors.ItemCheckedBackground2.IsEmpty && !button.IsMouseOver)
+				{
+					using(LinearGradientBrush gradient=BarFunctions.CreateLinearGradientBrush(r,pa.Colors.ItemCheckedBackground,pa.Colors.ItemCheckedBackground2,pa.Colors.ItemCheckedBackgroundGradientAngle))
+						g.FillRectangle(gradient,r);
+				}
+				else
+				{
+					using(SolidBrush brush=new SolidBrush(clr))
+						g.FillRectangle(brush,r);
+				}
+			}
+
+			Pen objPen=new Pen(pa.Colors.ItemCheckedBorder,Dpi.Width1);
+			DisplayHelp.DrawRectangle(g,objPen,r);
+
+			objPen.Dispose();
+			objPen=new Pen(pa.Colors.ItemCheckedText);
+			// Draw checker...
+			Point[] pt=new Point[3];
+            pt[0].X = r.Left + (r.Width - Dpi.Width5) / 2 - Dpi.Width1;
+            pt[0].Y = r.Top + (r.Height - Dpi.Height6) / 2 + Dpi.Height3;
+            pt[1].X = pt[0].X + Dpi.Width2;
+            pt[1].Y = pt[0].Y + Dpi.Height2;
+            pt[2].X = pt[1].X + Dpi.Width4;
+            pt[2].Y = pt[1].Y - Dpi.Height4;
+			g.DrawLines(objPen,pt);
+			pt[0].X++;
+			pt[1].X++;
+			pt[2].X++;
+			g.DrawLines(objPen,pt);
+			objPen.Dispose();
+		}
+
+		/// <summary>
+		/// Paints state of the button, either hot, pressed or checked
+		/// </summary>
+		/// <param name="button"></param>
+		/// <param name="pa"></param>
+		/// <param name="image"></param>
+		public override void PaintButtonMouseOver(ButtonItem button, ItemPaintArgs pa, CompositeImage image, Rectangle r)
+		{
+			bool isMouseDown=button.IsMouseDown;
+            bool isOnMenu = IsOnMenu(button, pa);
+			Graphics g=pa.Graphics;
+
+			Brush brush=null;
+			Pen pen=null;
+
+			if(isMouseDown && !isOnMenu)
+			{
+				if(pa.Colors.ItemPressedBackground2.IsEmpty)
+					brush=new SolidBrush(pa.Colors.ItemPressedBackground);
+				else
+					brush=BarFunctions.CreateLinearGradientBrush(r,pa.Colors.ItemPressedBackground,pa.Colors.ItemPressedBackground2,pa.Colors.ItemPressedBackgroundGradientAngle);
+				pen=new Pen(pa.Colors.ItemPressedBorder,1);
+			}
+			else
+			{
+				if(IsItemEnabled(button, pa))
+				{
+					if(!pa.Colors.ItemHotBackground2.IsEmpty)
+						brush=BarFunctions.CreateLinearGradientBrush(r,pa.Colors.ItemHotBackground,pa.Colors.ItemHotBackground2,pa.Colors.ItemHotBackgroundGradientAngle);
+					else
+						brush=new SolidBrush(pa.Colors.ItemHotBackground);
+                    pen = new Pen(pa.Colors.ItemHotBorder, 1);
+				}
+                else if(isOnMenu)
+				    pen=new Pen(pa.Colors.ItemHotBorder,1);
+			}
+
+			if(brush!=null)
+			{
+                //Rectangle rf=r;
+                //rf.Width--;
+                //rf.Height--;
+				g.FillRectangle(brush,r);
+			}
+			if(pen!=null)
+				DisplayHelp.DrawRectangle(g,pen,r);
+
+			if(brush!=null)
+				brush.Dispose();
+			if(pen!=null)
+				pen.Dispose();
+		}
+
+        protected virtual void PaintButtonCheckBackground(ButtonItem button, ItemPaintArgs pa, Rectangle r)
+        {
+            Graphics g = pa.Graphics;
+            bool isOnMenu = IsOnMenu(button, pa);
+            if (!button.IsMouseOver || isOnMenu)
+            {
+                DisplayHelp.FillRectangle(g, r, pa.Colors.ItemCheckedBackground, pa.Colors.ItemCheckedBackground2, pa.Colors.ItemCheckedBackgroundGradientAngle);
+                DisplayHelp.DrawRectangle(g, pa.Colors.ItemCheckedBorder, r);
+            }
+        }
+
+		public override void PaintButtonCheck(ButtonItem button, ItemPaintArgs pa, CompositeImage image, Rectangle r)
+		{
+			if(r.IsEmpty)
+				return;
+            bool isOnMenu = IsOnMenu(button, pa);
+			Graphics g=pa.Graphics;
+
+            PaintButtonCheckBackground(button, pa, r);
+
+			if((image==null && string.IsNullOrEmpty(button.SymbolRealized) || button.ButtonStyle==eButtonStyle.TextOnlyAlways) && isOnMenu)
+			{
+				// Draw checker...
+                using (Pen pen = new Pen((IsItemEnabled(button, pa) ? pa.Colors.ItemCheckedText : pa.Colors.ItemDisabledText), Dpi.Width1))
+                {
+                    Point[] pt = new Point[3];
+                    pt[0].X = r.Left + (r.Width - Dpi.Width5) / 2 - Dpi.Width1;
+                    pt[0].Y = r.Top + (r.Height - Dpi.Height6) / 2 + Dpi.Height3;
+                    pt[1].X = pt[0].X + Dpi.Width2;
+                    pt[1].Y = pt[0].Y + Dpi.Height2;
+                    pt[2].X = pt[1].X + Dpi.Width4;
+                    pt[2].Y = pt[1].Y - Dpi.Height4;
+                    g.DrawLines(pen, pt);
+                    pt[0].X += Dpi.Width1;
+                    //pt[0].Y
+                    pt[1].X += Dpi.Width1;
+                    //pt[1].Y;
+                    pt[2].X += Dpi.Width1;
+                    //pt[2].Y;
+                    g.DrawLines(pen, pt);
+                }
+			}
+		}
+
+		public override Rectangle GetMouseOverRectangle(ButtonItem button, ItemPaintArgs pa, CompositeImage image)
+		{
+            Rectangle r = GetDisplayRectangle(button); 
+
+			if(button.HotTrackingStyle==eHotTrackingStyle.None || button.HotTrackingStyle==eHotTrackingStyle.Color)
+				return Rectangle.Empty;
+
+			if(button.HotTrackingStyle==eHotTrackingStyle.Image && image!=null)
+			{
+				r=GetImageRectangle(button,pa,image);
+				r.Inflate(2,2);
+				return r;
+			}
+
+            bool isOnMenu = IsOnMenu(button, pa);
+			if(isOnMenu)
+			{
+				r.X++;
+				r.Width-=2;
+			}
+
+			return r;
+		}
+
+		public override eTextFormat GetStringFormat(ButtonItem button, ItemPaintArgs pa, CompositeImage image)
+		{
+			eTextFormat stringFormat=pa.ButtonStringFormat;
+            bool isOnMenu = IsOnMenu(button, pa);
+			if(!isOnMenu)
+			{
+				if(pa.ContainerControl is RibbonStrip && (image==null && string.IsNullOrEmpty(button.SymbolRealized) || button.ImagePosition==eImagePosition.Top || button.ImagePosition==eImagePosition.Bottom)
+                    || button._FixedSizeCenterText)
+					stringFormat |= eTextFormat.HorizontalCenter;
+                else if (pa.ContainerControl is ButtonX)
+                {
+                    ButtonX buttonX = pa.ContainerControl as ButtonX;
+                    if(buttonX.TextAlignment== eButtonTextAlignment.Center)
+                        stringFormat |= eTextFormat.HorizontalCenter;
+                    else if(buttonX.TextAlignment== eButtonTextAlignment.Left)
+                        stringFormat |= eTextFormat.Left;
+                    else if (buttonX.TextAlignment == eButtonTextAlignment.Right && (image == null && string.IsNullOrEmpty(button.SymbolRealized) || button.ImagePosition == eImagePosition.Top || button.ImagePosition == eImagePosition.Bottom))
+                        stringFormat |= eTextFormat.Right;
+                    if (!buttonX.UseMnemonic)
+                        stringFormat |= eTextFormat.NoPrefix;
+                }
+                else if (pa.IsOnMenuBar || (pa.ContainerControl is Bar || pa.ContainerControl is ButtonX || button.Orientation == eOrientation.Vertical) && image == null && string.IsNullOrEmpty(button.SymbolRealized) || button.ImagePosition == eImagePosition.Top || button.ImagePosition == eImagePosition.Bottom)
+                    stringFormat |= eTextFormat.HorizontalCenter;
+
+                //if (pa.ContainerControl is RibbonBar) // VerticalCenter in this configuration was causing the bottom pixels to be cut off so remove it for all cases when images are on top or bottom
+                {
+                    if (button.ImagePosition == eImagePosition.Top || button.ImagePosition == eImagePosition.Bottom)
+                    {
+                        if (image != null || !string.IsNullOrEmpty(button.SymbolRealized))
+                            stringFormat |= eTextFormat.WordBreak;
+                        stringFormat = stringFormat & ~(stringFormat & eTextFormat.VerticalCenter) | eTextFormat.Top;
+                    }
+
+                }
+			}
+            if (pa.RightToLeft) stringFormat |= eTextFormat.RightToLeft;
+            
+			return stringFormat;
+		}
+
+        protected virtual bool IsTextCentered(ButtonItem button, ItemPaintArgs pa, CompositeImage image)
+        {
+            bool isOnMenu = IsOnMenu(button, pa);
+            if (!isOnMenu)
+            {
+                System.Windows.Forms.Control cc = pa.ContainerControl;
+                if (cc is RibbonStrip && (image == null && string.IsNullOrEmpty(button.SymbolRealized) || button.ImagePosition == eImagePosition.Top || button.ImagePosition == eImagePosition.Bottom) || button.Name.StartsWith("sysgallery") || button._FixedSizeCenterText)
+                    return true;
+                else if (cc is ButtonX)
+                {
+                    ButtonX buttonX = cc as ButtonX;
+                    if (buttonX.TextAlignment == eButtonTextAlignment.Center)
+                        return true;
+                }
+                else if (pa.IsOnMenuBar || cc is Bar && image == null && string.IsNullOrEmpty(button.SymbolRealized) || (button.ImagePosition == eImagePosition.Top || button.ImagePosition == eImagePosition.Bottom))
+                    return true;
+            }
+
+            return false;
+        }
+
+        protected virtual Rectangle GetTextRectangle(ButtonItem button, ItemPaintArgs pa, eTextFormat stringFormat, CompositeImage image)
+        {
+            Graphics g = pa.Graphics;
+            bool isOnMenu = IsOnMenu(button, pa);
+            bool isOnMenuBar = pa.IsOnMenuBar;
+            Rectangle itemRect = GetDisplayRectangle(button);
+            Rectangle textRect = button.TextDrawRect;
+            Rectangle imageRect = button.ImageDrawRect;
+            
+            bool rightToLeft = pa.RightToLeft;
+
+            // Draw menu item text
+            if (isOnMenu || button.ButtonStyle != eButtonStyle.Default || image == null && string.IsNullOrEmpty(button.SymbolRealized) || (!isOnMenu && (button.ImagePosition == eImagePosition.Top || button.ImagePosition == eImagePosition.Bottom)))
+            {
+                if (isOnMenu)
+                {
+                    if (rightToLeft)
+                    {
+                        //rect = new Rectangle(26, button.TextDrawRect.Y, itemRect.Width - button.ImageDrawRect.Width - 28, button.TextDrawRect.Height);
+                        // This seems to give a better alignment match with the corresponding LTR alignment
+                        if(button.IsOnCustomizeMenu)
+                            textRect = new Rectangle(itemRect.Height, textRect.Y, itemRect.Width - imageRect.Width - 11 - itemRect.Height, textRect.Height);
+                        else
+                            textRect = new Rectangle(17, textRect.Y, itemRect.Width - imageRect.Width - 28, textRect.Height);
+                    }
+                    else
+                        textRect = new Rectangle(textRect.X, textRect.Y, itemRect.Width - imageRect.Right - 26, textRect.Height);
+                }
+                else
+                {
+                    //rect = button.TextDrawRect;
+                    if (button.ImagePosition == eImagePosition.Top || button.ImagePosition == eImagePosition.Bottom)
+                    {
+                        if (button.Orientation != eOrientation.Vertical)
+                        {
+                            textRect = new Rectangle(1, textRect.Y + 2, itemRect.Width - 2, textRect.Height);
+                            if (button.SplitButton || pa.ContainerControl is RibbonBar) textRect.Y += 2;
+                        }
+                    }
+                }
+
+                if (image == null && string.IsNullOrEmpty(button.SymbolRealized) && (stringFormat & eTextFormat.HorizontalCenter) != eTextFormat.HorizontalCenter &&
+                    !isOnMenu && !isOnMenuBar && textRect.X == 0 && !pa.RightToLeft)
+                    textRect.X = 3;
+
+                textRect.Offset(itemRect.Left, itemRect.Top);
+
+                if (button.Orientation == eOrientation.Vertical && !isOnMenu)
+                {
+                    if (textRect.Bottom > itemRect.Bottom)
+                        textRect.Height = itemRect.Bottom - textRect.Y;
+                }
+                else
+                {
+                    if (textRect.Right > itemRect.Right)
+                        textRect.Width = itemRect.Right - textRect.Left;
+                }
+            }
+
+            return textRect;
+        }
+
+		public override void PaintButtonText(ButtonItem button, ItemPaintArgs pa, Color textColor, CompositeImage image)
+		{
+            if (!button.RenderText) return;
+			Graphics g=pa.Graphics;
+			eTextFormat stringFormat=GetStringFormat(button,pa,image);
+            bool isOnMenu = IsOnMenu(button, pa);
+			bool isOnMenuBar=pa.IsOnMenuBar;
+
+            Rectangle itemRect = GetDisplayRectangle(button);
+			Rectangle rect=GetTextRectangle(button, pa, stringFormat, image);
+			
+			Font font=button.GetFont(pa, false);
+            bool rightToLeft = pa.RightToLeft;
+
+            //if (isOnMenu && rightToLeft || (stringFormat & eTextFormat.Left) == eTextFormat.Left)
+            //    stringFormat |=eTextFormat.Right;
+
+			// Draw menu item text
+            if (isOnMenu || button.ButtonStyle != eButtonStyle.Default || image == null && string.IsNullOrEmpty(button.SymbolRealized) || (!isOnMenu && (button.ImagePosition == eImagePosition.Top || button.ImagePosition == eImagePosition.Bottom)))
+			{
+				if(button.Orientation==eOrientation.Vertical && !isOnMenu)
+				{
+					g.RotateTransform(90);
+                    if (button.TextMarkupBody == null)
+                    {
+                        TextDrawing.DrawStringLegacy(g, GetDrawText(button.Text), font, textColor, new Rectangle(rect.Top, -rect.Right, rect.Height, rect.Width), stringFormat);
+                    }
+                    else
+                    {
+                        TextMarkup.MarkupDrawContext d = new TextMarkup.MarkupDrawContext(g, font, textColor, rightToLeft);
+                        d.HotKeyPrefixVisible = !((stringFormat & eTextFormat.HidePrefix) == eTextFormat.HidePrefix);
+                        button.TextMarkupBody.Bounds = new Rectangle(rect.Top, -rect.Right, button.TextMarkupBody.Bounds.Width, button.TextMarkupBody.Bounds.Height);
+                        button.TextMarkupBody.Render(d);
+                    }
+
+					g.ResetTransform();
+				}
+				else
+				{
+                    if (button.TextMarkupBody == null)
+                    {
+						#if FRAMEWORK20
+                        if (pa.GlassEnabled && (button.Parent is CaptionItemContainer || button.Parent is RibbonTabItemContainer && (button.EffectiveStyle == eDotNetBarStyle.Office2010 || StyleManager.IsMetro(button.EffectiveStyle))) && !(pa.ContainerControl is QatToolbar))
+                        {
+                            if (!pa.CachedPaint)
+                                Office2007RibbonControlPainter.PaintTextOnGlass(g, button.Text, font, rect, TextDrawing.GetTextFormat(stringFormat), textColor, true, !button.IsMouseOver && !ColorFunctions.IsEqual(textColor, Color.White), 7);
+                        }
+                        else
+						#endif
+                            TextDrawing.DrawString(g, GetDrawText(button.Text), font, textColor, rect, stringFormat);
+                    }
+                    else
+                    {
+                        TextMarkup.MarkupDrawContext d = new TextMarkup.MarkupDrawContext(g, font, textColor, rightToLeft);
+                        d.HotKeyPrefixVisible = !((stringFormat & eTextFormat.HidePrefix) == eTextFormat.HidePrefix);
+                        d.ContextObject = button;
+                        Rectangle mr = new Rectangle((rightToLeft && isOnMenu?rect.X+rect.Width-button.TextMarkupBody.Bounds.Width:rect.X), rect.Y + (rect.Height - button.TextMarkupBody.Bounds.Height) / 2 /*- (isOnMenu ? -1 : -1)*/+1, button.TextMarkupBody.Bounds.Width, button.TextMarkupBody.Bounds.Height);
+                        if (pa.ContainerControl is RibbonBar && (button.ImagePosition == eImagePosition.Top || button.ImagePosition == eImagePosition.Bottom))
+                            mr = new Rectangle(rect.X + (rect.Width - button.TextMarkupBody.Bounds.Width) / 2, rect.Y, button.TextMarkupBody.Bounds.Width, button.TextMarkupBody.Bounds.Height);
+                        else if (IsTextCentered(button, pa, image))
+                            mr.Offset((rect.Width - mr.Width) / 2, 0);
+                        if (button._FixedSizeCenterText) mr.Y--;
+                        button.TextMarkupBody.Bounds = mr;
+                        button.TextMarkupBody.Render(d);
+                    }
+
+					if(!button.DesignMode && button.Focused && !isOnMenu && !isOnMenuBar && !(pa.ContainerControl is ButtonX && !((ButtonX)pa.ContainerControl).FocusCuesEnabled))
+					{
+						Rectangle r=itemRect;
+                        r.Inflate(-2, -2);
+						ControlPaint.DrawFocusRectangle(g,r);
+					}
+				}					
+			}
+			
+			// Draw Shortcut text if needed
+			if( button.DrawShortcutText!="" && isOnMenu && !button.IsOnCustomizeDialog)
+			{
+                stringFormat |= eTextFormat.HidePrefix;
+                
+                //if(rightToLeft)
+                //    stringFormat = stringFormat & ~(stringFormat & eTextFormat.Right) | eTextFormat.Left;
+                //else
+                    stringFormat|=eTextFormat.Right;
+
+				TextDrawing.DrawString(g, button.DrawShortcutText, font, textColor, rect, stringFormat);
+			}
+		}
+
+        protected virtual Rectangle GetTotalSubItemsRect(ButtonItem button)
+        {
+            return button.GetTotalSubItemsRect();
+        }
+
+		public override void PaintExpandButton(ButtonItem button, ItemPaintArgs pa)
+		{
+			Graphics g=pa.Graphics;
+            bool isOnMenu = IsOnMenu(button, pa);
+            Rectangle itemRect = GetDisplayRectangle(button);
+			bool mouseOver=button.IsMouseOver;
+
+            Color textColor = this.GetTextColor(button, pa);
+            using (SolidBrush textBrush = new SolidBrush(textColor))
+            {
+                // If it has subitems draw the triangle to indicate that
+                if ((button.SubItems.Count > 0 || button.PopupType == ePopupType.Container) && button.ShowSubItems)
+                {
+                    if (isOnMenu)
+                    {
+                        Point[] p = new Point[3];
+                        if (pa.RightToLeft)
+                        {
+                            p[0].X = itemRect.Left + 8;
+                            p[0].Y = itemRect.Top + (itemRect.Height - 8) / 2;
+                            p[1].X = p[0].X;
+                            p[1].Y = p[0].Y + 8;
+                            p[2].X = p[0].X - 4;
+                            p[2].Y = p[0].Y + 4;
+                        }
+                        else
+                        {
+                            p[0].X = itemRect.Left + itemRect.Width - 12;
+                            p[0].Y = itemRect.Top + (itemRect.Height - 8) / 2;
+                            p[1].X = p[0].X;
+                            p[1].Y = p[0].Y + 8;
+                            p[2].X = p[0].X + 4;
+                            p[2].Y = p[0].Y + 4;
+                        }
+
+                        g.FillPolygon(textBrush, p);
+                    }
+                    else if (!button.SubItemsRect.IsEmpty)
+                    {
+                        if (IsItemEnabled(button, pa) && ((mouseOver || button.Checked) && !button.Expanded && button.HotTrackingStyle != eHotTrackingStyle.None && button.HotTrackingStyle != eHotTrackingStyle.Image) && !button.AutoExpandOnClick)
+                        {
+                            Rectangle r = GetTotalSubItemsRect(button); // button.SubItemsRect;
+                            r.Offset(itemRect.Location);
+                            using (Pen mypen = new Pen(mouseOver?pa.Colors.ItemHotBorder:pa.Colors.ItemCheckedBorder))
+                                DisplayHelp.DrawRectangle(g, mypen, r);
+                        }
+                        PaintButtonExpandIndicator(button, pa);
+                    }
+                }
+            }
+		}
+
+        protected virtual void PaintMenuItemSide(ButtonItem button, ItemPaintArgs pa, Rectangle sideRect)
+        {
+            Graphics g = pa.Graphics;
+            Region oldClip = g.Clip.Clone() as Region;
+            g.SetClip(sideRect);
+
+            sideRect.Inflate(0, 1);
+
+            // Draw side bar
+            if (button.MenuVisibility == eMenuVisibility.VisibleIfRecentlyUsed && !button.RecentlyUsed)
+            {
+                DisplayHelp.FillRectangle(g, sideRect, pa.Colors.MenuUnusedSide, pa.Colors.MenuUnusedSide2, pa.Colors.MenuUnusedSideGradientAngle);
+            }
+            else
+            {
+                DisplayHelp.FillRectangle(g, sideRect, pa.Colors.MenuSide, pa.Colors.MenuSide2, pa.Colors.MenuSideGradientAngle);
+            }
+
+            if (oldClip != null)
+                g.Clip = oldClip;
+            else
+                g.ResetClip();
+        }
+
+        public override void PaintButtonBackground(ButtonItem button, ItemPaintArgs pa, CompositeImage image)
+        {
+            Graphics g = pa.Graphics;
+            bool isOnMenu = IsOnMenu(button, pa);
+
+            Rectangle displayRect = GetDisplayRectangle(button);
+            if (isOnMenu)
+            {
+                Rectangle sideRect = new Rectangle(displayRect.Left, displayRect.Top, button.ImageDrawRect.Right, displayRect.Height);
+                if (pa.RightToLeft)
+                {
+                    sideRect = new Rectangle(displayRect.Right - button.ImageDrawRect.Right, displayRect.Top, button.ImageDrawRect.Right, displayRect.Height);
+                }
+
+                PaintMenuItemSide(button, pa, sideRect);
+            }
+            else
+            {
+                // Draw button background
+                if (!pa.Colors.ItemBackground.IsEmpty)
+                {
+                    if (pa.Colors.ItemBackground2.IsEmpty)
+                    {
+                        using (SolidBrush mybrush = new SolidBrush(pa.Colors.ItemBackground))
+                            g.FillRectangle(mybrush, displayRect);
+                    }
+                    else
+                    {
+                        using (LinearGradientBrush gradient = BarFunctions.CreateLinearGradientBrush(displayRect, pa.Colors.ItemBackground, pa.Colors.ItemBackground2, pa.Colors.ItemBackgroundGradientAngle))
+                            g.FillRectangle(gradient, displayRect);
+                    }
+                }
+                else if (!IsItemEnabled(button, pa) && !pa.Colors.ItemDisabledBackground.IsEmpty)
+                {
+                    using (SolidBrush mybrush = new SolidBrush(pa.Colors.ItemDisabledBackground))
+                        g.FillRectangle(mybrush, displayRect);
+                }
+            }
+
+            Rectangle itemRect = displayRect;
+            if (IsItemEnabled(button, pa) || button.DesignMode)
+            {
+                if (button.Expanded && !isOnMenu)
+                {
+                    // DotNet Style
+                    if (pa.Colors.ItemExpandedBackground2.IsEmpty)
+                    {
+                        Rectangle rBack = displayRect;
+                        if (!pa.Colors.ItemExpandedShadow.IsEmpty)
+                            rBack.Width -= 2;
+                        using (SolidBrush mybrush = new SolidBrush(pa.Colors.ItemExpandedBackground))
+                            g.FillRectangle(mybrush, rBack);
+                    }
+                    else
+                    {
+                        LinearGradientBrush gradient = BarFunctions.CreateLinearGradientBrush(new Rectangle(itemRect.Left, itemRect.Top, itemRect.Width - 2, itemRect.Height), pa.Colors.ItemExpandedBackground, pa.Colors.ItemExpandedBackground2, pa.Colors.ItemExpandedBackgroundGradientAngle);
+                        Rectangle rBack = new Rectangle(itemRect.Left, itemRect.Top, itemRect.Width, itemRect.Height);
+                        if (!pa.Colors.ItemExpandedShadow.IsEmpty)
+                            rBack.Width -= 2;
+                        g.FillRectangle(gradient, rBack);
+                        gradient.Dispose();
+                    }
+                    Point[] p;
+                    if (button.Orientation == eOrientation.Horizontal && button.PopupSide == ePopupSide.Default)
+                        p = new Point[4];
+                    else
+                        p = new Point[5];
+                    p[0].X = itemRect.Left;
+                    p[0].Y = itemRect.Top + itemRect.Height - 1;
+                    p[1].X = itemRect.Left;
+                    p[1].Y = itemRect.Top;
+                    if (button.Orientation == eOrientation.Horizontal /*&& !pa.Colors.ItemExpandedShadow.IsEmpty*/)
+                    {
+                        if (!pa.Colors.ItemExpandedShadow.IsEmpty)
+                            p[2].X = itemRect.Left + itemRect.Width - 3;
+                        else
+                            p[2].X = itemRect.Right - 1;
+                    }
+                    else
+                        p[2].X = itemRect.Left + itemRect.Width - 1;
+                    p[2].Y = itemRect.Top;
+                    if (button.Orientation == eOrientation.Horizontal /*&& !pa.Colors.ItemExpandedShadow.IsEmpty*/)
+                    {
+                        if (!pa.Colors.ItemExpandedShadow.IsEmpty)
+                            p[3].X = itemRect.Left + itemRect.Width - 3;
+                        else
+                            p[3].X = itemRect.Right - 1;
+                    }
+                    else
+                        p[3].X = itemRect.Left + itemRect.Width - 1;
+
+                    p[3].Y = itemRect.Top + itemRect.Height - 1;
+
+                    if (button.Orientation == eOrientation.Vertical || button.PopupSide != ePopupSide.Default)
+                    {
+                        p[4].X = itemRect.Left;
+                        p[4].Y = itemRect.Top + itemRect.Height - 1;
+                    }
+
+                    if (!pa.Colors.ItemExpandedBorder.IsEmpty)
+                    {
+                        using (Pen mypen = new Pen(pa.Colors.ItemExpandedBorder, 1))
+                            g.DrawLines(mypen, p);
+                    }
+                    // Draw the shadow
+                    if (!pa.Colors.ItemExpandedShadow.IsEmpty && button.Orientation == eOrientation.Horizontal)
+                    {
+                        using (SolidBrush shadow = new SolidBrush(pa.Colors.ItemExpandedShadow))
+                            g.FillRectangle(shadow, itemRect.Left + itemRect.Width - 2, itemRect.Top + 2, 2, itemRect.Height - 2); // TODO: ADD GRADIENT SHADOW					
+                    }
+                }
+            }
+        }
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/Ribbon/Office2003RibbonTabItemPainter.cs b/PROMS/DotNetBar Source Code/Ribbon/Office2003RibbonTabItemPainter.cs
new file mode 100644
index 00000000..0415266f
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Ribbon/Office2003RibbonTabItemPainter.cs	
@@ -0,0 +1,171 @@
+using System;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Summary description for Office2003RibbonTabItemPainter.
+	/// </summary>
+	internal class Office2003RibbonTabItemPainter:Office2003ButtonItemPainter
+	{
+		/// <summary>
+		/// Paints state of the button, either hot, pressed or checked
+		/// </summary>
+		/// <param name="button"></param>
+		/// <param name="pa"></param>
+		/// <param name="image"></param>
+		public override void PaintButtonMouseOver(ButtonItem button, ItemPaintArgs pa, CompositeImage image, Rectangle r)
+		{
+			PaintButtonCheck(button,pa,image,r);
+		}
+
+        public override void PaintButtonBackground(ButtonItem button, ItemPaintArgs pa, CompositeImage image)
+		{
+            bool isOnMenu = IsOnMenu(button, pa);
+			if(isOnMenu)
+				base.PaintButtonBackground(button,pa, image);
+			else
+				PaintButtonCheck(button,pa,image,button.DisplayRectangle);
+		}
+
+		public override void PaintButtonCheck(ButtonItem button, ItemPaintArgs pa, CompositeImage image, Rectangle r)
+		{
+            bool isOnMenu = IsOnMenu(button, pa);
+			if(isOnMenu)
+			{
+				base.PaintButtonCheck(button,pa,image,r);
+				return;
+			}
+
+			// TODO: Cleanup code here, tabs were drawn for every state that code is still left
+			if(!button.IsMouseOver && !button.Checked)
+				return;
+
+			Color topColor=pa.Colors.BarBackground2;
+			Color bottomColor=pa.Colors.BarBackground;
+			Color borderColor=pa.Colors.BarFloatingBorder;
+			int angle=pa.Colors.BarBackgroundGradientAngle;
+			
+			if(button.IsMouseOver && !button.Checked)
+			{
+				topColor=pa.Colors.ItemHotBackground2;
+				bottomColor=pa.Colors.ItemHotBackground;
+				angle=pa.Colors.ItemHotBackgroundGradientAngle;
+			}
+			else if(button.Checked)
+			{
+				topColor=Color.White;//pa.Colors.BarBackground2;
+				bottomColor=pa.Colors.BarBackground; //pa.Colors.BarBackground;
+				//topColor=pa.Colors.ItemPressedBackground;
+				//bottomColor=pa.Colors.ItemPressedBackground2;
+				angle=pa.Colors.ItemPressedBackgroundGradientAngle;
+			}
+
+			Color lightColor=ControlPaint.LightLight(bottomColor);
+			Color darkColor=Color.FromArgb(100,ControlPaint.Dark(topColor));
+
+			int cornerDiameter=4;
+			
+			Graphics g=pa.Graphics;
+			GraphicsPath path=GetTabPath(r,cornerDiameter);
+			path.CloseAllFigures();
+            
+			// Background
+			using(LinearGradientBrush brush=DisplayHelp.CreateLinearGradientBrush(r,topColor,bottomColor,angle))
+			{
+				brush.GammaCorrection=true;
+				g.FillPath(brush,path);
+			}
+			path.Dispose();
+
+			// Border light
+			using(path=GetTabPathLight(r,cornerDiameter-1))
+			{
+				using(Pen pen=new Pen(darkColor/*lightColor*/,1))
+					g.DrawPath(pen,path);
+			}
+
+			// Border dark
+			using(path=GetTabPathDark(r,cornerDiameter-1))
+			{
+				using(Pen pen=new Pen(darkColor,1))
+					g.DrawPath(pen,path);
+			}
+
+			// Border
+			using(path=GetTabPath(r,cornerDiameter))
+			{
+				using(Pen pen=new Pen(borderColor,1))
+					g.DrawPath(pen,path);
+			}
+		}
+
+		private GraphicsPath GetTabPathLight(Rectangle r, int cornerDiameter)
+		{
+			r.X++;
+			r.Y++;
+			r.Width-=2;
+			r.Height--;
+			// Get graphics path for the tab bounds
+			GraphicsPath path=new GraphicsPath();
+
+			path.AddLine(r.X,r.Bottom,r.X,r.Y+cornerDiameter);
+			
+			ArcData ad=ElementStyleDisplay.GetCornerArc(r,cornerDiameter,eCornerArc.TopLeft);
+			path.AddArc(ad.X,ad.Y,ad.Width,ad.Height,ad.StartAngle,ad.SweepAngle);
+			//path.AddLine(r.X,r.Y+cornerDiameter,r.X+cornerDiameter,r.Y);
+			
+			path.AddLine(r.X+cornerDiameter,r.Y,r.Right-cornerDiameter,r.Y);
+			
+			return path;
+		}
+
+		private GraphicsPath GetTabPathDark(Rectangle r, int cornerDiameter)
+		{
+			r.X++;
+			r.Y++;
+			r.Width-=3;
+			r.Height--;
+			// Get graphics path for the tab bounds
+			GraphicsPath path=new GraphicsPath();
+
+			ArcData ad=ElementStyleDisplay.GetCornerArc(r,cornerDiameter,eCornerArc.TopRight);
+			path.AddArc(ad.X,ad.Y,ad.Width,ad.Height,ad.StartAngle,ad.SweepAngle);
+			//path.AddLine(r.Right-cornerDiameter,r.Y,r.Right,r.Y+cornerDiameter);
+
+			path.AddLine(r.Right,r.Y+cornerDiameter,r.Right,r.Bottom);
+			
+			return path;
+		}
+
+
+		private GraphicsPath GetTabPath(Rectangle r, int cornerDiameter)
+		{
+			r.Width--;
+			//r.Height--;
+			// Get graphics path for the tab bounds
+			GraphicsPath path=new GraphicsPath();
+
+			path.AddLine(r.X,r.Bottom,r.X,r.Y+cornerDiameter);
+			//path.AddLine(r.X,r.Y+cornerDiameter,r.X+cornerDiameter,r.Y);
+			ArcData ad=ElementStyleDisplay.GetCornerArc(r,cornerDiameter,eCornerArc.TopLeft);
+			path.AddArc(ad.X,ad.Y,ad.Width,ad.Height,ad.StartAngle,ad.SweepAngle);
+			
+			path.AddLine(r.X+cornerDiameter,r.Y,r.Right-cornerDiameter,r.Y);
+			//path.AddLine(r.Right-cornerDiameter,r.Y,r.Right,r.Y+cornerDiameter);
+			ad=ElementStyleDisplay.GetCornerArc(r,cornerDiameter,eCornerArc.TopRight);
+			path.AddArc(ad.X,ad.Y,ad.Width,ad.Height,ad.StartAngle,ad.SweepAngle);
+
+			path.AddLine(r.Right,r.Y+cornerDiameter,r.Right,r.Bottom);
+			
+			return path;
+		}
+
+		public override void PaintButtonText(ButtonItem button, ItemPaintArgs pa, Color textColor, CompositeImage image)
+		{
+			base.PaintButtonText(button,pa,textColor,image);
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/Ribbon/Office2007BarBackgroundPainter.cs b/PROMS/DotNetBar Source Code/Ribbon/Office2007BarBackgroundPainter.cs
new file mode 100644
index 00000000..cf302db2
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Ribbon/Office2007BarBackgroundPainter.cs	
@@ -0,0 +1,269 @@
+using System;
+using System.Text;
+using System.Drawing;
+using DevComponents.DotNetBar.Rendering;
+
+namespace DevComponents.DotNetBar
+{
+    internal class Office2007BarBackgroundPainter : BarBackgroundPainter, IOffice2007Painter
+    {
+        #region Private Variables
+        private float m_TopSplit = .4f;
+        #endregion
+
+        #region IOffice2007Painter
+        private Office2007ColorTable m_ColorTable = null; //new Office2007ColorTable();
+        /// <summary>
+        /// Gets or sets color table used by renderer.
+        /// </summary>
+        public Office2007ColorTable ColorTable
+        {
+            get { return m_ColorTable; }
+            set { m_ColorTable = value; }
+        }
+        #endregion
+
+        #region Docked Background
+        /// <summary>
+        /// Paints background of docked bar.
+        /// </summary>
+        /// <param name="e">Context information</param>
+        public override void PaintDockedBackground(ToolbarRendererEventArgs e)
+        {
+            Graphics g = e.Graphics;
+            Bar bar = e.Bar;
+            ItemPaintArgs pa = e.ItemPaintArgs;
+            Rectangle r = e.Bounds;
+            Rectangle backgroundBounds = r;
+            backgroundBounds.Inflate(1, 1);
+
+            ColorScheme cs = m_ColorTable.LegacyColors;
+            if (bar.LayoutType == eLayoutType.DockContainer || bar.LayoutType == eLayoutType.TaskList)
+            {
+                if(bar.HasFocus)
+                    DisplayHelp.FillRectangle(g, backgroundBounds, cs.BarBackground, cs.BarBackground2, cs.BarBackgroundGradientAngle);
+                else
+                    DisplayHelp.FillRectangle(g, backgroundBounds, cs.BarCaptionInactiveBackground, cs.BarCaptionInactiveBackground2, cs.BarCaptionInactiveBackgroundGAngle);
+            }
+            else if (bar.MenuBar)
+            {
+                DisplayHelp.FillRectangle(g, backgroundBounds, cs.MenuBarBackground, cs.MenuBarBackground2, cs.MenuBarBackgroundGradientAngle);
+            }
+            else if (bar.GrabHandleStyle != eGrabHandleStyle.ResizeHandle && bar.BarType != eBarType.StatusBar)
+            {
+                // Docked state
+                if (bar.ItemsContainer.m_BackgroundColor.IsEmpty && bar.BackColor != Color.Transparent)
+                {
+                    if (bar.IsThemed)
+                    {
+                        Rectangle rb = new Rectangle(-bar.Location.X, -bar.Location.Y, bar.Parent.Width, bar.Parent.Height);
+                        ThemeRebar theme = ((IThemeCache)bar).ThemeRebar;
+                        theme.DrawBackground(g, ThemeRebarParts.Background, ThemeRebarStates.Normal, rb);
+                    }
+                    else
+                    {
+                        if (IsGradientBackground(bar))
+                            DisplayHelp.FillRectangle(g, backgroundBounds, cs.BarBackground, cs.BarBackground2, cs.BarBackgroundGradientAngle, new float[] { 0, .12f, 1f }, new float[] { 0, .50f, 1f });
+                        else
+                            DisplayHelp.FillRectangle(g, backgroundBounds, cs.BarBackground);
+                    }
+                }
+                else if (!bar.ItemsContainer.BackColor.IsEmpty)
+                {
+                    DisplayHelp.FillRectangle(g, backgroundBounds, bar.ItemsContainer.BackColor);
+                }
+
+                if (bar.Parent != null && bar.Parent.BackgroundImage != null && bar.Parent is DockSite)
+                {
+                    Rectangle rb = new Rectangle(-bar.Location.X, -bar.Location.Y, bar.Parent.Width, bar.Parent.Height);
+                    DockSite site = bar.Parent as DockSite;
+                    BarFunctions.PaintBackgroundImage(g, rb, site.BackgroundImage, site.BackgroundImagePosition, site.BackgroundImageAlpha);
+                }
+                else if(bar.BackgroundImage!=null)
+                    BarFunctions.PaintBackgroundImage(g, r, bar.BackgroundImage, bar.BackgroundImagePosition, bar.BackgroundImageAlpha);
+
+                if (!bar.IsThemed && bar.LayoutType == eLayoutType.Toolbar && bar.BackColor != Color.Transparent && pa!=null)
+                {
+                    using (Pen p = new Pen(pa.Colors.BarDockedBorder, 1))
+                    {
+                        g.DrawLine(p, 0, bar.Height - 1, bar.Width, bar.Height - 1);
+                    }
+                }
+                else
+                {
+                    Rectangle border = r; // bar.ClientRectangle;
+                    border.Inflate(-2, -2);
+                    BarFunctions.DrawBorder(g, bar.DockedBorderStyle, border, bar.SingleLineColor);
+                }
+            }
+            else
+            {
+                if (!bar.BackColor.IsEmpty && bar.ShouldSerializeBackColor())
+                {
+                    DisplayHelp.FillRectangle(g, r, bar.BackColor);
+                }
+                else
+                {
+                    Office2007BarColorTable colorTable = m_ColorTable.Bar;
+
+                    Rectangle back = r;
+                    if(!pa.CachedPaint)
+                        back.Inflate(1, 1);
+
+                    if (colorTable.ToolbarBottomBackground == null || colorTable.ToolbarBottomBackground.IsEmpty)
+                    {
+                        DisplayHelp.FillRectangle(g, back, colorTable.ToolbarTopBackground);
+                    }
+                    else
+                    {
+                        // Fill top background part
+                        back.Height = (int)(back.Height * m_TopSplit);
+                        back.Height++;
+                        DisplayHelp.FillRectangle(g, back, colorTable.ToolbarTopBackground);
+                        back.Height--;
+
+                        // Fill bottom background part
+                        back.Y += back.Height;
+                        back.Height = r.Height - back.Height + 1;
+                        DisplayHelp.FillRectangle(g, back, colorTable.ToolbarBottomBackground);
+                    }
+
+                    if (bar.BarType == eBarType.StatusBar && bar.Items.Count > 0 && bar.Items[bar.Items.Count - 1] is ItemContainer && e.ItemPaintArgs != null && e.ItemPaintArgs.CachedPaint)
+                    {
+                        ItemContainer ic = bar.Items[bar.Items.Count - 1] as ItemContainer;
+                        if (ic.Visible && ic.BackgroundStyle.Class == ElementStyleClassKeys.Office2007StatusBarBackground2Key)
+                        {
+                            Rectangle bounds = new Rectangle(ic.Bounds.X, r.Y, ic.Bounds.Width, e.Bar.Height + 1);
+                            if (e.ItemPaintArgs.RightToLeft)
+                            {
+                                bounds.Width += bounds.X;
+                                bounds.X = 0;
+                            }
+                            else
+                            {
+                                bounds.X += e.ItemPaintArgs.ContainerControl.Left;
+                                bounds.Width += r.Right - bounds.Right;
+                            }
+                            ElementStyleDisplay.Paint(new ElementStyleDisplayInfo(ic.BackgroundStyle, g, bounds));
+                        }
+                    }
+
+                    if (bar.Parent != null && bar.Parent.BackgroundImage != null && bar.Parent is DockSite)
+                    {
+                        Rectangle backImageRect = new Rectangle(-bar.Location.X, -bar.Location.Y, bar.Parent.Width, bar.Parent.Height);
+                        DockSite site = bar.Parent as DockSite;
+                        BarFunctions.PaintBackgroundImage(g, backImageRect, site.BackgroundImage, site.BackgroundImagePosition, site.BackgroundImageAlpha);
+                    }
+                    else if (bar.BackgroundImage != null)
+                        BarFunctions.PaintBackgroundImage(g, bar.ClientRectangle, bar.BackgroundImage, bar.BackgroundImagePosition, bar.BackgroundImageAlpha);
+
+                    if (!colorTable.ToolbarBottomBorder.IsEmpty && bar.BarType != eBarType.StatusBar ||
+                        !colorTable.StatusBarTopBorder.IsEmpty && bar.BarType == eBarType.StatusBar)
+                    {
+                        if (bar.BarType == eBarType.StatusBar)
+                        {
+                            using (Pen pen = new Pen(colorTable.StatusBarTopBorder, 1))
+                                g.DrawLine(pen, r.X, r.Y, r.Right, r.Y);
+                            if (!colorTable.StatusBarTopBorderLight.IsEmpty)
+                            {
+                                using (Pen pen = new Pen(colorTable.StatusBarTopBorderLight, 1))
+                                    g.DrawLine(pen, r.X, r.Y + 1, r.Right, r.Y + 1);
+                            }
+                        }
+                        else
+                        {
+                            using (Pen pen = new Pen(colorTable.ToolbarBottomBorder, 1))
+                                g.DrawLine(pen, r.X, r.Bottom - 1, r.Right, r.Bottom - 1);
+                        }
+                    }
+                }
+            }
+            if (pa != null && !pa.CachedPaint)
+                bar.PaintGrabHandle(pa);
+        }
+
+        private bool IsGradientBackground(Bar bar)
+        {
+            if (bar.Style == eDotNetBarStyle.VS2005 && bar.LayoutType == eLayoutType.DockContainer)
+                return false;
+            return true;
+        }
+        #endregion
+
+        #region Floating Background
+        /// <summary>
+        /// Paints background of floating bar.
+        /// </summary>
+        /// <param name="e">Context information</param>
+        public override void PaintFloatingBackground(ToolbarRendererEventArgs e)
+        {
+            Graphics g = e.Graphics;
+            Bar bar = e.Bar;
+            ItemPaintArgs pa = e.ItemPaintArgs;
+            Rectangle r = e.Bounds;
+
+            ColorScheme cs = m_ColorTable.LegacyColors;
+            DisplayHelp.FillRectangle(g, r, cs.BarBackground, cs.BarBackground2, cs.BarBackgroundGradientAngle, new float[] { 0, .12f, 1f }, new float[] { 0, .50f, 1f });
+
+            //Office2007BarColorTable colorTable = m_ColorTable.Bar;
+            //Rectangle back = r;
+            //// Fill top background part
+            //back.Height = (int)(back.Height * m_TopSplit);
+            //DisplayHelp.FillRectangle(g, back, colorTable.ToolbarTopBackground);
+
+            //// Fill bottom background part
+            //back.Y += back.Height;
+            //back.Height = r.Height - back.Height;
+            //DisplayHelp.FillRectangle(g, back, colorTable.ToolbarBottomBackground);
+
+            if (bar.BackgroundImage != null)
+                BarFunctions.PaintBackgroundImage(g, bar.ClientRectangle, bar.BackgroundImage, bar.BackgroundImagePosition, bar.BackgroundImageAlpha);
+        }
+        #endregion
+
+        #region Popup Background
+        /// <summary>
+        /// Paints background of popup bar.
+        /// </summary>
+        /// <param name="e">Context information</param>
+        public override void PaintPopupBackground(ToolbarRendererEventArgs e)
+        {
+            Graphics g = e.Graphics;
+            Bar bar = e.Bar;
+            ItemPaintArgs pa = e.ItemPaintArgs;
+            Office2007BarColorTable colorTable = m_ColorTable.Bar;
+            int cornerSize = bar.CornerSize;
+            Rectangle r = e.Bounds;
+
+            DisplayHelp.FillRectangle(g, r, colorTable.PopupToolbarBackground.Start, colorTable.PopupToolbarBackground.End, colorTable.PopupToolbarBackground.GradientAngle);
+
+            if (bar.BackgroundImage != null)
+                BarFunctions.PaintBackgroundImage(g, bar.ClientRectangle, bar.BackgroundImage, bar.BackgroundImagePosition, bar.BackgroundImageAlpha);
+
+            bar.PaintSideBar(g);
+
+            Rectangle borderRectangle = r;
+
+            if (bar.DisplayShadow && !bar.AlphaShadow)
+                borderRectangle = new Rectangle(0, 0, bar.ClientSize.Width - 2, bar.ClientSize.Height - 2);
+
+            using (Pen p = new Pen(colorTable.PopupToolbarBorder, 1))
+                DisplayHelp.DrawRoundedRectangle(g, p, borderRectangle, cornerSize);
+
+            if (bar.DisplayShadow && !bar.AlphaShadow)
+            {
+                // Shadow
+                Point[] pt = new Point[3];
+                pt[0].X = 2;
+                pt[0].Y = r.Height - 1;
+                pt[1].X = r.Width - 1;
+                pt[1].Y = r.Height - 1;
+                pt[2].X = r.Width - 1;
+                pt[2].Y = 2;
+                using (Pen p = new Pen(SystemColors.ControlDark, 2))
+                    g.DrawLines(p, pt);
+            }
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Ribbon/Office2007ButtonItemPainter.cs b/PROMS/DotNetBar Source Code/Ribbon/Office2007ButtonItemPainter.cs
new file mode 100644
index 00000000..a53b3f82
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Ribbon/Office2007ButtonItemPainter.cs	
@@ -0,0 +1,968 @@
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Drawing.Imaging;
+using System.Drawing.Text;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.Rendering;
+using System;
+
+
+namespace DevComponents.DotNetBar
+{
+    internal class Office2007ButtonItemPainter : Office2003ButtonItemPainter, IOffice2007Painter
+    {
+        #region Private Variables
+        private int m_CornerSize = 2;
+        private Office2007ColorTable m_ColorTable = null; //new Office2007ColorTable();
+        private static RoundRectangleShapeDescriptor _DefaultOffice2007Shape = new RoundRectangleShapeDescriptor(2);
+        private static RoundRectangleShapeDescriptor _DefaultOffice2007LeftShape = new RoundRectangleShapeDescriptor(2, 0, 2, 0);
+        private static RoundRectangleShapeDescriptor _DefaultOffice2007RightShape = new RoundRectangleShapeDescriptor(0, 2, 0, 2);
+        private static RoundRectangleShapeDescriptor _DefaultOffice2007TopShape = new RoundRectangleShapeDescriptor(2, 2, 0, 0);
+        private static RoundRectangleShapeDescriptor _DefaultOffice2007BottomShape = new RoundRectangleShapeDescriptor(0, 0, 2, 2);
+
+        private static RoundRectangleShapeDescriptor _DefaultMetroShape = new RoundRectangleShapeDescriptor(0);
+        #endregion
+
+        #region Implementation
+        private bool IsOffice2003Rendering(ButtonItem button, ItemPaintArgs pa)
+        {
+            if (button.ColorTable == eButtonColor.Flat || pa.Owner is DotNetBarManager && string.IsNullOrEmpty(button.CustomColorName))
+                return true;
+            return false;
+        }
+
+        /// <summary>
+        /// Paints state of the button, either hot, pressed or checked
+        /// </summary>
+        /// <param name="button"></param>
+        /// <param name="pa"></param>
+        /// <param name="image"></param>
+        public override void PaintButtonMouseOver(ButtonItem button, ItemPaintArgs pa, CompositeImage image, Rectangle r)
+        {
+            if (IsOffice2003Rendering(button, pa))
+            {
+                base.PaintButtonMouseOver(button, pa, image, r);
+                return;
+            }
+            //PaintState(button, pa, image, r, button.IsMouseDown);
+        }
+
+        public override void PaintButtonCheck(ButtonItem button, ItemPaintArgs pa, CompositeImage image, Rectangle r)
+        {
+            if (IsOffice2003Rendering(button, pa))
+            {
+                base.PaintButtonCheck(button, pa, image, r);
+                return;
+            }
+            bool isOnMenu = IsOnMenu(button, pa);
+            if (isOnMenu)
+                base.PaintButtonCheck(button, pa, image, r);
+            //else
+            //    PaintState(button, pa, image, r, button.IsMouseDown);
+        }
+
+        protected virtual IShapeDescriptor GetButtonShape(ButtonItem button, ItemPaintArgs pa)
+        {
+            IShapeDescriptor shape = Office2007ButtonItemPainter.GetButtonShape(button);
+
+            if (pa.ContainerControl is ButtonX)
+                shape = ((ButtonX)pa.ContainerControl).GetButtonShape();
+            else if (pa.ContainerControl is NavigationBar)
+                shape = ((NavigationBar)pa.ContainerControl).ButtonShape;
+            return shape;
+        }
+
+        protected virtual void PaintState(ButtonItem button, ItemPaintArgs pa, CompositeImage image, Rectangle r, bool isMouseDown)
+        {
+            if (r.IsEmpty)
+                return;
+
+            bool isOnMenu = pa.IsOnMenu;
+            Office2007ColorTable colorTable = this.ColorTable;
+
+            Graphics g = pa.Graphics;
+            IShapeDescriptor shape = GetButtonShape(button, pa);
+
+            eButtonContainer buttonCont = GetButtonContainerQualifier(pa, button);
+            Office2007ButtonItemColorTable buttonColorTable = GetColorTable(button, buttonCont);
+
+            Region oldClip = g.Clip;
+            try
+            {
+                g.SetClip(r, CombineMode.Intersect);
+
+                Office2007ButtonItemStateColorTable stateColors = buttonColorTable.Default;
+
+                if (IsOnMenu(button, pa))
+                {
+                    Rectangle sideRect = new Rectangle(button.DisplayRectangle.Left, button.DisplayRectangle.Top, button.ImageDrawRect.Right, button.DisplayRectangle.Height);
+                    if (pa.RightToLeft)
+                        sideRect = new Rectangle(button.DisplayRectangle.Right - button.ImageDrawRect.Width, button.DisplayRectangle.Top, button.ImageDrawRect.Width, button.DisplayRectangle.Height);
+
+                    PaintMenuItemSide(button, pa, sideRect);
+                }
+
+                if (!IsItemEnabled(button, pa))
+                {
+                    if (!isOnMenu)
+                        PaintStateBackground(button, g, buttonColorTable.Disabled, r, shape, pa.IsDefaultButton, true);
+                    g.Clip = oldClip;
+                    return;
+                }
+
+                bool mouseOver = false;
+                bool expanded = false;
+                if (!button.DesignMode)
+                {
+                    if (button.IsMouseOver && button.HotTrackingStyle != eHotTrackingStyle.Image && button.HotTrackingStyle != eHotTrackingStyle.None)
+                    {
+                        stateColors = buttonColorTable.MouseOver;
+                        mouseOver = true;
+                    }
+
+                    if (isMouseDown && button.HotTrackingStyle != eHotTrackingStyle.Image && button.HotTrackingStyle != eHotTrackingStyle.None)
+                    {
+                        if (buttonColorTable.Pressed != null)
+                            stateColors = buttonColorTable.Pressed;
+                    }
+                    else if (button.Checked && !button.IsMouseOver && !IsOnMenu(button, pa))
+                    {
+                        stateColors = buttonColorTable.Checked;
+                    }
+                    else if (button.Expanded && button.HotTrackingStyle != eHotTrackingStyle.Image && !(!mouseOver && pa.IsOnMenu))
+                    {
+                        stateColors = buttonColorTable.Expanded;
+                        expanded = true;
+                    }
+                }
+                else
+                {
+                    if (button.Checked && !IsOnMenu(button, pa))
+                    {
+                        stateColors = buttonColorTable.Checked;
+                    }
+                    else if (button.Expanded && button.HotTrackingStyle != eHotTrackingStyle.Image)
+                    {
+                        stateColors = buttonColorTable.Expanded;
+                        expanded = true;
+                    }
+                }
+
+                Rectangle subRect = GetTotalSubItemsRect(button);
+                bool isSplitButton = (mouseOver || expanded) && !button.AutoExpandOnClick && !subRect.IsEmpty && !IsOnMenu(button, pa);
+                eDotNetBarStyle effectiveStyle = button.EffectiveStyle;
+                subRect.Offset(button.DisplayRectangle.Location);
+
+                if (isSplitButton && !button.Checked &&
+                    (effectiveStyle == eDotNetBarStyle.Office2010 || effectiveStyle == eDotNetBarStyle.Windows7 || StyleManager.IsMetro(effectiveStyle)))
+                {
+                    Rectangle[] rects = DisplayHelp.ExcludeRectangle(r, subRect);
+                    if (rects.Length > 0 && (button.IsMouseOverExpand || button.Expanded))
+                        rects = DisplayHelp.ExcludeRectangle(r, rects[0]);
+                    if (rects.Length > 0)
+                    {
+                        PaintStateBackground(button, g, buttonColorTable.MouseOverSplitInactive, r, shape, pa.IsDefaultButton, !pa.IsOnNavigationBar);
+                        if (rects[0].X == r.X && rects[0].Right < r.Right) // Left aligned
+                            shape = (StyleManager.IsMetro(effectiveStyle)) ? _DefaultMetroShape : _DefaultOffice2007LeftShape;
+                        else if (rects[0].X > r.X && rects[0].Right == r.Right) // Right aligned
+                            shape = (StyleManager.IsMetro(effectiveStyle)) ? _DefaultMetroShape : _DefaultOffice2007RightShape;
+                        else if (rects[0].Y == r.Y && rects[0].Bottom < r.Bottom) // Top aligned
+                            shape = (StyleManager.IsMetro(effectiveStyle)) ? _DefaultMetroShape : _DefaultOffice2007TopShape;
+                        else if (rects[0].Y > r.Y && rects[0].Bottom == r.Bottom) // Bottom aligned
+                            shape = (StyleManager.IsMetro(effectiveStyle)) ? _DefaultMetroShape : _DefaultOffice2007BottomShape;
+
+                        PaintStateBackground(button, g, stateColors, rects[0], shape, pa.IsDefaultButton, !pa.IsOnNavigationBar);
+                    }
+                    else
+                        PaintStateBackground(button, g, stateColors, r, shape, pa.IsDefaultButton, !pa.IsOnNavigationBar);
+                }
+                else
+                    PaintStateBackground(button, g, stateColors, r, shape, pa.IsDefaultButton, !pa.IsOnNavigationBar);
+
+                if (isSplitButton && !(effectiveStyle == eDotNetBarStyle.Office2010 || effectiveStyle == eDotNetBarStyle.Windows7 || StyleManager.IsMetro(effectiveStyle)))
+                {
+                    using (Brush brush = GetOverlayInactiveBrush())
+                    {
+                        Rectangle backRect = button.DisplayRectangle;
+                        backRect.Inflate(-1, -1);
+
+                        if (!button.IsMouseOverExpand && !expanded)
+                        {
+                            subRect.Inflate(-1, -1);
+                            g.SetClip(subRect, CombineMode.Intersect);
+                            GraphicsPath backPath = shape.GetShape(backRect);
+                            if (backPath != null)
+                            {
+                                g.FillPath(brush, backPath);
+                                backPath.Dispose();
+                            }
+                        }
+                        else if (!mouseOver || button.IsMouseOverExpand)
+                        {
+                            g.SetClip(subRect, CombineMode.Exclude);
+                            GraphicsPath backPath = shape.GetShape(backRect);
+                            if (backPath != null)
+                            {
+                                g.FillPath(brush, backPath);
+                                backPath.Dispose();
+                            }
+                        }
+                    }
+                }
+
+                g.Clip = oldClip;
+            }
+            finally
+            {
+                if (oldClip != null) oldClip.Dispose();
+            }
+        }
+
+        protected virtual void PaintStateBackground(ButtonItem button, Graphics g, Office2007ButtonItemStateColorTable stateColors, Rectangle r, IShapeDescriptor shape, bool isDefault, bool paintBorder)
+        {
+            PaintBackground(g, stateColors, r, shape, isDefault, paintBorder);
+        }
+
+        public static void PaintBackground(Graphics g, Office2007ButtonItemStateColorTable stateColors, Rectangle r, IShapeDescriptor shape)
+        {
+            PaintBackground(g, stateColors, r, shape, false);
+        }
+
+        public static void PaintBackground(Graphics g, Office2007ButtonItemStateColorTable stateColors, Rectangle r, IShapeDescriptor shape, bool isDefault)
+        {
+            PaintBackground(g, stateColors, r, shape, isDefault, true);
+        }
+
+        public static void PaintBackground(Graphics g, Office2007ButtonItemStateColorTable stateColors, Rectangle r, IShapeDescriptor shape, bool isDefault, bool paintBorder)
+        {
+            float topSplit = .35f;
+            float bottomSplit = .65f;
+            if (!shape.CanDrawShape(r)) return;
+
+            if (stateColors != null)
+            {
+                Rectangle fillRectangle = r;
+                
+                Rectangle backRect = new Rectangle(fillRectangle.X, fillRectangle.Y, fillRectangle.Width, (int)(fillRectangle.Height * topSplit));
+                if (!stateColors.OuterBorder.IsEmpty && paintBorder)
+                    fillRectangle.Width--;
+                GraphicsPath backPath = shape.GetShape(fillRectangle);
+                if (stateColors.Background != null)
+                {
+                    if (backPath != null)
+                    {
+                        if (stateColors.Background.End.IsEmpty)
+                        {
+                            using (SolidBrush brush = new SolidBrush(stateColors.Background.Start))
+                                g.FillPath(brush, backPath);
+                        }
+                        else
+                        {
+                            using (LinearGradientBrush lb = new LinearGradientBrush(fillRectangle, stateColors.Background.Start, stateColors.Background.End, stateColors.Background.GradientAngle))
+                            {
+                                g.FillPath(lb, backPath);
+                            }
+                        }
+                        backPath.Dispose();
+                    }
+                }
+                else
+                {
+                    if (backPath != null && stateColors.TopBackground!= null && stateColors.BottomBackground!=null)
+                    {
+                        if (stateColors.TopBackground.End.IsEmpty && stateColors.BottomBackground.End.IsEmpty)
+                        {
+                            if (stateColors.TopBackground.Start == stateColors.BottomBackground.Start)
+                                using (SolidBrush lb = new SolidBrush(stateColors.TopBackground.Start))
+                                    g.FillPath(lb, backPath);
+                            else
+                            {
+                                using (LinearGradientBrush lb = new LinearGradientBrush(fillRectangle, stateColors.TopBackground.Start, stateColors.BottomBackground.Start, stateColors.TopBackground.GradientAngle))
+                                {
+                                    g.FillPath(lb, backPath);
+                                }
+                            }
+                        }
+                        else
+                        {
+                            using (LinearGradientBrush lb = new LinearGradientBrush(fillRectangle, stateColors.TopBackground.Start, stateColors.BottomBackground.End, stateColors.TopBackground.GradientAngle))
+                            {
+                                ColorBlend cb = new ColorBlend(4);
+                                cb.Colors = new Color[] { stateColors.TopBackground.Start, stateColors.TopBackground.End, stateColors.BottomBackground.Start, stateColors.BottomBackground.End };
+                                cb.Positions = new float[] { 0, topSplit, topSplit, 1f };
+                                lb.InterpolationColors = cb;
+                                g.FillPath(lb, backPath);
+                            }
+                        }
+                        backPath.Dispose();
+                    }
+
+                    if (stateColors.TopBackgroundHighlight!=null && !stateColors.TopBackgroundHighlight.IsEmpty)
+                    {
+                        Rectangle ellipse = new Rectangle(fillRectangle.X, fillRectangle.Y, fillRectangle.Width, fillRectangle.Height);
+                        GraphicsPath path = new GraphicsPath();
+                        path.AddEllipse(ellipse);
+                        PathGradientBrush brush = new PathGradientBrush(path);
+                        brush.CenterColor = stateColors.TopBackgroundHighlight.Start;
+                        brush.SurroundColors = new Color[] { stateColors.TopBackgroundHighlight.End };
+                        brush.CenterPoint = new PointF(ellipse.X + ellipse.Width / 2, fillRectangle.Bottom);
+                        Blend blend = new Blend();
+                        blend.Factors = new float[] { 0f, .5f, 1f };
+                        blend.Positions = new float[] { .0f, .4f, 1f };
+                        brush.Blend = blend;
+
+                        g.FillRectangle(brush, backRect);
+                        brush.Dispose();
+                        path.Dispose();
+                    }
+
+                    // Draw Bottom part
+                    int bottomHeight = (int)(fillRectangle.Height * bottomSplit);
+                    backRect = new Rectangle(fillRectangle.X, fillRectangle.Y + backRect.Height, fillRectangle.Width, fillRectangle.Height - backRect.Height);
+
+                    if (stateColors.BottomBackgroundHighlight!=null && !stateColors.BottomBackgroundHighlight.IsEmpty)
+                    {
+                        Rectangle ellipse = new Rectangle(fillRectangle.X, fillRectangle.Y + bottomHeight - 2, fillRectangle.Width, fillRectangle.Height + 4);
+                        GraphicsPath path = new GraphicsPath();
+                        path.AddEllipse(ellipse);
+                        PathGradientBrush brush = new PathGradientBrush(path);
+                        brush.CenterColor = stateColors.BottomBackgroundHighlight.Start;
+                        brush.SurroundColors = new Color[] { stateColors.BottomBackgroundHighlight.End };
+                        brush.CenterPoint = new PointF(ellipse.X + ellipse.Width / 2, fillRectangle.Bottom);
+                        Blend blend = new Blend();
+                        blend.Factors = new float[] { 0f, .5f, .6f };
+                        blend.Positions = new float[] { .0f, .4f, 1f };
+                        brush.Blend = blend;
+
+                        g.FillRectangle(brush, backRect);
+                        brush.Dispose();
+                        path.Dispose();
+                    }
+                }
+
+                if (paintBorder)
+                {
+                    SmoothingMode sm = g.SmoothingMode;
+                    g.SmoothingMode = SmoothingMode.AntiAlias;
+                    // Draw Border
+                    if (!stateColors.OuterBorder.IsEmpty && stateColors.OuterBorderWidth>0)
+                    {
+                        Rectangle br = r;
+                        br.Width--;
+                        br.Height--;
+
+                        if (shape is EllipticalShapeDescriptor && stateColors.OuterBorder.End.IsEmpty)
+                        {
+                            br.Width -= (stateColors.OuterBorderWidth / 2);
+                            br.Height -= (stateColors.OuterBorderWidth / 2);
+                            using (Pen pen = new Pen(stateColors.OuterBorder.Start, stateColors.OuterBorderWidth))
+                                g.DrawEllipse(pen, br);
+                        }
+                        else
+                        {
+                            GraphicsPath path = shape.GetShape(br);
+                            if (path != null)
+                            {
+                                DisplayHelp.DrawGradientPath(g, path, r, stateColors.OuterBorder, stateColors.OuterBorderWidth);
+                                path.Dispose();
+                            }
+                        }
+                        //if (cornerSize > 1)
+                        //    DisplayHelp.DrawRoundGradientRectangle(g, r, stateColors.OuterBorder, 1, cornerSize);
+                        //else
+                        //    DisplayHelp.DrawGradientRectangle(g, r, stateColors.OuterBorder, 1);
+
+                        if (isDefault)
+                        {
+                            Color clr = Color.FromArgb(128, stateColors.OuterBorder.Start);
+                            r.Inflate(-1, -1);
+                            DisplayHelp.DrawRectangle(g, clr, r);
+                            r.Inflate(-1, -1);
+                            DisplayHelp.DrawRectangle(g, clr, r);
+                        }
+                    }
+                    if (!isDefault && !stateColors.InnerBorder.IsEmpty)
+                    {
+                        Rectangle innerRect = r;
+                        innerRect.Inflate(-1, -1);
+                        innerRect.Width--;
+                        innerRect.Height--;
+                        using (GraphicsPath path = shape.GetInnerShape(innerRect, 1))
+                            DisplayHelp.DrawGradientPath(g, path, innerRect, stateColors.InnerBorder, 1);
+                        //cornerSize--;
+                        //if (cornerSize > 1)
+                        //    DisplayHelp.DrawRoundGradientRectangle(g, innerRect, stateColors.InnerBorder, 1, cornerSize);
+                        //else
+                        //    DisplayHelp.DrawGradientRectangle(g, innerRect, stateColors.InnerBorder, 1);
+                    }
+
+                    g.SmoothingMode = sm;
+                }
+            }
+        }
+
+        public override void PaintButtonBackground(ButtonItem button, ItemPaintArgs pa, CompositeImage image)
+        {
+            if (IsOffice2003Rendering(button, pa))
+            {
+                base.PaintButtonBackground(button, pa, image);
+                return;
+            }
+
+            if (button is ApplicationButton && m_ColorTable.RibbonControl.StartButtonDefault != null)
+            {
+                Image backImage = m_ColorTable.RibbonControl.StartButtonDefault;
+                if (button.IsMouseDown || button.Expanded)
+                    backImage = m_ColorTable.RibbonControl.StartButtonPressed;
+                else if (button.IsMouseOver)
+                    backImage = m_ColorTable.RibbonControl.StartButtonMouseOver;
+                if (backImage != null)
+                {
+                    if (Office2007ColorTable.CloneImagesOnAccess)
+                        backImage = backImage.Clone() as Image;
+                    pa.Graphics.DrawImageUnscaled(backImage, new Point(button.LeftInternal + (button.WidthInternal - backImage.Width) / 2, button.TopInternal + (button.HeightInternal - backImage.Height) / 2));
+                    if (Office2007ColorTable.CloneImagesOnAccess)
+                        backImage.Dispose();
+                }
+            }
+
+            PaintState(button, pa, image, button.DisplayRectangle, button.IsMouseDown);
+        }
+
+        private Brush GetOverlayInactiveBrush()
+        {
+            return new SolidBrush(Color.FromArgb(76, Color.White));
+        }
+
+        private static IShapeDescriptor GetButtonShape(ButtonItem button)
+        {
+            if (button.Shape != null)
+                return button.Shape;
+            return _DefaultOffice2007Shape;
+        }
+
+        public override void PaintExpandButton(ButtonItem button, ItemPaintArgs pa)
+        {
+            if (IsOffice2003Rendering(button, pa))
+            {
+                base.PaintExpandButton(button, pa);
+                return;
+            }
+
+            Graphics g = pa.Graphics;
+            bool isOnMenu = IsOnMenu(button, pa);
+            Rectangle itemRect = button.DisplayRectangle;
+            bool mouseOver = button.IsMouseOver;
+            bool enabled = IsItemEnabled(button, pa);
+
+            Color textColor = Color.Empty;
+            eButtonContainer buttonCont = GetButtonContainerQualifier(pa, button);
+            Office2007ButtonItemColorTable buttonColorTable = GetColorTable(button, buttonCont);
+            if (buttonCont == eButtonContainer.RibbonStrip)
+            {
+                textColor = GetTextColor(button, pa);
+            }
+            if (textColor.IsEmpty)
+                textColor = GetTextColor(button, pa, buttonColorTable, true);
+
+            using (SolidBrush textBrush = new SolidBrush(textColor))
+            {
+                // If it has subitems draw the triangle to indicate that
+                if ((button.SubItems.Count > 0 || button.PopupType == ePopupType.Container) && button.ShowSubItems)
+                {
+                    if (isOnMenu)
+                    {
+                        Point[] p = new Point[3];
+                        if (pa.RightToLeft)
+                        {
+                            p[0].X = itemRect.Left + 8;
+                            p[0].Y = itemRect.Top + (itemRect.Height - 8) / 2;
+                            p[1].X = p[0].X;
+                            p[1].Y = p[0].Y + 8;
+                            p[2].X = p[0].X - 4;
+                            p[2].Y = p[0].Y + 4;
+                        }
+                        else
+                        {
+                            p[0].X = itemRect.Left + itemRect.Width - 12;
+                            p[0].Y = itemRect.Top + (itemRect.Height - 8) / 2;
+                            p[1].X = p[0].X;
+                            p[1].Y = p[0].Y + 8;
+                            p[2].X = p[0].X + 4;
+                            p[2].Y = p[0].Y + 4;
+                        }
+                        SmoothingMode sm = g.SmoothingMode;
+                        g.SmoothingMode = SmoothingMode.None;
+                        g.FillPolygon(textBrush, p);
+                        g.SmoothingMode = sm;
+                    }
+                    else if (!button.SubItemsRect.IsEmpty)
+                    {
+                        Point[] p = new Point[3];
+                        Rectangle sr = button.SubItemsRect;
+                        if (pa.IsOnRibbonBar && button.ImagePosition == eImagePosition.Top && !button.SplitButton && button.Text.Length > 0)
+                            sr.Y -= 3;
+
+                        if (button.PopupSide == ePopupSide.Default)
+                        {
+                            if (pa.IsOnMenu)
+                            {
+                                if (pa.RightToLeft)
+                                {
+                                    p[0].X = itemRect.Left + sr.Left + sr.Width / 2 + 3;
+                                    p[0].Y = itemRect.Top + sr.Top + sr.Height / 2 - 3;
+                                    p[1].X = p[0].X;
+                                    p[1].Y = p[0].Y + 6;
+                                    p[2].X = p[0].X - 3;
+                                    p[2].Y = p[0].Y + 3;
+                                }
+                                else
+                                {
+                                    p[0].X = itemRect.Left + sr.Left + sr.Width / 2;
+                                    p[0].Y = itemRect.Top + sr.Top + sr.Height / 2 - 3;
+                                    p[1].X = p[0].X;
+                                    p[1].Y = p[0].Y + 6;
+                                    p[2].X = p[0].X + 3;
+                                    p[2].Y = p[0].Y + 3;
+                                }
+                            }
+                            else if (button.Orientation == eOrientation.Horizontal)
+                            {
+                                p[0].X = itemRect.Left + sr.Left + (sr.Width - Dpi.Width5) / 2;
+                                p[0].Y = itemRect.Top + sr.Top + (sr.Height - Dpi.Height3) / 2 + 1;
+                                p[1].X = p[0].X + Dpi.Width5;
+                                p[1].Y = p[0].Y;
+                                p[2].X = p[0].X + Dpi.Width2;
+                                p[2].Y = p[0].Y + Dpi.Height3;
+                            }
+                            else
+                            {
+                                p[0].X = itemRect.Left + sr.Left + (sr.Width - 3) / 2 + 1;
+                                p[0].Y = itemRect.Top + sr.Top + (sr.Height - 5) / 2;
+                                p[1].X = p[0].X;
+                                p[1].Y = p[0].Y + 6;
+                                p[2].X = p[0].X - 3;
+                                p[2].Y = p[0].Y + 3;
+                            }
+                        }
+                        else
+                        {
+                            switch (button.PopupSide)
+                            {
+                                case ePopupSide.Right:
+                                    {
+                                        p[0].X = itemRect.Left + sr.Left + sr.Width / 2;
+                                        p[0].Y = itemRect.Top + sr.Top + sr.Height / 2 - 3;
+                                        p[1].X = p[0].X;
+                                        p[1].Y = p[0].Y + 6;
+                                        p[2].X = p[0].X + 3;
+                                        p[2].Y = p[0].Y + 3;
+                                        break;
+                                    }
+                                case ePopupSide.Left:
+                                    {
+                                        p[0].X = itemRect.Left + sr.Left + sr.Width / 2 + 3;
+                                        p[0].Y = itemRect.Top + sr.Top + sr.Height / 2 - 3;
+                                        p[1].X = p[0].X;
+                                        p[1].Y = p[0].Y + 6;
+                                        p[2].X = p[0].X - 3;
+                                        p[2].Y = p[0].Y + 3;
+                                        break;
+                                    }
+                                case ePopupSide.Top:
+                                    {
+                                        p[0].X = itemRect.Left + sr.Left + (sr.Width - 5) / 2;
+                                        p[0].Y = itemRect.Top + sr.Top + (sr.Height - 3) / 2 + 4;
+                                        p[1].X = p[0].X + 6;
+                                        p[1].Y = p[0].Y;
+                                        p[2].X = p[0].X + 3;
+                                        p[2].Y = p[0].Y - 4;
+                                        break;
+                                    }
+                                case ePopupSide.Bottom:
+                                    {
+                                        p[0].X = itemRect.Left + sr.Left + (sr.Width - 5) / 2 + 1;
+                                        p[0].Y = itemRect.Top + sr.Top + (sr.Height - 3) / 2 + 1;
+                                        p[1].X = p[0].X + 5;
+                                        p[1].Y = p[0].Y;
+                                        p[2].X = p[0].X + 2;
+                                        p[2].Y = p[0].Y + 3;
+                                        break;
+                                    }
+                            }
+                        }
+
+                        if (button.SplitButton && !button.TextDrawRect.IsEmpty && (button.ImagePosition == eImagePosition.Top))
+                        {
+                            p[0].Y -= 3;
+                            p[1].Y -= 3;
+                            p[2].Y -= 3;
+                        }
+
+                        if (enabled)
+                        {
+                            SmoothingMode sm = g.SmoothingMode;
+                            g.SmoothingMode = SmoothingMode.None;
+                            g.FillPolygon(textBrush, p);
+                            g.SmoothingMode = sm;
+
+                        }
+                        else
+                        {
+                            SmoothingMode sm = g.SmoothingMode;
+                            g.SmoothingMode = SmoothingMode.None;
+                            using (SolidBrush mybrush = new SolidBrush(pa.Colors.ItemDisabledText))
+                                g.FillPolygon(mybrush, p);
+                            g.SmoothingMode = sm;
+                        }
+                    }
+
+                    Rectangle r = GetTotalSubItemsRect(button);
+                    if (enabled && !r.IsEmpty && (mouseOver || button.Expanded && !pa.IsOnMenu) && !button.AutoExpandOnClick)
+                    {
+                        r.Offset(itemRect.Location);
+                        Point[] pt = new Point[4];
+                        if (pa.ContainerControl is RibbonBar && (button.ImagePosition == eImagePosition.Top || button.ImagePosition == eImagePosition.Bottom))
+                        {
+                            pt[0] = new Point(r.X + 1, r.Y);
+                            pt[1] = new Point(r.Right - 2, r.Y);
+                            pt[2] = new Point(r.X + 1, r.Y + 1);
+                            pt[3] = new Point(r.Right - 2, r.Y + 1);
+                            if (button.SplitButton)
+                            {
+                                pt[0].Y--;
+                                pt[1].Y--;
+                                pt[2].Y--;
+                                pt[3].Y--;
+                            }
+                        }
+                        else
+                        {
+                            r.Y += 1;
+                            r.Height -= 3;
+                            if (pa.RightToLeft)
+                                r.X = r.Right - 1;
+                            pt[0] = new Point(r.X, r.Y);
+                            pt[1] = new Point(r.X, r.Bottom);
+                            pt[2] = new Point(r.X + 1, r.Y);
+                            pt[3] = new Point(r.X + 1, r.Bottom);
+                        }
+                        eDotNetBarStyle effectiveStyle = button.EffectiveStyle;
+                        if (effectiveStyle != eDotNetBarStyle.Office2010 && effectiveStyle != eDotNetBarStyle.Windows7 && !StyleManager.IsMetro(effectiveStyle) || button.Checked)
+                        {
+                            using (Pen pen = new Pen(buttonColorTable.MouseOver.SplitBorder.Start))
+                                g.DrawLine(pen, pt[0], pt[1]); //r.X, r.Y, r.X, r.Bottom);
+                            using (Pen pen = new Pen(buttonColorTable.MouseOver.SplitBorderLight.Start))
+                                g.DrawLine(pen, pt[2], pt[3]); //r.X + 1, r.Y, r.X + 1, r.Bottom);
+                        }
+                    }
+
+
+                }
+            }
+        }
+
+        protected override void PaintMenuItemSide(ButtonItem button, ItemPaintArgs pa, Rectangle sideRect)
+        {
+            if (IsOffice2003Rendering(button, pa))
+            {
+                base.PaintMenuItemSide(button, pa, sideRect);
+                return;
+            }
+
+            Graphics g = pa.Graphics;
+            Office2007MenuColorTable ct = m_ColorTable.Menu;
+            Region oldClip = g.Clip.Clone() as Region;
+            g.SetClip(sideRect);
+
+            sideRect.Inflate(0, 1);
+
+            // Draw side bar
+            if (button.MenuVisibility == eMenuVisibility.VisibleIfRecentlyUsed && !button.RecentlyUsed)
+                DisplayHelp.FillRectangle(g, sideRect, ct.SideUnused);
+            else
+                DisplayHelp.FillRectangle(g, sideRect, ct.Side);
+
+            if (pa.RightToLeft)
+            {
+                Point p = new Point(sideRect.X, sideRect.Y);
+                DisplayHelp.DrawGradientLine(g, p, new Point(p.X, p.Y + sideRect.Height), ct.SideBorder, 1);
+
+                p.X++;
+
+                DisplayHelp.DrawGradientLine(g, p, new Point(p.X, p.Y + sideRect.Height), ct.SideBorderLight, 1);
+            }
+            else
+            {
+                Point p = new Point(sideRect.Right - 2, sideRect.Y);
+                DisplayHelp.DrawGradientLine(g, p, new Point(p.X, p.Y + sideRect.Height), ct.SideBorder, 1);
+
+                p.X++;
+
+                DisplayHelp.DrawGradientLine(g, p, new Point(p.X, p.Y + sideRect.Height), ct.SideBorderLight, 1);
+            }
+
+            if (oldClip != null)
+                g.Clip = oldClip;
+            else
+                g.ResetClip();
+        }
+
+        protected override void PaintButtonCheckBackground(ButtonItem button, ItemPaintArgs pa, Rectangle r)
+        {
+            if (IsOffice2003Rendering(button, pa))
+            {
+                base.PaintButtonCheckBackground(button, pa, r);
+                return;
+            }
+
+            Graphics g = pa.Graphics;
+            bool isOnMenu = IsOnMenu(button, pa);
+            int cornerSize = m_CornerSize;
+            if (pa.ContainerControl is ButtonX)
+                cornerSize = ((ButtonX)pa.ContainerControl).CornerSize;
+            if (!button.IsMouseOver || isOnMenu)
+            {
+                Rectangle backRect = r;
+                backRect.Inflate(-1, -1);
+                DisplayHelp.FillRectangle(g, backRect, pa.Colors.ItemCheckedBackground, pa.Colors.ItemCheckedBackground2, pa.Colors.ItemCheckedBackgroundGradientAngle);
+                DisplayHelp.DrawRoundedRectangle(g, pa.Colors.ItemCheckedBorder, r, cornerSize);
+            }
+        }
+
+        protected static readonly Type ButtonColorTableType = typeof(Office2007ButtonItemColorTable);
+        public virtual Office2007ButtonItemColorTable GetColorTable(ButtonItem button, eButtonContainer buttonCont)
+        {
+            Office2007ColorTable colorTable = this.ColorTable;
+            Office2007ButtonItemColorTable buttonColorTable = null;
+            if (buttonCont == eButtonContainer.StatusBar)
+            {
+                object st = null;
+                if (colorTable.ContextualTables.TryGetValue(Office2007ColorTable.GetContextualKey(ButtonColorTableType, "StatusBar"), out st))
+                    return (Office2007ButtonItemColorTable)st;
+            }
+            if (buttonCont == eButtonContainer.RibbonBar && colorTable.RibbonButtonItemColors.Count > 0)
+            {
+                if (button.CustomColorName != "")
+                    buttonColorTable = colorTable.RibbonButtonItemColors[button.CustomColorName];
+
+                if (buttonColorTable == null)
+                    buttonColorTable = colorTable.RibbonButtonItemColors[button.GetColorTableName()];
+
+                if (buttonColorTable != null)
+                    return buttonColorTable;
+            }
+            else if ((buttonCont == eButtonContainer.MenuBar || buttonCont == eButtonContainer.StatusBar) && colorTable.MenuButtonItemColors.Count > 0)
+            {
+                if (button.CustomColorName != "")
+                    buttonColorTable = colorTable.MenuButtonItemColors[button.CustomColorName];
+
+                if (buttonColorTable == null)
+                    buttonColorTable = colorTable.MenuButtonItemColors[button.GetColorTableName()];
+
+                if (buttonColorTable != null)
+                    return buttonColorTable;
+            }
+            else if (buttonCont == eButtonContainer.Backstage && colorTable.BackstageButtonItemColors.Count > 0)
+            {
+                if (button.CustomColorName != "")
+                    buttonColorTable = colorTable.BackstageButtonItemColors[button.CustomColorName];
+
+                if (buttonColorTable == null)
+                    buttonColorTable = colorTable.BackstageButtonItemColors[button.GetColorTableName()];
+
+                if (buttonColorTable != null)
+                    return buttonColorTable;
+            }
+            else if (buttonCont == eButtonContainer.NavigationPane && colorTable.NavigationPaneButtonItemColors.Count > 0)
+            {
+                if (button.CustomColorName != "")
+                    buttonColorTable = colorTable.NavigationPaneButtonItemColors[button.CustomColorName];
+
+                if (buttonColorTable == null)
+                    buttonColorTable = colorTable.NavigationPaneButtonItemColors[button.GetColorTableName()];
+
+                if (buttonColorTable != null)
+                    return buttonColorTable;
+            }
+
+            if (button.CustomColorName != "")
+                buttonColorTable = colorTable.ButtonItemColors[button.CustomColorName];
+
+            try
+            {
+                if (buttonColorTable == null)
+                    buttonColorTable = colorTable.ButtonItemColors[button.GetColorTableName()];
+
+                if (buttonColorTable == null)
+                    return colorTable.ButtonItemColors[0];
+            }
+            catch
+            {
+                buttonColorTable = Office2007ColorTable.GetFallBackButtonItemColorTable();
+            }
+            return buttonColorTable;
+        }
+
+        private eButtonContainer GetButtonContainerQualifier(ItemPaintArgs pa, ButtonItem button)
+        {
+            eButtonContainer buttonCont = eButtonContainer.None;
+            if (pa.ContainerControl is RibbonBar)
+                buttonCont = eButtonContainer.RibbonBar;
+            else if (pa.ContainerControl is RibbonStrip)
+                buttonCont = eButtonContainer.RibbonStrip;
+            else if (pa.ContainerControl is DevComponents.DotNetBar.Metro.MetroTabStrip)
+                buttonCont = eButtonContainer.MetroTabStrip;
+            else if (pa.ContainerControl is Bar)
+            {
+                Bar bar = pa.ContainerControl as Bar;
+                if (bar.MenuBar)
+                    buttonCont = eButtonContainer.MenuBar;
+                else if (bar.LayoutType == eLayoutType.Toolbar)
+                {
+                    if (bar.BarType == eBarType.StatusBar || bar.GrabHandleStyle == eGrabHandleStyle.ResizeHandle || bar.Dock == DockStyle.Bottom || bar.DockSide == eDockSide.Bottom)
+                        buttonCont = eButtonContainer.StatusBar;
+                    else
+                        buttonCont = eButtonContainer.Toolbar;
+                }
+            }
+            else if (pa.IsOnMenu || pa.IsOnPopupBar)
+                buttonCont = eButtonContainer.Popup;
+            else if (pa.ContainerControl is SuperTabStrip && ((SuperTabStrip)pa.ContainerControl).ApplicationButton != null)
+                buttonCont = eButtonContainer.Backstage;
+            else if (pa.ContainerControl is NavigationBar)
+                buttonCont = eButtonContainer.NavigationPane;
+
+            return buttonCont;
+        }
+
+        protected virtual Color GetTextColor(ButtonItem button, ItemPaintArgs pa, Office2007ButtonItemColorTable buttonColorTable)
+        {
+            return GetTextColor(button, pa, buttonColorTable, false);
+        }
+        protected virtual Color GetTextColor(ButtonItem button, ItemPaintArgs pa, Office2007ButtonItemColorTable buttonColorTable, bool isExpandPart)
+        {
+            Color textColor = Color.Empty;
+
+            bool isMouseOver = button.IsMouseOver;
+            if (isMouseOver)
+            {
+                if (isExpandPart)
+                {
+                    if (!button.IsMouseOverExpand)
+                        isMouseOver = false;
+                }
+                else if (button.IsMouseOverExpand && button.SplitButton && !button.AutoExpandOnClick)
+                    isMouseOver = false;
+                else if (button.IsMouseOverExpand && !isExpandPart && !button.AutoExpandOnClick)
+                    isMouseOver = false;
+            }
+
+            if (isMouseOver)
+            {
+                if (!button.HotForeColor.IsEmpty)
+                    textColor = button.HotForeColor;
+            }
+            else if (!button.ForeColor.IsEmpty)
+                textColor = button.ForeColor;
+
+            if (textColor.IsEmpty)
+            {
+                if (buttonColorTable != null)
+                {
+                    if (!button.GetEnabled(pa.ContainerControl))
+                    {
+                        if (buttonColorTable.Disabled != null)
+                            textColor = buttonColorTable.Disabled.Text;
+                    }
+                    else if (button.IsMouseDown)
+                        textColor = buttonColorTable.Pressed.Text;
+                    else if (isMouseOver && !(StyleManager.IsMetro(button.EffectiveStyle) && button.Expanded))
+                        textColor = buttonColorTable.MouseOver.Text;
+                    else if (button.Expanded && (button.AutoExpandOnClick && !button.SplitButton))
+                        textColor = buttonColorTable.Expanded.Text;
+                    else if (button.Checked && !IsOnMenu(button, pa))
+                        textColor = buttonColorTable.Checked.Text;
+                    else
+                        textColor = buttonColorTable.Default.Text;
+                }
+            }
+
+            if (textColor.IsEmpty)
+                return base.GetTextColor(button, pa);
+
+            return textColor;
+        }
+
+        protected override Color GetTextColor(ButtonItem button, ItemPaintArgs pa)
+        {
+            bool enabled = IsItemEnabled(button, pa);
+
+            if (enabled && button.IsMouseOver && !button.HotForeColor.IsEmpty)
+                return button.HotForeColor;
+            if (enabled && !button.ForeColor.IsEmpty)
+                return button.ForeColor;
+            if (enabled && button.ForeColorColorSchemePart != eColorSchemePart.None)
+                return (Color)pa.Colors.GetType().GetProperty(button.ForeColorColorSchemePart.ToString()).GetValue(pa.Colors, null);
+
+            eButtonContainer buttonCont = GetButtonContainerQualifier(pa, button);
+
+            if (!enabled || IsOffice2003Rendering(button, pa))
+            {
+                if (enabled && buttonCont == eButtonContainer.MenuBar && !button.IsMouseDown && !button.IsMouseOver && !button.Expanded && !button.Checked)
+                {
+                    Office2007ButtonItemColorTable bt = GetColorTable(button, buttonCont);
+                    return bt.Default.Text;
+                }
+                return base.GetTextColor(button, pa);
+            }
+
+            Color textColor = Color.Empty;
+            if (buttonCont == eButtonContainer.RibbonStrip && !button.IsMouseOver && !button.IsMouseDown && !button.Expanded)
+            {
+                Office2007RibbonTabItemColorTable rtc = Office2007RibbonTabItemPainter.GetColorTable(m_ColorTable);
+                if (pa.GlassEnabled && !rtc.Default.GlassText.IsEmpty)
+                    return rtc.Default.GlassText;
+                    
+                return rtc.Default.Text;
+            }
+
+            Office2007ButtonItemColorTable buttonColorTable = GetColorTable(button, buttonCont);
+            textColor = GetTextColor(button, pa, buttonColorTable);
+
+            return textColor;
+        }
+        #endregion
+
+        #region IOffice2007Painter Members
+
+        public Office2007ColorTable ColorTable
+        {
+            get
+            {
+                return m_ColorTable;
+            }
+            set
+            {
+                m_ColorTable = value;
+            }
+        }
+
+
+        #endregion
+    }
+
+    internal enum eButtonContainer
+    {
+        None,
+        RibbonBar,
+        Popup,
+        RibbonStrip,
+        MenuBar,
+        StatusBar,
+        Toolbar,
+        Backstage,
+        NavigationPane,
+        MetroTabStrip
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Ribbon/Office2007DialogLauncherPainter.cs b/PROMS/DotNetBar Source Code/Ribbon/Office2007DialogLauncherPainter.cs
new file mode 100644
index 00000000..e106e2d6
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Ribbon/Office2007DialogLauncherPainter.cs	
@@ -0,0 +1,121 @@
+using System;
+using System.Text;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using DevComponents.DotNetBar.Rendering;
+
+
+namespace DevComponents.DotNetBar
+{
+    internal class Office2007DialogLauncherPainter : DialogLauncherPainter, IOffice2007Painter
+    {
+        #region IOffice2007Painter
+        private Office2007ColorTable m_ColorTable = null; //new Office2007ColorTable();
+
+        /// <summary>
+        /// Gets or sets color table used by renderer.
+        /// </summary>
+        public Office2007ColorTable ColorTable
+        {
+            get { return m_ColorTable; }
+            set { m_ColorTable = value; }
+        }
+        #endregion
+
+        
+        #region Dialog Launcher Painter
+        public override void PaintDialogLauncher(RibbonBarRendererEventArgs e)
+        {
+            Rectangle r = e.Bounds;
+            Graphics g = e.Graphics;
+            bool rightToLeft = (e.RibbonBar.RightToLeft == System.Windows.Forms.RightToLeft.Yes);
+            Office2007DialogLauncherStateColorTable c = GetColorTable(e);
+
+            if (!c.TopBackground.IsEmpty && !c.BottomBackground.IsEmpty)
+            {
+                Presentation.Rectangle pr = new Presentation.Rectangle(
+                    new Presentation.ShapeBorder(c.OuterBorder), new Presentation.ShapeFill(c.TopBackground));
+                pr.Padding = new Presentation.PaddingInfo(1, 1, 1, 1);
+                Presentation.Rectangle prb = new Presentation.Rectangle(new Presentation.ShapeFill(c.BottomBackground));
+                prb.Size.Height = r.Height / 2;
+                pr.Children.Add(prb);
+                prb = new Presentation.Rectangle(new Presentation.ShapeBorder(c.InnerBorder));
+                pr.Children.Add(prb);
+                Presentation.ShapePaintInfo pi = new Presentation.ShapePaintInfo(g, r);
+                pr.Paint(pi);
+            }
+
+            Size size = new Size(Dpi.Width8, Dpi.Height8);
+
+            // Get final dialog launcher bounds
+            if (rightToLeft)
+                r = new Rectangle(r.X + (r.Width - size.Width) / 2, r.Y + (r.Height - size.Height) / 2, size.Width, size.Height);
+            else
+                r = new Rectangle(r.X + (r.Width - size.Width)/2, r.Y + (r.Height - size.Height) / 2, size.Width, size.Height);
+
+            SmoothingMode sm = g.SmoothingMode;
+            g.SmoothingMode = SmoothingMode.Default;
+            
+            // Create the dialog launcher shape
+            Presentation.ShapeBorder border = new Presentation.ShapeBorder(c.DialogLauncherShade, 1);
+            Presentation.ShapeFill fill = new Presentation.ShapeFill(c.DialogLauncherShade);
+            Presentation.Shape shape = new Presentation.Shape();
+
+            // Horizontal line
+            Presentation.Line line = new Presentation.Line(new Presentation.Location(),
+                new Presentation.Location(Dpi.Width6, 0), border);
+            shape.Children.Add(line);
+
+            // Vertical line
+            line = new Presentation.Line(new Presentation.Location(),
+                new Presentation.Location(0, Dpi.Width6), border);
+            shape.Children.Add(line);
+
+            Presentation.Rectangle rect = new Presentation.Rectangle();
+            rect.Fill = fill;
+            rect.Location.X = Dpi.Width5;
+            rect.Location.Y = Dpi.Height5;
+            rect.Size.Width = Dpi.Width3;
+            rect.Size.Height = Dpi.Height3;
+            shape.Children.Add(rect);
+
+            // Arrow line vertical
+            line = new Presentation.Line(new Presentation.Location(Dpi.Width7, Dpi.Height4),
+                new Presentation.Location(Dpi.Width7, Dpi.Height7), border);
+            shape.Children.Add(line);
+            // Arrow line horizontal
+            line = new Presentation.Line(new Presentation.Location(Dpi.Width4, Dpi.Height7),
+                new Presentation.Location(Dpi.Width7, Dpi.Height7), border);
+            shape.Children.Add(line);
+            // Arrow line cross
+            line = new Presentation.Line(new Presentation.Location(Dpi.Width4, Dpi.Height4),
+                new Presentation.Location(Dpi.Width5, Dpi.Height5), border);
+            shape.Children.Add(line);
+
+            r.Offset(Dpi.Width1, Dpi.Height1);
+            Presentation.ShapePaintInfo p = new Presentation.ShapePaintInfo(g, r);
+            shape.Paint(p);
+
+            border.Color1 = c.DialogLauncher;
+            fill.Color1 = c.DialogLauncher;
+            r.Offset(-Dpi.Width1, -Dpi.Height1);
+            p.Bounds = r;
+            shape.Paint(p);
+
+            g.SmoothingMode = sm;
+        }
+
+        private Office2007DialogLauncherStateColorTable GetColorTable(RibbonBarRendererEventArgs e)
+        {
+            if (e.Pressed)
+                return m_ColorTable.DialogLauncher.Pressed;
+            else if (e.MouseOver)
+                return m_ColorTable.DialogLauncher.MouseOver;
+            else
+                return m_ColorTable.DialogLauncher.Default;
+        }
+
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Ribbon/Office2007ItemContainerPainter.cs b/PROMS/DotNetBar Source Code/Ribbon/Office2007ItemContainerPainter.cs
new file mode 100644
index 00000000..247f80d8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Ribbon/Office2007ItemContainerPainter.cs	
@@ -0,0 +1,186 @@
+using System;
+using System.Text;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using DevComponents.DotNetBar.Rendering;
+
+namespace DevComponents.DotNetBar
+{
+    internal class Office2007ItemContainerPainter : ItemContainerPainter, IOffice2007Painter
+    {
+        #region IOffice2007Painter
+        private Office2007ColorTable m_ColorTable = null; //new Office2007ColorTable();
+        /// <summary>
+        /// Gets or sets color table used by renderer.
+        /// </summary>
+        public Office2007ColorTable ColorTable
+        {
+            get { return m_ColorTable; }
+            set { m_ColorTable = value; }
+        }
+        #endregion
+
+        #region PaintBackground
+        public override void PaintBackground(ItemContainerRendererEventArgs e)
+        {
+            if (!BarFunctions.IsOffice2007Style(e.ItemContainer.EffectiveStyle))
+                return;
+
+            ItemContainer container = e.ItemContainer;
+            Office2007ItemGroupColorTable gt = m_ColorTable.ItemGroup;
+
+            if (container.SubItems.Count == 0 && (container.WidthInternal <= 0 || container.HeightInternal <= 0) || gt == null)
+                return;
+
+            Rectangle bounds = container.DisplayRectangle;
+
+            if (!container.BeginGroup || container.IsOnMenu && !(container.Parent is ItemContainer))
+            {
+                if (container.BackgroundStyle.Class == ElementStyleClassKeys.Office2007StatusBarBackground2Key && e.ItemPaintArgs != null &&
+                e.ItemPaintArgs.ContainerControl is Bar && ((Bar)e.ItemPaintArgs.ContainerControl).BarType == eBarType.StatusBar)
+                {                    
+                    bounds.Y = 1;
+                    if (!m_ColorTable.Bar.StatusBarTopBorderLight.IsEmpty) bounds.Y++;
+                    bounds.Height = e.ItemPaintArgs.ContainerControl.Height - 1;
+                    if (container.Parent.SubItems.IndexOf(container) == container.Parent.SubItems.Count - 1)
+                    {
+                        if (e.ItemPaintArgs.RightToLeft)
+                        {
+                            bounds.Width += bounds.X;
+                            bounds.X = 0;
+                        }
+                        else
+                        {
+                            bounds.Width += e.ItemPaintArgs.ContainerControl.Width - bounds.Right;
+                        }
+                    }
+                }
+                Region oldClip = e.Graphics.Clip;
+                e.Graphics.SetClip(bounds);
+                ElementStyleDisplay.Paint(new ElementStyleDisplayInfo(container.BackgroundStyle, e.Graphics, bounds));
+                e.Graphics.Clip = oldClip;
+                if (oldClip != null) oldClip.Dispose();
+                return;
+            }
+
+            bounds.Width -= container.BackgroundStyle.MarginHorizontal;
+            bounds.Height -= container.BackgroundStyle.MarginVertical;
+            bounds.X += container.BackgroundStyle.MarginLeft;
+            bounds.Y += container.BackgroundStyle.MarginTop;
+            //bounds.Width--;
+            //bounds.Height--;
+
+            Graphics g = e.Graphics;
+            int cornerSize = 2;
+
+            
+            //GraphicsPath path = DisplayHelp.GetRoundedRectanglePath(bounds, 2);
+
+            //using (SolidBrush brush = new SolidBrush(ColorScheme.GetColor("FEFFFF")))
+            //    g.FillPath(brush, path);
+
+            // Draw border
+            if (gt.OuterBorder != null && !gt.OuterBorder.IsEmpty)
+                DisplayHelp.DrawRoundGradientRectangle(g, bounds, gt.OuterBorder, 1, cornerSize);
+
+            if (gt.InnerBorder != null && !gt.InnerBorder.IsEmpty)
+            {
+                bounds.Inflate(-1, -1);
+                DisplayHelp.DrawRoundGradientRectangle(g, bounds, gt.InnerBorder, 1, cornerSize);
+            }
+
+            float topPart = .4f;
+
+            Rectangle r = bounds;
+            r.Inflate(-1, -1);
+
+            SmoothingMode sm = g.SmoothingMode;
+            g.SmoothingMode = SmoothingMode.Default;
+            if(gt.TopBackground!=null && !gt.TopBackground.IsEmpty)
+                DisplayHelp.FillRectangle(g, r, gt.TopBackground);
+            int topHeight = (int)(r.Height * topPart);
+            r.Height -= topHeight;
+            r.Y += topHeight;
+
+            if (gt.BottomBackground != null && !gt.BottomBackground.IsEmpty)
+                DisplayHelp.FillRectangle(g, r, gt.BottomBackground);
+            g.SmoothingMode = sm;
+            bool isVertical = container.LayoutOrientation == eOrientation.Vertical;
+            using (Pen penLight = new Pen(gt.ItemGroupDividerLight, 1))
+            {
+                using (Pen penDark = new Pen(gt.ItemGroupDividerDark))
+                {
+                    int c = container.SubItems.Count - 1;
+                    for (int i = 0; i <= c; i++)
+                    {
+                        BaseItem item = container.SubItems[i];
+                        if (!item.Visible || item.DisplayRectangle.Right == container.DisplayRectangle.Right || i == c)
+                            continue;
+                        if (isVertical)
+                        {
+                            g.DrawLine(penDark, container.DisplayRectangle.X + 1, item.DisplayRectangle.Bottom - 1, container.DisplayRectangle.Right - 1, item.DisplayRectangle.Bottom - 1);
+                            g.DrawLine(penLight, container.DisplayRectangle.X + 1, item.DisplayRectangle.Bottom, container.DisplayRectangle.Right, item.DisplayRectangle.Bottom);
+                        }
+                        else
+                        {
+                            g.DrawLine(penDark, item.DisplayRectangle.Right - 1, item.DisplayRectangle.Y + 1, item.DisplayRectangle.Right - 1, item.DisplayRectangle.Bottom - 2);
+                            g.DrawLine(penLight, item.DisplayRectangle.Right, item.DisplayRectangle.Y + 1, item.DisplayRectangle.Right, item.DisplayRectangle.Bottom - 2);
+                        }
+                    }
+                }
+            }
+
+            //path.Dispose();
+        }
+        #endregion
+
+        #region Paint Separator
+        public override void PaintItemSeparator(ItemContainerSeparatorRendererEventArgs e)
+        {
+            if (e.Item is ItemContainer)
+                return;
+
+            Graphics g = e.Graphics;
+            BaseItem item = e.Item;
+            Size imageSize = Size.Empty;
+            if (item is ImageItem)
+                imageSize = ((ImageItem)item).ImageSize;
+
+            ItemContainer container = e.ItemContainer;
+            Color color1 = m_ColorTable.LegacyColors.ItemSeparator;
+            Color color2 = m_ColorTable.LegacyColors.ItemSeparatorShade;
+
+            Point start = Point.Empty, end = Point.Empty;
+            Point start2 = Point.Empty, end2 = Point.Empty;
+
+            if (container.LayoutOrientation == eOrientation.Horizontal)
+            {
+                start = new Point(item.DisplayRectangle.X - 2, item.DisplayRectangle.Y + 3);
+                end = new Point(start.X, item.DisplayRectangle.Bottom - 4);
+                start2 = new Point(start.X + 1, start.Y);
+                end2 = new Point(end.X + 1, end.Y);
+            }
+            else
+            {
+                if (item.IsOnMenu)
+                {
+                    start = new Point(item.DisplayRectangle.X + imageSize.Width, item.DisplayRectangle.Y - 2);
+                    end = new Point(item.DisplayRectangle.Right-1, start.Y);
+                    start2 = new Point(start.X, start.Y + 1);
+                    end2 = new Point(end.X, end.Y + 1);
+                }
+                else
+                {
+                    start = new Point(item.DisplayRectangle.X + 3, item.DisplayRectangle.Y - 2);
+                    end = new Point(item.DisplayRectangle.Right - 4, start.Y);
+                    start2 = new Point(start.X, start.Y + 1);
+                    end2 = new Point(end.X, end.Y + 1);
+                }
+            }
+
+            DisplayHelp.DrawLine(g, start, end, color1, 1);
+            DisplayHelp.DrawLine(g, start2, end2, color2, 1);
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Ribbon/Office2007KeyTipsPainter.cs b/PROMS/DotNetBar Source Code/Ribbon/Office2007KeyTipsPainter.cs
new file mode 100644
index 00000000..e7fdd531
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Ribbon/Office2007KeyTipsPainter.cs	
@@ -0,0 +1,51 @@
+using System;
+using System.Text;
+using System.Drawing;
+using DevComponents.DotNetBar.Rendering;
+
+namespace DevComponents.DotNetBar
+{
+    internal class Office2007KeyTipsPainter : KeyTipsPainter, IOffice2007Painter
+    {
+        #region IOffice2007Painter
+        private Office2007ColorTable m_ColorTable = null; //new OfficeColorTable();
+
+        /// <summary>
+        /// Gets or sets color table used by renderer.
+        /// </summary>
+        public Office2007ColorTable ColorTable
+        {
+            get { return m_ColorTable; }
+            set { m_ColorTable = value; }
+        }
+        #endregion
+
+        #region Paint KeyTips
+        public override void PaintKeyTips(KeyTipsRendererEventArgs e)
+        {
+            Rectangle r = e.Bounds;
+            Color borderColor = m_ColorTable.KeyTips.KeyTipBorder;
+            Color textColor = m_ColorTable.KeyTips.KeyTipText;
+            Color backColor = m_ColorTable.KeyTips.KeyTipBackground;
+            
+            if (e.ReferenceObject is BaseItem && !((BaseItem)e.ReferenceObject).Enabled)
+            {
+                int alpha = 128;
+                backColor = Color.FromArgb(alpha, backColor);
+                textColor = Color.FromArgb(alpha, textColor);
+                borderColor = Color.FromArgb(alpha, borderColor);
+            }
+
+            Graphics g = e.Graphics;
+            string keyTip = e.KeyTip;
+            Font font = e.Font;
+
+            using (SolidBrush brush = new SolidBrush(backColor))
+                DisplayHelp.FillRoundedRectangle(g, brush, r, 2);
+            using (Pen pen = new Pen(textColor, 1))
+                DisplayHelp.DrawRoundedRectangle(g, pen, r, 2);
+            TextDrawing.DrawString(g, keyTip, font, textColor, r, eTextFormat.HorizontalCenter | eTextFormat.VerticalCenter);
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Ribbon/Office2007MdiSystemItemPainter.cs b/PROMS/DotNetBar Source Code/Ribbon/Office2007MdiSystemItemPainter.cs
new file mode 100644
index 00000000..20928ace
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Ribbon/Office2007MdiSystemItemPainter.cs	
@@ -0,0 +1,114 @@
+using System;
+using System.Drawing;
+using System.Text;
+using DevComponents.DotNetBar.Rendering;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represents Office 2007 style MdiSystemItem painter
+    /// </summary>
+    internal class Office2007MdiSystemItemPainter : MdiSystemItemPainter, IOffice2007Painter
+    {
+        #region Private Variables
+        #endregion
+        #region IOffice2007Painter
+        private Office2007ColorTable m_ColorTable = null; //new Office2007ColorTable();
+
+        /// <summary>
+        /// Gets or sets color table used by renderer.
+        /// </summary>
+        public Office2007ColorTable ColorTable
+        {
+            get { return m_ColorTable; }
+            set { m_ColorTable = value; }
+        }
+        #endregion
+
+        public override void Paint(MdiSystemItemRendererEventArgs e)
+        {
+            MDISystemItem mdi = e.MdiSystemItem;
+            Graphics g = e.Graphics;
+            Rectangle r = mdi.DisplayRectangle;
+
+            if (mdi.IsSystemIcon)
+            {
+                r.Offset((r.Width - 16) / 2, (r.Height - 16) / 2);
+                if (mdi.Icon != null)
+                    g.DrawIconUnstretched(mdi.Icon, r);
+                return;
+            }
+
+            
+            r = new Rectangle(mdi.DisplayRectangle.Location, mdi.GetButtonSize());
+            if (mdi.Orientation == eOrientation.Horizontal)
+                r.Offset(0, (mdi.DisplayRectangle.Height - r.Height) / 2);
+            else
+                r.Offset((mdi.WidthInternal - r.Width) / 2, 0);
+
+            this.PaintButton(g, mdi, SystemButton.Minimize, r, GetColorTable(mdi, SystemButton.Minimize), m_ColorTable.LegacyColors);
+
+            if (mdi.Orientation == eOrientation.Horizontal)
+                r.Offset(r.Width, 0);
+            else
+                r.Offset(0, r.Height);
+            this.PaintButton(g, mdi, SystemButton.Restore, r, GetColorTable(mdi, SystemButton.Restore), m_ColorTable.LegacyColors);
+
+            if (mdi.Orientation == eOrientation.Horizontal)
+                r.Offset(r.Width + 2, 0);
+            else
+                r.Offset(0, r.Height + 2);
+
+            this.PaintButton(g, mdi, SystemButton.Close, r, GetColorTable(mdi, SystemButton.Close), m_ColorTable.LegacyColors);
+        }
+
+        private Office2007ButtonItemStateColorTable GetColorTable(MDISystemItem mdi, SystemButton button)
+        {
+            Office2007ButtonItemColorTable colors = m_ColorTable.ButtonItemColors[eButtonColor.Orange.ToString()];
+            Office2007ButtonItemStateColorTable ct = colors.Default;
+            if (mdi.MouseDownButton == button)
+                ct = colors.Pressed;
+            else if (mdi.MouseOverButton == button)
+                ct = colors.MouseOver;
+
+            return ct;
+        }
+
+        private void PaintButton(Graphics g, MDISystemItem mdi , SystemButton button, Rectangle r, Office2007ButtonItemStateColorTable ct, ColorScheme colorScheme)
+        {
+            Region oldClip = g.Clip;
+            g.SetClip(r);
+
+            Office2007ButtonItemPainter.PaintBackground(g, ct, r, RoundRectangleShapeDescriptor.RoundCorner2);
+            r.Inflate(-1, -1);
+            r.Offset(1, 0);
+            using (Bitmap bmp = mdi.GetButtonBitmap(g, button, r, colorScheme))
+            {
+                if (button == SystemButton.Minimize && !mdi.MinimizeEnabled ||
+                    button == SystemButton.Restore && !mdi.RestoreEnabled ||
+                    button == SystemButton.Close && !mdi.CloseEnabled)
+                {
+                    float[][] array = new float[5][];
+                    array[0] = new float[5] { 0, 0, 0, 0, 0 };
+                    array[1] = new float[5] { 0, 0, 0, 0, 0 };
+                    array[2] = new float[5] { 0, 0, 0, 0, 0 };
+                    array[3] = new float[5] { .5f, .5f, .5f, .5f, 0 };
+                    array[4] = new float[5] { 0, 0, 0, 0, 0 };
+                    System.Drawing.Imaging.ColorMatrix grayMatrix = new System.Drawing.Imaging.ColorMatrix(array);
+                    System.Drawing.Imaging.ImageAttributes disabledImageAttr = new System.Drawing.Imaging.ImageAttributes();
+                    disabledImageAttr.ClearColorKey();
+                    disabledImageAttr.SetColorMatrix(grayMatrix);
+                    g.DrawImage(bmp, r, 0, 0, bmp.Width, bmp.Height, GraphicsUnit.Pixel, disabledImageAttr);
+                }
+                else
+                {
+                    if (button == mdi.MouseDownButton)
+                        r.Offset(1, 1);
+                    g.DrawImageUnscaled(bmp, r);
+                }
+            }
+
+            g.Clip = oldClip;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Ribbon/Office2007RibbonControlPainter.cs b/PROMS/DotNetBar Source Code/Ribbon/Office2007RibbonControlPainter.cs
new file mode 100644
index 00000000..432990b7
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Ribbon/Office2007RibbonControlPainter.cs	
@@ -0,0 +1,994 @@
+using System;
+using System.Drawing;
+using System.Text;
+using System.Drawing.Drawing2D;
+using System.Collections;
+using System.Runtime.InteropServices;
+using DevComponents.DotNetBar.Rendering;
+
+namespace DevComponents.DotNetBar
+{
+    internal class Office2007RibbonControlPainter : RibbonControlPainter, Rendering.IOffice2007Painter
+    {
+        private Rendering.Office2007ColorTable m_ColorTable = null; //new Rendering.Office2007ColorTable();
+
+        #region Ribbon Control Background
+        /// <summary>
+        /// Paints controls background
+        /// </summary>
+        public override void PaintBackground(RibbonControlRendererEventArgs e)
+        {
+            Graphics g = e.Graphics;
+            RibbonControl rc = e.RibbonControl;
+            Rendering.Office2007RibbonColorTable ct = m_ColorTable.RibbonControl;
+            Rendering.Office2007RibbonTabItemStateColorTable selectedTabColors = null;
+
+            PaintCaptionBackground(e, rc.DisplayRectangle);
+
+            if (rc.Expanded && rc.RibbonStrip.HasVisibleTabs)
+            {
+                int cornerSize = ct.CornerSize;
+                // Draw the border which is base for the tabs
+                Rectangle selectedTabRect = Rectangle.Empty;
+                if (rc.SelectedRibbonTabItem == null || !rc.Expanded)
+                    selectedTabRect = Rectangle.Empty;
+                else
+                {
+                    selectedTabRect = rc.SelectedRibbonTabItem.DisplayRectangle;
+                    selectedTabColors = Office2007RibbonTabItemPainter.GetStateColorTable(Office2007RibbonTabItemPainter.GetColorTable(this.ColorTable, rc.SelectedRibbonTabItem), rc.SelectedRibbonTabItem, rc.Expanded);
+                }
+
+                Rectangle bottomBounds = new Rectangle(rc.ClientRectangle.X, rc.ClientRectangle.Bottom - cornerSize, rc.ClientRectangle.Width - 1, cornerSize);
+                if (!selectedTabRect.IsEmpty)
+                    bottomBounds = new Rectangle(rc.ClientRectangle.X, selectedTabRect.Bottom,
+                        rc.ClientRectangle.Width - 1, rc.ClientRectangle.Bottom - selectedTabRect.Bottom);
+
+                //using (GraphicsPath path = GetBottomLinePath(bottomBounds, cornerSize))
+                //{
+                //    using (SolidBrush brush = new SolidBrush(m_ColorTable.RibbonBar.Default.TopBackground.Start))
+                //        g.FillPath(brush, path);
+                //}
+
+                // Dark border
+                using (GraphicsPath path = GetBottomLinePath(bottomBounds, cornerSize))
+                {
+                    Region oldRegion = null;
+                    if (g.Clip != null) oldRegion = g.Clip as Region;
+                    
+                    if (!selectedTabRect.IsEmpty)
+                    {
+                        if (selectedTabColors != null)
+                        {
+                            using (Pen pen = new Pen(selectedTabColors.Background.End.IsEmpty ? selectedTabColors.Background.Start : selectedTabColors.Background.End, 1))
+                                g.DrawLine(pen, selectedTabRect.X + 1, selectedTabRect.Bottom, selectedTabRect.Right - 1, selectedTabRect.Bottom);
+                        }
+                        g.SetClip(new Rectangle(selectedTabRect.X + 1, selectedTabRect.Bottom, selectedTabRect.Width - 1, 1), CombineMode.Exclude);
+                        if (StyleManager.IsMetro(rc.EffectiveStyle))
+                        {
+                            ApplicationButton appButton = rc.GetApplicationButton() as ApplicationButton;
+                            if (appButton != null && appButton.Displayed)
+                            {
+                                Rectangle rApp = appButton.Bounds;
+                                g.TranslateTransform(0, 1);
+                                appButton.Paint(e.ItemPaintArgs);
+                                g.TranslateTransform(0, -1);
+                                rApp.Inflate(0, 2);
+                                rApp.Width-=3;
+                                g.SetClip(rApp, CombineMode.Exclude);
+                            }
+                        }
+                    }
+
+                    using (Pen pen = new Pen(ct.OuterBorder.Start, 1))
+                        g.DrawPath(pen, path);
+
+                    if (!selectedTabRect.IsEmpty)
+                    {
+                        if (oldRegion != null)
+                            g.Clip = oldRegion;
+                        else
+                            g.ResetClip();
+                    }
+                    if (oldRegion != null) oldRegion.Dispose();
+                }
+
+                // Light border
+                bottomBounds.Y++;
+                if (ct.InnerBorder != null)
+                {
+                    using (GraphicsPath path = GetBottomLinePath(bottomBounds, cornerSize))
+                    {
+                        using (Pen pen = new Pen(ct.InnerBorder.Start, 1))
+                            g.DrawPath(pen, path);
+                    }
+                }
+            }
+            else
+            {
+                int topLineY = rc.ClientRectangle.Bottom - 2;
+                if (!ct.TabDividerBorder.IsEmpty)
+                {
+                    using (Pen pen = new Pen(ct.TabDividerBorder, 1))
+                        g.DrawLine(pen, 0, topLineY, rc.ClientRectangle.Right, topLineY);
+                    topLineY++;
+                }
+
+                if (!ct.TabDividerBorderLight.IsEmpty)
+                {
+                    using (Pen pen = new Pen(ct.TabDividerBorderLight, 1))
+                        g.DrawLine(pen, 0, topLineY, rc.ClientRectangle.Right, topLineY);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Paints form caption background
+        /// </summary>
+        public override void PaintCaptionBackground(RibbonControlRendererEventArgs e, Rectangle displayRect)
+        {
+            Graphics g = e.Graphics;
+            RibbonControl rc = e.RibbonControl;
+            Rendering.Office2007RibbonColorTable ct = m_ColorTable.RibbonControl;
+
+            // Draw top divider line that sits between the tabs and any items above
+            int topLineY = GetTabYPosition(rc.Items);
+            if (topLineY == -1) topLineY = rc.RibbonStrip.GetAbsoluteCaptionHeight() + 2;
+
+            if (topLineY > 2)
+            {
+                if (e.GlassEnabled && rc.EffectiveStyle == eDotNetBarStyle.Windows7)
+                    topLineY -= 2;
+                else
+                    topLineY -= 3;
+
+                if (!e.GlassEnabled)
+                {
+                    if (!ct.TabDividerBorder.IsEmpty)
+                    {
+                        using (Pen pen = new Pen(ct.TabDividerBorder, 1))
+                            g.DrawLine(pen, 0, topLineY, displayRect.Right + 12, topLineY); // 12 extension when painting from Office2007RibbonForm
+                        topLineY++;
+                    }
+
+                    if (!ct.TabDividerBorderLight.IsEmpty)
+                    {
+                        using (Pen pen = new Pen(ct.TabDividerBorderLight, 1))
+                            g.DrawLine(pen, 0, topLineY, displayRect.Right + 12, topLineY);
+                    }
+                }
+                else
+                {
+                    if (rc.EffectiveStyle != eDotNetBarStyle.Office2010 && !StyleManager.IsMetro(rc.EffectiveStyle))
+                    {
+                        using (Pen pen = new Pen(m_ColorTable.Form.Active.BorderColors[0], 1))
+                            g.DrawLine(pen, 0, topLineY, displayRect.Right + 12, topLineY); // 12 extension when painting from Office2007RibbonForm
+                    }
+                }
+            }
+
+            // Draw Caption if necessary
+            if (rc.RibbonStrip.CaptionVisible)
+            {
+                Rendering.Office2007FormStateColorTable formct = m_ColorTable.Form.Active;
+                System.Windows.Forms.Form form = rc.FindForm();
+                if (!rc.IsDesignMode && form != null && (form != System.Windows.Forms.Form.ActiveForm && form.MdiParent == null ||
+                    form.MdiParent != null && form.MdiParent.ActiveMdiChild != form))
+                {
+                    formct = m_ColorTable.Form.Inactive;
+                }
+                Rectangle captionRect = new Rectangle(displayRect.X, displayRect.Y, displayRect.Width, topLineY - 1);
+                if (captionRect.Height <= 0)
+                    captionRect.Height = rc.RibbonStrip.GetAbsoluteCaptionHeight();
+
+                if (!e.GlassEnabled)
+                {
+                    Rectangle drawRect = captionRect;
+                    if (form is RibbonForm)
+                        drawRect.Width = ((RibbonForm)form).Width;
+                    SmoothingMode sm = g.SmoothingMode;
+                    g.SmoothingMode = SmoothingMode.Default;
+
+                    if (!formct.CaptionTopBackground.End.IsEmpty && !formct.CaptionBottomBackground.End.IsEmpty)
+                    {
+                        using (LinearGradientBrush lb = new LinearGradientBrush(drawRect, formct.CaptionTopBackground.Start, formct.CaptionBottomBackground.End, formct.CaptionTopBackground.GradientAngle))
+                        {
+                            ColorBlend cb = new ColorBlend(4);
+                            cb.Colors = new Color[] { formct.CaptionTopBackground.Start, formct.CaptionTopBackground.End, formct.CaptionBottomBackground.Start, formct.CaptionBottomBackground.End };
+                            cb.Positions = new float[] { 0, .4f, .4f, 1f };
+                            lb.InterpolationColors = cb;
+                            g.FillRectangle(lb, drawRect);
+                        }
+                    }
+                    else
+                    {
+                        using (LinearGradientBrush lb = new LinearGradientBrush(drawRect, formct.CaptionTopBackground.Start, formct.CaptionBottomBackground.Start, formct.CaptionTopBackground.GradientAngle))
+                        {
+                            g.FillRectangle(lb, drawRect);
+                        }
+                    }
+                    //// Top Part
+                    //Rectangle topCaptionPart = new Rectangle(drawRect.X, drawRect.Y, drawRect.Width, (int)(drawRect.Height * .4));
+                    //DisplayHelp.FillRectangle(g, topCaptionPart, formct.CaptionTopBackground);
+                    //Rectangle bottomCaptionPart = new Rectangle(drawRect.X, topCaptionPart.Bottom, drawRect.Width, drawRect.Height - topCaptionPart.Height);
+                    //DisplayHelp.FillRectangle(g, bottomCaptionPart, formct.CaptionBottomBackground);
+                    g.SmoothingMode = sm;
+                }
+                rc.RibbonStrip.CaptionBounds = captionRect;
+            }
+        }
+
+        private GraphicsPath GetBottomLinePath(Rectangle bottomBounds, int cornerSize)
+        {
+            GraphicsPath path = new GraphicsPath();
+
+            if (cornerSize > 1)
+            {
+                if (bottomBounds.Height > cornerSize)
+                    path.AddLine(bottomBounds.X, bottomBounds.Bottom, bottomBounds.X, bottomBounds.Y + cornerSize);
+                ElementStyleDisplay.AddCornerArc(path, bottomBounds, cornerSize, eCornerArc.TopLeft);
+
+                path.AddLine(bottomBounds.X + cornerSize, bottomBounds.Y, bottomBounds.Right - cornerSize, bottomBounds.Y);
+
+                ElementStyleDisplay.AddCornerArc(path, bottomBounds, cornerSize, eCornerArc.TopRight);
+
+                if (bottomBounds.Height > cornerSize)
+                    path.AddLine(bottomBounds.Right, bottomBounds.Y + cornerSize, bottomBounds.Right, bottomBounds.Bottom);
+            }
+            else
+            {
+                path.AddLine(bottomBounds.X, bottomBounds.Y, bottomBounds.Right, bottomBounds.Y);
+                //path.AddRectangle(bottomBounds);
+            }
+
+            return path;
+        }
+
+        private int GetTabYPosition(SubItemsCollection c)
+        {
+            foreach (BaseItem item in c)
+            {
+                if (item is RibbonTabItem && item.Visible)
+                {
+                    return item.Bounds.Top;
+                }
+            }
+            return -1;
+        }
+        #endregion
+
+        #region IOffice2007Painter Members
+
+        public DevComponents.DotNetBar.Rendering.Office2007ColorTable ColorTable
+        {
+            get
+            {
+                return m_ColorTable;
+            }
+            set
+            {
+                m_ColorTable = value;
+            }
+        }
+
+        #endregion
+
+        #region Form Caption Text Drawing
+        public override void PaintCaptionText(RibbonControlRendererEventArgs e)
+        {
+            RibbonStrip rs = e.RibbonControl.RibbonStrip;
+            if (!rs.CaptionVisible || rs.CaptionBounds.IsEmpty)
+                return;
+
+            Graphics g = e.Graphics;
+            bool isMaximized = false;
+            bool isFormActive = true;
+            Rendering.Office2007FormStateColorTable formct = m_ColorTable.Form.Active;
+            System.Windows.Forms.Form form = rs.FindForm();
+            bool renderText = true;
+            if (form is RibbonForm && !((RibbonForm)form).RenderFormText) renderText = false;
+
+            if (form != null && (form != System.Windows.Forms.Form.ActiveForm && form.MdiParent == null ||
+                form.MdiParent != null && form.MdiParent.ActiveMdiChild != form))
+            {
+                formct = m_ColorTable.Form.Inactive;
+                isFormActive = false;
+            }
+            string text = e.RibbonControl.TitleText;
+            string plainText = text;
+            bool isTitleTextMarkup = e.RibbonControl.RibbonStrip.TitleTextMarkupBody != null;
+            if (isTitleTextMarkup)
+                plainText = e.RibbonControl.RibbonStrip.TitleTextMarkupBody.PlainText;
+            if (form != null)
+            {
+                if (text == "")
+                {
+                    text = form.Text;
+                    plainText = text;
+                }
+                isMaximized = form.WindowState == System.Windows.Forms.FormWindowState.Maximized;
+            }
+
+            Rectangle captionRect = rs.CaptionBounds;
+
+            // Exclude quick access toolbar if any
+            if (!rs.QuickToolbarBounds.IsEmpty)
+                DisplayHelp.ExcludeEdgeRect(ref captionRect, rs.QuickToolbarBounds);
+            else
+            {
+                BaseItem sb = e.RibbonControl.GetApplicationButton();
+                if (sb != null && sb.Visible && sb.Displayed)
+                    DisplayHelp.ExcludeEdgeRect(ref captionRect, sb.Bounds);
+                else
+                    DisplayHelp.ExcludeEdgeRect(ref captionRect, new Rectangle(0, 0, 22, 22)); // The system button in top-left corner
+            }
+
+            if (!rs.SystemCaptionItemBounds.IsEmpty)
+                DisplayHelp.ExcludeEdgeRect(ref captionRect, rs.SystemCaptionItemBounds);
+
+
+            // Array of the rectangles after they are split
+            ArrayList rects = new ArrayList(5);
+            ArrayList tempRemoveList = new ArrayList(5);
+            // Exclude Context Tabs Captions if any
+            if (rs.TabGroupsVisible)
+            {
+                foreach (RibbonTabItemGroup group in rs.TabGroups)
+                {
+                    foreach (Rectangle r in group.DisplayPositions)
+                    {
+                        if (rects.Count > 0)
+                        {
+                            tempRemoveList.Clear();
+                            Rectangle[] arrCopy = new Rectangle[rects.Count];
+                            rects.CopyTo(arrCopy);
+                            for (int irc = 0; irc < arrCopy.Length; irc++)
+                            {
+                                if (arrCopy[irc].IntersectsWith(r))
+                                {
+                                    tempRemoveList.Add(irc);
+                                    Rectangle[] splitRects = DisplayHelp.ExcludeRectangle(arrCopy[irc], r);
+                                    rects.AddRange(splitRects);
+                                }
+                            }
+                            foreach (int idx in tempRemoveList)
+                                rects.RemoveAt(idx);
+                        }
+                        else
+                        {
+                            if (r.IntersectsWith(captionRect))
+                            {
+                                Rectangle[] splitRects = DisplayHelp.ExcludeRectangle(captionRect, r);
+                                if (splitRects.Length > 0)
+                                {
+                                    rects.AddRange(splitRects);
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
+            Font font = SystemFonts.CaptionFont;
+            bool disposeFont = true;
+            if (rs.CaptionFont != null)
+            {
+                font.Dispose();
+                font = rs.CaptionFont;
+                disposeFont = false;
+            }
+            Size textSize = Size.Empty;
+            if (isTitleTextMarkup)
+            {
+                textSize = e.RibbonControl.RibbonStrip.TitleTextMarkupBody.Bounds.Size;
+            }
+            else
+            {
+                textSize = TextDrawing.MeasureString(g, plainText, font);
+            }
+
+            if (rects.Count > 0)
+            {
+                rs.CaptionTextBounds = (Rectangle[])rects.ToArray(typeof(Rectangle));
+                if (e.RibbonControl.RightToLeft == System.Windows.Forms.RightToLeft.No)
+                    rects.Reverse();
+                captionRect = Rectangle.Empty;
+                foreach (Rectangle r in rects)
+                {
+                    if (r.Width >= textSize.Width)
+                    {
+                        captionRect = r;
+                        break;
+                    }
+                    else if (r.Width > captionRect.Width)
+                        captionRect = r;
+                }
+            }
+            else
+                rs.CaptionTextBounds = new Rectangle[] { captionRect };
+
+            if (captionRect.Width > 6 && captionRect.Height > 6 && renderText)
+            {
+                if (e.GlassEnabled && e.ItemPaintArgs != null && e.ItemPaintArgs.ThemeWindow != null && !e.RibbonControl.IsDesignMode)
+                {
+                    if (!e.ItemPaintArgs.CachedPaint || isMaximized)
+                        PaintGlassText(g, plainText, font, captionRect, isMaximized);
+                }
+                else
+                {
+                    if (!isTitleTextMarkup)
+                        TextDrawing.DrawString(g, plainText, font, formct.CaptionText, captionRect, eTextFormat.VerticalCenter | eTextFormat.HorizontalCenter | eTextFormat.EndEllipsis | eTextFormat.NoPrefix);
+                    else
+                    {
+                        TextMarkup.MarkupDrawContext d = new TextMarkup.MarkupDrawContext(g, font, formct.CaptionText, e.RibbonControl.RightToLeft == System.Windows.Forms.RightToLeft.Yes, captionRect, false);
+                        d.AllowMultiLine = false;
+                        d.IgnoreFormattingColors = !isFormActive;
+                        TextMarkup.BodyElement body = e.RibbonControl.RibbonStrip.TitleTextMarkupBody;
+                        if (e.RibbonControl.RibbonStrip.TitleTextMarkupLastArrangeBounds != captionRect)
+                        {
+                            body.Measure(captionRect.Size, d);
+                            body.Arrange(captionRect, d);
+                            e.RibbonControl.RibbonStrip.TitleTextMarkupLastArrangeBounds = captionRect;
+                            Rectangle mr = body.Bounds;
+                            if (mr.Width < captionRect.Width)
+                                mr.Offset((captionRect.Width - mr.Width) / 2, 0);
+                            if (mr.Height < captionRect.Height)
+                                mr.Offset(0, (captionRect.Height - mr.Height) / 2);
+                            body.Bounds = mr;
+                        }
+                        Region oldClip = g.Clip;
+                        g.SetClip(captionRect, CombineMode.Intersect);
+                        body.Render(d);
+                        g.Clip = oldClip;
+                        if (oldClip != null) oldClip.Dispose();
+                    }
+                }
+            }
+
+            if (disposeFont) font.Dispose();
+        }
+
+        //private void PaintGlassTextTheme(Graphics g, string text, Font font, Rectangle captionRect, ItemPaintArgs pa)
+        //{
+        //    //TextDrawing.DrawString(g, text, font, SystemColors.ActiveCaptionText, captionRect, eTextFormat.VerticalCenter | eTextFormat.HorizontalCenter | eTextFormat.EndEllipsis | eTextFormat.NoPrefix);
+        //    //Bitmap bmp = new Bitmap(captionRect.Width, captionRect.Height);
+        //    //bmp.MakeTransparent();
+        //    //using (Graphics gb = Graphics.FromImage(bmp))
+        //    {
+        //        //gb.FillRectangle(new SolidBrush(Color.Black), new Rectangle(0, 0, bmp.Width, bmp.Height));
+        //        //gb.FillRectangle(new SolidBrush(Color.FromArgb(186, Color.White)), new Rectangle(0, 0, bmp.Width, bmp.Height));
+        //        //g.ResetTransform();
+        //        //e.ItemPaintArgs.ThemeWindow.DrawText(g, text, font, captionRect,
+        //        //    ThemeWindowParts.Caption, ThemeWindowStates.CaptionActive);
+        //        //g.ResetTransform();
+        //        Themes.DTTOPTS options = new Themes.DTTOPTS();
+        //        options.iGlowSize = 12;
+        //        options.crText = new Themes.COLORREF(SystemColors.ActiveCaptionText);
+        //        options.dwFlags = (int)(Themes.DTT_VALIDBITS.DTT_TEXTCOLOR |
+        //            Themes.DTT_VALIDBITS.DTT_APPLYOVERLAY |
+        //            Themes.DTT_VALIDBITS.DTT_COMPOSITED | Themes.DTT_VALIDBITS.DTT_GLOWSIZE
+        //                                                                                     );
+        //        pa.ThemeWindow.DrawTextEx(g, text, font, captionRect,
+        //            ThemeWindowParts.Caption, ThemeWindowStates.CaptionActive,
+        //            ThemeTextFormat.Center | ThemeTextFormat.VCenter | ThemeTextFormat.EndEllipsis | ThemeTextFormat.NoPrefix |
+        //            ThemeTextFormat.SingleLine,
+        //            options);
+        //        //g.ResetTransform();
+        //    }
+
+        //    //bmp.MakeTransparent(Color.Black);
+        //    //g.DrawImage(bmp, captionRect.Location);
+        //    //bmp.Save(@"TitleImage.png", System.Drawing.Imaging.ImageFormat.Png);
+        //    //bmp.Dispose();
+        //}
+#if FRAMEWORK20
+        public static void PaintTextOnGlass(Graphics g, string text, Font font, Rectangle rect, ThemeTextFormat tf)
+        {
+            PaintTextOnGlass(g, text, font, rect, tf, SystemColors.ControlText, false, true, 16);
+        }
+        public static void PaintTextOnGlass(Graphics g, string text, Font font, Rectangle rect, ThemeTextFormat tf, Color textColor, bool copySourceBackground, bool renderGlow, int glowSize)
+        {
+            IntPtr hdc = g.GetHdc();
+            const int SRCCOPY = 0x00CC0020;
+            try
+            {
+                IntPtr memdc = WinApi.CreateCompatibleDC(hdc);
+                try
+                {
+                    WinApi.BITMAPINFO info = new WinApi.BITMAPINFO();
+                    info.biWidth = rect.Width;
+                    info.biHeight = -rect.Height;
+                    info.biPlanes = 1;
+                    info.biBitCount = 32;
+                    info.biSize = Marshal.SizeOf(info);
+                    IntPtr dib = WinApi.CreateDIBSection(hdc, info, 0, 0, IntPtr.Zero, 0);
+                    WinApi.SelectObject(memdc, dib);
+
+                    IntPtr fontHandle = font.ToHfont();
+                    WinApi.SelectObject(memdc, fontHandle);
+
+                    Themes.RECT bounds = new Themes.RECT(new Rectangle(0, 0, rect.Width, rect.Height));
+                    System.Windows.Forms.VisualStyles.VisualStyleRenderer themeRenderer = new System.Windows.Forms.VisualStyles.VisualStyleRenderer(System.Windows.Forms.VisualStyles.VisualStyleElement.Window.Caption.Active);
+                    Themes.DTTOPTS dttOpts = new Themes.DTTOPTS();
+                    dttOpts.iGlowSize = glowSize;
+                    dttOpts.crText = new Themes.COLORREF(textColor);
+                    dttOpts.dwFlags = (int)Themes.DTT_VALIDBITS.DTT_COMPOSITED |
+                        (renderGlow ? (int)Themes.DTT_VALIDBITS.DTT_GLOWSIZE : 0) |
+                        (int)Themes.DTT_VALIDBITS.DTT_TEXTCOLOR;
+                    dttOpts.dwSize = Marshal.SizeOf(dttOpts);
+
+                    if (copySourceBackground)
+                        WinApi.BitBlt(memdc, 0, 0, rect.Width, rect.Height, hdc, rect.Left, rect.Top, SRCCOPY);
+
+                    Themes.DrawThemeTextEx(themeRenderer.Handle, memdc, 0, 0, text, -1, (int)tf, ref bounds, ref dttOpts);
+
+                    WinApi.BitBlt(hdc, rect.Left, rect.Top, rect.Width, rect.Height, memdc, 0, 0, SRCCOPY);
+
+                    WinApi.DeleteObject(fontHandle);
+                    WinApi.DeleteObject(dib);
+                }
+                finally
+                {
+                    WinApi.DeleteDC(memdc);
+                }
+            }
+            finally
+            {
+                g.ReleaseHdc(hdc);
+            }
+        }
+
+        public static void PaintShadowTextOnGlass(Graphics g, string text, Font font, Rectangle rect, ThemeTextFormat tf, Color textColor, Color shadowColor, bool copySourceBackground)
+        {
+            Point transformPoint = new Point();
+            using (Matrix trans = g.Transform)
+            {
+                Point[] pts = new Point[1];
+                pts[0] = transformPoint;
+                trans.TransformPoints(pts);
+                transformPoint = pts[0];
+            }
+
+            IntPtr hdc = g.GetHdc();
+            const int SRCCOPY = 0x00CC0020;
+            try
+            {
+                IntPtr memdc = WinApi.CreateCompatibleDC(hdc);
+                try
+                {
+                    WinApi.BITMAPINFO info = new WinApi.BITMAPINFO();
+                    info.biWidth = rect.Width;
+                    info.biHeight = -rect.Height;
+                    info.biPlanes = 1;
+                    info.biBitCount = 32;
+                    info.biSize = Marshal.SizeOf(info);
+                    IntPtr dib = WinApi.CreateDIBSection(hdc, info, 0, 0, IntPtr.Zero, 0);
+                    WinApi.SelectObject(memdc, dib);
+
+                    IntPtr fontHandle = font.ToHfont();
+                    WinApi.SelectObject(memdc, fontHandle);
+
+                    Themes.RECT bounds = new Themes.RECT(new Rectangle(0, 0, rect.Width, rect.Height));
+                    System.Windows.Forms.VisualStyles.VisualStyleRenderer themeRenderer = new System.Windows.Forms.VisualStyles.VisualStyleRenderer(System.Windows.Forms.VisualStyles.VisualStyleElement.Window.Caption.Active);
+                    Themes.DTTOPTS dttOpts = new Themes.DTTOPTS();
+                    dttOpts.crText = new Themes.COLORREF(shadowColor);
+                    dttOpts.dwFlags = (int)Themes.DTT_VALIDBITS.DTT_COMPOSITED |
+                        (int)Themes.DTT_VALIDBITS.DTT_TEXTCOLOR;
+                    dttOpts.dwSize = Marshal.SizeOf(dttOpts);
+
+                    if (copySourceBackground)
+                        WinApi.BitBlt(memdc, 0, 0, rect.Width, rect.Height, hdc, rect.Left + transformPoint.X, rect.Top + transformPoint.Y, SRCCOPY);
+                    // Shadow
+                    bounds.Offset(1, 2);
+                    Themes.DrawThemeTextEx(themeRenderer.Handle, memdc, 0, 0, text, -1, (int)tf, ref bounds, ref dttOpts);
+                    bounds.Offset(-1, -1);
+                    dttOpts.crText = new Themes.COLORREF(textColor);
+                    Themes.DrawThemeTextEx(themeRenderer.Handle, memdc, 0, 0, text, -1, (int)tf, ref bounds, ref dttOpts);
+                    //Themes.DrawThemeTextEx(themeRenderer.Handle, memdc, 0, 0, text, -1, (int)tf, ref bounds, ref dttOpts);
+
+                    WinApi.BitBlt(hdc, rect.Left + transformPoint.X, rect.Top + transformPoint.Y, rect.Width, rect.Height, memdc, 0, 0, SRCCOPY);
+
+                    WinApi.DeleteObject(fontHandle);
+                    WinApi.DeleteObject(dib);
+                }
+                finally
+                {
+                    WinApi.DeleteDC(memdc);
+                }
+            }
+            finally
+            {
+                g.ReleaseHdc(hdc);
+            }
+        }
+
+        private void PaintGlassText(Graphics g, string text, Font font, Rectangle captionRect, bool isMaximized)
+        {
+            if (isMaximized && !BarFunctions.IsWindows7)
+            {
+                captionRect.Offset(0, 3);
+                TextDrawing.DrawString(g, text, font, Color.White, captionRect, eTextFormat.VerticalCenter | eTextFormat.HorizontalCenter | eTextFormat.EndEllipsis | eTextFormat.NoPrefix);
+                return;
+            }
+            if (isMaximized && BarFunctions.IsWindows7)
+            {
+                captionRect.Y += 6;
+                captionRect.Height -= 6;
+            }
+            ThemeTextFormat tf = ThemeTextFormat.Center | ThemeTextFormat.EndEllipsis | ThemeTextFormat.VCenter | ThemeTextFormat.SingleLine;
+            PaintTextOnGlass(g, text, font, captionRect, tf);
+        }
+#else
+        private void PaintGlassText(Graphics g, string text, Font font, Rectangle captionRect, bool isMaximized)
+        {
+            if (isMaximized)
+            {
+                captionRect.Offset(0, 3);
+                TextDrawing.DrawString(g, text, font, Color.White, captionRect, eTextFormat.VerticalCenter | eTextFormat.HorizontalCenter | eTextFormat.EndEllipsis | eTextFormat.NoPrefix);
+                return;
+            }
+
+            SmoothingMode sm = g.SmoothingMode;
+            g.SmoothingMode = SmoothingMode.HighQuality;
+            using (GraphicsPath path = new GraphicsPath())
+            {
+                StringFormat format = new StringFormat();
+                format.Alignment = StringAlignment.Center;
+                format.LineAlignment = StringAlignment.Center;
+                format.Trimming = StringTrimming.EllipsisCharacter;
+                format.HotkeyPrefix = System.Drawing.Text.HotkeyPrefix.None;
+                format.FormatFlags |= StringFormatFlags.NoWrap;
+                const float emMulti = 1.3285f;
+                path.AddString(text, font.FontFamily, (int)font.Style, font.SizeInPoints * emMulti, captionRect, format);
+
+                using (Pen glowPen = new Pen(Color.FromArgb(215, Color.White), 4f))
+                {
+                    //glowPen.PenType = PenType.PathGradient;
+                    GraphicsPath p1 = new GraphicsPath();
+                    Rectangle rc = captionRect;
+                    rc.Inflate(captionRect.Width/2, -3);
+                    p1.AddEllipse(rc);
+                    PathGradientBrush pb = new PathGradientBrush(p1);
+                    pb.CenterColor = Color.FromArgb(164, Color.White);
+                    pb.SurroundColors = new Color[] { Color.Transparent };
+                    glowPen.Brush = pb;
+                    g.DrawPath(glowPen, path);
+                }
+                //GraphicsPath glowPath = path.Clone() as GraphicsPath;
+                //using (Region reg = new Region())
+                //{
+                //    reg.MakeEmpty();
+                //    reg.Union(glowPath);
+                //    using (Pen pen = new Pen(Color.Black, 5))
+                //        glowPath.Widen(pen);
+                //    reg.Union(glowPath);
+                //    GraphicsPath p1 = new GraphicsPath();
+                //    RectangleF rf = glowPath.GetBounds();
+                //    p1.AddEllipse(rf.X - 12, rf.Y - 4, rf.Width + 24, rf.Height + 8);
+                //    using (PathGradientBrush pb = new PathGradientBrush(p1))
+                //    {
+                //        pb.CenterColor = Color.FromArgb(164, Color.White);
+                //        pb.SurroundColors = new Color[] { Color.Transparent };
+                //        Blend blend = new Blend();
+                //        blend.Factors = new float[] { 0f, .9f, 1f };
+                //        blend.Positions = new float[] { .0f, .9f, 1f };
+                //        pb.Blend = blend;
+                //        g.FillRegion(pb, reg);
+                //    }
+                //    p1.Dispose();
+                //    glowPath.Dispose();
+                //}
+                
+                g.FillPath(SystemBrushes.ActiveCaptionText, path);
+            }
+            g.SmoothingMode = sm;
+        }
+#endif
+
+        private class RectangleWidthComparer : IComparer
+        {
+            // Calls CaseInsensitiveComparer.Compare with the parameters reversed.
+            int IComparer.Compare(object x, object y)
+            {
+                if (x is Rectangle && y is Rectangle)
+                {
+                    return ((Rectangle)x).Width - ((Rectangle)y).Width;
+                }
+                else
+                    return ((new CaseInsensitiveComparer()).Compare(x, y));
+            }
+        }
+        #endregion
+
+        #region Quick Access Toolbar background
+        /// <summary>
+        /// Paints the background of quick access toolbar.
+        /// </summary>
+        public override void PaintQuickAccessToolbarBackground(RibbonControlRendererEventArgs e)
+        {
+            RibbonStrip rs = e.RibbonControl.RibbonStrip;
+            RibbonControl ribbon = e.RibbonControl;
+            if (!rs.CaptionVisible)
+                return;
+            eDotNetBarStyle effectiveStyle = ribbon.EffectiveStyle;
+            Graphics g = e.Graphics;
+            bool rightToLeft = (rs.RightToLeft == System.Windows.Forms.RightToLeft.Yes);
+            bool drawQatBackground = true;
+            // Get appropriate color table
+            Rendering.Office2007QuickAccessToolbarStateColorTable ct = m_ColorTable.QuickAccessToolbar.Active;
+            System.Windows.Forms.Form form = rs.FindForm();
+            bool isMaximized = false;
+            if (form != null) isMaximized = form.WindowState == System.Windows.Forms.FormWindowState.Maximized;
+            if (form != null && !e.RibbonControl.IsDesignMode && (form != System.Windows.Forms.Form.ActiveForm && form.MdiParent == null ||
+                form.MdiParent != null && form.MdiParent.ActiveMdiChild != form))
+                ct = m_ColorTable.QuickAccessToolbar.Inactive;
+
+            // Get right most X position of the Quick Access Toolbar
+            int right = 0, sysLeft = 0;
+            Size qatSize = Size.Empty;
+            for (int i = rs.QuickToolbarItems.Count - 1; i >= 0; i--)
+            {
+                BaseItem item = rs.QuickToolbarItems[i];
+                if (!item.Visible || !item.Displayed && !((RibbonStripContainerItem)rs.GetBaseItemContainer()).MetroBackstageOpen)
+                    continue;
+                if (item is QatCustomizeItem) qatSize = item.DisplayRectangle.Size;
+                if (item.ItemAlignment == eItemAlignment.Near && item.Visible && i > 0)
+                {
+                    if (rightToLeft)
+                        right = item.DisplayRectangle.X;
+                    else
+                        right = item.DisplayRectangle.Right;
+                    break;
+                }
+                else if (item.ItemAlignment == eItemAlignment.Far && item.Visible)
+                {
+                    if (rightToLeft)
+                        sysLeft = item.DisplayRectangle.Right;
+                    else
+                        sysLeft = item.DisplayRectangle.X;
+                }
+            }
+            if (right == 0) drawQatBackground = false;
+            if (rs.CaptionContainerItem is CaptionItemContainer && ((CaptionItemContainer)rs.CaptionContainerItem).MoreItems != null)
+            {
+                if (rightToLeft)
+                    right = ((CaptionItemContainer)rs.CaptionContainerItem).MoreItems.DisplayRectangle.X;
+                else
+                    right = ((CaptionItemContainer)rs.CaptionContainerItem).MoreItems.DisplayRectangle.Right;
+                qatSize = ((CaptionItemContainer)rs.CaptionContainerItem).MoreItems.DisplayRectangle.Size;
+            }
+
+            Rectangle r = rs.CaptionBounds;
+
+            if (sysLeft > 0)
+            {
+                if (rightToLeft)
+                    rs.SystemCaptionItemBounds = new Rectangle(r.X, r.Y, sysLeft, r.Height);
+                else
+                    rs.SystemCaptionItemBounds = new Rectangle(sysLeft, r.Y, r.Right - sysLeft, r.Height);
+            }
+
+            if (right == 0 || r.Height <= 0 || r.Width <= 0)
+                return;
+
+            if (!ribbon.QatPositionedBelowRibbon)
+            {
+                BaseItem startButton = ribbon.GetApplicationButton();
+                if (startButton != null)
+                {
+                    int startIndex = rs.QuickToolbarItems.IndexOf(startButton);
+                    if (rs.QuickToolbarItems.Count - 1 > startIndex)
+                    {
+                        BaseItem firstItem = rs.QuickToolbarItems[startIndex + 1];
+                        if (rightToLeft)
+                        {
+                            r.Width -= r.Right - firstItem.DisplayRectangle.Right;
+                        }
+                        else
+                        {
+                            r.Width -= firstItem.DisplayRectangle.X - r.X;
+                            r.X = firstItem.DisplayRectangle.X;
+                        }
+                    }
+                }
+                r.Height = ((CaptionItemContainer)ribbon.RibbonStrip.CaptionContainerItem).MaxItemHeight + 6;
+            }
+
+            // Create QAT rectangle
+            int reduction = (r.Right - right);
+
+            if (rightToLeft)
+            {
+                r.Width = reduction;
+                if (rightToLeft) r.X += right;
+            }
+            else
+            {
+                r.Width -= reduction;
+            }
+
+            if (e.GlassEnabled)
+            {
+                r.Inflate(0, -3);
+                r.Offset(0, 2);
+            }
+            else
+            {
+                r.Inflate(0, -2);
+                if (isMaximized)
+                {
+                    r.Y++;
+                    r.Height--;
+                }
+            }
+
+            // Draw it, fill first
+            GraphicsPath path = GetQuickToolbarBackPath(r, rightToLeft);
+            if (path == null) return;
+
+            // Get total background bounds and save them
+            Rectangle clip = Rectangle.Ceiling(path.GetBounds());
+            rs.QuickToolbarBounds = clip;
+
+            // Adjust the bounds of QAT so it is drawn before the QAT Customize Item
+            r.Width -= (qatSize.Width + qatSize.Height / 2);
+            if (rightToLeft)
+                r.X += (qatSize.Width + qatSize.Height / 2) + 3;
+            path.Dispose();
+            path = GetQuickToolbarBackPath(r, rightToLeft);
+
+            SmoothingMode sm = g.SmoothingMode;
+            if (!ribbon.QatPositionedBelowRibbon && drawQatBackground && r.Width > 6)
+            {
+                bool glassBorderPainted = false;
+                if (e.GlassEnabled)
+                {
+                    g.SmoothingMode = SmoothingMode.HighQuality;
+                    if (e.GlassEnabled && isMaximized && effectiveStyle == eDotNetBarStyle.Office2007)
+                    {
+                        DisplayHelp.FillPath(g, path, Color.FromArgb(72, Color.LightGray), Color.Empty);
+                    }
+                    if (!ct.GlassBorder.IsEmpty)
+                        DisplayHelp.DrawGradientPathBorder(g, path, ct.GlassBorder, 1);
+                    g.SmoothingMode = sm;
+                    if (e.GlassEnabled) glassBorderPainted = true;
+                }
+                else
+                {
+                    if (!ct.OutterBorderColor.IsEmpty)
+                    {
+                        g.SmoothingMode = SmoothingMode.HighQuality;
+                        r.X++;
+                        //r.Y++;
+                        r.Y--;
+                        r.Height += 2;
+                        using (GraphicsPath pathOuter = GetQuickToolbarBackPath(r, rightToLeft))
+                        {
+                            using (Pen pen = new Pen(ct.OutterBorderColor))
+                                g.DrawPath(pen, pathOuter);
+                        }
+                        r.X--;
+                        //r.Y--;
+                        r.Y++;
+                        r.Height -= 2;
+                        g.SmoothingMode = sm;
+                        if (e.GlassEnabled) glassBorderPainted = true;
+                    }
+                }
+
+                //if (!e.GlassEnabled) // Fill painted only if Glass is not enabled
+                //{
+                Region oldClip = g.Clip;
+                g.SetClip(path, CombineMode.Intersect);
+
+                Rectangle top = new Rectangle(clip.X, clip.Y, clip.Width, (int)(r.Height * .2));
+                Rectangle bottom = new Rectangle(clip.X, top.Bottom, clip.Width, clip.Height - top.Height);
+
+                g.SmoothingMode = SmoothingMode.Default;
+                if (!e.GlassEnabled)
+                {
+                    DisplayHelp.FillRectangle(g, top, ct.TopBackground);
+                    DisplayHelp.FillRectangle(g, bottom, ct.BottomBackground);
+                }
+                else
+                {
+                    if (!ct.GlassBorder.IsEmpty)
+                        DisplayHelp.FillRectangle(g, clip, Color.FromArgb(64, Color.White));
+                }
+                g.SmoothingMode = sm;
+                clip.Height -= 2;
+                clip.Width += 2;
+                clip.Y++;
+                clip.X++;
+                g.SetClip(clip);
+
+                //if (!ct.InnerBorderColor.IsEmpty)
+                //{
+                //    r.X--;
+                //    path = GetQuickToolbarBackPath(r, rightToLeft, true);
+                //    using (Pen pen = new Pen(ct.InnerBorderColor))
+                //        g.DrawPath(pen, path);
+                //    path.Dispose();
+                //    r.X++;
+                //}
+
+                g.Clip = oldClip;
+                if (oldClip != null) oldClip.Dispose();
+                //}
+
+                if (!ct.MiddleBorderColor.IsEmpty && !(e.GlassEnabled && glassBorderPainted))
+                {
+                    g.SmoothingMode = SmoothingMode.HighQuality;
+                    path = GetQuickToolbarBackPath(r, rightToLeft);
+                    using (Pen pen = new Pen(ct.MiddleBorderColor))
+                        g.DrawPath(pen, path);
+                    path.Dispose();
+                    path = null;
+                    g.SmoothingMode = sm;
+                }
+            }
+            if (path != null) path.Dispose();
+        }
+
+        private GraphicsPath GetQuickToolbarBackPath(Rectangle r, bool rightToLeft)
+        {
+            r.Offset(-1, 0);
+            r.Height--;
+            r.Width--;
+            if (r.Width < 2 || r.Height < 2) return null;
+            GraphicsPath path = new GraphicsPath();
+
+            int outdent = 11;
+            if (rightToLeft)
+            {
+                path.AddCurve(new Point[] { new Point(r.Right + outdent, r.Y), new Point(r.Right + 2, r.Y + 10), new Point(r.Right, r.Bottom) }, .6f);
+                path.AddLine(r.Right, r.Bottom, r.X, r.Bottom);
+                path.AddArc(r.X - (outdent + 1), r.Y, 20, r.Height, 90, 180);
+                path.AddLine(r.X, r.Y, r.Right + outdent, r.Y);
+            }
+            else
+            {
+                path.AddCurve(new Point[] { new Point(r.X - outdent, r.Y), new Point(r.X - 2, r.Y + 10), new Point(r.X, r.Bottom) }, .6f);
+                path.AddLine(r.X, r.Bottom, r.Right, r.Bottom);
+                path.AddArc(r.Right - (outdent + 1), r.Y, 20, r.Height, 90, -180);
+                path.AddLine(r.Right, r.Y, r.X - outdent, r.Y);
+            }
+            path.CloseAllFigures();
+            return path;
+        }
+
+        //private GraphicsPath GetQuickToolbarBackPath(Rectangle r, bool rightToLeft, bool arcOnly)
+        //{
+        //    GraphicsPath path = new GraphicsPath();
+        //    if (rightToLeft)
+        //    {
+        //        int arcSize = (int)(r.Height * .8);
+        //        Rectangle arcRect = new Rectangle(r.X - r.Height / 2, r.Y, r.Width + r.Height / 2, r.Height);
+        //        path.AddLine(arcRect.X, r.Bottom, arcRect.X, arcRect.Y + arcSize);
+        //        ElementStyleDisplay.AddCornerArc(path, arcRect, arcSize, eCornerArc.TopLeft);
+        //        if (!arcOnly)
+        //        {
+        //            path.AddLine(r.X, r.Y, r.Right, r.Y);
+        //            path.AddLine(r.Right, r.Y, r.Right, r.Bottom);
+        //            path.CloseAllFigures();
+        //        }
+        //    }
+        //    else
+        //    {
+        //        if (!arcOnly)
+        //        {
+        //            path.AddLine(r.X, r.Bottom, r.X, r.Y);
+        //            path.AddLine(r.X, r.Y, r.Right, r.Y);
+        //        }
+        //        Rectangle arcRect = new Rectangle(r.X, r.Y, r.Width + r.Height / 2, r.Height);
+        //        int arcSize = (int)(r.Height * .8);
+        //        ElementStyleDisplay.AddCornerArc(path, arcRect, arcSize, eCornerArc.TopRight);
+        //        path.AddLine(arcRect.Right, arcRect.Y + arcSize, arcRect.Right, r.Bottom);
+        //        if (!arcOnly) path.CloseAllFigures();
+        //    }
+
+        //    return path;
+        //}
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Ribbon/Office2007RibbonTabGroupPainter.cs b/PROMS/DotNetBar Source Code/Ribbon/Office2007RibbonTabGroupPainter.cs
new file mode 100644
index 00000000..e3b08c82
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Ribbon/Office2007RibbonTabGroupPainter.cs	
@@ -0,0 +1,230 @@
+using System;
+using System.Text;
+using DevComponents.DotNetBar.Rendering;
+using System.Drawing.Drawing2D;
+using System.Drawing;
+using System.Runtime.InteropServices;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represents the Office 2007 Ribbon Tab Group painter.
+    /// </summary>
+    internal class Office2007RibbonTabGroupPainter : RibbonTabGroupPainter, IOffice2007Painter
+    {
+        #region Private Variables
+        private Office2007ColorTable m_ColorTable = null; //new Office2007ColorTable();
+        #endregion
+
+        #region Internal Implementation
+        protected virtual ThemeTextFormat GetThemeFormat()
+        {
+            ThemeTextFormat tf = ThemeTextFormat.Center | ThemeTextFormat.EndEllipsis | ThemeTextFormat.VCenter | ThemeTextFormat.SingleLine;
+            return tf;
+        }
+        protected virtual eTextFormat GetTextFormat()
+        {
+            return eTextFormat.VerticalCenter;
+        }
+        protected virtual Themes.RECT GetThemeTextBounds(Rectangle rect)
+        {
+            Themes.RECT bounds = new Themes.RECT(new Rectangle(0, 0, rect.Width, rect.Height));
+            return bounds;
+        }
+        protected virtual Rectangle GetTextBounds(RibbonTabGroupRendererEventArgs e)
+        {
+            return e.Bounds;
+        }
+        /// <summary>
+        /// Paints ribbon tab group.
+        /// </summary>
+        /// <param name="e">Context information</param>
+        public override void PaintTabGroup(RibbonTabGroupRendererEventArgs e)
+        {
+            Graphics g = e.Graphics;
+            Office2007RibbonTabGroupColorTable colorTable = GetColors(e.RibbonTabItemGroup);
+            if (colorTable == null)
+                return;
+            #if FRAMEWORK20
+            if (e.ItemPaintArgs.GlassEnabled)
+            {
+                if (e.ItemPaintArgs.CachedPaint) return;
+                PaintTabGroupBackground(g, colorTable, e.Bounds, e.GroupBounds, true);
+                
+                Rectangle rect = e.Bounds;
+                rect.Height -= 2;
+                IntPtr hdc = g.GetHdc();
+                Font font = e.GroupFont;
+                string text = e.RibbonTabItemGroup.GroupTitle;
+                ThemeTextFormat tf = GetThemeFormat();
+                try
+                {
+                    IntPtr memdc = WinApi.CreateCompatibleDC(hdc);
+                    try
+                    {
+                        WinApi.BITMAPINFO bmpInfo = new WinApi.BITMAPINFO();
+                        bmpInfo.biWidth = rect.Width;
+                        bmpInfo.biHeight = -rect.Height;
+                        bmpInfo.biPlanes = 1;
+                        bmpInfo.biBitCount = 32;
+                        bmpInfo.biSize = Marshal.SizeOf(bmpInfo);
+                        IntPtr dib = WinApi.CreateDIBSection(hdc, bmpInfo, 0, 0, IntPtr.Zero, 0);
+                        WinApi.SelectObject(memdc, dib);
+
+                        IntPtr fontHandle = font.ToHfont();
+                        WinApi.SelectObject(memdc, fontHandle);
+
+                        Themes.RECT bounds = GetThemeTextBounds(rect);
+                        System.Windows.Forms.VisualStyles.VisualStyleRenderer themeRenderer = new System.Windows.Forms.VisualStyles.VisualStyleRenderer(System.Windows.Forms.VisualStyles.VisualStyleElement.Window.Caption.Active);
+                        Themes.DTTOPTS dttOpts = new Themes.DTTOPTS();
+                        dttOpts.iGlowSize = 10;
+                        dttOpts.crText = new Themes.COLORREF(colorTable.Text);
+                        dttOpts.dwFlags = (int)Themes.DTT_VALIDBITS.DTT_COMPOSITED | (int)Themes.DTT_VALIDBITS.DTT_TEXTCOLOR;
+                        if (colorTable.Background == null || colorTable.Background.IsEmpty || colorTable.Background.Start.A < 255)
+                            dttOpts.dwFlags |= (int)Themes.DTT_VALIDBITS.DTT_GLOWSIZE;
+                        dttOpts.dwSize = Marshal.SizeOf(dttOpts);
+                        
+                        // Draw Background
+                        using (Graphics gb = Graphics.FromHdc(memdc))
+                        {
+                            PaintTabGroupBackground(gb, colorTable, new Rectangle(0, 0, rect.Width, rect.Height + 2), new Rectangle(0, 0, rect.Width, rect.Height + 2), true);
+                        }
+                        
+                        Themes.DrawThemeTextEx(themeRenderer.Handle, memdc, 0, 0, text, -1, (int)tf, ref bounds, ref dttOpts);
+                        
+
+                        const int SRCCOPY = 0x00CC0020;
+                        WinApi.BitBlt(hdc, rect.Left, rect.Top, rect.Width, rect.Height, memdc, 0, 0, SRCCOPY);
+
+                        WinApi.DeleteObject(fontHandle);
+                        WinApi.DeleteObject(dib);
+                    }
+                    finally
+                    {
+                        WinApi.DeleteDC(memdc);
+                    }
+                }
+                finally
+                {
+                    g.ReleaseHdc(hdc);
+                }
+                return;
+            }
+            #endif
+
+            PaintTabGroupBackground(g, colorTable, e.Bounds, e.GroupBounds, false);
+            ElementStyle style = e.RibbonTabItemGroup.Style; //.Copy();
+            Color styleTextColor = style.TextColor;
+            Color styleTextShadowColor = style.TextShadowColor;
+            Point styleTextShadowOffset = style.TextShadowOffset;
+            style.FreezeEvents = true;
+            style.TextColor = colorTable.Text;
+            style.TextShadowColor = Color.Empty;
+            style.TextShadowOffset = Point.Empty;
+
+            ElementStyleDisplayInfo info = new ElementStyleDisplayInfo(style, e.Graphics, GetTextBounds(e));
+            ElementStyleDisplay.PaintText(info, e.RibbonTabItemGroup.GroupTitle, e.GroupFont, false, e.RibbonTabItemGroup.Style.TextFormat | GetTextFormat());
+
+            style.TextColor = styleTextColor;
+            style.TextShadowColor = styleTextShadowColor;
+            style.TextShadowOffset = styleTextShadowOffset;
+            style.FreezeEvents = false;
+        }
+
+        protected virtual void PaintTabGroupBackground(Graphics g, Office2007RibbonTabGroupColorTable colorTable, Rectangle bounds, Rectangle groupBounds, bool glassEnabled)
+        {
+            if (colorTable == null)
+                return;
+
+            // Draw title rectangle part of the group
+            Rectangle r = bounds;
+            r.Height -= 2;
+
+            // GDI+ bug
+            Rectangle rFill = r;
+            rFill.Width--;
+            //rFill.Height--;
+
+            // First draw background
+            DisplayHelp.FillRectangle(g, rFill, colorTable.Background.Start, colorTable.Background.End, 90, new float[] { 0f, .10f, .9f }, new float[] { 0f, (glassEnabled?.4f:.70f), 1f });
+
+            // Draw highlight
+            if (!colorTable.BackgroundHighlight.IsEmpty && r.Width > 0 && r.Height > 0)
+            {
+                //Rectangle hr = new Rectangle(r.X, r.Bottom - 3, r.Width - 1, 3);
+                //DisplayHelp.FillRectangle(g, hr, colorTable.BackgroundHighlight.Start, colorTable.BackgroundHighlight.End);
+                Rectangle ellipse = new Rectangle(r.X - r.Width * 3, r.Y, r.Width * 7, (int)(r.Height * 4.5f));
+                GraphicsPath path = new GraphicsPath();
+                path.AddEllipse(ellipse);
+                PathGradientBrush brush = new PathGradientBrush(path);
+                brush.CenterColor = colorTable.BackgroundHighlight.Start;
+                brush.SurroundColors = new Color[] { colorTable.BackgroundHighlight.End };
+                brush.CenterPoint = new PointF(ellipse.X + ellipse.Width / 2, r.Bottom);
+                Blend blend = new Blend();
+                blend.Factors = new float[] { 0f, .05f, 1f };
+                blend.Positions = new float[] { .0f, .8f, 1f };
+                brush.Blend = blend;
+                path.Dispose();
+                //rFill.Height++;
+                g.FillRectangle(brush, rFill);
+                brush.Dispose();
+                path.Dispose();
+            }
+            // Underline highlight
+            using (Pen pen = new Pen(Color.FromArgb(64, System.Windows.Forms.ControlPaint.Dark(colorTable.BackgroundHighlight.Start))))
+                g.DrawLine(pen, r.X, r.Bottom, r.Right - 1, r.Bottom);
+
+            r = bounds;
+            SmoothingMode sm = g.SmoothingMode;
+            g.SmoothingMode = SmoothingMode.Default;
+
+            Rectangle rAll = groupBounds;
+
+            if (!colorTable.Border.IsEmpty)
+            {
+                //using(SolidBrush brush=new SolidBrush(colorTable.Border.Start))
+                //{
+                //    // Draw border top
+                //    g.FillRectangle(brush, bounds.X, bounds.Y, bounds.Width, 4);
+                //}
+
+                // Draw border ... Left first
+                DisplayHelp.FillRectangle(g, new Rectangle(rAll.X, r.Y, 1, r.Height), colorTable.Border);
+
+                // Then right
+                DisplayHelp.FillRectangle(g, new Rectangle(rAll.Right - 1, r.Y, 1, r.Height), colorTable.Border);
+
+                // Draw borders on the bottom...
+                // Left first
+                DisplayHelp.FillRectangle(g, new Rectangle(rAll.X, r.Bottom - 1, 1, rAll.Height - r.Height), colorTable.Border.End, Color.Transparent, 90);
+
+                // Then right
+                DisplayHelp.FillRectangle(g, new Rectangle(rAll.Right - 1, r.Bottom - 1, 1, rAll.Height - r.Height), colorTable.Border.End, Color.Transparent, 90);
+            }
+            g.SmoothingMode = sm;
+        }
+
+        private Office2007RibbonTabGroupColorTable GetColors(RibbonTabItemGroup group)
+        {
+            Office2007RibbonTabGroupColorTable c = null;
+            if(group.CustomColorName!="")
+                c = m_ColorTable.RibbonTabGroupColors[group.CustomColorName];
+            if(c==null)
+                c = m_ColorTable.RibbonTabGroupColors[Enum.GetName(typeof(eRibbonTabGroupColor), group.Color)];
+            if (c == null && m_ColorTable.RibbonTabGroupColors.Count > 0)
+                c = m_ColorTable.RibbonTabGroupColors[0];
+            return c;
+        }
+        #endregion
+
+        #region IOffice2007Painter Members
+
+        public Office2007ColorTable ColorTable
+        {
+            get { return m_ColorTable; }
+            set { m_ColorTable = value; }
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Ribbon/Office2007RibbonTabItemPainter.cs b/PROMS/DotNetBar Source Code/Ribbon/Office2007RibbonTabItemPainter.cs
new file mode 100644
index 00000000..06ba5a45
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Ribbon/Office2007RibbonTabItemPainter.cs	
@@ -0,0 +1,267 @@
+using System;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.Rendering;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// RibbonTabItem painter for Office 2007 style
+    /// </summary>
+    internal class Office2007RibbonTabItemPainter : Office2007ButtonItemPainter
+    {
+        protected override Rectangle GetTextRectangle(ButtonItem button, ItemPaintArgs pa, eTextFormat stringFormat, CompositeImage image)
+        {
+            Rectangle r = base.GetTextRectangle(button, pa, stringFormat, image);
+            if (image == null && string.IsNullOrEmpty(button.SymbolRealized))
+                r.Inflate(-3, 0);
+            return r;
+        }
+
+        public override eTextFormat GetStringFormat(ButtonItem button, ItemPaintArgs pa, CompositeImage image)
+        {
+            eTextFormat sf = base.GetStringFormat(button, pa, image);
+            sf &= ~(sf & eTextFormat.EndEllipsis);
+            return sf;
+        }
+
+        protected override void PaintState(ButtonItem button, ItemPaintArgs pa, CompositeImage image, Rectangle r, bool isMouseDown)
+        {
+            if (r.IsEmpty || !IsItemEnabled(button, pa) || r.Width == 0 || r.Height == 0)
+                return;
+
+            RibbonTabItem tab = button as RibbonTabItem;
+            if (tab == null || IsOnMenu(button, pa))
+            {
+                base.PaintState(button, pa, image, r, isMouseDown);
+                return;
+            }
+
+            bool isOnMenu = pa.IsOnMenu;
+            Office2007RibbonTabItemColorTable tabColorTable = GetColorTable(tab);
+            if (tabColorTable == null)
+                return;
+            bool ribbonExpanded = pa.ControlExpanded;
+
+            Office2007RibbonTabItemStateColorTable stateColors = GetStateColorTable(tabColorTable, tab, ribbonExpanded);
+
+            if (stateColors == null)
+                return;
+
+            Graphics g = pa.Graphics;
+            int cornerSize = tabColorTable.CornerSize;
+            Region oldClip = g.Clip;
+            try
+            {
+                Rectangle rClip = r;
+                rClip.Inflate(1, 0);
+                g.SetClip(rClip, CombineMode.Replace);
+
+                if (stateColors != null)
+                {
+                    eDotNetBarStyle effectiveStyle = button.EffectiveStyle;
+                    using (GraphicsPath path = GetTabPath(r, cornerSize, true, effectiveStyle))
+                    {
+                        DisplayHelp.FillPath(g, path, stateColors.Background);
+                        DisplayHelp.DrawGradientPathBorder(g, path, stateColors.OuterBorder, 1);
+                    }
+                    if (!StyleManager.IsMetro(effectiveStyle) && tab.Checked && ribbonExpanded && tab.RenderTabState /*|| tab.IsMouseOver*/)
+                    {
+                        SmoothingMode sm = g.SmoothingMode;
+                        g.SmoothingMode = SmoothingMode.Default;
+
+                        if (this.ColorTable.RibbonControl.TabsBackground.Start.GetBrightness() > .5 && !stateColors.OuterBorder.IsEmpty)
+                        {
+                            using (GraphicsPath path = new GraphicsPath())
+                            {
+                                path.AddRectangle(new Rectangle(r.Right - 1, r.Y + cornerSize + 1, 1, r.Height - cornerSize - 3));
+                                DisplayHelp.FillPath(g, path, Color.FromArgb(96, stateColors.OuterBorder.Start), Color.FromArgb(32, stateColors.OuterBorder.End), 90);
+                            }
+                            using (GraphicsPath path = new GraphicsPath())
+                            {
+                                path.AddRectangle(new Rectangle(r.X + 1, r.Y + cornerSize + 1, 1, r.Height - cornerSize - 3));
+                                DisplayHelp.FillPath(g, path, Color.FromArgb(32, stateColors.OuterBorder.Start), Color.FromArgb(8, stateColors.OuterBorder.End), 90);
+                            }
+                        }
+                        g.SmoothingMode = sm;
+                    }
+
+                    Rectangle r1 = r;
+                    r1.Inflate(-1, 0);
+                    r1.Height--;
+                    r1.Y++;
+                    using (GraphicsPath path = GetTabPath(r1, cornerSize, true, effectiveStyle))
+                    {
+                        DisplayHelp.DrawGradientPathBorder(g, path, stateColors.InnerBorder, 1);
+                    }
+
+                    if (tab.Checked && ribbonExpanded && tab.RenderTabState)
+                    {
+                        using (SolidBrush brush = new SolidBrush(stateColors.InnerBorder.Start))
+                        {
+                            SmoothingMode sm = g.SmoothingMode;
+                            g.SmoothingMode = SmoothingMode.None;
+                            g.FillRectangle(brush, new Rectangle(r1.X + cornerSize, r1.Y + 1, r1.Width - cornerSize * 2, 2));
+                            g.SmoothingMode = sm;
+                        }
+                    }
+
+                    float topSplit = .6f;
+                    float bottomSplit = .4f;
+
+                    Rectangle fillRectangle = r;
+                    Rectangle backRect = new Rectangle(fillRectangle.X, fillRectangle.Y + (int)(fillRectangle.Height * topSplit), fillRectangle.Width, (int)(fillRectangle.Height * bottomSplit));
+
+                    if (!stateColors.BackgroundHighlight.IsEmpty)
+                    {
+                        Rectangle ellipse = new Rectangle(backRect.X, backRect.Y, fillRectangle.Width, fillRectangle.Height);
+                        GraphicsPath path = new GraphicsPath();
+                        path.AddEllipse(ellipse);
+                        PathGradientBrush brush = new PathGradientBrush(path);
+                        brush.CenterColor = stateColors.BackgroundHighlight.Start;
+                        brush.SurroundColors = new Color[] { stateColors.BackgroundHighlight.End };
+                        brush.CenterPoint = new PointF(ellipse.X + ellipse.Width / 2, fillRectangle.Bottom + 2);
+                        Blend blend = new Blend();
+                        blend.Factors = new float[] { 0f, .8f, 1f };
+                        blend.Positions = new float[] { .0f, .55f, 1f };
+                        brush.Blend = blend;
+                        g.FillRectangle(brush, backRect);
+                        brush.Dispose();
+                        path.Dispose();
+                    }
+                }
+
+                if (tab.ReducedSize && !tab.Checked && !tab.IsMouseOver && tabColorTable != null && tabColorTable.Selected != null)
+                {
+                    Color c = this.ColorTable.RibbonControl.OuterBorder.Start;
+                    if (!c.IsEmpty)
+                        DisplayHelp.DrawGradientLine(g, new Point(r.Right - 1, r.Y), new Point(r.Right - 1, r.Bottom - 1),
+                            Color.Transparent, c, 90, 1, new float[] { 0, .8f, 1f }, new float[] { 0, .50f, 1f });
+                }
+
+                g.Clip = oldClip;
+            }
+            finally
+            {
+                if (oldClip != null) oldClip.Dispose();
+            }
+        }
+
+        private GraphicsPath GetTabPath(Rectangle r, int cornerSize, bool getBottomPart, eDotNetBarStyle style)
+        {
+            GraphicsPath path = new GraphicsPath();
+            int bottomCorner = (style == eDotNetBarStyle.Windows7 || style == eDotNetBarStyle.Office2010) ? 1 : 2;
+            if (StyleManager.IsMetro(style)) bottomCorner = 0;
+            if (getBottomPart)
+                path.AddLine(r.X, r.Bottom, r.X + bottomCorner, r.Bottom - bottomCorner);
+            else
+                path.AddLine(r.X, r.Bottom, r.X, r.Y + cornerSize);
+            r.Inflate(-bottomCorner, 0);
+
+            ElementStyleDisplay.AddCornerArc(path, r, cornerSize, eCornerArc.TopLeft);
+            ElementStyleDisplay.AddCornerArc(path, r, cornerSize, eCornerArc.TopRight);
+
+            if (getBottomPart)
+                path.AddLine(r.Right, r.Bottom - bottomCorner, r.Right + bottomCorner, r.Bottom);
+            else
+                path.AddLine(r.Right, r.Y + cornerSize, r.Right, r.Bottom);
+
+            return path;
+        }
+
+        protected override Color GetTextColor(ButtonItem button, ItemPaintArgs pa)
+        {
+            if (!IsItemEnabled(button, pa) || !(button is RibbonTabItem))
+                return base.GetTextColor(button, pa);
+
+            RibbonTabItem tab = button as RibbonTabItem;
+
+            Color textColor = Color.Empty;
+
+            Office2007RibbonTabItemStateColorTable ct = GetStateColorTable(GetColorTable(tab), tab, pa.ControlExpanded);
+
+            if (ct != null)
+            {
+                if (pa.GlassEnabled && !ct.GlassText.IsEmpty)
+                    return ct.GlassText;
+                textColor = ct.Text;
+            }
+
+            if (textColor.IsEmpty)
+                return base.GetTextColor(button, pa);
+
+            return textColor;
+        }
+
+        private Office2007RibbonTabItemColorTable GetColorTable(RibbonTabItem tab)
+        {
+            return GetColorTable(this.ColorTable, tab);
+        }
+
+        internal static Office2007RibbonTabItemColorTable GetColorTable(Office2007ColorTable table, RibbonTabItem tab)
+        {
+            if (table == null)
+                return null;
+
+            Office2007RibbonTabItemColorTable rt = table.RibbonTabItemColors[tab.GetColorTableName()];
+            if (rt == null && table.RibbonTabItemColors.Count > 0)
+                rt = table.RibbonTabItemColors[0];
+
+            return rt;
+        }
+
+        internal static Office2007RibbonTabItemColorTable GetColorTable(Office2007ColorTable table)
+        {
+            if (table == null)
+                return null;
+
+            Office2007RibbonTabItemColorTable rt = table.RibbonTabItemColors["Default"];
+            if (rt == null && table.RibbonTabItemColors.Count > 0)
+                rt = table.RibbonTabItemColors[0];
+
+            return rt;
+        }
+
+        internal static Office2007RibbonTabItemStateColorTable GetStateColorTable(Office2007RibbonTabItemColorTable tabColorTable, RibbonTabItem tab, bool ribbonExpanded)
+        {
+            if (tabColorTable == null)
+                return null;
+
+            Office2007RibbonTabItemStateColorTable stateColors = null;
+
+            if (!tab.RenderTabState)
+                stateColors = tabColorTable.Default;
+            else if (tab.Checked && tab.IsMouseOver && ribbonExpanded)
+                stateColors = tabColorTable.SelectedMouseOver;
+            else if (tab.Checked && ribbonExpanded)
+                stateColors = tabColorTable.Selected;
+            else if (tab.IsMouseOver)
+                stateColors = tabColorTable.MouseOver;
+            else if (tab.GetEnabled())
+                stateColors = tabColorTable.Default;
+
+            return stateColors;
+        }
+#if FRAMEWORK20
+        public override void PaintButtonText(ButtonItem button, ItemPaintArgs pa, Color textColor, CompositeImage image)
+        {
+            eDotNetBarStyle effectiveStyle = button.EffectiveStyle;
+            if (!((effectiveStyle == eDotNetBarStyle.Office2010 || StyleManager.IsMetro(effectiveStyle)) && pa.GlassEnabled))
+            {
+                base.PaintButtonText(button, pa, textColor, image);
+                return;
+            }
+
+            Rectangle r = GetTextRectangle(button, pa, eTextFormat.HorizontalCenter | eTextFormat.VerticalCenter, image);
+            //r.Offset(0, 3);
+            //r.Height -= 2;
+            ThemeTextFormat textFormat = ThemeTextFormat.Center | ThemeTextFormat.VCenter | ThemeTextFormat.HidePrefix | ThemeTextFormat.SingleLine;
+            bool renderGlow = true;
+            //if (effectiveStyle == eDotNetBarStyle.Office2010 && StyleManager.Style == eStyle.Office2010Black)
+            //    renderGlow = false;
+            Office2007RibbonControlPainter.PaintTextOnGlass(pa.Graphics, button.Text, pa.Font, r, textFormat, textColor, true, renderGlow, 10);
+        }
+#endif
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Ribbon/PainterFactory.cs b/PROMS/DotNetBar Source Code/Ribbon/PainterFactory.cs
new file mode 100644
index 00000000..935d121b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Ribbon/PainterFactory.cs	
@@ -0,0 +1,412 @@
+using System.Windows.Forms;
+using System;
+using DevComponents.DotNetBar.Rendering;
+using DevComponents.DotNetBar.Metro.Rendering;
+using DevComponents.DotNetBar.Controls;
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Summary description for PainterFactory.
+	/// </summary>
+	internal class PainterFactory
+	{
+		private static Office2003ButtonItemPainter m_Office2003Painter=new Office2003ButtonItemPainter();
+        private static Office2007ButtonItemPainter m_Office2007Painter = new Office2007ButtonItemPainter();
+        private static MetroButtonItemPainter m_MetroButtonPainter = new MetroButtonItemPainter();
+		private static Office2003RibbonTabItemPainter m_RibbonTabItemOffice2003Painter=new Office2003RibbonTabItemPainter();
+        private static Office2007ItemContainerPainter m_Office2007ItemContainerPainter = new Office2007ItemContainerPainter();
+        private static Office2007BarBackgroundPainter m_Office2007BarBackgroundPainter = new Office2007BarBackgroundPainter();
+        private static Office2007KeyTipsPainter m_Office2007KeyTipsPainter = new Office2007KeyTipsPainter();
+        private static Office2007DialogLauncherPainter m_Office2007RibbonBarPainter = new Office2007DialogLauncherPainter();
+        private static Office2007RibbonControlPainter m_Office2007RibbonControlPainter = new Office2007RibbonControlPainter();
+        private static Office2007RibbonTabItemPainter m_Office2007RibbonTabItemPainter = new Office2007RibbonTabItemPainter();
+        //private static Office2007RibbonTabGroupPainter m_Office2007RibbonTabGroupPainter = new Office2007RibbonTabGroupPainter();
+        private static Rendering.Office2007ColorItemPainter m_Office2007ColorItemPainter = new Rendering.Office2007ColorItemPainter();
+        private static Office2007SystemCaptionItemPainter m_Office2007SystemCaptionItemPainter = null;
+        private static Office2007MdiSystemItemPainter m_Office2007MdiSystemItemPainter = new Office2007MdiSystemItemPainter();
+        private static Office2007FormCaptionPainter m_Office2007FormCaptionPainter = new Office2007FormCaptionPainter();
+        private static Rendering.Office2007RibbonOverflowPainter m_Office2007RibbonOverflowPainter = new DevComponents.DotNetBar.Rendering.Office2007RibbonOverflowPainter();
+        private static Rendering.Office2007QatOverflowPainter m_Office2007QatOverflowPainter = new DevComponents.DotNetBar.Rendering.Office2007QatOverflowPainter();
+        private static Rendering.Office2007QatCustomizeItemPainter m_Office2007QatCustomizePainter = new DevComponents.DotNetBar.Rendering.Office2007QatCustomizeItemPainter();
+        private static Rendering.Office2007CheckBoxItemPainter m_Office2007CheckBoxItemPainter = new Rendering.Office2007CheckBoxItemPainter();
+        private static Rendering.Office2007ProgressBarItemPainter m_Office2007ProgressBarPainter = new DevComponents.DotNetBar.Rendering.Office2007ProgressBarItemPainter();
+        private static Rendering.Office2007NavigationPanePainter m_Office2007NavPanePainter = new DevComponents.DotNetBar.Rendering.Office2007NavigationPanePainter();
+        private static Rendering.SliderPainter m_SliderPainter = new DevComponents.DotNetBar.Rendering.Office2007SliderPainter();
+        private static Rendering.SideBarPainter m_SideBarPainter = new DevComponents.DotNetBar.Rendering.Office2007SideBarPainter();
+        private static CrumbBarItemViewPainter m_CrumbBarItemViewPainter = null;
+        private static SwitchButtonPainter m_SwitchButtonPainter = null;
+        private static Office2010NavPaneButtonPainter _Office2010NavPaneButtonPainter = new Office2010NavPaneButtonPainter();
+        private static Rendering.RangeSliderPainter _RangeSliderPainter = new DevComponents.DotNetBar.Rendering.Office2010RangeSliderPainter();
+
+        public static ButtonItemPainter CreateButtonPainter(ButtonItem button)
+        {
+            if (button is RibbonTabItem)
+            {
+                return CreateRibbonTabItemPainter((RibbonTabItem)button);
+            }
+            if (button is TabFormItem)
+            {
+                return CreateTabFormItemPainter((TabFormItem)button);
+            }
+            else if (button is NewTabFormItem)
+            {
+                return CreateNewTabFormItemPainter((NewTabFormItem)button);
+            }
+            if (button is RibbonOverflowButtonItem)
+            {
+                ButtonItemPainter p = CreateRibbonOverflowButtonPainter((RibbonOverflowButtonItem)button);
+                if (p != null)
+                    return p;
+            }
+
+            eDotNetBarStyle buttonEffectiveStyle = button.EffectiveStyle;
+            if (buttonEffectiveStyle == eDotNetBarStyle.Office2010 && button.ContainerState == eContainerState.NavigationPane)
+            {
+                return _Office2010NavPaneButtonPainter;
+            }
+            
+            if (buttonEffectiveStyle == eDotNetBarStyle.Office2010 && button is ApplicationButton)
+                return Office2010ApplicationButtonPainter;
+            else if (button is DevComponents.DotNetBar.Metro.MetroAppButton || button is ApplicationButton && StyleManager.IsMetro(buttonEffectiveStyle))
+                return MetroAppButtonPainter;
+
+            if (BarFunctions.IsOffice2007Style(buttonEffectiveStyle))
+            {
+                if (StyleManager.IsMetro(buttonEffectiveStyle))
+                    return m_MetroButtonPainter;
+                if (button.ContainerControl is RibbonBar)
+                    return m_Office2007Painter;
+                return m_Office2007Painter;
+            }
+            return m_Office2003Painter;
+        }
+
+        private static ButtonItemPainter _Office2010ApplicationButtonPainter;
+        public static ButtonItemPainter Office2010ApplicationButtonPainter
+        {
+            get
+            {
+                if (_Office2010ApplicationButtonPainter == null) _Office2010ApplicationButtonPainter = new Office2010AppButtonPainter();
+                return _Office2010ApplicationButtonPainter;
+            }
+        }
+
+        private static ButtonItemPainter _MetroAppButtonPainter;
+        public static ButtonItemPainter MetroAppButtonPainter
+        {
+            get
+            {
+                if (_MetroAppButtonPainter == null) _MetroAppButtonPainter = new DevComponents.DotNetBar.Metro.Rendering.MetroAppButtonPainter();
+                return _MetroAppButtonPainter;
+            }
+        }
+
+        public static CrumbBarItemViewPainter GetCrumbBarItemViewPainter(ButtonItem button)
+        {
+            if (m_CrumbBarItemViewPainter == null)
+                m_CrumbBarItemViewPainter = new CrumbBarItemViewPainter();
+            return m_CrumbBarItemViewPainter;
+        }
+
+        public static ButtonItemPainter CreateRibbonOverflowButtonPainter(RibbonOverflowButtonItem button)
+        {
+            if (BarFunctions.IsOffice2007Style(button.EffectiveStyle))
+                return m_Office2007RibbonOverflowPainter;
+            return null;
+        }
+
+		public static ButtonItemPainter CreateRibbonTabItemPainter(RibbonTabItem tab)
+		{
+            if (BarFunctions.IsOffice2007Style(tab.EffectiveStyle) && !tab.IsOnMenu)
+            {
+                return m_Office2007RibbonTabItemPainter;
+            }
+            if ((tab.EffectiveStyle == eDotNetBarStyle.Office2003 || tab.EffectiveStyle == eDotNetBarStyle.VS2005) && !tab.IsOnMenu)
+			{
+				return m_RibbonTabItemOffice2003Painter;
+			}
+			
+			return m_Office2003Painter;
+		}
+
+        private static OfficeTabFormItemPainter _TabFormItemPainter=new OfficeTabFormItemPainter();
+        public static ButtonItemPainter CreateTabFormItemPainter(TabFormItem tab)
+		{
+			return _TabFormItemPainter;
+		}
+
+        private static OfficeNewTabFormItemPainter _NewTabFormItemPainter = new OfficeNewTabFormItemPainter();
+        public static ButtonItemPainter CreateNewTabFormItemPainter(NewTabFormItem tab)
+        {
+            return _NewTabFormItemPainter;
+        }
+
+        public static ItemContainerPainter CreateItemContainerPainter(ItemContainer container)
+        {
+            if (BarFunctions.IsOffice2007Style(container.EffectiveStyle))
+                return m_Office2007ItemContainerPainter;
+            return null;
+        }
+
+        public static BarBackgroundPainter CreateBarBackgroundPainter(Bar bar)
+        {
+            return m_Office2007BarBackgroundPainter;
+        }
+
+        public static KeyTipsPainter CreateKeyTipsPainter()
+        {
+            if (StyleManager.IsMetro(StyleManager.Style))
+                return MetroKeyTipsPainter;
+            else
+                return m_Office2007KeyTipsPainter;
+        }
+        private static MetroKeyTipsPainter _MetroKeyTipsPainter = null;
+        private static MetroKeyTipsPainter MetroKeyTipsPainter
+        {
+            get
+            {
+                if (_MetroKeyTipsPainter == null) _MetroKeyTipsPainter = new MetroKeyTipsPainter();
+                return _MetroKeyTipsPainter;
+            }
+        }
+
+        public static DialogLauncherPainter CreateRibbonBarPainter(RibbonBar ribbon)
+        {
+            if (BarFunctions.IsOffice2007Style(ribbon.EffectiveStyle))
+                return m_Office2007RibbonBarPainter;
+            return null;
+        }
+
+        private static RibbonTabGroupPainter _Office2010RibbonTabGroupPainter = null;
+        private static RibbonTabGroupPainter Office2010RibbonTabGroupPainter
+        {
+            get
+            {
+                if (_Office2010RibbonTabGroupPainter == null) _Office2010RibbonTabGroupPainter = new Office2010RibbonTabGroupPainter();
+                return _Office2010RibbonTabGroupPainter;
+            }
+        }
+        private static RibbonTabGroupPainter _Office2007RibbonTabGroupPainter = null;
+        private static RibbonTabGroupPainter Office2007RibbonTabGroupPainter
+        {
+            get
+            {
+                if (_Office2007RibbonTabGroupPainter == null) _Office2007RibbonTabGroupPainter = new Office2007RibbonTabGroupPainter();
+                return _Office2007RibbonTabGroupPainter;
+            }
+        }
+        private static RibbonTabGroupPainter _MetroRibbonTabGroupPainter = null;
+        private static RibbonTabGroupPainter MetroRibbonTabGroupPainter
+        {
+            get
+            {
+                if (_MetroRibbonTabGroupPainter == null) _MetroRibbonTabGroupPainter = new MetroRibbonTabGroupPainter();
+                return _MetroRibbonTabGroupPainter;
+            }
+        }
+        public static RibbonTabGroupPainter CreateRibbonTabGroupPainter(eDotNetBarStyle style)
+        {
+            if (style == eDotNetBarStyle.Office2010)
+                return Office2010RibbonTabGroupPainter;
+            else if (StyleManager.IsMetro(style))
+                return MetroRibbonTabGroupPainter;
+            else
+                return Office2007RibbonTabGroupPainter;
+        }
+
+        public static Rendering.ColorItemPainter CreateColorItemPainter(ColorItem item)
+        {
+            return m_Office2007ColorItemPainter;
+        }
+
+        public static RibbonControlPainter CreateRibbonControlPainter(RibbonControl r)
+        {
+            if (BarFunctions.IsOffice2007Style(r.EffectiveStyle))
+                return m_Office2007RibbonControlPainter;
+            return null;
+        }
+
+        private static SystemCaptionItemPainter _MetroCaptionItemPainter = null;
+        private static SystemCaptionItemPainter MetroCaptionItemPainter
+        {
+            get
+            {
+                if (_MetroCaptionItemPainter == null) _MetroCaptionItemPainter = new DevComponents.DotNetBar.Metro.Rendering.MetroCaptionItemPainter();
+                return _MetroCaptionItemPainter;
+            }
+        }
+
+        private static Office2010SystemCaptionItemPainter _Office2010SystemCaptionItemPainter=null;
+        private static SystemCaptionItemPainter Office2010SystemCaptionItemPainter
+        {
+            get
+            {
+                if (_Office2010SystemCaptionItemPainter == null) _Office2010SystemCaptionItemPainter = new Office2010SystemCaptionItemPainter();
+                return _Office2010SystemCaptionItemPainter;
+            }
+        }
+        private static Office2007SystemCaptionItemPainter _Office2007SystemCaptionItemPainter = null;
+        private static SystemCaptionItemPainter Office2007SystemCaptionItemPainter
+        {
+            get
+            {
+                if (_Office2007SystemCaptionItemPainter == null) _Office2007SystemCaptionItemPainter = new Office2007SystemCaptionItemPainter();
+                return _Office2007SystemCaptionItemPainter;
+            }
+        }
+        public static SystemCaptionItemPainter CreateSystemCaptionItemPainter(SystemCaptionItem item)
+        {
+            eDotNetBarStyle effectiveStyle = item.EffectiveStyle;
+            if (effectiveStyle == eDotNetBarStyle.Office2010)
+                return Office2010SystemCaptionItemPainter;
+            if (StyleManager.IsMetro(effectiveStyle))
+                return MetroCaptionItemPainter;
+            if (BarFunctions.IsOffice2007Style(effectiveStyle))
+                return Office2007SystemCaptionItemPainter;
+            return null;
+        }
+
+        public static MdiSystemItemPainter CreateMdiSystemItemPainter(MDISystemItem mdiSystemItem)
+        {
+            if (BarFunctions.IsOffice2007Style(mdiSystemItem.EffectiveStyle))
+                return m_Office2007MdiSystemItemPainter;
+            return null;
+        }
+
+        public static FormCaptionPainter CreateFormCaptionPainter(Form form)
+        {
+            return m_Office2007FormCaptionPainter;
+        }
+
+        public static DevComponents.DotNetBar.Rendering.QatOverflowPainter CreateQatOverflowItemPainter(QatOverflowItem ribbonQatOverflowItem)
+        {
+            return m_Office2007QatOverflowPainter;
+        }
+
+        public static DevComponents.DotNetBar.Rendering.QatCustomizeItemPainter CreateQatCustomizeItemPainter(QatCustomizeItem qatCustomizeItem)
+        {
+            return m_Office2007QatCustomizePainter;
+        }
+
+        public static Rendering.Office2007CheckBoxItemPainter CreateCheckBoxItemPainter(CheckBoxItem item)
+        {
+            return m_Office2007CheckBoxItemPainter;
+        }
+
+        /// <summary>
+        /// Forces the creation of the objects inside of factory.
+        /// </summary>
+        public static void InitFactory() { }
+
+        public static DevComponents.DotNetBar.Rendering.ProgressBarItemPainter CreateProgressBarItemPainter(ProgressBarItem progressBarItem)
+        {
+            return m_Office2007ProgressBarPainter;
+        }
+
+        internal static DevComponents.DotNetBar.Rendering.NavigationPanePainter CreateNavigationPanePainter()
+        {
+            return m_Office2007NavPanePainter;
+        }
+
+        internal static DevComponents.DotNetBar.Rendering.SliderPainter CreateSliderPainter(SliderItem slider)
+        {
+            return m_SliderPainter;
+        }
+
+        internal static DevComponents.DotNetBar.Rendering.RangeSliderPainter CreateRangeSliderPainter(RangeSliderItem slider)
+        {
+            return _RangeSliderPainter;
+        }
+
+        internal static DevComponents.DotNetBar.Rendering.SideBarPainter CreateSideBarPainter()
+        {
+            return m_SideBarPainter;
+        }
+
+        private static MetroSwitchButtonPainter _MetroSwitchPainter = null;
+        internal static SwitchButtonPainter CreateSwitchButtonPainter(SwitchButtonItem item)
+        {
+            if (StyleManager.IsMetro(item.EffectiveStyle))
+            {
+                if (_MetroSwitchPainter == null) _MetroSwitchPainter = new MetroSwitchButtonPainter();
+                return _MetroSwitchPainter;
+            }
+            else
+            {
+                if (m_SwitchButtonPainter == null)
+                    m_SwitchButtonPainter = new Office2010SwitchButtonPainter();
+            }
+            return m_SwitchButtonPainter;
+        }
+
+        //private static MetroStepItemPainter _MetroStepItemPainter = null;
+        private static OfficeStepItemPainter _OfficeStepItemPainter = null;
+        internal static StepItemPainter CreateStepItemPainter(StepItem item)
+        {
+            //if (StyleManager.IsMetro(item.EffectiveStyle))
+            //{
+            //    if (_MetroStepItemPainter == null) _MetroStepItemPainter = new MetroStepItemPainter();
+            //    return _MetroStepItemPainter;
+            //}
+            //else
+            //{
+                if (_OfficeStepItemPainter == null)
+                    _OfficeStepItemPainter = new OfficeStepItemPainter();
+            //}
+            return _OfficeStepItemPainter;
+        }
+
+        private static OfficeListBoxItemPainter _OfficeListBoxPainter = null;
+        internal static OfficeListBoxItemPainter CreateListBoxItemPainter(ListBoxItem item)
+        {
+            //if (StyleManager.IsMetro(item.EffectiveStyle))
+            //{
+            //    if (_MetroStepItemPainter == null) _MetroStepItemPainter = new MetroStepItemPainter();
+            //    return _MetroStepItemPainter;
+            //}
+            //else
+            //{
+            if (_OfficeListBoxPainter == null)
+            {
+                _OfficeListBoxPainter = new OfficeListBoxItemPainter();
+                _OfficeListBoxPainter.CheckBoxPainter = m_Office2007CheckBoxItemPainter;
+            }
+            //}
+            return _OfficeListBoxPainter;
+        }
+
+        private static OfficeSideNavItemPainter _OfficeSideNavItemPainter = null;
+        internal static OfficeSideNavItemPainter CreateSideNavItemPainter(SideNavItem item)
+        {
+            //if (StyleManager.IsMetro(item.EffectiveStyle))
+            //{
+            //    if (_MetroStepItemPainter == null) _MetroStepItemPainter = new MetroStepItemPainter();
+            //    return _MetroStepItemPainter;
+            //}
+            //else
+            //{
+            if (_OfficeSideNavItemPainter == null)
+            {
+                _OfficeSideNavItemPainter = new OfficeSideNavItemPainter();
+            }
+            //}
+            return _OfficeSideNavItemPainter;
+        }
+
+	    private static TabFormStripPainter _TabFormStripPainter = null;
+
+	    internal static TabFormStripPainter CreateTabFormStripPainter(TabFormStripControl c)
+	    {
+	        if(_TabFormStripPainter==null)
+                _TabFormStripPainter=new OfficeTabFormStripPainter();
+            return _TabFormStripPainter;
+	    }
+
+        private static TabFormPainter _TabFormPainter=new OfficeTabFormPainter();
+
+	    internal static TabFormPainter CreateTabFormPainter(TabParentForm form)
+	    {
+	        return _TabFormPainter;
+	    }
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/Ribbon/PanelControl.cs b/PROMS/DotNetBar Source Code/Ribbon/PanelControl.cs
new file mode 100644
index 00000000..0b22cfae
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Ribbon/PanelControl.cs	
@@ -0,0 +1,1224 @@
+using System;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Windows.Forms;
+using System.ComponentModel;
+using System.Collections;
+using System.Drawing.Text;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represents graphical panel control with support for different visual styles and gradients.
+    /// </summary>
+    [ToolboxItem(false), Designer("DevComponents.DotNetBar.Design.PanelControlDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf"), DefaultEvent("Click")]
+    public class PanelControl : System.Windows.Forms.Panel, IButtonControl
+    {
+        #region Private Variables
+        private ElementStyle m_Style;
+        private ElementStyle m_StyleMouseOver;
+        private ElementStyle m_StyleMouseDown;
+
+        private ColorScheme m_ColorScheme = null;
+        private eDotNetBarStyle m_ColorSchemeStyle = eDotNetBarStyle.Office2003;
+
+        private bool m_MouseOver = false, m_MouseDown = false;
+
+        private Rectangle m_ClientTextRectangle = Rectangle.Empty;
+        private bool m_TextDockConstrained = true;
+        private bool m_ShowFocusRectangle;
+        //private string m_Text = "";
+
+        // Theme Caching Support
+        private ThemeTab m_ThemeTab = null;
+
+        private DialogResult m_DialogResult = DialogResult.None;
+        private bool m_IsDefault = false;
+
+        private bool m_AntiAlias = true;
+        private Color m_CanvasColor = Color.White;
+
+        protected Bitmap m_ThemeCachedBitmap = null;
+        private bool m_SuspendPaint = false;
+        private TextMarkup.BodyElement m_TextMarkup = null;
+        #endregion
+
+        #region Events
+        /// <summary>
+        /// Occurs when text markup link is clicked. Markup links can be created using "a" tag, for example:
+        /// <a name="MyLink">Markup link</a>
+        /// </summary>
+        public event MarkupLinkClickEventHandler MarkupLinkClick;
+        #endregion
+
+        /// <summary>
+        ///     Default constructor.
+        /// </summary>
+        public PanelControl()
+        {
+            if (!ColorFunctions.ColorsLoaded)
+            {
+                NativeFunctions.RefreshSettings();
+                NativeFunctions.OnDisplayChange();
+                ColorFunctions.LoadColors();
+            }
+
+            this.SetStyle(ControlStyles.UserPaint, true);
+            this.SetStyle(ControlStyles.AllPaintingInWmPaint, true);
+            this.SetStyle(ControlStyles.Opaque, true);
+            this.SetStyle(ControlStyles.ResizeRedraw, true);
+            this.SetStyle(DisplayHelp.DoubleBufferFlag, true);
+            this.SetStyle(ControlStyles.SupportsTransparentBackColor, true);
+            this.SetStyle(ControlStyles.ContainerControl, true);
+
+            this.SetStyle(ControlStyles.Selectable, true);
+            this.SetStyle(ControlStyles.StandardDoubleClick, false);
+
+            m_ColorScheme = new ColorScheme(m_ColorSchemeStyle);
+
+            ResetStyle();
+            ResetStyleMouseOver();
+            ResetStyleMouseDown();
+
+            StyleManager.Register(this);
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing) StyleManager.Unregister(this);
+            base.Dispose(disposing);
+        }
+
+        /// <summary>
+        /// Called by StyleManager to notify control that style on manager has changed and that control should refresh its appearance if
+        /// its style is controlled by StyleManager.
+        /// </summary>
+        /// <param name="newStyle">New active style.</param>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void StyleManagerStyleChanged(eDotNetBarStyle newStyle)
+        {
+            OnColorSchemeChanged();
+        }
+
+        internal TextMarkup.BodyElement TextMarkupElement
+        {
+            get { return m_TextMarkup; }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public new System.Windows.Forms.BorderStyle BorderStyle
+        {
+            get { return base.BorderStyle; }
+            set { base.BorderStyle = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets Bar Color Scheme.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), Category("Appearance"), Description("Gets or sets Bar Color Scheme."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public DevComponents.DotNetBar.ColorScheme ColorScheme
+        {
+            get { return m_ColorScheme; }
+            set
+            {
+                if (value == null)
+                    throw new ArgumentException("NULL is not a valid value for this property.");
+                m_ColorScheme = value;
+                OnColorSchemeChanged();
+                if (this.Visible)
+                    this.Invalidate();
+            }
+        }
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeColorScheme()
+        {
+            return m_ColorScheme.SchemeChanged;
+        }
+
+        internal ColorScheme GetColorScheme()
+        {
+            if (BarFunctions.IsOffice2007Style(m_ColorSchemeStyle))
+            {
+                Rendering.Office2007Renderer r = Rendering.GlobalManager.Renderer as Rendering.Office2007Renderer;
+                if (r != null && r.ColorTable.LegacyColors != null)
+                    return r.ColorTable.LegacyColors;
+            }
+
+            return m_ColorScheme;
+        }
+
+        private void OnVisualPropertyChanged(object sender, EventArgs e)
+        {
+            RefreshStyleSystemColors();
+
+            SetRegion();
+
+            this.Invalidate();
+        }
+
+        protected override void OnRightToLeftChanged(EventArgs e)
+        {
+            this.Invalidate();
+            base.OnRightToLeftChanged(e);
+        }
+
+        private eCornerType m_CurrentCornerType = eCornerType.Square;
+        private int m_CornerDiameter = 8;
+        /// <summary>
+        /// Applies any region related settings from style to control.
+        /// </summary>
+        protected virtual void SetRegion()
+        {
+            SetRegion(false);
+        }
+        private void SetRegion(bool bResize)
+        {
+            if (!CanSetRegion) return;
+            ElementStyle style = GetStyle();
+            if (bResize || m_CurrentCornerType != style.CornerType || m_CornerDiameter != style.CornerDiameter)
+            {
+                m_CurrentCornerType = style.CornerType;
+                m_CornerDiameter = style.CornerDiameter;
+                if (style != null && !(DrawThemedPane && BarFunctions.ThemedOS) && style.CornerType != eCornerType.Square)
+                {
+                    this.Region = ElementStyleDisplay.GetStyleRegion(new ElementStyleDisplayInfo(style, null, new Rectangle(0,0,this.Width, this.Height)));
+                }
+                else
+                    this.Region = null;
+            }
+        }
+        internal bool CanSetRegion = true;
+
+        /// <summary>
+        /// Applies color scheme colors to the style objects.
+        /// </summary>
+        public void RefreshStyleSystemColors()
+        {
+            ColorScheme cs = GetColorScheme();
+            if (m_Style != null)
+                m_Style.SetColorScheme(cs);
+            if (m_StyleMouseOver != null)
+                m_StyleMouseOver.SetColorScheme(cs);
+            if (m_StyleMouseDown != null)
+                m_StyleMouseDown.SetColorScheme(cs);
+        }
+
+        protected override void WndProc(ref System.Windows.Forms.Message m)
+        {
+            const int WM_MOUSEWHEEL = 0x020A;
+            const int WM_HSCROLL = 0x0114;
+            const int WM_VSCROLL = 0x0115;
+
+            switch (m.Msg)
+            {
+                case WM_HSCROLL:
+                case WM_VSCROLL:
+                case WM_MOUSEWHEEL:
+                    if (this.Controls.Count == 0)
+                    {
+                        RefreshTextClientRectangle();
+                        this.Invalidate();
+                    }
+                    else
+                    {
+                        base.WndProc(ref m);
+                        this.Refresh();
+                        return;
+                    }
+                    break;
+            }
+
+            base.WndProc(ref m);
+        }
+
+        /// <summary>
+        /// Creates the Graphics object for the control.
+        /// </summary>
+        /// <returns>The Graphics object for the control.</returns>
+        public new Graphics CreateGraphics()
+        {
+            Graphics g = base.CreateGraphics();
+            if (m_AntiAlias)
+            {
+                g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.AntiAlias;
+#if FRAMEWORK20
+                if (!SystemInformation.IsFontSmoothingEnabled)
+#endif
+                    g.TextRenderingHint = DisplayHelp.AntiAliasTextRenderingHint;
+            }
+            return g;
+        }
+
+        protected virtual void BaseWndProc(ref System.Windows.Forms.Message m)
+        {
+            base.WndProc(ref m);
+        }
+
+        /// <summary>
+        /// Returns the current style of the control.
+        /// </summary>
+        /// <returns>Instance of ElementStyle object.</returns>
+        protected virtual ElementStyle GetStyle()
+        {
+            return m_Style;
+        }
+
+        /// <summary>
+        /// Returns the current mouse down style of the control.
+        /// </summary>
+        /// <returns>Instance of ElementStyle object.</returns>
+        protected virtual ElementStyle GetStyleMouseDown()
+        {
+            return m_StyleMouseDown;
+        }
+
+        /// <summary>
+        /// Returns the current mouse over style of the control.
+        /// </summary>
+        /// <returns>Instance of ElementStyle object.</returns>
+        protected virtual ElementStyle GetStyleMouseOver()
+        {
+            return m_StyleMouseOver;
+        }
+
+        /// <summary>
+        /// Paints panel using Windows themes.
+        /// </summary>
+        /// <param name="e">Paint event arguments</param>
+        protected virtual void PaintThemed(PaintEventArgs e)
+        {
+            if (m_ThemeCachedBitmap == null || m_ThemeCachedBitmap.Size != this.ClientRectangle.Size)
+            {
+                DisposeThemeCachedBitmap();
+                Bitmap bmp = new Bitmap(this.ClientRectangle.Width, this.ClientRectangle.Height, e.Graphics);
+                Graphics gTmp = Graphics.FromImage(bmp);
+                try
+                {
+                    this.ThemeTab.DrawBackground(gTmp, ThemeTabParts.Pane, ThemeTabStates.Normal, new Rectangle(0, 0, bmp.Width, bmp.Height));
+                }
+                finally
+                {
+                    gTmp.Dispose();
+                }
+                e.Graphics.DrawImage(bmp, 0, 0, bmp.Width, bmp.Height);
+                ElementStyle style = GetStyle();
+                if (style.BackgroundImage != null)
+                    BarFunctions.PaintBackgroundImage(e.Graphics, this.ClientRectangle, style.BackgroundImage, style.BackgroundImagePosition, style.BackgroundImageAlpha);
+                m_ThemeCachedBitmap = bmp;
+            }
+            else
+            {
+                e.Graphics.DrawImage(m_ThemeCachedBitmap, 0, 0, m_ThemeCachedBitmap.Width, m_ThemeCachedBitmap.Height);
+            }
+        }
+
+        /// <summary>
+        /// Prepares paint surface for paint operation. Called as first thing in Paint event.
+        /// </summary>
+        /// <param name="e"></param>
+        protected virtual void PaintPrepare(PaintEventArgs e)
+        {
+            using (SolidBrush brush = new SolidBrush(m_CanvasColor))
+                e.Graphics.FillRectangle(brush, new Rectangle(0,0,this.Width, this.Height));
+            ElementStyle style = GetStyle();
+            if ((style.BackColor.IsEmpty || style.BackColor.A < 255) &&
+                (style.BackColor2.IsEmpty || style.BackColor2.A < 255))
+            {
+                base.OnPaintBackground(e);
+            }
+
+            if (m_AntiAlias)
+            {
+                e.Graphics.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.AntiAlias;
+                e.Graphics.TextRenderingHint = DisplayHelp.AntiAliasTextRenderingHint;
+            }
+        }
+
+        /// <summary>
+        /// Paints panel given current style.
+        /// </summary>
+        /// <param name="e">Paint event arguments</param>
+        protected virtual void PaintStyled(PaintEventArgs e)
+        {
+            Graphics g = e.Graphics;
+
+            using (ElementStyle style = GetStyle().Copy() as ElementStyle)
+            {
+                if (m_MouseDown && this.Enabled)
+                    style.ApplyStyle(GetStyleMouseDown());
+                else if (m_MouseOver && this.Enabled)
+                    style.ApplyStyle(GetStyleMouseOver());
+
+                PaintInnerContent(e, style, true);
+
+                if (this.Focused && m_ShowFocusRectangle)
+                {
+                    Rectangle r = this.ClientRectangle;
+                    r.Inflate(-2, -2);
+                    if (r.Width > 0 && r.Height > 0)
+                        ControlPaint.DrawFocusRectangle(g, r);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Paints insides of the control.
+        /// </summary>
+        /// <param name="e">Paint event arguments.</param>
+        protected virtual void PaintInnerContent(PaintEventArgs e, ElementStyle style, bool paintText)
+        {
+            Graphics g = e.Graphics;
+            if (m_TextMarkup == null)
+                RefreshTextClientRectangle();
+            Rectangle r = new Rectangle(0,0,this.Width, this.Height);
+            Rectangle rText = m_ClientTextRectangle;
+            //rText.Inflate(-1, -1);
+
+            if (!this.Enabled)
+                style.TextColor = GetColorScheme().ItemDisabledText;
+
+            ElementStyleDisplayInfo info = new ElementStyleDisplayInfo(style, g, r);
+            info.RightToLeft = (this.RightToLeft == RightToLeft.Yes);
+            ElementStyleDisplay.Paint(info);
+            
+            if (paintText)
+            {
+                if (m_TextMarkup == null)
+                {
+                    info.Bounds = rText;
+                    ElementStyleDisplay.PaintText(info, this.Text, this.Font);
+                }
+                else
+                {
+                    TextMarkup.MarkupDrawContext d = new TextMarkup.MarkupDrawContext(g, this.Font, style.TextColor, (this.RightToLeft == RightToLeft.Yes), e.ClipRectangle, true);
+                    m_TextMarkup.Render(d);
+                }
+            }
+
+        }
+
+		private bool m_Painting = false;
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            if (m_SuspendPaint || m_Painting) return;
+			m_Painting=true;
+			try
+			{
+				SmoothingMode sm = e.Graphics.SmoothingMode;
+				TextRenderingHint th = e.Graphics.TextRenderingHint;
+
+				PaintPrepare(e);
+
+				if (DrawThemedPane && BarFunctions.ThemedOS)
+				{
+					PaintThemed(e);
+				}
+				else
+				{
+					PaintStyled(e);
+				}
+
+				e.Graphics.SmoothingMode = sm;
+				e.Graphics.TextRenderingHint = th;
+
+				base.OnPaint(e);
+			}
+			finally
+			{
+				m_Painting=false;
+			}
+        }
+
+        protected override void OnResize(EventArgs e)
+        {
+            base.OnResize(e);
+            RefreshTextClientRectangle();
+            SetRegion(true);
+        }
+
+        protected override void OnHandleCreated(EventArgs e)
+        {
+            base.OnHandleCreated(e);
+            SetRegion(true);
+        }
+
+        protected override void NotifyInvalidate(Rectangle invalidatedArea)
+        {
+            base.NotifyInvalidate(invalidatedArea);
+            SetRegion(true);
+        }
+
+        //protected override void OnEnabledChanged(EventArgs e)
+        //{
+        //    m_SuspendPaint = true;
+        //    base.OnEnabledChanged(e);
+        //    m_SuspendPaint = false;
+        //}
+
+        protected override void OnChangeUICues(UICuesEventArgs e)
+        {
+            if (m_ShowFocusRectangle)
+            {
+                if (e.ChangeFocus)
+                    this.Invalidate();
+            }
+        }
+
+        protected override void OnMouseMove(MouseEventArgs e)
+        {
+            if (m_TextMarkup != null)
+                m_TextMarkup.MouseMove(this, e);
+            base.OnMouseMove(e);
+        }
+
+        protected override void OnMouseDown(MouseEventArgs e)
+        {
+            if (m_TextMarkup != null)
+                m_TextMarkup.MouseDown(this, e);
+
+            if (e.Button == MouseButtons.Left)
+            {
+                if (!m_MouseDown)
+                {
+                    m_MouseDown = true;
+                    if (GetStyleMouseDown().Custom)
+                        this.Invalidate(false);
+                }
+            }
+            base.OnMouseDown(e);
+        }
+
+        protected override void OnMouseUp(MouseEventArgs e)
+        {
+            if (m_TextMarkup != null)
+                m_TextMarkup.MouseUp(this, e);
+
+            base.OnMouseUp(e);
+
+            if (m_MouseDown)
+            {
+                m_MouseDown = false;
+                if (GetStyleMouseDown().Custom)
+                    this.Invalidate(false);
+            }
+        }
+
+        protected override void OnClick(EventArgs e)
+        {
+            if (m_TextMarkup != null)
+                m_TextMarkup.Click(this);
+            base.OnClick(e);
+        }
+
+        protected override void OnMouseEnter(EventArgs e)
+        {
+            base.OnMouseEnter(e);
+
+            if (!m_MouseOver)
+            {
+                m_MouseOver = true;
+                if (GetStyleMouseOver().Custom)
+                    this.Invalidate(false);
+            }
+        }
+
+        protected override void OnMouseLeave(EventArgs e)
+        {
+            if (m_TextMarkup != null)
+                m_TextMarkup.MouseLeave(this);
+
+            base.OnMouseLeave(e);
+
+            if (m_MouseOver)
+            {
+                m_MouseOver = false;
+                if (GetStyleMouseOver().Custom)
+                    this.Invalidate(false);
+            }
+        }
+
+        protected override void OnFontChanged(EventArgs e)
+        {
+            base.OnFontChanged(e);
+            if (m_TextMarkup != null)
+                m_TextMarkup.InvalidateElementsSize();
+            RefreshTextClientRectangle();
+        }
+
+        protected override void OnTextChanged(EventArgs e)
+        {
+            string text = this.Text;
+
+            if (m_TextMarkup != null)
+            {
+                m_TextMarkup.MouseLeave(this);
+                m_TextMarkup.HyperLinkClick -= new EventHandler(TextMarkupLinkClicked);
+                m_TextMarkup = null;
+            }
+
+            if (TextMarkup.MarkupParser.IsMarkup(ref text))
+                m_TextMarkup = TextMarkup.MarkupParser.Parse(text);
+
+            if (m_TextMarkup != null)
+            {
+                m_TextMarkup.HyperLinkClick += new EventHandler(TextMarkupLinkClicked);
+                RefreshTextClientRectangle();
+            }
+            this.Invalidate();
+            base.OnTextChanged(e);
+        }
+
+        private void TextMarkupLinkClicked(object sender, EventArgs e)
+        {
+            TextMarkup.HyperLink link = sender as TextMarkup.HyperLink;
+            if (link != null)
+            {
+                OnMarkupLinkClick(new MarkupLinkClickEventArgs(link.Name, link.HRef));
+            }
+        }
+
+        protected virtual void OnMarkupLinkClick(MarkupLinkClickEventArgs e)
+        {
+            if (this.MarkupLinkClick != null)
+                MarkupLinkClick(this, e);
+        }
+
+        protected virtual void ResizeMarkup()
+        {
+            if (m_TextMarkup != null)
+            {
+                Rectangle r = this.ClientTextRectangle;
+                r.Inflate(-2, 0);
+                r.X += ElementStyleLayout.LeftWhiteSpace(this.Style);
+                r.Width -= ElementStyleLayout.HorizontalStyleWhiteSpace(this.Style);
+                r.Y += ElementStyleLayout.TopWhiteSpace(this.Style);
+                r.Height -= ElementStyleLayout.VerticalStyleWhiteSpace(this.Style);
+                
+                if (r.Width <= 0 || r.Height <= 0)
+                    return;
+                Graphics g = this.CreateGraphics();
+                try
+                {
+                    if (m_AntiAlias)
+                    {
+                        g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.AntiAlias;
+                        g.TextRenderingHint = DisplayHelp.AntiAliasTextRenderingHint;
+                    }
+                    TextMarkup.MarkupDrawContext d = new TextMarkup.MarkupDrawContext(g, this.Font, SystemColors.Control, (this.RightToLeft == RightToLeft.Yes));
+                    m_TextMarkup.Measure(r.Size, d);
+                    m_TextMarkup.Arrange(r, d);
+                    if (this.AutoScroll)
+                    {
+                        Size autoScrollMinSize = Size.Empty;
+                        if (m_TextMarkup.Bounds.Height > r.Height)
+                            autoScrollMinSize.Height = m_TextMarkup.Bounds.Height + m_Style.MarginTop + m_Style.MarginBottom + 2;
+                        if (m_TextMarkup.Bounds.Width > r.Width)
+                            autoScrollMinSize.Width = m_TextMarkup.Bounds.Width + m_Style.MarginLeft + m_Style.MarginRight + 2;
+
+                        if (this.AutoScrollMinSize != autoScrollMinSize)
+                            this.AutoScrollMinSize = autoScrollMinSize;
+                    }
+                    else if (!this.AutoScrollMinSize.IsEmpty)
+                        this.AutoScrollMinSize = Size.Empty;
+                }
+                finally
+                {
+                    g.Dispose();
+                }
+            }
+        }
+
+        protected override void OnSystemColorsChanged(EventArgs e)
+        {
+            base.OnSystemColorsChanged(e);
+
+            Application.DoEvents();
+
+            m_ColorScheme.Refresh(null, true);
+            RefreshStyleSystemColors();
+
+            if (m_ThemeTab != null)
+                RefreshThemes();
+
+            this.Invalidate(true);
+        }
+
+        protected override void OnHandleDestroyed(EventArgs e)
+        {
+            DisposeThemes();
+            base.OnHandleDestroyed(e);
+        }
+
+        protected override bool ProcessMnemonic(char charCode)
+        {
+            if (IsMnemonic(charCode, this.Text))
+            {
+                OnClick(new EventArgs());
+                return true;
+            }
+            return base.ProcessMnemonic(charCode);
+        }
+
+        ///// <summary>
+        /////   Gets or sets the text displayed on panel.
+        ///// </summary>
+        //[Browsable(true), DevCoBrowsable(true), EditorBrowsable(EditorBrowsableState.Always), Category("Appearance"), Description("Gets or sets the text displayed on panel.")]
+        //public override string Text
+        //{
+        //    get { return m_Text; }
+        //    set
+        //    {
+        //        if (value.Length < 0) return;
+        //        base.Text = value;
+        //        m_Text = value;
+        //        OnTextChanged(new EventArgs());
+        //        this.Invalidate();
+        //    }
+        //}
+
+        /// <summary>
+        /// Gets or sets whether focus rectangle is displayed when control has focus.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), DefaultValue(false), Category("Appearance"), Description("Indicates whether focus rectangle is displayed when control has focus.")]
+        public bool ShowFocusRectangle
+        {
+            get { return m_ShowFocusRectangle; }
+            set
+            {
+                m_ShowFocusRectangle = value;
+                if (this.DesignMode)
+                    this.Invalidate();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the canvas color for the panel. Canvas color will be visible on areas of the control that do not get covered
+        /// by the style and it will also be used as a base color for style to be painted on.
+        /// </summary>
+        [Browsable(true), Category("Background"), Description("Gets or sets the canvas color.")]
+        public Color CanvasColor
+        {
+            get
+            {
+                return m_CanvasColor;
+            }
+            set
+            {
+                m_CanvasColor = value;
+                if (this.DesignMode)
+                    this.Invalidate();
+            }
+        }
+        /// <summary>
+        /// Indicates whether CanvasColor should be serialized. Used by windows forms designer design-time support.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeCanvasColor()
+        { return (m_CanvasColor != Color.White); }
+        /// <summary>
+        /// Resets CanvasColor to it's default value. Used by windows forms designer design-time support.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetCanvasColor()
+        {
+            m_CanvasColor = Color.White;
+        }
+
+        /// <summary>
+        /// Gets or sets the panel style.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Category("Style"), Description("Indicates panel style."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public virtual ElementStyle Style
+        {
+            get { return m_Style; }
+            //set
+            //{
+            //    if (value == null)
+            //        throw new InvalidOperationException("Null is not valid value for this property");
+            //    m_Style = value; 
+            //}
+        }
+        /// <summary>
+        ///     Resets the style to it's default value.
+        /// </summary>
+        public void ResetStyle()
+        {
+			if(m_Style==null)
+			{
+				// Set default style
+				m_Style = new ElementStyle();
+                m_Style.SetColorScheme(GetColorScheme());
+				m_Style.StyleChanged += new EventHandler(this.OnVisualPropertyChanged);
+			}
+			else
+				m_Style.Reset();
+
+            RefreshStyleSystemColors();
+            this.Invalidate();
+        }
+
+        /// <summary>
+        /// Resets the internal mouse tracking properties that track whether mouse is over the panel and whether is mouse pressed while over the panel.
+        /// </summary>
+        public void ResetMouseTracking()
+        {
+            m_MouseOver = false;
+            m_MouseDown = false;
+            this.Invalidate();
+        }
+
+        /// <summary>
+        /// Gets or sets the panel style when mouse hovers over the panel.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), NotifyParentPropertyAttribute(true), Category("Style"), Description("Gets or sets the panel style when mouse hovers over the panel."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public virtual ElementStyle StyleMouseOver
+        {
+            get
+            {
+                return m_StyleMouseOver;
+            }
+            //set
+            //{
+            //    if (value == null)
+            //        throw new InvalidOperationException("Null is not valid value for this property.");
+            //    m_StyleMouseOver = value;
+            //}
+        }
+        /// <summary>
+        ///     Resets the style to it's default value.
+        /// </summary>
+        public void ResetStyleMouseOver()
+        {
+			if(m_StyleMouseOver==null)
+			{
+				m_StyleMouseOver = new ElementStyle();
+                m_StyleMouseOver.SetColorScheme(GetColorScheme());
+				m_StyleMouseOver.StyleChanged += new EventHandler(this.OnVisualPropertyChanged);
+			}
+			else
+				m_StyleMouseOver.Reset();
+            this.Invalidate();
+        }
+
+        /// <summary>
+        /// Gets or sets the panel style when mouse button is pressed on the panel.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), NotifyParentPropertyAttribute(true), Category("Style"), Description("Gets or sets the panel style when mouse button is pressed on the panel."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public virtual ElementStyle StyleMouseDown
+        {
+            get
+            {
+                return m_StyleMouseDown;
+            }
+            //set
+            //{
+            //    if (value == null)
+            //        throw new InvalidOperationException("Null is not valid value for this property.");
+            //    m_StyleMouseDown = value;
+            //}
+        }
+        /// <summary>
+        ///     Resets the style to it's default value.
+        /// </summary>
+        public void ResetStyleMouseDown()
+        {
+			if(m_StyleMouseDown==null)
+			{
+				m_StyleMouseDown = new ElementStyle();
+                m_StyleMouseDown.SetColorScheme(GetColorScheme());
+				m_StyleMouseDown.StyleChanged += new EventHandler(this.OnVisualPropertyChanged);
+			}
+			else
+				m_StyleMouseDown.Reset();
+            this.Invalidate();
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override Color BackColor
+        {
+            get { return base.BackColor; }
+            set { base.BackColor = value; }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override Image BackgroundImage
+        {
+            get { return base.BackgroundImage; }
+            set { base.BackgroundImage = value; }
+        }
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override ImageLayout BackgroundImageLayout
+        {
+            get { return base.BackgroundImageLayout; }
+            set { base.BackgroundImageLayout = value; }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override Color ForeColor
+        {
+            get { return base.ForeColor; }
+            set { base.ForeColor = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether anti-alias smoothing is used while painting.
+        /// </summary>
+        [DefaultValue(true), Browsable(true), Category("Appearance"), Description("Gets or sets whether anti-aliasing is used while painting.")]
+        public bool AntiAlias
+        {
+            get { return m_AntiAlias; }
+            set
+            {
+                if (m_AntiAlias != value)
+                {
+                    m_AntiAlias = value;
+                    this.Invalidate();
+                }
+            }
+        }
+
+        internal eDotNetBarStyle EffectiveColorSchemeStyle
+        {
+            get
+            {
+                if (m_ColorSchemeStyle == eDotNetBarStyle.StyleManagerControlled)
+                    return StyleManager.GetEffectiveStyle();
+                return m_ColorSchemeStyle;
+            }
+        }
+        /// <summary>
+        ///     Gets or sets color scheme style.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Category("Style"), Description("Gets or sets color scheme style."), DefaultValue(eDotNetBarStyle.Office2003)]
+        public eDotNetBarStyle ColorSchemeStyle
+        {
+            get { return m_ColorSchemeStyle; }
+            set
+            {
+                m_ColorSchemeStyle = value;
+                m_ColorScheme = new ColorScheme(EffectiveColorSchemeStyle);
+                OnColorSchemeChanged();
+                this.Invalidate();
+            }
+        }
+
+        /// <summary>
+        /// Called after either ColorScheme or ColorSchemeStyle has changed. If you override make sure that you call base implementation so default
+        /// processing can occur.
+        /// </summary>
+        protected virtual void OnColorSchemeChanged()
+        {
+            RefreshStyleSystemColors();
+        }
+
+        protected virtual void RefreshTextClientRectangle()
+        {
+            Rectangle r = this.DisplayRectangle;
+            if (!m_TextDockConstrained)
+                return;
+
+            foreach (Control ctrl in this.Controls)
+            {
+                if (ctrl.Dock != DockStyle.None)
+                {
+                    if (ctrl.Dock == DockStyle.Fill)
+                    {
+                        r = Rectangle.Empty;
+                        break;
+                    }
+                    switch (ctrl.Dock)
+                    {
+                        case DockStyle.Left:
+                            {
+                                r.X += ctrl.Width;
+                                r.Width -= ctrl.Width;
+                                break;
+                            }
+                        case DockStyle.Right:
+                            {
+                                r.Width -= ctrl.Width;
+                                break;
+                            }
+                        case DockStyle.Top:
+                            {
+                                r.Y += ctrl.Height;
+                                r.Height -= ctrl.Height;
+                                break;
+                            }
+                        case DockStyle.Bottom:
+                            {
+                                r.Height -= ctrl.Height;
+                                break;
+                            }
+                    }
+                }
+            }
+            if (r.Width <= 0 || r.Height <= 0)
+                r = Rectangle.Empty;
+            m_ClientTextRectangle = r;
+
+            ResizeMarkup();
+        }
+
+        [Browsable(true), DefaultValue(""), DesignerSerializationVisibility(DesignerSerializationVisibility.Visible),  EditorBrowsable(EditorBrowsableState.Always), Bindable(true)]
+        public override string Text
+        {
+            get
+            {
+                return base.Text;
+            }
+            set
+            {
+                base.Text = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether text rectangle painted on panel is considering docked controls inside the panel. 
+        /// </summary>
+        [DefaultValue(true), Category("Appearance"), Description("Indicates whether text rectangle painted on panel is considering docked controls inside the panel.")]
+        public virtual bool TextDockConstrained
+        {
+            get { return m_TextDockConstrained; }
+            set
+            {
+                m_TextDockConstrained = value;
+                if (this.DesignMode)
+                    this.Invalidate();
+            }
+
+        }
+
+        protected override void OnControlAdded(ControlEventArgs e)
+        {
+            base.OnControlAdded(e);
+            if (this.DesignMode)
+            {
+                this.Invalidate();
+            }
+        }
+        protected override void OnControlRemoved(ControlEventArgs e)
+        {
+            base.OnControlRemoved(e);
+            if (m_TextDockConstrained && this.DesignMode)
+            {
+                this.Invalidate();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the text rectangle. This property is set by internal implementation and it should not be set by outside code.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public Rectangle ClientTextRectangle
+        {
+            get { return m_ClientTextRectangle; }
+            set { m_ClientTextRectangle = value; }
+        }
+
+        /// <summary>
+        ///     Applies predefined Panel color scheme to the control.
+        /// </summary>
+        public void ApplyPanelStyle()
+        {
+            ApplyPanelStyle(eDotNetBarStyle.Office2003);
+        }
+
+        /// <summary>
+        ///     Applies predefined Panel color scheme to the control.
+        /// </summary>
+        public void ApplyPanelStyle(eDotNetBarStyle style)
+        {
+            this.ColorSchemeStyle = style;
+
+            this.ResetStyle();
+            this.ResetStyleMouseDown();
+            this.ResetStyleMouseOver();
+
+            m_Style.Border = eStyleBorderType.Solid;
+            m_Style.BorderWidth = 1;
+            m_Style.BorderColorSchemePart = eColorSchemePart.PanelBorder;
+            m_Style.BackColorSchemePart = eColorSchemePart.PanelBackground;
+            m_Style.BackColor2SchemePart = eColorSchemePart.PanelBackground2;
+            m_Style.BackColorGradientAngle = GetColorScheme().PanelBackgroundGradientAngle;
+            m_Style.TextColorSchemePart = eColorSchemePart.PanelText;
+            m_Style.TextAlignment = eStyleTextAlignment.Center;
+            m_Style.TextLineAlignment = eStyleTextAlignment.Center;
+
+            this.Invalidate();
+        }
+
+        /// <summary>
+        ///     Applies predefined Button color scheme to the control.
+        /// </summary>
+        public void ApplyButtonStyle()
+        {
+            this.ColorSchemeStyle = eDotNetBarStyle.Office2003;
+
+            this.ResetStyle();
+            this.ResetStyleMouseDown();
+            this.ResetStyleMouseOver();
+
+            this.Style.TextAlignment = eStyleTextAlignment.Center;
+            this.Style.TextLineAlignment = eStyleTextAlignment.Center;
+            this.Style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground;
+            this.Style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground2;
+            this.Style.BackgroundImagePosition = DevComponents.DotNetBar.eStyleBackgroundImage.Tile;
+            this.Style.Border = eStyleBorderType.Solid;
+            this.Style.BorderWidth = 1;
+            this.Style.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder;
+            this.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText;
+            this.Style.BackColorGradientAngle = 90;
+            this.StyleMouseDown.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground;
+            this.StyleMouseDown.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground2;
+            this.StyleMouseDown.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBorder;
+            this.StyleMouseDown.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedText;
+            this.StyleMouseOver.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemHotBackground;
+            this.StyleMouseOver.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemHotBackground2;
+            this.StyleMouseOver.BorderColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemHotBorder;
+            this.StyleMouseOver.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemHotText;
+
+            this.Invalidate();
+        }
+
+        /// <summary>
+        ///     Applies predefined Label color scheme to the control.
+        /// </summary>
+        public void ApplyLabelStyle()
+        {
+            this.ResetStyleMouseDown();
+            this.ResetStyleMouseOver();
+
+            ApplyLabelStyle(this.Style);
+            this.Invalidate();
+        }
+
+        /// <summary>
+        /// Applies predefined lable style to the ElementStyle object.
+        /// </summary>
+        /// <param name="style">Reference to ElementStyle object.</param>
+        protected virtual void ApplyLabelStyle(ElementStyle style)
+        {
+            style.Reset();
+            style.TextAlignment = eStyleTextAlignment.Center;
+            style.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground;
+            style.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground2;
+            style.BackgroundImagePosition = DevComponents.DotNetBar.eStyleBackgroundImage.Tile;
+            style.BorderColorSchemePart = eColorSchemePart.BarDockedBorder;
+            style.BorderWidth = 1;
+            style.TextColorSchemePart = eColorSchemePart.ItemText;
+            style.BackColorGradientAngle = 90;
+
+        }
+        /// <summary>
+        /// Gets or sets whether painting of the control is suspended.
+        /// </summary>
+        protected virtual bool SuspendPaint
+        {
+            get { return m_SuspendPaint; }
+            set { m_SuspendPaint = value; }
+        }
+
+        #region IButtonControl implementation
+        /// <summary>
+        /// Gets or sets the value returned to the parent form when the button is clicked.
+        /// </summary>
+        [Browsable(true), Category("Behavior"), DefaultValue(DialogResult.None), Description("Gets or sets the value returned to the parent form when the button is clicked.")]
+        public DialogResult DialogResult
+        {
+            get
+            {
+                return m_DialogResult;
+            }
+
+            set
+            {
+                if (Enum.IsDefined(typeof(DialogResult), value))
+                {
+                    m_DialogResult = value;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Notifies a control that it is the default button so that its appearance and behavior is adjusted accordingly.
+        /// </summary>
+        /// <param name="value">true if the control should behave as a default button; otherwise false.</param>
+        public void NotifyDefault(bool value)
+        {
+            if (m_IsDefault != value)
+            {
+                m_IsDefault = value;
+            }
+        }
+
+        /// <summary>
+        /// Generates a Click event for the control.
+        /// </summary>
+        public void PerformClick()
+        {
+            if (this.CanSelect)
+            {
+                this.OnClick(EventArgs.Empty);
+            }
+        }
+        #endregion
+
+        #region Themes Support
+        /// <summary>
+        /// Specifies whether item is drawn using Themes when running on OS that supports themes like Windows XP.
+        /// </summary>
+        [System.ComponentModel.Browsable(true), DevCoBrowsable(true), System.ComponentModel.DefaultValue(false), System.ComponentModel.Category("Appearance"), System.ComponentModel.Description("Specifies whether item is drawn using Themes when running on OS that supports themes like Windows XP.")]
+        public virtual bool ThemeAware
+        {
+            get
+            {
+                return DrawThemedPane;
+            }
+            set
+            {
+                DisposeThemeCachedBitmap();
+                DrawThemedPane = value;
+                this.Invalidate();
+            }
+        }
+
+        internal bool DrawThemedPane = false;
+        private void RefreshThemes()
+        {
+            DisposeThemeCachedBitmap();
+            if (m_ThemeTab != null)
+            {
+                m_ThemeTab.Dispose();
+                m_ThemeTab = new ThemeTab(this);
+            }
+        }
+        private void DisposeThemes()
+        {
+            if (m_ThemeTab != null)
+            {
+                m_ThemeTab.Dispose();
+                m_ThemeTab = null;
+            }
+            DisposeThemeCachedBitmap();
+        }
+        protected void DisposeThemeCachedBitmap()
+        {
+            if (m_ThemeCachedBitmap != null)
+            {
+                m_ThemeCachedBitmap.Dispose();
+                m_ThemeCachedBitmap = null;
+            }
+        }
+        internal DevComponents.DotNetBar.ThemeTab ThemeTab
+        {
+            get
+            {
+                if (m_ThemeTab == null)
+                    m_ThemeTab = new ThemeTab(this);
+                return m_ThemeTab;
+            }
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Ribbon/QatCustomizeDialog.cs b/PROMS/DotNetBar Source Code/Ribbon/QatCustomizeDialog.cs
new file mode 100644
index 00000000..d73903f0
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Ribbon/QatCustomizeDialog.cs	
@@ -0,0 +1,131 @@
+using System;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.Metro;
+
+namespace DevComponents.DotNetBar.Ribbon
+{
+    public class QatCustomizeDialog : DevComponents.DotNetBar.OfficeForm
+    {
+        private QatCustomizePanel qatCustomizePanel1;
+        internal ButtonX buttonOK;
+        internal ButtonX buttonCancel;
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form 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.qatCustomizePanel1 = new DevComponents.DotNetBar.Ribbon.QatCustomizePanel();
+            this.buttonOK = new DevComponents.DotNetBar.ButtonX();
+            this.buttonCancel = new DevComponents.DotNetBar.ButtonX();
+            this.SuspendLayout();
+            // 
+            // qatCustomizePanel1
+            // 
+            this.qatCustomizePanel1.BackColor = System.Drawing.Color.Transparent;
+            this.qatCustomizePanel1.Location = new System.Drawing.Point(0, 0);
+            this.qatCustomizePanel1.Name = "qatCustomizePanel1";
+            this.qatCustomizePanel1.Size = new System.Drawing.Size(444, 298);
+            this.qatCustomizePanel1.TabIndex = 0;
+            // 
+            // buttonOK
+            // 
+            this.buttonOK.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+            this.buttonOK.DialogResult = System.Windows.Forms.DialogResult.OK;
+            this.buttonOK.Location = new System.Drawing.Point(285, 297);
+            this.buttonOK.Name = "buttonOK";
+            this.buttonOK.Size = new System.Drawing.Size(73, 21);
+            this.buttonOK.TabIndex = 1;
+            this.buttonOK.Text = "OK";
+            // 
+            // buttonCancel
+            // 
+            this.buttonCancel.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+            this.buttonCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+            this.buttonCancel.Location = new System.Drawing.Point(364, 297);
+            this.buttonCancel.Name = "buttonCancel";
+            this.buttonCancel.Size = new System.Drawing.Size(73, 21);
+            this.buttonCancel.TabIndex = 2;
+            this.buttonCancel.Text = "Cancel";
+            // 
+            // QatCustomizeDialog
+            // 
+            this.ClientSize = new System.Drawing.Size(445, 324);
+            this.Controls.Add(this.buttonCancel);
+            this.Controls.Add(this.buttonOK);
+            this.Controls.Add(this.qatCustomizePanel1);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.ShowInTaskbar = false;
+            this.Name = "QatCustomizeDialog";
+            this.Text = "Customize";
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        public QatCustomizeDialog()
+        {
+            InitializeComponent();
+            this.EnableGlass = false;
+            //if (System.Environment.OSVersion.Version.Major >= 6)
+            //{
+            //    this.ClientSize = new Size(this.ClientSize.Width + 10, this.ClientSize.Height + 10);
+            //}
+        }
+
+        /// <summary>
+        /// Loads the items for the customization into the ribbon control. All Ribbon Bars on the ribbon are enumerated and items
+        /// are added if they have CanCustomize=true.
+        /// </summary>
+        /// <param name="rc">Ribbon control to enumerate.</param>
+        public void LoadItems(RibbonControl rc)
+        {
+            qatCustomizePanel1.LoadItems(rc);
+        }
+
+        /// <summary>
+        /// Loads the items for the customization from MetroTab control. Registered MetroToolbar controls are enumerated and items
+        /// are added if they have CanCustomize=true.
+        /// </summary>
+        /// <param name="tab">MetroTab control that holds references to known MetroToolbars.</param>
+        public void LoadItems(MetroShell tab)
+        {
+            qatCustomizePanel1.LoadItems(tab);
+        }
+
+        /// <summary>
+        /// Gets reference to the internal Quick Access Toolbar Customization panel.
+        /// </summary>
+        public QatCustomizePanel QatCustomizePanel
+        {
+            get { return qatCustomizePanel1; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/Ribbon/QatCustomizeDialog.resx b/PROMS/DotNetBar Source Code/Ribbon/QatCustomizeDialog.resx
new file mode 100644
index 00000000..19dc0dd8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Ribbon/QatCustomizeDialog.resx	
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/Ribbon/QatCustomizeItem.cs b/PROMS/DotNetBar Source Code/Ribbon/QatCustomizeItem.cs
new file mode 100644
index 00000000..9cd576dc
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Ribbon/QatCustomizeItem.cs	
@@ -0,0 +1,466 @@
+using System;
+using System.Text;
+using System.ComponentModel;
+using DevComponents.DotNetBar.Ribbon;
+using DevComponents.DotNetBar.Rendering;
+using DevComponents.DotNetBar.Metro;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represents the item that provides Quick Access Toolbar customization.
+    /// </summary>
+    public class QatCustomizeItem : CustomizeItem
+    {
+        #region Private Variables
+        //private bool m_SetupComplete = false;
+        private const string DefaultTooltipText = "Customize Quick Access Toolbar";
+        private const int FIXED_SIZE = 14;
+        #endregion
+
+        #region Internal Implementation
+        /// <summary>
+		/// Creates new instance of CustomizeItem object.
+		/// </summary>
+        public QatCustomizeItem():base()
+        {
+            this.Tooltip = DefaultTooltipText;
+        }
+
+        /// <summary>
+        /// Returns copy of CustomizeItem item
+        /// </summary>
+        public override BaseItem Copy()
+        {
+            QatCustomizeItem objCopy = new QatCustomizeItem();
+            this.CopyToItem(objCopy);
+            return objCopy;
+        }
+
+        public override void Paint(ItemPaintArgs p)
+        {
+            Rendering.BaseRenderer renderer = p.Renderer;
+            if (renderer != null)
+            {
+                renderer.DrawQatCustomizeItem(new QatCustomizeItemRendererEventArgs(this, p.Graphics));
+                return;
+            }
+            else
+            {
+                Rendering.QatCustomizeItemPainter painter = PainterFactory.CreateQatCustomizeItemPainter(this);
+                if (painter != null)
+                {
+                    painter.Paint(new QatCustomizeItemRendererEventArgs(this, p.Graphics));
+                    return;
+                }
+            }
+
+            base.Paint(p);
+        }
+
+        private bool QatContainsItem(RibbonControl rc, string itemName)
+        {
+            if (rc.QuickToolbarItems.Contains(itemName))
+                return true;
+
+            if(this.Parent is QatOverflowItem && this.Parent.SubItems.Contains(itemName))
+                return true;
+            
+            return false;
+        }
+        private bool QatContainsItem(MetroShell tab, string itemName)
+        {
+            if (tab.QuickToolbarItems.Contains(itemName))
+                return true;
+
+            if (this.Parent is QatOverflowItem && this.Parent.SubItems.Contains(itemName))
+                return true;
+
+            return false;
+        }
+
+        protected override void SetupCustomizeItem()
+        {
+            if (this.GetRibbonControl() != null)
+                SetupRibbonCustomizeItem();
+            else if (this.GetMetroTab() != null)
+                SetupMetroTabCustomizeItem();
+        }
+
+        private void SetupMetroTabCustomizeItem()
+        {
+            this.SubItems.Clear();
+
+            // Add customize items...
+            string qatCustomize = "&Customize Quick Access Toolbar...";
+
+            MetroShell tab = GetMetroTab();
+
+            if (tab != null)
+            {
+                qatCustomize = tab.SystemText.QatCustomizeText;
+                this.PopupFont = tab.Font;
+            }
+
+            SubItemsCollection qatFrequentCommands = tab.QatFrequentCommands;
+
+            string s = "<b>Customize Quick Access Toolbar</b>";
+            if (tab != null)
+                s = tab.SystemText.QatCustomizeMenuLabel;
+            LabelItem label = new LabelItem(RibbonControl.SysQatCustomizeLabelName, s);
+            label.PaddingBottom = 2;
+            label.PaddingTop = 2;
+            label.PaddingLeft = 12;
+            label.BorderSide = eBorderSide.Bottom;
+            label.BorderType = eBorderType.SingleLine;
+            label.CanCustomize = false;
+            if (GlobalManager.Renderer is Office2007Renderer)
+            {
+                label.BackColor = ((Office2007Renderer)GlobalManager.Renderer).ColorTable.QuickAccessToolbar.QatCustomizeMenuLabelBackground;
+                label.ForeColor = ((Office2007Renderer)GlobalManager.Renderer).ColorTable.QuickAccessToolbar.QatCustomizeMenuLabelText;
+            }
+            this.SubItems.Add(label);
+
+            bool beginGroup = false;
+
+            if (qatFrequentCommands.Count > 0)
+            {
+                beginGroup = true;
+                foreach (BaseItem qatFC in qatFrequentCommands)
+                {
+                    if (qatFC.Text.Length > 0)
+                    {
+                        ButtonItem bf = new ButtonItem(RibbonControl.SysFrequentlyQatNamePart + qatFC.Name, qatFC.Text);
+                        if (QatContainsItem(tab, qatFC.Name))
+                            bf.Checked = true;
+                        bf.CanCustomize = false;
+                        this.SubItems.Add(bf);
+                        bf.Click += new EventHandler(AddFrequentCommandToQat);
+                        bf.Tag = qatFC.Name;
+                    }
+                }
+            }
+
+            ButtonItem item = new ButtonItem(RibbonControl.SysQatCustomizeItemName, qatCustomize);
+            item.BeginGroup = beginGroup;
+            item.CanCustomize = false;
+            this.SubItems.Add(item);
+            item.Click += new EventHandler(QatCustomizeItemClick);
+
+            //if (tab != null && tab.EnableQatPlacement)
+            //{
+            //    ButtonItem b = new ButtonItem(RibbonControl.SysQatPlaceItemName);
+            //    b.CanCustomize = false;
+            //    //if (tab.QatPositionedBelowRibbon)
+            //    //    b.Text = tab.SystemText.QatPlaceAboveRibbonText;
+            //    //else
+            //        b.Text = tab.SystemText.QatPlaceBelowRibbonText;
+            //    b.Click += new EventHandler(QuickAccessToolbarChangePlacement);
+            //    this.SubItems.Add(b);
+            //}
+
+            //if (tab != null)
+            //{
+            //    ButtonItem b = null;
+            //    if (tab.Expanded)
+            //        b = new ButtonItem(RibbonControl.SysMinimizeRibbon, tab.SystemText.MinimizeRibbonText);
+            //    else
+            //        b = new ButtonItem(RibbonControl.SysMaximizeRibbon, tab.SystemText.MaximizeRibbonText);
+            //    b.CanCustomize = false;
+            //    b.BeginGroup = true;
+            //    b.Click += new EventHandler(ToggleRibbonExpand);
+            //    this.SubItems.Add(b);
+            //}
+        }
+        private MetroShell GetMetroTab()
+        {
+            MetroTabStrip strip = this.ContainerControl as MetroTabStrip;
+            if (strip == null)
+            {
+                BaseItem parent = this;
+                while (parent != null && strip == null)
+                {
+                    parent = parent.Parent;
+                    if (parent != null)
+                    {
+                        strip = parent.ContainerControl as MetroTabStrip;
+                    }
+                }
+            }
+            MetroShell tab = null;
+            if (strip != null) tab = strip.Parent as MetroShell;
+            return tab;
+        }
+        private void SetupRibbonCustomizeItem()
+        {
+            this.SubItems.Clear();
+
+            // Add customize items...
+            string qatCustomize = "&Customize Quick Access Toolbar...";
+
+            RibbonControl rc = GetRibbonControl();
+
+            if (rc != null)
+                qatCustomize = rc.SystemText.QatCustomizeText;
+
+            SubItemsCollection qatFrequentCommands = rc.QatFrequentCommands;
+
+            string s = "<b>Customize Quick Access Toolbar</b>";
+            if (rc != null)
+                s = rc.SystemText.QatCustomizeMenuLabel;
+            LabelItem label = new LabelItem(RibbonControl.SysQatCustomizeLabelName, s);
+            label.PaddingBottom = 2;
+            label.PaddingTop = 2;
+            label.PaddingLeft = 12;
+            label.BorderSide = eBorderSide.Bottom;
+            label.BorderType = eBorderType.SingleLine;
+            label.CanCustomize = false;
+            if (GlobalManager.Renderer is Office2007Renderer)
+            {
+                label.BackColor = ((Office2007Renderer)GlobalManager.Renderer).ColorTable.QuickAccessToolbar.QatCustomizeMenuLabelBackground;
+                label.ForeColor = ((Office2007Renderer)GlobalManager.Renderer).ColorTable.QuickAccessToolbar.QatCustomizeMenuLabelText;
+            }
+            this.SubItems.Add(label);
+
+            bool beginGroup = false;
+
+            if (qatFrequentCommands.Count > 0)
+            {
+                beginGroup = true;
+                foreach (BaseItem qatFC in qatFrequentCommands)
+                {
+                    if (qatFC.Text.Length > 0)
+                    {
+                        ButtonItem bf = new ButtonItem(RibbonControl.SysFrequentlyQatNamePart + qatFC.Name, qatFC.Text);
+                        if (QatContainsItem(rc, qatFC.Name))
+                            bf.Checked = true;
+                        bf.CanCustomize = false;
+                        this.SubItems.Add(bf);
+                        bf.Click += new EventHandler(AddFrequentCommandToQat);
+                        bf.Tag = qatFC.Name;
+                    }
+                }
+            }
+
+            ButtonItem item = new ButtonItem(RibbonControl.SysQatCustomizeItemName, qatCustomize);
+            item.BeginGroup = beginGroup;
+            item.CanCustomize = false;
+            this.SubItems.Add(item);
+            item.Click += new EventHandler(QatCustomizeItemClick);
+
+            if (rc != null && rc.EnableQatPlacement)
+            {
+                ButtonItem b = new ButtonItem(RibbonControl.SysQatPlaceItemName);
+                b.CanCustomize = false;
+                if (rc.QatPositionedBelowRibbon)
+                    b.Text = rc.SystemText.QatPlaceAboveRibbonText;
+                else
+                    b.Text = rc.SystemText.QatPlaceBelowRibbonText;
+                b.Click += new EventHandler(QuickAccessToolbarChangePlacement);
+                this.SubItems.Add(b);
+            }
+
+            if (rc != null)
+            {
+                ButtonItem b = null;
+                if (rc.Expanded)
+                    b = new ButtonItem(RibbonControl.SysMinimizeRibbon, rc.SystemText.MinimizeRibbonText);
+                else
+                    b = new ButtonItem(RibbonControl.SysMaximizeRibbon, rc.SystemText.MaximizeRibbonText);
+                b.CanCustomize = false;
+                b.BeginGroup = true;
+                b.Click += new EventHandler(ToggleRibbonExpand);
+                this.SubItems.Add(b);
+            }
+        }
+        private void AddFrequentCommandToQat(object sender, EventArgs e)
+        {
+            RibbonControl rc = GetRibbonControl();
+            if (rc==null) return;
+            CollapseAll(this);
+            rc.RibbonStrip.ClosePopups();
+            ButtonItem b = sender as ButtonItem;
+            if (b != null && b.Tag is string && b.Tag.ToString().Length > 0)
+            {
+                if (b.Checked)
+                {
+                    // Remove from QAT
+                    rc.RemoveItemFromQuickAccessToolbar(rc.QuickToolbarItems[b.Tag.ToString()]);
+                }
+                else
+                {
+                    // Add to QAT
+                    rc.AddItemToQuickAccessToolbar(rc.QatFrequentCommands[b.Tag.ToString()]);
+                }
+            }
+        }
+
+        private void ToggleRibbonExpand(object sender, EventArgs e)
+        {
+            CollapseAll(this);
+            ButtonItem b = sender as ButtonItem;
+            if(b==null) return;
+            RibbonControl rc = GetRibbonControl();
+            if (rc == null) return;
+            rc.RibbonStrip.ClosePopups();
+            if (b.Name == RibbonControl.SysMinimizeRibbon)
+                rc.Expanded = false;
+            else if (b.Name == RibbonControl.SysMaximizeRibbon)
+                rc.Expanded = true;
+        }
+
+        private void QuickAccessToolbarChangePlacement(object sender, EventArgs e)
+        {
+            CollapseAll(this);
+            RibbonControl rc = GetRibbonControl();
+            if (rc != null)
+            {
+                rc.RibbonStrip.ClosePopups();
+                rc.QuickAccessToolbarChangePlacement();
+            }
+        }
+
+        private void QatCustomizeItemClick(object sender, EventArgs e)
+        {
+            if (GetRibbonControl() != null)
+                QatCustomizeItemClickRibbon();
+            else if (GetMetroTab() != null)
+                QatCustomizeItemClickMetroTab();
+        }
+
+        private void QatCustomizeItemClickMetroTab()
+        {
+            MetroShell tab = GetMetroTab();
+            CollapseAll(this);
+            if (tab != null)
+            {
+                tab.MetroTabStrip.ClosePopups();
+                tab.ShowQatCustomizeDialog();
+            }
+        }
+        private void QatCustomizeItemClickRibbon()
+        {
+            RibbonControl rc = GetRibbonControl();
+            CollapseAll(this);
+            if (rc != null)
+            {
+                rc.RibbonStrip.ClosePopups();
+                rc.ShowQatCustomizeDialog();
+            }
+        }
+        private RibbonControl GetRibbonControl()
+        {
+            RibbonStrip strip = this.ContainerControl as RibbonStrip;
+            if (strip == null)
+            {
+                BaseItem parent = this;
+                while (parent != null && strip == null)
+                {
+                    parent = parent.Parent;
+                    if (parent != null)
+                    {
+                        if (parent.ContainerControl is QatToolbar)
+                        {
+                            QatToolbar qat = parent.ContainerControl as QatToolbar;
+                            if (qat.Parent is RibbonControl)
+                            {
+                                strip = ((RibbonControl)qat.Parent).RibbonStrip;
+                                break;
+                            }
+                        }
+                        else
+                            strip = parent.ContainerControl as RibbonStrip;
+                    }
+                }
+            }
+            RibbonControl rc = null;
+            if (strip != null) rc = strip.Parent as RibbonControl;
+
+            Ribbon.QatToolbar qatToolbar = this.ContainerControl as Ribbon.QatToolbar;
+            if (qatToolbar != null && qatToolbar.Parent is RibbonControl)
+                return qatToolbar.Parent as RibbonControl;
+
+            return rc;
+        }
+
+        protected override void ClearCustomizeItem()
+        {
+            // Nothing to do leave all items as they are
+        }
+
+        protected override void LoadResources() {}
+
+        //protected override void SetCustomTooltip(string text) {}
+
+        /// <summary>
+        /// Gets or sets whether Customize menu item is visible.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), Category("Behavior"), Description("Indicates whether Customize menu item is visible."), DefaultValue(true), EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool CustomizeItemVisible
+        {
+            get { return base.CustomizeItemVisible; }
+            set { base.CustomizeItemVisible = value; }
+        }
+
+        /// <summary>
+        /// Gets/Sets informational text (tooltip) for the item.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), DefaultValue(QatCustomizeItem.DefaultTooltipText), System.ComponentModel.Category("Appearance"), System.ComponentModel.Description("Indicates the text that is displayed when mouse hovers over the item."), Localizable(true)]
+        public override string Tooltip
+        {
+            get { return base.Tooltip; }
+            set { base.Tooltip = value; }
+        }
+
+        protected internal override void OnExpandChange()
+        {
+            this.PopupSide = ePopupSide.Bottom;
+            base.OnExpandChange();
+        }
+
+        /// <summary>
+		/// Overridden. Recalculates the size of the item.
+		/// </summary>
+        public override void RecalcSize()
+        {
+            if (this.SuspendLayout)
+                return;
+
+            if (m_Orientation == eOrientation.Vertical)
+            {
+                // Take suggested width
+                m_Rect.Height = Dpi.Height(FIXED_SIZE);
+                m_Rect.Width = Dpi.Width22;
+            }
+            else
+            {
+                // Take suggested height
+                m_Rect.Width = Dpi.Width(FIXED_SIZE);
+                m_Rect.Height = Dpi.Height22;
+            }
+
+            SetCustomTooltip(GetTooltipText());
+        }
+
+        /// <summary>
+        /// Gets localized tooltip text for this instance of the item.
+        /// </summary>
+        /// <returns>Tooltip text.</returns>
+        protected override string GetTooltipText()
+        {
+            string s = "";
+            using (LocalizationManager lm = new LocalizationManager(this.GetOwner() as IOwnerLocalize))
+                s = lm.GetLocalizedString(LocalizationKeys.QatCustomizeTooltip);
+            if (s == "") s = this.Tooltip;
+            return s;
+        }
+
+        /// <summary>
+        /// Called when mouse hovers over the customize item.
+        /// </summary>
+        protected override void MouseHoverCustomize()
+        {
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Ribbon/QatCustomizePanel.cs b/PROMS/DotNetBar Source Code/Ribbon/QatCustomizePanel.cs
new file mode 100644
index 00000000..909e7653
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Ribbon/QatCustomizePanel.cs	
@@ -0,0 +1,724 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Data;
+using System.Text;
+using System.Windows.Forms;
+using System.Collections;
+using DevComponents.DotNetBar.Controls;
+using DevComponents.DotNetBar.Metro;
+using System.Collections.Generic;
+
+namespace DevComponents.DotNetBar.Ribbon
+{
+    /// <summary>
+    /// Represents the Quick Access Toolbar customization panel which can be used on the custom QAT customization dialogs
+    /// so customization of Quick Access Toolbar can be reused.
+    /// </summary>
+    public class QatCustomizePanel : UserControl
+    {
+        #region Private/Public variables
+        /// <summary>
+        /// Gets reference to the internal ItemPanel control that displays the commands for selected category.
+        /// </summary>
+        public ItemPanel itemPanelCommands;
+        /// <summary>
+        /// Gets reference to the ItemPanel control that displays the Quick Access Toolbar Items.
+        /// </summary>
+        public ItemPanel itemPanelQat;
+        /// <summary>
+        /// Gets reference to the button that perform addition of commands to the Quick Access Toolbar.
+        /// </summary>
+        public ButtonX buttonAddToQat;
+        /// <summary>
+        /// Gets reference to the button that perform removal of commands from the Quick Access Toolbar.
+        /// </summary>
+        public ButtonX buttonRemoveFromQat;
+        /// <summary>
+        /// Gets reference to the combo box control that holds all categories.
+        /// </summary>
+        public ComboBoxEx comboCategories;
+        /// <summary>
+        /// Gets reference to the combo box categories label control.
+        /// </summary>
+        public Label labelCategories;
+        /// <summary>
+        /// Gets reference to the check box that changes the placement of the Quick Access Toolbar.
+        /// </summary>
+        public Controls.CheckBoxX checkQatBelowRibbon;
+
+        private Hashtable m_Categories = new Hashtable();
+        private bool m_DataChanged = false;
+        /// <summary> 
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+        #endregion
+
+        #region Constructor
+
+        public QatCustomizePanel()
+        {
+            this.SetStyle(ControlStyles.UserPaint, true);
+            this.SetStyle(ControlStyles.AllPaintingInWmPaint, true);
+            this.SetStyle(ControlStyles.Opaque, true);
+            this.SetStyle(ControlStyles.ResizeRedraw, true);
+            this.SetStyle(DisplayHelp.DoubleBufferFlag, true);
+            this.SetStyle(ControlStyles.SupportsTransparentBackColor, true);
+
+            InitializeComponent();
+        }
+        #endregion
+
+        #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.itemPanelCommands = new DevComponents.DotNetBar.ItemPanel();
+            this.itemPanelQat = new DevComponents.DotNetBar.ItemPanel();
+            this.buttonAddToQat = new DevComponents.DotNetBar.ButtonX();
+            this.buttonRemoveFromQat = new DevComponents.DotNetBar.ButtonX();
+            this.comboCategories = new Controls.ComboBoxEx();
+            this.labelCategories = new System.Windows.Forms.Label();
+            this.checkQatBelowRibbon = new Controls.CheckBoxX();
+            this.SuspendLayout();
+            // 
+            // itemPanelCommands
+            // 
+            this.itemPanelCommands.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+                        | System.Windows.Forms.AnchorStyles.Left)
+                        | System.Windows.Forms.AnchorStyles.Right)));
+            // 
+            // 
+            // 
+            this.itemPanelCommands.AutoScroll = true;
+            this.itemPanelCommands.BackgroundStyle.Class = DevComponents.DotNetBar.Rendering.ElementStyleClassKeys.ItemPanelKey;
+            this.itemPanelCommands.Style = eDotNetBarStyle.StyleManagerControlled;
+            this.itemPanelCommands.FadeEffect = false;
+            this.itemPanelCommands.LayoutOrientation = DevComponents.DotNetBar.eOrientation.Vertical;
+#if!TRIAL
+            this.itemPanelCommands.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F";
+#endif
+            this.itemPanelCommands.Location = new System.Drawing.Point(9, 46);
+            this.itemPanelCommands.Name = "itemPanelCommands";
+            this.itemPanelCommands.Size = new System.Drawing.Size(173, 257);
+            this.itemPanelCommands.TabIndex = 2;
+            this.itemPanelCommands.Text = "itemPanelCommands";
+            this.itemPanelCommands.KeyUp += new KeyEventHandler(ItemPanelKeyUp);
+            this.itemPanelCommands.ItemDoubleClick += new MouseEventHandler(ItemPanelCommandsDoubleClick);
+            // 
+            // itemPanelQat
+            // 
+            this.itemPanelQat.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+                        | System.Windows.Forms.AnchorStyles.Right)));
+            // 
+            // 
+            // 
+            this.itemPanelQat.AutoScroll = true;
+            this.itemPanelQat.BackgroundStyle.Class = DevComponents.DotNetBar.Rendering.ElementStyleClassKeys.ItemPanelKey;
+            this.itemPanelQat.Style = eDotNetBarStyle.StyleManagerControlled;
+            this.itemPanelQat.EnableDragDrop = true;
+            this.itemPanelQat.FadeEffect = false;
+            this.itemPanelQat.LayoutOrientation = DevComponents.DotNetBar.eOrientation.Vertical;
+            #if!TRIAL
+            this.itemPanelQat.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F";
+            #endif
+            this.itemPanelQat.Location = new System.Drawing.Point(266, 46);
+            this.itemPanelQat.Name = "itemPanelQat";
+            this.itemPanelQat.Size = new System.Drawing.Size(173, 257);
+            this.itemPanelQat.TabIndex = 5;
+            this.itemPanelQat.Text = "itemPanelCommands";
+            this.itemPanelQat.DragDrop += new System.Windows.Forms.DragEventHandler(this.itemPanelQat_DragDrop);
+            this.itemPanelQat.UserCustomize += new EventHandler(this.itemPanelQat_UserCustomize);
+            this.itemPanelQat.KeyUp += new KeyEventHandler(ItemPanelKeyUp);
+            this.itemPanelQat.ItemDoubleClick += new MouseEventHandler(ItemPanelQatDoubleClick);
+            // 
+            // buttonAddToQat
+            // 
+            this.buttonAddToQat.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonAddToQat.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+            this.buttonAddToQat.Location = new System.Drawing.Point(188, 126);
+            this.buttonAddToQat.Name = "buttonAddToQat";
+            this.buttonAddToQat.Size = new System.Drawing.Size(73, 21);
+            this.buttonAddToQat.TabIndex = 3;
+            this.buttonAddToQat.Text = "&Add >>";
+            this.buttonAddToQat.Click += new System.EventHandler(this.buttonAddToQat_Click);
+            // 
+            // buttonRemoveFromQat
+            // 
+            this.buttonRemoveFromQat.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonRemoveFromQat.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+            this.buttonRemoveFromQat.Location = new System.Drawing.Point(188, 153);
+            this.buttonRemoveFromQat.Name = "buttonRemoveFromQat";
+            this.buttonRemoveFromQat.Size = new System.Drawing.Size(73, 21);
+            this.buttonRemoveFromQat.TabIndex = 4;
+            this.buttonRemoveFromQat.Text = "&Remove";
+            this.buttonRemoveFromQat.Click += new System.EventHandler(this.buttonRemoveFromQat_Click);
+            // 
+            // comboCategories
+            // 
+            this.comboCategories.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                        | System.Windows.Forms.AnchorStyles.Right)));
+            this.comboCategories.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboCategories.Location = new System.Drawing.Point(9, 19);
+            this.comboCategories.Name = "comboCategories";
+            this.comboCategories.Size = new System.Drawing.Size(173, 21);
+            this.comboCategories.Sorted = true;
+            this.comboCategories.TabIndex = 1;
+            this.comboCategories.SelectedIndexChanged += new System.EventHandler(this.comboCategories_SelectedIndexChanged);
+            this.comboCategories.Style = eDotNetBarStyle.Office2007;
+            this.comboCategories.DrawMode = DrawMode.OwnerDrawFixed;
+            this.comboCategories.ThemeAware = false;
+            // 
+            // labelCategories
+            // 
+            this.labelCategories.AutoSize = true;
+            this.labelCategories.BackColor = System.Drawing.Color.Transparent;
+            this.labelCategories.Location = new System.Drawing.Point(6, 3);
+            this.labelCategories.Name = "labelCategories";
+            this.labelCategories.Size = new System.Drawing.Size(123, 13);
+            this.labelCategories.TabIndex = 0;
+            this.labelCategories.Text = "&Choose commands from:";
+            // 
+            // checkQatBelowRibbon
+            // 
+            this.checkQatBelowRibbon.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.checkQatBelowRibbon.BackColor = System.Drawing.Color.Transparent;
+            this.checkQatBelowRibbon.Location = new System.Drawing.Point(9, 311);
+            this.checkQatBelowRibbon.Name = "checkQatBelowRibbon";
+            this.checkQatBelowRibbon.Size = new System.Drawing.Size(420, 17);
+            this.checkQatBelowRibbon.TabIndex = 6;
+            this.checkQatBelowRibbon.Text = "&Place Quick Access Toolbar below the Ribbon";
+            this.checkQatBelowRibbon.CheckedChangedEx += new Controls.CheckBoxXChangeEventHandler(this.checkQatBelowRibbon_CheckedChanged);
+            // 
+            // QatCustomizePanel
+            // 
+            this.BackColor = System.Drawing.Color.Transparent;
+            this.Controls.Add(this.comboCategories);
+            this.Controls.Add(this.checkQatBelowRibbon);
+            this.Controls.Add(this.labelCategories);
+            this.Controls.Add(this.buttonRemoveFromQat);
+            this.Controls.Add(this.buttonAddToQat);
+            this.Controls.Add(this.itemPanelQat);
+            this.Controls.Add(this.itemPanelCommands);
+            this.Name = "QatCustomizePanel";
+            this.Size = new System.Drawing.Size(444, 334);
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        private void ItemPanelKeyUp(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode == Keys.Up || e.KeyCode == Keys.Down || e.KeyCode == Keys.Left || e.KeyCode == Keys.Right)
+            {
+                ItemPanel panel = sender as ItemPanel;
+                foreach (BaseItem item in panel.Items)
+                {
+                    ButtonItem button = item as ButtonItem;
+                    if (button != null && button.IsMouseOver && !button.Checked)
+                    {
+                        button.Checked = true;
+                        break;
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region Internal Implementation
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            if (this.BackColor== Color.Transparent || this.BackColor.A<255)
+            {
+                base.OnPaintBackground(e);
+            }
+
+            if (this.BackColor == Color.Transparent)
+                return;
+
+            DisplayHelp.FillRectangle(e.Graphics, this.ClientRectangle, this.BackColor);
+        }
+
+        /// <summary>
+        /// Loads the items for the customization into the ribbon control. All Ribbon Bars on the ribbon are enumerated and items
+        /// are added if they have CanCustomize=true.
+        /// </summary>
+        /// <param name="rc">Ribbon control to enumerate.</param>
+        public void LoadItems(RibbonControl rc)
+        {
+            m_Categories.Clear();
+            itemPanelCommands.Items.Clear();
+            itemPanelQat.Items.Clear();
+
+            LoadQatItems(rc);
+
+            if (rc.CategorizeMode == eCategorizeMode.Categories)
+                LoadByCategory(rc);
+            else
+                LoadByRibbonBar(rc);
+
+            LoadCategories();
+
+            checkQatBelowRibbon.Checked = rc.QatPositionedBelowRibbon;
+            checkQatBelowRibbon.Visible = rc.EnableQatPlacement;
+            m_DataChanged = false;
+        }
+
+        /// <summary>
+        /// Loads the items for the customization from MetroTab registered toolbars. All registered Toolbars are enumerated and items
+        /// are added if they have CanCustomize=true.
+        /// </summary>
+        /// <param name="tab">MetroTab control to enumerate.</param>
+        public void LoadItems(MetroShell tab)
+        {
+            m_Categories.Clear();
+            itemPanelCommands.Items.Clear();
+            itemPanelQat.Items.Clear();
+
+            LoadQatItems(tab);
+
+            if (tab.CategorizeMode == eMetroCategorizeMode.Categories)
+                LoadByCategory(tab);
+            else
+                LoadByMetroToolbar(tab);
+
+            LoadCategories();
+
+            checkQatBelowRibbon.Visible = false;
+            m_DataChanged = false;
+        }
+
+        #region By Category Loading
+        private void LoadByCategory(RibbonControl rc)
+        {
+            // Loop through all RibbonBars and add the items
+            foreach (Control panel in rc.Controls)
+            {
+                LoadByCategory(panel);
+            }
+
+            BaseItem startButton = rc.GetApplicationButton();
+            if (startButton!=null)
+            {
+                LoadByCategory(startButton);
+            }
+        }
+
+        private void LoadByCategory(MetroShell tab)
+        {
+            // Loop through all RibbonBars and add the items
+            List<IOwner> toolbars = tab.RegisteredToolbars;
+            foreach (IOwner toolbar in toolbars)
+            {
+                if (toolbar is MetroToolbar)
+                    LoadByCategory((MetroToolbar)toolbar);
+            }
+
+            BaseItem startButton = tab.GetApplicationButton();
+            if (startButton != null)
+            {
+                LoadByCategory(startButton);
+            }
+        }
+        private void LoadByCategory(MetroToolbar toolbar)
+        {
+            foreach (BaseItem item in toolbar.Items)
+                LoadByCategory(item);
+            foreach (BaseItem item in toolbar.ExtraItems)
+                LoadByCategory(item);
+        }
+
+        private void LoadByCategory(Control panel)
+        {
+            if (panel is RibbonBar)
+                LoadByCategory(panel as RibbonBar);
+            foreach (Control c in panel.Controls)
+                LoadByCategory(c);
+        }
+
+        private void LoadByCategory(RibbonBar bar)
+        {
+            foreach (BaseItem item in bar.Items)
+                LoadByCategory(item);
+        }
+
+        private void LoadByCategory(BaseItem item)
+        {
+            if (CanCustomizeItem(item))
+            {
+                string cat = GetCategory(item);
+                ArrayList items = m_Categories[cat] as ArrayList;
+                if (items == null)
+                {
+                    items = new ArrayList();
+                    m_Categories.Add(cat, items);
+                }
+                items.Add(GetCustomizeRepresentation(item));
+            }
+
+            foreach (BaseItem child in item.SubItems)
+                LoadByCategory(child);
+
+            if (item is GalleryContainer)
+            {
+                GalleryContainer gallery = item as GalleryContainer;
+                foreach (BaseItem child in gallery.PopupGalleryItems)
+                    LoadByCategory(child);
+            }
+        }
+
+        private string GetCategory(BaseItem item)
+        {
+            if (item.Category != "")
+                return item.Category;
+            return "Unassigned";
+        }
+        #endregion
+
+        #region Load by Ribbon or Toolbar
+        private void LoadByRibbonBar(RibbonControl rc)
+        {
+            // Loop through all RibbonBars and add the items
+            foreach (Control panel in rc.Controls)
+            {
+                LoadByRibbonBar(panel);
+            }
+
+            BaseItem startButton = rc.GetApplicationButton();
+            if (startButton!=null)
+            {
+                LoadByRibbonBar(startButton, GetRibbonBarCategory(startButton.Text));
+            }
+        }
+        private void LoadByMetroToolbar(MetroShell rc)
+        {
+            // Loop through all RibbonBars and add the items
+            List<IOwner> toolbars = rc.RegisteredToolbars;
+            foreach (IOwner owner in toolbars)
+            {
+                if (owner is MetroToolbar)
+                {
+                    LoadByMetroToolbar((MetroToolbar)owner);
+                }
+            }
+
+            BaseItem startButton = rc.GetApplicationButton();
+            if (startButton != null)
+            {
+                LoadByRibbonBar(startButton, GetMetroToolbarCategory(startButton.Text));
+            }
+        }
+        private void LoadByMetroToolbar(MetroToolbar bar)
+        {
+            foreach (BaseItem item in bar.Items)
+                LoadByRibbonBar(item, GetMetroToolbarCategory(bar.Text));
+            foreach (BaseItem item in bar.ExtraItems)
+                LoadByRibbonBar(item, GetMetroToolbarCategory(bar.Text));
+        }
+
+        private void LoadByRibbonBar(Control panel)
+        {
+            if (panel is RibbonBar)
+                LoadByRibbonBar(panel as RibbonBar);
+            foreach (Control c in panel.Controls)
+                LoadByRibbonBar(c);
+        }
+
+        private void LoadByRibbonBar(RibbonBar bar)
+        {
+            foreach (BaseItem item in bar.Items)
+                LoadByRibbonBar(item, GetRibbonBarCategory(bar.Text));
+        }
+
+        private string GetRibbonBarCategory(string barText)
+        {
+            StringBuilder ret = new StringBuilder(barText.Length);
+            for (int i = 0; i < barText.Length; i++)
+            {
+                if (barText[i] == '&')
+                {
+                    if (i + 1 < barText.Length && barText[i + 1] == '&')
+                        ret.Append(barText[i]);
+                    else
+                        continue;
+                }
+                else
+                    ret.Append(barText[i]);
+            }
+
+            return ret.ToString();
+        }
+        private string GetMetroToolbarCategory(string barText)
+        {
+            StringBuilder ret = new StringBuilder(barText.Length);
+            for (int i = 0; i < barText.Length; i++)
+            {
+                if (barText[i] == '&')
+                {
+                    if (i + 1 < barText.Length && barText[i + 1] == '&')
+                        ret.Append(barText[i]);
+                    else
+                        continue;
+                }
+                else
+                    ret.Append(barText[i]);
+            }
+
+            return ret.ToString();
+        }
+
+        private void LoadByRibbonBar(BaseItem item, string category)
+        {
+            if (CanCustomizeItem(item))
+            {
+                ArrayList items = m_Categories[category] as ArrayList;
+                if (items == null)
+                {
+                    items = new ArrayList();
+                    m_Categories.Add(category, items);
+                }
+                items.Add(GetCustomizeRepresentation(item));
+            }
+
+            foreach (BaseItem child in item.SubItems)
+                LoadByRibbonBar(child, category);
+
+            if (item is GalleryContainer)
+            {
+                GalleryContainer gallery = item as GalleryContainer;
+                foreach (BaseItem child in gallery.PopupGalleryItems)
+                    LoadByRibbonBar(child, category);
+            }
+        }
+        #endregion
+
+        private void LoadQatItems(RibbonControl rc)
+        {
+            int count = rc.QuickToolbarItems.Count;
+            int start = 0;
+
+            BaseItem startButton = rc.GetApplicationButton();
+            if (startButton != null)
+                start = rc.QuickToolbarItems.IndexOf(startButton) + 1;
+
+            for (int i = start; i < count; i++)
+            {
+                BaseItem item = rc.QuickToolbarItems[i];
+                if (IsSystemItem(item))
+                    continue;
+                BaseItem custItem = GetCustomizeRepresentation(item);
+                custItem.Tag = null;
+                if (!item.CanCustomize) custItem.Visible = false;
+                itemPanelQat.Items.Add(custItem);
+            }
+        }
+        private void LoadQatItems(MetroShell tab)
+        {
+            int count = tab.QuickToolbarItems.Count;
+            int start = 0;
+
+            BaseItem startButton = tab.GetApplicationButton();
+            if (startButton != null)
+                start = tab.QuickToolbarItems.IndexOf(startButton) + 1;
+
+            for (int i = start; i < count; i++)
+            {
+                BaseItem item = tab.QuickToolbarItems[i];
+                if (IsSystemItem(item))
+                    continue;
+                BaseItem custItem = GetCustomizeRepresentation(item);
+                custItem.Tag = null;
+                if (!item.CanCustomize) custItem.Visible = false;
+                itemPanelQat.Items.Add(custItem);
+            }
+        }
+
+        private bool IsSystemItem(BaseItem item)
+        {
+            if (item.SystemItem || item is ItemContainer || item is CustomizeItem || item is SystemCaptionItem)
+                return true;
+            return false;
+        }
+
+        private ButtonItem GetCustomizeRepresentation(BaseItem item)
+        {
+            ButtonItem ret = new ButtonItem(item.Name);
+            ret.Text = item.Text;
+            ret.ButtonStyle = eButtonStyle.ImageAndText;
+            ret.ImagePaddingVertical = 4;
+            ret.OptionGroup = "sys";
+            ret.GlobalItem = false;
+            if (ret.Text == "")
+                ret.Text = "Unassigned";
+            ret.Tag = item;
+
+            if (item is ButtonItem)
+            {
+                ButtonItem b = item as ButtonItem;
+                if (b.ImageSmall != null)
+                {
+                    ret.Image = b.ImageSmall;
+                    if (b.ImageSmall.Width != 16 || b.ImageSmall.Height != 16)
+                        ret.ImageFixedSize = new Size(16, 16);
+                }
+                else
+                {
+                    CompositeImage image = b.GetImage(ImageState.Default, Color.Black);
+                    if (image != null)
+                    {
+                        if (image.IsIcon)
+                            ret.Icon = (Icon)image.Icon.Clone();
+                        else
+                            ret.Image = image.Image;
+                        ret.ImageFixedSize = new Size(16, 16);
+                    }
+                }
+            }
+            else if (item is ComboBoxItem || item is TextBoxItem || item is ControlContainerItem)
+            {
+                ret.ImagePosition = eImagePosition.Right;
+                ret.Image = BarFunctions.LoadBitmap("SystemImages.QatCustomizeItemCombo.png");
+            }
+
+            return ret;
+        }
+
+        private bool CanCustomizeItem(BaseItem item)
+        {
+            if (item == null)
+                return false;
+
+            if (!item.CanCustomize || item.SystemItem || item.Name=="tempColorPickerItem")
+                return false;
+
+            if (item is ItemContainer || item is GenericItemContainer)
+                return false;
+
+            return true;
+        }
+
+        private void LoadCategories()
+        {
+            comboCategories.Items.Clear();
+            foreach (string key in m_Categories.Keys)
+                comboCategories.Items.Add(key);
+            if (comboCategories.Items.Count > 0)
+                comboCategories.SelectedIndex = 0;
+        }
+
+        private void comboCategories_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            if (comboCategories.SelectedIndex < 0)
+            {
+                itemPanelCommands.Items.Clear();
+                itemPanelCommands.RecalcLayout();
+                return;
+            }
+
+            string key = comboCategories.Items[comboCategories.SelectedIndex].ToString();
+            ArrayList items = m_Categories[key] as ArrayList;
+
+            itemPanelCommands.Items.Clear();
+            foreach (BaseItem item in items)
+                itemPanelCommands.Items.Add(item);
+            itemPanelCommands.RecalcLayout();
+        }
+
+        private void ItemPanelCommandsDoubleClick(object sender, MouseEventArgs e)
+        {
+            AddCheckedButtonToQat();
+        }
+
+        private void AddCheckedButtonToQat()
+        {
+            ButtonItem buttonChecked = itemPanelCommands.GetChecked();
+            if (buttonChecked == null)
+                return;
+            if (itemPanelQat.Items.Contains(buttonChecked.Name))
+                return;
+
+            ButtonItem copy = buttonChecked.Copy() as ButtonItem;
+            copy.Checked = false;
+            itemPanelQat.Items.Add(copy);
+            copy.Checked = true;
+            itemPanelQat.RecalcLayout();
+            m_DataChanged = true;
+
+            int index = itemPanelCommands.Items.IndexOf(buttonChecked) + 1;
+            if (index == itemPanelCommands.Items.Count)
+                return;
+            buttonChecked = itemPanelCommands.Items[index] as ButtonItem;
+            if (buttonChecked != null)
+            {
+                buttonChecked.Checked = true;
+                itemPanelCommands.EnsureVisible(buttonChecked);
+            }
+        }
+        private void buttonAddToQat_Click(object sender, EventArgs e)
+        {
+            AddCheckedButtonToQat();
+        }
+
+        private void RemoveCheckedButtonFromQat()
+        {
+            ButtonItem buttonChecked = itemPanelQat.GetChecked();
+            if (buttonChecked == null)
+                return;
+            int index = itemPanelQat.Items.IndexOf(buttonChecked);
+            itemPanelQat.Items.Remove(buttonChecked);
+            if (index >= 0 && itemPanelQat.Items.Count > 0)
+            {
+                if (index + 1 >= itemPanelQat.Items.Count)
+                    index = itemPanelQat.Items.Count - 1;
+                buttonChecked = itemPanelQat.Items[index] as ButtonItem;
+                if (buttonChecked != null)
+                {
+                    buttonChecked.Checked = true;
+                    itemPanelQat.EnsureVisible(buttonChecked);
+                }
+            }
+            itemPanelQat.RecalcLayout();
+            m_DataChanged = true;
+        }
+        private void buttonRemoveFromQat_Click(object sender, EventArgs e)
+        {
+            RemoveCheckedButtonFromQat();
+        }
+        void ItemPanelQatDoubleClick(object sender, MouseEventArgs e)
+        {
+            RemoveCheckedButtonFromQat();
+        }
+
+        /// <summary>
+        /// Gets or sets the value of data changed flag.
+        /// </summary>
+        [DefaultValue(false), Browsable(false)]
+        public bool DataChanged
+        {
+            get { return m_DataChanged; }
+            set { m_DataChanged = value; }
+        }
+
+        private void itemPanelQat_DragDrop(object sender, DragEventArgs e)
+        {
+            m_DataChanged = true;
+        }
+
+        private void itemPanelQat_UserCustomize(object sender, EventArgs e)
+        {
+            m_DataChanged = true;
+        }
+
+        private void checkQatBelowRibbon_CheckedChanged(object sender, Controls.CheckBoxXChangeEventArgs e)
+        {
+            m_DataChanged = true;
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Ribbon/QatCustomizePanel.resx b/PROMS/DotNetBar Source Code/Ribbon/QatCustomizePanel.resx
new file mode 100644
index 00000000..19dc0dd8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Ribbon/QatCustomizePanel.resx	
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/Ribbon/QatOverflowItem.cs b/PROMS/DotNetBar Source Code/Ribbon/QatOverflowItem.cs
new file mode 100644
index 00000000..3b88161e
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Ribbon/QatOverflowItem.cs	
@@ -0,0 +1,74 @@
+using System;
+using System.Text;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Defines the Ribbon Quick Access Overflow system item. Used internally by Ribbon control.
+    /// </summary>
+    public class QatOverflowItem : DisplayMoreItem
+    {
+        #region Internal Implementation
+        public QatOverflowItem()
+            : base()
+        {
+            this.KeyTips = "00";
+        }
+
+        /// <summary>
+        /// Returns copy of DisplayMoreItem item
+        /// </summary>
+        public override BaseItem Copy()
+        {
+            QatOverflowItem objCopy = new QatOverflowItem();
+            this.CopyToItem(objCopy);
+            return objCopy;
+        }
+
+        /// <summary>
+		/// Overriden. Draws the item.
+		/// </summary>
+		/// <param name="g">Target Graphics object.</param>
+        public override void Paint(ItemPaintArgs p)
+        {
+            Rendering.BaseRenderer renderer = p.Renderer;
+            if (renderer != null)
+            {
+                renderer.DrawQatOverflowItem(new QatOverflowItemRendererEventArgs(this, p.Graphics));
+                return;
+            }
+            else
+            {
+                Rendering.QatOverflowPainter painter = PainterFactory.CreateQatOverflowItemPainter(this);
+                if (painter != null)
+                {
+                    painter.Paint(new QatOverflowItemRendererEventArgs(this, p.Graphics));
+                    return;
+                }
+            }
+
+            base.Paint(p);
+        }
+
+        /// <summary>
+        /// Returns the insertion index for the items removed from overflow popup. Assumes that right-most items are removed first by the layout manager.
+        /// </summary>
+        /// <returns></returns>
+        protected override int GetReInsertIndex()
+        {
+            int insertPos = m_Parent.SubItems.Count;
+            for (int i = insertPos - 1; i >= 0; i--)
+            {
+                if (m_Parent.SubItems[i] is CustomizeItem || m_Parent.SubItems[i].ItemAlignment == eItemAlignment.Far)
+                {
+                    insertPos = i;
+                }
+                else if (m_Parent.SubItems[i].ItemAlignment == eItemAlignment.Near)
+                    break;
+            }
+            return insertPos;
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Ribbon/QatToolbar.cs b/PROMS/DotNetBar Source Code/Ribbon/QatToolbar.cs
new file mode 100644
index 00000000..246049a8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Ribbon/QatToolbar.cs	
@@ -0,0 +1,185 @@
+using System;
+using System.Text;
+using System.ComponentModel;
+using System.Windows.Forms;
+using System.Collections;
+
+namespace DevComponents.DotNetBar.Ribbon
+{
+    /// <summary>
+    /// Represents the stand-alone Quick Access Toolbar control
+    /// </summary>
+    internal class QatToolbar : ItemControl
+    {
+        #region Private Variables
+        private CaptionItemContainer m_ItemContainer = null;
+        private ElementStyle m_DefaultBackgroundStyle = new ElementStyle();
+        #endregion
+
+        #region Constructor
+        public QatToolbar()
+        {
+            m_ItemContainer = new CaptionItemContainer();
+            m_ItemContainer.GlobalItem = false;
+            m_ItemContainer.ContainerControl = this;
+            m_ItemContainer.WrapItems = false;
+            m_ItemContainer.EventHeight = false;
+            m_ItemContainer.UseMoreItemsButton = false;
+            m_ItemContainer.Stretch = true;
+            m_ItemContainer.Displayed = true;
+            m_ItemContainer.SystemContainer = true;
+            m_ItemContainer.PaddingTop = 0;
+            m_ItemContainer.PaddingBottom = 0;
+            m_ItemContainer.ItemSpacing = 0;
+            m_ItemContainer.SetOwner(this);
+            m_ItemContainer.PaddingBottom = 0;
+            m_ItemContainer.PaddingTop = 0;
+            m_ItemContainer.ItemSpacing = 1;
+            m_ItemContainer.TrackSubItemsImageSize = false;
+            //m_ItemContainer.ToolbarItemsAlign = eContainerVerticalAlignment.Middle;
+            this.SetBaseItemContainer(m_ItemContainer);
+            m_ItemContainer.Style = eDotNetBarStyle.Office2007;
+        }
+        #endregion
+
+        #region Internal Implementation
+        protected override ElementStyle GetBackgroundStyle()
+        {
+            if(this.BackgroundStyle.Custom)
+                return base.GetBackgroundStyle();
+
+            return m_DefaultBackgroundStyle;
+        }
+
+        protected override void RecalcSize()
+        {
+            InitDefaultStyles();
+            base.RecalcSize();
+        }
+
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            InitDefaultStyles();
+            base.OnPaint(e);
+        }
+
+        private void InitDefaultStyles()
+        {
+            // Initialize Default Styles
+            RibbonPredefinedColorSchemes.ApplyQatElementStyle(m_DefaultBackgroundStyle, this);
+        }
+
+        /// <summary>
+        /// Gets/Sets the visual style for items and color scheme.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Category("Appearance"), Description("Specifies the visual style of the control."), DefaultValue(eDotNetBarStyle.Office2007)]
+        public eDotNetBarStyle Style
+        {
+            get
+            {
+                return m_ItemContainer.Style;
+            }
+            set
+            {
+                this.ColorScheme.Style = value;
+                m_ItemContainer.Style = value;
+                this.Invalidate();
+                this.RecalcLayout();
+            }
+        }
+
+        internal eDotNetBarStyle EffectiveStyle
+        {
+            get
+            {
+                if (Style == eDotNetBarStyle.StyleManagerControlled)
+                    return StyleManager.GetEffectiveStyle();
+                return Style;
+            }
+        }
+
+        /// <summary>
+        /// Returns collection of items on a bar.
+        /// </summary>
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content), Browsable(false)]
+        public SubItemsCollection Items
+        {
+            get
+            {
+                return m_ItemContainer.SubItems;
+            }
+        }
+
+        protected override void OnMouseDown(System.Windows.Forms.MouseEventArgs e)
+        {
+            if (e.Button == MouseButtons.Right)
+            {
+                if(this.Parent is RibbonControl)
+                    ((RibbonControl)this.Parent).ShowCustomizeContextMenu(this.HitTest(e.X, e.Y), true);
+            }
+            base.OnMouseDown(e);
+        }
+
+        protected override bool ProcessMnemonic(char charCode)
+        {
+            if (!this.ShowKeyTips) return false;
+            return base.ProcessMnemonic(charCode);
+        }
+
+        /// <summary>
+        /// Returns the collection of items with the specified name.
+        /// </summary>
+        /// <param name="ItemName">Item name to look for.</param>
+        /// <returns></returns>
+        public override ArrayList GetItems(string ItemName)
+        {
+            RibbonControl ribbonControl = GetRibbonControl();
+            if (ribbonControl != null && ribbonControl.RibbonStrip != null)
+                return ribbonControl.RibbonStrip.GetItems(ItemName);
+            return base.GetItems(ItemName);
+        }
+
+        /// <summary>
+        /// Returns the collection of items with the specified name and type.
+        /// </summary>
+        /// <param name="ItemName">Item name to look for.</param>
+        /// <param name="itemType">Item type to look for.</param>
+        /// <returns></returns>
+        public override ArrayList GetItems(string ItemName, Type itemType)
+        {
+            RibbonControl ribbonControl = GetRibbonControl();
+            if (ribbonControl != null && ribbonControl.RibbonStrip != null)
+                return ribbonControl.RibbonStrip.GetItems(ItemName, itemType);
+            return base.GetItems(ItemName, itemType);
+        }
+
+        /// <summary>
+        /// Returns the collection of items with the specified name and type.
+        /// </summary>
+        /// <param name="ItemName">Item name to look for.</param>
+        /// <param name="itemType">Item type to look for.</param>
+        /// <param name="useGlobalName">Indicates whether GlobalName property is used for searching.</param>
+        /// <returns></returns>
+        public override ArrayList GetItems(string ItemName, Type itemType, bool useGlobalName)
+        {
+            RibbonControl ribbonControl = GetRibbonControl();
+            if (ribbonControl != null && ribbonControl.RibbonStrip != null)
+                return ribbonControl.RibbonStrip.GetItems(ItemName, itemType, useGlobalName);
+            return base.GetItems(ItemName, itemType, useGlobalName);
+        }
+
+        /// <summary>
+        /// Returns the first item that matches specified name.
+        /// </summary>
+        /// <param name="ItemName">Item name to look for.</param>
+        /// <returns></returns>
+        public override BaseItem GetItem(string ItemName)
+        {
+            RibbonControl ribbonControl = GetRibbonControl();
+            if (ribbonControl != null && ribbonControl.RibbonStrip != null)
+                return ribbonControl.RibbonStrip.GetItem(ItemName);
+            return base.GetItem(ItemName);
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Ribbon/RangeSliderItem.cs b/PROMS/DotNetBar Source Code/Ribbon/RangeSliderItem.cs
new file mode 100644
index 00000000..3595e90a
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Ribbon/RangeSliderItem.cs	
@@ -0,0 +1,1473 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel;
+using DevComponents.DotNetBar.Events;
+using System.ComponentModel.Design.Serialization;
+using System.Globalization;
+using System.Collections;
+using System.Drawing;
+using System.Reflection;
+using System.Windows.Forms;
+using System.Drawing.Drawing2D;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represents the slider item which allows you to select a value from predefined range.
+    /// </summary>
+    [Browsable(false), Designer("DevComponents.DotNetBar.Design.SimpleItemDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+    public class RangeSliderItem : BaseItem
+    {
+        #region Constructor
+        /// <summary>
+        /// Creates new instance of SliderItem.
+        /// </summary>
+        public RangeSliderItem() : this("", "") { }
+        /// <summary>
+        /// Creates new instance of SliderItem and assigns the name to it.
+        /// </summary>
+        /// <param name="sItemName">Item name.</param>
+        public RangeSliderItem(string sItemName) : this(sItemName, "") { }
+        /// <summary>
+        /// Creates new instance of SliderItem and assigns the name and text to it.
+        /// </summary>
+        /// <param name="sItemName">Item name.</param>
+        /// <param name="ItemText">item text.</param>
+        public RangeSliderItem(string sItemName, string ItemText)
+            : base(sItemName, ItemText)
+        {
+            this.MouseUpNotification = true;
+            this.MouseDownCapture = true;
+        }
+
+        /// <summary>
+        /// Returns copy of the item.
+        /// </summary>
+        public override BaseItem Copy()
+        {
+            RangeSliderItem objCopy = new RangeSliderItem(m_Name);
+            this.CopyToItem(objCopy);
+            return objCopy;
+        }
+
+        /// <summary>
+        /// Copies the SliderItem specific properties to new instance of the item.
+        /// </summary>
+        /// <param name="copy">New SliderItem instance.</param>
+        internal void InternalCopyToItem(SliderItem copy)
+        {
+            CopyToItem(copy);
+        }
+
+        /// <summary>
+        /// Copies the SliderItem specific properties to new instance of the item.
+        /// </summary>
+        /// <param name="copy">New SliderItem instance.</param>
+        protected override void CopyToItem(BaseItem copy)
+        {
+            RangeSliderItem c = copy as RangeSliderItem;
+            base.CopyToItem(c);
+
+            c.Maximum = this.Maximum;
+            c.Minimum = this.Minimum;
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            HideRangeTooltip();
+            base.Dispose(disposing);
+        }
+
+        #endregion
+
+        #region Events
+        /// <summary>
+        /// Occurs before Value has changed and allow the cancellation of the change.
+        /// </summary>
+        [Description("Occurs before Value has changed and allow the cancellation of the change.")]
+        public event RangeSliderValueChangingEventHandler ValueChanging;
+        /// <summary>
+        /// Raises ValueChanging event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnValueChanging(RangeSliderValueChangingEventArgs e)
+        {
+            RangeSliderValueChangingEventHandler handler = ValueChanging;
+            if (handler != null)
+                handler(this, e);
+        }
+        /// <summary>
+        /// Occurs after Value property has changed
+        /// </summary>
+        [Description("Occurs after Value property has changed.")]
+        public event EventHandler ValueChanged;
+        /// <summary>
+        /// Raises ValueChanged event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnValueChanged(EventArgs e)
+        {
+            EventHandler handler = ValueChanged;
+            if (handler != null)
+                handler(this, e);
+        }
+        #endregion
+
+        #region Implementation
+        public override void Paint(ItemPaintArgs p)
+        {
+            //SmoothingMode sm = p.Graphics.SmoothingMode;
+            //p.Graphics.SmoothingMode = SmoothingMode.None;
+            //p.Graphics.FillRectangle(Brushes.LightGray, m_Rect);
+            //p.Graphics.SmoothingMode = sm;
+
+            Rendering.BaseRenderer renderer = p.Renderer;
+            if (renderer != null)
+            {
+                RangeSliderItemRendererEventArgs e = new RangeSliderItemRendererEventArgs(this, p.Graphics);
+                e.ItemPaintArgs = p;
+                renderer.DrawRangeSliderItem(e);
+            }
+            else
+            {
+                Rendering.RangeSliderPainter painter = PainterFactory.CreateRangeSliderPainter(this);
+                if (painter != null)
+                {
+                    RangeSliderItemRendererEventArgs e = new RangeSliderItemRendererEventArgs(this, p.Graphics);
+                    e.ItemPaintArgs = p;
+                    painter.Paint(e);
+                }
+            }
+
+            if (this.DesignMode && this.Focused)
+            {
+                Rectangle r = m_Rect;
+                r.Inflate(-1, -1);
+                DesignTime.DrawDesignTimeSelection(p.Graphics, r, p.Colors.ItemDesignTimeBorder);
+            }
+        }
+        private int _TicksHeight = 4;
+        public override void RecalcSize()
+        {
+            m_Rect.Size = new Size(_Width, _Height);
+            UpdateTicksBounds();
+
+            UpdateRangeButtonBounds();
+            base.RecalcSize();
+        }
+
+        private void UpdateRangeButtonBounds()
+        {
+            Size buttonSize = Dpi.Size(_RangeButtonSize);
+
+            int ticksHeight = Dpi.Height(_TicksHeight);
+            int ticksRangeButtonSpacing = Dpi.Height(_TicksRangeButtonSpacing);
+            if (_SliderOrientation == eOrientation.Horizontal)
+            {
+                int itemHeight = _Height;// m_Rect.Height;
+                if (_TicksPosition == eTicksPosition.Top)
+                {
+                    _RangeButtonMinBounds = new Rectangle(0,
+                                       ticksHeight + ticksRangeButtonSpacing + Math.Max(0, (itemHeight - (ticksHeight + buttonSize.Height + ticksRangeButtonSpacing)) / 2),
+                                       buttonSize.Width,
+                                       buttonSize.Height);
+                }
+                else if (_TicksPosition == eTicksPosition.Bottom)
+                {
+                    _RangeButtonMinBounds = new Rectangle(0,
+                                       Math.Max(0, (itemHeight - (ticksHeight + buttonSize.Height + ticksRangeButtonSpacing)) / 2),
+                                       buttonSize.Width,
+                                       buttonSize.Height);
+                }
+                else if (_TicksPosition == eTicksPosition.TopAndBottom)
+                {
+                    _RangeButtonMinBounds = new Rectangle(0,
+                                       ticksHeight + ticksRangeButtonSpacing + (itemHeight - (ticksHeight * 2 + buttonSize.Height + ticksRangeButtonSpacing * 2)) / 2,
+                                       buttonSize.Width,
+                                       buttonSize.Height);
+                }
+                _RangeButtonMaxBounds = _RangeButtonMinBounds;
+
+                RangeValue minmax = GetNormalizedMinMaxValues();
+                RangeValue value = GetNormalizedRangeValue();
+                double xstep = GetXStep(_TicksBounds.Width, minmax.Min, minmax.Max, _TicksVisible ? _TicksStep : 1);
+
+                _RangeButtonMinBounds.X = _TicksBounds.X + (int)((Math.Abs(value.Min - minmax.Min)/_TicksStep) * xstep) - buttonSize.Width;
+                _RangeButtonMaxBounds.X = _TicksBounds.X + (int)((Math.Abs((value.Max - minmax.Min)/_TicksStep)) * xstep);
+                if (value.Max == minmax.Max)
+                    _RangeButtonMaxBounds.X = _TicksBounds.Right - 1;
+            }
+            else
+            {
+                int itemWidth = _Width; // m_Rect.Width;
+                if (_TicksPosition == eTicksPosition.Top)
+                {
+                    _RangeButtonMinBounds = new Rectangle(ticksHeight + ticksRangeButtonSpacing + Math.Max(0, (itemWidth - (ticksHeight + buttonSize.Height + ticksRangeButtonSpacing)) / 2),
+                                       0,
+                                       buttonSize.Height,
+                                       buttonSize.Width);
+                }
+                else if (_TicksPosition == eTicksPosition.Bottom)
+                {
+                    _RangeButtonMinBounds = new Rectangle(Math.Max(0, (itemWidth - (ticksHeight + buttonSize.Height + ticksRangeButtonSpacing)) / 2),
+                                       0,
+                                       buttonSize.Height,
+                                       buttonSize.Width);
+                }
+                else if (_TicksPosition == eTicksPosition.TopAndBottom)
+                {
+                    _RangeButtonMinBounds = new Rectangle(ticksHeight + ticksRangeButtonSpacing + (itemWidth - (ticksHeight * 2 + buttonSize.Height + ticksRangeButtonSpacing * 2)) / 2,
+                                       0,
+                                       buttonSize.Height,
+                                       buttonSize.Width);
+                }
+                _RangeButtonMaxBounds = _RangeButtonMinBounds;
+
+                RangeValue minmax = GetNormalizedMinMaxValues();
+                RangeValue value = GetNormalizedRangeValue();
+                double ystep = GetXStep(_TicksBounds.Height, minmax.Min, minmax.Max, _TicksStep);
+
+                _RangeButtonMinBounds.Y = _TicksBounds.Y + (int)((Math.Abs(value.Min - minmax.Min) / _TicksStep) * ystep) - buttonSize.Width;
+                _RangeButtonMaxBounds.Y = _TicksBounds.Y + (int)((Math.Abs((value.Max - minmax.Min) / _TicksStep)) * ystep);
+                if (value.Max == minmax.Max)
+                    _RangeButtonMaxBounds.Y = _TicksBounds.Bottom - 1;
+            }
+        }
+        private int _TicksRangeButtonSpacing = 2;
+        private void UpdateTicksBounds()
+        {
+            _TicksBounds = Rectangle.Empty;
+            _TicksBounds2 = Rectangle.Empty;
+
+            Size rangeButtonSize = Dpi.Size(_RangeButtonSize);
+            int ticksRangeButtonSpacing = Dpi.Height(_TicksRangeButtonSpacing);
+            int ticksHeight = Dpi.Height(_TicksHeight);
+            if (_SliderOrientation == eOrientation.Horizontal)
+            {
+                if (_TicksPosition == eTicksPosition.Top)
+                {
+                    _TicksBounds = new Rectangle(rangeButtonSize.Width,
+                                       (m_Rect.Height - (ticksHeight + rangeButtonSize.Height + ticksRangeButtonSpacing)) / 2,
+                                       m_Rect.Width - rangeButtonSize.Width * 2,
+                                       ticksHeight);
+                }
+                else if (_TicksPosition == eTicksPosition.Bottom)
+                {
+                    _TicksBounds = new Rectangle(rangeButtonSize.Width,
+                                       rangeButtonSize.Height + ticksRangeButtonSpacing + (m_Rect.Height - (ticksHeight + rangeButtonSize.Height + ticksRangeButtonSpacing)) / 2,
+                                       m_Rect.Width - rangeButtonSize.Width * 2,
+                                       ticksHeight);
+                }
+                else if (_TicksPosition == eTicksPosition.TopAndBottom)
+                {
+                    _TicksBounds = new Rectangle(rangeButtonSize.Width,
+                                       (m_Rect.Height - (ticksHeight * 2 + rangeButtonSize.Height + ticksRangeButtonSpacing * 2)) / 2,
+                                       m_Rect.Width - rangeButtonSize.Width * 2,
+                                       ticksHeight);
+                    _TicksBounds2 = new Rectangle(rangeButtonSize.Width,
+                                       rangeButtonSize.Height + ticksHeight + ticksRangeButtonSpacing * 2 + (m_Rect.Height - (ticksHeight * 2 + rangeButtonSize.Height + ticksRangeButtonSpacing * 2)) / 2,
+                                       m_Rect.Width - rangeButtonSize.Width * 2,
+                                       ticksHeight);
+                }
+            }
+            else
+            {
+                if (_TicksPosition == eTicksPosition.Top)
+                {
+                    _TicksBounds = new Rectangle((m_Rect.Width - (ticksHeight + rangeButtonSize.Height + ticksRangeButtonSpacing)) / 2,
+                                       rangeButtonSize.Width,
+                                       ticksHeight,
+                                       m_Rect.Height - rangeButtonSize.Width * 2);
+                }
+                else if (_TicksPosition == eTicksPosition.Bottom)
+                {
+                    _TicksBounds = new Rectangle(rangeButtonSize.Height + ticksRangeButtonSpacing + (m_Rect.Width - (ticksHeight + rangeButtonSize.Height + ticksRangeButtonSpacing)) / 2,
+                                       rangeButtonSize.Width,
+                                       ticksHeight,
+                                       m_Rect.Height - rangeButtonSize.Width * 2);
+                }
+                else if (_TicksPosition == eTicksPosition.TopAndBottom)
+                {
+                    _TicksBounds = new Rectangle((m_Rect.Width - (ticksHeight * 2 + rangeButtonSize.Height + ticksRangeButtonSpacing * 2)) / 2,
+                                       rangeButtonSize.Width,
+                                       ticksHeight,
+                                       m_Rect.Height - rangeButtonSize.Width * 2);
+                    _TicksBounds2 = new Rectangle(rangeButtonSize.Height + ticksHeight + ticksRangeButtonSpacing * 2 + (m_Rect.Width - (ticksHeight * 2 + rangeButtonSize.Height + ticksRangeButtonSpacing * 2)) / 2,
+                                       rangeButtonSize.Width,
+                                       ticksHeight,
+                                       m_Rect.Height - rangeButtonSize.Width * 2);
+                }
+            }
+        }
+        internal static double GetXStep(int ticksBoundsWidth, int min, int max, int tickSteps)
+        {
+            if (max == min) return 1;
+            double xstep = ticksBoundsWidth / ((double)Math.Abs(max - min) / tickSteps);
+            return xstep;
+        }
+        internal RangeValue GetNormalizedRangeValue()
+        {
+            RangeValue value = this.Value;
+            if (value.Min < this.Minimum)
+                value.Min = this.Minimum;
+            if (value.Max > this.Maximum)
+                value.Max = this.Maximum;
+
+            if (value.Max < value.Min)
+                value.Max = value.Min;
+
+            return value;
+        }
+        internal RangeValue GetNormalizedMinMaxValues()
+        {
+            int min = this.Minimum;
+            int max = this.Maximum;
+            if (max < min) max = min + 1;
+            return new RangeValue(min, max);
+        }
+
+        private eRangeSliderPart _MouseOverPart = eRangeSliderPart.None;
+        /// <summary>
+        /// Gets mouse over part.
+        /// </summary>
+        [Browsable(false)]
+        public eRangeSliderPart MouseOverPart
+        {
+            get { return _MouseOverPart; }
+            private set
+            {
+                if (_MouseOverPart != value)
+                {
+                    _MouseOverPart = value;
+                    this.Refresh();
+                }
+            }
+        }
+        /// <summary>
+        /// Gets current part that is pressed using mouse left button.
+        /// </summary>
+        [Browsable(false)]
+        public eRangeSliderPart MouseDownPart
+        {
+            get { return _MouseDownPart; }
+            private set
+            {
+                if (_MouseDownPart != value)
+                {
+                    _MouseDownPart = value;
+                    this.Refresh();
+                }
+            }
+        }
+
+        private eRangeSliderPart _MouseDownPart = eRangeSliderPart.None;
+        public override void InternalMouseDown(System.Windows.Forms.MouseEventArgs e)
+        {
+            if (e.Button == System.Windows.Forms.MouseButtons.Left && !this.DesignMode)
+            {
+                MouseDownPart = HitTest(e.Location);
+                if (MouseDownPart == eRangeSliderPart.TickArea && _ClientClickRangeChangeEnabled)
+                {
+                    int v = 0;
+                    RangeValue minmax = GetNormalizedMinMaxValues();
+                    // Try to calculate the new range, first get click value
+                    if (_SliderOrientation == eOrientation.Horizontal)
+                    {
+                        int x = e.X - (_TicksBounds.X + this.Bounds.X);
+                        v = minmax.Min + (int)(x / GetXStep(_TicksBounds.Width, minmax.Min, minmax.Max, _TicksVisible ? _TicksStep : 1)) * _TicksStep;
+                    }
+                    else
+                    {
+                        int y = e.Y - (_TicksBounds.Y + this.Bounds.Y);
+                        v = minmax.Min + (int)(y / GetXStep(_TicksBounds.Height, minmax.Min, minmax.Max, _TicksVisible ? _TicksStep : 1)) * _TicksStep;
+                    }
+
+                    if (v > minmax.Max)
+                        v = minmax.Max;
+                    if (v < minmax.Min)
+                        v = minmax.Min;
+                    RangeValue newValue = this.Value;
+                    if (v > this.Value.Max)
+                        newValue= new RangeValue(this.Value.Min, v);
+                    else if (v < this.Value.Min)
+                        newValue = new RangeValue(v, this.Value.Max);
+                    else if(Math.Abs(v - this.Value.Min) < Math.Abs(v - this.Value.Max) && v<=this.Value.Max)
+                        newValue = new RangeValue(v, this.Value.Max);
+                    else if(v>=this.Value.Min)
+                        newValue = new RangeValue(this.Value.Min, v);
+
+                    if (Math.Abs(newValue.Max - newValue.Min) >= _MinimumAbsoluteRange)
+                        SetValue(newValue, eEventSource.Mouse);
+                }
+            }
+
+            base.InternalMouseDown(e);
+        }
+        public override void InternalMouseMove(System.Windows.Forms.MouseEventArgs e)
+        {
+            if (e.Button == System.Windows.Forms.MouseButtons.Left && !this.DesignMode)
+            {
+                if (_MouseDownPart == eRangeSliderPart.MinRangeSlider)
+                {
+                    if (_SliderOrientation == eOrientation.Horizontal)
+                    {
+                        int x = e.X - (_TicksBounds.X + this.Bounds.X);
+                        RangeValue minmax = GetNormalizedMinMaxValues();
+                        double xStep = GetXStep(_TicksBounds.Width, minmax.Min, minmax.Max, _TicksStep);
+                        int v = minmax.Min + (int)(x / xStep) * _TicksStep;
+                        if (v > this.Value.Max)
+                            v = this.Value.Max;
+                        if (v < minmax.Min)
+                            v = minmax.Min;
+
+                        RangeValue newValue = new RangeValue(v, this.Value.Max);
+                        if (Math.Abs(newValue.Max - newValue.Min) >= _MinimumAbsoluteRange)
+                            SetValue(newValue, eEventSource.Mouse);
+                    }
+                    else
+                    {
+                        int y = e.Y - (_TicksBounds.Y + this.Bounds.Y);
+                        RangeValue minmax = GetNormalizedMinMaxValues();
+                        double xStep = GetXStep(_TicksBounds.Height, minmax.Min, minmax.Max, _TicksStep);
+                        int v = minmax.Min + (int)(y / xStep) * _TicksStep;
+                        if (v > this.Value.Max)
+                            v = this.Value.Max;
+                        if (v < minmax.Min)
+                            v = minmax.Min;
+
+                        RangeValue newValue = new RangeValue(v, this.Value.Max);
+                        if (Math.Abs(newValue.Max - newValue.Min) >= _MinimumAbsoluteRange)
+                            SetValue(newValue, eEventSource.Mouse);
+                    }
+                }
+                else if (_MouseDownPart == eRangeSliderPart.MaxRangeSlider)
+                {
+                    if (_SliderOrientation == eOrientation.Horizontal)
+                    {
+                        int x = e.X - (_TicksBounds.X + this.Bounds.X);
+                        RangeValue minmax = GetNormalizedMinMaxValues();
+                        double xStep = GetXStep(_TicksBounds.Width, minmax.Min, minmax.Max, _TicksStep);
+                        int v = minmax.Min + (int)(x / xStep) * _TicksStep;
+                        if (v < this.Value.Min)
+                            v = this.Value.Min;
+                        if (v > minmax.Max)
+                            v = minmax.Max;
+                        RangeValue newValue = new RangeValue(this.Value.Min, v);
+                        if (Math.Abs(newValue.Max - newValue.Min) >= _MinimumAbsoluteRange)
+                            SetValue(newValue, eEventSource.Mouse);
+                    }
+                    else
+                    {
+                        int y = e.Y - (_TicksBounds.Y + this.Bounds.Y);
+                        RangeValue minmax = GetNormalizedMinMaxValues();
+                        int v = minmax.Min + (int)(y / GetXStep(_TicksBounds.Height, minmax.Min, minmax.Max, _TicksStep)) * _TicksStep;
+                        if (v < this.Value.Min)
+                            v = this.Value.Min;
+                        if (v > minmax.Max)
+                            v = minmax.Max;
+                        RangeValue newValue = new RangeValue(this.Value.Min, v);
+                        if (Math.Abs(newValue.Max - newValue.Min) >= _MinimumAbsoluteRange)
+                            SetValue(newValue, eEventSource.Mouse);
+                    }
+                }
+            }
+            else if (e.Button == MouseButtons.None && !this.DesignMode)
+            {
+                this.MouseOverPart = HitTest(e.Location);
+            }
+
+            base.InternalMouseMove(e);
+        }
+        public override void InternalMouseUp(System.Windows.Forms.MouseEventArgs objArg)
+        {
+            MouseDownPart = eRangeSliderPart.None;
+            HideRangeTooltip();
+            base.InternalMouseUp(objArg);
+        }
+        public override void InternalMouseLeave()
+        {
+            this.MouseOverPart = eRangeSliderPart.None;
+            base.InternalMouseLeave();
+        }
+
+        private ToolTip _RangeTooltip = null;
+        private void UpdateAndShowRangeTooltip()
+        {
+            if (_RangeTooltip == null)
+            {
+                _RangeTooltip = new ToolTip();
+                _RangeTooltip.FixedLocation = GetRangeTooltipLocation();
+                _RangeTooltip.ShowDropShadow = false;
+                _RangeTooltip.Style = EffectiveStyle;
+                _RangeTooltip.Text = GetRangeTooltipText();
+                _RangeTooltip.ShowToolTip();
+            }
+            else
+            {
+                _RangeTooltip.FixedLocation = GetRangeTooltipLocation();
+                _RangeTooltip.Text = GetRangeTooltipText();
+            }
+        }
+        private Point GetRangeTooltipLocation()
+        {
+            Point p = Point.Empty;
+            Control c = this.ContainerControl as Control;
+            if (c != null)
+            {
+                Rectangle r = _RangeButtonMinBounds;
+                if (_MouseDownPart == eRangeSliderPart.MaxRangeSlider)
+                    r = _RangeButtonMaxBounds;
+                r.Offset(this.Bounds.Location);
+                Point pb = c.PointToScreen(r.Location);
+                Point pi = c.PointToScreen(this.Bounds.Location);
+                if (_SliderOrientation == eOrientation.Horizontal)
+                {
+                    p.X = pb.X;
+                    if (_TicksPosition == eTicksPosition.Top)
+                        p.Y = pi.Y - 18;
+                    else
+                        p.Y = pi.Y + this.Bounds.Height + 3;
+                }
+                else
+                {
+                    p.Y = pb.Y;
+                    p.X = pi.X + this.Bounds.Width + 3;
+                }
+            }
+            return p;
+        }
+        private string GetRangeTooltipText()
+        {
+            string s = string.Format(_RangeTooltipFormat, Value.Min, Value.Max);
+            RangeTooltipEventArgs e = new RangeTooltipEventArgs(s);
+            OnRangeTooltipText(e);
+            return e.Tooltip;
+        }
+        /// <summary>
+        /// Occurs when control is about to display the range tooltip and it allows you to customize tooltip
+        /// </summary>
+        [Description("Occurs when control is about to display the range tooltip and it allows you to customize tooltip")]
+        public event RangeTooltipEventHandler RangeTooltipText;
+        /// <summary>
+        /// Raises GetRangeTooltipText event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnRangeTooltipText(RangeTooltipEventArgs e)
+        {
+            RangeTooltipEventHandler handler = RangeTooltipText;
+            if (handler != null)
+                handler(this, e);
+        }
+        private void HideRangeTooltip()
+        {
+            if (_RangeTooltip == null) return;
+            _RangeTooltip.Hide();
+            _RangeTooltip.Dispose();
+            _RangeTooltip = null;
+        }
+        protected override bool ShowToolTips
+        {
+            get
+            {
+                return (_RangeTooltip == null);
+            }
+        }
+        /// <summary>
+        /// Gets the range part that is under specified client location.
+        /// </summary>
+        /// <param name="p">Location in parent control client coordinates.</param>
+        /// <returns>Range part at specified location.</returns>
+        public eRangeSliderPart HitTest(Point p)
+        {
+            Rectangle r = _RangeButtonMinBounds;
+            r.Offset(this.Bounds.Location);
+            if (r.Contains(p))
+                return eRangeSliderPart.MinRangeSlider;
+
+            r = _RangeButtonMaxBounds;
+            r.Offset(this.Bounds.Location);
+            if (r.Contains(p))
+                return eRangeSliderPart.MaxRangeSlider;
+
+            r = _TicksBounds;
+            r.Offset(this.Bounds.Location);
+
+            if (_SliderOrientation == eOrientation.Horizontal && p.X >= r.X && p.X <= r.Right)
+                return eRangeSliderPart.TickArea;
+            if (_SliderOrientation == eOrientation.Vertical && p.Y >= r.Y && p.Y <= r.Bottom)
+                return eRangeSliderPart.TickArea;
+
+            return eRangeSliderPart.None;
+        }
+        private int _Minimum = 0;
+        /// <summary>
+        /// Gets or sets the minimum value of the range of the control.
+        /// </summary>
+        [Description("Gets or sets the minimum value of the range of the control."), Category("Behavior"), DefaultValue(0)]
+        public int Minimum
+        {
+            get { return _Minimum; }
+            set
+            {
+                if (value != _Minimum)
+                {
+                    int oldValue = _Minimum;
+                    _Minimum = value;
+                    OnMinimumChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when Minimum property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnMinimumChanged(int oldValue, int newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("Minimum"));
+            this.Refresh();
+            OnAppearanceChanged();
+        }
+
+        private int _Maximum = 10;
+        /// <summary>
+        /// Gets or sets the maximum value of the range of the control.
+        /// </summary>
+        [Description("Gets or sets the maximum value of the range of the control."), Category("Behavior"), DefaultValue(10)]
+        public int Maximum
+        {
+            get { return _Maximum; }
+            set
+            {
+                if (value != _Maximum)
+                {
+                    int oldValue = _Maximum;
+                    _Maximum = value;
+                    OnMaximumChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when Maximum property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnMaximumChanged(int oldValue, int newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("Maximum"));
+            this.Refresh();
+            OnAppearanceChanged();
+        }
+
+        private static readonly RangeValue _DefaultRangeValue = new RangeValue(0, 10);
+        private RangeValue _Value = _DefaultRangeValue;
+        /// <summary>
+        /// Gets or sets the range displayed by the control.
+        /// </summary>
+        [Description("Specifies range displayed by the control."), Category("Data")]
+        public RangeValue Value
+        {
+            get { return _Value; }
+            set
+            {
+                if (value.Min != _Value.Min || value.Max != _Value.Max)
+                {
+                    SetValue(value, eEventSource.Code);
+                }
+            }
+        }
+        /// <summary>
+        /// Sets the range value.
+        /// </summary>
+        /// <param name="value">New Range value.</param>
+        /// <param name="source">Source of the value change.</param>
+        public bool SetValue(RangeValue value, eEventSource source)
+        {
+            RangeSliderValueChangingEventArgs ce = new RangeSliderValueChangingEventArgs(source, value);
+            OnValueChanging(ce);
+            if (ce.Cancel)
+                return false;
+
+            RangeValue oldValue = _Value;
+            _Value = value;
+            UpdateRangeButtonBounds();
+            OnValueChanged(oldValue, value);
+            OnValueChanged(new EventSourceArgs(source));
+            this.Refresh();
+            OnAppearanceChanged();
+
+            if (_MouseDownPart != eRangeSliderPart.None && _ShowRangeTooltip)
+                UpdateAndShowRangeTooltip();
+
+            return true;
+        }
+        /// <summary>
+        /// Called when Value property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnValueChanged(RangeValue oldValue, RangeValue newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("Value"));
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeValue()
+        {
+            return _Value.Min != _DefaultRangeValue.Min || _Value.Max != _DefaultRangeValue.Max;
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetValue()
+        {
+            Value = _DefaultRangeValue;
+        }
+
+        private bool _TicksVisible = true;
+        /// <summary>
+        /// Indicates whether tick lines are shown
+        /// </summary>
+        [DefaultValue(true), Category("Appearance"), Description("Indicates whether tick lines are shown")]
+        public bool TicksVisible
+        {
+            get { return _TicksVisible; }
+            set
+            {
+                if (value != _TicksVisible)
+                {
+                    bool oldValue = _TicksVisible;
+                    _TicksVisible = value;
+                    OnTicksVisibleChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when TicksVisible property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnTicksVisibleChanged(bool oldValue, bool newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("TicksVisible"));
+            this.OnAppearanceChanged();
+            this.Refresh();
+        }
+
+        private Rectangle _TicksBounds = Rectangle.Empty;
+        /// <summary>
+        /// Gets tick marks bounds.
+        /// </summary>
+        [Browsable(false)]
+        public Rectangle TicksBounds
+        {
+            get
+            {
+                return _TicksBounds;
+            }
+        }
+        private Rectangle _TicksBounds2 = Rectangle.Empty;
+        /// <summary>
+        /// Gets tick marks bounds for second marker is visible.
+        /// </summary>
+        [Browsable(false)]
+        public Rectangle TicksBounds2
+        {
+            get
+            {
+                return _TicksBounds2;
+            }
+        }
+
+        private Rectangle _RangeButtonMinBounds = Rectangle.Empty;
+        /// <summary>
+        /// Gets bounds of minimum range sliding button.
+        /// </summary>
+        [Browsable(false)]
+        public Rectangle RangeButtonMinBounds
+        {
+            get
+            {
+                return _RangeButtonMinBounds;
+            }
+        }
+        private Rectangle _RangeButtonMaxBounds = Rectangle.Empty;
+        /// <summary>
+        /// Gets bounds of maximum range sliding button.
+        /// </summary>
+        [Browsable(false)]
+        public Rectangle RangeButtonMaxBounds
+        {
+            get
+            {
+                return _RangeButtonMaxBounds;
+            }
+        }
+
+        private int _TicksStep = 1;
+        /// <summary>
+        /// Indicates tick display period
+        /// </summary>
+        [DefaultValue(1), Category("Appearance"), Description("Indicates tick display period")]
+        public int TicksStep
+        {
+            get { return _TicksStep; }
+            set
+            {
+                if (value != _TicksStep)
+                {
+                    int oldValue = _TicksStep;
+                    _TicksStep = value;
+                    OnTicksStepChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when TicksStep property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnTicksStepChanged(int oldValue, int newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("TicksStep"));
+            this.OnAppearanceChanged();
+            this.Refresh();
+        }
+
+        private eOrientation _SliderOrientation = eOrientation.Horizontal;
+        /// <summary>
+        /// Gets or sets the slider orientation. Default value is horizontal.
+        /// </summary>
+        [DefaultValue(eOrientation.Horizontal), Category("Appearance"), Description("Indicates slider orientation.")]
+        public eOrientation SliderOrientation
+        {
+            get { return _SliderOrientation; }
+            set
+            {
+                if (_SliderOrientation != value)
+                {
+                    _SliderOrientation = value;
+                    NeedRecalcSize = true;
+                    this.Refresh();
+                }
+            }
+        }
+
+        private int _Width = 140;
+        /// <summary>
+        /// Gets or sets the width of the range slider in pixels. Value must be greater than 0. Default value is 140.
+        /// </summary>
+        [Browsable(true), DefaultValue(140), Category("Layout"), Description("Indicates the width of range slider in pixels.")]
+        public int Width
+        {
+            get
+            {
+                return _Width;
+            }
+            set
+            {
+                if (_Width == value || value <= 0)
+                    return;
+                _Width = value;
+                NeedRecalcSize = true;
+                OnAppearanceChanged();
+                this.Refresh();
+            }
+        }
+        private int _Height = 24;
+        /// <summary>
+        /// Gets or sets the Height of the range slider in pixels. Value must be greater than 0. Default value is 24.
+        /// </summary>
+        [Browsable(true), DefaultValue(24), Category("Layout"), Description("Indicates the Height of range slider in pixels.")]
+        public int Height
+        {
+            get
+            {
+                return _Height;
+            }
+            set
+            {
+                if (_Height == value || value <= 0)
+                    return;
+                _Height = value;
+                NeedRecalcSize = true;
+                OnAppearanceChanged();
+                this.Refresh();
+            }
+        }
+
+        private static readonly Size DefaultRangeButtonSize = new Size(7, 17);
+        private Size _RangeButtonSize = DefaultRangeButtonSize;
+        /// <summary>
+        /// Indicates the size of the range change buttons.
+        /// </summary>
+        [Description("Indicates the size of the range change buttons."), Category("Appearance")]
+        public Size RangeButtonSize
+        {
+            get { return _RangeButtonSize; }
+            set
+            {
+                if (value != _RangeButtonSize)
+                {
+                    Size oldValue = _RangeButtonSize;
+                    _RangeButtonSize = value;
+                    OnRangeButtonSizeChanged(oldValue, value);
+                }
+            }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeRangeButtonSize()
+        {
+            return _RangeButtonSize != DefaultRangeButtonSize;
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetRangeButtonSize()
+        {
+            RangeButtonSize = DefaultRangeButtonSize;
+        }
+        /// <summary>
+        /// Called when RangeButtonSize property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnRangeButtonSizeChanged(Size oldValue, Size newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("RangeButtonSize"));
+            NeedRecalcSize = true;
+            OnAppearanceChanged();
+            this.Refresh();
+        }
+
+        private eTicksPosition _TicksPosition = eTicksPosition.Bottom;
+        /// <summary>
+        /// Specifies the ticks position inside of Range Slider.
+        /// </summary>
+        [DefaultValue(eTicksPosition.Bottom), Category("Appearance"), Description("Specifies the ticks position inside of Range Slider.")]
+        public eTicksPosition TicksPosition
+        {
+            get { return _TicksPosition; }
+            set
+            {
+                if (value != _TicksPosition)
+                {
+                    eTicksPosition oldValue = _TicksPosition;
+                    _TicksPosition = value;
+                    OnTicksPositionChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when TicksPosition property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnTicksPositionChanged(eTicksPosition oldValue, eTicksPosition newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("TicksPosition"));
+            NeedRecalcSize = true;
+            OnAppearanceChanged();
+            this.Refresh();
+        }
+
+        [Browsable(false)]
+        public override string Text
+        {
+            get
+            {
+                return base.Text;
+            }
+            set
+            {
+                base.Text = value;
+            }
+        }
+
+        private int _MinimumAbsoluteRange = 0;
+        /// <summary>
+        /// Specifies minimum absolute range that user can select. Absolute range is defined as Abs(Value.Max-Value.Min) Applies to user performed selection through mouse only.
+        /// </summary>
+        [DefaultValue(0), Category("Behavior"), Description("Specifies minimum absolute range that user can select. Absolute range is defined as Abs(Value.Max-Value.Min) Applies to user performed selection through mouse only.")]
+        public int MinimumAbsoluteRange
+        {
+            get { return _MinimumAbsoluteRange; }
+            set
+            {
+                if (value != _MinimumAbsoluteRange)
+                {
+                    int oldValue = _MinimumAbsoluteRange;
+                    _MinimumAbsoluteRange = value;
+                    OnMinimumAbsoluteRangeChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when MinimumAbsoluteRange property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnMinimumAbsoluteRangeChanged(int oldValue, int newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("MinimumAbsoluteRange"));
+        }
+
+        private string _RangeTooltipFormat = "Min: {0} - Max: {1}";
+        /// <summary>
+        /// Gets or sets the string that is used to format the range value to be displayed while user moves the range buttons. Value set here is used in string.Format(RangeTooltipFormat, Value.Min, Value.Max).
+        /// </summary>
+        [DefaultValue("{0} - {1}"), Description("Indicate string that is used to format the range value to be displayed while user moves the range buttons. Value set here is used in string.Format(RangeTooltipFormat, Value.Min, Value.Max)."), Localizable(true), Category("Behavior")]
+        public string RangeTooltipFormat
+        {
+            get { return _RangeTooltipFormat; }
+            set
+            {
+                if (value != _RangeTooltipFormat)
+                {
+                    string oldValue = _RangeTooltipFormat;
+                    _RangeTooltipFormat = value;
+                    OnRangeTooltipFormatChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when RangeTooltipFormat property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnRangeTooltipFormatChanged(string oldValue, string newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("RangeTooltipFormat"));
+        }
+
+        private bool _ShowRangeTooltip = true;
+        /// <summary>
+        /// Specifies whether range tooltip is shown while user is changing the range
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Specifies whether range tooltip is shown while user is changing the range")]
+        public bool ShowRangeTooltip
+        {
+            get { return _ShowRangeTooltip; }
+            set
+            {
+                _ShowRangeTooltip = value;
+            }
+        }
+
+        private Image _MinRangeSliderImage = null;
+        /// <summary>
+        /// Indicates image to be used as minimum range slider button instead of built-in button. Image is scaled to size set by RangeButtonSize.
+        /// </summary>
+        [DefaultValue(null), Category("Appearance"), Description("Indicates image to be used as minimum range slider button instead of built-in button. Image is scaled to size set by RangeButtonSize.")]
+        public Image MinRangeSliderImage
+        {
+            get { return _MinRangeSliderImage; }
+            set
+            {
+                if (value != _MinRangeSliderImage)
+                {
+                    Image oldValue = _MinRangeSliderImage;
+                    _MinRangeSliderImage = value;
+                    OnMinRangeSliderImageChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when MinRangeSliderImage property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnMinRangeSliderImageChanged(Image oldValue, Image newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("MinRangeSliderImage"));
+            this.OnAppearanceChanged();
+            this.Refresh();
+        }
+
+        private Image _MaxRangeSliderImage = null;
+        /// <summary>
+        /// Indicates image to be used as maximum range slider button instead of built-in button. Image is scaled to size set by RangeButtonSize.
+        /// </summary>
+        [DefaultValue(null), Category("Appearance"), Description("Indicates image to be used as maximum range slider button instead of built-in button. Image is scaled to size set by RangeButtonSize.")]
+        public Image MaxRangeSliderImage
+        {
+            get { return _MaxRangeSliderImage; }
+            set
+            {
+                if (value != _MaxRangeSliderImage)
+                {
+                    Image oldValue = _MaxRangeSliderImage;
+                    _MaxRangeSliderImage = value;
+                    OnMaxRangeSliderImageChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when MaxRangeSliderImage property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnMaxRangeSliderImageChanged(Image oldValue, Image newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("MinRangeSliderImage"));
+            this.OnAppearanceChanged();
+            this.Refresh();
+        }
+
+        private int _RangeLineHeight = 7;
+        /// <summary>
+        /// Specifies the height of the range line
+        /// </summary>
+        [DefaultValue(7), Category("Appearance"), Description("Specifies the height of the range line")]
+        public int RangeLineHeight
+        {
+            get { return _RangeLineHeight; }
+            set
+            {
+                if (value != _RangeLineHeight)
+                {
+                    int oldValue = _RangeLineHeight;
+                    _RangeLineHeight = value;
+                    OnRangeLineHeightChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when RangeLineHeight property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnRangeLineHeightChanged(int oldValue, int newValue)
+        {
+            //OnPropertyChanged(new PropertyChangedEventArgs("RangeLineHeight"));
+            this.OnAppearanceChanged();
+            this.Refresh();
+        }
+
+        private bool _ClientClickRangeChangeEnabled = true;
+        /// <summary>
+        /// Indicates whether clicking the area outside of the range change buttons moves the range change button to the clicked location if possible thus allowing range change.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether clicking the area outside of the range change buttons moves the range change button to the clicked location if possible thus allowing range change.")]
+        public bool ClientClickRangeChangeEnabled
+        {
+            get { return _ClientClickRangeChangeEnabled; }
+            set
+            {
+                _ClientClickRangeChangeEnabled = value;
+            }
+        }
+
+        private Color _RangeValueColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets the color of the range value.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates color of range value.")]
+        public Color RangeValueColor
+        {
+            get { return _RangeValueColor; }
+            set
+            {
+                _RangeValueColor = value;
+                this.OnAppearanceChanged();
+                this.Refresh();
+            }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeRangeValueColor()
+        {
+            return !_RangeValueColor.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetRangeValueColor()
+        {
+            this.RangeValueColor = Color.Empty;
+        }
+        #endregion
+    }
+
+    #region eTicksPosition
+    /// <summary>
+    /// Specifies the ticks position inside of Range Slider.
+    /// </summary>
+    public enum eTicksPosition
+    {
+        /// <summary>
+        /// Ticks are displayed on top of range sliders.
+        /// </summary>
+        Top,
+        /// <summary>
+        /// Ticks are displayed on bottom of range sliders.
+        /// </summary>
+        Bottom,
+        /// <summary>
+        /// Ticks are displayed on top and bottom of range sliders.
+        /// </summary>
+        TopAndBottom
+    }
+    #endregion
+
+    #region RangeValue
+    /// <summary>
+    /// Defines value for the range slider controls.
+    /// </summary>
+    [Serializable, TypeConverter(typeof(RangeValueConverter))]
+    public struct RangeValue
+    {
+        /// <summary>
+        /// Gets or sets the range minimum value.
+        /// </summary>
+        [DefaultValue(0)]
+        public int Min;
+        /// <summary>
+        /// Gets or sets the range maximum value.
+        /// </summary>
+        [DefaultValue(0)]
+        public int Max;
+
+        public RangeValue(int min, int max)
+        {
+            Min = min;
+            Max = max;
+        }
+
+        public override string ToString()
+        {
+            return string.Format("Min={0}, Max={1}", Min, Max);
+        }
+    }
+    #endregion
+
+    #region RangeValueConverter
+    public class RangeValueConverter : TypeConverter
+    {
+        // Methods
+        public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
+        {
+            return ((sourceType == typeof(string)) || base.CanConvertFrom(context, sourceType));
+        }
+
+        public override bool CanConvertTo(ITypeDescriptorContext context, Type destinationType)
+        {
+            return ((destinationType == typeof(InstanceDescriptor)) || base.CanConvertTo(context, destinationType));
+        }
+
+        public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
+        {
+            string str = value as string;
+            if (str == null)
+            {
+                return base.ConvertFrom(context, culture, value);
+            }
+            string str2 = str.Trim();
+            if (str2.Length == 0)
+            {
+                return null;
+            }
+            if (culture == null)
+            {
+                culture = CultureInfo.CurrentCulture;
+            }
+            char ch = culture.TextInfo.ListSeparator[0];
+            string[] strArray = str2.Split(new char[] { ch });
+            int[] numArray = new int[strArray.Length];
+            TypeConverter converter = TypeDescriptor.GetConverter(typeof(int));
+            for (int i = 0; i < numArray.Length; i++)
+            {
+                numArray[i] = (int)converter.ConvertFromString(context, culture, strArray[i]);
+            }
+            if (numArray.Length != 2)
+            {
+                throw new ArgumentException("Text Parsing Failed, only 2 comma separated values are accepted");
+            }
+            return new RangeValue(numArray[0], numArray[1]);
+        }
+
+        public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+        {
+            if (destinationType == null)
+            {
+                throw new ArgumentNullException("destinationType");
+            }
+            if (value is RangeValue)
+            {
+                if (destinationType == typeof(string))
+                {
+                    RangeValue range = (RangeValue)value;
+                    if (culture == null)
+                    {
+                        culture = CultureInfo.CurrentCulture;
+                    }
+                    string separator = culture.TextInfo.ListSeparator + " ";
+                    TypeConverter converter = TypeDescriptor.GetConverter(typeof(int));
+                    string[] strArray = new string[2];
+                    int num = 0;
+                    strArray[num++] = converter.ConvertToString(context, culture, range.Min);
+                    strArray[num++] = converter.ConvertToString(context, culture, range.Max);
+                    return string.Join(separator, strArray);
+                }
+                if (destinationType == typeof(InstanceDescriptor))
+                {
+                    RangeValue range2 = (RangeValue)value;
+                    ConstructorInfo constructor = typeof(RangeValue).GetConstructor(new Type[] { typeof(int), typeof(int) });
+                    if (constructor != null)
+                    {
+                        return new InstanceDescriptor(constructor, new object[] { range2.Min, range2.Max });
+                    }
+                }
+            }
+            return base.ConvertTo(context, culture, value, destinationType);
+        }
+
+        public override object CreateInstance(ITypeDescriptorContext context, IDictionary propertyValues)
+        {
+            if (propertyValues == null)
+            {
+                throw new ArgumentNullException("propertyValues");
+            }
+            object obj2 = propertyValues["Min"];
+            object obj3 = propertyValues["Max"];
+            if (((obj2 == null) || (obj3 == null)) || (!(obj2 is int) || !(obj3 is int)))
+            {
+                throw new ArgumentException("Property Value Invalid Entry");
+            }
+            return new RangeValue((int)obj2, (int)obj3);
+        }
+
+        public override bool GetCreateInstanceSupported(ITypeDescriptorContext context)
+        {
+            return true;
+        }
+
+        public override PropertyDescriptorCollection GetProperties(ITypeDescriptorContext context, object value, Attribute[] attributes)
+        {
+            return TypeDescriptor.GetProperties(typeof(RangeValue), attributes).Sort(new string[] { "Min", "Max" });
+        }
+
+        public override bool GetPropertiesSupported(ITypeDescriptorContext context)
+        {
+            return true;
+        }
+    }
+
+    #endregion
+
+    #region RangeSliderItemRendererEventArgs
+    /// <summary>
+    /// Provides data for the Slider item rendering events.
+    /// </summary>
+    public class RangeSliderItemRendererEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets or sets the reference to the item being rendered.
+        /// </summary>
+        public RangeSliderItem SliderItem = null;
+
+        /// <summary>
+        /// Gets or sets the reference to graphics object.
+        /// </summary>
+        public Graphics Graphics = null;
+
+        internal ItemPaintArgs ItemPaintArgs = null;
+
+        /// <summary>
+        /// Creates new instance of the object and initializes it with default values.
+        /// </summary>
+        /// <param name="item">Reference to the Range Slider item being rendered.</param>
+        /// <param name="g">Reference to the graphics object.</param>
+        public RangeSliderItemRendererEventArgs(RangeSliderItem item, Graphics g)
+        {
+            this.SliderItem = item;
+            this.Graphics = g;
+        }
+    }
+    #endregion
+
+    #region RangeSliderValueChangingEventArgs
+    /// <summary>
+    /// Defines delegate for RangeSliderValueChanging event.
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    public delegate void RangeSliderValueChangingEventHandler(object sender, RangeSliderValueChangingEventArgs e);
+    /// <summary>
+    /// Provides information for RangeSliderValueChanging event.
+    /// </summary>
+    public class RangeSliderValueChangingEventArgs : EventSourceArgs
+    {
+        /// <summary>
+        ///  New range value.
+        /// </summary>
+        public readonly RangeValue NewValue;
+        /// <summary>
+        /// Set to true to cancel the value changing.
+        /// </summary>
+        public bool Cancel = false;
+        /// <summary>
+        /// Initializes a new instance of the RangeSliderValueChangingEventArgs class.
+        /// </summary>
+        /// <param name="newValue"></param>
+        public RangeSliderValueChangingEventArgs(eEventSource source, RangeValue newValue)
+            : base(source)
+        {
+            NewValue = newValue;
+        }
+    }
+    #endregion
+
+    #region eRangeSliderPart
+    /// <summary>
+    /// Defines the slider item parts.
+    /// </summary>
+    public enum eRangeSliderPart
+    {
+        /// <summary>
+        /// Indicates no part.
+        /// </summary>
+        None,
+        /// <summary>
+        /// Indicates the minimum range slider button.
+        /// </summary>
+        MinRangeSlider,
+        /// <summary>
+        /// Indicates the maximum range slider button.
+        /// </summary>
+        MaxRangeSlider,
+        /// <summary>
+        /// Indicates the track area part of the control.
+        /// </summary>
+        TickArea
+    }
+    #endregion
+
+
+    #region RangeTooltipEventHandler
+    /// <summary>
+    /// Defines delegate for RangeSliderValueChanging event.
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    public delegate void RangeTooltipEventHandler(object sender, RangeTooltipEventArgs e);
+    /// <summary>
+    /// Provides information for GetRangeTooltip event.
+    /// </summary>
+    public class RangeTooltipEventArgs : EventArgs
+    {
+        /// <summary>
+        ///  Gets or sets the tooltip to display.
+        /// </summary>
+        public string Tooltip;
+        /// <summary>
+        /// Initializes a new instance of the RangeTooltipEventArgs class.
+        /// </summary>
+        /// <param name="tooltip"></param>
+        public RangeTooltipEventArgs(string tooltip)
+        {
+            Tooltip = tooltip;
+        }
+    }
+    #endregion
+
+}
diff --git a/PROMS/DotNetBar Source Code/Ribbon/RibbonBar.cs b/PROMS/DotNetBar Source Code/Ribbon/RibbonBar.cs
new file mode 100644
index 00000000..bc27070e
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Ribbon/RibbonBar.cs	
@@ -0,0 +1,2775 @@
+using System;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Windows.Forms;
+using System.ComponentModel;
+using System.Collections;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Represents a single ribbon container control.
+	/// </summary>
+    [ToolboxBitmap(typeof(RibbonBar), "Ribbon.RibbonBar.ico"), ToolboxItem(true), Designer("DevComponents.DotNetBar.Design.RibbonBarDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf"), System.Runtime.InteropServices.ComVisible(false)]
+	public class RibbonBar:ItemControl
+	{
+		#region Events
+		/// <summary>
+		/// Occurs when dialog launcher button in title bar is clicked. Use DialogLauncherVisible property to show the button in title bar.
+		/// </summary>
+		[Description("Occurs when dialog launcher button in title bar is clicked. Use DialogLauncherVisible property to show the button in title bar.")]
+		public event EventHandler LaunchDialog;
+
+        /// <summary>
+        /// Occurs when overflow button for control is created because control size is below the minimum size required to display complete content of the control.
+        /// This event allows you to get access to the internal overflow button that is created and change it's properties if required.
+        /// </summary>
+        [Description("Occurs when overflow button for control is created because control size is below the minimum size required to display complete content of the control.")]
+        public event OverflowButtonEventHandler OverflowButtonSetup;
+
+        /// <summary>
+        /// Occurs after overflow button setup is complete and all items contained by this control are moved to it.
+        /// </summary>
+        [Description("Occurs after overflow button setup is complete and all items contained by this control are moved to it.")]
+        public event OverflowButtonEventHandler OverflowButtonSetupComplete;
+
+        /// <summary>
+        /// Occurs before overflow button is destroyed.
+        /// </summary>
+        [Description("Occurs before overflow button is destroyed.")]
+        public event OverflowButtonEventHandler OverflowButtonDestroy;
+
+        /// <summary>
+        /// Occurs when mouse enters dialog launcher button.
+        /// </summary>
+        [Description("")]
+        public event EventHandler DialogLauncherMouseEnter;
+
+        /// <summary>
+        /// Occurs when mouse leaves dialog launcher button.
+        /// </summary>
+        [Description("Occurs when mouse leaves dialog launcher button.")]
+        public event EventHandler DialogLauncherMouseLeave;
+
+        /// <summary>
+        /// Occurs when mouse hovers over the dialog launcher button.
+        /// </summary>
+        [Description("Occurs when mouse hovers over the dialog launcher button.")]
+        public event EventHandler DialogLauncherMouseHover;
+
+        /// <summary>
+        /// Occurs when mouse is pressed over the dialog launcher button.
+        /// </summary>
+        [Description("Occurs when mouse is pressed over the dialog launcher button.")]
+        public event MouseEventHandler DialogLauncherMouseDown;
+		#endregion
+
+		#region Private Variables & Constructor
+		private ItemContainer m_ItemContainer=null;
+		private Rectangle m_TitleRectangle=Rectangle.Empty;
+		private ElementStyle m_TitleStyle=null;
+        private ElementStyle m_TitleStyleMouseOver = null;
+		private SimpleElement m_TitleElement=new SimpleElement();
+		private bool m_DialogLauncherVisible=false;
+		private Rectangle m_DialogLauncherRect=Rectangle.Empty;
+		private Image m_DialogLauncherButton=null;
+		private Image m_DialogLauncherMouseOverButton=null;
+		private bool m_MouseOverDialogLauncher=false;
+
+        private bool m_AutoOverflow = true;
+        private RibbonOverflowButtonItem m_OverflowButton = null;
+        private RibbonBar m_OverflowRibbonBar = null;
+        private string m_OverflowButtonText = "";
+        private Image m_OverflowButtonImage = null;
+        private int m_ResizeOrderIndex = 0;
+        private bool m_SuspendRecalcSize = false;
+        private int m_MaximumOverflowTextLength = 25;
+		private Size m_BeforeOverflowSize=Size.Empty;
+        private bool m_MouseOver = false;
+        private ElementStyle m_BackgroundMouseOverStyle = new ElementStyle();
+        private eRibbonTitlePosition m_TitlePosition = eRibbonTitlePosition.Bottom;
+        private bool m_TitleVisible = true;
+        private bool m_EnableDragDrop = false;
+        private ElementStyle m_DefaultBackgroundStyle = new ElementStyle();
+        private ElementStyle m_DefaultBackgroundMouseOverStyle = new ElementStyle();
+        private ElementStyle m_DefaultTitleStyle = new ElementStyle();
+        private ElementStyle m_DefaultTitleStyleMouseOver = new ElementStyle();
+        private bool m_CanCustomize = true;
+        private ArrayList m_AutoSizeBagList = new ArrayList();
+        private bool m_AutoSizeItems = true;
+        private Size m_FullItemsSize = Size.Empty;
+        private Size m_LastReducedSize = Size.Empty;
+        private string m_DialogLauncherAccessibleName = "";
+        private bool m_IsOverflowRibbon = false;
+        private GalleryContainer m_GalleryStretch = null;
+        private Timer m_MouseOverTimer = null;
+        private bool m_BackgroundHoverEnabled = true;
+        private bool m_UseSpecKeyTipsPositioning = false;
+
+		public RibbonBar()
+		{
+            //this.BackColor = Color.Transparent;
+			m_ItemContainer=new ItemContainer();
+			m_ItemContainer.GlobalItem=false;
+			m_ItemContainer.ContainerControl=this;
+			m_ItemContainer.Stretch=false;
+			m_ItemContainer.Displayed=true;
+			m_ItemContainer.Style=eDotNetBarStyle.StyleManagerControlled;
+			this.ColorScheme.Style=eDotNetBarStyle.StyleManagerControlled;
+			m_ItemContainer.SetOwner(this);
+			m_ItemContainer.SetSystemContainer(true);
+			this.SetBaseItemContainer(m_ItemContainer);
+            this.DragDropSupport = true;
+			m_TitleStyle=new ElementStyle();
+			m_TitleStyle.SetColorScheme(this.GetColorScheme());
+			m_TitleStyle.StyleChanged+=new EventHandler(ElementStyleChanged);
+
+            m_TitleStyleMouseOver = new ElementStyle();
+            m_TitleStyleMouseOver.SetColorScheme(this.GetColorScheme());
+            m_TitleStyleMouseOver.StyleChanged += new EventHandler(ElementStyleChanged);
+
+            m_BackgroundMouseOverStyle.SetColorScheme(this.GetColorScheme());
+            m_BackgroundMouseOverStyle.StyleChanged += new EventHandler(this.VisualPropertyChanged);
+
+            this.ItemAdded += new EventHandler(RibbonBar_ItemAdded);
+            this.ItemRemoved += new ItemRemovedEventHandler(RibbonBar_ItemRemoved);
+		}
+
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                this.ItemAdded -= RibbonBar_ItemAdded;
+                this.ItemRemoved -= RibbonBar_ItemRemoved;
+
+                m_TitleStyle.StyleChanged -= ElementStyleChanged;
+                m_TitleStyle.Dispose();
+                m_TitleStyleMouseOver.StyleChanged -= ElementStyleChanged;
+                m_TitleStyleMouseOver.Dispose();
+                m_BackgroundMouseOverStyle.StyleChanged -= this.VisualPropertyChanged;
+                m_BackgroundMouseOverStyle.Dispose();
+
+                m_DefaultBackgroundStyle.Dispose();
+                m_DefaultBackgroundMouseOverStyle.Dispose();
+                m_DefaultTitleStyle.Dispose();
+                m_DefaultTitleStyleMouseOver.Dispose();
+
+                DestroyMouseOverTimer();
+
+                DisposeOverflowButton();
+                //if (m_OverflowRibbonBar != null)
+                //{
+                //    m_OverflowRibbonBar.Dispose();
+                //    m_OverflowRibbonBar = null;
+                //}
+
+                if (BarUtilities.DisposeItemImages && !this.DesignMode)
+                {
+                    BarUtilities.DisposeImage(ref m_DialogLauncherButton);
+                    BarUtilities.DisposeImage(ref m_OverflowButtonImage);
+                    BarUtilities.DisposeImage(ref m_DialogLauncherMouseOverButton);
+                }
+            }
+
+            base.Dispose(disposing);
+        }
+
+        /// <summary>
+        /// Creates new accessibility instance.
+        /// </summary>
+        /// <returns>Reference to AccessibleObject.</returns>
+        protected override AccessibleObject CreateAccessibilityInstance()
+        {
+            return new RibbonBarAccessibleObject(this);
+        }
+		#endregion
+
+        #region Internal Implementation
+        private ButtonItem _QatButtonParent;
+        /// <summary>
+        /// Gets or sets parent button when on QAT.
+        /// </summary>
+        [Browsable(false)]
+        internal DevComponents.DotNetBar.ButtonItem QatButtonParent
+        {
+            get
+            {
+                return _QatButtonParent;
+            }
+            set
+            {
+                _QatButtonParent = value;
+            }
+        }
+        private bool _IsOnQat;
+        /// <summary>
+        /// Gets or sets whether this RibbonBar is on QAT.
+        /// </summary>
+        [Browsable(false)]
+        internal bool IsOnQat
+        {
+            get
+            {
+                return _IsOnQat;
+            }
+            set
+            {
+                _IsOnQat = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether Office 2007 Design Guidelines specification for positioning KeyTips is used.
+        /// </summary>
+        [DefaultValue(false), Category("KeyTips"), Description("Indicates whether Office 2007 Design Guidelines specification for positioning KeyTips is used.")]
+        public bool UseSpecKeyTipsPositioning
+        {
+            get { return m_UseSpecKeyTipsPositioning; }
+            set
+            {
+                m_UseSpecKeyTipsPositioning = value;
+            }
+        }
+
+        protected override void OnItemClick(BaseItem item)
+        {
+            base.OnItemClick(item);
+
+            if (this.IsOverflowRibbon && this.Parent is MenuPanel && item!=null && item.AutoCollapseOnClick && item is ButtonItem && !item.Name.StartsWith("sysgallery"))
+            {
+                ButtonItem b = item as ButtonItem;
+                if(!b.AutoExpandOnClick)
+                    CloseOverflowPopup();
+            }
+        }
+
+        /// <summary>
+        /// Closes the RibbonBar overflow popup if control is in overflow mode and displays the overflow popup that shows complete content of the control.
+        /// </summary>
+        public void CloseOverflowPopup()
+        {
+            if (this.IsOverflowRibbon)
+            {
+                if (this.Parent is MenuPanel)
+                {
+                    RibbonOverflowButtonItem rb = ((MenuPanel)this.Parent).ParentItem as RibbonOverflowButtonItem;
+                    if (rb != null && rb.Expanded)
+                        rb.Expanded = false;
+                }
+            }
+            else if (this.OverflowState && m_OverflowButton != null && m_OverflowButton.Expanded)
+            {
+                m_OverflowButton.Expanded = false;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Accessible name for the Dialog Launcher button
+        /// </summary>
+        [Browsable(true), DefaultValue(""), Category("Accessibility"), Description("Indicates Accessible name for the Dialog Launcher button.")]
+        public string DialogLauncherAccessibleName
+        {
+            get { return m_DialogLauncherAccessibleName; }
+            set { m_DialogLauncherAccessibleName = value; }
+        }
+
+        /// <summary>
+        /// Specifies the background style of the control when mouse is over the control. Style specified here will be applied to the
+        /// BackgroundStyle.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Category("Style"), Description("Indicates mouse over background style."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ElementStyle BackgroundMouseOverStyle
+        {
+            get { return m_BackgroundMouseOverStyle; }
+            //#if FRAMEWORK20
+            //set
+            //{
+            //    if (value == null)
+            //        throw new InvalidOperationException("Null is not valid value for this property.");
+            //    m_BackgroundMouseOverStyle = value;
+            //}
+            //#endif
+        }
+
+        /// <summary>
+        /// Resets style to default value. Used by windows forms designer.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetBackgroundMouseOverStyle()
+		{
+			m_BackgroundMouseOverStyle.StyleChanged-=new EventHandler(this.VisualPropertyChanged);
+			m_BackgroundMouseOverStyle=new ElementStyle();
+			m_BackgroundMouseOverStyle.StyleChanged+=new EventHandler(this.VisualPropertyChanged);
+            this.Invalidate();
+		}
+
+        protected virtual ElementStyle GetBackgroundMouseOverStyle()
+        {
+            if (!m_BackgroundHoverEnabled) return null;
+
+            if (this.OverflowState && m_OverflowButton.Expanded)
+                return this.GetBackgroundStyle();
+
+            if (m_BackgroundMouseOverStyle.Custom)
+            {
+                ElementStyle copy = m_DefaultBackgroundMouseOverStyle.Copy();
+                copy.ApplyStyle(m_BackgroundMouseOverStyle);
+                return copy;
+            }
+            return m_DefaultBackgroundMouseOverStyle;
+        }
+
+        protected override ElementStyle GetBackgroundStyle()
+        {
+            if (this.OverflowState && m_OverflowButton.Expanded)
+            {
+                Rendering.Office2007Renderer r = this.GetRenderer() as Rendering.Office2007Renderer;
+                if (r != null)
+                {
+                    return RibbonPredefinedColorSchemes.StyleFromRibbonBarStateColorTable(r.ColorTable.RibbonBar.Expanded);
+                }
+            }
+            if (this.BackgroundStyle.Custom)
+            {
+                ElementStyle copy = m_DefaultBackgroundStyle.Copy();
+                copy.ApplyStyle(BackgroundStyle);
+                return copy;
+            }
+            return m_DefaultBackgroundStyle;
+        }
+
+        private ElementStyle GetTitleStyle()
+        {
+            if (m_TitleStyle.Custom)
+            {
+                ElementStyle copy = m_DefaultTitleStyle.Copy();
+                copy.ApplyStyle(m_TitleStyle);
+                return copy;
+            }
+            return m_DefaultTitleStyle;
+        }
+
+        private ElementStyle GetTitleMouseOverStyle()
+        {
+            if (!m_BackgroundHoverEnabled)
+                return null;
+
+            if (m_TitleStyleMouseOver.Custom)
+            {
+                ElementStyle copy = m_DefaultTitleStyleMouseOver.Copy();
+                copy.ApplyStyle(m_TitleStyleMouseOver);
+                return copy;
+            }
+            return m_DefaultTitleStyleMouseOver;
+        }
+
+        private void VisualPropertyChanged(object sender, EventArgs e)
+        {
+            if (this.GetDesignMode())
+            {
+                this.RecalcLayout();
+            }
+            else if (this.Parent != null && this.Parent.Site != null && this.Parent.Site.DesignMode)
+            {
+                this.RecalcLayout();
+            }
+        }
+
+		/// <summary>
+		/// Gets or sets image that is used as dialog luncher button in ribbon title bar. Default value is null which indicates that
+		/// default appearance for the button is used.
+		/// </summary>
+		[Browsable(true),DefaultValue(null), Category("Appearance"),Description("Indicates image that is used as dialog luncher button in ribbon title bar.")]
+		public Image DialogLauncherButton
+		{
+			get {return m_DialogLauncherButton;}
+			set
+			{
+				m_DialogLauncherButton=value;
+				OnDialogLuncherButtonChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets image that is used as dialog luncher button when mouse is over the button.
+		/// Note that if this property is set you also must set the DialogLauncherButton property. Images set to both
+		/// properties must have same size. Default value is null which indicates that
+		/// default appearance for the button is used.
+		/// </summary>
+		[Browsable(true),DefaultValue(null), Category("Appearance"),Description("Indicates image that is used as dialog launcher button when mouse is over the button.")]
+		public Image DialogLauncherMouseOverButton
+		{
+			get {return m_DialogLauncherMouseOverButton;}
+			set
+			{
+				m_DialogLauncherMouseOverButton=value;
+			}
+		}
+
+	    /// <summary>
+	    /// Gets or sets maximum text length for automatic overflow button text. When overflow button is created due to the
+        /// reduced size of the control text for the button can be specified using OverflowButtonText property. If
+        /// text is not specified RibbonBar.Text property is used as overflow button text. In that case
+        /// this property specifies maximum length of the text to display on the button. Default value is 25. You can set
+        /// this property to 0 to use complete text regardless of length.
+	    /// </summary>
+        [DefaultValue(25), Category("Overflow"), Browsable(true), Description("Indicates maximum text length for automatic overflow button text.")]
+	    public int MaximumOverflowTextLength
+	    {
+            get
+            {
+                return m_MaximumOverflowTextLength;
+            }
+	        set
+	        {
+                m_MaximumOverflowTextLength = value;
+	        }
+	    }
+        /// <summary>
+        /// Gets or sets resize order index of the control. When control is parented to RibbonPanel control (which is the case when control is
+        /// used as part of RibbonControl) index specified here indicates the order in which controls that are part of the same panel
+        /// are resized. Lower index value indicates that control should be resized later when size needs to be reduced or earlier when size needs
+        /// to be increased. Default value is 0.
+        /// </summary>
+        [Browsable(true), Category("Overflow"), DefaultValue(0), Description("Indicates resize order index of the control.")]
+        public int ResizeOrderIndex
+        {
+            get { return m_ResizeOrderIndex; }
+            set { m_ResizeOrderIndex = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether automatic overflow handling is enabled. When overflow is enabled if control is resized below the
+        /// size that is needed to display its complete content overflow button is created and all content is moved to the overflow button
+        /// popup. Control will only display overflow button when in this state and user can click overflow button to display the actual
+        /// content of the control.
+        /// Default value is true.
+        /// </summary>
+        public bool AutoOverflowEnabled
+        {
+            get { return m_AutoOverflow; }
+            set
+            {
+                if (m_AutoOverflow != value)
+                {
+                    m_AutoOverflow = value;
+                    this.OnAutoOverflowChanged();
+                }
+            }
+        }
+
+        private void OnAutoOverflowChanged()
+        {
+            if (m_OverflowButton != null)
+                DisposeOverflowButton();
+            this.RecalcLayout();
+        }
+
+        /// <summary>
+        /// Gets or sets the text for overflow button that is created when ribbon bar size is reduced so it cannot display all its content.
+        /// When control is resized so it cannot display its content overflow button is created which is displayed on face of the control.
+        /// Complete content of the control is then displayed on popup toolbar when user clicks overflow button.
+        /// </summary>
+        [Browsable(true), DefaultValue(""), Description("Indicates text for overflow button that is created when ribbon bar size is reduced so it cannot display all its content"), Category("Overflow")]
+        public string OverflowButtonText
+        {
+            get { return m_OverflowButtonText; }
+            set
+            {
+                m_OverflowButtonText = value;
+                OnOverflowButtonChanged();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Image for overflow button that is created when ribbon bar size is reduced so it cannot display all its content.
+        /// When control is resized so it cannot display its content overflow button is created which is displayed on face of the control.
+        /// Complete content of the control is then displayed on popup toolbar when user clicks overflow button. This Image is also used when
+        /// RibbonBar is added to the Quick Access Toolbar to identify the RibbonBar button.
+        /// </summary>
+        [Browsable(true), DefaultValue(null), Description("Indicates image for overflow button that is created when ribbon bar size is reduced so it cannot display all its content"), Category("Overflow")]
+        public Image OverflowButtonImage
+        {
+            get { return m_OverflowButtonImage; }
+            set
+            {
+                m_OverflowButtonImage = value;
+                OnOverflowButtonChanged();
+            }
+        }
+
+        private void OnOverflowButtonChanged()
+        {
+            // Updates overflow button properties if button exists...
+            if (m_OverflowButton != null)
+            {
+                m_OverflowButton.Text = m_OverflowButtonText;
+                m_OverflowButton.Image = m_OverflowButtonImage;
+            }
+        }
+
+        /// <summary>
+        /// Invokes the LaunchDialog event to execute default launch dialog action.
+        /// </summary>
+        public void DoLaunchDialog()
+        {
+            InvokeLaunchDialog(new EventArgs());
+        }
+
+		protected virtual void InvokeLaunchDialog(EventArgs e)
+		{
+			if(LaunchDialog!=null)
+				LaunchDialog(this,e);
+		}
+
+		/// <summary>
+		/// Gets or sets whether dialog launcher button is visible in title of the ribbon. Default value is false.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),DefaultValue(false),Category("Behavior"),Description("Indicates whether dialog launcher button is visible in title of the ribbon.")]
+		public bool DialogLauncherVisible
+		{
+			get {return m_DialogLauncherVisible;}
+			set
+			{
+				m_DialogLauncherVisible=value;
+				if(this.DesignMode)
+					this.RecalcLayout();
+			}
+		}
+		/// <summary>
+		/// Gets or sets default layout orientation inside the control. You can have multiple layouts inside of the control by adding
+		/// one or more instances of the ItemContainer object and changing it's LayoutOrientation property.
+		/// </summary>
+        [Browsable(true), DevCoBrowsable(true), Category("Layout"), DefaultValue(eOrientation.Horizontal), DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
+		public virtual eOrientation LayoutOrientation
+		{
+			get {return m_ItemContainer.LayoutOrientation;}
+			set
+			{
+				m_ItemContainer.LayoutOrientation=value;
+				if(this.DesignMode)
+					this.RecalcLayout();
+			}
+		}
+
+        /// <summary>
+        /// Gets or sets spacing in pixels between items. Default value is 1.
+        /// </summary>
+        [Browsable(true), DefaultValue(1), Category("Layout"), Description("Indicates spacing in pixels between items.")]
+        public int ItemSpacing
+        {
+            get { return m_ItemContainer.ItemSpacing; }
+            set
+            {
+                m_ItemContainer.ItemSpacing = value;
+                if (this.DesignMode) RecalcLayout();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether items contained by container are resized to fit the container bounds. When container is in horizontal
+        /// layout mode then all items will have the same height. When container is in vertical layout mode then all items
+        /// will have the same width. Default value is true.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), DefaultValue(true), Category("Layout")]
+        public bool ResizeItemsToFit
+        {
+            get { return m_ItemContainer.ResizeItemsToFit; }
+            set
+            {
+                m_ItemContainer.ResizeItemsToFit = value;
+                if (this.DesignMode) RecalcLayout();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the item alignment when container is in horizontal layout. Default value is Left.
+        /// </summary>
+        [Browsable(true), DefaultValue(eHorizontalItemsAlignment.Left), Category("Layout"), Description("Indicates item alignment when container is in horizontal layout."), DevCoBrowsable(true)]
+        public eHorizontalItemsAlignment HorizontalItemAlignment
+        {
+            get { return m_ItemContainer.HorizontalItemAlignment; }
+            set
+            {
+                m_ItemContainer.HorizontalItemAlignment = value;
+                if (this.DesignMode) RecalcLayout();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the item vertical alignment. Default value is Top.
+        /// </summary>
+        [Browsable(true), DefaultValue(eVerticalItemsAlignment.Top), Category("Layout"), Description("Indicates item item vertical alignment."), DevCoBrowsable(true)]
+        public eVerticalItemsAlignment VerticalItemAlignment
+        {
+            get { return m_ItemContainer.VerticalItemAlignment; }
+            set
+            {
+                m_ItemContainer.VerticalItemAlignment = value;
+                if (this.DesignMode) RecalcLayout();
+            }
+        }
+
+		/// <summary>
+		/// Returns collection of items on a bar.
+		/// </summary>
+		[DesignerSerializationVisibility(DesignerSerializationVisibility.Content), Browsable(false)]
+		public SubItemsCollection Items
+		{
+			get
+			{
+                if (OverflowState && !this.DesignMode)
+                    return m_OverflowRibbonBar.Items; // m_OverflowButton.SubItems;
+				return m_ItemContainer.SubItems;
+			}
+		}
+
+        /// <summary>
+        /// Called when item on popup container is right-clicked.
+        /// </summary>
+        /// <param name="item">Instance of the item that is right-clicked.</param>
+        protected override void OnPopupItemRightClick(BaseItem item)
+        {
+            if (item != null && !item.CanCustomize) return;
+
+            RibbonControl rc = this.GetRibbonControl();
+            if (rc != null)
+            {
+                rc.ShowCustomizeContextMenu(item, false);
+            }
+        }
+
+        internal Rectangle DialogLauncherRect
+        {
+            get { return m_DialogLauncherRect; }
+        }
+
+		protected override void OnMouseDown(MouseEventArgs e)
+		{
+			base.OnMouseDown(e);
+            if (m_DialogLauncherRect.Contains(e.X, e.Y) && !m_DialogLauncherRect.IsEmpty && m_TitleVisible && !this.OverflowState)
+            {
+                this.Invalidate(m_DialogLauncherRect);
+                OnDialogLauncherMouseDown(e);
+            }
+
+            if (e.Button == MouseButtons.Right)
+            {
+                RibbonControl rc = GetRibbonControl();
+                if(rc!=null)
+                    rc.OnRibbonBarRightClick(this, e.X, e.Y);
+            }
+		}
+
+        /// <summary>
+        /// Gets or sets whether ribbon bar can be customized by end user i.e. added to Quick Access Toolbar.
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Behavior"), Description("Indicates whether ribbon bar can be customized by end user i.e. added to Quick Access Toolbar.")]
+        public virtual bool CanCustomize
+        {
+            get
+            {
+                return m_CanCustomize;
+            }
+            set
+            {
+                m_CanCustomize = value;
+            }
+        }
+
+        protected override void OnMouseUp(MouseEventArgs e)
+        {
+            base.OnMouseUp(e);
+            if (m_DialogLauncherRect.Contains(e.X, e.Y) && e.Button == MouseButtons.Left)
+            {
+                if(!m_DialogLauncherRect.IsEmpty)
+                    this.Invalidate(m_DialogLauncherRect);
+                if (this.Parent is MenuPanel)
+                {
+                    PopupItem item = ((MenuPanel)this.Parent).ParentItem as PopupItem;
+                    if (item != null)
+                        item.ClosePopup();
+                }
+                else if (this.Parent is Bar && ((Bar)this.Parent).BarState == eBarState.Popup)
+                {
+                    PopupItem item = ((Bar)this.Parent).ParentItem as PopupItem;
+                    if (item != null)
+                        item.ClosePopup();
+                }
+                InvokeLaunchDialog(new EventArgs());
+            }
+        }
+
+        protected override void OnMouseEnter(EventArgs e)
+        {
+            base.OnMouseEnter(e);
+            SetMouseOver(true); // m_MouseOver = true;
+            if ((m_TitleStyleMouseOver != null && m_TitleStyleMouseOver.Custom || m_DefaultTitleStyleMouseOver.Custom) && m_TitleVisible && !this.OverflowState)
+            {
+                this.Invalidate(GetTitleRectangle());
+            }
+            ElementStyle mouseOverStyle = GetBackgroundMouseOverStyle();
+            if (mouseOverStyle != null && mouseOverStyle.Custom)
+                this.Invalidate();
+        }
+
+        protected override void OnMouseLeave(EventArgs e)
+        {
+            base.OnMouseLeave(e);
+
+            Point p = this.PointToClient(Control.MousePosition);
+            if (this.ClientRectangle.Contains(p))
+            {
+                Form form = this.FindForm();
+                if (form != null && Form.ActiveForm == form)
+                {
+                    // Mouse is over the control inside of the RibbonBar, event should be ignored...
+                    CreateMouseOverTimer();
+                    return;
+                }
+            }
+            
+            SetMouseOver(false); // m_MouseOver = false;
+			
+			SetMouseOverDialogLauncher(false);
+
+            if ((m_TitleStyleMouseOver != null && m_TitleStyleMouseOver.Custom || m_DefaultTitleStyleMouseOver.Custom) && m_TitleVisible && !this.OverflowState)
+            {
+                this.Invalidate(GetTitleRectangle());
+            }
+            ElementStyle mouseOverStyle = GetBackgroundMouseOverStyle();
+            if (mouseOverStyle != null && mouseOverStyle.Custom)
+                this.Invalidate();
+        }
+
+        private void CreateMouseOverTimer()
+        {
+            if (m_MouseOverTimer != null) return;
+
+            m_MouseOverTimer = new Timer();
+            m_MouseOverTimer.Interval = 500;
+            m_MouseOverTimer.Tick += new EventHandler(MouseOverTimer_Tick);
+            m_MouseOverTimer.Enabled = true;
+            m_MouseOverTimer.Start();
+        }
+
+        private void MouseOverTimer_Tick(object sender, EventArgs e)
+        {
+            Point p = this.PointToClient(Control.MousePosition);
+            if (!this.ClientRectangle.Contains(p) || !this.Visible)
+            {
+                m_MouseOverTimer.Stop();
+                m_MouseOverTimer.Enabled = false;
+                SetMouseOver(false);
+                DestroyMouseOverTimer();
+            }
+        }
+
+        private void DestroyMouseOverTimer()
+        {
+            if (m_MouseOverTimer != null)
+            {
+                m_MouseOverTimer.Stop();
+                m_MouseOverTimer.Dispose();
+                m_MouseOverTimer = null;
+            }
+        }
+
+		protected override void OnMouseMove(MouseEventArgs e)
+		{
+			base.OnMouseMove(e);
+			if(m_DialogLauncherVisible)
+			{
+				if(m_DialogLauncherRect.Contains(e.X,e.Y))
+					SetMouseOverDialogLauncher(true);
+				else
+					SetMouseOverDialogLauncher(false);
+			}
+		}
+
+        protected override void InternalMouseMove(MouseEventArgs e)
+        {
+            if (m_TitleVisible && !m_TitleRectangle.IsEmpty && m_TitleRectangle.Contains(e.X, e.Y))
+            {
+                if (m_ItemContainer.HotSubItem != null)
+                    m_ItemContainer.InternalMouseLeave();
+                return;
+            }
+            base.InternalMouseMove(e);
+        }
+
+        protected override void OnMouseHover(EventArgs e)
+        {
+            base.OnMouseHover(e);
+
+            if (m_MouseOverDialogLauncher)
+                OnDialogLauncherMouseHover(new EventArgs());
+        }
+
+		private void SetMouseOverDialogLauncher(bool value)
+		{
+			if(m_MouseOverDialogLauncher!=value)
+			{
+                m_MouseOverDialogLauncher=value;
+                
+                this.Invalidate(m_DialogLauncherRect);
+
+                if (value)
+                    OnDialogLauncherMouseEnter(new EventArgs());
+                else
+                    OnDialogLauncherMouseLeave(new EventArgs());
+			}
+		}
+
+        /// <summary>
+        /// Invokes DialogLauncherMouseEnter event.
+        /// </summary>
+        protected virtual void OnDialogLauncherMouseEnter(EventArgs e)
+        {
+            if (DialogLauncherMouseEnter != null)
+                DialogLauncherMouseEnter(this, e);
+        }
+
+        /// <summary>
+        /// Invokes DialogLauncherMouseLeave event.
+        /// </summary>
+        protected virtual void OnDialogLauncherMouseLeave(EventArgs e)
+        {
+            if (DialogLauncherMouseLeave != null)
+                DialogLauncherMouseLeave(this, e);
+        }
+
+        /// <summary>
+        /// Invokes DialogLauncherMouseHover event.
+        /// </summary>
+        protected virtual void OnDialogLauncherMouseHover(EventArgs e)
+        {
+            if (DialogLauncherMouseHover != null)
+                DialogLauncherMouseHover(this, e);
+        }
+
+        protected virtual void OnDialogLauncherMouseDown(MouseEventArgs e)
+        {
+            if (DialogLauncherMouseDown != null)
+                DialogLauncherMouseDown(this, e);
+        }
+
+        /// <summary>
+        /// Returns the collection of items with the specified name.
+        /// </summary>
+        /// <param name="ItemName">Item name to look for.</param>
+        /// <returns></returns>
+        public override ArrayList GetItems(string ItemName)
+        {
+            RibbonControl rc = GetRibbonControl();
+            if (rc == null)
+                return base.GetItems(ItemName);
+            return rc.RibbonStrip.GetItems(ItemName);
+        }
+
+        /// <summary>
+        /// Returns the collection of items with the specified name and type.
+        /// </summary>
+        /// <param name="ItemName">Item name to look for.</param>
+        /// <param name="itemType">Item type to look for.</param>
+        /// <returns></returns>
+        public override ArrayList GetItems(string ItemName, Type itemType)
+        {
+            RibbonControl rc = GetRibbonControl();
+            if (rc == null)
+                return base.GetItems(ItemName, itemType);
+            return rc.RibbonStrip.GetItems(ItemName, itemType);
+        }
+
+        /// <summary>
+        /// Returns the first item that matches specified name.
+        /// </summary>
+        /// <param name="ItemName">Item name to look for.</param>
+        /// <returns></returns>
+        public override BaseItem GetItem(string ItemName)
+        {
+            RibbonControl rc = GetRibbonControl();
+            if (rc == null)
+            {
+                BaseItem item = base.GetItem(ItemName);
+                return item;
+            }
+            return rc.RibbonStrip.GetItem(ItemName);
+        }
+
+        /// <summary>
+        /// Returns the collection of items with the specified name and type.
+        /// </summary>
+        /// <param name="ItemName">Item name to look for.</param>
+        /// <param name="itemType">Item type to look for.</param>
+        /// <param name="useGlobalName">Indicates whether GlobalName property is used for searching.</param>
+        /// <returns></returns>
+        public override ArrayList GetItems(string ItemName, Type itemType, bool useGlobalName)
+        {
+            RibbonControl rc = GetRibbonControl();
+            if (rc == null)
+                return base.GetItems(ItemName, itemType, useGlobalName);
+
+            return rc.RibbonStrip.GetItems(ItemName, itemType, useGlobalName);
+        }
+
+        protected override void OnShowKeyTipsChanged()
+        {
+            RibbonControl rc = this.GetRibbonControl();
+            if (rc != null && this.ShowKeyTips)
+            {
+                rc.RibbonStrip.OnRibbonBarShowKeyTips(this);
+            }
+            base.OnShowKeyTipsChanged();
+        }
+
+        protected override BaseItem GetItemForMnemonic(BaseItem container, char charCode, bool deepScan, bool stackKeys)
+        {
+            BaseItem item = base.GetItemForMnemonic(container, charCode, deepScan, stackKeys);
+            
+            if (item ==null && this.OverflowState)
+            {
+                item = m_OverflowRibbonBar.GetItemForMnemonic(m_OverflowRibbonBar.m_ItemContainer, charCode, deepScan, stackKeys);
+            }
+            return item;
+        }
+		#endregion
+
+		#region Layout Support
+		protected override void OnTextChanged(EventArgs e)
+		{
+			m_TitleElement.Text=this.Text;
+            if (m_OverflowButton != null) m_OverflowButton.Text = GetOverflowButtonText();
+			this.RecalcLayout();
+			base.OnTextChanged (e);
+		}
+
+		private void OnDialogLuncherButtonChanged()
+		{
+			this.RecalcLayout();
+		}
+
+        private void InitDefaultStyles()
+        {
+            ColorScheme cs = this.GetColorScheme();
+            m_DefaultBackgroundStyle.SetColorScheme(cs);
+            m_DefaultBackgroundMouseOverStyle.SetColorScheme(cs);
+            m_DefaultTitleStyle.SetColorScheme(cs);
+            m_DefaultTitleStyle.HideMnemonic = true;
+            m_DefaultTitleStyleMouseOver.SetColorScheme(cs);
+            m_DefaultTitleStyleMouseOver.HideMnemonic = true;
+
+            // Initialize Default Styles
+            RibbonPredefinedColorSchemes.ApplyRibbonBarElementStyle(m_DefaultBackgroundStyle, m_DefaultBackgroundMouseOverStyle,
+                m_DefaultTitleStyle, m_DefaultTitleStyleMouseOver, this);
+        }
+
+        private void RibbonBar_ItemRemoved(object sender, ItemRemovedEventArgs e)
+        {
+            if (sender == m_GalleryStretch)
+                m_GalleryStretch = null;
+        }
+
+        private void RibbonBar_ItemAdded(object sender, EventArgs e)
+        {
+            if (sender is GalleryContainer)
+            {
+                GalleryContainer gc = sender as GalleryContainer;
+                if (gc.StretchGallery && m_GalleryStretch == null)
+                    m_GalleryStretch = gc;
+            }
+        }
+
+        internal GalleryContainer GalleryStretch
+        {
+            get { return m_GalleryStretch; }
+            set { m_GalleryStretch = value; }
+        }
+
+        private Size GetItemContainerMinimumSize()
+        {
+			Rectangle r=base.GetItemContainerRectangle();
+            if (m_TitleVisible)
+            {
+                Rectangle rTitle = GetTitleRectangle();
+                if (m_TitlePosition == eRibbonTitlePosition.Top)
+                {
+                    rTitle.Height++;
+                    r.Y += rTitle.Height;
+                    r.Height -= rTitle.Height;
+                }
+                else
+                {
+                    rTitle.Height++;
+                    r.Height -= rTitle.Height;
+                }
+            }
+
+			return Dpi.Descale(r.Size);
+        }
+
+		protected override void RecalcSize()
+		{
+            if (!BarFunctions.IsHandleValid(this) || m_SuspendRecalcSize)
+				return;
+            
+            InitDefaultStyles();
+            ElementStyle backStyle = GetBackgroundStyle();
+            if (m_TitleVisible)
+            {
+                SimpleElementLayoutInfo li = new SimpleElementLayoutInfo();
+                m_TitleElement.Image = m_DialogLauncherButton;
+                if (m_DialogLauncherButton != null && m_DialogLauncherVisible)
+                {
+                    m_TitleElement.ImageAlignment = eSimplePartAlignment.FarCenter;
+                }
+
+                li.Element = m_TitleElement;
+                li.LayoutStyle = GetTitleStyle();
+                li.Font = this.Font;
+                li.LeftToRight = (this.RightToLeft != RightToLeft.Yes);
+                li.VerticalPartAlignment = false;
+                li.Left = this.ClientRectangle.X;
+                li.Top = this.ClientRectangle.Y;
+                m_TitleElement.FixedWidth = this.ClientRectangle.Width;
+
+                if (backStyle != null)
+                {
+                    //if (backStyle.PaintLeftBorder)
+                    //{
+                    //    li.Left += backStyle.BorderLeftWidth;
+                    //    m_TitleElement.FixedWidth -= backStyle.BorderLeftWidth;
+                    //}
+
+                    if (backStyle.PaintRightBorder)
+                        m_TitleElement.FixedWidth -= backStyle.BorderRightWidth;
+
+                    if (backStyle.PaintTopBorder)
+                        li.Top += backStyle.BorderTopWidth;
+                }
+
+                using (Graphics g = this.CreateGraphics())
+                {
+                    li.Graphics = g;
+                    SimpleElementLayout.LayoutSimpleElement(li);
+                    if (m_TitlePosition == eRibbonTitlePosition.Bottom)
+                    {
+                        li.Top = this.ClientRectangle.Bottom - m_TitleElement.Bounds.Height;
+                        if (backStyle != null && backStyle.PaintBottomBorder)
+                            li.Top -= backStyle.BorderBottomWidth;
+                        else if (StyleManager.IsMetro(StyleManager.Style))
+                            li.Top++;
+                        SimpleElementLayout.LayoutSimpleElement(li);
+                    }
+                }
+                m_TitleRectangle = m_TitleElement.Bounds;
+            }
+            else
+                m_TitleRectangle = Rectangle.Empty;
+
+            RestoreAutoSizedItems();
+            m_FullItemsSize = Size.Empty;
+
+            if (this.Parent is RibbonPanel)
+            {
+                RibbonControl rc = this.GetRibbonControl();
+                if ((rc != null) && !rc.AutoSize)
+                {
+                    // The height of the RibbonBar is controlled by the height of the panel so whatever height is here we apply to ItemContainer
+                    m_ItemContainer.MinimumSize = new Size(0, GetItemContainerMinimumSize().Height);
+                }
+            }
+            else if(this.IsOverflowRibbon && !this.AutoSize)
+                m_ItemContainer.MinimumSize = new Size(0, GetItemContainerMinimumSize().Height);
+            else
+                m_ItemContainer.MinimumSize = Size.Empty;
+
+			base.RecalcSize();
+
+            Size contentSize = this.GetContentBasedSize();
+            if (ResizeGallery(contentSize.Width))
+            {
+                m_LastReducedSize = Size.Empty;
+                return;
+            }
+
+            if (this.AutoOverflowEnabled && !this.DesignMode)
+            {    
+                if (contentSize.Width > this.Width)
+                {
+                    if (m_AutoSizeBagList.Count == 0 && m_AutoSizeItems && this.Width > 1 && !this.OverflowState)
+                    {
+                        // Try to reduce the size of the Ribbon by manipulating size of the items
+                        AutoReduceItemSize(contentSize.Width);
+                        base.RecalcSize();
+                        Size sa = this.GetContentBasedSize();
+                        if (sa.Width > this.Width)
+                        {
+                            RestoreAutoSizedItems();
+                        }
+                        else
+                        {
+                            m_LastReducedSize = sa;
+                            m_FullItemsSize = contentSize;
+                            contentSize = sa;
+                        }
+                    }
+
+                    if (!this.OverflowState && contentSize.Width > this.Width)
+                    {
+                        m_BeforeOverflowSize = contentSize;
+                        this.SetupOverflowButton();
+                        base.RecalcSize();
+                    }
+                }
+                else if (this.OverflowState)
+                {
+                    if (m_BeforeOverflowSize.IsEmpty)
+                    {
+                        this.DisposeOverflowButton();
+                        base.RecalcSize();
+                        Size newSize = this.GetContentBasedSize();
+                        if (newSize.Width > this.Width)
+                        {
+                            this.SetupOverflowButton();
+                            base.RecalcSize();
+                        }
+                    }
+                    else if (m_BeforeOverflowSize.Width <= this.Width)
+                    {
+                        this.DisposeOverflowButton();
+                        base.RecalcSize();
+                        contentSize = this.GetContentBasedSize();
+                        if (ResizeGallery(contentSize.Width))
+                            m_LastReducedSize = Size.Empty;
+                    }
+                    else if (!m_LastReducedSize.IsEmpty && m_LastReducedSize.Width <= this.Width)
+                    {
+                        this.DisposeOverflowButton();
+                        AutoReduceItemSize(m_LastReducedSize.Width);
+                        base.RecalcSize();
+                        contentSize = this.GetContentBasedSize();
+                        if (ResizeGallery(contentSize.Width))
+                            m_LastReducedSize = Size.Empty;
+                    }
+                }
+                else
+                    m_LastReducedSize = Size.Empty;
+            }
+		}
+
+        internal Size BeforeOverflowSize
+        {
+            get { return m_BeforeOverflowSize; }
+        }
+
+        internal Size LastReducedSize
+        {
+            get { return m_LastReducedSize; }
+        }
+
+        private bool ResizeGallery(int contentBasedWidth)
+        {
+            if (m_GalleryStretch == null || !m_GalleryStretch.Visible)
+                return false;
+            // Check whether gallery can be reduced/increased in size
+            int diff = this.Width - contentBasedWidth;
+
+            if (m_GalleryStretch.DisplayRectangle.Width + diff >= m_GalleryStretch.MinimumSize.Width)
+            {
+                int previousWidth = m_GalleryStretch.DisplayRectangle.Width;
+                m_GalleryStretch.RecommendedSize = new Size(m_GalleryStretch.DisplayRectangle.Width + diff, Dpi.Height(m_GalleryStretch.DefaultSize.Height));
+                m_GalleryStretch.RecalcSize();
+                int offset = m_GalleryStretch.DisplayRectangle.Width - previousWidth;
+                OffsetItems(m_GalleryStretch.Parent, m_GalleryStretch.Parent.SubItems.IndexOf(m_GalleryStretch) + 1, offset);
+                return Math.Abs(offset) >= Math.Abs(diff);
+            }
+
+            return false;
+        }
+
+        private void OffsetItems(BaseItem parent, int startOffsetIndex, int offset)
+        {
+            int c = parent.SubItems.Count;
+            for (int i = startOffsetIndex; i < c; i++)
+            {
+                BaseItem item = parent.SubItems[i];
+                if (item.Visible)
+                {
+                    Rectangle r = item.Bounds;
+                    r.Offset(offset, 0);
+                    item.Bounds = r;
+                }
+            }
+            parent.SetDisplayRectangle(new Rectangle(parent.DisplayRectangle.X, parent.DisplayRectangle.Y, parent.DisplayRectangle.Width + offset, parent.DisplayRectangle.Height));
+            //parent.WidthInternal = parent.WidthInternal + offset;
+        }
+
+        private void AutoReduceItemSize(int contentBasedWidth)
+        {
+            if (m_AutoSizeBagList.Count > 0) return;
+
+            // Reduce the size of gallery if any
+            if (m_GalleryStretch != null) m_GalleryStretch.RecommendedSize = new Size(m_GalleryStretch.MinimumSize.Width, m_GalleryStretch.HeightInternal);
+
+            // Go through all items and change properties to try to reduce the ribbon size
+            AutoReduceItemContainerSize(m_ItemContainer);
+
+            if (m_AutoSizeBagList.Count > 0) _AutoSizeIncludesTitleEnabled = false;
+        }
+
+        private void AutoReduceItemContainerSize(ItemContainer cont)
+        {
+            if (cont.LayoutOrientation == eOrientation.Vertical)
+            {
+                foreach (BaseItem item in cont.SubItems)
+                {
+                    ButtonItem b = item as ButtonItem;
+                    if (b != null && b.ButtonStyle == eButtonStyle.ImageAndText && (b.ImagePosition == eImagePosition.Left || b.ImagePosition == eImagePosition.Right))
+                    {
+                        BaseItemAutoSizeBag bag = AutoSizeBagFactory.CreateAutoSizeBag(b);
+                        bag.RecordSetting(b);
+                        bool gi = b.GlobalItem;
+                        b.GlobalItem = false;
+                        b.ButtonStyle = eButtonStyle.Default;
+                        b.ImageFixedSize = new Size(16, 16);
+                        b.UseSmallImage = true;
+                        b.GlobalItem = gi;
+                        m_AutoSizeBagList.Add(bag);
+                    }
+                    else if (item is ItemContainer && !(item is GalleryContainer))
+                        AutoReduceItemContainerSize(item as ItemContainer);
+                }
+            }
+            else
+            {
+                ArrayList buttons = new ArrayList();
+                foreach (BaseItem item in cont.SubItems)
+                {
+                    if (item is ItemContainer && !(item is GalleryContainer))
+                        AutoReduceItemContainerSize(item as ItemContainer);
+                    else if (item is ButtonItem)
+                    {
+                        ButtonItem b = item as ButtonItem;
+                        if (b.ImagePosition == eImagePosition.Top || b.ImagePosition == eImagePosition.Bottom)
+                        {
+                            buttons.Add(b);
+                        }
+                    }
+                }
+                if (buttons.Count > 1)
+                {
+                    int c = buttons.Count / 3;
+                    int lowerBound = buttons.Count - c * 3;
+                    for (int i = buttons.Count - 1; i >=lowerBound; i--)
+                    {
+                        ButtonItem b=buttons[i] as ButtonItem;
+                        BaseItemAutoSizeBag bag = AutoSizeBagFactory.CreateAutoSizeBag(b);
+                        bag.RecordSetting(b);
+                        bool gi = b.GlobalItem;
+                        b.GlobalItem = false;
+                        b.ImagePosition = eImagePosition.Left;
+                        b.ButtonStyle = eButtonStyle.ImageAndText;
+                        b.ImageFixedSize = new Size(16, 16);
+                        if (b.TextMarkupBody != null && b.TextMarkupBody.HasExpandElement) b.Text = TextMarkup.MarkupParser.RemoveExpand(b.Text);
+                        b.GlobalItem = gi;
+                        m_AutoSizeBagList.Add(bag);
+                    }
+                    BaseItemAutoSizeBag bagCont = AutoSizeBagFactory.CreateAutoSizeBag(cont);
+                    m_AutoSizeBagList.Add(bagCont);
+                    bagCont.RecordSetting(cont);
+                    cont.LayoutOrientation = eOrientation.Vertical;
+                    cont.MultiLine = true;
+                }
+            }
+        }
+
+        internal void RestoreAutoSizedItems()
+        {
+            if (m_GalleryStretch != null) m_GalleryStretch.RecommendedSize = Size.Empty;
+            if (m_AutoSizeBagList.Count == 0) return;
+            _AutoSizeIncludesTitleEnabled = true;
+            BaseItemAutoSizeBag[] bagItems = new BaseItemAutoSizeBag[m_AutoSizeBagList.Count];
+            m_AutoSizeBagList.CopyTo(bagItems);
+            foreach (BaseItemAutoSizeBag ab in bagItems)
+                ab.RestoreSettings();
+
+            m_AutoSizeBagList.Clear();
+        }
+
+        internal bool IsItemsAutoSizeActive
+        {
+            get
+            {
+                return (m_AutoSizeBagList.Count>0);
+            }
+        }
+
+
+        internal bool IsOverflowRibbon
+        {
+            get { return m_IsOverflowRibbon; }
+            set { m_IsOverflowRibbon = value; }
+        }
+
+        private RibbonBar CreateOverflowRibbon()
+        {
+            return CreateOverflowRibbon(false);
+        }
+
+        internal RibbonBar CreateOverflowRibbon(bool createHandle)
+        {
+            RibbonBar bar = new RibbonBar();
+            bar.ShortcutsEnabled = false;
+            bar.AutoOverflowEnabled = false;
+            bar.Style = this.Style;
+            bar.BackgroundStyle.ApplyStyle(this.BackgroundStyle);
+            bar.BackgroundMouseOverStyle.ApplyStyle(this.BackgroundMouseOverStyle);
+            bar.Text = this.Text;
+            bar.TitleStyle.ApplyStyle(this.TitleStyle);
+            bar.TitleStyleMouseOver.ApplyStyle(this.TitleStyleMouseOver);
+            bar.LayoutOrientation = this.LayoutOrientation;
+            CopyIOwnerEvents(bar);
+            bar.DialogLauncherVisible = this.DialogLauncherVisible;
+            bar.DialogLauncherMouseDown = this.DialogLauncherMouseDown;
+            bar.DialogLauncherMouseEnter = this.DialogLauncherMouseEnter;
+            bar.DialogLauncherMouseHover = this.DialogLauncherMouseHover;
+            bar.DialogLauncherMouseLeave = this.DialogLauncherMouseLeave;
+            bar.DialogLauncherButton = this.DialogLauncherButton;
+            bar.DialogLauncherMouseOverButton = this.DialogLauncherMouseOverButton;
+            bar.Images = this.Images;
+            bar.ImagesLarge = this.ImagesLarge;
+            bar.ImagesMedium = this.ImagesMedium;
+            bar.FadeEffect = this.FadeEffect;
+            bar.LaunchDialog = this.LaunchDialog;
+            bar.ItemSpacing= this.ItemSpacing;
+            bar.HorizontalItemAlignment = this.HorizontalItemAlignment;
+            bar.IsOverflowRibbon = true;
+            bar.AutoSizeItems = this.AutoSizeItems;
+#if!TRIAL
+            bar.LicenseKey = this.LicenseKey;
+#endif
+            bar.MaximumOverflowTextLength = this.MaximumOverflowTextLength;
+            bar.VerticalItemAlignment = this.VerticalItemAlignment;
+            //bar.AutoSize = true;
+            if (createHandle && !BarFunctions.IsHandleValid(this))
+            {
+                this.CreateHandle();
+                this.RecalcLayout();
+            }
+            if (!m_BeforeOverflowSize.IsEmpty)
+            {
+                Size barSize = m_BeforeOverflowSize;
+                bar.Size = barSize;
+            }
+            else
+                bar.Size = GetFullContentBasedSize();
+            bar.TitleVisible = this.TitleVisible;
+            bar.Visible = true;
+            return bar;
+        }
+        private eVerticalItemsAlignment m_OriginalVerticalItemAlign = eVerticalItemsAlignment.Top;
+        private eOrientation m_OriginalLayoutOrientation = eOrientation.Horizontal;
+        private eHorizontalItemsAlignment m_OriginalHorizontalItemAlign = eHorizontalItemsAlignment.Left;
+        private void SetupOverflowButton()
+        {
+            if (m_OverflowButton != null || m_ItemContainer.SubItems.Count==0)
+                return;
+            m_SuspendRecalcSize = true;
+
+            
+            RibbonOverflowButtonItem overflowButton = new RibbonOverflowButtonItem();
+            overflowButton.Name = "sysOverflowButton";
+            overflowButton.Text = GetOverflowButtonText();
+            overflowButton.RibbonBar = this;
+            overflowButton.Image = GetOverflowButtonImage();
+            overflowButton.ButtonStyle = eButtonStyle.ImageAndText;
+            overflowButton.ImagePosition = eImagePosition.Top;
+            overflowButton.AutoExpandOnClick = true;
+            overflowButton.PopupType = ePopupType.Menu;
+            overflowButton.ImagePaddingHorizontal = 16;
+            overflowButton.VerticalPadding = 12;
+            overflowButton.SubItemsExpandWidth = 14;
+            overflowButton.HotTrackingStyle = eHotTrackingStyle.None;
+            overflowButton.PopupOpen += new DotNetBarManager.PopupOpenEventHandler(OverflowButton_PopupOpen);
+            if (OverflowButtonSetup != null)
+                OverflowButtonSetup(this, new OverflowButtonEventArgs(overflowButton));
+
+            ArrayList items = new ArrayList();
+            m_ItemContainer.SubItems.CopyTo(items);
+            m_ItemContainer.SubItems.Clear();
+
+            //ItemContainer cont = m_ItemContainer.Copy() as ItemContainer;
+            //m_OverflowButton.SubItems.Add(cont);
+            m_ItemContainer.SubItems.Add(overflowButton);
+            m_OverflowRibbonBar = CreateOverflowRibbon();
+            m_OverflowRibbonBar.OverflowParent = this;
+
+            m_OriginalVerticalItemAlign = m_ItemContainer.VerticalItemAlignment;
+            m_OriginalLayoutOrientation = m_ItemContainer.LayoutOrientation;
+            m_OriginalHorizontalItemAlign = m_ItemContainer.HorizontalItemAlignment;
+            m_ItemContainer.VerticalItemAlignment = eVerticalItemsAlignment.Top;
+            m_ItemContainer.LayoutOrientation = eOrientation.Horizontal;
+            m_ItemContainer.HorizontalItemAlignment = eHorizontalItemsAlignment.Center;
+
+            IOwner owner = (IOwner)this;
+            foreach (BaseItem item in items)
+            {
+                m_OverflowRibbonBar.Items.Add(item);
+                owner.AddShortcutsFromItem(item);
+            }
+            
+            ItemContainer ic = new ItemContainer();
+            ic.Stretch = true;
+            ControlContainerItem cont = new ControlContainerItem();
+            cont.AllowItemResize = false;
+            ic.SubItems.Add(cont);
+            cont.Control = m_OverflowRibbonBar;
+            overflowButton.SubItems.Add(ic);
+			m_ItemContainer.RefreshImageSize();
+
+            m_OverflowButton = overflowButton;
+
+            if (OverflowButtonSetupComplete != null)
+                OverflowButtonSetupComplete(this, new OverflowButtonEventArgs(m_OverflowButton));
+            m_SuspendRecalcSize = false;
+        }
+
+        protected override void OnClick(EventArgs e)
+        {
+            if (m_OverflowButton != null)
+            {
+                Point p = this.PointToClient(Control.MousePosition);
+                if(!m_OverflowButton.DisplayRectangle.Contains(p))
+                    m_OverflowButton.Expanded = !m_OverflowButton.Expanded;
+            }
+            base.OnClick(e);
+        }
+
+        private RibbonBar _OverflowParent;
+        internal RibbonBar OverflowParent
+        {
+            get { return _OverflowParent; }
+            set { _OverflowParent = value; }
+        }
+
+        /// <summary>
+        /// Returns reference to the overflow button that is used by control.
+        /// </summary>
+        internal RibbonBar OverflowRibbonBar
+        {
+            get { return m_OverflowRibbonBar; }
+        }
+
+        private void OverflowButton_PopupOpen(object sender, PopupOpenEventArgs e)
+        {
+            if (m_OverflowRibbonBar != null)
+            {
+                m_OverflowRibbonBar.BackgroundStyle.ApplyStyle(this.BackgroundStyle);
+                m_OverflowRibbonBar.BackgroundMouseOverStyle.ApplyStyle(this.BackgroundMouseOverStyle);
+                m_OverflowRibbonBar.TitleStyle.ApplyStyle(this.TitleStyle);
+                m_OverflowRibbonBar.TitleStyleMouseOver.ApplyStyle(this.TitleStyleMouseOver);
+                if (this.ShowKeyTips)
+                    m_OverflowRibbonBar.ShowKeyTips = true;
+            }
+        }
+
+        private void DisposeOverflowButton()
+        {
+            if (m_OverflowButton == null)
+                return;
+
+            m_SuspendRecalcSize = true;
+            if (OverflowButtonDestroy != null)
+                OverflowButtonDestroy(this, new OverflowButtonEventArgs(m_OverflowButton));
+            m_OverflowButton.PopupOpen -= new DotNetBarManager.PopupOpenEventHandler(OverflowButton_PopupOpen);
+            m_ItemContainer.SubItems.Remove(m_OverflowButton);
+            m_ItemContainer.VerticalItemAlignment = m_OriginalVerticalItemAlign;
+            m_ItemContainer.LayoutOrientation = m_OriginalLayoutOrientation;
+            m_ItemContainer.HorizontalItemAlignment = m_OriginalHorizontalItemAlign;
+            ArrayList items=new ArrayList();
+            m_OverflowRibbonBar.Items.CopyTo(items);
+            m_OverflowRibbonBar.Items.Clear();
+            m_OverflowButton.SubItems.Clear();
+
+            IOwner owner = (IOwner)this;
+            foreach (BaseItem item in items)
+            {
+                owner.RemoveShortcutsFromItem(item);
+                m_ItemContainer.SubItems.Add(item);
+            }
+			if(m_OverflowButtonImage==null)
+			{
+				m_OverflowButton.Image.Dispose();
+				m_OverflowButton.Image=null;
+			}
+            m_OverflowButton.Dispose();
+            m_OverflowRibbonBar.Dispose();
+            m_OverflowButton = null;
+            m_OverflowRibbonBar = null;
+            m_SuspendRecalcSize = false;
+            m_BeforeOverflowSize = Size.Empty;
+        }
+
+		internal Image GetOverflowButtonImage()
+		{
+			if(m_OverflowButtonImage==null)
+				return BarFunctions.LoadBitmap("SystemImages.RibbonOverflow.png");
+			return m_OverflowButtonImage;
+		}
+
+		private string GetOverflowButtonText()
+		{
+			string text = m_OverflowButtonText;
+			if (text == "")
+			{
+				text = this.Text;
+                if (m_MaximumOverflowTextLength > 0 && text.Length >= m_MaximumOverflowTextLength)
+                    text = text.Substring(0, m_MaximumOverflowTextLength) + "...";
+                else if (text.IndexOf(' ') > 0)
+                {
+                    text += " <expand/>";
+                    text="<div align=\"center\">"+text+"</div>";
+                }
+			}
+			return text;
+		}
+
+        protected override void OnResize(EventArgs e)
+        {
+            //Console.WriteLine("Name: {0}  Size:{1}", this.Name, this.Size);
+            if (this.OverflowState)
+                m_OverflowButton.Bounds = this.GetItemContainerRectangle();
+            base.OnResize(e);
+        }
+
+        /// <summary>
+        /// Gets whether control is in overflow state or not.
+        /// </summary>
+        [Browsable(false)]
+        public bool OverflowState
+        {
+            get
+            {
+                if (m_OverflowButton != null)
+                    return true;
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether ButtonItem objects hosted on control are resized to reduce the space consumed by ribbon bar when required.
+        /// Default value is true.
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Behavior"), Description("Indicates whether ButtonItem objects hosted on control are resized to reduce the space consumed by ribbon bar when required.")]
+        public bool AutoSizeItems
+        {
+            get
+            {
+                return m_AutoSizeItems;
+            }
+            set
+            {
+                m_AutoSizeItems = value;
+            }
+        }
+
+		/// <summary>
+		/// Resets cached content size. Content size is cached to improve performance of the control when control is
+		/// switched into overflow mode displaying a single button. If you change content of Rendering, hide/show items or
+		/// add new items you will need to call this method to erase cached value and allow the full Rendering size to be calculated.
+		/// </summary>
+		public void ResetCachedContentSize()
+		{
+			m_BeforeOverflowSize=Size.Empty;
+		}
+
+        /// <summary>
+        /// Returns size of the control based on current content size.
+        /// </summary>
+        /// <returns>Size based on content.</returns>
+        internal Size GetContentBasedSize()
+        {
+            return GetControlSize(new Size(m_ItemContainer.WidthInternal, m_ItemContainer.HeightInternal));
+        }
+
+        private bool _AutoSizeIncludesTitleEnabled = true;
+        private Size GetControlSize(Size innerContentSize)
+        {
+            ElementStyle style = GetBackgroundStyle();
+
+            if (_AutoSizeIncludesTitle && _AutoSizeIncludesTitleEnabled)
+            {
+                innerContentSize.Width = Math.Max(innerContentSize.Width, m_TitleElement.TextSize.Width + (m_DialogLauncherVisible ? 16 : 1));
+            }
+
+            Size size = new Size((innerContentSize.Width > 0 ? innerContentSize.Width : 32) + ElementStyleLayout.HorizontalStyleWhiteSpace(style),
+                innerContentSize.Height + ElementStyleLayout.VerticalStyleWhiteSpace(style));
+            if (m_TitleVisible && !this.OverflowState)
+            {
+                size.Height += m_TitleRectangle.Height;
+            }
+
+            if (BarFunctions.IsOffice2007Style(this.EffectiveStyle))
+            {
+                size.Width += 1;
+                size.Height += 4;
+            }
+
+            return size;
+        }
+
+        private bool _AutoSizeIncludesTitle = false;
+        /// <summary>
+        /// Indicates whether auto-sizing for RibbonBar includes ribbon bar title width so in case when ribbon bar title width is wider than ribbon bar width the 
+        /// width of the ribbon bar will always be at least the title bar width so complete title text can be displayed.
+        /// </summary>
+        [DefaultValue(false), Category("Behavior"), Description("Indicates whether auto-sizing for RibbonBar includes ribbon bar title width so in case when ribbon bar title width is wider than ribbon bar width the width of the ribbon bar will always be at least the title bar width so complete title text can be displayed.")]
+        public bool AutoSizeIncludesTitle
+        {
+            get { return _AutoSizeIncludesTitle; }
+            set
+            {
+                _AutoSizeIncludesTitle = value;
+            }
+        }
+        
+
+        internal Size GetFullContentBasedSize()
+        {
+            if (!m_FullItemsSize.IsEmpty)
+                return GetControlSize(m_FullItemsSize);
+            else
+                return GetContentBasedSize();
+        }
+
+		/// <summary>
+		/// Sets the height of the control to the automatically calculated height based on content.
+		/// </summary>
+		public override void AutoSyncSize()
+		{
+			if(!this.AutoSize || this.OverflowState)
+				return;
+			if(m_ItemContainer.NeedRecalcSize)
+				return;
+
+            this.Height = GetContentBasedSize().Height;
+		}
+
+        /// <summary>
+        /// Returns automatically calculated height of the control given current content.
+        /// </summary>
+        /// <returns>Height in pixels.</returns>
+        public override int GetAutoSizeHeight()
+        {
+            return GetContentBasedSize().Height;
+        }
+
+        /// <summary>
+        /// Returns automatically calculated width of the control given current content.
+        /// </summary>
+        /// <returns>Width in pixels.</returns>
+        public int GetAutoSizeWidth()
+        {
+            return GetContentBasedSize().Width;
+        }
+
+		protected override Rectangle GetItemContainerRectangle()
+		{
+			Rectangle r=base.GetItemContainerRectangle();
+            //r.Inflate(-2, 0);
+            if (m_TitleVisible &&!this.OverflowState)
+            {
+                Rectangle rTitle = GetTitleRectangle();
+                if (m_TitlePosition == eRibbonTitlePosition.Top)
+                {
+                    rTitle.Height++;
+                    r.Y += rTitle.Height;
+                    r.Height -= rTitle.Height;
+                }
+                else
+                {
+                    //rTitle.Height++;
+                    r.Height -= rTitle.Height;
+                }
+            }
+
+			return r;
+		}
+
+		private Rectangle GetBackgroundRectangle()
+		{
+			Rectangle r=this.ClientRectangle;
+			
+            //Rectangle rTitle=GetTitleRectangle();
+            //if (m_TitlePosition == eRibbonTitlePosition.Top)
+            //{
+            //    rTitle.Height++;
+            //    r.Y += rTitle.Height;
+            //    r.Height -= rTitle.Height;
+            //}
+            //else
+            //{
+            //    rTitle.Height++;
+            //    r.Height -= rTitle.Height;
+            //}
+			
+			return r;
+		}
+
+        /// <summary>
+        /// Gets the bounds of the title. 
+        /// </summary>
+		public Rectangle GetTitleRectangle()
+		{
+			return m_TitleRectangle;
+		}
+
+#if FRAMEWORK20
+        public override Rectangle DisplayRectangle
+        {
+            get
+            {
+                Rectangle r = this.ClientRectangle;
+                if (!m_TitleRectangle.IsEmpty && m_TitleVisible)
+                {
+                    if (m_TitlePosition == eRibbonTitlePosition.Top)
+                    {
+                        r.Y += m_TitleRectangle.Height;
+                        r.Height -= m_TitleRectangle.Height;
+                    }
+                    else
+                        r.Height -= m_TitleRectangle.Height;
+                }
+
+                return r;
+            }
+        }
+#endif
+		#endregion
+
+		#region Display Support
+		/// <summary>
+		/// Gets/Sets the visual style for items and color scheme.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),Category("Appearance"),Description("Specifies the visual style of the control.")]
+		public eDotNetBarStyle Style
+		{
+			get
+			{
+				return m_ItemContainer.Style;
+			}
+			set
+			{
+                m_ItemContainer.Style = value;
+                this.ColorScheme.Style = m_ItemContainer.EffectiveStyle;
+				this.Invalidate();
+				this.RecalcLayout();
+			}
+		}
+
+        internal eDotNetBarStyle EffectiveStyle
+        {
+            get
+            {
+                return m_ItemContainer.EffectiveStyle;
+            }
+        }
+
+        protected override Font GetKeyTipFont()
+        {
+            RibbonControl rc = this.GetRibbonControl();
+            if (rc!=null)
+            {
+                RibbonStrip rs = rc.RibbonStrip;
+                if (rs.KeyTipsFont != null)
+                    return rs.KeyTipsFont;
+            }
+
+            return base.GetKeyTipFont();
+        }
+
+        protected override bool NeedsTopLevelKeyTipCanvasParent
+        {
+            get
+            {
+                if (this.DialogLauncherVisible && this.DialogLauncherKeyTip != "")
+                    return true;
+                return false;
+            }
+        }
+
+        internal override void PaintContainerKeyTips(BaseItem container, Rendering.BaseRenderer renderer, KeyTipsRendererEventArgs e)
+        {
+            base.PaintContainerKeyTips(container, renderer, e);
+
+            if (this.DialogLauncherVisible && this.DialogLauncherKeyTip != "")
+            {
+                string stack = ((IKeyTipsControl)this).KeyTipsKeysStack;
+                string keyTip = this.DialogLauncherKeyTip;
+                if (stack != "" && !keyTip.StartsWith(stack))
+                    return;
+                e.ReferenceObject = this;
+                e.KeyTip = keyTip;
+
+                Size padding = KeyTipsPainter.KeyTipsPadding;
+                Size size = TextDrawing.MeasureString(e.Graphics, keyTip, e.Font);
+                size.Width += padding.Width;
+                size.Height += padding.Height;
+                Rectangle r = new Rectangle(this.Width - size.Width, this.Height + 4, size.Width, size.Height);
+                e.Bounds = r;
+                renderer.DrawKeyTips(e);
+            }
+        }
+
+        private string _DialogLauncherKeyTip = "";
+        /// <summary>
+        /// Gets or sets the KeyTip for the dialog launcher button.
+        /// </summary>
+        [DefaultValue(""), Category("Behavior"), Description("Indicates KeyTip for the dialog launcher button.")]
+        public string DialogLauncherKeyTip
+        {
+            get { return _DialogLauncherKeyTip; }
+            set
+            {
+                if (value == null) value = "";
+                _DialogLauncherKeyTip = value;
+            }
+        }
+        
+
+        //protected override void PaintKeyTips(Graphics g)
+        //{
+        //    base.PaintKeyTips(g);
+        //    if (this.ShowKeyTips && this.DialogLauncherKeyTip != "" && this.DialogLauncherKeyTip!=null)
+        //    {
+        //        char c = NativeFunctions.GetAccessKey(this.Text);
+        //        if (c == char.MinValue)
+        //            return;
+
+        //        string keyTip = c.ToString().ToUpper();
+        //        if (keyTip != "")
+        //        {
+        //            KeyTipsRendererEventArgs e = new KeyTipsRendererEventArgs(g, Rectangle.Empty, keyTip, GetKeyTipFont(), this);
+
+        //            Size padding = KeyTipsPainter.KeyTipsPadding;
+        //            Size size = TextDrawing.MeasureString(g, keyTip, e.Font);
+        //            size.Width += padding.Width;
+        //            size.Height += padding.Height;
+        //            Rectangle r = new Rectangle((this.Width - size.Width),
+        //                this.Height-2 /*m_TitleRectangle.Height / 2*/,
+        //                size.Width, size.Height);
+
+        //            e.Bounds = r;
+
+        //            this.GetRenderer().DrawKeyTips(e);
+        //        }
+        //    }
+        //}
+
+        protected override Rectangle GetKeyTipCanvasBounds()
+        {
+            RibbonControl rc = this.GetRibbonControl();
+            if (rc != null)
+            {
+                Point p = rc.PointToClient(this.PointToScreen(Point.Empty));
+                return new Rectangle(p.X, p.Y - 8, this.Bounds.Width+12, this.Bounds.Height + 20);
+            }
+            else
+                return new Rectangle(0, 0, this.Width, this.Height);
+        }
+
+        protected override Rectangle GetKeyTipRectangle(Graphics g, BaseItem item, Font font, string keyTip)
+        {
+            Size padding = KeyTipsPainter.KeyTipsPadding;
+            Size size = TextDrawing.MeasureString(g, keyTip, font);
+            size.Width += padding.Width;
+            size.Height += padding.Height;
+
+            Rectangle ib = GetItemClientRectangle(item);
+            Rectangle r = new Rectangle(ib.Right - size.Width - 1, ib.Bottom - size.Height+(int)(size.Height/3) + 8, size.Width, size.Height);
+
+            if (item == m_OverflowButton)
+            {
+                r.Y = this.Height - 2;
+                r.X = ib.X + (ib.Width - size.Width - 2) / 2;
+            }
+            else if (m_UseSpecKeyTipsPositioning)
+            {
+                if (item.HeightInternal * 1.2 >= m_ItemContainer.HeightInternal || item is GalleryContainer)
+                {
+                    r.Y = this.Height - size.Height - 5;
+                    if(item is GalleryContainer)
+                        r.X = ib.Right - (size.Width - 2) / 2;
+                    else
+                        r.X = ib.X + (ib.Width - size.Width - 2) / 2;
+                }
+                else if (ib.Bottom * 1.2 >= m_ItemContainer.HeightInternal)
+                    r.Y = this.Height - size.Height - 5;
+                else if (item.Parent is ItemContainer && ib.Y >= 0 && ib.Y <= 12)
+                    r.Y = 0;
+                else if (r.Bottom > this.Height)
+                    r.Y = this.Height - size.Height;
+                else if (ib.Y >= this.Height * .25)
+                    r.Y = (int)(this.Height * .4);
+            }
+            else if(item is GalleryContainer)
+                r.X = ib.Right - (size.Width - 2) / 2;
+
+            return r;
+        }
+
+        private Rectangle GetItemClientRectangle(BaseItem item)
+        {
+            Rectangle r = item.DisplayRectangle;
+            return r;
+        }
+
+        protected override bool ProcessMnemonic(BaseItem container, char charCode)
+        {
+            // Process mnemonic only if in KeyTips mode
+            if (this.Parent is IKeyTipsControl && !((IKeyTipsControl)this.Parent).ShowKeyTips)
+            {
+                return false;
+            }
+
+            bool ret = base.ProcessMnemonic(container, charCode);
+            if (!ret && this.DialogLauncherVisible && this.DialogLauncherKeyTip != "")
+            {
+                string stack = ((IKeyTipsControl)this).KeyTipsKeysStack;
+                string keyTipsString = stack + charCode.ToString();
+                keyTipsString = keyTipsString.ToUpper();
+                if (this.DialogLauncherKeyTip.ToUpper() == keyTipsString)
+                {
+                    this.DoLaunchDialog();
+                    ret = true;
+                }
+                else if (this.DialogLauncherKeyTip.ToUpper().StartsWith(keyTipsString))
+                {
+                    ((IKeyTipsControl)this).KeyTipsKeysStack += charCode.ToString().ToUpper();
+                }
+            }
+            return ret;
+        }
+
+		protected override void PaintControlBackground(ItemPaintArgs pa)
+		{
+            bool mouseOver = m_MouseOver;
+            bool fade = m_FadeImageState!=null;
+
+            if (fade)
+                mouseOver = false;
+            GraphicsPath insideClip = null;
+            ElementStyle backStyle = GetBackgroundStyle();
+            bool disposeBackStyle = fade;
+            try
+            {
+                if (backStyle != null)
+                {
+                    Rectangle r = GetBackgroundRectangle();
+                    pa.Graphics.SetClip(r, CombineMode.Replace);
+                    ElementStyle mouseOverStyle = GetBackgroundMouseOverStyle();
+                    if (mouseOver && backStyle != null && mouseOverStyle != null && mouseOverStyle.Custom)
+                    {
+                        backStyle = backStyle.Copy();
+                        disposeBackStyle = true;
+                        backStyle.ApplyStyle(mouseOverStyle);
+                    }
+
+                    ElementStyleDisplayInfo displayInfo = new ElementStyleDisplayInfo(backStyle, pa.Graphics, r, EffectiveStyle == eDotNetBarStyle.Office2007);
+                    ElementStyleDisplay.Paint(displayInfo);
+                    pa.Graphics.ResetClip();
+                    displayInfo.Bounds = GetBackgroundRectangle();
+                    // Adjust so the title shows over the inside light border line
+                    displayInfo.Bounds.X--;
+                    displayInfo.Bounds.Width++;
+                    insideClip = ElementStyleDisplay.GetInsideClip(displayInfo);
+                    displayInfo.Bounds.X++;
+                    displayInfo.Bounds.Width--;
+                }
+
+                if (insideClip != null)
+                    pa.Graphics.SetClip(insideClip, CombineMode.Replace);
+
+                m_DialogLauncherRect = Rectangle.Empty;
+
+                if (m_TitleVisible && !this.OverflowState)
+                {
+                    ElementStyle style = GetTitleStyle();
+                    ElementStyle styleMouseOver = GetTitleMouseOverStyle();
+                    if (mouseOver && style != null && styleMouseOver != null && styleMouseOver.Custom)
+                    {
+                        style = style.Copy();
+                        style.ApplyStyle(styleMouseOver);
+                    }
+
+                    if (style != null)
+                    {
+                        SimpleNodeDisplayInfo info = new SimpleNodeDisplayInfo(style, pa.Graphics, m_TitleElement, this.Font, (this.RightToLeft == RightToLeft.Yes));
+                        if (m_DialogLauncherVisible)
+                        {
+                            if (m_DialogLauncherButton == null)
+                            {
+                                Rectangle textRect = m_TitleElement.TextBounds;
+                                textRect.Width -= m_TitleRectangle.Height;
+                                if (this.RightToLeft == RightToLeft.Yes)
+                                    textRect.X += m_TitleRectangle.Height;
+                                info.TextBounds = textRect;
+                            }
+                            else
+                            {
+                                if (m_MouseOverDialogLauncher && m_DialogLauncherMouseOverButton != null)
+                                    m_TitleElement.Image = m_DialogLauncherMouseOverButton;
+                                else
+                                    m_TitleElement.Image = m_DialogLauncherButton;
+                            }
+                        }
+
+                        SimpleNodeDisplay.Paint(info);
+
+                        if (m_DialogLauncherVisible && m_TitleElement.Image == null)
+                            PaintDialogLauncher(pa);
+                        else
+                            m_DialogLauncherRect = m_TitleElement.ImageBounds;
+                    }
+                }
+
+                pa.Graphics.ResetClip();
+
+                m_FadeImageLock.AcquireReaderLock(-1);
+                try
+                {
+                    if (m_FadeImageState != null)
+                    {
+                        Graphics g = pa.Graphics;
+                        Rectangle r = new Rectangle(0, 0, this.Width, this.Height);
+
+                        System.Drawing.Imaging.ColorMatrix matrix1 = new System.Drawing.Imaging.ColorMatrix();
+                        matrix1[3, 3] = (float)((float)m_FadeAlpha / 255);
+                        using (System.Drawing.Imaging.ImageAttributes imageAtt = new System.Drawing.Imaging.ImageAttributes())
+                        {
+                            imageAtt.SetColorMatrix(matrix1);
+
+                            g.DrawImage(m_FadeImageState, r, 0, 0, r.Width, r.Height, GraphicsUnit.Pixel, imageAtt);
+                        }
+                        return;
+                    }
+                }
+                finally
+                {
+                    m_FadeImageLock.ReleaseReaderLock();
+                }
+            }
+            finally
+            {
+                if (insideClip != null) insideClip.Dispose();
+                if (disposeBackStyle && backStyle != null) backStyle.Dispose();
+            }
+		}
+
+		private void PaintDialogLauncher(ItemPaintArgs pa)
+		{
+			Rectangle r=new Rectangle(m_TitleRectangle.Right-(m_TitleRectangle.Height-5)-3,m_TitleRectangle.Y+2,
+                m_TitleRectangle.Height-5,m_TitleRectangle.Height-5);
+            if (this.RightToLeft == RightToLeft.Yes)
+                r.X = m_TitleRectangle.X;
+			Graphics g=pa.Graphics;
+
+            if (BarFunctions.IsOffice2007Style(this.EffectiveStyle))
+            {
+                int ds = Dpi.Height((int)Math.Min(15, m_TitleRectangle.Height - 1));
+                r = new Rectangle(m_TitleRectangle.Right - ds - 2, m_TitleRectangle.Y + (m_TitleRectangle.Height-ds)/2, ds, ds);
+                if (this.RightToLeft == RightToLeft.Yes)
+                    r.X = m_TitleRectangle.X+2;
+
+                RibbonBarRendererEventArgs e = new RibbonBarRendererEventArgs(g, r, this);
+                if (m_MouseOverDialogLauncher)
+                {
+                    if (Control.MouseButtons == MouseButtons.Left)
+                        e.Pressed = true;
+                    else
+                        e.MouseOver = true;
+                }
+                this.GetRenderer().DrawRibbonDialogLauncher(e);
+                m_DialogLauncherRect = r;
+                return;
+            }
+
+			if(this.AntiAlias)
+				g.SmoothingMode=System.Drawing.Drawing2D.SmoothingMode.Default; // AntiAlias;
+
+			using(LinearGradientBrush brush=DisplayHelp.CreateLinearGradientBrush(r,ControlPaint.LightLight(pa.Colors.BarBackground),pa.Colors.BarBackground,90))
+			{
+				g.FillRectangle(brush,r);
+			}
+
+			Rectangle rDot=new Rectangle(r.X+(int)Math.Ceiling((float)(r.Width-8)/2),r.Bottom-4,2,2);
+			g.FillRectangle(SystemBrushes.ControlText,rDot);
+			rDot.Offset(rDot.Width+1,0);
+			g.FillRectangle(SystemBrushes.ControlText,rDot);
+			rDot.Offset(rDot.Width+1,0);
+			g.FillRectangle(SystemBrushes.ControlText,rDot);
+
+			if(this.AntiAlias)
+				g.SmoothingMode=System.Drawing.Drawing2D.SmoothingMode.AntiAlias;
+
+			m_DialogLauncherRect=r;
+		}
+
+        /// <summary>
+        /// Gets or sets whether ribbon bar title is visible. Default value is true.
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Appearance"), Description("Indicates whether ribbon bar title is visible")]
+        public bool TitleVisible
+        {
+            get { return m_TitleVisible; }
+            set
+            {
+                m_TitleVisible = value;
+                this.RecalcLayout();
+            }
+        }
+
+		/// <summary>
+		/// Specifies the style of the title of the control.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),Category("Style"),Description("Specifies the style of the title of the control"),DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+		public ElementStyle TitleStyle
+		{
+			get {return m_TitleStyle;}
+            //#if FRAMEWORK20
+            //set
+            //{
+            //    if (value == null)
+            //        throw new InvalidOperationException("Null is not valid value for this property.");
+            //    m_TitleStyle = value;
+            //}
+            //#endif
+		}
+
+		/// <summary>
+		/// Resets TitleStyle property to its default value. Used by Windows Forms designer for design-time support.
+		/// </summary>
+		public void ResetTitleStyle()
+		{
+			m_TitleStyle.StyleChanged-=new EventHandler(this.ElementStyleChanged);
+			m_TitleStyle=new ElementStyle();
+			m_TitleStyle.StyleChanged+=new EventHandler(this.ElementStyleChanged);
+            this.Invalidate();
+		}
+
+        /// <summary>
+        /// Specifies the style of the title of the control when mouse is over the control.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Category("Style"), Description("Specifies the style of the title of the control when mouse is over the control."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ElementStyle TitleStyleMouseOver
+        {
+            get { return m_TitleStyleMouseOver; }
+            //#if FRAMEWORK20
+            //set
+            //{
+            //    if (value == null)
+            //        throw new InvalidOperationException("Null is not valid value for this property.");
+            //    m_TitleStyleMouseOver = value;
+            //}
+            //#endif
+        }
+
+        /// <summary>
+        /// Resets TitleStyle property to its default value. Used by Windows Forms designer for design-time support.
+        /// </summary>
+        public void ResetTitleStyleMouseOver()
+        {
+            m_TitleStyleMouseOver.StyleChanged -= new EventHandler(this.ElementStyleChanged);
+            m_TitleStyleMouseOver = new ElementStyle();
+            m_TitleStyleMouseOver.StyleChanged += new EventHandler(this.ElementStyleChanged);
+            this.Invalidate();
+        }
+
+        /// <summary>
+        /// Gets the title bounds.
+        /// </summary>
+        internal Rectangle TitleRectangle
+        {
+            get { return m_TitleElement.Bounds; }
+        }
+
+		private void ElementStyleChanged(object sender, EventArgs e)
+		{
+			if(this.DesignMode)
+			{
+				this.RecalcLayout();
+			}
+		}
+		#endregion
+
+        #region Fade Background Effect Support
+        private Bitmap m_FadeImageState = null;
+        private int m_FadeDirection = 1;
+        private int m_FadeAlpha = 0;
+        private bool m_FadeAnimation = false;
+		private System.Threading.ReaderWriterLock m_FadeImageLock=new System.Threading.ReaderWriterLock();
+		private void SetMouseOver(bool value)
+		{
+			if (value != m_MouseOver)
+			{
+				bool fadeEnabled = IsFadeEnabled && this.Enabled && this.Visible && this.Width>0 && this.Height>0;
+				if (fadeEnabled)
+				{
+					bool createImage=false;
+                    bool erroredOut = false;
+                    try
+                    {
+                        m_FadeImageLock.AcquireReaderLock(-1);
+                        try
+                        {
+                            createImage = (m_FadeImageState == null);
+                        }
+                        finally
+                        {
+                            m_FadeImageLock.ReleaseReaderLock();
+                        }
+
+                        if (createImage)
+                        {
+                            m_MouseOver = true;
+
+                            bool readerLockHeld = m_FadeImageLock.IsReaderLockHeld;
+                            System.Threading.LockCookie cookie1 = new System.Threading.LockCookie();
+                            if (readerLockHeld)
+                            {
+                                cookie1 = m_FadeImageLock.UpgradeToWriterLock(-1);
+                            }
+                            else
+                            {
+                                m_FadeImageLock.AcquireWriterLock(-1);
+                            }
+
+                            try
+                            {
+                                m_FadeImageState = GetCurrentStateImage();
+                            }
+                            finally
+                            {
+                                if (readerLockHeld)
+                                {
+                                    m_FadeImageLock.DowngradeFromWriterLock(ref cookie1);
+                                }
+                                else
+                                {
+                                    m_FadeImageLock.ReleaseWriterLock();
+                                }
+                            }
+                        }
+                    }
+                    catch (ApplicationException)
+                    {
+                        erroredOut = true;
+                    }
+                    
+					m_FadeDirection = 1;
+                    
+					m_MouseOver = value;
+
+                    if (!erroredOut)
+                    {
+                        if (!m_MouseOver)
+                            m_FadeDirection = -1;
+                        else
+                            m_FadeAlpha = 10;
+
+                        FadeAnimator.Fade(this, new EventHandler(this.OnFadeChanged));
+                        m_FadeAnimation = true;
+                    }
+				}
+				else
+					m_MouseOver = value;
+			}
+		}
+
+		private void StopFade()
+		{
+			if (!m_FadeAnimation)
+				return;
+
+			m_FadeAnimation = false;
+			FadeAnimator.StopFade(this, new EventHandler(OnFadeChanged));
+            
+			bool disposeImage=false;
+			m_FadeImageLock.AcquireReaderLock(-1);
+			try
+			{
+				disposeImage=(m_FadeImageState != null);
+			}
+			finally
+			{
+				m_FadeImageLock.ReleaseReaderLock();
+			}
+			if (disposeImage)
+				DisposeFadeImage();
+
+			if (m_FadeAlpha > 230)
+				m_FadeAlpha = 255;
+			else if (m_FadeAlpha < 0)
+				m_FadeAlpha = 0;
+		}
+
+		private void DisposeFadeImage()
+		{
+			bool readerLockHeld = m_FadeImageLock.IsReaderLockHeld;
+			System.Threading.LockCookie cookie1 = new System.Threading.LockCookie();
+			
+			if (readerLockHeld)
+			{
+				cookie1 = m_FadeImageLock.UpgradeToWriterLock(-1);
+			}
+			else
+			{
+				m_FadeImageLock.AcquireWriterLock(-1);
+			}
+
+			try
+			{
+				m_FadeImageState.Dispose();
+				m_FadeImageState=null;
+			}
+			finally
+			{
+				if (readerLockHeld)
+				{
+					m_FadeImageLock.DowngradeFromWriterLock(ref cookie1);
+				}
+				else
+				{
+					m_FadeImageLock.ReleaseWriterLock();
+				}
+			}
+		}
+
+
+        private void OnFadeChanged(object sender, EventArgs e)
+        {
+            m_FadeAlpha += (m_FadeDirection * 65);
+
+            if (m_FadeDirection < 0 && m_FadeAlpha <= 0 || m_FadeDirection > 0 && m_FadeAlpha >= 255)
+            {
+                StopFade();
+            }
+
+            this.Invalidate();
+        }
+
+        private Bitmap GetCurrentStateImage()
+        {
+            Bitmap bitmap = new Bitmap(this.Width, this.Height, System.Drawing.Imaging.PixelFormat.Format32bppPArgb);
+            bitmap.MakeTransparent();
+            Graphics g = Graphics.FromImage(bitmap);
+
+            try
+            {
+                bool antiAlias = this.AntiAlias;
+                ColorScheme cs = this.GetColorScheme();
+
+                if (antiAlias)
+                {
+                    g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.AntiAlias;
+                    g.TextRenderingHint = DisplayHelp.AntiAliasTextRenderingHint;
+                }
+
+                ItemPaintArgs pa = GetItemPaintArgs(g);
+                this.PaintControlBackground(pa);
+            }
+            finally
+            {
+                g.Dispose();
+            }
+            return bitmap;
+        }
+
+        protected override void OnHandleDestroyed(EventArgs e)
+        {
+            StopFade();
+            base.OnHandleDestroyed(e);
+        }
+
+        protected override void OnVisibleChanged(EventArgs e)
+        {
+            if (!this.Visible)
+            {
+                StopFade();
+                if (this.IsOverflowRibbon)
+                    ((IOwner)this).OnApplicationDeactivate();
+            }
+            base.OnVisibleChanged(e);
+        }
+        #endregion
+
+        #region Licensing
+
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            ColorScheme cs = this.GetColorScheme();
+			m_TitleStyle.SetColorScheme(cs);
+            m_TitleStyleMouseOver.SetColorScheme(cs);
+            m_BackgroundMouseOverStyle.SetColorScheme(cs);
+
+            InitDefaultStyles();
+            //if (this.Parent.Controls.IndexOf(this) == 1)
+            //{
+            //    e.Graphics.ResetClip();
+            //    e.Graphics.FillRectangle(Brushes.Red, this.ClientRectangle);
+            //    return;
+            //}
+            base.OnPaint(e);
+
+            #if !TRIAL
+            if (NativeFunctions.keyValidated2 != 266)
+                TextDrawing.DrawString(e.Graphics, "Invalid License", this.Font, Color.FromArgb(180, Color.Red), this.ClientRectangle, eTextFormat.Bottom | eTextFormat.HorizontalCenter);
+            #else
+            if (NativeFunctions.ColorExpAlt() || !NativeFunctions.CheckedThrough)
+		    {
+			    e.Graphics.Clear(SystemColors.Control);
+                return;
+            }
+            #endif
+        }
+
+#if !TRIAL
+        private string m_LicenseKey = "";
+        [Browsable(false), DefaultValue("")]
+        public string LicenseKey
+        {
+            get { return m_LicenseKey; }
+            set
+            {
+                if (NativeFunctions.ValidateLicenseKey(value))
+                    return;
+                m_LicenseKey = (!NativeFunctions.CheckLicenseKey(value) ? "9dsjkhds7" : value);
+            }
+        }
+#endif
+        #endregion
+
+        #region Misc Properties
+        /// <summary>
+        /// Gets or sets whether control changes its background when mouse is over the control.
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Appearance"), Description("Indicates whether control changes its background when mouse is over the control.")]
+        public bool BackgroundHoverEnabled
+        {
+            get { return m_BackgroundHoverEnabled; }
+            set { m_BackgroundHoverEnabled = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether external ButtonItem object is accepted in drag and drop operation. UseNativeDragDrop must be set to true in order for this property to be effective.
+        /// </summary>
+        [Browsable(true), DefaultValue(false), Category("Behavior"), Description("Gets or sets whether external ButtonItem object is accepted in drag and drop operation.")]
+        public override bool AllowExternalDrop
+        {
+            get { return base.AllowExternalDrop; }
+            set { base.AllowExternalDrop = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether native .NET Drag and Drop is used by control to perform drag and drop operations. AllowDrop must be set to true to allow drop of the items on control.
+        /// </summary>
+        [Browsable(true), DefaultValue(false), Category("Behavior"), Description("Specifies whether native .NET Drag and Drop is used by control to perform drag and drop operations.")]
+        public override bool UseNativeDragDrop
+        {
+            get { return base.UseNativeDragDrop; }
+            set { base.UseNativeDragDrop = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether automatic drag & drop support is enabled. Default value is false.
+        /// </summary>
+        [Browsable(true), DefaultValue(false), Category("Behavior"), Description("Specifies whether automatic drag & drop support is enabled.")]
+        public virtual bool EnableDragDrop
+        {
+            get { return m_EnableDragDrop; }
+            set { m_EnableDragDrop = value; }
+        }
+
+        ///// <summary>
+        ///// Gets or sets the Bar back color.
+        ///// </summary>
+        //[Browsable(true), DevCoBrowsable(true), Category("Appearance"), Description("Specifies background color of the Bar."), DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
+        //public override Color BackColor
+        //{
+        //    get
+        //    {
+        //        return base.BackColor;
+        //    }
+        //    set
+        //    {
+        //        base.BackColor = value;
+        //    }
+        //}
+        //[System.ComponentModel.Browsable(false), System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+        //public override void ResetBackColor()
+        //{
+        //    base.BackColor = Color.Transparent;
+        //}
+        //public bool ShouldSerializeBackColor()
+        //{
+        //    return base.BackColor != Color.Transparent;
+        //}
+
+        #endregion
+    }
+
+    #region OverflowButton Event Code
+    /// <summary>
+    /// Defines event handler for overflow button events.
+    /// </summary>
+    /// <param name="sender">Control that is hosting the overflow button.</param>
+    /// <param name="e">Event arguments</param>
+    public delegate void OverflowButtonEventHandler(object sender, OverflowButtonEventArgs e);
+
+    /// <summary>
+    /// Represents event arguments for overflow button events.
+    /// </summary>
+    public class OverflowButtonEventArgs : EventArgs
+    {
+        private readonly ButtonItem m_OverflowButton;
+
+        /// <summary>
+        /// Creates new instance of the class and initializes it.
+        /// </summary>
+        /// <param name="ob">Reference to overflow button.</param>
+        public OverflowButtonEventArgs(ButtonItem ob)
+        {
+            m_OverflowButton = ob;
+        }
+
+        /// <summary>
+        /// Returns reference to the overflow button that is used by control.
+        /// </summary>
+        public ButtonItem OverflowButton
+        {
+            get { return m_OverflowButton; }
+        }
+    }
+    #endregion
+
+    #region RibbonBarAccessibleObject
+    /// <summary>
+    /// Represents class for RibbonBar Accessibility support.
+    /// </summary>
+    public class RibbonBarAccessibleObject : ItemControlAccessibleObject
+    {
+        /// <summary>
+        /// Creates new instance of the object and initializes it with owner control.
+        /// </summary>
+        /// <param name="owner">Reference to owner control.</param>
+        public RibbonBarAccessibleObject(ItemControl owner)
+            : base(owner) { }
+
+        /// <summary>
+        /// Returns number of child objects.
+        /// </summary>
+        /// <returns>Total number of child objects.</returns>
+        public override int GetChildCount()
+        {
+            int count = base.GetChildCount();
+            if (this.Owner is RibbonBar && ((RibbonBar)this.Owner).DialogLauncherVisible)
+                count++;
+            return count;
+        }
+
+        /// <summary>
+        /// Returns reference to child object given the index.
+        /// </summary>
+        /// <param name="iIndex">0 based index of child object.</param>
+        /// <returns>Reference to child object.</returns>
+        public override System.Windows.Forms.AccessibleObject GetChild(int iIndex)
+        {
+            RibbonBar bar = this.Owner as RibbonBar;
+            if (bar != null && bar.DialogLauncherVisible && iIndex == GetChildCount() - 1)
+            {
+                return new DialogLauncherAccessibleObject(bar);
+            }
+
+            return base.GetChild(iIndex);
+        }
+    }
+    #endregion
+
+    #region DialogLauncherAccessibleObject
+    public class DialogLauncherAccessibleObject : System.Windows.Forms.AccessibleObject
+    {
+        private RibbonBar m_Owner = null;
+        private bool m_Hot = false;
+
+        public DialogLauncherAccessibleObject(RibbonBar owner)
+        {
+            m_Owner = owner;
+            m_Owner.DialogLauncherMouseEnter += new EventHandler(OnMouseEnter);
+            m_Owner.DialogLauncherMouseLeave += new EventHandler(OnMouseLeave);
+        }
+
+        private void OnMouseEnter(object sender, System.EventArgs e)
+        {
+            m_Hot = true;
+        }
+
+        private void OnMouseLeave(object sender, System.EventArgs e)
+        {
+            m_Hot = false;
+        }
+
+        public override string Name
+        {
+            get
+            {
+                if (m_Owner == null)
+                    return "";
+
+                if (m_Owner.DialogLauncherAccessibleName != "")
+                    return m_Owner.DialogLauncherAccessibleName;
+
+                if (m_Owner.Text != null)
+                    return m_Owner.Text.Replace("&", "");
+
+                return "";
+            }
+            set
+            {
+                m_Owner.DialogLauncherAccessibleName = value;
+            }
+        }
+
+        public override string Description
+        {
+            get
+            {
+                return m_Owner.Text + " Dialog Launcher";
+            }
+        }
+
+        public override System.Windows.Forms.AccessibleRole Role
+        {
+            get
+            {
+                if (m_Owner == null || !m_Owner.IsAccessible)
+                    return System.Windows.Forms.AccessibleRole.None;
+
+                return System.Windows.Forms.AccessibleRole.PushButton;
+            }
+        }
+
+        public override System.Windows.Forms.AccessibleStates State
+        {
+            get
+            {
+                if (m_Owner == null)
+                    return System.Windows.Forms.AccessibleStates.Unavailable;
+
+                System.Windows.Forms.AccessibleStates state = 0;
+
+                if (!m_Owner.IsAccessible)
+                    return System.Windows.Forms.AccessibleStates.Unavailable;
+
+                if (!m_Owner.Visible)
+                    state |= System.Windows.Forms.AccessibleStates.Invisible;
+                else if (!m_Owner.Enabled)
+                {
+                    return System.Windows.Forms.AccessibleStates.Unavailable;
+                }
+                else
+                {
+					#if FRAMEWORK20
+                    state |= AccessibleStates.HasPopup;
+					#endif
+                    if (m_Hot)
+                        state |= (System.Windows.Forms.AccessibleStates.Focused | System.Windows.Forms.AccessibleStates.HotTracked);
+                    else
+                        state |= System.Windows.Forms.AccessibleStates.Focusable;
+                }
+                return state;
+            }
+        }
+
+        public override System.Windows.Forms.AccessibleObject Parent
+        {
+            get { if (m_Owner == null) return null; return m_Owner.AccessibilityObject; }
+        }
+
+        public override System.Drawing.Rectangle Bounds
+        {
+            get
+            {
+                if (m_Owner == null)
+                    return System.Drawing.Rectangle.Empty;
+
+                return m_Owner.RectangleToScreen(m_Owner.DialogLauncherRect);
+            }
+        }
+
+        public override int GetChildCount()
+        {
+            return 0;
+        }
+
+        public override System.Windows.Forms.AccessibleObject GetChild(int iIndex)
+        {
+            return null;
+        }
+
+        public override string DefaultAction
+        {
+            get
+            {
+                return "Press";
+            }
+        }
+
+        public override void DoDefaultAction()
+        {
+            if (m_Owner == null)
+                return;
+
+            m_Owner.DoLaunchDialog(); 
+            base.DoDefaultAction();
+        }
+
+        public override string KeyboardShortcut
+        {
+            get
+            {
+                return "";
+            }
+        }
+
+        public override System.Windows.Forms.AccessibleObject GetSelected()
+        {
+            if (m_Owner == null)
+                return base.GetSelected();
+
+            if (m_Hot)
+                return this;
+            
+            return base.GetSelected();
+        }
+
+        public override System.Windows.Forms.AccessibleObject HitTest(int x, int y)
+        {
+            if (m_Owner == null)
+                return base.HitTest(x, y);
+
+            Point screen = new Point(x, y);
+            Point p = m_Owner.PointToClient(screen);
+            if (m_Owner.DialogLauncherRect.Contains(p))
+                return this;
+
+            return base.HitTest(x, y);
+        }
+
+        public override System.Windows.Forms.AccessibleObject Navigate(System.Windows.Forms.AccessibleNavigation navdir)
+        {
+            return base.Navigate(navdir);
+        }
+    }
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/Ribbon/RibbonBar.ico b/PROMS/DotNetBar Source Code/Ribbon/RibbonBar.ico
new file mode 100644
index 00000000..82e90054
Binary files /dev/null and b/PROMS/DotNetBar Source Code/Ribbon/RibbonBar.ico differ
diff --git a/PROMS/DotNetBar Source Code/Ribbon/RibbonBarMergeContainer.cs b/PROMS/DotNetBar Source Code/Ribbon/RibbonBarMergeContainer.cs
new file mode 100644
index 00000000..b88781b1
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Ribbon/RibbonBarMergeContainer.cs	
@@ -0,0 +1,320 @@
+using System;
+using System.Text;
+using System.Windows.Forms;
+using System.Collections;
+using System.ComponentModel;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represents the container for RibbonBar objects that will be merged into the MDI parent ribbon control.
+    /// </summary>
+    [ToolboxBitmap(typeof(RibbonBarMergeContainer), "Ribbon.RibbonControl.ico"), ToolboxItem(true), Designer("DevComponents.DotNetBar.Design.RibbonBarMergeContainerDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf"), System.Runtime.InteropServices.ComVisible(false)]
+    public class RibbonBarMergeContainer : RibbonPanel
+    {
+        #region Private variables
+        private bool m_AutoActivateTab = true;
+        private string m_RibbonTabText = "";
+        private string m_MergeIntoRibbonTabItemName = "";
+        private ArrayList m_MergedRibbonBarsList = new ArrayList();
+        private bool m_RibbonTabItemCreated = false;
+        private bool m_PreMergedVisibleState = false;
+        private bool m_AllowMerge = true;
+        private string m_MergeRibbonGroupName = "";
+        private int m_MergeRibbonTabItemIndex = -1;
+        private eRibbonTabColor m_RibbonTabColorTable = eRibbonTabColor.Default;
+        #endregion
+
+        #region Events
+        /// <summary>
+        /// Occurs before the RibbonBar objects from container are merged into the Ribbon control.
+        /// </summary>
+        public event EventHandler BeforeRibbonMerge;
+        /// <summary>
+        /// Occurs after the RibbonBar objects are merged into the Ribbon control.
+        /// </summary>
+        public event EventHandler AfterRibbonMerge;
+
+        /// <summary>
+        /// Occurs after the RibbonBar objects are removed from the Ribbon control.
+        /// </summary>
+        public event EventHandler BeforeRibbonUnmerge;
+
+        /// Occurs before the RibbonBar objects are removed from the Ribbon control.
+        /// </summary>
+        public event EventHandler AfterRibbonUnmerge;
+        #endregion
+
+        #region Internal Implementation
+        /// <summary>
+        /// Gets whether RibbonBar controls are merged into the RibbonControl.
+        /// </summary>
+        public bool IsMerged
+        {
+            get
+            {
+                return m_MergedRibbonBarsList.Count > 0;
+            }
+        }
+        /// <summary>
+        /// Removes any RibbonBar objects that were merged into the Ribbon control.
+        /// </summary>
+        /// <param name="ribbon">Reference to ribbon control to remove RibbonBar objects from.</param>
+        public virtual void RemoveMergedRibbonBars(RibbonControl ribbon)
+        {
+            OnBeforeRibbonUnmerge(new EventArgs());
+            Control parent = null;
+            foreach (RibbonBar c in m_MergedRibbonBarsList)
+            {
+                if (c.Parent != null)
+                {
+                    if (parent == null)
+                    {
+                        parent = c.Parent;
+                        parent.SuspendLayout();
+                    }
+                    c.Parent.Controls.Remove(c);
+                }
+                this.Controls.Add(c);
+                c.Enabled = false; // Disable shortcuts
+            }
+
+            m_MergedRibbonBarsList.Clear();
+
+            if (parent != null)
+                parent.ResumeLayout();
+
+            if (m_RibbonTabItemCreated)
+            {
+                this.RibbonTabItem.Parent.SubItems.Remove(this.RibbonTabItem);
+                if (this.RibbonTabItem.Panel != null && this.RibbonTabItem.Panel.Parent!=null)
+                {
+                    this.RibbonTabItem.Panel.Parent.Controls.Remove(this.RibbonTabItem.Panel);
+                }
+                this.RibbonTabItem.Panel.Dispose();
+                this.RibbonTabItem.Panel = null;
+                m_RibbonTabItemCreated = false;
+            }
+
+            this.RibbonTabItem = null;
+            if (this.Visible != m_PreMergedVisibleState)
+                this.Visible = m_PreMergedVisibleState;
+
+            OnAfterRibbonUnmerge(new EventArgs());
+        }
+
+        /// <summary>
+        /// Merges RibbonBar objects from this container into the Ribbon control.
+        /// </summary>
+        /// <param name="ribbon">Reference to ribbon control to remove RibbonBar objects from.</param>
+        public virtual void MergeRibbonBars(RibbonControl ribbon)
+        {
+            OnBeforeRibbonMerge(new EventArgs());
+            m_PreMergedVisibleState = this.Visible;
+            if (this.Visible) this.Visible = false;
+            RibbonTabItem tab = GetCreateRibbonTabItem(ribbon);
+            Control[] controls = new Control[this.Controls.Count];
+            this.Controls.CopyTo(controls, 0);
+            int xpos = tab.Panel.Width + 1;
+            tab.Panel.SuspendLayout();
+            foreach (Control c in controls)
+            {
+                if (c is RibbonBar)
+                {
+                    this.Controls.Remove(c);
+                    if (m_MergeIntoRibbonTabItemName.Length > 0 && !tab.Panel.DefaultLayout)
+                    {
+                        c.Left = xpos;
+                        xpos += c.Width;
+                    }
+                    tab.Panel.Controls.Add(c);
+                    c.Enabled = true;
+                    m_MergedRibbonBarsList.Add(c);
+                }
+            }
+            tab.Panel.ResumeLayout();
+            OnAfterRibbonMerge(new EventArgs());
+        }
+
+        private RibbonTabItem GetCreateRibbonTabItem(RibbonControl ribbon)
+        {
+            if (m_MergeIntoRibbonTabItemName != "")
+            {
+                if(ribbon.Items.IndexOf(m_MergeIntoRibbonTabItemName)<0)
+                    throw new NullReferenceException("MergeIntoRibbonTabItemName specified (" + m_MergeIntoRibbonTabItemName + ") cannot be found in RibbonControl.Items collection");
+                this.RibbonTabItem = ribbon.Items[m_MergeIntoRibbonTabItemName] as RibbonTabItem;
+
+                return this.RibbonTabItem;
+            }
+
+            string tabText = m_RibbonTabText;
+            if (tabText.Length == 0)
+                tabText = this.Name;
+            string tabName = (this.Parent != null ? this.Parent.Name + "." : "") + this.Name;
+            this.RibbonTabItem = ribbon.CreateRibbonTab(tabText, tabName, m_MergeRibbonTabItemIndex);
+            if (!string.IsNullOrEmpty(_RibbonTabKeyTips))
+                this.RibbonTabItem.KeyTips = _RibbonTabKeyTips;
+            this.RibbonTabItem.ColorTable = m_RibbonTabColorTable;
+            m_RibbonTabItemCreated = true;
+
+            if (m_MergeRibbonGroupName.Length > 0)
+            {
+                RibbonTabItemGroup group = ribbon.TabGroups[m_MergeRibbonGroupName];
+                if (group != null)
+                {
+                    int lastTabGroupIndex = -1;
+                    for (int i = 0; i < ribbon.Items.Count; i++)
+                    {
+                        if (ribbon.Items[i] is RibbonTabItem && ((RibbonTabItem)ribbon.Items[i]).Group == group)
+                            lastTabGroupIndex = i;
+                    }
+                    this.RibbonTabItem.Group = group;
+                    if (lastTabGroupIndex >= 0)
+                    {
+                        ribbon.Items.Remove(this.RibbonTabItem);
+                        ribbon.Items.Insert(lastTabGroupIndex + 1, this.RibbonTabItem);
+                    }
+                }
+            }
+
+            return this.RibbonTabItem;
+        }
+
+        /// <summary>
+        /// Gets or sets whether RibbonTab item the RibbonBar controls are added to when merged is automatically activated (selected) after
+        /// controls are merged. Default value is true.
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Behaviour"), Description("Indicates whether RibbonTab item the RibbonBar controls are added to when merged is automatically activated (selected) after controls are merged.")]
+        public bool AutoActivateTab
+        {
+            get { return m_AutoActivateTab; }
+            set { m_AutoActivateTab = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether merge functionality is enabled for the container. Default value is true.
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Behaviour"), Description("Indicates whether merge functionality is enabled for the container.")]
+        public bool AllowMerge
+        {
+            get { return m_AllowMerge; }
+            set { m_AllowMerge = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the Ribbon Tab text for the tab that will be created when ribbon bar objects from this container are merged into the ribbon.
+        /// </summary>
+        [Browsable(true), DefaultValue(""), Localizable(true), Category("Data"), Description("Indicates the Ribbon Tab text for the tab that will be created when ribbon bar objects from this container are merged into the ribbon.")]
+        public string RibbonTabText
+        {
+            get { return m_RibbonTabText; }
+            set 
+            { 
+                m_RibbonTabText = value;
+                if (this.IsMerged && this.RibbonTabItem != null)
+                    this.RibbonTabItem.Text = value;
+            }
+        }
+
+        private string _RibbonTabKeyTips = "";
+        /// <summary>
+        /// Gets or sets the Key Tips access key or keys for the Ribbon Tab. Use KeyTips property
+        /// when you want to assign the one or more letters to be used to access an item. For example assigning the FN to KeyTips property
+        /// will require the user to press F then N keys to select an item. Pressing the F letter will show only keytips for the items that start with letter F.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), DefaultValue(""), Description("Indicates the Key Tips access key or keys for the Ribbon Tab.")]
+        public virtual string RibbonTabKeyTips
+        {
+            get { return _RibbonTabKeyTips; }
+            set
+            {
+                if (value == null) value = "";
+                _RibbonTabKeyTips = value.ToUpper();
+                if (this.IsMerged && this.RibbonTabItem != null)
+                    this.RibbonTabItem.KeyTips = _RibbonTabKeyTips;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the predefined color for the ribbon tab that is created when ribbon bar controls are merged into the ribbon.
+        /// Default value is eRibbonTabColor.Default
+        /// </summary>
+        [Browsable(true), DefaultValue(eRibbonTabColor.Default), Category("Appearance"), Description("Indicates predefined color for the ribbon tab that is created when ribbon bar controls are merged into the ribbon.")]
+        public eRibbonTabColor RibbonTabColorTable
+        {
+            get { return m_RibbonTabColorTable; }
+            set { m_RibbonTabColorTable = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the name of RibbonTabItem object that already exists on Ribbon control into which the RibbonBar controls are merged.
+        /// If name is not specified new RibbonTabItem is created and RibbonBar controls are added to it.
+        /// </summary>
+        [Browsable(true), DefaultValue(""), Category("Data"), Description("Indicates the name of RibbonTabItem object that already exists on Ribbon control into which the RibbonBar controls are merged.")]
+        public string MergeIntoRibbonTabItemName
+        {
+            get { return m_MergeIntoRibbonTabItemName; }
+            set { m_MergeIntoRibbonTabItemName = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the name of the RibbonTabItemGroup the new Ribbon Tab Item that is created will be added to. The RibbonTabItemGroup
+        /// must be created and added to RibbonControl.TabGroups collection.
+        /// </summary>
+        [Browsable(true), DefaultValue(""), Category("Data"), Description("Indicates the name of the RibbonTabItemGroup the new Ribbon Tab Item that is created will be added to.")]
+        public string MergeRibbonGroupName
+        {
+            get { return m_MergeRibbonGroupName; }
+            set { m_MergeRibbonGroupName = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the insertion index for the ribbon tab item that is created when ribbon bars are merged into the ribbon control.
+        /// Default value is -1 which means that ribbon tab item is appended to the existing ribbon tab items.
+        /// </summary>
+        [Browsable(true), DefaultValue(-1), Category("Data"), Description("Indicates the insertion index for the ribbon tab item that is created when ribbon bars are merged into the ribbon control.")]
+        public int MergeRibbonTabItemIndex
+        {
+            get { return m_MergeRibbonTabItemIndex; }
+            set { m_MergeRibbonTabItemIndex = value; }
+        }
+
+        /// <summary>
+        /// Raises the BeforeRibbonMerge event.
+        /// </summary>
+        protected virtual void OnBeforeRibbonMerge(EventArgs e)
+        {
+            if (BeforeRibbonMerge != null)
+                BeforeRibbonMerge(this, e);
+        }
+
+        /// <summary>
+        /// Raises the AfterRibbonMerge event.
+        /// </summary>
+        protected virtual void OnAfterRibbonMerge(EventArgs e)
+        {
+            if (AfterRibbonMerge != null)
+                AfterRibbonMerge(this, e);
+        }
+
+        /// <summary>
+        /// Raises the BeforeRibbonUnmerge event.
+        /// </summary>
+        protected virtual void OnBeforeRibbonUnmerge(EventArgs e)
+        {
+            if (BeforeRibbonUnmerge != null)
+                BeforeRibbonUnmerge(this, e);
+        }
+
+        /// <summary>
+        /// Raises the AfterRibbonUnmerge event.
+        /// </summary>
+        protected virtual void OnAfterRibbonUnmerge(EventArgs e)
+        {
+            if (AfterRibbonUnmerge != null)
+                AfterRibbonUnmerge(this, e);
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Ribbon/RibbonClientPanel.bmp b/PROMS/DotNetBar Source Code/Ribbon/RibbonClientPanel.bmp
new file mode 100644
index 00000000..9e796826
Binary files /dev/null and b/PROMS/DotNetBar Source Code/Ribbon/RibbonClientPanel.bmp differ
diff --git a/PROMS/DotNetBar Source Code/Ribbon/RibbonClientPanel.cs b/PROMS/DotNetBar Source Code/Ribbon/RibbonClientPanel.cs
new file mode 100644
index 00000000..9fa9a3a7
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Ribbon/RibbonClientPanel.cs	
@@ -0,0 +1,59 @@
+using System;
+using System.Text;
+using System.ComponentModel;
+using System.Windows.Forms;
+using System.Drawing;
+using DevComponents.DotNetBar.Controls;
+
+namespace DevComponents.DotNetBar.Ribbon
+{
+    [ToolboxItem(true), Designer("DevComponents.DotNetBar.Design.RibbonClientPanelDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+    public class RibbonClientPanel : PanelControl
+    {
+        #region Private Variables
+        private bool m_IsShadowEnabled = true;
+        #endregion
+
+        #region Internal Implementation
+        /// <summary>
+        /// Gets or sets whether panel automatically provides shadows for child controls.
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Appearance"), Description("Indicates whether panel automatically provides shadows for child controls.")]
+        public bool IsShadowEnabled
+        {
+            get { return m_IsShadowEnabled; }
+            set
+            {
+                if (m_IsShadowEnabled != value)
+                {
+                    m_IsShadowEnabled = value;
+                    this.Invalidate();
+                }
+            }
+        }
+
+        protected override void PaintInnerContent(System.Windows.Forms.PaintEventArgs e, ElementStyle style, bool paintText)
+        {
+            base.PaintInnerContent(e, style, paintText);
+
+            if (!m_IsShadowEnabled) return;
+            Graphics g = e.Graphics;
+            ShadowPaintInfo pi = new ShadowPaintInfo();
+            pi.Graphics = g;
+            pi.Size = 6;
+            foreach (Control c in this.Controls)
+            {
+                if (!c.Visible || c.BackColor == Color.Transparent && !(c is GroupPanel)) continue;
+                if (c is GroupPanel)
+                {
+                    GroupPanel p = c as GroupPanel;
+                    pi.Rectangle = new Rectangle(c.Bounds.X, c.Bounds.Y + p.GetInternalClientRectangle().Y/2, c.Bounds.Width, c.Bounds.Height - p.GetInternalClientRectangle().Y/2);
+                }
+                else
+                    pi.Rectangle = c.Bounds;
+                ShadowPainter.Paint2(pi);
+            }
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Ribbon/RibbonControl.cs b/PROMS/DotNetBar Source Code/Ribbon/RibbonControl.cs
new file mode 100644
index 00000000..319d61ad
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Ribbon/RibbonControl.cs	
@@ -0,0 +1,3108 @@
+using System.Drawing;
+using System.Windows.Forms;
+using System.ComponentModel;
+using System.Drawing.Drawing2D;
+using System;
+using System.Collections;
+using System.Text;
+using DevComponents.DotNetBar.Rendering;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represents Rendering control composed of two parts, RibbonStrip and multiple RibbonBar controls per strip.
+    /// </summary>
+    [ToolboxBitmap(typeof(RibbonControl), "Ribbon.RibbonControl.ico"), ToolboxItem(true), Designer("DevComponents.DotNetBar.Design.RibbonControlDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf"), System.Runtime.InteropServices.ComVisible(false)]
+    public class RibbonControl : System.Windows.Forms.ContainerControl
+    {
+        #region Events
+        /// <summary>
+        /// Occurs when Quick Access Toolbar placement is changed, i.e. below or above the Ribbon.
+        /// </summary>
+        [Description("Occurs when Quick Access Toolbar placement is changed, i.e. below or above the Ribbon.")]
+        public event EventHandler QatPlacementChanged;
+        /// <summary>
+        /// Occurs just before the customize popup menu is displayed and provides the ability to cancel the menu display as well
+        /// as to add/remove the menu items from the customize popup menu.
+        /// </summary>
+        public event CustomizeMenuPopupEventHandler BeforeCustomizeMenuPopup;
+
+        /// <summary>
+        /// Occurs before an item is added to the quick access toolbar as result of user action. This event provides ability to
+        /// cancel the addition of the item by setting the Cancel=true of event arguments.
+        /// </summary>
+        public event CustomizeMenuPopupEventHandler BeforeAddItemToQuickAccessToolbar;
+
+        /// <summary>
+        /// Occurs before an item is removed from the quick access toolbar as result of user action. This event provides ability to
+        /// cancel the addition of the item by setting the Cancel=true of event arguments.
+        /// </summary>
+        public event CustomizeMenuPopupEventHandler BeforeRemoveItemFromQuickAccessToolbar;
+
+        /// <summary>
+        /// Occurs when DotNetBar is looking for translated text for one of the internal text that are
+        /// displayed on menus, toolbars and customize forms. You need to set Handled=true if you want
+        /// your custom text to be used instead of the built-in system value.
+        /// </summary>
+        public event DotNetBarManager.LocalizeStringEventHandler LocalizeString;
+
+        /// <summary>
+        /// Occurs when Item on ribbon tab strip or quick access toolbar is clicked.
+        /// </summary>
+        [Description("Occurs when Item on ribbon tab strip or quick access toolbar is clicked.")]
+        public event EventHandler ItemClick;
+
+        /// <summary>
+        /// Occurs before Quick Access Toolbar dialog is displayed. This event provides the opportunity to cancel the showing of
+        /// built-in dialog and display custom customization dialog. You can also set the Dialog property of the event arguments to
+        /// the custom dialog you want used instead of the DotNetBar system customization dialog.
+        /// </summary>
+        public event QatCustomizeDialogEventHandler BeforeQatCustomizeDialog;
+        /// <summary>
+        /// Occurs after the Quick Access Toolbar dialog is closed.
+        /// </summary>
+        public event QatCustomizeDialogEventHandler AfterQatCustomizeDialog;
+
+        /// <summary>
+        /// Occurs after any changes done on the Quick Access Toolbar dialog are applied to the actual Quick Access Toolbar.
+        /// </summary>
+        public event EventHandler AfterQatDialogChangesApplied;
+
+        /// <summary>
+        ///     Occurs after selected Ribbon tab has changed. You can use
+        ///     <see cref="SelectedRibbonTabItem">RibbonControl.SelectedRibbonTabItem</see>
+        ///     property to get reference to newly selected tab.
+        /// </summary>
+        public event EventHandler SelectedRibbonTabChanged;
+
+        /// <summary>
+        /// Occurs before selected RibbonPanel is displayed on popup while ribbon is collapsed. This event gives you the opportunity to cancel the popup of the ribbon panel.
+        /// </summary>
+        [Description("Occurs before selected RibbonPanel is displayed on popup while ribbon is collapsed.")]
+        public event CancelEventHandler BeforeRibbonPanelPopup;
+        /// <summary>
+        /// Occurs after selected RibbonPanel is displayed on popup while ribbon is collapsed.
+        /// </summary>
+        [Description("Occurs after selected RibbonPanel is displayed on popup while ribbon is collapsed.")]
+        public event EventHandler AfterRibbonPanelPopup;
+
+        /// <summary>
+        /// Occurs before RibbonPanel popup is closed and provides opportunity to cancel the closing. Note that if you cancel closing of ribbon popup you are
+        /// responsible for closing the popup.
+        /// </summary>
+        [Description("Occurs before RibbonPanel popup is closed.")]
+        public event RibbonPopupCloseEventHandler BeforeRibbonPanelPopupClose;
+
+        /// <summary>
+        /// Occurs after RibbonPanel popup is closed.
+        /// </summary>
+        [Description("Occurs after RibbonPanel popup is closed.")]
+        public event EventHandler AfterRibbonPanelPopupClose;
+
+        /// <summary>
+        /// Occurs when text markup link from TitleText markup is clicked. Markup links can be created using "a" tag, for example:
+        /// <a name="MyLink">Markup link</a>
+        /// </summary>
+        [Description("Occurs when text markup link from TitleText markup is clicked.")]
+        public event MarkupLinkClickEventHandler TitleTextMarkupLinkClick;
+
+        /// <summary>
+        /// Occurs after Expanded property has changed.
+        /// </summary>
+        [Description("Occurs after Expanded property has changed.")]
+        public event EventHandler ExpandedChanged;
+        #endregion
+
+        #region Private Variables and Constructor
+        private RibbonStrip m_RibbonStrip = null;
+        private bool m_Expanded = true;
+        //private int m_ExpandedHeight=0;
+        private bool m_MdiSystemItemVisible = true;
+        private Form m_ActiveMdiChild = null;
+        private bool m_MdiChildMaximized = false;
+        private bool m_AutoSize = false;
+        private ShadowPaintInfo m_ShadowPaintInfo = null;
+        private bool m_UseCustomizeDialog = true;
+        private bool m_EnableQatPlacement = true;
+
+        private eCategorizeMode m_CategorizeMode = eCategorizeMode.RibbonBar;
+        private Ribbon.QatToolbar m_QatToolbar = null;
+        private bool m_QatPositionedBelow = false;
+        private int DefaultBottomDockPadding = 3;
+        private Ribbon.SubItemsQatCollection m_QatSubItemsCollection = null;
+        private bool m_QatLayoutChanged = false;
+        private RibbonLocalization m_SystemText = new RibbonLocalization();
+        private Form m_PreviousMergedForm = null;
+        private bool m_AllowMerge = true;
+        private bool m_UseExternalCustomization = false;
+        private const string SYS_CUSTOMIZE_POPUP_MENU = "syscustomizepopupmenu";
+        private bool m_ExpandedQatBelowRibbon = false;
+        private int m_ExpandedQatHeight = 0;
+        private bool m_PopupMode = false;
+        private RibbonPanel m_PopupRibbonPanel = null;
+        private bool m_MenuTabsEnabled = true;
+        private ContextMenuBar m_GlobalContextMenuBar = null;
+        private SubItemsCollection m_QatFrequentCommands = new SubItemsCollection(null);
+
+        /// <summary>
+        /// Gets the name of the QAT Customize Item which is used to display the QAT Customize Dialog box.
+        /// </summary>
+        public static readonly string SysQatCustomizeItemName = "sysCustomizeQuickAccessToolbar";
+        /// <summary>
+        /// Gets the name of the Add to Quick Access Toolbar context menu item.
+        /// </summary>
+        public static readonly string SysQatAddToItemName = "sysAddToQuickAccessToolbar";
+        /// <summary>
+        /// Gets the name of the Remove from Quick Access Toolbar context menu item.
+        /// </summary>
+        public static readonly string SysQatRemoveFromItemName = "sysRemoveFromQuickAccessToolbar";
+        /// <summary>
+        /// Gets the name of the QAT placement change context menu item.
+        /// </summary>
+        public static readonly string SysQatPlaceItemName = "sysPlaceQuickAccessToolbar";
+        /// <summary>
+        /// Gets the name of the Minimize Ribbon Item which is used to minimize the ribbon.
+        /// </summary>
+        public static readonly string SysMinimizeRibbon = "sysMinimizeRibbon";
+        /// <summary>
+        /// Gets the name of the Maximize Ribbon Item which is used to maximize the ribbon.
+        /// </summary>
+        public static readonly string SysMaximizeRibbon = "sysMaximizeRibbon";
+        /// <summary>
+        /// Gets the name of the label displayed on Quick Access Toolbar customize popup menu.
+        /// </summary>
+        public static readonly string SysQatCustomizeLabelName = "sysCustomizeQuickAccessToolbarLabel";
+        /// <summary>
+        /// Gets the string that is used as starting name for the frequently used QAT menu items created when QAT Customize menu is displayed.
+        /// </summary>
+        public static readonly string SysFrequentlyQatNamePart = "sysQatFrequent_";
+
+        public RibbonControl()
+        {
+            // This forces the initialization out of paint loop which speeds up how fast components show up
+            BaseRenderer renderer = Rendering.GlobalManager.Renderer;
+
+            m_QatFrequentCommands.IgnoreEvents = true;
+            m_QatFrequentCommands.AllowParentRemove = false;
+
+            this.SetStyle(ControlStyles.AllPaintingInWmPaint
+                  | ControlStyles.ResizeRedraw
+                  | DisplayHelp.DoubleBufferFlag
+                  | ControlStyles.UserPaint
+                  | ControlStyles.Opaque
+                  , true);
+            m_RibbonStrip = new RibbonStrip();
+            m_RibbonStrip.Dock = DockStyle.Top;
+            m_RibbonStrip.Height = 32;
+            m_RibbonStrip.ItemAdded += new System.EventHandler(RibbonStripItemAdded);
+            m_RibbonStrip.SizeChanged += new System.EventHandler(RibbonStripSizeChanged);
+            m_RibbonStrip.ItemRemoved += new ItemControl.ItemRemovedEventHandler(RibbonStripItemRemoved);
+            m_RibbonStrip.LocalizeString += new DotNetBarManager.LocalizeStringEventHandler(RibbonStripLocalizeString);
+            m_RibbonStrip.ItemClick += new System.EventHandler(RibbonStripItemClick);
+            m_RibbonStrip.ButtonCheckedChanged += new EventHandler(RibbonStripButtonCheckedChanged);
+            m_RibbonStrip.TitleTextMarkupLinkClick += new MarkupLinkClickEventHandler(RibbonStripTitleTextMarkupLinkClick);
+            this.Controls.Add(m_RibbonStrip);
+            this.TabStop = false;
+            this.DockPadding.Bottom = DefaultBottomDockPadding;
+
+            StyleManager.Register(this);
+        }
+        protected override void Dispose(bool disposing)
+        {
+            StyleManager.Unregister(this);
+            ReleaseParentForm();
+            base.Dispose(disposing);
+        }
+        #endregion
+
+        #region Internal Implementation
+        /// <summary>
+        /// Called by StyleManager to notify control that style on manager has changed and that control should refresh its appearance if
+        /// its style is controlled by StyleManager.
+        /// </summary>
+        /// <param name="newStyle">New active style.</param>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void StyleManagerStyleChanged(eDotNetBarStyle newStyle)
+        {
+            SetStyle();
+        }
+
+        /// <summary>
+        /// Gets the collection of the Quick Access Toolbar Frequently used commands. You should add existing buttons to this collection that
+        /// you already have on the RibbonBar controls or on the application menu. The list will be used to construct the frequently used
+        /// menu that is displayed when Customize Quick Access Toolbar menu is displayed and it allows end-user to remove and add these
+        /// frequently used commands to the QAT directly from this menu.
+        /// Note that items you add here should not be items that are already on Quick Access Toolbar, i.e. in RibbonControl.QuickToolbarItems collection.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public SubItemsCollection QatFrequentCommands
+        {
+            get
+            {
+                return m_QatFrequentCommands;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether KeyTips functionality is enabled. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Browsable(true), Category("Behavior"), Description("Indicates whether KeyTips functionality is enabled.")]
+        public bool KeyTipsEnabled
+        {
+            get { return m_RibbonStrip.KeyTipsEnabled; }
+            set { m_RibbonStrip.KeyTipsEnabled = value; }
+        }
+
+        internal bool IsDesignMode
+        {
+            get { return this.DesignMode; }
+        }
+
+        protected virtual void OnSelectedRibbonTabChanged(EventArgs e)
+        {
+            if (SelectedRibbonTabChanged != null)
+                SelectedRibbonTabChanged(this, e);
+        }
+
+        void RibbonStripButtonCheckedChanged(object sender, EventArgs e)
+        {
+            if (sender is RibbonTabItem && ((RibbonTabItem)sender).Checked)
+            {
+                AutoSyncSize();
+                OnSelectedRibbonTabChanged(new EventArgs());
+            }
+        }
+
+        private void RibbonStripItemClick(object sender, System.EventArgs e)
+        {
+            if (ItemClick != null)
+                ItemClick(sender, e);
+        }
+
+        private void RibbonStripLocalizeString(object sender, LocalizeEventArgs e)
+        {
+            if (LocalizeString != null)
+                LocalizeString(this, e);
+        }
+
+        /// <summary>
+        /// Gets or sets whether merge functionality is enabled for the control. Default value is true.
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Behaviour"), Description("Indicates whether merge functionality is enabled for the control.")]
+        public bool AllowMerge
+        {
+            get { return m_AllowMerge; }
+            set { m_AllowMerge = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether control height is set automatically based on the content. Default value is false.
+        /// </summary>
+        [Browsable(false), Category("Layout"), Description("Indicates whether control height is set automatically."), DefaultValue(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+#if FRAMEWORK20
+        public override bool AutoSize
+#else
+        public virtual bool AutoSize
+#endif
+        {
+            get { return m_AutoSize; }
+            set
+            {
+                m_AutoSize = value;
+                OnAutoSizeChanged();
+            }
+        }
+        private void OnAutoSizeChanged()
+        {
+            AutoSyncSize();
+        }
+
+        /// <summary>
+        /// Sets the height of the control to the automatically calcualted height based on content.
+        /// </summary>
+        public virtual void AutoSyncSize()
+        {
+            AutoSyncSize(true);
+        }
+
+        private int m_SyncingSize = 0;
+        /// <summary>
+        /// Sets the height of the control to the automatically calcualted height based on content.
+        /// </summary>
+        private void AutoSyncSize(bool layoutSelectedPanel)
+        {
+            if (!m_AutoSize || m_SyncingSize > 0 || !BarFunctions.IsHandleValid(this))
+                return;
+
+            m_SyncingSize++;
+            try
+            {
+                RecalculateAutoSize(layoutSelectedPanel);
+            }
+            finally
+            {
+                m_SyncingSize--;
+            }
+        }
+
+        private int GetItemControlHeight(ItemControl c)
+        {
+            int height = c.GetAutoSizeHeight();
+#if FRAMEWORK20
+            if (!c.MinimumSize.IsEmpty && c.MinimumSize.Height > height)
+                height = (c.MinimumSize.Height + ElementStyleLayout.VerticalStyleWhiteSpace(c.GetPaintBackgroundStyle()));
+            else if (!c.MaximumSize.IsEmpty && height > c.MaximumSize.Height)
+                height = c.MaximumSize.Height + ElementStyleLayout.VerticalStyleWhiteSpace(c.GetPaintBackgroundStyle());
+#endif
+            return height;
+        }
+
+        private void RecalculateAutoSize()
+        {
+            RecalculateAutoSize(true);
+        }
+
+        private int GetAutoPanelHeight(RibbonPanel panel)
+        {
+            int height = 0;
+            if (panel == null) return height;
+            int maxHeight = 0;
+            foreach (Control c in panel.Controls)
+            {
+                ItemControl ic = c as ItemControl;
+                if (ic == null) continue;
+                int ah = ic.GetAutoSizeHeight();
+                if (ic != null && ah > maxHeight)
+                {
+                    int h = GetItemControlHeight(ic);
+                    if (h > maxHeight)
+                        maxHeight = h;
+                }
+            }
+
+            if (maxHeight > 0)
+                height += maxHeight;
+
+            return height;
+        }
+
+        private void RecalculateAutoSize(bool layoutSelectedPanel)
+        {
+            int height = m_RibbonStrip.Height;
+            if (this.Expanded)
+            {
+                if (this.SelectedRibbonTabItem != null)
+                {
+                    RibbonPanel panel = this.SelectedRibbonTabItem.Panel;
+                    if (panel != null)
+                    {
+                        int maxHeight = GetAutoPanelHeight(panel);
+
+                        if (maxHeight > 0)
+                            height += maxHeight;
+                        else
+                            height = 0;
+                    }
+                    else
+                        height = 0;
+                }
+                else
+                    height = 0;
+            }
+            else
+                height -= 4;
+
+            if (height > 0)
+            {
+                height += this.DockPadding.Bottom + this.DockPadding.Top;
+                if (m_QatPositionedBelow)
+                {
+                    height += (m_QatToolbar.Height);
+                }
+            }
+
+            if (this.Height != height && height > 0)
+            {
+                RibbonPanel selectedPanel = null;
+                if (!layoutSelectedPanel)
+                {
+                    RibbonTabItem tab = this.SelectedRibbonTabItem;
+                    if (tab != null && tab.Panel != null)
+                    {
+                        selectedPanel = tab.Panel;
+                        selectedPanel.SuspendLayout();
+                    }
+                }
+
+                this.Height = height;
+
+                if (selectedPanel != null)
+                    selectedPanel.ResumeLayout(false);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether anti-alias smoothing is used while painting. Default value is false.
+        /// </summary>
+        [DefaultValue(true), Browsable(true), Category("Appearance"), Description("Gets or sets whether anti-aliasing is used while painting.")]
+        public bool AntiAlias
+        {
+            get { return m_RibbonStrip.AntiAlias; }
+            set
+            {
+                m_RibbonStrip.AntiAlias = value;
+                this.Invalidate();
+            }
+        }
+
+        internal Rendering.Office2007ColorTable GetOffice2007ColorTable()
+        {
+            Rendering.Office2007Renderer r = Rendering.GlobalManager.Renderer as Rendering.Office2007Renderer;
+            if (r != null)
+                return r.ColorTable;
+            return new Rendering.Office2007ColorTable();
+        }
+
+        /// <summary>
+        /// Performs the setup of the RibbonPanel with the current style of the Ribbon Control.
+        /// </summary>
+        /// <param name="panel">Panel to apply style changes to.</param>
+        public void SetRibbonPanelStyle(RibbonPanel panel)
+        {
+            if (this.DesignMode)
+            {
+                TypeDescriptor.GetProperties(panel.DockPadding)["Left"].SetValue(panel.DockPadding, 3);
+                TypeDescriptor.GetProperties(panel.DockPadding)["Right"].SetValue(panel.DockPadding, 3);
+                TypeDescriptor.GetProperties(panel.DockPadding)["Bottom"].SetValue(panel.DockPadding, 3);
+            }
+            else
+            {
+                panel.DockPadding.Left = 3;
+                panel.DockPadding.Right = 3;
+                panel.DockPadding.Bottom = 3;
+            }
+        }
+
+        /// <summary>
+        /// Creates new Rendering Tab at specified position, creates new associated panel and adds them to the control.
+        /// </summary>
+        /// <param name="text">Specifies the text displayed on the tab.</param>
+        /// <param name="name">Specifies the name of the tab</param>
+        /// <param name="insertPosition">Specifies the position of the new tab inside of Items collection.</param>
+        /// <returns>New instance of the RibbonTabItem that was created.</returns>
+        public RibbonTabItem CreateRibbonTab(string text, string name, int insertPosition)
+        {
+            RibbonTabItem item = new RibbonTabItem();
+            item.Text = text;
+            item.Name = name;
+
+            RibbonPanel panel = new RibbonPanel();
+            panel.Dock = DockStyle.Fill;
+            panel.Width = this.Width - 4;
+            SetRibbonPanelStyle(panel);
+            this.Controls.Add(panel);
+            panel.SendToBack();
+
+            item.Panel = panel;
+            if (insertPosition < 0)
+            {
+                insertPosition = this.Items.Count;
+                for (int i = 0; i < this.Items.Count; i++)
+                {
+                    if (this.Items[i].ItemAlignment == eItemAlignment.Far)
+                    {
+                        insertPosition = i;
+                        break;
+                    }
+                }
+                if (insertPosition >= this.Items.Count)
+                    this.Items.Add(item);
+                else
+                    this.Items.Insert(insertPosition, item);
+            }
+            else if (insertPosition > this.Items.Count - 1)
+            {
+                // Make sure we obey any items aligned to far
+                insertPosition = this.Items.Count;
+                for (int i = 0; i < this.Items.Count; i++)
+                {
+                    if (this.Items[i].ItemAlignment == eItemAlignment.Far)
+                    {
+                        insertPosition = i;
+                        break;
+                    }
+                }
+                if (insertPosition >= this.Items.Count)
+                    this.Items.Add(item);
+                else
+                    this.Items.Insert(insertPosition, item);
+            }
+            else
+                this.Items.Insert(insertPosition, item);
+
+            return item;
+        }
+
+        /// <summary>
+        /// Creates new Rendering Tab and associated panel and adds them to the control.
+        /// </summary>
+        /// <param name="text">Specifies the text displayed on the tab.</param>
+        /// <param name="name">Specifies the name of the tab</param>
+        /// <returns>New instance of the RibbonTabItem that was created.</returns>
+        public RibbonTabItem CreateRibbonTab(string text, string name)
+        {
+            return CreateRibbonTab(text, name, -1);
+        }
+
+        /// <summary>
+        /// Recalculates layout of the control and applies any changes made to the size or position of the items contained.
+        /// </summary>
+        public void RecalcLayout()
+        {
+            m_RibbonStrip.RecalcLayout();
+            if(m_RibbonStrip.SelectedRibbonTabItem!=null && m_RibbonStrip.SelectedRibbonTabItem.Panel!=null)
+                m_RibbonStrip.SelectedRibbonTabItem.Panel.PerformLayout();
+            if (m_QatToolbar != null && m_QatToolbar.Visible)
+                m_QatToolbar.RecalcLayout();
+        }
+
+        protected override void OnHandleCreated(System.EventArgs e)
+        {
+            base.OnHandleCreated(e);
+            foreach (Control c in this.Controls)
+            {
+                IntPtr h = c.Handle;
+                if (c is RibbonPanel)
+                {
+                    foreach (Control r in c.Controls)
+                        h = r.Handle;
+                }
+            }
+            UpdateRegion();
+            this.RecalcLayout();
+            if (m_SetExpandedDelayed)
+                this.Expanded = m_ExpandedDelayed;
+        }
+
+        protected override void OnControlAdded(ControlEventArgs e)
+        {
+            base.OnControlAdded(e);
+
+            if (this.DesignMode)
+                return;
+            RibbonPanel panel = e.Control as RibbonPanel;
+            if (panel == null)
+                return;
+            if (panel.RibbonTabItem != null)
+            {
+                if (this.Items.Contains(panel.RibbonTabItem) && this.SelectedRibbonTabItem == panel.RibbonTabItem)
+                {
+                    panel.Visible = true;
+                    panel.BringToFront();
+                }
+                else
+                    panel.Visible = false;
+            }
+            else
+                panel.Visible = false;
+        }
+
+        private void RibbonStripSizeChanged(object sender, System.EventArgs e)
+        {
+            if (!m_RibbonControlResized)
+            {
+                if (m_AutoSize)
+                    this.AutoSyncSize();
+            }
+            m_RibbonControlResized = false;
+
+            if (!m_Expanded && !m_AutoSize)
+            {
+                this.Height = GetCollapsedHeight();
+            }
+        }
+
+        private void RibbonStripItemAdded(object sender, System.EventArgs e)
+        {
+            if (this.DesignMode)
+                return;
+
+            if (sender is RibbonTabItem)
+            {
+                RibbonTabItem tab = sender as RibbonTabItem;
+                if (tab.Panel != null)
+                {
+                    if (this.Controls.Contains(tab.Panel) && tab.Checked)
+                    {
+                        tab.Panel.Visible = true;
+                        tab.Panel.BringToFront();
+                    }
+                    else
+                        tab.Panel.Visible = false;
+                    tab.CheckedChanged += new System.EventHandler(RibbonTabCheckedChanged);
+                }
+            }
+        }
+
+        private void RibbonStripItemRemoved(object sender, ItemRemovedEventArgs e)
+        {
+            if (sender is RibbonTabItem)
+                ((RibbonTabItem)sender).CheckedChanged -= new System.EventHandler(RibbonTabCheckedChanged);
+        }
+
+        private void RibbonTabCheckedChanged(object sender, System.EventArgs e)
+        {
+            if (sender is RibbonTabItem && ((RibbonTabItem)sender).Checked)
+                AutoSyncSize();
+        }
+
+        protected override void OnControlRemoved(ControlEventArgs e)
+        {
+            base.OnControlRemoved(e);
+            if (m_PopupMode) return;
+            RibbonPanel panel = e.Control as RibbonPanel;
+            if (panel == null)
+                return;
+            if (panel.RibbonTabItem != null)
+            {
+                if (this.Items.Contains(panel.RibbonTabItem))
+                    this.Items.Remove(panel.RibbonTabItem);
+            }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void SetDesignMode()
+        {
+            m_RibbonStrip.SetDesignMode(true);
+        }
+
+        private ElementStyle GetBackgroundStyle()
+        {
+            return m_RibbonStrip.InternalGetBackgroundStyle();
+        }
+
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            ElementStyle style = GetBackgroundStyle();
+            if (style.BackColor.A < 255 && !style.BackColor.IsEmpty ||
+                this.BackColor == Color.Transparent)
+            {
+                base.OnPaintBackground(e);
+            }
+            else
+            {
+                using (SolidBrush brush = new SolidBrush(this.BackColor))
+                    e.Graphics.FillRectangle(brush, this.ClientRectangle);
+            }
+
+            if (this.IsGlassEnabled)
+            {
+                RibbonForm f = this.FindForm() as RibbonForm;
+                if (f != null)
+                    e.Graphics.SetClip(new Rectangle(0, 0, this.Width, f.GlassHeight), CombineMode.Exclude);
+            }
+
+            Office2007ColorTable table = GetOffice2007ColorTable();
+            if (table != null)
+            {
+                using (SolidBrush brush = new SolidBrush(table.Form.BackColor))
+                    e.Graphics.FillRectangle(brush, this.ClientRectangle);
+            }
+            else
+            {
+                ElementStyleDisplayInfo info = new ElementStyleDisplayInfo(style, e.Graphics, this.ClientRectangle);
+                ElementStyleDisplay.PaintBackground(info);
+            }
+
+            if (!m_QatPositionedBelow && m_RibbonStrip.HasVisibleTabs && !StyleManager.IsMetro(this.EffectiveStyle))
+            {
+                ShadowPaintInfo shadowInfo = GetShadowPaintInfo();
+                //shadowInfo.Rectangle = new Rectangle(-2, 0, this.Bounds.Width - shadowInfo.Size + 1, this.Bounds.Height - shadowInfo.Size);
+                shadowInfo.Rectangle = new Rectangle(-6, 0, this.Bounds.Width + 12, this.Bounds.Height);
+                shadowInfo.Graphics = e.Graphics;
+                ShadowPainter.Paint3(shadowInfo, 2);
+            }
+        }
+
+        private ShadowPaintInfo GetShadowPaintInfo()
+        {
+            if (m_ShadowPaintInfo == null)
+                m_ShadowPaintInfo = new ShadowPaintInfo();
+            m_ShadowPaintInfo.Size = 3;
+            eDotNetBarStyle effectiveStyle = this.EffectiveStyle;
+            m_ShadowPaintInfo.IsSquare = (effectiveStyle == eDotNetBarStyle.Office2010 || effectiveStyle == eDotNetBarStyle.Windows7 || StyleManager.IsMetro(effectiveStyle));
+            return m_ShadowPaintInfo;
+        }
+
+        private bool m_RibbonControlResized = false;
+        protected override void OnResize(System.EventArgs e)
+        {
+            m_RibbonControlResized = true;
+            UpdateRegion();
+            base.OnResize(e);
+            this.AutoSyncSize();
+        }
+
+        protected override void NotifyInvalidate(Rectangle invalidatedArea)
+        {
+            base.NotifyInvalidate(invalidatedArea);
+            this.UpdateRegion();
+        }
+
+        private void UpdateRegion()
+        {
+            if (this.Parent is RibbonForm && m_RibbonStrip.CaptionVisible && !this.IsGlassEnabled)
+            {
+                // Calculate and set the region for the control so the form is displayed properly
+                this.Region = GetControlRegion();
+            }
+        }
+
+        private bool IsGlassEnabled
+        {
+            get { if (this.DesignMode || !CanSupportGlass) return false; return WinApi.IsGlassEnabled; }
+        }
+
+        protected override void WndProc(ref Message m)
+        {
+            if (m.Msg == (int)WinApi.WindowsMessages.WM_NCHITTEST)
+            {
+                // Get position being tested...
+                int x = WinApi.LOWORD(m.LParam);
+                int y = WinApi.HIWORD(m.LParam);
+                Point p = PointToClient(new Point(x, y));
+                if (IsGlassEnabled && this.CaptionVisible)
+                {
+                    Rectangle r = new Rectangle(this.Width - BarFunctions.CaptionButtonSize.Width * 3, 0, BarFunctions.CaptionButtonSize.Width * 3, BarFunctions.CaptionButtonSize.Height);
+                    if (r.Contains(p))
+                    {
+                        m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.TransparentOrCovered);
+                        return;
+                    }
+
+                    if (m_RibbonStrip != null && !m_RibbonStrip.IsMaximized)
+                    {
+                        r = new Rectangle(0, 0, this.Width, Dpi.Height4);
+                        if (r.Contains(p))
+                        {
+                            m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.TransparentOrCovered);
+                            return;
+                        }
+                    }
+
+                    if (BarFunctions.IsWindows7 && m_RibbonStrip != null && m_RibbonStrip.IsMaximized)
+                    {
+                        r = m_RibbonStrip.CaptionBounds;
+                        if (r.Contains(p))
+                        {
+                            m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.TransparentOrCovered);
+                            return;
+                        }
+                    }
+                }
+                else if (this.CaptionVisible && m_RibbonStrip != null && !m_RibbonStrip.IsMaximized)
+                {
+                    Rectangle r = new Rectangle(0, 0, this.Width, Dpi.Height4);
+                    if (r.Contains(p))
+                    {
+                        m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.TransparentOrCovered);
+                        return;
+                    }
+                }
+                if ((this.EffectiveStyle == eDotNetBarStyle.Office2010 || StyleManager.IsMetro(this.EffectiveStyle)) && (p.X < Dpi.Width28 && this.RightToLeft == RightToLeft.No || p.X > this.Width - Dpi.Width28 && this.RightToLeft == RightToLeft.Yes) && p.Y < Dpi.Height28)
+                {
+                    m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.TransparentOrCovered);
+                    return;
+                }
+                else if (this.EffectiveStyle == eDotNetBarStyle.Windows7 && (p.X < Dpi.Width28 && this.RightToLeft == RightToLeft.No || p.X > this.Width - Dpi.Width28 && this.RightToLeft == RightToLeft.Yes) && p.Y < Dpi.Height28)
+                {
+                    m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.TransparentOrCovered);
+                    return;
+                }
+            }
+            base.WndProc(ref m);
+        }
+
+        /// <summary>
+        /// Returns Control region if any when control is hosted by Office2007RibbonForm
+        /// </summary>
+        /// <returns></returns>
+        protected virtual Region GetControlRegion()
+        {
+            if (this.Parent is RibbonForm && ((Form)this.Parent).WindowState == FormWindowState.Maximized)
+                return null;
+            eDotNetBarStyle effectiveStyle = this.EffectiveStyle;
+            if (StyleManager.IsMetro(effectiveStyle)) return null;
+
+            GraphicsPath path = new GraphicsPath();
+            Rectangle r = new Rectangle(0, 0, this.Width, this.Height); //this.DisplayRectangle;
+            
+            if (effectiveStyle == eDotNetBarStyle.Office2010 && !BarFunctions.IsWindows8) r.Y++;
+            bool rightToLeft = (this.RightToLeft == RightToLeft.Yes);
+
+            int topLeftCornerSize = 2, topRightCornerSize = 2;
+            
+            if (this.Parent is RibbonForm)
+            {
+                RibbonForm f = this.Parent as RibbonForm;
+                topLeftCornerSize = f.TopLeftCornerSize - 2;
+                topRightCornerSize = f.TopRightCornerSize - 1;
+                if (topLeftCornerSize <= 0) topLeftCornerSize = 0;
+                if (topRightCornerSize <= 0) topLeftCornerSize = 0;
+            }
+            else
+                return null;
+
+            if (rightToLeft)
+            {
+                int temp = topLeftCornerSize;
+                topLeftCornerSize = topRightCornerSize;
+                topRightCornerSize = temp;
+            }
+
+            ArcData arc;
+            if (topLeftCornerSize > 0)
+            {
+                arc = ElementStyleDisplay.GetCornerArc(r, topLeftCornerSize, eCornerArc.TopLeft);
+                path.AddArc(arc.X, arc.Y, arc.Width, arc.Height, arc.StartAngle, arc.SweepAngle);
+            }
+            else
+            {
+                // Top Left
+                path.AddLine(r.X, r.Y + 2, r.X, r.Y);
+                path.AddLine(r.X, r.Y, r.X + 2, r.Y);
+            }
+
+            if (topRightCornerSize > 0)
+            {
+                arc = ElementStyleDisplay.GetCornerArc(r, topRightCornerSize, eCornerArc.TopRight);
+                path.AddArc(arc.X, arc.Y, arc.Width, arc.Height, arc.StartAngle, arc.SweepAngle);
+            }
+            else
+            {
+                // Top Right
+                path.AddLine(r.Right - 2, r.Y, r.Right, r.Y);
+                path.AddLine(r.Right, r.Y, r.Right, r.Y + 2);
+            }
+
+            // Bottom Right
+            path.AddLine(r.Right, r.Bottom - 2, r.Right, r.Bottom);
+            path.AddLine(r.Right, r.Bottom, r.Right - 2, r.Bottom);
+
+            // Bottom Left
+            path.AddLine(r.X + 2, r.Bottom, r.X, r.Bottom);
+            path.AddLine(r.X, r.Bottom, r.X, r.Bottom - 2);
+
+            path.CloseAllFigures();
+
+            Region reg = new Region();
+            reg.MakeEmpty();
+            reg.Union(path);
+
+            // Widen path for the border...
+            path.Widen(SystemPens.Control);
+            Region r2 = new Region(path);
+            reg.Union(path);
+            return reg;
+        }
+
+        #endregion
+
+        #region Properties
+        /// <summary>
+        /// Gets or sets the rich text displayed on Ribbon Title instead of the Form.Text property. This property supports text-markup.
+        /// You can use <font color="SysCaptionTextExtra"> markup to instruct the markup renderer to use Office 2007 system caption extra text color which
+        /// changes depending on the currently selected color table. Note that when using this property you should manage also the Form.Text property since
+        /// that is the text that will be displayed in Windows task-bar and elsewhere where system Form.Text property is used.
+        /// You can also use the hyperlinks as part of the text markup and handle the TitleTextMarkupLinkClick event to be notified when they are clicked.
+        /// </summary>
+        [Browsable(true), DefaultValue(""), Editor("DevComponents.DotNetBar.Design.TextMarkupUIEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), EditorBrowsable(EditorBrowsableState.Always), Category("Appearance"), Description("Indicates text displayed on Ribbon Title instead of the Form.Text property.")]
+        public string TitleText
+        {
+            get { return m_RibbonStrip.TitleText; }
+            set { m_RibbonStrip.TitleText = value; }
+        }
+
+        /// <summary>
+        /// Occurs when text markup link is clicked.
+        /// </summary>
+        private void RibbonStripTitleTextMarkupLinkClick(object sender, MarkupLinkClickEventArgs e)
+        {
+            if (TitleTextMarkupLinkClick != null)
+                TitleTextMarkupLinkClick(this, new MarkupLinkClickEventArgs(e.Name, e.HRef));
+        }
+
+        /// <summary>
+        /// Gets or sets the Context menu bar associated with the this control which is used as part of Global Items feature. The context menu 
+        /// bar assigned here will be used to search for the items with the same Name or GlobalName property so global properties can be propagated when changed.
+        /// You should assign this property to enable the Global Items feature to reach your ContextMenuBar.
+        /// </summary>
+        [DefaultValue(null), Description("Indicates Context menu bar associated with the ribbon control which is used as part of Global Items feature."), Category("Data")]
+        public ContextMenuBar GlobalContextMenuBar
+        {
+            get { return m_GlobalContextMenuBar; }
+            set
+            {
+                if (m_GlobalContextMenuBar != null)
+                    m_GlobalContextMenuBar.GlobalParentComponent = null;
+                m_GlobalContextMenuBar = value;
+                if (m_GlobalContextMenuBar != null)
+                    m_GlobalContextMenuBar.GlobalParentComponent = this;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether custom caption and quick access toolbar provided by the control is visible. Default value is false.
+        /// This property should be set to true when control is used on Office2007RibbonForm.
+        /// </summary>
+        [Browsable(true), DefaultValue(false), Category("Caption"), Description("Indicates whether custom caption and quick access toolbar provided by the control is visible.")]
+        public bool CaptionVisible
+        {
+            get { return m_RibbonStrip.CaptionVisible; }
+            set
+            {
+                m_RibbonStrip.CaptionVisible = value;
+                if (!value)
+                {
+                    RibbonForm f = this.FindForm() as RibbonForm;
+                    if (f != null)
+                        f.UpdateGlass();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the font for the form caption text when CaptionVisible=true. Default value is NULL which means that system font is used.
+        /// </summary>
+        [Browsable(true), DefaultValue(null), Category("Caption"), Description("Indicates font for the form caption text when CaptionVisible=true.")]
+        public Font CaptionFont
+        {
+            get { return m_RibbonStrip.CaptionFont; }
+            set
+            {
+                m_RibbonStrip.CaptionFont = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the explicit height of the caption provided by control. Caption height when set is composed of the TabGroupHeight and
+        /// the value specified here. Default value is 0 which means that system default caption size is used.
+        /// </summary>
+        [Browsable(true), DefaultValue(0), Category("Caption"), Description("Indicates explicit height of the caption provided by control")]
+        public int CaptionHeight
+        {
+            get { return m_RibbonStrip.CaptionHeight; }
+            set
+            {
+                m_RibbonStrip.CaptionHeight = value;
+                this.RecalcLayout();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the indent of the ribbon strip. The indent setting is useful when control is used with caption visible and the Office 2007
+        /// style start button. The indent specified here will move the ribbon strip so the start button does not overlap the tabs.
+        /// Value of this property is used only when CaptionVisible = true.
+        /// Default value is 46.
+        /// </summary>
+        [Browsable(true), DefaultValue(46), Category("Layout"), Description("Indicates indent of the ribbon strip.")]
+        public int RibbonStripIndent
+        {
+            get { return m_RibbonStrip.RibbonStripIndent; }
+            set { m_RibbonStrip.RibbonStripIndent = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the font used by the ribbon strip.
+        /// </summary>
+        [Category("Appearance"), Description("Gets or sets the font used by the ribbon strip.")]
+        public Font RibbonStripFont
+        {
+            get { return m_RibbonStrip.Font; }
+            set { m_RibbonStrip.Font = value; }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeRibbonStripFont()
+        {
+            System.Reflection.MethodInfo mi = m_RibbonStrip.GetType().GetMethod("ShouldSerializeFont", System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.NonPublic);
+            return (bool)mi.Invoke(m_RibbonStrip, null);
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetRibbonStripFont()
+        {
+            m_RibbonStrip.ResetFont();
+        }
+
+
+        /// <summary>
+        /// Gets or sets whether mouse over fade effect is enabled. Default value is true.
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Appearance"), Description("Indicates whether mouse over fade effect is enabled")]
+        public bool FadeEffect
+        {
+            get { return m_RibbonStrip.FadeEffect; }
+            set
+            {
+                m_RibbonStrip.FadeEffect = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the font that is used to display Key Tips (accelerator keys) when they are displayed. Default value is null which means
+        /// that control Font is used for Key Tips display.
+        /// </summary>
+        [Browsable(true), DefaultValue(null), Category("Appearance"), Description("Indicates font that is used to display Key Tips (accelerator keys) when they are displayed.")]
+        public virtual Font KeyTipsFont
+        {
+            get { return m_RibbonStrip.KeyTipsFont; }
+            set { m_RibbonStrip.KeyTipsFont = value; }
+        }
+
+        /// <summary>
+        /// Collection of RibbonTabItemGroup items. Groups are assigned optionally to one or more RibbonTabItem object through the RibbonTabItem.Group
+        /// property to visually group tabs that belong to same functions. These tabs should be positioned next to each other.
+        /// </summary>
+        [Editor("DevComponents.DotNetBar.Design.RibbonTabItemGroupCollectionEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), DesignerSerializationVisibility(DesignerSerializationVisibility.Content), Category("Tab Groups"), Browsable(true), DevCoBrowsable(true)]
+        public RibbonTabItemGroupCollection TabGroups
+        {
+            get { return m_RibbonStrip.TabGroups; }
+        }
+
+        /// <summary>
+        /// Gets or sets the height in pixels of tab group line that is displayed above the RibbonTabItem objects that have group assigned.
+        /// Default value is 10 pixels. To show tab groups you need to assign the RibbonTabItem.Group property and set TabGroupsVisible=true.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true),DefaultValue(10),Category("Tab Groups"),Description("Indicates height in pixels of tab group line that is displayed above the RibbonTabItem objects that have group assigned.")]
+        public int TabGroupHeight
+        {
+            get { return m_RibbonStrip.TabGroupHeight; }
+            set
+            {
+                m_RibbonStrip.TabGroupHeight = value;
+                if (this.DesignMode)
+                    this.RecalcLayout();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether tab group line that is displayed above the RibbonTabItem objects that have group assigned is visible.
+        /// Default value is false. To show tab groups you need to assign the RibbonTabItem.Group property and set TabGroupsVisible=true. Use TabGroupHeight
+        /// property to control height of the group line.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), DefaultValue(false), Category("Tab Groups"), Description("Indicates whether tab group line that is displayed above the RibbonTabItem objects that have group assigned is visible.")]
+        public bool TabGroupsVisible
+        {
+            get { return m_RibbonStrip.TabGroupsVisible; }
+            set
+            {
+                m_RibbonStrip.TabGroupsVisible = value;
+                if (this.DesignMode)
+                    this.RecalcLayout();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets default font for tab groups. This font will be used if font is not specified by group style element.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true),Category("Tab Groups"),DefaultValue(null)]
+        public Font DefaultGroupFont
+        {
+            get { return m_RibbonStrip.DefaultGroupFont; }
+            set
+            {
+                m_RibbonStrip.DefaultGroupFont = value;
+                if (this.DesignMode)
+                    this.Refresh();
+            }
+        }
+        /// <summary>
+        /// Resets DefaultGroupFont property to default value null.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetDefaultGroupFont()
+        {
+            TypeDescriptor.GetProperties(this)["DefaultGroupFont"].SetValue(this, null);
+        }
+
+        /// <summary>
+        /// Specifies the background style of the control.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true),Category("Style"),Description("Gets or sets bar background style."),DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ElementStyle BackgroundStyle
+        {
+            get { return m_RibbonStrip.BackgroundStyle; }
+        }
+
+        /// <summary>
+        /// Gets or sets the currently selected RibbonTabItem. RibbonTabItems are selected using the Checked property. Only a single
+        /// RibbonTabItem can be selected (Checked) at any given time.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public RibbonTabItem SelectedRibbonTabItem
+        {
+            get { return m_RibbonStrip.SelectedRibbonTabItem; }
+            set
+            {
+                if (value != null) value.Checked = true;
+            }
+        }
+
+        /// <summary>
+        /// Returns reference to internal ribbon strip control.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public RibbonStrip RibbonStrip
+        {
+            get { return m_RibbonStrip; }
+        }
+
+        /// <summary>
+        /// Returns collection of items on a bar.
+        /// </summary>
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content), Browsable(false)]
+        public SubItemsCollection Items
+        {
+            get { return m_RibbonStrip.Items; }
+        }
+
+        /// <summary>
+        /// Returns collection of quick toolbar access and caption items.
+        /// </summary>
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content), Browsable(false)]
+        public SubItemsCollection QuickToolbarItems
+        {
+            get { return GetQatSubItemsCollection(); }
+        }
+
+        private SubItemsCollection GetQatSubItemsCollection()
+        {
+            if (m_QatPositionedBelow)
+            {
+                if (m_QatSubItemsCollection == null)
+                {
+                    m_QatSubItemsCollection = new Ribbon.SubItemsQatCollection(m_QatToolbar);
+                    BaseItem startButton = GetApplicationButton();
+                    if (startButton != null)
+                        m_QatSubItemsCollection._Add(startButton);
+                    foreach (BaseItem item in m_QatToolbar.Items)
+                        m_QatSubItemsCollection._Add(item);
+                }
+
+                return m_QatSubItemsCollection;
+            }
+            else
+                return m_RibbonStrip.QuickToolbarItems;
+        }
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public eDotNetBarStyle EffectiveStyle
+        {
+            get
+            {
+                return m_RibbonStrip.EffectiveStyle;
+            }
+        }
+
+        /// <summary>
+        /// Gets/Sets the visual style of the control. If you are changing style to Office 2007 or Office 2010 use RibbonPredefinedColorSchemes.ChangeStyle method instead to ensure
+        /// all controls are switched properly.
+        /// </summary>
+        [Browsable(false), Category("Appearance"),Description("Specifies the visual style of the control."),DefaultValue(eDotNetBarStyle.Office2003)]
+        public eDotNetBarStyle Style
+        {
+            get { return m_RibbonStrip.Style; }
+            set
+            {
+                if (value == eDotNetBarStyle.StyleManagerControlled)
+                {
+                    SetStyle();
+                }
+                else
+                    ChangeControlStyle(value);
+            }
+        }
+
+
+        private static BaseItem GetAppButton(RibbonControl ribbon)
+        {
+            BaseItem appButton = null;
+            for (int i = 0; i < ribbon.QuickToolbarItems.Count; i++)
+            {
+                if (ribbon.QuickToolbarItems[i] is ApplicationButton)
+                {
+                    appButton = ribbon.QuickToolbarItems[i];
+                    break;
+                }
+
+            }
+            return appButton;
+        }
+        protected override void OnBackColorChanged(EventArgs e)
+        {
+            base.OnBackColorChanged(e);
+        }
+        private void SetStyle()
+        {
+            eDotNetBarStyle effectiveStyle = StyleManager.GetEffectiveStyle();
+            RibbonControl ribbon = this;
+            if (effectiveStyle == eDotNetBarStyle.Office2010 || effectiveStyle == eDotNetBarStyle.Windows7 || StyleManager.IsMetro(effectiveStyle))
+            {
+                BaseItem appButton = GetAppButton(ribbon);
+                if (appButton != null)
+                {
+                    if (appButton is ButtonItem && ((ButtonItem)appButton).ImageFixedSize.IsEmpty)
+                    {
+                        ((ButtonItem)appButton).ImageFixedSize = new Size(16, 16);
+                    }
+                    if (appButton is ButtonItem)
+                    {
+                        ButtonItem tempButton = (ButtonItem)appButton;
+                        tempButton.ImagePaddingHorizontal = 0;
+                        tempButton.ImagePaddingVertical = 0;
+                    }
+                    if (appButton.Parent != null)
+                        appButton.Parent.SubItems.Remove(appButton);
+                    ribbon.Items.Insert(0, appButton);
+                }
+            }
+            else if (effectiveStyle == eDotNetBarStyle.Office2007)
+            {
+                if (ribbon.Items.Count > 0 && ribbon.Items[0] is ApplicationButton)
+                {
+                    ApplicationButton appButton = (ApplicationButton)ribbon.Items[0];
+                    if (!appButton.ImageFixedSize.IsEmpty)
+                        appButton.ImageFixedSize = Size.Empty;
+                    appButton.ImagePaddingHorizontal = 2;
+                    appButton.ImagePaddingVertical = 2;
+                    ribbon.Items.Remove(appButton);
+                    if (m_QatPositionedBelow)
+                        m_RibbonStrip.CaptionContainerItem.SubItems.Insert(0, appButton);
+                    else
+                        ribbon.QuickToolbarItems.Insert(0, appButton);
+                }
+            }
+
+            foreach (Control c in this.Controls)
+            {
+                if (c is RibbonPanel)
+                {
+                    ((RibbonPanel)c).ColorSchemeStyle = eDotNetBarStyle.StyleManagerControlled;
+                    RibbonPanel ribbonPanel = (RibbonPanel)c;
+                    foreach (Control r in c.Controls)
+                    {
+                        if (r is RibbonBar)
+                        {
+                            RibbonBar rb = r as RibbonBar;
+                            if (rb.GalleryStretch == null && !ribbonPanel.DefaultLayout && !this.DesignMode) rb.Width += 4;
+                            TypeDescriptor.GetProperties(rb)["Style"].SetValue(rb, eDotNetBarStyle.StyleManagerControlled);
+                        }
+                    }
+                }
+            }
+            m_RibbonStrip.Style = eDotNetBarStyle.StyleManagerControlled;
+            UpdatePaddingOnControls();
+            ribbon.RibbonStrip.InitDefaultStyles();
+            ribbon.Invalidate(true);
+            if (ribbon.IsHandleCreated && ribbon.SelectedRibbonTabItem != null && ribbon.SelectedRibbonTabItem.Panel != null)
+            {
+                ribbon.SelectedRibbonTabItem.Panel.PerformLayout();
+            }
+
+            if (m_QatToolbar != null) m_QatToolbar.Style = eDotNetBarStyle.StyleManagerControlled;
+            if (this.IsHandleCreated)
+            {
+                this.Invalidate(true);
+                this.RecalcLayout();
+            }
+        }
+
+        private bool _AutoUpdatePadding = true;
+        /// <summary>
+        /// Indicates whether control automatically updates Padding property for the ribbon and RibbonPanel based on style. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether control automatically updates padding for the ribbon and RibbonPanel based on style")]
+        public bool AutoUpdatePadding
+        {
+            get { return _AutoUpdatePadding; }
+            set
+            {
+                _AutoUpdatePadding = value;
+            }
+        }
+
+        private void UpdatePaddingOnControls()
+        {
+            if (!_AutoUpdatePadding) return;
+
+            eDotNetBarStyle effectiveStyle = StyleManager.GetEffectiveStyle();
+            if (StyleManager.IsMetro(effectiveStyle))
+            {
+                this.Padding = new System.Windows.Forms.Padding(this.Padding.Left, this.Padding.Top, this.Padding.Right, 0);
+            }
+            else
+            {
+                this.Padding = new System.Windows.Forms.Padding(this.Padding.Left, this.Padding.Top, this.Padding.Right, DefaultBottomDockPadding);
+            }
+            foreach (Control c in this.Controls)
+            {
+                RibbonPanel panel = c as RibbonPanel;
+                if (panel!=null)
+                {
+                    if (StyleManager.IsMetro(effectiveStyle))
+                    {
+                        panel.Padding = new System.Windows.Forms.Padding(panel.Padding.Left, panel.Padding.Top, panel.Padding.Right, this.DesignMode ? 2 : 0);
+                    }
+                    else
+                    {
+                        panel.Padding = new System.Windows.Forms.Padding(panel.Padding.Left, panel.Padding.Top, panel.Padding.Right, DefaultBottomDockPadding);
+                    }
+                }
+            }
+        }
+
+        private void ChangeControlStyle(eDotNetBarStyle newStyle)
+        {
+            if (newStyle != eDotNetBarStyle.StyleManagerControlled)
+            {
+                if (newStyle == eDotNetBarStyle.Office2010)
+                {
+                    // Ensure that proper color table is selected.
+                    if (GlobalManager.Renderer is Office2007Renderer)
+                    {
+                        if (!(((Office2007Renderer)GlobalManager.Renderer).ColorTable is Office2010ColorTable))
+                        {
+                            ((Office2007Renderer)GlobalManager.Renderer).ColorTable = new Office2010ColorTable();
+                        }
+
+                    }
+                }
+                else if (newStyle == eDotNetBarStyle.Windows7)
+                {
+                    // Ensure that proper color table is selected.
+                    if (GlobalManager.Renderer is Office2007Renderer)
+                    {
+                        if (!(((Office2007Renderer)GlobalManager.Renderer).ColorTable is Windows7ColorTable))
+                        {
+                            ((Office2007Renderer)GlobalManager.Renderer).ColorTable = new Windows7ColorTable();
+                        }
+
+                    }
+                }
+                else if (newStyle == eDotNetBarStyle.Office2007)
+                {
+                    // Ensure that proper color table is selected.
+                    if (GlobalManager.Renderer is Office2007Renderer)
+                    {
+                        if ((((Office2007Renderer)GlobalManager.Renderer).ColorTable is Office2010ColorTable) ||
+                            (((Office2007Renderer)GlobalManager.Renderer).ColorTable is Windows7ColorTable))
+                            ((Office2007Renderer)GlobalManager.Renderer).ColorTable = new Office2007ColorTable(this.Office2007ColorTable);
+
+                    }
+                }
+            }
+
+            m_RibbonStrip.Style = newStyle;
+            foreach (Control c in this.Controls)
+            {
+                if (c is RibbonPanel)
+                {
+                    ((RibbonPanel)c).ColorSchemeStyle = newStyle;
+
+                    foreach (Control r in c.Controls)
+                    {
+                        if (r is RibbonBar)
+                        {
+                            RibbonBar rb = r as RibbonBar;
+                            TypeDescriptor.GetProperties(rb)["Style"].SetValue(rb, newStyle);
+                        }
+                    }
+                }
+            }
+
+            if (m_QatToolbar != null) m_QatToolbar.Style = newStyle;
+            if (this.IsHandleCreated)
+            {
+                this.Invalidate(true);
+                this.RecalcLayout();
+            }
+
+            if (!this.DesignMode)
+            {
+                RibbonForm form = this.FindForm() as RibbonForm;
+                if (form != null) form.UpdateGlass();
+            }
+
+        }
+
+        private Rendering.eOffice2007ColorScheme m_DelayedColorTableChange = DevComponents.DotNetBar.Rendering.eOffice2007ColorScheme.Blue;
+        private bool m_SetColorTableDelayed = false;
+        /// <summary>
+        /// Gets or sets the Office 2007 Renderer global Color Table. Setting this property will affect all controls on the form that are using Office 2007 global renderer.
+        /// </summary>
+        [Browsable(false), Category("Appearance"), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden) ,DefaultValue(Rendering.eOffice2007ColorScheme.Blue), Description("Indicates the Office 2007 Renderer global Color Table."), Obsolete("This property is obsolete and it does not do anything. It has been replaced by StyleManager")]
+        public Rendering.eOffice2007ColorScheme Office2007ColorTable
+        {
+            get
+            {
+                Rendering.Office2007Renderer r = m_RibbonStrip.GetRenderer() as Rendering.Office2007Renderer;
+                if (r != null)
+                    return r.ColorTable.InitialColorScheme;
+                return Rendering.eOffice2007ColorScheme.Blue;
+            }
+            set
+            {
+                //Form f = this.FindForm();
+                //if (f == null && this.Parent == null)
+                //{
+                //    m_SetColorTableDelayed = true;
+                //    m_DelayedColorTableChange = value;
+                //    return;
+                //}
+                //else if (f == null && this.Parent != null)
+                //{
+                //    RibbonPredefinedColorSchemes.ChangeOffice2007ColorTable(this.Parent, value);
+                //}
+                //else
+                //    RibbonPredefinedColorSchemes.ChangeOffice2007ColorTable(f, value);
+
+            }
+        }
+
+        /// <summary>
+        /// Raises the BeforeRibbonPanelPopupClose event.
+        /// </summary>
+        protected virtual void OnBeforeRibbonPanelPopupClose(RibbonPopupCloseEventArgs e)
+        {
+            if (BeforeRibbonPanelPopupClose != null)
+                BeforeRibbonPanelPopupClose(this, e);
+        }
+
+        /// <summary>
+        /// Raises the AfterRibbonPanelPopupClose event.
+        /// </summary>
+        protected virtual void OnAfterRibbonPanelPopupClose(EventArgs e)
+        {
+            if (AfterRibbonPanelPopupClose != null)
+                AfterRibbonPanelPopupClose(this, e);
+        }
+
+        /// <summary>
+        /// Raises the BeforeRibbonPanelPopup event.
+        /// </summary>
+        /// <param name="ce"></param>
+        protected virtual void OnBeforeRibbonPanelPopup(CancelEventArgs ce)
+        {
+            if (BeforeRibbonPanelPopup != null)
+                BeforeRibbonPanelPopup(this, ce);
+        }
+
+        /// <summary>
+        /// Raises the BeforeRibbonPanelPopup event.
+        /// </summary>
+        /// <param name="ce"></param>
+        protected virtual void OnAfterRibbonPanelPopup(EventArgs e)
+        {
+            if (AfterRibbonPanelPopup != null)
+                AfterRibbonPanelPopup(this, e);
+        }
+
+        /// <summary>
+        /// Gets whether collapsed ribbon is displaying the selected ribbon panel as popup.
+        /// </summary>
+        [Browsable(false)]
+        public bool IsPopupMode
+        {
+            get { return m_PopupMode; }
+        }
+
+        internal void OnChildItemClick(BaseItem item)
+        {
+            m_RibbonStrip.OnChildItemClick(item);
+            if (!m_PopupMode || item == null) return;
+            if (item is RibbonTabItem || item.IsContainer || item.Name.StartsWith("sysgallery") || item is CheckBoxItem || !item.AutoCollapseOnClick) return;
+            if (item is PopupItem && item.Expanded) return;
+
+            this.CloseRibbonMenu(item, eEventSource.Mouse);
+        }
+
+        private Timer m_ActiveWindowTimer = null;
+        private IntPtr m_ForegroundWindow = IntPtr.Zero;
+        private IntPtr m_ActiveWindow = IntPtr.Zero;
+        /// <summary>
+        /// Sets up timer that watches when active window changes.
+        /// </summary>
+        private void SetupActiveWindowTimer()
+        {
+            if (m_ActiveWindowTimer != null)
+                return;
+            m_ActiveWindowTimer = new Timer();
+            m_ActiveWindowTimer.Interval = 100;
+            m_ActiveWindowTimer.Tick += new EventHandler(ActiveWindowTimer_Tick);
+
+            m_ForegroundWindow = NativeFunctions.GetForegroundWindow();
+            m_ActiveWindow = NativeFunctions.GetActiveWindow();
+
+            m_ActiveWindowTimer.Start();
+        }
+
+        private void ActiveWindowTimer_Tick(object sender, EventArgs e)
+        {
+            if (m_ActiveWindowTimer == null)
+                return;
+
+            IntPtr f = NativeFunctions.GetForegroundWindow();
+            IntPtr a = NativeFunctions.GetActiveWindow();
+
+            if (f != m_ForegroundWindow || a != m_ActiveWindow)
+            {
+                if (a != IntPtr.Zero)
+                {
+                    Control c = Control.FromHandle(a);
+                    if (c is PopupContainer || c is PopupContainerControl || c is Balloon)
+                        return;
+                }
+                m_ActiveWindowTimer.Stop();
+                OnActiveWindowChanged();
+            }
+        }
+
+        /// <summary>
+        /// Called after change of active window has been detected. SetupActiveWindowTimer must be called to enable detection.
+        /// </summary>
+        private void OnActiveWindowChanged()
+        {
+            if (m_PopupMode)
+                this.CloseRibbonMenu(this, eEventSource.Code);
+            ReleaseActiveWindowTimer();
+        }
+
+        /// <summary>
+        /// Releases and disposes the active window watcher timer.
+        /// </summary>
+        private void ReleaseActiveWindowTimer()
+        {
+            if (m_ActiveWindowTimer != null)
+            {
+                Timer timer = m_ActiveWindowTimer;
+                m_ActiveWindowTimer = null;
+                timer.Stop();
+                timer.Tick -= new EventHandler(ActiveWindowTimer_Tick);
+                timer.Dispose();
+            }
+        }
+#if TRIAL
+        private bool _ShownOnce = false;
+#endif
+        protected override void OnVisibleChanged(EventArgs e)
+        {
+            if (!this.Visible)
+                OnActiveWindowChanged();
+            else
+            {
+#if TRIAL
+                if(!this.DesignMode && !_ShownOnce)
+                {
+				    RemindForm frm=new RemindForm();
+				    frm.ShowDialog();
+				    frm.Dispose();
+                    _ShownOnce = true;
+                }
+#endif
+
+            }
+            base.OnVisibleChanged(e);
+        }
+
+        internal void OnEscapeKeyDown()
+        {
+            OnActiveWindowChanged();
+        }
+
+
+        internal void OnSysMouseDown(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+            if (!m_PopupMode)
+                return;
+            Control cTmp = FromChildHandle(hWnd);
+            if (cTmp == null)
+            {
+                string s = NativeFunctions.GetClassName(hWnd);
+                s = s.ToLower();
+                if (s.IndexOf("combolbox") >= 0)
+                    return;
+                OnActiveWindowChanged();
+                return;
+            }
+
+            do
+            {
+                if (cTmp is MenuPanel || cTmp is PopupContainer || cTmp is PopupContainerControl || cTmp is RibbonBar || cTmp is RibbonStrip || cTmp is RibbonPanel || cTmp is Balloon)
+                {
+                    return;
+                }
+                cTmp = cTmp.Parent;
+            } while (cTmp != null);
+
+            OnActiveWindowChanged();
+            return;
+        }
+
+        /// <summary>
+        /// Displays the active ribbon panel on the popup if ribbon control is collapsed.
+        /// </summary>
+        /// <param name="source">Reference to the object that was cause of the event. This is provided to the BeforeRibbonPanelPopupClose event if an menu needs to be closed.</param>
+        /// <param name="eventSource">Indicates the event source. This is provided to the BeforeRibbonPanelPopupClose event if an menu needs to be closed.</param>
+        public void PopupRibbon(object source, eEventSource eventSource)
+        {
+            if (this.Expanded || this.SelectedRibbonTabItem == null || this.SelectedRibbonTabItem.Panel == null)
+                return;
+            if (m_PopupRibbonPanel == this.SelectedRibbonTabItem.Panel)
+                return;
+
+            Control f = this.FindForm();
+            if (f == null) f = this.Parent;
+            if (f == null) return;
+
+            // Close any currently open panels.
+            RibbonPanel previousVisiblePanel = m_PopupRibbonPanel;
+            if (previousVisiblePanel != null)
+            {
+                RibbonPopupCloseEventArgs pce = new RibbonPopupCloseEventArgs(source, eventSource);
+                OnBeforeRibbonPanelPopupClose(pce);
+                if (pce.Cancel) return;
+            }
+
+            //Raise events
+            CancelEventArgs ce = new CancelEventArgs();
+            OnBeforeRibbonPanelPopup(ce);
+            if (ce.Cancel) return;
+
+            m_PopupMode = true;
+            RibbonPanel panel = this.SelectedRibbonTabItem.Panel;
+            panel.SuspendLayout();
+            this.Controls.Remove(panel);
+            panel.Visible = false;
+            panel.Dock = DockStyle.None;
+            f.Controls.Add(panel);
+            Point p = m_RibbonStrip.PointToScreen(new Point(0, m_RibbonStrip.Height));
+            p = f.PointToClient(p);
+            panel.Font = this.Font;
+            panel.Bounds = new Rectangle(p.X, p.Y - (StyleManager.IsMetro(EffectiveStyle)?0:DefaultBottomDockPadding) - 1, this.Width, GetPopupRibbonPanelHeight(panel));
+            panel.SetPopupMode(true, this);
+            panel.ResumeLayout();
+            panel.Visible = true;
+            panel.BringToFront();
+            CloseRibbonMenu(previousVisiblePanel);
+            SetupActiveWindowTimer();
+            m_PopupRibbonPanel = panel;
+            // Raise events...
+            OnAfterRibbonPanelPopup(new EventArgs());
+        }
+
+        private void CloseRibbonMenu(RibbonPanel panel)
+        {
+            if (panel == null || panel.IsDisposed || panel.Parent == null) return;
+
+            this.SuspendLayout();
+            panel.Visible = false;
+            panel.Parent.Controls.Remove(panel);
+            panel.SetPopupMode(false, this);
+            panel.Dock = DockStyle.Fill;
+            this.Controls.Add(panel);
+            if (this.SelectedRibbonTabItem != null)
+            {
+                this.SelectedRibbonTabItem.Refresh();
+                if (this.SelectedRibbonTabItem.Panel == panel)
+                    panel.Visible = true;
+            }
+            panel.BringToFront();
+            this.ResumeLayout(true);
+
+            OnAfterRibbonPanelPopupClose(new EventArgs());
+        }
+
+        /// <summary>
+        /// Closes the Ribbon tab menu with source set to null and event source set to Code.
+        /// </summary>
+        public void CloseRibbonMenu()
+        {
+            CloseRibbonMenu(null, eEventSource.Code);
+        }
+
+        /// <summary>
+        /// Closes the Ribbon Menu if one is currently displayed.
+        /// </summary>
+        public void CloseRibbonMenu(object source, eEventSource eventSource)
+        {
+            if (!m_PopupMode || m_PopupRibbonPanel == null) return;
+
+            RibbonPopupCloseEventArgs pce = new RibbonPopupCloseEventArgs(source, eventSource);
+            OnBeforeRibbonPanelPopupClose(pce);
+            if (pce.Cancel) return;
+
+            CloseRibbonMenu(m_PopupRibbonPanel);
+
+            m_PopupRibbonPanel = null;
+            m_PopupMode = false;
+        }
+
+        private int GetPopupRibbonPanelHeight(RibbonPanel panel)
+        {
+            if (this.AutoSize)
+                return GetAutoPanelHeight(panel);
+
+            int height = m_ExpandedHeight - m_RibbonStrip.Height;
+            if (m_ExpandedQatBelowRibbon)
+                height -= m_ExpandedQatHeight + 1;
+            //else
+            //    height -= DefaultBottomDockPadding;
+
+            return height;
+        }
+
+        internal void RibbonTabItemClick(RibbonTabItem rt)
+        {
+            if (!this.Expanded)
+            {
+                if (m_MenuTabsEnabled)
+                {
+                    if (rt.Panel == m_PopupRibbonPanel)
+                        CloseRibbonMenu(rt, eEventSource.Mouse);
+                    else
+                        PopupRibbon(rt, eEventSource.Mouse);
+                }
+                else
+                    this.Expanded = true;
+            }
+        }
+
+        internal void RibbonTabItemDoubleClick(RibbonTabItem ribbonTabItem)
+        {
+            if (m_MenuTabsEnabled && !this.Expanded)
+            {
+                this.CloseRibbonMenu(ribbonTabItem, eEventSource.Code);
+                this.Expanded = true;
+            }
+            else
+                this.Expanded = false;
+        }
+
+        private bool _MouseWheelTabScrollEnabled = true;
+        /// <summary>
+        /// Gets or sets whether mouse wheel scrolls through the ribbon tabs. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether mouse wheel scrolls through the ribbon tabs.")]
+        public bool MouseWheelTabScrollEnabled
+        {
+            get { return _MouseWheelTabScrollEnabled; }
+            set
+            {
+                _MouseWheelTabScrollEnabled = value;
+            }
+        }
+
+
+        private bool m_SetExpandedDelayed = false;
+        private bool m_ExpandedDelayed = false;
+        /// <summary>
+        /// Gets or sets whether control is expanded or not. When control is expanded both the tabs and the tab ribbons are visible. When collapsed
+        /// only tabs are visible.
+        /// </summary>
+        [DefaultValue(true), Browsable(true),DevCoBrowsable(true),Category("Layout"),Description("Gets or sets whether control is expanded or not. When control is expanded both the tabs and the tab ribbons are visible.")]
+        public bool Expanded
+        {
+            get { return m_Expanded; }
+            set
+            {
+                if (m_Expanded != value)
+                {
+                    if (m_IsLayoutSuspended || !BarFunctions.IsHandleValid(this))
+                    {
+                        m_SetExpandedDelayed = true;
+                        m_ExpandedDelayed = value;
+                        return;
+                    }
+                    m_SetExpandedDelayed = false;
+                    m_Expanded = value;
+                    OnExpandedChanged();
+                }
+            }
+        }
+
+        private int m_ExpandedHeight = 0;
+        private void OnExpandedChanged()
+        {
+            if (m_Expanded && m_QatToolbar != null)
+                m_QatToolbar.SendToBack();
+            else if (!m_Expanded && m_QatToolbar != null)
+                m_QatToolbar.BringToFront();
+            m_RibbonStrip.Invalidate();
+
+            if (this.AutoSize)
+                RecalculateAutoSize();
+            else
+            {
+                int height = 0; // m_RibbonStrip.Height;
+
+                if (!this.Expanded)
+                {
+                    height = GetCollapsedHeight();
+                    m_ExpandedQatBelowRibbon = m_QatPositionedBelow;
+                    if (m_QatPositionedBelow)
+                    {
+                        //height += m_QatToolbar.Height;
+                        m_ExpandedQatHeight = m_QatToolbar.Height;
+                    }
+                }
+
+                if (this.Expanded)
+                {
+                    height = m_ExpandedHeight;
+                    // If QAT Position changed substract its height
+                    if (!m_QatPositionedBelow && m_ExpandedQatBelowRibbon) // Qat was below but while collapsed moved up
+                        height -= m_ExpandedQatHeight;
+                    else if (m_QatPositionedBelow && !m_ExpandedQatBelowRibbon) // Qat was above but while collapsed moved down
+                        height += m_QatToolbar.Height;
+                }
+                else
+                    m_ExpandedHeight = this.Height;
+
+                if (this.Height != height && height > 0)
+                    this.Height = height;
+            }
+
+            if (StyleManager.IsMetro(EffectiveStyle))
+            {
+                RibbonForm form=this.FindForm() as RibbonForm;
+                if (form != null)
+                {
+                    BaseItem button = GetApplicationButton() as BaseItem;
+                    if (button != null)
+                        form.Invalidate(new Rectangle(0, button.TopInternal, form.Width, button.HeightInternal + 16));
+                }
+
+            }
+
+            if (ExpandedChanged != null)
+                ExpandedChanged(this, new EventArgs());
+        }
+
+        private int GetCollapsedHeight()
+        {
+            int height = m_RibbonStrip.Height;
+            if (m_QatPositionedBelow)
+                height += m_QatToolbar.Height;
+            return height;
+        }
+
+        /// <summary>
+        /// Gets or sets whether control is collapsed when RibbonTabItem is double clicked and expanded when RibbonTabItem is clicked.
+        /// Default value is true.
+        /// </summary>
+        [DefaultValue(true), Browsable(true), DevCoBrowsable(true), Category("Layout"), Description("Indicates whether control is collapsed when RibbonTabItem is double clicked and expanded when RibbonTabItem is clicked.")]
+        public virtual bool AutoExpand
+        {
+            get { return m_RibbonStrip.AutoExpand; }
+            set { m_RibbonStrip.AutoExpand = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether control is collapsed/expanded when Ctrl+F1 key is clicked.
+        /// Default value is true.
+        /// </summary>
+        [DefaultValue(true), Browsable(true), DevCoBrowsable(true), Category("Layout"), Description("Indicates whether control is collapsed/expanded when Ctrl+F1 key is clicked.")]
+        public virtual bool AutoKeyboardExpand
+        {
+            get { return m_RibbonStrip.AutoKeyboardExpand; }
+            set { m_RibbonStrip.AutoKeyboardExpand = value; }
+        }
+
+        /// <summary>
+        /// ImageList for images used on Items. Images specified here will always be used on menu-items and are by default used on all Bars.
+        /// </summary>
+        [Browsable(true), Category("Data"), DefaultValue(null), Description("ImageList for images used on Items. Images specified here will always be used on menu-items and are by default used on all Bars.")]
+        public ImageList Images
+        {
+            get { return m_RibbonStrip.Images; }
+            set { m_RibbonStrip.Images = value; }
+        }
+
+        /// <summary>
+        /// ImageList for medium-sized images used on Items.
+        /// </summary>
+        [Browsable(true), Category("Data"), DefaultValue(null), Description("ImageList for medium-sized images used on Items.")]
+        public ImageList ImagesMedium
+        {
+            get { return m_RibbonStrip.ImagesMedium; }
+            set { m_RibbonStrip.ImagesMedium = value; }
+        }
+
+        /// <summary>
+        /// ImageList for large-sized images used on Items.
+        /// </summary>
+        [Browsable(true), Category("Data"), DefaultValue(null), Description("ImageList for large-sized images used on Items.")]
+        public ImageList ImagesLarge
+        {
+            get { return m_RibbonStrip.ImagesLarge; }
+            set { m_RibbonStrip.ImagesLarge = value; }
+        }
+
+        protected override void OnTabStopChanged(System.EventArgs e)
+        {
+            base.OnTabStopChanged(e);
+            m_RibbonStrip.TabStop = this.TabStop;
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the user can give the focus to this control using the TAB key. Default value is false.
+        /// </summary>
+        [Browsable(true), DefaultValue(false), Category("Behavior"), Description("Indicates whether the user can give the focus to this control using the TAB key.")]
+        public new bool TabStop
+        {
+            get { return base.TabStop; }
+            set { base.TabStop = value; }
+        }
+
+        private eBackgroundImagePosition _BackgroundImagePosition = eBackgroundImagePosition.TopRight;
+        /// <summary>
+        /// Indicates the position of the BackgroundImage
+        /// </summary>
+        [DefaultValue(eBackgroundImagePosition.TopRight), Category("Appearance"), Description("Indicates the position of the BackgroundImage")]
+        public eBackgroundImagePosition BackgroundImagePosition
+        {
+            get { return _BackgroundImagePosition; }
+            set { _BackgroundImagePosition = value; }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public override ImageLayout BackgroundImageLayout
+        {
+            get
+            {
+                return base.BackgroundImageLayout;
+            }
+            set
+            {
+                base.BackgroundImageLayout = value;
+            }
+        }
+        #endregion
+
+        #region Mdi Child System Item handling
+        /// <summary>
+        /// Specifies whether the MDI system buttons are displayed in ribbon strip when MDI Child window is maximized.
+        /// </summary>
+        [System.ComponentModel.Browsable(true), DefaultValue(true), System.ComponentModel.Category("Run-time Behavior"), System.ComponentModel.Description("Specifies whether the MDI system buttons are displayed in menu bar when MDI Child window is maximized.")]
+        public bool MdiSystemItemVisible
+        {
+            get
+            {
+                return m_MdiSystemItemVisible;
+            }
+            set
+            {
+                if (m_MdiSystemItemVisible != value)
+                {
+                    m_MdiSystemItemVisible = value;
+                    if (!this.DesignMode)
+                    {
+                        SyncMdiChildSystemItem();
+                        if (!m_MdiSystemItemVisible)
+                        {
+                            if (m_ActiveMdiChild != null)
+                            {
+                                // Release the form
+                                m_ActiveMdiChild.Resize -= new System.EventHandler(MdiChildFormResize);
+                                m_ActiveMdiChild.VisibleChanged -= new System.EventHandler(MdiChildVisibleChanged);
+                            }
+
+                            //// Remove event handler
+                            //Form form = this.FindForm();
+                            //if (form != null)
+                            //    form.MdiChildActivate -= new System.EventHandler(ParentFormMdiChildActivate);
+                        }
+                        //else
+                        //{
+                        //    // Hook into the parent form if any...
+                        //    Form form = this.FindForm();
+                        //    if (form != null)
+                        //        form.MdiChildActivate += new System.EventHandler(ParentFormMdiChildActivate);
+                        //}
+                    }
+                }
+            }
+        }
+
+        private bool m_IsLayoutSuspended = false;
+        /// <summary>
+        /// Suspends the form layout.
+        /// </summary>
+        public new void SuspendLayout()
+        {
+            base.SuspendLayout();
+            m_IsLayoutSuspended = true;
+        }
+
+        /// <summary>
+        /// Suspends the form layout.
+        /// </summary>
+        public new void ResumeLayout()
+        {
+            m_IsLayoutSuspended = false;
+            if (m_SetColorTableDelayed)
+            {
+                m_SetColorTableDelayed = false;
+                this.Office2007ColorTable = m_DelayedColorTableChange;
+            }
+            base.ResumeLayout();
+        }
+
+        /// <summary>
+        /// Suspends the form layout.
+        /// </summary>
+        public new void ResumeLayout(bool performLayout)
+        {
+            m_IsLayoutSuspended = false;
+            if (m_SetColorTableDelayed)
+            {
+                m_SetColorTableDelayed = false;
+                this.Office2007ColorTable = m_DelayedColorTableChange;
+            }
+            base.ResumeLayout(performLayout);
+        }
+
+        /// <summary>
+        /// Gets or sets whether Ribbon control employs the Windows Vista Glass support when available. This is managed automatically by Ribbon Control and
+        /// no setting is necessary on your part.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public virtual bool CanSupportGlass
+        {
+            get { return m_RibbonStrip.CanSupportGlass; }
+            set { m_RibbonStrip.CanSupportGlass = value; }
+        }
+
+        private Form _ParentForm = null;
+        private void ReleaseParentForm()
+        {
+            Form parentForm = _ParentForm;
+            _ParentForm = null;
+            if (parentForm != null)
+            {
+                parentForm.MdiChildActivate -= ParentFormMdiChildActivate;
+            }
+        }
+        protected override void OnParentChanged(System.EventArgs e)
+        {
+            ReleaseParentForm();
+
+            base.OnParentChanged(e);
+
+            Form form = this.FindForm();
+            if (form != null)
+            {
+                form.MdiChildActivate += ParentFormMdiChildActivate;
+                _ParentForm = form;
+            }
+
+            if (m_SetColorTableDelayed && !m_IsLayoutSuspended)
+            {
+                m_SetColorTableDelayed = false;
+                this.Office2007ColorTable = m_DelayedColorTableChange;
+            }
+        }
+
+        private void ParentFormMdiChildActivate(object sender, System.EventArgs e)
+        {
+            Form form = this.FindForm();
+            if (form == null)
+                return;
+
+            Form mdiChild = form.ActiveMdiChild;
+            if (m_MdiSystemItemVisible)
+            {
+                if (mdiChild != null)
+                {
+                    mdiChild.Resize += new System.EventHandler(MdiChildFormResize);
+                    mdiChild.VisibleChanged += new System.EventHandler(MdiChildVisibleChanged);
+                }
+
+                if (m_ActiveMdiChild != null)
+                {
+                    m_ActiveMdiChild.Resize -= new System.EventHandler(MdiChildFormResize);
+                    m_ActiveMdiChild.VisibleChanged -= new System.EventHandler(MdiChildVisibleChanged);
+                }
+                m_MdiChildMaximized = false;
+                m_ActiveMdiChild = mdiChild;
+                SyncMdiChildSystemItem();
+            }
+
+            UpdateMerging();
+
+        }
+
+        private void UpdateMerging()
+        {
+            if (!m_AllowMerge) return;
+
+            Form form = this.FindForm();
+            if (form == null)
+                return;
+
+            Form mdiChild = form.ActiveMdiChild;
+
+            if (mdiChild == m_PreviousMergedForm)
+                return;
+            bool selectedRemoved = false;
+            this.SuspendLayout();
+            m_RibbonStrip.BeginUpdate();
+            if (m_PreviousMergedForm != null)
+            {
+                ArrayList list = GetMergeContainers(m_PreviousMergedForm);
+                foreach (RibbonBarMergeContainer cont in list)
+                {
+                    if (cont.RibbonTabItem == this.SelectedRibbonTabItem)
+                        selectedRemoved = true;
+                    cont.RemoveMergedRibbonBars(this);
+                }
+                m_PreviousMergedForm = null;
+            }
+
+            if (mdiChild != null)
+            {
+                ArrayList list = GetMergeContainers(mdiChild);
+                if (list.Count > 0)
+                {
+                    bool first = true;
+                    foreach (RibbonBarMergeContainer cont in list)
+                    {
+                        cont.MergeRibbonBars(this);
+                        if (first && cont.RibbonTabItem != null && cont.AutoActivateTab)
+                        {
+                            cont.RibbonTabItem.Checked = true;
+                            selectedRemoved = false;
+                        }
+                    }
+                    m_PreviousMergedForm = mdiChild;
+                }
+            }
+
+            if (selectedRemoved)
+                SelectFirstVisibleRibbonTab();
+
+            m_RibbonStrip.EndUpdate(false);
+            this.ResumeLayout(true);
+            this.RecalcLayout();
+        }
+
+        /// <summary>
+        /// Selects first visible RibbonTab.
+        /// </summary>
+        /// <returns>Returns true if selection is performed otherwise false.</returns>
+        public bool SelectFirstVisibleRibbonTab()
+        {
+            // Select first visible
+            foreach (BaseItem item in this.Items)
+            {
+                if (item is RibbonTabItem && item.Visible)
+                {
+                    ((RibbonTabItem)item).Checked = true;
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        private ArrayList GetMergeContainers(Form form)
+        {
+            ArrayList list = new ArrayList();
+            foreach (Control c in form.Controls)
+            {
+                if (c is RibbonBarMergeContainer && ((RibbonBarMergeContainer)c).AllowMerge)
+                {
+                    list.Add(c);
+                }
+            }
+
+            return list;
+        }
+
+        private void MdiChildVisibleChanged(object sender, System.EventArgs e)
+        {
+            SyncMdiChildSystemItem();
+        }
+
+        private void MdiChildFormResize(object sender, System.EventArgs e)
+        {
+            SyncMdiChildSystemItem();
+        }
+
+        private void SyncMdiChildSystemItem()
+        {
+            if (m_MdiSystemItemVisible && m_ActiveMdiChild != null &&
+                IsMaximized(m_ActiveMdiChild) && m_ActiveMdiChild.Visible)
+            {
+                if (!m_MdiChildMaximized)
+                {
+                    m_RibbonStrip.ShowMDIChildSystemItems(m_ActiveMdiChild, true);
+                    m_MdiChildMaximized = true;
+                }
+            }
+            else
+            {
+                m_RibbonStrip.ClearMDIChildSystemItems(true);
+                m_MdiChildMaximized = false;
+            }
+        }
+
+        private bool IsMaximized(Form form)
+        {
+            if (form.WindowState == FormWindowState.Maximized)
+            {
+                if (form.IsMdiChild && !WinApi.IsZoomed(form.Handle))
+                    return false;
+                return true;
+            }
+
+            return false;
+        }
+        #endregion
+
+        #region Ribbon Customization
+
+        private bool DisplayCustomizeContextMenu
+        {
+            get { return this.CanCustomize && (this.CaptionVisible || m_UseExternalCustomization); }
+        }
+        /// <summary>
+        /// Called when right-mouse button is pressed over RibbonBar
+        /// </summary>
+        /// <param name="ribbonBar">Reference to RibbonBar object.</param>
+        internal void OnRibbonBarRightClick(RibbonBar ribbonBar, int x, int y)
+        {
+            if (!DisplayCustomizeContextMenu)
+                return;
+
+            if (ribbonBar.CanCustomize && (ribbonBar.TitleRectangle.Contains(x, y) || ribbonBar.OverflowState))
+            {
+                ShowCustomizeContextMenu(ribbonBar, false);
+            }
+            else
+            {
+                BaseItem item = ribbonBar.HitTest(x, y);
+                if (item != null && item.CanCustomize && !item.SystemItem)
+                {
+                    ShowCustomizeContextMenu(item, false);
+                }
+            }
+
+        }
+
+        /// <summary>
+        /// Called when right-mouse button is pressed over RibbonStrip
+        /// </summary>
+        /// <param name="ribbonStrip">Reference to RibbonStrip object.</param>
+        internal void OnRibbonStripRightClick(RibbonStrip ribbonStrip, int x, int y)
+        {
+            if (!DisplayCustomizeContextMenu)
+                return;
+            BaseItem item = ribbonStrip.HitTest(x, y);
+            if (item != null && item.CanCustomize && !item.SystemItem)
+            {
+                ShowCustomizeContextMenu(item, true);
+            }
+        }
+
+        /// <summary>
+        /// Displays popup customize context menu for given customization object.
+        /// </summary>
+        /// <param name="o">Object that should be customized, usually an instance of BaseItem.</param>
+        /// <param name="ribbonStrip">Indicates whether customize menu is displayed over ribbon strip</param>
+        internal virtual void ShowCustomizeContextMenu(object o, bool ribbonStrip)
+        {
+            if (o == null || !m_UseCustomizeDialog)
+                return;
+
+            m_RibbonStrip.ClosePopup(SYS_CUSTOMIZE_POPUP_MENU);
+
+            ButtonItem cont = new ButtonItem(SYS_CUSTOMIZE_POPUP_MENU);
+            cont.Style = eDotNetBarStyle.Office2007;
+            cont.SetOwner(m_RibbonStrip);
+
+            if ((CanCustomizeItem(o as BaseItem) || o is RibbonBar) && !m_UseExternalCustomization)
+            {
+                if (o is BaseItem && this.QuickToolbarItems.Contains((BaseItem)o))
+                {
+
+                    ButtonItem b = new ButtonItem(SysQatRemoveFromItemName);
+                    b.Text = this.SystemText.QatRemoveItemText;
+                    b.Click += new System.EventHandler(CustomizeRemoveFromQuickAccessToolbar);
+                    b.Tag = o;
+                    cont.SubItems.Add(b);
+                }
+                else
+                {
+                    BaseItem itemToCustomize = o as BaseItem;
+
+                    ButtonItem b = new ButtonItem(SysQatAddToItemName);
+                    b.Text = this.SystemText.QatAddItemText;
+                    b.Click += new System.EventHandler(CustomizeAddToQuickAccessToolbar);
+                    b.Tag = o;
+                    cont.SubItems.Add(b);
+
+                    if (itemToCustomize != null && this.QuickToolbarItems.Contains(itemToCustomize.Name) ||
+                        o is RibbonBar && this.QuickToolbarItems.Contains(GetQATRibbonBarName(o as RibbonBar)))
+                        b.Enabled = false;
+
+                    if (itemToCustomize != null && BaseItem.IsOnPopup(itemToCustomize) && itemToCustomize.Parent != null)
+                    {
+                        Control c = itemToCustomize.ContainerControl as Control;
+                        if (c != null) c.VisibleChanged += new EventHandler(CustomizePopupItemParentVisibleChange);
+                    }
+                }
+            }
+
+            if (m_UseCustomizeDialog)
+            {
+                ButtonItem b = new ButtonItem(SysQatCustomizeItemName);
+                b.Text = this.SystemText.QatCustomizeText;
+                b.BeginGroup = true;
+                b.Click += new EventHandler(CustomizeQuickAccessToolbarDialog);
+                cont.SubItems.Add(b);
+            }
+
+            if (m_EnableQatPlacement && !m_UseExternalCustomization)
+            {
+                ButtonItem b = new ButtonItem(SysQatPlaceItemName);
+                if (m_QatPositionedBelow)
+                    b.Text = this.SystemText.QatPlaceAboveRibbonText;
+                else
+                    b.Text = this.SystemText.QatPlaceBelowRibbonText;
+                b.Click += new EventHandler(QuickAccessToolbarChangePlacement);
+                cont.SubItems.Add(b);
+            }
+
+            if (this.AutoExpand)
+            {
+                ButtonItem b = new ButtonItem(this.Expanded ? SysMinimizeRibbon : SysMaximizeRibbon, this.Expanded ? this.SystemText.MinimizeRibbonText : this.SystemText.MaximizeRibbonText);
+                b.Click += new EventHandler(MinMaxRibbonClick);
+                b.BeginGroup = true;
+                cont.SubItems.Add(b);
+            }
+
+            RibbonCustomizeEventArgs e = new RibbonCustomizeEventArgs(o, cont);
+            OnBeforeCustomizeMenuPopup(e);
+            if (e.Cancel)
+            {
+                cont.Dispose();
+                return;
+            }
+
+            ((IOwnerMenuSupport)m_RibbonStrip).RegisterPopup(cont);
+            cont.Popup(Control.MousePosition);
+        }
+
+        private void MinMaxRibbonClick(object sender, EventArgs e)
+        {
+            this.Expanded = !this.Expanded;
+        }
+
+        private void CustomizePopupItemParentVisibleChange(object sender, EventArgs e)
+        {
+            Control c = sender as Control;
+            if (c == null) return;
+            c.VisibleChanged -= new EventHandler(CustomizePopupItemParentVisibleChange);
+            // Close the Customize Context menu we displayed
+            m_RibbonStrip.ClosePopup(SYS_CUSTOMIZE_POPUP_MENU);
+        }
+
+        private void QuickAccessToolbarChangePlacement(object sender, EventArgs e)
+        {
+            QuickAccessToolbarChangePlacement();
+        }
+
+        private int _QuickAccessToolbarBelowRibbonHeight = 0;
+        /// <summary>
+        /// Indicates Quick Access Toolbar height when positioned below the Ribbon. Default value of 0 indicates auto-height.
+        /// </summary>
+        [DefaultValue(0), Category("Appearance"), Description("Indicates Quick Access Toolbar height when positioned below the Ribbon. Default value of 0 indicates auto-height.")]
+        public int QuickAccessToolbarBelowRibbonHeight
+        {
+            get { return _QuickAccessToolbarBelowRibbonHeight; }
+            set
+            {
+                if (_QuickAccessToolbarBelowRibbonHeight != value)
+                {
+                    if (value < 0) value = 0;
+                    _QuickAccessToolbarBelowRibbonHeight = value;
+                    if (m_QatToolbar != null)
+                    {
+                        int oldHeight = m_QatToolbar.Height;
+                        m_QatToolbar.Height = _QuickAccessToolbarBelowRibbonHeight > 0 ? _QuickAccessToolbarBelowRibbonHeight : m_QatToolbar.GetAutoSizeHeight();
+                        if (m_AutoSize)
+                            this.AutoSyncSize();
+                        else
+                            this.Height += m_QatToolbar.Height - oldHeight;
+                        this.Invalidate(true);
+                    }
+                }
+            }
+        }
+
+
+        internal void QuickAccessToolbarChangePlacement()
+        {
+            m_RibbonStrip.ClosePopups();
+            if (m_QatPositionedBelow)
+            {
+                m_QatToolbar.ClosePopups();
+                m_QatToolbar.Visible = false;
+                ArrayList qatItems = new ArrayList(m_QatToolbar.Items.Count);
+                m_QatToolbar.Items.CopyTo(qatItems);
+                m_QatToolbar.Items.Clear();
+
+                // Find insert position before any far or center aligned items
+                GenericItemContainer captionCont = m_RibbonStrip.CaptionContainerItem;
+                int insertIndex = captionCont.SubItems.Count - 1;
+                for (int i = 0; i < captionCont.SubItems.Count; i++)
+                {
+                    if (captionCont.SubItems[i].ItemAlignment != eItemAlignment.Near)
+                    {
+                        insertIndex = Math.Max(0, i);
+                        break;
+                    }
+                }
+
+                foreach (BaseItem item in qatItems)
+                {
+                    captionCont.SubItems.Insert(insertIndex, item);
+                    insertIndex++;
+                }
+                if (m_QatSubItemsCollection != null)
+                {
+                    m_QatSubItemsCollection._Clear();
+                    m_QatSubItemsCollection = null;
+                }
+                this.DockPadding.Bottom = DefaultBottomDockPadding;
+                m_QatPositionedBelow = false;
+                m_RibbonStrip.RecalcLayout();
+                if (m_AutoSize)
+                    this.AutoSyncSize();
+                else
+                    this.Height -= (m_QatToolbar.Height + m_QatToolbar.DockPadding.Top);
+                m_QatToolbar.Dispose();
+                m_QatToolbar = null;
+            }
+            else
+            {
+                if (m_QatToolbar == null)
+                    CreateQatToolbar();
+                this.DockPadding.Bottom = 1;
+                m_QatToolbar.BeginUpdate();
+                ArrayList qatItems = GetQatItems(true);
+                foreach (BaseItem item in qatItems)
+                {
+                    this.QuickToolbarItems.Remove(item);
+                    m_QatToolbar.Items.Add(item);
+                }
+                m_QatToolbar.EndUpdate();
+                m_QatToolbar.Height = _QuickAccessToolbarBelowRibbonHeight > 0 ? _QuickAccessToolbarBelowRibbonHeight : m_QatToolbar.GetAutoSizeHeight();
+                m_QatPositionedBelow = true;
+                if (m_AutoSize)
+                    this.AutoSyncSize();
+                else
+                    this.Height += (m_QatToolbar.Height + m_QatToolbar.DockPadding.Top);
+            }
+            this.RecalcLayout();
+            m_QatLayoutChanged = true;
+            OnQatPlacementChanged(EventArgs.Empty);
+        }
+
+        /// <summary>
+        /// Raises the QatPlacementChanged event.
+        /// </summary>
+        /// <param name="e">Event arguments.</param>
+        protected virtual void OnQatPlacementChanged(EventArgs e)
+        {
+            EventHandler handler = QatPlacementChanged;
+            if (handler != null) handler(this, e);
+        }
+        private ArrayList GetQatItems(bool includeCustomizeItem)
+        {
+            ArrayList list = new ArrayList();
+            foreach (BaseItem item in this.QuickToolbarItems)
+            {
+                if (item.ItemAlignment != eItemAlignment.Near) break;
+                if (IsSystemItem(item) || item is ButtonItem && ((ButtonItem)item).HotTrackingStyle == eHotTrackingStyle.Image && this.QuickToolbarItems.IndexOf(item) == 0)
+                {
+                    if (includeCustomizeItem && item is CustomizeItem)
+                        list.Add(item);
+                    continue;
+                }
+                list.Add(item);
+            }
+
+            return list;
+        }
+
+        internal Ribbon.QatToolbar QatToolbar
+        {
+            get { return m_QatToolbar; }
+        }
+
+        private void CreateQatToolbar()
+        {
+            m_QatToolbar = new Ribbon.QatToolbar();
+            m_QatToolbar.FadeEffect = m_RibbonStrip.FadeEffect;
+            m_QatToolbar.Style = this.Style;
+
+            //if (this.Style == eDotNetBarStyle.Office2007)
+            //{
+            //    RibbonPredefinedColorSchemes.ApplyOffice2007ColorScheme(m_QatToolbar);
+            //}
+            //else
+            //{
+            //    m_QatToolbar.BackgroundStyle.ApplyStyle(this.BackgroundStyle);
+            //}
+            m_QatToolbar.Dock = DockStyle.Bottom;
+            this.Controls.Add(m_QatToolbar);
+            if (!this.Expanded)
+                m_QatToolbar.BringToFront();
+        }
+
+        private void CustomizeQuickAccessToolbarDialog(object sender, EventArgs e)
+        {
+            ShowQatCustomizeDialog();
+        }
+
+        private bool CanCustomizeItem(BaseItem item)
+        {
+            if (item == null)
+                return false;
+
+            if (!item.CanCustomize || item.SystemItem)
+                return false;
+
+            if (item is ItemContainer) // && ((ItemContainer)item).SystemContainer)
+                return false;
+
+            if (item is ButtonItem && this.QuickToolbarItems.IndexOf(item) == 0)
+                return false;
+
+            return true;
+        }
+
+        private string GetQATRibbonBarName(RibbonBar bar)
+        {
+            return "qt_" + bar.Name;
+        }
+
+        private void CustomizeRemoveFromQuickAccessToolbar(object sender, System.EventArgs e)
+        {
+            ButtonItem b = sender as ButtonItem;
+            if (b.Tag is BaseItem)
+            {
+                BaseItem item = b.Tag as BaseItem;
+                RemoveItemFromQuickAccessToolbar(item);
+            }
+
+            b.Tag = null;
+        }
+
+        /// <summary>
+        /// Removes an item from the Quick Access Toolbar.
+        /// </summary>
+        /// <param name="item">Reference to the item that is already part of Quick Access Toolbar.</param>
+        public void RemoveItemFromQuickAccessToolbar(BaseItem item)
+        {
+            RibbonCustomizeEventArgs rc = new RibbonCustomizeEventArgs(item, null);
+            OnBeforeRemoveItemFromQuickAccessToolbar(rc);
+
+            if (!rc.Cancel)
+            {
+                this.QuickToolbarItems.Remove(item);
+                //item.Parent.SubItems.Remove(item);
+                this.RecalcLayout();
+                m_QatLayoutChanged = true;
+            }
+        }
+
+        private void CustomizeAddToQuickAccessToolbar(object sender, System.EventArgs e)
+        {
+            ButtonItem b = sender as ButtonItem;
+
+            AddItemToQuickAccessToolbar(b.Tag);
+
+            b.Tag = null;
+        }
+
+        /// <summary>
+        /// Adds an instance of base type BaseItem or RibbonBar to the Quick Access Toolbar. Note that this method creates
+        /// new instance of the item or an representation of the item being added and adds that to the Quick Access Toolbar.
+        /// </summary>
+        /// <param name="originalItem">Reference to the item to add, must be an BaseItem type or RibbonBar type.</param>
+        public void AddItemToQuickAccessToolbar(object originalItem)
+        {
+            BaseItem copy = GetQatItemCopy(originalItem);
+            if (copy != null)
+            {
+                RibbonCustomizeEventArgs re = new RibbonCustomizeEventArgs(copy, null);
+                OnBeforeAddItemToQuickAccessToolbar(re);
+                if (!re.Cancel)
+                {
+                    this.QuickToolbarItems.Add(copy);
+                    this.RecalcLayout();
+                    m_QatLayoutChanged = true;
+                }
+            }
+        }
+
+        private BaseItem GetQatItemCopy(object o)
+        {
+            BaseItem copy = null;
+            if (o is ButtonItem)
+            {
+                ButtonItem button = ((ButtonItem)o).Copy() as ButtonItem;
+                button.KeyTips = "";
+                button.ImageFixedSize = Size.Empty;
+                button.FixedSize = Size.Empty;
+                button.ButtonStyle = eButtonStyle.Default;
+                button.ImagePosition = eImagePosition.Left;
+                button.BeginGroup = false;
+                button.UseSmallImage = true;
+
+                if (button.TextMarkupBody != null && button.TextMarkupBody.HasExpandElement)
+                    button.Text = TextMarkup.MarkupParser.RemoveExpand(button.Text);
+
+                if (button.Image == null && button.ImageIndex == -1 && button.Icon == null)
+                    button.Image = BarFunctions.LoadBitmap("SystemImages.GreenLight.png");
+                else
+                    button.ImageFixedSize = new Size(16, 16);
+                copy = button;
+            }
+            else if (o is BaseItem)
+            {
+                copy = ((BaseItem)o).Copy();
+                copy.KeyTips = "";
+            }
+            else if (o is RibbonBar)
+            {
+                RibbonBar bar = o as RibbonBar;
+                ButtonItem item = new ButtonItem(GetQATRibbonBarName(bar));
+                item.Image = bar.GetOverflowButtonImage();
+                item.ImageFixedSize = new Size(16, 16);
+                item.AutoExpandOnClick = true;
+                item.Tooltip = bar.Text;
+                item.Text = bar.Text;
+                RibbonBar qatBar = null;
+                bool recalcLayout = false;
+                if (bar.IsItemsAutoSizeActive)
+                {
+                    bar.RestoreAutoSizedItems();
+                    qatBar = bar.CreateOverflowRibbon(true);
+                    recalcLayout = true;
+                }
+                else
+                    qatBar = bar.CreateOverflowRibbon(true);
+                qatBar.IsOnQat = true;
+                qatBar.QatButtonParent = item;
+                foreach (BaseItem child in bar.Items)
+                {
+                    BaseItem childCopy = child.Copy();
+                    qatBar.Items.Add(childCopy);
+                }
+                if (recalcLayout) bar.RecalcLayout();
+
+                ItemContainer ic = new ItemContainer();
+                ic.Stretch = true;
+                ControlContainerItem cont = new ControlContainerItem();
+                cont.AllowItemResize = false;
+                ic.SubItems.Add(cont);
+                cont.Control = qatBar;
+                item.SubItems.Add(ic);
+
+                copy = item;
+            }
+
+            return copy;
+        }
+
+        /// <summary>
+        /// Raises the BeforeCustomizeMenuPopup event.
+        /// </summary>
+        /// <param name="e">Event arguments</param>
+        protected virtual void OnBeforeCustomizeMenuPopup(RibbonCustomizeEventArgs e)
+        {
+            if (BeforeCustomizeMenuPopup != null)
+                BeforeCustomizeMenuPopup(this, e);
+        }
+
+        /// <summary>
+        /// Raises the BeforeAddItemToQuickAccessToolbar event.
+        /// </summary>
+        /// <param name="e">Event arguments.</param>
+        protected virtual void OnBeforeAddItemToQuickAccessToolbar(RibbonCustomizeEventArgs e)
+        {
+            if (BeforeAddItemToQuickAccessToolbar != null)
+                BeforeAddItemToQuickAccessToolbar(this, e);
+        }
+
+        protected virtual void OnBeforeRemoveItemFromQuickAccessToolbar(RibbonCustomizeEventArgs e)
+        {
+            if (BeforeRemoveItemFromQuickAccessToolbar != null)
+                BeforeRemoveItemFromQuickAccessToolbar(this, e);
+        }
+
+        /// <summary>
+        /// Gets or sets whether control can be customized and items added by end-user using context menu to the quick access toolbar.
+        /// Caption of the control must be visible for customization to be enabled. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Browsable(true), Category("Quick Access Toolbar"), Description("Indicates whether control can be customized. Caption must be visible for customization to be fully enabled.")]
+        public bool CanCustomize
+        {
+            get { return m_RibbonStrip.CanCustomize; }
+            set { m_RibbonStrip.CanCustomize = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether external implementation for ribbon bar and menu item customization will be used for customizing the ribbon control. When set to true
+        /// it enables the displaying of RibbonBar and menu item context menus which allow customization. You are responsible for
+        /// adding the menu items to context menu to handle all aspects of item customization. See "Ribbon Control Quick Access Toolbar Customization" topic in help file under How To.
+        /// Default value is false.
+        /// </summary>
+        [DefaultValue(false), Browsable(true), Category("Quick Access Toolbar"), Description("Indicates whether external implementation for ribbon bar and menu item customization will be used for customizing the ribbon control.")]
+        public bool UseExternalCustomization
+        {
+            get { return m_UseExternalCustomization; }
+            set { m_UseExternalCustomization = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether end-user customization of the placement of the Quick Access Toolbar is enabled. User
+        /// can change the position of the Quick Access Toolbar using the customize menu. Default value is true.
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Quick Access Toolbar"), Description("Indicates whether end-user customization of the placement of the Quick Access Toolbar is enabled.")]
+        public bool EnableQatPlacement
+        {
+            get { return m_EnableQatPlacement; }
+            set { m_EnableQatPlacement = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether customize dialog is used to customize the quick access toolbar. You can handle the EnterCustomize event 
+        /// to display your custom dialog instead of built-in dialog for customization. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Browsable(true), Category("Quick Access Toolbar"), Description("Indicates whether customize dialog is used to customize the quick access toolbar.")]
+        public bool UseCustomizeDialog
+        {
+            get { return m_UseCustomizeDialog; }
+            set { m_UseCustomizeDialog = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the categorization mode for the items on Quick Access Toolbar customize dialog box. Default value categorizes
+        /// items by the ribbon bar they appear on.
+        /// </summary>
+        [DefaultValue(eCategorizeMode.RibbonBar), Browsable(true), Category("Quick Access Toolbar"), Description("Indicates categorization mode for the items on Quick Access Toolbar customize dialog box.")]
+        public eCategorizeMode CategorizeMode
+        {
+            get { return m_CategorizeMode; }
+            set { m_CategorizeMode = value; }
+        }
+
+        /// <summary>
+        /// Shows the quick access toolbar customize dialog.
+        /// </summary>
+        public virtual void ShowQatCustomizeDialog()
+        {
+            Form qatDialog = CreateQatCustomizeDialog();
+
+            if (BeforeQatCustomizeDialog != null)
+            {
+                QatCustomizeDialogEventArgs ce = new QatCustomizeDialogEventArgs(qatDialog);
+                BeforeQatCustomizeDialog(this, ce);
+                if (ce.Cancel || ce.Dialog == null)
+                {
+                    qatDialog.Dispose();
+                    return;
+                }
+
+                qatDialog = ce.Dialog;
+            }
+
+            if (qatDialog is Ribbon.QatCustomizeDialog)
+                ((Ribbon.QatCustomizeDialog)qatDialog).LoadItems(this);
+
+            Form form = this.FindForm();
+            qatDialog.StartPosition = FormStartPosition.CenterParent;
+            DialogResult result = qatDialog.ShowDialog(form);
+
+            if (AfterQatCustomizeDialog != null)
+            {
+                QatCustomizeDialogEventArgs ce = new QatCustomizeDialogEventArgs(qatDialog);
+                AfterQatCustomizeDialog(this, ce);
+                if (ce.Cancel)
+                {
+                    qatDialog.Dispose();
+                    return;
+                }
+            }
+
+            if (result == DialogResult.Cancel)
+            {
+                qatDialog.Dispose();
+                return;
+            }
+
+            // Apply changes to the Quick Access Toolbar
+            Ribbon.QatCustomizeDialog qd = qatDialog as Ribbon.QatCustomizeDialog;
+            if (qd == null || !qd.QatCustomizePanel.DataChanged) return;
+            ApplyQatCustomizePanelChanges(qd.QatCustomizePanel);
+            qatDialog.Dispose();
+        }
+
+        /// <summary>
+        /// Applies the Quick Access Toolbar customization changes made on QatCustomizePanel to the Ribbon Control Quick Access Toolbar. Note that QatCustomizePanel.DataChanged property indicates whether user made any changes to the data on the panel.
+        /// </summary>
+        /// <param name="customizePanel">Reference to the QatCustomizePanel</param>
+        public void ApplyQatCustomizePanelChanges(Ribbon.QatCustomizePanel customizePanel)
+        {
+            if (customizePanel == null || !customizePanel.DataChanged) return;
+            m_RibbonStrip.BeginUpdate();
+            try
+            {
+                ItemPanel itemPanelQat = customizePanel.itemPanelQat;
+
+                int start = 0;
+                BaseItem startButton = GetApplicationButton();
+                if (startButton != null)
+                    start = this.QuickToolbarItems.IndexOf(startButton) + 1;
+
+                ArrayList removeList = new ArrayList();
+                SubItemsCollection qatList = new SubItemsCollection(null);
+
+                for (int i = start; i < this.QuickToolbarItems.Count; i++)
+                {
+                    BaseItem item = this.QuickToolbarItems[i];
+                    if (IsSystemItem(item))
+                        continue;
+
+                    if (!itemPanelQat.Items.Contains(item.Name))
+                        removeList.Add(item);
+                    else
+                        qatList._Add(item);
+                }
+
+                foreach (BaseItem item in removeList)
+                    this.QuickToolbarItems.Remove(item);
+                foreach (BaseItem item in qatList)
+                    this.QuickToolbarItems.Remove(item);
+
+                foreach (BaseItem item in itemPanelQat.Items)
+                {
+                    // Already exists on Quick Access Toolbar
+                    if (item.Tag != null)
+                    {
+                        BaseItem copy = GetQatItemCopy(item.Tag as BaseItem);
+                        this.QuickToolbarItems.Add(copy);
+                    }
+                    else
+                    {
+                        BaseItem qatItem = qatList[item.Name];
+                        if (qatItem != null)
+                            this.QuickToolbarItems.Add(qatItem);
+                    }
+                }
+
+                m_QatLayoutChanged = true;
+            }
+            finally
+            {
+                m_RibbonStrip.EndUpdate();
+            }
+            if (customizePanel.checkQatBelowRibbon.Checked != m_QatPositionedBelow)
+                QuickAccessToolbarChangePlacement();
+
+            OnAfterQatDialogChangesApplied();
+        }
+
+        /// <summary>
+        /// Raises the AfterQatDialogChangesApplied event.
+        /// </summary>
+        protected virtual void OnAfterQatDialogChangesApplied()
+        {
+            if (AfterQatDialogChangesApplied != null)
+                AfterQatDialogChangesApplied(this, new EventArgs());
+        }
+
+        private Ribbon.QatCustomizeDialog CreateQatCustomizeDialog()
+        {
+            Ribbon.QatCustomizeDialog qat = new Ribbon.QatCustomizeDialog();
+            qat.Text = SystemText.QatDialogCaption;
+            qat.buttonCancel.Text = SystemText.QatDialogCancelButton;
+            qat.buttonOK.Text = SystemText.QatDialogOkButton;
+            qat.QatCustomizePanel.buttonAddToQat.Text = SystemText.QatDialogAddButton;
+            qat.QatCustomizePanel.buttonRemoveFromQat.Text = SystemText.QatDialogRemoveButton;
+            qat.QatCustomizePanel.labelCategories.Text = SystemText.QatDialogCategoriesLabel;
+            qat.QatCustomizePanel.checkQatBelowRibbon.Text = SystemText.QatDialogPlacementCheckbox;
+
+            return qat;
+        }
+
+        private bool IsSystemItem(BaseItem item)
+        {
+            if (item.SystemItem || item is ItemContainer || item is CustomizeItem || item is SystemCaptionItem)
+                return true;
+            return false;
+        }
+        /// <summary>
+        /// Returns the ribbon Application Button.
+        /// </summary>
+        /// <returns>reference to Application Button or null if button is not found.</returns>
+        public BaseItem GetApplicationButton()
+        {
+            return m_RibbonStrip.GetApplicationButton();
+        }
+
+        /// <summary>
+        /// Gets or sets whether Quick Access toolbar is positioned below the ribbon.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool QatPositionedBelowRibbon
+        {
+            get { return m_QatPositionedBelow; }
+            set
+            {
+                if (m_QatPositionedBelow != value)
+                    QuickAccessToolbarChangePlacement();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Quick Access Toolbar layout description. You can use the value obtained from this property to save
+        /// the customized Quick Access Toolbar into registry or into any other storage object. You can also set the saved layout description back
+        /// to restore user customize layout.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public string QatLayout
+        {
+            get
+            {
+                return GetQatLayoutDescription();
+            }
+            set
+            {
+                SetQatLayoutDescription(value);
+            }
+        }
+
+        private string GetQatLayoutDescription()
+        {
+            ArrayList qatList = GetQatItems(false);
+            StringBuilder layoutDesc = new StringBuilder();
+            if (m_QatPositionedBelow)
+                layoutDesc.Append("1");
+            else
+                layoutDesc.Append("0");
+            foreach (BaseItem item in qatList)
+            {
+                if (item.Name != "")
+                {
+                    layoutDesc.Append("," + item.Name);
+                }
+            }
+
+            return layoutDesc.ToString();
+        }
+
+        private void SetQatLayoutDescription(string layoutDesc)
+        {
+            if (layoutDesc == "" || layoutDesc == null)
+                return;
+
+            string[] values = layoutDesc.Split(',');
+            if (values.Length == 0)
+                return;
+            bool qatBelow = values[0] == "1";
+            ArrayList qatItems = new ArrayList();
+            for (int i = 1; i < values.Length; i++)
+            {
+                if (this.QuickToolbarItems.Contains(values[i]))
+                    qatItems.Add(this.QuickToolbarItems[values[i]]);
+                else
+                {
+                    if (values[i].StartsWith("qt_"))
+                    {
+                        RibbonBar bar = GetRibbonBar(values[i].Substring(3));
+                        if (bar != null)
+                            qatItems.Add(GetQatItemCopy(bar));
+                    }
+                    else
+                    {
+                        BaseItem item = m_RibbonStrip.GetItem(values[i]);
+                        if (item != null && CanCustomizeItem(item))
+                            qatItems.Add(GetQatItemCopy(item));
+                    }
+
+                }
+            }
+
+            ArrayList removeItems = GetQatItems(false);
+            foreach (BaseItem item in removeItems)
+                this.QuickToolbarItems.Remove(item);
+
+            foreach (BaseItem item in qatItems)
+                this.QuickToolbarItems.Add(item);
+
+            if (m_QatPositionedBelow != qatBelow)
+                QuickAccessToolbarChangePlacement();
+
+            m_QatLayoutChanged = false;
+        }
+
+        private RibbonBar GetRibbonBar(string name)
+        {
+            foreach (Control c in this.Controls)
+            {
+                RibbonBar bar = GetRibbonBar(c, name);
+                if (bar != null)
+                    return bar;
+            }
+            return null;
+        }
+
+        private RibbonBar GetRibbonBar(Control parent, string name)
+        {
+            if (parent is RibbonBar && parent.Name == name)
+                return parent as RibbonBar;
+            foreach (Control c in parent.Controls)
+            {
+                RibbonBar bar = GetRibbonBar(c, name);
+                if (bar != null)
+                    return bar;
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Gets or sets whether Quick Access Toolbar has been customized by end-user. You can use value of this property to determine
+        /// whether Quick Access Toolbar layout that can be accessed using QatLayout property should be saved.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool QatLayoutChanged
+        {
+            get { return m_QatLayoutChanged; }
+            set { m_QatLayoutChanged = value; }
+        }
+
+        /// <summary>
+        /// Gets the reference to the ribbon localization object which holds all system text used by the component.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), NotifyParentPropertyAttribute(true), Category("Localization"), Description("Gets system text used by the component.."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public RibbonLocalization SystemText
+        {
+            get { return m_SystemText; }
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Ribbon/RibbonControl.ico b/PROMS/DotNetBar Source Code/Ribbon/RibbonControl.ico
new file mode 100644
index 00000000..1bb915c0
Binary files /dev/null and b/PROMS/DotNetBar Source Code/Ribbon/RibbonControl.ico differ
diff --git a/PROMS/DotNetBar Source Code/Ribbon/RibbonControl.png b/PROMS/DotNetBar Source Code/Ribbon/RibbonControl.png
new file mode 100644
index 00000000..a63159be
Binary files /dev/null and b/PROMS/DotNetBar Source Code/Ribbon/RibbonControl.png differ
diff --git a/PROMS/DotNetBar Source Code/Ribbon/RibbonControl2.bmp b/PROMS/DotNetBar Source Code/Ribbon/RibbonControl2.bmp
new file mode 100644
index 00000000..1534d99f
Binary files /dev/null and b/PROMS/DotNetBar Source Code/Ribbon/RibbonControl2.bmp differ
diff --git a/PROMS/DotNetBar Source Code/Ribbon/RibbonControl2.ico b/PROMS/DotNetBar Source Code/Ribbon/RibbonControl2.ico
new file mode 100644
index 00000000..03d4e2e3
Binary files /dev/null and b/PROMS/DotNetBar Source Code/Ribbon/RibbonControl2.ico differ
diff --git a/PROMS/DotNetBar Source Code/Ribbon/RibbonControlPainter.cs b/PROMS/DotNetBar Source Code/Ribbon/RibbonControlPainter.cs
new file mode 100644
index 00000000..0945cb06
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Ribbon/RibbonControlPainter.cs	
@@ -0,0 +1,36 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represents base class for Ribbon Control painting.
+    /// </summary>
+    internal class RibbonControlPainter
+    {
+        /// <summary>
+        /// Paints controls background
+        /// </summary>
+        public virtual void PaintBackground(RibbonControlRendererEventArgs e)
+        {
+        }
+
+        /// <summary>
+        /// Paints form caption background
+        /// </summary>
+        public virtual void PaintCaptionBackground(RibbonControlRendererEventArgs e, Rectangle displayRect)
+        {
+        }
+
+        /// <summary>
+        /// Paints form caption text when ribbon control is displaying form caption
+        /// </summary>
+        public virtual void PaintCaptionText(RibbonControlRendererEventArgs e) { }
+
+        /// <summary>
+        /// Paints the background of quick access toolbar.
+        /// </summary>
+        public virtual void PaintQuickAccessToolbarBackground(RibbonControlRendererEventArgs e) { }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Ribbon/RibbonDialogLauncherRendererEventArgs.cs b/PROMS/DotNetBar Source Code/Ribbon/RibbonDialogLauncherRendererEventArgs.cs
new file mode 100644
index 00000000..4d27449f
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Ribbon/RibbonDialogLauncherRendererEventArgs.cs	
@@ -0,0 +1,56 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Provides data for RibbonBar rendering events.
+    /// </summary>
+    public class RibbonBarRendererEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets or sets the reference to Graphics object.
+        /// </summary>
+        public Graphics Graphics = null;
+
+        /// <summary>
+        /// Gets or sets the part bounds.
+        /// </summary>
+        public Rectangle Bounds = Rectangle.Empty;
+
+        /// <summary>
+        /// Gets or sets the reference to RibbonBar.
+        /// </summary>
+        public RibbonBar RibbonBar = null;
+
+        /// <summary>
+        /// Gets or sets whether mouse over state should be painted for the ribbon bar part.
+        /// </summary>
+        public bool MouseOver = false;
+
+        /// <summary>
+        /// Gets or sets whether mouse is pressed over the ribbon part.
+        /// </summary>
+        public bool Pressed = false;
+
+        /// <summary>
+        /// Gets or sets the region that defines the content bounds. When background is rendered the renderer should set this property
+        /// to define the content clip.
+        /// </summary>
+        public Region ContentClip = null;
+
+        /// <summary>
+        /// Creates new instance of the object and initializes it with default values.
+        /// </summary>
+        /// <param name="g">Reference to Graphics object.</param>
+        /// <param name="bounds">Bounds of the part to be rendered.</param>
+        /// <param name="ribbon">Reference to ribbon bar.</param>
+        public RibbonBarRendererEventArgs(Graphics g, Rectangle bounds, RibbonBar ribbon)
+        {
+            this.Graphics = g;
+            this.Bounds = bounds;
+            this.RibbonBar = ribbon;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Ribbon/RibbonLocalization.cs b/PROMS/DotNetBar Source Code/Ribbon/RibbonLocalization.cs
new file mode 100644
index 00000000..12c356f7
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Ribbon/RibbonLocalization.cs	
@@ -0,0 +1,184 @@
+using System;
+using System.Text;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represents the class that stores text used by ribbon control only for localization purposes.
+    /// </summary>
+    [ToolboxItem(false), TypeConverter(typeof(System.ComponentModel.ExpandableObjectConverter))]
+    public class RibbonLocalization
+    {
+        #region Private Variables
+        private string m_QatRemoveItemText = "&Remove from Quick Access Toolbar";
+        private string m_QatAddItemText = "&Add to Quick Access Toolbar";
+        private string m_QatCustomizeText = "&Customize Quick Access Toolbar...";
+        private string m_QatPlaceBelowRibbonText = "&Place Quick Access Toolbar below the Ribbon";
+        private string m_QatPlaceAboveRibbonText = "&Place Quick Access Toolbar above the Ribbon";
+
+        private string m_QatDialogOkButton = "OK";
+        private string m_QatDialogCancelButton = "Cancel";
+        private string m_QatDialogAddButton = "&Add >>";
+        private string m_QatDialogRemoveButton = "&Remove";
+        private string m_QatDialogCategoriesLabel = "&Choose commands from:";
+        private string m_QatDialogPlacementCheckbox = "&Place Quick Access Toolbar below the Ribbon";
+        private string m_QatDialogCaption = "Customize Quick Access Toolbar";
+        private string m_MinimizeRibbonText = "Mi&nimize the Ribbon";
+        private string m_MaximizeRibbonText = "&Maximize the Ribbon";
+        private string m_QatCustomizeMenuLabel = "<b>Customize Quick Access Toolbar</b>";
+        #endregion
+
+        #region Internal Implementation
+        /// <summary>
+        /// Gets or sets the title text of the Quick Access Toolbar Customize dialog form.
+        /// </summary>
+        [Localizable(true), Description("Indicates the the title text of the Quick Access Toolbar Customize dialog form."), Category("QAT Customize Dialog")]
+        public string QatDialogCaption
+        {
+            get { return m_QatDialogCaption; }
+            set { m_QatDialogCaption = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the text of the "Place Quick Access Toolbar below the Ribbon" check-box on the Quick Access Toolbar Customize dialog form.
+        /// </summary>
+        [Localizable(true), Description("Indicates the text of the 'Place Quick Access Toolbar below the Ribbon' check-box on the Quick Access Toolbar Customize dialog form."), Category("QAT Customize Dialog")]
+        public string QatDialogPlacementCheckbox
+        {
+            get { return m_QatDialogPlacementCheckbox; }
+            set { m_QatDialogPlacementCheckbox = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the text of the Choose commands from label on the Quick Access Toolbar Customize dialog form.
+        /// </summary>
+        [Localizable(true), Description("Indicates the text of the Choose commands from label on the Quick Access Toolbar Customize dialog form."), Category("QAT Customize Dialog")]
+        public string QatDialogCategoriesLabel
+        {
+            get { return m_QatDialogCategoriesLabel; }
+            set { m_QatDialogCategoriesLabel = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the text of the Remove button on the Quick Access Toolbar Customize dialog form.
+        /// </summary>
+        [Localizable(true), Description("Indicates the text of the Remove button on the Quick Access Toolbar Customize dialog form."), Category("QAT Customize Dialog")]
+        public string QatDialogRemoveButton
+        {
+            get { return m_QatDialogRemoveButton; }
+            set { m_QatDialogRemoveButton = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the text of the Add button on the Quick Access Toolbar Customize dialog form.
+        /// </summary>
+        [Localizable(true), Description("Indicates the text of the Add button on the Quick Access Toolbar Customize dialog form."), Category("QAT Customize Dialog")]
+        public string QatDialogAddButton
+        {
+            get { return m_QatDialogAddButton; }
+            set { m_QatDialogAddButton = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the text of the OK button on the Quick Access Toolbar Customize dialog form.
+        /// </summary>
+        [Localizable(true), Description("Indicates the text of the OK button on the Quick Access Toolbar Customize dialog form."), Category("QAT Customize Dialog")]
+        public string QatDialogOkButton
+        {
+            get { return m_QatDialogOkButton; }
+            set { m_QatDialogOkButton = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the text of the Cancel button on the Quick Access Toolbar Customize dialog form.
+        /// </summary>
+        [Localizable(true), Description("Indicates the text of the OK button on the Quick Access Toolbar Customize dialog form."), Category("QAT Customize Dialog")]
+        public string QatDialogCancelButton
+        {
+            get { return m_QatDialogCancelButton; }
+            set { m_QatDialogCancelButton = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the text that is used on context menu used to customize Quick Access Toolbar.
+        /// </summary>
+        [Localizable(true), Description("Indicates the text that is used on context menu used to customize Quick Access Toolbar."), Category("Quick Access Toolbar")]
+        public string QatRemoveItemText
+        {
+            get { return m_QatRemoveItemText; }
+            set { m_QatRemoveItemText = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the text that is used on context menu used to customize Quick Access Toolbar.
+        /// </summary>
+        [Localizable(true), Description("Indicates the text that is used on context menu used to customize Quick Access Toolbar."), Category("Quick Access Toolbar")]
+        public string QatAddItemText
+        {
+            get { return m_QatAddItemText; }
+            set { m_QatAddItemText = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the text that is used on context menu used to customize Quick Access Toolbar.
+        /// </summary>
+        [Localizable(true), Description("Indicates the text that is used on context menu used to customize Quick Access Toolbar."), Category("Quick Access Toolbar")]
+        public string QatCustomizeText
+        {
+            get { return m_QatCustomizeText; }
+            set { m_QatCustomizeText = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the text that is used on Quick Access Toolbar customize menu label.
+        /// </summary>
+        [Localizable(true), Description("Indicates text that is used on Quick Access Toolbar customize menu label."), Category("Quick Access Toolbar")]
+        public string QatCustomizeMenuLabel
+        {
+            get { return m_QatCustomizeMenuLabel; }
+            set { m_QatCustomizeMenuLabel = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the text that is used on context menu used to change placement of the Quick Access Toolbar.
+        /// </summary>
+        [Localizable(true), Description("Indicates the text that is used on context menu used to change placement of the Quick Access Toolbar."), Category("Quick Access Toolbar")]
+        public string QatPlaceBelowRibbonText
+        {
+            get { return m_QatPlaceBelowRibbonText; }
+            set { m_QatPlaceBelowRibbonText = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the text that is used on context menu used to change placement of the Quick Access Toolbar.
+        /// </summary>
+        [Localizable(true), Description("Indicates the text that is used on context menu used to change placement of the Quick Access Toolbar."), Category("Quick Access Toolbar")]
+        public string QatPlaceAboveRibbonText
+        {
+            get { return m_QatPlaceAboveRibbonText; }
+            set { m_QatPlaceAboveRibbonText = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the text that is used on context menu item used to minimize the Ribbon.
+        /// </summary>
+        [Localizable(true), Description("Indicates text that is used on context menu item used to minimize the Ribbon."), Category("Quick Access Toolbar")]
+        public string MinimizeRibbonText
+        {
+            get { return m_MinimizeRibbonText; }
+            set { m_MinimizeRibbonText = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the text that is used on context menu item used to maximize the Ribbon.
+        /// </summary>
+        [Localizable(true), Description("Indicates text that is used on context menu item used to maximize the Ribbon."), Category("Quick Access Toolbar")]
+        public string MaximizeRibbonText
+        {
+            get { return m_MaximizeRibbonText; }
+            set { m_MaximizeRibbonText = value; }
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Ribbon/RibbonOverflowButtonItem.cs b/PROMS/DotNetBar Source Code/Ribbon/RibbonOverflowButtonItem.cs
new file mode 100644
index 00000000..211d75e9
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Ribbon/RibbonOverflowButtonItem.cs	
@@ -0,0 +1,43 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represents ribbon overflow button.
+    /// </summary>
+    internal class RibbonOverflowButtonItem : ButtonItem
+    {
+        /// <summary>
+        /// Gets or sets the ribbon bar control overflow button is displayed on.
+        /// </summary>
+        public RibbonBar RibbonBar = null;
+
+        protected override void OnCommandChanged()
+        {
+        }
+
+        protected override void OnExternalSizeChange()
+        {
+            base.OnExternalSizeChange();
+            AdjustSubItemsRect();
+        }
+
+        public override void RecalcSize()
+        {
+            base.RecalcSize();
+            AdjustSubItemsRect();
+        }
+        private void AdjustSubItemsRect()
+        {
+            Rectangle r = this.SubItemsRect;
+            if (!r.IsEmpty)
+            {
+                r.Y += 8;
+                r.Height -= 4;
+                this.SubItemsRect = r;
+            }
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Ribbon/RibbonPanel.cs b/PROMS/DotNetBar Source Code/Ribbon/RibbonPanel.cs
new file mode 100644
index 00000000..73b8275e
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Ribbon/RibbonPanel.cs	
@@ -0,0 +1,849 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Windows.Forms;
+using System.Collections;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Represents panel used by RibbonTabItem as a container panel for the control.
+	/// </summary>
+    [ToolboxItem(false), Designer("DevComponents.DotNetBar.Design.RibbonPanelDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+    public class RibbonPanel : PanelControl, IKeyTipsControl
+	{
+		#region Private Variables
+		private const string INFO_TEXT="Drop RibbonBar or other controls here. Drag and Drop tabs and items to re-order.";
+		private RibbonTabItem m_RibbonTabItem=null;
+		private bool m_UseCustomStyle=false;
+        private bool m_DefaultLayout = false;
+        private bool m_StretchLastRibbonBar = false;
+        private ElementStyle m_DefaultStyle = new ElementStyle();
+        private RightToLeft m_RightToLeft = RightToLeft.No;
+        private bool m_InternalLayoutSuspend = false;
+        private ButtonX m_ButtonScrollRight = null;
+        private ButtonX m_ButtonScrollLeft = null;
+        private Rectangle m_ViewBounds = Rectangle.Empty;
+        private int m_ScrollOffset = 0;
+		#endregion
+
+		#region Internal Implementation
+		/// <summary>
+		/// Creates new instance of the panel.
+		/// </summary>
+		public RibbonPanel():base()
+		{
+			this.BackColor=SystemColors.Control;
+		}
+
+        protected override ElementStyle GetStyle()
+        {
+            if (!this.Style.Custom)
+            {
+                return GetDefaultStyle();
+            }
+            return base.GetStyle();
+        }
+
+        //protected override bool ScaleChildren
+        //{
+        //    get { return m_DefaultLayout; }
+        //}
+
+	    private bool m_PopupMode = false;
+        private RibbonControl m_RibbonControl = null;
+        internal RibbonControl GetRibbonControl()
+        {
+            if (m_PopupMode)
+                return m_RibbonControl;
+            return this.Parent as RibbonControl;
+        }
+
+        internal bool IsPopupMode
+        {
+            get { return m_PopupMode; }
+        }
+
+        internal void SetPopupMode(bool popupMode, RibbonControl rc)
+        {
+            m_PopupMode = popupMode;
+            if (m_PopupMode)
+            {
+                m_RibbonControl = rc;
+
+#if FRAMEWORK20
+                if (this.Padding.Bottom > 0)
+                {
+                    this.Height += this.Padding.Bottom;
+                    this.Padding = new System.Windows.Forms.Padding(this.Padding.Left, this.Padding.Bottom, this.Padding.Right, this.Padding.Bottom);
+                }
+#else
+                if (this.DockPadding.Bottom > 0)
+                {
+                    this.DockPadding.Top = this.DockPadding.Bottom;
+                    this.Height += this.DockPadding.Bottom;
+                }
+#endif
+            }
+            else
+            {
+#if FRAMEWORK20
+                if (this.Padding.Top > 0)
+                {
+                    this.Height -= this.Padding.Top;
+                    this.Padding = new System.Windows.Forms.Padding(this.Padding.Left, 0, this.Padding.Right, this.Padding.Bottom);
+                }
+#else
+                if (this.DockPadding.Top > 0)
+                {
+                    this.Height -= this.DockPadding.Top;
+                    this.DockPadding.Top = 0;
+                }
+#endif
+                m_RibbonControl = null;
+            }
+        }
+
+        private ElementStyle GetDefaultStyle()
+        {
+            RibbonControl rc = GetRibbonControl();
+
+            if (rc!=null && this.ColorSchemeStyle != rc.Style)
+                this.ColorSchemeStyle = rc.Style;
+
+            m_DefaultStyle.SetColorScheme(this.ColorScheme);
+
+            if (BarFunctions.IsOffice2007Style(this.EffectiveColorSchemeStyle) || rc != null && BarFunctions.IsOffice2007Style(rc.EffectiveStyle))
+            {
+                m_DefaultStyle.Reset();
+
+                Rendering.Office2007ColorTable ct = null;
+                if (rc != null)
+                    ct = rc.GetOffice2007ColorTable();
+                else if (Rendering.GlobalManager.Renderer is Rendering.Office2007Renderer)
+                {
+                    ct = ((Rendering.Office2007Renderer)Rendering.GlobalManager.Renderer).ColorTable;
+                }
+                else
+                    return this.Style;
+
+                if (StyleManager.IsMetro(this.EffectiveColorSchemeStyle) || rc != null && StyleManager.IsMetro(rc.EffectiveStyle))
+                    m_DefaultStyle.Border = eStyleBorderType.Solid;
+                else
+                    m_DefaultStyle.Border = eStyleBorderType.Double;
+                if (rc == null || !rc.IsPopupMode)
+                    m_DefaultStyle.BorderTop = eStyleBorderType.None;
+
+                m_DefaultStyle.BorderWidth = 1;
+                m_DefaultStyle.CornerDiameter = ct.RibbonControl.CornerSize;
+                m_DefaultStyle.CornerType = eCornerType.Rounded;
+                if (!m_PopupMode)
+                {
+                    m_DefaultStyle.CornerTypeTopLeft = eCornerType.Square;
+                    m_DefaultStyle.CornerTypeTopRight = eCornerType.Square;
+                }
+                else if (ct.InitialColorScheme == DevComponents.DotNetBar.Rendering.eOffice2007ColorScheme.Black)
+                    m_DefaultStyle.BorderTop = eStyleBorderType.None;
+                if (rc != null && (rc.EffectiveStyle == eDotNetBarStyle.Office2010 || StyleManager.IsMetro(rc.EffectiveStyle)))
+                {
+                    m_DefaultStyle.CornerTypeBottomRight = eCornerType.Square;
+                    m_DefaultStyle.CornerTypeBottomLeft = eCornerType.Square;
+                    if (rc.RibbonStrip.IsGlassEnabled)
+                    {
+                        m_DefaultStyle.BorderLeftWidth = 0;
+                        m_DefaultStyle.BorderRightWidth = 0;
+                        m_DefaultStyle.BorderLeft = eStyleBorderType.None;
+                        m_DefaultStyle.BorderRight = eStyleBorderType.None;
+                    }
+                    else
+                    {
+                        if (StyleManager.IsMetro(rc.EffectiveStyle))
+                        {
+                            m_DefaultStyle.BorderLeft = eStyleBorderType.None;
+                            m_DefaultStyle.BorderRight = eStyleBorderType.None;
+                        }
+                        else
+                        {
+                            m_DefaultStyle.BorderLeft = eStyleBorderType.Solid;
+                            m_DefaultStyle.BorderRight = eStyleBorderType.Solid;
+                        }
+                    }
+                }
+                else if (rc != null && rc.EffectiveStyle == eDotNetBarStyle.Windows7)
+                {
+                    m_DefaultStyle.CornerType = eCornerType.Square;
+                    m_DefaultStyle.CornerTypeBottomRight = eCornerType.Square;
+                    m_DefaultStyle.CornerTypeBottomLeft = eCornerType.Square;
+                    m_DefaultStyle.CornerTypeTopRight = eCornerType.Square;
+                    m_DefaultStyle.CornerTypeTopLeft = eCornerType.Square;
+                    m_DefaultStyle.CornerDiameter = 0;
+                    if (rc.RibbonStrip.IsGlassEnabled)
+                    {
+                        m_DefaultStyle.BorderLeft = eStyleBorderType.None;
+                        m_DefaultStyle.BorderRight = eStyleBorderType.None;
+                    }
+                }
+
+                // Border Colors
+                m_DefaultStyle.BorderColor = ct.RibbonControl.OuterBorder.Start;
+                m_DefaultStyle.BorderColor2 = ct.RibbonControl.OuterBorder.End;
+                if (ct.RibbonControl.InnerBorder != null)
+                {
+                    m_DefaultStyle.BorderColorLight = ct.RibbonControl.InnerBorder.Start;
+                    m_DefaultStyle.BorderColorLight2 = ct.RibbonControl.InnerBorder.End;
+                    m_DefaultStyle.BorderBottom = eStyleBorderType.Double;
+                }
+                else
+                {
+                    m_DefaultStyle.BorderBottom = eStyleBorderType.Solid;
+                }
+                m_DefaultStyle.BorderWidth = 1;
+                
+                // Background colors
+                m_DefaultStyle.BackColorGradientAngle = 90;
+                m_DefaultStyle.BackColor = ct.RibbonBar.Default.TopBackground.Start;
+                if (ct.RibbonControl.PanelTopBackgroundHeight==  0 && ct.RibbonControl.PanelBottomBackground==null)
+                {
+                    m_DefaultStyle.BackColor = ct.RibbonControl.PanelTopBackground.Start;
+                    m_DefaultStyle.BackColor2 = ct.RibbonControl.PanelTopBackground.End;
+                }
+                else
+                {
+                    m_DefaultStyle.BackColorBlend.Add(new BackgroundColorBlend(ct.RibbonControl.PanelTopBackground.Start, 0));
+                    m_DefaultStyle.BackColorBlend.Add(new BackgroundColorBlend(ct.RibbonControl.PanelTopBackground.End, ct.RibbonControl.PanelTopBackgroundHeight));
+                    m_DefaultStyle.BackColorBlend.Add(new BackgroundColorBlend(ct.RibbonControl.PanelBottomBackground.Start, ct.RibbonControl.PanelTopBackgroundHeight));
+                    m_DefaultStyle.BackColorBlend.Add(new BackgroundColorBlend(ct.RibbonControl.PanelBottomBackground.End, 1));
+                }
+            }
+            else
+            {
+                ApplyLabelStyle(m_DefaultStyle);
+                m_DefaultStyle.BorderBottom = eStyleBorderType.Solid;
+            }
+
+            return m_DefaultStyle;
+        }
+
+        protected override void OnControlAdded(ControlEventArgs e)
+        {
+            if (!(e.Control is RibbonBar))
+            {
+                m_DefaultLayout = false;
+            }
+            base.OnControlAdded(e);
+        }
+
+        internal bool InternalLayoutSuspend
+        {
+            get { return m_InternalLayoutSuspend; }
+            set { m_InternalLayoutSuspend = value; }
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Advanced)]
+        protected override void OnLayout(LayoutEventArgs levent)
+        {
+            if (m_DefaultLayout || this.DesignMode)
+            {
+                base.OnLayout(levent);
+                return;
+            }
+
+            if (this.ClientRectangle.Width == 0 || this.ClientRectangle.Height == 0 || !this.IsHandleCreated)
+                return;
+
+            Form f = this.FindForm();
+            if (f != null && f.WindowState == FormWindowState.Minimized)
+                return;
+
+            // Has RightToLeft changed, if so mirror content
+            if (m_RightToLeft != this.RightToLeft)
+            {
+                m_RightToLeft = this.RightToLeft;
+                Rectangle r = GetLayoutRectangle();
+                foreach (Control c in this.Controls)
+                {
+                    if (!(c is RibbonBar))
+                        continue;
+                    // Mirror the X position of each RibbonBar
+                    c.Left = r.Width - c.Width - c.Left;
+                }
+            }
+
+            if(!m_InternalLayoutSuspend)
+                LayoutRibbons();
+        }
+
+        private Rectangle GetLayoutRectangle()
+        {
+            Rectangle r = this.ClientRectangle;
+            r.X += this.DockPadding.Left;
+            r.Width -= this.DockPadding.Left + this.DockPadding.Right;
+            r.Y += this.DockPadding.Top;
+            r.Height -= this.DockPadding.Top + ((this.EffectiveColorSchemeStyle == eDotNetBarStyle.Office2010 || StyleManager.IsMetro(this.EffectiveColorSchemeStyle)) && this.DockPadding.Bottom == 3 ? 2 : this.DockPadding.Bottom);
+
+            if (StyleManager.IsMetro(this.EffectiveColorSchemeStyle) && this.DockPadding.All == 0)
+            {
+                r.Y += 3;
+                r.Height -= 6;
+            }
+
+            return r;
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void LayoutRibbons()
+        {
+            int spacing = 2;
+            Rectangle r = GetLayoutRectangle();
+            int currentWidth = -spacing;
+            
+            ArrayList resizeOrder = new ArrayList();
+            ArrayList layoutOrder = new ArrayList();
+            ArrayList overflowList = new ArrayList();
+            Control lastVisibleControl = null;
+            int lastX = 0;
+            bool resizeOrderSpecified = false;
+            
+            RibbonBar barGallery = null;
+            foreach (Control c in this.Controls)
+            {
+                RibbonBar bar = c as RibbonBar;
+                if (bar == null || !bar.Visible) continue;
+                if(Dpi.Factor.Width>1)
+                    bar.RecalcLayout();
+                int barContentBasedWidth = bar.GetContentBasedSize().Width;
+
+                currentWidth += barContentBasedWidth + spacing;
+                
+                if (bar.GalleryStretch != null && bar.GalleryStretch.Visible) barGallery = bar;
+
+                if (bar.ResizeOrderIndex != 0)
+                    resizeOrderSpecified = true;
+                resizeOrder.Add(bar);
+                layoutOrder.Add(bar);
+                if (bar.OverflowState) overflowList.Add(bar);
+                if (bar.Left > lastX)
+                {
+                    lastX = bar.Left;
+                    lastVisibleControl = c;
+                }
+            }
+
+            layoutOrder.Sort(new XPositionComparer());
+            if (resizeOrderSpecified)
+            {
+                resizeOrder.Sort(new ResizeOrderComparer());
+                overflowList.Sort(new ResizeOrderComparer());
+            }
+            else
+            {
+                resizeOrder.Sort(new XPositionComparer());
+                overflowList.Sort(new XPositionComparer());
+            }
+
+            int lastControlIncrease = 0;
+
+            if (currentWidth > r.Width)
+            {
+                // One or more ribbons must be reduced in size...
+                int totalReduction = currentWidth - r.Width;
+
+                // Check whether gallery can be reduced first
+                if (barGallery != null && !barGallery.GalleryStretch.IsAtMinimumSize) // barGallery.GalleryStretch.WidthInternal > barGallery.GalleryStretch.MinimumSize.Width)
+                {
+                    int oldWidth = barGallery.GetContentBasedSize().Width;
+                    if (barGallery.GalleryStretch.WidthInternal - barGallery.GalleryStretch.MinimumSize.Width >= totalReduction)
+                        barGallery.Size = new Size(oldWidth - totalReduction, r.Height);
+                    else
+                        barGallery.Size = new Size(oldWidth - (barGallery.GalleryStretch.WidthInternal - barGallery.GalleryStretch.MinimumSize.Width), r.Height);
+                    totalReduction -= (oldWidth - barGallery.GetContentBasedSize().Width);
+                }
+
+                if (totalReduction > 0)
+                {
+                    int c = resizeOrder.Count - 1;
+                    for (int i = c; i >= 0; i--)
+                    {
+                        RibbonBar bar = resizeOrder[i] as RibbonBar;
+                        int oldWidth = bar.GetContentBasedSize().Width;
+                        if (oldWidth > totalReduction && bar.AutoSizeItems)
+                            bar.Size = new Size(oldWidth - totalReduction, r.Height);
+                        else
+                            bar.Size = new Size(1, r.Height);
+                        totalReduction -= (oldWidth - bar.GetContentBasedSize().Width);
+                        if (totalReduction <= 0) break;
+                    }
+                }
+
+                if (totalReduction != 0) lastControlIncrease = Math.Abs(totalReduction);
+            }
+            else if (currentWidth < r.Width)
+            {
+                // One or more ribbons must be increased in size
+                int totalIncrease = r.Width - currentWidth;
+                // Start with overflows first
+                ArrayList overflowed = new ArrayList();
+                overflowed.AddRange(overflowList.ToArray());
+                foreach(RibbonBar bar in overflowed)
+                {
+                    int oldWidth = bar.GetContentBasedSize().Width;
+                    bar.Size = new Size(oldWidth + totalIncrease, r.Height);
+                    totalIncrease -= (bar.GetContentBasedSize().Width - oldWidth);
+                    if (totalIncrease >= 0 && !bar.OverflowState)
+                        overflowList.Remove(bar);
+
+                    if (totalIncrease <= 0 || bar.GetContentBasedSize().Width - oldWidth == 0) break;
+                }
+
+                if (totalIncrease > 0 && overflowList.Count == 0)
+                {
+                    int c = resizeOrder.Count - 1;
+                    for (int i = c; i >= 0; i--)
+                    {
+                        RibbonBar bar = resizeOrder[i] as RibbonBar;
+                        if (bar.OverflowState || overflowed.Contains(bar)) continue;
+                        int oldWidth = bar.GetContentBasedSize().Width;
+                        if (oldWidth == bar.Width && bar.Height == r.Height && bar.LastReducedSize.IsEmpty && bar.BeforeOverflowSize.IsEmpty && bar.GalleryStretch == null)
+                            continue;
+                        if (bar.Width == oldWidth + totalIncrease)
+                        {
+                            if(!(bar == lastVisibleControl && m_StretchLastRibbonBar)) // If not stretching last bar and current bar is last one
+                                totalIncrease = 0;
+                            break;
+                        }
+                        bar.Size = new Size(oldWidth + totalIncrease, r.Height);
+                        totalIncrease -= (bar.GetContentBasedSize().Width - oldWidth);
+                        if (totalIncrease <= 0) break;
+                    }
+                }
+                if (totalIncrease > 0) lastControlIncrease = totalIncrease;
+            }
+
+            RepositionRibbons(layoutOrder, r, spacing, lastVisibleControl, lastControlIncrease);
+        }
+        
+        private void RepositionRibbons(ArrayList layoutOrder, Rectangle layoutRectangle, int spacing, Control lastVisibleControl, int lastControlIncrease)
+        {
+            Point p = layoutRectangle.Location;
+
+            // Is there an offset?
+            int offset = 0;
+            if (this.RightToLeft == RightToLeft.Yes)
+            {
+                int currentWidth = 0;
+                foreach (RibbonBar bar in layoutOrder)
+                {
+                    currentWidth += bar.GetContentBasedSize().Width + spacing;
+                }
+                if (currentWidth < layoutRectangle.Width)
+                {
+                    offset = spacing + layoutRectangle.Width - currentWidth;
+                }
+            }
+            Rectangle viewBounds = Rectangle.Empty;
+            p.X += m_ScrollOffset;
+            foreach (RibbonBar bar in layoutOrder)
+            {
+                Size contentSize = bar.GetContentBasedSize();
+                if (bar == lastVisibleControl && m_StretchLastRibbonBar && !bar.OverflowState)
+                    contentSize.Width += lastControlIncrease;
+                //Rectangle bounds = new Rectangle(p.X, p.Y, width, r.Height);
+                Rectangle bounds = new Rectangle(p.X + offset, p.Y, contentSize.Width, layoutRectangle.Height);
+                if (this.DesignMode)
+                    TypeDescriptor.GetProperties(bar)["Bounds"].SetValue(bar, bounds);
+                else
+                    bar.Bounds = bounds;
+                viewBounds = Rectangle.Union(bounds, viewBounds);
+                p.X += (bar.Width + spacing);
+            }
+
+            m_ViewBounds = viewBounds;
+            if (m_ViewBounds.Right > this.Width)
+            {
+                if (m_ButtonScrollRight == null)
+                {
+                    m_ButtonScrollRight = new ButtonX();
+                    m_ButtonScrollRight.Text = "<expand direction=\"right\"/>";
+                    m_ButtonScrollRight.ColorTable = eButtonColor.OrangeWithBackground;
+                    m_ButtonScrollRight.Click += new EventHandler(ScrollPanelRightClick);
+                }
+                m_ButtonScrollRight.Bounds = new Rectangle(this.Width - 12, 0, 12, this.Height - 2);
+                this.Controls.Add(m_ButtonScrollRight);
+                m_ButtonScrollRight.BringToFront();
+            }
+            else
+            {
+                if (m_ButtonScrollRight != null)
+                {
+                    m_ButtonScrollRight.Visible = false;
+                    this.Controls.Remove(m_ButtonScrollRight);
+                    m_ButtonScrollRight.Dispose();
+                    m_ButtonScrollRight = null;
+                }
+            }
+
+            if (m_ScrollOffset < 0)
+            {
+                if (m_ButtonScrollLeft == null)
+                {
+                    m_ButtonScrollLeft = new ButtonX();
+                    m_ButtonScrollLeft.Text = "<expand direction=\"left\"/>";
+                    m_ButtonScrollLeft.ColorTable = eButtonColor.OrangeWithBackground;
+                    m_ButtonScrollLeft.Click += new EventHandler(ScrollPanelLeftClick);
+                }
+                m_ButtonScrollLeft.Bounds = new Rectangle(0, 0, 12, this.Height - 2);
+                this.Controls.Add(m_ButtonScrollLeft);
+                m_ButtonScrollLeft.BringToFront();
+            }
+            else
+            {
+                if (m_ButtonScrollLeft != null)
+                {
+                    m_ButtonScrollLeft.Visible = false;
+                    this.Controls.Remove(m_ButtonScrollLeft);
+                    m_ButtonScrollLeft.Dispose();
+                    m_ButtonScrollLeft = null;
+                }
+            }
+        }
+
+        private void ScrollPanelRightClick(object sender, EventArgs e)
+        {
+            ScrollRight();
+        }
+
+        /// <summary>
+        /// Scrolls the RibbonBar controls to the right one step if there is more of the controls on the panel that can fit into the available space.
+        /// </summary>
+        public void ScrollRight()
+        {
+            if (m_ScrollOffset + m_ViewBounds.Width <= this.Width)
+                return;
+
+            SetScrollOffset(-Math.Min(this.Width, m_ViewBounds.Right - this.Width + 2));
+        }
+
+        private void ScrollPanelLeftClick(object sender, EventArgs e)
+        {
+            ScrollLeft();
+        }
+
+        /// <summary>
+        /// Scrolls the RibbonBar controls one step to the left.
+        /// </summary>
+        public void ScrollLeft()
+        {
+            SetScrollOffset(Math.Min(Math.Abs(m_ScrollOffset), this.Width));
+        }
+
+        /// <summary>
+        /// Resets the panel scroll position.
+        /// </summary>
+        public void ResetScrollPosition()
+        {
+            SetScrollOffset(-m_ScrollOffset);
+        }
+
+        private void SetScrollOffset(int offset)
+        {
+            m_ScrollOffset += offset;
+            this.PerformLayout();
+        }
+
+        private class XPositionComparer : IComparer
+        {
+            // Calls CaseInsensitiveComparer.Compare with the parameters reversed.
+            int IComparer.Compare(object x, object y) 
+            {
+                if (x is Control && y is Control)
+                {
+                    return ((Control)x).Left - ((Control)y).Left;
+                }
+                else
+                    return( (new CaseInsensitiveComparer()).Compare(x, y));
+            }
+        }
+
+        private class ResizeOrderComparer : IComparer
+        {
+            // Calls CaseInsensitiveComparer.Compare with the parameters reversed.
+            int IComparer.Compare(object x, object y)
+            {
+                if (x is RibbonBar && y is RibbonBar)
+                {
+                    return ((RibbonBar)x).ResizeOrderIndex - ((RibbonBar)y).ResizeOrderIndex;
+                }
+                else
+                    return ((new CaseInsensitiveComparer()).Compare(x, y));
+            }
+        }
+
+		private Rectangle GetThemedRect(Rectangle r)
+		{
+			const int offset=6;
+			r.Y-=offset;
+			r.Height+=offset;
+			return r;
+		}
+		
+		protected override void OnPaint(PaintEventArgs e)
+		{
+			bool baseCall=true;
+			if(DrawThemedPane && BarFunctions.ThemedOS)
+			{
+				Rectangle r=GetThemedRect(this.ClientRectangle);
+				eTabStripAlignment tabAlignment=eTabStripAlignment.Top;
+				
+				Rectangle rTemp=new Rectangle(0,0,r.Width,r.Height);
+				if(tabAlignment==eTabStripAlignment.Right || tabAlignment==eTabStripAlignment.Left)
+					rTemp=new Rectangle(0,0,rTemp.Height,rTemp.Width);
+				if(m_ThemeCachedBitmap==null || m_ThemeCachedBitmap.Size!=rTemp.Size)
+				{
+					DisposeThemeCachedBitmap();
+					Bitmap bmp=new Bitmap(rTemp.Width,rTemp.Height,e.Graphics);
+					try
+					{
+						Graphics gTemp=Graphics.FromImage(bmp);
+						try
+						{
+							using(SolidBrush brush=new SolidBrush(Color.Transparent))
+								gTemp.FillRectangle(brush,0,0,bmp.Width,bmp.Height);
+							this.ThemeTab.DrawBackground(gTemp,ThemeTabParts.Pane,ThemeTabStates.Normal,rTemp);
+						}
+						finally
+						{
+							gTemp.Dispose();
+						}
+					}
+					finally
+					{
+						if(tabAlignment==eTabStripAlignment.Left)
+							bmp.RotateFlip(RotateFlipType.Rotate270FlipNone);
+						else if(tabAlignment==eTabStripAlignment.Right)
+							bmp.RotateFlip(RotateFlipType.Rotate90FlipNone);
+						else if(tabAlignment==eTabStripAlignment.Bottom)
+							bmp.RotateFlip(RotateFlipType.Rotate180FlipNone);
+						e.Graphics.DrawImageUnscaled(bmp,r.X,r.Y);							
+						m_ThemeCachedBitmap=bmp;
+					}
+				}
+				else
+					e.Graphics.DrawImageUnscaled(m_ThemeCachedBitmap,r.X,r.Y);
+
+				baseCall=false;
+			}
+
+			if(baseCall)
+				base.OnPaint(e);
+
+			if(this.DesignMode && this.Controls.Count==0 && this.Text=="")
+			{
+				Rectangle r=this.ClientRectangle;
+				r.Inflate(-2,-2);
+				StringFormat sf=BarFunctions.CreateStringFormat();
+				sf.Alignment=StringAlignment.Center;
+				sf.LineAlignment=StringAlignment.Center;
+				sf.Trimming=StringTrimming.EllipsisCharacter;
+				Font font=new Font(this.Font,FontStyle.Bold);
+				e.Graphics.DrawString(INFO_TEXT,font,new SolidBrush(ControlPaint.Dark(this.Style.BackColor)),r,sf);
+				font.Dispose();
+				sf.Dispose();
+			}
+            if (this.Parent is RibbonControl) ((RibbonControl)this.Parent).RibbonStrip.InvalidateKeyTipsCanvas();
+		}
+
+        //protected override void PaintInnerContent(PaintEventArgs e, ElementStyle style, bool paintText)
+        //{
+        //    if (m_PopupMode && m_RibbonTabItem != null)
+        //    {
+
+        //    }
+
+        //    base.PaintInnerContent(e, style, paintText);
+        //}
+
+        /// <summary>
+        /// Gets or sets whether default control layout is used instead of Rendering layout for RibbonBar controls positioning. By default
+        /// internal layout logic is used so proper resizing of Ribbons can be performed. You can disable internal layout by setting this property
+        /// to true.
+        /// Default value is false.
+        /// </summary>
+        [Browsable(true),DefaultValue(false),Category("Layout"),Description("Indicates whether default control layout is used instead of Rendering layout for RibbonBar controls positioning.")]
+        public bool DefaultLayout
+        {
+            get { return m_DefaultLayout; }
+            set
+            {
+                m_DefaultLayout = value;
+                this.PerformLayout();
+            }
+        }
+
+		/// <summary>
+		/// Indicates whether style of the panel is managed by tab control automatically.
+		/// Set this to true if you would like to control style of the panel.
+		/// </summary>
+		[Browsable(true),DefaultValue(false),Category("Appearance"),Description("Indicates whether style of the panel is managed by tab control automatically. Set this to true if you would like to control style of the panel.")]
+		public bool UseCustomStyle
+		{
+			get {return m_UseCustomStyle;}
+			set {m_UseCustomStyle=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets TabItem that this panel is attached to.
+		/// </summary>
+		[Browsable(false),DefaultValue(null),DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public RibbonTabItem RibbonTabItem
+		{
+			get {return m_RibbonTabItem;}
+			set	{m_RibbonTabItem=value;}
+		}
+
+        /// <summary>
+        /// Gets or sets whether last RibbonBar is stretched to fill available space inside of the panel. Default value is false.
+        /// </summary>
+        [Browsable(true),DefaultValue(false), Category("Layout"), Description("Whether last RibbonBar is stretched to fill available space inside of the panel.")]
+        public bool StretchLastRibbonBar
+        {
+            get { return m_StretchLastRibbonBar; }
+            set
+            {
+                m_StretchLastRibbonBar = value;
+                this.PerformLayout();
+            }
+        }
+
+		protected override void OnResize(EventArgs e)
+		{
+            m_ScrollOffset = 0;
+			DisposeThemeCachedBitmap();
+			base.OnResize(e);
+		}
+
+		/// <summary>
+		/// Gets or sets which edge of the parent container a control is docked to.
+		/// </summary>
+		[Browsable(false),DefaultValue(DockStyle.None)]
+		public override DockStyle Dock
+		{
+			get {return base.Dock;}
+			set {base.Dock=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets the size of the control.
+		/// </summary>
+		[Browsable(false)]
+		public new Size Size
+		{
+			get {return base.Size;}
+			set {base.Size=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets the coordinates of the upper-left corner of the control relative to the upper-left corner of its container.
+		/// </summary>
+		[Browsable(false)]
+		public new Point Location
+		{
+			get {return base.Location;}
+			set {base.Location=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets a value indicating whether the control is displayed.
+		/// </summary>
+		[Browsable(false)]
+		public new bool Visible
+		{
+			get {return base.Visible;}
+			set {base.Visible=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets which edges of the control are anchored to the edges of its container.
+		/// </summary>
+		[Browsable(false)]
+		public override AnchorStyles Anchor
+		{
+			get {return base.Anchor;}
+			set {base.Anchor=value;}
+		}
+
+        [Browsable(false), DefaultValue("")]
+        public override string Text
+        {
+            get
+            {
+                return base.Text;
+            }
+            set
+            {
+                base.Text = value;
+            }
+        }
+
+        bool IKeyTipsControl.ProcessMnemonicEx(char charCode)
+        {
+            if (this.Controls.Count == 0) return false;
+
+            Control[] ca = new Control[this.Controls.Count];
+            this.Controls.CopyTo(ca, 0);
+            ArrayList controls = new ArrayList(ca);
+            controls.Sort(new XPositionComparer());
+            foreach (Control c in controls)
+            {
+                IKeyTipsControl ktc = c as IKeyTipsControl;
+                if (ktc!=null && c.Visible && c.Enabled)
+                {
+                    string oldStack = ktc.KeyTipsKeysStack;
+                    bool ret = ktc.ProcessMnemonicEx(charCode);
+                    if (ret)
+                        return true;
+                    if (ktc.KeyTipsKeysStack != oldStack)
+                    {
+                        ((IKeyTipsControl)this).KeyTipsKeysStack = ktc.KeyTipsKeysStack;
+                        return false;
+                    }
+                }
+            }
+            return false;
+        }
+
+        private bool m_ShowKeyTips = false;
+        bool IKeyTipsControl.ShowKeyTips
+        {
+            get
+            {
+                return m_ShowKeyTips;
+            }
+            set
+            {
+                m_ShowKeyTips = value;
+                Control[] controls = new Control[this.Controls.Count];
+                this.Controls.CopyTo(controls, 0);
+                foreach (Control c in controls)
+                {
+                    if (c is IKeyTipsControl && c.Enabled && (c.Visible || !m_ShowKeyTips))
+                        ((IKeyTipsControl)c).ShowKeyTips = m_ShowKeyTips;
+                }
+            }
+        }
+
+        private string m_KeyTipsKeysStack = "";
+        string IKeyTipsControl.KeyTipsKeysStack
+        {
+            get { return m_KeyTipsKeysStack; }
+            set
+            {
+                m_KeyTipsKeysStack = value;
+                foreach (Control c in this.Controls)
+                {
+                    if (c is IKeyTipsControl && c.Visible && c.Enabled)
+                        ((IKeyTipsControl)c).KeyTipsKeysStack = m_KeyTipsKeysStack;
+                }
+            }
+        }
+		#endregion
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/Ribbon/RibbonPredefinedColorSchemes.cs b/PROMS/DotNetBar Source Code/Ribbon/RibbonPredefinedColorSchemes.cs
new file mode 100644
index 00000000..4e785a20
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Ribbon/RibbonPredefinedColorSchemes.cs	
@@ -0,0 +1,1515 @@
+using System.ComponentModel;
+using System.Drawing;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.Rendering;
+using System;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represents predefined color schemes for ribbon controls.
+    /// </summary>
+    public class RibbonPredefinedColorSchemes
+    {
+        #region Office 2007
+        /// <summary>
+        /// Applies default gray color scheme to background and title.
+        /// </summary>
+        /// <param name="b">Reference to object.</param>
+        public static void ApplyGrayColorScheme(RibbonBar b)
+        {
+            b.BackgroundStyle.Reset();
+            b.BackgroundMouseOverStyle.Reset();
+            b.TitleStyle.Reset();
+            b.TitleStyleMouseOver.Reset();
+
+            TypeDescriptor.GetProperties(b.BackgroundStyle)["BackColor"].SetValue(b.BackgroundStyle, ColorScheme.GetColor("CFD5E2"));
+            TypeDescriptor.GetProperties(b.BackgroundStyle)["BackColor2"].SetValue(b.BackgroundStyle, ColorScheme.GetColor("C2C9D9"));
+            TypeDescriptor.GetProperties(b.BackgroundStyle)["BackColorGradientAngle"].SetValue(b.BackgroundStyle, 90);
+
+            TypeDescriptor.GetProperties(b.BackgroundMouseOverStyle)["BackColor"].SetValue(b.BackgroundMouseOverStyle, ColorScheme.GetColor("EFEFEF"));
+            TypeDescriptor.GetProperties(b.BackgroundMouseOverStyle)["BackColor2"].SetValue(b.BackgroundMouseOverStyle, ColorScheme.GetColor("D2DAED"));
+            TypeDescriptor.GetProperties(b.BackgroundMouseOverStyle)["BackColorGradientAngle"].SetValue(b.BackgroundMouseOverStyle, 90);
+
+            TypeDescriptor.GetProperties(b.TitleStyle)["BackColor"].SetValue(b.TitleStyle, ColorScheme.GetColor("6A7080"));
+            TypeDescriptor.GetProperties(b.TitleStyle)["BackColor2"].SetValue(b.TitleStyle, ColorScheme.GetColor("A8B2CC"));
+            TypeDescriptor.GetProperties(b.TitleStyle)["BackColorGradientAngle"].SetValue(b.TitleStyle, 90);
+            TypeDescriptor.GetProperties(b.TitleStyle)["TextColor"].SetValue(b.TitleStyle, Color.White);
+
+            TypeDescriptor.GetProperties(b.TitleStyle)["PaddingTop"].SetValue(b.TitleStyle, 3);
+            TypeDescriptor.GetProperties(b.TitleStyle)["PaddingBottom"].SetValue(b.TitleStyle, 2);
+            TypeDescriptor.GetProperties(b.TitleStyle)["PaddingLeft"].SetValue(b.TitleStyle, 2);
+            TypeDescriptor.GetProperties(b.TitleStyle)["PaddingRight"].SetValue(b.TitleStyle, 2);
+            TypeDescriptor.GetProperties(b.TitleStyle)["TextShadowColor"].SetValue(b.TitleStyle, Color.Black);
+            TypeDescriptor.GetProperties(b.TitleStyle)["TextShadowOffset"].SetValue(b.TitleStyle, new Point(1, 1));
+            TypeDescriptor.GetProperties(b.TitleStyle)["Border"].SetValue(b.TitleStyle, eStyleBorderType.None);
+
+            TypeDescriptor.GetProperties(b.TitleStyleMouseOver)["BackColor"].SetValue(b.TitleStyleMouseOver, ColorScheme.GetColor("53607D"));
+            TypeDescriptor.GetProperties(b.TitleStyleMouseOver)["BackColor2"].SetValue(b.TitleStyleMouseOver, ColorScheme.GetColor("8BA1CA"));
+
+            b.Invalidate();
+        }
+
+        /// <summary>
+        /// Applies orange color scheme to background and title.
+        /// </summary>
+        /// <param name="b">Reference to object</param>
+        public static void ApplyOrangeColorScheme(RibbonBar b)
+        {
+            b.BackgroundStyle.Reset();
+            b.BackgroundMouseOverStyle.Reset();
+            b.TitleStyle.Reset();
+            b.TitleStyleMouseOver.Reset();
+
+            TypeDescriptor.GetProperties(b.BackgroundStyle)["BackColor"].SetValue(b.BackgroundStyle, ColorScheme.GetColor("CFD5E2"));
+            TypeDescriptor.GetProperties(b.BackgroundStyle)["BackColor2"].SetValue(b.BackgroundStyle, ColorScheme.GetColor("C2C9D9"));
+            TypeDescriptor.GetProperties(b.BackgroundStyle)["BackColorGradientAngle"].SetValue(b.BackgroundStyle, 90);
+
+            TypeDescriptor.GetProperties(b.TitleStyle)["BackColor"].SetValue(b.TitleStyle, ColorScheme.GetColor("CBA950"));
+            TypeDescriptor.GetProperties(b.TitleStyle)["BackColor2"].SetValue(b.TitleStyle, ColorScheme.GetColor("FED665"));
+            TypeDescriptor.GetProperties(b.TitleStyle)["BackColorGradientAngle"].SetValue(b.TitleStyle, 90);
+            TypeDescriptor.GetProperties(b.TitleStyle)["TextColor"].SetValue(b.TitleStyle, Color.White);
+            TypeDescriptor.GetProperties(b.TitleStyle)["PaddingTop"].SetValue(b.TitleStyle, 3);
+            TypeDescriptor.GetProperties(b.TitleStyle)["PaddingBottom"].SetValue(b.TitleStyle, 2);
+            TypeDescriptor.GetProperties(b.TitleStyle)["PaddingLeft"].SetValue(b.TitleStyle, 2);
+            TypeDescriptor.GetProperties(b.TitleStyle)["PaddingRight"].SetValue(b.TitleStyle, 2);
+            TypeDescriptor.GetProperties(b.TitleStyle)["TextShadowColor"].SetValue(b.TitleStyle, Color.Black);
+            TypeDescriptor.GetProperties(b.TitleStyle)["TextShadowOffset"].SetValue(b.TitleStyle, new Point(1, 1));
+            TypeDescriptor.GetProperties(b.TitleStyle)["Border"].SetValue(b.TitleStyle, eStyleBorderType.None);
+
+            b.Invalidate();
+        }
+
+        /// <summary>
+        /// Apply Office 2003 color scheme to background and title.
+        /// </summary>
+        /// <param name="b">Reference to object</param>
+        public static void ApplyOffice2003ColorScheme(RibbonBar b)
+        {
+
+
+            b.Invalidate();
+        }
+
+        internal static void ApplyRibbonBarOffice2003ElementStyle(ElementStyle backStyle, ElementStyle backMouseOverStyle, ElementStyle titleStyle, ElementStyle titleMouseOverStyle)
+        {
+            backStyle.Reset();
+            backMouseOverStyle.Reset();
+            titleStyle.Reset();
+            titleMouseOverStyle.Reset();
+
+            backStyle.BackColorSchemePart = eColorSchemePart.BarBackground2;
+            backStyle.BackColor2SchemePart = eColorSchemePart.BarBackground;
+            backStyle.BackColorGradientAngle = 90;
+
+            titleStyle.BackColorSchemePart = eColorSchemePart.PanelBackground;
+            titleStyle.BackColor2SchemePart = eColorSchemePart.PanelBackground2;
+            titleStyle.BackColorGradientAngle = 90;
+            titleStyle.TextColorSchemePart = eColorSchemePart.PanelText;
+            titleStyle.PaddingTop = 1;
+            titleStyle.PaddingBottom = 1;
+            titleStyle.PaddingLeft = 2;
+            titleStyle.PaddingRight = 2;
+            titleStyle.TextShadowColor = Color.Black;
+            titleStyle.TextShadowOffset = new Point(1, 1);
+
+            titleStyle.BorderColorSchemePart = eColorSchemePart.PanelBorder;
+            titleStyle.Border = eStyleBorderType.Solid;
+            titleStyle.BorderWidth = 1;
+        }
+
+        /// <summary>
+        /// Applies Office 2003 color scheme to ribbon control background.
+        /// </summary>
+        /// <param name="b">Reference to object.</param>
+        public static void ApplyOffice2003ColorScheme(RibbonControl b)
+        {
+            ApplyRibbonOffice2003ElementStyle(b.BackgroundStyle);
+            b.Invalidate(true);
+        }
+
+        /// <summary>
+        /// Applies Gray color scheme to ribbon control background.
+        /// </summary>
+        /// <param name="b">Reference to object.</param>
+        public static void ApplyGrayColorScheme(RibbonControl b)
+        {
+            b.BackgroundStyle.Reset();
+            TypeDescriptor.GetProperties(b.BackgroundStyle)["BackColor"].SetValue(b.BackgroundStyle, ColorScheme.GetColor("F4F4F4"));
+            TypeDescriptor.GetProperties(b.BackgroundStyle)["BackColor2"].SetValue(b.BackgroundStyle, ColorScheme.GetColor("CFCFCF"));
+            TypeDescriptor.GetProperties(b.BackgroundStyle)["BackColorGradientAngle"].SetValue(b.BackgroundStyle, 0);
+            TypeDescriptor.GetProperties(b.BackgroundStyle)["BackColorGradientType"].SetValue(b.BackgroundStyle, eGradientType.Radial);
+
+            b.Invalidate(true);
+        }
+
+        /// <summary>
+        /// Applies Office 2007 color table to ribbon control background.
+        /// </summary>
+        /// <param name="b">Reference to object.</param>
+        public static void ApplyOffice2007ColorScheme(RibbonControl b)
+        {
+            //Rendering.Office2007ColorTable ct = GetOffice2007ColorTable(b);
+            //ApplyRibbonOffice2007ElementStyle(b.BackgroundStyle, ct);
+            b.Invalidate(true);
+        }
+
+        internal static void ApplyRibbonElementStyle(ElementStyle style, RibbonControl rc)
+        {
+            eDotNetBarStyle effectiveStyle = rc.Style;
+            if (effectiveStyle == eDotNetBarStyle.StyleManagerControlled)
+                effectiveStyle = StyleManager.GetEffectiveStyle();
+            if (rc != null && effectiveStyle == eDotNetBarStyle.Office2007)
+            {
+                ApplyRibbonOffice2007ElementStyle(style, GetOffice2007ColorTable(rc));
+            }
+            else if (rc != null && (effectiveStyle == eDotNetBarStyle.Office2010 || StyleManager.IsMetro(effectiveStyle)))
+            {
+                ApplyRibbonOffice2010ElementStyle(style, GetOffice2007ColorTable(rc), rc.RibbonStrip.IsGlassEnabled);
+            }
+            else if (rc != null && effectiveStyle == eDotNetBarStyle.Windows7)
+            {
+                ApplyRibbonWindows7ElementStyle(style, GetOffice2007ColorTable(rc));
+            }
+            else
+            {
+                ApplyRibbonOffice2003ElementStyle(style);
+            }
+        }
+
+        internal static void ApplyRibbonOffice2007ElementStyle(ElementStyle backStyle, Rendering.Office2007ColorTable ct)
+        {
+            backStyle.Reset();
+
+            backStyle.BackColor = ct.RibbonControl.TabsBackground.Start;
+            backStyle.BackColor2 = ct.RibbonControl.TabsBackground.End;
+            backStyle.BackColorGradientAngle = ct.RibbonControl.TabsBackground.GradientAngle;
+            backStyle.BackColorGradientType = eGradientType.Linear;
+        }
+        internal static void ApplyRibbonOffice2010ElementStyle(ElementStyle backStyle, Rendering.Office2007ColorTable ct, bool isGlassEnabled)
+        {
+            backStyle.Reset();
+            backStyle.BackColor = ct.RibbonControl.TabsBackground.Start;
+            backStyle.BackColor2 = ct.RibbonControl.TabsBackground.End;
+            backStyle.BackColorGradientAngle = ct.RibbonControl.TabsBackground.GradientAngle;
+            backStyle.BackColorGradientType = eGradientType.Linear;
+
+            if (isGlassEnabled)
+            {
+                //backStyle.BackColor = ct.RibbonControl.TabsGlassBackground.Start;
+                //backStyle.BackColor2 = ct.RibbonControl.TabsGlassBackground.End;
+                //backStyle.BackColorGradientAngle = ct.RibbonControl.TabsGlassBackground.GradientAngle;
+                //backStyle.BackColorGradientType = eGradientType.Linear;
+                backStyle.BackColor = ct.RibbonControl.TabsGlassBackground.End;
+                backStyle.BackColor2 = ct.RibbonControl.TabsGlassBackground.Start;
+                backStyle.BackColorGradientAngle = ct.RibbonControl.TabsGlassBackground.GradientAngle;
+                backStyle.BackColorGradientType = eGradientType.Radial;
+            }
+        }
+        internal static void ApplyRibbonWindows7ElementStyle(ElementStyle backStyle, Rendering.Office2007ColorTable ct)
+        {
+            backStyle.Reset();
+
+            backStyle.BackColor = ct.RibbonControl.TabsBackground.Start;
+            backStyle.BackColor2 = ct.RibbonControl.TabsBackground.End;
+            backStyle.BackColorGradientAngle = ct.RibbonControl.TabsBackground.GradientAngle;
+            backStyle.BackColorGradientType = eGradientType.Linear;
+        }
+
+        internal static void ApplyRibbonOffice2003ElementStyle(ElementStyle backStyle)
+        {
+            backStyle.Reset();
+
+            backStyle.BackColorSchemePart = eColorSchemePart.BarBackground2;
+            backStyle.BackColor2SchemePart = eColorSchemePart.BarBackground;
+            backStyle.BackColorGradientAngle = 90;
+        }
+
+        /// <summary>
+        /// Applies Office 2007 Luna blue color scheme to the Ribbon Bar.
+        /// </summary>
+        /// <param name="b">Reference to object.</param>
+        public static void ApplyOffice2007ColorScheme(RibbonBar b)
+        {
+            //Rendering.Office2007ColorTable c = GetOffice2007ColorTable(b);
+            //ApplyRibbonBarOffice2007ElementStyle(b.BackgroundStyle, b.BackgroundMouseOverStyle, b.TitleStyle, b.TitleStyleMouseOver, c);
+            b.Invalidate();
+        }
+
+        internal static Rendering.Office2007ColorTable GetOffice2007ColorTable(RibbonBar b)
+        {
+            Rendering.Office2007ColorTable c = null;
+            if ((b.RenderMode == eRenderMode.Custom || b.RenderMode == eRenderMode.Instance) && b.Renderer != null)
+            {
+                Rendering.Office2007Renderer rn = b.Renderer as Rendering.Office2007Renderer;
+                if (rn != null)
+                    c = rn.ColorTable;
+            }
+            else
+            {
+                Rendering.Office2007Renderer rn = GlobalManager.Renderer as Rendering.Office2007Renderer;
+                if (rn != null)
+                    c = rn.ColorTable;
+            }
+
+            if (c == null) c = new Office2007ColorTable();
+
+            return c;
+        }
+
+        internal static Rendering.Office2007ColorTable GetOffice2007ColorTable(RibbonControl b)
+        {
+            Rendering.Office2007ColorTable c = null;
+            if ((b.RibbonStrip.RenderMode == eRenderMode.Custom || b.RibbonStrip.RenderMode == eRenderMode.Instance) && b.RibbonStrip.Renderer != null)
+            {
+                Rendering.Office2007Renderer rn = b.RibbonStrip.Renderer as Rendering.Office2007Renderer;
+                if (rn != null)
+                    c = rn.ColorTable;
+            }
+            else
+            {
+                Rendering.Office2007Renderer rn = GlobalManager.Renderer as Rendering.Office2007Renderer;
+                if (rn != null)
+                    c = rn.ColorTable;
+            }
+
+            if (c == null) c = new Office2007ColorTable();
+
+            return c;
+        }
+
+        internal static void ApplyRibbonBarElementStyle(ElementStyle backStyle, ElementStyle backMouseOverStyle, ElementStyle titleStyle, ElementStyle titleMouseOverStyle, RibbonBar b)
+        {
+            if (b.EffectiveStyle == eDotNetBarStyle.Office2007)
+            {
+                Rendering.Office2007ColorTable c = GetOffice2007ColorTable(b);
+                ApplyRibbonBarOffice2007ElementStyle(backStyle, backMouseOverStyle, titleStyle, titleMouseOverStyle, c);
+            }
+            else if (b.EffectiveStyle == eDotNetBarStyle.Office2010)
+            {
+                Rendering.Office2007ColorTable c = GetOffice2007ColorTable(b);
+                ApplyRibbonBarOffice2010ElementStyle(backStyle, backMouseOverStyle, titleStyle, titleMouseOverStyle, c); ;
+            }
+            else if (StyleManager.IsMetro(b.EffectiveStyle))
+            {
+                Rendering.Office2007ColorTable c = GetOffice2007ColorTable(b);
+                ApplyRibbonBarMetroElementStyle(backStyle, backMouseOverStyle, titleStyle, titleMouseOverStyle, c); ;
+            }
+            else if (b.EffectiveStyle == eDotNetBarStyle.Windows7)
+            {
+                Rendering.Office2007ColorTable c = GetOffice2007ColorTable(b);
+                ApplyRibbonBarWindows7ElementStyle(backStyle, backMouseOverStyle, titleStyle, titleMouseOverStyle, c); ;
+            }
+            else
+            {
+                ApplyRibbonBarOffice2003ElementStyle(backStyle, backMouseOverStyle, titleStyle, titleMouseOverStyle);
+            }
+        }
+
+        internal static void ApplyRibbonBarOffice2010ElementStyle(ElementStyle backStyle, ElementStyle backMouseOverStyle, ElementStyle titleStyle, ElementStyle titleMouseOverStyle, Rendering.Office2007ColorTable c)
+        {
+            backStyle.Reset();
+            backMouseOverStyle.Reset();
+            titleStyle.Reset();
+            titleMouseOverStyle.Reset();
+
+            backStyle.BorderRight = eStyleBorderType.Etched;
+            backStyle.BorderRightWidth = 1;
+            backStyle.CornerType = eCornerType.Square;
+            //backStyle.CornerDiameter = 2;
+            backStyle.BorderColor = c.RibbonBar.Default.OuterBorder.Start;
+            backStyle.BorderColor2 = c.RibbonBar.Default.OuterBorder.End;
+            backStyle.BorderColorLight = c.RibbonBar.Default.InnerBorder.Start;
+            backStyle.BorderColorLight2 = c.RibbonBar.Default.InnerBorder.End;
+            backStyle.BackColorGradientAngle = 90;
+            if (c.RibbonBar.Default.BottomBackground == null)
+            {
+                backStyle.BackColor = c.RibbonBar.Default.TopBackground.Start;
+                backStyle.BackColor2 = c.RibbonBar.Default.TopBackground.End;
+            }
+            else
+            {
+                backStyle.BackColorBlend.Add(new BackgroundColorBlend(c.RibbonBar.Default.TopBackground.Start, 0));
+                backStyle.BackColorBlend.Add(new BackgroundColorBlend(c.RibbonBar.Default.TopBackground.End, c.RibbonBar.Default.TopBackgroundHeight));
+                backStyle.BackColorBlend.Add(new BackgroundColorBlend(c.RibbonBar.Default.BottomBackground.Start, c.RibbonBar.Default.TopBackgroundHeight));
+                backStyle.BackColorBlend.Add(new BackgroundColorBlend(c.RibbonBar.Default.BottomBackground.End, 1));
+            }
+
+            backStyle.PaddingTop = 2;
+            backStyle.PaddingLeft = 2;
+            backStyle.PaddingRight = 2;
+
+            backMouseOverStyle.BorderColor = c.RibbonBar.MouseOver.OuterBorder.Start;
+            backMouseOverStyle.BorderColor2 = c.RibbonBar.MouseOver.OuterBorder.End;
+            backMouseOverStyle.BorderColorLight = c.RibbonBar.MouseOver.InnerBorder.Start;
+            backMouseOverStyle.BorderColorLight2 = c.RibbonBar.MouseOver.InnerBorder.End;
+            backMouseOverStyle.BackColorGradientAngle = 90;
+            if (c.RibbonBar.MouseOver.BottomBackground == null)
+            {
+                backStyle.BackColor = c.RibbonBar.MouseOver.TopBackground.Start;
+                backStyle.BackColor2 = c.RibbonBar.MouseOver.TopBackground.End;
+            }
+            else
+            {
+                backMouseOverStyle.BackColorBlend.Add(new BackgroundColorBlend(c.RibbonBar.MouseOver.TopBackground.Start, 0));
+                backMouseOverStyle.BackColorBlend.Add(new BackgroundColorBlend(c.RibbonBar.MouseOver.TopBackground.End, c.RibbonBar.MouseOver.TopBackgroundHeight));
+                backMouseOverStyle.BackColorBlend.Add(new BackgroundColorBlend(c.RibbonBar.MouseOver.BottomBackground.Start, c.RibbonBar.MouseOver.TopBackgroundHeight));
+                backMouseOverStyle.BackColorBlend.Add(new BackgroundColorBlend(c.RibbonBar.MouseOver.BottomBackground.End, 1));
+            }
+
+            if (c.RibbonBar.Default.TitleBackground != null)
+            {
+                titleStyle.BackColor = c.RibbonBar.Default.TitleBackground.Start;
+                titleStyle.BackColor2 = c.RibbonBar.Default.TitleBackground.End;
+                titleStyle.BackColorGradientAngle = 90;
+            }
+            titleStyle.TextAlignment = eStyleTextAlignment.Center;
+            titleStyle.TextColor = c.RibbonBar.Default.TitleText;
+            titleStyle.TextShadowOffset = Point.Empty;
+            titleStyle.PaddingTop = 1;
+            titleStyle.PaddingBottom = 1;
+
+            if (c.RibbonBar.MouseOver.TitleBackground != null)
+            {
+                titleMouseOverStyle.BackColor = c.RibbonBar.MouseOver.TitleBackground.Start;
+                titleMouseOverStyle.BackColor2 = c.RibbonBar.MouseOver.TitleBackground.End;
+                titleMouseOverStyle.BackColorGradientAngle = 90;
+                titleMouseOverStyle.BackColorGradientType = eGradientType.Radial;
+            }
+            titleMouseOverStyle.TextAlignment = eStyleTextAlignment.Center;
+            titleMouseOverStyle.TextColor = c.RibbonBar.MouseOver.TitleText;
+
+            titleStyle.HideMnemonic = true;
+            titleMouseOverStyle.HideMnemonic = true;
+        }
+        internal static void ApplyRibbonBarMetroElementStyle(ElementStyle backStyle, ElementStyle backMouseOverStyle, ElementStyle titleStyle, ElementStyle titleMouseOverStyle, Rendering.Office2007ColorTable c)
+        {
+            backStyle.Reset();
+            backMouseOverStyle.Reset();
+            titleStyle.Reset();
+            titleMouseOverStyle.Reset();
+
+            backStyle.BorderRight = eStyleBorderType.Solid;
+            backStyle.BorderRightWidth = 1;
+            backStyle.CornerType = eCornerType.Square;
+            //backStyle.CornerDiameter = 2;
+            backStyle.BorderColor = c.RibbonBar.Default.OuterBorder.Start;
+            backStyle.BorderColor2 = c.RibbonBar.Default.OuterBorder.End;
+            //backStyle.BorderColorLight = c.RibbonBar.Default.InnerBorder.Start;
+            //backStyle.BorderColorLight2 = c.RibbonBar.Default.InnerBorder.End;
+            backStyle.BackColorGradientAngle = 90;
+            if (c.RibbonBar.Default.BottomBackground == null)
+            {
+                backStyle.BackColor = c.RibbonBar.Default.TopBackground.Start;
+                backStyle.BackColor2 = c.RibbonBar.Default.TopBackground.End;
+            }
+            else
+            {
+                backStyle.BackColorBlend.Add(new BackgroundColorBlend(c.RibbonBar.Default.TopBackground.Start, 0));
+                backStyle.BackColorBlend.Add(new BackgroundColorBlend(c.RibbonBar.Default.TopBackground.End, c.RibbonBar.Default.TopBackgroundHeight));
+                backStyle.BackColorBlend.Add(new BackgroundColorBlend(c.RibbonBar.Default.BottomBackground.Start, c.RibbonBar.Default.TopBackgroundHeight));
+                backStyle.BackColorBlend.Add(new BackgroundColorBlend(c.RibbonBar.Default.BottomBackground.End, 1));
+            }
+
+            backStyle.PaddingTop = 2;
+            backStyle.PaddingLeft = 2;
+            backStyle.PaddingRight = 2;
+
+            backMouseOverStyle.BorderColor = c.RibbonBar.MouseOver.OuterBorder.Start;
+            backMouseOverStyle.BorderColor2 = c.RibbonBar.MouseOver.OuterBorder.End;
+            //backMouseOverStyle.BorderColorLight = c.RibbonBar.MouseOver.InnerBorder.Start;
+            //backMouseOverStyle.BorderColorLight2 = c.RibbonBar.MouseOver.InnerBorder.End;
+            backMouseOverStyle.BackColorGradientAngle = 90;
+            if (c.RibbonBar.MouseOver.BottomBackground == null)
+            {
+                backMouseOverStyle.BackColor = c.RibbonBar.MouseOver.TopBackground.Start;
+                backMouseOverStyle.BackColor2 = c.RibbonBar.MouseOver.TopBackground.End;
+            }
+            else
+            {
+                backMouseOverStyle.BackColorBlend.Add(new BackgroundColorBlend(c.RibbonBar.MouseOver.TopBackground.Start, 0));
+                backMouseOverStyle.BackColorBlend.Add(new BackgroundColorBlend(c.RibbonBar.MouseOver.TopBackground.End, c.RibbonBar.MouseOver.TopBackgroundHeight));
+                backMouseOverStyle.BackColorBlend.Add(new BackgroundColorBlend(c.RibbonBar.MouseOver.BottomBackground.Start, c.RibbonBar.MouseOver.TopBackgroundHeight));
+                backMouseOverStyle.BackColorBlend.Add(new BackgroundColorBlend(c.RibbonBar.MouseOver.BottomBackground.End, 1));
+            }
+
+            if (c.RibbonBar.Default.TitleBackground != null)
+            {
+                titleStyle.BackColor = c.RibbonBar.Default.TitleBackground.Start;
+                titleStyle.BackColor2 = c.RibbonBar.Default.TitleBackground.End;
+                titleStyle.BackColorGradientAngle = 90;
+            }
+            titleStyle.TextAlignment = eStyleTextAlignment.Center;
+            titleStyle.TextColor = c.RibbonBar.Default.TitleText;
+            titleStyle.TextShadowOffset = Point.Empty;
+            titleStyle.PaddingTop = 1;
+            titleStyle.PaddingBottom = 1;
+
+            if (c.RibbonBar.MouseOver.TitleBackground != null)
+            {
+                titleMouseOverStyle.BackColor = c.RibbonBar.MouseOver.TitleBackground.Start;
+                titleMouseOverStyle.BackColor2 = c.RibbonBar.MouseOver.TitleBackground.End;
+                titleMouseOverStyle.BackColorGradientAngle = 90;
+                titleMouseOverStyle.BackColorGradientType = eGradientType.Radial;
+            }
+            titleMouseOverStyle.TextAlignment = eStyleTextAlignment.Center;
+            titleMouseOverStyle.TextColor = c.RibbonBar.MouseOver.TitleText;
+
+            titleStyle.HideMnemonic = true;
+            titleMouseOverStyle.HideMnemonic = true;
+        }
+        internal static void ApplyRibbonBarWindows7ElementStyle(ElementStyle backStyle, ElementStyle backMouseOverStyle, ElementStyle titleStyle, ElementStyle titleMouseOverStyle, Rendering.Office2007ColorTable c)
+        {
+            backStyle.Reset();
+            backMouseOverStyle.Reset();
+            titleStyle.Reset();
+            titleMouseOverStyle.Reset();
+
+            backStyle.BorderRight = eStyleBorderType.Etched;
+            backStyle.BorderRightWidth = 1;
+            backStyle.CornerType = eCornerType.Square;
+            //backStyle.CornerDiameter = 2;
+            backStyle.BorderColor = c.RibbonBar.Default.OuterBorder.Start;
+            backStyle.BorderColor2 = c.RibbonBar.Default.OuterBorder.End;
+            backStyle.BorderColorLight = c.RibbonBar.Default.InnerBorder.Start;
+            backStyle.BorderColorLight2 = c.RibbonBar.Default.InnerBorder.End;
+            backStyle.BackColorGradientAngle = 90;
+            if (c.RibbonBar.Default.BottomBackground == null)
+            {
+                backStyle.BackColor = c.RibbonBar.Default.TopBackground.Start;
+                backStyle.BackColor2 = c.RibbonBar.Default.TopBackground.End;
+            }
+            else
+            {
+                backStyle.BackColorBlend.Add(new BackgroundColorBlend(c.RibbonBar.Default.TopBackground.Start, 0));
+                backStyle.BackColorBlend.Add(new BackgroundColorBlend(c.RibbonBar.Default.TopBackground.End, c.RibbonBar.Default.TopBackgroundHeight));
+                backStyle.BackColorBlend.Add(new BackgroundColorBlend(c.RibbonBar.Default.BottomBackground.Start, c.RibbonBar.Default.TopBackgroundHeight));
+                backStyle.BackColorBlend.Add(new BackgroundColorBlend(c.RibbonBar.Default.BottomBackground.End, 1));
+            }
+
+            backStyle.PaddingTop = 2;
+            backStyle.PaddingLeft = 2;
+            backStyle.PaddingRight = 2;
+
+            backMouseOverStyle.BorderColor = c.RibbonBar.MouseOver.OuterBorder.Start;
+            backMouseOverStyle.BorderColor2 = c.RibbonBar.MouseOver.OuterBorder.End;
+            backMouseOverStyle.BorderColorLight = c.RibbonBar.MouseOver.InnerBorder.Start;
+            backMouseOverStyle.BorderColorLight2 = c.RibbonBar.MouseOver.InnerBorder.End;
+            backMouseOverStyle.BackColorGradientAngle = 90;
+            if (c.RibbonBar.MouseOver.BottomBackground == null)
+            {
+                backStyle.BackColor = c.RibbonBar.MouseOver.TopBackground.Start;
+                backStyle.BackColor2 = c.RibbonBar.MouseOver.TopBackground.End;
+            }
+            else
+            {
+                backMouseOverStyle.BackColorBlend.Add(new BackgroundColorBlend(c.RibbonBar.MouseOver.TopBackground.Start, 0));
+                backMouseOverStyle.BackColorBlend.Add(new BackgroundColorBlend(c.RibbonBar.MouseOver.TopBackground.End, c.RibbonBar.MouseOver.TopBackgroundHeight));
+                backMouseOverStyle.BackColorBlend.Add(new BackgroundColorBlend(c.RibbonBar.MouseOver.BottomBackground.Start, c.RibbonBar.MouseOver.TopBackgroundHeight));
+                backMouseOverStyle.BackColorBlend.Add(new BackgroundColorBlend(c.RibbonBar.MouseOver.BottomBackground.End, 1));
+            }
+
+            if (c.RibbonBar.Default.TitleBackground != null)
+            {
+                titleStyle.BackColor = c.RibbonBar.Default.TitleBackground.Start;
+                titleStyle.BackColor2 = c.RibbonBar.Default.TitleBackground.End;
+                titleStyle.BackColorGradientAngle = 90;
+            }
+            titleStyle.TextAlignment = eStyleTextAlignment.Center;
+            titleStyle.TextColor = c.RibbonBar.Default.TitleText;
+            titleStyle.TextShadowOffset = Point.Empty;
+            titleStyle.PaddingTop = 1;
+            titleStyle.PaddingBottom = 1;
+
+            if (c.RibbonBar.MouseOver.TitleBackground != null)
+            {
+                titleMouseOverStyle.BackColor = c.RibbonBar.MouseOver.TitleBackground.Start;
+                titleMouseOverStyle.BackColor2 = c.RibbonBar.MouseOver.TitleBackground.End;
+                titleMouseOverStyle.BackColorGradientAngle = 90;
+                titleMouseOverStyle.BackColorGradientType = eGradientType.Radial;
+            }
+            titleMouseOverStyle.TextAlignment = eStyleTextAlignment.Center;
+            titleMouseOverStyle.TextColor = c.RibbonBar.MouseOver.TitleText;
+
+            titleStyle.HideMnemonic = true;
+            titleMouseOverStyle.HideMnemonic = true;
+        }
+
+        internal static void ApplyRibbonBarOffice2007ElementStyle(ElementStyle backStyle, ElementStyle backMouseOverStyle, ElementStyle titleStyle, ElementStyle titleMouseOverStyle, Rendering.Office2007ColorTable c)
+        {
+            backStyle.Reset();
+            backMouseOverStyle.Reset();
+            titleStyle.Reset();
+            titleMouseOverStyle.Reset();
+
+            backStyle.Border = eStyleBorderType.Etched;
+            backStyle.BorderWidth = 1;
+            backStyle.CornerType = eCornerType.Rounded;
+            backStyle.CornerDiameter = 2;
+            backStyle.BorderColor = c.RibbonBar.Default.OuterBorder.Start;
+            backStyle.BorderColor2 = c.RibbonBar.Default.OuterBorder.End;
+            backStyle.BorderColorLight = c.RibbonBar.Default.InnerBorder.Start;
+            backStyle.BorderColorLight2 = c.RibbonBar.Default.InnerBorder.End;
+            backStyle.BackColorGradientAngle = 90;
+            if (c.RibbonBar.Default.TopBackground != null && c.RibbonBar.Default.BottomBackground != null)
+            {
+                backStyle.BackColorBlend.Add(new BackgroundColorBlend(c.RibbonBar.Default.TopBackground.Start, 0));
+                backStyle.BackColorBlend.Add(new BackgroundColorBlend(c.RibbonBar.Default.TopBackground.End, c.RibbonBar.Default.TopBackgroundHeight));
+                backStyle.BackColorBlend.Add(new BackgroundColorBlend(c.RibbonBar.Default.BottomBackground.Start, c.RibbonBar.Default.TopBackgroundHeight));
+                backStyle.BackColorBlend.Add(new BackgroundColorBlend(c.RibbonBar.Default.BottomBackground.End, 1));
+            }
+
+            backStyle.PaddingLeft = 2;
+            backStyle.PaddingRight = 2;
+
+            backMouseOverStyle.BorderColor = c.RibbonBar.MouseOver.OuterBorder.Start;
+            backMouseOverStyle.BorderColor2 = c.RibbonBar.MouseOver.OuterBorder.End;
+            backMouseOverStyle.BorderColorLight = c.RibbonBar.MouseOver.InnerBorder.Start;
+            backMouseOverStyle.BorderColorLight2 = c.RibbonBar.MouseOver.InnerBorder.End;
+            backMouseOverStyle.BackColorGradientAngle = 90;
+            if (c.RibbonBar.MouseOver.TopBackground != null && c.RibbonBar.MouseOver.BottomBackground != null)
+            {
+                backMouseOverStyle.BackColorBlend.Add(new BackgroundColorBlend(c.RibbonBar.MouseOver.TopBackground.Start, 0));
+                backMouseOverStyle.BackColorBlend.Add(new BackgroundColorBlend(c.RibbonBar.MouseOver.TopBackground.End, c.RibbonBar.MouseOver.TopBackgroundHeight));
+                backMouseOverStyle.BackColorBlend.Add(new BackgroundColorBlend(c.RibbonBar.MouseOver.BottomBackground.Start, c.RibbonBar.MouseOver.TopBackgroundHeight));
+                backMouseOverStyle.BackColorBlend.Add(new BackgroundColorBlend(c.RibbonBar.MouseOver.BottomBackground.End, 1));
+            }
+
+            if (c.RibbonBar.Default.TitleBackground != null)
+            {
+                titleStyle.BackColor = c.RibbonBar.Default.TitleBackground.Start;
+                titleStyle.BackColor2 = c.RibbonBar.Default.TitleBackground.End;
+            }
+
+            titleStyle.BackColorGradientAngle = 90;
+            titleStyle.TextAlignment = eStyleTextAlignment.Center;
+            titleStyle.TextColor = c.RibbonBar.Default.TitleText;
+            titleStyle.TextShadowOffset = Point.Empty;
+            titleStyle.PaddingTop = 1;
+            titleStyle.PaddingBottom = 1;
+
+            if (c.RibbonBar.MouseOver != null)
+            {
+                if (c.RibbonBar.MouseOver.TitleBackground != null)
+                {
+                    titleMouseOverStyle.BackColor = c.RibbonBar.MouseOver.TitleBackground.Start;
+                    titleMouseOverStyle.BackColor2 = c.RibbonBar.MouseOver.TitleBackground.End;
+                }
+                titleMouseOverStyle.BackColorGradientAngle = 90;
+                titleMouseOverStyle.TextAlignment = eStyleTextAlignment.Center;
+                titleMouseOverStyle.TextColor = c.RibbonBar.MouseOver.TitleText;
+            }
+
+            titleStyle.HideMnemonic = true;
+            titleMouseOverStyle.HideMnemonic = true;
+        }
+
+        internal static ElementStyle StyleFromRibbonBarStateColorTable(Office2007RibbonBarStateColorTable table)
+        {
+            ElementStyle style = new ElementStyle();
+            style.Border = eStyleBorderType.Etched;
+            style.BorderWidth = 1;
+            style.CornerType = eCornerType.Rounded;
+            style.CornerDiameter = 3;
+            style.BorderColor = table.OuterBorder.Start;
+            style.BorderColor2 = table.OuterBorder.End;
+            style.BorderColorLight = table.InnerBorder.Start;
+            style.BorderColorLight2 = table.InnerBorder.End;
+            style.BackColorGradientAngle = 90;
+            if (table.BottomBackground != null && !table.BottomBackground.IsEmpty)
+            {
+                style.BackColorBlend.Add(new BackgroundColorBlend(table.TopBackground.Start, 0));
+                style.BackColorBlend.Add(new BackgroundColorBlend(table.TopBackground.End, table.TopBackgroundHeight));
+                style.BackColorBlend.Add(new BackgroundColorBlend(table.BottomBackground.Start, table.TopBackgroundHeight));
+                style.BackColorBlend.Add(new BackgroundColorBlend(table.BottomBackground.End, 1));
+            }
+            else if (table.TopBackground != null && !table.TopBackground.IsEmpty)
+            {
+                style.BackColor = table.TopBackground.Start;
+                style.BackColor2 = table.TopBackground.End;
+            }
+
+            return style;
+        }
+
+        private static ColorScheme GetColorScheme()
+        {
+            if (GlobalManager.Renderer is Office2007Renderer)
+                return ((Office2007Renderer)(GlobalManager.Renderer)).ColorTable.LegacyColors;
+            return new ColorScheme();
+        }
+        /// <summary>
+        /// Applies specified style to Ribbon control and all other controls that are managed by the ribbon control.
+        /// This method is useful for example when switching the color tables for Office 2007 renderer. Once
+        /// the GlobalManager.Renderer color table is changed you can call this method to apply color table
+        /// changes to the Ribbon Control and other controls managed by it.
+        /// </summary>
+        /// <param name="r">RibbonControl to set the style on.</param>
+        /// <param name="style">Visual style to apply.</param>
+        public static void SetRibbonControlStyle(RibbonControl r, eDotNetBarStyle style)
+        {
+            r.BackgroundStyle.Reset();
+
+            if (style == eDotNetBarStyle.Office2010 || style == eDotNetBarStyle.Windows7 || StyleManager.IsMetro(style) || style != r.Style)
+            {
+                ChangeStyle(r, style, r.IsDesignMode, GetColorScheme());
+            }
+            else
+            {
+                r.Style = style;
+
+                foreach (Control c in r.Controls)
+                {
+                    if (c is RibbonPanel)
+                    {
+                        RibbonPanel rp = c as RibbonPanel;
+                        rp.Style.Reset();
+                        rp.StyleMouseDown.Reset();
+                        rp.StyleMouseOver.Reset();
+                        rp.ColorSchemeStyle = style;
+                    }
+                    else if (c is RibbonBar)
+                        SetRibbonBarStyle(c as RibbonBar, style);
+
+                    foreach (Control child in c.Controls)
+                    {
+                        if (child is RibbonBar)
+                            SetRibbonBarStyle(child as RibbonBar, style);
+                    }
+                }
+            }
+
+
+            r.Invalidate(true);
+        }
+
+        internal static void ApplyQatElementStyle(ElementStyle style, Ribbon.QatToolbar qat)
+        {
+            if (!(qat.Parent is RibbonControl)) return;
+
+            style.Reset();
+            eDotNetBarStyle effectiveStyle = qat.EffectiveStyle;
+            if (effectiveStyle == eDotNetBarStyle.Office2010 || StyleManager.IsMetro(effectiveStyle))
+            {
+                Rendering.Office2007ColorTable ct = GetOffice2007ColorTable(qat.Parent as RibbonControl);
+
+                Rendering.Office2007QuickAccessToolbarStateColorTable qatColors = ct.QuickAccessToolbar.Standalone;
+                style.BackColor = qatColors.BottomBackground.Start;
+                style.BackColor2 = qatColors.BottomBackground.End;
+                style.BackColorGradientAngle = qatColors.BottomBackground.GradientAngle;
+                style.Border = eStyleBorderType.Solid;
+                style.BorderWidth = 1;
+                style.CornerType = eCornerType.Square;
+                //style.CornerDiameter = 2;
+                style.BorderColor = qatColors.OutterBorderColor;
+                style.BorderColorLight = qatColors.InnerBorderColor;
+            }
+            else if (effectiveStyle == eDotNetBarStyle.Windows7)
+            {
+                Rendering.Office2007ColorTable ct = GetOffice2007ColorTable(qat.Parent as RibbonControl);
+
+                Rendering.Office2007QuickAccessToolbarStateColorTable qatColors = ct.QuickAccessToolbar.Standalone;
+                style.BackColor = qatColors.BottomBackground.Start;
+                style.BackColor2 = qatColors.BottomBackground.End;
+                style.BackColorGradientAngle = qatColors.BottomBackground.GradientAngle;
+                style.Border = eStyleBorderType.Solid;
+                style.BorderWidth = 1;
+                style.CornerType = eCornerType.Square;
+                style.BorderColor = qatColors.OutterBorderColor;
+                style.BorderColorLight = qatColors.InnerBorderColor;
+            }
+            else if (effectiveStyle == eDotNetBarStyle.Office2007)
+            {
+                Rendering.Office2007ColorTable ct = GetOffice2007ColorTable(qat.Parent as RibbonControl);
+
+                Rendering.Office2007QuickAccessToolbarStateColorTable qatColors = ct.QuickAccessToolbar.Standalone;
+                style.BackColor = qatColors.BottomBackground.Start;
+                style.BackColor2 = qatColors.BottomBackground.End;
+                style.BackColorGradientAngle = qatColors.BottomBackground.GradientAngle;
+                style.Border = eStyleBorderType.Etched;
+                style.BorderWidth = 1;
+                style.CornerType = eCornerType.Rounded;
+                style.CornerDiameter = 2;
+                style.BorderColor = qatColors.OutterBorderColor;
+                style.BorderColorLight = qatColors.InnerBorderColor;
+            }
+            else
+            {
+                style.BackColorSchemePart = eColorSchemePart.BarBackground;
+                style.BackColor2SchemePart = eColorSchemePart.BarBackground2;
+                style.BackColorGradientAngle = 90;
+            }
+        }
+
+        //internal static void ApplyOffice2007ColorScheme(Ribbon.QatToolbar qat)
+        //{
+        //    Rendering.Office2007ColorTable ct = null;
+        //    Rendering.Office2007Renderer rn = Rendering.GlobalManager.Renderer as Rendering.Office2007Renderer;
+        //    if (rn != null)
+        //        ct = rn.ColorTable;
+        //    else
+        //        ct = new Rendering.Office2007ColorTable();
+
+        //    Rendering.Office2007QuickAccessToolbarStateColorTable qatColors = ct.QuickAccessToolbar.Standalone;
+        //    qat.BackColor = Color.Transparent;
+        //    qat.BackgroundStyle.BackColor = qatColors.BottomBackground.Start;
+        //    qat.BackgroundStyle.BackColor2 = qatColors.BottomBackground.End;
+        //    qat.BackgroundStyle.BackColorGradientAngle = qatColors.BottomBackground.GradientAngle;
+        //    qat.BackgroundStyle.Border = eStyleBorderType.Etched;
+        //    qat.BackgroundStyle.BorderWidth = 1;
+        //    qat.BackgroundStyle.CornerType = eCornerType.Rounded;
+        //    qat.BackgroundStyle.CornerDiameter = 2;
+        //    qat.BackgroundStyle.BorderColor = qatColors.OutterBorderColor;
+        //    qat.BackgroundStyle.BorderColorLight = qatColors.InnerBorderColor;
+        //}
+
+        /// <summary>
+        /// Applies specified visual style to the RibbonBar control.
+        /// </summary>
+        /// <param name="bar">RibbonBar control to set the style on.</param>
+        /// <param name="style">Visual style to apply.</param>
+        public static void SetRibbonBarStyle(RibbonBar bar, eDotNetBarStyle style)
+        {
+            bar.BackgroundStyle.Reset();
+            bar.BackgroundMouseOverStyle.Reset();
+            bar.TitleStyle.Reset();
+            bar.TitleStyleMouseOver.Reset();
+            bar.Style = style;
+            bar.Invalidate();
+        }
+
+        /// <summary>
+        /// Applies current color scheme and layout settings to the container which acts as top-level file menu container.
+        /// Applies to Office 2007 style only.
+        /// </summary>
+        /// <param name="container">Container to apply style to.</param>
+        public static void SetupFileMenuContainer(ItemContainer topContainer)
+        {
+            Rendering.Office2007MenuColorTable mc = GetOffice2007MenuColorTable();
+            if (mc == null)
+                return;
+
+            topContainer.LayoutOrientation = eOrientation.Vertical;
+            topContainer.BackgroundStyle.PaddingBottom = 3;
+            topContainer.BackgroundStyle.PaddingLeft = 3;
+            topContainer.BackgroundStyle.PaddingRight = 3;
+            topContainer.BackgroundStyle.PaddingTop = 8;
+            BackgroundColorBlend[] blend = new BackgroundColorBlend[mc.FileBackgroundBlend.Count];
+            mc.FileBackgroundBlend.CopyTo(blend);
+            topContainer.BackgroundStyle.BackColorBlend.Clear();
+            topContainer.BackgroundStyle.BackColorBlend.AddRange(blend);
+        }
+
+        private static Rendering.Office2007MenuColorTable GetOffice2007MenuColorTable()
+        {
+            Rendering.Office2007MenuColorTable mc = null;
+            if (Rendering.GlobalManager.Renderer is Rendering.Office2007Renderer)
+                mc = ((Rendering.Office2007Renderer)Rendering.GlobalManager.Renderer).ColorTable.Menu;
+            return mc;
+        }
+
+        /// <summary>
+        /// Applies current color scheme and layout properties to the two column menu container used by the top-level file menu.
+        /// Applies to Office 2007 style only.
+        /// </summary>
+        /// <param name="twoColumn">Container to apply style to.</param>
+        public static void SetupTwoColumnMenuContainer(ItemContainer twoColumnMenu)
+        {
+            Rendering.Office2007MenuColorTable mc = GetOffice2007MenuColorTable();
+            if (mc == null)
+                return;
+
+            twoColumnMenu.BackgroundStyle.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Double;
+            twoColumnMenu.BackgroundStyle.BorderBottomWidth = 1;
+            twoColumnMenu.BackgroundStyle.BorderColor = mc.FileContainerBorder;
+            twoColumnMenu.BackgroundStyle.BorderColorLight = mc.FileContainerBorderLight;
+            twoColumnMenu.BackgroundStyle.BorderLeft = DevComponents.DotNetBar.eStyleBorderType.Double;
+            twoColumnMenu.BackgroundStyle.BorderLeftWidth = 1;
+            twoColumnMenu.BackgroundStyle.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Double;
+            twoColumnMenu.BackgroundStyle.BorderRightWidth = 1;
+            twoColumnMenu.BackgroundStyle.BorderTop = DevComponents.DotNetBar.eStyleBorderType.Double;
+            twoColumnMenu.BackgroundStyle.BorderTopWidth = 1;
+            twoColumnMenu.BackgroundStyle.PaddingBottom = 2;
+            twoColumnMenu.BackgroundStyle.PaddingLeft = 2;
+            twoColumnMenu.BackgroundStyle.PaddingRight = 2;
+            twoColumnMenu.BackgroundStyle.PaddingTop = 2;
+            twoColumnMenu.ItemSpacing = 0;
+        }
+
+        /// <summary>
+        /// Applies current color scheme and layout properties to the first column menu container used by the top-level file menu.
+        /// This column usually contains menu items.
+        /// Applies to Office 2007 style only.
+        /// </summary>
+        /// <param name="menuColumn">Container to apply style to.</param>
+        public static void SetupMenuColumnOneContainer(ItemContainer menuColumn)
+        {
+            Rendering.Office2007MenuColorTable mc = GetOffice2007MenuColorTable();
+            if (mc == null)
+                return;
+
+            menuColumn.BackgroundStyle.BackColor = mc.FileColumnOneBackground;
+            menuColumn.BackgroundStyle.BorderRight = DevComponents.DotNetBar.eStyleBorderType.Solid;
+            menuColumn.BackgroundStyle.BorderRightColor = mc.FileColumnOneBorder;
+            menuColumn.BackgroundStyle.BorderRightWidth = 1;
+            menuColumn.BackgroundStyle.PaddingRight = 1;
+            menuColumn.LayoutOrientation = DevComponents.DotNetBar.eOrientation.Vertical;
+            menuColumn.MinimumSize = new System.Drawing.Size(120, 0);
+        }
+
+        /// <summary>
+        /// Applies current color scheme and layout properties to the first column menu container used by the top-level file menu.
+        /// This column usually contains most recently used list of files or documents.
+        /// Applies to Office 2007 style only.
+        /// </summary>
+        /// <param name="menuColumn">Container to apply style to.</param>
+        public static void SetupMenuColumnTwoContainer(ItemContainer columnTwo)
+        {
+            Rendering.Office2007MenuColorTable mc = GetOffice2007MenuColorTable();
+            if (mc == null)
+                return;
+
+            columnTwo.BackgroundStyle.BackColor = mc.FileColumnTwoBackground;
+            columnTwo.LayoutOrientation = DevComponents.DotNetBar.eOrientation.Vertical;
+            columnTwo.MinimumSize = new System.Drawing.Size(180, 0);
+        }
+
+        /// <summary>
+        /// Applies current color scheme and layout properties to the bottom menu container used by the top-level file menu.
+        /// This container usually contains Options and Exit buttons.
+        /// Applies to Office 2007 style only.
+        /// </summary>
+        /// <param name="menuColumn">Container to apply style to.</param>
+        public static void SetupMenuBottomContainer(ItemContainer bottomContainer)
+        {
+            Rendering.Office2007MenuColorTable mc = GetOffice2007MenuColorTable();
+            if (mc == null)
+                return;
+
+            BackgroundColorBlend[] blend = new BackgroundColorBlend[mc.FileBottomContainerBackgroundBlend.Count];
+            mc.FileBottomContainerBackgroundBlend.CopyTo(blend);
+            bottomContainer.BackgroundStyle.BackColorBlend.Clear();
+            bottomContainer.BackgroundStyle.BackColorBlend.AddRange(blend);
+
+            bottomContainer.BackgroundStyle.BackColorGradientAngle = 90;
+            bottomContainer.HorizontalItemAlignment = DevComponents.DotNetBar.eHorizontalItemsAlignment.Right;
+        }
+
+#if FRAMEWORK20
+        /// <summary>
+        /// Changes the Office 2007 color table for all DotNetBar controls on the open forms that are tracked by Application.OpenForms collection. You can use this function for example to
+        /// apply Black color scheme to all DotNetBar control on all open forms. The color table will be changed only for controls that
+        /// have Office 2007 style. Any other style will be unchanged.
+        /// </summary>
+        /// <param name="colorTable">Color table to select and apply.</param>
+        public static void ChangeOffice2007ColorTable(eOffice2007ColorScheme colorTable)
+        {
+            // Make sure we use right color table in our global renderer
+            if (GlobalManager.Renderer is Office2007Renderer)
+            {
+                ((Office2007Renderer)GlobalManager.Renderer).ColorTable.Dispose();
+                ((Office2007Renderer)GlobalManager.Renderer).ColorTable = new Office2007ColorTable(colorTable);
+            }
+            else
+                throw new InvalidOperationException("GlobalManager.Renderer is not Office2007Renderer. Cannot change the color table. Make sure that renderer is set to Office2007Renderer");
+
+            ApplyOffice2007ColorTable();
+        }
+
+        /// <summary>
+        /// Applies current Office 2007 style color table set on GlobalManager.Renderer to all DotNetBar controls with Office 2007 style on all open forms.
+        /// </summary>
+        public static void ApplyOffice2007ColorTable()
+        {
+            foreach (Form f in Application.OpenForms)
+            {
+                ApplyOffice2007ColorTable(f);
+            }
+        }
+#endif
+
+        /// <summary>
+        /// Changes the Office 2007 color table for all DotNetBar controls on the form. You can use this function for example to
+        /// apply Black color scheme to all DotNetBar control on given form. The color table will be changed only for controls that
+        /// have Office 2007 style. Any other style will be unchanged.
+        /// </summary>
+        /// <param name="form">Form to apply color table to.</param>
+        /// <param name="colorTable">Color table to select and apply.</param>
+        public static void ChangeOffice2007ColorTable(Control form, eOffice2007ColorScheme colorTable)
+        {
+            // Make sure we use right color table in our global renderer
+            if (GlobalManager.Renderer is Office2007Renderer)
+            {
+                ((Office2007Renderer)GlobalManager.Renderer).ColorTable.Dispose();
+                ((Office2007Renderer)GlobalManager.Renderer).ColorTable = new Office2007ColorTable(colorTable);
+            }
+            else
+                throw new InvalidOperationException("GlobalManager.Renderer is not Office2007Renderer. Cannot change the color table. Make sure that renderer is set to Office2007Renderer");
+
+            ApplyOffice2007ColorTable(form);
+        }
+
+        /// <summary>
+        /// Generates and Changes the Office 2007 color table for all DotNetBar controls on the form. You can use this function for example to
+        /// create custom color scheme based on the base color and apply it to all DotNetBar control on given form. The new color table will be applied only to controls that
+        /// have Office 2007 style. Any other style will be unchanged.
+        /// </summary>
+        /// <param name="form">Form to apply color table to.</param>
+        /// <param name="colorTable">Base color table to use for creation of custom color table that will be applied.</param>
+        /// <param name="baseSchemeColor">Base color used to create custom color table.</param>
+        public static void ChangeOffice2007ColorTable(Control form, eOffice2007ColorScheme colorTable, Color baseSchemeColor)
+        {
+            // Make sure we use black color table in our global renderer
+            if (GlobalManager.Renderer is Office2007Renderer)
+            {
+                ((Office2007Renderer)GlobalManager.Renderer).ColorTable.Dispose();
+                ((Office2007Renderer)GlobalManager.Renderer).ColorTable = new Office2007ColorTable(colorTable, baseSchemeColor);
+            }
+            else
+                throw new InvalidOperationException("GlobalManager.Renderer is not Office2007Renderer. Cannot change the color table. Make sure that renderer is set to Office2007Renderer");
+
+            ApplyOffice2007ColorTable(form);
+        }
+
+#if FRAMEWORK20
+        /// <summary>
+        /// Generates and Changes the Office 2007 color table for all DotNetBar controls on all open forms. You can use this function for example to
+        /// create custom color scheme based on the base color and apply it to all DotNetBar control on given form. The new color table will be applied only to controls that
+        /// have Office 2007 style. Any other style will be unchanged.
+        /// </summary>
+        /// <param name="colorTable">Base color table to use for creation of custom color table that will be applied.</param>
+        /// <param name="baseSchemeColor">Base color used to create custom color table.</param>
+        public static void ChangeOffice2007ColorTable(eOffice2007ColorScheme colorTable, Color baseSchemeColor)
+        {
+            // Make sure we use black color table in our global renderer
+            if (GlobalManager.Renderer is Office2007Renderer)
+            {
+                ((Office2007Renderer)GlobalManager.Renderer).ColorTable.Dispose();
+                ((Office2007Renderer)GlobalManager.Renderer).ColorTable = new Office2007ColorTable(colorTable, baseSchemeColor);
+            }
+            else
+                throw new InvalidOperationException("GlobalManager.Renderer is not Office2007Renderer. Cannot change the color table. Make sure that renderer is set to Office2007Renderer");
+
+            ApplyOffice2007ColorTable();
+        }
+#endif
+
+        /// <summary>
+        /// Applies current Office 2007 style color table to all DotNetBar controls on the form.
+        /// </summary>
+        /// <param name="form">Reference to the form or parent control that contains DotNetBar controls you would like to apply color table to.</param>
+        public static void ApplyOffice2007ColorTable(Control form)
+        {
+            if (form == null)
+                return;
+
+            // Make sure we use black color table in our global renderer
+            if (!(GlobalManager.Renderer is Office2007Renderer))
+                throw new InvalidOperationException("GlobalManager.Renderer is not Office2007Renderer. Cannot change the color table. Make sure that renderer is set to Office2007Renderer");
+
+            ColorScheme cs = ((Office2007Renderer)GlobalManager.Renderer).ColorTable.LegacyColors;
+
+            foreach (Control c in form.Controls)
+            {
+                ChangeOffice2007ColorTable(c, cs);
+            }
+
+            if (form is RibbonForm)
+            {
+                form.BackColor = ((Office2007Renderer)GlobalManager.Renderer).ColorTable.Form.BackColor;
+            }
+            if (form is OfficeForm)
+                ((OfficeForm)form).InvalidateNonClient(true);
+            form.Invalidate(true);
+        }
+
+        private static void ChangeOffice2007ColorTable(Control cont, ColorScheme cs)
+        {
+            bool enumChildControls = true;
+            if (cont is PanelEx && ((PanelEx)cont).ColorSchemeStyle == eDotNetBarStyle.Office2007)
+            {
+                PanelEx pe = cont as PanelEx;
+                pe.ColorSchemeStyle = eDotNetBarStyle.Office2007;
+                cont.Invalidate();
+            }
+            if (cont is PanelControl && ((PanelControl)cont).EffectiveColorSchemeStyle == eDotNetBarStyle.Office2007)
+            {
+                PanelControl pc = cont as PanelControl;
+                pc.RefreshStyleSystemColors();
+                pc.Invalidate();
+            }
+            else if (cont is ExpandablePanel && ((ExpandablePanel)cont).ColorSchemeStyle == eDotNetBarStyle.Office2007)
+            {
+                //ExpandablePanel ep = cont as ExpandablePanel;
+                //ep.ColorScheme = cs;
+                cont.Invalidate();
+            }
+            else if (cont is RibbonControl)
+            {
+                ((RibbonControl)cont).RibbonStrip.InitDefaultStyles();
+                cont.Invalidate(true);
+                //RibbonControl rc = cont as RibbonControl;
+                //SetRibbonControlStyle(rc, eDotNetBarStyle.Office2007);
+                //enumChildControls = false;
+            }
+            else if (cont is RibbonBar)
+            {
+                cont.Invalidate();
+                //RibbonBar rb = cont as RibbonBar;
+                //ApplyOffice2007ColorScheme(rb);
+            }
+            else if (cont is TabControl)
+            {
+                TabControl tc = cont as TabControl;
+                if (tc.Style == eTabStripStyle.Office2007Dock || tc.Style == eTabStripStyle.Office2007Document)
+                    tc.Style = tc.Style;
+            }
+            else if (cont is TabStrip)
+            {
+                TabStrip ts = cont as TabStrip;
+                if (ts.Style == eTabStripStyle.Office2007Dock || ts.Style == eTabStripStyle.Office2007Document)
+                    ts.Style = ts.Style;
+            }
+            else if (cont is SideBar)
+            {
+                SideBar sb = cont as SideBar;
+                if (sb.Style == eDotNetBarStyle.Office2007)
+                    sb.Invalidate();
+            }
+            else if (cont is RibbonForm)
+            {
+                cont.BackColor = ((Office2007Renderer)GlobalManager.Renderer).ColorTable.Form.BackColor;
+                if (cont is OfficeForm)
+                    ((OfficeForm)cont).InvalidateNonClient(true);
+            }
+            else if (cont is DockSite && cont.Dock == DockStyle.Top)
+            {
+                // Update any floating bars through DotNetBarManager
+                DockSite ds = cont as DockSite;
+                if (ds.Owner != null)
+                {
+                    foreach (Bar bar in ds.Owner.Bars)
+                    {
+                        if (bar.DockSide == eDockSide.None)
+                        {
+                            bar.Invalidate(true);
+                            ChangeOffice2007ColorTable(bar, cs);
+                        }
+                    }
+                }
+            }
+            else if (cont is Controls.ComboBoxEx)
+                ((Controls.ComboBoxEx)cont).Style = ((Controls.ComboBoxEx)cont).Style;
+            else if (cont is NavigationPane)
+                ((NavigationPane)cont).Office2007ColorTableChanged();
+            else if (cont is BaseItemControl && ((BaseItemControl)cont).Style == eDotNetBarStyle.Office2007)
+                cont.Invalidate();
+#if FRAMEWORK20
+            else if (cont is Controls.ListViewEx)
+            {
+                Controls.ListViewEx lv = cont as Controls.ListViewEx;
+                lv.Invalidate(true);
+                lv.ResetCachedColorTableReference();
+            }
+            else if (cont is Controls.DataGridViewX)
+                cont.Invalidate(true);
+            else if (cont is Controls.DGHScrollBar || cont is Controls.DGVScrollBar)
+                cont.Invalidate();
+            else if (cont is DevComponents.DotNetBar.Controls.WarningBox)
+                ((DevComponents.DotNetBar.Controls.WarningBox)cont).UpdateColorScheme();
+#endif
+#if !NOTREE
+            else if (cont is AdvTree.AdvTree)
+                cont.Invalidate();
+#endif
+
+            if (enumChildControls)
+            {
+                foreach (Control c in cont.Controls)
+                    ChangeOffice2007ColorTable(c, cs);
+            }
+        }
+        #endregion
+
+        #region Office 2010
+#if FRAMEWORK20
+        /// <summary>
+        /// Changes style for all controls on Application.OpenForms to specified style. Use this method to change the style for all controls to Office 2007 or Office 2010 styles only.
+        /// </summary>
+        /// <param name="newStyle">New style to assign to controls on forms.</param>
+        public static void ChangeStyle(eDotNetBarStyle newStyle)
+        {
+            foreach (Form form in Application.OpenForms)
+            {
+                ChangeStyle(newStyle, form);
+            }
+        }
+
+        /// <summary>
+        /// Changes style for all controls on Application.OpenForms to specified style. Use this method to change the style for all controls to Office 2007 or Office 2010 styles only.
+        /// </summary>
+        /// <param name="newStyle">New style to assign to controls on forms.</param>
+        /// <param name="blendColor">Color used to blend with the base color scheme.</param>
+        public static void ChangeStyle(eDotNetBarStyle newStyle, Color blendColor)
+        {
+            foreach (Form form in Application.OpenForms)
+            {
+                ChangeStyle(newStyle, form, false, blendColor);
+            }
+        }
+#endif
+        /// <summary>
+        /// Changes style for all controls on a form to specified style. Use this method to change the style for all controls to Office 2007 or Office 2010 styles only.
+        /// </summary>
+        /// <param name="newStyle">New style to assign to controls.</param>
+        /// <param name="parentForm">Form or Control to process.</param>
+        public static void ChangeStyle(eDotNetBarStyle newStyle, Control parentForm)
+        {
+            ChangeStyle(newStyle, parentForm, false, Color.Empty);
+        }
+        /// <summary>
+        /// Changes style for all controls on a form to specified style. Use this method to change the style for all controls to Office 2007 or Office 2010 styles only.
+        /// </summary>
+        /// <param name="newStyle">New style to assign to controls.</param>
+        /// <param name="parentForm">Form or Control to process.</param>
+        /// <param name="blendColor">Color used to blend with the base color scheme.</param>
+        public static void ChangeStyle(eDotNetBarStyle newStyle, Control parentForm, Color blendColor)
+        {
+            ChangeStyle(newStyle, parentForm, false, blendColor);
+        }
+
+        private static void ChangeStyle(eDotNetBarStyle newStyle, Control parentForm, bool designMode, Color blendColor)
+        {
+            if (newStyle == eDotNetBarStyle.Office2010 || StyleManager.IsMetro(newStyle))
+            {
+                if (blendColor.IsEmpty)
+                    ((Office2007Renderer)GlobalManager.Renderer).ColorTable = new Office2010ColorTable();
+                else
+                    ((Office2007Renderer)GlobalManager.Renderer).ColorTable = new Office2010ColorTable(eOffice2010ColorScheme.Silver, blendColor);
+            }
+            else if (newStyle == eDotNetBarStyle.Windows7)
+            {
+                if (blendColor.IsEmpty)
+                    ((Office2007Renderer)GlobalManager.Renderer).ColorTable = new Windows7ColorTable();
+                else
+                    ((Office2007Renderer)GlobalManager.Renderer).ColorTable = new Windows7ColorTable(eWindows7ColorScheme.Blue, blendColor);
+            }
+            else if (newStyle == eDotNetBarStyle.Office2007)
+            {
+                if (blendColor.IsEmpty)
+                    ((Office2007Renderer)GlobalManager.Renderer).ColorTable = new Office2007ColorTable();
+                else
+                    ((Office2007Renderer)GlobalManager.Renderer).ColorTable = new Office2007ColorTable(eOffice2007ColorScheme.Blue, blendColor);
+            }
+            ColorScheme cs = ((Office2007Renderer)GlobalManager.Renderer).ColorTable.LegacyColors;
+
+            foreach (Control item in parentForm.Controls)
+            {
+                ChangeStyle(item, newStyle, designMode, cs);
+            }
+        }
+
+        private static BaseItem GetAppButton(RibbonControl ribbon)
+        {
+            BaseItem appButton = null;
+            for (int i = 0; i < ribbon.QuickToolbarItems.Count; i++)
+            {
+                if (ribbon.QuickToolbarItems[i] is ApplicationButton)
+                {
+                    appButton = ribbon.QuickToolbarItems[i];
+                    break;
+                }
+
+            }
+            return appButton;
+        }
+        private static DevComponents.DotNetBar.eTabStripStyle GetTabControlStyle(TabStrip tab, eDotNetBarStyle style)
+        {
+            if (style == eDotNetBarStyle.Office2007 || style == eDotNetBarStyle.Office2010 || style == eDotNetBarStyle.Windows7 || StyleManager.IsMetro(style))
+            {
+                if (tab.Style != eTabStripStyle.Office2007Dock || tab.Style != eTabStripStyle.Office2007Document)
+                    return eTabStripStyle.Office2007Document;
+            }
+            else if (style == eDotNetBarStyle.VS2005)
+                return eTabStripStyle.VS2005;
+            return tab.Style;
+        }
+        private static void ChangeStyle(Control cont, eDotNetBarStyle style, bool designMode, ColorScheme cs)
+        {
+            eDotNetBarStyle effectiveStyle = style;
+            if (style == eDotNetBarStyle.StyleManagerControlled) effectiveStyle = StyleManager.GetEffectiveStyle();
+            bool enumChildControls = true;
+            if (cont is PanelEx && ((PanelEx)cont).ColorSchemeStyle == eDotNetBarStyle.Office2007)
+            {
+                PanelEx pe = cont as PanelEx;
+                pe.ColorSchemeStyle = style;
+                cont.Invalidate();
+            }
+            if (cont is PanelControl && ((PanelControl)cont).ColorSchemeStyle == eDotNetBarStyle.Office2007)
+            {
+                PanelControl pc = cont as PanelControl;
+                pc.ColorSchemeStyle = style;
+                pc.RefreshStyleSystemColors();
+                pc.Invalidate();
+            }
+            else if (cont is ExpandablePanel && ((ExpandablePanel)cont).ColorSchemeStyle == eDotNetBarStyle.Office2007)
+            {
+                ExpandablePanel ep = cont as ExpandablePanel;
+                ep.ColorSchemeStyle = style;
+                cont.Invalidate();
+            }
+            else if (cont is RibbonControl)
+            {
+                RibbonControl ribbon = (RibbonControl)cont;
+                if (effectiveStyle == eDotNetBarStyle.Office2010 || effectiveStyle == eDotNetBarStyle.Windows7 || StyleManager.IsMetro(effectiveStyle))
+                {
+                    BaseItem appButton = GetAppButton(ribbon);
+                    if (appButton != null)
+                    {
+                        if (appButton is ButtonItem && ((ButtonItem)appButton).ImageFixedSize.IsEmpty)
+                            ((ButtonItem)appButton).ImageFixedSize = new Size(16, 16);
+                        ribbon.QuickToolbarItems.Remove(appButton);
+                        ribbon.Items.Insert(0, appButton);
+                    }
+                }
+                else if (effectiveStyle == eDotNetBarStyle.Office2007)
+                {
+                    if (ribbon.Items.Count > 0 && ribbon.Items[0] is ApplicationButton)
+                    {
+                        ApplicationButton appButton = (ApplicationButton)ribbon.Items[0];
+                        if (!appButton.ImageFixedSize.IsEmpty)
+                            appButton.ImageFixedSize = Size.Empty;
+                        ribbon.Items.Remove(appButton);
+                        ribbon.QuickToolbarItems.Insert(0, appButton);
+                    }
+                }
+                if (style == eDotNetBarStyle.StyleManagerControlled && ribbon.Style == style || style != eDotNetBarStyle.StyleManagerControlled)
+                    ribbon.Style = style;
+                ribbon.RibbonStrip.InitDefaultStyles();
+                ribbon.Invalidate(true);
+                if (ribbon.IsHandleCreated && ribbon.SelectedRibbonTabItem != null && ribbon.SelectedRibbonTabItem.Panel != null)
+                {
+                    ribbon.SelectedRibbonTabItem.Panel.PerformLayout();
+                }
+                enumChildControls = false;
+            }
+            else if (cont is RibbonBar)
+            {
+                RibbonBar rb = cont as RibbonBar;
+                rb.Style = style;
+                cont.Invalidate();
+            }
+            else if (cont is TabControl)
+            {
+                TabControl tc = cont as TabControl;
+                tc.Style = GetTabControlStyle(tc.TabStrip, style);
+            }
+            else if (cont is TabStrip)
+            {
+                TabStrip ts = cont as TabStrip;
+                ts.Style = GetTabControlStyle(ts, style);
+            }
+            else if (cont is SideBar)
+            {
+                SideBar sb = cont as SideBar;
+                sb.Style = style;
+                sb.Invalidate();
+            }
+            else if (cont is RibbonForm)
+            {
+                cont.BackColor = ((Office2007Renderer)GlobalManager.Renderer).ColorTable.Form.BackColor;
+                if (cont is OfficeForm)
+                    ((OfficeForm)cont).InvalidateNonClient(true);
+            }
+            else if (cont is DockSite && cont.Dock == DockStyle.Top)
+            {
+                // Update any floating bars through DotNetBarManager
+                DockSite ds = cont as DockSite;
+                if (ds.Owner != null)
+                {
+                    foreach (Bar bar in ds.Owner.Bars)
+                    {
+                        if (bar.DockSide == eDockSide.None)
+                        {
+                            bar.Invalidate(true);
+                            ChangeOffice2007ColorTable(bar, cs);
+                        }
+                    }
+                }
+            }
+            else if (cont is Controls.ComboBoxEx)
+                ((Controls.ComboBoxEx)cont).Style = style;
+            else if (cont is NavigationPane)
+            {
+                NavigationPane pane = (NavigationPane)cont;
+                pane.Style = style;
+                if (BarFunctions.IsOffice2007Style(style))
+                    ((NavigationPane)cont).Office2007ColorTableChanged();
+            }
+            else if (cont is BaseItemControl)
+            {
+                ((BaseItemControl)cont).Style = style;
+                cont.Invalidate();
+            }
+#if FRAMEWORK20
+            else if (cont is Controls.ListViewEx)
+            {
+                Controls.ListViewEx lv = cont as Controls.ListViewEx;
+                lv.Invalidate(true);
+                lv.ResetCachedColorTableReference();
+            }
+            else if (cont is Controls.DataGridViewX)
+                cont.Invalidate(true);
+            else if (cont is Controls.DGHScrollBar || cont is Controls.DGVScrollBar)
+                cont.Invalidate();
+            else if (cont is DevComponents.DotNetBar.Controls.WarningBox)
+                ((DevComponents.DotNetBar.Controls.WarningBox)cont).UpdateColorScheme();
+#endif
+#if !NOTREE
+            else if (cont is AdvTree.AdvTree)
+                cont.Invalidate();
+#endif
+
+            if (enumChildControls)
+            {
+                foreach (Control c in cont.Controls)
+                    ChangeOffice2007ColorTable(c, cs);
+            }
+        }
+
+        /// <summary>
+        /// Changes the Office 2010 color table for all DotNetBar controls on the form. You can use this function for example to
+        /// apply Black color scheme to all DotNetBar control on given form. The color table will be changed only for controls that
+        /// have Office 2007 and 2010 style. Any other style will be unchanged.
+        /// </summary>
+        /// <param name="form">Form to apply color table to.</param>
+        /// <param name="colorTable">Color table to select and apply.</param>
+        public static void ChangeOffice2010ColorTable(Control form, eOffice2010ColorScheme colorTable)
+        {
+            // Make sure we use right color table in our global renderer
+            if (GlobalManager.Renderer is Office2007Renderer)
+            {
+                ((Office2007Renderer)GlobalManager.Renderer).ColorTable.Dispose();
+                ((Office2007Renderer)GlobalManager.Renderer).ColorTable = new Office2010ColorTable(colorTable);
+            }
+            else
+                throw new InvalidOperationException("GlobalManager.Renderer is not Office2007Renderer. Cannot change the color table. Make sure that renderer is set to Office2007Renderer");
+
+            ApplyOffice2007ColorTable(form);
+        }
+
+        /// <summary>
+        /// Generates and Changes the Office 2010 color table for all DotNetBar controls on the form. You can use this function for example to
+        /// create custom color scheme based on the base color and apply it to all DotNetBar control on given form. The new color table will be applied only to controls that
+        /// have Office 2007 and 2010 style. Any other style will be unchanged.
+        /// </summary>
+        /// <param name="form">Form to apply color table to.</param>
+        /// <param name="colorTable">Base color table to use for creation of custom color table that will be applied.</param>
+        /// <param name="baseSchemeColor">Base color used to create custom color table.</param>
+        public static void ChangeOffice2010ColorTable(Control form, eOffice2010ColorScheme colorTable, Color baseSchemeColor)
+        {
+            // Make sure we use black color table in our global renderer
+            if (GlobalManager.Renderer is Office2007Renderer)
+            {
+                ((Office2007Renderer)GlobalManager.Renderer).ColorTable.Dispose();
+                ((Office2007Renderer)GlobalManager.Renderer).ColorTable = new Office2010ColorTable(colorTable, baseSchemeColor);
+            }
+            else
+                throw new InvalidOperationException("GlobalManager.Renderer is not Office2007Renderer. Cannot change the color table. Make sure that renderer is set to Office2007Renderer");
+
+            ApplyOffice2007ColorTable(form);
+        }
+
+#if FRAMEWORK20
+        /// <summary>
+        /// Generates and Changes the Office 2010 color table for all DotNetBar controls on all open forms. You can use this function for example to
+        /// create custom color scheme based on the base color and apply it to all DotNetBar control on given form. The new color table will be applied only to controls that
+        /// have Office 2007 and 2010 style. Any other style will be unchanged.
+        /// </summary>
+        /// <param name="colorTable">Base color table to use for creation of custom color table that will be applied.</param>
+        /// <param name="baseSchemeColor">Base color used to create custom color table.</param>
+        public static void ChangeOffice2010ColorTable(eOffice2010ColorScheme colorTable, Color baseSchemeColor)
+        {
+            // Make sure we use black color table in our global renderer
+            if (GlobalManager.Renderer is Office2007Renderer)
+            {
+                ((Office2007Renderer)GlobalManager.Renderer).ColorTable.Dispose();
+                ((Office2007Renderer)GlobalManager.Renderer).ColorTable = new Office2010ColorTable(colorTable, baseSchemeColor);
+            }
+            else
+                throw new InvalidOperationException("GlobalManager.Renderer is not Office2007Renderer. Cannot change the color table. Make sure that renderer is set to Office2007Renderer");
+
+            ApplyOffice2007ColorTable();
+        }
+#endif
+        #endregion
+
+        #region Windows7
+        /// <summary>
+        /// Changes the Windows 7 color table for all DotNetBar controls on the form. You can use this function for example to
+        /// apply Black color scheme to all DotNetBar control on given form. The color table will be changed only for controls that
+        /// have Windows 7, Office 2007, 2010 style. Any other style will be unchanged.
+        /// </summary>
+        /// <param name="form">Form to apply color table to.</param>
+        /// <param name="colorTable">Color table to select and apply.</param>
+        public static void ChangeWindows7ColorTable(Control form, eWindows7ColorScheme colorTable)
+        {
+            // Make sure we use right color table in our global renderer
+            if (GlobalManager.Renderer is Office2007Renderer)
+            {
+                ((Office2007Renderer)GlobalManager.Renderer).ColorTable.Dispose();
+                ((Office2007Renderer)GlobalManager.Renderer).ColorTable = new Windows7ColorTable(colorTable);
+            }
+            else
+                throw new InvalidOperationException("GlobalManager.Renderer is not Office2007Renderer. Cannot change the color table. Make sure that renderer is set to Office2007Renderer");
+
+            ApplyOffice2007ColorTable(form);
+        }
+
+        /// <summary>
+        /// Generates and Changes the Windows 7 color table for all DotNetBar controls on the form. You can use this function for example to
+        /// create custom color scheme based on the base color and apply it to all DotNetBar control on given form. The new color table will be applied only to controls that
+        /// have Windows 7, Office 2007 and 2010 style. Any other style will be unchanged.
+        /// </summary>
+        /// <param name="form">Form to apply color table to.</param>
+        /// <param name="colorTable">Base color table to use for creation of custom color table that will be applied.</param>
+        /// <param name="baseSchemeColor">Base color used to create custom color table.</param>
+        public static void ChangeWindows7ColorTable(Control form, eWindows7ColorScheme colorTable, Color baseSchemeColor)
+        {
+            // Make sure we use black color table in our global renderer
+            if (GlobalManager.Renderer is Office2007Renderer)
+            {
+                ((Office2007Renderer)GlobalManager.Renderer).ColorTable.Dispose();
+                ((Office2007Renderer)GlobalManager.Renderer).ColorTable = new Windows7ColorTable(colorTable, baseSchemeColor);
+            }
+            else
+                throw new InvalidOperationException("GlobalManager.Renderer is not Office2007Renderer. Cannot change the color table. Make sure that renderer is set to Office2007Renderer");
+
+            ApplyOffice2007ColorTable(form);
+        }
+
+#if FRAMEWORK20
+        /// <summary>
+        /// Generates and Changes the Windows 7 color table for all DotNetBar controls on all open forms. You can use this function for example to
+        /// create custom color scheme based on the base color and apply it to all DotNetBar control on given form. The new color table will be applied only to controls that
+        /// have Windows 7, Office 2007 and 2010 style. Any other style will be unchanged.
+        /// </summary>
+        /// <param name="colorTable">Base color table to use for creation of custom color table that will be applied.</param>
+        /// <param name="baseSchemeColor">Base color used to create custom color table.</param>
+        public static void ChangeWindows7ColorTable(eWindows7ColorScheme colorTable, Color baseSchemeColor)
+        {
+            // Make sure we use black color table in our global renderer
+            if (GlobalManager.Renderer is Office2007Renderer)
+            {
+                ((Office2007Renderer)GlobalManager.Renderer).ColorTable.Dispose();
+                ((Office2007Renderer)GlobalManager.Renderer).ColorTable = new Windows7ColorTable(colorTable, baseSchemeColor);
+            }
+            else
+                throw new InvalidOperationException("GlobalManager.Renderer is not Office2007Renderer. Cannot change the color table. Make sure that renderer is set to Office2007Renderer");
+
+            ApplyOffice2007ColorTable();
+        }
+#endif
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Ribbon/RibbonStrip.cs b/PROMS/DotNetBar Source Code/Ribbon/RibbonStrip.cs
new file mode 100644
index 00000000..28c5e24d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Ribbon/RibbonStrip.cs	
@@ -0,0 +1,2104 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Runtime.InteropServices;
+using System.Windows.Forms;
+using System.Collections;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represents RibbonStrip control internally used by RibbonControl.
+    /// </summary>
+    [ToolboxItem(false), ComVisible(false)]
+    public class RibbonStrip : ItemControl
+    {
+        private const int Office2010GlassExcludeTopPart = 29;
+        #region Private Variables & Constructor
+        private RibbonStripContainerItem m_StripContainer = null;
+        //private GenericItemContainer m_ItemContainer=null;
+        private RibbonTabItemGroupCollection m_Groups = null;
+        private int m_TabGroupHeight = 14;
+        private bool m_TabGroupsVisible = false;
+        private Font m_DefaultGroupFont = null;
+        private Font m_DefaultGroupFontAuto = null;
+        private int m_CaptionHeight = 0;
+        private bool m_CaptionVisible = false;
+        private bool m_AutoExpand = true;
+        //private GenericItemContainer m_CaptionContainer = null;
+        //private SystemCaptionItem m_SystemCaptionItem = null;
+        private int m_RibbonStripIndent = 46;
+        private Rectangle m_CaptionBounds = Rectangle.Empty;
+        private Rectangle m_QuickToolbarBounds = Rectangle.Empty;
+        private Rectangle m_SystemCaptionItemBounds = Rectangle.Empty;
+        private Rectangle[] m_CaptionTextBounds = null;
+        private Font m_CaptionFont = null;
+        private bool m_CanCustomize = true;
+        private ElementStyle m_DefaultBackgroundStyle = new ElementStyle();
+        private bool m_KeyTipsEnabled = true;
+        private string m_TitleText = "";
+        private bool m_CanSupportGlass = false;
+
+        public RibbonStrip()
+        {
+            this.SetStyle(ControlStyles.StandardDoubleClick, true);
+
+            m_StripContainer = new RibbonStripContainerItem(this);
+            m_StripContainer.GlobalItem = false;
+            m_StripContainer.ContainerControl = this;
+            m_StripContainer.Displayed = true;
+            m_StripContainer.SetOwner(this);
+            m_StripContainer.Style = eDotNetBarStyle.Office2003;
+            this.SetBaseItemContainer(m_StripContainer);
+
+            this.ColorScheme.Style = eDotNetBarStyle.Office2003;
+
+            this.AutoSize = true;
+
+            m_Groups = new RibbonTabItemGroupCollection();
+            m_Groups.Owner = this;
+
+            // Setup system caption item
+            m_StripContainer.SystemCaptionItem.Click += SystemCaptionClick;
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            m_StripContainer.SystemCaptionItem.Click -= SystemCaptionClick;
+            base.Dispose(disposing);
+        }
+
+        #endregion
+
+        #region Events
+        /// <summary>
+        /// Occurs when text markup link from TitleText markup is clicked. Markup links can be created using "a" tag, for example:
+        /// <a name="MyLink">Markup link</a>
+        /// </summary>
+        [Description("Occurs when text markup link from TitleText markup is clicked.")]
+        public event MarkupLinkClickEventHandler TitleTextMarkupLinkClick;
+        #endregion
+
+        #region Internal Implementation
+        /// <summary>
+        /// Gets or sets whether RibbonStrip control employs the Windows Vista Glass support when available. This is managed automatically by Ribbon Control and
+        /// no setting is necessary on your part.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool CanSupportGlass
+        {
+            get { return m_CanSupportGlass; }
+            set { m_CanSupportGlass = value; }
+        }
+
+        internal override bool IsGlassEnabled
+        {
+            get
+            {
+                bool baseIsGlassEnabled = base.IsGlassEnabled;
+                if (!m_CanSupportGlass || !baseIsGlassEnabled) return false;
+                Form form = this.FindForm();
+                if (form is OfficeForm) return false;
+                if (form is RibbonForm)
+                    return ((RibbonForm)form).IsGlassEnabled;
+                return baseIsGlassEnabled;
+            }
+        }
+
+        private TextMarkup.BodyElement m_TitleTextMarkup = null;
+        /// <summary>
+        /// Gets or sets the rich text displayed on Ribbon Title instead of the Form.Text property. This property supports text-markup.
+        /// You can use <font color="SysCaptionTextExtra"> markup to instruct the markup renderer to use Office 2007 system caption extra text color which
+        /// changes depending on the currently selected color table. Note that when using this property you should manage also the Form.Text property since
+        /// that is the text that will be displayed in Windows task-bar and elsewhere where system Form.Text property is used.
+        /// You can also use the hyperlinks as part of the text markup and handle the TitleTextMarkupLinkClick event to be notified when they are clicked.
+        /// </summary>
+        [Browsable(true), DefaultValue(""), Editor("DevComponents.DotNetBar.Design.TextMarkupUIEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), EditorBrowsable(EditorBrowsableState.Always), Category("Appearance"), Description("Indicates text displayed on Ribbon Title instead of the Form.Text property.")]
+        public string TitleText
+        {
+            get { return m_TitleText; }
+            set
+            {
+                if (value == null) value = "";
+                m_TitleText = value;
+                m_TitleTextMarkup = null;
+
+                if (!TextMarkup.MarkupParser.IsMarkup(ref m_TitleText))
+                    return;
+
+                m_TitleTextMarkup = TextMarkup.MarkupParser.Parse(m_TitleText);
+
+                if (m_TitleTextMarkup != null)
+                    m_TitleTextMarkup.HyperLinkClick += new EventHandler(InternalTitleTextMarkupLinkClick);
+                TitleTextMarkupLastArrangeBounds = Rectangle.Empty;
+                this.Invalidate();
+            }
+        }
+
+        /// <summary>
+        /// Occurs when text markup link is clicked.
+        /// </summary>
+        private void InternalTitleTextMarkupLinkClick(object sender, EventArgs e)
+        {
+            TextMarkup.HyperLink link = sender as TextMarkup.HyperLink;
+            if (link != null)
+            {
+                if (TitleTextMarkupLinkClick != null)
+                    TitleTextMarkupLinkClick(this, new MarkupLinkClickEventArgs(link.Name, link.HRef));
+            }
+        }
+
+        /// <summary>
+        /// Gets reference to parsed markup body element if text was markup otherwise returns null.
+        /// </summary>
+        internal TextMarkup.BodyElement TitleTextMarkupBody
+        {
+            get { return m_TitleTextMarkup; }
+        }
+
+        internal Rectangle TitleTextMarkupLastArrangeBounds = Rectangle.Empty;
+        /// <summary>
+        /// Gets or sets whether KeyTips functionality is enabled. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Browsable(true), Category("Behavior"), Description("Indicates whether KeyTips functionality is enabled.")]
+        public bool KeyTipsEnabled
+        {
+            get { return m_KeyTipsEnabled; }
+            set { m_KeyTipsEnabled = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether control can be customized and items added by end-user using context menu to the quick access toolbar.
+        /// Caption of the control must be visible for customization to be enabled. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Browsable(true), Category("Customization"), Description("Indicates whether control can be customized. Caption must be visible for customization to be fully enabled.")]
+        public bool CanCustomize
+        {
+            get { return m_CanCustomize; }
+            set { m_CanCustomize = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the explicit height of the caption provided by control. Caption height when set is composed of the TabGroupHeight and
+        /// the value specified here. Default value is 0 which means that system default caption size is used.
+        /// </summary>
+        [Browsable(true), DefaultValue(0), Category("Appearance"), Description("Indicates explicit height of the caption provided by control")]
+        public int CaptionHeight
+        {
+            get { return m_CaptionHeight; }
+            set
+            {
+                m_CaptionHeight = value;
+                m_StripContainer.NeedRecalcSize = true;
+            }
+        }
+
+        internal bool HasVisibleTabs
+        {
+            get
+            {
+                foreach (BaseItem item in this.Items)
+                {
+                    if (item.Visible) return true;
+                }
+                return false;
+            }
+        }
+
+        internal Rectangle[] CaptionTextBounds
+        {
+            get { return m_CaptionTextBounds; }
+            set { m_CaptionTextBounds = value; }
+        }
+
+        internal Rectangle CaptionBounds
+        {
+            get { return m_CaptionBounds; }
+            set { m_CaptionBounds = value; }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never), Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public Rectangle QuickToolbarBounds
+        {
+            get { return m_QuickToolbarBounds; }
+            set { m_QuickToolbarBounds = value; }
+        }
+
+        internal Rectangle SystemCaptionItemBounds
+        {
+            get { return m_SystemCaptionItemBounds; }
+            set { m_SystemCaptionItemBounds = value; }
+        }
+
+        internal SystemCaptionItem SystemCaptionItem
+        {
+            get { return m_StripContainer.SystemCaptionItem; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether custom caption line provided by the control is visible. Default value is false.
+        /// This property should be set to true when control is used on Office2007RibbonForm.
+        /// </summary>
+        [Browsable(true), DefaultValue(false), Category("Appearance"), Description("Indicates whether custom caption line provided by the control is visible.")]
+        public bool CaptionVisible
+        {
+            get { return m_CaptionVisible; }
+            set
+            {
+                m_CaptionVisible = value;
+                OnCaptionVisibleChanged();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the font for the form caption text when CaptionVisible=true. Default value is NULL which means that system font is used.
+        /// </summary>
+        [Browsable(true), DefaultValue(null), Category("Appearance"), Description("")]
+        public Font CaptionFont
+        {
+            get { return m_CaptionFont; }
+            set
+            {
+                m_CaptionFont = value;
+                m_StripContainer.NeedRecalcSize = true;
+                this.Invalidate();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the indent of the ribbon strip. The indent setting is useful when control is used with caption visible and the Office 2007
+        /// style start button. The indent specified here will move the ribbon strip so the start button does not overlap the tabs.
+        /// Value of this property is used only when CaptionVisible = true.
+        /// Default value is 46.
+        /// </summary>
+        [Browsable(true), DefaultValue(46), Category("Layout"), Description("Indicates indent of the ribbon strip.")]
+        public int RibbonStripIndent
+        {
+            get { return m_RibbonStripIndent; }
+            set
+            {
+                m_RibbonStripIndent = value;
+                this.RecalcLayout();
+            }
+        }
+
+        private void OnCaptionVisibleChanged()
+        {
+            m_StripContainer.NeedRecalcSize = true;
+            this.RecalcLayout();
+        }
+
+        /// <summary>
+        /// Gets or sets the height in pixels of tab group line that is displayed above the RibbonTabItem objects that have group assigned.
+        /// Default value is 14 pixels. To show tab groups you need to assign the RibbonTabItem.Group property and set TabGroupsVisible=true.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), DefaultValue(14), Category("Tab Groups"), Description("Indicates height in pixels of tab group line that is displayed above the RibbonTabItem objects that have group assigned.")]
+        public int TabGroupHeight
+        {
+            get { return m_TabGroupHeight; }
+            set
+            {
+                m_TabGroupHeight = value;
+                m_StripContainer.NeedRecalcSize = true;
+                if (this.DesignMode)
+                    this.RecalcLayout();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether tab group line that is displayed above the RibbonTabItem objects that have group assigned is visible.
+        /// Default value is false. To show tab groups you need to assign the RibbonTabItem.Group property and set TabGroupsVisible=true. Use TabGroupHeight
+        /// property to control height of the group line.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), DefaultValue(false), Category("Tab Groups"), Description("Indicates height in pixels of tab group line that is displayed above the RibbonTabItem objects that have group assigned.")]
+        public bool TabGroupsVisible
+        {
+            get { return m_TabGroupsVisible; }
+            set
+            {
+                m_TabGroupsVisible = value;
+                m_StripContainer.NeedRecalcSize = true;
+                if (this.DesignMode)
+                    this.RecalcLayout();
+            }
+        }
+
+        /// <summary>
+        /// Collection of RibbonTabItemGroup items. Groups are assigned optionally to one or more RibbonTabItem object through the RibbonTabItem.Group
+        /// property to visually group tabs that belong to same functions. These tabs should be positioned next to each other.
+        /// </summary>
+        [Editor("DevComponents.DotNetBar.Design.RibbonTabItemGroupCollectionEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), DesignerSerializationVisibility(DesignerSerializationVisibility.Content), Category("Tab Groups"), Browsable(true), DevCoBrowsable(true)]
+        public RibbonTabItemGroupCollection TabGroups
+        {
+            get { return m_Groups; }
+        }
+
+        internal eDotNetBarStyle EffectiveStyle
+        {
+            get
+            {
+                return m_StripContainer.EffectiveStyle;
+            }
+        }
+        /// <summary>
+        /// Gets/Sets the visual style of the control.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Category("Appearance"), Description("Specifies the visual style of the control."), DefaultValue(eDotNetBarStyle.Office2003)]
+        public eDotNetBarStyle Style
+        {
+            get
+            {
+                return m_StripContainer.Style;
+            }
+            set
+            {
+                this.ColorScheme.Style = value;
+                m_StripContainer.Style = value;
+                this.Invalidate();
+                this.RecalcLayout();
+            }
+        }
+
+        /// <summary>
+        /// Returns collection of items on a bar.
+        /// </summary>
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content), Browsable(false)]
+        public SubItemsCollection Items
+        {
+            get
+            {
+                return m_StripContainer.RibbonStripContainer.SubItems;
+            }
+        }
+
+        /// <summary>
+        /// Returns currently selected RibbonTabItem. RibbonTabItems are selected using the Checked property. Only a single
+        /// RibbonTabItem can be Checked at any given time.
+        /// </summary>
+        [Browsable(false)]
+        public RibbonTabItem SelectedRibbonTabItem
+        {
+            get
+            {
+                foreach (BaseItem item in this.Items)
+                {
+                    if (item is RibbonTabItem && ((RibbonTabItem)item).Checked)
+                        return (RibbonTabItem)item;
+                }
+                return null;
+            }
+        }
+
+        internal override ItemPaintArgs GetItemPaintArgs(Graphics g)
+        {
+            ItemPaintArgs pa = base.GetItemPaintArgs(g);
+            RibbonControl rc = this.Parent as RibbonControl;
+            if (rc != null)
+                pa.ControlExpanded = rc.Expanded || rc.IsPopupMode;
+            return pa;
+        }
+
+        protected override void WndProc(ref Message m)
+        {
+            if (m.Msg == (int)WinApi.WindowsMessages.WM_NCHITTEST)
+            {
+                // Get position being tested...
+                int x = WinApi.LOWORD(m.LParam);
+                int y = WinApi.HIWORD(m.LParam);
+                Point p = PointToClient(new Point(x, y));
+                if (IsGlassEnabled && this.CaptionVisible)
+                {
+                    Rectangle r = new Rectangle(this.Width - BarFunctions.CaptionButtonSize.Width * 3, 0, BarFunctions.CaptionButtonSize.Width * 3, BarFunctions.CaptionButtonSize.Height + 6);
+                    if (r.Contains(p))
+                    {
+                        m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.TransparentOrCovered);
+                        return;
+                    }
+
+                    r = new Rectangle(0, 0, this.Width, 4);
+                    if (r.Contains(p))
+                    {
+                        m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.TransparentOrCovered);
+                        return;
+                    }
+
+                    if (BarFunctions.IsWindows7 && this.IsMaximized)
+                    {
+                        Rectangle[] captionTextBounds = m_CaptionTextBounds;
+                        if (captionTextBounds != null)
+                        {
+                            foreach (Rectangle item in captionTextBounds)
+                            {
+                                if (item.Contains(p))
+                                {
+                                    m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.TransparentOrCovered);
+                                    return;
+                                }
+                            }
+                        }
+                    }
+                }
+                else if (this.CaptionVisible && !this.IsMaximized)
+                {
+                    Rectangle r = new Rectangle(0, 0, this.Width, Dpi.Height4);
+                    if (r.Contains(p))
+                    {
+                        m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.TransparentOrCovered);
+                        return;
+                    }
+                }
+
+                eDotNetBarStyle effectiveStyle = this.EffectiveStyle;
+                if (m_CaptionVisible && (effectiveStyle == eDotNetBarStyle.Office2010 || StyleManager.IsMetro(effectiveStyle)) && (p.X < Dpi.Width28 && this.RightToLeft == RightToLeft.No || p.X > this.Width - Dpi.Width28 && this.RightToLeft == RightToLeft.Yes) && p.Y < Dpi.Height28)
+                {
+                    m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.TransparentOrCovered);
+                    return;
+                }
+                else if (m_CaptionVisible && effectiveStyle == eDotNetBarStyle.Windows7 && (p.X < Dpi.Width28 && this.RightToLeft == RightToLeft.No || p.X > this.Width - Dpi.Width28 && this.RightToLeft == RightToLeft.Yes) && p.Y < Dpi.Height28)
+                {
+                    m.Result = new IntPtr((int)WinApi.WindowHitTestRegions.TransparentOrCovered);
+                    return;
+                }
+            }
+
+            base.WndProc(ref m);
+        }
+
+        internal bool IsMaximized
+        {
+            get
+            {
+                Form f = this.FindForm();
+                return (f != null && f.WindowState == FormWindowState.Maximized);
+            }
+        }
+
+        protected override void ClearBackground(ItemPaintArgs pa)
+        {
+            if (this.IsGlassEnabled)
+            {
+                RibbonForm f = this.FindForm() as RibbonForm;
+                if (f != null)
+                {
+                    pa.Graphics.Clear(Color.Transparent);
+                    pa.Graphics.SetClip(new Rectangle(0, 0, this.Width, f.GlassHeight - 1), System.Drawing.Drawing2D.CombineMode.Exclude);
+                }
+                base.ClearBackground(pa);
+                pa.Graphics.ResetClip();
+            }
+            else
+                base.ClearBackground(pa);
+        }
+        protected override Rectangle GetPaintControlBackgroundRectangle()
+        {
+            if (this.IsGlassEnabled && (this.EffectiveStyle == eDotNetBarStyle.Office2010 || StyleManager.IsMetro(this.EffectiveStyle)))
+            {
+                Rectangle r = base.GetPaintControlBackgroundRectangle();
+                r.Y += Office2010GlassExcludeTopPart;
+                r.Height -= Office2010GlassExcludeTopPart;
+                return r;
+            }
+            return base.GetPaintControlBackgroundRectangle();
+        }
+        protected override void PaintControlBackground(ItemPaintArgs pa)
+        {
+            bool resetClip = false;
+            eDotNetBarStyle effectiveStyle = this.EffectiveStyle;
+
+            bool isGlassEnabled = this.IsGlassEnabled;
+            RibbonForm ribbonForm = this.FindForm() as RibbonForm;
+
+            if (isGlassEnabled)
+            {
+                if (ribbonForm != null)
+                {
+                    pa.Graphics.SetClip(new Rectangle(0, 0, this.Width, ribbonForm.GlassHeight - ((effectiveStyle == eDotNetBarStyle.Office2010 || StyleManager.IsMetro(effectiveStyle)) && pa.GlassEnabled ? Office2010GlassExcludeTopPart : 1)),
+                        System.Drawing.Drawing2D.CombineMode.Exclude);
+                    resetClip = true;
+                }
+            }
+
+            if (isGlassEnabled && (effectiveStyle == eDotNetBarStyle.Office2010 || StyleManager.IsMetro(effectiveStyle)))
+            {
+                ElementStyle style = GetBackgroundStyle();
+                if (style != null)
+                {
+                    Rectangle r = new Rectangle(0, Office2010GlassExcludeTopPart - 2, this.Width, this.Height + 8);
+                    using (System.Drawing.Drawing2D.GraphicsPath fillPath = new System.Drawing.Drawing2D.GraphicsPath())
+                    {
+                        fillPath.AddEllipse(r);
+                        using (System.Drawing.Drawing2D.PathGradientBrush brush = new System.Drawing.Drawing2D.PathGradientBrush(fillPath))
+                        {
+                            brush.CenterColor = style.BackColor;
+                            brush.SurroundColors = new Color[] { style.BackColor2 };
+                            brush.CenterPoint = new PointF(r.Width / 2, r.Bottom - Office2010GlassExcludeTopPart / 2);
+                            System.Drawing.Drawing2D.Blend blend = new System.Drawing.Drawing2D.Blend();
+                            blend.Factors = new float[] { 0f, .85f, 1f, };
+                            blend.Positions = new float[] { 0f, .65f, 1f };
+                            brush.Blend = blend;
+                            pa.Graphics.FillPath(brush, fillPath);
+                        }
+                    }
+                }
+            }
+            else
+                base.PaintControlBackground(pa);
+
+            if (resetClip) pa.Graphics.ResetClip();
+
+            m_QuickToolbarBounds = Rectangle.Empty;
+            m_CaptionBounds = Rectangle.Empty;
+            m_SystemCaptionItemBounds = Rectangle.Empty;
+
+            Rendering.BaseRenderer renderer = GetRenderer();
+            RibbonControl ribbon = this.Parent as RibbonControl;
+            if (renderer != null && ribbon != null)
+            {
+                RibbonControlRendererEventArgs rargs = new RibbonControlRendererEventArgs(pa.Graphics, this.Parent as RibbonControl, pa.GlassEnabled);
+                rargs.ItemPaintArgs = pa;
+                renderer.DrawRibbonControlBackground(rargs);
+
+                if (ribbon.BackgroundImage != null && !this.IsBackstageOpen)
+                {
+                    Rectangle br = GetBackgroundImageRect(ribbonForm);
+                    BarFunctions.PaintBackgroundImage(pa.Graphics, br, ribbon.BackgroundImage,
+                        ribbon.BackgroundImagePosition, 255);
+                }
+
+                if (m_CaptionVisible)
+                    renderer.DrawQuickAccessToolbarBackground(new RibbonControlRendererEventArgs(pa.Graphics, this.Parent as RibbonControl, pa.GlassEnabled));
+            }
+
+            if (m_TabGroupsVisible)
+            {
+                PaintTabGroups(pa);
+            }
+
+            // Paint form caption text
+            if (renderer != null && m_CaptionVisible)
+            {
+                RibbonControlRendererEventArgs rer = new RibbonControlRendererEventArgs(pa.Graphics, this.Parent as RibbonControl, pa.GlassEnabled);
+                rer.ItemPaintArgs = pa;
+                renderer.DrawRibbonFormCaptionText(rer);
+            }
+
+#if TRIAL
+            if (NativeFunctions.ColorExpAlt())
+				{
+					pa.Graphics.Clear(Color.White);
+					TextDrawing.DrawString(pa.Graphics, "Trial Version Expired :-(", this.Font, Color.FromArgb(128, Color.Black), this.ClientRectangle, eTextFormat.HorizontalCenter | eTextFormat.VerticalCenter);
+				}
+                //else
+                //{
+                //    TextDrawing.DrawString(pa.Graphics, "Trial Version", this.Font, Color.FromArgb(128, Color.Black), new Rectangle(0, 0, this.Width - 12, this.Height-4), eTextFormat.Right | eTextFormat.Bottom);
+                //}
+#endif
+        }
+
+        private Rectangle GetBackgroundImageRect(RibbonForm ribbonForm)
+        {
+            Rectangle br = this.ClientRectangle;
+            if (ribbonForm != null)
+                br.Inflate(ribbonForm.BorderSize - 1, 0);
+            return br;
+        }
+
+        private bool _TabGroupPaintSuspended = false;
+        /// <summary>
+        /// Gets or set whether TabGroup painting is suspended.
+        /// </summary>
+        internal bool TabGroupPaintSuspended
+        {
+            get { return _TabGroupPaintSuspended; }
+            set
+            {
+                if (_TabGroupPaintSuspended != value)
+                {
+                    _TabGroupPaintSuspended = value;
+                    this.Invalidate();
+                    Form form = this.FindForm();
+                    if (form != null) form.Invalidate();
+                }
+            }
+        }
+
+        internal void PaintTabGroups(ItemPaintArgs pa)
+        {
+            if (m_Groups.Count == 0 || _TabGroupPaintSuspended)
+                return;
+            RibbonTabItemGroup currentGroup = null;
+            Rectangle groupRect = Rectangle.Empty;
+            Rectangle groupBounds = Rectangle.Empty;
+            int y = 0;
+            eDotNetBarStyle effectiveStyle = this.EffectiveStyle;
+
+            if (m_CaptionVisible)
+            {
+                if (effectiveStyle == eDotNetBarStyle.Office2010 || StyleManager.IsMetro(effectiveStyle))
+                    y += 1;
+                else
+                    y += (pa.GlassEnabled && effectiveStyle == eDotNetBarStyle.Windows7) ? 4 : 3;
+            }
+
+            foreach (RibbonTabItemGroup group in this.TabGroups)
+                group.DisplayPositions.Clear();
+
+            foreach (BaseItem item in this.Items)
+            {
+#if TRIAL
+                if (NativeFunctions.ColorExpAlt())
+					return;
+#endif
+                if (item is RibbonTabItem)
+                {
+                    RibbonTabItem tab = item as RibbonTabItem;
+                    if (tab.Group != currentGroup)
+                    {
+                        if (tab.Visible)
+                        {
+                            if (currentGroup != null)
+                                PaintGroup(pa, currentGroup, groupRect, groupBounds);
+                            currentGroup = tab.Group;
+                            if (currentGroup != null)
+                            {
+                                currentGroup.DisplayPositions.Clear();
+                                groupRect = new Rectangle(tab.DisplayRectangle.X, y, tab.DisplayRectangle.Width, ((effectiveStyle == eDotNetBarStyle.Office2010 || StyleManager.IsMetro(effectiveStyle)) ? tab.DisplayRectangle.Y : tab.DisplayRectangle.Y - 4));
+                                groupBounds = new Rectangle(tab.DisplayRectangle.X, y, tab.DisplayRectangle.Width, tab.DisplayRectangle.Bottom - (StyleManager.IsMetro(effectiveStyle) ? 1 : m_TabGroupHeight));
+                            }
+                        }
+                    }
+                    else if (currentGroup != null)
+                    {
+                        if (tab.Visible)
+                        {
+                            groupRect.Width += (tab.DisplayRectangle.Right - groupRect.Right);
+                            groupBounds.Width += (tab.DisplayRectangle.Right - groupBounds.Right);
+                        }
+                    }
+                    else
+                    {
+                        groupRect = Rectangle.Empty;
+                        groupBounds = Rectangle.Empty;
+                    }
+                }
+                else if (currentGroup != null)
+                {
+                    PaintGroup(pa, currentGroup, groupRect, groupBounds);
+                }
+            }
+
+            if (currentGroup != null)
+                PaintGroup(pa, currentGroup, groupRect, groupBounds);
+        }
+
+        private void PaintGroup(ItemPaintArgs pa, RibbonTabItemGroup group, Rectangle rect, Rectangle groupBounds)
+        {
+            if (m_CaptionVisible && !m_QuickToolbarBounds.IsEmpty && rect.IntersectsWith(m_QuickToolbarBounds) || m_SystemCaptionItemBounds.IntersectsWith(groupBounds))
+                return;
+            eDotNetBarStyle effectiveStyle = this.EffectiveStyle;
+
+            if (effectiveStyle == eDotNetBarStyle.Office2010 || StyleManager.IsMetro(effectiveStyle))
+                group.DisplayPositions.Add(new Rectangle(rect.X, rect.Y, rect.Width + 1, rect.Height));
+            else
+                group.DisplayPositions.Add(rect);
+
+
+            if (BarFunctions.IsOffice2007Style(effectiveStyle))
+            {
+                RibbonTabGroupRendererEventArgs e = new RibbonTabGroupRendererEventArgs(pa.Graphics, group, rect, groupBounds, this.GetDefaultGroupFont(), pa, effectiveStyle);
+                Rendering.BaseRenderer renderer = GetRenderer();
+                renderer.DrawRibbonTabGroup(e);
+            }
+            else
+            {
+                ElementStyleDisplayInfo info = new ElementStyleDisplayInfo(group.Style, pa.Graphics, rect);
+                ElementStyleDisplay.Paint(info);
+                ElementStyleDisplay.PaintText(info, group.GroupTitle, this.GetDefaultGroupFont());
+            }
+        }
+
+        private Font GetDefaultGroupFont()
+        {
+            if (m_DefaultGroupFont == null)
+            {
+                try
+                {
+                    if (m_DefaultGroupFontAuto == null)
+                        m_DefaultGroupFontAuto = new Font(this.Font.Name, this.Font.SizeInPoints - 1);
+                }
+                catch
+                {
+                    return this.Font;
+                }
+                return m_DefaultGroupFontAuto;
+            }
+            return m_DefaultGroupFont;
+        }
+
+        /// <summary>
+        /// Gets or sets default font for tab groups. This font will be used if font is not specified by group style element.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Category("Tab Groups"), DefaultValue(null)]
+        public Font DefaultGroupFont
+        {
+            get { return m_DefaultGroupFont; }
+            set
+            {
+                m_DefaultGroupFont = value;
+                if (this.DesignMode)
+                    this.Refresh();
+            }
+        }
+        /// <summary>
+        /// Resets DefaultGroupFont property to default value null.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetDefaultGroupFont()
+        {
+            TypeDescriptor.GetProperties(this)["DefaultGroupFont"].SetValue(this, null);
+        }
+
+        protected override void OnFontChanged(EventArgs e)
+        {
+            base.OnFontChanged(e);
+            m_DefaultGroupFont = null;
+        }
+
+        protected override ElementStyle GetBackgroundStyle()
+        {
+            if (this.BackgroundStyle.Custom)
+                return base.GetBackgroundStyle();
+            return m_DefaultBackgroundStyle;
+        }
+
+        internal void InitDefaultStyles()
+        {
+            m_DefaultBackgroundStyle.SetColorScheme(this.GetColorScheme());
+            // Initialize Default Styles
+            if (this.Parent is RibbonControl)
+                RibbonPredefinedColorSchemes.ApplyRibbonElementStyle(m_DefaultBackgroundStyle, (RibbonControl)this.Parent);
+        }
+
+        internal ElementStyle InternalGetBackgroundStyle()
+        {
+            return this.GetBackgroundStyle();
+        }
+
+        internal Rectangle GetItemContainerBounds()
+        {
+            Rectangle r = base.GetItemContainerRectangle();
+            if (m_TabGroupsVisible)
+            {
+                r.Y += m_TabGroupHeight + 1;
+            }
+            if (m_CaptionVisible)
+            {
+                r.Y += GetAbsoluteCaptionHeight();
+            }
+            if (m_CaptionVisible && m_RibbonStripIndent > 0)
+            {
+                eDotNetBarStyle effectiveStyle = this.EffectiveStyle;
+                if (effectiveStyle != eDotNetBarStyle.Office2010 && effectiveStyle != eDotNetBarStyle.Windows7 && !StyleManager.IsMetro(effectiveStyle))
+                {
+                    if (this.RightToLeft == RightToLeft.No)
+                        r.X += m_RibbonStripIndent;
+                    r.Width -= m_RibbonStripIndent;
+                }
+            }
+            return r;
+        }
+
+        internal Rectangle GetCaptionContainerBounds()
+        {
+            Rectangle baseRect = base.GetItemContainerRectangle();
+            if (this.IsGlassEnabled)
+                baseRect.Y += 3;
+            return new Rectangle(baseRect.X, baseRect.Y, baseRect.Width, GetAbsoluteCaptionHeight());
+        }
+
+        private int GetCaptionHeight()
+        {
+            if (m_CaptionHeight == 0)
+            {
+                //int captionHeight = (SystemInformation.CaptionHeight + SystemInformation.FrameBorderSize.Height * NativeFunctions.BorderMultiplierFactor) - 
+                //(System.Environment.OSVersion.Version.Major < 6?14:12);
+                int captionHeight = 16; // System.Environment.OSVersion.Version.Major < 6 ? 13 : 16;
+                if (StyleManager.Style == eStyle.OfficeMobile2014)
+                    captionHeight = 20;
+                if (this.IsGlassEnabled && EffectiveStyle != eDotNetBarStyle.Office2010 && EffectiveStyle != eDotNetBarStyle.Windows7 && !StyleManager.IsMetro(EffectiveStyle))
+                    captionHeight += 0;
+                else if (!this.IsGlassEnabled && EffectiveStyle == eDotNetBarStyle.Office2010)
+                    captionHeight -= 2;
+                else if (!this.IsGlassEnabled && EffectiveStyle == eDotNetBarStyle.Windows7)
+                    captionHeight -= 2;
+                else if (!this.IsGlassEnabled && StyleManager.IsMetro(EffectiveStyle))
+                    captionHeight -= 2;
+
+                return captionHeight;
+            }
+            else
+            {
+                return m_CaptionHeight;
+            }
+        }
+
+        internal int GetAbsoluteCaptionHeight()
+        {
+            return Dpi.Height((GetCaptionHeight() + (!m_TabGroupsVisible ? m_TabGroupHeight : 0))) + Dpi.CaptionVerticalPadding;
+        }
+
+        internal int GetTotalCaptionHeight()
+        {
+            return Dpi.Height((GetCaptionHeight() + m_TabGroupHeight + ((this.EffectiveStyle == eDotNetBarStyle.Office2010 || this.EffectiveStyle == eDotNetBarStyle.Windows7 || StyleManager.IsMetro(this.EffectiveStyle)) ? 0 : 0)));
+        }
+
+        internal int GetGlassCaptionHeight()
+        {
+            if (this.EffectiveStyle == eDotNetBarStyle.Office2010 || StyleManager.IsMetro(this.EffectiveStyle))
+                return this.Height;
+            else
+                return GetTotalCaptionHeight();
+        }
+
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            InitDefaultStyles();
+            base.OnPaint(e);
+        }
+
+        protected override void RecalcSize()
+        {
+            InitDefaultStyles();
+            base.RecalcSize();
+        }
+
+        /// <summary>
+        /// Gets or sets whether control is collapsed when RibbonTabItem is double clicked and expanded when RibbonTabItem is clicked.
+        /// </summary>
+        internal bool AutoExpand
+        {
+            get { return m_AutoExpand; }
+            set { m_AutoExpand = value; }
+        }
+
+        private bool m_AutoKeyboardExpand = true;
+        /// <summary>
+        /// Gets or sets whether control is collapsed when RibbonTabItem is double clicked and expanded when RibbonTabItem is clicked.
+        /// </summary>
+        internal bool AutoKeyboardExpand
+        {
+            get { return m_AutoKeyboardExpand; }
+            set { m_AutoKeyboardExpand = value; }
+        }
+
+        /// <summary>
+        /// Returns automatically calculated height of the control given current content.
+        /// </summary>
+        /// <returns>Height in pixels.</returns>
+        public override int GetAutoSizeHeight()
+        {
+            int i = base.GetAutoSizeHeight();
+            //if (m_TabGroupsVisible)
+            //    i += m_TabGroupHeight + 1;
+            //if (m_CaptionVisible)
+            //    i += m_CaptionHeight;
+            if (BarFunctions.IsOffice2007Style(this.EffectiveStyle))
+            {
+                Rendering.BaseRenderer renderer = GetRenderer();
+                if (renderer is Rendering.Office2007Renderer)
+                    i += ((Rendering.Office2007Renderer)renderer).ColorTable.RibbonControl.CornerSize;
+            }
+
+            return i;
+        }
+
+        protected override bool OnMouseWheel(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+            Rectangle r = this.DisplayRectangle;
+            r.Location = this.PointToScreen(r.Location);
+
+            RibbonControl rc = this.Parent as RibbonControl;
+
+            if (this.Parent is RibbonControl)
+            {
+                r = this.Parent.DisplayRectangle;
+                r.Location = this.Parent.PointToScreen(r.Location);
+                if (rc.SelectedRibbonTabItem != null && rc.SelectedRibbonTabItem.Panel is IKeyTipsControl && ((IKeyTipsControl)rc.SelectedRibbonTabItem.Panel).ShowKeyTips)
+                    return false;
+            }
+
+            if (rc != null && !rc.MouseWheelTabScrollEnabled) return false;
+
+            Point mousePos = Control.MousePosition;
+            bool expanded = true;
+            if (rc != null) expanded = rc.Expanded;
+
+            bool parentActive = true;
+            Form parentForm = this.FindForm();
+            if (parentForm != null && !BarFunctions.IsFormActive(parentForm))
+                parentActive = false;
+
+            if (parentActive && r.Contains(mousePos) && !this.ShowKeyTips && expanded && this.Items.Count > 0)
+            {
+                IntPtr handle = NativeFunctions.WindowFromPoint(new NativeFunctions.POINT(mousePos));
+                Control c = Control.FromChildHandle(handle);
+                if (c == null)
+                    c = Control.FromHandle(handle);
+                if (c is RibbonBar || c is RibbonStrip || c is RibbonControl || c is RibbonPanel)
+                {
+                    RibbonTabItem selectedTab = this.SelectedRibbonTabItem;
+                    int start = 0;
+                    int end = this.Items.Count - 1;
+
+                    int direction = 1;
+                    if ((wParam.ToInt64() & 0x80000000) > 0)
+                    {
+                        direction = -1;
+                        end = 0;
+                    }
+                    if (selectedTab != null)
+                    {
+                        start = this.Items.IndexOf(selectedTab) + direction;
+                        if (direction < 0 && start < 0) return false;
+
+                        if (start == this.Items.Count)
+                            start = 0;
+                        else if (start < 0)
+                            start = this.Items.Count - 1;
+                    }
+
+                    int index = start - direction;
+                    do
+                    {
+                        index += direction;
+                        if (index < 0 || index > this.Items.Count - 1) break;
+
+                        if (this.Items[index] is RibbonTabItem && this.Items[index].Visible && this.Items[index].Enabled)
+                        {
+                            ((RibbonTabItem)this.Items[index]).Checked = true;
+                            return true;
+                        }
+                    } while (index != end);
+                }
+            }
+
+            return false;
+        }
+
+        private ArrayList GetAllRibbonBars()
+        {
+            ArrayList list = new ArrayList();
+            if (!(this.Parent is RibbonControl))
+                return list;
+
+            foreach (Control c in this.Parent.Controls)
+            {
+                GetAllRibbonBars(c, list);
+            }
+
+            RibbonControl rc = this.Parent as RibbonControl;
+            if (!rc.Expanded && this.SelectedRibbonTabItem != null && this.SelectedRibbonTabItem.Panel != null && this.SelectedRibbonTabItem.Panel.Parent != rc)
+            {
+                GetAllRibbonBars(this.SelectedRibbonTabItem.Panel, list);
+            }
+
+            return list;
+        }
+
+        private void GetAllRibbonBars(Control c, ArrayList list)
+        {
+            if (c is RibbonBar)
+                list.Add(c);
+
+            foreach (Control child in c.Controls)
+                GetAllRibbonBars(child, list);
+        }
+
+        /// <summary>
+        /// Returns the collection of items with the specified name.
+        /// </summary>
+        /// <param name="ItemName">Item name to look for.</param>
+        /// <returns></returns>
+        public override ArrayList GetItems(string ItemName)
+        {
+            ArrayList list = new ArrayList(15);
+            BarFunctions.GetSubItemsByName(GetBaseItemContainer(), ItemName, list);
+
+            RibbonControl rc = this.GetRibbonControl();
+            if (rc != null && rc.QatPositionedBelowRibbon)
+            {
+                BarFunctions.GetSubItemsByName(rc.QatToolbar.GetBaseItemContainer(), ItemName, list);
+            }
+
+            ArrayList ribbonBars = GetAllRibbonBars();
+            foreach (RibbonBar b in ribbonBars)
+                BarFunctions.GetSubItemsByName(b.GetBaseItemContainer(), ItemName, list);
+
+            if (rc != null && rc.GlobalContextMenuBar != null)
+                BarFunctions.GetSubItemsByName(rc.GlobalContextMenuBar.ItemsContainer, ItemName, list);
+
+            return list;
+        }
+
+        /// <summary>
+        /// Returns the collection of items with the specified name and type.
+        /// </summary>
+        /// <param name="ItemName">Item name to look for.</param>
+        /// <param name="itemType">Item type to look for.</param>
+        /// <returns></returns>
+        public override ArrayList GetItems(string ItemName, Type itemType)
+        {
+            ArrayList list = new ArrayList(15);
+            BarFunctions.GetSubItemsByNameAndType(GetBaseItemContainer(), ItemName, list, itemType);
+
+            RibbonControl rc = this.GetRibbonControl();
+            if (rc != null && rc.QatPositionedBelowRibbon)
+            {
+                BarFunctions.GetSubItemsByNameAndType(rc.QatToolbar.GetBaseItemContainer(), ItemName, list, itemType);
+            }
+
+            ArrayList ribbonBars = GetAllRibbonBars();
+            foreach (RibbonBar b in ribbonBars)
+                BarFunctions.GetSubItemsByNameAndType(b.GetBaseItemContainer(), ItemName, list, itemType);
+
+            if (rc != null && rc.GlobalContextMenuBar != null)
+                BarFunctions.GetSubItemsByNameAndType(rc.GlobalContextMenuBar.ItemsContainer, ItemName, list, itemType);
+
+            return list;
+        }
+
+        /// <summary>
+        /// Returns the collection of items with the specified name and type.
+        /// </summary>
+        /// <param name="ItemName">Item name to look for.</param>
+        /// <param name="itemType">Item type to look for.</param>
+        /// <param name="useGlobalName">Indicates whether GlobalName property is used for searching.</param>
+        /// <returns></returns>
+        public override ArrayList GetItems(string ItemName, Type itemType, bool useGlobalName)
+        {
+            ArrayList list = new ArrayList(15);
+            BarFunctions.GetSubItemsByNameAndType(GetBaseItemContainer(), ItemName, list, itemType, useGlobalName);
+
+            RibbonControl rc = this.GetRibbonControl();
+            if (rc != null && rc.QatPositionedBelowRibbon)
+            {
+                BarFunctions.GetSubItemsByNameAndType(rc.QatToolbar.GetBaseItemContainer(), ItemName, list, itemType, useGlobalName);
+            }
+
+            ArrayList ribbonBars = GetAllRibbonBars();
+            foreach (RibbonBar b in ribbonBars)
+                BarFunctions.GetSubItemsByNameAndType(b.GetBaseItemContainer(), ItemName, list, itemType, useGlobalName);
+
+            if (rc != null && rc.GlobalContextMenuBar != null)
+                BarFunctions.GetSubItemsByNameAndType(rc.GlobalContextMenuBar.ItemsContainer, ItemName, list, itemType, useGlobalName);
+
+            return list;
+        }
+
+        /// <summary>
+        /// Returns the first item that matches specified name.
+        /// </summary>
+        /// <param name="ItemName">Item name to look for.</param>
+        /// <returns></returns>
+        public override BaseItem GetItem(string ItemName)
+        {
+            BaseItem item = BarFunctions.GetSubItemByName(GetBaseItemContainer(), ItemName);
+            if (item != null)
+                return item;
+
+            RibbonControl rc = this.GetRibbonControl();
+            if (rc != null && rc.QatPositionedBelowRibbon)
+            {
+                item = BarFunctions.GetSubItemByName(rc.QatToolbar.GetBaseItemContainer(), ItemName);
+                if (item != null)
+                    return item;
+            }
+
+            ArrayList ribbonBars = GetAllRibbonBars();
+            foreach (RibbonBar b in ribbonBars)
+            {
+                if (b.OverflowState && b.OverflowRibbonBar != null)
+                    item = BarFunctions.GetSubItemByName(b.OverflowRibbonBar.GetBaseItemContainer(), ItemName);
+                else
+                    item = BarFunctions.GetSubItemByName(b.GetBaseItemContainer(), ItemName);
+                if (item != null)
+                    return item;
+            }
+
+            if (rc != null && rc.GlobalContextMenuBar != null)
+                return BarFunctions.GetSubItemByName(rc.GlobalContextMenuBar.ItemsContainer, ItemName);
+
+            return null;
+        }
+        #endregion
+
+        #region KeyTips Support
+        private bool m_AltFocus = false;
+        private IKeyTipsControl m_AltFocusedControl = null;
+
+        /// <summary>
+        /// Called when ShowKeyTips on RibbonBar contained by this Ribbon is set to true
+        /// </summary>
+        internal void OnRibbonBarShowKeyTips(RibbonBar bar)
+        {
+            if (!m_AltFocus)
+            {
+                m_AltFocus = true;
+            }
+
+            if (m_AltFocusedControl != bar.Parent && bar.Parent is RibbonPanel)
+            {
+                if (m_AltFocusedControl != null)
+                    m_AltFocusedControl.ShowKeyTips = false;
+                m_AltFocusedControl = bar.Parent as IKeyTipsControl;
+                if (m_AltFocusedControl != null)
+                    m_AltFocusedControl.ShowKeyTips = true;
+            }
+        }
+
+        protected override void OnShowKeyTipsChanged()
+        {
+            //if (this.SelectedRibbonTabItem != null && this.SelectedRibbonTabItem.Panel != null)
+            //{
+            //    Control panel = this.SelectedRibbonTabItem.Panel;
+            //    foreach (Control c in panel.Controls)
+            //    {
+            //        if (c is RibbonBar && c.Visible)
+            //        {
+            //            ((RibbonBar)c).ShowKeyTips = this.ShowKeyTips;
+            //        }
+            //    }
+            //}
+            RibbonControl rc = this.GetRibbonControl();
+            if (rc != null && rc.QatPositionedBelowRibbon)
+                rc.QatToolbar.ShowKeyTips = this.ShowKeyTips;
+            base.OnShowKeyTipsChanged();
+
+            if (this.ShowKeyTips && !m_AltFocus)
+                GiveKeyTipsAltFocus();
+        }
+
+        internal void BackstageTabClosed(SuperTabControl tabControl)
+        {
+            if (m_AltFocusedControl == tabControl || m_AltFocusedControl == tabControl.TabStrip)
+                m_AltFocusedControl = null;
+        }
+
+        protected override bool OnKeyDown(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+
+            int wParamInt = WinApi.ToInt(wParam);
+            if (wParamInt == 27)
+            {
+                RibbonControl rc = this.GetRibbonControl();
+                if (rc != null)
+                    rc.OnEscapeKeyDown();
+            }
+
+            if (m_AltFocus)
+            {
+                if (HasRegisteredPopups)
+                {
+                    bool ret = base.OnKeyDown(hWnd, wParam, lParam);
+                    if (!HasRegisteredPopups) ReleaseAltFocus();
+                }
+                Keys key = (Keys)NativeFunctions.MapVirtualKey((uint)wParam, 2);
+                if (key == Keys.None)
+                    key = (Keys)wParamInt;
+
+                if (key == Keys.Escape)
+                {
+                    bool reShowKeyTips = false;
+                    if (!this.ShowKeyTips && m_AltFocusedControl != null)
+                    {
+                        if (m_AltFocusedControl is RibbonPanel)
+                            reShowKeyTips = true;
+                    }
+
+                    ReleaseAltFocus();
+
+                    if (reShowKeyTips)
+                    {
+                        GiveKeyTipsAltFocus();
+                    }
+
+                    return base.OnKeyDown(hWnd, wParam, lParam);
+                }
+
+                char accessKey = CharFromInt((int)key);
+                if (accessKey == char.MinValue)
+                {
+                    ReleaseAltFocus();
+                    return true;
+                }
+                else if (key == Keys.Space || key == Keys.Down || key == Keys.Right || key == Keys.Tab)
+                {
+                    ReleaseAltFocus();
+                    return false;
+                }
+
+                //if (m_AltFocusedControl != null && m_AltFocusedControl.ProcessMnemonicEx(accessKey))
+                //{
+                //    ReleaseAltFocus();
+                //    return true;
+                //}
+                //else 
+                if (this.ProcessMnemonic(accessKey))
+                    return true;
+
+                return true;
+            }
+            else if (wParamInt == 112 && Control.ModifierKeys == Keys.Control)
+            {
+                Form frm = this.FindForm();
+                if (BarFunctions.IsFormActive(frm))
+                {
+                    // Collapse ribbon
+                    RibbonControl rc = this.GetRibbonControl();
+                    if (rc.AutoKeyboardExpand)
+                        rc.Expanded = !rc.Expanded;
+                }
+            }
+
+            return base.OnKeyDown(hWnd, wParam, lParam);
+        }
+
+        private char CharFromInt(int key)
+        {
+            char[] ch = new char[1];
+            byte[] by = new byte[1];
+            try
+            {
+                by[0] = System.Convert.ToByte(key);
+                System.Text.Encoding.Default.GetDecoder().GetChars(by, 0, 1, ch, 0);
+            }
+            catch (Exception)
+            {
+                return char.MinValue;
+            }
+
+            return ch[0];
+        }
+
+        private bool _IgnoreF10Key = false;
+        /// <summary>
+        /// Gets or sets whether F10 key is ignored as way to set KeyTips focus to Ribbon.
+        /// </summary>
+        [DefaultValue(false), Browsable(false)]
+        public bool IgnoreF10Key
+        {
+            get { return _IgnoreF10Key; }
+            set
+            {
+                _IgnoreF10Key = value;
+            }
+        }
+
+        protected override bool OnSysKeyUp(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+            int wParamInt = WinApi.ToInt(wParam);
+            if (wParamInt == 18 || wParamInt == 121 && !_IgnoreF10Key)
+            {
+                bool callBase = true;
+                if (m_AltFocus)
+                {
+                    if (wParamInt == 18 || wParamInt == 121 && !_IgnoreF10Key)
+                        callBase = false;
+                    ReleaseAltFocus();
+                }
+                else
+                {
+                    Form f = this.FindForm();
+                    if (f == Form.ActiveForm)
+                    {
+                        callBase = false;
+                        ActivateKeyTips();
+                    }
+                }
+                if (!callBase)
+                    return true;
+            }
+            return base.OnSysKeyUp(hWnd, wParam, lParam);
+        }
+        internal bool IsBackstageOpen
+        {
+            get
+            {
+                ApplicationButton appButton = GetApplicationButton() as ApplicationButton;
+                if (appButton != null && appButton.BackstageTab != null && appButton.Expanded && appButton.BackstageTabEnabled)
+                    return true;
+                return false;
+            }
+        }
+        private void ActivateKeyTips()
+        {
+            ApplicationButton appButton = GetApplicationButton() as ApplicationButton;
+
+            if (appButton != null && appButton.BackstageTab != null && appButton.Expanded)
+            {
+                if (m_AltFocusedControl != null)
+                    m_AltFocusedControl.ShowKeyTips = false;
+                m_AltFocusedControl = appButton.BackstageTab.TabStrip;
+                if (!m_AltFocusedControl.ShowKeyTips)
+                    m_AltFocusedControl.ShowKeyTips = true;
+            }
+            else
+                GiveKeyTipsAltFocus();
+        }
+
+        private void GiveKeyTipsAltFocus()
+        {
+            if (!m_KeyTipsEnabled) return;
+
+            m_AltFocus = true;
+            this.ShowKeyTips = true;
+            SetupActiveWindowTimer();
+        }
+
+        private void ReleaseAltFocus()
+        {
+            if (m_AltFocus)
+            {
+                ReleaseActiveWindowTimer();
+                if (!this.ShowKeyTips && m_AltFocusedControl != null)
+                {
+                    m_AltFocusedControl.ShowKeyTips = false;
+                    m_AltFocusedControl = null;
+                }
+                this.ShowKeyTips = false;
+            }
+
+            m_AltFocus = false;
+        }
+
+        /// <summary>
+        /// Gets whether Ribbon is in key-tips mode including its child controls.
+        /// </summary>
+        [Browsable(false)]
+        public bool IsInKeyTipsMode
+        {
+            get
+            {
+                return m_AltFocus | this.ShowKeyTips;
+            }
+        }
+
+        /// <summary>
+        /// Forces the control to exit Ribbon Key-Tips mode.
+        /// </summary>
+        public void ExitKeyTipsMode()
+        {
+            ReleaseAltFocus();
+        }
+
+        internal void OnChildItemClick(BaseItem item)
+        {
+            if (this.ShowKeyTips || m_AltFocusedControl != null && m_AltFocusedControl.ShowKeyTips)
+            {
+                this.ShowKeyTips = false;
+                ReleaseAltFocus();
+            }
+        }
+
+        protected override bool OnSysMouseDown(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+            if (this.ShowKeyTips || m_AltFocusedControl != null && m_AltFocusedControl.ShowKeyTips)
+            {
+                this.ShowKeyTips = false;
+                ReleaseAltFocus();
+            }
+
+            RibbonControl rc = this.GetRibbonControl();
+            if (rc != null) rc.OnSysMouseDown(hWnd, wParam, lParam);
+
+            return base.OnSysMouseDown(hWnd, wParam, lParam);
+        }
+
+        protected override bool ProcessMnemonic(char charCode)
+        {
+            if (m_AltFocusedControl != null)
+            {
+                if (m_AltFocusedControl.ProcessMnemonicEx(charCode))
+                {
+                    ReleaseAltFocus();
+                    return true;
+                }
+                return false;
+            }
+            if (!m_AltFocus && (Control.ModifierKeys & Keys.Alt) != Keys.Alt)
+                return false;
+            return base.ProcessMnemonic(charCode);
+        }
+
+        public override bool ProcessMnemonicEx(char charCode)
+        {
+            // If different ribbon tab item is selected we should not exit the Alt mode...
+            BaseItem item = null;
+
+            if (m_CaptionVisible)
+            {
+                item = GetItemForMnemonic(m_StripContainer.CaptionContainer, charCode, false, true);
+                if (item != null)
+                {
+                    if (ProcessItemMnemonicKey(item))
+                    {
+                        ReleaseAltFocus();
+                        return true;
+                    }
+                }
+            }
+
+            RibbonControl rc = this.GetRibbonControl();
+            if (rc != null && rc.QatPositionedBelowRibbon)
+            {
+                if (rc.QatToolbar.ProcessMnemonicEx(charCode))
+                {
+                    ReleaseAltFocus();
+                    return true;
+                }
+            }
+
+            if (item == null)
+            {
+                item = GetItemForMnemonic(this.GetBaseItemContainer(), charCode, true, true);
+            }
+
+            if (item is RibbonTabItem && item.Visible)
+            {
+                if (!m_AltFocus)
+                {
+                    GiveKeyTipsAltFocus();
+                }
+                this.ShowKeyTips = false;
+                if (item != this.SelectedRibbonTabItem)
+                {
+                    // Switch the tab
+                    item.RaiseClick();
+                    //this.ShowKeyTips = true;
+                }
+                else if (this.SelectedRibbonTabItem != null && rc != null && !rc.Expanded && !rc.IsPopupMode)
+                    rc.RibbonTabItemClick(this.SelectedRibbonTabItem);
+                if (this.SelectedRibbonTabItem != null && m_KeyTipsEnabled)
+                {
+                    if (m_AltFocusedControl != null)
+                        m_AltFocusedControl.ShowKeyTips = false;
+                    m_AltFocusedControl = this.SelectedRibbonTabItem.Panel;
+                    if (m_AltFocusedControl != null)
+                        m_AltFocusedControl.ShowKeyTips = true;
+                }
+
+                // Keep the Alt focus
+                return true;
+            }
+            else if (item != null && ProcessItemMnemonicKey(item))
+            {
+                this.ShowKeyTips = false;
+                if (item is ApplicationButton)
+                {
+                    ApplicationButton appButton = (ApplicationButton)item;
+                    if (appButton.BackstageTab != null)
+                    {
+                        if (m_AltFocusedControl != null)
+                            m_AltFocusedControl.ShowKeyTips = false;
+                        m_AltFocusedControl = appButton.BackstageTab.TabStrip;
+                        if (!m_AltFocusedControl.ShowKeyTips)
+                            m_AltFocusedControl.ShowKeyTips = true;
+                    }
+
+                }
+                return true;
+            }
+
+            //if (base.ProcessMnemonicEx(charCode))
+            //{
+            //    ReleaseAltFocus();
+            //    return true;
+            //}
+
+            if (m_AltFocus && this.SelectedRibbonTabItem != null && this.SelectedRibbonTabItem.Panel != null)
+            {
+                Control panel = this.SelectedRibbonTabItem.Panel;
+                foreach (Control c in panel.Controls)
+                {
+                    if (c is RibbonBar && c.Visible)
+                    {
+                        if (IsMnemonic(charCode, c.Text))
+                        {
+                            // Select RibbonBar for Alt+ Key access
+                            this.ShowKeyTips = false;
+                            ((RibbonBar)c).ShowKeyTips = true;
+                            if (m_AltFocusedControl != null)
+                                m_AltFocusedControl.ShowKeyTips = false;
+                            m_AltFocusedControl = (IKeyTipsControl)c;
+                            return true;
+                        }
+                    }
+                }
+            }
+
+            return false;
+        }
+
+        protected override void OnActiveWindowChanged()
+        {
+            ReleaseAltFocus();
+            base.OnActiveWindowChanged();
+        }
+
+        protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
+        {
+            return base.ProcessCmdKey(ref msg, keyData);
+        }
+
+        protected override bool ProcessDialogKey(Keys keyData)
+        {
+            return base.ProcessDialogKey(keyData);
+        }
+        #endregion
+
+        #region Caption Container Support
+        /// <summary>
+        /// Called when item on popup container is right-clicked.
+        /// </summary>
+        /// <param name="item">Instance of the item that is right-clicked.</param>
+        protected override void OnPopupItemRightClick(BaseItem item)
+        {
+            RibbonControl rc = this.GetRibbonControl();
+            if (rc != null)
+                rc.ShowCustomizeContextMenu(item, false);
+        }
+        //private RibbonControl GetRibbonControl()
+        //{
+        //    Control parent = this.Parent;
+        //    while (parent != null && !(parent is RibbonControl))
+        //        parent = parent.Parent;
+        //    if (parent is RibbonControl)
+        //        return parent as RibbonControl;
+        //    return null;
+        //}
+        protected override void OnMouseLeave(EventArgs e)
+        {
+            if (m_TitleTextMarkup != null)
+                m_TitleTextMarkup.MouseLeave(this);
+            base.OnMouseLeave(e);
+        }
+
+        internal bool MouseDownOnCaption
+        {
+            get
+            {
+                return m_MouseDownOnCaption;
+            }
+        }
+
+        private bool m_MouseDownOnCaption = false;
+        protected override void OnMouseDown(MouseEventArgs e)
+        {
+            m_MouseDownOnCaption = false;
+            if (m_CaptionVisible)
+            {
+                m_MouseDownOnCaption = HitTestCaption(new Point(e.X, e.Y));
+                if (e.Button == MouseButtons.Right && m_MouseDownOnCaption)
+                {
+                    Form form = this.FindForm();
+                    if (form != null)
+                    {
+                        const int TPM_RETURNCMD = 0x0100;
+                        Point p = Control.MousePosition;
+                        byte[] bx = BitConverter.GetBytes(p.X);
+                        byte[] by = BitConverter.GetBytes(p.Y);
+                        byte[] blp = new byte[] { bx[0], bx[1], by[0], by[1] };
+                        int lParam = BitConverter.ToInt32(blp, 0);
+                        this.Capture = false;
+                        NativeFunctions.SendMessage(form.Handle, NativeFunctions.WM_SYSCOMMAND, NativeFunctions.TrackPopupMenu(
+                            NativeFunctions.GetSystemMenu(form.Handle, false), TPM_RETURNCMD, Control.MousePosition.X, Control.MousePosition.Y, 0, form.Handle, IntPtr.Zero), lParam);
+                        BarUtilities.InvokeDelayed(new MethodInvoker(delegate { m_MouseDownOnCaption = false; }), 500);
+                        return;
+                    }
+                }
+
+                if (m_TitleTextMarkup != null)
+                    m_TitleTextMarkup.MouseDown(this, e);
+
+                e = TranslateMouseEventArgs(e);
+            }
+
+            if (e.Button == MouseButtons.Right && this.QuickToolbarBounds.Contains(e.X, e.Y))
+            {
+                RibbonControl rc = this.GetRibbonControl();
+                if (rc != null)
+                    rc.OnRibbonStripRightClick(this, e.X, e.Y);
+            }
+            else if (e.Button == MouseButtons.Left && m_CaptionVisible && m_TabGroupsVisible && !m_StripContainer.RibbonStripContainer.DisplayRectangle.Contains(e.X, e.Y))
+            {
+                foreach (RibbonTabItemGroup group in this.TabGroups)
+                {
+                    if (!group.Visible) continue;
+                    foreach (Rectangle r in group.DisplayPositions)
+                    {
+                        if (r.Contains(e.X, e.Y))
+                        {
+                            if (!group.IsTabFromGroupSelected)
+                            {
+                                group.SelectFirstTab();
+                                return;
+                            }
+                            break;
+                        }
+                    }
+                }
+            }
+
+            base.OnMouseDown(e);
+        }
+
+        private RibbonTabItemGroup HitTestTabItemGroup(Point p)
+        {
+            if (m_CaptionVisible && m_TabGroupsVisible && !m_StripContainer.RibbonStripContainer.DisplayRectangle.Contains(p.X, p.Y))
+            {
+                foreach (RibbonTabItemGroup group in this.TabGroups)
+                {
+                    if (!group.Visible) continue;
+                    foreach (Rectangle r in group.DisplayPositions)
+                    {
+                        if (r.Contains(p.X, p.Y))
+                        {
+                            return group;
+                        }
+                    }
+                }
+            }
+            return null;
+        }
+
+        protected override void OnMouseUp(MouseEventArgs e)
+        {
+            if (m_CaptionVisible)
+            {
+                if (m_TitleTextMarkup != null)
+                    m_TitleTextMarkup.MouseUp(this, e);
+
+                e = TranslateMouseEventArgs(e);
+            }
+            m_MouseDownOnCaption = false;
+            base.OnMouseUp(e);
+        }
+
+        internal BaseItem GetApplicationButton()
+        {
+            if (!this.CaptionVisible)
+                return null;
+            BaseItem cont = this.CaptionContainerItem;
+
+            if ((this.EffectiveStyle == eDotNetBarStyle.Office2010 || StyleManager.IsMetro(this.EffectiveStyle)) && this.Items.Count > 0)
+            {
+                foreach (BaseItem item in this.Items)
+                {
+                    if (item is ApplicationButton) return item;
+                }
+                //return this.Items[0];
+            }
+
+            if (cont.SubItems.Count > 0 && cont.SubItems[0] is ApplicationButton)
+                return cont.SubItems[0];
+
+            if (cont.SubItems.Count > 0 && cont.SubItems[0] is ButtonItem && ((ButtonItem)cont.SubItems[0]).HotTrackingStyle == eHotTrackingStyle.Image)
+                return cont.SubItems[0];
+
+            return null;
+        }
+
+        protected override void OnMouseMove(MouseEventArgs e)
+        {
+            if (m_CaptionVisible)
+            {
+                if (e.Button == MouseButtons.Left && m_MouseDownOnCaption && HitTestCaption(new Point(e.X, e.Y)))
+                {
+                    Form form = this.FindForm();
+                    if (form != null && (form.WindowState == FormWindowState.Normal || BarFunctions.IsWindows7))
+                    {
+                        PopupItem popup = GetApplicationButton() as PopupItem;
+                        if (popup != null && popup.Expanded) popup.Expanded = false;
+                        const int HTCAPTION = 2;
+                        Point p = Control.MousePosition;
+                        byte[] bx = BitConverter.GetBytes(p.X);
+                        byte[] by = BitConverter.GetBytes(p.Y);
+                        byte[] blp = new byte[] { bx[0], bx[1], by[0], by[1] };
+                        int lParam = BitConverter.ToInt32(blp, 0);
+                        this.Capture = false;
+                        NativeFunctions.SendMessage(form.Handle, NativeFunctions.WM_SYSCOMMAND, NativeFunctions.SC_MOVE + HTCAPTION, lParam);
+                        m_MouseDownOnCaption = false;
+                        return;
+                    }
+                }
+                if (m_TitleTextMarkup != null)
+                    m_TitleTextMarkup.MouseMove(this, e);
+                e = TranslateMouseEventArgs(e);
+            }
+            base.OnMouseMove(e);
+        }
+
+        protected override void InternalOnClick(MouseButtons mb, Point mousePos)
+        {
+            if (m_CaptionVisible)
+            {
+                MouseEventArgs e = new MouseEventArgs(mb, 0, mousePos.X, mousePos.Y, 0);
+                e = TranslateMouseEventArgs(e);
+                mousePos = new Point(e.X, e.Y);
+            }
+
+            base.InternalOnClick(mb, mousePos);
+        }
+
+        private MouseEventArgs TranslateMouseEventArgs(MouseEventArgs e)
+        {
+            if (e.Y <= 6)
+            {
+                Form form = this.FindForm();
+                if (form != null && form.WindowState == FormWindowState.Maximized && form is RibbonForm)
+                {
+                    if (e.X <= 4)
+                    {
+                        BaseItem sb = GetApplicationButton();
+                        if (sb != null)
+                        {
+                            e = new MouseEventArgs(e.Button, e.Clicks, sb.LeftInternal + 1, sb.TopInternal + 1, e.Delta);
+                        }
+                    }
+                    else if (e.X >= this.Width - 6)
+                        e = new MouseEventArgs(e.Button, e.Clicks, this.SystemCaptionItem.DisplayRectangle.Right - 4, this.SystemCaptionItem.DisplayRectangle.Top + 4, e.Delta);
+                    else
+                        e = new MouseEventArgs(e.Button, e.Clicks, e.X, this.CaptionContainerItem.TopInternal + 5, e.Delta);
+                }
+            }
+            return e;
+        }
+
+        //protected override void OnMouseUp(MouseEventArgs e)
+        //{
+        //    base.OnMouseUp(e);
+        //    if (m_CaptionVisible) m_CaptionContainer.InternalMouseUp(e);
+        //}
+
+        //protected override void OnClick(EventArgs e)
+        //{
+        //    if (m_CaptionVisible) m_CaptionContainer.InternalClick(MouseButtons, MousePosition);
+        //    base.OnClick(e);
+        //}
+
+        protected override void OnClick(EventArgs e)
+        {
+            if (m_CaptionVisible)
+            {
+                if (m_TitleTextMarkup != null)
+                    m_TitleTextMarkup.Click(this);
+            }
+            base.OnClick(e);
+        }
+
+        protected override void OnDoubleClick(EventArgs e)
+        {
+            if (m_CaptionVisible)
+            {
+                // Check whether double click is on caption so window can be maximized/restored
+                Point p = this.PointToClient(Control.MousePosition);
+                if (HitTestCaption(p))
+                {
+                    Form form = this.FindForm();
+                    if (form != null && form.MaximizeBox && (form.FormBorderStyle == FormBorderStyle.Sizable || form.FormBorderStyle == FormBorderStyle.SizableToolWindow))
+                    {
+                        if (form.WindowState == FormWindowState.Normal)
+                        {
+                            NativeFunctions.PostMessage(form.Handle, NativeFunctions.WM_SYSCOMMAND, NativeFunctions.SC_MAXIMIZE, 0);
+                        }
+                        else if (form.WindowState == FormWindowState.Maximized)
+                        {
+                            NativeFunctions.PostMessage(form.Handle, NativeFunctions.WM_SYSCOMMAND, NativeFunctions.SC_RESTORE, 0);
+                        }
+                    }
+                }
+                //m_CaptionContainer.InternalDoubleClick(MouseButtons, MousePosition);
+            }
+            base.OnDoubleClick(e);
+        }
+
+        /// <summary>
+        /// Returns true if point is inside the caption area.
+        /// </summary>
+        /// <param name="p">Client point coordinates.</param>
+        /// <returns>True if point is inside of caption area otherwise false.</returns>
+        protected bool HitTestCaption(Point p)
+        {
+            if (m_CaptionBounds.Contains(p) && m_CaptionTextBounds != null)
+            {
+                foreach (Rectangle r in m_CaptionTextBounds)
+                {
+                    if (r.Contains(p))
+                        return true;
+                }
+            }
+            if (BarFunctions.IsOffice2010Style(this.EffectiveStyle) && this.ClientRectangle.Contains(p))
+            {
+                if (HitTest(p.X, p.Y) == null && HitTestTabItemGroup(p) == null)
+                    return true;
+            }
+            return false;
+        }
+
+        //protected override void PaintControl(ItemPaintArgs pa)
+        //{
+        //    base.PaintControl(pa);
+
+        //    if (m_CaptionContainer == null || this.IsDisposed || !m_CaptionVisible)
+        //        return;
+
+        //    m_CaptionContainer.Paint(pa);
+        //}
+
+        //protected override void RecalcSize()
+        //{
+        //    base.RecalcSize();
+
+        //    if (!BarFunctions.IsHandleValid(this) || IsUpdateSuspended || !m_CaptionVisible)
+        //        return;
+
+        //    m_CaptionContainer.LeftInternal = 0;
+        //    m_CaptionContainer.TopInternal = 0;
+        //    m_CaptionContainer.WidthInternal = this.Width;
+        //    m_CaptionContainer.HeightInternal = m_CaptionHeight;
+        //    m_CaptionContainer.RecalcSize();
+        //}
+
+        private void SystemCaptionClick(object sender, EventArgs e)
+        {
+            SystemCaptionItem sci = sender as SystemCaptionItem;
+            Form frm = this.FindForm();
+
+            if (frm == null)
+                return;
+
+            if (sci.LastButtonClick == sci.MouseDownButton)
+            {
+                if (sci.LastButtonClick == SystemButton.Minimize)
+                {
+                    NativeFunctions.PostMessage(frm.Handle, NativeFunctions.WM_SYSCOMMAND, NativeFunctions.SC_MINIMIZE, 0);
+                }
+                else if (sci.LastButtonClick == SystemButton.Maximize)
+                {
+                    NativeFunctions.PostMessage(frm.Handle, NativeFunctions.WM_SYSCOMMAND, NativeFunctions.SC_MAXIMIZE, 0);
+                }
+                else if (sci.LastButtonClick == SystemButton.Restore)
+                {
+                    NativeFunctions.PostMessage(frm.Handle, NativeFunctions.WM_SYSCOMMAND, NativeFunctions.SC_RESTORE, 0);
+                }
+                else if (sci.LastButtonClick == SystemButton.Close)
+                {
+                    NativeFunctions.PostMessage(frm.Handle, NativeFunctions.WM_SYSCOMMAND, NativeFunctions.SC_CLOSE, 0);
+                }
+                else if (sci.LastButtonClick == SystemButton.Help)
+                {
+                    NativeFunctions.PostMessage(frm.Handle, NativeFunctions.WM_SYSCOMMAND, NativeFunctions.SC_CONTEXTHELP, 0);
+                }
+            }
+        }
+
+        protected override void OnResize(EventArgs e)
+        {
+            base.OnResize(e);
+            if (!m_CaptionVisible)
+                return;
+
+            Form frm = this.FindForm();
+            if (frm == null)
+                return;
+
+            if (frm.WindowState == FormWindowState.Maximized || frm.WindowState == FormWindowState.Minimized)
+                m_StripContainer.SystemCaptionItem.RestoreEnabled = true;
+            else
+                m_StripContainer.SystemCaptionItem.RestoreEnabled = false;
+        }
+
+        /// <summary>
+        /// Returns collection of items on a bar.
+        /// </summary>
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content), Browsable(false)]
+        public SubItemsCollection QuickToolbarItems
+        {
+            get { return m_StripContainer.CaptionContainer.SubItems; }
+        }
+
+        /// <summary>
+        /// Gets the reference to the internal container item for the items displayed in control caption.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public GenericItemContainer CaptionContainerItem
+        {
+            get { return m_StripContainer.CaptionContainer; }
+        }
+
+        /// <summary>
+        /// Gets the reference to the internal container for the ribbon tabs and other items.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public GenericItemContainer StripContainerItem
+        {
+            get { return m_StripContainer.RibbonStripContainer; }
+        }
+
+        //internal override bool MenuFocus
+        //{
+        //    get
+        //    {
+        //        return base.MenuFocus;
+        //    }
+        //    set
+        //    {
+        //        if (this.MenuFocus != value)
+        //        {
+        //            if (m_CaptionVisible && (m_CaptionContainer.GetHotSubItem() != null || m_CaptionContainer.ExpandedItem()!=null))
+        //            {
+        //                if (value)
+        //                {
+        //                    SetMenuFocus(value);
+        //                    m_CaptionContainer.SetSystemFocus();
+        //                    SetupActiveWindowTimer();
+        //                    this.Refresh();
+        //                }
+        //                else
+        //                {
+        //                    ReleaseActiveWindowTimer();
+        //                    m_CaptionContainer.AutoExpand = false;
+        //                    m_CaptionContainer.ReleaseSystemFocus();
+        //                    m_CaptionContainer.ContainerLostFocus();
+        //                    base.MenuFocus = value;
+        //                }
+        //            }
+        //            else
+        //                base.MenuFocus = value;
+        //        }
+        //    }
+        //}
+
+        protected override void PaintKeyTips(Graphics g)
+        {
+            if (!this.ShowKeyTips)
+                return;
+
+            KeyTipsRendererEventArgs e = new KeyTipsRendererEventArgs(g, Rectangle.Empty, "", GetKeyTipFont(), null);
+
+            Rendering.BaseRenderer renderer = GetRenderer();
+            PaintContainerKeyTips(m_StripContainer.RibbonStripContainer, renderer, e);
+            if (m_CaptionVisible)
+                PaintContainerKeyTips(m_StripContainer.CaptionContainer, renderer, e);
+        }
+
+        protected override Rectangle GetKeyTipRectangle(Graphics g, BaseItem item, Font font, string keyTip)
+        {
+            Rectangle r = base.GetKeyTipRectangle(g, item, font, keyTip);
+            if (this.QuickToolbarItems.Contains(item))
+                r.Y += 4;
+            return r;
+        }
+        #endregion
+
+        #region Mdi Child System Item
+        internal void ClearMDIChildSystemItems(bool bRecalcLayout)
+        {
+            if (m_StripContainer.RibbonStripContainer == null)
+                return;
+            bool recalc = false;
+            try
+            {
+                if (this.Items.Contains("dotnetbarsysiconitem"))
+                {
+                    this.Items.Remove("dotnetbarsysiconitem");
+                    recalc = true;
+                }
+                if (this.Items.Contains("dotnetbarsysmenuitem"))
+                {
+                    this.Items.Remove("dotnetbarsysmenuitem");
+                    recalc = true;
+                }
+                if (bRecalcLayout && recalc)
+                    this.RecalcLayout();
+            }
+            catch (Exception)
+            {
+            }
+        }
+
+        internal void ShowMDIChildSystemItems(System.Windows.Forms.Form objMdiChild, bool bRecalcLayout)
+        {
+            ClearMDIChildSystemItems(bRecalcLayout);
+
+            if (objMdiChild == null)
+                return;
+
+            MDISystemItem mdi = new MDISystemItem("dotnetbarsysmenuitem");
+            if (!objMdiChild.ControlBox)
+                mdi.CloseEnabled = false;
+            if (!objMdiChild.MinimizeBox)
+                mdi.MinimizeEnabled = false;
+            if (!objMdiChild.MaximizeBox)
+            {
+                mdi.RestoreEnabled = false;
+            }
+            mdi.ItemAlignment = eItemAlignment.Far;
+            mdi.Click += new System.EventHandler(this.MDISysItemClick);
+
+            this.Items.Add(mdi);
+
+            if (bRecalcLayout)
+                this.RecalcLayout();
+        }
+
+        private void MDISysItemClick(object sender, System.EventArgs e)
+        {
+            MDISystemItem mdi = sender as MDISystemItem;
+            Form frm = this.FindForm();
+            if (frm != null)
+                frm = frm.ActiveMdiChild;
+            if (frm == null)
+            {
+                ClearMDIChildSystemItems(true);
+                return;
+            }
+            if (mdi.LastButtonClick == SystemButton.Minimize)
+            {
+                NativeFunctions.PostMessage(frm.Handle, NativeFunctions.WM_SYSCOMMAND, NativeFunctions.SC_MINIMIZE, 0);
+            }
+            else if (mdi.LastButtonClick == SystemButton.Restore)
+            {
+                NativeFunctions.PostMessage(frm.Handle, NativeFunctions.WM_SYSCOMMAND, NativeFunctions.SC_RESTORE, 0);
+            }
+            else if (mdi.LastButtonClick == SystemButton.Close)
+            {
+                NativeFunctions.PostMessage(frm.Handle, NativeFunctions.WM_SYSCOMMAND, NativeFunctions.SC_CLOSE, 0);
+            }
+            else if (mdi.LastButtonClick == SystemButton.NextWindow)
+            {
+                NativeFunctions.PostMessage(frm.Handle, NativeFunctions.WM_SYSCOMMAND, NativeFunctions.SC_NEXTWINDOW, 0);
+            }
+        }
+        #endregion
+
+        internal void InvokeMouseDown(MouseEventArgs e)
+        {
+            OnMouseDown(e);
+        }
+
+        internal void InvokeMouseMove(MouseEventArgs e)
+        {
+            OnMouseMove(e);
+        }
+
+        internal void InvokeMouseUp(MouseEventArgs e)
+        {
+            OnMouseUp(e);
+        }
+
+        internal void InvokeClick(EventArgs e)
+        {
+            OnClick(e);
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Ribbon/RibbonStripContainerItem.cs b/PROMS/DotNetBar Source Code/Ribbon/RibbonStripContainerItem.cs
new file mode 100644
index 00000000..c187e07e
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Ribbon/RibbonStripContainerItem.cs	
@@ -0,0 +1,562 @@
+using System;
+using System.Drawing;
+using System.Collections;
+using System.Windows.Forms;
+using System.Collections.Generic;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Defines the internal container item for the ribbon strip control.
+    /// </summary>
+    [System.ComponentModel.ToolboxItem(false), System.ComponentModel.DesignTimeVisible(false)]
+    public class RibbonStripContainerItem : ImageItem, IDesignTimeProvider
+    {
+        #region Private Variables
+        private RibbonTabItemContainer m_ItemContainer = null;
+        private CaptionItemContainer m_CaptionContainer = null;
+        private SystemCaptionItem m_SystemCaptionItem = null;
+        private RibbonStrip m_RibbonStrip = null;
+        private SystemCaptionItem _WindowIcon = null;
+        private Separator _IconSeparator = null;
+        #endregion
+
+        #region Constructor
+        /// <summary>
+        /// Creates new instance of the class and initializes it with the parent RibbonStrip control.
+        /// </summary>
+        /// <param name="parent">Reference to parent RibbonStrip control</param>
+        public RibbonStripContainerItem(RibbonStrip parent)
+        {
+            m_RibbonStrip = parent;
+
+            // We contain other controls
+            m_IsContainer = true;
+            this.AccessibleRole = System.Windows.Forms.AccessibleRole.Grouping;
+
+            m_ItemContainer = new RibbonTabItemContainer();
+            m_ItemContainer.ContainerControl = parent;
+            m_ItemContainer.GlobalItem = false;
+            m_ItemContainer.WrapItems = false;
+            m_ItemContainer.EventHeight = false;
+            m_ItemContainer.UseMoreItemsButton = false;
+            m_ItemContainer.Stretch = true;
+            m_ItemContainer.Displayed = true;
+            m_ItemContainer.SystemContainer = true;
+            m_ItemContainer.PaddingTop = 0;
+            m_ItemContainer.PaddingBottom = 0;
+            m_ItemContainer.ItemSpacing = 1;
+
+            m_CaptionContainer = new CaptionItemContainer();
+            m_CaptionContainer.ContainerControl = parent;
+            m_CaptionContainer.GlobalItem = false;
+            m_CaptionContainer.WrapItems = false;
+            m_CaptionContainer.EventHeight = false;
+            m_CaptionContainer.EqualButtonSize = false;
+            m_CaptionContainer.ToolbarItemsAlign = eContainerVerticalAlignment.Top;
+            m_CaptionContainer.UseMoreItemsButton = false;
+            m_CaptionContainer.Stretch = true;
+            m_CaptionContainer.Displayed = true;
+            m_CaptionContainer.SystemContainer = true;
+            m_CaptionContainer.PaddingBottom = 0;
+            m_CaptionContainer.PaddingTop = 0;
+            m_CaptionContainer.ItemSpacing = 1;
+            m_CaptionContainer.TrackSubItemsImageSize = false;
+            m_CaptionContainer.ItemAdded += this.CaptionContainerNewItemAdded;
+            this.SubItems.Add(m_CaptionContainer);
+            this.SubItems.Add(m_ItemContainer);
+
+            SystemCaptionItem sc = new SystemCaptionItem();
+            sc.RestoreEnabled = false;
+            sc.IsSystemIcon = false;
+            sc.ItemAlignment = eItemAlignment.Far;
+            m_CaptionContainer.SubItems.Add(sc);
+            m_SystemCaptionItem = sc;
+
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            m_CaptionContainer.ItemAdded -= this.CaptionContainerNewItemAdded;
+            base.Dispose(disposing);
+        }
+
+        #endregion
+
+        #region Internal Implementation
+        private void CaptionContainerNewItemAdded(object sender, EventArgs e)
+        {
+            if (sender is BaseItem)
+            {
+                BaseItem item = sender as BaseItem;
+                if (!(item is SystemCaptionItem))
+                {
+                    if (m_CaptionContainer.SubItems.Contains(m_SystemCaptionItem))
+                    {
+                        m_CaptionContainer.SubItems._Remove(m_SystemCaptionItem);
+                        m_CaptionContainer.SubItems._Add(m_SystemCaptionItem);
+                    }
+                }
+            }
+        }
+
+        internal void ReleaseSystemFocus()
+        {
+            m_ItemContainer.ReleaseSystemFocus();
+            if (m_RibbonStrip.CaptionVisible)
+                m_CaptionContainer.ReleaseSystemFocus();
+        }
+
+        public override void ContainerLostFocus(bool appLostFocus)
+        {
+            base.ContainerLostFocus(appLostFocus);
+            m_ItemContainer.ContainerLostFocus(appLostFocus);
+            if (m_RibbonStrip.CaptionVisible)
+                m_CaptionContainer.ContainerLostFocus(appLostFocus);
+        }
+
+        internal void SetSystemFocus()
+        {
+            if (m_RibbonStrip.CaptionVisible && m_ItemContainer.ExpandedItem()==null)
+                m_CaptionContainer.SetSystemFocus();
+            else
+                m_ItemContainer.SetSystemFocus();
+        }
+
+        private List<BaseItem> _HiddenCaptionItems = new List<BaseItem>();
+        private bool _MetroBackstageOpen = false;
+        /// <summary>
+        /// Gets whether Metro Backstage application menu is open.
+        /// </summary>
+        public bool MetroBackstageOpen
+        {
+            get { return _MetroBackstageOpen; }
+            internal set
+            {
+                if (_MetroBackstageOpen == value) return;
+                _MetroBackstageOpen = value;
+                if (value)
+                {
+                    foreach (BaseItem item in m_CaptionContainer.SubItems)
+                    {
+                        if (item.Visible && item != m_SystemCaptionItem)
+                        {
+                            item.Displayed = false;
+                            item.LockDisplayedChange = true;
+                            _HiddenCaptionItems.Add(item);
+                        }
+                    }
+                }
+                else
+                {
+                    foreach (BaseItem item in _HiddenCaptionItems)
+                    {
+                        item.Displayed = true;
+                        item.LockDisplayedChange = false;
+                    }
+                    _HiddenCaptionItems.Clear();
+                    NeedRecalcSize = true;
+                }
+            }
+        }
+        
+        
+
+        /// <summary>
+		/// Paints this base container
+		/// </summary>
+        public override void Paint(ItemPaintArgs pa)
+        {
+            if (this.SuspendLayout)
+                return;
+
+            m_ItemContainer.Paint(pa);
+            if (m_RibbonStrip.CaptionVisible)
+                m_CaptionContainer.Paint(pa);
+        }
+
+        public override void RecalcSize()
+        {
+            if (this.SuspendLayout)
+                return;
+            m_ItemContainer.Bounds = GetItemContainerBounds();
+            m_ItemContainer.RecalcSize();
+            if (m_ItemContainer.HeightInternal < 0) m_ItemContainer.HeightInternal = 0;
+            bool isMaximized = false;
+            bool isGlassEnabled = this.IsGlassEnabled;
+            
+            if (m_RibbonStrip.CaptionVisible)
+            {
+                Size frameBorderSize = SystemInformation.FrameBorderSize;
+
+                Control c = this.ContainerControl as Control;
+                Form form = null;
+                if (c != null) form = c.FindForm();
+                if (form != null)
+                {
+                    isMaximized = form.WindowState == FormWindowState.Maximized;
+                    if (_WindowIcon != null)
+                        _WindowIcon.SetVisibleDirect(form.ShowIcon);
+                }
+                if (form is RibbonForm)
+                {
+                    NonClientInfo nci = ((RibbonForm)form).GetNonClientInfo();
+                    frameBorderSize.Width = nci.LeftBorder; frameBorderSize.Height = nci.BottomBorder;
+                    if (_WindowIcon != null)
+                        _WindowIcon.SetVisibleDirect(form.ShowIcon && ((RibbonForm)form).RenderFormIcon);
+
+                }
+                if (_IconSeparator != null)
+                    _IconSeparator.SetVisibleDirect(_WindowIcon.Visible);
+
+                m_CaptionContainer.Bounds = GetCaptionContainerBounds();
+                m_CaptionContainer.RecalcSize();
+
+                if (m_RibbonStrip.CaptionHeight == 0 && m_SystemCaptionItem.TopInternal < (frameBorderSize.Height - 1))
+                {
+                    if (System.Environment.OSVersion.Version.Major >= 6 && !isGlassEnabled)
+                    {
+                        if (isMaximized)
+                        {
+                            m_SystemCaptionItem.TopInternal = 1;
+                            if (_WindowIcon != null) _WindowIcon.TopInternal = Dpi.Factor.Height > 1 ? Dpi.Height5 : 6;
+                        }
+                        else
+                        {
+                            m_SystemCaptionItem.TopInternal = frameBorderSize.Height - Dpi.Height4;
+                            if (_WindowIcon != null)
+                            {
+                                _WindowIcon.TopInternal = Math.Max(0, frameBorderSize.Height - (Dpi.Factor.Height > 1 ? Dpi.Height3 : 2));
+                            }
+                        }
+                    }
+                    else
+                    {
+                        if (EffectiveStyle == eDotNetBarStyle.Office2010 || StyleManager.IsMetro(EffectiveStyle))
+                            m_SystemCaptionItem.TopInternal = 1;
+                        else
+                            m_SystemCaptionItem.TopInternal = 0;
+                        if (isGlassEnabled)
+                        {
+                            if (_WindowIcon != null) _WindowIcon.TopInternal = frameBorderSize.Height - Dpi.Width2;
+                            if (_IconSeparator != null) _IconSeparator.TopInternal = frameBorderSize.Height - 4;
+                        }
+                        else
+                        {
+                            if (_WindowIcon != null) _WindowIcon.TopInternal = frameBorderSize.Height + Dpi.Width2;
+                            if (_IconSeparator != null) _IconSeparator.TopInternal = frameBorderSize.Height;
+                        }
+                        
+                    }
+                }
+                
+                // Adjust the Y position of the items inside of the caption container since they are top aligned and
+                // quick access toolbar items should be aligned with the bottom of the system caption item.
+                if (System.Environment.OSVersion.Version.Major >= 6)
+                {
+                    int topOffset = 2;
+                    if (!isGlassEnabled)
+                        topOffset++;
+                    else if (isMaximized)
+                        topOffset += 1;
+                    int maxBottom = 0;
+                    foreach (BaseItem item in m_CaptionContainer.SubItems)
+                    {
+                        if (!(item is ApplicationButton) && item != m_SystemCaptionItem && item!=_WindowIcon)
+                            item.TopInternal += topOffset;
+                        maxBottom = Math.Max(item.Bounds.Bottom, maxBottom);
+                    }
+                    if (m_CaptionContainer.MoreItems != null)
+                        m_CaptionContainer.MoreItems.TopInternal += topOffset;
+                    if (maxBottom > m_CaptionContainer.HeightInternal) m_CaptionContainer.SetDisplayRectangle(new Rectangle(m_CaptionContainer.Bounds.X, m_CaptionContainer.Bounds.Y, m_CaptionContainer.Bounds.Width, maxBottom));
+                }
+                else
+                {
+                    int maxBottom = 0;
+                    foreach (BaseItem item in m_CaptionContainer.SubItems)
+                    {
+                        if (item.HeightInternal < m_SystemCaptionItem.HeightInternal && (item!= _IconSeparator && item!= _WindowIcon))
+                        {
+                            //item.TopInternal += (m_SystemCaptionItem.HeightInternal - item.HeightInternal);
+                            item.TopInternal = (m_SystemCaptionItem.Bounds.Bottom - (item.HeightInternal + ((item is LabelItem) ? 2 : 0)));
+                            maxBottom = Math.Max(item.Bounds.Bottom, maxBottom);
+                        }
+                    }
+                    if (m_CaptionContainer.MoreItems != null)
+                        m_CaptionContainer.MoreItems.TopInternal += (m_SystemCaptionItem.HeightInternal - m_CaptionContainer.MoreItems.HeightInternal);
+                    if (maxBottom > m_CaptionContainer.HeightInternal) m_CaptionContainer.SetDisplayRectangle(new Rectangle(m_CaptionContainer.Bounds.X, m_CaptionContainer.Bounds.Y, m_CaptionContainer.Bounds.Width, maxBottom));
+                }
+
+                if (m_ItemContainer.HeightInternal == 0)
+                    this.HeightInternal = m_CaptionContainer.HeightInternal;
+                else
+                    this.HeightInternal = m_ItemContainer.Bounds.Bottom;// -m_CaptionContainer.Bounds.Top;
+            }
+            else
+            {
+                int h = m_ItemContainer.HeightInternal;
+                if (m_RibbonStrip.TabGroupsVisible)
+                    h += m_RibbonStrip.TabGroupHeight + 1;
+                this.HeightInternal = h;
+            }
+
+            base.RecalcSize();
+        }
+
+        private bool IsGlassEnabled
+        {
+            get 
+            {
+                if (this.DesignMode || !m_RibbonStrip.CanSupportGlass) return false;
+                RibbonForm form = m_RibbonStrip.FindForm() as RibbonForm;
+                if (form != null) return form.IsGlassEnabled;
+                return WinApi.IsGlassEnabled; 
+            }
+        }
+
+        private Rectangle GetItemContainerBounds()
+        {
+            return m_RibbonStrip.GetItemContainerBounds();
+        }
+
+        private Rectangle GetCaptionContainerBounds()
+        {
+            return m_RibbonStrip.GetCaptionContainerBounds();
+        }
+
+        /// <summary>
+        /// Gets reference to internal ribbon strip container that contains tabs and/or other items.
+        /// </summary>
+        public GenericItemContainer RibbonStripContainer
+        {
+            get { return m_ItemContainer; }
+        }
+
+        /// <summary>
+        /// Gets reference to internal caption container item that contains the quick toolbar, start button and system caption item.
+        /// </summary>
+        public GenericItemContainer CaptionContainer
+        {
+            get { return m_CaptionContainer; }
+        }
+
+        public SystemCaptionItem SystemCaptionItem
+        {
+            get { return m_SystemCaptionItem; }
+        }
+
+        /// <summary>
+        /// Returns copy of GenericItemContainer item
+        /// </summary>
+        public override BaseItem Copy()
+        {
+            RibbonStripContainerItem objCopy = new RibbonStripContainerItem(m_RibbonStrip);
+            this.CopyToItem(objCopy);
+
+            return objCopy;
+        }
+        protected override void CopyToItem(BaseItem copy)
+        {
+            RibbonStripContainerItem objCopy = copy as RibbonStripContainerItem;
+            base.CopyToItem(objCopy);
+        }
+
+
+        public override void InternalClick(MouseButtons mb, Point mpos)
+        {
+            m_ItemContainer.InternalClick(mb, mpos);
+            if (m_RibbonStrip.CaptionVisible) m_CaptionContainer.InternalClick(mb, mpos);
+        }
+
+        public override void InternalDoubleClick(MouseButtons mb, Point mpos)
+        {
+            m_ItemContainer.InternalDoubleClick(mb, mpos);
+            if (m_RibbonStrip.CaptionVisible) m_CaptionContainer.InternalDoubleClick(mb, mpos);
+        }
+
+        public override void InternalMouseDown(MouseEventArgs objArg)
+        {
+            m_ItemContainer.InternalMouseDown(objArg);
+            if (m_RibbonStrip.CaptionVisible)
+            {
+                if(this.DesignMode && m_CaptionContainer.ItemAtLocation(objArg.X, objArg.Y)!=null || !this.DesignMode)
+                    m_CaptionContainer.InternalMouseDown(objArg);
+            }
+        }
+
+        public override void InternalMouseHover()
+        {
+            m_ItemContainer.InternalMouseHover();
+            if (m_RibbonStrip.CaptionVisible) m_CaptionContainer.InternalMouseHover();
+        }
+
+        public override void InternalMouseLeave()
+        {
+            m_ItemContainer.InternalMouseLeave();
+            if (m_RibbonStrip.CaptionVisible) m_CaptionContainer.InternalMouseLeave();
+        }
+
+        public override void InternalMouseMove(MouseEventArgs objArg)
+        {
+            m_ItemContainer.InternalMouseMove(objArg);
+            if (m_RibbonStrip.CaptionVisible) m_CaptionContainer.InternalMouseMove(objArg);
+        }
+
+        public override void InternalMouseUp(MouseEventArgs objArg)
+        {
+            m_ItemContainer.InternalMouseUp(objArg);
+            if (m_RibbonStrip.CaptionVisible) m_CaptionContainer.InternalMouseUp(objArg);
+        }
+
+        public override void InternalKeyDown(KeyEventArgs objArg)
+        {
+            BaseItem expanded = this.ExpandedItem();
+            if (expanded == null)
+                expanded = m_CaptionContainer.ExpandedItem();
+            if (expanded == null)
+                expanded = m_ItemContainer.ExpandedItem();
+
+            if (expanded == null || !m_RibbonStrip.CaptionVisible)
+            {
+                m_ItemContainer.InternalKeyDown(objArg);
+                if (!objArg.Handled && m_RibbonStrip.CaptionVisible)
+                    m_CaptionContainer.InternalKeyDown(objArg);
+            }
+            else
+            {
+                if (expanded.Parent == m_ItemContainer)
+                {
+                    m_ItemContainer.InternalKeyDown(objArg);
+                }
+                else
+                {
+                    m_CaptionContainer.InternalKeyDown(objArg);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Return Sub Item at specified location
+        /// </summary>
+        public override BaseItem ItemAtLocation(int x, int y)
+        {
+            if (m_ItemContainer.DisplayRectangle.Contains(x, y))
+                return m_ItemContainer.ItemAtLocation(x, y);
+
+            if (m_CaptionContainer.DisplayRectangle.Contains(x, y))
+                return m_CaptionContainer.ItemAtLocation(x, y);
+
+            return null;
+        }
+
+        protected override void OnStyleChanged()
+        {
+            if (this.EffectiveStyle == eDotNetBarStyle.Office2010 || StyleManager.IsMetro(this.EffectiveStyle))
+            {
+                if (_WindowIcon == null)
+                {
+                    _IconSeparator = new Separator("sys_caption_separator");
+                    _IconSeparator.SetSystemItem(true);
+                    m_CaptionContainer.SubItems._Add(_IconSeparator, 0);
+                    _WindowIcon = new SystemCaptionItem();
+                    _WindowIcon.Name = "sys_caption_icon";
+                    _WindowIcon.Enabled = false;
+                    _WindowIcon.Style = this.Style;
+                    _WindowIcon.IsSystemIcon = true;
+                    _WindowIcon.QueryIconOnPaint = true;
+                    m_CaptionContainer.SubItems._Add(_WindowIcon, 0);
+                }
+            }
+            else if (this.EffectiveStyle == eDotNetBarStyle.Windows7)
+            {
+                if (_WindowIcon == null)
+                {
+                    _IconSeparator = new Separator("sys_caption_separator");
+                    _IconSeparator.FixedSize = new Size(3, 12);
+                    _IconSeparator.SetSystemItem(true);
+                    m_CaptionContainer.SubItems._Add(_IconSeparator, 0);
+                    _WindowIcon = new SystemCaptionItem();
+                    _WindowIcon.Name = "sys_caption_icon";
+                    _WindowIcon.Enabled = false;
+                    _WindowIcon.Style = this.Style;
+                    _WindowIcon.IsSystemIcon = true;
+                    _WindowIcon.QueryIconOnPaint = true;
+                    m_CaptionContainer.SubItems._Add(_WindowIcon, 0);
+                }
+            }
+            else if(_WindowIcon!=null)
+            {
+                if (m_CaptionContainer.SubItems.Contains(_WindowIcon))
+                    m_CaptionContainer.SubItems._Remove(_WindowIcon);
+                _WindowIcon.Dispose();
+                _WindowIcon = null;
+                if (m_CaptionContainer.SubItems.Contains(_IconSeparator))
+                    m_CaptionContainer.SubItems._Remove(_IconSeparator);
+                _IconSeparator.Dispose();
+                _IconSeparator = null;
+            }
+
+            base.OnStyleChanged();
+        }
+        #endregion
+
+        #region IDesignTimeProvider Members
+
+        public InsertPosition GetInsertPosition(Point pScreen, BaseItem DragItem)
+        {
+            InsertPosition pos = m_ItemContainer.GetInsertPosition(pScreen, DragItem);
+            if(pos==null && m_RibbonStrip.CaptionVisible)
+                pos = m_CaptionContainer.GetInsertPosition(pScreen, DragItem);
+            return pos;
+        }
+
+        public void DrawReversibleMarker(int iPos, bool Before)
+        {
+            //DesignTimeProviderContainer.DrawReversibleMarker(this, iPos, Before);
+        }
+
+        public void InsertItemAt(BaseItem objItem, int iPos, bool Before)
+        {
+            //DesignTimeProviderContainer.InsertItemAt(this, objItem, iPos, Before);
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the item is expanded or not. For Popup items this would indicate whether the item is popped up or not.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), System.ComponentModel.DefaultValue(false), System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
+        public override bool Expanded
+        {
+            get
+            {
+                return base.Expanded;
+            }
+            set
+            {
+                base.Expanded = value;
+                if (!value)
+                {
+                    foreach (BaseItem item in this.SubItems)
+                        item.Expanded = false;
+                }
+            }
+        }
+
+        /// <summary>
+        /// When parent items does recalc size for its sub-items it should query
+        /// image size and store biggest image size into this property.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden), System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+        public override System.Drawing.Size SubItemsImageSize
+        {
+            get
+            {
+                return base.SubItemsImageSize;
+            }
+            set
+            {
+                //m_SubItemsImageSize = value;
+            }
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Ribbon/RibbonTabGroupPainter.cs b/PROMS/DotNetBar Source Code/Ribbon/RibbonTabGroupPainter.cs
new file mode 100644
index 00000000..cfbc6c8c
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Ribbon/RibbonTabGroupPainter.cs	
@@ -0,0 +1,10 @@
+using System;
+using System.Text;
+
+namespace DevComponents.DotNetBar
+{
+    internal abstract class RibbonTabGroupPainter
+    {
+        public abstract void PaintTabGroup(RibbonTabGroupRendererEventArgs e);
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Ribbon/RibbonTabGroupRendererEventArgs.cs b/PROMS/DotNetBar Source Code/Ribbon/RibbonTabGroupRendererEventArgs.cs
new file mode 100644
index 00000000..7b9bf5b0
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Ribbon/RibbonTabGroupRendererEventArgs.cs	
@@ -0,0 +1,54 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Provides data for RenderRibbonTabGroup event.
+    /// </summary>
+    public class RibbonTabGroupRendererEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets or sets Graphics object group is rendered on.
+        /// </summary>
+        public Graphics Graphics = null;
+        /// <summary>
+        /// Gets or sets RibbonTabItemGroup being rendered.
+        /// </summary>
+        public RibbonTabItemGroup RibbonTabItemGroup = null;
+        /// <summary>
+        /// Gets or sets the bounds of the tab group. Bounds specified here are bounds of the tab group title. GroupBounds contains the bounds
+        /// that include all tabs that belong to the tab group.
+        /// </summary>
+        public Rectangle Bounds = Rectangle.Empty;
+        /// <summary>
+        /// Gets or sets the font that should be used to render group text.
+        /// </summary>
+        public Font GroupFont = null;
+        /// <summary>
+        /// Gets or sets group bounds including the tabs that belong to the group.
+        /// </summary>
+        public Rectangle GroupBounds = Rectangle.Empty;
+        /// <summary>
+        /// Gets or sets the effective style for the group.
+        /// </summary>
+        public eDotNetBarStyle EffectiveStyle = eDotNetBarStyle.Office2007;
+
+        /// <summary>
+        /// Gets whether Windows Vista glass is enabled.
+        /// </summary>
+        public ItemPaintArgs ItemPaintArgs = null;
+
+        public RibbonTabGroupRendererEventArgs(Graphics g, RibbonTabItemGroup group, Rectangle bounds, Rectangle groupBounds, Font font, ItemPaintArgs pa, eDotNetBarStyle effectiveStyle)
+        {
+            this.Graphics = g;
+            this.RibbonTabItemGroup = group;
+            this.Bounds = bounds;
+            this.GroupBounds = groupBounds;
+            this.GroupFont = font;
+            this.ItemPaintArgs = pa;
+            this.EffectiveStyle = effectiveStyle;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Ribbon/RibbonTabItem.cs b/PROMS/DotNetBar Source Code/Ribbon/RibbonTabItem.cs
new file mode 100644
index 00000000..862f5f63
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Ribbon/RibbonTabItem.cs	
@@ -0,0 +1,760 @@
+using System.ComponentModel;
+using System.Drawing;
+using System;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Represents Rendering Tab used on RibbonControl.
+	/// </summary>
+    [ToolboxItem(false), DesignTimeVisible(false), Designer("DevComponents.DotNetBar.Design.RibbonTabItemDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+	public class RibbonTabItem:ButtonItem
+	{
+		#region Private Variables & Constructor
+		private RibbonPanel m_Panel=null;
+		private RibbonTabItemGroup m_Group=null;
+        private eRibbonTabColor m_ColorTable = eRibbonTabColor.Default; private string m_CashedColorTableName = "Default";
+        private bool m_ReducedSize = false;
+        private int m_PaddingHorizontal = 0;
+		#endregion
+        
+		#region Internal Implementation
+        private bool _RenderTabState = true;
+        /// <summary>
+        /// Gets or sets whether tab renders its state. Used internally by DotNetBar. Do not set.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never), Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        internal bool RenderTabState
+        {
+            get { return _RenderTabState; }
+            set
+            {
+                _RenderTabState = value;
+                if (this.ContainerControl is System.Windows.Forms.Control)
+                    ((System.Windows.Forms.Control)this.ContainerControl).Invalidate();
+                else
+                    this.Refresh();
+            }
+        }
+
+        protected override bool IsFadeEnabled
+        {
+            get
+            {
+                if ((this.EffectiveStyle == eDotNetBarStyle.Office2010 || StyleManager.IsMetro(this.EffectiveStyle)) && WinApi.IsGlassEnabled)
+                    return false;
+                return base.IsFadeEnabled;
+            }
+        }
+        /// <summary>
+        /// Gets or sets the additional padding added around the tab item in pixels. Default value is 0.
+        /// </summary>
+        [Browsable(true), DefaultValue(0), Category("Layout"), Description("Indicates additional padding added around the tab item in pixels.")]
+        public int PaddingHorizontal
+        {
+            get { return m_PaddingHorizontal; }
+            set
+            {
+                m_PaddingHorizontal = value;
+                UpdateTabAppearance();
+            }
+        }
+
+        /// <summary>
+        /// Selects the tab.
+        /// </summary>
+        public void Select()
+        {
+            this.Checked = true;
+        }
+        /// <summary>
+        /// Gets or sets whether size of the tab has been reduced below the default calculated size.
+        /// </summary>
+        internal bool ReducedSize
+        {
+            get { return m_ReducedSize; }
+            set { m_ReducedSize = value; }
+        }
+        ///// <summary>
+        ///// Gets or sets the custom color name. Name specified here must be represented by the coresponding object with the same name that is part
+        ///// of the Office2007ColorTable.RibbonTabItemColors collection. See documentation for Office2007ColorTable.RibbonTabItemColors for more information.
+        ///// If color table with specified name cannot be found default color will be used. Valid settings for this property override any
+        ///// setting to the Color property.
+        ///// Applies to items with Office 2007 style only.
+        ///// </summary>
+        //[Browsable(true), DefaultValue(""), Category("Appearance"), Description("Indicates custom color table name for the item when Office 12 style is used.")]
+        //public string CustomColorName
+        //{
+        //    get { return m_CustomColorName; }
+        //    set
+        //    {
+        //        m_CustomColorName = value;
+        //        this.Refresh();
+        //    }
+        //}
+
+        /// <summary>
+        /// Gets or sets the predefined color of item. Color specified here applies to items with Office 2007 style only. It does not have
+        /// any effect on other styles. Default value is eRibbonTabColor.Default
+        /// </summary>
+        [Browsable(true), DefaultValue(eRibbonTabColor.Default), Category("Appearance"), Description("Indicates predefined color of item when Office 2007 style is used.")]
+        public new eRibbonTabColor ColorTable
+        {
+            get { return m_ColorTable; }
+            set
+            {
+                if (m_ColorTable != value)
+                {
+                    m_ColorTable = value;
+                    m_CashedColorTableName = Enum.GetName(typeof(eRibbonTabColor), m_ColorTable);
+                    this.Refresh();
+                }
+            }
+        }
+
+        internal override string GetColorTableName()
+        {
+            return this.CustomColorName != "" ? this.CustomColorName : m_CashedColorTableName;
+        }
+
+		/// <summary>
+		/// Gets or sets the group this tab belongs to. Groups are optional classification that is used to 
+		/// visually group tabs that belong to same functions. These tabs should be positioned next to each other.
+		/// </summary>
+        [Editor("DevComponents.DotNetBar.Design.RibbonTabItemGroupTypeEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), Browsable(true), DefaultValue(null), DevCoBrowsable(true), Category("Tab Group"), Description("Indicates the group tab belongs to.")]
+		public RibbonTabItemGroup Group
+		{
+			get {return m_Group;}
+			set 
+			{
+				m_Group=value;
+				if(this.DesignMode)
+				{
+					ItemControl c=this.ContainerControl as ItemControl;
+					if(c!=null)
+						c.RecalcLayout();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Resets Group property to default value null.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetGroup()
+		{
+			TypeDescriptor.GetProperties(this)["Group"].SetValue(this,null);
+		}
+
+		/// <summary>
+		/// Gets or sets the panel assigned to this ribbon tab item.
+		/// </summary>
+		[Browsable(false),DefaultValue(null)]
+		public RibbonPanel Panel
+		{
+			get {return m_Panel;}
+			set
+			{
+			    if (m_Panel != null)
+			        m_Panel.RibbonTabItem = null;
+				m_Panel=value;
+			    if (m_Panel != null)
+			        m_Panel.RibbonTabItem = this;
+                OnPanelChanged();
+			}
+		}
+
+		private void OnPanelChanged()
+		{
+			ChangePanelVisibility();
+		}
+
+		/// <summary>
+		/// Called after Checked property has changed.
+		/// </summary>
+		protected override void OnCheckedChanged()
+		{
+            if(this.Checked && this.Parent!=null)
+			{
+                ChangePanelVisibility();
+				foreach(BaseItem item in this.Parent.SubItems)
+				{
+					if(item==this)
+						continue;
+					RibbonTabItem b=item as RibbonTabItem;
+                    if (b != null && b.Checked)
+                    {
+                        if (this.DesignMode)
+                            TypeDescriptor.GetProperties(b)["Checked"].SetValue(b, false);
+                        else
+                            b.Checked = false;
+                    }
+				}
+			}
+
+            m_LastAutoExpandTime = DateTime.MinValue;
+
+            if (BarFunctions.IsOffice2007Style(this.EffectiveStyle) && this.ContainerControl is System.Windows.Forms.Control)
+                ((System.Windows.Forms.Control)this.ContainerControl).Invalidate();
+            if(!this.Checked)
+                ChangePanelVisibility();
+            InvokeCheckedChanged();
+		}
+
+		private void ChangePanelVisibility()
+		{
+			if(this.Checked && m_Panel!=null)
+			{
+                if (this.DesignMode)
+                {
+                    if (!m_Panel.Visible) m_Panel.Visible = true;
+                    TypeDescriptor.GetProperties(m_Panel)["Visible"].SetValue(m_Panel, true);
+                    m_Panel.BringToFront();
+                }
+                else
+                {
+                    if (!m_Panel.IsDisposed)
+                    {
+                        m_Panel.SuspendLayout();
+                        m_Panel.Visible = true;
+                        m_Panel.ResumeLayout(true);
+                        m_Panel.BringToFront();
+                    }
+                }
+			}
+			else if(!this.Checked && m_Panel!=null && !m_Panel.IsPopupMode) // Panels in popup mode will be taken care of by Ribbon
+			{
+                if (this.DesignMode)
+                    TypeDescriptor.GetProperties(m_Panel)["Visible"].SetValue(m_Panel, false);
+                else
+                    m_Panel.Visible = false;
+			}
+		}
+
+        /// <summary>
+        /// Occurs just before Click event is fired.
+        /// </summary>
+        protected override void OnClick()
+        {
+            base.OnClick();
+            if (!this.Checked)
+            {
+                if (this.DesignMode)
+                    TypeDescriptor.GetProperties(this)["Checked"].SetValue(this, true);
+                else
+                    this.Checked = true;
+            }
+
+            System.Windows.Forms.Control c = this.ContainerControl as System.Windows.Forms.Control;
+            if (c is RibbonStrip && ((RibbonStrip)c).AutoExpand && c.Parent is RibbonControl)
+            {
+                RibbonControl rc = (RibbonControl)c.Parent;
+                if (!rc.Expanded)
+                {
+                    TimeSpan span = DateTime.Now.Subtract(m_LastAutoExpandTime);
+                    if (m_LastAutoExpandTime == DateTime.MinValue ||
+                        Math.Abs(span.TotalMilliseconds) > System.Windows.Forms.SystemInformation.DoubleClickTime)
+                    {
+                        rc.RibbonTabItemClick(this);
+                        m_LastAutoExpandTime = DateTime.MinValue;
+                    }
+                }
+            }
+        }
+
+        private DateTime m_LastAutoExpandTime = DateTime.MinValue;
+        /// <summary>
+        /// Occurs when the item is clicked. This is used by internal implementation only.
+        /// </summary>
+        //[System.ComponentModel.Browsable(false), System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+        //public override void InternalClick(System.Windows.Forms.MouseButtons mb, System.Drawing.Point mpos)
+        //{
+        //                base.InternalClick(mb, mpos);
+        //}
+
+        protected override void InvokeDoubleClick()
+        {
+            System.Windows.Forms.Control c = this.ContainerControl as System.Windows.Forms.Control;
+            if (c is RibbonStrip && ((RibbonStrip)c).AutoExpand && c.Parent is RibbonControl)
+            {
+                //if (m_LastAutoExpandTime == DateTime.Now || m_LastAutoExpandTime == DateTime.MinValue ||
+                //    m_LastAutoExpandTime != DateTime.Now && Math.Abs(DateTime.Now.Subtract(m_LastAutoExpandTime).Milliseconds) > System.Windows.Forms.SystemInformation.DoubleClickTime)
+                //{
+                    ((RibbonControl)c.Parent).RibbonTabItemDoubleClick(this);
+                    m_LastAutoExpandTime = DateTime.Now; // DateTime.MinValue;
+                //}
+            }
+
+            base.InvokeDoubleClick();
+        }
+
+		/// <summary>
+		/// Called when Visibility of the items has changed.
+		/// </summary>
+		/// <param name="bVisible">New Visible state.</param>
+		protected internal override void OnVisibleChanged(bool bVisible)
+		{
+			base.OnVisibleChanged(bVisible);
+			if(!bVisible && this.Checked)
+			{
+				TypeDescriptor.GetProperties(this)["Checked"].SetValue(this,false);
+				// Try to check first item in the group
+				if(this.Parent!=null)
+				{
+					foreach(BaseItem item in this.Parent.SubItems)
+					{
+                        if (item == this || !item.GetEnabled() || !item.Visible)
+							continue;
+						RibbonTabItem b=item as RibbonTabItem;
+						if(b!=null)
+						{
+							TypeDescriptor.GetProperties(b)["Checked"].SetValue(this,true);
+							break;
+						}
+					}
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or set the Group item belongs to. The groups allows a user to choose from mutually exclusive options within the group. The choice is reflected by Checked property.
+		/// </summary>
+		[Browsable(false),DevCoBrowsable(false),DefaultValue(""),EditorBrowsable(EditorBrowsableState.Never)]
+		public override string OptionGroup
+		{
+			get {return base.OptionGroup;}
+			set {base.OptionGroup=value;}
+		}
+
+		/// <summary>
+		/// Occurs after item visual style has changed.
+		/// </summary>
+		protected override void OnStyleChanged()
+		{
+			base.OnStyleChanged();
+            UpdateTabAppearance();
+		}
+
+        private void UpdateTabAppearance()
+        {
+            eDotNetBarStyle effectiveStyle = this.EffectiveStyle;
+            if (effectiveStyle == eDotNetBarStyle.Office2007)
+            {
+                this.VerticalPadding = 0;
+                this.HorizontalPadding = 12 + m_PaddingHorizontal;
+            }
+            else if (effectiveStyle == eDotNetBarStyle.Office2010 || StyleManager.IsMetro(effectiveStyle))
+            {
+                this.VerticalPadding = 1;
+                this.HorizontalPadding = 16 + m_PaddingHorizontal;
+            }
+            else if (effectiveStyle == eDotNetBarStyle.Windows7)
+            {
+                this.VerticalPadding = 0;
+                this.HorizontalPadding = 16 + m_PaddingHorizontal;
+            }
+            else if (effectiveStyle == eDotNetBarStyle.Office2003)
+            {
+                this.VerticalPadding = -1;
+                this.HorizontalPadding = 2 + m_PaddingHorizontal;
+            }
+            else
+            {
+                this.VerticalPadding = 0;
+                this.HorizontalPadding = 0 + m_PaddingHorizontal;
+            }
+
+            this.NeedRecalcSize = true;
+            this.OnAppearanceChanged();
+        }
+
+	    protected override void ScaleItem(SizeF factor)
+	    {
+            UpdateTabAppearance();
+	        base.ScaleItem(factor);
+	    }
+
+	    /// <summary>
+		/// Returns the collection of sub items.
+		/// </summary>
+		[Browsable(false),DevCoBrowsable(false),DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Content)]
+		public override SubItemsCollection SubItems
+		{
+			get {return base.SubItems;}
+		}
+
+        internal override void DoAccesibleDefaultAction()
+        {
+            this.Checked = true;
+        }
+
+        protected override void Invalidate(System.Windows.Forms.Control containerControl)
+        {
+            Rectangle r = m_Rect;
+            r.Width++;
+            r.Height++;
+            if (containerControl.InvokeRequired)
+                containerControl.BeginInvoke(new MethodInvoker(delegate { containerControl.Invalidate(r, true); }));
+            else
+                containerControl.Invalidate(r, true);
+        }
+		#endregion
+
+		#region Hidden Properties
+		/// <summary>
+		/// Indicates whether the item will auto-collapse (fold) when clicked. 
+		/// When item is on popup menu and this property is set to false, menu will not
+		/// close when item is clicked.
+		/// </summary>
+        [Browsable(false), DevCoBrowsable(false), EditorBrowsable(EditorBrowsableState.Never), Category("Behavior"), DefaultValue(true), Description("Indicates whether the item will auto-collapse (fold) when clicked.")]
+		public override bool AutoCollapseOnClick
+		{
+			get
+			{
+				return base.AutoCollapseOnClick;
+			}
+			set
+			{
+				base.AutoCollapseOnClick=value;
+			}
+		}
+
+		/// <summary>
+		/// Indicates whether the item will auto-expand when clicked. 
+		/// When item is on top level bar and not on menu and contains sub-items, sub-items will be shown only if user
+		/// click the expand part of the button. Setting this propert to true will expand the button and show sub-items when user
+		/// clicks anywhere inside of the button. Default value is false which indicates that button is expanded only
+		/// if its expand part is clicked.
+		/// </summary>
+        [DefaultValue(false), Browsable(false), EditorBrowsable(EditorBrowsableState.Never), DevCoBrowsable(false), Category("Behavior"), Description("Indicates whether the item will auto-collapse (fold) when clicked.")]
+		public override bool AutoExpandOnClick
+		{
+			get
+			{
+				return base.AutoExpandOnClick;
+			}
+			set
+			{
+				base.AutoExpandOnClick=value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets whether item can be customized by end user.
+		/// </summary>
+        [Browsable(false), DevCoBrowsable(false), EditorBrowsable(EditorBrowsableState.Never), DefaultValue(true), System.ComponentModel.Category("Behavior"), System.ComponentModel.Description("Indicates whether item can be customized by user.")]
+		public override bool CanCustomize
+		{
+			get
+			{
+				return base.CanCustomize;
+			}
+			set
+			{
+				base.CanCustomize=value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or set a value indicating whether the button is in the checked state.
+		/// </summary>
+		[Browsable(false),DevCoBrowsable(false),Category("Appearance"),Description("Indicates whether item is checked or not."),DefaultValue(false)]
+		public override bool Checked
+		{
+			get
+			{
+				return base.Checked;
+			}
+			set
+			{
+				base.Checked=value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets whether Click event will be auto repeated when mouse button is kept pressed over the item.
+		/// </summary>
+        [Browsable(false), DevCoBrowsable(false), EditorBrowsable(EditorBrowsableState.Never), DefaultValue(false), Category("Behavior"), Description("Gets or sets whether Click event will be auto repeated when mouse button is kept pressed over the item.")]
+		public override bool ClickAutoRepeat
+		{
+			get
+			{
+				return base.ClickAutoRepeat;
+			}
+			set
+			{
+				base.ClickAutoRepeat=value;                
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the auto-repeat interval for the click event when mouse button is kept pressed over the item.
+		/// </summary>
+        [Browsable(false), DevCoBrowsable(false), EditorBrowsable(EditorBrowsableState.Never), DefaultValue(600), Category("Behavior"), Description("Gets or sets the auto-repeat interval for the click event when mouse button is kept pressed over the item.")]
+		public override int ClickRepeatInterval
+		{
+			get
+			{
+				return base.ClickRepeatInterval;
+			}
+			set
+			{
+				base.ClickRepeatInterval=value;                
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets a value indicating whether the item is enabled.
+		/// </summary>
+		[Browsable(false),DevCoBrowsable(false),DefaultValue(true),Category("Behavior"),Description("Indicates whether is item enabled.")]
+		public override bool Enabled
+		{
+			get
+			{
+				return base.Enabled;
+			}
+			set
+			{
+				base.Enabled=value;
+			}
+		}
+
+		/// <summary>
+		/// Indicates item's visiblity when on pop-up menu.
+		/// </summary>
+        [Browsable(false), DevCoBrowsable(false), EditorBrowsable(EditorBrowsableState.Never), Category("Appearance"), Description("Indicates item's visiblity when on pop-up menu."), DefaultValue(eMenuVisibility.VisibleAlways)]
+		public override eMenuVisibility MenuVisibility
+		{
+			get
+			{
+				return base.MenuVisibility;
+			}
+			set
+			{
+				base.MenuVisibility=value;
+			}
+		}
+
+		/// <summary>
+		/// Indicates when menu items are displayed when MenuVisiblity is set to VisibleIfRecentlyUsed and RecentlyUsed is true.
+		/// </summary>
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never), DevCoBrowsable(false), Category("Appearance"), Description("Indicates when menu items are displayed when MenuVisiblity is set to VisibleIfRecentlyUsed and RecentlyUsed is true."), DefaultValue(ePersonalizedMenus.Disabled)]
+		public override ePersonalizedMenus PersonalizedMenus
+		{
+			get
+			{
+				return base.PersonalizedMenus;
+			}
+			set
+			{
+				base.PersonalizedMenus=value;
+			}
+		}
+
+		/// <summary>
+		/// Indicates Animation type for Popups.
+		/// </summary>
+        [Browsable(false), DevCoBrowsable(false), EditorBrowsable(EditorBrowsableState.Never), Category("Behavior"), Description("Indicates Animation type for Popups."), DefaultValue(ePopupAnimation.ManagerControlled)]
+		public override ePopupAnimation PopupAnimation
+		{
+			get
+			{
+				return base.PopupAnimation;
+			}
+			set
+			{
+				base.PopupAnimation=value;
+			}
+		}
+
+		/// <summary>
+		/// Indicates the font that will be used on the popup window.
+		/// </summary>
+        [Browsable(false), DevCoBrowsable(false), EditorBrowsable(EditorBrowsableState.Never), Category("Appearance"), Description("Indicates the font that will be used on the popup window."), DefaultValue(null)]
+		public override System.Drawing.Font PopupFont
+		{
+			get
+			{
+				return base.PopupFont;
+			}
+			set
+			{
+				base.PopupFont=value;
+			}
+		}
+
+		/// <summary>
+		/// Indicates whether sub-items are shown on popup Bar or popup menu.
+		/// </summary>
+        [Browsable(false), DevCoBrowsable(false), EditorBrowsable(EditorBrowsableState.Never), Category("Appearance"), Description("Indicates whether sub-items are shown on popup Bar or popup menu."), DefaultValue(ePopupType.Menu)]
+		public override ePopupType PopupType
+		{
+			get
+			{
+				return base.PopupType;
+			}
+			set
+			{
+				base.PopupType=value;
+			}
+		}
+
+		/// <summary>
+		/// Specifies the inital width for the Bar that hosts pop-up items. Applies to PopupType.Toolbar only.
+		/// </summary>
+        [Browsable(false), DevCoBrowsable(false), EditorBrowsable(EditorBrowsableState.Never), Category("Layout"), Description("Specifies the inital width for the Bar that hosts pop-up items. Applies to PopupType.Toolbar only."), DefaultValue(200)]
+		public override int PopupWidth
+		{
+			get
+			{
+				return base.PopupWidth;
+			}
+			set
+			{
+				base.PopupWidth=value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets whether item will display sub items.
+		/// </summary>
+        [Browsable(false), DevCoBrowsable(false), EditorBrowsable(EditorBrowsableState.Never), DefaultValue(true), Category("Behavior"), Description("Determines whether sub-items are displayed.")]
+		public override bool ShowSubItems
+		{
+			get
+			{
+				return base.ShowSubItems;
+			}
+			set
+			{
+				base.ShowSubItems=value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets whether the item expands automatically to fill out the remaining space inside the container. Applies to Items on stretchable, no-wrap Bars only.
+		/// </summary>
+        [Browsable(false), DevCoBrowsable(false), EditorBrowsable(EditorBrowsableState.Never), DefaultValue(false), Category("Appearance"), Description("Indicates whether item will stretch to consume empty space. Items on stretchable, no-wrap Bars only.")]
+		public override bool Stretch
+		{
+			get
+			{
+				return base.Stretch;
+			}
+			set
+			{
+				base.Stretch=value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the width of the expand part of the button item.
+		/// </summary>
+        [Browsable(false), DevCoBrowsable(false), EditorBrowsable(EditorBrowsableState.Never), Category("Behavior"), Description("Indicates the width of the expand part of the button item."), DefaultValue(12)]
+		public override int SubItemsExpandWidth
+		{
+			get {return base.SubItemsExpandWidth;}
+			set
+			{
+				base.SubItemsExpandWidth=value;
+			}
+		}
+
+        /// <summary>
+        /// Gets or set the alternative shortcut text.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), EditorBrowsable(EditorBrowsableState.Never), DevCoBrowsable(false), System.ComponentModel.Category("Design"), System.ComponentModel.Description("Gets or set the alternative Shortcut Text.  This text appears next to the Text instead of any shortcuts"), System.ComponentModel.DefaultValue("")]
+        public override string AlternateShortCutText
+        {
+            get
+            {
+                return base.AlternateShortCutText;
+            }
+            set
+            {
+                base.AlternateShortCutText = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether item separator is shown before this item.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), DevCoBrowsable(false), System.ComponentModel.DefaultValue(false), System.ComponentModel.Category("Appearance"), System.ComponentModel.Description("Indicates whether this item is beginning of the group.")]
+        public override bool BeginGroup
+        {
+            get
+            {
+                return base.BeginGroup;
+            }
+            set
+            {
+                base.BeginGroup = value;
+            }
+        }
+
+        /// <summary>
+        /// Returns category for this item. If item cannot be customzied using the
+        /// customize dialog category is empty string.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), DevCoBrowsable(false), System.ComponentModel.DefaultValue(""), System.ComponentModel.Category("Design"), System.ComponentModel.Description("Indicates item category used to group similar items at design-time."), EditorBrowsable(EditorBrowsableState.Never)]
+        public override string Category
+        {
+            get
+            {
+
+                return base.Category;
+            }
+            set
+            {
+                base.Category = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the text color of the button when mouse is over the item.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), DevCoBrowsable(false), System.ComponentModel.Category("Appearance"), System.ComponentModel.Description("The foreground color used to display text when mouse is over the item."), EditorBrowsable(EditorBrowsableState.Never)]
+        public override Color HotForeColor
+        {
+            get
+            {
+                return base.HotForeColor;
+            }
+            set
+            {
+                base.HotForeColor = value;
+            }
+        }
+
+        /// <summary>
+        /// Indicates the way item is painting the picture when mouse is over it. Setting the value to Color will render the image in gray-scale when mouse is not over the item.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), DevCoBrowsable(false), System.ComponentModel.Category("Appearance"), System.ComponentModel.Description("Indicates the way item is painting the picture when mouse is over it. Setting the value to Color will render the image in gray-scale when mouse is not over the item."), System.ComponentModel.DefaultValue(eHotTrackingStyle.Default), EditorBrowsable(EditorBrowsableState.Never)]
+        public override eHotTrackingStyle HotTrackingStyle
+        {
+            get { return base.HotTrackingStyle; }
+            set
+            {
+                base.HotTrackingStyle = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the text color of the button.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), DevCoBrowsable(false), EditorBrowsable(EditorBrowsableState.Never), System.ComponentModel.Category("Appearance"), System.ComponentModel.Description("The foreground color used to display text.")]
+        public override Color ForeColor
+        {
+            get
+            {
+                return base.ForeColor;
+            }
+            set
+            {
+                base.ForeColor = value;
+            }
+        }
+		#endregion
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/Ribbon/RibbonTabItemContainer.cs b/PROMS/DotNetBar Source Code/Ribbon/RibbonTabItemContainer.cs
new file mode 100644
index 00000000..c4bae6f6
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Ribbon/RibbonTabItemContainer.cs	
@@ -0,0 +1,115 @@
+using System;
+using System.Collections;
+using System.Text;
+
+namespace DevComponents.DotNetBar
+{
+    internal class RibbonTabItemContainer : GenericItemContainer
+    {
+        protected override void OnStyleChanged()
+        {
+            eDotNetBarStyle effectiveStyle = this.EffectiveStyle;
+            if (effectiveStyle == eDotNetBarStyle.Windows7)
+            {
+                this.PaddingLeft = 0;
+                this.PaddingRight = 0;
+                this.PaddingTop = 0;
+            }
+            else if (effectiveStyle == eDotNetBarStyle.Office2010 || StyleManager.IsMetro(effectiveStyle))
+            {
+                this.PaddingLeft = 0;
+                this.PaddingRight = 1;
+                this.PaddingTop = 1;
+            }
+            else
+            {
+                this.PaddingLeft = 1;
+                this.PaddingRight = 1;
+                this.PaddingTop = 1;
+            }
+            base.OnStyleChanged();
+        }
+        protected override bool OnBeforeLayout()
+        {
+            if (this.Orientation != eOrientation.Horizontal)
+                return true;
+
+            ArrayList ribbonTabItems = new ArrayList();
+            int totalWidth = 0;
+            int totalRibbonTabItemsWidth = 0;
+            int minimumSize = 24;
+            int availableWidth = this.WidthInternal - (this.PaddingLeft + this.PaddingRight);
+
+            foreach (BaseItem item in this.SubItems)
+            {
+                if (!item.Visible)
+                    continue;
+                item.RecalcSize();
+                totalWidth += (item.WidthInternal + this.ItemSpacing);
+                if (item is RibbonTabItem)
+                {
+                    // Reset reduced size flag
+                    ((RibbonTabItem)item).ReducedSize = false;
+                    ribbonTabItems.Add(item);
+                    totalRibbonTabItemsWidth += (item.WidthInternal + this.ItemSpacing);
+                }
+            }
+
+            int totalReduction = totalWidth - availableWidth;
+
+            if (totalWidth > availableWidth && totalRibbonTabItemsWidth > 0)
+            {
+                if (totalReduction >= totalRibbonTabItemsWidth - (minimumSize * ribbonTabItems.Count + ribbonTabItems.Count - 1))
+                {
+                    foreach (RibbonTabItem item in ribbonTabItems)
+                    {
+                        item.WidthInternal = minimumSize;
+                        item.ReducedSize = true;
+                    }
+                }
+                else
+                {
+                    float reduction = 1 - (float)totalReduction / (float)totalRibbonTabItemsWidth;
+                    bool reducedSize = false;
+                    if (reduction <= .75)
+                        reducedSize = true;
+                    for (int i = 0; i < ribbonTabItems.Count; i++)
+                    {
+                        RibbonTabItem item = ribbonTabItems[i] as RibbonTabItem;
+                        item.ReducedSize = reducedSize;
+                        if (i == ribbonTabItems.Count - 1)
+                        {
+                            item.WidthInternal -= totalReduction;
+                        }
+                        else
+                        {
+                            int width = (int)(item.WidthInternal * reduction);
+                            if (width < minimumSize)
+                                width = minimumSize;
+                            totalReduction -= (item.WidthInternal - width);
+                            item.WidthInternal = width;
+                        }
+                    }
+                }
+            }
+
+            return false;
+        }
+
+        protected override bool ShouldCollapseParentItem()
+        {
+            BaseItem expandedItem = ExpandedItem();
+            if (expandedItem is ApplicationButton)
+            {
+                RibbonStrip strip = this.ContainerControl as RibbonStrip;
+                if (strip != null)
+                {
+                    BaseItem item = strip.HitTest(MouseDownPt);
+                    if (item is SystemCaptionItem)
+                        return false;
+                }
+            }
+            return true;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Ribbon/RibbonTabItemGroup.cs b/PROMS/DotNetBar Source Code/Ribbon/RibbonTabItemGroup.cs
new file mode 100644
index 00000000..6f62283c
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Ribbon/RibbonTabItemGroup.cs	
@@ -0,0 +1,249 @@
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Represents a group RibbonTabItem objects are assigned to.
+	/// </summary>
+    [DesignTimeVisible(false), ToolboxItem(false), TypeConverterAttribute("DevComponents.DotNetBar.Design.RibbonTabItemGroupConverter, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+	public class RibbonTabItemGroup:Component
+	{
+		#region Private Variables & Constructor
+		private ElementStyle m_Style=null;
+		private string m_GroupTitle="";
+		private RibbonStrip m_ParentRibbonStrip=null;
+        [EditorBrowsable(EditorBrowsableState.Never), Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public ArrayList DisplayPositions=new ArrayList();
+        private eRibbonTabGroupColor m_Color = eRibbonTabGroupColor.Default;
+        private string m_Name = "";
+        private string m_CustomColorName = "";
+
+		public RibbonTabItemGroup()
+		{
+			m_Style=new ElementStyle();
+			m_Style.StyleChanged+=new EventHandler(StyleChanged);
+		}
+		#endregion
+
+		#region Internal Implementation
+        /// <summary>
+        /// Gets or sets the predefined color of the group. Color specified here applies to groups with Office 12 style only. It does not have
+        /// any effect on other styles. Default value is eRibbonTabGroupColor.Default
+        /// </summary>
+        [Browsable(true), DefaultValue(eRibbonTabGroupColor.Default), Category("Appearance"), Description("Indicates predefined color of the group when Office 12 style is used.")]
+        public eRibbonTabGroupColor Color
+        {
+            get { return m_Color; }
+            set
+            {
+                if (m_Color != value)
+                {
+                    m_Color = value;
+                    if (this.ParentRibbonStrip != null)
+                        this.ParentRibbonStrip.Invalidate();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the custom color name. Name specified here must be represented by the coresponding object with the same name that is part
+        /// of the Office2007ColorTable.RibbonTabGroupColors collection. See documentation for Office2007ColorTable.RibbonTabGroupColors for more information.
+        /// If color table with specified name cannot be found default color will be used. Valid settings for this property override any
+        /// setting to the Color property.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(false), DefaultValue(""), Category("Appearance"), Description("Indicates custom color table name for the button when Office 2007 style is used.")]
+        public string CustomColorName
+        {
+            get { return m_CustomColorName; }
+            set
+            {
+                m_CustomColorName = value;
+                if (this.ParentRibbonStrip != null)
+                    this.ParentRibbonStrip.Invalidate();
+            }
+        }
+
+		/// <summary>
+		/// Gets the style for tab group.
+		/// </summary>
+		[Browsable(false),Category("Background"),Description("Gets the style for tab group."),DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+		public ElementStyle Style
+		{
+			get {return m_Style;}
+		}
+
+		/// <summary>
+		/// Gets or sets title of the group that will be displayed when group is visually represented.
+		/// </summary>
+        [Browsable(true), DevCoBrowsable(true), DefaultValue(""), Localizable(true)]
+		public string GroupTitle
+		{
+			get {return m_GroupTitle;}
+			set
+			{
+				m_GroupTitle=value;
+				if(this.DesignMode && m_ParentRibbonStrip!=null)
+				{
+					m_ParentRibbonStrip.RecalcLayout();
+				}
+			}
+		}
+
+		private void StyleChanged(object sender, EventArgs e)
+		{
+			if(m_ParentRibbonStrip!=null)
+				m_ParentRibbonStrip.Refresh();
+		}
+		
+		/// <summary>
+		/// Gets or sets parent ribbon strip for this group.
+		/// </summary>
+		[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden),Browsable(false)]
+		internal RibbonStrip ParentRibbonStrip
+		{
+			get {return m_ParentRibbonStrip;}
+			set
+			{
+				m_ParentRibbonStrip=value;
+				if(m_ParentRibbonStrip!=null)
+					m_Style.SetColorScheme(m_ParentRibbonStrip.ColorScheme);
+			}
+		}
+
+		public override string ToString()
+		{
+			if(m_GroupTitle.Length>0)
+				return m_GroupTitle;
+			return base.ToString ();
+		}
+
+		/// <summary>
+		/// Gets or sets whether RibbonTabItem objects that belong to this group are visible. Setting this property will
+		/// show/hide all RibbonTabItem objects that are assigned to this group through RibbonTabItem.Group property.
+		/// </summary>
+		[Browsable(false),DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public bool Visible
+		{
+			get
+			{
+				if(m_ParentRibbonStrip==null)
+					return true;
+				bool visible=false;
+				foreach(BaseItem item in m_ParentRibbonStrip.Items)
+				{
+					if(item is RibbonTabItem)
+					{
+						RibbonTabItem tab=item as RibbonTabItem;
+						if(tab.Group == this && tab.Visible)
+						{
+							visible=true;
+							break;
+						}
+					}
+				}
+
+				return visible;
+			}
+			set
+			{
+				if(m_ParentRibbonStrip==null)
+					return;
+				foreach(BaseItem item in m_ParentRibbonStrip.Items)
+				{
+					if(item is RibbonTabItem)
+					{
+						RibbonTabItem tab=item as RibbonTabItem;
+						if(tab.Group==this)
+							tab.Visible=value;
+					}
+				}
+				m_ParentRibbonStrip.RecalcLayout();
+			}
+		}
+
+        /// <summary>
+        /// Gets whether any tab from this tab group is selected.
+        /// </summary>
+        [Browsable(false)]
+        public bool IsTabFromGroupSelected
+        {
+            get
+            {
+                if(m_ParentRibbonStrip==null)
+					return false;
+				foreach(BaseItem item in m_ParentRibbonStrip.Items)
+				{
+					if(item is RibbonTabItem)
+					{
+						RibbonTabItem tab=item as RibbonTabItem;
+                        if (tab.Group == this && tab.Checked)
+                            return true;
+					}
+				}
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// Selected first tab that is part of this group.
+        /// </summary>
+        public void SelectFirstTab()
+        {
+            if (m_ParentRibbonStrip == null)
+                return;
+            foreach (BaseItem item in m_ParentRibbonStrip.Items)
+            {
+                if (item is RibbonTabItem)
+                {
+                    RibbonTabItem tab = item as RibbonTabItem;
+                    if (tab.Group == this && tab.Visible)
+                    {
+                        tab.Checked = true;
+                        break;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets name of the group that can be used to identify item from the code.
+        /// </summary>
+        [Browsable(false), Category("Design"), Description("Indicates the name used to identify the group.")]
+        public string Name
+        {
+            get
+            {
+                if (this.Site != null)
+                    m_Name = this.Site.Name;
+                return m_Name;
+            }
+            set
+            {
+                if (this.Site != null)
+                    this.Site.Name = value;
+                if (value == null)
+                    m_Name = "";
+                else
+                    m_Name = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets an array of Rectangle objects that describe the visual position on the ribbon control of the group titles displayed.
+        /// If tabs that belong to a tab group are not next to each other then there will be multiple rectangle returned as part of the array
+        /// for each tab group that is apart.
+        /// </summary>
+        [Browsable(false)]
+        public Rectangle[] TitleBounds
+        {
+            get
+            {
+                return (Rectangle[])DisplayPositions.ToArray(typeof(Rectangle));
+            }
+        }
+		#endregion
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/Ribbon/RibbonTabItemGroupCollection.cs b/PROMS/DotNetBar Source Code/Ribbon/RibbonTabItemGroupCollection.cs
new file mode 100644
index 00000000..ed8f29a7
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Ribbon/RibbonTabItemGroupCollection.cs	
@@ -0,0 +1,151 @@
+using System;
+using System.Collections;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Collection of RibbonTabItemGroup objects.
+	/// </summary>
+	public class RibbonTabItemGroupCollection:CollectionBase
+	{
+		#region Private Variables and Events
+		public event EventHandler GroupRemoved;
+		public event EventHandler GroupAdded;
+		private RibbonStrip m_Owner=null;
+		#endregion
+
+		#region Internal Implementation
+		/// <summary>
+		/// Adds new object to the collection.
+		/// </summary>
+		/// <param name="tab">Object to add.</param>
+		/// <returns>Index of newly added object.</returns>
+		public int Add(RibbonTabItemGroup tab)
+		{
+			return List.Add(tab);
+		}
+
+		/// <summary>
+		/// Adds new objects to the collection.
+		/// </summary>
+		/// <param name="groups">Array of groups to add.</param>
+		public void AddRange(RibbonTabItemGroup[] groups)
+		{
+			foreach(RibbonTabItemGroup doc in groups)
+				List.Add(doc);
+		}
+
+		/// <summary>
+		/// Returns reference to the object in collection based on it's index.
+		/// </summary>
+		public RibbonTabItemGroup this[int index]
+		{
+			get {return (RibbonTabItemGroup)(List[index]);}
+			set {List[index] = value;}
+		}
+
+        /// <summary>
+        /// Returns reference to the object in collection based on it's name.
+        /// </summary>
+        public RibbonTabItemGroup this[string name]
+        {
+            get
+            {
+                foreach (RibbonTabItemGroup g in this.List)
+                {
+                    if (g.Name == name)
+                        return g;
+                }
+                return null;
+            }
+        }
+
+		/// <summary>
+		/// Inserts new object into the collection.
+		/// </summary>
+		/// <param name="index">Position of the object.</param>
+		/// <param name="value">Object to insert.</param>
+		public void Insert(int index, RibbonTabItemGroup value) 
+		{
+			List.Insert(index, value);
+		}
+
+		/// <summary>
+		/// Returns index of the object inside of the collection.
+		/// </summary>
+		/// <param name="value">Reference to the object.</param>
+		/// <returns>Index of the object.</returns>
+		public int IndexOf(RibbonTabItemGroup value) 
+		{
+			return List.IndexOf(value);
+		}
+
+		/// <summary>
+		/// Returns whether collection contains specified object.
+		/// </summary>
+		/// <param name="value">Object to look for.</param>
+		/// <returns>true if object is part of the collection, otherwise false.</returns>
+		public bool Contains(RibbonTabItemGroup value) 
+		{
+			return List.Contains(value);
+		}
+
+		/// <summary>
+		/// Removes specified object from the collection.
+		/// </summary>
+		/// <param name="value"></param>
+		public void Remove(RibbonTabItemGroup value) 
+		{
+			List.Remove(value);
+		}
+
+		protected override void OnRemoveComplete(int index,object value)
+		{
+			base.OnRemoveComplete(index,value);
+			RibbonTabItemGroup item=value as RibbonTabItemGroup;
+			item.ParentRibbonStrip=null;
+			if(GroupRemoved!=null)
+				GroupRemoved(item,new EventArgs());
+		}
+		protected override void OnInsertComplete(int index,object value)
+		{
+			base.OnInsertComplete(index,value);
+			RibbonTabItemGroup item=value as RibbonTabItemGroup;
+			if(m_Owner!=null)
+				item.ParentRibbonStrip=m_Owner;
+			if(GroupAdded!=null)
+				GroupAdded(item,new EventArgs());
+		}
+
+		/// <summary>
+		/// Copies collection into the specified array.
+		/// </summary>
+		/// <param name="array">Array to copy collection to.</param>
+		/// <param name="index">Starting index.</param>
+		public void CopyTo(RibbonTabItemGroup[] array, int index) 
+		{
+			List.CopyTo(array, index);
+		}
+
+		/// <summary>
+		/// Copies contained items to the RibbonTabItemGroup array.
+		/// </summary>
+		/// <param name="array">Array to copy to.</param>
+		internal void CopyTo(RibbonTabItemGroup[] array)
+		{
+			List.CopyTo(array,0);
+		}
+
+		internal RibbonStrip Owner
+		{
+			get {return m_Owner;}
+			set {m_Owner=value;}
+		}
+
+		protected override void OnClear()
+		{
+			base.OnClear();
+		}
+		#endregion
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/Ribbon/RibbonTabItemRendererEventArgs.cs b/PROMS/DotNetBar Source Code/Ribbon/RibbonTabItemRendererEventArgs.cs
new file mode 100644
index 00000000..9342fe34
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Ribbon/RibbonTabItemRendererEventArgs.cs	
@@ -0,0 +1,54 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Provides data for ButtonItem rendering.
+    /// </summary>
+    public class RibbonTabItemRendererEventArgs
+    {
+        /// <summary>
+        /// Gets or sets Graphics object group is rendered on.
+        /// </summary>
+        public Graphics Graphics = null;
+        /// <summary>
+        /// Gets the reference to ButtonItem instance being rendered.
+        /// </summary>
+        public RibbonTabItem RibbonTabItem = null;
+
+        /// <summary>
+        /// Reference to internal data.
+        /// </summary>
+        internal ItemPaintArgs ItemPaintArgs = null;
+
+        /// <summary>
+        /// Creates new instance of the object.
+        /// </summary>
+        public RibbonTabItemRendererEventArgs() { }
+
+        /// <summary>
+        /// Creates new instance of the object and initializes it with default values
+        /// </summary>
+        /// <param name="g">Reference to Graphics object.</param>
+        /// <param name="button">Reference to ButtonItem object.</param>
+        public RibbonTabItemRendererEventArgs(Graphics g, RibbonTabItem button)
+        {
+            this.Graphics = g;
+            this.RibbonTabItem = button;
+        }
+
+        /// <summary>
+        /// Creates new instance of the object and initializes it with default values
+        /// </summary>
+        /// <param name="g">Reference to Graphics object.</param>
+        /// <param name="button">Reference to ButtonItem object.</param>
+        internal RibbonTabItemRendererEventArgs(Graphics g, RibbonTabItem button, ItemPaintArgs pa)
+        {
+            this.Graphics = g;
+            this.RibbonTabItem = button;
+            this.ItemPaintArgs = pa;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Ribbon/SimpleElement.cs b/PROMS/DotNetBar Source Code/Ribbon/SimpleElement.cs
new file mode 100644
index 00000000..e9d146cc
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Ribbon/SimpleElement.cs	
@@ -0,0 +1,125 @@
+using System;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Summary description for SimpleElement.
+	/// </summary>
+	internal class SimpleElement:ISimpleElement
+	{
+		#region Private Variables
+		private Rectangle m_Bounds=Rectangle.Empty;
+		private Rectangle m_ImageBounds=Rectangle.Empty;
+		private Rectangle m_TextBounds=Rectangle.Empty;
+		private Image m_Image=null;
+		private eSimplePartAlignment m_ImageAlignment=eSimplePartAlignment.NearCenter;
+		private string m_Text="";
+		private int m_FixedWidth=0;
+		#endregion
+
+		#region ISimpleElement Members
+
+		public int FixedWidth
+		{
+			get
+			{
+				return m_FixedWidth;
+			}
+			set
+			{
+				m_FixedWidth=value;
+			}
+		}
+
+		public bool ImageVisible
+		{
+			get
+			{
+				return m_Image!=null;
+			}
+		}
+
+		public System.Drawing.Size ImageLayoutSize
+		{
+			get
+			{
+				if(m_Image==null)
+					return Size.Empty;
+				return m_Image.Size;
+			}
+		}
+
+		public DevComponents.DotNetBar.eSimplePartAlignment ImageAlignment
+		{
+			get
+			{
+				return m_ImageAlignment;
+			}
+			set
+			{
+				m_ImageAlignment=value;
+			}
+		}
+
+		public int ImageTextSpacing
+		{
+			get
+			{
+				return 1;
+			}
+		}
+
+		public bool TextVisible
+		{
+			get
+			{
+				return true;
+			}
+		}
+
+		public string Text
+		{
+			get
+			{
+				return m_Text;
+			}
+			set
+			{
+				m_Text=value;
+			}
+		}
+
+		public Rectangle Bounds
+		{
+			get { return m_Bounds; }
+			set { m_Bounds=value; }
+		}
+
+		public Rectangle TextBounds
+		{
+			get { return m_TextBounds; }
+			set { m_TextBounds=value; }
+		}
+
+		public Rectangle ImageBounds
+		{
+			get { return m_ImageBounds; }
+			set { m_ImageBounds=value; }
+		}
+
+		public System.Drawing.Image Image
+		{
+			get { return m_Image; }
+			set { m_Image=value; }
+		}
+
+        private Size _TextSize;
+        public Size TextSize
+        {
+            get { return _TextSize; }
+            set { _TextSize = value; }
+        }
+		#endregion
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/Ribbon/SimpleElementLayout.cs b/PROMS/DotNetBar Source Code/Ribbon/SimpleElementLayout.cs
new file mode 100644
index 00000000..c6d24507
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Ribbon/SimpleElementLayout.cs	
@@ -0,0 +1,359 @@
+using System;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Summary description for SimpleElementLayout.
+	/// </summary>
+	internal class SimpleElementLayout
+	{
+        internal static void LayoutSimpleElement(SimpleElementLayoutInfo info)
+        {
+            Size textsize = Size.Empty;
+            Font font = info.Font;
+            int height = 0;
+            if (info.LayoutStyle.Font != null)
+                font = info.LayoutStyle.Font;
+
+            // Calculate Text Width and Height
+            string text = info.Element.Text;
+            if (info.Element.FixedWidth == 0)
+            {
+                if (info.Element.TextVisible)
+                {
+                    if (!string.IsNullOrEmpty(text))
+                    {
+                        textsize = TextDrawing.MeasureString(info.Graphics, text, font);
+                        //textSize=info.Graphics.MeasureString(text,font);
+                        if (info.LayoutStyle != null && !info.LayoutStyle.TextShadowColor.IsEmpty && !info.LayoutStyle.TextShadowOffset.IsEmpty)
+                            textsize.Height += info.LayoutStyle.TextShadowOffset.Y;
+                        info.Element.TextSize = textsize;
+                    }
+                }
+            }
+            else
+            {
+                int availTextWidth = info.Element.FixedWidth -
+                    ElementStyleLayout.HorizontalStyleWhiteSpace(info.LayoutStyle);
+
+                if (info.Element.ImageVisible)
+                    availTextWidth -= info.Element.ImageLayoutSize.Width;
+
+                if (info.Element.TextVisible)
+                {
+                    int elementHeight = font.Height;
+                    if (info.LayoutStyle != null && !info.LayoutStyle.TextShadowColor.IsEmpty && !info.LayoutStyle.TextShadowOffset.IsEmpty)
+                        elementHeight += info.LayoutStyle.TextShadowOffset.Y;
+
+                    if (info.LayoutStyle.WordWrap)
+                    {
+                        elementHeight = info.LayoutStyle.MaximumHeight - info.LayoutStyle.MarginTop -
+                                      info.LayoutStyle.MarginBottom - info.LayoutStyle.PaddingTop - info.LayoutStyle.PaddingBottom;
+                        if (availTextWidth > 0)
+                        {
+                            if (elementHeight > 0)
+                            {
+                                textsize = TextDrawing.MeasureString(info.Graphics, text, font,
+                                    new Size(availTextWidth, elementHeight), info.LayoutStyle.TextFormat);
+                            }
+                            else
+                                textsize = TextDrawing.MeasureString(info.Graphics, text, font, availTextWidth, info.LayoutStyle.TextFormat);
+                            info.Element.TextSize = textsize;
+                        }
+                    }
+                    else
+                    {
+                        if (!string.IsNullOrEmpty(text))
+                            info.Element.TextSize = TextDrawing.MeasureString(info.Graphics, text, font);
+                        textsize = new Size(availTextWidth, elementHeight);
+                    }
+                }
+            }
+
+            if (info.Element.TextVisible && !info.LayoutStyle.TextShadowColor.IsEmpty)
+            {
+                textsize.Height += info.LayoutStyle.TextShadowOffset.Y;
+            }
+            height = textsize.Height;
+
+            if (info.VerticalPartAlignment)
+            {
+                if (info.Element.ImageVisible && info.Element.ImageLayoutSize.Height > 0)
+                    height += info.Element.ImageLayoutSize.Height;
+            }
+            else
+            {
+                if (info.Element.ImageVisible && info.Element.ImageLayoutSize.Height > height)
+                    height = info.Element.ImageLayoutSize.Height;
+            }
+
+            Rectangle r = new Rectangle(info.Left + ElementStyleLayout.LeftWhiteSpace(info.LayoutStyle),
+                info.Top + ElementStyleLayout.TopWhiteSpace(info.LayoutStyle)
+                , info.Element.FixedWidth - ElementStyleLayout.HorizontalStyleWhiteSpace(info.LayoutStyle), height);
+
+            if (r.Width == 0)
+            {
+                if (info.VerticalPartAlignment)
+                {
+                    if (info.Element.TextVisible)
+                        r.Width = textsize.Width;
+                    if (info.Element.ImageVisible && info.Element.ImageLayoutSize.Width > r.Width)
+                        r.Width = (info.Element.ImageLayoutSize.Width + info.Element.ImageTextSpacing);
+                }
+                else
+                {
+                    if (info.Element.TextVisible)
+                        r.Width = textsize.Width;
+                    if (info.Element.ImageVisible && info.Element.ImageLayoutSize.Width > 0)
+                        r.Width += (info.Element.ImageLayoutSize.Width + info.Element.ImageTextSpacing);
+                }
+            }
+
+            // Now that we have element bounds store them
+            Rectangle rElementBounds = new Rectangle(info.Left, info.Top, info.Element.FixedWidth, r.Height + info.LayoutStyle.MarginTop + info.LayoutStyle.MarginBottom + info.LayoutStyle.PaddingTop + info.LayoutStyle.PaddingBottom);
+            if (rElementBounds.Width == 0)
+                rElementBounds.Width = r.Width + ElementStyleLayout.HorizontalStyleWhiteSpace(info.LayoutStyle);
+            info.Element.Bounds = rElementBounds;
+
+            // Set Position of the image
+            if (info.Element.ImageVisible && !info.Element.ImageLayoutSize.IsEmpty)
+            {
+                eVerticalAlign va = GetImageVerticalAlign(info.Element.ImageAlignment);
+                eHorizontalAlign ha = GetImageHorizontalAlign(info.Element.ImageAlignment, info.LeftToRight);
+                if (info.VerticalPartAlignment)
+                    info.Element.ImageBounds = AlignContentVertical(info.Element.ImageLayoutSize, ref r, ha, va, info.Element.ImageTextSpacing);
+                else
+                    info.Element.ImageBounds = AlignContent(info.Element.ImageLayoutSize, ref r, ha, va, info.Element.ImageTextSpacing);
+            }
+            else
+                info.Element.ImageBounds = Rectangle.Empty;
+
+
+            // Set position of the text
+            if (!textsize.IsEmpty)
+                info.Element.TextBounds = r;
+            else
+                info.Element.TextBounds = Rectangle.Empty;
+
+        }
+
+		private static Rectangle AlignContent(System.Drawing.Size contentSize, ref Rectangle boundingRectangle, eHorizontalAlign horizAlign, eVerticalAlign vertAlign, int contentSpacing)
+		{
+			Rectangle contentRect=new Rectangle(Point.Empty,contentSize);
+			switch(horizAlign)
+			{
+				case eHorizontalAlign.Right:
+				{
+					contentRect.X=boundingRectangle.Right-contentRect.Width;
+					boundingRectangle.Width-=(contentRect.Width+contentSpacing);
+					break;
+				}
+					//case eHorizontalAlign.Left:
+				default:
+				{
+					contentRect.X=boundingRectangle.X;
+					boundingRectangle.X=contentRect.Right+contentSpacing;
+					boundingRectangle.Width-=(contentRect.Width+contentSpacing);
+					break;
+				}
+					//				case eHorizontalAlign.Center:
+					//				{
+					//					contentRect.X=boundingRectangle.X+(boundingRectangle.Width-contentRect.Width)/2;
+					//					break;
+					//				}
+			}
+
+			switch(vertAlign)
+			{
+				case eVerticalAlign.Top:
+				{
+					contentRect.Y=boundingRectangle.Y;
+					break;
+				}
+				case eVerticalAlign.Middle:
+				{
+					contentRect.Y=boundingRectangle.Y+(boundingRectangle.Height-contentRect.Height)/2;
+					break;
+				}
+				case eVerticalAlign.Bottom:
+				{
+					contentRect.Y=boundingRectangle.Bottom-contentRect.Height;
+					break;
+				}
+			}
+
+			return contentRect;
+		}
+
+		private static Rectangle AlignContentVertical(System.Drawing.Size contentSize, ref Rectangle boundingRectangle, eHorizontalAlign horizAlign, eVerticalAlign vertAlign, int contentSpacing)
+		{
+			Rectangle contentRect=new Rectangle(Point.Empty,contentSize);
+			switch(horizAlign)
+			{
+				case eHorizontalAlign.Left:
+				{
+					contentRect.X=boundingRectangle.X;
+					break;
+				}
+				case eHorizontalAlign.Right:
+				{
+					contentRect.X=boundingRectangle.Right-contentRect.Width;
+					break;
+				}
+				case eHorizontalAlign.Center:
+				{
+					contentRect.X=boundingRectangle.X+(boundingRectangle.Width-contentRect.Width)/2;
+					break;
+				}
+			}
+
+			switch(vertAlign)
+			{
+				case eVerticalAlign.Bottom:
+				{
+					contentRect.Y=boundingRectangle.Bottom-contentRect.Height;
+					boundingRectangle.Height-=(contentRect.Height+contentSpacing);
+					break;
+				}
+					//case eVerticalAlign.Top:
+				default:
+				{
+					contentRect.Y=boundingRectangle.Y;
+					boundingRectangle.Y=contentRect.Bottom+contentSpacing;
+					boundingRectangle.Height-=(contentRect.Height+contentSpacing);
+					break;
+				}
+					//				case eVerticalAlign.Middle:
+					//				{
+					//					contentRect.Y=boundingRectangle.Y+(boundingRectangle.Height-contentRect.Height)/2;
+					//					break;
+					//				}
+			}
+
+			return contentRect;
+		}
+
+		private static eHorizontalAlign GetImageHorizontalAlign(eSimplePartAlignment align, bool leftToRight)
+		{
+			if(((align==eSimplePartAlignment.NearBottom || align==eSimplePartAlignment.NearCenter ||
+				align==eSimplePartAlignment.NearTop) && leftToRight) ||
+				((align==eSimplePartAlignment.FarBottom || align==eSimplePartAlignment.FarCenter ||
+				align==eSimplePartAlignment.FarTop) && !leftToRight))
+				return eHorizontalAlign.Left;
+			else if(align==eSimplePartAlignment.CenterBottom || align==eSimplePartAlignment.CenterTop)
+				return eHorizontalAlign.Center;
+			return eHorizontalAlign.Right;
+		}
+
+		private static eVerticalAlign GetImageVerticalAlign(eSimplePartAlignment align)
+		{
+			eVerticalAlign va=eVerticalAlign.Middle;
+
+			switch(align)
+			{
+				case eSimplePartAlignment.FarBottom:
+				case eSimplePartAlignment.NearBottom:
+				case eSimplePartAlignment.CenterBottom:
+					va=eVerticalAlign.Bottom;
+					break;
+				case eSimplePartAlignment.FarTop:
+				case eSimplePartAlignment.NearTop:
+				case eSimplePartAlignment.CenterTop:
+					va=eVerticalAlign.Top;
+					break;
+			}
+
+			return va;
+		}
+
+		/// <summary>
+		/// Indicates absolute vertical alignment of the content.
+		/// </summary>
+		private enum eVerticalAlign
+		{
+			/// <summary>
+			/// Content is aligned to the top
+			/// </summary>
+			Top,
+			/// <summary>
+			/// Content is aligned in the middle
+			/// </summary>
+			Middle,
+			/// <summary>
+			/// Content is aligned at the bottom
+			/// </summary>
+			Bottom
+		}
+
+		/// <summary>
+		/// Indicates absolute horizontal alignment
+		/// </summary>
+		private enum eHorizontalAlign
+		{
+			/// <summary>
+			/// Content is left aligned
+			/// </summary>
+			Left,
+			/// <summary>
+			/// Content is centered
+			/// </summary>
+			Center,
+			/// <summary>
+			/// Content is right aligned
+			/// </summary>
+			Right
+		}
+	}
+
+	/// <summary>Indicates alignment of a part of the cell like image or check box in relation to the text.</summary>
+	public enum eSimplePartAlignment:int
+	{
+		/// <summary>
+		/// Part is aligned to the left center of the text assuming left-to-right
+		/// orientation.
+		/// </summary>
+		NearCenter=0,
+		/// <summary>
+		/// Part is aligned to the right center of the text assuming left-to-right
+		/// orientation.
+		/// </summary>
+		FarCenter=1,
+		/// <summary>
+		/// Part is aligned to the top left of the text assuming left-to-right
+		/// orientation.
+		/// </summary>
+		NearTop=2,
+		/// <summary>Part is aligned above the text and centered.</summary>
+		CenterTop=3,
+		/// <summary>
+		/// Part is aligned to the top right of the text assuming left-to-right
+		/// orientation.
+		/// </summary>
+		FarTop=4,
+		/// <summary>
+		/// Part is aligned to the bottom left of the text assuming left-to-right
+		/// orientation.
+		/// </summary>
+		NearBottom=5,
+		/// <summary>Part is aligned below the text and centered.</summary>
+		CenterBottom=6,
+		/// <summary>
+		/// Part is aligned to the bottom right of the text assuming left-to-right
+		/// orientation.
+		/// </summary>
+		FarBottom=7
+	}
+
+	internal class SimpleElementLayoutInfo
+	{
+		public ISimpleElement Element=null;
+		public System.Drawing.Graphics Graphics=null;
+		public System.Drawing.Font Font=null;
+		public int Left=0;
+		public int Top=0;
+		public ElementStyle LayoutStyle=null;
+		public bool LeftToRight=true;
+		public bool VerticalPartAlignment=false;
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/Ribbon/SimpleNodeDisplay.cs b/PROMS/DotNetBar Source Code/Ribbon/SimpleNodeDisplay.cs
new file mode 100644
index 00000000..f772c3ed
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Ribbon/SimpleNodeDisplay.cs	
@@ -0,0 +1,96 @@
+using System;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Summary description for SimpleNodeDisplay.
+	/// </summary>
+	internal class SimpleNodeDisplay
+	{
+		public static void Paint(SimpleNodeDisplayInfo di)
+		{
+			Rectangle r=di.Element.Bounds;
+			//di.Graphics.SetClip(r);
+
+            Region oldClip = di.Graphics.Clip;
+            if (oldClip != null)
+                di.Graphics.SetClip(r, CombineMode.Intersect);
+            else
+                di.Graphics.SetClip(r, CombineMode.Replace);
+
+
+			//r.Inflate(1,1);
+			ElementStyleDisplayInfo displayInfo=new ElementStyleDisplayInfo(di.Style,di.Graphics,r);
+			ElementStyleDisplay.Paint(displayInfo);
+			di.Graphics.ResetClip();
+
+			if(di.Element.ImageVisible)
+				SimpleNodeDisplay.PaintImage(di);
+			if(di.Element.TextVisible)
+			{
+				displayInfo.Bounds=(di.TextBounds.IsEmpty?di.Element.TextBounds:di.TextBounds);
+                eTextFormat format = di.Style.TextFormat;
+                if (di.RightToLeft)
+                    format |= eTextFormat.RightToLeft;
+				ElementStyleDisplay.PaintText(displayInfo,di.Element.Text,di.Font, false, format);
+			}
+
+            if (oldClip != null)
+                di.Graphics.Clip = oldClip;
+            else
+                di.Graphics.ResetClip();
+		}
+
+		private static void PaintImage(SimpleNodeDisplayInfo di)
+		{
+			if(di.Element.ImageLayoutSize.IsEmpty || di.Element.Image==null)
+				return;
+			Rectangle r=di.Element.ImageBounds;
+
+			di.Graphics.DrawImage(di.Element.Image,r.X+(r.Width-di.Element.Image.Width)/2,
+				r.Y+(r.Height-di.Element.Image.Height)/2);
+		}
+
+//		private static void PaintText(SimpleNodeDisplayInfo di)
+//		{
+//			ISimpleElement e=di.Element;
+//			if(e.Text=="" || e.TextBounds.IsEmpty || di.Style.TextColor.IsEmpty)
+//				return;
+//
+//			Rectangle bounds=e.TextBounds;
+//			
+//			Font font=di.Style.Font;
+//			if(font==null)
+//				font=di.Font;
+//
+//			using(SolidBrush brush=new SolidBrush(di.Style.TextColor))
+//			{
+//				di.Graphics.DrawString(e.Text,font,brush,bounds,di.Style.StringFormat);
+//			}
+//		}
+	}
+
+	/// <summary>
+	/// Represents information neccessary to paint the cell on canvas.
+	/// </summary>
+	internal class SimpleNodeDisplayInfo
+	{
+		public ElementStyle Style=null;
+		public System.Drawing.Graphics Graphics=null;
+		public ISimpleElement Element=null;
+		public System.Drawing.Font Font=null;
+		public Rectangle TextBounds=Rectangle.Empty;
+        public bool RightToLeft = false;
+
+		public SimpleNodeDisplayInfo(ElementStyle style, System.Drawing.Graphics g, ISimpleElement elem, Font font, bool rightToLeft)
+		{
+			this.Style=style;
+			this.Graphics=g;
+			this.Element=elem;
+			this.Font=font;
+            this.RightToLeft = rightToLeft;
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/Ribbon/SliderItem.cs b/PROMS/DotNetBar Source Code/Ribbon/SliderItem.cs
new file mode 100644
index 00000000..873dc10a
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Ribbon/SliderItem.cs	
@@ -0,0 +1,1159 @@
+using System;
+using System.Text;
+using System.ComponentModel;
+using System.Drawing;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.Rendering;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represents the slider item which allows you to select a value from predefined range.
+    /// </summary>
+    [Browsable(false), Designer("DevComponents.DotNetBar.Design.SimpleItemDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+    public class SliderItem : BaseItem
+    {
+        #region Private Variables
+        private int m_Maximum = 100;
+        private int m_Minimum = 0;
+        private int m_Value = 0;
+        private int m_Step = 1;
+        private bool m_LabelVisible = true;
+        private int m_Width = 136;
+        private int m_LabelWidth = 38;
+        private eSliderLabelPosition m_LabelPosition = eSliderLabelPosition.Left;
+        private eSliderPart m_MouseOverPart = eSliderPart.None;
+        private eSliderPart m_MouseDownPart = eSliderPart.None;
+        private int m_ButtonSize = 18;
+        private Size m_SlideSize = new Size(11, 15);
+        private bool m_TrackMarker = true;
+        private Color m_TextColor = Color.Empty;
+        private string m_DecreaseTooltip = "";
+        private string m_IncreaseTooltip = "";
+        private string m_ItemTooltip = "";
+        #endregion
+
+        #region Events
+        /// <summary>
+        /// Occurs after Value property has changed.
+        /// </summary>
+        public event EventHandler ValueChanged;
+
+        /// <summary>
+        /// Occurs before Value property has changed.
+        /// </summary>
+        public event CancelIntValueEventHandler ValueChanging;
+        /// <summary>
+        /// Occurs when Increase button is clicked using mouse.
+        /// </summary>
+        public event EventHandler IncreaseButtonClick;
+        /// <summary>
+        /// Occurs when Decrease button is clicked using mouse.
+        /// </summary>
+        public event EventHandler DecreaseButtonClick;
+        #endregion
+
+        #region Constructor, Copy
+        /// <summary>
+        /// Creates new instance of SliderItem.
+		/// </summary>
+		public SliderItem():this("","") {}
+		/// <summary>
+        /// Creates new instance of SliderItem and assigns the name to it.
+		/// </summary>
+		/// <param name="sItemName">Item name.</param>
+		public SliderItem(string sItemName):this(sItemName,"") {}
+		/// <summary>
+        /// Creates new instance of SliderItem and assigns the name and text to it.
+		/// </summary>
+		/// <param name="sItemName">Item name.</param>
+		/// <param name="ItemText">item text.</param>
+        public SliderItem(string sItemName, string ItemText)
+            : base(sItemName, ItemText)
+        {
+            this.ClickRepeatInterval = 200;
+            this.MouseUpNotification = true;
+            this.MouseDownCapture = true;
+        }
+
+        /// <summary>
+        /// Returns copy of the item.
+        /// </summary>
+        public override BaseItem Copy()
+        {
+            SliderItem objCopy = new SliderItem(m_Name);
+            this.CopyToItem(objCopy);
+            return objCopy;
+        }
+
+        /// <summary>
+        /// Copies the SliderItem specific properties to new instance of the item.
+        /// </summary>
+        /// <param name="copy">New SliderItem instance.</param>
+        internal void InternalCopyToItem(SliderItem copy)
+        {
+            CopyToItem(copy);
+        }
+
+        /// <summary>
+        /// Copies the SliderItem specific properties to new instance of the item.
+        /// </summary>
+        /// <param name="copy">New SliderItem instance.</param>
+        protected override void CopyToItem(BaseItem copy)
+        {
+            SliderItem c = copy as SliderItem;
+            base.CopyToItem(c);
+
+            c.Maximum = this.Maximum;
+            c.Minimum = this.Minimum;
+            c.Value = this.Value;
+            c.Text = this.Text;
+            c.LabelWidth = this.LabelWidth;
+            c.LabelVisible = this.LabelVisible;
+            c.LabelPosition = this.LabelPosition;
+            c.Width = this.Width;
+            c.IncreaseButtonClick = this.IncreaseButtonClick;
+            c.DecreaseButtonClick = this.DecreaseButtonClick;
+            c.ValueChanged = this.ValueChanged;
+            c.ValueChanging = this.ValueChanging;
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            DisposeClickTimer();
+            base.Dispose(disposing);
+        }
+        #endregion
+
+        #region Internal Implementation
+        public override void Paint(ItemPaintArgs p)
+        {
+            Rendering.BaseRenderer renderer = p.Renderer;
+            if (renderer != null)
+            {
+                SliderItemRendererEventArgs e = new SliderItemRendererEventArgs(this, p.Graphics);
+                e.ItemPaintArgs = p;
+                renderer.DrawSliderItem(e);
+            }
+            else
+            {
+                Rendering.SliderPainter painter = PainterFactory.CreateSliderPainter(this);
+                if (painter != null)
+                {
+                    SliderItemRendererEventArgs e = new SliderItemRendererEventArgs(this, p.Graphics);
+                    e.ItemPaintArgs = p;
+                    painter.Paint(e);
+                }
+            }
+
+            if (this.DesignMode && this.Focused)
+            {
+                Rectangle r = m_Rect;
+                r.Inflate(-1, -1);
+                DesignTime.DrawDesignTimeSelection(p.Graphics, r, p.Colors.ItemDesignTimeBorder);
+            }
+        }
+
+        public override void RecalcSize()
+        {
+            Font font = GetFont(null);
+            int sliderHeight = Dpi.Height(m_ButtonSize);
+
+            Size sz = new Size(Dpi.Width(m_Width), sliderHeight);
+
+            Control objCtrl = this.ContainerControl as Control;
+            if (objCtrl == null || objCtrl.Disposing || objCtrl.IsDisposed)
+                return;
+            Graphics g = BarFunctions.CreateGraphics(objCtrl);
+            if (g == null) return;
+            try
+            {
+                if (m_LabelVisible)
+                {
+                    Size textSize = ButtonItemLayout.MeasureItemText(this, g, sz.Width, font, eTextFormat.Default, this.IsRightToLeft);
+                    if (m_LabelPosition == eSliderLabelPosition.Left || m_LabelPosition == eSliderLabelPosition.Right)
+                    {
+                        sz.Height = Math.Max(sliderHeight, Math.Max(textSize.Height, font.Height));
+                        sz.Width += Dpi.Width(m_LabelWidth);
+                    }
+                    else
+                    {
+                        sz.Height = sliderHeight + Math.Max(textSize.Height, font.Height);
+                    }
+                }
+                if (_SliderOrientation == eOrientation.Vertical)
+                    sz = new Size(sz.Height, sz.Width);
+
+                m_Rect.Size = sz;
+                UpdateLayout();
+
+                base.RecalcSize();
+            }
+            finally
+            {
+                g.Dispose();
+            }
+        }
+
+        public eSliderPart HitTest(int x, int y)
+        {
+            eSliderPart mo = eSliderPart.None;
+
+            Rectangle r = this.DecreaseBounds;
+            r.Offset(this.Bounds.Location);
+            if (r.Contains(x, y))
+                mo = eSliderPart.DecreaseButton;
+            else
+            {
+                r = this.IncreaseBounds;
+                r.Offset(this.Bounds.Location);
+                if (r.Contains(x, y))
+                    mo = eSliderPart.IncreaseButton;
+                else
+                {
+                    // Commented out to allow wider selection area for touch input
+                    //r = this.SlideBounds;
+                    //r.Offset(this.Bounds.Location);
+                    r = this.Bounds;
+                    if (r.Contains(x, y))
+                        mo = eSliderPart.TrackArea;
+                }
+            }
+
+            return mo;
+        }
+
+        public override void InternalMouseMove(System.Windows.Forms.MouseEventArgs objArg)
+        {
+            if (this.GetEnabled() && !this.DesignMode)
+            {
+                if (this.MouseDownPart == eSliderPart.None)
+                {
+                    eSliderPart mo = HitTest(objArg.X, objArg.Y);
+
+                    if (MouseOverPart != mo)
+                        MouseOverPart = mo;
+                }
+                else if (this.MouseDownPart == eSliderPart.TrackArea)
+                {
+                    // Calculate and move the tracker to the position indicates by the mouse
+                    if(this.SliderOrientation == eOrientation.Horizontal)
+                        SetValue(GetValueFromX(objArg.X), eEventSource.Mouse);
+                    else
+                        SetValue(GetValueFromY(objArg.Y), eEventSource.Mouse);
+                }
+            }
+            base.InternalMouseMove(objArg);
+        }
+
+        public override void InternalMouseLeave()
+        {
+            if (m_MouseOverPart != eSliderPart.None)
+                MouseOverPart = eSliderPart.None;
+            DisposeClickTimer();
+            if (this.MouseDownPart != eSliderPart.None)
+                this.MouseDownPart = eSliderPart.None;
+
+            base.InternalMouseLeave();
+        }
+
+        private void DisposeClickTimer()
+        {
+            if (m_ClickTimer != null)
+            {
+                m_ClickTimer.Stop();
+                m_ClickTimer.Dispose();
+                m_ClickTimer = null;
+            }
+        }
+
+        /// <summary>
+        /// Raises the IncreaseButtonClick event.
+        /// </summary>
+        /// <param name="e">Provides event arguments</param>
+        protected virtual void OnIncreaseButtonClick(EventArgs e)
+        {
+            EventHandler handler = IncreaseButtonClick;
+            if (handler != null) handler(this, e);
+        }
+        /// <summary>
+        /// Raises the DecreaseButtonClick event.
+        /// </summary>
+        /// <param name="e">Provides event arguments</param>
+        protected virtual void OnDecreaseButtonClick(EventArgs e)
+        {
+            EventHandler handler = DecreaseButtonClick;
+            if (handler != null) handler(this, e);
+        }
+
+        private System.Windows.Forms.Timer m_ClickTimer = null;
+        public override void InternalMouseDown(System.Windows.Forms.MouseEventArgs objArg)
+        {
+            if (this.GetEnabled() && !this.DesignMode && objArg.Button == MouseButtons.Left)
+            {
+                eSliderPart mo = HitTest(objArg.X, objArg.Y);
+                this.MouseDownPart = mo;
+
+                if (this.MouseDownPart == eSliderPart.DecreaseButton)
+                {
+                    SetValue(this.Value - this.Step, eEventSource.Mouse);
+                    OnDecreaseButtonClick(EventArgs.Empty);
+                }
+                else if (this.MouseDownPart == eSliderPart.IncreaseButton)
+                {
+                    this.PerformStep(eEventSource.Mouse);
+                    OnIncreaseButtonClick(EventArgs.Empty);
+                }
+                else if (mo == eSliderPart.TrackArea)
+                {
+                    if (!m_TrackBounds.Contains(objArg.X, objArg.Y))
+                    {
+                        // Calculate and move the tracker to the position indicates by the mouse
+                        if (this.SliderOrientation == eOrientation.Horizontal)
+                            SetValue(GetValueFromX(objArg.X), eEventSource.Mouse);
+                        else
+                            SetValue(GetValueFromY(objArg.Y), eEventSource.Mouse);
+                    }
+                }
+
+                if (this.ClickRepeatInterval > 0 && (mo == eSliderPart.IncreaseButton || mo == eSliderPart.DecreaseButton))
+                {
+                    if (m_ClickTimer == null)
+                        m_ClickTimer = new Timer();
+                    m_ClickTimer.Interval = this.ClickRepeatInterval;
+                    m_ClickTimer.Tick += new EventHandler(this.ClickTimerTick);
+                    m_ClickTimer.Start();
+                }
+            }
+
+            base.InternalMouseDown(objArg);
+        }
+
+        private int GetValueFromX(int x)
+        {
+            x -= (m_SlideSize.Width - 2) / 2;
+            Rectangle r = this.SlideBounds;
+            r.Width -= m_SlideSize.Width;
+            r.Offset(this.DisplayRectangle.Location);
+            if (x <= r.X)
+            {
+                if (this.IsRightToLeft)
+                    return this.Maximum;
+                else
+                    return this.Minimum;
+            }
+            else if (x >= r.Right)
+            {
+                if (this.IsRightToLeft)
+                    return this.Minimum;
+                else
+                    return this.Maximum;
+            }
+
+            float f = (float)(x - r.X) / (float)(r.Right - r.X);
+            if (this.IsRightToLeft) f = 1 - f;
+            int v = this.Minimum + (int)((this.Maximum - this.Minimum) * f);
+
+            if (this.Step > 1)
+            {
+                if (Math.Ceiling((float)((v - this.Minimum) / (float)this.Step)) * this.Step != v - this.Minimum)
+                {
+                    v = this.Minimum + (int)Math.Ceiling((float)((v - this.Minimum) / (float)this.Step)) * this.Step;
+                }
+            }
+
+            return v;
+        }
+
+        private int GetValueFromY(int y)
+        {
+            y -= (m_SlideSize.Width - 2) / 2;
+            Rectangle r = this.SlideBounds;
+            r.Height -= m_SlideSize.Width;
+            r.Offset(this.DisplayRectangle.Location);
+            if (y <= r.Y)
+            {
+                return this.Maximum;
+            }
+            else if (y >= r.Bottom)
+            {
+                return this.Minimum;
+            }
+
+            float f = 1- (float)(y - r.Y) / (float)(r.Bottom - r.Y);
+            int v = this.Minimum + (int)((this.Maximum - this.Minimum) * f);
+
+            if (this.Step > 1)
+            {
+                if (Math.Ceiling((float)((v - this.Minimum) / (float)this.Step)) * this.Step != v - this.Minimum)
+                {
+                    v = this.Minimum + (int)Math.Ceiling((float)((v - this.Minimum) / (float)this.Step)) * this.Step;
+                }
+            }
+
+            return v;
+        }
+
+        private void ClickTimerTick(object sender, EventArgs e)
+        {
+            if (this.MouseDownPart == eSliderPart.DecreaseButton)
+            {
+                SetValue(this.Value - this.Step, eEventSource.Mouse);
+                OnDecreaseButtonClick(EventArgs.Empty);
+            }
+            else if (this.MouseDownPart == eSliderPart.IncreaseButton)
+            {
+                this.PerformStep(eEventSource.Mouse);
+                OnIncreaseButtonClick(EventArgs.Empty);
+            }
+        }
+
+        public override void InternalMouseUp(System.Windows.Forms.MouseEventArgs objArg)
+        {
+            DisposeClickTimer();
+            if(this.MouseDownPart!= eSliderPart.None)
+                this.MouseDownPart = eSliderPart.None;
+            base.InternalMouseUp(objArg);
+        }
+
+        /// <summary>
+        /// Gets or sets the slider mouse over part.
+        /// </summary>
+        internal eSliderPart MouseOverPart
+        {
+            get { return m_MouseOverPart; }
+            set
+            {
+                m_MouseOverPart = value;
+                UpdateTooltip();
+                this.Refresh();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the slider part that mouse is pressed over. This property should not be modified and it is for internal usage only.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public eSliderPart MouseDownPart
+        {
+            get { return m_MouseDownPart; }
+            set
+            {
+                m_MouseDownPart = value;
+                this.Refresh();
+            }
+        }
+
+        protected override void OnExternalSizeChange()
+        {
+            UpdateLayout();
+            base.OnExternalSizeChange();
+        }
+
+        private void UpdateLayout()
+        {
+            bool rtl = this.IsRightToLeft;
+            Rectangle r = new Rectangle(Point.Empty, this.DisplayRectangle.Size);
+
+            int buttonSize = Dpi.Width(m_ButtonSize);
+            if (m_LabelVisible)
+            {
+                int labelWidth = Dpi.Width(m_LabelWidth);
+                if (m_LabelPosition == eSliderLabelPosition.Left && (!rtl || _SliderOrientation == eOrientation.Vertical) || m_LabelPosition == eSliderLabelPosition.Right && rtl)
+                {
+                    if (_SliderOrientation == eOrientation.Vertical)
+                    {
+                        m_LabelBounds = new Rectangle(0, 2, r.Width, labelWidth - 2);
+                        r.Height -= labelWidth;
+                        r.Y += labelWidth;
+                    }
+                    else
+                    {
+                        m_LabelBounds = new Rectangle(2, 0, labelWidth - 2, r.Height);
+                        r.Width -= labelWidth;
+                        r.X += labelWidth;
+                    }
+                }
+                else if (m_LabelPosition == eSliderLabelPosition.Left && rtl || m_LabelPosition == eSliderLabelPosition.Right && (!rtl || _SliderOrientation == eOrientation.Vertical))
+                {
+                    if (_SliderOrientation == eOrientation.Vertical)
+                    {
+                        m_LabelBounds = new Rectangle(0, r.Height - labelWidth + 2, r.Width, labelWidth - 2);
+                        r.Height -= labelWidth;
+                    }
+                    else
+                    {
+                        m_LabelBounds = new Rectangle(r.Width - labelWidth + 2, 0, labelWidth - 2, r.Height);
+                        r.Width -= labelWidth;
+                    }
+                }
+                else if (m_LabelPosition == eSliderLabelPosition.Top)
+                {
+                    Font font = GetFont(null);
+                    int h = (font != null) ? font.Height : 14;
+                    if (this.TextMarkupBody != null)
+                        h = this.TextMarkupBody.Bounds.Height;
+                    int th = buttonSize + h;
+                    if (_SliderOrientation == eOrientation.Vertical)
+                    {
+                        m_LabelBounds = new Rectangle((r.Width - th) / 2, 0, h, r.Height);
+                        r.X = m_LabelBounds.Right;
+                        r.Width = buttonSize;
+                    }
+                    else
+                    {
+                        m_LabelBounds = new Rectangle(0, (r.Height - th) / 2, r.Width, h);
+                        r.Y = m_LabelBounds.Bottom;
+                        r.Height = buttonSize;
+                    }
+                }
+                else if (m_LabelPosition == eSliderLabelPosition.Bottom)
+                {
+                    Font font = GetFont(null);
+                    int h = (font != null) ? font.Height : 14;
+                    if (this.TextMarkupBody != null)
+                        h = this.TextMarkupBody.Bounds.Height;
+                    int th = buttonSize + h;
+                    if (_SliderOrientation == eOrientation.Vertical)
+                    {
+                        m_LabelBounds = new Rectangle((r.Width - th) / 2 + buttonSize, 0, h, r.Height);
+                        r.X = (r.Width - th) / 2;
+                        r.Width = buttonSize;
+                    }
+                    else
+                    {
+                        m_LabelBounds = new Rectangle(0, (r.Height - th) / 2 + buttonSize, r.Width, h);
+                        r.Y = (r.Height - th) / 2;
+                        r.Height = buttonSize;
+                    }
+                }
+            }
+            else
+                m_LabelBounds = Rectangle.Empty;
+
+
+            if (rtl && _SliderOrientation == eOrientation.Horizontal)
+            {
+                m_DecreaseBounds = new Rectangle(r.Right - buttonSize, r.Y + (r.Height - buttonSize) / 2, buttonSize, buttonSize);
+                m_IncreaseBounds = new Rectangle(r.X, r.Y + (r.Height - buttonSize) / 2, buttonSize, buttonSize);
+            }
+            else
+            {
+                if (_SliderOrientation == eOrientation.Horizontal)
+                {
+                    m_DecreaseBounds = new Rectangle(r.X, r.Y + (r.Height - buttonSize) / 2, buttonSize, buttonSize);
+                    m_IncreaseBounds = new Rectangle(r.Right - buttonSize, r.Y + (r.Height - buttonSize) / 2, buttonSize, buttonSize);
+                }
+                else
+                {
+                    m_DecreaseBounds = new Rectangle(r.X + (r.Width - buttonSize) / 2, r.Bottom - buttonSize, buttonSize, buttonSize);
+                    m_IncreaseBounds = new Rectangle(r.X + (r.Width - buttonSize) / 2, r.Y, buttonSize, buttonSize);
+                }
+            }
+
+            if (_SliderOrientation == eOrientation.Horizontal)
+                m_SlideBounds = new Rectangle(r.X + buttonSize, r.Y, r.Width - buttonSize * 2, r.Height);
+            else
+                m_SlideBounds = new Rectangle(r.X, r.Y + buttonSize, r.Width, r.Height - buttonSize * 2);
+        }
+
+        private Rectangle m_LabelBounds = Rectangle.Empty;
+        /// <summary>
+        /// Returns the label bounds inside of the control.
+        /// </summary>
+        internal Rectangle LabelBounds
+        {
+            get
+            {
+                return m_LabelBounds;
+            }
+        }
+
+        private Rectangle m_DecreaseBounds = Rectangle.Empty;
+        internal Rectangle DecreaseBounds
+        {
+            get
+            {
+                return m_DecreaseBounds;
+            }
+        }
+
+        private Rectangle m_IncreaseBounds = Rectangle.Empty;
+        internal Rectangle IncreaseBounds
+        {
+            get
+            {
+                return m_IncreaseBounds;
+            }
+        }
+
+        private Rectangle m_SlideBounds = Rectangle.Empty;
+        internal Rectangle SlideBounds
+        {
+            get
+            {
+                return m_SlideBounds;
+            }
+        }
+
+        private Rectangle m_TrackBounds = Rectangle.Empty;
+        internal Rectangle TrackBounds
+        {
+            get { return m_TrackBounds; }
+            set { m_TrackBounds = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the text associated with this item.
+        /// </summary>
+        [System.ComponentModel.Browsable(true), DevCoBrowsable(true), Editor("DevComponents.DotNetBar.Design.TextMarkupUIEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), System.ComponentModel.Category("Appearance"), System.ComponentModel.Description("The text contained in the item."), System.ComponentModel.Localizable(true), System.ComponentModel.DefaultValue("")]
+        public override string Text
+        {
+            get
+            {
+                return base.Text;
+            }
+            set
+            {
+                base.Text = value;
+            }
+        }
+
+        #region Markup Implementation
+        /// <summary>
+        /// Gets whether item supports text markup. Default is false.
+        /// </summary>
+        protected override bool IsMarkupSupported
+        {
+            get { return _EnableMarkup; }
+        }
+
+        private bool _EnableMarkup = true;
+        /// <summary>
+        /// Gets or sets whether text-markup support is enabled for items Text property. Default value is true.
+        /// Set this property to false to display HTML or other markup in the item instead of it being parsed as text-markup.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance"), Description("Indicates whether text-markup support is enabled for items Text property.")]
+        public bool EnableMarkup
+        {
+            get { return _EnableMarkup; }
+            set
+            {
+                if (_EnableMarkup != value)
+                {
+                    _EnableMarkup = value;
+                    NeedRecalcSize = true;
+                    OnTextChanged();
+                }
+            }
+        }
+        #endregion
+
+        /// <summary>
+        /// Returns the Font object to be used for drawing the item text.
+        /// </summary>
+        /// <returns>Font object.</returns>
+        private Font GetFont(ItemPaintArgs pa)
+        {
+            System.Drawing.Font objFont = null;
+
+            if (pa != null)
+                objFont = pa.Font;
+
+            if (objFont == null)
+            {
+                System.Windows.Forms.Control objCtrl = null;
+                if (pa != null)
+                    objCtrl = pa.ContainerControl;
+                if (objCtrl == null)
+                    objCtrl = this.ContainerControl as System.Windows.Forms.Control;
+                if (objCtrl != null && objCtrl.Font != null)
+                    objFont = (Font)objCtrl.Font;
+                else
+                    objFont = SystemFonts.DefaultFont; // (Font)System.Windows.Forms.SystemInformation.MenuFont;
+            }
+
+            return objFont;
+        }
+
+        /// <summary>
+        /// Gets or sets the maximum value of the range of the control.
+        /// </summary>
+        [DevCoBrowsable(true), Browsable(true), Description("Gets or sets the maximum value of the range of the control."), Category("Behavior"), DefaultValue(100)]
+        public int Maximum
+        {
+            get
+            {
+                return m_Maximum;
+            }
+            set
+            {
+                m_Maximum = value;
+                this.Refresh();
+                OnAppearanceChanged();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the minimum value of the range of the control.
+        /// </summary>
+        [DevCoBrowsable(true), Browsable(true), Description("Gets or sets the minimum value of the range of the control."), Category("Behavior"), DefaultValue(0)]
+        public int Minimum
+        {
+            get
+            {
+                return m_Minimum;
+            }
+            set
+            {
+                m_Minimum = value;
+                this.Refresh();
+                OnAppearanceChanged();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the current position of the slider.
+        /// </summary>
+        [DevCoBrowsable(true), Browsable(true), Description("Gets or sets the current position of the slider."), Category("Behavior")]
+        public int Value
+        {
+            get { return m_Value; }
+
+            set
+            {
+                if (m_Value != value)
+                {
+                    SetValue(value, eEventSource.Code);
+                }
+            }
+        }
+
+        private void SetValue(int value, eEventSource source)
+        {
+            if (value == m_Value) return;
+
+            CancelIntValueEventArgs e = new CancelIntValueEventArgs();
+            e.NewValue = value;
+            e.EventSource = source;
+
+            OnValueChanging(e);
+
+            if (e.Cancel)
+                return;
+
+            if (value < m_Minimum)
+                m_Value = m_Minimum;
+            else if (value > m_Maximum)
+                m_Value = m_Maximum;
+            else
+                m_Value = value;
+
+            OnValueChanged(e);
+
+            if (ShouldSyncProperties)
+                BarFunctions.SyncProperty(this, "Value");
+
+            this.Refresh();
+            OnAppearanceChanged();
+            ExecuteCommand();
+        }
+        /// <summary>
+        /// Gets or sets the amount by which a call to the PerformStep method increases the current position of the slider. Value must be greater than 0.
+        /// </summary>
+        [DevCoBrowsable(true), Browsable(true), Description("Gets or sets the amount by which a call to the PerformStep method increases the current position of the slider."), Category("Behavior"), DefaultValue(1)]
+        public int Step
+        {
+            get
+            {
+                return m_Step;
+            }
+            set
+            {
+                if (m_Step <= 0) return;
+                m_Step = value;
+            }
+        }
+
+        /// <summary>
+        /// Advances the current position of the slider by the amount of the Step property.
+        /// </summary>
+        public virtual void PerformStep()
+        {
+            PerformStep(eEventSource.Code);
+        }
+
+        /// <summary>
+        /// Advances the current position of the slider by the amount of the Step property.
+        /// </summary>
+        public virtual void PerformStep(eEventSource eventSource)
+        {
+            SetValue(this.Value + m_Step, eventSource);
+        }
+
+        /// <summary>
+        /// Advances the current position of the slider by the specified amount.
+        /// </summary>
+        /// <param name="value">The amount by which to increment the sliders current position. </param>
+        public virtual void Increment(int value)
+        {
+            Increment(value, eEventSource.Code);
+        }
+
+        /// <summary>
+        /// Advances the current position of the slider by the specified amount.
+        /// </summary>
+        /// <param name="value">The amount by which to increment the sliders current position. </param>
+        public virtual void Increment(int value, eEventSource eventSource)
+        {
+            SetValue(this.Value + value, eventSource);
+        }
+
+        /// <summary>
+        /// Gets or sets whether the text label next to the slider is displayed.
+        /// </summary>
+        [DevCoBrowsable(true), Browsable(true), Description("Gets or sets whether the label text is displayed."), Category("Behavior"), DefaultValue(true)]
+        public bool LabelVisible
+        {
+            get
+            {
+                return m_LabelVisible;
+            }
+            set
+            {
+                m_LabelVisible = value;
+                OnAppearanceChanged();
+                this.Refresh();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the width of the slider part of the item in pixels. Value must be greater than 0. Default value is 136.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), DefaultValue(136), System.ComponentModel.Category("Layout"), System.ComponentModel.Description("Indicates the width of the slider part of the item in pixels.")]
+        public int Width
+        {
+            get
+            {
+                return m_Width;
+            }
+            set
+            {
+                if (m_Width == value || value<=0)
+                    return;
+                m_Width = value;
+                NeedRecalcSize = true;
+                OnAppearanceChanged();
+                this.Refresh();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the width of the label part of the item in pixels. Value must be greater than 0. Default value is 38.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), DefaultValue(38), System.ComponentModel.Category("Layout"), System.ComponentModel.Description("Indicates width of the label part of the item in pixels.")]
+        public int LabelWidth
+        {
+            get
+            {
+                return m_LabelWidth;
+            }
+            set
+            {
+                if (m_LabelWidth == value || value<=0)
+                    return;
+                m_LabelWidth = value;
+                NeedRecalcSize = true;
+                OnAppearanceChanged();
+                this.Refresh();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the text label position in relationship to the slider. Default value is Left.
+        /// </summary>
+        [Browsable(true), DefaultValue(eSliderLabelPosition.Left), Category("Layout"), Description("Indicates text label position in relationship to the slider")]
+        public eSliderLabelPosition LabelPosition
+        {
+            get { return m_LabelPosition; }
+            set
+            {
+                m_LabelPosition = value;
+                NeedRecalcSize = true;
+                this.OnAppearanceChanged();
+                this.Refresh();
+            }
+        }
+
+        /// <summary>
+        /// Raises the ValueChanged event.
+        /// </summary>
+        protected virtual void OnValueChanged()
+        {
+            OnValueChanged(EventArgs.Empty);
+        }
+
+        /// <summary>
+        /// Raises the ValueChanged event.
+        /// </summary>
+        protected virtual void OnValueChanged(EventArgs e)
+        {
+            if (ValueChanged != null)
+                ValueChanged(this, e);
+        }
+
+        /// <summary>
+        /// Raises the ValueChanging event.
+        /// </summary>
+        protected virtual void OnValueChanging(CancelIntValueEventArgs e)
+        {
+            if (ValueChanging != null)
+                ValueChanging(this, e);
+        }
+
+        /// <summary>
+        /// Gets or sets whether Click event will be auto repeated when mouse button is kept pressed over the item.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), DefaultValue(false), Category("Behavior"), Description("Gets or sets whether Click event will be auto repeated when mouse button is kept pressed over the item.")]
+        public override bool ClickAutoRepeat
+        {
+            get
+            {
+                return base.ClickAutoRepeat;
+            }
+            set
+            {
+                base.ClickAutoRepeat = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the auto-repeat interval for the click event when mouse button is kept pressed over the item.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), System.ComponentModel.DefaultValue(200), System.ComponentModel.Category("Behavior"), System.ComponentModel.Description("Gets or sets the auto-repeat interval for the click event when mouse button is kept pressed over the item.")]
+        public override int ClickRepeatInterval
+        {
+            get
+            {
+                return base.ClickRepeatInterval;
+            }
+            set
+            {
+                base.ClickRepeatInterval = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether vertical line track marker is displayed on the slide line. Default value is true.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), DefaultValue(true), Description("Indicates whether vertical line track marker is displayed on the slide line.")]
+        public virtual bool TrackMarker
+        {
+            get { return m_TrackMarker; }
+            set
+            {
+                m_TrackMarker = value;
+                this.Refresh();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the color of the label text.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), Description("Indicates color of the label text.")]
+        public Color TextColor
+        {
+            get { return m_TextColor; }
+            set
+            {
+                m_TextColor = value;
+                this.Refresh();
+            }
+        }
+        /// <summary>
+        /// Returns whether property should be serialized. Used by Windows Forms designer.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeTextColor()
+        {
+            return !m_TextColor.IsEmpty;
+        }
+        /// <summary>
+        /// Resets the property to default value. Used by Windows Forms designer.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetTextColor()
+        {
+            TextColor = Color.Empty;
+        }
+
+        /// <summary>
+        /// Gets or sets the Key Tips access key or keys for the item when on Ribbon Control or Ribbon Bar. Use KeyTips property
+        /// when you want to assign the one or more letters to be used to access an item. For example assigning the FN to KeyTips property
+        /// will require the user to press F then N keys to select an item. Pressing the F letter will show only keytips for the items that start with letter F.
+        /// </summary>
+        [Browsable(false), Category("Appearance"), DefaultValue(""), Description("Indicates the Key Tips access key or keys for the item when on Ribbon Control or Ribbon Bar.")]
+        public override string KeyTips
+        {
+            get { return base.KeyTips; }
+            set
+            {
+                base.KeyTips = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the collection of shortcut keys associated with the item.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), System.ComponentModel.Category("Design"), System.ComponentModel.Description("Indicates list of shortcut keys for this item."), System.ComponentModel.Editor("DevComponents.DotNetBar.Design.ShortcutsDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), System.ComponentModel.TypeConverter("DevComponents.DotNetBar.Design.ShortcutsConverter, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf"), System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Content)]
+        public override ShortcutsCollection Shortcuts
+        {
+            get
+            {
+                return base.Shortcuts;
+            }
+            set
+            {
+                base.Shortcuts = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether item will display sub items.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), System.ComponentModel.DefaultValue(true), System.ComponentModel.Category("Behavior"), System.ComponentModel.Description("Determines whether sub-items are displayed.")]
+        public override bool ShowSubItems
+        {
+            get
+            {
+                return base.ShowSubItems;
+            }
+            set
+            {
+                base.ShowSubItems = value;
+            }
+        }
+
+        /// <summary>
+        /// Specifies whether item is drawn using Themes when running on OS that supports themes like Windows XP.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), DefaultValue(false), Category("Appearance"), Description("Specifies whether item is drawn using Themes when running on OS that supports themes like Windows XP.")]
+        public override bool ThemeAware
+        {
+            get
+            {
+                return base.ThemeAware;
+            }
+            set
+            {
+                base.ThemeAware = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether the item expands automatically to fill out the remaining space inside the container. Applies to Items on stretchable, no-wrap Bars only.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), System.ComponentModel.DefaultValue(false), System.ComponentModel.Category("Appearance"), System.ComponentModel.Description("Indicates whether item will stretch to consume empty space. Items on stretchable, no-wrap Bars only.")]
+        public override bool Stretch
+        {
+            get
+            {
+                return base.Stretch;
+            }
+            set
+            {
+                base.Stretch = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the tooltip for the Increase button of the slider.
+        /// </summary>
+        [Browsable(true), DefaultValue(""), Localizable(true), Category("Appearance"), Description("Indicates tooltip for the Increase button of the slider.")]
+        public string IncreaseTooltip
+        {
+            get { return m_IncreaseTooltip; }
+            set { m_IncreaseTooltip = value; UpdateTooltip(); }
+        }
+
+        /// <summary>
+        /// Gets or sets the tooltip for the Decrease button of the slider.
+        /// </summary>
+        [Browsable(true), DefaultValue(""), Localizable(true), Category("Appearance"), Description("Indicates tooltip for the Increase button of the slider.")]
+        public string DecreaseTooltip
+        {
+            get { return m_DecreaseTooltip; }
+            set { m_DecreaseTooltip = value; UpdateTooltip(); }
+        }
+
+        protected override void OnTooltipChanged()
+        {
+            m_ItemTooltip = this.Tooltip;
+            UpdateTooltip();
+            base.OnTooltipChanged();
+        }
+
+        private void UpdateTooltip()
+        {
+            if (this.DesignMode) return;
+
+            if (m_MouseOverPart == eSliderPart.DecreaseButton && m_DecreaseTooltip != "")
+            {
+                SetInternalTooltip(m_DecreaseTooltip);
+            }
+            else if (m_MouseOverPart == eSliderPart.IncreaseButton && m_IncreaseTooltip != "")
+                SetInternalTooltip(m_IncreaseTooltip);
+            else if (m_Tooltip != m_ItemTooltip)
+                SetInternalTooltip(m_ItemTooltip);
+        }
+
+        private void SetInternalTooltip(string t)
+        {
+            if (m_Tooltip != t)
+            {
+                m_Tooltip = t;
+                if (this.ToolTipVisible)
+                    this.ShowToolTip();
+            }
+        }
+
+        private eOrientation _SliderOrientation = eOrientation.Horizontal;
+        /// <summary>
+        /// Gets or sets the slider orientation. Default value is horizontal.
+        /// </summary>
+        [DefaultValue(eOrientation.Horizontal), Category("Appearance"), Description("Indicates slider orientation.")]
+        public eOrientation SliderOrientation
+        {
+            get { return _SliderOrientation; }
+            set 
+            {
+                if (_SliderOrientation != value)
+                {
+                    _SliderOrientation = value;
+                    NeedRecalcSize = true;
+                    this.Refresh();
+                }
+            }
+        }
+
+        private Office2007SliderColorTable _ColorTable = null;
+        /// <summary>
+        /// Gets or sets the custom color table for the item. Color table here will override all system color table settings.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public Office2007SliderColorTable ColorTable
+        {
+            get
+            {
+                return _ColorTable;
+            }
+            set
+            {
+            	_ColorTable = value;
+                this.Refresh();
+            }
+        }
+        #endregion
+    }
+
+}
diff --git a/PROMS/DotNetBar Source Code/Ribbon/Spacing.cs b/PROMS/DotNetBar Source Code/Ribbon/Spacing.cs
new file mode 100644
index 00000000..9a5c45f7
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Ribbon/Spacing.cs	
@@ -0,0 +1,115 @@
+using System;
+using System.Text;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Indicates spacing for an user interface element either padding or margins.
+    /// </summary>
+    [ToolboxItem(false),TypeConverter(typeof(System.ComponentModel.ExpandableObjectConverter))]
+    public class Spacing
+    {
+        #region Events
+        public event EventHandler SpacingChanged;
+        #endregion
+
+        #region Private Variables
+        private int m_Left = 0;
+        private int m_Right = 0;
+        private int m_Top = 0;
+        private int m_Bottom = 0;
+        #endregion
+
+        #region Internal Implementation
+        /// <summary>
+        /// Gets or sets the amount of the space on the left side.
+        /// </summary>
+        [Browsable(true), DefaultValue(0), Description("Indicates the amount of the space on the left side."), DevCoSerialize()]
+        public int Left
+        {
+            get { return m_Left; }
+            set
+            {
+                m_Left = value;
+                OnSpacingChanged();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the amount of the space on the right side.
+        /// </summary>
+        [Browsable(true), DefaultValue(0), Description("Indicates the amount of the space on the right side."), DevCoSerialize()]
+        public int Right
+        {
+            get { return m_Right; }
+            set
+            {
+                m_Right = value;
+                OnSpacingChanged();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the amount of the space on the top.
+        /// </summary>
+        [Browsable(true), DefaultValue(0), Description("Indicates the amount of the space on the top."), DevCoSerialize()]
+        public int Top
+        {
+            get { return m_Top; }
+            set
+            {
+                m_Top = value;
+                OnSpacingChanged();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the amount of the space on the bottom.
+        /// </summary>
+        [Browsable(true), DefaultValue(0), Description("Indicates the amount of the space on the bottom."), DevCoSerialize()]
+        public int Bottom
+        {
+            get { return m_Bottom; }
+            set
+            {
+                m_Bottom = value;
+                OnSpacingChanged();
+            }
+        }
+
+        private void OnSpacingChanged()
+        {
+            if (SpacingChanged != null)
+                SpacingChanged(this, new EventArgs());
+        }
+
+        /// <summary>
+        /// Gets total horizontal spacing.
+        /// </summary>
+        [Browsable(false)]
+        public int Horizontal
+        {
+            get { return Left + Right; }
+        }
+
+        /// <summary>
+        /// Gets total vertical spacing.
+        /// </summary>
+        [Browsable(false)]
+        public int Vertical
+        {
+            get { return Top + Bottom; }
+        }
+
+        /// <summary>
+        /// Gets whether all memebers of class are set to 0.
+        /// </summary>
+        [Browsable(false)]
+        public bool IsEmpty
+        {
+            get { return (m_Left==0 && m_Right==0 && m_Top==0 && m_Bottom==0); }
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Ribbon/SubItemsQatCollection.cs b/PROMS/DotNetBar Source Code/Ribbon/SubItemsQatCollection.cs
new file mode 100644
index 00000000..0c3137f0
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Ribbon/SubItemsQatCollection.cs	
@@ -0,0 +1,41 @@
+using System;
+using System.Text;
+
+namespace DevComponents.DotNetBar.Ribbon
+{
+    internal class SubItemsQatCollection : SubItemsCollection
+    {
+        private Ribbon.QatToolbar m_QatToolbar = null;
+        public SubItemsQatCollection(Ribbon.QatToolbar qatToolbar):base(null)
+        {
+            m_QatToolbar = qatToolbar;
+        }
+
+        protected override void OnInsert(int index, object value) {}
+
+        protected override void OnInsertComplete(int index, object value)
+        {
+            if (!m_IgnoreEvents)
+            {
+                if(m_QatToolbar.Items.Count<=index)
+                    m_QatToolbar.Items.Add(value as BaseItem);
+                else
+                    m_QatToolbar.Items.Insert(index, value as BaseItem);
+            }
+        }
+
+        protected override void RemoveInternal(int index, object value)
+        {
+            // Raise event before item is actualy removed so the item is able to clean its state
+            // See override in PopupItem
+            if (!m_IgnoreEvents)
+            {
+                m_QatToolbar.Items.Remove(value as BaseItem);
+            }
+        }
+
+        protected override void RemoveCompleteInternal(int index, object value)
+        {
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Ribbon/SuperTooltip.cs b/PROMS/DotNetBar Source Code/Ribbon/SuperTooltip.cs
new file mode 100644
index 00000000..7f51282c
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Ribbon/SuperTooltip.cs	
@@ -0,0 +1,1413 @@
+using System;
+using System.Text;
+using System.ComponentModel;
+using System.Windows.Forms;
+using System.Drawing;
+using System.Collections;
+using System.Reflection;
+using DevComponents.DotNetBar.Controls;
+
+namespace DevComponents.DotNetBar
+{
+    [ToolboxBitmap(typeof(SuperTooltip),"Ribbon.SuperTooltip.ico"),ToolboxItem(true), ProvideProperty("SuperTooltip",typeof(IComponent)),
+   System.Runtime.InteropServices.ComVisible(false), Designer("DevComponents.DotNetBar.Design.SuperTooltipDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+    public class SuperTooltip : Component , IExtenderProvider
+    {
+        #region Private Variables & Constructor
+        /// <summary>
+        /// Occurs just before tooltip is displayed and gives you opportunity to cancel showing of tooltip.
+        /// </summary>
+        public event SuperTooltipEventHandler BeforeTooltipDisplay;
+
+        /// <summary>
+        /// Occurs after tooltip has been closed.
+        /// </summary>
+        public event EventHandler TooltipClosed;
+
+        /// <summary>
+        /// Occurs when text markup link is clicked. Markup links can be created using "a" tag, for example:
+        /// <a name="MyLink">Markup link</a>
+        /// </summary>
+        public event MarkupLinkClickEventHandler MarkupLinkClick;
+
+        private bool m_PositionBelowControl = true;
+        private Hashtable m_SuperTooltipInfo = new Hashtable();
+        private SuperTooltipControl m_Tooltip = null;
+        private Timer m_ActiveWindowTimer = null;
+        private Timer m_HideDelayedTimer = null;
+        private bool m_CheckOnScreenPosition = true;
+        private IntPtr m_ActiveWindowPtr = IntPtr.Zero;
+        private int m_TooltipDuration = 20;
+        private long m_DurationDisplayed = 0;
+        private SuperTooltipInfo m_DefaultTooltipSettings = new SuperTooltipInfo();
+        private static SuperTooltipInfo s_DefaultSuperTooltipInfo = null;
+		private Font m_DefaultFont=null;
+		private int m_HoverCount=0;
+		private int m_HoverTrigger=2;
+        private Size m_MinimumTooltipSize = new Size(150, 24);
+        private bool m_Enabled = true;
+		private bool m_AntiAlias = true;
+        private int m_DelayTooltipHideDuration = 0;
+        private bool m_ShowTooltipImmediately = false;
+        private bool m_IgnoreFormActiveState = false;
+        private int m_MaximumWidth = 0;
+        private bool m_CheckTooltipPosition = true;
+        private bool m_ShowTooltipDescription = true;
+        private bool m_ShowTooltipForFocusedControl = true;
+        private const string TREEGX_NODE_CLASS_NAME = "DevComponents.Tree.Node";
+        #endregion
+
+        #region Internal Implementation
+        /// <summary>
+        /// Gets or sets the maximum width of the super tooltip. Default value is 0 which indicates that maximum width is not used. The maximum width property
+        /// will not be used if custom size is specified.
+        /// </summary>
+        [Browsable(true), DefaultValue(0), Category("Appearance"), Description("Indicates maximum width of the super tooltip.")]
+        public int MaximumWidth
+        {
+            get { return m_MaximumWidth; }
+            set { m_MaximumWidth = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether form active state is ignored when control is deciding whether to show tooltip. By default this property is set to false
+        /// which indicates that tooltip will be shown only if parent form is active. When set to true the form active state is ignored when
+        /// deciding whether to show tooltip.
+        /// </summary>
+        [Browsable(true), DefaultValue(false), Category("Behavior"), Description("Indicates whether form active state is ignored when control is deciding whether to show tooltip.")]
+        public bool IgnoreFormActiveState
+        {
+            get { return m_IgnoreFormActiveState; }
+            set { m_IgnoreFormActiveState = value; }
+        }
+		/// <summary>
+		/// Gets or sets whether anti-alias smoothing is used while painting. Default value is true.
+		/// </summary>
+		[DefaultValue(true),Browsable(true),Category("Appearance"),Description("Gets or sets whether anti-aliasing is used while painting.")]
+		public bool AntiAlias
+		{
+			get {return m_AntiAlias;}
+			set
+			{
+				m_AntiAlias=value;
+			}
+		}
+
+        protected override void Dispose(bool disposing)
+        {
+            HideTooltip();
+            DestroyActiveWindowTimer();
+            DisposeHideDelayedTimer();
+            base.Dispose(disposing);
+        }
+
+        /// <summary>
+        /// Gets or sets whether SuperTooltip will be shown for the controls assigned to it. Default value is true. You can set
+        /// this property to false to disable SuperTooltip for all controls assigned to it.
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Behavior"), Description("Indicates whether SuperTooltip will be shown for the controls assigned to it.")]
+        public bool Enabled
+        {
+            get { return m_Enabled; }
+            set { m_Enabled = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether tooltip is shown immediately after the mouse enters the control. The default value is false which indicates
+        /// that tooltip is shown after system hover timeout has expired which provides slight delay before tooltip is shown.
+        /// </summary>
+        [Browsable(true), DefaultValue(false), Category("Behavior"), Description("Indicates whether tooltip is shown immediately after the mouse enters the control.")]
+        public bool ShowTooltipImmediately
+        {
+            get { return m_ShowTooltipImmediately; }
+            set { m_ShowTooltipImmediately = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the minimum tooltip size. Default value is 150 width and 24 height.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), Description("Indicates minimum tooltip size.")]
+        public Size MinimumTooltipSize
+        {
+            get { return m_MinimumTooltipSize; }
+            set { m_MinimumTooltipSize = value; }
+        }
+
+        /// <summary>
+        /// Gets whether MinimumTooltipSize property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeMinimumTooltipSize()
+        {
+            return (m_MinimumTooltipSize.Width != 150 || m_MinimumTooltipSize.Height != 24);
+        }
+
+        /// <summary>
+        /// Gets or sets the duration in seconds that tooltip is kept on screen after it is displayed. Default value is 20 seconds.
+        /// You can set this value to 0 to keep tooltip displayed until user moves mouse out of control or application loses focus.
+        /// </summary>
+        [Browsable(true), DefaultValue(20), Category("Behavior"), Description("Indicates duration in seconds that tooltip is kept on screen after it is displayed.")]
+        public int TooltipDuration
+        {
+            get { return m_TooltipDuration; }
+            set
+            {
+                if (value < 0) value = 0;
+                m_TooltipDuration = value;
+            }
+        }
+
+        /// <summary>
+        /// 	Gets or sets the delay time for hiding the tooltip in milliseconds after
+        ///     mouse has left the control. Default value is 0 which means that tooltip will be
+        ///     hidden as soon as mouse leaves the control tooltip was displayed for. You can use
+        ///     this property to provide the user with enough time to move the mouse cursor to the
+        ///     tooltip so user can act on the content of the tooltip, like hyper links.
+        /// </summary>
+        [Browsable(true), DefaultValue(0), Category("Behavior"), Description("Indicates delay time for hiding the tooltip in milliseconds after mouse has left the control.")]
+        public int DelayTooltipHideDuration
+        {
+            get { return m_DelayTooltipHideDuration; }
+            set
+            {
+                if (value < 0) value = 0;
+                m_DelayTooltipHideDuration = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether tooltip position is checked before tooltip is displayed and adjusted to tooltip always
+        /// falls into screen bounds. Default value is true.
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Behavior"), Description("Indicates whether tooltip position is checked before tooltip is displayed and adjusted to tooltip always falls into screen bounds.")]
+        public bool CheckOnScreenPosition
+        {
+            get { return m_CheckOnScreenPosition; }
+            set { m_CheckOnScreenPosition = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether tooltip position is checked before tooltip is displayed and adjusted so tooltip does not overlaps the
+        /// control it is displayed for. Default value is true.
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Behavior"), Description("Indicates whether tooltip position is checked before tooltip is displayed and adjusted so tooltip does not overlap control its displayed for")]
+        public bool CheckTooltipPosition
+        {
+            get { return m_CheckTooltipPosition; }
+            set { m_CheckTooltipPosition = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the tooltip position in relationship to the control tooltip is providing information for.
+        /// Set this property to false if you want tooltip to be displayed below the mouse cursor. Default value is
+        /// true which indicates that tooltip is displayed below mouse cursor but it is positioned below the control
+        /// that it provides the information for so it is not covering its content.
+        /// </summary>
+        [Browsable(true),DefaultValue(true),Category("Behavior"),Description("")]
+        public bool PositionBelowControl
+        {
+            get { return m_PositionBelowControl; }
+            set { m_PositionBelowControl = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets default setting for new Tooltips you create in design time. If all your tooltips have common elements
+        /// you can change this property to reflect these default setting before you start writing tooltips for all controls on the form.
+        /// As you start creating new tooltips for controls on the form default values specified here will be used as starting values
+        /// for new tooltip you are creating.
+        /// </summary>
+        [Localizable(true), Editor("DevComponents.DotNetBar.Design.SuperTooltipInfoEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), DefaultValue(null), Description("Indicates default setting for new Tooltips you create in design time.")]
+        public SuperTooltipInfo DefaultTooltipSettings
+        {
+            get { return m_DefaultTooltipSettings; }
+            set
+            {
+                m_DefaultTooltipSettings = value;
+                s_DefaultSuperTooltipInfo = value;
+            }
+        }
+
+        /// <summary>
+        /// Returns instance of default tooltip information used in design-time.
+        /// </summary>
+        [Browsable(false)]
+        public static SuperTooltipInfo DefaultSuperTooltipInfo
+        {
+            get { return s_DefaultSuperTooltipInfo; }
+        }
+
+        /// <summary>
+		/// Retrieves SuperTooltipInfo for given component or return null if component does not have tooltip associated with it.
+		/// </summary>
+        [Editor("DevComponents.DotNetBar.Design.SuperTooltipInfoEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), DefaultValue(null), Localizable(true)]
+        public SuperTooltipInfo GetSuperTooltip(IComponent c)
+		{
+            if (m_SuperTooltipInfo.Contains(c))
+			{
+                SuperTooltipInfo info = m_SuperTooltipInfo[c] as SuperTooltipInfo;
+				if(info!=null)
+					return info;
+			}
+			return null;
+		}
+
+		/// <summary>
+		/// Associates SuperTooltipInfo with given component.
+		/// </summary>
+		/// <param name="c">Reference to supported component.</param>
+		/// <param name="info">Instance of SuperTooltipInfo class. If null is passed the SuperTooltip is detached from the given component.</param>
+        public void SetSuperTooltip(IComponent c, SuperTooltipInfo info)
+        {
+            if (info != null)
+            {
+                if (info.BodyText == null) info.BodyText = "";
+                if (info.FooterText == null) info.FooterText = "";
+            }
+
+            if (m_SuperTooltipInfo.Contains(c))
+            {
+                if (info == null)
+                    this.RemoveSuperTooltipInfo(c);
+                else
+                    m_SuperTooltipInfo[c]=info;
+            }
+            else if (info != null)
+            {
+                this.AddSuperTooltipInfo(c, info);
+            }
+#if (FRAMEWORK20)
+            if (c is MaskedTextBoxAdv && !this.DesignMode)
+                SetSuperTooltip(((MaskedTextBoxAdv)c).MaskedTextBox, info);
+            else if (c is TextBoxDropDown)
+                SetSuperTooltip(((TextBoxDropDown)c).TextBox, info);
+            else if (c is ExpandablePanel)
+                SetSuperTooltip(((ExpandablePanel)c).TitlePanel, info);
+            else if (c is NumericUpDown && !this.DesignMode)
+            {
+                NumericUpDown num = (NumericUpDown)c;
+                foreach (Control item in num.Controls)
+                {
+                    SetSuperTooltip(item, info);
+                }
+            }
+#endif
+        }
+
+        /// <summary>
+        /// Gets the reference to internal Hashtable that contains reference to all controls and assigned SuperTooltips. This
+        /// collection must not be modified directly and it is automatically managed by the SuperTooltip component. You can use it
+        /// for example to change the color for all SuperTooltips managed by the component but you should not add or remove items to it.
+        /// Instead use SetSuperTooltip methods to add or remove the tooltip for a component.
+        /// </summary>
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), Browsable(false)]
+        public Hashtable SuperTooltipInfoTable
+        {
+            get { return m_SuperTooltipInfo; }
+        }
+
+        private void RemoveSuperTooltipInfo(IComponent c)
+        {
+            m_SuperTooltipInfo.Remove(c);
+            if (this.DesignMode)
+                return;
+#if (FRAMEWORK20)
+            if (c is MaskedTextBoxAdv)
+                RemoveSuperTooltipInfo(((MaskedTextBoxAdv)c).MaskedTextBox);
+            else if(c is TextBoxDropDown)
+                RemoveSuperTooltipInfo(((TextBoxDropDown)c).TextBox);
+            else if (c is ExpandablePanel)
+                RemoveSuperTooltipInfo(((ExpandablePanel)c).TitlePanel);
+#endif
+            if (c is ComboBoxItem)
+            {
+                ComboBoxItem item = c as ComboBoxItem;
+                item.MouseHover -= new EventHandler(this.ComponentMouseHover);
+                item.MouseLeave -= new EventHandler(ComponentMouseLeave);
+                item.MouseEnter -= new EventHandler(ComponentMouseEnter);
+                item.MouseDown -= new MouseEventHandler(ComponentMouseDown);
+                item.ComboBoxEx.MouseHover -= new EventHandler(this.ComponentMouseHover);
+                item.ComboBoxEx.MouseLeave -= new EventHandler(ComponentMouseLeave);
+                item.ComboBoxEx.MouseEnter -= new EventHandler(ComponentMouseEnter);
+                item.ComboBoxEx.MouseDown -= new MouseEventHandler(ComponentMouseDown);
+            }
+            else if (c is TextBoxItem)
+            {
+                TextBoxItem item = c as TextBoxItem;
+                item.MouseHover -= new EventHandler(this.ComponentMouseHover);
+                item.MouseLeave -= new EventHandler(ComponentMouseLeave);
+                item.MouseEnter -= new EventHandler(ComponentMouseEnter);
+                item.MouseDown -= new MouseEventHandler(ComponentMouseDown);
+                item.TextBox.MouseHover -= new EventHandler(this.ComponentMouseHover);
+                item.TextBox.MouseLeave -= new EventHandler(ComponentMouseLeave);
+                item.TextBox.MouseEnter -= new EventHandler(ComponentMouseEnter);
+                item.TextBox.MouseDown -= new MouseEventHandler(ComponentMouseDown);
+            }
+            else if (c is BaseItem)
+            {
+                BaseItem item = c as BaseItem;
+                item.MouseHover -= new EventHandler(this.ComponentMouseHover);
+                item.MouseLeave -= new EventHandler(ComponentMouseLeave);
+                item.MouseEnter -= new EventHandler(ComponentMouseEnter);
+                item.MouseDown -= new MouseEventHandler(ComponentMouseDown);
+                
+            }
+            else if (c is RibbonBar)
+            {
+                RibbonBar bar = c as RibbonBar;
+                bar.DialogLauncherMouseHover -= new EventHandler(this.ComponentMouseHover);
+                bar.DialogLauncherMouseLeave -= new EventHandler(ComponentMouseLeave);
+                bar.DialogLauncherMouseDown -= new MouseEventHandler(ComponentMouseDown);
+                bar.DialogLauncherMouseEnter -= new EventHandler(ComponentMouseEnter);
+            }
+            else if (c is Control)
+            {
+                Control ctrl = c as Control;
+                ctrl.MouseHover -= new EventHandler(this.ComponentMouseHover);
+                ctrl.MouseLeave -= new EventHandler(ComponentMouseLeave);
+                ctrl.MouseDown -= new MouseEventHandler(ComponentMouseDown);
+                ctrl.MouseEnter -= new EventHandler(ComponentMouseEnter);
+            }
+            else if (c is ISuperTooltipInfoProvider)
+            {
+                ISuperTooltipInfoProvider ip = c as ISuperTooltipInfoProvider;
+                ip.DisplayTooltip -= new EventHandler(this.ComponentMouseHover);
+                ip.HideTooltip -= new EventHandler(ComponentHideTooltip);
+            }
+#if (FRAMEWORK20)
+            else if (c is ToolStripButton)
+            {
+                ToolStripButton item = c as ToolStripButton;
+                item.MouseHover -= new EventHandler(this.ComponentMouseHover);
+                item.MouseLeave -= new EventHandler(ComponentMouseLeave);
+                item.MouseEnter -= new EventHandler(ComponentMouseEnter);
+                item.MouseDown -= new MouseEventHandler(ComponentMouseDown);
+            }
+#endif
+            else if (c is AdvTree.Node || IsTreeGXType(c.GetType()))
+            {
+                Type nodeType = c.GetType();
+                EventInfo ei = nodeType.GetEvent("NodeMouseHover");
+                if (ei != null)
+                {
+                    Delegate handler = Delegate.CreateDelegate(typeof(EventHandler),
+                    this, "ComponentMouseHover");
+                    ei.RemoveEventHandler(c, handler);
+                }
+
+                ei = nodeType.GetEvent("NodeMouseLeave");
+                if (ei != null)
+                {
+                    Delegate handler = Delegate.CreateDelegate(typeof(EventHandler),
+                    this, "ComponentMouseLeave");
+                    ei.RemoveEventHandler(c, handler);
+                }
+
+                ei = nodeType.GetEvent("NodeMouseEnter");
+                if (ei != null)
+                {
+                    Delegate handler = Delegate.CreateDelegate(typeof(EventHandler),
+                    this, "ComponentMouseEnter");
+                    ei.RemoveEventHandler(c, handler);
+                }
+
+                ei = nodeType.GetEvent("NodeMouseDown");
+                if (ei != null)
+                {
+                    Delegate handler = Delegate.CreateDelegate(typeof(MouseEventHandler),
+                    this, "ComponentMouseDown");
+                    ei.RemoveEventHandler(c, handler);
+                }
+            }
+            else if (c is TabItem)
+            {
+                TabItem item = c as TabItem;
+                item.MouseHover -= new EventHandler(this.ComponentMouseHover);
+                item.MouseLeave -= new EventHandler(ComponentMouseLeave);
+                item.MouseEnter -= new EventHandler(ComponentMouseEnter);
+                item.MouseDown -= new MouseEventHandler(ComponentMouseDown);
+
+            }
+        }
+
+        private void AddSuperTooltipInfo(IComponent c, SuperTooltipInfo info)
+        {
+            m_SuperTooltipInfo[c] = info;
+
+            if (c is ISuperTooltipInfoProvider)
+            {
+                ISuperTooltipInfoProvider ip = c as ISuperTooltipInfoProvider;
+                ip.DisplayTooltip += new EventHandler(this.ComponentMouseHover);
+                ip.HideTooltip += new EventHandler(ComponentHideTooltip);
+            }
+            else if (c is ComboBoxItem)
+            {
+                ComboBoxItem item = c as ComboBoxItem;
+                item.MouseHover += new EventHandler(this.ComponentMouseHover);
+                item.MouseLeave += new EventHandler(ComponentMouseLeave);
+                item.MouseEnter += new EventHandler(ComponentMouseEnter);
+                item.MouseDown += new MouseEventHandler(ComponentMouseDown);
+                item.ComboBoxEx.MouseHover += new EventHandler(this.ComponentMouseHover);
+                item.ComboBoxEx.MouseLeave += new EventHandler(ComponentMouseLeave);
+                item.ComboBoxEx.MouseEnter += new EventHandler(ComponentMouseEnter);
+                item.ComboBoxEx.MouseDown += new MouseEventHandler(ComponentMouseDown);
+            }
+            else if (c is TextBoxItem)
+            {
+                TextBoxItem item = c as TextBoxItem;
+                item.MouseHover += new EventHandler(this.ComponentMouseHover);
+                item.MouseLeave += new EventHandler(ComponentMouseLeave);
+                item.MouseEnter += new EventHandler(ComponentMouseEnter);
+                item.MouseDown += new MouseEventHandler(ComponentMouseDown);
+                item.TextBox.MouseHover += new EventHandler(this.ComponentMouseHover);
+                item.TextBox.MouseLeave += new EventHandler(ComponentMouseLeave);
+                item.TextBox.MouseEnter += new EventHandler(ComponentMouseEnter);
+                item.TextBox.MouseDown += new MouseEventHandler(ComponentMouseDown);
+            }
+            else if (c is BaseItem)
+            {
+                BaseItem item = c as BaseItem;
+                item.MouseHover += new EventHandler(this.ComponentMouseHover);
+                item.MouseLeave += new EventHandler(ComponentMouseLeave);
+                item.MouseEnter += new EventHandler(ComponentMouseEnter);
+                item.MouseDown += new MouseEventHandler(ComponentMouseDown);
+            }
+            else if (c is RibbonBar)
+            {
+                RibbonBar bar = c as RibbonBar;
+                bar.DialogLauncherMouseHover += new EventHandler(this.ComponentMouseHover);
+                bar.DialogLauncherMouseEnter += new EventHandler(ComponentMouseEnter);
+                bar.DialogLauncherMouseLeave += new EventHandler(ComponentMouseLeave);
+                bar.DialogLauncherMouseDown += new MouseEventHandler(ComponentMouseDown);
+            }
+            else if (c is Control)
+            {
+                Control ctrl = c as Control;
+                ctrl.MouseHover += new EventHandler(this.ComponentMouseHover);
+                ctrl.MouseLeave += new EventHandler(ComponentMouseLeave);
+                ctrl.MouseDown += new MouseEventHandler(ComponentMouseDown);
+                ctrl.MouseEnter += new EventHandler(ComponentMouseEnter);
+            }
+#if (FRAMEWORK20)
+            else if (c is ToolStripButton)
+            {
+                ToolStripButton item = c as ToolStripButton;
+                item.MouseHover += new EventHandler(this.ComponentMouseHover);
+                item.MouseLeave += new EventHandler(ComponentMouseLeave);
+                item.MouseEnter += new EventHandler(ComponentMouseEnter);
+                item.MouseDown += new MouseEventHandler(ComponentMouseDown);
+                item.AutoToolTip = false;
+                item.ToolTipText = "";
+            }
+#endif
+            else if (c is AdvTree.Node || IsTreeGXType(c.GetType()))
+            {
+                Type nodeType = c.GetType();
+                EventInfo ei = nodeType.GetEvent("NodeMouseHover");
+                if (ei != null)
+                {
+                    Delegate handler = Delegate.CreateDelegate(typeof(EventHandler),
+                    this, "ComponentMouseHover");
+                    ei.AddEventHandler(c, handler);
+                }
+
+                ei = nodeType.GetEvent("NodeMouseLeave");
+                if (ei != null)
+                {
+                    Delegate handler = Delegate.CreateDelegate(typeof(EventHandler),
+                    this, "ComponentMouseLeave");
+                    ei.AddEventHandler(c, handler);
+                }
+
+                ei = nodeType.GetEvent("NodeMouseEnter");
+                if (ei != null)
+                {
+                    Delegate handler = Delegate.CreateDelegate(typeof(EventHandler),
+                    this, "ComponentMouseEnter");
+                    ei.AddEventHandler(c, handler);
+                }
+
+                ei = nodeType.GetEvent("NodeMouseDown");
+                if (ei != null)
+                {
+                    Delegate handler = Delegate.CreateDelegate(typeof(MouseEventHandler),
+                    this, "ComponentMouseDown");
+                    ei.AddEventHandler(c, handler);
+                }
+            }
+            else if (c is TabItem)
+            {
+                TabItem tab = c as TabItem;
+                tab.MouseHover += new EventHandler(this.ComponentMouseHover);
+                tab.MouseLeave += new EventHandler(ComponentMouseLeave);
+                tab.MouseEnter += new EventHandler(ComponentMouseEnter);
+                tab.MouseDown += new MouseEventHandler(ComponentMouseDown);
+            }
+        }
+
+        void ComponentHideTooltip(object sender, EventArgs e)
+        {
+            this.HideTooltip();
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ComponentMouseDown(object sender, MouseEventArgs e)
+        {
+            this.HideTooltip();
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ComponentMouseEnter(object sender, EventArgs e)
+        {
+            if(sender is Control)
+                ResetHover(sender as Control);
+
+            if (m_ShowTooltipImmediately && m_Enabled)
+            {
+                ShowTooltip(sender);
+            }
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ComponentMouseLeave(object sender, EventArgs e)
+        {
+            if (!IsMouseOverSuperTooltip)
+                this.HideDelayed();
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ComponentMouseHover(object sender, EventArgs e)
+        {
+            if (m_ShowTooltipImmediately) return;
+
+			m_HoverCount++;
+			
+            if(sender is Control && m_HoverCount<m_HoverTrigger)
+				ResetHover(sender as Control);
+            else if (sender is BaseItem && m_HoverCount < m_HoverTrigger)
+            {
+                Control container = GetContainerControl((BaseItem)sender);
+                if (container != null)
+                    ResetHover((Control)container);
+            }
+            else if (sender is TabItem && m_HoverCount < m_HoverTrigger)
+                ResetHover((Control)((TabItem)sender).Parent);
+            else if (sender is AdvTree.Node && m_HoverCount < m_HoverTrigger)
+                ResetHover((Control)((AdvTree.Node)sender).TreeControl);
+            else if (m_Enabled)
+                ShowTooltip(sender);
+        }
+
+        private Control GetContainerControl(BaseItem item)
+        {
+            object container = item.ContainerControl;
+            if (container is BaseItem)
+                container = ((BaseItem)container).ContainerControl;
+            return container as Control;
+        }
+
+        /// <summary>
+        /// Gets or sets the hover delay multiplier which controls how fast tooltip appears. The value set here indicates
+        /// how many hover events are needed to occur before the tooltip is displayed.
+        /// </summary>
+        [DefaultValue(2), Category("Behavior"), Description("Indicates hover delay multiplier which controls how fast tooltip appears. The value set here indicates how many hover events are needed to occur before the tooltip is displayed.")]
+        public int HoverDelayMultiplier
+        {
+            get { return m_HoverTrigger; }
+            set
+            {
+                m_HoverTrigger = value;
+            }
+        }
+        
+
+        private ComboBoxItem GetComboBoxItemFromComboBoxEx(Controls.ComboBoxEx c)
+        {
+            foreach (object o in m_SuperTooltipInfo.Keys)
+            {
+                if (o is ComboBoxItem && ((ComboBoxItem)o).ComboBoxEx == c)
+                    return o as ComboBoxItem;
+            }
+            return null;
+        }
+
+        private bool IsMouseOverSuperTooltip
+        {
+            get
+            {
+                if (m_MouseOverSuperTooltip)
+                    return true;
+
+                if (m_Tooltip != null && m_Tooltip.Visible && m_Tooltip.Bounds.Contains(Control.MousePosition))
+                    return true;
+
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// Raises the MarkupLinkClick event.
+        /// </summary>
+        protected virtual void OnMarkupLinkClick(MarkupLinkClickEventArgs e)
+        {
+            if (MarkupLinkClick != null)
+                MarkupLinkClick(this, e);
+        }
+
+        /// <summary>
+        /// Shows SuperTooltip for given object that has been registered using SetSuperTooltip method at specific location on the screen.
+        /// </summary>
+        /// <param name="sender">Object to show tooltip for. Object must be registered using SetSuperTooltip method before tooltip is shown for it.</param>
+        /// <param name="screenPosition">Specifies the explicit position of the SuperTooltip in screen coordinates.</param>
+        public void ShowTooltip(object sender, Point screenPosition)
+        {
+            ShowTooltip(sender, screenPosition, true);
+        }
+
+        /// <summary>
+        /// Shows SuperTooltip for given object that has been registered using SetSuperTooltip method.
+        /// </summary>
+        /// <param name="sender">Object to show tooltip for. Object must be registered using SetSuperTooltip method before tooltip is shown for it.</param>
+        public void ShowTooltip(object sender)
+        {
+            ShowTooltip(sender, Point.Empty, false);
+        }
+
+        /// <summary>
+        /// Shows SuperTooltip for given object that has been registered using SetSuperTooltip method.
+        /// </summary>
+        /// <param name="sender">Object to show tooltip for. Object must be registered using SetSuperTooltip method before tooltip is shown for it.</param>
+        private void ShowTooltip(object sender, Point screenPosition, bool useScreenPosition)
+        {
+            if (sender is Control && ((Control)sender).Focused && !m_ShowTooltipForFocusedControl)
+                return;
+
+            Rectangle controlRect = Rectangle.Empty;
+            Rectangle actualControlRect = Rectangle.Empty;
+            bool rightToLeft = false;
+
+            // Check whether form that is hosting the control for super-tooltip is active and if not exit
+            if (!IsFormActive(sender)) return;
+
+            if (sender is Controls.ComboBoxEx)
+            {
+                BaseItem combo = GetComboBoxItemFromComboBoxEx(sender as Controls.ComboBoxEx);
+                if (combo != null) sender = combo;
+            }
+
+            if (sender is BaseItem)
+            {
+                BaseItem item = sender as BaseItem;
+                Control containerControl = GetContainerControl(item);
+                if (item is PopupItem && ((PopupItem)item).Expanded && (containerControl is RibbonBar || containerControl is RibbonStrip))
+                    return;
+                Control itemControl = containerControl;
+                if (itemControl != null)
+                {
+                    if (m_PositionBelowControl && !(itemControl is RibbonStrip && ((RibbonStrip)itemControl).QuickToolbarItems.Contains(item) || !(itemControl is RibbonBar)))
+                        controlRect = new Rectangle(itemControl.PointToScreen(Point.Empty), itemControl.Size);
+                    else
+                        controlRect = new Rectangle(itemControl.PointToScreen(item.DisplayRectangle.Location), item.DisplayRectangle.Size);
+                    actualControlRect = new Rectangle(itemControl.PointToScreen(item.DisplayRectangle.Location), item.DisplayRectangle.Size);
+                    rightToLeft = containerControl.RightToLeft == RightToLeft.Yes;
+                }
+            }
+            else if (sender is Control)
+            {
+                Control c = sender as Control;
+                controlRect = new Rectangle(c.PointToScreen(Point.Empty), c.Size);
+                actualControlRect = controlRect;
+                rightToLeft = (c.RightToLeft == RightToLeft.Yes);
+            }
+            else if (sender is TabItem)
+            {
+                TabItem tab = sender as TabItem;
+                TabStrip strip = tab.Parent;
+                controlRect = new Rectangle(strip.PointToScreen(Point.Empty), strip.Size);
+                actualControlRect = controlRect;
+                rightToLeft = (strip.RightToLeft == RightToLeft.Yes);
+            }
+            else if (sender is ISuperTooltipInfoProvider)
+            {
+                ISuperTooltipInfoProvider ip = sender as ISuperTooltipInfoProvider;
+                controlRect = ip.ComponentRectangle;
+                actualControlRect = controlRect;
+            }
+            else if (sender is AdvTree.Node || IsTreeGXType(sender.GetType()))
+            {
+                controlRect = (Rectangle)TypeDescriptor.GetProperties(sender)["CellsBounds"].GetValue(sender);
+                Control c = TypeDescriptor.GetProperties(sender)["TreeControl"].GetValue(sender) as Control;
+                if (c != null)
+                {
+                    if (m_PositionBelowControl)
+                        controlRect = new Rectangle(c.PointToScreen(Point.Empty), c.Size);
+                    else
+                        controlRect = new Rectangle(c.PointToScreen(controlRect.Location), controlRect.Size);
+                    rightToLeft = (c.RightToLeft == RightToLeft.Yes);
+                }
+                actualControlRect = controlRect;
+            }
+#if (FRAMEWORK20)
+            else if (sender is ToolStripButton)
+            {
+                ToolStripButton toolButton = sender as ToolStripButton;
+                controlRect = toolButton.Bounds;
+                actualControlRect = toolButton.Bounds;
+            }
+#endif
+
+            if (controlRect.IsEmpty)
+                return;
+
+            SuperTooltipInfo info = GetSuperTooltipInfo(sender);
+            if (info == null && sender is BaseItem)
+            {
+                // Try to find it by name...
+                foreach (object o in m_SuperTooltipInfo.Keys)
+                {
+                    if (o is BaseItem && ((BaseItem)o).Name == ((BaseItem)sender).Name)
+                    {
+                        info = m_SuperTooltipInfo[o] as SuperTooltipInfo;
+                        break;
+                    }
+                }
+            }
+            if (info == null)
+                return;
+
+            HideTooltip();
+
+            Point p=new Point(Control.MousePosition.X,Control.MousePosition.Y+(int)(SystemInformation.CursorSize.Height * .6f));
+            if (m_PositionBelowControl)
+            {
+                p.Y = Math.Max(controlRect.Bottom + 1, p.Y);
+            }
+
+            // Set the position explicitly
+            if (useScreenPosition)
+                p = screenPosition;
+
+            m_Tooltip = new SuperTooltipControl();
+            m_Tooltip.ShowTooltipDescription = m_ShowTooltipDescription;
+            m_Tooltip.MaximumWidth = m_MaximumWidth;
+            m_Tooltip.MouseActivateEnabled = false;
+            m_Tooltip.MouseEnter += new EventHandler(SuperTooltip_MouseEnter);
+            m_Tooltip.MouseLeave += new EventHandler(SuperTooltip_MouseLeave);
+            m_Tooltip.MarkupLinkClick += new MarkupLinkClickEventHandler(Tooltip_MarkupLinkClick);
+			if(m_DefaultFont!=null)
+				m_Tooltip.Font=m_DefaultFont;
+            if (rightToLeft)
+                m_Tooltip.RightToLeft = RightToLeft.Yes;
+            m_Tooltip.MinimumTooltipSize = m_MinimumTooltipSize;
+			m_Tooltip.AntiAlias = m_AntiAlias;
+
+            Size tooltipSize = Size.Empty;
+            if (m_CheckTooltipPosition || m_CheckOnScreenPosition)
+            {
+                if (!info.CustomSize.IsEmpty && info.CustomSize.Width > 0 && info.CustomSize.Height > 0)
+                    tooltipSize = info.CustomSize;
+                else
+                {
+                    m_Tooltip.UpdateWithSuperTooltipInfo(info);
+                    m_Tooltip.UpdateSuperTooltipSize(info); // RecalcSize();
+                    tooltipSize = m_Tooltip.Size;
+                }
+            }
+
+            if (m_CheckOnScreenPosition)
+            {
+                ScreenInformation screen = BarFunctions.ScreenFromPoint(p);
+                if (screen != null)
+                {
+                    Rectangle r = new Rectangle(p, tooltipSize);
+                    System.Drawing.Size layoutArea = screen.WorkingArea.Size;
+
+                    if (r.Right > screen.WorkingArea.Right)
+                    {
+                        r.X = r.X - (r.Right - screen.WorkingArea.Right);
+                        //if (r.IntersectsWith(controlRect))
+                        //{
+                        //    r.X = controlRect.X - r.Width;
+                        //}
+                    }
+                    if (r.Bottom > screen.Bounds.Bottom)
+                    {
+                        r.Y = screen.Bounds.Bottom - r.Height;
+                        //if (r.IntersectsWith(controlRect))
+                        //{
+                        //    r.Y = controlRect.Y - r.Height;
+                        //}
+                    }
+
+                    p = r.Location;
+                }
+            }
+
+            if (m_CheckTooltipPosition && !actualControlRect.IsEmpty)
+            {
+                Rectangle r = new Rectangle(p, tooltipSize);
+
+                if (r.IntersectsWith(actualControlRect))
+                {
+                    if (actualControlRect.Y - r.Height >= 0)
+                        r.Y = actualControlRect.Y - r.Height;
+                    else if (actualControlRect.X - r.Width >= 0)
+                        r.Width = actualControlRect.X - r.Width;
+
+                    p = r.Location;
+                }
+            }
+            
+            if (BeforeTooltipDisplay != null)
+            {
+                SuperTooltipEventArgs eventArgs = new SuperTooltipEventArgs(sender, info, p);
+                eventArgs.TooltipSize = tooltipSize;
+                BeforeTooltipDisplay(this, eventArgs);
+                if (eventArgs.Cancel)
+                {
+                    m_Tooltip.Dispose();
+                    m_Tooltip = null;
+                    return;
+                }
+                p = eventArgs.Location;
+            }
+
+            m_Tooltip.ShowTooltip(info, p.X, p.Y, false);
+            m_DurationDisplayed = 0;
+            CreateActiveWindowTimer();
+        }
+
+        /// <summary>
+        /// Raises the TooltipClosed event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnTooltipClosed(EventArgs e)
+        {
+            if(TooltipClosed!=null)
+                TooltipClosed(this, e);
+        }
+
+        private SuperTooltipInfo GetSuperTooltipInfo(object sender)
+        {
+            if (sender is TextBoxX && !m_SuperTooltipInfo.Contains(sender))
+            {
+                foreach (object o in m_SuperTooltipInfo.Keys)
+                {
+                    if(o is TextBoxItem && ((TextBoxItem)o).TextBox == sender)
+                        return m_SuperTooltipInfo[o] as SuperTooltipInfo;
+                }
+            }
+            else if (sender is ComboBoxEx && !m_SuperTooltipInfo.Contains(sender))
+            {
+                foreach (object o in m_SuperTooltipInfo.Keys)
+                {
+                    if (o is ComboBoxItem && ((ComboBoxItem)o).ComboBoxEx == sender)
+                        return m_SuperTooltipInfo[o] as SuperTooltipInfo;
+                }
+            }
+
+            return m_SuperTooltipInfo[sender] as SuperTooltipInfo;
+        }
+
+        private bool IsFormActive(object sender)
+        {
+            if (m_IgnoreFormActiveState) return true;
+            Control c = null;
+            if (sender is Control)
+                c = sender as Control;
+            else if (sender is BaseItem)
+                c = GetContainerControl((BaseItem)sender);
+
+            if (c != null)
+            {
+                Form f = c.FindForm();
+                if (f!=null && f.IsMdiChild && f.MdiParent.ActiveMdiChild == f)
+                    return true;
+                if (f != null && Form.ActiveForm != f)
+                    return false;
+            }
+            return true;
+        }
+
+        private void Tooltip_MarkupLinkClick(object sender, MarkupLinkClickEventArgs e)
+        {
+            OnMarkupLinkClick(e);
+        }
+
+        private bool m_MouseOverSuperTooltip = false;
+        private void SuperTooltip_MouseLeave(object sender, EventArgs e)
+        {
+            m_MouseOverSuperTooltip = false;
+            HideTooltip();
+        }
+
+        private void SuperTooltip_MouseEnter(object sender, EventArgs e)
+        {
+            m_MouseOverSuperTooltip = true;
+        }
+
+        /// <summary>
+        /// Hides tooltip if it is visible.
+        /// </summary>
+        public void HideTooltip()
+        {
+			m_HoverCount=0;
+            DestroyActiveWindowTimer();
+            DisposeHideDelayedTimer();
+            if (m_Tooltip != null)
+            {
+                m_Tooltip.Hide();
+                m_Tooltip.Dispose();
+                m_Tooltip = null;
+                OnTooltipClosed(new EventArgs());
+            }
+            m_MouseOverSuperTooltip = false;
+        }
+
+        private void HideDelayed()
+        {
+            if (m_DelayTooltipHideDuration <= 100)
+            {
+                HideTooltip();
+                return;
+            }
+
+            if (m_HideDelayedTimer == null)
+            {
+                m_HideDelayedTimer = new Timer();
+                m_HideDelayedTimer.Tick += new EventHandler(HideDelayedTimer_Tick);
+                m_HideDelayedTimer.Interval = m_DelayTooltipHideDuration;
+                m_HideDelayedTimer.Enabled = true;
+            }
+        }
+
+        private void HideDelayedTimer_Tick(object sender, EventArgs e)
+        {
+            if(!IsMouseOverSuperTooltip)
+                HideTooltip();
+        }
+
+        private void DisposeHideDelayedTimer()
+        {
+            if (m_HideDelayedTimer != null)
+            {
+                m_HideDelayedTimer.Stop();
+                m_HideDelayedTimer.Enabled = false;
+                m_HideDelayedTimer.Dispose();
+                m_HideDelayedTimer = null;
+            }
+        }
+
+        private void CreateActiveWindowTimer()
+        {
+            if (m_ActiveWindowTimer != null || m_TimerOperation)
+                return;
+            m_TimerOperation = true;
+            try
+            {
+                m_ActiveWindowPtr = NativeFunctions.GetActiveWindow();
+                m_ActiveWindowTimer = new Timer();
+                m_ActiveWindowTimer.Interval = 300;
+                m_ActiveWindowTimer.Tick += new EventHandler(ActiveWindowTimerTick);
+                m_ActiveWindowTimer.Start();
+            }
+            finally
+            {
+                m_TimerOperation = false;
+            }
+        }
+
+        void ActiveWindowTimerTick(object sender, EventArgs e)
+        {
+            m_DurationDisplayed += m_ActiveWindowTimer.Interval;
+            if (m_ActiveWindowPtr != IntPtr.Zero)
+            {
+                IntPtr active = NativeFunctions.GetActiveWindow();
+                if (active != m_ActiveWindowPtr)
+                {
+                    m_ActiveWindowTimer.Stop();
+                    HideTooltip();
+                    return;
+                }
+            }
+            
+            if (m_TooltipDuration > 0 && m_DurationDisplayed > m_TooltipDuration * 1000 && !m_MouseOverSuperTooltip)
+            {
+                m_ActiveWindowTimer.Stop();
+                HideTooltip();
+            }
+        }
+
+        private bool m_TimerOperation = false;
+        private void DestroyActiveWindowTimer()
+        {
+            if (m_TimerOperation) return;
+            m_TimerOperation = true;
+            try
+            {
+                if (m_ActiveWindowTimer != null)
+                {
+                    m_ActiveWindowTimer.Enabled = false;
+                    m_ActiveWindowTimer.Stop();
+                    m_ActiveWindowTimer.Tick -= new EventHandler(ActiveWindowTimerTick);
+                    m_ActiveWindowTimer.Dispose();
+                    m_ActiveWindowTimer = null;
+                }
+            }
+            finally
+            {
+                m_TimerOperation = false;
+            }
+        }
+
+        /// <summary>
+        /// Returns whether tooltip is visible.
+        /// </summary>
+        [Browsable(false)]
+        public bool IsTooltipVisible
+        {
+            get
+            {
+                if (m_Tooltip != null && m_Tooltip.Visible)
+                    return true;
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// Gets reference to instance of tooltip control if any has been created at the time call is made.
+        /// </summary>
+        [Browsable(false)]
+        public SuperTooltipControl SuperTooltipControl
+        {
+            get { return m_Tooltip; }
+        }
+
+		/// <summary>
+		/// Gets or sets default tooltip font. Default value is null which means that default system font is used.
+		/// </summary>
+		[Browsable(true), DefaultValue(null), Category("Appearance"), Description("Indicates default tooltip font.")]
+		public Font DefaultFont
+		{
+			get {return m_DefaultFont;}
+			set {m_DefaultFont=value;}
+		}
+
+        /// <summary>
+        /// Resets Hoover timer.
+        /// </summary>
+        private void ResetHover(Control c)
+        {
+            if (c==null || !BarFunctions.IsHandleValid(c))
+                return;
+            // We need to reset hover thing since it is fired only first time mouse hovers inside the window and we need it for each of our items
+            NativeFunctions.TRACKMOUSEEVENT tme = new NativeFunctions.TRACKMOUSEEVENT();
+            tme.dwFlags = NativeFunctions.TME_QUERY;
+            tme.hwndTrack = c.Handle;
+            tme.cbSize = System.Runtime.InteropServices.Marshal.SizeOf(tme);
+            NativeFunctions.TrackMouseEvent(ref tme);
+            tme.dwFlags = tme.dwFlags | NativeFunctions.TME_HOVER;
+            NativeFunctions.TrackMouseEvent(ref tme);
+        }
+
+        /// <summary>
+        /// Gets or sets whether complete tooltip is shown including header, body and footer. Default value is true. When set to false only tooltip header will be shown.
+        /// Providing this option to your end users as part of your application setting allows them to customize the level of information displayed and reduce it after they are familiar with your product.
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Behavior"), Description("Indicates whether complete tooltip is shown including header, body and footer. When set to false only tooltip header is shown.")]
+        public bool ShowTooltipDescription
+        {
+            get
+            {
+                return m_ShowTooltipDescription;
+            }
+            set
+            {
+                m_ShowTooltipDescription = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether tooltip is shown when control that tooltip is assigned to is focused. You can set this value to false to disable Tooltip display when control receives input focus. Default value is true.
+        /// </summary>
+        /// <remarks>This property is effective only when Super Tooltip is assigned to the controls that inherit from System.Windows.Forms.Control class and it relies on Focused property of respective control for proper function.</remarks>
+        [Browsable(true), DefaultValue(true), Category("Behavior"), Description("Indicates whether tooltip is shown when control that tooltip is assigned to is focused.")]
+        public bool ShowTooltipForFocusedControl
+        {
+            get
+            {
+                return m_ShowTooltipForFocusedControl;
+            }
+            set
+            {
+                m_ShowTooltipForFocusedControl = value;
+            }
+        }
+
+        private bool IsTreeGXType(Type type)
+        {
+            return type.BaseType.FullName == TREEGX_NODE_CLASS_NAME || type.FullName == TREEGX_NODE_CLASS_NAME;
+        }
+        #endregion
+
+        #region IExtenderProvider Members
+
+        public bool CanExtend(object extendee)
+        {
+            if (extendee is Control || extendee is BaseItem ||
+                extendee is ISuperTooltipInfoProvider || IsTreeGXType(extendee.GetType()) ||
+                extendee is TabItem)
+                return true;
+#if FRAMEWORK20
+            if (extendee is ToolStripButton) return true;
+#endif
+#if (!NOTREE)
+            if (extendee is DevComponents.AdvTree.Node) return true;
+#endif
+            return false;
+        }
+
+        #endregion
+
+        #region Licensing
+#if !TRIAL
+        private string m_LicenseKey = "";
+        [Browsable(false), DefaultValue("")]
+        public string LicenseKey
+        {
+            get { return m_LicenseKey; }
+            set
+            {
+                if (NativeFunctions.ValidateLicenseKey(value))
+                    return;
+                m_LicenseKey = (!NativeFunctions.CheckLicenseKey(value) ? "9dsjkhds7" : value);
+            }
+        }
+#endif
+        #endregion
+    }
+
+    #region SuperTooltipInfo Class
+    /// <summary>
+    /// Provides information about SuperTooltip attached to a component.
+    /// </summary>
+    [TypeConverter("DevComponents.DotNetBar.Design.SuperTooltipInfoConverter, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf"), DesignTimeVisible(false), ToolboxItem(false), Localizable(true)]
+    public class SuperTooltipInfo
+    {
+        private bool m_HeaderVisible=true;
+        private bool m_FooterVisible=true;
+        private string m_HeaderText="";
+        private string m_FooterText="";
+        private Image m_FooterImage=null;
+        private string m_BodyText="";
+        private Image m_BodyImage=null;
+        private Size m_CustomSize = Size.Empty;
+        private eTooltipColor m_Color = eTooltipColor.Gray;
+
+        /// <summary>
+        /// Creates new instance of the class.
+        /// </summary>
+        public SuperTooltipInfo()
+        {
+        }
+
+        /// <summary>
+        /// Creates new instance of the class with specified parameters.
+        /// </summary>
+        public SuperTooltipInfo(string headerText, string footerText, string bodyText, Image bodyImage, Image footerImage, eTooltipColor color, bool headerVisible, bool footerVisible, Size customSize)
+        {
+            m_HeaderText = headerText;
+            m_FooterText = footerText;
+            m_BodyText = bodyText;
+            m_BodyImage = bodyImage;
+			m_FooterImage = footerImage;
+            m_HeaderVisible = headerVisible;
+            m_FooterVisible = footerVisible;
+            m_CustomSize = customSize;
+			m_Color=color;
+        }
+
+        /// <summary>
+        /// Creates new instance of the class with specified parameters.
+        /// </summary>
+        public SuperTooltipInfo(string headerText, string footerText, string bodyText, Image bodyImage, Image footerImage, eTooltipColor color)
+        {
+            m_HeaderText = headerText;
+            m_FooterText = footerText;
+            m_BodyText = bodyText;
+            m_BodyImage = bodyImage;
+            m_FooterImage = footerImage;
+            m_Color = color;
+        }
+
+        /// <summary>
+        /// Gets or sets whether tooltip header text is visible or not. Default value is true.
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Description("Indicates whether header text is visible."), Localizable(true)]
+        public bool HeaderVisible
+        {
+            get { return m_HeaderVisible; }
+            set { m_HeaderVisible = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether tooltip footer text is visible or not. Default value is true.
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Description("Indicates whether footer text is visible."), Localizable(true)]
+        public bool FooterVisible
+        {
+            get { return m_FooterVisible; }
+            set { m_FooterVisible = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the header text.
+        /// </summary>
+        [Browsable(true), DefaultValue(""), Description("Indicates header text."), Localizable(true)]
+        public string HeaderText
+        {
+            get { return m_HeaderText; }
+            set { m_HeaderText = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the footer text.
+        /// </summary>
+        [Browsable(true), DefaultValue(""), Description("Indicates footer text."), Localizable(true)]
+        public string FooterText
+        {
+            get { return m_FooterText; }
+            set { m_FooterText = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets body text.
+        /// </summary>
+        [Browsable(true), DefaultValue(""), Description("Indicates body text."), Localizable(true)]
+        public string BodyText
+        {
+            get { return m_BodyText; }
+            set { m_BodyText = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets body image displayed to the left of body text.
+        /// </summary>
+        [Browsable(true), DefaultValue(null), Description("Indicates body image displayed to the left of body text."), Localizable(true)]
+        public Image BodyImage
+        {
+            get { return m_BodyImage; }
+            set { m_BodyImage = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets footer image displayed to the left of footer text.
+        /// </summary>
+        [Browsable(true), DefaultValue(null), Description("Indicates footer image displayed to the left of footer text."), Localizable(true)]
+        public Image FooterImage
+        {
+            get { return m_FooterImage; }
+            set { m_FooterImage = value; }
+        }
+
+
+        /// <summary>
+        /// Gets or sets the custom size for tooltip. Default value is 0,0 which indicates that tooltip is automatically
+        /// resized based on the content.
+        /// </summary>
+        [Browsable(true), Description("Indicates custom size for tooltip."), Localizable(true)]
+        public Size CustomSize
+        {
+            get { return m_CustomSize; }
+            set { m_CustomSize = value; }
+        }
+
+        /// <summary>
+        /// Returns whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeCustomSize()
+        {
+            return !m_CustomSize.IsEmpty;
+        }
+
+        /// <summary>
+        /// Gets or sets predefined tooltip color.
+        /// </summary>
+        [Browsable(true), DefaultValue(eTooltipColor.Gray), Description("Indicates predefined tooltip color."), Localizable(true)]
+        public eTooltipColor Color
+        {
+            get { return m_Color; }
+            set { m_Color = value; }
+        }
+    }
+    #endregion
+
+    #region ISuperTooltipInfoProvider
+    /// <summary>
+    /// Extensibility interface that custom components may implement
+    /// so SuperTooltip can be provided for them.
+    /// </summary>
+    public interface ISuperTooltipInfoProvider
+    {
+        /// <summary>
+        /// This event should be triggered by the component when it wants to display SuperTooltip. Normally
+        /// this event would be equivalent of MouseHover event but you can trigger it in response to anything else.
+        /// Sender for this event must be object that implements ISuperTooltipInfoProvider interface.
+        /// </summary>
+        event EventHandler DisplayTooltip;
+        /// <summary>
+        /// This event should be triggered by component when it wants to hide SuperTooltip. For example this event
+        /// might be triggered when mouse leaves your component. Sender of this event must be object that implements ISuperTooltipInfoProvider interface.
+        /// </summary>
+        event EventHandler HideTooltip;
+        /// <summary>
+        /// Returns rectangle of the visible area of the component in screen coordinates. This rectangle is used
+        /// to position SuperTooltip on the screen.
+        /// </summary>
+        Rectangle ComponentRectangle { get;}
+    }
+    #endregion
+
+    #region SuperTooltipEventArgs
+    /// <summary>
+    /// Delegate for SuperTooltip events.
+    /// </summary>
+    public delegate void SuperTooltipEventHandler(object sender, SuperTooltipEventArgs e);
+
+    /// <summary>
+    /// Represents event arguments for PanelChanging event.
+    /// </summary>
+    public class SuperTooltipEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Set to true to cancel display of tooltip.
+        /// </summary>
+        public bool Cancel = false;
+        /// <summary>
+        /// Object that has triggered displaying of tooltip
+        /// </summary>
+        public readonly object Source;
+        /// <summary>
+        /// Information that will be used to populate tooltip.
+        /// </summary>
+        public readonly SuperTooltipInfo TooltipInfo;
+        /// <summary>
+        /// Location where tooltip will be displayed. You can change the location here to display tooltip at different position.
+        /// </summary>
+        public Point Location;
+        /// <summary>
+        /// Indicates the tooltip size, read-only and valid only if tooltip position is checked on screen.
+        /// </summary>
+        public Size TooltipSize;
+        /// <summary>
+        /// Default constructor.
+        /// </summary>
+        public SuperTooltipEventArgs(object source, SuperTooltipInfo info, Point location)
+        {
+            this.Source = source;
+            this.TooltipInfo = info;
+            this.Location = location;
+        }
+    }
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/Ribbon/SuperTooltip.ico b/PROMS/DotNetBar Source Code/Ribbon/SuperTooltip.ico
new file mode 100644
index 00000000..d5bd29ee
Binary files /dev/null and b/PROMS/DotNetBar Source Code/Ribbon/SuperTooltip.ico differ
diff --git a/PROMS/DotNetBar Source Code/Ribbon/SuperTooltipControl.cs b/PROMS/DotNetBar Source Code/Ribbon/SuperTooltipControl.cs
new file mode 100644
index 00000000..eb17a564
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Ribbon/SuperTooltipControl.cs	
@@ -0,0 +1,1437 @@
+using System;
+using System.Globalization;
+using System.Windows.Forms;
+using System.Drawing;
+using System.ComponentModel;
+using DevComponents.DotNetBar.Rendering;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represents SuperTooltipControl.
+    /// </summary>
+    [ToolboxItem(false)]
+    public class SuperTooltipControl:PanelControl
+    {
+        #region Events
+        
+        #endregion
+
+        #region Private variables, Constructor
+        const long WS_POPUP = 0x80000000L;
+        const long WS_CLIPSIBLINGS = 0x04000000L;
+        const long WS_CLIPCHILDREN = 0x02000000L;
+        const long WS_EX_TOOLWINDOW = 0x00000080L;
+        const long WS_EX_TOPMOST = 0x00000008L;
+
+        private string m_HeaderText="";
+        private TextMarkup.BodyElement m_HeaderMarkup = null;
+        private string m_FooterText = "";
+        private TextMarkup.BodyElement m_FooterMarkup = null;
+        private Image m_FooterImage = null;
+        private Image m_BodyImage = null;
+        private Size m_MinimumTooltipSize = new Size(100,18);
+        private bool m_HeaderVisible = true;
+        private bool m_FooterVisible = true;
+        private bool m_FooterSeparator = true;
+        private int m_FooterImageSpacing = 8;
+        private PopupShadow m_DropShadow = null;
+        private bool m_StandardControl = false;
+        private TextMarkup.BodyElement m_BodyMarkup = null;
+        private bool m_MouseActivateEnabled = true;
+        private int m_MaximumWidth = 0;
+        private bool m_ShowTooltipDescription = true;
+
+        /// <summary>
+        ///     Default constructor.
+        /// </summary>
+        public SuperTooltipControl():base()
+        {
+            
+        }
+        #endregion
+
+        #region Internal Implementation
+        /// <summary>
+        /// Gets or sets whether complete tooltip is shown including header, body and footer. Default value is true. When set to false only tooltip header will be shown.
+        /// Providing this option to your end users as part of your application setting allows them to customize the level of information displayed and reduce it after they are familiar with your product.
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Behavior"), Description("Indicates whether complete tooltip is shown including header, body and footer. When set to false only tooltip header is shown.")]
+        public bool ShowTooltipDescription
+        {
+            get
+            {
+                return m_ShowTooltipDescription;
+            }
+            set
+            {
+                m_ShowTooltipDescription = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the maximum width of the super tooltip. Default value is 0 which indicates that maximum width is not used. The maximum width property
+        /// will not be used if custom size is specified.
+        /// </summary>
+        [Browsable(true), DefaultValue(0), Category("Appearance"), Description("Indicates maximum width of the super tooltip.")]
+        public int MaximumWidth
+        {
+            get { return m_MaximumWidth; }
+            set { m_MaximumWidth = value; }
+        }
+
+        private eTooltipColor m_PredefinedColor = eTooltipColor.Default;
+        [DefaultValue(eTooltipColor.Default)]
+        public eTooltipColor PredefinedColor
+        {
+            get { return m_PredefinedColor; }
+            set
+            {
+                m_PredefinedColor = value;
+                this.ApplyColors(value);
+                this.Refresh();
+            }
+        }
+
+        internal TextMarkup.BodyElement BodyMarkup
+        {
+            get { return m_BodyMarkup; }
+        }
+
+        /// <summary>
+        /// Gets or sets the minimum tooltip size. Default value is 150, 50
+        /// </summary>
+        public Size MinimumTooltipSize
+        {
+            get { return m_MinimumTooltipSize; }
+            set { m_MinimumTooltipSize = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets image used next to body text.
+        /// </summary>
+        [DefaultValue(null)]
+        public Image BodyImage
+        {
+            get { return m_BodyImage; }
+            set { m_BodyImage = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets image used next to footer text.
+        /// </summary>
+        [DefaultValue(null)]
+        public Image FooterImage
+        {
+            get { return m_FooterImage; }
+            set { m_FooterImage = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets text displayed in header of tooltip
+        /// </summary>
+        [Browsable(true),DefaultValue("")]
+        public string HeaderText
+        {
+            get { return m_HeaderText; }
+            set
+            {
+                m_HeaderText = value;
+                if (TextMarkup.MarkupParser.IsMarkup(ref m_HeaderText))
+                {
+                    m_HeaderMarkup = TextMarkup.MarkupParser.Parse(m_HeaderText);
+                    if (m_HeaderMarkup != null)
+                        m_HeaderMarkup.HyperLinkClick += new EventHandler(Markup_HyperLinkClick);
+                }
+                else
+                    m_HeaderMarkup = null;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether header in tooltip is visible. Default value is true.
+        /// </summary>
+        [DefaultValue(true)]
+        public bool HeaderVisible
+        {
+            get { return m_HeaderVisible; }
+            set
+            {
+                m_HeaderVisible = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets text displayed in footer of the tooltip
+        /// </summary>
+        [Browsable(true), DefaultValue("")]
+        public string FooterText
+        {
+            get { return m_FooterText; }
+            set
+            {
+                m_FooterText = value;
+                if (TextMarkup.MarkupParser.IsMarkup(ref m_FooterText))
+                {
+                    m_FooterMarkup = TextMarkup.MarkupParser.Parse(m_FooterText);
+                    if (m_FooterMarkup != null)
+                        m_FooterMarkup.HyperLinkClick += new EventHandler(Markup_HyperLinkClick);
+                }
+                else
+                    m_FooterMarkup = null;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether footer in tooltip is visible. Default value is true.
+        /// </summary>
+        [DefaultValue(true)]
+        public bool FooterVisible
+        {
+            get { return m_FooterVisible; }
+            set
+            {
+                m_FooterVisible = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether line above footer text is drawn to separate footer from body text. Default value is true.
+        /// </summary>
+        [Browsable(true),DefaultValue(true)]
+        public bool FooterSeparator
+        {
+            get { return m_FooterSeparator; }
+            set { m_FooterSeparator = value; }
+        }
+#if FRAMEWORK20
+        public override Size GetPreferredSize(Size proposedSize)
+        {
+            if (!BarFunctions.IsHandleValid(this))
+                return proposedSize;
+            return GetAutoSize();
+        }
+#endif
+
+        /// <summary>
+        /// Gets or sets whether mouse click on super tooltip will activate it, make it active window. Default value is true.
+        /// </summary>
+        [DefaultValue(true)]
+        public bool MouseActivateEnabled
+        {
+            get { return m_MouseActivateEnabled; }
+            set
+            {
+                m_MouseActivateEnabled = value;
+            }
+        }
+
+        protected override void OnTextChanged(EventArgs e)
+        {
+            string s = this.Text;
+            if (TextMarkup.MarkupParser.IsMarkup(ref s))
+            {
+                m_BodyMarkup = TextMarkup.MarkupParser.Parse(s);
+                if(m_BodyMarkup!=null)
+                    m_BodyMarkup.HyperLinkClick += new EventHandler(Markup_HyperLinkClick);
+            }
+            else
+                m_BodyMarkup = null;
+
+            base.OnTextChanged(e);
+        }
+
+        private void Markup_HyperLinkClick(object sender, EventArgs e)
+        {
+            TextMarkup.HyperLink link = sender as TextMarkup.HyperLink;
+            if (link != null)
+            {
+                OnMarkupLinkClick(new MarkupLinkClickEventArgs(link.Name, link.HRef));
+            }
+        }
+
+        protected override void OnMouseMove(MouseEventArgs e)
+        {
+            if (m_BodyMarkup != null)
+                m_BodyMarkup.MouseMove(this, e);
+            if (m_HeaderMarkup != null)
+                m_HeaderMarkup.MouseMove(this, e);
+            if (m_FooterMarkup != null)
+                m_FooterMarkup.MouseMove(this, e);
+            
+            base.OnMouseMove(e);
+        }
+
+        protected override void OnMouseDown(MouseEventArgs e)
+        {
+            if (m_BodyMarkup != null)
+                m_BodyMarkup.MouseDown(this, e);
+            if (m_HeaderMarkup != null)
+                m_HeaderMarkup.MouseDown(this, e);
+            if (m_FooterMarkup != null)
+                m_FooterMarkup.MouseDown(this, e);
+
+            base.OnMouseDown(e);
+        }
+
+        protected override void OnMouseUp(MouseEventArgs e)
+        {
+            if (m_BodyMarkup != null)
+                m_BodyMarkup.MouseUp(this, e);
+            if (m_HeaderMarkup != null)
+                m_HeaderMarkup.MouseUp(this, e);
+            if (m_FooterMarkup != null)
+                m_FooterMarkup.MouseUp(this, e);
+
+            base.OnMouseUp(e);
+        }
+
+        protected override void OnMouseLeave(EventArgs e)
+        {
+            if (m_BodyMarkup != null)
+                m_BodyMarkup.MouseLeave(this);
+            if (m_HeaderMarkup != null)
+                m_HeaderMarkup.MouseLeave(this);
+            if (m_FooterMarkup != null)
+                m_FooterMarkup.MouseLeave(this);
+
+            base.OnMouseLeave(e);
+        }
+
+        protected override void OnClick(EventArgs e)
+        {
+            if (m_BodyMarkup != null)
+                m_BodyMarkup.Click(this);
+            if (m_HeaderMarkup != null)
+                m_HeaderMarkup.Click(this);
+            if (m_FooterMarkup != null)
+                m_FooterMarkup.Click(this);
+            base.OnClick(e);
+        }
+
+        protected override void WndProc(ref Message m)
+        {
+            if (m.Msg == (int)WinApi.WindowsMessages.WM_MOUSEACTIVATE && !m_MouseActivateEnabled)
+            {
+                const int MA_NOACTIVATE = 3;
+                m.Result = new System.IntPtr(MA_NOACTIVATE);
+                return;
+            }
+            base.WndProc(ref m);
+        }
+
+        /// <summary>
+        /// Paints insides of the control.
+        /// </summary>
+        /// <param name="e">Paint event arguments.</param>
+        protected override void PaintInnerContent(PaintEventArgs e, ElementStyle style, bool paintText)
+        {
+            base.PaintInnerContent(e, style, false);
+            if (!paintText)
+                return;
+
+            Rectangle r = this.ClientRectangle;
+            r.X += ElementStyleLayout.LeftWhiteSpace(this.Style);
+            r.Width -= ElementStyleLayout.HorizontalStyleWhiteSpace(this.Style);
+            r.Y += ElementStyleLayout.TopWhiteSpace(this.Style);
+            r.Height -= ElementStyleLayout.VerticalStyleWhiteSpace(this.Style);
+            if (r.Width <= 4 || r.Height <= 4) return;
+
+            Graphics g = e.Graphics;
+
+            Font font = this.Font;
+            if (this.Style.Font != null)
+                font = this.Style.Font;
+            Font headerFont = new Font(font, (m_ShowTooltipDescription || m_HeaderText == "") ? FontStyle.Bold : FontStyle.Regular);
+            Padding headerPadding = GetHeaderPadding();
+            Padding footerPadding = GetFooterPadding();
+            Padding textPadding = GetTextPadding();
+            Padding imagePadding = GetImagePadding();
+
+            try
+            {
+                ElementStyleDisplayInfo info = new ElementStyleDisplayInfo(style, g, Rectangle.Empty);
+                if (m_HeaderText != "" && HeaderVisible)
+                {
+                    Rectangle headerRect = new Rectangle(r.X + headerPadding.Left, r.Y + headerPadding.Top, r.Width - headerPadding.Horizontal, r.Height - headerPadding.Vertical);
+                    Size headerSize = Size.Empty;
+                    if (m_HeaderMarkup == null)
+                    {
+                        info.Bounds = headerRect;
+                        eTextFormat format = eTextFormat.Default | eTextFormat.WordBreak;
+                        if (this.RightToLeft == RightToLeft.Yes) format |= eTextFormat.RightToLeft;
+                        ElementStyleDisplay.PaintText(info, m_HeaderText, headerFont, true, format);
+                        headerSize = TextDrawing.MeasureString(g, m_HeaderText, headerFont, headerRect.Width, format);
+                    }
+                    else if(headerRect.Width>0 && headerRect.Height>0)
+                    {
+                        TextMarkup.MarkupDrawContext d = new TextMarkup.MarkupDrawContext(g, font, info.Style.TextColor,
+                            (this.RightToLeft == RightToLeft.Yes), headerRect, true);
+                        m_HeaderMarkup.Arrange(headerRect, d);
+                        m_HeaderMarkup.Render(d);
+                        headerSize = m_HeaderMarkup.Bounds.Size;
+                    }
+                    headerSize.Width += headerPadding.Horizontal;
+                    headerSize.Height += headerPadding.Vertical;
+                    r.Y += headerSize.Height;
+                    r.Height -= headerSize.Height;
+                }
+
+                if (m_FooterText != "" && FooterVisible && r.Width>0 && r.Height>0 && (m_ShowTooltipDescription || m_HeaderText==""))
+                {
+                    Size footerSize = Size.Empty;
+                    eTextFormat format = eTextFormat.Default | eTextFormat.WordBreak;
+                    if (m_FooterMarkup == null)
+                        footerSize = TextDrawing.MeasureString(g, m_FooterText, headerFont, r.Width - footerPadding.Horizontal, format);
+                    else
+                        footerSize = m_FooterMarkup.Bounds.Size;
+
+                    if (m_FooterImage != null && m_FooterImage.Height > footerSize.Height)
+                        footerSize.Height = m_FooterImage.Height;
+
+                    Rectangle footerRect = new Rectangle(r.X+footerPadding.Left,
+                        r.Bottom-footerSize.Height-footerPadding.Bottom,
+                        r.Width - footerPadding.Horizontal, footerSize.Height);
+                    if (this.FooterSeparator)
+                    {
+                        using (Pen pen = new Pen(style.BorderColor, 1))
+                            g.DrawLine(pen, 0, footerRect.Y - footerPadding.Top - 1, this.ClientRectangle.Right, footerRect.Y - footerPadding.Top - 1);
+                    }
+                    if (m_FooterImage != null)
+                    {
+                        g.DrawImage(m_FooterImage, new Rectangle(footerRect.X, footerRect.Y + (footerRect.Height - m_FooterImage.Height) / 2, m_FooterImage.Width, m_FooterImage.Height));
+                        footerRect.X += (m_FooterImage.Width + m_FooterImageSpacing);
+                        footerRect.Width -= (m_FooterImage.Width + m_FooterImageSpacing);
+                    }
+                    if (footerRect.Width > 0 && footerRect.Height > 0)
+                    {
+                        if (m_FooterMarkup == null)
+                        {
+                            info.Bounds = footerRect;
+
+                            format |= eTextFormat.VerticalCenter;
+                            if (this.RightToLeft == RightToLeft.Yes) format |= eTextFormat.RightToLeft;
+                            ElementStyleDisplay.PaintText(info, m_FooterText, headerFont, true, format);
+                        }
+                        else
+                        {
+                            TextMarkup.MarkupDrawContext d = new TextMarkup.MarkupDrawContext(g, font, info.Style.TextColor,
+                            (this.RightToLeft == RightToLeft.Yes), footerRect, true);
+                            m_FooterMarkup.Arrange(footerRect, d);
+                            m_FooterMarkup.Render(d);
+                            footerSize = m_FooterMarkup.Bounds.Size;
+                        }
+                    }
+
+                    footerSize.Width += footerPadding.Horizontal;
+                    footerSize.Height += footerPadding.Vertical;
+                    r.Height -= footerSize.Height;
+                }
+
+                if (m_ShowTooltipDescription || m_HeaderText == "")
+                {
+                    if (m_BodyImage != null)
+                    {
+                        Rectangle imageRect = new Rectangle(r.X + imagePadding.Left, r.Y + imagePadding.Top, m_BodyImage.Width, m_BodyImage.Height);
+                        g.DrawImage(m_BodyImage, imageRect);
+                        r.X += (imagePadding.Horizontal + m_BodyImage.Width);
+                        r.Width -= (imagePadding.Horizontal + m_BodyImage.Width);
+                    }
+
+                    if (this.Text != "" && r.Width > 0 && r.Height > 0)
+                    {
+                        Rectangle textRect = new Rectangle(r.X + textPadding.Left, r.Y + textPadding.Top, r.Width - textPadding.Horizontal, r.Height - textPadding.Vertical);
+                        if (m_BodyMarkup == null)
+                        {
+                            info.Bounds = textRect;
+                            if (textRect.Width > 0 && textRect.Height > 0)
+                            {
+                                eTextFormat format = info.Style.TextFormat;
+                                if (this.RightToLeft == RightToLeft.Yes) format |= eTextFormat.RightToLeft;
+                                ElementStyleDisplay.PaintText(info, this.Text, font, false, format);
+                            }
+                        }
+                        else if (textRect.Width > 0 && textRect.Height > 0)
+                        {
+                            TextMarkup.MarkupDrawContext d = new TextMarkup.MarkupDrawContext(g, font, info.Style.TextColor,
+                                (this.RightToLeft == RightToLeft.Yes), textRect, true);
+                            m_BodyMarkup.Arrange(textRect, d);
+                            m_BodyMarkup.Render(d);
+                        }
+                    }
+                }
+            }
+            finally
+            {
+                headerFont.Dispose();
+            }
+        }
+
+        private Padding GetHeaderPadding()
+        {
+            return new Padding(6, 6, 2, 2);
+        }
+
+        private Padding GetFooterPadding()
+        {
+            return new Padding(6, 6, 4, 6);
+        }
+
+        private Padding GetTextPadding()
+        {
+            if ((m_HeaderText == "" || !HeaderVisible) && (m_FooterText == "" || !FooterVisible))
+                return new Padding(1, 1, 1, 1);
+            if(this.RightToLeft==RightToLeft.Yes)
+                return new Padding(6, 14, 4, 4);
+            else
+                return new Padding(14, 6, 4, 4);
+        }
+
+        private Padding GetImagePadding()
+        {
+            return new Padding(6, 6, 6, 6);
+        }
+
+        /// <summary>
+        /// Recalculates and set size of the control based on the content that is made available to it.
+        /// </summary>
+        public void RecalcSize()
+        {
+            this.Size = GetAutoSize();
+        }
+
+        /// <summary>
+        /// Calculates the tooltip height based on the specified width.
+        /// </summary>
+        /// <param name="width">Tooltip width</param>
+        /// <returns>Size of the tooltip based on specified width.</returns>
+        public Size GetFixedWidthSize(int width)
+        {
+            Padding headerPadding = GetHeaderPadding();
+            Padding footerPadding = GetFooterPadding();
+            Padding textPadding = GetTextPadding();
+            Padding imagePadding = GetImagePadding();
+
+            Size size = Size.Empty;
+            int innerWidth = width - ElementStyleLayout.HorizontalStyleWhiteSpace(this.Style);
+            if (innerWidth <= 6) innerWidth = 16;
+            Font font = this.Font;
+            if (this.Style.Font != null)
+                font = this.Style.Font;
+
+            Font headerFont = new Font(font, (m_ShowTooltipDescription || m_HeaderText == "") ? FontStyle.Bold : FontStyle.Regular);
+            Graphics g = this.CreateGraphics();
+
+            if (this.AntiAlias)
+            {
+                g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.AntiAlias;
+                g.TextRenderingHint = DisplayHelp.AntiAliasTextRenderingHint;
+            }
+
+            try
+            {
+                if (m_HeaderText != "" && HeaderVisible)
+                {
+                    Size headerSize = Size.Empty;
+                    int w = innerWidth - headerPadding.Horizontal;
+                    if (w <= 1) w = 2;
+
+                    if (m_HeaderMarkup == null)
+                    {
+                        headerSize = TextDrawing.MeasureString(g, m_HeaderText, headerFont, w, eTextFormat.Default | eTextFormat.WordBreak);
+                    }
+                    else
+                    {
+                        TextMarkup.MarkupDrawContext d = new TextMarkup.MarkupDrawContext(g, font, Color.Black, (this.RightToLeft == RightToLeft.Yes));
+                        m_HeaderMarkup.Measure(new Size(w, 1), d);
+                        headerSize = m_HeaderMarkup.Bounds.Size;
+                        m_HeaderMarkup.Arrange(new Rectangle(Point.Empty, headerSize), d);
+                        headerSize = m_HeaderMarkup.Bounds.Size;
+                    }
+                    //headerSize.Width += 2;
+                    headerSize.Height += 2;
+                    //headerSize.Width += headerPadding.Horizontal;
+                    headerSize.Height += headerPadding.Vertical;
+                    //if (headerSize.Width > size.Width)
+                    //    size.Width = headerSize.Width;
+                    size.Height += headerSize.Height;
+                }
+
+                if (m_FooterText != "" && FooterVisible && (m_ShowTooltipDescription || m_HeaderText == ""))
+                {
+                    Size footerSize = Size.Empty;
+                    int w = innerWidth - footerPadding.Horizontal;
+                    if (m_FooterImage != null)
+                        w-= (m_FooterImage.Width + m_FooterImageSpacing);
+                    if (w <= 1) w = 2;
+
+                    if (m_FooterMarkup == null)
+                    {
+                        footerSize = TextDrawing.MeasureString(g, m_FooterText, headerFont, w, eTextFormat.Default | eTextFormat.WordBreak);
+                    }
+                    else
+                    {
+                        TextMarkup.MarkupDrawContext d = new TextMarkup.MarkupDrawContext(g, font, Color.Black, (this.RightToLeft == RightToLeft.Yes));
+                        m_FooterMarkup.Measure(new Size(w, 1), d);
+                        footerSize = m_FooterMarkup.Bounds.Size;
+                        m_FooterMarkup.Arrange(new Rectangle(Point.Empty, footerSize), d);
+                        footerSize = m_FooterMarkup.Bounds.Size;
+                    }
+                    //footerSize.Width += 2;
+                    footerSize.Height += 2;
+                    if (m_FooterImage != null)
+                    {
+                        //footerSize.Width += (m_FooterImage.Width + m_FooterImageSpacing);
+                        if (m_FooterImage.Height > footerSize.Height)
+                            footerSize.Height = m_FooterImage.Height;
+                    }
+                    //footerSize.Width += footerPadding.Horizontal;
+                    footerSize.Height += footerPadding.Vertical;
+                    //if (footerSize.Width > size.Width)
+                    //    size.Width = footerSize.Width;
+                    size.Height += footerSize.Height;
+                }
+
+                if (m_ShowTooltipDescription || m_HeaderText == "")
+                {
+                    if (this.Text != "")
+                    {
+                        int textArea = innerWidth - textPadding.Horizontal;
+                        if (m_BodyImage != null)
+                            textArea -= (m_BodyImage.Width + imagePadding.Horizontal);
+
+                        if (textArea <= 1)
+                            textArea = 2;
+
+                        Size textSize = Size.Empty;
+
+                        if (m_BodyMarkup == null)
+                        {
+                            textSize = TextDrawing.MeasureString(g, this.Text, font, textArea, this.Style.TextFormat);
+                        }
+                        else
+                        {
+                            TextMarkup.MarkupDrawContext d = new TextMarkup.MarkupDrawContext(g, font, Color.Black, (this.RightToLeft == RightToLeft.Yes));
+                            m_BodyMarkup.Measure(new Size(textArea, 1), d);
+                            textSize = m_BodyMarkup.Bounds.Size;
+
+                            if (textSize.Height > textSize.Width * 1.75)
+                                textArea = (int)(textSize.Height * .75);
+
+                            m_BodyMarkup.Arrange(new Rectangle(Point.Empty, new Size(textArea, 1)), d);
+                            textSize = m_BodyMarkup.Bounds.Size;
+                        }
+
+                        //textSize.Width += textPadding.Horizontal;
+                        textSize.Height += textPadding.Vertical;
+
+                        if (m_BodyImage != null)
+                        {
+                            //textSize.Width += (m_BodyImage.Width + imagePadding.Horizontal);
+                            if (m_BodyImage.Height + imagePadding.Vertical > textSize.Height)
+                                textSize.Height = (m_BodyImage.Height + imagePadding.Vertical);
+                        }
+
+                        //if (textSize.Width > size.Width)
+                        //    size.Width = textSize.Width;
+                        size.Height += textSize.Height;
+                    }
+                    else
+                    {
+                        if (m_BodyImage != null)
+                        {
+                            //if (m_BodyImage.Width + imagePadding.Horizontal > size.Width)
+                            //    size.Width = (m_BodyImage.Width + imagePadding.Horizontal);
+                            size.Height += (m_BodyImage.Height + imagePadding.Vertical);
+                        }
+                    }
+                }
+            }
+            finally
+            {
+                g.Dispose();
+                headerFont.Dispose();
+            }
+
+            size.Width = width;
+            size.Height += ElementStyleLayout.VerticalStyleWhiteSpace(this.Style);
+
+            return size;
+        }
+
+        private Size GetAutoSize()
+        {
+            Padding headerPadding = Dpi.Size(GetHeaderPadding());
+            Padding footerPadding = Dpi.Size(GetFooterPadding());
+            Padding textPadding = Dpi.Size(GetTextPadding());
+            Padding imagePadding = Dpi.Size(GetImagePadding());
+
+            Size size = Size.Empty;
+
+            Font font = this.Font;
+            if (this.Style.Font != null)
+                font = this.Style.Font;
+
+            Font headerFont = new Font(font, (m_ShowTooltipDescription || m_HeaderText == "") ? FontStyle.Bold : FontStyle.Regular);
+            Graphics g = this.CreateGraphics();
+
+            if (this.AntiAlias)
+            {
+                g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.AntiAlias;
+                g.TextRenderingHint = DisplayHelp.AntiAliasTextRenderingHint;
+            }
+
+            Size minTooltipSize = Dpi.Size(m_MinimumTooltipSize);
+            try
+            {
+                if (m_HeaderText != "" && HeaderVisible)
+                {
+                    Size headerSize = Size.Empty;
+                    if (m_HeaderMarkup == null)
+                    {
+                        headerSize = TextDrawing.MeasureString(g, m_HeaderText, headerFont);
+                    }
+                    else
+                    {
+                        TextMarkup.MarkupDrawContext d=new TextMarkup.MarkupDrawContext(g, font, Color.Black, (this.RightToLeft==RightToLeft.Yes));
+                        m_HeaderMarkup.Measure(new Size(1024, 1), d);
+                        headerSize = m_HeaderMarkup.Bounds.Size;
+                        m_HeaderMarkup.Arrange(new Rectangle(Point.Empty, headerSize), d);
+                        headerSize = m_HeaderMarkup.Bounds.Size;
+                    }
+					headerSize.Width+=2;
+					headerSize.Height+=2;
+                    headerSize.Width += headerPadding.Horizontal;
+                    headerSize.Height += headerPadding.Vertical;
+                    if (headerSize.Width > size.Width)
+                        size.Width = headerSize.Width;
+                    size.Height += headerSize.Height;
+                }
+
+                if (m_FooterText != "" && FooterVisible && (m_ShowTooltipDescription || m_HeaderText == ""))
+                {
+                    Size footerSize = Size.Empty;
+                    if (m_FooterMarkup == null)
+                    {
+                        footerSize = TextDrawing.MeasureString(g, m_FooterText, headerFont);
+                    }
+                    else
+                    {
+                        TextMarkup.MarkupDrawContext d = new TextMarkup.MarkupDrawContext(g, font, Color.Black, (this.RightToLeft == RightToLeft.Yes));
+                        m_FooterMarkup.Measure(new Size(1024, 1), d);
+                        footerSize = m_FooterMarkup.Bounds.Size;
+                        m_FooterMarkup.Arrange(new Rectangle(Point.Empty, footerSize), d);
+                        footerSize = m_FooterMarkup.Bounds.Size;
+                    }
+					footerSize.Width+=2;
+					footerSize.Height+=2;
+                    if (m_FooterImage != null)
+                    {
+                        footerSize.Width += (m_FooterImage.Width + m_FooterImageSpacing);
+                        if (m_FooterImage.Height > footerSize.Height)
+                            footerSize.Height = m_FooterImage.Height;
+                    }
+                    footerSize.Width += footerPadding.Horizontal;
+                    footerSize.Height += footerPadding.Vertical;
+                    if (footerSize.Width > size.Width)
+                        size.Width = footerSize.Width;
+                    size.Height += footerSize.Height;
+                }
+
+                if (m_ShowTooltipDescription || m_HeaderText == "")
+                {
+                    if (this.Text != "")
+                    {
+                        int textArea = size.Width;
+                        if (textArea < minTooltipSize.Width)
+                            textArea = minTooltipSize.Width;
+                        if (m_MaximumWidth > 0)
+                            textArea = 5000;
+
+                        Size textSize = Size.Empty;
+
+                        if (m_BodyMarkup == null)
+                        {
+                            textSize = TextDrawing.MeasureString(g, this.Text, font, textArea, this.Style.TextFormat);
+                            if (textSize.Height > textSize.Width * 1.75 && textSize.Width > font.Height * 2)
+                            {
+                                textArea = (int)(textSize.Height * .75);
+                                textSize = TextDrawing.MeasureString(g, this.Text, font, textArea, this.Style.TextFormat);
+                            }
+                        }
+                        else
+                        {
+                            TextMarkup.MarkupDrawContext d = new TextMarkup.MarkupDrawContext(g, font, Color.Black, (this.RightToLeft == RightToLeft.Yes));
+                            m_BodyMarkup.Measure(new Size(textArea, 1), d);
+                            textSize = m_BodyMarkup.Bounds.Size;
+
+                            if (textSize.Height > textSize.Width * 1.75 && textSize.Width > font.Height * 2)
+                                textArea = (int)(textSize.Height * .75);
+
+                            m_BodyMarkup.Arrange(new Rectangle(Point.Empty, new Size(textArea, 1)), d);
+                            textSize = m_BodyMarkup.Bounds.Size;
+                        }
+
+                        textSize.Width += textPadding.Horizontal;
+                        textSize.Height += textPadding.Vertical;
+
+                        if (m_BodyImage != null)
+                        {
+                            textSize.Width += (m_BodyImage.Width + imagePadding.Horizontal);
+                            if (m_BodyImage.Height + imagePadding.Vertical > textSize.Height)
+                                textSize.Height = (m_BodyImage.Height + imagePadding.Vertical);
+                        }
+
+                        if (textSize.Width > size.Width)
+                            size.Width = textSize.Width;
+                        size.Height += textSize.Height;
+                    }
+                    else
+                    {
+                        if (m_BodyImage != null)
+                        {
+                            if (m_BodyImage.Width + imagePadding.Horizontal > size.Width)
+                                size.Width = (m_BodyImage.Width + imagePadding.Horizontal);
+                            size.Height += (m_BodyImage.Height + imagePadding.Vertical);
+                        }
+                    }
+                }
+            }
+            finally
+            {
+                g.Dispose();
+                headerFont.Dispose();
+            }
+
+            size.Width += ElementStyleLayout.HorizontalStyleWhiteSpace(this.Style);
+            size.Height += ElementStyleLayout.VerticalStyleWhiteSpace(this.Style);
+
+            if (size.Width < minTooltipSize.Width)
+                size.Width = minTooltipSize.Width;
+            if (size.Height < minTooltipSize.Height)
+                size.Height = minTooltipSize.Height;
+
+            return size;
+        }
+
+        private void ApplyColors(eTooltipColor c)
+        {
+            this.ResetStyle();
+            this.ResetStyleMouseOver();
+            this.ResetStyleMouseDown();
+
+            ElementStyle style = this.Style;
+
+            Color color1 = Color.Empty;
+            Color color2 = Color.Empty;
+            eCornerType cornerType = StyleManager.IsMetro(StyleManager.Style) ? eCornerType.Square : eCornerType.Rounded;
+            int cornerDiameter = cornerType == eCornerType.Rounded ? 2 : 0;
+            if (this.DesignMode)
+            {
+                TypeDescriptor.GetProperties(style)["WordWrap"].SetValue(style, true);
+                TypeDescriptor.GetProperties(style)["TextAlignment"].SetValue(style, eStyleTextAlignment.Near);
+                TypeDescriptor.GetProperties(style)["TextLineAlignment"].SetValue(style, eStyleTextAlignment.Near);
+                TypeDescriptor.GetProperties(style)["BackColorGradientAngle"].SetValue(style, 90);
+                TypeDescriptor.GetProperties(style)["BorderColor"].SetValue(style, Color.DimGray);
+                TypeDescriptor.GetProperties(style)["BorderWidth"].SetValue(style, 1);
+                TypeDescriptor.GetProperties(style)["TextColor"].SetValue(style, Color.Black);
+                TypeDescriptor.GetProperties(style)["Border"].SetValue(style, eStyleBorderType.Solid);
+                TypeDescriptor.GetProperties(style)["CornerType"].SetValue(style, cornerType);
+                TypeDescriptor.GetProperties(style)["CornerDiameter"].SetValue(style, cornerDiameter);
+            }
+            else
+            {
+                style.WordWrap = true;
+                style.TextAlignment = eStyleTextAlignment.Near;
+                style.TextLineAlignment = eStyleTextAlignment.Near;
+                style.BackColorGradientAngle = 90;
+                style.BorderColor = Color.DimGray;
+                style.BorderWidth = 1;
+                style.TextColor = Color.Black;
+                style.Border = eStyleBorderType.Solid;
+                style.CornerType = cornerType;
+                style.CornerDiameter = cornerDiameter;
+            }
+            
+            switch (c)
+            {
+                case eTooltipColor.System:
+                    {
+                        if (GlobalManager.Renderer is Office2007Renderer)
+                        {
+                            Office2007ColorTable ct = ((Office2007Renderer)GlobalManager.Renderer).ColorTable;
+                            color1 = ct.SuperTooltip.BackgroundColors.Start;
+                            color2 = ct.SuperTooltip.BackgroundColors.End;
+                            style.TextColor = ct.SuperTooltip.TextColor;
+                        }
+                        break;
+                    }
+                case eTooltipColor.Apple:
+                    {
+                        color1 = Color.FromArgb(232, 248, 224);
+                        color2 = Color.FromArgb(173, 231, 146);
+                        break;
+                    }
+                case eTooltipColor.Blue:
+                    {
+                        color1 = Color.FromArgb(221, 230, 247);
+                        color2 = Color.FromArgb(138, 168, 228);
+                        break;
+                    }
+                case eTooltipColor.BlueMist:
+                    {
+                        color1 = Color.FromArgb(227, 236, 243);
+                        color2 = Color.FromArgb(155, 187, 210);
+                        break;
+                    }
+                case eTooltipColor.Cyan:
+                    {
+                        color1 = Color.FromArgb(227, 236, 243);
+                        color2 = Color.FromArgb(155, 187, 210);
+                        break;
+                    }
+                case eTooltipColor.Green:
+                    {
+                        color1 = Color.FromArgb(234, 240, 226);
+                        color2 = Color.FromArgb(183, 201, 151);
+                        break;
+                    }
+                case eTooltipColor.Lemon:
+                    {
+                        color1 = Color.FromArgb(252, 253, 215);
+                        color2 = Color.FromArgb(245, 249, 111);
+                        break;
+                    }
+                case eTooltipColor.Magenta:
+                    {
+                        color1 = Color.FromArgb(243, 229, 236);
+                        color2 = Color.FromArgb(213, 164, 187);
+                        break;
+                    }
+                case eTooltipColor.Orange:
+                    {
+                        color1 = Color.FromArgb(252, 233, 217);
+                        color2 = Color.FromArgb(246, 176, 120);
+                        break;
+                    }
+                case eTooltipColor.Purple:
+                    {
+                        color1 = Color.FromArgb(234, 227, 245);
+                        color2 = Color.FromArgb(180, 158, 222);
+                        break;
+                    }
+                case eTooltipColor.PurpleMist:
+                    {
+                        color1 = Color.FromArgb(232, 227, 234);
+                        color2 = Color.FromArgb(171, 156, 183);
+                        break;
+                    }
+                case eTooltipColor.Red:
+                    {
+                        color1 = Color.FromArgb(249, 225, 226);
+                        color2 = Color.FromArgb(238, 149, 151);
+                        break;
+                    }
+                case eTooltipColor.Silver:
+                    {
+                        color1 = Color.FromArgb(225, 225, 232);
+                        color2 = Color.FromArgb(149, 149, 170);
+                        break;
+                    }
+                case eTooltipColor.Tan:
+                    {
+                        color1 = Color.FromArgb(248, 242, 226);
+                        color2 = Color.FromArgb(232, 209, 153);
+                        break;
+                    }
+                case eTooltipColor.Teal:
+                    {
+                        color1 = Color.FromArgb(205, 236, 240);
+                        color2 = Color.FromArgb(78, 188, 202);
+                        break;
+                    }
+                case eTooltipColor.Yellow:
+                    {
+                        color1 = Color.FromArgb(255, 244, 213);
+                        color2 = Color.FromArgb(255, 216, 105);
+                        break;
+                    }
+                case eTooltipColor.Gray:
+                    {
+                        color1 = Color.White;
+                        color2 = ColorScheme.GetColor("E4E4F0");
+                        break;
+                    }
+                case eTooltipColor.Office2003:
+                    {
+                        if (this.DesignMode)
+                        {
+                            TypeDescriptor.GetProperties(style)["BackColor"].SetValue(style, Color.White);
+                            TypeDescriptor.GetProperties(style)["BackColor2SchemePart"].SetValue(style, eColorSchemePart.MenuSide);
+                        }
+                        else
+                        {
+                            style.BackColor = Color.White;
+                            style.BackColor2SchemePart = eColorSchemePart.MenuSide;
+                        }
+                        break;
+                    }
+                default:
+                    {
+                        color1 = Color.Empty;
+                        color2 = Color.Empty;
+                        break;
+                    }
+            }
+
+            if (!color1.IsEmpty)
+            {
+                if (this.DesignMode)
+                    TypeDescriptor.GetProperties(style)["BackColor"].SetValue(style, color1);
+                else
+                    style.BackColor = color1;
+            }
+            if (!color2.IsEmpty)
+            {
+                if (this.DesignMode)
+                    TypeDescriptor.GetProperties(style)["BackColor2"].SetValue(style, color2);
+                else
+                    style.BackColor2 = color2;
+            }
+
+            this.SetRegion();
+        }
+
+        public void UpdateWithSuperTooltipInfo(SuperTooltipInfo info)
+        {
+            if (info.BodyText == null) info.BodyText = "";
+            if (info.FooterText == null) info.FooterText = "";
+            m_BodyImage = info.BodyImage;
+            this.Text = info.BodyText;
+            m_FooterImage = info.FooterImage;
+            FooterText = info.FooterText;
+            m_FooterVisible = info.FooterVisible;
+            HeaderText = info.HeaderText;
+            m_HeaderVisible = info.HeaderVisible;
+            this.PredefinedColor = info.Color;
+        }
+        #endregion
+
+        #region Popup Support
+        /// <summary>
+        /// Gets or sets whether tooltip control is popup tooltip or standard control. Default is false which means tooltip is popup style.
+        /// </summary>
+        public bool StandardControl
+        {
+            get { return m_StandardControl; }
+            set { m_StandardControl = value; }
+        }
+
+        internal void UpdateSuperTooltipSize(SuperTooltipInfo info)
+        {
+            UpdateWithSuperTooltipInfo(info);
+            if (info.CustomSize.Width > ElementStyleLayout.HorizontalStyleWhiteSpace(GetStyle()) + 4 && info.CustomSize.Height == 0)
+                this.Size = GetFixedWidthSize(info.CustomSize.Width);
+            else if (info.CustomSize.IsEmpty || info.CustomSize.Width < ElementStyleLayout.HorizontalStyleWhiteSpace(GetStyle()) + 4 ||
+                info.CustomSize.Height < ElementStyleLayout.VerticalStyleWhiteSpace(GetStyle()) + 4)
+            {
+                this.RecalcSize();
+                if (m_MaximumWidth > 0 && this.Size.Width > m_MaximumWidth)
+                {
+                    // Enforce maximum width
+                    this.Size = GetFixedWidthSize(m_MaximumWidth);
+                }
+            }
+            else
+                this.Size = info.CustomSize;
+        }
+        
+        /// <summary>
+        /// Shows tooltip at specified screen coordinates.
+        /// </summary>
+        /// <param name="x">X coordinate</param>
+        /// <param name="y">Y coordinate</param>
+        /// <param name="enforceScreenPosition">Indicates whether to enforce the screen position of tooltip if tooltip falls out of screen bounds.</param>
+        public void ShowTooltip(SuperTooltipInfo info, int x, int y, bool enforceScreenPosition)
+        {
+            UpdateWithSuperTooltipInfo(info);
+            if (info.CustomSize.Width > ElementStyleLayout.HorizontalStyleWhiteSpace(GetStyle()) + 4 && info.CustomSize.Height == 0)
+                this.Size = GetFixedWidthSize(info.CustomSize.Width);
+            else if (info.CustomSize.IsEmpty || info.CustomSize.Width < ElementStyleLayout.HorizontalStyleWhiteSpace(GetStyle()) + 4 ||
+                info.CustomSize.Height < ElementStyleLayout.VerticalStyleWhiteSpace(GetStyle()) + 4)
+            {
+                this.RecalcSize();
+                if (m_MaximumWidth > 0 && this.Size.Width > m_MaximumWidth)
+                {
+                    // Enforce maximum width
+                    this.Size = GetFixedWidthSize(m_MaximumWidth);
+                }
+            }
+            else
+                this.Size = info.CustomSize;
+
+            bool setLocation = true;
+
+            if (enforceScreenPosition)
+            {
+                Point mousePosition = Control.MousePosition;
+                ScreenInformation screen = BarFunctions.ScreenFromPoint(mousePosition);
+                if (screen != null)
+                {
+                    Rectangle r = new Rectangle(x, y, this.Width, this.Height);
+                    System.Drawing.Size layoutArea = screen.WorkingArea.Size;
+                    layoutArea.Width -= (int)(layoutArea.Width * .2f);
+
+                    if (r.Right > screen.WorkingArea.Right)
+                        r.X=r.X - (r.Right - screen.WorkingArea.Right);
+                    if (r.Bottom > screen.Bounds.Bottom)
+                        r.Y = screen.Bounds.Bottom - r.Height;
+
+                    if (r.Contains(System.Windows.Forms.Control.MousePosition.X, System.Windows.Forms.Control.MousePosition.Y))
+                    {
+                        // We have to move it out of mouse position
+                        if (r.Height + System.Windows.Forms.Control.MousePosition.Y + 1 <= screen.WorkingArea.Height)
+                            r.Y = System.Windows.Forms.Control.MousePosition.Y + SystemInformation.CursorSize.Height;
+                        else
+                            r.Y = System.Windows.Forms.Control.MousePosition.Y - r.Height - SystemInformation.CursorSize.Height;
+                    }
+
+                    this.Bounds = r;
+                    setLocation = false;
+                }
+            }
+
+            if (!this.IsHandleCreated)
+                this.CreateControl();
+
+            Point p = Point.Empty;
+            if (setLocation)
+            {
+                p = new Point(x, y);
+                this.Location = p;
+            }
+            else
+                p = this.Location;
+
+            if (NativeFunctions.ShowDropShadow)
+            {
+                if (m_DropShadow == null)
+                {
+                    m_DropShadow = new PopupShadow(NativeFunctions.AlphaBlendingSupported);
+                    m_DropShadow.CreateControl();
+                }
+                m_DropShadow.Hide();
+            }
+            if (NativeFunctions.ShowDropShadow && Environment.OSVersion.Version.Major >= 5 && !NativeFunctions.IsTerminalSession())
+            {
+                NativeFunctions.AnimateWindow(this.Handle, BarFunctions.ANIMATION_INTERVAL, NativeFunctions.AW_BLEND);
+            }
+            else
+                NativeFunctions.SetWindowPos(this.Handle, new IntPtr(NativeFunctions.HWND_TOP), 0, 0, 0, 0, NativeFunctions.SWP_SHOWWINDOW | NativeFunctions.SWP_NOSIZE | NativeFunctions.SWP_NOACTIVATE | NativeFunctions.SWP_NOMOVE);
+            if (m_DropShadow != null)
+            {
+                NativeFunctions.SetWindowPos(m_DropShadow.Handle, this.Handle, p.X + 3, p.Y + 3, this.Width, this.Height, NativeFunctions.SWP_SHOWWINDOW | NativeFunctions.SWP_NOACTIVATE);
+                m_DropShadow.UpdateShadow();
+            }
+        }
+
+        /// <summary>
+        /// Updates the popup shadow size and position if shadow is visible.
+        /// </summary>
+        public void UpdateShadow()
+        {
+            if (m_DropShadow != null)
+            {
+                NativeFunctions.SetWindowPos(m_DropShadow.Handle, this.Handle, this.Left + 3, this.Top + 3, this.Width, this.Height, NativeFunctions.SWP_SHOWWINDOW | NativeFunctions.SWP_NOACTIVATE);
+                m_DropShadow.UpdateShadow();
+            }
+        }
+
+        protected override void OnLocationChanged(EventArgs e)
+        {
+            base.OnLocationChanged(e);
+            if (m_DropShadow != null)
+            {
+                NativeFunctions.SetWindowPos(m_DropShadow.Handle, new IntPtr(NativeFunctions.HWND_TOP), this.Left + 3, this.Top + 3, 0, 0, NativeFunctions.SWP_SHOWWINDOW | NativeFunctions.SWP_NOACTIVATE | NativeFunctions.SWP_NOSIZE);
+            }
+        }
+
+        protected override CreateParams CreateParams
+        {
+            get
+            {
+                CreateParams p = base.CreateParams;
+                if (!m_StandardControl)
+                {
+                    p.Style = unchecked((int)(WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN));
+                    p.ExStyle = (int)(WS_EX_TOOLWINDOW | WS_EX_TOPMOST);
+                    p.Caption = "";
+                }
+                return p;
+            }
+        }
+
+        protected override void OnVisibleChanged(EventArgs e)
+        {
+            if (!this.Visible && m_DropShadow != null)
+            {
+                m_DropShadow.Hide();
+                m_DropShadow.Dispose();
+                m_DropShadow = null;
+            }
+            base.OnVisibleChanged(e);
+        }
+
+        #endregion
+    }
+
+    #region Padding Class
+
+    /// <summary>
+    /// Represents class that holds padding information for user interface elements.
+    /// </summary>
+    [TypeConverter(typeof(PaddingConvertor))]
+    public class Padding : INotifyPropertyChanged
+    {
+        #region Private variables
+
+        /// <summary>
+        /// Gets or sets padding on left side. Default value is 0
+        /// </summary>
+        private int _Left;
+
+        /// <summary>
+        /// Gets or sets padding on right side. Default value is 0
+        /// </summary>
+        private int _Right;
+
+        /// <summary>
+        /// Gets or sets padding on top side. Default value is 0
+        /// </summary>
+        private int _Top;
+
+        /// <summary>
+        /// Gets or sets padding on bottom side. Default value is 0
+        /// </summary>
+        private int _Bottom;
+
+        #endregion
+
+        /// <summary>
+        /// Creates new instance of the class and initializes it.
+        /// </summary>
+        /// <param name="all">Padding for all sides</param>
+        public Padding(int all)
+        {
+            _Left = all;
+            _Right = all;
+            _Top = all;
+            _Bottom = all;
+        }
+
+        /// <summary>
+        /// Creates new instance of the class and initializes it.
+        /// </summary>
+        /// <param name="left">Left padding</param>
+        /// <param name="right">Right padding</param>
+        /// <param name="top">Top padding</param>
+        /// <param name="bottom">Bottom padding</param>
+        public Padding(int left, int right, int top, int bottom)
+        {
+            _Left = left;
+            _Right = right;
+            _Top = top;
+            _Bottom = bottom;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets amount of Top padding
+        /// </summary>
+        [Browsable(true), DefaultValue(0)]
+        [Description("Indicates the amount of Top padding.")]
+        [NotifyParentProperty(true)]
+        public int Top
+        {
+            get { return (_Top); }
+            set { _Top = value; OnPropertyChanged(new PropertyChangedEventArgs("Top")); }
+        }
+
+        /// <summary>
+        /// Gets amount of Left padding
+        /// </summary>
+        [Browsable(true), DefaultValue(0)]
+        [Description("Indicates the amount of Left padding.")]
+        [NotifyParentProperty(true)]
+        public int Left
+        {
+            get { return (_Left); }
+            set { _Left = value; OnPropertyChanged(new PropertyChangedEventArgs("Left")); }
+        }
+
+        /// <summary>
+        /// Gets amount of Bottom padding
+        /// </summary>
+        [Browsable(true), DefaultValue(0)]
+        [Description("Indicates the amount of Bottom padding.")]
+        [NotifyParentProperty(true)]
+        public int Bottom
+        {
+            get { return (_Bottom); }
+            set { _Bottom = value; OnPropertyChanged(new PropertyChangedEventArgs("Bottom")); }
+        }
+
+        /// <summary>
+        /// Gets amount of Right padding
+        /// </summary>
+        [Browsable(true), DefaultValue(0)]
+        [Description("Indicates the amount of Right padding.")]
+        [NotifyParentProperty(true)]
+        public int Right
+        {
+            get { return (_Right); }
+            set { _Right = value; OnPropertyChanged(new PropertyChangedEventArgs("Right")); }
+        }
+
+        /// <summary>
+        /// Gets amount of horizontal padding (Left+Right)
+        /// </summary>
+        [Browsable(false)]
+        public int Horizontal
+        {
+            get { return (_Left + _Right); }
+        }
+
+        /// <summary>
+        /// Gets amount of vertical padding (Top+Bottom)
+        /// </summary>
+        [Browsable(false)]
+        public int Vertical
+        {
+            get { return (_Top + _Bottom); }
+        }
+
+        /// <summary>
+        /// Gets whether Padding is empty.
+        /// </summary>
+        [Browsable(false)]
+        public bool IsEmpty
+        {
+            get { return (_Left == 0 && _Right == 0 && _Top == 0 && _Bottom == 0); }
+        }
+
+        /// <summary>
+        /// Gets or sets the padding for all sides.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public int All
+        {
+            get
+            {
+                return _Top;
+            }
+            set
+            {
+                Top = value;
+                Bottom = value;
+                Left = value;
+                Right = value;
+            }
+        }
+
+        public static Padding Empty = new Padding(0);
+        #endregion
+
+        #region INotifyPropertyChanged Members
+        /// <summary>
+        /// Occurs when property value has changed.
+        /// </summary>
+        public event PropertyChangedEventHandler PropertyChanged;
+        /// <summary>
+        /// Raises the PropertyChanged event.
+        /// </summary>
+        /// <param name="e">Event arguments</param>
+        protected virtual void OnPropertyChanged(PropertyChangedEventArgs e)
+        {
+            PropertyChangedEventHandler eh = PropertyChanged;
+            if (eh != null) eh(this, e);
+        }
+        #endregion
+    }
+
+    #endregion
+
+    #region PaddingConvertor
+
+    public class PaddingConvertor : ExpandableObjectConverter
+    {
+        public override bool CanConvertTo(
+            ITypeDescriptorContext context, Type destinationType)
+        {
+            if (destinationType == typeof(string))
+                return (true);
+
+            return (base.CanConvertTo(context, destinationType));
+        }
+
+        public override object ConvertTo(
+            ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+        {
+            if (destinationType == typeof(string))
+            {
+                Padding pad = value as Padding;
+
+                if (pad != null)
+                {
+                    return (String.Format("{0:D}, {1:D}, {2:D}, {3:D}",
+                        pad.Bottom, pad.Left, pad.Right, pad.Top));
+                }
+            }
+
+            return (base.ConvertTo(context, culture, value, destinationType));
+        }
+
+        public override bool CanConvertFrom(
+            ITypeDescriptorContext context, Type sourceType)
+        {
+            if (sourceType == typeof(string))
+                return (true);
+
+            return (base.CanConvertFrom(context, sourceType));
+        }
+
+        public override object ConvertFrom(
+            ITypeDescriptorContext context, CultureInfo culture, object value)
+        {
+            if (value is string)
+            {
+                string[] values = ((string)value).Split(',');
+
+                if (values.Length != 4)
+                    throw new ArgumentException("Invalid value to convert.");
+
+                try
+                {
+                    int bottom = int.Parse(values[0]);
+                    int left = int.Parse(values[1]);
+                    int right = int.Parse(values[2]);
+                    int top = int.Parse(values[3]);
+
+                    Padding pad = new Padding(left, right, top, bottom);
+
+                    return (pad);
+                }
+                catch (Exception exp)
+                {
+                    throw new ArgumentException("Invalid value to convert.");
+                }
+            }
+
+            return base.ConvertFrom(context, culture, value);
+        }
+    }
+
+    #endregion
+
+}
diff --git a/PROMS/DotNetBar Source Code/Ribbon/ThemedButtonItemPainter.cs b/PROMS/DotNetBar Source Code/Ribbon/ThemedButtonItemPainter.cs
new file mode 100644
index 00000000..3d0ad111
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Ribbon/ThemedButtonItemPainter.cs	
@@ -0,0 +1,235 @@
+using System;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Summary description for ThemedButtonItemPainter.
+	/// </summary>
+	public class ThemedButtonItemPainter
+	{
+		public static void PaintButton(ButtonItem button, ItemPaintArgs pa)
+		{
+			System.Drawing.Graphics g=pa.Graphics;
+			ThemeToolbar theme=pa.ThemeToolbar;
+			ThemeToolbarParts part=ThemeToolbarParts.Button;
+			ThemeToolbarStates state=ThemeToolbarStates.Normal;
+			Color textColor=ButtonItemPainterHelper.GetTextColor(button,pa);
+
+			Rectangle rectImage=Rectangle.Empty;
+			Rectangle itemRect=button.DisplayRectangle;
+			
+			Font font=null;
+			CompositeImage image=button.GetImage();
+
+			font=button.GetFont(pa, false);
+
+			eTextFormat format= GetStringFormat(button, pa, image);
+
+			bool bSplitButton=(button.SubItems.Count>0 || button.PopupType==ePopupType.Container) && button.ShowSubItems && !button.SubItemsRect.IsEmpty;
+
+			if(bSplitButton)
+				part=ThemeToolbarParts.SplitButton;
+
+			// Calculate image position
+			if(image!=null)
+			{
+				if(button.ImagePosition==eImagePosition.Top || button.ImagePosition==eImagePosition.Bottom)
+					rectImage=new Rectangle(button.ImageDrawRect.X,button.ImageDrawRect.Y,itemRect.Width,button.ImageDrawRect.Height);
+				else
+					rectImage=new Rectangle(button.ImageDrawRect.X,button.ImageDrawRect.Y,button.ImageDrawRect.Width,button.ImageDrawRect.Height);
+
+				rectImage.Offset(itemRect.Left,itemRect.Top);
+				rectImage.Offset((rectImage.Width-button.ImageSize.Width)/2,(rectImage.Height-button.ImageSize.Height)/2);
+				rectImage.Width=button.ImageSize.Width;
+				rectImage.Height=button.ImageSize.Height;
+			}
+
+			// Set the state and text brush
+			if(!ButtonItemPainter.IsItemEnabled(button, pa))
+			{
+				state=ThemeToolbarStates.Disabled;
+			}
+			else if(button.IsMouseDown)
+			{
+				state=ThemeToolbarStates.Pressed;
+			}
+			else if(button.IsMouseOver && button.Checked)
+			{
+				state=ThemeToolbarStates.HotChecked;
+			}
+			else if(button.IsMouseOver || button.Expanded)
+			{
+				state=ThemeToolbarStates.Hot;
+			}
+			else if(button.Checked)
+			{
+				state=ThemeToolbarStates.Checked;
+			}
+			
+			Rectangle backRect=button.DisplayRectangle;
+			if(button.HotTrackingStyle==eHotTrackingStyle.Image && image!=null)
+			{
+				backRect=rectImage;
+				backRect.Inflate(3,3);
+			}
+			else if(bSplitButton)
+			{
+				backRect.Width=backRect.Width-button.SubItemsRect.Width;
+			}
+
+			// Draw Button Background
+			if(button.HotTrackingStyle!=eHotTrackingStyle.None)
+			{
+				theme.DrawBackground(g,part,state,backRect);
+			}
+
+			// Draw Image
+			if(image!=null && button.ButtonStyle!=eButtonStyle.TextOnlyAlways)
+			{
+				if(state==ThemeToolbarStates.Normal && button.HotTrackingStyle==eHotTrackingStyle.Color)
+				{
+					// Draw gray-scale image for this hover style...
+					float[][] array = new float[5][];
+					array[0] = new float[5] {0.2125f, 0.2125f, 0.2125f, 0, 0};
+					array[1] = new float[5] {0.5f, 0.5f, 0.5f, 0, 0};
+					array[2] = new float[5] {0.0361f, 0.0361f, 0.0361f, 0, 0};
+					array[3] = new float[5] {0,       0,       0,       1, 0};
+					array[4] = new float[5] {0.2f,    0.2f,    0.2f,    0, 1};
+					System.Drawing.Imaging.ColorMatrix grayMatrix = new System.Drawing.Imaging.ColorMatrix(array);
+					System.Drawing.Imaging.ImageAttributes att = new System.Drawing.Imaging.ImageAttributes();
+					att.SetColorMatrix(grayMatrix);
+					//g.DrawImage(image,rectImage,0,0,image.Width,image.Height,GraphicsUnit.Pixel,att);
+					image.DrawImage(g,rectImage,0,0,image.Width,image.Height,GraphicsUnit.Pixel,att);
+				}
+				else if(state==ThemeToolbarStates.Normal && !image.IsIcon)
+				{
+					// Draw image little bit lighter, I decied to use gamma it is easy
+					System.Drawing.Imaging.ImageAttributes lightImageAttr = new System.Drawing.Imaging.ImageAttributes();
+					lightImageAttr.SetGamma(.7f,System.Drawing.Imaging.ColorAdjustType.Bitmap);
+					//g.DrawImage(image,rectImage,0,0,image.Width,image.Height,GraphicsUnit.Pixel,lightImageAttr);
+					image.DrawImage(g,rectImage,0,0,image.Width,image.Height,GraphicsUnit.Pixel,lightImageAttr);
+				}
+				else
+				{
+					image.DrawImage(g,rectImage);
+				}
+			}
+
+			// Draw Text
+			if(button.ButtonStyle==eButtonStyle.ImageAndText || button.ButtonStyle==eButtonStyle.TextOnlyAlways || image==null)
+			{
+				Rectangle rectText=button.TextDrawRect;
+				if(button.ImagePosition==eImagePosition.Top || button.ImagePosition==eImagePosition.Bottom)
+				{
+					if(button.Orientation==eOrientation.Vertical)
+					{
+						rectText=new Rectangle(button.TextDrawRect.X,button.TextDrawRect.Y,button.TextDrawRect.Width,button.TextDrawRect.Height);
+					}
+					else
+					{
+						rectText=new Rectangle(button.TextDrawRect.X,button.TextDrawRect.Y,itemRect.Width,button.TextDrawRect.Height);
+						if((button.SubItems.Count>0 || button.PopupType==ePopupType.Container) && button.ShowSubItems)
+							rectText.Width-=10;
+					}
+					format|=eTextFormat.HorizontalCenter;
+				}
+
+				rectText.Offset(itemRect.Left,itemRect.Top);
+
+				if(button.Orientation==eOrientation.Vertical)
+				{
+					g.RotateTransform(90);
+					TextDrawing.DrawStringLegacy(g,ButtonItemPainter.GetDrawText(button.Text),font,textColor,new Rectangle(rectText.Top,-rectText.Right,rectText.Height,rectText.Width),format);
+					g.ResetTransform();
+				}
+				else
+				{
+					if(rectText.Right>button.DisplayRectangle.Right)
+						rectText.Width=button.DisplayRectangle.Right-rectText.Left;
+					TextDrawing.DrawString(g,ButtonItemPainter.GetDrawText(button.Text),font,textColor,rectText,format);
+					if(!button.DesignMode && button.Focused && !pa.IsOnMenu && !pa.IsOnMenuBar)
+					{
+						//SizeF szf=g.MeasureString(m_Text,font,rectText.Width,format);
+						Rectangle r=rectText;
+						//r.Width=(int)Math.Ceiling(szf.Width);
+						//r.Height=(int)Math.Ceiling(szf.Height);
+						//r.Inflate(1,1);
+						System.Windows.Forms.ControlPaint.DrawFocusRectangle(g,r);
+					}
+				}				
+			}
+
+			// If it has subitems draw the triangle to indicate that
+			if(bSplitButton)
+			{
+				part=ThemeToolbarParts.SplitButtonDropDown;
+				
+				if(!ButtonItemPainter.IsItemEnabled(button, pa))
+					state=ThemeToolbarStates.Disabled;
+				else
+					state=ThemeToolbarStates.Normal;
+
+				if(button.HotTrackingStyle!=eHotTrackingStyle.None && button.HotTrackingStyle!=eHotTrackingStyle.Image && ButtonItemPainter.IsItemEnabled(button, pa))
+				{
+					if(button.Expanded || button.IsMouseDown)
+						state=ThemeToolbarStates.Pressed;
+					else if(button.IsMouseOver && button.Checked)
+						state=ThemeToolbarStates.HotChecked;
+					else if(button.Checked)
+						state=ThemeToolbarStates.Checked;
+					else if(button.IsMouseOver)
+						state=ThemeToolbarStates.Hot;
+				}
+
+                if (!button.AutoExpandOnClick)
+                {
+                    if (button.Orientation == eOrientation.Horizontal)
+                    {
+                        Rectangle r = button.SubItemsRect;
+                        r.Offset(itemRect.X, itemRect.Y);
+                        theme.DrawBackground(g, part, state, r);
+                    }
+                    else
+                    {
+                        Rectangle r = button.SubItemsRect;
+                        r.Offset(itemRect.X, itemRect.Y);
+                        theme.DrawBackground(g, part, state, r);
+                    }
+                }
+			}
+
+			if(button.Focused && button.DesignMode)
+			{
+				Rectangle r=itemRect;
+				r.Inflate(-1,-1);
+				DesignTime.DrawDesignTimeSelection(g,r,pa.Colors.ItemDesignTimeBorder);
+			}
+
+			if(image!=null)
+				image.Dispose();
+		}
+
+		private static eTextFormat GetStringFormat(ButtonItem button, ItemPaintArgs pa, CompositeImage image)
+		{
+			eTextFormat stringFormat=pa.ButtonStringFormat;
+			bool isOnMenu = IsOnMenu(button, pa);
+			if(!isOnMenu)
+			{
+				if(button.ContainerControl is RibbonStrip && (image==null || button.ImagePosition==eImagePosition.Top || button.ImagePosition==eImagePosition.Bottom))
+					stringFormat |= eTextFormat.HorizontalCenter;
+				else if(pa.IsOnMenuBar || pa.ContainerControl is Bar && image==null || button.ImagePosition==eImagePosition.Top || button.ImagePosition==eImagePosition.Bottom)
+					stringFormat |= eTextFormat.HorizontalCenter;
+			}
+			return stringFormat;
+		}
+
+		private static bool IsOnMenu(ButtonItem button, ItemPaintArgs pa)
+		{
+			bool isOnMenu = pa.IsOnMenu;
+			if (isOnMenu && button.Parent is ItemContainer)
+				isOnMenu = false;
+			return isOnMenu;
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/Ribbon/ThreadUIOperation.cs b/PROMS/DotNetBar Source Code/Ribbon/ThreadUIOperation.cs
new file mode 100644
index 00000000..a222b42c
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Ribbon/ThreadUIOperation.cs	
@@ -0,0 +1,134 @@
+using System;
+using System.Text;
+
+namespace DevComponents.DotNetBar
+{
+    internal class ThreadUIOperation
+    {
+        #region Private Variables
+        private bool m_IsActive = false;
+        private System.Threading.ReaderWriterLock m_FadeImageLock = new System.Threading.ReaderWriterLock();
+        private EventHandler m_UpdateUIHandler = null;
+        private EventHandler m_RecordStartStateHandler = null;
+        private EventHandler m_CleanupHandler = null;
+        #endregion
+
+        #region Internal Implementation
+        public ThreadUIOperation(EventHandler recordStartState, EventHandler updateUIHandler, EventHandler cleanup)
+        {
+            m_RecordStartStateHandler = recordStartState;
+            m_UpdateUIHandler = updateUIHandler;
+            m_CleanupHandler = cleanup;
+        }
+
+        public bool IsActive
+        {
+            get { return m_IsActive; }
+        }
+
+        public void Start()
+        {
+            m_FadeImageLock.AcquireReaderLock(-1);
+            try
+            {
+                if (m_IsActive)
+                    return;
+            }
+            finally
+            {
+                m_FadeImageLock.ReleaseReaderLock();
+            }
+
+            bool readerLockHeld = m_FadeImageLock.IsReaderLockHeld;
+            System.Threading.LockCookie cookie1 = new System.Threading.LockCookie();
+            if (readerLockHeld)
+            {
+                cookie1 = m_FadeImageLock.UpgradeToWriterLock(-1);
+            }
+            else
+            {
+                m_FadeImageLock.AcquireWriterLock(-1);
+            }
+
+            try
+            {
+                m_IsActive = true;
+                m_RecordStartStateHandler.Invoke(this, new EventArgs());
+            }
+            finally
+            {
+                if (readerLockHeld)
+                {
+                    m_FadeImageLock.DowngradeFromWriterLock(ref cookie1);
+                }
+                else
+                {
+                    m_FadeImageLock.ReleaseWriterLock();
+                }
+            }
+
+            FadeAnimator.Fade(this, new EventHandler(this.OnFadeChanged));
+            m_IsActive = true;
+        }
+
+        public void Stop()
+        {
+            m_FadeImageLock.AcquireReaderLock(-1);
+            try
+            {
+                if (!m_IsActive)
+                    return;
+            }
+            finally
+            {
+                m_FadeImageLock.ReleaseReaderLock();
+            }
+            FadeAnimator.StopFade(this, new EventHandler(OnFadeChanged));
+
+            bool readerLockHeld = m_FadeImageLock.IsReaderLockHeld;
+            System.Threading.LockCookie cookie1 = new System.Threading.LockCookie();
+
+            if (readerLockHeld)
+            {
+                cookie1 = m_FadeImageLock.UpgradeToWriterLock(-1);
+            }
+            else
+            {
+                m_FadeImageLock.AcquireWriterLock(-1);
+            }
+
+            try
+            {
+                m_IsActive = false;
+                m_CleanupHandler.Invoke(this, new EventArgs());
+            }
+            finally
+            {
+                if (readerLockHeld)
+                {
+                    m_FadeImageLock.DowngradeFromWriterLock(ref cookie1);
+                }
+                else
+                {
+                    m_FadeImageLock.ReleaseWriterLock();
+                }
+            }
+        }
+
+        private void OnFadeChanged(object sender, EventArgs e)
+        {
+            m_UpdateUIHandler.Invoke(this, new EventArgs());
+        }
+
+        public void StartReadOperation()
+        {
+            m_FadeImageLock.AcquireReaderLock(-1);
+        }
+
+        public void EndReadOperation()
+        {
+            m_FadeImageLock.ReleaseReaderLock();
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Ribbon/ToolbarRendererEventArgs.cs b/PROMS/DotNetBar Source Code/Ribbon/ToolbarRendererEventArgs.cs
new file mode 100644
index 00000000..54fecdb9
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Ribbon/ToolbarRendererEventArgs.cs	
@@ -0,0 +1,44 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Provides data for toolbar rendering.
+    /// </summary>
+    public class ToolbarRendererEventArgs
+    {
+        /// <summary>
+        /// Gets or sets the reference to Bar object being rendered
+        /// </summary>
+        public Bar Bar = null;
+
+        /// <summary>
+        /// Gets or sets Graphics object bar is rendered on.
+        /// </summary>
+        public Graphics Graphics = null;
+
+        /// <summary>
+        /// Gets the bounds of the region that should be rendered.
+        /// </summary>
+        public Rectangle Bounds = Rectangle.Empty;
+
+        /// <summary>
+        /// Reference to internal data.
+        /// </summary>
+        internal ItemPaintArgs ItemPaintArgs = null;
+
+        /// <summary>
+        /// Creates new instance of the object and initializes it with default data.
+        /// </summary>
+        /// <param name="bar">Reference to bar object.</param>
+        /// <param name="g">Reference to Graphics object.</param>
+        public ToolbarRendererEventArgs(Bar bar, Graphics g, Rectangle bounds)
+        {
+            this.Bar = bar;
+            this.Graphics = g;
+            this.Bounds = bounds;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/RoundRectangleShapeDescriptor.cs b/PROMS/DotNetBar Source Code/RoundRectangleShapeDescriptor.cs
new file mode 100644
index 00000000..55775a50
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/RoundRectangleShapeDescriptor.cs	
@@ -0,0 +1,265 @@
+using System;
+using System.Text;
+using System.ComponentModel;
+using System.Drawing.Drawing2D;
+using System.Drawing;
+using System.Globalization;
+using System.ComponentModel.Design.Serialization;
+using System.Reflection;
+
+namespace DevComponents.DotNetBar
+{
+
+    /// <summary>
+    /// Describes the round rectangle shape.
+    /// </summary>
+    [System.ComponentModel.ToolboxItem(false), System.ComponentModel.DesignTimeVisible(false), TypeConverter(typeof(RoundRectangleShapeDescriptorConverter))]
+    public class RoundRectangleShapeDescriptor : ShapeDescriptor
+    {
+        #region Constructor
+        /// <summary>
+        /// Initializes a new instance of the RoundCornerDescriptor class.
+        /// </summary>
+        public RoundRectangleShapeDescriptor()
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the RoundCornerDescriptor class.
+        /// </summary>
+        public RoundRectangleShapeDescriptor(int cornerSize) : this(cornerSize, cornerSize, cornerSize, cornerSize)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the RoundCornerDescriptor class.
+        /// </summary>
+        /// <param name="topLeft"></param>
+        /// <param name="topRight"></param>
+        /// <param name="bottomLeft"></param>
+        /// <param name="bottomRight"></param>
+        public RoundRectangleShapeDescriptor(int topLeft, int topRight, int bottomLeft, int bottomRight)
+        {
+            _TopLeft = topLeft;
+            _TopRight = topRight;
+            _BottomLeft = bottomLeft;
+            _BottomRight = bottomRight;
+        }
+        #endregion
+
+        #region Internal Implementation
+        private int _TopLeft = 0;
+        /// <summary>
+        /// Gets or sets the top-left round corner size.
+        /// </summary>
+        [DefaultValue(0), Description("Gets or sets the top-left round corner size.")]
+        public int TopLeft
+        {
+            get { return _TopLeft; }
+            set
+            {
+                if (_TopLeft != value)
+                {
+                    _TopLeft = Math.Max(0, value);
+                }
+            }
+        }
+
+        private int _TopRight = 0;
+        /// <summary>
+        /// Gets or sets the top-right round corner size.
+        /// </summary>
+        [DefaultValue(0), Description("Gets or sets the top-right round corner size.")]
+        public int TopRight
+        {
+            get { return _TopRight; }
+            set
+            {
+                if (_TopRight != value)
+                {
+                    _TopRight = Math.Max(0, value);
+                }
+            }
+        }
+
+        private int _BottomLeft = 0;
+        /// <summary>
+        /// Gets or sets the bottom-left round corner size.
+        /// </summary>
+        [DefaultValue(0), Description("Gets or sets the bottom-left round corner size.")]
+        public int BottomLeft
+        {
+            get { return _BottomLeft; }
+            set
+            {
+                if (_BottomLeft != value)
+                {
+                    _BottomLeft = Math.Max(0, value);
+                }
+            }
+        }
+
+        private int _BottomRight = 0;
+        /// <summary>
+        /// Gets or sets the bottom-right round corner size.
+        /// </summary>
+        [DefaultValue(0), Description("Gets or sets the bottom-right round corner size.")]
+        public int BottomRight
+        {
+            get { return _BottomRight; }
+            set
+            {
+                if (_BottomRight != value)
+                {
+                    _BottomRight = Math.Max(0, value);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether all corner size values are set to zero which results in no rounded corners.
+        /// </summary>
+        [Browsable(false)]
+        public bool IsEmpty
+        {
+            get { return _TopLeft == 0 && _TopRight == 0 && _BottomLeft == 0 && _BottomRight == 0; }
+        }
+
+        /// <summary>
+        /// Gets whether all corner size values are set to same value.
+        /// </summary>
+        [Browsable(false)]
+        public bool IsUniform
+        {
+            get { return _TopLeft == _TopRight && _TopLeft == _BottomLeft && _TopLeft == _BottomRight; }
+        }
+        #endregion
+
+        #region IShapeDescriptor Members
+
+        public override System.Drawing.Drawing2D.GraphicsPath GetShape(System.Drawing.Rectangle bounds)
+        {
+            if (!CanDrawShape(bounds))
+                return null;
+
+            return GetShape(bounds, _TopLeft, _TopRight, _BottomLeft, _BottomRight);
+        }
+
+
+        public override GraphicsPath GetInnerShape(Rectangle bounds, int borderSize)
+        {
+            return GetShape(bounds, Math.Max(0, _TopLeft - borderSize), Math.Max(0, _TopRight - borderSize), 
+                Math.Max(0, _BottomLeft - borderSize), Math.Max(0, _BottomRight - borderSize));
+        }
+
+        private GraphicsPath GetShape(Rectangle bounds, int topLeft, int topRight, int bottomLeft, int bottomRight)
+        {
+            if (topLeft == 0 && topRight == 0 && bottomLeft == 0 && bottomRight == 0)
+            {
+                GraphicsPath path = new GraphicsPath();
+                //bounds.Width--;
+                //bounds.Height--;
+                path.AddRectangle(bounds);
+                return path;
+            }
+
+            return DisplayHelp.GetRoundedRectanglePath(bounds, topLeft, topRight, bottomLeft, bottomRight, eStyleBackgroundPathPart.Complete,
+                eCornerType.Rounded, eCornerType.Rounded, eCornerType.Rounded, eCornerType.Rounded, 0);
+        }
+
+        public override bool CanDrawShape(System.Drawing.Rectangle bounds)
+        {
+            if (bounds.Width < Math.Max(_TopLeft + _TopRight, _BottomLeft + _BottomRight) + 1 ||
+                bounds.Height < Math.Max(_TopLeft + _TopRight, _BottomLeft + _BottomRight) + 1 || bounds.Height <= 1 || bounds.Width <= 1) 
+                return false;
+
+            return true;
+        }
+
+        private static RoundRectangleShapeDescriptor _RectangleShape = new RoundRectangleShapeDescriptor();
+        public static RoundRectangleShapeDescriptor RectangleShape
+        {
+            get
+            {
+                return _RectangleShape;
+            }
+        }
+
+        private static RoundRectangleShapeDescriptor _RoundCorner2 = new RoundRectangleShapeDescriptor(2);
+        public static RoundRectangleShapeDescriptor RoundCorner2
+        {
+            get
+            {
+                return _RoundCorner2;
+            }
+        }
+
+        private static RoundRectangleShapeDescriptor _RoundCorner3 = new RoundRectangleShapeDescriptor(3);
+        public static RoundRectangleShapeDescriptor RoundCorner3
+        {
+            get
+            {
+                return _RoundCorner3;
+            }
+        }
+        #endregion
+
+
+    }
+
+    /// <summary>
+    /// Represents DocumentDockContainer object converter.
+    /// </summary>
+    public class RoundRectangleShapeDescriptorConverter : TypeConverter
+    {
+        public RoundRectangleShapeDescriptorConverter() { }
+
+        public override bool CanConvertTo(ITypeDescriptorContext context, Type destinationType)
+        {
+            if (destinationType == typeof(InstanceDescriptor))
+                return true;
+            return base.CanConvertTo(context, destinationType);
+        }
+
+        public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+        {
+            if (destinationType == null)
+                throw new ArgumentNullException("destinationType");
+
+            if ((destinationType == typeof(InstanceDescriptor)) && (value is RoundRectangleShapeDescriptor))
+            {
+                RoundRectangleShapeDescriptor doc = (RoundRectangleShapeDescriptor)value;
+                Type[] constructorParams = null;
+                MemberInfo constructorMemberInfo = null;
+                object[] constructorValues = null;
+
+                if (doc.IsEmpty)
+                {
+                    constructorParams = new Type[0];
+                    constructorMemberInfo = typeof(RoundRectangleShapeDescriptor).GetConstructor(constructorParams);
+                    constructorValues = new object[0];
+                }
+                else if (doc.IsUniform)
+                {
+                    constructorParams = new Type[1] { typeof(int) };
+                    constructorMemberInfo = typeof(RoundRectangleShapeDescriptor).GetConstructor(constructorParams);
+                    constructorValues = new object[1] { doc.TopLeft };
+                }
+                else
+                {
+                    constructorParams = new Type[4] { typeof(int), typeof(int), typeof(int), typeof(int) };
+                    constructorMemberInfo = typeof(RoundRectangleShapeDescriptor).GetConstructor(constructorParams);
+                    constructorValues = new object[4] { doc.TopLeft, doc.TopRight, doc.BottomLeft, doc.BottomRight};
+                }
+
+                if (constructorMemberInfo != null)
+                {
+                    return new InstanceDescriptor(constructorMemberInfo, constructorValues);
+                }
+            }
+
+            return base.ConvertTo(context, culture, value, destinationType);
+        }
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Schedule/Color/CalendarColor.cs b/PROMS/DotNetBar Source Code/Schedule/Color/CalendarColor.cs
new file mode 100644
index 00000000..5591e764
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Schedule/Color/CalendarColor.cs	
@@ -0,0 +1,442 @@
+#if FRAMEWORK20
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Globalization;
+
+namespace DevComponents.DotNetBar.Schedule
+{
+    #region ColorDef
+
+    /// <summary>
+    /// Color definition class
+    /// </summary>
+    [TypeConverter(typeof(ColorDefConvertor))]
+    public class ColorDef
+    {
+        #region Events
+
+        /// <summary>
+        /// Event raised when the SuperTabColorStates is changed
+        /// </summary>
+        [Description("Event raised when the ColorDef is changed")]
+        public event EventHandler<EventArgs> ColorDefChanged;
+
+        #endregion
+
+        #region Private variables
+
+        private Color[] _Colors;        // Color values
+        private float[] _Positions;     // Gradient color positions
+        private float _Angle;           // Gradient angle
+
+        #endregion
+
+        #region Constructors
+
+        public ColorDef()
+        {
+        }
+
+        /// <summary>
+        /// Constructor - solid def
+        /// </summary>
+        /// <param name="rgb">RGB value</param>
+        public ColorDef(int rgb)
+            : this(ColorScheme.GetColor(rgb))
+        {
+        }
+
+        /// <summary>
+        /// Constructor - solid def
+        /// </summary>
+        /// <param name="color">Color</param>
+        public ColorDef(Color color)
+        {
+            _Colors = new Color[1];
+
+            _Colors[0] = color;
+            _Positions = null;
+        }
+
+        /// <summary>
+        /// Constructor - 2 color def
+        /// </summary>
+        /// <param name="start">Start Color</param>
+        /// <param name="end">End Color</param>
+        public ColorDef(Color start, Color end)
+            : this(start, end, 90f)
+        {
+        }
+
+        /// <summary>
+        /// Constructor - 2 color def
+        /// </summary>
+        /// <param name="start">Start Color</param>
+        /// <param name="end">End Color</param>
+        /// <param name="angle">Gradient angle</param>
+        public ColorDef(Color start, Color end, float angle)
+        {
+            _Colors = new Color[] { start, end };
+            _Positions = new float[] { 0, 1 };
+
+            _Angle = angle;
+        }
+
+        /// <summary>
+        /// Constructor - Gradient def
+        /// </summary>
+        /// <param name="rgbs">Array of RGB values</param>
+        /// <param name="cPositions">Gradient positions</param>
+        public ColorDef(int[] rgbs, float[] cPositions)
+            : this(rgbs, cPositions, 90f)
+        {
+        }
+
+        /// <summary>
+        /// Constructor - Gradient def
+        /// </summary>
+        /// <param name="colors">Array of Color values</param>
+        /// <param name="cPositions">Gradient positions</param>
+        public ColorDef(Color[] colors, float[] cPositions)
+            : this(colors, cPositions, 90f)
+        {
+        }
+
+        /// <summary>
+        /// Constructor - Gradient def
+        /// </summary>
+        /// <param name="rgbs">Array of RGB values</param>
+        /// <param name="cPositions">Gradient positions</param>
+        /// <param name="angle">Gradient angle</param>
+        public ColorDef(int[] rgbs, float[] cPositions, float angle)
+        {
+            _Colors = new Color[rgbs.Length];
+
+            for (int i = 0; i < rgbs.Length; i++)
+                _Colors[i] = ColorScheme.GetColor(rgbs[i]);
+
+            _Positions = cPositions;
+            _Angle = angle;
+        }
+
+        /// <summary>
+        /// Constructor - Gradient def
+        /// </summary>
+        /// <param name="colors">Array of Color values</param>
+        /// <param name="cPositions">Gradient positions</param>
+        /// <param name="angle">Gradient angle</param>
+        public ColorDef(Color[] colors, float[] cPositions, float angle)
+        {
+            _Colors = colors;
+            _Positions = cPositions;
+            _Angle = angle;
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region Colors
+
+        /// <summary>
+        /// Gets or sets the Color array
+        /// </summary>
+        [Browsable(true), DefaultValue(null)]
+        [NotifyParentProperty(true)]
+        [Description("Indicates the Color array")]
+        public Color[] Colors
+        {
+            get { return (_Colors); }
+            set { _Colors = value; OnColorDefChanged(); }
+        }
+
+        #endregion
+
+        #region Positions
+
+        /// <summary>
+        /// Gets or sets the Color Positions
+        /// </summary>
+        [Browsable(true), DefaultValue(null)]
+        [NotifyParentProperty(true)]
+        [Description("Indicates the Color Positions.")]
+        public float[] Positions
+        {
+            get { return (_Positions); }
+            set { _Positions = value; OnColorDefChanged(); }
+        }
+
+        #endregion
+
+        #region Angle
+
+        /// <summary>
+        /// Gets or sets the Gradient Angle
+        /// </summary>
+        [Browsable(true), DefaultValue(0f)]
+        [NotifyParentProperty(true)]
+        [Description("Indicates the Gradient Angle.")]
+        public float Angle
+        {
+            get { return (_Angle); }
+            set { _Angle = value; OnColorDefChanged(); }
+        }
+
+        #endregion
+
+        #region IsEmpty
+
+        /// <summary>
+        /// IsEmpty
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsEmpty
+        {
+            get { return (_Colors == null || 
+                _Colors.Length == 1 && _Colors[0].IsEmpty); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region OnColorDefChanged
+
+        /// <summary>
+        /// OnColorDefChanged
+        /// </summary>
+        private void OnColorDefChanged()
+        {
+            if (ColorDefChanged != null)
+                ColorDefChanged(this, EventArgs.Empty);
+        }
+
+        #endregion
+    }
+
+    #region ColorDefConvertor
+
+    /// <summary>
+    /// ColorDefConvertor
+    /// </summary>
+    public class ColorDefConvertor : ExpandableObjectConverter
+    {
+        public override object ConvertTo(
+            ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+        {
+            if (destinationType == typeof(string))
+            {
+                ColorDef cd = value as ColorDef;
+
+                if (cd != null)
+                {
+                    ColorConverter cvt = new ColorConverter();
+
+                    if (cd.Colors != null)
+                    {
+                        if (cd.Colors[0] != Color.Empty)
+                            return (cvt.ConvertToString(cd.Colors[0]));
+
+                        if (cd.Colors.Length > 1 && cd.Colors[1] != Color.Empty)
+                            return (cvt.ConvertToString(cd.Colors[1]));
+                    }
+
+                    if (cd.Angle != 0)
+                        return (cd.Angle.ToString());
+                }
+
+                return (String.Empty);
+            }
+
+            return (base.ConvertTo(context, culture, value, destinationType));
+        }
+    }
+
+    #endregion
+
+    #endregion
+
+    //#region CalendarColor
+
+    //public class CalendarColor
+    //{
+    //    #region Private variables
+
+    //    private eCalendarColor _ColorSch;   // Current color scheme enum
+    //    private ColorDef[] _ColorTable;     // Color scheme definition
+
+    //    #endregion
+
+    //    /// <summary>
+    //    /// Constructor
+    //    /// </summary>
+    //    /// <param name="colorSch">eCalendarColor</param>
+    //    public CalendarColor(eCalendarColor colorSch)
+    //    {
+    //        _ColorSch = colorSch;
+
+    //        SetColorTable();
+    //    }
+
+    //    #region Public properties
+
+    //    /// <summary>
+    //    /// Gets and sets ColorTable
+    //    /// </summary>
+    //    public ColorDef[] ColorTable
+    //    {
+    //        get { return (_ColorTable); }
+    //        set { _ColorTable = value; }
+    //    }
+
+    //    /// <summary>
+    //    /// Gets and sets calendar color scheme
+    //    /// </summary>
+    //    public eCalendarColor ColorSch
+    //    {
+    //        get { return (_ColorSch); }
+
+    //        set
+    //        {
+    //            if (_ColorSch != value)
+    //            {
+    //                _ColorSch = value;
+
+    //                SetColorTable();
+    //            }
+    //        }
+    //    }
+
+    //    #region SetColorTable
+
+    //    public virtual void SetColorTable()
+    //    {
+    //    }
+
+    //    #endregion
+
+    //    #endregion
+
+    //    #region Get Color
+
+    //    /// <summary>
+    //    /// Gets the Color of the calendar part
+    //    /// </summary>
+    //    /// <param name="part">Calendar part</param>
+    //    /// <returns>Color</returns>
+    //    public Color GetColor(int part)
+    //    {
+    //        return (_ColorTable[part].Colors[0]);
+    //    }
+
+    //    #endregion
+
+    //    #region GetColorDef
+
+    //    /// <summary>
+    //    /// Gets the ColorDef of the part
+    //    /// </summary>
+    //    /// <param name="part">Calendar part</param>
+    //    /// <returns>Part ColorDef</returns>
+    //    public ColorDef GetColorDef(int part)
+    //    {
+    //        return (_ColorTable[part]);
+    //    }
+
+    //    #endregion
+
+    //    #region BrushPart routines
+
+    //    /// <summary>
+    //    /// Creates a LinearGradientBrush from the given part
+    //    /// </summary>
+    //    /// <param name="part">Color part</param>
+    //    /// <param name="r">Gradient Rectangle</param>
+    //    /// <returns>Created Brush</returns>
+    //    public Brush BrushPart(int part, Rectangle r)
+    //    {
+    //        return (BrushPart(GetColorDef(part), r));
+    //    }
+
+    //    /// <summary>
+    //    /// Creates a LinearGradientBrush from the given ColorDef
+    //    /// </summary>
+    //    /// <param name="cDef">ColorDef</param>
+    //    /// <param name="r">Gradient Rectangle</param>
+    //    /// <returns>Created Brush</returns>
+    //    public Brush BrushPart(ColorDef cDef, Rectangle r)
+    //    {
+    //        return (BrushPart(cDef, r, cDef.Angle));
+    //    }
+        
+    //    /// <summary>
+    //    /// Creates a LinearGradientBrush from the given ColorDef
+    //    /// </summary>
+    //    /// <param name="cDef">ColorDef</param>
+    //    /// <param name="r">Gradient Rectangle</param>
+    //    /// <param name="angle">Gradient angle</param>
+    //    /// <returns>Created Brush</returns>
+    //    public Brush BrushPart(ColorDef cDef, Rectangle r, float angle)
+    //    {
+    //        if (cDef.Colors.Length == 1)
+    //            return (new SolidBrush(cDef.Colors[0]));
+
+    //        LinearGradientBrush lbr =
+    //            new LinearGradientBrush(r, Color.White, Color.White, angle);
+
+    //        lbr.InterpolationColors = GetColorBlend(cDef);
+
+    //        return (lbr);
+    //    }
+
+    //    /// <summary>
+    //    /// Creates a ColorBlend from the given ColorDef
+    //    /// </summary>
+    //    /// <param name="cDef">ColorDef for blend</param>
+    //    /// <returns>ColorBlend</returns>
+    //    private ColorBlend GetColorBlend(ColorDef cDef)
+    //    {
+    //        ColorBlend cb = new ColorBlend(cDef.Colors.Length);
+
+    //        // Set each Color and position from the
+    //        // provided color definition
+
+    //        cb.Colors = cDef.Colors;
+    //        cb.Positions = GetPositions(cDef);
+
+    //        return (cb);
+    //    }
+
+    //    /// <summary>
+    //    /// Gets the array of color positions
+    //    /// </summary>
+    //    /// <param name="cDef"></param>
+    //    /// <returns></returns>
+    //    private float[] GetPositions(ColorDef cDef)
+    //    {
+    //        float[] cp = cDef.Positions;
+
+    //        if (cp == null || cp.Length != cDef.Colors.Length)
+    //        {
+    //            cp = new float[cDef.Colors.Length];
+
+    //            float f = 1f / cDef.Colors.Length;
+
+    //            for (int i = 0; i < cp.Length; i++)
+    //                cp[i] = i * f;
+
+    //            cp[cDef.Colors.Length - 1] = 1;
+    //        }
+
+    //        return (cp);
+    //    }
+
+    //    #endregion
+    //}
+
+    //#endregion
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/Schedule/Model/TimeZoneInfo/NativeMethods.cs b/PROMS/DotNetBar Source Code/Schedule/Model/TimeZoneInfo/NativeMethods.cs
new file mode 100644
index 00000000..c43d93cc
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Schedule/Model/TimeZoneInfo/NativeMethods.cs	
@@ -0,0 +1,128 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Runtime.InteropServices;
+
+namespace DevComponents.Schedule
+{
+    internal class NativeMethods
+    {
+        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
+        internal struct TimeZoneInformation
+        {
+            [MarshalAs(UnmanagedType.I4)]
+            public int Bias;
+            [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 0x20)]
+            public string StandardName;
+            public NativeMethods.SystemTime StandardDate;
+            [MarshalAs(UnmanagedType.I4)]
+            public int StandardBias;
+            [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 0x20)]
+            public string DaylightName;
+            public NativeMethods.SystemTime DaylightDate;
+            [MarshalAs(UnmanagedType.I4)]
+            public int DaylightBias;
+            public TimeZoneInformation(NativeMethods.DynamicTimeZoneInformation dtzi)
+            {
+                this.Bias = dtzi.Bias;
+                this.StandardName = dtzi.StandardName;
+                this.StandardDate = dtzi.StandardDate;
+                this.StandardBias = dtzi.StandardBias;
+                this.DaylightName = dtzi.DaylightName;
+                this.DaylightDate = dtzi.DaylightDate;
+                this.DaylightBias = dtzi.DaylightBias;
+            }
+        }
+
+        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
+        internal struct DynamicTimeZoneInformation
+        {
+            [MarshalAs(UnmanagedType.I4)]
+            public int Bias;
+            [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 0x20)]
+            public string StandardName;
+            public NativeMethods.SystemTime StandardDate;
+            [MarshalAs(UnmanagedType.I4)]
+            public int StandardBias;
+            [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 0x20)]
+            public string DaylightName;
+            public NativeMethods.SystemTime DaylightDate;
+            [MarshalAs(UnmanagedType.I4)]
+            public int DaylightBias;
+            [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 0x80)]
+            public string TimeZoneKeyName;
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        internal struct SystemTime
+        {
+            [MarshalAs(UnmanagedType.U2)]
+            public short Year;
+            [MarshalAs(UnmanagedType.U2)]
+            public short Month;
+            [MarshalAs(UnmanagedType.U2)]
+            public short DayOfWeek;
+            [MarshalAs(UnmanagedType.U2)]
+            public short Day;
+            [MarshalAs(UnmanagedType.U2)]
+            public short Hour;
+            [MarshalAs(UnmanagedType.U2)]
+            public short Minute;
+            [MarshalAs(UnmanagedType.U2)]
+            public short Second;
+            [MarshalAs(UnmanagedType.U2)]
+            public short Milliseconds;
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        internal struct RegistryTimeZoneInformation
+        {
+            [MarshalAs(UnmanagedType.I4)]
+            public int Bias;
+            [MarshalAs(UnmanagedType.I4)]
+            public int StandardBias;
+            [MarshalAs(UnmanagedType.I4)]
+            public int DaylightBias;
+            public NativeMethods.SystemTime StandardDate;
+            public NativeMethods.SystemTime DaylightDate;
+            public RegistryTimeZoneInformation(NativeMethods.TimeZoneInformation tzi)
+            {
+                this.Bias = tzi.Bias;
+                this.StandardDate = tzi.StandardDate;
+                this.StandardBias = tzi.StandardBias;
+                this.DaylightDate = tzi.DaylightDate;
+                this.DaylightBias = tzi.DaylightBias;
+            }
+
+            public RegistryTimeZoneInformation(byte[] bytes)
+            {
+                if ((bytes == null) || (bytes.Length != 0x2c))
+                {
+                    throw new ArgumentException("Argument_InvalidREG_TZI_FORMAT", "bytes");
+                }
+                this.Bias = BitConverter.ToInt32(bytes, 0);
+                this.StandardBias = BitConverter.ToInt32(bytes, 4);
+                this.DaylightBias = BitConverter.ToInt32(bytes, 8);
+                this.StandardDate.Year = BitConverter.ToInt16(bytes, 12);
+                this.StandardDate.Month = BitConverter.ToInt16(bytes, 14);
+                this.StandardDate.DayOfWeek = BitConverter.ToInt16(bytes, 0x10);
+                this.StandardDate.Day = BitConverter.ToInt16(bytes, 0x12);
+                this.StandardDate.Hour = BitConverter.ToInt16(bytes, 20);
+                this.StandardDate.Minute = BitConverter.ToInt16(bytes, 0x16);
+                this.StandardDate.Second = BitConverter.ToInt16(bytes, 0x18);
+                this.StandardDate.Milliseconds = BitConverter.ToInt16(bytes, 0x1a);
+                this.DaylightDate.Year = BitConverter.ToInt16(bytes, 0x1c);
+                this.DaylightDate.Month = BitConverter.ToInt16(bytes, 30);
+                this.DaylightDate.DayOfWeek = BitConverter.ToInt16(bytes, 0x20);
+                this.DaylightDate.Day = BitConverter.ToInt16(bytes, 0x22);
+                this.DaylightDate.Hour = BitConverter.ToInt16(bytes, 0x24);
+                this.DaylightDate.Minute = BitConverter.ToInt16(bytes, 0x26);
+                this.DaylightDate.Second = BitConverter.ToInt16(bytes, 40);
+                this.DaylightDate.Milliseconds = BitConverter.ToInt16(bytes, 0x2a);
+            }
+        }
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/Schedule/Model/TimeZoneInfo/TimeZoneInfo.cs b/PROMS/DotNetBar Source Code/Schedule/Model/TimeZoneInfo/TimeZoneInfo.cs
new file mode 100644
index 00000000..3f5c7568
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Schedule/Model/TimeZoneInfo/TimeZoneInfo.cs	
@@ -0,0 +1,2655 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Security.Permissions;
+using System.Runtime.Serialization;
+using System.Globalization;
+using System.Security;
+using Microsoft.Win32;
+using System.Runtime.InteropServices;
+using System.Security.AccessControl;
+using System.IO;
+using System.Runtime.ConstrainedExecution;
+
+namespace DevComponents.Schedule
+{
+    [Serializable, HostProtection(SecurityAction.LinkDemand, MayLeakOnAbort = true)]
+    public sealed class TimeZoneInfo : IEquatable<TimeZoneInfo>, ISerializable, IDeserializationCallback
+    {
+        // Fields
+        private const string c_daylightValue = "Dlt";
+        private const string c_disableDST = "DisableAutoDaylightTimeSet";
+        private const string c_disableDynamicDST = "DynamicDaylightTimeDisabled";
+        private const string c_displayValue = "Display";
+        private const string c_firstEntryValue = "FirstEntry";
+        private const string c_lastEntryValue = "LastEntry";
+        private const string c_localId = "Local";
+        private const int c_maxKeyLength = 0xff;
+        private const string c_muiDaylightValue = "MUI_Dlt";
+        private const string c_muiDisplayValue = "MUI_Display";
+        private const string c_muiStandardValue = "MUI_Std";
+        private const string c_standardValue = "Std";
+        private const long c_ticksPerDay = 0xc92a69c000L;
+        private const long c_ticksPerDayRange = 0xc92a6998f0L;
+        private const long c_ticksPerHour = 0x861c46800L;
+        private const long c_ticksPerMillisecond = 0x2710L;
+        private const long c_ticksPerMinute = 0x23c34600L;
+        private const long c_ticksPerSecond = 0x989680L;
+        private const string c_timeZoneInfoRegistryHive = @"SYSTEM\CurrentControlSet\Control\TimeZoneInformation";
+        private const string c_timeZoneInfoRegistryHivePermissionList = @"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\TimeZoneInformation";
+        private const string c_timeZoneInfoValue = "TZI";
+        private const string c_timeZonesRegistryHive = @"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones";
+        private const string c_timeZonesRegistryHivePermissionList = @"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones";
+        private const string c_utcId = "UTC";
+        private AdjustmentRule[] m_adjustmentRules;
+        private TimeSpan m_baseUtcOffset;
+        private string m_daylightDisplayName;
+        private string m_displayName;
+        private string m_id;
+        private string m_standardDisplayName;
+        private bool m_supportsDaylightSavingTime;
+        private static bool s_allSystemTimeZonesRead = false;
+        private static object s_hiddenInternalSyncObject;
+        private static Dictionary<string, TimeZoneInfo> s_hiddenSystemTimeZones;
+        private static TimeZoneInfo s_localTimeZone;
+        private static List<TimeZoneInfo> s_readOnlySystemTimeZones;
+        private static TimeZoneInfo s_utcTimeZone;
+
+        // Methods
+        private TimeZoneInfo(NativeMethods.TimeZoneInformation zone, bool dstDisabled)
+        {
+            if (string.IsNullOrEmpty(zone.StandardName))
+            {
+                this.m_id = "Local";
+            }
+            else
+            {
+                this.m_id = zone.StandardName;
+            }
+            this.m_baseUtcOffset = new TimeSpan(0, -zone.Bias, 0);
+            if (!dstDisabled)
+            {
+                NativeMethods.RegistryTimeZoneInformation timeZoneInformation = new NativeMethods.RegistryTimeZoneInformation(zone);
+                AdjustmentRule rule = CreateAdjustmentRuleFromTimeZoneInformation(timeZoneInformation, DateTime.MinValue.Date, DateTime.MaxValue.Date);
+                if (rule != null)
+                {
+                    this.m_adjustmentRules = new AdjustmentRule[] { rule };
+                }
+            }
+            ValidateTimeZoneInfo(this.m_id, this.m_baseUtcOffset, this.m_adjustmentRules, out this.m_supportsDaylightSavingTime);
+            this.m_displayName = zone.StandardName;
+            this.m_standardDisplayName = zone.StandardName;
+            this.m_daylightDisplayName = zone.DaylightName;
+        }
+
+        private TimeZoneInfo(SerializationInfo info, StreamingContext context)
+        {
+            if (info == null)
+            {
+                throw new ArgumentNullException("info");
+            }
+            this.m_id = (string)info.GetValue("Id", typeof(string));
+            this.m_displayName = (string)info.GetValue("DisplayName", typeof(string));
+            this.m_standardDisplayName = (string)info.GetValue("StandardName", typeof(string));
+            this.m_daylightDisplayName = (string)info.GetValue("DaylightName", typeof(string));
+            this.m_baseUtcOffset = (TimeSpan)info.GetValue("BaseUtcOffset", typeof(TimeSpan));
+            this.m_adjustmentRules = (AdjustmentRule[])info.GetValue("AdjustmentRules", typeof(AdjustmentRule[]));
+            this.m_supportsDaylightSavingTime = (bool)info.GetValue("SupportsDaylightSavingTime", typeof(bool));
+        }
+
+        private TimeZoneInfo(string id, TimeSpan baseUtcOffset, string displayName, string standardDisplayName, string daylightDisplayName, AdjustmentRule[] adjustmentRules, bool disableDaylightSavingTime)
+        {
+            bool flag;
+            ValidateTimeZoneInfo(id, baseUtcOffset, adjustmentRules, out flag);
+            if ((!disableDaylightSavingTime && (adjustmentRules != null)) && (adjustmentRules.Length > 0))
+            {
+                this.m_adjustmentRules = (AdjustmentRule[])adjustmentRules.Clone();
+            }
+            this.m_id = id;
+            this.m_baseUtcOffset = baseUtcOffset;
+            this.m_displayName = displayName;
+            this.m_standardDisplayName = standardDisplayName;
+            this.m_daylightDisplayName = disableDaylightSavingTime ? null : daylightDisplayName;
+            this.m_supportsDaylightSavingTime = flag && !disableDaylightSavingTime;
+        }
+
+        [SecurityCritical, SecurityTreatAsSafe]
+        private static bool CheckDaylightSavingTimeDisabled()
+        {
+            try
+            {
+                PermissionSet set = new PermissionSet(PermissionState.None);
+                set.AddPermission(new RegistryPermission(RegistryPermissionAccess.Read, @"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\TimeZoneInformation"));
+                set.Assert();
+                using (RegistryKey key = Registry.LocalMachine.OpenSubKey(@"SYSTEM\CurrentControlSet\Control\TimeZoneInformation", RegistryKeyPermissionCheck.Default, RegistryRights.ExecuteKey))
+                {
+                    if (key == null)
+                    {
+                        return false;
+                    }
+                    int num = 0;
+                    try
+                    {
+                        num = (int)key.GetValue("DisableAutoDaylightTimeSet", 0, RegistryValueOptions.None);
+                    }
+                    catch (InvalidCastException)
+                    {
+                    }
+                    if (num != 1)
+                    {
+                        try
+                        {
+                            num = (int)key.GetValue("DynamicDaylightTimeDisabled", 0, RegistryValueOptions.None);
+                        }
+                        catch (InvalidCastException)
+                        {
+                        }
+                        if (num != 1)
+                        {
+                            goto Label_009C;
+                        }
+                    }
+                    return true;
+                }
+            }
+            finally
+            {
+                PermissionSet.RevertAssert();
+            }
+        Label_009C:
+            return false;
+        }
+
+        private static bool CheckDaylightSavingTimeNotSupported(NativeMethods.TimeZoneInformation timeZone)
+        {
+            return (((((timeZone.DaylightDate.Year == timeZone.StandardDate.Year) && (timeZone.DaylightDate.Month == timeZone.StandardDate.Month)) && ((timeZone.DaylightDate.DayOfWeek == timeZone.StandardDate.DayOfWeek) && (timeZone.DaylightDate.Day == timeZone.StandardDate.Day))) && (((timeZone.DaylightDate.Hour == timeZone.StandardDate.Hour) && (timeZone.DaylightDate.Minute == timeZone.StandardDate.Minute)) && (timeZone.DaylightDate.Second == timeZone.StandardDate.Second))) && (timeZone.DaylightDate.Milliseconds == timeZone.StandardDate.Milliseconds));
+        }
+
+        private static bool CheckIsDst(DateTime startTime, DateTime time, DateTime endTime)
+        {
+            if (startTime.Year != endTime.Year)
+            {
+                endTime = endTime.AddYears(startTime.Year - endTime.Year);
+            }
+            if (startTime.Year != time.Year)
+            {
+                time = time.AddYears(startTime.Year - time.Year);
+            }
+            if (startTime > endTime)
+            {
+                return ((time < endTime) || (time >= startTime));
+            }
+            return ((time >= startTime) && (time < endTime));
+        }
+
+        public static void ClearCachedData()
+        {
+            lock (s_internalSyncObject)
+            {
+                s_localTimeZone = null;
+                s_utcTimeZone = null;
+                s_systemTimeZones = null;
+                s_readOnlySystemTimeZones = null;
+                s_allSystemTimeZonesRead = false;
+            }
+        }
+
+        public static DateTime ConvertTime(DateTime dateTime, TimeZoneInfo destinationTimeZone)
+        {
+            if (destinationTimeZone == null)
+            {
+                throw new ArgumentNullException("destinationTimeZone");
+            }
+            if (dateTime.Kind == DateTimeKind.Utc)
+            {
+                lock (s_internalSyncObject)
+                {
+                    return ConvertTime(dateTime, Utc, destinationTimeZone);
+                }
+            }
+            lock (s_internalSyncObject)
+            {
+                return ConvertTime(dateTime, Local, destinationTimeZone);
+            }
+        }
+
+        public static DateTimeOffset ConvertTime(DateTimeOffset dateTimeOffset, TimeZoneInfo destinationTimeZone)
+        {
+            if (destinationTimeZone == null)
+            {
+                throw new ArgumentNullException("destinationTimeZone");
+            }
+            DateTime utcDateTime = dateTimeOffset.UtcDateTime;
+            TimeSpan utcOffsetFromUtc = GetUtcOffsetFromUtc(utcDateTime, destinationTimeZone);
+            long ticks = utcDateTime.Ticks + utcOffsetFromUtc.Ticks;
+            if (ticks > DateTimeOffset.MaxValue.Ticks)
+            {
+                return DateTimeOffset.MaxValue;
+            }
+            if (ticks < DateTimeOffset.MinValue.Ticks)
+            {
+                return DateTimeOffset.MinValue;
+            }
+            return new DateTimeOffset(ticks, utcOffsetFromUtc);
+        }
+
+        public static DateTime ConvertTime(DateTime dateTime, TimeZoneInfo sourceTimeZone, TimeZoneInfo destinationTimeZone)
+        {
+            return ConvertTime(dateTime, sourceTimeZone, destinationTimeZone, TimeZoneInfoOptions.None);
+        }
+
+        internal static DateTime ConvertTime(DateTime dateTime, TimeZoneInfo sourceTimeZone, TimeZoneInfo destinationTimeZone, TimeZoneInfoOptions flags)
+        {
+            if (sourceTimeZone == null)
+            {
+                throw new ArgumentNullException("sourceTimeZone");
+            }
+            if (destinationTimeZone == null)
+            {
+                throw new ArgumentNullException("destinationTimeZone");
+            }
+            DateTimeKind correspondingKind = sourceTimeZone.GetCorrespondingKind();
+            if ((((flags & TimeZoneInfoOptions.NoThrowOnInvalidTime) == 0) && (dateTime.Kind != DateTimeKind.Unspecified)) && (dateTime.Kind != correspondingKind))
+            {
+                throw new ArgumentException("Argument_ConvertMismatch", "sourceTimeZone");
+            }
+            AdjustmentRule adjustmentRuleForTime = sourceTimeZone.GetAdjustmentRuleForTime(dateTime);
+            TimeSpan baseUtcOffset = sourceTimeZone.BaseUtcOffset;
+            if (adjustmentRuleForTime != null)
+            {
+                bool flag = false;
+                DaylightTime daylightTime = GetDaylightTime(dateTime.Year, adjustmentRuleForTime);
+                if (((flags & TimeZoneInfoOptions.NoThrowOnInvalidTime) == 0) && GetIsInvalidTime(dateTime, adjustmentRuleForTime, daylightTime))
+                {
+                    throw new ArgumentException("Argument_DateTimeIsInvalid", "dateTime");
+                }
+                flag = GetIsDaylightSavings(dateTime, adjustmentRuleForTime, daylightTime);
+                baseUtcOffset += flag ? adjustmentRuleForTime.DaylightDelta : TimeSpan.Zero;
+            }
+            DateTimeKind kind = destinationTimeZone.GetCorrespondingKind();
+            if (((dateTime.Kind != DateTimeKind.Unspecified) && (correspondingKind != DateTimeKind.Unspecified)) && (correspondingKind == kind))
+            {
+                return dateTime;
+            }
+            long ticks = dateTime.Ticks - baseUtcOffset.Ticks;
+            DateTime time2 = ConvertUtcToTimeZone(ticks, destinationTimeZone);
+            if (kind == DateTimeKind.Local)
+            {
+                kind = DateTimeKind.Unspecified;
+            }
+            return new DateTime(time2.Ticks, kind);
+        }
+
+        public static DateTime ConvertTimeBySystemTimeZoneId(DateTime dateTime, string destinationTimeZoneId)
+        {
+            return ConvertTime(dateTime, FindSystemTimeZoneById(destinationTimeZoneId));
+        }
+
+        public static DateTimeOffset ConvertTimeBySystemTimeZoneId(DateTimeOffset dateTimeOffset, string destinationTimeZoneId)
+        {
+            return ConvertTime(dateTimeOffset, FindSystemTimeZoneById(destinationTimeZoneId));
+        }
+
+        public static DateTime ConvertTimeBySystemTimeZoneId(DateTime dateTime, string sourceTimeZoneId, string destinationTimeZoneId)
+        {
+            if ((dateTime.Kind == DateTimeKind.Local) && (string.Compare(sourceTimeZoneId, Local.Id, StringComparison.OrdinalIgnoreCase) == 0))
+            {
+                lock (s_internalSyncObject)
+                {
+                    return ConvertTime(dateTime, Local, FindSystemTimeZoneById(destinationTimeZoneId));
+                }
+            }
+            if ((dateTime.Kind == DateTimeKind.Utc) && (string.Compare(sourceTimeZoneId, Utc.Id, StringComparison.OrdinalIgnoreCase) == 0))
+            {
+                lock (s_internalSyncObject)
+                {
+                    return ConvertTime(dateTime, Utc, FindSystemTimeZoneById(destinationTimeZoneId));
+                }
+            }
+            return ConvertTime(dateTime, FindSystemTimeZoneById(sourceTimeZoneId), FindSystemTimeZoneById(destinationTimeZoneId));
+        }
+
+        public static DateTime ConvertTimeFromUtc(DateTime dateTime, TimeZoneInfo destinationTimeZone)
+        {
+            lock (s_internalSyncObject)
+            {
+                return ConvertTime(dateTime, Utc, destinationTimeZone);
+            }
+        }
+
+        public static DateTime ConvertTimeToUtc(DateTime dateTime)
+        {
+            if (dateTime.Kind == DateTimeKind.Utc)
+            {
+                return dateTime;
+            }
+            lock (s_internalSyncObject)
+            {
+                return ConvertTime(dateTime, Local, Utc);
+            }
+        }
+
+        public static DateTime ConvertTimeToUtc(DateTime dateTime, TimeZoneInfo sourceTimeZone)
+        {
+            lock (s_internalSyncObject)
+            {
+                return ConvertTime(dateTime, sourceTimeZone, Utc);
+            }
+        }
+
+        private static DateTime ConvertUtcToTimeZone(long ticks, TimeZoneInfo destinationTimeZone)
+        {
+            DateTime maxValue;
+            if (ticks > DateTime.MaxValue.Ticks)
+            {
+                maxValue = DateTime.MaxValue;
+            }
+            else if (ticks < DateTime.MinValue.Ticks)
+            {
+                maxValue = DateTime.MinValue;
+            }
+            else
+            {
+                maxValue = new DateTime(ticks);
+            }
+            TimeSpan utcOffsetFromUtc = GetUtcOffsetFromUtc(maxValue, destinationTimeZone);
+            ticks += utcOffsetFromUtc.Ticks;
+            if (ticks > DateTime.MaxValue.Ticks)
+            {
+                return DateTime.MaxValue;
+            }
+            if (ticks < DateTime.MinValue.Ticks)
+            {
+                return DateTime.MinValue;
+            }
+            return new DateTime(ticks);
+        }
+
+        private static AdjustmentRule CreateAdjustmentRuleFromTimeZoneInformation(NativeMethods.RegistryTimeZoneInformation timeZoneInformation, DateTime startDate, DateTime endDate)
+        {
+            if (timeZoneInformation.StandardDate.Month == 0)
+            {
+                return null;
+            }
+            TransitionTime? nullable = TransitionTimeFromTimeZoneInformation(timeZoneInformation, true);
+            if (!nullable.HasValue)
+            {
+                return null;
+            }
+            TransitionTime? nullable2 = TransitionTimeFromTimeZoneInformation(timeZoneInformation, false);
+            if (!nullable2.HasValue)
+            {
+                return null;
+            }
+            if (nullable.Equals(nullable2))
+            {
+                return null;
+            }
+            return AdjustmentRule.CreateAdjustmentRule(startDate, endDate, new TimeSpan(0, -timeZoneInformation.DaylightBias, 0), nullable.Value, nullable2.Value);
+        }
+
+        public static TimeZoneInfo CreateCustomTimeZone(string id, TimeSpan baseUtcOffset, string displayName, string standardDisplayName)
+        {
+            return new TimeZoneInfo(id, baseUtcOffset, displayName, standardDisplayName, standardDisplayName, null, false);
+        }
+
+        public static TimeZoneInfo CreateCustomTimeZone(string id, TimeSpan baseUtcOffset, string displayName, string standardDisplayName, string daylightDisplayName, AdjustmentRule[] adjustmentRules)
+        {
+            return new TimeZoneInfo(id, baseUtcOffset, displayName, standardDisplayName, daylightDisplayName, adjustmentRules, false);
+        }
+
+        public static TimeZoneInfo CreateCustomTimeZone(string id, TimeSpan baseUtcOffset, string displayName, string standardDisplayName, string daylightDisplayName, AdjustmentRule[] adjustmentRules, bool disableDaylightSavingTime)
+        {
+            return new TimeZoneInfo(id, baseUtcOffset, displayName, standardDisplayName, daylightDisplayName, adjustmentRules, disableDaylightSavingTime);
+        }
+
+        public bool Equals(TimeZoneInfo other)
+        {
+            return (((other != null) && (string.Compare(this.m_id, other.m_id, StringComparison.OrdinalIgnoreCase) == 0)) && this.HasSameRules(other));
+        }
+
+        [SecurityCritical, SecurityTreatAsSafe]
+        private static string FindIdFromTimeZoneInformation(NativeMethods.TimeZoneInformation timeZone, out bool dstDisabled)
+        {
+            dstDisabled = false;
+            try
+            {
+                PermissionSet set = new PermissionSet(PermissionState.None);
+                set.AddPermission(new RegistryPermission(RegistryPermissionAccess.Read, @"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones"));
+                set.Assert();
+                using (RegistryKey key = Registry.LocalMachine.OpenSubKey(@"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones", RegistryKeyPermissionCheck.Default, RegistryRights.ExecuteKey))
+                {
+                    if (key == null)
+                    {
+                        return null;
+                    }
+                    foreach (string str in key.GetSubKeyNames())
+                    {
+                        if (TryCompareTimeZoneInformationToRegistry(timeZone, str, out dstDisabled))
+                        {
+                            return str;
+                        }
+                    }
+                }
+            }
+            finally
+            {
+                PermissionSet.RevertAssert();
+            }
+            return null;
+        }
+
+        public static TimeZoneInfo FindSystemTimeZoneById(string id)
+        {
+            if (string.Compare(id, "UTC", StringComparison.OrdinalIgnoreCase) == 0)
+            {
+                return Utc;
+            }
+            lock (s_internalSyncObject)
+            {
+                return GetTimeZone(id);
+            }
+        }
+
+        public static TimeZoneInfo FromSerializedString(string source)
+        {
+            if (source == null)
+            {
+                throw new ArgumentNullException("source");
+            }
+            if (source.Length == 0)
+            {
+                throw new ArgumentException("Argument_InvalidSerializedString source");
+            }
+            return StringSerializer.GetDeserializedTimeZoneInfo(source);
+        }
+
+        private AdjustmentRule GetAdjustmentRuleForTime(DateTime dateTime)
+        {
+            if ((this.m_adjustmentRules != null) && (this.m_adjustmentRules.Length != 0))
+            {
+                DateTime date = dateTime.Date;
+                for (int i = 0; i < this.m_adjustmentRules.Length; i++)
+                {
+                    if ((this.m_adjustmentRules[i].DateStart <= date) && (this.m_adjustmentRules[i].DateEnd >= date))
+                    {
+                        return this.m_adjustmentRules[i];
+                    }
+                }
+            }
+            return null;
+        }
+
+        public AdjustmentRule[] GetAdjustmentRules()
+        {
+            if (this.m_adjustmentRules == null)
+            {
+                return new AdjustmentRule[0];
+            }
+            return (AdjustmentRule[])this.m_adjustmentRules.Clone();
+        }
+
+        public TimeSpan[] GetAmbiguousTimeOffsets(DateTime dateTime)
+        {
+            DateTime time;
+            bool flag;
+            if (!this.m_supportsDaylightSavingTime)
+            {
+                throw new ArgumentException("Argument_DateTimeIsNotAmbiguous", "dateTime");
+            }
+            if (dateTime.Kind == DateTimeKind.Local)
+            {
+                lock (s_internalSyncObject)
+                {
+                    time = ConvertTime(dateTime, Local, this, TimeZoneInfoOptions.NoThrowOnInvalidTime);
+                    goto Label_007D;
+                }
+            }
+            if (dateTime.Kind == DateTimeKind.Utc)
+            {
+                lock (s_internalSyncObject)
+                {
+                    time = ConvertTime(dateTime, Utc, this, TimeZoneInfoOptions.NoThrowOnInvalidTime);
+                    goto Label_007D;
+                }
+            }
+            time = dateTime;
+        Label_007D:
+            flag = false;
+            AdjustmentRule adjustmentRuleForTime = this.GetAdjustmentRuleForTime(time);
+            if (adjustmentRuleForTime != null)
+            {
+                DaylightTime daylightTime = GetDaylightTime(time.Year, adjustmentRuleForTime);
+                flag = GetIsAmbiguousTime(time, adjustmentRuleForTime, daylightTime);
+            }
+            if (!flag)
+            {
+                throw new ArgumentException("Argument_DateTimeIsNotAmbiguous", "dateTime");
+            }
+            TimeSpan[] spanArray = new TimeSpan[2];
+            if (adjustmentRuleForTime.DaylightDelta > TimeSpan.Zero)
+            {
+                spanArray[0] = this.m_baseUtcOffset;
+                spanArray[1] = this.m_baseUtcOffset + adjustmentRuleForTime.DaylightDelta;
+                return spanArray;
+            }
+            spanArray[0] = this.m_baseUtcOffset + adjustmentRuleForTime.DaylightDelta;
+            spanArray[1] = this.m_baseUtcOffset;
+            return spanArray;
+        }
+
+        public TimeSpan[] GetAmbiguousTimeOffsets(DateTimeOffset dateTimeOffset)
+        {
+            if (!this.m_supportsDaylightSavingTime)
+            {
+                throw new ArgumentException("Argument_DateTimeOffsetIsNotAmbiguous", "dateTimeOffset");
+            }
+            DateTime dateTime = ConvertTime(dateTimeOffset, this).DateTime;
+            bool flag = false;
+            AdjustmentRule adjustmentRuleForTime = this.GetAdjustmentRuleForTime(dateTime);
+            if (adjustmentRuleForTime != null)
+            {
+                DaylightTime daylightTime = GetDaylightTime(dateTime.Year, adjustmentRuleForTime);
+                flag = GetIsAmbiguousTime(dateTime, adjustmentRuleForTime, daylightTime);
+            }
+            if (!flag)
+            {
+                throw new ArgumentException("Argument_DateTimeOffsetIsNotAmbiguous", "dateTimeOffset");
+            }
+            TimeSpan[] spanArray = new TimeSpan[2];
+            if (adjustmentRuleForTime.DaylightDelta > TimeSpan.Zero)
+            {
+                spanArray[0] = this.m_baseUtcOffset;
+                spanArray[1] = this.m_baseUtcOffset + adjustmentRuleForTime.DaylightDelta;
+                return spanArray;
+            }
+            spanArray[0] = this.m_baseUtcOffset + adjustmentRuleForTime.DaylightDelta;
+            spanArray[1] = this.m_baseUtcOffset;
+            return spanArray;
+        }
+
+        private DateTimeKind GetCorrespondingKind()
+        {
+            if (this == s_utcTimeZone)
+            {
+                return DateTimeKind.Utc;
+            }
+            if (this == s_localTimeZone)
+            {
+                return DateTimeKind.Local;
+            }
+            return DateTimeKind.Unspecified;
+        }
+
+        private static DaylightTime GetDaylightTime(int year, AdjustmentRule rule)
+        {
+            TimeSpan daylightDelta = rule.DaylightDelta;
+            DateTime start = TransitionTimeToDateTime(year, rule.DaylightTransitionStart);
+            return new DaylightTime(start, TransitionTimeToDateTime(year, rule.DaylightTransitionEnd), daylightDelta);
+        }
+
+        public override int GetHashCode()
+        {
+            return this.m_id.ToUpperInvariant().GetHashCode();
+        }
+
+        private static bool GetIsAmbiguousTime(DateTime time, AdjustmentRule rule, DaylightTime daylightTime)
+        {
+            bool flag = false;
+            if ((rule != null) && (rule.DaylightDelta != TimeSpan.Zero))
+            {
+                DateTime end;
+                DateTime time3;
+                DateTime time4;
+                DateTime time5;
+                if (rule.DaylightDelta > TimeSpan.Zero)
+                {
+                    end = daylightTime.End;
+                    time3 = daylightTime.End - rule.DaylightDelta;
+                }
+                else
+                {
+                    end = daylightTime.Start;
+                    time3 = daylightTime.Start + rule.DaylightDelta;
+                }
+                flag = (time >= time3) && (time < end);
+                if (flag || (end.Year == time3.Year))
+                {
+                    return flag;
+                }
+                try
+                {
+                    time4 = end.AddYears(1);
+                    time5 = time3.AddYears(1);
+                    flag = (time >= time5) && (time < time4);
+                }
+                catch (ArgumentOutOfRangeException)
+                {
+                }
+                if (flag)
+                {
+                    return flag;
+                }
+                try
+                {
+                    time4 = end.AddYears(-1);
+                    time5 = time3.AddYears(-1);
+                    flag = (time >= time5) && (time < time4);
+                }
+                catch (ArgumentOutOfRangeException)
+                {
+                }
+            }
+            return flag;
+        }
+
+        private static bool GetIsDaylightSavings(DateTime time, AdjustmentRule rule, DaylightTime daylightTime)
+        {
+            if (rule == null)
+            {
+                return false;
+            }
+            bool flag = rule.DaylightDelta > TimeSpan.Zero;
+            DateTime startTime = daylightTime.Start + (flag ? rule.DaylightDelta : TimeSpan.Zero);
+            DateTime endTime = daylightTime.End + (flag ? -(rule.DaylightDelta) : TimeSpan.Zero);
+            return CheckIsDst(startTime, time, endTime);
+        }
+
+        private static bool GetIsDaylightSavingsFromUtc(DateTime time, int Year, TimeSpan utc, AdjustmentRule rule)
+        {
+            if (rule == null)
+            {
+                return false;
+            }
+            TimeSpan span = utc;
+            DaylightTime daylightTime = GetDaylightTime(Year, rule);
+            DateTime startTime = daylightTime.Start - span;
+            DateTime endTime = (daylightTime.End - span) - rule.DaylightDelta;
+            return CheckIsDst(startTime, time, endTime);
+        }
+
+        private static bool GetIsInvalidTime(DateTime time, AdjustmentRule rule, DaylightTime daylightTime)
+        {
+            bool flag = false;
+            if ((rule != null) && (rule.DaylightDelta != TimeSpan.Zero))
+            {
+                DateTime end;
+                DateTime time3;
+                DateTime time4;
+                DateTime time5;
+                if (rule.DaylightDelta < TimeSpan.Zero)
+                {
+                    end = daylightTime.End;
+                    time3 = daylightTime.End - rule.DaylightDelta;
+                }
+                else
+                {
+                    end = daylightTime.Start;
+                    time3 = daylightTime.Start + rule.DaylightDelta;
+                }
+                flag = (time >= end) && (time < time3);
+                if (flag || (end.Year == time3.Year))
+                {
+                    return flag;
+                }
+                try
+                {
+                    time4 = end.AddYears(1);
+                    time5 = time3.AddYears(1);
+                    flag = (time >= time4) && (time < time5);
+                }
+                catch (ArgumentOutOfRangeException)
+                {
+                }
+                if (flag)
+                {
+                    return flag;
+                }
+                try
+                {
+                    time4 = end.AddYears(-1);
+                    time5 = time3.AddYears(-1);
+                    flag = (time >= time4) && (time < time5);
+                }
+                catch (ArgumentOutOfRangeException)
+                {
+                }
+            }
+            return flag;
+        }
+
+        [SecurityCritical]
+        private static TimeZoneInfo GetLocalTimeZone()
+        {
+            string id = null;
+            try
+            {
+                TimeZoneInfo info;
+                Exception exception;
+                TimeZoneInfo info2;
+                Exception exception2;
+                NativeMethods.DynamicTimeZoneInformation lpDynamicTimeZoneInformation = new NativeMethods.DynamicTimeZoneInformation();
+                long dynamicTimeZoneInformation = UnsafeNativeMethods.GetDynamicTimeZoneInformation(out lpDynamicTimeZoneInformation);
+                if (dynamicTimeZoneInformation == -1L)
+                {
+                    return CreateCustomTimeZone("Local", TimeSpan.Zero, "Local", "Local");
+                }
+                NativeMethods.TimeZoneInformation timeZone = new NativeMethods.TimeZoneInformation(lpDynamicTimeZoneInformation);
+                bool dstDisabled = CheckDaylightSavingTimeDisabled();
+                if (!string.IsNullOrEmpty(lpDynamicTimeZoneInformation.TimeZoneKeyName) && (TryGetTimeZone(lpDynamicTimeZoneInformation.TimeZoneKeyName, dstDisabled, out info, out exception) == TimeZoneInfoResult.Success))
+                {
+                    return info;
+                }
+                id = FindIdFromTimeZoneInformation(timeZone, out dstDisabled);
+                if ((id != null) && (TryGetTimeZone(id, dstDisabled, out info2, out exception2) == TimeZoneInfoResult.Success))
+                {
+                    return info2;
+                }
+                return GetLocalTimeZoneFromWin32Data(timeZone, dstDisabled);
+            }
+            catch (EntryPointNotFoundException)
+            {
+                bool flag2;
+                TimeZoneInfo info3;
+                Exception exception3;
+                NativeMethods.TimeZoneInformation lpTimeZoneInformation = new NativeMethods.TimeZoneInformation();
+                long timeZoneInformation = UnsafeNativeMethods.GetTimeZoneInformation(out lpTimeZoneInformation);
+                if (timeZoneInformation == -1L)
+                {
+                    return CreateCustomTimeZone("Local", TimeSpan.Zero, "Local", "Local");
+                }
+                id = FindIdFromTimeZoneInformation(lpTimeZoneInformation, out flag2);
+                if ((id != null) && (TryGetTimeZone(id, flag2, out info3, out exception3) == TimeZoneInfoResult.Success))
+                {
+                    return info3;
+                }
+                return GetLocalTimeZoneFromWin32Data(lpTimeZoneInformation, flag2);
+            }
+        }
+
+        private static TimeZoneInfo GetLocalTimeZoneFromWin32Data(NativeMethods.TimeZoneInformation timeZoneInformation, bool dstDisabled)
+        {
+            TimeZoneInfo info = null;
+            try
+            {
+                info = new TimeZoneInfo(timeZoneInformation, dstDisabled);
+            }
+            catch (ArgumentException)
+            {
+            }
+            catch (InvalidTimeZoneException)
+            {
+            }
+            return info;
+            try
+            {
+                info = new TimeZoneInfo(timeZoneInformation, true);
+            }
+            catch (ArgumentException)
+            {
+            }
+            catch (InvalidTimeZoneException)
+            {
+            }
+            return info;
+        }
+
+        [SecurityTreatAsSafe, SecurityCritical]
+        public static List<TimeZoneInfo> GetSystemTimeZones()
+        {
+            lock (s_internalSyncObject)
+            {
+                if (!s_allSystemTimeZonesRead)
+                {
+                    PermissionSet set = new PermissionSet(PermissionState.None);
+                    set.AddPermission(new RegistryPermission(RegistryPermissionAccess.Read, @"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones"));
+                    set.Assert();
+                    using (RegistryKey key = Registry.LocalMachine.OpenSubKey(@"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones", RegistryKeyPermissionCheck.Default, RegistryRights.ExecuteKey))
+                    {
+                        if (key == null)
+                        {
+                            List<TimeZoneInfo> list;
+                            if (s_systemTimeZones != null)
+                            {
+                                list = new List<TimeZoneInfo>(s_systemTimeZones.Values);
+                            }
+                            else
+                            {
+                                list = new List<TimeZoneInfo>();
+                            }
+                            s_readOnlySystemTimeZones = new List<TimeZoneInfo>(list);
+                            s_allSystemTimeZonesRead = true;
+                            return s_readOnlySystemTimeZones;
+                        }
+                        foreach (string str in key.GetSubKeyNames())
+                        {
+                            TimeZoneInfo info;
+                            Exception exception;
+                            TryGetTimeZone(str, false, out info, out exception);
+                        }
+                    }
+                    IComparer<TimeZoneInfo> comparer = new TimeZoneInfoComparer();
+                    List<TimeZoneInfo> list2 = new List<TimeZoneInfo>(s_systemTimeZones.Values);
+                    list2.Sort(comparer);
+                    s_readOnlySystemTimeZones = new List<TimeZoneInfo>(list2);
+                    s_allSystemTimeZonesRead = true;
+                }
+                return s_readOnlySystemTimeZones;
+            }
+        }
+
+        private static TimeZoneInfo GetTimeZone(string id)
+        {
+            TimeZoneInfo info;
+            Exception exception;
+            if (id == null)
+            {
+                throw new ArgumentNullException("id");
+            }
+            if (((id.Length == 0) || (id.Length > 0xff)) || id.Contains("\0"))
+            {
+                throw new TimeZoneNotFoundException("TimeZoneNotFound_MissingRegistryData, id");
+            }
+            switch (TryGetTimeZone(id, false, out info, out exception))
+            {
+                case TimeZoneInfoResult.Success:
+                    return info;
+
+                case TimeZoneInfoResult.InvalidTimeZoneException:
+                    throw new InvalidTimeZoneException("InvalidTimeZone_InvalidRegistryData, id", exception);
+
+                case TimeZoneInfoResult.SecurityException:
+                    throw new SecurityException("Security_CannotReadRegistryData, id", exception);
+            }
+            throw new TimeZoneNotFoundException("TimeZoneNotFound_MissingRegistryData, id", exception);
+        }
+
+        public TimeSpan GetUtcOffset(DateTime dateTime)
+        {
+            if (dateTime.Kind == DateTimeKind.Local)
+            {
+                DateTime time;
+                lock (s_internalSyncObject)
+                {
+                    if (this.GetCorrespondingKind() == DateTimeKind.Local)
+                    {
+                        return GetUtcOffset(dateTime, this);
+                    }
+                    time = ConvertTime(dateTime, Local, Utc, TimeZoneInfoOptions.NoThrowOnInvalidTime);
+                }
+                return GetUtcOffsetFromUtc(time, this);
+            }
+            if (dateTime.Kind != DateTimeKind.Utc)
+            {
+                return GetUtcOffset(dateTime, this);
+            }
+            if (this.GetCorrespondingKind() == DateTimeKind.Utc)
+            {
+                return this.m_baseUtcOffset;
+            }
+            return GetUtcOffsetFromUtc(dateTime, this);
+        }
+
+        public TimeSpan GetUtcOffset(DateTimeOffset dateTimeOffset)
+        {
+            return GetUtcOffsetFromUtc(dateTimeOffset.UtcDateTime, this);
+        }
+
+        private static TimeSpan GetUtcOffset(DateTime time, TimeZoneInfo zone)
+        {
+            TimeSpan baseUtcOffset = zone.BaseUtcOffset;
+            AdjustmentRule adjustmentRuleForTime = zone.GetAdjustmentRuleForTime(time);
+            if (adjustmentRuleForTime != null)
+            {
+                DaylightTime daylightTime = GetDaylightTime(time.Year, adjustmentRuleForTime);
+                bool flag = GetIsDaylightSavings(time, adjustmentRuleForTime, daylightTime);
+                baseUtcOffset += flag ? adjustmentRuleForTime.DaylightDelta : TimeSpan.Zero;
+            }
+            return baseUtcOffset;
+        }
+
+        private static TimeSpan GetUtcOffsetFromUtc(DateTime time, TimeZoneInfo zone)
+        {
+            bool flag;
+            return GetUtcOffsetFromUtc(time, zone, out flag);
+        }
+
+        private static TimeSpan GetUtcOffsetFromUtc(DateTime time, TimeZoneInfo zone, out bool isDaylightSavings)
+        {
+            int year;
+            AdjustmentRule adjustmentRuleForTime;
+            isDaylightSavings = false;
+            TimeSpan baseUtcOffset = zone.BaseUtcOffset;
+            if (time > new DateTime(0x270f, 12, 0x1f))
+            {
+                adjustmentRuleForTime = zone.GetAdjustmentRuleForTime(DateTime.MaxValue);
+                year = 0x270f;
+            }
+            else if (time < new DateTime(1, 1, 2))
+            {
+                adjustmentRuleForTime = zone.GetAdjustmentRuleForTime(DateTime.MinValue);
+                year = 1;
+            }
+            else
+            {
+                DateTime dateTime = time + baseUtcOffset;
+                year = time.Year;
+                adjustmentRuleForTime = zone.GetAdjustmentRuleForTime(dateTime);
+            }
+            if (adjustmentRuleForTime != null)
+            {
+                isDaylightSavings = GetIsDaylightSavingsFromUtc(time, year, zone.m_baseUtcOffset, adjustmentRuleForTime);
+                baseUtcOffset += isDaylightSavings ? adjustmentRuleForTime.DaylightDelta : TimeSpan.Zero;
+            }
+            return baseUtcOffset;
+        }
+
+        public bool HasSameRules(TimeZoneInfo other)
+        {
+            if (other == null)
+            {
+                throw new ArgumentNullException("other");
+            }
+            if ((this.m_baseUtcOffset != other.m_baseUtcOffset) || (this.m_supportsDaylightSavingTime != other.m_supportsDaylightSavingTime))
+            {
+                return false;
+            }
+            AdjustmentRule[] adjustmentRules = this.m_adjustmentRules;
+            AdjustmentRule[] ruleArray2 = other.m_adjustmentRules;
+            bool flag = ((adjustmentRules == null) && (ruleArray2 == null)) || ((adjustmentRules != null) && (ruleArray2 != null));
+            if (!flag)
+            {
+                return false;
+            }
+            if (adjustmentRules != null)
+            {
+                if (adjustmentRules.Length != ruleArray2.Length)
+                {
+                    return false;
+                }
+                for (int i = 0; i < adjustmentRules.Length; i++)
+                {
+                    if (!adjustmentRules[i].Equals(ruleArray2[i]))
+                    {
+                        return false;
+                    }
+                }
+            }
+            return flag;
+        }
+
+        public bool IsAmbiguousTime(DateTime dateTime)
+        {
+            DateTime time;
+            AdjustmentRule rule;
+            if (!this.m_supportsDaylightSavingTime)
+            {
+                return false;
+            }
+            if (dateTime.Kind == DateTimeKind.Local)
+            {
+                lock (s_internalSyncObject)
+                {
+                    time = ConvertTime(dateTime, Local, this, TimeZoneInfoOptions.NoThrowOnInvalidTime);
+                    goto Label_0068;
+                }
+            }
+            if (dateTime.Kind == DateTimeKind.Utc)
+            {
+                lock (s_internalSyncObject)
+                {
+                    time = ConvertTime(dateTime, Utc, this, TimeZoneInfoOptions.NoThrowOnInvalidTime);
+                    goto Label_0068;
+                }
+            }
+            time = dateTime;
+        Label_0068:
+            rule = this.GetAdjustmentRuleForTime(time);
+            if (rule != null)
+            {
+                DaylightTime daylightTime = GetDaylightTime(time.Year, rule);
+                return GetIsAmbiguousTime(time, rule, daylightTime);
+            }
+            return false;
+        }
+
+        public bool IsAmbiguousTime(DateTimeOffset dateTimeOffset)
+        {
+            if (!this.m_supportsDaylightSavingTime)
+            {
+                return false;
+            }
+            DateTimeOffset offset = ConvertTime(dateTimeOffset, this);
+            return this.IsAmbiguousTime(offset.DateTime);
+        }
+
+        public bool IsDaylightSavingTime(DateTime dateTime)
+        {
+            DateTime time;
+            AdjustmentRule rule;
+            if (!this.m_supportsDaylightSavingTime || (this.m_adjustmentRules == null))
+            {
+                return false;
+            }
+            if (dateTime.Kind == DateTimeKind.Local)
+            {
+                lock (s_internalSyncObject)
+                {
+                    time = ConvertTime(dateTime, Local, this, TimeZoneInfoOptions.NoThrowOnInvalidTime);
+                    goto Label_0064;
+                }
+            }
+            if (dateTime.Kind == DateTimeKind.Utc)
+            {
+                bool flag;
+                if (this.GetCorrespondingKind() == DateTimeKind.Utc)
+                {
+                    return false;
+                }
+                GetUtcOffsetFromUtc(dateTime, this, out flag);
+                return flag;
+            }
+            time = dateTime;
+        Label_0064:
+            rule = this.GetAdjustmentRuleForTime(time);
+            if (rule != null)
+            {
+                DaylightTime daylightTime = GetDaylightTime(time.Year, rule);
+                return GetIsDaylightSavings(time, rule, daylightTime);
+            }
+            return false;
+        }
+
+        public bool IsDaylightSavingTime(DateTimeOffset dateTimeOffset)
+        {
+            bool flag;
+            GetUtcOffsetFromUtc(dateTimeOffset.UtcDateTime, this, out flag);
+            return flag;
+        }
+
+        public bool IsInvalidTime(DateTime dateTime)
+        {
+            bool flag = false;
+            if ((dateTime.Kind != DateTimeKind.Unspecified) && ((dateTime.Kind != DateTimeKind.Local) || (this.GetCorrespondingKind() != DateTimeKind.Local)))
+            {
+                return flag;
+            }
+            AdjustmentRule adjustmentRuleForTime = this.GetAdjustmentRuleForTime(dateTime);
+            if (adjustmentRuleForTime != null)
+            {
+                DaylightTime daylightTime = GetDaylightTime(dateTime.Year, adjustmentRuleForTime);
+                return GetIsInvalidTime(dateTime, adjustmentRuleForTime, daylightTime);
+            }
+            return false;
+        }
+
+        void IDeserializationCallback.OnDeserialization(object sender)
+        {
+            try
+            {
+                bool flag;
+                ValidateTimeZoneInfo(this.m_id, this.m_baseUtcOffset, this.m_adjustmentRules, out flag);
+                if (flag != this.m_supportsDaylightSavingTime)
+                {
+                   throw new SerializationException("Serialization_CorruptField, SupportsDaylightSavingTime" );
+                }
+            }
+            catch (ArgumentException exception)
+            {
+                throw new SerializationException("Serialization_InvalidData", exception);
+            }
+            catch (InvalidTimeZoneException exception2)
+            {
+                throw new SerializationException("Serialization_InvalidData", exception2);
+            }
+        }
+
+        [SecurityPermission(SecurityAction.LinkDemand, Flags = SecurityPermissionFlag.SerializationFormatter)]
+        void ISerializable.GetObjectData(SerializationInfo info, StreamingContext context)
+        {
+            if (info == null)
+            {
+                throw new ArgumentNullException("info");
+            }
+            info.AddValue("Id", this.m_id);
+            info.AddValue("DisplayName", this.m_displayName);
+            info.AddValue("StandardName", this.m_standardDisplayName);
+            info.AddValue("DaylightName", this.m_daylightDisplayName);
+            info.AddValue("BaseUtcOffset", this.m_baseUtcOffset);
+            info.AddValue("AdjustmentRules", this.m_adjustmentRules);
+            info.AddValue("SupportsDaylightSavingTime", this.m_supportsDaylightSavingTime);
+        }
+
+        public string ToSerializedString()
+        {
+            return StringSerializer.GetSerializedString(this);
+        }
+
+        public override string ToString()
+        {
+            return this.DisplayName;
+        }
+
+        private static TransitionTime? TransitionTimeFromTimeZoneInformation(NativeMethods.RegistryTimeZoneInformation timeZoneInformation, bool readStartDate)
+        {
+            TransitionTime time;
+            if (timeZoneInformation.StandardDate.Month == 0)
+            {
+                return null;
+            }
+            if (readStartDate)
+            {
+                if (timeZoneInformation.DaylightDate.Year == 0)
+                {
+                    time = TransitionTime.CreateFloatingDateRule(new DateTime(1, 1, 1, timeZoneInformation.DaylightDate.Hour, timeZoneInformation.DaylightDate.Minute, timeZoneInformation.DaylightDate.Second, timeZoneInformation.DaylightDate.Milliseconds), timeZoneInformation.DaylightDate.Month, timeZoneInformation.DaylightDate.Day, (DayOfWeek)timeZoneInformation.DaylightDate.DayOfWeek);
+                }
+                else
+                {
+                    time = TransitionTime.CreateFixedDateRule(new DateTime(1, 1, 1, timeZoneInformation.DaylightDate.Hour, timeZoneInformation.DaylightDate.Minute, timeZoneInformation.DaylightDate.Second, timeZoneInformation.DaylightDate.Milliseconds), timeZoneInformation.DaylightDate.Month, timeZoneInformation.DaylightDate.Day);
+                }
+            }
+            else if (timeZoneInformation.StandardDate.Year == 0)
+            {
+                time = TransitionTime.CreateFloatingDateRule(new DateTime(1, 1, 1, timeZoneInformation.StandardDate.Hour, timeZoneInformation.StandardDate.Minute, timeZoneInformation.StandardDate.Second, timeZoneInformation.StandardDate.Milliseconds), timeZoneInformation.StandardDate.Month, timeZoneInformation.StandardDate.Day, (DayOfWeek)timeZoneInformation.StandardDate.DayOfWeek);
+            }
+            else
+            {
+                time = TransitionTime.CreateFixedDateRule(new DateTime(1, 1, 1, timeZoneInformation.StandardDate.Hour, timeZoneInformation.StandardDate.Minute, timeZoneInformation.StandardDate.Second, timeZoneInformation.StandardDate.Milliseconds), timeZoneInformation.StandardDate.Month, timeZoneInformation.StandardDate.Day);
+            }
+            return new TransitionTime?(time);
+        }
+
+        private static DateTime TransitionTimeToDateTime(int year, TransitionTime transitionTime)
+        {
+            DateTime time;
+            DateTime timeOfDay = transitionTime.TimeOfDay;
+            if (transitionTime.IsFixedDateRule)
+            {
+                int num = DateTime.DaysInMonth(year, transitionTime.Month);
+                return new DateTime(year, transitionTime.Month, (num < transitionTime.Day) ? num : transitionTime.Day, timeOfDay.Hour, timeOfDay.Minute, timeOfDay.Second, timeOfDay.Millisecond);
+            }
+            if (transitionTime.Week <= 4)
+            {
+                time = new DateTime(year, transitionTime.Month, 1, timeOfDay.Hour, timeOfDay.Minute, timeOfDay.Second, timeOfDay.Millisecond);
+                int dayOfWeek = (int)time.DayOfWeek;
+                int num3 = ((int)transitionTime.DayOfWeek) - dayOfWeek;
+                if (num3 < 0)
+                {
+                    num3 += 7;
+                }
+                num3 += 7 * (transitionTime.Week - 1);
+                if (num3 > 0)
+                {
+                    time = time.AddDays((double)num3);
+                }
+                return time;
+            }
+            int day = DateTime.DaysInMonth(year, transitionTime.Month);
+            time = new DateTime(year, transitionTime.Month, day, timeOfDay.Hour, timeOfDay.Minute, timeOfDay.Second, timeOfDay.Millisecond);
+            int num6 = (int)(time.DayOfWeek - transitionTime.DayOfWeek);
+            if (num6 < 0)
+            {
+                num6 += 7;
+            }
+            if (num6 > 0)
+            {
+                time = time.AddDays((double)-num6);
+            }
+            return time;
+        }
+
+        private static bool TryCompareStandardDate(NativeMethods.TimeZoneInformation timeZone, NativeMethods.RegistryTimeZoneInformation registryTimeZoneInfo)
+        {
+            return ((((((timeZone.Bias == registryTimeZoneInfo.Bias) && (timeZone.StandardBias == registryTimeZoneInfo.StandardBias)) && ((timeZone.StandardDate.Year == registryTimeZoneInfo.StandardDate.Year) && (timeZone.StandardDate.Month == registryTimeZoneInfo.StandardDate.Month))) && (((timeZone.StandardDate.DayOfWeek == registryTimeZoneInfo.StandardDate.DayOfWeek) && (timeZone.StandardDate.Day == registryTimeZoneInfo.StandardDate.Day)) && ((timeZone.StandardDate.Hour == registryTimeZoneInfo.StandardDate.Hour) && (timeZone.StandardDate.Minute == registryTimeZoneInfo.StandardDate.Minute)))) && (timeZone.StandardDate.Second == registryTimeZoneInfo.StandardDate.Second)) && (timeZone.StandardDate.Milliseconds == registryTimeZoneInfo.StandardDate.Milliseconds));
+        }
+
+        [SecurityTreatAsSafe, SecurityCritical]
+        private static bool TryCompareTimeZoneInformationToRegistry(NativeMethods.TimeZoneInformation timeZone, string id, out bool dstDisabled)
+        {
+            bool flag2;
+            dstDisabled = false;
+            try
+            {
+                PermissionSet set = new PermissionSet(PermissionState.None);
+                set.AddPermission(new RegistryPermission(RegistryPermissionAccess.Read, @"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones"));
+                set.Assert();
+                using (RegistryKey key = Registry.LocalMachine.OpenSubKey(string.Format(CultureInfo.InvariantCulture, @"{0}\{1}", new object[] { @"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones", id }), RegistryKeyPermissionCheck.Default, RegistryRights.ExecuteKey))
+                {
+                    NativeMethods.RegistryTimeZoneInformation information;
+                    if (key == null)
+                    {
+                        return false;
+                    }
+                    try
+                    {
+                        information = new NativeMethods.RegistryTimeZoneInformation((byte[])key.GetValue("TZI", null, RegistryValueOptions.None));
+                    }
+                    catch (InvalidCastException)
+                    {
+                        return false;
+                    }
+                    catch (ArgumentException)
+                    {
+                        return false;
+                    }
+                    if (!TryCompareStandardDate(timeZone, information))
+                    {
+                        return false;
+                    }
+                    dstDisabled = CheckDaylightSavingTimeDisabled();
+                    bool flag = (dstDisabled || CheckDaylightSavingTimeNotSupported(timeZone)) || (((((timeZone.DaylightBias == information.DaylightBias) && (timeZone.DaylightDate.Year == information.DaylightDate.Year)) && ((timeZone.DaylightDate.Month == information.DaylightDate.Month) && (timeZone.DaylightDate.DayOfWeek == information.DaylightDate.DayOfWeek))) && (((timeZone.DaylightDate.Day == information.DaylightDate.Day) && (timeZone.DaylightDate.Hour == information.DaylightDate.Hour)) && ((timeZone.DaylightDate.Minute == information.DaylightDate.Minute) && (timeZone.DaylightDate.Second == information.DaylightDate.Second)))) && (timeZone.DaylightDate.Milliseconds == information.DaylightDate.Milliseconds));
+                    if (flag)
+                    {
+                        string strA = key.GetValue("Std", string.Empty, RegistryValueOptions.None) as string;
+                        flag = string.Compare(strA, timeZone.StandardName, StringComparison.Ordinal) == 0;
+                    }
+                    flag2 = flag;
+                }
+            }
+            finally
+            {
+                PermissionSet.RevertAssert();
+            }
+            return flag2;
+        }
+
+        private static bool TryCreateAdjustmentRules(string id, NativeMethods.RegistryTimeZoneInformation defaultTimeZoneInformation, out AdjustmentRule[] rules, out Exception e)
+        {
+            e = null;
+            try
+            {
+                using (RegistryKey key = Registry.LocalMachine.OpenSubKey(string.Format(CultureInfo.InvariantCulture, @"{0}\{1}\Dynamic DST", new object[] { @"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones", id }), RegistryKeyPermissionCheck.Default, RegistryRights.ExecuteKey))
+                {
+                    if (key == null)
+                    {
+                        AdjustmentRule rule = CreateAdjustmentRuleFromTimeZoneInformation(defaultTimeZoneInformation, DateTime.MinValue.Date, DateTime.MaxValue.Date);
+                        if (rule == null)
+                        {
+                            rules = null;
+                        }
+                        else
+                        {
+                            rules = new AdjustmentRule[] { rule };
+                        }
+                        return true;
+                    }
+                    int year = (int)key.GetValue("FirstEntry", -1, RegistryValueOptions.None);
+                    int num2 = (int)key.GetValue("LastEntry", -1, RegistryValueOptions.None);
+                    if (((year == -1) || (num2 == -1)) || (year > num2))
+                    {
+                        rules = null;
+                        return false;
+                    }
+                    NativeMethods.RegistryTimeZoneInformation timeZoneInformation = new NativeMethods.RegistryTimeZoneInformation((byte[])key.GetValue(year.ToString(CultureInfo.InvariantCulture), null, RegistryValueOptions.None));
+                    if (year == num2)
+                    {
+                        AdjustmentRule rule2 = CreateAdjustmentRuleFromTimeZoneInformation(timeZoneInformation, DateTime.MinValue.Date, DateTime.MaxValue.Date);
+                        if (rule2 == null)
+                        {
+                            rules = null;
+                        }
+                        else
+                        {
+                            rules = new AdjustmentRule[] { rule2 };
+                        }
+                        return true;
+                    }
+                    List<AdjustmentRule> list = new List<AdjustmentRule>(1);
+                    AdjustmentRule item = CreateAdjustmentRuleFromTimeZoneInformation(timeZoneInformation, DateTime.MinValue.Date, new DateTime(year, 12, 0x1f));
+                    if (item != null)
+                    {
+                        list.Add(item);
+                    }
+                    for (int i = year + 1; i < num2; i++)
+                    {
+                        timeZoneInformation = new NativeMethods.RegistryTimeZoneInformation((byte[])key.GetValue(i.ToString(CultureInfo.InvariantCulture), null, RegistryValueOptions.None));
+                        AdjustmentRule rule4 = CreateAdjustmentRuleFromTimeZoneInformation(timeZoneInformation, new DateTime(i, 1, 1), new DateTime(i, 12, 0x1f));
+                        if (rule4 != null)
+                        {
+                            list.Add(rule4);
+                        }
+                    }
+                    timeZoneInformation = new NativeMethods.RegistryTimeZoneInformation((byte[])key.GetValue(num2.ToString(CultureInfo.InvariantCulture), null, RegistryValueOptions.None));
+                    AdjustmentRule rule5 = CreateAdjustmentRuleFromTimeZoneInformation(timeZoneInformation, new DateTime(num2, 1, 1), DateTime.MaxValue.Date);
+                    if (rule5 != null)
+                    {
+                        list.Add(rule5);
+                    }
+                    rules = list.ToArray();
+                    if ((rules != null) && (rules.Length == 0))
+                    {
+                        rules = null;
+                    }
+                }
+            }
+            catch (InvalidCastException exception)
+            {
+                rules = null;
+                e = exception;
+                return false;
+            }
+            catch (ArgumentOutOfRangeException exception2)
+            {
+                rules = null;
+                e = exception2;
+                return false;
+            }
+            catch (ArgumentException exception3)
+            {
+                rules = null;
+                e = exception3;
+                return false;
+            }
+            return true;
+        }
+
+        [SecurityTreatAsSafe, SecurityCritical, FileIOPermission(SecurityAction.Assert, AllLocalFiles = FileIOPermissionAccess.PathDiscovery)]
+        private static string TryGetLocalizedNameByMuiNativeResource(string resource)
+        {
+            string str;
+            int num;
+            if (string.IsNullOrEmpty(resource))
+            {
+                return string.Empty;
+            }
+            string[] strArray = resource.Split(new char[] { ',' }, StringSplitOptions.None);
+            if (strArray.Length != 2)
+            {
+                return string.Empty;
+            }
+            string folderPath = Environment.GetFolderPath(Environment.SpecialFolder.System);
+            string str3 = strArray[0].TrimStart(new char[] { '@' });
+            try
+            {
+                str = Path.Combine(folderPath, str3);
+            }
+            catch (ArgumentException)
+            {
+                return string.Empty;
+            }
+            if (!int.TryParse(strArray[1], NumberStyles.Integer, CultureInfo.InvariantCulture, out num))
+            {
+                return string.Empty;
+            }
+            num = -num;
+            try
+            {
+                StringBuilder fileMuiPath = new StringBuilder(260);
+                fileMuiPath.Length = 260;
+                int fileMuiPathLength = 260;
+                int languageLength = 0;
+                long enumerator = 0L;
+                if (!UnsafeNativeMethods.GetFileMUIPath(0x10, str, null, ref languageLength, fileMuiPath, ref fileMuiPathLength, ref enumerator))
+                {
+                    return string.Empty;
+                }
+                return TryGetLocalizedNameByNativeResource(fileMuiPath.ToString(), num);
+            }
+            catch (EntryPointNotFoundException)
+            {
+                return string.Empty;
+            }
+        }
+
+        [SecurityCritical]
+        private static string TryGetLocalizedNameByNativeResource(string filePath, int resource)
+        {
+            if (File.Exists(filePath))
+            {
+                using (SafeLibraryHandle handle = UnsafeNativeMethods.LoadLibraryEx(filePath, IntPtr.Zero, 2))
+                {
+                    if (!handle.IsInvalid)
+                    {
+                        StringBuilder buffer = new StringBuilder(500);
+                        buffer.Length = 500;
+                        if (UnsafeNativeMethods.LoadString(handle, resource, buffer, buffer.Length) != 0)
+                        {
+                            return buffer.ToString();
+                        }
+                    }
+                }
+            }
+            return string.Empty;
+        }
+
+        private static bool TryGetLocalizedNamesByRegistryKey(RegistryKey key, out string displayName, out string standardName, out string daylightName)
+        {
+            displayName = string.Empty;
+            standardName = string.Empty;
+            daylightName = string.Empty;
+            string str = key.GetValue("MUI_Display", string.Empty, RegistryValueOptions.None) as string;
+            string str2 = key.GetValue("MUI_Std", string.Empty, RegistryValueOptions.None) as string;
+            string str3 = key.GetValue("MUI_Dlt", string.Empty, RegistryValueOptions.None) as string;
+            if (!string.IsNullOrEmpty(str))
+            {
+                displayName = TryGetLocalizedNameByMuiNativeResource(str);
+            }
+            if (!string.IsNullOrEmpty(str2))
+            {
+                standardName = TryGetLocalizedNameByMuiNativeResource(str2);
+            }
+            if (!string.IsNullOrEmpty(str3))
+            {
+                daylightName = TryGetLocalizedNameByMuiNativeResource(str3);
+            }
+            if (string.IsNullOrEmpty(displayName))
+            {
+                displayName = key.GetValue("Display", string.Empty, RegistryValueOptions.None) as string;
+            }
+            if (string.IsNullOrEmpty(standardName))
+            {
+                standardName = key.GetValue("Std", string.Empty, RegistryValueOptions.None) as string;
+            }
+            if (string.IsNullOrEmpty(daylightName))
+            {
+                daylightName = key.GetValue("Dlt", string.Empty, RegistryValueOptions.None) as string;
+            }
+            return true;
+        }
+
+        private static TimeZoneInfoResult TryGetTimeZone(string id, bool dstDisabled, out TimeZoneInfo value, out Exception e)
+        {
+            TimeZoneInfoResult success = TimeZoneInfoResult.Success;
+            e = null;
+            TimeZoneInfo info = null;
+            if (s_systemTimeZones.TryGetValue(id, out info))
+            {
+                if (dstDisabled && info.m_supportsDaylightSavingTime)
+                {
+                    value = CreateCustomTimeZone(info.m_id, info.m_baseUtcOffset, info.m_displayName, info.m_standardDisplayName);
+                    return success;
+                }
+                value = new TimeZoneInfo(info.m_id, info.m_baseUtcOffset, info.m_displayName, info.m_standardDisplayName, info.m_daylightDisplayName, info.m_adjustmentRules, false);
+                return success;
+            }
+            if (!s_allSystemTimeZonesRead)
+            {
+                success = TryGetTimeZoneByRegistryKey(id, out info, out e);
+                if (success == TimeZoneInfoResult.Success)
+                {
+                    s_systemTimeZones.Add(id, info);
+                    if (dstDisabled && info.m_supportsDaylightSavingTime)
+                    {
+                        value = CreateCustomTimeZone(info.m_id, info.m_baseUtcOffset, info.m_displayName, info.m_standardDisplayName);
+                        return success;
+                    }
+                    value = new TimeZoneInfo(info.m_id, info.m_baseUtcOffset, info.m_displayName, info.m_standardDisplayName, info.m_daylightDisplayName, info.m_adjustmentRules, false);
+                    return success;
+                }
+                value = null;
+                return success;
+            }
+            success = TimeZoneInfoResult.TimeZoneNotFoundException;
+            value = null;
+            return success;
+        }
+
+        [SecurityCritical, SecurityTreatAsSafe]
+        private static TimeZoneInfoResult TryGetTimeZoneByRegistryKey(string id, out TimeZoneInfo value, out Exception e)
+        {
+            TimeZoneInfoResult invalidTimeZoneException;
+            e = null;
+            try
+            {
+                PermissionSet set = new PermissionSet(PermissionState.None);
+                set.AddPermission(new RegistryPermission(RegistryPermissionAccess.Read, @"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones"));
+                set.Assert();
+                using (RegistryKey key = Registry.LocalMachine.OpenSubKey(string.Format(CultureInfo.InvariantCulture, @"{0}\{1}", new object[] { @"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones", id }), RegistryKeyPermissionCheck.Default, RegistryRights.ExecuteKey))
+                {
+                    NativeMethods.RegistryTimeZoneInformation information;
+                    AdjustmentRule[] ruleArray;
+                    string str;
+                    string str2;
+                    string str3;
+                    if (key == null)
+                    {
+                        value = null;
+                        return TimeZoneInfoResult.TimeZoneNotFoundException;
+                    }
+                    try
+                    {
+                        information = new NativeMethods.RegistryTimeZoneInformation((byte[])key.GetValue("TZI", null, RegistryValueOptions.None));
+                    }
+                    catch (InvalidCastException exception)
+                    {
+                        value = null;
+                        e = exception;
+                        return TimeZoneInfoResult.InvalidTimeZoneException;
+                    }
+                    catch (ArgumentException exception2)
+                    {
+                        value = null;
+                        e = exception2;
+                        return TimeZoneInfoResult.InvalidTimeZoneException;
+                    }
+                    if (!TryCreateAdjustmentRules(id, information, out ruleArray, out e))
+                    {
+                        value = null;
+                        return TimeZoneInfoResult.InvalidTimeZoneException;
+                    }
+                    if (!TryGetLocalizedNamesByRegistryKey(key, out str, out str2, out str3))
+                    {
+                        value = null;
+                        invalidTimeZoneException = TimeZoneInfoResult.InvalidTimeZoneException;
+                    }
+                    else
+                    {
+                        try
+                        {
+                            value = new TimeZoneInfo(id, new TimeSpan(0, -information.Bias, 0), str, str2, str3, ruleArray, false);
+                            invalidTimeZoneException = TimeZoneInfoResult.Success;
+                        }
+                        catch (ArgumentException exception3)
+                        {
+                            value = null;
+                            e = exception3;
+                            invalidTimeZoneException = TimeZoneInfoResult.InvalidTimeZoneException;
+                        }
+                        catch (InvalidTimeZoneException exception4)
+                        {
+                            value = null;
+                            e = exception4;
+                            invalidTimeZoneException = TimeZoneInfoResult.InvalidTimeZoneException;
+                        }
+                    }
+                }
+            }
+            finally
+            {
+                PermissionSet.RevertAssert();
+            }
+            return invalidTimeZoneException;
+        }
+
+        internal static bool UtcOffsetOutOfRange(TimeSpan offset)
+        {
+            if (offset.TotalHours >= -14.0)
+            {
+                return (offset.TotalHours > 14.0);
+            }
+            return true;
+        }
+
+        private static void ValidateTimeZoneInfo(string id, TimeSpan baseUtcOffset, AdjustmentRule[] adjustmentRules, out bool adjustmentRulesSupportDst)
+        {
+            adjustmentRulesSupportDst = false;
+            if (id == null)
+            {
+                throw new ArgumentNullException("id");
+            }
+            if (id.Length == 0)
+            {
+                throw new ArgumentException("Argument_InvalidId , id");
+            }
+            if (UtcOffsetOutOfRange(baseUtcOffset))
+            {
+                throw new ArgumentOutOfRangeException("baseUtcOffset", "ArgumentOutOfRange_UtcOffset");
+            }
+            if ((baseUtcOffset.Ticks % 0x23c34600L) != 0L)
+            {
+                throw new ArgumentException("Argument_TimeSpanHasSeconds", "baseUtcOffset");
+            }
+            if ((adjustmentRules != null) && (adjustmentRules.Length != 0))
+            {
+                adjustmentRulesSupportDst = true;
+                AdjustmentRule rule = null;
+                AdjustmentRule rule2 = null;
+                for (int i = 0; i < adjustmentRules.Length; i++)
+                {
+                    rule = rule2;
+                    rule2 = adjustmentRules[i];
+                    if (rule2 == null)
+                    {
+                        throw new InvalidTimeZoneException("Argument_AdjustmentRulesNoNulls");
+                    }
+                    if (UtcOffsetOutOfRange(baseUtcOffset + rule2.DaylightDelta))
+                    {
+                        throw new InvalidTimeZoneException("ArgumentOutOfRange_UtcOffsetAndDaylightDelta");
+                    }
+                    if ((rule != null) && (rule2.DateStart <= rule.DateEnd))
+                    {
+                        throw new InvalidTimeZoneException("Argument_AdjustmentRulesOutOfOrder");
+                    }
+                }
+            }
+        }
+
+        // Properties
+        public TimeSpan BaseUtcOffset
+        {
+            get
+            {
+                return this.m_baseUtcOffset;
+            }
+        }
+
+        public string DaylightName
+        {
+            get
+            {
+                if (this.m_daylightDisplayName != null)
+                {
+                    return this.m_daylightDisplayName;
+                }
+                return string.Empty;
+            }
+        }
+
+        public string DisplayName
+        {
+            get
+            {
+                if (this.m_displayName != null)
+                {
+                    return this.m_displayName;
+                }
+                return string.Empty;
+            }
+        }
+
+        public string Id
+        {
+            get
+            {
+                return this.m_id;
+            }
+        }
+
+        public static TimeZoneInfo Local
+        {
+            [SecurityCritical]
+            get
+            {
+                TimeZoneInfo info = s_localTimeZone;
+                if (info != null)
+                {
+                    return info;
+                }
+                lock (s_internalSyncObject)
+                {
+                    if (s_localTimeZone == null)
+                    {
+                        TimeZoneInfo localTimeZone = GetLocalTimeZone();
+                        s_localTimeZone = new TimeZoneInfo(localTimeZone.m_id, localTimeZone.m_baseUtcOffset, localTimeZone.m_displayName, localTimeZone.m_standardDisplayName, localTimeZone.m_daylightDisplayName, localTimeZone.m_adjustmentRules, false);
+                    }
+                    return s_localTimeZone;
+                }
+            }
+        }
+
+        private static object s_internalSyncObject
+        {
+            get
+            {
+                if (s_hiddenInternalSyncObject == null)
+                {
+                    object obj2 = new object();
+                    System.Threading.Interlocked.CompareExchange(ref s_hiddenInternalSyncObject, obj2, null);
+                }
+                return s_hiddenInternalSyncObject;
+            }
+        }
+
+        private static Dictionary<string, TimeZoneInfo> s_systemTimeZones
+        {
+            get
+            {
+                if (s_hiddenSystemTimeZones == null)
+                {
+                    s_hiddenSystemTimeZones = new Dictionary<string, TimeZoneInfo>();
+                }
+                return s_hiddenSystemTimeZones;
+            }
+            set
+            {
+                s_hiddenSystemTimeZones = value;
+            }
+        }
+
+        public string StandardName
+        {
+            get
+            {
+                if (this.m_standardDisplayName != null)
+                {
+                    return this.m_standardDisplayName;
+                }
+                return string.Empty;
+            }
+        }
+
+        public bool SupportsDaylightSavingTime
+        {
+            get
+            {
+                return this.m_supportsDaylightSavingTime;
+            }
+        }
+
+        public static TimeZoneInfo Utc
+        {
+            get
+            {
+                TimeZoneInfo info = s_utcTimeZone;
+                if (info != null)
+                {
+                    return info;
+                }
+                lock (s_internalSyncObject)
+                {
+                    if (s_utcTimeZone == null)
+                    {
+                        s_utcTimeZone = CreateCustomTimeZone("UTC", TimeSpan.Zero, "UTC", "UTC");
+                    }
+                    return s_utcTimeZone;
+                }
+            }
+        }
+
+        // Nested Types
+        [Serializable, HostProtection(SecurityAction.LinkDemand, MayLeakOnAbort = true), HostProtection(SecurityAction.LinkDemand, MayLeakOnAbort = true)]
+        public sealed class AdjustmentRule : IEquatable<TimeZoneInfo.AdjustmentRule>, ISerializable, IDeserializationCallback
+        {
+            // Fields
+            private DateTime m_dateEnd;
+            private DateTime m_dateStart;
+            private TimeSpan m_daylightDelta;
+            private TimeZoneInfo.TransitionTime m_daylightTransitionEnd;
+            private TimeZoneInfo.TransitionTime m_daylightTransitionStart;
+
+            // Methods
+            private AdjustmentRule()
+            {
+            }
+
+            private AdjustmentRule(SerializationInfo info, StreamingContext context)
+            {
+                if (info == null)
+                {
+                    throw new ArgumentNullException("info");
+                }
+                this.m_dateStart = (DateTime)info.GetValue("DateStart", typeof(DateTime));
+                this.m_dateEnd = (DateTime)info.GetValue("DateEnd", typeof(DateTime));
+                this.m_daylightDelta = (TimeSpan)info.GetValue("DaylightDelta", typeof(TimeSpan));
+                this.m_daylightTransitionStart = (TimeZoneInfo.TransitionTime)info.GetValue("DaylightTransitionStart", typeof(TimeZoneInfo.TransitionTime));
+                this.m_daylightTransitionEnd = (TimeZoneInfo.TransitionTime)info.GetValue("DaylightTransitionEnd", typeof(TimeZoneInfo.TransitionTime));
+            }
+
+            public static TimeZoneInfo.AdjustmentRule CreateAdjustmentRule(DateTime dateStart, DateTime dateEnd, TimeSpan daylightDelta, TimeZoneInfo.TransitionTime daylightTransitionStart, TimeZoneInfo.TransitionTime daylightTransitionEnd)
+            {
+                ValidateAdjustmentRule(dateStart, dateEnd, daylightDelta, daylightTransitionStart, daylightTransitionEnd);
+                TimeZoneInfo.AdjustmentRule rule = new TimeZoneInfo.AdjustmentRule();
+                rule.m_dateStart = dateStart;
+                rule.m_dateEnd = dateEnd;
+                rule.m_daylightDelta = daylightDelta;
+                rule.m_daylightTransitionStart = daylightTransitionStart;
+                rule.m_daylightTransitionEnd = daylightTransitionEnd;
+                return rule;
+            }
+
+            public bool Equals(TimeZoneInfo.AdjustmentRule other)
+            {
+                return ((((((other != null) && (this.m_dateStart == other.m_dateStart)) && (this.m_dateEnd == other.m_dateEnd)) && (this.m_daylightDelta == other.m_daylightDelta)) && this.m_daylightTransitionEnd.Equals(other.m_daylightTransitionEnd)) && this.m_daylightTransitionStart.Equals(other.m_daylightTransitionStart));
+            }
+
+            public override int GetHashCode()
+            {
+                return this.m_dateStart.GetHashCode();
+            }
+
+            void IDeserializationCallback.OnDeserialization(object sender)
+            {
+                try
+                {
+                    ValidateAdjustmentRule(this.m_dateStart, this.m_dateEnd, this.m_daylightDelta, this.m_daylightTransitionStart, this.m_daylightTransitionEnd);
+                }
+                catch (ArgumentException exception)
+                {
+                    throw new SerializationException("Serialization_InvalidData", exception);
+                }
+            }
+
+            [SecurityPermission(SecurityAction.LinkDemand, Flags = SecurityPermissionFlag.SerializationFormatter)]
+            void ISerializable.GetObjectData(SerializationInfo info, StreamingContext context)
+            {
+                if (info == null)
+                {
+                    throw new ArgumentNullException("info");
+                }
+                info.AddValue("DateStart", this.m_dateStart);
+                info.AddValue("DateEnd", this.m_dateEnd);
+                info.AddValue("DaylightDelta", this.m_daylightDelta);
+                info.AddValue("DaylightTransitionStart", this.m_daylightTransitionStart);
+                info.AddValue("DaylightTransitionEnd", this.m_daylightTransitionEnd);
+            }
+
+            private static void ValidateAdjustmentRule(DateTime dateStart, DateTime dateEnd, TimeSpan daylightDelta, TimeZoneInfo.TransitionTime daylightTransitionStart, TimeZoneInfo.TransitionTime daylightTransitionEnd)
+            {
+                if (dateStart.Kind != DateTimeKind.Unspecified)
+                {
+                    throw new ArgumentException("Argument_DateTimeKindMustBeUnspecified", "dateStart");
+                }
+                if (dateEnd.Kind != DateTimeKind.Unspecified)
+                {
+                    throw new ArgumentException("Argument_DateTimeKindMustBeUnspecified", "dateEnd");
+                }
+                if (daylightTransitionStart.Equals(daylightTransitionEnd))
+                {
+                    throw new ArgumentException("Argument_TransitionTimesAreIdentical", "daylightTransitionEnd");
+                }
+                if (dateStart > dateEnd)
+                {
+                    throw new ArgumentException("Argument_OutOfOrderDateTimes", "dateStart");
+                }
+                if (TimeZoneInfo.UtcOffsetOutOfRange(daylightDelta))
+                {
+                    throw new ArgumentOutOfRangeException("daylightDelta", daylightDelta, "ArgumentOutOfRange_UtcOffset");
+                }
+                if ((daylightDelta.Ticks % 0x23c34600L) != 0L)
+                {
+                    throw new ArgumentException("Argument_TimeSpanHasSeconds", "daylightDelta");
+                }
+                if (dateStart.TimeOfDay != TimeSpan.Zero)
+                {
+                    throw new ArgumentException("Argument_DateTimeHasTimeOfDay", "dateStart");
+                }
+                if (dateEnd.TimeOfDay != TimeSpan.Zero)
+                {
+                    throw new ArgumentException("Argument_DateTimeHasTimeOfDay", "dateEnd");
+                }
+            }
+
+            // Properties
+            public DateTime DateEnd
+            {
+                get
+                {
+                    return this.m_dateEnd;
+                }
+            }
+
+            public DateTime DateStart
+            {
+                get
+                {
+                    return this.m_dateStart;
+                }
+            }
+
+            public TimeSpan DaylightDelta
+            {
+                get
+                {
+                    return this.m_daylightDelta;
+                }
+            }
+
+            public TimeZoneInfo.TransitionTime DaylightTransitionEnd
+            {
+                get
+                {
+                    return this.m_daylightTransitionEnd;
+                }
+            }
+
+            public TimeZoneInfo.TransitionTime DaylightTransitionStart
+            {
+                get
+                {
+                    return this.m_daylightTransitionStart;
+                }
+            }
+        }
+
+        private sealed class StringSerializer
+        {
+            // Fields
+            private const string dateTimeFormat = "MM:dd:yyyy";
+            private const char esc = '\\';
+            private const string escapedEsc = @"\\";
+            private const string escapedLhs = @"\[";
+            private const string escapedRhs = @"\]";
+            private const string escapedSep = @"\;";
+            private const string escString = @"\";
+            private const int initialCapacityForString = 0x40;
+            private const char lhs = '[';
+            private const string lhsString = "[";
+            private int m_currentTokenStartIndex;
+            private string m_serializedText;
+            private State m_state;
+            private const char rhs = ']';
+            private const string rhsString = "]";
+            private const char sep = ';';
+            private const string sepString = ";";
+            private const string timeOfDayFormat = "HH:mm:ss.FFF";
+
+            // Methods
+            private StringSerializer(string str)
+            {
+                this.m_serializedText = str;
+                this.m_state = State.StartOfToken;
+            }
+
+            public static TimeZoneInfo GetDeserializedTimeZoneInfo(string source)
+            {
+                TimeZoneInfo info;
+                TimeZoneInfo.StringSerializer serializer = new TimeZoneInfo.StringSerializer(source);
+                string nextStringValue = serializer.GetNextStringValue(false);
+                TimeSpan nextTimeSpanValue = serializer.GetNextTimeSpanValue(false);
+                string displayName = serializer.GetNextStringValue(false);
+                string standardDisplayName = serializer.GetNextStringValue(false);
+                string daylightDisplayName = serializer.GetNextStringValue(false);
+                TimeZoneInfo.AdjustmentRule[] nextAdjustmentRuleArrayValue = serializer.GetNextAdjustmentRuleArrayValue(false);
+                try
+                {
+                    info = TimeZoneInfo.CreateCustomTimeZone(nextStringValue, nextTimeSpanValue, displayName, standardDisplayName, daylightDisplayName, nextAdjustmentRuleArrayValue);
+                }
+                catch (ArgumentException exception)
+                {
+                    throw new SerializationException("Serialization_InvalidData", exception);
+                }
+                catch (InvalidTimeZoneException exception2)
+                {
+                    throw new SerializationException("Serialization_InvalidData", exception2);
+                }
+                return info;
+            }
+
+            private TimeZoneInfo.AdjustmentRule[] GetNextAdjustmentRuleArrayValue(bool canEndWithoutSeparator)
+            {
+                List<TimeZoneInfo.AdjustmentRule> list = new List<TimeZoneInfo.AdjustmentRule>(1);
+                int num = 0;
+                for (TimeZoneInfo.AdjustmentRule rule = this.GetNextAdjustmentRuleValue(true); rule != null; rule = this.GetNextAdjustmentRuleValue(true))
+                {
+                    list.Add(rule);
+                    num++;
+                }
+                if (!canEndWithoutSeparator)
+                {
+                    if (this.m_state == State.EndOfLine)
+                    {
+                        throw new SerializationException("Serialization_InvalidData");
+                    }
+                    if ((this.m_currentTokenStartIndex < 0) || (this.m_currentTokenStartIndex >= this.m_serializedText.Length))
+                    {
+                        throw new SerializationException("Serialization_InvalidData");
+                    }
+                }
+                if (num == 0)
+                {
+                    return null;
+                }
+                return list.ToArray();
+            }
+
+            private TimeZoneInfo.AdjustmentRule GetNextAdjustmentRuleValue(bool canEndWithoutSeparator)
+            {
+                TimeZoneInfo.AdjustmentRule rule;
+                if (this.m_state == State.EndOfLine)
+                {
+                    if (!canEndWithoutSeparator)
+                    {
+                        throw new SerializationException("Serialization_InvalidData");
+                    }
+                    return null;
+                }
+                if ((this.m_currentTokenStartIndex < 0) || (this.m_currentTokenStartIndex >= this.m_serializedText.Length))
+                {
+                    throw new SerializationException("Serialization_InvalidData");
+                }
+                if (this.m_serializedText[this.m_currentTokenStartIndex] == ';')
+                {
+                    return null;
+                }
+                if (this.m_serializedText[this.m_currentTokenStartIndex] != '[')
+                {
+                    throw new SerializationException("Serialization_InvalidData");
+                }
+                this.m_currentTokenStartIndex++;
+                DateTime nextDateTimeValue = this.GetNextDateTimeValue(false, "MM:dd:yyyy");
+                DateTime dateEnd = this.GetNextDateTimeValue(false, "MM:dd:yyyy");
+                TimeSpan nextTimeSpanValue = this.GetNextTimeSpanValue(false);
+                TimeZoneInfo.TransitionTime nextTransitionTimeValue = this.GetNextTransitionTimeValue(false);
+                TimeZoneInfo.TransitionTime daylightTransitionEnd = this.GetNextTransitionTimeValue(false);
+                if ((this.m_state == State.EndOfLine) || (this.m_currentTokenStartIndex >= this.m_serializedText.Length))
+                {
+                    throw new SerializationException("Serialization_InvalidData");
+                }
+                if (this.m_serializedText[this.m_currentTokenStartIndex] != ']')
+                {
+                    this.SkipVersionNextDataFields(1);
+                }
+                else
+                {
+                    this.m_currentTokenStartIndex++;
+                }
+                try
+                {
+                    rule = TimeZoneInfo.AdjustmentRule.CreateAdjustmentRule(nextDateTimeValue, dateEnd, nextTimeSpanValue, nextTransitionTimeValue, daylightTransitionEnd);
+                }
+                catch (ArgumentException exception)
+                {
+                    throw new SerializationException("Serialization_InvalidData", exception);
+                }
+                if (this.m_currentTokenStartIndex >= this.m_serializedText.Length)
+                {
+                    this.m_state = State.EndOfLine;
+                    return rule;
+                }
+                this.m_state = State.StartOfToken;
+                return rule;
+            }
+
+            private DateTime GetNextDateTimeValue(bool canEndWithoutSeparator, string format)
+            {
+                DateTime time;
+                if (!DateTime.TryParseExact(this.GetNextStringValue(canEndWithoutSeparator), format, DateTimeFormatInfo.InvariantInfo, DateTimeStyles.None, out time))
+                {
+                    throw new SerializationException("Serialization_InvalidData");
+                }
+                return time;
+            }
+
+            private int GetNextInt32Value(bool canEndWithoutSeparator)
+            {
+                int num;
+                if (!int.TryParse(this.GetNextStringValue(canEndWithoutSeparator), NumberStyles.AllowLeadingSign, CultureInfo.InvariantCulture, out num))
+                {
+                    throw new SerializationException("Serialization_InvalidData");
+                }
+                return num;
+            }
+
+            private string GetNextStringValue(bool canEndWithoutSeparator)
+            {
+                if (this.m_state == State.EndOfLine)
+                {
+                    if (!canEndWithoutSeparator)
+                    {
+                        throw new SerializationException("Serialization_InvalidData");
+                    }
+                    return null;
+                }
+                if ((this.m_currentTokenStartIndex < 0) || (this.m_currentTokenStartIndex >= this.m_serializedText.Length))
+                {
+                    throw new SerializationException("Serialization_InvalidData");
+                }
+                State notEscaped = State.NotEscaped;
+                StringBuilder builder = new StringBuilder(0x40);
+                for (int i = this.m_currentTokenStartIndex; i < this.m_serializedText.Length; i++)
+                {
+                    if (notEscaped == State.Escaped)
+                    {
+                        VerifyIsEscapableCharacter(this.m_serializedText[i]);
+                        builder.Append(this.m_serializedText[i]);
+                        notEscaped = State.NotEscaped;
+                    }
+                    else if (notEscaped == State.NotEscaped)
+                    {
+                        switch (this.m_serializedText[i])
+                        {
+                            case '[':
+                                throw new SerializationException("Serialization_InvalidData");
+
+                            case '\\':
+                                notEscaped = State.Escaped;
+                                break;
+
+                            case ']':
+                                if (!canEndWithoutSeparator)
+                                {
+                                    throw new SerializationException("Serialization_InvalidData");
+                                }
+                                this.m_currentTokenStartIndex = i;
+                                this.m_state = State.StartOfToken;
+                                return builder.ToString();
+
+                            case ';':
+                                this.m_currentTokenStartIndex = i + 1;
+                                if (this.m_currentTokenStartIndex >= this.m_serializedText.Length)
+                                {
+                                    this.m_state = State.EndOfLine;
+                                }
+                                else
+                                {
+                                    this.m_state = State.StartOfToken;
+                                }
+                                return builder.ToString();
+
+                            case '\0':
+                                throw new SerializationException("Serialization_InvalidData");
+
+                            default:
+                                builder.Append(this.m_serializedText[i]);
+                                break;
+                        }
+                    }
+                }
+                if (notEscaped == State.Escaped)
+                {
+                    throw new SerializationException("Serialization_InvalidEscapeSequence");
+                }
+                if (!canEndWithoutSeparator)
+                {
+                    throw new SerializationException("Serialization_InvalidData");
+                }
+                this.m_currentTokenStartIndex = this.m_serializedText.Length;
+                this.m_state = State.EndOfLine;
+                return builder.ToString();
+            }
+
+            private TimeSpan GetNextTimeSpanValue(bool canEndWithoutSeparator)
+            {
+                TimeSpan span;
+                int minutes = this.GetNextInt32Value(canEndWithoutSeparator);
+                try
+                {
+                    span = new TimeSpan(0, minutes, 0);
+                }
+                catch (ArgumentOutOfRangeException exception)
+                {
+                    throw new SerializationException("Serialization_InvalidData", exception);
+                }
+                return span;
+            }
+
+            private TimeZoneInfo.TransitionTime GetNextTransitionTimeValue(bool canEndWithoutSeparator)
+            {
+                TimeZoneInfo.TransitionTime time;
+                if ((this.m_state == State.EndOfLine) || ((this.m_currentTokenStartIndex < this.m_serializedText.Length) && (this.m_serializedText[this.m_currentTokenStartIndex] == ']')))
+                {
+                    throw new SerializationException("Serialization_InvalidData");
+                }
+                if ((this.m_currentTokenStartIndex < 0) || (this.m_currentTokenStartIndex >= this.m_serializedText.Length))
+                {
+                    throw new SerializationException("Serialization_InvalidData");
+                }
+                if (this.m_serializedText[this.m_currentTokenStartIndex] != '[')
+                {
+                    throw new SerializationException("Serialization_InvalidData");
+                }
+                this.m_currentTokenStartIndex++;
+                int num = this.GetNextInt32Value(false);
+                if ((num != 0) && (num != 1))
+                {
+                    throw new SerializationException("Serialization_InvalidData");
+                }
+                DateTime nextDateTimeValue = this.GetNextDateTimeValue(false, "HH:mm:ss.FFF");
+                nextDateTimeValue = new DateTime(1, 1, 1, nextDateTimeValue.Hour, nextDateTimeValue.Minute, nextDateTimeValue.Second, nextDateTimeValue.Millisecond);
+                int month = this.GetNextInt32Value(false);
+                if (num == 1)
+                {
+                    int day = this.GetNextInt32Value(false);
+                    try
+                    {
+                        time = TimeZoneInfo.TransitionTime.CreateFixedDateRule(nextDateTimeValue, month, day);
+                        goto Label_015B;
+                    }
+                    catch (ArgumentException exception)
+                    {
+                        throw new SerializationException("Serialization_InvalidData", exception);
+                    }
+                }
+                int week = this.GetNextInt32Value(false);
+                int num5 = this.GetNextInt32Value(false);
+                try
+                {
+                    time = TimeZoneInfo.TransitionTime.CreateFloatingDateRule(nextDateTimeValue, month, week, (DayOfWeek)num5);
+                }
+                catch (ArgumentException exception2)
+                {
+                    throw new SerializationException("Serialization_InvalidData", exception2);
+                }
+            Label_015B:
+                if ((this.m_state == State.EndOfLine) || (this.m_currentTokenStartIndex >= this.m_serializedText.Length))
+                {
+                    throw new SerializationException("Serialization_InvalidData");
+                }
+                if (this.m_serializedText[this.m_currentTokenStartIndex] != ']')
+                {
+                    this.SkipVersionNextDataFields(1);
+                }
+                else
+                {
+                    this.m_currentTokenStartIndex++;
+                }
+                bool flag = false;
+                if ((this.m_currentTokenStartIndex < this.m_serializedText.Length) && (this.m_serializedText[this.m_currentTokenStartIndex] == ';'))
+                {
+                    this.m_currentTokenStartIndex++;
+                    flag = true;
+                }
+                if (!flag && !canEndWithoutSeparator)
+                {
+                    throw new SerializationException("Serialization_InvalidData");
+                }
+                if (this.m_currentTokenStartIndex >= this.m_serializedText.Length)
+                {
+                    this.m_state = State.EndOfLine;
+                    return time;
+                }
+                this.m_state = State.StartOfToken;
+                return time;
+            }
+
+            public static string GetSerializedString(TimeZoneInfo zone)
+            {
+                StringBuilder serializedText = new StringBuilder();
+                serializedText.Append(SerializeSubstitute(zone.Id));
+                serializedText.Append(';');
+                serializedText.Append(SerializeSubstitute(zone.BaseUtcOffset.TotalMinutes.ToString(CultureInfo.InvariantCulture)));
+                serializedText.Append(';');
+                serializedText.Append(SerializeSubstitute(zone.DisplayName));
+                serializedText.Append(';');
+                serializedText.Append(SerializeSubstitute(zone.StandardName));
+                serializedText.Append(';');
+                serializedText.Append(SerializeSubstitute(zone.DaylightName));
+                serializedText.Append(';');
+                TimeZoneInfo.AdjustmentRule[] adjustmentRules = zone.GetAdjustmentRules();
+                if ((adjustmentRules != null) && (adjustmentRules.Length > 0))
+                {
+                    for (int i = 0; i < adjustmentRules.Length; i++)
+                    {
+                        TimeZoneInfo.AdjustmentRule rule = adjustmentRules[i];
+                        serializedText.Append('[');
+                        serializedText.Append(SerializeSubstitute(rule.DateStart.ToString("MM:dd:yyyy", DateTimeFormatInfo.InvariantInfo)));
+                        serializedText.Append(';');
+                        serializedText.Append(SerializeSubstitute(rule.DateEnd.ToString("MM:dd:yyyy", DateTimeFormatInfo.InvariantInfo)));
+                        serializedText.Append(';');
+                        serializedText.Append(SerializeSubstitute(rule.DaylightDelta.TotalMinutes.ToString(CultureInfo.InvariantCulture)));
+                        serializedText.Append(';');
+                        SerializeTransitionTime(rule.DaylightTransitionStart, serializedText);
+                        serializedText.Append(';');
+                        SerializeTransitionTime(rule.DaylightTransitionEnd, serializedText);
+                        serializedText.Append(';');
+                        serializedText.Append(']');
+                    }
+                }
+                serializedText.Append(';');
+                return serializedText.ToString();
+            }
+
+            private static string SerializeSubstitute(string text)
+            {
+                text = text.Replace(@"\", @"\\");
+                text = text.Replace("[", @"\[");
+                text = text.Replace("]", @"\]");
+                return text.Replace(";", @"\;");
+            }
+
+            private static void SerializeTransitionTime(TimeZoneInfo.TransitionTime time, StringBuilder serializedText)
+            {
+                serializedText.Append('[');
+                serializedText.Append((time.IsFixedDateRule ? 1 : 0).ToString(CultureInfo.InvariantCulture));
+                serializedText.Append(';');
+                if (time.IsFixedDateRule)
+                {
+                    serializedText.Append(SerializeSubstitute(time.TimeOfDay.ToString("HH:mm:ss.FFF", DateTimeFormatInfo.InvariantInfo)));
+                    serializedText.Append(';');
+                    serializedText.Append(SerializeSubstitute(time.Month.ToString(CultureInfo.InvariantCulture)));
+                    serializedText.Append(';');
+                    serializedText.Append(SerializeSubstitute(time.Day.ToString(CultureInfo.InvariantCulture)));
+                    serializedText.Append(';');
+                }
+                else
+                {
+                    serializedText.Append(SerializeSubstitute(time.TimeOfDay.ToString("HH:mm:ss.FFF", DateTimeFormatInfo.InvariantInfo)));
+                    serializedText.Append(';');
+                    serializedText.Append(SerializeSubstitute(time.Month.ToString(CultureInfo.InvariantCulture)));
+                    serializedText.Append(';');
+                    serializedText.Append(SerializeSubstitute(time.Week.ToString(CultureInfo.InvariantCulture)));
+                    serializedText.Append(';');
+                    serializedText.Append(SerializeSubstitute(((int)time.DayOfWeek).ToString(CultureInfo.InvariantCulture)));
+                    serializedText.Append(';');
+                }
+                serializedText.Append(']');
+            }
+
+            private void SkipVersionNextDataFields(int depth)
+            {
+                if ((this.m_currentTokenStartIndex < 0) || (this.m_currentTokenStartIndex >= this.m_serializedText.Length))
+                {
+                    throw new SerializationException("Serialization_InvalidData");
+                }
+                State notEscaped = State.NotEscaped;
+                for (int i = this.m_currentTokenStartIndex; i < this.m_serializedText.Length; i++)
+                {
+                    switch (notEscaped)
+                    {
+                        case State.Escaped:
+                            {
+                                VerifyIsEscapableCharacter(this.m_serializedText[i]);
+                                notEscaped = State.NotEscaped;
+                                continue;
+                            }
+                        case State.NotEscaped:
+                            switch (this.m_serializedText[i])
+                            {
+                                case '[':
+                                    {
+                                        depth++;
+                                        continue;
+                                    }
+                                case '\\':
+                                    {
+                                        notEscaped = State.Escaped;
+                                        continue;
+                                    }
+                                case ']':
+                                    depth--;
+                                    if (depth != 0)
+                                    {
+                                        continue;
+                                    }
+                                    this.m_currentTokenStartIndex = i + 1;
+                                    if (this.m_currentTokenStartIndex < this.m_serializedText.Length)
+                                    {
+                                        goto Label_00B5;
+                                    }
+                                    this.m_state = State.EndOfLine;
+                                    return;
+
+                                case '\0':
+                                    throw new SerializationException("Serialization_InvalidData");
+                            }
+                            break;
+                    }
+                    continue;
+                Label_00B5:
+                    this.m_state = State.StartOfToken;
+                    return;
+                }
+                throw new SerializationException("Serialization_InvalidData");
+            }
+
+            private static void VerifyIsEscapableCharacter(char c)
+            {
+                if (((c != '\\') && (c != ';')) && ((c != '[') && (c != ']')))
+                {
+                    throw new SerializationException("Serialization_InvalidEscapeSequence " + c.ToString());
+                }
+            }
+
+            // Nested Types
+            private enum State
+            {
+                Escaped,
+                NotEscaped,
+                StartOfToken,
+                EndOfLine
+            }
+        }
+
+        private class TimeZoneInfoComparer : IComparer<TimeZoneInfo>
+        {
+            // Methods
+            int IComparer<TimeZoneInfo>.Compare(TimeZoneInfo x, TimeZoneInfo y)
+            {
+                return DevComponents.AdvTree.Utilities.CompareAlphaNumeric(x.Id, y.Id);
+            }
+        }
+
+        private enum TimeZoneInfoResult
+        {
+            Success,
+            TimeZoneNotFoundException,
+            InvalidTimeZoneException,
+            SecurityException
+        }
+
+        [Serializable, StructLayout(LayoutKind.Sequential), HostProtection(SecurityAction.LinkDemand, MayLeakOnAbort = true), HostProtection(SecurityAction.LinkDemand, MayLeakOnAbort = true)]
+        public struct TransitionTime : IEquatable<TimeZoneInfo.TransitionTime>, ISerializable, IDeserializationCallback
+        {
+            private DateTime m_timeOfDay;
+            private byte m_month;
+            private byte m_week;
+            private byte m_day;
+            private DayOfWeek m_dayOfWeek;
+            private bool m_isFixedDateRule;
+            public DateTime TimeOfDay
+            {
+                get
+                {
+                    return this.m_timeOfDay;
+                }
+            }
+            public int Month
+            {
+                get
+                {
+                    return this.m_month;
+                }
+            }
+            public int Week
+            {
+                get
+                {
+                    return this.m_week;
+                }
+            }
+            public int Day
+            {
+                get
+                {
+                    return this.m_day;
+                }
+            }
+            public DayOfWeek DayOfWeek
+            {
+                get
+                {
+                    return this.m_dayOfWeek;
+                }
+            }
+            public bool IsFixedDateRule
+            {
+                get
+                {
+                    return this.m_isFixedDateRule;
+                }
+            }
+            public override bool Equals(object obj)
+            {
+                return ((obj is TimeZoneInfo.TransitionTime) && this.Equals((TimeZoneInfo.TransitionTime)obj));
+            }
+
+            public static bool operator ==(TimeZoneInfo.TransitionTime left, TimeZoneInfo.TransitionTime right)
+            {
+                return left.Equals(right);
+            }
+
+            public static bool operator !=(TimeZoneInfo.TransitionTime left, TimeZoneInfo.TransitionTime right)
+            {
+                return !left.Equals(right);
+            }
+
+            public bool Equals(TimeZoneInfo.TransitionTime other)
+            {
+                bool flag = ((this.m_isFixedDateRule == other.m_isFixedDateRule) && (this.m_timeOfDay == other.m_timeOfDay)) && (this.m_month == other.m_month);
+                if (!flag)
+                {
+                    return flag;
+                }
+                if (other.m_isFixedDateRule)
+                {
+                    return (this.m_day == other.m_day);
+                }
+                return ((this.m_week == other.m_week) && (this.m_dayOfWeek == other.m_dayOfWeek));
+            }
+
+            public override int GetHashCode()
+            {
+                return (this.m_month ^ (this.m_week << 8));
+            }
+
+            public static TimeZoneInfo.TransitionTime CreateFixedDateRule(DateTime timeOfDay, int month, int day)
+            {
+                return CreateTransitionTime(timeOfDay, month, 1, day, DayOfWeek.Sunday, true);
+            }
+
+            public static TimeZoneInfo.TransitionTime CreateFloatingDateRule(DateTime timeOfDay, int month, int week, DayOfWeek dayOfWeek)
+            {
+                return CreateTransitionTime(timeOfDay, month, week, 1, dayOfWeek, false);
+            }
+
+            private static TimeZoneInfo.TransitionTime CreateTransitionTime(DateTime timeOfDay, int month, int week, int day, DayOfWeek dayOfWeek, bool isFixedDateRule)
+            {
+                ValidateTransitionTime(timeOfDay, month, week, day, dayOfWeek);
+                TimeZoneInfo.TransitionTime time = new TimeZoneInfo.TransitionTime();
+                time.m_isFixedDateRule = isFixedDateRule;
+                time.m_timeOfDay = timeOfDay;
+                time.m_dayOfWeek = dayOfWeek;
+                time.m_day = (byte)day;
+                time.m_week = (byte)week;
+                time.m_month = (byte)month;
+                return time;
+            }
+
+            private static void ValidateTransitionTime(DateTime timeOfDay, int month, int week, int day, DayOfWeek dayOfWeek)
+            {
+                if (timeOfDay.Kind != DateTimeKind.Unspecified)
+                {
+                    throw new ArgumentException("Argument_DateTimeKindMustBeUnspecified", "timeOfDay");
+                }
+                if ((month < 1) || (month > 12))
+                {
+                    throw new ArgumentOutOfRangeException("month", "ArgumentOutOfRange_Month");
+                }
+                if ((day < 1) || (day > 0x1f))
+                {
+                    throw new ArgumentOutOfRangeException("day", "ArgumentOutOfRange_Day");
+                }
+                if ((week < 1) || (week > 5))
+                {
+                    throw new ArgumentOutOfRangeException("week", "ArgumentOutOfRange_Week");
+                }
+                if ((dayOfWeek < DayOfWeek.Sunday) || (dayOfWeek > DayOfWeek.Saturday))
+                {
+                    throw new ArgumentOutOfRangeException("dayOfWeek", "ArgumentOutOfRange_DayOfWeek");
+                }
+                if (((timeOfDay.Year != 1) || (timeOfDay.Month != 1)) || ((timeOfDay.Day != 1) || ((timeOfDay.Ticks % 0x2710L) != 0L)))
+                {
+                    throw new ArgumentException("Argument_DateTimeHasTicks", "timeOfDay");
+                }
+            }
+
+            void IDeserializationCallback.OnDeserialization(object sender)
+            {
+                try
+                {
+                    ValidateTransitionTime(this.m_timeOfDay, this.m_month, this.m_week, this.m_day, this.m_dayOfWeek);
+                }
+                catch (ArgumentException exception)
+                {
+                    throw new SerializationException("Serialization_InvalidData", exception);
+                }
+            }
+
+            [SecurityPermission(SecurityAction.LinkDemand, Flags = SecurityPermissionFlag.SerializationFormatter)]
+            void ISerializable.GetObjectData(SerializationInfo info, StreamingContext context)
+            {
+                if (info == null)
+                {
+                    throw new ArgumentNullException("info");
+                }
+                info.AddValue("TimeOfDay", this.m_timeOfDay);
+                info.AddValue("Month", this.m_month);
+                info.AddValue("Week", this.m_week);
+                info.AddValue("Day", this.m_day);
+                info.AddValue("RelativeDayOfWeek", this.m_dayOfWeek);
+                info.AddValue("IsFixedDateRule", this.m_isFixedDateRule);
+            }
+
+            private TransitionTime(SerializationInfo info, StreamingContext context)
+            {
+                if (info == null)
+                {
+                    throw new ArgumentNullException("info");
+                }
+                this.m_timeOfDay = (DateTime)info.GetValue("TimeOfDay", typeof(DateTime));
+                this.m_month = (byte)info.GetValue("Month", typeof(byte));
+                this.m_week = (byte)info.GetValue("Week", typeof(byte));
+                this.m_day = (byte)info.GetValue("Day", typeof(byte));
+                this.m_dayOfWeek = (DayOfWeek)info.GetValue("RelativeDayOfWeek", typeof(DayOfWeek));
+                this.m_isFixedDateRule = (bool)info.GetValue("IsFixedDateRule", typeof(bool));
+            }
+        }
+    }
+
+    [Flags]
+    internal enum TimeZoneInfoOptions
+    {
+        None = 1,
+        NoThrowOnInvalidTime = 2
+    }
+
+    [Serializable, HostProtection(SecurityAction.LinkDemand, MayLeakOnAbort = true)]
+    public class InvalidTimeZoneException : Exception
+    {
+        // Methods
+        public InvalidTimeZoneException()
+        {
+        }
+
+        public InvalidTimeZoneException(string message)
+            : base(message)
+        {
+        }
+
+        protected InvalidTimeZoneException(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
+
+        public InvalidTimeZoneException(string message, Exception innerException)
+            : base(message, innerException)
+        {
+        }
+    }
+
+    [Serializable, HostProtection(SecurityAction.LinkDemand, MayLeakOnAbort = true)]
+    public class TimeZoneNotFoundException : Exception
+    {
+        // Methods
+        public TimeZoneNotFoundException()
+        {
+        }
+
+        public TimeZoneNotFoundException(string message)
+            : base(message)
+        {
+        }
+
+        protected TimeZoneNotFoundException(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
+
+        public TimeZoneNotFoundException(string message, Exception innerException)
+            : base(message, innerException)
+        {
+        }
+    }
+
+    [SuppressUnmanagedCodeSecurity, HostProtection(SecurityAction.LinkDemand, MayLeakOnAbort = true)]
+    internal sealed class SafeLibraryHandle : Microsoft.Win32.SafeHandles.SafeHandleZeroOrMinusOneIsInvalid
+    {
+        // Methods
+        internal SafeLibraryHandle()
+            : base(true)
+        {
+        }
+
+        [ReliabilityContract(Consistency.WillNotCorruptState, Cer.Success), DllImport("kernel32.dll", CharSet = CharSet.Unicode)]
+        private static extern bool FreeLibrary(IntPtr hModule);
+        [DllImport("kernel32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
+        internal static extern SafeLibraryHandle LoadLibraryEx(string libFilename, IntPtr reserved, int flags);
+        protected override bool ReleaseHandle()
+        {
+            return FreeLibrary(base.handle);
+        }
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/Schedule/Model/TimeZoneInfo/UnsafeNativeMethods.cs b/PROMS/DotNetBar Source Code/Schedule/Model/TimeZoneInfo/UnsafeNativeMethods.cs
new file mode 100644
index 00000000..35e36361
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Schedule/Model/TimeZoneInfo/UnsafeNativeMethods.cs	
@@ -0,0 +1,36 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Runtime.InteropServices;
+using System.Security;
+
+namespace DevComponents.Schedule
+{
+    [SuppressUnmanagedCodeSecurity]
+    internal static class UnsafeNativeMethods
+    {
+        [DllImport("kernel32.dll", SetLastError=true, ExactSpelling=true)]
+        internal static extern int GetDynamicTimeZoneInformation(out NativeMethods.DynamicTimeZoneInformation lpDynamicTimeZoneInformation);
+
+        [DllImport("kernel32.dll", SetLastError = true, ExactSpelling = true)]
+        internal static extern int GetTimeZoneInformation(out NativeMethods.TimeZoneInformation lpTimeZoneInformation);
+
+        [return: MarshalAs(UnmanagedType.Bool)]
+        [DllImport("kernel32.dll", SetLastError = true, ExactSpelling = true)]
+        internal static extern bool GetFileMUIPath(int flags, [MarshalAs(UnmanagedType.LPWStr)] string filePath, [MarshalAs(UnmanagedType.LPWStr)] StringBuilder language, ref int languageLength, [MarshalAs(UnmanagedType.LPWStr)] StringBuilder fileMuiPath, ref int fileMuiPathLength, ref long enumerator);
+
+        [SecurityCritical, DllImport("kernel32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
+        internal static extern SafeLibraryHandle LoadLibraryEx(string libFilename, IntPtr reserved, int flags);
+
+        [SecurityCritical, DllImport("user32.dll", EntryPoint = "LoadStringW", CallingConvention = CallingConvention.StdCall, CharSet = CharSet.Unicode, SetLastError = true, ExactSpelling = true)]
+        internal static extern int LoadString(SafeLibraryHandle handle, int id, StringBuilder buffer, int bufferLength);
+ 
+
+ 
+
+
+    }
+}
+#endif
+
diff --git a/PROMS/DotNetBar Source Code/ScheduleModelIcsTests/ImportTest.cs b/PROMS/DotNetBar Source Code/ScheduleModelIcsTests/ImportTest.cs
new file mode 100644
index 00000000..a585aa9d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/ScheduleModelIcsTests/ImportTest.cs	
@@ -0,0 +1,2801 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using DevComponents.DotNetBar.Schedule;
+using DevComponents.Schedule;
+using DevComponents.Schedule.Model;
+using DevComponents.Schedule.Model.Serialization;
+using NUnit.Framework;
+
+namespace ScheduleModelIcsTests
+{
+    public delegate void ValidateHandler(string calName, DateTime dateStart, DateTime rangeEnd);
+
+    [TestFixture]
+    public class ImportTestDaily : ImportTestBase
+    {
+        #region DailyTest1: Daily for 10 occurrences
+
+        //BEGIN:VEVENT
+        //SUMMARY:Daily for 10 occurrences
+        //DESCRIPTION:(2010 9:00 AM EDT) January 1-10
+        //DTSTART;TZID=America/New_York:20100101T090000
+        //RRULE:FREQ=DAILY;COUNT=10
+        //DURATION:PT2H
+        //END:VEVENT
+
+        [Test]
+        public void DailyTest1()
+        {
+            DateTime dateStart = new DateTime(2010, 1, 1, 9, 0, 0);
+            DateTime dateEnd = dateStart.AddHours(2);
+
+            const string calName = "DailyTest1";
+            const string summary = "Daily for 10 occurrences";
+            const string description = "(2010 9:00 AM EDT) January 1-10";
+
+            const string duration = "PT2H";
+            const string rrule = "FREQ=DAILY;COUNT=10";
+
+            CalendarBegin(calName);
+            AddVEvent(summary, description, dateStart, dateEnd, duration, rrule);
+            CalendarEnd();
+
+            PerformTest(DailyTest1Validate, calName, dateStart, DateTime.MaxValue);
+        }
+
+        #region DailyTest1Validate
+
+        private void DailyTest1Validate(string calName, DateTime dateStart, DateTime rangeEnd)
+        {
+            Assert.True(Model.Appointments.Count == 1);
+            Assert.True(Model.Appointments[0].OwnerKey.Equals(calName));
+
+            AppointmentRecurrence recur = Model.Appointments[0].Recurrence;
+
+            Assert.NotNull(recur);
+            Assert.True(recur.RecurrenceType == eRecurrencePatternType.Daily);
+            Assert.True(recur.Daily.RepeatInterval == 1);
+            Assert.True(recur.Daily.RepeatOnDaysOfWeek == eDailyRecurrenceRepeat.All);
+
+            Assert.True(recur.RangeLimitType == eRecurrenceRangeLimitType.RangeNumberOfOccurrences);
+            Assert.True(recur.RangeNumberOfOccurrences == 9);
+            Assert.True(recur.RecurrenceStartDate == dateStart);
+
+            AppointmentSubsetCollection appc =
+                new AppointmentSubsetCollection(Model, dateStart, dateStart.AddDays(10));
+
+            Assert.True(appc.Count == 10);
+
+            DateTime date = dateStart;
+
+            for (int i = 0; i < appc.Count; i++)
+            {
+                Assert.True(appc[i].StartTime == date);
+                date = date.AddDays(1);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region DailyTest2: Daily until March 24, 2010
+
+        //BEGIN:VEVENT
+        //SUMMARY:Daily until March 24, 2010
+        //DESCRIPTION:(2010 9:00 AM EDT) February 2 - March 24, 2010
+        //DTSTART;TZID=America/New_York:20100202T090000
+        //DTEND;TZID=America/New_York:20100202T110000
+        //RRULE:FREQ=DAILY;UNTIL=20100324T000000
+        //END:VEVENT
+
+        [Test]
+        public void DailyTest2()
+        {
+            DateTime dateStart = new DateTime(2010, 2, 2, 9, 0, 0);
+            DateTime dateEnd = dateStart.AddHours(2);
+            DateTime rangeEnd = new DateTime(2010, 3, 24, 0, 0, 0);
+
+            const string calName = "DailyTest2";
+            const string summary = "Daily until March 24, 2010";
+            const string description = "(2010 9:00 AM EDT) February 2 - March 24, 2010";
+
+            string rrule = "FREQ=DAILY;UNTIL=" + GetDateTimeText(rangeEnd);
+
+            CalendarBegin(calName);
+            AddVEvent(summary, description, dateStart, dateEnd, null, rrule);
+            CalendarEnd();
+
+            PerformTest(DailyTest2Validate, calName, dateStart, rangeEnd);
+        }
+
+        #region DailyTest2Validate
+
+        private void DailyTest2Validate(string calName, DateTime dateStart, DateTime rangeEnd)
+        {
+            Assert.True(Model.Appointments.Count == 1);
+            Assert.True(Model.Appointments[0].OwnerKey.Equals(calName));
+
+            AppointmentRecurrence recur = Model.Appointments[0].Recurrence;
+
+            Assert.NotNull(recur);
+            Assert.True(recur.RecurrenceType == eRecurrencePatternType.Daily);
+            Assert.True(recur.Daily.RepeatInterval == 1);
+            Assert.True(recur.Daily.RepeatOnDaysOfWeek == eDailyRecurrenceRepeat.All);
+
+            Assert.True(recur.RangeLimitType == eRecurrenceRangeLimitType.RangeEndDate);
+            Assert.True(recur.RangeEndDate == rangeEnd);
+            Assert.True(recur.RangeNumberOfOccurrences == 0);
+            Assert.True(recur.RecurrenceStartDate == dateStart);
+
+            AppointmentSubsetCollection appc =
+                new AppointmentSubsetCollection(Model, dateStart, dateStart.AddYears(1));
+
+            Assert.True(appc.Count == 51);
+
+            DateTime date = dateStart;
+
+            for (int i = 0; i < appc.Count; i++)
+            {
+                Assert.True(appc[i].StartTime == date);
+
+                date = date.AddDays(1);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region DailyTest3: Every WeekEndDay - for 4 occurrences
+
+        //BEGIN:VEVENT
+        //SUMMARY:Every WeekEndDay - for 4 occurrences
+        //DESCRIPTION:(2010 9:00 AM EDT) May 15-16, 22-23
+        //UID:C2BD07E2-54F2-11D7-93F8-000393BCF7D2-RID4
+        //DTSTART;TZID=America/New_York:20100515T090000
+        //RRULE:FREQ=DAILY;COUNT=4;BYDAY=SA,SU
+        //DURATION:PT2H
+        //END:VEVENT
+
+        [Test]
+        public void DailyTest3()
+        {
+            DateTime dateStart = new DateTime(2010, 5, 15, 9, 0, 0);
+            DateTime dateEnd = dateStart.AddHours(2);
+
+            const string calName = "DailyTest3";
+            const string summary = "(2010 9:00 AM EDT) May 15-16, 22-23";
+            const string description = "(2010 9:00 AM EDT) May 15-16, 22-23";
+            const string rrule = "FREQ=DAILY;COUNT=4;BYDAY=SA,SU";
+
+            CalendarBegin(calName);
+            AddVEvent(summary, description, dateStart, dateEnd, null, rrule);
+            CalendarEnd();
+
+            PerformTest(DailyTest3Validate, calName, dateStart, DateTime.MaxValue);
+        }
+
+        #region DailyTest3Validate
+
+        private void DailyTest3Validate(string calName, DateTime dateStart, DateTime rangeEnd)
+        {
+            Assert.True(Model.Appointments.Count == 1);
+            Assert.True(Model.Appointments[0].OwnerKey.Equals(calName));
+
+            AppointmentRecurrence recur = Model.Appointments[0].Recurrence;
+
+            Assert.NotNull(recur);
+            Assert.True(recur.RecurrenceType == eRecurrencePatternType.Daily);
+            Assert.True(recur.Daily.RepeatInterval == 1);
+            Assert.True(recur.Daily.RepeatOnDaysOfWeek == eDailyRecurrenceRepeat.WeekendDays);
+
+            Assert.True(recur.RangeLimitType == eRecurrenceRangeLimitType.RangeNumberOfOccurrences);
+            Assert.True(recur.RangeNumberOfOccurrences == 3);
+            Assert.True(recur.RecurrenceStartDate == dateStart);
+
+            AppointmentSubsetCollection appc =
+                new AppointmentSubsetCollection(Model, dateStart, dateStart.AddYears(1));
+
+            Assert.True(appc.Count == 4);
+
+            DateTime date = dateStart;
+
+            Assert.True(appc[0].StartTime == date);
+            Assert.True(appc[1].StartTime == date.AddDays(1));
+            Assert.True(appc[2].StartTime == date.AddDays(7));
+            Assert.True(appc[3].StartTime == date.AddDays(8));
+        }
+
+        #endregion
+
+        #endregion
+
+        #region DailyTest4: Every Day - for 21 occurrences
+
+        //BEGIN:VEVENT
+        //SUMMARY:Every Day - for 21 occurrences
+        //DESCRIPTION:(2010 9:00 AM EDT) June 9-29
+        //DTSTART;TZID=America/New_York:20100609T090000
+        //RRULE:FREQ=DAILY;COUNT=21;BYDAY=SA,SU,MO,TU,WE,TH,FR
+        //DURATION:PT2H
+        //END:VEVENT
+
+        [Test]
+        public void DailyTest4()
+        {
+            DateTime dateStart = new DateTime(2010, 6, 9, 9, 0, 0);
+            DateTime dateEnd = dateStart.AddHours(2);
+
+            const string calName = "DailyTest4";
+            const string summary = "Every Day - for 21 occurrences";
+            const string description = "(2010 9:00 AM EDT) June 9-29";
+            const string rrule = "FREQ=DAILY;COUNT=21;BYDAY=SA,SU,MO,TU,WE,TH,FR";
+
+            CalendarBegin(calName);
+            AddVEvent(summary, description, dateStart, dateEnd, null, rrule);
+            CalendarEnd();
+
+            PerformTest(DailyTest4Validate, calName, dateStart, DateTime.MaxValue);
+        }
+
+        #region DailyTest4Validate
+
+        private void DailyTest4Validate(string calName, DateTime dateStart, DateTime rangeEnd)
+        {
+            Assert.True(Model.Appointments.Count == 1);
+            Assert.True(Model.Appointments[0].OwnerKey.Equals(calName));
+
+            AppointmentRecurrence recur = Model.Appointments[0].Recurrence;
+
+            Assert.NotNull(recur);
+            Assert.True(recur.RecurrenceType == eRecurrencePatternType.Daily);
+            Assert.True(recur.Daily.RepeatInterval == 1);
+            Assert.True(recur.Daily.RepeatOnDaysOfWeek == eDailyRecurrenceRepeat.All);
+
+            Assert.True(recur.RangeLimitType == eRecurrenceRangeLimitType.RangeNumberOfOccurrences);
+            Assert.True(recur.RangeNumberOfOccurrences == 20);
+            Assert.True(recur.RecurrenceStartDate == dateStart);
+
+            AppointmentSubsetCollection appc =
+                new AppointmentSubsetCollection(Model, dateStart, dateStart.AddYears(1));
+
+            Assert.True(appc.Count == 21);
+
+            DateTime date = dateStart;
+
+            for (int i = 0; i < appc.Count; i++)
+            {
+                Assert.True(appc[i].StartTime == date);
+
+                date = date.AddDays(1);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region DailyTest5: Every Day - for 5 occurrences, Interval 10
+
+        //BEGIN:VEVENT
+        //SUMMARY:Every Day - for 5 occurrences, Interval 10
+        //DESCRIPTION:(2010 9:00 AM EDT) Jul 22; Aug 1,11,21,31
+        //DTSTART;TZID=America/New_York:20100722T090000
+        //RRULE:FREQ=DAILY;INTERVAL=10;COUNT=5
+        //DURATION:PT2H
+        //END:VEVENT
+
+        [Test]
+        public void DailyTest5()
+        {
+            DateTime dateStart = new DateTime(2010, 7, 22, 9, 0, 0);
+            DateTime dateEnd = dateStart.AddHours(2);
+
+            const string calName = "DailyTest5";
+            const string summary = "Every Day - for 5 occurrences, Interval 10";
+            const string description = "(2010 9:00 AM EDT) Jul 22; Aug 1,11,21,31";
+            const string rrule = "FREQ=DAILY;INTERVAL=10;COUNT=5";
+
+            CalendarBegin(calName);
+            AddVEvent(summary, description, dateStart, dateEnd, null, rrule);
+            CalendarEnd();
+
+            PerformTest(DailyTest5Validate, calName, dateStart, DateTime.MaxValue);
+        }
+
+        #region DailyTest5Validate
+
+        private void DailyTest5Validate(string calName, DateTime dateStart, DateTime rangeEnd)
+        {
+            Assert.True(Model.Appointments.Count == 1);
+            Assert.True(Model.Appointments[0].OwnerKey.Equals(calName));
+
+            AppointmentRecurrence recur = Model.Appointments[0].Recurrence;
+
+            Assert.NotNull(recur);
+            Assert.True(recur.RecurrenceType == eRecurrencePatternType.Daily);
+            Assert.True(recur.Daily.RepeatInterval == 10);
+            Assert.True(recur.Daily.RepeatOnDaysOfWeek == eDailyRecurrenceRepeat.All);
+
+            Assert.True(recur.RangeLimitType == eRecurrenceRangeLimitType.RangeNumberOfOccurrences);
+            Assert.True(recur.RangeNumberOfOccurrences == 4);
+            Assert.True(recur.RecurrenceStartDate == dateStart);
+
+            AppointmentSubsetCollection appc =
+                new AppointmentSubsetCollection(Model, dateStart, dateStart.AddYears(1));
+
+            Assert.True(appc.Count == 5);
+
+            DateTime date = dateStart;
+
+            for (int i = 0; i < appc.Count; i++)
+            {
+                Assert.True(appc[i].StartTime == date);
+
+                date = date.AddDays(10);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region DailyTest6: Every other day - forever
+
+        //BEGIN:VEVENT
+        //SUMMARY:Every other day - forever
+        //DESCRIPTION:(2010 9:00 AM EDT) October 8,10,12...
+        //DTSTART;TZID=America/New_York:20101008T090000
+        //RRULE:FREQ=DAILY;INTERVAL=2
+        //DURATION:PT2H
+        //END:VEVENT
+
+        [Test]
+        public void DailyTest6()
+        {
+            DateTime dateStart = new DateTime(2010, 10, 8, 2, 0, 0);
+            DateTime dateEnd = dateStart.AddHours(2);
+
+            const string calName = "DailyTest6";
+            const string summary = "Every other day - forever";
+            const string description = "(2010 9:00 AM EDT) October 8,10,12...";
+            const string rrule = "FREQ=DAILY;INTERVAL=2";
+
+            CalendarBegin(calName);
+            AddVEvent(summary, description, dateStart, dateEnd, null, rrule);
+            CalendarEnd();
+
+            PerformTest(DailyTest6Validate, calName, dateStart, DateTime.MaxValue);
+        }
+
+        #region DailyTest6Validate
+
+        private void DailyTest6Validate(string calName, DateTime dateStart, DateTime rangeEnd)
+        {
+            Assert.True(Model.Appointments.Count == 1);
+            Assert.True(Model.Appointments[0].OwnerKey.Equals(calName));
+
+            AppointmentRecurrence recur = Model.Appointments[0].Recurrence;
+
+            Assert.NotNull(recur);
+            Assert.True(recur.RecurrenceType == eRecurrencePatternType.Daily);
+            Assert.True(recur.Daily.RepeatInterval == 2);
+            Assert.True(recur.Daily.RepeatOnDaysOfWeek == eDailyRecurrenceRepeat.All);
+
+            Assert.True(recur.RangeLimitType == eRecurrenceRangeLimitType.NoEndDate);
+            Assert.True(recur.RangeNumberOfOccurrences == 0);
+            Assert.True(recur.RecurrenceStartDate == dateStart);
+
+            AppointmentSubsetCollection
+                appc = new AppointmentSubsetCollection(Model, dateStart, dateStart.AddYears(1));
+
+            Assert.True(appc.Count == 183);
+
+            DateTime date = dateStart;
+
+            for (int i = 0; i < appc.Count; i++)
+            {
+                Assert.True(appc[i].StartTime == GetValidDateTime(date));
+
+                date = date.AddDays(2);
+            }
+        }
+
+        #endregion
+
+        #endregion
+    }
+
+    [TestFixture]
+    public class ImportTestWeekly : ImportTestBase
+    {
+        #region WeeklyTest1: Weekly for 10x
+
+        //BEGIN:VEVENT
+        //SUMMARY:Weekly for 10 occurrences
+        //DESCRIPTION:(2010 9:00 AM EDT) Jan 1,8,15,22,29;Feb 5,12,19,26 Mar 5
+        //DTSTART;TZID=America/New_York:20100101T090000
+        //RRULE:FREQ=WEEKLY;COUNT=10
+        //DURATION:PT2H
+        //END:VEVENT
+
+        [Test]
+        public void WeeklyTest1()
+        {
+            DateTime dateStart = new DateTime(2010, 1, 1, 9, 0, 0);
+            DateTime dateEnd = dateStart.AddHours(2);
+
+            const string calName = "WeeklyTest1";
+            const string summary = "Weekly for 10 occurrences";
+            const string description = "(2010 9:00 AM EDT) Jan 1,8,15,22,29;Feb 5,12,19,26 Mar 5";
+            const string rrule = "FREQ=WEEKLY;COUNT=10";
+
+            CalendarBegin(calName);
+            AddVEvent(summary, description, dateStart, dateEnd, "PT2H", rrule);
+            CalendarEnd();
+
+            PerformTest(WeeklyTest1Validate, calName, dateStart, DateTime.MaxValue);
+        }
+
+        #region WeeklyTest1Validate
+
+        private void WeeklyTest1Validate(string calName, DateTime dateStart, DateTime rangeEnd)
+        {
+            Assert.True(Model.Appointments.Count == 1);
+            Assert.True(Model.Appointments[0].OwnerKey.Equals(calName));
+
+            AppointmentRecurrence recur = Model.Appointments[0].Recurrence;
+
+            Assert.NotNull(recur);
+            Assert.True(recur.RecurrenceType == eRecurrencePatternType.Weekly);
+            Assert.True(recur.Weekly.RepeatInterval == 1);
+            Assert.True(recur.Weekly.RepeatOnDaysOfWeek == eDayOfWeekRecurrence.Friday);
+
+            Assert.True(recur.RangeLimitType == eRecurrenceRangeLimitType.RangeNumberOfOccurrences);
+            Assert.True(recur.RangeNumberOfOccurrences == 9);
+            Assert.True(recur.RecurrenceStartDate == dateStart);
+
+            AppointmentSubsetCollection appc =
+                new AppointmentSubsetCollection(Model, dateStart, dateStart.AddYears(1));
+
+            Assert.True(appc.Count == 10);
+
+            DateTime date = dateStart;
+
+            for (int i = 0; i < appc.Count; i++)
+            {
+                Assert.True(appc[i].StartTime == date);
+
+                date = date.AddDays(7);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region WeeklyTest2: Weekly until May 24, 2010
+
+        //BEGIN:VEVENT
+        //SUMMARY:Weekly until May 24, 2010
+        //DESCRIPTION:(2010 9:00 AM EDT) Mar 11,18,25;Apr 1,8,15,22,29;May 6,13,20
+        //DTSTART;TZID=America/New_York:20100311T090000
+        //RRULE:FREQ=WEEKLY;UNTIL=20100524T000000
+        //DURATION:PT2H
+        //END:VEVENT
+
+        [Test]
+        public void WeeklyTest2()
+        {
+            DateTime dateStart = new DateTime(2010, 3, 11, 9, 0, 0);
+            DateTime dateEnd = dateStart.AddHours(2);
+            DateTime rangeEnd = new DateTime(2010, 5, 24, 0, 0, 0);
+
+            const string calName = "WeeklyTest2";
+            const string summary = "Weekly until May 24, 2010";
+            const string description = "(2010 9:00 AM EDT) Mar 11,18,25;Apr 1,8,15,22,29;May 6,13,20";
+            string rrule = "FREQ=WEEKLY;UNTIL=" + GetDateTimeText(rangeEnd);
+
+            CalendarBegin(calName);
+            AddVEvent(summary, description, dateStart, dateEnd, "PT2H", rrule);
+            CalendarEnd();
+
+            PerformTest(WeeklyTest2Validate, calName, dateStart, DateTime.MaxValue);
+        }
+
+        #region WeeklyTest2Validate
+
+        private void WeeklyTest2Validate(string calName, DateTime dateStart, DateTime rangeEnd)
+        {
+            Assert.True(Model.Appointments.Count == 1);
+            Assert.True(Model.Appointments[0].OwnerKey.Equals(calName));
+
+            AppointmentRecurrence recur = Model.Appointments[0].Recurrence;
+
+            Assert.NotNull(recur);
+            Assert.True(recur.RecurrenceType == eRecurrencePatternType.Weekly);
+            Assert.True(recur.Weekly.RepeatInterval == 1);
+            Assert.True(recur.Weekly.RepeatOnDaysOfWeek == eDayOfWeekRecurrence.Thursday);
+
+            Assert.True(recur.RangeLimitType == eRecurrenceRangeLimitType.RangeEndDate);
+            Assert.True(recur.RangeNumberOfOccurrences == 0);
+            Assert.True(recur.RecurrenceStartDate == dateStart);
+
+            AppointmentSubsetCollection appc =
+                new AppointmentSubsetCollection(Model, dateStart, dateStart.AddYears(1));
+
+            Assert.True(appc.Count == 11);
+
+            DateTime date = dateStart;
+
+            for (int i = 0; i < appc.Count; i++)
+            {
+                Assert.True(appc[i].StartTime == date);
+
+                date = date.AddDays(7);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region WeeklyTest3: Weekly on Tuesday and Thursday until July 4, 2010
+
+        //BEGIN:VEVENT
+        //SUMMARY:Weekly on Tuesday and Thursday until July 4, 2010
+        //DESCRIPTION:(2010 9:00 AM EDT) June 3,8,10,15,17,22
+        //DTSTART;TZID=America/New_York:20100603T090000
+        //RRULE:FREQ=WEEKLY;UNTIL=20100623T000000Z;BYDAY=TU,TH
+        //DURATION:PT2H
+        //END:VEVENT
+
+        [Test]
+        public void WeeklyTest3()
+        {
+            DateTime dateStart = new DateTime(2010, 6, 3, 9, 0, 0);
+            DateTime dateEnd = dateStart.AddHours(2);
+
+            const string calName = "WeeklyTest3";
+            const string summary = "Weekly on Tuesday and Thursday until July 4, 2010";
+            const string description = "(2010 9:00 AM EDT) June 3,8,10,15,17,22,24,29; Jul 1";
+            const string rrule = "FREQ=WEEKLY;UNTIL=20100704T000000Z;BYDAY=TU,TH";
+
+            CalendarBegin(calName);
+            AddVEvent(summary, description, dateStart, dateEnd, "PT2H", rrule);
+            CalendarEnd();
+
+            PerformTest(WeeklyTest3Validate, calName, dateStart, DateTime.MaxValue);
+        }
+
+        #region WeeklyTest3Validate
+
+        private void WeeklyTest3Validate(string calName, DateTime dateStart, DateTime rangeEnd)
+        {
+            Assert.True(Model.Appointments.Count == 1);
+            Assert.True(Model.Appointments[0].OwnerKey.Equals(calName));
+
+            AppointmentRecurrence recur = Model.Appointments[0].Recurrence;
+
+            Assert.NotNull(recur);
+            Assert.True(recur.RecurrenceType == eRecurrencePatternType.Weekly);
+            Assert.True(recur.Weekly.RepeatInterval == 1);
+            Assert.True(recur.Weekly.RepeatOnDaysOfWeek == (eDayOfWeekRecurrence.Tuesday | eDayOfWeekRecurrence.Thursday));
+
+            Assert.True(recur.RangeLimitType == eRecurrenceRangeLimitType.RangeEndDate);
+            Assert.True(recur.RangeNumberOfOccurrences == 0);
+            Assert.True(recur.RecurrenceStartDate == dateStart);
+
+            AppointmentSubsetCollection appc =
+                new AppointmentSubsetCollection(Model, dateStart, dateStart.AddYears(1));
+
+            Assert.True(appc.Count == 9);
+
+            DateTime date = dateStart;
+
+            for (int i = 0; i < appc.Count; i++)
+            {
+                Assert.True(appc[i].StartTime == date);
+                date = date.AddDays(date.DayOfWeek == DayOfWeek.Tuesday ? 2 : 5);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region WeeklyTest4: Weekly on Wednesday and Saturday for five weeks
+
+        //BEGIN:VEVENT
+        //SUMMARY:Weekly on Wednesday and Saturday for five weeks
+        //DESCRIPTION:(2010 9:00 AM EDT) Jul 7,10,14,17,21,24,28,31; Aug 4,7
+        //DTSTART;TZID=America/New_York:20100707T090000
+        //RRULE:FREQ=WEEKLY;COUNT=10;BYDAY=SA,WE
+        //DURATION:PT2H
+        //END:VEVENT
+
+        [Test]
+        public void WeeklyTest4()
+        {
+            DateTime dateStart = new DateTime(2010, 7, 7, 9, 0, 0);
+            DateTime dateEnd = dateStart.AddHours(2);
+
+            const string calName = "WeeklyTest4";
+            const string summary = "Weekly on Wednesday and Saturday for five weeks";
+            const string description = "(2010 9:00 AM EDT) Jul 7,10,14,17,21,24,28,31; Aug 4,7";
+            const string rrule = "FREQ=WEEKLY;COUNT=10;BYDAY=SA,WE";
+
+            CalendarBegin(calName);
+            AddVEvent(summary, description, dateStart, dateEnd, null, rrule);
+            CalendarEnd();
+
+            PerformTest(WeeklyTest4Validate, calName, dateStart, DateTime.MaxValue);
+        }
+
+        #region WeeklyTest4Validate
+
+        private void WeeklyTest4Validate(string calName, DateTime dateStart, DateTime rangeEnd)
+        {
+            Assert.True(Model.Appointments.Count == 1);
+            Assert.True(Model.Appointments[0].OwnerKey.Equals(calName));
+
+            AppointmentRecurrence recur = Model.Appointments[0].Recurrence;
+
+            Assert.NotNull(recur);
+            Assert.True(recur.RecurrenceType == eRecurrencePatternType.Weekly);
+            Assert.True(recur.Weekly.RepeatInterval == 1);
+            Assert.True(recur.Weekly.RepeatOnDaysOfWeek == (eDayOfWeekRecurrence.Saturday | eDayOfWeekRecurrence.Wednesday));
+
+            Assert.True(recur.RangeLimitType == eRecurrenceRangeLimitType.RangeNumberOfOccurrences);
+            Assert.True(recur.RangeNumberOfOccurrences == 9);
+            Assert.True(recur.RecurrenceStartDate == dateStart);
+
+            AppointmentSubsetCollection appc =
+                new AppointmentSubsetCollection(Model, dateStart, dateStart.AddYears(1));
+
+            Assert.True(appc.Count == 10);
+
+            DateTime date = dateStart;
+
+            for (int i = 0; i < appc.Count; i += 2)
+            {
+                Assert.True(appc[i].StartTime == date);
+                date = date.AddDays(3);
+
+                Assert.True(appc[i + 1].StartTime == date);
+                date = date.AddDays(4);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region WeeklyTest5: Every other week on Mon, Wed, and Fri until Sept 24, 2010
+
+        //BEGIN:VEVENT
+        //SUMMARY:Every other week on Mon, Wed, and Fri until Sept 24, 2010
+        //DESCRIPTION:(2010 9:00 AM EDT) Aug 9,11,13,23,25,27;sept 6,8,10,20,22,24
+        //DTSTART;TZID=America/New_York:20100809T090000
+        //RRULE:FREQ=WEEKLY;INTERVAL=2;UNTIL=20100924T100000Z;BYDAY=MO,WE,FR
+        //DURATION:PT2H
+        //END:VEVENT
+
+        [Test]
+        public void WeeklyTest5()
+        {
+            DateTime dateStart = new DateTime(2010, 8, 9, 9, 0, 0);
+            DateTime dateEnd = dateStart.AddHours(2);
+
+            const string calName = "WeeklyTest5";
+            const string summary = "Every other week on Mon, Wed, and Fri until Sept 24, 2010";
+            const string description = "(2010 9:00 AM EDT) Aug 9,11,13,23,25,27;sept 6,8,10,20,22,24";
+            const string rrule = "FREQ=WEEKLY;INTERVAL=2;UNTIL=20100924T100000Z;BYDAY=MO,WE,FR";
+
+            CalendarBegin(calName);
+            AddVEvent(summary, description, dateStart, dateEnd, null, rrule);
+            CalendarEnd();
+
+            PerformTest(WeeklyTest5Validate, calName, dateStart, DateTime.MaxValue);
+        }
+
+        #region WeeklyTest5Validate
+
+        private void WeeklyTest5Validate(string calName, DateTime dateStart, DateTime rangeEnd)
+        {
+            Assert.True(Model.Appointments.Count == 1);
+            Assert.True(Model.Appointments[0].OwnerKey.Equals(calName));
+
+            AppointmentRecurrence recur = Model.Appointments[0].Recurrence;
+
+            Assert.NotNull(recur);
+            Assert.True(recur.RecurrenceType == eRecurrencePatternType.Weekly);
+            Assert.True(recur.Weekly.RepeatInterval == 2);
+
+            Assert.True(recur.Weekly.RepeatOnDaysOfWeek ==
+                (eDayOfWeekRecurrence.Monday | eDayOfWeekRecurrence.Wednesday | eDayOfWeekRecurrence.Friday));
+
+            Assert.True(recur.RangeLimitType == eRecurrenceRangeLimitType.RangeEndDate);
+            Assert.True(recur.RangeNumberOfOccurrences == 0);
+            Assert.True(recur.RecurrenceStartDate == dateStart);
+
+            AppointmentSubsetCollection appc =
+                new AppointmentSubsetCollection(Model, dateStart, dateStart.AddYears(1));
+
+            Assert.True(appc.Count == 12);
+
+            DateTime date = dateStart;
+
+            for (int i = 0; i < appc.Count; i += 3)
+            {
+                Assert.True(appc[i].StartTime == date);
+                date = date.AddDays(2);
+
+                Assert.True(appc[i + 1].StartTime == date);
+                date = date.AddDays(2);
+
+                Assert.True(appc[i + 2].StartTime == date);
+                date = date.AddDays(10);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region WeeklyTest6: Weekly, 3 days long, on Tue
+
+        //BEGIN:VEVENT
+        //SUMMARY:Weekly, 3 days long, on Tue
+        //RRULE:FREQ=WEEKLY;INTERVAL=1;BYDAY=TU
+        //DTSTART;VALUE=DATE:20100907
+        //DTEND;VALUE=DATE:20100909
+        //END:VEVENT
+
+        [Test]
+        public void WeeklyTest6()
+        {
+            DateTime dateStart = new DateTime(2010, 9, 7, 0, 0, 0);
+            DateTime dateEnd = new DateTime(2010, 9, 10, 0, 0, 0);
+
+            const string calName = "WeeklyTest6";
+            const string summary = "Weekly, 3 days long, on Tue";
+            const string description = "(2010 00:00 AM EDT) Sept 3-5, 10-12, ...";
+            const string rrule = "FREQ=WEEKLY;INTERVAL=1;BYDAY=TU";
+
+            CalendarBegin(calName);
+            AddVEvent(summary, description, dateStart, dateEnd, null, rrule);
+            CalendarEnd();
+
+            PerformTest(WeeklyTest6Validate, calName, dateStart, DateTime.MaxValue);
+        }
+
+        #region WeeklyTest6Validate
+
+        private void WeeklyTest6Validate(string calName, DateTime dateStart, DateTime rangeEnd)
+        {
+            Assert.True(Model.Appointments.Count == 1);
+            Assert.True(Model.Appointments[0].OwnerKey.Equals(calName));
+
+            AppointmentRecurrence recur = Model.Appointments[0].Recurrence;
+
+            Assert.NotNull(recur);
+            Assert.True(recur.RecurrenceType == eRecurrencePatternType.Weekly);
+            Assert.True(recur.Weekly.RepeatInterval == 1);
+
+            Assert.True(recur.Weekly.RepeatOnDaysOfWeek == eDayOfWeekRecurrence.Tuesday);
+
+            Assert.True(recur.RangeLimitType == eRecurrenceRangeLimitType.NoEndDate);
+            Assert.True(recur.RangeNumberOfOccurrences == 0);
+            Assert.True(recur.RecurrenceStartDate == dateStart);
+
+            AppointmentSubsetCollection appc =
+                new AppointmentSubsetCollection(Model, dateStart, dateStart.AddYears(1));
+
+            Assert.True(appc.Count == 53);
+
+            DateTime date = dateStart;
+
+            for (int i = 0; i < appc.Count; i++)
+            {
+                Assert.True(appc[i].StartTime == date);
+                Assert.True(appc[i].StartTime.DayOfWeek == DayOfWeek.Tuesday);
+                Assert.True((appc[i].EndTime - appc[i].StartTime).TotalDays == 3);
+
+                date = date.AddDays(7);
+            }
+        }
+
+        #endregion
+
+        #endregion
+    }
+
+    [TestFixture]
+    public class ImportTestMonthly : ImportTestBase
+    {
+        #region MonthlyTest1: Monthly on the first Friday for 10x
+
+        //BEGIN:VEVENT
+        //SUMMARY:Monthly on the first Friday for 10 occurrences
+        //DESCRIPTION:(2010 9:00 AM EDT) Jan 1;Feb 5;Mar 5;Apr 2;May 7;Jun 4;Jul 2;Aug 6;Sept 3;Oct 1
+        //DTSTART;TZID=America/New_York:20100101T090000
+        //RRULE:FREQ=MONTHLY;COUNT=10;BYDAY=1FR
+        //DURATION:PT2H
+        //END:VEVENT
+
+        [Test]
+        public void MonthlyTest1()
+        {
+            DateTime dateStart = new DateTime(2010, 1, 1, 0, 0, 0);
+
+            const string calName = "MonthlyTest1";
+            const string summary = "Monthly on the first Friday for 10 occurrences";
+            const string description = "(2010 9:00 AM EDT) Jan 1;Feb 5;Mar 5;Apr 2;May 7;Jun 4;Jul 2;Aug 6;Sept 3;Oct 1";
+            const string rrule = "FREQ=MONTHLY;COUNT=10;BYDAY=1FR";
+
+            string uid = Guid.NewGuid().ToString();
+            string sDateStart = GetDateTimeText(dateStart);
+
+            CalendarBegin(calName);
+
+            AddOutput("BEGIN:VEVENT");
+
+            AddOutput("SUMMARY:" + summary);
+            AddOutput("DESCRIPTION:" + description);
+            AddOutput("UID:" + uid);
+            AddOutput("DTSTAMP:" + sDateStart);
+            AddOutput("DTSTART;VALUE=DATE:" + dateStart.ToString("yyyyMMdd"));
+            AddOutput("RRULE:" + rrule);
+
+            AddOutput("END:VEVENT");
+
+            CalendarEnd();
+
+            PerformTest(MonthlyTest1Validate, calName, dateStart, DateTime.MaxValue);
+        }
+
+        #region MonthlyTest1Validate
+
+        private void MonthlyTest1Validate(string calName, DateTime dateStart, DateTime rangeEnd)
+        {
+            Assert.True(Model.Appointments.Count == 1);
+            Assert.True(Model.Appointments[0].OwnerKey.Equals(calName));
+
+            AppointmentRecurrence recur = Model.Appointments[0].Recurrence;
+
+            Assert.NotNull(recur);
+            Assert.True(recur.RecurrenceType == eRecurrencePatternType.Monthly);
+            Assert.True(recur.Monthly.RepeatInterval == 1);
+            Assert.True(recur.Monthly.RepeatOnRelativeDayInMonth == eRelativeDayInMonth.First);
+
+            Assert.True(recur.RangeLimitType == eRecurrenceRangeLimitType.RangeNumberOfOccurrences);
+            Assert.True(recur.RangeNumberOfOccurrences == 9);
+            Assert.True(recur.RecurrenceStartDate == dateStart);
+
+            AppointmentSubsetCollection appc =
+                new AppointmentSubsetCollection(Model, dateStart, dateStart.AddYears(1));
+
+            Assert.True(appc.Count == 10);
+
+            DateTime date = dateStart;
+
+            for (int i = 0; i < appc.Count; i++)
+            {
+                Assert.True(appc[i].StartTime == date);
+
+                date = GetNextFirstDate(date, date.DayOfWeek);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region MonthlyTest2: Monthly on the third Tuesday until Mar 24, 2010
+
+        //BEGIN:VEVENT
+        //SUMMARY:Monthly on the third Tuesday until Mar 24, 2010
+        //DESCRIPTION:(2010 9:00 AM EDT) Jan 19;Feb 16;Mar 16
+        //DTSTART;TZID=America/New_York:20100119T090000
+        //RRULE:FREQ=MONTHLY;UNTIL=20100324T000000Z;BYDAY=3TU
+        //DURATION:PT2H
+        //END:VEVENT
+
+        [Test]
+        public void MonthlyTest2()
+        {
+            DateTime dateStart = new DateTime(2010, 1, 19, 9, 0, 0);
+            DateTime dateEnd = dateStart.AddHours(2);
+
+            const string calName = "MonthlyTest2";
+            const string summary = "Monthly on the third Tuesday until Mar 24, 2010";
+            const string description = "(2010 9:00 AM EDT) Jan 19;Feb 16;Mar 16";
+            const string rrule = "FREQ=MONTHLY;UNTIL=20100324T000000Z;BYDAY=3TU";
+
+            CalendarBegin(calName);
+            AddVEvent(summary, description, dateStart, dateEnd, null, rrule);
+            CalendarEnd();
+
+            PerformTest(MonthlyTest2Validate, calName, dateStart, DateTime.MaxValue);
+        }
+
+        #region MonthlyTest2Validate
+
+        private void MonthlyTest2Validate(string calName, DateTime dateStart, DateTime rangeEnd)
+        {
+            Assert.True(Model.Appointments.Count == 1);
+            Assert.True(Model.Appointments[0].OwnerKey.Equals(calName));
+
+            AppointmentRecurrence recur = Model.Appointments[0].Recurrence;
+
+            Assert.NotNull(recur);
+            Assert.True(recur.RecurrenceType == eRecurrencePatternType.Monthly);
+            Assert.True(recur.Monthly.RepeatInterval == 1);
+            Assert.True(recur.Monthly.RepeatOnRelativeDayInMonth == eRelativeDayInMonth.Third);
+
+            Assert.True(recur.RangeLimitType == eRecurrenceRangeLimitType.RangeEndDate);
+            Assert.True(recur.RangeNumberOfOccurrences == 0);
+            Assert.True(recur.RecurrenceStartDate == dateStart);
+
+            AppointmentSubsetCollection appc =
+                new AppointmentSubsetCollection(Model, dateStart, dateStart.AddYears(1));
+
+            Assert.True(appc.Count == 3);
+
+            DateTime date = dateStart;
+
+            for (int i = 0; i < appc.Count; i++)
+            {
+                Assert.True(appc[i].StartTime == date);
+
+                date = GetNextRelativeDate(date, date.DayOfWeek, 3);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region MonthlyTest3: Every other month, 2nd Sunday and last Saturday, 10x
+
+        //BEGIN:VEVENT
+        //SUMMARY:Every other month on the second Sunday and last Saturday
+        //  of the month for 10 occurrences
+        //DESCRIPTION:(2010 9:00 AM EDT) Apr 11,24;Jun 13,26;Aug 8,28;Oct 10,30
+        //DTSTART;TZID=America/New_York:20100404T090000
+        //RRULE:FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SA,2SU
+        //EXDATE:20100626T090000
+        //DURATION:PT2H
+        //END:VEVENT
+
+        [Test]
+        public void MonthlyTest3()
+        {
+            DateTime dateStart = new DateTime(2010, 4, 11, 9, 0, 0);
+            DateTime dateEnd = dateStart.AddHours(2);
+
+            const string calName = "MonthlyTest3";
+            const string summary = "Every other month on the second Sunday and last Saturday of the month for 10 occurrences";
+            const string description = "(2010 9:00 AM EDT) Apr 11,24;Jun 13,26;Aug 8,28;Oct 10,30";
+            const string rrule = "FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SA,2SU";
+
+            CalendarBegin(calName);
+            AddVEvent(summary, description, dateStart, dateEnd, null, rrule);
+            CalendarEnd();
+
+            PerformTest(MonthlyTest3Validate, calName, dateStart, DateTime.MaxValue);
+        }
+
+        #region MonthlyTest3Validate
+
+        private void MonthlyTest3Validate(string calName, DateTime dateStart, DateTime rangeEnd)
+        {
+            Assert.True(Model.Appointments.Count == 2);
+
+            for (int i = 0; i < Model.Appointments.Count; i++)
+            {
+                Appointment app = Model.Appointments[i];
+
+                Assert.True(app.OwnerKey.Equals(calName));
+
+                AppointmentRecurrence recur = app.Recurrence;
+
+                Assert.NotNull(recur);
+                Assert.True(recur.RecurrenceType == eRecurrencePatternType.Monthly);
+                Assert.True(recur.Monthly.RepeatInterval == 2);
+                Assert.True(recur.Monthly.RepeatOnRelativeDayInMonth != eRelativeDayInMonth.None);
+
+                Assert.True(recur.RangeLimitType == eRecurrenceRangeLimitType.RangeNumberOfOccurrences);
+                Assert.True(recur.RangeNumberOfOccurrences == 9);
+                Assert.True(recur.RecurrenceStartDate == app.StartTime);
+            }
+
+            AppointmentSubsetCollection appc =
+                new AppointmentSubsetCollection(Model, dateStart, dateStart.AddYears(2));
+
+            Assert.True(appc.Count == 20);
+
+            DateTime date = GetNextLastDate(dateStart.AddMonths(-1), DayOfWeek.Saturday);
+
+            for (int i = 0; i < appc.Count / 2; i++)
+            {
+                Assert.True(AppcContainsDate(appc, date) == true);
+
+                for (int j = 0; j < 2; j++)
+                    date = GetNextLastDate(date, date.DayOfWeek);
+            }
+
+            date = dateStart;
+
+            for (int i = 0; i < appc.Count / 2; i++)
+            {
+                Assert.True(AppcContainsDate(appc, date) == true);
+
+                for (int j = 0; j < 2; j++)
+                    date = GetNextRelativeDate(date, date.DayOfWeek, 2);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region MonthlyTest4: Every third month, on the 1st, 2nd, and Last Thursday, 4x
+
+        //BEGIN:VEVENT
+        //SUMMARY:Every third month on the first, second, and Last Thursday of the month for 4 occurrences
+        //DESCRIPTION:(2010 9:00 AM EDT) Nov 4,11,25;Feb 3,10,24;May 5,12,26;Aug 4,11,25
+        //DTSTART;TZID=America/New_York:20101104T090000
+        //RRULE:FREQ=MONTHLY;INTERVAL=3;COUNT=4;BYDAY=1TH,2TH,-1TH
+        //EXDATE:20110210T090000
+        //DURATION:PT2H
+        //END:VEVENT
+
+        [Test]
+        public void MonthlyTest4()
+        {
+            DateTime dateStart = new DateTime(2010, 11, 4, 9, 0, 0);
+            DateTime dateEnd = dateStart.AddHours(2);
+
+            const string calName = "MonthlyTest4";
+            const string summary = "Every third month on the first, second, and Last Thursday of the month for 4 occurrences";
+            const string description = "(2010 9:00 AM EDT) Nov 4,11,25;Feb 3,10,24;May 5,12,26;Aug 4,11,25";
+            const string rrule = "FREQ=MONTHLY;INTERVAL=3;COUNT=4;BYDAY=1TH,2TH,-1TH";
+
+            CalendarBegin(calName);
+            AddVEvent(summary, description, dateStart, dateEnd, null, rrule);
+            CalendarEnd();
+
+            PerformTest(MonthlyTest4Validate, calName, dateStart, DateTime.MaxValue);
+        }
+
+        #region MonthlyTest4Validate
+
+        private void MonthlyTest4Validate(string calName, DateTime dateStart, DateTime rangeEnd)
+        {
+            Assert.True(Model.Appointments.Count == 3);
+
+            for (int i = 0; i < Model.Appointments.Count; i++)
+            {
+                Appointment app = Model.Appointments[i];
+
+                Assert.True(app.OwnerKey.Equals(calName));
+
+                AppointmentRecurrence recur = app.Recurrence;
+
+                Assert.NotNull(recur);
+                Assert.True(recur.RecurrenceType == eRecurrencePatternType.Monthly);
+                Assert.True(recur.Monthly.RepeatInterval == 3);
+                Assert.True(recur.Monthly.RepeatOnRelativeDayInMonth != eRelativeDayInMonth.None);
+
+                Assert.True(recur.RangeLimitType == eRecurrenceRangeLimitType.RangeNumberOfOccurrences);
+                Assert.True(recur.RangeNumberOfOccurrences == 3);
+                Assert.True(recur.RecurrenceStartDate == app.StartTime);
+            }
+
+            AppointmentSubsetCollection appc =
+                new AppointmentSubsetCollection(Model, dateStart, dateStart.AddYears(4));
+
+            Assert.True(appc.Count == 12);
+
+            DateTime date = GetNextFirstDate(dateStart.AddMonths(-1), DayOfWeek.Thursday);
+
+            for (int i = 0; i < appc.Count / 3; i++)
+            {
+                Assert.True(AppcContainsDate(appc, date) == true);
+
+                for (int j = 0; j < 3; j++)
+                    date = GetNextFirstDate(date, date.DayOfWeek);
+            }
+
+            date = GetNextRelativeDate(dateStart.AddMonths(-1), DayOfWeek.Thursday, 2);
+
+            for (int i = 0; i < appc.Count / 3; i++)
+            {
+                Assert.True(AppcContainsDate(appc, date) == true);
+
+                for (int j = 0; j < 3; j++)
+                    date = GetNextRelativeDate(date, date.DayOfWeek, 2);
+            }
+
+            date = GetNextLastDate(dateStart.AddMonths(-1), DayOfWeek.Thursday);
+
+            for (int i = 0; i < appc.Count / 3; i++)
+            {
+                Assert.True(AppcContainsDate(appc, date) == true);
+
+                for (int j = 0; j < 3; j++)
+                    date = GetNextLastDate(date, date.DayOfWeek);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region MonthlyTest5: Every month on the 2nd and 15th, 5x
+
+        //BEGIN:VEVENT
+        //SUMMARY:Monthly on the 2nd and 15th of the month for 5 occurrences
+        //DESCRIPTION:(2010 9:00 AM EDT) Apr 2,15;May 2,15;Jun 2,15;Jul 2,15;Aug 2,15
+        //DTSTART;TZID=America/New_York:20100402T090000
+        //RRULE:FREQ=MONTHLY;COUNT=5;BYMONTHDAY=2,15
+        //DURATION:PT2H
+        //END:VEVENT
+
+        [Test]
+        public void MonthlyTest5()
+        {
+            DateTime dateStart = new DateTime(2010, 4, 2, 9, 0, 0);
+            DateTime dateEnd = dateStart.AddHours(2);
+
+            const string calName = "MonthlyTest5";
+            const string summary = "Monthly on the 2nd and 15th of the month for 5 occurrences";
+            const string description = "(2010 9:00 AM EDT) Apr 2,15;May 2,15;Jun 2,15;Jul 2,15;Aug 2,15";
+            const string rrule = "FREQ=MONTHLY;COUNT=5;BYMONTHDAY=2,15";
+
+            CalendarBegin(calName);
+            AddVEvent(summary, description, dateStart, dateEnd, null, rrule);
+            CalendarEnd();
+
+            PerformTest(MonthlyTest5Validate, calName, dateStart, DateTime.MaxValue);
+        }
+
+        #region MonthlyTest5Validate
+
+        private void MonthlyTest5Validate(string calName, DateTime dateStart, DateTime rangeEnd)
+        {
+            Assert.True(Model.Appointments.Count == 2);
+
+            for (int i = 0; i < Model.Appointments.Count; i++)
+            {
+                Appointment app = Model.Appointments[i];
+
+                Assert.True(app.OwnerKey.Equals(calName));
+
+                AppointmentRecurrence recur = app.Recurrence;
+
+                Assert.NotNull(recur);
+                Assert.True(recur.RecurrenceType == eRecurrencePatternType.Monthly);
+                Assert.True(recur.Monthly.RepeatInterval == 1);
+                Assert.True(recur.Monthly.RepeatOnRelativeDayInMonth == eRelativeDayInMonth.None);
+
+                Assert.True(recur.RangeLimitType == eRecurrenceRangeLimitType.RangeNumberOfOccurrences);
+                Assert.True(recur.RangeNumberOfOccurrences == 4);
+                Assert.True(recur.RecurrenceStartDate == app.StartTime);
+            }
+
+            AppointmentSubsetCollection appc =
+                new AppointmentSubsetCollection(Model, dateStart, dateStart.AddYears(4));
+
+            Assert.True(appc.Count == 10);
+
+            DateTime date = dateStart;
+
+            for (int i = 0; i < appc.Count / 2; i++)
+            {
+                Assert.True(AppcContainsDate(appc, date) == true);
+
+                date = date.AddMonths(1);
+            }
+
+            date = new DateTime(2010, 4, 15, 9, 0, 0);
+
+            for (int i = 0; i < appc.Count / 2; i++)
+            {
+                Assert.True(AppcContainsDate(appc, date) == true);
+
+                date = date.AddMonths(1);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region MonthlyTest6: Every 6 months on the 10th thru 15th, 5x
+
+        //BEGIN:VEVENT
+        //SUMMARY:Every 6 months on the 10th thru 15th of the month for 5 occurrences
+        //DESCRIPTION:(2010 9:00 AM EDT) Nov 10-15,May 10-15...
+        //DTSTART;TZID=America/New_York:20101110T090000
+        //RRULE:FREQ=MONTHLY;INTERVAL=6;COUNT=5;BYMONTHDAY=10,11,12,13,14,15
+        //EXDATE:20111113T090000
+        //DURATION:PT2H
+        //END:VEVENT
+
+        [Test]
+        public void MonthlyTest6()
+        {
+            DateTime dateStart = new DateTime(2010, 11, 10, 9, 0, 0);
+            DateTime dateEnd = dateStart.AddHours(2);
+
+            const string calName = "MonthlyTest6";
+            const string summary = "Every 6 months on the 10th thru 15th of the month for 5 occurrences";
+            const string description = "(2010 9:00 AM EDT) Nov 10-15,May 10-15...";
+            const string rrule = "FREQ=MONTHLY;INTERVAL=6;COUNT=5;BYMONTHDAY=10,11,12,13,14,15";
+
+            CalendarBegin(calName);
+            AddVEvent(summary, description, dateStart, dateEnd, null, rrule);
+            CalendarEnd();
+
+            PerformTest(MonthlyTest6Validate, calName, dateStart, DateTime.MaxValue);
+        }
+
+        #region MonthlyTest6Validate
+
+        private void MonthlyTest6Validate(string calName, DateTime dateStart, DateTime rangeEnd)
+        {
+            Assert.True(Model.Appointments.Count == 6);
+
+            for (int i = 0; i < Model.Appointments.Count; i++)
+            {
+                Appointment app = Model.Appointments[i];
+
+                Assert.True(app.OwnerKey.Equals(calName));
+
+                AppointmentRecurrence recur = app.Recurrence;
+
+                Assert.NotNull(recur);
+                Assert.True(recur.RecurrenceType == eRecurrencePatternType.Monthly);
+                Assert.True(recur.Monthly.RepeatInterval == 6);
+                Assert.True(recur.Monthly.RepeatOnRelativeDayInMonth == eRelativeDayInMonth.None);
+
+                Assert.True(recur.RangeLimitType == eRecurrenceRangeLimitType.RangeNumberOfOccurrences);
+                Assert.True(recur.RangeNumberOfOccurrences == 4);
+                Assert.True(recur.RecurrenceStartDate == app.StartTime);
+            }
+
+            AppointmentSubsetCollection appc =
+                new AppointmentSubsetCollection(Model, dateStart, dateStart.AddYears(20));
+
+            Assert.True(appc.Count == 30);
+
+            DateTime date = dateStart;
+
+            for (int i = 0; i < appc.Count / 6; i++)
+            {
+                Assert.True(AppcContainsDate(appc, date) == true);
+                Assert.True(AppcContainsDate(appc, date.AddDays(1)) == true);
+                Assert.True(AppcContainsDate(appc, date.AddDays(2)) == true);
+                Assert.True(AppcContainsDate(appc, date.AddDays(3)) == true);
+                Assert.True(AppcContainsDate(appc, date.AddDays(4)) == true);
+                Assert.True(AppcContainsDate(appc, date.AddDays(5)) == true);
+
+                date = date.AddMonths(6);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region MonthlyTest7: Monthly, every 2 months, 1st, 15th, 20th
+
+        //BEGIN:VEVENT
+        //SUMMARY:Monthly, every 2 months, 1st, 15th, 20th
+        //RRULE:FREQ=MONTHLY;INTERVAL=2;BYMONTHDAY=1,15,20
+        //DTSTART;VALUE=DATE:20100915
+        //DTEND;VALUE=DATE:20020916
+        //END:VEVENT
+
+        [Test]
+        public void MonthlyTest7()
+        {
+            DateTime dateStart = new DateTime(2010, 9, 15, 0, 0, 0);
+            DateTime dateEnd = dateStart.AddDays(1);
+
+            const string calName = "MonthlyTest7";
+            const string summary = "Monthly, every 2 months, 1st, 15th, 20th";
+
+            const string description = "(2010 00:00 AM EDT) Sept 15,20;Nov 1,15,20;Jan 1,15,20;" +
+                                       "Mar 1,15,20;May 1,15,20;Jul 1,15,20;Sept 1,15";
+
+            const string rrule = "FREQ=MONTHLY;INTERVAL=2;BYMONTHDAY=1,15,20";
+
+            CalendarBegin(calName);
+            AddVEvent(summary, description, dateStart, dateEnd, null, rrule);
+            CalendarEnd();
+
+            PerformTest(MonthlyTest7Validate, calName, dateStart, DateTime.MaxValue);
+        }
+
+        #region MonthlyTest7Validate
+
+        private void MonthlyTest7Validate(string calName, DateTime dateStart, DateTime rangeEnd)
+        {
+            Assert.True(Model.Appointments.Count == 3);
+
+            for (int i = 0; i < Model.Appointments.Count; i++)
+            {
+                Appointment app = Model.Appointments[i];
+
+                Assert.True(app.OwnerKey.Equals(calName));
+
+                AppointmentRecurrence recur = app.Recurrence;
+
+                Assert.NotNull(recur);
+                Assert.True(recur.RecurrenceType == eRecurrencePatternType.Monthly);
+                Assert.True(recur.Monthly.RepeatInterval == 2);
+                Assert.True(recur.Monthly.RepeatOnRelativeDayInMonth == eRelativeDayInMonth.None);
+
+                Assert.True(recur.RangeLimitType == eRecurrenceRangeLimitType.NoEndDate);
+                Assert.True(recur.RangeNumberOfOccurrences == 0);
+                Assert.True(recur.RecurrenceStartDate == app.StartTime);
+            }
+
+            AppointmentSubsetCollection appc =
+                new AppointmentSubsetCollection(Model, dateStart, dateStart.AddYears(1));
+
+            Assert.True(appc.Count == 19);
+
+            DateTime date = dateStart;
+
+            for (int i = 0; i < appc.Count; i++)
+            {
+                Assert.True(AppcContainsDate(appc, date) == true);
+
+                switch (date.Day)
+                {
+                    case 1:
+                        date = date.AddDays(14);
+                        break;
+
+                    case 15:
+                        date = date.AddDays(5);
+                        break;
+
+                    default:
+                        for (int j = 0; j < 2; j++)
+                            date = date.AddMonths(1);
+
+                        date = date.AddDays(-date.Day + 1);
+                        break;
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+    }
+
+    [TestFixture]
+    public class ImportTestYearly : ImportTestBase
+    {
+        #region YearlyTest1: Yearly in March for 2x
+
+        //BEGIN:VEVENT
+        //SUMMARY:Yearly in March for 2 occurrences
+        //DESCRIPTION:(2010 9:00 AM EDT) Mar 24,...
+        //DTSTART;TZID=America/New_York:20100324T090000
+        //RRULE:FREQ=YEARLY;COUNT=2;BYMONTH=3
+        //DURATION:PT2H
+        //END:VEVENT
+
+        [Test]
+        public void YearlyTest1()
+        {
+            DateTime dateStart = new DateTime(2010, 3, 24, 9, 0, 0);
+            DateTime dateEnd = dateStart.AddHours(2);
+
+            const string calName = "YearlyTest1";
+            const string summary = "Yearly in March for 2 occurrences";
+            const string description = "(2010 9:00 AM EDT) Mar 24,...";
+            const string rrule = "FREQ=YEARLY;COUNT=2;BYMONTH=3";
+
+            CalendarBegin(calName);
+            AddVEvent(summary, description, dateStart, dateEnd, null, rrule);
+            CalendarEnd();
+
+            PerformTest(YearlyTest1Validate, calName, dateStart, DateTime.MaxValue);
+        }
+
+        #region YearlyTest1Validate
+
+        private void YearlyTest1Validate(string calName, DateTime dateStart, DateTime rangeEnd)
+        {
+            Assert.True(Model.Appointments.Count == 1);
+            Assert.True(Model.Appointments[0].OwnerKey.Equals(calName));
+
+            AppointmentRecurrence recur = Model.Appointments[0].Recurrence;
+
+            Assert.NotNull(recur);
+            Assert.True(recur.RecurrenceType == eRecurrencePatternType.Yearly);
+            Assert.True(recur.Monthly.RepeatInterval == 1);
+            Assert.True(recur.Monthly.RepeatOnRelativeDayInMonth == eRelativeDayInMonth.None);
+
+            Assert.True(recur.RangeLimitType == eRecurrenceRangeLimitType.RangeNumberOfOccurrences);
+            Assert.True(recur.RangeNumberOfOccurrences == 1);
+            Assert.True(recur.RecurrenceStartDate == Model.Appointments[0].StartTime);
+
+            DateTime dt1 = new DateTime(2009, 7, 1);
+
+            AppointmentSubsetCollection appc =
+                new AppointmentSubsetCollection(Model, dt1, dt1.AddYears(1));
+
+            Assert.True(appc.Count == 1);
+
+            dt1 = dt1.AddYears(1);
+
+            appc = new AppointmentSubsetCollection(Model, dt1, dt1.AddYears(1));
+            Assert.True(appc.Count == 1);
+
+            appc = new AppointmentSubsetCollection(Model, dateStart, dateStart.AddYears(30));
+            Assert.True(appc.Count == 2);
+
+            DateTime date = dateStart;
+
+            for (int i = 0; i < appc.Count; i++)
+            {
+                Assert.True(AppcContainsDate(appc, date));
+                date = date.AddYears(1);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region YearlyTest2: Every 1st Monday, and 2nd and 4th Thursday in April, 3x
+
+        //BEGIN:VEVENT
+        //SUMMARY:Every 1st Monday, and 2nd and 4th Thursday in April, 3x
+        //DESCRIPTION:(2010 9:00 AM EDT) 
+        //DTSTART;TZID=America/New_York:20100405T090000
+        //RRULE:FREQ=YEARLY;COUNT=3;BYMONTH=4;BYDAY=1MO,2TH,4TH
+        //DURATION:PT2H
+        //END:VEVENT
+
+        [Test]
+        public void YearlyTest2()
+        {
+            DateTime dateStart = new DateTime(2010, 4, 5, 9, 0, 0);
+            DateTime dateEnd = dateStart.AddHours(2);
+
+            const string calName = "YearlyTest2";
+            const string summary = "Every 1st Monday, and 2nd and 4th Thursday in April, 3x";
+            const string description = "(2010 9:00 AM EDT) Apr 5,8,22; Apr 4,14,28; Apr 2,12,26";
+            const string rrule = "FREQ=YEARLY;COUNT=3;BYMONTH=4;BYDAY=1MO,2TH,4TH";
+
+            CalendarBegin(calName);
+            AddVEvent(summary, description, dateStart, dateEnd, null, rrule);
+            CalendarEnd();
+
+            PerformTest(YearlyTest2Validate, calName, dateStart, DateTime.MaxValue);
+        }
+
+        #region YearlyTest2Validate
+
+        private void YearlyTest2Validate(string calName, DateTime dateStart, DateTime rangeEnd)
+        {
+            Assert.True(Model.Appointments.Count == 3);
+            Assert.True(Model.Appointments[0].OwnerKey.Equals(calName));
+
+            AppointmentRecurrence recur = Model.Appointments[0].Recurrence;
+
+            Assert.NotNull(recur);
+            Assert.True(recur.RecurrenceType == eRecurrencePatternType.Yearly);
+            Assert.True(recur.Monthly.RepeatInterval == 1);
+            Assert.True(recur.Monthly.RepeatOnRelativeDayInMonth == eRelativeDayInMonth.None);
+
+            Assert.True(recur.RangeLimitType == eRecurrenceRangeLimitType.RangeNumberOfOccurrences);
+            Assert.True(recur.RangeNumberOfOccurrences == 2);
+            Assert.True(recur.RecurrenceStartDate == Model.Appointments[0].StartTime);
+
+            AppointmentSubsetCollection appc =
+                new AppointmentSubsetCollection(Model, dateStart, dateStart.AddYears(30));
+
+            Assert.True(appc.Count == 9);
+
+            DateTime date = dateStart;
+
+            for (int i = 0; i < appc.Count; i += 3)
+            {
+                DateTime date1 = GetFirstDate(date, DayOfWeek.Monday);
+                Assert.True(AppcContainsDate(appc, date1));
+
+                date1 = GetRelativeDate(date, DayOfWeek.Thursday, 2);
+                Assert.True(AppcContainsDate(appc, date1));
+
+                date1 = GetRelativeDate(date, DayOfWeek.Thursday, 4);
+                Assert.True(AppcContainsDate(appc, date1));
+
+                date = date.AddYears(1);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region YearlyTest3: Yearly on Sept 17
+
+        //BEGIN:VEVENT
+        //SUMMARY:Yearly on Sept 17
+        //DESCRIPTION:(2010 9:00 AM EDT) Mar 24,...
+        //DTSTART;TZID=America/New_York:20100917T000000
+        //DTEND;TZID=America/New_York:20100918T000000
+        //RRULE:FREQ=YEARLY
+        //END:VEVENT
+
+        [Test]
+        public void YearlyTest3()
+        {
+            DateTime dateStart = new DateTime(2010, 3, 24, 9, 0, 0);
+            DateTime dateEnd = dateStart.AddHours(2);
+
+            const string calName = "YearlyTest3";
+            const string summary = "Yearly on Sept 17";
+            const string description = "(2010 9:00 AM EDT) Sept 17,...";
+            const string rrule = "FREQ=YEARLY";
+
+            CalendarBegin(calName);
+            AddVEvent(summary, description, dateStart, dateEnd, null, rrule);
+            CalendarEnd();
+
+            PerformTest(YearlyTest3Validate, calName, dateStart, DateTime.MaxValue);
+        }
+
+        #region YearlyTest3Validate
+
+        private void YearlyTest3Validate(string calName, DateTime dateStart, DateTime rangeEnd)
+        {
+            Assert.True(Model.Appointments.Count == 1);
+            Assert.True(Model.Appointments[0].OwnerKey.Equals(calName));
+
+            AppointmentRecurrence recur = Model.Appointments[0].Recurrence;
+
+            Assert.NotNull(recur);
+            Assert.True(recur.RecurrenceType == eRecurrencePatternType.Yearly);
+            Assert.True(recur.Monthly.RepeatInterval == 1);
+            Assert.True(recur.Monthly.RepeatOnRelativeDayInMonth == eRelativeDayInMonth.None);
+
+            Assert.True(recur.RangeLimitType == eRecurrenceRangeLimitType.NoEndDate);
+            Assert.True(recur.RangeNumberOfOccurrences == 0);
+            Assert.True(recur.RecurrenceStartDate == Model.Appointments[0].StartTime);
+
+            AppointmentSubsetCollection appc =
+                new AppointmentSubsetCollection(Model, dateStart, dateStart.AddYears(30));
+
+            Assert.True(appc.Count == 31);
+
+            DateTime date = dateStart;
+
+            for (int i = 0; i < appc.Count; i++)
+            {
+                Assert.True(AppcContainsDate(appc, date));
+                date = date.AddYears(1);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region YearlyTest4: Yearly on Sept 17 with RDate
+
+        //BEGIN:VEVENT
+        //SUMMARY:Yearly on Sept 17
+        //DESCRIPTION:(2010 9:00 AM EDT) Mar 24,...
+        //DTSTART;TZID=America/New_York:20100917T000000
+        //DTEND;TZID=America/New_York:20100918T000000
+        //RRULE:FREQ=YEARLY
+        //RDATE;VALUE=PERIOD:20100920T100000z/20100920T140000z,
+        // 20100922T120000z/PT3H
+        //END:VEVENT
+
+        [Test]
+        public void YearlyTest4()
+        {
+            DateTime dateStart = new DateTime(2010, 9, 17, 10, 0, 0);
+            DateTime dateEnd = dateStart.AddHours(2);
+
+            const string calName = "YearlyTest4";
+            const string summary = "Yearly on Sept 17";
+            const string description = "(2010 9:00 AM EDT) Sept 17,20,22;...";
+            const string rrule = "FREQ=YEARLY";
+
+            CalendarBegin(calName);
+
+            AddOutput("BEGIN:VEVENT");
+            AddVEventBody(summary, description, dateStart, dateEnd, null, rrule);
+            AddOutput("RDATE;VALUE=PERIOD:20100920T100000/20100920T140000,20100922T120000/PT3H45M");
+            AddOutput("END:VEVENT");
+
+            CalendarEnd();
+
+            PerformTest(YearlyTest4Validate, calName, dateStart, DateTime.MaxValue);
+        }
+
+        #region YearlyTest4Validate
+
+        private void YearlyTest4Validate(string calName, DateTime dateStart, DateTime rangeEnd)
+        {
+            Assert.True(Model.Appointments.Count == 3);
+            Assert.True(Model.Appointments[0].OwnerKey.Equals(calName));
+
+            AppointmentRecurrence recur = Model.Appointments[0].Recurrence;
+
+            Assert.NotNull(recur);
+            Assert.True(recur.RecurrenceType == eRecurrencePatternType.Yearly);
+            Assert.True(recur.Monthly.RepeatInterval == 1);
+            Assert.True(recur.Monthly.RepeatOnRelativeDayInMonth == eRelativeDayInMonth.None);
+
+            Assert.True(recur.RangeLimitType == eRecurrenceRangeLimitType.NoEndDate);
+            Assert.True(recur.RangeNumberOfOccurrences == 0);
+            Assert.True(recur.RecurrenceStartDate == Model.Appointments[0].StartTime);
+
+            AppointmentSubsetCollection appc =
+                new AppointmentSubsetCollection(Model, dateStart, dateStart.AddYears(30));
+
+            Assert.True(appc.Count == 33);
+
+            DateTime date = dateStart;
+
+            for (int i = 0; i < appc.Count - 2; i++)
+            {
+                Assert.True(AppcContainsDate(appc, date));
+                date = date.AddYears(1);
+            }
+
+            date = new DateTime(2010, 9, 20, 10, 0, 0);
+
+            Appointment app = AppcGetApp(appc, date);
+
+            Assert.NotNull(app);
+
+            if (app != null)
+                Assert.True((app.EndTime - app.StartTime).TotalMinutes == 4 * 60);
+
+            date = new DateTime(2010, 9, 22, 12, 0, 0);
+
+            app = AppcGetApp(appc, date);
+
+            Assert.NotNull(app);
+
+            if (app != null)
+                Assert.True((app.EndTime - app.StartTime).TotalMinutes == 3 * 60 + 45);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region YearlyTest5: Every year, on the 4th and 12th of Jan, Feb, and May for 10x
+
+        //BEGIN:VEVENT
+        //SUMMARY:Yearly in January, February, and May for 10 occurrences
+        //DESCRIPTION:(2010 9:00 AM EDT) Jan 4;Feb 4;May 4
+        //DTSTART;TZID=America/New_York:20100104T090000
+        //RRULE:FREQ=YEARLY;COUNT=10;BYMONTH=1,2,5;BYMONTHDAY=4,12
+        //DURATION:PT2H
+        //END:VEVENT
+
+        [Test]
+        public void YearlyTest5()
+        {
+            DateTime dateStart = new DateTime(2010, 1, 4, 9, 0, 0);
+            DateTime dateEnd = dateStart.AddHours(2);
+
+            const string calName = "YearlyTest5";
+            const string summary = "Yearly in January, February, and May for 10 occurrences";
+            const string description = "(2010 9:00 AM EDT) Jan 4;Feb 4;May 4";
+            const string rrule = "FREQ=YEARLY;COUNT=10;BYMONTH=1,2,5;BYMONTHDAY=4,12";
+
+            CalendarBegin(calName);
+            AddVEvent(summary, description, dateStart, dateEnd, null, rrule);
+            CalendarEnd();
+
+            PerformTest(YearlyTest5Validate, calName, dateStart, DateTime.MaxValue);
+        }
+
+        #region YearlyTest5Validate
+
+        private void YearlyTest5Validate(string calName, DateTime dateStart, DateTime rangeEnd)
+        {
+            Assert.True(Model.Appointments.Count == 6);
+            Assert.True(Model.Appointments[0].OwnerKey.Equals(calName));
+
+            AppointmentRecurrence recur = Model.Appointments[0].Recurrence;
+
+            Assert.NotNull(recur);
+            Assert.True(recur.RecurrenceType == eRecurrencePatternType.Yearly);
+            Assert.True(recur.Monthly.RepeatInterval == 1);
+            Assert.True(recur.Monthly.RepeatOnRelativeDayInMonth == eRelativeDayInMonth.None);
+
+            Assert.True(recur.RangeLimitType == eRecurrenceRangeLimitType.RangeNumberOfOccurrences);
+            Assert.True(recur.RangeNumberOfOccurrences == 9);
+            Assert.True(recur.RecurrenceStartDate == Model.Appointments[0].StartTime);
+
+            AppointmentSubsetCollection appc =
+                new AppointmentSubsetCollection(Model, dateStart, dateStart.AddYears(30));
+
+            Assert.True(appc.Count == 60);
+
+            DateTime date = dateStart;
+
+            for (int i = 0; i < appc.Count / 3; i += 3)
+            {
+                DateTime date1 = date;
+                DateTime date2 = date.AddMonths(1);
+                DateTime date5 = date.AddMonths(4);
+
+                Assert.True(AppcContainsDate(appc, date1));
+                Assert.True(AppcContainsDate(appc, date2));
+                Assert.True(AppcContainsDate(appc, date5));
+
+                date1 = date1.AddDays(8);
+                date2 = date2.AddDays(8);
+                date5 = date5.AddDays(8);
+
+                Assert.True(AppcContainsDate(appc, date1));
+                Assert.True(AppcContainsDate(appc, date2));
+                Assert.True(AppcContainsDate(appc, date5));
+
+                date = date.AddYears(1);
+            }
+        }
+
+        #endregion
+
+        #endregion
+    }
+
+    [TestFixture]
+    public class ImportTestMisc : ImportTestBase
+    {
+        #region DurationTest: Single duration events
+
+        //BEGIN:VEVENT
+        //SUMMARY:Single shot events
+        //DTSTART;TZID=Canada/Eastern:20100601T00000
+        //DURATION:P*
+        //END:VEVENT
+
+        [Test]
+        public void DurationTest()
+        {
+            DateTime dateStart = new DateTime(2010, 6, 1, 0, 0, 0);
+
+            const string calName = "DurationTest";
+            const string summary = "Single shot events";
+            const string description = "(2010 1:00 PM EDT) Jun 1+";
+
+            CalendarBegin(calName);
+            AddVEvent(summary, description, dateStart, dateStart, "P2D", null);
+            AddVEvent(summary, description, dateStart.AddDays(1), dateStart, "P3DT4H", null);
+            AddVEvent(summary, description, dateStart.AddDays(2), dateStart, "P1DT3H45M", null);
+            AddVEvent(summary, description, dateStart.AddDays(3), dateStart, "P4DT15M", null);
+            AddVEvent(summary, description, dateStart.AddDays(4), dateStart, "PT4H", null);
+            AddVEvent(summary, description, dateStart.AddDays(5), dateStart, "PT2H15M", null);
+            AddVEvent(summary, description, dateStart.AddDays(6), dateStart, "PT12M", null);
+            AddVEvent(summary, description, dateStart.AddDays(7), dateStart, "PT7M30S", null);
+            CalendarEnd();
+
+            PerformTest(DurationTestValidate, calName, dateStart, DateTime.MaxValue);
+        }
+
+        #region DurationTestValidate
+
+        private void DurationTestValidate(string calName, DateTime dateStart, DateTime rangeEnd)
+        {
+            Assert.True(Model.Appointments.Count == 8);
+
+            AppointmentSubsetCollection appc =
+                new AppointmentSubsetCollection(Model, dateStart, dateStart.AddYears(1));
+
+            Assert.True(appc.Count == 8);
+
+            for (int i = 0; i < appc.Count; i++)
+            {
+                Appointment app = appc[i];
+
+                Assert.Null(app.Recurrence);
+                Assert.True(app.OwnerKey.Equals(calName));
+
+                int actMinutes = 0;
+                int appMinutes = (int)(app.EndTime - app.StartTime).TotalMinutes;
+
+                switch (app.StartTime.Day)
+                {
+                    case 1: actMinutes = 60 * 48; break;
+                    case 2: actMinutes = 60 * 76; break;
+                    case 3: actMinutes = 60 * 27 + 45; break;
+                    case 4: actMinutes = 60 * 96 + 15; break;
+                    case 5: actMinutes = 60 * 4; break;
+                    case 6: actMinutes = 60 * 2 + 15; break;
+                    case 7: actMinutes = 12; break;
+                    case 8: actMinutes = 7; break;
+
+                    default:
+                        Assert.True(false, "Invalid duration date.");
+                        break;
+                }
+
+                Assert.True(appMinutes == actMinutes, "Incorrect duration.");
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ExDateTest: Daily, 30x, ExDate Jul 2,16
+
+        //BEGIN:VEVENT
+        //SUMMARY:Daily, 30x, ExDate Jul 2,16
+        //EXDATE;TZID=Canada/Eastern:20100702T130000
+        //EXDATE;TZID=Canada/Eastern:20100716T130000
+        //DTSTART;TZID=Canada/Eastern:20100618T130000
+        //DTEND;TZID=Canada/Eastern:20100618T150000
+        //RRULE:FREQ=DAILY;COUNT=10
+        //END:VEVENT
+
+        [Test]
+        public void ExDateTest()
+        {
+            DateTime dateStart = new DateTime(2010, 6, 18, 13, 0, 0);
+            DateTime dateEnd = dateStart.AddHours(2);
+
+            const string calName = "ExDateTest";
+            const string summary = "Daily, 10x, ExDate Jul 2,16";
+            const string description = "(2010 1:00 PM EDT) Jun 18... ExDate Jul 2,16";
+
+            const string duration = "PT2H";
+            const string rrule = "FREQ=DAILY;COUNT=30";
+
+            CalendarBegin(calName);
+
+            AddOutput("BEGIN:VEVENT");
+            AddOutput("EXDATE;TZID=Canada/Eastern:20100702T130000");
+            AddVEventBody(summary, description, dateStart, dateEnd, duration, rrule);
+            AddOutput("EXDATE;TZID=Canada/Eastern:20100716T130000");
+            AddOutput("END:VEVENT");
+
+            CalendarEnd();
+
+            PerformTest(ExDateTestValidate, calName, dateStart, DateTime.MaxValue);
+        }
+
+        #region ExDateTestValidate
+
+        private void ExDateTestValidate(string calName, DateTime dateStart, DateTime rangeEnd)
+        {
+            Assert.True(Model.Appointments.Count == 1);
+            Assert.True(Model.Appointments[0].OwnerKey.Equals(calName));
+
+            AppointmentRecurrence recur = Model.Appointments[0].Recurrence;
+
+            Assert.NotNull(recur);
+            Assert.True(recur.RecurrenceType == eRecurrencePatternType.Daily);
+            Assert.True(recur.Daily.RepeatInterval == 1);
+            Assert.True(recur.Daily.RepeatOnDaysOfWeek == eDailyRecurrenceRepeat.All);
+
+            Assert.True(recur.RangeLimitType == eRecurrenceRangeLimitType.RangeNumberOfOccurrences);
+            Assert.True(recur.RangeNumberOfOccurrences == 29);
+            Assert.True(recur.RecurrenceStartDate == dateStart);
+
+            AppointmentSubsetCollection appc =
+                new AppointmentSubsetCollection(Model, dateStart, dateStart.AddYears(1));
+
+            Assert.True(appc.Count == 30);
+
+            DateTime date = dateStart;
+
+            for (int i = 0; i < appc.Count; i++)
+            {
+                if (date.Month == 7)
+                {
+                    if (date.Day == 2 || date.Day == 16)
+                    {
+                        Assert.True(AppcContainsDate(appc, date) == false);
+                        i--;
+                    }
+                }
+                else
+                {
+                    Assert.True(AppcContainsDate(appc, date) == true);
+                }
+
+                date = date.AddDays(1);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region XDNBTest: Daily, 10x
+
+        //BEGIN:VEVENT
+        //SUMMARY:Daily, 10x
+        //DTSTART;TZID=Canada/Eastern:20100618T130000
+        //DTEND;TZID=Canada/Eastern:20100618T150000
+        //RRULE:FREQ=DAILY;COUNT=10
+        //X-DNB-CATEGORYCOLOR:Purple
+        //X-DNB-DISPLAYTEMPLATE:<font color=\"Blue\">[StartTime] - [EndTime]</font><br />
+        //X-DNB-IMAGEALIGN:MiddleRight
+        //X-DNB-IMAGEKEY:OpenFolder
+        //X-DNB-LOCKED:true
+        //X-DNB-TIMEMARKEDAS:OutOfOffice
+        //X-DNB-TOOLTIP:MyToolTip is, of course, the best tooltip!
+        //END:VEVENT
+
+        [Test]
+        public void XdnbTest()
+        {
+            DateTime dateStart = new DateTime(2010, 6, 18, 13, 0, 0);
+            DateTime dateEnd = dateStart.AddHours(2);
+
+            const string calName = "XDNBTest";
+            const string summary = "Daily, 10x";
+            const string description = "(2010 1:00 PM EDT) Jun 18...";
+
+            const string duration = "PT2H";
+            const string rrule = "FREQ=DAILY;COUNT=10";
+
+            CalendarBegin(calName);
+
+            AddOutput("BEGIN:VEVENT");
+            AddOutput("X-DNB-CATEGORYCOLOR:Purple");
+            AddOutput("X-DNB-DISPLAYTEMPLATE:<font color=\"Blue\">[StartTime] - [EndTime]</font><br />");
+            AddOutput("X-DNB-IMAGEALIGN:MiddleRight");
+            AddOutput("X-DNB-IMAGEKEY:OpenFolder");
+
+            AddVEventBody(summary, description, dateStart, dateEnd, duration, rrule);
+
+            AddOutput("X-DNB-LOCKED:true");
+            AddOutput("X-DNB-TIMEMARKEDAS:OutOfOffice");
+            AddOutput("X-DNB-TOOLTIP:MyToolTip is, of course, the best tooltip!");
+            AddOutput("END:VEVENT");
+
+            CalendarEnd();
+
+            PerformTest(XdnbTestValidate, calName, dateStart, DateTime.MaxValue);
+        }
+
+        #region XdnbTestValidate
+
+        private void XdnbTestValidate(string calName, DateTime dateStart, DateTime rangeEnd)
+        {
+            Assert.True(Model.Appointments.Count == 1);
+            Assert.True(Model.Appointments[0].OwnerKey.Equals(calName));
+
+            AppointmentRecurrence recur = Model.Appointments[0].Recurrence;
+
+            Assert.NotNull(recur);
+            Assert.True(recur.RecurrenceType == eRecurrencePatternType.Daily);
+            Assert.True(recur.Daily.RepeatInterval == 1);
+            Assert.True(recur.Daily.RepeatOnDaysOfWeek == eDailyRecurrenceRepeat.All);
+
+            Assert.True(recur.RangeLimitType == eRecurrenceRangeLimitType.RangeNumberOfOccurrences);
+            Assert.True(recur.RangeNumberOfOccurrences == 9);
+            Assert.True(recur.RecurrenceStartDate == dateStart);
+
+            AppointmentSubsetCollection appc =
+                new AppointmentSubsetCollection(Model, dateStart, dateStart.AddYears(1));
+
+            Assert.True(appc.Count == 10);
+
+            DateTime date = dateStart;
+
+            for (int i = 0; i < appc.Count; i++)
+            {
+                Appointment app = appc[i];
+
+                Assert.True(app.CategoryColor.Equals(Appointment.CategoryPurple), "Incorrect CategoryColor.");
+                Assert.True(app.DisplayTemplate.Equals("<font color=\"Blue\">[StartTime] - [EndTime]</font><br />"), "Incorrect DisplayTemplate.");
+                Assert.True(app.ImageAlign == eImageContentAlignment.MiddleRight, "Incorrect ImageAlign.");
+                Assert.True(app.ImageKey.Equals("OpenFolder"), "Incorrect ImageKey.");
+                Assert.True(app.Locked, "Incorrect Locked value.");
+                Assert.True(app.TimeMarkedAs.Equals(Appointment.TimerMarkerOutOfOffice), "Incorrect TimeMarkedAs.");
+                Assert.True(app.Tooltip.Equals("MyToolTip is, of course, the best tooltip!"), "Incorrect Tooltip.");
+
+                Assert.True(AppcContainsDate(appc, date), "Invalid Date.");
+                date = date.AddDays(1);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RecIdTest: Daily, 10x
+
+        //BEGIN:VEVENT
+        //SUMMARY:Monthly, 15th of month, 24x
+        //DTSTART;TZID=US/Eastern:20100115T130000
+        //DTEND;TZID=US/Eastern:20100115T160000
+        //RRULE:FREQ=MONTHLY;BYMONTHDAY=15
+        //END:VEVENT
+
+        //BEGIN:VEVENT
+        //RECURRENCE-ID;TZID=US/Eastern:20100615T130000
+        //DTSTART;TZID=US/Eastern:20100615T150000
+        //DURATION:PT4H45M
+        //END:VEVENT
+
+        [Test]
+        public void RecIdTest()
+        {
+            DateTime dateStart = new DateTime(2010, 1, 15, 13, 0, 0);
+            DateTime dateEnd = new DateTime(2010, 1, 15, 16, 0, 0);
+
+            const string calName = "RecIdTest";
+            const string summary = "Daily, 10x";
+            const string description = "(2010 1:00 PM EDT) Jan 15, Feb 15...";
+            const string rrule = "FREQ=MONTHLY;COUNT=10;BYMONTHDAY=15";
+
+            CalendarBegin(calName);
+
+            string uid = AddVEvent(summary, description, dateStart, dateEnd, null, rrule);
+
+            AddOutput("BEGIN:VEVENT");
+            AddOutput("UID:" + uid);
+            AddOutput("RECURRENCE-ID:20100615T130000");
+            AddOutput("DTSTART:20100615T153000");
+            AddOutput("DURATION:PT4H45M");
+            AddOutput("END:VEVENT");
+
+            CalendarEnd();
+
+            PerformTest(RecIdTestValidate, calName, dateStart, DateTime.MaxValue);
+        }
+
+        #region RecIdTestValidate
+
+        private void RecIdTestValidate(string calName, DateTime dateStart, DateTime rangeEnd)
+        {
+            Assert.True(Model.Appointments.Count == 2);
+            Assert.True(Model.Appointments[0].OwnerKey.Equals(calName));
+
+            AppointmentRecurrence recur = Model.Appointments[0].Recurrence;
+
+            Assert.NotNull(recur);
+            Assert.True(recur.RecurrenceType == eRecurrencePatternType.Monthly);
+            Assert.True(recur.Monthly.RepeatInterval == 1);
+            Assert.True(recur.Monthly.RepeatOnDayOfMonth == 15);
+            Assert.True(recur.Monthly.RepeatOnRelativeDayInMonth == eRelativeDayInMonth.None);
+
+            Assert.True(recur.RangeLimitType == eRecurrenceRangeLimitType.RangeNumberOfOccurrences);
+            Assert.True(recur.RangeNumberOfOccurrences == 9);
+            Assert.True(recur.RecurrenceStartDate == dateStart);
+
+            AppointmentSubsetCollection appc =
+                new AppointmentSubsetCollection(Model, dateStart, dateStart.AddYears(1));
+
+            Assert.True(appc.Count == 11);
+
+            DateTime date = dateStart;
+
+            for (int i = 0; i < appc.Count; i++)
+            {
+                if (date.Month == 6)
+                {
+                    DateTime dateRecId = new DateTime(2010, 06, 15, 15, 30, 0);
+
+                    Appointment app = AppcGetApp(appc, dateRecId);
+
+                    Assert.True(app != null, "Incorrect RecurrenceId date.");
+
+                    if (app != null)
+                        Assert.True((app.EndTime - app.StartTime).TotalMinutes == 285, "Incorrect RecurrenceId duration.");
+                }
+                else
+                {
+                    Appointment app = AppcGetApp(appc, date);
+
+                    Assert.True(app != null, "Invalid Date.");
+
+                    if (app != null)
+                        Assert.True((app.EndTime - app.StartTime).TotalMinutes == 180, "Incorrect normal duration.");
+                }
+
+                date = date.AddMonths(1);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region LongValueTest: Single shot
+
+        //BEGIN:VEVENT
+        //SUMMARY:Paris (8 km) Prologue
+        //DESCRIPTION:PARIS\nThe 2003 Tour de France begins and ends in 
+        // Paris.\n\nThe first finish took place on the pink track of the Parc des 
+        // Princes\, then on the Bois de Vincennes municipal track (the \"Cipale\"\, 
+        // Jacques Anquetil Velodrome).\n\nSince 1975\, the finish takes place 
+        // against the prestigious backdrop of the Champs-Elysées (\"the most 
+        // beautiful avenue in the world\"). \r\n\nThe road opened in the XVIth 
+        // Century by Marie de Médicis is now the most famous in Paris\, situated 
+        // between Concorde and the Arc-de-Triomphe.
+        //DTSTART;VALUE=DATE:20030705
+        //DTEND;VALUE=DATE:20030706
+        //END:VEVENT
+
+        private string _Description;
+
+        [Test]
+        public void LongValueTest()
+        {
+            DateTime dateStart = new DateTime(2010, 1, 15, 0, 0, 0);
+            DateTime dateEnd = new DateTime(2010, 1, 16, 0, 0, 0);
+
+            const string calName = "LongValueTest";
+            const string summary = "LongValueTest - Single shot";
+
+            _Description = "PARIS\\nThe 2003 Tour de France begins and ends in " +
+                "Paris.\\n\\nThe first finish took place on the pink track of the Parc des " +
+                "Princes\\, then on the Bois de Vincennes municipal track (the \"Cipale\"\\, " +
+                "Jacques Anquetil Velodrome).\\n\\nSince 1975\\, the finish takes place " +
+                "against the prestigious backdrop of the Champs-Elysées (\"the most " +
+                "beautiful avenue in the world\"). \\n\\nThe road opened in the XVIth " +
+                "Century by Marie de Médicis is now the most famous in Paris\\, situated " +
+                "between Concorde and the Arc-de-Triomphe.";
+
+            CalendarBegin(calName);
+            AddVEvent(summary, _Description, dateStart, dateEnd, null, null);
+            CalendarEnd();
+
+            PerformTest(LongValueTestValidate, calName, dateStart, DateTime.MaxValue);
+        }
+
+        #region AddMetaData
+
+        /// <summary>
+        /// Adds escape chars to text meta data
+        /// </summary>
+        /// <param name="s"></param>
+        /// <returns></returns>
+        private string AddMetaData(string s)
+        {
+            Regex p = new Regex("[,;\\n]");
+            MatchCollection mc = p.Matches(s);
+
+            if (mc.Count > 0)
+            {
+                StringBuilder sb = new StringBuilder();
+
+                int index = 0;
+
+                foreach (Match ma in mc)
+                {
+                    if (index < ma.Index)
+                        sb.Append(s.Substring(index, ma.Index - index));
+
+                    index = ma.Index + ma.Length;
+
+                    char c = ma.Value[0];
+
+                    if (c == '\n')
+                        c = 'n';
+
+                    sb.Append('\\');
+                    sb.Append(c);
+                }
+
+                if (index < s.Length)
+                    sb.Append(s.Substring(index, s.Length - index));
+
+                return (sb.ToString());
+            }
+
+            return (s);
+        }
+
+        #endregion
+
+        #region LongValueTestValidate
+
+        private void LongValueTestValidate(string calName, DateTime dateStart, DateTime rangeEnd)
+        {
+            Assert.True(Model.Appointments.Count == 1);
+
+            Appointment app = Model.Appointments[0];
+
+            Assert.True(app.OwnerKey.Equals(calName));
+            Assert.Null(app.Recurrence);
+
+            string metaDesc = AddMetaData(app.Description);
+            Assert.True(metaDesc.Equals(_Description), "Incorrect description");
+
+            AppointmentSubsetCollection appc =
+                new AppointmentSubsetCollection(Model, dateStart, dateStart.AddYears(1));
+
+            Assert.True(appc.Count == 1);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region VTimeZone: Single shot
+
+        //BEGIN:VTIMEZONE
+        //TZID:/softwarestudio.org/Olson_20011030_5/Europe/London
+
+        //BEGIN:STANDARD
+        //TZOFFSETFROM:+0100
+        //TZOFFSETTO:+0000
+        //TZNAME:GMT
+        //DTSTART:19701025T020000
+        //RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=-1SU;BYMONTH=10
+        //END:STANDARD
+
+        //BEGIN:DAYLIGHT
+        //TZOFFSETFROM:+0000
+        //TZOFFSETTO:+0100
+        //TZNAME:BST
+        //DTSTART:19700329T010000
+        //RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=-1SU;BYMONTH=3
+        //END:DAYLIGHT
+
+        //END:VTIMEZONE
+
+        //BEGIN:VEVENT
+        //SEQUENCE:1
+        //SUMMARY:VTimeZone Test
+        //DTSTART;TZID=/softwarestudio.org/Olson_20011030_5/Europe/London:20100708T100000
+        //DURATION:PT2H
+        //END:VEVENT
+
+        [Test]
+        public void VTimeZone()
+        {
+            DateTime dateStart = new DateTime(2010, 7, 7, 10, 0, 0);
+            DateTime dateEnd = dateStart.AddHours(2);
+
+            const string calName = "VTimeZone";
+            const string summary = "VTimeZone - Single shot";
+
+            const string description = "Jul 7th, ";
+
+            CalendarBegin(calName);
+
+            string uid = Guid.NewGuid().ToString();
+            string sDateStart = GetDateTimeText(dateStart);
+
+            AddOutput("BEGIN:VEVENT");
+            AddOutput("SUMMARY:" + summary);
+            AddOutput("DESCRIPTION:" + description);
+            AddOutput("UID:" + uid);
+            AddOutput("DTSTAMP:" + sDateStart);
+            AddOutput("DTSTART;TZID=/softwarestudio.org/Olson_20011030_5/Europe/London:" + sDateStart);
+            AddOutput("DTEND;TZID=/softwarestudio.org/Olson_20011030_5/Europe/London:" + GetDateTimeText(dateEnd));
+            AddOutput("End:VEVENT");
+
+            AddOutput("BEGIN:VTIMEZONE");
+            AddOutput("TZID:/softwarestudio.org/Olson_20011030_5/Europe/London");
+
+            AddOutput("BEGIN:STANDARD");
+            AddOutput("TZOFFSETFROM:+0100");
+            AddOutput("TZOFFSETTO:+0000");
+            AddOutput("TZNAME:GMT");
+            AddOutput("DTSTART:19701025T020000");
+            AddOutput("RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=-1SU;BYMONTH=10");
+            AddOutput("END:STANDARD");
+
+            AddOutput("BEGIN:DAYLIGHT");
+            AddOutput("TZOFFSETFROM:+0000");
+            AddOutput("TZOFFSETTO:+0100");
+            AddOutput("TZNAME:BST");
+            AddOutput("DTSTART:19700329T010000");
+            AddOutput("RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=-1SU;BYMONTH=3");
+            AddOutput("END:DAYLIGHT");
+
+            AddOutput("END:VTIMEZONE");
+
+            CalendarEnd();
+
+            PerformTest(VTimeZoneValidate, calName, dateStart, DateTime.MaxValue);
+        }
+
+        #region VTimeZoneValidate
+
+        private void VTimeZoneValidate(string calName, DateTime dateStart, DateTime rangeEnd)
+        {
+            Assert.True(Model.Appointments.Count == 1);
+
+            Appointment app = Model.Appointments[0];
+
+            Assert.True(app.OwnerKey.Equals(calName));
+            Assert.Null(app.Recurrence);
+
+            AppointmentSubsetCollection appc =
+                new AppointmentSubsetCollection(Model, dateStart.AddDays(-1), dateStart.AddYears(1));
+
+            Assert.True(appc.Count == 1);
+            Assert.True(app.StartTime == dateStart.AddHours(-7));
+        }
+
+        #endregion
+
+        #endregion
+
+        #region VAlarmTest
+
+        //BEGIN:VEVENT
+        //SUMMARY:OLN: Road to the Tour
+        //DTSTART:20100719T081500
+        //DTEND:20100719T081600
+
+        //BEGIN:VALARM
+        //TRIGGER;VALUE=DURATION:-P15DT7H12M
+        //ACTION:DISPLAY
+        //DESCRIPTION:Event reminder 15 days, 7 hours, and 12 min before.
+        //END:VALARM
+
+        //BEGIN:VALARM
+        //TRIGGER;VALUE=DURATION:PT0M
+        //ACTION:DISPLAY
+        //DESCRIPTION:Event start time reached.
+        //END:VALARM
+
+        //BEGIN:VALARM
+        //TRIGGER;VALUE=DURATION:PT1M
+        //ACTION:DISPLAY
+        //DESCRIPTION:Event reminder 1 min after.
+        //END:VALARM
+        //END:VEVENT
+
+        private const string DescrBefore = "Event reminder 15 days, 7 hours, and 12 min before.";
+        private const string DescrStart = "Event start time reached.";
+        private const string DescrAfter = "Event reminder 1 min after.";
+
+        [Test]
+        public void VAlarmTest()
+        {
+            DateTime dateStart = new DateTime(2010, 7, 20, 8, 15, 0);
+            DateTime dateEnd = dateStart.AddMinutes(30);
+
+            const string calName = "VAlarmTest";
+            const string summary = "OLN: Road to the Tour";
+
+            const string description = "Jul 20th, ";
+
+            CalendarBegin(calName);
+
+            string uid = Guid.NewGuid().ToString();
+            string sDateStart = GetDateTimeText(dateStart);
+
+            AddOutput("BEGIN:VEVENT");
+
+            AddOutput("SUMMARY:" + summary);
+            AddOutput("DESCRIPTION:" + description);
+            AddOutput("UID:" + uid);
+            AddOutput("DTSTAMP:" + sDateStart);
+            AddOutput("DTSTART:" + sDateStart);
+            AddOutput("DTEND:" + GetDateTimeText(dateEnd));
+
+            AddOutput("BEGIN:VALARM");
+            AddOutput("TRIGGER;VALUE=DURATION:-P15DT7H12M");
+            AddOutput("ACTION:DISPLAY");
+            AddOutput("DESCRIPTION:" + DescrBefore);
+            AddOutput("END:VALARM");
+
+            AddOutput("BEGIN:VALARM");
+            AddOutput("TRIGGER;VALUE=DURATION:PT0M");
+            AddOutput("ACTION:DISPLAY");
+            AddOutput("DESCRIPTION:" + DescrStart);
+            AddOutput("END:VALARM");
+
+            AddOutput("BEGIN:VALARM");
+            AddOutput("TRIGGER;VALUE=DURATION:PT1M");
+            AddOutput("TZNAME:BST");
+            AddOutput("DESCRIPTION:" + DescrAfter);
+            AddOutput("END:VALARM");
+
+            AddOutput("END:VEVENT");
+
+            CalendarEnd();
+
+            PerformTest(VAlarmTestValidate, calName, dateStart, DateTime.MaxValue);
+        }
+
+        #region VAlarmTestValidate
+
+        private void VAlarmTestValidate(string calName, DateTime dateStart, DateTime rangeEnd)
+        {
+            Assert.True(Model.Appointments.Count == 1);
+
+            Appointment app = Model.Appointments[0];
+
+            Assert.True(app.OwnerKey.Equals(calName));
+            Assert.Null(app.Recurrence);
+
+            AppointmentSubsetCollection appc =
+                new AppointmentSubsetCollection(Model, dateStart, dateStart.AddYears(1));
+
+            Assert.True(appc.Count == 1);
+            Assert.True(app.StartTime == dateStart);
+
+            Assert.NotNull(app.Reminders);
+
+            if (app.Reminders != null)
+            {
+                Assert.True(app.Reminders.Count == 2);
+
+                foreach (Reminder rem in app.Reminders)
+                {
+                    switch (rem.Description)
+                    {
+                        case DescrBefore:
+                            Assert.True(rem.ReminderTime ==
+                                        dateStart.AddDays(-15).AddHours(-7).AddMinutes(-12));
+                            break;
+
+                        case DescrAfter:
+                            Assert.True(rem.ReminderTime == dateStart.AddMinutes(1));
+                            break;
+
+                        default:
+                            Assert.Fail("Invalid Reminder.");
+                            break;
+                    }
+                }
+
+                Assert.True(app.StartTimeAction == eStartTimeAction.StartTimeReachedEvent);
+            }
+        }
+
+        #endregion
+
+        #endregion
+    }
+
+    #region ImportTestBase
+
+    public class ImportTestBase
+    {
+        #region Private variables
+
+        private CalendarView _CalendarView;
+        private CalendarModel _Model;
+        private IcsImporter _Importer;
+        private IcsExporter _Exporter;
+
+        private MemoryStream _MemoryStream;
+        private StreamReader _StreamReader;
+        private StreamWriter _StreamWriter;
+
+        #endregion
+
+        #region Public properties
+
+        public CalendarModel Model
+        {
+            get { return (_Model); }
+            set { _Model = value; }
+        }
+
+        public MemoryStream MemoryStream
+        {
+            get { return (_MemoryStream); }
+            set { _MemoryStream = value; }
+        }
+
+        public StreamReader StreamReader
+        {
+            get { return (_StreamReader); }
+            set { _StreamReader = value; }
+        }
+
+        public StreamWriter StreamWriter
+        {
+            get { return (_StreamWriter); }
+            set { _StreamWriter = value; }
+        }
+
+        public IcsImporter Importer
+        {
+            get { return (_Importer); }
+        }
+
+        public IcsExporter Exporter
+        {
+            get { return (_Exporter); }
+        }
+        
+        #endregion
+
+        #region SetUp
+
+        [SetUp]
+        protected void SetUp()
+        {
+            Model = new CalendarModel();
+
+            _CalendarView = new CalendarView();
+            _CalendarView.CalendarModel = Model;
+
+            _Importer = new IcsImporter(Model);
+            _Exporter = new IcsExporter(Model);
+
+            _MemoryStream = new MemoryStream();
+            _StreamWriter = new StreamWriter(_MemoryStream);
+            _StreamReader = new StreamReader(MemoryStream);
+        }
+
+        #endregion
+
+        #region TearDown
+
+        [TearDown]
+        protected void TearDown()
+        {
+            if (_StreamWriter != null)
+                _StreamWriter.Dispose();
+
+            if (_StreamReader != null)
+                _StreamReader.Dispose();
+
+            if (_MemoryStream != null)
+                _MemoryStream.Dispose();
+        }
+
+        #endregion
+
+        #region CalendarBegin
+
+        public void CalendarBegin(string calName)
+        {
+            _StreamWriter.BaseStream.SetLength(0);
+
+            _StreamWriter.WriteLine("BEGIN:VCALENDAR");
+            _StreamWriter.WriteLine("CALSCALE:GREGORIAN");
+            _StreamWriter.WriteLine("X-WR-TIMEZONE;VALUE=TEXT:Canada/Eastern");
+            _StreamWriter.WriteLine("PRODID:-//DNB Components\\, Inc//iCal 1.0//EN");
+            _StreamWriter.WriteLine("X-WR-CALNAME;VALUE=TEXT:" + calName);
+            _StreamWriter.WriteLine("VERSION:2.0");
+        }
+
+        #endregion
+
+        #region CalendarEnd
+
+        public void CalendarEnd()
+        {
+            _StreamWriter.WriteLine("END:VCALENDAR");
+            _StreamWriter.Flush();
+        }
+
+        #endregion
+
+        #region AddOutput
+
+        public void AddOutput(string text)
+        {
+            _StreamWriter.WriteLine(text);
+        }
+
+        #endregion
+
+        #region AddVEvent
+
+        public string AddVEvent(string summary, string description,
+            DateTime dateStart, DateTime dateEnd, string duration, string rrule)
+        {
+            _StreamWriter.WriteLine("BEGIN:VEVENT");
+
+            string uid = AddVEventBody(summary, description, dateStart, dateEnd, duration, rrule);
+
+            _StreamWriter.WriteLine("END:VEVENT");
+
+            return (uid);
+        }
+
+        #endregion
+
+        #region AddVEventBody
+
+        public string AddVEventBody(string summary, string description,
+            DateTime dateStart, DateTime dateEnd, string duration, string rrule)
+        {
+            string uid = Guid.NewGuid().ToString();
+            string sDateStart = GetDateTimeText(dateStart);
+
+            _StreamWriter.WriteLine("SUMMARY:" + summary);
+            _StreamWriter.WriteLine("DESCRIPTION:" + description);
+            _StreamWriter.WriteLine("UID:" + uid);
+            _StreamWriter.WriteLine("DTSTAMP:" + sDateStart);
+            _StreamWriter.WriteLine("DTSTART:" + sDateStart);
+
+            if (duration != null)
+                _StreamWriter.WriteLine("DURATION:" + duration);
+            else
+                _StreamWriter.WriteLine("DTEND:" + GetDateTimeText(dateEnd));
+
+            if (rrule != null)
+                _StreamWriter.WriteLine("RRULE:" + rrule);
+
+            return (uid);
+        }
+
+        #endregion
+
+        #region GetDateTimeText
+
+        public string GetDateTimeText(DateTime date)
+        {
+            return (date.ToString("yyyyMMdd\\tHHmms"));
+        }
+
+        #endregion
+
+        #region GetFirstDate
+
+        public DateTime GetFirstDate(DateTime date, DayOfWeek dayOfWeek)
+        {
+            DateTime dt = date.AddDays(-date.Day + 1);
+
+            while (dt.DayOfWeek != dayOfWeek)
+                dt = dt.AddDays(1);
+
+            return (dt);
+        }
+
+        #endregion
+
+        #region GetNextFirstDate
+
+        public DateTime GetNextFirstDate(DateTime date, DayOfWeek dayOfWeek)
+        {
+            Calendar calendar = CultureInfo.CurrentCulture.Calendar;
+
+            DateTime dt = date.AddDays(calendar.GetDaysInMonth(date.Year, date.Month));
+
+            return (GetFirstDate(dt, dayOfWeek));
+        }
+
+        #endregion
+
+        #region GetRelativeDate
+
+        public DateTime GetRelativeDate(DateTime date, DayOfWeek dayOfWeek, int rel)
+        {
+            DateTime dt = GetFirstDate(date, dayOfWeek);
+
+            while (--rel > 0)
+                dt = dt.AddDays(7);
+
+            return (dt);
+        }
+
+        #endregion
+
+        #region GetNextRelativeDate
+
+        public DateTime GetNextRelativeDate(DateTime date, DayOfWeek dayOfWeek, int rel)
+        {
+            DateTime dt = GetNextFirstDate(date, dayOfWeek);
+
+            while (--rel > 0)
+                dt = dt.AddDays(7);
+
+            return (dt);
+        }
+
+        #endregion
+
+        #region GetNextLastDate
+
+        public DateTime GetNextLastDate(DateTime date, DayOfWeek dayOfWeek)
+        {
+            Calendar calendar = CultureInfo.CurrentCulture.Calendar;
+
+            DateTime dt = date.AddDays(calendar.GetDaysInMonth(date.Year, date.Month) - date.Day + 1);
+
+            dt = dt.AddDays(calendar.GetDaysInMonth(dt.Year, dt.Month) - 1);
+
+            while (dt.DayOfWeek != dayOfWeek)
+                dt = dt.AddDays(-1);
+
+            return (dt);
+        }
+
+        #endregion
+
+        #region AppcContainsDate
+
+        public bool AppcContainsDate(IEnumerable<Appointment> appc, DateTime date)
+        {
+            return (AppcGetApp(appc, date) != null);
+        }
+
+        #endregion
+
+        #region AppcGetApp
+
+        public Appointment AppcGetApp(IEnumerable<Appointment> appc, DateTime date)
+        {
+            foreach (Appointment app in appc)
+            {
+                if (app.StartTime == date)
+                    return (app);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetValidDateTime
+
+        public DateTime GetValidDateTime(DateTime date)
+        {
+            if (date == DateTime.MinValue || date == DateTime.MaxValue || date.Kind == DateTimeKind.Utc)
+                return (date);
+
+            TimeZoneInfo timeZone = TimeZoneInfo.Local;
+
+            if (timeZone.IsInvalidTime(date))
+            {
+                while (timeZone.IsInvalidTime(date))
+                    date = date.AddHours(1);
+            }
+            return date;
+        }
+
+        #endregion
+
+        #region PerformTest
+
+        public void PerformTest(ValidateHandler validate,
+            string calName, DateTime dateStart, DateTime rangeEnd)
+        {
+            // Import and validate the data
+
+            Model.Appointments.Clear();
+            StreamReader.BaseStream.Position = 0;
+            Importer.Import(StreamReader);
+
+            validate(calName, dateStart, rangeEnd);
+
+            // Export the Model data
+
+            StreamWriter.BaseStream.SetLength(0);
+            Exporter.Export(StreamWriter);
+
+            // Re-import and validate the exported data
+
+            Model.Appointments.Clear();
+            StreamReader.BaseStream.Position = 0;
+            Importer.Import(StreamReader);
+
+            validate(calName, dateStart, rangeEnd);
+        }
+
+        #endregion
+    }
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/ScheduleModelIcsTests/ScheduleModelIcsTests.csproj b/PROMS/DotNetBar Source Code/ScheduleModelIcsTests/ScheduleModelIcsTests.csproj
new file mode 100644
index 00000000..ca559711
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/ScheduleModelIcsTests/ScheduleModelIcsTests.csproj	
@@ -0,0 +1,55 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{B8D28F77-8509-4E7C-8C42-87323BF8ADDE}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>ScheduleModelIcsTests</RootNamespace>
+    <AssemblyName>ScheduleModelTests</AssemblyName>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="nunit.framework, Version=2.5.5.10112, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL" />
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="ImportTest.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\DotNetBar.csproj">
+      <Project>{12816180-9A18-4C4E-8C2C-6E9A25676190}</Project>
+      <Name>DotNetBar</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/ScrollBar/HScrollBarAdv.cs b/PROMS/DotNetBar Source Code/ScrollBar/HScrollBarAdv.cs
new file mode 100644
index 00000000..fda6b6a5
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/ScrollBar/HScrollBarAdv.cs	
@@ -0,0 +1,28 @@
+using System;
+using System.Text;
+using System.ComponentModel;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.ScrollBar
+{
+    [ToolboxItem(true), ToolboxBitmap(typeof(HScrollBarAdv), "ScrollBar.HScrollBarAdv.ico")]
+    public class HScrollBarAdv : ScrollBarAdv
+    {
+        #region Private Variables
+        #endregion
+
+        #region Events
+        #endregion
+
+        #region Constructor
+        #endregion
+
+        #region Internal Implementation
+        protected override bool IsVertical()
+        {
+            return false;
+        }
+        #endregion
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/ScrollBar/HScrollBarAdv.ico b/PROMS/DotNetBar Source Code/ScrollBar/HScrollBarAdv.ico
new file mode 100644
index 00000000..862fc080
Binary files /dev/null and b/PROMS/DotNetBar Source Code/ScrollBar/HScrollBarAdv.ico differ
diff --git a/PROMS/DotNetBar Source Code/ScrollBar/Office2007ScrollBarPainter.cs b/PROMS/DotNetBar Source Code/ScrollBar/Office2007ScrollBarPainter.cs
new file mode 100644
index 00000000..8de29bab
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/ScrollBar/Office2007ScrollBarPainter.cs	
@@ -0,0 +1,283 @@
+using System;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Text;
+using DevComponents.DotNetBar.Rendering;
+
+namespace DevComponents.DotNetBar.ScrollBar
+{
+    internal class Office2007ScrollBarPainter : ScrollBarPainter, IOffice2007Painter
+    {
+        #region Private Variables
+        private Office2007ColorTable m_ColorTable = null;
+        private bool m_AppStyleScrollBar = false;
+        private Presentation.ShapeBorder m_ThumbOuterBorder = new Presentation.ShapeBorder(1);
+        private Presentation.ShapeBorder m_ThumbInnerBorder = new Presentation.ShapeBorder(1);
+        private Presentation.ShapeFill m_ThumbInnerFill = new Presentation.ShapeFill();
+        private Presentation.ShapeFill m_ThumbSignFill = new Presentation.ShapeFill();
+        private Presentation.Shape m_ThumbShape = null;
+        private Presentation.ShapePath m_ThumbSignShape = null;
+        private Size m_ThumbSignSize = new Size(9, 5);
+
+        private Presentation.Shape m_TrackShape = null;
+        private Presentation.ShapeBorder m_TrackOuterBorder = new Presentation.ShapeBorder(1);
+        private Presentation.ShapeBorder m_TrackInnerBorder = new Presentation.ShapeBorder(1);
+        private Presentation.ShapeFill m_TrackInnerFill = new Presentation.ShapeFill();
+
+        private Presentation.Shape m_BackgroundShape = null;
+        private Presentation.ShapeBorder m_BackgroundBorder = new Presentation.ShapeBorder(1);
+        private Presentation.ShapeFill m_BackgroundFill = new Presentation.ShapeFill();
+        #endregion
+        
+        #region IOffice2007Painter Members
+
+        public DevComponents.DotNetBar.Rendering.Office2007ColorTable ColorTable
+        {
+            get
+            {
+                return m_ColorTable;
+            }
+            set
+            {
+                m_ColorTable = value;
+            }
+        }
+
+        #endregion
+
+        #region Internal Implemementation
+        public Office2007ScrollBarPainter()
+        {
+            m_ThumbShape = GetThumbShape();
+            m_TrackShape = GetTrackShape();
+            m_BackgroundShape = GetBackgroundShape();
+        }
+
+        public override void PaintThumb(System.Drawing.Graphics g, System.Drawing.Rectangle bounds, eScrollThumbPosition position, eScrollBarState state)
+        {
+            Office2007ScrollBarStateColorTable ct = GetColorTable(state);
+            if (ct == null) return;
+
+            // Initialize Colors
+            m_ThumbOuterBorder.Apply(ct.ThumbOuterBorder);
+            m_ThumbInnerBorder.Apply(ct.ThumbInnerBorder);
+            m_ThumbInnerFill.BackgroundColorBlend = ct.ThumbBackground;
+            m_ThumbSignFill.Apply(ct.ThumbSignBackground);
+
+            m_ThumbSignShape.Path = GetThumbSignPath(position);
+            m_ThumbShape.Paint(new Presentation.ShapePaintInfo(g, bounds));
+            m_ThumbSignShape.Path.Dispose();
+            m_ThumbSignShape.Path = null;
+        }
+
+        private Office2007ScrollBarStateColorTable GetColorTable(eScrollBarState state)
+        {
+            Office2007ScrollBarColorTable csb = m_AppStyleScrollBar ? m_ColorTable.AppScrollBar : m_ColorTable.ScrollBar;
+            if (state == eScrollBarState.Normal)
+                return csb.Default;
+            else if (state == eScrollBarState.Disabled)
+                return csb.Disabled;
+            else if (state == eScrollBarState.ControlMouseOver)
+                return csb.MouseOverControl;
+            else if (state == eScrollBarState.PartMouseOver)
+                return csb.MouseOver;
+            else if (state == eScrollBarState.Pressed)
+                return csb.Pressed;
+
+            return null;
+        }
+
+        public override void PaintTrackHorizontal(System.Drawing.Graphics g, System.Drawing.Rectangle bounds, eScrollBarState state)
+        {
+            Office2007ScrollBarStateColorTable ct = GetColorTable(state);
+            if (ct == null) return;
+
+            // Apply Colors...
+            m_TrackOuterBorder.Apply(ct.TrackOuterBorder);
+            m_TrackInnerBorder.Apply(ct.TrackInnerBorder);
+            m_TrackInnerFill.BackgroundColorBlend = ct.TrackBackground;
+            m_TrackInnerFill.GradientAngle = 90;
+
+            m_TrackShape.Paint(new Presentation.ShapePaintInfo(g, bounds));
+
+            if (bounds.Width > Dpi.Width10 && !ct.TrackSignBackground.Start.IsEmpty)
+            {
+                Rectangle r = new Rectangle(bounds.X + (bounds.Width - Dpi.Width7) / 2, bounds.Y + (bounds.Height - Dpi.Height8) / 2, Dpi.Width8, Dpi.Height8);
+                Pen penDark = new Pen(ct.TrackSignBackground.Start, Dpi.Width1);
+                Pen penLight = null;
+                if (!ct.TrackSignBackground.End.IsEmpty) penLight = new Pen(ct.TrackSignBackground.End, Dpi.Width1);
+                for (int i = 0; i < 4; i++)
+                {
+                    g.DrawLine(penDark, r.X, r.Y, r.X, r.Bottom);
+                    r.X+=Dpi.Width1;
+                    if (penLight != null)
+                        g.DrawLine(penLight, r.X, r.Y, r.X, r.Bottom);
+                    r.X += Dpi.Width1;
+                }
+                if (penDark != null) penDark.Dispose();
+                if (penLight != null) penLight.Dispose();
+            }
+        }
+
+        public override void PaintTrackVertical(System.Drawing.Graphics g, System.Drawing.Rectangle bounds, eScrollBarState state)
+        {
+            Office2007ScrollBarStateColorTable ct = GetColorTable(state);
+            if (ct == null) return;
+
+            // Apply Colors...
+            m_TrackOuterBorder.Apply(ct.TrackOuterBorder);
+            m_TrackInnerBorder.Apply(ct.TrackInnerBorder);
+            m_TrackInnerFill.BackgroundColorBlend = ct.TrackBackground;
+            m_TrackInnerFill.GradientAngle = 0;
+
+            m_TrackShape.Paint(new Presentation.ShapePaintInfo(g, bounds));
+
+            if (bounds.Height > Dpi.Height10 && !ct.TrackSignBackground.Start.IsEmpty)
+            {
+                Rectangle r = new Rectangle(bounds.X + (bounds.Width - Dpi.Width8) / 2, bounds.Y + (bounds.Height - Dpi.Height6) / 2, Dpi.Width8, Dpi.Height8);
+                Pen penDark = new Pen(ct.TrackSignBackground.Start, Dpi.Width1);
+                Pen penLight = null;
+                if (!ct.TrackSignBackground.End.IsEmpty) penLight = new Pen(ct.TrackSignBackground.End, Dpi.Width1);
+                for (int i = 0; i < 4; i++)
+                {
+                    g.DrawLine(penDark, r.X, r.Y, r.Right, r.Y);
+                    r.Y+=Dpi.Height1;
+                    if (penLight != null)
+                        g.DrawLine(penLight, r.X, r.Y, r.Right, r.Y);
+                    r.Y += Dpi.Height1;
+                }
+                if (penDark != null) penDark.Dispose();
+                if (penLight != null) penLight.Dispose();
+            }
+        }
+
+        public override void PaintBackground(Graphics g, Rectangle bounds, eScrollBarState state, bool horizontal, bool sideBorderOnly, bool rtl)
+        {
+            Office2007ScrollBarStateColorTable ct = GetColorTable(state);
+            if (ct == null) return;
+
+            // Apply Colors...
+            if (sideBorderOnly)
+                m_BackgroundBorder.Apply(null);
+            else
+                m_BackgroundBorder.Apply(ct.Border);
+
+            m_BackgroundFill.Apply(ct.Background);
+            m_BackgroundFill.GradientAngle = horizontal ? 90 : 0;
+
+            m_BackgroundShape.Paint(new Presentation.ShapePaintInfo(g, bounds));
+            if (sideBorderOnly && !ct.Border.Start.IsEmpty)
+            {
+                if (horizontal)
+                    DisplayHelp.DrawLine(g, bounds.X, bounds.Y, bounds.Right, bounds.Y, ct.Border.Start, 1);
+                else
+                {
+                    if (rtl)
+                        DisplayHelp.DrawLine(g, bounds.Right - 1, bounds.Y, bounds.Right - 1, bounds.Bottom, ct.Border.Start, 1);
+                    else
+                        DisplayHelp.DrawLine(g, 0, bounds.Y, 0, bounds.Bottom, ct.Border.Start, 1);
+                }
+            }
+        }
+
+        private Presentation.Shape GetBackgroundShape()
+        {
+            Presentation.Rectangle b = new Presentation.Rectangle();
+            b.Border = m_BackgroundBorder;
+            b.Fill = m_BackgroundFill;
+            b.Padding = new Presentation.PaddingInfo(1, 1, 1, 1);
+            return b;
+        }
+
+        private Presentation.Shape GetThumbShape()
+        {
+            Presentation.Rectangle thumb = new Presentation.Rectangle();
+            thumb.Border = m_ThumbOuterBorder;
+            thumb.Padding = new Presentation.PaddingInfo(1, 1, 1, 1);
+            Presentation.Rectangle innerRect = new Presentation.Rectangle();
+            innerRect.Padding = new Presentation.PaddingInfo(1, 1, 1, 1);
+            innerRect.Border = m_ThumbInnerBorder;
+            innerRect.Fill = m_ThumbInnerFill;
+            thumb.Children.Add(innerRect);
+
+
+            m_ThumbSignShape = new Presentation.ShapePath();
+            m_ThumbSignShape.Fill = m_ThumbSignFill;
+            innerRect.Children.Add(m_ThumbSignShape);
+
+            return thumb;
+        }
+
+        private Presentation.Shape GetTrackShape()
+        {
+            Presentation.Rectangle thumb = new Presentation.Rectangle();
+            thumb.CornerType = eCornerType.Rounded;
+            thumb.CornerSize = 1;
+            thumb.Border = m_TrackOuterBorder;
+            thumb.Padding = new Presentation.PaddingInfo(1, 1, 1, 1);
+            Presentation.Rectangle innerRect = new Presentation.Rectangle();
+            innerRect.Padding = new Presentation.PaddingInfo(1, 1, 1, 1);
+            innerRect.Border = m_TrackInnerBorder;
+            innerRect.Fill = m_TrackInnerFill;
+            thumb.Children.Add(innerRect);
+
+            return thumb;
+        }
+
+        private GraphicsPath GetThumbSignPath(eScrollThumbPosition pos)
+        {
+            GraphicsPath path = new GraphicsPath();
+            Size signSize = Dpi.Size(m_ThumbSignSize);
+
+            if (pos == eScrollThumbPosition.Left || pos == eScrollThumbPosition.Right)
+            {
+                int w = signSize.Width;
+                signSize.Width = signSize.Height;
+                signSize.Height = w;
+            }
+
+            if (pos == eScrollThumbPosition.Top)
+            {
+                path.AddPolygon(new PointF[] {new PointF(-1, signSize.Height), 
+                    new PointF(signSize.Width / 2 , -1), 
+                    new PointF(signSize.Width / 2, -1), new PointF(signSize.Width, signSize.Height), 
+                    new PointF(signSize.Width, signSize.Height), new PointF(-1, signSize.Height)});
+                path.CloseAllFigures();
+            }
+            else if (pos == eScrollThumbPosition.Bottom)
+            {
+                path.AddLine(signSize.Width / 2, signSize.Height + 1, signSize.Width, 1);
+                path.AddLine(signSize.Width, 1, 0, 1);
+                path.AddLine(0, 1, signSize.Width / 2, signSize.Height + 1);
+                path.CloseAllFigures();
+            }
+            else if (pos == eScrollThumbPosition.Left)
+            {
+                //signSize.Width++;
+                signSize.Height++;
+                int h2 = (int)(signSize.Height / 2);
+                path.AddLine(0, h2, signSize.Width, 0);
+                path.AddLine(signSize.Width, 0, signSize.Width, signSize.Height);
+                path.AddLine(signSize.Width, signSize.Height, 0, h2);
+                path.CloseAllFigures();
+            }
+            else if (pos == eScrollThumbPosition.Right)
+            {
+                signSize.Height++;
+                path.AddLine(signSize.Width, signSize.Height / 2, 0, 0);
+                path.AddLine(0, 0, 0, signSize.Height);
+                path.AddLine(0, signSize.Height, signSize.Width, signSize.Height / 2);
+                path.CloseAllFigures();
+            }
+
+            return path;
+        }
+
+        public bool AppStyleScrollBar
+        {
+            get { return m_AppStyleScrollBar; }
+            set { m_AppStyleScrollBar = value; }
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/ScrollBar/ScrollBarAdv.cs b/PROMS/DotNetBar Source Code/ScrollBar/ScrollBarAdv.cs
new file mode 100644
index 00000000..c2f14f6f
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/ScrollBar/ScrollBarAdv.cs	
@@ -0,0 +1,780 @@
+using System;
+using System.Text;
+using System.Windows.Forms;
+using System.ComponentModel;
+using DevComponents.DotNetBar.ScrollBar;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar
+{
+    [ToolboxItem(false), DefaultEvent("Scroll"), DefaultProperty("Value")]
+    public abstract class ScrollBarAdv : Control, ICommandSource
+    {
+        #region Private Variables
+        private ScrollBarCore _ScrollBar = null;
+        #endregion
+
+        #region Events
+        /// <summary>
+        /// Occurs when the Value property is changed, either by a Scroll event or programmatically.
+        /// </summary>
+        public event EventHandler ValueChanged;
+
+        /// <summary>
+        /// Occurs when the scroll box has been moved by either a mouse or keyboard action.
+        /// </summary>
+        public event ScrollEventHandler Scroll;
+        #endregion
+
+        #region Constructor
+        /// <summary>
+        /// Initializes a new instance of the ScrollBarAdv class.
+        /// </summary>
+        public ScrollBarAdv()
+        {
+            this.TabStop = false;
+            this.SetStyle(ControlStyles.UserPaint, true);
+            this.SetStyle(ControlStyles.AllPaintingInWmPaint, true);
+            this.SetStyle(ControlStyles.Opaque, true);
+            this.SetStyle(ControlStyles.ResizeRedraw, true);
+            this.SetStyle(DisplayHelp.DoubleBufferFlag, true);
+            this.SetStyle(ControlStyles.SupportsTransparentBackColor, false);
+            this.SetStyle(ControlStyles.ContainerControl, false);
+            this.SetStyle(ControlStyles.Selectable, true);
+            CreateScrollBarCore();
+            StyleManager.Register(this);
+        }
+        #endregion
+
+        #region Internal Implementation
+        /// <summary>
+        /// Called by StyleManager to notify control that style on manager has changed and that control should refresh its appearance if
+        /// its style is controlled by StyleManager.
+        /// </summary>
+        /// <param name="newStyle">New active style.</param>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void StyleManagerStyleChanged(eDotNetBarStyle newStyle)
+        {
+            if (_ScrollBar != null)
+                _ScrollBar.InvalidateScrollBar();
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            if (_ScrollBar != null)
+            {
+                _ScrollBar.ValueChanged -= new EventHandler(CoreValueChanged);
+                _ScrollBar.Scroll -= new ScrollEventHandler(CoreScroll);
+                _ScrollBar.Dispose();
+                _ScrollBar = null;
+            }
+            base.Dispose(disposing);
+        }
+
+        protected override void ScaleControl(SizeF factor, BoundsSpecified specified)
+        {
+            UpdateScaling(factor);
+            base.ScaleControl(factor, specified);
+        }
+
+        internal void UpdateScaling(SizeF factor)
+        {
+            if (Dpi.RecordScalePerControl)
+                Dpi.SetScaling(factor);
+            _ScrollBar.ScaleItem(factor);
+        }
+
+        protected override void OnEnabledChanged(EventArgs e)
+        {
+            _ScrollBar.Enabled = this.Enabled;
+            this.Refresh();
+            base.OnEnabledChanged(e);
+        }
+
+        /// <summary>
+        /// Gets whether scrollbar is vertical.
+        /// </summary>
+        /// <returns>true if scrollbar is vertical otherwise false for horizontal scrollbar</returns>
+        protected abstract bool IsVertical();
+
+        private void CreateScrollBarCore()
+        {
+            _ScrollBar = new ScrollBarCore(this, false);
+            _ScrollBar.Orientation = IsVertical() ? eOrientation.Vertical : eOrientation.Horizontal;
+            _ScrollBar.LargeChange = _LargeChange;
+            _ScrollBar.Maximum = _Maximum;
+            _ScrollBar.Minimum = _Minimum;
+            _ScrollBar.SmallChange = this.SmallChange;
+            _ScrollBar.Value = _Value;
+            _ScrollBar.ValueChanged += new EventHandler(CoreValueChanged);
+            _ScrollBar.Scroll += new ScrollEventHandler(CoreScroll);
+        }
+
+        private void CoreScroll(object sender, ScrollEventArgs e)
+        {
+            OnScroll(e);
+        }
+
+        private void CoreValueChanged(object sender, EventArgs e)
+        {
+            OnValueChanged(e);
+            ExecuteCommand();
+        }
+
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            if (_ScrollBar != null)
+            {
+                _ScrollBar.Paint(GetItemPaintArgs(e));
+            }
+            base.OnPaint(e);
+        }
+
+        private ItemPaintArgs GetItemPaintArgs(PaintEventArgs e)
+        {
+            ItemPaintArgs p = new ItemPaintArgs(null, this, e.Graphics, null);
+            return p;
+        }
+
+        protected override void OnMouseMove(MouseEventArgs e)
+        {
+            if (_ScrollBar != null) _ScrollBar.MouseMove(e);
+            base.OnMouseMove(e);
+        }
+
+        protected override void OnMouseDown(MouseEventArgs e)
+        {
+            if (this.TabStop && !this.Focused)
+            {
+                this.Select();
+            }
+            if (_ScrollBar != null) _ScrollBar.MouseDown(e);
+            base.OnMouseDown(e);
+        }
+
+        protected override void OnEnter(EventArgs e)
+        {
+            if (_ScrollBar != null) _ScrollBar.InvalidateScrollBar();
+            base.OnEnter(e);
+        }
+
+        protected override void OnLeave(EventArgs e)
+        {
+            if (_ScrollBar != null) _ScrollBar.InvalidateScrollBar();
+            base.OnLeave(e);
+        }
+
+        protected override void OnMouseUp(MouseEventArgs e)
+        {
+            if (_ScrollBar != null) _ScrollBar.MouseUp(e);
+            base.OnMouseUp(e);
+        }
+
+        protected override void OnMouseLeave(EventArgs e)
+        {
+            if (_ScrollBar != null) _ScrollBar.MouseLeave();
+            base.OnMouseLeave(e);
+        }
+
+        protected override void OnResize(EventArgs e)
+        {
+            if (_ScrollBar != null) _ScrollBar.DisplayRectangle = new System.Drawing.Rectangle(0, 0, this.Width, this.Height);
+            base.OnResize(e);
+        }
+
+        private int _LargeChange = 10;
+        /// <summary>
+        /// Gets or sets a value to be added to or subtracted from the <paramref name="Value">Value</paramref> property when the scroll box is moved a large distance.
+        /// <value>A numeric value. The default value is 10.</value>
+        /// <remarks>ArgumentOutOfRangeException is raised if assigned value is less than 0.  </remarks>
+        /// </summary>
+        [DefaultValue(10), Category("Behavior"), Description("Indicates value to be added to or subtracted from the Value property when the scroll box is moved a large distance")]
+        public int LargeChange
+        {
+            get { return _LargeChange; }
+            set
+            {
+                if (value < 0)
+                    throw new ArgumentOutOfRangeException();
+
+                if (_LargeChange != value)
+                {
+                    _LargeChange = value;
+                    if (_ScrollBar != null) _ScrollBar.LargeChange = _LargeChange;
+                }
+            }
+        }
+
+        private int _Maximum = 100;
+        /// <summary>
+        /// Gets or sets the upper limit of values of the scrollable range.
+        /// <value>A numeric value. The default value is 100.</value>
+        /// </summary>
+        [DefaultValue(100), Category("Behavior"), Description("Indicates upper limit of values of the scrollable range."), RefreshProperties(RefreshProperties.Repaint)]
+        public int Maximum
+        {
+            get { return _Maximum; }
+            set
+            {
+                if (_Maximum != value)
+                {
+                    _Maximum = value;
+                    if (_ScrollBar != null) _ScrollBar.Maximum = _Maximum;
+                }
+            }
+        }
+
+        private int _Minimum = 0;
+        /// <summary>
+        /// Gets or sets the lower limit of values of the scrollable range.
+        /// <value>A numeric value. The default value is 0.</value>
+        /// </summary>
+        [DefaultValue(0), Category("Behavior"), Description("Indicates lower limit of values of the scrollable range."), RefreshProperties(RefreshProperties.Repaint)]
+        public int Minimum
+        {
+            get { return _Minimum; }
+            set
+            {
+                if (_Minimum != value)
+                {
+                    _Minimum = value;
+                    if (_ScrollBar != null) _ScrollBar.Minimum = _Minimum;
+                }
+            }
+        }
+
+        private int _SmallChange = 1;
+        /// <summary>
+        /// Gets or sets the value to be added to or subtracted from the <paramref name="Value">Value</paramref> property when the scroll box is moved a small distance.
+        /// <value>A numeric value. The default value is 1.</value>
+        /// <remarks>ArgumentOutOfRangeException is raised if assigned value is less than 0.  </remarks>
+        /// </summary>
+        [DefaultValue(1), Category("Behavior"), Description("Indicates value to be added to or subtracted from the Value property when the scroll box is moved a small distance.")]
+        public int SmallChange
+        {
+            get
+            {
+                return Math.Min(_SmallChange, _LargeChange);
+            }
+            set
+            {
+                if (value < 0)
+                    throw new ArgumentOutOfRangeException();
+
+                if (_SmallChange != value)
+                {
+                    _SmallChange = value;
+
+                    if (_ScrollBar != null)
+                        _ScrollBar.SmallChange = this.SmallChange;
+                }
+            }
+        }
+
+        private int _Value = 0;
+        /// <summary>
+        /// Gets or sets a numeric value that represents the current position of the scroll box on the scroll bar control.
+        /// <value>A numeric value that is within the Minimum and Maximum range. The default value is 0.</value>
+        /// <remarks>ArgumentOutOfRangeException is raised if assigned value is less than the Minimum property value or assigned value is greater than the Maximum property value.</remarks>
+        /// </summary>
+        [DefaultValue(0), Category("Behavior"), Description("Indicates numeric value that represents the current position of the scroll box on the scroll bar control"), RefreshProperties(RefreshProperties.Repaint)]
+        public int Value
+        {
+            get { if (_ScrollBar != null) return _ScrollBar.Value; else return 0; }
+            set
+            {
+                if (value < Minimum)
+                    throw new ArgumentOutOfRangeException("Value must be greater or equal than Minimum property value.");
+                if(value>Maximum)
+                    throw new ArgumentOutOfRangeException("Value must be less or equal than Maximum property value.");
+                if (_ScrollBar != null) _ScrollBar.Value = value;
+            }
+        }
+
+        internal void DoScroll(int newValue, ScrollEventType eventType)
+        {
+            int oldValue = this.Value;
+            this.Value = newValue;
+#if FRAMEWORK20
+            OnScroll(new ScrollEventArgs(eventType, oldValue, newValue, _ScrollBar.Orientation == eOrientation.Vertical ? ScrollOrientation.VerticalScroll : ScrollOrientation.HorizontalScroll));
+#else
+            OnScroll(new ScrollEventArgs(eventType, newValue));
+#endif
+        }
+
+        /// <summary>
+        /// Raises the Scroll event.
+        /// </summary>
+        /// <param name="e">Provides Event arguments.</param>
+        protected virtual void OnScroll(ScrollEventArgs e)
+        {
+            ScrollEventHandler h = this.Scroll;
+            if (h != null)
+                h(this, e);
+        }
+
+        /// <summary>
+        /// Raises the ValueChanged event.
+        /// </summary>
+        /// <param name="e">Provides Event arguments.</param>
+        protected virtual void OnValueChanged(EventArgs e)
+        {
+            EventHandler h = this.ValueChanged;
+            if (h != null)
+                h(this, e);
+        }
+
+        private eScrollBarAppearance _Appearance = eScrollBarAppearance.Default;
+        /// <summary>
+        /// Gets or sets the scroll bar appearance style.
+        /// </summary>
+        [DefaultValue(eScrollBarAppearance.Default), Category("Appearance"), Description("Indicates scroll bar appearance style."), RefreshProperties(RefreshProperties.Repaint)]
+        public eScrollBarAppearance Appearance
+        {
+            get { return _Appearance; }
+            set
+            {
+                if (_Appearance != value)
+                {
+                    _Appearance = value;
+                    OnAppearanceChanged();
+                }
+            }
+        }
+
+        private void OnAppearanceChanged()
+        {
+            if (_ScrollBar != null)
+            {
+                if (_Appearance == eScrollBarAppearance.Default)
+                    _ScrollBar.IsAppScrollBarStyle = false;
+                else
+                    _ScrollBar.IsAppScrollBarStyle = true;
+            }
+            this.Invalidate();
+        }
+
+        protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
+        {
+            if (_ScrollBar!=null)
+                return _ScrollBar.ProcessCmdKey(ref msg, keyData);
+            return base.ProcessCmdKey(ref msg, keyData);
+        }
+        #endregion
+
+        #region Property Hiding
+#if FRAMEWORK20
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), EditorBrowsable(EditorBrowsableState.Never), Browsable(false)]
+        public override bool AutoSize
+        {
+            get
+            {
+                return base.AutoSize;
+            }
+            set
+            {
+                base.AutoSize = value;
+            }
+        }
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public new event EventHandler AutoSizeChanged
+        {
+            add
+            {
+                base.AutoSizeChanged += value;
+            }
+            remove
+            {
+                base.AutoSizeChanged -= value;
+            }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never), Browsable(false)]
+        public new event MouseEventHandler MouseClick
+        {
+            add
+            {
+                base.MouseClick += value;
+            }
+            remove
+            {
+                base.MouseClick -= value;
+            }
+        }
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public new event MouseEventHandler MouseDoubleClick
+        {
+            add
+            {
+                base.MouseDoubleClick += value;
+            }
+            remove
+            {
+                base.MouseDoubleClick -= value;
+            }
+        }
+#endif
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public override Color BackColor
+        {
+            get
+            {
+                return base.BackColor;
+            }
+            set
+            {
+                base.BackColor = value;
+            }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never), Browsable(false)]
+        public new event EventHandler BackColorChanged
+        {
+            add
+            {
+                base.BackColorChanged += value;
+            }
+            remove
+            {
+                base.BackColorChanged -= value;
+            }
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never), Browsable(false)]
+        public override Image BackgroundImage
+        {
+            get
+            {
+                return base.BackgroundImage;
+            }
+            set
+            {
+                base.BackgroundImage = value;
+            }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never), Browsable(false)]
+        public new event EventHandler BackgroundImageChanged
+        {
+            add
+            {
+                base.BackgroundImageChanged += value;
+            }
+            remove
+            {
+                base.BackgroundImageChanged -= value;
+            }
+        }
+#if FRAMEWORK20
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public override ImageLayout BackgroundImageLayout
+        {
+            get
+            {
+                return base.BackgroundImageLayout;
+            }
+            set
+            {
+                base.BackgroundImageLayout = value;
+            }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never), Browsable(false)]
+        public new event EventHandler BackgroundImageLayoutChanged
+        {
+            add
+            {
+                base.BackgroundImageLayoutChanged += value;
+            }
+            remove
+            {
+                base.BackgroundImageLayoutChanged -= value;
+            }
+        }
+#endif
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public override Font Font
+        {
+            get
+            {
+                return base.Font;
+            }
+            set
+            {
+                base.Font = value;
+            }
+        }
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public override Color ForeColor
+        {
+            get
+            {
+                return base.ForeColor;
+            }
+            set
+            {
+                base.ForeColor = value;
+            }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never), Browsable(false)]
+        public new ImeMode ImeMode
+        {
+            get
+            {
+                return base.ImeMode;
+            }
+            set
+            {
+                base.ImeMode = value;
+            }
+        }
+
+        [DefaultValue(false)]
+        public new bool TabStop
+        {
+            get
+            {
+                return base.TabStop;
+            }
+            set
+            {
+                base.TabStop = value;
+            }
+        }
+
+        [Bindable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), EditorBrowsable(EditorBrowsableState.Never), Browsable(false)]
+        public override string Text
+        {
+            get
+            {
+                return base.Text;
+            }
+            set
+            {
+                base.Text = value;
+            }
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never), Browsable(false)]
+        public new event EventHandler Click
+        {
+            add
+            {
+                base.Click += value;
+            }
+            remove
+            {
+                base.Click -= value;
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public new event EventHandler DoubleClick
+        {
+            add
+            {
+                base.DoubleClick += value;
+            }
+            remove
+            {
+                base.DoubleClick -= value;
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public new event EventHandler FontChanged
+        {
+            add
+            {
+                base.FontChanged += value;
+            }
+            remove
+            {
+                base.FontChanged -= value;
+            }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never), Browsable(false)]
+        public new event EventHandler ForeColorChanged
+        {
+            add
+            {
+                base.ForeColorChanged += value;
+            }
+            remove
+            {
+                base.ForeColorChanged -= value;
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public new event EventHandler ImeModeChanged
+        {
+            add
+            {
+                base.ImeModeChanged += value;
+            }
+            remove
+            {
+                base.ImeModeChanged -= value;
+            }
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never), Browsable(false)]
+        public new event MouseEventHandler MouseDown
+        {
+            add
+            {
+                base.MouseDown += value;
+            }
+            remove
+            {
+                base.MouseDown -= value;
+            }
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never), Browsable(false)]
+        public new event MouseEventHandler MouseMove
+        {
+            add
+            {
+                base.MouseMove += value;
+            }
+            remove
+            {
+                base.MouseMove -= value;
+            }
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never), Browsable(false)]
+        public new event MouseEventHandler MouseUp
+        {
+            add
+            {
+                base.MouseUp += value;
+            }
+            remove
+            {
+                base.MouseUp -= value;
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public new event PaintEventHandler Paint
+        {
+            add
+            {
+                base.Paint += value;
+            }
+            remove
+            {
+                base.Paint -= value;
+            }
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never), Browsable(false)]
+        public new event EventHandler TextChanged
+        {
+            add
+            {
+                base.TextChanged += value;
+            }
+            remove
+            {
+                base.TextChanged -= value;
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public override RightToLeft RightToLeft
+        {
+            get
+            {
+                return RightToLeft.No;
+            }
+            set
+            {
+            }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never), Browsable(false)]
+        public event EventHandler RightToLeftChanged
+        {
+            add
+            {
+                base.RightToLeftChanged += value;
+            }
+            remove
+            {
+                base.RightToLeftChanged -= value;
+            }
+        }
+        #endregion
+
+        #region ICommandSource Members
+        protected virtual void ExecuteCommand()
+        {
+            if (_Command == null) return;
+            CommandManager.ExecuteCommand(this);
+        }
+
+        /// <summary>
+        /// Gets or sets the command assigned to the item. Default value is null.
+        /// <remarks>Note that if this property is set to null Enabled property will be set to false automatically to disable the item.</remarks>
+        /// </summary>
+        [DefaultValue(null), Category("Commands"), Description("Indicates the command assigned to the item.")]
+        public Command Command
+        {
+            get { return (Command)((ICommandSource)this).Command; }
+            set
+            {
+                ((ICommandSource)this).Command = value;
+            }
+        }
+
+        private ICommand _Command = null;
+        //[Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        ICommand ICommandSource.Command
+        {
+            get
+            {
+                return _Command;
+            }
+            set
+            {
+                bool changed = false;
+                if (_Command != value)
+                    changed = true;
+
+                if (_Command != null)
+                    CommandManager.UnRegisterCommandSource(this, _Command);
+                _Command = value;
+                if (value != null)
+                    CommandManager.RegisterCommand(this, value);
+                if (changed)
+                    OnCommandChanged();
+            }
+        }
+
+        /// <summary>
+        /// Called when Command property value changes.
+        /// </summary>
+        protected virtual void OnCommandChanged()
+        {
+        }
+
+        private object _CommandParameter = null;
+        /// <summary>
+        /// Gets or sets user defined data value that can be passed to the command when it is executed.
+        /// </summary>
+        [Browsable(true), DefaultValue(null), Category("Commands"), Description("Indicates user defined data value that can be passed to the command when it is executed."), System.ComponentModel.TypeConverter(typeof(System.ComponentModel.StringConverter)), System.ComponentModel.Localizable(true)]
+        public object CommandParameter
+        {
+            get
+            {
+                return _CommandParameter;
+            }
+            set
+            {
+                _CommandParameter = value;
+            }
+        }
+
+        #endregion
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/ScrollBar/ScrollBarCore.cs b/PROMS/DotNetBar Source Code/ScrollBar/ScrollBarCore.cs
new file mode 100644
index 00000000..a2f32160
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/ScrollBar/ScrollBarCore.cs	
@@ -0,0 +1,802 @@
+using System;
+using System.Text;
+using System.Windows.Forms;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.ScrollBar
+{
+    public class ScrollBarCore : IDisposable
+    {
+        #region Private Variables
+        private Rectangle m_DisplayRectangle = Rectangle.Empty;
+        private eOrientation m_Orientation = eOrientation.Vertical;
+
+        // Default thumb sizes...
+        private Size m_VThumbSize = new Size(Dpi.Width15, Dpi.Height17);
+        private Size m_HThumbSize = new Size(Dpi.Width17, Dpi.Height15);
+        private Rectangle m_ThumbDecrease = Rectangle.Empty;
+        private Rectangle m_ThumbIncrease = Rectangle.Empty;
+        private Rectangle m_Track = Rectangle.Empty;
+        private eScrollPart m_MouseOverPart = eScrollPart.None;
+
+        private Control m_ParentControl = null;
+        private bool m_MouseDown = false;
+        private Timer m_ClickTimer = null;
+        private int m_MouseDownTrackOffset = 0;
+        private Bitmap m_CashedView = null;
+        private bool m_ViewExpired = true;
+        private bool m_PassiveScrollBar = false;
+        private bool m_IsAppScrollBarStyle = false;
+        public event EventHandler ValueChanged;
+        private bool m_IsScrollBarParent = false;
+        private bool m_IsAdvScrollBar = false;
+        private int m_AutoClickCount = 0;
+        public event ScrollEventHandler Scroll;
+        #endregion
+
+        #region Internal Implementation
+        public ScrollBarCore() : this(null) { }
+
+        public ScrollBarCore(Control parentControl) : this(parentControl, false) { }
+
+        public ScrollBarCore(Control parentControl, bool isPassive)
+        {
+            m_ParentControl = parentControl;
+            m_IsScrollBarParent = m_ParentControl is System.Windows.Forms.ScrollBar || m_ParentControl is ScrollBarAdv;
+            m_IsAdvScrollBar = m_ParentControl is ScrollBarAdv;
+            m_PassiveScrollBar = isPassive;
+            DisposeCashedView();
+        }
+
+        internal void DisposeCashedView()
+        {
+            if (m_CashedView != null)
+            {
+                m_CashedView.Dispose();
+                m_CashedView = null;
+            }
+        }
+
+        private ScrollBarPainter GetScrollBarPainter()
+        {
+            ScrollBarPainter scp = null;
+            if (StyleManager.IsMetro(StyleManager.Style))
+            {
+                DevComponents.DotNetBar.Metro.Rendering.MetroScrollBarPainter painter = new DevComponents.DotNetBar.Metro.Rendering.MetroScrollBarPainter();
+                painter.ColorTable = ((Rendering.Office2007Renderer)Rendering.GlobalManager.Renderer).ColorTable;
+                painter.AppStyleScrollBar = m_IsAppScrollBarStyle;
+                scp = painter;
+            }
+            else
+            {
+                Office2007ScrollBarPainter painter = new Office2007ScrollBarPainter();
+                painter.ColorTable = ((Rendering.Office2007Renderer)Rendering.GlobalManager.Renderer).ColorTable;
+                painter.AppStyleScrollBar = m_IsAppScrollBarStyle;
+                scp = painter;
+            }
+            return scp;
+        }
+
+        private bool _IsPainting = false;
+        public void Paint(ItemPaintArgs p)
+        {
+            if (_IsPainting) return;
+
+            _IsPainting = true;
+            try
+            {
+                if (m_DisplayRectangle.IsEmpty || m_DisplayRectangle.Width <= 0 || m_DisplayRectangle.Height <= 0 || p.Graphics == null) return;
+
+                ScrollBarPainter painter = GetScrollBarPainter();
+
+                if (m_CashedView == null)
+                {
+                    try
+                    {
+                        m_CashedView = new Bitmap(m_DisplayRectangle.Width, m_DisplayRectangle.Height, p.Graphics);
+                    }
+                    catch
+                    {
+                        return;
+                    }
+                    m_CashedView.MakeTransparent();
+                    m_ViewExpired = true;
+                }
+
+                if (!m_ViewExpired)
+                {
+                    Bitmap cachedView = m_CashedView;
+                    if (cachedView != null)
+                        p.Graphics.DrawImageUnscaled(cachedView, m_DisplayRectangle.Location);
+                    return;
+                }
+
+                using (Graphics g = Graphics.FromImage(m_CashedView))
+                {
+                    if (!m_DisplayRectangle.Location.IsEmpty)
+                        g.TranslateTransform(-m_DisplayRectangle.X, -m_DisplayRectangle.Y);
+                    eScrollBarState state = m_Enabled ? eScrollBarState.Normal : eScrollBarState.Disabled;
+                    if (m_Enabled && (m_MouseOverPart != eScrollPart.None || IsFocused)) state = eScrollBarState.ControlMouseOver;
+                    bool rtl = false;
+                    if (m_ParentControl != null) rtl = m_ParentControl.RightToLeft == RightToLeft.Yes;
+                    painter.PaintBackground(g, m_DisplayRectangle, state, m_Orientation == eOrientation.Horizontal, m_SideBorderOnly, rtl);
+
+                    eScrollThumbPosition tp = eScrollThumbPosition.Top;
+                    if (m_Orientation == eOrientation.Horizontal) tp = eScrollThumbPosition.Left;
+                    if (m_MouseOverPart == eScrollPart.ThumbDecrease && m_Enabled)
+                    {
+                        if (m_MouseDown)
+                            state = eScrollBarState.Pressed;
+                        else
+                            state = eScrollBarState.PartMouseOver;
+                    }
+                    painter.PaintThumb(g, m_ThumbDecrease, tp, state);
+
+                    tp = eScrollThumbPosition.Bottom;
+                    if (m_MouseOverPart == eScrollPart.ThumbIncrease && m_Enabled)
+                    {
+                        if (m_MouseDown)
+                            state = eScrollBarState.Pressed;
+                        else
+                            state = eScrollBarState.PartMouseOver;
+                    }
+                    else if (m_MouseOverPart != eScrollPart.None && m_Enabled)
+                        state = eScrollBarState.ControlMouseOver;
+
+                    if (m_Orientation == eOrientation.Horizontal) tp = eScrollThumbPosition.Right;
+                    painter.PaintThumb(g, m_ThumbIncrease, tp, state);
+
+                    if (m_MouseOverPart == eScrollPart.Track && m_Enabled)
+                    {
+                        if (m_MouseDown)
+                            state = eScrollBarState.Pressed;
+                        else
+                            state = eScrollBarState.PartMouseOver;
+                    }
+                    else if ((m_MouseOverPart != eScrollPart.None || this.IsFocused) && m_Enabled)
+                        state = eScrollBarState.ControlMouseOver;
+                    if (m_Orientation == eOrientation.Horizontal)
+                        painter.PaintTrackHorizontal(g, m_Track, state);
+                    else
+                        painter.PaintTrackVertical(g, m_Track, state);
+                }
+
+                p.Graphics.DrawImageUnscaled(m_CashedView, m_DisplayRectangle.Location);
+                m_ViewExpired = false;
+            }
+            finally
+            {
+                _IsPainting = false;
+            }
+        }
+
+        private bool IsFocused
+        {
+            get
+            {
+                if (m_IsAdvScrollBar && m_ParentControl.Focused)
+                    return true;
+
+                return false;
+            }
+        }
+
+        public void MouseMove(MouseEventArgs e)
+        {
+            if (!m_Enabled)
+                return;
+
+            Point p = new Point(e.X, e.Y);
+            if (m_MouseDown && m_MouseOverPart == eScrollPart.Track)
+            {
+                if (!m_PassiveScrollBar)
+                {
+                    // Update Track position based on mouse position...
+                    int i = ValueFromMouseCoordinates(p);
+                    SetValue(i, ScrollEventType.ThumbTrack);
+                    //this.Value = i;
+                }
+                return;
+            }
+
+            if (e.Button != MouseButtons.None && m_MouseOverPart!=eScrollPart.None) return;
+
+            if (m_DisplayRectangle.Contains(p))
+            {
+                eScrollPart part = eScrollPart.Control;
+                if (m_ThumbDecrease.Contains(p))
+                    part = eScrollPart.ThumbDecrease;
+                else if (m_ThumbIncrease.Contains(p))
+                    part = eScrollPart.ThumbIncrease;
+                else if (m_Track.Contains(p))
+                    part = eScrollPart.Track;
+
+                if (m_MouseOverPart != part)
+                {
+                    m_MouseOverPart = part;
+                    this.Invalidate();
+                }
+            }
+            else if (m_MouseOverPart != eScrollPart.None)
+            {
+                m_MouseOverPart = eScrollPart.None;
+                this.Invalidate();
+            }
+        }
+
+        private int ValueFromMouseCoordinates(Point p)
+        {
+            if (m_Orientation == eOrientation.Vertical)
+            {
+                int trackY = p.Y - m_MouseDownTrackOffset;
+                trackY = Math.Max(trackY, m_ThumbDecrease.Bottom);
+                trackY = Math.Min(trackY, m_ThumbIncrease.Y - GetTrackSize());
+                trackY -= m_ThumbDecrease.Bottom;
+
+                int totalSize = GetAvailableTrackArea() - GetTrackSize();
+                return (int)((this.GetMaximumValue() - this.Minimum) * ((float)trackY / (float)totalSize));
+            }
+            else
+            {
+                int trackX = p.X - m_MouseDownTrackOffset;
+                trackX = Math.Max(trackX, m_ThumbDecrease.Right);
+                trackX = Math.Min(trackX, m_ThumbIncrease.X - GetTrackSize());
+                trackX -= m_ThumbDecrease.Right;
+
+                int totalSize = GetAvailableTrackArea() - GetTrackSize();
+                return (int)((this.GetMaximumValue() - this.Minimum) * ((float)trackX / (float)totalSize));
+            }
+        }
+
+        public void MouseLeave()
+        {
+            if (m_MouseOverPart != eScrollPart.None)
+            {
+                if (m_MouseDown && (m_MouseOverPart == eScrollPart.Track || m_MouseOverPart != eScrollPart.None && m_PassiveScrollBar))
+                    return;
+                m_MouseOverPart = eScrollPart.None;
+                this.Invalidate();
+            }
+        }
+
+        public void MouseDown(MouseEventArgs e)
+        {
+            if (m_MouseOverPart != eScrollPart.None)
+            {
+                m_MouseDown = true;
+                if (m_PassiveScrollBar)
+                {
+                    m_ViewExpired = true;
+                    return;
+                }
+
+                if(m_Orientation == eOrientation.Vertical)
+                    m_MouseDownTrackOffset = e.Y - m_Track.Y;
+                else
+                    m_MouseDownTrackOffset = e.X - m_Track.X;
+
+                if (m_MouseOverPart == eScrollPart.ThumbDecrease)
+                    SetValue(this.Value - m_SmallChange, ScrollEventType.SmallDecrement);
+                else if (m_MouseOverPart == eScrollPart.ThumbIncrease)
+                    SetValue(this.Value + m_SmallChange, ScrollEventType.SmallIncrement);
+                else if (m_MouseOverPart == eScrollPart.Track)
+                {
+                    this.Invalidate();
+                    if (m_ParentControl != null)
+                        m_ParentControl.Capture = true;
+                }
+                else if (m_MouseOverPart == eScrollPart.Control)
+                {
+                    MousePageDown(new Point(e.X, e.Y));
+                }
+
+                SetupClickTimer();
+            }
+        }
+
+        private void MousePageDown(Point p)
+        {
+            if (m_Orientation == eOrientation.Vertical && (p.Y<m_Track.Y || p.Y>m_Track.Bottom) || 
+                m_Orientation == eOrientation.Horizontal && (p.X<m_Track.X || p.X>m_Track.Right))
+            {
+                if (m_Orientation == eOrientation.Vertical && m_Track.Y > p.Y || m_Orientation == eOrientation.Horizontal && m_Track.X > p.X)
+                    SetValue(this.Value - this.LargeChange, ScrollEventType.LargeDecrement);
+                else
+                {
+                    if (m_IsScrollBarParent)
+                    {
+                        if (this.Value + this.LargeChange > this.GetMaximumValue())
+                        {
+                            SetValue(this.GetMaximumValue(), ScrollEventType.LargeIncrement);
+                        }
+                        else
+                            SetValue(this.Value + this.LargeChange, ScrollEventType.LargeIncrement);
+                    }
+                    else
+                        SetValue(this.Value + this.LargeChange, ScrollEventType.LargeIncrement);
+                }
+            }
+        }
+
+        public bool IsMouseDown
+        {
+            get { return m_MouseDown; }
+        }
+
+        public void MouseUp(MouseEventArgs e)
+        {
+            if (m_ParentControl != null && m_ParentControl.Capture)
+                m_ParentControl.Capture = false;
+
+            if(m_MouseDown)
+            {
+                if (m_MouseOverPart != eScrollPart.None && _RaiseEndScroll)
+                {
+#if FRAMEWORK20
+                    if(m_MouseOverPart == eScrollPart.Track)
+                        OnScroll(new ScrollEventArgs(ScrollEventType.ThumbPosition, this.Value, this.Value, this.ScrollOrientation));
+                    OnScroll(new ScrollEventArgs(ScrollEventType.EndScroll, this.Value, this.Value, this.ScrollOrientation));
+#else
+					if(m_MouseOverPart == eScrollPart.Track)
+						OnScroll(new ScrollEventArgs(ScrollEventType.ThumbPosition, this.Value));
+					OnScroll(new ScrollEventArgs(ScrollEventType.EndScroll, this.Value));
+#endif
+                    _RaiseEndScroll = false;
+                }
+                DisposeTimer();
+                m_MouseDown = false;
+                this.Invalidate();
+            }
+
+            if (!this.DisplayRectangle.Contains(e.X, e.Y))
+                MouseLeave();
+        }
+
+        private ScrollOrientation ScrollOrientation
+        {
+            get
+            {
+                return this.Orientation == eOrientation.Horizontal ? ScrollOrientation.HorizontalScroll : ScrollOrientation.VerticalScroll;
+            }
+        }
+
+        private void DisposeTimer()
+        {
+            Timer clickTimer = m_ClickTimer;
+            m_ClickTimer = null;
+            if (clickTimer != null)
+            {
+                clickTimer.Enabled = false;
+                clickTimer.Tick -= new EventHandler(ClickTimer_Tick);
+                clickTimer.Dispose();
+            }
+        }
+
+        private void SetupClickTimer()
+        {
+            if (m_ClickTimer != null) return;
+            m_AutoClickCount = 0;
+            m_ClickTimer = new Timer();
+            m_ClickTimer.Interval = 100;
+            m_ClickTimer.Tick += new EventHandler(ClickTimer_Tick);
+            m_ClickTimer.Enabled = true;
+        }
+
+        private void ClickTimer_Tick(object sender, EventArgs e)
+        {
+            Control parentControl = m_ParentControl;
+            if (m_MouseDown && m_MouseOverPart == eScrollPart.ThumbDecrease)
+            {
+                SetValue(this.Value - m_SmallChange, ScrollEventType.SmallDecrement);
+            }
+            else if (m_MouseDown && m_MouseOverPart == eScrollPart.ThumbIncrease)
+            {
+                SetValue(this.Value + m_SmallChange, ScrollEventType.SmallIncrement);
+            }
+            else if (m_MouseDown && m_MouseOverPart == eScrollPart.Control && parentControl != null)
+            {
+                Point p = parentControl.PointToClient(Control.MousePosition);
+                if (m_Track.Contains(p))
+                {
+                    DisposeTimer();
+                    m_MouseDown = false;
+                }
+                else
+                    MousePageDown(p);
+            }
+            m_AutoClickCount++;
+            if (m_AutoClickCount > 4 && m_ClickTimer != null && m_ClickTimer.Interval > 20)
+            {
+                m_ClickTimer.Interval -= 10;
+            }
+        }
+
+        private void Invalidate()
+        {
+            m_ViewExpired = true;
+            Control parentControl = m_ParentControl;
+            if (parentControl != null && !m_PassiveScrollBar)
+            {
+                parentControl.Invalidate(m_DisplayRectangle);
+                parentControl.Update();
+            }
+        }
+
+        private bool m_HasBorder = true;
+        internal bool HasBorder
+        {
+            get { return m_HasBorder; }
+            set { m_HasBorder = value; }
+        }
+
+        private bool m_SideBorderOnly = false;
+        internal bool SideBorderOnly
+        {
+            get { return m_SideBorderOnly; }
+            set { m_SideBorderOnly = value; }
+        }
+
+        private void UpdateLayout()
+        {
+            if (m_PassiveScrollBar)
+                return;
+
+            Rectangle r = m_DisplayRectangle;
+            if(m_HasBorder)
+                r.Inflate(-1, -1);
+
+            if (m_Orientation == eOrientation.Vertical)
+            {
+                m_ThumbDecrease = new Rectangle(r.X, r.Y, r.Width, m_VThumbSize.Height);
+                m_ThumbIncrease = new Rectangle(r.X, r.Bottom - m_VThumbSize.Height, r.Width, m_VThumbSize.Height);
+                int i = GetTrackSize();
+                m_Track = new Rectangle(r.X, r.Y + GetTrackPosition(), r.Width, i);
+            }
+            else
+            {
+                m_ThumbDecrease = new Rectangle(r.X, r.Y, m_HThumbSize.Width, r.Height);
+                m_ThumbIncrease = new Rectangle(r.Right - m_HThumbSize.Width, r.Y, m_HThumbSize.Width, r.Height);
+                int i = GetTrackSize();
+                m_Track = new Rectangle(r.X + GetTrackPosition(), r.Y, i, r.Height);
+
+            }
+            if(!(m_ParentControl is System.Windows.Forms.ScrollBar))
+                this.Invalidate();
+        }
+
+        public virtual void ScaleItem(SizeF factor)
+        {
+            m_VThumbSize = new Size(Dpi.Width15, Dpi.Height17);
+            m_HThumbSize = new Size(Dpi.Width17, Dpi.Height15);
+        }
+
+        private int GetTrackSize()
+        {
+            int i = 0;
+            int size = GetAvailableTrackArea();
+            //Rectangle r = m_DisplayRectangle;
+            //r.Inflate(-1, -1);
+
+            i = (int)(size * ((float)m_LargeChange / (float)(m_Maximum - m_Minimum + 1)));
+            //i = (int)(size / ((float)m_Maximum / (float)m_LargeChange));
+            //if (m_Orientation == eOrientation.Horizontal)
+            //{
+            //    i = (int)(r.Width * ((float)m_LargeChange / (float)m_Maximum));
+            //}
+            //else
+            //{
+            //    i = (int)(r.Height * ((float)m_LargeChange / (float)m_Maximum));
+            //}
+            i = Math.Max(14, i);
+            i = Math.Min(i, size);
+
+            return i;
+        }
+
+        private int GetAvailableTrackArea()
+        {
+            Rectangle r = m_DisplayRectangle;
+            if(m_HasBorder)
+                r.Inflate(-1, -1);
+
+            int size = r.Height;
+
+            if (m_Orientation == eOrientation.Horizontal)
+            {
+                size = r.Width - m_HThumbSize.Width * 2;
+            }
+            else
+            {
+                size -= m_VThumbSize.Height * 2;
+            }
+
+            return Math.Max(size, 8);
+        }
+
+        private int GetTrackPosition()
+        {
+            int trackSize = GetTrackSize();
+            int totalSize = GetAvailableTrackArea() - trackSize;
+            int i = Math.Min(totalSize, Math.Max((int)(totalSize * ((float)m_Value / (float)GetMaximumValue())), 0));
+            if (m_Orientation == eOrientation.Vertical)
+                i += m_VThumbSize.Height;
+            else
+                i += m_HThumbSize.Width;
+            return i;
+        }
+
+        public Rectangle ThumbDecreaseRectangle
+        {
+            get { return m_ThumbDecrease; }
+            set
+            {
+                m_ThumbDecrease = value;
+                DisposeCashedView();
+            }
+        }
+
+        public Rectangle ThumbIncreaseRectangle
+        {
+            get { return m_ThumbIncrease; }
+            set
+            {
+                m_ThumbIncrease = value;
+                DisposeCashedView();
+            }
+        }
+
+        public Rectangle TrackRectangle
+        {
+            get { return m_Track; }
+            set
+            {
+                m_Track = value;
+                DisposeCashedView();
+            }
+        }
+
+        public Rectangle DisplayRectangle
+        {
+            get { return m_DisplayRectangle; }
+            set
+            {
+                m_DisplayRectangle = value;
+                DisposeCashedView();
+                UpdateLayout();
+            }
+        }
+
+        public eOrientation Orientation
+        {
+            get { return m_Orientation; }
+            set
+            { 
+                m_Orientation = value;
+                DisposeCashedView();
+            }
+        }
+
+        private int m_Minimum = 0;
+        public int Minimum
+        {
+            get { return m_Minimum; }
+            set 
+            {
+                m_Minimum = value;
+                DisposeCashedView();
+                UpdateLayout();
+            }
+        }
+
+        private int m_Maximum = 0;
+        public int Maximum
+        {
+            get { return m_Maximum; }
+            set
+            {
+                m_Maximum = value;
+                DisposeCashedView();
+                UpdateLayout();
+            }
+        }
+
+        private int m_SmallChange = 1;
+        public int SmallChange
+        {
+            get { return m_SmallChange; }
+            set { m_SmallChange = value; }
+        }
+
+        private int m_LargeChange = 16;
+        public int LargeChange
+        {
+            get { return m_LargeChange; }
+            set
+            {
+                m_LargeChange = value;
+                DisposeCashedView();
+                UpdateLayout();
+            }
+        }
+
+        private int m_Value = 0;
+        public int Value
+        {
+            get { return m_Value; }
+            set
+            {
+                value = NormalizeValue(value);
+                if (m_Value == value && (!m_IsScrollBarParent || m_IsAdvScrollBar)) return;
+
+                m_Value = value;
+                if (m_PassiveScrollBar) return;
+                DisposeCashedView();
+                UpdateLayout();
+                if (ValueChanged != null)
+                    ValueChanged(this, new EventArgs());
+                this.Invalidate();
+            }
+        }
+
+        private bool _RaiseEndScroll = false;
+        private void SetValue(int value, ScrollEventType type)
+        {
+            value = NormalizeValue(value);
+#if FRAMEWORK20
+            OnScroll(new ScrollEventArgs(type, m_Value, value, this.ScrollOrientation));
+#else
+			OnScroll(new ScrollEventArgs(type, value));
+#endif
+            Value = value;
+            _RaiseEndScroll = true;
+        }
+
+        private int NormalizeValue(int value)
+        {
+            int max = m_IsAdvScrollBar ? GetMaximumValue() : m_Maximum;
+            if (value < m_Minimum) value = m_Minimum;
+            if (value > max) value = max;
+            return value;
+        }
+
+        private void OnScroll(ScrollEventArgs e)
+        {
+            ScrollEventHandler h = this.Scroll;
+            if (h != null)
+                h(this, e);
+        }
+
+        internal int GetMaximumValue()
+        {
+            if (m_IsScrollBarParent)
+            {
+                return m_Maximum - m_LargeChange + 1;
+            }
+            else
+                return m_Maximum;
+        }
+        
+        internal eScrollPart MouseOverPart
+        {
+            get
+            {
+                return m_MouseOverPart;
+            }
+            set
+            {
+                m_MouseOverPart = value;
+            }
+        }
+
+        private bool m_Visible = true;
+        public bool Visible
+        {
+            get { return m_Visible; }
+            set { m_Visible = value; }
+        }
+
+        public Control ParentControl
+        {
+            get { return m_ParentControl; }
+            set 
+            { 
+                m_ParentControl = value;
+                if (m_ParentControl == null) DisposeTimer();
+            }
+        }
+
+        private bool m_Enabled = true;
+        public bool Enabled
+        {
+            get { return m_Enabled; }
+            set
+            {
+                if (m_Enabled != value)
+                {
+                    m_Enabled = value;
+                    this.Invalidate();
+                }
+            }
+        }
+
+        public bool IsAppScrollBarStyle
+        {
+            get { return m_IsAppScrollBarStyle; }
+            set { m_IsAppScrollBarStyle = value; DisposeCashedView(); }
+        }
+
+        internal enum eScrollPart
+        {
+            ThumbIncrease,
+            ThumbDecrease,
+            Track,
+            Control,
+            None
+        }
+
+        internal bool ProcessCmdKey(ref Message msg, Keys keyData)
+        {
+            if (keyData == Keys.PageDown)
+            {
+                SetValue(this.Value + m_LargeChange, ScrollEventType.LargeIncrement);
+                return true;
+            }
+            else if (keyData == Keys.PageUp)
+            {
+                SetValue(this.Value - m_LargeChange, ScrollEventType.LargeIncrement);
+                return true;
+            }
+            else if (keyData == Keys.Up || keyData == Keys.Left)
+            {
+                SetValue(this.Value - m_SmallChange, ScrollEventType.SmallDecrement);
+                return true;
+            }
+            else if (keyData == Keys.Down || keyData == Keys.Right)
+            {
+                SetValue(this.Value + m_SmallChange, ScrollEventType.SmallIncrement);
+                return true;
+            }
+            else if (keyData == Keys.Home)
+            {
+                SetValue(m_Minimum, ScrollEventType.First);
+                return true;
+            }
+            else if (keyData == Keys.End)
+            {
+                SetValue(m_Maximum, ScrollEventType.Last);
+                return true;
+            }
+
+
+            return false;
+        }
+        #endregion
+
+        #region IDisposable Members
+
+        public void Dispose()
+        {
+            DisposeTimer();
+            DisposeCashedView();
+            m_ParentControl = null;
+        }
+
+        #endregion
+
+        internal void InvalidateScrollBar()
+        {
+            DisposeCashedView();
+            Control parentControl = m_ParentControl;
+            if (parentControl != null)
+                parentControl.Invalidate();
+        }
+    }
+
+#if !FRAMEWORK20
+	public enum ScrollOrientation
+	{
+		HorizontalScroll,
+		VerticalScroll
+	}
+#endif
+}
diff --git a/PROMS/DotNetBar Source Code/ScrollBar/ScrollBarPainter.cs b/PROMS/DotNetBar Source Code/ScrollBar/ScrollBarPainter.cs
new file mode 100644
index 00000000..eaecbc24
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/ScrollBar/ScrollBarPainter.cs	
@@ -0,0 +1,47 @@
+using System;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Text;
+using DevComponents.DotNetBar.Rendering;
+
+namespace DevComponents.DotNetBar.ScrollBar
+{
+    internal class ScrollBarPainter
+    {
+        #region Internal Implementation
+        public virtual void PaintThumb(Graphics g, System.Drawing.Rectangle bounds, eScrollThumbPosition position, eScrollBarState state)
+        {
+            
+        }
+
+        public virtual void PaintTrackVertical(Graphics g, System.Drawing.Rectangle bounds, eScrollBarState state)
+        {
+        }
+
+        public virtual void PaintTrackHorizontal(Graphics g, System.Drawing.Rectangle bounds, eScrollBarState state)
+        {
+        }
+
+        public virtual void PaintBackground(Graphics g, System.Drawing.Rectangle bounds, eScrollBarState state, bool horizontal, bool sideBorderOnly, bool rtl)
+        {
+        }
+        #endregion
+    }
+    
+    internal enum eScrollThumbPosition
+    {
+        Top,
+        Bottom,
+        Left,
+        Right
+    }
+    
+    internal enum eScrollBarState
+    {
+        Normal,
+        PartMouseOver,
+        ControlMouseOver,
+        Pressed,
+        Disabled
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/ScrollBar/VScrollBarAdv.cs b/PROMS/DotNetBar Source Code/ScrollBar/VScrollBarAdv.cs
new file mode 100644
index 00000000..5953de02
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/ScrollBar/VScrollBarAdv.cs	
@@ -0,0 +1,33 @@
+using System;
+using System.Text;
+using System.ComponentModel;
+using System.Windows.Forms;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar
+{
+    [ToolboxItem(true), ToolboxBitmap(typeof(VScrollBarAdv), "ScrollBar.VScrollBarAdv.ico")]
+    public class VScrollBarAdv : ScrollBarAdv
+    {
+        #region Private Variables
+        #endregion
+
+        #region Events
+        #endregion
+
+        #region Constructor
+        #endregion
+
+        #region Internal Implementation
+        protected override bool IsVertical()
+        {
+            return true;
+        }
+        #endregion
+
+        #region Property Hiding
+        
+        #endregion
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/ScrollBar/VScrollBarAdv.ico b/PROMS/DotNetBar Source Code/ScrollBar/VScrollBarAdv.ico
new file mode 100644
index 00000000..026d6796
Binary files /dev/null and b/PROMS/DotNetBar Source Code/ScrollBar/VScrollBarAdv.ico differ
diff --git a/PROMS/DotNetBar Source Code/ScrollButton.cs b/PROMS/DotNetBar Source Code/ScrollButton.cs
new file mode 100644
index 00000000..8d983123
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/ScrollButton.cs	
@@ -0,0 +1,400 @@
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.Drawing;
+using System.Data;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Summary description for ScrollButton.
+	/// </summary>
+	[ToolboxItem(false)]
+	internal class ScrollButton : System.Windows.Forms.UserControl
+	{
+		private bool m_MouseOver=false;
+		private bool m_MouseDown=false;
+		private eOrientation m_Orientation=eOrientation.Horizontal;
+		private eItemAlignment m_ButtonAlignment=eItemAlignment.Near;
+		private System.Windows.Forms.Timer m_ScrollTimer=null;
+		public ColorScheme _Scheme=null;
+		private ThemeScrollBar m_ThemeScrollBar=null;
+
+		public bool UseThemes=false;
+		public bool UseTimer=true;
+		public bool StandardButton=false;
+
+		public ScrollButton()
+		{
+			this.SetStyle(ControlStyles.Selectable,false);
+			this.SetStyle(ControlStyles.UserPaint,true);
+			this.SetStyle(ControlStyles.AllPaintingInWmPaint,true);
+			this.SetStyle(ControlStyles.Opaque,true);
+			this.SetStyle(ControlStyles.ResizeRedraw,true);
+			this.SetStyle(DisplayHelp.DoubleBufferFlag,true);
+			this.TabStop=false;
+		}
+
+		protected override void OnPaint(PaintEventArgs e)
+		{
+			Graphics g=e.Graphics;
+			if(StandardButton)
+			{
+				PaintStandardButton(e);
+				return;
+			}
+
+			if(m_MouseOver)
+			{
+				if(_Scheme==null)
+				{
+					using(SolidBrush brush=new SolidBrush(ColorFunctions.HoverBackColor(g)))
+						g.FillRectangle(brush,this.DisplayRectangle);
+					//g.Clear(ColorFunctions.HoverBackColor(g));
+					NativeFunctions.DrawRectangle(g,SystemPens.Highlight,this.ClientRectangle);
+				}
+				else
+				{
+					if(!_Scheme.ItemHotBackground2.IsEmpty)
+					{
+						System.Drawing.Drawing2D.LinearGradientBrush gradient=BarFunctions.CreateLinearGradientBrush(this.ClientRectangle,_Scheme.ItemHotBackground,_Scheme.ItemHotBackground2,_Scheme.ItemHotBackgroundGradientAngle);
+						g.FillRectangle(gradient,this.ClientRectangle);
+						gradient.Dispose();
+					}
+					else
+					{
+						using(SolidBrush brush=new SolidBrush(_Scheme.ItemHotBackground))
+							g.FillRectangle(brush,this.DisplayRectangle);
+						//g.Clear(_Scheme.ItemHotBackground);
+					}
+					NativeFunctions.DrawRectangle(g,new Pen(_Scheme.ItemHotBorder),this.ClientRectangle);
+				}
+			}
+			else
+			{
+				if(_Scheme==null)
+				{
+					using(SolidBrush brush=new SolidBrush(SystemColors.Control))
+						g.FillRectangle(brush,this.DisplayRectangle);
+					//g.Clear(SystemColors.Control);
+					NativeFunctions.DrawRectangle(g,SystemPens.ControlDark,this.ClientRectangle);
+				}
+				else
+				{
+					if(_Scheme.ItemBackground.IsEmpty)
+					{
+						using(SolidBrush brush=new SolidBrush(_Scheme.BarBackground))
+							g.FillRectangle(brush,this.DisplayRectangle);
+						//g.Clear(_Scheme.BarBackground);
+					}
+					else
+					{
+						if(_Scheme.ItemBackground2.IsEmpty)
+						{
+							using(SolidBrush brush=new SolidBrush(_Scheme.ItemBackground))
+								g.FillRectangle(brush,this.DisplayRectangle);
+							//g.Clear(_Scheme.ItemBackground);
+						}
+						else
+						{
+							using(System.Drawing.Drawing2D.LinearGradientBrush gradient=BarFunctions.CreateLinearGradientBrush(this.DisplayRectangle,_Scheme.ItemBackground,_Scheme.ItemBackground2,_Scheme.ItemBackgroundGradientAngle))
+								g.FillRectangle(gradient,this.DisplayRectangle);
+						}
+					}
+				}
+			}
+			if(m_Orientation==eOrientation.Horizontal)
+			{
+				if(m_ButtonAlignment==eItemAlignment.Far)
+				{
+					Point[] p=new Point[3];
+					p[0].X=(this.ClientRectangle.Width/2)-2;
+					p[0].Y=(this.ClientRectangle.Height-8)/2;
+					p[1].X=p[0].X;
+					p[1].Y=p[0].Y+8;
+					p[2].X=p[0].X+4;
+					p[2].Y=p[0].Y+4;
+					if(_Scheme==null)
+						g.FillPolygon(SystemBrushes.ControlText,p);
+					else
+						g.FillPolygon(new SolidBrush(_Scheme.ItemText),p);
+				}
+				else
+				{
+					Point[] p=new Point[3];
+					p[0].X=(this.ClientRectangle.Width/2)+2;
+					p[0].Y=(this.ClientRectangle.Height-8)/2;
+					p[1].X=p[0].X;
+					p[1].Y=p[0].Y+8;
+					p[2].X=p[0].X-4;
+					p[2].Y=p[0].Y+4;
+					if(_Scheme==null)
+						g.FillPolygon(SystemBrushes.ControlText,p);
+					else
+						g.FillPolygon(new SolidBrush(_Scheme.ItemText),p);
+				}
+			}
+			else
+			{
+				if(m_ButtonAlignment==eItemAlignment.Far)
+				{
+					Point[] p=new Point[3];
+					p[0].X=(this.ClientRectangle.Width)/2-3;
+					p[0].Y=(this.ClientRectangle.Height-4)/2;
+					p[1].X=p[0].X+7;
+					p[1].Y=p[0].Y;
+					p[2].X=p[0].X+3;
+					p[2].Y=p[0].Y+4;
+					if(_Scheme==null)
+						g.FillPolygon(SystemBrushes.ControlText,p);
+					else
+						g.FillPolygon(new SolidBrush(_Scheme.ItemText),p);
+				}
+				else
+				{
+					Point[] p=new Point[3];
+					p[0].X=(this.ClientRectangle.Width)/2-3;
+					p[0].Y=(this.ClientRectangle.Height+3)/2;
+					p[1].X=p[0].X+7;
+					p[1].Y=p[0].Y;
+					p[2].X=p[0].X+3;
+					p[2].Y=p[0].Y-4;
+					if(_Scheme==null)
+						g.FillPolygon(SystemBrushes.ControlText,p);
+					else
+						g.FillPolygon(new SolidBrush(_Scheme.ItemText),p);
+				}
+			}
+		}
+
+		private void PaintStandardButton(PaintEventArgs e)
+		{
+			Graphics g=e.Graphics;
+			if(UseThemes)
+			{
+				ThemeScrollBar scroll=this.ThemeScrollBar;
+				ThemeScrollBarParts part=ThemeScrollBarParts.ArrowBtn;
+				ThemeScrollBarStates state=ThemeScrollBarStates.ArrowBtnUpNormal;
+
+				if(m_MouseOver)
+				{
+					if(m_Orientation==eOrientation.Vertical)
+					{
+						if(m_ButtonAlignment==eItemAlignment.Near)
+							state=ThemeScrollBarStates.ArrowBtnUpHot;
+						else
+							state=ThemeScrollBarStates.ArrowBtnDownHot;
+					}
+					else
+					{
+						if(m_ButtonAlignment==eItemAlignment.Near)
+							state=ThemeScrollBarStates.ArrowBtnLeftHot;
+						else
+							state=ThemeScrollBarStates.ArrowBtnRightHot;
+					}
+				}
+				else
+				{
+					if(m_Orientation==eOrientation.Vertical)
+					{
+						if(m_ButtonAlignment==eItemAlignment.Near)
+							state=ThemeScrollBarStates.ArrowBtnUpNormal;
+						else
+							state=ThemeScrollBarStates.ArrowBtnDownNormal;
+					}
+					else
+					{
+						if(m_ButtonAlignment==eItemAlignment.Near)
+							state=ThemeScrollBarStates.ArrowBtnLeftNormal;
+						else
+							state=ThemeScrollBarStates.ArrowBtnRightNormal;
+					}
+				}
+
+				scroll.DrawBackground(g,part,state,this.DisplayRectangle);
+			}
+			else
+			{
+				if(m_MouseDown)
+					BarFunctions.DrawBorder3D(g,this.DisplayRectangle,System.Windows.Forms.Border3DStyle.SunkenInner);
+				else
+					BarFunctions.DrawBorder3D(g,this.DisplayRectangle,System.Windows.Forms.Border3DStyle.Raised);
+
+				if(m_Orientation==eOrientation.Vertical)
+				{
+					PaintArrow(g,this.DisplayRectangle,SystemColors.ControlText,(m_ButtonAlignment==eItemAlignment.Near));
+				}
+			}
+		}
+
+		private void PaintArrow(Graphics g, Rectangle rect, Color c, bool up)
+		{
+			Point[] p=new Point[3];
+			if(up)
+			{
+				p[0].X=rect.Left+(rect.Width-9)/2;
+				p[0].Y=rect.Top+rect.Height/2+1;
+				p[1].X=p[0].X+8;
+				p[1].Y=p[0].Y;
+				p[2].X=p[0].X+4;
+				p[2].Y=p[0].Y-5;
+			}
+			else
+			{
+				p[0].X=rect.Left+(rect.Width-7)/2;
+				p[0].Y=rect.Top+(rect.Height-4)/2;
+				p[1].X=p[0].X+7;
+				p[1].Y=p[0].Y;
+				p[2].X=p[0].X+3;
+				p[2].Y=p[0].Y+4;
+			}
+			g.FillPolygon(new SolidBrush(c),p);
+		}
+
+		protected override void OnMouseEnter(EventArgs e)
+		{
+			base.OnMouseEnter(e);
+			if(!m_MouseOver)
+			{
+				m_MouseOver=true;
+				this.Refresh();
+			}
+		}
+		protected override void OnMouseLeave(EventArgs e)
+		{
+			base.OnMouseLeave(e);
+			
+			if(m_ScrollTimer!=null)
+			{
+				m_ScrollTimer.Stop();
+				m_ScrollTimer.Dispose();
+				m_ScrollTimer=null;
+			}
+
+			if(m_MouseOver)
+			{
+				m_MouseOver=false;
+				this.Refresh();
+			}
+		}
+
+		protected override void OnMouseHover(EventArgs e)
+		{
+			base.OnMouseHover(e);
+			if(UseTimer)
+				SetupScrollTimer();
+		}
+
+		public eOrientation Orientation
+		{
+			get
+			{
+				return m_Orientation;
+			}
+			set
+			{
+				if(m_Orientation!=value)
+				{
+					m_Orientation=value;
+					this.Refresh();
+				}
+			}
+		}
+
+		public eItemAlignment ButtonAlignment
+		{
+			get
+			{
+				return m_ButtonAlignment;
+			}
+			set
+			{
+				if(m_ButtonAlignment!=value)
+				{
+					m_ButtonAlignment=value;
+					this.Refresh();
+				}
+			}
+		}
+
+		private void SetupScrollTimer()
+		{
+			if(m_ScrollTimer==null)
+			{
+				m_ScrollTimer=new Timer();
+				m_ScrollTimer.Interval=200;
+				m_ScrollTimer.Tick+=new EventHandler(this.ScrollTimerTick);
+				m_ScrollTimer.Start();
+			}
+		}
+
+		private void ScrollTimerTick(object sender, EventArgs e)
+		{
+			base.InvokeOnClick(this,new EventArgs());
+		}
+		
+		/// <summary> 
+		/// Clean up any resources being used.
+		/// </summary>
+		protected override void Dispose( bool disposing )
+		{
+			if(m_ScrollTimer!=null)
+			{
+				m_ScrollTimer.Stop();
+				m_ScrollTimer.Dispose();
+				m_ScrollTimer=null;
+			}
+			base.Dispose(disposing);
+		}
+
+		private DevComponents.DotNetBar.ThemeScrollBar ThemeScrollBar
+		{
+			get
+			{
+				if(m_ThemeScrollBar==null)
+					m_ThemeScrollBar=new ThemeScrollBar(this);
+				return m_ThemeScrollBar;
+			}
+		}
+
+		protected override void OnHandleDestroyed(EventArgs e)
+		{
+			DisposeThemes();
+			base.OnHandleDestroyed(e);
+		}
+
+		private void DisposeThemes()
+		{
+			if(m_ThemeScrollBar!=null)
+			{
+				m_ThemeScrollBar.Dispose();
+				m_ThemeScrollBar=null;
+			}
+		}
+		protected override void WndProc(ref Message m)
+		{
+			const int WM_MOUSEACTIVATE = 0x21;
+			const int MA_NOACTIVATE = 3;
+			if(m.Msg==NativeFunctions.WM_THEMECHANGED)
+			{
+				this.RefreshThemes();
+			}
+			else if(m.Msg==WM_MOUSEACTIVATE)
+			{
+				m.Result=new System.IntPtr(MA_NOACTIVATE);
+				return;
+			}
+			base.WndProc(ref m);
+		}
+
+		private void RefreshThemes()
+		{
+			if(m_ThemeScrollBar!=null)
+			{
+				m_ThemeScrollBar.Dispose();
+				m_ThemeScrollBar=new ThemeScrollBar(this);
+			}
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/Separator.cs b/PROMS/DotNetBar Source Code/Separator.cs
new file mode 100644
index 00000000..49a27eca
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Separator.cs	
@@ -0,0 +1,246 @@
+using System;
+using System.Text;
+using System.Drawing;
+using System.ComponentModel;
+using DevComponents.DotNetBar.Controls;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represents the visual separator line that is displayed between items.
+    /// </summary>
+    [ToolboxItem(false)]
+    public class Separator : BaseItem
+    {
+        #region Private Variables
+
+        #endregion
+
+        #region Constructors
+        /// <summary>
+        /// Creates new instance of Separator.
+		/// </summary>
+		public Separator():this("") {}
+		/// <summary>
+        /// Creates new instance of Separator and assigns the name to it.
+		/// </summary>
+		/// <param name="sItemName">Item name.</param>
+		public Separator(string sItemName):base(sItemName) 
+        {
+        }
+        #endregion
+
+        #region Internal Implementation
+        public override void Paint(ItemPaintArgs p)
+        {
+            Rectangle bounds = this.Bounds;
+            if (bounds.Width < 1 || bounds.Height < 1) return;
+
+            Color colorLine = p.Colors.ItemSeparator;
+            if (p.ContainerControl is SideNavStrip)
+                colorLine = p.Colors.BarDockedBorder;
+            if (!_SeparatorColor.IsEmpty)
+                colorLine = _SeparatorColor;
+            Color colorShade = p.Colors.ItemSeparatorShade;
+            if (!_ShadeColor.IsEmpty)
+                colorShade = _ShadeColor;
+            Graphics g=p.Graphics;
+            Rectangle r;
+
+            Padding padding = Dpi.Size(_Padding);
+            if (this.Orientation == eOrientation.Vertical && _SeparatorOrientation == eDesignMarkerOrientation.NotSet || _SeparatorOrientation== eDesignMarkerOrientation.Vertical)
+            {
+                r = new Rectangle(bounds.X + padding.Left, bounds.Y + padding.Top + (bounds.Height - padding.Vertical) / 2, bounds.Width - padding.Horizontal, 1);
+                if (!colorLine.IsEmpty)
+                    DisplayHelp.DrawLine(g, r.X, r.Y, r.Right -1, r.Y, colorLine, 1);
+            }
+            else
+            {
+                r = new Rectangle(bounds.X + padding.Left + (bounds.Width - padding.Horizontal) / 2, 
+                    bounds.Y + padding.Top, 1, bounds.Height - padding.Vertical);
+                if (!colorLine.IsEmpty)
+                    DisplayHelp.DrawLine(g, r.X, r.Y, r.X, r.Bottom - 1, colorLine, 1);
+            }
+
+            if (!colorShade.IsEmpty && (_FixedSize.Height>1 && 
+                (_SeparatorOrientation == eDesignMarkerOrientation.Vertical || this.Orientation == eOrientation.Vertical && _SeparatorOrientation == eDesignMarkerOrientation.NotSet) ||
+                _FixedSize.Width>1 && (_SeparatorOrientation == eDesignMarkerOrientation.Horizontal || this.Orientation == eOrientation.Horizontal && _SeparatorOrientation == eDesignMarkerOrientation.NotSet)))
+            {
+                r.Inflate(1, 1);
+                DisplayHelp.DrawRectangle(g, colorShade, r);
+            }
+
+            if (this.DesignMode && this.Focused)
+            {
+                r = this.Bounds;
+                r.Inflate(-1, -1);
+                DesignTime.DrawDesignTimeSelection(p.Graphics, r, p.Colors.ItemDesignTimeBorder);
+            }
+
+            this.DrawInsertMarker(p.Graphics);
+        }
+
+        private Padding _Padding = new Padding(2, 2, 2, 2);
+        /// <summary>
+        /// Gets or sets separator padding.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), Description("Gets or sets separator padding."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public Padding Padding
+        {
+            get { return _Padding; }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializePadding()
+        {
+            return _Padding.Bottom != 2 || _Padding.Top != 2 || _Padding.Left != 2 || _Padding.Right != 2;
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetPadding()
+        {
+            _Padding = new Padding(2, 2, 2, 2);
+        }
+
+        private Size _FixedSize = new Size(3, 16);
+        /// <summary>
+        /// Gets or sets the size of separator. Size specified is for separator in Vertical orientation. If orientation changes then the size will be internally switched to respect proper orientation.
+        /// </summary>
+        public Size FixedSize
+        {
+            get { return _FixedSize; }
+            set
+            {
+                _FixedSize = value;
+                NeedRecalcSize = true;
+                OnAppearanceChanged();
+            }
+        }
+
+        public override void RecalcSize()
+        {
+            if (this.Orientation == eOrientation.Horizontal)
+                m_Rect.Size = new Size(Dpi.Width(_FixedSize.Width + _Padding.Horizontal), Dpi.Height(_FixedSize.Height + _Padding.Vertical));
+            else
+                m_Rect.Size = new Size(Dpi.Width(_FixedSize.Height + Padding.Horizontal), Dpi.Height(_FixedSize.Width + _Padding.Vertical));
+            base.RecalcSize();
+        }
+
+        /// <summary>
+		/// Returns copy of the item.
+		/// </summary>
+		public override BaseItem Copy()
+		{
+            Separator objCopy = new Separator(m_Name);
+			this.CopyToItem(objCopy);
+			return objCopy;
+		}
+		/// <summary>
+		/// Copies the ButtonItem specific properties to new instance of the item.
+		/// </summary>
+		/// <param name="copy">New ButtonItem instance.</param>
+        protected override void CopyToItem(BaseItem copy)
+        {
+            Separator objCopy = copy as Separator;
+            base.CopyToItem(objCopy);
+            objCopy.FixedSize = _FixedSize;
+            objCopy.Padding.Left = _Padding.Left;
+            objCopy.Padding.Right = _Padding.Right;
+            objCopy.Padding.Top = _Padding.Top;
+            objCopy.Padding.Bottom = _Padding.Bottom;
+        }
+
+        private eDesignMarkerOrientation _SeparatorOrientation = eDesignMarkerOrientation.NotSet;
+        /// <summary>
+        /// Indicates splitter orientation.
+        /// </summary>
+        [DefaultValue(eDesignMarkerOrientation.NotSet), Category("Appearance"), Description("Indicates splitter orientation.")]
+        public eDesignMarkerOrientation SeparatorOrientation
+        {
+            get { return _SeparatorOrientation; }
+            set
+            {
+                if (_SeparatorOrientation != value)
+                {
+                    eDesignMarkerOrientation oldValue = _SeparatorOrientation;
+                    _SeparatorOrientation = value;
+                    OnSeparatorOrientationChanged(value, oldValue);
+                }
+            }
+        }
+
+        protected virtual void OnSeparatorOrientationChanged(eDesignMarkerOrientation newValue, eDesignMarkerOrientation oldValue)
+        {
+            this.OnAppearanceChanged();
+        }
+
+        private Color _SeparatorColor = Color.Empty;
+
+        /// <summary>
+        /// Gets or sets the separator color.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates separator color.")]
+        public Color SeparatorColor
+        {
+            get { return _SeparatorColor; }
+            set
+            {
+                _SeparatorColor = value;
+                this.Refresh();
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeSeparatorColor()
+        {
+            return !_SeparatorColor.IsEmpty;
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetSeparatorColor()
+        {
+            this.SeparatorColor = Color.Empty;
+        }
+
+        private Color _ShadeColor = Color.Empty;
+
+        /// <summary>
+        /// Gets or sets the separator shade color.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates separator shade color.")]
+        public Color ShadeColor
+        {
+            get { return _ShadeColor; }
+            set
+            {
+                _ShadeColor = value;
+                this.Refresh();
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeShadeColor()
+        {
+            return !_ShadeColor.IsEmpty;
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetShadeColor()
+        {
+            this.ShadeColor = Color.Empty;
+        }
+        #endregion
+
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/ShadowPainter.cs b/PROMS/DotNetBar Source Code/ShadowPainter.cs
new file mode 100644
index 00000000..e1befe45
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/ShadowPainter.cs	
@@ -0,0 +1,256 @@
+using System;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represents class that provides shadows to elements.
+    /// </summary>
+    public class ShadowPainter
+    {
+        /// <summary>
+        /// Creates new instance of shadow painter.
+        /// </summary>
+        public ShadowPainter()
+        {
+        }
+
+        private static System.Drawing.Drawing2D.GraphicsPath GetPath(Rectangle r)
+        {
+            System.Drawing.Drawing2D.GraphicsPath path = new System.Drawing.Drawing2D.GraphicsPath();
+            path.AddLine(r.Left + 1, r.Y, r.Right - 1, r.Y);
+            path.AddLine(r.Right - 1, r.Y, r.Right - 1, r.Y + 1);
+            path.AddLine(r.Right - 1, r.Y + 1, r.Right, r.Y + 1);
+            path.AddLine(r.Right, r.Y + 1, r.Right, r.Bottom - 1);
+            path.AddLine(r.Right, r.Bottom - 1, r.Right - 1, r.Bottom - 1);
+            path.AddLine(r.Right - 1, r.Bottom - 1, r.Right - 1, r.Bottom);
+            path.AddLine(r.Right - 1, r.Bottom, r.Left + 1, r.Bottom);
+            path.AddLine(r.Left + 1, r.Bottom, r.Left + 1, r.Bottom - 1);
+            path.AddLine(r.Left + 1, r.Bottom - 1, r.Left, r.Bottom - 1);
+            path.AddLine(r.Left, r.Bottom - 1, r.Left, r.Top + 1);
+            return path;
+        }
+
+        public static void Paint(ShadowPaintInfo info)
+        {
+            Paint(info, 0);
+        }
+        public static void Paint(ShadowPaintInfo info, int alphaOffset)
+        {
+            Graphics g = info.Graphics;
+            Region oldClip = g.Clip;
+            if (info.ClipRectangle.IsEmpty)
+                g.SetClip(info.Rectangle, CombineMode.Exclude);
+            else
+                g.SetClip(info.ClipRectangle, CombineMode.Exclude);
+            Color[] clr = new Color[]{
+									   Color.FromArgb(Math.Max(0, 14-alphaOffset),Color.Black),
+									   Color.FromArgb(Math.Max(0,43-alphaOffset),Color.Black),
+									   Color.FromArgb(Math.Max(0,84-alphaOffset),Color.Black),
+									   Color.FromArgb(Math.Max(0,113-alphaOffset),Color.Black),
+									   Color.FromArgb(Math.Max(0,128-alphaOffset),Color.Black)};
+
+
+            Rectangle r = info.Rectangle;
+            if (info.IsSquare)
+            {
+                r.Inflate(info.Size, info.Size);
+                r.Width += info.Size;
+            }
+            else
+            {
+                r.Width--;
+                r.Height--;
+                int offset = info.Size / 2;
+                r.Offset(offset + 1, offset);
+                r.Width += (info.Size - offset);
+                r.Height += (info.Size - offset);
+            }
+            //r.Width--;
+            //r.Height--;
+            //int offset = info.Size / 2;
+            //r.Offset(offset,offset);
+            //r.Width+=(info.Size-offset);
+            //r.Height+=(info.Size-offset);
+
+            for (int i = 0; i < info.Size; i++)
+            {
+                using (Pen pen = new Pen(clr[i], 1))
+                {
+                    using (GraphicsPath path = GetPath(r))
+                        g.DrawPath(pen, path);
+                    r.Inflate(-1, -1);
+                }
+            }
+
+            g.Clip = oldClip;
+        }
+
+        public static void Paint2(ShadowPaintInfo info)
+        {
+            if (info.Size <= 2) return;
+            Graphics g = info.Graphics;
+            Color c = Color.FromArgb(128, Color.Black);
+            Rectangle r = info.Rectangle;
+            r.Offset(info.Size - 1, info.Size - 1);
+
+            using (Bitmap bmp = new Bitmap(info.Size, info.Size))
+            {
+                using (Graphics bg = Graphics.FromImage(bmp))
+                {
+                    using (GraphicsPath path = new GraphicsPath())
+                    {
+                        path.AddEllipse(0, 0, info.Size * 2, info.Size * 2);
+                        using (PathGradientBrush brush = new PathGradientBrush(path))
+                        {
+                            brush.CenterColor = c;
+                            brush.SurroundColors = new Color[] { Color.Transparent };
+                            bg.FillRectangle(brush, new Rectangle(0, 0, info.Size, info.Size));
+                        }
+                    }
+                }
+                g.DrawImage(bmp, r.X, r.Y);
+                bmp.RotateFlip(RotateFlipType.Rotate90FlipNone);
+                g.DrawImage(bmp, r.Right - info.Size, r.Y);
+                bmp.RotateFlip(RotateFlipType.Rotate90FlipNone);
+                g.DrawImage(bmp, r.Right - info.Size, r.Bottom - info.Size);
+                bmp.RotateFlip(RotateFlipType.Rotate90FlipNone);
+                g.DrawImage(bmp, r.X, r.Bottom - info.Size);
+            }
+            SmoothingMode sm = g.SmoothingMode;
+            g.SmoothingMode = SmoothingMode.None;
+            Rectangle rb = new Rectangle(r.X + info.Size, r.Y + 1, r.Width - info.Size * 2, info.Size - 1);
+            using (LinearGradientBrush brush = DisplayHelp.CreateLinearGradientBrush(rb, Color.Transparent, c, 90))
+                g.FillRectangle(brush, rb);
+            rb.Offset(0, r.Height - info.Size - 1);
+            using (LinearGradientBrush brush = DisplayHelp.CreateLinearGradientBrush(rb, c, Color.Transparent, 90))
+                g.FillRectangle(brush, rb);
+
+            rb = new Rectangle(r.X, r.Y + info.Size, info.Size, r.Height - info.Size * 2);
+            using (LinearGradientBrush brush = DisplayHelp.CreateLinearGradientBrush(rb, Color.Transparent, c, 0))
+                g.FillRectangle(brush, rb);
+
+            rb.Offset(r.Width - info.Size - 1, 0);
+            using (LinearGradientBrush brush = DisplayHelp.CreateLinearGradientBrush(rb, c, Color.Transparent, 0))
+                g.FillRectangle(brush, rb);
+
+            g.SmoothingMode = sm;
+        }
+
+        private static Bitmap _ShadowTemplate = null;
+        private static Bitmap[] _ShadowParts = null;
+        private static int LastUsedShadowVersion = 1;
+        public static void Paint3(ShadowPaintInfo p)
+        {
+            Paint3(p, 1);
+        }
+        public static void Paint3(ShadowPaintInfo p, int shadowVersion)
+        {
+            if (LastUsedShadowVersion != shadowVersion && _ShadowTemplate != null)
+            {
+                _ShadowTemplate.Dispose();
+                _ShadowTemplate = null;
+                for (int i = 0; i < _ShadowParts.Length; i++)
+                {
+                    _ShadowParts[i].Dispose();
+                }
+                _ShadowParts = null;
+            }
+            if (_ShadowTemplate == null)
+            {
+                if(shadowVersion == 1)
+                    _ShadowTemplate = BarFunctions.LoadBitmap("SystemImages.Shadow3px.png");
+                else
+                    _ShadowTemplate = BarFunctions.LoadBitmap("SystemImages.Shadow3px-2.png");
+                _ShadowParts = new Bitmap[4];
+                // Left part
+                Bitmap bmp = new Bitmap(_ShadowTemplate, 1, 1);
+                using (Graphics gb = Graphics.FromImage(bmp))
+                {
+                    gb.DrawImage(_ShadowTemplate, new Rectangle(0, 0, 1, 1), new Rectangle(0, 3, 1, 1), GraphicsUnit.Pixel);
+                    _ShadowParts[0] = bmp;
+                }
+
+                // Top part
+                bmp = new Bitmap(_ShadowTemplate, 1, 1);
+                using (Graphics gb = Graphics.FromImage(bmp))
+                {
+                    gb.DrawImage(_ShadowTemplate, new Rectangle(0, 0, 1, 1), new Rectangle(3, 0, 1, 1), GraphicsUnit.Pixel);
+                    _ShadowParts[1] = bmp;
+                }
+
+                // Right part
+                bmp = new Bitmap(_ShadowTemplate, 3, 1);
+                using (Graphics gb = Graphics.FromImage(bmp))
+                {
+                    gb.DrawImage(_ShadowTemplate, new Rectangle(0, 0, 3, 1), new Rectangle(_ShadowTemplate.Width - 3, 6, 3, 1), GraphicsUnit.Pixel);
+                    _ShadowParts[2] = bmp;
+                    //bmp.Save(@"d:\rightpart.png", System.Drawing.Imaging.ImageFormat.Png);
+                }
+
+                // Bottom part
+                bmp = new Bitmap(_ShadowTemplate, 1, 3);
+                using (Graphics gb = Graphics.FromImage(bmp))
+                {
+                    gb.DrawImage(_ShadowTemplate, new Rectangle(0, 0, 1, 3), new Rectangle(5, _ShadowTemplate.Height - 3, 1, 3), GraphicsUnit.Pixel);
+                    _ShadowParts[3] = bmp;
+                }
+            }
+            
+            Graphics g = p.Graphics;
+            SmoothingMode sm = g.SmoothingMode;
+            g.SmoothingMode = SmoothingMode.None;
+            Rectangle r = p.Rectangle;
+            g.DrawImage(_ShadowTemplate, new Rectangle(r.X, r.Y, 1, 1), new Rectangle(0, 0, 1, 1), GraphicsUnit.Pixel);
+
+            // Left side
+            using (TextureBrush brush = new TextureBrush(_ShadowParts[0], System.Drawing.Drawing2D.WrapMode.Tile))
+            {
+                g.FillRectangle(brush, new Rectangle(r.X, r.Y + 1, _ShadowParts[0].Width, r.Height - 4));
+            }
+            // Top side
+            using (TextureBrush brush = new TextureBrush(_ShadowParts[1], System.Drawing.Drawing2D.WrapMode.Tile))
+            {
+                g.FillRectangle(brush, new Rectangle(r.X + 1, r.Y, r.Width - 4, _ShadowParts[1].Height));
+            }
+            // Top-Right corner
+            g.DrawImage(_ShadowTemplate, new Rectangle(r.Right - 3, r.Y, 3, 4), new Rectangle(_ShadowTemplate.Width - 3, 0, 3, 4), GraphicsUnit.Pixel);
+            // Right side
+            using (TextureBrush brush = new TextureBrush(_ShadowParts[2], System.Drawing.Drawing2D.WrapMode.Tile))
+            {
+                Rectangle rightSide = new Rectangle(r.Right - _ShadowParts[2].Width, r.Y + 4, _ShadowParts[2].Width, r.Height - 7);
+                brush.TranslateTransform(rightSide.X, rightSide.Y);
+                g.FillRectangle(brush, rightSide);
+            }
+            // Bottom-right corner
+            g.DrawImage(_ShadowTemplate, new Rectangle(r.Right - 4, r.Bottom - 3, 4, 3), new Rectangle(_ShadowTemplate.Width - 4, _ShadowTemplate.Height - 3, 4, 3), GraphicsUnit.Pixel);
+            // Bottom side
+            using (TextureBrush brush = new TextureBrush(_ShadowParts[3], System.Drawing.Drawing2D.WrapMode.Tile))
+            {
+                Rectangle bottomSide = new Rectangle(r.X + 4, r.Bottom - 3, r.Width - 8, _ShadowParts[3].Height);
+                brush.TranslateTransform(bottomSide.X, bottomSide.Y);
+                g.FillRectangle(brush, bottomSide);
+            }
+            // Bottom-left corner
+            g.DrawImage(_ShadowTemplate, new Rectangle(r.X, r.Bottom - 3, 4, 3), new Rectangle(0, _ShadowTemplate.Height - 3, 4, 3), GraphicsUnit.Pixel);
+            g.SmoothingMode = sm;
+
+            LastUsedShadowVersion = shadowVersion;
+        }
+    }
+
+    #region ShadowPaintInfo class
+    /// <summary>
+    /// Represents class that provides display context for shadow painter.
+    /// </summary>
+    public class ShadowPaintInfo
+    {
+        public System.Drawing.Graphics Graphics = null;
+        public System.Drawing.Rectangle Rectangle = Rectangle.Empty;
+        public int Size = 3;
+        public System.Drawing.Rectangle ClipRectangle = Rectangle.Empty;
+        public bool IsSquare = false;
+    }
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/ShapeDescriptor.cs b/PROMS/DotNetBar Source Code/ShapeDescriptor.cs
new file mode 100644
index 00000000..e27d322d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/ShapeDescriptor.cs	
@@ -0,0 +1,19 @@
+using System;
+using System.Text;
+using System.Drawing.Drawing2D;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar
+{
+    public abstract class ShapeDescriptor : IShapeDescriptor
+    {
+        #region IShapeDescriptor Members
+
+        public abstract System.Drawing.Drawing2D.GraphicsPath GetShape(System.Drawing.Rectangle bounds);
+
+        public abstract System.Drawing.Drawing2D.GraphicsPath GetInnerShape(System.Drawing.Rectangle bounds, int borderSize);
+
+        public abstract bool CanDrawShape(System.Drawing.Rectangle bounds);
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/ShortcutCollection.cs b/PROMS/DotNetBar Source Code/ShortcutCollection.cs
new file mode 100644
index 00000000..6257a2a7
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/ShortcutCollection.cs	
@@ -0,0 +1,143 @@
+using System.ComponentModel;
+namespace DevComponents.DotNetBar
+{
+	using System;
+	using System.Collections;
+	/// <summary>
+	///		Summary description for ShortcutList.
+	/// </summary>
+	public class ShortcutsCollection:System.Collections.CollectionBase
+	{
+		private BaseItem m_Parent=null;
+		public ShortcutsCollection(BaseItem parent)
+		{
+			m_Parent=parent;
+		}
+		public int Add(eShortcut key)
+		{
+			int iRet=0;
+			iRet=List.Add(key);
+			return iRet;
+		}
+		protected override void OnInsertComplete(int index,object value)
+		{
+			base.OnInsertComplete(index,value);
+			RefreshOwnerShortcuts();
+		}
+		public eShortcut this[int index]
+		{
+			get {return (eShortcut)(List[index]);}
+			set {List[index] = value;}
+		}
+
+		public void Insert(int index, eShortcut value) 
+		{
+			List.Insert(index, value);
+			RefreshOwnerShortcuts();
+		}
+
+		public int IndexOf(eShortcut value) 
+		{
+			return List.IndexOf(value);
+		}
+
+		public string ToString(string Delimiter)
+		{
+			if(List.Count==0)
+				return "";
+
+			System.Text.StringBuilder sb=new System.Text.StringBuilder(List.Count*(2+Delimiter.Length));int c=List.Count-1;
+			for(int i=0;i<c;i++)
+				sb.Append(((int)List[i]).ToString()+Delimiter);
+
+			sb.Append(((int)List[c]).ToString());
+
+			return sb.ToString();
+		}
+
+		public void FromString(string Data, string Delimiter)
+		{
+			List.Clear();
+			string[] str=Data.Split(Delimiter.ToCharArray());
+			foreach(string s in str)
+				List.Add((eShortcut)System.Xml.XmlConvert.ToInt32(s));
+		}
+
+		public bool Contains(eShortcut value) 
+		{
+			return List.Contains(value);
+		}
+
+		public void Remove(eShortcut value) 
+		{
+			List.Remove(value);
+		}
+
+        protected override void OnRemove(int index, object value)
+        {
+            RemoveOwnerShortcuts();
+            base.OnRemove(index, value);
+        }
+
+		protected override void OnRemoveComplete(int index,object value)
+		{
+			base.OnRemoveComplete(index,value);
+			RefreshOwnerShortcuts();
+		}
+
+		protected override void OnClear()
+		{
+			base.OnClear();
+			RemoveOwnerShortcuts();
+		}
+
+        protected override void OnClearComplete()
+        {
+            RefreshOwnerShortcuts();
+            base.OnClearComplete();
+        }
+
+		public void CopyTo(eShortcut[] array, int index) 
+		{
+			List.CopyTo(array, index);
+		}
+        [EditorBrowsable(EditorBrowsableState.Never)]
+		public BaseItem Parent
+		{
+			get
+			{
+				return m_Parent;
+			}
+			set
+			{
+				m_Parent=value;
+                if (m_Parent != null)
+                    m_Parent.RefreshShortcutString();
+			}
+		}
+		private void RefreshOwnerShortcuts()
+		{
+            if (m_Parent != null)
+                m_Parent.RefreshShortcutString();
+
+			IOwner owner=null;
+			if(m_Parent!=null)
+				owner=m_Parent.GetOwner() as IOwner;
+			if(m_Parent!=null && owner!=null)
+			{
+				owner.RemoveShortcutsFromItem(m_Parent);
+				owner.AddShortcutsFromItem(m_Parent);
+			}
+		}
+		private void RemoveOwnerShortcuts()
+		{
+			IOwner owner=null;
+			if(m_Parent!=null)
+				owner=m_Parent.GetOwner() as IOwner;
+			if(m_Parent!=null && owner!=null)
+			{
+				owner.RemoveShortcutsFromItem(m_Parent);
+			}
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/ShortcutsDesigner.cs b/PROMS/DotNetBar Source Code/ShortcutsDesigner.cs
new file mode 100644
index 00000000..104ebfec
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/ShortcutsDesigner.cs	
@@ -0,0 +1,151 @@
+using System;
+using System.ComponentModel;
+using System.ComponentModel.Design;
+using System.Windows.Forms;
+using System.Windows.Forms.ComponentModel;
+using System.Windows.Forms.Design;
+using System.Drawing.Design;
+using System.Globalization;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Summary description for ShortcutsDesigner.
+	/// </summary>
+	public class ShortcutsDesigner:UITypeEditor
+	{
+		private IWindowsFormsEditorService m_EdSvc = null;
+
+		public override UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext context) 
+		{
+			if (context != null && context.Instance != null) 
+			{
+				return UITypeEditorEditStyle.DropDown;
+			}
+			return base.GetEditStyle(context);
+		}
+
+		public override object EditValue(ITypeDescriptorContext context, IServiceProvider provider, object value) 
+		{
+
+			if (context!=null && context.Instance!=null && provider!=null) 
+			{
+				m_EdSvc=(IWindowsFormsEditorService)provider.GetService(typeof(IWindowsFormsEditorService));
+				if(m_EdSvc!=null) 
+				{
+					ShortcutsListBox lst=null;
+					if(context.Instance is BaseItem)
+						lst=new ShortcutsListBox(((BaseItem)context.Instance).Shortcuts);
+					else if(context.Instance is DotNetBarManager)
+						lst=new ShortcutsListBox(((DotNetBarManager)context.Instance).AutoDispatchShortcuts);
+					else if(context.Instance!=null)
+						System.Windows.Forms.MessageBox.Show("Unknow control using shortcuts. Cannot edit shortcuts. ["+context.Instance.ToString()+"]");
+					else
+						System.Windows.Forms.MessageBox.Show("Unknow control using shortcuts. Cannot edit shortcuts. [context instance null]");
+					if(lst!=null)
+					{
+						m_EdSvc.DropDownControl(lst);
+						value=lst.Shortcuts();
+						((ShortcutsCollection)value).Parent=context.Instance as BaseItem;
+					}
+				}
+			}
+
+			return value;
+		}
+
+		private class ShortcutsListBox:CheckedListBox
+		{
+			public ShortcutsListBox(ShortcutsCollection editingInstance):base()
+			{
+				// Load all shortcuts
+				Array a=eShortcut.GetValues(typeof(eShortcut));
+				for(int i=1;i<a.Length;i++)
+				{
+					NameValue nv=new NameValue(eShortcut.GetName(typeof(eShortcut),a.GetValue(i)),(eShortcut)a.GetValue(i));
+					if(editingInstance.Contains((eShortcut)a.GetValue(i)))
+					{
+						this.Items.Add(nv,System.Windows.Forms.CheckState.Checked);
+					}
+					else
+						this.Items.Add(nv,System.Windows.Forms.CheckState.Unchecked);
+				}
+			}
+
+			public ShortcutsCollection Shortcuts()
+			{
+				ShortcutsCollection sl=new ShortcutsCollection(null);
+				foreach(NameValue nv in this.CheckedItems)
+					sl.Add(nv.Key);
+				return sl;
+			}
+
+			private struct NameValue
+			{
+				public NameValue(string name,eShortcut k)
+				{
+					Name=name;
+					Key=k;
+				}
+				public override string ToString()
+				{
+					return Name;
+				}
+				public string Name;
+				public eShortcut Key;
+			}
+		}
+	}
+	public class ShortcutsConverter:TypeConverter 
+	{
+		public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType) 
+		{
+			if (sourceType == typeof(string)) 
+			{
+				return true;
+			}
+			return base.CanConvertFrom(context, sourceType);
+		}
+		// Overrides the ConvertFrom method of TypeConverter.
+		public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value) 
+		{
+			if(value is string)
+			{
+				return this.FromString((string)value);
+			}
+			return base.ConvertFrom(context, culture, value);
+		}
+		// Overrides the ConvertTo method of TypeConverter.
+		public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+		{  
+			if (destinationType == typeof(string)) 
+			{
+				ShortcutsCollection sl=(ShortcutsCollection)value;
+				System.Text.StringBuilder sb=new System.Text.StringBuilder();
+
+				for(int i=0;i<sl.Count;i++)
+				{
+					sb.Append(eShortcut.GetName(typeof(eShortcut),sl[i]));
+					if(i<sl.Count-1)
+						sb.Append(",");
+				}
+
+				return sb.ToString();
+			}
+			return base.ConvertTo(context, culture, value, destinationType);
+		}
+            
+		private ShortcutsCollection FromString(string str)
+		{
+			ShortcutsCollection sl=new ShortcutsCollection(null);
+			if(str=="" || str==null)
+				return sl;
+			string[] v=str.Split(',');
+			for(int i=0;i<v.Length;i++)
+			{
+				sl.Add((eShortcut)eShortcut.Parse(typeof(eShortcut),v[i],true));
+			}
+			return sl;
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/SideBar.bmp b/PROMS/DotNetBar Source Code/SideBar.bmp
new file mode 100644
index 00000000..977f334d
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SideBar.bmp differ
diff --git a/PROMS/DotNetBar Source Code/SideBar.cs b/PROMS/DotNetBar Source Code/SideBar.cs
new file mode 100644
index 00000000..38857f97
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/SideBar.cs	
@@ -0,0 +1,3301 @@
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.Drawing;
+using System.Data;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.Rendering;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Represents the Outlook like Side-bar Control.
+	/// </summary>
+    [ToolboxItem(true), System.Runtime.InteropServices.ComVisible(false), Designer("DevComponents.DotNetBar.Design.SideBarDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+	public class SideBar : System.Windows.Forms.Control,
+		IOwnerItemEvents, IOwner, IThemeCache, IMessageHandlerClient, IOwnerMenuSupport, IBarDesignerServices,
+        ICustomSerialization
+	{
+		// Events
+		#region Event Definition
+        /// <summary>
+        /// Occurs when Checked property of an button has changed.
+        /// </summary>
+        public event EventHandler ButtonCheckedChanged;
+
+		/// <summary>
+		/// Represents the method that will handle the ItemRemoved event.
+		/// </summary>
+		public delegate void ItemRemovedEventHandler(object sender, ItemRemovedEventArgs e);
+
+		/// <summary>
+		/// Occurs when Item is clicked.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when Item is clicked.")]
+		public event EventHandler ItemClick;
+
+        /// <summary>
+        /// Occurs when Item is clicked.
+        /// </summary>
+        [Description("Occurs when Item is double-clicked.")]
+        public event MouseEventHandler ItemDoubleClick;
+
+		/// <summary>
+		/// Occurs when popup of type container is loading.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when popup of type container is loading.")]
+		public event EventHandler PopupContainerLoad;
+
+		/// <summary>
+		/// Occurs when popup of type container is unloading.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when popup of type container is unloading.")]
+		public event EventHandler PopupContainerUnload;
+
+		/// <summary>
+		/// Occurs when popup item is about to open.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when popup item is about to open.")]
+		public event EventHandler PopupOpen;
+
+		/// <summary>
+		/// Occurs when popup item is closing.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when popup item is closing.")]
+		public event EventHandler PopupClose;
+
+		/// <summary>
+		/// Occurs just before popup window is shown.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs just before popup window is shown.")]
+		public event EventHandler PopupShowing;
+
+		/// <summary>
+		/// Occurs when Item Expanded property has changed.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when Item Expanded property has changed.")]
+		public event EventHandler ExpandedChange;
+
+		private MouseEventHandler EventMouseDown;
+		/// <summary>
+		/// Occurs when mouse button is pressed.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when mouse button is pressed.")]
+		new public event MouseEventHandler MouseDown 
+		{
+			add { EventMouseDown += value; }
+			remove { EventMouseDown -= value; }
+		}
+
+		private MouseEventHandler EventMouseUp;
+		/// <summary>
+		/// Occurs when mouse button is released.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when mouse button is released.")]
+		new public event MouseEventHandler MouseUp
+		{
+			add { EventMouseUp += value; }
+			remove { EventMouseUp -= value; }
+		}
+
+		private EventHandler EventMouseEnter;
+		/// <summary>
+		/// Occurs when mouse enters the item.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when mouse enters the item.")]
+		new public event EventHandler MouseEnter
+		{
+			add { EventMouseEnter += value; }
+			remove { EventMouseEnter -= value; }
+		}
+		
+		private EventHandler EventMouseLeave;
+		/// <summary>
+		/// Occurs when mouse leaves the item.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when mouse leaves the item.")]
+		new public event EventHandler MouseLeave
+		{
+			add { EventMouseLeave += value; }
+			remove { EventMouseLeave -= value; }
+		}
+
+		private MouseEventHandler EventMouseMove;
+		/// <summary>
+		/// Occurs when mouse moves over the item.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when mouse moves over the item.")]
+		new public event MouseEventHandler MouseMove
+		{
+			add { EventMouseMove += value; }
+			remove { EventMouseMove -= value; }
+		}
+		
+		private EventHandler EventMouseHover;
+		/// <summary>
+		/// Occurs when mouse remains still inside an item for an amount of time.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when mouse remains still inside an item for an amount of time.")]
+		new public event EventHandler MouseHover
+		{
+			add { EventMouseHover += value; }
+			remove { EventMouseHover -= value; }
+		}
+		
+		private EventHandler EventLostFocus;
+		/// <summary>
+		/// Occurs when item loses input focus.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when item loses input focus.")]
+		new public event EventHandler LostFocus
+		{
+			add { EventLostFocus += value; }
+			remove { EventLostFocus -= value; }
+		}
+		
+		private EventHandler EventGotFocus;
+		/// <summary>
+		/// Occurs when item receives input focus.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when item receives input focus.")]
+		new public event EventHandler GotFocus
+		{
+			add { EventGotFocus += value; }
+			remove { EventGotFocus -= value; }
+		}
+		
+		/// <summary>
+		/// Occurs when user changes the item position, removes the item, adds new item or creates new bar.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when user changes the item position.")]
+		public event EventHandler UserCustomize;
+
+		/// <summary>
+		/// Occurs after an Item is removed from SubItemsCollection.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs after an Item is removed from SubItemsCollection.")]
+		public event ItemRemovedEventHandler ItemRemoved;
+
+		/// <summary>
+		/// Occurs after an Item has been added to the SubItemsCollection.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs after an Item has been added to the SubItemsCollection.")]
+		public event EventHandler ItemAdded;
+
+		/// <summary>
+		/// Occurs when ControlContainerControl is created and contained control is needed.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when ControlContainerControl is created and contained control is needed.")]
+		public event EventHandler ContainerLoadControl;
+
+		/// <summary>
+		/// Occurs when Text property of an Item has changed.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when Text property of an Item has changed.")]
+		public event EventHandler ItemTextChanged;
+
+		/// <summary>
+		/// Use this event if you want to serialize the hosted control state directly into the DotNetBar definition file.
+		/// </summary>
+		public event ControlContainerItem.ControlContainerSerializationEventHandler ContainerControlSerialize;
+		/// <summary>
+		/// Use this event if you want to deserialize the hosted control state directly from the DotNetBar definition file.
+		/// </summary>
+		public event ControlContainerItem.ControlContainerSerializationEventHandler ContainerControlDeserialize;
+
+		/// <summary>
+		/// Occurs after DotNetBar definition is loaded.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs after DotNetBar definition is loaded.")]
+		public event EventHandler DefinitionLoaded;
+
+		/// <summary>
+		/// Occurs before an item in option group is checked and provides opportunity to cancel that.
+		/// </summary>
+		public event OptionGroupChangingEventHandler OptionGroupChanging;
+
+		/// <summary>
+		/// Occurs before tooltip for an item is shown. Sender could be the BaseItem or derived class for which tooltip is being displayed or it could be a ToolTip object itself it tooltip is not displayed for any item in particular.
+		/// </summary>
+		public event EventHandler ToolTipShowing;
+
+        /// <summary>
+        /// Occurs after an item has been serialized to XmlElement and provides you with opportunity to add any custom data
+        /// to serialized XML. This allows you to serialize any data with the item and load it back up in DeserializeItem event.
+        /// </summary>
+        /// <remarks>
+        /// 	<para>To serialize custom data to XML definition control creates handle this event and use CustomXmlElement
+        /// property on SerializeItemEventArgs to add new nodes or set attributes with custom data you want saved.</para>
+        /// </remarks>
+        public event SerializeItemEventHandler SerializeItem;
+
+        /// <summary>
+        /// Occurs after an item has been de-serialized (load) from XmlElement and provides you with opportunity to load any custom data
+        /// you have serialized during SerializeItem event.
+        /// </summary>
+        /// <remarks>
+        /// 	<para>To de-serialize custom data from XML definition handle this event and use CustomXmlElement
+        /// property on SerializeItemEventArgs to retrive any data you saved in SerializeItem event.</para>
+        /// </remarks>
+        public event SerializeItemEventHandler DeserializeItem;
+		#endregion
+
+		#region Private Variables
+		private SideBarContainerItem m_ItemContainer=null;
+
+		private System.Windows.Forms.Timer m_ClickTimer=null;
+		private BaseItem m_ClickRepeatItem=null;
+		private BaseItem m_ExpandedItem=null;
+		private BaseItem m_FocusItem=null;
+
+		private System.Windows.Forms.ImageList m_ImageList;
+		private System.Windows.Forms.ImageList m_ImageListMedium=null;
+		private System.Windows.Forms.ImageList m_ImageListLarge=null;
+
+		private bool m_ShowToolTips=true;
+		private bool m_ShowShortcutKeysInToolTips=false;
+
+		private Hashtable m_ShortcutTable=new Hashtable();
+		private eBorderType m_BorderStyle=eBorderType.Sunken;
+
+		private SideBarPanelItem m_DelayedExpandedPanel=null;
+
+		private BaseItem m_DragItem=null;
+		private bool m_DragInProgress=false;
+		private Cursor m_MoveCursor, m_CopyCursor, m_NACursor;
+		private IDesignTimeProvider m_DesignTimeProvider=null;
+		private int m_InsertPosition;
+		private bool m_InsertBefore;
+		private bool m_AllowUserCustomize=true;
+		private bool m_ThemeAware=false;
+
+		// Theme Caching Support
+		private ThemeWindow m_ThemeWindow=null;
+		private ThemeRebar m_ThemeRebar=null;
+		private ThemeToolbar m_ThemeToolbar=null;
+		private ThemeHeader m_ThemeHeader=null;
+		private ThemeScrollBar m_ThemeScrollBar=null;
+		private ThemeExplorerBar m_ThemeExplorerBar=null;
+		private ThemeProgress m_ThemeProgress=null;
+        private ThemeButton m_ThemeButton = null;
+
+		private bool m_UseNativeDragDrop=false;
+		private bool m_AllowExternalDrop=false;
+		private bool m_ExternalDragInProgress=false;
+		private bool m_DragLeft=false;
+
+		private bool m_DispatchShortcuts=false;
+		private bool m_FilterInstalled=false;
+
+		private ColorScheme m_ColorScheme=null;
+
+		private const string INFO_EMPTYSIDEBAR="Right-click and choose Add New Panel or use Panels collection to create new panels. Right-click to Choose Color Scheme.";
+
+		private eSideBarAppearance m_Appearance=eSideBarAppearance.Traditional;
+		private eSideBarColorScheme m_PredefinedColorScheme=eSideBarColorScheme.Blue;
+		private bool m_UsingSystemColors=false;
+
+		private bool m_MenuEventSupport=false;
+		private IBarItemDesigner m_BarDesigner=null;
+		#endregion
+
+		/// <summary>
+		/// Creates new instance of side bar control.
+		/// </summary>
+		public SideBar()
+		{
+			m_ItemContainer=new SideBarContainerItem();
+			m_ItemContainer.GlobalItem=false;
+			m_ItemContainer.ContainerControl=this;
+			m_ItemContainer.Stretch=false;
+			m_ItemContainer.Displayed=true;
+			m_ItemContainer.SetOwner(this);
+
+			//this.SetStyle(ControlStyles.Selectable,false);
+			this.SetStyle(ControlStyles.UserPaint,true);
+			this.SetStyle(ControlStyles.AllPaintingInWmPaint,true);
+			this.SetStyle(ControlStyles.Opaque,true);
+			this.SetStyle(ControlStyles.ResizeRedraw,true);
+			this.SetStyle(DisplayHelp.DoubleBufferFlag,true);
+
+			//this.TabStop=false;
+			//this.Font=System.Windows.Forms.SystemInformation.MenuFont.Clone() as Font;
+
+			if(!ColorFunctions.ColorsLoaded)
+			{
+				NativeFunctions.RefreshSettings();
+				NativeFunctions.OnDisplayChange();
+				ColorFunctions.LoadColors();
+			}
+
+			#if TRIAL
+				RemindForm frm=new RemindForm();
+				frm.ShowDialog();
+			#endif
+
+			try
+			{
+				m_MoveCursor=new Cursor(typeof(DevComponents.DotNetBar.DotNetBarManager),"DRAGMOVE.CUR");
+				m_CopyCursor=new Cursor(typeof(DevComponents.DotNetBar.DotNetBarManager),"DRAGCOPY.CUR");
+				m_NACursor=new Cursor(typeof(DevComponents.DotNetBar.DotNetBarManager),"DRAGNONE.CUR");
+			}
+			catch(Exception)
+			{
+				m_MoveCursor=null;
+				m_CopyCursor=null;
+				m_NACursor=null;
+			}
+			this.AccessibleRole=AccessibleRole.ToolBar;
+
+			m_ColorScheme=new ColorScheme();
+            StyleManager.Register(this);
+		}
+
+		/// <summary> 
+		/// Clean up any resources being used.
+		/// </summary>
+		protected override void Dispose( bool disposing )
+		{
+			if( disposing )
+			{
+				if(m_ClickTimer!=null)
+				{
+					m_ClickTimer.Stop();
+					m_ClickTimer.Dispose();
+					m_ClickTimer=null;
+				}
+                StyleManager.Unregister(this);
+			}
+			base.Dispose( disposing );
+		}
+
+        /// <summary>
+        /// Called by StyleManager to notify control that style on manager has changed and that control should refresh its appearance if
+        /// its style is controlled by StyleManager.
+        /// </summary>
+        /// <param name="newStyle">New active style.</param>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void StyleManagerStyleChanged(eDotNetBarStyle newStyle)
+        {
+            
+        }
+
+        protected override void ScaleControl(SizeF factor, BoundsSpecified specified)
+        {
+            if (Dpi.RecordScalePerControl)
+                Dpi.SetScaling(factor);
+            if (m_ItemContainer != null)
+                m_ItemContainer.NotifyScaleItem(factor);
+            base.ScaleControl(factor, specified);
+        }
+
+		#region IBarDesignerServices
+		IBarItemDesigner IBarDesignerServices.Designer
+		{
+			get {return m_BarDesigner;}
+			set {m_BarDesigner=value;}
+		}
+		#endregion
+
+#if FRAMEWORK20
+        protected override void OnBindingContextChanged(EventArgs e)
+        {
+            base.OnBindingContextChanged(e);
+            if (m_ItemContainer != null)
+                m_ItemContainer.UpdateBindings();
+        }
+#endif
+
+		protected override AccessibleObject CreateAccessibilityInstance()
+		{
+			return new SideBarAccessibleObject(this);
+		}
+
+		protected override void OnClick(EventArgs e)
+		{
+			m_ItemContainer.InternalClick(Control.MouseButtons,Control.MousePosition);
+			base.OnClick(e);
+		}
+
+		protected override void OnDoubleClick(EventArgs e)
+		{
+			m_ItemContainer.InternalDoubleClick(Control.MouseButtons,Control.MousePosition);
+			base.OnDoubleClick(e);
+		}
+
+		protected override void OnKeyDown(KeyEventArgs e)
+		{
+			ExKeyDown(e);
+			base.OnKeyDown(e);
+		}
+
+		internal void ExKeyDown(KeyEventArgs e)
+		{
+			m_ItemContainer.InternalKeyDown(e);
+		}
+
+		protected override void OnLostFocus(EventArgs e)
+		{
+			base.OnLostFocus(e);
+			((IOwner)this).SetFocusItem(null);			
+		}
+
+		protected override void OnGotFocus(EventArgs e)
+		{
+			base.OnGotFocus(e);
+			if(m_ItemContainer!=null)
+				m_ItemContainer.FocusNextItem();
+		}
+
+		protected override bool ProcessDialogKey(Keys keyData)
+		{
+			if(this.Focused)
+			{
+				if(keyData==Keys.Down)
+				{
+					if(m_ItemContainer!=null)
+						m_ItemContainer.FocusNextItem();
+					if(((IOwner)this).GetFocusItem()!=null)
+						return true;
+				}
+				else if(keyData==Keys.Up)
+				{
+					if(m_ItemContainer!=null)
+						m_ItemContainer.FocusPreviousItem();
+					if(((IOwner)this).GetFocusItem()!=null)
+						return true;
+				}
+				else if(keyData==Keys.Enter)
+				{
+					if(((IOwner)this).GetFocusItem()!=null)
+					{
+						BaseItem item=((IOwner)this).GetFocusItem();
+						if(item is SideBarPanelItem)
+							item.Expanded=!item.Expanded;
+						else
+							item.RaiseClick();
+						return true;
+					}
+				}
+			}
+			return base.ProcessDialogKey(keyData);
+		}
+
+		protected override void OnMouseDown(MouseEventArgs e)
+		{
+			m_ItemContainer.InternalMouseDown(e);
+			base.OnMouseDown(e);
+		}
+
+		protected override void OnMouseHover(EventArgs e)
+		{
+			base.OnMouseHover(e);
+			m_ItemContainer.InternalMouseHover();
+		}
+
+		protected override void OnMouseLeave(EventArgs e)
+		{
+			// If we had hot sub item pass the mouse leave message to it...
+			if(this.Cursor!=System.Windows.Forms.Cursors.Arrow)
+				this.Cursor=System.Windows.Forms.Cursors.Arrow;
+			m_ItemContainer.InternalMouseLeave();
+			base.OnMouseLeave(e);
+		}
+
+		protected override void OnMouseMove(MouseEventArgs e)
+		{
+			base.OnMouseMove(e);
+			if(m_DragInProgress)
+			{
+				if(!m_UseNativeDragDrop)
+					MouseDragOver(e.X,e.Y,null);
+			}
+			else
+				m_ItemContainer.InternalMouseMove(e);
+//			if(EventMouseMove!=null)
+//				EventMouseMove(this,e);
+		}
+
+        protected override void OnMouseWheel(MouseEventArgs e)
+        {
+            SideBarPanelItem expanded = this.ExpandedPanel;
+            if (expanded != null)
+                expanded.OnMouseWheel(e);
+            base.OnMouseWheel(e);
+        }
+
+		protected override void OnDragOver(DragEventArgs e)
+		{
+			if(m_DragInProgress || m_ExternalDragInProgress)
+			{
+				Point p=this.PointToClient(new Point(e.X,e.Y));
+				MouseDragOver(p.X,p.Y,e);
+				m_DragLeft=false;
+			}
+			base.OnDragOver(e);
+		}
+
+		protected override void OnDragLeave(EventArgs e)
+		{
+			if(m_DragInProgress || m_ExternalDragInProgress)
+				MouseDragOver(-1,-1,null);
+			m_DragLeft=true;
+			m_ExternalDragInProgress=false;
+			base.OnDragLeave(e);
+		}
+
+		protected override void OnDragEnter(DragEventArgs e)
+		{
+			base.OnDragEnter(e);
+			if(m_DragInProgress || !m_AllowExternalDrop)
+				return;
+			if(e.Data.GetData(typeof(ButtonItem))==null)
+			{
+				if(e.Effect!=DragDropEffects.None)
+					m_ExternalDragInProgress=true;
+				return;
+			}
+			if((e.AllowedEffect & DragDropEffects.Move)==DragDropEffects.Move)
+				e.Effect=DragDropEffects.Move;
+			else if((e.AllowedEffect & DragDropEffects.Copy)==DragDropEffects.Copy)
+				e.Effect=DragDropEffects.Move;
+			else if((e.AllowedEffect & DragDropEffects.Link)==DragDropEffects.Link)
+				e.Effect=DragDropEffects.Move;
+			else
+				return;
+			m_ExternalDragInProgress=true;
+		}
+
+		protected override void OnDragDrop(DragEventArgs e)
+		{
+			if(m_DragInProgress)
+			{
+				Point p=this.PointToClient(new Point(e.X,e.Y));
+				MouseDragDrop(p.X,p.Y,null);
+			}
+			else if(m_ExternalDragInProgress)
+			{
+				Point p=this.PointToClient(new Point(e.X,e.Y));
+				MouseDragDrop(p.X,p.Y,e);
+			}
+			base.OnDragDrop(e);
+		}
+
+		protected override void OnQueryContinueDrag(QueryContinueDragEventArgs e)
+		{
+			if(m_DragInProgress)
+			{
+				if(m_DragLeft && e.Action==DragAction.Drop || e.Action==DragAction.Cancel)
+					MouseDragDrop(-1,-1,null);
+			}
+			base.OnQueryContinueDrag(e);
+		}
+
+		private void MouseDragOver(int x, int y, DragEventArgs dragArgs)
+		{
+			if(!m_DragInProgress && !m_ExternalDragInProgress)
+				return;
+			BaseItem dragItem=m_DragItem;
+			
+			if(m_ExternalDragInProgress && dragArgs!=null)
+				dragItem=dragArgs.Data.GetData(typeof(ButtonItem)) as BaseItem;
+
+			if(m_DesignTimeProvider!=null)
+			{
+				m_DesignTimeProvider.DrawReversibleMarker(m_InsertPosition,m_InsertBefore);
+				m_DesignTimeProvider=null;
+			}
+
+			if(m_ExternalDragInProgress && dragItem==null)
+                return;
+
+			Point pScreen=this.PointToScreen(new Point(x,y));
+			foreach(SideBarPanelItem panel in m_ItemContainer.SubItems)
+			{
+				if(!panel.Visible)
+					continue;
+				InsertPosition pos=((IDesignTimeProvider)panel).GetInsertPosition(pScreen, dragItem);
+				
+				if(pos!=null)
+				{
+					if(pos.TargetProvider==null)
+					{
+						// Cursor is over drag item
+						if(!m_UseNativeDragDrop)
+						{
+							if(m_NACursor!=null)
+								System.Windows.Forms.Cursor.Current=m_NACursor;
+							else
+								System.Windows.Forms.Cursor.Current=System.Windows.Forms.Cursors.No;
+						}
+						break;
+					}
+					pos.TargetProvider.DrawReversibleMarker(pos.Position,pos.Before);
+					m_InsertPosition=pos.Position;
+					m_InsertBefore=pos.Before;
+					m_DesignTimeProvider=pos.TargetProvider;
+					if(!m_UseNativeDragDrop)
+					{
+						if(m_MoveCursor!=null)
+							System.Windows.Forms.Cursor.Current=m_MoveCursor;
+						else
+							System.Windows.Forms.Cursor.Current=System.Windows.Forms.Cursors.Hand;
+					}
+					else if(dragArgs!=null)
+						dragArgs.Effect=DragDropEffects.Move;
+					break;
+				}
+				else
+				{
+					if(!m_UseNativeDragDrop)
+					{
+						if(m_NACursor!=null)
+							System.Windows.Forms.Cursor.Current=m_NACursor;
+						else
+							System.Windows.Forms.Cursor.Current=System.Windows.Forms.Cursors.No;
+					}
+					else if(dragArgs!=null)
+						dragArgs.Effect=DragDropEffects.None;
+				}
+			}
+		}
+
+		protected override void OnMouseUp(MouseEventArgs e)
+		{
+			base.OnMouseUp(e);
+			if(!m_UseNativeDragDrop)
+				MouseDragDrop(e.X,e.Y,null);
+
+			m_ItemContainer.InternalMouseUp(e);
+		}
+
+		private void MouseDragDrop(int x, int y, DragEventArgs dragArgs)
+		{
+			if(!m_DragInProgress && !m_ExternalDragInProgress)
+				return;
+			BaseItem dragItem=m_DragItem;
+			if(m_ExternalDragInProgress)
+				dragItem=dragArgs.Data.GetData(typeof(ButtonItem)) as BaseItem;
+
+			if(dragItem!=null)
+				dragItem.InternalMouseLeave();
+
+			if(m_DesignTimeProvider!=null)
+			{
+				if(x==-1 && y==-1)
+				{
+					// Cancel state
+					m_DesignTimeProvider.DrawReversibleMarker(m_InsertPosition, m_InsertBefore);
+				}
+				else
+				{
+					m_DesignTimeProvider.DrawReversibleMarker(m_InsertPosition, m_InsertBefore);
+					if(dragItem!=null)
+					{
+						BaseItem objParent=dragItem.Parent;
+						if(objParent!=null)
+						{
+							if(objParent==(BaseItem)m_DesignTimeProvider && m_InsertPosition>0)
+							{
+								if(objParent.SubItems.IndexOf(dragItem)<m_InsertPosition)
+									m_InsertPosition--;
+							}
+							objParent.SubItems.Remove(dragItem);
+							Control ctrl=objParent.ContainerControl as Control;
+							objParent.Refresh();
+						}
+						m_DesignTimeProvider.InsertItemAt(dragItem,m_InsertPosition,m_InsertBefore);
+						m_DesignTimeProvider=null;
+						((IOwner)this).InvokeUserCustomize(dragItem,new EventArgs());
+					}
+				}
+			}
+			m_DesignTimeProvider=null;
+			m_DragInProgress=false;
+			m_ExternalDragInProgress=false;
+			if(!m_UseNativeDragDrop)
+				System.Windows.Forms.Cursor.Current=System.Windows.Forms.Cursors.Default;
+			this.Capture=false;
+			if(dragItem!=null)
+				dragItem._IgnoreClick=true;
+			m_ItemContainer.InternalMouseUp(new MouseEventArgs(MouseButtons.Left,0,x,y,0));
+			if(dragItem!=null)
+				dragItem._IgnoreClick=false;
+
+			m_DragItem=null;
+		}
+
+        private Rendering.BaseRenderer m_DefaultRenderer = null;
+        private Rendering.BaseRenderer m_Renderer = null;
+        private eRenderMode m_RenderMode = eRenderMode.Global;
+        /// <summary>
+        /// Returns the renderer control will be rendered with.
+        /// </summary>
+        /// <returns>The current renderer.</returns>
+        public virtual Rendering.BaseRenderer GetRenderer()
+        {
+            if (m_RenderMode == eRenderMode.Global && Rendering.GlobalManager.Renderer != null)
+                return Rendering.GlobalManager.Renderer;
+            else if (m_RenderMode == eRenderMode.Custom && m_Renderer != null)
+                return m_Renderer;
+
+            if (m_DefaultRenderer == null)
+                m_DefaultRenderer = new Rendering.Office2007Renderer();
+
+            return m_Renderer;
+        }
+
+        /// <summary>
+        /// Gets or sets the redering mode used by control. Default value is eRenderMode.Global which means that static GlobalManager.Renderer is used. If set to Custom then Renderer property must
+        /// also be set to the custom renderer that will be used.
+        /// </summary>
+        [Browsable(false), DefaultValue(eRenderMode.Global)]
+        public eRenderMode RenderMode
+        {
+            get { return m_RenderMode; }
+            set
+            {
+                if (m_RenderMode != value)
+                {
+                    m_RenderMode = value;
+                    this.Invalidate(true);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the custom renderer used by the items on this control. RenderMode property must also be set to eRenderMode.Custom in order renderer
+        /// specified here to be used.
+        /// </summary>
+        [Browsable(false), DefaultValue(null)]
+        public DevComponents.DotNetBar.Rendering.BaseRenderer Renderer
+        {
+            get
+            {
+                return m_Renderer;
+            }
+            set { m_Renderer = value; }
+        }
+
+		protected override void OnPaint(PaintEventArgs e)
+		{
+			if(m_ItemContainer==null || this.IsDisposed)
+				return;
+			
+			Graphics g=e.Graphics;
+			g.PageUnit=GraphicsUnit.Pixel;
+
+			Rectangle r=this.ClientRectangle;
+            if (!BarFunctions.IsOffice2007Style(this.Style))
+			    BarFunctions.DrawBorder(g,m_BorderStyle,r,SystemColors.ControlText);
+            ColorScheme cs = m_ColorScheme;
+            if (!cs.SchemeChanged && BarFunctions.IsOffice2007Style(this.Style) && GlobalManager.Renderer is Office2007Renderer)
+            {
+                cs = ((Office2007Renderer)GlobalManager.Renderer).ColorTable.LegacyColors;
+            }
+            ItemPaintArgs pa = new ItemPaintArgs(this as IOwner, this, e.Graphics, cs);
+            pa.Renderer = GetRenderer();
+
+            if (BarFunctions.IsOffice2007Style(this.Style))
+            {
+                BaseRenderer renderer = pa.Renderer;
+                SideBarRendererEventArgs renderArgs = new SideBarRendererEventArgs(this, g);
+                renderArgs.ItemPaintArgs = pa;
+                renderer.DrawSideBar(renderArgs);
+            }
+			else if(this.BackColor==SystemColors.Control && this.IsThemed)
+			{
+				if(m_BorderStyle==eBorderType.SingleLine)
+					r.Inflate(-1,-1);
+				else if(m_BorderStyle!=eBorderType.None)
+					r.Inflate(-2,-2);
+
+				ThemeRebar theme=((IThemeCache)this).ThemeRebar;
+				theme.DrawBackground(e.Graphics,ThemeRebarParts.Background,ThemeRebarStates.Normal,r);
+			}
+			else
+			{
+				if(m_BorderStyle==eBorderType.None)
+				{
+					using(SolidBrush brush=new SolidBrush(this.BackColor))
+						g.FillRectangle(brush,this.DisplayRectangle);
+					//g.Clear(this.BackColor);
+				}
+				else if(m_BorderStyle==eBorderType.SingleLine)
+				{
+					r.Inflate(-1,-1);
+				}
+				else
+				{
+					r.Inflate(-2,-2);
+				}
+				g.FillRectangle(new SolidBrush(this.BackColor),r);
+			}
+
+			
+			m_ItemContainer.Paint(pa);
+			if(m_ItemContainer.SubItems.Count==0 && this.DesignMode)
+			{
+				string info=INFO_EMPTYSIDEBAR;
+				Rectangle rText=this.ClientRectangle;
+				r.Inflate(-2,-2);
+                eTextFormat format = eTextFormat.Default | eTextFormat.HorizontalCenter | 
+                    eTextFormat.VerticalCenter | eTextFormat.WordBreak;
+				TextDrawing.DrawString(g,info,this.Font,SystemColors.ControlDark,rText,format);
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets visual appearance for the control.
+		/// </summary>
+		[Browsable(true),DefaultValue(eSideBarAppearance.Traditional),Category("Appearance"),Description("Indicates visual appearance for the control.")]
+		public eSideBarAppearance Appearance
+		{
+			get {return m_Appearance;}
+			set
+			{
+				if(m_Appearance!=value)
+				{
+					m_Appearance=value;
+					m_ItemContainer.Appearance=value;
+					if(m_Appearance==eSideBarAppearance.Flat && this.Panels.Count>0 && this.Panels[0] is SideBarPanelItem)
+					{
+						if(!((SideBarPanelItem)this.Panels[0]).BackgroundStyle.Custom)
+						{
+							this.PredefinedColorScheme=eSideBarColorScheme.SystemColors;
+							if(this.DesignMode)
+                                ApplyPredefinedColorScheme(eSideBarColorScheme.SystemColors);	
+						}
+					}
+					this.Refresh();
+				}
+			}
+		}
+
+		/// <summary>
+		///     Gets or sets whether flat side bar is using system colors.
+		/// </summary>
+		/// <remarks>
+		///     This property is used internally by side bar to determine whether to reset color scheme based on system colors.
+		///     If you want side bar to use system colors you need to set PredefinedColorScheme property.
+		/// </remarks>
+		[Browsable(false),DefaultValue(false)]
+		public bool UsingSystemColors
+		{
+			get {return m_UsingSystemColors;}
+			set
+			{
+				m_UsingSystemColors=value;
+			}
+		}
+
+		[DesignOnly(true),Browsable(false)]
+		public eSideBarColorScheme PredefinedColorScheme
+		{
+			get {return m_PredefinedColorScheme;}
+			set
+			{
+				m_PredefinedColorScheme=value;
+				if(m_PredefinedColorScheme==eSideBarColorScheme.SystemColors)
+					m_UsingSystemColors=true;
+				else
+					m_UsingSystemColors=false;
+				if(!this.DesignMode)
+					ApplyPredefinedColorScheme(m_PredefinedColorScheme);
+			}
+		}
+		/// <summary>
+		/// Gets or sets Bar Color Scheme.
+		/// </summary>
+		[Browsable(false),DevCoBrowsable(false),Category("Appearance"),Description("Gets or sets Bar Color Scheme."),DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+		public DevComponents.DotNetBar.ColorScheme ColorScheme
+		{
+			get {return m_ColorScheme;}
+			set
+			{
+				if(value==null)
+					throw new ArgumentException("NULL is not a valid value for this property.");
+				m_ColorScheme=value;
+				if(this.Visible)
+					this.Refresh();
+			}
+		}
+		[Browsable(false),EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeColorScheme()
+		{
+			return m_ColorScheme.SchemeChanged;
+		}
+        [EditorBrowsable(EditorBrowsableState.Never)]
+		public void ApplyPredefinedColorScheme(eSideBarColorScheme scheme)
+		{
+			if(m_ItemContainer==null)
+				return;
+			SideBar.ApplyColorScheme(this.ColorScheme,scheme);
+			foreach(BaseItem item in m_ItemContainer.SubItems)
+			{
+				if(item is SideBarPanelItem)
+					SideBar.ApplyColorScheme((SideBarPanelItem)item,scheme);
+			}
+			this.Refresh();
+		}
+
+		/// <summary>
+		/// Gets/Sets the visual style of the SideBar.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Appearance"),System.ComponentModel.Description("Specifies the visual style of the side bar."),DefaultValue(eDotNetBarStyle.OfficeXP)]
+		public eDotNetBarStyle Style
+		{
+			get
+			{
+				return m_ItemContainer.Style;
+			}
+			set
+			{
+				if(m_ItemContainer.Style==value)
+					return;
+				m_ColorScheme.Style=value;
+				m_ItemContainer.Style=value;
+				this.Invalidate();
+				this.RecalcLayout();
+			}
+		}
+        [EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetTraditional()
+		{
+			m_Appearance=eSideBarAppearance.Traditional;
+			m_ColorScheme.Style=m_ItemContainer.Style;
+			m_ItemContainer.Style=m_ItemContainer.Style;
+			
+			foreach(SideBarPanelItem item in this.Panels)
+			{
+				item.ResetHeaderHotStyle();
+				item.ResetHeaderMouseDownStyle();
+				item.ResetHeaderSideHotStyle();
+				item.ResetHeaderSideMouseDownStyle();
+				item.ResetHeaderSideStyle();
+				item.ResetHeaderStyle();
+				item.ResetBackgroundStyle();
+			}
+
+			this.Invalidate();
+			this.RecalcLayout();
+		}
+
+		protected bool IsThemed
+		{
+			get
+			{
+                if (m_ThemeAware && (m_ItemContainer.EffectiveStyle == eDotNetBarStyle.OfficeXP || m_ItemContainer.EffectiveStyle == eDotNetBarStyle.Office2003 || m_ItemContainer.EffectiveStyle == eDotNetBarStyle.VS2005 || BarFunctions.IsOffice2007Style(m_ItemContainer.EffectiveStyle)) && BarFunctions.ThemedOS && Themes.ThemesActive)
+					return true;
+				return false;
+			}
+		}
+
+		/// <summary>
+		/// Specifies whether SideBar is drawn using Themes when running on OS that supports themes like Windows XP.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DevCoBrowsable(true),System.ComponentModel.DefaultValue(false),System.ComponentModel.Category("Appearance"),System.ComponentModel.Description("Specifies whether SideBar is drawn using Themes when running on OS that supports themes like Windows XP.")]
+		public virtual bool ThemeAware
+		{
+			get
+			{
+				return m_ThemeAware;
+			}
+			set
+			{
+				m_ThemeAware=value;
+				m_ItemContainer.ThemeAware=value;
+				if(this.DesignMode)
+					this.Refresh();
+			}
+		}
+
+		protected override void OnSystemColorsChanged(EventArgs e)
+		{
+			base.OnSystemColorsChanged(e);
+
+			Application.DoEvents();
+
+			m_ColorScheme.Refresh(null,true);
+
+			if(m_ItemContainer!=null)
+			{
+				foreach(SideBarPanelItem item in m_ItemContainer.SubItems)
+					item.RefreshItemStyleSystemColors();
+			}
+
+			if(m_UsingSystemColors && this.Appearance!=eSideBarAppearance.Traditional)
+			{
+				this.PredefinedColorScheme=eSideBarColorScheme.SystemColors;
+				this.Invalidate(true);
+			}
+		}
+
+		protected override void WndProc(ref Message m)
+		{
+			if(m.Msg==NativeFunctions.WM_THEMECHANGED)
+			{
+				this.RefreshThemes();
+			}
+			// This code was added to support windows animation that we used for auto-hide windows.
+//			else if(m.Msg==NativeFunctions.WM_PRINTCLIENT && m.WParam!=IntPtr.Zero)
+//			{
+//				Graphics g=null;
+//				try
+//				{
+//					g=Graphics.FromHdc(m.WParam);
+//					this.OnPaint(new PaintEventArgs(g,this.ClientRectangle));
+//				}
+//				finally
+//				{
+//					if(g!=null)
+//						g.Dispose();
+//				}
+//			}
+			base.WndProc(ref m);
+		}
+
+		private void RefreshThemes()
+		{
+			if(m_ThemeWindow!=null)
+			{
+				m_ThemeWindow.Dispose();
+				m_ThemeWindow=new ThemeWindow(this);
+			}
+			if(m_ThemeRebar!=null)
+			{
+				m_ThemeRebar.Dispose();
+				m_ThemeRebar=new ThemeRebar(this);
+			}
+			if(m_ThemeToolbar!=null)
+			{
+				m_ThemeToolbar.Dispose();
+				m_ThemeToolbar=new ThemeToolbar(this);
+			}
+			if(m_ThemeHeader!=null)
+			{
+				m_ThemeHeader.Dispose();
+				m_ThemeHeader=new ThemeHeader(this);
+			}
+			if(m_ThemeScrollBar!=null)
+			{
+				m_ThemeScrollBar.Dispose();
+				m_ThemeScrollBar=new ThemeScrollBar(this);
+			}
+			if(m_ThemeProgress!=null)
+			{
+				m_ThemeProgress.Dispose();
+				m_ThemeProgress=new ThemeProgress(this);
+			}
+			if(m_ThemeExplorerBar!=null)
+			{
+				m_ThemeExplorerBar.Dispose();
+				m_ThemeExplorerBar=new ThemeExplorerBar(this);
+			}
+            if (m_ThemeButton != null)
+            {
+                m_ThemeButton.Dispose();
+                m_ThemeButton = new ThemeButton(this);
+            }
+		}
+		private void DisposeThemes()
+		{
+			if(m_ThemeWindow!=null)
+			{
+				m_ThemeWindow.Dispose();
+				m_ThemeWindow=null;
+			}
+			if(m_ThemeRebar!=null)
+			{
+				m_ThemeRebar.Dispose();
+				m_ThemeRebar=null;
+			}
+			if(m_ThemeToolbar!=null)
+			{
+				m_ThemeToolbar.Dispose();
+				m_ThemeToolbar=null;
+			}
+			if(m_ThemeHeader!=null)
+			{
+				m_ThemeHeader.Dispose();
+				m_ThemeHeader=null;
+			}
+			if(m_ThemeScrollBar!=null)
+			{
+				m_ThemeScrollBar.Dispose();
+				m_ThemeScrollBar=null;
+			}
+            if (m_ThemeProgress != null)
+            {
+                m_ThemeProgress.Dispose();
+                m_ThemeProgress = null;
+            }
+            if (m_ThemeExplorerBar != null)
+            {
+                m_ThemeExplorerBar.Dispose();
+                m_ThemeExplorerBar = null;
+            }
+            if (m_ThemeButton != null)
+            {
+                m_ThemeButton.Dispose();
+                m_ThemeButton = null;
+            }
+		}
+		protected override void OnHandleDestroyed(EventArgs e)
+		{
+			DisposeThemes();
+			MenuEventSupportUnhook();
+			base.OnHandleDestroyed(e);
+
+			if(m_FilterInstalled)
+			{
+				MessageHandler.UnregisterMessageClient(this);
+				m_FilterInstalled=false;
+			}
+		}
+		DevComponents.DotNetBar.ThemeWindow IThemeCache.ThemeWindow
+		{
+			get
+			{
+				if(m_ThemeWindow==null)
+					m_ThemeWindow=new ThemeWindow(this);
+				return m_ThemeWindow;
+			}
+		}
+		DevComponents.DotNetBar.ThemeRebar IThemeCache.ThemeRebar
+		{
+			get
+			{
+				if(m_ThemeRebar==null)
+					m_ThemeRebar=new ThemeRebar(this);
+				return m_ThemeRebar;
+			}
+		}
+		DevComponents.DotNetBar.ThemeToolbar IThemeCache.ThemeToolbar
+		{
+			get
+			{
+				if(m_ThemeToolbar==null)
+					m_ThemeToolbar=new ThemeToolbar(this);
+				return m_ThemeToolbar;
+			}
+		}
+		DevComponents.DotNetBar.ThemeHeader IThemeCache.ThemeHeader
+		{
+			get
+			{
+				if(m_ThemeHeader==null)
+					m_ThemeHeader=new ThemeHeader(this);
+				return m_ThemeHeader;
+			}
+		}
+		DevComponents.DotNetBar.ThemeScrollBar IThemeCache.ThemeScrollBar
+		{
+			get
+			{
+				if(m_ThemeScrollBar==null)
+					m_ThemeScrollBar=new ThemeScrollBar(this);
+				return m_ThemeScrollBar;
+			}
+		}
+		DevComponents.DotNetBar.ThemeExplorerBar IThemeCache.ThemeExplorerBar
+		{
+			get
+			{
+				if(m_ThemeExplorerBar==null)
+					m_ThemeExplorerBar=new ThemeExplorerBar(this);
+				return m_ThemeExplorerBar;
+			}
+		}
+		DevComponents.DotNetBar.ThemeProgress IThemeCache.ThemeProgress
+		{
+			get
+			{
+				if(m_ThemeProgress==null)
+					m_ThemeProgress=new ThemeProgress(this);
+				return m_ThemeProgress;
+			}
+		}
+        DevComponents.DotNetBar.ThemeButton IThemeCache.ThemeButton
+        {
+            get
+            {
+                if (m_ThemeButton == null)
+                    m_ThemeButton = new ThemeButton(this);
+                return m_ThemeButton;
+            }
+        }
+
+		protected override void OnResize(EventArgs e)
+		{
+			base.OnResize(e);
+            if (this.Width == 0 || this.Height == 0)
+                return;
+			this.RecalcSize();
+		}
+
+		protected virtual void RecalcSize()
+		{
+			if(!BarFunctions.IsHandleValid(this))
+				return;
+			if(m_BorderStyle==eBorderType.None)
+			{
+                if (BarFunctions.IsOffice2007Style(this.Style))
+                {
+                    m_ItemContainer.WidthInternal = this.Width - 2;
+                    m_ItemContainer.HeightInternal = this.Height - 2;
+                    m_ItemContainer.LeftInternal = 1;
+                    m_ItemContainer.TopInternal = 1;
+                }
+				else if(m_Appearance==eSideBarAppearance.Traditional)
+				{
+					m_ItemContainer.WidthInternal =this.Width-2;
+					m_ItemContainer.HeightInternal=this.Height-2;
+				}
+				else
+				{
+					m_ItemContainer.WidthInternal =this.Width;
+					m_ItemContainer.HeightInternal=this.Height-2;
+				}
+			}
+			else
+			{
+				m_ItemContainer.LeftInternal=2;
+				m_ItemContainer.TopInternal=2;
+				m_ItemContainer.WidthInternal =this.Width-4;
+				m_ItemContainer.HeightInternal=this.Height-4;
+			}
+			m_ItemContainer.RecalcSize();
+            OnItemLayoutUpdated(EventArgs.Empty);
+		}
+
+        /// <summary>
+        /// Occurs after internal item layout has been updated and items have valid bounds assigned.
+        /// </summary>
+        public event EventHandler ItemLayoutUpdated;
+        /// <summary>
+        /// Raises ItemLayoutUpdated event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnItemLayoutUpdated(EventArgs e)
+        {
+            EventHandler handler = ItemLayoutUpdated;
+            if (handler != null)
+                handler(this, e);
+        }
+
+		public void RecalcLayout()
+		{
+			this.RecalcSize();
+			this.Refresh();
+		}
+        [EditorBrowsable(EditorBrowsableState.Never)]
+		public void SetDesignMode()
+		{
+			m_ItemContainer.SetDesignMode(true);
+		}
+
+		protected override void OnHandleCreated(EventArgs e)
+		{
+			if(this.DesignMode)
+				SetDesignMode();
+			base.OnHandleCreated(e);
+
+			if(!m_FilterInstalled && !this.DesignMode)
+			{
+				MessageHandler.RegisterMessageClient(this);
+				m_FilterInstalled=true;
+			}
+			this.RecalcLayout();
+		}
+
+		protected override void OnParentChanged(EventArgs e)
+		{
+			base.OnParentChanged(e);
+			if(m_DelayedExpandedPanel!=null)
+			{
+				if(m_ItemContainer.SubItems.Contains(m_DelayedExpandedPanel))
+					m_DelayedExpandedPanel.Expanded=true;
+				m_DelayedExpandedPanel=null;
+			}
+			if(this.Parent!=null && (this.Images!=null || this.ImagesLarge!=null || this.ImagesMedium!=null))
+			{
+				foreach(SideBarPanelItem panel in m_ItemContainer.SubItems)
+				{
+					foreach(BaseItem item in panel.SubItems)
+					{
+						if(item is ImageItem)
+							((ImageItem)item).OnImageChanged();
+					}
+				}
+			}
+		}
+
+		/// <summary>
+		/// Returns the collection of side-bar Panels.
+		/// </summary>
+        [System.ComponentModel.Editor("DevComponents.DotNetBar.Design.SideBarPanelsEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), DesignerSerializationVisibility(DesignerSerializationVisibility.Content), System.ComponentModel.Category("Data"), System.ComponentModel.Description("Returns the collection of side-bar Panels.")]
+		public SubItemsCollection Panels
+		{
+			get
+			{
+				return m_ItemContainer.SubItems;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the expanded panel. Only one panel can be expanded at a time.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),System.ComponentModel.Category("Data"),System.ComponentModel.Description("Gets or sets the expanded panel. Only one panel can be expanded at a time.")]
+		public SideBarPanelItem ExpandedPanel
+		{
+			get
+			{
+				return m_ItemContainer.ExpandedItem() as SideBarPanelItem;
+			}
+			set
+			{
+				if(!m_ItemContainer.SubItems.Contains(value))
+				{
+					//if(this.IsHandleCreated && this.Parent!=null)
+						//throw(new ArgumentException("Item is not member of Panels collection"));
+					//else
+					m_DelayedExpandedPanel=value;
+				}
+				else
+					value.Expanded=true;
+			}
+		}
+
+		void IOwnerItemEvents.InvokeItemAdded(BaseItem item,EventArgs e)
+		{
+			if(ItemAdded!=null)
+				ItemAdded(item,e);
+		}
+		void IOwnerItemEvents.InvokeItemRemoved(BaseItem item, BaseItem parent, int itemIndex)
+		{
+			if(ItemRemoved!=null)
+			{
+                ItemRemoved(item, new ItemRemovedEventArgs(parent, itemIndex));
+			}
+		}
+		void IOwnerItemEvents.InvokeMouseEnter(BaseItem item,EventArgs e)
+		{
+			if(EventMouseEnter!=null)
+				EventMouseEnter.Invoke(item,e);
+		}
+		void IOwnerItemEvents.InvokeMouseHover(BaseItem item,EventArgs e)
+		{
+			if(EventMouseHover!=null)
+				EventMouseHover.Invoke(item,e);
+		}
+		void IOwnerItemEvents.InvokeMouseLeave(BaseItem item,EventArgs e)
+		{
+			if(EventMouseLeave!=null)
+				EventMouseLeave.Invoke(item,e);
+		}
+		void IOwnerItemEvents.InvokeMouseDown(BaseItem item, System.Windows.Forms.MouseEventArgs e)
+		{
+			if (EventMouseDown!= null)
+	 			EventMouseDown.Invoke(item, e);
+			//if(this.MouseDown!=null)
+			//	this.MouseDown(item,e);
+			if(item.ClickAutoRepeat && e.Button==MouseButtons.Left)
+			{
+				m_ClickRepeatItem=item;
+				if(m_ClickTimer==null)
+					m_ClickTimer=new Timer();
+				m_ClickTimer.Interval=item.ClickRepeatInterval;
+				m_ClickTimer.Tick+=new EventHandler(this.ClickTimerTick);
+				m_ClickTimer.Start();
+			}
+		}
+		void IOwnerItemEvents.InvokeMouseUp(BaseItem item, System.Windows.Forms.MouseEventArgs e)
+		{
+			if(EventMouseUp!=null)
+				EventMouseUp.Invoke(item, e);
+
+			if(m_ClickTimer!=null && m_ClickTimer.Enabled)
+			{
+				m_ClickTimer.Stop();
+				m_ClickTimer.Enabled=false;
+			}
+		}
+		void IOwnerItemEvents.InvokeMouseMove(BaseItem item, System.Windows.Forms.MouseEventArgs e)
+		{
+			if(EventMouseMove!=null)
+				EventMouseMove.Invoke(item,e);
+		}
+        void IOwnerItemEvents.InvokeItemDoubleClick(BaseItem objItem, MouseEventArgs e)
+        {
+            OnItemDoubleClick(objItem, e);
+        }
+        /// <summary>
+        /// Invokes ItemDoubleClick event.
+        /// </summary>
+        /// <param name="objItem">Reference to item double-clicked</param>
+        /// <param name="e">Event arguments</param>
+        protected virtual void OnItemDoubleClick(BaseItem objItem, MouseEventArgs e)
+        {
+            MouseEventHandler handler = ItemDoubleClick;
+            if (handler != null)
+                handler(objItem, e);
+        }
+		void IOwnerItemEvents.InvokeItemClick(BaseItem objItem)
+		{
+			if(ItemClick!=null)
+				ItemClick(objItem,new EventArgs());
+		}
+		void IOwnerItemEvents.InvokeGotFocus(BaseItem item,EventArgs e)
+		{
+			if(EventGotFocus!=null)
+				EventGotFocus.Invoke(item,e);
+		}
+		void IOwnerItemEvents.InvokeLostFocus(BaseItem item,EventArgs e)
+		{
+			if(EventLostFocus!=null)
+				EventLostFocus.Invoke(item,e);
+		}
+		void IOwnerItemEvents.InvokeExpandedChange(BaseItem item,EventArgs e)
+		{
+			if(ExpandedChange!=null)
+				ExpandedChange(item,e);
+		}
+		void IOwnerItemEvents.InvokeItemTextChanged(BaseItem item, EventArgs e)
+		{
+			if(ItemTextChanged!=null)
+				ItemTextChanged(item,e);
+		}
+
+		void IOwnerItemEvents.InvokeContainerControlDeserialize(BaseItem item,ControlContainerSerializationEventArgs e)
+		{
+			if(ContainerControlDeserialize!=null)
+				ContainerControlDeserialize(item,e);
+		}
+		void IOwnerItemEvents.InvokeContainerControlSerialize(BaseItem item,ControlContainerSerializationEventArgs e)
+		{
+			if(ContainerControlSerialize!=null)
+				ContainerControlSerialize(item,e);
+		}
+		void IOwnerItemEvents.InvokeContainerLoadControl(BaseItem item,EventArgs e)
+		{
+			if(ContainerLoadControl!=null)
+				ContainerLoadControl(item,e);
+		}
+		void IOwnerItemEvents.InvokeOptionGroupChanging(BaseItem item, OptionGroupChangingEventArgs e)
+		{
+			if(OptionGroupChanging!=null)
+				OptionGroupChanging(item,e);
+		}
+
+		void IOwnerItemEvents.InvokeToolTipShowing(object item, EventArgs e)
+		{
+			if(ToolTipShowing!=null)
+				ToolTipShowing(item,e);
+		}
+
+        void IOwnerItemEvents.InvokeCheckedChanged(ButtonItem item, EventArgs e)
+        {
+            if (ButtonCheckedChanged != null)
+                ButtonCheckedChanged(item, e);
+        }
+//		void IOwnerItemEvents.InvokeItemDisplayedChanged(BaseItem item,EventArgs e)
+//		{
+////			if(ItemDisplayedChanged!=null)
+////				ItemDisplayedChanged(item,e);
+//		}
+
+		private void ClickTimerTick(object sender, EventArgs e)
+		{
+			if(m_ClickRepeatItem!=null)
+				m_ClickRepeatItem.RaiseClick();
+			else
+				m_ClickTimer.Stop();
+		}
+
+		/// <summary>
+		/// Gets or sets the form SideBar is attached to.
+		/// </summary>
+		Form IOwner.ParentForm
+		{
+			get
+			{
+				return base.FindForm();
+			}
+			set
+			{
+			}
+		}
+
+		/// <summary>
+		/// Returns the collection of items with the specified name.
+		/// </summary>
+		/// <param name="ItemName">Item name to look for.</param>
+		/// <returns></returns>
+		public ArrayList GetItems(string ItemName)
+		{
+			ArrayList list=new ArrayList(15);
+			BarFunctions.GetSubItemsByName(m_ItemContainer,ItemName,list);
+			return list;
+		}
+
+		/// <summary>
+		/// Returns the collection of items with the specified name and type.
+		/// </summary>
+		/// <param name="ItemName">Item name to look for.</param>
+		/// <param name="itemType">Item type to look for.</param>
+		/// <returns></returns>
+		public ArrayList GetItems(string ItemName, Type itemType)
+		{
+			ArrayList list=new ArrayList(15);
+			BarFunctions.GetSubItemsByNameAndType(m_ItemContainer,ItemName,list,itemType);
+			return list;
+		}
+
+        /// <summary>
+        /// Returns the collection of items with the specified name and type.
+        /// </summary>
+        /// <param name="ItemName">Item name to look for.</param>
+        /// <param name="itemType">Item type to look for.</param>
+        /// <returns></returns>
+        public ArrayList GetItems(string ItemName, Type itemType, bool useGlobalName)
+        {
+            ArrayList list = new ArrayList(15);
+            BarFunctions.GetSubItemsByNameAndType(m_ItemContainer, ItemName, list, itemType, useGlobalName);
+            return list;
+        }
+
+		/// <summary>
+		/// Returns the first item that matches specified name.
+		/// </summary>
+		/// <param name="ItemName">Item name to look for.</param>
+		/// <returns></returns>
+		public BaseItem GetItem(string ItemName)
+		{
+			BaseItem item=BarFunctions.GetSubItemByName(m_ItemContainer,ItemName);
+			if(item!=null)
+				return item;
+			return null;
+		}
+
+		// Only one Popup Item can be expanded at a time. This is used
+		// to track the currently expanded popup item and to close the popup item
+		// if another item is expanding.
+		void IOwner.SetExpandedItem(BaseItem objItem)
+		{
+			if(objItem!=null && objItem.Parent is PopupItem)
+				return;
+			if(m_ExpandedItem!=null)
+			{
+				if(m_ExpandedItem.Expanded)
+					m_ExpandedItem.Expanded=false;
+				m_ExpandedItem=null;
+			}
+			m_ExpandedItem=objItem;
+		}
+
+		BaseItem IOwner.GetExpandedItem()
+		{
+			return m_ExpandedItem;
+		}
+
+		// Currently we are using this to communicate "focus" when control is in
+		// design mode. This can be used later if we decide to add focus
+		// handling to our BaseItem class.
+		void IOwner.SetFocusItem(BaseItem objFocusItem)
+		{
+			if(m_FocusItem!=null && m_FocusItem!=objFocusItem)
+			{
+				m_FocusItem.OnLostFocus();
+			}
+			if(objFocusItem==null)
+				objFocusItem=null;
+			if(this.DesignMode && this.Panels.Contains(objFocusItem))
+			{
+				foreach(BaseItem panel in this.Panels)
+					BaseItem.CollapseSubItems(panel);
+			}
+			m_FocusItem=objFocusItem;
+			if(m_FocusItem!=null)
+				m_FocusItem.OnGotFocus();
+		}
+
+		BaseItem IOwner.GetFocusItem()
+		{
+			return m_FocusItem;
+		}
+
+		void IOwner.DesignTimeContextMenu(BaseItem objItem)
+		{
+		}
+
+		bool IOwner.DesignMode
+		{
+			get {return this.DesignMode;}
+		}
+
+		void IOwner.RemoveShortcutsFromItem(BaseItem objItem)
+		{
+			ShortcutTableEntry objEntry=null;
+			if(objItem.ShortcutString!="")
+			{
+				foreach(eShortcut key in objItem.Shortcuts)
+				{
+					if(m_ShortcutTable.ContainsKey(key))
+					{
+						objEntry=(ShortcutTableEntry)m_ShortcutTable[key];
+						try
+						{
+							objEntry.Items.Remove(objItem.Id);
+							if(objEntry.Items.Count==0)
+								m_ShortcutTable.Remove(objEntry.Shortcut);
+						}
+						catch(System.ArgumentException)	{}
+					}
+				}
+			}
+			IOwner owner=this as IOwner;
+			foreach(BaseItem objTmp in objItem.SubItems)
+				owner.RemoveShortcutsFromItem(objTmp);
+		}
+
+		void IOwner.AddShortcutsFromItem(BaseItem objItem)
+		{
+			ShortcutTableEntry objEntry=null;
+			if(objItem.ShortcutString!="")
+			{
+				foreach(eShortcut key in objItem.Shortcuts)
+				{
+					if(m_ShortcutTable.ContainsKey(key))
+						objEntry=(ShortcutTableEntry)m_ShortcutTable[objItem.Shortcuts[0]];
+					else
+					{
+						objEntry=new ShortcutTableEntry(key);
+						m_ShortcutTable.Add(objEntry.Shortcut,objEntry);
+					}
+					try
+					{
+						objEntry.Items.Add(objItem.Id,objItem);
+					}
+					catch(System.ArgumentException)	{}
+				}
+			}
+			IOwner owner=this as IOwner;
+			foreach(BaseItem objTmp in objItem.SubItems)
+				owner.AddShortcutsFromItem(objTmp);
+		}
+
+		/// <summary>
+		/// Gets or sets whether end-user can rearrange the items inside the panels.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),System.ComponentModel.DefaultValue(true),System.ComponentModel.Category("Behavior"),System.ComponentModel.Description("Specifies whether end-user can rearrange the items inside the panels.")]
+		public bool AllowUserCustomize
+		{
+			get{return m_AllowUserCustomize;}
+			set{m_AllowUserCustomize=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets whether native .NET Drag and Drop is used by side-bar to perform drag and drop operations. AllowDrop must be set to true to allow drop of the items on control.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),System.ComponentModel.DefaultValue(false),System.ComponentModel.Category("Behavior"),System.ComponentModel.Description("Specifies whether native .NET Drag and Drop is used by side-bar to perform drag and drop operations.")]
+		public bool UseNativeDragDrop
+		{
+			get{return m_UseNativeDragDrop;}
+			set{m_UseNativeDragDrop=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets whether external ButtonItem object is accepted in drag and drop operation. UseNativeDragDrop must be set to true in order for this property to be effective.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),System.ComponentModel.DefaultValue(false),System.ComponentModel.Category("Behavior"),System.ComponentModel.Description("Gets or sets whether external ButtonItem object is accepted in drag and drop operation.")]
+		public bool AllowExternalDrop
+		{
+			get{return m_AllowExternalDrop;}
+			set{m_AllowExternalDrop=value;}
+		}
+		
+		private bool m_DisabledImagesGrayScale=true;
+		/// <summary>
+		/// Gets or sets whether gray-scale algorithm is used to create automatic gray-scale images. Default is true.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DefaultValue(true),System.ComponentModel.Category("Appearance"),Description("Gets or sets whether gray-scale algorithm is used to create automatic gray-scale images.")]
+		public bool DisabledImagesGrayScale
+		{
+			get
+			{
+				return m_DisabledImagesGrayScale;
+			}
+			set
+			{
+				m_DisabledImagesGrayScale=value;
+			}
+		}
+
+		/// <summary>
+		/// ImageList for images used on Items. Images specified here will always be used on menu-items and are by default used on all Bars.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),System.ComponentModel.Category("Data"),DefaultValue(null),System.ComponentModel.Description("ImageList for images used on Items. Images specified here will always be used on menu-items and are by default used on all Bars.")]
+		public System.Windows.Forms.ImageList Images
+		{
+			get
+			{
+				return m_ImageList;
+			}
+			set
+			{
+				if(m_ImageList!=null)
+					m_ImageList.Disposed-=new EventHandler(this.ImageListDisposed);
+				m_ImageList=value;
+				if(m_ImageList!=null)
+					m_ImageList.Disposed+=new EventHandler(this.ImageListDisposed);
+			}
+		}
+
+		/// <summary>
+		/// ImageList for medium-sized images used on Items.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),System.ComponentModel.Category("Data"),DefaultValue(null),System.ComponentModel.Description("ImageList for medium-sized images used on Items.")]
+		public System.Windows.Forms.ImageList ImagesMedium
+		{
+			get
+			{
+				return m_ImageListMedium;
+			}
+			set
+			{
+				if(m_ImageListMedium!=null)
+					m_ImageListMedium.Disposed-=new EventHandler(this.ImageListDisposed);
+				m_ImageListMedium=value;
+				if(m_ImageListMedium!=null)
+					m_ImageListMedium.Disposed+=new EventHandler(this.ImageListDisposed);
+			}
+		}
+
+		/// <summary>
+		/// ImageList for large-sized images used on Items.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),System.ComponentModel.Category("Data"),DefaultValue(null),System.ComponentModel.Description("ImageList for large-sized images used on Items.")]
+		public System.Windows.Forms.ImageList ImagesLarge
+		{
+			get
+			{
+				return m_ImageListLarge;
+			}
+			set
+			{
+				if(m_ImageListLarge!=null)
+					m_ImageListLarge.Disposed-=new EventHandler(this.ImageListDisposed);
+				m_ImageListLarge=value;
+				if(m_ImageListLarge!=null)
+					m_ImageListLarge.Disposed+=new EventHandler(this.ImageListDisposed);
+			}
+		}
+
+		private void ImageListDisposed(object sender, EventArgs e)
+		{
+			if(sender==m_ImageList)
+			{
+				m_ImageList=null;
+			}
+			else if(sender==m_ImageListLarge)
+			{
+				m_ImageListLarge=null;
+			}
+			else if(sender==m_ImageListMedium)
+			{
+				m_ImageListMedium=null;
+			}
+		}
+
+		void IOwner.StartItemDrag(BaseItem item)
+		{
+			if(m_DragItem==null)
+			{
+				m_DragItem=item;
+				if(!m_UseNativeDragDrop)
+				{
+					this.Capture=true;
+					if(m_MoveCursor!=null)
+						System.Windows.Forms.Cursor.Current=m_MoveCursor;
+					else
+						System.Windows.Forms.Cursor.Current=System.Windows.Forms.Cursors.Hand;
+					m_DragInProgress=true;
+				}
+				else
+				{
+					m_DragInProgress=true;
+					this.DoDragDrop(item,DragDropEffects.All);
+					if(m_DragInProgress)
+						MouseDragDrop(-1,-1,null);
+				}
+					
+			}
+		}
+
+		bool IOwner.DragInProgress
+		{
+			get{ return m_DragInProgress;}
+		}
+
+		BaseItem IOwner.DragItem
+		{
+			get {return m_DragItem;}
+		}
+
+		void IOwner.InvokeUserCustomize(object sender,EventArgs e)
+		{
+			if(UserCustomize!=null)
+				UserCustomize(sender,e);
+		}
+
+		void IOwner.InvokeEndUserCustomize(object sender,EndUserCustomizeEventArgs e){}
+
+		/// <summary>
+		/// Indicates whether Tooltips are shown on Bars and menus.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DefaultValue(true),System.ComponentModel.Category("Run-time Behavior"),System.ComponentModel.Description("Indicates whether Tooltips are shown on Bars and menus.")]
+		public bool ShowToolTips
+		{
+			get
+			{
+				return m_ShowToolTips;
+			}
+			set
+			{
+				m_ShowToolTips=value;
+			}
+		}
+
+		/// <summary>
+		/// Indicates whether item shortcut is displayed in Tooltips.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DefaultValue(false),System.ComponentModel.Category("Run-time Behavior"),System.ComponentModel.Description("Indicates whether item shortcut is displayed in Tooltips.")]
+		public bool ShowShortcutKeysInToolTips
+		{
+			get
+			{
+				return m_ShowShortcutKeysInToolTips;
+			}
+			set
+			{
+				m_ShowShortcutKeysInToolTips=value;
+			}
+		}
+
+		bool IOwner.AlwaysDisplayKeyAccelerators
+		{
+			get {return false;}
+			set {}
+		}
+
+		Form IOwner.ActiveMdiChild
+		{
+			get
+			{
+				Form form=base.FindForm();
+				if(form==null)
+					return null;
+				if(form.IsMdiContainer)
+				{
+					return form.ActiveMdiChild;
+				}
+				return null;
+			}
+		}
+
+		System.Windows.Forms.MdiClient IOwner.GetMdiClient(System.Windows.Forms.Form MdiForm)
+		{
+			return BarFunctions.GetMdiClient(MdiForm);
+		}
+
+		/// <summary>
+		/// Invokes the DotNetBar Customize dialog.
+		/// </summary>
+		void IOwner.Customize()
+		{
+		}
+
+		void IOwner.InvokeResetDefinition(BaseItem item,EventArgs e)
+		{
+		}
+
+		/// <summary>
+		/// Indicates whether Reset buttons is shown that allows end-user to reset the toolbar state.
+		/// </summary>
+		bool IOwner.ShowResetButton
+		{
+			get{return false;}
+			set {}
+		}
+
+		void IOwner.OnApplicationActivate(){}
+		void IOwner.OnApplicationDeactivate()
+		{
+			ClosePopups();
+		}
+		void IOwner.OnParentPositionChanging(){}
+
+		/// <summary>
+		/// Returns the reference to the container that containing the sub-items.
+		/// </summary>
+		[System.ComponentModel.Browsable(false)]
+		public SideBarContainerItem ItemsContainer
+		{
+			get
+			{
+				return m_ItemContainer;
+			}
+		}
+
+		/// <summary>
+		/// Gets/Sets control border style.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),System.ComponentModel.DefaultValue(eBorderType.Sunken),System.ComponentModel.Category("Appearance"),System.ComponentModel.Description("Indicates border style when Bar is docked.")]
+		public eBorderType BorderStyle
+		{
+			get
+			{
+				return m_BorderStyle;
+			}
+			set
+			{
+				if(m_BorderStyle==value)
+					return;
+				if(m_BorderStyle==eBorderType.None)
+				{
+					m_BorderStyle=value;
+					this.RecalcSize();
+				}
+				else
+					m_BorderStyle=value;
+				this.Refresh();
+			}
+		}
+
+		[System.ComponentModel.Browsable(false),System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+		public override Image BackgroundImage
+		{
+			get{return base.BackgroundImage;}
+			set{base.BackgroundImage=value;}
+		}
+
+        #region ICustomSerialization Implementation
+        /// <summary>
+        /// Invokes SerializeItem event.
+        /// </summary>
+        /// <param name="e">Provides data for the event.</param>
+        void ICustomSerialization.InvokeSerializeItem(SerializeItemEventArgs e)
+        {
+            if (SerializeItem != null)
+                SerializeItem(this, e);
+        }
+
+        /// <summary>
+        /// Invokes DeserializeItem event.
+        /// </summary>
+        /// <param name="e">Provides data for the event.</param>
+        void ICustomSerialization.InvokeDeserializeItem(SerializeItemEventArgs e)
+        {
+            if (DeserializeItem != null)
+                DeserializeItem(this, e);
+        }
+
+        /// <summary>
+        /// Gets whether any handlers have been defined for SerializeItem event. If no handles have been defined to optimize performance SerializeItem event will not be attempted to fire.
+        /// </summary>
+        bool ICustomSerialization.HasSerializeItemHandlers
+        {
+            get
+            {
+                return SerializeItem != null;
+            }
+        }
+
+        /// <summary>
+        /// Gets whether any handlers have been defined for DeserializeItem event. If no handles have been defined to optimize performance DeserializeItem event will not be attempted to fire.
+        /// </summary>
+        bool ICustomSerialization.HasDeserializeItemHandlers
+        {
+            get
+            {
+                return DeserializeItem != null;
+            }
+        }
+        #endregion
+
+		/// <summary>
+		/// Gets/Sets Bar definition as XML string.
+		/// </summary>
+		[System.ComponentModel.Browsable(false),System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
+		public string Definition
+		{
+			get
+			{
+				System.Xml.XmlDocument xmlDoc=new System.Xml.XmlDocument();
+				SaveDefinition(xmlDoc);
+				return xmlDoc.OuterXml;
+			}
+			set
+			{
+				System.Xml.XmlDocument xmlDoc=new System.Xml.XmlDocument();
+				xmlDoc.LoadXml(value);
+				LoadDefinition(xmlDoc);
+			}
+		}
+
+		internal void SaveDefinition(System.Xml.XmlDocument xmlDoc)
+		{
+			System.Xml.XmlElement xmlBar=xmlDoc.CreateElement("sidebar");
+			xmlDoc.AppendChild(xmlBar);
+			this.Serialize(xmlBar);
+		}
+
+		internal void Serialize(System.Xml.XmlElement xmlThisBar)
+		{
+            // Creates serialization context
+            ItemSerializationContext context = new ItemSerializationContext();
+            context.Serializer = this;
+            context.HasDeserializeItemHandlers = ((ICustomSerialization)this).HasDeserializeItemHandlers;
+            context.HasSerializeItemHandlers = ((ICustomSerialization)this).HasSerializeItemHandlers;
+
+			xmlThisBar.SetAttribute("name",this.Name);
+			xmlThisBar.SetAttribute("style",System.Xml.XmlConvert.ToString((int)m_ItemContainer.Style));
+			xmlThisBar.SetAttribute("app",System.Xml.XmlConvert.ToString((int)m_Appearance));
+			xmlThisBar.SetAttribute("psc",System.Xml.XmlConvert.ToString((int)m_PredefinedColorScheme));
+			
+			// Save Font information if needed
+			if(this.Font!=null)
+			{
+				if(this.Font.Name!=System.Windows.Forms.SystemInformation.MenuFont.Name || this.Font.Size!=System.Windows.Forms.SystemInformation.MenuFont.Size || this.Font.Style!=System.Windows.Forms.SystemInformation.MenuFont.Style)
+				{
+					xmlThisBar.SetAttribute("fontname",this.Font.Name);
+					xmlThisBar.SetAttribute("fontemsize",System.Xml.XmlConvert.ToString(this.Font.Size));
+					xmlThisBar.SetAttribute("fontstyle",System.Xml.XmlConvert.ToString((int)this.Font.Style));
+				}
+			}
+
+			if(this.BackColor!=SystemColors.Control)
+				xmlThisBar.SetAttribute("backcolor",BarFunctions.ColorToString(this.BackColor));
+			if(this.ForeColor!=SystemColors.ControlText)
+				xmlThisBar.SetAttribute("forecolor",BarFunctions.ColorToString(this.ForeColor));
+
+			//xmlThisBar.SetAttribute("x",System.Xml.XmlConvert.ToString(this.Location.X));
+			//xmlThisBar.SetAttribute("y",System.Xml.XmlConvert.ToString(this.Location.Y));
+			xmlThisBar.SetAttribute("width",System.Xml.XmlConvert.ToString(this.Width));
+			xmlThisBar.SetAttribute("height",System.Xml.XmlConvert.ToString(this.Height));
+			
+			System.Xml.XmlElement xmlItems=xmlThisBar.OwnerDocument.CreateElement("items");
+			xmlThisBar.AppendChild(xmlItems);
+			foreach(BaseItem objItem in m_ItemContainer.SubItems)
+			{
+				if(objItem.ShouldSerialize)
+				{
+					System.Xml.XmlElement xmlItem=xmlThisBar.OwnerDocument.CreateElement("item");
+					xmlItems.AppendChild(xmlItem);
+                    context.ItemXmlElement = xmlItem;
+					objItem.Serialize(context);
+				}
+			}
+
+			if(m_ColorScheme.SchemeChanged)
+			{
+				System.Xml.XmlElement xmlScheme=xmlThisBar.OwnerDocument.CreateElement("colorscheme");
+				m_ColorScheme.Serialize(xmlScheme);
+				xmlThisBar.AppendChild(xmlScheme);
+			}
+		}
+
+		internal void Deserialize(System.Xml.XmlElement xmlThisBar)
+		{
+            // Creates serialization context
+            ItemSerializationContext context = new ItemSerializationContext();
+            context.Serializer = this;
+            context.HasDeserializeItemHandlers = ((ICustomSerialization)this).HasDeserializeItemHandlers;
+            context.HasSerializeItemHandlers = ((ICustomSerialization)this).HasSerializeItemHandlers;
+
+			this.Name=xmlThisBar.GetAttribute("name");
+			m_ItemContainer.Style=(eDotNetBarStyle)System.Xml.XmlConvert.ToInt32(xmlThisBar.GetAttribute("style"));
+			
+			if(xmlThisBar.HasAttribute("backcolor"))
+				this.BackColor=BarFunctions.ColorFromString(xmlThisBar.GetAttribute("backcolor"));
+			if(xmlThisBar.HasAttribute("forecolor"))
+				this.ForeColor=BarFunctions.ColorFromString(xmlThisBar.GetAttribute("forecolor"));
+
+			//this.Location=new Point(System.Xml.XmlConvert.ToInt32(xmlThisBar.GetAttribute("x")),System.Xml.XmlConvert.ToInt32(xmlThisBar.GetAttribute("y")));
+			this.Size=new Size(System.Xml.XmlConvert.ToInt32(xmlThisBar.GetAttribute("width")),System.Xml.XmlConvert.ToInt32(xmlThisBar.GetAttribute("height")));
+
+			// Load font information if it exists
+			if(xmlThisBar.HasAttribute("fontname"))
+			{
+				string FontName=xmlThisBar.GetAttribute("fontname");
+				float FontSize=System.Xml.XmlConvert.ToSingle(xmlThisBar.GetAttribute("fontemsize"));
+				System.Drawing.FontStyle FontStyle=(System.Drawing.FontStyle)System.Xml.XmlConvert.ToInt32(xmlThisBar.GetAttribute("fontstyle"));
+				try
+				{
+					this.Font=new Font(FontName,FontSize,FontStyle);
+				}
+				catch(Exception)
+				{
+                    this.Font = SystemFonts.DefaultFont; // System.Windows.Forms.SystemInformation.MenuFont.Clone() as Font;
+				}
+			}
+
+			foreach(System.Xml.XmlElement xmlElem in xmlThisBar.ChildNodes)
+			{
+				if(xmlElem.Name=="items")
+				{
+					foreach(System.Xml.XmlElement xmlItem in xmlElem.ChildNodes)
+					{
+						BaseItem objItem=BarFunctions.CreateItemFromXml(xmlItem);
+						m_ItemContainer.SubItems.Add(objItem);
+                        context.ItemXmlElement = xmlItem;
+						objItem.Deserialize(context);
+					}
+				}
+				else if(xmlElem.Name=="colorscheme")
+				{
+					m_ColorScheme.Deserialize(xmlElem);
+				}
+			}
+
+
+			if(xmlThisBar.HasAttribute("app"))
+				this.Appearance=(eSideBarAppearance)System.Xml.XmlConvert.ToInt32(xmlThisBar.GetAttribute("app"));
+			xmlThisBar.SetAttribute("app",System.Xml.XmlConvert.ToString((int)m_Appearance));
+			if(xmlThisBar.HasAttribute("psc"))
+			{
+				if(this.Appearance!=eSideBarAppearance.Traditional)
+					this.PredefinedColorScheme=(eSideBarColorScheme)System.Xml.XmlConvert.ToInt32(xmlThisBar.GetAttribute("psc"));
+			}
+		}
+
+		/// <summary>
+		/// Loads the Side bar definition from file.
+		/// </summary>
+		/// <param name="FileName">Definition file name.</param>
+		public void LoadDefinition(string FileName)
+		{
+			System.Xml.XmlDocument xmlDoc=new System.Xml.XmlDocument();
+			xmlDoc.Load(FileName);
+			this.LoadDefinition(xmlDoc);			
+		}
+
+		internal void LoadDefinition(System.Xml.XmlDocument xmlDoc)
+		{
+			if(xmlDoc.FirstChild.Name!="sidebar")
+				throw(new System.InvalidOperationException("XML Format not recognized"));
+
+			m_ItemContainer.SubItems.Clear();
+			this.Deserialize(xmlDoc.FirstChild as System.Xml.XmlElement);
+
+			IOwner owner=this as IOwner;
+			if(owner!=null)
+				owner.AddShortcutsFromItem(m_ItemContainer);
+
+			((IOwner)this).InvokeDefinitionLoaded(this,new EventArgs());
+			this.RecalcSize();
+		}
+
+		/// <summary>
+		/// Saves the Side bar definition to file.
+		/// </summary>
+		/// <param name="FileName">Definition file name.</param>
+		public void SaveDefinition(string FileName)
+		{
+			System.Xml.XmlDocument xmlDoc=new System.Xml.XmlDocument();
+			
+			this.SaveDefinition(xmlDoc);
+
+			xmlDoc.Save(FileName);
+		}
+
+		void IOwner.InvokeDefinitionLoaded(object sender,EventArgs e)
+		{
+			if(DefinitionLoaded!=null)
+				DefinitionLoaded(sender,e);
+		}
+
+		private bool ProcessShortcut(eShortcut key)
+		{
+			bool eat=BarFunctions.ProcessItemsShortcuts(key,m_ShortcutTable);
+			return !m_DispatchShortcuts && eat;
+
+//			if(m_ShortcutTable.Contains(key))
+//			{
+//				ShortcutTableEntry objEntry=(ShortcutTableEntry)m_ShortcutTable[key];
+//				// Must convert to independable array, since if this is for example
+//				// close command first Click will destroy the collection we are
+//				// iterating through and exception will be raised.
+//				BaseItem[] arr=new BaseItem[objEntry.Items.Values.Count];
+//				objEntry.Items.Values.CopyTo(arr,0);
+//				Hashtable hnames=new Hashtable(arr.Length);
+//
+//				bool eat=false;
+//
+//				foreach(BaseItem objItem in arr)
+//				{
+//					if(objItem.CanRaiseClick && (objItem.Name=="" || !hnames.Contains(objItem.Name)))
+//					{
+//						eat=true;
+//						objItem.RaiseClick();
+//						if(objItem.Name!="")
+//							hnames.Add(objItem.Name,"");
+//					}
+//				}
+//				return !m_DispatchShortcuts && eat; // True will eat the key, false will pass it through
+//			}
+//			return false;
+		}
+
+		/// <summary>
+		/// Indicates whether shortucts handled by items are dispatched to the next handler or control.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DefaultValue(false),System.ComponentModel.Category("Behavior"),System.ComponentModel.Description("Indicates whether shortucts handled by items are dispatched to the next handler or control.")]
+		public bool DispatchShortcuts
+		{
+			get {return m_DispatchShortcuts;}
+			set {m_DispatchShortcuts=value;}
+		}
+
+		private bool IsParentFormActive
+		{
+			get
+			{
+				// Process only if parent form is active
+				Form form=this.FindForm();
+				if(form==null)
+					return false;
+				if(form.IsMdiChild)
+				{
+					if(form.MdiParent==null)
+						return false;
+					if(form.MdiParent.ActiveMdiChild!=form)
+						return false;
+				}
+				else if(form!=Form.ActiveForm)
+					return false;
+				return true;
+			}
+		}
+        // IMessageHandlerClient Implementation
+		bool IMessageHandlerClient.IsModal
+		{
+			get
+			{
+				Form form=this.FindForm();
+				if(form!=null)
+					return form.Modal;
+				return false;
+			}
+		}
+        bool IMessageHandlerClient.OnMouseWheel(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+            Point p=this.PointToClient(Control.MousePosition);
+            if (this.ClientRectangle.Contains(p))
+            {
+                SideBarPanelItem expanded = this.ExpandedPanel;
+                if (expanded != null && expanded.HasScrollButtons)
+                {
+                    expanded.OnMouseWheel(new MouseEventArgs(Control.MouseButtons, 0, p.X, p.Y, ((wParam.ToInt64() & 0x80000000) > 0 ? -1 : 1)));
+                }
+            }
+            return false;
+        }
+		//private bool m_IgnoreSysKeyUp=false, m_EatSysKeyUp=false, m_IgnoreF10Key=false;
+        bool IMessageHandlerClient.OnKeyDown(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+            int wParamInt = WinApi.ToInt(wParam);
+            if (m_RegisteredPopups.Count > 0)
+            {
+                if (((BaseItem)m_RegisteredPopups[m_RegisteredPopups.Count - 1]).Parent == null)
+                {
+                    PopupItem objItem = (PopupItem)m_RegisteredPopups[m_RegisteredPopups.Count - 1];
+
+                    Control ctrl = objItem.PopupControl as Control;
+                    Control ctrl2 = Control.FromChildHandle(hWnd);
+
+                    if (ctrl2 != null)
+                    {
+                        while (ctrl2.Parent != null)
+                            ctrl2 = ctrl2.Parent;
+                    }
+
+                    bool bIsOnHandle = false;
+                    if (ctrl2 != null && objItem != null)
+                        bIsOnHandle = objItem.IsAnyOnHandle(ctrl2.Handle);
+
+                    bool bNoEat = ctrl != null && ctrl2 != null && ctrl.Handle == ctrl2.Handle || bIsOnHandle;
+
+                    if (!bIsOnHandle)
+                    {
+                        Keys key = (Keys)NativeFunctions.MapVirtualKey((uint)wParam, 2);
+                        if (key == Keys.None)
+                            key = (Keys)wParamInt;
+                        objItem.InternalKeyDown(new KeyEventArgs(key));
+                    }
+
+                    // Don't eat the message if the pop-up window has focus
+                    if (bNoEat)
+                        return false;
+                    return true;
+                }
+            }
+
+            if (!this.IsParentFormActive)
+                return false;
+
+            if (wParamInt>= 0x70 || System.Windows.Forms.Control.ModifierKeys != Keys.None || (WinApi.ToInt(lParam) & 0x1000000000) != 0 || wParamInt== 0x2E || wParamInt== 0x2D) // 2E=VK_DELETE, 2D=VK_INSERT
+            {
+                int i = (int)System.Windows.Forms.Control.ModifierKeys | wParamInt;
+                return ProcessShortcut((eShortcut)i);
+            }
+            return false;
+        }
+		bool IMessageHandlerClient.OnMouseDown(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+		{
+			if(m_RegisteredPopups.Count==0 || this.DesignMode)
+				return false;
+
+			for(int i=m_RegisteredPopups.Count-1;i>=0;i--)
+			{
+				PopupItem objPopup=m_RegisteredPopups[i] as PopupItem;
+				bool bChildHandle=objPopup.IsAnyOnHandle(hWnd);
+
+				if(!bChildHandle)
+				{
+                    System.Windows.Forms.Control cTmp = System.Windows.Forms.Control.FromChildHandle(hWnd);
+                    if (cTmp != null)
+                    {
+                        if (cTmp is MenuPanel)
+                        {
+                            bChildHandle = true;
+                        }
+                        else
+                        {
+                            while (cTmp.Parent != null)
+                            {
+                                cTmp = cTmp.Parent;
+                                if (cTmp.GetType().FullName.IndexOf("DropDownHolder") >= 0 || cTmp is MenuPanel || cTmp is PopupContainerControl)
+                                {
+                                    bChildHandle = true;
+                                    break;
+                                }
+                            }
+                        }
+                        if (!bChildHandle)
+                            bChildHandle = objPopup.IsAnyOnHandle(cTmp.Handle);
+                    }
+                    else
+                    {
+                        string s = NativeFunctions.GetClassName(hWnd);
+                        s = s.ToLower();
+                        if (s.IndexOf("combolbox") >= 0)
+                            bChildHandle = true;
+                    }
+				}
+
+                if (!bChildHandle)
+                {
+                    Control popupContainer = objPopup.PopupControl;
+                    if (popupContainer != null)
+                        while (popupContainer.Parent != null) popupContainer = popupContainer.Parent;
+                    if (popupContainer != null && popupContainer.Bounds.Contains(Control.MousePosition))
+                        bChildHandle = true;
+                }
+
+				if(bChildHandle)
+					break;
+
+				if(objPopup.Displayed)
+				{
+					// Do not close if mouse is inside the popup parent button
+					Point p=this.PointToClient(Control.MousePosition);
+					if(objPopup.DisplayRectangle.Contains(p))
+						break;
+				}
+				
+				objPopup.ClosePopup();
+
+				if(m_RegisteredPopups.Count==0)
+					break;
+			}
+			return false;
+		}
+		bool IMessageHandlerClient.OnMouseMove(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+		{
+			if(m_RegisteredPopups.Count>0)
+			{
+				foreach(BaseItem item in m_RegisteredPopups)
+				{
+					if(item.Parent==null)
+					{
+						Control ctrl=((PopupItem)item).PopupControl;
+						if(ctrl!=null && ctrl.Handle!=hWnd && !item.IsAnyOnHandle(hWnd) && !(ctrl.Parent!=null && ctrl.Parent.Handle!=hWnd))
+							return true;
+					}
+				}
+			}
+			return false;
+		}
+        bool IMessageHandlerClient.OnSysKeyDown(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+        {
+            if (!this.DesignMode)
+            {
+                // Check Shortcuts
+                int wParamInt = WinApi.ToInt(wParam);
+                if (System.Windows.Forms.Control.ModifierKeys != Keys.None || wParamInt>= (int)eShortcut.F1 && wParamInt<= (int)eShortcut.F12)
+                {
+                    int i = (int)System.Windows.Forms.Control.ModifierKeys | wParamInt;
+                    if (ProcessShortcut((eShortcut)i))
+                        return true;
+                }
+            }
+            return false;
+        }
+		bool IMessageHandlerClient.OnSysKeyUp(IntPtr hWnd, IntPtr wParam, IntPtr lParam)
+		{
+			return false;
+		}
+
+		private void MenuEventSupportHook()
+		{
+			if(m_MenuEventSupport)
+				return;
+			m_MenuEventSupport=true;
+			
+			Form parentForm=this.FindForm();
+			if(parentForm==null)
+			{
+				m_MenuEventSupport=false;
+				return;
+			}
+
+			parentForm.Resize+=new System.EventHandler(this.ParentResize);
+			parentForm.Deactivate+=new System.EventHandler(this.ParentDeactivate);
+
+			DotNetBarManager.RegisterParentMsgHandler(this,parentForm);
+		}
+
+		private void MenuEventSupportUnhook()
+		{
+			if(!m_MenuEventSupport)
+				return;
+			m_MenuEventSupport=false;
+
+			Form parentForm=this.FindForm();
+			if(parentForm==null)
+				return;
+            DotNetBarManager.UnRegisterParentMsgHandler(this, parentForm);
+			parentForm.Resize-=new System.EventHandler(this.ParentResize);
+			parentForm.Deactivate-=new System.EventHandler(this.ParentDeactivate);
+		}
+		private void ParentResize(object sender, System.EventArgs e)
+		{
+			Form parentForm=this.FindForm();
+			if(parentForm!=null && parentForm.WindowState==FormWindowState.Minimized)
+				((IOwner)this).OnApplicationDeactivate();
+		}
+		private void ParentDeactivate(object sender, System.EventArgs e)
+		{
+			Form parentForm=this.FindForm();
+			if(parentForm!=null && parentForm.WindowState==FormWindowState.Minimized)
+				((IOwner)this).OnApplicationDeactivate();
+		}
+
+		// IOwnerMenuSupport
+		private ArrayList m_RegisteredPopups=new ArrayList();
+		bool IOwnerMenuSupport.PersonalizedAllVisible {get{return false;}set{}}
+		bool IOwnerMenuSupport.ShowFullMenusOnHover {get{return true;}set{}}
+		bool IOwnerMenuSupport.AlwaysShowFullMenus {get{return false;}set{}}
+        private Hook m_Hook = null;
+
+		void IOwnerMenuSupport.RegisterPopup(PopupItem objPopup)
+		{
+			if(m_RegisteredPopups.Contains(objPopup))
+				return;
+			
+			if(!this.DesignMode)
+			{
+				if(!m_FilterInstalled)
+				{
+					//System.Windows.Forms.Application.AddMessageFilter(this);
+					MessageHandler.RegisterMessageClient(this);
+					m_FilterInstalled=true;
+				}
+
+                if (!m_MenuEventSupport)
+                    MenuEventSupportHook();
+			}
+            else
+            {
+                if (m_Hook == null)
+                {
+                    m_Hook = new Hook(this);
+                }
+            }
+
+            if (m_RegisteredPopups.Count == 0)
+                PopupManager.RegisterPopup((IOwnerMenuSupport)this);
+
+			m_RegisteredPopups.Add(objPopup);
+			if(objPopup.GetOwner()!=this)
+				objPopup.SetOwner(this);
+		}
+		void IOwnerMenuSupport.UnregisterPopup(PopupItem objPopup)
+		{
+			if(m_RegisteredPopups.Contains(objPopup))
+				m_RegisteredPopups.Remove(objPopup);
+            if (m_RegisteredPopups.Count == 0)
+            {
+                MenuEventSupportUnhook();
+                if (m_Hook != null)
+                {
+                    m_Hook.Dispose();
+                    m_Hook = null;
+                }
+
+                PopupManager.UnregisterPopup((IOwnerMenuSupport)this);
+            }
+		}
+		bool IOwnerMenuSupport.RelayMouseHover()
+		{
+			foreach(PopupItem popup in m_RegisteredPopups)
+			{
+				Control ctrl=popup.PopupControl;
+				if(ctrl!=null && ctrl.DisplayRectangle.Contains(Control.MousePosition))
+				{
+					if(ctrl is MenuPanel)
+						((MenuPanel)ctrl).InternalMouseHover();
+					else if(ctrl is Bar)
+						((Bar)ctrl).InternalMouseHover();
+					return true;
+				}
+			}
+			return false;
+		}
+
+        void IOwnerMenuSupport.ClosePopups()
+        {
+            ClosePopups();
+        }
+
+        private void ClosePopups()
+        {
+            ArrayList popupList = new ArrayList(m_RegisteredPopups);
+            foreach (PopupItem objPopup in popupList)
+                objPopup.ClosePopup();
+        }
+
+		// Events
+		void IOwnerMenuSupport.InvokePopupClose(PopupItem item,EventArgs e)
+		{
+			if(PopupClose!=null)
+				PopupClose(item,e);
+		}
+		void IOwnerMenuSupport.InvokePopupContainerLoad(PopupItem item,EventArgs e)
+		{
+			if(PopupContainerLoad!=null)
+				PopupContainerLoad(item,e);
+		}
+		void IOwnerMenuSupport.InvokePopupContainerUnload(PopupItem item,EventArgs e)
+		{
+			if(PopupContainerUnload!=null)
+				PopupContainerUnload(item,e);
+		}
+		void IOwnerMenuSupport.InvokePopupOpen(PopupItem item,PopupOpenEventArgs e)
+		{
+			if(PopupOpen!=null)
+				PopupOpen(item,e);
+		}
+		void IOwnerMenuSupport.InvokePopupShowing(PopupItem item,EventArgs e)
+		{
+			if(PopupShowing!=null)
+				PopupShowing(item,e);
+		}
+		bool IOwnerMenuSupport.ShowPopupShadow {get{return false;}}
+		eMenuDropShadow IOwnerMenuSupport.MenuDropShadow{get{return eMenuDropShadow.Hide;}set{}}
+		ePopupAnimation IOwnerMenuSupport.PopupAnimation{get {return ePopupAnimation.SystemDefault;}set{}}
+		bool IOwnerMenuSupport.AlphaBlendShadow{get {return true;}set{}}
+
+		public class SideBarAccessibleObject : System.Windows.Forms.Control.ControlAccessibleObject
+		{
+			SideBar m_Owner = null;
+			public SideBarAccessibleObject(SideBar owner):base(owner)
+			{
+				m_Owner = owner;
+			}
+
+			internal void GenerateEvent(BaseItem sender, System.Windows.Forms.AccessibleEvents e)
+			{
+				int	iChild = m_Owner.Panels.IndexOf(sender);
+				if(iChild>=0)
+					m_Owner.AccessibilityNotifyClients(e,iChild);
+			}
+
+            //public override string Name 
+            //{
+            //    get { return m_Owner.AccessibleName; }
+            //    set { m_Owner.AccessibleName = value; }
+            //}
+
+            //public override string Description
+            //{
+            //    get { return m_Owner.AccessibleDescription; }
+            //}
+
+			public override AccessibleRole Role
+			{
+				get { return m_Owner.AccessibleRole; }
+			}
+
+			public override AccessibleObject Parent 
+			{
+				get
+				{
+					if(m_Owner.Parent!=null)
+						return m_Owner.Parent.AccessibilityObject;
+					return null;
+				}
+			}
+
+			public override Rectangle Bounds 
+			{
+				get
+				{
+					if(m_Owner.Parent!=null)
+						return this.m_Owner.Parent.RectangleToScreen(m_Owner.Bounds);
+					return m_Owner.DisplayRectangle;
+				}
+			}
+
+			public override int GetChildCount()
+			{
+				return m_Owner.Panels.Count;
+			}
+
+			public override System.Windows.Forms.AccessibleObject GetChild(int iIndex)
+			{
+				return m_Owner.Panels[iIndex].AccessibleObject;
+			}
+
+			public override AccessibleStates State
+			{
+				get
+				{
+					AccessibleStates state=AccessibleStates.Default;
+					if(m_Owner.Focused)
+					{
+						state=AccessibleStates.Focused;
+					}
+					return state;
+				}
+			}
+		}
+
+		public static void ApplyColorScheme(SideBarPanelItem item, eSideBarColorScheme scheme)
+		{
+			SideBarColors colors=SideBar.GetColorScheme(scheme);
+			colors.Apply(item);
+		}
+
+		public static void ApplyColorScheme(ColorScheme cs, eSideBarColorScheme scheme)
+		{
+			SideBarColors colors=SideBar.GetColorScheme(scheme);
+			colors.Apply(cs);
+		}
+
+		private static SideBarColors GetColorScheme(eSideBarColorScheme scheme)
+		{
+			SideBarColors colors=null;
+			switch(scheme)
+			{
+				case eSideBarColorScheme.Brick:
+				case eSideBarColorScheme.Marine:
+				case eSideBarColorScheme.Plum:
+				case eSideBarColorScheme.Pumpkin:
+				case eSideBarColorScheme.Fire:
+				case eSideBarColorScheme.Rose:
+				case eSideBarColorScheme.Slate:
+				case eSideBarColorScheme.Spruce:
+				case eSideBarColorScheme.Storm:
+				case eSideBarColorScheme.Sunset:
+				case eSideBarColorScheme.Wheat:
+				{
+					colors=GetFlatColorScheme(scheme);
+					break;
+				}
+				case eSideBarColorScheme.Blue:
+				case eSideBarColorScheme.Silver:
+				case eSideBarColorScheme.Green:
+				case eSideBarColorScheme.Orange:
+				case eSideBarColorScheme.Red:
+				case eSideBarColorScheme.LightBlue:
+				case eSideBarColorScheme.Money:
+				{
+					colors=GetGradientColorScheme(scheme);
+					break;
+				}
+				case eSideBarColorScheme.SystemColors:
+				{
+					colors=GetSystemColorScheme();
+					break;
+				}
+			}
+
+			return colors;
+		}
+		private static SideBarColors GetGradientColorScheme(eSideBarColorScheme scheme)
+		{
+			Color border=Color.Empty;
+			Color back=Color.Empty;
+			Color back2=Color.Empty;
+			Color headerBack=Color.Empty;
+			Color headerBack2=Color.Empty;
+			Color headerHotBack=Color.Empty;
+			Color headerText=Color.Empty;
+			Color headerHotText=Color.Empty;
+			Color sideBack=Color.Empty;
+			Color sideBack2=Color.Empty;
+			Color itemText=Color.Empty;
+			Color itemHotBack=Color.Empty;
+			Color itemHotBack2=Color.Empty;
+			Color itemHotBorder=Color.Empty;
+			Color itemHotText=Color.Empty;
+			Color itemPressedBack=Color.Empty;
+			Color itemPressedBack2=Color.Empty;
+			Color itemCheckedBack=Color.Empty;
+			Color itemCheckedBack2=Color.Empty;
+			Color backText=Color.Empty;
+
+			switch(scheme)
+			{
+				case eSideBarColorScheme.Blue:
+				{
+					border=Color.FromArgb(59,97,156);
+					back=Color.FromArgb(232,232,232);
+					back2=Color.White;
+					sideBack=Color.FromArgb(200,220,248);
+					sideBack2=Color.FromArgb(94,137,207);
+					headerBack=Color.FromArgb(221,236,254);
+					headerBack2=Color.FromArgb(133,171,228);
+					headerText=Color.FromArgb(0,51,102);
+					itemText=Color.Black;
+					itemHotBack=Color.FromArgb(255,244,204);
+					itemHotBack2=Color.FromArgb(255,209,147);
+					itemHotBorder=Color.FromArgb(0,0,128);
+					itemPressedBack=Color.FromArgb(254,142,75);
+					itemPressedBack2=Color.FromArgb(255,207,139);
+					itemCheckedBack=Color.FromArgb(255,213,140);
+					itemCheckedBack2=Color.FromArgb(255,173,85);
+					break;
+				}
+				case eSideBarColorScheme.Silver:
+				{
+					border=Color.FromArgb(87,86,113);
+					back=Color.FromArgb(232,232,232);
+					back2=Color.White;
+					sideBack=Color.FromArgb(225,226,236);
+					sideBack2=Color.FromArgb(126,125,157);
+					headerBack=Color.FromArgb(243,244,250);
+					headerBack2=Color.FromArgb(155,153,183);
+					headerText=Color.FromArgb(87,86,113);
+					itemText=Color.Black;
+					itemHotBack=Color.FromArgb(255,244,204);
+					itemHotBack2=Color.FromArgb(255,209,147);
+					itemHotBorder=Color.FromArgb(87,86,113);
+					itemPressedBack=Color.FromArgb(254,142,75);
+					itemPressedBack2=Color.FromArgb(255,207,139);
+					itemCheckedBack=Color.FromArgb(255,213,140);
+					itemCheckedBack2=Color.FromArgb(255,173,85);
+					break;
+				}
+				case eSideBarColorScheme.Green:
+				{
+					border=Color.FromArgb(96,128,88);
+					back=Color.FromArgb(232,232,232);
+					back2=Color.White;
+					sideBack=Color.FromArgb(217,225,188);
+					sideBack2=Color.FromArgb(151,170,111);
+					headerBack=Color.FromArgb(244,247,222);
+					headerBack2=Color.FromArgb(183,198,145);
+					headerText=Color.FromArgb(85,114,78);
+					itemText=Color.Black;
+					itemHotBack=Color.FromArgb(255,244,204);
+					itemHotBack2=Color.FromArgb(255,209,147);
+					itemHotBorder=Color.FromArgb(96,128,88);
+					itemPressedBack=Color.FromArgb(254,142,75);
+					itemPressedBack2=Color.FromArgb(255,207,139);
+					itemCheckedBack=Color.FromArgb(255,213,140);
+					itemCheckedBack2=Color.FromArgb(255,173,85);
+					break;
+				}
+				case eSideBarColorScheme.Orange:
+				{
+					border=Color.FromArgb(137,105,28);
+					back=Color.FromArgb(232,232,232);
+					back2=Color.White;
+					sideBack=Color.FromArgb(249,225,164);
+					sideBack2=Color.FromArgb(227,185,82);
+					headerBack=Color.FromArgb(255,239,201);
+					headerBack2=Color.FromArgb(242,210,132);
+					headerText=Color.FromArgb(117,83,2);
+					itemText=Color.Black;
+					itemHotBack=Color.FromArgb(255,244,204);
+					itemHotBack2=Color.FromArgb(255,209,147);
+					itemHotBorder=Color.FromArgb(137,105,28);
+					itemPressedBack=Color.FromArgb(254,142,75);
+					itemPressedBack2=Color.FromArgb(255,207,139);
+					itemCheckedBack=Color.FromArgb(255,213,140);
+					itemCheckedBack2=Color.FromArgb(255,173,85);
+					break;
+				}
+				case eSideBarColorScheme.Red:
+				{
+					border=Color.FromArgb(144,0,34);
+					back=Color.FromArgb(232,232,232);
+					back2=Color.White;
+					sideBack=Color.FromArgb(255,174,193);
+					sideBack2=Color.FromArgb(226,78,113);
+					headerBack=Color.FromArgb(252,219,227);
+					headerBack2=Color.FromArgb(254,150,174);
+					headerText=Color.FromArgb(144,0,34);
+					itemText=Color.Black;
+					itemHotBack=Color.FromArgb(255,244,204);
+					itemHotBack2=Color.FromArgb(255,209,147);
+					itemHotBorder=Color.FromArgb(144,0,34);
+					itemPressedBack=Color.FromArgb(254,142,75);
+					itemPressedBack2=Color.FromArgb(255,207,139);
+					itemCheckedBack=Color.FromArgb(255,213,140);
+					itemCheckedBack2=Color.FromArgb(255,173,85);
+					break;
+				}
+				case eSideBarColorScheme.LightBlue:
+				{
+					border=Color.FromArgb(81,100,136);
+					back=Color.FromArgb(232,232,232);
+					back2=Color.White;
+					sideBack=Color.FromArgb(226,235,253);
+					sideBack2=Color.FromArgb(175,190,218);
+					headerBack=Color.FromArgb(255,255,255);
+					headerBack2=Color.FromArgb(210,224,252);
+					headerText=Color.FromArgb(69,84,115);
+					itemText=Color.Black;
+					itemHotBack=Color.FromArgb(255,244,204);
+					itemHotBack2=Color.FromArgb(255,209,147);
+					itemHotBorder=Color.FromArgb(81,100,136);
+					itemPressedBack=Color.FromArgb(254,142,75);
+					itemPressedBack2=Color.FromArgb(255,207,139);
+					itemCheckedBack=Color.FromArgb(255,213,140);
+					itemCheckedBack2=Color.FromArgb(255,173,85);
+					break;
+				}
+				case eSideBarColorScheme.Money:
+				{
+					border=Color.FromArgb(44,72,112);
+					back=Color.FromArgb(91,91,91);
+					back2=Color.FromArgb(127,127,127);
+					backText=Color.White;
+					sideBack=Color.FromArgb(163,187,224);
+					sideBack2=Color.FromArgb(99,131,177);
+					headerBack=Color.FromArgb(77,108,152);
+					headerBack2=Color.Empty;
+					headerHotBack=Color.FromArgb(55,85,128); //Color.FromArgb(99,131,177);
+					headerText=Color.White;
+					itemText=Color.White;
+					itemHotText=Color.FromArgb(255,223,127);
+					headerHotText=Color.FromArgb(255,223,127);
+					itemHotBack=Color.FromArgb(80,80,80);
+					itemHotBack2=Color.FromArgb(60,60,60);
+					itemHotBorder=Color.Black;
+					itemPressedBack=Color.FromArgb(110,110,110);
+					itemPressedBack2=Color.FromArgb(80,80,80);
+					itemCheckedBack=Color.FromArgb(60,60,60);
+					itemCheckedBack2=Color.FromArgb(80,80,80);
+					break;
+				}
+			}
+
+			SideBarColors c=new SideBarColors();
+			c.Background=back;
+			c.Background2=back2;
+			c.Border=border;
+			c.HeaderBackground=headerBack;
+			c.HeaderBackground2=headerBack2;
+			c.HeaderSideBackground=sideBack;
+			c.HeaderSideBackground2=sideBack2;
+			c.HeaderText=headerText;
+			c.HeaderHotText=headerHotText;
+			if(headerHotBack.IsEmpty)
+			{
+				c.HeaderHotBackground=headerBack2;
+				c.HeaderHotBackground2=headerBack;
+			}
+			else
+			{
+				c.HeaderHotBackground=headerHotBack;
+			}
+			c.HeaderSideHotBackground=headerBack2;
+			c.HeaderSideHotBackground2=headerBack;
+			c.ItemCheckedBorder=itemHotBorder;
+			c.ItemCheckedText=itemText;
+			if(itemHotText.IsEmpty)
+				c.ItemHotText=itemText;
+			else
+				c.ItemHotText=itemHotText;
+			c.ItemHotBackground=itemHotBack;
+			c.ItemHotBackground2=itemHotBack2;
+			c.ItemHotBorder=itemHotBorder;
+			c.ItemPressedText=itemText;
+			c.ItemPressedBackground=itemPressedBack;
+			c.ItemPressedBackground2=itemPressedBack2;
+			c.ItemPressedBorder=itemHotBorder;
+			c.ItemText=itemText;
+			c.MenuBackground=back;
+			c.MenuBackground2=back2;
+			c.MenuBorder=itemHotBorder;
+			c.MenuSide=sideBack;
+			c.MenuSide=sideBack2;
+			c.BackgroundText=backText;
+			return c;
+		}
+		private static SideBarColors GetFlatColorScheme(eSideBarColorScheme scheme)
+		{
+			Color border=Color.Empty;
+			Color background=Color.Empty;
+			Color sideBack=Color.Empty;
+			Color headerBack=Color.Empty;
+			Color headerText=Color.Empty;
+			Color headerHot=Color.Empty;
+			Color itemHotBack=Color.Empty;
+			Color itemHotBorder=Color.Empty;
+			Color itemPressedBack=Color.Empty;
+
+			switch(scheme)
+			{
+				case eSideBarColorScheme.Brick:
+				{
+					border=Color.FromArgb(66,0,0);
+					background=Color.White;
+					sideBack=Color.FromArgb(204,102,102);
+					headerBack=Color.FromArgb(227,220,198);
+					headerText=Color.Black;
+					itemHotBack=Color.FromArgb(255,153,153);
+					itemHotBorder=Color.FromArgb(132,0,0);
+					headerHot=Color.FromArgb(245,238,217);
+					break;
+				}
+				case eSideBarColorScheme.Wheat:
+				{
+					border=Color.FromArgb(132,130,0);
+					background=Color.White;
+					sideBack=Color.FromArgb(177,174,0);
+					headerBack=Color.FromArgb(239,240,120);
+					headerText=Color.Black;
+					itemHotBack=Color.FromArgb(244,245,169);
+					itemHotBorder=Color.FromArgb(132,130,0);
+					headerHot=Color.FromArgb(254,255,178);
+					break;
+				}
+				case eSideBarColorScheme.Storm:
+				{
+					border=Color.FromArgb(132,0,132);
+					background=Color.White;
+					sideBack=Color.FromArgb(162,78,162);
+					headerBack=Color.FromArgb(226,189,226);
+					headerText=Color.Black;
+					itemHotBack=Color.FromArgb(226,189,226);
+					itemHotBorder=Color.FromArgb(132,0,132);
+					headerHot=Color.FromArgb(244,223,244);
+					break;
+				}
+				case eSideBarColorScheme.Spruce:
+				{
+					border=Color.FromArgb(51,102,51);
+					background=Color.White;
+					sideBack=Color.FromArgb(90,150,99);
+					headerBack=Color.FromArgb(165,228,165);
+					headerText=Color.Black;
+					itemHotBack=Color.FromArgb(204,255,204);
+					itemHotBorder=Color.FromArgb(51,102,51);
+					headerHot=Color.FromArgb(204,231,204);
+					break;
+				}
+				case eSideBarColorScheme.Slate:
+				{
+					border=Color.FromArgb(34,82,127);
+					background=Color.White;
+					sideBack=Color.FromArgb(123,167,184);
+					headerBack=Color.FromArgb(186,204,216);
+					headerText=Color.Black;
+					itemHotBack=Color.FromArgb(129,191,232);
+					itemHotBorder=Color.FromArgb(34,82,127);
+					headerHot=Color.FromArgb(232,232,232);
+					break;
+				}
+				case eSideBarColorScheme.Rose:
+				{
+					border=Color.FromArgb(102,45,63);
+					background=Color.White;
+					sideBack=Color.FromArgb(182,100,125);
+					headerBack=Color.FromArgb(206,174,181);
+					headerText=Color.Black;
+					itemHotBack=Color.FromArgb(241,163,180);
+					itemHotBorder=Color.FromArgb(102,45,63);
+					headerHot=Color.FromArgb(242,200,209);
+					break;
+				}
+				case eSideBarColorScheme.Fire:
+				{
+					border=Color.FromArgb(92,0,0);
+					background=Color.White;
+					sideBack=Color.FromArgb(175,32,32);
+					headerBack=Color.FromArgb(198,198,198);
+					headerText=Color.Black;
+					itemHotBack=Color.FromArgb(242,84,84);
+					itemHotBorder=Color.FromArgb(92,0,0);
+					headerHot=Color.FromArgb(255,142,142);
+					break;
+				}
+				case eSideBarColorScheme.Pumpkin:
+				{
+					border=Color.FromArgb(123,96,27);
+					background=Color.White;
+					sideBack=Color.FromArgb(214,166,41);
+					headerBack=Color.FromArgb(239,215,156);
+					headerText=Color.Black;
+					itemHotBack=Color.FromArgb(239,191,97);
+					itemHotBorder=Color.FromArgb(123,96,27);
+					headerHot=Color.FromArgb(255,239,198);
+					break;
+				}
+				case eSideBarColorScheme.Plum:
+				{
+					border=Color.FromArgb(74,65,99);
+					background=Color.White;
+					sideBack=Color.FromArgb(119,106,154);
+					headerBack=Color.FromArgb(173,154,148);
+					headerText=Color.Black;
+					itemHotBack=Color.FromArgb(205,188,182);
+					itemHotBorder=Color.FromArgb(74,65,99);
+					headerHot=Color.FromArgb(219,195,188);
+					break;
+				}
+				case eSideBarColorScheme.Marine:
+				{
+					border=Color.FromArgb(0,0,132);
+					background=Color.White;
+					sideBack=Color.FromArgb(83,168,159);
+					headerBack=Color.FromArgb(154,214,207);
+					headerText=Color.Black;
+					itemHotBack=Color.FromArgb(79,198,185);
+					itemHotBorder=Color.FromArgb(0,0,132);
+					headerHot=Color.FromArgb(188,231,226);
+					break;
+				}
+				case eSideBarColorScheme.Sunset:
+				{
+					border=Color.FromArgb(176,87,0);
+					background=Color.White;
+					sideBack=Color.FromArgb(219,155,0);
+					headerBack=Color.FromArgb(255,212,110);
+					headerText=Color.Black;
+					itemHotBack=Color.FromArgb(247,193,77);
+					itemHotBorder=Color.FromArgb(176,87,0);
+					headerHot=Color.FromArgb(253,226,162);
+					break;
+				}
+			}
+			
+			itemPressedBack=ControlPaint.Light(itemHotBack);
+
+			SideBarColors c=new SideBarColors();
+			c.Background=background;
+			c.Border=border;
+			c.HeaderBackground=headerBack;
+			c.HeaderSideBackground=sideBack;
+			c.HeaderHotBackground=headerHot;
+			c.HeaderSideHotBackground=headerHot;
+			c.HeaderText=headerText;
+			c.ItemCheckedBorder=border;
+			c.ItemCheckedText=headerText;
+			c.ItemHotText=headerText;
+			c.ItemHotBackground=itemHotBack;
+			c.ItemHotBorder=itemHotBorder;
+			c.ItemPressedText=headerText;
+			c.ItemPressedBackground=itemPressedBack;
+			c.ItemPressedBorder=border;
+			c.ItemText=headerText;
+			c.MenuBackground=background;
+			c.MenuBorder=border;
+			c.MenuSide=sideBack;
+
+			return c;
+		}
+		private static SideBarColors GetSystemColorScheme()
+		{
+			ColorScheme cs=new ColorScheme(eDotNetBarStyle.Office2003);
+			SideBarColors c=new SideBarColors();
+			c.Background=cs.MenuBackground;
+			c.Background2=ControlPaint.LightLight(cs.MenuBackground);
+			c.Border=cs.BarPopupBorder;
+			c.HeaderBackground=cs.MenuSide;
+			c.HeaderBackground2=cs.MenuSide2;
+			c.HeaderSideBackground=cs.BarBackground;
+			c.HeaderSideBackground2=cs.BarBackground2;
+			c.HeaderText=cs.ItemText;
+			c.HeaderHotText=cs.ItemHotText;
+			c.HeaderHotBackground=c.HeaderBackground2;
+			c.HeaderHotBackground2=c.HeaderBackground;
+			c.HeaderSideHotBackground=c.HeaderHotBackground;
+			c.HeaderSideHotBackground2=c.HeaderHotBackground2;
+			c.ItemCheckedBorder=cs.ItemCheckedBorder;
+			c.ItemCheckedText=cs.ItemCheckedText;
+			c.ItemHotText=cs.ItemHotText;
+			c.ItemHotBackground=cs.ItemHotBackground;
+			c.ItemHotBackground2=cs.ItemHotBackground2;
+			c.ItemHotBorder=cs.ItemHotBorder;
+			c.ItemPressedText=cs.ItemPressedText;
+			c.ItemPressedBackground=cs.ItemPressedBackground;
+			c.ItemPressedBackground2=cs.ItemPressedBackground2;
+			c.ItemPressedBorder=cs.ItemPressedBorder;
+			c.ItemText=cs.ItemText;
+			c.MenuBackground=cs.MenuBackground;
+			c.MenuBackground2=cs.MenuBackground2;
+			c.MenuBorder=cs.MenuBorder;
+			c.MenuSide=cs.MenuSide;
+			c.MenuSide2=cs.MenuSide2;
+			c.BackgroundText=cs.ItemText;
+			return c;
+		}
+	}
+
+	internal class SideBarColors
+	{
+		public Color Border=Color.Empty;
+		public Color Background=Color.Empty;
+		public Color Background2=Color.Empty;
+		public Color BackgroundText=Color.Empty;
+		public Color HeaderBackground=Color.Empty;
+		public Color HeaderBackground2=Color.Empty;
+		public Color HeaderSideBackground=Color.Empty;
+		public Color HeaderSideBackground2=Color.Empty;
+		public Color HeaderHotBackground=Color.Empty;
+		public Color HeaderHotBackground2=Color.Empty;
+		public Color HeaderHotText=Color.Empty;
+		public Color HeaderSideHotBackground=Color.Empty;
+		public Color HeaderSideHotBackground2=Color.Empty;
+		public Color HeaderText=Color.Empty;
+		public Color ItemHotBackground=Color.Empty;
+		public Color ItemHotBackground2=Color.Empty;
+		public int ItemHotBackgroundGradientAngle=90;
+		public Color ItemHotBorder=Color.Empty;
+		public Color ItemHotText=Color.Empty;
+		public Color ItemBackground=Color.Empty;
+		public Color ItemText=Color.Empty;
+		public Color ItemPressedBackground=Color.Empty;
+		public Color ItemPressedBackground2=Color.Empty;
+		public int ItemPressedBackgroundGradientAngle=90;
+		public Color ItemPressedBorder=Color.Empty;
+		public Color ItemPressedText=Color.Empty;
+		public Color MenuBackground=Color.Empty;
+		public Color MenuBackground2=Color.Empty;
+		public int MenuBackgroundGradientAngle=0;
+		public Color MenuBorder=Color.Empty;
+		public Color MenuSide=Color.Empty;
+		public Color MenuSide2=Color.Empty;
+		public int MenuSideGradientAngle=0;
+		public Color ItemCheckedBackground=Color.Empty;
+		public Color ItemCheckedBackground2=Color.Empty;
+		public int ItemCheckedBackgroundGradientAngle=90;
+		public Color ItemCheckedBorder=Color.Empty;
+		public Color ItemCheckedText=Color.Empty;
+
+		public void Apply(SideBarPanelItem item)
+		{
+			item.SetBackgroundStyle(new ItemStyle());
+			
+			item.BackgroundStyle.BackColor1.Color=Background;
+			item.BackgroundStyle.BackColor2.Color=Background2;
+			item.BackgroundStyle.BorderColor.Color=Border;
+			item.BackgroundStyle.Border=eBorderType.SingleLine;
+			item.BackgroundStyle.BorderSide=eBorderSide.All;
+			item.BackgroundStyle.ForeColor.Color=BackgroundText;
+			
+			item.SetHeaderStyle(new ItemStyle());
+			item.HeaderStyle.BackColor1.Color=HeaderBackground;
+			item.HeaderStyle.BackColor2.Color=HeaderBackground2;
+			item.HeaderStyle.GradientAngle=90;
+			item.HeaderStyle.BorderSide=eBorderSide.Right | eBorderSide.Top | eBorderSide.Bottom;
+			item.HeaderStyle.Border=eBorderType.SingleLine;
+			item.HeaderStyle.BorderColor.Color=Border;
+			item.HeaderStyle.ForeColor.Color=HeaderText;
+			item.HeaderStyle.Font=new Font("Arial",9,FontStyle.Bold);
+			if(!HeaderHotBackground.IsEmpty)
+			{
+				item.SetHeaderHotStyle(new ItemStyle());
+				item.HeaderHotStyle.BackColor1.Color=HeaderHotBackground;
+				item.HeaderHotStyle.BackColor2.Color=HeaderHotBackground2;
+				item.HeaderHotStyle.GradientAngle=90;
+				if(!HeaderHotText.IsEmpty)
+					item.HeaderHotStyle.ForeColor.Color=HeaderHotText;
+			}
+			else
+				item.SetHeaderHotStyle(null);
+			item.SetHeaderMouseDownStyle(null);
+			
+			item.SetHeaderSideStyle(new ItemStyle());
+			item.HeaderSideStyle.Border=eBorderType.SingleLine;
+			item.HeaderSideStyle.BorderColor.Color=Border;
+			item.HeaderSideStyle.BorderSide=eBorderSide.Left | eBorderSide.Top | eBorderSide.Bottom;
+			item.HeaderSideStyle.BackColor1.Color=HeaderSideBackground;
+			item.HeaderSideStyle.BackColor2.Color=HeaderSideBackground2;
+			item.HeaderSideStyle.GradientAngle=90;
+			if(!HeaderSideHotBackground.IsEmpty)
+			{
+				item.SetHeaderSideHotStyle(new ItemStyle());
+				item.HeaderSideHotStyle.BackColor1.Color=HeaderSideHotBackground;
+				item.HeaderSideHotStyle.BackColor2.Color=HeaderSideHotBackground2;
+				item.HeaderSideHotStyle.GradientAngle=90;
+			}
+			else
+				item.SetHeaderSideHotStyle(null);
+			item.SetHeaderSideMouseDownStyle(null);
+		}
+
+		public void Apply(ColorScheme scheme)
+		{
+			scheme.ItemBackground=this.ItemBackground;
+			scheme.ItemCheckedBackground=this.ItemCheckedBackground;
+			scheme.ItemCheckedBackground2=this.ItemCheckedBackground2;
+			scheme.ItemCheckedBackgroundGradientAngle=this.ItemCheckedBackgroundGradientAngle;
+			scheme.ItemCheckedBorder=this.ItemCheckedBorder;
+			scheme.ItemCheckedText=this.ItemCheckedText;
+			scheme.ItemHotBackground=this.ItemHotBackground;
+			scheme.ItemHotBackground2=this.ItemHotBackground2;
+			scheme.ItemHotBackgroundGradientAngle=this.ItemHotBackgroundGradientAngle;
+			scheme.ItemHotBorder=this.ItemHotBorder;
+			scheme.ItemHotText=this.ItemHotText;
+			scheme.ItemPressedBackground=this.ItemPressedBackground;
+			scheme.ItemPressedBackground2=this.ItemPressedBackground2;
+			scheme.ItemPressedBackgroundGradientAngle=this.ItemPressedBackgroundGradientAngle;
+			scheme.ItemPressedBorder=this.ItemPressedBorder;
+			scheme.ItemPressedText=this.ItemPressedText;
+			scheme.ItemText=this.ItemText;
+
+			scheme.ItemExpandedBackground=this.ItemPressedBackground;
+			scheme.ItemExpandedBackground2=this.ItemPressedBackground2;
+			scheme.ItemExpandedBackgroundGradientAngle=this.ItemPressedBackgroundGradientAngle;
+			scheme.ItemExpandedShadow=Color.Empty;
+			scheme.ItemExpandedText=this.ItemPressedText;
+
+			scheme.MenuBackground=this.MenuBackground;
+			scheme.MenuBackground2=this.MenuBackground2;
+			scheme.MenuBackgroundGradientAngle=this.MenuBackgroundGradientAngle;
+			scheme.MenuBorder=this.MenuBorder;
+			scheme.MenuSide=this.MenuSide;
+			scheme.MenuSide2=this.MenuSide2;
+			scheme.MenuSideGradientAngle=this.MenuSideGradientAngle;
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/SideBar.resx b/PROMS/DotNetBar Source Code/SideBar.resx
new file mode 100644
index 00000000..7e323966
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/SideBar.resx	
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<root>
+	<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+		<xsd:element name="root" msdata:IsDataSet="true">
+			<xsd:complexType>
+				<xsd:choice maxOccurs="unbounded">
+					<xsd:element name="data">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+								<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" />
+							<xsd:attribute name="type" type="xsd:string" />
+							<xsd:attribute name="mimetype" type="xsd:string" />
+						</xsd:complexType>
+					</xsd:element>
+					<xsd:element name="resheader">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" use="required" />
+						</xsd:complexType>
+					</xsd:element>
+				</xsd:choice>
+			</xsd:complexType>
+		</xsd:element>
+	</xsd:schema>
+	<resheader name="ResMimeType">
+		<value>text/microsoft-resx</value>
+	</resheader>
+	<resheader name="Version">
+		<value>1.0.0.0</value>
+	</resheader>
+	<resheader name="Reader">
+		<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.3102.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+	<resheader name="Writer">
+		<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.3102.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+</root>
diff --git a/PROMS/DotNetBar Source Code/SideBarContainerItem.cs b/PROMS/DotNetBar Source Code/SideBarContainerItem.cs
new file mode 100644
index 00000000..a5635ffa
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/SideBarContainerItem.cs	
@@ -0,0 +1,437 @@
+using System;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Provides layout for Side-Bar control.
+	/// </summary>
+	[System.ComponentModel.ToolboxItem(false),System.ComponentModel.DesignTimeVisible(false)]
+	public class SideBarContainerItem:ImageItem, IDesignTimeProvider
+	{
+		#region Private Variables
+		private eSideBarAppearance m_Appearance=eSideBarAppearance.Traditional;
+		private bool m_ProcessingExpanded=false;
+		private int m_ItemSpacing=1;
+		#endregion
+
+		#region Internal Implementation
+		/// <summary>
+		/// Creates new instance of SideBarContainerItem class.
+		/// </summary>
+		public SideBarContainerItem()
+		{
+			m_IsContainer=true;
+			m_SystemItem=true;
+			m_SupportedOrientation=eSupportedOrientation.Horizontal;
+            m_AllowOnlyOneSubItemExpanded = false;
+		}
+		/// <summary>
+		/// Returns copy of SideBarContainerItem item
+		/// </summary>
+		public override BaseItem Copy()
+		{
+			SideBarContainerItem objCopy=new SideBarContainerItem();
+			this.CopyToItem(objCopy);
+			return objCopy;
+		}
+		protected override void CopyToItem(BaseItem copy)
+		{
+			SideBarContainerItem objCopy=copy as SideBarContainerItem;
+			base.CopyToItem(objCopy);
+		}
+
+		/// <summary>
+		/// Recalculates the size of the item
+		/// </summary>
+		public override void RecalcSize()
+		{
+			// This container will always have one and only one item expanded at the time.
+			// Recalculation of the size for this item is different then rest of the DotNetBar.
+			// This container always takes the size assigned by the Control and never changes
+			// the Size by itself.
+			int iUnexpandItemsHeight=0;
+			int iTotalHeight=0;
+			bool bOverflow=false;		// Too many items so there is no need to stretch the expanded since it can't fit
+
+			if(m_SubItems!=null)
+			{
+				SideBarPanelItem expanded=null;
+				foreach(BaseItem item in m_SubItems)
+				{
+					if(item.Visible)
+					{
+						if(iTotalHeight>this.HeightInternal)
+						{
+							item.Displayed=false;
+							bOverflow=true;
+							continue;
+						}
+
+						// Give it our maximum size
+						item.WidthInternal=this.WidthInternal;
+						item.HeightInternal=0;
+						item.RecalcSize();
+						if(item.WidthInternal!=this.WidthInternal)
+							item.WidthInternal=this.WidthInternal;
+						if(item.Expanded && item is SideBarPanelItem && expanded==null)
+							expanded=item as SideBarPanelItem;
+
+						// Set item position
+                        item.LeftInternal=m_Rect.Left;
+						item.TopInternal=m_Rect.Top+iTotalHeight;
+						iTotalHeight+=m_ItemSpacing;
+
+						// Needed to set the expanded item height and to reposition other items...
+						if(!item.Expanded)
+							iUnexpandItemsHeight+=(item.HeightInternal+m_ItemSpacing);
+
+						// Remember Total Height
+						iTotalHeight+=item.HeightInternal;
+
+						item.Displayed=true;
+					}
+				}
+
+				if(expanded!=null && !bOverflow)
+				{
+					// Expanded item is always "stretched" to fill the space...
+					expanded.HeightInternal=m_Rect.Height-iUnexpandItemsHeight;
+					expanded.RecalcSize();
+                    int iOffsetTop = expanded.DisplayRectangle.Bottom + m_ItemSpacing;
+					if(m_Appearance==eSideBarAppearance.Flat)
+						iOffsetTop--;
+					// Move the items after the expanded item to bottom
+					for(int i=m_SubItems.IndexOf(expanded)+1;i<m_SubItems.Count;i++)
+					{
+						BaseItem item=m_SubItems[i];
+						if(item.Visible)
+						{
+							item.TopInternal=iOffsetTop;
+							iOffsetTop+=(item.HeightInternal+m_ItemSpacing);
+						}
+					}
+				}
+			}
+
+			base.RecalcSize();
+		}
+
+		/// <summary>
+		/// Paints this base container
+		/// </summary>
+		public override void Paint(ItemPaintArgs pa)
+		{
+			if(this.SuspendLayout)
+				return;
+			System.Drawing.Graphics g=pa.Graphics;
+			if(m_NeedRecalcSize)
+				RecalcSize();
+
+			if(m_SubItems==null)
+				return;
+
+			foreach(BaseItem item in m_SubItems)
+			{
+				if(item.Visible && item.Displayed)
+				{
+					item.Paint(pa);
+				}
+			}
+		}
+
+		[System.ComponentModel.Browsable(false)]
+		public override eOrientation Orientation
+		{
+			get
+			{
+				return eOrientation.Horizontal;
+			}
+			set
+			{
+				return;
+			}
+		}
+
+		/// <summary>
+		/// Occurs when sub item expanded state has changed.
+		/// </summary>
+		/// <param name="item">Sub item affected.</param>
+		protected internal override void OnSubItemExpandChange(BaseItem item)
+		{
+			// Prevent re-entrancy
+			if(m_ProcessingExpanded)
+				return;
+
+			m_ProcessingExpanded=true;
+			try
+			{
+				// We have to make sure that only one item is always expanded at a time
+				if(item.Expanded)
+				{
+					foreach(BaseItem subitem in m_SubItems)
+					{
+						if(subitem.Expanded && subitem!=item)
+							subitem.Expanded=false;
+					}
+				}
+				else
+				{
+					bool bOneExpanded=false;
+					foreach(BaseItem subitem in m_SubItems)
+					{
+						if(subitem.Expanded)
+						{
+							bOneExpanded=true;
+							break;
+						}
+					}
+					if(!bOneExpanded)
+						item.Expanded=true;
+				}
+				this.RecalcSize();
+				System.Windows.Forms.Control container=this.ContainerControl as System.Windows.Forms.Control;
+				if(container!=null)
+					container.Refresh();
+			}
+			finally
+			{
+				m_ProcessingExpanded=false;
+			}
+		}
+
+		internal eSideBarAppearance Appearance
+		{
+			get {return m_Appearance;}
+			set
+			{
+				if(m_Appearance!=value)
+				{
+					m_Appearance=value;
+					if(m_Appearance==eSideBarAppearance.Flat)
+						m_ItemSpacing=-1;
+					else
+						m_ItemSpacing=1;
+					foreach(SideBarPanelItem item in this.SubItems)
+					{
+						item.Appearance=value;
+					}
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets a value indicating whether the item is expanded or not. For Popup items this would indicate whether the item is popped up or not.
+		/// </summary>
+		[System.ComponentModel.Browsable(false),System.ComponentModel.DefaultValue(false),System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
+		public override bool Expanded
+		{
+			get
+			{
+				return base.Expanded;
+			}
+			set
+			{
+				if(!value)
+				{
+					foreach(BaseItem item in m_SubItems)
+					{
+						if(item is SideBarPanelItem)
+						{
+							foreach(BaseItem popup in item.SubItems)
+							{
+								if(popup is PopupItem && item.Expanded)
+									popup.Expanded=false;
+							}
+						}
+					}
+				}
+				base.Expanded=value;
+			}
+		}
+
+		/// <summary>
+		/// Occurs when the mouse pointer is over the item and a mouse button is pressed. This is used by internal implementation only.
+		/// </summary>
+		[System.ComponentModel.Browsable(false),System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+		public override void InternalMouseDown(System.Windows.Forms.MouseEventArgs objArg)
+		{
+			base.InternalMouseDown(objArg);
+			if(this.DesignMode)
+			{
+				if(this.ItemAtLocation(objArg.X,objArg.Y)==null)
+				{
+					IOwner owner=this.GetOwner() as IOwner;
+					if(owner!=null)
+						owner.SetFocusItem(null);
+				}
+			}
+		}
+
+		/// <summary>
+		/// Sets input focus to next visible item in Explorer Bar.
+		/// </summary>
+		/// <returns>True if focus was set to next visible item otherwise false.</returns>
+		public bool FocusNextItem()
+		{
+			bool bBaseCall=true;
+			
+			BaseItem focusItem=((IOwner)this.GetOwner()).GetFocusItem();
+			bool bFocusNext=false;
+			if(focusItem==null)
+				bFocusNext=true;
+			int iLoopCount=0;
+			while(iLoopCount<2)
+			{
+				foreach(BaseItem item in this.SubItems)
+				{
+					if(item==focusItem)
+						bFocusNext=true;
+					else if(item.Visible && bFocusNext) 
+					{
+						((IOwner)this.GetOwner()).SetFocusItem(item);
+						iLoopCount=2;
+						bBaseCall=false;
+						break;
+					}
+					if(item.Expanded && item.Visible)
+					{
+						foreach(BaseItem child in item.SubItems)
+						{
+							if(child==focusItem)
+								bFocusNext=true;
+							else if(item.Visible && bFocusNext) 
+							{
+								((IOwner)this.GetOwner()).SetFocusItem(child);
+								iLoopCount=2;
+								bBaseCall=false;
+								break;
+							}
+						}
+						if(iLoopCount==2)
+							break;
+					}
+				}
+				iLoopCount++;
+			}				
+
+			return bBaseCall;
+		}
+
+		/// <summary>
+		/// Sets input focus to previous visible item in Explorer Bar.
+		/// </summary>
+		/// <returns>True if focus was set to previous visible item otherwise false.</returns>
+		public bool FocusPreviousItem()
+		{
+			bool bBaseCall=true;
+			
+			BaseItem focusItem=((IOwner)this.GetOwner()).GetFocusItem();
+			bool bFocusNext=false;
+			if(focusItem==null)
+				bFocusNext=true;
+			int iLoopCount=0;
+			while(iLoopCount<2)
+			{
+				for(int groupIndex=this.SubItems.Count-1;groupIndex>=0;groupIndex--)
+				{
+					BaseItem item=this.SubItems[groupIndex];
+					
+					if(item.Expanded && item.Visible)
+					{
+						for(int index=item.SubItems.Count-1;index>=0;index--)
+						{
+							BaseItem child=item.SubItems[index];
+							if(child==focusItem)
+								bFocusNext=true;
+							else if(item.Visible && bFocusNext) 
+							{
+								((IOwner)this.GetOwner()).SetFocusItem(child);
+								iLoopCount=2;
+								bBaseCall=false;
+								break;
+							}
+						}
+						if(iLoopCount==2)
+							break;
+					}
+
+					if(item==focusItem)
+						bFocusNext=true;
+					else if(item.Visible && bFocusNext) 
+					{
+						((IOwner)this.GetOwner()).SetFocusItem(item);
+						iLoopCount=2;
+						bBaseCall=false;
+						break;
+					}
+				}
+				iLoopCount++;
+			}				
+
+			return bBaseCall;
+		}
+
+		protected internal override void OnItemAdded(BaseItem item)
+		{
+			base.OnItemAdded(item);
+			NeedRecalcSize=true;
+			if(this.ContainerControl is SideBar && item is SideBarPanelItem)
+			{
+				SideBarPanelItem panel=item as SideBarPanelItem;
+				panel.Appearance=((SideBar)this.ContainerControl).Appearance;
+				panel.RefreshItemStyleSystemColors();
+                //if(panel.Appearance==eSideBarAppearance.Flat && this.DesignMode)
+                //{
+                //    if(!panel.HasFlatStyle)
+                //        SideBar.ApplyColorScheme((SideBarPanelItem)item,((SideBar)this.ContainerControl).PredefinedColorScheme);
+                //}
+			}
+			if(m_SubItems.Count==1)
+				item.Expanded=true;
+			if(this.DesignMode)
+				this.Refresh();
+		}
+
+        protected internal override void OnAfterItemRemoved(BaseItem item, int itemIndex)
+		{
+			base.OnAfterItemRemoved(item, itemIndex);
+			NeedRecalcSize=true;
+			if(this.DesignMode)
+				this.Refresh();
+		}
+
+		protected internal override void OnSubItemsClear()
+		{
+			base.OnSubItemsClear();
+			NeedRecalcSize=true;
+			if(this.DesignMode)
+				this.Refresh();
+		}
+		#endregion
+
+		#region IDesignTimeProvider Implementation
+		
+		InsertPosition IDesignTimeProvider.GetInsertPosition(Point pScreen, BaseItem dragItem)
+		{
+			foreach(BaseItem panel in this.SubItems)
+			{
+				if(!panel.Visible)
+					continue;
+				if(panel is IDesignTimeProvider)
+				{
+					InsertPosition pos=((IDesignTimeProvider)panel).GetInsertPosition(pScreen, dragItem);
+					if(pos!=null)
+					{
+						return pos;
+					}
+				}
+			}
+			return null;
+		}
+		void IDesignTimeProvider.DrawReversibleMarker(int iPos, bool Before){}
+		void IDesignTimeProvider.InsertItemAt(BaseItem objItem, int iPos, bool Before){}
+
+		#endregion
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/SideBarDesigner.cs b/PROMS/DotNetBar Source Code/SideBarDesigner.cs
new file mode 100644
index 00000000..d1400d46
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/SideBarDesigner.cs	
@@ -0,0 +1,304 @@
+using System;
+using System.ComponentModel;
+using System.ComponentModel.Design;
+using System.Windows.Forms;
+using System.ComponentModel.Design.Serialization;
+using System.CodeDom;
+using System.Drawing;
+using System.Collections;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Represents Windows Forms designer for SideBar control.
+	/// </summary>
+	public class SideBarDesigner:BarBaseControlDesigner
+	{
+		#region Internal Implementation
+		public SideBarDesigner():base()
+		{
+			this.EnableItemDragDrop=true;
+		}
+
+		public override void Initialize(IComponent component) 
+		{
+			base.Initialize(component);
+			if(!component.Site.DesignMode)
+				return;
+			SideBar bar=this.Control as SideBar;
+			if(bar!=null)
+				bar.SetDesignMode();
+		}
+
+		public override DesignerVerbCollection Verbs 
+		{
+			get 
+			{
+				DesignerVerb[] verbs;
+				verbs = new DesignerVerb[]
+				{
+					new DesignerVerb("Create Panel", new EventHandler(OnAddGroup)),
+					new DesignerVerb("Create Button", new EventHandler(OnAddButton)),
+					new DesignerVerb("Choose Color Scheme", new EventHandler(OnPickColorScheme))
+				};
+				return new DesignerVerbCollection(verbs);
+			}
+		}
+
+		protected override BaseItem GetItemContainer()
+		{
+			SideBar bar=this.Control as SideBar;
+			if(bar!=null)
+				return bar.ItemsContainer;
+			return null;
+		}
+
+		protected override void RecalcLayout()
+		{
+			SideBar bar=this.GetItemContainerControl() as SideBar;
+			if(bar!=null)
+				bar.RecalcLayout();
+		}
+
+		protected override void OnSubItemsChanging()
+		{
+			base.OnSubItemsChanging();
+			IComponentChangeService change=this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+			if(change!=null)
+			{
+				SideBar bar=this.GetItemContainerControl() as SideBar;
+				change.OnComponentChanging(this.Component,TypeDescriptor.GetProperties(bar).Find("Panels",true));
+			}
+		}
+
+		protected override void OnSubItemsChanged()
+		{
+			base.OnSubItemsChanged();
+			IComponentChangeService change=this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+			if(change!=null)
+			{
+				SideBar bar=this.GetItemContainerControl() as SideBar;
+				change.OnComponentChanged(this.Component,TypeDescriptor.GetProperties(bar).Find("Panels",true),null,null);
+			}
+		}
+
+		private void OnAddGroup(object sender, EventArgs e)
+		{
+			IDesignerHost dh=this.GetService(typeof(IDesignerHost)) as IDesignerHost;
+			DesignerTransaction trans=null;
+			if(dh!=null)
+				trans=dh.CreateTransaction("New SideBarPanelItem");
+			try
+			{
+				CreateNewPanel();
+			}
+			finally
+			{
+				if(trans!=null && !trans.Canceled)
+					trans.Commit();
+			}
+			
+			this.RecalcLayout();
+		}
+		
+		private SideBarPanelItem CreateNewPanel()
+		{
+			SideBarPanelItem item=null;
+			SideBar bar=this.Component as SideBar;
+			IDesignerHost dh=GetIDesignerHost();
+			if(bar!=null && dh!=null)
+			{
+				OnSubItemsChanging();
+				item=dh.CreateComponent(typeof(SideBarPanelItem)) as SideBarPanelItem;
+				if(item==null)
+					return null;
+				
+				IComponentChangeService change=this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+				if(change!=null)
+					change.OnComponentChanging(item,null);
+				item.Text=item.Name;
+				bar.Panels.Add(item);
+                item.Appearance = bar.Appearance;
+                if (item.Appearance == eSideBarAppearance.Flat)
+                    SideBar.ApplyColorScheme(item, bar.PredefinedColorScheme);
+
+				if(change!=null)
+					change.OnComponentChanged(item,null,null,null);
+				OnSubItemsChanged();
+			}
+			return item;
+		}
+
+		private void OnAddButton(object sender, EventArgs e)
+		{
+			SideBar bar=this.Component as SideBar;
+			IDesignerHost dh=GetIDesignerHost();
+			if(bar!=null && dh!=null)
+			{
+				ISelectionService selection = (ISelectionService) this.GetService(typeof(ISelectionService));
+				if(selection==null)
+					return;
+				SideBarPanelItem panel=null;
+				if(!(selection.PrimarySelection is SideBarPanelItem))
+				{
+					if(bar.ExpandedPanel==null)
+						panel=CreateNewPanel();
+					else
+						panel=bar.ExpandedPanel;
+				}
+				else
+					panel=selection.PrimarySelection as SideBarPanelItem;
+
+				if(panel==null)
+					return;
+
+				IComponentChangeService change=this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+				if(change!=null)
+					change.OnComponentChanging(this.Component,TypeDescriptor.GetProperties(panel).Find("SubItems",true));
+				ButtonItem item=dh.CreateComponent(typeof(ButtonItem)) as ButtonItem;
+				if(item==null)
+					return;
+				item.Text="New Button";
+				if(bar.Appearance==eSideBarAppearance.Flat)
+					item.ImagePosition=eImagePosition.Left;
+				else
+					item.ImagePosition=eImagePosition.Top;
+				item.ButtonStyle=eButtonStyle.ImageAndText;
+				panel.SubItems.Add(item);
+				if(change!=null)
+					change.OnComponentChanged(this.Component,TypeDescriptor.GetProperties(panel).Find("SubItems",true),null,null);
+
+				this.RecalcLayout();
+			}
+		}
+
+		private void OnPickColorScheme(object sender, EventArgs e)
+		{
+			using(SideBarColorSchemePicker picker=new SideBarColorSchemePicker())
+			{
+				picker.ShowDialog();
+				if(picker.DialogResult==DialogResult.OK)
+				{
+					SetColorScheme(picker.SelectedColorScheme);
+				}
+			}
+		}
+
+		private void SetColorScheme(eSideBarColorScheme scheme)
+		{
+			SideBar sidebar=this.Control as SideBar;
+			if(sidebar!=null)
+			{
+				if(sidebar.Appearance!=eSideBarAppearance.Flat)
+                    TypeDescriptor.GetProperties(sidebar)["Appearance"].SetValue(sidebar, eSideBarAppearance.Flat);
+                TypeDescriptor.GetProperties(sidebar)["PredefinedColorScheme"].SetValue(sidebar, scheme);
+				sidebar.ApplyPredefinedColorScheme(scheme);
+				this.RaiseStyleChanged();
+			}
+		}
+		private void RaiseStyleChanged()
+		{
+			IDesignerHost dh=GetIDesignerHost();
+			DesignerTransaction trans=null;
+			if(dh!=null)
+				trans=dh.CreateTransaction();
+			SideBar sidebar=this.Control as SideBar;
+			IComponentChangeService change=this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+			if(change!=null)
+			{
+				change.OnComponentChanging(this.Control,null);
+				change.OnComponentChanged(this.Control,null,null,null);
+
+				change.OnComponentChanging(this.Component,TypeDescriptor.GetProperties(sidebar).Find("ColorScheme",true));
+				change.OnComponentChanged(this.Component,TypeDescriptor.GetProperties(sidebar).Find("ColorScheme",true),null,null);
+
+				change.OnComponentChanging(this.Component,TypeDescriptor.GetProperties(sidebar).Find("Panels",true));
+				change.OnComponentChanged(this.Component,TypeDescriptor.GetProperties(sidebar).Find("Panels",true),null,null);
+
+				foreach(SideBarPanelItem panel in sidebar.Panels)
+				{
+					change.OnComponentChanging(panel,TypeDescriptor.GetProperties(typeof(SideBarPanelItem))["HeaderStyle"]);
+					change.OnComponentChanged(panel,TypeDescriptor.GetProperties(typeof(SideBarPanelItem))["HeaderStyle"],null,null);
+
+					change.OnComponentChanging(panel,TypeDescriptor.GetProperties(typeof(SideBarPanelItem))["HeaderHotStyle"]);
+					change.OnComponentChanged(panel,TypeDescriptor.GetProperties(typeof(SideBarPanelItem))["HeaderHotStyle"],null,null);
+
+					change.OnComponentChanging(panel,TypeDescriptor.GetProperties(typeof(SideBarPanelItem))["HeaderMouseDownStyle"]);
+					change.OnComponentChanged(panel,TypeDescriptor.GetProperties(typeof(SideBarPanelItem))["HeaderMouseDownStyle"],null,null);
+
+					change.OnComponentChanging(panel,TypeDescriptor.GetProperties(typeof(SideBarPanelItem))["HeaderSideHotStyle"]);
+					change.OnComponentChanged(panel,TypeDescriptor.GetProperties(typeof(SideBarPanelItem))["HeaderSideHotStyle"],null,null);
+
+					change.OnComponentChanging(panel,TypeDescriptor.GetProperties(typeof(SideBarPanelItem))["HeaderSideMouseDownStyle"]);
+					change.OnComponentChanged(panel,TypeDescriptor.GetProperties(typeof(SideBarPanelItem))["HeaderSideMouseDownStyle"],null,null);
+
+					change.OnComponentChanging(panel,TypeDescriptor.GetProperties(typeof(SideBarPanelItem))["HeaderSideStyle"]);
+					change.OnComponentChanged(panel,TypeDescriptor.GetProperties(typeof(SideBarPanelItem))["HeaderSideStyle"],null,null);
+
+				}							
+			}
+			if(trans!=null)
+				trans.Commit();
+		}
+
+		private IDesignerHost GetIDesignerHost()
+		{
+			try
+			{
+				IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+				return dh;
+			}
+			catch{}
+			return null;
+		}
+
+		protected override void PreFilterProperties(
+			IDictionary properties) 
+		{
+			base.PreFilterProperties(properties);
+			// shadow the checked property so we can intercept the set.
+			//
+			properties["Appearance"] = 
+				TypeDescriptor.CreateProperty(typeof(SideBarDesigner), 
+				(PropertyDescriptor)properties["Appearance"], 
+				new Attribute[0]);
+		}
+
+		/// <summary>
+		/// Gets or sets visual appearance for the control.
+		/// </summary>
+		[Browsable(true),DefaultValue(eSideBarAppearance.Traditional),Category("Appearance"),Description("Indicates visual appearance for the control.")]
+		public eSideBarAppearance Appearance
+		{
+			get 
+			{
+				return ((SideBar)Control).Appearance;
+			}
+			set 
+			{
+				// set the value into the control
+				if(((SideBar)Control).Appearance != value)
+				{
+					((SideBar)Control).Appearance=value;
+					if(value==eSideBarAppearance.Flat)
+					{
+						SetColorScheme(((SideBar)Control).PredefinedColorScheme);
+					}
+					else if(value==eSideBarAppearance.Traditional)
+					{
+						((SideBar)Control).ResetTraditional();
+						RaiseStyleChanged();
+					}
+				}
+			}
+		}
+
+		protected override bool CanDragItem(BaseItem item)
+		{
+			if(item is SideBarPanelItem)
+				return false;
+			return base.CanDragItem(item);
+		}
+		#endregion
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/SideBarPanelControlHost.cs b/PROMS/DotNetBar Source Code/SideBarPanelControlHost.cs
new file mode 100644
index 00000000..1f989d66
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/SideBarPanelControlHost.cs	
@@ -0,0 +1,646 @@
+using System;
+using System.Windows.Forms;
+using System.Drawing;
+using DevComponents.DotNetBar.Rendering;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Summary description for SideBarPanelControl.
+	/// </summary>
+	[System.ComponentModel.ToolboxItem(false),System.ComponentModel.DesignTimeVisible(false),System.Runtime.InteropServices.ComVisible(false)]
+	public class SideBarPanelControlHost:Control,IThemeCache
+	{
+		private SideBarPanelItem m_ParentPanel=null;
+		private BaseItem m_HotSubItem=null;
+		private Point m_MouseDownPt=Point.Empty;
+
+		// Theme Caching Support
+		private ThemeWindow m_ThemeWindow=null;
+		private ThemeRebar m_ThemeRebar=null;
+		private ThemeToolbar m_ThemeToolbar=null;
+		private ThemeHeader m_ThemeHeader=null;
+		private ThemeScrollBar m_ThemeScrollBar=null;
+		private ThemeExplorerBar m_ThemeExplorerBar=null;
+		private ThemeProgress m_ThemeProgress=null;
+        private ThemeButton m_ThemeButton = null;
+		private ScrollButton m_TopScrollButton=null;
+		private ScrollButton m_BottomScrollButton=null;
+
+		public SideBarPanelControlHost(SideBarPanelItem parentPanel)
+		{
+			this.SetStyle(ControlStyles.UserPaint,true);
+			this.SetStyle(ControlStyles.AllPaintingInWmPaint,true);
+			this.SetStyle(ControlStyles.Opaque,true);
+			this.SetStyle(ControlStyles.ResizeRedraw,true);
+			this.SetStyle(DisplayHelp.DoubleBufferFlag,true);
+			this.TabStop=false;
+			
+			m_TopScrollButton=new ScrollButton();
+			m_TopScrollButton.UseTimer=false;
+			m_TopScrollButton.StandardButton=true;
+			m_TopScrollButton.Visible=false;
+			m_TopScrollButton.Orientation=eOrientation.Vertical;
+			m_TopScrollButton.ButtonAlignment=eItemAlignment.Near;
+			ColorScheme scheme=null;
+			if(parentPanel.Appearance==eSideBarAppearance.Flat)
+			{
+				m_TopScrollButton.Size=new Size(14,14);
+				if(parentPanel.HeaderStyle!=null)
+				{
+					scheme=new ColorScheme();
+					scheme.ItemBackground=Color.Empty;
+                    scheme.ItemBackground=Color.Empty;
+					scheme.ItemBackground=parentPanel.HeaderStyle.BackColor1.Color;
+					scheme.ItemHotBackground=parentPanel.HeaderStyle.BackColor1.Color;
+					scheme.ItemHotBackground2=parentPanel.HeaderStyle.BackColor2.Color;
+					scheme.ItemHotBorder=parentPanel.HeaderStyle.BorderColor.Color;
+					scheme.ItemPressedBorder=parentPanel.HeaderStyle.BorderColor.Color;
+					scheme.ItemText=parentPanel.HeaderStyle.ForeColor.Color;
+                    scheme.ItemHotText=parentPanel.HeaderStyle.ForeColor.Color;
+					scheme.ItemPressedText=parentPanel.HeaderStyle.ForeColor.Color;
+					scheme.ItemPressedBackground=ControlPaint.Light(parentPanel.HeaderStyle.BackColor1.Color);
+					scheme.ItemPressedBackground2=ControlPaint.Light(parentPanel.HeaderStyle.BackColor2.Color);
+					m_TopScrollButton._Scheme=scheme;
+					m_TopScrollButton.StandardButton=false;
+				}
+			}
+			else
+				m_TopScrollButton.Size=new Size(16,16);
+			this.Controls.Add(m_TopScrollButton);
+			m_BottomScrollButton=new ScrollButton();
+			m_BottomScrollButton.UseTimer=false;
+			m_BottomScrollButton.StandardButton=true;
+			m_BottomScrollButton.Visible=false;
+			m_BottomScrollButton.Orientation=eOrientation.Vertical;
+			m_BottomScrollButton.ButtonAlignment=eItemAlignment.Far;
+			if(parentPanel.Appearance==eSideBarAppearance.Flat)
+			{
+				m_BottomScrollButton.Size=new Size(14,14);
+				if(scheme!=null)
+				{
+					m_BottomScrollButton._Scheme=scheme;
+					m_BottomScrollButton.StandardButton=false;
+				}
+			}
+			else
+				m_BottomScrollButton.Size=new Size(16,16);
+			this.Controls.Add(m_BottomScrollButton);
+
+			m_BottomScrollButton.MouseDown+=new MouseEventHandler(ScrollButtonClick);
+			m_TopScrollButton.MouseDown+=new MouseEventHandler(ScrollButtonClick);
+
+			m_ParentPanel=parentPanel;
+			foreach(BaseItem item in  m_ParentPanel.SubItems)
+				item.ContainerControl=this;
+		}
+
+		public void SetupScrollButtons()
+		{
+			// Setup scroll buttons
+			if(m_ParentPanel.TopItemIndex>0 && m_ParentPanel.EnableScrollButtons)
+			{
+				m_TopScrollButton.Location=new Point(this.Width-(m_TopScrollButton.Width+2),4);
+				m_TopScrollButton.UseThemes=m_ParentPanel.UseThemes;
+				m_TopScrollButton.BringToFront();
+				if(!m_TopScrollButton.Visible)
+				{
+					m_TopScrollButton.Visible=true;
+				}
+			}
+			else
+				m_TopScrollButton.Visible=false;
+
+			// Draw scroll down button
+			if(m_ParentPanel.ScrollDownButton && m_ParentPanel.EnableScrollButtons)
+			{
+				m_BottomScrollButton.Location=new Point(this.Width-(m_BottomScrollButton.Width+2),this.Height-(m_BottomScrollButton.Height+2));
+				m_BottomScrollButton.UseThemes=m_ParentPanel.UseThemes;
+				m_BottomScrollButton.BringToFront();
+				if(!m_BottomScrollButton.Visible)
+				{
+					m_BottomScrollButton.Visible=true;					
+				}
+			}
+			else
+				m_BottomScrollButton.Visible=false;
+		}
+
+		private void ScrollButtonClick(object sender, MouseEventArgs e)
+		{
+			if(e.Button!=MouseButtons.Left)
+				return;
+			if(sender==m_TopScrollButton)
+			{
+				// Scroll up
+				m_ParentPanel.ScrollButtonClick(true);
+			}
+			else
+			{
+				m_ParentPanel.ScrollButtonClick(false);
+			}
+		}
+
+		protected override void OnPaint(PaintEventArgs e)
+		{
+			if(m_ParentPanel==null || this.IsDisposed)
+				return;
+
+			ItemPaintArgs pa=null;
+			SideBar bar=m_ParentPanel.ContainerControl as SideBar;
+			if(bar!=null)
+				pa=new ItemPaintArgs(m_ParentPanel.GetOwner() as IOwner,this,e.Graphics,bar.ColorScheme);
+			else
+				pa=new ItemPaintArgs(m_ParentPanel.GetOwner() as IOwner,this,e.Graphics,new ColorScheme(e.Graphics));
+            pa.Renderer = bar.GetRenderer();
+			if(m_ParentPanel.UseThemes)
+			{
+				((IThemeCache)this).ThemeRebar.DrawBackground(e.Graphics,ThemeRebarParts.Background,ThemeRebarStates.Normal,this.DisplayRectangle);
+			}
+			else
+			{
+                if (!m_ParentPanel.BackgroundStyle.BackColor1.IsEmpty)
+                {
+                    if (m_ParentPanel.Appearance == eSideBarAppearance.Flat)
+                    {
+                        eBorderSide oldBorder = m_ParentPanel.BackgroundStyle.BorderSide;
+                        m_ParentPanel.BackgroundStyle.BorderSide = ~(oldBorder & eBorderSide.Top) & oldBorder;
+                        m_ParentPanel.BackgroundStyle.Paint(e.Graphics, this.ClientRectangle);
+                        m_ParentPanel.BackgroundStyle.BorderSide = oldBorder;
+                    }
+                    else
+                        m_ParentPanel.BackgroundStyle.Paint(e.Graphics, this.ClientRectangle);
+                }
+                else
+                {
+                    Color backColor = SystemColors.Control;
+                    if (bar != null && BarFunctions.IsOffice2007Style(bar.Style) && bar.BackColor == SystemColors.Control)
+                    {
+                        if(pa.Renderer is Office2007Renderer)
+                        {
+                            DisplayHelp.FillRectangle(e.Graphics, this.ClientRectangle,((Office2007Renderer)pa.Renderer).ColorTable.SideBar.Background);
+                            backColor = Color.Empty;
+                        }
+                    }
+                    else if (this.Parent != null && this.Parent.BackColor != Color.Transparent)
+                    {
+                        backColor = this.Parent.BackColor;
+                    }
+                    DisplayHelp.FillRectangle(e.Graphics, this.ClientRectangle, backColor, Color.Empty);
+                }
+			}
+			for(int i=m_ParentPanel.TopItemIndex;i<m_ParentPanel.SubItems.Count;i++)
+			{
+				BaseItem item=m_ParentPanel.SubItems[i];
+				if(!item.Displayed || !item.Visible)
+					continue;
+				item.Paint(pa);
+			}
+		}
+
+        ///// <summary>
+        ///// Returns the renderer control will be rendered with.
+        ///// </summary>
+        ///// <returns>The current renderer.</returns>
+        //private Rendering.BaseRenderer GetRenderer()
+        //{
+        //    return Rendering.GlobalManager.Renderer;
+        //}
+
+		private void InternalClick(System.Windows.Forms.MouseButtons mb, System.Drawing.Point mpos)
+		{
+			if(m_HotSubItem!=null)
+			{
+				m_HotSubItem.InternalClick(mb,mpos);
+				return;
+			}
+		}
+
+		private void InternalDoubleClick(System.Windows.Forms.MouseButtons mb, System.Drawing.Point mpos)
+		{
+			if(m_HotSubItem!=null)
+			{
+				m_HotSubItem.InternalDoubleClick(mb,mpos);
+			}
+		}
+
+		private void InternalKeyDown(System.Windows.Forms.KeyEventArgs objArg)
+		{
+			if(m_ParentPanel.DesignMode)
+			{
+				objArg.Handled=true;
+				return;
+			}
+			if(m_HotSubItem!=null)
+			{
+				m_HotSubItem.InternalKeyDown(objArg);
+			}
+		}
+
+		private void InternalMouseDown(System.Windows.Forms.MouseEventArgs objArg)
+		{
+			IOwner owner=null;
+
+			// Colapse any item if expanded
+			m_MouseDownPt=new System.Drawing.Point(objArg.X,objArg.Y);
+			BaseItem objItem=m_ParentPanel.ExpandedItem();
+			if(objItem!=null && objItem!=m_HotSubItem && !m_ParentPanel.DesignMode)
+			{
+				objItem.Expanded=false;
+				m_ParentPanel.AutoExpand=false;
+			}
+
+			if(m_ParentPanel.DesignMode && m_ParentPanel.CanCustomize)
+			{
+				if(m_ParentPanel.IsContainer && m_ParentPanel.SubItems.Count>0)
+				{
+					BaseItem objNew=ItemAtLocation(objArg.X,objArg.Y);
+					if(objNew!=null && objNew.CanCustomize)
+					{
+						owner=m_ParentPanel.GetOwner() as IOwner;
+						if(owner!=null)
+							owner.SetFocusItem(objNew);
+					}
+					if(objNew!=null)
+						objNew.InternalMouseDown(objArg);
+				}
+				
+				if(objArg.Button==System.Windows.Forms.MouseButtons.Right && !m_ParentPanel.IsContainer)
+				{
+					owner=m_ParentPanel.GetOwner() as IOwner;
+					if(owner!=null)
+						owner.DesignTimeContextMenu(m_ParentPanel);
+				}
+			}
+
+			if(!m_ParentPanel.DesignMode)
+			{
+				owner=m_ParentPanel.GetOwner() as IOwner;
+				if(owner!=null && owner.GetFocusItem()!=null)
+				{
+					BaseItem objNew=ItemAtLocation(objArg.X,objArg.Y);
+					if(objNew!=owner.GetFocusItem())
+						owner.GetFocusItem().ReleaseFocus();
+				}
+			}
+
+			if(m_HotSubItem!=null)
+			{
+				m_HotSubItem.InternalMouseDown(objArg);
+			}
+		}
+
+		private void InternalMouseHover()
+		{
+			if(m_ParentPanel.DesignMode)
+				return;
+
+			if(m_HotSubItem!=null)
+			{
+				if(!m_ParentPanel.AutoExpand)
+				{
+					BaseItem objItem=m_ParentPanel.ExpandedItem();
+					if(objItem!=null && m_HotSubItem!=objItem && (m_ParentPanel.IsOnMenu || m_ParentPanel.ContainerControl is Bar))
+						objItem.Expanded=false;
+				}
+				// Changing the Expanded of the item can cause hot sub item to be set to null
+				if(m_HotSubItem!=null)
+					m_HotSubItem.InternalMouseHover();
+			}
+		}
+
+		public virtual void InternalMouseLeave()
+		{
+			if(m_ParentPanel.DesignMode)
+				return;
+
+			// If we had hot sub item pass the mouse leave message to it...
+			if(m_HotSubItem!=null)
+			{
+				m_HotSubItem.InternalMouseLeave();
+				m_HotSubItem=null;
+			}
+		}
+
+		private void InternalMouseMove(System.Windows.Forms.MouseEventArgs objArg)
+		{
+			if(m_ParentPanel.DesignMode && objArg.Button==System.Windows.Forms.MouseButtons.Left && (Math.Abs(objArg.X-m_MouseDownPt.X)>=2 || Math.Abs(objArg.Y-m_MouseDownPt.Y)>=2))
+			{
+				BaseItem objFocus=m_ParentPanel.FocusedItem();
+				if(objFocus!=null && objFocus.CanCustomize)
+				{
+					if(!objFocus.SystemItem)
+					{
+						IOwner owner=m_ParentPanel.GetOwner() as IOwner;
+						if(owner!=null)
+							owner.StartItemDrag(objFocus);
+					}
+				}
+				else if(!m_ParentPanel.IsContainer)
+				{
+					if(!m_ParentPanel.SystemItem && m_ParentPanel.CanCustomize)
+					{
+						IOwner owner=m_ParentPanel.GetOwner() as IOwner;
+						if(owner!=null)
+							owner.StartItemDrag(m_ParentPanel);
+					}
+				}
+				return;
+			}
+
+			// If item is container and not in design time...
+			if(m_ParentPanel.IsContainer && !m_ParentPanel.DesignMode)
+			{
+				BaseItem objNew=ItemAtLocation(objArg.X,objArg.Y);
+				if(objNew!=m_HotSubItem)
+				{
+					if(m_HotSubItem!=null)
+					{
+						m_HotSubItem.InternalMouseLeave();
+						if(objNew!=null && m_HotSubItem.Expanded && (m_ParentPanel.IsOnMenu || m_ParentPanel.ContainerControl is Bar))
+							m_HotSubItem.Expanded=false;
+					}
+					
+					if(objNew!=null)
+					{
+						if(m_ParentPanel.AutoExpand)
+						{
+							BaseItem objItem=m_ParentPanel.ExpandedItem();
+							if(objItem!=null && objItem!=objNew)
+								objItem.Expanded=false;
+						}
+						objNew.InternalMouseEnter();
+						objNew.InternalMouseMove(objArg);
+						if(m_ParentPanel.AutoExpand && objNew.Enabled && objNew.ShowSubItems)
+						{
+							if(objNew is PopupItem)
+							{
+								PopupItem pi=objNew as PopupItem;
+								ePopupAnimation oldAnim=pi.PopupAnimation;
+								pi.PopupAnimation=ePopupAnimation.None;
+								if(objNew.SubItems.Count>0)
+									objNew.Expanded=true;
+								pi.PopupAnimation=oldAnim;
+							}
+							else
+								objNew.Expanded=true;
+						}
+						m_HotSubItem=objNew;
+						ResetHover();
+					}
+					else
+						m_HotSubItem=null;
+				}
+				else if(m_HotSubItem!=null)
+				{
+					m_HotSubItem.InternalMouseMove(objArg);
+				}
+			}
+		}
+
+		private BaseItem ItemAtLocation(int x, int y)
+		{
+			foreach(BaseItem objSub in m_ParentPanel.SubItems)
+			{
+				if((objSub.Visible || m_ParentPanel.IsOnCustomizeMenu) && objSub.Displayed && objSub.DisplayRectangle.Contains(x,y))
+				{
+					return objSub;
+				}
+			}
+			return null;
+		}
+
+		private void ResetHover()
+		{
+			// We need to reset hover thing since it is fired only first time mouse hovers inside the window and we need it for each of our items
+			NativeFunctions.TRACKMOUSEEVENT tme=new NativeFunctions.TRACKMOUSEEVENT();
+			tme.dwFlags=NativeFunctions.TME_QUERY;
+			tme.hwndTrack=this.Handle;
+			tme.cbSize=System.Runtime.InteropServices.Marshal.SizeOf(tme);
+			NativeFunctions.TrackMouseEvent(ref tme);
+			tme.dwFlags=tme.dwFlags | NativeFunctions.TME_HOVER;
+			NativeFunctions.TrackMouseEvent(ref tme);
+		}
+
+		protected override void OnClick(EventArgs e)
+		{
+			InternalClick(Control.MouseButtons,Control.MousePosition);
+			base.OnClick(e);
+		}
+
+		protected override void OnDoubleClick(EventArgs e)
+		{
+			InternalDoubleClick(Control.MouseButtons,Control.MousePosition);
+			base.OnDoubleClick(e);
+		}
+
+		protected override void OnKeyDown(KeyEventArgs e)
+		{
+			InternalKeyDown(e);
+			base.OnKeyDown(e);
+		}
+
+		protected override void OnMouseDown(MouseEventArgs e)
+		{
+			InternalMouseDown(e);
+			base.OnMouseDown(e);
+		}
+
+		protected override void OnMouseHover(EventArgs e)
+		{
+			base.OnMouseHover(e);
+			InternalMouseHover();
+		}
+
+		protected override void OnMouseLeave(EventArgs e)
+		{
+			if(this.Cursor!=System.Windows.Forms.Cursors.Arrow)
+				this.Cursor=System.Windows.Forms.Cursors.Arrow;
+			InternalMouseLeave();
+			base.OnMouseLeave(e);
+		}
+
+		protected override void OnMouseMove(MouseEventArgs e)
+		{
+			base.OnMouseMove(e);
+			InternalMouseMove(e);
+		}
+
+		protected override void OnMouseUp(MouseEventArgs e)
+		{
+			base.OnMouseUp(e);
+			if(m_HotSubItem!=null)
+				m_HotSubItem.InternalMouseUp(e);
+		}
+
+		DevComponents.DotNetBar.ThemeWindow IThemeCache.ThemeWindow
+		{
+			get
+			{
+				if(m_ThemeWindow==null)
+					m_ThemeWindow=new ThemeWindow(this);
+				return m_ThemeWindow;
+			}
+		}
+		DevComponents.DotNetBar.ThemeRebar IThemeCache.ThemeRebar
+		{
+			get
+			{
+				if(m_ThemeRebar==null)
+					m_ThemeRebar=new ThemeRebar(this);
+				return m_ThemeRebar;
+			}
+		}
+		DevComponents.DotNetBar.ThemeToolbar IThemeCache.ThemeToolbar
+		{
+			get
+			{
+				if(m_ThemeToolbar==null)
+					m_ThemeToolbar=new ThemeToolbar(this);
+				return m_ThemeToolbar;
+			}
+		}
+		DevComponents.DotNetBar.ThemeHeader IThemeCache.ThemeHeader
+		{
+			get
+			{
+				if(m_ThemeHeader==null)
+					m_ThemeHeader=new ThemeHeader(this);
+				return m_ThemeHeader;
+			}
+		}
+		DevComponents.DotNetBar.ThemeScrollBar IThemeCache.ThemeScrollBar
+		{
+			get
+			{
+				if(m_ThemeScrollBar==null)
+					m_ThemeScrollBar=new ThemeScrollBar(this);
+				return m_ThemeScrollBar;
+			}
+		}
+		DevComponents.DotNetBar.ThemeExplorerBar IThemeCache.ThemeExplorerBar
+		{
+			get
+			{
+				if(m_ThemeExplorerBar==null)
+					m_ThemeExplorerBar=new ThemeExplorerBar(this);
+				return m_ThemeExplorerBar;
+			}
+		}
+		DevComponents.DotNetBar.ThemeProgress IThemeCache.ThemeProgress
+		{
+			get
+			{
+				if(m_ThemeProgress==null)
+					m_ThemeProgress=new ThemeProgress(this);
+				return m_ThemeProgress;
+			}
+		}
+        DevComponents.DotNetBar.ThemeButton IThemeCache.ThemeButton
+        {
+            get
+            {
+                if (m_ThemeButton == null)
+                    m_ThemeButton = new ThemeButton(this);
+                return m_ThemeButton;
+            }
+        }
+
+		protected override void OnHandleDestroyed(EventArgs e)
+		{
+			DisposeThemes();
+			base.OnHandleDestroyed(e);
+		}
+
+		private void DisposeThemes()
+		{
+			if(m_ThemeWindow!=null)
+			{
+				m_ThemeWindow.Dispose();
+				m_ThemeWindow=null;
+			}
+			if(m_ThemeRebar!=null)
+			{
+				m_ThemeRebar.Dispose();
+				m_ThemeRebar=null;
+			}
+			if(m_ThemeToolbar!=null)
+			{
+				m_ThemeToolbar.Dispose();
+				m_ThemeToolbar=null;
+			}
+			if(m_ThemeHeader!=null)
+			{
+				m_ThemeHeader.Dispose();
+				m_ThemeHeader=null;
+			}
+			if(m_ThemeScrollBar!=null)
+			{
+				m_ThemeScrollBar.Dispose();
+				m_ThemeScrollBar=null;
+			}
+            if (m_ThemeProgress != null)
+            {
+                m_ThemeProgress.Dispose();
+                m_ThemeProgress = null;
+            }
+            if (m_ThemeExplorerBar != null)
+            {
+                m_ThemeExplorerBar.Dispose();
+                m_ThemeExplorerBar = null;
+            }
+            if (m_ThemeButton != null)
+            {
+                m_ThemeButton.Dispose();
+                m_ThemeButton = null;
+            }
+		}
+		protected override void WndProc(ref Message m)
+		{
+			if(m.Msg==NativeFunctions.WM_THEMECHANGED)
+			{
+				this.RefreshThemes();
+			}
+			base.WndProc(ref m);
+		}
+
+		private void RefreshThemes()
+		{
+			if(m_ThemeWindow!=null)
+			{
+				m_ThemeWindow.Dispose();
+				m_ThemeWindow=new ThemeWindow(this);
+			}
+			if(m_ThemeRebar!=null)
+			{
+				m_ThemeRebar.Dispose();
+				m_ThemeRebar=new ThemeRebar(this);
+			}
+			if(m_ThemeToolbar!=null)
+			{
+				m_ThemeToolbar.Dispose();
+				m_ThemeToolbar=new ThemeToolbar(this);
+			}
+			if(m_ThemeHeader!=null)
+			{
+				m_ThemeHeader.Dispose();
+				m_ThemeHeader=new ThemeHeader(this);
+			}
+			if(m_ThemeScrollBar!=null)
+			{
+				m_ThemeScrollBar.Dispose();
+				m_ThemeScrollBar=new ThemeScrollBar(this);
+			}
+			if(m_ThemeProgress!=null)
+			{
+				m_ThemeProgress.Dispose();
+				m_ThemeProgress=new ThemeProgress(this);
+			}
+			if(m_ThemeExplorerBar!=null)
+			{
+				m_ThemeExplorerBar.Dispose();
+				m_ThemeExplorerBar=new ThemeExplorerBar(this);
+			}
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/SideBarPanelItem.cs b/PROMS/DotNetBar Source Code/SideBarPanelItem.cs
new file mode 100644
index 00000000..105f4e94
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/SideBarPanelItem.cs	
@@ -0,0 +1,2665 @@
+using System;
+using System.Drawing;
+using System.Drawing.Design;
+using System.ComponentModel;
+using System.ComponentModel.Design;
+using DevComponents.DotNetBar.Rendering;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Represents the Side-Bar Panel item.
+	/// </summary>
+    [System.ComponentModel.ToolboxItem(false), Designer("DevComponents.DotNetBar.Design.SideBarPanelItemDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+	public class SideBarPanelItem:ImageItem,IDesignTimeProvider
+	{
+		private int m_TopItemIndex=0;
+		private bool m_ScrollDownButton=false;
+		private Rectangle[] m_ScrollButtonRect={Rectangle.Empty,Rectangle.Empty};
+		private int m_ScrollButtonHot=-1;
+		private int m_Margin=3;
+		private bool m_MouseOver=false;
+		private bool m_MouseDown=false;
+		private Rectangle m_PanelRect=Rectangle.Empty;
+		//private Color m_BackColor=SystemColors.Control;
+		private Color m_ForeColor=Color.Empty;
+		private Color m_HotForeColor=Color.Empty;
+		private bool m_HotFontUnderline=false;
+		private bool m_HotFontBold=false;
+        private bool m_FontBold = false;
+		private eBarImageSize m_ItemImageSize=eBarImageSize.Default;
+		private System.Drawing.Point m_MouseDownPt;
+		// Used to host items that have windows associated with them....
+		private SideBarPanelControlHost m_ControlHost=null;
+
+		private ItemStyle m_BackgroundStyle=new ItemStyle();
+		private ItemStyle m_HeaderStyle=null, m_HeaderHotStyle=null, m_HeaderMouseDownStyle=null;
+		private ItemStyle m_HeaderSideStyle=null, m_HeaderSideHotStyle, m_HeaderSideMouseDownStyle;
+
+		private bool m_WordWrap=false;
+
+		private const string INFO_EMPTYPANEL="Right-click header and choose Add New Button or use SubItems collection to create new buttons.";
+
+		private System.Drawing.Image m_Image;
+		private int m_ImageIndex=-1; // Image index if image from ImageList is used
+		private System.Drawing.Image m_HoverImage;
+		private int m_HoverImageIndex=-1; // Image index if image from ImageList is used
+		private System.Drawing.Image m_PressedImage;
+		private int m_PressedImageIndex=-1;  // Image index if image from ImageList is used
+		System.Drawing.Icon m_Icon=null;
+		private System.Drawing.Image m_ImageCachedIdx=null;
+		private ItemPaintArgs _ItemPaintArgs=null;
+		private eSideBarAppearance m_Appearance=eSideBarAppearance.Traditional;
+		
+		private const int FLAT_NOIMAGESIDEWIDTH=26;
+		private const int IMAGE_MARGIN=2;
+
+		private bool m_IgnoreNextClick=false;
+		private DateTime m_IgnoreClickDateTime=DateTime.MinValue;
+		private Rectangle m_IgnoreScrollRect=Rectangle.Empty;
+
+		private bool m_EnableScrollButtons=true;
+
+		private eSideBarLayoutType m_LayoutType=eSideBarLayoutType.Default;
+
+		/// <summary>
+		/// Creates new instance of SideBarPanelItem.
+		/// </summary>
+		public SideBarPanelItem():this("","") {}
+		/// <summary>
+		/// Creates new instance of SideBarPanelItem and assigns the name to it.
+		/// </summary>
+		/// <param name="sItemName">Item name.</param>
+		public SideBarPanelItem(string sItemName):this(sItemName,"") {}
+		/// <summary>
+		/// Creates new instance of SideBarPanelItem and assigns the name and text to it.
+		/// </summary>
+		/// <param name="sItemName">Item name.</param>
+		/// <param name="ItemText">item text.</param>
+		public SideBarPanelItem(string sItemName, string ItemText):base(sItemName,ItemText)
+		{
+			m_IsContainer=true;
+			m_BackgroundStyle.VisualPropertyChanged+=new EventHandler(this.VisualPropertyChanged);
+		}
+
+        protected override void Dispose(bool disposing)
+        {
+            if (BarUtilities.DisposeItemImages && !this.DesignMode)
+            {
+                BarUtilities.DisposeImage(ref m_Image);
+                BarUtilities.DisposeImage(ref m_ImageCachedIdx);
+                BarUtilities.DisposeImage(ref m_Icon);
+                BarUtilities.DisposeImage(ref m_HoverImage);
+                BarUtilities.DisposeImage(ref m_PressedImage);
+            }
+            base.Dispose(disposing);
+        }
+
+		/// <summary>
+		/// Returns copy of SideBarPanelItem item.
+		/// </summary>
+		public override BaseItem Copy()
+		{
+			SideBarPanelItem objCopy=new SideBarPanelItem();
+			this.CopyToItem(objCopy);
+			return objCopy;
+		}
+		protected override void CopyToItem(BaseItem copy)
+		{
+			SideBarPanelItem objCopy=copy as SideBarPanelItem;
+			
+			base.CopyToItem(objCopy);
+
+			objCopy.HotFontBold=m_HotFontBold;
+			objCopy.HotFontUnderline=m_HotFontUnderline;
+			objCopy.HotForeColor=m_HotForeColor;
+			objCopy.ForeColor=m_ForeColor;
+			//objCopy.BackColor=m_BackColor;
+			objCopy.ItemImageSize=m_ItemImageSize;
+			objCopy.SetBackgroundStyle(m_BackgroundStyle.Clone() as ItemStyle);
+		}
+		private void VisualPropertyChanged(object sender, EventArgs e)
+		{
+			RefreshItemStyleSystemColors();
+			NeedRecalcSize=true;
+			OnAppearanceChanged();
+		}
+		internal void RefreshItemStyleSystemColors()
+		{
+			// Apply any color scheme changes needed
+			SideBar sb=this.ContainerControl as SideBar;
+			if(sb!=null)
+			{
+				if(m_BackgroundStyle!=null)
+					m_BackgroundStyle.ApplyColorScheme(sb.ColorScheme);
+				if(m_HeaderStyle!=null)
+					m_HeaderStyle.ApplyColorScheme(sb.ColorScheme);
+				if(m_HeaderHotStyle!=null)
+					m_HeaderHotStyle.ApplyColorScheme(sb.ColorScheme);
+				if(m_HeaderMouseDownStyle!=null)
+					m_HeaderMouseDownStyle.ApplyColorScheme(sb.ColorScheme);
+				if(m_HeaderSideStyle!=null)
+					m_HeaderSideStyle.ApplyColorScheme(sb.ColorScheme);
+				if(m_HeaderSideHotStyle!=null)
+					m_HeaderSideHotStyle.ApplyColorScheme(sb.ColorScheme);
+				if(m_HeaderSideMouseDownStyle!=null)
+					m_HeaderSideMouseDownStyle.ApplyColorScheme(sb.ColorScheme);
+			}
+		}
+		public override void RecalcSize()
+		{
+			m_ScrollDownButton=false;
+
+			System.Windows.Forms.Control objCtrl=this.ContainerControl as System.Windows.Forms.Control;
+			if(!IsHandleValid(objCtrl))
+				return;
+            
+			CompositeImage image=this.GetImage();
+			System.Drawing.Size imageSize=System.Drawing.Size.Empty;
+			if(image!=null)
+			{
+				imageSize=image.Size;
+				imageSize.Width+=(IMAGE_MARGIN*2);
+				imageSize.Height+=(IMAGE_MARGIN*2);
+			}
+			image=null;
+
+			Size objStringSize=Size.Empty;
+			string text=m_Text;
+
+            Graphics g = BarFunctions.CreateGraphics(objCtrl);
+            try
+            {
+                if (text != "")
+                    objStringSize = TextDrawing.MeasureString(g, text, this.GetFont(), m_Rect.Width, this.GetStringFormat());
+            }
+            finally
+            {
+                g.Dispose();
+            }
+
+			if(imageSize.Height>objStringSize.Height+m_Margin*2)
+				m_PanelRect=new Rectangle(0,0,m_Rect.Width,imageSize.Height);
+			else
+			{
+				m_PanelRect=new Rectangle(0,0,m_Rect.Width,(int)objStringSize.Height+m_Margin*2);
+				if(m_Appearance==eSideBarAppearance.Flat)
+					m_PanelRect.Height+=(IMAGE_MARGIN*2);
+			}
+
+			if(this.Expanded)
+			{
+				// Take suggested height and set the actual height only when suggested is less than minimum
+				if(m_Rect.Height<m_PanelRect.Height)
+					m_Rect.Height=m_PanelRect.Height;
+				int clientWidth=m_Rect.Width;
+
+				bool bMultiColumnPass=false;
+				if(m_LayoutType==eSideBarLayoutType.MultiColumn && m_TopItemIndex>0)
+					bMultiColumnPass=true;
+
+				if(m_SubItems!=null)
+				{
+					int iRepeat=0;
+					int iTop=0, iHeightThreshold=0;
+					do
+					{
+						iRepeat++;
+						iTop=m_Rect.Top+m_PanelRect.Height+1;
+						int iLeft=m_Rect.Left;
+						iHeightThreshold=m_Rect.Bottom;
+						if(m_ControlHost!=null)
+						{
+							iTop=0;
+							iLeft=0;
+							iHeightThreshold=m_Rect.Height-(m_PanelRect.Height+1);
+						}
+						int iIndex=-1;
+						int iVisibleHeight=iTop;
+						int itemWidth=m_Rect.Width;
+						
+						if(m_Appearance==eSideBarAppearance.Flat)
+						{
+							if(imageSize.IsEmpty)
+								itemWidth-=FLAT_NOIMAGESIDEWIDTH;
+							else
+								itemWidth-=imageSize.Width;
+							if(itemWidth<=0)
+								itemWidth=m_Rect.Width;
+							if(itemWidth>16)
+							{
+								itemWidth-=4;
+								iLeft+=m_Rect.Width-itemWidth-2;
+							}
+							else
+							{
+								iLeft+=m_Rect.Width-itemWidth;
+							}
+							clientWidth=itemWidth+4;
+							if(m_ControlHost!=null)
+								iLeft=2;
+						}
+
+						// Used for column based layout
+						int initalLeft=iLeft;
+						int lineHeight=0;
+
+						foreach(BaseItem item in m_SubItems)
+						{
+							iIndex++;
+							if(!item.Visible || iTop>iHeightThreshold && !bMultiColumnPass)
+							{
+								if(m_EnableScrollButtons && item.Visible)
+									m_ScrollDownButton=true;
+								if(item.Visible && iTop>iHeightThreshold)
+								{
+									item.RecalcSize();
+									iVisibleHeight+=item.HeightInternal;
+								}
+								item.Displayed=false;
+								continue;
+							}
+							else if(iIndex<m_TopItemIndex && !bMultiColumnPass)
+							{
+								item.WidthInternal=itemWidth;
+								item.RecalcSize();
+								iVisibleHeight+=item.HeightInternal;
+								item.Displayed=false;
+								continue;
+							}
+							if(m_LayoutType==eSideBarLayoutType.MultiColumn)
+							{
+								item.WidthInternal=itemWidth;
+								item.RecalcSize();
+								if(item.WidthInternal>itemWidth && lineHeight==0)
+								{
+									item.WidthInternal=itemWidth;
+									lineHeight=item.HeightInternal;
+								}
+								else
+								{
+									if(iLeft+item.WidthInternal-initalLeft>itemWidth)
+									{
+										// Switch the line
+										iLeft=initalLeft;
+										iTop+=lineHeight;
+										iVisibleHeight+=lineHeight;
+										lineHeight=0;
+									}
+									if(item.HeightInternal>lineHeight)
+										lineHeight=item.HeightInternal;
+									item.TopInternal=iTop;
+									item.LeftInternal=iLeft;
+									iLeft+=item.WidthInternal;
+								}
+							}
+							else
+							{
+								item.WidthInternal=itemWidth;
+								item.RecalcSize();
+								item.WidthInternal=itemWidth;
+								if(this.DesignMode && item.IsWindowed && iTop+item.HeightInternal>iHeightThreshold)
+								{
+									iVisibleHeight+=item.HeightInternal;
+									item.Displayed=false;
+									continue;
+								}
+								else
+								{
+									if(item.BeginGroup)
+									{
+										iTop+=3;
+										iVisibleHeight+=3;
+									}
+									item.TopInternal=iTop;
+									item.LeftInternal=iLeft;
+									iTop+=item.HeightInternal;
+									iVisibleHeight+=item.HeightInternal;
+								}
+							}
+							item.Displayed=true;
+						}
+
+						if(m_LayoutType==eSideBarLayoutType.MultiColumn && lineHeight>0)
+						{
+							iVisibleHeight+=lineHeight;
+							iTop+=lineHeight;
+						}
+						
+						if(bMultiColumnPass)
+						{
+							// Make sure that top index is correct
+							int iTopY=this.SubItems[m_TopItemIndex].TopInternal;
+							int iTopIndex=m_TopItemIndex;
+							while(iTopIndex>0)
+							{
+								iTopIndex--;
+								if(this.SubItems[iTopIndex].Visible && this.SubItems[iTopIndex].TopInternal<iTopY)
+								{
+									iTopIndex++;
+									break;
+								}
+							}
+							m_TopItemIndex=iTopIndex;
+							bMultiColumnPass=false;
+							iRepeat=2; // Make sure this loop repeats
+						}
+						else
+						{
+							if(iVisibleHeight>0 && iVisibleHeight<iHeightThreshold && m_TopItemIndex>0)
+							{
+								m_TopItemIndex=0;
+								m_ScrollDownButton=false;
+								iRepeat++;
+							}
+						}
+					}while(iRepeat==2);
+                    if(iTop>iHeightThreshold && m_EnableScrollButtons)
+						m_ScrollDownButton=true;
+				}
+				if(m_ControlHost!=null)
+				{
+					System.Drawing.Size controlSize=Size.Empty;
+					if(m_Appearance==eSideBarAppearance.Traditional)
+						controlSize=new Size(m_Rect.Width,m_Rect.Height-(m_PanelRect.Height+1));
+					else
+						controlSize=new Size(clientWidth,m_Rect.Height-m_PanelRect.Height);
+					System.Drawing.Point location=System.Drawing.Point.Empty;
+					if(m_Appearance==eSideBarAppearance.Traditional)
+						location=new Point(m_Rect.Left,m_Rect.Top+m_PanelRect.Height+1);
+					else
+						location=new Point(m_Rect.Right-clientWidth,m_Rect.Top+m_PanelRect.Height);
+
+					m_ControlHost.Size=controlSize;
+					m_ControlHost.Location=location;
+					m_ControlHost.Visible=true;
+				}
+			}
+			else
+			{
+				if(m_ControlHost!=null)
+					m_ControlHost.Visible=false;
+				// When not expanded just set the height and return
+                m_Rect.Height=m_PanelRect.Height;
+				foreach(BaseItem item in m_SubItems)
+				{
+					item.Displayed=false;
+				}
+			}
+
+			if(m_ControlHost!=null && this.Expanded)
+				m_ControlHost.SetupScrollButtons();
+			base.RecalcSize();
+		}
+
+
+        /// <summary>
+        /// Gets whether mouse is over the panel header.
+        /// </summary>
+        [Browsable(false)]
+        public bool IsMouseOver
+        {
+            get { return m_MouseOver; }
+        }
+
+        /// <summary>
+        /// Gets whether mouse is pressed over the panel header.
+        /// </summary>
+        [Browsable(false)]
+        public bool IsMouseDown
+        {
+            get { return m_MouseDown; }
+        }
+
+		public override void Paint(ItemPaintArgs pa)
+		{
+            if (m_WordWrap)
+            {
+                pa.ButtonStringFormat = pa.ButtonStringFormat & ~(pa.ButtonStringFormat & eTextFormat.SingleLine);
+                pa.ButtonStringFormat |= eTextFormat.WordBreak;
+            }
+			_ItemPaintArgs=pa;
+
+            Rectangle r = m_Rect;
+            Font font = this.GetFont();
+            System.Drawing.Graphics g = pa.Graphics;
+            if (m_NeedRecalcSize)
+                RecalcSize();
+
+            if (BarFunctions.IsOffice2007Style(this.EffectiveStyle))
+            {
+                SideBarPanelItemRendererEventArgs renderArgs = new SideBarPanelItemRendererEventArgs(this, pa.Graphics);
+                renderArgs.ItemPaintArgs = pa;
+                pa.Renderer.DrawSideBarPanelItem(renderArgs);
+
+                r = m_PanelRect;
+                r.Offset(m_Rect.X, m_Rect.Y);
+            }
+            else
+            {
+                if (this.IsThemed)
+                {
+                    PaintThemed(pa);
+                    if (m_WordWrap)
+                        pa.ButtonStringFormat = pa.ButtonStringFormat | eTextFormat.SingleLine;
+                    _ItemPaintArgs = null;
+                    return;
+                }
+
+                if (this.SuspendLayout)
+                {
+                    if (m_WordWrap)
+                        pa.ButtonStringFormat = pa.ButtonStringFormat | eTextFormat.SingleLine;
+                    _ItemPaintArgs = null;
+                    return;
+                }
+                
+                CompositeImage image = this.GetImage();
+                Rectangle rText = Rectangle.Empty;
+
+                if (m_Appearance == eSideBarAppearance.Traditional)
+                {
+                    Color backColor = SystemColors.Control;
+                    Color foreColor = m_ForeColor;
+                    if (foreColor.IsEmpty) foreColor = pa.Colors.ItemText;
+                    System.Windows.Forms.Control ctrl = this.ContainerControl as System.Windows.Forms.Control;
+
+                    if (!m_BackgroundStyle.BackColor1.IsEmpty || m_BackgroundStyle.BackgroundImage != null)
+                    {
+                        m_BackgroundStyle.Paint(g, m_Rect);
+                        backColor = m_BackgroundStyle.BackColor1.Color;
+                    }
+
+                    if (ctrl != null)
+                    {
+                        backColor = ctrl.BackColor;
+                        if (m_ForeColor == SystemColors.ControlText)
+                            foreColor = ctrl.ForeColor;
+                    }
+
+                    if (m_MouseOver && !m_HotForeColor.IsEmpty)
+                        foreColor = m_HotForeColor;
+
+                    r = m_PanelRect;
+                    r.Offset(m_Rect.X, m_Rect.Y);
+
+                    if (m_Text != "")
+                    {
+                        if (m_MouseDown)
+                            BarFunctions.DrawBorder3D(g, r.X, r.Y, r.Width, r.Height, System.Windows.Forms.Border3DStyle.Sunken, backColor);
+                        else if (m_MouseOver)
+                            BarFunctions.DrawBorder3D(g, r.X, r.Y, r.Width, r.Height, System.Windows.Forms.Border3DStyle.Raised, backColor);
+                        else
+                            BarFunctions.DrawBorder3D(g, r.X, r.Y, r.Width, r.Height, System.Windows.Forms.Border3DStyle.RaisedInner, backColor);
+                    }
+
+                    r.Inflate(-2, -2);
+
+                    if (image != null)
+                    {
+                        r.X += 2;
+                        r.Width -= 2;
+                        image.DrawImage(g, new Rectangle(r.X, r.Y + (r.Height - image.Height) / 2, image.Width, image.Height));
+                        r.X += (image.Width + 4);
+                        r.Width -= (image.Width + 8);
+                    }
+
+                    if (m_Text != "")
+                    {
+                        TextDrawing.DrawString(g, m_Text, font, foreColor, r, this.GetStringFormat());
+                        rText = r;
+                    }
+                }
+                else
+                {
+                    int iSideWidth = FLAT_NOIMAGESIDEWIDTH;
+                    if (image != null)
+                        iSideWidth = image.Width + IMAGE_MARGIN * 2;
+
+                    if (iSideWidth >= m_Rect.Width)
+                        iSideWidth = 0;
+
+                    r.Offset(iSideWidth, 0);
+                    r.Width -= iSideWidth;
+                    if (!m_BackgroundStyle.BackColor1.IsEmpty || m_BackgroundStyle.BackgroundImage != null)
+                    {
+                        m_BackgroundStyle.Paint(g, r);
+                    }
+                    // Paint Header
+                    r = m_PanelRect;
+                    r.Offset(m_Rect.Location);
+
+                    if (iSideWidth > 0)
+                    {
+                        Rectangle sideRect = new Rectangle(r.X, r.Y, iSideWidth + 1, r.Height);
+                        r.Offset(iSideWidth + 1, 0);
+                        r.Width -= iSideWidth + 1;
+                        if (m_HeaderSideStyle != null)
+                        {
+                            ItemStyle style = m_HeaderSideStyle.Clone() as ItemStyle;
+                            if (m_MouseDown && !this.Expanded)
+                                style.ApplyStyle(m_HeaderSideMouseDownStyle);
+                            else if (m_MouseOver && !this.Expanded)
+                                style.ApplyStyle(m_HeaderSideHotStyle);
+                            style.Paint(g, sideRect);
+                            if (image != null)
+                                image.DrawImage(g, new Rectangle(sideRect.X + (sideRect.Width - image.Width) / 2, sideRect.Y + (sideRect.Height - image.Height) / 2, image.Width, image.Height));
+                        }
+                    }
+
+                    if (m_HeaderStyle != null)
+                    {
+                        ItemStyle style = m_HeaderStyle.Clone() as ItemStyle;
+                        if (m_MouseDown && !this.Expanded)
+                            style.ApplyStyle(m_HeaderMouseDownStyle);
+                        else if (m_MouseOver && !this.Expanded)
+                            style.ApplyStyle(m_HeaderHotStyle);
+                        else if (this.Expanded && !m_BackgroundStyle.ForeColor.IsEmpty)
+                            style.ForeColor.Color = m_BackgroundStyle.ForeColor.Color;
+                        rText = r;
+                        rText.Offset(4, 0);
+                        rText.Width -= 4;
+                        if (this.Expanded)
+                            style.PaintText(g, m_Text, rText, font);
+                        else
+                            style.Paint(g, r, m_Text, rText, font);
+                    }
+                }
+                image = null;
+
+                if (this.Focused)
+                {
+                    if (this.DesignMode)
+                    {
+                        Rectangle rFocus = m_PanelRect;
+                        rFocus.Offset(m_Rect.X, m_Rect.Y);
+                        rFocus.Inflate(-2, -2);
+                        DesignTime.DrawDesignTimeSelection(g, rFocus, pa.Colors.ItemDesignTimeBorder);
+                    }
+                    else if (!rText.IsEmpty)
+                    {
+                        Rectangle rFocus = rText;
+                        System.Windows.Forms.ControlPaint.DrawFocusRectangle(g, rFocus);
+                    }
+                }
+            }
+
+			if(this.Expanded && m_SubItems!=null && m_ControlHost==null)
+			{
+				r=new Rectangle(m_Rect.X,m_Rect.Y+r.Height+1,m_Rect.Width,m_Rect.Height-r.Height-1);
+				g.SetClip(r);
+				for(int i=m_TopItemIndex;i<m_SubItems.Count;i++)
+				{
+					BaseItem item=m_SubItems[i];
+					if(!item.Displayed || !item.Visible)
+						continue;
+					if(item.BeginGroup && m_LayoutType==eSideBarLayoutType.Default)
+					{
+						Color divider=SystemColors.ControlDark;
+						if(m_HeaderStyle!=null && !m_HeaderStyle.BorderColor.IsEmpty)
+							divider=m_HeaderStyle.BorderColor.Color;
+						using(Pen line=new Pen(divider,1))
+							g.DrawLine(line,item.LeftInternal+2,item.TopInternal-2,item.DisplayRectangle.Right-4,item.TopInternal-2);
+					}
+					item.Paint(pa);
+				}
+				g.ResetClip();
+			}
+
+			if(m_ControlHost==null)
+			{
+				// Draw scroll up button
+				if(m_TopItemIndex>0 && m_EnableScrollButtons)
+				{
+                    if (BarFunctions.IsOffice2007Style(this.EffectiveStyle))
+                    {
+                        Office2007SideBarColorTable ct = ((Office2007Renderer)pa.Renderer).ColorTable.SideBar;
+                        GradientColorTable t = ct.SideBarPanelItemDefault;
+                        if (t != null)
+                        {
+                            m_ScrollButtonRect[0] = new Rectangle(r.Right - Dpi.Width18, r.Top + Dpi.Height4, Dpi.Width16, Dpi.Height16);
+                            using (Brush brush = DisplayHelp.CreateBrush(r, t))
+                            {
+                                g.FillRectangle(brush, m_ScrollButtonRect[0]);
+                            }
+                            DisplayHelp.DrawRectangle(g, ct.Border, m_ScrollButtonRect[0]);
+                            PaintArrow(g, m_ScrollButtonRect[0], ct.SideBarPanelItemText, true);
+                        }
+                    }
+					else if(m_Appearance==eSideBarAppearance.Traditional || m_HeaderStyle==null)
+					{
+                        m_ScrollButtonRect[0] = new Rectangle(r.Right - Dpi.Width18, r.Top + Dpi.Height4, Dpi.Width16, Dpi.Height16);
+						BarFunctions.DrawBorder3D(g,m_ScrollButtonRect[0],System.Windows.Forms.Border3DStyle.Raised);
+						PaintArrow(g,m_ScrollButtonRect[0],SystemColors.ControlText,true);
+					}
+					else
+					{
+                        m_ScrollButtonRect[0] = new Rectangle(r.Right - Dpi.Width16, r.Top + Dpi.Height2, Dpi.Width14, Dpi.Width14);
+						ItemStyle style=m_HeaderStyle.Clone() as ItemStyle;
+						style.BorderSide=eBorderSide.All;
+						style.Paint(g,m_ScrollButtonRect[0]);
+						//style.Dispose();
+						PaintArrow(g,m_ScrollButtonRect[0],SystemColors.ControlText,true);
+					}
+				}
+				else
+					m_ScrollButtonRect[0]=Rectangle.Empty;
+
+				// Draw scroll down button
+				if(m_ScrollDownButton)
+				{
+                    if (BarFunctions.IsOffice2007Style(this.EffectiveStyle))
+                    {
+                        Office2007SideBarColorTable ct = ((Office2007Renderer)pa.Renderer).ColorTable.SideBar;
+                        GradientColorTable t = ct.SideBarPanelItemDefault;
+                        if (t != null)
+                        {
+                            m_ScrollButtonRect[1] = new Rectangle(m_Rect.Right - Dpi.Width18, m_Rect.Bottom - Dpi.Height18, Dpi.Width16, Dpi.Height16);
+                            using (Brush brush = DisplayHelp.CreateBrush(r, t))
+                            {
+                                g.FillRectangle(brush, m_ScrollButtonRect[1]);
+                            }
+                            DisplayHelp.DrawRectangle(g, ct.Border, m_ScrollButtonRect[1]);
+                            PaintArrow(g, m_ScrollButtonRect[1], ct.SideBarPanelItemText, false);
+                        }
+                    }
+                    else if(m_Appearance==eSideBarAppearance.Traditional || m_HeaderStyle==null)
+					{
+                        m_ScrollButtonRect[1] = new Rectangle(m_Rect.Right - Dpi.Width18, m_Rect.Bottom - Dpi.Height18, Dpi.Width16, Dpi.Height16);
+						BarFunctions.DrawBorder3D(g,m_ScrollButtonRect[1],System.Windows.Forms.Border3DStyle.Raised);
+						PaintArrow(g,m_ScrollButtonRect[1],SystemColors.ControlText,false);
+					}
+					else
+					{
+                        m_ScrollButtonRect[1] = new Rectangle(m_Rect.Right - Dpi.Width16, m_Rect.Bottom - Dpi.Height16, Dpi.Width14, Dpi.Height14);
+						ItemStyle style=m_HeaderStyle.Clone() as ItemStyle;
+						style.BorderSide=eBorderSide.All;
+						style.Paint(g,m_ScrollButtonRect[1]);
+						//style.Dispose();
+						PaintArrow(g,m_ScrollButtonRect[1],SystemColors.ControlText,false);
+					}
+				}
+				else
+					m_ScrollButtonRect[1]=Rectangle.Empty;
+			}
+
+			if(m_WordWrap)
+				pa.ButtonStringFormat=pa.ButtonStringFormat | eTextFormat.SingleLine;
+
+			PaintInfoText(pa);
+
+			_ItemPaintArgs=null;
+		}
+
+		private void PaintThemed(ItemPaintArgs pa)
+		{
+			if(this.SuspendLayout)
+				return;
+			System.Drawing.Graphics g=pa.Graphics;
+			if(m_NeedRecalcSize)
+				RecalcSize();
+
+			ThemeHeader theme=pa.ThemeHeader;
+			Rectangle r=m_PanelRect;
+			r.Offset(m_Rect.X,m_Rect.Y);
+			Font font=this.GetFont();
+			
+//			if(this.Expanded)
+//			{
+//				SizeF size=SizeF.Empty;
+//				if(m_Text!="")
+//					size=g.MeasureString(m_Text,font,m_Rect.Width-m_Margin*2,this.GetStringFormat());
+//				r.Height=(int)size.Height+m_Margin*2;
+//			}
+
+			ThemeHeaderParts part=ThemeHeaderParts.HeaderItemLeft;
+			ThemeHeaderStates state=ThemeHeaderStates.ItemNormal;
+
+			if(m_Text!="")
+			{
+				if(m_MouseDown)
+				{
+					state=ThemeHeaderStates.ItemPressed;
+					part=ThemeHeaderParts.HeaderItem;
+				}
+				else if(m_MouseOver)
+				{
+					state=ThemeHeaderStates.ItemHot;
+					part=ThemeHeaderParts.HeaderItem;
+				}
+
+				theme.DrawBackground(g,part,state,r);
+			}
+
+			CompositeImage image=this.GetImage();
+
+			r.Inflate(-2,-2);
+
+			if(image!=null)
+			{
+				r.X+=2;
+				r.Width-=2;
+				image.DrawImage(g,new Rectangle(r.X,r.Y+(r.Height-image.Height)/2,image.Width,image.Height));
+				r.X+=(image.Width+4);
+				r.Width-=(image.Width+4);
+				r.Inflate(0,-2);
+			}
+
+			if(m_Text!="")
+				theme.DrawText(g,m_Text,font,r,part,state,ThemeTextFormat.VCenter | ThemeTextFormat.Center | ThemeTextFormat.EndEllipsis,!m_Enabled);
+
+			if(this.DesignMode && this.Focused)
+			{
+				Rectangle rFocus=m_PanelRect;
+				rFocus.Offset(m_Rect.X,m_Rect.Y);
+				rFocus.Inflate(-2,-2);
+				DesignTime.DrawDesignTimeSelection(g,rFocus,pa.Colors.ItemDesignTimeBorder);
+			}
+
+			if(this.Expanded && m_SubItems!=null && m_ControlHost==null)
+			{
+				r=new Rectangle(m_Rect.X,m_Rect.Y+r.Height+1,m_Rect.Width,m_Rect.Height-r.Height-1);
+				g.SetClip(r);
+
+				IntPtr hdc=g.GetHdc();
+				int rgn=0;
+				try
+				{
+					rgn=NativeFunctions.CreateRectRgn(r.Left,r.Top,r.Right,r.Bottom);
+					if(rgn!=0)
+						NativeFunctions.SelectClipRgn(hdc,rgn);
+				}
+				finally
+				{
+					g.ReleaseHdc(hdc);
+				}
+
+				for(int i=m_TopItemIndex;i<m_SubItems.Count;i++)
+				{
+					BaseItem item=m_SubItems[i];
+					if(!item.Displayed || !item.Visible)
+						continue;
+					item.Paint(pa);
+				}
+				g.ResetClip();
+				if(rgn!=0)
+				{
+					hdc=g.GetHdc();
+                    try
+                    {
+                        NativeFunctions.SelectClipRgn(hdc, 0);
+                        WinApi.DeleteObject(rgn);
+                    }
+                    finally
+                    {
+                        g.ReleaseHdc(hdc);
+                    }
+				}
+			}
+
+			if(m_ControlHost==null)
+			{
+				// Draw scroll up button
+				if(m_TopItemIndex>0)
+				{
+					ThemeScrollBar scroll=pa.ThemeScrollBar;
+                    m_ScrollButtonRect[0] = new Rectangle(r.Right - Dpi.Width17, r.Top + Dpi.Height4, Dpi.Width17, Dpi.Height16);
+					scroll.DrawBackground(g,ThemeScrollBarParts.ArrowBtn, ThemeScrollBarStates.ArrowBtnUpNormal,m_ScrollButtonRect[0]);
+				}
+				else
+					m_ScrollButtonRect[0]=Rectangle.Empty;
+
+				// Draw scroll down button
+				if(m_ScrollDownButton)
+				{
+					ThemeScrollBar scroll=pa.ThemeScrollBar;
+                    m_ScrollButtonRect[1] = new Rectangle(m_Rect.Right - Dpi.Width17, m_Rect.Bottom - Dpi.Height18, Dpi.Width17, Dpi.Height16);
+					scroll.DrawBackground(g,ThemeScrollBarParts.ArrowBtn, ThemeScrollBarStates.ArrowBtnDownNormal,m_ScrollButtonRect[1]);
+				}
+				else
+					m_ScrollButtonRect[1]=Rectangle.Empty;
+			}
+
+			PaintInfoText(pa);
+		}
+
+		private void PaintInfoText(ItemPaintArgs pa)
+		{
+			if(m_SubItems!=null && m_SubItems.Count==0 && this.DesignMode && this.Expanded)
+			{
+				Rectangle rInfoText=m_Rect;
+				if(!m_PanelRect.IsEmpty)
+				{
+					rInfoText.Y+=m_PanelRect.Height;
+					rInfoText.Height-=m_PanelRect.Height;
+				}
+				string info=INFO_EMPTYPANEL;
+				rInfoText.Inflate(-1,-1);
+				if(m_Appearance==eSideBarAppearance.Flat)
+				{
+					CompositeImage image=this.GetImage();
+					int iSideWidth=FLAT_NOIMAGESIDEWIDTH;
+					if(image!=null)
+						iSideWidth=image.Width+IMAGE_MARGIN*2;
+					if(iSideWidth>=m_Rect.Width)
+						iSideWidth=0;
+					rInfoText.Offset(iSideWidth,0);
+					rInfoText.Width-=iSideWidth;
+				}
+                Font f1=this.GetFont();
+                if(f1!=null)
+                {
+                    Font font = new Font(f1.FontFamily, f1.Size - 1);
+                    try
+                    {
+                        eTextFormat format = eTextFormat.Default | eTextFormat.HorizontalCenter | eTextFormat.VerticalCenter | eTextFormat.WordBreak;
+                        TextDrawing.DrawString(pa.Graphics, info, font, SystemColors.ControlDark, rInfoText, format);
+                    }
+                    finally
+                    {
+                        font.Dispose();
+                    }
+                }
+			}
+		}
+
+		private void PaintThemeScrollState()
+		{
+            System.Windows.Forms.Control container=this.ContainerControl as System.Windows.Forms.Control;
+			if(!IsHandleValid(container))
+				return;
+			Graphics g=BarFunctions.CreateGraphics(container);
+			try
+			{
+				ThemeScrollBar scroll=null;
+				bool bDisposeTheme=false;
+				if(container is IThemeCache)
+					scroll=((IThemeCache)container).ThemeScrollBar;
+				else if(container is Bar)
+					scroll=((Bar)container).ThemeScrollBar;
+				else
+				{
+					bDisposeTheme=true;
+					scroll=new ThemeScrollBar(container);
+				}
+				ThemeScrollBarParts part=ThemeScrollBarParts.ArrowBtn;
+				ThemeScrollBarStates state=ThemeScrollBarStates.ArrowBtnUpNormal;
+				if(m_TopItemIndex>0)
+				{
+					if(m_ScrollButtonHot==0)
+						state=ThemeScrollBarStates.ArrowBtnUpHot;
+					scroll.DrawBackground(g,part,state,m_ScrollButtonRect[0]);
+				}
+				if(m_ScrollDownButton)
+				{
+					state=ThemeScrollBarStates.ArrowBtnDownNormal;
+					if(m_ScrollButtonHot==1)
+						state=ThemeScrollBarStates.ArrowBtnDownHot;
+                    scroll.DrawBackground(g,part,state,m_ScrollButtonRect[1]);
+				}
+				if(bDisposeTheme)
+					scroll.Dispose();
+			}
+			finally
+			{
+				if(g!=null)
+					g.Dispose();
+			}
+		}
+
+		public override void SubItemSizeChanged(BaseItem objChildItem)
+		{
+			NeedRecalcSize=true;
+		}
+
+		private void PaintArrow(Graphics g, Rectangle rect, Color c, bool up)
+		{
+			Point[] p=new Point[3];
+			if(up)
+			{
+				p[0].X=rect.Left+(rect.Width-9)/2;
+				p[0].Y=rect.Top+rect.Height/2+1;
+				p[1].X=p[0].X+8;
+				p[1].Y=p[0].Y;
+				p[2].X=p[0].X+4;
+				p[2].Y=p[0].Y-5;
+			}
+			else
+			{
+				p[0].X=rect.Left+(rect.Width-7)/2;
+				p[0].Y=rect.Top+(rect.Height-4)/2;
+				p[1].X=p[0].X+7;
+				p[1].Y=p[0].Y;
+				p[2].X=p[0].X+3;
+				p[2].Y=p[0].Y+4;
+			}
+			g.FillPolygon(new SolidBrush(c),p);
+		}
+
+		/// <summary>
+		/// Returns the Font object to be used for drawing the item text.
+		/// </summary>
+		/// <returns>Font object.</returns>
+		internal virtual Font GetFont()
+		{
+            System.Drawing.Font font = SystemFonts.DefaultFont; // System.Windows.Forms.SystemInformation.MenuFont;
+			System.Windows.Forms.Control ctrl=this.ContainerControl as System.Windows.Forms.Control;
+			if(ctrl!=null)
+				font=ctrl.Font;
+			if(m_MouseOver && (m_HotFontBold || m_HotFontUnderline))
+			{
+				FontStyle style=FontStyle.Regular;
+				if(m_HotFontBold)
+					style=style | FontStyle.Bold;
+				if(m_HotFontUnderline)
+					style=style | FontStyle.Underline;
+				try
+				{
+					font=new Font(font,style);
+				}
+				catch
+				{
+                    font = SystemFonts.DefaultFont; // System.Windows.Forms.SystemInformation.MenuFont.Clone() as Font;
+				}
+			}
+            else if (m_FontBold)
+            {
+                FontStyle style = font.Style;
+                style = style | FontStyle.Bold;
+                try
+                {
+                    font = new Font(font, style);
+                }
+                catch
+                {
+                    font = SystemFonts.DefaultFont; // System.Windows.Forms.SystemInformation.MenuFont.Clone() as Font;
+                }
+            }
+			return font;
+		}
+
+        internal eTextFormat GetStringFormat()
+		{
+            eTextFormat format = eTextFormat.VerticalCenter |
+                eTextFormat.EndEllipsis | eTextFormat.ExternalLeading;
+            
+            if (m_TextAlignment == eStyleTextAlignment.Center)
+                format |= eTextFormat.HorizontalCenter;
+            else if (m_TextAlignment == eStyleTextAlignment.Far)
+                format |= eTextFormat.Right;
+
+            if (!m_WordWrap)
+                format |= eTextFormat.SingleLine;
+            else
+                format |= eTextFormat.WordBreak;
+            return format;
+		}
+
+        private eStyleTextAlignment m_TextAlignment = eStyleTextAlignment.Center;
+        /// <summary>
+        /// Specifies panel title text alignment. Default value is Center.
+        /// </summary>
+        [DevCoSerialize(), Browsable(true), Category("Appearance"), DefaultValue(eStyleTextAlignment.Center), Description("Specifies alignment of the text.")]
+        public eStyleTextAlignment TextAlignment
+        {
+            get { return m_TextAlignment; }
+            set
+            {
+                m_TextAlignment = value;
+                this.OnAppearanceChanged();
+            }
+        }
+
+		/// <summary>
+		/// Occurs when the mouse pointer is moved over the item. This is used by internal implementation only.
+		/// </summary>
+		[System.ComponentModel.Browsable(false),System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+		public override void InternalMouseMove(System.Windows.Forms.MouseEventArgs objArg)
+		{
+			if(objArg.Button==System.Windows.Forms.MouseButtons.Left && (Math.Abs(objArg.X-m_MouseDownPt.X)>=4 || Math.Abs(objArg.Y-m_MouseDownPt.Y)>=4))
+			{
+				SideBar sidebar=this.ContainerControl as SideBar;
+				if(sidebar!=null && sidebar.AllowUserCustomize && this.CanCustomize)
+				{
+					BaseItem active=m_HotSubItem;
+					if(active!=null && active.CanCustomize && !active.SystemItem)
+					{
+						IOwner owner=this.GetOwner() as IOwner;
+						if(owner!=null && owner.DragItem==null)
+						{
+							owner.StartItemDrag(active);
+							return;
+						}
+					}
+				}
+			}
+
+			bool bScrollPaint=false;
+			if(m_ScrollButtonRect[0].Contains(objArg.X,objArg.Y) || m_ScrollButtonRect[1].Contains(objArg.X,objArg.Y))
+			{
+				if(m_HotSubItem!=null)
+				{
+					m_HotSubItem.InternalMouseLeave();
+					m_HotSubItem=null;
+				}
+				if(m_ScrollButtonRect[0].Contains(objArg.X,objArg.Y))
+					m_ScrollButtonHot=0;
+				else
+					m_ScrollButtonHot=1;
+				if(this.IsThemed)
+					PaintThemeScrollState();
+				return;
+			}
+			else if(m_ScrollButtonHot>=0)
+			{
+				m_ScrollButtonHot=-1;
+				bScrollPaint=true;
+			}
+			
+			if(m_ControlHost!=null)
+			{
+				m_IsContainer=false;
+				base.InternalMouseMove(objArg);
+				m_IsContainer=true;
+			}
+			else
+				base.InternalMouseMove(objArg);
+
+			Rectangle r=m_PanelRect;
+			r.Offset(m_Rect.Location);
+			if(r.Contains(objArg.X,objArg.Y))
+			{
+				m_MouseOver=true;
+				this.Refresh();
+			}
+			else if(m_MouseOver)
+			{
+				m_MouseOver=false;
+				this.Refresh();
+			}
+			else if(bScrollPaint && this.IsThemed)
+				PaintThemeScrollState();
+		}
+
+		[System.ComponentModel.Browsable(false),System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+		public override void InternalMouseLeave()
+		{
+			base.InternalMouseLeave();
+			m_MouseOver=false;
+			m_MouseDown=false;
+			if(m_ScrollButtonHot>=0)
+				m_ScrollButtonHot=-1;
+			this.Refresh();
+		}
+
+		/// <summary>
+		/// Occurs when the mouse pointer is over the item and a mouse button is pressed. This is used by internal implementation only.
+		/// </summary>
+		[System.ComponentModel.Browsable(false),System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+		public override void InternalMouseDown(System.Windows.Forms.MouseEventArgs objArg)
+		{
+			Rectangle r=m_PanelRect;
+			r.Offset(m_Rect.Location);
+			m_MouseDownPt=new System.Drawing.Point(objArg.X,objArg.Y);
+
+			if(this.DesignMode)
+			{
+				if(this.ItemAtLocation(objArg.X,objArg.Y)==null && !r.Contains(objArg.X,objArg.Y) && this.Expanded)
+				{
+					IOwner owner=this.GetOwner() as IOwner;
+					if(owner!=null)
+						owner.SetFocusItem(null);
+				}
+				else if(!r.Contains(objArg.X,objArg.Y))
+					base.InternalMouseDown(objArg);
+				return;
+			}
+
+			if(objArg.Button==System.Windows.Forms.MouseButtons.Left && m_ScrollButtonRect[0].Contains(objArg.X,objArg.Y))
+			{
+				// Scroll up
+				ScrollButtonClick(true);
+				return;
+			}
+			else if(objArg.Button==System.Windows.Forms.MouseButtons.Left && m_ScrollButtonRect[1].Contains(objArg.X,objArg.Y))
+			{
+                ScrollButtonClick(false);
+				return;
+			}
+			
+			if(objArg.Button == System.Windows.Forms.MouseButtons.Left && r.Contains(objArg.X,objArg.Y))
+			{
+				m_MouseDown=true;
+				this.Refresh();
+			}
+
+			if(m_IgnoreClickDateTime!=DateTime.MinValue)
+			{
+				TimeSpan elapsed=DateTime.Now.Subtract(m_IgnoreClickDateTime);
+				if(elapsed.TotalMilliseconds<1000 && m_IgnoreScrollRect.Contains(objArg.X,objArg.Y))
+					return;
+				m_IgnoreClickDateTime=DateTime.MinValue;
+			}
+
+			base.InternalMouseDown(objArg);
+		}
+
+        internal void OnMouseWheel(System.Windows.Forms.MouseEventArgs e)
+        {
+            if (HasScrollButtons)
+            {
+                ScrollButtonClick(e.Delta < 0);
+            }
+        }
+
+		internal void ScrollButtonClick(bool up)
+		{
+			if(up)
+			{
+				// Scroll up
+				if(m_TopItemIndex>0)
+				{
+					m_IgnoreScrollRect=m_ScrollButtonRect[0];
+					if(m_LayoutType==eSideBarLayoutType.MultiColumn)
+					{
+						// Look for line switch
+						while(m_TopItemIndex>0)
+						{
+							m_TopItemIndex--;
+							if(this.SubItems[m_TopItemIndex].Visible)
+								break;
+						}
+					}
+					else
+						m_TopItemIndex--;
+					NeedRecalcSize=true;
+					this.Refresh();
+					m_IgnoreNextClick=true;
+				}
+			}
+			else if(!m_ScrollButtonRect[1].IsEmpty)
+			{
+				m_IgnoreScrollRect=m_ScrollButtonRect[1];
+				// Scroll Down
+				if(m_LayoutType==eSideBarLayoutType.MultiColumn)
+				{
+					// Look for line switch
+					int iY=this.SubItems[m_TopItemIndex].TopInternal;
+					while(m_TopItemIndex+1<this.SubItems.Count)
+					{
+						m_TopItemIndex++;
+						if(this.SubItems[m_TopItemIndex].Visible && this.SubItems[m_TopItemIndex].TopInternal>iY)
+							break;
+					}
+				}
+				else
+					m_TopItemIndex++;
+				NeedRecalcSize=true;
+				this.Refresh();
+				m_IgnoreNextClick=true;
+			}
+			if(m_ControlHost!=null)
+				m_ControlHost.Refresh();
+		}
+
+		[System.ComponentModel.Browsable(false),System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+		public override void InternalMouseUp(System.Windows.Forms.MouseEventArgs objArg)
+		{
+			if(objArg.Button==System.Windows.Forms.MouseButtons.Left)
+			{
+				m_MouseDown=false;
+				this.Refresh();
+			}
+			if(m_IgnoreNextClick)
+			{
+				m_IgnoreNextClick=false;
+				m_IgnoreClickDateTime=DateTime.Now;
+			}
+			else if(m_IgnoreClickDateTime!=DateTime.MinValue)
+				return;
+
+			Rectangle r=m_PanelRect;
+			r.Offset(m_Rect.Location);
+
+			base.InternalMouseUp(objArg);
+
+			if((this.GetOwner() as IOwner)!=null && ((IOwner)this.GetOwner()).DragInProgress)
+				return;
+			
+			if(!this.Expanded && objArg.Button==System.Windows.Forms.MouseButtons.Left && r.Contains(objArg.X,objArg.Y))
+				this.Expanded=true;
+		}
+
+		/// <summary>
+		/// Occurs when the item is clicked. This is used by internal implementation only.
+		/// </summary>
+		[System.ComponentModel.Browsable(false),System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+		public override void InternalClick(System.Windows.Forms.MouseButtons mb, System.Drawing.Point mpos)
+		{
+			base.InternalClick(mb,mpos);
+//			if((this.GetOwner() as IOwner)!=null && ((IOwner)this.GetOwner()).DragInProgress)
+//				return;
+//			if(!this.Expanded)
+//				this.Expanded=true;
+		}
+
+		protected internal override void OnExpandChange()
+		{
+			base.OnExpandChange();
+			m_TopItemIndex=0;
+		}
+
+		/// <summary>
+		/// Gets or sets the layout type for the items. Default layout orders items in a single column. Multi-column layout will order
+		/// items in multiple colums based on the width of the control.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),DefaultValue(eSideBarLayoutType.Default),Category("Appearance"),Description("Gets or sets the layout type for the items.")]
+		public eSideBarLayoutType LayoutType
+		{
+			get {return m_LayoutType;}
+			set
+			{
+				if(m_LayoutType!=value)
+				{
+					m_LayoutType=value;
+					NeedRecalcSize=true;
+					if(this.DesignMode)
+						this.Refresh();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the text associated with this item.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Appearance"),System.ComponentModel.Description("The text contained in the item."),System.ComponentModel.Localizable(true)]
+		public override string Text
+		{
+			get
+			{
+				return base.Text;
+			}
+			set
+			{
+				base.Text=value;
+				if(m_Text=="")
+					m_Margin=0;
+				else
+					m_Margin=3;
+				this.NeedRecalcSize=true;
+				if(this.Parent!=null)
+					this.Parent.NeedRecalcSize=true;
+				if(this.DesignMode)
+					this.Refresh();
+				OnAppearanceChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the item background style.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),Category("Style"),Description("Gets or sets group background style."),DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+		public ItemStyle BackgroundStyle
+		{
+			get {return m_BackgroundStyle;}
+		}
+		public void ResetBackgroundStyle()
+		{
+			SetBackgroundStyle(new ItemStyle());
+		}
+		internal void SetBackgroundStyle(ItemStyle newStyle)
+		{
+			if(m_BackgroundStyle!=null)
+				m_BackgroundStyle.VisualPropertyChanged-=new EventHandler(this.VisualPropertyChanged);
+			m_BackgroundStyle=newStyle;
+			if(m_BackgroundStyle!=null)
+				m_BackgroundStyle.VisualPropertyChanged+=new EventHandler(this.VisualPropertyChanged);
+		}
+
+		internal bool HasFlatStyle
+		{
+			get
+			{
+				if(m_HeaderStyle!=null)
+					return true;
+				return false;
+			}
+		}
+		/// <summary>
+		/// Gets or sets the item header style. Applies only when SideBar.Appearance is set to Flat.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),NotifyParentPropertyAttribute(true),Category("Style"),Description("Gets or sets the item header style. Applies only when SideBar.Appearance is set to Flat."),DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+		public ItemStyle HeaderStyle
+		{
+			get
+			{
+				if(m_HeaderStyle==null)
+				{
+					SetHeaderStyle(new ItemStyle());
+				}
+				return m_HeaderStyle;
+			}
+		}
+		public void ResetHeaderStyle()
+		{
+			SetHeaderStyle(null);
+		}
+		internal void SetHeaderStyle(ItemStyle style)
+		{
+			if(m_HeaderStyle!=null)
+				m_HeaderStyle.VisualPropertyChanged-=new EventHandler(this.VisualPropertyChanged);
+			m_HeaderStyle=style;
+			if(m_HeaderStyle!=null)
+				m_HeaderStyle.VisualPropertyChanged+=new EventHandler(this.VisualPropertyChanged);
+		}
+
+		/// <summary>
+		/// Gets or sets the item header style when mouse is over the header. Applies only when SideBar.Appearance is set to Flat.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),NotifyParentPropertyAttribute(true),Category("Style"),Description("Gets or sets the item header style when mouse is over the header. Applies only when SideBar.Appearance is set to Flat."),DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+		public ItemStyle HeaderHotStyle
+		{
+			get
+			{
+				if(m_HeaderHotStyle==null)
+				{
+					SetHeaderHotStyle(new ItemStyle());
+				}
+				return m_HeaderHotStyle;
+			}
+		}
+		public void ResetHeaderHotStyle()
+		{
+			SetHeaderHotStyle(null);
+		}
+		internal void SetHeaderHotStyle(ItemStyle style)
+		{
+			if(m_HeaderHotStyle!=null)
+				m_HeaderHotStyle.VisualPropertyChanged-=new EventHandler(this.VisualPropertyChanged);
+			m_HeaderHotStyle=style;
+			if(m_HeaderHotStyle!=null)
+				m_HeaderHotStyle.VisualPropertyChanged+=new EventHandler(this.VisualPropertyChanged);
+		}
+
+		/// <summary>
+		/// Gets or sets the item header style when left mouse button is pressed on header. Applies only when SideBar.Appearance is set to Flat.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),NotifyParentPropertyAttribute(true),Category("Style"),Description("Gets or sets the item header style when left mouse button is pressed on header. Applies only when SideBar.Appearance is set to Flat."),DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+		public ItemStyle HeaderMouseDownStyle
+		{
+			get
+			{
+				if(m_HeaderMouseDownStyle==null)
+				{
+					SetHeaderMouseDownStyle(new ItemStyle());
+				}
+				return m_HeaderMouseDownStyle;
+			}
+		}
+		public void ResetHeaderMouseDownStyle()
+		{
+			SetHeaderMouseDownStyle(null);
+		}
+		internal void SetHeaderMouseDownStyle(ItemStyle style)
+		{
+			if(m_HeaderMouseDownStyle!=null)
+				m_HeaderMouseDownStyle.VisualPropertyChanged-=new EventHandler(this.VisualPropertyChanged);
+			m_HeaderMouseDownStyle=style;
+			if(m_HeaderMouseDownStyle!=null)
+				m_HeaderMouseDownStyle.VisualPropertyChanged+=new EventHandler(this.VisualPropertyChanged);
+		}
+		
+		/// <summary>
+		/// Gets or sets the item header side style. Applies only when SideBar.Appearance is set to Flat.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),NotifyParentPropertyAttribute(true),Category("Style"),Description("Gets or sets the item header side style. Applies only when SideBar.Appearance is set to Flat."),DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+		public ItemStyle HeaderSideStyle
+		{
+			get
+			{
+				if(m_HeaderSideStyle==null)
+				{
+					SetHeaderSideStyle(new ItemStyle());
+				}
+				return m_HeaderSideStyle;
+			}
+		}
+		public void ResetHeaderSideStyle()
+		{
+			SetHeaderSideStyle(null);
+		}
+		internal void SetHeaderSideStyle(ItemStyle style)
+		{
+			if(m_HeaderSideStyle!=null)
+				m_HeaderSideStyle.VisualPropertyChanged-=new EventHandler(this.VisualPropertyChanged);
+			m_HeaderSideStyle=style;
+			if(m_HeaderSideStyle!=null)
+				m_HeaderSideStyle.VisualPropertyChanged+=new EventHandler(this.VisualPropertyChanged);
+		}
+
+		/// <summary>
+		/// Gets or sets the item header side style when mouse is over the header. Applies only when SideBar.Appearance is set to Flat.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),NotifyParentPropertyAttribute(true),Category("Style"),Description("Gets or sets the item header side style when mouse is over the header. Applies only when SideBar.Appearance is set to Flat."),DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+		public ItemStyle HeaderSideHotStyle
+		{
+			get
+			{
+				if(m_HeaderSideHotStyle==null)
+				{
+					SetHeaderSideHotStyle(new ItemStyle());
+				}
+				return m_HeaderSideHotStyle;
+			}
+		}
+		public void ResetHeaderSideHotStyle()
+		{
+			SetHeaderSideHotStyle(null);
+		}
+		internal void SetHeaderSideHotStyle(ItemStyle style)
+		{
+			if(m_HeaderSideHotStyle!=null)
+				m_HeaderSideHotStyle.VisualPropertyChanged-=new EventHandler(this.VisualPropertyChanged);
+			m_HeaderSideHotStyle=style;
+			if(m_HeaderSideHotStyle!=null)
+				m_HeaderSideHotStyle.VisualPropertyChanged+=new EventHandler(this.VisualPropertyChanged);
+		}
+
+		/// <summary>
+		/// Gets or sets the item header side style when left mouse button is pressed on header. Applies only when SideBar.Appearance is set to Flat.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),NotifyParentPropertyAttribute(true),Category("Style"),Description("Gets or sets the item header side style when left mouse button is pressed on header. Applies only when SideBar.Appearance is set to Flat."),DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+		public ItemStyle HeaderSideMouseDownStyle
+		{
+			get
+			{
+				if(m_HeaderSideMouseDownStyle==null)
+				{
+					SetHeaderSideMouseDownStyle(new ItemStyle());
+				}
+				return m_HeaderSideMouseDownStyle;
+			}
+		}
+		public void ResetHeaderSideMouseDownStyle()
+		{
+			SetHeaderSideMouseDownStyle(null);
+		}
+		internal void SetHeaderSideMouseDownStyle(ItemStyle style)
+		{
+			if(m_HeaderSideMouseDownStyle!=null)
+				m_HeaderSideMouseDownStyle.VisualPropertyChanged-=new EventHandler(this.VisualPropertyChanged);
+			m_HeaderSideMouseDownStyle=style;
+			if(m_HeaderSideMouseDownStyle!=null)
+				m_HeaderSideMouseDownStyle.VisualPropertyChanged+=new EventHandler(this.VisualPropertyChanged);
+		}
+
+        [EditorBrowsable(EditorBrowsableState.Never), Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public eSideBarAppearance Appearance
+		{
+			get {return m_Appearance;}
+			set
+			{
+				if(m_Appearance!=value)
+				{
+					m_Appearance=value;
+					NeedRecalcSize=true;
+				}
+			}
+		}
+
+        /// <summary>
+        /// Gets or sets whether the font used to draw the item text is bold.
+        /// </summary>
+        [System.ComponentModel.Browsable(true), DevCoBrowsable(true), System.ComponentModel.Category("Appearance"), System.ComponentModel.Description("Specifies that text font is bold when text is rendered."), System.ComponentModel.DefaultValue(false)]
+        public bool FontBold
+        {
+            get
+            {
+                return m_FontBold;
+            }
+            set
+            {
+                if (m_FontBold != value)
+                {
+                    m_FontBold = value;
+                    if (ShouldSyncProperties)
+                        BarFunctions.SyncProperty(this, "FontBold");
+                    if (this.Displayed)
+                        this.Refresh();
+                }
+                OnAppearanceChanged();
+            }
+        }
+
+		/// <summary>
+		/// Gets or sets whether the font used to draw the item text is bold when mouse is over the item.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Appearance"),System.ComponentModel.Description("Specifies that text font is bold when mouse is over the item."),System.ComponentModel.DefaultValue(false)]
+		public bool HotFontBold
+		{
+			get
+			{
+				return m_HotFontBold;
+			}
+			set
+			{
+				if(m_HotFontBold!=value)
+				{
+					m_HotFontBold=value;
+                    if(ShouldSyncProperties)
+                        BarFunctions.SyncProperty(this, "HotFontBold");
+					if(this.Displayed && m_MouseOver)
+						this.Refresh();
+				}
+				OnAppearanceChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets whether the font used to draw the item text is underlined when mouse is over the item.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Appearance"),System.ComponentModel.Description("Specifies that text font is underlined when mouse is over the item."), System.ComponentModel.DefaultValue(false)]
+		public bool HotFontUnderline
+		{
+			get
+			{
+				return m_HotFontUnderline;
+			}
+			set
+			{
+				if(m_HotFontUnderline!=value)
+				{
+					m_HotFontUnderline=value;
+                    if(ShouldSyncProperties)
+                        BarFunctions.SyncProperty(this, "HotFontUnderline");
+					if(this.Displayed && m_MouseOver)
+						this.Refresh();
+				}
+				OnAppearanceChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the text color of the button when mouse is over the item.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Appearance"),System.ComponentModel.Description("The foreground color used to display text when mouse is over the item.")]
+		public Color HotForeColor
+		{
+			get
+			{
+				return m_HotForeColor;
+			}
+			set
+			{
+				if(m_HotForeColor!=value)
+				{
+					m_HotForeColor=value;
+                    if(ShouldSyncProperties)
+                        BarFunctions.SyncProperty(this, "HotForeColor");
+					if(this.Displayed && m_MouseOver)
+						this.Refresh();
+				}
+				OnAppearanceChanged();
+			}
+		}
+
+		public bool ShouldSerializeHotForeColor()
+		{
+			if(m_HotForeColor!=Color.Empty)
+				return true;
+			return false;
+		}
+
+		/// <summary>
+		/// Gets or sets the text color of the button.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Appearance"),System.ComponentModel.Description("The foreground color used to display text.")]
+		public Color ForeColor
+		{
+			get
+			{
+				return m_ForeColor;
+			}
+			set
+			{
+				if(m_ForeColor!=value)
+				{
+					m_ForeColor=value;
+                    if(ShouldSyncProperties)
+                        BarFunctions.SyncProperty(this, "ForeColor");
+					if(this.Displayed)
+						this.Refresh();
+				}
+				OnAppearanceChanged();
+			}
+		}
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetForeColor() { this.ForeColor = Color.Empty; }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeForeColor()
+		{
+            return !m_ForeColor.IsEmpty;
+		}
+
+		/// <summary>
+		/// Overloaded. Serializes the item and all sub-items into the XmlElement.
+		/// </summary>
+		/// <param name="ThisItem">XmlElement to serialize the item to.</param>
+		protected internal override void Serialize(ItemSerializationContext context)
+		{
+			base.Serialize(context);
+            System.Xml.XmlElement ThisItem = context.ItemXmlElement;
+			if(m_ForeColor!=SystemColors.ControlText && !m_ForeColor.IsEmpty)
+				ThisItem.SetAttribute("forecolor",BarFunctions.ColorToString(m_ForeColor));
+
+//			if(m_BackColor!=SystemColors.Control)
+//				ThisItem.SetAttribute("backcolor",BarFunctions.ColorToString(m_BackColor));
+
+			if(m_HotFontBold)
+				ThisItem.SetAttribute("hotfb",System.Xml.XmlConvert.ToString(m_HotFontBold));
+
+			if(m_HotFontUnderline)
+				ThisItem.SetAttribute("hotfu",System.Xml.XmlConvert.ToString(m_HotFontUnderline));
+
+			if(!m_HotForeColor.IsEmpty)
+				ThisItem.SetAttribute("hotclr",BarFunctions.ColorToString(m_HotForeColor));
+
+			if(m_ItemImageSize!=eBarImageSize.Default)
+				ThisItem.SetAttribute("itemimagesize",System.Xml.XmlConvert.ToString((int)m_ItemImageSize));
+
+			if(!m_EnableScrollButtons)
+				ThisItem.SetAttribute("enablescrollbuttons",System.Xml.XmlConvert.ToString(m_EnableScrollButtons));
+
+			// Serialize Images
+			System.Xml.XmlElement xmlElem=null, xmlElem2=null;
+			if(m_Image!=null || m_ImageIndex>=0 || m_HoverImage!=null || m_HoverImageIndex>=0 || m_PressedImage!=null || m_PressedImageIndex>=0 || m_Icon!=null)
+			{
+				xmlElem=ThisItem.OwnerDocument.CreateElement("images");
+				ThisItem.AppendChild(xmlElem);
+
+				if(m_ImageIndex>=0)
+					xmlElem.SetAttribute("imageindex",System.Xml.XmlConvert.ToString(m_ImageIndex));
+				if(m_HoverImageIndex>=0)
+					xmlElem.SetAttribute("hoverimageindex",System.Xml.XmlConvert.ToString(m_HoverImageIndex));
+				if(m_PressedImageIndex>=0)
+					xmlElem.SetAttribute("pressedimageindex",System.Xml.XmlConvert.ToString(m_PressedImageIndex));
+
+				if(m_Image!=null)
+				{
+					xmlElem2=ThisItem.OwnerDocument.CreateElement("image");
+					xmlElem2.SetAttribute("type","default");
+					xmlElem.AppendChild(xmlElem2);
+					BarFunctions.SerializeImage(m_Image,xmlElem2);
+				}
+				if(m_HoverImage!=null)
+				{
+					xmlElem2=ThisItem.OwnerDocument.CreateElement("image");
+					xmlElem2.SetAttribute("type","hover");
+					xmlElem.AppendChild(xmlElem2);
+					BarFunctions.SerializeImage(m_HoverImage,xmlElem2);
+				}
+				if(m_PressedImage!=null)
+				{
+					xmlElem2=ThisItem.OwnerDocument.CreateElement("image");
+					xmlElem2.SetAttribute("type","pressed");
+					xmlElem.AppendChild(xmlElem2);
+					BarFunctions.SerializeImage(m_PressedImage,xmlElem2);
+				}
+				if(m_Icon!=null)
+				{
+					xmlElem2=ThisItem.OwnerDocument.CreateElement("image");
+					xmlElem2.SetAttribute("type","icon");
+					xmlElem.AppendChild(xmlElem2);
+					BarFunctions.SerializeIcon(m_Icon,xmlElem2);
+				}
+			}
+		}
+
+		/// <summary>
+		/// Overloaded. Deserializes the Item from the XmlElement.
+		/// </summary>
+		/// <param name="ItemXmlSource">Source XmlElement.</param>
+		public override void Deserialize(ItemSerializationContext context)
+		{
+			base.Deserialize(context);
+
+            System.Xml.XmlElement ItemXmlSource = context.ItemXmlElement;
+
+			if(ItemXmlSource.HasAttribute("forecolor"))
+				m_ForeColor=BarFunctions.ColorFromString(ItemXmlSource.GetAttribute("forecolor"));
+			else
+				m_ForeColor=Color.Empty;
+
+//			if(ItemXmlSource.HasAttribute("backcolor"))
+//				m_BackColor=BarFunctions.ColorFromString(ItemXmlSource.GetAttribute("backcolor"));
+//			else
+//				m_BackColor=SystemColors.Control;
+
+			if(ItemXmlSource.HasAttribute("hotclr"))
+				m_HotForeColor=BarFunctions.ColorFromString(ItemXmlSource.GetAttribute("hotclr"));
+			else
+				m_HotForeColor=Color.Empty;
+
+			if(ItemXmlSource.HasAttribute("hotfb"))
+				m_HotFontBold=System.Xml.XmlConvert.ToBoolean(ItemXmlSource.GetAttribute("hotfb"));
+			else
+				m_HotFontBold=false;
+			if(ItemXmlSource.HasAttribute("hotfu"))
+				m_HotFontUnderline=System.Xml.XmlConvert.ToBoolean(ItemXmlSource.GetAttribute("hotfu"));
+			else
+				m_HotFontUnderline=false;
+
+			if(ItemXmlSource.HasAttribute("itemimagesize"))
+				m_ItemImageSize=(eBarImageSize)System.Xml.XmlConvert.ToInt32(ItemXmlSource.GetAttribute("itemimagesize"));
+			else
+				m_ItemImageSize=eBarImageSize.Default;
+
+			if(ItemXmlSource.HasAttribute("enablescrollbuttons"))
+				m_EnableScrollButtons=System.Xml.XmlConvert.ToBoolean(ItemXmlSource.GetAttribute("enablescrollbuttons"));
+			else
+				m_EnableScrollButtons=true;
+
+			// Load Images
+			foreach(System.Xml.XmlElement xmlElem in ItemXmlSource.ChildNodes)
+			{
+				if(xmlElem.Name=="images")
+				{
+					if(xmlElem.HasAttribute("imageindex"))
+						m_ImageIndex=System.Xml.XmlConvert.ToInt32(xmlElem.GetAttribute("imageindex"));
+					if(xmlElem.HasAttribute("hoverimageindex"))
+						m_HoverImageIndex=System.Xml.XmlConvert.ToInt32(xmlElem.GetAttribute("hoverimageindex"));
+					if(xmlElem.HasAttribute("pressedimageindex"))
+						m_PressedImageIndex=System.Xml.XmlConvert.ToInt32(xmlElem.GetAttribute("pressedimageindex"));
+
+					foreach(System.Xml.XmlElement xmlElem2 in xmlElem.ChildNodes)
+					{
+						switch(xmlElem2.GetAttribute("type"))
+						{
+							case "default":
+							{
+								m_Image=BarFunctions.DeserializeImage(xmlElem2);
+								m_ImageIndex=-1;
+								break;
+							}
+							case "icon":
+							{
+								m_Icon=BarFunctions.DeserializeIcon(xmlElem2);
+								m_ImageIndex=-1;
+								break;
+							}
+							case "hover":
+							{
+								m_HoverImage=BarFunctions.DeserializeImage(xmlElem2);
+								m_HoverImageIndex=-1;
+								break;
+							}
+							case "pressed":
+							{
+								m_PressedImage=BarFunctions.DeserializeImage(xmlElem2);
+								m_PressedImageIndex=-1;
+								break;
+							}
+						}
+					}
+					break;
+				}
+			}
+			this.RefreshImageSize();
+			NeedRecalcSize=true;
+		}
+
+		protected internal override void OnItemAdded(BaseItem item)
+		{
+			NeedRecalcSize=true;
+			if(item.IsWindowed && !this.DesignMode)
+				CreateControlPanelHost();
+			base.OnItemAdded(item);
+			if(!this.Expanded)
+			{
+				if(!item.Displayed)
+					item.Displayed=true;
+				item.Displayed=false;
+			}
+			if(m_ControlHost!=null)
+				item.ContainerControl=m_ControlHost;
+			if(item is ButtonItem)
+			{
+				((ButtonItem)item)._FitContainer=m_WordWrap;
+				//((ButtonItem)item).PopupSide=ePopupSide.Left;
+			}
+		}
+
+		protected internal override void OnBeforeItemRemoved(BaseItem item)
+		{
+			if(item is ButtonItem)
+				((ButtonItem)item)._FitContainer=false;
+			base.OnBeforeItemRemoved(item);
+		}
+
+		private void CreateControlPanelHost()
+		{
+			System.Windows.Forms.Control ctrl=this.ContainerControl as System.Windows.Forms.Control;
+            if (ctrl == null || m_ControlHost != null)
+                return;
+            m_ControlHost=new SideBarPanelControlHost(this);
+			m_ControlHost.Visible=false;
+			ctrl.Controls.Add(m_ControlHost);
+		}
+
+		[System.ComponentModel.Browsable(false),DevCoBrowsable(false),System.ComponentModel.DefaultValue(eItemAlignment.Near),System.ComponentModel.Category("Appearance"),System.ComponentModel.Description("Determines alignment of the item inside the container.")]
+		public override eItemAlignment ItemAlignment
+		{
+			get{return base.ItemAlignment;}
+			set{base.ItemAlignment=value;}
+		}
+		[System.ComponentModel.Browsable(false),DevCoBrowsable(false),System.ComponentModel.DefaultValue(false),System.ComponentModel.Category("Appearance"),System.ComponentModel.Description("Indicates whether item will stretch to consume empty space. Items on stretchable, no-wrap Bars only.")]
+		public override bool Stretch
+		{
+			get {return base.Stretch;}
+			set {base.Stretch=value;}
+		}
+//		[System.ComponentModel.Browsable(false),System.ComponentModel.DefaultValue(eDotNetBarStyle.OfficeXP),System.ComponentModel.Category("Appearance"),System.ComponentModel.Description("Determines the display of the item when shown.")]
+//		public override eDotNetBarStyle Style
+//		{
+//			get {return base.Style;}
+//			set {base.Style=value;}
+//		}
+		[System.ComponentModel.Browsable(false),DevCoBrowsable(false),System.ComponentModel.Category("Behavior"),System.ComponentModel.DefaultValue(true),System.ComponentModel.Description("Indicates whether the item will auto-collapse (fold) when clicked.")]
+		public override bool AutoCollapseOnClick
+		{
+			get {return base.AutoCollapseOnClick;}
+			set {base.AutoCollapseOnClick=value;}
+		}
+		[System.ComponentModel.Browsable(false),DevCoBrowsable(false),System.ComponentModel.DefaultValue(true),System.ComponentModel.Category("Behavior"),System.ComponentModel.Description("Determines whether sub-items are displayed.")]
+		public override bool ShowSubItems
+		{
+			get {return base.ShowSubItems;}
+			set {base.ShowSubItems=value;}
+		}
+		[System.ComponentModel.Browsable(false),DevCoBrowsable(false),System.ComponentModel.DefaultValue(""),System.ComponentModel.Category("Design"),System.ComponentModel.Description("Indicates item category used to group similar items at design-time.")]
+		public override string Category
+		{
+			get {return base.Category;}
+			set {base.Category=value;}
+		}
+		[System.ComponentModel.Browsable(false),DevCoBrowsable(false),System.ComponentModel.DefaultValue(""),System.ComponentModel.Category("Design"),System.ComponentModel.Description("Indicates description of the item that is displayed during design.")]
+		public override string Description
+		{
+			get {return base.Description;}
+			set {base.Description=value;}
+		}
+		[System.ComponentModel.Browsable(false),DevCoBrowsable(false),System.ComponentModel.DefaultValue(false),System.ComponentModel.Category("Appearance"),System.ComponentModel.Description("Indicates whether this item is beginning of the group.")]
+		public override bool BeginGroup
+		{
+			get {return base.BeginGroup;}
+			set {base.BeginGroup=value;}
+		}
+
+        [System.ComponentModel.Browsable(true), DevCoBrowsable(false), System.ComponentModel.Editor("DevComponents.DotNetBar.Design.SideBarPanelItemEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), System.ComponentModel.Category("Data"), System.ComponentModel.Description("Collection of sub items."), System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Content)]
+		public override SubItemsCollection SubItems
+		{
+			get
+			{
+				return base.SubItems;
+			}
+		}
+
+		/// <summary>
+		/// Gets/Sets the Image size for all sub-items on the Bar.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DevCoBrowsable(true),System.ComponentModel.DefaultValue(eBarImageSize.Default),System.ComponentModel.Category("Behavior"),System.ComponentModel.Description("Specifies the Image size that will be used by items on this bar.")]
+		public eBarImageSize ItemImageSize
+		{
+			get
+			{
+				return m_ItemImageSize;
+			}
+			set
+			{
+//				if(m_ItemImageSize==value)
+//					return;
+				m_ItemImageSize=value;
+				
+				eImagePosition pos=eImagePosition.Left;
+				if(m_ItemImageSize!=eBarImageSize.Default)
+					pos=eImagePosition.Top;
+
+				foreach(BaseItem item in this.SubItems)
+				{
+					ButtonItem button=item as ButtonItem;
+					if(button!=null)
+						button.ImagePosition=pos;
+				}
+				m_TopItemIndex=0;
+				this.RefreshImageSize();
+				this.RecalcSize();
+				this.Refresh();
+			}
+		}
+
+
+		/// <summary>
+		/// Gets the rectangle of the panel item Button.
+		/// </summary>
+		[System.ComponentModel.Browsable(false),System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
+		public Rectangle PanelRect
+		{
+			get
+			{
+				return m_PanelRect;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the index of the first visible item on the panel.
+		/// </summary>
+		[Browsable(false),DevCoBrowsable(false),DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public int TopItemIndex
+		{
+			get
+			{
+				return m_TopItemIndex;
+			}
+			set
+			{
+				m_TopItemIndex=value;
+				NeedRecalcSize=true;
+				this.Refresh();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets a value that determines whether text is displayed in multiple lines or one long line.
+		/// This setting applies to the buttons inside Panel as well.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),DefaultValue(false),Description("Indicates a value that determines whether text is displayed in multiple lines or one long line."),Category("Layout")]
+		public bool WordWrap
+		{
+			get {return m_WordWrap;}
+			set
+			{
+				m_WordWrap=value;
+				foreach(BaseItem item in this.SubItems)
+				{
+					if(item is ButtonItem)
+						((ButtonItem)item)._FitContainer=m_WordWrap;
+				}
+				NeedRecalcSize=true;
+				if(this.DesignMode)
+				{
+					SideBar sidebar=this.ContainerControl as SideBar;
+					if(sidebar!=null)
+						sidebar.RecalcLayout();
+				}
+				OnAppearanceChanged();
+			}
+		}
+
+		/// <summary>
+		/// Shows tooltip for this item.
+		/// </summary>
+		public override void ShowToolTip()
+		{
+			if(this.DesignMode)
+				return;
+
+			if(this.Visible && this.Displayed)
+			{
+				IOwner owner=this.GetOwner() as IOwner;
+				if(owner!=null && !owner.ShowToolTips)
+					return;
+				System.Windows.Forms.Control ctrl=this.ContainerControl as System.Windows.Forms.Control;
+				if(ctrl==null)
+					return;
+				if(!m_PanelRect.Contains(ctrl.PointToClient(System.Windows.Forms.Control.MousePosition)))
+					return;
+
+				OnTooltip(true);
+				if(m_Tooltip!="")
+				{
+					if(m_ToolTipWnd==null)
+						m_ToolTipWnd=new ToolTip();
+					m_ToolTipWnd.Text=m_Tooltip;
+					if(owner!=null && owner.ShowShortcutKeysInToolTips && this.Shortcuts.Count>0)
+						m_ToolTipWnd.Text+=(" ("+this.ShortcutString+")");
+					IOwnerItemEvents ownerEvents=this.GetIOwnerItemEvents();
+					if(ownerEvents!=null)
+						ownerEvents.InvokeToolTipShowing(this,new EventArgs());
+					m_ToolTipWnd.ShowToolTip();
+				}
+			}
+		}
+
+		/// <summary>
+		///     Gets or sets whether scroll buttons are displayed when content of the panel exceeds it's height.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DevCoBrowsable(true),System.ComponentModel.DefaultValue(true),System.ComponentModel.Category("Behavior"),System.ComponentModel.Description("Specifies whether scroll buttons are displayed when content of the panel exceeds it's height.")]
+		public bool EnableScrollButtons
+		{
+			get {return m_EnableScrollButtons;}
+			set
+			{
+				m_EnableScrollButtons=value;
+				if(!m_EnableScrollButtons)
+				{
+					NeedRecalcSize=true;
+					if(this.DesignMode)
+						this.Refresh();
+				}
+			}
+		}
+
+        internal bool HasScrollButtons
+        {
+            get
+            {
+                return m_EnableScrollButtons && (!m_ScrollButtonRect[0].IsEmpty || !m_ScrollButtonRect[1].IsEmpty);
+            }
+        }
+
+		internal bool ScrollDownButton
+		{
+			get{return m_ScrollDownButton;}
+		}
+
+		internal bool UseThemes
+		{
+			get {return this.IsThemed;}
+		}
+
+		/// <summary>
+		/// Forces the repaint the item.
+		/// </summary>
+		public override void Refresh()
+		{
+			if(this.SuspendLayout)
+				return;
+
+			if(m_ControlHost==null || !this.Expanded)
+				base.Refresh();
+			else
+			{
+				if((this.Visible || this.IsOnCustomizeMenu) && this.Displayed)
+				{
+					System.Windows.Forms.Control objCtrl=this.ContainerControl as System.Windows.Forms.Control;
+					if(objCtrl!=null && IsHandleValid(objCtrl) && !(objCtrl is ItemsListBox))
+					{
+						if(m_NeedRecalcSize)
+						{
+							RecalcSize();
+							if(m_Parent!=null)
+								m_Parent.SubItemSizeChanged(this);
+						}
+						Rectangle r=m_PanelRect;
+						r.Inflate(4,4);
+						objCtrl.Invalidate(m_Rect,false);
+					}
+				}
+			}
+		}
+
+		// Property Editor support for ImageIndex selection
+		[System.ComponentModel.Browsable(false),System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+		public System.Windows.Forms.ImageList ImageList
+		{
+			get
+			{
+				IOwner owner=this.GetOwner() as IOwner;
+				if(owner!=null)
+					return owner.Images;
+				return null;
+			}
+		}
+
+		/// <summary>
+		/// Specifies the Button icon. Icons support multiple image sizes and alpha blending.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Appearance"),System.ComponentModel.Description("Specifies the Button icon. Icons support multiple image sizes and alpha blending."),System.ComponentModel.DefaultValue(null)]
+		public System.Drawing.Icon Icon
+		{
+			get
+			{
+				return m_Icon;
+			}
+			set
+			{
+				NeedRecalcSize=true;
+				m_Icon=value;
+				this.OnImageChanged();
+				this.Refresh();
+				OnAppearanceChanged();
+			}
+		}
+
+		/// <summary>
+		/// Specifies the Button image.
+        /// </summary>
+        [System.ComponentModel.Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Appearance"),System.ComponentModel.Description("The image that will be displayed on the face of the item."),System.ComponentModel.DefaultValue(null)]
+		public System.Drawing.Image Image
+		{
+			get
+			{
+				return m_Image;
+			}
+			set
+			{
+				NeedRecalcSize=true;
+				m_Image=value;
+				this.OnImageChanged();
+				this.Refresh();
+				OnAppearanceChanged();
+			}
+		}
+
+		/// <summary>
+		/// Specifies the index of the image for the button if ImageList is used.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Appearance"),System.ComponentModel.Description("The image list image index of the image that will be displayed on the face of the item."),System.ComponentModel.Editor("DevComponents.DotNetBar.Design.ImageIndexEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)),System.ComponentModel.TypeConverter(typeof(System.Windows.Forms.ImageIndexConverter)),System.ComponentModel.DefaultValue(-1)]
+		public int ImageIndex
+		{
+			get
+			{
+				return m_ImageIndex;
+			}
+			set
+			{
+				m_ImageCachedIdx=null;
+				if(m_ImageIndex!=value)
+				{
+					m_ImageIndex=value;
+                    if(ShouldSyncProperties)
+                        BarFunctions.SyncProperty(this, "ImageIndex");
+					if(m_Parent!=null)
+					{
+						OnImageChanged();
+						NeedRecalcSize=true;
+						this.Refresh();
+					}
+				}
+				OnAppearanceChanged();
+			}
+		}
+
+		internal void SetImageIndex(int iImageIndex)
+		{
+			m_ImageIndex=iImageIndex;
+		}
+
+		/// <summary>
+		/// Specifies the image for the button when mouse is over the item.
+        /// </summary>
+        [System.ComponentModel.Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Appearance"),System.ComponentModel.Description("The image that will be displayed when mouse hovers over the item."),System.ComponentModel.DefaultValue(null)]
+		public System.Drawing.Image HoverImage
+		{
+			get
+			{
+				return m_HoverImage;
+			}
+			set 
+			{
+				m_HoverImage=value;
+				OnAppearanceChanged();
+			}
+		}
+
+		/// <summary>
+		/// Specifies the index of the image for the button when mouse is over the item when ImageList is used.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Appearance"),System.ComponentModel.Description("The image list image index of the image that will be displayed when mouse hovers over the item."),System.ComponentModel.Editor("DevComponents.DotNetBar.Design.ImageIndexEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)),System.ComponentModel.TypeConverter(typeof(System.Windows.Forms.ImageIndexConverter)),System.ComponentModel.DefaultValue(-1)]
+		public int HoverImageIndex
+		{
+			get
+			{
+				return m_HoverImageIndex;
+			}
+			set
+			{
+				if(m_HoverImageIndex!=value)
+				{
+					m_HoverImageIndex=value;
+                    if(ShouldSyncProperties)
+                        BarFunctions.SyncProperty(this, "HoverImageIndex");
+					this.Refresh();
+				}
+				OnAppearanceChanged();
+			}
+		}
+
+		/// <summary>
+		/// Specifies the image for the button when mouse left button is pressed.
+        /// </summary>
+        [System.ComponentModel.Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Appearance"),System.ComponentModel.Description("The image that will be displayed when item is pressed."),System.ComponentModel.DefaultValue(null)]
+		public System.Drawing.Image PressedImage
+		{
+			get
+			{
+				return m_PressedImage;
+			}
+			set 
+			{
+				m_PressedImage=value;
+				OnAppearanceChanged();
+			}
+		}
+
+		/// <summary>
+		/// Specifies the index of the image for the button when mouse left button is pressed and ImageList is used.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Appearance"),System.ComponentModel.Description("The image list image index of the image that will be displayed when item is pressed."),System.ComponentModel.Editor("DevComponents.DotNetBar.Design.ImageIndexEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)),System.ComponentModel.TypeConverter(typeof(System.Windows.Forms.ImageIndexConverter)),System.ComponentModel.DefaultValue(-1)]
+		public int PressedImageIndex
+		{
+			get
+			{
+				return m_PressedImageIndex;
+			}
+			set
+			{
+				if(m_PressedImageIndex!=value)
+				{
+					m_PressedImageIndex=value;
+                    if(ShouldSyncProperties)
+                        BarFunctions.SyncProperty(this, "PressedImageIndex");
+					this.Refresh();
+				}
+				OnAppearanceChanged();
+			}
+		}
+
+		internal CompositeImage GetImage()
+		{
+			if(m_MouseDown)
+				return GetImage(ImageState.Pressed);
+			else if(m_MouseOver)
+				return GetImage(ImageState.Hover);
+			return GetImage(ImageState.Default);
+		}
+		private CompositeImage GetImage(ImageState state)
+		{
+			Image image=null;
+
+			if(m_Icon!=null)
+			{
+				System.Drawing.Size iconSize=this.IconSize;
+				System.Drawing.Icon icon=null;
+				try
+				{
+					icon=new System.Drawing.Icon(m_Icon,iconSize);
+				}
+				catch{icon=null;}
+				if(icon==null)
+					return new CompositeImage(m_Icon,false);
+				else
+					return new CompositeImage(icon,true);
+			}
+
+			if(state==ImageState.Hover && (m_HoverImage!=null || m_HoverImageIndex>=0))
+			{
+				if(m_HoverImage!=null)
+					return new CompositeImage(m_HoverImage,false);
+				if(m_HoverImageIndex>=0)
+				{
+					image=GetImageFromImageList(m_HoverImageIndex);
+					if(image!=null)
+						return new CompositeImage(image,false);
+					return null;
+				}
+			}
+
+			if(state==ImageState.Pressed && (m_PressedImage!=null || m_PressedImageIndex>=0))
+			{
+				if(m_PressedImage!=null)
+					return new CompositeImage(m_PressedImage,false);
+				if(m_PressedImageIndex>=0)
+				{
+					image=GetImageFromImageList(m_PressedImageIndex);
+					if(image!=null)
+						return new CompositeImage(image,false);
+					return null;
+				}
+			}
+
+			if(m_Image!=null)
+			{
+				return new CompositeImage(m_Image,false);
+			}
+			if(m_ImageIndex>=0)
+			{
+				image=GetImageFromImageList(m_ImageIndex);
+				if(image!=null)
+					return new CompositeImage(image,false);
+			}
+
+			return null;
+		}
+
+		private Image GetImageFromImageList(int ImageIndex)
+		{
+			if(ImageIndex>=0)
+			{
+				IOwner owner=null;
+				IBarImageSize iImageSize=null;
+				if(_ItemPaintArgs!=null)
+				{
+					owner=_ItemPaintArgs.Owner;
+					iImageSize=_ItemPaintArgs.ContainerControl as IBarImageSize;
+				}
+				if(owner==null) owner=this.GetOwner() as IOwner;
+				if(iImageSize==null) iImageSize=this.ContainerControl as IBarImageSize; 
+
+				if(owner!=null)
+				{
+					try
+					{
+						if(iImageSize!=null && iImageSize.ImageSize!=eBarImageSize.Default)
+						{
+							if(iImageSize.ImageSize==eBarImageSize.Medium && owner.ImagesMedium!=null) // && owner.ImagesMedium.Images.Count>0 && ImageIndex<owner.ImagesMedium.Images.Count)
+								return owner.ImagesMedium.Images[ImageIndex];
+							else if(iImageSize.ImageSize==eBarImageSize.Large && owner.ImagesLarge!=null) // && owner.ImagesLarge.Images.Count>0  && ImageIndex<owner.ImagesLarge.Images.Count)
+								return owner.ImagesLarge.Images[ImageIndex];
+							else if(owner.Images!=null)// && owner.Images.Images.Count>0 && ImageIndex<owner.Images.Images.Count)
+							{
+								if(ImageIndex==m_ImageIndex)
+								{
+									if(m_ImageCachedIdx==null)
+										m_ImageCachedIdx=owner.Images.Images[ImageIndex];
+									return m_ImageCachedIdx; //owner.Images.Images[ImageIndex];
+								}
+								else
+									return owner.Images.Images[ImageIndex];
+							}
+						}
+						else if(m_Parent is SideBarPanelItem && ((SideBarPanelItem)m_Parent).ItemImageSize!=eBarImageSize.Default)
+						{
+							eBarImageSize imgSize=((SideBarPanelItem)m_Parent).ItemImageSize;
+							if(imgSize==eBarImageSize.Medium && owner.ImagesMedium!=null) // && owner.ImagesMedium.Images.Count>0 && ImageIndex<owner.ImagesMedium.Images.Count)
+								return owner.ImagesMedium.Images[ImageIndex];
+							else if(imgSize==eBarImageSize.Large && owner.ImagesLarge!=null) // && owner.ImagesLarge.Images.Count>0  && ImageIndex<owner.ImagesLarge.Images.Count)
+								return owner.ImagesLarge.Images[ImageIndex];
+							else if(owner.Images!=null)// && owner.Images.Images.Count>0 && ImageIndex<owner.Images.Images.Count)
+								return owner.Images.Images[ImageIndex];
+						}
+						else if(owner.Images!=null)// && owner.Images.Images.Count>0 && ImageIndex<owner.Images.Images.Count)
+						{
+							if(ImageIndex==m_ImageIndex)
+							{
+								if(m_ImageCachedIdx==null)
+									m_ImageCachedIdx=owner.Images.Images[ImageIndex];
+
+								return m_ImageCachedIdx; //owner.Images.Images[ImageIndex];
+							}
+							else
+								return owner.Images.Images[ImageIndex];
+						}
+					}
+					catch(Exception)
+					{
+						return null;
+					}
+				}
+			}
+			return null;
+		}
+
+		private System.Drawing.Size IconSize
+		{
+			get
+			{
+				// Default Icon Size
+				System.Drawing.Size size=new Size(16,16);
+				IBarImageSize iImageSize=null;
+				if(_ItemPaintArgs!=null)
+				{
+					iImageSize=_ItemPaintArgs.ContainerControl as IBarImageSize;
+				}
+				if(iImageSize==null) iImageSize=this.ContainerControl as IBarImageSize; 
+
+				try
+				{
+					if(iImageSize!=null && iImageSize.ImageSize!=eBarImageSize.Default)
+					{
+						if(iImageSize.ImageSize==eBarImageSize.Medium)
+							size=new Size(24,24);
+						else if(iImageSize.ImageSize==eBarImageSize.Large)
+							size=new Size(32,32);
+					}
+					else if(m_Parent is SideBarPanelItem && ((SideBarPanelItem)m_Parent).ItemImageSize!=eBarImageSize.Default)
+					{
+						eBarImageSize imgSize=((SideBarPanelItem)m_Parent).ItemImageSize;
+						if(imgSize==eBarImageSize.Medium)
+							size=new Size(24,24);
+						else if(imgSize==eBarImageSize.Large)
+							size=new Size(32,32);
+					}
+				}
+				catch(Exception)
+				{
+				}
+
+				return size;
+			}
+		}
+
+		/// <summary>
+		/// Must be called by any sub item that implements the image when image has changed
+		/// </summary>
+//		public override void OnSubItemImageSizeChanged(BaseItem objItem)
+//		{
+//            base.OnSubItemImageSizeChanged(objItem);
+//			if(this.Expanded)
+//			{
+//				this.RecalcSize();
+//				this.Refresh();
+//			}
+//		}
+
+		//***********************************************
+		// IDesignTimeProvider Implementation
+		//***********************************************
+		InsertPosition IDesignTimeProvider.GetInsertPosition(Point pScreen, BaseItem DragItem)
+		{
+			InsertPosition objInsertPos=null;
+			System.Windows.Forms.Control objContainer=this.ContainerControl as System.Windows.Forms.Control;
+			if(objContainer==null || !this.CanCustomize)
+				return null;
+			Point pClient=objContainer.PointToClient(pScreen);
+			Rectangle thisRect=this.DisplayRectangle;
+			if(thisRect.Contains(pClient))
+			{
+				Rectangle r=thisRect;
+				r.Size=m_PanelRect.Size;
+				r.X+=m_PanelRect.Left;
+				r.Y+=m_PanelRect.Top;
+				if(r.Contains(pClient) && !this.Expanded)
+				{
+					this.Expanded=true;
+					objInsertPos=new InsertPosition();
+					objInsertPos.TargetProvider=this;
+					if(this.SubItems.Count==0)
+						objInsertPos.Position=-1;
+					else
+					{
+						objInsertPos.Position=0;
+						objInsertPos.Before=true;
+					}
+					return objInsertPos;
+				}
+				
+				BaseItem objItem;
+				// Check first inside any expanded items
+				objItem=this.ExpandedItem();
+				if(objItem!=null)
+				{
+					IDesignTimeProvider provider=objItem as IDesignTimeProvider;
+					if(provider!=null)
+					{
+						objInsertPos=provider.GetInsertPosition(pScreen, DragItem);
+						if(objInsertPos!=null)
+							return objInsertPos;
+					}
+				}
+
+				for(int i=0;i<this.SubItems.Count;i++)
+				{
+					objItem=this.SubItems[i];
+					r=objItem.DisplayRectangle;
+					r.Inflate(2,2);
+					if(objItem.Visible && objItem.Displayed && r.Contains(pClient))
+					{
+						if(objItem.SystemItem && this.SubItems.Count!=1)
+						{
+							return null;
+						}
+						if(objItem==DragItem)
+							return new InsertPosition();
+						objInsertPos=new InsertPosition();
+						objInsertPos.TargetProvider=this;
+						objInsertPos.Position=i;
+						if(pClient.Y<=objItem.TopInternal+objItem.HeightInternal/2 || objItem.SystemItem)
+							objInsertPos.Before=true;
+
+						// We need to collapse any expanded items that are not on this bar
+						IOwner owner=this.GetOwner() as IOwner;
+						if(owner!=null)
+						{
+							BaseItem objExp=owner.GetExpandedItem();
+							if(objExp!=null)
+							{
+								while(objExp.Parent!=null)
+									objExp=objExp.Parent;
+								BaseItem objParent=objItem;
+								while(objParent.Parent!=null)
+									objParent=objParent.Parent;
+								if(objExp!=objParent)
+									owner.SetExpandedItem(null);
+							}
+						}
+
+						if(objItem is PopupItem && (objItem.SubItems.Count>0 || objItem.IsOnMenuBar))
+						{
+							if(!objItem.Expanded)
+								objItem.Expanded=true;
+						}
+						else
+						{
+							CollapseSubItems(this);
+						}
+						break;
+					}
+				}
+				if(objInsertPos==null)
+				{
+					// Container is empty but it can contain the items
+					if(this.SubItems.Count>1 && this.SubItems[this.SubItems.Count-1].SystemItem)
+						objInsertPos=new InsertPosition(this.SubItems.Count-2,true,this);
+					else
+						objInsertPos=new InsertPosition(this.SubItems.Count-1,false,this);
+				}
+			}
+			else
+			{
+				foreach(BaseItem objItem in this.SubItems)
+				{
+					if(objItem==DragItem)
+						continue;
+					IDesignTimeProvider provider=objItem as IDesignTimeProvider;
+					if(provider!=null)
+					{
+						objInsertPos=provider.GetInsertPosition(pScreen, DragItem);
+						if(objInsertPos!=null)
+							break;
+					}
+				}				
+			}
+			return objInsertPos;
+		}
+		void IDesignTimeProvider.DrawReversibleMarker(int iPos, bool Before)
+		{
+			System.Windows.Forms.Control objCtrl=this.ContainerControl as System.Windows.Forms.Control;
+			if(objCtrl==null)
+				return;
+
+			BaseItem objItem=null;
+			if(iPos>=0)
+				objItem=this.SubItems[iPos];
+			Rectangle r, rl,rr;
+			if(objItem!=null)
+			{
+				if(objItem.DesignInsertMarker!=eDesignInsertPosition.None)
+					objItem.DesignInsertMarker=eDesignInsertPosition.None;
+				else if(Before)
+					objItem.DesignInsertMarker=eDesignInsertPosition.Before;
+				else
+					objItem.DesignInsertMarker=eDesignInsertPosition.After;
+				return;
+			}
+			else
+			{
+				Rectangle rTmp=this.DisplayRectangle;
+				rTmp.Inflate(-1,-1);
+				rTmp.Offset(m_PanelRect.X,m_PanelRect.Bottom);
+				r=new Rectangle(rTmp.Left+2,rTmp.Top+2,rTmp.Width-4,1);
+				rl=new Rectangle(rTmp.Left+1,rTmp.Top,1,5);
+				rr=new Rectangle(rTmp.Right-2,rTmp.Top,1,5);
+			}
+            //r.Location=objCtrl.PointToScreen(r.Location);
+            //rl.Location=objCtrl.PointToScreen(rl.Location);
+            //rr.Location=objCtrl.PointToScreen(rr.Location);
+            //System.Windows.Forms.ControlPaint.DrawReversibleFrame(r,SystemColors.Control,System.Windows.Forms.FrameStyle.Thick);
+            //System.Windows.Forms.ControlPaint.DrawReversibleFrame(rl,SystemColors.Control,System.Windows.Forms.FrameStyle.Thick);
+            //System.Windows.Forms.ControlPaint.DrawReversibleFrame(rr,SystemColors.Control,System.Windows.Forms.FrameStyle.Thick);
+		}
+
+		void IDesignTimeProvider.InsertItemAt(BaseItem objItem, int iPos, bool Before)
+		{
+			if(this.ExpandedItem()!=null)
+			{
+				this.ExpandedItem().Expanded=false;
+			}
+			if(!Before)
+			{
+				//objItem.BeginGroup=!objItem.BeginGroup;
+				if(iPos+1>=this.SubItems.Count)
+				{
+					this.SubItems.Add(objItem,GetAppendPosition(this));
+				}
+				else
+				{
+					this.SubItems.Add(objItem,iPos+1);
+				}
+			}
+			else
+			{
+				if(iPos>=this.SubItems.Count)
+				{
+					this.SubItems.Add(objItem, GetAppendPosition(this));
+				}
+				else
+				{
+					this.SubItems.Add(objItem,iPos);
+				}
+			}
+			if(this.ContainerControl is Bar)
+				((Bar)this.ContainerControl).RecalcLayout();
+			else if(this.ContainerControl is MenuPanel)
+				((MenuPanel)this.ContainerControl).RecalcSize();
+			else
+			{
+				this.RecalcSize();
+				this.Refresh();
+			}
+		}
+		private int GetAppendPosition(BaseItem objParent)
+		{
+			int iPos=-1;
+			for(int i=objParent.SubItems.Count-1;i>=0;i--)
+			{
+				if(objParent.SubItems[i].SystemItem)
+					iPos=i;
+				else
+					break;
+			}
+			return iPos;
+		}
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/SimpleItemContainer.cs b/PROMS/DotNetBar Source Code/SimpleItemContainer.cs
new file mode 100644
index 00000000..15242254
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/SimpleItemContainer.cs	
@@ -0,0 +1,575 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represents simple item container which orders items horizontally and support all ItemAlignment settings.
+    /// </summary>
+    [ToolboxItem(false)]
+    public class SimpleItemContainer : ImageItem, IDesignTimeProvider
+    {
+        #region Constructor
+        /// <summary>
+        /// Initializes a new instance of the SimpleItemContainer class.
+        /// </summary>
+        public SimpleItemContainer()
+        {
+            // We contain other controls
+            m_IsContainer = true;
+            this.AccessibleRole = System.Windows.Forms.AccessibleRole.Grouping;
+        }
+        #endregion
+
+        #region Implementation
+        public override void RecalcSize()
+        {
+            if (_LayoutOrientation == eOrientation.Vertical)
+            {
+                RecalcSizeVertical();
+            }
+            else
+            {
+                List<BaseItem> leftItems = new List<BaseItem>();
+                List<BaseItem> centerItems = new List<BaseItem>();
+                List<BaseItem> rightItems = new List<BaseItem>();
+
+                int centerWidth = 0;
+                Size minSize = SplitItems(leftItems, centerItems, rightItems, out centerWidth);
+                Point loc = this.Bounds.Location;
+                int bottom = this.Bounds.Bottom;
+                loc.X += _PaddingLeft;
+                if (this.WidthInternal == 0 || this.WidthInternal <= minSize.Width)
+                {
+                    BaseItem[] items = new BaseItem[leftItems.Count + centerItems.Count + rightItems.Count];
+                    leftItems.CopyTo(items);
+                    centerItems.CopyTo(items, leftItems.Count);
+                    rightItems.CopyTo(items, leftItems.Count + centerItems.Count);
+                    BaseItem previousItem = null;
+                    // Just line items up
+                    foreach (BaseItem item in items)
+                    {
+                        if (!item.Visible) continue;
+                        item.Displayed = true;
+                        loc.X -= GetOverlapSpacing(previousItem, item);
+                        item.LeftInternal = loc.X;
+                        if (IsVerticallyCentered(item))
+                            item.TopInternal = loc.Y + (minSize.Height - item.HeightInternal)/2;
+                        else
+                            item.TopInternal = loc.Y + (minSize.Height - item.HeightInternal);
+                        loc.X += item.WidthInternal + _ItemSpacing;
+                        previousItem = item;
+                    }
+                    m_Rect.Size = minSize;
+                }
+                else
+                {
+                    int leftItemsRight = 0;
+                    BaseItem previousItem = null;
+                    foreach (BaseItem item in leftItems)
+                    {
+                        item.Displayed = true;
+                        if (item.BeginGroup) loc.X += _BeginGroupSpacing;
+                        loc.X -= GetOverlapSpacing(previousItem, item);
+                        item.LeftInternal = loc.X;
+                        if (IsVerticallyCentered(item))
+                            item.TopInternal = loc.Y + (minSize.Height - item.HeightInternal)/2;
+                        else
+                            item.TopInternal = loc.Y + (minSize.Height - item.HeightInternal);
+                        loc.X += item.WidthInternal + _ItemSpacing;
+                        previousItem = item;
+                    }
+                    leftItemsRight = loc.X;
+
+                    int rightItemsLeft = 0;
+                    loc = new Point(this.Bounds.Right - _PaddingRight, this.Bounds.Y);
+                    previousItem = null;
+                    for (int i = rightItems.Count - 1; i >= 0; i--)
+                    {
+                        BaseItem item = rightItems[i];
+                        loc.X -= item.WidthInternal;
+                        item.Displayed = true;
+                        loc.X += GetOverlapSpacing(previousItem, item);
+                        item.LeftInternal = loc.X;
+                        loc.X -= _ItemSpacing + (item.BeginGroup ? _BeginGroupSpacing : 0);
+                        if (IsVerticallyCentered(item))
+                            item.TopInternal = loc.Y + (minSize.Height - item.HeightInternal)/2;
+                        else
+                            item.TopInternal = loc.Y + (minSize.Height - item.HeightInternal);
+                        previousItem = item;
+                    }
+                    rightItemsLeft = loc.X;
+
+                    loc = new Point((this.WidthInternal - centerWidth)/2, this.Bounds.Y);
+                    if (loc.X < leftItemsRight || loc.X + centerWidth > rightItemsLeft)
+                    {
+                        loc.X = leftItemsRight + ((rightItemsLeft - leftItemsRight) - centerWidth)/2;
+                    }
+                    previousItem = null;
+                    foreach (BaseItem item in centerItems)
+                    {
+                        item.Displayed = true;
+                        if (item.BeginGroup) loc.X += _BeginGroupSpacing;
+                        loc.X -= GetOverlapSpacing(previousItem, item);
+                        item.LeftInternal = loc.X;
+                        if (IsVerticallyCentered(item))
+                            item.TopInternal = loc.Y + (minSize.Height - item.HeightInternal)/2;
+                        else
+                            item.TopInternal = loc.Y + (minSize.Height - item.HeightInternal);
+                        loc.X += item.WidthInternal + _ItemSpacing;
+                        previousItem = item;
+                    }
+                    m_Rect.Height = minSize.Height;
+                }
+
+                if (m_Rect.Width < _MinimumSize.Width)
+                    m_Rect.Width = _MinimumSize.Width;
+                if (m_Rect.Height < _MinimumSize.Height)
+                    m_Rect.Height = _MinimumSize.Height;
+            }
+
+            base.RecalcSize();
+        }
+        protected virtual bool IsVerticallyCentered(BaseItem item)
+        {
+            return !(item is DevComponents.DotNetBar.Metro.MetroTabItem);
+        }
+        private Size SplitItems(List<BaseItem> leftItems, List<BaseItem> centerItems, List<BaseItem> rightItems, out int centerWidth)
+        {
+            Size minSize = new Size();
+            
+            centerWidth = 0;
+            BaseItem previousItem = null;
+            foreach (BaseItem item in this.SubItems)
+            {
+                if (!item.Visible)
+                {
+                    item.Displayed = false;
+                    continue;
+                }
+                item.RecalcSize();
+                
+                minSize.Width += item.WidthInternal + _ItemSpacing + (item.BeginGroup ? _BeginGroupSpacing : 0) - GetOverlapSpacing(previousItem, item);
+                minSize.Height = Math.Max(item.HeightInternal, minSize.Height);
+                if (item.ItemAlignment == eItemAlignment.Near)
+                    leftItems.Add(item);
+                else if (item.ItemAlignment == eItemAlignment.Center)
+                {
+                    centerItems.Add(item);
+                    centerWidth += item.WidthInternal + _ItemSpacing;
+                }
+                else if (item.ItemAlignment == eItemAlignment.Far)
+                    rightItems.Add(item);
+                previousItem = item;
+            }
+
+            if (minSize.Width > 0) minSize.Width -= _ItemSpacing;
+            if (centerWidth > 0) centerWidth -= _ItemSpacing;
+
+            return minSize;
+        }
+
+        private int GetOverlapSpacing(BaseItem previousItem, BaseItem item)
+        {
+            if (previousItem == null || _OverlapSpacing <= 0 || _OverlapType == null ||
+                !(_OverlapType.IsInstanceOfType(previousItem) && _OverlapType.IsInstanceOfType(item)))
+                return 0;
+            return _OverlapSpacing;
+        }
+
+        private bool IsHorizontallyCentered(BaseItem item)
+        {
+            return !(item is DevComponents.DotNetBar.Metro.MetroTabItem);
+        }
+        private Size SplitItemsVertical(List<BaseItem> topItems, List<BaseItem> centerItems, List<BaseItem> bottomItems, out int centerHeight)
+        {
+            Size minSize = new Size();
+            centerHeight = 0;
+            BaseItem previousItem = null;
+            foreach (BaseItem item in this.SubItems)
+            {
+                if (!item.Visible)
+                {
+                    item.Displayed = false;
+                    continue;
+                }
+                item.RecalcSize();
+                minSize.Height += item.HeightInternal + _ItemSpacing + (item.BeginGroup ? _BeginGroupSpacing : 0) - GetOverlapSpacing(previousItem, item);
+                minSize.Width = Math.Max(item.WidthInternal, minSize.Width);
+                if (item.ItemAlignment == eItemAlignment.Near)
+                    topItems.Add(item);
+                else if (item.ItemAlignment == eItemAlignment.Center)
+                {
+                    centerItems.Add(item);
+                    centerHeight += item.HeightInternal + _ItemSpacing;
+                }
+                else if (item.ItemAlignment == eItemAlignment.Far)
+                    bottomItems.Add(item);
+                previousItem = item;
+            }
+
+            if (minSize.Height > 0) minSize.Height -= _ItemSpacing;
+            if (centerHeight > 0) centerHeight -= _ItemSpacing;
+
+            return minSize;
+        }
+        private void RecalcSizeVertical()
+        {
+            List<BaseItem> leftItems = new List<BaseItem>();
+            List<BaseItem> centerItems = new List<BaseItem>();
+            List<BaseItem> rightItems = new List<BaseItem>();
+
+            int centerHeight = 0;
+            Size minSize = SplitItemsVertical(leftItems, centerItems, rightItems, out centerHeight);
+            Point loc = this.Bounds.Location;
+            int bottom = this.Bounds.Bottom;
+
+            if (this.HeightInternal == 0 || this.HeightInternal <= minSize.Height)
+            {
+                BaseItem[] items = new BaseItem[leftItems.Count + centerItems.Count + rightItems.Count];
+                leftItems.CopyTo(items);
+                centerItems.CopyTo(items, leftItems.Count);
+                rightItems.CopyTo(items, leftItems.Count + centerItems.Count);
+                // Just line items up
+                foreach (BaseItem item in items)
+                {
+                    if (!item.Visible) continue;
+                    item.Displayed = true;
+                    item.TopInternal = loc.Y;
+                    item.LeftInternal = loc.X;
+                    //if (IsHorizontallyCentered(item))
+                    //    item.LeftInternal = loc.X + (minSize.Width - item.WidthInternal) / 2;
+                    //else
+                    //    item.LeftInternal = loc.X + (minSize.Width - item.WidthInternal);
+                    item.WidthInternal = minSize.Width;
+                    loc.Y += item.HeightInternal + _ItemSpacing;
+                }
+                m_Rect.Size = minSize;
+            }
+            else
+            {
+                int leftItemsRight = 0;
+                foreach (BaseItem item in leftItems)
+                {
+                    item.Displayed = true;
+                    if (item.BeginGroup) loc.Y += _BeginGroupSpacing;
+                    item.TopInternal = loc.Y;
+                    item.WidthInternal = minSize.Width;
+                    if (IsHorizontallyCentered(item))
+                        item.LeftInternal = loc.X + (minSize.Width - item.WidthInternal) / 2;
+                    else
+                        item.LeftInternal = loc.X + (minSize.Width - item.WidthInternal);
+                    loc.Y += item.HeightInternal + _ItemSpacing;
+                }
+                leftItemsRight = loc.Y;
+
+                int rightItemsLeft = 0;
+                loc = new Point(this.Bounds.X, this.Bounds.Bottom);
+                for (int i = rightItems.Count - 1; i >= 0; i--)
+                {
+                    BaseItem item = rightItems[i];
+                    loc.Y -= item.HeightInternal;
+                    item.Displayed = true;
+                    item.TopInternal = loc.Y;
+                    item.WidthInternal = minSize.Width;
+                    loc.Y -= _ItemSpacing + (item.BeginGroup ? _BeginGroupSpacing : 0);
+                    if (IsHorizontallyCentered(item))
+                        item.LeftInternal = loc.X + (minSize.Width - item.WidthInternal) / 2;
+                    else
+                        item.LeftInternal = loc.X + (minSize.Width - item.WidthInternal);
+                }
+                rightItemsLeft = loc.Y;
+
+                loc = new Point(this.Bounds.X, (this.HeightInternal - centerHeight) / 2);
+                if (loc.Y < leftItemsRight || loc.Y + centerHeight > rightItemsLeft)
+                {
+                    loc.Y = leftItemsRight + ((rightItemsLeft - leftItemsRight) - centerHeight) / 2;
+                }
+
+                foreach (BaseItem item in centerItems)
+                {
+                    item.Displayed = true;
+                    if (item.BeginGroup) loc.Y += _BeginGroupSpacing;
+                    item.TopInternal = loc.Y;
+                    item.WidthInternal = minSize.Width;
+                    if (IsHorizontallyCentered(item))
+                        item.LeftInternal = loc.X + (minSize.Width - item.WidthInternal) / 2;
+                    else
+                        item.LeftInternal = loc.X + (minSize.Width - item.WidthInternal);
+                    loc.Y += item.HeightInternal + _ItemSpacing;
+                }
+                m_Rect.Width = minSize.Width;
+            }
+
+            if (m_Rect.Width < _MinimumSize.Width)
+                m_Rect.Width = _MinimumSize.Width;
+            if (m_Rect.Height < _MinimumSize.Height)
+                m_Rect.Height = _MinimumSize.Height;
+        }
+        public override void Paint(ItemPaintArgs p)
+        {
+            foreach (BaseItem item in this.SubItems)
+            {
+                if (!item.Displayed) continue;
+                if (item.BeginGroup)
+                {
+                    DisplayHelp.DrawLine(p.Graphics, item.LeftInternal -3, this.TopInternal + 4, item.LeftInternal - 3, this.Bounds.Bottom - 8, p.Colors.ItemSeparator, 1);
+                }
+                item.Paint(p);
+            }
+        }
+
+        /// <summary>
+        /// Returns copy of the item.
+        /// </summary>
+        public override BaseItem Copy()
+        {
+            SimpleItemContainer objCopy = new SimpleItemContainer();
+            this.CopyToItem(objCopy);
+            return objCopy;
+        }
+
+        /// <summary>
+        /// Copies the item specific properties to new instance of the item.
+        /// </summary>
+        /// <param name="copy">New instance.</param>
+        internal void InternalCopyToItem(SimpleItemContainer copy)
+        {
+            CopyToItem(copy);
+        }
+
+        /// <summary>
+        /// Copies the item specific properties to new instance of the item.
+        /// </summary>
+        /// <param name="copy">New instance.</param>
+        protected override void CopyToItem(BaseItem copy)
+        {
+            SimpleItemContainer c = copy as SimpleItemContainer;
+            base.CopyToItem(c);
+        }
+
+        internal void SetSystemFocus()
+        {
+            if (m_HotSubItem != null || this.SubItems.Count == 0)
+                return;
+
+            BaseItem exp = this.ExpandedItem();
+            if (exp != null)
+            {
+                m_HotSubItem = exp;
+                m_HotSubItem.InternalMouseEnter();
+                m_HotSubItem.InternalMouseMove(new MouseEventArgs(MouseButtons.None, 0, m_HotSubItem.LeftInternal + 2, m_HotSubItem.TopInternal + 2, 0));
+                return;
+            }
+
+            foreach (BaseItem objItem in this.SubItems)
+            {
+                if (!objItem.SystemItem && objItem.Displayed && objItem.Visible)
+                {
+                    m_HotSubItem = objItem;
+                    m_HotSubItem.InternalMouseEnter();
+                    m_HotSubItem.InternalMouseMove(new MouseEventArgs(MouseButtons.None, 0, m_HotSubItem.LeftInternal + 2, m_HotSubItem.TopInternal + 2, 0));
+                    break;
+                }
+            }
+        }
+
+        internal void ReleaseSystemFocus()
+        {
+            CollapseSubItems(this);
+            if (m_HotSubItem != null)
+            {
+                Control c = this.ContainerControl as Control;
+                if (c != null)
+                {
+                    Point p = c.PointToClient(Control.MousePosition);
+                    if (m_HotSubItem.DisplayRectangle.Contains(p))
+                        return;
+                }
+                m_HotSubItem.InternalMouseLeave();
+                m_HotSubItem = null;
+            }
+        }
+
+        private int _ItemSpacing;
+        private Size _MinimumSize = Size.Empty;
+        /// <summary>
+        /// Gets or sets the minimum size of the container. Either Width or Height can be set or both. Default value is 0,0 which means
+        /// that size is automatically calculated.
+        /// </summary>
+        [Browsable(false)]
+        public Size MinimumSize
+        {
+            get { return _MinimumSize; }
+            set
+            {
+                _MinimumSize = value;
+                this.NeedRecalcSize = true;
+                this.OnAppearanceChanged();
+            }
+        }
+
+        //private bool ShouldSerializeMinimumSize()
+        //{
+        //    return !_MinimumSize.IsEmpty;
+        //}
+
+        private bool _SystemContainer = false;
+        /// <summary>
+        /// Returns whether instance of the item container is used as system container internally by DotNetBar.
+        /// </summary>
+        [Browsable(false)]
+        public bool SystemContainer
+        {
+            get { return _SystemContainer; }
+        }
+
+        /// <summary>
+        /// Sets whether container is used as system container internally by DotNetBar.
+        /// </summary>
+        /// <param name="b">true or false to indicate whether container is system container or not.</param>
+        internal void SetSystemContainer(bool b)
+        {
+            _SystemContainer = b;
+        }
+
+        /// <summary>
+        /// Indicates the spacing between items.
+        /// </summary>
+        public int ItemSpacing
+        {
+            get { return _ItemSpacing; }
+            set
+            {
+                if (value != _ItemSpacing)
+                {
+                    int oldValue = _ItemSpacing;
+                    _ItemSpacing = value;
+                    OnItemSpacingChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when ItemSpacing property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnItemSpacingChanged(int oldValue, int newValue)
+        {
+            this.NeedRecalcSize = true;
+            this.OnAppearanceChanged();
+            //OnPropertyChanged(new PropertyChangedEventArgs("ItemSpacing"));
+            
+        }
+
+        private int _BeginGroupSpacing = 6;
+        /// <summary>
+        /// Indicates additional spacing between item when its BeginGroup property is set.
+        /// </summary>
+        [DefaultValue(6), Category("Appearance"), Description("Indicates additional spacing between item when its BeginGroup property is set.")]
+        public int BeginGroupSpacing
+        {
+            get { return _BeginGroupSpacing; }
+            set { _BeginGroupSpacing = value; }
+        }
+
+        private eOrientation _LayoutOrientation = eOrientation.Horizontal;
+        /// <summary>
+        /// Specifies the layout orientation
+        /// </summary>
+        [DefaultValue(eOrientation.Horizontal), Category("Layout"), Description("Specifies the layout orientation")]
+        public eOrientation LayoutOrientation {
+            get { return _LayoutOrientation; }
+            set
+            {
+                if (_LayoutOrientation != value)
+                {
+                    _LayoutOrientation = value;
+                    NeedRecalcSize = true;
+                }
+            } 
+        }
+
+        private bool _EqualizeButtonSize = false;
+        /// <summary>
+        /// Indicates whether all items are resized to be of the size equal to largest item in the container
+        /// </summary>
+        [DefaultValue(false), Category("Layout"), Description("Indicates whether all items are resized to be of the size equal to largest item in the container")]
+        public bool EqualizeButtonSize
+        {
+            get { return _EqualizeButtonSize; }
+            set
+            {
+                if (_EqualizeButtonSize != value)
+                {
+                    _EqualizeButtonSize = value;
+                    NeedRecalcSize = true;
+                }
+            }
+        }
+
+        private int _PaddingLeft = 0;
+        /// <summary>
+        /// Indicates left side padding within container.
+        /// </summary>
+        public int PaddingLeft
+        {
+            get { return _PaddingLeft; }
+            set { _PaddingLeft = value; }
+        }
+
+        private int _PaddingRight;
+
+        /// <summary>
+        /// Indicates right side padding within container.
+        /// </summary>
+        public int PaddingRight
+        {
+            get { return _PaddingRight; }
+            set { _PaddingRight = value; }
+        }
+
+        private int _OverlapSpacing = 0;
+        /// <summary>
+        /// Gets overlap spacing for specific item types specified by OverlapType in the container.
+        /// </summary>
+        public int OverlapSpacing
+        {
+            get { return _OverlapSpacing; }
+            set { _OverlapSpacing = value; }
+        }
+
+        private Type _OverlapType = null;
+        /// <summary>
+        /// Gets the type of the item that will overlap.
+        /// </summary>
+        public Type OverlapType
+        {
+            get { return _OverlapType; }
+            set { _OverlapType = value; }
+        }
+        #endregion
+
+        #region IDesignTimeProvider
+        public InsertPosition GetInsertPosition(Point pScreen, BaseItem DragItem)
+        {
+            return DesignTimeProviderContainer.GetInsertPosition(this, pScreen, DragItem);
+        }
+        public void DrawReversibleMarker(int iPos, bool Before)
+        {
+            DesignTimeProviderContainer.DrawReversibleMarker(this, iPos, Before);
+            return;
+        }
+
+        public void InsertItemAt(BaseItem objItem, int iPos, bool Before)
+        {
+            DesignTimeProviderContainer.InsertItemAt(this, objItem, iPos, Before);
+            return;
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/SimpleTabDisplay.cs b/PROMS/DotNetBar Source Code/SimpleTabDisplay.cs
new file mode 100644
index 00000000..6bb5657e
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/SimpleTabDisplay.cs	
@@ -0,0 +1,305 @@
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Drawing.Text;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Represents class that provide display support for simple tabs.
+	/// </summary>
+	public class SimpleTabDisplay
+	{
+		#region Private Variables
+		private int m_SideWidth=8;
+		private int m_TextTopOffset=2;
+		#endregion
+
+		#region Internal Implementation
+		/// <summary>
+		/// Default constructor.
+		/// </summary>
+		public SimpleTabDisplay()
+		{
+		}
+
+		public virtual void Paint(Graphics g, ISimpleTab[] tabs)
+		{
+			int iSelected=-1;
+			for(int i=tabs.Length-1;i>=0;i--)
+			{
+				if(tabs[i].IsSelected)
+				{
+					iSelected=i;
+					continue;
+				}
+				PaintTab(g,tabs[i]);
+			}
+
+			if(iSelected!=-1)
+				PaintTab(g,tabs[iSelected]);
+		}
+
+		protected virtual void PaintTab(Graphics g, ISimpleTab tab)
+		{
+			TabColors c=GetTabColors(tab);
+			Rectangle r=tab.DisplayRectangle;
+			
+
+			r.Width+=(m_SideWidth*2);
+			r.X-=m_SideWidth;
+
+			GraphicsPath path=this.GetTabPath(r,tab.TabAlignment);
+			if(c.BackColor2.IsEmpty)
+			{
+				using(SolidBrush brush=new SolidBrush(c.BackColor))
+					g.FillPath(brush,path);
+			}
+			else
+			{
+				using(LinearGradientBrush brush=BarFunctions.CreateLinearGradientBrush(tab.DisplayRectangle,c.BackColor,c.BackColor2,c.BackColorGradientAngle))
+					g.FillPath(brush,path);
+			}
+			r.Width--;
+			r.Height--;
+			//Rectangle r=tab.DisplayRectangle;
+//			r.Width--;
+//			r.Height--;
+			if(!c.BorderColor.IsEmpty)
+			{
+				using(Pen pen=new Pen(c.BorderColor,1))
+				{
+					Line l=GetLeftLine(r,tab.TabAlignment);
+					g.DrawLine(pen,l.X1,l.Y1,l.X2,l.Y2);
+					l=GetRightLine(r,tab.TabAlignment);
+					g.DrawLine(pen,l.X1,l.Y1,l.X2,l.Y2);
+					if(tab.TabAlignment==eTabStripAlignment.Top)
+					{
+						l=GetTopLine(r,tab.TabAlignment);
+						g.DrawLine(pen,l.X1,l.Y1,l.X2,l.Y2);
+					}
+					else if(tab.TabAlignment==eTabStripAlignment.Bottom)
+					{
+						l=GetBottomLine(r,tab.TabAlignment);
+						g.DrawLine(pen,l.X1,l.Y1,l.X2,l.Y2);
+					}
+				}
+			}
+			
+			if(!c.LightBorderColor.IsEmpty)
+			{
+				using(Pen pen=new Pen(c.LightBorderColor,1))
+				{
+					Line l=GetLeftLine(r,tab.TabAlignment);
+					g.DrawLine(pen,l.X1,l.Y1,l.X2,l.Y2);
+					if(tab.TabAlignment==eTabStripAlignment.Top)
+					{
+						l=GetTopLine(r,tab.TabAlignment);
+						g.DrawLine(pen,l.X1,l.Y1,l.X2,l.Y2);
+					}
+					else if(tab.TabAlignment==eTabStripAlignment.Bottom)
+					{
+						l=GetBottomLine(r,tab.TabAlignment);
+						g.DrawLine(pen,l.X1,l.Y1,l.X2,l.Y2);
+					}
+				}
+			}
+
+			if(!c.DarkBorderColor.IsEmpty)
+			{
+				using(Pen pen=new Pen(c.DarkBorderColor,1))
+				{
+					Line l=GetRightLine(r,tab.TabAlignment);
+					g.DrawLine(pen,l.X1,l.Y1,l.X2,l.Y2);
+				}
+			}
+            
+			DrawTabText(g,tab,GetTextRectangle(tab),c);
+
+//			if(tab is BubbleBarTab && ((BubbleBarTab)tab).Focus)
+//			{
+//				Region clip=g.Clip;
+//				g.ResetClip();
+//				r=tab.DisplayRectangle;
+//				r.Width+=(m_SideWidth*2);
+//				r.X-=m_SideWidth;
+//				r.Inflate(1,1);
+//				DesignTime.DrawDesignTimeSelection(g,r,Color.Navy);
+//				g.Clip=clip;
+//			}
+		}
+
+		private TabColors GetTabColors(ISimpleTab tab)
+		{
+			TabColors c=new TabColors();
+			c.BackColor=tab.BackColor;
+			c.BackColor2=tab.BackColor2;
+			c.BackColorGradientAngle=tab.BackColorGradientAngle;
+			c.BorderColor=tab.BorderColor;
+			c.DarkBorderColor=tab.DarkBorderColor;
+			c.LightBorderColor=tab.LightBorderColor;
+			c.TextColor=tab.TextColor;
+
+			if(tab.IsSelected)
+			{
+				if(tab is BubbleBarTab && ((BubbleBarTab)tab).Parent!=null)
+				{
+					TabColors sel=((BubbleBarTab)tab).Parent.SelectedTabColors;
+					if(!sel.BackColor.IsEmpty)
+						c.BackColor=sel.BackColor;
+					if(!sel.BackColor2.IsEmpty)
+					{
+						c.BackColor2=sel.BackColor2;
+						c.BackColorGradientAngle=sel.BackColorGradientAngle;
+					}
+					if(!sel.BorderColor.IsEmpty)
+						c.BorderColor=sel.BorderColor;
+					if(!sel.DarkBorderColor.IsEmpty)
+						c.DarkBorderColor=sel.DarkBorderColor;
+					if(!sel.LightBorderColor.IsEmpty)
+						c.LightBorderColor=sel.LightBorderColor;
+					if(!sel.TextColor.IsEmpty)
+						c.TextColor=sel.TextColor;
+				}
+			}
+			
+			if(tab.IsMouseOver)
+			{
+				if(tab is BubbleBarTab && ((BubbleBarTab)tab).Parent!=null)
+				{
+					TabColors sel=((BubbleBarTab)tab).Parent.MouseOverTabColors;
+					if(!sel.BackColor.IsEmpty)
+						c.BackColor=sel.BackColor;
+					if(!sel.BackColor2.IsEmpty)
+					{
+						c.BackColor2=sel.BackColor2;
+						c.BackColorGradientAngle=sel.BackColorGradientAngle;
+					}
+					if(!sel.BorderColor.IsEmpty)
+						c.BorderColor=sel.BorderColor;
+					if(!sel.DarkBorderColor.IsEmpty)
+						c.DarkBorderColor=sel.DarkBorderColor;
+					if(!sel.LightBorderColor.IsEmpty)
+						c.LightBorderColor=sel.LightBorderColor;
+					if(!sel.TextColor.IsEmpty)
+						c.TextColor=sel.TextColor;
+				}
+			}
+
+			return c;
+		}
+
+		protected virtual Rectangle GetTextRectangle(ISimpleTab tab)
+		{
+			Rectangle rText=tab.DisplayRectangle;
+			rText.Y+=m_TextTopOffset;
+			rText.Height-=m_TextTopOffset;
+			//rText.X+=m_SideWidth/2;
+			//rText.Width-=m_SideWidth;
+			return rText;
+		}
+
+		protected virtual GraphicsPath GetTabPath(Rectangle r,eTabStripAlignment align)
+		{
+			GraphicsPath path=new GraphicsPath();
+			Line l=GetLeftLine(r,align);
+			path.AddLine(l.X1,l.Y1,l.X2,l.Y2);
+			l=GetTopLine(r,align);
+			path.AddLine(l.X1,l.Y1,l.X2,l.Y2);
+			l=GetRightLine(r,align);
+			path.AddLine(l.X1,l.Y1,l.X2,l.Y2);
+			l=GetBottomLine(r,align);
+			path.AddLine(l.X1,l.Y1,l.X2,l.Y2);
+			path.CloseAllFigures();
+			return path;
+		}
+
+		protected virtual Line GetLeftLine(Rectangle r,eTabStripAlignment align)
+		{
+			if(align==eTabStripAlignment.Top)
+				return new Line(r.X,r.Bottom,r.X+m_SideWidth,r.Y);
+			else if(align==eTabStripAlignment.Bottom)
+				return new Line(r.X+m_SideWidth,r.Bottom,r.X,r.Y);
+			return null;
+		}
+
+		protected virtual Line GetRightLine(Rectangle r,eTabStripAlignment align)
+		{
+			if(align==eTabStripAlignment.Top)
+				return new Line(r.Right-m_SideWidth,r.Y,r.Right,r.Bottom);
+			else if(align==eTabStripAlignment.Bottom)
+				return new Line(r.Right,r.Y,r.Right-m_SideWidth,r.Bottom);
+			return null;
+		}
+
+		protected virtual Line GetTopLine(Rectangle r,eTabStripAlignment align)
+		{
+			if(align==eTabStripAlignment.Top)
+				return new Line(r.X+m_SideWidth,r.Y,r.Right-m_SideWidth,r.Y);
+			else if(align==eTabStripAlignment.Bottom)
+				return new Line(r.X,r.Y,r.Right,r.Y);
+			return null;
+		}
+
+		protected virtual Line GetBottomLine(Rectangle r,eTabStripAlignment align)
+		{
+			if(align==eTabStripAlignment.Top)
+				return new Line(r.X,r.Bottom,r.Right,r.Bottom);
+			else if(align==eTabStripAlignment.Bottom)
+				return new Line(r.Right-m_SideWidth,r.Bottom,r.X+m_SideWidth,r.Bottom);
+			return null;
+		}
+
+		protected virtual void DrawTabText(Graphics g, ISimpleTab tab, Rectangle rText, TabColors c)
+		{
+			eTextFormat strFormat=GetStringFormat();
+
+			Font font=tab.GetTabFont();
+			
+			if(tab.TabAlignment==eTabStripAlignment.Left || tab.TabAlignment==eTabStripAlignment.Right)
+			{
+				g.RotateTransform(90);
+				rText=new Rectangle(rText.Top,-rText.Right,rText.Height,rText.Width);
+			}
+
+            if (tab.TabAlignment == eTabStripAlignment.Left || tab.TabAlignment == eTabStripAlignment.Right)
+                TextDrawing.DrawStringLegacy(g, tab.Text, font, c.TextColor, rText, strFormat);
+            else
+		        TextDrawing.DrawString(g,tab.Text,font,c.TextColor,rText,strFormat);
+
+			if(tab.TabAlignment==eTabStripAlignment.Left || tab.TabAlignment==eTabStripAlignment.Right)
+				g.ResetTransform();
+		}
+
+		protected virtual eTextFormat GetStringFormat()
+		{
+            return eTextFormat.HorizontalCenter | eTextFormat.VerticalCenter |
+                eTextFormat.SingleLine | eTextFormat.EndEllipsis;
+
+            //StringFormat strFormat=BarFunctions.CreateStringFormat(); //new StringFormat(StringFormat.GenericDefault);
+            //strFormat.FormatFlags=strFormat.FormatFlags | StringFormatFlags.NoWrap;
+            //strFormat.Trimming=StringTrimming.EllipsisCharacter;
+            //strFormat.LineAlignment=StringAlignment.Center;
+            //strFormat.Alignment=StringAlignment.Center;
+            //strFormat.HotkeyPrefix=HotkeyPrefix.Show;
+            //return strFormat;
+		}
+		#endregion
+
+		#region Line class
+		protected class Line
+		{
+			public int X1=0;
+			public int Y1=0;
+			public int X2=0;
+			public int Y2=0;
+			public Line(int x1, int y1, int x2, int y2)
+			{
+				this.X1=x1;
+				this.Y1=y1;
+				this.X2=x2;
+				this.Y2=y2;
+			}
+		}
+		#endregion
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/SimpleTabLayoutManager.cs b/PROMS/DotNetBar Source Code/SimpleTabLayoutManager.cs
new file mode 100644
index 00000000..f750b1a4
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/SimpleTabLayoutManager.cs	
@@ -0,0 +1,67 @@
+using System;
+using System.Collections;
+using System.Drawing;
+using DevComponents.UI.ContentManager;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Provides layout management for ISimpleTab tab implementations.
+	/// </summary>
+	public class SimpleTabLayoutManager:BlockLayoutManager
+	{
+		public SimpleTabLayoutManager()
+		{
+		}
+
+		/// <summary>
+		/// Resizes the content block and sets it's Bounds property to reflect new size.
+		/// </summary>
+		/// <param name="block">Content block to resize.</param>
+        public override void Layout(IBlock block, Size availableSize)
+		{
+			if(this.Graphics==null)
+				throw(new InvalidOperationException("Graphics property must be set to valid instance of Graphics object."));
+
+			ISimpleTab tab=block as ISimpleTab;
+			if(!tab.Visible)
+				return;
+
+			int width=0;
+			int height=0;
+			int paddingTop=1;
+			int paddingBottom=0;
+			int paddingLeft=1;
+			int paddingRight=1;
+			int paddingBottomSelected=2;
+
+            eTextFormat strFormat = eTextFormat.Default;
+
+			Font font=tab.GetTabFont();
+			if(tab.Text!="")
+			{
+				Size textSize=TextDrawing.MeasureString(this.Graphics,tab.Text,font,0,strFormat);
+				width+=textSize.Width;
+				if(textSize.Height>height)
+					height=textSize.Height;
+			}
+			else
+				height+=font.Height;
+
+			height+=(paddingTop+paddingBottom);
+			if(tab.IsSelected)
+				height+=paddingBottomSelected;
+			width+=(paddingLeft+paddingRight);
+
+			if(tab.TabAlignment==eTabStripAlignment.Left || tab.TabAlignment==eTabStripAlignment.Right)
+				block.Bounds=new Rectangle(0,0,height,width);
+			else
+				block.Bounds=new Rectangle(0,0,width,height);
+		}
+
+        public override Rectangle FinalizeLayout(Rectangle containerBounds, Rectangle blocksBounds, ArrayList lines)
+        {
+            return (blocksBounds);
+        }
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/SplitterMozillaPainter.cs b/PROMS/DotNetBar Source Code/SplitterMozillaPainter.cs
new file mode 100644
index 00000000..5a63ec77
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/SplitterMozillaPainter.cs	
@@ -0,0 +1,94 @@
+using System;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Represents painter for Mozilla style splitter.
+	/// </summary>
+	internal class SplitterMozillaPainter:SplitterPainter
+	{
+		/// <summary>
+		/// Creates new instance of splitter painter.
+		/// </summary>
+		public SplitterMozillaPainter(){}
+
+		#region Painting
+		/// <summary>
+		/// Paints splitter.
+		/// </summary>
+		/// <param name="info">Paint information.</param>
+		public override void Paint(SplitterPaintInfo info)
+		{
+			int gripWidth=42;
+			int spacing=8;
+			Rectangle r=info.DisplayRectangle;
+			Graphics g=info.Graphics;
+
+			PaintBackground(info);
+
+			if(info.Dock==DockStyle.Top || info.Dock==DockStyle.Bottom)
+			{
+				if(info.DisplayRectangle.Width-ArrowSize*2<gripWidth)
+				{
+					gripWidth=info.DisplayRectangle.Width-ArrowSize*2;
+					if(gripWidth<0)
+						gripWidth=info.DisplayRectangle.Width;
+				}
+				
+				Point pStart=new Point(r.X+(r.Width-gripWidth)/2,r.Y+(r.Height-5)/2);
+				SolidBrush brushLight=new SolidBrush(info.Colors.GripLightColor);
+				SolidBrush brushDark=new SolidBrush(info.Colors.GripDarkColor);
+				for(int i=pStart.X;i<pStart.X+gripWidth;i+=3)
+				{
+					g.FillRectangle(brushLight,i,pStart.Y+3,1,1);
+					g.FillRectangle(brushDark,i+1,pStart.Y+4,1,1);
+					g.FillRectangle(brushLight,i+1,pStart.Y,1,1);
+					g.FillRectangle(brushDark,i+2,pStart.Y+1,1,1);
+				}
+				brushLight.Dispose();
+				brushDark.Dispose();
+				if(info.Expandable)
+				{
+					Point p=new Point(r.X+(r.Width-gripWidth)/2-this.ArrowSize-spacing,r.Y+(r.Height-ArrowSize/2)/2);
+					this.PaintArrow(p,info);
+					p.Offset(gripWidth+spacing*2+ArrowSize,0);
+					this.PaintArrow(p,info);
+				}
+			}
+			else
+			{
+				if(info.DisplayRectangle.Height-ArrowSize*2<gripWidth)
+				{
+					gripWidth=info.DisplayRectangle.Height-ArrowSize*2;
+					if(gripWidth<0)
+						gripWidth=info.DisplayRectangle.Height;
+				}
+
+				Point pStart=new Point(r.X+(r.Width-5)/2,r.Y+(r.Height-gripWidth)/2);
+				SolidBrush brushLight=new SolidBrush(info.Colors.GripLightColor);
+				SolidBrush brushDark=new SolidBrush(info.Colors.GripDarkColor);
+				for(int i=pStart.Y;i<pStart.Y+gripWidth;i+=3)
+				{
+					g.FillRectangle(brushLight,pStart.X+3,i,1,1);
+					g.FillRectangle(brushDark,pStart.X+4,i+1,1,1);
+					g.FillRectangle(brushLight,pStart.X,i+1,1,1);
+					g.FillRectangle(brushDark,pStart.X+1,i+2,1,1);
+				}
+				brushLight.Dispose();
+				brushDark.Dispose();
+
+				if(info.Expandable)
+				{
+					Point p=new Point(r.X+(r.Width-ArrowSize/2)/2,r.Y+(r.Height-gripWidth)/2-this.ArrowSize-spacing);
+					this.PaintArrow(p,info);
+					p.Offset(0,gripWidth+spacing*2+ArrowSize);
+					this.PaintArrow(p,info);
+				}
+			}
+		}
+		#endregion
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/SplitterOffice2003Painter.cs b/PROMS/DotNetBar Source Code/SplitterOffice2003Painter.cs
new file mode 100644
index 00000000..73d940ae
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/SplitterOffice2003Painter.cs	
@@ -0,0 +1,101 @@
+using System;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Represents painter for Office 2003 style splitter.
+	/// </summary>
+	internal class SplitterOffice2003Painter:SplitterPainter
+	{
+		/// <summary>
+		/// Creates new instance of splitter painter.
+		/// </summary>
+		public SplitterOffice2003Painter(){}
+
+		#region Painting
+		/// <summary>
+		/// Paints splitter.
+		/// </summary>
+		/// <param name="info">Paint information.</param>
+		public override void Paint(SplitterPaintInfo info)
+		{
+			int spacing=8;
+			Rectangle r=info.DisplayRectangle;
+			Graphics g=info.Graphics;
+			SplitterColors colors=info.Colors;
+
+			PaintBackground(info);
+
+			if(info.Dock==DockStyle.Top || info.Dock==DockStyle.Bottom)
+			{
+				Point pStart=new Point(r.X+(r.Width-34)/2-1,r.Y+(r.Height-4)/2);
+				using(SolidBrush brush=new SolidBrush(colors.GripLightColor)) //White
+				{
+					int x=pStart.X+1;
+					int y=pStart.Y+1;
+					for(int i=0;i<9;i++)
+					{
+						g.FillRectangle(brush,x,y,2,2);
+						x+=4;
+					}
+				}
+
+				using(SolidBrush brush=new SolidBrush(colors.GripDarkColor)) //Color.FromArgb(128,ControlPaint.Dark(colors.PanelBackground))))
+				{
+					int x=pStart.X;
+					int y=pStart.Y;
+					for(int i=0;i<9;i++)
+					{
+						g.FillRectangle(brush,x,y,2,2);
+						x+=4;
+					}
+				}
+
+				if(info.Expandable)
+				{
+					Point p=new Point(r.X+(r.Width-36)/2-this.ArrowSize-spacing,r.Y+(r.Height-ArrowSize/2)/2);
+					this.PaintArrow(p,info);
+					p.Offset(36+spacing*2+ArrowSize,0);
+					this.PaintArrow(p,info);
+				}
+			}
+			else
+			{
+				Point pStart=new Point(r.X+(r.Width-4)/2,r.Y+(r.Height-34)/2);
+				using(SolidBrush brush=new SolidBrush(colors.GripLightColor))
+				{
+					int y=pStart.Y; //r.Y+(r.Height-34)/2;
+					int x=pStart.X+1; // r.X+2;
+					for(int i=0;i<9;i++)
+					{
+						g.FillRectangle(brush,x,y,2,2);
+						y+=4;
+					}
+				}
+
+				using(SolidBrush brush=new SolidBrush(colors.GripDarkColor))
+				{
+					int y=pStart.Y-1; //r.Y+(r.Height-34)/2-1;
+					int x=pStart.X; //r.X+1;
+					for(int i=0;i<9;i++)
+					{
+						g.FillRectangle(brush,x,y,2,2);
+						y+=4;
+					}
+				}
+
+				if(info.Expandable)
+				{
+					Point p=new Point(r.X+(r.Width-ArrowSize/2)/2,r.Y+(r.Height-36)/2-this.ArrowSize-spacing);
+					this.PaintArrow(p,info);
+					p.Offset(0,36+spacing*2+ArrowSize);
+					this.PaintArrow(p,info);
+				}
+			}
+		}
+		#endregion
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/SplitterPainter.cs b/PROMS/DotNetBar Source Code/SplitterPainter.cs
new file mode 100644
index 00000000..c41ccee4
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/SplitterPainter.cs	
@@ -0,0 +1,172 @@
+using System;
+using System.Windows.Forms;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Base class for painting expandable splitter control.
+	/// </summary>
+	internal abstract class SplitterPainter
+	{
+		#region Private Variables
+		private int m_ArrowSize=6;
+		#endregion
+
+		/// <summary>
+		/// Default constructor.
+		/// </summary>
+		public SplitterPainter()
+		{
+		}
+
+		#region Methods
+		/// <summary>
+		/// Paints splitter.
+		/// </summary>
+		/// <param name="info">Paint information.</param>
+		public virtual void Paint(SplitterPaintInfo info)
+		{
+		}
+
+		protected virtual void PaintArrow(Point p, SplitterPaintInfo info)
+		{
+			System.Drawing.Drawing2D.GraphicsPath path=UIGraphics.GetTrianglePath(p,ArrowSize,this.GetDirection(info));
+			if(!info.Colors.ExpandFillColor.IsEmpty)
+			{
+				using(SolidBrush brush=new SolidBrush(info.Colors.ExpandFillColor))
+					info.Graphics.FillPath(brush,path);
+			}
+			if(!info.Colors.ExpandLineColor.IsEmpty)
+			{
+				using(Pen pen=new Pen(info.Colors.ExpandLineColor,1))
+					info.Graphics.DrawPath(pen,path);
+			}
+			path.Dispose();
+		}
+
+		protected eTriangleDirection GetDirection(SplitterPaintInfo info)
+		{
+			if(info.Dock==DockStyle.Top && info.Expanded || info.Dock==DockStyle.Bottom && !info.Expanded)
+			{
+				// Points up
+				return eTriangleDirection.Top;
+			}
+			else if(info.Dock==DockStyle.Top && !info.Expanded || info.Dock==DockStyle.Bottom && info.Expanded)
+			{
+				// Points down
+				return eTriangleDirection.Bottom;
+			}
+			else if(info.Dock==DockStyle.Left && info.Expanded || info.Dock==DockStyle.Right && !info.Expanded)
+			{
+				// Points left
+				return eTriangleDirection.Left;
+			}
+			return eTriangleDirection.Right;
+		}
+
+		protected System.Drawing.Drawing2D.LinearGradientBrush CreateLinearGradientBrush(Rectangle r,Color color1, Color color2,float gradientAngle)
+		{
+			return new System.Drawing.Drawing2D.LinearGradientBrush(new Rectangle(r.X-1,r.Y-1,r.Width+1,r.Height+1),color1,color2,gradientAngle);
+		}
+
+		protected virtual void PaintBackground(SplitterPaintInfo info)
+		{
+			int gradientAngle=info.Colors.BackColorGradientAngle;
+			Rectangle r=info.DisplayRectangle;
+
+			if(info.Dock==DockStyle.Top || info.Dock==DockStyle.Bottom)
+				gradientAngle+=90;
+
+			if(info.Colors.BackColor2.IsEmpty)
+			{
+				using(SolidBrush brush=new SolidBrush(info.Colors.BackColor))
+					info.Graphics.FillRectangle(brush,r);
+			}
+			else
+			{
+				using(System.Drawing.Drawing2D.LinearGradientBrush brush=CreateLinearGradientBrush(r,info.Colors.BackColor,info.Colors.BackColor2,gradientAngle))
+					info.Graphics.FillRectangle(brush,r);
+			}
+		}
+		#endregion
+
+		#region Properties
+		protected int ArrowSize
+		{
+			get {return m_ArrowSize;}
+			set {m_ArrowSize=value;}
+		}
+		#endregion
+	}
+
+	#region SplitterPaintInfo
+	/// <summary>
+	/// Represents class that holds information neccessary to paint the expandable splitter.
+	/// </summary>
+	internal class SplitterPaintInfo
+	{
+		/// <summary>
+		/// Specifies reference to graphics canvas.
+		/// </summary>
+		public System.Drawing.Graphics Graphics;
+		/// <summary>
+		/// Specifies splitter display rectangle.
+		/// </summary>
+		public System.Drawing.Rectangle DisplayRectangle;
+		/// <summary>
+		/// Holds color settings for painting.
+		/// </summary>
+		public SplitterColors Colors;
+		/// <summary>
+		/// Specifies whether splitter is expandable or not.
+		/// </summary>
+		public bool Expandable;
+		/// <summary>
+		/// Specifies whether splitter is expanded or not.
+		/// </summary>
+		public bool Expanded;
+		/// <summary>
+		/// Specifies the splitter dock.
+		/// </summary>
+		public System.Windows.Forms.DockStyle Dock;
+	}
+	#endregion
+
+	#region SplitterColors
+	/// <summary>
+	/// Represents class that holds colors for the splitter display.
+	/// </summary>
+	internal class SplitterColors
+	{
+		/// <summary>
+		/// Specifies back color.
+		/// </summary>
+		public Color BackColor=Color.Empty;
+		/// <summary>
+		/// Specifies target gradient background color.
+		/// </summary>
+		public Color BackColor2=Color.Empty;
+		/// <summary>
+		/// Specifies background gradient angle.
+		/// </summary>
+		public int BackColorGradientAngle=0;
+		/// <summary>
+		/// Specifies grip part dark color.
+		/// </summary>
+		public Color GripDarkColor=Color.Empty;
+		/// <summary>
+		/// Specifies grip part light color.
+		/// </summary>
+		public Color GripLightColor=Color.Empty;
+		/// <summary>
+		/// Specifies expand part line color.
+		/// </summary>
+		public Color ExpandLineColor=Color.Empty;
+		/// <summary>
+		/// Specifies expand part fill color.
+		/// </summary>
+		public Color ExpandFillColor=Color.Empty;
+	}
+	#endregion
+}
diff --git a/PROMS/DotNetBar Source Code/StringHelper.cs b/PROMS/DotNetBar Source Code/StringHelper.cs
new file mode 100644
index 00000000..40a5f917
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/StringHelper.cs	
@@ -0,0 +1,104 @@
+using System;
+using System.Text;
+
+namespace DevComponents.DotNetBar
+{
+#if FRAMEWORK20
+    internal static class StringHelper
+#else
+	internal class StringHelper
+#endif
+    {
+        internal static string Capitalize(string s)
+        {
+            if (s.Length > 1)
+                return s.Substring(0, 1).ToUpper() + s.Substring(1);
+            return s;
+        }
+
+        internal static string GetFriendlyName(string fieldName)
+        {
+            fieldName = fieldName.Replace('_', ' ');
+#if FRAMEWORK20
+            if (fieldName.Contains(" "))
+#else
+			if (fieldName.IndexOf(" ") >= 0)
+#endif
+            {
+                string[] words = fieldName.Split(' ');
+                StringBuilder builder = new StringBuilder(fieldName.Length);
+                for (int i = 0; i < words.Length; i++)
+                {
+                    builder.Append(Capitalize(words[i]));
+                    if (i < words.Length - 1)
+                        builder.Append(' ');
+                }
+                return builder.ToString();
+            }
+            else if (fieldName.Length > 2)
+            {
+                bool hadUpperCase = false;
+                int lastUpperCaseIndex = -1;
+                StringBuilder builder = new StringBuilder(fieldName.Length + 10);
+                for (int i = 0; i < fieldName.Length; i++)
+                {
+                    if (IsUpperCase(fieldName[i]))
+                    {
+                        if (hadUpperCase && i - lastUpperCaseIndex > 1)
+                        {
+                            builder.Append(' ');
+                            builder.Append(fieldName[i]);
+                            lastUpperCaseIndex = i;
+                        }
+                        else if (!hadUpperCase)
+                        {
+                            lastUpperCaseIndex = i;
+                            hadUpperCase = true;
+                            if (i > 0) builder.Append(' ');
+                            builder.Append(fieldName[i]);
+                        }
+                        else
+                        {
+                            lastUpperCaseIndex = i;
+                            builder.Append(fieldName[i].ToString().ToLower());
+                            hadUpperCase = true;
+                        }
+                    }
+                    else
+                    {
+                        if (hadUpperCase)
+                            builder.Append(fieldName[i]);
+                        else
+                        {
+                            builder.Append(fieldName[i].ToString().ToUpper());
+                            hadUpperCase = true;
+                            lastUpperCaseIndex = i;
+                        }
+                    }
+                }
+
+                return builder.ToString();
+            }
+
+            return fieldName;
+        }
+
+        internal static bool IsUpperCase(char c)
+        {
+            return IsUpperCase(c.ToString());
+        }
+
+        internal static bool IsUpperCase(string s)
+        {
+            return s.ToUpper() == s;
+        }
+
+        internal static string Repeat(char repeatCharacter, int count)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.Append(repeatCharacter, count);
+            
+            return builder.ToString();
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Strings.resources b/PROMS/DotNetBar Source Code/Strings.resources
new file mode 100644
index 00000000..ab19abf6
Binary files /dev/null and b/PROMS/DotNetBar Source Code/Strings.resources differ
diff --git a/PROMS/DotNetBar Source Code/Strings.txt b/PROMS/DotNetBar Source Code/Strings.txt
new file mode 100644
index 00000000..18980b5a
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Strings.txt	
@@ -0,0 +1,102 @@
+; Customize Dialog Pop-up Menu Strings
+cust_pm_reset=Reset
+cust_pm_delete=Delete
+cust_pm_name=Name:
+cust_pm_stydef=Default Style
+cust_pm_stytextonly=Text Only (Always)
+cust_pm_styimagetext=Image and Text (Always)
+cust_pm_begingroup=Begin Group
+
+; Customize Dialog Strings
+cust_caption=Customize
+cust_tab_toolbars=Toolbars
+cust_tab_commands=Commands
+cust_tab_options=Options
+cust_btn_keyboard=&Keyboard...
+cust_btn_close=Close
+cust_btn_new=&New...
+cust_btn_rename=&Rename...
+cust_btn_delete=Delete
+cust_btn_reset=&Reset...
+cust_lbl_cmdsins=To add a command to Bar select the category and drag the command out of this box to a Bar.
+cust_lbl_cats=Cate&gories:
+cust_lbl_cmds=Comman&ds:
+cust_lbl_tlbs=Toolb&ars:
+; Options Tab
+cust_lbl_pmt=Personalized Menus and Toolbars
+cust_chk_fullmenus=Always show full menus
+cust_chk_delay=Show full menus after a short delay
+cust_btn_resetusage=&Reset my usage data
+cust_lbl_other=Other:
+cust_chk_showst=Show Screen&Tips on Toolbars
+cust_chk_showsk=Show &Shortcut Keys in ScreenTips
+cust_lbl_menuan=Menu Animation:
+cust_cbo_none=(None)
+cust_cbo_system=System Default
+cust_cbo_random=Random
+cust_cbo_unfold=Unfold
+cust_cbo_slide=Slide
+cust_cbo_fade=Fade
+cust_msg_delete=Are you sure you want to delete the <barname> toolbar?
+
+; CustomizeItem string
+cust_mnu_addremove=&Add or Remove Buttons
+cust_mnu_reset=Reset Bar
+cust_mnu_cust=Customize...
+cust_mnu_tooltip=Bar Options
+
+; New Toolbar Window
+barname_caption=New Toolbar
+barrename_caption=Rename Toolbar
+barname_name=&Toolbar Name:
+barname_ok=OK
+barname_cancel=Cancel
+barname_msginvalidname=Toolbar name cannot be empty.
+
+; MDI System Item Tooltip Text
+mdisystt_minimize=Minimize
+mdisystt_restore=Restore
+mdisystt_close=Close
+mdisysmenu_restore=Restore
+mdisysmenu_move=Move
+mdisysmenu_size=Size
+mdisysmenu_minimize=Minimize
+mdisysmenu_maximize=Maximize
+mdisysmenu_close=Close
+mdisysmenu_next=Next
+
+; Bar system buttons text
+barsys_autohide_tooltip=Auto-Hide
+barsys_customize_tooltip=Customize
+barsys_close_tooltip=Close
+
+; Additional strings
+sys_morebuttons=More Buttons
+sys_custombar=Custom Bar
+
+; Navigation Bar Strings
+navbar_showmorebuttons=Show &More Buttons
+navbar_showfewerbuttons=Show &Fewer Buttons
+navbar_navpaneoptions=Na&vigation Pane Options...
+
+; Navigation Pane String
+navPaneCollapseTooltip=Collapse the Navigation Pane
+navPaneExpandTooltip=Expand the Navigation Pane
+
+; Color Picker Strings
+colorpicker_themecolorslabel=Theme Colors
+colorpicker_standardcolorslabel=Standard Colors
+colorpicker_morecolors=&More Colors...
+; Color Picker Dialog String
+colorpickerdialog_caption=Colors
+colorpickerdialog_okbutton=OK
+colorpickerdialog_cancelbutton=Cancel
+colorpickerdialog_newcolorlabel=New
+colorpickerdialog_currentcolorlabel=Current
+colorpickerdialog_standardcolorslabel= Colors:
+colorpickerdialog_customcolorslabel= Colors:
+colorpickerdialog_greenlabel=&Green:
+colorpickerdialog_bluelabel=&Blue:
+colorpickerdialog_redlabel=&Red:
+colorpickerdialog_tabstandard=Standard
+colorpickerdialog_tabcustom=Custom
diff --git a/PROMS/DotNetBar Source Code/Strings_de.resources b/PROMS/DotNetBar Source Code/Strings_de.resources
new file mode 100644
index 00000000..ddbc3477
Binary files /dev/null and b/PROMS/DotNetBar Source Code/Strings_de.resources differ
diff --git a/PROMS/DotNetBar Source Code/Strings_es.resources b/PROMS/DotNetBar Source Code/Strings_es.resources
new file mode 100644
index 00000000..31ef1a4a
Binary files /dev/null and b/PROMS/DotNetBar Source Code/Strings_es.resources differ
diff --git a/PROMS/DotNetBar Source Code/Strings_fr.resources b/PROMS/DotNetBar Source Code/Strings_fr.resources
new file mode 100644
index 00000000..7b4e59a1
Binary files /dev/null and b/PROMS/DotNetBar Source Code/Strings_fr.resources differ
diff --git a/PROMS/DotNetBar Source Code/Strings_it.resources b/PROMS/DotNetBar Source Code/Strings_it.resources
new file mode 100644
index 00000000..912cb500
Binary files /dev/null and b/PROMS/DotNetBar Source Code/Strings_it.resources differ
diff --git a/PROMS/DotNetBar Source Code/Strings_ja.resources b/PROMS/DotNetBar Source Code/Strings_ja.resources
new file mode 100644
index 00000000..86122d43
Binary files /dev/null and b/PROMS/DotNetBar Source Code/Strings_ja.resources differ
diff --git a/PROMS/DotNetBar Source Code/Strings_ko.resources b/PROMS/DotNetBar Source Code/Strings_ko.resources
new file mode 100644
index 00000000..53d3497d
Binary files /dev/null and b/PROMS/DotNetBar Source Code/Strings_ko.resources differ
diff --git a/PROMS/DotNetBar Source Code/Strings_sv.resources b/PROMS/DotNetBar Source Code/Strings_sv.resources
new file mode 100644
index 00000000..f1536302
Binary files /dev/null and b/PROMS/DotNetBar Source Code/Strings_sv.resources differ
diff --git a/PROMS/DotNetBar Source Code/Strings_zh-chs.resources b/PROMS/DotNetBar Source Code/Strings_zh-chs.resources
new file mode 100644
index 00000000..ae851875
Binary files /dev/null and b/PROMS/DotNetBar Source Code/Strings_zh-chs.resources differ
diff --git a/PROMS/DotNetBar Source Code/Strings_zh-cht.resources b/PROMS/DotNetBar Source Code/Strings_zh-cht.resources
new file mode 100644
index 00000000..de5b5ecb
Binary files /dev/null and b/PROMS/DotNetBar Source Code/Strings_zh-cht.resources differ
diff --git a/PROMS/DotNetBar Source Code/StyleManager.cs b/PROMS/DotNetBar Source Code/StyleManager.cs
new file mode 100644
index 00000000..7c098298
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/StyleManager.cs	
@@ -0,0 +1,886 @@
+using System;
+using System.Text;
+using System.ComponentModel;
+using System.Windows.Forms;
+using System.Collections;
+using System.Reflection;
+using System.Drawing;
+using DevComponents.DotNetBar.Rendering;
+using System.Threading;
+using System.Collections.Generic;
+
+namespace DevComponents.DotNetBar
+{
+    [ToolboxBitmap(typeof(StyleManager), "StyleManager.ico"), ToolboxItem(true)]
+    public class StyleManager : Component
+    {
+        #region Constructor
+        static StyleManager()
+        {
+            StyleManager._ReadWriteClientsListLock = new ReaderWriterLock();
+            StyleManager._ReadWriteAmbientListLock = new ReaderWriterLock();
+        }
+        /// <summary>
+        /// Initializes a new instance of the StyleManager class.
+        /// </summary>
+        public StyleManager()
+        {
+
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the StyleManager class with the specified container.
+        /// </summary>
+        /// <param name="container">An IContainer that represents the container for the command.</param>
+        public StyleManager(IContainer container)
+            : this()
+        {
+            container.Add(this);
+        }
+        #endregion
+
+        #region Implementation
+        /// <summary>
+        /// Updates Ambient colors for control and its child controls.
+        /// </summary>
+        /// <param name="control"></param>
+        internal static void UpdateMetroAmbientColors(Control control)
+        {
+            DevComponents.DotNetBar.Metro.ColorTables.MetroColorTable colorTable = DevComponents.DotNetBar.Metro.Rendering.MetroRender.GetColorTable();
+            UpdateAmbientProperties(control, colorTable);
+        }
+        private static void UpdateAmbientProperties(Control item, DevComponents.DotNetBar.Metro.ColorTables.MetroColorTable colorTable)
+        {
+            Color backColor = Color.Empty;
+            Color foreColor = Color.Empty;
+            eAmbientSettings ambientSettings = GetAmbientSettings(item);
+
+            if (ambientSettings != eAmbientSettings.None)
+            {
+                if (item is DevComponents.DotNetBar.Controls.PageSliderPage)
+                {
+                    if ((ambientSettings & eAmbientSettings.BackColor) == eAmbientSettings.BackColor)
+                        item.BackColor = colorTable.CanvasColor;
+                    if ((ambientSettings & eAmbientSettings.ForeColor) == eAmbientSettings.ForeColor)
+                        item.ForeColor = colorTable.ForeColor;
+                }
+                else if (item is Panel)
+                {
+                    if (ShouldUpdateAmbientPanel((Panel)item))
+                    {
+                        if (item.BackColor != Color.Transparent && (ambientSettings & eAmbientSettings.BackColor) == eAmbientSettings.BackColor)
+                            item.BackColor = colorTable.CanvasColorShadeLight;
+                        if ((ambientSettings & eAmbientSettings.ForeColor) == eAmbientSettings.ForeColor)
+                            item.ForeColor = colorTable.ForeColor;
+
+                        if (item is DevComponents.DotNetBar.Controls.GroupPanel)
+                        {
+                            if ((ambientSettings & eAmbientSettings.BackColor) == eAmbientSettings.BackColor)
+                            {
+                                ((DevComponents.DotNetBar.Controls.GroupPanel)item).CanvasColor = colorTable.CanvasColor;
+                                ((DevComponents.DotNetBar.Controls.GroupPanel)item).BackColor = colorTable.CanvasColor;
+                            }
+                        }
+                    }
+                }
+                else if (item is AdvTree.AdvTree || item is DevComponents.DotNetBar.Controls.ComboTree)
+                {
+                    AdvTree.AdvTree tree = null;
+                    if (item is AdvTree.AdvTree)
+                        tree = (AdvTree.AdvTree)item;
+                    else
+                    {
+                        if (item.BackColor != Color.Transparent && (ambientSettings & eAmbientSettings.BackColor) == eAmbientSettings.BackColor)
+                            item.BackColor = colorTable.EditControlBackColor;
+                        if ((ambientSettings & eAmbientSettings.ForeColor) == eAmbientSettings.ForeColor)
+                            item.ForeColor = colorTable.ForeColor;
+                        tree = ((DevComponents.DotNetBar.Controls.ComboTree)item).AdvTree;
+                    }
+                    if (tree.BackColor != Color.Transparent && (ambientSettings & eAmbientSettings.BackColor) == eAmbientSettings.BackColor)
+                        tree.BackColor = colorTable.EditControlBackColor;
+                    if ((ambientSettings & eAmbientSettings.ForeColor) == eAmbientSettings.ForeColor)
+                    {
+                        tree.ForeColor = colorTable.ForeColor;
+                        if (tree.NodeStyle != null && tree.NodeStyle.BackColor.IsEmpty && !tree.NodeStyle.TextColor.IsEmpty)
+                            tree.NodeStyle.TextColor = colorTable.ForeColor;
+                        if (tree.CellStyleDefault != null && tree.CellStyleDefault.BackColor.IsEmpty && !tree.CellStyleDefault.TextColor.IsEmpty)
+                            tree.CellStyleDefault.TextColor = colorTable.ForeColor;
+                        if (tree.NodesConnector != null)
+                            tree.NodesConnector.LineColor = colorTable.MetroPartColors.TextInactiveColor;
+                    }
+                }
+                else if (item is DevComponents.DotNetBar.Controls.TextBoxX)
+                {
+                    if (item.BackColor != Color.Transparent && (ambientSettings & eAmbientSettings.BackColor) == eAmbientSettings.BackColor)
+                    {
+                        item.BackColor = colorTable.EditControlBackColor;
+                        if(((DevComponents.DotNetBar.Controls.TextBoxX)item).DisabledBackColor.IsEmpty)
+                            ((DevComponents.DotNetBar.Controls.TextBoxX)item).DisabledBackColor = colorTable.EditControlBackColor;
+                    }
+                    if ((ambientSettings & eAmbientSettings.ForeColor) == eAmbientSettings.ForeColor)
+                        item.ForeColor = colorTable.ForeColor;
+                }
+                else if (item is DevComponents.DotNetBar.Controls.MaskedTextBoxAdv)
+                {
+                    if (item.BackColor != Color.Transparent && (ambientSettings & eAmbientSettings.BackColor) == eAmbientSettings.BackColor)
+                    {
+                        item.BackColor = colorTable.EditControlBackColor;
+                        if (((DevComponents.DotNetBar.Controls.MaskedTextBoxAdv)item).DisabledBackColor.IsEmpty)
+                            ((DevComponents.DotNetBar.Controls.MaskedTextBoxAdv)item).DisabledBackColor = colorTable.EditControlBackColor;
+                    }
+                    if ((ambientSettings & eAmbientSettings.ForeColor) == eAmbientSettings.ForeColor)
+                        item.ForeColor = colorTable.ForeColor;
+                }
+                else if (IsEditControl(item))
+                {
+                    if (item.BackColor != Color.Transparent && (ambientSettings & eAmbientSettings.BackColor) == eAmbientSettings.BackColor)
+                        item.BackColor = colorTable.EditControlBackColor;
+                    if ((ambientSettings & eAmbientSettings.ForeColor) == eAmbientSettings.ForeColor)
+                        item.ForeColor = colorTable.ForeColor;
+                }
+                else if (!(item is Bar || item is DevComponents.DotNetBar.Controls.SideNav))
+                {
+                    if (item.BackColor != Color.Transparent && (ambientSettings & eAmbientSettings.BackColor) == eAmbientSettings.BackColor)
+                    {
+                        if (item is RibbonForm)
+                        {
+                            RibbonForm form = (RibbonForm)item;
+                            if (!form.BackColorSet)
+                            {
+                                form.BackColor = colorTable.CanvasColor;
+                                form.BackColorSet = false;
+                            }
+                        }
+                        else item.BackColor = colorTable.CanvasColor;
+                        
+                    }
+                    if ((ambientSettings & eAmbientSettings.ForeColor) == eAmbientSettings.ForeColor)
+                        item.ForeColor = colorTable.ForeColor;
+                }
+                backColor = item.BackColor;
+                foreColor = item.ForeColor;
+            }
+            if ((ambientSettings & eAmbientSettings.ChildControls) == eAmbientSettings.ChildControls)
+            {
+                foreach (Control child in item.Controls)
+                {
+                    UpdateAmbientProperties(child, colorTable);
+                }
+            }
+        }
+        private static bool IsEditControl(Control item)
+        {
+            return item is TextBox || item is TreeView || item is ListView || item is DevComponents.Editors.VisualControlBase ||
+                item is DevComponents.DotNetBar.Controls.ComboBoxEx || item is MaskedTextBox || item is DevComponents.DotNetBar.Controls.MaskedTextBoxAdv ||
+                item is RichTextBox || item is DevComponents.DotNetBar.Controls.RichTextBoxEx || item is DevComponents.DotNetBar.Controls.TextBoxDropDown;
+                
+        }
+        private static bool ShouldUpdateAmbientPanel(Panel item)
+        {
+            return !(item is DevComponents.DotNetBar.Metro.MetroTabPanel || item is DevComponents.DotNetBar.Controls.SideNavPanel);
+        }
+        private static bool ShouldUpdateAmbientProperties(Control item)
+        {
+            return !(item is ButtonX);
+        }
+        private static eAmbientSettings GetAmbientSettings(Control control)
+        {
+            if (control is ButtonX || control is ScrollBarAdv) return eAmbientSettings.None;
+
+            foreach (WeakReference item in _RegisteredAmbients)
+            {
+                if (item.IsAlive)
+                {
+                    StyleManagerAmbient ambientProvider = (StyleManagerAmbient)item.Target;
+                    if (ambientProvider.Contains(control))
+                        return ambientProvider.GetEnableAmbientSettings(control);
+                }
+            }
+
+            return eAmbientSettings.All;
+        }
+
+        /// <summary>
+        /// Updates ambient colors for the control and its children.
+        /// </summary>
+        /// <param name="c"></param>
+        public static void UpdateAmbientColors(Control c)
+        {
+            if (StyleManager.IsMetro(StyleManager.Style))
+            {
+                UpdateMetroAmbientColors(c);
+            }
+            else if (StyleManager.IsMetro(StyleManager.PreviousStyle))
+            {
+                eAmbientSettings ambientSettings = GetAmbientSettings(c);
+                if ((ambientSettings & eAmbientSettings.BackColor) == eAmbientSettings.BackColor)
+                    c.ResetBackColor();// = SystemColors.Control;
+                if ((ambientSettings & eAmbientSettings.ForeColor) == eAmbientSettings.ForeColor)
+                    c.ResetForeColor(); // = SystemColors.ControlText;
+            }
+        }
+        private static DevComponents.DotNetBar.Metro.ColorTables.MetroColorTable GetMetroColorTable()
+        {
+            return DevComponents.DotNetBar.Metro.Rendering.MetroRender.GetColorTable();
+        }
+
+        /// <summary>
+        /// Gets or sets the global style for the controls that have Style=ManagerControlled.
+        /// </summary>
+        [DefaultValue(eDotNetBarStyle.Office2007), Category("Appearance"), Description("Indicates global style for the controls that have Style=ManagerControlled.")]
+        public eStyle ManagerStyle
+        {
+            get { return StyleManager.Style; }
+            set
+            {
+                StyleManager.Style = value;
+            }
+        }
+        /// <summary>
+        /// Gets or sets the color current style is tinted with.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates color current style is tinted with.")]
+        public Color ManagerColorTint
+        {
+            get { return StyleManager.ColorTint; }
+            set { StyleManager.ColorTint = value; }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized by WinForms designer.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeManagerColorTint()
+        {
+            return !ManagerColorTint.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetManagerColorTint()
+        {
+            ManagerColorTint = Color.Empty;
+        }
+
+        private static eStyle _PreviousStyle = eStyle.Office2007Blue;
+        /// <summary>
+        /// Gets previous effective style.
+        /// </summary>
+        public static eStyle PreviousStyle
+        {
+            get
+            {
+                return _PreviousStyle;
+            }
+        }
+
+        //private Form _StyleContextForm = null;
+        ///// <summary>
+        ///// Gets or sets the context form for the style that is set on the style manager. Setting the context form will cause all controls on the form and form itself
+        ///// to use style and color scheme that is set on this instance of StyleManager instead of global style and color scheme.
+        ///// </summary>
+        //[DefaultValue(null), Category("Behavior"), Description("Indicates context form for the style that is set on the style manager. Setting the context form will cause all controls on the form and form itself to use style and color scheme that is set on this instance of StyleManager instead of global style and color scheme.")]
+        //public Form StyleContextForm
+        //{
+        //    get { return _StyleContextForm; }
+        //    set 
+        //    {
+        //        if (_StyleContextForm != null)
+        //        {
+        //            UnregisterContextForm(_StyleContextForm);
+        //            _StyleContextForm = value;
+        //            if (_StyleContextForm != null)
+        //                RegisterContextForm(_StyleContextForm);
+        //        }
+        //    }
+        //}
+
+        //private DevComponents.DotNetBar.Metro.ColorTables.MetroColorGeneratorParameters _MetroColorParameters = DevComponents.DotNetBar.Metro.ColorTables.MetroColorGeneratorParameters.Default;
+        /// <summary>
+        /// Gets or sets color generation parameters for Metro color generator. 
+        /// </summary>
+        [Editor("DevComponents.DotNetBar.Design.Metro.MetroColorThemeEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor))]
+        public DevComponents.DotNetBar.Metro.ColorTables.MetroColorGeneratorParameters MetroColorParameters
+        {
+            get { return MetroColorGeneratorParameters; }
+            set
+            {
+                MetroColorGeneratorParameters = value;
+            }
+        }
+
+        private static DevComponents.DotNetBar.Metro.ColorTables.MetroColorGeneratorParameters _MetroColorGeneratorParameters = DevComponents.DotNetBar.Metro.ColorTables.MetroColorGeneratorParameters.Default;
+        /// <summary>
+        /// Gets or sets color generation parameters for Metro color generator. 
+        /// </summary>
+        public static DevComponents.DotNetBar.Metro.ColorTables.MetroColorGeneratorParameters MetroColorGeneratorParameters
+        {
+            get { return _MetroColorGeneratorParameters; }
+            set
+            {
+                _MetroColorGeneratorParameters = value;
+                if (_Style == eStyle.Metro || _Style  == eStyle.OfficeMobile2014 || _Style == eStyle.Office2016 || _Style == eStyle.VisualStudio2012Dark || _Style == eStyle.VisualStudio2012Light)
+                {
+                    OnStyleChanged(eStyle.Metro, eStyle.Metro);
+                }
+            }
+        }
+
+        private static eStyle _Style = eStyle.Office2007Blue;
+        /// <summary>
+        /// Gets or sets the current visual style.
+        /// </summary>
+        public static eStyle Style
+        {
+            get
+            {
+                return _Style;
+            }
+            set
+            {
+                eStyle oldValue = _Style;
+                _Style = value;
+                _EffectiveStyle = DotNetBarStyleFromStyle(value);
+                if (_Style == eStyle.VisualStudio2012Light)
+                    _MetroColorGeneratorParameters = DevComponents.DotNetBar.Metro.ColorTables.MetroColorGeneratorParameters.VisualStudio2012Light;
+                else if(_Style == eStyle.VisualStudio2012Dark)
+                    _MetroColorGeneratorParameters = DevComponents.DotNetBar.Metro.ColorTables.MetroColorGeneratorParameters.VisualStudio2012Dark;
+                else if (_Style == eStyle.OfficeMobile2014)
+                    _MetroColorGeneratorParameters = new DevComponents.DotNetBar.Metro.ColorTables.MetroColorGeneratorParameters(Color.White, ColorScheme.GetColor(0xB7472A));
+                else if (_Style == eStyle.Office2016)
+                    _MetroColorGeneratorParameters = DevComponents.DotNetBar.Metro.ColorTables.MetroColorGeneratorParameters.Office2016Blue;
+                if (oldValue != _Style)
+                    _PreviousStyle = oldValue;
+
+                OnStyleChanged(oldValue, value);
+            }
+        }
+
+        private static eDotNetBarStyle DotNetBarStyleFromStyle(eStyle value)
+        {
+            if (value == eStyle.Windows7Blue)
+                return eDotNetBarStyle.Windows7;
+            else if (value == eStyle.Office2010Silver || value == eStyle.Office2010Blue || value == eStyle.Office2010Black || value == eStyle.VisualStudio2010Blue)
+                return eDotNetBarStyle.Office2010;
+            else if (value == eStyle.Metro || StyleManager.IsVisualStudio2012(value) || value == eStyle.OfficeMobile2014 || value == eStyle.Office2016)
+                return eDotNetBarStyle.Metro;
+
+            return eDotNetBarStyle.Office2007;
+        }
+        private static eDotNetBarStyle _EffectiveStyle = eDotNetBarStyle.Office2007;
+        public static eDotNetBarStyle GetEffectiveStyle()
+        {
+            return _EffectiveStyle;
+        }
+
+        private static Color _ColorTint = Color.Empty;
+        /// <summary>
+        /// Gets or sets the color tint that is applied to current Office 2007, Office 2010 or Windows 7 color table.
+        /// Default value is Color.Empty which indicates that no color blending is performed.
+        /// </summary>
+        public static Color ColorTint
+        {
+            get
+            {
+                return _ColorTint;
+            }
+            set
+            {
+                Color oldValue = _ColorTint;
+                _ColorTint = value;
+                OnColorTintChanged(oldValue, value);
+            }
+        }
+
+        /// <summary>
+        /// Changes the StyleManager style and color tint in one step. Use this method if you need to change style and color tint simultaneously in single step for better performance.
+        /// </summary>
+        /// <param name="newStyle">New style.</param>
+        /// <param name="colorTint">Color tint for the style.</param>
+        public static void ChangeStyle(eStyle newStyle, Color colorTint)
+        {
+            _ColorTint = colorTint;
+            Style = newStyle;
+        }
+
+        private static void OnColorTintChanged(Color oldValue, Color newValue)
+        {
+            ChangeColorTable(_Style, true);
+            NotifyOnStyleChange();
+#if FRAMEWORK20
+            foreach (Form form in Application.OpenForms)
+            {
+                if (form.InvokeRequired)
+                {
+                    if (form is OfficeForm)
+                        form.Invoke(new
+                                MethodInvoker(delegate() { ((OfficeForm)form).InvalidateNonClient(true); }));
+
+                    form.Invoke(new
+                                MethodInvoker(delegate() { form.Invalidate(true); }));
+                }
+                else
+                {
+                    if (form is OfficeForm)
+                        ((OfficeForm)form).InvalidateNonClient(true);
+                    form.Invalidate(true);
+                }
+            }
+#else
+            WeakReference[] references = new WeakReference[_RegisteredControls.Count];
+            _RegisteredControls.CopyTo(references);
+            foreach (WeakReference reference in references)
+            {
+                Control target = reference.Target as Control;
+                if (reference.IsAlive)
+                {
+                    if (target != null)
+                    {
+                        target.Invalidate(true);
+                    }
+                }
+            }
+#endif
+        }
+
+        private static void ChangeColorTable(eStyle style)
+        {
+            ChangeColorTable(style, false);
+        }
+
+        private static void ChangeColorTable(eStyle style, bool colorBlendChanged)
+        {
+            if (style == eStyle.Office2010Silver)
+            {
+                // Ensure that proper color table is selected.
+                if (GlobalManager.Renderer is Office2007Renderer)
+                {
+                    Office2007Renderer renderer = (Office2007Renderer)GlobalManager.Renderer;
+                    if (colorBlendChanged || !(renderer.ColorTable is Office2010ColorTable) ||
+                        renderer.ColorTable is Office2010ColorTable && ((Office2010ColorTable)renderer.ColorTable).ColorScheme != eOffice2010ColorScheme.Silver)
+                    {
+                        ((Office2007Renderer)GlobalManager.Renderer).ColorTable = new Office2010ColorTable(eOffice2010ColorScheme.Silver, _ColorTint);
+                    }
+                }
+            }
+            else if (style == eStyle.Office2010Blue)
+            {
+                // Ensure that proper color table is selected.
+                if (GlobalManager.Renderer is Office2007Renderer)
+                {
+                    Office2007Renderer renderer = (Office2007Renderer)GlobalManager.Renderer;
+                    if (colorBlendChanged || !(renderer.ColorTable is Office2010ColorTable) ||
+                        renderer.ColorTable is Office2010ColorTable && ((Office2010ColorTable)renderer.ColorTable).ColorScheme != eOffice2010ColorScheme.Blue)
+                    {
+                        ((Office2007Renderer)GlobalManager.Renderer).ColorTable = new Office2010ColorTable(eOffice2010ColorScheme.Blue, _ColorTint);
+                    }
+                }
+            }
+            else if (style == eStyle.Office2010Black)
+            {
+                // Ensure that proper color table is selected.
+                if (GlobalManager.Renderer is Office2007Renderer)
+                {
+                    Office2007Renderer renderer = (Office2007Renderer)GlobalManager.Renderer;
+                    if (colorBlendChanged || !(renderer.ColorTable is Office2010ColorTable) ||
+                        renderer.ColorTable is Office2010ColorTable && ((Office2010ColorTable)renderer.ColorTable).ColorScheme != eOffice2010ColorScheme.Black)
+                    {
+                        ((Office2007Renderer)GlobalManager.Renderer).ColorTable = new Office2010ColorTable(eOffice2010ColorScheme.Black, _ColorTint);
+                    }
+                }
+            }
+            else if (style == eStyle.VisualStudio2010Blue)
+            {
+                // Ensure that proper color table is selected.
+                if (GlobalManager.Renderer is Office2007Renderer)
+                {
+                    Office2007Renderer renderer = (Office2007Renderer)GlobalManager.Renderer;
+                    if (colorBlendChanged || !(renderer.ColorTable is Office2010ColorTable) ||
+                        renderer.ColorTable is Office2010ColorTable && ((Office2010ColorTable)renderer.ColorTable).ColorScheme != eOffice2010ColorScheme.VS2010)
+                    {
+                        ((Office2007Renderer)GlobalManager.Renderer).ColorTable = new Office2010ColorTable(eOffice2010ColorScheme.VS2010, _ColorTint);
+                    }
+                }
+            }
+            else if (style == eStyle.Windows7Blue)
+            {
+                // Ensure that proper color table is selected.
+                if (GlobalManager.Renderer is Office2007Renderer)
+                {
+                    if (colorBlendChanged || !(((Office2007Renderer)GlobalManager.Renderer).ColorTable is Windows7ColorTable))
+                    {
+                        ((Office2007Renderer)GlobalManager.Renderer).ColorTable = new Windows7ColorTable(eWindows7ColorScheme.Blue, _ColorTint);
+                    }
+
+                }
+            }
+            else if (style == eStyle.Office2007Blue || style == eStyle.Office2007Silver || style == eStyle.Office2007Black || style == eStyle.Office2007VistaGlass)
+            {
+                // Ensure that proper color table is selected.
+                if (GlobalManager.Renderer is Office2007Renderer)
+                {
+                    if (colorBlendChanged || (((Office2007Renderer)GlobalManager.Renderer).ColorTable is Office2010ColorTable) ||
+                        (((Office2007Renderer)GlobalManager.Renderer).ColorTable is Windows7ColorTable) ||
+                        (((Office2007Renderer)GlobalManager.Renderer).ColorTable.InitialColorScheme != ColorSchemeFromStyle(style)) || _PreviousStyle != style)
+                    {
+                        ((Office2007Renderer)GlobalManager.Renderer).ColorTable = new Office2007ColorTable(ColorSchemeFromStyle(style), _ColorTint);
+                    }
+
+                }
+            }
+            else if (style == eStyle.Metro || style == eStyle.OfficeMobile2014 || style == eStyle.Office2016)
+            {
+                DevComponents.DotNetBar.Metro.Rendering.MetroRender.UpdateColorTable(_MetroColorGeneratorParameters);
+            }
+            else if (style == eStyle.VisualStudio2012Light)
+            {
+                DevComponents.DotNetBar.Metro.Rendering.MetroRender.UpdateColorTable(DevComponents.DotNetBar.Metro.ColorTables.MetroColorGeneratorParameters.VisualStudio2012Light);
+            }
+            else if (style == eStyle.VisualStudio2012Dark)
+            {
+                DevComponents.DotNetBar.Metro.Rendering.MetroRender.UpdateColorTable(DevComponents.DotNetBar.Metro.ColorTables.MetroColorGeneratorParameters.VisualStudio2012Dark);
+            }
+        }
+
+        private static eOffice2007ColorScheme ColorSchemeFromStyle(eStyle style)
+        {
+            eOffice2007ColorScheme colorScheme = eOffice2007ColorScheme.Blue;
+            if (style == eStyle.Office2007Silver)
+                colorScheme = eOffice2007ColorScheme.Silver;
+            else if (style == eStyle.Office2007Black)
+                colorScheme = eOffice2007ColorScheme.Black;
+            else if (style == eStyle.Office2007VistaGlass)
+                colorScheme = eOffice2007ColorScheme.VistaGlass;
+            return colorScheme;
+        }
+
+        private static void NotifyOnStyleChange()
+        {
+            WeakReference[] references;
+            StyleManager._ReadWriteClientsListLock.AcquireReaderLock(-1);
+            try
+            {
+                references = new WeakReference[_RegisteredControls.Count];
+                _RegisteredControls.CopyTo(references);
+            }
+            finally
+            {
+                StyleManager._ReadWriteClientsListLock.ReleaseReaderLock();
+            }
+
+            foreach (WeakReference reference in references)
+            {
+                object target = reference.Target;
+                if (reference.IsAlive)
+                {
+                    if (target != null)
+                    {
+                        Control control = target as Control;
+#if FRAMEWORK20
+                        if (control != null && control.InvokeRequired)
+                        {
+                            control.Invoke(new
+                                MethodInvoker(delegate() { InvokeStyleManagerStyleChanged(target, _EffectiveStyle); }));
+                            if (BarFunctions.IsHandleValid(control))
+                                control.Invoke(new
+                                    MethodInvoker(delegate() { control.Invalidate(true); }));
+                        }
+                        else
+#endif
+                        {
+                            InvokeStyleManagerStyleChanged(target, _EffectiveStyle);
+                            if (control != null && BarFunctions.IsHandleValid(control))
+                                control.Invalidate(true);
+                        }
+                    }
+                }
+            }
+        }
+        private static void OnStyleChanged(eStyle oldValue, eStyle newValue)
+        {
+            ChangeColorTable(newValue, !_ColorTint.IsEmpty);
+            NotifyOnStyleChange();
+        }
+
+        private static void InvokeStyleManagerStyleChanged(object target, eDotNetBarStyle newStyle)
+        {
+            if (target == null) return;
+            try
+            {
+                MethodInfo mi = target.GetType().GetMethod("StyleManagerStyleChanged");
+                if (mi != null)
+                {
+                    mi.Invoke(target, new object[] { newStyle });
+                }
+            }
+            catch { } // target is part of generics with undeclared type and other possibilities...  we don't care if it fails on borderline cases
+        }
+
+        private static ReaderWriterLock _ReadWriteClientsListLock;
+        private static ArrayList _RegisteredControls = new ArrayList();
+        /// <summary>
+        /// Registers control with the StyleManager so control can be notified of global style changes.
+        /// </summary>
+        /// <param name="control">Control to register with the StyleManager.</param>
+        public static void Register(Control control)
+        {
+            if (GetControlReference(control) == null)
+            {
+                WeakReference reference = new WeakReference(control);
+                reference.Target = control;
+
+                LockCookie cookie1 = new LockCookie();
+                bool readerLockHeld = StyleManager._ReadWriteClientsListLock.IsReaderLockHeld;
+                if (readerLockHeld)
+                {
+                    cookie1 = StyleManager._ReadWriteClientsListLock.UpgradeToWriterLock(-1);
+                }
+                else
+                {
+                    StyleManager._ReadWriteClientsListLock.AcquireWriterLock(-1);
+                }
+                try
+                {
+                    _RegisteredControls.Add(reference);
+                }
+                finally
+                {
+                    if (readerLockHeld)
+                    {
+                        StyleManager._ReadWriteClientsListLock.DowngradeFromWriterLock(ref cookie1);
+                    }
+                    else
+                    {
+                        StyleManager._ReadWriteClientsListLock.ReleaseWriterLock();
+                    }
+                }
+
+                if (StyleManager.IsMetro(_Style) && ShouldUpdateAmbientProperties(control))
+                    UpdateAmbientColors(control);
+
+                control = null;
+            }
+        }
+
+        private static WeakReference GetControlReference(Control control)
+        {
+            ArrayList registeredControls = _RegisteredControls;
+            if (registeredControls == null) return null;
+
+            StyleManager._ReadWriteClientsListLock.AcquireReaderLock(-1);
+            try
+            {
+                foreach (WeakReference item in registeredControls)
+                {
+                    object target = item.Target;
+                    if (target != null && target.Equals(control))
+                        return item;
+                }
+            }
+            finally
+            {
+                StyleManager._ReadWriteClientsListLock.ReleaseReaderLock();
+            }
+            return null;
+        }
+        /// <summary>
+        /// Unregister the control from StyleManager notifications.
+        /// </summary>
+        /// <param name="control">Control that was registered through Register method.</param>
+        public static void Unregister(Control control)
+        {
+            LockCookie cookie1 = new LockCookie();
+            bool readerLockHeld = StyleManager._ReadWriteClientsListLock.IsReaderLockHeld;
+            if (readerLockHeld)
+            {
+                cookie1 = StyleManager._ReadWriteClientsListLock.UpgradeToWriterLock(-1);
+            }
+            else
+            {
+                StyleManager._ReadWriteClientsListLock.AcquireWriterLock(-1);
+            }
+            try
+            {
+                ArrayList removeList = new ArrayList();
+                foreach (WeakReference item in _RegisteredControls)
+                {
+                    object target = item.Target;
+
+                    if (target != null && target.Equals(control))
+                    {
+                        removeList.Add(item);
+                        //_RegisteredControls.Remove(item);
+                        //break;
+                    }
+                    else if (target == null)
+                        removeList.Add(item);
+                }
+                foreach (WeakReference item in removeList)
+                {
+                    _RegisteredControls.Remove(item);
+                }
+            }
+            finally
+            {
+                if (readerLockHeld)
+                {
+                    StyleManager._ReadWriteClientsListLock.DowngradeFromWriterLock(ref cookie1);
+                }
+                else
+                {
+                    StyleManager._ReadWriteClientsListLock.ReleaseWriterLock();
+                }
+            }
+        }
+        private static ArrayList _RegisteredAmbients = new ArrayList();
+        private static ReaderWriterLock _ReadWriteAmbientListLock;
+        internal static void RegisterAmbientManager(StyleManagerAmbient ambientProvider)
+        {
+            if (GetAmbientReference(ambientProvider) == null)
+            {
+                WeakReference reference = new WeakReference(ambientProvider);
+
+                LockCookie cookie1 = new LockCookie();
+                bool readerLockHeld = StyleManager._ReadWriteAmbientListLock.IsReaderLockHeld;
+                if (readerLockHeld)
+                {
+                    cookie1 = StyleManager._ReadWriteAmbientListLock.UpgradeToWriterLock(-1);
+                }
+                else
+                {
+                    StyleManager._ReadWriteAmbientListLock.AcquireWriterLock(-1);
+                }
+                try
+                {
+                    _RegisteredAmbients.Add(reference);
+                }
+                finally
+                {
+                    if (readerLockHeld)
+                    {
+                        StyleManager._ReadWriteAmbientListLock.DowngradeFromWriterLock(ref cookie1);
+                    }
+                    else
+                    {
+                        StyleManager._ReadWriteAmbientListLock.ReleaseWriterLock();
+                    }
+                }
+                ambientProvider = null;
+            }
+        }
+        internal static void UnregisterAmbientManager(StyleManagerAmbient ambientProvider)
+        {
+            LockCookie cookie1 = new LockCookie();
+            bool readerLockHeld = StyleManager._ReadWriteAmbientListLock.IsReaderLockHeld;
+            if (readerLockHeld)
+            {
+                cookie1 = StyleManager._ReadWriteAmbientListLock.UpgradeToWriterLock(-1);
+            }
+            else
+            {
+                StyleManager._ReadWriteAmbientListLock.AcquireWriterLock(-1);
+            }
+            try
+            {
+
+                foreach (WeakReference item in _RegisteredAmbients)
+                {
+                    object target = item.Target;
+                    if (target != null && target.Equals(ambientProvider))
+                    {
+                        _RegisteredControls.Remove(item);
+                        break;
+                    }
+                }
+            }
+            finally
+            {
+                if (readerLockHeld)
+                {
+                    StyleManager._ReadWriteAmbientListLock.DowngradeFromWriterLock(ref cookie1);
+                }
+                else
+                {
+                    StyleManager._ReadWriteAmbientListLock.ReleaseWriterLock();
+                }
+            }
+        }
+        private static WeakReference GetAmbientReference(StyleManagerAmbient ambientProvider)
+        {
+            ArrayList registeredAmbients = _RegisteredAmbients;
+            if (registeredAmbients == null) return null;
+
+            StyleManager._ReadWriteAmbientListLock.AcquireReaderLock(-1);
+            try
+            {
+                foreach (WeakReference item in registeredAmbients)
+                {
+                    object target = item.Target;
+                    if (target != null && target.Equals(ambientProvider))
+                        return item;
+                }
+            }
+            finally
+            {
+                StyleManager._ReadWriteAmbientListLock.ReleaseReaderLock();
+            }
+            return null;
+        }
+
+        /// <summary>
+        /// Returns whether style is a Metro type style.
+        /// </summary>
+        /// <param name="style">style to test.</param>
+        /// <returns>true if Metro type style otherwise false.</returns>
+        public static bool IsMetro(eDotNetBarStyle style)
+        {
+            if (style == eDotNetBarStyle.StyleManagerControlled)
+                return IsMetro(StyleManager.Style);
+            return style == eDotNetBarStyle.Metro || style == eDotNetBarStyle.OfficeMobile2014;
+        }
+
+        /// <summary>
+        /// Returns whether style is a Metro type style.
+        /// </summary>
+        /// <param name="style">style to test.</param>
+        /// <returns>true if Metro type style otherwise false.</returns>
+        public static bool IsMetro(eStyle style)
+        {
+            return style == eStyle.Metro || StyleManager.IsVisualStudio2012(style) || style == eStyle.OfficeMobile2014 || style == eStyle.Office2016;
+        }
+
+        /// <summary>
+        /// Returns whether style is a Metro type style.
+        /// </summary>
+        /// <param name="style">style to test.</param>
+        /// <returns>true if Metro type style otherwise false.</returns>
+        internal static bool IsVisualStudio2012(eStyle style)
+        {
+            return style == eStyle.VisualStudio2012Light || style == eStyle.VisualStudio2012Dark;
+        }
+        #endregion
+    }
+    /// <summary>
+    /// Defines the StyleManager styles.
+    /// </summary>
+    public enum eStyle
+    {
+        Office2007Blue,
+        Office2007Silver,
+        Office2007Black,
+        Office2007VistaGlass,
+        Office2010Silver,
+        Office2010Blue,
+        Office2010Black,
+        Windows7Blue,
+        VisualStudio2010Blue,
+        Metro,
+        Office2013 = Metro,
+        VisualStudio2012Light,
+        VisualStudio2012Dark,
+        OfficeMobile2014,
+        Office2016
+    }
+
+
+}
diff --git a/PROMS/DotNetBar Source Code/StyleManager.ico b/PROMS/DotNetBar Source Code/StyleManager.ico
new file mode 100644
index 00000000..2165fa08
Binary files /dev/null and b/PROMS/DotNetBar Source Code/StyleManager.ico differ
diff --git a/PROMS/DotNetBar Source Code/StyleManagerAmbient.cs b/PROMS/DotNetBar Source Code/StyleManagerAmbient.cs
new file mode 100644
index 00000000..4b4fbefd
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/StyleManagerAmbient.cs	
@@ -0,0 +1,125 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+using System.ComponentModel;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Manages whether ambient property settings (BackColor, ForeColor etc.) are applied to child controls of the form when StyleManager component changes style.
+    /// </summary>
+    [ToolboxBitmap(typeof(StyleManagerAmbient), "StyleManager.ico"), ToolboxItem(true)]
+    [ProvideProperty("EnableAmbientSettings", typeof(Control))]
+    public class StyleManagerAmbient : Component, IExtenderProvider
+    {
+        #region Constructor
+        /// <summary>
+        /// Initializes a new instance of the StyleManagerAmbient class.
+        /// </summary>
+        public StyleManagerAmbient()
+        {
+            StyleManager.RegisterAmbientManager(this);
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the StyleManagerAmbient class with the specified container.
+        /// </summary>
+        /// <param name="container">An IContainer that represents the container for the command.</param>
+        public StyleManagerAmbient(IContainer container)
+            : this()
+        {
+            container.Add(this);
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            StyleManager.UnregisterAmbientManager(this);
+            base.Dispose(disposing);
+        }
+        #endregion
+
+        #region Implementation
+        private Dictionary<Control, eAmbientSettings> _Settings = new Dictionary<Control, eAmbientSettings>();
+        /// <summary>
+        /// Gets ambient settings StyleManager is allowed to change on the control.
+        /// </summary>
+        [DefaultValue(eAmbientSettings.All), Description("Indicates ambient settings StyleManager is allowed to change on the control.")]
+        [System.ComponentModel.Editor("DevComponents.DotNetBar.Design.FlagEnumUIEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor))]
+        public eAmbientSettings GetEnableAmbientSettings(Control c)
+        {
+            eAmbientSettings settings = eAmbientSettings.All;
+            if (_Settings.TryGetValue(c, out settings))
+                return settings;
+
+            return eAmbientSettings.All;
+        }
+
+        /// <summary>
+        /// Sets the ambient settings StyleManager is allowed to change on component.
+        /// </summary>
+        /// <param name="c">Reference to supported component.</param>
+        /// <param name="ambientSettings">Ambient settings that StyleManager may change.</param>
+        public void SetEnableAmbientSettings(Control c, eAmbientSettings ambientSettings)
+        {
+            if (_Settings.ContainsKey(c))
+            {
+                if (ambientSettings == eAmbientSettings.All)
+                    _Settings.Remove(c);
+                else
+                    _Settings[c] = ambientSettings;
+            }
+            else if (ambientSettings != eAmbientSettings.All)
+            {
+                _Settings.Add(c, ambientSettings);
+            }
+        }
+
+        internal bool Contains(Control c)
+        {
+            return _Settings.ContainsKey(c);
+        }
+        #endregion
+
+        #region IExtenderProvider Members
+
+        public bool CanExtend(object extendee)
+        {
+            if (extendee is Control)
+                return true;
+            return false;
+        }
+
+        #endregion
+
+    }
+
+    /// <summary>
+    /// Specifies ambient settings enabled on the control for StyleManager.
+    /// </summary>
+    [Flags]
+    public enum eAmbientSettings
+    {
+        /// <summary>
+        /// All ambient settings are allowed to change.
+        /// </summary>
+        All = BackColor | ForeColor | ChildControls,
+        /// <summary>
+        /// StyleManager cannot change ambient settings.
+        /// </summary>
+        None = 0,
+        /// <summary>
+        /// StyleManager should process child controls.
+        /// </summary>
+        ChildControls = 1,
+        /// <summary>
+        /// StyleManager should change BackColor.
+        /// </summary>
+        BackColor = 2,
+        /// <summary>
+        /// StyleManager should change ForeColor.
+        /// </summary>
+        ForeColor = 4
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/SubItemsCollection.cs b/PROMS/DotNetBar Source Code/SubItemsCollection.cs
new file mode 100644
index 00000000..b01e0f67
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/SubItemsCollection.cs	
@@ -0,0 +1,374 @@
+using System;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Summary description for SubItemsCollection.
+	/// </summary>
+	public class SubItemsCollection:System.Collections.CollectionBase
+	{
+
+		private BaseItem m_ParentItem;
+		protected bool m_IgnoreEvents=false;
+		private bool m_AllowParentRemove=true;
+
+		internal SubItemsCollection(BaseItem parent)
+		{
+			m_ParentItem=parent;
+		}
+		internal int _Add(BaseItem item)
+		{
+			m_IgnoreEvents=true;
+			m_AllowParentRemove=false;
+			int i=0;
+			try
+			{
+				i=List.Add(item);
+			}
+			finally
+			{
+				m_IgnoreEvents=false;
+				m_AllowParentRemove=true;
+			}
+			return i;
+		}
+		internal void _Add(BaseItem item, int Position)
+		{
+			m_IgnoreEvents=true;
+			m_AllowParentRemove=false;
+			try
+			{
+                if (Position >= 0)
+                    List.Insert(Position, item);
+                else
+                    List.Add(item);
+			}
+			finally
+			{
+				m_IgnoreEvents=false;
+				m_AllowParentRemove=true;
+			}
+		}
+		internal void _Clear()
+		{
+			m_IgnoreEvents=true;
+			try
+			{
+				List.Clear();
+			}
+			finally
+			{
+				m_IgnoreEvents=false;
+			}
+		}
+        [EditorBrowsable(EditorBrowsableState.Never), Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public bool AllowParentRemove
+		{
+			get {return m_AllowParentRemove;}
+			set {m_AllowParentRemove=value;}
+		}
+
+		public virtual int Add(BaseItem item)
+		{
+			return Add(item,-1);
+		}
+		public virtual  int Add(BaseItem item, int Position)
+		{
+			int iRet=Position;
+            if (this.Contains(item))
+            {
+                return this.IndexOf(item);
+            }
+
+			if(Position>=0)
+				List.Insert(Position,item);
+			else
+				iRet=List.Add(item);
+
+			return iRet;
+		}
+
+		protected override void OnInsert(int index,object value)
+		{
+			if(value is BaseItem)
+			{
+				BaseItem item=value as BaseItem;
+
+				if(m_AllowParentRemove && item.Parent!=null && item.Parent!=m_ParentItem && item.Parent.SubItems.Contains(item))
+					item.Parent.SubItems.Remove(item);
+			}
+			base.OnInsert(index,value);
+		}
+
+		protected override void OnInsertComplete(int index,object value)
+		{
+			if(!m_IgnoreEvents)
+			{
+				BaseItem item=value as BaseItem;
+
+				object objItemContainer=item.ContainerControl;
+				item.Style=m_ParentItem.Style;
+				item.Orientation=m_ParentItem.Orientation;
+				item.ThemeAware=m_ParentItem.ThemeAware;
+				item.SetParent(m_ParentItem);
+
+				IOwner owner=m_ParentItem.GetOwner() as IOwner;
+				if(owner!=null)
+					owner.AddShortcutsFromItem(item);
+                if (m_ParentItem != null && m_ParentItem is PopupItem && m_ParentItem.Expanded && 
+                    ((PopupItem)m_ParentItem).PopupType != ePopupType.Container)
+                {
+                    item.ContainerControl = ((PopupItem)m_ParentItem).PopupControl;
+                    item.OnContainerChanged(objItemContainer);
+                }
+                else
+                {
+                    item.ContainerControl = null;
+                    item.OnContainerChanged(objItemContainer);
+                }
+				objItemContainer=null;
+
+				item.SetDesignMode(m_ParentItem.DesignMode);
+
+				m_ParentItem.NeedRecalcSize=true;
+				m_ParentItem.OnItemAdded(item);
+			}
+
+			base.OnInsertComplete(index,value);
+		}
+
+		public virtual BaseItem this[int index]
+		{
+			get {return (BaseItem)(List[index]);}
+			set {List[index] = value;}
+		}
+		public  virtual BaseItem this[string name]
+		{
+			get {return (BaseItem)(List[this.IndexOf(name)]);}
+			set {List[this.IndexOf(name)] = value;}
+		}
+
+		public virtual void Insert(int index, BaseItem item) 
+		{
+			this.Add(item,index);
+		}
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void _Insert(int index, BaseItem item)
+        {
+            m_IgnoreEvents = true;
+            try { List.Insert(index, item); }
+            finally { m_IgnoreEvents = false; }
+        }
+
+		public virtual  int IndexOf(BaseItem value) 
+		{
+			return List.IndexOf(value);
+		}
+
+		public virtual  int IndexOf(string name)
+		{
+			int i=-1;
+			foreach(BaseItem item in List)
+			{
+				i++;
+				if(item.Name==name)
+					return i;
+			}
+			return -1;
+		}
+
+		public virtual bool Contains(BaseItem value) 
+		{
+			return List.Contains(value);
+		}
+
+		public virtual bool Contains(string name)
+		{
+			foreach(BaseItem item in List)
+			{
+				if(item.Name==name)
+					return true;
+			}
+			return false;
+		}
+
+		public virtual void Remove(BaseItem item) 
+		{
+			List.Remove(item);
+		}
+
+		public virtual void RemoveRange(BaseItem[] items) 
+		{
+			foreach(BaseItem item in items)
+				this.Remove(item);
+		}
+
+		protected override void OnRemove(int index,object value)
+		{
+			RemoveInternal(index,value);
+			base.OnRemove(index,value);
+		}
+
+		protected virtual void RemoveInternal(int index,object value)
+		{
+			// Raise event before item is actually removed so the item is able to clean its state
+			// See override in PopupItem
+			if(!m_IgnoreEvents)
+			{
+				BaseItem item=value as BaseItem;
+				
+				item.OnBeforeItemRemoved(null);
+				m_ParentItem.OnBeforeItemRemoved(item);
+
+				IOwner owner=m_ParentItem.GetOwner() as IOwner;
+				if(owner!=null)
+					owner.RemoveShortcutsFromItem(item);
+			}
+
+		}
+
+		protected override void OnRemoveComplete(int index,object value)
+		{
+			RemoveCompleteInternal(index,value);
+			base.OnRemoveComplete(index,value);
+		}
+
+		protected virtual void RemoveCompleteInternal(int index, object value)
+		{
+			if(!m_IgnoreEvents)
+			{
+				BaseItem item=value as BaseItem;
+
+				item.SetParent(null);
+				item.OnAfterItemRemoved(null, index);
+				item.ContainerControl=null;
+				m_ParentItem.OnAfterItemRemoved(item, index);
+				m_ParentItem.NeedRecalcSize=true;
+				m_ParentItem.Refresh();
+			}
+		}
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void _RemoveAt(int index)
+        {
+            m_IgnoreEvents = true;
+            try { List.RemoveAt(index); }
+            finally { m_IgnoreEvents = false; }
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+		public void _Remove(BaseItem item)
+		{
+			m_IgnoreEvents=true;
+			try{List.Remove(item);}
+			finally{m_IgnoreEvents=false;}
+		}
+
+		public void Remove(int index)
+		{
+			this.Remove((BaseItem)List[index]);
+		}
+
+		public virtual void Remove(string name)
+		{
+			this.Remove(this[name]);
+		}
+
+		protected override void OnClear()
+		{
+			if(!m_IgnoreEvents)
+			{
+				IOwner owner=m_ParentItem.GetOwner() as IOwner;
+				if(m_ParentItem!=null)
+				    m_ParentItem.SuspendLayout = true;
+                try
+                {
+                    if (List.Count > 0)
+                    {
+                        for (int i = 0; i < this.Count; i++)
+                        {
+                            BaseItem item = this[i];
+                            RemoveInternal(i, item);
+                            RemoveCompleteInternal(i, item);
+                        }
+                    }
+                }
+                finally
+                {
+                    if (m_ParentItem != null)
+                        m_ParentItem.SuspendLayout = false;
+                }
+			    owner=null;
+
+				if(m_ParentItem!=null)
+				{
+					m_ParentItem.OnSubItemsClear();
+				}
+			}
+			//base.OnClear();
+		}
+
+		public virtual void AddRange(BaseItem[] items)
+		{
+            foreach (BaseItem item in items)
+            {
+                this.Add(item);
+            }
+		}
+
+        public virtual void InsertRange(int startPosition, BaseItem[] items)
+        {
+            foreach (BaseItem item in items)
+            {
+                List.Insert(startPosition, item);
+                startPosition++;
+            }
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+		public void CopyTo(System.Collections.ArrayList list)
+		{
+			if(list==null)
+				return;
+			foreach(BaseItem item in this)
+				list.Add(item);
+		}
+
+		public virtual void CopyTo(BaseItem[] array, int index) 
+		{
+			List.CopyTo(array, index);
+		}
+
+        internal void CopyToFromIndex(BaseItem[] array, int fromCollectionIndex)
+        {
+            for (int i = fromCollectionIndex; i < List.Count; i++)
+            {
+                array[i - fromCollectionIndex] = this[i];
+            }
+        }
+
+        internal bool IgnoreEvents
+        {
+            get { return m_IgnoreEvents; }
+            set { m_IgnoreEvents = value; }
+        }
+
+        /// <summary>
+        /// Sorts the items in the collection using the built in IComparable on each item which sorts items by the Text property.
+        /// </summary>
+        public void Sort()
+        {
+            InnerList.Sort();
+        }
+        /// <summary>
+        /// Sorts the items in the collection using specified comparer.
+        /// </summary>
+        /// <param name="comparer">Comparer to use for item sorting.</param>
+        public void Sort(System.Collections.IComparer comparer)
+        {
+            InnerList.Sort(comparer);
+        }
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/SuperTabControl.ico b/PROMS/DotNetBar Source Code/SuperTabControl.ico
new file mode 100644
index 00000000..33493b78
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SuperTabControl.ico differ
diff --git a/PROMS/DotNetBar Source Code/SuperTabControl/Office2007/Office2007SuperTabItem.cs b/PROMS/DotNetBar Source Code/SuperTabControl/Office2007/Office2007SuperTabItem.cs
new file mode 100644
index 00000000..c491ee39
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/SuperTabControl/Office2007/Office2007SuperTabItem.cs	
@@ -0,0 +1,222 @@
+#if FRAMEWORK20
+using System.Drawing;
+using System.Drawing.Drawing2D;
+
+namespace DevComponents.DotNetBar
+{
+    public class Office2007SuperTabItem : SuperTabItemBaseDisplay
+    {
+        #region Constants
+
+        private const int Radius = 4;
+
+        #endregion
+
+        /// <summary>
+        /// Constructor for Office2007 style SuperTabItem base display
+        /// </summary>
+        /// <param name="tabItem">Associated SuperTabItem</param>
+        public Office2007SuperTabItem(SuperTabItem tabItem)
+            : base(tabItem)
+        {
+        }
+
+        #region TabItemPath
+
+        /// <summary>
+        /// Creates the tab item GraphicsPath
+        /// </summary>
+        /// <returns>Tab path</returns>
+        internal override GraphicsPath TabItemPath()
+        {
+            // Check to see if the user is supplying a path
+
+            GraphicsPath path = base.TabItemPath();
+
+            if (path != null)
+                return (path);
+
+            // Supply the default path based upon
+            // the current tab alignment
+
+            switch (TabItem.TabAlignment)
+            {
+                case eTabStripAlignment.Top:
+                    return (TopTabPath());
+
+                case eTabStripAlignment.Bottom:
+                    return (BottomTabPath());
+
+                case eTabStripAlignment.Left:
+                    return (LeftTabPath());
+
+                default:
+                    return (RightTabPath());
+            }
+        }
+
+        #region TopTabPath
+
+        /// <summary>
+        /// Create the Top tab path
+        /// </summary>
+        /// <returns>GraphicsPath</returns>
+        private GraphicsPath TopTabPath()
+        {
+            Rectangle r = TabItem.DisplayRectangle;
+            r.Width -= 1;
+
+            // Allow for the TabStrip border
+
+            if (TabItem.IsSelected == true)
+                r.Height += 2;
+
+            // Create the path
+
+            GraphicsPath path = new GraphicsPath();
+
+            Rectangle ar = new Rectangle(r.X, r.Y, Radius, Radius);
+
+            path.AddLine(r.X, r.Bottom, r.X, r.Top + Radius);
+            path.AddArc(ar, 180, 90);
+
+            path.AddLine(r.X + Radius, r.Top, r.Right - Radius, r.Top);
+
+            ar.X = r.Right - Radius;
+            path.AddArc(ar, 270, 90);
+
+            path.AddLine(r.Right, r.Top + Radius, r.Right, r.Bottom);
+
+            return (path);
+        }
+
+        #endregion
+
+        #region BottomTabPath
+
+        /// <summary>
+        /// Creates the Bottom tab path
+        /// </summary>
+        /// <returns>GraphicsPath</returns>
+        private GraphicsPath BottomTabPath()
+        {
+            Rectangle r = TabItem.DisplayRectangle;
+            r.Width -= 1;
+            r.Height -= 1;
+
+            // Allow for the TabStrip border
+
+            if (TabItem.IsSelected == true)
+            {
+                r.Y -= 2;
+                r.Height += 2;
+            }
+
+            // Create the path
+
+            GraphicsPath path = new GraphicsPath();
+
+            Rectangle ar = new
+                Rectangle(r.Right - Radius, r.Bottom - Radius, Radius, Radius);
+
+            path.AddLine(r.Right, r.Top, r.Right, r.Bottom - Radius);
+            path.AddArc(ar, 0, 90);
+
+            path.AddLine(r.Right - Radius, r.Bottom, r.X + Radius, r.Bottom);
+
+            ar.X = r.X;
+            path.AddArc(ar, 90, 90);
+
+            path.AddLine(r.X, r.Bottom - Radius, r.X, r.Top);
+
+            return (path);
+        }
+
+        #endregion
+
+        #region LeftTabPath
+
+        /// <summary>
+        /// Creates the Left tab path
+        /// </summary>
+        /// <returns>GraphicsPath</returns>
+        private GraphicsPath LeftTabPath()
+        {
+            Rectangle r = TabItem.DisplayRectangle;
+            r.Height -= 1;
+            r.Width -= 1;
+
+            // Allow for the TabStrip border
+
+            if (TabItem.IsSelected == true)
+                r.Width += 2;
+
+            // Create the tab path
+
+            GraphicsPath path = new GraphicsPath();
+
+            Rectangle ar = new
+                Rectangle(r.X, r.Bottom - Radius, Radius, Radius);
+
+            path.AddLine(r.Right, r.Bottom, r.X + Radius, r.Bottom);
+            path.AddArc(ar, 90, 90);
+
+            path.AddLine(r.X, r.Bottom - Radius, r.X, r.Top + Radius);
+
+            ar.Y = r.Y;
+            path.AddArc(ar, 180, 90);
+
+            path.AddLine(r.X + Radius, r.Top, r.Right, r.Top);
+
+            return (path);
+        }
+
+        #endregion
+
+        #region RightTabPath
+
+        /// <summary>
+        /// Create the Right tab path
+        /// </summary>
+        /// <returns>GraphicsPath</returns>
+        private GraphicsPath RightTabPath()
+        {
+            Rectangle r = TabItem.DisplayRectangle;
+            r.Width -= 1;
+            r.Height -= 1;
+
+            // Allow for the TabStrip border
+
+            if (TabItem.IsSelected == true)
+            {
+                r.X -= 2;
+                r.Width += 2;
+            }
+
+            // Create the tab path
+
+            GraphicsPath path = new GraphicsPath();
+
+            Rectangle ar = new
+                Rectangle(r.Right - Radius, r.Top, Radius, Radius);
+
+            path.AddLine(r.X, r.Top, r.Right - Radius, r.Top);
+            path.AddArc(ar, 270, 90);
+
+            path.AddLine(r.Right, r.Top + Radius, r.Right, r.Bottom - Radius);
+
+            ar.Y = r.Bottom - Radius;
+            path.AddArc(ar, 0, 90);
+
+            path.AddLine(r.Right - Radius, r.Bottom, r.X, r.Bottom);
+
+            return (path);
+        }
+
+        #endregion
+
+        #endregion
+
+    }
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/SuperTabControl/Office2007/Office2007SuperTabStrip.cs b/PROMS/DotNetBar Source Code/SuperTabControl/Office2007/Office2007SuperTabStrip.cs
new file mode 100644
index 00000000..5d9029e6
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/SuperTabControl/Office2007/Office2007SuperTabStrip.cs	
@@ -0,0 +1,31 @@
+#if FRAMEWORK20
+using System.Drawing;
+
+namespace DevComponents.DotNetBar
+{
+    internal class Office2007SuperTabStrip : SuperTabStripBaseDisplay
+    {
+        /// <summary>
+        /// Office2007 TabStrip base display constructor
+        /// </summary>
+        /// <param name="tabStripItem">Associated TabStrip</param>
+        public Office2007SuperTabStrip(SuperTabStripItem tabStripItem)
+            : base(tabStripItem)
+        {
+        }
+
+        #region Internal properties
+
+        /// <summary>
+        /// Tab layout offsets
+        /// </summary>
+        internal override Size TabLayoutOffset
+        {
+            get { return (new Size(3, 2)); }
+        }
+
+        #endregion
+
+    }
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/SuperTabControl/Office2010Backstage/Office2010BackstageSuperTabItem.cs b/PROMS/DotNetBar Source Code/SuperTabControl/Office2010Backstage/Office2010BackstageSuperTabItem.cs
new file mode 100644
index 00000000..8d4de6ca
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/SuperTabControl/Office2010Backstage/Office2010BackstageSuperTabItem.cs	
@@ -0,0 +1,378 @@
+#if FRAMEWORK20
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.Rendering;
+
+namespace DevComponents.DotNetBar
+{
+    public class Office2010BackstageSuperTabItem : SuperTabItemBaseDisplay
+    {
+        #region Constants
+
+        private const int MarkerHeight = 7;
+        private const int MarkerWidth = 13;
+
+        #endregion
+
+        /// <summary>
+        /// Office 2010 Backstage SuperTabItem display constructor
+        /// </summary>
+        /// <param name="tabItem">Associated SuperTabItem</param>
+        public Office2010BackstageSuperTabItem(SuperTabItem tabItem)
+            : base(tabItem)
+        {
+        }
+
+        #region DrawTabBorder
+
+        /// <summary>
+        /// Draws the tab border
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="path"></param>
+        /// <param name="ct"></param>
+        protected override void DrawTabBorder(Graphics g,
+            GraphicsPath path, SuperTabItemStateColorTable ct)
+        {
+            base.DrawTabBorder(g, path, ct);
+
+            // Draw the Backstage selection marker
+
+            if (ct.SelectionMarker.IsEmpty == false)
+                DrawSelMarker(g, ct);
+        }
+
+        #region DrawSelMarker
+
+        /// <summary>
+        /// Draws the Backstage SelectedItem marker
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="ct"></param>
+        private void DrawSelMarker(Graphics g, SuperTabItemStateColorTable ct)
+        {
+            Rectangle r = TabItem.DisplayRectangle;
+
+            Point[] pts;
+
+            switch (TabStripItem.TabAlignment)
+            {
+                case eTabStripAlignment.Top:
+                    r.X += (r.Width - MarkerWidth) / 2;
+                    r.Y = r.Bottom - MarkerHeight + 2;
+
+                    r.Width = MarkerWidth;
+                    r.Height = MarkerHeight;
+
+                    pts = new Point[] {
+                        new Point(r.X, r.Bottom),
+                        new Point(r.X + MarkerWidth / 2, r.Y),
+                        new Point(r.Right, r.Bottom)};
+
+                    break;
+
+                case eTabStripAlignment.Left:
+                    r.X = r.Right - MarkerHeight + 2;
+                    r.Y += (r.Height - MarkerWidth) / 2;
+
+                    r.Width = MarkerHeight;
+                    r.Height = MarkerWidth;
+
+                    pts = new Point[] {
+                        new Point(r.Right, r.Bottom),
+                        new Point(r.X, r.Y + MarkerWidth / 2),
+                        new Point(r.Right, r.Y)};
+
+                    break;
+
+                case eTabStripAlignment.Bottom:
+                    r.X += (r.Width - MarkerWidth) / 2;
+                    r.Y -= 3;
+
+                    r.Width = MarkerWidth;
+                    r.Height = MarkerHeight;
+
+                    pts = new Point[] {
+                        new Point(r.X, r.Y),
+                        new Point(r.X + MarkerWidth / 2, r.Bottom),
+                        new Point(r.Right, r.Y)};
+
+                    break;
+
+                default:
+                    r.X -= 3;
+                    r.Y += (r.Height - MarkerWidth) / 2;
+
+                    r.Width = MarkerHeight;
+                    r.Height = MarkerWidth;
+
+                    pts = new Point[] {
+                        new Point(r.X, r.Y),
+                        new Point(r.Right, r.Y + MarkerWidth / 2),
+                        new Point(r.X, r.Bottom)};
+
+                    break;
+            }
+
+            using (Brush br = new SolidBrush(ct.SelectionMarker))
+                g.FillPolygon(br, pts);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region DrawTabItemBackground
+
+        /// <summary>
+        /// DrawTabItemBackground
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="path"></param>
+        /// <param name="tabColors"></param>
+        protected override void DrawTabItemBackground(Graphics g,
+            GraphicsPath path, SuperTabItemStateColorTable tabColors)
+        {
+            Rectangle r = Rectangle.Round(path.GetBounds());
+
+            if (r.Width > 0 && r.Height > 0)
+            {
+                if (tabColors.Background.Colors != null)
+                {
+                    if (tabColors.Background.Colors.Length == 1)
+                    {
+                        DrawTabItemSolidBackground(g, path, tabColors, r);
+
+                        if (TabItem.IsSelected == true && !StyleManager.IsMetro(TabItem.EffectiveStyle))
+                            DrawTabItemHighLight(g, path, tabColors, r);
+                    }
+                    else
+                    {
+                        DrawTabItemGradientBackground(g, path, tabColors, r);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region DrawTabItemHighLight
+
+        /// <summary>
+        /// DrawTabItemHighLight
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="path"></param>
+        /// <param name="tabColors"></param>
+        /// <param name="r"></param>
+        private void DrawTabItemHighLight(
+            Graphics g, GraphicsPath path, SuperTabItemStateColorTable tabColors, Rectangle r)
+        {
+            Region clip = g.Clip;
+            g.SetClip(path, CombineMode.Intersect);
+
+            using (GraphicsPath path2 = new GraphicsPath())
+            {
+                Rectangle t = r;
+                t.Inflate(r.Width / 3, r.Height / 3);
+
+                path2.AddEllipse(t);
+
+                using (PathGradientBrush pbr = new PathGradientBrush(path2))
+                {
+                    pbr.CenterPoint = new
+                        PointF(r.X + r.Width / 2, r.Bottom - (r.Height / 4));
+
+                    pbr.CenterColor = ControlPaint.LightLight(tabColors.Background.Colors[0]);
+                    pbr.SurroundColors = new Color[] {Color.Empty};
+
+                    g.FillPath(pbr, path2);
+                }
+            }
+
+            g.Clip = clip;
+        }
+
+        #endregion
+
+        #region TabItemPath
+
+        /// <summary>
+        /// Creates the tab item GraphicsPath
+        /// </summary>
+        /// <returns>Tab path</returns>
+        internal override GraphicsPath TabItemPath()
+        {
+            // Check to see if the user is supplying a path
+
+            GraphicsPath path = base.TabItemPath();
+
+            if (path != null)
+                return (path);
+
+            // Supply the default path based upon
+            // the current tab alignment
+
+            switch (TabItem.TabAlignment)
+            {
+                case eTabStripAlignment.Top:
+                    return (TopTabPath());
+
+                case eTabStripAlignment.Bottom:
+                    return (BottomTabPath());
+
+                case eTabStripAlignment.Left:
+                    return (LeftTabPath());
+
+                default:
+                    return (RightTabPath());
+            }
+        }
+
+        #region TopTabPath
+
+        /// <summary>
+        /// Create the Top tab path
+        /// </summary>
+        /// <returns>GraphicsPath</returns>
+        private GraphicsPath TopTabPath()
+        {
+            Rectangle r = TabItem.DisplayRectangle;
+            r.Width -= 1;
+            r.Height -= 1;
+
+            // Allow for the TabStrip border
+
+            if (TabItem.IsSelected == true)
+                r.Height += 2;
+
+            // Create the path
+
+            GraphicsPath path = new GraphicsPath();
+
+            path.AddLines(new Point[]
+            {
+                new Point(r.X, r.Bottom), 
+                new Point(r.X, r.Top),
+                new Point(r.Right, r.Top),
+                new Point(r.Right, r.Bottom),
+            });
+
+            return (path);
+        }
+
+        #endregion
+
+        #region BottomTabPath
+
+        /// <summary>
+        /// Creates the Bottom tab path
+        /// </summary>
+        /// <returns>GraphicsPath</returns>
+        private GraphicsPath BottomTabPath()
+        {
+            Rectangle r = TabItem.DisplayRectangle;
+            r.Width -= 1;
+            r.Height -= 1;
+
+            // Allow for the TabStrip border
+
+            if (TabItem.IsSelected == true)
+            {
+                r.Y -= 2;
+                r.Height += 2;
+            }
+
+            // Create the path
+            
+            GraphicsPath path = new GraphicsPath();
+
+            path.AddLines(new Point[]
+            {
+                new Point(r.Right, r.Top),
+                new Point(r.Right, r.Bottom),
+                new Point(r.X, r.Bottom), 
+                new Point(r.X, r.Top),
+            });
+
+            return (path);
+        }
+
+        #endregion
+
+        #region LeftTabPath
+
+        /// <summary>
+        /// Creates the Left tab path
+        /// </summary>
+        /// <returns>GraphicsPath</returns>
+        private GraphicsPath LeftTabPath()
+        {
+            Rectangle r = TabItem.DisplayRectangle;
+            r.Width -= 1;
+            r.Height -= 1;
+
+            // Allow for the TabStrip border
+
+            if (TabItem.IsSelected == true)
+                r.Width += 2;
+
+            GraphicsPath path = new GraphicsPath();
+
+            // Create the tab path
+
+            path.AddLines(new Point[]
+            {
+                new Point(r.Right, r.Bottom),
+                new Point(r.X, r.Bottom), 
+                new Point(r.X, r.Top),
+                new Point(r.Right, r.Top),
+            });
+
+            return (path);
+        }
+
+        #endregion
+
+        #region RightTabPath
+
+        /// <summary>
+        /// Create the Right tab path
+        /// </summary>
+        /// <returns>GraphicsPath</returns>
+        private GraphicsPath RightTabPath()
+        {
+            Rectangle r = TabItem.DisplayRectangle;
+            r.Width -= 1;
+            r.Height -= 1;
+
+            // Allow for the TabStrip border
+
+            if (TabItem.IsSelected == true)
+            {
+                r.X -= 2;
+                r.Width += 2;
+            }
+
+            // Create the tab path
+            
+            GraphicsPath path = new GraphicsPath();
+
+            path.AddLines(new Point[]
+            {
+                new Point(r.X, r.Top),
+                new Point(r.Right, r.Top),
+                new Point(r.Right, r.Bottom),
+                new Point(r.X, r.Bottom), 
+            });
+
+            return (path);
+        }
+
+        #endregion
+
+        #endregion
+    }
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/SuperTabControl/Office2010Backstage/Office2010BackstageSuperTabStrip.cs b/PROMS/DotNetBar Source Code/SuperTabControl/Office2010Backstage/Office2010BackstageSuperTabStrip.cs
new file mode 100644
index 00000000..3c4e3dc7
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/SuperTabControl/Office2010Backstage/Office2010BackstageSuperTabStrip.cs	
@@ -0,0 +1,155 @@
+#if FRAMEWORK20
+using System.Drawing;
+using DevComponents.DotNetBar.Rendering;
+using DevComponents.UI.ContentManager;
+using System.Drawing.Drawing2D;
+
+namespace DevComponents.DotNetBar
+{
+    internal class Office2010BackstageSuperTabStrip : SuperTabStripBaseDisplay
+    {
+        #region Constants
+
+        private const int SelectedPadding = 5;
+        private const int HvTabOverLap = -1;
+
+        #endregion
+
+        public Office2010BackstageSuperTabStrip(SuperTabStripItem tabStripItem)
+            : base(tabStripItem)
+        {
+            tabStripItem.ControlBox.MenuBox.Style = eDotNetBarStyle.Office2010;
+        }
+
+        #region Internal properties
+
+        #region PreDrawStripBorder
+
+        /// <summary>
+        /// PreDrawStripBorder
+        /// </summary>
+        internal override bool PreDrawStripBorder
+        {
+            get { return (true); }
+        }
+
+        #endregion
+
+        #region SelectedPaddingWidth
+
+        /// <summary>
+        /// SelectedPaddingWidth
+        /// </summary>
+        internal override int SelectedPaddingWidth
+        {
+            get { return (SelectedPadding); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region NextBlockPosition (LayoutManager)
+
+        /// <summary>
+        /// Gets the Layout manager NextBlockPosition
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void NextBlockPosition(LayoutManagerPositionEventArgs e)
+        {
+            BaseItem item = (BaseItem)e.Block;
+            int n = Tabs.IndexOf(item);
+
+            if (n >= 0 && n + 1 < Tabs.Count)
+            {
+                SuperTabItem tab1 = Tabs[n] as SuperTabItem;
+
+                if (tab1 != null)
+                {
+                    SuperTabItem tab2 = Tabs[n + 1] as SuperTabItem;
+
+                    if (tab2 != null)
+                    {
+                        e.NextPosition = e.CurrentPosition;
+
+                        if (TabStripItem.IsVertical == true)
+                            e.NextPosition.Y += (e.Block.Bounds.Height - HvTabOverLap);
+                        else
+                            e.NextPosition.X += (e.Block.Bounds.Width - HvTabOverLap);
+
+                        e.Cancel = true;
+                    }
+                }
+            }
+        }
+
+        #endregion        
+
+        #region NextBlockPosition (PromoteSelTab)
+
+        /// <summary>
+        /// Gets the "PromoteSelTab" NextBlockPosition
+        /// </summary>
+        /// <param name="item"></param>
+        /// <param name="vItem"></param>
+        /// <returns></returns>
+        internal override Rectangle NextBlockPosition(BaseItem item, BaseItem vItem)
+        {
+            Rectangle r = base.NextBlockPosition(item, vItem);
+
+            if (item is SuperTabItem && vItem is SuperTabItem)
+            {
+                if (TabStripItem.IsVertical == true)
+                    r.Y -= HvTabOverLap;
+                else
+                    r.X -= HvTabOverLap;
+            }
+
+            return (r);
+        }
+
+        #endregion
+
+        #region DrawBackground
+
+        /// <summary>
+        /// Draws the background
+        /// </summary>
+        /// <param name="p"></param>
+        /// <param name="ct"></param>
+        protected override void DrawBackground(ItemPaintArgs p, SuperTabColorTable ct)
+        {
+            Graphics g = p.Graphics;
+            Rectangle r = TabStripItem.DisplayRectangle;
+
+            int angle = ct.Background.GradientAngle;
+
+            switch (TabStripItem.TabAlignment)
+            {
+                case eTabStripAlignment.Bottom:
+                    r.Y -= 1;
+                    break;
+
+                case eTabStripAlignment.Right:
+                    r.X -= 1;
+                    break;
+
+                case eTabStripAlignment.Top:
+                    angle += 180;
+                    break;
+            }
+
+            using (Brush lbr = ct.Background.GetBrush(r, angle))
+            {
+                SmoothingMode sm = g.SmoothingMode;
+                g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.Default;
+                if (lbr != null)
+                    g.FillRectangle(lbr, r);
+                g.SmoothingMode = sm;
+            }
+        }
+
+        #endregion
+    }
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/SuperTabControl/OfficeMobile2014/OfficeMobile2014SuperTabItem.cs b/PROMS/DotNetBar Source Code/SuperTabControl/OfficeMobile2014/OfficeMobile2014SuperTabItem.cs
new file mode 100644
index 00000000..a66ae67d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/SuperTabControl/OfficeMobile2014/OfficeMobile2014SuperTabItem.cs	
@@ -0,0 +1,290 @@
+#if FRAMEWORK20
+using System;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+
+namespace DevComponents.DotNetBar
+{
+    public class OfficeMobile2014SuperTabItem : SuperTabItemBaseDisplay
+    {
+        #region Constants
+
+        private const int Radius = 8;
+        private const int Dia = Radius * 2;
+        private const int Offset = 2;
+        private const int StripeTop = 7;
+        private const int StripeBot = 5;
+        private const int PadFill = 3;
+
+        #endregion
+
+        /// <summary>
+        /// Constructor for OfficeMobile2014 style SuperTabItem base display
+        /// </summary>
+        /// <param name="tabItem">Associated SuperTabItem</param>
+        public OfficeMobile2014SuperTabItem(SuperTabItem tabItem)
+            : base(tabItem)
+        {
+        }
+
+        #region ContentRectangle
+
+        /// <summary>
+        /// Calculates the Content Rectangle for the tab
+        /// </summary>
+        /// <returns>Content Rectangle</returns>
+        internal override Rectangle ContentRectangle()
+        {
+            Rectangle r = TabItem.DisplayRectangle;
+
+            int tabOverlap = (TabStripItem.TabDisplay.TabOverlap);
+            int tabSpacing = (TabStripItem.TabDisplay.TabSpacing);
+            int n = tabOverlap + tabSpacing;
+
+            if (TabStripItem.IsVertical == true)
+            {
+                r.Y += (tabOverlap / 2 + tabSpacing);
+                r.Height -= (tabOverlap + tabSpacing * 2);
+            }
+            else
+            {
+                r.X += (tabOverlap / 2 + tabSpacing);
+                r.Width -= (tabOverlap + tabSpacing * 2);
+            }
+
+            int stripeTop = Dpi.Width(StripeTop);
+            int padFill = Dpi.Width(PadFill);
+            switch (TabItem.TabAlignment)
+            {
+                case eTabStripAlignment.Top:
+                    r.Height -= stripeTop;
+                    break;
+
+                case eTabStripAlignment.Bottom:
+                    r.Height -= StripeBot;
+                    r.Y += StripeBot;
+                    break;
+
+                case eTabStripAlignment.Left:
+                    if (TabStripItem.HorizontalText == false)
+                    {
+                        r.X -= padFill;
+                        r.Y += padFill;
+                    }
+
+                    r.Width -= stripeTop;
+                    break;
+
+                default:
+                    if (TabStripItem.HorizontalText == true)
+                    {
+                        r.X += padFill;
+                        r.Width -= StripeBot;
+                    }
+                    else
+                    {
+                        r.X += stripeTop;
+                        r.Width -= stripeTop;
+                        r.Height += stripeTop;
+                    }
+                    break;
+            }
+
+            return (r);
+        }
+
+        #endregion
+
+        #region TabItemPath
+
+        /// <summary>
+        /// Creates the tab item GraphicsPath
+        /// </summary>
+        /// <returns>Tab path</returns>
+        internal override GraphicsPath TabItemPath()
+        {
+            GraphicsPath path = base.TabItemPath();
+
+            if (path != null)
+                return (path);
+
+            switch (TabItem.TabAlignment)
+            {
+                case eTabStripAlignment.Top:
+                    return (TopTabPath());
+
+                case eTabStripAlignment.Bottom:
+                    return (BottomTabPath());
+
+                case eTabStripAlignment.Left:
+                    return (LeftTabPath());
+
+                default:
+                    return (RightTabPath());
+            }
+        }
+
+        #region TopTabPath
+
+        /// <summary>
+        /// Create the Top tab path
+        /// </summary>
+        /// <returns>GraphicsPath</returns>
+        private GraphicsPath TopTabPath()
+        {
+            Rectangle r = TabItem.DisplayRectangle;
+            r.Width -= Dpi.Width1;
+            r.Height -= Dpi.Height(StripeBot);
+
+            int k = Math.Min(20, r.Height);
+            float scale = (float)k / 20;
+
+            int delta = (int)(90 * scale) - 25;
+            int n = (int)((TabStripItem.TabDisplay.TabOverlap / 2) * scale);
+
+            // Create the path
+
+            GraphicsPath path = new GraphicsPath();
+
+            int dia = Dpi.Width(Dia);
+            Rectangle ar = new Rectangle(r.X - Dpi.Width(Radius), r.Bottom - dia, dia, dia);
+            path.AddArc(ar, 90, -delta);
+
+            int offset = Dpi.Width(Offset);
+            ar = new Rectangle(r.X + Dpi.Width(Radius) + Dpi.Width(offset), r.Y, dia, dia);
+            path.AddArc(ar, 270 - delta, delta);
+
+            ar = new Rectangle(r.Right - (dia + offset + n), r.Y, dia, dia);
+            path.AddArc(ar, 270, delta);
+
+            ar = new Rectangle(r.Right - (dia - offset * 2), r.Bottom - dia, dia, dia);
+            path.AddArc(ar, 90 + delta, -delta);
+
+            return (path);
+        }
+
+        #endregion
+
+        #region BottomTabPath
+
+        /// <summary>
+        /// Creates the Bottom tab path
+        /// </summary>
+        /// <returns>GraphicsPath</returns>
+        private GraphicsPath BottomTabPath()
+        {
+            Rectangle r = TabItem.DisplayRectangle;
+            r.Width -= 1;
+            r.Height -= (StripeBot + 1);
+            r.Y += StripeBot;
+
+            // Create the path
+
+            GraphicsPath path = new GraphicsPath();
+
+            int k = Math.Min(20, r.Height);
+            float scale = (float)k / 20;
+
+            int delta = (int)(90 * scale) - 25;
+            int n = (int)((TabStripItem.TabDisplay.TabOverlap / 2) * scale);
+
+            Rectangle ar = new Rectangle(r.X - Radius, r.Y, Dia, Dia);
+            path.AddArc(ar, 270, delta);
+
+            ar = new Rectangle(r.X + Radius + Offset, r.Bottom - Dia, Dia, Dia);
+            path.AddArc(ar, 90 + delta, -delta);
+
+            ar = new Rectangle(r.Right - (Dia + Offset + n), r.Bottom - Dia, Dia, Dia);
+            path.AddArc(ar, 90, -delta);
+
+            ar = new Rectangle(r.Right - (Dia - Offset * 2), r.Y, Dia, Dia);
+            path.AddArc(ar, 270 - delta, delta);
+
+            return (path);
+        }
+
+        #endregion
+
+        #region LeftTabPath
+
+        /// <summary>
+        /// Creates the Left tab path
+        /// </summary>
+        /// <returns>GraphicsPath</returns>
+        private GraphicsPath LeftTabPath()
+        {
+            Rectangle r = TabItem.DisplayRectangle;
+            r.Width -= StripeBot;
+            r.Height -= 1;
+
+            // Create the path
+
+            GraphicsPath path = new GraphicsPath();
+
+            int k = Math.Min(20, r.Width);
+            float scale = (float)k / 20;
+
+            int delta = (int)(90 * scale) - 25;
+            int n = (int)((TabStripItem.TabDisplay.TabOverlap / 2) * scale);
+
+            Rectangle ar = new Rectangle(r.Right - Dia, r.Y - Radius, Dia, Dia);
+            path.AddArc(ar, 0, delta);
+
+            ar = new Rectangle(r.X, r.Y + Offset + n, Dia, Dia);
+            path.AddArc(ar, -180 + delta, -delta);
+
+            ar = new Rectangle(r.X, r.Bottom - Dia - Offset, Dia, Dia);
+            path.AddArc(ar, 180, -delta);
+
+            ar = new Rectangle(r.Right - Dia, r.Bottom - Radius + n, Dia, Dia);
+            path.AddArc(ar, -delta, delta);
+
+            return (path);
+        }
+
+        #endregion
+
+        #region RightTabPath
+
+        /// <summary>
+        /// Create the Right tab path
+        /// </summary>
+        /// <returns>GraphicsPath</returns>
+        private GraphicsPath RightTabPath()
+        {
+            Rectangle r = TabItem.DisplayRectangle;
+            r.X += StripeBot;
+            r.Width -= (StripeBot + 1);
+            r.Height -= 1;
+
+            // Create the path
+
+            GraphicsPath path = new GraphicsPath();
+
+            int k = Math.Min(20, r.Width);
+            float scale = (float)k / 20;
+
+            int delta = (int)(90 * scale) - 25;
+            int n = (int)((TabStripItem.TabDisplay.TabOverlap / 2) * scale);
+
+            Rectangle ar = new Rectangle(r.X, r.Y - Radius, Dia, Dia);
+            path.AddArc(ar, 180, -delta);
+
+            ar = new Rectangle(r.Right - Dia, r.Y + Offset + n, Dia, Dia);
+            path.AddArc(ar, -delta, delta);
+
+            ar = new Rectangle(r.Right - Dia, r.Bottom - Dia - Offset, Dia, Dia);
+            path.AddArc(ar, 0, delta);
+
+            ar = new Rectangle(r.X, r.Bottom - Radius + n, Dia, Dia);
+            path.AddArc(ar, 180 + delta, -delta);
+
+            return (path);
+        }
+
+        #endregion
+
+        #endregion
+    }
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/SuperTabControl/OfficeMobile2014/OfficeMobile2014SuperTabStrip.cs b/PROMS/DotNetBar Source Code/SuperTabControl/OfficeMobile2014/OfficeMobile2014SuperTabStrip.cs
new file mode 100644
index 00000000..ce8f0328
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/SuperTabControl/OfficeMobile2014/OfficeMobile2014SuperTabStrip.cs	
@@ -0,0 +1,386 @@
+#if FRAMEWORK20
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using DevComponents.DotNetBar.Rendering;
+using DevComponents.UI.ContentManager;
+
+namespace DevComponents.DotNetBar
+{
+    internal class OfficeMobile2014SuperTabStrip : SuperTabStripBaseDisplay
+    {
+        #region Constants
+
+        private int HTabSpacing
+        {
+            get { return Dpi.Width4; }
+        }
+
+        private int HTabOverLap
+        {
+            get { return Dpi.Width25; }
+        }
+
+        private int VTabSpacing {
+            get { return Dpi.Width4; }
+        }
+
+        private int VTabOverLap {
+            get { return Dpi.Width14; }
+        }
+
+        #endregion
+
+        /// <summary>
+        /// OfficeMobile2014 SuperTabStripBaseDisplay
+        /// </summary>
+        /// <param name="tabStripItem">Associated TabStripItem</param>
+        public OfficeMobile2014SuperTabStrip(SuperTabStripItem tabStripItem)
+            : base(tabStripItem)
+        {
+        }
+
+        #region Internal properties
+
+        #region MinTabSize
+
+        /// <summary>
+        /// Returns the Minimum tab size for this style
+        /// </summary>
+        internal override Size MinTabSize
+        {
+            get
+            {
+                if (TabStripItem.IsVertical == false || TabStripItem.HorizontalText == true)
+                    return Dpi.Size(new Size(52, 20));
+                    
+                return Dpi.Size(new Size(36, 20));
+            }
+        }
+
+        #endregion
+
+        #region TabLayoutOffset
+
+        /// <summary>
+        /// Tab layout offsets
+        /// </summary>
+        internal override Size TabLayoutOffset
+        {
+            get { return Dpi.Size(new Size(5, 3)); }
+        }
+
+        #endregion
+
+        #region TabOverlap
+
+        /// <summary>
+        /// Tab Overlap
+        /// </summary>
+        internal override int TabOverlap
+        {
+            get { return (TabStripItem.IsVertical ? VTabOverLap : HTabOverLap); }
+        }
+
+        #endregion
+
+        #region TabSpacing
+
+        /// <summary>
+        /// Tab Spacing
+        /// </summary>
+        internal override int TabSpacing
+        {
+            get
+            {
+                switch (TabStripItem.TabAlignment)
+                {
+                    case eTabStripAlignment.Top:
+                    case eTabStripAlignment.Bottom:
+                        return HTabSpacing;
+
+                    case eTabStripAlignment.Right:
+                        return TabStripItem.HorizontalText == false ? HTabSpacing : VTabSpacing;
+
+                    default:
+                        return VTabSpacing;
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region NextBlockPosition
+
+        /// <summary>
+        /// Gets the next layout block position
+        /// </summary>
+        /// <param name="e">LayoutManagerPositionEventArgs</param>
+        protected override void NextBlockPosition(LayoutManagerPositionEventArgs e)
+        {
+            int n = Tabs.IndexOf((BaseItem)e.Block);
+
+            if (n >= 0 && n + 1 < Tabs.Count)
+            {
+                SuperTabItem tab1 = Tabs[n] as SuperTabItem;
+
+                if (tab1 != null)
+                {
+                    SuperTabItem tab2 = Tabs[n + 1] as SuperTabItem;
+
+                    if (tab2 != null)
+                    {
+                        e.NextPosition = e.CurrentPosition;
+
+                        if (TabStripItem.IsVertical == true)
+                            e.NextPosition.Y += (e.Block.Bounds.Height - VTabOverLap);
+                        else
+                            e.NextPosition.X += (e.Block.Bounds.Width - HTabOverLap);
+
+                        e.Cancel = true;
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region NextBlockPosition
+
+        /// <summary>
+        /// Gets the next block position when attempting
+        /// to make a specific tab visible
+        /// </summary>
+        /// <param name="item">Potential item to replace</param>
+        /// <param name="vItem">View item being placed</param>
+        /// <returns>Block Rectangle</returns>
+        internal override Rectangle NextBlockPosition(BaseItem item, BaseItem vItem)
+        {
+            Rectangle r = base.NextBlockPosition(item, vItem);
+
+            if (item is SuperTabItem && vItem is SuperTabItem)
+            {
+                if (TabStripItem.IsVertical == true)
+                    r.Y -= VTabOverLap;
+                else
+                    r.X -= HTabOverLap;
+            }
+
+            return (r);
+        }
+
+        #endregion
+
+        #region AddDefaultPadding
+
+        internal override void AddDefaultPadding(ref Size size)
+        {
+            base.AddDefaultPadding(ref size);
+
+            if (TabStripItem.IsVertical == false || TabStripItem.HorizontalText == false)
+                size.Height += Dpi.Height7;
+        }
+
+        #endregion
+
+        #region DrawStripBorder
+
+        protected override void DrawStripBorder(ItemPaintArgs p, Rendering.SuperTabColorTable ct)
+        {
+            Graphics g = p.Graphics;
+
+            Rectangle t = TabStripItem.SelectedTab != null ?
+                TabStripItem.SelectedTab.DisplayRectangle : Rectangle.Empty;
+
+            Rectangle r = GetStripeRect();
+
+            eTabState ts = GetTabState();
+            SuperTabItemStateColorTable tct = TabStripItem.SelectedTab.GetTabColorTable(ts);
+
+            if (tct.Background.Colors != null)
+            {
+                using (Brush br = new SolidBrush(tct.Background.Colors[tct.Background.Colors.Length - 1]))
+                {
+                    SmoothingMode mode = g.SmoothingMode;
+                    g.SmoothingMode = SmoothingMode.None;
+
+                    g.FillRectangle(br, r);
+
+                    g.SmoothingMode = mode;
+                }
+            }
+
+            if (ct.InnerBorder.IsEmpty == false)
+                RenderInnerBorder(g, ct, r, t);
+
+            if (ct.OuterBorder.IsEmpty == false)
+                RenderOuterBorder(g, ct, r, t);
+        }
+
+        #region RenderInnerBorder
+
+        private void RenderInnerBorder(Graphics g, 
+            Rendering.SuperTabColorTable ct, Rectangle r, Rectangle t)
+        {
+            using (Pen pen = new Pen(ct.InnerBorder))
+            {
+                switch (TabStripItem.TabAlignment)
+                {
+                    case eTabStripAlignment.Top:
+                        if (t.X > r.X)
+                            g.DrawLine(pen, r.X, r.Y + Dpi.Height1, t.X + Dpi.Width4, r.Y + Dpi.Height1);
+
+                        if (t.Right < r.Right)
+                            g.DrawLine(pen, t.Right - Dpi.Width4, r.Y + Dpi.Height1, r.Right - Dpi.Width1, r.Y + Dpi.Height1);
+
+                        g.DrawLine(pen, r.X + Dpi.Width1, r.Y + Dpi.Height1, r.X + Dpi.Width1, r.Y + Dpi.Height7);
+                        g.DrawLine(pen, r.Right - Dpi.Width2, r.Y + Dpi.Height1, r.Right - Dpi.Width2, r.Y + Dpi.Height7);
+                        break;
+
+                    case eTabStripAlignment.Bottom:
+                        if (t.X > r.X)
+                            g.DrawLine(pen, r.X, r.Bottom - 1, t.X + 3, r.Bottom - 1);
+
+                        if (t.Right < r.Right)
+                            g.DrawLine(pen, t.Right - 3, r.Bottom - 1, r.Right - 1, r.Bottom - 1);
+
+                        g.DrawLine(pen, r.X + 1, r.Bottom - 2, r.X + 1, r.Bottom - 7);
+                        g.DrawLine(pen, r.Right - 2, r.Bottom - 2, r.Right - 2, r.Bottom - 7);
+                        break;
+
+                    case eTabStripAlignment.Left:
+                        if (t.Y > 0)
+                            g.DrawLine(pen, r.X + 1, r.Y, r.X + 1, t.Y + 3);
+
+                        if (t.Bottom < r.Bottom)
+                            g.DrawLine(pen, r.X + 1, t.Bottom + 3, r.X + 1, r.Bottom - 3);
+
+                        g.DrawLine(pen, r.X, r.Y + 1, r.X + 7, r.Y + 1);
+                        g.DrawLine(pen, r.X, r.Bottom - 2, r.X + 7, r.Bottom - 2);
+                        break;
+
+                    case eTabStripAlignment.Right:
+                        if (t.Y > 0)
+                            g.DrawLine(pen, r.Right - 1, r.Y, r.Right - 1, t.Y + 3);
+
+                        if (t.Bottom < r.Bottom)
+                            g.DrawLine(pen, r.Right - 1, t.Bottom + 2, r.Right - 1, r.Bottom - 1);
+
+                        g.DrawLine(pen, r.X, r.Y + 1, r.Right, r.Y + 1);
+                        g.DrawLine(pen, r.X, r.Bottom - 2, r.Right, r.Bottom - 2);
+                        break;
+                }
+            }
+        }
+
+        #endregion
+
+        #region RenderOuterBorder
+
+        private void RenderOuterBorder(Graphics g, SuperTabColorTable ct, Rectangle r, Rectangle t)
+        {
+            using (Pen pen = new Pen(ct.OuterBorder))
+            {
+                switch (TabStripItem.TabAlignment)
+                {
+                    case eTabStripAlignment.Top:
+                        if (t.X > r.X)
+                            g.DrawLine(pen, r.X, r.Y, t.X + 4, r.Y);
+
+                        if (t.Right < r.Right)
+                            g.DrawLine(pen, t.Right - 4, r.Y, r.Right - 2, r.Y);
+
+                        g.DrawLine(pen, r.X, r.Y, r.X, r.Y + 7);
+                        g.DrawLine(pen, r.Right - 1, r.Y, r.Right - 1, r.Y + 7);
+                        break;
+
+                    case eTabStripAlignment.Bottom:
+                        if (t.X > r.X)
+                            g.DrawLine(pen, r.X, r.Bottom, t.X, r.Bottom);
+
+                        if (t.Right < r.Right)
+                            g.DrawLine(pen, t.Right, r.Bottom, r.Right - 2, r.Bottom);
+
+                        g.DrawLine(pen, r.X, r.Bottom, r.X, r.Bottom - 7);
+                        g.DrawLine(pen, r.Right - 1, r.Bottom, r.Right - 1, r.Bottom - 7);
+                        break;
+
+                    case eTabStripAlignment.Left:
+                        if (t.Y > 0)
+                            g.DrawLine(pen, r.X, r.Y, r.X, t.Y + 3);
+
+                        if (t.Bottom < r.Bottom)
+                            g.DrawLine(pen, r.X, t.Bottom + 2, r.X, r.Bottom - 3);
+
+                        g.DrawLine(pen, r.X, r.Y, r.X + 7, r.Y);
+                        g.DrawLine(pen, r.X, r.Bottom - 1, r.X + 7, r.Bottom - 1);
+                        break;
+
+                    case eTabStripAlignment.Right:
+                        if (t.Y > 0)
+                            g.DrawLine(pen, r.Right, r.Y, r.Right, t.Y);
+
+                        if (t.Bottom < r.Bottom)
+                            g.DrawLine(pen, r.Right, t.Bottom + 3, r.Right, r.Bottom - 1);
+
+                        g.DrawLine(pen, r.X, r.Y, r.Right, r.Y);
+                        g.DrawLine(pen, r.X, r.Bottom - 1, r.Right, r.Bottom - 1);
+                        break;
+                }
+            }
+        }
+
+        #endregion
+
+        #region GetStripeRect
+
+        private Rectangle GetStripeRect()
+        {
+            Rectangle r = TabStripItem.Bounds;
+
+            switch (TabStripItem.TabAlignment)
+            {
+                case eTabStripAlignment.Top:
+                    r.Y = r.Bottom - Dpi.Height7 - Dpi.Height1;
+                    break;
+
+                case eTabStripAlignment.Bottom:
+                    r.Y -= Dpi.Height1;
+                    r.Height = Dpi.Height7 + Dpi.Height1;
+                    break;
+
+                case eTabStripAlignment.Left:
+                    r.X = r.Right - Dpi.Width7 - Dpi.Width1;
+                    break;
+
+                default:
+                    r.X -= Dpi.Width1;
+                    r.Width = Dpi.Width7 + Dpi.Width1;
+                    break;
+            }
+
+            return (r);
+        }
+
+        #endregion
+
+        #region GetTabState
+
+        private eTabState GetTabState()
+        {
+            SuperTabItem tab = TabStripItem.SelectedTab;
+
+            if (tab.Enabled == false)
+                return (eTabState.Disabled);
+
+            return (tab.IsSelected ? eTabState.Selected : eTabState.Default);
+        }
+
+        #endregion
+
+        #endregion
+
+    }
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/SuperTabControl/OneNote2007/OneNote2007SuperTabItem.cs b/PROMS/DotNetBar Source Code/SuperTabControl/OneNote2007/OneNote2007SuperTabItem.cs
new file mode 100644
index 00000000..2dbe5e6c
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/SuperTabControl/OneNote2007/OneNote2007SuperTabItem.cs	
@@ -0,0 +1,231 @@
+#if FRAMEWORK20
+using System.Drawing;
+using System.Drawing.Drawing2D;
+
+namespace DevComponents.DotNetBar
+{
+    public class OneNote2007SuperTabItem : SuperTabItemBaseDisplay
+    {
+        #region Constants
+
+        private const int Radius = 10;
+
+        #endregion
+
+        /// <summary>
+        /// Constructor for OneNote2007 style SuperTabItem base display
+        /// </summary>
+        /// <param name="tabItem">Associated SuperTabItem</param>
+        public OneNote2007SuperTabItem(SuperTabItem tabItem)
+            : base(tabItem)
+        {
+        }
+
+        #region ContentRectangle
+
+        /// <summary>
+        /// Calculates the Content Rectangle for the tab
+        /// </summary>
+        /// <returns>Content Rectangle</returns>
+        internal override Rectangle ContentRectangle()
+        {
+            Rectangle r = TabItem.DisplayRectangle;
+
+            int n = TabStripItem.TabDisplay.TabOverlap + TabStripItem.TabDisplay.TabSpacing;
+
+            if (TabStripItem.IsVertical == true)
+                r.Height -= n;
+            else
+                r.Width -= n;
+
+            return (r);
+        }
+
+        #endregion
+
+        #region TabItemPath
+
+        /// <summary>
+        /// Creates the tab item GraphicsPath
+        /// </summary>
+        /// <returns>Tab path</returns>
+        internal override GraphicsPath TabItemPath()
+        {
+            GraphicsPath path = base.TabItemPath();
+
+            if (path != null)
+                return (path);
+
+            switch (TabItem.TabAlignment)
+            {
+                case eTabStripAlignment.Top:
+                    return (TopTabPath());
+
+                case eTabStripAlignment.Bottom:
+                    return (BottomTabPath());
+
+                case eTabStripAlignment.Left:
+                    return (LeftTabPath());
+
+                default:
+                    return (RightTabPath());
+            }
+        }
+
+        #region TopTabPath
+
+        /// <summary>
+        /// Create the Top tab path
+        /// </summary>
+        /// <returns>GraphicsPath</returns>
+        private GraphicsPath TopTabPath()
+        {
+            Rectangle r = TabItem.DisplayRectangle;
+            r.Width -= 1;
+            r.Height -= 1;
+
+            // Allow for the TabStrip border
+
+            if (TabItem.IsSelected == true)
+                r.Height += 2;
+
+            // Create the path
+
+            GraphicsPath path = new GraphicsPath();
+
+            int n = TabStripItem.TabDisplay.TabOverlap + TabStripItem.TabDisplay.TabSpacing * 2;
+
+            Rectangle ar = new Rectangle(r.X, r.Y, Radius, Radius);
+
+            path.AddLine(r.X, r.Bottom, r.X, r.Top + Radius);
+            path.AddArc(ar, 180, 90);
+            path.AddLine(r.Right - n, r.Top, r.Right, r.Bottom);
+
+            return (path);
+        }
+
+        #endregion
+
+        #region BottomTabPath
+
+        /// <summary>
+        /// Creates the Bottom tab path
+        /// </summary>
+        /// <returns>GraphicsPath</returns>
+        private GraphicsPath BottomTabPath()
+        {
+            Rectangle r = TabItem.DisplayRectangle;
+            r.Width -= 1;
+            r.Height -= 1;
+
+            // Allow for the TabStrip border
+
+            if (TabItem.IsSelected == true)
+            {
+                r.Y -= 2;
+                r.Height += 2;
+            }
+
+            // Create the path
+
+            GraphicsPath path = new GraphicsPath();
+
+            int n = TabStripItem.TabDisplay.TabOverlap + TabStripItem.TabDisplay.TabSpacing * 2;
+
+            Rectangle ar = new
+                Rectangle(r.X, r.Bottom - Radius, Radius, Radius);
+
+            path.AddLine(r.Right, r.Top, r.Right - n, r.Bottom);
+            path.AddArc(ar, 90, 90);
+            path.AddLine(r.X, r.Bottom - Radius, r.X, r.Top);
+
+
+            return (path);
+        }
+
+        #endregion
+
+        #region LeftTabPath
+
+        /// <summary>
+        /// Creates the Left tab path
+        /// </summary>
+        /// <returns>GraphicsPath</returns>
+        private GraphicsPath LeftTabPath()
+        {
+            Rectangle r = TabItem.DisplayRectangle;
+            r.Width -= 1;
+            r.Height -= 1;
+
+            // Allow for the TabStrip border
+
+            if (TabItem.IsSelected == true)
+                r.Width += 2;
+
+            // Create the tab path
+
+            GraphicsPath path = new GraphicsPath();
+
+            int n = TabStripItem.TabDisplay.TabOverlap + TabStripItem.TabDisplay.TabSpacing;
+
+            Rectangle ar = new
+                Rectangle(r.X, r.Top, Radius, Radius);
+
+            path.AddLine(r.Right, r.Top, r.X + Radius, r.Top);
+            path.AddArc(ar, -90, -90);
+
+            path.AddLine(r.X, r.Top + Radius, r.X, r.Bottom - n);
+            path.AddLine(r.X, r.Bottom - n, r.Right, r.Bottom);
+
+            return (path);
+        }
+
+        #endregion
+
+        #region RightTabPath
+
+        /// <summary>
+        /// Create the Right tab path
+        /// </summary>
+        /// <returns>GraphicsPath</returns>
+        private GraphicsPath RightTabPath()
+        {
+            GraphicsPath path = new GraphicsPath();
+
+            Rectangle r = TabItem.DisplayRectangle;
+            r.Width -= 1;
+            r.Height -= 1;
+
+            // Allow for the TabStrip border
+
+            if (TabItem.IsSelected == true)
+            {
+                r.X -= 2;
+                r.Width += 2;
+            }
+
+            // Create the tab path
+
+            int n = TabStripItem.TabDisplay.TabOverlap + TabStripItem.TabDisplay.TabSpacing;
+
+            if (TabStripItem.HorizontalText == false)
+                n += TabStripItem.TabDisplay.TabSpacing;
+
+            Rectangle ar = new
+                Rectangle(r.Right - Radius, r.Top, Radius, Radius);
+
+            path.AddLine(r.X, r.Top, r.Right - Radius, r.Top);
+            path.AddArc(ar, 270, 90);
+
+            path.AddLine(r.Right, r.Top + Radius, r.Right, r.Bottom - n);
+            path.AddLine(r.Right, r.Bottom - n, r.X, r.Bottom);
+
+            return (path);
+        }
+
+        #endregion
+
+        #endregion
+    }
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/SuperTabControl/OneNote2007/OneNote2007SuperTabStrip.cs b/PROMS/DotNetBar Source Code/SuperTabControl/OneNote2007/OneNote2007SuperTabStrip.cs
new file mode 100644
index 00000000..cde0c9fb
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/SuperTabControl/OneNote2007/OneNote2007SuperTabStrip.cs	
@@ -0,0 +1,150 @@
+#if FRAMEWORK20
+using System.Drawing;
+using DevComponents.UI.ContentManager;
+
+namespace DevComponents.DotNetBar
+{
+    internal class OneNote2007SuperTabStrip : SuperTabStripBaseDisplay
+    {
+        #region Constants
+
+        private const int HTabSpacing = 5;
+        private const int HTabOverLap = 10;
+
+        private const int VTabSpacing = 7;
+        private const int VTabOverLap = 10;
+
+        #endregion
+
+        /// <summary>
+        /// OneNote2007 SuperTabStripBaseDisplay
+        /// </summary>
+        /// <param name="tabStripItem">Associated TabStripItem</param>
+        public OneNote2007SuperTabStrip(SuperTabStripItem tabStripItem)
+            : base(tabStripItem)
+        {
+        }
+
+        #region Internal properties
+
+        #region MinTabSize
+
+        /// <summary>
+        /// Returns the Minimum tab size for this style
+        /// </summary>
+        internal override Size MinTabSize
+        {
+            get
+            {
+                if (TabStripItem.IsVertical == true && TabStripItem.HorizontalText == true)
+                    return (new Size(28, 30));
+
+                return (new Size(28, 16));
+            }
+        }
+
+        #endregion
+
+        #region TabOverlap
+
+        /// <summary>
+        /// Tab Overlap
+        /// </summary>
+        internal override int TabOverlap
+        {
+            get { return (TabStripItem.IsVertical ? VTabOverLap : HTabOverLap); }
+        }
+
+        #endregion
+
+        #region TabSpacing
+
+        /// <summary>
+        /// Tab Spacing
+        /// </summary>
+        internal override int TabSpacing
+        {
+            get
+            {
+                switch (TabStripItem.TabAlignment)
+                {
+                    case eTabStripAlignment.Top:
+                    case eTabStripAlignment.Bottom:
+                        return (HTabSpacing);
+
+                    case eTabStripAlignment.Right:
+                        return (TabStripItem.HorizontalText == false ? HTabSpacing : VTabSpacing);
+
+                    default:
+                        return (VTabSpacing);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region NextBlockPosition
+
+        /// <summary>
+        /// Gets the next layout block position
+        /// </summary>
+        /// <param name="e">LayoutManagerPositionEventArgs</param>
+        protected override void NextBlockPosition(LayoutManagerPositionEventArgs e)
+        {
+            int n = Tabs.IndexOf((BaseItem)e.Block);
+
+            if (n >= 0 && n + 1 < Tabs.Count)
+            {
+                SuperTabItem tab1 = Tabs[n] as SuperTabItem;
+
+                if (tab1 != null)
+                {
+                    SuperTabItem tab2 = Tabs[n + 1] as SuperTabItem;
+
+                    if (tab2 != null)
+                    {
+                        e.NextPosition = e.CurrentPosition;
+
+                        if (TabStripItem.IsVertical == true)
+                            e.NextPosition.Y += (e.Block.Bounds.Height - VTabOverLap);
+                        else
+                            e.NextPosition.X += (e.Block.Bounds.Width - HTabOverLap);
+
+                        e.Cancel = true;
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region NextBlockPosition
+
+        /// <summary>
+        /// Gets the next block position when attempting
+        /// to make a specific tab visible
+        /// </summary>
+        /// <param name="item">Potential item to replace</param>
+        /// <param name="vItem">View item being placed</param>
+        /// <returns>Block Rectangle</returns>
+        internal override Rectangle NextBlockPosition(BaseItem item, BaseItem vItem)
+        {
+            Rectangle r = base.NextBlockPosition(item, vItem);
+
+            if (item is SuperTabItem && vItem is SuperTabItem)
+            {
+                if (TabStripItem.IsVertical == true)
+                    r.Y -= VTabOverLap;
+                else
+                    r.X -= HTabOverLap;
+            }
+
+            return (r);
+        }
+
+        #endregion
+    }
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/SuperTabControl/SuperTabControl/SuperTabControl.cs b/PROMS/DotNetBar Source Code/SuperTabControl/SuperTabControl/SuperTabControl.cs
new file mode 100644
index 00000000..bc3216bc
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/SuperTabControl/SuperTabControl/SuperTabControl.cs	
@@ -0,0 +1,1892 @@
+#if FRAMEWORK20
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.Rendering;
+
+namespace DevComponents.DotNetBar
+{
+    [ToolboxItem(true)]
+    [DefaultEvent("SelectedTabChanged")]
+    [Designer("DevComponents.DotNetBar.Design.SuperTabControlDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+    public class SuperTabControl : Control, ISupportInitialize
+    {
+        #region Events
+
+        /// <summary>
+        /// Occurs when a tab is added to the Tabs collection
+        /// </summary>
+        [Description("Occurs when a tab is added to the Tabs collection.")]
+        public event EventHandler<SuperTabStripTabItemOpenEventArgs> TabItemOpen;
+
+        /// <summary>
+        /// Occurs when a tab is about to Close
+        /// </summary>
+        [Description("Occurs when a tab is about to Close.")]
+        public event EventHandler<SuperTabStripTabItemCloseEventArgs> TabItemClose;
+
+        /// <summary>
+        /// Occurs when a tab is removed from the Tabs collection
+        /// </summary>
+        [Description("Occurs when a tab is removed from the Tabs collection.")]
+        public event EventHandler<SuperTabStripTabRemovedEventArgs> TabRemoved;
+        
+        /// <summary>
+        /// Occurs when a tab is about to be displayed
+        /// </summary>
+        [Description("Occurs when a tab is about to be displayed.")]
+        public event EventHandler<SuperTabStripBeforeTabDisplayEventArgs> BeforeTabDisplay;
+
+        /// <summary>
+        /// Occurs when a tab is being moved or dragged by the user
+        /// </summary>
+        [Description("Occurs when a tab is being moved or dragged by the user.")]
+        public event EventHandler<SuperTabStripTabMovingEventArgs> TabMoving;
+
+        /// <summary>
+        /// Occurs when a tab has been moved or dragged by the user
+        /// </summary>
+        [Description("Occurs when a tab has been moved or dragged by the user.")]
+        public event EventHandler<SuperTabStripTabMovedEventArgs> TabMoved;
+
+        /// <summary>
+        /// Occurs when the Selected tab is changing
+        /// </summary>
+        [Description("Occurs when the Selected tab is changing.")]
+        public event EventHandler<SuperTabStripSelectedTabChangingEventArgs> SelectedTabChanging;
+
+        /// <summary>
+        /// Occurs when the Selected tab has changed
+        /// </summary>
+        [Description("Occurs when the Selected tab has changed.")]
+        public event EventHandler<SuperTabStripSelectedTabChangedEventArgs> SelectedTabChanged;
+
+        /// <summary>
+        /// Occurs when the control needs a tab's bordering path
+        /// </summary>
+        [Description("Occurs when the control needs a tab's bordering path.")]
+        public event EventHandler<SuperTabGetTabItemPathEventArgs> GetTabItemPath;
+
+        /// <summary>
+        /// Occurs when the control needs a tab's Content Rectangle
+        /// </summary>
+        [Description("Occurs when the control needs a tab's Content Rectangle.")]
+        public event EventHandler<SuperTabGetTabItemContentRectangleEventArgs> GetTabItemContentRectangle;
+
+        /// <summary>
+        /// Occurs when the control needs to measure a tab
+        /// </summary>
+        [Description("Occurs when the control needs to measure a tab.")]
+        public event EventHandler<SuperTabMeasureTabItemEventArgs> MeasureTabItem;
+
+        /// <summary>
+        /// Occurs before any tab rendering is done
+        /// </summary>
+        [Description("Occurs before any tab rendering is done.")]
+        public event EventHandler<SuperTabPreRenderTabItemEventArgs> PreRenderTabItem;
+
+        /// <summary>
+        /// Occurs After all tab rendering is complete
+        /// </summary>
+        [Description("Occurs After all tab rendering is complete.")]
+        public event EventHandler<SuperTabPostRenderTabItemEventArgs> PostRenderTabItem;
+
+        /// <summary>
+        /// Occurs when the control needs to get the tab's Text Bounds
+        /// </summary>
+        [Description("Occurs when the control needs to get the tab's Text Bounds.")]
+        public event EventHandler<SuperTabGetTabTextBoundsEventArgs> GetTabTextBounds;
+
+        /// <summary>
+        /// Occurs when the control needs to get the tab's Image Bounds
+        /// </summary>
+        [Description("Occurs when the control needs to get the tab's Image Bounds.")]
+        public event EventHandler<SuperTabGetTabImageBoundsEventArgs> GetTabImageBounds;
+
+        /// <summary>
+        /// Occurs when the control needs to get the tab's Close Button Bounds
+        /// </summary>
+        [Description("Occurs when the control needs to get the tab's Close Button Bounds.")]
+        public event EventHandler<SuperTabGetTabCloseBoundsEventArgs> GetTabCloseBounds;
+
+        /// <summary>
+        /// Occurs when the TabStrip background needs painted
+        /// </summary>
+        [Description("Occurs when the TabStrip background needs painted.")]
+        public event EventHandler<SuperTabStripPaintBackgroundEventArgs> TabStripPaintBackground;
+
+        /// <summary>
+        /// Occurs when a TabStrip MouseUp event is raised
+        /// </summary>
+        [Description("Occurs when a TabStrip MouseUp event is raised.")]
+        public event EventHandler<MouseEventArgs> TabStripMouseUp;
+
+        /// <summary>
+        /// Occurs when a TabStrip MouseDown event is raised
+        /// </summary>
+        [Description("Occurs when a TabStrip MouseDown event is raised.")]
+        public event EventHandler<MouseEventArgs> TabStripMouseDown;
+
+        /// <summary>
+        /// Occurs when a TabStrip MouseMove event is raised
+        /// </summary>
+        [Description("Occurs when a TabStrip MouseMove event is raised.")]
+        public event EventHandler<MouseEventArgs> TabStripMouseMove;
+
+        /// <summary>
+        /// Occurs when a TabStrip MouseClick event is raised
+        /// </summary>
+        [Description("Occurs when a TabStrip MouseClick event is raised.")]
+        public event EventHandler<MouseEventArgs> TabStripMouseClick;
+
+        /// <summary>
+        /// Occurs when a TabStrip MouseDoubleClick event is raised
+        /// </summary>
+        [Description("Occurs when a TabStrip MouseDoubleClick event is raised.")]
+        public event EventHandler<MouseEventArgs> TabStripMouseDoubleClick;
+
+        /// <summary>
+        /// Occurs when a TabStrip MouseEnter event is raised
+        /// </summary>
+        [Description("Occurs when a TabStrip MouseEnter event is raised.")]
+        public event EventHandler<EventArgs> TabStripMouseEnter;
+
+        /// <summary>
+        /// Occurs when a TabStrip MouseHover event is raised
+        /// </summary>
+        [Description("Occurs when a TabStrip MouseHover event is raised.")]
+        public event EventHandler<EventArgs> TabStripMouseHover;
+
+        /// <summary>
+        /// Occurs when a TabStrip MouseLeave event is raised
+        /// </summary>
+        [Description("Occurs when a TabStrip MouseLeave event is raised.")]
+        public event EventHandler<EventArgs> TabStripMouseLeave;
+
+        #endregion
+
+        #region Private variables
+
+        private readonly SuperTabStrip _TabStrip;
+
+        private bool _Initializing;
+        private bool _TabsVisible = true;
+        private int _LoadSelectedTabIndex = -1;
+
+        #endregion
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        public SuperTabControl()
+        {
+            _TabStrip = new SuperTabStrip();
+
+            Controls.Add(_TabStrip);
+
+            _TabStrip.Dock = DockStyle.Top;
+            _TabStrip.AutoSelectAttachedControl = true;
+            _TabStrip.SendToBack();
+
+            HookEvents(true);
+
+            SetStyle(ControlStyles.SupportsTransparentBackColor, true);
+
+            StyleManager.Register(this);
+        }
+
+        #region Public properties
+
+        #region TabStripTabStop
+        /// <summary>
+        /// Gets or sets whether TabStrip will get focus when Tab key is used. Default value is false.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Gets or sets whether TabStrip will get focus when Tab key is used.")]
+        public bool TabStripTabStop
+        {
+            get { return TabStrip.TabStop; }
+            set { TabStrip.TabStop = value; }
+        }
+
+        protected override void OnGotFocus(EventArgs e)
+        {
+            if (TabStripTabStop)
+                TabStrip.Focus();
+
+            base.OnGotFocus(e);
+        }
+        #endregion
+
+        #region AntiAlias
+
+        [Browsable(true), DefaultValue(true), Category("Appearance")]
+        [Description("Gets or sets whether anti-aliasing is used while painting.")]
+        public bool AntiAlias
+        {
+            get { return (_TabStrip.AntiAlias); }
+            set { _TabStrip.AntiAlias = value; }
+        }
+
+        #endregion
+
+        #region CloseButton properties
+
+        #region AutoCloseTabs
+
+        /// <summary>
+        /// Gets or sets whether tabs are automatically closed when a close button is clicked
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Close Button")]
+        [Description("Indicates whether tab is automatically closed when close button is clicked.")]
+        public bool AutoCloseTabs
+        {
+            get { return (_TabStrip.AutoCloseTabs); }
+            set { _TabStrip.AutoCloseTabs = value; }
+        }
+
+        #endregion
+
+        #region CloseButtonOnTabsAlwaysDisplayed
+
+        /// <summary>
+        /// Gets or sets whether the tab's visible close button is displayed for every tab state
+        /// </summary>
+        [Browsable(true), DefaultValue(true), DevCoBrowsable(true), Category("Close Button")]
+        [Description("Indicates whether the tab's visible close button is displayed for every tab state.")]
+        public bool CloseButtonOnTabsAlwaysDisplayed
+        {
+            get { return (_TabStrip.CloseButtonOnTabsAlwaysDisplayed); }
+            set { _TabStrip.CloseButtonOnTabsAlwaysDisplayed = value; }
+        }
+
+        #endregion
+
+        #region CloseButtonOnTabsVisible
+
+        /// <summary>
+        /// Gets or sets whether close button is visible on each tab
+        /// </summary>
+        [Browsable(true), DefaultValue(false), DevCoBrowsable(true), Category("Close Button")]
+        [Description("Indicates whether close button is visible on each tab.")]
+        public bool CloseButtonOnTabsVisible
+        {
+            get { return (_TabStrip.CloseButtonOnTabsVisible); }
+            set { _TabStrip.CloseButtonOnTabsVisible = value; }
+        }
+
+        #endregion
+
+        #region CloseButtonPosition
+
+        /// <summary>
+        /// Gets or sets the position of the tab close button
+        /// </summary>
+        [Browsable(true), DefaultValue(eTabCloseButtonPosition.Right), DevCoBrowsable(true)]
+        [Category("Close Button"), Description("Indicates the position of the tab close button.")]
+        public eTabCloseButtonPosition CloseButtonPosition
+        {
+            get { return (_TabStrip.CloseButtonPosition); }
+            set { _TabStrip.CloseButtonPosition = value; }
+        }
+
+        #endregion
+
+        #region TabCloseButtonNormal
+
+        /// <summary>
+        /// Gets or sets the custom tab Close button image
+        /// </summary>
+        [Browsable(true), DefaultValue(null), Category("Close Button")]
+        [Description("Indicates the custom tab Close button image.")]
+        public Image TabCloseButtonNormal
+        {
+            get { return (_TabStrip.TabCloseButtonNormal); }
+            set { _TabStrip.TabCloseButtonNormal = value; }
+        }
+
+        #endregion
+
+        #region TabCloseButtonHot
+
+        /// <summary>
+        /// Gets or sets the custom Close button image that is used on tabs when the mouse is over the close button
+        /// </summary>
+        [Browsable(true), DefaultValue(null), Category("Close Button")]
+        [Description("Indicates custom Close button image that is used on tabs when the mouse is over the close button.")]
+        public Image TabCloseButtonHot
+        {
+            get { return (_TabStrip.TabCloseButtonHot); }
+            set { _TabStrip.TabCloseButtonHot = value; }
+        }
+
+        #endregion
+
+        #region TabCloseButtonPressed
+
+        /// <summary>
+        /// Gets or sets the custom Close button image that is used on tabs when the button has been pressed
+        /// </summary>
+        [Browsable(true), DefaultValue(null), Category("Close Button")]
+        [Description("Indicates custom Close button image that is used on tabs when the button has been pressed.")]
+        public Image TabCloseButtonPressed
+        {
+            get { return (_TabStrip.TabCloseButtonPressed); }
+            set { _TabStrip.TabCloseButtonPressed = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ControlBox
+
+        /// <summary>
+        /// Gets the TabStrip ControlBox
+        /// </summary>
+        [Browsable(true), Category("Appearance")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        [Description("Gets the TabStrip ControlBox.")]
+        public SuperTabControlBox ControlBox
+        {
+            get { return (_TabStrip.ControlBox); }
+        }
+
+        #endregion
+
+        #region DisplaySelectedTextOnly
+
+        /// <summary>
+        /// Gets or sets whether the only Text displayed is for the SelectedTab
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Category("Behavior"), DefaultValue(false)]
+        [Description("Specifies whether the only Text displayed is for the SelectedTab.")]
+        public bool DisplaySelectedTextOnly
+        {
+            get { return (_TabStrip.DisplaySelectedTextOnly); }
+            set { _TabStrip.DisplaySelectedTextOnly = value; }
+        }
+
+        #endregion
+
+        #region HorizontalText
+
+        /// <summary>
+        /// Gets or sets whether text is drawn horizontally regardless of tab orientation
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Appearance")]
+        [Description("Indicates whether text is drawn horizontally regardless of tab orientation.")]
+        public bool HorizontalText
+        {
+            get { return (_TabStrip.HorizontalText); }
+            set { _TabStrip.HorizontalText = value; }
+        }
+
+        #endregion
+
+        #region ImageAlignment
+
+        /// <summary>
+        /// Gets or sets the default alignment of the Image within the tab
+        /// </summary>
+        [DefaultValue(ImageAlignment.NotSet), Category("Appearance")]
+        [Description("Indicates the default alignment of the Image within the tab.")]
+        public ImageAlignment ImageAlignment
+        {
+            get { return (_TabStrip.ImageAlignment); }
+            set { _TabStrip.ImageAlignment = value; }
+        }
+
+        #endregion
+
+        #region ImageList
+
+        /// <summary>
+        /// Gets or sets the ImageList used by the TabStrip and its tab items
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Category("Appearance"), DefaultValue(null)]
+        [Description("Indicates the ImageList used by the TabStrip and its tab items.")]
+        public ImageList ImageList
+        {
+            get { return (_TabStrip.ImageList); }
+            set { _TabStrip.ImageList = value; }
+        }
+
+        #endregion
+
+        #region ItemPadding
+
+        /// <summary>
+        /// Gets or sets BaseItem tab padding in pixels.
+        /// </summary>
+        [Browsable(true), Category("Layout")]
+        [Description("Indicates BaseItem tab padding in pixels.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public Padding ItemPadding
+        {
+            get { return (_TabStrip.ItemPadding); }
+            set { _TabStrip.ItemPadding = value; }
+        }
+
+        #endregion
+
+        #region RotateVerticalText
+
+        /// <summary>
+        /// Gets or sets whether vertical tab text is rotated 180 degrees
+        /// </summary>
+        [Browsable(true), DefaultValue(false), Category("Layout")]
+        [Description("Indicates whether vertical tab text is rotated 180 degrees.")]
+        public bool RotateVerticalText
+        {
+            get { return (_TabStrip.RotateVerticalText); }
+            set { _TabStrip.RotateVerticalText = value; }
+        }
+
+        #endregion
+
+        #region SelectedPanel
+
+        /// <summary>
+        /// Gets or sets the SelectedTab based upon the given panel
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public SuperTabControlPanel SelectedPanel
+        {
+            get
+            {
+                if (_TabStrip.SelectedTab != null)
+                    return (_TabStrip.SelectedTab.AttachedControl as SuperTabControlPanel);
+
+                return (null);
+            }
+
+            set
+            {
+                if (value != null && Controls.Contains(value))
+                {
+                    if (value.TabItem != null && Tabs.Contains(value.TabItem))
+                        _TabStrip.SelectedTab = value.TabItem;
+                }
+            }
+        }
+
+        #endregion
+
+        #region ShowFocusRectangle
+
+        /// <summary>
+        /// Gets or sets whether a focus rectangle is displayed when tab has input focus
+        /// </summary>
+        [Browsable(true), DefaultValue(false), Category("Behavior")]
+        [Description("Indicates whether a focus rectangle is displayed when tab has input focus.")]
+        public bool ShowFocusRectangle
+        {
+            get { return (_TabStrip.ShowFocusRectangle); }
+            set { _TabStrip.ShowFocusRectangle = value; }
+        }
+
+        #endregion
+
+        #region Tab properties
+
+        #region FixedTabSize
+
+        /// <summary>
+        /// Gets or sets the fixed tab size in pixels. Either Height, Width, or both can be set
+        /// </summary>
+        [Browsable(true), Category("Appearance")]
+        [Description("Indicates the fixed tab size in pixels. Either Height, Width, or both can be set.")]
+        public Size FixedTabSize
+        {
+            get { return (_TabStrip.FixedTabSize); }
+            set { _TabStrip.FixedTabSize = value; }
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeFixedTabSize()
+        {
+            return (_TabStrip.ShouldSerializeFixedTabSize());
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetFixedTabSize()
+        {
+            TypeDescriptor.GetProperties(this)["FixedTabSize"].SetValue(this, Size.Empty);
+        }
+
+        #endregion
+
+        #region IsTabDragging
+
+        /// <summary>
+        /// Gets or sets whether a tab is currently in a drag operation
+        /// </summary>
+        [Browsable(false)]
+        public bool IsTabDragging
+        {
+            get { return (_TabStrip.IsTabDragging); }
+        }
+
+        #endregion
+
+        #region ReorderTabsEnabled
+
+        /// <summary>
+        /// Gets or sets whether tabs can be reordered through the user interface
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Category("Behavior")]
+        [Description("Indicates whether the control tabs can be reordered through the user interface.")]
+        public bool ReorderTabsEnabled
+        {
+            get { return (_TabStrip.ReorderTabsEnabled); }
+            set { _TabStrip.ReorderTabsEnabled = value; }
+        }
+
+        #endregion
+
+        #region SelectedTab
+
+        /// <summary>
+        /// Gets or sets the selected tab
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), Category("Behavior")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public SuperTabItem SelectedTab
+        {
+            get { return (_TabStrip.SelectedTab); }
+            set { _TabStrip.SelectedTab = value; }
+        }
+
+        #endregion
+
+        #region SelectedTabFont
+
+        /// <summary>
+        /// Gets or sets the selected tab Font
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true),  Localizable(true), Category("Style"), DefaultValue(null)]
+        [Description("Indicates the selected tab Font")]
+        public Font SelectedTabFont
+        {
+            get { return (_TabStrip.SelectedTabFont); }
+            set { _TabStrip.SelectedTabFont = value; }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeSelectedTabFont()
+        {
+            return (_TabStrip.ShouldSerializeSelectedTabFont());
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetSelectedTabFont()
+        {
+            _TabStrip.ResetSelectedTabFont();
+        }
+
+        #endregion
+
+        #region SelectedTabIndex
+
+        /// <summary>
+        /// Gets or sets the index of the selected tab
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Category("Behavior")]
+        [Description("Indicates the index of the selected tab.")]
+        public int SelectedTabIndex
+        {
+            get { return (_TabStrip.SelectedTabIndex); }
+
+            set
+            {
+                if (_Initializing == true)
+                    _LoadSelectedTabIndex = value;
+                else
+                    _TabStrip.SelectedTabIndex = value;
+            }
+        }
+
+        #endregion
+
+        #region TabAlignment
+
+        /// <summary>
+        /// Gets or sets the tab alignment within the Tab-Strip control
+        /// </summary>
+        [Browsable(true), DefaultValue(eTabStripAlignment.Top), DevCoBrowsable(true)]
+        [Category("Appearance"), Description("Indicates the tab alignment within the Tab-Strip control.")]
+        public eTabStripAlignment TabAlignment
+        {
+            get { return (_TabStrip.TabAlignment); }
+
+            set
+            {
+                if (_TabStrip.TabAlignment != value)
+                {
+                    _TabStrip.TabAlignment = value;
+
+                    SetTabDocking(value);
+                }
+            }
+        }
+
+        #region SetTabDocking
+
+        /// <summary>
+        /// Sets the tab docking based upon the given alignment
+        /// </summary>
+        /// <param name="value"></param>
+        private void SetTabDocking(eTabStripAlignment value)
+        {
+            _TabStrip.SuspendLayout();
+
+            try
+            {
+                switch (value)
+                {
+                    case eTabStripAlignment.Top:
+                        _TabStrip.Dock = DockStyle.Top;
+                        break;
+
+                    case eTabStripAlignment.Bottom:
+                        _TabStrip.Dock = DockStyle.Bottom;
+                        break;
+
+                    case eTabStripAlignment.Left:
+                        _TabStrip.Dock = DockStyle.Left;
+                        break;
+
+                    case eTabStripAlignment.Right:
+                        _TabStrip.Dock = DockStyle.Right;
+                        break;
+                }
+
+                _TabStrip.SendToBack();
+            }
+            finally
+            {
+                _TabStrip.ResumeLayout(true);
+            }
+
+            RefreshPanelsStyle();
+
+            RecalcLayout();
+        }
+
+        #endregion
+
+        #endregion
+
+        #region TabFont
+
+        /// <summary>
+        /// Gets or sets the tab Font
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true),  Localizable(true), Category("Style"), DefaultValue(null)]
+        [Description("Indicates the tab Font")]
+        public Font TabFont
+        {
+            get { return (_TabStrip.TabFont); }
+            set { _TabStrip.TabFont = value; }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeTabFont()
+        {
+            return (_TabStrip.ShouldSerializeTabFont());
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetTabFont()
+        {
+            _TabStrip.ResetTabFont();
+        }
+
+        #endregion
+
+        #region TabHorizontalSpacing
+
+        /// <summary>
+        /// Gets or sets the Horizontal spacing around tab elements
+        /// </summary>
+        [Browsable(true), DefaultValue(5), Category("Appearance")]
+        [Description("Indicates the Horizontal spacing around tab elements.")]
+        public int TabHorizontalSpacing
+        {
+            get { return (_TabStrip.TabHorizontalSpacing); }
+            set { _TabStrip.TabHorizontalSpacing = value; }
+        }
+
+        #endregion
+
+        #region TabLayoutType
+
+        /// <summary>
+        /// Gets or sets the type of the tab layout
+        /// </summary>
+        [Browsable(true), DefaultValue(eSuperTabLayoutType.SingleLine), Category("Appearance")]
+        [Description("Indicates the type of the tab layout.")]
+        public eSuperTabLayoutType TabLayoutType
+        {
+            get { return (_TabStrip.TabLayoutType); }
+            set { _TabStrip.TabLayoutType = value; }
+        }
+
+        #endregion
+
+        #region Tabs
+
+        /// <summary>
+        /// Gets the collection of Tabs
+        /// </summary>
+        [Editor("DevComponents.DotNetBar.Design.SuperTabControlTabsEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor))]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        [Category("Data"), Description("Indicates the collection of Tabs.")]
+        public SubItemsCollection Tabs
+        {
+            get { return (_TabStrip.Tabs); }
+        }
+
+        #endregion
+
+        #region TabStrip
+
+        /// <summary>
+        /// Gets the control TabStrip
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public SuperTabStrip TabStrip
+        {
+            get { return (_TabStrip); }
+        }
+
+        #endregion
+
+        #region TabStripColor
+
+        /// <summary>
+        /// Gets or sets the Color of the TabStrip
+        /// </summary>
+        [Browsable(true), Category("Appearance")]
+        [Description("Indicates the Color of the TabStrip.")]
+        public SuperTabColorTable TabStripColor
+        {
+            get { return (_TabStrip.TabStripColor); }
+            set { _TabStrip.TabStripColor = value; }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeTabStripColor()
+        {
+            return (_TabStrip.TabStripColor.IsEmpty == false);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetTabStripColor()
+        {
+            _TabStrip.TabStripColor = new SuperTabColorTable();
+        }
+
+        #endregion
+
+        #region TabStyle
+
+        /// <summary>
+        /// Gets or sets the tab style
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), DefaultValue(eSuperTabStyle.Office2007)]
+        [Category("Appearance"), Description("Indicates the tab style.")]
+        public eSuperTabStyle TabStyle
+        {
+            get { return (_TabStrip.TabStyle); }
+
+            set
+            {
+                if (_TabStrip.TabStyle != value)
+                {
+                    _TabStrip.TabStyle = value;
+
+                    RefreshPanelsStyle();
+                }
+            }
+        }
+
+        #endregion
+
+        #region TabVerticalSpacing
+
+        /// <summary>
+        /// Gets or sets the Vertical spacing around tab elements
+        /// </summary>
+        [Browsable(true), DefaultValue(4), Category("Appearance")]
+        [Description("Indicates the Vertical spacing around tab elements.")]
+        public int TabVerticalSpacing
+        {
+            get { return (_TabStrip.TabVerticalSpacing); }
+            set { _TabStrip.TabVerticalSpacing = value; }
+        }
+
+        #endregion
+
+        #region TabsVisible
+
+        /// <summary>
+        /// Gets or sets whether tabs are visible
+        /// </summary>
+        [DefaultValue(true), Category("Appearance")]
+        [Description("Indicates whether tabs are visible")]
+        public bool TabsVisible
+        {
+            get { return (_TabsVisible); }
+
+            set
+            {
+                if (_TabsVisible != value)
+                {
+                    _TabsVisible = value;
+                    _TabStrip.Visible = value;
+
+                    RefreshPanelsStyle();
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region TextAlignment
+
+        /// <summary>
+        /// Gets or sets tab text alignment
+        /// </summary>
+        [Browsable(true), DefaultValue(eItemAlignment.Near)]
+        [DevCoBrowsable(true), Category("Layout"), Description("Indicates tab text alignment.")]
+        public eItemAlignment TextAlignment
+        {
+            get { return (_TabStrip.TextAlignment); }
+            set { _TabStrip.TextAlignment = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region HookEvents
+
+        /// <summary>
+        /// Hooks (or unhooks) underlying TabStrip events
+        /// </summary>
+        /// <param name="hook">true to hook, false to unhook</param>
+        private void HookEvents(bool hook)
+        {
+            if (hook == true)
+            {
+                _TabStrip.TabItemOpen += TabStripTabItemOpen;
+                _TabStrip.TabItemClose += TabStripTabItemClose;
+                _TabStrip.TabRemoved += TabStripTabRemoved;
+                _TabStrip.TabMoving += TabStripTabMoving;
+                _TabStrip.TabMoved += TabStripTabMoved;
+
+                _TabStrip.SelectedTabChanging += TabStripSelectedTabChanging;
+                _TabStrip.SelectedTabChanged += TabStripSelectedTabChanged;
+
+                _TabStrip.GetTabItemPath += TabStripItemGetTabItemPath;
+                _TabStrip.GetTabItemContentRectangle += TabStripItemGetTabItemContentRectangle;
+
+                _TabStrip.BeforeTabDisplay += TabStripBeforeTabDisplay;
+                _TabStrip.MeasureTabItem += TabStripMeasureTabItem;
+                _TabStrip.PreRenderTabItem += TabStripPreRenderTabItem;
+                _TabStrip.PostRenderTabItem += TabStripPostRenderTabItem;
+
+                _TabStrip.GetTabTextBounds += TabStripGetTabTextBounds;
+                _TabStrip.GetTabImageBounds += TabStripGetTabImageBounds;
+                _TabStrip.GetTabCloseBounds += TabStripGetTabCloseBounds;
+
+                _TabStrip.TabStripPaintBackground += TabStripTabStripPaintBackground;
+
+                _TabStrip.TabStripTabColorChanged += TabStripTabColorChanged;
+
+                _TabStrip.MouseUp += TabStrip_MouseUp;
+                _TabStrip.MouseDown += TabStrip_MouseDown;
+                _TabStrip.MouseMove += TabStrip_MouseMove;
+                _TabStrip.MouseClick += TabStrip_MouseClick;
+                _TabStrip.MouseDoubleClick += TabStrip_MouseDoubleClick;
+
+                _TabStrip.MouseEnter += TabStrip_MouseEnter;
+                _TabStrip.MouseHover += TabStrip_MouseHover;
+                _TabStrip.MouseLeave += TabStrip_MouseLeave;
+            }
+            else
+            {
+                _TabStrip.TabItemOpen -= TabStripTabItemOpen;
+                _TabStrip.TabItemClose -= TabStripTabItemClose;
+                _TabStrip.TabRemoved -= TabStripTabRemoved;
+                _TabStrip.TabMoving -= TabStripTabMoving;
+                _TabStrip.TabMoved -= TabStripTabMoved;
+
+                _TabStrip.SelectedTabChanging -= TabStripSelectedTabChanging;
+                _TabStrip.SelectedTabChanged -= TabStripSelectedTabChanged;
+
+                _TabStrip.GetTabItemPath -= TabStripItemGetTabItemPath;
+                _TabStrip.GetTabItemContentRectangle -= TabStripItemGetTabItemContentRectangle;
+
+                _TabStrip.BeforeTabDisplay -= TabStripBeforeTabDisplay;
+                _TabStrip.MeasureTabItem -= TabStripMeasureTabItem;
+                _TabStrip.PreRenderTabItem -= TabStripPreRenderTabItem;
+                _TabStrip.PostRenderTabItem -= TabStripPostRenderTabItem;
+
+                _TabStrip.GetTabTextBounds -= TabStripGetTabTextBounds;
+                _TabStrip.GetTabImageBounds -= TabStripGetTabImageBounds;
+                _TabStrip.GetTabCloseBounds -= TabStripGetTabCloseBounds;
+
+                _TabStrip.TabStripPaintBackground -= TabStripTabStripPaintBackground;
+
+                _TabStrip.TabStripTabColorChanged -= TabStripTabColorChanged;
+
+                _TabStrip.MouseUp -= TabStrip_MouseUp;
+                _TabStrip.MouseDown -= TabStrip_MouseDown;
+                _TabStrip.MouseMove -= TabStrip_MouseMove;
+                _TabStrip.MouseClick -= TabStrip_MouseClick;
+                _TabStrip.MouseDoubleClick -= TabStrip_MouseDoubleClick;
+
+                _TabStrip.MouseEnter -= TabStrip_MouseEnter;
+                _TabStrip.MouseHover -= TabStrip_MouseHover;
+                _TabStrip.MouseLeave -= TabStrip_MouseLeave;
+            }
+        }
+
+        #endregion
+
+        #region Event processing
+
+        #region TabItemOpen
+
+        /// <summary>
+        /// Handles TabItemOpen events
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void TabStripTabItemOpen(object sender, SuperTabStripTabItemOpenEventArgs e)
+        {
+            if (TabItemOpen != null)
+                TabItemOpen(this, e);
+        }
+
+        #endregion
+
+        #region TabItemClose
+
+        /// <summary>
+        /// Handles TabItemClose events
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void TabStripTabItemClose(object sender, SuperTabStripTabItemCloseEventArgs e)
+        {
+            if (TabItemClose != null)
+                TabItemClose(this, e);
+        }
+
+        #endregion
+
+        #region TabMoving
+
+        /// <summary>
+        /// Handles TabMoving events
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void TabStripTabMoving(object sender, SuperTabStripTabMovingEventArgs e)
+        {
+            if (TabMoving != null)
+                TabMoving(this, e);
+        }
+
+        #endregion
+
+        #region TabMoved
+
+        /// <summary>
+        /// Handles TabMoved events
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void TabStripTabMoved(object sender, SuperTabStripTabMovedEventArgs e)
+        {
+            if (TabMoved != null)
+                TabMoved(this, e);
+        }
+
+        #endregion
+
+        #region TabRemoved
+
+        /// <summary>
+        /// Handles TabRemoved events
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void TabStripTabRemoved(object sender, SuperTabStripTabRemovedEventArgs e)
+        {
+            if (TabRemoved != null)
+                TabRemoved(this, e);
+        }
+
+        #endregion
+
+        #region SelectedTabChanging
+
+        /// <summary>
+        /// Handles SelectedTabChanging events
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void TabStripSelectedTabChanging(object sender, SuperTabStripSelectedTabChangingEventArgs e)
+        {
+            if (SelectedTabChanging != null)
+                SelectedTabChanging(this, e);
+        }
+
+        #endregion
+
+        #region SelectedTabChanged
+
+        /// <summary>
+        /// Handles SelectedTabChanged events
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void TabStripSelectedTabChanged(object sender, SuperTabStripSelectedTabChangedEventArgs e)
+        {
+            if (SelectedTabChanged != null)
+                SelectedTabChanged(this, e);
+        }
+
+        #endregion
+
+        #region GetTabItemPath
+
+        /// <summary>
+        /// Handles GetTabItemPath events
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void TabStripItemGetTabItemPath(object sender, SuperTabGetTabItemPathEventArgs e)
+        {
+            if (GetTabItemPath != null)
+                GetTabItemPath(this, e);
+        }
+
+        #endregion
+
+        #region GetTabItemContentRectangle
+
+        /// <summary>
+        /// Handles GetTabItemContentRectangle events
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void TabStripItemGetTabItemContentRectangle(object sender, SuperTabGetTabItemContentRectangleEventArgs e)
+        {
+            if (GetTabItemContentRectangle != null)
+                GetTabItemContentRectangle(this, e);
+        }
+
+        #endregion
+
+        #region BeforeTabDisplay
+
+        /// <summary>
+        /// Handles BeforeTabDisplay events
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void TabStripBeforeTabDisplay(object sender, SuperTabStripBeforeTabDisplayEventArgs e)
+        {
+            if (BeforeTabDisplay != null)
+                BeforeTabDisplay(this, e);
+        }
+
+        #endregion
+
+        #region MeasureTabItem
+
+        /// <summary>
+        /// Handles MeasureTabItem events
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void TabStripMeasureTabItem(object sender, SuperTabMeasureTabItemEventArgs e)
+        {
+            if (MeasureTabItem != null)
+                MeasureTabItem(this, e);
+        }
+
+        #endregion
+
+        #region PreRenderTabItem
+
+        /// <summary>
+        /// Handles PreRenderTabItem events
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void TabStripPreRenderTabItem(object sender, SuperTabPreRenderTabItemEventArgs e)
+        {
+            if (PreRenderTabItem != null)
+                PreRenderTabItem(this, e);
+        }
+
+        #endregion
+
+        #region PostRenderTabItem
+
+        /// <summary>
+        /// Handles PostRenderTabItem events
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void TabStripPostRenderTabItem(object sender, SuperTabPostRenderTabItemEventArgs e)
+        {
+            if (PostRenderTabItem != null)
+                PostRenderTabItem(this, e);
+        }
+
+        #endregion
+
+        #region GetTabCloseBounds
+
+        /// <summary>
+        /// Handles GetTabCloseBounds events
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void TabStripGetTabCloseBounds(object sender, SuperTabGetTabCloseBoundsEventArgs e)
+        {
+            if (GetTabCloseBounds != null)
+                GetTabCloseBounds(this, e);
+        }
+
+        #endregion
+
+        #region GetTabImageBounds
+
+        /// <summary>
+        /// Handles GetTabImageBounds events
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void TabStripGetTabImageBounds(object sender, SuperTabGetTabImageBoundsEventArgs e)
+        {
+            if (GetTabImageBounds != null)
+                GetTabImageBounds(this, e);
+        }
+
+        #endregion
+
+        #region GetTabTextBounds
+
+        /// <summary>
+        /// Handles GetTabTextBounds events
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void TabStripGetTabTextBounds(object sender, SuperTabGetTabTextBoundsEventArgs e)
+        {
+            if (GetTabTextBounds != null)
+                GetTabTextBounds(this, e);
+        }
+
+        #endregion
+
+        #region TabStripPaintBackground
+
+        /// <summary>
+        /// Handles TabStripPaintBackground events
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void TabStripTabStripPaintBackground(object sender, SuperTabStripPaintBackgroundEventArgs e)
+        {
+            if (TabStripPaintBackground != null)
+                TabStripPaintBackground(this, e);
+        }
+
+        #endregion
+
+        #region StyleManagerStyleChanged
+
+        /// <summary>
+        /// Handles StyleManagerStyleChanged events
+        /// </summary>
+        /// <param name="newStyle"></param>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void StyleManagerStyleChanged(eDotNetBarStyle newStyle)
+        {
+            RefreshPanelsStyle();
+        }
+
+        #endregion
+
+        #region TabStripTabColorChanged
+
+        /// <summary>
+        /// Handles TabStripTabColorChanged events
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void TabStripTabColorChanged(object sender, SuperTabStripTabColorChangedEventArgs e)
+        {
+            SuperTabControlPanel panel = e.Tab.AttachedControl as SuperTabControlPanel;
+
+            if (panel != null)
+                ApplyPanelStyle(panel);
+        }
+
+        #endregion
+
+        #region TabStrip_MouseUp
+
+        /// <summary>
+        /// Handles TabStrip_MouseUp events
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void TabStrip_MouseUp(object sender, MouseEventArgs e)
+        {
+            if (TabStripMouseUp != null)
+                TabStripMouseUp(sender, e);
+        }
+
+        #endregion
+
+        #region MouseDown
+
+        /// <summary>
+        /// Handles TabStrip_MouseDown events
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void TabStrip_MouseDown(object sender, MouseEventArgs e)
+        {
+            if (TabStripMouseDown != null)
+                TabStripMouseDown(sender, e);
+        }
+
+        #endregion
+
+        #region MouseMove
+
+        /// <summary>
+        /// Handles TabStrip_MouseMove events
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void TabStrip_MouseMove(object sender, MouseEventArgs e)
+        {
+            if (TabStripMouseMove != null)
+                TabStripMouseMove(sender, e);
+        }
+
+        #endregion
+
+        #region MouseClick
+
+        /// <summary>
+        /// Handles TabStrip_MouseClick events
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void TabStrip_MouseClick(object sender, MouseEventArgs e)
+        {
+            if (TabStripMouseClick != null)
+                TabStripMouseClick(sender, e);
+        }
+
+        #endregion
+
+        #region MouseDoubleClick
+
+        /// <summary>
+        /// Handles TabStrip_MouseDoubleClick events
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void TabStrip_MouseDoubleClick(object sender, MouseEventArgs e)
+        {
+            if (TabStripMouseDoubleClick != null)
+                TabStripMouseDoubleClick(sender, e);
+        }
+
+        #endregion
+
+        #region MouseEnter
+
+        /// <summary>
+        /// Handles TabStrip_MouseEnter events
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void TabStrip_MouseEnter(object sender, EventArgs e)
+        {
+            if (TabStripMouseEnter != null)
+                TabStripMouseEnter(sender, e);
+        }
+
+        #endregion
+
+        #region MouseHover
+
+        /// <summary>
+        /// Handles TabStrip_MouseHover events
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void TabStrip_MouseHover(object sender, EventArgs e)
+        {
+            if (TabStripMouseHover != null)
+                TabStripMouseHover(sender, e);
+        }
+
+        #endregion
+
+        #region MouseLeave
+
+        /// <summary>
+        /// Handles TabStrip_MouseLeave events
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void TabStrip_MouseLeave(object sender, EventArgs e)
+        {
+            if (TabStripMouseLeave != null)
+                TabStripMouseLeave(sender, e);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region DefaultSize
+
+        /// <summary>
+        /// Gets the DefaultSize
+        /// </summary>
+        protected override Size DefaultSize
+        {
+            get { return new Size(200, 100); }
+        }
+
+        #endregion
+
+        #region CreateTab
+
+        /// <summary>
+        /// Creates a TabControl tab
+        /// </summary>
+        /// <param name="tabText"></param>
+        /// <returns></returns>
+        public SuperTabItem CreateTab(string tabText)
+        {
+            return (CreateTab(tabText, -1));
+        }
+
+        /// <summary>
+        /// Creates a TabControl tab
+        /// </summary>
+        /// <param name="tabText"></param>
+        /// <param name="insertAt"></param>
+        /// <returns></returns>
+        public SuperTabItem CreateTab(string tabText, int insertAt)
+        {
+            SuperTabItem tab = new SuperTabItem();
+            SuperTabControlPanel panel = new SuperTabControlPanel();
+
+            tab.Text = tabText;
+
+            return (CreateTab(tab, panel, insertAt));
+        }
+
+        /// <summary>
+        /// Creates a TabControl tab
+        /// </summary>
+        /// <param name="tab"></param>
+        /// <param name="panel"></param>
+        /// <param name="insertAt"></param>
+        /// <returns></returns>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public SuperTabItem CreateTab(SuperTabItem tab, SuperTabControlPanel panel, int insertAt)
+        {
+            SuspendLayout();
+
+            tab.AttachedControl = panel;
+            panel.TabItem = tab;
+
+            Controls.Add(panel);
+
+            if (insertAt < 0 || insertAt >= Tabs.Count)
+                Tabs.Add(tab);
+            else
+                Tabs.Insert(insertAt, tab);
+
+            ApplyPanelStyle(panel);
+
+            panel.Size = Size.Empty;
+            panel.Dock = DockStyle.Fill;
+            panel.BringToFront();
+
+            ResumeLayout();
+
+            return (tab);
+        }
+
+        #endregion
+
+        #region SelectPreviousTab
+
+        /// <summary>
+        /// Selects the previous tab
+        /// </summary>
+        /// <returns>true if tab selected</returns>
+        public bool SelectPreviousTab()
+        {
+            return (_TabStrip.SelectPreviousTab());
+        }
+
+        #endregion
+
+        #region SelectNextTab
+
+        /// <summary>
+        /// Selects the next tab
+        /// </summary>
+        /// <returns>true if tab selected</returns>
+        public bool SelectNextTab()
+        {
+            return (_TabStrip.SelectNextTab());
+        }
+
+        #endregion
+
+        #region GetTabFromPoint
+
+        /// <summary>
+        /// Gets the SuperTabItem tab containing the given Point
+        /// </summary>
+        /// <param name="pt">Point to test</param>
+        /// <returns>Associated tab, or null</returns>
+        public SuperTabItem GetTabFromPoint(Point pt)
+        {
+            return (_TabStrip.GetTabFromPoint(pt));
+        }
+
+        #endregion
+
+        #region GetItemFromPoint
+
+        /// <summary>
+        /// Gets the item (SuperTabItem or BaseView) associated
+        /// with the given Point
+        /// </summary>
+        /// <param name="pt">Point to test</param>
+        /// <returns>BaseItem or null</returns>
+        public BaseItem GetItemFromPoint(Point pt)
+        {
+            return (_TabStrip.GetItemFromPoint(pt));
+        }
+
+        #endregion
+
+        #region CloseTab
+
+        /// <summary>
+        /// Closes the given tab
+        /// </summary>
+        /// <param name="tab"></param>
+        public void CloseTab(SuperTabItem tab)
+        {
+            _TabStrip.CloseTab(tab);
+        }
+
+        #endregion
+
+        #region RecalcLayout
+
+        /// <summary>
+        /// Causes a Layout Recalculation of the SuperTabControl
+        /// </summary>
+        public void RecalcLayout()
+        {
+            _TabStrip.RecalcLayout();
+        }
+
+        #endregion
+
+        #region RefreshPanelStyle
+
+        /// <summary>
+        /// Refreshes all panel styles
+        /// </summary>
+        internal void RefreshPanelsStyle()
+        {
+            if (_Initializing == false)
+            {
+                foreach (Control c in Controls)
+                {
+                    if (c is SuperTabControlPanel)
+                        ApplyPanelStyle(c as SuperTabControlPanel);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ApplyPanelStyle
+
+        /// <summary>
+        /// Applies color and border settings to the given panel
+        /// </summary>
+        /// <param name="panel"></param>
+        public void ApplyPanelStyle(SuperTabControlPanel panel)
+        {
+            if (panel != null && panel.TabItem != null && panel.TabItem.TabStripItem != null)
+            {
+                ElementStyle style = new ElementStyle();
+
+                ApplyPanelColor(panel, style);
+                ApplyPanelBorder(style);
+                style.BackgroundImage = panel.BackgroundImage;
+                style.BackgroundImagePosition = panel.BackgroundImagePosition;
+                panel.PanelStyle = style;
+            }
+        }
+
+        #region ApplyPanelColor
+
+        /// <summary>
+        /// Applies color settings to the given panel
+        /// </summary>
+        /// <param name="panel"></param>
+        /// <param name="style"></param>
+        private void ApplyPanelColor(
+            SuperTabControlPanel panel, ElementStyle style)
+        {
+            SuperTabPanelItemColorTable pct = panel.TabItem.GetPanelColorTable();
+            SuperTabItemStateColorTable sct = panel.TabItem.GetTabColorTable(eTabState.Selected);
+
+            int angle;
+            bool? adaptiveGradient;
+
+            // If we have PanelColorTable settings, use them.  If not, use
+            // the current StateColorTable panel settings
+
+            if (pct.Background.IsEmpty == false)
+            {
+                angle = pct.Background.GradientAngle;
+                adaptiveGradient = pct.Background.AdaptiveGradient ?? sct.Background.AdaptiveGradient;
+
+                style.BackColorBlend.Clear();
+
+                if (pct.Background.Colors != null)
+                {
+                    if (pct.Background.Colors.Length > 2)
+                    {
+                        style.BackColorBlend.CopyFrom(pct.Background.GetColorBlendCollection());
+                    }
+                    else
+                    {
+                        style.BackColor = pct.Background.Colors[0];
+
+                        style.BackColor2 = (pct.Background.Colors.Length == 1) ?
+                            pct.Background.Colors[0] : pct.Background.Colors[1];
+                    }
+                }
+            }
+            else
+            {
+                angle = sct.Background.GradientAngle;
+                adaptiveGradient = sct.Background.AdaptiveGradient;
+
+                if (sct.Background.Colors != null)
+                {
+                    style.BackColor = sct.Background.Colors[0];
+
+                    style.BackColor2 = (sct.Background.Colors.Length == 1) ?
+                        sct.Background.Colors[0] : sct.Background.Colors[1];
+                }
+            }
+
+            // If we have an adaptive gradient, alter the gradient
+            // angle to correspond to the current tab alignment
+
+            if (adaptiveGradient != false)
+            {
+                switch (_TabStrip.TabAlignment)
+                {
+                    case eTabStripAlignment.Top:
+                        style.BackColorGradientAngle = angle - 180;
+                        break;
+
+                    case eTabStripAlignment.Bottom:
+                        style.BackColorGradientAngle = angle;
+                        break;
+
+                    case eTabStripAlignment.Left:
+                        style.BackColorGradientAngle = angle + 90;
+                        break;
+
+                    case eTabStripAlignment.Right:
+                        style.BackColorGradientAngle = angle - 90;
+                        break;
+                }
+            }
+
+            // Set the panel's inner and outer border colors
+
+            style.BorderColor = pct.OuterBorder;
+            style.BorderColorLight = pct.InnerBorder;
+        }
+
+        #endregion
+
+        #region ApplyPanelBorder
+
+        /// <summary>
+        /// Applies border settings for the given panel
+        /// </summary>
+        /// <param name="style"></param>
+        private void ApplyPanelBorder(ElementStyle style)
+        {
+            if (TabsVisible == true)
+            {
+                style.BorderWidth = 0;
+
+                if (style.BorderColor.IsEmpty == false)
+                    style.BorderWidth++;
+
+                if (style.BorderWidth == 0)
+                    style.Border = eStyleBorderType.None;
+
+                else if (style.BorderColorLight.IsEmpty)
+                    style.Border = eStyleBorderType.Solid;
+
+                else
+                    style.Border = eStyleBorderType.Double;
+
+                if (_TabStrip.Available == true)
+                {
+                    switch (_TabStrip.TabAlignment)
+                    {
+                        case eTabStripAlignment.Top:
+                            style.BorderTop = eStyleBorderType.None;
+                            break;
+
+                        case eTabStripAlignment.Bottom:
+                            style.BorderBottom = eStyleBorderType.None;
+                            break;
+
+                        case eTabStripAlignment.Left:
+                            style.BorderLeft = eStyleBorderType.None;
+                            break;
+
+                        case eTabStripAlignment.Right:
+                            style.BorderRight = eStyleBorderType.None;
+                            break;
+                    }
+                }
+            }
+            else
+            {
+                style.Border = eStyleBorderType.None;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region OnSystemColorsChanged
+
+        /// <summary>
+        /// Performs OnSystemColorsChanged processing
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnSystemColorsChanged(EventArgs e)
+        {
+            base.OnSystemColorsChanged(e);
+
+            Application.DoEvents();
+
+            RefreshPanelsStyle();
+        }
+
+        #endregion
+
+        #region OnResize
+
+        /// <summary>
+        /// Performs OnResize processing
+        /// </summary>
+        /// <param name="e"></param>
+        /// NOT NEEDED. Let WinForms layout do the work!
+        //protected override void OnResize(EventArgs e)
+        //{
+        //    base.OnResize(e);
+        //    if (_TabStrip != null)
+        //        _TabStrip.Size = Size;
+        //}
+        protected override void OnHandleCreated(EventArgs e)
+        {
+            // This will make sure that layout is performed by WinForms
+            BarUtilities.InvokeDelayed(new MethodInvoker(delegate
+            {
+                if (_TabStrip.Dock == DockStyle.Top || _TabStrip.Dock == DockStyle.Bottom)
+                    _TabStrip.Width = this.ClientRectangle.Width;
+                else if (_TabStrip.Dock == DockStyle.Left || _TabStrip.Dock == DockStyle.Right)
+                    _TabStrip.Height = this.ClientRectangle.Height;
+            }
+            ), 100);
+
+            base.OnHandleCreated(e);
+        }
+        #endregion
+
+        #region OnControlAdded
+
+        /// <summary>
+        /// OnControlAdded
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnControlAdded(ControlEventArgs e)
+        {
+            base.OnControlAdded(e);
+
+            if (DesignMode == false)
+            {
+                SuperTabControlPanel panel = e.Control as SuperTabControlPanel;
+
+                if (panel != null)
+                {
+                    if (panel.TabItem != null)
+                    {
+                        if (this.Tabs.Contains(panel.TabItem) && this.SelectedTab == panel.TabItem)
+                        {
+                            panel.Visible = true;
+                            panel.BringToFront();
+                        }
+                        else
+                            panel.Visible = false;
+                    }
+                    else
+                    {
+                        panel.Visible = false;
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region OnControlRemoved
+
+        /// <summary>
+        /// OnControlRemoved
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnControlRemoved(ControlEventArgs e)
+        {
+            base.OnControlRemoved(e);
+
+            SuperTabControlPanel panel = e.Control as SuperTabControlPanel;
+
+            if (panel != null)
+            {
+                if (panel.TabItem != null)
+                {
+                    if (Tabs.Contains(panel.TabItem))
+                        Tabs.Remove(panel.TabItem);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ISupportInitialize Members
+
+        /// <summary>
+        /// BeginInit
+        /// </summary>
+        void ISupportInitialize.BeginInit()
+        {
+            _Initializing = true;
+        }
+
+        /// <summary>
+        /// EndInit
+        /// </summary>
+        void ISupportInitialize.EndInit()
+        {
+            _Initializing = false;
+
+            // Apply default panel style
+
+            RefreshPanelsStyle();
+
+            // Establish our initial selected tab
+
+            SuperTabItem tab =
+                _TabStrip.TabStripItem.GetNewSelectTab(_LoadSelectedTabIndex);
+            
+            if (tab != null)
+            {
+                SelectedTab = tab;
+
+                if (_TabStrip.SelectedTab != null && _TabStrip.SelectedTab.AttachedControl != null)
+                {
+                    _TabStrip.SelectedTab.AttachedControl.Visible = true;
+                    _TabStrip.SelectedTab.AttachedControl.BringToFront();
+                }
+            }
+
+            if (this.DesignMode && this.SelectedTab!=null)
+            {
+                foreach (BaseItem item in _TabStrip.Tabs)
+                {
+                    SuperTabItem tabItem = item as SuperTabItem;
+                    if (tabItem != null && tabItem != this.SelectedTab && tabItem.AttachedControl != null)
+                        tabItem.AttachedControl.Visible = false;
+                }
+            }
+
+            _LoadSelectedTabIndex = -1;
+            // Make sure the pending layout is performed following
+            // the designer initialization
+
+            //ResumeLayout(true); // Bad idea since it messes up layout when controls created with 96 DPI are loaded in environment greater than 96 DPI, like 120 DPI etc.
+        }
+
+        #endregion
+
+        #region ValidateFormOnTabSelection
+        private bool _ValidateFormOnTabSelection = true;
+        /// <summary>
+        /// Indicates whether Form.Validate is called and checked before selected tab is changed. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether Form.Validate is called and checked before selected tab is changed.")]
+        public bool ValidateFormOnTabSelection
+        {
+            get { return _ValidateFormOnTabSelection; }
+            set
+            {
+                _ValidateFormOnTabSelection = value;
+            }
+        }
+        #endregion
+
+    }
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/SuperTabControl/SuperTabControl/SuperTabControlPanel.cs b/PROMS/DotNetBar Source Code/SuperTabControl/SuperTabControl/SuperTabControlPanel.cs
new file mode 100644
index 00000000..9655862c
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/SuperTabControl/SuperTabControl/SuperTabControlPanel.cs	
@@ -0,0 +1,300 @@
+#if FRAMEWORK20
+using System;
+using System.Windows.Forms;
+using System.Drawing;
+using System.ComponentModel;
+using DevComponents.DotNetBar.Rendering;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represents Panel for the SuperTabControl
+    /// </summary>
+    ///
+    [ToolboxItem(false)]
+    [Designer("DevComponents.DotNetBar.Design.SuperTabControlPanelDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+    public class SuperTabControlPanel : PanelControl
+    {
+        #region Events
+
+        /// <summary>
+        /// Occurs when the tab colors have changed
+        /// </summary>
+        [Description("Occurs when the panel colors have changed.")]
+        public event EventHandler<EventArgs> PanelColorChanged;
+
+        #endregion
+
+        #region Constants
+
+        private const string InfoText =
+            "Drop controls on this panel to associate them with currently selected tab.";
+
+        #endregion
+
+        #region Private Variables
+
+        private SuperTabItem _Tab;
+        private ElementStyle _PanelStyle;
+        private SuperTabPanelColorTable _PanelColor;
+
+        #endregion
+
+        public SuperTabControlPanel()
+        {
+            _PanelStyle = new ElementStyle();
+            _PanelColor = new SuperTabPanelColorTable();
+
+            _PanelColor.ColorTableChanged += PanelColor_ColorTableChanged;
+        }
+
+        #region Public property hiding
+
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override ElementStyle Style
+        {
+            get { return base.Style; }
+        }
+
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override ElementStyle StyleMouseDown
+        {
+            get { return base.Style; }
+        }
+
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override ElementStyle StyleMouseOver
+        {
+            get { return base.Style; }
+        }
+
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), EditorBrowsable(EditorBrowsableState.Never)]
+        public override ImageLayout BackgroundImageLayout
+        {
+            get
+            {
+                return base.BackgroundImageLayout;
+            }
+            set
+            {
+                base.BackgroundImageLayout = value;
+            }
+        }
+        #endregion
+
+        #region Public properties
+
+        #region DockStyle
+
+        /// <summary>
+        /// Gets or sets which edge of the parent container a control is docked to.
+        /// </summary>
+        [Browsable(false), DefaultValue(DockStyle.None)]
+        public override DockStyle Dock
+        {
+            get { return (base.Dock); }
+            set { base.Dock = value; }
+        }
+
+        #endregion
+
+        #region PanelColor
+
+        /// <summary>
+        /// Gets or sets user specified tab panel display colors
+        /// </summary>
+        [Browsable(true), Category("Style")]
+        [Description("Contains user specified tab panel display colors.")]
+        public SuperTabPanelColorTable PanelColor
+        {
+            get { return (_PanelColor); }
+
+            set
+            {
+                if (_PanelColor.Equals(value) == false)
+                {
+                    if (_PanelColor != null)
+                        _PanelColor.ColorTableChanged -= PanelColor_ColorTableChanged;
+
+                    _PanelColor = value;
+
+                    if (value != null)
+                        _PanelColor.ColorTableChanged += PanelColor_ColorTableChanged;
+
+                    OnPanelColorChanged();
+
+                    Refresh();
+                }
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializePanelColor()
+        {
+            return (_PanelColor.IsEmpty == false);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetPanelColor()
+        {
+            PanelColor = new SuperTabPanelColorTable();
+        }
+
+        #endregion
+
+        #region PanelStyle
+
+        /// <summary>
+        /// Gets or sets the Panel ElementStyle
+        /// </summary>
+        [Browsable(false)]
+        public ElementStyle PanelStyle
+        {
+            get { return (_PanelStyle); }
+
+            set
+            {
+                _PanelStyle = value;
+
+                Refresh();
+            }
+        }
+
+        #endregion
+
+        #region SuperTabItem
+
+        /// <summary>
+        /// Gets or sets TabItem that this panel is attached to.
+        /// </summary>
+        [Browsable(false), DefaultValue(null)]
+        public SuperTabItem TabItem
+        {
+            get { return (_Tab); }
+            set { _Tab = value; }
+        }
+
+        #endregion
+
+        #region BackgroundImage
+        [Browsable(true), EditorBrowsable(EditorBrowsableState.Always), DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
+        public override Image BackgroundImage
+        {
+            get { return base.BackgroundImage; }
+            set { base.BackgroundImage = value; }
+        }
+        protected override void OnBackgroundImageChanged(EventArgs e)
+        {
+            OnPanelColorChanged();
+            base.OnBackgroundImageChanged(e);
+        }
+        private eStyleBackgroundImage _BackgroundImagePosition = eStyleBackgroundImage.Stretch;
+        /// <summary>
+        /// Specifies background image position when container is larger than image.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), DefaultValue(eStyleBackgroundImage.Stretch), Description("Specifies background image position when container is larger than image.")]
+        public eStyleBackgroundImage BackgroundImagePosition
+        {
+            get { return _BackgroundImagePosition; }
+            set
+            {
+                if (_BackgroundImagePosition != value)
+                {
+                    _BackgroundImagePosition = value;
+                    OnPanelColorChanged();
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region PanelColor_ColorTableChanged
+
+        /// <summary>
+        /// _PanelColor_ColorTableChanged
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void PanelColor_ColorTableChanged(object sender, EventArgs e)
+        {
+            OnPanelColorChanged();
+        }
+
+        #endregion
+
+        #region OnPanelColorChanged
+
+        /// <summary>
+        /// Processes ColorTable changes
+        /// </summary>
+        protected void OnPanelColorChanged()
+        {
+            if (PanelColorChanged != null)
+                PanelColorChanged(this, EventArgs.Empty);
+
+            Refresh();
+        }
+
+        #endregion
+
+        #region GetStyle
+
+        /// <summary>
+        /// GetStyle
+        /// </summary>
+        /// <returns></returns>
+        protected override ElementStyle GetStyle()
+        {
+            if (_PanelStyle != null)
+                return (_PanelStyle);
+
+            return (Style);
+        }
+
+        #endregion
+
+        #region OnPaint
+
+        /// <summary>
+        /// Provides OnPaint support
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            if (ClientRectangle.Width > 0 && ClientRectangle.Height > 0)
+            {
+                SuperTabControl tab = Parent as SuperTabControl;
+
+                if (tab != null && tab.SelectedPanel == this)
+                {
+                    base.OnPaint(e);
+
+                    if (this.DesignMode && this.Controls.Count == 0 && this.Text == "")
+                    {
+                        Rectangle r = this.ClientRectangle;
+                        r.Inflate(-2, -2);
+
+                        const eTextFormat sf = eTextFormat.Default | eTextFormat.VerticalCenter |
+                                               eTextFormat.HorizontalCenter | eTextFormat.EndEllipsis |
+                                               eTextFormat.WordBreak;
+
+                        using (Font font = new Font(this.Font, FontStyle.Bold))
+                        {
+                            TextDrawing.DrawString(e.Graphics, InfoText,
+                                                   font, ControlPaint.Dark(this.Style.BackColor), r, sf);
+
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+    }
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/SuperTabControl/SuperTabControlBox/SuperTabCloseBox.cs b/PROMS/DotNetBar Source Code/SuperTabControl/SuperTabControlBox/SuperTabCloseBox.cs
new file mode 100644
index 00000000..21888419
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/SuperTabControl/SuperTabControlBox/SuperTabCloseBox.cs	
@@ -0,0 +1,430 @@
+#if FRAMEWORK20
+using System.ComponentModel;
+using System.Drawing;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.Rendering;
+
+namespace DevComponents.DotNetBar
+{
+    public class SuperTabCloseBox : BaseItem
+    {
+        #region Private variables
+
+        private SuperTabControlBox _ControlBox;
+        private Size _ItemSize = new Size(16, 16);
+
+        private bool _IsMouseOver;
+        private bool _IsMouseDown;
+
+        #endregion
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="controlBox">Associated SuperTabControlBox</param>
+        public SuperTabCloseBox(SuperTabControlBox controlBox)
+        {
+            _ControlBox = controlBox;
+
+            Visible = false;
+        }
+
+        #region Public override designer hiding
+
+        [Browsable(false)]
+        public override bool BeginGroup
+        {
+            get { return base.BeginGroup; }
+            set { base.BeginGroup = value; }
+        }
+
+        [Browsable(false)]
+        public override bool AutoCollapseOnClick
+        {
+            get { return base.AutoCollapseOnClick; }
+            set { base.AutoCollapseOnClick = value; }
+        }
+
+        [Browsable(false)]
+        public override bool CanCustomize
+        {
+            get { return base.CanCustomize; }
+            set { base.CanCustomize = value; }
+        }
+
+        [Browsable(false)]
+        public override string Category
+        {
+            get { return base.Category; }
+            set { base.Category = value; }
+        }
+
+        [Browsable(false)]
+        public override bool ClickAutoRepeat
+        {
+            get { return base.ClickAutoRepeat; }
+            set { base.ClickAutoRepeat = value; }
+        }
+
+        [Browsable(false)]
+        public override int ClickRepeatInterval
+        {
+            get { return base.ClickRepeatInterval; }
+            set { base.ClickRepeatInterval = value; }
+        }
+
+        [Browsable(false)]
+        public override Cursor Cursor
+        {
+            get { return base.Cursor; }
+            set { base.Cursor = value; }
+        }
+
+        [Browsable(false)]
+        public override bool Enabled
+        {
+            get { return base.Enabled; }
+            set { base.Enabled = value; }
+        }
+
+        [Browsable(false)]
+        public override bool Stretch
+        {
+            get { return base.Stretch; }
+            set { base.Stretch = value; }
+        }
+
+        [Browsable(false)]
+        public override string Text
+        {
+            get { return base.Text; }
+            set { base.Text = value; }
+        }
+
+        [Browsable(false)]
+        public override bool ThemeAware
+        {
+            get { return base.ThemeAware; }
+            set { base.ThemeAware = value; }
+        }
+
+        [Browsable(false)]
+        public override string Tooltip
+        {
+            get { return base.Tooltip; }
+            set { base.Tooltip = value; }
+        }
+
+        [Browsable(false)]
+        public override eItemAlignment ItemAlignment
+        {
+            get { return base.ItemAlignment; }
+            set { base.ItemAlignment = value; }
+        }
+
+        [Browsable(false)]
+        public override string KeyTips
+        {
+            get { return base.KeyTips; }
+            set { base.KeyTips = value; }
+        }
+
+        [Browsable(false)]
+        public override ShortcutsCollection Shortcuts
+        {
+            get { return base.Shortcuts; }
+            set { base.Shortcuts = value; }
+        }
+
+        [Browsable(false)]
+        public override string Description
+        {
+            get { return base.Description; }
+            set { base.Description = value; }
+        }
+
+        [Browsable(false)]
+        public override bool GlobalItem
+        {
+            get { return base.GlobalItem; }
+            set { base.GlobalItem = value; }
+        }
+
+        [Browsable(false)]
+        public override bool ShowSubItems
+        {
+            get { return base.ShowSubItems; }
+            set { base.ShowSubItems = value; }
+        }
+
+        [Browsable(false)]
+        public override string GlobalName
+        {
+            get { return base.GlobalName; }
+            set { base.GlobalName = value; }
+        }
+
+        [Browsable(false)]
+        public override Command Command
+        {
+            get { return base.Command; }
+            set { base.Command = value; }
+        }
+
+        [Browsable(false)]
+        public override object CommandParameter
+        {
+            get { return base.CommandParameter; }
+            set { base.CommandParameter = value; }
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region Visible
+
+        /// <summary>
+        /// Gets or sets the CloseBox Visible state
+        /// </summary>
+        [Browsable(true), DefaultValue(false), Category("Behavior")]
+        [Description("Indicates CloseBox Visible state.")]
+        public override bool Visible
+        {
+            get { return base.Visible; }
+
+            set
+            {
+                if (base.Visible != value)
+                {
+                    base.Visible = value;
+
+                    MyRefresh();
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region IsMouseDown
+
+        /// <summary>
+        /// Gets whether the mouse is down
+        /// </summary>
+        internal bool IsMouseDown
+        {
+            get { return (_IsMouseDown); }
+        }
+
+        #endregion
+
+        #region IsMouseOver
+
+        /// <summary>
+        /// Gets whether the mouse is over the CloseBox
+        /// </summary>
+        internal bool IsMouseOver
+        {
+            get { return (_IsMouseOver); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RecalcSize
+
+        /// <summary>
+        /// Performs RecalcSize processing
+        /// </summary>
+        public override void RecalcSize()
+        {
+            base.RecalcSize();
+
+            WidthInternal = _ItemSize.Width;
+            HeightInternal = _ItemSize.Height;
+        }
+
+        #endregion
+
+        #region MyRefresh
+
+        /// <summary>
+        /// Refreshes the CloseBox
+        /// </summary>
+        private void MyRefresh()
+        {
+            if (_ControlBox.TabDisplay != null)
+            {
+                SuperTabStripItem tsi = _ControlBox.TabDisplay.TabStripItem;
+
+                if (tsi != null)
+                {
+                    _ControlBox.NeedRecalcSize = true;
+                    _ControlBox.RecalcSize();
+
+                    tsi.NeedRecalcSize = true;
+                    tsi.Refresh();
+                }
+            }
+        }
+
+        #endregion
+
+        #region Paint
+
+        /// <summary>
+        /// Performs control Paint processing
+        /// </summary>
+        /// <param name="p"></param>
+        public override void Paint(ItemPaintArgs p)
+        {
+            Graphics g = p.Graphics;
+
+            using (SuperTabColorTable sct = _ControlBox.TabDisplay.GetColorTable())
+            {
+
+                Color imageColor = sct.ControlBoxDefault.Image;
+
+                if (_IsMouseOver == true)
+                {
+                    Rectangle r = Bounds;
+
+                    r.Width--;
+                    r.Height--;
+
+                    if (_IsMouseDown == true && _IsMouseOver == true)
+                    {
+                        imageColor = sct.ControlBoxPressed.Image;
+
+                        using (Brush br = new SolidBrush(sct.ControlBoxPressed.Background))
+                            g.FillRectangle(br, r);
+
+                        using (Pen pen = new Pen(sct.ControlBoxPressed.Border))
+                            g.DrawRectangle(pen, r);
+                    }
+                    else
+                    {
+                        imageColor = sct.ControlBoxMouseOver.Image;
+
+                        using (Brush br = new SolidBrush(sct.ControlBoxMouseOver.Background))
+                            g.FillRectangle(br, r);
+
+                        using (Pen pen = new Pen(sct.ControlBoxMouseOver.Border))
+                            g.DrawRectangle(pen, r);
+                    }
+                }
+
+                g.DrawImageUnscaled(
+                    _ControlBox.TabDisplay.GetCloseButton(g, imageColor), Bounds);
+            }
+        }
+
+        #endregion
+
+        #region Mouse support
+
+        #region InternalMouseEnter
+
+        /// <summary>
+        /// InternalMouseEnter
+        /// </summary>
+        public override void InternalMouseEnter()
+        {
+            base.InternalMouseEnter();
+
+            _IsMouseOver = true;
+
+            Refresh();
+        }
+
+        #endregion
+
+        #region InternalMouseLeave
+
+        /// <summary>
+        /// InternalMouseLeave
+        /// </summary>
+        public override void InternalMouseLeave()
+        {
+            base.InternalMouseLeave();
+
+            _IsMouseOver = false;
+
+            Refresh();
+        }
+
+        #endregion
+
+        #region InternalMouseDown
+
+        /// <summary>
+        /// InternalMouseDown
+        /// </summary>
+        /// <param name="objArg"></param>
+        public override void InternalMouseDown(MouseEventArgs objArg)
+        {
+            base.InternalMouseDown(objArg);
+
+            if (DesignMode == false && objArg.Button == MouseButtons.Left)
+                _IsMouseDown = true;
+
+            Refresh();
+        }
+
+        #endregion
+
+        #region InternalMouseUp
+
+        /// <summary>
+        /// InternalMouseUp
+        /// </summary>
+        /// <param name="objArg"></param>
+        public override void InternalMouseUp(MouseEventArgs objArg)
+        {
+            base.InternalMouseUp(objArg);
+
+            _IsMouseDown = false;
+
+            if (_IsMouseOver == true)
+            {
+                SuperTabItem tab = _ControlBox.TabDisplay.SelectedTab;
+
+                if (tab != null)
+                    tab.Close();
+            }
+
+            Refresh();
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Copy object support
+
+        /// <summary>
+        /// Returns copy of the item
+        /// </summary>
+        public override BaseItem Copy()
+        {
+            SuperTabCloseBox objCopy = new SuperTabCloseBox(_ControlBox);
+            CopyToItem(objCopy);
+
+            return (objCopy);
+        }
+
+        protected override void CopyToItem(BaseItem copy)
+        {
+            SuperTabCloseBox objCopy = copy as SuperTabCloseBox;
+            base.CopyToItem(objCopy);
+        }
+
+        #endregion
+    }
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/SuperTabControl/SuperTabControlBox/SuperTabControlBox.cs b/PROMS/DotNetBar Source Code/SuperTabControl/SuperTabControlBox/SuperTabControlBox.cs
new file mode 100644
index 00000000..8b56ff63
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/SuperTabControl/SuperTabControlBox/SuperTabControlBox.cs	
@@ -0,0 +1,666 @@
+#if FRAMEWORK20
+using System.ComponentModel;
+using System.Drawing;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar
+{
+    public class SuperTabControlBox : BaseItem
+    {
+        #region Private variables
+
+        private SuperTabStripItem _TabStripItem;
+
+        private SuperTabCloseBox _CloseBox;
+        private SuperTabMenuBox _MenuBox;
+
+        private BaseItem _HotItem;
+        private BaseItem _MouseDownItem;
+
+        private bool _IsMouseOver;
+        private bool _IsMouseDown;
+
+        #endregion
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="tabStripItem">Associated SuperTabStripItem</param>
+        public SuperTabControlBox(SuperTabStripItem tabStripItem)
+        {
+            _TabStripItem = tabStripItem;
+
+            MouseDownCapture = true;
+            MouseUpNotification = true;
+
+            Style = eDotNetBarStyle.Office2007;
+
+            _MenuBox = new SuperTabMenuBox(this);
+            _CloseBox = new SuperTabCloseBox(this);
+
+            _MenuBox.Visible = true;
+            _CloseBox.Visible = false;
+
+            SetParent(tabStripItem);
+            SetIsContainer(true);
+
+            SubItems.Add(_MenuBox);
+            SubItems.Add(_CloseBox);
+        }
+
+        #region Public override designer hiding
+
+        [Browsable(false)]
+        public override bool BeginGroup
+        {
+            get { return base.BeginGroup; }
+            set { base.BeginGroup = value; }
+        }
+
+        [Browsable(false)]
+        public override bool AutoCollapseOnClick
+        {
+            get { return base.AutoCollapseOnClick; }
+            set { base.AutoCollapseOnClick = value; }
+        }
+
+        [Browsable(false)]
+        public override bool CanCustomize
+        {
+            get { return base.CanCustomize; }
+            set { base.CanCustomize = value; }
+        }
+
+        [Browsable(false)]
+        public override string Category
+        {
+            get { return base.Category; }
+            set { base.Category = value; }
+        }
+
+        [Browsable(false)]
+        public override bool ClickAutoRepeat
+        {
+            get { return base.ClickAutoRepeat; }
+            set { base.ClickAutoRepeat = value; }
+        }
+
+        [Browsable(false)]
+        public override int ClickRepeatInterval
+        {
+            get { return base.ClickRepeatInterval; }
+            set { base.ClickRepeatInterval = value; }
+        }
+
+        [Browsable(false)]
+        public override Cursor Cursor
+        {
+            get { return base.Cursor; }
+            set { base.Cursor = value; }
+        }
+
+        [Browsable(false)]
+        public override bool Enabled
+        {
+            get { return base.Enabled; }
+            set { base.Enabled = value; }
+        }
+
+        [Browsable(false)]
+        public override bool Stretch
+        {
+            get { return base.Stretch; }
+            set { base.Stretch = value; }
+        }
+
+        [Browsable(false)]
+        public override string Text
+        {
+            get { return base.Text; }
+            set { base.Text = value; }
+        }
+
+        [Browsable(false)]
+        public override bool ThemeAware
+        {
+            get { return base.ThemeAware; }
+            set { base.ThemeAware = value; }
+        }
+
+        [Browsable(false)]
+        public override string Tooltip
+        {
+            get { return base.Tooltip; }
+            set { base.Tooltip = value; }
+        }
+
+        [Browsable(false)]
+        public override eItemAlignment ItemAlignment
+        {
+            get { return base.ItemAlignment; }
+            set { base.ItemAlignment = value; }
+        }
+
+        [Browsable(false)]
+        public override string KeyTips
+        {
+            get { return base.KeyTips; }
+            set { base.KeyTips = value; }
+        }
+
+        [Browsable(false)]
+        public override ShortcutsCollection Shortcuts
+        {
+            get { return base.Shortcuts; }
+            set { base.Shortcuts = value; }
+        }
+
+        [Browsable(false)]
+        public override string Description
+        {
+            get { return base.Description; }
+            set { base.Description = value; }
+        }
+
+        [Browsable(false)]
+        public override bool GlobalItem
+        {
+            get { return base.GlobalItem; }
+            set { base.GlobalItem = value; }
+        }
+
+        [Browsable(false)]
+        public override bool ShowSubItems
+        {
+            get { return base.ShowSubItems; }
+            set { base.ShowSubItems = value; }
+        }
+
+        [Browsable(false)]
+        public override string GlobalName
+        {
+            get { return base.GlobalName; }
+            set { base.GlobalName = value; }
+        }
+
+        [Browsable(false)]
+        public override Command Command
+        {
+            get { return base.Command; }
+            set { base.Command = value; }
+        }
+
+        [Browsable(false)]
+        public override object CommandParameter
+        {
+            get { return base.CommandParameter; }
+            set { base.CommandParameter = value; }
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region Bounds
+
+        /// <summary>
+        /// Gets or sets the ControlBox Bounds
+        /// </summary>
+        [Browsable(false)]
+        public override Rectangle Bounds
+        {
+            get { return (base.Bounds); }
+
+            set
+            {
+                if (base.Bounds.Equals(value) == false)
+                {
+                    base.Bounds = value;
+
+                    RecalcLayout();
+                }
+            }
+        }
+
+        #endregion
+
+        #region CloseBox
+
+        /// <summary>
+        /// Gets the CloseBox
+        /// </summary>
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public SuperTabCloseBox CloseBox
+        {
+            get { return (_CloseBox); }
+        }
+
+        #endregion
+
+        #region MenuBox
+
+        /// <summary>
+        /// Gets the MenuBox
+        /// </summary>
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public SuperTabMenuBox MenuBox
+        {
+            get { return (_MenuBox); }
+        }
+
+        #endregion
+
+        #region Visible
+
+        /// <summary>
+        /// Gets or sets the ControlBox Visible state
+        /// </summary>
+        public override bool Visible
+        {
+            get { return base.Visible; }
+
+            set
+            {
+                if (base.Visible != value)
+                {
+                    base.Visible = value;
+
+                    MyRefresh();
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region IsMouseDown
+
+        /// <summary>
+        /// Gets the MouseDown state
+        /// </summary>
+        internal bool IsMouseDown
+        {
+            get { return (_IsMouseDown); }
+        }
+
+        #endregion
+
+        #region IsMouseOver
+
+        /// <summary>
+        /// Gets the MouseOver state
+        /// </summary>
+        internal bool IsMouseOver
+        {
+            get { return (_IsMouseOver); }
+        }
+
+        #endregion
+
+        #region TabDisplay
+
+        /// <summary>
+        /// Gets the TabStrip TabDisplay
+        /// </summary>
+        internal SuperTabStripBaseDisplay TabDisplay
+        {
+            get { return (_TabStripItem.TabDisplay); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RecalcSize
+
+        /// <summary>
+        /// Performs RecalcSize processing
+        /// </summary>
+        public override void RecalcSize()
+        {
+            Size size = Size.Empty;
+
+            foreach (BaseItem item in SubItems)
+                size = LayoutItem(item, size, true);
+
+            WidthInternal = size.Width;
+            HeightInternal = size.Height;
+        }
+
+        #endregion
+
+        #region RecalcLayout
+
+        /// <summary>
+        /// Performs RecalcLayout processing
+        /// </summary>
+        private void RecalcLayout()
+        {
+            Size size = Size.Empty;
+
+            if (_TabStripItem.IsRightToLeft)
+            {
+                int closeIndex = SubItems.IndexOf(_CloseBox);
+                int menuIndex = SubItems.IndexOf(_MenuBox);
+
+                if (menuIndex >= 0 && closeIndex > menuIndex)
+                {
+                    SubItems.Remove(_CloseBox);
+                    SubItems.Insert(menuIndex, _CloseBox);
+                }
+            }
+
+            foreach (BaseItem item in SubItems)
+                size = LayoutItem(item, size, false);
+
+            Refresh();
+        }
+
+        #endregion
+
+        #region LayoutItem
+
+        /// <summary>
+        /// Performs individual running layout processing for the given BaseItem
+        /// </summary>
+        /// <param name="item">Item to Layout</param>
+        /// <param name="size">Running Layout Size</param>
+        /// <param name="recalc">Whether a recalcSize is needed</param>
+        /// <returns>New running Size</returns>
+        private Size LayoutItem(BaseItem item, Size size, bool recalc)
+        {
+            if (item.Visible == true)
+            {
+                // Recalc if requested
+
+                if (recalc == true)
+                    item.RecalcSize();
+
+                // If this is the first item, then give
+                // us a little padding around the ControlBox
+
+                if (size.IsEmpty == true)
+                {
+                    if (Orientation == eOrientation.Horizontal)
+                        size.Width += Dpi.Width5;
+                    else
+                        size.Height += Dpi.Height5;
+                }
+
+                // Get the item Bounds
+
+                Rectangle r = new Rectangle(Bounds.X, Bounds.Y, item.WidthInternal, item.HeightInternal);
+
+                // Set the item location
+
+                if (_TabStripItem.IsVertical == true)
+                {
+                    r.Y += size.Height;
+                    r.X += (Bounds.Width - r.Width) / 2;
+                }
+                else
+                {
+                    r.X += size.Width;
+                    r.Y += (Bounds.Height - r.Height) / 2;
+                }
+
+                // Set the Bounds
+
+                item.Bounds = r;
+
+                // Set the item Size
+
+                if (_TabStripItem.IsVertical == true)
+                {
+                    size.Height += item.HeightInternal + Dpi.Height2;
+
+                    if (item.WidthInternal > size.Width)
+                        size.Width = item.WidthInternal;
+                }
+                else
+                {
+                    size.Width += item.WidthInternal + Dpi.Width2;
+
+                    if (item.HeightInternal > size.Height)
+                        size.Height = item.HeightInternal;
+                }
+
+                // Set its display status
+
+                if (DesignMode == false)
+                    item.Displayed = true;
+            }
+
+            return (size);
+        }
+
+        #endregion
+
+        #region MyRefresh
+
+        /// <summary>
+        /// Refresh code
+        /// </summary>
+        private void MyRefresh()
+        {
+            if (TabDisplay != null)
+            {
+                SuperTabStripItem tsi = TabDisplay.TabStripItem;
+
+                if (tsi != null)
+                {
+                    tsi.NeedRecalcSize = true;
+                    tsi.Refresh();
+                }
+            }
+        }
+
+        #endregion
+
+        #region Paint
+
+        /// <summary>
+        /// Paint processing
+        /// </summary>
+        /// <param name="p"></param>
+        public override void Paint(ItemPaintArgs p)
+        {
+            foreach (BaseItem item in SubItems)
+            {
+                if (item.Visible == true)
+                    item.Paint(p);
+            }
+        }
+
+        #endregion
+
+        #region Mouse support
+
+        #region InternalMouseEnter
+
+        /// <summary>
+        /// InternalMouseEnter
+        /// </summary>
+        public override void InternalMouseEnter()
+        {
+            base.InternalMouseEnter();
+
+            _IsMouseOver = true;
+        }
+
+        #endregion
+
+        #region InternalMouseLeave
+
+        /// <summary>
+        /// InternalMouseLeave
+        /// </summary>
+        public override void InternalMouseLeave()
+        {
+            base.InternalMouseLeave();
+
+            _IsMouseOver = false;
+
+            if (_HotItem != null)
+            {
+                _HotItem.InternalMouseLeave();
+
+                _HotItem = null;
+            }
+        }
+
+        #endregion        
+
+        #region InternalMouseMove
+
+        /// <summary>
+        /// InternalMouseMove
+        /// </summary>
+        /// <param name="objArg"></param>
+        public override void InternalMouseMove(MouseEventArgs objArg)
+        {
+            base.InternalMouseMove(objArg);
+
+            _HotItem = GetBoxItemFromPoint(objArg.Location);
+        }
+
+        #endregion
+
+        #region InternalMouseDown
+
+        /// <summary>
+        /// InternalMouseDown
+        /// </summary>
+        /// <param name="objArg"></param>
+        public override void InternalMouseDown(MouseEventArgs objArg)
+        {
+            base.InternalMouseDown(objArg);
+
+            _IsMouseDown = true;
+            _MouseDownItem = _HotItem;
+        }
+
+        #endregion
+
+        #region InternalMouseUp
+
+        /// <summary>
+        /// InternalMouseUp
+        /// </summary>
+        /// <param name="objArg"></param>
+        public override void InternalMouseUp(MouseEventArgs objArg)
+        {
+            base.InternalMouseUp(objArg);
+
+            _IsMouseDown = false;
+
+            if (_MouseDownItem != null)
+            {
+                if (_MouseDownItem != _HotItem)
+                    _MouseDownItem.InternalMouseUp(objArg);
+
+                _MouseDownItem = null;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetBoxItemFromPoint
+
+        /// <summary>
+        /// Gets the ControlBoxItem from the given Point
+        /// </summary>
+        /// <param name="pt"></param>
+        /// <returns></returns>
+        private BaseItem GetBoxItemFromPoint(Point pt)
+        {
+            foreach (BaseItem item in SubItems)
+            {
+                if (item.Visible == true)
+                {
+                    if (item.Bounds.Contains(pt))
+                        return (item);
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region OnItemAdded
+
+        /// <summary>
+        /// OnItemAdded
+        /// </summary>
+        /// <param name="item"></param>
+        protected internal override void OnItemAdded(BaseItem item)
+        {
+            base.OnItemAdded(item);
+
+            MyRefresh();
+        }
+
+        #endregion
+
+        #region OnAfterItemRemoved
+
+        /// <summary>
+        /// OnAfterItemRemoved
+        /// </summary>
+        /// <param name="item"></param>
+        protected internal override void OnAfterItemRemoved(BaseItem item, int itemIndex)
+        {
+            base.OnAfterItemRemoved(item, itemIndex);
+
+            MyRefresh();
+        }
+
+        #endregion
+
+        #region RemoveUserItems
+
+        /// <summary>
+        /// Removes all user added items from the ControlBox
+        /// </summary>
+        public void RemoveUserItems()
+        {
+            for (int i = SubItems.Count - 1; i >= 0; i--)
+            {
+                if (SubItems[i] != _MenuBox && SubItems[i] != _CloseBox)
+                    SubItems._RemoveAt(i);
+            }
+
+            MyRefresh();
+        }
+
+        #endregion
+
+        #region Copy object support
+
+        /// <summary>
+        /// Returns copy of the item.
+        /// </summary>
+        public override BaseItem Copy()
+        {
+            SuperTabControlBox objCopy = new SuperTabControlBox(_TabStripItem);
+            CopyToItem(objCopy);
+
+            return (objCopy);
+        }
+
+        protected override void CopyToItem(BaseItem copy)
+        {
+            SuperTabControlBox objCopy = copy as SuperTabControlBox;
+            base.CopyToItem(objCopy);
+        }
+
+        #endregion
+    }
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/SuperTabControl/SuperTabControlBox/SuperTabMenuBox.cs b/PROMS/DotNetBar Source Code/SuperTabControl/SuperTabControlBox/SuperTabMenuBox.cs
new file mode 100644
index 00000000..e2e842a2
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/SuperTabControl/SuperTabControlBox/SuperTabMenuBox.cs	
@@ -0,0 +1,805 @@
+#if FRAMEWORK20
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Imaging;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.Rendering;
+
+namespace DevComponents.DotNetBar
+{
+    public class SuperTabMenuBox : PopupItem
+    {
+        #region Private variables
+
+        private SuperTabControlBox _ControlBox;
+
+        private Size _ItemSize = new Size(16, 16);
+
+        private bool _IsMouseOver;
+        private bool _IsMouseDown;
+
+        private bool _AutoHide;
+        private bool _ShowTabsOnly = true;
+        private bool _ShowImages = true;
+        private bool _RaiseClickOnSelection;
+
+        #endregion
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="controlBox">Associated SuperTabControlBox</param>
+        public SuperTabMenuBox(SuperTabControlBox controlBox)
+        {
+            _ControlBox = controlBox;
+
+            Style = eDotNetBarStyle.Office2007;
+        }
+
+        #region Public override designer hiding
+
+        [Browsable(false)]
+        public override bool BeginGroup
+        {
+            get { return base.BeginGroup; }
+            set { base.BeginGroup = value; }
+        }
+
+        [Browsable(false)]
+        public override bool AutoCollapseOnClick
+        {
+            get { return base.AutoCollapseOnClick; }
+            set { base.AutoCollapseOnClick = value; }
+        }
+
+        [Browsable(false)]
+        public override bool CanCustomize
+        {
+            get { return base.CanCustomize; }
+            set { base.CanCustomize = value; }
+        }
+
+        [Browsable(false)]
+        public override string Category
+        {
+            get { return base.Category; }
+            set { base.Category = value; }
+        }
+
+        [Browsable(false)]
+        public override bool ClickAutoRepeat
+        {
+            get { return base.ClickAutoRepeat; }
+            set { base.ClickAutoRepeat = value; }
+        }
+
+        [Browsable(false)]
+        public override int ClickRepeatInterval
+        {
+            get { return base.ClickRepeatInterval; }
+            set { base.ClickRepeatInterval = value; }
+        }
+
+        [Browsable(false)]
+        public override Cursor Cursor
+        {
+            get { return base.Cursor; }
+            set { base.Cursor = value; }
+        }
+
+        [Browsable(false)]
+        public override bool Enabled
+        {
+            get { return base.Enabled; }
+            set { base.Enabled = value; }
+        }
+
+        [Browsable(false)]
+        public override bool Stretch
+        {
+            get { return base.Stretch; }
+            set { base.Stretch = value; }
+        }
+
+        [Browsable(false)]
+        public override string Text
+        {
+            get { return base.Text; }
+            set { base.Text = value; }
+        }
+
+        [Browsable(false)]
+        public override bool ThemeAware
+        {
+            get { return base.ThemeAware; }
+            set { base.ThemeAware = value; }
+        }
+
+        [Browsable(false)]
+        public override string Tooltip
+        {
+            get { return base.Tooltip; }
+            set { base.Tooltip = value; }
+        }
+
+        [Browsable(false)]
+        public override eItemAlignment ItemAlignment
+        {
+            get { return base.ItemAlignment; }
+            set { base.ItemAlignment = value; }
+        }
+
+        [Browsable(false)]
+        public override string KeyTips
+        {
+            get { return base.KeyTips; }
+            set { base.KeyTips = value; }
+        }
+
+        [Browsable(false)]
+        public override ShortcutsCollection Shortcuts
+        {
+            get { return base.Shortcuts; }
+            set { base.Shortcuts = value; }
+        }
+
+        [Browsable(false)]
+        public override string Description
+        {
+            get { return base.Description; }
+            set { base.Description = value; }
+        }
+
+        [Browsable(false)]
+        public override bool GlobalItem
+        {
+            get { return base.GlobalItem; }
+            set { base.GlobalItem = value; }
+        }
+
+        [Browsable(false)]
+        public override bool ShowSubItems
+        {
+            get { return base.ShowSubItems; }
+            set { base.ShowSubItems = value; }
+        }
+
+        [Browsable(false)]
+        public override string GlobalName
+        {
+            get { return base.GlobalName; }
+            set { base.GlobalName = value; }
+        }
+
+        [Browsable(false)]
+        public override Command Command
+        {
+            get { return base.Command; }
+            set { base.Command = value; }
+        }
+
+        [Browsable(false)]
+        public override object CommandParameter
+        {
+            get { return base.CommandParameter; }
+            set { base.CommandParameter = value; }
+        }
+
+        #endregion
+
+        #region Public properties
+
+        #region AutoHide
+
+        /// <summary>
+        /// Gets or sets whether the MenuBox is automatically hidden when the tab items size does not exceed the size of the control
+        /// </summary>
+        [Browsable(true), DefaultValue(false), Category("Behavior")]
+        [Description("Indicates whether the MenuBox is automatically hidden when the tab items size does not exceed the size of the control.")]
+        public bool AutoHide
+        {
+            get { return (_AutoHide); }
+
+            set
+            {
+                if (_AutoHide != value)
+                {
+                    _AutoHide = value;
+
+                    Visible = (value == true) ? AllItemsVisible() == false : true;
+
+                    MyRefresh();
+                }
+            }
+        }
+
+        #endregion
+
+        #region RaiseClickOnSelection
+
+        /// <summary>
+        /// Gets or sets whether the MenuBox raises a ClickEvent when selected
+        /// </summary>
+        [Browsable(true), DefaultValue(false), Category("Behavior")]
+        [Description("Indicates whether the MenuBox raises a ClickEvent when selected.")]
+        public bool RaiseClickOnSelection
+        {
+            get { return (_RaiseClickOnSelection); }
+            set { _RaiseClickOnSelection = value; }
+        }
+
+        #endregion
+
+        #region ShowTabsOnly
+
+        /// <summary>
+        /// Gets or sets whether MenuBox shows only Tabs entries
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Behavior")]
+        [Description("Indicates whether MenuBox shows only Tabs entries.")]
+        public bool ShowTabsOnly
+        {
+            get { return (_ShowTabsOnly); }
+            set { _ShowTabsOnly = value; }
+        }
+
+        #endregion
+
+        #region ShowImages
+
+        /// <summary>
+        /// Gets or sets whether the MenuBox displays each menu entry with its associated Image/Icon
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Behavior")]
+        [Description("Indicates whether the MenuBox displays each menu entry with its associated Image/Icon.")]
+        public bool ShowImages
+        {
+            get { return (_ShowImages); }
+            set { _ShowImages = value; }
+        }
+
+        #endregion
+
+        #region Visible
+
+        /// <summary>
+        /// Gets or sets MenuBox Visible state
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Behavior")]
+        [Description("Indicates MenuBox Visible state.")]
+        public override bool Visible
+        {
+            get { return base.Visible; }
+
+            set
+            {
+                if (base.Visible != value)
+                {
+                    base.Visible = value;
+
+                    MyRefresh();
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region IsMouseDown
+
+        /// <summary>
+        /// Gets the MouseDown state
+        /// </summary>
+        internal bool IsMouseDown
+        {
+            get { return (_IsMouseDown); }
+        }
+
+        #endregion
+
+        #region IsMouseOver
+
+        /// <summary>
+        /// Gets the MouseOver state
+        /// </summary>
+        internal bool IsMouseOver
+        {
+            get { return (_IsMouseOver); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RecalcSize
+
+        /// <summary>
+        /// RecalcSize
+        /// </summary>
+        public override void RecalcSize()
+        {
+            base.RecalcSize();
+
+            WidthInternal = Dpi.Width(_ItemSize.Width);
+            HeightInternal = Dpi.Height(_ItemSize.Height);
+        }
+
+        #endregion
+
+        #region MyRefresh
+
+        /// <summary>
+        /// Refreshes the display
+        /// </summary>
+        private void MyRefresh()
+        {
+            if (_ControlBox.TabDisplay != null)
+            {
+                SuperTabStripItem tsi = _ControlBox.TabDisplay.TabStripItem;
+
+                if (tsi != null)
+                {
+                    _ControlBox.NeedRecalcSize = true;
+                    _ControlBox.RecalcSize();
+
+                    tsi.NeedRecalcSize = true;
+                    tsi.Refresh();
+                }
+            }
+        }
+
+        #endregion
+
+        #region Paint
+
+        /// <summary>
+        /// Paint processing
+        /// </summary>
+        /// <param name="p"></param>
+        public override void Paint(ItemPaintArgs p)
+        {
+            Graphics g = p.Graphics;
+
+            using (SuperTabColorTable sct = _ControlBox.TabDisplay.GetColorTable())
+            {
+                Color imageColor = sct.ControlBoxDefault.Image;
+
+                if (IsMouseOver == true)
+                {
+                    Rectangle r = Bounds;
+
+                    r.Width--;
+                    r.Height--;
+
+                    imageColor = sct.ControlBoxMouseOver.Image;
+
+                    using (Brush br = new SolidBrush(sct.ControlBoxMouseOver.Background))
+                        g.FillRectangle(br, r);
+
+                    using (Pen pen = new Pen(sct.ControlBoxMouseOver.Border))
+                        g.DrawRectangle(pen, r);
+                }
+
+                if (AllItemsVisible() == true)
+                    g.DrawImageUnscaled(GetMenuButton1(g, imageColor), Bounds);
+                else
+                    g.DrawImageUnscaled(GetMenuButton2(g, imageColor), Bounds);
+            }
+        }
+
+        #region AllItemsVisible
+
+        /// <summary>
+        /// Determines if all the items are visible
+        /// </summary>
+        /// <returns>true if all visible</returns>
+        private bool AllItemsVisible()
+        {
+            SubItemsCollection tabs = _ControlBox.TabDisplay.Tabs;
+
+            for (int i = 0; i < tabs.Count; i++)
+            {
+                if (tabs[i].Visible == true && tabs[i].Displayed == false)
+                    return (false);
+            }
+
+            return (true);
+        }
+
+        #endregion
+
+        #region GetMenuButton1
+
+        /// <summary>
+        /// Gets MenuButton1
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="color"></param>
+        /// <returns></returns>
+        private Bitmap GetMenuButton1(Graphics g, Color color)
+        {
+            return (_ControlBox.TabDisplay.GetMenuButton1(g, color));
+        }
+
+        #endregion
+
+        #region GetMenuButton2
+
+        /// <summary>
+        /// Gets MenuButton2
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="color"></param>
+        /// <returns></returns>
+        private Bitmap GetMenuButton2(Graphics g, Color color)
+        {
+            return (_ControlBox.TabDisplay.GetMenuButton2(g, color));
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Mouse support
+
+        #region InternalMouseEnter
+
+        /// <summary>
+        /// InternalMouseEnter
+        /// </summary>
+        public override void InternalMouseEnter()
+        {
+            base.InternalMouseEnter();
+
+            _IsMouseOver = true;
+
+            Refresh();
+        }
+
+        #endregion
+
+        #region InternalMouseLeave
+
+        /// <summary>
+        /// InternalMouseLeave
+        /// </summary>
+        public override void InternalMouseLeave()
+        {
+            base.InternalMouseLeave();
+
+            _IsMouseOver = false;
+
+            Refresh();
+        }
+
+        #endregion
+
+        #region InternalMouseDown
+
+        /// <summary>
+        /// InternalMouseDown
+        /// </summary>
+        /// <param name="objArg"></param>
+        public override void InternalMouseDown(MouseEventArgs objArg)
+        {
+            _IsMouseDown = true;
+
+            if (DesignMode == false && objArg.Button == MouseButtons.Left)
+            {
+                LoadTabMenu();
+
+                Point pt = GetPopupPosition();
+
+                Popup(pt);
+            }
+        }
+
+        #region GetPopupPosition
+
+        /// <summary>
+        /// Gets the popup menu position
+        /// </summary>
+        /// <returns></returns>
+        private Point GetPopupPosition()
+        {
+            Point pt = new Point(Bounds.X, Bounds.Bottom);
+
+            Control c = (Control)_ControlBox.GetContainerControl(true);
+
+            if (c != null)
+                pt = c.PointToScreen(pt);
+
+            return (pt);
+        }
+
+        #endregion
+
+        #region LoadTabMenu
+
+        /// <summary>
+        /// Loads the TabMenu
+        /// </summary>
+        private void LoadTabMenu()
+        {
+            SubItems.Clear();
+
+            SubItemsCollection tabs = _ControlBox.TabDisplay.Tabs;
+
+            if (_ShowTabsOnly == true)
+                LoadTabsMenu(tabs);
+            else
+                LoadItemsMenu(tabs);
+        }
+
+        #region LoadTabsMenu
+
+        /// <summary>
+        /// Loads Tabs only into the TabMenu
+        /// </summary>
+        /// <param name="tabs"></param>
+        private void LoadTabsMenu(SubItemsCollection tabs)
+        {
+            for (int i = 0; i < tabs.Count; i++)
+            {
+                SuperTabItem tab = tabs[i] as SuperTabItem;
+
+                if (tab != null && tab.Visible == true)
+                {
+                    ButtonItem bi = new ButtonItem();
+
+                    bi.Tag = tab;
+                    bi.Text = tab.Text;
+
+                    if (tab.Enabled == true)
+                        bi.Click += SuperTabMenuBoxClick;
+                    else
+                        bi.Enabled = false;
+
+                    SubItems.Add(bi);
+
+                    if (_ShowImages == true)
+                        SetMenuImage(bi, tab);
+
+                    if (tab.IsSelected == true)
+                        bi.Checked = true;
+                }
+            }
+        }
+
+        #endregion
+
+        #region LoadItemsMenu
+
+        /// <summary>
+        /// Loads all items into the TabMenu
+        /// </summary>
+        /// <param name="tabs"></param>
+        private void LoadItemsMenu(SubItemsCollection tabs)
+        {
+            ButtonItem[] items = new ButtonItem[tabs.Count];
+
+            for (int i = 0; i < tabs.Count; i++)
+            {
+                if (tabs[i].Visible == true)
+                {
+                    items[i] = new ButtonItem();
+
+                    items[i].Tag = tabs[i];
+                    items[i].Text = tabs[i].Text;
+
+                    if (tabs[i].Enabled == true)
+                        items[i].Click += SuperTabMenuBoxClick;
+                    else
+                        items[i].Enabled = false;
+
+                    if (_ShowImages == true)
+                    {
+                        if (tabs[i] is SuperTabItem)
+                            SetMenuImage(items[i], ((SuperTabItem) tabs[i]).GetTabImage());
+
+                        else if (tabs[i] is ButtonItem)
+                            SetMenuImage(items[i], ((ButtonItem) tabs[i]).GetImage());
+                    }
+                }
+            }
+
+            int index = _ControlBox.TabDisplay.TabStripItem.SelectedTabIndex;
+
+            if (index >= 0 && index < tabs.Count)
+                items[index].Checked = true;
+
+            SubItems.AddRange(items);
+        }
+
+        #endregion
+
+        #region SetMenuImage
+
+        /// <summary>
+        /// Sets the TabMenu entry image
+        /// </summary>
+        /// <param name="bi"></param>
+        /// <param name="image"></param>
+        private void SetMenuImage(ButtonItem bi, SuperTabItem tab)
+        {
+            if (string.IsNullOrEmpty(tab.SymbolRealized) == false)
+            {
+                bi.Symbol = tab.Symbol;
+                bi.SymbolSize = tab.SymbolSize;
+                bi.SymbolColor = tab.TabItemDisplay.GetSymbolColor();
+            }
+            else
+            {
+                SetMenuImage(bi, tab.GetTabImage());
+            }
+        }
+
+        private void SetMenuImage(ButtonItem bi, CompositeImage image)
+        {
+            if (image != null)
+            {
+                if (image.Icon != null)
+                    bi.Icon = image.Icon;
+
+                else if (image.Image != null)
+                {
+                    if (ImageAnimator.CanAnimate(image.Image) == true)
+                    {
+                        FrameDimension frameDimensions =
+                            new FrameDimension(image.Image.FrameDimensionsList[0]);
+
+                        image.Image.SelectActiveFrame(frameDimensions, 0);
+
+                        bi.Image = new Bitmap(image.Image);
+                        bi.NeedRecalcSize = true;
+                    }
+                    else
+                    {
+                        bi.Image = image.Image;
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region SuperTabMenuBox_Click
+
+        /// <summary>
+        /// Handles SuperTabMenuBox_Click event
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void SuperTabMenuBoxClick(object sender, EventArgs e)
+        {
+            ButtonItem bi = sender as ButtonItem;
+
+            if (bi != null)
+            {
+                BaseItem item = bi.Tag as BaseItem;
+
+                if (item != null)
+                {
+                    SuperTabItem tab = bi.Tag as SuperTabItem;
+
+                    if (tab != null)
+                        _ControlBox.TabDisplay.TabStripItem.SelectedTab = tab;
+                    else
+                        _ControlBox.TabDisplay.TabStripItem.VisibleTab = item;
+
+                    if (_RaiseClickOnSelection == true)
+                        item.RaiseClick(eEventSource.Code);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InternalMouseUp
+
+        /// <summary>
+        /// InternalMouseUp
+        /// </summary>
+        /// <param name="objArg"></param>
+        public override void InternalMouseUp(MouseEventArgs objArg)
+        {
+            base.InternalMouseUp(objArg);
+
+            _IsMouseDown = false;
+
+            Refresh();
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Copy object support
+
+        /// <summary>
+        /// Returns copy of the item.
+        /// </summary>
+        public override BaseItem Copy()
+        {
+            SuperTabMenuBox objCopy = new SuperTabMenuBox(_ControlBox);
+            CopyToItem(objCopy);
+
+            return (objCopy);
+        }
+
+        protected override void CopyToItem(BaseItem copy)
+        {
+            SuperTabMenuBox objCopy = copy as SuperTabMenuBox;
+            base.CopyToItem(objCopy);
+        }
+
+        #endregion
+    }
+
+    #region enums
+
+    #region TabMenuOpenEventArgs
+
+    public class TabMenuOpenEventArgs : CancelEventArgs
+    {
+        #region Private variables
+
+        private ButtonItem _TabMenu;
+
+        #endregion
+
+        public TabMenuOpenEventArgs(ButtonItem tabMenu)
+        {
+            _TabMenu = tabMenu;
+        }
+
+        #region Public properties
+
+        public ButtonItem TabMenu
+        {
+            get { return (_TabMenu); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region TabMenuCloseEventArgs
+
+    public class TabMenuCloseEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private ButtonItem _TabMenu;
+
+        #endregion
+
+        public TabMenuCloseEventArgs(ButtonItem tabMenu)
+        {
+            _TabMenu = tabMenu;
+        }
+
+        #region Public properties
+
+        public ButtonItem TabMenu
+        {
+            get { return (_TabMenu); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #endregion
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/SuperTabControl/SuperTabItem/SuperTabItem.cs b/PROMS/DotNetBar Source Code/SuperTabControl/SuperTabItem/SuperTabItem.cs
new file mode 100644
index 00000000..1ff6b127
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/SuperTabControl/SuperTabItem/SuperTabItem.cs	
@@ -0,0 +1,2445 @@
+#if FRAMEWORK20
+using System;
+using System.ComponentModel;
+using System.Drawing.Design;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.Rendering;
+
+namespace DevComponents.DotNetBar
+{
+    [Designer("DevComponents.DotNetBar.Design.SuperTabItemDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+    public class SuperTabItem : BaseItem
+    {
+        #region Events
+
+        /// <summary>
+        /// Occurs when text markup link is clicked
+        /// </summary>
+        [Description("Occurs when text markup link is clicked.")]
+        public event MarkupLinkClickEventHandler MarkupLinkClick;
+
+        /// <summary>
+        /// Occurs when the tab colors have changed
+        /// </summary>
+        [Description("Occurs when the tab colors have changed.")]
+        public event EventHandler<EventArgs> TabColorChanged;
+
+        #endregion
+
+        #region Private variables
+
+        private Icon _Icon;
+        private Image _Image;
+        private int _ImageIndex = -1;
+        private Rectangle _ImageBounds;
+
+        private eTabItemColor _PredefinedColor = eTabItemColor.Default;
+        private SuperTabItemColorTable _TabColor = new SuperTabItemColorTable();
+
+        private bool _EnableMarkup = true;
+        private eItemAlignment? _TextAlignment;
+        private Rectangle _TextBounds;
+
+        private Font _TabFont;
+        private Font _SelectedTabFont;
+        private Font _SizingFont;
+
+        private bool _CloseButtonVisible = true;
+        private bool _CloseButtonMouseOver;
+        private bool _CloseButtonPressed;
+        private Rectangle _CloseButtonBounds;
+
+        private SuperTabStripItem _TabStripItem;
+        private Control _AttachedControl;
+
+        private SuperTabItemBaseDisplay _TabItemDisplay;
+
+        private Font _DefaultSelectedTabFont;
+        private bool _EnableImageAnimation;
+        private bool _CanAnimateImage;
+
+        private ImageAlignment _ImageAlignment = ImageAlignment.NotSet;
+        private Padding _ImagePadding;
+
+        private Size _FixedTabSize = Size.Empty;
+
+        private Color _SymbolColor = Color.Empty;
+        private string _Symbol = "";
+        private float _SymbolSize = 0f;
+
+        private bool _StartsNewTabLine;
+
+        #endregion
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        public SuperTabItem()
+        {
+            Visible = true;
+            GlobalItem = false;
+            Stretch = false;
+            Displayed = true;
+
+            HookEvents(true);
+        }
+
+        #region Protected properties
+
+        #region IsMarkupSupported
+
+        /// <summary>
+        /// IsMarkupSupported
+        /// </summary>
+        protected override bool IsMarkupSupported
+        {
+            get { return _EnableMarkup; }
+        }
+
+        #endregion
+
+        #region DefaultSelectedTabFont
+
+        /// <summary>
+        /// Gets or sets the default SelectedTabFont
+        /// </summary>
+        protected Font DefaultSelectedTabFont
+        {
+            get
+            {
+                if (_DefaultSelectedTabFont == null)
+                    _DefaultSelectedTabFont = new Font(SystemFonts.CaptionFont, FontStyle.Bold);
+
+                return (_DefaultSelectedTabFont);
+            }
+
+            set
+            {
+                if (_DefaultSelectedTabFont != null)
+                    _DefaultSelectedTabFont.Dispose();
+
+                _DefaultSelectedTabFont = value;
+
+                _SizingFont = null;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region CanAnimateImage
+
+        internal bool CanAnimateImage
+        {
+            get
+            {
+                return (_EnableImageAnimation == true &&
+                    _CanAnimateImage == true);
+            }
+        }
+
+        #endregion
+
+        #region CloseButtonBounds
+
+        /// <summary>
+        /// Gets the tab CloseButton Bounds
+        /// </summary>
+        internal Rectangle CloseButtonBounds
+        {
+            get
+            {
+                if (_CloseButtonBounds.IsEmpty)
+                    _CloseButtonBounds = GetCloseButtonBounds();
+
+                return (_CloseButtonBounds);
+            }
+        }
+
+        #endregion
+
+        #region CloseButtonMouseOver
+
+        /// <summary>
+        /// Gets or sets the CloseButtonMouseOver state
+        /// </summary>
+        internal bool CloseButtonMouseOver
+        {
+            get { return (_CloseButtonMouseOver); }
+
+            set
+            {
+                if (_CloseButtonMouseOver != value)
+                {
+                    _CloseButtonMouseOver = value;
+
+                    Refresh();
+                }
+            }
+        }
+
+        #endregion
+
+        #region CloseButtonPressed
+
+        /// <summary>
+        /// Gets or sets the CloseButtonPressed state
+        /// </summary>
+        internal bool CloseButtonPressed
+        {
+            get { return (_CloseButtonPressed); }
+
+            set
+            {
+                if (_CloseButtonPressed != value)
+                {
+                    _CloseButtonPressed = value;
+
+                    Refresh();
+                }
+            }
+        }
+
+        #endregion
+
+        #region EffectiveImageAlignment
+
+        /// <summary>
+        /// Gets the effective image alignment
+        /// </summary>
+        internal ImageAlignment EffectiveImageAlignment
+        {
+            get
+            {
+                if (ImageAlignment != ImageAlignment.NotSet)
+                    return (ImageAlignment);
+
+                if (TabStripItem.ImageAlignment != ImageAlignment.NotSet)
+                    return (TabStripItem.ImageAlignment);
+
+                return (ImageAlignment.MiddleLeft);
+            }
+        }
+
+        #endregion
+
+        #region ImageBounds
+
+        /// <summary>
+        /// Gets the tab Image Bounds
+        /// </summary>
+        internal Rectangle ImageBounds
+        {
+            get
+            {
+                if (_ImageBounds.IsEmpty)
+                    _ImageBounds = GetImageBounds();
+
+                return (_ImageBounds);
+            }
+        }
+
+        #endregion
+
+        #region IsVertical
+
+        /// <summary>
+        /// Gets the tabs vertical orientation
+        /// </summary>
+        internal bool IsVertical
+        {
+            get
+            {
+                return (_TabStripItem.HorizontalText == false &&
+                        (_TabStripItem.TabAlignment == eTabStripAlignment.Left ||
+                         _TabStripItem.TabAlignment == eTabStripAlignment.Right));
+            }
+        }
+
+        #endregion
+
+        #region SelectedFont
+
+        internal Font SelectedFont
+        {
+            get { return (_SelectedTabFont ?? _TabStripItem.SelectedTabFont) ?? DefaultSelectedTabFont; }
+        }
+
+        #endregion
+
+        #region SizingFont
+
+        internal Font SizingFont
+        {
+            get { return (_SizingFont); }
+            set { _SizingFont = value; }
+        }
+
+        #endregion
+
+        #region TabDisplay
+
+        /// <summary>
+        /// Gets the TabItemDisplay
+        /// </summary>
+        internal SuperTabItemBaseDisplay TabItemDisplay
+        {
+            get { return (_TabItemDisplay); }
+        }
+
+        #endregion
+
+        #region TabStrip
+
+        /// <summary>
+        /// Gets the tabs TabStrip
+        /// </summary>
+        internal SuperTabStrip TabStrip
+        {
+            get { return (TabStripItem != null ? TabStripItem.TabStrip : null); }
+        }
+
+        #endregion
+
+        #region TextBounds
+
+        /// <summary>
+        /// Gets the tabs Text Bounds
+        /// </summary>
+        internal Rectangle TextBounds
+        {
+            get
+            {
+                if (_TextBounds.IsEmpty)
+                    _TextBounds = GetTextBounds();
+
+                return (_TextBounds);
+            }
+        }
+
+        #endregion
+
+        #region UnselectedFont
+
+        internal Font UnselectedFont
+        {
+            get { return (_TabFont ?? _TabStripItem.TabFont) ?? SystemFonts.CaptionFont; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Public properties
+
+        #region Browsable properties
+
+        #region EnableImageAnimation
+
+        /// <summary>
+        /// Gets or sets whether image animation is enabled
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true)]
+        [DefaultValue(false), Category("Appearance")]
+        [Description("Indicates whether image animation is enabled.")]
+        public bool EnableImageAnimation
+        {
+            get { return (_EnableImageAnimation); }
+
+            set
+            {
+                if (_EnableImageAnimation != value)
+                {
+                    _EnableImageAnimation = value;
+
+                    RefreshOwner();
+                }
+            }
+        }
+
+        #endregion
+
+        #region TabColor
+
+        /// <summary>
+        /// Gets or sets user specified tab display colors
+        /// </summary>
+        [Browsable(true), Category("Style")]
+        [Description("Contains user specified tab display colors.")]
+        public SuperTabItemColorTable TabColor
+        {
+            get { return (_TabColor); }
+
+            set
+            {
+                if (_TabColor.Equals(value) == false)
+                {
+                    if (_TabColor != null)
+                        _TabColor.ColorTableChanged -= ColorTableColorTableChanged;
+
+                    _TabColor = value;
+
+                    if (value != null)
+                        _TabColor.ColorTableChanged += ColorTableColorTableChanged;
+
+                    OnTabColorChanged();
+
+                    Refresh();
+                }
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeTabColor()
+        {
+            return (_TabColor.IsEmpty == false);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetTabColor()
+        {
+            TabColor = new SuperTabItemColorTable();
+        }
+
+        #endregion
+
+        #region CloseButtonVisible
+
+        /// <summary>
+        /// Gets or sets whether Close button on the tab is visible when SuperTabStrip.CloseButtonOnTabsVisible property is set to true
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Appearance")]
+        [Description("Indicates whether Close button on the tab is visible when SuperTabStrip.CloseButtonOnTabsVisible property is set to true.")]
+        public bool CloseButtonVisible
+        {
+            get { return (_CloseButtonVisible); }
+
+            set
+            {
+                if (_CloseButtonVisible != value)
+                {
+                    _CloseButtonVisible = value;
+
+                    RefreshOwner();
+                }
+            }
+        }
+
+        #endregion
+
+        #region Enabled
+
+        /// <summary>
+        /// Enabled
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Behavior")]
+        [Description("Indicates whether the tab is enabled.")]
+        public override bool Enabled
+        {
+            get { return base.Enabled; }
+
+            set
+            {
+                if (base.Enabled != value)
+                {
+                    base.Enabled = value;
+                    
+                    if (_TabStripItem != null)
+                    {
+                        if (value == false && IsSelected == true && DesignMode == false)
+                            _TabStripItem.SelectNewTab(this);
+                    }
+
+                    RefreshOwner();
+                }
+            }
+        }
+
+        #endregion
+
+        #region EnableMarkup
+
+        /// <summary>
+        /// Gets or sets whether text-markup support is enabled for the control's Text property
+        /// </summary>
+        [DefaultValue(true), Category("Appearance")]
+        [Description("Indicates whether text-markup support is enabled for the control's Text property.")]
+        public bool EnableMarkup
+        {
+            get { return (_EnableMarkup); }
+
+            set
+            {
+                if (_EnableMarkup != value)
+                {
+                    _EnableMarkup = value;
+                    NeedRecalcSize = true;
+
+                    OnTextChanged();
+                }
+            }
+        }
+
+        #endregion
+
+        #region FixedTabSize
+
+        /// <summary>
+        /// Gets or sets the FixedTabSize
+        /// </summary>
+        public Size FixedTabSize
+        {
+            get { return _FixedTabSize; }
+
+            set
+            {
+                value.Width = Math.Max(0, value.Width);
+                value.Height = Math.Max(0, value.Height);
+
+                if (_FixedTabSize != value)
+                {
+                    _FixedTabSize = value;
+
+                    RefreshOwner();
+                }
+            }
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeFixedTabSize()
+        {
+            return (_FixedTabSize.IsEmpty == false);
+        }
+
+        #endregion
+
+        #region Icon
+
+        /// <summary>
+        /// Gets or sets the tab icon. Icon has same functionality as Image except that it supports Alpha blending
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), DefaultValue(null), Category("Appearance")]
+        [Description("Indicates the tab icon. Icon has same functionality as Image except that it supports Alpha blending.")]
+        public Icon Icon
+        {
+            get { return _Icon; }
+
+            set
+            {
+                if (_Icon != value)
+                {
+                    _Icon = value;
+
+                    RefreshOwner();
+                }
+            }
+        }
+
+        [Browsable(false), DevCoBrowsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetIcon()
+        {
+            Icon = null;
+        }
+
+        #endregion
+
+        #region Image
+
+        /// <summary>
+        /// Gets or sets the tab image
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), DefaultValue(null), Category("Appearance")]
+        [Description("Indicates the tab image.")]
+        public Image Image
+        {
+            get { return (_Image); }
+
+            set
+            {
+                if (_Image != value)
+                {
+                    _Image = value;
+
+                    OnImageChanged();
+                }
+            }
+        }
+
+        private void OnImageChanged()
+        {
+            if (_EnableImageAnimation == true)
+            {
+                if (_TabItemDisplay != null)
+                    _TabItemDisplay.StopImageAnimation();
+            }
+
+            Image image = GetImage();
+
+            _CanAnimateImage = ImageAnimator.CanAnimate(image);
+
+            RefreshOwner();
+        }
+
+        #endregion
+
+        #region ImageIndex
+
+        /// <summary>
+        /// Gets or sets the tab image index
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), DefaultValue(-1)]
+        [Category("Appearance"), Description("Indicates the tab image index")]
+		[Editor("DevComponents.DotNetBar.Design.ImageIndexEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(UITypeEditor))]
+        [TypeConverter(typeof(ImageIndexConverter))]
+        public int ImageIndex
+        {
+            get { return (_ImageIndex); }
+
+            set
+            {
+                if (_ImageIndex != value)
+                {
+                    _ImageIndex = value;
+
+                    OnImageChanged();
+                }
+            }
+        }
+
+        [Browsable(false), DevCoBrowsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetImageIndex()
+        {
+            ImageIndex = -1;
+        }
+
+        #endregion
+
+        #region ImageList
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public ImageList ImageList
+        {
+            get
+            {
+                if (_TabStripItem != null && _TabStripItem.TabStrip != null)
+                    return (_TabStripItem.TabStrip.ImageList);
+
+                return (null);
+            }
+        }
+
+        #endregion
+
+        #region ImageAlignment
+
+        /// <summary>
+        /// Gets or sets the alignment of the Image within the tab
+        /// </summary>
+        [DefaultValue(ImageAlignment.NotSet), Category("Appearance")]
+        [Description("Indicates the alignment of the Image within the tab.")]
+        public ImageAlignment ImageAlignment
+        {
+            get { return (_ImageAlignment); }
+
+            set
+            {
+                if (_ImageAlignment != value)
+                {
+                    _ImageAlignment = value;
+
+                    RefreshOwner();
+                }
+            }
+        }
+
+        #endregion
+
+        #region ImagePadding
+
+        /// <summary>
+        /// Gets or sets the spacing between content and edges of the Image
+        /// </summary>
+        [Description("Indicates the spacing between content and edges of the Image")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public Padding ImagePadding
+        {
+            get
+            {
+                if (_ImagePadding == null)
+                {
+                    _ImagePadding = new Padding(0);
+
+                    UpdateChangeHandler(null, _ImagePadding);
+                }
+
+                return (_ImagePadding);
+            }
+
+            set
+            {
+                if (_ImagePadding != value)
+                {
+                    UpdateChangeHandler(_ImagePadding, value);
+
+                    _ImagePadding = value;
+
+                    RefreshOwner();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private bool ShouldSerializeImagePadding()
+        {
+            return (_ImagePadding != null && _ImagePadding.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetImagePadding()
+        {
+            ImagePadding = null;
+        }
+
+        #endregion
+
+        #region PredefinedColor
+
+        /// <summary>
+        /// Gets or sets the predefined color for the tab
+        /// </summary>
+        [Browsable(true), DefaultValue(eTabItemColor.Default), Category("Style")]
+        [Description("Indicates the predefined color for the tab.")]
+        public eTabItemColor PredefinedColor
+        {
+            get { return (_PredefinedColor); }
+
+            set
+            {
+                _PredefinedColor = value;
+
+                OnTabColorChanged();
+            }
+        }
+
+        #endregion
+
+        #region SelectedTabFont
+
+        /// <summary>
+        /// Gets or sets the selected tab Font
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Category("Style"), DefaultValue(null)]
+        [Description("Indicates the selected tab Font")]
+        public Font SelectedTabFont
+        {
+            get { return (_SelectedTabFont); } 
+
+            set
+            {
+                if (_SelectedTabFont != value)
+                {
+                    if (value != null)
+                        DefaultSelectedTabFont = null;
+
+                    _SelectedTabFont = value;
+                    _SizingFont = null;
+
+                    RefreshOwner();
+                }
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeSelectedTabFont()
+        {
+            return (_SelectedTabFont != null);
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetSelectedTabFont()
+        {
+            SelectedTabFont = null;
+        }
+
+        #endregion 
+
+        #region StartsNewTabLine
+
+        /// <summary>
+        /// StartsNewTabLine
+        /// </summary>
+        [Browsable(true), DefaultValue(false), Category("Behavior")]
+        [Description("Indicates whether the tab starts a new tab line.")]
+        public bool StartsNewTabLine
+        {
+            get { return (_StartsNewTabLine); }
+
+            set
+            {
+                if (value != _StartsNewTabLine)
+                {
+                    _StartsNewTabLine = value;
+
+                    RefreshOwner();
+                }
+            }
+        }
+
+        #endregion
+
+        #region Symbol
+        /// <summary>
+        /// Gets the realized symbol string.
+        /// </summary>
+        [Browsable(false)]
+        public string SymbolRealized
+        {
+            get { return _SymbolRealized; }
+        }
+        private string _SymbolRealized = "";
+        /// <summary>
+        /// Indicates the symbol displayed on face of the button instead of
+        /// the image. Setting the symbol overrides the image setting.
+        /// </summary>
+        [DefaultValue(""), Category("Appearance"), Description("Indicates the symbol displayed on face of the button instead of the image. Setting the symbol overrides the image setting.")]
+        [Editor("DevComponents.DotNetBar.Design.SymbolTypeEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor))]
+        public string Symbol
+        {
+            get { return (_Symbol); }
+
+            set
+            {
+                if (value != _Symbol)
+                {
+                    string oldValue = _Symbol;
+                    _Symbol = value;
+
+                    OnSymbolChanged(oldValue, value);
+                }
+            }
+        }
+
+        #region OnSymbolChanged
+
+        /// <summary>
+        /// Called when Symbol property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnSymbolChanged(string oldValue, string newValue)
+        {
+            if (string.IsNullOrEmpty(newValue))
+                _SymbolRealized = "";
+            else
+                _SymbolRealized = Symbols.GetSymbol(newValue);
+            NeedRecalcSize = true;
+
+            OnAppearanceChanged();
+            Refresh();
+        }
+
+        #endregion
+
+        private eSymbolSet _SymbolSet = eSymbolSet.Awesome;
+        /// <summary>
+        /// Gets or sets the symbol set used to represent the Symbol.
+        /// </summary>
+        [Browsable(false), DefaultValue(eSymbolSet.Awesome)]
+        public eSymbolSet SymbolSet
+        {
+            get { return _SymbolSet; }
+            set
+            {
+                if (_SymbolSet != value)
+                {
+                    eSymbolSet oldValue = _SymbolSet;
+                    _SymbolSet = value;
+                    OnSymbolSetChanged(oldValue, value);
+                }
+            }
+        }
+        /// <summary>
+        /// Called when SymbolSet property value changes.
+        /// </summary>
+        /// <param name="oldValue">Indciates old value</param>
+        /// <param name="newValue">Indicates new value</param>
+        protected virtual void OnSymbolSetChanged(eSymbolSet oldValue, eSymbolSet newValue)
+        {
+            NeedRecalcSize = true;
+            OnAppearanceChanged();
+            this.Refresh();
+        }
+
+        #endregion
+
+        #region SymbolColor
+
+        /// <summary>
+        /// Gets or sets the color of the Symbol.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates color of the Symbol.")]
+        public Color SymbolColor
+        {
+            get { return (_SymbolColor); }
+            set { _SymbolColor = value; Refresh(); }
+        }
+
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeSymbolColor()
+        {
+            return (_SymbolColor.IsEmpty == false);
+        }
+
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetSymbolColor()
+        {
+            SymbolColor = Color.Empty;
+        }
+
+        #endregion
+
+        #region SymbolSize
+
+        /// <summary>
+        /// Indicates the size of the symbol in points.
+        /// </summary>
+        [DefaultValue(0f), Category("Appearance"), Description("Indicates the size of the symbol in points.")]
+        public float SymbolSize
+        {
+            get { return (_SymbolSize); }
+
+            set
+            {
+                if (value != _SymbolSize)
+                {
+                    float oldValue = _SymbolSize;
+                    _SymbolSize = value;
+
+                    OnSymbolSizeChanged(oldValue, value);
+                }
+            }
+        }
+
+        #region OnSymbolSizeChanged
+
+        /// <summary>
+        /// Called when SymbolSize property has changed.
+        /// </summary>
+        /// <param name="oldValue">Old property value</param>
+        /// <param name="newValue">New property value</param>
+        protected virtual void OnSymbolSizeChanged(float oldValue, float newValue)
+        {
+            NeedRecalcSize = true;
+
+            OnAppearanceChanged();
+            Refresh();
+        }
+
+        #endregion
+
+        #endregion
+
+        #region TextAlignment
+
+        /// <summary>
+        /// Gets or sets the text alignment
+        /// </summary>
+        [Browsable(true), DefaultValue(null)]
+        [DevCoBrowsable(true), Category("Layout"), Description("Indicates text alignment.")]
+        public eItemAlignment? TextAlignment
+        {
+            get { return (_TextAlignment); }
+
+            set
+            {
+                if (_TextAlignment != value)
+                {
+                    _TextAlignment = value;
+
+                    Refresh();
+                }
+            }
+        }
+
+        #endregion
+
+        #region TabFont
+
+        /// <summary>
+        /// Gets or sets the tab Font
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Category("Style"), DefaultValue(null)]
+        [Description("Indicates the tab Font")]
+        public Font TabFont
+        {
+            get { return (_TabFont); }
+
+            set
+            {
+                if (_TabFont != value)
+                {
+                    _TabFont = value;
+                    _SizingFont = null;
+
+                    RefreshOwner();
+                }
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeTabFont()
+        {
+            return (_TabFont != null);
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetTabFont()
+        {
+            TabFont = null;
+        }
+
+        #endregion
+
+        #region Text
+
+        /// <summary>
+        /// Gets or sets the tab text
+        /// </summary>
+        [Browsable(true)]
+        [Editor("DevComponents.DotNetBar.Design.TextMarkupUIEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(UITypeEditor))]
+        [Category("Appearance"), Description("Indicates the tab text.")]
+        public override string Text
+        {
+            get { return (base.Text); }
+            set { base.Text = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Non-Browsable properties
+
+        #region AttachedControl
+
+        /// <summary>
+        /// Gets or sets the control that is attached to this tab
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(true), DefaultValue(null), Category("Behavior")]
+        public Control AttachedControl
+        {
+            get { return (_AttachedControl); }
+
+            set
+            {
+                SuperTabControlPanel panel = _AttachedControl as SuperTabControlPanel;
+
+                if (panel != null)
+                    panel.PanelColorChanged -= ColorTableColorTableChanged;
+
+                _AttachedControl = value;
+
+                panel = _AttachedControl as SuperTabControlPanel;
+
+                if (panel != null)
+                {
+                    panel.TabItem = this;
+                    panel.Dock = DockStyle.Fill;
+
+                    panel.PanelColorChanged += ColorTableColorTableChanged;
+
+                    if (_TabStripItem != null && _TabStripItem.TabStrip != null)
+                    {
+                        if (DesignMode == true)
+                            _TabStripItem.TabStrip.Controls.Add(panel);
+
+                        panel.BringToFront();
+                        panel.Visible = (_TabStripItem.SelectedTab == this);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region Bounds
+
+        /// <summary>
+        /// Gets or sets the tab Bounds
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public override Rectangle Bounds
+        {
+            get { return (base.Bounds); }
+
+            set
+            {
+                base.Bounds = value;
+
+                _TextBounds = Rectangle.Empty;
+                _CloseButtonBounds = Rectangle.Empty;
+                _ImageBounds = Rectangle.Empty;
+            }
+        }
+
+        #endregion
+
+        #region IsMouseOver
+
+        /// <summary>
+        /// Gets the MouseOver state
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsMouseOver
+        {
+            get { return (_TabStripItem != null && _TabStripItem.MouseOverTab == this); }
+        }
+
+        #endregion
+
+        #region IsSelected
+
+        /// <summary>
+        /// Gets the tab selected state
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IsSelected
+        {
+            get { return (_TabStripItem != null && _TabStripItem.SelectedTab == this); }
+        }
+
+        #endregion
+
+        #region TabAlignment
+
+        /// <summary>
+        /// Gets the tab alignment
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public eTabStripAlignment TabAlignment
+        {
+            get
+            {
+                if (_TabStripItem != null)
+                    return (_TabStripItem.TabAlignment);
+
+                return (eTabStripAlignment.Top);
+            }
+        }
+
+        #endregion
+
+        #region ContentRectangle
+
+        /// <summary>
+        /// Gets the tab Content Rectangle
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public Rectangle ContentRectangle
+        {
+            get
+            {
+                if (_TabItemDisplay != null)
+                    return (_TabItemDisplay.GetContentRectangle());
+
+                return (Rectangle.Empty);
+            }
+        }
+
+        #endregion
+
+        #region TabStripItem
+
+        /// <summary>
+        /// Gets or sets the tab TabStripItem
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public SuperTabStripItem TabStripItem
+        {
+            get { return (_TabStripItem); }
+
+            set
+            {
+                _TabStripItem = value;
+
+                if(_TabStripItem!=null)
+                SetOwner(_TabStripItem.GetOwner());
+
+                if (_TabStripItem != null)
+                {
+                    TabStyle = _TabStripItem.TabStyle;
+                    ContainerControl = _TabStripItem.ContainerControl;
+                }
+            }
+        }
+
+        #endregion
+
+        #region TabStyle
+
+        /// <summary>
+        /// Gets or sets the tabs TabStyle
+        /// </summary>
+        [Browsable(false)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public eSuperTabStyle TabStyle
+        {
+            get
+            {
+                if (_TabStripItem != null)
+                    return (_TabStripItem.TabStyle);
+
+                return (eSuperTabStyle.Office2007);
+            }
+
+            internal set
+            {
+                if (_TabItemDisplay != null)
+                    _TabItemDisplay.Dispose();
+
+                switch (value)
+                {
+                    case eSuperTabStyle.Office2007:
+                        _TabItemDisplay = new Office2007SuperTabItem(this);
+                        break;
+
+                    case eSuperTabStyle.Office2010BackstageBlue:
+                        _TabItemDisplay = new Office2010BackstageSuperTabItem(this);
+                        break;
+
+                    case eSuperTabStyle.OneNote2007:
+                        _TabItemDisplay = new OneNote2007SuperTabItem(this);
+                        break;
+
+                    case eSuperTabStyle.OfficeMobile2014:
+                        _TabItemDisplay = new OfficeMobile2014SuperTabItem(this);
+                        break;
+
+                    case eSuperTabStyle.VisualStudio2008Dock:
+                        _TabItemDisplay = new VS2008DockSuperTabItem(this);
+                        break;
+
+                    case eSuperTabStyle.VisualStudio2008Document:
+                        _TabItemDisplay = new VS2008DocumentSuperTabItem(this);
+                        break;
+
+                    case eSuperTabStyle.WinMediaPlayer12:
+                        _TabItemDisplay = new WinMediaPlayer12SuperTabItem(this);
+                        break;
+                }
+            }
+        }
+
+        #endregion
+
+        #region Visible
+
+        /// <summary>
+        /// Visible
+        /// </summary>
+        public override bool Visible
+        {
+            get { return (base.Visible); }
+
+            set
+            {
+                base.Visible = value;
+
+                if (_TabStripItem != null)
+                {
+                    if (value == false && IsSelected == true && DesignMode == false)
+                        _TabStripItem.SelectNewTab(this);
+
+                    RefreshOwner();
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region HookEvents
+
+        /// <summary>
+        /// Hooks or unhooks control events
+        /// </summary>
+        /// <param name="hook">true to hook</param>
+        private void HookEvents(bool hook)
+        {
+            if (hook == true)
+            {
+                TextChanged += SuperTabItemTextChanged;
+                MarkupLinkClick += TextMarkupLinkClick;
+
+                _TabColor.ColorTableChanged += ColorTableColorTableChanged;
+            }
+            else
+            {
+                TextChanged -= SuperTabItemTextChanged;
+                MarkupLinkClick -= TextMarkupLinkClick;
+
+                if (_TabColor != null)
+                    _TabColor.ColorTableChanged -= ColorTableColorTableChanged;
+            }
+        }
+
+        #endregion
+
+        #region Event processing
+
+        #region SuperTabItem_TextChanged
+
+        /// <summary>
+        /// SuperTabItem_TextChanged processing
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void SuperTabItemTextChanged(object sender, EventArgs e)
+        {
+            NeedRecalcSize = true;
+            Refresh();
+
+            if (_TabStripItem != null)
+            {
+                _TabStripItem.NeedRecalcSize = true;
+                _TabStripItem.Refresh();
+            }
+        }
+
+        #endregion
+
+        #region Markup Support
+
+        /// <summary>
+        /// TextMarkupLinkClick
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected override void TextMarkupLinkClick(object sender, EventArgs e)
+        {
+            TextMarkup.HyperLink link = sender as TextMarkup.HyperLink;
+
+            if (link != null)
+                OnMarkupLinkClick(new MarkupLinkClickEventArgs(link.Name, link.HRef));
+
+            base.TextMarkupLinkClick(sender, e);
+        }
+
+        /// <summary>
+        /// OnMarkupLinkClick
+        /// </summary>
+        /// <param name="e"></param>
+        protected virtual void OnMarkupLinkClick(MarkupLinkClickEventArgs e)
+        {
+            if (MarkupLinkClick != null)
+                MarkupLinkClick(this, e);
+        }
+
+        #endregion
+
+        #region ColorTable_ColorTableChanged
+
+        /// <summary>
+        /// ColorTable_ColorTableChanged
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void ColorTableColorTableChanged(object sender, EventArgs e)
+        {
+            OnTabColorChanged();
+        }
+
+        #endregion
+
+        #endregion
+
+        #region OnColorTableChanged
+
+        /// <summary>
+        /// Processes ColorTable changes
+        /// </summary>
+        protected void OnTabColorChanged()
+        {
+            if (TabColorChanged != null)
+                TabColorChanged(this, EventArgs.Empty);
+
+            Refresh();
+        }
+
+        #endregion
+
+        #region Close
+
+        /// <summary>
+        /// Closes the tab
+        /// </summary>
+        public void Close()
+        {
+            _TabStripItem.CloseTab(this);
+        }
+
+        #endregion
+
+        #region GetTabFont
+
+        /// <summary>
+        /// Gets the operational tab font
+        /// </summary>
+        /// <returns></returns>
+        public Font GetTabFont()
+        {
+            return ((IsSelected == true) ? SelectedFont : UnselectedFont);
+        }
+
+        #endregion
+
+        #region GetTabColorTable
+
+        /// <summary>
+        /// Gets the tab ColorTable
+        /// </summary>
+        /// <returns>SuperTabItemStateColorTable</returns>
+        internal SuperTabItemStateColorTable GetTabColorTable()
+        {
+            return (_TabItemDisplay.GetTabColorTable());
+        }
+
+        /// <summary>
+        /// Gets the tab ColorStateTable for the given state
+        /// </summary>
+        /// <param name="tabState">eTabState</param>
+        /// <returns>SuperTabItemStateColorTable</returns>
+        internal SuperTabItemStateColorTable GetTabColorTable(eTabState tabState)
+        {
+            return (_TabItemDisplay.GetTabColorTable(tabState));
+        }
+
+        internal SuperTabItemStateColorTable GetTabColorTableEx(eTabState tabState)
+        {
+            return (_TabItemDisplay.GetTabColorTableEx(tabState));
+        }
+
+
+        #endregion
+
+        #region GetPanelColorTable
+
+        /// <summary>
+        /// Gets the tab Panel ColorTable
+        /// </summary>
+        /// <returns></returns>
+        internal SuperTabPanelItemColorTable GetPanelColorTable()
+        {
+            return (_TabItemDisplay.GetPanelColorTable());
+        }
+
+        #endregion
+
+        #region GetTabAreaFromPoint
+
+        /// <summary>
+        /// Gets the area of the tab that contains the given Point
+        /// </summary>
+        /// <param name="pt"></param>
+        /// <returns></returns>
+        public eSuperTabArea GetTabAreaFromPoint(Point pt)
+        {
+            if (Bounds.Contains(pt) == true)
+            {
+                if (CloseButtonBounds.Contains(pt) == true)
+                    return (eSuperTabArea.InCloseBox);
+
+                if (ImageBounds.Contains(pt) == true)
+                    return (eSuperTabArea.InImage);
+
+                return (eSuperTabArea.InContent);
+            }
+
+            return (eSuperTabArea.InNone);
+        }
+
+        #endregion
+
+        #region PointInTab
+
+        /// <summary>
+        /// Determines if the given Point is in the tab
+        /// </summary>
+        /// <param name="pt">Point to test</param>
+        /// <returns>true if Point is in tab</returns>
+        public bool PointInTab(Point pt)
+        {
+            using (GraphicsPath path = GetTabItemPath())
+            {
+                if (path.IsVisible(pt))
+                    return (true);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region GetTabItemPath
+
+        /// <summary>
+        /// Gets the tab bordering GraphicsPath
+        /// </summary>
+        /// <returns>GraphicsPath</returns>
+        public GraphicsPath GetTabItemPath()
+        {
+            return (_TabItemDisplay != null ?
+                _TabItemDisplay.TabItemPath() : null);
+        }
+
+        #endregion
+
+        #region GetCloseButtonBounds
+
+        /// <summary>
+        /// Gets the Close Button bounding Rectangle
+        /// </summary>
+        /// <returns>Bounding Rectangle</returns>
+        private Rectangle GetCloseButtonBounds()
+        {
+            if (CloseButtonVisible == false ||
+                _TabStripItem == null ||
+                _TabStripItem.CloseButtonOnTabsVisible == false)
+            {
+                return (Rectangle.Empty);
+            }
+
+            Rectangle r = TabItemDisplay.GetContentRectangle();
+
+            Rectangle t = r;
+
+            Size closeSize = _TabStripItem.TabCloseButtonSize;
+            int spacing = _TabStripItem.TabHorizontalSpacing;
+
+            if (IsVertical == true)
+            {
+                if (TabStripItem.CloseButtonPosition == eTabCloseButtonPosition.Left)
+                {
+                    r = new Rectangle(r.X + (r.Width - closeSize.Width) / 2 + 1,
+                                      r.Bottom - spacing - closeSize.Height - 1,
+                                      closeSize.Width, closeSize.Height);
+                }
+                else
+                {
+                    r = new Rectangle(r.X + (r.Width - closeSize.Width)/2 + 1,
+                                      r.Y + spacing, closeSize.Width, closeSize.Height);
+                }
+
+                if (TabStripItem.RotateVerticalText ^
+                    TabStripItem.TabAlignment == eTabStripAlignment.Right)
+                {
+                    r.X = t.X + (t.Right - r.Right);
+                    r.Y = t.Y + (t.Bottom - r.Bottom);
+                }
+            }
+            else
+            {
+                if (_TabStripItem.CloseButtonPosition == eTabCloseButtonPosition.Left)
+                {
+                    r = new Rectangle(r.X + spacing,
+                                      r.Y + (r.Height - closeSize.Height) / 2,
+                                      closeSize.Width, closeSize.Height);
+
+                    if (_TabStripItem.TabAlignment == eTabStripAlignment.Right)
+                    {
+                        if (IsSelected == true)
+                            r.X += _TabStripItem.TabDisplay.SelectedPaddingWidth;
+                    }
+                }
+                else
+                {
+                    r = new Rectangle(r.Right - spacing - closeSize.Width,
+                                      r.Y + (r.Height - closeSize.Height) / 2 + 1,
+                                      closeSize.Width, closeSize.Height);
+
+                    if (_TabStripItem.TabAlignment == eTabStripAlignment.Left)
+                    {
+                        if (IsSelected == true)
+                            r.X -= _TabStripItem.TabDisplay.SelectedPaddingWidth;
+                    }
+                }
+            }
+
+            r = _TabStripItem.OnGetCloseBounds(this, r);
+
+            return (r);
+        }
+
+        #endregion
+
+        #region GetImageBounds
+
+        /// <summary>
+        /// Gets the Image bounding Rectangle
+        /// </summary>
+        /// <returns>Bounding Rectangle</returns>
+        private Rectangle GetImageBounds()
+        {
+            CompositeImage image = GetTabImage();
+
+            if (string.IsNullOrEmpty(SymbolRealized) && image == null)
+                return (Rectangle.Empty);
+
+            Rectangle r = TabItemDisplay.GetContentRectangle();
+
+            r = ProcessCloseBounds(r);
+
+            r = (IsVertical == true)
+                ? CalcVerticalImageBounds(image, r)
+                : CalcHorizontalImageBounds(image, r);
+
+            r = _TabStripItem.OnGetImageBounds(this, r);
+
+            return (r);
+        }
+
+        #region CalcVerticalImageBounds
+
+        private Rectangle CalcVerticalImageBounds(CompositeImage image, Rectangle r)
+        {
+            int h = 0;
+            int w = 0;
+
+            if (string.IsNullOrEmpty(SymbolRealized) == false)
+            {
+                Size size = GetSymbolSize();
+
+                w = size.Width;
+                h = size.Height;
+            }
+            else
+            {
+                w = Dpi.ImageWidth(image.Width);
+                h = Dpi.ImageHeight(image.Height);
+            }
+
+            Padding padding = Dpi.Size(ImagePadding);
+
+            Rectangle t = r;
+
+            switch (EffectiveImageAlignment)
+            {
+                case ImageAlignment.TopLeft:
+                    r.X += padding.Top + TabStripItem.TabVerticalSpacing;
+                    r.Y = r.Bottom - (w + padding.Left);
+                    break;
+
+                case ImageAlignment.TopCenter:
+                    r.X += padding.Top + TabStripItem.TabVerticalSpacing;
+                    r.Y += (r.Height - (w + padding.Horizontal - TabStripItem.TabHorizontalSpacing))/2;
+                    break;
+
+                case ImageAlignment.TopRight:
+                    r.X += padding.Top + TabStripItem.TabVerticalSpacing;
+                    r.Y += padding.Right + TabStripItem.TabHorizontalSpacing;
+                    break;
+
+                case ImageAlignment.MiddleLeft:
+                    r.X += (r.Width - (h + padding.Vertical))/2 + padding.Top;
+                    r.Y = r.Bottom - (w + padding.Left);
+                    break;
+
+                case ImageAlignment.MiddleCenter:
+                    r.X += (r.Width - (h + padding.Vertical))/2 + padding.Top;
+                    r.Y += (r.Height - (w + padding.Horizontal - TabStripItem.TabHorizontalSpacing)) / 2;
+                    break;
+
+                case ImageAlignment.MiddleRight:
+                    r.X += (r.Width - (h + padding.Vertical))/2 + padding.Top;
+                    r.Y += padding.Right + TabStripItem.TabHorizontalSpacing;
+                    break;
+
+                case ImageAlignment.BottomLeft:
+                    r.X = r.Right - (w + padding.Right + TabStripItem.TabHorizontalSpacing);
+                    r.Y = r.Bottom - (w + padding.Left);
+                    break;
+
+                case ImageAlignment.BottomCenter:
+                    r.X = r.Right - (w + padding.Right + TabStripItem.TabHorizontalSpacing);
+                    r.Y += (r.Height - (w + padding.Horizontal - TabStripItem.TabHorizontalSpacing)) / 2;
+                    break;
+
+                case ImageAlignment.BottomRight:
+                    r.X = r.Right - (w + padding.Right + TabStripItem.TabHorizontalSpacing);
+                    r.Y += padding.Right + TabStripItem.TabHorizontalSpacing;
+                    break;
+            }
+
+            if (TabStripItem.RotateVerticalText ^
+                TabStripItem.TabAlignment == eTabStripAlignment.Right == true)
+            {
+                r.X = t.X + (t.Right - (r.X + h));
+                r.Y = t.Y + (t.Bottom - (r.Y + w));
+            }
+
+            r.Width = w;
+            r.Height = h;
+
+            return (r);
+        }
+
+
+        #endregion
+
+        #region CalcHorizontalImageBounds
+
+        private Rectangle CalcHorizontalImageBounds(CompositeImage image, Rectangle r)
+        {
+            int h = 0;
+            int w = 0;
+
+            if (string.IsNullOrEmpty(SymbolRealized) == false)
+            {
+                Size size = GetSymbolSize();
+
+                w = size.Width;
+                h = size.Height;
+            }
+            else
+            {
+                w = image.Width;
+                h = image.Height;
+            }
+
+            Padding padding = ImagePadding;
+
+            switch (EffectiveImageAlignment)
+            {
+                case ImageAlignment.TopLeft:
+                    r.X += padding.Left;
+                    r.Y += padding.Top + TabStripItem.TabVerticalSpacing;
+                    break;
+
+                case ImageAlignment.TopCenter:
+                    r.X += (r.Width - (w + padding.Horizontal + TabStripItem.TabHorizontalSpacing)) / 2;
+                    r.Y += padding.Top + TabStripItem.TabVerticalSpacing;
+                    break;
+
+                case ImageAlignment.TopRight:
+                    r.X = r.Right - w - padding.Right - TabStripItem.TabHorizontalSpacing;
+                    r.Y += padding.Top + TabStripItem.TabVerticalSpacing;
+                    break;
+
+                case ImageAlignment.MiddleLeft:
+                    r.X += padding.Left;
+                    r.Y += (r.Height - (h + padding.Vertical)) / 2 + padding.Top;
+                    break;
+
+                case ImageAlignment.MiddleCenter:
+                    r.X += (r.Width - (w + padding.Horizontal + TabStripItem.TabHorizontalSpacing)) / 2;
+                    r.Y += (r.Height - (h + padding.Vertical)) / 2 + padding.Top;
+                    break;
+
+                case ImageAlignment.MiddleRight:
+                    r.X = r.Right - w - padding.Right - TabStripItem.TabHorizontalSpacing;
+                    r.Y += (r.Height - (h + padding.Vertical)) / 2 + padding.Top;
+                    break;
+
+                case ImageAlignment.BottomLeft:
+                    r.X += padding.Left;
+                    r.Y = r.Bottom - (h + padding.Bottom + TabStripItem.TabVerticalSpacing);
+                    break;
+
+                case ImageAlignment.BottomCenter:
+                    r.X += (r.Width - (w + padding.Horizontal + TabStripItem.TabHorizontalSpacing)) / 2;
+                    r.Y = r.Bottom - (h + padding.Bottom + TabStripItem.TabVerticalSpacing);
+                    break;
+
+                case ImageAlignment.BottomRight:
+                    r.X = r.Right - w - padding.Right - TabStripItem.TabHorizontalSpacing;
+                    r.Y = r.Bottom - (h + padding.Bottom + TabStripItem.TabVerticalSpacing);
+                    break;
+            }
+
+            r.Width = w;
+            r.Height = h;
+
+            return (r);
+        }
+
+        #endregion
+
+        #region GetTabImage
+
+        internal CompositeImage GetTabImage()
+        {
+            Image image = GetImage();
+
+            if (image != null)
+                return (new CompositeImage(image, false));
+
+            return (Icon != null) ?
+                (new CompositeImage(Icon, false, Icon.Size)) : null;
+        }
+
+        #endregion
+
+        #region GetImage
+
+        private Image GetImage()
+        {
+            if (_Image != null)
+                return (_Image);
+
+            if (_ImageIndex >= 0 && TabStrip != null)
+            {
+                ImageList imageList = TabStrip.ImageList;
+
+                if (imageList != null && _ImageIndex < imageList.Images.Count)
+                    return (imageList.Images[_ImageIndex]);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetSymbolSize
+
+        internal Size GetSymbolSize()
+        {
+            using (Graphics g = BarFunctions.CreateGraphics(TabStrip))
+            {
+                Font symFont = Symbols.GetFont(SymbolSize, SymbolSet);
+
+                Size size = TextDrawing.MeasureStringLegacy(g, SymbolRealized, symFont, Size.Empty, eTextFormat.Default);
+
+                int descent = (int)Math.Ceiling((symFont.FontFamily.GetCellDescent(symFont.Style) *
+                    symFont.Size / symFont.FontFamily.GetEmHeight(symFont.Style)));
+
+                size.Height -= descent;
+
+                return (size);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetTextBounds
+
+        /// <summary>
+        /// Gets the Text bounding Rectangle
+        /// </summary>
+        /// <returns>Bounding Rectangle</returns>
+        private Rectangle GetTextBounds()
+        {
+            Rectangle r = TabItemDisplay.GetContentRectangle();
+                
+            r = ProcessImageBounds(
+                ProcessCloseBounds(r));
+
+            if (IsVertical == false)
+            {
+                if (IsSelected == true)
+                {
+                    if (_TabStripItem.TabAlignment == eTabStripAlignment.Left ||
+                        _TabStripItem.TabAlignment == eTabStripAlignment.Right)
+                    {
+                        r.Width -= Dpi.Width(_TabStripItem.TabDisplay.SelectedPaddingWidth);
+                    }
+                }
+            }
+            else
+            {
+                if ((_TabStripItem.TabAlignment == eTabStripAlignment.Left &&
+                     _TabStripItem.RotateVerticalText == true) ||
+                    (_TabStripItem.TabAlignment == eTabStripAlignment.Right &&
+                     _TabStripItem.RotateVerticalText == false))
+                {
+                    if (_TabStripItem.TabAlignment == eTabStripAlignment.Left)
+                    {
+                        r.X += Dpi.Width(_TabStripItem.TabVerticalSpacing);
+                        r.Width -= Dpi.Width(_TabStripItem.TabVerticalSpacing);
+                    }
+                    else
+                    {
+                        r.Width -= Dpi.Width(_TabStripItem.TabVerticalSpacing);
+                    }
+                }
+            }
+
+            r = _TabStripItem.OnGetTextBounds(this, r);
+
+            return (r);
+        }
+
+        #endregion
+
+        #region ProcessCloseBounds
+
+        /// <summary>
+        /// Calculates Close button bounds
+        /// </summary>
+        /// <param name="r">Running rectangle</param>
+        /// <returns>Running rectangle</returns>
+        private Rectangle ProcessCloseBounds(Rectangle r)
+        {
+            int spacing = _TabStripItem.TabHorizontalSpacing;
+
+            Size size = new Size();
+
+            if (_TabStripItem.CloseButtonOnTabsVisible && CloseButtonVisible)
+            {
+                size += CloseButtonBounds.Size;
+
+                size.Width += spacing;
+                size.Height += spacing;
+            }
+
+            if (IsVertical == true)
+            {
+                Rectangle t = r;
+
+                if (TabStripItem.CloseButtonPosition == eTabCloseButtonPosition.Right)
+                    r.Y += size.Width;
+
+                r.Height -= (size.Width + spacing);
+
+                if (TabStripItem.RotateVerticalText ^
+                    TabStripItem.TabAlignment == eTabStripAlignment.Right)
+                {
+                    r.X = t.X + (t.Right - r.Right);
+                    r.Y = t.Y + (t.Bottom - r.Bottom);
+                }
+            }
+            else
+            {
+                if (size.Width > 0)
+                {
+                    if (_TabStripItem.CloseButtonPosition == eTabCloseButtonPosition.Left)
+                        r.X += (size.Width + spacing);
+
+                    r.Width -= (size.Width + spacing);
+                }
+
+                r.X += spacing;
+                r.Width -= (spacing * 2);
+
+                if (IsSelected == true)
+                {
+                    if (_TabStripItem.TabAlignment == eTabStripAlignment.Right)
+                        r.X += _TabStripItem.TabDisplay.SelectedPaddingWidth;
+                }
+            }
+
+            return (r);
+        }
+
+        #endregion
+
+        #region ProcessImageBounds
+
+        /// <summary>
+        /// Calculates Image bounds
+        /// </summary>
+        /// <param name="r">Running rectangle</param>
+        /// <returns>Running rectangle</returns>
+        private Rectangle ProcessImageBounds(Rectangle r)
+        {
+            CompositeImage image = GetTabImage();
+
+            if (String.IsNullOrEmpty(SymbolRealized) == false || image != null)
+            {
+                r = (IsVertical == true)
+                    ? SubVerticalImageBounds(image, r)
+                    : SubHorizontalImageBounds(image, r);
+            }
+
+            return (r);
+        }
+
+        #region SubHorizontalImageBounds
+
+        private Rectangle SubHorizontalImageBounds(CompositeImage image, Rectangle r)
+        {
+            int h = 0;
+            int w = 0;
+
+            if (string.IsNullOrEmpty(SymbolRealized) == false)
+            {
+                Size size = GetSymbolSize();
+
+                w = size.Width;
+                h = size.Height;
+            }
+            else
+            {
+                w = image.Width;
+                h = image.Height;
+            }
+
+            w += (_TabStripItem.TabHorizontalSpacing + ImagePadding.Horizontal);
+            h += (_TabStripItem.TabVerticalSpacing + ImagePadding.Vertical);
+
+            switch (EffectiveImageAlignment)
+            {
+                case ImageAlignment.TopLeft:
+                case ImageAlignment.TopCenter:
+                case ImageAlignment.TopRight:
+                    r.Y += h;
+                    r.Height -= h;
+                    break;
+
+                case ImageAlignment.MiddleLeft:
+                    r.X += w;
+                    r.Width -= w;
+                    break;
+
+                case ImageAlignment.MiddleRight:
+                    r.Width -= w;
+                    break;
+
+                case ImageAlignment.BottomLeft:
+                case ImageAlignment.BottomCenter:
+                case ImageAlignment.BottomRight:
+                    r.Height -= h;
+                    break;
+            }
+
+            return (r);
+        }
+
+        #endregion
+
+        #region SubVerticalImageBounds
+
+        private Rectangle SubVerticalImageBounds(CompositeImage image, Rectangle r)
+        {
+            int h = 0;
+            int w = 0;
+
+            if (string.IsNullOrEmpty(SymbolRealized) == false)
+            {
+                Size size = GetSymbolSize();
+
+                w = size.Width;
+                h = size.Height;
+            }
+            else
+            {
+                w = image.Width;
+                h = image.Height;
+            }
+
+            w += (_TabStripItem.TabHorizontalSpacing + ImagePadding.Horizontal);
+            h += (_TabStripItem.TabVerticalSpacing + ImagePadding.Vertical);
+
+            Rectangle t = r;
+
+            switch (EffectiveImageAlignment)
+            {
+                case ImageAlignment.TopLeft:
+                case ImageAlignment.TopCenter:
+                case ImageAlignment.TopRight:
+                    r.X += h;
+                    r.Width -= h;
+                    break;
+
+                case ImageAlignment.MiddleLeft:
+                    r.Height -= w;
+                    break;
+
+                case ImageAlignment.MiddleRight:
+                    r.Y += w;
+                    r.Height -= w;
+                    break;
+
+                case ImageAlignment.BottomLeft:
+                case ImageAlignment.BottomCenter:
+                case ImageAlignment.BottomRight:
+                    r.Width -= h;
+                    break;
+            }
+
+            if (TabStripItem.RotateVerticalText ^
+                TabStripItem.TabAlignment == eTabStripAlignment.Right)
+            {
+                r.X = t.X + (t.Right - r.Right);
+                r.Y = t.Y + (t.Bottom - r.Bottom);
+            }
+
+            return (r);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region RefreshOwner
+
+        /// <summary>
+        /// Refreshes the tab owner
+        /// </summary>
+        private void RefreshOwner()
+        {
+            if (_TabStripItem != null)
+            {
+                _TabStripItem.NeedRecalcSize = true;
+                _TabStripItem.Refresh();
+            }
+
+            Refresh();
+        }
+
+        #endregion
+
+        #region Refresh
+
+        /// <summary>
+        /// Refreshes the tab display
+        /// </summary>
+        public override void Refresh()
+        {
+            if (SuspendLayout == false)
+            {
+                if (Visible == true && Displayed == true && TabStripItem != null)
+                {
+                    Control objCtrl = TabStripItem.ContainerControl as Control;
+
+                    if (objCtrl != null && IsHandleValid(objCtrl))
+                    {
+                        if (NeedRecalcSize == true)
+                        {
+                            if (Parent is ItemContainer)
+                            {
+                                Parent.RecalcSize();
+                            }
+                            else
+                            {
+                                RecalcSize();
+
+                                if (Parent != null)
+                                    Parent.SubItemSizeChanged(this);
+                            }
+                        }
+
+                        Invalidate(objCtrl);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region Paint
+
+        /// <summary>
+        /// Paint processing
+        /// </summary>
+        /// <param name="p"></param>
+        public override void Paint(ItemPaintArgs p)
+        {
+            if (_TabItemDisplay != null)
+                _TabItemDisplay.Paint(p);
+        }
+
+        #endregion
+
+        #region Mouse support
+
+        #region InternalMouseMove
+
+        /// <summary>
+        /// InternalMouseMove
+        /// </summary>
+        /// <param name="objArg"></param>
+        public override void InternalMouseMove(MouseEventArgs objArg)
+        {
+            base.InternalMouseMove(objArg);
+
+            CloseButtonMouseOver =
+                CloseButtonBounds.Contains(objArg.Location);
+        }
+
+        #endregion
+
+        #region InternalMouseEnter
+
+        /// <summary>
+        /// InternalMouseEnter
+        /// </summary>
+        public override void InternalMouseEnter()
+        {
+            base.InternalMouseEnter();
+
+            Refresh();
+        }
+
+        #endregion
+
+        #region InternalMouseLeave
+
+        /// <summary>
+        /// InternalMouseLeave
+        /// </summary>
+        public override void InternalMouseLeave()
+        {
+            base.InternalMouseLeave();
+
+            CloseButtonMouseOver = false;
+            CloseButtonPressed = false;
+
+            Refresh();
+        }
+
+        #endregion
+
+        #region InternalMouseDown
+
+        /// <summary>
+        /// InternalMouseDown
+        /// </summary>
+        /// <param name="objArg"></param>
+        public override void InternalMouseDown(MouseEventArgs objArg)
+        {
+            base.InternalMouseDown(objArg);
+
+            if (CloseButtonMouseOver == true)
+            {
+                CloseButtonPressed =
+                    ((objArg.Button & MouseButtons.Left) == MouseButtons.Left);
+            }
+        }
+
+        #endregion
+
+        #region InternalMouseUp
+
+        /// <summary>
+        /// InternalMouseUp
+        /// </summary>
+        /// <param name="objArg"></param>
+        public override void InternalMouseUp(MouseEventArgs objArg)
+        {
+            base.InternalMouseUp(objArg);
+
+            CloseButtonPressed = false;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region UpdateChangeHandler
+
+        protected void UpdateChangeHandler(
+            INotifyPropertyChanged oldValue, INotifyPropertyChanged newValue)
+        {
+            if (oldValue != null)
+                oldValue.PropertyChanged -= ValuePropertyChanged;
+
+            if (newValue != null)
+                newValue.PropertyChanged += ValuePropertyChanged;
+        }
+
+        void ValuePropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            RefreshOwner();
+        }
+
+        #endregion
+
+        #region ToString
+
+        /// <summary>
+        /// ToString
+        /// </summary>
+        /// <returns></returns>
+        public override string ToString()
+        {
+            return (Text);
+        }
+
+        #endregion
+
+        #region Dispose
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing == true && IsDisposed == false)
+                HookEvents(false);
+
+            base.Dispose(disposing);
+        }
+
+        #endregion
+
+        #region Copy
+
+        /// <summary>
+        /// Returns copy of the item.
+        /// </summary>
+        public override BaseItem Copy()
+        {
+            SuperTabItem objCopy = new SuperTabItem();
+            CopyToItem(objCopy);
+
+            return (objCopy);
+        }
+
+        /// <summary>
+        /// Copies specific properties to new instance of the item.
+        /// </summary>
+        /// <param name="copy">New SuperTabItem instance</param>
+        protected override void CopyToItem(BaseItem copy)
+        {
+            SuperTabItem objCopy = copy as SuperTabItem;
+
+            if (objCopy != null)
+            {
+                base.CopyToItem(objCopy);
+
+                objCopy.TabColor = _TabColor;
+                objCopy.CloseButtonVisible = _CloseButtonVisible;
+                objCopy.EnableImageAnimation = _EnableImageAnimation;
+                objCopy.EnableMarkup = _EnableMarkup;
+                objCopy.Icon = _Icon;
+                objCopy.Image = _Image;
+                objCopy.ImageIndex = _ImageIndex;
+                objCopy.PredefinedColor = _PredefinedColor;
+                objCopy.SelectedTabFont = _SelectedTabFont;
+                objCopy.TextAlignment = _TextAlignment;
+                objCopy.TabFont = _TabFont;
+                objCopy.Symbol = _Symbol;
+                objCopy.SymbolSet = _SymbolSet;
+                objCopy.SymbolColor = _SymbolColor;
+                objCopy.SymbolSize = _SymbolSize;
+                objCopy.AttachedControl = _AttachedControl;
+            }
+        }
+
+        #endregion
+    }
+
+    #region enums
+
+    #region ImageAlignment
+
+    ///<summary>
+    /// Alignment
+    ///</summary>
+    public enum ImageAlignment
+    {
+        ///<summary>
+        ///</summary>
+        NotSet = -1,
+
+        ///<summary>
+        /// TopLeft
+        ///</summary>
+        TopLeft,
+
+        ///<summary>
+        /// TopCenter
+        ///</summary>
+        TopCenter,
+
+        ///<summary>
+        /// TopRight
+        ///</summary>
+        TopRight,
+
+        ///<summary>
+        /// MiddleLeft
+        ///</summary>
+        MiddleLeft,
+
+        ///<summary>
+        /// MiddleCenter
+        ///</summary>
+        MiddleCenter,
+
+        /// <summary>
+        /// MiddleRight
+        /// </summary>
+        MiddleRight,
+
+        /// <summary>
+        /// BottomLeft
+        /// </summary>
+        BottomLeft,
+
+        /// <summary>
+        /// BottomCenter
+        /// </summary>
+        BottomCenter,
+
+        /// <summary>
+        /// BottomRight
+        /// </summary>
+        BottomRight,
+    }
+
+    #endregion
+
+    #region eSuperTabArea
+
+    /// <summary>
+    /// Tab area parts
+    /// </summary>
+    public enum eSuperTabArea
+    {
+        InNone,
+        InContent,
+        InImage,
+        InCloseBox
+    }
+
+    #endregion
+
+    #region eTabState
+
+    /// <summary>
+    /// Tab states
+    /// </summary>
+    public enum eTabState
+    {
+        Default,
+        Selected,
+        MouseOver,
+        SelectedMouseOver,
+
+        Disabled,
+    }
+
+    #endregion
+
+    #endregion
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/SuperTabControl/SuperTabItem/SuperTabItemBaseDisplay.cs b/PROMS/DotNetBar Source Code/SuperTabControl/SuperTabItem/SuperTabItemBaseDisplay.cs
new file mode 100644
index 00000000..b88ef31c
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/SuperTabControl/SuperTabItem/SuperTabItemBaseDisplay.cs	
@@ -0,0 +1,1319 @@
+#if FRAMEWORK20
+using System;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Drawing.Imaging;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.Rendering;
+
+namespace DevComponents.DotNetBar
+{
+    public class SuperTabItemBaseDisplay : IDisposable
+    {
+        #region Private variables
+
+        private SuperTabItem _TabItem;
+
+        private Bitmap _CloseButtonBitmap;
+        private Bitmap _CloseButtonHotBitmap;
+        private Bitmap _CloseButtonPressedBitmap;
+        private Color _CloseMarkerColor;
+
+        private SuperTabItemColorTable _DefaultTabColorTable;
+        private SuperTabPanelColorTable _DefaultPanelColorTable;
+
+        private bool _CurrentlyAnimating;
+        private Image _AnimateImage;
+
+        #endregion
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="tabItem">Associated SuperTabItem</param>
+        public SuperTabItemBaseDisplay(SuperTabItem tabItem)
+        {
+            _TabItem = tabItem;
+
+            SetDefaultColorTable();
+        }
+
+        #region Internal properties
+
+        /// <summary>
+        /// Gets or sets the default item ColorTable
+        /// </summary>
+        internal SuperTabItemColorTable DefaultItemColorTable
+        {
+            get { return (_DefaultTabColorTable); }
+            set { _DefaultTabColorTable = value; }
+        }
+
+        #region TabItem
+
+        internal SuperTabItem TabItem
+        {
+            get { return (_TabItem); }
+        }
+
+        #endregion
+
+        #region TabStripItem
+
+        internal SuperTabStripItem TabStripItem
+        {
+            get { return (_TabItem.TabStripItem); }
+        }
+
+        #endregion
+
+        #region TabDisplay
+
+        internal SuperTabStripBaseDisplay TabDisplay
+        {
+            get { return (_TabItem.TabStripItem.TabDisplay); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Paint
+
+        /// <summary>
+        /// Paint processing
+        /// </summary>
+        /// <param name="p"></param>
+        public virtual void Paint(ItemPaintArgs p)
+        {
+            if (TabItem.Visible == true)
+            {
+                Graphics g = p.Graphics;
+
+                if (TabStripItem.OnPreRenderTabItem(TabItem, g) == false)
+                {
+                    SuperTabItemStateColorTable colors = GetTabColorTable();
+
+                    using (GraphicsPath path = TabItemPath())
+                    {
+                        DrawTabItemBackground(g, path, colors);
+
+                        DrawTabContent(g, colors);
+                        DrawTabBorder(g, path, colors);
+
+                        TabStripItem.OnPostRenderTabItem(TabItem, g);
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region GetContentRectangle
+
+        /// <summary>
+        /// Gets the default tab ContentRectangle
+        /// </summary>
+        /// <returns>Rectangle</returns>
+        internal virtual Rectangle ContentRectangle()
+        {
+            return (_TabItem.DisplayRectangle);
+        }
+
+        /// <summary>
+        /// Gets the tab ContentRectangle
+        /// </summary>
+        /// <returns>Rectangle</returns>
+        internal Rectangle GetContentRectangle()
+        {
+            Rectangle r = TabStripItem.OnGetTabItemContentRectangle(_TabItem);
+
+            return (r);
+        }
+
+        #endregion
+
+        #region TabItemPath
+
+        /// <summary>
+        /// Gets the tab path
+        /// </summary>
+        /// <returns>GraphicsPath</returns>
+        internal virtual GraphicsPath TabItemPath()
+        {
+            GraphicsPath path = TabStripItem.OnGetTabItemPath(_TabItem);
+
+            return (path);
+        }
+
+        #endregion
+
+        #region SetDefaultColorTable
+
+        /// <summary>
+        /// Sets the default color tables
+        /// </summary>
+        internal void SetDefaultColorTable()
+        {
+            _DefaultTabColorTable =
+                SuperTabStyleColorFactory.GetItemColorTable(TabItem.TabStyle, ColorFactory.Empty);
+
+            _DefaultPanelColorTable =
+                SuperTabStyleColorFactory.GetPanelColorTable(TabItem.TabStyle, ColorFactory.Empty);
+        }
+
+        #endregion
+
+        #region GetColorTable
+
+        /// <summary>
+        /// Gets the tab ColorTable
+        /// </summary>
+        /// <returns>ColorTable</returns>
+        internal virtual SuperTabItemStateColorTable GetTabColorTable()
+        {
+            eTabState tabState = GetTabState();
+
+            return (GetTabColorTable(tabState));
+        }
+
+        /// <summary>
+        /// Gets the tab state
+        /// </summary>
+        /// <returns>eTabState</returns>
+        private eTabState GetTabState()
+        {
+            if (TabItem.Enabled == false)
+                return (eTabState.Disabled);
+
+            if (TabItem == TabStripItem.HotTab)
+                return (TabItem.IsSelected ? eTabState.SelectedMouseOver : eTabState.MouseOver);
+
+            return (TabItem.IsSelected ? eTabState.Selected : eTabState.Default);
+        }
+
+        #region GetTabColorTable
+
+        internal virtual SuperTabItemStateColorTable GetTabColorTable(eTabState tabState)
+        {
+            SuperTabItemStateColorTable sct = GetTabColorTableEx(tabState);
+
+            if (sct.SelectionMarker.IsEmpty == true &&
+                (tabState == eTabState.Selected || tabState == eTabState.SelectedMouseOver))
+            {
+                using (SuperTabColorTable ct = TabDisplay.GetColorTable())
+                    sct.SelectionMarker = ct.SelectionMarker;
+            }
+
+            return (sct);
+        }
+
+        internal SuperTabItemStateColorTable GetTabColorTableEx(eTabState tabState)
+        {
+            SuperTabItemStateColorTable sct = GetStateColorTable(tabState, _DefaultTabColorTable.Default);
+            SuperTabItemStateColorTable tct = GetStateColorTable(tabState, TabItem.TabColor.Default);
+
+            sct = (SuperTabItemStateColorTable)sct.Clone();
+            tct = (SuperTabItemStateColorTable)tct.Clone();
+
+            switch (TabItem.TabAlignment)
+            {
+                case eTabStripAlignment.Left:
+                    ApplyTabColors(sct, GetStateColorTable(tabState, _DefaultTabColorTable.Left));
+                    ApplyTabColors(tct, GetStateColorTable(tabState, TabItem.TabColor.Left));
+                    break;
+
+                case eTabStripAlignment.Bottom:
+                    ApplyTabColors(sct, GetStateColorTable(tabState, _DefaultTabColorTable.Bottom));
+                    ApplyTabColors(tct, GetStateColorTable(tabState, TabItem.TabColor.Bottom));
+                    break;
+
+                case eTabStripAlignment.Right:
+                    ApplyTabColors(sct, GetStateColorTable(tabState, _DefaultTabColorTable.Right));
+                    ApplyTabColors(tct, GetStateColorTable(tabState, TabItem.TabColor.Right));
+                    break;
+            }
+
+            ApplyPredefinedColor(tabState, sct);
+            ApplyTabColors(sct, tct);
+
+            return (sct);
+        }
+
+        #endregion
+
+        #region GetStateColorTable
+
+        private SuperTabItemStateColorTable GetStateColorTable(
+            eTabState tabState, SuperTabColorStates cs)
+        {
+            switch (tabState)
+            {
+                case eTabState.MouseOver:
+                    return (cs.MouseOver);
+
+                case eTabState.Selected:
+                    return (cs.Selected);
+
+                case eTabState.SelectedMouseOver:
+                    return (cs.SelectedMouseOver);
+
+                case eTabState.Disabled:
+                    return (cs.Disabled);
+
+                default:
+                    return (cs.Normal);
+            }
+        }
+
+        #endregion
+
+        #region ApplyPredefinedColor
+
+        internal virtual void ApplyPredefinedColor(eTabState tabState, SuperTabItemStateColorTable sct)
+        {
+            if (TabItem.PredefinedColor != eTabItemColor.Default)
+            {
+                SuperTabItemColorTable ct =
+                    SuperTabStyleColorFactory.GetPredefinedTabColors(TabItem.PredefinedColor, ColorFactory.Empty);
+
+                SuperTabItemStateColorTable ict = ct.Default.Normal;
+
+                switch (tabState)
+                {
+                    case eTabState.SelectedMouseOver:
+                        ict = ct.Default.SelectedMouseOver;
+                        break;
+
+                    case eTabState.MouseOver:
+                        ict = ct.Default.MouseOver;
+                        break;
+
+                    case eTabState.Selected:
+                        ict = ct.Default.Selected;
+                        break;
+                }
+
+                sct.Text = ict.Text;
+                sct.InnerBorder = ict.InnerBorder;
+                sct.OuterBorder = ict.OuterBorder;
+                sct.Background = ict.Background;
+                sct.CloseMarker = ict.CloseMarker;
+                sct.SelectionMarker = ict.SelectionMarker;
+            }
+        }
+
+        #endregion
+
+        #region ApplyTabColors
+
+        private void ApplyTabColors(
+            SuperTabItemStateColorTable sct, SuperTabItemStateColorTable tct)
+        {
+            if (tct.Background.IsEmpty == false)
+            {
+                if (tct.Background.IsEmpty == false)
+                {
+                    if (tct.Background.Colors != null)
+                        sct.Background.Colors = tct.Background.Colors;
+
+                    if (tct.Background.Positions != null)
+                        sct.Background.Positions = tct.Background.Positions;
+
+                    if (tct.Background.AdaptiveGradient.HasValue)
+                        sct.Background.AdaptiveGradient = tct.Background.AdaptiveGradient;
+                }
+
+                sct.Background.GradientAngle = tct.Background.GradientAngle;
+            }
+
+            if (tct.InnerBorder != Color.Empty)
+                sct.InnerBorder = tct.InnerBorder;
+
+            if (tct.OuterBorder != Color.Empty)
+                sct.OuterBorder = tct.OuterBorder;
+
+            if (tct.Text != Color.Empty)
+                sct.Text = tct.Text;
+
+            if (tct.CloseMarker != Color.Empty)
+                sct.CloseMarker = tct.CloseMarker;
+
+            if (tct.SelectionMarker != Color.Empty)
+                sct.SelectionMarker = tct.SelectionMarker;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetPanelColorTable
+
+        /// <summary>
+        /// Gets the tab panel Color Table
+        /// </summary>
+        /// <returns>Color Table</returns>
+        internal virtual SuperTabPanelItemColorTable GetPanelColorTable()
+        {
+            SuperTabPanelItemColorTable sct =
+                (SuperTabPanelItemColorTable)_DefaultPanelColorTable.Default.Clone();
+
+            SuperTabControlPanel cp = TabItem.AttachedControl as SuperTabControlPanel;
+
+            if (cp != null)
+            {
+                SuperTabPanelItemColorTable tct =
+                    (SuperTabPanelItemColorTable) cp.PanelColor.Default.Clone();
+
+                switch (TabItem.TabAlignment)
+                {
+                    case eTabStripAlignment.Left:
+                        ApplyPanelColors(sct, _DefaultPanelColorTable.Left);
+                        ApplyPanelColors(tct, cp.PanelColor.Left);
+                        break;
+
+                    case eTabStripAlignment.Bottom:
+                        ApplyPanelColors(sct, _DefaultPanelColorTable.Bottom);
+                        ApplyPanelColors(tct, cp.PanelColor.Bottom);
+                        break;
+
+                    case eTabStripAlignment.Right:
+                        ApplyPanelColors(sct, _DefaultPanelColorTable.Right);
+                        ApplyPanelColors(tct, cp.PanelColor.Right);
+                        break;
+                }
+
+                ApplyPredefinedColor(sct);
+                ApplyPanelColors(sct, tct);
+            }
+
+            return (sct);
+        }
+
+        #region ApplyPredefinedColor
+
+        internal virtual void ApplyPredefinedColor(SuperTabPanelItemColorTable pct)
+        {
+            if (TabItem.PredefinedColor != eTabItemColor.Default)
+            {
+                SuperTabPanelItemColorTable ct =
+                    SuperTabStyleColorFactory.GetPredefinedPanelColors(TabItem.PredefinedColor, ColorFactory.Empty);
+
+                pct.InnerBorder = ct.InnerBorder;
+                pct.OuterBorder = ct.OuterBorder;
+
+                pct.Background = ct.Background;
+            }
+        }
+
+        #endregion
+
+        #region ApplyPanelColors
+
+        private void ApplyPanelColors(SuperTabPanelItemColorTable sct, SuperTabPanelItemColorTable tct)
+        {
+            if (tct.Background.IsEmpty == false)
+            {
+                if (tct.Background.Colors != null)
+                    sct.Background.Colors = tct.Background.Colors;
+
+                if (tct.Background.Positions != null)
+                    sct.Background.Positions = tct.Background.Positions;
+
+                if (tct.Background.AdaptiveGradient.HasValue)
+                    sct.Background.AdaptiveGradient = tct.Background.AdaptiveGradient;
+
+                sct.Background.GradientAngle = tct.Background.GradientAngle;
+            }
+
+            if (tct.InnerBorder.IsEmpty == false)
+                sct.InnerBorder = tct.InnerBorder;
+
+            if (tct.OuterBorder.IsEmpty == false)
+                sct.OuterBorder = tct.OuterBorder;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region DrawTabItemBackground
+
+        /// <summary>
+        /// Draws the tab background
+        /// </summary>
+        /// <param name="g">Graphics</param>
+        /// <param name="path">Tab path</param>
+        /// <param name="tabColors">StateColorTable</param>
+        protected virtual void DrawTabItemBackground(
+            Graphics g, GraphicsPath path, SuperTabItemStateColorTable tabColors)
+        {
+            Rectangle r = Rectangle.Round(path.GetBounds());
+
+            if (r.Width > 0 && r.Height > 0)
+            {
+                if (tabColors.Background.Colors != null)
+                {
+                    if (tabColors.Background.Colors.Length == 1)
+                        DrawTabItemSolidBackground(g, path, tabColors, r);
+                    else
+                        DrawTabItemGradientBackground(g, path, tabColors, r);
+                }
+            }
+        }
+
+        #region DrawTabItemSolidBackground
+
+        internal void DrawTabItemSolidBackground(
+            Graphics g, GraphicsPath path, SuperTabItemStateColorTable tabColors, Rectangle r)
+        {
+            using (Brush br = tabColors.Background.GetBrush(r))
+            {
+                if (br != null)
+                {
+                    g.FillPath(br, path);
+
+                    using (Pen pen = new Pen(tabColors.Background.Colors[0]))
+                    {
+                        int n = (_TabItem.IsSelected == true) ? 3 : 1;
+
+                        for (int i = 0; i < n; i++)
+                        {
+                            switch (_TabItem.TabAlignment)
+                            {
+                                case eTabStripAlignment.Top:
+                                    g.DrawLine(pen, r.X, r.Bottom + i, r.Right, r.Bottom + i);
+                                    break;
+
+                                case eTabStripAlignment.Left:
+                                    g.DrawLine(pen, r.Right + i, r.Top, r.Right + i, r.Bottom);
+                                    break;
+
+                                case eTabStripAlignment.Bottom:
+                                    g.DrawLine(pen, r.X, r.Top - i, r.Right, r.Top - i);
+                                    break;
+
+                                case eTabStripAlignment.Right:
+                                    g.DrawLine(pen, r.X - i, r.Top, r.X - i, r.Bottom);
+                                    break;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region DrawTabItemGradientBackground
+
+        internal void DrawTabItemGradientBackground(
+            Graphics g, GraphicsPath path, SuperTabItemStateColorTable tabColors, Rectangle r)
+        {
+            int angle = tabColors.Background.GradientAngle;
+
+            if (tabColors.Background.AdaptiveGradient != false)
+            {
+                switch (_TabItem.TabAlignment)
+                {
+                    case eTabStripAlignment.Left:
+                        angle -= 90;
+                        break;
+
+                    case eTabStripAlignment.Bottom:
+                        angle += 180;
+                        break;
+
+                    case eTabStripAlignment.Right:
+                        angle += 90;
+                        break;
+                }
+            }
+
+            using (LinearGradientBrush lbr =
+                (LinearGradientBrush)tabColors.Background.GetBrush(r, angle))
+            {
+                if (lbr != null)
+                {
+                    lbr.WrapMode = WrapMode.TileFlipXY;
+
+                    g.FillPath(lbr, path);
+
+                    SmoothingMode sm = g.SmoothingMode;
+                    g.SmoothingMode = SmoothingMode.None;
+
+                    int n = (_TabItem.IsSelected == true) ? 3 : 1;
+
+                    switch (_TabItem.TabAlignment)
+                    {
+                        case eTabStripAlignment.Top:
+                            g.FillRectangle(lbr, r.X, r.Bottom, r.Width, n);
+                            break;
+
+                        case eTabStripAlignment.Left:
+                            g.FillRectangle(lbr, r.Right, r.Top, n, r.Height);
+                            break;
+
+                        case eTabStripAlignment.Bottom:
+                            g.FillRectangle(lbr, r.X, r.Top - n + 1, r.Width, n);
+                            break;
+
+                        case eTabStripAlignment.Right:
+                            g.FillRectangle(lbr, r.X - n + 1, r.Top, n, r.Height);
+                            break;
+                    }
+
+                    g.SmoothingMode = sm;
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region DrawTabBorder
+
+        /// <summary>
+        /// Draws the tab border
+        /// </summary>
+        /// <param name="g">Graphics</param>
+        /// <param name="path">Tab path</param>
+        /// <param name="ct">Color table</param>
+        protected virtual void DrawTabBorder(
+            Graphics g, GraphicsPath path, SuperTabItemStateColorTable ct)
+        {
+            if (ct.InnerBorder.IsEmpty == false)
+            {
+                using (Pen pen = new Pen(ct.InnerBorder, 2))
+                {
+                    Region rgn = g.Clip;
+                    g.SetClip(path);
+
+                    g.DrawPath(pen, path);
+                    g.DrawPath(pen, path);
+                    g.DrawPath(pen, path);
+                    g.DrawPath(pen, path);
+
+                    g.Clip = rgn;
+                    if (rgn != null) rgn.Dispose();
+                }
+            }
+
+            if (ct.OuterBorder.IsEmpty == false)
+            {
+                using (Pen pen = new Pen(ct.OuterBorder))
+                    g.DrawPath(pen, path);
+            }
+        }
+
+        #endregion
+
+        #region DrawTabContent
+
+        /// <summary>
+        /// Draws the tab contents
+        /// </summary>
+        /// <param name="g">Graphics</param>
+        /// <param name="colors">State color table</param>
+        protected virtual void DrawTabContent(Graphics g, SuperTabItemStateColorTable colors)
+        {
+            // Draw image and text
+
+            if (DrawTabSymbol(g) == false)
+                DrawTabImage(g);
+
+            DrawTabText(g, colors);
+
+            // Draw the close button
+
+            if (TabStripItem.CloseButtonOnTabsVisible && TabItem.CloseButtonVisible)
+            {
+                if (TabStripItem.CloseButtonOnTabsAlwaysDisplayed == true || TabItem.IsMouseOver == true)
+                    DrawCloseButton(g, colors);
+            }
+        }
+
+        #region DrawTabSymbol
+
+        private bool DrawTabSymbol(Graphics g)
+        {
+            if (string.IsNullOrEmpty(TabItem.SymbolRealized) == false)
+            {
+                Font font = Symbols.GetFont(TabItem.SymbolSize, TabItem.SymbolSet);
+
+                Color color = GetSymbolColor();
+
+                Region clip = g.Clip;
+
+                g.SetClip(TabItem.ContentRectangle, CombineMode.Intersect);
+
+                Rectangle r = SetTransform(g, TabItem.ImageBounds);
+                r.Height += 10;
+
+                if (TabItem.IsVertical == true)
+                {
+                    if ((TabStripItem.TabAlignment == eTabStripAlignment.Right && TabStripItem.RotateVerticalText == false) ||
+                        (TabStripItem.TabAlignment == eTabStripAlignment.Left && TabStripItem.RotateVerticalText == true))
+                    {
+                        r.X += TabStripItem.TabHorizontalSpacing;
+                    }
+                }
+
+                TextDrawing.DrawStringLegacy(g, TabItem.SymbolRealized, font, color, 
+                    r, eTextFormat.Default | eTextFormat.HorizontalCenter);
+
+                ResetTransform(g);
+
+                g.Clip = clip;
+
+                return (true);
+            }
+
+            return (false);
+        }
+
+        #region GetSymbolColor
+
+        internal Color GetSymbolColor()
+        {
+            if (TabItem.SymbolColor.IsEmpty == false)
+                return (TabItem.SymbolColor);
+
+            eTabState state = GetTabState();
+            SuperTabItemStateColorTable sct = TabItem.GetTabColorTableEx(state);
+
+            return ((sct.Text.IsEmpty == false) ? sct.Text : SystemColors.ControlDark);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region DrawTabImage
+
+        /// <summary>
+        /// Draws the tab image
+        /// </summary>
+        /// <param name="g">Graphics</param>
+        protected virtual void DrawTabImage(Graphics g)
+        {
+            CompositeImage image = TabItem.GetTabImage();
+
+            if (image != null)
+            {
+                if (_CurrentlyAnimating == true)
+                {
+                    if (TabItem.CanAnimateImage == false)
+                        StopImageAnimation();
+                }
+
+                if (TabItem.CanAnimateImage == true)
+                {
+                    if (_CurrentlyAnimating == false)
+                        StartImageAnimation(image.Image);
+
+                    ImageAnimator.UpdateFrames();
+                }
+
+                Region clip = g.Clip;
+
+                g.SetClip(TabItem.ContentRectangle, CombineMode.Intersect);
+
+                Rectangle t = TabItem.ImageBounds;
+
+                if (TabItem.IsVertical == true)
+                {
+                    int w = t.Width;
+                    t.Width = t.Height;
+                    t.Height = w;
+                }
+
+                Rectangle r = SetTransform(g, t);
+
+                image.DrawImage(g, r);
+
+                ResetTransform(g);
+
+                g.Clip = clip;
+            }
+        }
+
+        #region StartImageAnimation
+
+        internal void StartImageAnimation(Image image)
+        {
+            _CurrentlyAnimating = true;
+            _AnimateImage = image;
+
+            ImageAnimator.Animate(image, OnFrameChanged);
+        }
+
+        #endregion
+
+        #region StopImageAnimation
+
+        internal void StopImageAnimation()
+        {
+            if (_CurrentlyAnimating == true)
+            {
+                _CurrentlyAnimating = false;
+
+                ImageAnimator.StopAnimate(_AnimateImage, OnFrameChanged);
+
+                FrameDimension frameDimensions =
+                    new FrameDimension(_AnimateImage.FrameDimensionsList[0]);
+
+                _AnimateImage.SelectActiveFrame(frameDimensions, 0);
+            }
+        }
+
+        #endregion
+
+        #region OnFrameChanged
+
+        private void OnFrameChanged(object o, EventArgs e)
+        {
+            if (_CurrentlyAnimating == true &&
+                TabItem.Visible == true && TabItem.Parent != null)
+            {
+                TabItem.Refresh();
+            }
+            else
+            {
+                _CurrentlyAnimating = false;
+
+                ImageAnimator.StopAnimate((Image)o, OnFrameChanged);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region DrawTabText
+
+        /// <summary>
+        /// Draws the tab text
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="colors"></param>
+        protected virtual void DrawTabText(Graphics g, SuperTabItemStateColorTable colors)
+        {
+            if (TabStripItem.DisplaySelectedTextOnly == false || TabItem.IsSelected == true)
+            {
+                Rectangle r = TabItem.TextBounds;
+
+                if (r.Height > 0 && r.Width > 0)
+                {
+                    Font font = TabItem.GetTabFont();
+
+                    if (TabItem.IsVertical == false)
+                    {
+                        if (TabItem.TextMarkupBody != null)
+                        {
+                            r = AlignText(r);
+
+                            TextMarkup.MarkupDrawContext d =
+                                new TextMarkup.MarkupDrawContext(g, font, colors.Text, TabItem.IsRightToLeft);
+
+                            TabItem.TextMarkupBody.Arrange(new
+                                Rectangle(r.Location, TabItem.TextMarkupBody.Bounds.Size), d);
+
+                            RenderMarkup(g, r, d);
+                        }
+                        else
+                        {
+                            eTextFormat strFormat;
+
+                            r = AlignText(r, out strFormat);
+
+                            TextDrawing.DrawString(g, TabItem.Text, font, colors.Text, r, strFormat);
+                        }
+                    }
+                    else
+                    {
+                        if (TabItem.TextMarkupBody != null)
+                        {
+                            Rectangle t = TabItem.TextMarkupBody.Bounds;
+
+                            r = SetTransform(g, r);
+                            r = AlignText(r);
+
+                            TextMarkup.MarkupDrawContext d =
+                                new TextMarkup.MarkupDrawContext(g, font, colors.Text, TabItem.IsRightToLeft);
+
+                            TabItem.TextMarkupBody.Bounds = r;
+                            RenderMarkup(g, r, d);
+                            TabItem.TextMarkupBody.Bounds = t;
+                        }
+                        else
+                        {
+                            eTextFormat strFormat;
+
+                            r = SetTransform(g, r);
+                            r = AlignText(r, out strFormat);
+
+                            TextDrawing.DrawStringLegacy(g, TabItem.Text, font, colors.Text, r, strFormat);
+                        }
+
+                        ResetTransform(g);
+                    }
+
+                    if (TabDisplay.ShowFocusRectangle == true)
+                    {
+                        if (IsFocused() == true)
+                            ControlPaint.DrawFocusRectangle(g, GetFocusRectangle(GetContentRectangle()));
+                    }
+                }
+            }
+        }
+
+        #region AlignText
+
+        private Rectangle AlignText(Rectangle r, out eTextFormat strFormat)
+        {
+            strFormat = eTextFormat.Default | eTextFormat.SingleLine |
+                eTextFormat.EndEllipsis | eTextFormat.VerticalCenter;
+
+            eItemAlignment alignment = TabItem.TextAlignment.HasValue ?
+                TabItem.TextAlignment.Value : TabItem.TabStripItem.TextAlignment;
+
+            switch (alignment)
+            {
+                case eItemAlignment.Center:
+                    strFormat |= eTextFormat.HorizontalCenter;
+
+                    if (TabItem.IsVertical == true)
+                    {
+                        int tabHorizontalSpacing = Dpi.Width(TabStripItem.TabHorizontalSpacing);
+                        r.X -= tabHorizontalSpacing;
+                        r.Width += tabHorizontalSpacing;
+                    }
+                    break;
+
+                case eItemAlignment.Far:
+                    strFormat |= eTextFormat.Right;
+
+                    if (TabItem.IsVertical == true)
+                    {
+                        r.X -= Dpi.Width3;
+                        r.Width -= Dpi.Width3;
+                    }
+                    break;
+            }
+
+            return (r);
+        }
+
+        private Rectangle AlignText(Rectangle r)
+        {
+            if (r.Height > TabItem.TextMarkupBody.Bounds.Height)
+                r.Y += (r.Height - TabItem.TextMarkupBody.Bounds.Height) / 2;
+
+            if (r.Width > TabItem.TextMarkupBody.Bounds.Width)
+            {
+                eItemAlignment alignment = TabItem.TextAlignment.HasValue ?
+                    TabItem.TextAlignment.Value : TabItem.TabStripItem.TextAlignment;
+
+                switch (alignment)
+                {
+                    case eItemAlignment.Center:
+                        r.X += (r.Width - TabItem.TextMarkupBody.Bounds.Width) / 2;
+                        break;
+
+                    case eItemAlignment.Far:
+                        r.X += (r.Width - TabItem.TextMarkupBody.Bounds.Width);
+                        break;
+                }
+            }
+
+            return (r);
+        }
+
+        #endregion
+
+        #region RenderMarkup
+
+        private void RenderMarkup(Graphics g,
+            Rectangle r, TextMarkup.MarkupDrawContext d)
+        {
+            Region oldClip = g.Clip;
+            Rectangle clipRect = r;
+
+            g.SetClip(clipRect, CombineMode.Replace);
+
+            TabItem.TextMarkupBody.Render(d);
+
+            g.Clip = oldClip;
+        }
+
+        #endregion
+
+        #region IsFocused
+
+        private bool IsFocused()
+        {
+            if (TabItem.IsSelected == true && TabItem.DesignMode == false)
+                return (TabItem.TabStrip.ContainsFocus);
+
+            return (false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region DrawCloseButton
+
+        /// <summary>
+        /// Draws the tab close button
+        /// </summary>
+        /// <param name="g">Graphics</param>
+        /// <param name="colors">State color table</param>
+        protected virtual void DrawCloseButton(Graphics g, SuperTabItemStateColorTable colors)
+        {
+            Rectangle r = TabItem.CloseButtonBounds;
+
+            if (TabItem.CloseButtonMouseOver == true || TabItem.CloseButtonPressed == true)
+            {
+                if (TabItem.CloseButtonMouseOver == true && TabItem.CloseButtonPressed == true)
+                {
+                    if (TabStripItem.TabCloseButtonPressed != null)
+                        g.DrawImageUnscaled(TabStripItem.TabCloseButtonPressed, r);
+                    else
+                        g.DrawImageUnscaled(GetCloseButtonPressedBitmap(g), r);
+                }
+                else
+                {
+                    if (TabStripItem.TabCloseButtonHot != null)
+                        g.DrawImageUnscaled(TabStripItem.TabCloseButtonHot, r);
+                    else
+                        g.DrawImageUnscaled(GetCloseButtonHotBitmap(g), r);
+                }
+            }
+            else
+            {
+                if (TabStripItem.TabCloseButtonNormal != null)
+                    g.DrawImageUnscaled(TabStripItem.TabCloseButtonNormal, r);
+                else
+                    g.DrawImageUnscaled(GetCloseButtonBitmap(g, colors), r);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region SetTransform
+
+        /// <summary>
+        /// Sets the GraphicsTransform for the given alignment
+        /// and Horizontal text setting
+        /// </summary>
+        /// <param name="g">Graphics</param>
+        /// <param name="r">Rectangle to transform</param>
+        /// <returns>Transformed rectangle</returns>
+        private Rectangle SetTransform(Graphics g, Rectangle r)
+        {
+            if (TabItem.IsVertical == true)
+            {
+                if (TabDisplay.Alignment == eTabStripAlignment.Left)
+                {
+                    if (TabStripItem.RotateVerticalText == true)
+                    {
+                        g.RotateTransform(90);
+                        r = new Rectangle(r.Top, -r.Right, r.Height, r.Width);
+                    }
+                    else
+                    {
+                        g.RotateTransform(-90);
+                        r = new Rectangle(-r.Bottom, r.X, r.Height, r.Width);
+                    }
+                }
+                else
+                {
+                    if (TabStripItem.RotateVerticalText == true)
+                    {
+                        g.RotateTransform(-90);
+                        r = new Rectangle(-r.Bottom, r.X, r.Height, r.Width);
+                    }
+                    else
+                    {
+                        g.RotateTransform(90);
+                        r = new Rectangle(r.Top, -r.Right, r.Height, r.Width);
+                    }
+                }
+            }
+
+            return (r);
+        }
+
+        #endregion
+
+        #region ResetTransform
+
+        /// <summary>
+        /// Resets out transform
+        /// </summary>
+        /// <param name="g">Graphics</param>
+        private void ResetTransform(Graphics g)
+        {
+            if (TabItem.IsVertical == true)
+                g.ResetTransform();
+        }
+
+        #endregion
+
+        #region GetFocusRectangle
+
+        /// <summary>
+        /// Gets the focus rectangle
+        /// </summary>
+        /// <param name="rText"></param>
+        /// <returns></returns>
+        protected virtual Rectangle GetFocusRectangle(Rectangle rText)
+        {
+            rText.Inflate(-3, -3);
+
+            return (rText);
+        }
+
+        #endregion
+
+        #region GetCloseButtonBitmap
+
+        /// <summary>
+        /// Gets the tab close button bitmap
+        /// </summary>
+        /// <param name="g">Graphics</param>
+        /// <param name="colors">State color table</param>
+        /// <returns>Button bitmap</returns>
+        public Bitmap GetCloseButtonBitmap(Graphics g, SuperTabItemStateColorTable colors)
+        {
+            if (_CloseMarkerColor != colors.CloseMarker || _CloseButtonBitmap == null)
+            {
+                if (_CloseButtonBitmap != null)
+                    _CloseButtonBitmap.Dispose();
+
+                _CloseButtonBitmap = CreateCloseButtonBitmap(g, colors);
+
+                _CloseMarkerColor = colors.CloseMarker;
+            }
+
+            return (_CloseButtonBitmap);
+        }
+
+        #endregion
+
+        #region CreateCloseButtonBitmap
+
+        /// <summary>
+        /// Creates the close button bitmap
+        /// </summary>
+        /// <param name="g">Graphics</param>
+        /// <param name="colors">State color table</param>
+        /// <returns>Close bitmap</returns>
+        public virtual Bitmap CreateCloseButtonBitmap(Graphics g, SuperTabItemStateColorTable colors)
+        {
+            Bitmap bmp = new Bitmap(16, 16, g);
+
+            using (Graphics gBmp = Graphics.FromImage(bmp))
+            {
+                gBmp.CompositingQuality = CompositingQuality.HighQuality;
+                gBmp.SmoothingMode = g.SmoothingMode;
+
+                using (Pen pen = new Pen(colors.CloseMarker))
+                {
+                    gBmp.DrawLine(pen, new Point(4, 4), new Point(10, 9));
+                    gBmp.DrawLine(pen, new Point(10, 4), new Point(4, 9));
+                }
+            }
+
+            return (bmp);
+        }
+
+        #endregion
+
+        #region GetCloseButtonHotBitmap
+
+        /// <summary>
+        /// Gets the hot close button bitmap
+        /// </summary>
+        /// <param name="g">Graphics</param>
+        /// <returns>Close bitmap</returns>
+        public Bitmap GetCloseButtonHotBitmap(Graphics g)
+        {
+            if (_CloseButtonHotBitmap == null)
+                _CloseButtonHotBitmap = CreateCloseButtonHotBitmap(g);
+
+            return (_CloseButtonHotBitmap);
+        }
+
+        #endregion
+
+        #region CreateCloseButtonHotBitmap
+
+        /// <summary>
+        /// Creates the hot button bitmap
+        /// </summary>
+        /// <param name="g">Graphics</param>
+        /// <returns>Close bitmap</returns>
+        public virtual Bitmap CreateCloseButtonHotBitmap(Graphics g)
+        {
+            Bitmap bmp = new Bitmap(16, 16, g);
+
+            using (Graphics gBmp = Graphics.FromImage(bmp))
+            {
+                gBmp.CompositingQuality = CompositingQuality.HighQuality;
+                gBmp.SmoothingMode = g.SmoothingMode;
+
+                Rectangle r = new Rectangle(0, 0, 15, 15);
+
+                using (GraphicsPath path = GetClosePath(r, 4))
+                {
+                    using (LinearGradientBrush lbr = new
+                        LinearGradientBrush(r, Color.White, Color.Pink, 90))
+                    {
+                        gBmp.FillPath(lbr, path);
+                    }
+
+                    r.Inflate(-1, -1);
+
+                    using (GraphicsPath path2 = GetClosePath(r, 6))
+                    {
+                        using (LinearGradientBrush lbr = new
+                            LinearGradientBrush(r, Color.Pink, Color.Crimson, 90))
+                        {
+                            gBmp.FillPath(lbr, path2);
+                        }
+                    }
+
+                    using (Pen pen = new Pen(Color.White, 2))
+                    {
+                        gBmp.DrawLine(pen, new Point(4, 4), new Point(10, 10));
+                        gBmp.DrawLine(pen, new Point(10, 4), new Point(4, 10));
+                    }
+
+                    gBmp.DrawPath(Pens.DarkRed, path);
+                }
+            }
+
+            return (bmp);
+        }
+
+        #endregion
+
+        #region GetCloseButtonPressedBitmap
+
+        /// <summary>
+        /// Gets the pressed close button bitmap
+        /// </summary>
+        /// <param name="g">Graphics</param>
+        /// <returns>Close bitmap</returns>
+        public Bitmap GetCloseButtonPressedBitmap(Graphics g)
+        {
+            if (_CloseButtonPressedBitmap == null)
+                _CloseButtonPressedBitmap = CreateCloseButtonPressedBitmap(g);
+
+            return (_CloseButtonPressedBitmap);
+        }
+
+        #endregion
+
+        #region CreateCloseButtonPressedBitmap
+
+        /// <summary>
+        /// Creates the pressed button bitmap
+        /// </summary>
+        /// <param name="g">Graphics</param>
+        /// <returns>Close bitmap</returns>
+        public virtual Bitmap CreateCloseButtonPressedBitmap(Graphics g)
+        {
+            Bitmap bmp = new Bitmap(16, 16, g);
+
+            using (Graphics gBmp = Graphics.FromImage(bmp))
+            {
+                gBmp.CompositingQuality = CompositingQuality.HighQuality;
+                gBmp.SmoothingMode = g.SmoothingMode;
+
+                Rectangle r = new Rectangle(0, 0, 15, 15);
+
+                using (GraphicsPath path = GetClosePath(r, 4))
+                {
+                    using (LinearGradientBrush lbr = new
+                        LinearGradientBrush(r, Color.LightGray, Color.Red, 90))
+                    {
+                        gBmp.FillPath(lbr, path);
+                    }
+
+                    r.Inflate(-1, -1);
+
+                    using (GraphicsPath path2 = GetClosePath(r, 6))
+                    {
+                        using (LinearGradientBrush lbr = new
+                            LinearGradientBrush(r, Color.Red, Color.Maroon, 90))
+                        {
+                            gBmp.FillPath(lbr, path2);
+                        }
+                    }
+
+                    using (Pen pen = new Pen(Color.LightGray, 2))
+                    {
+                        gBmp.DrawLine(pen, new Point(4, 4), new Point(10, 10));
+                        gBmp.DrawLine(pen, new Point(10, 4), new Point(4, 10));
+                    }
+
+                    gBmp.DrawPath(Pens.DarkRed, path);
+                }
+            }
+
+            return (bmp);
+        }
+
+        #endregion
+
+        #region GetClosePath
+
+        /// <summary>
+        /// Gets the close button path
+        /// </summary>
+        /// <param name="r">Close rectangle</param>
+        /// <param name="rad">Corner radius</param>
+        /// <returns></returns>
+        private GraphicsPath GetClosePath(Rectangle r, int rad)
+        {
+            GraphicsPath path = new GraphicsPath();
+
+            Rectangle ar = new
+                Rectangle(r.Right - rad, r.Bottom - rad, rad, rad);
+
+            path.AddArc(ar, 0, 90);
+
+            ar.X = r.X;
+            path.AddArc(ar, 90, 90);
+
+            ar.Y = r.Y;
+            path.AddArc(ar, 180, 90);
+
+            ar.X = r.Right - rad;
+            path.AddArc(ar, 270, 90);
+
+            path.CloseAllFigures();
+
+            return (path);
+        }
+
+        #endregion
+
+        #region Dispose
+
+        public void Dispose()
+        {
+            StopImageAnimation();
+        }
+
+        #endregion
+    }
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/SuperTabControl/SuperTabStrip/SuperTabDragWindow.Designer.cs b/PROMS/DotNetBar Source Code/SuperTabControl/SuperTabStrip/SuperTabDragWindow.Designer.cs
new file mode 100644
index 00000000..f3570e55
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/SuperTabControl/SuperTabStrip/SuperTabDragWindow.Designer.cs	
@@ -0,0 +1,50 @@
+namespace DevComponents.DotNetBar
+{
+    partial class SuperTabDragWindow
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form 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.SuspendLayout();
+            // 
+            // SuperTabDragWindow
+            // 
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
+            this.CausesValidation = false;
+            this.ClientSize = new System.Drawing.Size(63, 24);
+            this.DoubleBuffered = true;
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.Name = "SuperTabDragWindow";
+            this.Opacity = 0.7;
+            this.ShowIcon = false;
+            this.ShowInTaskbar = false;
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/SuperTabControl/SuperTabStrip/SuperTabDragWindow.cs b/PROMS/DotNetBar Source Code/SuperTabControl/SuperTabStrip/SuperTabDragWindow.cs
new file mode 100644
index 00000000..8af1a922
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/SuperTabControl/SuperTabStrip/SuperTabDragWindow.cs	
@@ -0,0 +1,29 @@
+#if FRAMEWORK20
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar
+{
+    public partial class SuperTabDragWindow : Form
+    {
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        public SuperTabDragWindow()
+        {
+            InitializeComponent();
+
+            SetStyle(ControlStyles.UserPaint, true);
+            SetStyle(ControlStyles.AllPaintingInWmPaint, true);
+            SetStyle(ControlStyles.OptimizedDoubleBuffer, true);
+        }
+
+        /// <summary>
+        /// ShowWithoutActivation
+        /// </summary>
+        protected override bool ShowWithoutActivation
+        {
+            get { return true; }
+        }
+    }
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/SuperTabControl/SuperTabStrip/SuperTabDragWindow.resx b/PROMS/DotNetBar Source Code/SuperTabControl/SuperTabStrip/SuperTabDragWindow.resx
new file mode 100644
index 00000000..19dc0dd8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/SuperTabControl/SuperTabStrip/SuperTabDragWindow.resx	
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/SuperTabControl/SuperTabStrip/SuperTabStrip.cs b/PROMS/DotNetBar Source Code/SuperTabControl/SuperTabStrip/SuperTabStrip.cs
new file mode 100644
index 00000000..39cfceb4
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/SuperTabControl/SuperTabStrip/SuperTabStrip.cs	
@@ -0,0 +1,1548 @@
+#if FRAMEWORK20
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Runtime.InteropServices;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.Rendering;
+
+namespace DevComponents.DotNetBar
+{
+    [ToolboxItem(true), ComVisible(false)]
+    [Designer("DevComponents.DotNetBar.Design.SuperTabStripDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+    public class SuperTabStrip : ItemControl, ISupportInitialize
+    {
+        #region Events
+
+        /// <summary>
+        /// Occurs when a tab is added to the Tabs collection
+        /// </summary>
+        [Description("Occurs when a tab is added to the Tabs collection.")]
+        public event EventHandler<SuperTabStripTabItemOpenEventArgs> TabItemOpen;
+
+        /// <summary>
+        /// Occurs when a tab is about to Close
+        /// </summary>
+        [Description("Occurs when a tab is about to Close.")]
+        public event EventHandler<SuperTabStripTabItemCloseEventArgs> TabItemClose;
+
+        /// <summary>
+        /// Occurs when a tab is removed from the Tabs collection
+        /// </summary>
+        [Description("Occurs when a tab is removed from the Tabs collection.")]
+        public event EventHandler<SuperTabStripTabRemovedEventArgs> TabRemoved;
+
+        /// <summary>
+        /// Occurs when a tab is about to be displayed
+        /// </summary>
+        [Description("Occurs when a tab is about to be displayed.")]
+        public event EventHandler<SuperTabStripBeforeTabDisplayEventArgs> BeforeTabDisplay;
+
+        /// <summary>
+        /// Occurs when a tab is being moved or dragged by the user
+        /// </summary>
+        [Description("Occurs when a tab is being moved or dragged by the user.")]
+        public event EventHandler<SuperTabStripTabMovingEventArgs> TabMoving;
+
+        /// <summary>
+        /// Occurs when a tab has been moved or dragged by the user
+        /// </summary>
+        [Description("Occurs when a tab has been moved or dragged by the user.")]
+        public event EventHandler<SuperTabStripTabMovedEventArgs> TabMoved;
+
+        /// <summary>
+        /// Occurs when the Selected tab is changing
+        /// </summary>
+        [Description("Occurs when the Selected tab is changing.")]
+        public event EventHandler<SuperTabStripSelectedTabChangingEventArgs> SelectedTabChanging;
+
+        /// <summary>
+        /// Occurs when the Selected tab has changed
+        /// </summary>
+        [Description("Occurs when the Selected tab has changed.")]
+        public event EventHandler<SuperTabStripSelectedTabChangedEventArgs> SelectedTabChanged;
+
+        /// <summary>
+        /// Occurs when the control needs a tab's bordering path
+        /// </summary>
+        [Description("Occurs when the control needs a tab's bordering path.")]
+        public event EventHandler<SuperTabGetTabItemPathEventArgs> GetTabItemPath;
+
+        /// <summary>
+        /// Occurs when the control needs a tab's Content Rectangle
+        /// </summary>
+        [Description("Occurs when the control needs a tab's Content Rectangle.")]
+        public event EventHandler<SuperTabGetTabItemContentRectangleEventArgs> GetTabItemContentRectangle;
+
+        /// <summary>
+        /// Occurs when the control needs to measure a tab
+        /// </summary>
+        [Description("Occurs when the control needs to measure a tab.")]
+        public event EventHandler<SuperTabMeasureTabItemEventArgs> MeasureTabItem;
+
+        /// <summary>
+        /// Occurs before any tab rendering is done
+        /// </summary>
+        [Description("Occurs before any tab rendering is done.")]
+        public event EventHandler<SuperTabPreRenderTabItemEventArgs> PreRenderTabItem;
+
+        /// <summary>
+        /// Occurs After all tab rendering is complete
+        /// </summary>
+        [Description("Occurs After all tab rendering is complete.")]
+        public event EventHandler<SuperTabPostRenderTabItemEventArgs> PostRenderTabItem;
+
+        /// <summary>
+        /// Occurs when the control needs to get the tab's Text Bounds
+        /// </summary>
+        [Description("Occurs when the control needs to get the tab's Text Bounds.")]
+        public event EventHandler<SuperTabGetTabTextBoundsEventArgs> GetTabTextBounds;
+
+        /// <summary>
+        /// Occurs when the control needs to get the tab's Image Bounds
+        /// </summary>
+        [Description("Occurs when the control needs to get the tab's Image Bounds.")]
+        public event EventHandler<SuperTabGetTabImageBoundsEventArgs> GetTabImageBounds;
+
+        /// <summary>
+        /// Occurs when the control needs to get the tab's Close Button Bounds
+        /// </summary>
+        [Description("Occurs when the control needs to get the tab's Close Button Bounds.")]
+        public event EventHandler<SuperTabGetTabCloseBoundsEventArgs> GetTabCloseBounds;
+
+        /// <summary>
+        /// Occurs when the TabStrip background needs painted
+        /// </summary>
+        [Description("Occurs when the TabStrip background needs painted.")]
+        public event EventHandler<SuperTabStripPaintBackgroundEventArgs> TabStripPaintBackground;
+
+        /// <summary>
+        /// Occurs when the TabStrip TabColor has changed
+        /// </summary>
+        [Description("Occurs when the TabStrip TabColor has changed.")]
+        public event EventHandler<SuperTabStripTabColorChangedEventArgs> TabStripTabColorChanged;
+
+        #endregion
+
+        #region Private variables
+
+        private BaseItem _DesignTimeSelection;
+        private SuperTabStripItem _TabStripItem;
+
+        private bool _IsInitializing;
+        private bool _Available = true;
+
+        #endregion
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        public SuperTabStrip()
+        {
+            _TabStripItem = new SuperTabStripItem(this);
+
+            _TabStripItem.GlobalItem = false;
+            _TabStripItem.ContainerControl = this;
+            _TabStripItem.Stretch = false;
+            _TabStripItem.Displayed = true;
+            _TabStripItem.SetOwner(this);
+
+            SetBaseItemContainer(_TabStripItem);
+
+            SetStyle(ControlStyles.SupportsTransparentBackColor, true);
+
+            HookEvents(true);
+
+            StyleManager.Register(this);
+        }
+
+        #region Public properties
+
+        #region AutoSelectAttachedControl
+
+        /// <summary>
+        /// Gets or sets whether the control attached to the TabItem.AttachedControl property
+        /// is automatically selected when TabItem becomes the selected tab. Default value is true.
+        /// </summary>
+        [Browsable(false)]
+        public bool AutoSelectAttachedControl
+        {
+            get { return (TabStripItem.AutoSelectAttachedControl); }
+            set { TabStripItem.AutoSelectAttachedControl = value; }
+        }
+
+        #endregion
+
+        #region Close button properties
+
+        #region AutoCloseTabs
+
+        /// <summary>
+        /// Gets or sets whether tabs are automatically closed when a close button is clicked
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Close Button")]
+        [Description("Indicates whether tab is automatically closed when close button is clicked.")]
+        public bool AutoCloseTabs
+        {
+            get { return (_TabStripItem.AutoCloseTabs); }
+            set { _TabStripItem.AutoCloseTabs = value; }
+        }
+
+        #endregion
+
+        #region CloseButtonOnTabsAlwaysDisplayed
+
+        /// <summary>
+        /// Gets or sets whether the tab's visible close button is displayed for every tab state
+        /// </summary>
+        [Browsable(true), DefaultValue(true), DevCoBrowsable(true), Category("Close Button")]
+        [Description("Indicates whether the tab's visible close button is displayed for every tab state.")]
+        public bool CloseButtonOnTabsAlwaysDisplayed
+        {
+            get { return (_TabStripItem.CloseButtonOnTabsAlwaysDisplayed); }
+            set { _TabStripItem.CloseButtonOnTabsAlwaysDisplayed = value; }
+        }
+
+        #endregion
+
+        #region CloseButtonOnTabsVisible
+
+        /// <summary>
+        /// Gets or sets whether close button is visible on each tab
+        /// </summary>
+        [Browsable(true), DefaultValue(false), DevCoBrowsable(true), Category("Close Button")]
+        [Description("Indicates whether close button is visible on each tab.")]
+        public bool CloseButtonOnTabsVisible
+        {
+            get { return (_TabStripItem.CloseButtonOnTabsVisible); }
+            set { _TabStripItem.CloseButtonOnTabsVisible = value; }
+        }
+
+        #endregion
+
+        #region CloseButtonPosition
+
+        /// <summary>
+        /// Gets or sets the position of the tab close button
+        /// </summary>
+        [Browsable(true), DefaultValue(eTabCloseButtonPosition.Right), DevCoBrowsable(true)]
+        [Category("Close Button"), Description("Indicates the position of the tab close button.")]
+        public eTabCloseButtonPosition CloseButtonPosition
+        {
+            get { return (_TabStripItem.CloseButtonPosition); }
+            set { _TabStripItem.CloseButtonPosition = value; }
+        }
+
+        #endregion
+
+        #region TabCloseButtonNormal
+
+        /// <summary>
+        /// Gets or sets the custom tab Close button image
+        /// </summary>
+        [Browsable(true), DefaultValue(null), Category("Close Button")]
+        [Description("Indicates the custom tab Close button image.")]
+        public Image TabCloseButtonNormal
+        {
+            get { return (_TabStripItem.TabCloseButtonNormal); }
+            set { _TabStripItem.TabCloseButtonNormal = value; }
+        }
+
+        #endregion
+
+        #region TabCloseButtonHot
+
+        /// <summary>
+        /// Gets or sets the custom Close button image that is used on tabs when the mouse is over the close button
+        /// </summary>
+        public Image TabCloseButtonHot
+        {
+            get { return (_TabStripItem.TabCloseButtonHot); }
+            set { _TabStripItem.TabCloseButtonHot = value; }
+        }
+
+        #endregion
+
+        #region TabCloseButtonPressed
+
+        /// <summary>
+        /// Gets or sets the custom Close button image that is used on tabs when the button has been pressed
+        /// </summary>
+        [Browsable(true), DefaultValue(null), Category("Close Button")]
+        [Description("Indicates custom Close button image that is used on tabs when the button has been pressed.")]
+        public Image TabCloseButtonPressed
+        {
+            get { return (_TabStripItem.TabCloseButtonPressed); }
+            set { _TabStripItem.TabCloseButtonPressed = value; }
+        }
+
+        #endregion
+
+        #region Visible
+
+        public new bool Visible
+        {
+            get { return (base.Visible); }
+
+            set
+            {
+                _Available = value;
+
+                base.Visible = value;
+
+                SuperTabControl stc = Parent as SuperTabControl;
+
+                if (stc != null)
+                    stc.RefreshPanelsStyle();
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ControlBox
+
+        /// <summary>
+        /// Gets the TabStrip ControlBox
+        /// </summary>
+        [Browsable(true), Category("Appearance")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        [Description("Gets the TabStrip ControlBox.")]
+        public SuperTabControlBox ControlBox
+        {
+            get { return (_TabStripItem.ControlBox); }
+        }
+
+        #endregion
+
+        #region DesignTimeSelection
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public BaseItem DesignTimeSelection
+        {
+            get { return (_DesignTimeSelection); }
+
+            set
+            {
+                _DesignTimeSelection = value;
+
+                Invalidate();
+            }
+        }
+
+        #endregion
+
+        #region DisplaySelectedTextOnly
+
+        /// <summary>
+        /// Gets or sets whether the only Text displayed is for the SelectedTab
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Category("Behavior"), DefaultValue(false)]
+        [Description("Specifies whether the only Text displayed is for the SelectedTab.")]
+        public bool DisplaySelectedTextOnly
+        {
+            get { return (_TabStripItem.DisplaySelectedTextOnly); }
+            set { _TabStripItem.DisplaySelectedTextOnly = value; }
+        }
+
+        #endregion
+
+        #region HorizontalText
+
+        [Browsable(true), DefaultValue(true), Category("Appearance")]
+        [Description("Indicates whether text is drawn horizontally regardless of tab orientation.")]
+        public bool HorizontalText
+        {
+            get { return (_TabStripItem.HorizontalText); }
+            set { _TabStripItem.HorizontalText = value; }
+        }
+
+        #endregion
+
+        #region ImageAlignment
+
+        /// <summary>
+        /// Gets or sets the default alignment of the Image within the tab
+        /// </summary>
+        [DefaultValue(ImageAlignment.NotSet), Category("Appearance")]
+        [Description("Indicates the default alignment of the Image within the tab.")]
+        public ImageAlignment ImageAlignment
+        {
+            get { return (_TabStripItem.ImageAlignment); }
+            set { _TabStripItem.ImageAlignment = value; }
+        }
+
+        #endregion
+
+        #region ImageList
+
+        [Browsable(true), DevCoBrowsable(true), Category("Appearance"), DefaultValue(null)]
+        public ImageList ImageList
+        {
+            get { return (Images); }
+            set { Images = value; }
+        }
+
+        #endregion
+
+        #region ItemPadding
+
+        /// <summary>
+        /// Gets or sets BaseItem tab padding in pixels.
+        /// </summary>
+        [Browsable(true), Category("Layout")]
+        [Description("Indicates BaseItem tab padding in pixels.")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public Padding ItemPadding
+        {
+            get { return (_TabStripItem.ItemPadding); }
+            set { _TabStripItem.ItemPadding = value; }
+        }
+
+        #endregion
+
+        #region RotateVerticalText
+
+        /// <summary>
+        /// Gets or sets whether vertical tab text is rotated 180 degrees
+        /// </summary>
+        [Browsable(true), DefaultValue(false), Category("Layout")]
+        [Description("Indicates whether vertical tab text is rotated 180 degrees.")]
+        public bool RotateVerticalText
+        {
+            get { return (_TabStripItem.RotateVerticalText); }
+            set { _TabStripItem.RotateVerticalText = value; }
+        }
+
+        #endregion
+
+        #region ShowFocusRectangle
+
+        [Browsable(true), DefaultValue(false), Category("Behavior")]
+        [Description("Indicates whether focus rectangle is displayed when tab has input focus.")]
+        public bool ShowFocusRectangle
+        {
+            get { return (_TabStripItem.ShowFocusRectangle); }
+            set { _TabStripItem.ShowFocusRectangle = value; }
+        }
+
+        #endregion
+
+        #region Tab properties
+
+        #region FixedTabSize
+
+        /// <summary>
+        /// Gets or sets the fixed tab size in pixels. Either Height, Width, or both can be set
+        /// </summary>
+        [Browsable(true), Category("Appearance")]
+        [Description("Indicates the fixed tab size in pixels. Either Height, Width, or both can be set.")]
+        public Size FixedTabSize
+        {
+            get { return (_TabStripItem.FixedTabSize); }
+            set { _TabStripItem.FixedTabSize = value; }
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeFixedTabSize()
+        {
+            return (_TabStripItem.ShouldSerializeFixedTabSize());
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetFixedTabSize()
+        {
+            TypeDescriptor.GetProperties(this)["FixedTabSize"].SetValue(this, Size.Empty);
+        }
+
+        #endregion
+
+        #region IsTabDragging
+
+        /// <summary>
+        /// Gets or sets whether a tab is currently in a drag operation
+        /// </summary>
+        [Browsable(false)]
+        public bool IsTabDragging
+        {
+            get { return (_TabStripItem.IsTabDragging); }
+        }
+
+        #endregion
+
+        #region ReorderTabsEnabled
+
+        /// <summary>
+        /// Gets or sets whether tabs can be reordered through the user interface
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Category("Behavior")]
+        [Description("Indicates whether the control tabs can be reordered through the user interface.")]
+        public bool ReorderTabsEnabled
+        {
+            get { return (_TabStripItem.ReorderTabsEnabled); }
+            set { _TabStripItem.ReorderTabsEnabled = value; }
+        }
+
+        #endregion
+
+        #region SelectedTab
+
+        /// <summary>
+        /// Gets or sets the selected tab
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), Category("Behavior")]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public SuperTabItem SelectedTab
+        {
+            get { return (_TabStripItem.SelectedTab); }
+            set {_TabStripItem.SelectedTab = value; }
+        }
+
+        #endregion
+
+        #region SelectedTabFont
+
+        /// <summary>
+        /// Gets or sets the selected tab Font
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true),  Localizable(true), Category("Style"), DefaultValue(null)]
+        [Description("Indicates the selected tab Font")]
+        public Font SelectedTabFont
+        {
+            get { return (_TabStripItem.SelectedTabFont); }
+            set { _TabStripItem.SelectedTabFont = value; }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeSelectedTabFont()
+        {
+            return (_TabStripItem.ShouldSerializeSelectedTabFont());
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetSelectedTabFont()
+        {
+            _TabStripItem.ResetSelectedTabFont();
+        }
+
+        #endregion
+
+        #region SelectedTabIndex
+
+        /// <summary>
+        /// Gets or sets the index of the selected tab
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Category("Behavior")]
+        [Description("Indicates the index of the selected tab.")]
+        public int SelectedTabIndex
+        {
+            get { return (_TabStripItem.SelectedTabIndex); }
+            set {_TabStripItem.SelectedTabIndex = value; }
+        }
+
+        #endregion
+
+        #region TabAlignment
+
+        /// <summary>
+        /// Gets or sets the tab alignment within the Tab-Strip control
+        /// </summary>
+        [Browsable(true), DefaultValue(eTabStripAlignment.Top), DevCoBrowsable(true)]
+        [Category("Appearance"), Description("Indicates the tab alignment within the Tab-Strip control.")]
+        public eTabStripAlignment TabAlignment
+        {
+            get { return (_TabStripItem.TabAlignment); }
+            set {_TabStripItem.TabAlignment = value; }
+        }
+
+        #endregion
+
+        #region TabFont
+
+        /// <summary>
+        /// Gets or sets the tab Font
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true),  Localizable(true), Category("Style"), DefaultValue(null)]
+        [Description("Indicates the tab Font")]
+        public Font TabFont
+        {
+            get { return (_TabStripItem.TabFont); }
+            set { _TabStripItem.TabFont = value; }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeTabFont()
+        {
+            return (_TabStripItem.ShouldSerializeTabFont());
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetTabFont()
+        {
+            _TabStripItem.ResetTabFont();
+        }
+
+        #endregion
+
+        #region TabHorizontalSpacing
+
+        /// <summary>
+        /// Gets or sets the Horizontal spacing around tab elements
+        /// </summary>
+        [Browsable(true), DefaultValue(5), Category("Appearance")]
+        [Description("Indicates the Horizontal spacing around tab elements.")]
+        public int TabHorizontalSpacing
+        {
+            get { return (_TabStripItem.TabHorizontalSpacing); }
+            set { _TabStripItem.TabHorizontalSpacing = value; }
+        }
+
+        #endregion
+
+        #region TabLayoutType
+
+        /// <summary>
+        /// Gets or sets the type of the tab layout
+        /// </summary>
+        [Browsable(true), DefaultValue(eSuperTabLayoutType.SingleLine), Category("Appearance")]
+        [Description("Indicates the type of the tab layout.")]
+        public eSuperTabLayoutType TabLayoutType
+        {
+            get { return (_TabStripItem.TabLayoutType); }
+            set { _TabStripItem.TabLayoutType = value; }
+        }
+
+        #endregion
+
+        #region Tabs
+
+        /// <summary>
+        /// Gets the collection of Tabs
+        /// </summary>
+        [Editor("DevComponents.DotNetBar.Design.SuperTabStripTabsEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor))]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        [Category("Data"), Description("Returns the collection of Tabs.")]
+        public SubItemsCollection Tabs
+        {
+            get { return (_TabStripItem.SubItems); }
+        }
+
+        #endregion
+
+        #region TabStripColor
+
+        /// <summary>
+        /// Gets or sets the Color of the TabStrip
+        /// </summary>
+        [Browsable(true), Category("Appearance")]
+        [Description("Indicates the Color of the TabStrip.")]
+        public SuperTabColorTable TabStripColor
+        {
+            get { return (_TabStripItem.TabStripColor); }
+            set { _TabStripItem.TabStripColor = value; }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeTabStripColor()
+        {
+            return (_TabStripItem.TabStripColor.IsEmpty == false);
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetTabStripColor()
+        {
+            _TabStripItem.TabStripColor = new SuperTabColorTable();
+        }
+
+        #endregion
+
+        #region TabStyle
+
+        /// <summary>
+        /// Gets or sets the tab style
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), DefaultValue(eSuperTabStyle.Office2007)]
+        [Category("Appearance"), Description("Indicates the tab style.")]
+        public eSuperTabStyle TabStyle
+        {
+            get { return (_TabStripItem.TabStyle); }
+            set { _TabStripItem.TabStyle = value; }
+        }
+
+        #endregion
+
+        #region TabVerticalSpacing
+
+        /// <summary>
+        /// Gets or sets the Vertical spacing around tab elements
+        /// </summary>
+        [Browsable(true), DefaultValue(4), Category("Appearance")]
+        [Description("Indicates the Vertical spacing around tab elements.")]
+        public int TabVerticalSpacing
+        {
+            get { return (_TabStripItem.TabVerticalSpacing); }
+            set { _TabStripItem.TabVerticalSpacing = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region TabStripItem
+
+        /// <summary>
+        /// Gets the TabStrip associated TabStripItem
+        /// </summary>
+        [Browsable(false)]
+        public SuperTabStripItem TabStripItem
+        {
+            get { return (_TabStripItem); }
+        }
+
+        #endregion
+
+        #region TextAlignment
+
+        /// <summary>
+        /// Gets or sets tab text alignment
+        /// </summary>
+        [Browsable(true), DefaultValue(eItemAlignment.Near)]
+        [DevCoBrowsable(true), Category("Layout"), Description("Indicates tab text alignment.")]
+        public eItemAlignment TextAlignment
+        {
+            get { return (_TabStripItem.TextAlignment); }
+            set { _TabStripItem.TextAlignment = value; }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region Available
+
+        /// <summary>
+        /// Gets whether the tabStrip is visually available
+        /// </summary>
+        internal bool Available
+        {
+            get { return (_Available); }
+        }
+
+        #endregion
+
+        #region IsDesignMode
+
+        /// <summary>
+        /// Gets the Design state for the control
+        /// </summary>
+        internal bool IsDesignMode
+        {
+            get
+            {
+                if (Parent != null && Parent is SuperTabControl && Parent.Site != null)
+                    return (Parent.Site.DesignMode);
+
+                return (DesignMode);
+            }
+        }
+
+        #endregion
+
+        #region IsInitializing
+
+        /// <summary>
+        /// Gets the ISupportInitialize state
+        /// </summary>
+        internal bool IsInitializing
+        {
+            get { return (_IsInitializing); }
+        }
+
+        #endregion
+
+        #region TabDisplay
+
+        /// <summary>
+        /// Gets the TabDisplay
+        /// </summary>
+        internal SuperTabStripBaseDisplay TabDisplay
+        {
+            get { return (_TabStripItem.TabDisplay); }
+        }
+
+        #endregion
+
+        #region ApplicationButton
+        private BaseItem _ApplicationButton;
+        /// <summary>
+        /// Gets or sets the reference to ribbon application button when tab control is used as backstage ribbon control.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public BaseItem ApplicationButton
+        {
+            get { return _ApplicationButton; }
+            set { _ApplicationButton = value; }
+        }
+        #endregion
+
+        #endregion
+
+        #region HookEvents
+
+        /// <summary>
+        /// Hooks or unhooks TabStripItem events
+        /// </summary>
+        /// <param name="hook">true to hook</param>
+        private void HookEvents(bool hook)
+        {
+            if (hook == true)
+            {
+                _TabStripItem.TabItemOpen += TabStripItemTabItemOpen;
+                _TabStripItem.TabItemClose += TabStripItem_TabItemClose;
+                _TabStripItem.TabRemoved += TabStripItem_TabRemoved;
+                _TabStripItem.TabMoving += TabStripItem_TabMoving;
+                _TabStripItem.TabMoved += TabStripItem_TabMoved;
+
+                _TabStripItem.GetTabItemPath += TabStripItem_GetTabItemPath;
+                _TabStripItem.GetTabItemContentRectangle += TabStripItem_GetTabItemContentRectangle;
+
+                _TabStripItem.BeforeTabDisplay += TabStripItem_BeforeTabDisplay;
+                _TabStripItem.MeasureTabItem += TabStripItem_MeasureTabItem;
+                _TabStripItem.PreRenderTabItem += TabStripItem_PreRenderTabItem;
+                _TabStripItem.PostRenderTabItem += TabStripItem_PostRenderTabItem;
+
+                _TabStripItem.GetTabTextBounds += TabStripItem_GetTabTextBounds;
+                _TabStripItem.GetTabImageBounds += TabStripItem_GetTabImageBounds;
+                _TabStripItem.GetTabCloseBounds += TabStripItem_GetTabCloseBounds;
+
+                _TabStripItem.TabStripPaintBackground += TabStripItem_TabStripPaintBackground;
+
+                _TabStripItem.SelectedTabChanging += TabStripItem_SelectedTabChanging;
+                _TabStripItem.SelectedTabChanged += TabStripItem_SelectedTabChanged;
+
+                _TabStripItem.TabStripTabColorChanged += TabStripItem_TabStripTabColorChanged;
+            }
+            else
+            {
+                _TabStripItem.TabItemOpen -= TabStripItemTabItemOpen;
+                _TabStripItem.TabItemClose -= TabStripItem_TabItemClose;
+                _TabStripItem.TabRemoved -= TabStripItem_TabRemoved;
+                _TabStripItem.TabMoving -= TabStripItem_TabMoving;
+                _TabStripItem.TabMoved -= TabStripItem_TabMoved;
+
+                _TabStripItem.GetTabItemPath -= TabStripItem_GetTabItemPath;
+                _TabStripItem.GetTabItemContentRectangle -= TabStripItem_GetTabItemContentRectangle;
+
+                _TabStripItem.BeforeTabDisplay -= TabStripItem_BeforeTabDisplay;
+                _TabStripItem.MeasureTabItem -= TabStripItem_MeasureTabItem;
+                _TabStripItem.PreRenderTabItem -= TabStripItem_PreRenderTabItem;
+                _TabStripItem.PostRenderTabItem -= TabStripItem_PostRenderTabItem;
+
+                _TabStripItem.GetTabTextBounds -= TabStripItem_GetTabTextBounds;
+                _TabStripItem.GetTabImageBounds -= TabStripItem_GetTabImageBounds;
+                _TabStripItem.GetTabCloseBounds -= TabStripItem_GetTabCloseBounds;
+
+                _TabStripItem.TabStripPaintBackground -= TabStripItem_TabStripPaintBackground;
+
+                _TabStripItem.SelectedTabChanging -= TabStripItem_SelectedTabChanging;
+                _TabStripItem.SelectedTabChanged -= TabStripItem_SelectedTabChanged;
+
+                _TabStripItem.TabStripTabColorChanged -= TabStripItem_TabStripTabColorChanged;
+            }
+        }
+
+        #endregion
+
+        #region Event processing
+
+        #region TabStripItem_TabItemOpen
+
+        /// <summary>
+        /// TabStripItem_TabItemOpen
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void TabStripItemTabItemOpen(object sender, SuperTabStripTabItemOpenEventArgs e)
+        {
+            if (TabItemOpen != null)
+                TabItemOpen(this, e);
+        }
+
+        #endregion
+
+        #region TabStripItem_TabItemClose
+
+        /// <summary>
+        /// TabStripItem_TabItemClose
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void TabStripItem_TabItemClose(object sender, SuperTabStripTabItemCloseEventArgs e)
+        {
+            if (TabItemClose != null)
+                TabItemClose(this, e);
+        }
+
+        #endregion
+
+        #region TabStripItem_TabRemoved
+
+        /// <summary>
+        /// TabStripItem_TabRemoved
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void TabStripItem_TabRemoved(object sender, SuperTabStripTabRemovedEventArgs e)
+        {
+            if (TabRemoved != null)
+                TabRemoved(this, e);
+        }
+
+        #endregion
+
+        #region TabStripItem_TabMoving
+
+        /// <summary>
+        /// TabStripItem_TabMoving
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void TabStripItem_TabMoving(object sender, SuperTabStripTabMovingEventArgs e)
+        {
+            if (TabMoving != null)
+                TabMoving(this, e);
+        }
+
+        #endregion
+
+        #region TabStripItem_TabMoved
+
+        /// <summary>
+        /// TabStripItem_TabMoved
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void TabStripItem_TabMoved(object sender, SuperTabStripTabMovedEventArgs e)
+        {
+            if (TabMoved != null)
+                TabMoved(this, e);
+        }
+
+        #endregion
+
+        #region TabStripItem_GetTabItemPath
+
+        /// <summary>
+        /// TabStripItem_GetTabItemPath
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void TabStripItem_GetTabItemPath(object sender, SuperTabGetTabItemPathEventArgs e)
+        {
+            if (GetTabItemPath != null)
+                GetTabItemPath(this, e);
+        }
+
+        #endregion
+
+        #region TabStripItem_GetTabItemContentRectangle
+
+        /// <summary>
+        /// TabStripItem_GetTabItemContentRectangle
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void TabStripItem_GetTabItemContentRectangle(object sender, SuperTabGetTabItemContentRectangleEventArgs e)
+        {
+            if (GetTabItemContentRectangle != null)
+                GetTabItemContentRectangle(this, e);
+        }
+
+        #endregion
+
+        #region TabStripItem_BeforeTabDisplay
+
+        /// <summary>
+        /// TabStripItem_BeforeTabDisplay
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void TabStripItem_BeforeTabDisplay(object sender, SuperTabStripBeforeTabDisplayEventArgs e)
+        {
+            if (BeforeTabDisplay != null)
+                BeforeTabDisplay(this, e);
+        }
+
+        #endregion
+
+        #region TabStripItem_MeasureTabItem
+
+        /// <summary>
+        /// TabStripItem_MeasureTabItem
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void TabStripItem_MeasureTabItem(object sender, SuperTabMeasureTabItemEventArgs e)
+        {
+            if (MeasureTabItem != null)
+                MeasureTabItem(this, e);
+        }
+
+        #endregion
+
+        #region TabStripItem_PreRenderTabItem
+
+        /// <summary>
+        /// TabStripItem_PreRenderTabItem
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void TabStripItem_PreRenderTabItem(object sender, SuperTabPreRenderTabItemEventArgs e)
+        {
+            if (PreRenderTabItem != null)
+                PreRenderTabItem(this, e);
+        }
+
+        #endregion
+
+        #region TabStripItem_PostRenderTabItem
+
+        /// <summary>
+        /// TabStripItem_PostRenderTabItem
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void TabStripItem_PostRenderTabItem(object sender, SuperTabPostRenderTabItemEventArgs e)
+        {
+            if (PostRenderTabItem != null)
+                PostRenderTabItem(this, e);
+        }
+
+        #endregion
+
+        #region TabStripItem_GetTabCloseBounds
+
+        /// <summary>
+        /// TabStripItem_GetTabCloseBounds
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void TabStripItem_GetTabCloseBounds(object sender, SuperTabGetTabCloseBoundsEventArgs e)
+        {
+            if (GetTabCloseBounds != null)
+                GetTabCloseBounds(this, e);
+        }
+
+        #endregion
+
+        #region TabStripItem_GetTabImageBounds
+
+        /// <summary>
+        /// TabStripItem_GetTabImageBounds
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void TabStripItem_GetTabImageBounds(object sender, SuperTabGetTabImageBoundsEventArgs e)
+        {
+            if (GetTabImageBounds != null)
+                GetTabImageBounds(this, e);
+        }
+
+        #endregion
+
+        #region TabStripItem_GetTabTextBounds
+
+        /// <summary>
+        /// TabStripItem_GetTabTextBounds
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void TabStripItem_GetTabTextBounds(object sender, SuperTabGetTabTextBoundsEventArgs e)
+        {
+            if (GetTabTextBounds != null)
+                GetTabTextBounds(this, e);
+        }
+
+        #endregion
+
+        #region TabStripItem_TabStripPaintBackground
+
+        /// <summary>
+        /// TabStripItem_TabStripPaintBackground
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void TabStripItem_TabStripPaintBackground(object sender, SuperTabStripPaintBackgroundEventArgs e)
+        {
+            if (TabStripPaintBackground != null)
+                TabStripPaintBackground(this, e);
+        }
+
+        #endregion
+
+        #region TabStripItem_SelectedTabChanging
+
+        /// <summary>
+        /// TabStripItem_SelectedTabChanging
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void TabStripItem_SelectedTabChanging(object sender, SuperTabStripSelectedTabChangingEventArgs e)
+        {
+            if (SelectedTabChanging != null)
+                SelectedTabChanging(this, e);
+        }
+
+        #endregion
+
+        #region TabStripItem_SelectedTabChanged
+
+        /// <summary>
+        /// TabStripItem_SelectedTabChanged
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void TabStripItem_SelectedTabChanged(object sender, SuperTabStripSelectedTabChangedEventArgs e)
+        {
+            if (SelectedTabChanged != null)
+                SelectedTabChanged(this, e);
+        }
+
+        #endregion
+
+        #region TabStripItem_TabStripTabColorChanged
+
+        /// <summary>
+        /// TabStripItem_TabStripTabColorChanged
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void TabStripItem_TabStripTabColorChanged(object sender, SuperTabStripTabColorChangedEventArgs e)
+        {
+            if (TabStripTabColorChanged != null)
+                TabStripTabColorChanged(this, e);
+        }
+
+        #endregion
+
+        #region Theme Changing
+
+        /// <summary>
+        /// Called by StyleManager to notify control that style on manager has changed and that control should refresh its appearance if
+        /// its style is controlled by StyleManager.
+        /// </summary>
+        /// <param name="newStyle">New active style.</param>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void StyleManagerStyleChanged(eDotNetBarStyle newStyle)
+        {
+            if (BarFunctions.IsHandleValid(this))
+                this.Invalidate(true);
+
+            TabDisplay.SetDefaultColorTable();
+        }
+
+        #endregion
+
+        #endregion
+
+        #region DefaultSize
+
+        /// <summary>
+        /// Gets the DefaultSize
+        /// </summary>
+        protected override Size DefaultSize
+        {
+            get { return new Size(236, 25); }
+        }
+
+        #endregion
+
+        #region RecalcLayout
+        private bool _RecalcLayoutInProgress = false;
+        /// <summary>
+        /// Performs layout recalculation
+        /// </summary>
+        public override void RecalcLayout()
+        {
+            if (!this.IsHandleCreated || _RecalcLayoutInProgress) return; // Do not force creation of Control Handle by going through RecalcLayout. It breaks up the actual layout of controls when Anchor and Dock properties are used.
+
+            _RecalcLayoutInProgress = true;
+            try
+            {
+                base.RecalcLayout();
+
+                if (_IsInitializing == false)
+                {
+                    if (_TabStripItem != null)
+                        _TabStripItem.RecalcSize();
+                }
+            }
+            finally
+            {
+                _RecalcLayoutInProgress = false;
+            }
+        }
+
+        #endregion
+
+        #region EnsureVisible
+
+        /// <summary>
+        /// Ensures that the given tab is visible on the TabStrip
+        /// </summary>
+        /// <param name="tab"></param>
+        public void EnsureVisible(SuperTabItem tab)
+        {
+            _TabStripItem.EnsureVisible(tab);
+        }
+
+        #endregion
+
+        #region GetTabFromPoint
+
+        /// <summary>
+        /// Gets the SuperTabItem from the given Point
+        /// </summary>
+        /// <param name="pt"></param>
+        /// <returns>SuperTabItem or null</returns>
+        public SuperTabItem GetTabFromPoint(Point pt)
+        {
+            return (_TabStripItem.GetTabFromPoint(pt));
+        }
+
+        #endregion
+
+        #region GetItemFromPoint
+
+        /// <summary>
+        /// Gets the BaseItem from the given Point
+        /// </summary>
+        /// <param name="pt"></param>
+        /// <returns>BaseItem or null</returns>
+        public BaseItem GetItemFromPoint(Point pt)
+        {
+            return (_TabStripItem.GetItemFromPoint(pt));
+        }
+
+        #endregion
+
+        #region CloseTab
+
+        /// <summary>
+        /// Closes the given tab
+        /// </summary>
+        /// <param name="tab"></param>
+        public void CloseTab(SuperTabItem tab)
+        {
+            _TabStripItem.CloseTab(tab);
+        }
+
+        #endregion
+
+        #region SelectPreviousTab
+
+        /// <summary>
+        /// Selects the previous tab
+        /// </summary>
+        /// <returns>true if successful</returns>
+        public bool SelectPreviousTab()
+        {
+            return (_TabStripItem.SelectPreviousTab());
+        }
+
+        #endregion
+
+        #region SelectNextTab
+
+        /// <summary>
+        /// Selects the next tab
+        /// </summary>
+        /// <returns>true if successful</returns>
+        public bool SelectNextTab()
+        {
+            return (_TabStripItem.SelectNextTab());
+        }
+
+        #endregion
+
+        #region OnResize
+
+        /// <summary>
+        /// OnResize processing
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void OnResize(EventArgs e)
+        {
+            base.OnResize(e);
+            
+            if (_TabStripItem != null)
+                _TabStripItem.VisibleTab = null;
+
+            RecalcLayout();
+        }
+
+        #endregion
+
+        #region OnGotFocus
+
+        protected override void OnGotFocus(EventArgs e)
+        {
+            base.OnGotFocus(e);
+
+            if (SelectedTab != null)
+                SelectedTab.Refresh();
+        }
+
+        #endregion
+
+        #region OnLostFocus
+
+        protected override void OnLostFocus(EventArgs e)
+        {
+            base.OnLostFocus(e);
+
+            if (SelectedTab != null)
+                SelectedTab.Refresh();
+        }
+
+        #endregion
+
+        #region OnKeyDown
+
+        protected override void OnKeyDown(KeyEventArgs e)
+        {
+            base.OnKeyDown(e);
+
+            if (e.Handled == false)
+            {
+                switch (e.KeyData)
+                {
+                    case Keys.Tab:
+                        Parent.SelectNextControl(this, true, true, true, true);
+
+                        if (SelectedTab != null)
+                            SelectedTab.Refresh();
+                        break;
+
+                    case Keys.Tab | Keys.Shift:
+                        Parent.SelectNextControl(this, false, true, true, true);
+
+                        if (SelectedTab != null)
+                            SelectedTab.Refresh();
+                        break;
+
+                    case Keys.Left:
+                    case Keys.Right:
+                    case Keys.Up:
+                    case Keys.Down:
+                        switch (GetKeyDir(e.KeyData))
+                        {
+                            case KeyDir.Previous:
+                                if (SelectPreviousTab() == true)
+                                    e.Handled = true;
+                                break;
+
+                            case KeyDir.Next:
+                                if (SelectNextTab() == true)
+                                    e.Handled = true;
+                                break;
+                        }
+                        break;
+
+                    case Keys.Home:
+                        SuperTabItem ftab = TabStripItem.FirstVisibleTab;
+
+                        if (ftab != null)
+                        {
+                            TabStripItem.SelectTab(ftab, eEventSource.Keyboard);
+                            e.Handled = true;
+                        }
+                        break;
+
+                    case Keys.End:
+                        SuperTabItem ltab = TabStripItem.LastVisibleTab;
+
+                        if (ltab != null)
+                        {
+                            TabStripItem.SelectTab(ltab, eEventSource.Keyboard);
+                            e.Handled = true;
+                        }
+                        break;
+                }
+
+                if (e.Handled == true)
+                    Focus();            
+            }
+        }
+
+        #region GetKeyDir
+
+        private enum KeyDir
+        {
+            None,
+            Previous,
+            Next
+        }
+
+        private KeyDir GetKeyDir(Keys keys)
+        {
+            switch (keys)
+            {
+                case Keys.Left:
+                    if (TabStripItem.HorizontalText == false)
+                    {
+                        if ((TabStripItem.TabAlignment == eTabStripAlignment.Left && TabStripItem.RotateVerticalText == false) ||
+                            (TabStripItem.TabAlignment == eTabStripAlignment.Right && TabStripItem.RotateVerticalText == true))
+                        {
+                            return (KeyDir.Next);
+                        }
+                    }
+
+                    return (KeyDir.Previous);
+
+                case Keys.Right:
+                    if (TabStripItem.HorizontalText == false)
+                    {
+                        if ((TabStripItem.TabAlignment == eTabStripAlignment.Left && TabStripItem.RotateVerticalText == false) ||
+                            (TabStripItem.TabAlignment == eTabStripAlignment.Right && TabStripItem.RotateVerticalText == true))
+                        {
+                            return (KeyDir.Previous);
+                        }
+                    }
+                    return (KeyDir.Next);
+
+                case Keys.Up:
+                    return (KeyDir.Previous);
+
+                case Keys.Down:
+                    return (KeyDir.Next);
+            }
+
+            return (KeyDir.None);
+        }
+
+        #endregion
+
+        #region IsInputKey
+
+        protected override bool IsInputKey(Keys keyData)
+        {
+            switch (keyData)
+            {
+                case Keys.Right:
+                case Keys.Left:
+                case Keys.Up:
+                case Keys.Down:
+                case Keys.Tab:
+                    return true;
+            }
+
+            return (base.IsInputKey(keyData));
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Mnemonic Processing
+        protected override bool ProcessItemMnemonicKey(BaseItem item)
+        {
+            if (item != null && item.Visible && item.GetEnabled())
+            {
+                if (item is SuperTabItem)
+                {
+                    SuperTabItem tab = (SuperTabItem)item;
+                    SuperTabControl tabControl = Parent as SuperTabControl;
+                    if (tabControl != null && !tabControl.ContainsFocus) return false;
+                    if (!tab.IsSelected)
+                    {
+                        _TabStripItem.SelectTab((SuperTabItem)item, eEventSource.Keyboard);
+                        return true;
+                    }
+                    return false;
+                }
+            }
+            return base.ProcessItemMnemonicKey(item);
+        }
+        #endregion
+
+        #region ISupportInitialize Members
+
+        /// <summary>
+        /// BeginInit
+        /// </summary>
+        void ISupportInitialize.BeginInit()
+        {
+            _IsInitializing = true;
+        }
+
+        /// <summary>
+        /// EndInit
+        /// </summary>
+        void ISupportInitialize.EndInit()
+        {
+            _IsInitializing = false;
+        }
+
+        #endregion
+
+        #region KeyTips
+        public override bool ProcessMnemonicEx(char charCode)
+        {
+            bool processed = base.ProcessMnemonicEx(charCode);
+            if (processed)
+            {
+                if (ShowKeyTips)
+                    ShowKeyTips = false;
+
+                if (ApplicationButton is ApplicationButton)
+                    ((ApplicationButton)ApplicationButton).BackstageMnemonicProcessed(charCode);
+
+                else if (ApplicationButton is Metro.MetroAppButton)
+                    ((Metro.MetroAppButton)ApplicationButton).BackstageMnemonicProcessed(charCode);
+            }
+
+            return processed;
+        }
+
+        protected override Rectangle GetKeyTipRectangle(Graphics g, BaseItem item, Font font, string keyTip)
+        {
+            if (ApplicationButton != null)
+            {
+                Size padding = KeyTipsPainter.KeyTipsPadding;
+                Size size = TextDrawing.MeasureString(g, keyTip, font);
+                size.Width += padding.Width;
+                size.Height += padding.Height;
+
+                Rectangle ib = item.DisplayRectangle;
+                Rectangle r;
+                if (item is SuperTabItem)
+                    r = new Rectangle(ib.X + 2, ib.Y, size.Width, size.Height);
+                else
+                    r = new Rectangle(ib.X + 24, ib.Y - 2, size.Width, size.Height);
+
+                return r;
+            }
+
+            return base.GetKeyTipRectangle(g, item, font, keyTip);
+        }
+        #endregion
+
+        #region Dispose
+
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing == true && IsDisposed == false)
+                HookEvents(false);
+
+            base.Dispose(disposing);
+        }
+
+        #endregion
+    }
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/SuperTabControl/SuperTabStrip/SuperTabStripBaseDisplay.cs b/PROMS/DotNetBar Source Code/SuperTabControl/SuperTabStrip/SuperTabStripBaseDisplay.cs
new file mode 100644
index 00000000..20ddcbc1
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/SuperTabControl/SuperTabStrip/SuperTabStripBaseDisplay.cs	
@@ -0,0 +1,1727 @@
+#if FRAMEWORK20
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using DevComponents.DotNetBar.Rendering;
+using DevComponents.UI.ContentManager;
+
+namespace DevComponents.DotNetBar
+{
+    internal class SuperTabStripBaseDisplay
+    {
+        #region Constants
+
+        private const int MarkerSize = 10;
+
+        #endregion
+
+        #region Private Variables
+
+        private int _TabHeight;
+        private SuperTabStripItem _TabStripItem;
+
+        private SerialContentLayoutManager _ContentManager;
+        private SuperTabItemLayoutManager _BlockManager;
+        private SuperTabColorTable _DefaultColorTable;
+
+        private Bitmap _CloseButton;
+        private Color _CloseButtonColor;
+
+        private Bitmap _MenuButton1;
+        private Bitmap _MenuButton2;
+        private Color _MenuButtonColor;
+
+        private Bitmap _TopInsertMarker;
+        private Bitmap _LeftInsertMarker;
+        private Color _InsertMarkerColor;
+
+		#endregion
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="tabStripItem">Associated SuperTabStripItem</param>
+        public SuperTabStripBaseDisplay(SuperTabStripItem tabStripItem)
+        {
+            _TabStripItem = tabStripItem;
+
+            _ContentManager = new SerialContentLayoutManager();
+            _ContentManager.NextPosition += ContentManagerNextPosition;
+
+            _BlockManager = new SuperTabItemLayoutManager(tabStripItem);
+
+            _DefaultColorTable = SuperTabStyleColorFactory.GetColorTable(tabStripItem.TabStyle, ColorFactory.Empty);
+        }
+
+        #region Internal properties
+
+        #region Alignment
+
+        /// <summary>
+        /// Gets the TabAlignment
+        /// </summary>
+        internal eTabStripAlignment Alignment
+        {
+            get { return (_TabStripItem.TabAlignment); }
+        }
+
+        #endregion
+
+        #region DefaultColorTable
+
+        /// <summary>
+        /// gets or sets the default color table
+        /// </summary>
+        internal SuperTabColorTable DefaultColorTable
+        {
+            get { return (_DefaultColorTable); }
+
+            set
+            {
+                _DefaultColorTable = value;
+
+                for (int i = 0; i < Tabs.Count; i++)
+                {
+                    SuperTabItem tab = Tabs[i] as SuperTabItem;
+
+                    if (tab != null)
+                        tab.TabItemDisplay.SetDefaultColorTable();
+                }
+            }
+        }
+
+        #endregion
+
+        #region IsRightToLeft
+
+        /// <summary>
+        /// Gets if display is RightToLeft
+        /// </summary>
+        internal bool IsRightToLeft
+        {
+            get { return (_TabStripItem.IsRightToLeft); }
+        }
+
+        #endregion
+
+        #region IsVertical
+
+        /// <summary>
+        /// Gets tab vertical orientation
+        /// </summary>
+        internal bool IsVertical
+        {
+            get { return (_TabStripItem.IsVertical); }
+        }
+
+        #endregion
+
+        #region MinTabStripHeight
+
+        /// <summary>
+        /// Gets the minimum TabStrip height
+        /// </summary>
+        internal virtual int MinTabStripHeight
+        {
+            get
+            {
+                if (TabItemsBounds.IsEmpty)
+                    return (TabHeight + Dpi.Height6);
+
+                if (Alignment == eTabStripAlignment.Top || Alignment == eTabStripAlignment.Bottom)
+                    return (TabItemsBounds.Height + Dpi.Height2);
+
+                return (TabItemsBounds.Width + Dpi.Width2);
+            }
+        }
+
+        #endregion
+
+        #region ShowFocusRectangle
+
+        /// <summary>
+        /// Gets whether we are to show the Focus rectangle
+        /// </summary>
+        internal bool ShowFocusRectangle
+        {
+            get { return (_TabStripItem.ShowFocusRectangle); }   // && _TabStripItem.Focused
+        }
+
+        #endregion
+
+        #region Tab properties
+
+        #region CloseButtonOnTabs
+
+        /// <summary>
+        /// Gets CloseButtonOnTabsVisible
+        /// </summary>
+        internal bool CloseButtonOnTabs
+        {
+            get { return (_TabStripItem.CloseButtonOnTabsVisible); }
+        }
+
+        #endregion
+
+        #region FixedTabSize
+
+        /// <summary>
+        /// Gets FixedTabSize
+        /// </summary>
+        internal Size FixedTabSize
+        {
+            get { return (_TabStripItem.FixedTabSize); }
+        }
+
+        #endregion
+
+        #region MinTabSize
+
+        /// <summary>
+        /// Gets the minimum tab size
+        /// </summary>
+        internal virtual Size MinTabSize
+        {
+            get { return Dpi.Size(new Size(13, 13)); }
+        }
+
+        #endregion
+
+        #region SelectedTab
+
+        /// <summary>
+        /// Gets the selected tab
+        /// </summary>
+        internal SuperTabItem SelectedTab
+        {
+            get { return (_TabStripItem.SelectedTab); }
+        }
+
+        #endregion
+
+        #region SelectedTabFont
+
+        /// <summary>
+        /// Gets the selected font
+        /// </summary>
+        internal Font SelectedTabFont
+        {
+            get { return (_TabStripItem.SelectedTabFont); }
+        }
+
+        #endregion
+
+        #region TabControlBox
+
+        /// <summary>
+        /// Gets the tab ControlBox
+        /// </summary>
+        internal SuperTabControlBox TabControlBox
+        {
+            get { return (_TabStripItem.ControlBox); }
+        }
+
+        #endregion
+
+        #region TabHeight
+
+        /// <summary>
+        /// Gets the tab height
+        /// </summary>
+        internal int TabHeight
+        {
+            get
+            {
+                if (_TabHeight <= 0)
+                {
+                    _TabHeight = (FixedTabSize.Height > 0)
+                        ? Dpi.Height(FixedTabSize.Height) : GetTabHeight();
+                }
+
+                return (Dpi.Height(_TabHeight));
+            }
+
+            set { _TabHeight = value; }
+        }
+
+        #endregion
+
+        #region TabItemsBounds
+
+        /// <summary>
+        /// Gets the tab bounds
+        /// </summary>
+        internal Rectangle TabItemsBounds
+        {
+            get { return (_TabStripItem.TabItemsBounds); }
+            set { _TabStripItem.TabItemsBounds = value; }
+        }
+
+        #endregion
+
+        #region Tabs
+
+        /// <summary>
+        /// Gets the Tabs collection
+        /// </summary>
+        internal SubItemsCollection Tabs
+        {
+            get { return (_TabStripItem.SubItems); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region TabStrip
+
+        /// <summary>
+        /// Gets the TabStrip
+        /// </summary>
+        internal SuperTabStrip TabStrip
+        {
+            get { return (TabStripItem.TabStrip); }
+        }
+
+        #endregion
+
+        #region TabStripItem
+
+        /// <summary>
+        /// Gets the TabStripItem
+        /// </summary>
+        internal SuperTabStripItem TabStripItem
+        {
+            get { return (_TabStripItem); }
+        }
+
+        #endregion
+
+        #region Virtual properties
+
+        /// <summary>
+        ///  Gets the PreDrawStripBorder state
+        /// </summary>
+        internal virtual bool PreDrawStripBorder
+        {
+            get { return (false); }
+        }
+
+        /// <summary>
+        ///  Gets the SelectedPaddingWidth
+        /// </summary>
+        internal virtual int SelectedPaddingWidth
+        {
+            get { return (0); }
+        }
+
+        /// <summary>
+        /// Gets the TabOverlap
+        /// </summary>
+        internal virtual int TabOverlap
+        {
+            get { return (0); }
+        }
+
+        /// <summary>
+        /// Gets the TabSpacing
+        /// </summary>
+        internal virtual int TabSpacing
+        {
+            get { return (0); }
+        }
+
+        /// <summary>
+        /// Gets the TabOverlapLeft
+        /// </summary>
+        internal virtual bool TabOverlapLeft
+        {
+            get { return (false); }
+        }
+
+        /// <summary>
+        /// Gets the TabLayoutOffset
+        /// </summary>
+        internal virtual Size TabLayoutOffset
+        {
+            get { return (Size.Empty); }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Events
+
+        /// <summary>
+        /// Handles ContentManager NextPosition events
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void ContentManagerNextPosition(object sender, LayoutManagerPositionEventArgs e)
+        {
+            SuperTabItem item = e.Block as SuperTabItem;
+
+            if (item != null)
+            {
+                int index = item.TabStrip.Tabs.IndexOf(item);
+
+                if (index >= 0)
+                {
+                    for (int i = index + 1; i < item.TabStrip.Tabs.Count; i++)
+                    {
+                        BaseItem nextItem = item.TabStrip.Tabs[i];
+
+                        if (nextItem == null || nextItem.Visible == true)
+                        {
+                            if (nextItem is SuperTabItem)
+                                e.SwitchToNewLine = ((SuperTabItem)nextItem).StartsNewTabLine;
+
+                            break;
+                        }
+                    }
+                }
+            }
+
+            NextBlockPosition(e);
+        }
+
+        #endregion
+
+        #region RecalcSize
+
+        /// <summary>
+        /// Handles RecalcSize requests
+        /// </summary>
+        /// <param name="g"></param>
+        internal virtual void RecalcSize(Graphics g)
+        {
+            RecalcLayoutInit(g);
+            RecLayoutContent();
+
+            int n = MinTabStripHeight;
+
+            switch (_TabStripItem.TabAlignment)
+            {
+                case eTabStripAlignment.Left:
+                case eTabStripAlignment.Right:
+                    _TabStripItem.TabStrip.Width = n;
+
+                    _TabStripItem.WidthInternal = n;
+                    _TabStripItem.HeightInternal = _TabStripItem.TabStrip.Height;
+                    break;
+
+                default:
+                    _TabStripItem.TabStrip.Height = n;
+
+                    _TabStripItem.HeightInternal = n;
+                    _TabStripItem.WidthInternal = _TabStripItem.TabStrip.Width;
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region RecLayoutContent
+
+        /// <summary>
+        /// Handles RecLayoutContent requests
+        /// </summary>
+        internal virtual void RecLayoutContent()
+        {
+            if (TabControlBox.MenuBox.AutoHide == true && TabControlBox.Visible == true)
+            {
+                RecalcLayout(GetTabClientArea(false));
+
+                TabControlBox.MenuBox.Visible = !AllItemsVisible();
+            }
+
+            RecalcLayout(GetTabClientArea());
+        }
+
+        #endregion
+
+        #region RecalcLayoutInit
+
+        /// <summary>
+        /// Initializes the layout engine
+        /// </summary>
+        /// <param name="g"></param>
+        protected virtual void RecalcLayoutInit(Graphics g)
+        {
+            _BlockManager.Graphics = g;
+
+            g.CompositingMode = g.CompositingMode;
+
+            _BlockManager.FixedTabSize = FixedTabSize;
+            _BlockManager.TabLayoutOffset = TabLayoutOffset;
+
+            _ContentManager.RightToLeft = IsRightToLeft;
+            _ContentManager.EvenHeight = true;
+
+            switch (Alignment)
+            {
+                case eTabStripAlignment.Bottom:
+                    _ContentManager.ContentAlignment = eContentAlignment.Left;
+                    _ContentManager.ContentVerticalAlignment = eContentVerticalAlignment.Top;
+                    _ContentManager.BlockLineAlignment = eContentVerticalAlignment.Top;
+                    _ContentManager.ContentOrientation = eContentOrientation.Horizontal;
+                    break;
+
+                case eTabStripAlignment.Top:
+                    _ContentManager.ContentAlignment = eContentAlignment.Left;
+                    _ContentManager.ContentVerticalAlignment = eContentVerticalAlignment.Top;
+                    _ContentManager.BlockLineAlignment = eContentVerticalAlignment.Bottom;
+                    _ContentManager.ContentOrientation = eContentOrientation.Horizontal;
+                    break;
+
+                case eTabStripAlignment.Left:
+                    _ContentManager.ContentAlignment = eContentAlignment.Left;
+                    _ContentManager.ContentVerticalAlignment = eContentVerticalAlignment.Top;
+                    _ContentManager.BlockLineAlignment = eContentVerticalAlignment.Top;
+                    _ContentManager.ContentOrientation = eContentOrientation.Vertical;
+                    break;
+
+                case eTabStripAlignment.Right:
+                    _ContentManager.ContentAlignment = eContentAlignment.Left;
+                    _ContentManager.ContentVerticalAlignment = eContentVerticalAlignment.Top;
+                    _ContentManager.BlockLineAlignment = eContentVerticalAlignment.Top;
+                    _ContentManager.ContentOrientation = eContentOrientation.Vertical;
+                    break;
+            }
+
+            switch (_TabStripItem.TabLayoutType)
+            {
+                case eSuperTabLayoutType.SingleLine:
+                    _ContentManager.MultiLine = false;
+                    _ContentManager.FitContainer = false;
+                    break;
+
+                case eSuperTabLayoutType.SingleLineFit:
+                    _ContentManager.MultiLine = false;
+                    _ContentManager.FitContainer = true;
+                    break;
+
+                case eSuperTabLayoutType.MultiLine:
+                    _ContentManager.MultiLine = true;
+                    _ContentManager.FitContainer = false;
+                    break;
+
+                case eSuperTabLayoutType.MultiLineFit:
+                    _ContentManager.MultiLine = true;
+                    _ContentManager.FitContainer = true;
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region RecalcLayout
+
+        /// <summary>
+        /// Performs the Recalc Layout
+        /// </summary>
+        /// <param name="r"></param>
+        protected virtual void RecalcLayout(Rectangle r)
+        {
+            if (Tabs.Count > 0)
+            {
+                IBlock[] blocks = new IBlock[Tabs.Count];
+
+                for (int i = 0; i < Tabs.Count; i++)
+                    blocks[i] = Tabs[i];
+
+                if (IsRightToLeft)
+                {
+                    Rectangle tabArea = r;
+
+                    if (_TabStripItem.ControlBox.Visible)
+                        tabArea.X += TabControlBox.Size.Width;
+
+                    TabItemsBounds = _ContentManager.Layout(tabArea, blocks, _BlockManager);
+                    RecalcSizeTabControlBox(r, tabArea);
+                }
+                else
+                {
+                    TabItemsBounds = _ContentManager.Layout(r, blocks, _BlockManager);
+                    RecalcSizeTabControlBox(r, TabItemsBounds);
+                }
+            }
+            else
+            {
+                TabItemsBounds = Rectangle.Empty;
+            }
+        }
+
+        #endregion
+
+        #region RecalcSizeTabSystemBox
+
+        /// <summary>
+        /// Recalculates the bounds for the TabControlBox
+        /// </summary>
+        /// <param name="dispRect"></param>
+        /// <param name="tabsBounds"></param>
+        protected virtual void RecalcSizeTabControlBox(Rectangle dispRect, Rectangle tabsBounds)
+        {
+            if (_TabStripItem.ControlBox.Visible == true)
+            {
+                int dx, dy;
+                Size boxSize = TabControlBox.Size;
+
+                switch (Alignment)
+                {
+                    case eTabStripAlignment.Left:
+                    case eTabStripAlignment.Right:
+                        dx = dispRect.X + (dispRect.Width - boxSize.Width) / 2;
+                        dy = _TabStripItem.DisplayRectangle.Bottom - boxSize.Height;
+                        break;
+
+                    default:
+                        if (IsRightToLeft)
+                            dx = dispRect.X;
+                        else
+                            dx = _TabStripItem.DisplayRectangle.Right - boxSize.Width;
+
+                        dy = tabsBounds.Y + (dispRect.Height - boxSize.Height) / 2;
+                        break;
+                }
+
+                TabControlBox.Bounds =
+                    new Rectangle(dx, dy, boxSize.Width, boxSize.Height);
+            }
+        }
+
+        #endregion
+
+        #region GetTabClientArea
+
+        /// <summary>
+        /// Gets the tab client area
+        /// </summary>
+        /// <returns></returns>
+        protected virtual Rectangle GetTabClientArea()
+        {
+            return (GetTabClientArea(TabControlBox.MenuBox.Visible));
+        }
+
+        /// <summary>
+        /// Gets the tab client area
+        /// </summary>
+        /// <returns></returns>
+        protected virtual Rectangle GetTabClientArea(bool mbVisible)
+        {
+            Rectangle r = new Rectangle();
+            r.Size = TabStripItem.TabStrip.Size;
+
+            if (TabStripItem.ControlBox.Visible == true)
+            {
+                if (Alignment == eTabStripAlignment.Right || Alignment == eTabStripAlignment.Left)
+                {
+                    r.Height -= TabStripItem.ControlBox.Size.Height;
+
+                    if (TabStripItem.ControlBox.MenuBox.Visible != mbVisible)
+                    {
+                        if (mbVisible == true)
+                            r.Height -= TabStripItem.ControlBox.MenuBox.HeightInternal;
+                        else
+                            r.Height += TabStripItem.ControlBox.MenuBox.HeightInternal;
+                    }
+
+                    if (r.Height < TabStripItem.ControlBox.Size.Height)
+                        r.Height = TabStripItem.ControlBox.Size.Height;
+                }
+                else
+                {
+                    r.Width -= TabStripItem.ControlBox.Size.Width;
+
+                    if (TabStripItem.ControlBox.MenuBox.Visible != mbVisible)
+                    {
+                        if (mbVisible == true)
+                            r.Width -= TabStripItem.ControlBox.MenuBox.WidthInternal;
+                        else
+                            r.Width += TabStripItem.ControlBox.MenuBox.WidthInternal;
+                    }
+
+                    if (r.Width < TabStripItem.ControlBox.Size.Width)
+                        r.Width = TabStripItem.ControlBox.Size.Width;
+                }
+            }
+
+            return (r);
+        }
+
+        #endregion
+
+        #region GetTabHeight
+
+        /// <summary>
+        /// Gets the tab height
+        /// </summary>
+        /// <returns></returns>
+        protected virtual int GetTabHeight()
+        {
+            if (FixedTabSize.Height > 0)
+                return Dpi.Height(FixedTabSize.Height);
+
+            int iHeight = (Alignment == eTabStripAlignment.Left ||
+                Alignment == eTabStripAlignment.Right) ? Dpi.Height20 : Dpi.Height16;
+
+            Font font = (_TabStripItem.SelectedTabFont ?? _TabStripItem.TabFont) ?? TabStrip.Font;
+
+            if (font.Height > iHeight)
+                iHeight = font.Height;
+
+            iHeight = GetMaxHeight(iHeight) + Dpi.Height4;
+
+            return (iHeight);
+        }
+
+        private int GetMaxHeight(int height)
+        {
+            int maxHeight = 0;
+
+            foreach (BaseItem item in Tabs)
+            {
+                SuperTabItem tab = item as SuperTabItem;
+                if (tab != null)
+                {
+                    CompositeImage image = tab.GetTabImage();
+
+                    if (image != null)
+                    {
+                        int h = Dpi.ImageHeight(image.Height);
+
+                        switch (tab.EffectiveImageAlignment)
+                        {
+                            case ImageAlignment.TopLeft:
+                            case ImageAlignment.TopCenter:
+                            case ImageAlignment.TopRight:
+                            case ImageAlignment.BottomLeft:
+                            case ImageAlignment.BottomCenter:
+                            case ImageAlignment.BottomRight:
+                                h += height;
+                                break;
+                        }
+
+                        if (h > maxHeight)
+                            maxHeight = h;
+                    }
+                }
+            }
+
+            return (maxHeight);
+        }
+
+        #endregion
+
+        #region AddDefaultPadding
+
+        internal virtual void AddDefaultPadding(ref Size size)
+        {
+            size.Width += Dpi.Width(_TabStripItem.TabHorizontalSpacing) * 2;
+            size.Height += Dpi.Height(_TabStripItem.TabVerticalSpacing) * 2;
+        }
+
+        #endregion
+
+        #region NextBlockPosition
+
+        /// <summary>
+        /// Layout manager NextBlockPosition
+        /// </summary>
+        /// <param name="e"></param>
+        protected virtual void NextBlockPosition(LayoutManagerPositionEventArgs e)
+        {
+        }
+
+        /// <summary>
+        /// PromoteTab NextBlockPosition
+        /// </summary>
+        /// <param name="item"></param>
+        /// <param name="vItem"></param>
+        /// <returns></returns>
+        internal virtual Rectangle NextBlockPosition(BaseItem item, BaseItem vItem)
+        {
+            Rectangle r = item.Bounds;
+
+            if (IsVertical == true)
+            {
+                r.X = vItem.Bounds.X;
+                r.Y += item.Bounds.Height;
+            }
+            else
+            {
+                r.X += item.Bounds.Width;
+                r.Y = vItem.Bounds.Y;
+            }
+
+            r.Size = vItem.Size;
+
+            return (r);
+        }
+
+        #endregion
+
+        #region AllItemsVisible
+
+        /// <summary>
+        /// Determines if all tabs are visible
+        /// </summary>
+        /// <returns></returns>
+        private bool AllItemsVisible()
+        {
+            foreach (BaseItem item in Tabs)
+            {
+                if (item.Visible == true && item.Displayed == false)
+                    return (false);
+            }
+
+            return (true);
+        }
+
+        #endregion
+
+        #region Paint
+
+        /// <summary>
+        /// Paint processing
+        /// </summary>
+        /// <param name="p"></param>
+        public void Paint(ItemPaintArgs p)
+        {
+            Rectangle r = _TabStripItem.DisplayRectangle;
+
+            if (r.Width > 0 && r.Height > 0)
+            {
+                using (SuperTabColorTable ct = GetColorTable())
+                {
+                    DrawBackground(p, ct);
+
+                    _TabStripItem.OnPaintBackground(p.Graphics, ct);
+
+                    if (Tabs.Count > 0)
+                    {
+                        // Draw the ControlBox
+
+                        if (_TabStripItem.ControlBox.Visible == true)
+                            TabControlBox.Paint(p);
+
+                        if (PreDrawStripBorder == true)
+                            DrawStripBorder(p, ct);
+
+                        DrawTabs(p);
+                        DrawTabInsertMarker(p, ct);
+
+                        if (PreDrawStripBorder == false)
+                            DrawStripBorder(p, ct);
+                    }
+                }
+            }
+        }
+
+        #region DrawBackground
+
+        /// <summary>
+        /// Draws the background
+        /// </summary>
+        /// <param name="p"></param>
+        /// <param name="ct"></param>
+        protected virtual void DrawBackground(ItemPaintArgs p, SuperTabColorTable ct)
+        {
+            Graphics g = p.Graphics;
+            Rectangle r = _TabStripItem.DisplayRectangle;
+
+            int angle = ct.Background.GradientAngle;
+
+            switch (_TabStripItem.TabAlignment)
+            {
+                case eTabStripAlignment.Bottom:
+                    angle += 180;
+                    r.Y -= 1;
+                    break;
+
+                case eTabStripAlignment.Left:
+                    angle += -90;
+                    break;
+
+                case eTabStripAlignment.Right:
+                    angle += 90;
+                    r.X -= 1;
+                    break;
+            }
+
+            using (Brush lbr = ct.Background.GetBrush(r, angle))
+            {
+                if (lbr != null)
+                    g.FillRectangle(lbr, r);
+            }
+        }
+
+        #endregion
+
+        #region DrawTabs
+
+        /// <summary>
+        /// Draws the tabs
+        /// </summary>
+        /// <param name="p"></param>
+        protected virtual void DrawTabs(ItemPaintArgs p)
+        {
+            // Draw all but the selected tab item
+
+            for (int i = Tabs.Count - 1; i >= 0; i--)
+            {
+                BaseItem item = Tabs[i];
+
+                if (item != null && item.Displayed == true)
+                {
+                    if (p.ClipRectangle.IntersectsWith(item.DisplayRectangle))
+                    {
+                        SuperTabItem tab = item as SuperTabItem;
+
+                        if (tab == null || tab.IsSelected == false)
+                            item.Paint(p);
+                    }
+                }
+            }
+
+            // Draw the selected tab
+
+            if (SelectedTab != null && SelectedTab.Displayed == true)
+                SelectedTab.Paint(p);
+            
+            // Lastly draw tab insert markers
+
+            for (int i = Tabs.Count - 1; i >= 0; i--)
+            {
+                BaseItem item = Tabs[i];
+
+                if (item != null && item.Displayed == true)
+                    item.DrawInsertMarker(p.Graphics);
+            }
+        }
+
+        #endregion
+
+        #region DrawTabInsertMarker
+
+        #region DrawTabInsertMarker
+
+        /// <summary>
+        /// Draws the Drag and Drop insert marker
+        /// </summary>
+        /// <param name="p">ItemPaintArgs</param>
+        /// <param name="ct">Color table</param>
+        private void DrawTabInsertMarker(ItemPaintArgs p, SuperTabColorTable ct)
+        {
+            if (_TabStripItem.InsertTab != null)
+            {
+                if (_InsertMarkerColor != ct.InsertMarker)
+                {
+                    if (_TopInsertMarker != null)
+                    {
+                        _TopInsertMarker.Dispose();
+                        _TopInsertMarker = null;
+                    }
+
+                    if (_LeftInsertMarker != null)
+                    {
+                        _LeftInsertMarker.Dispose();
+                        _LeftInsertMarker = null;
+                    }
+
+                    _InsertMarkerColor = ct.InsertMarker;
+                }
+
+                switch (_TabStripItem.TabAlignment)
+                {
+                    case eTabStripAlignment.Top:
+                    case eTabStripAlignment.Bottom:
+                        DrawTopInsertMarker(p.Graphics);
+                        break;
+
+                    case eTabStripAlignment.Left:
+                    case eTabStripAlignment.Right:
+                        DrawLeftInsertMarker(p.Graphics);
+                        break;
+                }
+            }
+        }
+
+        #endregion
+
+        #region DrawTopInsertMarker
+
+        /// <summary>
+        /// Draws the top insert marker
+        /// </summary>
+        /// <param name="g"></param>
+        private void DrawTopInsertMarker(Graphics g)
+        {
+            Rectangle r = GetTopInsertRect();
+            Bitmap b = GetTopInsertMarker(g);
+
+            g.DrawImageUnscaled(b, r);
+        }
+
+        #region GetTopInsertRect
+
+        private Rectangle GetTopInsertRect()
+        {
+            BaseItem item = _TabStripItem.InsertTab;
+            SuperTabStripBaseDisplay tabDisplay = _TabStripItem.TabDisplay;
+
+            int x1 = item.Bounds.X;
+            int x2 = item.Bounds.Right;
+
+            int n = Tabs.IndexOf(item);
+
+            if (n > 0)
+            {
+                int p = _TabStripItem.GetPrevVisibleTab(Tabs, n - 1);
+
+                if (p >= 0)
+                {
+                    if (IsSameLine(item, Tabs[p]) == true)
+                    {
+                        if (tabDisplay.TabOverlap > 0)
+                        {
+                            if (tabDisplay.TabOverlapLeft == true)
+                                x1 = Tabs[p].Bounds.Right;
+                        }
+                        else
+                        {
+                            x1 = (item.Bounds.X + Tabs[p].Bounds.Right) / 2;
+                        }
+                    }
+                }
+            }
+
+            if (n + 1 < Tabs.Count)
+            {
+                int p = _TabStripItem.GetNextVisibleTab(Tabs, n + 1);
+
+                if (p >= 0)
+                {
+                    if (IsSameLine(item, Tabs[p]) == true)
+                    {
+                        if (tabDisplay.TabOverlap > 0)
+                        {
+                            if (tabDisplay.TabOverlapLeft == false)
+                                x2 = Tabs[p].Bounds.X;
+                        }
+                        else
+                        {
+                            x2 = (item.Bounds.Right + Tabs[p].Bounds.X) / 2;
+                        }
+                    }
+                }
+            }
+
+            Rectangle r = item.Bounds;
+
+            r.X = x1;
+            r.Width = x2 - x1;
+            r.Height = MarkerSize;
+
+            if (_TabStripItem.InsertBefore == true)
+            {
+                r.X -= MarkerSize / 2;
+
+                if (r.X < 0)
+                    r.X = 0;
+            }
+            else
+            {
+                r.X = r.Right - MarkerSize / 2;
+
+                if (r.X + MarkerSize > _TabStripItem.Bounds.Right)
+                    r.X = _TabStripItem.Bounds.Right - MarkerSize;
+            }
+
+            r.Width = MarkerSize;
+
+            return (r);
+        }
+
+        #endregion
+
+        #region GetTopInsertMarker
+
+        private Bitmap GetTopInsertMarker(Graphics g)
+        {
+            if (_TopInsertMarker == null)
+                _TopInsertMarker = CreateTopInsertMarker(g);
+
+            return (_TopInsertMarker);
+        }
+
+        #endregion
+
+        #region CreateTopInsertMarker
+
+        private Bitmap CreateTopInsertMarker(Graphics g)
+        {
+            Bitmap bmp = new Bitmap(MarkerSize, MarkerSize, g);
+
+            using (Graphics gBmp = Graphics.FromImage(bmp))
+            {
+                gBmp.SmoothingMode = g.SmoothingMode;
+
+                using (GraphicsPath path = new GraphicsPath())
+                {
+                    path.AddPolygon(new Point[]
+                    {
+                        new Point(6, 0),
+                        new Point(6, 5),
+                        new Point(9, 5),
+                        new Point(5, 9),
+                        new Point(4, 9),
+                        new Point(0, 5),
+                        new Point(3, 5),
+                        new Point(3, 0),
+                        new Point(6, 0),
+                    });
+
+                    path.CloseFigure();
+
+                    Color color = Color.FromArgb(200, _InsertMarkerColor);
+
+                    using (SolidBrush br = new SolidBrush(color))
+                        gBmp.FillPath(br, path);
+
+                    using (Pen pen = new Pen(color))
+                        gBmp.DrawPath(pen, path);
+                }
+            }
+
+            return (bmp);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region DrawLeftInsertMarker
+
+        /// <summary>
+        /// Draws the left insert marker
+        /// </summary>
+        /// <param name="g"></param>
+        private void DrawLeftInsertMarker(Graphics g)
+        {
+            Rectangle r = GetLeftInsertRect();
+            Bitmap b = GetLeftInsertMarker(g);
+
+            g.DrawImageUnscaled(b, r);
+        }
+
+        #region GetLeftInsertRect
+
+        private Rectangle GetLeftInsertRect()
+        {
+            BaseItem item = _TabStripItem.InsertTab;
+            SuperTabStripBaseDisplay tabDisplay = _TabStripItem.TabDisplay;
+
+            int y1 = item.Bounds.Y;
+            int y2 = item.Bounds.Bottom;
+
+            int n = Tabs.IndexOf(item);
+
+            if (n > 0)
+            {
+                if (IsSameLine(item, Tabs[n - 1]) == true)
+                {
+                    if (tabDisplay.TabOverlap > 0)
+                    {
+                        if (tabDisplay.TabOverlapLeft == true)
+                            y1 = Tabs[n - 1].Bounds.Bottom;
+                    }
+                    else
+                    {
+                        y1 = (item.Bounds.Y + Tabs[n - 1].Bounds.Bottom) / 2;
+                    }
+                }
+            }
+
+            if (n + 1 < Tabs.Count)
+            {
+                if (IsSameLine(item, Tabs[n + 1]) == true)
+                {
+                    if (tabDisplay.TabOverlap > 0)
+                    {
+                        if (tabDisplay.TabOverlapLeft == false)
+                            y2 = Tabs[n + 1].Bounds.Y;
+                    }
+                    else
+                    {
+                        y2 = (item.Bounds.Bottom + Tabs[n + 1].Bounds.Y) / 2;
+                    }
+                }
+            }
+
+            Rectangle r = item.Bounds;
+            r.Y = y1;
+            r.Height = y2 - y1;
+            r.Width = MarkerSize;
+
+            if (_TabStripItem.InsertBefore == true)
+            {
+                r.Y -= MarkerSize / 2;
+
+                if (r.Y < 0)
+                    r.Y = 0;
+            }
+            else
+            {
+                r.Y = r.Bottom - MarkerSize / 2;
+
+                if (r.Y + MarkerSize > _TabStripItem.Bounds.Bottom)
+                    r.Y = _TabStripItem.Bounds.Bottom - MarkerSize;
+            }
+
+            r.Height = MarkerSize;
+
+            return (r);
+        }
+
+        #endregion
+
+        #region GetLeftInsertMarker
+
+        private Bitmap GetLeftInsertMarker(Graphics g)
+        {
+            if (_LeftInsertMarker == null)
+                _LeftInsertMarker = CreateLeftInsertMarker(g);
+
+            return (_LeftInsertMarker);
+        }
+
+        #endregion
+
+        #region CreateLeftInsertMarker
+
+        private Bitmap CreateLeftInsertMarker(Graphics g)
+        {
+            Bitmap bmp = new Bitmap(MarkerSize, MarkerSize, g);
+
+            using (Graphics gBmp = Graphics.FromImage(bmp))
+            {
+                gBmp.SmoothingMode = g.SmoothingMode;
+
+                using (GraphicsPath path = new GraphicsPath())
+                {
+                    path.AddPolygon(new Point[]
+                     {
+                         new Point(0, 6),
+                         new Point(5, 6),
+                         new Point(5, 9),
+                         new Point(9, 5),
+                         new Point(9, 4),
+                         new Point(5, 0),
+                         new Point(5, 3),
+                         new Point(0, 3),
+                         new Point(0, 6),
+                     });
+
+                    path.CloseFigure();
+
+                    Color color = Color.FromArgb(200, _InsertMarkerColor);
+
+                    using (SolidBrush br = new SolidBrush(color))
+                        gBmp.FillPath(br, path);
+
+                    using (Pen pen = new Pen(color))
+                        gBmp.DrawPath(pen, path);
+                }
+            }
+
+            return (bmp);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region IsSameLine
+
+        /// <summary>
+        /// Determines if the given items are on the same line
+        /// </summary>
+        /// <param name="item1"></param>
+        /// <param name="item2"></param>
+        /// <returns></returns>
+        private bool IsSameLine(BaseItem item1, BaseItem item2)
+        {
+            if (_TabStripItem.TabLines == 1)
+                return (true);
+
+            switch (_TabStripItem.TabAlignment)
+            {
+                case eTabStripAlignment.Top:
+                    return (item1.Bounds.Bottom == item2.Bounds.Bottom);
+
+                case eTabStripAlignment.Left:
+                    return (item1.Bounds.Right == item2.Bounds.Right);
+
+                case eTabStripAlignment.Bottom:
+                    return (item1.Bounds.Top == item2.Bounds.Top);
+
+                default:
+                    return (item1.Bounds.Left == item2.Bounds.Left);
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region DrawStripBorder
+
+        /// <summary>
+        /// Draws the TabStrip border
+        /// </summary>
+        /// <param name="p"></param>
+        /// <param name="ct"></param>
+        protected virtual void DrawStripBorder(ItemPaintArgs p, SuperTabColorTable ct)
+        {
+            Graphics g = p.Graphics;
+            SuperTabItem selTab = TabStripItem.SelectedTab;
+
+            Rectangle r = TabStripItem.Bounds;
+            Rectangle t = (selTab != null) ? selTab.DisplayRectangle : Rectangle.Empty;
+
+            Color iColor = ct.InnerBorder;
+            Color oColor = ct.OuterBorder;
+
+            if (selTab != null)
+            {
+                if (SuperTabStyleColorFactory.IsOfficeMobile2014Color(selTab.PredefinedColor))
+                {
+                    SuperTabLinearGradientColorTable lgt =
+                       SuperTabStyleColorFactory.GetPredefinedSelectedBackground(selTab.PredefinedColor, new ColorFactory());
+
+                    iColor = (lgt.Colors != null && lgt.Colors.Length > 0)
+                        ? lgt.Colors[lgt.Colors.Length - 1] : Color.DimGray;
+
+                    oColor = iColor;
+                }
+            }
+
+            using (Pen iPen = new Pen(iColor))
+            {
+                using (Pen oPen = new Pen(oColor))
+                {
+                    int inner, outer;
+                    GetBorderLines(out inner, out outer);
+
+                    switch (TabStripItem.TabAlignment)
+                    {
+                        case eTabStripAlignment.Top:
+                        case eTabStripAlignment.Bottom:
+                            if (t.X > r.X)
+                            {
+                                g.DrawLine(iPen, r.X, inner, t.X + 1, inner);
+                                g.DrawLine(oPen, r.X, outer, t.X, outer);
+                            }
+
+                            if (t.Right < r.Right)
+                            {
+                                g.DrawLine(iPen, t.Right - 2, inner, r.Right - 1, inner);
+                                g.DrawLine(oPen, t.Right, outer, r.Right - 2, outer);
+                            }
+
+                            g.DrawLine(oPen, r.X, outer, r.X, inner);
+                            g.DrawLine(oPen, r.Right - 1, outer, r.Right - 1, inner);
+                            break;
+
+                        case eTabStripAlignment.Left:
+                        case eTabStripAlignment.Right:
+                            if (t.Y > 0)
+                            {
+                                g.DrawLine(iPen, inner, r.Y, inner, t.Y + 1);
+                                g.DrawLine(oPen, outer, r.Y, outer, t.Y);
+                            }
+
+                            if (t.Bottom < r.Bottom)
+                            {
+                                g.DrawLine(iPen, inner, t.Bottom - 2, inner, r.Bottom - 1);
+                                g.DrawLine(oPen, outer, t.Bottom - 1, outer, r.Bottom - 1);
+                            }
+
+                            g.DrawLine(oPen, inner, r.Y, outer, r.Y);
+                            g.DrawLine(oPen, inner, r.Bottom - 1, outer, r.Bottom - 1);
+                            break;
+                    }
+                }
+            }
+        }
+
+        #region GetBorderLines
+
+        /// <summary>
+        /// Gets the inner and outer border lines
+        /// </summary>
+        /// <param name="inner"></param>
+        /// <param name="outer"></param>
+        private void GetBorderLines(out int inner, out int outer)
+        {
+            Rectangle r = TabStripItem.Bounds;
+
+            switch (TabStripItem.TabAlignment)
+            {
+                case eTabStripAlignment.Top:
+                    inner = r.Bottom - 1;
+                    outer = r.Bottom - 2;
+                    break;
+
+                case eTabStripAlignment.Bottom:
+                    inner = r.Y;
+                    outer = r.Y + 1;
+                    break;
+
+                case eTabStripAlignment.Left:
+                    inner = r.Right - 1;
+                    outer = r.Right - 2;
+                    break;
+
+                default:
+                    inner = r.X;
+                    outer = r.X + 1;
+                    break;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region SetDefaultColorTable
+
+        /// <summary>
+        /// Sets the default color table
+        /// </summary>
+        internal void SetDefaultColorTable()
+        {
+            DefaultColorTable =
+                SuperTabStyleColorFactory.GetColorTable(TabStrip.TabStyle, ColorFactory.Empty);
+        }
+
+        #endregion
+
+        #region GetColorTable
+
+        /// <summary>
+        /// Gets the tab color table
+        /// </summary>
+        /// <returns>Tab color table</returns>
+        internal virtual SuperTabColorTable GetColorTable()
+        {
+            SuperTabColorTable ct = TabStripItem.TabStripColor;
+            SuperTabColorTable sct = (SuperTabColorTable)_DefaultColorTable.Clone();
+            
+            if (ct != null)
+            {
+                if (ct.Background.IsEmpty == false)
+                    sct.Background = ct.Background;
+
+                if (ct.InnerBorder != Color.Empty)
+                    sct.InnerBorder = ct.InnerBorder;
+
+                if (ct.OuterBorder != Color.Empty)
+                    sct.OuterBorder = ct.OuterBorder;
+
+                GetControlBoxColors(sct.ControlBoxDefault, ct.ControlBoxDefault);
+                GetControlBoxColors(sct.ControlBoxMouseOver, ct.ControlBoxMouseOver);
+                GetControlBoxColors(sct.ControlBoxPressed, ct.ControlBoxPressed);
+
+                if (ct.InsertMarker != Color.Empty)
+                    sct.InsertMarker = ct.InsertMarker;
+
+                if (ct.SelectionMarker != Color.Empty)
+                    sct.SelectionMarker = ct.SelectionMarker;
+            }
+
+            if (SelectedTab != null)
+            {
+                if (SuperTabStyleColorFactory.IsOfficeMobile2014Color(SelectedTab.PredefinedColor) == true)
+                {
+                    SuperTabItemStateColorTable tct = SelectedTab.GetTabColorTableEx(eTabState.Selected);
+
+                    if (tct != null)
+                    {
+                        if (tct.InnerBorder != Color.Empty)
+                            sct.InnerBorder = tct.InnerBorder;
+
+                        if (tct.OuterBorder != Color.Empty)
+                            sct.OuterBorder = tct.OuterBorder;
+                    }
+                }
+            }
+
+            return (sct);
+        }
+
+        private void GetControlBoxColors(
+            SuperTabControlBoxStateColorTable sbc, SuperTabControlBoxStateColorTable bc)
+        {
+            if (bc.Background != Color.Empty)
+                sbc.Background = bc.Background;
+
+            if (bc.Border != Color.Empty)
+                sbc.Border = bc.Border;
+
+            if (bc.Image != Color.Empty)
+                sbc.Image = bc.Image;
+        }
+
+        #endregion
+
+        #region GetCloseButton
+
+        /// <summary>
+        /// Gets the tab close button bitmap
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="color"></param>
+        /// <returns></returns>
+        public Bitmap GetCloseButton(Graphics g, Color color)
+        {
+            if (color != _CloseButtonColor && _CloseButton != null)
+            {
+                _CloseButton.Dispose();
+                _CloseButton = null;
+            }
+
+            _CloseButtonColor = color;
+
+            if (_CloseButton == null)
+                _CloseButton = CreateCloseButton(g);
+
+            return (_CloseButton);
+        }
+
+        #region CreateCloseButton
+
+        /// <summary>
+        /// Creates the tab close button bitmap
+        /// </summary>
+        /// <param name="g"></param>
+        /// <returns></returns>
+        public virtual Bitmap CreateCloseButton(Graphics g)
+        {
+            Bitmap bmp = new Bitmap(Dpi.Width16, Dpi.Height16, g);
+
+            using (Graphics gBmp = Graphics.FromImage(bmp))
+            {
+                gBmp.CompositingQuality = CompositingQuality.HighQuality;
+                gBmp.SmoothingMode = g.SmoothingMode;
+
+                using (Pen pen = new Pen(_CloseButtonColor, Dpi.Width2))
+                {
+                    gBmp.DrawLine(pen, new Point(Dpi.Width3, Dpi.Height3), new Point(Dpi.Width11, Dpi.Height11));
+                    gBmp.DrawLine(pen, new Point(Dpi.Width11, Dpi.Height3), new Point(Dpi.Width3, Dpi.Height11));
+                }
+            }
+
+            return (bmp);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetMenuButton1
+
+        /// <summary>
+        /// Gets the Menu button bitmap
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="color"></param>
+        /// <returns></returns>
+        public Bitmap GetMenuButton1(Graphics g, Color color)
+        {
+            if (color != _MenuButtonColor)
+            {
+                if (_MenuButton1 != null)
+                {
+                    _MenuButton1.Dispose();
+                    _MenuButton1 = null;
+                }
+
+                if (_MenuButton2 != null)
+                {
+                    _MenuButton2.Dispose();
+                    _MenuButton2 = null;
+                }
+            }
+
+            _MenuButtonColor = color;
+
+            if (_MenuButton1 == null)
+                _MenuButton1 = CreateMenuButton1(g);
+
+            return (_MenuButton1);
+        }
+
+
+        #region CreateMenuButton1
+
+        /// <summary>
+        /// Create the Menu button bitmap
+        /// </summary>
+        /// <param name="g"></param>
+        /// <returns></returns>
+        public virtual Bitmap CreateMenuButton1(Graphics g)
+        {
+            Bitmap bmp = new Bitmap(Dpi.Width16, Dpi.Height16, g);
+
+            using (Graphics gBmp = Graphics.FromImage(bmp))
+            {
+                gBmp.CompositingQuality = CompositingQuality.HighQuality;
+                gBmp.SmoothingMode = g.SmoothingMode;
+
+                using (GraphicsPath path = GetMenuButtonPath1())
+                {
+                    using (Brush br = new SolidBrush(_MenuButtonColor))
+                        gBmp.FillPath(br, path);
+
+                    using (Pen pen = new Pen(_MenuButtonColor))
+                        gBmp.DrawPath(pen, path);
+                }
+            }
+
+            return (bmp);
+        }
+
+        #endregion
+
+        #region GetMenuButtonPath1
+
+        /// <summary>
+        /// Gets the Menu button path
+        /// </summary>
+        /// <returns></returns>
+        private GraphicsPath GetMenuButtonPath1()
+        {
+            GraphicsPath path = new GraphicsPath();
+
+            path.AddLines(new Point[] 
+            {
+                new Point(Dpi.Width4, Dpi.Height5), 
+                new Point(Dpi.Width8, Dpi.Height9), 
+                new Point(Dpi.Width12, Dpi.Height5) 
+            });
+
+            path.CloseAllFigures();
+
+            return (path);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetMenuButton2
+
+        /// <summary>
+        /// Gets the Menu button bitmap
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="color"></param>
+        /// <returns></returns>
+        public Bitmap GetMenuButton2(Graphics g, Color color)
+        {
+            if (color != _MenuButtonColor)
+            {
+                if (_MenuButton1 != null)
+                {
+                    _MenuButton1.Dispose();
+                    _MenuButton1 = null;
+                }
+
+                if (_MenuButton2 != null)
+                {
+                    _MenuButton2.Dispose();
+                    _MenuButton2 = null;
+                }
+            }
+
+            _MenuButtonColor = color;
+
+            if (_MenuButton2 == null)
+                _MenuButton2 = CreateMenuButton2(g);
+
+            return (_MenuButton2);
+        }
+
+        #region CreateMenuButton2
+
+        /// <summary>
+        /// Create the Menu button bitmap
+        /// </summary>
+        /// <param name="g"></param>
+        /// <returns></returns>
+        public virtual Bitmap CreateMenuButton2(Graphics g)
+        {
+            Bitmap bmp = new Bitmap(Dpi.Width16, Dpi.Height16, g);
+
+            using (Graphics gBmp = Graphics.FromImage(bmp))
+            {
+                gBmp.CompositingQuality = CompositingQuality.HighQuality;
+                gBmp.SmoothingMode = g.SmoothingMode;
+
+                using (GraphicsPath path = GetMenuButtonPath2())
+                {
+                    using (Brush br = new SolidBrush(_MenuButtonColor))
+                        gBmp.FillPath(br, path);
+
+                    using (Pen pen = new Pen(_MenuButtonColor))
+                        gBmp.DrawPath(pen, path);
+                }
+            }
+
+            return (bmp);
+        }
+
+        #endregion
+
+        #region GetMenuButtonPath2
+
+        /// <summary>
+        /// Gets the Menu button path
+        /// </summary>
+        /// <returns></returns>
+        private GraphicsPath GetMenuButtonPath2()
+        {
+            GraphicsPath path = new GraphicsPath();
+
+            path.AddLines(new Point[]
+            {
+                new Point(Dpi.Width3, Dpi.Height4),
+                new Point(Dpi.Width6, Dpi.Height7),
+                new Point(Dpi.Width3, Dpi.Height11)
+            });
+
+            path.CloseFigure();
+
+            path.AddLines(new Point[]
+            {
+                new Point(Dpi.Width9, Dpi.Height4),
+                new Point(Dpi.Width12, Dpi.Height7),
+                new Point(Dpi.Width9, Dpi.Height11)
+            });
+
+            path.CloseFigure();
+
+            return (path);
+        }
+
+        #endregion
+
+        #endregion
+    }
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/SuperTabControl/SuperTabStrip/SuperTabStripItem.cs b/PROMS/DotNetBar Source Code/SuperTabControl/SuperTabStrip/SuperTabStripItem.cs
new file mode 100644
index 00000000..2d0dc0af
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/SuperTabControl/SuperTabStrip/SuperTabStripItem.cs	
@@ -0,0 +1,3834 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Media;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.Rendering;
+
+namespace DevComponents.DotNetBar
+{
+    public class SuperTabStripItem : BaseItem, IDesignTimeProvider
+    {
+        #region Events
+
+        /// <summary>
+        /// Occurs when a tab is added to the Tabs collection
+        /// </summary>
+        [Description("Occurs when a tab is added to the Tabs collection.")]
+        public event EventHandler<SuperTabStripTabItemOpenEventArgs> TabItemOpen;
+
+        /// <summary>
+        /// Occurs when a tab is about to Close
+        /// </summary>
+        [Description("Occurs when a tab is about to Close.")]
+        public event EventHandler<SuperTabStripTabItemCloseEventArgs> TabItemClose;
+
+        /// <summary>
+        /// Occurs when a tab is removed from the Tabs collection
+        /// </summary>
+        [Description("Occurs when a tab is removed from the Tabs collection.")]
+        public event EventHandler<SuperTabStripTabRemovedEventArgs> TabRemoved;
+
+        /// <summary>
+        /// Occurs when a tab is about to be displayed
+        /// </summary>
+        [Description("Occurs when a tab is about to be displayed.")]
+        public event EventHandler<SuperTabStripBeforeTabDisplayEventArgs> BeforeTabDisplay;
+
+        /// <summary>
+        /// Occurs when a tab is being moved or dragged by the user
+        /// </summary>
+        [Description("Occurs when a tab is being moved or dragged by the user.")]
+        public event EventHandler<SuperTabStripTabMovingEventArgs> TabMoving;
+
+        /// <summary>
+        /// Occurs when a tab has been moved or dragged by the user
+        /// </summary>
+        [Description("Occurs when a tab has been moved or dragged by the user.")]
+        public event EventHandler<SuperTabStripTabMovedEventArgs> TabMoved;
+
+        /// <summary>
+        /// Occurs when the Selected tab is changing
+        /// </summary>
+        [Description("Occurs when the Selected tab is changing.")]
+        public event EventHandler<SuperTabStripSelectedTabChangingEventArgs> SelectedTabChanging;
+
+        /// <summary>
+        /// Occurs when the Selected tab has changed
+        /// </summary>
+        [Description("Occurs when the Selected tab has changed.")]
+        public event EventHandler<SuperTabStripSelectedTabChangedEventArgs> SelectedTabChanged;
+
+        /// <summary>
+        /// Occurs when the control needs a tab's bordering path
+        /// </summary>
+        [Description("Occurs when the control needs a tab's bordering path.")]
+        public event EventHandler<SuperTabGetTabItemPathEventArgs> GetTabItemPath;
+
+        /// <summary>
+        /// Occurs when the control needs a tab's Content Rectangle
+        /// </summary>
+        [Description("Occurs when the control needs a tab's Content Rectangle.")]
+        public event EventHandler<SuperTabGetTabItemContentRectangleEventArgs> GetTabItemContentRectangle;
+
+        /// <summary>
+        /// Occurs when the control needs to measure a tab
+        /// </summary>
+        [Description("Occurs when the control needs to measure a tab.")]
+        public event EventHandler<SuperTabMeasureTabItemEventArgs> MeasureTabItem;
+
+        /// <summary>
+        /// Occurs before any tab rendering is done
+        /// </summary>
+        [Description("Occurs before any tab rendering is done.")]
+        public event EventHandler<SuperTabPreRenderTabItemEventArgs> PreRenderTabItem;
+
+        /// <summary>
+        /// Occurs After all tab rendering is complete
+        /// </summary>
+        [Description("Occurs After all tab rendering is complete.")]
+        public event EventHandler<SuperTabPostRenderTabItemEventArgs> PostRenderTabItem;
+
+        /// <summary>
+        /// Occurs when the control needs to get the tab's Text Bounds
+        /// </summary>
+        [Description("Occurs when the control needs to get the tab's Text Bounds.")]
+        public event EventHandler<SuperTabGetTabTextBoundsEventArgs> GetTabTextBounds;
+
+        /// <summary>
+        /// Occurs when the control needs to get the tab's Image Bounds
+        /// </summary>
+        [Description("Occurs when the control needs to get the tab's Image Bounds.")]
+        public event EventHandler<SuperTabGetTabImageBoundsEventArgs> GetTabImageBounds;
+
+        /// <summary>
+        /// Occurs when the control needs to get the tab's Close Button Bounds
+        /// </summary>
+        [Description("Occurs when the control needs to get the tab's Close Button Bounds.")]
+        public event EventHandler<SuperTabGetTabCloseBoundsEventArgs> GetTabCloseBounds;
+
+        /// <summary>
+        /// Occurs when the TabStrip background needs painted
+        /// </summary>
+        [Description("Occurs when the TabStrip background needs painted.")]
+        public event EventHandler<SuperTabStripPaintBackgroundEventArgs> TabStripPaintBackground;
+
+        /// <summary>
+        /// Occurs when the TabStrip TabColor has changed
+        /// </summary>
+        [Description("Occurs when the TabStrip TabColor has changed.")]
+        public event EventHandler<SuperTabStripTabColorChangedEventArgs> TabStripTabColorChanged;
+
+        /// <summary>
+        /// Occurs when the TabStrip Color has changed
+        /// </summary>
+        [Description("Occurs when the TabStrip TabColor has changed.")]
+        public event EventHandler<EventArgs> TabStripColorChanged;
+
+        #endregion
+
+        #region Private variables
+
+        private eSuperTabStyle _TabStyle = eSuperTabStyle.Office2007;
+        private eSuperTabLayoutType _TabLayoutType = eSuperTabLayoutType.SingleLine;
+
+        private Image _TabCloseButtonNormal;
+        private Image _TabCloseButtonHot;
+        private Image _TabCloseButtonPressed;
+
+        private Size _TabCloseButtonSize = new Size(16, 16);
+        private Size _DefaultTabCloseButtonSize = new Size(16, 16);
+
+        private int _TabHorizontalSpacing = 5;
+        private int _TabVerticalSpacing = 4;
+
+        private bool _CloseButtonOnTabsVisible;
+        private bool _CloseButtonOnTabsAlwaysDisplayed = true;
+
+        private bool _DisplaySelectedTextOnly;
+        private bool _ShowFocusRectangle;
+        private Size _FixedTabSize = Size.Empty;
+        private bool _HorizontalText = true;
+
+        private bool _AutoCloseTabs = true;
+        private bool _AutoSelectAttachedControl;
+
+        private bool _ReorderTabsEnabled = true;
+        private bool _RotateVerticalText;
+
+        private Font _TabFont;
+        private Font _SelectedTabFont;
+        private SuperTabColorTable _TabStripColor = new SuperTabColorTable();
+
+        private SuperTabItem _HotTab;
+        private SuperTabItem _SelectedTab;
+        private BaseItem _VisibleTab;
+        private int _SelectedTabIndex;
+
+        private SuperTabControlBox _TabControlBox;
+        private SuperTabStripBaseDisplay _TabDisplay;
+        private Rectangle _TabItemsBounds;
+
+        private SuperTabItem _DesignTimeSelection;
+        private eTabStripAlignment _TabAlignment = eTabStripAlignment.Top;
+        private eTabCloseButtonPosition _CloseButtonPosition = eTabCloseButtonPosition.Right;
+
+        private SuperTabStrip _TabStrip;
+
+        private int _TabLines;
+        private eItemAlignment _TextAlignment;
+
+        private eSuperTabArea _TabArea;
+        private SuperTabItem _MouseDownTab;
+        private Point _MouseDownLocation;
+        private bool _IsTabDragging;
+        private SuperTabDragWindow _TabDragWindow;
+
+        private BaseItem _InsertTab;
+        private bool _InsertBefore;
+        private bool _RecalcInProgress;
+
+        private Padding _ItemPadding;
+        private ImageAlignment _ImageAlignment = ImageAlignment.NotSet;
+
+        #endregion
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="tabStrip">Associated SuperTabStrip</param>
+        public SuperTabStripItem(SuperTabStrip tabStrip)
+        {
+            _TabStrip = tabStrip;
+
+            _TabControlBox = new SuperTabControlBox(this);
+            _TabDisplay = new Office2007SuperTabStrip(this);
+            _ItemPadding = new Padding(0, 0, 0, 0);
+            
+            SetIsContainer(true);
+
+            HookEvents(true);
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            if (BarUtilities.DisposeItemImages && !DesignMode)
+            {
+                BarUtilities.DisposeImage(ref _TabCloseButtonNormal);
+                BarUtilities.DisposeImage(ref _TabCloseButtonHot);
+                BarUtilities.DisposeImage(ref _TabCloseButtonPressed);
+            }
+
+            if (disposing)
+                _TabControlBox.Dispose();
+
+            base.Dispose(disposing);
+        }
+
+        #region Public properties
+
+        #region AutoCloseTabs
+
+        /// <summary>
+        /// Gets or sets AutoCloseTabs
+        /// </summary>
+        public bool AutoCloseTabs
+        {
+            get { return (_AutoCloseTabs); }
+            set { _AutoCloseTabs = value; }
+        }
+
+        #endregion
+
+        #region AutoSelectAttachedControl
+
+        /// <summary>
+        /// Gets or sets whether the control attached to the TabItem.AttachedControl property
+        /// is automatically selected when TabItem becomes the selected tab. Default value is true.
+        /// </summary>
+        public bool AutoSelectAttachedControl
+        {
+            get { return (_AutoSelectAttachedControl); }
+            set { _AutoSelectAttachedControl = value; }
+        }
+
+        #endregion
+
+        #region CloseButton properties
+
+        #region TabCloseButtonNormal
+
+        /// <summary>
+        /// Gets or sets TabCloseButtonNormal
+        /// </summary>
+        public Image TabCloseButtonNormal
+        {
+            get { return (_TabCloseButtonNormal); }
+
+            set
+            {
+                _TabCloseButtonNormal = value;
+
+                _TabCloseButtonSize = (_TabCloseButtonNormal != null)
+                    ? _TabCloseButtonNormal.Size : _DefaultTabCloseButtonSize;
+
+                MyRefresh();
+            }
+        }
+
+        #endregion
+
+        #region TabCloseButtonHot
+
+        /// <summary>
+        /// Gets or sets TabCloseButtonHot
+        /// </summary>
+        public Image TabCloseButtonHot
+        {
+            get { return (_TabCloseButtonHot); }
+
+            set
+            {
+                _TabCloseButtonHot = value;
+
+                MyRefresh();
+            }
+        }
+
+        #endregion
+
+        #region TabCloseButtonPressed
+
+        /// <summary>
+        /// Gets or sets TabCloseButtonPressed
+        /// </summary>
+        public Image TabCloseButtonPressed
+        {
+            get { return (_TabCloseButtonPressed); }
+
+            set
+            {
+                _TabCloseButtonPressed = value;
+
+                MyRefresh();
+            }
+        }
+
+        #endregion
+
+        #region TabHorizontalSpacing
+
+        /// <summary>
+        /// Gets or sets TabHorizontalSpacing
+        /// </summary>
+        public int TabHorizontalSpacing
+        {
+            get { return (_TabHorizontalSpacing); }
+
+            set
+            {
+                if (_TabHorizontalSpacing != value)
+                {
+                    _TabHorizontalSpacing = value;
+
+                    MyRefresh();
+                }
+            }
+        }
+
+        #endregion
+
+        #region TabVerticalSpacing
+
+        /// <summary>
+        /// Gets or sets TabVerticalSpacing
+        /// </summary>
+        public int TabVerticalSpacing
+        {
+            get { return (_TabVerticalSpacing); }
+
+            set
+            {
+                if (_TabVerticalSpacing != value)
+                {
+                    _TabVerticalSpacing = value;
+
+                    MyRefresh();
+                }
+            }
+        }
+
+        #endregion
+
+        #region CloseButtonOnTabsVisible
+
+        /// <summary>
+        /// Gets or sets CloseButtonOnTabsVisible
+        /// </summary>
+        public bool CloseButtonOnTabsVisible
+        {
+            get { return (_CloseButtonOnTabsVisible); }
+
+            set
+            {
+                if (_CloseButtonOnTabsVisible != value)
+                {
+                    _CloseButtonOnTabsVisible = value;
+
+                    MyRefresh();
+                }
+            }
+        }
+
+        #endregion
+
+        #region CloseButtonOnTabsAlwaysDisplayed
+
+        /// <summary>
+        /// Gets or sets CloseButtonOnTabsAlwaysDisplayed
+        /// </summary>
+        public bool CloseButtonOnTabsAlwaysDisplayed
+        {
+            get { return (_CloseButtonOnTabsAlwaysDisplayed); }
+
+            set
+            {
+                if (_CloseButtonOnTabsAlwaysDisplayed != value)
+                {
+                    _CloseButtonOnTabsAlwaysDisplayed = value;
+
+                    MyRefresh();
+                }
+            }
+        }
+
+        #endregion
+
+        #region CloseButtonPosition
+
+        /// <summary>
+        /// Gets or sets CloseButtonPosition
+        /// </summary>
+        public eTabCloseButtonPosition CloseButtonPosition
+        {
+            get { return _CloseButtonPosition; }
+
+            set
+            {
+                _CloseButtonPosition = value;
+
+                MyRefresh();
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ControlBox
+
+        /// <summary>
+        /// Gets the ControlBox
+        /// </summary>
+        public SuperTabControlBox ControlBox
+        {
+            get { return (_TabControlBox); }
+        }
+
+        #endregion
+
+        #region DesignTimeSelection
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public SuperTabItem DesignTimeSelection
+        {
+            get { return _DesignTimeSelection; }
+
+            set
+            {
+                _DesignTimeSelection = value;
+
+                Refresh();
+            }
+        }
+
+        #endregion
+
+        #region DisplaySelectedTextOnly
+
+        /// <summary>
+        /// Gets or sets DisplaySelectedTextOnly
+        /// </summary>
+        public bool DisplaySelectedTextOnly
+        {
+            get { return _DisplaySelectedTextOnly; }
+
+            set
+            {
+                _DisplaySelectedTextOnly = value;
+
+                MyRefresh();
+            }
+        }
+
+        #endregion
+
+        #region Expanded
+
+        /// <summary>
+        /// Gets or set the Expanded state
+        /// </summary>
+        public override bool Expanded
+        {
+            get { return (base.Expanded); }
+
+            set
+            {
+                base.Expanded = value;
+
+                for (int i = 0; i < SubItems.Count; i++)
+                    SubItems[i].Expanded = value;
+
+                if (ControlBox.Visible == true)
+                {
+                    ControlBox.Expanded = value;
+
+                    for (int i = 0; i < ControlBox.SubItems.Count; i++)
+                        ControlBox.SubItems[i].Expanded = value;
+                }
+            }
+        }
+
+        #endregion
+
+        #region Font properties
+
+        #region TabFont
+
+        /// <summary>
+        /// Gets or sets the tab font
+        /// </summary>
+        public Font TabFont
+        {
+            get { return (_TabFont); }
+
+            set
+            {
+                _TabFont = value;
+
+                ClearSizingFont();
+
+                MyRefresh();
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeTabFont()
+        {
+            return (_TabFont != null);
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetTabFont()
+        {
+            TabFont = null;
+        }
+
+        #region ClearSizingFont
+
+        private void ClearSizingFont()
+        {
+            foreach (BaseItem item in SubItems)
+            {
+                SuperTabItem tab = item as SuperTabItem;
+
+                if (tab != null)
+                    tab.SizingFont = null;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region SelectedTabFont
+
+        /// <summary>
+        /// Gets or sets the selected tab font
+        /// </summary>
+        public Font SelectedTabFont
+        {
+            get { return (_SelectedTabFont); }
+
+            set
+            {
+                _SelectedTabFont = value;
+
+                ClearSizingFont();
+
+                MyRefresh();
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeSelectedTabFont()
+        {
+            return (_SelectedTabFont != null);
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetSelectedTabFont()
+        {
+            SelectedTabFont = null;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region HorizontalText
+
+        /// <summary>
+        /// Gets or sets the HorizontalText
+        /// </summary>
+        public bool HorizontalText
+        {
+            get { return (_HorizontalText); }
+
+            set
+            {
+                _HorizontalText = value;
+
+                MyRefresh();
+            }
+        }
+
+        #endregion
+
+        #region ImageAlignment
+
+        /// <summary>
+        /// Gets or sets the default alignment of the Image within the tab
+        /// </summary>
+        [DefaultValue(ImageAlignment.NotSet), Category("Appearance")]
+        [Description("Indicates the default alignment of the Image within the tab.")]
+        public ImageAlignment ImageAlignment
+        {
+            get { return (_ImageAlignment); }
+
+            set
+            {
+                if (_ImageAlignment != value)
+                {
+                    _ImageAlignment = value;
+
+                    MyRefresh();
+                }
+            }
+        }
+
+        #endregion
+
+        #region ItemPadding
+
+        /// <summary>
+        /// Gets or sets the BaseItem tab padding.
+        /// </summary>
+        public Padding ItemPadding
+        {
+            get { return (_ItemPadding); }
+            set { _ItemPadding = value; }
+        }
+
+        #endregion
+
+        #region RotateVerticalText
+
+        /// <summary>
+        /// Gets or sets RotateVerticalText
+        /// </summary>
+        public bool RotateVerticalText
+        {
+            get { return (_RotateVerticalText); }
+
+            set
+            {
+                _RotateVerticalText = value;
+
+                MyRefresh();
+            }
+        }
+
+        #endregion
+
+        #region ShowFocusRectangle
+
+        /// <summary>
+        /// Gets or sets ShowFocusRectangle
+        /// </summary>
+        public bool ShowFocusRectangle
+        {
+            get { return (_ShowFocusRectangle); }
+            set { _ShowFocusRectangle = value; }
+        }
+
+        #endregion
+
+        #region Tab properties
+
+        #region FixedTabSize
+
+        /// <summary>
+        /// Gets or sets the FixedTabSize
+        /// </summary>
+        public Size FixedTabSize
+        {
+            get { return _FixedTabSize; }
+
+            set
+            {
+                value.Width = Math.Max(0, value.Width);
+                value.Height = Math.Max(0, value.Height);
+
+                if ((value.Width > 0 || value.Height > 0) && _TabDisplay != null)
+                {
+                    Size minSize = _TabDisplay.MinTabSize;
+
+                    if (value.Width > 0)
+                    {
+                        if (minSize.Width > value.Width)
+                            value.Width = minSize.Width;
+                    }
+
+                    if (value.Height > 0)
+                    {
+                        if (minSize.Height > value.Height)
+                            value.Height = minSize.Height;
+                    }
+                }
+
+                if (_FixedTabSize != value)
+                {
+                    _FixedTabSize = value;
+
+                    MyRefresh();
+                }
+            }
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeFixedTabSize()
+        {
+            return (_FixedTabSize.IsEmpty == false);
+        }
+
+        #endregion
+
+        #region IsTabDragging
+
+        /// <summary>
+        /// Gets or sets 
+        /// </summary>
+        public bool IsTabDragging
+        {
+            get { return (_IsTabDragging); }
+            internal set { _IsTabDragging = value; }
+        }
+
+        #endregion
+
+        #region MinTabStripHeight
+
+        /// <summary>
+        /// Gets the MinTabStripHeight
+        /// </summary>
+        public int MinTabStripHeight
+        {
+            get { return (_TabDisplay.MinTabStripHeight); }
+        }
+
+        #endregion
+
+        #region ReorderTabsEnabled
+
+        /// <summary>
+        /// Gets or sets ReorderTabsEnabled
+        /// </summary>
+        public bool ReorderTabsEnabled
+        {
+            get { return (_ReorderTabsEnabled); }
+            set { _ReorderTabsEnabled = value; }
+        }
+
+        #endregion
+
+        #region SelectedTab
+
+        /// <summary>
+        /// Gets or sets the selected tab
+        /// </summary>
+        public SuperTabItem SelectedTab
+        {
+            get { return (_SelectedTab); }
+
+            set
+            {
+                if (value != null)
+                {
+                    if (value.Visible == true)
+                        SelectTab(value, eEventSource.Code);
+                }
+                else
+                {
+                    SelectTab(null, eEventSource.Code);
+                }
+            }
+        }
+
+        #endregion
+
+        #region SelectedTabIndex
+
+        /// <summary>
+        /// Gets or sets the selected tab index
+        /// </summary>
+        public int SelectedTabIndex
+        {
+            get
+            {
+                if (_SelectedTab != null)
+                    return (SubItems.IndexOf(_SelectedTab));
+
+                return (-1);
+            }
+
+            set
+            {
+                if (value >= 0 && value < SubItems.Count)
+                {
+                    SuperTabItem tab = SubItems[value] as SuperTabItem;
+
+                    if (tab != null)
+                    {
+                        if (tab.Visible == true)
+                            SelectedTab = tab;
+                    }
+                    else
+                    {
+                        SelectedTab = null;
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region TabAlignment
+
+        /// <summary>
+        /// Gets or sets the tab alignment
+        /// </summary>
+        public eTabStripAlignment TabAlignment
+        {
+            get { return (_TabAlignment); }
+
+            set
+            {
+                if (_TabAlignment != value)
+                {
+                    _TabAlignment = value;
+
+                    SyncOrientation();
+                    MyRefresh();
+                }
+            }
+        }
+
+        #region SyncOrientation
+
+        /// <summary>
+        /// Syncs the Orientation of each SubItem to
+        /// the current TabAlignment Orientation
+        /// </summary>
+        private void SyncOrientation()
+        {
+            eDesignMarkerOrientation orientation = GetTabAlignmentBasedOrientation();
+
+            foreach (BaseItem item in SubItems)
+                item.DesignMarkerOrientation = orientation;
+        }
+
+        #endregion
+
+        #region GetTabAlignmentBasedOrientation
+
+        /// <summary>
+        /// Gets the Orientation based upon the current
+        /// TabAlignment
+        /// </summary>
+        /// <returns></returns>
+        private eDesignMarkerOrientation GetTabAlignmentBasedOrientation()
+        {
+            return ((IsVertical == true)
+                ? eDesignMarkerOrientation.Vertical
+                : eDesignMarkerOrientation.Horizontal);
+        }
+
+        #endregion
+
+        #region OnItemAdded
+
+        /// <summary>
+        /// Makes sure all newly added items
+        /// are set to the design orientation and style
+        /// </summary>
+        /// <param name="item"></param>
+        protected internal override void OnItemAdded(BaseItem item)
+        {
+            item.DesignMarkerOrientation = GetTabAlignmentBasedOrientation();
+            item.Style = GetStyleFromTabStyle();
+
+            base.OnItemAdded(item);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region TabLayoutType
+
+        /// <summary>
+        /// Gets or sets the TabLayoutType
+        /// </summary>
+        public eSuperTabLayoutType TabLayoutType
+        {
+            get { return (_TabLayoutType); }
+
+            set
+            {
+                _TabLayoutType = value;
+                _TabControlBox.Bounds = Rectangle.Empty;
+
+                OnTabStyleChanged();
+
+                MyRefresh();
+            }
+        }
+
+        #endregion
+
+        #region TabStripColor
+
+        /// <summary>
+        /// Gets or sets the TabStripColor
+        /// </summary>
+        public SuperTabColorTable TabStripColor
+        {
+            get { return (_TabStripColor); }
+
+            set
+            {
+                if (_TabStripColor.Equals(value) == false)
+                {
+                    if (_TabStripColor != null)
+                        _TabStripColor.ColorTableChanged -= ColorTableColorTableChanged;
+
+                    _TabStripColor = value;
+
+                    if (value != null)
+                        _TabStripColor.ColorTableChanged += ColorTableColorTableChanged;
+
+                    OnTabStripColorChanged();
+
+                    MyRefresh();
+                }
+            }
+        }
+
+        #endregion
+
+        #region TabStyle
+
+        /// <summary>
+        /// Gets or sets the TabStyle
+        /// </summary>
+        public eSuperTabStyle TabStyle
+        {
+            get { return (_TabStyle); }
+
+            set
+            {
+                if (_TabStyle != value)
+                {
+                    _TabStyle = value;
+
+                    switch (value)
+                    {
+                        case eSuperTabStyle.Office2007:
+                            _TabDisplay = new Office2007SuperTabStrip(this);
+                            break;
+
+                        case eSuperTabStyle.Office2010BackstageBlue:
+                            _TabDisplay = new Office2010BackstageSuperTabStrip(this);
+                            break;
+
+                        case eSuperTabStyle.OneNote2007:
+                            _TabDisplay = new OneNote2007SuperTabStrip(this);
+                            break;
+
+                        case eSuperTabStyle.OfficeMobile2014:
+                            _TabDisplay = new OfficeMobile2014SuperTabStrip(this);
+                            break;
+
+                        case eSuperTabStyle.VisualStudio2008Dock:
+                            _TabDisplay = new VS2008DockSuperTabStrip(this);
+                            break;
+
+                        case eSuperTabStyle.VisualStudio2008Document:
+                            _TabDisplay = new VS2008DocumentSuperTabStrip(this);
+                            break;
+
+                        case eSuperTabStyle.WinMediaPlayer12:
+                            _TabDisplay = new WinMediaPlayer12SuperTabStrip(this);
+                            break;
+                    }
+
+                    ApplyTabStyle();
+                }
+            }
+        }
+
+        #region ApplyTabStyle
+
+        /// <summary>
+        /// Applies the current TabStyle to each tab and
+        /// sets the item style to the DotNetBarStyle from the TabStyle
+        /// </summary>
+        private void ApplyTabStyle()
+        {
+            eDotNetBarStyle style = GetStyleFromTabStyle();
+
+            foreach (BaseItem item in SubItems)
+            {
+                SuperTabItem tab = item as SuperTabItem;
+
+                if (tab != null)
+                    tab.TabStyle = _TabStyle;
+
+                item.Style = style;
+            }
+
+            TabStrip.RecalcLayout();
+        }
+
+        #endregion
+
+        #region GetStyleFromTabStyle
+
+        /// <summary>
+        /// Gets the DotNetBarStyle from the SuperTabStyle
+        /// </summary>
+        /// <returns>eDotNetBarStyle</returns>
+        private eDotNetBarStyle GetStyleFromTabStyle()
+        {
+            eDotNetBarStyle style = eDotNetBarStyle.StyleManagerControlled;
+            eSuperTabStyle tabStyle = _TabStyle;
+
+            if (tabStyle == eSuperTabStyle.VisualStudio2008Dock ||
+                tabStyle == eSuperTabStyle.VisualStudio2008Document)
+            {
+                style = eDotNetBarStyle.VS2005;
+            }
+
+            return style;
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region TextAlignment
+
+        /// <summary>
+        /// Gets or sets the TextAlignment
+        /// </summary>
+        public eItemAlignment TextAlignment
+        {
+            get { return (_TextAlignment); }
+
+            set
+            {
+                if (_TextAlignment != value)
+                {
+                    _TextAlignment = value;
+
+                    Refresh();
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Internal properties
+
+        #region FirstVisibleTab
+
+        /// <summary>
+        /// Gets the First Visible Tab
+        /// </summary>
+        internal SuperTabItem FirstVisibleTab
+        {
+            get
+            {
+                for (int i = 0; i < SubItems.Count; i++)
+                {
+                    BaseItem item = SubItems[i];
+
+                    if (item is SuperTabItem)
+                    {
+                        if (item.Visible == true &&
+                            (item.Enabled == true || DesignMode == true))
+                        {
+                            return ((SuperTabItem)item);
+                        }
+                    }
+                }
+
+                return (null);
+            }
+        }
+
+        #endregion
+
+        #region HotTab
+
+        /// <summary>
+        /// Gets the HotTab
+        /// </summary>
+        internal SuperTabItem HotTab
+        {
+            get { return (_HotTab); }
+        }
+
+        #endregion
+
+        #region InsertTab
+
+        /// <summary>
+        /// Gets the InsertTab
+        /// </summary>
+        internal BaseItem InsertTab
+        {
+            get { return (_InsertTab); }
+        }
+
+        #endregion
+
+        #region InsertBefore
+
+        /// <summary>
+        /// Gets whether to insert before or after
+        /// </summary>
+        internal bool InsertBefore
+        {
+            get { return (_InsertBefore); }
+        }
+
+        #endregion
+
+        #region MouseOverTab
+
+        /// <summary>
+        /// Gets the MouseOver tab
+        /// </summary>
+        internal SuperTabItem MouseOverTab
+        {
+            get { return (_HotTab); }
+        }
+
+        #endregion
+
+        #region IsVertical
+
+        /// <summary>
+        /// Gets TabStrip vertical orientation
+        /// </summary>
+        internal bool IsVertical
+        {
+            get
+            {
+                return (_TabAlignment == eTabStripAlignment.Left ||
+                    _TabAlignment == eTabStripAlignment.Right);
+            }
+        }
+
+        #endregion
+
+        #region LastVisibleTab
+
+        /// <summary>
+        /// Gets the Last Visible Tab
+        /// </summary>
+        internal SuperTabItem LastVisibleTab
+        {
+            get
+            {
+                for (int i = SubItems.Count - 1; i >= 0; i--)
+                {
+                    BaseItem item = SubItems[i];
+
+                    if (item is SuperTabItem)
+                    {
+                        if (item.Visible == true &&
+                            (item.Enabled == true || DesignMode == true))
+                        {
+                            return ((SuperTabItem)item);
+                        }
+                    }
+                }
+
+                return (null);
+            }
+        }
+
+        #endregion
+
+        #region TabCloseButtonSize
+
+        /// <summary>
+        /// Gets the tab close button size
+        /// </summary>
+        internal Size TabCloseButtonSize
+        {
+            get { return (_TabCloseButtonSize); }
+        }
+
+        #endregion
+
+        #region TabDisplay
+
+        /// <summary>
+        /// Gets the TabDisplay
+        /// </summary>
+        internal SuperTabStripBaseDisplay TabDisplay
+        {
+            get { return (_TabDisplay); }
+        }
+
+        #endregion
+
+        #region TabItemsBounds
+
+        /// <summary>
+        /// Gets or sets the TabItemsBounds
+        /// </summary>
+        internal Rectangle TabItemsBounds
+        {
+            get { return (_TabItemsBounds); }
+            set { _TabItemsBounds = value; }
+        }
+
+        #endregion
+
+        #region TabLines
+
+        /// <summary>
+        /// Gets or sets the number of TabLines
+        /// </summary>
+        internal int TabLines
+        {
+            get { return (_TabLines); }
+            set { _TabLines = value; }
+        }
+
+        #endregion
+
+        #region TabStrip
+
+        /// <summary>
+        /// Gets the TabStrip
+        /// </summary>
+        internal SuperTabStrip TabStrip
+        {
+            get { return (_TabStrip); }
+        }
+
+        #endregion
+
+        #region VisibleTabCount
+
+        /// <summary>
+        /// Gets the visible tab count
+        /// </summary>
+        internal int VisibleTabCount
+        {
+            get
+            {
+                int count = 0;
+
+                for (int i = 0; i < SubItems.Count; i++)
+                {
+                    if (SubItems[i].Parent != null && SubItems[i].Visible)
+                        count++;
+                }
+
+                return (count);
+            }
+        }
+
+        #endregion
+
+        #region VisibleTab
+
+        /// <summary>
+        /// Gets or sets the promoted visible tab
+        /// </summary>
+        internal BaseItem VisibleTab
+        {
+            get { return (_VisibleTab ?? _SelectedTab); }
+
+            set
+            {
+                if (_VisibleTab != value)
+                {
+                    _VisibleTab = value;
+
+                    MyRefresh();
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region HookEvents
+
+        /// <summary>
+        /// Hooks or unhooks our events
+        /// </summary>
+        /// <param name="hook"></param>
+        private void HookEvents(bool hook)
+        {
+            if (hook == true)
+                SubItemsChanged += SuperTabStripItemSubItemsChanged;
+            else
+                SubItemsChanged -= SuperTabStripItemSubItemsChanged;
+        }
+
+        #endregion
+
+        #region Event processing
+
+        #region SubItemsChanged
+
+        /// <summary>
+        /// Handles SubItemsChanged events
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void SuperTabStripItemSubItemsChanged(object sender, CollectionChangeEventArgs e)
+        {
+            switch (e.Action)
+            {
+                case CollectionChangeAction.Add:
+                    TabItemAdded(e.Element as BaseItem);
+                    break;
+
+                case CollectionChangeAction.Remove:
+                    TabItemRemoved(e.Element as BaseItem);
+                    break;
+
+                case CollectionChangeAction.Refresh:
+                    MyRefresh();
+                    break;
+            }
+        }
+
+        #endregion
+
+        #region TabItemAdded
+
+        /// <summary>
+        /// Handles newly added items
+        /// </summary>
+        /// <param name="item"></param>
+        internal void TabItemAdded(BaseItem item)
+        {
+            SuperTabItem tab = item as SuperTabItem;
+
+            if (tab != null)
+            {
+                tab.TabStripItem = this;
+                //tab.Visible = true;
+
+                tab.TabColorChanged += TabTabColorChanged;
+
+                if (TabItemOpen != null)
+                {
+                    SuperTabStripTabItemOpenEventArgs args =
+                        new SuperTabStripTabItemOpenEventArgs(tab);
+
+                    TabItemOpen(this, args);
+                }
+
+                if (tab.Visible == true)
+                {
+                    if (SelectedTab == null && VisibleTabCount == 1)
+                        SelectedTab = tab;
+                }
+            }
+
+            MyRefresh();
+        }
+
+        #endregion
+
+        #region TabRemoved
+
+        /// <summary>
+        /// Handles newly removed items
+        /// </summary>
+        /// <param name="item"></param>
+        internal void TabItemRemoved(BaseItem item)
+        {
+            if (TabRemoved != null)
+            {
+                SuperTabStripTabRemovedEventArgs args = new
+                    SuperTabStripTabRemovedEventArgs(item);
+
+                TabRemoved(this, args);
+            }
+
+            SuperTabItem tab = item as SuperTabItem;
+
+            if (tab != null)
+            {
+                tab.TabColorChanged -= TabTabColorChanged;
+
+                SuperTabControlPanel panel = tab.AttachedControl as SuperTabControlPanel;
+
+                if (panel != null)
+                    panel.PanelColorChanged -= TabTabColorChanged;
+
+                if (SelectedTab == tab)
+                    OnSelectedTabRemoved(_SelectedTabIndex, tab);
+
+                if (VisibleTabCount == 0)
+                    SelectedTab = null;
+            }
+
+            Refresh();
+        }
+
+        #endregion
+
+        #region Tab_TabColorChanged
+
+        /// <summary>
+        /// Handles tab color changes
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void TabTabColorChanged(object sender, EventArgs e)
+        {
+            if (TabStripTabColorChanged != null)
+            {
+                SuperTabItem tab = sender as SuperTabItem;
+
+                if (tab != null)
+                {
+                    TabStripTabColorChanged(this,
+                        new SuperTabStripTabColorChangedEventArgs(tab));
+                }
+            }
+
+            Refresh();
+        }
+
+        #endregion
+
+        #region ColorTable_ColorTableChanged
+
+        /// <summary>
+        /// Handles color table changes
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void ColorTableColorTableChanged(object sender, EventArgs e)
+        {
+            OnTabStripColorChanged();
+        }
+
+        #endregion
+
+        #endregion
+
+        #region MyRefresh
+
+        /// <summary>
+        /// Performs NeedRecalcSize and refresh
+        /// </summary>
+        private void MyRefresh()
+        {
+            NeedRecalcSize = true;
+            Refresh();
+        }
+
+        #endregion
+
+        #region RecalcSize
+
+        /// <summary>
+        /// Recalculates the size of the tabs.
+        /// </summary>
+        public override void RecalcSize()
+        {
+            if (SuspendLayout == false && BarFunctions.IsHandleValid(this.ContainerControl as Control)) // Do not force Control to create Handle by going through RecalcSize since it will break layout on controls
+            {
+                if (_RecalcInProgress == false)
+                {
+                    try
+                    {
+                        _RecalcInProgress = true;
+
+                        RecalcDisplaySize();
+                    }
+                    finally
+                    {
+                        _RecalcInProgress = false;
+                    }
+                }
+            }
+        }
+
+        #region RecalcDisplaySize
+
+        private void RecalcDisplaySize()
+        {
+            base.RecalcSize();
+
+            Control container = ContainerControl as Control;
+
+            if (container != null)
+            {
+                using (Graphics g = BarFunctions.CreateGraphics(container))
+                {
+                    if (_TabControlBox.Visible == true)
+                    {
+                        _TabControlBox.RecalcSize();
+
+                        if (DesignMode == false)
+                            _TabControlBox.Displayed = true;
+                    }
+
+                    _TabDisplay.RecalcSize(g);
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region EnsureVisible
+
+        /// <summary>
+        /// Ensures that the given item is visible on the TabStrip
+        /// </summary>
+        /// <param name="item"></param>
+        public void EnsureVisible(BaseItem item)
+        {
+            VisibleTab = item;
+        }
+
+        #endregion
+
+        #region SelectTab
+
+        /// <summary>
+        /// Selects the given tab
+        /// </summary>
+        /// <param name="tab"></param>
+        /// <param name="eventSource"></param>
+        public void SelectTab(SuperTabItem tab, eEventSource eventSource)
+        {
+            if (tab != null &&
+                (tab.Enabled == true || DesignMode == true))
+            {
+                bool refresh = (_VisibleTab != tab || _SelectedTab != tab);
+
+                if (_SelectedTab != tab)
+                {
+                    SuperTabControl tc = _TabStrip.Parent as SuperTabControl;
+
+                    if (tc != null && tc.ValidateFormOnTabSelection)
+                    {
+                        Form form = tc.FindForm();
+
+                        if (form != null)
+                        {
+                            if (form.Validate() == false)
+                                return;
+                        }
+                    }
+
+                    SuperTabItem oldTab = _SelectedTab;
+
+                    if (OnSelectedTabChanging(tab, eventSource) == false)
+                    {
+                        _VisibleTab = tab;
+
+                        OnBeforeTabDisplay(tab);
+
+                        Control hideControl = null;
+
+                        if (_SelectedTab != null && _SelectedTab.AttachedControl != null)
+                            hideControl = _SelectedTab.AttachedControl;
+
+                        _SelectedTab = tab;
+                        _SelectedTabIndex = SubItems.IndexOf(tab);
+
+                        if (_SelectedTab.AttachedControl != null)
+                        {                        
+                            _SelectedTab.AttachedControl.BringToFront();
+                            _SelectedTab.AttachedControl.Visible = true;
+
+                            if (tc != null)
+                            {
+                                bool select = !(tc.TabStop && tc.Focused && eventSource == eEventSource.Keyboard);
+
+                                if (_AutoSelectAttachedControl && select)
+                                    _SelectedTab.AttachedControl.Select();
+                            }
+
+                            if (hideControl == _SelectedTab.AttachedControl)
+                                hideControl = null;
+                        }
+
+                        if (hideControl != null)
+                            hideControl.Visible = false;
+
+                        OnSelectedTabChanged(oldTab, _SelectedTab, eventSource);
+                    }
+                }
+
+                if (refresh == true)
+                    MyRefresh();
+            }
+            else
+            {
+                _SelectedTab = null;
+
+                MyRefresh();
+            }
+        }
+
+        #endregion
+
+        #region SelectPreviousTab
+
+        /// <summary>
+        /// Selects the previous tab
+        /// </summary>
+        /// <returns></returns>
+        public bool SelectPreviousTab()
+        {
+            return SelectPreviousTab(eEventSource.Code);
+        }
+
+        /// <summary>
+        /// Selects the previous tab
+        /// </summary>
+        /// <returns></returns>
+        internal bool SelectPreviousTab(eEventSource eventSource)
+        {
+            if (SelectedTab != null && SubItems.IndexOf(SelectedTab) > 0)
+            {
+                for (int i = SubItems.IndexOf(SelectedTab) - 1; i >= 0; i--)
+                {
+                    BaseItem item = SubItems[i];
+
+                    if (item.Visible == true &&
+                        (item.Enabled == true || DesignMode == true))
+                    {
+                        if (item is SuperTabItem)
+                        {
+                            SelectTab((SuperTabItem)item, eventSource);
+                            return (true);
+                        }
+                    }
+                }
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region SelectNextTab
+
+        /// <summary>
+        /// Selects the next tab
+        /// </summary>
+        /// <returns></returns>
+        public bool SelectNextTab()
+        {
+            return SelectNextTab(eEventSource.Code);
+        }
+
+        /// <summary>
+        /// Selects the next tab
+        /// </summary>
+        /// <returns></returns>
+        internal bool SelectNextTab(eEventSource eventSource)
+        {
+            if (SelectedTab != null && SubItems.IndexOf(SelectedTab) < SubItems.Count)
+            {
+                for (int i = SubItems.IndexOf(SelectedTab) + 1; i < SubItems.Count; i++)
+                {
+                    BaseItem item = SubItems[i];
+
+                    if (item.Visible == true &&
+                        (item.Enabled == true || DesignMode == true))
+                    {
+                        if (item is SuperTabItem)
+                        {
+                            SelectTab((SuperTabItem)item, eventSource);
+                            return (true);
+                        }
+                    }
+                }
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region SelectNewTab
+
+        internal void SelectNewTab(BaseItem item)
+        {
+            SelectNewTab(Math.Max(0, SubItems.IndexOf(item)));
+        }
+
+        internal void SelectNewTab(int index)
+        {
+            SubItemsCollection items = SubItems;
+
+            int k = GetNextSelectableTab(items, index);
+
+            if (k < 0)
+                k = GetPrevSelectableTab(items, index);
+
+            if (k >= 0)
+            {
+                SelectTab(items[k] as SuperTabItem, eEventSource.Code);
+
+                RecalcSize();
+            }
+            else
+            {
+                SelectedTab = null;
+            }
+        }
+
+        #endregion
+
+        #region GetNewSelectTab
+
+        internal SuperTabItem GetNewSelectTab(int index)
+        {
+            SubItemsCollection items = SubItems;
+
+            if ((uint) index < items.Count)
+            {
+                int k = GetNextSelectableTab(items, index);
+
+                if (k < 0)
+                    k = GetPrevSelectableTab(items, index);
+
+                if (k >= 0)
+                    return (items[k] as SuperTabItem);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetNextSelectableTab
+
+        internal int GetNextSelectableTab(SuperTabItem tab)
+        {
+            SubItemsCollection items = SubItems;
+
+            return (GetNextSelectableTab(items, items.IndexOf(tab)));
+        }
+
+        internal int GetNextSelectableTab(SubItemsCollection items, int n)
+        {
+            n = Math.Max(n, 0);
+
+            for (int i = n; i < items.Count; i++)
+            {
+                SuperTabItem tab = items[i] as SuperTabItem;
+
+                if (tab != null && tab.Parent != null && tab.Visible && tab.Enabled)
+                    return (i);
+            }
+
+            return (-1);
+        }
+
+        #endregion
+
+        #region GetPrevSelectableTab
+
+        internal int GetPrevSelectableTab(SuperTabItem tab)
+        {
+            SubItemsCollection items = SubItems;
+
+            return (GetPrevSelectableTab(items, items.IndexOf(tab)));
+        }
+
+        internal int GetPrevSelectableTab(SubItemsCollection items, int n)
+        {
+            n = Math.Min(n, items.Count - 1);
+
+            for (int i = n; i >= 0; i--)
+            {
+                SuperTabItem tab = items[i] as SuperTabItem;
+
+                if (tab != null && tab.Parent != null && tab.Visible && tab.Enabled)
+                    return (i);
+            }
+
+            return (-1);
+        }
+
+        #endregion
+
+        #region GetNextVisibleTab
+
+        internal int GetNextVisibleTab(SubItemsCollection items, int n)
+        {
+            n = Math.Max(n, 0);
+
+            for (int i = n; i < items.Count; i++)
+            {
+                SuperTabItem tab = items[i] as SuperTabItem;
+
+                if (tab != null && tab.Parent != null && tab.Visible)
+                    return (i);
+            }
+
+            return (-1);
+        }
+
+        #endregion
+
+        #region GetPrevVisibleTab
+
+        internal int GetPrevVisibleTab(SubItemsCollection items, int n)
+        {
+            n = Math.Min(n, items.Count - 1);
+
+            for (int i = n; i >= 0; i--)
+            {
+                SuperTabItem tab = items[i] as SuperTabItem;
+
+                if (tab != null && tab.Parent != null && tab.Visible)
+                    return (i);
+            }
+
+            return (-1);
+        }
+
+        #endregion
+
+        #region UpdateSelectedTab
+
+        /// <summary>
+        /// UpdateSelectedTab
+        /// </summary>
+        internal void UpdateSelectedTab()
+        {
+            if (DesignMode == false)
+                SelectNewTab(SelectedTab);
+
+            RecalcSize();
+        }
+
+        #endregion
+
+        #region "On" processing
+
+        #region OnTabStyleChanged
+
+        /// <summary>
+        /// OnTabStyleChanged
+        /// </summary>
+        private void OnTabStyleChanged()
+        {
+            MyRefresh();
+
+            EnsureVisible(SelectedTab);
+        }
+
+        #endregion
+
+        #region OnMeasureTabItem
+
+        /// <summary>
+        /// OnMeasureTabItem
+        /// </summary>
+        /// <param name="tab"></param>
+        /// <param name="size"></param>
+        /// <param name="g"></param>
+        /// <returns></returns>
+        internal Size OnMeasureTabItem(SuperTabItem tab, Size size, Graphics g)
+        {
+            if (MeasureTabItem != null)
+            {
+                SuperTabMeasureTabItemEventArgs args =
+                    new SuperTabMeasureTabItemEventArgs(tab, size, g);
+
+                MeasureTabItem(this, args);
+
+                return (args.Size);
+            }
+
+            return (size);
+        }
+
+        #endregion
+
+        #region OnPreRenderTabItem
+
+        /// <summary>
+        /// OnPreRenderTabItem
+        /// </summary>
+        /// <param name="tab"></param>
+        /// <param name="g"></param>
+        /// <returns></returns>
+        internal bool OnPreRenderTabItem(SuperTabItem tab, Graphics g)
+        {
+            if (PreRenderTabItem != null)
+            {
+                SuperTabPreRenderTabItemEventArgs args =
+                    new SuperTabPreRenderTabItemEventArgs(tab, g);
+
+                PreRenderTabItem(this, args);
+
+                return (args.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region OnPostRenderTabItem
+
+        /// <summary>
+        /// OnPostRenderTabItem
+        /// </summary>
+        /// <param name="tab"></param>
+        /// <param name="g"></param>
+        internal void OnPostRenderTabItem(SuperTabItem tab, Graphics g)
+        {
+            if (PostRenderTabItem != null)
+            {
+                SuperTabPostRenderTabItemEventArgs args =
+                    new SuperTabPostRenderTabItemEventArgs(tab, g);
+
+                PostRenderTabItem(this, args);
+            }
+        }
+
+        #endregion
+
+        #region OnGetTabItemContentRectangle
+
+        /// <summary>
+        /// OnGetTabItemContentRectangle
+        /// </summary>
+        /// <param name="tab"></param>
+        /// <returns></returns>
+        internal Rectangle OnGetTabItemContentRectangle(SuperTabItem tab)
+        {
+            if (GetTabItemContentRectangle != null)
+            {
+                SuperTabGetTabItemContentRectangleEventArgs args =
+                    new SuperTabGetTabItemContentRectangleEventArgs(tab);
+
+                GetTabItemContentRectangle(this, args);
+
+                return (args.ContentRectangle);
+            }
+
+            return (tab.TabItemDisplay.ContentRectangle());
+        }
+
+        #endregion
+
+        #region OnGetTabItemPath
+
+        /// <summary>
+        /// OnGetTabItemPath
+        /// </summary>
+        /// <param name="tab"></param>
+        /// <returns></returns>
+        internal GraphicsPath OnGetTabItemPath(SuperTabItem tab)
+        {
+            if (GetTabItemPath != null)
+            {
+                SuperTabGetTabItemPathEventArgs args =
+                    new SuperTabGetTabItemPathEventArgs(tab);
+
+                GetTabItemPath(this, args);
+
+                return (args.Path);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region OnSelectedTabRemoved
+
+        /// <summary>
+        /// OnSelectedTabRemoved
+        /// </summary>
+        /// <param name="index"></param>
+        /// <param name="item"></param>
+        internal void OnSelectedTabRemoved(int index, SuperTabItem item)
+        {
+            SelectNewTab(index);
+        }
+
+        #endregion
+
+        #region OnSelectedTabChanging
+
+        /// <summary>
+        /// OnSelectedTabChanging
+        /// </summary>
+        /// <param name="value"></param>
+        /// <param name="eventSource"></param>
+        /// <returns></returns>
+        private bool OnSelectedTabChanging(SuperTabItem value, eEventSource eventSource)
+        {
+            if (SelectedTabChanging != null)
+            {
+                SuperTabStripSelectedTabChangingEventArgs eventData = new
+                    SuperTabStripSelectedTabChangingEventArgs(_SelectedTab, value, eventSource);
+
+                SelectedTabChanging(this, eventData);
+
+                return (eventData.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region OnSelectedTabChanged
+
+        /// <summary>
+        /// OnSelectedTabChanged
+        /// </summary>
+        /// <param name="oldTab"></param>
+        /// <param name="newTab"></param>
+        /// <param name="eventSource"></param>
+        private void OnSelectedTabChanged(SuperTabItem oldTab,
+            SuperTabItem newTab, eEventSource eventSource)
+        {
+            if (SelectedTabChanged != null)
+            {
+                SuperTabStripSelectedTabChangedEventArgs eventData = new
+                    SuperTabStripSelectedTabChangedEventArgs(oldTab, newTab, eventSource);
+
+                SelectedTabChanged(this, eventData);
+            }
+        }
+
+        #endregion
+
+        #region OnBeforeTabDisplay
+
+        /// <summary>
+        /// OnBeforeTabDisplay
+        /// </summary>
+        /// <param name="item"></param>
+        internal void OnBeforeTabDisplay(SuperTabItem item)
+        {
+            if (BeforeTabDisplay != null)
+            {
+                SuperTabStripBeforeTabDisplayEventArgs args = new
+                    SuperTabStripBeforeTabDisplayEventArgs(item);
+
+                BeforeTabDisplay(this, args);
+            }
+        }
+
+        #endregion
+
+        #region OnTabItemClose
+
+        /// <summary>
+        /// OnTabItemClose
+        /// </summary>
+        /// <param name="tab"></param>
+        /// <returns></returns>
+        private bool OnTabItemClose(SuperTabItem tab)
+        {
+            if (TabItemClose != null)
+            {
+                SuperTabStripTabItemCloseEventArgs args =
+                    new SuperTabStripTabItemCloseEventArgs(tab);
+
+                args.Cancel = (AutoCloseTabs == false);
+
+                TabItemClose(this, args);
+
+                return (args.Cancel);
+            }
+
+            return (AutoCloseTabs == false);
+        }
+
+        #endregion
+
+        #region OnTabStripColorChanged
+
+        /// <summary>
+        /// OnTabStripColorChanged
+        /// </summary>
+        private void OnTabStripColorChanged()
+        {
+            if (TabStripColorChanged != null)
+                TabStripColorChanged(this, EventArgs.Empty);
+
+            MyRefresh();
+        }
+
+        #endregion
+
+        #region OnPaintBackground
+
+        /// <summary>
+        /// OnPaintBackground
+        /// </summary>
+        /// <param name="g"></param>
+        /// <param name="ct"></param>
+        internal void OnPaintBackground(Graphics g, SuperTabColorTable ct)
+        {
+            if (TabStripPaintBackground != null)
+                TabStripPaintBackground(this, new SuperTabStripPaintBackgroundEventArgs(g, ct));
+        }
+
+        #endregion
+
+        #region OnGetTextBounds
+
+        /// <summary>
+        /// OnGetTextBounds
+        /// </summary>
+        /// <param name="tab"></param>
+        /// <param name="bounds"></param>
+        /// <returns></returns>
+        internal Rectangle OnGetTextBounds(SuperTabItem tab, Rectangle bounds)
+        {
+            if (GetTabTextBounds != null)
+            {
+                SuperTabGetTabTextBoundsEventArgs ev = new
+                    SuperTabGetTabTextBoundsEventArgs(tab, bounds);
+
+                GetTabTextBounds(this, ev);
+
+                bounds = ev.Bounds;
+            }
+
+            return (bounds);
+        }
+
+        #endregion
+
+        #region OnGetImageBounds
+
+        /// <summary>
+        /// OnGetImageBounds
+        /// </summary>
+        /// <param name="tab"></param>
+        /// <param name="bounds"></param>
+        /// <returns></returns>
+        internal Rectangle OnGetImageBounds(SuperTabItem tab, Rectangle bounds)
+        {
+            if (GetTabImageBounds != null)
+            {
+                SuperTabGetTabImageBoundsEventArgs ev = new
+                    SuperTabGetTabImageBoundsEventArgs(tab, bounds);
+
+                GetTabImageBounds(this, ev);
+
+                bounds = ev.Bounds;
+            }
+
+            return (bounds);
+        }
+
+        #endregion
+
+        #region OnGetCloseBounds
+
+        /// <summary>
+        /// OnGetCloseBounds
+        /// </summary>
+        /// <param name="tab"></param>
+        /// <param name="bounds"></param>
+        /// <returns></returns>
+        internal Rectangle OnGetCloseBounds(SuperTabItem tab, Rectangle bounds)
+        {
+            if (GetTabCloseBounds != null)
+            {
+                SuperTabGetTabCloseBoundsEventArgs ev = new
+                    SuperTabGetTabCloseBoundsEventArgs(tab, bounds);
+
+                GetTabCloseBounds(this, ev);
+
+                bounds = ev.Bounds;
+            }
+
+            return (bounds);
+        }
+
+        #endregion
+
+        #region OnTabMoving
+
+        /// <summary>
+        /// OnTabMoving
+        /// </summary>
+        /// <param name="moveTab"></param>
+        /// <param name="insertTab"></param>
+        /// <param name="insertBefore"></param>
+        /// <returns></returns>
+        protected bool OnTabMoving(
+            BaseItem moveTab, BaseItem insertTab, bool insertBefore)
+        {
+            if (TabMoving != null)
+            {
+                SuperTabStripTabMovingEventArgs ev =
+                    new SuperTabStripTabMovingEventArgs(moveTab, insertTab, insertBefore);
+
+                TabMoving(this, ev);
+
+                return (ev.CanMove);
+            }
+
+            return (true);
+        }
+
+        #endregion
+
+        #region OnTabMoved
+
+        /// <summary>
+        /// OnTabMoved
+        /// </summary>
+        /// <param name="tab">Tab that was moved</param>
+        /// <param name="oldOrder">Old tab order</param>
+        /// <param name="newOrder">New tab order</param>
+        /// <returns></returns>
+        protected bool OnTabMoved(SuperTabItem tab,
+            List<BaseItem> oldOrder, ref List<BaseItem> newOrder)
+        {
+            if (TabMoved != null)
+            {
+                SuperTabStripTabMovedEventArgs ev =
+                    new SuperTabStripTabMovedEventArgs(tab, oldOrder, newOrder);
+
+                TabMoved(this, ev);
+
+                newOrder = ev.NewOrder;
+
+                return (ev.Cancel);
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ItemAtLocation
+
+        /// <summary>
+        /// ItemAtLocation
+        /// </summary>
+        /// <param name="x"></param>
+        /// <param name="y"></param>
+        /// <returns></returns>
+        public override BaseItem ItemAtLocation(int x, int y)
+        {
+            Point pt = new Point(x, y);
+
+            return (GetTabFromPoint(pt) ?? GetItemFromPoint(pt));
+        }
+
+        #endregion
+
+        #region Mouse support
+
+        #region InternalClick
+
+        /// <summary>
+        /// InternalClick
+        /// </summary>
+        /// <param name="mb"></param>
+        /// <param name="pt"></param>
+        public override void InternalClick(MouseButtons mb, Point pt)
+        {
+            base.InternalClick(mb, pt);
+
+            SuperTabItem tab = GetTabFromPoint(pt);
+
+            if (tab != null)
+                tab.InternalClick(mb, pt);
+        }
+
+        #endregion
+
+        #region InternalMouseDown
+
+        /// <summary>
+        /// InternalMouseDown
+        /// </summary>
+        /// <param name="objArg"></param>
+        public override void InternalMouseDown(MouseEventArgs objArg)
+        {
+            base.InternalMouseDown(objArg);
+
+            InternalOnMouseDown(objArg);
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void InternalOnMouseDown(MouseEventArgs objArg)
+        {
+            HideToolTip();
+
+            _TabArea = eSuperTabArea.InNone;
+
+            SuperTabItem tab = GetTabFromPoint(objArg.Location);
+
+            _MouseDownTab = tab;
+            _MouseDownLocation = objArg.Location;
+
+            if (tab != null)
+            {
+                if (objArg.Button == MouseButtons.Left)
+                {
+                    if (tab.Enabled == true || DesignMode == true)
+                    {
+                        _TabArea = tab.GetTabAreaFromPoint(objArg.Location);
+
+                        if (_TabArea == eSuperTabArea.InContent || _TabArea == eSuperTabArea.InImage)
+                        {
+                            tab.TabStrip.Focus();
+
+                            if (_SelectedTab != tab)
+                                SelectTab(tab, eEventSource.Mouse);
+                        }
+                    }
+                    else
+                    {
+                        _MouseDownTab = null;
+
+                        SystemSounds.Beep.Play();
+                    }
+                }
+            }
+            else
+            {
+                if (ControlBox.Visible == true)
+                {
+                    if (ControlBox.IsMouseOver == true)
+                        ControlBox.InternalMouseDown(objArg);
+                }
+            }
+        }
+
+        #endregion
+
+        #region InternalMouseUp
+
+        /// <summary>
+        /// InternalMouseUp
+        /// </summary>
+        /// <param name="objArg"></param>
+        public override void InternalMouseUp(MouseEventArgs objArg)
+        {
+            base.InternalMouseUp(objArg);
+
+            InternalOnMouseUp(objArg);
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void InternalOnMouseUp(MouseEventArgs objArg)
+        {
+            if (_IsTabDragging == false)
+                ProcessMouseUp(objArg);
+            else
+                ProcessTabUp();
+
+            _InsertTab = null;
+            _MouseDownTab = null;
+            _IsTabDragging = false;
+        }
+
+        #region ProcessMouseUp
+
+        private void ProcessMouseUp(MouseEventArgs objArg)
+        {
+            SuperTabItem tab = GetTabFromPoint(objArg.Location);
+
+            if (tab != null)
+            {
+                if (objArg.Button == MouseButtons.Left)
+                {
+                    eSuperTabArea upTabArea = tab.GetTabAreaFromPoint(objArg.Location);
+
+                    if (_TabArea == eSuperTabArea.InCloseBox && upTabArea == eSuperTabArea.InCloseBox)
+                    {
+                        CloseTab(tab);
+                    }
+                }
+            }
+            else
+            {
+                if (ControlBox.Visible == true)
+                {
+                    if (ControlBox.IsMouseDown == true)
+                        ControlBox.InternalMouseUp(objArg);
+                }
+            }
+        }
+
+        #endregion
+
+        #region ProcessTabUp
+
+        private void ProcessTabUp()  
+        {
+            _TabDragWindow.Owner.Cursor = Cursors.Default;
+
+            _TabDragWindow.Dispose();
+            _TabDragWindow = null;
+
+            if (_InsertTab != null)
+            {
+                SuperTabItem dragTab = _HotTab;
+
+                List<BaseItem> oldOrder = GetOldOrder();
+                List<BaseItem> newOrder = GetNewOrder();
+
+                if (OnTabMoved(dragTab, oldOrder, ref newOrder) == false)
+                {
+                    SubItems.Clear();
+
+                    foreach (BaseItem item in newOrder)
+                    {
+                        bool visible = item.Visible;
+
+                        SubItems.Add(item);
+
+                        if (visible == false)
+                            item.Visible = false;
+                    }
+
+                    SelectedTab = dragTab;
+                }
+            }
+
+            Refresh();
+        }
+
+        #region GetOldOrder
+
+        private List<BaseItem> GetOldOrder()
+        {
+            List<BaseItem> items = new List<BaseItem>(SubItems.Count);
+
+            foreach (BaseItem item in SubItems)
+                items.Add(item);
+
+            return (items);
+        }
+
+        #endregion
+
+        #region GetNewOrder
+
+        private List<BaseItem> GetNewOrder()
+        {
+            List<BaseItem> items = GetOldOrder();
+
+            int n = items.IndexOf(_InsertTab);
+            int m = items.IndexOf(_HotTab);
+
+            if (n >= 0 && m >= 0)
+            {
+                if ((_InsertBefore == false && n + 1 != m) ||
+                    (_InsertBefore == true && n - 1 != m))
+                {
+                    items.Remove(_HotTab);
+
+                    n = items.IndexOf(_InsertTab);
+
+                    if (_InsertBefore == false)
+                        n++;
+
+                    items.Insert(n, _HotTab);
+                }
+            }
+
+            return (items);
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region InternalMouseMove
+
+        /// <summary>
+        /// InternalMouseMove
+        /// </summary>
+        /// <param name="objArg"></param>
+        public override void InternalMouseMove(MouseEventArgs objArg)
+        {
+            if (_IsTabDragging == false)
+                base.InternalMouseMove(objArg);
+
+            InternalOnMouseMove(objArg);
+        }
+
+        /// <summary>
+        /// InternalOnMouseMove
+        /// </summary>
+        /// <param name="objArg"></param>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void InternalOnMouseMove(MouseEventArgs objArg)
+        {
+            SyncMouseState();
+
+            if (_IsTabDragging == false)
+                ProcessMouseMove(objArg);
+            else
+                ProcessTabMove(objArg);
+        }
+
+        #region SyncMouseState
+
+        private void SyncMouseState()
+        {
+            if (_MouseDownTab != null)
+            {
+                if (Control.MouseButtons == MouseButtons.None)
+                {
+                    if (_TabDragWindow != null)
+                    {
+                        _TabDragWindow.Dispose();
+                        _TabDragWindow = null;
+                    }
+
+                    _InsertTab = null;
+                    _MouseDownTab = null;
+                    _IsTabDragging = false;
+                }
+            }
+        }
+
+        #endregion
+
+        #region ProcessMouseMove
+
+        /// <summary>
+        /// ProcessMouseMove
+        /// </summary>
+        /// <param name="objArg"></param>
+        private void ProcessMouseMove(MouseEventArgs objArg)
+        {
+            SuperTabItem tab = GetTabFromPoint(objArg.Location);
+
+            if (_HotTab != tab || _HotTab != null)
+                HotTabMouseMove(objArg, tab);
+            else
+                ControlBoxMouseMove(objArg);
+        }
+
+        #region HotTabMouseMove
+
+        /// <summary>
+        /// HotTabMouseMove
+        /// </summary>
+        /// <param name="objArg"></param>
+        /// <param name="tab"></param>
+        private void HotTabMouseMove(MouseEventArgs objArg, SuperTabItem tab)
+        {
+            if (_HotTab != tab)
+            {
+                if (_HotTab != null) 
+                    _HotTab.Refresh();
+
+                if (_HotTab == null || _HotTab.CloseButtonPressed == false)
+                    _HotTab = tab;
+
+                if (_HotTab != null) 
+                    _HotTab.Refresh();
+
+                ResetHover();
+                HideToolTip();
+            }
+            else if (_HotTab != null)
+            {
+                StartTabMove(objArg);
+            }
+        }
+
+        #endregion
+
+        #region ControlBoxMouseMove
+
+        /// <summary>
+        /// ControlBoxMouseMove
+        /// </summary>
+        /// <param name="objArg"></param>
+        private void ControlBoxMouseMove(MouseEventArgs objArg)
+        {
+            if (ControlBox.Visible == true)
+            {
+                if (ControlBox.Bounds.Contains(objArg.Location))
+                {
+                    if (ControlBox.IsMouseOver == false)
+                        ControlBox.InternalMouseEnter();
+
+                    ControlBox.InternalMouseMove(objArg);
+                }
+                else
+                {
+                    if (ControlBox.IsMouseOver == true)
+                        ControlBox.InternalMouseLeave();
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ProcessTabMove
+
+        /// <summary>
+        /// ProcessTabMove
+        /// </summary>
+        /// <param name="objArg"></param>
+        private void ProcessTabMove(MouseEventArgs objArg)
+        {
+            _TabDragWindow.Location = new Point(Control.MousePosition.X,
+                Control.MousePosition.Y + _TabDragWindow.Owner.Cursor.Size.Height / 2);
+
+            _InsertTab = null;
+
+            BaseItem item = GetItemFromPoint(objArg.Location);
+
+            if (item != null && _HotTab != null)
+            {
+                Point pt = objArg.Location;
+
+                switch (_TabStrip.TabAlignment)
+                {
+                    case eTabStripAlignment.Top:
+                    case eTabStripAlignment.Bottom:
+                        _InsertBefore = (pt.X < item.Bounds.X + (item.Bounds.Width / 2));
+                        break;
+
+                    default:
+                        _InsertBefore = (pt.Y < item.Bounds.Y + (item.Bounds.Height / 2));
+                        break;
+                }
+
+                int n = SubItems.IndexOf(item);
+                int m = SubItems.IndexOf(_HotTab);
+
+                if (m != n && ((_InsertBefore == true && n - 1 != m) || (_InsertBefore == false && n + 1 != m)))
+                    _InsertTab = item;
+            }
+
+            if (OnTabMoving(_HotTab, _InsertTab, _InsertBefore) == false)
+                _InsertTab = null;
+
+            _TabDragWindow.Owner.Cursor =
+                (_InsertTab != null) ? Cursors.Hand : Cursors.No;
+
+            Refresh();
+        }
+
+        #endregion
+
+        #region StartTabMove
+
+        /// <summary>
+        /// StartTabMove
+        /// </summary>
+        /// <param name="objArg"></param>
+        /// <returns></returns>
+        private bool StartTabMove(MouseEventArgs objArg)
+        {
+            if (_ReorderTabsEnabled == true && _HotTab == _MouseDownTab &&
+                _MouseDownTab.CloseButtonPressed == false)
+            {
+                if (Math.Abs(_MouseDownLocation.X - objArg.Location.X) > 8 ||
+                    Math.Abs(_MouseDownLocation.Y - objArg.Location.Y) > 8)
+                {
+                    _IsTabDragging = true;
+
+                    _TabDragWindow = new SuperTabDragWindow();
+                    _TabDragWindow.Owner = TabStrip.FindForm();
+
+                    _TabDragWindow.Paint += TabDragWindowPaint;
+
+                    SetDragWindowRegion();
+                    _TabDragWindow.Show();
+
+                    _TabDragWindow.Size = _MouseDownTab.Bounds.Size;
+
+                    return (true);
+                }
+            }
+
+            return (false);
+        }
+
+        #endregion
+
+        #region SetDragWindowRegion
+
+        /// <summary>
+        /// SetDragWindowRegion
+        /// </summary>
+        private void SetDragWindowRegion()
+        {
+            Rectangle saveRect = _MouseDownTab.Bounds;
+            Rectangle dragRect = saveRect;
+
+            dragRect.Location = new Point(0, 0);
+
+            try
+            {
+                _MouseDownTab.Bounds = dragRect;
+
+                using (GraphicsPath path = _MouseDownTab.GetTabItemPath())
+                {
+                    GraphicsPath cpath = (GraphicsPath) path.Clone();
+
+                    using (Pen pen = new Pen(Color.Black, 2))
+                        cpath.Widen(pen);
+
+                    Region rgn = new Region(path);
+                    rgn.Union(cpath);
+
+                    _TabDragWindow.Region = rgn;
+                }
+            }
+            finally
+            {
+                _MouseDownTab.Bounds = saveRect;
+            }
+        }
+
+        #endregion
+
+        #region TabDragWindow_Paint
+
+        /// <summary>
+        /// TabDragWindow_Paint
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void TabDragWindowPaint(object sender, PaintEventArgs e)
+        {
+            ItemPaintArgs p = new ItemPaintArgs(null, _TabStrip, e.Graphics, new ColorScheme());
+
+            Rectangle saveRect = _MouseDownTab.Bounds;
+            Rectangle dragRect = saveRect;
+
+            dragRect.Location = new Point(0, 0);
+
+            try
+            {
+                _MouseDownTab.Bounds = dragRect;
+                _MouseDownTab.Paint(p);
+            }
+            finally
+            {
+                _MouseDownTab.Bounds = saveRect;
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region InternalMouseLeave
+
+        /// <summary>
+        /// InternalMouseLeave
+        /// </summary>
+        public override void InternalMouseLeave()
+        {
+            base.InternalMouseLeave();
+
+            InternalOnMouseLeave();
+        }
+
+        /// <summary>
+        /// InternalOnMouseLeave
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void InternalOnMouseLeave()
+        {
+            HideToolTip();
+
+            if (_HotTab != null)
+            {
+                if (SubItems.Contains(_HotTab))
+                {
+                    _HotTab.CloseButtonMouseOver = false;
+                    _HotTab.Refresh();
+
+                    _HotTab = null;
+
+                    Refresh();
+                }
+                else
+                {
+                    _HotTab = null;
+                }
+            }
+            else
+            {
+                if (ControlBox.Visible == true)
+                {
+                    if (ControlBox.IsMouseOver == true)
+                        ControlBox.InternalMouseLeave();
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region GetTabFromPoint
+
+        /// <summary>
+        /// Get the tab at the given Point
+        /// </summary>
+        /// <param name="pt"></param>
+        /// <returns>SuperTabItem or null</returns>
+        public SuperTabItem GetTabFromPoint(Point pt)
+        {
+            if (SelectedTab != null)
+            {
+                if (SelectedTab.PointInTab(pt) == true)
+                    return (SelectedTab);
+            }
+
+            for (int i = 0; i < SubItems.Count; i++)
+            {
+                SuperTabItem tab = SubItems[i] as SuperTabItem;
+
+                if (tab != null)
+                {
+                    if (tab.Visible == true && tab.Displayed == true)
+                    {
+                        if (tab.PointInTab(pt) == true)
+                            return (tab);
+                    }
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetItemFromPoint
+
+        /// <summary>
+        /// Gets the item at the given point
+        /// </summary>
+        /// <param name="pt"></param>
+        /// <returns>BaseItem or null</returns>
+        public BaseItem GetItemFromPoint(Point pt)
+        {
+            for (int i = 0; i < SubItems.Count; i++)
+            {
+                BaseItem item = SubItems[i];
+
+                if (item.Visible == true && item.Displayed == true)
+                {
+                    if (item.DisplayRectangle.Contains(pt))
+                        return (item);
+                }
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region GetNextVisibleTab
+
+        /// <summary>
+        /// Gets the next visible Tab
+        /// </summary>
+        /// <param name="index"></param>
+        /// <returns>SuperTabItem</returns>
+        internal SuperTabItem GetNextVisibleTab(int index)
+        {
+            if (index < 0 || index >= SubItems.Count)
+                index = 0;
+
+            for (int i = index; i < SubItems.Count; i++)
+            {
+                SuperTabItem tab = SubItems[i] as SuperTabItem;
+
+                if (tab != null && tab.Visible == true)
+                    return (tab);
+            }
+
+            return (null);
+        }
+
+        #endregion
+
+        #region CloseTab
+
+        /// <summary>
+        /// Closes the given tab
+        /// </summary>
+        /// <param name="tab"></param>
+        public void CloseTab(SuperTabItem tab)
+        {
+            if (tab != null && SubItems.Contains(tab))
+            {
+                if (OnTabItemClose(tab) == false)
+                {
+                    if (_TabStrip.IsDesignMode == false)
+                    {
+                        SubItems.Remove(tab);
+
+                        Control c = tab.AttachedControl;
+
+                        if (c != null)
+                        {
+                            if (_TabStrip.Controls.Contains(c))
+                                _TabStrip.Controls.Remove(c);
+
+                            c.Dispose();
+                        }
+
+                        _TabStrip.RecalcLayout();
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region Paint
+
+        /// <summary>
+        /// Paint processing
+        /// </summary>
+        /// <param name="p"></param>
+        public override void Paint(ItemPaintArgs p)
+        {
+            if (_TabDisplay != null)
+               _TabDisplay.Paint(p);
+        }
+
+        #endregion
+
+        #region SubItemSizeChanged
+
+        /// <summary>
+        /// SubItemSizeChanged
+        /// </summary>
+        /// <param name="objChildItem"></param>
+        public override void SubItemSizeChanged(BaseItem objChildItem)
+        {
+            base.SubItemSizeChanged(objChildItem);
+
+            _TabStrip.RecalcLayout();
+
+            if (DesignMode == false)
+                SelectNewTab(SelectedTab);
+        }
+
+        #endregion
+
+        #region Copy
+
+        /// <summary>
+        /// Returns copy of the item.
+        /// </summary>
+        public override BaseItem Copy()
+        {
+            SuperTabStripItem objCopy = new SuperTabStripItem(_TabStrip);
+            CopyToItem(objCopy);
+
+            return (objCopy);
+        }
+
+        /// <summary>
+        /// Copies specific properties to new instance of the item.
+        /// </summary>
+        /// <param name="copy">New SuperTabStripItem instance</param>
+        protected override void CopyToItem(BaseItem copy)
+        {
+            SuperTabStripItem objCopy = copy as SuperTabStripItem;
+
+            if (objCopy != null)
+            {
+                base.CopyToItem(objCopy);
+
+                objCopy.AutoCloseTabs = _AutoCloseTabs;
+                objCopy.TabCloseButtonNormal = _TabCloseButtonNormal;
+                objCopy.TabCloseButtonHot = _TabCloseButtonHot;
+                objCopy.TabHorizontalSpacing = _TabHorizontalSpacing;
+                objCopy.TabVerticalSpacing = _TabVerticalSpacing;
+                objCopy.CloseButtonOnTabsVisible = _CloseButtonOnTabsVisible;
+                objCopy.CloseButtonOnTabsAlwaysDisplayed = _CloseButtonOnTabsAlwaysDisplayed;
+                objCopy.CloseButtonPosition = _CloseButtonPosition;
+                objCopy.DisplaySelectedTextOnly = _DisplaySelectedTextOnly;
+                objCopy.TabFont = _TabFont;
+                objCopy.SelectedTabFont = _SelectedTabFont;
+                objCopy.HorizontalText = _HorizontalText;
+                objCopy.ShowFocusRectangle = _ShowFocusRectangle;
+                objCopy.FixedTabSize = _FixedTabSize;
+                objCopy.ReorderTabsEnabled = _ReorderTabsEnabled;
+                objCopy.TabAlignment = _TabAlignment;
+                objCopy.TabLayoutType = _TabLayoutType;
+                objCopy.TabStripColor = _TabStripColor;
+                objCopy.TabStyle = _TabStyle;
+                objCopy.TextAlignment = _TextAlignment;
+            }
+        }
+
+        #endregion
+
+        #region IDesignTimeProvider Members
+
+        protected virtual InsertPosition GetContainerInsertPosition(Point pScreen, BaseItem dragItem)
+        {
+            InsertPosition ip = DesignTimeProviderContainer.GetInsertPosition(this, pScreen, dragItem);
+
+            if (ip != null)
+            {
+                if (ip.TargetProvider != this && dragItem is SuperTabItem)
+                    return (null);
+            }
+
+            return (ip);
+        }
+
+        InsertPosition IDesignTimeProvider.GetInsertPosition(Point pScreen, BaseItem dragItem)
+        {
+            return (GetContainerInsertPosition(pScreen, dragItem));
+        }
+
+        void IDesignTimeProvider.DrawReversibleMarker(int iPos, bool before)
+        {
+            DesignTimeProviderContainer.DrawReversibleMarker(this, iPos, before);
+        }
+
+        void IDesignTimeProvider.InsertItemAt(BaseItem objItem, int iPos, bool before)
+        {
+            DesignTimeProviderContainer.InsertItemAt(this, objItem, iPos, before);
+        }
+
+        #endregion
+    }
+
+    #region enums
+
+    public enum eSuperTabStyle
+    {
+        Office2007,
+        Office2010BackstageBlue,
+        OfficeMobile2014,
+        OneNote2007,
+        VisualStudio2008Dock,
+        VisualStudio2008Document,
+        WinMediaPlayer12,
+    }
+
+    public enum eSuperTabLayoutType
+    {
+        SingleLine,
+        SingleLineFit,
+        MultiLine,
+        MultiLineFit
+    }
+
+    #endregion
+
+    #region ValueChangingEventArgs
+
+    /// <summary>
+    /// Generic ValueChangingEventArgs
+    /// </summary>
+    /// <typeparam name="T1">oldValue type</typeparam>
+    /// <typeparam name="T2">newValue type</typeparam>
+    public class ValueChangingEventArgs<T1, T2> : CancelEventArgs
+    {
+        #region Private variables
+
+        private T1 _OldValue;
+        private T2 _NewValue;
+
+        #endregion
+
+        public ValueChangingEventArgs(T1 oldValue, T2 newValue)
+        {
+            _OldValue = oldValue;
+            _NewValue = newValue;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the old value
+        /// </summary>
+        public T1 OldValue
+        {
+            get { return (_OldValue); }
+        }
+
+        /// <summary>
+        /// Gets the new value
+        /// </summary>
+        public T2 NewValue
+        {
+            get { return (_NewValue); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region ValueChangingSourceEventArgs
+
+    /// <summary>
+    /// Generic ValueChangingSourceEventArgs
+    /// </summary>
+    /// <typeparam name="T1">oldValue type</typeparam>
+    /// <typeparam name="T2">newValue type</typeparam>
+    /// <typeparam name="T3">EventSource</typeparam>
+    public class ValueChangingSourceEventArgs<T1, T2, T3> : CancelEventArgs
+    {
+        #region Private variables
+
+        private T1 _OldValue;
+        private T2 _NewValue;
+        private T3 _EventSource;
+
+        #endregion
+
+        public ValueChangingSourceEventArgs(T1 oldValue, T2 newValue, T3 eventSource)
+        {
+            _OldValue = oldValue;
+            _NewValue = newValue;
+            _EventSource = eventSource;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the old value
+        /// </summary>
+        public T1 OldValue
+        {
+            get { return (_OldValue); }
+        }
+
+        /// <summary>
+        /// Gets the new value
+        /// </summary>
+        public T2 NewValue
+        {
+            get { return (_NewValue); }
+        }
+
+        /// <summary>
+        /// Gets the eventSource
+        /// </summary>
+        public T3 EventSource
+        {
+            get { return (_EventSource); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region ValueChangedEventArgs
+
+    /// <summary>
+    /// Generic ValueChangedEventArgs
+    /// </summary>
+    /// <typeparam name="T1">oldValue type</typeparam>
+    /// <typeparam name="T2">newValue type</typeparam>
+    public class ValueChangedEventArgs<T1, T2> : EventArgs
+    {
+        #region Private variables
+
+        private T1 _OldValue;
+        private T2 _NewValue;
+
+        #endregion
+
+        public ValueChangedEventArgs(T1 oldValue, T2 newValue)
+        {
+            _OldValue = oldValue;
+            _NewValue = newValue;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the old value
+        /// </summary>
+        public T1 OldValue
+        {
+            get { return (_OldValue); }
+        }
+
+        /// <summary>
+        /// Gets the new value
+        /// </summary>
+        public T2 NewValue
+        {
+            get { return (_NewValue); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region ValueChangedSourceEventArgs
+
+    /// <summary>
+    /// Generic ValueChangedSourceEventArgs
+    /// </summary>
+    /// <typeparam name="T1">oldValue type</typeparam>
+    /// <typeparam name="T2">newValue type</typeparam>
+    /// <typeparam name="T3">EventSource</typeparam>
+    public class ValueChangedEventArgs<T1, T2, T3> : EventArgs
+    {
+        #region Private variables
+
+        private T1 _OldValue;
+        private T2 _NewValue;
+        private T3 _EventSource;
+
+        #endregion
+
+        public ValueChangedEventArgs(T1 oldValue, T2 newValue, T3 eventSource)
+        {
+            _OldValue = oldValue;
+            _NewValue = newValue;
+            _EventSource = eventSource;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the old value
+        /// </summary>
+        public T1 OldValue
+        {
+            get { return (_OldValue); }
+        }
+
+        /// <summary>
+        /// Gets the new value
+        /// </summary>
+        public T2 NewValue
+        {
+            get { return (_NewValue); }
+        }
+
+        /// <summary>
+        /// Gets the eventSource
+        /// </summary>
+        public T3 EventSource
+        {
+            get { return (_EventSource); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region TabActionEventArgs
+
+    public class TabActionEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private BaseItem _Tab;
+
+        #endregion
+
+        public TabActionEventArgs(BaseItem tab)
+        {
+            _Tab = tab;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the tab
+        /// </summary>
+        public BaseItem Tab
+        {
+            get { return (_Tab); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region SuperTabStripTabActionCancelEventArgs
+
+    public class SuperTabStripTabActionCancelEventArgs : CancelEventArgs
+    {
+        #region Private variables
+
+        private BaseItem _Tab;
+
+        #endregion
+
+        public SuperTabStripTabActionCancelEventArgs(BaseItem tab)
+        {
+            _Tab = tab;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the tab
+        /// </summary>
+        public BaseItem Tab
+        {
+            get { return (_Tab); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region SuperTabStripSelectedTabChangingEventArgs
+
+    public class SuperTabStripSelectedTabChangingEventArgs : ValueChangingSourceEventArgs<BaseItem, BaseItem, eEventSource>
+    {
+        public SuperTabStripSelectedTabChangingEventArgs(BaseItem oldValue, BaseItem newValue, eEventSource source)
+            : base(oldValue, newValue, source)
+        {
+        }
+    }
+
+    #endregion
+
+    #region SuperTabStripSelectedTabChangedEventArgs
+
+    public class SuperTabStripSelectedTabChangedEventArgs : ValueChangingSourceEventArgs<BaseItem, BaseItem, eEventSource>
+    {
+        public SuperTabStripSelectedTabChangedEventArgs(BaseItem oldValue, BaseItem newValue, eEventSource source)
+            : base(oldValue, newValue, source)
+        {
+        }
+    }
+
+    #endregion
+
+    #region SuperTabStripBeforeTabDisplayEventArgs
+
+    public class SuperTabStripBeforeTabDisplayEventArgs : TabActionEventArgs
+    {
+        public SuperTabStripBeforeTabDisplayEventArgs(BaseItem tab)
+            : base(tab)
+        {
+        }
+    }
+
+    #endregion
+
+    #region SuperTabStripTabRemovedEventArgs
+
+    public class SuperTabStripTabRemovedEventArgs : TabActionEventArgs
+    {
+        public SuperTabStripTabRemovedEventArgs(BaseItem tab)
+            : base(tab)
+        {
+        }
+    }
+
+    #endregion
+
+    #region SuperTabStripTabMovingEventArgs
+
+    public class SuperTabStripTabMovingEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private BaseItem _MoveTab;
+        private BaseItem _InsertTab;
+        private bool _InsertBefore;
+
+        private bool _CanMove = true;
+
+        #endregion
+
+        public SuperTabStripTabMovingEventArgs(
+            BaseItem moveTab, BaseItem insertTab, bool insertBefore)
+        {
+            _MoveTab = moveTab;
+            _InsertTab = insertTab;
+            _InsertBefore = insertBefore;
+        }
+
+        #region Public properties
+
+        public BaseItem MoveTab
+        {
+            get { return (_MoveTab); }
+        }
+
+        public BaseItem InsertTab
+        {
+            get { return (_InsertTab); }
+        }
+
+        public bool InsertBefore
+        {
+            get { return (_InsertBefore); }
+        }
+
+        public bool CanMove
+        {
+            get { return (_CanMove); }
+            set { _CanMove = value; }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region SuperTabStripTabMovedEventArgs
+
+    public class SuperTabStripTabMovedEventArgs : SuperTabStripTabActionCancelEventArgs
+    {
+        #region Private variables
+
+        List<BaseItem> _OldOrder;
+        List<BaseItem> _NewOrder;
+
+        #endregion
+
+        public SuperTabStripTabMovedEventArgs(
+            BaseItem tab, List<BaseItem> oldOrder, List<BaseItem> newOrder)
+            : base(tab)
+        {
+            _OldOrder = oldOrder;
+            _NewOrder = newOrder;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets the old order of the tabs 
+        /// </summary>
+        public List<BaseItem> OldOrder
+        {
+            get { return (_OldOrder); }
+        }
+
+        /// <summary>
+        /// Gets or sets the new order of the tabs
+        /// </summary>
+        public List<BaseItem> NewOrder
+        {
+            get { return (_NewOrder); }
+            set { _NewOrder = value; }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region SuperTabStripTabItemCloseEventArgs
+
+    public class SuperTabStripTabItemCloseEventArgs : SuperTabStripTabActionCancelEventArgs
+    {
+        public SuperTabStripTabItemCloseEventArgs(BaseItem tab)
+            : base(tab)
+        {
+        }
+    }
+
+    #endregion
+
+    #region SuperTabStripTabItemOpenEventArgs
+
+    public class SuperTabStripTabItemOpenEventArgs : TabActionEventArgs
+    {
+        public SuperTabStripTabItemOpenEventArgs(BaseItem tab)
+            : base(tab)
+        {
+        }
+    }
+
+    #endregion
+
+    #region SuperTabMeasureTabItemEventArgs
+
+    public class SuperTabMeasureTabItemEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private SuperTabItem _Tab;
+        private Size _Size;
+        private Graphics _Graphics;
+
+        #endregion
+
+        public SuperTabMeasureTabItemEventArgs(SuperTabItem tab, Size size, Graphics graphics)
+        {
+            _Tab = tab;
+            _Size = size;
+            _Graphics = graphics;
+        }
+
+        #region Public properties
+
+        public SuperTabItem Tab
+        {
+            get { return (_Tab); }
+        }
+
+        public Size Size
+        {
+            get { return (_Size); }
+            set { _Size = value; }
+        }
+
+        public Graphics Graphics
+        {
+            get { return (_Graphics); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region SuperTabPreRenderTabItemEventArgs
+
+    public class SuperTabPreRenderTabItemEventArgs : CancelEventArgs
+    {
+        #region Private variables
+
+        private SuperTabItem _Tab;
+        private Graphics _Graphics;
+
+        #endregion
+
+        public SuperTabPreRenderTabItemEventArgs(SuperTabItem tab, Graphics graphics)
+        {
+            _Tab = tab;
+            _Graphics = graphics;
+        }
+
+        #region Public properties
+
+        public SuperTabItem Tab
+        {
+            get { return (_Tab); }
+        }
+
+        public Graphics Graphics
+        {
+            get { return (_Graphics); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region SuperTabPostRenderTabItemEventArgs
+
+    public class SuperTabPostRenderTabItemEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private SuperTabItem _Tab;
+        private Graphics _Graphics;
+
+        #endregion
+
+        public SuperTabPostRenderTabItemEventArgs(SuperTabItem tab, Graphics graphics)
+        {
+            _Tab = tab;
+            _Graphics = graphics;
+        }
+
+        #region Public properties
+
+        public SuperTabItem Tab
+        {
+            get { return (_Tab); }
+        }
+
+        public Graphics Graphics
+        {
+            get { return (_Graphics); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region SuperTabGetTabTextBoundsEventArgs
+
+    public class SuperTabGetTabTextBoundsEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private SuperTabItem _Tab;
+        private Rectangle _Bounds;
+
+        #endregion
+
+        public SuperTabGetTabTextBoundsEventArgs(SuperTabItem tab, Rectangle bounds)
+        {
+            _Tab = tab;
+            _Bounds = bounds;
+        }
+
+        #region Public properties
+
+        public SuperTabItem Tab
+        {
+            get { return (_Tab); }
+        }
+
+        public Rectangle Bounds
+        {
+            get { return (_Bounds); }
+            set { _Bounds = value; }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region SuperTabGetTabImageBoundsEventArgs
+
+    public class SuperTabGetTabImageBoundsEventArgs : SuperTabGetTabTextBoundsEventArgs
+    {
+        public SuperTabGetTabImageBoundsEventArgs(SuperTabItem tab, Rectangle bounds)
+            : base(tab, bounds)
+        {
+        }
+    }
+
+    #endregion
+
+    #region SuperTabGetTabCloseBoundsEventArgs
+
+    public class SuperTabGetTabCloseBoundsEventArgs : SuperTabGetTabImageBoundsEventArgs
+    {
+        public SuperTabGetTabCloseBoundsEventArgs(SuperTabItem tab, Rectangle bounds)
+            : base(tab, bounds)
+        {
+        }
+    }
+
+    #endregion
+
+    #region SuperTabStripPaintBackgroundEventArgs
+
+    public class SuperTabStripPaintBackgroundEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private Graphics _Graphics;
+        private SuperTabColorTable _ColorTable;
+
+        #endregion
+
+        public SuperTabStripPaintBackgroundEventArgs(Graphics graphics, SuperTabColorTable colorTable)
+        {
+            _Graphics = graphics;
+            _ColorTable = colorTable;
+        }
+
+        #region Public properties
+
+        public Graphics Graphics
+        {
+            get { return (_Graphics); }
+        }
+
+        public SuperTabColorTable ColorTable
+        {
+            get { return (_ColorTable); }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region SuperTabStripTabColorChangedEventArgs
+
+    /// <summary>
+    /// TabStripTabColorChangedEventArgs
+    /// </summary>
+    public class SuperTabStripTabColorChangedEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private SuperTabItem _Tab;
+
+        #endregion
+
+        #region Public properties
+
+        public SuperTabItem Tab
+        {
+            get { return (_Tab); }
+        }
+
+        #endregion
+
+        public SuperTabStripTabColorChangedEventArgs(SuperTabItem tab)
+        {
+            _Tab = tab;
+        }
+    }
+
+    #endregion    
+
+    #region SuperTabGetTabItemPathEventArgs
+
+    public class SuperTabGetTabItemPathEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private SuperTabItem _Tab;
+        private GraphicsPath _Path;
+
+        #endregion
+
+        public SuperTabGetTabItemPathEventArgs(SuperTabItem tab)
+        {
+            _Tab = tab;
+        }
+
+        #region Public properties
+
+        public SuperTabItem Tab
+        {
+            get { return (_Tab); }
+        }
+
+        public GraphicsPath Path
+        {
+            get { return (_Path); }
+            set { _Path = value; }
+        }
+
+        #endregion
+    }
+
+    #endregion
+
+    #region SuperTabGetTabItemGetContentRectangleEventArgs
+
+    public class SuperTabGetTabItemContentRectangleEventArgs : EventArgs
+    {
+        #region Private variables
+
+        private SuperTabItem _Tab;
+        private Rectangle _ContentRectangle;
+
+        #endregion
+
+        public SuperTabGetTabItemContentRectangleEventArgs(SuperTabItem tab)
+        {
+            _Tab = tab;
+            _ContentRectangle = tab.TabItemDisplay.ContentRectangle();
+        }
+
+        #region Public properties
+
+        public SuperTabItem Tab
+        {
+            get { return (_Tab); }
+        }
+
+        public Rectangle ContentRectangle
+        {
+            get { return (_ContentRectangle); }
+            set { _ContentRectangle = value; }
+        }
+
+        #endregion
+    }
+
+    #endregion
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/SuperTabControl/SuperTabStrip/SuperTabStripLayoutManager.cs b/PROMS/DotNetBar Source Code/SuperTabControl/SuperTabStrip/SuperTabStripLayoutManager.cs
new file mode 100644
index 00000000..cc031730
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/SuperTabControl/SuperTabStrip/SuperTabStripLayoutManager.cs	
@@ -0,0 +1,1098 @@
+#if FRAMEWORK20
+using System.Collections;
+using System.Collections.Generic;
+using System.Drawing;
+using DevComponents.UI.ContentManager;
+
+namespace DevComponents.DotNetBar
+{
+    public class SuperTabItemLayoutManager : BlockLayoutManager
+    {
+        #region Private variables
+
+        private int _SelLine;
+
+        private Size _CloseButtonSize = new Size(16, 16);
+        private Size _FixedTabSize = Size.Empty;
+        private Size _TabLayoutOffset = Size.Empty;
+
+        private SuperTabStripItem _TabStripItem;
+        private Dictionary<BaseItem, Size> _List;
+
+        #endregion
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        public SuperTabItemLayoutManager()
+        {
+        }
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="tabStripItem">Associated SuperTabStripItem</param>
+        public SuperTabItemLayoutManager(SuperTabStripItem tabStripItem)
+        {
+            _TabStripItem = tabStripItem;
+
+            _List = new Dictionary<BaseItem, Size>();
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// gets or sets the FixedTabSize
+        /// </summary>
+        public Size FixedTabSize
+        {
+            get { return _FixedTabSize; }
+            set { _FixedTabSize = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the TabLayoutOffset
+        /// </summary>
+        public Size TabLayoutOffset
+        {
+            get { return _TabLayoutOffset; }
+            set { _TabLayoutOffset = value; }
+        }
+
+        #endregion
+
+        #region Internal properties
+
+        /// <summary>
+        /// Gets the TabDisplay
+        /// </summary>
+        internal SuperTabStripBaseDisplay TabDisplay
+        {
+            get { return (_TabStripItem.TabDisplay); }
+        }
+
+        #endregion
+
+        #region Layout
+
+        /// <summary>
+        /// Resizes the content block and sets it's Bounds property to reflect new size.
+        /// </summary>
+        /// <param name="block">Content block to resize.</param>
+        /// <param name="availableSize"></param>
+        public override void Layout(IBlock block, Size availableSize)
+        {
+            if (block.Visible == true)
+            {
+                if (block is SuperTabItem)
+                    LayoutTab(block as SuperTabItem);
+
+                else if (block is BaseItem)
+                    LayoutBaseItem(block as BaseItem);
+            }
+        }
+
+        #region LayoutTab
+
+        private void LayoutTab(SuperTabItem tab)
+        {
+            Size size = new Size();
+            Rectangle bounds = Rectangle.Empty;
+
+            if (_FixedTabSize.Width <= 0 || _FixedTabSize.Height <= 0 ||
+                tab.TextMarkupBody != null)
+            {
+                size = MeasureTab(tab);
+            }
+
+            // If the user has set a FixedTabSize, then apply it
+
+            if (tab.FixedTabSize.Width > 0)
+                size.Width = tab.FixedTabSize.Width;
+
+            else if (_FixedTabSize.Width > 0)
+                size.Width = _FixedTabSize.Width;
+
+            if (tab.FixedTabSize.Height > 0)
+                size.Height = tab.FixedTabSize.Height;
+
+            else if (_FixedTabSize.Height > 0)
+                size.Height = _FixedTabSize.Height;
+
+            // Make sure we keep the tab size within the tab style minimum
+
+            Size minSize = TabDisplay.MinTabSize;
+
+            if (size.Width < minSize.Width)
+                size.Width = minSize.Width;
+
+            if (size.Height < minSize.Height)
+                size.Height = minSize.Height;
+
+            bounds.Size = (tab.IsVertical == true)
+                         ? new Size(size.Height, size.Width) : size;
+
+            // Let the user have one last crack at measuring the tab
+
+            bounds.Size = _TabStripItem.OnMeasureTabItem(tab, bounds.Size, Graphics);
+
+            tab.Bounds = bounds;
+            tab.RecalcSize();
+        }
+
+        #endregion
+
+        #region MeasureTab
+
+        /// <summary>
+        /// Measures the given tab
+        /// </summary>
+        /// <param name="tab"></param>
+        /// <returns></returns>
+        private Size MeasureTab(SuperTabItem tab)
+        {
+            Size size = new Size(0, 0);
+
+            // Measure the tab Text
+
+            Font font = GetSizingFont(Graphics, tab);
+
+            Size textSize = (tab.TextMarkupBody != null)
+                ? MeasureMarkup(tab, Graphics, font) : MeasureText(tab, Graphics, font);
+
+            textSize.Width += _TabLayoutOffset.Width;
+            textSize.Height += _TabLayoutOffset.Height;
+
+            bool displayText =
+                (tab.IsSelected || _TabStripItem.DisplaySelectedTextOnly == false);
+
+            // Add in our overlap, spacing, and selection padding
+
+            if (_TabStripItem.IsVertical == false || _TabStripItem.HorizontalText == false)
+            {
+                if (displayText == true)
+                    size.Width += (textSize.Width + _TabStripItem.TabHorizontalSpacing);
+
+                if (textSize.Height > size.Height)
+                    size.Height = textSize.Height;
+
+                size.Width += (TabDisplay.TabOverlap + TabDisplay.TabSpacing);
+            }
+            else
+            {
+                if (displayText == true)
+                {
+                    if (textSize.Height > size.Height)
+                        size.Height = textSize.Height;
+                }
+
+                size.Height += (TabDisplay.TabOverlap + TabDisplay.TabSpacing);
+                size.Width += (textSize.Width + _TabStripItem.TabHorizontalSpacing + TabDisplay.SelectedPaddingWidth);
+            }
+
+            // Add in any image space needed
+
+            size = GetSizeWithImage(tab, size);
+
+            // Add in the Close Button
+
+            if (TabDisplay.CloseButtonOnTabs && tab.CloseButtonVisible)
+            {
+                size.Width += (_CloseButtonSize.Width + _TabStripItem.TabHorizontalSpacing);
+
+                if (size.Height < _CloseButtonSize.Height + _TabStripItem.TabVerticalSpacing)
+                    size.Height = _CloseButtonSize.Height + _TabStripItem.TabVerticalSpacing;
+
+                if (size.Height < _CloseButtonSize.Height + 4)
+                    size.Height = _CloseButtonSize.Height + 4;
+            }
+
+            // Add our default spacing
+
+            _TabStripItem.TabDisplay.AddDefaultPadding(ref size);
+
+            return (size);
+        }
+
+        #region GetSizingFont
+
+        private Font GetSizingFont(Graphics g, SuperTabItem tab)
+        {
+            if (tab.SizingFont == null)
+            {
+                Size selectedSize = Size.Empty;
+
+                Font sfont = tab.SelectedFont;
+
+                if (sfont != null)
+                {
+                    selectedSize = (tab.TextMarkupBody != null)
+                        ? MeasureMarkup(tab, g, sfont) : MeasureText(tab, g, sfont);
+                }
+
+                Size unselectedSize = Size.Empty;
+
+                Font unsfont = tab.UnselectedFont;
+
+                if (unsfont != null)
+                {
+                    unselectedSize = (tab.TextMarkupBody != null)
+                        ? MeasureMarkup(tab, g, unsfont) : MeasureText(tab, g, unsfont);
+                }
+
+                tab.SizingFont = (selectedSize.Width > unselectedSize.Width) ? sfont : unsfont;
+            }
+
+            return (tab.SizingFont);
+        }
+
+        #endregion
+
+        #region GetSizeWithImage
+
+        private Size GetSizeWithImage(SuperTabItem tab, Size size)
+        {
+            Size imageSize = Size.Empty;
+
+            if (string.IsNullOrEmpty(tab.SymbolRealized) == false)
+            {
+                imageSize = tab.GetSymbolSize();
+            }
+            else
+            {
+                CompositeImage tabImage = tab.GetTabImage();
+
+                if (tabImage != null)
+                    imageSize = tabImage.Size;
+            }
+
+            if (imageSize.IsEmpty == false)
+            {
+                int h = _TabStripItem.TabVerticalSpacing + tab.ImagePadding.Vertical;
+                int w = _TabStripItem.TabHorizontalSpacing + tab.ImagePadding.Horizontal;
+
+                switch (tab.EffectiveImageAlignment)
+                {
+                    case ImageAlignment.TopLeft:
+                    case ImageAlignment.TopCenter:
+                    case ImageAlignment.TopRight:
+                    case ImageAlignment.BottomLeft:
+                    case ImageAlignment.BottomCenter:
+                    case ImageAlignment.BottomRight:
+                        size.Height += (imageSize.Height + h);
+                        break;
+
+                    case ImageAlignment.MiddleLeft:
+                    case ImageAlignment.MiddleRight:
+                        size.Width += (imageSize.Width + w);
+
+                        if (size.Height < imageSize.Height + h)
+                            size.Height = imageSize.Height + h;
+                        break;
+
+                    case ImageAlignment.MiddleCenter:
+                        if (size.Width < imageSize.Width + w)
+                            size.Width = imageSize.Width + w;
+
+                        if (size.Height < imageSize.Height + h)
+                            size.Height = imageSize.Height + h;
+                        break;
+                }
+
+                if (_TabStripItem.IsVertical == true && _TabStripItem.HorizontalText == true)
+                {
+                    int n = imageSize.Height +
+                            _TabStripItem.TabDisplay.TabOverlap + _TabStripItem.TabDisplay.TabSpacing + 4;
+
+                    if (size.Height < n)
+                        size.Height = n;
+                }
+            }
+
+            return (size);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region MeasureMarkup
+
+        /// <summary>
+        /// Measures the markup text
+        /// </summary>
+        /// <param name="tab"></param>
+        /// <param name="g"></param>
+        /// <param name="font"></param>
+        /// <returns></returns>
+        private Size MeasureMarkup(SuperTabItem tab, Graphics g, Font font)
+        {
+            TextMarkup.MarkupDrawContext d =
+                new TextMarkup.MarkupDrawContext(g, font, Color.Black, false);
+
+            Size size = new Size(5000, 5000);
+
+            tab.TextMarkupBody.InvalidateElementsSize();
+            tab.TextMarkupBody.Measure(size, d);
+
+            d.RightToLeft = _TabStripItem.IsRightToLeft;
+
+            tab.TextMarkupBody.Arrange(new
+                Rectangle(Point.Empty, tab.TextMarkupBody.Bounds.Size), d);
+
+            size = tab.TextMarkupBody.Bounds.Size;
+
+            return (size);
+        }
+
+        #endregion
+
+        #region MeasureText
+
+        /// <summary>
+        /// Measures the given text
+        /// </summary>
+        /// <param name="tab"></param>
+        /// <param name="g"></param>
+        /// <param name="font"></param>
+        /// <returns></returns>
+        private Size MeasureText(SuperTabItem tab, Graphics g, Font font)
+        {
+            string text = string.IsNullOrEmpty(tab.Text) ? "M" : tab.Text;
+
+            Size textSize = tab.IsVertical
+               ? TextDrawing.MeasureStringLegacy(g, text, font, Size.Empty, eTextFormat.Default)
+               : TextDrawing.MeasureString(g, text, font, 0, eTextFormat.Default);
+
+            return (textSize);
+        }
+
+        #endregion
+
+        #region LayoutBaseItem
+
+        private void LayoutBaseItem(BaseItem item)
+        {
+            Size size = new Size();
+            Rectangle bounds = Rectangle.Empty;
+
+            if (_FixedTabSize.Width <= 0 || _FixedTabSize.Height <= 0 || 
+                (item is ButtonItem && ((ButtonItem)item).FixedSize.IsEmpty))
+            {
+                item.RecalcSize();
+
+                size = item.Bounds.Size;
+
+                size.Width += _TabLayoutOffset.Width;
+                size.Height += _TabLayoutOffset.Height;
+
+                size.Width += _TabStripItem.ItemPadding.Horizontal;
+                size.Height += _TabStripItem.ItemPadding.Vertical;
+            }
+
+            if (_FixedTabSize.Width > 0)
+                size.Width = _FixedTabSize.Width;
+
+            if (_FixedTabSize.Height > 0)
+                size.Height = _FixedTabSize.Height;
+
+            if (!(item is ButtonItem && !((ButtonItem)item).FixedSize.IsEmpty))
+            {
+                bounds.Size = size;
+                item.Bounds = bounds;
+            }
+
+            if (item.Stretch == false)
+                _List[item] = size;
+        }
+
+        #endregion
+
+        #endregion
+
+        #region FinalizeLayout
+
+        /// <summary>
+        /// Finalizes the layout
+        /// </summary>
+        /// <param name="containerBounds"></param>
+        /// <param name="blocksBounds"></param>
+        /// <param name="lines"></param>
+        /// <returns></returns>
+        public override Rectangle FinalizeLayout(
+            Rectangle containerBounds, Rectangle blocksBounds, ArrayList lines)
+        {
+            if (lines.Count > 1)
+            {
+                int line = FindSelectedLine(lines);
+
+                ReorderLines(lines, line);
+                SetBlockDisplay(containerBounds, lines);
+                ResizeMultiLine(lines);
+            }
+            else
+            {
+                SetBlockDisplay(containerBounds, lines);
+                PromoteSelectedTab(containerBounds, lines);
+                ResizeSingleLine(lines);
+            }
+
+            _TabStripItem.TabLines = lines.Count;
+
+            _List.Clear();
+
+            return (blocksBounds);
+        }
+
+        #endregion
+
+        #region ReorderLines
+
+        /// <summary>
+        /// Reorders the lines to keep the selected tab as line 0.
+        /// </summary>
+        /// <param name="lines"></param>
+        /// <param name="line"></param>
+        private void ReorderLines(ArrayList lines, int line)
+        {
+            _SelLine = 0;
+
+            switch (_TabStripItem.TabAlignment)
+            {
+                case eTabStripAlignment.Top:
+                case eTabStripAlignment.Left:
+                    line++;
+                    _SelLine = lines.Count - line;
+                    break;
+
+                default:
+                    _SelLine = line;
+                    break;
+            }
+
+            if (_SelLine > 0)
+                AdjustLines(lines, line);
+        }
+
+        #region AdjustLines
+
+        /// <summary>
+        /// Adjusts the line layout
+        /// </summary>
+        /// <param name="lines"></param>
+        /// <param name="n"></param>
+        private void AdjustLines(ArrayList lines, int n)
+        {
+            Size[] szs = GetLineSizes(lines);
+
+            Point pt = new Point();
+
+            for (int i = 0; i < lines.Count; i++)
+            {
+                int t = (i + n) % lines.Count;
+
+                SerialContentLayoutManager.BlockLineInfo info =
+                    lines[t] as SerialContentLayoutManager.BlockLineInfo;
+
+                if (info != null)
+                {
+                    AdjustBlocks(info, pt);
+
+                    pt.X += szs[t].Width;
+                    pt.Y += szs[t].Height;
+                }
+            }
+        }
+
+        #endregion
+
+        #region GetLineSizes
+
+        /// <summary>
+        /// Gets the array od line sizes
+        /// </summary>
+        /// <param name="lines"></param>
+        /// <returns></returns>
+        private Size[] GetLineSizes(ArrayList lines)
+        {
+            Size[] szs = new Size[lines.Count];
+
+            for (int i = 0; i < lines.Count; i++)
+            {
+                SerialContentLayoutManager.BlockLineInfo info =
+                    lines[i] as SerialContentLayoutManager.BlockLineInfo;
+
+                if (info != null)
+                {
+                    IBlock item = info.Blocks[0] as IBlock;
+
+                    if (item != null)
+                        szs[i] = item.Bounds.Size;
+                }
+            }
+
+            return (szs);
+        }
+
+        #endregion
+
+        #region AdjustBlocks
+
+        /// <summary>
+        /// Adjusts the individual blocks within a given line
+        /// </summary>
+        /// <param name="info"></param>
+        /// <param name="pt"></param>
+        private void AdjustBlocks(SerialContentLayoutManager.BlockLineInfo info, Point pt)
+        {
+            for (int i = 0; i < info.Blocks.Count; i++)
+            {
+                BaseItem item = info.Blocks[i] as BaseItem;
+
+                if (item != null)
+                {
+                    switch (_TabStripItem.TabAlignment)
+                    {
+                        case eTabStripAlignment.Top:
+                        case eTabStripAlignment.Bottom:
+                            item.TopInternal = pt.Y;
+                            break;
+
+                        default:
+                            item.LeftInternal = pt.X;
+                            break;
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region SetBlockDisplay
+
+        #region SetBlockDisplay
+
+        /// <summary>
+        /// Sets the Displayed status for the line blocks
+        /// </summary>
+        /// <param name="containerBounds"></param>
+        /// <param name="lines"></param>
+        private void SetBlockDisplay(
+            Rectangle containerBounds, ArrayList lines)
+        {
+            for (int i = 0; i < lines.Count; i++)
+            {
+                SerialContentLayoutManager.BlockLineInfo info =
+                    lines[i] as SerialContentLayoutManager.BlockLineInfo;
+
+                if (info != null)
+                {
+                    bool checkBreaks = true;
+
+                    // Set each item's display state, and
+                    // align each item if they aren't being stretched
+
+                    for (int j = 0; j < info.Blocks.Count; j++)
+                    {
+                        BaseItem item = info.Blocks[j] as BaseItem;
+
+                        if (item != null)
+                        {
+                            bool displayed = item.Visible;
+
+                            if (info.Blocks.Count > 1 && containerBounds.Contains(item.Bounds) == false)
+                            {
+                                checkBreaks = false;
+                                displayed = false;
+                            }
+
+                            item.Displayed = displayed;
+
+                            if (item.Displayed == true)
+                                AlignBaseItem(item);
+                        }
+                    }
+
+                    // Check item breaks, if we have extra
+                    // room to spare
+
+                    if (checkBreaks == true)
+                    {
+                        Size size;
+                        int count = GetBreakCount(info, out size);
+
+                        if (count > 0)
+                        {
+                            if (_TabStripItem.IsVertical)
+                                ProcessBreaks(info, count, containerBounds.Height - size.Height, true);
+                            else
+                                ProcessBreaks(info, count, containerBounds.Width - size.Width, false);
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region AlignBaseItem
+
+        private void AlignBaseItem(BaseItem item)
+        {
+            Rectangle r = item.Bounds;
+
+            if (item.Stretch == false)
+            {
+                Size size;
+
+                if (_List.TryGetValue(item, out size) == true)
+                {
+                    r.Size = size;
+
+                    r.Y = item.Bounds.Y + (item.Bounds.Height - r.Height)/2;
+
+                    switch (item.ItemAlignment)
+                    {
+                        case eItemAlignment.Center:
+                            r.X += (item.Bounds.Width - r.Width)/2;
+                            break;
+
+                        case eItemAlignment.Far:
+                            r.X = item.Bounds.Right - r.Width;
+                            break;
+                    }
+                }
+            }
+
+            // Take user specified padding into account
+            // for all non-SuperTabItems only
+
+            if (item is SuperTabItem == false)
+            {
+                r.X += _TabStripItem.ItemPadding.Left;
+                r.Y += _TabStripItem.ItemPadding.Top;
+
+                r.Width -= (_TabStripItem.ItemPadding.Horizontal);
+                r.Height -= (_TabStripItem.ItemPadding.Vertical);
+            }
+
+            item.Bounds = r;
+        }
+
+        #endregion
+
+        #region GetBreakCount
+
+        /// <summary>
+        /// Gets the count of BeginBreak groups
+        /// </summary>
+        /// <param name="info"></param>
+        /// <param name="size"></param>
+        /// <returns></returns>
+        private int GetBreakCount(
+            SerialContentLayoutManager.BlockLineInfo info, out Size size)
+        {
+            int cnt = 0;
+            size = Size.Empty;
+
+            for (int i = 0; i < info.Blocks.Count; i++)
+            {
+                BaseItem item = info.Blocks[i] as BaseItem;
+
+                if (item != null)
+                {
+                    if (item.Displayed == true)
+                    {
+                        size.Width = item.Bounds.Right;
+                        size.Height = item.Bounds.Bottom;
+
+                        if (item.BeginGroup == true)
+                            cnt++;
+                    }
+                }
+            }
+
+            return (cnt);
+        }
+
+        #endregion
+
+        #region ProcessBreaks
+
+        /// <summary>
+        /// Process item BeginBreaks
+        /// </summary>
+        /// <param name="info"></param>
+        /// <param name="count"></param>
+        /// <param name="span"></param>
+        /// <param name="vertical"></param>
+        private void ProcessBreaks(SerialContentLayoutManager.BlockLineInfo info,
+            int count, int span, bool vertical)
+        {
+            int dcnt = 0;
+            float delta = 0;
+            float n = (float) span / count;
+
+            for (int i = 0; i < info.Blocks.Count; i++)
+            {
+                BaseItem item = info.Blocks[i] as BaseItem;
+
+                if (item != null && item.Displayed == true)
+                {
+                    if (item.BeginGroup == true)
+                        delta = (++dcnt == count) ? span : delta + n;
+
+                    if (delta > 0)
+                    {
+                        if (vertical == true)
+                            item.TopInternal += (int) delta;
+                        else
+                            item.LeftInternal += (int) delta;
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region PromoteSelectedTab
+
+        /// <summary>
+        /// Makes sure the "VisibleTab" is in fact visible.
+        /// </summary>
+        /// <param name="containerBounds"></param>
+        /// <param name="lines"></param>
+        private void PromoteSelectedTab(Rectangle containerBounds, ArrayList lines)
+        {
+            BaseItem vItem = _TabStripItem.VisibleTab;
+
+            if (vItem != null && vItem.Displayed == false)
+            {
+                SerialContentLayoutManager.BlockLineInfo info =
+                    lines[0] as SerialContentLayoutManager.BlockLineInfo;
+
+                if (info != null)
+                {
+                    for (int i = info.Blocks.Count - 1; i >= 0; i--)
+                    {
+                        BaseItem item = info.Blocks[i] as BaseItem;
+
+                        if (item != null)
+                        {
+                            Rectangle r = _TabStripItem.TabDisplay.NextBlockPosition(item, vItem);
+
+                            if (containerBounds.Contains(r) == true)
+                            {
+                                vItem.Bounds = r;
+                                vItem.Displayed = true;
+
+                                break;
+                            }
+
+                            item.Displayed = false;
+
+                            if (i == 0)
+                            {
+                                r = item.Bounds;
+                                r.Size = vItem.Size;
+
+                                vItem.Bounds = r;
+                                vItem.Displayed = true;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region FindSelectedLine
+
+        /// <summary>
+        /// Determines what line th selected tab lies within
+        /// </summary>
+        /// <param name="lines"></param>
+        /// <returns></returns>
+        private int FindSelectedLine(ArrayList lines)
+        {
+            for (int i = 0; i < lines.Count; i++)
+            {
+                SerialContentLayoutManager.BlockLineInfo line =
+                    lines[i] as SerialContentLayoutManager.BlockLineInfo;
+
+                if (line != null)
+                {
+                    int iBlock = FindSelectedBlock(line.Blocks);
+
+                    if (iBlock >= 0)
+                        return (i);
+                }
+            }
+
+            return (-1);
+        }
+
+        #endregion
+
+        #region FindSelectedBlock
+
+        /// <summary>
+        /// Finds the SelectedTab block
+        /// </summary>
+        /// <param name="blocks"></param>
+        /// <returns></returns>
+        private int FindSelectedBlock(ArrayList blocks)
+        {
+            for (int i = 0; i < blocks.Count; i++)
+            {
+                SuperTabItem tab = blocks[i] as SuperTabItem;
+
+                if (tab != null)
+                {
+                    if (tab == _TabStripItem.SelectedTab)
+                        return (i);
+                }
+            }
+
+            return (-1);
+        }
+
+        #endregion
+
+        #region ResizeSingleLine
+
+        /// <summary>
+        /// Resizes single line layouts
+        /// </summary>
+        /// <param name="lines"></param>
+        private void ResizeSingleLine(ArrayList lines)
+        {
+            SerialContentLayoutManager.BlockLineInfo info =
+                lines[0] as SerialContentLayoutManager.BlockLineInfo;
+
+            if (info != null)
+            {
+                switch (_TabStripItem.TabAlignment)
+                {
+                    case eTabStripAlignment.Top:
+                        ResizeSingleLine1(info, 0, _TabLayoutOffset.Height, 0, -_TabLayoutOffset.Height);
+                        break;
+
+                    case eTabStripAlignment.Left:
+                        ResizeSingleLine1(info, _TabLayoutOffset.Width, 0, -_TabLayoutOffset.Width, 0);
+                        break;
+
+                    case eTabStripAlignment.Bottom:
+                        ResizeSingleLine2(info, 0, 2, 0, -_TabLayoutOffset.Height);
+                        break;
+
+                    case eTabStripAlignment.Right:
+                        ResizeSingleLine2(info, 2, 0, -_TabLayoutOffset.Width, 0);
+                        break;
+                }
+            }
+        }
+
+        #region ResizeSingleLine1
+
+        private void ResizeSingleLine1(
+            SerialContentLayoutManager.BlockLineInfo info, int dx, int dy, int dw, int dh)
+        {
+            for (int i = 0; i < info.Blocks.Count; i++)
+            {
+                BaseItem item = info.Blocks[i] as BaseItem;
+
+                if (item != null)
+                {
+                    SuperTabItem tab = info.Blocks[i] as SuperTabItem;
+
+                    if (tab == null || tab.IsSelected == false)
+                    {
+                        Rectangle r = item.Bounds;
+
+                        r.X += dx;
+                        r.Y += dy;
+                        r.Width += dw;
+                        r.Height += dh;
+
+                        item.Bounds = r;
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region ResizeSingleLine2
+
+        private void ResizeSingleLine2(
+            SerialContentLayoutManager.BlockLineInfo info, int dx, int dy, int dw, int dh)
+        {
+            for (int i = 0; i < info.Blocks.Count; i++)
+            {
+                BaseItem item = info.Blocks[i] as BaseItem;
+
+                if (item != null)
+                {
+                    Rectangle r = item.Bounds;
+                    SuperTabItem tab = info.Blocks[i] as SuperTabItem;
+
+                    r.X += dx;
+                    r.Y += dy;
+
+                    if (tab == null || tab.IsSelected == false)
+                    {
+                        r.Width += dw;
+                        r.Height += dh;
+                    }
+
+                    item.Bounds = r;
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ResizeMultiLine
+
+        /// <summary>
+        /// Resizes multiline layouts
+        /// </summary>
+        /// <param name="lines"></param>
+        private void ResizeMultiLine(ArrayList lines)
+        {
+            switch (_TabStripItem.TabAlignment)
+            {
+                case eTabStripAlignment.Top:
+                    ResizeMultiLineTop();
+                    break;
+
+                case eTabStripAlignment.Left:
+                    ResizeMultiLineLeft();
+                    break;
+
+                case eTabStripAlignment.Bottom:
+                    ResizeMultiLineBottom(lines);
+                    break;
+
+                case eTabStripAlignment.Right:
+                    ResizeMultiLineRight(lines);
+                    break;
+            }
+        }
+
+        #region ResizeMultiLineTop
+
+        private void ResizeMultiLineTop()
+        {
+            if (_TabStripItem.SelectedTab != null)
+            {
+                Rectangle r = _TabStripItem.SelectedTab.Bounds;
+
+                r.Y -= _TabLayoutOffset.Height;
+                r.Height += _TabLayoutOffset.Height;
+
+                _TabStripItem.SelectedTab.Bounds = r;
+            }
+        }
+
+        #endregion
+
+        #region ResizeMultiLineLeft
+
+        private void ResizeMultiLineLeft()
+        {
+            if (_TabStripItem.SelectedTab != null)
+            {
+                Rectangle r = _TabStripItem.SelectedTab.Bounds;
+
+                r.X -= _TabLayoutOffset.Width;
+                r.Width += _TabLayoutOffset.Width;
+
+                _TabStripItem.SelectedTab.Bounds = r;
+            }
+        }
+
+        #endregion
+
+        #region ResizeMultiLineBottom
+
+        private void ResizeMultiLineBottom(ArrayList lines)
+        {
+            for (int i = 0; i < lines.Count; i++)
+            {
+                SerialContentLayoutManager.BlockLineInfo info =
+                    lines[i] as SerialContentLayoutManager.BlockLineInfo;
+
+                if (info != null)
+                {
+                    for (int j = 0; j < info.Blocks.Count; j++)
+                    {
+                        BaseItem item = info.Blocks[j] as BaseItem;
+
+                        if (item != null)
+                        {
+                            Rectangle r = item.Bounds;
+
+                            r.Y += 2;
+
+                            SuperTabItem tab = info.Blocks[j] as SuperTabItem;
+
+                            if (tab != null && tab.IsSelected == true)
+                                r.Height += _TabLayoutOffset.Height;
+
+                            item.Bounds = r;
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region ResizeMultiLineRight
+
+        private void ResizeMultiLineRight(ArrayList lines)
+        {
+            for (int i = 0; i < lines.Count; i++)
+            {
+                SerialContentLayoutManager.BlockLineInfo info =
+                    lines[i] as SerialContentLayoutManager.BlockLineInfo;
+
+                if (info != null)
+                {
+                    for (int j = 0; j < info.Blocks.Count; j++)
+                    {
+                        BaseItem item = info.Blocks[j] as BaseItem;
+
+                        if (item != null)
+                        {
+                            Rectangle r = item.Bounds;
+
+                            r.X += 2;
+
+                            SuperTabItem tab = info.Blocks[j] as SuperTabItem;
+
+                            if (tab != null && tab.IsSelected == true)
+                                r.Width += _TabLayoutOffset.Width;
+
+                            item.Bounds = r;
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #endregion
+    }
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/SuperTabControl/VS2008Dock/VS2008DockSuperTabItem.cs b/PROMS/DotNetBar Source Code/SuperTabControl/VS2008Dock/VS2008DockSuperTabItem.cs
new file mode 100644
index 00000000..584e2785
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/SuperTabControl/VS2008Dock/VS2008DockSuperTabItem.cs	
@@ -0,0 +1,256 @@
+#if FRAMEWORK20
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using DevComponents.DotNetBar.Rendering;
+
+namespace DevComponents.DotNetBar
+{
+    public class VS2008DockSuperTabItem : SuperTabItemBaseDisplay
+    {
+        public VS2008DockSuperTabItem(SuperTabItem tabItem)
+            : base(tabItem)
+        {
+        }
+
+        #region TabItemPath
+
+        /// <summary>
+        /// Creates the tab item GraphicsPath
+        /// </summary>
+        /// <returns>Tab path</returns>
+        internal override GraphicsPath TabItemPath()
+        {
+            // Check to see if the user is supplying a path
+
+            GraphicsPath path = base.TabItemPath();
+
+            if (path != null)
+                return (path);
+
+            // Supply the default path based upon
+            // the current tab alignment
+
+            switch (TabItem.TabAlignment)
+            {
+                case eTabStripAlignment.Top:
+                    return (TopTabPath());
+
+                case eTabStripAlignment.Bottom:
+                    return (BottomTabPath());
+
+                case eTabStripAlignment.Left:
+                    return (LeftTabPath());
+
+                default:
+                    return (RightTabPath());
+            }
+        }
+
+        #region TopTabPath
+
+        /// <summary>
+        /// Create the Top tab path
+        /// </summary>
+        /// <returns>GraphicsPath</returns>
+        private GraphicsPath TopTabPath()
+        {         
+            GraphicsPath path = new GraphicsPath();
+
+            Rectangle r = TabItem.DisplayRectangle;
+            r.Width -= 1;
+            r.Height -= 1;
+
+            // Allow for the TabStrip border
+
+            if (TabItem.IsSelected == true)
+                r.Height += 2;
+
+            // Create the path
+
+            path.AddLines(new Point[]
+            {
+                new Point(r.X, r.Bottom), 
+                new Point(r.X, r.Top),
+                new Point(r.Right, r.Top),
+                new Point(r.Right, r.Bottom),
+            });
+
+            return (path);
+        }
+
+        #endregion
+
+        #region BottomTabPath
+
+        /// <summary>
+        /// Creates the Bottom tab path
+        /// </summary>
+        /// <returns>GraphicsPath</returns>
+        private GraphicsPath BottomTabPath()
+        {
+            GraphicsPath path = new GraphicsPath();
+
+            Rectangle r = TabItem.DisplayRectangle;
+            r.Width -= 1;
+            r.Height -= 1;
+
+            // Allow for the TabStrip border
+            
+            if (TabItem.IsSelected == true)
+            {
+                r.Y -= 2;
+                r.Height += 2;
+            }
+
+            // Create the path
+            
+            path.AddLines(new Point[]
+            {
+                new Point(r.Right, r.Top),
+                new Point(r.Right, r.Bottom),
+                new Point(r.X, r.Bottom), 
+                new Point(r.X, r.Top),
+            });
+
+            return (path);
+        }
+
+        #endregion
+
+        #region LeftTabPath
+
+        /// <summary>
+        /// Creates the Left tab path
+        /// </summary>
+        /// <returns>GraphicsPath</returns>
+        private GraphicsPath LeftTabPath()
+        {
+            GraphicsPath path = new GraphicsPath();
+
+            Rectangle r = TabItem.DisplayRectangle;
+            r.Width -= 1;
+            r.Height -= 1;
+
+            // Allow for the TabStrip border
+
+            if (TabItem.IsSelected == true)
+                r.Width += 2;
+
+            // Create the tab path
+
+            path.AddLines(new Point[]
+            {
+                new Point(r.Right, r.Bottom),
+                new Point(r.X, r.Bottom), 
+                new Point(r.X, r.Top),
+                new Point(r.Right, r.Top),
+            });
+
+            return (path);
+        }
+
+        #endregion
+
+        #region RightTabPath
+
+        /// <summary>
+        /// Create the Right tab path
+        /// </summary>
+        /// <returns>GraphicsPath</returns>
+        private GraphicsPath RightTabPath()
+        {
+            GraphicsPath path = new GraphicsPath();
+
+            Rectangle r = TabItem.DisplayRectangle;
+            r.Width -= 1;
+            r.Height -= 1;
+
+            // Allow for the TabStrip border
+
+            if (TabItem.IsSelected == true)
+            {
+                r.X -= 2;
+                r.Width += 2;
+            }
+
+            // Create the tab path
+            
+            path.AddLines(new Point[]
+            {
+                new Point(r.X, r.Top),
+                new Point(r.Right, r.Top),
+                new Point(r.Right, r.Bottom),
+                new Point(r.X, r.Bottom), 
+            });
+
+            return (path);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region ApplyPredefinedColor
+
+        /// <summary>
+        /// Applies the predefined tab color to the color table
+        /// </summary>
+        /// <param name="tabState"></param>
+        /// <param name="sct"></param>
+        internal override void ApplyPredefinedColor(eTabState tabState, SuperTabItemStateColorTable sct)
+        {
+            if (TabItem.PredefinedColor != eTabItemColor.Default)
+            {
+                SuperTabItemColorTable ct =
+                    SuperTabStyleColorFactory.GetPredefinedTabColors(TabItem.PredefinedColor, ColorFactory.Empty);
+
+                SuperTabItemStateColorTable ict = ct.Default.Normal;
+
+                switch (tabState)
+                {
+                    case eTabState.SelectedMouseOver:
+                        ict = ct.Default.SelectedMouseOver;
+                        break;
+
+                    case eTabState.MouseOver:
+                        ict = ct.Default.MouseOver;
+                        break;
+
+                    case eTabState.Selected:
+                        ict = ct.Default.Selected;
+                        ict.InnerBorder = Color.Empty;
+                        break;
+                }
+
+                sct.InnerBorder = ict.InnerBorder;
+                sct.OuterBorder = ict.OuterBorder;
+                sct.Background = ict.Background;
+            }
+        }
+
+        #endregion
+
+        #region ApplyPredefinedColor
+
+        /// <summary>
+        /// Applies the predefined color to the panel color table
+        /// </summary>
+        /// <param name="pct"></param>
+        internal override void ApplyPredefinedColor(SuperTabPanelItemColorTable pct)
+        {
+            if (TabItem.PredefinedColor != eTabItemColor.Default)
+            {
+                SuperTabPanelItemColorTable ct =
+                    SuperTabStyleColorFactory.GetPredefinedPanelColors(TabItem.PredefinedColor, ColorFactory.Empty);
+
+                pct.Background = ct.Background;
+                pct.InnerBorder = pct.Background.Colors[pct.Background.Colors.Length - 1];
+                pct.OuterBorder = ct.OuterBorder;
+            }
+        }
+
+        #endregion
+
+    }
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/SuperTabControl/VS2008Dock/VS2008SuperTabStrip.cs b/PROMS/DotNetBar Source Code/SuperTabControl/VS2008Dock/VS2008SuperTabStrip.cs
new file mode 100644
index 00000000..68c9fdcc
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/SuperTabControl/VS2008Dock/VS2008SuperTabStrip.cs	
@@ -0,0 +1,30 @@
+#if FRAMEWORK20
+using System.Drawing;
+
+namespace DevComponents.DotNetBar
+{
+    internal class VS2008DockSuperTabStrip : SuperTabStripBaseDisplay
+    {
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="tabStripItem">Associated SuperTabStripItem</param>
+        public VS2008DockSuperTabStrip(SuperTabStripItem tabStripItem)
+            : base(tabStripItem)
+        {
+        }
+
+        #region Internal properties
+
+        /// <summary>
+        /// Gets the TabLayoutOffset
+        /// </summary>
+        internal override Size TabLayoutOffset
+        {
+            get { return (new Size(3, 2)); } 
+        }
+
+        #endregion
+    }
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/SuperTabControl/VS2008Document/VS2008DocumentSuperTabItem.cs b/PROMS/DotNetBar Source Code/SuperTabControl/VS2008Document/VS2008DocumentSuperTabItem.cs
new file mode 100644
index 00000000..f7af95f2
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/SuperTabControl/VS2008Document/VS2008DocumentSuperTabItem.cs	
@@ -0,0 +1,251 @@
+#if FRAMEWORK20
+using System.Drawing;
+using System.Drawing.Drawing2D;
+
+namespace DevComponents.DotNetBar
+{
+    public class VS2008DocumentSuperTabItem : SuperTabItemBaseDisplay
+    {
+        #region Constants
+
+        private const int SmRadius = 8;
+        private const int LgRadius = 20;
+
+        #endregion
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="tabItem">Associated SuperTabItem</param>
+        public VS2008DocumentSuperTabItem(SuperTabItem tabItem)
+            : base(tabItem)
+        {
+        }
+
+        #region ContentRectangle
+
+        /// <summary>
+        /// Returns the tab ContentRectangle
+        /// </summary>
+        /// <returns></returns>
+        internal override Rectangle ContentRectangle()
+        {
+            Rectangle r = TabItem.DisplayRectangle;
+
+            int n = TabStripItem.TabDisplay.TabOverlap;
+
+            if (TabStripItem.IsVertical == true)
+            {
+                r.Y += n;
+                r.Height -= n;
+            }
+            else
+            {
+                r.X += n;
+                r.Width -= n;
+            }
+
+            return (r);
+        }
+
+        #endregion
+
+        #region TabItemPath
+
+        /// <summary>
+        /// Creates the tab item GraphicsPath
+        /// </summary>
+        /// <returns>Tab path</returns>
+        internal override GraphicsPath TabItemPath()
+        {
+            // Check to see if the user is supplying a path
+            
+            GraphicsPath path = base.TabItemPath();
+
+            if (path != null)
+                return (path);
+
+            // Supply the default path based upon
+            // the current tab alignment
+
+            switch (TabItem.TabAlignment)
+            {
+                case eTabStripAlignment.Top:
+                    return (TopTabPath());
+
+                case eTabStripAlignment.Bottom:
+                    return (BottomTabPath());
+
+                case eTabStripAlignment.Left:
+                    return (LeftTabPath());
+
+                default:
+                    return (RightTabPath());
+            }
+        }
+
+        #region TopTabPath
+
+        /// <summary>
+        /// Create the Top tab path
+        /// </summary>
+        /// <returns>GraphicsPath</returns>
+        private GraphicsPath TopTabPath()
+        {
+            GraphicsPath path = new GraphicsPath();
+
+            Rectangle r = TabItem.DisplayRectangle;
+            r.Width -= 1;
+            r.Height -= 1;
+
+            // Allow for the TabStrip border
+            
+            if (TabItem.IsSelected == true)
+                r.Height += 2;
+
+            // Create the path
+            
+            int n = TabStripItem.TabDisplay.TabOverlap + TabStripItem.TabDisplay.TabSpacing;
+
+            Rectangle ar = new Rectangle(r.X + n, r.Y, LgRadius, LgRadius);
+
+            path.AddLine(r.X, r.Bottom, r.X, r.Bottom);
+            path.AddArc(ar, 218, 52);
+
+            ar = new Rectangle(r.Right - SmRadius, r.Y, SmRadius, SmRadius);
+            path.AddArc(ar, 270, 90);
+
+            path.AddLine(r.Right, r.Top + SmRadius, r.Right, r.Bottom);
+
+            return (path);
+        }
+
+        #endregion
+
+        #region BottomTabPath
+
+        /// <summary>
+        /// Creates the Bottom tab path
+        /// </summary>
+        /// <returns>GraphicsPath</returns>
+        private GraphicsPath BottomTabPath()
+        {
+            GraphicsPath path = new GraphicsPath();
+
+            Rectangle r = TabItem.DisplayRectangle;
+            r.Width -= 1;
+            r.Height -= 1;
+
+            // Allow for the TabStrip border
+            
+            if (TabItem.IsSelected == true)
+            {
+                r.Y -= 2;
+                r.Height += 2;
+            }
+
+            // Create the path
+
+            int n = TabStripItem.TabDisplay.TabOverlap;
+
+            Rectangle ar = new
+                Rectangle(r.Right - SmRadius, r.Bottom - SmRadius, SmRadius, SmRadius);
+
+            path.AddLine(r.Right, r.Top, r.Right, r.Bottom - SmRadius);
+            path.AddArc(ar, 0, 90);
+
+            ar = new Rectangle(r.X + n, r.Bottom - LgRadius, LgRadius, LgRadius);
+            path.AddArc(ar, 90, 62);
+
+            path.AddLine(r.X, r.Top, r.X, r.Top);
+
+            return (path);
+        }
+
+        #endregion
+
+        #region LeftTabPath
+
+        /// <summary>
+        /// Creates the Left tab path
+        /// </summary>
+        /// <returns>GraphicsPath</returns>
+        private GraphicsPath LeftTabPath()
+        {
+            GraphicsPath path = new GraphicsPath();
+
+            Rectangle r = TabItem.DisplayRectangle;
+            r.Width -= 1;
+            r.Height -= 1;
+
+            // Allow for the TabStrip border
+
+            if (TabItem.IsSelected == true)
+                r.Width += 2;
+
+            // Create the tab path
+
+            int n = TabStripItem.TabDisplay.TabOverlap;
+
+            Rectangle ar = new
+                Rectangle(r.X, r.Bottom - SmRadius, SmRadius, SmRadius);
+
+            path.AddLine(r.Right, r.Bottom, r.X + SmRadius, r.Bottom);
+            path.AddArc(ar, 90, 90);
+
+            ar = new Rectangle(r.X, r.Y + n, LgRadius, LgRadius);
+            path.AddArc(ar, 180, 62);
+
+            path.AddLine(r.Right, r.Top, r.Right, r.Top);
+
+            return (path);
+        }
+
+        #endregion
+
+        #region RightTabPath
+
+        /// <summary>
+        /// Create the Right tab path
+        /// </summary>
+        /// <returns>GraphicsPath</returns>
+        private GraphicsPath RightTabPath()
+        {
+            GraphicsPath path = new GraphicsPath();
+
+            Rectangle r = TabItem.DisplayRectangle;
+            r.Width -= 1;
+            r.Height -= 1;
+
+            // Allow for the TabStrip border
+            
+            if (TabItem.IsSelected == true)
+            {
+                r.X -= 2;
+                r.Width += 2;
+            }
+
+            // Create the tab path
+
+            int n = TabStripItem.TabDisplay.TabOverlap;
+
+            Rectangle ar = new
+                Rectangle(r.Right - LgRadius, r.Top + n, LgRadius, LgRadius);
+
+            path.AddLine(r.X, r.Top, r.X, r.Top);
+            path.AddArc(ar, 360 - 62, 62);
+
+            ar = new Rectangle(r.Right - SmRadius, r.Bottom - SmRadius, SmRadius, SmRadius);
+            path.AddArc(ar, 0, 90);
+
+            path.AddLine(r.Right - SmRadius, r.Bottom, r.X, r.Bottom);
+
+            return (path);
+        }
+
+        #endregion
+
+        #endregion
+    }
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/SuperTabControl/VS2008Document/VS2008DocumentSuperTabStrip.cs b/PROMS/DotNetBar Source Code/SuperTabControl/VS2008Document/VS2008DocumentSuperTabStrip.cs
new file mode 100644
index 00000000..48afb182
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/SuperTabControl/VS2008Document/VS2008DocumentSuperTabStrip.cs	
@@ -0,0 +1,157 @@
+#if FRAMEWORK20
+using System.Drawing;
+using DevComponents.UI.ContentManager;
+
+namespace DevComponents.DotNetBar
+{
+    internal class VS2008DocumentSuperTabStrip : SuperTabStripBaseDisplay
+    {
+        #region Constants
+
+        private const int HvTabSpacing = 0;
+        private const int HvTabOverLap = 20;
+
+        #endregion
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="tabStripItem">Associated SuperTabStripItem</param>
+        public VS2008DocumentSuperTabStrip(SuperTabStripItem tabStripItem)
+            : base(tabStripItem)
+        {
+        }
+
+        #region Internal properties
+
+        #region TabOverlap
+
+        /// <summary>
+        /// Gets the TabOverlap
+        /// </summary>
+        internal override int TabOverlap
+        {
+            get { return (HvTabOverLap); }
+        }
+
+        #endregion
+
+        #region TabSpacing
+
+        /// <summary>
+        /// Gets the TabSpacing
+        /// </summary>
+        internal override int TabSpacing
+        {
+            get { return (HvTabSpacing); }
+        }
+
+        #endregion
+
+        #region TabOverlapLeft
+
+        /// <summary>
+        /// Gets the TabOverlapLeft
+        /// </summary>
+        internal override bool TabOverlapLeft
+        {
+            get { return (true); }
+        }
+
+        #endregion
+
+        #region TabLayoutOffset
+
+        /// <summary>
+        /// Gets the TabLayoutOffset
+        /// </summary>
+        internal override Size TabLayoutOffset
+        {
+            get { return (new Size(3, 2)); }
+        }
+
+        #endregion
+
+        #region MinTabSize
+
+        /// <summary>
+        /// Gets the MinTabSize
+        /// </summary>
+        internal override Size MinTabSize
+        {
+            get
+            {
+                if (TabStripItem.IsVertical == true && TabStripItem.HorizontalText == true)
+                    return (new Size(33, 35));
+                
+                return (new Size(33, 16));
+            }
+        }
+
+        #endregion
+
+        #endregion
+
+        #region NextBlockPosition (LayoutManager)
+
+        /// <summary>
+        /// Gets the LayoutManager NextBlockPosition
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void NextBlockPosition(LayoutManagerPositionEventArgs e)
+        {
+            int n = Tabs.IndexOf((BaseItem)e.Block);
+
+            if (n >= 0 && n + 1 < Tabs.Count)
+            {
+                SuperTabItem tab1 = Tabs[n] as SuperTabItem;
+
+                if (tab1 != null)
+                {
+                    SuperTabItem tab2 = Tabs[n + 1] as SuperTabItem;
+
+                    if (tab2 != null)
+                    {
+                        e.NextPosition = e.CurrentPosition;
+
+                        if (TabStripItem.IsVertical == true)
+                            e.NextPosition.Y += (e.Block.Bounds.Height - HvTabOverLap);
+                        else
+                            e.NextPosition.X += (e.Block.Bounds.Width - HvTabOverLap);
+
+                        e.Cancel = true;
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region NextBlockPosition (PromoteSelectedTab)
+
+        /// <summary>
+        /// Gets the PromoteSelectedTab NextBlockPosition
+        /// </summary>
+        /// <param name="item"></param>
+        /// <param name="vItem"></param>
+        /// <returns></returns>
+        internal override Rectangle NextBlockPosition(BaseItem item, BaseItem vItem)
+        {
+            Rectangle r = base.NextBlockPosition(item, vItem);
+
+            if (item is SuperTabItem && vItem is SuperTabItem)
+            {
+                if (IsVertical == true)
+                    r.Y -= HvTabOverLap;
+                else
+                    r.X -= HvTabOverLap;
+            }
+
+            return (r);
+        }
+
+        #endregion
+
+    }
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/SuperTabControl/WinMediaPlayer12/WinMediaPlayer12SuperTabItem.cs b/PROMS/DotNetBar Source Code/SuperTabControl/WinMediaPlayer12/WinMediaPlayer12SuperTabItem.cs
new file mode 100644
index 00000000..5f57dd22
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/SuperTabControl/WinMediaPlayer12/WinMediaPlayer12SuperTabItem.cs	
@@ -0,0 +1,224 @@
+#if FRAMEWORK20
+using System.Drawing;
+using System.Drawing.Drawing2D;
+
+namespace DevComponents.DotNetBar
+{
+    public class WinMediaPlayer12SuperTabItem : SuperTabItemBaseDisplay
+    {
+        #region Constants
+
+        private const int Radius = 4;
+
+        #endregion
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="tabItem">Associated SuperTabItem</param>
+        public WinMediaPlayer12SuperTabItem(SuperTabItem tabItem)
+            : base(tabItem)
+        {
+        }
+
+        #region TabItemPath
+
+        /// <summary>
+        /// Creates the tab item GraphicsPath
+        /// </summary>
+        /// <returns>Tab path</returns>
+        internal override GraphicsPath TabItemPath()
+        {
+            // Check to see if the user is supplying a path
+
+            GraphicsPath path = base.TabItemPath();
+
+            if (path != null)
+                return (path);
+
+            // Supply the default path based upon
+            // the current tab alignment
+
+            switch (TabItem.TabAlignment)
+            {
+                case eTabStripAlignment.Top:
+                    return (TopTabPath());
+
+                case eTabStripAlignment.Bottom:
+                    return (BottomTabPath());
+
+                case eTabStripAlignment.Left:
+                    return (LeftTabPath());
+
+                default:
+                    return (RightTabPath());
+            }
+        }
+
+        #region TopTabPath
+
+        /// <summary>
+        /// Create the Top tab path
+        /// </summary>
+        /// <returns>GraphicsPath</returns>
+        private GraphicsPath TopTabPath()
+        {
+            GraphicsPath path = new GraphicsPath();
+
+            Rectangle r = TabItem.DisplayRectangle;
+            r.Width -= 1;
+            r.Height -= 1;
+
+            // Allow for the TabStrip border
+
+            if (TabItem.IsSelected == true)
+                r.Height += 2;
+
+            // Create the path
+            
+            int n = TabStripItem.TabDisplay.TabSpacing;
+
+            Rectangle ar = new Rectangle(r.X, r.Y, Radius, Radius);
+
+            path.AddLine(r.X, r.Bottom, r.X, r.Top + Radius);
+            path.AddArc(ar, 180, 90);
+
+            path.AddLine(r.X + Radius, r.Top, r.Right - n - Radius, r.Top);
+
+            ar.X = r.Right - n - Radius;
+            path.AddArc(ar, 270, 90);
+
+            path.AddLine(r.Right - n, r.Top + Radius, r.Right - n, r.Bottom);
+
+            return (path);
+        }
+
+        #endregion
+
+        #region BottomTabPath
+
+        /// <summary>
+        /// Creates the Bottom tab path
+        /// </summary>
+        /// <returns>GraphicsPath</returns>
+        private GraphicsPath BottomTabPath()
+        {
+            GraphicsPath path = new GraphicsPath();
+
+            Rectangle r = TabItem.DisplayRectangle;
+            r.Width -= 1;
+            r.Height -= 1;
+
+            // Allow for the TabStrip border
+            
+            if (TabItem.IsSelected == true)
+            {
+                r.Y -= 2;
+                r.Height += 2;
+            }
+
+            // Create the path
+
+            Rectangle ar = new
+                Rectangle(r.Right - Radius, r.Bottom - Radius, Radius, Radius);
+
+            path.AddLine(r.Right, r.Top, r.Right, r.Bottom - Radius);
+            path.AddArc(ar, 0, 90);
+
+            path.AddLine(r.Right - Radius, r.Bottom, r.X + Radius, r.Bottom);
+
+            ar.X = r.X;
+            path.AddArc(ar, 90, 90);
+
+            path.AddLine(r.X, r.Bottom - Radius, r.X, r.Top);
+
+            return (path);
+        }
+
+        #endregion
+
+        #region LeftTabPath
+
+        /// <summary>
+        /// Creates the Left tab path
+        /// </summary>
+        /// <returns>GraphicsPath</returns>
+        private GraphicsPath LeftTabPath()
+        {
+            GraphicsPath path = new GraphicsPath();
+
+            Rectangle r = TabItem.DisplayRectangle;
+            r.Width -= 1;
+            r.Height -= 1;
+
+            // Allow for the TabStrip border
+
+            if (TabItem.IsSelected == true)
+                r.Width += 2;
+
+            // Create the tab path
+
+            Rectangle ar = new
+                Rectangle(r.X, r.Bottom - Radius, Radius, Radius);
+
+            path.AddLine(r.Right, r.Bottom, r.X + Radius, r.Bottom);
+            path.AddArc(ar, 90, 90);
+
+            path.AddLine(r.X, r.Bottom - Radius, r.X, r.Top + Radius);
+
+            ar.Y = r.Y;
+            path.AddArc(ar, 180, 90);
+
+            path.AddLine(r.X + Radius, r.Top, r.Right, r.Top);
+
+            return (path);
+        }
+
+        #endregion
+
+        #region RightTabPath
+
+        /// <summary>
+        /// Create the Right tab path
+        /// </summary>
+        /// <returns>GraphicsPath</returns>
+        private GraphicsPath RightTabPath()
+        {
+            GraphicsPath path = new GraphicsPath();
+
+            Rectangle r = TabItem.DisplayRectangle;
+            r.Width -= 1;
+            r.Height -= 1;
+
+            // Allow for the TabStrip border
+
+            if (TabItem.IsSelected == true)
+            {
+                r.X -= 2;
+                r.Width += 2;
+            }
+
+            // Create the tab path
+
+            Rectangle ar = new
+                Rectangle(r.Right - Radius, r.Top, Radius, Radius);
+
+            path.AddLine(r.X, r.Top, r.Right - Radius, r.Top);
+            path.AddArc(ar, 270, 90);
+
+            path.AddLine(r.Right, r.Top + Radius, r.Right, r.Bottom - Radius);
+
+            ar.Y = r.Bottom - Radius;
+            path.AddArc(ar, 0, 90);
+
+            path.AddLine(r.Right - Radius, r.Bottom, r.X, r.Bottom);
+
+            return (path);
+        }
+
+        #endregion
+
+        #endregion
+    }
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/SuperTabControl/WinMediaPlayer12/WinMediaPlayer12SuperTabStrip.cs b/PROMS/DotNetBar Source Code/SuperTabControl/WinMediaPlayer12/WinMediaPlayer12SuperTabStrip.cs
new file mode 100644
index 00000000..8e22d9c3
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/SuperTabControl/WinMediaPlayer12/WinMediaPlayer12SuperTabStrip.cs	
@@ -0,0 +1,86 @@
+#if FRAMEWORK20
+using System.Drawing;
+using DevComponents.UI.ContentManager;
+
+namespace DevComponents.DotNetBar
+{
+    internal class WinMediaPlayer12SuperTabStrip : SuperTabStripBaseDisplay
+    {
+        #region Constants
+
+        private const int HvTabOverLap = -3;
+
+        #endregion
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="tabStripItem">Associated SuperTabStripItem</param>
+        public WinMediaPlayer12SuperTabStrip(SuperTabStripItem tabStripItem)
+            : base(tabStripItem)
+        {
+            tabStripItem.ControlBox.MenuBox.Style = eDotNetBarStyle.Office2010;
+        }
+
+        #region NextBlockPosition (LayoutManager)
+
+        /// <summary>
+        /// Gets the Layout manager NextBlockPosition
+        /// </summary>
+        /// <param name="e"></param>
+        protected override void NextBlockPosition(LayoutManagerPositionEventArgs e)
+        {
+            int n = Tabs.IndexOf((BaseItem)e.Block);
+
+            if (n >= 0 && n + 1 < Tabs.Count)
+            {
+                SuperTabItem tab1 = Tabs[n] as SuperTabItem;
+
+                if (tab1 != null)
+                {
+                    SuperTabItem tab2 = Tabs[n + 1] as SuperTabItem;
+
+                    if (tab2 != null)
+                    {
+                        e.NextPosition = e.CurrentPosition;
+
+                        if (TabStripItem.IsVertical == true)
+                            e.NextPosition.Y += (e.Block.Bounds.Height - HvTabOverLap);
+                        else
+                            e.NextPosition.X += (e.Block.Bounds.Width - HvTabOverLap);
+
+                        e.Cancel = true;
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region NextBlockPosition (PromoteSelTab)
+
+        /// <summary>
+        /// Gets the "PromoteSelTab" NextBlockPosition
+        /// </summary>
+        /// <param name="item"></param>
+        /// <param name="vItem"></param>
+        /// <returns></returns>
+        internal override Rectangle NextBlockPosition(BaseItem item, BaseItem vItem)
+        {
+            Rectangle r = base.NextBlockPosition(item, vItem);
+
+            if (item is SuperTabItem && vItem is SuperTabItem)
+            {
+                if (TabStripItem.IsVertical == true)
+                    r.Y -= HvTabOverLap;
+                else
+                    r.X -= HvTabOverLap;
+            }
+
+            return (r);
+        }
+
+        #endregion
+    }
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/SuperTabStrip.ico b/PROMS/DotNetBar Source Code/SuperTabStrip.ico
new file mode 100644
index 00000000..33493b78
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SuperTabStrip.ico differ
diff --git a/PROMS/DotNetBar Source Code/SwitchButton/Office2010SwitchButtonPainter.cs b/PROMS/DotNetBar Source Code/SwitchButton/Office2010SwitchButtonPainter.cs
new file mode 100644
index 00000000..31745c0e
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/SwitchButton/Office2010SwitchButtonPainter.cs	
@@ -0,0 +1,194 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using DevComponents.DotNetBar.Ribbon;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    internal class Office2010SwitchButtonPainter : SwitchButtonPainter, IOffice2007Painter
+    {
+        #region Internal Implementation
+        private static readonly int SwitchCornerSize = 2;
+        public override void Paint(SwitchButtonRenderEventArgs e)
+        {
+            SwitchButtonItem switchButton = e.SwitchButtonItem;
+            bool enabled = switchButton.Enabled;
+            SwitchButtonColorTable colorTable = enabled ? this.ColorTable.SwitchButton.Default : this.ColorTable.SwitchButton.Disabled;
+            if (colorTable == null) colorTable = new SwitchButtonColorTable();
+            
+            Rectangle bounds = switchButton.Bounds;
+            int buttonWidth = Dpi.Width(switchButton.ButtonWidth);
+            Padding margin = Dpi.Size(switchButton.Margin);
+            if (e.ItemPaintArgs != null && e.ItemPaintArgs.ContainerControl is AdvTree.AdvTree)
+            {
+                if (switchButton.ItemAlignment == eItemAlignment.Far)
+                    bounds.X = bounds.Right - margin.Right - buttonWidth;
+                else if (switchButton.ItemAlignment == eItemAlignment.Center)
+                    bounds.X += (bounds.Width - buttonWidth) / 2;
+            }
+            else
+                bounds.X = bounds.Right - margin.Right - buttonWidth;
+            bounds.Width = buttonWidth;
+            int buttonHeight = Dpi.Height(switchButton.ButtonHeight);
+            bounds.Y += margin.Top + (bounds.Height - margin.Vertical - buttonHeight) / 2;
+            bounds.Height = buttonHeight;
+            switchButton.ButtonBounds = bounds;
+            bool rendersOnGlass = (e.ItemPaintArgs != null && e.ItemPaintArgs.GlassEnabled && (switchButton.Parent is CaptionItemContainer && !(e.ItemPaintArgs.ContainerControl is QatToolbar) || (switchButton.Parent is RibbonTabItemContainer && switchButton.EffectiveStyle == eDotNetBarStyle.Office2010)));
+            Graphics g = e.Graphics;
+            if (switchButton.TextVisible && !string.IsNullOrEmpty(switchButton.Text))
+            {
+                Rectangle textRect = switchButton.Bounds;
+                Padding textPadding = Dpi.Size(switchButton.TextPadding);
+                textRect.Width -= buttonWidth + margin.Right + textPadding.Horizontal;
+                textRect.Y += textPadding.Top;
+                textRect.X += textPadding.Left;
+                textRect.Height -= textPadding.Vertical;
+                bool rtl = e.RightToLeft;
+                Color textColor = (switchButton.TextColor.IsEmpty || !enabled) ? colorTable.TextColor : switchButton.TextColor;
+                Font textFont = e.Font;
+                eTextFormat tf = eTextFormat.Left | eTextFormat.VerticalCenter;
+                if (switchButton.TextMarkupBody != null)
+                {
+                    TextMarkup.MarkupDrawContext d = new TextMarkup.MarkupDrawContext(g, textFont, textColor, rtl);
+                    d.HotKeyPrefixVisible = !((tf & eTextFormat.HidePrefix) == eTextFormat.HidePrefix);
+                    if ((tf & eTextFormat.VerticalCenter) == eTextFormat.VerticalCenter)
+                        textRect.Y = switchButton.TopInternal + (switchButton.Bounds.Height - switchButton.TextMarkupBody.Bounds.Height) / 2;
+                    else if ((tf & eTextFormat.Bottom) == eTextFormat.Bottom)
+                        textRect.Y += (switchButton.TextMarkupBody.Bounds.Height - textRect.Height) + 1;
+                    textRect.Height = switchButton.TextMarkupBody.Bounds.Height;
+                    switchButton.TextMarkupBody.Bounds = textRect;
+                    switchButton.TextMarkupBody.Render(d);
+                }
+                else
+                {
+#if FRAMEWORK20
+                    if(rendersOnGlass)
+                    {
+                        if (!e.ItemPaintArgs.CachedPaint)
+                            Office2007RibbonControlPainter.PaintTextOnGlass(g, switchButton.Text, textFont, textRect, TextDrawing.GetTextFormat(tf));
+                    }
+                    else
+#endif
+                        TextDrawing.DrawString(g, switchButton.Text, textFont, textColor, textRect, tf);
+                }
+            }
+
+
+            bool switchState = switchButton.Value;
+            string offText = switchButton.OffText;
+            string onText = switchButton.OnText;
+            Font font = (switchButton.SwitchFont == null) ? new Font(e.Font, FontStyle.Bold) : switchButton.SwitchFont;
+            Color textOffColor = (switchButton.OffTextColor.IsEmpty || !enabled) ? colorTable.OffTextColor : switchButton.OffTextColor;
+            Color textOnColor = (switchButton.OnTextColor.IsEmpty || !enabled) ? colorTable.OnTextColor : switchButton.OnTextColor;
+
+            int switchWidth = Dpi.Width(switchButton.SwitchWidth);
+            int switchX = Math.Min(bounds.X + switchButton.SwitchOffset, bounds.Right);
+            if (switchState)
+            {
+                switchX = Math.Max(bounds.Right - switchWidth - switchButton.SwitchOffset, bounds.X);
+            }
+
+            Color borderColor = (switchButton.BorderColor.IsEmpty || !enabled) ? colorTable.BorderColor : switchButton.BorderColor;
+            Color offBackgroundColor = (switchButton.OffBackColor.IsEmpty || !enabled) ? colorTable.OffBackColor : switchButton.OffBackColor;
+            Color onBackgroundColor = (switchButton.OnBackColor.IsEmpty || !enabled) ? colorTable.OnBackColor : switchButton.OnBackColor;
+
+            // Set clip
+            Rectangle innerBoundsClip = bounds;
+            innerBoundsClip.Inflate(-1, -1);
+            GraphicsPath innerClipPath = DisplayHelp.GetRoundedRectanglePath(innerBoundsClip, SwitchCornerSize - 1);
+            Region oldClip = g.Clip;
+            g.SetClip(innerClipPath, System.Drawing.Drawing2D.CombineMode.Intersect);
+            innerClipPath.Dispose();
+            
+            // Draw On Background, it is to the left of the switch
+            Rectangle onBounds = new Rectangle(switchX - (bounds.Width - switchWidth), bounds.Y, bounds.Width - switchWidth + 2, bounds.Height);
+            switchButton.OnPartBounds = onBounds;
+            DisplayHelp.FillRoundedRectangle(g, onBounds, SwitchCornerSize - 1, onBackgroundColor);
+            DisplayHelp.FillRoundedRectangle(g, onBounds, SwitchCornerSize - 1, Color.FromArgb(onBackgroundColor.GetBrightness() > .90f ? 8 : 24, Color.Black), Color.FromArgb(32, Color.White));
+            // Draw On Text
+            if(rendersOnGlass && BarUtilities.UseTextRenderer)
+                TextDrawing.DrawStringLegacy(g, onText, font, textOnColor, onBounds, eTextFormat.HorizontalCenter | eTextFormat.VerticalCenter);
+            else
+                TextDrawing.DrawString(g, onText, font, textOnColor, onBounds, eTextFormat.HorizontalCenter | eTextFormat.VerticalCenter);
+
+            // Draw Off Background, it is on the right of the switch 
+            Rectangle offBounds = new Rectangle(switchX + switchWidth - 2, bounds.Y, bounds.Width - switchWidth + 2, bounds.Height);
+            switchButton.OffPartBounds = offBounds;
+            DisplayHelp.FillRoundedRectangle(g, offBounds, SwitchCornerSize, offBackgroundColor);
+            DisplayHelp.FillRoundedRectangle(g, offBounds, SwitchCornerSize, Color.FromArgb(offBackgroundColor.GetBrightness() > .90f ? 12 : 32, Color.Black), Color.FromArgb(64, Color.White));
+            // Draw Off Text
+            if (rendersOnGlass && BarUtilities.UseTextRenderer)
+                TextDrawing.DrawStringLegacy(g, offText, font, textOffColor, offBounds, eTextFormat.HorizontalCenter | eTextFormat.VerticalCenter);
+            else
+                TextDrawing.DrawString(g, offText, font, textOffColor, offBounds, eTextFormat.HorizontalCenter | eTextFormat.VerticalCenter);
+
+            // Restore old clip
+            g.Clip = oldClip;
+            oldClip.Dispose();
+
+            // Main control border
+            DisplayHelp.DrawRoundedRectangle(g, borderColor, bounds, SwitchCornerSize);
+
+            LinearGradientColorTable innerOverlay = new LinearGradientColorTable(Color.FromArgb(96, Color.DarkGray), Color.Transparent, 90);
+            Rectangle overlayBounds = bounds;
+            overlayBounds.Inflate(-SwitchCornerSize / 2, -1);
+            DisplayHelp.DrawLine(g, overlayBounds.X, overlayBounds.Y, overlayBounds.Right, overlayBounds.Y, Color.FromArgb(24, Color.Black), 1);
+            overlayBounds.Y++;
+            DisplayHelp.DrawLine(g, overlayBounds.X, overlayBounds.Y, overlayBounds.Right, overlayBounds.Y, Color.FromArgb(8, Color.Black), 1);
+
+            // Draw Switch on top
+            Rectangle switchBounds = new Rectangle(switchX, bounds.Y, switchWidth, bounds.Height);
+            switchButton.SwitchBounds = switchBounds;
+            Color switchBorderColor = (switchButton.SwitchBorderColor.IsEmpty || !enabled) ? colorTable.SwitchBorderColor : switchButton.SwitchBorderColor;
+            Color switchFillColor = (switchButton.SwitchBackColor.IsEmpty || !enabled) ? colorTable.SwitchBackColor : switchButton.SwitchBackColor;
+            if (!colorTable.SwitchOnBackColor.IsEmpty && !switchButton.Value && switchButton.SwitchBackColor.IsEmpty)
+                switchFillColor = colorTable.SwitchOnBackColor;
+
+            if (switchBounds.Right + 2 < bounds.Right)
+            {
+                DisplayHelp.DrawLine(g, switchBounds.Right, switchBounds.Y + 3, switchBounds.Right, switchBounds.Bottom - 2, Color.FromArgb(24, Color.Black), 1);
+                DisplayHelp.DrawLine(g, switchBounds.Right + 1, switchBounds.Y + 3, switchBounds.Right + 1, switchBounds.Bottom - 2, Color.FromArgb(8, Color.Black), 1);
+            }
+
+            DisplayHelp.DrawRoundedRectangle(g, switchBorderColor, switchFillColor, switchBounds, SwitchCornerSize);
+            DisplayHelp.FillRoundedRectangle(g, switchBounds, SwitchCornerSize, Color.FromArgb(switchFillColor.GetBrightness() > .90f ? 42 : 72, Color.Black), Color.FromArgb(64, Color.White));
+            DisplayHelp.DrawLine(g, switchBounds.X + 2, switchBounds.Y + 1, switchBounds.Right - 3, switchBounds.Y + 1, Color.FromArgb(164, Color.White), 1);
+
+            if (switchButton.IsReadOnly && switchButton.ShowReadOnlyMarker)
+            {
+                Color markerColor=switchButton.ReadOnlyMarkerColor;
+                Rectangle marker = new Rectangle(switchBounds.X + (switchBounds.Width - 7) / 2, switchBounds.Y + (switchBounds.Height - 10) / 2, 7, 10);
+                SmoothingMode sm = g.SmoothingMode;
+                g.SmoothingMode = SmoothingMode.None;
+                using (SolidBrush brush = new SolidBrush(markerColor))
+                {
+                    g.FillRectangle(brush, new Rectangle(marker.X, marker.Y + 4, marker.Width, marker.Height - 4));
+                    g.FillRectangle(Brushes.White, new Rectangle(marker.X + 3, marker.Y + 5, 1, 2));
+                }
+                using (Pen pen = new Pen(markerColor, 1))
+                {
+                    g.DrawLine(pen, marker.X + 2, marker.Y + 0, marker.X + 4, marker.Y + 0);
+                    g.DrawLine(pen, marker.X + 1, marker.Y + 1, marker.X + 1, marker.Y + 3);
+                    g.DrawLine(pen, marker.X + 5, marker.Y + 1, marker.X + 5, marker.Y + 3);
+                }
+                g.SmoothingMode = sm;
+            }
+        }
+        #endregion
+
+        #region IOffice2007Painter
+        private Office2007ColorTable _ColorTable = null;
+
+        /// <summary>
+        /// Gets or sets color table used by renderer.
+        /// </summary>
+        public Office2007ColorTable ColorTable
+        {
+            get { return _ColorTable; }
+            set { _ColorTable = value; }
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/SwitchButton/SwitchButton.cs b/PROMS/DotNetBar Source Code/SwitchButton/SwitchButton.cs
new file mode 100644
index 00000000..d54d0945
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/SwitchButton/SwitchButton.cs	
@@ -0,0 +1,770 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel;
+using System.Drawing;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.Events;
+
+namespace DevComponents.DotNetBar.Controls
+{
+    [ToolboxBitmap(typeof(SwitchButton), "Controls.SwitchButton.ico"), ToolboxItem(true), System.Runtime.InteropServices.ComVisible(false), Designer("DevComponents.DotNetBar.Design.SwitchButtonDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+    [DefaultEvent("ValueChanged"), DefaultBindingProperty("Value"), DefaultProperty("Value")]
+    public class SwitchButton : BaseItemControl, ICommandSource
+    {
+        #region Events
+        /// <summary>
+        /// Occurs before Value property has changed and it allows you to cancel the change.
+        /// </summary>
+        public event EventHandler ValueChanging;
+        /// <summary>
+        /// Raises ValueChanging event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnValueChanging(EventArgs e)
+        {
+            EventHandler handler = ValueChanging;
+            if (handler != null)
+                handler(this, e);
+        }
+        /// <summary>
+        /// Occurs after Value property has changed.
+        /// </summary>
+        public event EventHandler ValueChanged;
+        /// <summary>
+        /// Raises ValueChanged event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnValueChanged(EventArgs e)
+        {
+            EventHandler handler = ValueChanged;
+            if (handler != null)
+                handler(this, e);
+        }
+        #endregion
+
+        #region Constructor, Dispose
+        private SwitchButtonItem _SwitchButton = null;
+        public SwitchButton()
+        {
+            this.SetStyle(ControlStyles.Selectable, true);
+            _SwitchButton = new SwitchButtonItem();
+            _SwitchButton.TextVisible = false;
+            _SwitchButton.ValueChanging += new EventHandler(SwitchButtonItemValueChanging);
+            _SwitchButton.ValueChanged += new EventHandler(SwitchButtonItemValueChanged);
+
+            this.HostItem = _SwitchButton;
+        }
+        #endregion
+
+        #region Internal Implementation
+        protected override void OnHandleCreated(EventArgs e)
+        {
+            this.RecalcLayout();
+            base.OnHandleCreated(e);
+        }
+        /// <summary>
+        /// Forces the button to perform internal layout.
+        /// </summary>
+        public override void RecalcLayout()
+        {
+            if (_SwitchButton == null) return;
+            _SwitchButton.ButtonWidth = Math.Max(4, Dpi.DescaleWidth(this.Width - this.Padding.Horizontal));
+            _SwitchButton.ButtonHeight = Math.Max(4, Dpi.DescaleHeight(this.Height - this.Padding.Vertical));
+            base.RecalcLayout();
+        }
+        protected override void OnKeyDown(KeyEventArgs e)
+        {
+            if (e.KeyCode == Keys.Space && this.Enabled && !IsReadOnly)
+            {
+                _SwitchButton.SetValueAndAnimate(!_SwitchButton.Value, eEventSource.Keyboard);
+            }
+            base.OnKeyDown(e);
+        }
+
+        /// <summary>
+        /// Gets or sets the switch value.
+        /// </summary>
+        [DefaultValue(false), Category("Appearance"), Description("Indicates switch value."), Bindable(true)]
+        public bool Value
+        {
+            get { return _SwitchButton.Value; }
+            set
+            {
+                _SwitchButton.Value = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the item border color.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates item border color.")]
+        public Color BorderColor
+        {
+            get { return _SwitchButton.BorderColor; }
+            set { _SwitchButton.BorderColor = value; }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeBorderColor()
+        {
+            return _SwitchButton.ShouldSerializeBorderColor();
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetBorderColor()
+        {
+            this.BorderColor = Color.Empty;
+        }
+
+        /// <summary>
+        /// Cancels animation if in progress.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void CancelAnimation()
+        {
+            _SwitchButton.CancelAnimation();
+        }
+
+        /// <summary>
+        /// Gets or sets whether state transition animation is enabled.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance"), Description("Indicates whether state transition animation is enabled.")]
+        public bool AnimationEnabled
+        {
+            get { return _SwitchButton.AnimationEnabled; }
+            set
+            {
+                _SwitchButton.AnimationEnabled = value;
+            }
+        }
+
+        void SwitchButtonItemValueChanged(object sender, EventArgs e)
+        {
+            _ValueObject = GetValueObject(this.Value);
+
+            ExecuteCommand();
+            OnValueChanged(e);
+            OnValueObjectChanged(e);
+        }
+
+        void SwitchButtonItemValueChanging(object sender, EventArgs e)
+        {
+            OnValueChanging(e);
+        }
+
+        protected override System.Drawing.Size DefaultSize
+        {
+            get
+            {
+                return new System.Drawing.Size(66, 22);
+            }
+        }
+
+        protected override void OnPaddingChanged(EventArgs e)
+        {
+            _SwitchButton.Margin.Bottom = this.Padding.Bottom;
+            _SwitchButton.Margin.Top = this.Padding.Top;
+            _SwitchButton.Margin.Left = this.Padding.Left;
+            _SwitchButton.Margin.Right = this.Padding.Right;
+
+            base.OnPaddingChanged(e);
+        }
+
+        /// <summary>
+        /// Gets or sets the color of the OFF state background.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates color of OFF state background.")]
+        public Color OffBackColor
+        {
+            get { return _SwitchButton.OffBackColor; }
+            set { _SwitchButton.OffBackColor = value; }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeOffBackColor()
+        {
+            return _SwitchButton.ShouldSerializeOffBackColor();
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetOffBackColor()
+        {
+            this.OffBackColor = Color.Empty;
+        }
+
+        /// <summary>
+        /// Gets or sets the color of the ON state background.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates color of ON state background.")]
+        public Color OnBackColor
+        {
+            get { return _SwitchButton.OnBackColor; }
+            set { _SwitchButton.OnBackColor = value; }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeOnBackColor()
+        {
+            return _SwitchButton.ShouldSerializeOnBackColor();
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetOnBackColor()
+        {
+            this.OnBackColor = Color.Empty;
+        }
+
+        /// <summary>
+        /// Gets or sets the color of the ON state text.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates color of ON state text.")]
+        public Color OnTextColor
+        {
+            get { return _SwitchButton.OnTextColor; }
+            set { _SwitchButton.OnTextColor = value; }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeOnTextColor()
+        {
+            return _SwitchButton.ShouldSerializeOnTextColor();
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetOnTextColor()
+        {
+            this.OnTextColor = Color.Empty;
+        }
+
+        /// <summary>
+        /// Gets or sets the color of the OFF state text.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates color of OFF state text.")]
+        public Color OffTextColor
+        {
+            get { return _SwitchButton.OffTextColor; }
+            set { _SwitchButton.OffTextColor = value; }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeOffTextColor()
+        {
+            return _SwitchButton.ShouldSerializeOffTextColor();
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetOffTextColor()
+        {
+            this.OffTextColor = Color.Empty;
+        }
+
+        /// <summary>
+        /// Gets or sets the border color of the button switch.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates border color of the button switch.")]
+        public Color SwitchBorderColor
+        {
+            get { return _SwitchButton.SwitchBorderColor; }
+            set { _SwitchButton.SwitchBorderColor = value; }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeSwitchBorderColor()
+        {
+            return _SwitchButton.ShouldSerializeSwitchBorderColor();
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetSwitchBorderColor()
+        {
+            this.SwitchBorderColor = Color.Empty;
+        }
+        /// <summary>
+        /// Gets or sets the background color of the switch button.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates background color of the switch button.")]
+        public Color SwitchBackColor
+        {
+            get { return _SwitchButton.SwitchBackColor; }
+            set { _SwitchButton.SwitchBackColor = value; }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeSwitchBackColor()
+        {
+            return _SwitchButton.ShouldSerializeSwitchBackColor();
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetSwitchBackColor()
+        {
+            this.SwitchBackColor = Color.Empty;
+        }
+
+
+        /// <summary>
+        /// Gets or sets the text color.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates text color."), Browsable(false)]
+        public Color TextColor
+        {
+            get { return _SwitchButton.TextColor; }
+            set { _SwitchButton.TextColor = value; }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeTextColor()
+        {
+            return _SwitchButton.ShouldSerializeTextColor();
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetTextColor()
+        {
+            this.TextColor = Color.Empty;
+        }
+
+        /// <summary>
+        /// Gets or sets the font that is used to draw ON/OFF text on the switch button.
+        /// </summary>
+        [DefaultValue(null), Category("Appearance"), Description("Indicates font that is used to draw ON/OFF text on the switch button.")]
+        public Font SwitchFont
+        {
+            get { return _SwitchButton.SwitchFont; }
+            set { _SwitchButton.SwitchFont = value; }
+        }
+
+
+        /// <summary>
+        /// Gets or sets the text that is displayed on switch when Value property is set to true.
+        /// </summary>
+        [DefaultValue("ON"), Localizable(true), Category("Appearance"), Description("Indicates text that is displayed on switch when Value property is set to true.")]
+        public string OnText
+        {
+            get { return _SwitchButton.OnText; }
+            set
+            {
+                _SwitchButton.OnText = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the text that is displayed on switch when Value property is set to false.
+        /// </summary>
+        [DefaultValue("OFF"), Localizable(true), Category("Appearance"), Description("Indicates text that is displayed on switch when Value property is set to true.")]
+        public string OffText
+        {
+            get { return _SwitchButton.OffText; }
+            set
+            {
+                _SwitchButton.OffText = value;
+            }
+        }
+
+        [Browsable(false)]
+        public override eDotNetBarStyle Style
+        {
+            get
+            {
+                return base.Style;
+            }
+            set
+            {
+                base.Style = value;
+            }
+        }
+        [Browsable(false)]
+        public override string Text
+        {
+            get
+            {
+                return base.Text;
+            }
+            set
+            {
+                base.Text = value;
+            }
+        }
+        [Browsable(false)]
+        public override Color ForeColor
+        {
+            get
+            {
+                return base.ForeColor;
+            }
+            set
+            {
+                base.ForeColor = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the width in pixels of the switch part of the button. Minimum value is 6.
+        /// </summary>
+        [DefaultValue(28), Category("Appearance"), Description("Indicates width in pixels of the switch part of the button.")]
+        public int SwitchWidth
+        {
+            get { return _SwitchButton.SwitchWidth; }
+            set
+            {
+                _SwitchButton.SwitchWidth = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the switch bounds.
+        /// </summary>
+        [Browsable(false)]
+        public Rectangle SwitchBounds
+        {
+            get { return _SwitchButton.SwitchBounds; }
+        }
+
+        /// <summary>
+        /// Gets the On part of the switch button bounds excluding the SwitchBounds.
+        /// </summary>
+        [Browsable(false)]
+        public Rectangle OnPartBounds
+        {
+            get { return _SwitchButton.OnPartBounds; }
+        }
+
+        /// <summary>
+        /// Gets the Off part of the switch button bounds excluding the SwitchBounds.
+        /// </summary>
+        [Browsable(false)]
+        public Rectangle OffPartBounds
+        {
+            get { return _SwitchButton.OffPartBounds; }
+        }
+
+        /// <summary>
+        /// Sets the value of the control with state transition animation (if enabled) and specifies the source of the action.
+        /// </summary>
+        /// <param name="newValue">New value for Value property.</param>
+        /// <param name="source">Source of the action.</param>
+        public void SetValueAndAnimate(bool value, eEventSource source)
+        {
+            _SwitchButton.SetValueAndAnimate(value, source);
+        }
+
+        /// <summary>
+        /// Sets the value of the control and specifies the source of the action.
+        /// </summary>
+        /// <param name="newValue">New value for Value property.</param>
+        /// <param name="source">Source of the action.</param>
+        public void SetValue(bool newValue, eEventSource source)
+        {
+            _SwitchButton.SetValue(newValue, source);
+        }
+
+        /// <summary>
+        /// Gets or sets whether button is in read-only state meaning that it appears as enabled but user cannot change its state.
+        /// </summary>
+        [DefaultValue(false), Category("Behavior"), Description("Indicates whether button is in read-only state meaning that it appears as enabled but user cannot change its state.")]
+        public bool IsReadOnly
+        {
+            get { return _SwitchButton.IsReadOnly; }
+            set { _SwitchButton.IsReadOnly = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether lock marker is visible on face of the control when IsReadOnly is set to true.
+        /// Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance"), Description("Indicates whether lock marker is visible on face of the control when IsReadOnly is set to true.")]
+        public bool ShowReadOnlyMarker
+        {
+            get { return _SwitchButton.ShowReadOnlyMarker; }
+            set { _SwitchButton.ShowReadOnlyMarker = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the color of the read-only marker.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates color of read-only marker.")]
+        public Color ReadOnlyMarkerColor
+        {
+            get { return _SwitchButton.ReadOnlyMarkerColor; }
+            set { _SwitchButton.ReadOnlyMarkerColor = value; }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeReadOnlyMarkerColor()
+        {
+            return _SwitchButton.ShouldSerializeReadOnlyMarkerColor();
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetReadOnlyMarkerColor()
+        {
+            _SwitchButton.ResetReadOnlyMarkerColor();
+        }
+
+        public override Size GetPreferredSize(Size proposedSize)
+        {
+            if (_SwitchButton != null)
+                return _SwitchButton.GetPreferredSize();
+            return base.GetPreferredSize(proposedSize);
+        }
+
+        /// <summary>
+        /// Indicates whether clicking left mouse button on the switch part of the item will toggle the switch Value.
+        /// </summary>
+        [DefaultValue(false), Category("Behavior"), Description("Indicates whether clicking left mouse button on the switch part of the item will toggle the switch Value.")]
+        public bool SwitchClickTogglesValue
+        {
+            get { return _SwitchButton.SwitchClickTogglesValue; }
+            set { _SwitchButton.SwitchClickTogglesValue = value; }
+        }
+        #endregion
+
+        #region ValueObject implementation
+        private const string DefaultValueFalse = "N";
+        private const string DefaultValueTrue = "Y";
+        private object _ValueObject = DefaultValueFalse;
+
+        private object _ValueFalse= DefaultValueFalse;
+        private object _ValueTrue= DefaultValueTrue;
+        /// <summary>
+        /// Occurs after ValueObject property changes.
+        /// </summary>
+        [Description("Occurs after ValueObject property changes.")]
+        public event EventHandler ValueObjectChanged;
+        /// <summary>
+        /// Raises ValueObjectChanged event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnValueObjectChanged(EventArgs e)
+        {
+            EventHandler handler = ValueObjectChanged;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        /// <summary>
+        /// Gets or sets the object that represents the Value state of control.
+        /// </summary>
+        [DefaultValue("N"), Bindable(true), RefreshProperties(RefreshProperties.All), TypeConverter(typeof(StringConverter)), Description("Indicates object that represents the Value state of control.")]
+        public object ValueObject
+        {
+            get { return _ValueObject; }
+            set
+            {
+                _ValueObject = value;
+                OnValueObjectChanged();
+            }
+        }
+
+        private void OnValueObjectChanged()
+        {
+            bool value = GetValue(_ValueObject);
+            this.Value = value;
+        }
+
+        private bool IsNull(object value)
+        {
+            return value == null || value is string && (string)value == string.Empty ||
+                value == DBNull.Value;
+        }
+
+        private object GetValueObject(bool value)
+        {
+            return value ? _ValueTrue : _ValueFalse;
+        }
+
+        private bool GetValue(object value)
+        {
+            if (_ValueTrue != null && _ValueTrue.Equals(value))
+            {
+                return true;
+            }
+            else if (_ValueFalse == null && IsNull(value) || _ValueFalse != null && _ValueFalse.Equals(value))
+            {
+                return false;
+            }
+            else
+            {
+                if (value is System.Data.SqlTypes.SqlBoolean)
+                {
+                    System.Data.SqlTypes.SqlBoolean sqlBool = (System.Data.SqlTypes.SqlBoolean)value;
+                    return sqlBool.IsTrue;
+                }
+                else if (value is int?)
+                {
+                    if (value == null) return false;
+                    if (((int?)value).Value == 0)
+                        return false;
+                    return true;
+                }
+                else if (value is int)
+                {
+                    return ((int)value) == 0 ? false : true;
+                }
+                else if (value is long)
+                {
+                    return ((long)value) == 0 ? false : true;
+                }
+                else if (value is short)
+                {
+                    return ((short)value) == 0 ? false : true;
+                }
+                else if (value is float)
+                {
+                    return ((float)value) == 0 ? false : true;
+                }
+                else if (value is double)
+                {
+                    return ((double)value) == 0 ? false : true;
+                }
+                else if (value is byte)
+                {
+                    return ((byte)value) == 0 ? false : true;
+                }
+                else if (value is uint)
+                {
+                    return ((uint)value) == 0 ? false: true;
+                }
+                else if (value is ulong)
+                {
+                    return ((ulong)value) == 0 ? false : true;
+                }
+                else if (value is bool)
+                {
+                    return ((bool)value);
+                }
+
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the value that represents the True state of control when ValueObject property is set to that value.
+        /// </summary>
+        [Browsable(true), DefaultValue("Y"), Category("Behavior"), TypeConverter(typeof(StringConverter)), Description("Represents the True state of Value when ValueObject property is set to that value.")]
+        public object ValueTrue
+        {
+            get { return _ValueTrue; }
+            set { _ValueTrue = value; OnValueObjectChanged(); }
+        }
+
+        /// <summary>
+        /// Gets or sets the value that represents the False state of control when ValueObject property is set to that value.
+        /// </summary>
+        [Browsable(true), DefaultValue("N"), Category("Behavior"), TypeConverter(typeof(StringConverter)), Description("Represents the False state of control when ValueObject property is set to that value.")]
+        public object ValueFalse
+        {
+            get { return _ValueFalse; }
+            set { _ValueFalse = value; OnValueObjectChanged(); }
+        }
+        #endregion
+
+        #region ICommandSource Members
+        protected virtual void ExecuteCommand()
+        {
+            if (_Command == null) return;
+            CommandManager.ExecuteCommand(this);
+        }
+
+        /// <summary>
+        /// Gets or sets the command assigned to the item. Default value is null.
+        /// <remarks>Note that if this property is set to null Enabled property will be set to false automatically to disable the item.</remarks>
+        /// </summary>
+        [DefaultValue(null), Category("Commands"), Description("Indicates the command assigned to the item.")]
+        public Command Command
+        {
+            get { return (Command)((ICommandSource)this).Command; }
+            set
+            {
+                ((ICommandSource)this).Command = value;
+            }
+        }
+
+        private ICommand _Command = null;
+        //[Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        ICommand ICommandSource.Command
+        {
+            get
+            {
+                return _Command;
+            }
+            set
+            {
+                bool changed = false;
+                if (_Command != value)
+                    changed = true;
+
+                if (_Command != null)
+                    CommandManager.UnRegisterCommandSource(this, _Command);
+                _Command = value;
+                if (value != null)
+                    CommandManager.RegisterCommand(this, value);
+                if (changed)
+                    OnCommandChanged();
+            }
+        }
+
+        /// <summary>
+        /// Called when Command property value changes.
+        /// </summary>
+        protected virtual void OnCommandChanged()
+        {
+        }
+
+        private object _CommandParameter = null;
+        /// <summary>
+        /// Gets or sets user defined data value that can be passed to the command when it is executed.
+        /// </summary>
+        [Browsable(true), DefaultValue(null), Category("Commands"), Description("Indicates user defined data value that can be passed to the command when it is executed."), System.ComponentModel.TypeConverter(typeof(System.ComponentModel.StringConverter)), System.ComponentModel.Localizable(true)]
+        public object CommandParameter
+        {
+            get
+            {
+                return _CommandParameter;
+            }
+            set
+            {
+                _CommandParameter = value;
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/SwitchButton/SwitchButtonItem.cs b/PROMS/DotNetBar Source Code/SwitchButton/SwitchButtonItem.cs
new file mode 100644
index 00000000..d986d7cf
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/SwitchButton/SwitchButtonItem.cs	
@@ -0,0 +1,1012 @@
+using System;
+using System.ComponentModel;
+using DevComponents.DotNetBar.Events;
+using DevComponents.DotNetBar.Rendering;
+using System.Drawing;
+using System.Windows.Forms;
+using System.Threading;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represents the switch button UI element.
+    /// </summary>
+    [DefaultEvent("ValueChanged"), DefaultProperty("Value")]
+    public class SwitchButtonItem : BaseItem
+    {
+        #region Events
+        /// <summary>
+        /// Occurs before Value property has changed and it allows you to cancel the change.
+        /// </summary>
+        public event EventHandler ValueChanging;
+        /// <summary>
+        /// Raises ValueChanging event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnValueChanging(CancelableEventSourceArgs e)
+        {
+            EventHandler handler = ValueChanging;
+            if (handler != null)
+                handler(this, e);
+        }
+        /// <summary>
+        /// Occurs after Value property has changed.
+        /// </summary>
+        public event EventHandler ValueChanged;
+        /// <summary>
+        /// Raises ValueChanged event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnValueChanged(EventSourceArgs e)
+        {
+            EventHandler handler = ValueChanged;
+            if (handler != null)
+                handler(this, e);
+        }
+        #endregion
+
+        #region Constructor
+        internal static readonly int TextButtonSpacing = 3;
+        /// <summary>
+        /// Creates new instance of SwitchButtonItem.
+        /// </summary>
+        public SwitchButtonItem() : this("", "") { }
+        /// <summary>
+        /// Creates new instance of SwitchButtonItem and assigns the name to it.
+        /// </summary>
+        /// <param name="sItemName">Item name.</param>
+        public SwitchButtonItem(string sItemName) : this(sItemName, "") { }
+        /// <summary>
+        /// Creates new instance of SwitchButtonItem and assigns the name and text to it.
+        /// </summary>
+        /// <param name="sItemName">Item name.</param>
+        /// <param name="itemText">item text.</param>
+        public SwitchButtonItem(string sItemName, string itemText)
+            : base(sItemName, itemText)
+        {
+            _Margin.PropertyChanged += MarginPropertyChanged;
+        }
+
+        /// <summary>
+        /// Returns copy of the item.
+        /// </summary>
+        public override BaseItem Copy()
+        {
+            SwitchButtonItem objCopy = new SwitchButtonItem(m_Name);
+            this.CopyToItem(objCopy);
+            return objCopy;
+        }
+
+        /// <summary>
+        /// Copies the SwitchButtonItem specific properties to new instance of the item.
+        /// </summary>
+        /// <param name="copy">New SwitchButtonItem instance.</param>
+        internal void InternalCopyToItem(SwitchButtonItem copy)
+        {
+            CopyToItem(copy);
+        }
+
+        /// <summary>
+        /// Copies the SwitchButtonItem specific properties to new instance of the item.
+        /// </summary>
+        /// <param name="copy">New SwitchButtonItem instance.</param>
+        protected override void CopyToItem(BaseItem copy)
+        {
+            SwitchButtonItem objCopy = copy as SwitchButtonItem;
+
+            if (objCopy != null)
+            {
+                objCopy.Value = this.Value;
+                objCopy.BorderColor = this.BorderColor;
+                objCopy.OffBackColor = this.OffBackColor;
+                objCopy.OffText = this.OffText;
+                objCopy.OffTextColor = this.OffTextColor;
+                objCopy.OnBackColor = this.OnBackColor;
+                objCopy.OnText = this.OnText;
+                objCopy.OnTextColor = this.OnTextColor;
+                objCopy.SwitchBackColor = this.SwitchBackColor;
+                objCopy.SwitchBorderColor = this.SwitchBorderColor;
+                objCopy.SwitchWidth = this.SwitchWidth;
+                objCopy.ButtonWidth = this.ButtonWidth;
+                objCopy.ButtonHeight = this.ButtonHeight;
+
+                base.CopyToItem(objCopy);
+            }
+        }
+        #endregion
+
+        #region Implementation
+        protected override void Dispose(bool disposing)
+        {
+            CancelAnimation();
+            base.Dispose(disposing);
+        }
+
+        public override void Paint(ItemPaintArgs p)
+        {
+            BaseRenderer renderer = p.Renderer;
+            if (renderer != null)
+            {
+                SwitchButtonRenderEventArgs e = new SwitchButtonRenderEventArgs(p.Graphics, this, p.Colors, p.Font, p.RightToLeft);
+                e.ItemPaintArgs = p;
+                renderer.DrawSwitchButton(e);
+            }
+            else
+            {
+                SwitchButtonPainter painter = PainterFactory.CreateSwitchButtonPainter(this);
+                if (painter != null)
+                {
+                    SwitchButtonRenderEventArgs e = new SwitchButtonRenderEventArgs(p.Graphics, this, p.Colors, p.Font, p.RightToLeft);
+                    e.ItemPaintArgs = p;
+                    painter.Paint(e);
+                }
+            }
+
+            this.DrawInsertMarker(p.Graphics);
+        }
+
+        public override void RecalcSize()
+        {
+            Size size = new Size(Dpi.Width(_ButtonWidth + _Margin.Horizontal), Dpi.Height(_ButtonHeight + _Margin.Vertical));
+
+            if (_TextVisible && !string.IsNullOrEmpty(this.Text))
+            {
+                Control parent = this.ContainerControl as Control;
+                if (parent != null)
+                {
+                    Font font = parent.Font;
+                    using (Graphics g = parent.CreateGraphics())
+                    {
+                        Size textSize = ButtonItemLayout.MeasureItemText(this, g, 0, font, eTextFormat.WordBreak, parent.RightToLeft == RightToLeft.Yes);
+                        textSize.Width += Dpi.Width(_TextPadding.Horizontal + TextButtonSpacing);
+                        textSize.Height += Dpi.Height(_TextPadding.Vertical);
+                        size.Width += textSize.Width;
+                        size.Height = Math.Max(size.Height, textSize.Height);
+                    }
+                }
+            }
+
+            m_Rect.Width = size.Width;
+            m_Rect.Height = size.Height;
+
+            base.RecalcSize();
+        }
+
+        internal Size GetPreferredSize()
+        {
+            Size size = new Size(Dpi.Width(_SwitchWidth + _Margin.Horizontal), Dpi.Height8);
+
+            Control parent = this.ContainerControl as Control;
+            if (parent != null)
+            {
+                Font font = parent.Font;
+                using (Graphics g = parent.CreateGraphics())
+                {
+                    Size textOnSize = TextDrawing.MeasureString(g, _OnText, font);
+                    Size textOffSize = TextDrawing.MeasureString(g, _OffText, font);
+                    size.Width += Math.Max(textOnSize.Width, textOffSize.Width) + 8;
+                    size.Height = Math.Max(size.Height, textOffSize.Height + _Margin.Vertical + 4);
+
+                    if (_TextVisible && !string.IsNullOrEmpty(this.Text))
+                    {
+                        Size textSize = ButtonItemLayout.MeasureItemText(this, g, 0, font, eTextFormat.WordBreak, parent.RightToLeft == RightToLeft.Yes);
+                        textSize.Width += _TextPadding.Horizontal + TextButtonSpacing;
+                        textSize.Height += _TextPadding.Vertical;
+                        size.Width += textSize.Width;
+                        size.Height = Math.Max(size.Height, textSize.Height);
+                    }
+                }
+            }
+
+            return size;
+        }
+
+        /// <summary>
+        /// Gets whether item supports text markup. Default is false.
+        /// </summary>
+        protected override bool IsMarkupSupported
+        {
+            get { return _EnableMarkup; }
+        }
+
+        private bool _EnableMarkup = true;
+        /// <summary>
+        /// Gets or sets whether text-markup support is enabled for items Text property. Default value is true.
+        /// Set this property to false to display HTML or other markup in the item instead of it being parsed as text-markup.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance"), Description("Indicates whether text-markup support is enabled for items Text property.")]
+        public bool EnableMarkup
+        {
+            get { return _EnableMarkup; }
+            set
+            {
+                if (_EnableMarkup != value)
+                {
+                    _EnableMarkup = value;
+                    NeedRecalcSize = true;
+                    OnTextChanged();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the text associated with this item.
+        /// </summary>
+        [Browsable(true), Editor("DevComponents.DotNetBar.Design.TextMarkupUIEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), Category("Appearance"), Description("The text contained in the item."), Localizable(true), DefaultValue("")]
+        public override string Text
+        {
+            get
+            {
+                return base.Text;
+            }
+            set
+            {
+                base.Text = value;
+            }
+        }
+
+        private bool _Value;
+        /// <summary>
+        /// Gets or sets the switch value.
+        /// </summary>
+        [DefaultValue(false), Category("Appearance"), Description("Indicates switch value."), Bindable(true)]
+        public bool Value
+        {
+            get { return _Value; }
+            set
+            {
+                if (_Value != value)
+                    SetValue(value, eEventSource.Code);
+            }
+        }
+
+        /// <summary>
+        /// Sets the value of the control and specifies the source of the action.
+        /// </summary>
+        /// <param name="newValue">New value for Value property.</param>
+        /// <param name="source">Source of the action.</param>
+        public void SetValue(bool newValue, eEventSource source)
+        {
+            CancelableEventSourceArgs cancelEventArgs = new CancelableEventSourceArgs(source);
+            OnValueChanging(cancelEventArgs);
+            if (cancelEventArgs.Cancel)
+            {
+                SwitchOffset = 0;
+                this.Refresh();
+                return;
+            }
+
+            _Value = newValue;
+            _AsyncValue = newValue;
+
+            if (ShouldSyncProperties)
+                BarFunctions.SyncProperty(this, "Value");
+
+            SwitchOffset = 0;
+
+            if (this.Displayed)
+                this.Refresh();
+
+            ExecuteCommand();
+            EventSourceArgs sourceEventArgs = new EventSourceArgs(source);
+            OnValueChanged(sourceEventArgs);
+        }
+
+        private Point _MouseDownPoint = Point.Empty;
+        public override void InternalMouseDown(MouseEventArgs objArg)
+        {
+            if (this.Enabled && !_IsReadOnly && !this.DesignMode && objArg.Button == MouseButtons.Left)
+            {
+                if (!Value && _OffPartBounds.Contains(objArg.X, objArg.Y))
+                    this.SetValueAndAnimate(true, eEventSource.Mouse);
+                else if (Value && _OnPartBounds.Contains(objArg.X, objArg.Y))
+                    this.SetValueAndAnimate(false, eEventSource.Mouse);
+                else if (_SwitchBounds.Contains(objArg.X, objArg.Y))
+                {
+                    _MouseDownPoint = new Point(objArg.X, objArg.Y);
+                    SwitchPressed = true;
+                }
+            }
+            base.InternalMouseDown(objArg);
+        }
+
+        public override void InternalMouseMove(MouseEventArgs objArg)
+        {
+            if (_SwitchPressed)
+            {
+                if (objArg.Button == MouseButtons.Left)
+                {
+                    Point mouseDownPoint = _MouseDownPoint;
+                    int offsetX = objArg.X - mouseDownPoint.X;
+                    if (offsetX != 0)
+                    {
+                        if (!Value && offsetX > 0)
+                        {
+                            if (_SwitchBounds.Right + offsetX >= _ButtonBounds.Right)
+                            {
+                                SetValue(true, eEventSource.Mouse);
+                                _MouseDownPoint = new Point(objArg.X, objArg.Y);
+                            }
+                            else
+                                SwitchOffset = offsetX;
+                        }
+                        else if (Value && offsetX < 0)
+                        {
+                            if (_SwitchBounds.X + offsetX <= _ButtonBounds.X)
+                            {
+                                SetValue(false, eEventSource.Mouse);
+                                _MouseDownPoint = new Point(objArg.X, objArg.Y);
+                            }
+                            else
+                                SwitchOffset = Math.Abs(offsetX);
+                        }
+                    }
+                }
+                else
+                {
+                    SwitchPressed = false;
+                }
+            }
+
+            base.InternalMouseMove(objArg);
+        }
+
+        public override void InternalMouseUp(MouseEventArgs objArg)
+        {
+            if (_SwitchPressed)
+            {
+                SwitchPressed = false;
+                if (_SwitchClickTogglesValue && objArg.Button == MouseButtons.Left && _MouseDownPoint == objArg.Location)
+                    SetValue(!Value, eEventSource.Mouse);
+            }
+            base.InternalMouseUp(objArg);
+        }
+
+        private bool _SwitchClickTogglesValue;
+        /// <summary>
+        /// Indicates whether clicking left mouse button on the switch part of the item will toggle the switch Value.
+        /// </summary>
+        [DefaultValue(false), Category("Behavior"), Description("Indicates whether clicking left mouse button on the switch part of the item will toggle the switch Value.")]
+        public bool SwitchClickTogglesValue
+        {
+            get { return _SwitchClickTogglesValue; }
+            set { _SwitchClickTogglesValue = value; }
+        }
+        
+        private Rectangle _SwitchBounds;
+        /// <summary>
+        /// Gets the switch bounds.
+        /// </summary>
+        [Browsable(false)]
+        public Rectangle SwitchBounds
+        {
+            get { return _SwitchBounds; }
+            internal set { _SwitchBounds = value; }
+        }
+
+        private Rectangle _ButtonBounds;
+        /// <summary>
+        /// Gets the button bounds.
+        /// </summary>
+        [Browsable(false)]
+        public Rectangle ButtonBounds
+        {
+            get { return _ButtonBounds; }
+            internal set { _ButtonBounds = value; }
+        }
+
+        private Rectangle _OnPartBounds;
+        /// <summary>
+        /// Gets the On part of the switch button bounds excluding the SwitchBounds.
+        /// </summary>
+        [Browsable(false)]
+        public Rectangle OnPartBounds
+        {
+            get { return _OnPartBounds; }
+            internal set { _OnPartBounds = value; }
+        }
+
+        private Rectangle _OffPartBounds;
+        /// <summary>
+        /// Gets the Off part of the switch button bounds excluding the SwitchBounds.
+        /// </summary>
+        [Browsable(false)]
+        public Rectangle OffPartBounds
+        {
+            get { return _OffPartBounds; }
+            internal set { _OffPartBounds = value; }
+        }
+
+        private int _SwitchOffset;
+        /// <summary>
+        /// Gets or sets the switch offset from its initial position. Used for animation and dragging of the switch.
+        /// </summary>
+        internal int SwitchOffset
+        {
+            get { return _SwitchOffset; }
+            set
+            {
+                _SwitchOffset = value;
+                this.Refresh();
+            }
+        }
+
+        private bool _SwitchPressed;
+        /// <summary>
+        /// Gets whether switch part of the button is pressed using mouse left button.
+        /// </summary>
+        [Browsable(false)]
+        public bool SwitchPressed
+        {
+            get { return _SwitchPressed; }
+            internal set 
+            {
+                _SwitchPressed = value;
+                SwitchOffset = 0;
+                this.Refresh();
+            }
+        }
+
+        private int _SwitchWidth = 28;
+        /// <summary>
+        /// Gets or sets the width in pixels of the switch part of the button. Minimum value is 6.
+        /// </summary>
+        [DefaultValue(28), Category("Appearance"), Description("Indicates width in pixels of the switch part of the button.")]
+        public int SwitchWidth
+        {
+            get { return _SwitchWidth; }
+            set
+            {
+                if (value < 6) value = 6;
+                if (_SwitchWidth != value)
+                {
+                    _SwitchWidth = value;
+                    this.Refresh();
+                }
+            }
+        }
+
+        private string _OnText = "ON";
+        /// <summary>
+        /// Gets or sets the text that is displayed on switch when Value property is set to true.
+        /// </summary>
+        [DefaultValue("ON"), Localizable(true), Category("Appearance"), Description("Indicates text that is displayed on switch when Value property is set to true.")]
+        public string OnText
+        {
+            get { return _OnText; }
+            set
+            {
+                if (value == null) value = "";
+                if (_OnText != value)
+                {
+                    _OnText = value;
+                    this.Refresh();
+                }
+            }
+        }
+
+        private string _OffText = "OFF";
+        /// <summary>
+        /// Gets or sets the text that is displayed on switch when Value property is set to false.
+        /// </summary>
+        [DefaultValue("OFF"), Localizable(true), Category("Appearance"), Description("Indicates text that is displayed on switch when Value property is set to true.")]
+        public string OffText
+        {
+            get { return _OffText; }
+            set
+            {
+                if (value == null) value = "";
+                if (_OffText != value)
+                {
+                    _OffText = value;
+                    this.Refresh();
+                }
+            }
+        }
+
+        private bool _AsyncValue;
+        private eEventSource _AsyncSource;
+        private int _AsyncTotalSwitchOffset;
+        private BackgroundWorker _AnimationWorker;
+
+        /// <summary>
+        /// Sets the value of the control with state transition animation (if enabled) and specifies the source of the action.
+        /// </summary>
+        /// <param name="value">New value for Value property.</param>
+        /// <param name="source">Source of the action.</param>
+        public void SetValueAndAnimate(bool value, eEventSource source)
+        {
+            if (!IsAnimationEnabled)
+            {
+                SetValue(value, source);
+                return;
+            }
+
+            BackgroundWorker worker = _AnimationWorker;
+            if (worker != null)
+            {
+                worker.CancelAsync();
+                SetValue(value, source);
+                return;
+            }
+
+            if (Value != value)
+            {
+                _AsyncValue = value;
+                _AsyncSource = source;
+                _AsyncTotalSwitchOffset = _ButtonBounds.Width - Dpi.Width(SwitchWidth);
+
+                _AnimationWorker = new BackgroundWorker();
+
+                _AnimationWorker.WorkerSupportsCancellation = true;
+                _AnimationWorker.DoWork += AnimationWorkerDoWork;
+                _AnimationWorker.RunWorkerCompleted += AnimationWorkerRunWorkerCompleted;
+
+                _AnimationWorker.RunWorkerAsync();
+            }
+        }
+
+        private void AnimationWorkerRunWorkerCompleted(object sender, RunWorkerCompletedEventArgs e)
+        {
+            BackgroundWorker worker = _AnimationWorker;
+            _AnimationWorker = null;
+
+            if (worker != null)
+                worker.Dispose();
+
+            if (e.Cancelled == false)
+                SetValue(_AsyncValue, _AsyncSource);
+        }
+
+        private void AnimationWorkerDoWork(object sender, DoWorkEventArgs e)
+        {
+            DateTime start = DateTime.Now;
+
+            int steps = Math.Max(9, _AsyncTotalSwitchOffset / 5);
+
+            for (int i = 0; i < _AsyncTotalSwitchOffset; i += steps)
+            {
+                if (_AnimationWorker.CancellationPending == true)
+                {
+                    e.Cancel = true;
+                    break;
+                }
+
+                SwitchOffset = i;
+                try
+                {
+                    using (
+                                        System.Threading.ManualResetEvent wait =
+                                            new System.Threading.ManualResetEvent(false))
+                        wait.WaitOne(40);
+                    //Thread.Sleep(40);
+                }
+                catch 
+                {
+                    break;
+                }
+
+                if (DateTime.Now.Subtract(start).TotalMilliseconds > 400)
+                    break;
+            }
+        }
+
+        /// <summary>
+        /// Cancels any current inprogress animation.
+        /// </summary>
+        internal void CancelAnimation()
+        {
+            BackgroundWorker worker = _AnimationWorker;
+
+            if (worker != null)
+            {
+                if (worker.IsBusy)
+                {
+                    worker.CancelAsync();
+
+                    if (Value != _AsyncValue)
+                        SetValue(_AsyncValue, _AsyncSource);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether fade effect is enabled.
+        /// </summary>
+        protected virtual bool IsAnimationEnabled
+        {
+            get { return _AnimationEnabled; }
+        }
+
+        private bool _AnimationEnabled = true;
+        /// <summary>
+        /// Gets or sets whether state transition animation is enabled.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance"), Description("Indicates whether state transition animation is enabled.")]
+        public bool AnimationEnabled
+        {
+            get { return _AnimationEnabled; }
+            set { _AnimationEnabled = value; }
+        }
+
+        private int _ButtonWidth = 66;
+        /// <summary>
+        /// Gets or sets the width of the switch button. Must be greater than SwitchWidth.
+        /// </summary>
+        [DefaultValue(66), Category("Appearance"), Description("Indicates width of the switch button. Must be greater than SwitchWidth.")]
+        public int ButtonWidth
+        {
+            get { return _ButtonWidth; }
+            set
+            {
+                if (value < _SwitchWidth)
+                    value = _SwitchWidth + 1;
+                _ButtonWidth = value;
+                NeedRecalcSize = true;
+                this.Refresh();
+            }
+        }
+
+        private int _ButtonHeight = 22;
+        /// <summary>
+        /// Gets or sets the height of the switch button. Must be greater than 5.
+        /// </summary>
+        [DefaultValue(22), Category("Appearance"), Description("Indicates height of the switch button. Must be greater than 5.")]
+        public int ButtonHeight
+        {
+            get { return _ButtonHeight; }
+            set
+            {
+                if (value < 6) value = 6;
+                _ButtonHeight = value;
+                NeedRecalcSize = true;
+                this.Refresh();
+            }
+        }
+
+        private Padding _TextPadding = new Padding(0, 0, 0, 0);
+        /// <summary>
+        /// Gets or sets text padding.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), Description("Gets or sets text padding."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public Padding TextPadding
+        {
+            get { return _TextPadding; }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeTextPadding()
+        {
+            return _TextPadding.Bottom != 0 || _TextPadding.Top != 0 || _TextPadding.Left != 0 || _TextPadding.Right != 0;
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetTextPadding()
+        {
+            _TextPadding = new Padding(0, 0, 0, 0);
+        }
+        //private void TextPaddingPropertyChanged(object sender, PropertyChangedEventArgs e)
+        //{
+        //    NeedRecalcSize = true;
+        //    this.Refresh();
+        //}
+
+        private Padding _Margin = new Padding(0, 0, 0, 0);
+        /// <summary>
+        /// Gets or sets switch margin.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), Description("Gets or sets switch margin."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public Padding Margin
+        {
+            get { return _Margin; }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeMargin()
+        {
+            return _Margin.Bottom != 0 || _Margin.Top != 0 || _Margin.Left != 0 || _Margin.Right != 0;
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetMargin()
+        {
+            _Margin = new Padding(0, 0, 0, 0);
+        }
+        private void MarginPropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            NeedRecalcSize = true;
+            this.Refresh();
+        }
+
+        private Color _OffBackColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets the color of the OFF state background.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates color of OFF state background.")]
+        public Color OffBackColor
+        {
+            get { return _OffBackColor; }
+            set { _OffBackColor = value; this.Refresh(); }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeOffBackColor()
+        {
+            return !_OffBackColor.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetOffBackColor()
+        {
+            this.OffBackColor = Color.Empty;
+        }
+
+        private Color _OnBackColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets the color of the ON state background.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates color of ON state background.")]
+        public Color OnBackColor
+        {
+            get { return _OnBackColor; }
+            set { _OnBackColor = value; this.Refresh(); }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeOnBackColor()
+        {
+            return !_OnBackColor.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetOnBackColor()
+        {
+            this.OnBackColor = Color.Empty;
+        }
+
+        private Color _OnTextColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets the color of the ON state text.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates color of ON state text.")]
+        public Color OnTextColor
+        {
+            get { return _OnTextColor; }
+            set { _OnTextColor = value; this.Refresh(); }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeOnTextColor()
+        {
+            return !_OnTextColor.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetOnTextColor()
+        {
+            this.OnTextColor = Color.Empty;
+        }
+
+        private Color _OffTextColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets the color of the OFF state text.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates color of OFF state text.")]
+        public Color OffTextColor
+        {
+            get { return _OffTextColor; }
+            set { _OffTextColor = value; this.Refresh(); }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeOffTextColor()
+        {
+            return !_OffTextColor.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetOffTextColor()
+        {
+            this.OffTextColor = Color.Empty;
+        }
+
+        private Color _BorderColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets the item border color.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates item border color.")]
+        public Color BorderColor
+        {
+            get { return _BorderColor; }
+            set { _BorderColor = value; this.Refresh(); }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeBorderColor()
+        {
+            return !_BorderColor.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetBorderColor()
+        {
+            this.BorderColor = Color.Empty;
+        }
+
+        private Color _SwitchBorderColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets the border color of the button switch.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates border color of the button switch.")]
+        public Color SwitchBorderColor
+        {
+            get { return _SwitchBorderColor; }
+            set { _SwitchBorderColor = value; this.Refresh(); }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeSwitchBorderColor()
+        {
+            return !_SwitchBorderColor.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetSwitchBorderColor()
+        {
+            this.SwitchBorderColor = Color.Empty;
+        }
+
+        private Color _SwitchBackColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets the background color of the switch button.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates background color of the switch button.")]
+        public Color SwitchBackColor
+        {
+            get { return _SwitchBackColor; }
+            set { _SwitchBackColor = value; this.Refresh(); }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeSwitchBackColor()
+        {
+            return !_SwitchBackColor.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetSwitchBackColor()
+        {
+            this.SwitchBackColor = Color.Empty;
+        }
+
+        private bool _TextVisible = true;
+        /// <summary>
+        /// Gets or sets whether caption/label set using Text property is visible.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance"), Description("Indicates whether caption/label set using Text property is visible.")]
+        public bool TextVisible
+        {
+            get { return _TextVisible; }
+            set
+            {
+                _TextVisible = value;
+                NeedRecalcSize = true;
+                this.Refresh();
+            }
+        }
+
+        private Color _TextColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets the text color.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates text color.")]
+        public Color TextColor
+        {
+            get { return _TextColor; }
+            set { _TextColor = value; }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeTextColor()
+        {
+            return !_TextColor.IsEmpty;
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetTextColor()
+        {
+            this.TextColor = Color.Empty;
+        }
+
+        private Font _SwitchFont;
+        /// <summary>
+        /// Gets or sets the font that is used to draw ON/OFF text on the switch button.
+        /// </summary>
+        [DefaultValue(null), Category("Appearance"), Description("Indicates font that is used to draw ON/OFF text on the switch button.")]
+        public Font SwitchFont
+        {
+            get { return _SwitchFont; }
+            set { _SwitchFont = value; this.Refresh(); }
+        }
+
+        private bool _IsReadOnly;
+        /// <summary>
+        /// Gets or sets whether button is in read-only state meaning that it appears as enabled but user cannot change its state.
+        /// </summary>
+        [DefaultValue(false), Category("Behavior"), Description("Indicates whether button is in read-only state meaning that it appears as enabled but user cannot change its state.")]
+        public bool IsReadOnly
+        {
+            get { return _IsReadOnly; }
+            set { _IsReadOnly = value; this.Refresh(); }
+        }
+
+        private bool _ShowReadOnlyMarker = true;
+        /// <summary>
+        /// Gets or sets whether lock marker is visible on face of the control when IsReadOnly is set to true.
+        /// Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance"), Description("Indicates whether lock marker is visible on face of the control when IsReadOnly is set to true.")]
+        public bool ShowReadOnlyMarker
+        {
+            get { return _ShowReadOnlyMarker; }
+            set { _ShowReadOnlyMarker = value; this.Refresh(); }
+        }
+
+        private static readonly Color DefaultReadOnlyMarkerColor = ColorScheme.GetColor(0xC0504D);
+        private Color _ReadOnlyMarkerColor = DefaultReadOnlyMarkerColor;
+        /// <summary>
+        /// Gets or sets the color of the read-only marker.
+        /// </summary>
+        [Category("Appearance"), Description("Indicates color of read-only marker.")]
+        public Color ReadOnlyMarkerColor
+        {
+            get { return _ReadOnlyMarkerColor; }
+            set { _ReadOnlyMarkerColor = value; this.Refresh(); }
+        }
+        /// <summary>
+        /// Gets whether property should be serialized.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeReadOnlyMarkerColor()
+        {
+            return !_ReadOnlyMarkerColor.Equals(DefaultReadOnlyMarkerColor);
+        }
+        /// <summary>
+        /// Resets property to its default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetReadOnlyMarkerColor()
+        {
+            this.ReadOnlyMarkerColor = DefaultReadOnlyMarkerColor;
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/SwitchButton/SwitchButtonPainter.cs b/PROMS/DotNetBar Source Code/SwitchButton/SwitchButtonPainter.cs
new file mode 100644
index 00000000..0dc2c9f8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/SwitchButton/SwitchButtonPainter.cs	
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    internal class SwitchButtonPainter
+    {
+        /// <summary>
+        /// Paints SwitchButton.
+        /// </summary>
+        /// <param name="e">Provides arguments for the operation.</param>
+        public virtual void Paint(SwitchButtonRenderEventArgs e) { }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/SwitchButton/SwitchButtonRenderEventArgs.cs b/PROMS/DotNetBar Source Code/SwitchButton/SwitchButtonRenderEventArgs.cs
new file mode 100644
index 00000000..5feec3e8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/SwitchButton/SwitchButtonRenderEventArgs.cs	
@@ -0,0 +1,61 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Rendering
+{
+    /// <summary>
+    /// Provides data for SwitchButton rendering.
+    /// </summary>
+    public class SwitchButtonRenderEventArgs
+    {
+        /// <summary>
+        /// Gets or sets Graphics object group is rendered on.
+        /// </summary>
+        public Graphics Graphics = null;
+
+        /// <summary>
+        /// Gets or sets the reference to SwitchButtonItem being rendered.
+        /// </summary>
+        public SwitchButtonItem SwitchButtonItem = null;
+
+        /// <summary>
+        /// ColorScheme object that is used to provide colors for rendering check box item in legacy styles like Office 2003. Office 2007 style
+        /// uses color tables provided by renderer.
+        /// </summary>
+        public ColorScheme ColorScheme = null;
+
+        /// <summary>
+        /// Indicates whether item is in Right-To-Left environment.
+        /// </summary>
+        public bool RightToLeft = false;
+
+        /// <summary>
+        /// Gets or sets the text font.
+        /// </summary>
+        public Font Font = null;
+
+        /// <summary>
+        /// Gets or sets the ItemPaintArgs reference.
+        /// </summary>
+        internal ItemPaintArgs ItemPaintArgs;
+
+        /// <summary>
+        /// Creates new instance of the object and provides default values.
+        /// </summary>
+        /// <param name="g">Reference to Graphics object</param>
+        /// <param name="item">Reference to SwitchButtonItem</param>
+        /// <param name="cs">Reference to legacy ColorScheme</param>
+        /// <param name="f">Indicates the font for the text.</param>
+        /// <param name="rtl">Indicates whether item is in Right-To-Left environment.</param>
+        public SwitchButtonRenderEventArgs(Graphics g, SwitchButtonItem item, ColorScheme cs, Font f, bool rtl)
+        {
+            this.Graphics = g;
+            this.SwitchButtonItem = item;
+            this.ColorScheme = cs;
+            this.RightToLeft = rtl;
+            this.Font = f;
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Symbols.cs b/PROMS/DotNetBar Source Code/Symbols.cs
new file mode 100644
index 00000000..62ed9385
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Symbols.cs	
@@ -0,0 +1,255 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+using System.Drawing.Text;
+using System.Runtime.InteropServices;
+using System.Windows.Forms;
+using System.ComponentModel;
+using System.IO;
+using System.Reflection;
+#if LAYOUT
+namespace DevComponents.DotNetBar.Layout
+#else
+namespace DevComponents.DotNetBar
+#endif
+{
+    // Uses Font Awesome - http://fortawesome.github.com/Font-Awesome
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public static class Symbols
+    {
+        #region WinApi
+        [DllImport("gdi32")]
+        static extern IntPtr AddFontMemResourceEx(IntPtr pbFont,
+                                                           uint cbFont,
+                                                           IntPtr pdv,
+                                                           [In] ref uint pcFonts);
+        [DllImport("gdi32")]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        static extern bool RemoveFontMemResourceEx(IntPtr fh);
+        #endregion
+
+        #region Internal Implementation
+
+        public static string GetSymbol(string symbol)
+        {
+            if (string.IsNullOrEmpty(symbol) == true)
+                return (String.Empty);
+
+            if (symbol.Length == 1)
+                return symbol;
+
+            int utf32 = 0;
+
+            if (int.TryParse(symbol, out utf32))
+                return char.ConvertFromUtf32(utf32);
+
+            return symbol;
+        }
+
+        /// <summary>
+        /// Returns specific font set at specified size/
+        /// </summary>
+        /// <param name="fontSize">Font size</param>
+        /// <param name="symbolSet">Symbol set to return</param>
+        /// <returns>Font</returns>
+        public static Font GetFont(float fontSize, eSymbolSet symbolSet)
+        {
+            if (symbolSet == eSymbolSet.Awesome)
+                return GetFontAwesome(fontSize);
+            else
+                return GetFontMaterial(fontSize);
+        }
+
+        private static Dictionary<float, Font> _FontAwesomeCache = new Dictionary<float, Font>(10);
+        private static Dictionary<float, Font> _FontMaterialCache = new Dictionary<float, Font>(10);
+        /// <summary>
+        /// Returns FontAwesome at specific size.
+        /// </summary>
+        /// <param name="fontSize">Font size in points</param>
+        /// <returns>Font in desired size.</returns>
+        private static Font GetFontAwesome(float fontSize)
+        {
+            Font font = null;
+            EnsureFontAwesomeLoaded();
+            if (fontSize <= 0) return _FontAwesome;
+            if(_FontAwesomeCache.TryGetValue(fontSize, out font))
+                return font;
+            font = new Font(_FontAwesome.FontFamily, fontSize, FontStyle.Regular, GraphicsUnit.Point);
+            _FontAwesomeCache.Add(fontSize, font);
+            return font;
+        }
+
+        /// <summary>
+        /// Returns FontAwesome at specific size.
+        /// </summary>
+        /// <param name="fontSize">Font size in points</param>
+        /// <returns>Font in desired size.</returns>
+        public static Font GetFontMaterial(float fontSize)
+        {
+            Font font = null;
+            EnsureFontMaterialLoaded();
+            if (fontSize <= 0) return _FontMaterial;
+            if (_FontMaterialCache.TryGetValue(fontSize, out font))
+                return font;
+            font = new Font(_FontMaterial.FontFamily, fontSize, FontStyle.Regular, GraphicsUnit.Point);
+            _FontMaterialCache.Add(fontSize, font);
+            return font;
+        }
+
+        private static Font _FontAwesome = null;
+        /// <summary>
+        /// Gets FontAwesome at default size.
+        /// </summary>
+        public static Font FontAwesome
+        {
+            get
+            {
+                EnsureFontAwesomeLoaded();
+                return _FontAwesome;
+            }
+        }
+        /// <summary>
+        /// Returns FontAwesome Family.
+        /// </summary>
+        public static FontFamily FontAwesomeFamily
+        {
+            get
+            {
+                EnsureFontAwesomeLoaded();
+                return _FontAwesome.FontFamily;
+            }
+        }
+
+        private static Font _FontMaterial = null;
+        /// <summary>
+        /// Gets Material Font at default size.
+        /// </summary>
+        public static Font FontMaterial
+        {
+            get
+            {
+                EnsureFontMaterialLoaded();
+                return _FontMaterial;
+            }
+        }
+        /// <summary>
+        /// Returns Material Font Family.
+        /// </summary>
+        public static FontFamily FontMaterialFamily
+        {
+            get
+            {
+                EnsureFontMaterialLoaded();
+                return _FontMaterial.FontFamily;
+            }
+        }
+
+        private static PrivateFontCollection _PrivateFontAwesomeCollection;
+        private static PrivateFontCollection _PrivateFontMaterialCollection;
+        private static GCHandle _FontAwesomeHandle;
+        private static IntPtr _FontAwesomePointer;
+        private static GCHandle _FontMaterialHandle;
+        private static IntPtr _FontMaterialPointer;
+        private static void EnsureFontAwesomeLoaded()
+        {
+            if (_FontAwesome == null)
+            {
+                _PrivateFontAwesomeCollection = new PrivateFontCollection();
+
+                byte[] fontAwesomeBuffer = LoadFont("SystemImages.FontAwesome.ttf");
+                _FontAwesomeHandle = GCHandle.Alloc(fontAwesomeBuffer, GCHandleType.Pinned);
+                _PrivateFontAwesomeCollection.AddMemoryFont(_FontAwesomeHandle.AddrOfPinnedObject(), fontAwesomeBuffer.Length);
+                uint rsxCnt = 1;
+                _FontAwesomePointer = AddFontMemResourceEx(_FontAwesomeHandle.AddrOfPinnedObject(),
+                                                     (uint)fontAwesomeBuffer.Length, IntPtr.Zero, ref rsxCnt);
+                using (FontFamily ff = _PrivateFontAwesomeCollection.Families[0])
+                {
+                    if (ff.IsStyleAvailable(FontStyle.Regular))
+                    {
+                        _FontAwesome = new Font(ff, _FontAwesomeDefaultSize, FontStyle.Regular, GraphicsUnit.Point);
+                        _FontAwesomeCache.Add(_FontAwesomeDefaultSize, _FontAwesome);
+                    }
+                    else
+                    {
+                        // Error use default font...
+                        _FontAwesome = SystemInformation.MenuFont;
+                    }
+                }
+            }
+        }
+
+        private static void EnsureFontMaterialLoaded()
+        {
+            if (_FontMaterial == null)
+            {
+                _PrivateFontMaterialCollection = new PrivateFontCollection();
+
+                byte[] fontMaterialBuffer = LoadFont("SystemImages.MaterialIcons-Regular.ttf");
+                _FontMaterialHandle = GCHandle.Alloc(fontMaterialBuffer, GCHandleType.Pinned);
+                _PrivateFontMaterialCollection.AddMemoryFont(_FontMaterialHandle.AddrOfPinnedObject(), fontMaterialBuffer.Length);
+                uint rsxCnt = 1;
+                _FontMaterialPointer = AddFontMemResourceEx(_FontMaterialHandle.AddrOfPinnedObject(),
+                                                     (uint)fontMaterialBuffer.Length, IntPtr.Zero, ref rsxCnt);
+                using (FontFamily ff = _PrivateFontMaterialCollection.Families[0])
+                {
+                    if (ff.IsStyleAvailable(FontStyle.Regular))
+                    {
+                        _FontMaterial = new Font(ff, _FontMaterialDefaultSize, FontStyle.Regular, GraphicsUnit.Point);
+                        _FontMaterialCache.Add(_FontMaterialDefaultSize, _FontMaterial);
+                    }
+                    else
+                    {
+                        // Error use default font...
+                        _FontMaterial = SystemInformation.MenuFont;
+                    }
+                }
+            }
+        }
+
+        private static float _FontMaterialDefaultSize = 18;
+        /// <summary>
+        /// Gets the default size for the Material font size in points.
+        /// </summary>
+        public static float FontMaterialDefaultSize
+        {
+            get { return _FontMaterialDefaultSize; }
+        }
+
+        private static float _FontAwesomeDefaultSize = 18;
+        /// <summary>
+        /// Gets the default size for the FontAwesome font size in points.
+        /// </summary>
+        public static float FontAwesomeDefaultSize
+        {
+            get { return _FontAwesomeDefaultSize; }
+        }
+
+        internal static byte[] LoadFont(string fontFileName)
+        {
+            DotNetBarResourcesAttribute att = Attribute.GetCustomAttribute(System.Reflection.Assembly.GetExecutingAssembly(), typeof(DotNetBarResourcesAttribute)) as DotNetBarResourcesAttribute;
+            if (att != null && att.NamespacePrefix != "")
+            {
+                using (Stream fontStream = Assembly.GetExecutingAssembly().GetManifestResourceStream(att.NamespacePrefix + "." + fontFileName))
+                {
+                    byte[] fontData = new byte[fontStream.Length];
+                    fontStream.Read(fontData, 0, fontData.Length);
+                    fontStream.Close();
+                    return fontData;
+                }
+            }
+            else
+            {
+                using (Stream fontStream = typeof(DotNetBarManager).Module.Assembly.GetManifestResourceStream(typeof(DotNetBarManager), fontFileName))
+                {
+                    byte[] fontData = new byte[fontStream.Length];
+                    fontStream.Read(fontData, 0, fontData.Length);
+                    fontStream.Close();
+                    return fontData;
+                }
+            }
+            return new byte[0];
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/SystemImages/AddMoreItemsContainer.png b/PROMS/DotNetBar Source Code/SystemImages/AddMoreItemsContainer.png
new file mode 100644
index 00000000..8a316e86
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/AddMoreItemsContainer.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/BlankOffice2010HotBlue.png b/PROMS/DotNetBar Source Code/SystemImages/BlankOffice2010HotBlue.png
new file mode 100644
index 00000000..7053db50
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/BlankOffice2010HotBlue.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/BlankOffice2010HotSilver.png b/PROMS/DotNetBar Source Code/SystemImages/BlankOffice2010HotSilver.png
new file mode 100644
index 00000000..0ecc3d0c
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/BlankOffice2010HotSilver.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/BlankOffice2010NormalBlue.png b/PROMS/DotNetBar Source Code/SystemImages/BlankOffice2010NormalBlue.png
new file mode 100644
index 00000000..865c3a2c
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/BlankOffice2010NormalBlue.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/BlankOffice2010NormalSilver.png b/PROMS/DotNetBar Source Code/SystemImages/BlankOffice2010NormalSilver.png
new file mode 100644
index 00000000..4065fa05
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/BlankOffice2010NormalSilver.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/BlankOffice2010PressedBlue.png b/PROMS/DotNetBar Source Code/SystemImages/BlankOffice2010PressedBlue.png
new file mode 100644
index 00000000..dc97111f
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/BlankOffice2010PressedBlue.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/BlankOffice2010PressedSilver.png b/PROMS/DotNetBar Source Code/SystemImages/BlankOffice2010PressedSilver.png
new file mode 100644
index 00000000..dd33032c
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/BlankOffice2010PressedSilver.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/BlankStartButtonHot.png b/PROMS/DotNetBar Source Code/SystemImages/BlankStartButtonHot.png
new file mode 100644
index 00000000..2afc20ff
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/BlankStartButtonHot.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/BlankStartButtonHotBlack.png b/PROMS/DotNetBar Source Code/SystemImages/BlankStartButtonHotBlack.png
new file mode 100644
index 00000000..4a42af5e
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/BlankStartButtonHotBlack.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/BlankStartButtonHotSilver.png b/PROMS/DotNetBar Source Code/SystemImages/BlankStartButtonHotSilver.png
new file mode 100644
index 00000000..a8514b1d
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/BlankStartButtonHotSilver.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/BlankStartButtonHotVistaBlack.png b/PROMS/DotNetBar Source Code/SystemImages/BlankStartButtonHotVistaBlack.png
new file mode 100644
index 00000000..f6f8cedc
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/BlankStartButtonHotVistaBlack.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/BlankStartButtonNormal.png b/PROMS/DotNetBar Source Code/SystemImages/BlankStartButtonNormal.png
new file mode 100644
index 00000000..b923ba69
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/BlankStartButtonNormal.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/BlankStartButtonNormalBlack.png b/PROMS/DotNetBar Source Code/SystemImages/BlankStartButtonNormalBlack.png
new file mode 100644
index 00000000..8f3e519f
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/BlankStartButtonNormalBlack.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/BlankStartButtonNormalSilver.png b/PROMS/DotNetBar Source Code/SystemImages/BlankStartButtonNormalSilver.png
new file mode 100644
index 00000000..c9e5eacd
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/BlankStartButtonNormalSilver.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/BlankStartButtonNormalVistaBlack.png b/PROMS/DotNetBar Source Code/SystemImages/BlankStartButtonNormalVistaBlack.png
new file mode 100644
index 00000000..86708e1b
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/BlankStartButtonNormalVistaBlack.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/BlankStartButtonPressed.png b/PROMS/DotNetBar Source Code/SystemImages/BlankStartButtonPressed.png
new file mode 100644
index 00000000..b44452c1
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/BlankStartButtonPressed.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/BlankStartButtonPressedBlack.png b/PROMS/DotNetBar Source Code/SystemImages/BlankStartButtonPressedBlack.png
new file mode 100644
index 00000000..cd64bc97
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/BlankStartButtonPressedBlack.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/BlankStartButtonPressedSilver.png b/PROMS/DotNetBar Source Code/SystemImages/BlankStartButtonPressedSilver.png
new file mode 100644
index 00000000..edab5743
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/BlankStartButtonPressedSilver.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/BlankStartButtonPressedVistaBlack.png b/PROMS/DotNetBar Source Code/SystemImages/BlankStartButtonPressedVistaBlack.png
new file mode 100644
index 00000000..232dc833
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/BlankStartButtonPressedVistaBlack.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/BlankWin7HotBlue.png b/PROMS/DotNetBar Source Code/SystemImages/BlankWin7HotBlue.png
new file mode 100644
index 00000000..99508daf
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/BlankWin7HotBlue.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/BlankWin7NormalBlue.png b/PROMS/DotNetBar Source Code/SystemImages/BlankWin7NormalBlue.png
new file mode 100644
index 00000000..c45e10a5
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/BlankWin7NormalBlue.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/BlankWin7PressedBlue.png b/PROMS/DotNetBar Source Code/SystemImages/BlankWin7PressedBlue.png
new file mode 100644
index 00000000..120e8b34
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/BlankWin7PressedBlue.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/Calculator.png b/PROMS/DotNetBar Source Code/SystemImages/Calculator.png
new file mode 100644
index 00000000..b5b47550
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/Calculator.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/Category.png b/PROMS/DotNetBar Source Code/SystemImages/Category.png
new file mode 100644
index 00000000..fe01c4a9
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/Category.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/CloseButton.png b/PROMS/DotNetBar Source Code/SystemImages/CloseButton.png
new file mode 100644
index 00000000..a2bdd041
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/CloseButton.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/CollapseTitle.png b/PROMS/DotNetBar Source Code/SystemImages/CollapseTitle.png
new file mode 100644
index 00000000..e260ec0c
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/CollapseTitle.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/ColorPickerButtonImage.png b/PROMS/DotNetBar Source Code/SystemImages/ColorPickerButtonImage.png
new file mode 100644
index 00000000..06c2e80d
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/ColorPickerButtonImage.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/ColorPickerCustomColors.png b/PROMS/DotNetBar Source Code/SystemImages/ColorPickerCustomColors.png
new file mode 100644
index 00000000..23c8059a
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/ColorPickerCustomColors.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/DateReset.png b/PROMS/DotNetBar Source Code/SystemImages/DateReset.png
new file mode 100644
index 00000000..51a459ad
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/DateReset.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/DefaultNavBarImage.png b/PROMS/DotNetBar Source Code/SystemImages/DefaultNavBarImage.png
new file mode 100644
index 00000000..54e6e6ca
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/DefaultNavBarImage.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/Delete.png b/PROMS/DotNetBar Source Code/SystemImages/Delete.png
new file mode 100644
index 00000000..a3534408
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/Delete.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/DockGuideBottom.png b/PROMS/DotNetBar Source Code/SystemImages/DockGuideBottom.png
new file mode 100644
index 00000000..75f68a46
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/DockGuideBottom.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/DockGuideLeft.png b/PROMS/DotNetBar Source Code/SystemImages/DockGuideLeft.png
new file mode 100644
index 00000000..b612f468
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/DockGuideLeft.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/DockGuideRight.png b/PROMS/DotNetBar Source Code/SystemImages/DockGuideRight.png
new file mode 100644
index 00000000..48440d6c
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/DockGuideRight.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/DockGuideTab.png b/PROMS/DotNetBar Source Code/SystemImages/DockGuideTab.png
new file mode 100644
index 00000000..cd2a7541
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/DockGuideTab.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/DockGuideTop.png b/PROMS/DotNetBar Source Code/SystemImages/DockGuideTop.png
new file mode 100644
index 00000000..caf6095e
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/DockGuideTop.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/DockHintAllSides.png b/PROMS/DotNetBar Source Code/SystemImages/DockHintAllSides.png
new file mode 100644
index 00000000..4c12ac60
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/DockHintAllSides.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/DockHintAllSides2010.png b/PROMS/DotNetBar Source Code/SystemImages/DockHintAllSides2010.png
new file mode 100644
index 00000000..fbac3abf
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/DockHintAllSides2010.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/DockHintBottom.png b/PROMS/DotNetBar Source Code/SystemImages/DockHintBottom.png
new file mode 100644
index 00000000..cbc073b1
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/DockHintBottom.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/DockHintBottom2010.png b/PROMS/DotNetBar Source Code/SystemImages/DockHintBottom2010.png
new file mode 100644
index 00000000..6c031f9f
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/DockHintBottom2010.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/DockHintLeft.png b/PROMS/DotNetBar Source Code/SystemImages/DockHintLeft.png
new file mode 100644
index 00000000..58f6f9f8
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/DockHintLeft.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/DockHintLeft2010.png b/PROMS/DotNetBar Source Code/SystemImages/DockHintLeft2010.png
new file mode 100644
index 00000000..754e1d4d
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/DockHintLeft2010.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/DockHintLeftRight2010.png b/PROMS/DotNetBar Source Code/SystemImages/DockHintLeftRight2010.png
new file mode 100644
index 00000000..a364f6e5
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/DockHintLeftRight2010.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/DockHintRight.png b/PROMS/DotNetBar Source Code/SystemImages/DockHintRight.png
new file mode 100644
index 00000000..c5e6233d
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/DockHintRight.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/DockHintRight2010.png b/PROMS/DotNetBar Source Code/SystemImages/DockHintRight2010.png
new file mode 100644
index 00000000..9514c807
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/DockHintRight2010.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/DockHintTab.png b/PROMS/DotNetBar Source Code/SystemImages/DockHintTab.png
new file mode 100644
index 00000000..af8a4606
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/DockHintTab.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/DockHintTab2010.png b/PROMS/DotNetBar Source Code/SystemImages/DockHintTab2010.png
new file mode 100644
index 00000000..0b66dd1d
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/DockHintTab2010.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/DockHintTop.png b/PROMS/DotNetBar Source Code/SystemImages/DockHintTop.png
new file mode 100644
index 00000000..0b7a5aba
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/DockHintTop.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/DockHintTop2010.png b/PROMS/DotNetBar Source Code/SystemImages/DockHintTop2010.png
new file mode 100644
index 00000000..a4141b63
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/DockHintTop2010.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/DockHintTopBottom2010.png b/PROMS/DotNetBar Source Code/SystemImages/DockHintTopBottom2010.png
new file mode 100644
index 00000000..38b9c8b5
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/DockHintTopBottom2010.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/ErrorIcon.png b/PROMS/DotNetBar Source Code/SystemImages/ErrorIcon.png
new file mode 100644
index 00000000..1d198590
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/ErrorIcon.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/ExpandTitle.png b/PROMS/DotNetBar Source Code/SystemImages/ExpandTitle.png
new file mode 100644
index 00000000..674f7bdc
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/ExpandTitle.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/FirstRecord.png b/PROMS/DotNetBar Source Code/SystemImages/FirstRecord.png
new file mode 100644
index 00000000..60b7ea18
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/FirstRecord.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/FontAwesome.ttf b/PROMS/DotNetBar Source Code/SystemImages/FontAwesome.ttf
new file mode 100644
index 00000000..96a3639c
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/FontAwesome.ttf differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/FreeText.png b/PROMS/DotNetBar Source Code/SystemImages/FreeText.png
new file mode 100644
index 00000000..90adc54e
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/FreeText.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/GreenLight.png b/PROMS/DotNetBar Source Code/SystemImages/GreenLight.png
new file mode 100644
index 00000000..f0987ece
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/GreenLight.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/ImagePlaceHolder.png b/PROMS/DotNetBar Source Code/SystemImages/ImagePlaceHolder.png
new file mode 100644
index 00000000..8d7e0561
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/ImagePlaceHolder.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/ImagePlaceHolder16x16.png b/PROMS/DotNetBar Source Code/SystemImages/ImagePlaceHolder16x16.png
new file mode 100644
index 00000000..571d4e1a
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/ImagePlaceHolder16x16.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/LastRecord.png b/PROMS/DotNetBar Source Code/SystemImages/LastRecord.png
new file mode 100644
index 00000000..9ba3f9fb
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/LastRecord.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/MaterialIcons-Regular.ttf b/PROMS/DotNetBar Source Code/SystemImages/MaterialIcons-Regular.ttf
new file mode 100644
index 00000000..0768c78c
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/MaterialIcons-Regular.ttf differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/NavBarConfigure.png b/PROMS/DotNetBar Source Code/SystemImages/NavBarConfigure.png
new file mode 100644
index 00000000..78475cdf
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/NavBarConfigure.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/NavBarShowLess.png b/PROMS/DotNetBar Source Code/SystemImages/NavBarShowLess.png
new file mode 100644
index 00000000..85174de6
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/NavBarShowLess.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/NavBarShowMore.png b/PROMS/DotNetBar Source Code/SystemImages/NavBarShowMore.png
new file mode 100644
index 00000000..e4528eb4
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/NavBarShowMore.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/NewRecord.png b/PROMS/DotNetBar Source Code/SystemImages/NewRecord.png
new file mode 100644
index 00000000..47fb8e5c
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/NewRecord.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/NextRecord.png b/PROMS/DotNetBar Source Code/SystemImages/NextRecord.png
new file mode 100644
index 00000000..dca9007f
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/NextRecord.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/Note24.png b/PROMS/DotNetBar Source Code/SystemImages/Note24.png
new file mode 100644
index 00000000..aeca3326
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/Note24.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/Note64.png b/PROMS/DotNetBar Source Code/SystemImages/Note64.png
new file mode 100644
index 00000000..d89cde1e
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/Note64.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/Office2010BlackClientBackground.png b/PROMS/DotNetBar Source Code/SystemImages/Office2010BlackClientBackground.png
new file mode 100644
index 00000000..1f02c6b3
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/Office2010BlackClientBackground.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/Office2010BlueClientBackground.png b/PROMS/DotNetBar Source Code/SystemImages/Office2010BlueClientBackground.png
new file mode 100644
index 00000000..609af109
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/Office2010BlueClientBackground.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/Office2010SilverClientBackground.png b/PROMS/DotNetBar Source Code/SystemImages/Office2010SilverClientBackground.png
new file mode 100644
index 00000000..31f363a3
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/Office2010SilverClientBackground.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/Pin.png b/PROMS/DotNetBar Source Code/SystemImages/Pin.png
new file mode 100644
index 00000000..45050781
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/Pin.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/PinInactive.png b/PROMS/DotNetBar Source Code/SystemImages/PinInactive.png
new file mode 100644
index 00000000..b6567bca
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/PinInactive.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/PinPushed.png b/PROMS/DotNetBar Source Code/SystemImages/PinPushed.png
new file mode 100644
index 00000000..b55e4240
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/PinPushed.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/PinPushedInactive.png b/PROMS/DotNetBar Source Code/SystemImages/PinPushedInactive.png
new file mode 100644
index 00000000..e11be365
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/PinPushedInactive.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/PreviousRecord.png b/PROMS/DotNetBar Source Code/SystemImages/PreviousRecord.png
new file mode 100644
index 00000000..b9c31ef7
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/PreviousRecord.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/QatCustomizeItemCombo.png b/PROMS/DotNetBar Source Code/SystemImages/QatCustomizeItemCombo.png
new file mode 100644
index 00000000..dbf9af19
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/QatCustomizeItemCombo.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/Rating.png b/PROMS/DotNetBar Source Code/SystemImages/Rating.png
new file mode 100644
index 00000000..dc2d7c09
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/Rating.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/RibbonOverflow.png b/PROMS/DotNetBar Source Code/SystemImages/RibbonOverflow.png
new file mode 100644
index 00000000..4d9792fc
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/RibbonOverflow.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/RibbonOverflow24.png b/PROMS/DotNetBar Source Code/SystemImages/RibbonOverflow24.png
new file mode 100644
index 00000000..bdd9c470
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/RibbonOverflow24.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/Shadow3px-2.png b/PROMS/DotNetBar Source Code/SystemImages/Shadow3px-2.png
new file mode 100644
index 00000000..c67c244b
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/Shadow3px-2.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/Shadow3px.png b/PROMS/DotNetBar Source Code/SystemImages/Shadow3px.png
new file mode 100644
index 00000000..f90d9b49
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/Shadow3px.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/Sort.png b/PROMS/DotNetBar Source Code/SystemImages/Sort.png
new file mode 100644
index 00000000..089d8949
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/Sort.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/TaskBlueFlag.png b/PROMS/DotNetBar Source Code/SystemImages/TaskBlueFlag.png
new file mode 100644
index 00000000..652d0b51
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/TaskBlueFlag.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/TaskBlueStop.png b/PROMS/DotNetBar Source Code/SystemImages/TaskBlueStop.png
new file mode 100644
index 00000000..e87b394c
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/TaskBlueStop.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/TaskBulb.png b/PROMS/DotNetBar Source Code/SystemImages/TaskBulb.png
new file mode 100644
index 00000000..e8f4e109
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/TaskBulb.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/TaskCheckMark.png b/PROMS/DotNetBar Source Code/SystemImages/TaskCheckMark.png
new file mode 100644
index 00000000..e20d30be
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/TaskCheckMark.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/TaskCheckMark2.png b/PROMS/DotNetBar Source Code/SystemImages/TaskCheckMark2.png
new file mode 100644
index 00000000..2bed9b5a
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/TaskCheckMark2.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/TaskDelete.png b/PROMS/DotNetBar Source Code/SystemImages/TaskDelete.png
new file mode 100644
index 00000000..a488342e
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/TaskDelete.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/TaskExclamation.png b/PROMS/DotNetBar Source Code/SystemImages/TaskExclamation.png
new file mode 100644
index 00000000..7d780d1e
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/TaskExclamation.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/TaskFlag.png b/PROMS/DotNetBar Source Code/SystemImages/TaskFlag.png
new file mode 100644
index 00000000..f8dae636
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/TaskFlag.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/TaskHand.png b/PROMS/DotNetBar Source Code/SystemImages/TaskHand.png
new file mode 100644
index 00000000..df6206cf
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/TaskHand.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/TaskHelp.png b/PROMS/DotNetBar Source Code/SystemImages/TaskHelp.png
new file mode 100644
index 00000000..88852552
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/TaskHelp.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/TaskInformation.png b/PROMS/DotNetBar Source Code/SystemImages/TaskInformation.png
new file mode 100644
index 00000000..2363e592
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/TaskInformation.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/TaskInformation2.png b/PROMS/DotNetBar Source Code/SystemImages/TaskInformation2.png
new file mode 100644
index 00000000..fee38ce3
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/TaskInformation2.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/TaskNoEntry.png b/PROMS/DotNetBar Source Code/SystemImages/TaskNoEntry.png
new file mode 100644
index 00000000..cf0de2b5
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/TaskNoEntry.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/TaskShield.png b/PROMS/DotNetBar Source Code/SystemImages/TaskShield.png
new file mode 100644
index 00000000..5ebbd9cf
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/TaskShield.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/TaskShieldHelp.png b/PROMS/DotNetBar Source Code/SystemImages/TaskShieldHelp.png
new file mode 100644
index 00000000..192dd5e3
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/TaskShieldHelp.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/TaskShieldOk.png b/PROMS/DotNetBar Source Code/SystemImages/TaskShieldOk.png
new file mode 100644
index 00000000..3f00e08e
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/TaskShieldOk.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/TaskShieldStop.png b/PROMS/DotNetBar Source Code/SystemImages/TaskShieldStop.png
new file mode 100644
index 00000000..6efe81e3
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/TaskShieldStop.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/TaskStop.png b/PROMS/DotNetBar Source Code/SystemImages/TaskStop.png
new file mode 100644
index 00000000..e5716248
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/TaskStop.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/TaskStop2.png b/PROMS/DotNetBar Source Code/SystemImages/TaskStop2.png
new file mode 100644
index 00000000..ca3cbc50
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/TaskStop2.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/TaskUsers.png b/PROMS/DotNetBar Source Code/SystemImages/TaskUsers.png
new file mode 100644
index 00000000..de7f7119
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/TaskUsers.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/VS2010ClientBackground.png b/PROMS/DotNetBar Source Code/SystemImages/VS2010ClientBackground.png
new file mode 100644
index 00000000..609af109
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/VS2010ClientBackground.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/WinClose.png b/PROMS/DotNetBar Source Code/SystemImages/WinClose.png
new file mode 100644
index 00000000..75325dad
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/WinClose.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/WinMax.png b/PROMS/DotNetBar Source Code/SystemImages/WinMax.png
new file mode 100644
index 00000000..b80e05da
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/WinMax.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/WinMin.png b/PROMS/DotNetBar Source Code/SystemImages/WinMin.png
new file mode 100644
index 00000000..5bba002e
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/WinMin.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/WinRestore.png b/PROMS/DotNetBar Source Code/SystemImages/WinRestore.png
new file mode 100644
index 00000000..5dd292af
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/WinRestore.png differ
diff --git a/PROMS/DotNetBar Source Code/SystemImages/WizardHeaderImage.png b/PROMS/DotNetBar Source Code/SystemImages/WizardHeaderImage.png
new file mode 100644
index 00000000..572baf61
Binary files /dev/null and b/PROMS/DotNetBar Source Code/SystemImages/WizardHeaderImage.png differ
diff --git a/PROMS/DotNetBar Source Code/TabColorScheme.cs b/PROMS/DotNetBar Source Code/TabColorScheme.cs
new file mode 100644
index 00000000..4afcc3d9
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TabColorScheme.cs	
@@ -0,0 +1,2245 @@
+using System;
+using System.Drawing;
+using System.ComponentModel;
+using System.Windows.Forms;
+using DevComponents.DotNetBar.Rendering;
+using System.Threading;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represents the class that defines colors for a tab control.
+    /// </summary>
+    [ToolboxItem(false), TypeConverter(typeof(System.ComponentModel.ExpandableObjectConverter))]
+    public class TabColorScheme
+    {
+        #region Events
+        public event EventHandler ColorChanged;
+        #endregion
+
+        #region Private variables
+        private eTabStripStyle m_Style = eTabStripStyle.OneNote;
+
+        // Tab Control Section
+        private Color m_TabBackground = Color.Empty;
+        private bool m_TabBackgroundCustom = false;
+        private Color m_TabBackground2 = Color.Empty;
+        private bool m_TabBackground2Custom = false;
+        private int m_TabBackgroundGradientAngle = 90;
+        private Color m_TabBorder = Color.Empty;
+        private bool m_TabBorderCustom = false;
+
+        // Tab Panel Section
+        private Color m_TabPanelBackground = Color.Empty;
+        private bool m_TabPanelBackgroundCustom = false;
+        private Color m_TabPanelBackground2 = Color.Empty;
+        private bool m_TabPanelBackground2Custom = false;
+        private int m_TabPanelBackgroundGradientAngle = 90;
+        private Color m_TabPanelBorder = Color.Empty;
+        private bool m_TabPanelBorderCustom = false;
+
+        // Tab Item Section
+        private Color m_TabItemBorder = Color.Empty;
+        private bool m_TabItemBorderCustom = false;
+        private Color m_TabItemBorderLight = Color.Empty;
+        private bool m_TabItemBorderLightCustom = false;
+        private Color m_TabItemBorderDark = Color.Empty;
+        private bool m_TabItemBorderDarkCustom = false;
+        private Color m_TabItemBackground = Color.Empty;
+        private bool m_TabItemBackgroundCustom = false;
+        private Color m_TabItemBackground2 = Color.Empty;
+        private bool m_TabItemBackground2Custom = false;
+        private int m_TabItemBackgroundGradientAngle = 90;
+        private BackgroundColorBlendCollection m_TabItemBackgroundColorBlend = new BackgroundColorBlendCollection();
+        private Color m_TabItemText = Color.Empty;
+        private bool m_TabItemTextCustom = false;
+
+        // Tab Item Hot Section
+        private Color m_TabItemHotBorder = Color.Empty;
+        private bool m_TabItemHotBorderCustom = false;
+        private Color m_TabItemHotBorderLight = Color.Empty;
+        private bool m_TabItemHotBorderLightCustom = false;
+        private Color m_TabItemHotBorderDark = Color.Empty;
+        private bool m_TabItemHotBorderDarkCustom = false;
+        private Color m_TabItemHotBackground = Color.Empty;
+        private bool m_TabItemHotBackgroundCustom = false;
+        private Color m_TabItemHotBackground2 = Color.Empty;
+        private bool m_TabItemHotBackground2Custom = false;
+        private int m_TabItemHotBackgroundGradientAngle = 90;
+        private BackgroundColorBlendCollection m_TabItemHotBackgroundColorBlend = new BackgroundColorBlendCollection();
+        private Color m_TabItemHotText = Color.Empty;
+        private bool m_TabItemHotTextCustom = false;
+
+        // Tab Item Selected Section
+        private Color m_TabItemSelectedBorder = Color.Empty;
+        private bool m_TabItemSelectedBorderCustom = false;
+        private Color m_TabItemSelectedBorderLight = Color.Empty;
+        private bool m_TabItemSelectedBorderLightCustom = false;
+        private Color m_TabItemSelectedBorderDark = Color.Empty;
+        private bool m_TabItemSelectedBorderDarkCustom = false;
+        private Color m_TabItemSelectedBackground = Color.Empty;
+        private bool m_TabItemSelectedBackgroundCustom = false;
+        private Color m_TabItemSelectedBackground2 = Color.Empty;
+        private bool m_TabItemSelectedBackground2Custom = false;
+        private int m_TabItemSelectedBackgroundGradientAngle = 90;
+        private BackgroundColorBlendCollection m_TabItemSelectedBackgroundColorBlend = new BackgroundColorBlendCollection();
+        private Color m_TabItemSelectedText = Color.Empty;
+        private bool m_TabItemSelectedTextCustom = false;
+
+        private Color m_TabItemSeparator = Color.Empty;
+        private bool m_TabItemSeparatorCustom = false;
+        private Color m_TabItemSeparatorShade = Color.Empty;
+        private bool m_TabItemSeparatorShadeCustom = false;
+
+        private bool m_Themed = false;
+        private bool m_OtherCustom = false;
+        #endregion
+
+        #region Constructor
+        /// <summary>
+        /// Default constructor.
+        /// </summary>
+        public TabColorScheme()
+        {
+            this.Refresh();
+        }
+        /// <summary>
+        /// Default contructor that accepts style.
+        /// </summary>
+        public TabColorScheme(eTabStripStyle style)
+        {
+            m_Style = style;
+            this.Refresh();
+        }
+        #endregion
+
+        #region Color Scheme Generation
+
+        /// <summary>
+        /// Refreshes colors stored in the color scheme. This method is used for example to refresh the color after system display colors have changed.
+        /// </summary>
+        public void Refresh()
+        {
+            _TabBackgroundImage = null;
+
+            if (m_Themed)
+            {
+                GenerateThemedColorScheme();
+                return;
+            }
+            switch (m_Style)
+            {
+                case eTabStripStyle.Metro:
+                    {
+                        if (StyleManager.IsVisualStudio2012(StyleManager.Style))
+                            GenerateMetroVS2012ColorScheme();
+                        else
+                            GenerateMetroColorScheme();
+                        break;
+                    }
+                case eTabStripStyle.Flat:
+                    {
+                        GenerateFlatColorScheme();
+                        break;
+                    }
+                case eTabStripStyle.Office2003:
+                    {
+                        GenerateOffice2003ColorScheme();
+                        break;
+                    }
+                case eTabStripStyle.Office2007Document:
+                case eTabStripStyle.Office2007Dock:
+                    {
+                        GenerateOffice2007DocumentColorScheme();
+                        break;
+                    }
+                case eTabStripStyle.VS2005:
+                    {
+                        GenerateVS2005ColorScheme(false);
+                        break;
+                    }
+                case eTabStripStyle.VS2005Dock:
+                    {
+                        GenerateVS2005ColorScheme(true);
+                        break;
+                    }
+                case eTabStripStyle.SimulatedTheme:
+                    {
+                        GenerateVS2005ColorScheme(true);
+                        ApplySimulatedColorScheme();
+                        break;
+                    }
+                case eTabStripStyle.RoundHeader:
+                    {
+                        GenerateRoundHeaderColorScheme();
+                        break;
+                    }
+                case eTabStripStyle.VS2005Document:
+                    {
+                        GenerateVS2005DocumentColorScheme();
+                        break;
+                    }
+                default:
+                    {
+                        GenerateOneNoteColorScheme();
+                        break;
+                    }
+            }
+            if (!m_TabItemTextCustom)
+            {
+                if (!m_TabItemBackground.IsEmpty && Math.Abs(m_TabItemText.GetBrightness() - m_TabItemBackground.GetBrightness()) <= .2)
+                    m_TabItemText = (m_TabItemText.GetBrightness() < .5 ? ControlPaint.Light(m_TabItemText) : ControlPaint.Dark(m_TabItemText));
+            }
+            if (!m_TabItemSelectedTextCustom)
+            {
+                if (!m_TabItemSelectedBackground.IsEmpty && Math.Abs(m_TabItemSelectedText.GetBrightness() - m_TabItemSelectedBackground.GetBrightness()) <= .2)
+                    m_TabItemSelectedText = (m_TabItemSelectedText.GetBrightness() < .5 ? ControlPaint.Light(m_TabItemSelectedText) : ControlPaint.Dark(m_TabItemSelectedText));
+            }
+        }
+
+        private void GenerateMetroVS2012ColorScheme()
+        {
+            Office2007TabColorTable ct = null;
+            Office2007ColorTable globalTable = null;
+            if (GlobalManager.Renderer is Office2007Renderer)
+            {
+                globalTable = ((Office2007Renderer)GlobalManager.Renderer).ColorTable;
+                if (_TabContext == eTabContext.DockTab && globalTable.DockTabStrip != null)
+                    ct = globalTable.DockTabStrip;
+                else
+                    ct = globalTable.TabControl;
+            }
+            if (ct == null)
+            {
+                GenerateOneNoteColorScheme();
+                return;
+            }
+
+            if (!m_TabItemSeparatorCustom) m_TabItemSeparator = Color.Empty;
+            if (!m_TabItemSeparatorShadeCustom) m_TabItemSeparatorShade = Color.Empty;
+
+            // Tab Control Section
+            if (!m_TabBackgroundCustom)
+            {
+                if (ct.TabBackground.Start.IsEmpty)
+                    m_TabBackground = globalTable.Form.BackColor;
+                else
+                    m_TabBackground = ct.TabBackground.Start;
+            }
+            if (!m_TabBackground2Custom) m_TabBackground2 = ct.TabBackground.End;
+            m_TabBackgroundGradientAngle = ct.TabBackground.GradientAngle;
+
+            if (!m_TabBorderCustom) m_TabBorder = ct.TabPanelBorder;
+
+            // Tab Item Section
+            if (!m_TabItemBorderCustom) m_TabItemBorder = Color.Empty;
+            if (!m_TabItemBorderLightCustom) m_TabItemBorderLight = Color.Empty;
+            if (!m_TabItemBorderDarkCustom) m_TabItemBorderDark = Color.Empty;
+            if (!m_TabItemBackgroundCustom) m_TabItemBackground = Color.Empty;
+            if (!m_TabItemBackground2Custom) m_TabItemBackground2 = Color.Empty;
+            //m_TabItemBackgroundGradientAngle=90;
+            if (!m_TabItemTextCustom)
+            {
+                if (ct.TabBackground.Start.IsEmpty)
+                    m_TabItemText = globalTable.Form.TextColor;
+                else
+                    m_TabItemText = ct.Default.Text;
+            }
+
+            // Tab Item Hot Section
+            if (!m_TabItemHotBorderCustom) m_TabItemHotBorder = Color.Empty;
+            if (!m_TabItemHotBorderLightCustom) m_TabItemHotBorderLight = Color.Empty;
+            if (!m_TabItemHotBorderDarkCustom) m_TabItemHotBorderDark = Color.Empty;
+            if (!m_TabItemHotBackgroundCustom && ct.MouseOver.TopBackground != null) m_TabItemHotBackground = ct.MouseOver.TopBackground.Start;
+            if (!m_TabItemHotBackground2Custom) m_TabItemHotBackground2 = Color.Empty;
+            //m_TabItemHotBackgroundGradientAngle=90;
+            if (!m_TabItemHotTextCustom) m_TabItemHotText = ct.MouseOver.Text;
+
+            // Tab Item Selected Section
+            if (!m_TabItemSelectedBorderCustom)
+            {
+                if (ct.Selected.OuterBorder.IsEmpty)
+                    m_TabItemSelectedBorder = m_TabItemText;
+                else
+                    m_TabItemSelectedBorder = ct.Selected.OuterBorder;
+            }
+            if (!m_TabItemSelectedBorderLightCustom) m_TabItemSelectedBorderLight = Color.Empty;
+            if (!m_TabItemSelectedBorderDarkCustom) m_TabItemSelectedBorderDark = Color.Empty;
+            if (!m_TabItemSelectedBackgroundCustom && ct.Selected.TopBackground != null) m_TabItemSelectedBackground = ct.Selected.TopBackground.Start;
+            if (!m_TabItemSelectedBackground2Custom) m_TabItemSelectedBackground2 = Color.Empty;
+            //m_TabItemSelectedBackgroundGradientAngle=90;
+            if (!m_TabItemSelectedTextCustom) m_TabItemSelectedText = ct.Selected.Text;
+
+            // Tab Panel Section
+            if (!m_TabPanelBackgroundCustom) m_TabPanelBackground = m_TabBackground;
+            if (!m_TabPanelBackground2Custom) m_TabPanelBackground2 = m_TabBackground2;
+            //m_TabPanelBackgroundGradientAngle=90;
+            if (!m_TabPanelBorderCustom) m_TabPanelBorder = m_TabBorder;
+        }
+
+        private void GenerateMetroColorScheme()
+        {
+            Office2007TabColorTable ct = null;
+            Office2007ColorTable globalTable = null;
+            if (GlobalManager.Renderer is Office2007Renderer)
+            {
+                globalTable = ((Office2007Renderer)GlobalManager.Renderer).ColorTable;
+                ct = globalTable.TabControl;
+            }
+            if (ct == null)
+            {
+                GenerateOneNoteColorScheme();
+                return;
+            }
+
+            if (!m_TabItemSeparatorCustom) m_TabItemSeparator = Color.Empty;
+            if (!m_TabItemSeparatorShadeCustom) m_TabItemSeparatorShade = Color.Empty;
+
+            // Tab Control Section
+            if (!m_TabBackgroundCustom)
+            {
+                if (ct.TabBackground.Start.IsEmpty)
+                    m_TabBackground = globalTable.Form.BackColor;
+                else
+                    m_TabBackground = ct.TabBackground.Start;
+            }
+            if (!m_TabBackground2Custom) m_TabBackground2 = ct.TabBackground.End;
+            m_TabBackgroundGradientAngle = ct.TabBackground.GradientAngle;
+
+            if (!m_TabBorderCustom) m_TabBorder = ct.TabPanelBorder;
+
+            // Tab Item Section
+            if (!m_TabItemBorderCustom) m_TabItemBorder = Color.Empty;
+            if (!m_TabItemBorderLightCustom) m_TabItemBorderLight = Color.Empty;
+            if (!m_TabItemBorderDarkCustom) m_TabItemBorderDark = Color.Empty;
+            if (!m_TabItemBackgroundCustom) m_TabItemBackground = Color.Empty;
+            if (!m_TabItemBackground2Custom) m_TabItemBackground2 = Color.Empty;
+            //m_TabItemBackgroundGradientAngle=90;
+            if (!m_TabItemTextCustom)
+            {
+                if (ct.TabBackground.Start.IsEmpty)
+                    m_TabItemText = globalTable.Form.TextColor;
+                else
+                    m_TabItemText = ct.Default.Text;
+            }
+
+            // Tab Item Hot Section
+            if (!m_TabItemHotBorderCustom) m_TabItemHotBorder = Color.Empty;
+            if (!m_TabItemHotBorderLightCustom) m_TabItemHotBorderLight = Color.Empty;
+            if (!m_TabItemHotBorderDarkCustom) m_TabItemHotBorderDark = Color.Empty;
+            if (!m_TabItemHotBackgroundCustom) m_TabItemHotBackground = Color.Empty;
+            if (!m_TabItemHotBackground2Custom) m_TabItemHotBackground2 = Color.Empty;
+            //m_TabItemHotBackgroundGradientAngle=90;
+            if (!m_TabItemHotTextCustom) m_TabItemHotText = ct.MouseOver.Text;
+
+            // Tab Item Selected Section
+            if (!m_TabItemSelectedBorderCustom)
+            {
+                if (ct.Selected.OuterBorder.IsEmpty)
+                    m_TabItemSelectedBorder = m_TabItemText;
+                else
+                    m_TabItemSelectedBorder = ct.Selected.OuterBorder;
+            }
+            if (!m_TabItemSelectedBorderLightCustom) m_TabItemSelectedBorderLight = Color.Empty;
+            if (!m_TabItemSelectedBorderDarkCustom) m_TabItemSelectedBorderDark = Color.Empty;
+            if (!m_TabItemSelectedBackgroundCustom) m_TabItemSelectedBackground = m_TabBackground;
+            if (!m_TabItemSelectedBackground2Custom) m_TabItemSelectedBackground2 = Color.Empty;
+            //m_TabItemSelectedBackgroundGradientAngle=90;
+            if (!m_TabItemSelectedTextCustom) m_TabItemSelectedText = ct.Selected.Text;
+
+            // Tab Panel Section
+            if (!m_TabPanelBackgroundCustom) m_TabPanelBackground = m_TabBackground;
+            if (!m_TabPanelBackground2Custom) m_TabPanelBackground2 = m_TabBackground2;
+            //m_TabPanelBackgroundGradientAngle=90;
+            if (!m_TabPanelBorderCustom) m_TabPanelBorder = m_TabBorder;
+        }
+
+        private void ApplySimulatedColorScheme()
+        {
+            eWinXPColorScheme xpc = BarFunctions.WinXPColorScheme;
+            if (xpc == eWinXPColorScheme.Undetermined)
+            {
+                if (!m_TabItemSelectedBorderDarkCustom) m_TabItemSelectedBorderDark = SystemColors.Highlight;
+                if (!m_TabItemSelectedBorderLightCustom) m_TabItemSelectedBorderLight = Color.FromArgb(128, SystemColors.Highlight);
+            }
+            else
+            {
+                if (!m_TabItemSelectedBorderDarkCustom) m_TabItemSelectedBorderDark = GetColor("E68B2C");
+                if (!m_TabItemSelectedBorderLightCustom) m_TabItemSelectedBorderLight = GetColor("FFC73C");
+            }
+
+            if (!m_TabItemHotBorderDarkCustom) m_TabItemHotBorderDark = m_TabItemSelectedBorderDark;
+            if (!m_TabItemHotBorderLightCustom) m_TabItemHotBorderLight = m_TabItemSelectedBorderLight;
+            if (!m_TabItemHotBorderCustom) m_TabItemHotBorder = m_TabItemBorder;
+
+            if (!m_TabItemBorderLightCustom) m_TabItemBorderLight = SystemColors.ControlLightLight;
+            if (!m_TabItemBorderDarkCustom) m_TabItemBorderDark = SystemColors.Control;
+
+        }
+
+        /// <summary>
+        /// Generates color scheme for flat style.
+        /// </summary>
+        private void GenerateFlatColorScheme()
+        {
+            if (!m_TabItemSeparatorCustom) m_TabItemSeparator = SystemColors.ControlDark;
+            if (!m_TabItemSeparatorShadeCustom) m_TabItemSeparatorShade = Color.Empty;
+
+            // Tab Control Section
+            if (!m_TabBackgroundCustom) m_TabBackground = GetBackColorFlat();
+            if (!m_TabBackground2Custom) m_TabBackground2 = Color.Empty;
+            //m_TabBackgroundGradientAngle=90;
+            if (!m_TabBorderCustom) m_TabBorder = SystemColors.ControlDark;
+
+            // Tab Item Section
+            if (!m_TabItemBorderCustom) m_TabItemBorder = Color.Empty;
+            if (!m_TabItemBorderLightCustom) m_TabItemBorderLight = Color.Empty;
+            if (!m_TabItemBorderDarkCustom) m_TabItemBorderDark = Color.Empty;
+            if (!m_TabItemBackgroundCustom) m_TabItemBackground = Color.Empty;
+            if (!m_TabItemBackground2Custom) m_TabItemBackground2 = Color.Empty;
+            //m_TabItemBackgroundGradientAngle=90;
+            if (!m_TabItemTextCustom) m_TabItemText = SystemColors.ControlDark;
+
+            // Tab Item Hot Section
+            if (!m_TabItemHotBorderCustom) m_TabItemHotBorder = Color.Empty;
+            if (!m_TabItemHotBorderLightCustom) m_TabItemHotBorderLight = Color.Empty;
+            if (!m_TabItemHotBorderDarkCustom) m_TabItemHotBorderDark = Color.Empty;
+            if (!m_TabItemHotBackgroundCustom) m_TabItemHotBackground = Color.Empty;
+            if (!m_TabItemHotBackground2Custom) m_TabItemHotBackground2 = Color.Empty;
+            //m_TabItemHotBackgroundGradientAngle=90;
+            if (!m_TabItemHotTextCustom) m_TabItemHotText = Color.Empty;
+
+            // Tab Item Selected Section
+            if (!m_TabItemSelectedBorderCustom) m_TabItemSelectedBorder = SystemColors.ControlText;
+            if (!m_TabItemSelectedBorderLightCustom) m_TabItemSelectedBorderLight = SystemColors.ControlLightLight;
+            if (!m_TabItemSelectedBorderDarkCustom) m_TabItemSelectedBorderDark = Color.Empty;
+            if (!m_TabItemSelectedBackgroundCustom) m_TabItemSelectedBackground = SystemColors.Control;
+            if (!m_TabItemSelectedBackground2Custom) m_TabItemSelectedBackground2 = Color.Empty;
+            //m_TabItemSelectedBackgroundGradientAngle=90;
+            if (!m_TabItemSelectedTextCustom) m_TabItemSelectedText = SystemColors.ControlText;
+
+            // Tab Panel Section
+            if (!m_TabPanelBackgroundCustom) m_TabPanelBackground = m_TabItemSelectedBackground;
+            if (!m_TabPanelBackground2Custom) m_TabPanelBackground2 = Color.Empty;
+            //m_TabPanelBackgroundGradientAngle=90;
+            if (!m_TabPanelBorderCustom) m_TabPanelBorder = SystemColors.ControlDark;
+        }
+
+        private Color GetBackColorFlat()
+        {
+            Color color = ControlPaint.Light(SystemColors.Control);
+            eWinXPColorScheme xpc = BarFunctions.WinXPColorScheme;
+            switch (xpc)
+            {
+                case eWinXPColorScheme.Blue:
+                    color = Color.FromArgb(255, 251, 233);
+                    break;
+                case eWinXPColorScheme.OliveGreen:
+                    color = Color.FromArgb(255, 251, 233);
+                    break;
+                case eWinXPColorScheme.Silver:
+                    color = Color.FromArgb(251, 250, 255);
+                    break;
+            }
+            return color;
+        }
+
+        /// <summary>
+        /// Generates color scheme for Office 2003 style.
+        /// </summary>
+        private void GenerateOffice2003ColorScheme()
+        {
+            // Office 2003
+            ColorScheme scheme = new ColorScheme();
+            scheme.Style = eDotNetBarStyle.Office2003;
+
+            if (!m_TabItemSeparatorCustom) m_TabItemSeparator = scheme.ItemSeparator;
+            if (!m_TabItemSeparatorShadeCustom) m_TabItemSeparatorShade = scheme.ItemSeparatorShade;
+
+            // Tab Control Section
+            if (!m_TabBackgroundCustom) m_TabBackground = scheme.BarBackground;
+            if (!m_TabBackground2Custom) m_TabBackground2 = scheme.BarBackground2;
+            //m_TabBackgroundGradientAngle=scheme.BarBackgroundGradientAngle;
+            if (!m_TabBorderCustom) m_TabBorder = Color.Empty;
+
+            // Tab Item Section
+            if (!m_TabItemBorderCustom) m_TabItemBorder = Color.Empty;
+            if (!m_TabItemBorderLightCustom) m_TabItemBorderLight = Color.Empty;
+            if (!m_TabItemBorderDarkCustom) m_TabItemBorderDark = Color.Empty;
+            if (!m_TabItemBackgroundCustom) m_TabItemBackground = Color.Empty;
+            if (!m_TabItemBackground2Custom) m_TabItemBackground2 = Color.Empty;
+            //m_TabItemBackgroundGradientAngle=90;
+            if (!m_TabItemTextCustom) m_TabItemText = SystemColors.ControlText;
+
+            // Tab Item Hot Section
+            if (!m_TabItemHotBorderCustom) m_TabItemHotBorder = Color.Empty;
+            if (!m_TabItemHotBorderLightCustom) m_TabItemHotBorderLight = Color.Empty;
+            if (!m_TabItemHotBorderDarkCustom) m_TabItemHotBorderDark = Color.Empty;
+            if (!m_TabItemHotBackgroundCustom) m_TabItemHotBackground = Color.Empty;
+            if (!m_TabItemHotBackground2Custom) m_TabItemHotBackground2 = Color.Empty;
+            //m_TabItemHotBackgroundGradientAngle=90;
+            if (!m_TabItemHotTextCustom) m_TabItemHotText = Color.Empty;
+
+            // Tab Item Selected Section
+            if (!m_TabItemSelectedBorderCustom) m_TabItemSelectedBorder = scheme.ItemPressedBorder;
+            if (!m_TabItemSelectedBorderLightCustom) m_TabItemSelectedBorderLight = scheme.ItemPressedBorder;
+            if (!m_TabItemSelectedBorderDarkCustom) m_TabItemSelectedBorderDark = Color.Empty;
+            if (!m_TabItemSelectedBackgroundCustom) m_TabItemSelectedBackground = scheme.ItemPressedBackground;
+            if (!m_TabItemSelectedBackground2Custom) m_TabItemSelectedBackground2 = scheme.ItemPressedBackground2;
+            //m_TabItemSelectedBackgroundGradientAngle=scheme.ItemPressedBackgroundGradientAngle;
+            if (!m_TabItemSelectedTextCustom) m_TabItemSelectedText = scheme.ItemPressedText;
+
+            // Tab Panel Section
+            if (!m_TabPanelBackgroundCustom) m_TabPanelBackground = m_TabBackground2;
+            if (!m_TabPanelBackground2Custom) m_TabPanelBackground2 = m_TabBackground;
+            //m_TabPanelBackgroundGradientAngle=scheme.BarBackgroundGradientAngle;
+            if (!m_TabPanelBorderCustom) m_TabPanelBorder = m_TabItemSelectedBorder;
+        }
+
+        /// <summary>
+        /// Generates the VS2005 document tab like color scheme.
+        /// </summary>
+        private void GenerateVS2005DocumentColorScheme()
+        {
+            // VS 2005
+            ColorScheme scheme = new ColorScheme();
+            scheme.Style = eDotNetBarStyle.VS2005;
+
+            if (!m_TabItemSeparatorCustom) m_TabItemSeparator = scheme.ItemSeparator;
+            if (!m_TabItemSeparatorShadeCustom) m_TabItemSeparatorShade = scheme.ItemSeparatorShade;
+
+            // Tab Control Section
+            if (!m_TabBackgroundCustom) m_TabBackground = scheme.BarBackground;
+            if (!m_TabBackground2Custom) m_TabBackground2 = Color.Empty;
+            //m_TabBackgroundGradientAngle=scheme.BarBackgroundGradientAngle;
+            if (!m_TabBorderCustom) m_TabBorder = Color.Empty;
+
+            // Tab Item Section
+            if (!m_TabItemBorderCustom) m_TabItemBorder = GetColor("ACA899");
+            if (!m_TabItemBorderLightCustom) m_TabItemBorderLight = Color.White;
+            if (!m_TabItemBorderDarkCustom) m_TabItemBorderDark = GetColor("ECE9D8");
+            if (!m_TabItemBackgroundCustom) m_TabItemBackground = GetColor("FDFCFB");
+            if (!m_TabItemBackground2Custom) m_TabItemBackground2 = GetColor("F1EFE2");
+            //m_TabItemBackgroundGradientAngle=90;
+            if (!m_TabItemTextCustom) m_TabItemText = SystemColors.ControlText;
+
+            // Tab Item Hot Section
+            if (!m_TabItemHotBorderCustom) m_TabItemHotBorder = Color.Empty;
+            if (!m_TabItemHotBorderLightCustom) m_TabItemHotBorderLight = Color.Empty;
+            if (!m_TabItemHotBorderDarkCustom) m_TabItemHotBorderDark = Color.Empty;
+            if (!m_TabItemHotBackgroundCustom) m_TabItemHotBackground = Color.Empty;
+            if (!m_TabItemHotBackground2Custom) m_TabItemHotBackground2 = Color.Empty;
+            //m_TabItemHotBackgroundGradientAngle=90;
+            if (!m_TabItemHotTextCustom) m_TabItemHotText = Color.Empty;
+
+            // Tab Item Selected Section
+            if (!m_TabItemSelectedBorderCustom) m_TabItemSelectedBorder = GetColor("7F9DB9");
+            if (!m_TabItemSelectedBorderLightCustom) m_TabItemSelectedBorderLight = Color.Empty;
+            if (!m_TabItemSelectedBorderDarkCustom) m_TabItemSelectedBorderDark = Color.Empty;
+            if (!m_TabItemSelectedBackgroundCustom) m_TabItemSelectedBackground = Color.White;
+            if (!m_TabItemSelectedBackground2Custom) m_TabItemSelectedBackground2 = Color.Empty;
+            //m_TabItemSelectedBackgroundGradientAngle=scheme.ItemPressedBackgroundGradientAngle;
+            if (!m_TabItemSelectedTextCustom) m_TabItemSelectedText = SystemColors.ControlText;
+
+            // Tab Panel Section
+            if (!m_TabPanelBackgroundCustom) m_TabPanelBackground = m_TabBackground2;
+            if (!m_TabPanelBackground2Custom) m_TabPanelBackground2 = m_TabBackground;
+            //m_TabPanelBackgroundGradientAngle=scheme.BarBackgroundGradientAngle;
+            if (!m_TabPanelBorderCustom) m_TabPanelBorder = m_TabItemSelectedBorder;
+        }
+
+        /// <summary>
+        /// Generates Windows XP Themed color scheme.
+        /// </summary>
+        private void GenerateThemedColorScheme()
+        {
+            if (!m_TabItemSeparatorCustom) m_TabItemSeparator = SystemColors.ControlDark;
+            if (!m_TabItemSeparatorShadeCustom) m_TabItemSeparatorShade = Color.Empty;
+
+            // Tab Control Section
+            if (!m_TabBackgroundCustom) m_TabBackground = Color.Empty;
+            if (!m_TabBackground2Custom) m_TabBackground2 = Color.Empty;
+            //m_TabBackgroundGradientAngle=90;
+            if (!m_TabBorderCustom) m_TabBorder = Color.Empty;
+
+            // Tab Item Section
+            if (!m_TabItemBorderCustom) m_TabItemBorder = Color.Empty;
+            if (!m_TabItemBorderLightCustom) m_TabItemBorderLight = Color.Empty;
+            if (!m_TabItemBorderDarkCustom) m_TabItemBorderDark = Color.Empty;
+            if (!m_TabItemBackgroundCustom) m_TabItemBackground = Color.Empty;
+            if (!m_TabItemBackground2Custom) m_TabItemBackground2 = Color.Empty;
+            //m_TabItemBackgroundGradientAngle=90;
+            if (!m_TabItemTextCustom) m_TabItemText = SystemColors.ControlText;
+
+            // Tab Panel Section
+            if (!m_TabPanelBackgroundCustom) m_TabPanelBackground = SystemColors.Control;
+            if (!m_TabPanelBackground2Custom) m_TabPanelBackground2 = Color.Empty;
+            //m_TabPanelBackgroundGradientAngle=90;
+            if (!m_TabPanelBorderCustom) m_TabPanelBorder = Color.Empty;
+
+            // Tab Item Hot Section
+            if (!m_TabItemHotBorderCustom) m_TabItemHotBorder = Color.Empty;
+            if (!m_TabItemHotBorderLightCustom) m_TabItemHotBorderLight = Color.Empty;
+            if (!m_TabItemHotBorderDarkCustom) m_TabItemHotBorderDark = Color.Empty;
+            if (!m_TabItemHotBackgroundCustom) m_TabItemHotBackground = Color.Empty;
+            if (!m_TabItemHotBackground2Custom) m_TabItemHotBackground2 = Color.Empty;
+            //m_TabItemHotBackgroundGradientAngle=90;
+            if (!m_TabItemHotTextCustom) m_TabItemHotText = Color.Empty;
+
+            // Tab Item Selected Section
+            if (!m_TabItemSelectedBorderCustom) m_TabItemSelectedBorder = SystemColors.ControlText;
+            if (!m_TabItemSelectedBorderLightCustom) m_TabItemSelectedBorderLight = SystemColors.ControlLightLight;
+            if (!m_TabItemSelectedBorderDarkCustom) m_TabItemSelectedBorderDark = Color.Empty;
+            if (!m_TabItemSelectedBackgroundCustom) m_TabItemSelectedBackground = SystemColors.Control;
+            if (!m_TabItemSelectedBackground2Custom) m_TabItemSelectedBackground2 = Color.Empty;
+            //m_TabItemSelectedBackgroundGradientAngle=90;
+            if (!m_TabItemSelectedTextCustom) m_TabItemSelectedText = SystemColors.ControlText;
+        }
+
+        /// <summary>
+        /// Generates OneNote style color scheme.
+        /// </summary>
+        private void GenerateOneNoteColorScheme()
+        {
+            eWinXPColorScheme xpc = BarFunctions.WinXPColorScheme;
+
+            if (!m_TabItemSeparatorCustom) m_TabItemSeparator = Color.Empty;
+            if (!m_TabItemSeparatorShadeCustom) m_TabItemSeparatorShade = Color.Empty;
+
+            ColorScheme cs = new ColorScheme(eDotNetBarStyle.Office2003);
+            switch (xpc)
+            {
+                case eWinXPColorScheme.Blue:
+                    {
+                        // Tab Control Section
+                        if (!m_TabBackgroundCustom) m_TabBackground = Color.FromArgb(196, 218, 250);
+                        if (!m_TabBackground2Custom) m_TabBackground2 = Color.FromArgb(253, 254, 255);
+                        //m_TabBackgroundGradientAngle=90;
+                        if (!m_TabBorderCustom) m_TabBorder = Color.Empty;
+
+                        // Tab Item Section
+                        if (!m_TabItemBorderCustom) m_TabItemBorder = Color.FromArgb(0, 53, 154);
+                        if (!m_TabItemBorderLightCustom) m_TabItemBorderLight = Color.White;
+                        if (!m_TabItemBorderDarkCustom) m_TabItemBorderDark = Color.FromArgb(117, 166, 241);
+                        if (!m_TabItemBackgroundCustom) m_TabItemBackground = Color.FromArgb(236, 243, 252);
+                        if (!m_TabItemBackground2Custom) m_TabItemBackground2 = Color.FromArgb(191, 214, 246);
+                        //m_TabItemBackgroundGradientAngle=90;
+                        if (!m_TabItemTextCustom) m_TabItemText = SystemColors.ControlText;
+
+                        // Tab Panel Section
+                        if (!m_TabPanelBackgroundCustom) m_TabPanelBackground = m_TabItemBackground2;
+                        if (!m_TabPanelBackground2Custom) m_TabPanelBackground2 = Color.White;
+                        //m_TabPanelBackgroundGradientAngle=90;
+                        if (!m_TabPanelBorderCustom) m_TabPanelBorder = Color.Empty;
+
+                        // Tab Item Hot Section
+                        if (!m_TabItemHotBorderCustom) m_TabItemHotBorder = Color.FromArgb(0, 0, 128);
+                        if (!m_TabItemHotBorderLightCustom) m_TabItemHotBorderLight = Color.FromArgb(0, 0, 128);
+                        if (!m_TabItemHotBorderDarkCustom) m_TabItemHotBorderDark = Color.FromArgb(0, 0, 128);
+                        if (!m_TabItemHotBackgroundCustom) m_TabItemHotBackground = Color.FromArgb(255, 249, 237);
+                        if (!m_TabItemHotBackground2Custom) m_TabItemHotBackground2 = Color.FromArgb(255, 240, 199);
+                        //m_TabItemHotBackgroundGradientAngle=90;
+                        if (!m_TabItemHotTextCustom) m_TabItemHotText = SystemColors.ControlText;
+
+                        // Tab Item Selected Section
+                        if (!m_TabItemSelectedBorderCustom) m_TabItemSelectedBorder = cs.BarDockedBorder;
+                        if (!m_TabItemSelectedBorderLightCustom) m_TabItemSelectedBorderLight = Color.White;
+                        if (!m_TabItemSelectedBorderDarkCustom) m_TabItemSelectedBorderDark = m_TabItemSelectedBorderLight;
+                        if (!m_TabItemSelectedBackgroundCustom) m_TabItemSelectedBackground = cs.BarBackground;
+                        if (!m_TabItemSelectedBackground2Custom) m_TabItemSelectedBackground2 = cs.BarBackground2;
+                        //m_TabItemSelectedBackgroundGradientAngle=90;
+                        if (!m_TabItemSelectedTextCustom) m_TabItemSelectedText = SystemColors.ControlText;
+
+                        break;
+                    }
+                case eWinXPColorScheme.Silver:
+                    {
+                        // Tab Control Section
+                        if (!m_TabBackgroundCustom) m_TabBackground = Color.FromArgb(243, 243, 247);
+                        if (!m_TabBackground2Custom) m_TabBackground2 = Color.FromArgb(226, 226, 235);
+                        //m_TabBackgroundGradientAngle=90;
+                        if (!m_TabBorderCustom) m_TabBorder = Color.Empty;
+
+                        // Tab Item Section
+                        if (!m_TabItemBorderCustom) m_TabItemBorder = Color.FromArgb(118, 116, 146);
+                        if (!m_TabItemBorderLightCustom) m_TabItemBorderLight = Color.White;
+                        if (!m_TabItemBorderDarkCustom) m_TabItemBorderDark = Color.FromArgb(186, 185, 206);
+                        if (!m_TabItemBackgroundCustom) m_TabItemBackground = Color.FromArgb(243, 243, 247);
+                        if (!m_TabItemBackground2Custom) m_TabItemBackground2 = Color.FromArgb(215, 215, 228);
+                        //m_TabItemBackgroundGradientAngle=90;
+                        if (!m_TabItemTextCustom) m_TabItemText = SystemColors.ControlText;
+
+                        // Tab Panel Section
+                        if (!m_TabPanelBackgroundCustom) m_TabPanelBackground = Color.FromArgb(215, 215, 228);
+                        if (!m_TabPanelBackground2Custom) m_TabPanelBackground2 = Color.White;
+                        //m_TabPanelBackgroundGradientAngle=90;
+                        if (!m_TabPanelBorderCustom) m_TabPanelBorder = Color.Empty;
+
+                        // Tab Item Hot Section
+                        if (!m_TabItemHotBorderCustom) m_TabItemHotBorder = Color.FromArgb(75, 75, 111);
+                        if (!m_TabItemHotBorderLightCustom) m_TabItemHotBorderLight = Color.FromArgb(75, 75, 111);
+                        if (!m_TabItemHotBorderDarkCustom) m_TabItemHotBorderDark = Color.FromArgb(75, 75, 111);
+                        if (!m_TabItemHotBackgroundCustom) m_TabItemHotBackground = Color.FromArgb(255, 249, 237);
+                        if (!m_TabItemHotBackground2Custom) m_TabItemHotBackground2 = Color.FromArgb(255, 240, 199);
+                        //m_TabItemHotBackgroundGradientAngle=90;
+                        if (!m_TabItemHotTextCustom) m_TabItemHotText = SystemColors.ControlText;
+
+                        // Tab Item Selected Section
+                        if (!m_TabItemSelectedBorderCustom) m_TabItemSelectedBorder = cs.BarDockedBorder;
+                        if (!m_TabItemSelectedBorderLightCustom) m_TabItemSelectedBorderLight = Color.White;
+                        if (!m_TabItemSelectedBorderDarkCustom) m_TabItemSelectedBorderDark = m_TabItemSelectedBorderLight;
+                        if (!m_TabItemSelectedBackgroundCustom) m_TabItemSelectedBackground = cs.BarBackground;
+                        if (!m_TabItemSelectedBackground2Custom) m_TabItemSelectedBackground2 = cs.BarBackground;
+                        //m_TabItemSelectedBackgroundGradientAngle=90;
+                        if (!m_TabItemSelectedTextCustom) m_TabItemSelectedText = SystemColors.ControlText;
+
+                        break;
+                    }
+                case eWinXPColorScheme.OliveGreen:
+                    {
+                        // Tab Control Section
+                        if (!m_TabBackgroundCustom) m_TabBackground = Color.FromArgb(242, 241, 228);
+                        if (!m_TabBackground2Custom) m_TabBackground2 = Color.FromArgb(230, 236, 209);
+                        //m_TabBackgroundGradientAngle=90;
+                        if (!m_TabBorderCustom) m_TabBorder = Color.Empty;
+
+                        // Tab Item Section
+                        if (!m_TabItemBorderCustom) m_TabItemBorder = Color.FromArgb(96, 119, 107);
+                        if (!m_TabItemBorderLightCustom) m_TabItemBorderLight = Color.White;
+                        if (!m_TabItemBorderDarkCustom) m_TabItemBorderDark = Color.FromArgb(176, 194, 140);
+                        if (!m_TabItemBackgroundCustom) m_TabItemBackground = Color.FromArgb(244, 247, 236);
+                        if (!m_TabItemBackground2Custom) m_TabItemBackground2 = Color.FromArgb(221, 229, 192);
+                        //m_TabItemBackgroundGradientAngle=90;
+                        if (!m_TabItemTextCustom) m_TabItemText = SystemColors.ControlText;
+
+                        // Tab Panel Section
+                        if (!m_TabPanelBackgroundCustom) m_TabPanelBackground = Color.FromArgb(221, 229, 192);
+                        if (!m_TabPanelBackground2Custom) m_TabPanelBackground2 = Color.White;
+                        //m_TabPanelBackgroundGradientAngle=90;
+                        if (!m_TabPanelBorderCustom) m_TabPanelBorder = Color.Empty;
+
+                        // Tab Item Hot Section
+                        if (!m_TabItemHotBorderCustom) m_TabItemHotBorder = Color.FromArgb(63, 93, 56);
+                        if (!m_TabItemHotBorderLightCustom) m_TabItemHotBorderLight = Color.FromArgb(63, 93, 56);
+                        if (!m_TabItemHotBorderDarkCustom) m_TabItemHotBorderDark = Color.FromArgb(63, 93, 56);
+                        if (!m_TabItemHotBackgroundCustom) m_TabItemHotBackground = Color.FromArgb(255, 249, 237);
+                        if (!m_TabItemHotBackground2Custom) m_TabItemHotBackground2 = Color.FromArgb(255, 240, 199);
+                        //m_TabItemHotBackgroundGradientAngle=90;
+                        if (!m_TabItemHotTextCustom) m_TabItemHotText = SystemColors.ControlText;
+
+                        // Tab Item Selected Section
+                        if (!m_TabItemSelectedBorderCustom) m_TabItemSelectedBorder = cs.BarDockedBorder;
+                        if (!m_TabItemSelectedBorderLightCustom) m_TabItemSelectedBorderLight = Color.White;
+                        if (!m_TabItemSelectedBorderDarkCustom) m_TabItemSelectedBorderDark = m_TabItemSelectedBorderLight;
+                        if (!m_TabItemSelectedBackgroundCustom) m_TabItemSelectedBackground = cs.BarBackground;
+                        if (!m_TabItemSelectedBackground2Custom) m_TabItemSelectedBackground2 = cs.BarBackground;
+                        //m_TabItemSelectedBackgroundGradientAngle=90;
+                        if (!m_TabItemSelectedTextCustom) m_TabItemSelectedText = SystemColors.ControlText;
+                        break;
+                    }
+                default:
+                    {
+
+                        // Tab Control Section
+                        if (!m_TabBackgroundCustom) m_TabBackground = cs.BarBackground;
+                        if (!m_TabBackground2Custom) m_TabBackground2 = cs.BarBackground2;
+                        //m_TabBackgroundGradientAngle=90;
+                        if (!m_TabBorderCustom) m_TabBorder = Color.Empty;
+
+                        // Tab Item Section
+                        if (!m_TabItemBorderCustom) m_TabItemBorder = SystemColors.ControlDark;
+                        if (!m_TabItemBorderLightCustom) m_TabItemBorderLight = Color.White;
+                        if (!m_TabItemBorderDarkCustom) m_TabItemBorderDark = SystemColors.ControlDarkDark;
+                        if (!m_TabItemBackgroundCustom) m_TabItemBackground = m_TabBackground2;
+                        if (!m_TabItemBackground2Custom) m_TabItemBackground2 = m_TabBackground;
+                        //m_TabItemBackgroundGradientAngle=90;
+                        if (!m_TabItemTextCustom) m_TabItemText = SystemColors.ControlText;
+
+                        // Tab Panel Section
+                        if (!m_TabPanelBackgroundCustom) m_TabPanelBackground = m_TabBackground2;
+                        if (!m_TabPanelBackground2Custom) m_TabPanelBackground2 = ControlPaint.LightLight(m_TabBackground2);
+                        //m_TabPanelBackgroundGradientAngle=90;
+                        if (!m_TabPanelBorderCustom) m_TabPanelBorder = Color.Empty;
+
+                        // Tab Item Hot Section
+                        if (!m_TabItemHotBorderCustom) m_TabItemHotBorder = cs.BarDockedBorder;
+                        if (!m_TabItemHotBorderLightCustom) m_TabItemHotBorderLight = cs.BarDockedBorder;
+                        if (!m_TabItemHotBorderDarkCustom) m_TabItemHotBorderDark = cs.BarDockedBorder;
+                        if (!m_TabItemHotBackgroundCustom) m_TabItemHotBackground = cs.ItemHotBackground;
+                        if (!m_TabItemHotBackground2Custom) m_TabItemHotBackground2 = cs.ItemHotBackground2;
+                        //m_TabItemHotBackgroundGradientAngle=90;
+                        if (!m_TabItemHotTextCustom) m_TabItemHotText = SystemColors.ControlText;
+
+                        // Tab Item Selected Section
+                        if (!m_TabItemSelectedBorderCustom) m_TabItemSelectedBorder = SystemColors.ControlDark;
+                        if (!m_TabItemSelectedBorderLightCustom) m_TabItemSelectedBorderLight = SystemColors.ControlLightLight;
+                        if (!m_TabItemSelectedBorderDarkCustom) m_TabItemSelectedBorderDark = m_TabItemSelectedBorderLight;
+                        if (!m_TabItemSelectedBackgroundCustom) m_TabItemSelectedBackground = cs.ItemPressedBackground2;
+                        if (!m_TabItemSelectedBackground2Custom) m_TabItemSelectedBackground2 = cs.ItemPressedBackground;
+                        //m_TabItemSelectedBackgroundGradientAngle=90;
+                        if (!m_TabItemSelectedTextCustom) m_TabItemSelectedText = SystemColors.ControlText;
+                        break;
+                    }
+            }
+
+
+            // Tab Panel Section
+            if (!m_TabPanelBackgroundCustom) m_TabPanelBackground = m_TabItemSelectedBackground2;
+            if (!m_TabPanelBackground2Custom) m_TabPanelBackground2 = m_TabItemSelectedBackground;
+            //m_TabPanelBackgroundGradientAngle=90;
+            if (!m_TabPanelBorderCustom) m_TabPanelBorder = m_TabItemSelectedBorder;
+        }
+
+        /// <summary>
+        /// Generates VS2005 style color scheme.
+        /// </summary>
+        private void GenerateVS2005ColorScheme(bool dockStyle)
+        {
+            eWinXPColorScheme xpc = BarFunctions.WinXPColorScheme;
+
+            ColorScheme cs = new ColorScheme(eDotNetBarStyle.VS2005);
+            switch (xpc)
+            {
+                case eWinXPColorScheme.Blue:
+                    {
+                        // Tab Control Section
+                        if (!m_TabBackgroundCustom) m_TabBackground = GetColor("F4F2E8");
+                        if (!m_TabBackground2Custom) m_TabBackground2 = Color.Empty;
+                        //m_TabBackgroundGradientAngle=90;
+                        if (!m_TabBorderCustom) m_TabBorder = GetColor("ACA899");
+
+                        // Tab Item Section
+                        if (!m_TabItemBorderCustom)
+                        {
+                            if (dockStyle)
+                                m_TabItemBorder = GetColor("ACA899");
+                            else
+                                m_TabItemBorder = Color.Empty; // GetColor("ACA899");
+                        }
+                        if (!m_TabItemBorderLightCustom) m_TabItemBorderLight = Color.Empty;
+                        if (!m_TabItemBorderDarkCustom) m_TabItemBorderDark = Color.Empty;
+                        if (!m_TabItemBackgroundCustom) m_TabItemBackground = GetColor("F4F2E8");
+                        if (!m_TabItemBackground2Custom) m_TabItemBackground2 = Color.Empty; // GetColor("FEFDFD");
+                        //m_TabItemBackgroundGradientAngle=90;
+                        if (!m_TabItemTextCustom) m_TabItemText = SystemColors.ControlText;
+
+                        // Tab Panel Section
+                        if (!m_TabPanelBackgroundCustom) m_TabPanelBackground = m_TabItemBackground;
+                        if (!m_TabPanelBackground2Custom) m_TabPanelBackground2 = Color.White;
+                        //m_TabPanelBackgroundGradientAngle=90;
+                        if (!m_TabPanelBorderCustom) m_TabPanelBorder = m_TabBorder;
+
+                        // Tab Item Hot Section
+                        if (!m_TabItemHotBorderCustom) m_TabItemHotBorder = Color.Empty;
+                        if (!m_TabItemHotBorderLightCustom) m_TabItemHotBorderLight = Color.Empty;
+                        if (!m_TabItemHotBorderDarkCustom) m_TabItemHotBorderDark = Color.Empty;
+                        if (!m_TabItemHotBackgroundCustom) m_TabItemHotBackground = Color.Empty;
+                        if (!m_TabItemHotBackground2Custom) m_TabItemHotBackground2 = Color.Empty;
+                        //m_TabItemHotBackgroundGradientAngle=90;
+                        if (!m_TabItemHotTextCustom) m_TabItemHotText = SystemColors.ControlText;
+
+                        // Tab Item Selected Section
+                        if (!m_TabItemSelectedBorderCustom) m_TabItemSelectedBorder = GetColor("ACA899");
+                        if (!m_TabItemSelectedBorderLightCustom) m_TabItemSelectedBorderLight = Color.Empty;
+                        if (!m_TabItemSelectedBorderDarkCustom) m_TabItemSelectedBorderDark = Color.Empty;
+                        if (!m_TabItemSelectedBackgroundCustom) m_TabItemSelectedBackground = Color.White;
+                        if (!m_TabItemSelectedBackground2Custom) m_TabItemSelectedBackground2 = Color.Empty;
+                        //m_TabItemSelectedBackgroundGradientAngle=90;
+                        if (!m_TabItemSelectedTextCustom) m_TabItemSelectedText = SystemColors.ControlText;
+
+                        break;
+                    }
+                case eWinXPColorScheme.Silver:
+                    {
+                        // Tab Control Section
+                        if (!m_TabBackgroundCustom) m_TabBackground = GetColor("E7E7EF");
+                        if (!m_TabBackground2Custom) m_TabBackground2 = Color.Empty;
+                        //m_TabBackgroundGradientAngle=90;
+                        if (!m_TabBorderCustom) m_TabBorder = GetColor("9D9DA1");
+
+                        // Tab Item Section
+                        if (!m_TabItemBorderCustom)
+                        {
+                            if (dockStyle)
+                                m_TabItemBorder = m_TabBorder;
+                            else
+                                m_TabItemBorder = Color.Empty; //m_TabBorder;
+                        }
+                        if (!m_TabItemBorderLightCustom) m_TabItemBorderLight = Color.Empty;
+                        if (!m_TabItemBorderDarkCustom) m_TabItemBorderDark = Color.Empty;
+                        if (!m_TabItemBackgroundCustom) m_TabItemBackground = GetColor("E7E7EF");
+                        if (!m_TabItemBackground2Custom) m_TabItemBackground2 = Color.Empty; //GetColor("FEFEFE");
+                        //m_TabItemBackgroundGradientAngle=90;
+                        if (!m_TabItemTextCustom) m_TabItemText = SystemColors.ControlText;
+
+                        // Tab Panel Section
+                        if (!m_TabPanelBackgroundCustom) m_TabPanelBackground = m_TabItemBackground;
+                        if (!m_TabPanelBackground2Custom) m_TabPanelBackground2 = Color.White;
+                        //m_TabPanelBackgroundGradientAngle=90;
+                        if (!m_TabPanelBorderCustom) m_TabPanelBorder = m_TabItemBorder;
+
+                        // Tab Item Hot Section
+                        if (!m_TabItemHotBorderCustom) m_TabItemHotBorder = Color.Empty;
+                        if (!m_TabItemHotBorderLightCustom) m_TabItemHotBorderLight = Color.Empty;
+                        if (!m_TabItemHotBorderDarkCustom) m_TabItemHotBorderDark = Color.Empty;
+                        if (!m_TabItemHotBackgroundCustom) m_TabItemHotBackground = Color.Empty;
+                        if (!m_TabItemHotBackground2Custom) m_TabItemHotBackground2 = Color.Empty;
+                        //m_TabItemHotBackgroundGradientAngle=90;
+                        if (!m_TabItemHotTextCustom) m_TabItemHotText = SystemColors.ControlText;
+
+                        // Tab Item Selected Section
+                        if (!m_TabItemSelectedBorderCustom) m_TabItemSelectedBorder = m_TabBorder;
+                        if (!m_TabItemSelectedBorderLightCustom) m_TabItemSelectedBorderLight = Color.Empty;
+                        if (!m_TabItemSelectedBorderDarkCustom) m_TabItemSelectedBorderDark = Color.Empty;
+                        if (!m_TabItemSelectedBackgroundCustom) m_TabItemSelectedBackground = Color.White;
+                        if (!m_TabItemSelectedBackground2Custom) m_TabItemSelectedBackground2 = Color.Empty;
+                        //m_TabItemSelectedBackgroundGradientAngle=90;
+                        if (!m_TabItemSelectedTextCustom) m_TabItemSelectedText = SystemColors.ControlText;
+
+                        break;
+                    }
+                case eWinXPColorScheme.OliveGreen:
+                    {
+                        // Tab Control Section
+                        if (!m_TabBackgroundCustom) m_TabBackground = GetColor("F4F2E9");
+                        if (!m_TabBackground2Custom) m_TabBackground2 = Color.Empty;
+                        //m_TabBackgroundGradientAngle=90;
+                        if (!m_TabBorderCustom) m_TabBorder = GetColor("ACA899");
+
+                        // Tab Item Section
+                        if (!m_TabItemBorderCustom)
+                        {
+                            if (dockStyle)
+                                m_TabItemBorder = m_TabBorder;
+                            else
+                                m_TabItemBorder = Color.Empty; //m_TabBorder;
+                        }
+                        if (!m_TabItemBorderLightCustom) m_TabItemBorderLight = Color.Empty;
+                        if (!m_TabItemBorderDarkCustom) m_TabItemBorderDark = Color.Empty;
+                        if (!m_TabItemBackgroundCustom) m_TabItemBackground = GetColor("F4F2E9");
+                        if (!m_TabItemBackground2Custom) m_TabItemBackground2 = Color.Empty; //GetColor("FEFDFD");
+                        //m_TabItemBackgroundGradientAngle=90;
+                        if (!m_TabItemTextCustom) m_TabItemText = SystemColors.ControlText;
+
+                        // Tab Panel Section
+                        if (!m_TabPanelBackgroundCustom) m_TabPanelBackground = m_TabItemBackground;
+                        if (!m_TabPanelBackground2Custom) m_TabPanelBackground2 = Color.White;
+                        //m_TabPanelBackgroundGradientAngle=90;
+                        if (!m_TabPanelBorderCustom) m_TabPanelBorder = m_TabBorder;
+
+                        // Tab Item Hot Section
+                        if (!m_TabItemHotBorderCustom) m_TabItemHotBorder = Color.Empty;
+                        if (!m_TabItemHotBorderLightCustom) m_TabItemHotBorderLight = Color.Empty;
+                        if (!m_TabItemHotBorderDarkCustom) m_TabItemHotBorderDark = Color.Empty;
+                        if (!m_TabItemHotBackgroundCustom) m_TabItemHotBackground = Color.Empty;
+                        if (!m_TabItemHotBackground2Custom) m_TabItemHotBackground2 = Color.Empty;
+                        //m_TabItemHotBackgroundGradientAngle=90;
+                        if (!m_TabItemHotTextCustom) m_TabItemHotText = SystemColors.ControlText;
+
+                        // Tab Item Selected Section
+                        if (!m_TabItemSelectedBorderCustom) m_TabItemSelectedBorder = GetColor("ACA899");
+                        if (!m_TabItemSelectedBorderLightCustom) m_TabItemSelectedBorderLight = Color.Empty;
+                        if (!m_TabItemSelectedBorderDarkCustom) m_TabItemSelectedBorderDark = Color.Empty;
+                        if (!m_TabItemSelectedBackgroundCustom) m_TabItemSelectedBackground = Color.White;
+                        if (!m_TabItemSelectedBackground2Custom) m_TabItemSelectedBackground2 = Color.Empty;
+                        //m_TabItemSelectedBackgroundGradientAngle=90;
+                        if (!m_TabItemSelectedTextCustom) m_TabItemSelectedText = SystemColors.ControlText;
+                        break;
+                    }
+                default:
+                    {
+
+                        // Tab Control Section
+                        if (!m_TabBackgroundCustom) m_TabBackground = cs.BarBackground;
+                        if (!m_TabBackground2Custom) m_TabBackground2 = Color.Empty;
+                        //m_TabBackgroundGradientAngle=90;
+                        if (!m_TabBorderCustom) m_TabBorder = cs.BarBackground2;
+
+                        // Tab Item Section
+                        if (!m_TabItemBorderCustom)
+                        {
+                            if (dockStyle)
+                                m_TabItemBorder = m_TabBorder;
+                            else
+                                m_TabItemBorder = Color.Empty; //m_TabBorder;
+                        }
+                        if (!m_TabItemBorderLightCustom) m_TabItemBorderLight = Color.Empty;
+                        if (!m_TabItemBorderDarkCustom) m_TabItemBorderDark = Color.Empty;
+                        if (!m_TabItemBackgroundCustom) m_TabItemBackground = m_TabBackground;
+                        if (!m_TabItemBackground2Custom) m_TabItemBackground2 = Color.Empty; // System.Windows.Forms.ControlPaint.Light(cs.BarBackground);
+                        //m_TabItemBackgroundGradientAngle=90;
+                        if (!m_TabItemTextCustom) m_TabItemText = SystemColors.ControlText;
+
+                        // Tab Panel Section
+                        if (!m_TabPanelBackgroundCustom) m_TabPanelBackground = m_TabItemBackground;
+                        if (!m_TabPanelBackground2Custom) m_TabPanelBackground2 = ControlPaint.LightLight(m_TabItemBackground);
+                        //m_TabPanelBackgroundGradientAngle=90;
+                        if (!m_TabPanelBorderCustom) m_TabPanelBorder = Color.Empty;
+
+                        // Tab Item Hot Section
+                        if (!m_TabItemHotBorderCustom) m_TabItemHotBorder = Color.Empty;
+                        if (!m_TabItemHotBorderLightCustom) m_TabItemHotBorderLight = Color.Empty;
+                        if (!m_TabItemHotBorderDarkCustom) m_TabItemHotBorderDark = Color.Empty;
+                        if (!m_TabItemHotBackgroundCustom) m_TabItemHotBackground = Color.Empty;
+                        if (!m_TabItemHotBackground2Custom) m_TabItemHotBackground2 = Color.Empty;
+                        //m_TabItemHotBackgroundGradientAngle=90;
+                        if (!m_TabItemHotTextCustom) m_TabItemHotText = Color.Empty;
+
+                        // Tab Item Selected Section
+                        if (!m_TabItemSelectedBorderCustom) m_TabItemSelectedBorder = cs.BarFloatingBorder;
+                        if (!m_TabItemSelectedBorderLightCustom) m_TabItemSelectedBorderLight = Color.Empty;
+                        if (!m_TabItemSelectedBorderDarkCustom) m_TabItemSelectedBorderDark = Color.Empty;
+                        if (!m_TabItemSelectedBackgroundCustom) m_TabItemSelectedBackground = System.Windows.Forms.ControlPaint.LightLight(cs.BarBackground);
+                        if (!m_TabItemSelectedBackground2Custom) m_TabItemSelectedBackground2 = Color.Empty; // System.Windows.Forms.ControlPaint.Light(m_TabItemBackground2);
+                        //m_TabItemSelectedBackgroundGradientAngle=90;
+                        if (!m_TabItemSelectedTextCustom) m_TabItemSelectedText = SystemColors.ControlText;
+                        break;
+                    }
+            }
+
+            if (!m_TabItemSeparatorCustom) m_TabItemSeparator = m_TabItemSelectedBorder;
+            if (!m_TabItemSeparatorShadeCustom) m_TabItemSeparatorShade = m_TabItemSelectedBorderLight;
+
+            // Tab Panel Section
+            //			if(!m_TabPanelBackgroundCustom) m_TabPanelBackground=m_TabItemSelectedBackground2;
+            //			if(!m_TabPanelBackground2Custom) m_TabPanelBackground2=m_TabItemSelectedBackground;
+            //			m_TabPanelBackgroundGradientAngle=90;
+            //			if(!m_TabPanelBorderCustom) m_TabPanelBorder=m_TabItemSelectedBorder;
+        }
+
+        /// <summary>
+        /// Generates OneNote style color scheme.
+        /// </summary>
+        private void GenerateRoundHeaderColorScheme()
+        {
+            eWinXPColorScheme xpc = BarFunctions.WinXPColorScheme;
+
+            if (!m_TabItemSeparatorCustom) m_TabItemSeparator = Color.Empty;
+            if (!m_TabItemSeparatorShadeCustom) m_TabItemSeparatorShade = Color.Empty;
+
+            ColorScheme cs = new ColorScheme(eDotNetBarStyle.VS2005);
+            switch (xpc)
+            {
+                case eWinXPColorScheme.Blue:
+                    {
+                        // Tab Control Section
+                        if (!m_TabBackgroundCustom) m_TabBackground = GetColor("F9F8F4");
+                        if (!m_TabBackground2Custom) m_TabBackground2 = Color.Empty;
+                        //m_TabBackgroundGradientAngle=90;
+                        if (!m_TabBorderCustom) m_TabBorder = SystemColors.ControlDarkDark;//GetColor("ACA899");
+
+                        // Tab Item Section
+                        if (!m_TabItemBorderCustom) m_TabItemBorder = SystemColors.ControlDarkDark;// GetColor("ACA899");
+                        if (!m_TabItemBorderLightCustom) m_TabItemBorderLight = Color.Empty;
+                        if (!m_TabItemBorderDarkCustom) m_TabItemBorderDark = Color.Empty;
+                        if (!m_TabItemBackgroundCustom) m_TabItemBackground = GetColor("ECE9D7");
+                        if (!m_TabItemBackground2Custom) m_TabItemBackground2 = GetColor("FEFDFD");
+                        //m_TabItemBackgroundGradientAngle=90;
+                        if (!m_TabItemTextCustom) m_TabItemText = SystemColors.ControlText;
+
+                        // Tab Panel Section
+                        if (!m_TabPanelBackgroundCustom) m_TabPanelBackground = Color.White;
+                        if (!m_TabPanelBackground2Custom) m_TabPanelBackground2 = m_TabItemBackground;
+                        //m_TabPanelBackgroundGradientAngle=90;
+                        if (!m_TabPanelBorderCustom) m_TabPanelBorder = m_TabBorder;
+
+                        // Tab Item Hot Section
+                        if (!m_TabItemHotBorderCustom) m_TabItemHotBorder = Color.Empty;
+                        if (!m_TabItemHotBorderLightCustom) m_TabItemHotBorderLight = Color.Empty;
+                        if (!m_TabItemHotBorderDarkCustom) m_TabItemHotBorderDark = Color.Empty;
+                        if (!m_TabItemHotBackgroundCustom) m_TabItemHotBackground = Color.Empty;
+                        if (!m_TabItemHotBackground2Custom) m_TabItemHotBackground2 = Color.Empty;
+                        //m_TabItemHotBackgroundGradientAngle=90;
+                        if (!m_TabItemHotTextCustom) m_TabItemHotText = SystemColors.ControlText;
+
+                        // Tab Item Selected Section
+                        if (!m_TabItemSelectedBorderCustom) m_TabItemSelectedBorder = m_TabItemBorder;
+                        if (!m_TabItemSelectedBorderLightCustom) m_TabItemSelectedBorderLight = Color.Empty;
+                        if (!m_TabItemSelectedBorderDarkCustom) m_TabItemSelectedBorderDark = Color.Empty;
+                        if (!m_TabItemSelectedBackgroundCustom) m_TabItemSelectedBackground = GetColor("0266FB"); //SystemColors.Highlight;
+                        if (!m_TabItemSelectedBackground2Custom) m_TabItemSelectedBackground2 = Color.FromArgb(45, m_TabItemSelectedBackground); //ControlPaint.LightLight(SystemColors.Highlight);
+                        //m_TabItemSelectedBackgroundGradientAngle=90;
+                        if (!m_TabItemSelectedTextCustom) m_TabItemSelectedText = SystemColors.ControlText;
+
+                        break;
+                    }
+                case eWinXPColorScheme.Silver:
+                    {
+                        // Tab Control Section
+                        if (!m_TabBackgroundCustom) m_TabBackground = SystemColors.Control;//GetColor("E7E7EF");
+                        if (!m_TabBackground2Custom) m_TabBackground2 = Color.Empty;
+                        //m_TabBackgroundGradientAngle=90;
+                        if (!m_TabBorderCustom) m_TabBorder = SystemColors.ControlDarkDark;//GetColor("9D9DA1");
+
+                        // Tab Item Section
+                        if (!m_TabItemBorderCustom) m_TabItemBorder = SystemColors.ControlDarkDark; //m_TabBorder;
+                        if (!m_TabItemBorderLightCustom) m_TabItemBorderLight = Color.Empty;
+                        if (!m_TabItemBorderDarkCustom) m_TabItemBorderDark = Color.Empty;
+                        if (!m_TabItemBackgroundCustom) m_TabItemBackground = GetColor("F2F2F7");
+                        if (!m_TabItemBackground2Custom) m_TabItemBackground2 = GetColor("FEFEFE");
+                        //m_TabItemBackgroundGradientAngle=90;
+                        if (!m_TabItemTextCustom) m_TabItemText = SystemColors.ControlText;
+
+                        // Tab Panel Section
+                        if (!m_TabPanelBackgroundCustom) m_TabPanelBackground = Color.White;
+                        if (!m_TabPanelBackground2Custom) m_TabPanelBackground2 = m_TabItemBackground;
+                        //m_TabPanelBackgroundGradientAngle=90;
+                        if (!m_TabPanelBorderCustom) m_TabPanelBorder = m_TabItemBorder;
+
+                        // Tab Item Hot Section
+                        if (!m_TabItemHotBorderCustom) m_TabItemHotBorder = Color.Empty;
+                        if (!m_TabItemHotBorderLightCustom) m_TabItemHotBorderLight = Color.Empty;
+                        if (!m_TabItemHotBorderDarkCustom) m_TabItemHotBorderDark = Color.Empty;
+                        if (!m_TabItemHotBackgroundCustom) m_TabItemHotBackground = Color.Empty;
+                        if (!m_TabItemHotBackground2Custom) m_TabItemHotBackground2 = Color.Empty;
+                        //m_TabItemHotBackgroundGradientAngle=90;
+                        if (!m_TabItemHotTextCustom) m_TabItemHotText = SystemColors.ControlText;
+
+                        // Tab Item Selected Section
+                        if (!m_TabItemSelectedBorderCustom) m_TabItemSelectedBorder = m_TabItemBorder;
+                        if (!m_TabItemSelectedBorderLightCustom) m_TabItemSelectedBorderLight = Color.Empty;
+                        if (!m_TabItemSelectedBorderDarkCustom) m_TabItemSelectedBorderDark = Color.Empty;
+                        if (!m_TabItemSelectedBackgroundCustom) m_TabItemSelectedBackground = SystemColors.Highlight;
+                        if (!m_TabItemSelectedBackground2Custom) m_TabItemSelectedBackground2 = Color.FromArgb(45, m_TabItemSelectedBackground);
+                        //m_TabItemSelectedBackgroundGradientAngle=90;
+                        if (!m_TabItemSelectedTextCustom) m_TabItemSelectedText = SystemColors.ControlText;
+
+                        break;
+                    }
+                case eWinXPColorScheme.OliveGreen:
+                    {
+                        // Tab Control Section
+                        if (!m_TabBackgroundCustom) m_TabBackground = SystemColors.Control;
+                        if (!m_TabBackground2Custom) m_TabBackground2 = Color.Empty;
+                        //m_TabBackgroundGradientAngle=90;
+                        if (!m_TabBorderCustom) m_TabBorder = SystemColors.ControlDarkDark;//GetColor("ACA899");
+
+                        // Tab Item Section
+                        if (!m_TabItemBorderCustom) m_TabItemBorder = SystemColors.ControlDarkDark;
+                        if (!m_TabItemBorderLightCustom) m_TabItemBorderLight = Color.Empty;
+                        if (!m_TabItemBorderDarkCustom) m_TabItemBorderDark = Color.Empty;
+                        if (!m_TabItemBackgroundCustom) m_TabItemBackground = GetColor("ECE9D7");
+                        if (!m_TabItemBackground2Custom) m_TabItemBackground2 = GetColor("FEFDFD");
+                        //m_TabItemBackgroundGradientAngle=90;
+                        if (!m_TabItemTextCustom) m_TabItemText = SystemColors.ControlText;
+
+                        // Tab Panel Section
+                        if (!m_TabPanelBackgroundCustom) m_TabPanelBackground = Color.White;
+                        if (!m_TabPanelBackground2Custom) m_TabPanelBackground2 = m_TabItemBackground;
+                        //m_TabPanelBackgroundGradientAngle=90;
+                        if (!m_TabPanelBorderCustom) m_TabPanelBorder = m_TabBorder;
+
+                        // Tab Item Hot Section
+                        if (!m_TabItemHotBorderCustom) m_TabItemHotBorder = Color.Empty;
+                        if (!m_TabItemHotBorderLightCustom) m_TabItemHotBorderLight = Color.Empty;
+                        if (!m_TabItemHotBorderDarkCustom) m_TabItemHotBorderDark = Color.Empty;
+                        if (!m_TabItemHotBackgroundCustom) m_TabItemHotBackground = Color.Empty;
+                        if (!m_TabItemHotBackground2Custom) m_TabItemHotBackground2 = Color.Empty;
+                        //m_TabItemHotBackgroundGradientAngle=90;
+                        if (!m_TabItemHotTextCustom) m_TabItemHotText = SystemColors.ControlText;
+
+                        // Tab Item Selected Section
+                        if (!m_TabItemSelectedBorderCustom) m_TabItemSelectedBorder = GetColor("ACA899");
+                        if (!m_TabItemSelectedBorderLightCustom) m_TabItemSelectedBorderLight = Color.Empty;
+                        if (!m_TabItemSelectedBorderDarkCustom) m_TabItemSelectedBorderDark = Color.Empty;
+                        if (!m_TabItemSelectedBackgroundCustom) m_TabItemSelectedBackground = SystemColors.Highlight;
+                        if (!m_TabItemSelectedBackground2Custom) m_TabItemSelectedBackground2 = Color.FromArgb(45, m_TabItemSelectedBackground); //ControlPaint.LightLight(SystemColors.Highlight);
+                        //m_TabItemSelectedBackgroundGradientAngle=90;
+                        if (!m_TabItemSelectedTextCustom) m_TabItemSelectedText = SystemColors.ControlText;
+                        break;
+                    }
+                default:
+                    {
+
+                        // Tab Control Section
+                        if (!m_TabBackgroundCustom) m_TabBackground = SystemColors.Control;
+                        if (!m_TabBackground2Custom) m_TabBackground2 = Color.Empty;
+                        //m_TabBackgroundGradientAngle=90;
+                        if (!m_TabBorderCustom) m_TabBorder = SystemColors.ControlDarkDark;//cs.BarBackground2;
+
+                        // Tab Item Section
+                        if (!m_TabItemBorderCustom) m_TabItemBorder = SystemColors.ControlDarkDark;
+                        if (!m_TabItemBorderLightCustom) m_TabItemBorderLight = Color.Empty;
+                        if (!m_TabItemBorderDarkCustom) m_TabItemBorderDark = Color.Empty;
+                        if (!m_TabItemBackgroundCustom) m_TabItemBackground = System.Windows.Forms.ControlPaint.Light(cs.BarBackground2);
+                        if (!m_TabItemBackground2Custom) m_TabItemBackground2 = System.Windows.Forms.ControlPaint.Light(cs.BarBackground);
+                        //m_TabItemBackgroundGradientAngle=90;
+                        if (!m_TabItemTextCustom) m_TabItemText = SystemColors.ControlText;
+
+                        // Tab Panel Section
+                        if (!m_TabPanelBackgroundCustom) m_TabPanelBackground = ControlPaint.LightLight(m_TabItemBackground);
+                        if (!m_TabPanelBackground2Custom) m_TabPanelBackground2 = m_TabItemBackground;
+                        //m_TabPanelBackgroundGradientAngle=90;
+                        if (!m_TabPanelBorderCustom) m_TabPanelBorder = m_TabBorder;
+
+                        // Tab Item Hot Section
+                        if (!m_TabItemHotBorderCustom) m_TabItemHotBorder = Color.Empty;
+                        if (!m_TabItemHotBorderLightCustom) m_TabItemHotBorderLight = Color.Empty;
+                        if (!m_TabItemHotBorderDarkCustom) m_TabItemHotBorderDark = Color.Empty;
+                        if (!m_TabItemHotBackgroundCustom) m_TabItemHotBackground = Color.Empty;
+                        if (!m_TabItemHotBackground2Custom) m_TabItemHotBackground2 = Color.Empty;
+                        //m_TabItemHotBackgroundGradientAngle=90;
+                        if (!m_TabItemHotTextCustom) m_TabItemHotText = Color.Empty;
+
+                        // Tab Item Selected Section
+                        if (!m_TabItemSelectedBorderCustom) m_TabItemSelectedBorder = m_TabItemBorder;
+                        if (!m_TabItemSelectedBorderLightCustom) m_TabItemSelectedBorderLight = Color.Empty;
+                        if (!m_TabItemSelectedBorderDarkCustom) m_TabItemSelectedBorderDark = Color.Empty;
+                        if (!m_TabItemSelectedBackgroundCustom) m_TabItemSelectedBackground = SystemColors.Highlight;
+                        if (!m_TabItemSelectedBackground2Custom) m_TabItemSelectedBackground2 = Color.FromArgb(45, m_TabItemSelectedBackground); //ControlPaint.LightLight(SystemColors.Highlight);
+                        //m_TabItemSelectedBackgroundGradientAngle=90;
+                        if (!m_TabItemSelectedTextCustom) m_TabItemSelectedText = SystemColors.ControlText;
+                        break;
+                    }
+            }
+        }
+
+        private Color GetColor(string rgbHex)
+        {
+            if (rgbHex == "" || rgbHex == null)
+                return Color.Empty;
+            return Color.FromArgb(Convert.ToInt32(rgbHex.Substring(0, 2), 16),
+                Convert.ToInt32(rgbHex.Substring(2, 2), 16),
+                Convert.ToInt32(rgbHex.Substring(4, 2), 16));
+        }
+
+        /// <summary>
+        /// Generates OneNote style color scheme.
+        /// </summary>
+        private void GenerateOffice2007DocumentColorScheme()
+        {
+            Office2007TabColorTable ct = null;
+            if (GlobalManager.Renderer is Office2007Renderer)
+                ct = ((Office2007Renderer)GlobalManager.Renderer).ColorTable.TabControl;
+            if (ct == null)
+            {
+                GenerateOneNoteColorScheme();
+                return;
+            }
+
+
+            _TabBackgroundImage = ct.TabBackgroundImage;
+
+            if (!m_TabItemSeparatorCustom) m_TabItemSeparator = Color.Empty;
+            if (!m_TabItemSeparatorShadeCustom) m_TabItemSeparatorShade = Color.Empty;
+
+            // Tab Control Section
+            if (!m_TabBackgroundCustom) m_TabBackground = ct.TabBackground.Start;
+            if (!m_TabBackground2Custom) m_TabBackground2 = ct.TabBackground.End;
+
+            if (!m_TabBorderCustom) m_TabBorder = Color.Empty;
+
+            // Tab Item Section
+            if (!m_TabItemBorderCustom) m_TabItemBorder = ct.Default.OuterBorder;
+            if (!m_TabItemBorderLightCustom) m_TabItemBorderLight = ct.Default.InnerBorder;
+            if (!m_TabItemBorderDarkCustom) m_TabItemBorderDark = Color.Empty;
+            if (!m_TabItemBackgroundCustom) m_TabItemBackground = ct.Default.TopBackground.Start;
+            if (!m_TabItemBackground2Custom) m_TabItemBackground2 = ct.Default.BottomBackground.End;
+
+            if (!m_TabItemBackgroundCustom)
+            {
+                m_TabItemBackgroundColorBlend.Clear();
+                m_TabItemBackgroundColorBlend.Add(new BackgroundColorBlend(ct.Default.TopBackground.Start, 0));
+                m_TabItemBackgroundColorBlend.Add(new BackgroundColorBlend(ct.Default.TopBackground.End, .45f));
+                m_TabItemBackgroundColorBlend.Add(new BackgroundColorBlend(ct.Default.BottomBackground.Start, .45f));
+                m_TabItemBackgroundColorBlend.Add(new BackgroundColorBlend(ct.Default.BottomBackground.End, 1));
+            }
+            if (!m_TabItemTextCustom) m_TabItemText = ct.Default.Text; ;
+
+            // Tab Panel Section
+            if (!m_TabPanelBackgroundCustom) m_TabPanelBackground = ct.TabPanelBackground.Start;
+            if (!m_TabPanelBackground2Custom) m_TabPanelBackground2 = ct.TabPanelBackground.End;
+            if (!m_TabPanelBorderCustom) m_TabPanelBorder = ct.TabPanelBorder;
+
+            // Tab Item Hot Section
+            if (!m_TabItemHotBorderCustom) m_TabItemHotBorder = ct.MouseOver.OuterBorder;
+            if (!m_TabItemHotBorderLightCustom) m_TabItemHotBorderLight = ct.MouseOver.InnerBorder;
+            if (!m_TabItemHotBorderDarkCustom) m_TabItemHotBorderDark = Color.Empty;
+            if (!m_TabItemHotBackgroundCustom) m_TabItemHotBackground = ct.MouseOver.TopBackground.Start;
+            if (!m_TabItemHotBackground2Custom) m_TabItemHotBackground2 = ct.MouseOver.BottomBackground.End;
+
+            if (!m_TabItemHotBackgroundCustom)
+            {
+                m_TabItemHotBackgroundColorBlend.Clear();
+                m_TabItemHotBackgroundColorBlend.Add(new BackgroundColorBlend(ct.MouseOver.TopBackground.Start, 0));
+                m_TabItemHotBackgroundColorBlend.Add(new BackgroundColorBlend(ct.MouseOver.TopBackground.End, .45f));
+                m_TabItemHotBackgroundColorBlend.Add(new BackgroundColorBlend(ct.MouseOver.BottomBackground.Start, .45f));
+                m_TabItemHotBackgroundColorBlend.Add(new BackgroundColorBlend(ct.MouseOver.BottomBackground.End, 1));
+            }
+
+            if (!m_TabItemHotTextCustom) m_TabItemHotText = ct.MouseOver.Text;
+
+            // Tab Item Selected Section
+            if (!m_TabItemSelectedBorderCustom) m_TabItemSelectedBorder = ct.Selected.OuterBorder;
+            if (!m_TabItemSelectedBorderLightCustom) m_TabItemSelectedBorderLight = ct.Selected.InnerBorder;
+            if (!m_TabItemSelectedBorderDarkCustom) m_TabItemSelectedBorderDark = Color.Empty;
+            if (!m_TabItemSelectedBackgroundCustom) m_TabItemSelectedBackground = ct.Selected.TopBackground.Start;
+            if (!m_TabItemSelectedBackground2Custom) m_TabItemSelectedBackground2 = ct.Selected.BottomBackground.End;
+
+            if (!m_TabItemSelectedBackgroundCustom)
+            {
+                m_TabItemSelectedBackgroundColorBlend.Clear();
+                m_TabItemSelectedBackgroundColorBlend.Add(new BackgroundColorBlend(ct.Selected.TopBackground.Start, 0));
+                m_TabItemSelectedBackgroundColorBlend.Add(new BackgroundColorBlend(ct.Selected.TopBackground.End, .45f));
+                m_TabItemSelectedBackgroundColorBlend.Add(new BackgroundColorBlend(ct.Selected.BottomBackground.Start, .45f));
+                m_TabItemSelectedBackgroundColorBlend.Add(new BackgroundColorBlend(ct.Selected.BottomBackground.End, 1));
+            }
+
+            if (!m_TabItemSelectedTextCustom) m_TabItemSelectedText = ct.Selected.Text;
+
+            // Tab Panel Section
+            if (!m_TabPanelBackgroundCustom) m_TabPanelBackground = ct.TabPanelBackground.Start;
+            if (!m_TabPanelBackground2Custom) m_TabPanelBackground2 = ct.TabPanelBackground.End;
+            if (!m_TabPanelBorderCustom) m_TabPanelBorder = ct.TabPanelBorder;
+        }
+
+        private eTabContext _TabContext = eTabContext.Default;
+        internal eTabContext TabContext
+        {
+            get { return _TabContext; }
+            set { _TabContext = value; }
+        }
+        #endregion
+
+        #region Serialization
+        //		/// <summary>
+        //		/// Deserializes the color scheme object from XML element. The element passed should be the same xml element that was passed into the serialize method.
+        //		/// </summary>
+        //		/// <param name="xmlElem">XML Element to deserialize from.</param>
+        //		public void Deserialize(System.Xml.XmlElement xmlElem)
+        //		{
+        //		}
+        //
+        //		/// <summary>
+        //		/// Serializes the color scheme object to the XML element. The color scheme object will be serialized directly onto the element that is passed in by creating new attributes and possibly child nodes.
+        //		/// </summary>
+        //		/// <param name="xmlElem">XML Element to serialize to.</param>
+        //		public void Serialize(System.Xml.XmlElement xmlElem)
+        //		{
+        //
+        //		}
+        #endregion
+
+        #region Properties
+        /// <summary>
+        /// Gets or sets the style that color scheme represents.
+        /// </summary>
+        [DefaultValue(eTabStripStyle.OneNote), Browsable(false), Category("Appearance"), Description("Indicates style that color scheme represents."), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public eTabStripStyle Style
+        {
+            get { return m_Style; }
+            set
+            {
+                if (m_Style != value)
+                {
+                    m_Style = value;
+                    this.Refresh();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether themed color scheme is generated.
+        /// </summary>
+        internal bool Themed
+        {
+            get { return m_Themed; }
+            set
+            {
+                m_Themed = value;
+                this.Refresh();
+            }
+        }
+
+        protected virtual void InvokeColorChanged()
+        {
+            if (ColorChanged != null)
+                ColorChanged(this, new EventArgs());
+        }
+
+        /// <summary>
+        /// Resets changed flag for all color properties. When changed flag is set for a color property color is not automatically generated for that property.
+        /// Reseting the flag will ensure that all colors are automatically generated.
+        /// </summary>
+        public void ResetChangedFlag()
+        {
+            // Tab Flags
+            m_TabBackgroundCustom = false;
+            m_TabBackground2Custom = false;
+            m_TabBorderCustom = false;
+            m_TabItemBackgroundCustom = false;
+            m_TabItemBackground2Custom = false;
+            m_TabItemBorderCustom = false;
+            m_TabItemBorderDarkCustom = false;
+            m_TabItemBorderLightCustom = false;
+            m_TabItemTextCustom = false;
+            m_TabItemHotBackgroundCustom = false;
+            m_TabItemHotBackground2Custom = false;
+            m_TabItemHotBorderCustom = false;
+            m_TabItemHotBorderDarkCustom = false;
+            m_TabItemHotBorderLightCustom = false;
+            m_TabItemHotTextCustom = false;
+            m_TabItemSelectedBackgroundCustom = false;
+            m_TabItemSelectedBackground2Custom = false;
+            m_TabItemSelectedBorderCustom = false;
+            m_TabItemSelectedBorderDarkCustom = false;
+            m_TabItemSelectedBorderLightCustom = false;
+            m_TabItemSelectedTextCustom = false;
+            m_TabItemSeparatorCustom = false;
+            m_TabItemSeparatorShadeCustom = false;
+        }
+        /// <summary>
+        /// Indicates whether any of the colors has changed.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false)]
+        public bool SchemeChanged
+        {
+            get
+            {
+                return m_TabBackground2Custom ||
+                    m_TabBackgroundCustom ||
+                    m_TabBorderCustom ||
+                    m_TabItemBackground2Custom ||
+                    m_TabItemBackgroundCustom ||
+                    m_TabItemBorderCustom ||
+                    m_TabItemBorderDarkCustom ||
+                    m_TabItemBorderLightCustom ||
+                    m_TabItemTextCustom ||
+                    m_TabItemHotBackground2Custom ||
+                    m_TabItemHotBackgroundCustom ||
+                    m_TabItemHotBorderCustom ||
+                    m_TabItemHotBorderDarkCustom ||
+                    m_TabItemHotBorderLightCustom ||
+                    m_TabItemHotTextCustom ||
+                    m_TabItemSelectedBackground2Custom ||
+                    m_TabItemSelectedBackgroundCustom ||
+                    m_TabItemSelectedBorderCustom ||
+                    m_TabItemSelectedBorderDarkCustom ||
+                    m_TabItemSelectedBorderLightCustom ||
+                    m_TabItemSelectedTextCustom ||
+                    m_TabItemSeparatorCustom ||
+                    m_TabItemSeparatorShadeCustom ||
+                    m_OtherCustom;
+            }
+        }
+        private Image _TabBackgroundImage = null;
+        /// <summary>
+        /// Gets or sets the tab-strip background image.
+        /// </summary>
+        [DefaultValue(null), Category("Tab Control Colors"), Description("Indicates tab-strip background image.")]
+        public Image TabBackgroundImage
+        {
+            get { return _TabBackgroundImage; }
+            set { _TabBackgroundImage = value; }
+        }
+
+        /// <summary>
+        /// Specifies the background color of the tab control.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), System.ComponentModel.Category("Tab Control Colors"), System.ComponentModel.Description("Specifies the background color of the tab control.")]
+        public Color TabBackground
+        {
+            get { return m_TabBackground; }
+            set
+            {
+                if (m_TabBackground != value)
+                {
+                    m_TabBackground = value;
+                    m_TabBackgroundCustom = true;
+                    InvokeColorChanged();
+                }
+            }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeTabBackground()
+        {
+            return m_TabBackgroundCustom;
+        }
+        /// <summary>
+        /// Specifies the target gradient background color of the tab control.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), System.ComponentModel.Category("Tab Control Colors"), System.ComponentModel.Description("Specifies the target gradient background color of the tab control.")]
+        public Color TabBackground2
+        {
+            get { return m_TabBackground2; }
+            set
+            {
+                if (m_TabBackground2 != value)
+                {
+                    m_TabBackground2 = value;
+                    m_TabBackground2Custom = true;
+                    InvokeColorChanged();
+                }
+            }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeTabBackground2()
+        {
+            return m_TabBackground2Custom;
+        }
+        /// <summary>
+        /// Specifies the gradient angle.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), System.ComponentModel.Category("Tab Control Colors"), System.ComponentModel.Description("Specifies the gradient angle."), DefaultValue(90)]
+        public int TabBackgroundGradientAngle
+        {
+            get { return m_TabBackgroundGradientAngle; }
+            set { m_TabBackgroundGradientAngle = value; InvokeColorChanged(); m_OtherCustom = true; }
+        }
+
+        /// <summary>
+        /// Specifies the border color of the tab control.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), System.ComponentModel.Category("Tab Control Colors"), System.ComponentModel.Description("Specifies the border color of the tab control.")]
+        public Color TabBorder
+        {
+            get { return m_TabBorder; }
+            set
+            {
+                if (m_TabBorder != value)
+                {
+                    m_TabBorder = value;
+                    m_TabBorderCustom = true;
+                    InvokeColorChanged();
+                }
+            }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeTabBorder()
+        {
+            return m_TabBorderCustom;
+        }
+
+        /// <summary>
+        /// Specifies the background color of the tab panel.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), System.ComponentModel.Category("Tab Control Colors"), System.ComponentModel.Description("Specifies the background color of the tab panel.")]
+        public Color TabPanelBackground
+        {
+            get { return m_TabPanelBackground; }
+            set
+            {
+                if (m_TabPanelBackground != value)
+                {
+                    m_TabPanelBackground = value;
+                    m_TabPanelBackgroundCustom = true;
+                    InvokeColorChanged();
+                }
+            }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeTabPanelBackground()
+        {
+            return m_TabPanelBackgroundCustom;
+        }
+        /// <summary>
+        /// Specifies the target gradient background color of the tab panel.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), System.ComponentModel.Category("Tab Control Colors"), System.ComponentModel.Description("Specifies the target gradient background color of the tab panel.")]
+        public Color TabPanelBackground2
+        {
+            get { return m_TabPanelBackground2; }
+            set
+            {
+                if (m_TabPanelBackground2 != value)
+                {
+                    m_TabPanelBackground2 = value;
+                    m_TabPanelBackground2Custom = true;
+                    InvokeColorChanged();
+                }
+            }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeTabPanelBackground2()
+        {
+            return m_TabPanelBackground2Custom;
+        }
+        /// <summary>
+        /// Specifies the gradient angle.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), System.ComponentModel.Category("Tab Control Colors"), System.ComponentModel.Description("Specifies the gradient angle."), DefaultValue(90)]
+        public int TabPanelBackgroundGradientAngle
+        {
+            get { return m_TabPanelBackgroundGradientAngle; }
+            set { m_TabPanelBackgroundGradientAngle = value; InvokeColorChanged(); m_OtherCustom = true; }
+        }
+
+        /// <summary>
+        /// Specifies the border color of the tab panel.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), System.ComponentModel.Category("Tab Control Colors"), System.ComponentModel.Description("Specifies the border color of the tab panel.")]
+        public Color TabPanelBorder
+        {
+            get { return m_TabPanelBorder; }
+            set
+            {
+                if (m_TabPanelBorder != value)
+                {
+                    m_TabPanelBorder = value;
+                    m_TabPanelBorderCustom = true;
+                    InvokeColorChanged();
+                }
+            }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeTabPanelBorder()
+        {
+            return m_TabPanelBorderCustom;
+        }
+
+        /// <summary>
+        /// Specifies the border color of the tab item.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), System.ComponentModel.Category("Tab Control Colors"), System.ComponentModel.Description("Specifies the border color of the tab item.")]
+        public Color TabItemBorder
+        {
+            get { return m_TabItemBorder; }
+            set
+            {
+                if (m_TabItemBorder != value)
+                {
+                    m_TabItemBorder = value;
+                    m_TabItemBorderCustom = true;
+                    InvokeColorChanged();
+                }
+            }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeTabItemBorder()
+        {
+            return m_TabItemBorderCustom;
+        }
+        /// <summary>
+        /// Specifies the light border color of the tab item.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), System.ComponentModel.Category("Tab Control Colors"), System.ComponentModel.Description("Specifies the light border color of the tab item.")]
+        public Color TabItemBorderLight
+        {
+            get { return m_TabItemBorderLight; }
+            set
+            {
+                if (m_TabItemBorderLight != value)
+                {
+                    m_TabItemBorderLight = value;
+                    m_TabItemBorderLightCustom = true;
+                    InvokeColorChanged();
+                }
+            }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeTabItemBorderLight()
+        {
+            return m_TabItemBorderLightCustom;
+        }
+        /// <summary>
+        /// Specifies the dark border color of the tab item.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), System.ComponentModel.Category("Tab Control Colors"), System.ComponentModel.Description("Specifies the dark border color of the tab item.")]
+        public Color TabItemBorderDark
+        {
+            get { return m_TabItemBorderDark; }
+            set
+            {
+                if (m_TabItemBorderDark != value)
+                {
+                    m_TabItemBorderDark = value;
+                    m_TabItemBorderDarkCustom = true;
+                    InvokeColorChanged();
+                }
+            }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeTabItemBorderDark()
+        {
+            return m_TabItemBorderDarkCustom;
+        }
+        /// <summary>
+        /// Specifies the background color of the tab item.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), System.ComponentModel.Category("Tab Control Colors"), System.ComponentModel.Description("Specifies the background color of the tab item.")]
+        public Color TabItemBackground
+        {
+            get { return m_TabItemBackground; }
+            set
+            {
+                if (m_TabItemBackground != value)
+                {
+                    m_TabItemBackground = value;
+                    m_TabItemBackgroundCustom = true;
+                    InvokeColorChanged();
+                }
+            }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeTabItemBackground()
+        {
+            return m_TabItemBackgroundCustom;
+        }
+        /// <summary>
+        /// Specifies the target gradient background color of the tab item.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), System.ComponentModel.Category("Tab Control Colors"), System.ComponentModel.Description("Specifies the target gradient background color of the tab item.")]
+        public Color TabItemBackground2
+        {
+            get { return m_TabItemBackground2; }
+            set
+            {
+                if (m_TabItemBackground2 != value)
+                {
+                    m_TabItemBackground2 = value;
+                    m_TabItemBackground2Custom = true;
+                    InvokeColorChanged();
+                }
+            }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeTabItemBackground2()
+        {
+            return m_TabItemBackground2Custom;
+        }
+        /// <summary>
+        /// Specifies the gradient angle.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), System.ComponentModel.Category("Tab Control Colors"), System.ComponentModel.Description("Specifies the gradient angle."), DefaultValue(90)]
+        public int TabItemBackgroundGradientAngle
+        {
+            get { return m_TabItemBackgroundGradientAngle; }
+            set { m_TabItemBackgroundGradientAngle = value; InvokeColorChanged(); m_OtherCustom = true; }
+        }
+        /// <summary>
+        /// Gets the collection that defines the multi-color gradient background for tab item..
+        /// </summary>
+        [Browsable(true), DesignerSerializationVisibility(DesignerSerializationVisibility.Content), Description("Collection that defines the multicolor gradient background.")]
+        public BackgroundColorBlendCollection TabItemBackgroundColorBlend
+        {
+            get { return m_TabItemBackgroundColorBlend; }
+        }
+        /// <summary>
+        /// Specifies the text of the tab item.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), System.ComponentModel.Category("Tab Control Colors"), System.ComponentModel.Description("Specifies the text of the tab item.")]
+        public Color TabItemText
+        {
+            get { return m_TabItemText; }
+            set
+            {
+                if (m_TabItemText != value)
+                {
+                    m_TabItemText = value;
+                    m_TabItemTextCustom = true;
+                    InvokeColorChanged();
+                }
+            }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeTabItemText()
+        {
+            return m_TabItemTextCustom;
+        }
+
+        /// <summary>
+        /// Specifies the border color of the tab item when mouse is over it.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), System.ComponentModel.Category("Tab Control Colors"), System.ComponentModel.Description("Specifies the border color of the tab item when mouse is over it.")]
+        public Color TabItemHotBorder
+        {
+            get { return m_TabItemHotBorder; }
+            set
+            {
+                if (m_TabItemHotBorder != value)
+                {
+                    m_TabItemHotBorder = value;
+                    m_TabItemHotBorderCustom = true;
+                    InvokeColorChanged();
+                }
+            }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeTabItemHotBorder()
+        {
+            return m_TabItemHotBorderCustom;
+        }
+        /// <summary>
+        /// Specifies the light border color of the tab item when mouse is over it.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), System.ComponentModel.Category("Tab Control Colors"), System.ComponentModel.Description("Specifies the light border color of the tab item when mouse is over it.")]
+        public Color TabItemHotBorderLight
+        {
+            get { return m_TabItemHotBorderLight; }
+            set
+            {
+                if (m_TabItemHotBorderLight != value)
+                {
+                    m_TabItemHotBorderLight = value;
+                    m_TabItemHotBorderLightCustom = true;
+                    InvokeColorChanged();
+                }
+            }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeTabItemHotBorderLight()
+        {
+            return m_TabItemHotBorderLightCustom;
+        }
+        /// <summary>
+        /// Specifies the dark border color of the tab item when mouse is over it.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), System.ComponentModel.Category("Tab Control Colors"), System.ComponentModel.Description("Specifies the dark border color of the tab item when mouse is over it.")]
+        public Color TabItemHotBorderDark
+        {
+            get { return m_TabItemHotBorderDark; }
+            set
+            {
+                if (m_TabItemHotBorderDark != value)
+                {
+                    m_TabItemHotBorderDark = value;
+                    m_TabItemHotBorderDarkCustom = true;
+                    InvokeColorChanged();
+                }
+            }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeTabItemHotBorderDark()
+        {
+            return m_TabItemHotBorderDarkCustom;
+        }
+        /// <summary>
+        /// Specifies the background color of the tab item when mouse is over it.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), System.ComponentModel.Category("Tab Control Colors"), System.ComponentModel.Description("Specifies the background color of the tab item when mouse is over it.")]
+        public Color TabItemHotBackground
+        {
+            get { return m_TabItemHotBackground; }
+            set
+            {
+                if (m_TabItemHotBackground != value)
+                {
+                    m_TabItemHotBackground = value;
+                    m_TabItemHotBackgroundCustom = true;
+                    InvokeColorChanged();
+                }
+            }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeTabItemHotBackground()
+        {
+            return m_TabItemHotBackgroundCustom;
+        }
+        /// <summary>
+        /// Specifies the target gradient background color of the tab item when mouse is over it.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), System.ComponentModel.Category("Tab Control Colors"), System.ComponentModel.Description("Specifies the target gradient background color of the tab item when mouse is over it.")]
+        public Color TabItemHotBackground2
+        {
+            get { return m_TabItemHotBackground2; }
+            set
+            {
+                if (m_TabItemHotBackground2 != value)
+                {
+                    m_TabItemHotBackground2 = value;
+                    m_TabItemHotBackground2Custom = true;
+                    InvokeColorChanged();
+                }
+            }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeTabItemHotBackground2()
+        {
+            return m_TabItemHotBackground2Custom;
+        }
+        /// <summary>
+        /// Specifies the gradient angle.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), System.ComponentModel.Category("Tab Control Colors"), System.ComponentModel.Description("Specifies the gradient angle."), DefaultValue(90)]
+        public int TabItemHotBackgroundGradientAngle
+        {
+            get { return m_TabItemHotBackgroundGradientAngle; }
+            set { m_TabItemHotBackgroundGradientAngle = value; InvokeColorChanged(); m_OtherCustom = true; }
+        }
+        /// <summary>
+        /// Gets the collection that defines the multi-color gradient background for tab item..
+        /// </summary>
+        [Browsable(true), DesignerSerializationVisibility(DesignerSerializationVisibility.Content), Description("Collection that defines the multicolor gradient background.")]
+        public BackgroundColorBlendCollection TabItemHotBackgroundColorBlend
+        {
+            get { return m_TabItemHotBackgroundColorBlend; }
+        }
+        /// <summary>
+        /// Specifies the text color of the tab item when mouse is over it.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), System.ComponentModel.Category("Tab Control Colors"), System.ComponentModel.Description("Specifies the text color of the tab item when mouse is over it.")]
+        public Color TabItemHotText
+        {
+            get { return m_TabItemHotText; }
+            set
+            {
+                if (m_TabItemHotText != value)
+                {
+                    m_TabItemHotText = value;
+                    m_TabItemHotTextCustom = true;
+                    InvokeColorChanged();
+                }
+            }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeTabItemHotText()
+        {
+            return m_TabItemHotTextCustom;
+        }
+
+        /// <summary>
+        /// Specifies the border color of the tab item when selected.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), System.ComponentModel.Category("Tab Control Colors"), System.ComponentModel.Description("Specifies the border color of the tab item when selected.")]
+        public Color TabItemSelectedBorder
+        {
+            get { return m_TabItemSelectedBorder; }
+            set
+            {
+                if (m_TabItemSelectedBorder != value)
+                {
+                    m_TabItemSelectedBorder = value;
+                    m_TabItemSelectedBorderCustom = true;
+                    InvokeColorChanged();
+                }
+            }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeTabItemSelectedBorder()
+        {
+            return m_TabItemSelectedBorderCustom;
+        }
+        /// <summary>
+        /// Specifies the light border color of the tab item when selected.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), System.ComponentModel.Category("Tab Control Colors"), System.ComponentModel.Description("Specifies the light border color of the tab item when selected.")]
+        public Color TabItemSelectedBorderLight
+        {
+            get { return m_TabItemSelectedBorderLight; }
+            set
+            {
+                if (m_TabItemSelectedBorderLight != value)
+                {
+                    m_TabItemSelectedBorderLight = value;
+                    m_TabItemSelectedBorderLightCustom = true;
+                    InvokeColorChanged();
+                }
+            }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeTabItemSelectedBorderLight()
+        {
+            return m_TabItemSelectedBorderLightCustom;
+        }
+        /// <summary>
+        /// Specifies the dark border color of the tab item when selected.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), System.ComponentModel.Category("Tab Control Colors"), System.ComponentModel.Description("Specifies the dark border color of the tab item when selected.")]
+        public Color TabItemSelectedBorderDark
+        {
+            get { return m_TabItemSelectedBorderDark; }
+            set
+            {
+                if (m_TabItemSelectedBorderDark != value)
+                {
+                    m_TabItemSelectedBorderDark = value;
+                    m_TabItemSelectedBorderDarkCustom = true;
+                    InvokeColorChanged();
+                }
+            }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeTabItemSelectedBorderDark()
+        {
+            return m_TabItemSelectedBorderDarkCustom;
+        }
+        /// <summary>
+        /// Specifies the background color of the tab item when selected.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), System.ComponentModel.Category("Tab Control Colors"), System.ComponentModel.Description("Specifies the background color of the tab item when selected.")]
+        public Color TabItemSelectedBackground
+        {
+            get { return m_TabItemSelectedBackground; }
+            set
+            {
+                if (m_TabItemSelectedBackground != value)
+                {
+                    m_TabItemSelectedBackground = value;
+                    m_TabItemSelectedBackgroundCustom = true;
+                    InvokeColorChanged();
+                }
+            }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeTabItemSelectedBackground()
+        {
+            return m_TabItemSelectedBackgroundCustom;
+        }
+        /// <summary>
+        /// Specifies the target gradient background color of the tab item when selected.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), System.ComponentModel.Category("Tab Control Colors"), System.ComponentModel.Description("Specifies the target gradient background color of the tab item when selected.")]
+        public Color TabItemSelectedBackground2
+        {
+            get { return m_TabItemSelectedBackground2; }
+            set
+            {
+                if (m_TabItemSelectedBackground2 != value)
+                {
+                    m_TabItemSelectedBackground2 = value;
+                    m_TabItemSelectedBackground2Custom = true;
+                    InvokeColorChanged();
+                }
+            }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeTabItemSelectedBackground2()
+        {
+            return m_TabItemSelectedBackground2Custom;
+        }
+        /// <summary>
+        /// Specifies the gradient angle.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), System.ComponentModel.Category("Tab Control Colors"), System.ComponentModel.Description("Specifies the gradient angle."), DefaultValue(90)]
+        public int TabItemSelectedBackgroundGradientAngle
+        {
+            get { return m_TabItemSelectedBackgroundGradientAngle; }
+            set { m_TabItemSelectedBackgroundGradientAngle = value; InvokeColorChanged(); m_OtherCustom = true; }
+        }
+        /// <summary>
+        /// Gets the collection that defines the multi-color gradient background for tab item..
+        /// </summary>
+        [Browsable(true), DesignerSerializationVisibility(DesignerSerializationVisibility.Content), Description("Collection that defines the multicolor gradient background.")]
+        public BackgroundColorBlendCollection TabItemSelectedBackgroundColorBlend
+        {
+            get { return m_TabItemSelectedBackgroundColorBlend; }
+        }
+        /// <summary>
+        /// Specifies the text color of the tab item when selected.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), System.ComponentModel.Category("Tab Control Colors"), System.ComponentModel.Description("Specifies the text color of the tab item when selected.")]
+        public Color TabItemSelectedText
+        {
+            get { return m_TabItemSelectedText; }
+            set
+            {
+                if (m_TabItemSelectedText != value)
+                {
+                    m_TabItemSelectedText = value;
+                    m_TabItemSelectedTextCustom = true;
+                    InvokeColorChanged();
+                }
+            }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeTabItemSelectedText()
+        {
+            return m_TabItemSelectedTextCustom;
+        }
+
+        /// <summary>
+        /// Specifies the tab item separator color.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), System.ComponentModel.Category("Tab Control Colors"), System.ComponentModel.Description("Specifies the tab item separator color.")]
+        public Color TabItemSeparator
+        {
+            get { return m_TabItemSeparator; }
+            set
+            {
+                if (m_TabItemSeparator != value)
+                {
+                    m_TabItemSeparator = value;
+                    m_TabItemSeparatorCustom = true;
+                    InvokeColorChanged();
+                }
+            }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeTabItemSeparator()
+        {
+            return m_TabItemSeparatorCustom;
+        }
+        /// <summary>
+        /// Specifies the tab item separator shadow color.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), System.ComponentModel.Category("Tab Control Colors"), System.ComponentModel.Description("Specifies the tab item separator shadow color.")]
+        public Color TabItemSeparatorShade
+        {
+            get { return m_TabItemSeparatorShade; }
+            set
+            {
+                if (m_TabItemSeparatorShade != value)
+                {
+                    m_TabItemSeparatorShade = value;
+                    m_TabItemSeparatorShadeCustom = true;
+                    InvokeColorChanged();
+                }
+            }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeTabItemSeparatorShade()
+        {
+            return m_TabItemSeparatorShadeCustom;
+        }
+
+        private Color m_NavigationBoxForeColor = Color.Empty;
+        private bool m_NavigationBoxForeColorCustom = false;
+        /// <summary>
+        /// Specifies the text of the tab item.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), System.ComponentModel.Category("Tab Control Colors"), System.ComponentModel.Description("Specifies foreground color of tab-strip navigation box.")]
+        public Color NavigationBoxForeColor
+        {
+            get { return m_NavigationBoxForeColor; }
+            set
+            {
+                if (m_NavigationBoxForeColor != value)
+                {
+                    m_NavigationBoxForeColor = value;
+                    m_NavigationBoxForeColorCustom = true;
+                    InvokeColorChanged();
+                }
+            }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeNavigationBoxForeColor()
+        {
+            return m_NavigationBoxForeColorCustom;
+        }
+        #endregion
+
+        #region Static Members
+        /// <summary>
+        /// Applies predefinied tab item color scheme to the tab.
+        /// </summary>
+        /// <param name="item">Tab item to apply color to.</param>
+        /// <param name="c">Predefined color to apply</param>
+        public static void ApplyPredefinedColor(TabItem item, eTabItemColor c)
+        {
+            Color color1, color2;
+            GetPredefinedColors(c, out color1, out color2);
+
+            item.BackColor = color1;
+            item.BackColor2 = color2;
+            item.BackColorGradientAngle = 90;
+            if (c == eTabItemColor.Default)
+                item.TextColor = Color.Empty;
+            else
+                item.TextColor = Color.Black;
+        }
+
+        /// <summary>
+        /// Applies predefinied tab item color scheme to the tab.
+        /// </summary>
+        /// <param name="item">Tab item to apply color to.</param>
+        /// <param name="c">Predefined color to apply</param>
+        public static void ApplyPredefinedColor(ISimpleTab item, eTabItemColor c)
+        {
+            Color color1, color2;
+            GetPredefinedColors(c, out color1, out color2);
+
+            item.BackColor = color1;
+            item.BackColor2 = color2;
+            item.BackColorGradientAngle = 90;
+
+            item.TextColor = Color.Black;
+            item.BorderColor = Color.Empty;
+            item.DarkBorderColor = Color.FromArgb(190, Color.DimGray);
+            item.LightBorderColor = Color.FromArgb(128, Color.White);
+        }
+
+        public static void GetPredefinedColors(eTabItemColor c, out Color color1, out Color color2)
+        {
+            switch (c)
+            {
+                case eTabItemColor.Apple:
+                    color1 = Color.FromArgb(232, 248, 224);
+                    color2 = Color.FromArgb(173, 231, 146);
+                    break;
+
+                case eTabItemColor.Blue:
+                    color1 = Color.FromArgb(221, 230, 247);
+                    color2 = Color.FromArgb(138, 168, 228);
+                    break;
+
+                case eTabItemColor.BlueMist:
+                    color1 = Color.FromArgb(227, 236, 243);
+                    color2 = Color.FromArgb(155, 187, 210);
+                    break;
+
+                case eTabItemColor.Cyan:
+                    color1 = Color.FromArgb(227, 236, 243);
+                    color2 = Color.FromArgb(155, 187, 210);
+                    break;
+
+                case eTabItemColor.Green:
+                    color1 = Color.FromArgb(234, 240, 226);
+                    color2 = Color.FromArgb(183, 201, 151);
+                    break;
+
+                case eTabItemColor.Lemon:
+                    color1 = Color.FromArgb(252, 253, 215);
+                    color2 = Color.FromArgb(245, 249, 111);
+                    break;
+
+                case eTabItemColor.Magenta:
+                    color1 = Color.FromArgb(243, 229, 236);
+                    color2 = Color.FromArgb(213, 164, 187);
+                    break;
+
+                case eTabItemColor.Orange:
+                    color1 = Color.FromArgb(252, 233, 217);
+                    color2 = Color.FromArgb(246, 176, 120);
+                    break;
+
+                case eTabItemColor.Purple:
+                    color1 = Color.FromArgb(234, 227, 245);
+                    color2 = Color.FromArgb(180, 158, 222);
+                    break;
+
+                case eTabItemColor.PurpleMist:
+                    color1 = Color.FromArgb(232, 227, 234);
+                    color2 = Color.FromArgb(171, 156, 183);
+                    break;
+
+                case eTabItemColor.Red:
+                    color1 = Color.FromArgb(249, 225, 226);
+                    color2 = Color.FromArgb(238, 149, 151);
+                    break;
+
+                case eTabItemColor.Silver:
+                    color1 = Color.FromArgb(225, 225, 232);
+                    color2 = Color.FromArgb(149, 149, 170);
+                    break;
+
+                case eTabItemColor.Tan:
+                    color1 = Color.FromArgb(248, 242, 226);
+                    color2 = Color.FromArgb(232, 209, 153);
+                    break;
+
+                case eTabItemColor.Teal:
+                    color1 = Color.FromArgb(205, 236, 240);
+                    color2 = Color.FromArgb(78, 188, 202);
+                    break;
+
+                case eTabItemColor.Yellow:
+                    color1 = Color.FromArgb(255, 244, 213);
+                    color2 = Color.FromArgb(255, 216, 105);
+                    break;
+
+                default:
+                    color1 = Color.Empty;
+                    color2 = Color.Empty;
+                    break;
+            }
+        }
+
+        #endregion
+    }
+
+    internal enum eTabContext
+    {
+        Default,
+        DockTab
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/TabColors.cs b/PROMS/DotNetBar Source Code/TabColors.cs
new file mode 100644
index 00000000..6e876d45
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TabColors.cs	
@@ -0,0 +1,248 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Represents colors for the active tab.
+	/// </summary>
+	[ToolboxItem(false), TypeConverter(typeof(System.ComponentModel.ExpandableObjectConverter))]
+	public class TabColors
+	{
+		#region Events
+		/// <summary>
+		/// Occurs after color property has changed.
+		/// </summary>
+		public event EventHandler ColorChanged;
+		#endregion
+
+		#region Private Variables
+		private Color m_BackColor=Color.Empty;
+		private Color m_BackColor2=Color.Empty;
+		private int m_BackColorGradientAngle=90;
+		private Color m_LightBorderColor=Color.Empty;
+		private Color m_DarkBorderColor=Color.Empty;
+		private Color m_BorderColor=Color.Empty;
+		private Color m_TextColor=Color.Empty;
+        private BackgroundColorBlendCollection m_BackgroundColorBlend = new BackgroundColorBlendCollection();
+		#endregion
+
+		#region Internal Implementation
+		/// <summary>
+		/// Creates new instance of the object.
+		/// </summary>
+		public TabColors(){}
+		/// <summary>
+		/// Gets or sets the background color of the tab when inactive.
+		/// </summary>
+		[Browsable(true),Description("Indicates the inactive tab background color."),Category("Style")]
+		public Color BackColor
+		{
+			get {return m_BackColor;}
+			set
+			{
+				m_BackColor=value;
+				this.Refresh();
+			}
+		}
+		/// <summary>
+		/// Returns whether property should be serialized.
+		/// </summary>
+		/// <returns>true if property should be serialized otherwise false.</returns>
+		[Browsable(false),EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeBackColor()
+		{
+			return !m_BackColor.IsEmpty;
+		}
+		/// <summary>
+		/// Resets property to the default value.
+		/// </summary>
+		[Browsable(false),EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetBackColor()
+		{
+			BackColor=Color.Empty;
+		}
+
+		/// <summary>
+		/// Gets or sets the target gradient background color of the tab when inactive.
+		/// </summary>
+		[Browsable(true),Description("Indicates the inactive tab target gradient background color."),Category("Style")]
+		public Color BackColor2
+		{
+			get {return m_BackColor2;}
+			set
+			{
+				m_BackColor2=value;
+				this.Refresh();
+			}
+		}
+		/// <summary>
+		/// Returns whether property should be serialized.
+		/// </summary>
+		/// <returns>true if property should be serialized otherwise false.</returns>
+		[Browsable(false),EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeBackColor2()
+		{
+			return !m_BackColor2.IsEmpty;
+		}
+		/// <summary>
+		/// Resets property to the default value.
+		/// </summary>
+		[Browsable(false),EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetBackColor2()
+		{
+			BackColor2=Color.Empty;
+		}
+
+		/// <summary>
+		/// Gets or sets the gradient angle.
+		/// </summary>
+		[Browsable(true),Description("Indicates the gradient angle."),Category("Style"),DefaultValue(90)]
+		public int BackColorGradientAngle
+		{
+			get {return m_BackColorGradientAngle;}
+			set {m_BackColorGradientAngle=value;this.Refresh();}
+		}
+
+        /// <summary>
+        /// Gets the collection that defines the multi-color gradient background for tab item..
+        /// </summary>
+        [Browsable(true), DesignerSerializationVisibility(DesignerSerializationVisibility.Content), Description("Collection that defines the multicolor gradient background.")]
+        public BackgroundColorBlendCollection BackgroundColorBlend
+        {
+            get { return m_BackgroundColorBlend; }
+        }
+
+		/// <summary>
+		/// Gets or sets the light border color when tab is inactive.
+		/// </summary>
+		[Browsable(true),Description("Indicates the inactive tab light border color."),Category("Style")]
+		public Color LightBorderColor
+		{
+			get {return m_LightBorderColor;}
+			set
+			{
+				m_LightBorderColor=value;
+				this.Refresh();
+			}
+		}
+		/// <summary>
+		/// Returns whether property should be serialized.
+		/// </summary>
+		/// <returns>true if property should be serialized otherwise false.</returns>
+		[Browsable(false),EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeLightBorderColor()
+		{
+			return !m_LightBorderColor.IsEmpty;
+		}
+		/// <summary>
+		/// Resets property to the default value.
+		/// </summary>
+		[Browsable(false),EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetLightBorderColor()
+		{
+			LightBorderColor=Color.Empty;
+		}
+
+		/// <summary>
+		/// Gets or sets the dark border color when tab is inactive.
+		/// </summary>
+		[Browsable(true),Description("Indicates the inactive tab dark border color."),Category("Style")]
+		public Color DarkBorderColor
+		{
+			get {return m_DarkBorderColor;}
+			set
+			{
+				m_DarkBorderColor=value;
+				this.Refresh();
+			}
+		}
+		/// <summary>
+		/// Returns whether property should be serialized.
+		/// </summary>
+		/// <returns>true if property should be serialized otherwise false.</returns>
+		[Browsable(false),EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeDarkBorderColor()
+		{
+			return !m_DarkBorderColor.IsEmpty;
+		}
+		/// <summary>
+		/// Resets property to the default value.
+		/// </summary>
+		[Browsable(false),EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetDarkBorderColor()
+		{
+			DarkBorderColor=Color.Empty;
+		}
+
+		/// <summary>
+		/// Gets or sets the border color when tab is inactive.
+		/// </summary>
+		[Browsable(true),Description("Indicates the inactive tab border color."),Category("Style")]
+		public Color BorderColor
+		{
+			get {return m_BorderColor;}
+			set
+			{
+				m_BorderColor=value;
+				this.Refresh();
+			}
+		}
+		/// <summary>
+		/// Returns whether property should be serialized.
+		/// </summary>
+		/// <returns>true if property should be serialized otherwise false.</returns>
+		[Browsable(false),EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeBorderColor()
+		{
+			return !m_BorderColor.IsEmpty;
+		}
+		/// <summary>
+		/// Resets property to the default value.
+		/// </summary>
+		[Browsable(false),EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetBorderColor()
+		{
+			BorderColor=Color.Empty;
+		}
+
+		/// <summary>
+		/// Gets or sets the text color when tab is inactive.
+		/// </summary>
+		[Browsable(true),Description("Indicates the inactive tab text color."),Category("Style")]
+		public Color TextColor
+		{
+			get {return m_TextColor;}
+			set
+			{
+				m_TextColor=value;
+				this.Refresh();
+			}
+		}
+		/// <summary>
+		/// Returns whether property should be serialized.
+		/// </summary>
+		/// <returns>true if property should be serialized otherwise false.</returns>
+		[Browsable(false),EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeTextColor()
+		{
+			return !m_TextColor.IsEmpty;
+		}
+		/// <summary>
+		/// Resets property to the default value.
+		/// </summary>
+		[Browsable(false),EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetTextColor()
+		{
+			TextColor=Color.Empty;
+		}
+
+		private void Refresh()
+		{
+			if(ColorChanged!=null)
+				ColorChanged(this,new EventArgs());
+		}
+		#endregion
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TabControl.bmp b/PROMS/DotNetBar Source Code/TabControl.bmp
new file mode 100644
index 00000000..a925d091
Binary files /dev/null and b/PROMS/DotNetBar Source Code/TabControl.bmp differ
diff --git a/PROMS/DotNetBar Source Code/TabControl.cs b/PROMS/DotNetBar Source Code/TabControl.cs
new file mode 100644
index 00000000..508e5537
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TabControl.cs	
@@ -0,0 +1,1356 @@
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.Drawing;
+using System.Data;
+using System.Windows.Forms;
+using System.Reflection;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Summary description for TabControl.
+	/// </summary>
+    [ToolboxItem(true), Designer("DevComponents.DotNetBar.Design.TabControlDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+	public class TabControl : System.Windows.Forms.Control,ISupportInitialize
+	{
+		#region Events
+		/// <summary>
+		/// Occurs when selected tab changes.
+		/// </summary>
+		public event TabStrip.SelectedTabChangedEventHandler SelectedTabChanged;
+		/// <summary>
+		/// Occurs before selected tab changes and gives you opportunity to cancel the change.
+		/// </summary>
+		public event TabStrip.SelectedTabChangingEventHandler SelectedTabChanging;
+		/// <summary>
+		/// Occurs when tab is dragged by user.
+		/// </summary>
+		public event TabStrip.TabMovedEventHandler TabMoved;
+		/// <summary>
+		/// Occurs when the user navigates back using the back arrow.
+		/// </summary>
+		public event TabStrip.UserActionEventHandler NavigateBack;
+		/// <summary>
+		/// Occurs when the user navigates forward using the forward arrow.
+		/// </summary>
+		public event TabStrip.UserActionEventHandler NavigateForward;
+		/// <summary>
+		/// Occurs when tab item is closing.
+		/// </summary>
+		public event TabStrip.UserActionEventHandler TabItemClose;
+		/// <summary>
+		/// Occurs when tab item is added to the tabs collection.
+		/// </summary>
+		public event EventHandler TabItemOpen;
+		/// <summary>
+		/// Occurs before control or item attached to the tab is displayed.
+		/// </summary>
+		public event EventHandler BeforeTabDisplay;
+		/// <summary>
+		/// Occurs after tab item has been removed from tabs collection.
+		/// </summary>
+		public event EventHandler TabRemoved;
+		#endregion
+
+        #region Private Variables & Constructor, Dispose
+        private DevComponents.DotNetBar.TabStrip tabStrip1;
+        //private int m_SelectedTabIndex=0;
+		private System.Windows.Forms.Timer m_ClickTimer=null;
+        private bool m_AutoCloseTabs = false;
+        private bool m_TabStripVisible = true;
+        private int m_LoadSelectedTabIndex = -1;
+        private bool m_SyncingTabStripSize = false;
+
+		/// <summary> 
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.Container components = null;
+
+		public TabControl()
+		{
+			this.SetStyle(ControlStyles.Opaque,true);
+			this.SetStyle(DisplayHelp.DoubleBufferFlag,true);
+			this.SetStyle(ControlStyles.AllPaintingInWmPaint,true);
+            this.SetStyle(ControlStyles.SupportsTransparentBackColor, true);
+
+			// This call is required by the Windows.Forms Form Designer.
+			InitializeComponent();
+			//tabStrip1.VariableTabWidth=false;
+			tabStrip1.TabLayoutType=eTabLayoutType.FixedWithNavigationBox;
+			tabStrip1.SizeRecalculated+=new EventHandler(this.TabStripSizeRecalculated);
+
+            StyleManager.Register(this);
+		}
+
+		/// <summary> 
+		/// Clean up any resources being used.
+		/// </summary>
+		protected override void Dispose( bool disposing )
+		{
+			if( disposing )
+			{
+				if(components != null)
+				{
+					components.Dispose();
+				}
+                StyleManager.Unregister(this);
+			}
+			base.Dispose( disposing );
+        }
+        #endregion
+
+		#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.tabStrip1 = new DevComponents.DotNetBar.TabStrip();
+			this.SuspendLayout();
+			// 
+			// tabStrip1
+			// 
+			this.tabStrip1.CanReorderTabs = true;
+			this.tabStrip1.CloseButtonVisible = true;
+			this.tabStrip1.Dock = System.Windows.Forms.DockStyle.Top;
+			this.tabStrip1.ImageList = null;
+			this.tabStrip1.Name = "tabStrip1";
+			this.tabStrip1.SelectedTab = null;
+			this.tabStrip1.Size = new System.Drawing.Size(256, 26);
+			this.tabStrip1.Style = DevComponents.DotNetBar.eTabStripStyle.OneNote;
+			this.tabStrip1.TabAlignment = DevComponents.DotNetBar.eTabStripAlignment.Top;
+			this.tabStrip1.TabIndex = 0;
+			this.tabStrip1.Text = "tabStrip1";
+			this.tabStrip1.AutoHideSystemBox=true;
+			this.tabStrip1.CloseButtonVisible=false;
+			this.tabStrip1.TabRemoved += new System.EventHandler(this.tabStrip1_TabRemoved);
+            this.tabStrip1.TabItemOpen += new EventHandler(tabStrip1_TabItemAdded);
+			this.tabStrip1.SelectedTabChanged += new DevComponents.DotNetBar.TabStrip.SelectedTabChangedEventHandler(this.tabStrip1_SelectedTabChanged);
+			this.tabStrip1.SelectedTabChanging += new DevComponents.DotNetBar.TabStrip.SelectedTabChangingEventHandler(this.tabStrip1_SelectedTabChanging);
+			this.tabStrip1.TabMoved+=new TabStrip.TabMovedEventHandler(this.tabStrip1_TabMoved);
+			this.tabStrip1.NavigateBack+=new TabStrip.UserActionEventHandler(this.tabStrip1_NavigateBack);
+			this.tabStrip1.NavigateForward+=new TabStrip.UserActionEventHandler(this.tabStrip1_NavigateForward);
+			this.tabStrip1.TabItemClose+=new TabStrip.UserActionEventHandler(this.tabStrip1_TabItemClose);
+			this.tabStrip1.TabItemOpen+=new EventHandler(this.tabStrip1_TabItemOpen);
+            this.tabStrip1.TabsCleared += new EventHandler(this.tabStrip1_TabsCleared);
+			this.tabStrip1.BeforeTabDisplay+=new EventHandler(this.tabStrip1_BeforeTabDisplay);
+			this.tabStrip1.TabStop=false;
+			// 
+			// TabControl
+			// 
+			this.Controls.AddRange(new System.Windows.Forms.Control[] {
+																		  this.tabStrip1});
+			this.Name = "TabControl";
+			this.Size = new System.Drawing.Size(256, 152);
+			this.ResumeLayout(false);
+
+		}
+		#endregion
+
+		#region Hidden Properties
+		/// <summary>
+		/// Gets or sets the background color.
+		/// </summary>
+		[Browsable(true),Description("Indicates the background color."),Category("Style")]
+		public override Color BackColor
+		{
+			get {return base.BackColor;}
+			set
+            {
+                base.BackColor=value;
+                if (tabStrip1 != null)
+                    tabStrip1.BackColor = value;
+            }
+		}
+        /// <summary>
+        /// Gets whether property should be serialized. Used by Windows Forms designer.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeBackColor()
+        {
+            return (BackColor != SystemColors.Control);
+        }
+
+		#endregion
+
+        #region Internal Implementation
+        /// <summary>
+        /// Called by StyleManager to notify control that style on manager has changed and that control should refresh its appearance if
+        /// its style is controlled by StyleManager.
+        /// </summary>
+        /// <param name="newStyle">New active style.</param>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void StyleManagerStyleChanged(eDotNetBarStyle newStyle)
+        {
+            UpdateTabPanelStyle();
+        }
+
+        protected override void OnGotFocus(EventArgs e)
+        {
+            if (this.TabStripTabStop)
+                tabStrip1.Focus();
+            base.OnGotFocus(e);
+        }
+#if FRAMEWORK20
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public virtual bool ValidateChildren()
+        {
+            return this.ValidateChildren(ValidationConstraints.Selectable);
+        }
+
+        [Browsable(false)]
+        public virtual bool ValidateChildren(ValidationConstraints validationConstraints)
+        {
+            if ((validationConstraints < ValidationConstraints.None) || (validationConstraints > (ValidationConstraints.ImmediateChildren | ValidationConstraints.TabStop | ValidationConstraints.Visible | ValidationConstraints.Enabled | ValidationConstraints.Selectable)))
+            {
+                throw new InvalidEnumArgumentException("validationConstraints", (int)validationConstraints, typeof(ValidationConstraints));
+            }
+            Type t = typeof(Control);
+            MethodInfo mi = t.GetMethod("PerformContainerValidation", BindingFlags.InvokeMethod | BindingFlags.NonPublic | BindingFlags.Instance);
+            if (mi != null)
+            {
+                bool b = (bool)mi.Invoke(this, new object[] { validationConstraints });
+                return !b;
+            }
+            return true;
+        }
+#endif
+
+        /// <summary>
+        /// Gets the collection of all tabs.
+        /// </summary>
+        [Browsable(false), System.ComponentModel.Editor("DevComponents.DotNetBar.Design.TabStripTabsEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), DesignerSerializationVisibility(DesignerSerializationVisibility.Content), System.ComponentModel.Category("Data"), System.ComponentModel.Description("Returns the collection of Tabs.")]
+        public TabsCollection Tabs
+        {
+            get { return tabStrip1.Tabs; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether tabs are visible. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Appearance"), Description("Indicates whether tabs are visible")]
+        public bool TabsVisible
+        {
+            get { return m_TabStripVisible; }
+            set
+            {
+                m_TabStripVisible = value;
+                tabStrip1.Visible = value;
+                RefreshPanelsStyle();
+            }
+        }
+
+        /// <summary>
+        /// Returns reference to internal tab strip control.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public TabStrip TabStrip
+        {
+            get { return tabStrip1; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether TabStrip will get focus when Tab key is used. Default value is false.
+        /// </summary>
+        [DefaultValue(false), Category("Behavior"), Description("Gets or sets whether TabStrip will get focus when Tab key is used.")]
+        public bool TabStripTabStop
+        {
+            get { return tabStrip1.TabStop; }
+            set
+            {
+                tabStrip1.TabStop = value;
+            }
+        }
+        
+
+        public void RecalcLayout()
+        {
+            tabStrip1.Refresh();
+            this.SyncTabStripSize();
+        }
+
+
+		private void tabStrip1_SelectedTabChanged(object sender, DevComponents.DotNetBar.TabStripTabChangedEventArgs e)
+		{
+			if(e.NewTab!=null && e.NewTab.AttachedControl!=null)
+				e.NewTab.AttachedControl.BringToFront();
+
+			InvokeSelectedTabChanged(e);
+		}
+
+		protected virtual void InvokeSelectedTabChanged(DevComponents.DotNetBar.TabStripTabChangedEventArgs e)
+		{
+			if(SelectedTabChanged!=null)
+				SelectedTabChanged(this,e);
+		}
+
+		private void tabStrip1_SelectedTabChanging(object sender, DevComponents.DotNetBar.TabStripTabChangingEventArgs e)
+		{
+			InvokeSelectedTabChanging(e);
+		}
+
+		protected virtual void InvokeSelectedTabChanging(DevComponents.DotNetBar.TabStripTabChangingEventArgs e)
+		{
+			if(SelectedTabChanging!=null)
+				SelectedTabChanging(this,e);
+		}
+
+		private void tabStrip1_TabMoved(object sender, TabStripTabMovedEventArgs e)
+		{
+			InvokeTabMoved(e);
+		}
+
+		protected virtual void InvokeTabMoved(TabStripTabMovedEventArgs e)
+		{
+			if(TabMoved!=null)
+				TabMoved(this,e);
+		}
+
+		private void tabStrip1_NavigateBack(object sender, TabStripActionEventArgs e)
+		{
+			InvokeNavigateBack(e);
+		}
+
+		protected virtual void InvokeNavigateBack(TabStripActionEventArgs e)
+		{
+			if(NavigateBack!=null)
+				NavigateBack(this,e);
+		}
+
+		private void tabStrip1_NavigateForward(object sender, TabStripActionEventArgs e)
+		{
+			InvokeNavigateForward(e);
+		}
+
+		protected virtual void InvokeNavigateForward(TabStripActionEventArgs e)
+		{
+			if(NavigateForward!=null)
+				NavigateForward(this,e);
+		}
+
+		private void tabStrip1_TabItemClose(object sender, TabStripActionEventArgs e)
+		{
+			InvokeTabItemClose(e);
+
+            if (!e.Cancel && m_AutoCloseTabs && !this.DesignMode)
+            {
+                TabItem tab = tabStrip1.SelectedTab;
+                if (tab != null)
+                {
+                    tabStrip1.Tabs.Remove(tab);
+                    Control c = tab.AttachedControl;
+                    if (c != null)
+                    {
+                        if (this.Controls.Contains(c))
+                            this.Controls.Remove(c);
+                        c.Dispose();
+                    }
+                }
+                this.RecalcLayout();
+            }
+		}
+
+		protected virtual void InvokeTabItemClose(TabStripActionEventArgs e)
+		{
+			if(TabItemClose!=null)
+				TabItemClose(this,e);
+		}
+
+		private void tabStrip1_TabItemOpen(object sender, EventArgs e)
+		{
+			InvokeTabItemOpen(e);
+		}
+
+		protected virtual void InvokeTabItemOpen(EventArgs e)
+		{
+			if(TabItemOpen!=null)
+				TabItemOpen(this,e);
+		}
+
+		private void tabStrip1_BeforeTabDisplay(object sender, EventArgs e)
+		{
+			InvokeBeforeTabDisplay(e);
+		}
+
+		protected virtual void InvokeBeforeTabDisplay(EventArgs e)
+		{
+			if(BeforeTabDisplay!=null)
+				BeforeTabDisplay(this,e);
+		}
+
+		protected override void OnControlAdded(ControlEventArgs e)
+		{
+			base.OnControlAdded(e);
+
+            if (this.DesignMode)
+                return;
+			TabControlPanel panel=e.Control as TabControlPanel;
+			if(panel==null)
+				return;
+			if(panel.TabItem!=null)
+			{
+				if(this.Tabs.Contains(panel.TabItem) && this.SelectedTab==panel.TabItem)
+				{
+					panel.Visible=true;
+					panel.BringToFront();
+				}
+				else
+					panel.Visible=false;
+			}
+			else
+				panel.Visible=false;
+		}
+
+		protected override void OnControlRemoved(ControlEventArgs e)
+		{
+			base.OnControlRemoved(e);
+
+			TabControlPanel panel=e.Control as TabControlPanel;
+			if(panel==null)
+				return;
+			if(panel.TabItem!=null)
+			{
+				if(this.Tabs.Contains(panel.TabItem))
+					this.Tabs.Remove(panel.TabItem);
+			}
+		}
+
+//		protected override void OnEnter(EventArgs e)
+//		{
+//			base.OnEnter(e);
+//			if(this.Controls.Count>0)
+//			{
+//				foreach(Control c in this.Controls)
+//				{
+//					if(c.Visible && c.Controls.Count>0)
+//					{
+//						this.SelectNextControl(c,true,true,true,true);
+//					}
+//				}
+//			}
+//		}
+
+		private void tabStrip1_TabRemoved(object sender, System.EventArgs e)
+		{
+			if(sender is TabItem)
+			{
+				TabItem tab=sender as TabItem;
+				if(tab.AttachedControl!=null && this.Controls.Contains(tab.AttachedControl))
+				{
+					this.Controls.Remove(tab.AttachedControl);
+				}
+			}
+
+			InvokeTabRemoved(e);
+		}
+
+        void tabStrip1_TabItemAdded(object sender, EventArgs e)
+        {
+            TabItem item = sender as TabItem;
+            if (!this.DesignMode && !m_Initializing && item!=null && item.AttachedControl!=null && !this.Controls.Contains(item.AttachedControl))
+            {
+                this.Controls.Add(item.AttachedControl);
+            }
+        }
+
+		protected virtual void InvokeTabRemoved(EventArgs e)
+		{
+			if(TabRemoved!=null)
+				TabRemoved(this,e);
+		}
+
+        private void tabStrip1_TabsCleared(object sender, EventArgs e)
+        {
+            if (this.DesignMode) return;
+            Control[] cs = new Control[this.Controls.Count];
+            this.Controls.CopyTo(cs, 0);
+            foreach (Control c in cs)
+            {
+                if (c is TabControlPanel)
+                {
+                    this.Controls.Remove(c);
+                }
+            }
+        }
+
+		protected override void OnPaint(PaintEventArgs e)
+		{
+			base.OnPaint(e);
+            
+            if (this.BackColor == Color.Transparent || this.ColorScheme.TabBackground == Color.Transparent)
+            {
+                base.OnPaintBackground(e);
+            }
+
+			if(this.Controls.Count<=1)
+			{
+				using(SolidBrush brush=new SolidBrush(SystemColors.Control))
+					e.Graphics.FillRectangle(brush,this.DisplayRectangle);
+			}
+		}
+
+		protected override void OnResize(EventArgs e)
+		{
+            base.OnResize(e);
+
+            if (this.Width == 0 || this.Height == 0)
+                return;
+
+			if(tabStrip1.IsMultiLine)
+			{
+				CreateSyncSizeTimer();
+			}
+		}
+
+		private void CreateSyncSizeTimer()
+		{
+			if(m_ClickTimer!=null)
+				return;
+			m_ClickTimer=new Timer();
+			m_ClickTimer.Interval=10;
+			m_ClickTimer.Tick+=new EventHandler(this.SyncSizeTimerTick);
+			m_ClickTimer.Enabled=true;
+			m_ClickTimer.Start();
+		}
+		private void SyncSizeTimerTick(object sender, EventArgs e)
+		{
+			m_ClickTimer.Stop();
+			m_ClickTimer.Enabled=false;
+			m_ClickTimer=null;
+			try
+			{
+				this.PerformLayout();
+			}
+			catch{}
+		}
+
+		/// <summary>
+		/// Applies default tab colors to the panel
+		/// </summary>
+		/// <param name="panel">Panel to apply colors to.</param>
+		public void ApplyDefaultPanelStyle(TabControlPanel panel)
+		{
+			if(panel==null || panel.UseCustomStyle)
+				return;
+
+			if(panel.TabItem!=null && !panel.TabItem.BackColor.IsEmpty)
+			{
+				if(!panel.TabItem.BackColor2.IsEmpty)
+				{
+					panel.Style.BackColor1.Color=panel.TabItem.BackColor;
+					panel.Style.BackColor2.Color=panel.TabItem.BackColor2;
+					switch(tabStrip1.TabAlignment)
+					{
+						case eTabStripAlignment.Top:
+							panel.Style.GradientAngle=panel.TabItem.BackColorGradientAngle-180;
+							break;
+						case eTabStripAlignment.Bottom:
+							panel.Style.GradientAngle=panel.TabItem.BackColorGradientAngle;
+							break;
+						case eTabStripAlignment.Left:
+							panel.Style.GradientAngle=panel.TabItem.BackColorGradientAngle-90;
+							break;
+						case eTabStripAlignment.Right:
+							panel.Style.GradientAngle=panel.TabItem.BackColorGradientAngle+90;
+							break;
+					}
+				}
+			}
+			else
+			{
+				panel.Style.BackColor1.Color=tabStrip1.ColorScheme.TabPanelBackground;
+				panel.Style.BackColor2.Color=tabStrip1.ColorScheme.TabPanelBackground2;
+				
+				switch(tabStrip1.TabAlignment)
+				{
+					case eTabStripAlignment.Top:
+					{
+						panel.Style.GradientAngle=tabStrip1.ColorScheme.TabPanelBackgroundGradientAngle;
+						break;
+					}
+					case eTabStripAlignment.Bottom:
+					{
+						panel.Style.GradientAngle=tabStrip1.ColorScheme.TabPanelBackgroundGradientAngle-180;
+						break;
+					}
+					case eTabStripAlignment.Left:
+					{
+						panel.Style.GradientAngle=tabStrip1.ColorScheme.TabPanelBackgroundGradientAngle-90;
+						break;
+					}
+					case eTabStripAlignment.Right:
+					{
+						panel.Style.GradientAngle=tabStrip1.ColorScheme.TabPanelBackgroundGradientAngle+90;
+						break;
+					}
+				}
+				panel.Style.BorderColor.Color=tabStrip1.ColorScheme.TabPanelBorder;
+				
+			}
+
+			panel.Style.Border=eBorderType.SingleLine;
+
+            if (m_TabStripVisible)
+            {
+                switch (tabStrip1.TabAlignment)
+                {
+                    case eTabStripAlignment.Top:
+                        panel.Style.BorderSide = (eBorderSide.Left | eBorderSide.Right | eBorderSide.Bottom);
+                        break;
+                    case eTabStripAlignment.Bottom:
+                        panel.Style.BorderSide = (eBorderSide.Left | eBorderSide.Right | eBorderSide.Top);
+                        break;
+                    case eTabStripAlignment.Left:
+                        panel.Style.BorderSide = (eBorderSide.Top | eBorderSide.Right | eBorderSide.Bottom);
+                        break;
+                    case eTabStripAlignment.Right:
+                        panel.Style.BorderSide = (eBorderSide.Left | eBorderSide.Top | eBorderSide.Bottom);
+                        break;
+                }
+            }
+            else
+                panel.Style.BorderSide = eBorderSide.All;
+
+
+			if(tabStrip1.IsThemed)
+				panel.DrawThemedPane=true;
+			else
+                panel.DrawThemedPane=false;
+		}
+
+        private void UpdateTabPanelStyle()
+        {
+            foreach (Control c in this.Controls)
+            {
+                if (c is TabControlPanel)
+                {
+                    TabControlPanel panel = c as TabControlPanel;
+                    ApplyDefaultPanelStyle(panel);
+                }
+            }
+        }
+        protected override void OnSystemColorsChanged(EventArgs e)
+		{
+			base.OnSystemColorsChanged(e);
+			Application.DoEvents();
+            UpdateTabPanelStyle();
+		}
+
+		/// <summary>
+		/// Resumes normal layout logic. Optionally forces an immediate layout of pending layout requests.
+		/// </summary>
+		public new void ResumeLayout(bool performLayout)
+		{
+			base.ResumeLayout(performLayout);
+            if (!this.IsHandleCreated)
+            {
+                m_DelayedSync = true;
+            }
+            else
+            {
+                tabStrip1.ResetTabHeight();
+                SyncTabStripSize();
+            }
+		}
+        private bool m_DelayedSync = false;
+        protected override void OnHandleCreated(EventArgs e)
+        {
+            if (m_DelayedSync || this.DesignMode)
+            {
+                m_DelayedSync = false;
+                tabStrip1.ResetTabHeight();
+                SyncTabStripSize();
+
+                if (this.DesignMode) // There is bug in VS2010 designer where tab alignment is not updated we need to remedy that
+                {
+                    InvokeDelayed(new MethodInvoker(delegate { this.PerformLayout(); }));
+                }
+            }
+
+            base.OnHandleCreated(e);
+        }
+
+		private void RefreshPanelsStyle()
+		{
+            if (m_Initializing) return;
+			foreach(Control c in this.Controls)
+			{
+				if(c is TabControlPanel)
+					ApplyDefaultPanelStyle(c as TabControlPanel);
+			}
+		}
+
+		/// <summary>
+		/// Use TabControlPanel.Style property to set the background image for each tab panel.
+		/// </summary>
+		[System.ComponentModel.Browsable(false),System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+		public override Image BackgroundImage
+		{
+			get{return base.BackgroundImage;}
+			set{base.BackgroundImage=value;}
+        }
+
+        private void TabStripSizeRecalculated(object sender, EventArgs e)
+        {
+            //if (tabStrip1.IsMultiLine)
+                SyncTabStripSize();
+        }
+
+        /// <summary>
+        /// Resizes the portion of the control that holds the tabs.
+        /// </summary>
+        public void SyncTabStripSize()
+        {
+            if (m_SyncingTabStripSize)
+                return;
+            m_SyncingTabStripSize = true;
+            try
+            {
+                switch (tabStrip1.Dock)
+                {
+                    case DockStyle.Left:
+                    case DockStyle.Right:
+                        tabStrip1.Width = tabStrip1.MinTabStripHeight;
+                        break;
+                    default:
+                        tabStrip1.Height = tabStrip1.MinTabStripHeight;
+                        break;
+                }
+                //this.PerformLayout();
+                tabStrip1.SendToBack();
+            }
+            finally
+            {
+                m_SyncingTabStripSize = false;
+            }
+            //this.ResumeLayout();
+        }
+        private void InvokeDelayed(MethodInvoker method)
+        {
+            Timer delayedInvokeTimer = new Timer();
+            delayedInvokeTimer = new Timer();
+            delayedInvokeTimer.Tag = method;
+            delayedInvokeTimer.Interval = 10;
+            delayedInvokeTimer.Tick += new EventHandler(DelayedInvokeTimerTick);
+            delayedInvokeTimer.Start();
+        }
+        void DelayedInvokeTimerTick(object sender, EventArgs e)
+        {
+            Timer timer = (Timer)sender;
+            MethodInvoker method = (MethodInvoker)timer.Tag;
+            timer.Stop();
+            timer.Dispose();
+            method.Invoke();
+        }
+
+        /// <summary>
+        /// Creates new tab and tab panel and adds it to the Tabs collection.
+        /// </summary>
+        /// <param name="tabText">Tab text.</param>
+        /// <returns>Reference to newly created TabItem.</returns>
+        public TabItem CreateTab(string tabText)
+        {
+            return CreateTab(tabText, -1);
+        }
+
+        /// <summary>
+        /// Creates new tab and tab panel and inserts it at specified position inside of Tabs collection.
+        /// </summary>
+        /// <param name="tabText">Tab text.</param>
+        /// <param name="insertAt">Index to insert newly created tab at. -1 will append tab to the end of Tabs collection.</param>
+        /// <returns>Reference to newly created TabItem.</returns>
+        public TabItem CreateTab(string tabText, int insertAt)
+        {
+            TabItem tab = new TabItem();
+            tab.Text = tabText;
+            TabControlPanel panel = new TabControlPanel();
+            this.ApplyDefaultPanelStyle(panel);
+            tab.AttachedControl = panel;
+            panel.TabItem = tab;
+
+            if (insertAt < 0 || insertAt >= tabStrip1.Tabs.Count)
+            {
+                tabStrip1.Tabs.Add(tab);
+                this.Controls.Add(panel);
+            }
+            else
+            {
+                tabStrip1.Tabs.Insert(insertAt, tab);
+                this.Controls.Add(panel);
+            }
+
+            panel.Dock = DockStyle.Fill;
+            panel.SendToBack();
+
+            this.RecalcLayout();
+
+            return tab;
+        }
+
+        protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
+        {
+            if (_ControlTabNavigationEnabled)
+            {
+                if (keyData == (Keys.Tab | Keys.Control))
+                {
+                    tabStrip1.SelectNextTab(eEventSource.Keyboard, true);
+                    return true;
+                }
+                else if (keyData == (Keys.Tab | Keys.Control | Keys.Shift))
+                {
+                    tabStrip1.SelectPreviousTab(eEventSource.Keyboard, true);
+                    return true;
+                }
+            }
+            return base.ProcessCmdKey(ref msg, keyData);
+        }
+
+        private bool _ControlTabNavigationEnabled = true;
+        /// <summary>
+        /// Gets or sets whether pressing Ctrl+Tab keys will cycle through the selected tabs. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether pressing Ctrl+Tab keys will cycle through the selected tabs.")]
+        public bool ControlTabNavigationEnabled
+        {
+            get { return _ControlTabNavigationEnabled; }
+            set
+            {
+                _ControlTabNavigationEnabled = value;
+            }
+        }
+        
+        #endregion
+
+        #region ISupportInitialize
+        private bool m_Initializing=false;
+		void ISupportInitialize.BeginInit()
+		{
+            m_Initializing = true;
+		}
+		void ISupportInitialize.EndInit()
+		{
+            m_Initializing = false;
+			// Apply default panel style
+			RefreshPanelsStyle();
+            if(m_LoadSelectedTabIndex>=0)
+                tabStrip1.SelectedTabIndex = m_LoadSelectedTabIndex;
+            m_LoadSelectedTabIndex = -1;
+			if(tabStrip1.SelectedTab!=null && tabStrip1.SelectedTab.AttachedControl!=null)
+			{
+				//if(!this.DesignMode)
+					tabStrip1.SelectedTab.AttachedControl.Visible=true;
+			}
+		}
+		#endregion
+
+		#region Properties
+        /// <summary>
+        /// Gets or sets whether tabs use anti-alias smoothing when painted. Default value is false.
+        /// </summary>
+        [DefaultValue(false), Browsable(true), Category("Appearance"), Description("Gets or sets whether tabs use anti-aliasing when painted.")]
+        public bool AntiAlias
+        {
+            get { return tabStrip1.AntiAlias; }
+            set
+            {
+                tabStrip1.AntiAlias = value;
+            }
+        }
+
+		/// <summary>
+		/// Gets or sets whether the tab scrolling is animated.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),Description("Indicates whether the tab scrolling is animanted."),Category("Behavior"),DefaultValue(true)]
+		public bool Animate
+		{
+			get{return tabStrip1.Animate;}
+			set {tabStrip1.Animate=value;}
+		}
+		/// <summary>
+		/// Gets or sets whether system box that enables scrolling and closing of the tabs is automatically hidden when tab items size does not exceed the size of the control.
+		/// </summary>
+		[Browsable(true),DefaultValue(true),Category("Behavior"),Description("Indicates whether system box that enables scrolling and closing of the tabs is automatically hidden when tab items size does not exceed the size of the control.")]
+		public bool AutoHideSystemBox
+		{
+			get {return tabStrip1.AutoHideSystemBox;}
+			set
+			{
+				tabStrip1.AutoHideSystemBox=value;
+				if(this.DesignMode)
+					this.Refresh();
+			}
+		}
+		/// <summary>
+		/// Specifes whether end-user can reorder the tabs.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Behavior"),System.ComponentModel.Description("Specifes whether end-user can reorder the tabs.")]
+		public bool CanReorderTabs
+		{
+			get
+			{
+				return tabStrip1.CanReorderTabs;
+			}
+			set
+			{
+				tabStrip1.CanReorderTabs=value;
+			}
+		}
+
+        /// <summary>
+        /// Gets or sets whether tab is automatically closed when close button is clicked. Closing the tab will remove tab being closed from Tabs collection
+        /// and it will remove the panel as well. Default value is false which means that tab will not be closed and you should handle TabClose event to
+        /// perform desired action as result of user closing the tab.
+        /// </summary>
+        [Browsable(true), DefaultValue(false), Category("Close Button"), Description("Indicates whether tab is automatically closed when close button is clicked.")]
+        public bool AutoCloseTabs
+        {
+            get { return m_AutoCloseTabs; }
+            set { m_AutoCloseTabs = value; }
+        }
+
+		/// <summary>
+		/// Gets or sets whether the Close button that closes the active tab is visible on system box.
+		/// </summary>
+        [Browsable(true), DevCoBrowsable(true), Category("Close Button"), Description("Indicates whether the Close button that closes the active tab is visible."), DefaultValue(false)]
+		public bool CloseButtonVisible
+		{
+			get
+			{
+				return tabStrip1.CloseButtonVisible;
+			}
+			set
+			{
+				tabStrip1.CloseButtonVisible=value;
+			}
+		}
+
+        /// <summary>
+        /// Gets or sets whether close button is visible on each tab instead of in system box.
+        /// </summary>
+        [Browsable(true), DefaultValue(false), DevCoBrowsable(true), Category("Close Button"), Description("Indicates whether close button is visible on each tab instead of in system box.")]
+        public bool CloseButtonOnTabsVisible
+        {
+            get
+            {
+                return tabStrip1.CloseButtonOnTabsVisible;
+            }
+            set
+            {
+                tabStrip1.CloseButtonOnTabsVisible = value;
+                this.Refresh();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether close button on tabs when visible is displayed for every tab state. Default value is true. When set to false
+        /// the close button will be displayed only for selected and tab that mouse is currently over.
+        /// </summary>
+        [Browsable(true), DefaultValue(true), DevCoBrowsable(true), Category("Close Button"), Description("Indicates whether close button on tabs when visible is displayed for every tab state.")]
+        public bool CloseButtonOnTabsAlwaysDisplayed
+        {
+            get
+            {
+                return tabStrip1.CloseButtonOnTabsAlwaysDisplayed;
+            }
+            set
+            {
+                tabStrip1.CloseButtonOnTabsAlwaysDisplayed = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the position of the close button displayed on each tab. Default value is Left.
+        /// </summary>
+        [Browsable(true), DefaultValue(eTabCloseButtonPosition.Left), DevCoBrowsable(true), Category("Close Button"), Description("Indicates position of the close button displayed on each tab.")]
+        public eTabCloseButtonPosition CloseButtonPosition
+        {
+            get { return tabStrip1.CloseButtonPosition; }
+            set
+            {
+                tabStrip1.CloseButtonPosition = value;
+            }
+        }
+
+
+        /// <summary>
+        /// Gets or sets custom image that is used on tabs as Close button that allows user to close the tab.
+        /// Use TabCloseButtonHot property to specify image that is used when mouse is over the close button. Note that image size must
+        /// be same for both images.
+        /// Default value is null
+        /// which means that internal representation of close button is used.
+        /// </summary>
+        [Browsable(true), DefaultValue(null), Category("Close Button"), Description("Indicates custom image that is used on tabs as Close button that allows user to close the tab.")]
+        public Image TabCloseButtonNormal
+        {
+            get { return tabStrip1.TabCloseButtonNormal; }
+            set {tabStrip1.TabCloseButtonNormal = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets custom image that is used on tabs as Close button whem mouse is over the close button.
+        /// To use this property you must set TabCloseButtonNormal as well. Note that image size for both images must be same.
+        /// Default value is null which means that internal representation of close button is used.
+        /// </summary>
+        [Browsable(true), DefaultValue(null), Category("Close Button"), Description("Indicates custom image that is used on tabs as Close button whem mouse is over the close button.")]
+        public Image TabCloseButtonHot
+        {
+            get { return tabStrip1.TabCloseButtonHot; }
+            set {tabStrip1.TabCloseButtonHot = value;}
+        }
+
+		/// <summary>
+		/// Gets or sets whether only selected tab is displaying it's text.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),Category("Behavior"),Description("Specifes whether only selected tab is displaying it's text."),DefaultValue(false)]
+		public bool DisplaySelectedTextOnly
+		{
+			get {return tabStrip1.DisplaySelectedTextOnly;}
+			set
+			{
+				tabStrip1.DisplaySelectedTextOnly=value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the image list used by tab items.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),Category("Appearance"),DefaultValue(null)]
+		public System.Windows.Forms.ImageList ImageList
+		{
+			get
+			{
+				return tabStrip1.ImageList;
+			}
+			set
+			{
+				tabStrip1.ImageList=value;
+			}
+		}
+		/// <summary>
+		/// Gets or sets scrolling offset of the first tab. You can use this property to programmatically scroll the tab strip.
+		/// </summary>
+		[Browsable(false),DevCoBrowsable(false),DefaultValue(0),DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public int ScrollOffset
+		{
+			get {return tabStrip1.ScrollOffset;}
+			set {tabStrip1.ScrollOffset=value;}
+		}
+		/// <summary>
+		///     Selects previous visible tab. Returns true if previous tab was found for selection.
+		/// </summary>
+		public bool SelectPreviousTab()
+		{
+			return tabStrip1.SelectPreviousTab();
+		}
+		/// <summary>
+		///     Selects next visible tab. Returns true if next tab was found for selection.
+		/// </summary>
+		public bool SelectNextTab()
+		{
+			return tabStrip1.SelectNextTab();
+		}
+		/// <summary>
+		/// Gets or sets Tab Control style. Theme style is supported only on themed OS and only for bottom or top aligned tabs.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),Category("Appearance"),Description("Specifies the Tab Control style."),DefaultValue(eTabStripStyle.OneNote)]
+		public eTabStripStyle Style
+		{
+			get
+			{
+				return tabStrip1.Style;
+			}
+			set
+			{
+				tabStrip1.Style=value;
+				this.SyncTabStripSize();
+				this.RefreshPanelsStyle();
+				if(this.DesignMode)
+					this.Refresh();
+			}
+		}
+
+        protected override void OnParentChanged(EventArgs e)
+        {
+            if (this.Style == eTabStripStyle.Office2007Dock || this.Style == eTabStripStyle.Office2007Document)
+            {
+                tabStrip1.Style = this.Style;
+                this.RefreshPanelsStyle();
+            }
+            base.OnParentChanged(e);
+        }
+
+		/// <summary>
+		/// Specifies whether tab is drawn using Themes when running on OS that supports themes like Windows XP.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DevCoBrowsable(true),System.ComponentModel.DefaultValue(false),System.ComponentModel.Category("Appearance"),System.ComponentModel.Description("Specifies whether tab is drawn using Themes when running on OS that supports themes like Windows XP.")]
+		public virtual bool ThemeAware
+		{
+			get
+			{
+				return tabStrip1.ThemeAware;
+			}
+			set
+			{
+				tabStrip1.ThemeAware=value;
+				this.RefreshPanelsStyle();
+				if(this.DesignMode)
+					this.Refresh();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets whether tabs are scrolled continuously while mouse is pressed over the scroll tab button.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DevCoBrowsable(true),System.ComponentModel.DefaultValue(false),System.ComponentModel.Category("Behavior"),System.ComponentModel.Description("Indicates whether tabs are scrolled continuously while mouse is pressed over the scroll tab button.")]
+		public virtual bool TabScrollAutoRepeat
+		{
+			get
+			{
+				return tabStrip1.TabScrollAutoRepeat;
+			}
+			set
+			{
+				tabStrip1.TabScrollAutoRepeat=value;                
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the auto-repeat interval for the tab scrolling while mouse button is kept pressed over the scroll tab button.
+		/// </summary>
+		[System.ComponentModel.Browsable(true),DevCoBrowsable(true),System.ComponentModel.DefaultValue(300),System.ComponentModel.Category("Behavior"),System.ComponentModel.Description("Indicates auto-repeat interval for the tab scrolling while mouse button is kept pressed over the scroll tab button.")]
+		public virtual int TabScrollRepeatInterval
+		{
+			get
+			{
+				return tabStrip1.TabScrollRepeatInterval;
+			}
+			set
+			{
+				tabStrip1.TabScrollRepeatInterval=value;                
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets Tab Color Scheme.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),Category("Style"),Description("Gets or sets Tab Color Scheme."),DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+		public TabColorScheme ColorScheme
+		{
+			get {return tabStrip1.ColorScheme;}
+			set
+			{
+				tabStrip1.ColorScheme=value;
+				if(this.DesignMode)
+					this.Refresh();
+			}
+		}
+		[Browsable(false),EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeColorScheme()
+		{
+			return tabStrip1.ColorScheme.SchemeChanged;
+		}
+		/// <summary>
+		/// Resets color scheme to default value.
+		/// </summary>
+		public void ResetColorScheme()
+		{
+			tabStrip1.ResetColorScheme();
+			if(this.DesignMode)
+				this.Refresh();
+		}
+
+		/// <summary>
+		/// Gets or sets the tab alignment within the Tab-Strip control.
+		/// </summary>
+		[DefaultValue(eTabStripAlignment.Top),Browsable(true),DevCoBrowsable(true),Category("Appearance"),Description("Indicates the tab alignment within the Tab-Strip control.")]
+		public eTabStripAlignment TabAlignment
+		{
+			get {return tabStrip1.TabAlignment;}
+			set
+			{
+				if(tabStrip1.TabAlignment==value)
+					return;
+				this.SuspendLayout();
+				try
+				{
+					switch(value)
+					{
+						case eTabStripAlignment.Top:
+							tabStrip1.Dock=DockStyle.Top;
+							break;
+						case eTabStripAlignment.Bottom:
+							tabStrip1.Dock=DockStyle.Bottom;
+							break;
+						case eTabStripAlignment.Left:
+							tabStrip1.Dock=DockStyle.Left;
+							break;
+						case eTabStripAlignment.Right:
+							tabStrip1.Dock=DockStyle.Right;
+							break;
+					}
+					tabStrip1.TabAlignment=value;
+					RefreshPanelsStyle();
+				}
+				finally
+				{
+					this.ResumeLayout(true);
+				}
+                if (this.Visible)
+                    SyncTabStripSize();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the selected tab.
+		/// </summary>
+		[Browsable(false),DevCoBrowsable(false),Category("Behavior"),Description("Indicates selected tab."),DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public TabItem SelectedTab
+		{
+			get
+			{
+				return tabStrip1.SelectedTab;
+			}
+			set
+			{
+				tabStrip1.SelectedTab=value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the selected tab Font
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),Category("Style"),DefaultValue(null),Description("Gets or sets the selected tab Font")]
+		public System.Drawing.Font SelectedTabFont
+		{
+			get
+			{
+				return tabStrip1.SelectedTabFont;
+			}
+			set
+			{
+				tabStrip1.SelectedTabFont=value;
+			}
+		}
+		[System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+		public void ResetSelectedTabFont()
+		{
+			tabStrip1.ResetSelectedTabFont();
+		}
+
+		/// <summary>
+		/// Gets or sets whether focus rectangle is displayed on the tab when tab has input focus.
+		/// </summary>
+		[Browsable(true),DefaultValue(true),Category("Behavior"),Description("Indicates whether focus rectangle is displayed on the tab when tab has input focus.")]
+		public bool ShowFocusRectangle
+		{
+			get {return tabStrip1.ShowFocusRectangle;}
+			set {tabStrip1.ShowFocusRectangle=value;}
+		}
+
+        /// <summary>
+        /// Gets or sets whether keyboard navigation using Left and Right arrow keys to select tabs is enabled. Default value is true.
+        /// </summary>
+        [Category("Behavior"), DefaultValue(true), Description("Indicates whether keyboard navigation using Left and Right arrow keys to select tabs is enabled.")]
+        public bool KeyboardNavigationEnabled
+        {
+            get { return tabStrip1.KeyboardNavigationEnabled; }
+            set
+            {
+                tabStrip1.KeyboardNavigationEnabled = value;
+            }
+        }
+
+		/// <summary>
+		/// Gets or sets the index of the selected tab.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),Category("Behavior"),Description("Indicates the index of selected tab.")]
+		public int SelectedTabIndex
+		{
+            get { return tabStrip1.SelectedTabIndex; }
+			set
+			{
+                if (m_Initializing)
+                    m_LoadSelectedTabIndex = value;
+                else
+                    tabStrip1.SelectedTabIndex = value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets selected tab panel.
+		/// </summary>
+		[Browsable(false),DevCoBrowsable(false),DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public TabControlPanel SelectedPanel
+		{
+			get
+			{
+				if(tabStrip1.SelectedTab!=null)
+					return tabStrip1.SelectedTab.AttachedControl as TabControlPanel;
+				return null;
+			}
+			set
+			{
+				if(value!=null && this.Controls.Contains(value) && value.TabItem!=null && this.Tabs.Contains(value.TabItem))
+				{
+					tabStrip1.SelectedTab=value.TabItem;
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the type of the tab layout.
+		/// </summary>
+		[Browsable(true),DefaultValue(eTabLayoutType.FitContainer),Category("Appearance"),Description("Indicates the type of the tab layout.")]
+		public eTabLayoutType TabLayoutType
+		{
+			get {return tabStrip1.TabLayoutType;}
+			set {tabStrip1.TabLayoutType=value;}
+		}
+
+        /// <summary>
+        /// Indicates whether selected tab is aligned with the panel in multiple lines use case.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), DefaultValue(true), Description("Indicates whether selected tab is aligned with the panel in multiple lines use case.")]
+        public bool MultiLinePanelAlignSelectedTab
+        {
+            get { return tabStrip1.MultiLinePanelAlignSelectedTab; }
+            set { tabStrip1.MultiLinePanelAlignSelectedTab = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the fixed tab size in pixels. Either Height or Width can be set or both.
+        /// Value of 0 indicates that size is automatically calculated which is
+        /// default behavior.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), Description("Gets or sets the fixed tab size in pixels. Either Height or Width can be set or both.")]
+        public Size FixedTabSize
+        {
+            get { return tabStrip1.FixedTabSize; }
+            set
+            {
+                tabStrip1.FixedTabSize = value;
+                this.RecalcLayout();
+            }
+        }
+        /// <summary>
+        /// Memeber used by Windows Forms designer.
+        /// </summary>
+        /// <returns>true if property should be serialized.</returns>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeFixedTabSize()
+        {
+            return tabStrip1.ShouldSerializeFixedTabSize();
+        }
+        /// <summary>
+        /// Memeber used by Windows Forms designer to reset property to default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetFixedTabSize()
+        {
+            TypeDescriptor.GetProperties(this)["FixedTabSize"].SetValue(this, Size.Empty);
+        }
+		#endregion
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TabControl.resx b/PROMS/DotNetBar Source Code/TabControl.resx
new file mode 100644
index 00000000..b7e8e674
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TabControl.resx	
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+            Microsoft ResX Schema 
+        
+            Version 1.3
+                
+            The primary goals of this format is to allow a simple XML format 
+            that is mostly human readable. The generation and parsing of the 
+            various data types are done through the TypeConverter classes 
+            associated with the data types.
+        
+            Example:
+        
+                ... ado.net/XML headers & schema ...
+                <resheader name="resmimetype">text/microsoft-resx</resheader>
+                <resheader name="version">1.3</resheader>
+                <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+                <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+                <data name="Name1">this is my long string</data>
+                <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+                <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+                    [base64 mime encoded serialized .NET Framework object]
+                </data>
+                <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+                    [base64 mime encoded string representing a byte array form of the .NET Framework object]
+                </data>
+        
+            There are any number of "resheader" rows that contain simple 
+            name/value pairs.
+            
+            Each data row contains a name, and value. The row also contains a 
+            type or mimetype. Type corresponds to a .NET class that support 
+            text/value conversion through the TypeConverter architecture. 
+            Classes that don't support this are serialized and stored with the 
+            mimetype set.
+                     
+            The mimetype is used for serialized objects, and tells the 
+            ResXResourceReader how to depersist the object. This is currently not 
+            extensible. For a given mimetype the value must be set accordingly:
+        
+            Note - application/x-microsoft.net.object.binary.base64 is the format 
+                   that the ResXResourceWriter will generate, however the reader can 
+                   read any of the formats listed below.
+        
+            mimetype: application/x-microsoft.net.object.binary.base64
+            value   : The object must be serialized with 
+                    : System.Serialization.Formatters.Binary.BinaryFormatter
+                    : and then encoded with base64 encoding.
+        
+            mimetype: application/x-microsoft.net.object.soap.base64
+            value   : The object must be serialized with 
+                    : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+                    : and then encoded with base64 encoding.
+            mimetype: application/x-microsoft.net.object.bytearray.base64
+            value   : The object must be serialized into a byte array 
+                    : using a System.ComponentModel.TypeConverter
+                    : and then encoded with base64 encoding.
+        -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>1.3</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="$this.Name">
+    <value>TabControl</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/TabControlDesigner.cs b/PROMS/DotNetBar Source Code/TabControlDesigner.cs
new file mode 100644
index 00000000..c42e57e5
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TabControlDesigner.cs	
@@ -0,0 +1,130 @@
+using System;
+using System.Windows.Forms;
+using System.Windows.Forms.Design;
+using System.Collections;
+using System.Drawing;
+using System.ComponentModel.Design;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Summary description for TabControlDesigner.
+	/// </summary>
+	public class TabControlDesigner:TabStripDesigner
+	{
+		public TabControlDesigner()
+		{
+		}
+
+		protected override void CreateNewTab(object sender, EventArgs e)
+		{
+			IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+			TabControl tabControl=this.Control as TabControl;
+			if(tabControl==null || dh==null)
+				return;
+
+			IComponentChangeService change=this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+			if(change!=null)
+				change.OnComponentChanging(this.Component,null);
+
+			TabItem tab=dh.CreateComponent(typeof(TabItem)) as TabItem;
+			tab.Text=tab.Name;
+
+			TabControlPanel panel=dh.CreateComponent(typeof(TabControlPanel)) as TabControlPanel;
+			tabControl.ApplyDefaultPanelStyle(panel);
+			tab.AttachedControl=panel;
+			panel.TabItem=tab;
+			
+			tabControl.Tabs.Add(tab);
+			tabControl.Controls.Add(panel);
+			panel.Dock=DockStyle.Fill;
+			panel.SendToBack();
+			
+			tabControl.RecalcLayout();
+
+			if(change!=null)
+				change.OnComponentChanged(this.Component,null,null,null);
+
+			if(change!=null)
+			{
+				change.OnComponentChanging(panel,null);
+				change.OnComponentChanged(panel,null,null,null);
+			}
+		}
+
+		public override bool CanParent(Control c)
+		{
+			if(c is TabControlPanel)
+				return true;
+			return false;
+		}
+
+		protected override void InternalComponentRemoving(ComponentEventArgs e)
+		{
+			if(m_InternalRemove)
+				return;
+			IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+			if(dh==null)
+				return;
+
+			if(e.Component is TabControlPanel && this.Control!=null && this.Control.Controls.Contains(e.Component as Control))
+			{
+				try
+				{
+					TabControlPanel panel=e.Component as TabControlPanel;
+					if(panel.TabItem!=null)
+					{
+						TabControl tabControl=this.Control as TabControl;
+						tabControl.Tabs.Remove(panel.TabItem);
+						dh.DestroyComponent(panel.TabItem);
+					}
+				}
+				finally
+				{
+					m_InternalRemove=false;
+				}
+			}
+			else if(e.Component is TabItem && this.Control!=null && ((TabControl)this.Control).Tabs.Contains(e.Component as TabItem))
+			{
+				try
+				{
+					TabItem item=e.Component as TabItem;
+					if(item.AttachedControl!=null && this.Control.Controls.Contains(item.AttachedControl))
+					{
+						TabControl tabControl=this.Control as TabControl;
+						tabControl.Controls.Remove(item.AttachedControl);
+						dh.DestroyComponent(item.AttachedControl);
+					}
+				}
+				finally
+				{
+					m_InternalRemove=false;
+				}
+			}
+		}
+
+		protected override TabStrip GetTabStrip()
+		{
+			if(this.Control==null || !(this.Control is TabControl))
+				return null;
+			return ((TabControl)this.Control).TabStrip;
+		}
+
+		public override System.Collections.ICollection AssociatedComponents
+		{
+			get
+			{
+				ArrayList c=new ArrayList(base.AssociatedComponents);
+				TabControl tabControl=this.Control as TabControl;
+				if(tabControl!=null)
+				{
+					foreach(TabItem tab in tabControl.Tabs)
+						c.Add(tab);
+				}
+
+				return c;
+			}
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TabControlPanel.cs b/PROMS/DotNetBar Source Code/TabControlPanel.cs
new file mode 100644
index 00000000..6456b4f5
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TabControlPanel.cs	
@@ -0,0 +1,170 @@
+using System;
+using System.Windows.Forms;
+using System.Windows.Forms.Design;
+using System.Collections;
+using System.Drawing;
+using System.ComponentModel.Design;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Represents Panel for the Tab Control.
+	/// </summary>
+    [ToolboxItem(false), Designer("DevComponents.DotNetBar.Design.TabControlPanelDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+	public class TabControlPanel:PanelEx
+	{
+		#region Private Variables
+		private const string INFO_TEXT="Drop controls on this panel to associate them with currently selected tab.";
+		private TabItem m_Tab=null;
+		private bool m_UseCustomStyle=false;
+		#endregion
+
+		#region Internal Implementation
+		/// <summary>
+		/// Default constructor.
+		/// </summary>
+		public TabControlPanel():base()
+		{
+			DockPadding.All = 1;
+			this.BackColor=SystemColors.Control;
+		}
+
+		private Rectangle GetThemedRect(Rectangle r)
+		{
+			const int offset=6;
+
+			switch(m_Tab.Parent.TabAlignment)
+			{
+				case eTabStripAlignment.Top:
+				{
+					r.Y-=offset;
+					r.Height+=offset;
+					break;
+				}
+				case eTabStripAlignment.Left:
+				{
+					r.X-=offset;
+					r.Width+=offset;
+					break;
+				}
+				case eTabStripAlignment.Right:
+				{
+					r.Width+=offset;
+					break;
+				}
+				case eTabStripAlignment.Bottom:
+				{
+					r.Height+=offset;
+					break;
+				}
+					
+			}
+			return r;
+		}
+		
+		protected override void OnPaint(PaintEventArgs e)
+		{
+            if (this.ClientRectangle.Width == 0 || this.ClientRectangle.Height == 0 || this.Parent is TabControl && ((TabControl)this.Parent).SelectedPanel!=this)
+                return;
+			bool baseCall=true;
+			if(DrawThemedPane && BarFunctions.ThemedOS && m_Tab!=null && m_Tab.Parent!=null)
+			{
+				Rectangle r=GetThemedRect(this.ClientRectangle);
+				
+					Rectangle rTemp=new Rectangle(0,0,r.Width,r.Height);
+					if(m_Tab.Parent.TabAlignment==eTabStripAlignment.Right || m_Tab.Parent.TabAlignment==eTabStripAlignment.Left)
+						rTemp=new Rectangle(0,0,rTemp.Height,rTemp.Width);
+					if(m_ThemeCachedBitmap==null || m_ThemeCachedBitmap.Size!=rTemp.Size)
+					{
+						DisposeThemeCachedBitmap();
+						Bitmap bmp=new Bitmap(rTemp.Width,rTemp.Height,e.Graphics);
+						try
+						{
+							Graphics gTemp=Graphics.FromImage(bmp);
+							try
+							{
+								using(SolidBrush brush=new SolidBrush(Color.Transparent))
+									gTemp.FillRectangle(brush,0,0,bmp.Width,bmp.Height);
+								this.ThemeTab.DrawBackground(gTemp,ThemeTabParts.Pane,ThemeTabStates.Normal,rTemp);
+							}
+							finally
+							{
+								gTemp.Dispose();
+							}
+						}
+						finally
+						{
+							if(m_Tab.Parent.TabAlignment==eTabStripAlignment.Left)
+								bmp.RotateFlip(RotateFlipType.Rotate270FlipNone);
+							else if(m_Tab.Parent.TabAlignment==eTabStripAlignment.Right)
+								bmp.RotateFlip(RotateFlipType.Rotate90FlipNone);
+							else if(m_Tab.Parent.TabAlignment==eTabStripAlignment.Bottom)
+								bmp.RotateFlip(RotateFlipType.Rotate180FlipNone);
+							e.Graphics.DrawImageUnscaled(bmp,r.X,r.Y);							
+							m_ThemeCachedBitmap=bmp;
+						}
+					}
+					else
+						e.Graphics.DrawImageUnscaled(m_ThemeCachedBitmap,r.X,r.Y);
+
+				baseCall=false;
+			}
+
+			if(baseCall)
+				base.OnPaint(e);
+
+			if(this.DesignMode && this.Controls.Count==0 && this.Text=="")
+			{
+				Rectangle r=this.ClientRectangle;
+				r.Inflate(-2,-2);
+                eTextFormat sf = eTextFormat.Default | eTextFormat.VerticalCenter | 
+                    eTextFormat.HorizontalCenter | eTextFormat.EndEllipsis | eTextFormat.WordBreak;
+				Font font=new Font(this.Font,FontStyle.Bold);
+				TextDrawing.DrawString(e.Graphics,INFO_TEXT,font,ControlPaint.Dark(this.Style.BackColor1.Color),r,sf);
+				font.Dispose();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets TabItem that this panel is attached to.
+		/// </summary>
+		[Browsable(false),DefaultValue(null)]
+		public TabItem TabItem
+		{
+			get {return m_Tab;}
+			set
+			{
+				m_Tab=value;
+			}
+		}
+
+		/// <summary>
+		/// Indicates whether style of the panel is managed by tab control automatically.
+		/// Set this to true if you would like to control style of the panel.
+		/// </summary>
+		[Browsable(true),DefaultValue(false),Category("Appearance"),Description("Indicates whether style of the panel is managed by tab control automatically. Set this to true if you would like to control style of the panel.")]
+		public bool UseCustomStyle
+		{
+			get {return m_UseCustomStyle;}
+			set {m_UseCustomStyle=value;}
+		}
+
+		protected override void OnResize(EventArgs e)
+		{
+			DisposeThemeCachedBitmap();
+			base.OnResize(e);
+		}
+
+		/// <summary>
+		/// Gets or sets which edge of the parent container a control is docked to.
+		/// </summary>
+		[Browsable(false),DefaultValue(DockStyle.None)]
+		public override DockStyle Dock
+		{
+			get {return base.Dock;}
+			set {base.Dock=value;}
+		}
+		#endregion
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TabItem.cs b/PROMS/DotNetBar Source Code/TabItem.cs
new file mode 100644
index 00000000..2b5618c7
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TabItem.cs	
@@ -0,0 +1,771 @@
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Runtime.InteropServices;
+using System.Windows.Forms;
+using DevComponents.Editors;
+using DevComponents.UI.ContentManager;
+using System;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Represents the Tab on the Tab-Strip control.
+	/// </summary>
+    [Designer("DevComponents.DotNetBar.Design.TabItemDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf"), ToolboxItem(false), ComVisible(false), DesignTimeVisible(false)]
+	public class TabItem : Component, IBlock, ISimpleTab
+	{
+		#region Private Properties
+		private int m_ImageIndex=-1;
+		private Image m_Image;
+		private Icon m_Icon;
+		private string m_Text="";
+		private TabStrip m_Parent=null;
+		private bool m_Visible=true;
+		private Rectangle m_DisplayRectangle=Rectangle.Empty;
+		private BaseItem m_DotNetBarItem=null;
+		private Control m_BoundControl=null;
+		private object m_ItemData=null;
+		
+		private Color m_BackColor=Color.Empty;
+		private Color m_BackColor2=Color.Empty;
+		private int m_BackColorGradientAngle=90;
+		private Color m_LightBorderColor=Color.Empty;
+		private Color m_DarkBorderColor=Color.Empty;
+		private Color m_BorderColor=Color.Empty;
+		private Color m_TextColor=Color.Empty;
+		private string m_Name="";
+		private eTabItemColor m_PredefinedColor=eTabItemColor.Default;
+		private object m_Tag=null;
+		private string m_Tooltip="";
+        private Rectangle m_CloseButtonBounds = Rectangle.Empty;
+        private bool m_CloseButtonMouseOver = false;
+        private bool m_CloseButtonVisible = true;
+		#endregion
+
+        #region Events
+        /// <summary>
+        /// Occurs when mouse is pressed over the tab item.
+        /// </summary>
+        public event MouseEventHandler MouseDown;
+        /// <summary>
+        /// Occurs when mouse button is released over the tab item.
+        /// </summary>
+        public event MouseEventHandler MouseUp;
+        /// <summary>
+        /// Occurs when mouse hovers over the tab item.
+        /// </summary>
+        public event EventHandler MouseHover;
+        /// <summary>
+        /// Occurs when mouse enters the tab item.
+        /// </summary>
+        public event EventHandler MouseEnter;
+        /// <summary>
+        /// Occurs when mouse leaves the tab item.
+        /// </summary>
+        public event EventHandler MouseLeave;
+        /// <summary>
+        /// Occurs when mouse moves over the tab item.
+        /// </summary>
+        public event MouseEventHandler MouseMove;
+        /// <summary>
+        /// Occurs when mouse click is performed on the tab item.
+        /// </summary>
+        public event EventHandler Click;
+        #endregion
+
+        #region Properties, Constructor
+        /// <summary>
+		/// Default constructor.
+		/// </summary>
+		/// <param name="container">Container object.</param>
+		public TabItem(IContainer container)
+		{
+			container.Add(this);
+		}
+		/// <summary>
+		/// Default constructor.
+		/// </summary>
+		public TabItem()
+		{
+		}
+
+        /// <summary>
+        /// Gets the AccessibleObject assigned to the item.
+        /// </summary>
+        [System.ComponentModel.Browsable(false), DevCoBrowsable(false)]
+        public virtual System.Windows.Forms.AccessibleObject AccessibleObject
+        {
+            get
+            {
+                return CreateAccessibilityInstance(); //m_Accessible;
+            }
+        }
+
+        private TabItemAccessibleObject _ItemAccessibleObject = null;
+        protected virtual System.Windows.Forms.AccessibleObject CreateAccessibilityInstance()
+        {
+            if (_ItemAccessibleObject == null)
+                _ItemAccessibleObject = new TabItemAccessibleObject(this);
+            return _ItemAccessibleObject;
+        }
+
+		/// <summary>
+		/// Gets or sets the tab Image index.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),DefaultValue(-1),Category("Appearance"),Description("Indicates the tab image index"),Editor("DevComponents.DotNetBar.Design.ImageIndexEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(UITypeEditor)),TypeConverter(typeof(ImageIndexConverter))]
+		public int ImageIndex
+		{
+			get {return m_ImageIndex;}
+			set
+			{
+				if(m_ImageIndex==value)
+					return;
+				m_ImageIndex=value;
+				if(m_Parent!=null)
+				{
+					m_Parent.NeedRecalcSize=true;
+					m_Parent.ResetTabHeight();
+				}
+                Refresh();
+				OnImageChanged();
+			}
+		}
+		[Browsable(false),DevCoBrowsable(false),EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetImageIndex()
+		{
+			this.ImageIndex=-1;
+		}
+		// Property Editor support for ImageIndex selection
+		[Browsable(false),EditorBrowsable(EditorBrowsableState.Never)]
+		public ImageList ImageList
+		{
+			get
+			{
+				if(m_Parent!=null)
+					return m_Parent.ImageList;
+				return null;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the tab image.
+        /// </summary>
+        [Browsable(true),DevCoBrowsable(true),DefaultValue(null),Category("Appearance"),Description("Indicates the tab image.")]
+		public Image Image
+		{
+			get {return m_Image;}
+			set
+			{
+				if(m_Image==value)
+					return;
+				m_Image=value;
+				if(m_Parent!=null)
+				{
+					m_Parent.NeedRecalcSize=true;
+					m_Parent.ResetTabHeight();
+				}
+				Refresh();
+				OnImageChanged();
+			}
+		}
+		[Browsable(false),DevCoBrowsable(false),EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetImage()
+		{
+			this.Image=null;
+		}
+
+		/// <summary>
+		/// Gets or sets the tab icon. Icon has same functionality as Image except that it support Alpha blending.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),DefaultValue(null),Category("Appearance"),Description("Indicates the tab icon. Icon has same functionality as Image except that it support Alpha blending.")]
+		public Icon Icon
+		{
+			get {return m_Icon;}
+			set
+			{
+				if(m_Icon==value)
+					return;
+				m_Icon=value;
+				if(m_Parent!=null)
+				{
+					m_Parent.NeedRecalcSize=true;
+					m_Parent.ResetTabHeight();
+				}
+				Refresh();
+				OnImageChanged();
+			}
+		}
+		[Browsable(false),DevCoBrowsable(false),EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetIcon()
+		{
+			this.Icon=null;
+		}
+
+		/// <summary>
+		/// Gets or sets the text displayed on the tab.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),Category("Appearance"),Description("Indicates the text displayed on the tab."),Localizable(true)]
+		public string Text
+		{
+			get {return m_Text;}
+			set
+			{
+				if(m_Text==value)
+					return;
+				m_Text=value;
+				if(m_Parent!=null)
+					m_Parent.NeedRecalcSize=true;
+				Refresh();
+				OnTextChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets whether tab is visible.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),DefaultValue(true),Category("Behavior"),Description("Indicates whether the tab is visible.")]
+		public bool Visible
+		{
+			get{return m_Visible;}
+			set
+			{
+				if(m_Visible==value)
+					return;
+				m_Visible=value;
+				if(m_Parent!=null)
+					m_Parent.OnTabVisibleChanged(this);
+				Refresh();
+			}
+		}
+
+		private void Refresh()
+		{
+			if(m_Parent!=null)
+				m_Parent.Refresh();
+		}
+
+		/// <summary>
+		/// Gets the display bounds of the tab.
+		/// </summary>
+		[Browsable(false),DevCoBrowsable(false)]
+		public Rectangle DisplayRectangle
+		{
+			get {return m_DisplayRectangle;}
+		}
+
+        /// <summary>
+        /// Gets or sets the bounds of the close button rectangle if displayed on the tab. You should not set value of this property.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public Rectangle CloseButtonBounds
+        {
+            get { return m_CloseButtonBounds; }
+            set { m_CloseButtonBounds = value; }
+        }
+
+		internal Rectangle _DisplayRectangle
+		{
+			get {return m_DisplayRectangle;}
+			set {m_DisplayRectangle=value;}
+		}
+        [EditorBrowsable(EditorBrowsableState.Never), Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public BaseItem AttachedItem
+		{
+			get {return m_DotNetBarItem;}
+			set {m_DotNetBarItem=value;}
+		}
+
+        [Browsable(false)]
+        internal bool CloseButtonMouseOver
+        {
+            get { return m_CloseButtonMouseOver; }
+            set { m_CloseButtonMouseOver = value; }
+        }
+
+		/// <summary>
+		/// Gets or sets the control that is attached to this tab. When tab is selected the control Visible property is set to true and when tab is unselected the control Visible property is set to false.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),DefaultValue(null),Category("Behavior"),Description("Indicates the control that is attached to this tab.")]
+		public Control AttachedControl
+		{
+			get {return m_BoundControl;}
+			set
+			{
+				m_BoundControl=value;
+				if(m_BoundControl!=null)
+				{
+                    if (m_Parent != null && !m_Parent.MdiTabbedDocuments /*&& (BarFunctions.IsHandleValid(m_Parent) || !(m_BoundControl is TabControlPanel))*/)
+					{
+						if(m_Parent.SelectedTab==this)
+							m_BoundControl.Visible=true;
+						else
+							m_BoundControl.Visible=false;
+					}
+				}
+			}
+		}
+
+		public TabStrip Parent
+		{
+			get
+			{
+				return m_Parent;
+			}
+		}
+
+		[Browsable(false),DevCoBrowsable(true),DefaultValue(null)]
+		public object ItemData
+		{
+			get {return m_ItemData;}
+			set {m_ItemData=value;}
+		}
+
+		internal void SetParent(TabStrip tabstrip)
+		{
+			m_Parent=tabstrip;
+		}
+
+		internal Image GetImage()
+		{
+			if(m_Image!=null)
+				return m_Image;
+			if(m_ImageIndex>=0 && m_Parent!=null && m_Parent.ImageList!=null && m_ImageIndex<m_Parent.ImageList.Images.Count)
+				return m_Parent.ImageList.Images[m_ImageIndex];
+			return null;
+		}
+
+		internal Size IconSize
+		{
+			get
+			{
+				return new Size(Dpi.Width16,Dpi.Height16);
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the background color of the tab when inactive.
+		/// </summary>
+		[Browsable(true),Description("Indicates the inactive tab background color."),Category("Style")]
+		public Color BackColor
+		{
+			get {return m_BackColor;}
+			set
+			{
+				m_BackColor=value;
+				this.Refresh();
+			}
+		}
+		[Browsable(false),EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeBackColor()
+		{
+			return !m_BackColor.IsEmpty;
+		}
+		[Browsable(false),EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetBackColor()
+		{
+			BackColor=Color.Empty;
+		}
+
+		/// <summary>
+		/// Gets or sets the target gradient background color of the tab when inactive.
+		/// </summary>
+		[Browsable(true),Description("Indicates the inactive tab target gradient background color."),Category("Style")]
+		public Color BackColor2
+		{
+			get {return m_BackColor2;}
+			set
+			{
+				m_BackColor2=value;
+				this.Refresh();
+			}
+		}
+		[Browsable(false),EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeBackColor2()
+		{
+			return !m_BackColor2.IsEmpty;
+		}
+		[Browsable(false),EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetBackColor2()
+		{
+			BackColor2=Color.Empty;
+		}
+
+		/// <summary>
+		/// Gets or sets the gradient angle.
+		/// </summary>
+		[Browsable(true),Description("Indicates the gradient angle."),Category("Style"),DefaultValue(90)]
+		public int BackColorGradientAngle
+		{
+			get {return m_BackColorGradientAngle;}
+			set {m_BackColorGradientAngle=value;this.Refresh();}
+		}
+
+		/// <summary>
+		/// Gets or sets the light border color when tab is inactive.
+		/// </summary>
+		[Browsable(true),Description("Indicates the inactive tab light border color."),Category("Style")]
+		public Color LightBorderColor
+		{
+			get {return m_LightBorderColor;}
+			set
+			{
+				m_LightBorderColor=value;
+				this.Refresh();
+			}
+		}
+		[Browsable(false),EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeLightBorderColor()
+		{
+			return !m_LightBorderColor.IsEmpty;
+		}
+		[Browsable(false),EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetLightBorderColor()
+		{
+			LightBorderColor=Color.Empty;
+		}
+
+		/// <summary>
+		/// Gets or sets the dark border color when tab is inactive.
+		/// </summary>
+		[Browsable(true),Description("Indicates the inactive tab dark border color."),Category("Style")]
+		public Color DarkBorderColor
+		{
+			get {return m_DarkBorderColor;}
+			set
+			{
+				m_DarkBorderColor=value;
+				this.Refresh();
+			}
+		}
+		[Browsable(false),EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeDarkBorderColor()
+		{
+			return !m_DarkBorderColor.IsEmpty;
+		}
+		[Browsable(false),EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetDarkBorderColor()
+		{
+			DarkBorderColor=Color.Empty;
+		}
+
+		/// <summary>
+		/// Gets or sets the border color when tab is inactive.
+		/// </summary>
+		[Browsable(true),Description("Indicates the inactive tab border color."),Category("Style")]
+		public Color BorderColor
+		{
+			get {return m_BorderColor;}
+			set
+			{
+				m_BorderColor=value;
+				this.Refresh();
+			}
+		}
+		[Browsable(false),EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeBorderColor()
+		{
+			return !m_BorderColor.IsEmpty;
+		}
+		[Browsable(false),EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetBorderColor()
+		{
+			BorderColor=Color.Empty;
+		}
+
+		/// <summary>
+		/// Gets or sets the text color when tab is inactive.
+		/// </summary>
+		[Browsable(true),Description("Indicates the inactive tab text color."),Category("Style")]
+		public Color TextColor
+		{
+			get {return m_TextColor;}
+			set
+			{
+				m_TextColor=value;
+				this.Refresh();
+			}
+		}
+		[Browsable(false),EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeTextColor()
+		{
+			return !m_TextColor.IsEmpty;
+		}
+		[Browsable(false),EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetTextColor()
+		{
+			TextColor=Color.Empty;
+		}
+
+		public override string ToString()
+		{
+			return m_Text;
+		}
+
+		/// <summary>
+		/// Gets or sets name of the tab item that can be used to identify item from the code.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),Category("Design"),Description("Indicates the name used to identify item.")]
+		public string Name
+		{
+			get
+			{
+				if(this.Site!=null)
+					m_Name=this.Site.Name;
+				return m_Name;
+			}
+			set
+			{
+				if(this.Site!=null)
+					this.Site.Name=value;
+				if(value==null)
+					m_Name="";
+				else
+					m_Name=value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the predefined tab color.
+		/// </summary>
+		[Browsable(true), DefaultValue(eTabItemColor.Default),Category("Style"),Description("Applies predefined color to tab.")]
+		public eTabItemColor PredefinedColor
+		{
+			get {return m_PredefinedColor;}
+			set
+			{
+				m_PredefinedColor=value;
+				TabColorScheme.ApplyPredefinedColor(this,m_PredefinedColor);
+				if(this.DesignMode)
+				{
+					if(m_Parent!=null && m_Parent.Parent is TabControl)
+					{
+						m_Parent.Parent.Invalidate(true);
+						((TabControl)m_Parent.Parent).ApplyDefaultPanelStyle(this.AttachedControl as TabControlPanel);
+						m_Parent.Parent.Update();
+					}
+					else
+						this.Refresh();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets an object that contains data to associate with the item.
+		/// </summary>
+		[Browsable(false),DefaultValue(null)]
+		public object Tag
+		{
+			get
+			{
+				return m_Tag;
+			}
+			set
+			{
+				m_Tag=value;
+			}
+		}
+
+		/// <summary>
+		/// Gets/Sets informational text (tooltip) for the tab.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),DefaultValue(""),Category("Appearance"),Description("Indicates the text that is displayed when mouse hovers over the tab."),Localizable(true)]
+		public string Tooltip
+		{
+			get
+			{
+			
+				return m_Tooltip;
+			}
+			set
+			{
+				m_Tooltip=value;
+			}
+		}
+
+		/// <summary>
+		/// Returns the font for the tab text.
+		/// </summary>
+		/// <returns>Reference to the font object.</returns>
+		public Font GetTabFont()
+		{
+            if (m_Parent != null)
+                return m_Parent.Font;
+            else
+                return SystemFonts.DefaultFont;
+		}
+
+		/// <summary>
+		/// Returns true if tab is selected tab.
+		/// </summary>
+		[Browsable(false)]
+		public bool IsSelected
+		{
+			get
+			{
+				if(m_Parent!=null)
+				{
+					return (m_Parent.SelectedTab==this);
+				}
+				return false;
+			}
+		}
+
+		/// <summary>
+		/// Gets the tab alignment.
+		/// </summary>
+		[Browsable(false)]
+		public eTabStripAlignment TabAlignment
+		{
+			get
+			{
+				return m_Parent.TabAlignment;
+			}
+		}
+
+		/// <summary>
+		/// Returns true if mouse is over the tab.
+		/// </summary>
+		[Browsable(false)]
+		public bool IsMouseOver
+		{
+			get
+			{
+				if(m_Parent!=null)
+					return (m_Parent.MouseOverTab==this);
+				return false;
+			}
+		}
+
+		private void OnImageChanged()
+		{
+			if(this.DesignMode && m_Parent!=null)
+			{
+				if(m_Parent.Parent is TabControl)
+				{
+					((TabControl)m_Parent.Parent).SyncTabStripSize();
+					((TabControl)m_Parent.Parent).RecalcLayout();
+				}
+				else
+				{
+					m_Parent.RecalcSize();
+					m_Parent.Refresh();
+				}
+			}
+		}
+
+		private void OnTextChanged()
+		{
+			this.OnImageChanged();
+		}
+
+        internal void InvokeMouseDown(MouseEventArgs e)
+        {
+            if (MouseDown != null)
+                MouseDown(this, e);
+            if (m_DotNetBarItem != null && m_DotNetBarItem is DockContainerItem)
+                m_DotNetBarItem.InternalMouseDown(e);
+        }
+
+        internal void InvokeMouseUp(MouseEventArgs e)
+        {
+            if (MouseUp != null)
+                MouseUp(this, e);
+            if (m_DotNetBarItem != null && m_DotNetBarItem is DockContainerItem)
+                m_DotNetBarItem.InternalMouseUp(e);
+        }
+
+        /// <summary>
+        /// Raises the Click event.
+        /// </summary>
+        public void PerformClick()
+        {
+            InvokeClick(new EventArgs());
+        }
+
+        internal void InvokeClick(EventArgs e)
+        {
+            if (Click != null)
+                Click(this, e);
+        }
+
+        internal void InvokeMouseEnter(EventArgs e)
+        {
+            if (MouseEnter != null)
+                MouseEnter(this, e);
+            if (m_Parent != null) m_Parent.OnTabMouseEnter(this, e);
+        }
+
+        internal void InvokeMouseLeave(EventArgs e)
+        {
+            if (MouseLeave != null)
+                MouseLeave(this, e);
+            if (m_Parent != null) m_Parent.OnTabMouseLeave(this, e);
+        }
+
+        internal void InvokeMouseHover(EventArgs e)
+        {
+            if (MouseHover != null)
+                MouseHover(this, e);
+            if (m_Parent != null) m_Parent.OnTabMouseHover(this, e);
+        }
+
+        internal void InvokeMouseMove(MouseEventArgs e)
+        {
+            if (MouseMove != null)
+                MouseMove(this, e);
+            if (m_Parent != null) m_Parent.OnTabMouseMove(this, e);
+        }
+
+        /// <summary>
+        /// Gets or sets whether Close button on the tab is visible when TabStrip.CloseButtonOnTabsVisible property is set to true. Default value is true. You can use this property
+        /// to selectively hide Close button on tabs.
+        /// </summary>
+        [Browsable(true), Description("Indicates whether Close button on the tab is visible when TabStrip.CloseButtonOnTabsVisible property is set to true."), DefaultValue(true), Category("Appearance")]
+        public bool CloseButtonVisible
+        {
+            get { return m_CloseButtonVisible; }
+            set
+            {
+                if (m_CloseButtonVisible != value)
+                {
+                    m_CloseButtonVisible = value;
+                    TabStrip ts = m_Parent;
+                    if (ts != null && ts.CloseButtonOnTabsVisible)
+                    {
+                        ts.RecalcSize();
+                        ts.Invalidate();
+                    }
+                }
+            }
+        }
+		#endregion
+
+		#region IBlock
+		/// <summary>
+		/// Gets or sets the bounds of the content block.
+		/// </summary>
+		Rectangle IBlock.Bounds
+		{
+			get
+			{
+				return this._DisplayRectangle;
+			}
+			set
+			{
+				this._DisplayRectangle=value;
+			}
+		}
+        private DevComponents.DotNetBar.Padding _Margin = new DevComponents.DotNetBar.Padding(0);
+        /// <summary>
+        /// Gets or sets item margin only used by certain items in certain containers. Provided only for internal DotNetBar use.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never), Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        DevComponents.DotNetBar.Padding DevComponents.UI.ContentManager.IBlock.Margin
+        {
+            get { return _Margin; }
+            set { _Margin = value; }
+        }
+		#endregion
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TabItemAccessibleObject.cs b/PROMS/DotNetBar Source Code/TabItemAccessibleObject.cs
new file mode 100644
index 00000000..2c6c9b82
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TabItemAccessibleObject.cs	
@@ -0,0 +1,91 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows.Forms;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar
+{
+    public class TabItemAccessibleObject : AccessibleObject
+    {
+        private TabItem _Item;
+        public TabItem Item
+        {
+            get { return _Item; }
+            set { _Item = value; }
+        }
+
+        public TabItemAccessibleObject(TabItem tabItem)
+        {
+            if (tabItem == null)
+            {
+                throw new ArgumentNullException("tabItem");
+            }
+
+            this.Item = tabItem;
+        }
+
+        #region public methods
+
+        public override string Description
+        {
+            get
+            {
+                return Item.Name;
+            }
+        }
+
+        public override string Value
+        {
+            get
+            {
+                return Item.Text;
+            }
+            set
+            {
+                Item.Text = value;
+            }
+        }
+
+        public override AccessibleObject Parent
+        {
+            get
+            {
+                return Item.Parent.AccessibilityObject;
+            }
+        }
+
+        public override System.Drawing.Rectangle Bounds
+        {
+            get
+            {
+                Rectangle bounds = this.Item.DisplayRectangle;
+                Point location = this.Item.Parent.PointToScreen(bounds.Location);
+                return new Rectangle(location, bounds.Size);
+            }
+        }
+
+        public override AccessibleObject Navigate(AccessibleNavigation navdir)
+        {
+            return base.Navigate(navdir);
+        }
+
+        public override void Select(AccessibleSelection flags)
+        {
+            Item.Parent.SelectedTab = Item;
+            base.Select(flags);
+        }
+
+        public override AccessibleRole Role
+        {
+            get
+            {
+                return AccessibleRole.OutlineItem;
+            }
+        }
+
+        #endregion
+
+    }
+}
+
diff --git a/PROMS/DotNetBar Source Code/TabItemLayoutManager.cs b/PROMS/DotNetBar Source Code/TabItemLayoutManager.cs
new file mode 100644
index 00000000..e17dedc2
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TabItemLayoutManager.cs	
@@ -0,0 +1,263 @@
+using System;
+using System.Collections;
+using System.Drawing;
+using System.Windows.Forms.VisualStyles;
+using DevComponents.UI.ContentManager;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Summary description for TabItemLayoutManager.
+	/// </summary>
+	public class TabItemLayoutManager:DevComponents.UI.ContentManager.BlockLayoutManager
+	{
+		private int m_TextPadding=4;
+		private int m_ImagePadding=2;
+		private int m_PaddingHeight=4;
+		private int m_PaddingWidth=0;
+		private bool m_HorizontalText=false;
+		private int m_SelectedPaddingWidth=0;
+        private Size m_FixedTabSize = Size.Empty;
+        private bool m_CloseButtonOnTabs = false;
+        private Size m_CloseButtonSize = new Size(11, 11);
+        private int m_CloseButtonSpacing = 3;
+        private TabStrip m_TabStrip = null;
+
+		public TabItemLayoutManager()
+		{
+		}
+
+        public TabItemLayoutManager(TabStrip tabStrip)
+        {
+            m_TabStrip = tabStrip;
+        }
+
+		/// <summary>
+		/// Resizes the content block and sets it's Bounds property to reflect new size.
+		/// </summary>
+		/// <param name="block">Content block to resize.</param>
+        public override void Layout(IBlock block, Size availableSize)
+		{
+			if(this.Graphics==null)
+				throw(new InvalidOperationException("Graphics property must be set to valid instance of Graphics object."));
+
+			TabItem tab=block as TabItem;
+			if(!tab.Visible)
+				return;
+
+			int width=0;
+			int height=0;
+            bool isVertical = (tab.Parent != null && (tab.Parent.TabAlignment == eTabStripAlignment.Left || tab.Parent.TabAlignment == eTabStripAlignment.Right) && !m_HorizontalText);
+
+			eTabStripStyle style=tab.Parent.Style;
+			eTextFormat strFormat=eTextFormat.Default;
+
+			Image tabImage=tab.GetImage();
+			if(tab.Icon!=null)
+			{
+				width+=tab.IconSize.Width;
+                if (style != eTabStripStyle.OneNote && style != eTabStripStyle.Office2007Document)
+					width+=m_ImagePadding;
+				height=tab.IconSize.Height+m_PaddingHeight;
+			}
+			else if(tabImage!=null)
+			{
+				width+=Dpi.Width(tabImage.Width);
+                if (style != eTabStripStyle.OneNote && style != eTabStripStyle.Office2007Document)
+					width+=Dpi.Width(m_ImagePadding);
+				height=Dpi.Height(tabImage.Height)+Dpi.Height(m_PaddingHeight);
+			}
+
+			if((!tab.Parent.DisplaySelectedTextOnly || tab==tab.Parent.SelectedTab))
+			{
+                string text = tab.Text;
+                if (text == "")
+                    text = "M";
+				Font font=tab.Parent.Font;
+                if (tab.Parent.SelectedTabFont != null && (tab == tab.Parent.SelectedTab || 
+                    tab.Parent.CloseButtonOnTabsAlwaysDisplayed && tab.Parent.CloseButtonPosition == eTabCloseButtonPosition.Right || 
+                    ((tab.Parent.TabAlignment == eTabStripAlignment.Left || tab.Parent.TabAlignment == eTabStripAlignment.Right) && m_HorizontalText)))
+					font=tab.Parent.SelectedTabFont;
+                Size textSize = Size.Empty;
+                if(isVertical)
+                    textSize = TextDrawing.MeasureStringLegacy(this.Graphics, text, font, Size.Empty, strFormat);
+                else
+				    textSize=TextDrawing.MeasureString(this.Graphics,text,font,0,strFormat);
+				width+=textSize.Width;
+				if(style!=eTabStripStyle.OneNote)
+					width+=Dpi.Width(m_TextPadding);
+				if(textSize.Height>height)
+					height=(int)(textSize.Height+Dpi.Height(m_PaddingHeight));
+			}
+
+            if (m_CloseButtonOnTabs && tab.CloseButtonVisible)
+                width += m_CloseButtonSize.Width + m_CloseButtonSpacing * 2;
+
+			width+=m_PaddingWidth;
+			if(tab.IsSelected)
+				width+=m_SelectedPaddingWidth;
+
+            if (m_FixedTabSize.Width > 0)
+                width = m_FixedTabSize.Width;
+            if (m_FixedTabSize.Height > 0)
+                height = m_FixedTabSize.Height;
+
+            if (style == eTabStripStyle.OneNote || style == eTabStripStyle.Office2007Document)
+                width += (int)(height * .5)-4;
+
+            Rectangle bounds = new Rectangle(0, 0, width, height);
+
+            if (isVertical)
+                bounds = new Rectangle(0, 0, height, width);
+
+            if (m_TabStrip != null && m_TabStrip.HasMeasureTabItem)
+            {
+                MeasureTabItemEventArgs mea = new MeasureTabItemEventArgs(tab, bounds.Size);
+                m_TabStrip.InvokeMeasureTabItem(mea);
+                bounds.Size = mea.Size;
+            }
+
+            block.Bounds = bounds;
+		}
+
+        public override Rectangle FinalizeLayout(Rectangle containerBounds, Rectangle blocksBounds, ArrayList lines)
+        {
+            if (lines.Count > 1 && m_TabStrip.MultiLinePanelAlignSelectedTab)
+            {
+                // Make sure that selected tab is always at the bottom i.e. next to the tab panel
+                int selectedTabLine = GetSelectedTabLine(lines);
+                if (selectedTabLine >= 0)
+                {
+                    if (m_TabStrip.TabAlignment == eTabStripAlignment.Bottom && selectedTabLine > 0)
+                        SwitchTabLines(lines, selectedTabLine, 0);
+                    else if(m_TabStrip.TabAlignment== eTabStripAlignment.Top && selectedTabLine<lines.Count-1)
+                        SwitchTabLines(lines, selectedTabLine, lines.Count - 1);
+                    else if (m_TabStrip.TabAlignment == eTabStripAlignment.Left && selectedTabLine < lines.Count - 1)
+                        SwitchTabLines(lines, selectedTabLine, lines.Count - 1);
+                    else if (m_TabStrip.TabAlignment == eTabStripAlignment.Right && selectedTabLine > 0)
+                        SwitchTabLines(lines, selectedTabLine, 0);
+                }
+            }
+
+            return (blocksBounds);
+        }
+
+        private void SwitchTabLines(ArrayList lines, int fromLine, int toLine)
+        {
+            SerialContentLayoutManager.BlockLineInfo lineFrom = (SerialContentLayoutManager.BlockLineInfo)lines[fromLine];
+            SerialContentLayoutManager.BlockLineInfo lineTo = (SerialContentLayoutManager.BlockLineInfo)lines[toLine];
+            bool horizontalTabs = (m_TabStrip.TabAlignment == eTabStripAlignment.Top ||
+                                   m_TabStrip.TabAlignment == eTabStripAlignment.Bottom);
+            int fromPos = horizontalTabs ? ((IBlock) lineFrom.Blocks[0]).Bounds.Y
+                : ((IBlock) lineFrom.Blocks[0]).Bounds.X;
+            int toPos = horizontalTabs ? ((IBlock)lineTo.Blocks[0]).Bounds.Y
+                : ((IBlock)lineTo.Blocks[0]).Bounds.X;
+            lines[fromLine] = lineTo;
+            lines[toLine] = lineFrom;
+            foreach (IBlock item in lineTo.Blocks)
+            {
+                if (horizontalTabs)
+                    item.Bounds = new Rectangle(item.Bounds.X, fromPos, item.Bounds.Width, item.Bounds.Height);
+                else
+                    item.Bounds = new Rectangle(fromPos, item.Bounds.Y, item.Bounds.Width, item.Bounds.Height);
+            }
+            foreach (IBlock item in lineFrom.Blocks)
+            {
+                if (horizontalTabs)
+                    item.Bounds = new Rectangle(item.Bounds.X, toPos, item.Bounds.Width, item.Bounds.Height);
+                else
+                    item.Bounds = new Rectangle(toPos, item.Bounds.Y, item.Bounds.Width, item.Bounds.Height);
+            }
+
+        }
+
+        private int GetSelectedTabLine(ArrayList lines)
+        {
+            foreach (SerialContentLayoutManager.BlockLineInfo line in lines)
+            {
+                foreach (TabItem item in line.Blocks)
+                {
+                    if (item.IsSelected)
+                        return line.Line;
+                }
+            }
+            return -1;
+        }
+
+        /// <summary>
+        /// Gets or sets the padding in pixels for the measured text. Default is 4.
+        /// </summary>
+        public int TextPadding
+		{
+			get {return m_TextPadding;}
+			set {m_TextPadding=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets the padding in pixels for the measured image size. Default is 4.
+		/// </summary>
+		public int ImagePadding
+		{
+			get {return m_ImagePadding;}
+			set {m_ImagePadding=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets the padding in pixels that is added to the measured height of the tab. Default is 4.
+		/// </summary>
+		public int PaddingHeight
+		{
+			get {return m_PaddingHeight;}
+			set {m_PaddingHeight=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets the padding in pixels that is added to the measured width of the tab. Default is 0.
+		/// </summary>
+		public int PaddingWidth
+		{
+			get {return m_PaddingWidth;}
+			set {m_PaddingWidth=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets whether text is always layed out horizontaly even if tabs are vertically aligned.
+		/// </summary>
+		public bool HorizontalText
+		{
+			get {return m_HorizontalText;}
+			set {m_HorizontalText=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets the additional padding for the selected item.
+		/// </summary>
+		public int SelectedPaddingWidth
+		{
+			get {return m_SelectedPaddingWidth;}
+			set {m_SelectedPaddingWidth=value;}
+		}
+
+        /// <summary>
+        /// Gets or sets the fixed tab size in pixels. Either member can be set. Value of 0 indicates that size is automatically calculated which is
+        /// default behavior.
+        /// </summary>
+        public Size FixedTabSize
+        {
+            get { return m_FixedTabSize; }
+            set { m_FixedTabSize = value; }
+        }
+
+        public bool CloseButtonOnTabs
+        {
+            get { return m_CloseButtonOnTabs; }
+            set { m_CloseButtonOnTabs = value; }
+        }
+
+        public Size CloseButtonSize
+        {
+            get { return m_CloseButtonSize; }
+            set { m_CloseButtonSize = value; }
+        }
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TabPanel.cs b/PROMS/DotNetBar Source Code/TabPanel.cs
new file mode 100644
index 00000000..391bc17e
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TabPanel.cs	
@@ -0,0 +1,298 @@
+using System;
+using System.ComponentModel;
+using System.Collections;
+using System.Diagnostics;
+using System.Drawing;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Represents the Tab on the Tab-Strip control.
+	/// </summary>
+	[ToolboxItem(false),System.Runtime.InteropServices.ComVisible(false)]
+	public class TabPanel : System.Windows.Forms.Panel
+	{
+		private int m_ImageIndex=-1;
+		private System.Drawing.Image m_Image;
+		private System.Drawing.Icon m_Icon;
+		private string m_Text="";
+		private TabControl m_Parent=null;
+		private bool m_Visible=true;
+		private Rectangle m_TabDisplayRectangle=Rectangle.Empty;
+		private Color m_BackColor=Color.Empty;
+		private Color m_BackColor2=Color.Empty;
+		private int m_BackColorGradientAngle=90;
+		private Color m_LightBorderColor=Color.Empty;
+		private Color m_DarkBorderColor=Color.Empty;
+		private Color m_TextColor=Color.Empty;
+
+		/// <summary>
+		/// Default constructor.
+		/// </summary>
+		/// <param name="container">Container object.</param>
+		public TabPanel(System.ComponentModel.IContainer container)
+		{
+			container.Add(this);
+		}
+		/// <summary>
+		/// Default constructor.
+		/// </summary>
+		public TabPanel()
+		{
+		}
+		/// <summary>
+		/// Gets or sets the tab Image index.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),DefaultValue(-1),Category("Appearance"),Description("Indicates the tab image index")]
+		public int ImageIndex
+		{
+			get {return m_ImageIndex;}
+			set
+			{
+				if(m_ImageIndex==value)
+					return;
+				m_ImageIndex=value;
+				if(m_Parent!=null)
+					m_Parent.NeedRecalcSize=true;
+				Refresh();
+			}
+		}
+		[Browsable(false),DevCoBrowsable(false),EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetImageIndex()
+		{
+			m_ImageIndex=-1;
+		}
+
+		/// <summary>
+		/// Gets or sets the tab image.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),DefaultValue(null),Category("Appearance"),Description("Indicates the tab image.")]
+		public System.Drawing.Image Image
+		{
+			get {return m_Image;}
+			set
+			{
+				if(m_Image==value)
+					return;
+				m_Image=value;
+				if(m_Parent!=null)
+					m_Parent.NeedRecalcSize=true;
+				Refresh();
+			}
+		}
+		[Browsable(false),DevCoBrowsable(false),EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetImage()
+		{
+			m_Image=null;
+		}
+
+		/// <summary>
+		/// Gets or sets the tab icon. Icon has same functionality as Image except that it support Alpha blending.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),DefaultValue(null),Category("Appearance"),Description("Indicates the tab icon. Icon has same functionality as Image except that it support Alpha blending.")]
+		public System.Drawing.Icon Icon
+		{
+			get {return m_Icon;}
+			set
+			{
+				if(m_Icon==value)
+					return;
+				m_Icon=value;
+				if(m_Parent!=null)
+					m_Parent.NeedRecalcSize=true;
+				Refresh();
+			}
+		}
+		[Browsable(false),DevCoBrowsable(false),EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetIcon()
+		{
+			m_Icon=null;
+		}
+
+		/// <summary>
+		/// Gets or sets the text displayed on the tab.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),Category("Appearance"),Description("Indicates the text displayed on the tab.")]
+		public new string Text
+		{
+			get {return m_Text;}
+			set
+			{
+				if(m_Text==value)
+					return;
+				m_Text=value;
+				if(m_Parent!=null)
+					m_Parent.NeedRecalcSize=true;
+				Refresh();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets whether tab is visible.
+		/// </summary>
+		[Browsable(true),DevCoBrowsable(true),DefaultValue(true),Category("Behavior"),Description("Indicates whether the tab is visible.")]
+		public bool Visible
+		{
+			get{return m_Visible;}
+			set
+			{
+				if(m_Visible==value)
+					return;
+				m_Visible=value;
+				if(m_Parent!=null)
+					m_Parent.NeedRecalcSize=true;
+				Refresh();
+			}
+		}
+
+		private void Refresh()
+		{
+			if(m_Parent!=null)
+				m_Parent.Refresh();
+		}
+
+		/// <summary>
+		/// Gets the display bounds of the tab.
+		/// </summary>
+		[Browsable(false),DevCoBrowsable(false)]
+		public Rectangle TabDisplayRectangle
+		{
+			get {return m_TabDisplayRectangle;}
+		}
+
+		internal Rectangle _TabDisplayRectangle
+		{
+			get {return m_TabDisplayRectangle;}
+			set {m_TabDisplayRectangle=value;}
+		}
+
+		internal System.Drawing.Image GetImage()
+		{
+			if(m_Image!=null)
+				return m_Image;
+			if(m_ImageIndex>=0 && m_Parent!=null && m_Parent.ImageList!=null && m_Parent.ImageList.Images.Count<m_ImageIndex)
+				return m_Parent.ImageList.Images[m_ImageIndex];
+			return null;
+		}
+
+		internal Size IconSize
+		{
+			get
+			{
+				return new Size(16,16);
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the target gradient background color of the tab when inactive.
+		/// </summary>
+		[Browsable(true),Description("Indicates the inactive tab target gradient background color."),Category("Style")]
+		public Color BackColor2
+		{
+			get {return m_BackColor2;}
+			set
+			{
+				m_BackColor2=value;
+				this.Refresh();
+			}
+		}
+		[Browsable(false),EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeBackColor2()
+		{
+			return !m_BackColor2.IsEmpty;
+		}
+		[Browsable(false),EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetBackColor2()
+		{
+			BackColor2=Color.Empty;
+		}
+
+		/// <summary>
+		/// Gets or sets the gradient angle.
+		/// </summary>
+		[Browsable(true),Description("Indicates the gradient angle."),Category("Style"),DefaultValue(90)]
+		public int BackColorGradientAngle
+		{
+			get {return m_BackColorGradientAngle;}
+			set {m_BackColorGradientAngle=value;this.Refresh();}
+		}
+
+		/// <summary>
+		/// Gets or sets the light border color when tab is inactive.
+		/// </summary>
+		[Browsable(true),Description("Indicates the inactive tab light border color."),Category("Style")]
+		public Color LightBorderColor
+		{
+			get {return m_LightBorderColor;}
+			set
+			{
+				m_LightBorderColor=value;
+				this.Refresh();
+			}
+		}
+		[Browsable(false),EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeLightBorderColor()
+		{
+			return !m_LightBorderColor.IsEmpty;
+		}
+		[Browsable(false),EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetLightBorderColor()
+		{
+			LightBorderColor=Color.Empty;
+		}
+
+		/// <summary>
+		/// Gets or sets the dark border color when tab is inactive.
+		/// </summary>
+		[Browsable(true),Description("Indicates the inactive tab dark border color."),Category("Style")]
+		public Color DarkBorderColor
+		{
+			get {return m_DarkBorderColor;}
+			set
+			{
+				m_DarkBorderColor=value;
+				this.Refresh();
+			}
+		}
+		[Browsable(false),EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeDarkBorderColor()
+		{
+			return !m_DarkBorderColor.IsEmpty;
+		}
+		[Browsable(false),EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetDarkBorderColor()
+		{
+			DarkBorderColor=Color.Empty;
+		}
+
+		/// <summary>
+		/// Gets or sets the text color when tab is inactive.
+		/// </summary>
+		[Browsable(true),Description("Indicates the inactive tab text color."),Category("Style")]
+		public Color TextColor
+		{
+			get {return m_TextColor;}
+			set
+			{
+				m_TextColor=value;
+				this.Refresh();
+			}
+		}
+		[Browsable(false),EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeTextColor()
+		{
+			return !m_TextColor.IsEmpty;
+		}
+		[Browsable(false),EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetTextColor()
+		{
+			TextColor=Color.Empty;
+		}
+
+		public override string ToString()
+		{
+			return m_Text;
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TabPanelsCollection.cs b/PROMS/DotNetBar Source Code/TabPanelsCollection.cs
new file mode 100644
index 00000000..2e12e41e
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TabPanelsCollection.cs	
@@ -0,0 +1,79 @@
+using System;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Represents collection of tab panels.
+	/// </summary>
+	public class TabPanelsCollection:System.Collections.CollectionBase
+	{
+		private TabControl m_Owner;
+		public TabPanelsCollection(TabControl owner)
+		{
+			m_Owner=owner;
+		}
+		public int Add(TabPanel item)
+		{
+			m_Owner.NeedRecalcSize=true;
+			return List.Add(item);
+		}
+		public TabPanel this[int index]
+		{
+			get {return (TabPanel)(List[index]);}
+			set {List[index] = value;}
+		}
+		public void Insert(int index, TabPanel value) 
+		{
+			value.Visible=true;
+			m_Owner.NeedRecalcSize=true;
+			List.Insert(index, value);
+		}
+
+		public int IndexOf(TabPanel value) 
+		{
+			return List.IndexOf(value);
+		}
+
+		public bool Contains(TabPanel value) 
+		{
+			return List.Contains(value);
+		}
+
+		public void Remove(TabPanel value) 
+		{
+			List.Remove(value);
+		}
+		protected override void OnRemoveComplete(int index,object value)
+		{
+			base.OnRemoveComplete(index,value);
+			TabPanel item=value as TabPanel;
+			item.Visible=true;
+			if(m_Owner.SelectedTab==item)
+				m_Owner.SelectedTab=null;
+
+			m_Owner.NeedRecalcSize=true;
+			if(m_Owner._DesignMode)
+				m_Owner.Refresh();
+		}
+		protected override void OnInsertComplete(int index,object value)
+		{
+			base.OnInsertComplete(index,value);
+			TabPanel item=value as TabPanel;
+			item.Visible=true;
+			m_Owner.OnTabAdded(item);
+			m_Owner.NeedRecalcSize=true;
+			if(m_Owner._DesignMode)
+				m_Owner.Refresh();
+		}
+
+		public void CopyTo(TabPanel[] array, int index) 
+		{
+			List.CopyTo(array, index);
+		}
+		protected override void OnClear()
+		{
+			m_Owner.OnTabsCleared();
+			base.OnClear();
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TabStrip.bmp b/PROMS/DotNetBar Source Code/TabStrip.bmp
new file mode 100644
index 00000000..9faf48d2
Binary files /dev/null and b/PROMS/DotNetBar Source Code/TabStrip.bmp differ
diff --git a/PROMS/DotNetBar Source Code/TabStrip.cs b/PROMS/DotNetBar Source Code/TabStrip.cs
new file mode 100644
index 00000000..639e44aa
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TabStrip.cs	
@@ -0,0 +1,6920 @@
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.ComponentModel.Design;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Drawing.Drawing2D;
+using System.Drawing.Text;
+using System.Runtime.InteropServices;
+using System.Windows.Forms;
+using DevComponents.UI.ContentManager;
+using DevComponents.DotNetBar.Rendering;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represents Tab-Strip control.
+    /// </summary>
+    [ToolboxItem(true), Designer("DevComponents.DotNetBar.Design.TabStripDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf"), ComVisible(false), DefaultEvent("SelectedTabChanged")]
+    public class TabStrip : Control
+    {
+        #region Events
+        /// <summary>
+        /// Event delegate for SelectedTabChanged event.
+        /// </summary>
+        public delegate void SelectedTabChangedEventHandler(object sender, TabStripTabChangedEventArgs e);
+        /// <summary>
+        /// Occurs after selected tab has changed.
+        /// </summary>
+        public event SelectedTabChangedEventHandler SelectedTabChanged;
+        /// <summary>
+        /// Event delegate for SelectedTabChanging event.
+        /// </summary>
+        public delegate void SelectedTabChangingEventHandler(object sender, TabStripTabChangingEventArgs e);
+        /// <summary>
+        /// Occurs before selected tab changes and gives you opportunity to cancel the change.
+        /// </summary>
+        public event SelectedTabChangingEventHandler SelectedTabChanging;
+        /// <summary>
+        /// Event delegate for TabMoved event
+        /// </summary>
+        public delegate void TabMovedEventHandler(object sender, TabStripTabMovedEventArgs e);
+        /// <summary>
+        /// Occurs when tab is dragged by user.
+        /// </summary>
+        public event TabMovedEventHandler TabMoved;
+        /// <summary>
+        /// Event delegate for NavigateBack, NavigateForward and TabItemClose events.
+        /// </summary>
+        public delegate void UserActionEventHandler(object sender, TabStripActionEventArgs e);
+        /// <summary>
+        /// Occurs when the user navigates back using the back arrow.
+        /// </summary>
+        public event UserActionEventHandler NavigateBack;
+        /// <summary>
+        /// Occurs when the user navigates forward using the forward arrow.
+        /// </summary>
+        public event UserActionEventHandler NavigateForward;
+        /// <summary>
+        /// Occurs when tab item is closing.
+        /// </summary>
+        public event UserActionEventHandler TabItemClose;
+        /// <summary>
+        /// Occurs when tab item is added to the tabs collection.
+        /// </summary>
+        public event EventHandler TabItemOpen;
+        /// <summary>
+        /// Occurs before control or item attached to the tab is displayed.
+        /// </summary>
+        public event EventHandler BeforeTabDisplay;
+        /// <summary>
+        /// Occurs after tab item has been removed from tabs collection.
+        /// </summary>
+        public event EventHandler TabRemoved;
+
+        /// <summary>
+        /// Occurs after Tabs collection has been cleared.
+        /// </summary>
+        public event EventHandler TabsCleared;
+
+        internal event EventHandler SizeRecalculated;
+
+        /// <summary>
+        /// Occurs after the tab item size has been determined and allows you to apply your custom size to the TabItem.
+        /// </summary>
+        public event MeasureTabItemEventHandler MeasureTabItem;
+
+        /// <summary>
+        /// Occurs before tab is rendered and allows you to cancel default tab rendering performed by the control.
+        /// </summary>
+        public event RenderTabItemEventHandler PreRenderTabItem;
+
+        /// <summary>
+        /// Occurs after tab is rendered and allows you to render on top of the default rendering performed by the control.
+        /// </summary>
+        public event RenderTabItemEventHandler PostRenderTabItem;
+
+        /// <summary>
+        /// Occurs when mouse enters a tab.
+        /// </summary>
+        [Description("Occurs when mouse enters a tab.")]
+        public event EventHandler TabMouseEnter;
+        /// <summary>
+        /// Raises TabMouseEnter event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected internal virtual void OnTabMouseEnter(TabItem sender, EventArgs e)
+        {
+            EventHandler handler = TabMouseEnter;
+            if (handler != null)
+                handler(sender, e);
+        }
+        /// <summary>
+        /// Occurs when mouse leaves a tab.
+        /// </summary>
+        [Description("Occurs when mouse leaves a tab.")]
+        public event EventHandler TabMouseLeave;
+        /// <summary>
+        /// Raises TabMouseLeave event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected internal virtual void OnTabMouseLeave(TabItem sender, EventArgs e)
+        {
+            EventHandler handler = TabMouseLeave;
+            if (handler != null)
+                handler(sender, e);
+        }
+        /// <summary>
+        /// Occurs when mouse moves over the tab.
+        /// </summary>
+        [Description("Occurs when mouse moves over the tab.")]
+        public event MouseEventHandler TabMouseMove;
+        /// <summary>
+        /// Raises TabMouseMove event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected internal virtual void OnTabMouseMove(TabItem sender, MouseEventArgs e)
+        {
+            MouseEventHandler handler = TabMouseMove;
+            if (handler != null)
+                handler(sender, e);
+        }
+        /// <summary>
+        /// Occurs when mouse clicks the tab.
+        /// </summary>
+        [Description("Occurs when mouse clicks the tab.")]
+        public event MouseEventHandler TabMouseClick;
+        /// <summary>
+        /// Raises TabMouseClick event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected internal virtual void OnTabMouseClick(TabItem sender, MouseEventArgs e)
+        {
+            MouseEventHandler handler = TabMouseClick;
+            if (handler != null)
+                handler(sender, e);
+        }
+        /// <summary>
+        /// Occurs when mouse hovers over the tab.
+        /// </summary>
+        [Description("Occurs when mouse hovers over the tab.")]
+        public event EventHandler TabMouseHover;
+        /// <summary>
+        /// Raises TabMouseHover event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected internal virtual void OnTabMouseHover(TabItem sender, EventArgs e)
+        {
+            EventHandler handler = TabMouseHover;
+            if (handler != null)
+                handler(sender, e);
+        }
+        #endregion
+
+        #region Private variables
+        private eTabStripAlignment m_Alignment = eTabStripAlignment.Bottom;
+        private TabsCollection m_Tabs = null;
+        private ImageList m_ImageList = null;
+        private TabItem m_SelectedTab = null;
+        private bool m_NeedRecalcSize = true;
+        private bool m_TabDrag = false;
+        private Bar m_DragBar = null;
+        private bool m_IsDragging = false;
+        private bool m_CanReorderTabs = true;
+
+        private bool m_VariableTabWidth = true;
+        private int m_ScrollOffset = 0;
+        private TabSystemBox m_TabSystemBox = null;
+
+        private bool m_Animate = true;
+
+        private bool m_MdiTabbedDocuments = false;
+        private Form m_MdiForm = null;
+        private bool m_MdiInitialized = false;
+        private int m_MaxMdiCaptionLength = 32;
+        private bool m_ShowMdiChildIcon = true;
+        private bool m_MdiAutoHide = true;
+        private bool m_MdiNoFormActivateFlicker = true;
+
+        private Font m_SelectedTabFont = null;
+        private bool m_SelectedTabFontCustom = false;
+
+        private bool m_DisplaySelectedTextOnly = false;
+
+        private ThemeTab m_ThemeTab = null;
+
+        private TabItem m_HotTab = null;
+
+        private eTabStripStyle m_Style = eTabStripStyle.Flat;
+
+        //		// New Color Styling
+        //		private Color m_BackColor2=Color.Empty;
+        //
+        //		// Selected Tab Colors...
+        //		private Color m_SelectedTabBackColor=Color.Empty;
+        //		private Color m_SelectedTabBackColor2=Color.Empty;
+        //		private Color m_SelectedTabBorderLightColor=Color.Empty;
+        //		private Color m_SelectedTabBorderDarkColor=Color.Empty;
+        private Color m_SelectedTabTextColor = Color.Empty;
+
+        //		// Hot Tab Colors
+        //		private Color m_HotBackColor=Color.Empty;
+        //		private Color m_HotBackColor2=Color.Empty;
+        private Color m_HotTextColor = Color.Empty;
+        //		private Color m_HotBorderLightColor=Color.Empty;
+        //		private Color m_HotBorderDarkColor=Color.Empty;
+
+        // Separator Colors
+        private Color m_SeparatorColor = Color.Empty;
+        private Color m_SeparatorShadeColor = Color.Empty;
+
+        // Auto-click repeat on system items
+        private bool m_TabScrollAutoRepeat = false;
+        private int m_TabScrollRepeatInterval = 300;
+
+        private TabColorScheme m_ColorScheme = null;
+        private TabItem m_DesignTimeSelection = null;
+
+        private bool m_ShowFocusRectangle = true;
+        private bool m_AutoHideSystemBox = false;
+        private int MIN_TEXT_WIDTH = 4;
+
+        //private bool m_MultiLine=false;
+        private int m_MultiLineSpacing = 0;
+
+        private eTabLayoutType m_TabLayoutType = eTabLayoutType.FitContainer;
+        private ToolTip m_ToolTip = null;
+        private TabItem m_TooltipTab = null;
+
+        private bool m_ThemeAware = false;
+        private Rectangle m_TabItemsBounds = Rectangle.Empty;
+
+        private Size m_FixedTabSize = Size.Empty;
+        private bool m_CloseButtonOnTabs = false;
+        private eTabCloseButtonPosition m_CloseButtonPosition = eTabCloseButtonPosition.Left;
+        private static Size default_close_button_size = new Size(11, 11);
+        private Size m_CloseButtonSize = default_close_button_size;
+
+        private Image m_TabCloseButtonNormal = null;
+        private Image m_TabCloseButtonHot = null;
+        private bool m_CloseButtonOnTabsAlwaysDisplayed = true;
+        private bool m_AntiAlias = false;
+        private bool m_AutoSelectAttachedControl = true;
+        #endregion
+
+        /// <summary>
+        /// Default constructor.
+        /// </summary>
+        public TabStrip()
+        {
+            if (!ColorFunctions.ColorsLoaded)
+            {
+                NativeFunctions.RefreshSettings();
+                NativeFunctions.OnDisplayChange();
+                ColorFunctions.LoadColors();
+            }
+            m_Tabs = new TabsCollection(this);
+            this.SetStyle(ControlStyles.Selectable, true);
+            this.SetStyle(ControlStyles.UserPaint, true);
+            this.SetStyle(ControlStyles.Opaque, true);
+            this.SetStyle(ControlStyles.SupportsTransparentBackColor, true);
+            this.SetStyle(DisplayHelp.DoubleBufferFlag, true);
+            this.SetStyle(ControlStyles.AllPaintingInWmPaint, true);
+            this.SetStyle(ControlStyles.ResizeRedraw, true);
+
+            m_TabSystemBox = new TabSystemBox(this);
+            m_TabSystemBox.Back += new EventHandler(this.OnTabBack);
+            m_TabSystemBox.Close += new EventHandler(this.OnTabClose);
+            m_TabSystemBox.Forward += new EventHandler(this.OnTabForward);
+
+            m_ColorScheme = new TabColorScheme(m_Style);
+            m_ColorScheme.ColorChanged += new EventHandler(this.ColorSchemeChanged);
+
+            StyleManager.Register(this);
+        }
+
+        protected override AccessibleObject CreateAccessibilityInstance()
+        {
+            return new TabStripAccessibleObject(this);
+        }
+
+        /// <summary>
+        /// Gets or sets whether anti-alias smoothing is used while painting. Default value is false.
+        /// </summary>
+        [DefaultValue(false), Browsable(true), Category("Appearance"), Description("Gets or sets whether anti-aliasing is used while painting.")]
+        public bool AntiAlias
+        {
+            get { return m_AntiAlias; }
+            set
+            {
+                if (m_AntiAlias != value)
+                {
+                    m_AntiAlias = value;
+                    this.Invalidate();
+                }
+            }
+        }
+
+        protected override void OnResize(EventArgs e)
+        {
+            base.OnResize(e);
+            if (this.Width == 0 || this.Height == 0)
+                return;
+
+            m_ScrollOffset = 0;
+            this.RecalcSize();
+            this.EnsureVisible(this.SelectedTab);
+        }
+
+        private Rectangle GetFocusRectangle(Rectangle rText)
+        {
+            rText.Inflate(-1, -1);
+            return rText;
+        }
+
+        internal void PaintTabSystemBox(Graphics g)
+        {
+            if (this.HasNavigationBox && m_TabSystemBox.Visible)
+            {
+                m_TabSystemBox.Paint(g);
+            }
+        }
+
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            SmoothingMode sm = e.Graphics.SmoothingMode;
+            TextRenderingHint th = e.Graphics.TextRenderingHint;
+
+            if (m_AntiAlias)
+            {
+                e.Graphics.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.AntiAlias;
+#if FRAMEWORK20
+                if (!SystemInformation.IsFontSmoothingEnabled)
+#endif
+                    e.Graphics.TextRenderingHint = DisplayHelp.AntiAliasTextRenderingHint;
+            }
+
+            if (this.BackColor == Color.Transparent || this.ColorScheme.TabBackground == Color.Transparent || this.BackgroundImage != null)
+            {
+                base.OnPaintBackground(e);
+            }
+
+            if (m_Style == eTabStripStyle.SimulatedTheme)
+            {
+                if (m_NeedRecalcSize)
+                    this.RecalcSize(e.Graphics, GetTabClientArea(this.DisplayRectangle, (this.TabLayoutType == eTabLayoutType.MultilineWithNavigationBox), false));
+                TabStripSimulatedThemeDisplay display = new TabStripSimulatedThemeDisplay();
+                display.CloseButtonOnTabs = m_CloseButtonOnTabs;
+                display.Paint(e.Graphics, this);
+            }
+            else if (m_Style == eTabStripStyle.Metro)
+                PaintFlat(e.Graphics);
+            else if (this.IsThemed)
+                PaintThemed(e.Graphics);
+            else if (m_Style == eTabStripStyle.OneNote || m_Style == eTabStripStyle.VS2005Document)
+                PaintOneNote(e.Graphics);
+            else if (m_Style == eTabStripStyle.VS2005)
+                PaintVS2005(e.Graphics);
+            else if (m_Style == eTabStripStyle.RoundHeader)
+            {
+                if (m_NeedRecalcSize)
+                    this.RecalcSize(e.Graphics, GetTabClientArea(this.DisplayRectangle, (this.TabLayoutType == eTabLayoutType.MultilineWithNavigationBox), false));
+                TabStripRoundHeaderDisplay display = new TabStripRoundHeaderDisplay();
+                display.CloseButtonOnTabs = m_CloseButtonOnTabs;
+                display.Paint(e.Graphics, this);
+            }
+            else if (m_Style == eTabStripStyle.Office2007Dock)
+            {
+                if (m_NeedRecalcSize)
+                    this.RecalcSize(e.Graphics, GetTabClientArea(this.DisplayRectangle, (this.TabLayoutType == eTabLayoutType.MultilineWithNavigationBox), false));
+                TabStripOffice2007DockDisplay display = new TabStripOffice2007DockDisplay();
+                display.CloseButtonOnTabs = m_CloseButtonOnTabs;
+                display.Paint(e.Graphics, this);
+            }
+            else if (m_Style == eTabStripStyle.VS2005Dock)
+            {
+                if (m_NeedRecalcSize)
+                    this.RecalcSize(e.Graphics, GetTabClientArea(this.DisplayRectangle, (this.TabLayoutType == eTabLayoutType.MultilineWithNavigationBox), false));
+                TabStripVS2005DockDisplay display = new TabStripVS2005DockDisplay();
+                display.CloseButtonOnTabs = m_CloseButtonOnTabs;
+                display.Paint(e.Graphics, this);
+            }
+            else if (m_Style == eTabStripStyle.Office2007Document)
+            {
+                if (m_NeedRecalcSize)
+                    this.RecalcSize(e.Graphics, GetTabClientArea(this.DisplayRectangle, (this.TabLayoutType == eTabLayoutType.MultilineWithNavigationBox), false));
+                TabStripOffice2007DocumentDisplay display = new TabStripOffice2007DocumentDisplay();
+                display.CloseButtonOnTabs = m_CloseButtonOnTabs;
+                display.Paint(e.Graphics, this);
+            }
+            else
+                PaintFlat(e.Graphics);
+
+            e.Graphics.SmoothingMode = sm;
+            e.Graphics.TextRenderingHint = th;
+        }
+
+        private void PaintFlat(Graphics g)
+        {
+            TabColorScheme colorScheme = m_ColorScheme;
+
+            if (!colorScheme.TabBackground2.IsEmpty && this.Height > 0 && this.Width > 0)
+            {
+                using (LinearGradientBrush gradient = BarFunctions.CreateLinearGradientBrush(this.ClientRectangle, colorScheme.TabBackground, colorScheme.TabBackground2, colorScheme.TabBackgroundGradientAngle))
+                    g.FillRectangle(gradient, this.ClientRectangle);
+
+            }
+            else
+            {
+                using (SolidBrush brush = new SolidBrush(colorScheme.TabBackground))
+                    g.FillRectangle(brush, this.DisplayRectangle);
+            }
+
+            Color tabBorder = colorScheme.TabBorder;
+            if (m_Style != eTabStripStyle.Metro)
+            {
+                if (!tabBorder.IsEmpty)
+                {
+                    using (Pen pen = new Pen(tabBorder, 1))
+                        g.DrawRectangle(pen, new Rectangle(ClientRectangle.X, ClientRectangle.Y, ClientRectangle.Width - 1, ClientRectangle.Height - 1));
+                }
+            }
+
+            // Fill tab background color
+            Rectangle r = this.DisplayRectangle;
+
+            switch (m_Alignment)
+            {
+                case eTabStripAlignment.Bottom:
+                    {
+                        r.Height -= 3;
+                        break;
+                    }
+                case eTabStripAlignment.Top:
+                    {
+                        r.Y += 1;
+                        r.Height -= 3;
+                        break;
+                    }
+            }
+
+            // See how we will draw items
+            TabItem selected = this.SelectedTab;
+            eTextFormat strFormat = eTextFormat.Default | eTextFormat.SingleLine | eTextFormat.EndEllipsis | eTextFormat.HorizontalCenter |
+                eTextFormat.VerticalCenter;
+
+            int outerBorderAdjustment = (tabBorder.IsEmpty ? 0 : 1);
+            // Draw the upper back line
+            if (m_Style != eTabStripStyle.Metro)
+            {
+                switch (m_Alignment)
+                {
+                    case eTabStripAlignment.Top:
+                        {
+                            if (!(this.Parent is TabControl))
+                                g.FillRectangle(new SolidBrush((colorScheme.TabItemSelectedBackground2.IsEmpty ? colorScheme.TabItemSelectedBackground : colorScheme.TabItemSelectedBackground2)), r.X + outerBorderAdjustment, r.Bottom, r.Width - outerBorderAdjustment * 2, this.Height - r.Bottom);
+                            else
+                            {
+                                using (Pen pen = new Pen(colorScheme.TabItemSelectedBorder, 1))
+                                {
+                                    g.DrawLine(pen, r.X, r.Bottom, r.X, ClientRectangle.Bottom);
+                                    g.DrawLine(pen, r.Right - 1, r.Bottom, r.Right - 1, ClientRectangle.Bottom);
+                                }
+                            }
+                            g.DrawLine(new Pen(colorScheme.TabItemSelectedBorderLight, 1), r.X + outerBorderAdjustment, r.Bottom, r.Right - 1 - outerBorderAdjustment, r.Bottom);
+                            r.Inflate(-4, 0);
+                            break;
+                        }
+                    case eTabStripAlignment.Left:
+                        {
+                            g.DrawLine(new Pen(colorScheme.TabItemSelectedBorderLight, 1), r.Right - 1, r.Y + outerBorderAdjustment, r.Right - 1, r.Bottom - outerBorderAdjustment);
+                            r.Inflate(0, -4);
+                            break;
+                        }
+                    case eTabStripAlignment.Right:
+                        {
+                            g.DrawLine(new Pen(colorScheme.TabItemSelectedBorderLight, 1), r.X, r.Y + outerBorderAdjustment, r.X, r.Bottom - outerBorderAdjustment);
+                            r.Inflate(0, -4);
+                            break;
+                        }
+                    default:
+                        {
+                            if (!(this.Parent is TabControl))
+                                g.FillRectangle(new SolidBrush(colorScheme.TabItemSelectedBackground), r.X, 0, r.Width, r.Y);
+                            else
+                            {
+                                using (Pen pen = new Pen(colorScheme.TabItemSelectedBorder, 1))
+                                {
+                                    g.DrawLine(pen, r.X, r.Y, r.X, 0);
+                                    g.DrawLine(pen, r.Right - 1, r.Y, r.Right - 1, 0);
+                                }
+                            }
+                            g.DrawLine(new Pen(colorScheme.TabItemSelectedBorderLight, 1), r.X, r.Y, r.Right, r.Y);
+                            r.Inflate(-4, 0);
+                            break;
+                        }
+                }
+            }
+
+            if (this.HasNavigationBox && m_TabSystemBox.Visible)
+            {
+                if (m_Alignment == eTabStripAlignment.Right || m_Alignment == eTabStripAlignment.Left)
+                {
+                    if (m_TabSystemBox.DisplayRectangle.Height > 0)
+                        r.Height -= m_TabSystemBox.DisplayRectangle.Height;
+                    else
+                        r.Height -= m_TabSystemBox.DefaultWidth;
+                }
+                else
+                {
+                    if (m_TabSystemBox.DisplayRectangle.Width > 0)
+                        r.Width -= m_TabSystemBox.DisplayRectangle.Width;
+                    else
+                        r.Width -= m_TabSystemBox.DefaultWidth;
+                    if (this.IsRightToLeft)
+                        r.X += m_TabSystemBox.DefaultWidth;
+                }
+            }
+            if (m_NeedRecalcSize)
+                RecalcSize(g, this.GetTabClientArea(this.DisplayRectangle, false, false));
+            if (m_Alignment == eTabStripAlignment.Top)
+                r.Height++;
+            Rectangle rClip = r;
+            g.SetClip(r);
+            Rectangle selectedTabRect = Rectangle.Empty;
+            foreach (TabItem tab in m_Tabs)
+            {
+                if (!tab.Visible || !r.IntersectsWith(tab.DisplayRectangle))
+                    continue;
+                if (HasPreRenderTabItem)
+                {
+                    RenderTabItemEventArgs re = new RenderTabItemEventArgs(tab, g);
+                    InvokePreRenderTabItem(re);
+                    if (re.Cancel) continue;
+                }
+
+                Rectangle tabRect = tab.DisplayRectangle;
+                TabColors tabColors = GetTabColors(tab);
+                if (m_Alignment == eTabStripAlignment.Left || m_Alignment == eTabStripAlignment.Right)
+                {
+                    if (tab == selected)
+                    {
+                        selectedTabRect = tabRect;
+                        if (m_Alignment == eTabStripAlignment.Left)
+                        {
+                            if (tabColors.BackColor2.IsEmpty)
+                            {
+                                using (SolidBrush brush = new SolidBrush(g.GetNearestColor(tabColors.BackColor)))
+                                    g.FillRectangle(brush, tabRect);
+                            }
+                            else
+                            {
+                                using (LinearGradientBrush gradient = BarFunctions.CreateLinearGradientBrush(tabRect, tabColors.BackColor, tabColors.BackColor2, tabColors.BackColorGradientAngle))
+                                    g.FillRectangle(gradient, tabRect);
+                            }
+                            if (m_Style == eTabStripStyle.Metro)
+                            {
+                                if (StyleManager.Style == eStyle.Metro || StyleManager.Style == eStyle.OfficeMobile2014 || StyleManager.Style == eStyle.Office2016)
+                                {
+                                    using (Pen p = new Pen(tabColors.BorderColor, 1))
+                                    {
+                                        g.DrawLine(p, tabRect.X, tabRect.Y, tabRect.Right - 1, tabRect.Y);
+                                        g.DrawLine(p, tabRect.X, tabRect.Bottom - 1, tabRect.Right - 1, tabRect.Bottom - 1);
+                                    }
+                                    using (SolidBrush brush = new SolidBrush(tabColors.TextColor))
+                                        g.FillRectangle(brush, new Rectangle(tabRect.X, tabRect.Y, 2, tabRect.Height));
+                                }
+                            }
+                            else
+                            {
+                                Pen p = new Pen(tabColors.LightBorderColor, 1);
+                                g.DrawLine(p, tabRect.X, tabRect.Y, tabRect.Right, tabRect.Y);
+                                g.DrawLine(p, tabRect.X, tabRect.Y, tabRect.X, tabRect.Bottom);
+                                p.Dispose();
+                                p = new Pen(tabColors.BorderColor, 1);
+                                g.DrawLine(p, tabRect.X + 1, tabRect.Bottom, tabRect.Right - 2, tabRect.Bottom);
+                                p.Dispose();
+                            }
+                        }
+                        else
+                        {
+                            if (tabColors.BackColor2.IsEmpty)
+                            {
+                                using (SolidBrush brush = new SolidBrush(g.GetNearestColor(tabColors.BackColor)))
+                                    g.FillRectangle(brush, tabRect.X, tabRect.Y, tabRect.Width, tabRect.Height + 1);
+                            }
+                            else
+                            {
+                                using (LinearGradientBrush gradient = BarFunctions.CreateLinearGradientBrush(new Rectangle(tabRect.X, tabRect.Y, tabRect.Width, tabRect.Height + 1), tabColors.BackColor, tabColors.BackColor2, tabColors.BackColorGradientAngle))
+                                    g.FillRectangle(gradient, tabRect.X, tabRect.Y, tabRect.Width, tabRect.Height + 1);
+                            }
+                            if (m_Style == eTabStripStyle.Metro)
+                            {
+                                if (StyleManager.Style == eStyle.Metro || StyleManager.Style == eStyle.OfficeMobile2014 || StyleManager.Style == eStyle.Office2016)
+                                {
+                                    using (Pen p = new Pen(tabColors.BorderColor, 1))
+                                    {
+                                        g.DrawLine(p, tabRect.X, tabRect.Y, tabRect.Right - 1, tabRect.Y);
+                                        g.DrawLine(p, tabRect.X, tabRect.Bottom - 1, tabRect.Right - 1, tabRect.Bottom - 1);
+                                    }
+                                    using (SolidBrush brush = new SolidBrush(tabColors.TextColor))
+                                        g.FillRectangle(brush, new Rectangle(tabRect.Right - 2, tabRect.Y, 2, tabRect.Height));
+                                }
+                            }
+                            else
+                            {
+                                Pen p = new Pen(tabColors.LightBorderColor, 1);
+                                g.DrawLine(p, tabRect.X, tabRect.Y, tabRect.Right, tabRect.Y);
+                                g.DrawLine(p, tabRect.Right - 1, tabRect.Y, tabRect.Right - 1, tabRect.Bottom);
+                                p.Dispose();
+                                p = new Pen(tabColors.BorderColor, 1);
+                                g.DrawLine(p, tabRect.X, tabRect.Bottom, tabRect.Right - 3, tabRect.Bottom);
+                                p.Dispose();
+                            }
+                        }
+                    }
+                    else
+                    {
+                        if (!tabColors.BackColor.IsEmpty)
+                        {
+                            if (!tabColors.BackColor2.IsEmpty)
+                            {
+                                using (LinearGradientBrush gradient = BarFunctions.CreateLinearGradientBrush(tabRect, tabColors.BackColor, tabColors.BackColor2, tabColors.BackColorGradientAngle))
+                                    g.FillRectangle(gradient, tabRect);
+                            }
+                            else
+                            {
+                                using (SolidBrush brush = new SolidBrush(tabColors.BackColor))
+                                    g.FillRectangle(brush, tabRect);
+                            }
+                        }
+
+                        if (!tabColors.LightBorderColor.IsEmpty)
+                        {
+                            if (m_Alignment == eTabStripAlignment.Left)
+                            {
+                                using (Pen p = new Pen(tabColors.LightBorderColor, 1))
+                                {
+                                    g.DrawLine(p, tabRect.X, tabRect.Y, tabRect.Right, tabRect.Y);
+                                    g.DrawLine(p, tabRect.X, tabRect.Y, tabRect.X, tabRect.Bottom);
+                                }
+                            }
+                            else
+                            {
+                                using (Pen p = new Pen(tabColors.LightBorderColor, 1))
+                                {
+                                    g.DrawLine(p, tabRect.X, tabRect.Y, tabRect.Right, tabRect.Y);
+                                    g.DrawLine(p, tabRect.Right - 1, tabRect.Y, tabRect.Right - 1, tabRect.Bottom);
+                                }
+                            }
+                        }
+
+                        if (!tabColors.BorderColor.IsEmpty)
+                        {
+                            if (m_Alignment == eTabStripAlignment.Left)
+                            {
+                                using (Pen p = new Pen(tabColors.BorderColor, 1))
+                                {
+                                    g.DrawLine(p, tabRect.X + 1, tabRect.Bottom, tabRect.Right - 2, tabRect.Bottom);
+                                    g.DrawLine(p, tabRect.Right - 1, tabRect.Bottom, tabRect.Right - 1, tabRect.Y + 1);
+                                }
+                            }
+                            else
+                            {
+                                using (Pen p = new Pen(tabColors.BorderColor, 1))
+                                {
+                                    g.DrawLine(p, tabRect.X, tabRect.Y + 1, tabRect.X, tabRect.Bottom);
+                                    g.DrawLine(p, tabRect.X + 1, tabRect.Bottom, tabRect.Right - 2, tabRect.Bottom);
+                                }
+                            }
+                        }
+                    }
+
+                    if (m_CloseButtonOnTabs && tab.CloseButtonVisible)
+                        tab.CloseButtonBounds = PaintTabItemCloseButton(g, true, tab.CloseButtonMouseOver, tab == m_HotTab || tab == this.SelectedTab, ref tabRect);
+                    else
+                        tab.CloseButtonBounds = Rectangle.Empty;
+
+                    Image tabImage = tab.GetImage();
+                    Icon icon = tab.Icon;
+                    Size imageSize = tabImage != null ? Dpi.ImageSize(tabImage.Size) : Size.Empty;
+                    if (tabImage != null && tabImage.Width + 4 <= tabRect.Width || icon != null && tab.IconSize.Width + 4 <= tabRect.Width)
+                    {
+                        if (icon != null)
+                        {
+                            Rectangle rIcon = new Rectangle(tabRect.X + (tabRect.Width - tab.IconSize.Width) / 2, tabRect.Y + 4, tab.IconSize.Width, tab.IconSize.Height);
+                            if (rClip.Contains(rIcon))
+                                g.DrawIcon(icon, rIcon);
+                            tabRect.Y += (tab.IconSize.Height + 2);
+                            tabRect.Height -= (tab.IconSize.Height + 2);
+                        }
+                        else if (tabImage != null)
+                        {
+                            g.DrawImage(tabImage, tabRect.X + (tabRect.Width - imageSize.Width) / 2, tabRect.Y + 4, imageSize.Width, imageSize.Height);
+                            tabRect.Y += (imageSize.Height + 2);
+                            tabRect.Height -= (imageSize.Height + 2);
+                        }
+                        tabRect.Inflate(0, -1);
+                        tabRect.Height -= 4;
+                        tabRect.Y += 3;
+                    }
+                    else
+                    {
+                        tabRect.Y += 2;
+                        tabRect.Height -= 2;
+                    }
+
+                    g.RotateTransform(90);
+                    if (!m_DisplaySelectedTextOnly || tab == m_SelectedTab)
+                    {
+                        Font font = this.Font;
+                        if (tab == selected && m_SelectedTabFont != null)
+                            font = m_SelectedTabFont;
+                        Rectangle rText = new Rectangle(tabRect.Top, -tabRect.Right, tabRect.Height, tabRect.Width);
+                        if (rText.Height > MIN_TEXT_WIDTH)
+                        {
+                            TextDrawing.DrawStringLegacy(g, tab.Text, font, tabColors.TextColor, rText, strFormat);
+                        }
+                        if (m_ShowFocusRectangle && this.Focused && tab == m_SelectedTab)
+                            ControlPaint.DrawFocusRectangle(g, GetFocusRectangle(rText));
+                        g.ResetTransform();
+                    }
+                    // Draw separator
+                    if (tab != selected)
+                    {
+                        g.DrawLine(new Pen(colorScheme.TabItemSeparator, 1), tab.DisplayRectangle.X + 1, tab.DisplayRectangle.Bottom, tab.DisplayRectangle.Right - 4, tab.DisplayRectangle.Bottom);
+                        if (!colorScheme.TabItemSeparatorShade.IsEmpty)
+                            g.DrawLine(new Pen(colorScheme.TabItemSeparatorShade, 1), tab.DisplayRectangle.X + 1 + 1, tab.DisplayRectangle.Bottom + 1, tab.DisplayRectangle.Right - 4 + 1, tab.DisplayRectangle.Bottom + 1);
+                    }
+                }
+                else
+                {
+                    if (tab == selected)
+                    {
+                        selectedTabRect = tabRect;
+                        if (m_Alignment == eTabStripAlignment.Bottom)
+                        {
+                            if (tabColors.BackColor2.IsEmpty)
+                            {
+                                using (SolidBrush brush = new SolidBrush(g.GetNearestColor(tabColors.BackColor)))
+                                    g.FillRectangle(brush, tabRect);
+                            }
+                            else
+                            {
+                                using (LinearGradientBrush gradient = BarFunctions.CreateLinearGradientBrush(tabRect, tabColors.BackColor, tabColors.BackColor2, tabColors.BackColorGradientAngle))
+                                    g.FillRectangle(gradient, tabRect);
+                            }
+
+                            if (m_Style == eTabStripStyle.Metro)
+                            {
+                                if (StyleManager.Style == eStyle.Metro || StyleManager.Style == eStyle.OfficeMobile2014 || StyleManager.Style == eStyle.Office2016 || m_ColorScheme.TabContext == eTabContext.DockTab)
+                                {
+                                    using (Pen p = new Pen(tabColors.BorderColor, 1))
+                                    {
+                                        g.DrawLine(p, tabRect.X, tabRect.Y, tabRect.X, tabRect.Bottom - 1);
+                                        g.DrawLine(p, tabRect.Right - 1, tabRect.Y, tabRect.Right - 1, tabRect.Bottom - 1);
+                                    }
+                                    if (m_ColorScheme.TabContext != eTabContext.DockTab)
+                                    {
+                                        using (SolidBrush brush = new SolidBrush(tabColors.TextColor))
+                                            g.FillRectangle(brush, new Rectangle(tabRect.X, tabRect.Bottom - 2, tabRect.Width, 2));
+                                    }
+                                }
+                            }
+                            else
+                            {
+                                using (Pen p = new Pen(tabColors.LightBorderColor, 1))
+                                    g.DrawLine(p, tabRect.X, tabRect.Y, tabRect.X, tabRect.Bottom);
+                                using (Pen p = new Pen(tabColors.BorderColor, 1))
+                                {
+                                    g.DrawLine(p, tabRect.X + 1, tabRect.Bottom, tabRect.Right, tabRect.Bottom);
+                                    g.DrawLine(p, tabRect.Right, tabRect.Y, tabRect.Right, tabRect.Bottom);
+                                }
+                            }
+                        }
+                        else
+                        {
+                            if (tabColors.BackColor2.IsEmpty)
+                            {
+                                using (SolidBrush brush = new SolidBrush(g.GetNearestColor(tabColors.BackColor)))
+                                    g.FillRectangle(brush, tabRect.X, tabRect.Y, tabRect.Width, tabRect.Height + 1);
+                            }
+                            else
+                            {
+                                using (LinearGradientBrush gradient = BarFunctions.CreateLinearGradientBrush(new Rectangle(tabRect.X, tabRect.Y, tabRect.Width, tabRect.Height + 1), tabColors.BackColor, tabColors.BackColor2, tabColors.BackColorGradientAngle))
+                                    g.FillRectangle(gradient, tabRect.X, tabRect.Y, tabRect.Width, tabRect.Height + 1);
+                            }
+
+                            if (m_Style == eTabStripStyle.Metro)
+                            {
+                                if (StyleManager.Style == eStyle.Metro || StyleManager.Style == eStyle.OfficeMobile2014 || StyleManager.Style == eStyle.Office2016)
+                                {
+                                    using (Pen p = new Pen(tabColors.BorderColor, 1))
+                                    {
+                                        g.DrawLine(p, tabRect.X, tabRect.Y, tabRect.X, tabRect.Bottom);
+                                        g.DrawLine(p, tabRect.Right - 1, tabRect.Y, tabRect.Right - 1, tabRect.Bottom);
+                                    }
+                                    using (SolidBrush brush = new SolidBrush(tabColors.TextColor))
+                                        g.FillRectangle(brush, new Rectangle(tabRect.X, tabRect.Y, tabRect.Width, 2));
+                                }
+                            }
+                            else
+                            {
+                                using (Pen p = new Pen(tabColors.LightBorderColor, 1))
+                                {
+                                    g.DrawLine(p, tabRect.X, tabRect.Y, tabRect.X, tabRect.Bottom);
+                                    g.DrawLine(p, tabRect.X, tabRect.Y, tabRect.Right, tabRect.Y);
+                                }
+                                using (Pen p = new Pen(tabColors.BorderColor, 1))
+                                    g.DrawLine(p, tabRect.Right, tabRect.Y, tabRect.Right, tabRect.Bottom);
+                            }
+                        }
+                    }
+                    else
+                    {
+                        if (!tabColors.BackColor.IsEmpty)
+                        {
+                            Rectangle rBack = tabRect;
+                            if (m_Style != eTabStripStyle.Metro)
+                            {
+                                rBack.Width--;
+                                rBack.X++;
+                                rBack.Height--;
+                                rBack.Y++;
+                            }
+                            if (!tabColors.BackColor2.IsEmpty)
+                            {
+                                using (LinearGradientBrush gradient = BarFunctions.CreateLinearGradientBrush(tabRect, tabColors.BackColor, tabColors.BackColor2, tabColors.BackColorGradientAngle))
+                                    g.FillRectangle(gradient, rBack);
+                            }
+                            else
+                            {
+                                using (SolidBrush brush = new SolidBrush(tabColors.BackColor))
+                                    g.FillRectangle(brush, rBack);
+                            }
+                        }
+                        if (!tabColors.LightBorderColor.IsEmpty)
+                        {
+                            if (m_Alignment == eTabStripAlignment.Bottom)
+                            {
+                                using (Pen p = new Pen(tabColors.LightBorderColor, 1))
+                                {
+                                    g.DrawLine(p, tabRect.X, tabRect.Y, tabRect.Right, tabRect.Y);
+                                    g.DrawLine(p, tabRect.X, tabRect.Y, tabRect.X, tabRect.Bottom);
+                                }
+                            }
+                            else
+                            {
+                                using (Pen p = new Pen(tabColors.LightBorderColor, 1))
+                                {
+                                    g.DrawLine(p, tabRect.X, tabRect.Y, tabRect.X, tabRect.Bottom);
+                                    g.DrawLine(p, tabRect.X, tabRect.Y, tabRect.Right, tabRect.Y);
+                                }
+                            }
+                        }
+
+                        if (!tabColors.BorderColor.IsEmpty)
+                        {
+                            if (m_Alignment == eTabStripAlignment.Bottom)
+                            {
+                                using (Pen p = new Pen(tabColors.BorderColor, 1))
+                                {
+                                    g.DrawLine(p, tabRect.X + 1, tabRect.Bottom, tabRect.Right, tabRect.Bottom);
+                                    g.DrawLine(p, tabRect.Right, tabRect.Y, tabRect.Right, tabRect.Bottom);
+                                }
+                            }
+                            else
+                            {
+                                using (Pen p = new Pen(tabColors.BorderColor, 1))
+                                {
+                                    g.DrawLine(p, tabRect.Right - 1, tabRect.Y, tabRect.Right - 1, tabRect.Bottom);
+                                    g.DrawLine(p, tabRect.X, tabRect.Bottom, tabRect.Right, tabRect.Bottom);
+                                }
+                            }
+                        }
+                    }
+
+                    if (m_Alignment == eTabStripAlignment.Top)
+                        tabRect.Offset(0, 1);
+
+                    if (m_CloseButtonOnTabs && tab.CloseButtonVisible)
+                        tab.CloseButtonBounds = PaintTabItemCloseButton(g, false, tab.CloseButtonMouseOver, tab == m_HotTab || tab == this.SelectedTab, ref tabRect);
+                    else
+                        tab.CloseButtonBounds = Rectangle.Empty;
+
+                    Image tabImage = tab.GetImage();
+                    Icon icon = tab.Icon;
+                    Size imageSize = Size.Empty;
+                    if (tabImage != null)
+                        imageSize = Dpi.ImageSize(tabImage.Size);
+                    if (tabImage != null && imageSize.Width + 4 < tabRect.Width || icon != null && tab.IconSize.Width + 4 < tabRect.Width)
+                    {
+                        if (icon != null)
+                        {
+                            Rectangle rIcon = new Rectangle(tabRect.X + 4, tabRect.Y + (tabRect.Height - tab.IconSize.Height) / 2, tab.IconSize.Width, tab.IconSize.Height);
+                            if (rClip.Contains(rIcon))
+                                g.DrawIcon(icon, rIcon);
+                            tabRect.X += (tab.IconSize.Width + 2);
+                            tabRect.Width -= (tab.IconSize.Width + 2);
+                        }
+                        else if (tabImage != null)
+                        {
+                            g.DrawImage(tabImage, tabRect.X + 4, tabRect.Y + (tabRect.Height - imageSize.Height) / 2, imageSize.Width, imageSize.Height);
+                            tabRect.X += (imageSize.Width + 2);
+                            tabRect.Width -= (imageSize.Width + 2);
+                        }
+                        tabRect.Inflate(0, -1);
+                        tabRect.Width -= 4;
+                        tabRect.X += 3;
+                    }
+                    else
+                    {
+                        tabRect.Inflate(-1, 0);
+                    }
+
+                    if (!m_DisplaySelectedTextOnly || tab == m_SelectedTab)
+                    {
+                        Font font = this.Font;
+                        if (tab == selected && m_SelectedTabFont != null)
+                            font = m_SelectedTabFont;
+                        if (tabRect.Width > MIN_TEXT_WIDTH)
+                        {
+                            TextDrawing.DrawString(g, tab.Text, font, tabColors.TextColor, tabRect, strFormat);
+                        }
+                        if (m_ShowFocusRectangle && this.Focused && tab == m_SelectedTab)
+                            ControlPaint.DrawFocusRectangle(g, GetFocusRectangle(tabRect));
+                    }
+
+                    if (tab != selected)
+                    {
+                        Rectangle rect = tab.DisplayRectangle;
+                        if (this.IsRightToLeft)
+                            rect.Width -= 2;
+                        if (!colorScheme.TabItemSeparator.IsEmpty)
+                        {
+                            using (Pen p = new Pen(colorScheme.TabItemSeparator, 1))
+                                g.DrawLine(p, rect.Right, rect.Y + 2, rect.Right, rect.Bottom - 4);
+                        }
+                        if (!colorScheme.TabItemSeparatorShade.IsEmpty)
+                        {
+                            using (Pen p = new Pen(colorScheme.TabItemSeparatorShade, 1))
+                                g.DrawLine(p, rect.Right + 1, rect.Y + 2 + 1, rect.Right + 1, rect.Bottom - 4 + 1);
+                        }
+                    }
+                }
+
+                if (HasPostRenderTabItem)
+                {
+                    RenderTabItemEventArgs re = new RenderTabItemEventArgs(tab, g);
+                    InvokePostRenderTabItem(re);
+                }
+            }
+            g.ResetClip();
+
+            Color tabsBottomBorder = tabBorder;
+            int tabsBottomBorderWidth = 1;
+            if (StyleManager.IsVisualStudio2012(StyleManager.Style))
+            {
+                tabsBottomBorderWidth = 2;
+                tabsBottomBorder = colorScheme.TabItemSelectedBackground;
+            }
+            if (m_Style == eTabStripStyle.Metro && !selectedTabRect.IsEmpty && !tabsBottomBorder.IsEmpty)
+            {
+                if (StyleManager.IsVisualStudio2012(StyleManager.Style))
+                {
+                    if (m_ColorScheme.TabContext != eTabContext.DockTab)
+                    {
+                        using (Pen pen = new Pen(tabsBottomBorder, tabsBottomBorderWidth))
+                        {
+                            if (m_Alignment == eTabStripAlignment.Top)
+                                g.DrawLine(pen, ClientRectangle.X, ClientRectangle.Bottom - tabsBottomBorderWidth, ClientRectangle.Right, ClientRectangle.Bottom - tabsBottomBorderWidth);
+                            else if (m_Alignment == eTabStripAlignment.Bottom)
+                                g.DrawLine(pen, ClientRectangle.X, ClientRectangle.Y + tabsBottomBorderWidth / 2, ClientRectangle.Right, ClientRectangle.Y + tabsBottomBorderWidth / 2);
+                            else if (m_Alignment == eTabStripAlignment.Left)
+                                g.DrawLine(pen, ClientRectangle.Right - tabsBottomBorderWidth, ClientRectangle.Y, ClientRectangle.Right - tabsBottomBorderWidth, ClientRectangle.Bottom);
+                            else if (m_Alignment == eTabStripAlignment.Right)
+                                g.DrawLine(pen, ClientRectangle.X, ClientRectangle.Y, ClientRectangle.X, ClientRectangle.Bottom);
+                        }
+                    }
+                }
+                else
+                {
+                    if (m_Alignment == eTabStripAlignment.Top)
+                    {
+                        using (Pen pen = new Pen(tabsBottomBorder, tabsBottomBorderWidth))
+                        {
+                            g.DrawLine(pen, ClientRectangle.X, ClientRectangle.Bottom - 1, selectedTabRect.X, ClientRectangle.Bottom - 1);
+                            g.DrawLine(pen, selectedTabRect.Right - 1, ClientRectangle.Bottom - 1, ClientRectangle.Right - 1, ClientRectangle.Bottom - 1);
+                        }
+                    }
+                    else if (m_Alignment == eTabStripAlignment.Bottom)
+                    {
+                        using (Pen pen = new Pen(tabsBottomBorder, tabsBottomBorderWidth))
+                        {
+                            g.DrawLine(pen, ClientRectangle.X, ClientRectangle.Y, selectedTabRect.X, ClientRectangle.Y);
+                            g.DrawLine(pen, selectedTabRect.Right - 1, ClientRectangle.Y, ClientRectangle.Right - 1, ClientRectangle.Y);
+                        }
+                    }
+                    else if (m_Alignment == eTabStripAlignment.Left)
+                    {
+                        using (Pen pen = new Pen(tabsBottomBorder, tabsBottomBorderWidth))
+                        {
+                            g.DrawLine(pen, ClientRectangle.Right - 1, ClientRectangle.Y, ClientRectangle.Right - 1, selectedTabRect.Y);
+                            g.DrawLine(pen, ClientRectangle.Right - 1, selectedTabRect.Bottom - 1, ClientRectangle.Right - 1, ClientRectangle.Bottom - 1);
+                        }
+                    }
+                    else if (m_Alignment == eTabStripAlignment.Right)
+                    {
+                        using (Pen pen = new Pen(tabsBottomBorder, tabsBottomBorderWidth))
+                        {
+                            g.DrawLine(pen, ClientRectangle.X, ClientRectangle.Y, ClientRectangle.X, selectedTabRect.Y);
+                            g.DrawLine(pen, ClientRectangle.X, selectedTabRect.Bottom - 1, ClientRectangle.X, ClientRectangle.Bottom - 1);
+                        }
+                    }
+                }
+            }
+
+            if (this.HasNavigationBox && m_TabSystemBox.Visible)
+            {
+                g.SetClip(m_TabSystemBox.DisplayRectangle);
+                m_TabSystemBox.Paint(g);
+                g.ResetClip();
+            }
+        }
+
+        private Rectangle GetBackgroundArea(Rectangle r)
+        {
+            switch (m_Alignment)
+            {
+                case eTabStripAlignment.Bottom:
+                    {
+                        r.Y += 3;
+                        r.Height -= 5;
+                        break;
+                    }
+                case eTabStripAlignment.Top:
+                    {
+                        r.Y += 1;
+                        r.Height -= 5;
+                        break;
+                    }
+                case eTabStripAlignment.Left:
+                    {
+                        r.Width -= 5;
+                        r.X++;
+                        break;
+                    }
+                case eTabStripAlignment.Right:
+                    {
+                        r.Width -= 5;
+                        r.X += 3;
+                        break;
+                    }
+            }
+            return r;
+        }
+
+        internal Rectangle GetTabClientArea(Rectangle r, bool bExcludeSystemBox, bool bPaintArea)
+        {
+            int tabItemHeight = GetSingleTabHeight();
+            if ((m_Style == eTabStripStyle.OneNote || m_Style == eTabStripStyle.VS2005Document) && !this.IsThemed)
+            {
+                r = GetBackgroundArea(r);
+                switch (m_Alignment)
+                {
+                    case eTabStripAlignment.Top:
+                        {
+                            r.Inflate(-4, 0);
+                            break;
+                        }
+                    case eTabStripAlignment.Left:
+                        {
+                            r.Inflate(0, -4);
+                            break;
+                        }
+                    case eTabStripAlignment.Right:
+                        {
+                            r.Inflate(0, -4);
+                            break;
+                        }
+                    default:
+                        {
+                            r.Inflate(-4, 0);
+                            break;
+                        }
+                }
+
+                if (bExcludeSystemBox && this.HasNavigationBox)
+                {
+                    // Reduce size by System Box size
+                    if (m_Alignment == eTabStripAlignment.Right || m_Alignment == eTabStripAlignment.Left)
+                    {
+                        r.Height -= (m_TabSystemBox.DefaultWidth + 3);
+                    }
+                    else
+                    {
+                        if (this.IsRightToLeft)
+                        {
+                            r.X += (m_TabSystemBox.DefaultWidth + 3);
+                            r.Width -= (m_TabSystemBox.DefaultWidth + 3);
+                        }
+                        else
+                            r.Width -= (m_TabSystemBox.DefaultWidth + 3);
+                    }
+                }
+
+                if (!bPaintArea && (m_Style == eTabStripStyle.OneNote || m_Style == eTabStripStyle.VS2005Document) && !this.IsThemed)
+                {
+                    if (m_Alignment == eTabStripAlignment.Right || m_Alignment == eTabStripAlignment.Left)
+                    {
+                        if (m_Alignment == eTabStripAlignment.Right)
+                        {
+                            r.Height -= tabItemHeight;
+                            r.Y += tabItemHeight;
+                        }
+                        else
+                        {
+                            r.Height -= tabItemHeight;
+                        }
+                    }
+                    else
+                    {
+                        //if(m_Alignment==eTabStripAlignment.Top)
+                        //{
+                        r.Width -= tabItemHeight;
+                        r.X += tabItemHeight;
+                        //}
+                        //else
+                        //{
+                        //    r.Width-=tabItemHeight;
+                        //}
+                    }
+                }
+            }
+            else
+            {
+                switch (m_Alignment)
+                {
+                    case eTabStripAlignment.Bottom:
+                        {
+                            if (this.IsThemed && this.Parent is TabControl)
+                                r.Y += 2;
+                            r.Height -= 3;
+                            break;
+                        }
+                    case eTabStripAlignment.Top:
+                        {
+                            r.Y += 1;
+                            r.Height -= 3;
+                            //						if(m_Style==eTabStripStyle.Themed && this.Parent is TabControl)
+                            //							r.Offset(0,2);
+                            break;
+                        }
+                    case eTabStripAlignment.Left:
+                        {
+                            if (this.IsThemed && this.Parent is TabControl)
+                            {
+                                r.Width -= 2;
+                            }
+                            break;
+                        }
+                    case eTabStripAlignment.Right:
+                        {
+                            if (this.IsThemed && this.Parent is TabControl)
+                            {
+                                r.X += 2;
+                                r.Width -= 2;
+                            }
+                            break;
+                        }
+                }
+
+                if (m_Style != eTabStripStyle.VS2005 && m_Style != eTabStripStyle.Office2007Document || this.IsThemed)
+                {
+                    switch (m_Alignment)
+                    {
+                        case eTabStripAlignment.Top:
+                            {
+                                r.Inflate(-4, 0);
+                                break;
+                            }
+                        case eTabStripAlignment.Left:
+                            {
+                                r.Inflate(0, -4);
+                                break;
+                            }
+                        case eTabStripAlignment.Right:
+                            {
+                                r.Inflate(0, -4);
+                                break;
+                            }
+                        default:
+                            {
+                                r.Inflate(-4, 0);
+                                break;
+                            }
+                    }
+                }
+                //				else
+                //				{
+                //					if(m_Alignment==eTabStripAlignment.Right)
+                //						r.Width-=2;
+                //				}
+
+                if (this.HasNavigationBox && bExcludeSystemBox)
+                {
+                    if (m_Alignment == eTabStripAlignment.Right || m_Alignment == eTabStripAlignment.Left)
+                    {
+                        r.Height -= m_TabSystemBox.DefaultWidth;
+                    }
+                    else
+                    {
+                        r.Width -= m_TabSystemBox.DefaultWidth;
+                    }
+                }
+            }
+            return r;
+        }
+
+        internal void ClipExcludeSystemBox(Graphics g)
+        {
+            Rectangle r = GetSystemBoxRectangle();
+            if (!r.IsEmpty)
+                g.SetClip(r, CombineMode.Exclude);
+        }
+
+        /// <summary>
+        /// Returns the bounds of the tab system box if one is available in current tab style.
+        /// </summary>
+        /// <returns>Rectangle describing the system box bounds.</returns>
+        public Rectangle GetSystemBoxRectangle()
+        {
+            if (!m_TabSystemBox.Visible || !this.HasNavigationBox)
+                return Rectangle.Empty;
+            Rectangle r = Rectangle.Empty;
+            if (m_Alignment == eTabStripAlignment.Right || m_Alignment == eTabStripAlignment.Left)
+                r = new Rectangle(0, m_TabSystemBox.DisplayRectangle.Y, this.ClientRectangle.Width, this.ClientRectangle.Bottom - m_TabSystemBox.DisplayRectangle.Y);
+            else
+            {
+                if (this.IsRightToLeft)
+                    r = m_TabSystemBox.DisplayRectangle;
+                else
+                    r = new Rectangle(m_TabSystemBox.DisplayRectangle.X, 0, this.ClientRectangle.Right - m_TabSystemBox.DisplayRectangle.X, this.ClientRectangle.Height);
+            }
+
+            if (m_Alignment == eTabStripAlignment.Bottom)
+                r.Y++;
+            else if (m_Alignment == eTabStripAlignment.Top)
+                r.Height -= 2;
+
+            return r;
+        }
+
+        private void PaintOneNote(Graphics g)
+        {
+            // Fill tab background color
+            Rectangle r = GetTabClientArea(this.DisplayRectangle, false, false);
+            //Rectangle rSysBox=Rectangle.Empty;
+
+            if (m_NeedRecalcSize)
+            {
+                RecalcSize(g, GetTabClientArea(this.DisplayRectangle, false, false));
+            }
+
+            if (!m_ColorScheme.TabBackground2.IsEmpty && this.Height > 0 && this.Width > 0)
+            {
+                int gradientAngle = m_ColorScheme.TabBackgroundGradientAngle;
+                if (m_Alignment == eTabStripAlignment.Bottom)
+                    gradientAngle -= 180;
+                else if (m_Alignment == eTabStripAlignment.Left)
+                    gradientAngle -= 90;
+                else if (m_Alignment == eTabStripAlignment.Right)
+                    gradientAngle += 90;
+
+                using (LinearGradientBrush gradient = BarFunctions.CreateLinearGradientBrush(this.DisplayRectangle, m_ColorScheme.TabBackground, m_ColorScheme.TabBackground2, gradientAngle))
+                    g.FillRectangle(gradient, this.DisplayRectangle);
+            }
+            else
+            {
+                using (SolidBrush brush = new SolidBrush(m_ColorScheme.TabBackground))
+                    g.FillRectangle(brush, this.DisplayRectangle);
+                //g.Clear(m_ColorScheme.TabBackground);
+            }
+
+            if (!m_ColorScheme.TabBorder.IsEmpty)
+            {
+                using (Pen pen = new Pen(m_ColorScheme.TabBorder, Dpi.Width1))
+                    g.DrawRectangle(pen, this.DisplayRectangle);
+            }
+
+            // Set text format
+            TabItem selected = this.SelectedTab;
+            eTextFormat strFormat = eTextFormat.Default | eTextFormat.EndEllipsis | eTextFormat.SingleLine |
+                eTextFormat.HorizontalCenter | eTextFormat.VerticalCenter;
+
+            // Draw the upper back line
+            Rectangle backArea = this.GetBackgroundArea(this.DisplayRectangle);
+            Color backAreaColor = (m_ColorScheme.TabItemSelectedBackground2.IsEmpty ? m_ColorScheme.TabItemSelectedBackground : m_ColorScheme.TabItemSelectedBackground2);
+            if (selected != null && selected.PredefinedColor != eTabItemColor.Default && !selected.BackColor2.IsEmpty)
+                backAreaColor = selected.BackColor2;
+            switch (m_Alignment)
+            {
+                case eTabStripAlignment.Top:
+                    {
+                        using (SolidBrush brush = new SolidBrush(backAreaColor))
+                            g.FillRectangle(brush, backArea.X, backArea.Bottom, backArea.Width, this.Height - r.Bottom);
+                        if (selected != null)
+                        {
+                            using (Pen pen = new Pen(m_ColorScheme.TabItemSelectedBorder, Dpi.Width1))
+                            {
+                                //RectangleF rs=this.GetTabPath(selected.DisplayRectangle,2,m_Alignment,false).GetBounds();
+                                Rectangle rs = selected.DisplayRectangle;
+                                rs.Width += rs.Height;
+                                rs.X -= (rs.Height - 1);
+                                if (this.HasNavigationBox && rs.Right > m_TabSystemBox.DisplayRectangle.X)
+                                    rs.Width -= (rs.Right - m_TabSystemBox.DisplayRectangle.X + 2);
+
+                                g.DrawLine(pen, backArea.X, backArea.Bottom, rs.X - 1, backArea.Bottom);
+                                g.DrawLine(pen, rs.Right + 1, backArea.Bottom, backArea.Right, backArea.Bottom);
+                                if (this.Parent is TabControl)
+                                {
+                                    g.DrawLine(pen, backArea.X, backArea.Bottom, backArea.X, this.ClientRectangle.Bottom);
+                                    g.DrawLine(pen, backArea.Right - 1, backArea.Bottom, backArea.Right - 1, this.ClientRectangle.Bottom);
+                                }
+                            }
+                        }
+                        break;
+                    }
+                case eTabStripAlignment.Left:
+                    {
+                        using (SolidBrush brush = new SolidBrush(backAreaColor))
+                            g.FillRectangle(brush, backArea.Right, backArea.Y, this.Width - backArea.Width, this.Height);
+                        using (Pen pen = new Pen(m_ColorScheme.TabItemSelectedBorder, Dpi.Width1))
+                        {
+                            g.DrawLine(pen, backArea.Right - 1, backArea.Y, backArea.Right - 1, backArea.Bottom);
+                            if (this.Parent is TabControl)
+                            {
+                                g.DrawLine(pen, backArea.Right - 1, backArea.Y, this.ClientRectangle.Right, backArea.Y);
+                                g.DrawLine(pen, backArea.Right - 1, backArea.Bottom - 1, this.ClientRectangle.Right, backArea.Bottom - 1);
+                            }
+                        }
+                        break;
+                    }
+                case eTabStripAlignment.Right:
+                    {
+                        using (SolidBrush brush = new SolidBrush(backAreaColor))
+                            g.FillRectangle(brush, 0, 0, this.Width - backArea.Width, this.Height);
+
+                        using (Pen pen = new Pen(m_ColorScheme.TabItemSelectedBorder, Dpi.Width1))
+                        {
+                            g.DrawLine(pen, backArea.X, backArea.Y, backArea.X, backArea.Bottom);
+                            if (this.Parent is TabControl)
+                            {
+                                g.DrawLine(pen, backArea.X, backArea.Y, 0, backArea.Y);
+                                g.DrawLine(pen, backArea.X, backArea.Bottom - 1, 0, backArea.Bottom - 1);
+                            }
+                        }
+                        break;
+                    }
+                default:
+                    {
+                        using (SolidBrush brush = new SolidBrush(backAreaColor))
+                            g.FillRectangle(brush, backArea.X, 0, backArea.Width, backArea.Y);
+                        using (Pen pen = new Pen(m_ColorScheme.TabItemSelectedBorder, Dpi.Width1))
+                        {
+                            g.DrawLine(pen, backArea.X, backArea.Y, backArea.Right, backArea.Y);
+                            if (this.Parent is TabControl)
+                            {
+                                g.DrawLine(pen, backArea.X, backArea.Y, backArea.X, 0);
+                                g.DrawLine(pen, backArea.Right - 1, backArea.Y, backArea.Right - 1, 0);
+                            }
+                        }
+                        break;
+                    }
+            }
+
+            r = GetTabClientArea(this.DisplayRectangle, m_TabSystemBox.Visible, true);
+            Rectangle rClip = r;
+            g.SetClip(r);
+
+            bool bVirstVisible = true;
+            bool bContinue = (m_Tabs.Count > 0);
+
+            // Bi-directional loop
+            int iIndex = 0;
+            bool reverseLoop = false;
+            if (m_Alignment == eTabStripAlignment.Left ||
+                (this.IsRightToLeft && (m_Alignment == eTabStripAlignment.Top || m_Alignment == eTabStripAlignment.Bottom)))
+            {
+                iIndex = m_Tabs.Count - 1;
+                reverseLoop = true;
+            }
+            int iMultiLineSwitch = -1;
+            while (bContinue)
+            {
+                TabItem tab = m_Tabs[iIndex];
+                if (reverseLoop)
+                {
+                    iIndex--;
+                    if (iIndex < 0) bContinue = false;
+                }
+                else
+                {
+                    iIndex++;
+                    if (iIndex >= m_Tabs.Count) bContinue = false;
+                }
+
+                if (!tab.Visible || !r.IntersectsWith(tab.DisplayRectangle))
+                    continue;
+
+                if (HasPreRenderTabItem)
+                {
+                    RenderTabItemEventArgs re = new RenderTabItemEventArgs(tab, g);
+                    InvokePreRenderTabItem(re);
+                    if (re.Cancel) continue;
+                }
+
+                TabColors tabColors = this.GetTabColors(tab);
+                Rectangle tabRect = tab.DisplayRectangle;
+                if (m_Alignment == eTabStripAlignment.Right)
+                    tabRect.Height--;
+                if (m_Alignment == eTabStripAlignment.Left || m_Alignment == eTabStripAlignment.Right)
+                {
+                    if (iMultiLineSwitch == -1)
+                        iMultiLineSwitch = tab.DisplayRectangle.X;
+                    if (iMultiLineSwitch != tab.DisplayRectangle.X)
+                    {
+                        iMultiLineSwitch = tab.DisplayRectangle.X;
+                        bVirstVisible = true;
+                    }
+                    GraphicsPath path = this.GetTabPath(tabRect, 2, m_Alignment, true);
+                    Region clip = g.Clip;
+
+                    if (bVirstVisible || tab == m_SelectedTab)
+                    {
+                        RectangleF pb = path.GetBounds();
+                        pb.Width++;
+                        if (m_Alignment == eTabStripAlignment.Left)
+                        {
+                            //pb.Width--;
+                            if (bVirstVisible && tab != m_SelectedTab)
+                                pb.Width--;
+                        }
+                        else
+                        {
+                            pb.Height++;
+                            if (bVirstVisible && tab != m_SelectedTab) pb.X++;
+                        }
+                        g.SetClip(pb);
+                    }
+                    else
+                    {
+                        if (m_Alignment == eTabStripAlignment.Right)
+                            g.SetClip(new Rectangle(tabRect.X + Dpi.Width1, tabRect.Y + Dpi.Height1, tabRect.Width + Dpi.Width1, tabRect.Height + Dpi.Height1));
+                        else
+                            g.SetClip(new Rectangle(tabRect.X, tabRect.Y, tabRect.Width - Dpi.Width1, tabRect.Height));
+                    }
+                    ClipExcludeSystemBox(g);
+
+                    if (tabColors.BackColor2.IsEmpty)
+                    {
+                        using (SolidBrush brush = new SolidBrush(tabColors.BackColor))
+                            g.FillPath(brush, path);
+                    }
+                    else
+                    {
+                        using (LinearGradientBrush brush = BarFunctions.CreateLinearGradientBrush(path.GetBounds(), tabColors.BackColor, tabColors.BackColor2, (m_Alignment == eTabStripAlignment.Left ? tabColors.BackColorGradientAngle - 90 : tabColors.BackColorGradientAngle + 90)))
+                            g.FillPath(brush, path);
+                    }
+                    path.Dispose();
+                    path = this.GetTabPath(tabRect, 2, m_Alignment, false);
+                    using (Pen pen = new Pen(tabColors.BorderColor, Dpi.Width1))
+                        g.DrawPath(pen, path);
+
+                    if (m_TabSystemBox.Visible && this.HasNavigationBox && path.GetBounds().IntersectsWith(m_TabSystemBox.DisplayRectangle))
+                    {
+                        Region reg = new Region(path);
+                        reg.Intersect(m_TabSystemBox.DisplayRectangle);
+                        RectangleF rg = reg.GetBounds(g);
+                        reg.Dispose();
+                        using (Pen pen = new Pen(tabColors.BorderColor, 1))
+                        {
+                            pen.DashPattern = new float[] { 2, 2 };
+                            g.DrawLine(pen, rg.X, rg.Y - Dpi.Width1, rg.Right, rg.Y - Dpi.Height1);
+                            g.DrawLine(pen, rg.X + Dpi.Width2, rg.Y - Dpi.Height2, rg.Right, rg.Y - Dpi.Height2);
+                        }
+                    }
+                    else if (path.GetBounds().Y < -1 && path.GetBounds().Bottom > 0)
+                    {
+                        RectangleF rg = path.GetBounds();
+                        using (Pen pen = new Pen(tabColors.BorderColor, 1))
+                        {
+                            pen.DashPattern = new float[] { 2, 2 };
+                            g.DrawLine(pen, rg.X, 0, rg.Right, 0);
+                            g.DrawLine(pen, rg.X + Dpi.Width2, Dpi.Height1, rg.Right, Dpi.Height1);
+                        }
+                    }
+
+                    Rectangle rh = tabRect;
+                    if (m_Alignment == eTabStripAlignment.Right)
+                    {
+                        rh.Offset(-Dpi.Width1, 0);
+                        rh.Height -= Dpi.Width1;
+                    }
+                    else
+                    {
+                        rh.Offset(Dpi.Width1, 0);
+                        rh.Height -= Dpi.Width1;
+                        rh.Y++;
+                    }
+                    path.Dispose();
+                    path = GetTabPath(rh, 1, m_Alignment, false);
+
+                    using (Pen pen = new Pen(tabColors.LightBorderColor, Dpi.Width1))
+                        g.DrawPath(pen, path);
+                    if (!tabColors.DarkBorderColor.IsEmpty)
+                    {
+                        RectangleF darkBounds = path.GetBounds();
+                        if (m_Alignment == eTabStripAlignment.Right)
+                        {
+                            darkBounds.Y = darkBounds.Bottom - Dpi.Height1;
+                            darkBounds.Height = Dpi.Height2;
+                            //darkBounds.Width--;
+                        }
+                        else
+                        {
+                            darkBounds.Height = Dpi.Height2;
+                            darkBounds.Width -= Dpi.Width2;
+                        }
+                        g.SetClip(darkBounds);
+                        ClipExcludeSystemBox(g);
+                        using (Pen pen = new Pen(tabColors.DarkBorderColor, Dpi.Width1))
+                            g.DrawPath(pen, path);
+                    }
+                    path.Dispose();
+                    path = null;
+                    g.SetClip(clip, CombineMode.Replace);
+                    if (clip != null)
+                    {
+                        clip.Dispose();
+                        clip = null;
+                    }
+                    if (m_CloseButtonOnTabs && tab.CloseButtonVisible)
+                    {
+                        tabRect.Y += Dpi.Height3;
+                        tabRect.Height -= Dpi.Height3;
+                        tab.CloseButtonBounds = PaintTabItemCloseButton(g, true, tab.CloseButtonMouseOver, tab == m_HotTab || tab == this.SelectedTab, ref tabRect);
+                    }
+                    else
+                        tab.CloseButtonBounds = Rectangle.Empty;
+
+                    Image tabImage = tab.GetImage();
+                    Icon icon = tab.Icon;
+                    if (icon != null)
+                    {
+                        Rectangle rIcon = new Rectangle(tabRect.X + (tabRect.Width - tab.IconSize.Width) / 2, tabRect.Y + Dpi.Height6, tab.IconSize.Width, tab.IconSize.Height);
+                        if (rClip.Contains(rIcon))
+                            g.DrawIcon(icon, rIcon);
+                        tabRect.Y += (tab.IconSize.Height + Dpi.Height2);
+                        tabRect.Height -= (tab.IconSize.Height + Dpi.Height2);
+                    }
+                    else if (tabImage != null)
+                    {
+                        Size imageSize = Dpi.ImageSize(tabImage.Size);
+                        g.DrawImage(tabImage, tabRect.X + (tabRect.Width - imageSize.Width) / 2, tabRect.Y + Dpi.Height6, imageSize.Width, imageSize.Height);
+                        tabRect.Y += (imageSize.Height + Dpi.Height2);
+                        tabRect.Height -= (imageSize.Height + Dpi.Height2);
+                    }
+                    tabRect.Inflate(0, -Dpi.Height1);
+                    tabRect.Height -= Dpi.Height4;
+                    if (m_Style == eTabStripStyle.OneNote)
+                        tabRect.Y += Dpi.Height3;
+
+                    g.RotateTransform(90);
+                    if (!m_DisplaySelectedTextOnly || tab == m_SelectedTab)
+                    {
+                        Font font = this.Font;
+                        if (tab == selected)
+                        {
+                            if (m_SelectedTabFont != null)
+                                font = m_SelectedTabFont;
+                        }
+                        if (tab != selected)
+                        {
+                            Rectangle rText = new Rectangle(tabRect.Top, -tabRect.Right, tabRect.Height, tabRect.Width);
+                            if (rText.Height > MIN_TEXT_WIDTH)
+                                TextDrawing.DrawStringLegacy(g, tab.Text, font, tabColors.TextColor, rText, strFormat);
+                            if (m_ShowFocusRectangle && this.Focused && tab == m_SelectedTab)
+                                ControlPaint.DrawFocusRectangle(g, GetFocusRectangle(rText));
+                        }
+                        else
+                        {
+                            Rectangle rText = new Rectangle(tabRect.Top, -tabRect.Right, tabRect.Height, tabRect.Width);
+                            if (rText.Height > MIN_TEXT_WIDTH)
+                                TextDrawing.DrawStringLegacy(g, tab.Text, font, tabColors.TextColor, rText, strFormat);
+                            if (m_ShowFocusRectangle && this.Focused && tab == m_SelectedTab)
+                                ControlPaint.DrawFocusRectangle(g, GetFocusRectangle(rText));
+                        }
+                        g.ResetTransform();
+                    }
+                    // Draw separator
+                    if (tab != selected)
+                    {
+                        g.DrawLine(new Pen(m_SeparatorColor, Dpi.Width1), tab.DisplayRectangle.X + Dpi.Width1, tab.DisplayRectangle.Bottom, tab.DisplayRectangle.Right - Dpi.Width4, tab.DisplayRectangle.Bottom);
+                        if (!m_SeparatorShadeColor.IsEmpty)
+                            g.DrawLine(new Pen(m_SeparatorShadeColor, Dpi.Width1), tab.DisplayRectangle.X + Dpi.Width2, tab.DisplayRectangle.Bottom + Dpi.Height1, tab.DisplayRectangle.Right - Dpi.Width4 + Dpi.Width1, tab.DisplayRectangle.Bottom + Dpi.Height1);
+                    }
+                }
+                else
+                {
+                    if (iMultiLineSwitch == -1)
+                        iMultiLineSwitch = tab.DisplayRectangle.Y;
+                    if (iMultiLineSwitch != tab.DisplayRectangle.Y)
+                    {
+                        iMultiLineSwitch = tab.DisplayRectangle.Y;
+                        bVirstVisible = true;
+                    }
+
+                    GraphicsPath path = this.GetTabPath(tabRect, 2, m_Alignment, true);
+                    Region clip = g.Clip;
+
+                    if (bVirstVisible || tab == m_SelectedTab)
+                    {
+                        //RectangleF pb=path.GetBounds();
+                        Rectangle pb = tabRect;
+                        pb.Width += pb.Height;
+                        //if(m_Alignment!=eTabStripAlignment.Bottom)
+                        pb.X -= pb.Height;
+
+                        pb.Width++;
+                        pb.Height++;
+                        if (m_Alignment == eTabStripAlignment.Bottom && bVirstVisible && tab != m_SelectedTab)
+                            pb.Y++;
+
+                        g.SetClip(pb, CombineMode.Replace);
+                    }
+                    else
+                    {
+                        if (m_Alignment == eTabStripAlignment.Top)
+                            g.SetClip(new Rectangle(tabRect.X + Dpi.Width1, tabRect.Y, tabRect.Width + Dpi.Width1, tabRect.Height), CombineMode.Replace);
+                        else
+                            g.SetClip(new Rectangle(tabRect.X + Dpi.Width1, tabRect.Y + Dpi.Height1, tabRect.Width + Dpi.Width1, tabRect.Height + Dpi.Height1), CombineMode.Replace);
+                    }
+                    ClipExcludeSystemBox(g);
+
+                    if (tabColors.BackColor2.IsEmpty)
+                    {
+                        using (SolidBrush brush = new SolidBrush(tabColors.BackColor))
+                            g.FillPath(brush, path);
+                    }
+                    else
+                    {
+                        using (LinearGradientBrush brush = BarFunctions.CreateLinearGradientBrush(path.GetBounds(), tabColors.BackColor, tabColors.BackColor2, (m_Alignment == eTabStripAlignment.Top ? tabColors.BackColorGradientAngle : -tabColors.BackColorGradientAngle)))
+                            g.FillPath(brush, path);
+                    }
+                    path.Dispose();
+                    path = this.GetTabPath(tabRect, 2, m_Alignment, false);
+                    using (Pen pen = new Pen(tabColors.BorderColor, Dpi.Width1))
+                        g.DrawPath(pen, path);
+
+                    if (m_TabSystemBox.Visible && this.HasNavigationBox && path.GetBounds().IntersectsWith(m_TabSystemBox.DisplayRectangle))
+                    {
+                        Region reg = new Region(path);
+                        reg.Intersect(m_TabSystemBox.DisplayRectangle);
+                        RectangleF rg = reg.GetBounds(g);
+                        reg.Dispose();
+                        using (Pen pen = new Pen(tabColors.BorderColor, Dpi.Width1))
+                        {
+                            pen.DashPattern = new float[] { 2, 2 };
+                            g.DrawLine(pen, rg.X - Dpi.Width1, rg.Y, rg.X - Dpi.Width1, rg.Bottom);
+                            g.DrawLine(pen, rg.X - Dpi.Width2, rg.Y + Dpi.Height2, rg.X - Dpi.Width2, rg.Bottom);
+                        }
+                    }
+                    else if (path.GetBounds().X < -1 && path.GetBounds().Right > 0)
+                    {
+                        RectangleF rg = path.GetBounds();
+                        using (Pen pen = new Pen(tabColors.BorderColor, Dpi.Width1))
+                        {
+                            pen.DashPattern = new float[] { 2, 2 };
+                            g.DrawLine(pen, 0, rg.Y, 0, rg.Bottom);
+                            g.DrawLine(pen, Dpi.Width1, rg.Y + Dpi.Height2, Dpi.Width1, rg.Bottom);
+                        }
+                    }
+
+                    Rectangle rh = tabRect;
+                    if (m_Alignment == eTabStripAlignment.Top)
+                    {
+                        rh.Offset(Dpi.Width1, Dpi.Height1);
+                        rh.X -= Dpi.Width1;
+                        rh.Width -= Dpi.Width1;
+                    }
+                    else
+                    {
+                        rh.Offset(Dpi.Width1, -Dpi.Height1);
+                        rh.X -= Dpi.Width1;
+                        rh.Width -= Dpi.Width1;
+                    }
+                    path.Dispose();
+                    path = GetTabPath(rh, 1, m_Alignment, false);
+
+                    if (!tabColors.LightBorderColor.IsEmpty)
+                    {
+                        RectangleF lightBounds = path.GetBounds();
+                        lightBounds.Height--;
+                        Region oldClip = g.Clip.Clone() as Region;
+                        g.SetClip(lightBounds, CombineMode.Intersect);
+
+                        using (Pen pen = new Pen(tabColors.LightBorderColor, Dpi.Width1))
+                            g.DrawPath(pen, path);
+
+                        g.SetClip(oldClip, CombineMode.Replace);
+                    }
+
+                    if (!tabColors.DarkBorderColor.IsEmpty)
+                    {
+                        RectangleF darkBounds = path.GetBounds();
+                        darkBounds.X = darkBounds.Right - Dpi.Width1;
+                        darkBounds.Width = Dpi.Width2;
+                        darkBounds.Height -= Dpi.Height1;
+
+                        g.SetClip(clip, CombineMode.Replace);
+                        g.SetClip(darkBounds, CombineMode.Intersect);
+                        using (Pen pen = new Pen(tabColors.DarkBorderColor, Dpi.Width1))
+                            g.DrawPath(pen, path);
+                    }
+                    path.Dispose();
+                    path = null;
+                    g.SetClip(clip, CombineMode.Replace);
+                    if (clip != null)
+                    {
+                        clip.Dispose();
+                        clip = null;
+                    }
+
+                    //if(m_Alignment==eTabStripAlignment.Top)
+                    tabRect.Offset(0, Dpi.Width1);
+
+                    if (m_CloseButtonOnTabs && tab.CloseButtonVisible)
+                        tab.CloseButtonBounds = this.PaintTabItemCloseButton(g, false, tab.CloseButtonMouseOver, tab == m_HotTab || tab == this.SelectedTab, ref tabRect);
+                    else
+                        tab.CloseButtonBounds = Rectangle.Empty;
+
+                    Image tabImage = tab.GetImage();
+                    Icon icon = tab.Icon;
+                    if (icon != null)
+                    {
+                        Rectangle rIcon = new Rectangle(tabRect.X + tabRect.Height / 3 + (m_Alignment == eTabStripAlignment.Top ? -Dpi.Width2 : 0), tabRect.Y + (tabRect.Height - tab.IconSize.Height) / 2, tab.IconSize.Width, tab.IconSize.Height);
+                        if (rClip.Contains(rIcon))
+                            g.DrawIcon(icon, rIcon);
+                        tabRect.X += (tab.IconSize.Width + Dpi.Width2);
+                        tabRect.Width -= (tab.IconSize.Width + Dpi.Width2);
+                    }
+                    else if (tabImage != null)
+                    {
+                        Size imageSize = Dpi.ImageSize(tabImage.Size);
+                        g.DrawImage(tabImage, tabRect.X + tabRect.Height / 3 + (m_Alignment == eTabStripAlignment.Top ? -Dpi.Width2 : 0), tabRect.Y + (tabRect.Height - imageSize.Height) / 2, imageSize.Width, imageSize.Height);
+                        tabRect.X += (imageSize.Width + Dpi.Width2);
+                        tabRect.Width -= (imageSize.Width + Dpi.Width2);
+                    }
+                    tabRect.Inflate(0, -Dpi.Height1);
+
+                    tabRect.Width -= Dpi.Width4;
+                    if (m_Style == eTabStripStyle.OneNote)
+                        tabRect.X += Dpi.Width3;
+
+                    if (!m_DisplaySelectedTextOnly || tab == m_SelectedTab)
+                    {
+                        Font font = this.Font;
+                        if (tab == selected && m_SelectedTabFont != null)
+                            font = m_SelectedTabFont;
+
+                        if (tab != selected)
+                        {
+                            if (tabRect.Width > MIN_TEXT_WIDTH)
+                                TextDrawing.DrawString(g, tab.Text, font, tabColors.TextColor, tabRect, strFormat);
+                            if (m_ShowFocusRectangle && this.Focused && tab == m_SelectedTab)
+                                ControlPaint.DrawFocusRectangle(g, GetFocusRectangle(tabRect));
+                        }
+                        else
+                        {
+                            if (tabRect.Width > MIN_TEXT_WIDTH)
+                                TextDrawing.DrawString(g, tab.Text, font, tabColors.TextColor, tabRect, strFormat);
+                            if (m_ShowFocusRectangle && this.Focused && tab == m_SelectedTab)
+                                ControlPaint.DrawFocusRectangle(g, GetFocusRectangle(tabRect));
+                        }
+                    }
+                }
+                if (HasPostRenderTabItem)
+                {
+                    RenderTabItemEventArgs re = new RenderTabItemEventArgs(tab, g);
+                    InvokePostRenderTabItem(re);
+                }
+                bVirstVisible = false;
+            }
+
+            g.ResetClip();
+            if (this.HasNavigationBox && m_TabSystemBox.Visible)
+            {
+                m_TabSystemBox.Paint(g);
+            }
+        }
+
+        private Rectangle PaintTabItemCloseButton(Graphics g, bool vertical, bool mouseOver, bool isTabHotOrSelected, ref Rectangle tabRect)
+        {
+            Size closeSize = Dpi.Size(m_CloseButtonSize);
+            bool closeOnLeftSide = (m_CloseButtonPosition == eTabCloseButtonPosition.Left);
+
+            int offset = (closeOnLeftSide ? Dpi.Width2 : Dpi.Width4);
+
+            Rectangle close = Rectangle.Empty;
+
+            if (closeOnLeftSide)
+            {
+                if (vertical)
+                    close = new Rectangle(tabRect.X + (tabRect.Width - closeSize.Width) / 2, tabRect.Y + offset, closeSize.Width, closeSize.Height);
+                else
+                    close = new Rectangle(tabRect.X + offset, tabRect.Y + (tabRect.Height - closeSize.Height) / 2, closeSize.Width, closeSize.Height);
+            }
+            else
+            {
+                if (vertical)
+                    close = new Rectangle(tabRect.X + (tabRect.Width - closeSize.Width) / 2, tabRect.Bottom - offset - closeSize.Height, closeSize.Width, closeSize.Height);
+                else
+                    close = new Rectangle(tabRect.Right - offset - closeSize.Width, tabRect.Y + (tabRect.Height - closeSize.Height) / 2, closeSize.Width, closeSize.Height);
+            }
+
+            if (isTabHotOrSelected || m_CloseButtonOnTabsAlwaysDisplayed)
+                TabStripBaseDisplay.PaintTabItemCloseButton(g, close, mouseOver, isTabHotOrSelected, this);
+
+            if (vertical)
+            {
+                if (closeOnLeftSide)
+                    tabRect.Y += close.Height + offset;
+                tabRect.Height -= close.Height + offset;
+            }
+            else
+            {
+                if (closeOnLeftSide)
+                    tabRect.X += close.Width + offset;
+                tabRect.Width -= close.Width + offset;
+            }
+
+            return close;
+        }
+
+        private GraphicsPath GetTabPath(Rectangle r, int rightCornerSize, eTabStripAlignment align, bool bCloseFigure)
+        {
+            Rectangle rbox = r;
+
+            if (align == eTabStripAlignment.Left)
+            {
+                // Left
+                rbox = new Rectangle(r.X, r.Y, r.Height, r.Width);
+            }
+            else if (align == eTabStripAlignment.Right)
+            {
+                // Right
+                rbox = new Rectangle(r.Right - r.Height, r.Y, r.Height, r.Width);
+            }
+
+            GraphicsPath path = new GraphicsPath();
+            Point[] p = new Point[4];
+            p[0].X = rbox.X + 2 - (rbox.Height + Dpi.Width1);
+            p[0].Y = rbox.Bottom - 1;
+            p[1].X = p[0].X + Dpi.Width3;
+            p[1].Y = p[0].Y - Dpi.Height2;
+            p[2].X = p[1].X + rbox.Height -Dpi.Width6;
+            p[2].Y = rbox.Y + Dpi.Height3;
+            p[3].X = p[2].X + Dpi.Width4;
+            p[3].Y = rbox.Y + Dpi.Height1;
+            path.AddCurve(p, 0, 3, .5f);
+            path.AddLine(p[3].X + 1, rbox.Y, rbox.Right - rightCornerSize, rbox.Y);
+            path.AddLine(rbox.Right - rightCornerSize, rbox.Y, rbox.Right, rbox.Y + rightCornerSize);
+            path.AddLine(rbox.Right, rbox.Y + rightCornerSize, rbox.Right, rbox.Bottom - 1);
+            if (bCloseFigure)
+            {
+                path.AddLine(p[0].X, rbox.Bottom, rbox.Right, rbox.Bottom);
+                path.CloseAllFigures();
+            }
+
+            if (align == eTabStripAlignment.Bottom)
+            {
+                path.Dispose();
+                path = new GraphicsPath();
+                p = new Point[4];
+                p[0].X = rbox.X + Dpi.Width2 - (rbox.Height + Dpi.Width1);
+                p[0].Y = rbox.Top + Dpi.Height1;
+                p[1].X = p[0].X + Dpi.Width3;
+                p[1].Y = p[0].Y + Dpi.Height2;
+                p[2].X = p[1].X + rbox.Height - Dpi.Width6;
+                p[2].Y = rbox.Bottom - Dpi.Height3;
+                p[3].X = p[2].X + Dpi.Width4;
+                p[3].Y = rbox.Bottom - Dpi.Height1;
+                path.AddCurve(p, 0, 3, .5f);
+                path.AddLine(p[3].X + Dpi.Width1, rbox.Bottom, rbox.Right - rightCornerSize, rbox.Bottom);
+                path.AddLine(rbox.Right - rightCornerSize, rbox.Bottom, rbox.Right, rbox.Bottom - rightCornerSize);
+                path.AddLine(rbox.Right, rbox.Bottom - rightCornerSize, rbox.Right, rbox.Y + Dpi.Height1);
+                if (bCloseFigure)
+                {
+                    path.AddLine(p[0].X, rbox.Y, rbox.Right, rbox.Y);
+                    path.CloseAllFigures();
+                }
+                // Bottom
+                //Matrix m=new Matrix();
+                ////RectangleF rf=path.GetBounds();
+                //m.RotateAt(180,new PointF(rbox.X+rbox.Width/2,rbox.Y+rbox.Height/2));
+                //path.Transform(m);
+            }
+            else if (align == eTabStripAlignment.Left)
+            {
+                // Left
+                Matrix m = new Matrix();
+                //RectangleF rf=path.GetBounds();
+                m.RotateAt(-90, new PointF(rbox.X, rbox.Bottom));
+                m.Translate(rbox.Height, rbox.Width - rbox.Height, MatrixOrder.Append);
+                path.Transform(m);
+            }
+            else if (align == eTabStripAlignment.Right)
+            {
+                // Right
+                Matrix m = new Matrix();
+                //RectangleF rf=path.GetBounds();
+                m.RotateAt(90, new PointF(rbox.Right, rbox.Bottom));
+                m.Translate(-rbox.Height, rbox.Width - (rbox.Height - 1), MatrixOrder.Append);
+                path.Transform(m);
+            }
+
+            return path;
+        }
+
+        private void PaintThemed(Graphics g)
+        {
+            if (m_ThemeTab == null)
+                this.RefreshThemes();
+
+            if (m_ColorScheme.TabBackground.IsEmpty)
+                m_ThemeTab.DrawBackground(g, ThemeTabParts.Body, ThemeTabStates.BodyNormal, this.ClientRectangle);
+            else if (!m_ColorScheme.TabBackground2.IsEmpty && this.Width > 0 && this.Height > 0)
+            {
+                using (LinearGradientBrush gradient = BarFunctions.CreateLinearGradientBrush(this.ClientRectangle, m_ColorScheme.TabBackground, m_ColorScheme.TabBackground2, m_ColorScheme.TabBackgroundGradientAngle))
+                    g.FillRectangle(gradient, this.ClientRectangle);
+            }
+            else
+            {
+                using (SolidBrush brush = new SolidBrush(m_ColorScheme.TabBackground))
+                    g.FillRectangle(brush, this.DisplayRectangle);
+                //g.Clear(m_ColorScheme.TabBackground);
+            }
+
+            Rectangle r = this.GetTabClientArea(this.DisplayRectangle, false, false); //this.DisplayRectangle;
+
+            // Text format
+            TabItem selected = this.SelectedTab;
+            eTextFormat strFormat = eTextFormat.Default | eTextFormat.SingleLine |
+                eTextFormat.EndEllipsis | eTextFormat.VerticalCenter | eTextFormat.HorizontalCenter;
+
+            if (m_NeedRecalcSize)
+                RecalcSize(g, r);
+
+            // Draw tab base line
+            if (this.Parent is TabControl)
+            {
+                if (m_Alignment == eTabStripAlignment.Top)
+                    m_ThemeTab.DrawBackground(g, ThemeTabParts.Pane, ThemeTabStates.PaneNormal, new Rectangle(0, r.Bottom, ClientRectangle.Width, ClientRectangle.Height));
+                else
+                {
+                    Size sz = new Size(this.Width, 5);
+                    if (m_Alignment == eTabStripAlignment.Left || m_Alignment == eTabStripAlignment.Right)
+                        sz = new Size(this.Height, 5);
+                    Bitmap bmp = new Bitmap(sz.Width, sz.Height, g);
+                    try
+                    {
+                        Graphics gtmp = Graphics.FromImage(bmp);
+                        try
+                        {
+                            m_ThemeTab.DrawBackground(gtmp, ThemeTabParts.Pane, ThemeTabStates.PaneNormal, new Rectangle(0, 0, sz.Width, sz.Height));
+                        }
+                        finally
+                        {
+                            gtmp.Dispose();
+                        }
+                        if (m_Alignment == eTabStripAlignment.Left)
+                        {
+                            bmp.RotateFlip(RotateFlipType.Rotate270FlipNone);
+                            g.DrawImageUnscaled(bmp, r.Right, 0);
+                        }
+                        else if (m_Alignment == eTabStripAlignment.Right)
+                        {
+                            bmp.RotateFlip(RotateFlipType.Rotate90FlipNone);
+                            g.DrawImageUnscaled(bmp, r.X - bmp.Width, 0);
+                        }
+                        else if (m_Alignment == eTabStripAlignment.Bottom)
+                        {
+                            bmp.RotateFlip(RotateFlipType.Rotate180FlipNone);
+                            g.DrawImageUnscaled(bmp, 0, r.Y - bmp.Height);
+                        }
+                    }
+                    finally
+                    {
+                        bmp.Dispose();
+                    }
+                }
+            }
+
+            if (m_Alignment == eTabStripAlignment.Top)
+                r.Height++;
+            Rectangle rClip = r;
+            if (m_Alignment == eTabStripAlignment.Bottom)
+            {
+                rClip.Y--;
+                rClip.Height++;
+            }
+            else if (m_Alignment == eTabStripAlignment.Left)
+            {
+                rClip.Width++;
+            }
+            else if (m_Alignment == eTabStripAlignment.Right)
+            {
+                rClip.X--;
+                rClip.Width++;
+            }
+            if (this.HasNavigationBox)
+            {
+                if (m_Alignment == eTabStripAlignment.Right || m_Alignment == eTabStripAlignment.Left)
+                    rClip.Height -= m_TabSystemBox.DisplayRectangle.Height;
+                else
+                    rClip.Width -= m_TabSystemBox.DisplayRectangle.Width;
+            }
+            g.SetClip(rClip);
+
+            foreach (TabItem tab in m_Tabs)
+            {
+                if (!tab.Visible || !r.IntersectsWith(tab.DisplayRectangle))
+                    continue;
+
+                if (HasPreRenderTabItem)
+                {
+                    RenderTabItemEventArgs re = new RenderTabItemEventArgs(tab, g);
+                    InvokePreRenderTabItem(re);
+                    if (re.Cancel) continue;
+                }
+
+                Rectangle tabRect = tab.DisplayRectangle;
+                Rectangle rTemp = new Rectangle(0, 0, tabRect.Width, tabRect.Height);
+                if (m_Alignment == eTabStripAlignment.Left || m_Alignment == eTabStripAlignment.Right)
+                    rTemp = new Rectangle(0, 0, tabRect.Height, tabRect.Width);
+                if (tab == selected)
+                {
+                    if (m_Alignment == eTabStripAlignment.Top)
+                        rTemp.Height += 2;
+                    else if (m_Alignment == eTabStripAlignment.Bottom)
+                    {
+                        rTemp.Height += 2;
+                        tabRect.Y--;
+                    }
+                    else if (m_Alignment == eTabStripAlignment.Left)
+                    {
+                        rTemp.Height += 2;
+                        tabRect.X--;
+                    }
+                    else if (m_Alignment == eTabStripAlignment.Right)
+                    {
+                        rTemp.Height += 2;
+                        tabRect.X--;
+                    }
+                }
+
+                Bitmap temp = new Bitmap(rTemp.Width, rTemp.Height, g);
+                try
+                {
+                    Graphics gtemp = Graphics.FromImage(temp);
+                    try
+                    {
+                        using (SolidBrush brush = new SolidBrush(Color.Transparent))
+                            gtemp.FillRectangle(brush, 0, 0, temp.Width, temp.Height);
+                        //gtemp.Clear(Color.Transparent);
+                        if (m_Alignment == eTabStripAlignment.Bottom)
+                        {
+                            DrawThemedTab(gtemp, rTemp, tab, strFormat, rTemp, true, false);
+                            temp.RotateFlip(RotateFlipType.Rotate180FlipNone);
+                            DrawThemedTab(gtemp, rTemp, tab, strFormat, rTemp, false, true);
+                        }
+                        else
+                            DrawThemedTab(gtemp, rTemp, tab, strFormat, rTemp, true, true);
+                    }
+                    finally
+                    {
+                        gtemp.Dispose();
+                    }
+                }
+                finally
+                {
+                    if (m_Alignment == eTabStripAlignment.Left)
+                        temp.RotateFlip(RotateFlipType.Rotate270FlipNone);
+                    else if (m_Alignment == eTabStripAlignment.Right)
+                        temp.RotateFlip(RotateFlipType.Rotate90FlipNone);
+
+                    g.DrawImageUnscaled(temp, tabRect);
+                    temp.Dispose();
+                }
+
+                if (HasPostRenderTabItem)
+                {
+                    RenderTabItemEventArgs re = new RenderTabItemEventArgs(tab, g);
+                    InvokePostRenderTabItem(re);
+                }
+            }
+            g.ResetClip();
+            if (this.HasNavigationBox && m_TabSystemBox.Visible)
+            {
+                g.SetClip(m_TabSystemBox.DisplayRectangle);
+                using (SolidBrush brushSysBox = new SolidBrush(m_ColorScheme.TabBackground))
+                    g.FillRectangle(brushSysBox, m_TabSystemBox.DisplayRectangle);
+                m_TabSystemBox.Paint(g);
+                g.ResetClip();
+            }
+
+        }
+        private void DrawThemedTab(Graphics g, Rectangle tabRect, TabItem tab, eTextFormat strFormat, Rectangle rClip, bool drawBack, bool drawInner)
+        {
+            TabColors tabColor = this.GetTabColors(tab);
+            ThemeTabStates tabState = ThemeTabStates.Normal;
+
+            if (m_HotTab == tab)
+                tabState = ThemeTabStates.Hot;
+            else if (tab == m_SelectedTab)
+                tabState = ThemeTabStates.Selected;
+
+            if (drawBack)
+            {
+                if (tab == m_SelectedTab)
+                    m_ThemeTab.DrawBackground(g, ThemeTabParts.TabItem, tabState, new Rectangle(tabRect.X, tabRect.Y, tabRect.Width, tabRect.Height + 1));
+                else
+                    m_ThemeTab.DrawBackground(g, ThemeTabParts.TabItem, tabState, new Rectangle(tabRect.X, tabRect.Y, tabRect.Width, tabRect.Height + 1));
+            }
+
+            tabRect.Offset(0, 1);
+
+            if (drawInner)
+            {
+                if (m_CloseButtonOnTabs && tab.CloseButtonVisible)
+                {
+                    Rectangle rc = PaintTabItemCloseButton(g, (m_Alignment == eTabStripAlignment.Left || m_Alignment == eTabStripAlignment.Right), tab.CloseButtonMouseOver, tab == m_HotTab || tab == this.SelectedTab, ref tabRect);
+                    rc.Offset(tab.DisplayRectangle.Location);
+                    tab.CloseButtonBounds = rc;
+                }
+                else
+                    tab.CloseButtonBounds = Rectangle.Empty;
+
+                Image tabImage = tab.GetImage();
+                Icon icon = tab.Icon;
+                Size imageSize = tabImage!=null?Dpi.ImageSize(tabImage.Size):Size.Empty;
+                if (tabImage != null && tabImage.Width + 4 <= tabRect.Width || icon != null && tab.IconSize.Width + 4 <= tabRect.Width)
+                {
+                    if (icon != null)
+                    {
+                        Rectangle rIcon = new Rectangle(tabRect.X + 4, tabRect.Y + (tabRect.Height - tab.IconSize.Height) / 2, tab.IconSize.Width, tab.IconSize.Height);
+                        if (rClip.Contains(rIcon))
+                            g.DrawIcon(icon, rIcon);
+                        tabRect.X += (tab.IconSize.Width + 2);
+                        tabRect.Width -= (tab.IconSize.Width + 2);
+                    }
+                    else if (tabImage != null)
+                    {
+                        g.DrawImage(tabImage, tabRect.X + 4, tabRect.Y + (tabRect.Height - imageSize.Height) / 2, imageSize.Width, imageSize.Height);
+                        tabRect.X += (imageSize.Width + 2);
+                        tabRect.Width -= (imageSize.Width + 2);
+                    }
+                    tabRect.Inflate(0, -1);
+                    tabRect.Width -= 4;
+                    tabRect.X += 3;
+                }
+
+                if (!m_DisplaySelectedTextOnly || tab == m_SelectedTab)
+                {
+                    Font font = this.Font;
+                    if (tab == m_SelectedTab && m_SelectedTabFont != null)
+                        font = m_SelectedTabFont;
+
+                    if (tabRect.Width > MIN_TEXT_WIDTH)
+                        TextDrawing.DrawString(g, tab.Text, font, tabColor.TextColor, tabRect, strFormat);
+                    if (m_ShowFocusRectangle && this.Focused && tab == m_SelectedTab)
+                        ControlPaint.DrawFocusRectangle(g, GetFocusRectangle(tabRect));
+                }
+            }
+        }
+
+        private void PaintVS2005(Graphics g)
+        {
+            if (!m_ColorScheme.TabBackground2.IsEmpty && this.Width > 0 && this.Height > 0)
+            {
+                using (LinearGradientBrush gradient = BarFunctions.CreateLinearGradientBrush(this.ClientRectangle, m_ColorScheme.TabBackground, m_ColorScheme.TabBackground2, m_ColorScheme.TabBackgroundGradientAngle))
+                    g.FillRectangle(gradient, this.ClientRectangle);
+            }
+            else
+            {
+                using (SolidBrush brush = new SolidBrush(m_ColorScheme.TabBackground))
+                    g.FillRectangle(brush, this.DisplayRectangle);
+            }
+
+            Rectangle r = this.GetTabClientArea(this.DisplayRectangle, false, false);
+            Rectangle client = this.DisplayRectangle;
+
+            if (m_NeedRecalcSize)
+                RecalcSize(g, r);
+
+            // Text format
+            TabItem selected = this.SelectedTab;
+            Rectangle selectedRect = Rectangle.Empty;
+            if (selected != null)
+                selectedRect = selected.DisplayRectangle;
+            eTextFormat strFormat = eTextFormat.Default | eTextFormat.SingleLine | eTextFormat.EndEllipsis |
+                eTextFormat.VerticalCenter | eTextFormat.HorizontalCenter;
+
+            switch (m_Alignment)
+            {
+                case eTabStripAlignment.Top:
+                    {
+                        using (Pen pen = new Pen(m_ColorScheme.TabItemSelectedBorder, 1))
+                        {
+                            if (!selectedRect.IsEmpty)
+                            {
+                                g.DrawLine(pen, client.X, r.Bottom, selectedRect.X, r.Bottom);
+                                g.DrawLine(pen, selectedRect.Right - 1, r.Bottom, client.Right, r.Bottom);
+                            }
+                            else
+                                g.DrawLine(pen, client.X, client.Bottom - 1, client.Right, client.Bottom - 1);
+                        }
+                        //r.Height--;
+                        break;
+                    }
+                case eTabStripAlignment.Bottom:
+                    {
+                        using (Pen pen = new Pen(m_ColorScheme.TabItemSelectedBorder, 1))
+                        {
+                            if (!selectedRect.IsEmpty)
+                            {
+                                g.DrawLine(pen, client.X, client.Y, selectedRect.X, client.Y);
+                                g.DrawLine(pen, selectedRect.Right - 1, client.Y, client.Right, client.Y);
+                            }
+                            else
+                                g.DrawLine(pen, client.X, client.Y, client.Right, client.Y);
+                        }
+                        r.Y++;
+                        r.Height--;
+                        break;
+                    }
+                case eTabStripAlignment.Left:
+                    {
+                        using (Pen pen = new Pen(m_ColorScheme.TabItemSelectedBorder, 1))
+                        {
+                            if (!selectedRect.IsEmpty)
+                            {
+                                g.DrawLine(pen, client.Right - 1, client.Y, client.Right - 1, selectedRect.Y);
+                                g.DrawLine(pen, client.Right - 1, selectedRect.Bottom - 1, client.Right - 1, client.Bottom);
+                            }
+                            else
+                                g.DrawLine(pen, client.Right - 1, client.Y, client.Right - 1, client.Bottom);
+                        }
+                        r.Width--;
+                        break;
+                    }
+                case eTabStripAlignment.Right:
+                    {
+                        using (Pen pen = new Pen(m_ColorScheme.TabItemSelectedBorder, 1))
+                        {
+                            if (!selectedRect.IsEmpty)
+                            {
+                                g.DrawLine(pen, client.X, client.Y, client.X, selectedRect.Y);
+                                g.DrawLine(pen, client.X, selectedRect.Bottom - 1, client.X, client.Bottom);
+                            }
+                            else
+                                g.DrawLine(pen, client.X, client.Y, client.X, client.Bottom);
+                        }
+                        r.Width--;
+                        r.X++;
+                        break;
+                    }
+            }
+
+            if (this.HasNavigationBox && m_TabSystemBox.Visible)
+            {
+                if (m_Alignment == eTabStripAlignment.Right || m_Alignment == eTabStripAlignment.Left)
+                    r.Height -= m_TabSystemBox.DisplayRectangle.Height;
+                else
+                {
+                    r.Width -= m_TabSystemBox.DisplayRectangle.Width;
+                    if (this.IsRightToLeft)
+                        r.X += m_TabSystemBox.DisplayRectangle.Width;
+                }
+            }
+
+            Rectangle rClip = r;
+            if (m_Alignment == eTabStripAlignment.Right)
+                rClip.Width++;
+
+            g.SetClip(rClip);
+
+            foreach (TabItem tab in m_Tabs)
+            {
+                if (!tab.Visible || !r.IntersectsWith(tab.DisplayRectangle))
+                    continue;
+
+                if (HasPreRenderTabItem)
+                {
+                    RenderTabItemEventArgs re = new RenderTabItemEventArgs(tab, g);
+                    InvokePreRenderTabItem(re);
+                    if (re.Cancel) continue;
+                }
+
+                Rectangle tabRect = tab.DisplayRectangle;
+                TabColors colors = GetTabColors(tab);
+
+                GraphicsPath path = new GraphicsPath();
+                switch (m_Alignment)
+                {
+                    case eTabStripAlignment.Top:
+                        {
+                            tabRect.Width--;
+                            path.AddLine(tabRect.X + 2, tabRect.Y, tabRect.Right - 2, tabRect.Y);
+                            path.AddLine(tabRect.Right, tabRect.Y + 2, tabRect.Right, tabRect.Bottom);
+                            path.AddLine(tabRect.Right, tabRect.Bottom, tabRect.X, tabRect.Bottom);
+                            path.AddLine(tabRect.X, tabRect.Y + 2, tabRect.X + 2, tabRect.Y);
+                            path.CloseAllFigures();
+                            break;
+                        }
+                    case eTabStripAlignment.Bottom:
+                        {
+                            tabRect.Width--;
+                            path.AddLine(tabRect.X, tabRect.Y, tabRect.Right, tabRect.Y);
+                            path.AddLine(tabRect.Right, tabRect.Y, tabRect.Right, tabRect.Bottom - 2);
+                            path.AddLine(tabRect.Right - 2, tabRect.Bottom, tabRect.X + 2, tabRect.Bottom);
+                            path.AddLine(tabRect.X, tabRect.Bottom - 2, tabRect.X, tabRect.Y);
+                            path.CloseAllFigures();
+                            break;
+                        }
+                    case eTabStripAlignment.Left:
+                        {
+                            tabRect.Height--;
+                            path.AddLine(tabRect.X + 2, tabRect.Y, tabRect.Right, tabRect.Y);
+                            path.AddLine(tabRect.Right, tabRect.Bottom, tabRect.X + 2, tabRect.Bottom);
+                            path.AddLine(tabRect.X, tabRect.Bottom - 2, tabRect.X, tabRect.Y + 2);
+                            path.CloseAllFigures();
+                            break;
+                        }
+                    case eTabStripAlignment.Right:
+                        {
+                            tabRect.Height--;
+                            tabRect.Width -= 2;
+                            path.AddLine(tabRect.X, tabRect.Y, tabRect.Right - 2, tabRect.Y);
+                            path.AddLine(tabRect.Right, tabRect.Y + 2, tabRect.Right, tabRect.Bottom - 2);
+                            path.AddLine(tabRect.Right - 2, tabRect.Bottom, tabRect.X, tabRect.Bottom);
+                            path.CloseAllFigures();
+                            break;
+                        }
+                }
+
+                // Draw Background
+                //g.SetClip(rClip);
+                if (colors.BackColor2.IsEmpty)
+                {
+                    if (!colors.BackColor.IsEmpty)
+                    {
+                        using (SolidBrush brush = new SolidBrush(colors.BackColor))
+                            g.FillPath(brush, path);
+                    }
+                }
+                else
+                {
+                    using (LinearGradientBrush brush = BarFunctions.CreateLinearGradientBrush(tabRect, colors.BackColor, colors.BackColor2, colors.BackColorGradientAngle))
+                        g.FillPath(brush, path);
+                }
+                //g.SetClip(rClip);
+
+                // Draw border
+                if (!colors.BorderColor.IsEmpty)
+                {
+                    using (Pen pen = new Pen(colors.BorderColor, 1))
+                        g.DrawPath(pen, path);
+                }
+
+                if (m_CloseButtonOnTabs && tab.CloseButtonVisible)
+                    tab.CloseButtonBounds = PaintTabItemCloseButton(g, (m_Alignment == eTabStripAlignment.Left || m_Alignment == eTabStripAlignment.Right), tab.CloseButtonMouseOver, tab == m_HotTab || tab == this.SelectedTab, ref tabRect);
+                else
+                    tab.CloseButtonBounds = Rectangle.Empty;
+                // Draw image
+                CompositeImage image = this.GetTabImage(tab);
+                if (image != null && image.Width + 4 <= tabRect.Width)
+                {
+                    if (m_Alignment == eTabStripAlignment.Top || m_Alignment == eTabStripAlignment.Bottom)
+                    {
+                        image.DrawImage(g, new Rectangle(tabRect.X + 3, tabRect.Y + (tabRect.Height - image.Height) / 2, image.Width, image.Height));
+                        int offset = image.Width + 2;
+                        tabRect.X += offset;
+                        tabRect.Width -= offset;
+                    }
+                    else
+                    {
+                        image.DrawImage(g, new Rectangle(tabRect.X + (tabRect.Width - image.Width) / 2, tabRect.Y + 3, image.Width, image.Height));
+                        int offset = image.Height + 2;
+                        tabRect.Y += offset;
+                        tabRect.Height -= offset;
+                    }
+                }
+
+                // Draw text
+                if (!m_DisplaySelectedTextOnly || tab == m_SelectedTab)
+                {
+                    Font font = this.Font;
+                    if (tab == selected && m_SelectedTabFont != null)
+                        font = m_SelectedTabFont;
+
+                    Rectangle rText = tabRect;
+                    if (m_Alignment == eTabStripAlignment.Left || m_Alignment == eTabStripAlignment.Right)
+                    {
+                        g.RotateTransform(90);
+                        rText = new Rectangle(rText.Top, -rText.Right, rText.Height, rText.Width);
+                    }
+
+                    if (rText.Width > MIN_TEXT_WIDTH)
+                    {
+                        if (m_Alignment == eTabStripAlignment.Left || m_Alignment == eTabStripAlignment.Right)
+                            TextDrawing.DrawStringLegacy(g, tab.Text, font, colors.TextColor, rText, strFormat);
+                        else
+                            TextDrawing.DrawString(g, tab.Text, font, colors.TextColor, rText, strFormat);
+                    }
+
+                    if (m_Alignment == eTabStripAlignment.Left || m_Alignment == eTabStripAlignment.Right)
+                        g.ResetTransform();
+
+                    if (m_ShowFocusRectangle && this.Focused && tab == selected)
+                        ControlPaint.DrawFocusRectangle(g, GetFocusRectangle(tabRect));
+                }
+
+                // Draw tab separator line
+                if (!tab.IsSelected && m_Tabs.IndexOf(tab) < m_Tabs.Count - 1 && m_Tabs.IndexOf(tab) + 1 != m_Tabs.IndexOf(m_SelectedTab))
+                {
+                    if (m_Alignment == eTabStripAlignment.Left || m_Alignment == eTabStripAlignment.Right)
+                    {
+                        DisplayHelp.DrawLine(g, tab.DisplayRectangle.X + 3, tab.DisplayRectangle.Bottom - 1, tab.DisplayRectangle.Right - 3, tab.DisplayRectangle.Bottom - 1, m_ColorScheme.TabItemSeparator, 1);
+                        DisplayHelp.DrawLine(g, tab.DisplayRectangle.X + 3, tab.DisplayRectangle.Bottom, tab.DisplayRectangle.Right - 3, tab.DisplayRectangle.Bottom, m_ColorScheme.TabItemSeparatorShade, 1);
+                    }
+                    else
+                    {
+                        DisplayHelp.DrawLine(g, tab.DisplayRectangle.Right - 1, tab.DisplayRectangle.Y + 3, tab.DisplayRectangle.Right - 1, tab.DisplayRectangle.Bottom - 3, m_ColorScheme.TabItemSeparator, 1);
+                        DisplayHelp.DrawLine(g, tab.DisplayRectangle.Right, tab.DisplayRectangle.Y + 3, tab.DisplayRectangle.Right, tab.DisplayRectangle.Bottom - 3, m_ColorScheme.TabItemSeparatorShade, 1);
+                    }
+
+                }
+
+                if (HasPostRenderTabItem)
+                {
+                    RenderTabItemEventArgs re = new RenderTabItemEventArgs(tab, g);
+                    InvokePostRenderTabItem(re);
+                }
+            }
+
+            g.ResetClip();
+            if (this.HasNavigationBox && m_TabSystemBox.Visible)
+            {
+                g.SetClip(m_TabSystemBox.DisplayRectangle);
+                using (SolidBrush brushSysBox = new SolidBrush(m_ColorScheme.TabBackground))
+                    g.FillRectangle(brushSysBox, m_TabSystemBox.DisplayRectangle);
+                m_TabSystemBox.Paint(g);
+                g.ResetClip();
+            }
+        }
+
+        private CompositeImage GetTabImage(TabItem tab)
+        {
+            Image image = tab.GetImage();
+            if (image != null)
+                return new CompositeImage(image, false);
+            Icon icon = tab.Icon;
+            if (icon != null)
+                return new CompositeImage(icon, false, tab.IconSize);
+
+            return null;
+        }
+
+        /// <summary>
+        /// Returns minimum tab strip height given the style and the tabs it contains.
+        /// </summary>
+        [Browsable(false)]
+        public int MinTabStripHeight
+        {
+            get
+            {
+                if (m_Style == eTabStripStyle.SimulatedTheme || m_Style == eTabStripStyle.Office2007Document || m_Style == eTabStripStyle.Office2007Dock)
+                {
+                    if (m_TabItemsBounds.IsEmpty || m_NeedRecalcSize)
+                    {
+                        if (this.Tabs.Count == 0 || !m_NeedRecalcSize)
+                            return this.TabHeight + 6;
+                        this.RecalcSize();
+                    }
+                    if (m_Alignment == eTabStripAlignment.Top || m_Alignment == eTabStripAlignment.Bottom)
+                        return m_TabItemsBounds.Height + 3;
+                    else
+                        return (m_TabItemsBounds.Width + 3);
+                }
+                //else if (m_Style == eTabStripStyle.Office2007Document && (m_TabItemsBounds.IsEmpty || m_NeedRecalcSize))
+                //    this.RecalcSize();
+                if (m_Style == eTabStripStyle.OneNote || m_Style == eTabStripStyle.VS2005Document)
+                    return this.TabHeight + 6;
+                else
+                    return this.TabHeight + 5;
+            }
+        }
+
+        private int m_TabHeight = -1;
+        private int TabHeight
+        {
+            get
+            {
+                if (m_TabHeight <= 0)
+                {
+                    Graphics g = null;
+                    if (BarFunctions.IsHandleValid(this))
+                        g = this.CreateGraphics();
+                    else
+                    {
+                        try
+                        {
+                            g = Graphics.FromHwnd(IntPtr.Zero);
+                        }
+                        catch { }
+                    }
+                    if (g != null)
+                    {
+                        try
+                        {
+                            m_TabHeight = GetTabHeight(g);
+                        }
+                        finally
+                        {
+                            g.Dispose();
+                        }
+                    }
+                }
+
+                return m_TabHeight;
+            }
+        }
+        internal void ResetTabHeight()
+        {
+            m_TabHeight = 0;
+        }
+        private int GetSingleTabHeight()
+        {
+            if (this.IsMultiLine)
+            {
+                int height = 0;
+                if (BarFunctions.IsHandleValid(this))
+                {
+                    Graphics g = this.CreateGraphics();
+                    try
+                    {
+                        height = GetTabHeight(g);
+                    }
+                    finally
+                    {
+                        g.Dispose();
+                    }
+                }
+                return height;
+            }
+            return this.TabHeight;
+        }
+
+        private bool IsVertical
+        {
+            get
+            {
+                if ((m_Alignment == eTabStripAlignment.Left || m_Alignment == eTabStripAlignment.Right) && this.Style != eTabStripStyle.SimulatedTheme)
+                    return true;
+                return false;
+            }
+        }
+
+        private int GetTabHeight(Graphics g)
+        {
+            if (m_FixedTabSize.Height > 0)
+                return Dpi.Height(m_FixedTabSize.Height);
+            int iHeight = Dpi.Height16;
+            if ((m_Alignment == eTabStripAlignment.Left || m_Alignment == eTabStripAlignment.Right) && m_Style != eTabStripStyle.OneNote && m_Style != eTabStripStyle.VS2005Document && m_Style != eTabStripStyle.Office2007Document)
+                iHeight = Dpi.Height20;
+            if (m_ImageList != null)
+                iHeight = Dpi.Height(m_ImageList.ImageSize.Height);
+            else
+            {
+                Font font = this.Font;
+                if (m_SelectedTabFont != null)
+                    font = m_SelectedTabFont;
+                foreach (TabItem tab in m_Tabs)
+                {
+                    if (tab.Icon != null && tab.Icon.Height > iHeight)
+                        iHeight = Dpi.Height(tab.IconSize.Height);
+                    else if (tab.Image != null && tab.Image.Height > iHeight)
+                        iHeight = Dpi.Height(tab.Image.Height);
+                    string s = tab.Text;
+                    if (s != "")
+                    {
+                        Size sz = Size.Empty;
+                        if (IsVertical)
+                            sz = TextDrawing.MeasureStringLegacy(g, tab.Text, font, Size.Empty, eTextFormat.Default);
+                        else
+                            sz = TextDrawing.MeasureString(g, tab.Text, font);
+                        if (sz.Height > iHeight)
+                            iHeight = sz.Height;
+                    }
+                }
+            }
+            if (this.Font.Height > iHeight)
+                iHeight = this.Font.Height;
+            iHeight += Dpi.Height4;
+            if (m_Style == eTabStripStyle.Metro) iHeight += Dpi.Height2;
+            if (this.IsThemed)
+                iHeight += Dpi.Width1;
+
+            return iHeight;
+        }
+
+        /// <summary>
+        /// Returns the rectangle that contains all the tabs.
+        /// </summary>
+        internal Rectangle TabItemsBounds
+        {
+            get { return m_TabItemsBounds; }
+        }
+
+        /// <summary>
+        /// Recalculates the size of the tabs.
+        /// </summary>
+        public void RecalcSize()
+        {
+            if (!BarFunctions.IsHandleValid(this))
+            {
+                m_NeedRecalcSize = true;
+                return;
+            }
+            Graphics g = this.CreateGraphics();
+            try
+            {
+                RecalcSize(g, GetTabClientArea(this.DisplayRectangle, (this.TabLayoutType == eTabLayoutType.MultilineWithNavigationBox), false));
+            }
+            finally
+            {
+                g.Dispose();
+            }
+        }
+
+        private bool IsRightToLeft
+        {
+            get
+            {
+                return (this.RightToLeft == RightToLeft.Yes);
+            }
+        }
+
+        private void RecalcSizeContentManager(Graphics g, Rectangle dispRect)
+        {
+            if (this.Tabs.Count == 0)
+            {
+                if (this.IsRightToLeft)
+                    RecalcSizeTabSystemBox(dispRect, Rectangle.Empty);
+                else
+                    RecalcSizeTabSystemBox(dispRect, Rectangle.Empty);
+                return;
+            }
+            SerialContentLayoutManager m = new SerialContentLayoutManager();
+            TabItemLayoutManager blockManager = new TabItemLayoutManager(this);
+            blockManager.FixedTabSize = m_FixedTabSize;
+            blockManager.CloseButtonOnTabs = m_CloseButtonOnTabs;
+            Size closeButtonSize = Dpi.Size(m_CloseButtonSize);
+            blockManager.CloseButtonSize = closeButtonSize;
+            m.RightToLeft = this.IsRightToLeft;
+            if (m_Style == eTabStripStyle.RoundHeader)
+            {
+                m.ContentAlignment = eContentAlignment.Center;
+                m.EvenHeight = true;
+                m.FitContainerOversize = true;
+            }
+            else if (m_Style == eTabStripStyle.Office2007Document)
+            {
+                m.EvenHeight = true;
+                if (m_Alignment == eTabStripAlignment.Bottom)
+                {
+                    m.ContentAlignment = eContentAlignment.Left;
+                    m.ContentVerticalAlignment = eContentVerticalAlignment.Top;
+                    m.BlockLineAlignment = eContentVerticalAlignment.Top;
+                    m.ContentOrientation = eContentOrientation.Horizontal;
+                }
+                else if (m_Alignment == eTabStripAlignment.Top)
+                {
+                    m.ContentAlignment = eContentAlignment.Left;
+                    m.ContentVerticalAlignment = eContentVerticalAlignment.Bottom;
+                    m.BlockLineAlignment = eContentVerticalAlignment.Bottom;
+                    m.ContentOrientation = eContentOrientation.Horizontal;
+                }
+                else if (m_Alignment == eTabStripAlignment.Left)
+                {
+                    m.ContentAlignment = eContentAlignment.Right;
+                    m.ContentVerticalAlignment = eContentVerticalAlignment.Top;
+                    m.BlockLineAlignment = eContentVerticalAlignment.Top;
+                    m.ContentOrientation = eContentOrientation.Vertical;
+                }
+                else if (m_Alignment == eTabStripAlignment.Right)
+                {
+                    m.ContentAlignment = eContentAlignment.Left;
+                    m.ContentVerticalAlignment = eContentVerticalAlignment.Top;
+                    m.BlockLineAlignment = eContentVerticalAlignment.Top;
+                    m.ContentOrientation = eContentOrientation.Vertical;
+                }
+                m.BlockSpacing = 0;
+                if (m_Alignment == eTabStripAlignment.Top || m_Alignment == eTabStripAlignment.Bottom)
+                {
+                    //dispRect.X += 4;
+                    dispRect.Width -= Dpi.Width2;
+                }
+                else
+                {
+                    //dispRect.Y += 4;
+                    dispRect.Height -= Dpi.Height2;
+                }
+                blockManager.PaddingHeight = 6;
+            }
+            else if (m_Style == eTabStripStyle.Office2007Dock)
+            {
+                m.EvenHeight = true;
+                if (m_Alignment == eTabStripAlignment.Bottom)
+                {
+                    m.ContentAlignment = eContentAlignment.Left;
+                    m.ContentVerticalAlignment = eContentVerticalAlignment.Top;
+                    m.BlockLineAlignment = eContentVerticalAlignment.Top;
+                    m.ContentOrientation = eContentOrientation.Horizontal;
+                }
+                else if (m_Alignment == eTabStripAlignment.Top)
+                {
+                    m.ContentAlignment = eContentAlignment.Left;
+                    m.ContentVerticalAlignment = eContentVerticalAlignment.Bottom;
+                    m.BlockLineAlignment = eContentVerticalAlignment.Bottom;
+                    m.ContentOrientation = eContentOrientation.Horizontal;
+                }
+                else if (m_Alignment == eTabStripAlignment.Left)
+                {
+                    m.ContentAlignment = eContentAlignment.Right;
+                    m.ContentVerticalAlignment = eContentVerticalAlignment.Top;
+                    m.BlockLineAlignment = eContentVerticalAlignment.Top;
+                    m.ContentOrientation = eContentOrientation.Vertical;
+                }
+                else if (m_Alignment == eTabStripAlignment.Right)
+                {
+                    m.ContentAlignment = eContentAlignment.Left;
+                    m.ContentVerticalAlignment = eContentVerticalAlignment.Top;
+                    m.BlockLineAlignment = eContentVerticalAlignment.Top;
+                    m.ContentOrientation = eContentOrientation.Vertical;
+                }
+                m.BlockSpacing = Dpi.Width2;
+                if (m_Alignment == eTabStripAlignment.Top || m_Alignment == eTabStripAlignment.Bottom)
+                {
+                    dispRect.X += Dpi.Width2;
+                    dispRect.Width -= Dpi.Width2;
+                }
+                else
+                {
+                    dispRect.Y += Dpi.Height2;
+                    dispRect.Height -= Dpi.Height2;
+                }
+                blockManager.PaddingHeight = 6;
+            }
+            else if (m_Style == eTabStripStyle.VS2005Dock)
+            {
+                m.EvenHeight = true;
+                if (m_Alignment == eTabStripAlignment.Bottom)
+                {
+                    m.ContentAlignment = eContentAlignment.Left;
+                    m.ContentVerticalAlignment = eContentVerticalAlignment.Top;
+                    m.BlockLineAlignment = eContentVerticalAlignment.Top;
+                    m.ContentOrientation = eContentOrientation.Horizontal;
+                }
+                else if (m_Alignment == eTabStripAlignment.Top)
+                {
+                    m.ContentAlignment = eContentAlignment.Left;
+                    m.ContentVerticalAlignment = eContentVerticalAlignment.Bottom;
+                    m.BlockLineAlignment = eContentVerticalAlignment.Bottom;
+                    m.ContentOrientation = eContentOrientation.Horizontal;
+                }
+                else if (m_Alignment == eTabStripAlignment.Left)
+                {
+                    m.ContentAlignment = eContentAlignment.Right;
+                    m.ContentVerticalAlignment = eContentVerticalAlignment.Top;
+                    m.BlockLineAlignment = eContentVerticalAlignment.Top;
+                    m.ContentOrientation = eContentOrientation.Vertical;
+                }
+                else if (m_Alignment == eTabStripAlignment.Right)
+                {
+                    m.ContentAlignment = eContentAlignment.Left;
+                    m.ContentVerticalAlignment = eContentVerticalAlignment.Top;
+                    m.BlockLineAlignment = eContentVerticalAlignment.Top;
+                    m.ContentOrientation = eContentOrientation.Vertical;
+                }
+                m.BlockSpacing = Dpi.Width8;
+                if (m_Alignment == eTabStripAlignment.Top || m_Alignment == eTabStripAlignment.Bottom)
+                {
+                    dispRect.X += Dpi.Width4;
+                    dispRect.Width -= Dpi.Width8;
+                }
+                else
+                {
+                    dispRect.Y += Dpi.Height4;
+                    dispRect.Height -= Dpi.Height8;
+                }
+            }
+            else if (m_Style == eTabStripStyle.SimulatedTheme)
+            {
+                if (m_Alignment == eTabStripAlignment.Top || m_Alignment == eTabStripAlignment.Bottom)
+                {
+                    //dispRect.X+=3;
+                    dispRect.Width -= Dpi.Width3;
+                }
+                else
+                {
+                    //dispRect.Y+=3;
+                    dispRect.Height -= Dpi.Height3;
+                }
+
+                if (m_Alignment == eTabStripAlignment.Bottom)
+                {
+                    m.ContentAlignment = eContentAlignment.Left;
+                    m.ContentVerticalAlignment = eContentVerticalAlignment.Top;
+                    m.BlockLineAlignment = eContentVerticalAlignment.Top;
+                    m.ContentOrientation = eContentOrientation.Horizontal;
+                    m.EvenHeight = true;
+                }
+                else if (m_Alignment == eTabStripAlignment.Top)
+                {
+                    m.ContentAlignment = eContentAlignment.Left;
+                    m.ContentVerticalAlignment = eContentVerticalAlignment.Bottom;
+                    m.BlockLineAlignment = eContentVerticalAlignment.Bottom;
+                    m.ContentOrientation = eContentOrientation.Horizontal;
+                    m.EvenHeight = true;
+                }
+                else if (m_Alignment == eTabStripAlignment.Left)
+                {
+                    m.ContentAlignment = eContentAlignment.Right;
+                    m.ContentVerticalAlignment = eContentVerticalAlignment.Top;
+                    m.BlockLineAlignment = eContentVerticalAlignment.Top;
+                    m.ContentOrientation = eContentOrientation.Vertical;
+                    m.EvenHeight = true;
+                }
+                else if (m_Alignment == eTabStripAlignment.Right)
+                {
+                    m.ContentAlignment = eContentAlignment.Left;
+                    m.ContentVerticalAlignment = eContentVerticalAlignment.Top;
+                    m.BlockLineAlignment = eContentVerticalAlignment.Top;
+                    m.ContentOrientation = eContentOrientation.Vertical;
+                    m.EvenHeight = true;
+                }
+                blockManager.HorizontalText = true;
+                //blockManager.SelectedPaddingWidth=1;
+                blockManager.PaddingHeight = 10;
+                blockManager.PaddingWidth = 2;
+            }
+
+            if (m_Alignment == eTabStripAlignment.Left || m_Alignment == eTabStripAlignment.Right)
+                m.ContentOrientation = eContentOrientation.Vertical;
+            else
+                m.ContentOrientation = eContentOrientation.Horizontal;
+
+            if (m_Style != eTabStripStyle.RoundHeader)
+            {
+                if (m_TabLayoutType == eTabLayoutType.FitContainer)
+                {
+                    m.FitContainerOversize = true;
+                    m.OversizeDistribute = true;
+                    m.MultiLine = false;
+                }
+                else if (m_TabLayoutType == eTabLayoutType.FixedWithNavigationBox)
+                {
+                    m.FitContainerOversize = false;
+                    m.MultiLine = false;
+                }
+                else if (m_TabLayoutType == eTabLayoutType.MultilineNoNavigationBox || m_TabLayoutType == eTabLayoutType.MultilineWithNavigationBox)
+                {
+                    m.FitContainerOversize = false;
+                    m.MultiLine = true;
+                }
+
+            }
+
+            blockManager.Graphics = g;
+            TabItem[] blocks =
+                new TabItem[this.Tabs.Count];
+            this.Tabs.CopyTo(blocks, 0);
+            Rectangle tabArea = dispRect;
+            if (m_ScrollOffset != 0)
+            {
+                if (m_Alignment == eTabStripAlignment.Left || m_Alignment == eTabStripAlignment.Right)
+                    tabArea.Y -= m_ScrollOffset;
+                else
+                    tabArea.X -= m_ScrollOffset;
+            }
+            if (this.IsRightToLeft)
+            {
+                if (this.HasNavigationBox && m_TabSystemBox.Visible)
+                {
+                    tabArea.X += m_TabSystemBox.DefaultWidth;
+                }
+
+                m_TabItemsBounds = m.Layout(tabArea, blocks, blockManager);
+                RecalcSizeTabSystemBox(dispRect, tabArea);
+            }
+            else
+            {
+                m_TabItemsBounds = m.Layout(tabArea, blocks, blockManager);
+                RecalcSizeTabSystemBox(dispRect, m_TabItemsBounds);
+            }
+        }
+
+        private bool IsContentManagedStyle
+        {
+            get
+            {
+                if ((this.Style == eTabStripStyle.RoundHeader || this.Style == eTabStripStyle.VS2005Dock) && !this.IsThemed || this.Style == eTabStripStyle.SimulatedTheme ||
+                    this.Style == eTabStripStyle.Office2007Document || this.Style == eTabStripStyle.Office2007Dock)
+                    return true;
+                else
+                    return false;
+            }
+        }
+
+        private void RecalcSize(Graphics g, Rectangle dispRect)
+        {
+            if (IsContentManagedStyle)
+                RecalcSizeContentManager(g, dispRect);
+            else
+                RecalcSizeLegacy(g, dispRect);
+
+            m_NeedRecalcSize = false;
+            InvokeSizeRecalculated();
+        }
+
+        private void RecalcSizeLegacy(Graphics g, Rectangle dispRect)
+        {
+            int iMaxWidth = dispRect.Width;
+            int iWidth = 0;
+            int iDisplayed = 0;
+            int firstVisible = -1;
+            eTextFormat strFormat = eTextFormat.Default;
+
+            if (m_Alignment == eTabStripAlignment.Left || m_Alignment == eTabStripAlignment.Right)
+                iMaxWidth = dispRect.Height;
+
+            int iHeight = this.GetTabHeight(g);
+            m_TabHeight = iHeight;
+
+            int x = dispRect.X;
+            int y = dispRect.Y;
+            if (m_Alignment == eTabStripAlignment.Top)
+            {
+                y = Math.Max(0,dispRect.Bottom - iHeight);
+            }
+            else if (m_Alignment == eTabStripAlignment.Left)
+            {
+                x = Math.Max(0,dispRect.Right - iHeight);
+            }
+
+            if (m_Alignment == eTabStripAlignment.Left || m_Alignment == eTabStripAlignment.Right)
+                y -= m_ScrollOffset;
+            else
+                x -= m_ScrollOffset;
+
+            int initalX = x, initalY = y;
+            bool bMultiLine = false;
+
+            int systemBoxDefaultWidth = Dpi.Width(m_TabSystemBox.DefaultWidth);
+            if (this.HasNavigationBox)
+            {
+                iMaxWidth -= (systemBoxDefaultWidth);
+                iMaxWidth -= Dpi.Width4;
+            }
+            ArrayList linePositions = new ArrayList();
+            foreach (TabItem tab in m_Tabs)
+            {
+                int iItemWidth = Dpi.Width4;
+                if (!tab.Visible)
+                    continue;
+
+                if (firstVisible < 0)
+                    firstVisible = m_Tabs.IndexOf(tab);
+
+                iDisplayed++;
+
+                if (m_FixedTabSize.Width == 0)
+                {
+                    Image tabImage = tab.GetImage();
+                    if (tab.Icon != null)
+                    {
+                        iItemWidth += tab.IconSize.Width;
+                        if (m_Style != eTabStripStyle.OneNote || this.IsThemed)
+                            iItemWidth += Dpi.Width4;
+                    }
+                    else if (tabImage != null)
+                    {
+                        iItemWidth += Dpi.Width(tabImage.Width);
+                        if (m_Style != eTabStripStyle.OneNote || this.IsThemed)
+                            iItemWidth += Dpi.Width4;
+                    }
+
+                    if (m_Style == eTabStripStyle.OneNote && !this.IsThemed)
+                        iItemWidth += ((iHeight - Dpi.Height6) * 1);
+                    else if (m_Style == eTabStripStyle.VS2005Document && !this.IsThemed)
+                        iItemWidth += Dpi.Width4;
+                    if (tab.Text != "" && (!m_DisplaySelectedTextOnly || tab == m_SelectedTab))
+                    {
+                        Font font = this.Font;
+                        if (m_SelectedTabFont != null && (tab == m_SelectedTab || m_CloseButtonPosition == eTabCloseButtonPosition.Right && m_CloseButtonOnTabsAlwaysDisplayed))
+                            font = m_SelectedTabFont;
+                        Size textSize = Size.Empty;
+                        if (this.IsVertical)
+                            textSize = TextDrawing.MeasureStringLegacy(g, tab.Text, font, Size.Empty, strFormat);
+                        else
+                            textSize = TextDrawing.MeasureString(g, tab.Text, font, 0, strFormat);
+                        iItemWidth += textSize.Width;
+                        if ((m_Style != eTabStripStyle.OneNote && m_Style != eTabStripStyle.VS2005Document || this.IsThemed) || m_Alignment == eTabStripAlignment.Top || m_Alignment == eTabStripAlignment.Bottom)
+                            iItemWidth += Dpi.Width4; // 2 pixels of padding...
+                        if (this.IsThemed)
+                            iItemWidth += Dpi.Width10;
+                    }
+
+                    if (m_CloseButtonOnTabs && tab.CloseButtonVisible && m_Style != eTabStripStyle.OneNote)
+                        iItemWidth += Dpi.Width(m_CloseButtonSize.Width);
+                }
+                else
+                    iItemWidth = m_FixedTabSize.Width;
+
+                // Multi-line tab support
+                if (this.IsMultiLine && iWidth + iItemWidth > iMaxWidth && iDisplayed > 1)
+                {
+                    bMultiLine = true;
+                    switch (m_Alignment)
+                    {
+                        case eTabStripAlignment.Left:
+                        case eTabStripAlignment.Right:
+                            {
+                                if (linePositions.Count == 0)
+                                    linePositions.Add(x);
+                                x += (iHeight + m_MultiLineSpacing);
+                                y = initalY;
+                                linePositions.Add(x);
+                                break;
+                            }
+                        case eTabStripAlignment.Top:
+                        case eTabStripAlignment.Bottom:
+                            {
+                                if (linePositions.Count == 0)
+                                    linePositions.Add(y);
+                                y += (iHeight + m_MultiLineSpacing);
+                                x = initalX;
+                                linePositions.Add(y);
+                                break;
+                            }
+                    }
+                    m_TabHeight += (iHeight + m_MultiLineSpacing);
+                    iWidth = 0;
+                }
+
+                if (m_Alignment == eTabStripAlignment.Left || m_Alignment == eTabStripAlignment.Right)
+                {
+                    tab._DisplayRectangle = new Rectangle(x, y, iHeight, iItemWidth);
+                }
+                else
+                {
+                    tab._DisplayRectangle = new Rectangle(x, y, iItemWidth, iHeight);
+                }
+
+                if (MeasureTabItem != null)
+                {
+                    MeasureTabItemEventArgs mea = new MeasureTabItemEventArgs(tab, tab.DisplayRectangle.Size);
+                    MeasureTabItem(this, mea);
+                    tab._DisplayRectangle = new Rectangle(tab._DisplayRectangle.Location, mea.Size);
+                    if (m_Alignment == eTabStripAlignment.Left || m_Alignment == eTabStripAlignment.Right)
+                        iItemWidth = mea.Size.Height;
+                    else
+                        iItemWidth = mea.Size.Width;
+                }
+
+                if (m_Alignment == eTabStripAlignment.Left || m_Alignment == eTabStripAlignment.Right)
+                    y += iItemWidth;
+                else
+                    x += iItemWidth;
+
+                iWidth += iItemWidth;
+            }
+
+            if (bMultiLine)
+            {
+                if (m_Alignment == eTabStripAlignment.Top)
+                {
+                    int offset = initalY - y;
+                    foreach (TabItem tab in m_Tabs)
+                        tab._DisplayRectangle = new Rectangle(tab.DisplayRectangle.X, tab.DisplayRectangle.Y + offset, tab.DisplayRectangle.Width, tab.DisplayRectangle.Height);
+                    for (int i = 0; i < linePositions.Count; i++)
+                        linePositions[i] = (int)linePositions[i] + offset;
+                }
+                else if (m_Alignment == eTabStripAlignment.Left)
+                {
+                    int offset = initalX - x;
+                    foreach (TabItem tab in m_Tabs)
+                        tab._DisplayRectangle = new Rectangle(tab.DisplayRectangle.X + offset, tab.DisplayRectangle.Y, tab.DisplayRectangle.Width, tab.DisplayRectangle.Height);
+                    for (int i = 0; i < linePositions.Count; i++)
+                        linePositions[i] = (int)linePositions[i] + offset;
+                }
+                // Rearrange tabs so line with the selected tab is always at the edge
+                if (_MultiLinePanelAlignSelectedTab)
+                {
+                    switch (m_Alignment)
+                    {
+                        case eTabStripAlignment.Left:
+                        {
+                            // Selected tab must be in last line
+                            if (m_SelectedTab.DisplayRectangle.X != (int) linePositions[linePositions.Count - 1])
+                            {
+                                int switchPos = m_SelectedTab.DisplayRectangle.X;
+                                int selectedPos = (int) linePositions[linePositions.Count - 1];
+                                foreach (TabItem tab in m_Tabs)
+                                {
+                                    if (tab.DisplayRectangle.X == selectedPos)
+                                        tab._DisplayRectangle = new Rectangle(switchPos, tab.DisplayRectangle.Y,
+                                            tab.DisplayRectangle.Width, tab.DisplayRectangle.Height);
+                                    else if (tab.DisplayRectangle.X == switchPos)
+                                        tab._DisplayRectangle = new Rectangle(selectedPos, tab.DisplayRectangle.Y,
+                                            tab.DisplayRectangle.Width, tab.DisplayRectangle.Height);
+                                }
+                            }
+                            break;
+                        }
+                        case eTabStripAlignment.Right:
+                        {
+                            // Selected tab must be in last line
+                            if (m_SelectedTab.DisplayRectangle.X != (int) linePositions[0])
+                            {
+                                int switchPos = m_SelectedTab.DisplayRectangle.X;
+                                int selectedPos = (int) linePositions[0];
+                                foreach (TabItem tab in m_Tabs)
+                                {
+                                    if (tab.DisplayRectangle.X == selectedPos)
+                                        tab._DisplayRectangle = new Rectangle(switchPos, tab.DisplayRectangle.Y,
+                                            tab.DisplayRectangle.Width, tab.DisplayRectangle.Height);
+                                    else if (tab.DisplayRectangle.X == switchPos)
+                                        tab._DisplayRectangle = new Rectangle(selectedPos, tab.DisplayRectangle.Y,
+                                            tab.DisplayRectangle.Width, tab.DisplayRectangle.Height);
+                                }
+                            }
+                            break;
+                        }
+                        case eTabStripAlignment.Top:
+                        {
+                            // Selected tab must be in last line
+                            if (m_SelectedTab.DisplayRectangle.Y != (int) linePositions[linePositions.Count - 1])
+                            {
+                                int switchPos = m_SelectedTab.DisplayRectangle.Y;
+                                int selectedPos = (int) linePositions[linePositions.Count - 1];
+                                foreach (TabItem tab in m_Tabs)
+                                {
+                                    if (tab.DisplayRectangle.Y == selectedPos)
+                                        tab._DisplayRectangle = new Rectangle(tab.DisplayRectangle.X, switchPos,
+                                            tab.DisplayRectangle.Width, tab.DisplayRectangle.Height);
+                                    else if (tab.DisplayRectangle.Y == switchPos)
+                                        tab._DisplayRectangle = new Rectangle(tab.DisplayRectangle.X, selectedPos,
+                                            tab.DisplayRectangle.Width, tab.DisplayRectangle.Height);
+                                }
+                            }
+                            break;
+                        }
+                        case eTabStripAlignment.Bottom:
+                        {
+                            // Selected tab must be in first line
+                            if (m_SelectedTab.DisplayRectangle.Y != (int) linePositions[0])
+                            {
+                                int switchPos = m_SelectedTab.DisplayRectangle.Y;
+                                int selectedPos = (int) linePositions[0];
+                                foreach (TabItem tab in m_Tabs)
+                                {
+                                    if (tab.DisplayRectangle.Y == selectedPos)
+                                        tab._DisplayRectangle = new Rectangle(tab.DisplayRectangle.X, switchPos,
+                                            tab.DisplayRectangle.Width, tab.DisplayRectangle.Height);
+                                    else if (tab.DisplayRectangle.Y == switchPos)
+                                        tab._DisplayRectangle = new Rectangle(tab.DisplayRectangle.X, selectedPos,
+                                            tab.DisplayRectangle.Width, tab.DisplayRectangle.Height);
+                                }
+                            }
+                            break;
+                        }
+                    }
+                }
+            }
+
+            if (this.HasNavigationBox)
+            {
+                if (m_ScrollOffset != 0)
+                    m_TabSystemBox.BackEnabled = true;
+                else
+                    m_TabSystemBox.BackEnabled = false;
+
+                if (iWidth - m_ScrollOffset > iMaxWidth)
+                    m_TabSystemBox.ForwardEnabled = true;
+                else
+                    m_TabSystemBox.ForwardEnabled = false;
+
+                if (m_AutoHideSystemBox && !this.IsMultiLine)
+                {
+                    if (iWidth > iMaxWidth)
+                        m_TabSystemBox.Visible = true;
+                    else
+                        m_TabSystemBox.Visible = false;
+                }
+                else
+                    m_TabSystemBox.Visible = true;
+
+                Rectangle rSysBox = Rectangle.Empty;
+                switch (m_Alignment)
+                {
+                    case eTabStripAlignment.Left:
+                        {
+                            rSysBox = new Rectangle((firstVisible < 0 ? dispRect.X : m_Tabs[firstVisible].DisplayRectangle.X), this.ClientRectangle.Bottom - systemBoxDefaultWidth - 3, (firstVisible < 0 ? dispRect.Width : m_Tabs[firstVisible].DisplayRectangle.Width), systemBoxDefaultWidth);
+                            if (m_Style == eTabStripStyle.VS2005 && !this.IsThemed) rSysBox.X--;
+                            break;
+                        }
+                    case eTabStripAlignment.Right:
+                        {
+                            rSysBox = new Rectangle(dispRect.X, this.ClientRectangle.Bottom - systemBoxDefaultWidth - 3, (firstVisible < 0 ? dispRect.Width : m_Tabs[firstVisible].DisplayRectangle.Width), systemBoxDefaultWidth);
+                            if (m_Style == eTabStripStyle.VS2005 && !this.IsThemed) rSysBox.X++;
+                            break;
+                        }
+                    case eTabStripAlignment.Top:
+                        {
+                            if (this.IsRightToLeft)
+                                rSysBox = new Rectangle(this.ClientRectangle.Left, (firstVisible < 0 ? dispRect.Y : m_Tabs[firstVisible].DisplayRectangle.Y), systemBoxDefaultWidth, (firstVisible < 0 ? dispRect.Height : m_Tabs[firstVisible].DisplayRectangle.Height));
+                            else
+                                rSysBox = new Rectangle(this.ClientRectangle.Right - systemBoxDefaultWidth - 3, (firstVisible < 0 ? dispRect.Y : m_Tabs[firstVisible].DisplayRectangle.Y), systemBoxDefaultWidth, (firstVisible < 0 ? dispRect.Height : m_Tabs[firstVisible].DisplayRectangle.Height));
+                            if (m_Style == eTabStripStyle.VS2005 && !this.IsThemed) rSysBox.Y--;
+                            break;
+                        }
+                    default:
+                        {
+                            if (this.IsRightToLeft)
+                                rSysBox = new Rectangle(this.ClientRectangle.Left, dispRect.Y, systemBoxDefaultWidth + 2, (firstVisible < 0 ? dispRect.Height : m_Tabs[firstVisible].DisplayRectangle.Height));
+                            else
+                                rSysBox = new Rectangle(this.ClientRectangle.Right - systemBoxDefaultWidth - 2, dispRect.Y, systemBoxDefaultWidth + 2, (firstVisible < 0 ? dispRect.Height : m_Tabs[firstVisible].DisplayRectangle.Height));
+                            if (m_Style == eTabStripStyle.VS2005 && !this.IsThemed) rSysBox.Y++;
+                            break;
+                        }
+                }
+
+                m_TabSystemBox.DisplayRectangle = rSysBox;
+            }
+
+            if (iWidth > iMaxWidth && m_TabLayoutType == eTabLayoutType.FitContainer && !this.IsMultiLine)
+            {
+                if (iDisplayed > 0)
+                {
+                    if (m_Alignment == eTabStripAlignment.Left || m_Alignment == eTabStripAlignment.Right)
+                    {
+                        x = dispRect.X;
+                        y = dispRect.Y;
+                        if (m_Alignment == eTabStripAlignment.Left)
+                            x = dispRect.Right - iHeight;
+                        int iItemWidth = iMaxWidth / iDisplayed;
+                        int iOverageCount = 0;
+                        foreach (TabItem tab in m_Tabs)
+                        {
+                            if (!tab.Visible)
+                                continue;
+                            if (tab.DisplayRectangle.Height > iItemWidth)
+                                iOverageCount++;
+                            else
+                            {
+                                iMaxWidth -= tab.DisplayRectangle.Height;
+                                iWidth -= tab.DisplayRectangle.Height;
+                            }
+                        }
+                        //int iDiff=(iWidth-iMaxWidth)/iOverageCount;
+                        float fDiff = (float)iMaxWidth / (float)iWidth;
+                        foreach (TabItem tab in m_Tabs)
+                        {
+                            if (!tab.Visible)
+                                continue;
+                            if (tab.DisplayRectangle.Height > iItemWidth)
+                            {
+                                if (iOverageCount == iDisplayed)
+                                    tab._DisplayRectangle = new Rectangle(x, y, tab.DisplayRectangle.Width, iItemWidth);
+                                else
+                                    tab._DisplayRectangle = new Rectangle(x, y, tab.DisplayRectangle.Width, (int)(tab.DisplayRectangle.Height * fDiff));
+                            }
+                            else
+                                tab._DisplayRectangle = new Rectangle(x, y, tab.DisplayRectangle.Width, tab.DisplayRectangle.Height);
+                            y += tab.DisplayRectangle.Height;
+                        }
+                    }
+                    else
+                    {
+                        x = dispRect.X;
+                        int iItemWidth = iMaxWidth / iDisplayed;
+                        int iOverageCount = 0;
+                        foreach (TabItem tab in m_Tabs)
+                        {
+                            if (!tab.Visible)
+                                continue;
+                            if (tab.DisplayRectangle.Width > iItemWidth)
+                                iOverageCount++;
+                            else
+                            {
+                                iMaxWidth -= tab.DisplayRectangle.Width;
+                                iWidth -= tab.DisplayRectangle.Width;
+                            }
+                        }
+                        //int iDiff=(iWidth-iMaxWidth)/iOverageCount;
+                        float fDiff = (float)iMaxWidth / (float)iWidth;
+                        foreach (TabItem tab in m_Tabs)
+                        {
+                            if (!tab.Visible)
+                                continue;
+                            if (tab.DisplayRectangle.Width > iItemWidth)
+                            {
+                                if (iOverageCount == iDisplayed)
+                                    tab._DisplayRectangle = new Rectangle(x, y, iItemWidth, tab.DisplayRectangle.Height);
+                                else
+                                    tab._DisplayRectangle = new Rectangle(x, y, (int)(tab.DisplayRectangle.Width * fDiff), tab.DisplayRectangle.Height);
+                            }
+                            else
+                                tab._DisplayRectangle = new Rectangle(x, y, tab.DisplayRectangle.Width, tab.DisplayRectangle.Height);
+                            x += tab.DisplayRectangle.Width;
+                        }
+                    }
+                }
+            }
+            else if (this.IsRightToLeft && m_TabLayoutType != eTabLayoutType.FitContainer &&
+                (m_Alignment == eTabStripAlignment.Top || m_Alignment == eTabStripAlignment.Bottom))
+            {
+                if (iWidth > iMaxWidth)
+                {
+                    for (int i = m_Tabs.Count - 1; i >= 0; i--)
+                    {
+                        if (m_Tabs[i].Visible)
+                        {
+                            x = m_Tabs[i].DisplayRectangle.Right;
+                            break;
+                        }
+                    }
+                    if (m_TabSystemBox.Visible)
+                        x += m_TabSystemBox.DisplayRectangle.Right;
+                }
+                else
+                    x = dispRect.Right;
+                foreach (TabItem tab in m_Tabs)
+                {
+                    if (tab.Visible)
+                    {
+                        x -= tab.DisplayRectangle.Width;
+                        tab._DisplayRectangle = new Rectangle(x, tab.DisplayRectangle.Y, tab.DisplayRectangle.Width, tab.DisplayRectangle.Height);
+                    }
+                }
+            }
+        }
+
+        internal bool HasMeasureTabItem
+        {
+            get
+            {
+                return MeasureTabItem != null;
+            }
+        }
+
+        internal void InvokeMeasureTabItem(MeasureTabItemEventArgs e)
+        {
+            if (MeasureTabItem != null)
+                MeasureTabItem(this, e);
+        }
+
+        internal bool HasPreRenderTabItem
+        {
+            get { return PreRenderTabItem != null; }
+        }
+
+        internal bool HasPostRenderTabItem
+        {
+            get { return PostRenderTabItem != null; }
+        }
+
+        internal void InvokePreRenderTabItem(RenderTabItemEventArgs e)
+        {
+            if (PreRenderTabItem != null)
+                PreRenderTabItem(this, e);
+        }
+
+        internal void InvokePostRenderTabItem(RenderTabItemEventArgs e)
+        {
+            if (PostRenderTabItem != null)
+                PostRenderTabItem(this, e);
+        }
+
+        private TabItem GetFirstVisibleTabItem()
+        {
+            foreach (TabItem tab in m_Tabs)
+            {
+                if (tab.Visible) return tab;
+            }
+            return null;
+        }
+
+        internal void RecalcSizeTabSystemBox(Rectangle displayRect, Rectangle tabsBounds)
+        {
+            if (this.HasNavigationBox)
+            {
+                Rectangle absTabBounds = tabsBounds;
+
+                if (m_Alignment == eTabStripAlignment.Top || m_Alignment == eTabStripAlignment.Bottom)
+                    absTabBounds.Offset(m_ScrollOffset, 0);
+                else
+                    absTabBounds.Offset(0, m_ScrollOffset);
+
+                bool bTabSystemBoxVisible = false;
+                int systemBoxDefaultWidth = Dpi.Width(m_TabSystemBox.DefaultWidth);
+                if (absTabBounds.Right > (displayRect.Right - (m_AutoHideSystemBox ? 0 : systemBoxDefaultWidth)) && (m_Alignment == eTabStripAlignment.Top || m_Alignment == eTabStripAlignment.Bottom) ||
+                    absTabBounds.Bottom > (displayRect.Bottom - (m_AutoHideSystemBox ? 0 : systemBoxDefaultWidth)) && (m_Alignment == eTabStripAlignment.Right || m_Alignment == eTabStripAlignment.Left))
+                    bTabSystemBoxVisible = true;
+
+                if (m_ScrollOffset != 0)
+                    m_TabSystemBox.BackEnabled = true;
+                else
+                    m_TabSystemBox.BackEnabled = false;
+
+                if (m_AutoHideSystemBox && !this.IsMultiLine)
+                    m_TabSystemBox.Visible = bTabSystemBoxVisible;
+                else
+                    m_TabSystemBox.Visible = true;
+
+                if (tabsBounds.Right + m_ScrollOffset > displayRect.Right - (m_TabSystemBox.Visible ? systemBoxDefaultWidth : 0) && (m_Alignment == eTabStripAlignment.Top || m_Alignment == eTabStripAlignment.Bottom) ||
+                    tabsBounds.Bottom + m_ScrollOffset > displayRect.Bottom - (m_TabSystemBox.Visible ? systemBoxDefaultWidth : 0) && (m_Alignment == eTabStripAlignment.Right || m_Alignment == eTabStripAlignment.Left))
+                    m_TabSystemBox.ForwardEnabled = true;
+                else
+                    m_TabSystemBox.ForwardEnabled = false;
+
+                TabItem firstVisible = GetFirstVisibleTabItem();
+
+                Rectangle rSysBox = Rectangle.Empty;
+                switch (m_Alignment)
+                {
+                    case eTabStripAlignment.Left:
+                        {
+                            rSysBox = new Rectangle((firstVisible == null ? displayRect.X : firstVisible.DisplayRectangle.X), this.ClientRectangle.Bottom - systemBoxDefaultWidth - 3, (firstVisible == null ? displayRect.Width : firstVisible.DisplayRectangle.Width), systemBoxDefaultWidth);
+                            if (m_Style == eTabStripStyle.VS2005 && !this.IsThemed) rSysBox.X--;
+                            break;
+                        }
+                    case eTabStripAlignment.Right:
+                        {
+                            rSysBox = new Rectangle(displayRect.X, this.ClientRectangle.Bottom - systemBoxDefaultWidth - 3, (firstVisible == null ? displayRect.Width : firstVisible.DisplayRectangle.Width), systemBoxDefaultWidth);
+                            if (m_Style == eTabStripStyle.VS2005 && !this.IsThemed) rSysBox.X++;
+                            break;
+                        }
+                    case eTabStripAlignment.Top:
+                        {
+                            if (this.IsRightToLeft)
+                                rSysBox = new Rectangle(displayRect.X, (firstVisible == null ? displayRect.Y : firstVisible.DisplayRectangle.Y), systemBoxDefaultWidth, (firstVisible == null ? displayRect.Height : firstVisible.DisplayRectangle.Height));
+                            else
+                                rSysBox = new Rectangle(this.ClientRectangle.Right - systemBoxDefaultWidth - 3, (firstVisible == null ? displayRect.Y : firstVisible.DisplayRectangle.Y), systemBoxDefaultWidth, (firstVisible == null ? displayRect.Height : firstVisible.DisplayRectangle.Height));
+                            if (m_Style == eTabStripStyle.VS2005 && !this.IsThemed) rSysBox.Y--;
+                            break;
+                        }
+                    default:
+                        {
+                            if (this.IsRightToLeft)
+                                rSysBox = new Rectangle(displayRect.X, displayRect.Y, systemBoxDefaultWidth + 2, (firstVisible == null ? displayRect.Height : firstVisible.DisplayRectangle.Height));
+                            else
+                                rSysBox = new Rectangle(this.ClientRectangle.Right - systemBoxDefaultWidth - 2, displayRect.Y, systemBoxDefaultWidth + 2, (firstVisible == null ? displayRect.Height : firstVisible.DisplayRectangle.Height));
+                            if (m_Style == eTabStripStyle.VS2005 && !this.IsThemed) rSysBox.Y++;
+                            break;
+                        }
+                }
+
+                m_TabSystemBox.DisplayRectangle = rSysBox;
+            }
+        }
+
+        private void InvokeSizeRecalculated()
+        {
+            if (SizeRecalculated != null)
+                SizeRecalculated(this, new EventArgs());
+
+            if (this.IsMultiLine && !(this.Parent is TabControl))
+            {
+                switch (this.TabAlignment)
+                {
+                    case eTabStripAlignment.Left:
+                    case eTabStripAlignment.Right:
+                        this.Width = this.MinTabStripHeight;
+                        break;
+                    default:
+                        this.Height = this.MinTabStripHeight;
+                        break;
+                }
+            }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), Browsable(false)]
+        public TabItem DesignTimeSelection
+        {
+            get { return m_DesignTimeSelection; }
+            set
+            {
+                m_DesignTimeSelection = value;
+                this.Invalidate();
+            }
+        }
+
+        private void RefreshThemes()
+        {
+            if (m_ThemeTab != null)
+                m_ThemeTab.Dispose();
+
+            m_ThemeTab = new ThemeTab(this);
+        }
+        private void DisposeThemes()
+        {
+            if (m_ThemeTab != null)
+            {
+                m_ThemeTab.Dispose();
+                m_ThemeTab = null;
+            }
+        }
+
+        protected override void WndProc(ref Message m)
+        {
+            if (m.Msg == NativeFunctions.WM_THEMECHANGED)
+            {
+                Themes.RefreshIsThemeActive();
+                this.RefreshThemes();
+            }
+            base.WndProc(ref m);
+        }
+
+        protected override void OnHandleDestroyed(EventArgs e)
+        {
+            DisposeThemes();
+            base.OnHandleDestroyed(e);
+        }
+
+        protected override void OnHandleCreated(EventArgs e)
+        {
+            base.OnHandleCreated(e);
+            if (m_NeedRecalcSize)
+            {
+                this.RecalcSize();
+                if (this.Parent is TabControl)
+                    ((TabControl)this.Parent).SyncTabStripSize();
+            }
+            RefreshMdiTabItems();
+        }
+
+        internal void OnSelectedTabRemoved(int index, TabItem item)
+        {
+            if (index >= this.Tabs.Count)
+                index = this.Tabs.Count - 1;
+            int selectedIndex = -1;
+            for (int i = index; i < this.Tabs.Count; i++)
+            {
+                if (this.Tabs[i].Visible)
+                {
+                    selectedIndex = i;
+                    break;
+                }
+            }
+            if (selectedIndex == -1)
+            {
+                for (int i = 0; i < this.Tabs.Count; i++)
+                {
+                    if (this.Tabs[i].Visible)
+                    {
+                        selectedIndex = i;
+                        break;
+                    }
+                }
+            }
+            if (selectedIndex >= 0)
+                this.SelectedTab = this.Tabs[selectedIndex];
+            else
+                m_SelectedTab = null;
+        }
+
+        internal void InvokeTabRemoved(TabItem tab)
+        {
+            if (m_MovingTab)
+                return;
+            HideToolTip();
+            if (TabRemoved != null)
+                TabRemoved(tab, new EventArgs());
+            if (this.VisibleTabCount == 0)
+                this.SelectedTab = null;
+        }
+
+        /// <summary>
+        /// Gets or sets the index of currently selected tab.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public int SelectedTabIndex
+        {
+            get
+            {
+                if (m_SelectedTab == null)
+                    return -1;
+                return m_Tabs.IndexOf(m_SelectedTab);
+            }
+            set
+            {
+                if (value < 0 || value >= m_Tabs.Count || m_Tabs.Count == 0)
+                    return;
+                this.SelectedTab = m_Tabs[value];
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the selected tab.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Category("Behavior"), Description("Indicates selected tab.")]
+        public TabItem SelectedTab
+        {
+            get
+            {
+                if (m_SelectedTab == null && m_Tabs.Count > 0)
+                    m_SelectedTab = m_Tabs[0] as TabItem;
+                return m_SelectedTab;
+            }
+            set
+            {
+                SelectTab(value, eEventSource.Code);
+            }
+        }
+
+        private void SelectTab(TabItem value, eEventSource eventSource)
+        {
+            if (m_SelectedTab == value)
+                return;
+            TabItem oldTab = m_SelectedTab;
+
+            if (SelectedTabChanging != null)
+            {
+                TabStripTabChangingEventArgs eventData = new TabStripTabChangingEventArgs(m_SelectedTab, value, eventSource);
+                SelectedTabChanging(this, eventData);
+                if (eventData.Cancel)
+                    return;
+            }
+
+            InvokeBeforeTabDisplay(value);
+
+            Control hideControl = null;
+
+            if (m_SelectedTab != null && m_SelectedTab.AttachedItem != null)
+                m_SelectedTab.AttachedItem.Displayed = false;
+            else if (m_SelectedTab != null && m_SelectedTab.AttachedControl != null)
+            {
+                if (!m_MdiTabbedDocuments)
+                    hideControl = m_SelectedTab.AttachedControl;
+            }
+
+            m_SelectedTab = value;
+            m_NeedRecalcSize = true;
+
+            EnsureVisible(m_SelectedTab);
+
+            if (m_SelectedTab != null && m_SelectedTab.AttachedItem != null)
+            {
+                m_SelectedTab.AttachedItem.Displayed = true;
+                if (m_SelectedTab.AttachedItem is DockContainerItem && ((DockContainerItem)m_SelectedTab.AttachedItem).Control != null)
+                {
+                    if (m_AutoSelectAttachedControl)
+                        ((DockContainerItem)m_SelectedTab.AttachedItem).Control.Select();
+                }
+            }
+            else if (m_SelectedTab != null && m_SelectedTab.AttachedControl != null)
+            {
+                if (!m_MdiTabbedDocuments)
+                {
+                    //if(!(this.IsDesignMode && m_SelectedTab.AttachedControl is TabControlPanel))
+                    m_SelectedTab.AttachedControl.Visible = true;
+                    if (m_AutoSelectAttachedControl && !(this.TabStop && this.Parent is TabControl && this.Focused && eventSource == eEventSource.Keyboard))
+                        m_SelectedTab.AttachedControl.Select();
+                    if (hideControl == m_SelectedTab.AttachedControl)
+                        hideControl = null;
+                }
+                else if (m_SelectedTab.AttachedControl is Form)
+                {
+                    MdiClient client = this.GetMdiClient(m_MdiForm);
+                    bool bSetRedraw = false;
+                    Form oldActive = m_MdiForm.ActiveMdiChild;
+
+                    if (client != null && m_MdiNoFormActivateFlicker && m_SelectedTab.AttachedControl is Form && (((Form)m_SelectedTab.AttachedControl).WindowState == FormWindowState.Maximized || oldActive != null && oldActive.WindowState == FormWindowState.Maximized))
+                    {
+                        NativeFunctions.SendMessage(client.Handle, NativeFunctions.WM_SETREDRAW, 0, 0);
+                        bSetRedraw = true;
+                    }
+
+                    ((Form)m_SelectedTab.AttachedControl).Activate();
+                    //if(m_TabSystemBox!=null)
+                    //	m_TabSystemBox.CloseVisible=((Form)m_SelectedTab.AttachedControl).ControlBox;
+
+                    if (bSetRedraw)
+                    {
+                        NativeFunctions.SendMessage(client.Handle, NativeFunctions.WM_SETREDRAW, 1, 0);
+                        client.Refresh();
+                    }
+
+                    if (oldActive != null && oldActive.WindowState == FormWindowState.Normal)
+                    {
+                        if (BarFunctions.ThemedOS)
+                        {
+                            // This will force repaint of Title bar since there were some repainting issues with it...
+                            string s = oldActive.Text; // GetFormText(oldActive);
+                            oldActive.Text = s + " ";
+                            oldActive.Text = s;
+                        }
+                    }
+                }
+            }
+            if (hideControl != null)
+            {
+                //if(!(this.IsDesignMode && hideControl is TabControlPanel))
+                hideControl.Visible = false;
+            }
+            this.Invalidate();
+
+            if (SelectedTabChanged != null)
+            {
+                TabStripTabChangedEventArgs eventData = new TabStripTabChangedEventArgs(oldTab, m_SelectedTab, eventSource);
+                SelectedTabChanged(this, eventData);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether tabs are scrolled continuously while mouse is pressed over the scroll tab button.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), DefaultValue(false), Category("Behavior"), Description("Indicates whether tabs are scrolled continuously while mouse is pressed over the scroll tab button.")]
+        public virtual bool TabScrollAutoRepeat
+        {
+            get
+            {
+                return m_TabScrollAutoRepeat;
+            }
+            set
+            {
+                m_TabScrollAutoRepeat = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the auto-repeat interval for the tab scrolling while mouse button is kept pressed over the scroll tab button.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), DefaultValue(300), Category("Behavior"), Description("Indicates auto-repeat interval for the tab scrolling while mouse button is kept pressed over the scroll tab button.")]
+        public virtual int TabScrollRepeatInterval
+        {
+            get
+            {
+                return m_TabScrollRepeatInterval;
+            }
+            set
+            {
+                m_TabScrollRepeatInterval = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether the Close button that closes the active tab is visible.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Category("Close Button"), Description("Indicates whether the Close button that closes the active tab is visible.")]
+        public bool CloseButtonVisible
+        {
+            get
+            {
+                if (m_TabSystemBox != null)
+                    return m_TabSystemBox.CloseVisible;
+                return true;
+            }
+            set
+            {
+                if (m_TabSystemBox != null)
+                    m_TabSystemBox.CloseVisible = value;
+                this.Invalidate();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether close button is visible on each tab instead of in system box.
+        /// </summary>
+        [Browsable(true), DefaultValue(false), DevCoBrowsable(true), Category("Close Button"), Description("Indicates whether close button is visible on each tab instead of in system box.")]
+        public bool CloseButtonOnTabsVisible
+        {
+            get
+            {
+                return m_CloseButtonOnTabs;
+            }
+            set
+            {
+                m_CloseButtonOnTabs = value;
+                m_NeedRecalcSize = true;
+                this.Invalidate();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether close button on tabs when visible is displayed for every tab state. Default value is true. When set to false
+        /// the close button will be displayed only for selected and tab that mouse is currently over.
+        /// </summary>
+        [Browsable(true), DefaultValue(true), DevCoBrowsable(true), Category("Close Button"), Description("Indicates whether close button on tabs when visible is displayed for every tab state.")]
+        public bool CloseButtonOnTabsAlwaysDisplayed
+        {
+            get
+            {
+                return m_CloseButtonOnTabsAlwaysDisplayed;
+            }
+            set
+            {
+                m_CloseButtonOnTabsAlwaysDisplayed = value;
+                this.Invalidate();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the position of the close button displayed on each tab. Default value is Left.
+        /// </summary>
+        [Browsable(true), DefaultValue(eTabCloseButtonPosition.Left), DevCoBrowsable(true), Category("Close Button"), Description("Indicates position of the close button displayed on each tab.")]
+        public eTabCloseButtonPosition CloseButtonPosition
+        {
+            get { return m_CloseButtonPosition; }
+            set
+            {
+                m_CloseButtonPosition = value;
+                m_NeedRecalcSize = true;
+                this.Invalidate();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets custom image that is used on tabs as Close button that allows user to close the tab.
+        /// Use TabCloseButtonHot property to specify image that is used when mouse is over the close button. Note that image size must
+        /// be same for both images.
+        /// Default value is null
+        /// which means that internal representation of close button is used.
+        /// </summary>
+        [Browsable(true), DefaultValue(null), Category("Close Button"), Description("Indicates custom image that is used on tabs as Close button that allows user to close the tab.")]
+        public Image TabCloseButtonNormal
+        {
+            get { return m_TabCloseButtonNormal; }
+            set
+            {
+                m_TabCloseButtonNormal = value;
+                if (m_TabCloseButtonNormal != null)
+                    m_CloseButtonSize = m_TabCloseButtonNormal.Size;
+                else
+                    m_CloseButtonSize = default_close_button_size;
+                m_NeedRecalcSize = true;
+                this.Invalidate();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets custom image that is used on tabs as Close button whem mouse is over the close button.
+        /// To use this property you must set TabCloseButtonNormal as well. Note that image size for both images must be same.
+        /// Default value is null which means that internal representation of close button is used.
+        /// </summary>
+        [Browsable(true), DefaultValue(null), Category("Close Button"), Description("Indicates custom image that is used on tabs as Close button whem mouse is over the close button.")]
+        public Image TabCloseButtonHot
+        {
+            get { return m_TabCloseButtonHot; }
+            set
+            {
+                m_TabCloseButtonHot = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the collection of all tabs.
+        /// </summary>
+        [Editor("DevComponents.DotNetBar.Design.TabStripTabsEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(UITypeEditor)), DesignerSerializationVisibility(DesignerSerializationVisibility.Content), Category("Data"), Description("Returns the collection of Tabs.")]
+        public TabsCollection Tabs
+        {
+            get { return m_Tabs; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether control attached to the TabItem.AttachedControl property is automatically selected when TabItem becomes selected tab. Default value is true.
+        /// </summary>
+        [Browsable(false)]
+        public bool AutoSelectAttachedControl
+        {
+            get { return m_AutoSelectAttachedControl; }
+            set { m_AutoSelectAttachedControl = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the image list used by tab items.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Category("Appearance"), DefaultValue(null)]
+        public ImageList ImageList
+        {
+            get
+            {
+                return m_ImageList;
+            }
+            set
+            {
+                m_ImageList = value;
+            }
+        }
+
+        private bool _MultiLinePanelAlignSelectedTab = true;
+        /// <summary>
+        /// Indicates whether selected tab is aligned with the panel in multiple lines use case.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), DefaultValue(true), Description("Indicates whether selected tab is aligned with the panel in multiple lines use case.")]
+        public bool MultiLinePanelAlignSelectedTab
+        {
+            get { return _MultiLinePanelAlignSelectedTab; }
+            set { _MultiLinePanelAlignSelectedTab = value;
+                m_NeedRecalcSize = true;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the type of the tab layout.
+        /// </summary>
+        [Browsable(true), DefaultValue(eTabLayoutType.FitContainer), Category("Appearance"), Description("Indicates the type of the tab layout.")]
+        public eTabLayoutType TabLayoutType
+        {
+            get { return m_TabLayoutType; }
+            set
+            {
+                m_TabLayoutType = value;
+                m_NeedRecalcSize = true;
+                m_TabSystemBox.DisplayRectangle = Rectangle.Empty;
+                OnTabStyleChanged();
+                //this.Refresh();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether tab size is adjusted to fit the available control size.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), Obsolete("Please use TabLayoutType property instead.", true)]
+        public bool VariableTabWidth
+        {
+            get { return m_VariableTabWidth; }
+            set
+            {
+                if (value)
+                    m_TabLayoutType = eTabLayoutType.FitContainer;
+                else
+                    m_TabLayoutType = eTabLayoutType.FixedWithNavigationBox;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets scrolling offset of the first tab. You can use this property to programmatically scroll the tab strip.
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), DefaultValue(0), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public int ScrollOffset
+        {
+            get { return m_ScrollOffset; }
+            set
+            {
+                if (m_ScrollOffset != value)
+                {
+                    m_ScrollOffset = value;
+                    m_NeedRecalcSize = true;
+                    this.Invalidate();
+                }
+            }
+        }
+
+        internal bool IsDesignMode
+        {
+            get
+            {
+                if (this.Parent != null && this.Parent is TabControl && this.Parent.Site != null)
+                    return this.Parent.Site.DesignMode;
+                return this.DesignMode;
+            }
+        }
+        [EditorBrowsable(EditorBrowsableState.Never), Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public TabSystemBox _TabSystemBox
+        {
+            get { return m_TabSystemBox; }
+        }
+
+        private bool _KeyboardNavigationEnabled = true;
+        /// <summary>
+        /// Gets or sets whether keyboard navigation using Left and Right arrow keys to select tabs is enabled. Default value is true.
+        /// </summary>
+        [Category("Behavior"), DefaultValue(true), Description("Indicates whether keyboard navigation using Left and Right arrow keys to select tabs is enabled.")]
+        public bool KeyboardNavigationEnabled
+        {
+            get { return _KeyboardNavigationEnabled; }
+            set
+            {
+                _KeyboardNavigationEnabled = value;
+            }
+        }
+
+        protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
+        {
+            if (_KeyboardNavigationEnabled)
+            {
+                if (keyData == Keys.Left)
+                {
+                    if (SelectPreviousTab(eEventSource.Keyboard, false))
+                        return true;
+                }
+                else if (keyData == Keys.Right)
+                {
+                    if (SelectNextTab(eEventSource.Keyboard, false))
+                        return true;
+                }
+            }
+            return base.ProcessCmdKey(ref msg, keyData);
+        }
+        /// <summary>
+        ///     Selectes previous visible tab. Returns true if previous tab was found for selection.
+        /// </summary>
+        public bool SelectPreviousTab()
+        {
+            return SelectPreviousTab(eEventSource.Code, false);
+        }
+        internal bool SelectPreviousTab(eEventSource eventSource, bool cycle)
+        {
+            if (this.SelectedTab != null && this.Tabs.IndexOf(this.SelectedTab) > 0)
+            {
+                for (int i = this.Tabs.IndexOf(this.SelectedTab) - 1; i >= 0; i--)
+                {
+                    if (this.Tabs[i].Visible)
+                    {
+                        this.SelectTab(this.Tabs[i], eventSource);
+                        return true;
+                    }
+                }
+            }
+            if (cycle)
+            {
+                for (int i = this.Tabs.Count - 1; i >= 0; i--)
+                {
+                    if (this.Tabs[i].Visible)
+                    {
+                        this.SelectTab(this.Tabs[i], eventSource);
+                        return true;
+                    }
+                }
+            }
+            return false;
+        }
+        /// <summary>
+        ///     Selectes next visible tab. Returns true if next tab was found for selection.
+        /// </summary>
+        public bool SelectNextTab()
+        {
+            return SelectNextTab(eEventSource.Code, false);
+        }
+        internal bool SelectNextTab(eEventSource eventSource, bool cycle)
+        {
+            if (this.SelectedTab != null && this.Tabs.IndexOf(this.SelectedTab) < this.Tabs.Count)
+            {
+                for (int i = this.Tabs.IndexOf(this.SelectedTab) + 1; i < this.Tabs.Count; i++)
+                {
+                    if (this.Tabs[i].Visible)
+                    {
+                        this.SelectTab(this.Tabs[i], eventSource);
+                        return true;
+                    }
+                }
+            }
+            if (cycle)
+            {
+                // Find first visible tab and select it
+                for (int i = 0; i < this.Tabs.Count; i++)
+                {
+                    if (this.Tabs[i].Visible)
+                    {
+                        this.SelectTab(this.Tabs[i], eventSource);
+                        return true;
+                    }
+                }
+            }
+            return false;
+        }
+
+        protected override void OnClick(EventArgs e)
+        {
+            base.OnClick(e);
+
+            // Invoke TabItem events.
+            Point p = this.PointToClient(Control.MousePosition);
+
+            if (this.HasNavigationBox)
+            {
+                if (m_TabSystemBox.Visible && m_TabSystemBox.DisplayRectangle.Contains(p.X, p.Y))
+                    return;
+            }
+
+            TabItem tabAt = HitTest(p.X, p.Y);
+            if (tabAt != null)
+            {
+                tabAt.InvokeClick(e);
+            }
+        }
+
+        protected override void OnMouseDown(MouseEventArgs e)
+        {
+            base.OnMouseDown(e);
+            InternalOnMouseDown(e);
+        }
+
+        internal bool HasNavigationBox
+        {
+            get { return (m_TabLayoutType == eTabLayoutType.FixedWithNavigationBox || m_TabLayoutType == eTabLayoutType.MultilineWithNavigationBox); }
+        }
+
+        internal bool IsMultiLine
+        {
+            get { return (m_TabLayoutType == eTabLayoutType.MultilineNoNavigationBox || m_TabLayoutType == eTabLayoutType.MultilineWithNavigationBox); }
+        }
+
+        private Point _MouseDownPoint = Point.Empty;
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void InternalOnMouseDown(MouseEventArgs e)
+        {
+            HideToolTip();
+            if (this.HasNavigationBox && m_TabSystemBox.Visible && m_TabSystemBox.DisplayRectangle.Contains(e.X, e.Y))
+            {
+                m_TabSystemBox.MouseDown(e);
+                return;
+            }
+            _MouseDownPoint = new Point(e.X, e.Y);
+            if (e.Button == MouseButtons.Left)
+            {
+                Rectangle rSelected = this.GetSelectedTabRectangle();
+                foreach (TabItem tab in m_Tabs)
+                {
+                    if ((tab.DisplayRectangle.Contains(new Point(e.X, e.Y)) || rSelected.Contains(e.X, e.Y)) && tab.Visible)
+                    {
+                        if (!tab.CloseButtonBounds.IsEmpty && tab.CloseButtonBounds.Contains(e.X, e.Y) && (m_TabLayoutType == eTabLayoutType.MultilineNoNavigationBox || m_TabLayoutType == eTabLayoutType.MultilineWithNavigationBox))
+                        {
+                            // Select and close tab on mouse up
+                            return;
+                        }
+                        TabItem newSelected = tab;
+                        if (rSelected.Contains(e.X, e.Y))
+                            newSelected = m_SelectedTab;
+
+                        if (m_SelectedTab != newSelected)
+                        {
+                            TabItem oldTab = m_SelectedTab;
+                            if (SelectedTabChanging != null)
+                            {
+                                TabStripTabChangingEventArgs eventData = new TabStripTabChangingEventArgs(m_SelectedTab, newSelected, eEventSource.Mouse);
+                                SelectedTabChanging(this, eventData);
+                                if (eventData.Cancel)
+                                    break;
+                            }
+
+                            this.InvokeBeforeTabDisplay(newSelected);
+
+                            if (m_SelectedTab.AttachedItem is DockContainerItem && ((DockContainerItem)m_SelectedTab.AttachedItem).Control != null && ((DockContainerItem)m_SelectedTab.AttachedItem).Control.Focused)
+                            {
+                                this.Focus();
+                            }
+                            Control panelToHide = null;
+                            if (m_SelectedTab.AttachedItem != null)
+                                m_SelectedTab.AttachedItem.Displayed = false;
+                            else if (m_SelectedTab.AttachedControl != null && !m_MdiTabbedDocuments)
+                            {
+                                //if(!(this.IsDesignMode && m_SelectedTab.AttachedControl is TabControlPanel))
+                                //m_SelectedTab.AttachedControl.Visible = false;
+                                panelToHide = m_SelectedTab.AttachedControl;
+                            }
+                            m_SelectedTab = newSelected;
+                            m_NeedRecalcSize = true;
+                            EnsureVisible(m_SelectedTab);
+                            if (m_SelectedTab.AttachedItem != null)
+                            {
+                                m_SelectedTab.AttachedItem.Displayed = true;
+                                if (m_SelectedTab.AttachedItem is DockContainerItem && ((DockContainerItem)m_SelectedTab.AttachedItem).Control != null)
+                                {
+                                    if (m_AutoSelectAttachedControl)
+                                        ((DockContainerItem)m_SelectedTab.AttachedItem).Control.Select();
+                                }
+                            }
+                            else if (m_SelectedTab.AttachedControl != null)
+                            {
+                                if (!m_MdiTabbedDocuments)
+                                {
+                                    //if(!(this.IsDesignMode && m_SelectedTab.AttachedControl is TabControlPanel))
+                                    m_SelectedTab.AttachedControl.Visible = true;
+                                    if (m_AutoSelectAttachedControl)
+                                        m_SelectedTab.AttachedControl.Select();
+
+                                }
+                                else if (m_SelectedTab.AttachedControl is Form)
+                                {
+                                    MdiClient client = this.GetMdiClient(m_MdiForm);
+                                    bool bSetRedraw = false;
+                                    Form oldActive = m_MdiForm.ActiveMdiChild;
+
+                                    if (client != null && m_MdiNoFormActivateFlicker && m_SelectedTab.AttachedControl is Form && (((Form)m_SelectedTab.AttachedControl).WindowState == FormWindowState.Maximized || oldActive != null && oldActive.WindowState == FormWindowState.Maximized))
+                                    {
+                                        NativeFunctions.SendMessage(client.Handle, NativeFunctions.WM_SETREDRAW, 0, 0);
+                                        bSetRedraw = true;
+                                    }
+
+                                    ((Form)m_SelectedTab.AttachedControl).Activate();
+                                    //if(m_TabSystemBox!=null)
+                                    //	m_TabSystemBox.CloseVisible=((Form)m_SelectedTab.AttachedControl).ControlBox;
+
+                                    if (bSetRedraw)
+                                    {
+                                        NativeFunctions.SendMessage(client.Handle, NativeFunctions.WM_SETREDRAW, 1, 0);
+                                        client.Refresh();
+                                    }
+
+                                    if (oldActive != null && oldActive.WindowState == FormWindowState.Normal)
+                                    {
+                                        if (BarFunctions.ThemedOS)
+                                        {
+                                            // This will force repaint of Title bar since there were some repainting issues with it...
+                                            string s = oldActive.Text; // GetFormText(oldActive);
+                                            oldActive.Text = s + " ";
+                                            oldActive.Text = s;
+                                        }
+                                    }
+                                }
+                            }
+
+                            if (panelToHide != null) panelToHide.Visible = false;
+                            this.Invalidate();
+
+                            if (SelectedTabChanged != null)
+                            {
+                                TabStripTabChangedEventArgs eventData = new TabStripTabChangedEventArgs(oldTab, m_SelectedTab, eEventSource.Mouse);
+                                SelectedTabChanged(this, eventData);
+                            }
+                        }
+                        else if (m_SelectedTab != null && m_SelectedTab.AttachedItem is DockContainerItem && m_SelectedTab.AttachedItem.ContainerControl is Bar && ((Bar)m_SelectedTab.AttachedItem.ContainerControl).DockSide == eDockSide.Document &&
+                            ((DockContainerItem)m_SelectedTab.AttachedItem).Control != null)
+                        {
+                            if (m_AutoSelectAttachedControl)
+                                ((DockContainerItem)m_SelectedTab.AttachedItem).Control.Select();
+                        }
+
+                        break;
+                    }
+                }
+            }
+
+            // Invoke TabItem events.
+            TabItem tabAt = HitTest(e.X, e.Y);
+            if (tabAt != null)
+            {
+                tabAt.InvokeMouseDown(e);
+            }
+        }
+
+        private void InvalidateHotTab()
+        {
+            if (m_HotTab == null)
+                return;
+            if (m_Style == eTabStripStyle.OneNote || m_Style == eTabStripStyle.VS2005Document)
+            {
+                Rectangle r = m_HotTab.DisplayRectangle;
+                if (m_Alignment == eTabStripAlignment.Top || m_Alignment == eTabStripAlignment.Bottom)
+                {
+                    r.X -= r.Height;
+                    r.Width += r.Height * 2;
+                    r.Height += 2;
+                }
+                else
+                {
+                    r.Y -= r.Width;
+                    r.Height += r.Width * 2;
+                    r.Width += 2;
+                }
+
+                this.Invalidate(r);
+            }
+            else if (m_Style == eTabStripStyle.Office2007Document)
+            {
+                Rectangle r = m_HotTab.DisplayRectangle;
+                if (m_Alignment == eTabStripAlignment.Top || m_Alignment == eTabStripAlignment.Bottom)
+                {
+                    r.Width += r.Height * 2;
+                    r.Height += 2;
+                }
+                else
+                {
+                    r.Height += r.Width * 2;
+                    r.Width += 2;
+                    r.X--;
+                }
+
+                this.Invalidate(r);
+            }
+            else if (m_Style == eTabStripStyle.VS2005Dock)
+            {
+                Rectangle r = m_HotTab.DisplayRectangle;
+                r.Inflate(6, 0);
+                this.Invalidate(r);
+            }
+            else
+            {
+                Rectangle r = m_HotTab.DisplayRectangle;
+                r.Inflate(2, 2);
+                this.Invalidate(r);
+            }
+        }
+
+        private Rectangle GetSelectedTabRectangle()
+        {
+            if (this.SelectedTab == null)
+                return Rectangle.Empty;
+            Rectangle r = this.SelectedTab.DisplayRectangle;
+            if (m_Style == eTabStripStyle.OneNote || m_Style == eTabStripStyle.VS2005Document)
+            {
+                switch (m_Alignment)
+                {
+                    case eTabStripAlignment.Top:
+                        {
+                            r.X -= (r.Height - 6);
+                            r.Width += (r.Height - 6);
+                            break;
+                        }
+                    case eTabStripAlignment.Bottom:
+                        {
+                            r.X -= (r.Height - 6);
+                            r.Width += (r.Height - 6);
+                            break;
+                        }
+                    case eTabStripAlignment.Left:
+                        {
+                            r.Height += (r.Width - 6);
+                            break;
+                        }
+                    case eTabStripAlignment.Right:
+                        {
+                            r.Y -= (r.Width - 6);
+                            r.Height += (r.Width - 6);
+                            break;
+                        }
+                }
+            }
+
+            return r;
+        }
+
+        protected override void OnMouseMove(MouseEventArgs e)
+        {
+            base.OnMouseMove(e);
+            this.InternalOnMouseMove(e);
+        }
+
+        private bool m_MovingTab = false;
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void InternalOnMouseMove(MouseEventArgs e)
+        {
+            if (m_TooltipTab != null)
+            {
+                if (!m_TooltipTab.DisplayRectangle.Contains(e.X, e.Y))
+                {
+                    HideToolTip();
+                    ResetHover();
+                }
+            }
+
+            if (m_HotTab != null)
+            {
+                if (m_HotTab.DisplayRectangle.Contains(e.X, e.Y))
+                    m_HotTab.InvokeMouseMove(e);
+                else
+                {
+                    m_HotTab.InvokeMouseLeave(e);
+                    TabItem mouseOverTab = HitTest(e.X, e.Y);
+                    if (mouseOverTab != null)
+                    {
+                        mouseOverTab.InvokeMouseEnter(e);
+                        ResetHover();
+                    }
+                }
+            }
+            else
+            {
+                TabItem mouseOverTab = HitTest(e.X, e.Y);
+                if (mouseOverTab != null)
+                {
+                    mouseOverTab.InvokeMouseEnter(e);
+                    ResetHover();
+                }
+            }
+
+            if (this.HasNavigationBox && !TabDrag)
+            {
+                m_TabSystemBox.MouseMove(e);
+                if (m_TabSystemBox.Visible && m_TabSystemBox.DisplayRectangle.Contains(e.X, e.Y))
+                {
+                    if (m_HotTab != null)
+                    {
+                        if (m_Tabs.Contains(m_HotTab))
+                        {
+                            InvalidateHotTab();
+                            m_HotTab = null;
+                            this.Update();
+                        }
+                        else
+                            m_HotTab = null;
+                    }
+                    return;
+                }
+            }
+
+            if (m_DragBar != null)
+            {
+                if (!m_DragBar.IsDisposed)
+                    m_DragBar.DragMouseMove();
+                return;
+            }
+            if (m_IsDragging)
+                return;
+
+            if (e.Button == MouseButtons.Left)
+            {
+                if (m_HotTab != null && m_HotTab.CloseButtonMouseOver)
+                {
+                    m_HotTab.CloseButtonMouseOver = false;
+                    InvalidateHotTab();
+                }
+
+                if (TabDrag)
+                {
+                    if (this.DisplayRectangle.Contains(e.X, e.Y))
+                    {
+                        if (m_CanReorderTabs || GetDesignMode())
+                        {
+                            foreach (TabItem item in m_Tabs)
+                            {
+                                Rectangle r = item.DisplayRectangle;
+                                if (e.X < r.Right && (m_Alignment == eTabStripAlignment.Bottom || m_Alignment == eTabStripAlignment.Top))
+                                    r.Width = m_SelectedTab.DisplayRectangle.Width;
+                                else if (e.Y < r.Bottom && (m_Alignment == eTabStripAlignment.Left || m_Alignment == eTabStripAlignment.Right))
+                                    r.Height = m_SelectedTab.DisplayRectangle.Height;
+                                if (r.Contains(e.X, e.Y))
+                                {
+                                    if (m_SelectedTab == item)
+                                        break;
+                                    int index = m_Tabs.IndexOf(item);
+                                    if (TabMoved != null)
+                                    {
+                                        TabStripTabMovedEventArgs arg = new TabStripTabMovedEventArgs(m_SelectedTab, m_Tabs.IndexOf(m_SelectedTab), index);
+                                        TabMoved(this, arg);
+                                        if (arg.Cancel)
+                                            break;
+                                    }
+                                    TabItem tabItem = m_SelectedTab;
+                                    m_MovingTab = true;
+                                    m_Tabs._Remove(tabItem);
+                                    m_Tabs._Insert(index, tabItem);
+                                    this.SelectedTab = tabItem;
+                                    m_MovingTab = false;
+                                    this.Refresh();
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                    else
+                    {
+                        Rectangle r = this.DisplayRectangle;
+                        r.Inflate(16, 16);
+                        if (!r.Contains(e.X, e.Y) && DotNetBarManager.MouseDockingEnabled)
+                        {
+                            int visibleTabCount = this.VisibleTabCount;
+                            if (this.Parent is Bar && ((Bar)this.Parent).CanTearOffTabs && (visibleTabCount > 1 || visibleTabCount == 1 && ((Bar)this.Parent).GrabHandleStyle == eGrabHandleStyle.None))
+                            {
+                                TabDrag = false;
+                                m_IsDragging = true; // Very important to set this flag before calling StartTabDrag
+
+                                m_DragBar = ((Bar)this.Parent).StartTabDrag();
+                                if (m_DragBar != null)
+                                {
+                                    this.Capture = true;
+                                    this.Refresh();
+                                }
+                                else
+                                    m_IsDragging = false;
+                            }
+                        }
+                    }
+
+                }
+                else if ((Math.Abs(e.X - _MouseDownPoint.X) >= 4 || Math.Abs(e.Y - _MouseDownPoint.Y) >= 4) && m_Tabs.Count > 0 && !this.IsMultiLine && this.CanReorderTabs)
+                {
+                    TabDrag = true;
+                }
+            }
+            else if (e.Button == MouseButtons.None)
+            {
+                Rectangle rSelected = this.GetSelectedTabRectangle();
+                if (rSelected.Contains(e.X, e.Y))
+                {
+                    SetHotTab(this.SelectedTab, e.X, e.Y);
+                    return;
+                }
+                else
+                {
+                    foreach (TabItem tab in m_Tabs)
+                    {
+                        if (tab.DisplayRectangle.Contains(e.X, e.Y))
+                        {
+                            SetHotTab(tab, e.X, e.Y);
+                            return;
+                        }
+                    }
+                }
+                SetHotTab(null, e.X, e.Y);
+            }
+        }
+
+        private Cursor _OldCursor = null;
+        private bool TabDrag
+        {
+            get
+            {
+                return m_TabDrag;
+            }
+            set
+            {
+                if (m_TabDrag != value)
+                {
+                    m_TabDrag = value;
+                    if (m_TabDrag)
+                    {
+                        if (!IsDockTab)
+                        {
+                            _OldCursor = this.Cursor;
+                            this.Cursor = GetTabDragCursor();
+                        }
+                    }
+                    else if (!IsDockTab)
+                    {
+                        this.Cursor = _OldCursor;
+                    }
+                }
+            }
+        }
+
+        private Cursor _TabDragCursor = null;
+        /// <summary>
+        /// Gets or sets the mouse cursor that is displayed when tab is dragged.
+        /// </summary>
+        [Browsable(true), DefaultValue(null), Category("Appearance"), Description("Specifies the mouse cursor that is displayed when tab is dragged.")]
+        public Cursor TabDragCursor
+        {
+            get { return _TabDragCursor; }
+            set { _TabDragCursor = value; }
+        }
+
+        private Cursor GetTabDragCursor()
+        {
+            if (_TabDragCursor != null) return _TabDragCursor;
+            return Cursors.SizeAll;
+        }
+        private bool IsDockTab
+        {
+            get { return this.Parent is Bar; }
+        }
+
+        private bool GetDesignMode()
+        {
+            if (this.Parent is TabControl)
+            {
+                TabControl tb = this.Parent as TabControl;
+                if (tb.Site != null) return tb.Site.DesignMode;
+            }
+            return this.DesignMode;
+        }
+
+        private void SetHotTab(TabItem tab, int x, int y)
+        {
+            if (m_HotTab != tab)
+            {
+                if (m_Tabs.Contains(m_HotTab))
+                    InvalidateHotTab();
+                if (m_HotTab != null)
+                    m_HotTab.CloseButtonMouseOver = false;
+                m_HotTab = tab;
+                if (m_HotTab != null)
+                {
+                    if (!m_HotTab.CloseButtonBounds.IsEmpty && m_HotTab.CloseButtonBounds.Contains(x, y))
+                        m_HotTab.CloseButtonMouseOver = true;
+                    InvalidateHotTab();
+                }
+                this.Update();
+                ResetHover();
+            }
+            else if (m_HotTab != null && !m_HotTab.CloseButtonBounds.IsEmpty)
+            {
+                if (m_HotTab.CloseButtonBounds.Contains(x, y))
+                {
+                    if (!m_HotTab.CloseButtonMouseOver)
+                    {
+                        m_HotTab.CloseButtonMouseOver = true;
+                        InvalidateHotTab();
+                        this.Update();
+                    }
+                }
+                else if (m_HotTab.CloseButtonMouseOver)
+                {
+                    m_HotTab.CloseButtonMouseOver = false;
+                    InvalidateHotTab();
+                    this.Update();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Returns tab mouse is over or null if mouse is not over the tab.
+        /// </summary>
+        internal TabItem MouseOverTab
+        {
+            get { return m_HotTab; }
+        }
+
+        protected override void OnMouseWheel(MouseEventArgs e)
+        {
+            base.OnMouseWheel(e);
+            m_TabSystemBox.MouseWheel(e);
+        }
+
+        internal int VisibleTabCount
+        {
+            get
+            {
+                int count = 0;
+                foreach (TabItem tab in m_Tabs)
+                {
+                    if (tab.Visible)
+                        count++;
+                }
+                return count;
+            }
+        }
+
+        internal bool IsDraggingBar
+        {
+            get
+            {
+                return m_IsDragging;
+            }
+        }
+
+        protected override void OnMouseUp(MouseEventArgs e)
+        {
+            base.OnMouseUp(e);
+            InternalOnMouseUp(e);
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void InternalOnMouseUp(MouseEventArgs e)
+        {
+            if (this.HasNavigationBox)
+            {
+                m_TabSystemBox.MouseUp(e);
+                if (m_TabSystemBox.Visible && m_TabSystemBox.DisplayRectangle.Contains(e.X, e.Y))
+                    return;
+            }
+
+            Point mouseDownPoint = _MouseDownPoint;
+            _MouseDownPoint = Point.Empty;
+
+            if (m_IsDragging)
+                this.Capture = false;
+            if (m_DragBar != null)
+            {
+                if (!m_DragBar.IsDisposed)
+                    m_DragBar.DragMouseUp();
+                m_DragBar = null;
+            }
+            m_IsDragging = false;
+            TabDrag = false;
+
+            // Invoke TabItem events.
+            TabItem tabAt = HitTest(e.X, e.Y);
+            if (tabAt != null)
+            {
+                tabAt.InvokeMouseUp(e);
+            }
+
+            if (this.SelectedTab != null && this.SelectedTab == tabAt && !this.SelectedTab.CloseButtonBounds.IsEmpty && e.Button == MouseButtons.Left)
+            {
+                Rectangle closeButtonBounds = this.SelectedTab.CloseButtonBounds;
+                // Increase the width for 2 pixels since when tab is selected it moves 2 pixels to the left
+                closeButtonBounds.Width += 2;
+                if (closeButtonBounds.Contains(e.X, e.Y) && closeButtonBounds.Contains(mouseDownPoint))
+                    this.CloseSelectedTab();
+            }
+            else if (e.Button == System.Windows.Forms.MouseButtons.Left && tabAt != null && !tabAt.CloseButtonBounds.IsEmpty && 
+                (m_TabLayoutType == eTabLayoutType.MultilineNoNavigationBox || m_TabLayoutType == eTabLayoutType.MultilineWithNavigationBox) && 
+                tabAt.CloseButtonBounds.Contains(e.X, e.Y) && tabAt.CloseButtonBounds.Contains(mouseDownPoint))
+            {
+                CloseTab(tabAt);
+            }
+        }
+
+        protected override void OnMouseLeave(EventArgs e)
+        {
+            InternalOnMouseLeave(e);
+            base.OnMouseLeave(e);
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void InternalOnMouseLeave(EventArgs e)
+        {
+            HideToolTip();
+            if (this.HasNavigationBox)
+                m_TabSystemBox.MouseLeave();
+            if (m_HotTab != null)
+            {
+                m_HotTab.InvokeMouseLeave(e);
+                if (m_Tabs.Contains(m_HotTab))
+                {
+                    m_HotTab.CloseButtonMouseOver = false;
+                    InvalidateHotTab();
+                    m_HotTab = null;
+                    this.Update();
+                }
+                else
+                    m_HotTab = null;
+            }
+        }
+
+        protected override void OnMouseClick(MouseEventArgs e)
+        {
+            if (m_HotTab != null)
+                OnTabMouseClick(m_HotTab, e);
+            base.OnMouseClick(e);
+        }
+
+        protected override void OnMouseHover(EventArgs e)
+        {
+            base.OnMouseHover(e);
+            if (this.HasNavigationBox)
+                m_TabSystemBox.MouseHover();
+            this.InternalMouseHover();
+        }
+
+        internal void InternalTabsCleared()
+        {
+            HideToolTip();
+            OnTabsCleared(new EventArgs());
+            if (m_SelectedTab != null)
+            {
+                if (SelectedTabChanged != null)
+                {
+                    TabStripTabChangedEventArgs eventData = new TabStripTabChangedEventArgs(m_SelectedTab, null, eEventSource.Code);
+                    SelectedTabChanged(this, eventData);
+                }
+                m_SelectedTab = null;
+            }
+        }
+
+        /// <summary>
+        /// Invokes the TabCleared event.
+        /// </summary>
+        /// <param name="e">Provides events arguments</param>
+        protected virtual void OnTabsCleared(EventArgs e)
+        {
+            if (TabsCleared != null)
+                TabsCleared(this, e);
+        }
+
+        /// <summary>
+        /// Ensures that the tab is visible, scrolling the tab-strip view as necessary.
+        /// </summary>
+        /// <param name="tab">Tab to make visible.</param>
+        public void EnsureVisible(TabItem tab)
+        {
+            if (tab == null || !m_Tabs.Contains(tab) || m_TabLayoutType == eTabLayoutType.FitContainer || this.IsMultiLine || !BarFunctions.IsHandleValid(this))
+                return;
+
+            Rectangle r = tab.DisplayRectangle;
+
+            if (r.IsEmpty)
+            {
+                this.Invalidate();
+                this.RecalcSize();
+            }
+
+            r = tab.DisplayRectangle;
+
+            if (m_Style == eTabStripStyle.OneNote || m_Style == eTabStripStyle.VS2005Document || m_Style == eTabStripStyle.Office2007Document)
+            {
+                if (m_Alignment == eTabStripAlignment.Top || m_Alignment == eTabStripAlignment.Bottom)
+                {
+                    if (m_Style != eTabStripStyle.Office2007Document)
+                        r.X -= (this.TabHeight - 6);
+                    r.Width += (this.TabHeight - 6);
+                }
+                else if (m_Alignment == eTabStripAlignment.Right)
+                {
+                    if (m_Style != eTabStripStyle.Office2007Document)
+                        r.Y -= (this.TabHeight - 6);
+                    r.Height += (this.TabHeight - 6);
+                }
+                else if (m_Alignment == eTabStripAlignment.Left)
+                    r.Height += (this.TabHeight - 6);
+
+            }
+
+            int offset = this.ScrollOffset;
+
+            if (m_Alignment == eTabStripAlignment.Top || m_Alignment == eTabStripAlignment.Bottom)
+            {
+                if (r.X < 0 || this.IsRightToLeft && r.X < m_TabSystemBox.DisplayRectangle.Right && m_TabSystemBox.Visible)
+                {
+                    offset = offset + r.X; //m_TabItemsBounds.Width - this.ClientRectangle.Width;
+                    if (this.IsRightToLeft && (m_Style == eTabStripStyle.OneNote || m_Style == eTabStripStyle.VS2005Document || m_Style == eTabStripStyle.Office2007Document))
+                        offset -= r.Height;
+                    if (offset < 0 || this.IsRightToLeft && offset < m_TabSystemBox.DisplayRectangle.Right)
+                    {
+                        offset = 0;
+                    }
+                    this.ScrollOffset = offset;
+                }
+                else if (!this.IsRightToLeft && r.Right > m_TabSystemBox.DisplayRectangle.Left && m_TabSystemBox.Visible && !m_TabSystemBox.DisplayRectangle.IsEmpty)
+                {
+                    offset = offset + r.Right - m_TabSystemBox.DisplayRectangle.Left + 2/*+m_TabSystemBox.DefaultWidth*/;
+                    this.ScrollOffset = offset;
+                }
+                else if (this.IsRightToLeft && r.Right > this.DisplayRectangle.Right)
+                {
+                    offset = offset + r.Right - this.DisplayRectangle.Right + 2;
+                    this.ScrollOffset = offset;
+                }
+                else if (tab.IsSelected && IsLastVisibleTab(tab) && offset > 0 && !m_TabItemsBounds.IsEmpty) // Ensures while tab is scrolled that there is little space to the right and most content visible
+                {
+                    offset = m_TabItemsBounds.Width - (this.ClientRectangle.Width - m_TabSystemBox.DisplayRectangle.Width - TabHeight);
+                    if (offset < 0 || this.IsRightToLeft && offset < m_TabSystemBox.DisplayRectangle.Right)
+                    {
+                        offset = 0;
+                    }
+                    this.ScrollOffset = offset;
+                }
+            }
+            else
+            {
+                if (r.Y < 0)
+                {
+                    offset = offset + (r.Y - 4);
+                    if (offset < 0)
+                        offset = 0;
+                    this.ScrollOffset = offset;
+                }
+                else if (r.Bottom > m_TabSystemBox.DisplayRectangle.Top && m_TabSystemBox.Visible && !m_TabSystemBox.DisplayRectangle.IsEmpty)
+                {
+                    offset = offset + r.Bottom - m_TabSystemBox.DisplayRectangle.Top + 4;
+                    this.ScrollOffset = offset;
+                }
+            }
+        }
+
+        private bool IsLastVisibleTab(TabItem tab)
+        {
+            int start = this.Tabs.Count - 1;
+            for (int i = start; i >= 0; i--)
+            {
+                if (!this.Tabs[i].Visible) continue;
+                if (this.Tabs[i] == tab) return true;
+                break;
+            }
+            return false;
+        }
+
+        internal bool _IgnoreBeforeTabDisplayEvent = false;
+        internal void InvokeBeforeTabDisplay(TabItem item)
+        {
+            if (!_IgnoreBeforeTabDisplayEvent && BeforeTabDisplay != null)
+                BeforeTabDisplay(item, new EventArgs());
+        }
+
+
+        /// <summary> 
+        /// Clean up any resources being used.
+        /// </summary>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                StyleManager.Unregister(this);
+            }
+
+            if (BarUtilities.DisposeItemImages && !this.DesignMode)
+            {
+                BarUtilities.DisposeImage(ref m_TabCloseButtonNormal);
+                BarUtilities.DisposeImage(ref m_TabCloseButtonHot);
+            }
+
+            base.Dispose(disposing);
+        }
+
+        /// <summary>
+        /// Called by StyleManager to notify control that style on manager has changed and that control should refresh its appearance if
+        /// its style is controlled by StyleManager.
+        /// </summary>
+        /// <param name="newStyle">New active style.</param>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public virtual void StyleManagerStyleChanged(eDotNetBarStyle newStyle)
+        {
+            OnTabStyleChanged();
+        }
+
+        /// <summary>
+        /// Gets or sets the selected tab Font
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Category("Style"), DefaultValue(null), Description("Gets or sets the selected tab Font")]
+        public Font SelectedTabFont
+        {
+            get
+            {
+                return m_SelectedTabFont;
+            }
+            set
+            {
+                m_SelectedTabFont = value;
+                if (m_SelectedTabFont == null)
+                    m_SelectedTabFontCustom = false;
+                else
+                    m_SelectedTabFontCustom = true;
+                m_NeedRecalcSize = true;
+                this.Invalidate();
+            }
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetSelectedTabFont()
+        {
+            m_SelectedTabFont = null;
+        }
+
+        /// <summary>
+        /// Gets or sets the tab alignment within the Tab-Strip control.
+        /// </summary>
+        [DefaultValue(eTabStripAlignment.Bottom), Browsable(true), DevCoBrowsable(true), Category("Appearance"), Description("Indicates the tab alignment within the Tab-Strip control.")]
+        public eTabStripAlignment TabAlignment
+        {
+            get { return m_Alignment; }
+            set
+            {
+                if (m_Alignment == value)
+                    return;
+                m_Alignment = value;
+                m_NeedRecalcSize = true;
+                this.Invalidate();
+            }
+        }
+
+        internal bool NeedRecalcSize
+        {
+            get { return m_NeedRecalcSize; }
+            set { m_NeedRecalcSize = value; }
+        }
+
+        /// <summary>
+        /// Specifes whether end-user can reorder the tabs.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Category("Behavior"), Description("Specifes whether end-user can reorder the tabs.")]
+        public bool CanReorderTabs
+        {
+            get
+            {
+                return m_CanReorderTabs;
+            }
+            set
+            {
+                if (m_CanReorderTabs != value)
+                    m_CanReorderTabs = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether system box that enables scrolling and closing of the tabs is automatically hidden when tab items size does not exceed the size of the control.
+        /// </summary>
+        [Browsable(true), DefaultValue(false), Category("Behavior"), Description("Indicates whether system box that enables scrolling and closing of the tabs is automatically hidden when tab items size does not exceed the size of the control.")]
+        public bool AutoHideSystemBox
+        {
+            get { return m_AutoHideSystemBox; }
+            set
+            {
+                if (m_AutoHideSystemBox == value)
+                    return;
+                m_AutoHideSystemBox = value;
+                m_NeedRecalcSize = true;
+                if (this.IsDesignMode)
+                    this.Invalidate();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the background color.
+        /// </summary>
+        [Browsable(false), Description("Indicates the background color."), Category("Style"), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), Obsolete("This property is obsolete. Please use ColorScheme property to change all tab colors."), EditorBrowsable(EditorBrowsableState.Never)]
+        public override Color BackColor
+        {
+            get { return base.BackColor; }
+            set { base.BackColor = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether only selected tab is displaying it's text.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Category("Behavior"), Description("Specifes whether only selected tab is displaying it's text."), DefaultValue(false)]
+        public bool DisplaySelectedTextOnly
+        {
+            get { return m_DisplaySelectedTextOnly; }
+            set
+            {
+                m_DisplaySelectedTextOnly = value;
+                m_NeedRecalcSize = true;
+                this.Invalidate();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets TabStrip style. Theme style is supported only on themed OS and only for bottom or top aligned tabs.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Category("Appearance"), Description("Specifes the TabStrip style."), DefaultValue(eTabStripStyle.Flat)]
+        public eTabStripStyle Style
+        {
+            get
+            {
+                return m_Style;
+            }
+            set
+            {
+                m_Style = value;
+                OnTabStyleChanged();
+            }
+        }
+
+        /// <summary>
+        /// Refreshes the color scheme with the colors from system color table.
+        /// </summary>
+        public void RefreshColorScheme()
+        {
+            m_ColorScheme.Style = m_Style;
+            m_ColorScheme.Themed = this.IsThemed;
+            if (this.Parent is Bar && ((Bar)this.Parent).DockSide != eDockSide.Document)
+                m_ColorScheme.TabContext = eTabContext.DockTab;
+            else
+                m_ColorScheme.TabContext = eTabContext.Default;
+            m_ColorScheme.Refresh();
+        }
+
+        private void OnTabStyleChanged()
+        {
+            m_NeedRecalcSize = true;
+            RefreshColorScheme();
+            m_ScrollOffset = 0;
+            m_TabHeight = 0;
+            if ((m_Style == eTabStripStyle.OneNote || m_Style == eTabStripStyle.VS2005Document || m_Style == eTabStripStyle.Office2007Document) && !this.IsThemed)
+            {
+                if (m_TabLayoutType == eTabLayoutType.FitContainer)
+                    m_TabLayoutType = eTabLayoutType.FixedWithNavigationBox;
+            }
+            this.Invalidate();
+            this.EnsureVisible(this.SelectedTab);
+        }
+
+        /// <summary>
+        /// Specifies whether tab is drawn using Themes when running on OS that supports themes like Windows XP.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), DefaultValue(false), Category("Appearance"), Description("Specifies whether tab is drawn using Themes when running on OS that supports themes like Windows XP.")]
+        public virtual bool ThemeAware
+        {
+            get
+            {
+                return m_ThemeAware;
+            }
+            set
+            {
+                m_ThemeAware = value;
+                m_NeedRecalcSize = true;
+                m_ColorScheme.Themed = this.IsThemed;
+                this.Invalidate();
+            }
+        }
+
+        /// <summary>
+        /// Gets whether control should be represented in themed style.
+        /// </summary>
+        internal bool IsThemed
+        {
+            get
+            {
+                if (m_ThemeAware && BarFunctions.ThemedOS && Themes.ThemesActive && m_Style != eTabStripStyle.SimulatedTheme &&
+                    m_Style != eTabStripStyle.Office2007Dock && m_Style != eTabStripStyle.Office2007Document && m_Style != eTabStripStyle.Metro)
+                    return true;
+                return false;
+            }
+        }
+
+        protected override void OnSystemColorsChanged(EventArgs e)
+        {
+            base.OnSystemColorsChanged(e);
+            Application.DoEvents();
+            OnTabStyleChanged();
+        }
+
+        protected override void OnFontChanged(EventArgs e)
+        {
+            base.OnFontChanged(e);
+            m_TabHeight = 0;
+            m_NeedRecalcSize = true;
+            if (this.IsDesignMode)
+            {
+                if ((m_Style == eTabStripStyle.OneNote || m_Style == eTabStripStyle.VS2005Document || m_Style == eTabStripStyle.Office2007Document) && !m_SelectedTabFontCustom)
+                {
+                    m_SelectedTabFont = new Font(this.Font, FontStyle.Bold);
+                }
+                this.Invalidate();
+            }
+        }
+
+        protected override void OnGotFocus(EventArgs e)
+        {
+            base.OnGotFocus(e);
+            if (this.ShowFocusRectangle)
+                this.Invalidate();
+        }
+
+        protected override void OnLostFocus(EventArgs e)
+        {
+            base.OnLostFocus(e);
+            if (this.ShowFocusRectangle)
+                this.Invalidate();
+        }
+
+        internal void OnTabVisibleChanged(TabItem tab)
+        {
+            m_NeedRecalcSize = true;
+            if (tab == m_TooltipTab)
+                HideToolTip();
+            if (!tab.Visible && m_SelectedTab == tab)
+            {
+                int i = this.Tabs.IndexOf(tab) - 1;
+                TabItem newSelected = null;
+                while (i >= 0)
+                {
+                    if (this.Tabs[i].Visible)
+                    {
+                        newSelected = this.Tabs[i];
+                        break;
+                    }
+                    i--;
+                }
+                if (newSelected == null)
+                {
+                    if (i < 0) i = 0;
+                    for (int it = i; it < this.Tabs.Count; it++)
+                    {
+                        if (this.Tabs[it].Visible)
+                        {
+                            newSelected = this.Tabs[it];
+                            break;
+                        }
+                    }
+                }
+                this.SelectedTab = newSelected;
+            }
+            else if (this.VisibleTabCount == 1 && tab.Visible)
+                this.SelectedTab = tab;
+        }
+
+        /// <summary>
+        /// Gets or sets Tab Color Scheme.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Category("Style"), Description("Gets or sets Tab Color Scheme."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public TabColorScheme ColorScheme
+        {
+            get { return m_ColorScheme; }
+            set
+            {
+                if (value == null)
+                    throw new ArgumentException("NULL is not a valid value for this property.");
+                if (m_ColorScheme != null)
+                    m_ColorScheme.ColorChanged -= new EventHandler(this.ColorSchemeChanged);
+                m_ColorScheme = value;
+                m_ColorScheme.ColorChanged += new EventHandler(this.ColorSchemeChanged);
+                if (this.Visible)
+                    this.Invalidate();
+            }
+        }
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeColorScheme()
+        {
+            return m_ColorScheme.SchemeChanged;
+        }
+        /// <summary>
+        /// Resets color scheme to default value.
+        /// </summary>
+        public void ResetColorScheme()
+        {
+            m_ColorScheme.ResetChangedFlag();
+            m_ColorScheme.Refresh();
+            if (this.IsDesignMode)
+                this.Invalidate();
+        }
+
+        private void ColorSchemeChanged(object sender, EventArgs e)
+        {
+            if (this.IsDesignMode || this.Parent is TabControl)
+                this.Invalidate();
+        }
+
+        protected override bool ProcessMnemonic(char charCode)
+        {
+            string s = "&" + charCode.ToString();
+            s = s.ToLower();
+            foreach (TabItem tab in this.Tabs)
+            {
+                if (string.IsNullOrEmpty(tab.Text)) continue;
+                string text = tab.Text.ToLower();
+                if (text.IndexOf(s) >= 0)
+                {
+                    this.SelectTab(tab, eEventSource.Keyboard);
+                    return true;
+                }
+            }
+            return base.ProcessMnemonic(charCode);
+        }
+
+        internal TabColors GetTabColors(TabItem tab)
+        {
+            TabColors c = new TabColors();
+            if (tab == m_HotTab && !tab.IsSelected)
+            {
+                c.BackColor = m_ColorScheme.TabItemHotBackground;
+                c.BackColor2 = m_ColorScheme.TabItemHotBackground2;
+                c.BackColorGradientAngle = m_ColorScheme.TabItemHotBackgroundGradientAngle;
+                c.TextColor = m_ColorScheme.TabItemHotText;
+                c.LightBorderColor = m_ColorScheme.TabItemHotBorderLight;
+                c.DarkBorderColor = m_ColorScheme.TabItemHotBorderDark;
+                c.BorderColor = m_ColorScheme.TabItemHotBorder;
+                c.BackgroundColorBlend.CopyFrom(m_ColorScheme.TabItemHotBackgroundColorBlend);
+            }
+
+            if (this.SelectedTab == tab)
+            {
+                if (tab.PredefinedColor != eTabItemColor.Default)
+                {
+                    c.BackColor = tab.BackColor;
+                    c.BackColor2 = tab.BackColor2;
+                    c.BackColorGradientAngle = tab.BackColorGradientAngle;
+                    c.TextColor = tab.TextColor;
+                }
+                if (c.BackColor.IsEmpty)
+                {
+                    c.BackColor = m_ColorScheme.TabItemSelectedBackground;
+                    c.BackColor2 = m_ColorScheme.TabItemSelectedBackground2;
+                    c.BackColorGradientAngle = m_ColorScheme.TabItemSelectedBackgroundGradientAngle;
+                    c.BackgroundColorBlend.CopyFrom(m_ColorScheme.TabItemSelectedBackgroundColorBlend);
+                }
+                if (c.TextColor.IsEmpty)
+                {
+                    if (m_ColorScheme.TabItemSelectedText.IsEmpty)
+                        c.TextColor = m_ColorScheme.TabItemText;
+                    else
+                        c.TextColor = m_ColorScheme.TabItemSelectedText;
+                }
+                if (c.BorderColor.IsEmpty)
+                {
+                    c.LightBorderColor = m_ColorScheme.TabItemSelectedBorderLight;
+                    c.DarkBorderColor = m_ColorScheme.TabItemSelectedBorderDark;
+                    c.BorderColor = m_ColorScheme.TabItemSelectedBorder;
+                }
+            }
+
+            if (c.BackColor.IsEmpty)
+            {
+                if (tab.BackColor.IsEmpty && tab.BackColor2.IsEmpty)
+                {
+                    c.BackColor = m_ColorScheme.TabItemBackground;
+                    c.BackColor2 = m_ColorScheme.TabItemBackground2;
+                    c.BackColorGradientAngle = m_ColorScheme.TabItemBackgroundGradientAngle;
+                    c.BackgroundColorBlend.CopyFrom(m_ColorScheme.TabItemBackgroundColorBlend);
+                }
+                else
+                {
+                    c.BackColor = tab.BackColor;
+                    c.BackColor2 = tab.BackColor2;
+                    c.BackColorGradientAngle = tab.BackColorGradientAngle;
+                    c.TextColor = tab.TextColor;
+                }
+            }
+
+            if (c.TextColor.IsEmpty)
+            {
+                if (tab.TextColor.IsEmpty)
+                    c.TextColor = m_ColorScheme.TabItemText;
+                else
+                    c.TextColor = tab.TextColor;
+            }
+
+            if (c.BorderColor.IsEmpty)
+            {
+                if (tab.BorderColor.IsEmpty && tab.LightBorderColor.IsEmpty && tab.DarkBorderColor.IsEmpty)
+                {
+                    c.DarkBorderColor = m_ColorScheme.TabItemBorderDark;
+                    c.LightBorderColor = m_ColorScheme.TabItemBorderLight;
+                    c.BorderColor = m_ColorScheme.TabItemBorder;
+                }
+                else
+                {
+                    c.LightBorderColor = tab.LightBorderColor;
+                    c.DarkBorderColor = tab.DarkBorderColor;
+                    c.BorderColor = tab.BorderColor;
+                }
+            }
+
+            return c;
+        }
+
+        private void OnTabBack(object sender, EventArgs e)
+        {
+            ScrollBackwards();
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ScrollBackwards()
+        {
+            if (NavigateBack != null)
+            {
+                TabStripActionEventArgs action = new TabStripActionEventArgs();
+                NavigateBack(this, action);
+                if (action.Cancel)
+                    return;
+            }
+
+            int iOffset = 0;
+            for (int i = m_Tabs.Count - 1; i >= 0; i--)
+            {
+                TabItem item = m_Tabs[i];
+                if (!item.Visible)
+                    continue;
+                if (m_Alignment == eTabStripAlignment.Top || m_Alignment == eTabStripAlignment.Bottom)
+                {
+                    if (item.DisplayRectangle.X < 4)
+                    {
+                        iOffset = -item.DisplayRectangle.Width;
+                        if (m_Style == eTabStripStyle.OneNote || m_Style == eTabStripStyle.VS2005Document)
+                            iOffset -= item.DisplayRectangle.Height;
+                        break;
+                    }
+                }
+                else
+                {
+                    if (item.DisplayRectangle.Y < 4)
+                    {
+                        iOffset = -item.DisplayRectangle.Height;
+                        if (m_Style == eTabStripStyle.OneNote || m_Style == eTabStripStyle.VS2005Document)
+                            iOffset -= item.DisplayRectangle.Height;
+                        break;
+                    }
+                }
+            }
+            if (iOffset == 0 && m_ScrollOffset > 0)
+                iOffset = -m_ScrollOffset;
+
+            int iStart = m_ScrollOffset;
+            int iEnd = m_ScrollOffset + iOffset;
+            if (iEnd < 0)
+                iEnd = 0;
+            if (m_Animate)
+            {
+                DateTime start = DateTime.Now;
+                for (int i = iStart; i > iEnd; i--)
+                {
+                    this.ScrollOffset = i;
+                    if (((TimeSpan)DateTime.Now.Subtract(start)).TotalMilliseconds > 200)
+                        break;
+                }
+            }
+            this.ScrollOffset = iEnd;
+        }
+        private void OnTabForward(object sender, EventArgs e)
+        {
+            ScrollForward();
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ScrollForward()
+        {
+            if (NavigateForward != null)
+            {
+                TabStripActionEventArgs action = new TabStripActionEventArgs();
+                NavigateForward(this, action);
+                if (action.Cancel)
+                    return;
+            }
+
+            int iOffset = 0;
+            TabItem lastItem = null;
+            int start = 0, end = m_Tabs.Count, direction = 1;
+            if (this.RightToLeft == RightToLeft.Yes)
+            {
+                start = m_Tabs.Count - 1;
+                end = -1;
+                direction = -1;
+            }
+            for (int i = start; i != end; i += direction)
+            {
+                TabItem item = m_Tabs[i];
+                if (!item.Visible)
+                    continue;
+                if (m_Alignment == eTabStripAlignment.Top || m_Alignment == eTabStripAlignment.Bottom)
+                {
+                    if (item.DisplayRectangle.X < 4 && this.RightToLeft == RightToLeft.No ||
+                        item.DisplayRectangle.Right <= this.Width && this.RightToLeft == RightToLeft.Yes)
+                        continue;
+                    lastItem = item;
+                    iOffset = item.DisplayRectangle.Width;
+                    if (item.DisplayRectangle.Right > this.Width - m_TabSystemBox.DefaultWidth)
+                        break;
+                }
+                else
+                {
+                    if (item.DisplayRectangle.Y < 4)
+                        continue;
+                    lastItem = item;
+                    iOffset = item.DisplayRectangle.Height;
+                    if (item.DisplayRectangle.Bottom > this.Height - m_TabSystemBox.DefaultWidth)
+                        break;
+                }
+            }
+
+            if (lastItem != null)
+            {
+                if (m_Alignment == eTabStripAlignment.Top || m_Alignment == eTabStripAlignment.Bottom)
+                {
+                    if (lastItem.DisplayRectangle.Right + 2 < this.Width - m_TabSystemBox.DefaultWidth)
+                        return;
+                }
+                else
+                {
+                    if (lastItem.DisplayRectangle.Bottom + 2 < this.Height - m_TabSystemBox.DefaultWidth)
+                        return;
+                }
+            }
+
+            int iStart = m_ScrollOffset;
+            int iEnd = m_ScrollOffset + iOffset;
+            if (m_Alignment == eTabStripAlignment.Top || m_Alignment == eTabStripAlignment.Bottom)
+            {
+                if (iEnd > m_Tabs[m_Tabs.Count - 1].DisplayRectangle.Right + m_ScrollOffset && this.RightToLeft == RightToLeft.No)
+                    iEnd = m_Tabs[m_Tabs.Count - 1].DisplayRectangle.Right + m_ScrollOffset + m_TabSystemBox.DefaultWidth;
+                else if (iEnd < 0 && this.RightToLeft == RightToLeft.Yes)
+                    iEnd = 0;
+            }
+            else
+            {
+                if (iEnd > m_Tabs[m_Tabs.Count - 1].DisplayRectangle.Bottom + m_ScrollOffset)
+                    iEnd = m_Tabs[m_Tabs.Count - 1].DisplayRectangle.Bottom + m_ScrollOffset + m_TabSystemBox.DefaultWidth;
+            }
+
+            if (m_Animate)
+            {
+                DateTime animationStart = DateTime.Now;
+                for (int i = iStart; i < iEnd; i++)
+                {
+                    this.ScrollOffset = i;
+                    if (((TimeSpan)DateTime.Now.Subtract(animationStart)).TotalMilliseconds > 200)
+                        break;
+                }
+            }
+            this.ScrollOffset = iEnd;
+        }
+        private void OnTabClose(object sender, EventArgs e)
+        {
+            CloseSelectedTab();
+        }
+
+        private void CloseSelectedTab()
+        {
+            CloseTab(this.SelectedTab);
+        }
+
+        private void CloseTab(TabItem tab)
+        {
+            if (tab == null)
+                return;
+
+            if (TabItemClose != null)
+            {
+                TabStripActionEventArgs action = new TabStripActionEventArgs();
+                action.TabItem = tab;
+                TabItemClose(this, action);
+                if (action.Cancel)
+                    return;
+            }
+
+            if (m_MdiTabbedDocuments && tab != null && tab.AttachedControl is Form)
+                ((Form)tab.AttachedControl).Close();
+            else if (tab != null && tab.AttachedItem != null)
+            {
+                if (tab.AttachedItem is DockContainerItem)
+                {
+                    Bar bar = tab.AttachedItem.ContainerControl as Bar;
+                    if (bar != null)
+                        bar.CloseDockTab((DockContainerItem)tab.AttachedItem, eEventSource.Mouse);
+                    else
+                        tab.AttachedItem.Visible = false;
+                }
+            }
+        }
+        /// <summary>
+        /// Gets or sets whether the tab scrolling is animanted.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Description("Indicates whether the tab scrolling is animanted."), Category("Behavior"), DefaultValue(true)]
+        public bool Animate
+        {
+            get { return m_Animate; }
+            set { m_Animate = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the fixed tab size in pixels. Either Height or Width can be set or both.
+        /// Value of 0 indicates that size is automatically calculated which is
+        /// default behavior.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), Description("Gets or sets the fixed tab size in pixels. Either Height or Width can be set or both.")]
+        public Size FixedTabSize
+        {
+            get { return m_FixedTabSize; }
+            set
+            {
+                m_FixedTabSize = value;
+                m_NeedRecalcSize = true;
+                if (this.DesignMode)
+                    this.Invalidate();
+            }
+        }
+        /// <summary>
+        /// Memeber used by Windows Forms designer.
+        /// </summary>
+        /// <returns>true if property should be serialized.</returns>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeFixedTabSize()
+        {
+            return !m_FixedTabSize.IsEmpty;
+        }
+        /// <summary>
+        /// Memeber used by Windows Forms designer to reset property to default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetFixedTabSize()
+        {
+            TypeDescriptor.GetProperties(this)["FixedTabSize"].SetValue(this, Size.Empty);
+        }
+
+        /// <summary>
+        /// Returns tab item that contains specified coordinates.
+        /// </summary>
+        /// <param name="x">X - coordinate to hit test</param>
+        /// <param name="y">Y - coordinate to hit test</param>
+        /// <returns></returns>
+        public TabItem HitTest(int x, int y)
+        {
+            if (m_Style == eTabStripStyle.OneNote || m_Style == eTabStripStyle.VS2005Document || m_Style == eTabStripStyle.Office2007Document)
+            {
+                if (this.GetSelectedTabRectangle().Contains(x, y))
+                    return this.SelectedTab;
+            }
+            Rectangle systemBox = GetSystemBoxRectangle();
+            foreach (TabItem tab in this.Tabs)
+            {
+                if (tab.Visible && tab.DisplayRectangle.Contains(x, y))
+                    return tab;
+            }
+
+            return null;
+        }
+
+        protected override void OnParentChanged(EventArgs e)
+        {
+            base.OnParentChanged(e);
+            RefreshColorScheme();
+            if (m_MdiTabbedDocuments && m_MdiForm == null)
+            {
+                Form form = this.FindForm();
+                if (form != null && form.IsMdiContainer)
+                    this.MdiForm = form;
+            }
+            if ((m_Style == eTabStripStyle.OneNote || m_Style == eTabStripStyle.VS2005Document || m_Style == eTabStripStyle.Office2007Document) && m_SelectedTabFont == null)
+            {
+                m_SelectedTabFont = new Font(this.Font, FontStyle.Bold);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether focus rectangle is displayed when tab has input focus.
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Behavior"), Description("Indicates whether focus rectangle is displayed when tab has input focus.")]
+        public bool ShowFocusRectangle
+        {
+            get { return m_ShowFocusRectangle; }
+            set { m_ShowFocusRectangle = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether Tab-Strip control provides Tabbed MDI Child form support. Default value is false.
+        /// </summary>
+        [Browsable(true), Description("Indicates whether Tab-Strip control provides Tabbed MDI Child form support."), Category("Mdi Support"), DefaultValue(false)]
+        public bool MdiTabbedDocuments
+        {
+            get { return m_MdiTabbedDocuments; }
+            set
+            {
+                if (m_MdiTabbedDocuments != value)
+                {
+                    m_MdiTabbedDocuments = value;
+                    if (m_MdiForm == null && m_MdiTabbedDocuments)
+                    {
+                        // Try to get to the MDI form
+                        Form form = this.FindForm();
+                        if (form != null && form.IsMdiContainer)
+                            this.MdiForm = form;
+                    }
+                    else if (!m_MdiTabbedDocuments)
+                    {
+                        this.MdiForm = null;
+                        m_Tabs.Clear();
+                        this.Invalidate();
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the maximum number of characters that will be used as Tab text from Mdi Child caption.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Description("Indicates the maximum number of characters that will be used as Tab text from Mdi Child caption."), Category("Mdi Support"), DefaultValue(32)]
+        public int MaxMdiCaptionLength
+        {
+            get { return m_MaxMdiCaptionLength; }
+            set
+            {
+                if (m_MaxMdiCaptionLength != value)
+                {
+                    m_MaxMdiCaptionLength = value;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether the Mdi Child Icon is displayed on Tab.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Description("Indicates whether the Mdi Child Icon is displayed on Tab."), Category("Mdi Support"), DefaultValue(true)]
+        public bool ShowMdiChildIcon
+        {
+            get { return m_ShowMdiChildIcon; }
+            set
+            {
+                if (m_ShowMdiChildIcon != value)
+                {
+                    m_ShowMdiChildIcon = value;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether the Tab-strip is automatically hidden when there are not Mdi Child forms open.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Description("Indicates whether the Tab-strip is automatically hidden when there are not Mdi Child forms open."), Category("Mdi Support"), DefaultValue(true)]
+        public bool MdiAutoHide
+        {
+            get { return m_MdiAutoHide; }
+            set
+            {
+                if (m_MdiAutoHide != value)
+                {
+                    m_MdiAutoHide = value;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether flicker associated with switching maximized Mdi child forms is attempted to eliminate. You should set this property to false if you encounter any painting problems with your Mdi child forms.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), Description("Indicates whether flicker associated with switching maximized Mdi child forms is attempted to eliminate."), Category("Mdi Support"), DefaultValue(true)]
+        public bool MdiNoFormActivateFlicker
+        {
+            get { return m_MdiNoFormActivateFlicker; }
+            set
+            {
+                if (m_MdiNoFormActivateFlicker != value)
+                {
+                    m_MdiNoFormActivateFlicker = value;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets Mdi Container form for which Tab-Strip is providing Tabbed MDI Child support.
+        /// </summary>
+        [Browsable(true), DefaultValue(null), Description("Indicates Mdi Container form for which Tab-Strip is providing Tabbed MDI Child support.")]
+        public Form MdiForm
+        {
+            get { return m_MdiForm; }
+            set
+            {
+                //if(value!=null && !value.IsMdiContainer)
+                //    throw new ArgumentException("Form is not a Mdi Container.");
+
+                if (m_MdiForm != null)
+                    ReleaseMdiForm();
+
+                m_MdiForm = value;
+
+                if (m_MdiForm != null && !this.DesignMode)
+                {
+                    InitializeMdiForm();
+                    RefreshMdiTabItems();
+                }
+            }
+        }
+
+        private void InitializeMdiForm()
+        {
+            MdiClient client = GetMdiClient(m_MdiForm);
+            if (client == null)
+            {
+                m_MdiForm.Load += new EventHandler(this.ParentFormLoaded);
+                return;
+            }
+
+            client.ControlAdded += new ControlEventHandler(this.MdiFormAdded);
+            client.ControlRemoved += new ControlEventHandler(this.MdiFormRemoved);
+            m_MdiForm.MdiChildActivate += new EventHandler(this.MdiFormActivated);
+            m_MdiInitialized = true;
+        }
+
+        private void ReleaseMdiForm()
+        {
+            if (!m_MdiInitialized)
+                return;
+
+            MdiClient client = GetMdiClient(m_MdiForm);
+            if (client == null)
+                return;
+
+            client.ControlAdded -= new ControlEventHandler(this.MdiFormAdded);
+            client.ControlRemoved -= new ControlEventHandler(this.MdiFormRemoved);
+            m_MdiForm.MdiChildActivate -= new EventHandler(this.MdiFormActivated);
+            m_MdiInitialized = false;
+        }
+
+        private void ParentFormLoaded(object sender, EventArgs e)
+        {
+            if (m_MdiForm != null)
+            {
+                m_MdiForm.Load -= new EventHandler(this.ParentFormLoaded);
+                if (!m_MdiInitialized)
+                {
+                    InitializeMdiForm();
+                    if (m_MdiForm.MdiChildren.Length > 0)
+                        RefreshMdiTabItems();
+                }
+            }
+            else if (sender is Form)
+            {
+                ((Form)sender).Load -= new EventHandler(this.ParentFormLoaded);
+            }
+        }
+
+        internal void OnTabAdded(TabItem item)
+        {
+            HideToolTip();
+
+            if (m_MovingTab)
+                return;
+            if (TabItemOpen != null)
+                TabItemOpen(item, new EventArgs());
+            if (this.VisibleTabCount == 1 && item.Visible && m_SelectedTab == null)
+                this.SelectedTab = item;
+        }
+
+        private string GetFormText(Form form)
+        {
+            if (form == null)
+                return "";
+            string text = form.Text.Replace("&", "&&");
+            if (text.Length > m_MaxMdiCaptionLength)
+            {
+                int i = m_MaxMdiCaptionLength / 2;
+                return text.Substring(0, i) + "..." + text.Substring(text.Length - (m_MaxMdiCaptionLength - i));
+            }
+            return text;
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public void MdiFormAdded(object sender, ControlEventArgs e)
+        {
+            if (m_MdiForm == null || !m_MdiInitialized)
+                return;
+
+            Form form = e.Control as Form;
+            if (form == null)
+            {
+                RefreshMdiTabItems();
+                return;
+            }
+
+            string text = GetFormText(form);
+
+            TabItem item = new TabItem();
+            item.Text = text;
+            item.AttachedControl = form;
+
+            //Image img=null;
+            if (m_ShowMdiChildIcon && form.Icon != null)
+            {
+                item.Icon = new Icon(form.Icon, item.IconSize);
+                //				img=new Bitmap(16,16,System.Drawing.Imaging.PixelFormat.Format32bppArgb);
+                //				Graphics g=Graphics.FromImage(img);
+                //				g.DrawIcon(form.Icon,new Rectangle(0,0,16,16));
+                //				g.Dispose();
+                //				item.Image=img;
+            }
+
+            m_Tabs.Add(item);
+
+            form.TextChanged += new EventHandler(this.FormTextChanged);
+            form.VisibleChanged += new EventHandler(this.FormVisibleChanged);
+
+            if (m_MdiForm.ActiveMdiChild == form)
+                this.SelectedTab = item;
+
+            if (m_MdiAutoHide && m_MdiForm != null && !this.Visible && !this.IsDesignMode)
+            {
+                BarFunctions.SetControlVisible(this, true);
+            }
+            this.Invalidate();
+        }
+
+        private void RefreshMdiTabItems()
+        {
+            if (m_MdiForm == null || !m_MdiTabbedDocuments || !BarFunctions.IsHandleValid(this))
+                return;
+
+            if (m_Tabs.Count > 0)
+            {
+                foreach (TabItem tab in m_Tabs)
+                {
+                    if (tab.AttachedControl is Form)
+                    {
+                        Form form = (Form)tab.AttachedControl;
+                        form.TextChanged -= new EventHandler(this.FormTextChanged);
+                        form.VisibleChanged -= new EventHandler(this.FormVisibleChanged);
+                    }
+                    tab.Dispose();
+                }
+            }
+
+            m_Tabs.Clear();
+
+            foreach (Form form in m_MdiForm.MdiChildren)
+            {
+                string text = GetFormText(form);
+
+                TabItem item = new TabItem();
+                item.Text = text;
+                item.AttachedControl = form;
+
+                if (m_ShowMdiChildIcon && form.Icon != null)
+                {
+                    item.Icon = new Icon(form.Icon, item.IconSize);
+                }
+
+                m_Tabs.Add(item);
+                item.Visible = form.Visible;
+
+                form.TextChanged += new EventHandler(this.FormTextChanged);
+                form.VisibleChanged += new EventHandler(this.FormVisibleChanged);
+
+                if (m_MdiForm.ActiveMdiChild == form)
+                    this.SelectedTab = item;
+            }
+
+            if (m_MdiAutoHide && m_MdiForm != null)
+            {
+                if (m_MdiForm.MdiChildren.Length == 0 && this.Visible && !this.IsDesignMode)
+                    this.Visible = false;
+                else if (m_MdiForm.MdiChildren.Length > 0 && !this.Visible && !this.IsDesignMode)
+                {
+                    BarFunctions.SetControlVisible(this, true);
+                }
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public void MdiFormRemoved(object sender, ControlEventArgs e)
+        {
+            Form form = e.Control as Form;
+            if (form == null)
+            {
+                if (TabItemClose != null)
+                {
+                    TabStripActionEventArgs action = new TabStripActionEventArgs();
+                    TabItemClose(this, action);
+                }
+                RefreshMdiTabItems();
+                return;
+            }
+            foreach (TabItem item in m_Tabs)
+            {
+                if (item.AttachedControl == form)
+                {
+                    if (TabItemClose != null)
+                    {
+                        TabStripActionEventArgs action = new TabStripActionEventArgs();
+                        TabItemClose(item, action);
+                    }
+                    m_Tabs.Remove(item);
+                    item.AttachedControl = null;
+                    item.Dispose();
+                    form.TextChanged -= new EventHandler(this.FormTextChanged);
+                    form.VisibleChanged -= new EventHandler(this.FormVisibleChanged);
+                    this.Invalidate();
+                    break;
+                }
+            }
+            if (m_MdiAutoHide && m_MdiForm != null)
+            {
+                if (m_MdiForm.MdiChildren.Length == 0 && !this.IsDesignMode)
+                    this.Visible = false;
+            }
+        }
+
+        private void MdiFormActivated(object sender, EventArgs e)
+        {
+            Form form = m_MdiForm.ActiveMdiChild;
+            foreach (TabItem item in m_Tabs)
+            {
+                if (item.AttachedControl == form)
+                {
+                    if (this.SelectedTab != item)
+                        this.SelectedTab = item;
+                    break;
+                }
+            }
+        }
+
+        private void FormTextChanged(object sender, EventArgs e)
+        {
+            Form form = sender as Form;
+            if (form == null)
+                return;
+            foreach (TabItem item in m_Tabs)
+            {
+                if (item.AttachedControl == form)
+                {
+                    item.Text = GetFormText(form);
+                    break;
+                }
+            }
+        }
+
+        private void FormVisibleChanged(object sender, EventArgs e)
+        {
+            Form form = sender as Form;
+            if (form == null)
+                return;
+            foreach (TabItem item in m_Tabs)
+            {
+                if (item.AttachedControl == form)
+                {
+                    item.Visible = form.Visible;
+                    break;
+                }
+            }
+        }
+
+        private MdiClient GetMdiClient(Form MdiForm)
+        {
+            if (!MdiForm.IsMdiContainer)
+                return null;
+            foreach (Control ctrl in MdiForm.Controls)
+            {
+                if (ctrl is MdiClient)
+                    return (ctrl as MdiClient);
+            }
+            return null;
+        }
+
+        internal Color GetBackColorFlat()
+        {
+            Color color = ControlPaint.Light(SystemColors.Control);
+            if (BarFunctions.ThemedOS && NativeFunctions.ColorDepth >= 16)
+            {
+                if (SystemColors.Control.ToArgb() == Color.FromArgb(236, 233, 216).ToArgb() && SystemColors.Highlight.ToArgb() == Color.FromArgb(49, 106, 197).ToArgb())
+                    color = Color.FromArgb(255, 251, 233);
+                else if (SystemColors.Control.ToArgb() == Color.FromArgb(224, 223, 227).ToArgb() && SystemColors.Highlight.ToArgb() == Color.FromArgb(178, 180, 191).ToArgb())
+                    color = Color.FromArgb(251, 250, 255);
+                else if (SystemColors.Control.ToArgb() == Color.FromArgb(236, 233, 216).ToArgb() && SystemColors.Highlight.ToArgb() == Color.FromArgb(147, 160, 112).ToArgb())
+                    color = Color.FromArgb(255, 251, 233);
+            }
+            return color;
+        }
+
+        #region Tooltip Support
+        /// <summary>
+        /// Hides tooltip for a tab is one is displayed.
+        /// </summary>
+        public void HideToolTip()
+        {
+            if (m_ToolTip != null)
+            {
+                m_ToolTip.Hide();
+                m_ToolTip.Dispose();
+                m_ToolTip = null;
+            }
+            m_TooltipTab = null;
+        }
+
+        /// <summary>
+        /// Shows tooltip for given tab.
+        /// </summary>
+        private void ShowToolTip(TabItem tab)
+        {
+            if (m_ToolTip != null)
+                HideToolTip();
+
+            if (tab.Tooltip == null || tab.Tooltip == "")
+                return;
+
+            if (this.Visible)
+            {
+                if (m_ToolTip == null)
+                    m_ToolTip = new ToolTip();
+                m_ToolTip.Text = tab.Tooltip;
+                m_ToolTip.ShowToolTip();
+                m_TooltipTab = tab;
+            }
+        }
+
+        /// <summary>
+        /// Resets Hoover timer.
+        /// </summary>
+        private void ResetHover()
+        {
+            NativeFunctions.TRACKMOUSEEVENT tme = new NativeFunctions.TRACKMOUSEEVENT();
+            tme.dwFlags = NativeFunctions.TME_QUERY;
+            tme.hwndTrack = this.Handle;
+            tme.cbSize = Marshal.SizeOf(tme);
+            NativeFunctions.TrackMouseEvent(ref tme);
+            tme.dwFlags = tme.dwFlags | NativeFunctions.TME_HOVER;
+            NativeFunctions.TrackMouseEvent(ref tme);
+        }
+
+        private void InternalMouseHover()
+        {
+            Point p = Control.MousePosition;
+            p = this.PointToClient(p);
+            TabItem tab = HitTest(p.X, p.Y);
+
+            if (tab != null)
+            {
+                tab.InvokeMouseHover(new EventArgs());
+            }
+
+            if (tab == null)
+            {
+                HideToolTip();
+            }
+            else if (m_TooltipTab != tab)
+            {
+                HideToolTip();
+
+                if (this.Style == eTabStripStyle.Office2007Document)
+                {
+                    Rectangle r = GetSystemBoxRectangle();
+                    if (!r.IsEmpty && r.IntersectsWith(tab.DisplayRectangle))
+                        return;
+                }
+
+                ShowToolTip(tab);
+            }
+        }
+        #endregion
+    }
+
+    /// <summary>
+    /// Represents the event arguments for tab selection events.
+    /// </summary>
+    public class TabStripTabChangedEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Currently selected tab.
+        /// </summary>
+        public readonly TabItem OldTab;
+        /// <summary>
+        /// Tab being selected.
+        /// </summary>
+        public readonly TabItem NewTab;
+        /// <summary>
+        /// Specifies the action that caused the event.
+        /// </summary>
+        public readonly eEventSource EventSource = eEventSource.Code;
+
+        /// <summary>
+        /// Default constructor.
+        /// </summary>
+        /// <param name="oldtab">Currently selected tab.</param>
+        /// <param name="newtab">New selection.</param>
+        public TabStripTabChangedEventArgs(TabItem oldtab, TabItem newtab, eEventSource source)
+        {
+            this.OldTab = oldtab;
+            this.NewTab = newtab;
+            this.EventSource = source;
+        }
+    }
+
+    /// <summary>
+    /// Represents the event arguments for tab selection events.
+    /// </summary>
+    public class TabStripTabChangingEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Currently selected tab.
+        /// </summary>
+        public readonly TabItem OldTab;
+        /// <summary>
+        /// Tab being selected.
+        /// </summary>
+        public readonly TabItem NewTab;
+        /// <summary>
+        /// Cancels the selection operation.
+        /// </summary>
+        public bool Cancel = false;
+        /// <summary>
+        /// Specifies the action that caused the event.
+        /// </summary>
+        public readonly eEventSource EventSource = eEventSource.Code;
+
+        /// <summary>
+        /// Default constructor.
+        /// </summary>
+        /// <param name="oldtab">Currently selected tab.</param>
+        /// <param name="newtab">New selection.</param>
+        public TabStripTabChangingEventArgs(TabItem oldtab, TabItem newtab, eEventSource source)
+        {
+            this.OldTab = oldtab;
+            this.NewTab = newtab;
+            this.EventSource = source;
+        }
+    }
+
+    /// <summary>
+    /// Represents the event arguments for tab moving events.
+    /// </summary>
+    public class TabStripTabMovedEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Tab being moved.
+        /// </summary>
+        public readonly TabItem Tab;
+        /// <summary>
+        /// Moved from index.
+        /// </summary>
+        public readonly int OldIndex;
+        /// <summary>
+        /// Moving to index.
+        /// </summary>
+        public readonly int NewIndex;
+        /// <summary>
+        /// Cancels the operation.
+        /// </summary>
+        public bool Cancel = false;
+        /// <summary>
+        /// Default Constructor
+        /// </summary>
+        /// <param name="tab">Tab</param>
+        /// <param name="oldindex">Old Index</param>
+        /// <param name="newindex">New Index</param>
+        public TabStripTabMovedEventArgs(TabItem tab, int oldindex, int newindex)
+        {
+            this.Tab = tab;
+            this.OldIndex = oldindex;
+            this.NewIndex = newindex;
+        }
+    }
+
+    /// <summary>
+    /// Represents the event arguments for action events.
+    /// </summary>
+    public class TabStripActionEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Cancels the operation.
+        /// </summary>
+        public bool Cancel = false;
+        /// <summary>
+        /// Reference to relevant TabItem, if any, otherwise null/nothing.
+        /// </summary>
+        public TabItem TabItem = null;
+        /// <summary>
+        /// Default Constructor.
+        /// </summary>
+        public TabStripActionEventArgs() { }
+    }
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public class TabSystemBox
+    {
+        public Rectangle DisplayRectangle = Rectangle.Empty;
+        private Rectangle m_CloseRect = Rectangle.Empty;
+        private Rectangle m_ForwardRect = Rectangle.Empty;
+        private Rectangle m_BackRect = Rectangle.Empty;
+        public int DefaultWidth = 43;
+        private bool m_BackEnabled = true;
+        private bool m_ForwardEnabled = true;
+        private bool m_CloseVisible = true;
+        public event EventHandler Back;
+        public event EventHandler Forward;
+        public event EventHandler Close;
+        private eMouseState m_CloseMouseState = eMouseState.None;
+        private eMouseState m_BackMouseState = eMouseState.None;
+        private eMouseState m_ForwardMouseState = eMouseState.None;
+        private TabStrip m_Parent = null;
+        protected ToolTip m_ToolTipWnd = null;
+        private Timer m_ClickTimer = null;
+        private bool m_ScrollBack = false;
+        private bool m_ScrollForward = false;
+        public bool Visible = true;
+
+        public TabSystemBox(TabStrip parent)
+        {
+            m_Parent = parent;
+        }
+
+        public void Dispose()
+        {
+            this.DestroyTimer();
+        }
+
+        public bool CloseVisible
+        {
+            get { return m_CloseVisible; }
+            set
+            {
+                m_CloseVisible = value;
+                if (m_CloseVisible)
+                    DefaultWidth = 43;
+                else
+                    DefaultWidth = 32;
+            }
+        }
+
+        public Rectangle ForwardRect
+        {
+            get { return m_ForwardRect; }
+        }
+
+        public Rectangle BackRect
+        {
+            get { return m_BackRect; }
+        }
+
+        private void DestroyTimer()
+        {
+            m_ScrollBack = false;
+            m_ScrollForward = false;
+            if (m_ClickTimer != null)
+            {
+                m_ClickTimer.Stop();
+                m_ClickTimer.Enabled = false;
+                m_ClickTimer.Dispose();
+                m_ClickTimer = null;
+            }
+        }
+
+        public bool ForwardEnabled
+        {
+            get { return m_ForwardEnabled; }
+            set
+            {
+                if (m_ForwardEnabled != value)
+                {
+                    m_ForwardEnabled = value;
+                    if (!m_ForwardEnabled)
+                        DestroyTimer();
+                }
+            }
+        }
+
+        public bool BackEnabled
+        {
+            get { return m_BackEnabled; }
+            set
+            {
+                if (m_BackEnabled != value)
+                {
+                    m_BackEnabled = value;
+                    if (!m_BackEnabled)
+                        DestroyTimer();
+                }
+            }
+        }
+
+        public void MouseLeave()
+        {
+            HideToolTip();
+
+            if (DisplayRectangle.IsEmpty)
+                return;
+            if (m_CloseMouseState != eMouseState.None || m_BackMouseState != eMouseState.None || m_ForwardMouseState != eMouseState.None)
+            {
+                ResetButtonMouseState();
+                m_Parent.Invalidate(DisplayRectangle, false);
+            }
+        }
+        public void MouseHover()
+        {
+            HideToolTip();
+            if (DisplayRectangle.IsEmpty)
+                return;
+
+        }
+        public void MouseMove(MouseEventArgs e)
+        {
+            if (DisplayRectangle.IsEmpty)
+                return;
+            bool bInvalidate = false;
+            if (m_CloseMouseState != eMouseState.None || m_BackMouseState != eMouseState.None || m_ForwardMouseState != eMouseState.None)
+            {
+                ResetButtonMouseState();
+                bInvalidate = true;
+            }
+
+            if (!DisplayRectangle.Contains(e.X, e.Y))
+            {
+                if (bInvalidate)
+                    m_Parent.Invalidate(DisplayRectangle, false);
+                return;
+            }
+
+            if (m_CloseRect.Contains(e.X, e.Y))
+            {
+                if (CloseVisible && m_Parent.SelectedTab != null)
+                {
+                    if (e.Button == MouseButtons.Left)
+                        m_CloseMouseState = eMouseState.Down;
+                    else
+                        m_CloseMouseState = eMouseState.Hot;
+                    bInvalidate = true;
+                }
+            }
+            else if (m_BackRect.Contains(e.X, e.Y))
+            {
+                if (BackEnabled)
+                {
+                    if (e.Button == MouseButtons.Left)
+                        m_BackMouseState = eMouseState.Down;
+                    else
+                        m_BackMouseState = eMouseState.Hot;
+                    bInvalidate = true;
+                }
+            }
+            else if (m_ForwardRect.Contains(e.X, e.Y))
+            {
+                if (ForwardEnabled)
+                {
+                    if (e.Button == MouseButtons.Left)
+                        m_ForwardMouseState = eMouseState.Down;
+                    else
+                        m_ForwardMouseState = eMouseState.Hot;
+                    bInvalidate = true;
+                }
+            }
+
+            if (bInvalidate)
+            {
+                Rectangle r = DisplayRectangle;
+                r.Inflate(2, 2);
+                m_Parent.Invalidate(r, false);
+            }
+
+        }
+
+        public void MouseDown(MouseEventArgs e)
+        {
+            if (e.Button != MouseButtons.Left)
+                return;
+
+            if (DisplayRectangle.IsEmpty)
+                return;
+            if (CloseVisible && m_CloseRect.Contains(e.X, e.Y) && m_Parent.SelectedTab != null)
+                m_CloseMouseState = eMouseState.Down;
+            else if (BackEnabled && m_BackRect.Contains(e.X, e.Y))
+            {
+                m_BackMouseState = eMouseState.Down;
+                if (m_Parent.TabScrollAutoRepeat)
+                {
+                    m_ScrollBack = true;
+                    m_ScrollForward = false;
+                    if (m_ClickTimer == null)
+                        m_ClickTimer = new Timer();
+                    m_ClickTimer.Interval = m_Parent.TabScrollRepeatInterval;
+                    m_ClickTimer.Tick += new EventHandler(this.ScrollClickTimer);
+                    m_ClickTimer.Start();
+                }
+            }
+            else if (ForwardEnabled && m_ForwardRect.Contains(e.X, e.Y))
+            {
+                m_ForwardMouseState = eMouseState.Down;
+                if (m_Parent.TabScrollAutoRepeat)
+                {
+                    m_ScrollForward = true;
+                    m_ScrollBack = false;
+                    if (m_ClickTimer == null)
+                        m_ClickTimer = new Timer();
+                    m_ClickTimer.Interval = m_Parent.TabScrollRepeatInterval;
+                    m_ClickTimer.Tick += new EventHandler(this.ScrollClickTimer);
+                    m_ClickTimer.Start();
+                }
+            }
+
+            if (m_CloseMouseState != eMouseState.None || m_BackMouseState != eMouseState.None || m_ForwardMouseState != eMouseState.None)
+                m_Parent.Invalidate(DisplayRectangle, false);
+        }
+        private void ScrollClickTimer(object sender, EventArgs e)
+        {
+            if (m_ScrollBack)
+            {
+                if (Back != null)
+                    Back(this, new EventArgs());
+            }
+            else if (m_ScrollForward)
+            {
+                if (Forward != null)
+                    Forward(this, new EventArgs());
+            }
+            else if (m_ClickTimer != null)
+                m_ClickTimer.Stop();
+        }
+        public void MouseUp(MouseEventArgs e)
+        {
+            DestroyTimer();
+
+            if (e.Button != MouseButtons.Left)
+                return;
+
+            if (DisplayRectangle.IsEmpty)
+                return;
+            bool bInvalidate = false;
+            if (m_CloseMouseState != eMouseState.None || m_BackMouseState != eMouseState.None || m_ForwardMouseState != eMouseState.None)
+                bInvalidate = true;
+
+            if (CloseVisible && m_CloseRect.Contains(e.X, e.Y) && m_Parent.SelectedTab != null)
+            {
+                if (m_CloseMouseState == eMouseState.Down && Close != null)
+                    Close(this, new EventArgs());
+                ResetButtonMouseState();
+                //m_CloseMouseState=eMouseState.Hot;
+            }
+            else if (BackEnabled && m_BackRect.Contains(e.X, e.Y))
+            {
+                if (m_BackMouseState == eMouseState.Down && Back != null)
+                    Back(this, new EventArgs());
+                ResetButtonMouseState();
+                m_BackMouseState = eMouseState.Hot;
+            }
+            else if (ForwardEnabled && m_ForwardRect.Contains(e.X, e.Y))
+            {
+                if (m_ForwardMouseState == eMouseState.Down && Forward != null)
+                    Forward(this, new EventArgs());
+                ResetButtonMouseState();
+                m_ForwardMouseState = eMouseState.Hot;
+            }
+
+            if (bInvalidate || m_CloseMouseState != eMouseState.None || m_BackMouseState != eMouseState.None || m_ForwardMouseState != eMouseState.None)
+                m_Parent.Invalidate(DisplayRectangle, false);
+        }
+        public void MouseWheel(MouseEventArgs e)
+        {
+            if (m_Parent.VisibleTabCount <= 0) return;
+            if (e.Delta > 0)
+            {
+                if (Back != null && BackEnabled)
+                    Back(this, new EventArgs());
+            }
+            else
+            {
+                if (Forward != null && ForwardEnabled)
+                    Forward(this, new EventArgs());
+            }
+        }
+        private void ResetButtonMouseState()
+        {
+            m_CloseMouseState = eMouseState.None;
+            m_BackMouseState = eMouseState.None;
+            m_ForwardMouseState = eMouseState.None;
+        }
+        public void Paint(Graphics g)
+        {
+            if (DisplayRectangle.IsEmpty)
+                return;
+
+            int x = DisplayRectangle.X;
+            int y = DisplayRectangle.Y;
+            Color colorDark = m_Parent.ColorScheme.NavigationBoxForeColor;
+            if (colorDark.IsEmpty)
+            {
+                colorDark = g.GetNearestColor(ControlPaint.Light(m_Parent.ColorScheme.TabItemText));
+                //Color colorBorder=g.GetNearestColor(ControlPaint.LightLight(m_Parent.ColorScheme.TabBackground));
+                if (Math.Abs(colorDark.GetBrightness() - m_Parent.ColorScheme.TabBackground.GetBrightness()) <= .2)
+                    colorDark = (m_Parent.ColorScheme.TabBackground.GetBrightness() < .5 ? ControlPaint.Light(m_Parent.ColorScheme.TabBackground) : ControlPaint.Dark(m_Parent.ColorScheme.TabBackground));
+            }
+            SolidBrush brush = null;
+            Pen pen = new Pen(colorDark, Dpi.Width1);
+            if (BackEnabled || ForwardEnabled)
+                brush = new SolidBrush(colorDark);
+
+            if (m_Parent.TabAlignment == eTabStripAlignment.Left || m_Parent.TabAlignment == eTabStripAlignment.Right)
+            {
+                // Offset position to center the system items...
+                y += (DisplayRectangle.Height - (m_CloseVisible ? Dpi.Width32 : Dpi.Width18)) / 2;
+                x += (DisplayRectangle.Width - Dpi.Width9) / 2;
+                Point[] p = new Point[3];
+                p[0].X = x + Dpi.Width4;
+                p[0].Y = y;
+                p[1].X = x;
+                p[1].Y = y + Dpi.Height4;
+                p[2].X = x + Dpi.Width8;
+                p[2].Y = y + Dpi.Height4;
+
+                m_BackRect = new Rectangle(x - Dpi.Width3, y - Dpi.Height5, Dpi.Width14, Dpi.Height14);
+                if (BackEnabled)
+                {
+                    if (m_BackMouseState == eMouseState.Hot)
+                        DrawBackgroundHot(g, m_BackRect); // BarFunctions.DrawBorder3D(g,m_BackRect,Border3DStyle.RaisedInner,Border3DSide.Left | Border3DSide.Right | Border3DSide.Top | Border3DSide.Bottom,colorBorder,false);
+                    else if (m_BackMouseState == eMouseState.Down)
+                        DrawBackgroundPressed(g, m_BackRect); // BarFunctions.DrawBorder3D(g,m_BackRect,Border3DStyle.SunkenOuter,Border3DSide.Left | Border3DSide.Right | Border3DSide.Top | Border3DSide.Bottom,colorBorder,false);
+                    g.FillPolygon(brush, p);
+                }
+                g.DrawPolygon(pen, p);
+
+                y += Dpi.Height14;
+                p[0].X = x;
+                p[0].Y = y;
+                p[1].X = x + Dpi.Width8;
+                p[1].Y = y;
+                p[2].X = x + Dpi.Width4;
+                p[2].Y = y + Dpi.Height4;
+                m_ForwardRect = new Rectangle(x - Dpi.Width3, y - Dpi.Height5, Dpi.Width14, Dpi.Height14);
+                if (ForwardEnabled)
+                {
+                    if (m_ForwardMouseState == eMouseState.Hot)
+                        DrawBackgroundHot(g, m_ForwardRect); // BarFunctions.DrawBorder3D(g,m_ForwardRect,Border3DStyle.RaisedInner,Border3DSide.Left | Border3DSide.Right | Border3DSide.Top | Border3DSide.Bottom,colorBorder,false);
+                    else if (m_ForwardMouseState == eMouseState.Down)
+                        DrawBackgroundPressed(g, m_ForwardRect); // BarFunctions.DrawBorder3D(g,m_ForwardRect,Border3DStyle.SunkenOuter,Border3DSide.Left | Border3DSide.Right | Border3DSide.Top | Border3DSide.Bottom,colorBorder,false);
+                    g.FillPolygon(brush, p);
+                }
+                g.DrawPolygon(pen, p);
+
+                y += Dpi.Height13;
+                if (CloseVisible)
+                {
+                    m_CloseRect = new Rectangle(x - Dpi.Width3, y - Dpi.Height3, Dpi.Width14, Dpi.Height14);
+                    if (CloseVisible)
+                    {
+                        if (m_CloseMouseState == eMouseState.Hot)
+                            DrawBackgroundHot(g, m_CloseRect); // BarFunctions.DrawBorder3D(g,m_CloseRect,Border3DStyle.RaisedInner,Border3DSide.Left | Border3DSide.Right | Border3DSide.Top | Border3DSide.Bottom,colorBorder,false);
+                        else if (m_CloseMouseState == eMouseState.Down)
+                            DrawBackgroundPressed(g, m_CloseRect); //BarFunctions.DrawBorder3D(g,m_CloseRect,Border3DStyle.SunkenOuter,Border3DSide.Left | Border3DSide.Right | Border3DSide.Top | Border3DSide.Bottom,colorBorder,false);
+                    }
+                    g.DrawLine(pen, x + Dpi.Width1, y, x + Dpi.Width7, y + Dpi.Height6);
+                    g.DrawLine(pen, x + Dpi.Width1, y + Dpi.Height1, x + Dpi.Width7, y + Dpi.Height7);
+                    g.DrawLine(pen, x + Dpi.Width1, y + Dpi.Height6, x + Dpi.Width7, y);
+                    g.DrawLine(pen, x + Dpi.Width1, y + Dpi.Height7, x + Dpi.Width7, y + Dpi.Height1);
+                }
+            }
+            else
+            {
+                // Offset position to center the system items...
+                x += (DisplayRectangle.Width - (m_CloseVisible ? Dpi.Width32 : Dpi.Width18)) / 2;
+                y += (DisplayRectangle.Height - Dpi.Height9) / 2;
+                Point[] p = new Point[3];
+                p[0].X = x + Dpi.Width4;
+                p[0].Y = y;
+                p[1].X = x + Dpi.Width4;
+                p[1].Y = y + Dpi.Height8;
+                p[2].X = x;
+                p[2].Y = y + Dpi.Height4;
+
+                m_BackRect = new Rectangle(x - Dpi.Width5, y - Dpi.Height3, Dpi.Width14, Dpi.Height14);
+                if (BackEnabled)
+                {
+                    if (m_BackMouseState == eMouseState.Hot)
+                        DrawBackgroundHot(g, m_BackRect); // BarFunctions.DrawBorder3D(g,m_BackRect,Border3DStyle.RaisedInner,Border3DSide.Left | Border3DSide.Right | Border3DSide.Top | Border3DSide.Bottom,colorBorder,false);
+                    else if (m_BackMouseState == eMouseState.Down)
+                        DrawBackgroundPressed(g, m_BackRect); // BarFunctions.DrawBorder3D(g,m_BackRect,Border3DStyle.SunkenOuter,Border3DSide.Left | Border3DSide.Right | Border3DSide.Top | Border3DSide.Bottom,colorBorder,false);
+                    g.FillPolygon(brush, p);
+                }
+                g.DrawPolygon(pen, p);
+
+                x += Dpi.Width14;
+                p[0].X = x;
+                p[0].Y = y;
+                p[1].X = x;
+                p[1].Y = y + Dpi.Height8;
+                p[2].X = x + Dpi.Width4;
+                p[2].Y = y + Dpi.Height4;
+
+                m_ForwardRect = new Rectangle(x - Dpi.Width5, y - Dpi.Height3, Dpi.Width14, Dpi.Height14);
+                if (ForwardEnabled)
+                {
+                    if (m_ForwardMouseState == eMouseState.Hot)
+                        DrawBackgroundHot(g, m_ForwardRect); // BarFunctions.DrawBorder3D(g,m_ForwardRect,Border3DStyle.RaisedInner,Border3DSide.Left | Border3DSide.Right | Border3DSide.Top | Border3DSide.Bottom,colorBorder,false);
+                    else if (m_ForwardMouseState == eMouseState.Down)
+                        DrawBackgroundPressed(g, m_ForwardRect); // BarFunctions.DrawBorder3D(g,m_ForwardRect,Border3DStyle.SunkenOuter,Border3DSide.Left | Border3DSide.Right | Border3DSide.Top | Border3DSide.Bottom,colorBorder,false);
+                    g.FillPolygon(brush, p);
+                }
+                g.DrawPolygon(pen, p);
+
+                x += Dpi.Width13;
+                if (CloseVisible)
+                {
+                    m_CloseRect = new Rectangle(x - Dpi.Width4, y - Dpi.Height3, Dpi.Width14, Dpi.Height14);
+                    if (CloseVisible)
+                    {
+                        if (m_CloseMouseState == eMouseState.Hot)
+                            DrawBackgroundHot(g, m_CloseRect); // BarFunctions.DrawBorder3D(g,m_CloseRect,Border3DStyle.RaisedInner,Border3DSide.Left | Border3DSide.Right | Border3DSide.Top | Border3DSide.Bottom,colorBorder,false);
+                        else if (m_CloseMouseState == eMouseState.Down)
+                            DrawBackgroundPressed(g, m_CloseRect); // BarFunctions.DrawBorder3D(g,m_CloseRect,Border3DStyle.SunkenOuter,Border3DSide.Left | Border3DSide.Right | Border3DSide.Top | Border3DSide.Bottom,colorBorder,false);
+                    }
+                    g.DrawLine(pen, x, y + Dpi.Height1, x + Dpi.Width6, y + Dpi.Height7);
+                    g.DrawLine(pen, x + Dpi.Width1, y + Dpi.Height1, x + Dpi.Width7, y + Dpi.Height7);
+                    g.DrawLine(pen, x + Dpi.Width6, y + Dpi.Height1, x, y + Dpi.Height7);
+                    g.DrawLine(pen, x + Dpi.Width7, y + Dpi.Height1, x + Dpi.Width1, y + Dpi.Height7);
+                }
+            }
+            pen.Dispose();
+            if (brush != null)
+                brush.Dispose();
+        }
+
+        private void DrawBackgroundHot(Graphics g, Rectangle r)
+        {
+            Color border = m_Parent.ColorScheme.TabItemHotBorder;
+            Color back = m_Parent.ColorScheme.TabItemHotBackground;
+            Color back2 = m_Parent.ColorScheme.TabItemHotBackground2;
+
+            if ((m_Parent.Style == eTabStripStyle.Office2003 || m_Parent.Style == eTabStripStyle.VS2005 || m_Parent.Style == eTabStripStyle.VS2005Document || m_Parent.Style == eTabStripStyle.VS2005Dock) && back.IsEmpty && back2.IsEmpty)
+            {
+                ColorScheme cs;
+                if (m_Parent.Style == eTabStripStyle.Office2003)
+                    cs = new ColorScheme(eDotNetBarStyle.Office2003);
+                else
+                    cs = new ColorScheme(eDotNetBarStyle.VS2005);
+                back = cs.ItemHotBackground;
+                back2 = cs.ItemHotBackground2;
+                border = cs.ItemHotBorder;
+            }
+
+            if (m_Parent.Style == eTabStripStyle.OneNote || m_Parent.Style == eTabStripStyle.Office2007Document || m_Parent.Style == eTabStripStyle.Office2007Dock || m_Parent.Style == eTabStripStyle.Office2003 || m_Parent.Style == eTabStripStyle.VS2005 || m_Parent.Style == eTabStripStyle.VS2005Document || m_Parent.Style == eTabStripStyle.VS2005Dock)
+            {
+                if (back2.IsEmpty)
+                {
+                    if (!back.IsEmpty)
+                    {
+                        using (SolidBrush brush = new SolidBrush(back))
+                            g.FillRectangle(brush, r);
+                    }
+                }
+                else
+                {
+                    using (LinearGradientBrush brush = new LinearGradientBrush(r, back, back2, m_Parent.ColorScheme.TabItemHotBackgroundGradientAngle))
+                        g.FillRectangle(brush, r);
+                }
+                using (Pen pen = new Pen(border, 1))
+                    g.DrawRectangle(pen, r);
+            }
+            else
+            {
+                Color colorBorder = g.GetNearestColor(ControlPaint.LightLight(m_Parent.ColorScheme.TabBackground));
+                BarFunctions.DrawBorder3D(g, r, Border3DStyle.RaisedInner, Border3DSide.Left | Border3DSide.Right | Border3DSide.Top | Border3DSide.Bottom, colorBorder, false);
+            }
+        }
+
+        private void DrawBackgroundPressed(Graphics g, Rectangle r)
+        {
+            Color border = m_Parent.ColorScheme.TabItemHotBorder;
+            Color back = m_Parent.ColorScheme.TabItemHotBackground;
+            Color back2 = m_Parent.ColorScheme.TabItemHotBackground2;
+
+            if ((m_Parent.Style == eTabStripStyle.Office2003 || m_Parent.Style == eTabStripStyle.VS2005 || m_Parent.Style == eTabStripStyle.VS2005Document || m_Parent.Style == eTabStripStyle.VS2005Dock) && back.IsEmpty && back2.IsEmpty)
+            {
+                ColorScheme cs;
+                if (m_Parent.Style == eTabStripStyle.Office2003)
+                    cs = new ColorScheme(eDotNetBarStyle.Office2003);
+                else
+                    cs = new ColorScheme(eDotNetBarStyle.VS2005);
+                back = cs.ItemPressedBackground;
+                back2 = cs.ItemPressedBackground2;
+                border = cs.ItemPressedBorder;
+            }
+
+            if (m_Parent.Style == eTabStripStyle.OneNote || m_Parent.Style == eTabStripStyle.Office2007Document || m_Parent.Style == eTabStripStyle.Office2007Dock || m_Parent.Style == eTabStripStyle.Office2003 || m_Parent.Style == eTabStripStyle.VS2005 || m_Parent.Style == eTabStripStyle.VS2005 || m_Parent.Style == eTabStripStyle.VS2005Document)
+            {
+                if (back2.IsEmpty)
+                {
+                    if (!back.IsEmpty)
+                    {
+                        using (SolidBrush brush = new SolidBrush(back))
+                            g.FillRectangle(brush, r);
+                    }
+                }
+                else
+                {
+                    using (LinearGradientBrush brush = new LinearGradientBrush(r, back2, back, m_Parent.ColorScheme.TabItemHotBackgroundGradientAngle))
+                        g.FillRectangle(brush, r);
+                }
+                using (Pen pen = new Pen(border, 1))
+                    g.DrawRectangle(pen, r);
+            }
+            else
+            {
+                Color colorBorder = g.GetNearestColor(ControlPaint.LightLight(m_Parent.ColorScheme.TabBackground));
+                BarFunctions.DrawBorder3D(g, r, Border3DStyle.SunkenOuter, Border3DSide.Left | Border3DSide.Right | Border3DSide.Top | Border3DSide.Bottom, colorBorder, false);
+            }
+        }
+
+        /// <summary>
+        /// Destroys tooltip window.
+        /// </summary>
+        private void HideToolTip()
+        {
+            if (m_ToolTipWnd != null)
+            {
+                m_ToolTipWnd.Hide();
+                m_ToolTipWnd.Dispose();
+                m_ToolTipWnd = null;
+            }
+        }
+    }
+
+    #region TabStrip Enums
+    /// <summary>
+    /// Specifies the tab alignment inside the Tab-Strip control.
+    /// </summary>
+    public enum eTabStripAlignment : int
+    {
+        /// <summary>
+        /// Tabs are left aligned.
+        /// </summary>
+        Left = 0,
+        /// <summary>
+        /// Tabs are right aligned.
+        /// </summary>
+        Right = 1,
+        /// <summary>
+        /// Tabs are top aligned.
+        /// </summary>
+        Top = 2,
+        /// <summary>
+        /// Tabs are bottom aligned.
+        /// </summary>
+        Bottom = 3
+    }
+
+    /// <summary>
+    /// Indicates tab strip style.
+    /// </summary>
+    public enum eTabStripStyle : int
+    {
+        /// <summary>
+        /// Default VS.NET like flat style.
+        /// </summary>
+        Flat = 0,
+        /// <summary>
+        /// Office 2003 like style.
+        /// </summary>
+        Office2003 = 2,
+        /// <summary>
+        /// OneNote like style.
+        /// </summary>
+        OneNote = 3,
+        /// <summary>
+        /// VS.NET 2005 style tabs.
+        /// </summary>
+        VS2005,
+        /// <summary>
+        /// Tab style where tabs are centered and first and last tab have the corners rounded. This style does not support multi-line tabs or tab scrolling.
+        /// </summary>
+        RoundHeader,
+        /// <summary>
+        /// VS.NET 2005 dock style tabs.
+        /// </summary>
+        VS2005Dock,
+        /// <summary>
+        /// VS.NET 2005 document style tabs.
+        /// </summary>
+        VS2005Document,
+        /// <summary>
+        /// Simulated theme style with the horizontal text alignment at all times.
+        /// </summary>
+        SimulatedTheme,
+        /// <summary>
+        /// Office 2007 document style.
+        /// </summary>
+        Office2007Document,
+        /// <summary>
+        /// Office 2007 dock style.
+        /// </summary>
+        Office2007Dock,
+        /// <summary>
+        /// Metro UI style.
+        /// </summary>
+        Metro
+    }
+    #endregion
+
+    #region Measure, Render Events
+    /// <summary>
+    /// Defines delegate for the MeasureTabItem event.
+    /// </summary>
+    public delegate void MeasureTabItemEventHandler(object sender, MeasureTabItemEventArgs e);
+
+    /// <summary>
+    /// Represents event arguments for MeasureTabItem event.
+    /// </summary>
+    public class MeasureTabItemEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets the TabItem that is being measured.
+        /// </summary>
+        public readonly TabItem TabItem;
+        /// <summary>
+        /// Gets or sets the size of the TabItem. The default size calculated by the control will be set by default. You can inspect it and change it to the
+        /// custom size by setting this property.
+        /// </summary>
+        public Size Size = Size.Empty;
+
+        /// <summary>
+        /// Creates new instance of the class and initializes it with default values.
+        /// </summary>
+        /// <param name="tab">TabItem being measured.</param>
+        /// <param name="size">Default size.</param>
+        public MeasureTabItemEventArgs(TabItem tab, Size size)
+        {
+            this.TabItem = tab;
+            this.Size = size;
+        }
+    }
+
+    /// <summary>
+    /// Defines delegate for the PreRenderTabItem and PostRenderTabItem events.
+    /// </summary>
+    public delegate void RenderTabItemEventHandler(object sender, RenderTabItemEventArgs e);
+
+    /// <summary>
+    /// Represents event arguments for PreRenderTabItem and PostRenderTabItem event.
+    /// </summary>
+    public class RenderTabItemEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets the reference to the TabItem being rendered. You can use properties like DisplayRectangle to determine the rendering bounds for the tab.
+        /// </summary>
+        public readonly TabItem TabItem;
+
+        /// <summary>
+        /// When used in PreRenderTabItem event allows you to cancel the default rendering by setting this property to true.
+        /// </summary>
+        public bool Cancel = false;
+
+        /// <summary>
+        /// Gets the reference to the Graphics object to render the tab on.
+        /// </summary>
+        public readonly Graphics Graphics;
+
+        /// <summary>
+        /// Creates new instance of the class and initializes it with default values.
+        /// </summary>
+        /// <param name="tab">Default value for TabItem property.</param>
+        /// <param name="g">Default value  for Graphics property.</param>
+        public RenderTabItemEventArgs(TabItem tab, Graphics g)
+        {
+            this.TabItem = tab;
+            this.Graphics = g;
+        }
+    }
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/TabStripAccessibleObject.cs b/PROMS/DotNetBar Source Code/TabStripAccessibleObject.cs
new file mode 100644
index 00000000..8686b022
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TabStripAccessibleObject.cs	
@@ -0,0 +1,88 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar
+{
+    public class TabStripAccessibleObject : Control.ControlAccessibleObject
+    {
+        private TabStrip _Item;
+        public TabStrip Item
+        {
+            get { return _Item; }
+            set { _Item = value; }
+        }
+
+        public TabStripAccessibleObject(TabStrip tabStrip)
+            : base(tabStrip)
+        {
+            if (tabStrip == null)
+            {
+                throw new ArgumentNullException("tabStrip");
+            }
+
+            this.Item = tabStrip;
+        }
+
+        #region public methods
+
+        public override string Description
+        {
+            get
+            {
+                return Item.AccessibleDescription;
+            }
+        }
+
+        public override AccessibleObject Parent
+        {
+            get
+            {
+                return Item.Parent.AccessibilityObject;
+            }
+        }
+
+        public override System.Drawing.Rectangle Bounds
+        {
+            get
+            {
+                Rectangle bounds = this.Item.DisplayRectangle;
+                bounds.Location = this.Item.PointToScreen(Point.Empty);
+                return bounds;
+            }
+        }
+
+        public override int GetChildCount()
+        {
+            return Item.Tabs.Count;
+        }
+
+        public override AccessibleObject GetChild(int index)
+        {
+            return Item.Tabs[index].AccessibleObject;
+        }
+
+        public override AccessibleObject Navigate(AccessibleNavigation navdir)
+        {
+            return base.Navigate(navdir);
+        }
+
+        public override void Select(AccessibleSelection flags)
+        {
+            base.Select(flags);
+        }
+        public override AccessibleRole Role
+        {
+            get
+            {
+                return Item.AccessibleRole;
+            }
+        }
+
+        #endregion
+
+    }
+}
+
diff --git a/PROMS/DotNetBar Source Code/TabStripBaseDisplay.cs b/PROMS/DotNetBar Source Code/TabStripBaseDisplay.cs
new file mode 100644
index 00000000..f6a3e592
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TabStripBaseDisplay.cs	
@@ -0,0 +1,519 @@
+using System;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Drawing.Text;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Represents base class for tab display.
+	/// </summary>
+	internal class TabStripBaseDisplay
+	{
+		#region Private Variables
+		private bool m_AntiAlias=true;
+		private bool m_HorizontalText=false;
+        private bool m_CloseButtonOnTabs = false;
+        private Size m_TabCloseButtonSize = new Size(11, 11);
+        private int m_TabCloseButtonSpacing = 3;
+		#endregion
+
+		public TabStripBaseDisplay()
+		{
+		}
+
+		#region Methods
+		/// <summary>
+		/// Main method for painting.
+		/// </summary>
+		/// <param name="g">Reference to graphics object</param>
+		/// <param name="tabStrip">TabStrip to paint</param>
+		public virtual void Paint(Graphics g, TabStrip tabStrip)
+		{
+			if(this.AntiAlias)
+			{
+				g.SmoothingMode=SmoothingMode.AntiAlias;
+                g.TextRenderingHint = DisplayHelp.AntiAliasTextRenderingHint;
+			}
+		}
+
+		protected virtual void PaintTab(Graphics g, TabItem tab, bool first, bool last)
+		{
+			if(!tab.Visible)
+				return;
+
+            if (tab.Parent!=null && tab.Parent.HasPreRenderTabItem)
+            {
+                RenderTabItemEventArgs re = new RenderTabItemEventArgs(tab, g);
+                tab.Parent.InvokePreRenderTabItem(re);
+                if (re.Cancel) return;
+            }
+
+            using (GraphicsPath path = GetTabItemPath(tab, first, last))
+            {
+                TabColors colors = tab.Parent.GetTabColors(tab);
+
+                DrawTabItemBackground(tab, path, colors, g);
+
+                DrawTabText(tab, colors, g);
+            }
+
+            if (tab.Parent != null && tab.Parent.HasPostRenderTabItem)
+            {
+                RenderTabItemEventArgs re = new RenderTabItemEventArgs(tab, g);
+                tab.Parent.InvokePostRenderTabItem(re);
+            }
+		}
+
+		protected virtual Region GetTabsRegion(TabsCollection tabs, TabItem lastTab)
+		{
+			return null;
+		}
+
+		protected virtual void DrawTabItemBackground(TabItem tab, GraphicsPath path, TabColors colors, Graphics g)
+		{
+			RectangleF rf=path.GetBounds();
+			Rectangle tabRect=new Rectangle((int)rf.X, (int)rf.Y, (int)rf.Width, (int)rf.Height);
+
+            SmoothingMode sm = g.SmoothingMode;
+            g.SmoothingMode = SmoothingMode.Default;
+
+            eBackgroundColorBlendType blendType = colors.BackgroundColorBlend.GetBlendType();
+            int ga = colors.BackColorGradientAngle;
+            if (tab.TabAlignment == eTabStripAlignment.Left || tab.TabAlignment == eTabStripAlignment.Right)
+                ga -= 90;
+
+            if (blendType != eBackgroundColorBlendType.Invalid)
+            {
+                if (blendType == eBackgroundColorBlendType.Relative)
+                {
+                    if (!colors.BackColor.IsEmpty || !colors.BackColor2.IsEmpty)
+                    {
+                        try
+                        {
+                            Rectangle rb = Rectangle.Ceiling(rf);
+                            rb.Inflate(1, 1);
+                            using (LinearGradientBrush brush = DisplayHelp.CreateLinearGradientBrush(rb, colors.BackColor, colors.BackColor2, ga))
+                            {
+                                brush.InterpolationColors = colors.BackgroundColorBlend.GetColorBlend();
+                                g.FillPath(brush, path);
+                            }
+                        }
+                        catch
+                        {
+                            blendType = eBackgroundColorBlendType.Invalid;
+                        }
+                    }
+                }
+                else
+                {
+                    Rectangle bounds = Rectangle.Ceiling(rf);
+                    BackgroundColorBlendCollection bc = colors.BackgroundColorBlend;
+                    Region oldClip = g.Clip;
+                    g.SetClip(path, CombineMode.Intersect);
+                    for (int i = 0; i < bc.Count; i += 2)
+                    {
+                        BackgroundColorBlend b1 = bc[i];
+                        BackgroundColorBlend b2 = null;
+                        if (i < bc.Count)
+                            b2 = bc[i + 1];
+                        if (b1 != null && b2 != null)
+                        {
+                            Rectangle rb = new Rectangle(bounds.X, bounds.Y + (int)b1.Position, bounds.Width,
+                                (b2.Position == 1f ? bounds.Height : (int)b2.Position) - (int)b1.Position);
+                            using (LinearGradientBrush brush = DisplayHelp.CreateLinearGradientBrush(rb, b1.Color, b2.Color, ga))
+                                g.FillRectangle(brush, rb);
+                        }
+                    }
+                    g.Clip = oldClip;
+                }
+            }
+
+            if (blendType == eBackgroundColorBlendType.Invalid)
+            {
+                if (colors.BackColor2.IsEmpty)
+                {
+                    if (!colors.BackColor.IsEmpty)
+                    {
+                        using (SolidBrush brush = new SolidBrush(colors.BackColor))
+                            g.FillPath(brush, path);
+                    }
+                }
+                else
+                {
+                    using (SolidBrush brush = new SolidBrush(Color.White))
+                        g.FillPath(brush, path);
+                    using (LinearGradientBrush brush = CreateTabGradientBrush(tabRect, colors.BackColor, colors.BackColor2, ga))
+                        g.FillPath(brush, path);
+                }
+            }
+
+            g.SmoothingMode = sm;
+
+            DrawTabBorder(tab, path, colors, g);
+		}
+
+        protected virtual void DrawTabBorder(TabItem tab, GraphicsPath path, TabColors colors, Graphics g)
+        {
+            if (!colors.BorderColor.IsEmpty)
+            {
+                using (Pen pen = new Pen(colors.BorderColor, 1))
+                    g.DrawPath(pen, path);
+            }
+        }
+
+		protected virtual LinearGradientBrush CreateTabGradientBrush(Rectangle r,Color color1,Color color2,int gradientAngle)
+		{
+			if(r.Width<=0)
+				r.Width=1;
+			if(r.Height<=0)
+				r.Height=1;
+			LinearGradientBrush brush=new System.Drawing.Drawing2D.LinearGradientBrush(new Rectangle(r.X,r.Y-1,r.Width,r.Height+1),color1,color2,gradientAngle);
+			return brush;
+		}
+
+        private Rectangle DrawCloseButton(Graphics g, bool vertical, bool mouseOver, bool isSelected, ref Rectangle tabRect, TabStrip tabStrip)
+        {
+            return DrawCloseButton(g, vertical, mouseOver, isSelected, ref tabRect, tabStrip, true);
+        }
+        private Rectangle DrawCloseButton(Graphics g, bool vertical, bool mouseOver, bool isSelected, ref Rectangle tabRect, TabStrip tabStrip, bool performPaint)
+        {
+            Size closeSize = Dpi.Size(m_TabCloseButtonSize);
+            int spacing = m_TabCloseButtonSpacing;
+            bool closeOnLeftSide = (tabStrip.CloseButtonPosition == eTabCloseButtonPosition.Left);
+
+            Rectangle close = Rectangle.Empty; //new Rectangle(tabRect.X + spacing, tabRect.Y + (tabRect.Height - closeSize.Height) / 2, closeSize.Width, closeSize.Height);
+
+            if (closeOnLeftSide)
+            {
+                if (vertical)
+                    close = new Rectangle(tabRect.X + (tabRect.Width - closeSize.Width) / 2, tabRect.Y + spacing, closeSize.Width, closeSize.Height);
+                else
+                    close = new Rectangle(tabRect.X + spacing, tabRect.Y + (tabRect.Height - closeSize.Height) / 2, closeSize.Width, closeSize.Height);
+            }
+            else
+            {
+                if (vertical)
+                    close = new Rectangle(tabRect.X + (tabRect.Width - closeSize.Width) / 2, tabRect.Bottom - spacing - closeSize.Height, closeSize.Width, closeSize.Height);
+                else
+                    close = new Rectangle(tabRect.Right - spacing - closeSize.Width, tabRect.Y + (tabRect.Height - closeSize.Height) / 2, closeSize.Width, closeSize.Height);
+            }
+            AdjustCloseButtonRectangle(ref close, closeOnLeftSide, vertical);
+            if (performPaint)
+                TabStripBaseDisplay.PaintTabItemCloseButton(g, close, mouseOver, isSelected, tabStrip);
+            if (vertical)
+            {
+                if (closeOnLeftSide)
+                    tabRect.Y += close.Height + spacing * 2;
+                tabRect.Height -= close.Height + spacing * 2;
+            }
+            else
+            {
+                if (closeOnLeftSide)
+                    tabRect.X += close.Width + spacing * 2;
+                tabRect.Width -= close.Width + spacing * 2;
+            }
+
+            return close;
+        }
+
+        protected virtual void AdjustCloseButtonRectangle(ref Rectangle close, bool closeOnLeftSide, bool vertical) { }
+
+        protected virtual void DrawTabText(TabItem tab, TabColors colors, Graphics g)
+        {
+            int MIN_TEXT_WIDTH = 4;
+            eTextFormat strFormat = eTextFormat.Default | eTextFormat.SingleLine | eTextFormat.EndEllipsis | eTextFormat.HorizontalCenter | eTextFormat.VerticalCenter;
+            eTabStripAlignment align = tab.Parent.TabAlignment;
+            Rectangle rText = tab.DisplayRectangle;
+            bool isVertical = ((align == eTabStripAlignment.Left || align == eTabStripAlignment.Right) && !m_HorizontalText);
+
+            if (m_CloseButtonOnTabs && tab.CloseButtonVisible)
+            {
+                if (isVertical)
+                {
+                    rText.Y++;
+                    rText.Height--;
+                }
+                else
+                {
+                    rText.X += 2;
+                    rText.Width -= 2;
+                }
+                bool renderCloseButton = tab.IsSelected || tab.IsMouseOver || tab.Parent.CloseButtonOnTabsAlwaysDisplayed;
+                tab.CloseButtonBounds = DrawCloseButton(g, isVertical, tab.CloseButtonMouseOver, tab.IsSelected, ref rText, tab.Parent, renderCloseButton);
+            }
+
+            // Draw image
+            CompositeImage image = GetTabImage(tab);
+            if (image != null && image.Width + 4 <= rText.Width)
+            {
+                if (align == eTabStripAlignment.Top || align == eTabStripAlignment.Bottom || m_HorizontalText)
+                {
+                    image.DrawImage(g, new Rectangle(rText.X + 3, rText.Y + (rText.Height - image.Height) / 2, image.Width, image.Height));
+                    int offset = image.Width + 2;
+                    rText.X += offset;
+                    rText.Width -= offset;
+                }
+                else
+                {
+                    image.DrawImage(g, new Rectangle(rText.X + (rText.Width - image.Width) / 2, rText.Y + 3, image.Width, image.Height));
+                    int offset = image.Height + 2;
+                    rText.Y += offset;
+                    rText.Height -= offset;
+                }
+            }
+            if (image != null) image.Dispose();
+
+            // Draw text
+            bool isSelected = tab == tab.Parent.SelectedTab;
+            if (!tab.Parent.DisplaySelectedTextOnly || isSelected)
+            {
+                if (!tab.Parent.AntiAlias)
+                    g.TextRenderingHint = TextRenderingHint.SystemDefault;
+
+                Font font = tab.Parent.Font;
+                if (isSelected && tab.Parent.SelectedTabFont != null)
+                    font = tab.Parent.SelectedTabFont;
+                AdjustTextRectangle(ref rText, align);
+                if (isVertical)
+                {
+                    g.RotateTransform(90);
+                    rText = new Rectangle(rText.Top, -rText.Right, rText.Height, rText.Width);
+                }
+
+                if (rText.Width > MIN_TEXT_WIDTH)
+                {
+                    if ((align == eTabStripAlignment.Left || align == eTabStripAlignment.Right) && !m_HorizontalText)
+                        TextDrawing.DrawStringLegacy(g, tab.Text, font, colors.TextColor, rText, strFormat);
+                    else
+                        TextDrawing.DrawString(g, tab.Text, font, colors.TextColor, rText, strFormat);
+                }
+                //using (Pen pen = new Pen(Color.Red))
+                //    g.DrawRectangle(pen, rText);
+                if (isVertical)
+                    g.ResetTransform();
+                if (!tab.Parent.AntiAlias)
+                    g.TextRenderingHint = DisplayHelp.AntiAliasTextRenderingHint;
+
+                if (tab.Parent.ShowFocusRectangle && tab.Parent.Focused && isSelected)
+                    ControlPaint.DrawFocusRectangle(g, GetFocusRectangle(tab.DisplayRectangle));
+            }
+        }
+
+        protected virtual void AdjustTextRectangle(ref Rectangle rText, eTabStripAlignment tabAlignment) {}
+
+		protected virtual CompositeImage GetTabImage(TabItem tab)
+		{
+			Image image=tab.GetImage();
+			if(image!=null)
+				return new CompositeImage(image,false);
+			Icon icon=tab.Icon;
+			if(icon!=null)
+				return new CompositeImage(icon,false,tab.IconSize);
+
+			return null;
+		}
+
+		protected virtual Rectangle GetFocusRectangle(Rectangle rText)
+		{
+			rText.Inflate(-1,-1);
+			return rText;
+		}
+
+		protected virtual TabItem GetLastVisibleTab(TabsCollection tabs)
+		{
+			int c=tabs.Count-1;
+			for(int i=c;i>=0;i--)
+			{
+				if(tabs[i].Visible)
+					return tabs[i];
+			}
+
+			return null;
+		}
+
+        protected virtual void DrawBackground(TabStrip tabStrip, Rectangle tabStripRect, Graphics g, TabColorScheme colors, Region tabsRegion, eTabStripAlignment tabAlignment, Rectangle selectedTabRect)
+		{
+			if(colors.TabBackground2.IsEmpty)
+			{
+                if (!colors.TabBackground.IsEmpty)
+                {
+                    using (SolidBrush brush = new SolidBrush(colors.TabBackground))
+                        g.FillRegion(brush, tabsRegion);
+                }
+			}
+			else
+			{
+				using(LinearGradientBrush brush=BarFunctions.CreateLinearGradientBrush(tabsRegion.GetBounds(g),colors.TabBackground,colors.TabBackground2,colors.TabBackgroundGradientAngle))
+					g.FillRegion(brush, tabsRegion);
+			}
+
+		}
+		#endregion
+
+		#region Tab Path Functions
+		protected virtual GraphicsPath GetTabItemPath(TabItem tab, bool bFirst, bool bLast)
+		{
+			return null;
+		}
+
+		protected virtual ArcData GetCornerArc(Rectangle bounds, int cornerDiameter, eCornerArc corner)
+		{
+			ArcData a;
+			int diameter=cornerDiameter*2;
+			switch(corner)
+			{
+				case eCornerArc.TopLeft:
+					a=new ArcData(bounds.X,bounds.Y,diameter,diameter,180,90);
+					break;
+				case eCornerArc.TopRight:
+					a=new ArcData(bounds.Right-diameter,bounds.Y,diameter,diameter,270,90);
+					break;
+				case eCornerArc.BottomLeft:
+					a=new ArcData(bounds.X,bounds.Bottom-diameter,diameter,diameter,90,90);
+					break;
+				default: // eCornerArc.BottomRight:
+					a=new ArcData(bounds.Right-diameter,bounds.Bottom-diameter,diameter,diameter,0,90);
+					break;
+			}
+			return a; 
+		}
+		#endregion
+
+		#region Properties
+		/// <summary>
+		/// Gets or sets whether anti-alias is used for painting the tabs. Default value is true.
+		/// </summary>
+		public virtual bool AntiAlias
+		{
+			get {return m_AntiAlias;}
+			set {m_AntiAlias=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets whether text is drawn horizontaly regardless of tab orientation.
+		/// </summary>
+		public bool HorizontalText
+		{
+			get {return m_HorizontalText;}
+			set {m_HorizontalText=value;}
+		}
+
+        /// <summary>
+        /// Gets or sets whether close button is painted on each tab.
+        /// </summary>
+        public bool CloseButtonOnTabs
+        {
+            get { return m_CloseButtonOnTabs; }
+            set { m_CloseButtonOnTabs = value; }
+        }
+
+        public int TabCloseButtonSpacing
+        {
+            get { return m_TabCloseButtonSpacing; }
+            set { m_TabCloseButtonSpacing=value; }
+        }
+		#endregion
+
+        #region Static Methods
+        public static void PaintTabItemCloseButton(Graphics g, Rectangle r, bool mouseOver, bool isSelected, TabStrip tabStrip)
+        {
+            if (tabStrip.TabCloseButtonNormal != null)
+            {
+                Image image = tabStrip.TabCloseButtonNormal;
+                if (mouseOver && tabStrip.TabCloseButtonHot != null)
+                    image = tabStrip.TabCloseButtonHot;
+                g.DrawImageUnscaled(image, r);
+                return;
+            }
+            
+            Color fillColor = tabStrip.ColorScheme.TabItemBorder;
+            Color lineColor = tabStrip.ColorScheme.TabItemBorderLight;
+            if (!fillColor.IsEmpty && Math.Abs(fillColor.GetBrightness() - lineColor.GetBrightness()) <= .38)
+            {
+                lineColor = BarFunctions.Ligten(lineColor, 60);
+                fillColor = BarFunctions.Darken(fillColor, 40);
+            }
+
+            if (fillColor.IsEmpty)
+            {
+                if(tabStrip.Style == eTabStripStyle.Office2003)
+                {
+                    fillColor = tabStrip.ColorScheme.TabPanelBackground;
+                    lineColor = tabStrip.ColorScheme.TabItemText;
+                }
+                else if (!tabStrip.ColorScheme.TabItemSelectedBorder.IsEmpty)
+                {
+                    fillColor = tabStrip.ColorScheme.TabItemSelectedBorder;
+                    if (!tabStrip.ColorScheme.TabItemSelectedBorderLight.IsEmpty)
+                        lineColor = tabStrip.ColorScheme.TabItemSelectedBorderLight;
+                    else if (isSelected && fillColor == tabStrip.ColorScheme.TabItemSelectedBackground && !tabStrip.ColorScheme.TabItemSelectedText.IsEmpty)
+                        lineColor = tabStrip.ColorScheme.TabItemSelectedText;
+                    else if (tabStrip.Style == eTabStripStyle.Metro)
+                        lineColor = tabStrip.ColorScheme.TabBackground;
+                }
+                else
+                {
+                    fillColor = SystemColors.ControlDark;
+                    lineColor = SystemColors.ControlLightLight;
+                }
+            }
+
+            if(lineColor.IsEmpty)
+                lineColor = SystemColors.ControlLightLight;
+
+            //if (!fillColor.IsEmpty && Math.Abs(fillColor.GetBrightness() - lineColor.GetBrightness()) <= .38)
+            //{
+            //    if (lineColor.GetBrightness() < .5)
+            //    {
+            //        fillColor = lineColor;
+            //        lineColor = SystemColors.ControlLightLight;
+            //    }
+            //    else
+            //        fillColor = (lineColor.GetBrightness() < .5 ? SystemColors.ControlLightLight : SystemColors.ControlDarkDark);
+            //}
+
+            fillColor = Color.FromArgb(mouseOver ? 255 : 200, fillColor);
+
+            if ((tabStrip.Style == eTabStripStyle.Metro || tabStrip.Style == eTabStripStyle.Office2003) && !mouseOver)
+            {
+                if (StyleManager.Style == eStyle.Metro || StyleManager.Style == eStyle.OfficeMobile2014 || StyleManager.Style == eStyle.Office2016)
+                    lineColor = fillColor;
+                fillColor = Color.Empty;
+            }
+
+            if (!fillColor.IsEmpty)
+            {
+                SmoothingMode sm = g.SmoothingMode;
+                g.SmoothingMode = SmoothingMode.AntiAlias;
+                using (Pen pen = new Pen(Color.White, Dpi.Width1))
+                    g.DrawEllipse(pen, r);
+                using (Pen pen = new Pen(fillColor, Dpi.Width1))
+                {
+                    g.DrawEllipse(pen, r);
+                }
+                using (SolidBrush brush = new SolidBrush(Color.White))
+                    g.FillEllipse(brush, r);
+                using (SolidBrush brush = new SolidBrush(fillColor))
+                {
+                    g.FillEllipse(brush, r);
+                }
+                g.SmoothingMode = sm;
+            }
+
+            using (Pen pen = new Pen(lineColor, Dpi.Width1))
+            {
+                Rectangle close = r;
+                close.Inflate(-Dpi.Width3, -Dpi.Height3);
+                close.Width--;
+                g.DrawLine(pen, close.X, close.Y, close.Right, close.Bottom);
+                g.DrawLine(pen, close.X, close.Bottom, close.Right, close.Y);
+                close.Offset(1, 0);
+                g.DrawLine(pen, close.X, close.Y, close.Right, close.Bottom);
+                g.DrawLine(pen, close.X, close.Bottom, close.Right, close.Y);
+            }
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/TabStripDesigner.cs b/PROMS/DotNetBar Source Code/TabStripDesigner.cs
new file mode 100644
index 00000000..0454a56e
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TabStripDesigner.cs	
@@ -0,0 +1,397 @@
+using System;
+using System.Windows.Forms;
+using System.Windows.Forms.Design;
+using System.Collections;
+using System.Drawing;
+using System.ComponentModel.Design;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Summary description for TabStripDesigner.
+	/// </summary>
+	public class TabStripDesigner:ParentControlDesigner
+	{
+		public TabStripDesigner()
+		{
+		}
+
+		public override void Initialize(IComponent component) 
+		{
+			base.Initialize(component);
+			if(!component.Site.DesignMode)
+				return;
+
+			ISelectionService ss =(ISelectionService)GetService(typeof(ISelectionService));
+			if(ss!=null)
+				ss.SelectionChanged+=new EventHandler(OnSelectionChanged);
+
+			// If our component is removed we need to clean-up
+			IComponentChangeService cc=(IComponentChangeService)GetService(typeof(IComponentChangeService));
+			if(cc!=null)
+				cc.ComponentRemoving+=new ComponentEventHandler(this.OnComponentRemoving);
+
+			TabStrip tabStrip=this.GetTabStrip();
+			if(tabStrip!=null)
+				tabStrip.TabMoved+=new TabStrip.TabMovedEventHandler(this.TabMoved);
+		}
+
+		protected override void Dispose(bool disposing)
+		{
+			ISelectionService ss =(ISelectionService)GetService(typeof(ISelectionService));
+			if(ss!=null)
+				ss.SelectionChanged-=new EventHandler(OnSelectionChanged);
+
+			// If our component is removed we need to clean-up
+			IComponentChangeService cc=(IComponentChangeService)GetService(typeof(IComponentChangeService));
+			if(cc!=null)
+				cc.ComponentRemoving-=new ComponentEventHandler(this.OnComponentRemoving);
+
+			base.Dispose(disposing);
+		}
+		public override DesignerVerbCollection Verbs 
+		{
+			get 
+			{
+				DesignerVerb[] verbs;
+				verbs = new DesignerVerb[]
+				{
+					new DesignerVerb("Create New Tab", new EventHandler(CreateNewTab)),
+				};
+				return new DesignerVerbCollection(verbs);
+			}
+		}
+
+		protected virtual void CreateNewTab(object sender, EventArgs e)
+		{
+			IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+			TabStrip tabStrip=this.Control as TabStrip;
+			if(tabStrip==null || dh==null)
+				return;
+
+			IComponentChangeService change=this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+			if(change!=null)
+				change.OnComponentChanging(this.Component,null);
+
+			TabItem tab=dh.CreateComponent(typeof(TabItem)) as TabItem;
+			tab.Text=tab.Name;
+			
+			tabStrip.Tabs.Add(tab);
+			
+			if(change!=null)
+				change.OnComponentChanged(this.Component,null,null,null);
+		}
+
+		private void TabMoved(object sender, TabStripTabMovedEventArgs e)
+		{
+			IComponentChangeService change=this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+			if(change!=null)
+			{
+				change.OnComponentChanging(this.Control,null);
+				change.OnComponentChanged(this.Control,null,null,null);
+			}
+		}
+
+		private void OnSelectionChanged(object sender, EventArgs e) 
+		{
+			TabStrip tabStrip=this.GetTabStrip();
+			if(tabStrip==null || tabStrip.IsDisposed)
+				return;
+			
+			ISelectionService ss = (ISelectionService)sender;
+			if(ss!=null && ss.PrimarySelection!=this.Control)
+			{
+				if(ss.PrimarySelection is TabItem && tabStrip.Tabs.Contains(ss.PrimarySelection as TabItem))
+				{
+					tabStrip.DesignTimeSelection=ss.PrimarySelection as TabItem;
+					return;
+				}
+			}
+			tabStrip.DesignTimeSelection=null;
+		}
+
+		protected bool m_InternalRemove=false;
+		private void OnComponentRemoving(object sender,ComponentEventArgs e)
+		{
+			InternalComponentRemoving(e);
+		}
+
+		protected virtual void InternalComponentRemoving(ComponentEventArgs e)
+		{
+			if(m_InternalRemove)
+				return;
+			IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+			if(dh==null)
+				return;
+
+			TabStrip tabStrip=this.GetTabStrip();
+			if(tabStrip==null || tabStrip.IsDisposed)
+				return;
+
+			if(e.Component is TabItem && this.Control!=null && tabStrip.Tabs.Contains(e.Component as TabItem))
+			{
+				try
+				{
+					TabItem item=e.Component as TabItem;
+					if(item.AttachedControl!=null && this.Control.Controls.Contains(item.AttachedControl))
+					{
+						this.Control.Controls.Remove(item.AttachedControl);
+						dh.DestroyComponent(item.AttachedControl);
+					}
+					tabStrip.Tabs.Remove(item);
+					tabStrip.RecalcSize();
+					tabStrip.Refresh();
+				}
+				finally
+				{
+					m_InternalRemove=false;
+				}
+			}
+		}
+
+		protected virtual TabStrip GetTabStrip()
+		{
+			return this.Control as TabStrip;
+		}
+
+#if FRAMEWORK20
+        public override void InitializeNewComponent(IDictionary defaultValues)
+        {
+            base.InitializeNewComponent(defaultValues);
+            SetDesignTimeDefaults();
+        }
+#else
+		public override void OnSetComponentDefaults()
+		{
+			base.OnSetComponentDefaults();
+			SetDesignTimeDefaults();
+		}
+#endif
+        private void SetDesignTimeDefaults()
+        {
+            if (this.Component == null || this.Component.Site == null || !this.Component.Site.DesignMode)
+                return;
+            this.CreateNewTab(null, null);
+        }
+
+		public override System.Collections.ICollection AssociatedComponents
+		{
+			get
+			{
+				ArrayList c=new ArrayList(base.AssociatedComponents);
+				TabStrip tabStrip=this.GetTabStrip();
+				if(tabStrip!=null)
+				{
+					foreach(TabItem tab in tabStrip.Tabs)
+						c.Add(tab);
+				}
+
+				return c;
+			}
+		}
+		#region WndProc Support
+		/// <summary>
+		/// Selection support for items on container.
+		/// </summary>
+		private TabItem m_SelectItem=null;
+		protected override void WndProc(ref Message m)
+		{
+			System.Windows.Forms.Control ctrl=this.Control;
+			if(ctrl==null || ctrl.IsDisposed)
+			{
+				base.WndProc(ref m);
+				return;
+			}
+
+			switch(m.Msg)
+			{
+				case NativeFunctions.WM_LBUTTONDOWN:
+				case NativeFunctions.WM_RBUTTONDOWN:
+				{
+					if(OnMouseDown(ref m))
+						return;
+					break;
+				}
+				case NativeFunctions.WM_RBUTTONUP:
+				case NativeFunctions.WM_LBUTTONUP:
+				{
+					if(OnMouseUp(ref m))
+						return;
+
+					break;
+				}
+				case NativeFunctions.WM_MOUSEMOVE:
+				{
+					if(OnMouseMove(ref m))
+						return;
+					break;
+				}
+				case NativeFunctions.WM_MOUSELEAVE:
+				{
+					if(OnMouseLeave(ref m))
+						return;
+					break;
+				}
+				case NativeFunctions.WM_USER+101:
+				{
+					if(OnProcessPendingSelection(ref m))
+						return;
+					break;
+				}
+			}
+
+			base.WndProc(ref m);
+		}
+
+		private bool m_IgnoreMouseUp=false;
+		private bool m_SelectTabControl=false;
+		protected virtual bool OnMouseDown(ref Message m)
+		{
+			TabStrip tabStrip=this.GetTabStrip();
+
+			if(tabStrip==null || tabStrip.IsDisposed || this.Control.IsDisposed)
+				return false;
+
+			Point pos=tabStrip.PointToClient(System.Windows.Forms.Control.MousePosition);
+			MouseEventArgs e=new MouseEventArgs(MouseButtons.Left,0,pos.X,pos.Y,0);
+			TabItem oldSelected=tabStrip.SelectedTab;
+			tabStrip.InternalOnMouseDown(e);
+
+			ISelectionService selection = (ISelectionService) this.GetService(typeof(ISelectionService));
+			TabItem selected=null;
+			if(selection!=null && selection.PrimarySelection is TabItem)
+				selected=selection.PrimarySelection as TabItem;
+
+			if(tabStrip.SelectedTab!=null && selected!=tabStrip.SelectedTab && tabStrip.HitTest(e.X,e.Y)!=null)
+			{
+				ArrayList arr=new ArrayList(1);
+				arr.Add(tabStrip.SelectedTab);
+#if FRAMEWORK20
+                selection.SetSelectedComponents(arr, SelectionTypes.Primary);
+#else
+                selection.SetSelectedComponents(arr,SelectionTypes.MouseDown);
+#endif
+
+                //m_SelectItem=tabStrip.SelectedTab;
+				//NativeFunctions.PostMessage(m.HWnd.ToInt32(),NativeFunctions.WM_USER+101,0,0);
+				m_IgnoreMouseUp=true;
+
+				if(m.Msg==NativeFunctions.WM_RBUTTONDOWN)
+					this.OnContextMenu(System.Windows.Forms.Control.MousePosition.X,System.Windows.Forms.Control.MousePosition.Y);
+				return true;
+			}
+			else if(tabStrip.SelectedTab==oldSelected)
+			{
+				if(tabStrip.HitTest(e.X,e.Y)!=null)
+				{
+					if(m.Msg==NativeFunctions.WM_RBUTTONDOWN)
+						this.OnContextMenu(System.Windows.Forms.Control.MousePosition.X,System.Windows.Forms.Control.MousePosition.Y);
+					return true;
+				}
+			}
+			
+			return false;
+		}
+
+		protected virtual bool OnMouseUp(ref Message m)
+		{
+			TabStrip tabStrip=this.GetTabStrip();
+			if(tabStrip==null || tabStrip.IsDisposed || this.Control.IsDisposed)
+				return false;
+
+			Point pos=tabStrip.PointToClient(System.Windows.Forms.Control.MousePosition);
+			MouseEventArgs e=new MouseEventArgs(MouseButtons.Left,0,pos.X,pos.Y,0);
+
+			tabStrip.InternalOnMouseUp(e);
+			
+			if(m_IgnoreMouseUp)
+			{
+				m_IgnoreMouseUp=false;
+				return true;
+			}
+
+			if(m_SelectTabControl)
+			{
+				m_SelectTabControl=false;
+				ISelectionService selection = (ISelectionService) this.GetService(typeof(ISelectionService));
+				if(selection!=null && selection.PrimarySelection!=this.Control && !(selection.PrimarySelection.GetType() == this.Control.GetType()))
+				{
+					ArrayList arr=new ArrayList(1);
+					arr.Add(this.Control);
+#if FRAMEWORK20
+                    selection.SetSelectedComponents(arr, SelectionTypes.Primary);
+#else
+                    selection.SetSelectedComponents(arr,SelectionTypes.Click);
+#endif
+                }
+			}
+
+			return false;
+		}
+
+		protected virtual bool OnMouseMove(ref Message m)
+		{
+			TabStrip tabStrip=this.GetTabStrip();
+			if(tabStrip==null || tabStrip.IsDisposed || this.Control.IsDisposed)
+				return false;
+
+			Point pos=tabStrip.PointToClient(System.Windows.Forms.Control.MousePosition);
+			MouseEventArgs e=new MouseEventArgs((m.WParam.ToInt32()==1?MouseButtons.Left:MouseButtons.None),0,pos.X,pos.Y,0);
+			tabStrip.InternalOnMouseMove(e);
+			if(tabStrip.DisplayRectangle.Contains(pos))
+				return true;
+
+			return false;
+		}
+
+		protected virtual bool OnMouseLeave(ref Message m)
+		{
+			TabStrip tabStrip=this.GetTabStrip();
+			if(tabStrip==null || tabStrip.IsDisposed || this.Control.IsDisposed)
+				return false;
+			tabStrip.InternalOnMouseLeave(new EventArgs());
+			return false;
+		}
+
+		protected virtual bool OnProcessPendingSelection(ref Message m)
+		{
+			return ProcessPendingSelection();
+		}
+
+		protected virtual bool ProcessPendingSelection()
+		{
+			TabStrip tabStrip=this.GetTabStrip();
+			if(tabStrip==null || tabStrip.IsDisposed || this.Control.IsDisposed)
+				return false;
+
+			if(m_SelectItem!=null)
+			{
+				tabStrip.DesignTimeSelection=m_SelectItem;
+				//Point pos=tabStrip.PointToClient(System.Windows.Forms.Control.MousePosition);
+				ISelectionService selection = (ISelectionService) this.GetService(typeof(ISelectionService));
+				if(selection==null)
+					return false;
+				ArrayList arr=new ArrayList(1);
+				arr.Add(m_SelectItem);
+#if FRAMEWORK20
+                selection.SetSelectedComponents(arr, SelectionTypes.Primary);
+#else
+                selection.SetSelectedComponents(arr,SelectionTypes.Click);
+#endif
+
+                m_SelectItem =null;
+
+				IComponentChangeService change=this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+				if(change!=null)
+				{
+					change.OnComponentChanging(this.Control,null);
+					change.OnComponentChanged(this.Control,null,null,null);
+				}
+				return true;
+			}
+			return false;
+		}
+		#endregion
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TabStripOffice2007DockDisplay.cs b/PROMS/DotNetBar Source Code/TabStripOffice2007DockDisplay.cs
new file mode 100644
index 00000000..6159ec6a
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TabStripOffice2007DockDisplay.cs	
@@ -0,0 +1,282 @@
+using System;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Drawing.Text;
+
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Provides display capabilities for TabStrip with Office 2007 Dock style.
+    /// </summary>
+    internal class TabStripOffice2007DockDisplay : TabStripBaseDisplay
+    {
+        #region Private Variables
+        private int m_CornerSize = 1;
+        #endregion
+
+        #region Methods
+        public override void Paint(Graphics g, TabStrip tabStrip)
+        {
+            base.Paint(g, tabStrip);
+
+            TabColorScheme colorScheme = tabStrip.ColorScheme;
+            Rectangle clientRect = tabStrip.DisplayRectangle;
+
+            if (colorScheme.TabBackgroundImage != null)
+                BarFunctions.PaintBackgroundImage(g, clientRect, colorScheme.TabBackgroundImage, eBackgroundImagePosition.Tile, 255);
+
+            if (colorScheme.TabBackground != Color.Transparent && !colorScheme.TabBackground.IsEmpty)
+            {
+                if (colorScheme.TabBackground2.IsEmpty)
+                {
+                    if (!colorScheme.TabBackground.IsEmpty)
+                    {
+                        using (SolidBrush brush = new SolidBrush(colorScheme.TabBackground))
+                            g.FillRectangle(brush, clientRect);
+                    }
+                }
+                else
+                {
+                    using (SolidBrush brush = new SolidBrush(Color.White))
+                        g.FillRectangle(brush, clientRect);
+                    using (LinearGradientBrush brush = CreateTabGradientBrush(clientRect, colorScheme.TabBackground, colorScheme.TabBackground2, colorScheme.TabBackgroundGradientAngle))
+                        g.FillRectangle(brush, clientRect);
+                }
+            }
+            Rectangle selectedRect = Rectangle.Empty;
+            if (tabStrip.SelectedTab != null)
+                selectedRect = tabStrip.SelectedTab.DisplayRectangle;
+
+            using (Region tabRegion = new Region(tabStrip.DisplayRectangle))
+                DrawBackground(tabStrip, clientRect, g, colorScheme, tabRegion, tabStrip.TabAlignment, selectedRect);
+
+            Rectangle systemBoxRect = tabStrip.GetSystemBoxRectangle();
+
+            for (int i = tabStrip.Tabs.Count - 1; i >= 0; i--)
+            {
+                TabItem tab = tabStrip.Tabs[i];
+
+                if (!tab.Visible || tab == tabStrip.SelectedTab)
+                    continue;
+                if (!tab.DisplayRectangle.IntersectsWith(systemBoxRect))
+                {   if(tab.DisplayRectangle.IntersectsWith(clientRect))
+                        PaintTab(g, tab, false, false);
+                }
+                else
+                {
+                    Region oldClip = g.Clip;
+                    g.SetClip(systemBoxRect, CombineMode.Exclude);
+                    PaintTab(g, tab, false, false);
+                    g.Clip = oldClip;
+                }
+            }
+
+            if (tabStrip.SelectedTab != null && tabStrip.Tabs.Contains(tabStrip.SelectedTab))
+            {
+                if (!tabStrip.SelectedTab.DisplayRectangle.IntersectsWith(systemBoxRect))
+                    PaintTab(g, tabStrip.SelectedTab, false, false);
+                else
+                {
+                    Region oldClip = g.Clip;
+                    g.SetClip(systemBoxRect, CombineMode.Exclude);
+                    PaintTab(g, tabStrip.SelectedTab, false, false);
+                    g.Clip = oldClip;
+                }
+            }
+
+            g.ResetClip();
+            tabStrip.PaintTabSystemBox(g);
+        }
+
+        protected override GraphicsPath GetTabItemPath(TabItem tab, bool bFirst, bool bLast)
+        {
+            return GetTabItemPath(tab.DisplayRectangle, tab.TabAlignment, true);
+        }
+
+        private GraphicsPath GetTabItemPath(Rectangle tabRect, eTabStripAlignment align, bool closePath)
+        {
+            GraphicsPath path = new GraphicsPath();
+            switch (align)
+            {
+                case eTabStripAlignment.Top:
+                    {
+                        //tabRect.Width--;
+                        if (closePath) tabRect.Height+=2;
+                        path.AddLine(tabRect.X, tabRect.Bottom, tabRect.X, tabRect.Y + m_CornerSize);
+                        path.AddLine(tabRect.X, tabRect.Y + m_CornerSize, tabRect.X+m_CornerSize, tabRect.Y);
+                        path.AddLine(tabRect.X + m_CornerSize, tabRect.Y, tabRect.Right-m_CornerSize, tabRect.Y);
+                        path.AddLine(tabRect.Right - m_CornerSize, tabRect.Y, tabRect.Right, tabRect.Y+m_CornerSize);
+                        path.AddLine(tabRect.Right, tabRect.Y + m_CornerSize, tabRect.Right, tabRect.Bottom);
+                        break;
+                    }
+                case eTabStripAlignment.Bottom:
+                    {
+                        //tabRect.Width--;
+                        if (!closePath)
+                            tabRect.Y++;
+                        tabRect.Height--;
+                        path.AddLine(tabRect.X, tabRect.Y, tabRect.X, tabRect.Bottom - m_CornerSize);
+                        path.AddLine(tabRect.X, tabRect.Bottom - m_CornerSize, tabRect.X + m_CornerSize, tabRect.Bottom);
+                        path.AddLine(tabRect.X + m_CornerSize, tabRect.Bottom, tabRect.Right - m_CornerSize, tabRect.Bottom);
+                        path.AddLine(tabRect.Right - m_CornerSize, tabRect.Bottom, tabRect.Right, tabRect.Bottom - m_CornerSize);
+                        path.AddLine(tabRect.Right, tabRect.Bottom - m_CornerSize, tabRect.Right, tabRect.Y);
+                        break;
+                    }
+                case eTabStripAlignment.Left:
+                    {
+                        tabRect.X--;
+                        tabRect.Height--;
+                        if (closePath)
+                            tabRect.Width++;
+                        path.AddLine(tabRect.Right, tabRect.Y, tabRect.X + m_CornerSize, tabRect.Y);
+                        path.AddLine(tabRect.X + m_CornerSize, tabRect.Y, tabRect.X, tabRect.Y+m_CornerSize);
+                        path.AddLine(tabRect.X, tabRect.Y + m_CornerSize, tabRect.X, tabRect.Bottom - m_CornerSize);
+                        path.AddLine(tabRect.X, tabRect.Bottom - m_CornerSize, tabRect.X+m_CornerSize, tabRect.Bottom);
+                        path.AddLine(tabRect.X + m_CornerSize, tabRect.Bottom, tabRect.Right, tabRect.Bottom);
+
+                        break;
+                    }
+                case eTabStripAlignment.Right:
+                    {
+                        if (!closePath)
+                            tabRect.X++;
+                        //if (closePath)
+                        //    tabRect.Width--;
+                        path.AddLine(tabRect.X, tabRect.Y, tabRect.Right - m_CornerSize, tabRect.Y);
+                        path.AddLine(tabRect.Right - m_CornerSize, tabRect.Y, tabRect.Right, tabRect.Y + m_CornerSize);
+                        path.AddLine(tabRect.Right, tabRect.Y + m_CornerSize, tabRect.Right, tabRect.Bottom - m_CornerSize);
+                        path.AddLine(tabRect.Right, tabRect.Bottom - m_CornerSize, tabRect.Right - m_CornerSize, tabRect.Bottom);
+                        path.AddLine(tabRect.Right - m_CornerSize, tabRect.Bottom, tabRect.X, tabRect.Bottom);
+
+                        break;
+                    }
+            }
+
+            if (closePath)
+                path.CloseAllFigures();
+
+            return path;
+        }
+
+        protected override void DrawTabBorder(TabItem tab, GraphicsPath path, TabColors colors, Graphics g)
+        {
+            Rectangle r = tab.DisplayRectangle;
+            eTabStripAlignment align = tab.TabAlignment;
+            //Region oldClip = g.Clip;
+            //Rectangle rClip = Rectangle.Ceiling(path.GetBounds());
+            //if (tab.TabAlignment == eTabStripAlignment.Right || tab.TabAlignment == eTabStripAlignment.Bottom)
+            //    rClip.Inflate(1, 1);
+
+            //g.SetClip(rClip);
+
+            if (!colors.BorderColor.IsEmpty)
+            {
+                using (GraphicsPath borderPath = GetTabItemPath(r, align, false))
+                {
+                    using (Pen pen = new Pen(colors.BorderColor, Dpi.Width1))
+                        g.DrawPath(pen, borderPath);
+                }
+            }
+
+            if (align == eTabStripAlignment.Top)
+            {
+                r.Offset(1, 1);
+                r.Width-=2;
+                r.Height--;
+            }
+            else if (align == eTabStripAlignment.Bottom)
+            {
+                r.Offset(1, 0);
+                r.Height--;
+                r.Width-=2;
+            }
+            else if (align == eTabStripAlignment.Left)
+            {
+                r.Offset(1, 1);
+                r.Height-=2;
+                r.Width-=2;
+            }
+            else if (align == eTabStripAlignment.Right)
+            {
+                r.Offset(1, 1);
+                r.Height -= 2;
+                r.Width -= 2;
+            }
+
+            if (!colors.LightBorderColor.IsEmpty)
+            {
+                using (GraphicsPath borderPath = GetTabItemPath(r, align, false))
+                {
+                    //rClip = Rectangle.Ceiling(path.GetBounds());
+                    //g.SetClip(rClip);
+
+                    using (Pen pen = new Pen(colors.LightBorderColor, Dpi.Width1))
+                        g.DrawPath(pen, borderPath);
+                }
+            }
+
+            //g.Clip = oldClip;
+        }
+
+        protected override void DrawBackground(TabStrip tabStrip, Rectangle tabStripRect, Graphics g, TabColorScheme colors, Region tabsRegion, eTabStripAlignment tabAlignment, Rectangle selectedTabRect)
+        {
+            base.DrawBackground(tabStrip, tabStripRect, g, colors, tabsRegion, tabAlignment, selectedTabRect);
+
+            SmoothingMode sm = g.SmoothingMode;
+            g.SmoothingMode = SmoothingMode.Default;
+            if (!colors.TabItemBorder.IsEmpty)
+            {
+                using (Pen pen = new Pen(colors.TabItemBorder, Dpi.Width1))
+                {
+                    if (tabAlignment == eTabStripAlignment.Top)
+                    {
+                        if (selectedTabRect.X > tabStripRect.Right)
+                            selectedTabRect = Rectangle.Empty;
+                        Rectangle r = new Rectangle(tabStripRect.X, tabStripRect.Bottom - 1, tabStripRect.Width, 2);
+                        DisplayHelp.FillRectangle(g, r, colors.TabItemBackground, Color.Empty);
+                        g.DrawLine(pen, r.X, r.Y, selectedTabRect.X - 1, r.Y);
+                        g.DrawLine(pen, selectedTabRect.Right, r.Y, r.Right, r.Y);
+                        g.DrawLine(pen, r.X, r.Y, r.X, r.Bottom);
+                        g.DrawLine(pen, r.Right - 1, r.Y, r.Right - 1, r.Bottom);
+                    }
+                    else if (tabAlignment == eTabStripAlignment.Bottom)
+                    {
+                        if (selectedTabRect.X > tabStripRect.Right)
+                            selectedTabRect = Rectangle.Empty;
+                        Rectangle r = new Rectangle(tabStripRect.X, tabStripRect.Y, tabStripRect.Width, 1);
+                        DisplayHelp.FillRectangle(g, r, colors.TabItemBackground, Color.Empty);
+                        g.DrawLine(pen, r.X, r.Bottom - 1, selectedTabRect.X - 1, r.Bottom - 1);
+                        g.DrawLine(pen, selectedTabRect.Right, r.Bottom - 1, r.Right, r.Bottom - 1);
+                        g.DrawLine(pen, r.X, r.Y, r.X, r.Bottom - 1);
+                        g.DrawLine(pen, r.Right - 1, r.Y, r.Right - 1, r.Bottom - 1);
+                    }
+                    else if (tabAlignment == eTabStripAlignment.Left)
+                    {
+                        if (selectedTabRect.Y > tabStripRect.Bottom)
+                            selectedTabRect = Rectangle.Empty;
+                        Rectangle r = new Rectangle(tabStripRect.Right - 1, tabStripRect.Y, 1, tabStripRect.Height);
+                        DisplayHelp.FillRectangle(g, r, colors.TabItemBackground, Color.Empty);
+                        g.DrawLine(pen, r.X, r.Y, r.X, selectedTabRect.Y - 1);
+                        g.DrawLine(pen, r.X, selectedTabRect.Bottom, r.X, r.Bottom);
+                        g.DrawLine(pen, r.X, r.Y, r.Right, r.Y);
+                        g.DrawLine(pen, r.X, r.Bottom - 1, r.Right, r.Bottom - 1);
+                    }
+                    else if (tabAlignment == eTabStripAlignment.Right)
+                    {
+                        if (selectedTabRect.Y > tabStripRect.Bottom)
+                            selectedTabRect = Rectangle.Empty;
+                        Rectangle r = new Rectangle(tabStripRect.X, tabStripRect.Y, 1, tabStripRect.Height);
+                        DisplayHelp.FillRectangle(g, r, colors.TabItemBackground, Color.Empty);
+                        g.DrawLine(pen, r.Right - 1, r.Y, r.Right - 1, selectedTabRect.Y - 1);
+                        g.DrawLine(pen, r.Right - 1, selectedTabRect.Bottom, r.Right - 1, r.Bottom);
+                        g.DrawLine(pen, r.X, r.Y, r.Right - 1, r.Y);
+                        g.DrawLine(pen, r.X, r.Bottom - 1, r.Right - 1, r.Bottom - 1);
+                    }
+                }
+            }
+            g.SmoothingMode = sm;
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/TabStripOffice2007DocumentDisplay.cs b/PROMS/DotNetBar Source Code/TabStripOffice2007DocumentDisplay.cs
new file mode 100644
index 00000000..9e89ef09
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TabStripOffice2007DocumentDisplay.cs	
@@ -0,0 +1,336 @@
+using System;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Drawing.Text;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Provides display capabilities for TabStrip with Office 2007 Document style.
+    /// </summary>
+    internal class TabStripOffice2007DocumentDisplay : TabStripBaseDisplay
+    {
+        #region Private Variable
+        private int m_TopLeftCornerSize = 3;
+        #endregion
+        /// <summary>
+        /// Creates new instance of the class.
+        /// </summary>
+        public TabStripOffice2007DocumentDisplay() { }
+
+        #region Methods
+        public override void Paint(Graphics g, TabStrip tabStrip)
+        {
+            base.Paint(g, tabStrip);
+
+            TabColorScheme colorScheme = tabStrip.ColorScheme;
+            Rectangle clientRect = tabStrip.DisplayRectangle;
+
+            if (colorScheme.TabBackgroundImage != null)
+                BarFunctions.PaintBackgroundImage(g, clientRect, colorScheme.TabBackgroundImage, eBackgroundImagePosition.Tile, 255);
+
+            if (colorScheme.TabBackground != Color.Transparent && !colorScheme.TabBackground.IsEmpty)
+            {
+                if (colorScheme.TabBackground2.IsEmpty)
+                {
+                    if (!colorScheme.TabBackground.IsEmpty)
+                    {
+                        using (SolidBrush brush = new SolidBrush(colorScheme.TabBackground))
+                            g.FillRectangle(brush, clientRect);
+                    }
+                }
+                else
+                {
+                    using (SolidBrush brush = new SolidBrush(Color.White))
+                        g.FillRectangle(brush, clientRect);
+                    using (LinearGradientBrush brush = CreateTabGradientBrush(clientRect, colorScheme.TabBackground, colorScheme.TabBackground2, colorScheme.TabBackgroundGradientAngle))
+                        g.FillRectangle(brush, clientRect);
+                }
+            }
+
+            Rectangle selectedRect = Rectangle.Empty;
+            if (tabStrip.SelectedTab != null)
+                selectedRect = tabStrip.SelectedTab.DisplayRectangle;
+
+            using(Region tabRegion = new Region(tabStrip.DisplayRectangle))
+                DrawBackground(tabStrip, clientRect, g, colorScheme, tabRegion, tabStrip.TabAlignment, selectedRect);
+
+            Rectangle systemBoxRect = tabStrip.GetSystemBoxRectangle();
+            systemBoxRect.Inflate(-2, -2);
+            for (int i = tabStrip.Tabs.Count - 1; i >= 0; i--)
+            {
+                TabItem tab = tabStrip.Tabs[i];
+
+                if (!tab.Visible || tab == tabStrip.SelectedTab)
+                    continue;
+                if(!tab.DisplayRectangle.IntersectsWith(systemBoxRect) && tab.DisplayRectangle.IntersectsWith(clientRect))
+                    PaintTab(g, tab, false, false);
+            }
+
+            if (tabStrip.SelectedTab != null && tabStrip.Tabs.Contains(tabStrip.SelectedTab))
+            {
+                if (!GetAdjustedRect(tabStrip.SelectedTab).IntersectsWith(systemBoxRect))
+                    PaintTab(g, tabStrip.SelectedTab, false, false);
+            }
+
+            g.ResetClip();
+            tabStrip.PaintTabSystemBox(g);
+        }
+
+        private Rectangle GetAdjustedRect(TabItem item)
+        {
+            Rectangle r = item.DisplayRectangle;
+            if (item.TabAlignment == eTabStripAlignment.Top || item.TabAlignment == eTabStripAlignment.Bottom)
+                r.Width -= (r.Height - 6);
+            else
+                r.Height -= (r.Width - 6);
+            return r;
+        }
+
+        protected override GraphicsPath GetTabItemPath(TabItem tab, bool bFirst, bool bLast)
+        {
+            return GetTabPath(tab.DisplayRectangle, tab.TabAlignment, true);
+        }
+
+        private GraphicsPath GetTabPath(Rectangle tabDisplayRectangle, eTabStripAlignment align, bool closePath)
+        {
+            Rectangle r = tabDisplayRectangle;
+
+            if (align == eTabStripAlignment.Right)
+                r = new Rectangle(r.X, r.Y, r.Height, r.Width);
+            else if (align == eTabStripAlignment.Left)
+                r = new Rectangle(r.X, r.Y, r.Height, r.Width);
+
+            if (align == eTabStripAlignment.Bottom || align == eTabStripAlignment.Top)
+                r.Offset(0, 1);
+            else
+                r.Offset(1, 0);
+
+            GraphicsPath path = new GraphicsPath();
+
+            if (align == eTabStripAlignment.Bottom || align == eTabStripAlignment.Left)
+            {
+                path.AddLine(r.X, r.Y, r.X, r.Bottom - m_TopLeftCornerSize);
+                path.AddLine(r.X, r.Bottom - m_TopLeftCornerSize, r.X+m_TopLeftCornerSize, r.Bottom);
+                path.AddLine(r.X + m_TopLeftCornerSize, r.Bottom, r.Right - (r.Height/2), r.Bottom);
+
+                Point[] p = new Point[4];
+                p[0].X = r.Right - (r.Height / 2);
+                p[0].Y = r.Bottom;
+                p[1].X = p[0].X + 5;
+                p[1].Y = p[0].Y - 3;
+                p[2].X = p[1].X + r.Height / 2;
+                p[2].Y = r.Y + 3;
+                p[3].X = p[2].X + 4;
+                p[3].Y = r.Y;
+                path.AddCurve(p, 0, 3, .1f);
+
+                if (closePath)
+                    path.AddLine(r.Right, r.Y, r.X, r.Y);
+            }
+            else
+            {
+                path.AddLine(r.X, r.Bottom, r.X, r.Y + m_TopLeftCornerSize);
+                path.AddLine(r.X, r.Y + m_TopLeftCornerSize, r.X + m_TopLeftCornerSize, r.Y);
+                path.AddLine(r.X + m_TopLeftCornerSize, r.Y, r.Right - (r.Height / 2), r.Y);
+
+                Point[] p = new Point[4];
+                p[0].X = r.Right - (r.Height / 2);
+                p[0].Y = r.Y;
+                p[1].X = p[0].X + 5;
+                p[1].Y = p[0].Y + 3;
+                p[2].X = p[1].X + r.Height / 2;
+                p[2].Y = r.Bottom - 3;
+                p[3].X = p[2].X + 4;
+                p[3].Y = r.Bottom;
+                path.AddCurve(p, 0, 3, .1f);
+
+                if (closePath)
+                    path.AddLine(r.Right, r.Bottom, r.X, r.Bottom);
+            }
+
+            if (align == eTabStripAlignment.Left)
+            {
+                // Left
+                Matrix m = new Matrix();
+                m.RotateAt(90, new PointF(r.Right, r.Bottom));
+                m.Translate(-r.Width-2, r.Width - (r.Height), MatrixOrder.Append);
+                //m.RotateAt(-90, new PointF(r.X, r.Bottom));
+                //m.Translate(r.Height, r.Width - r.Height, MatrixOrder.Append);
+                path.Transform(m);
+            }
+            else if (align == eTabStripAlignment.Right)
+            {
+                // Right
+                Matrix m = new Matrix();
+                //RectangleF rf=path.GetBounds();
+                m.RotateAt(90, new PointF(r.Right, r.Bottom));
+                m.Translate(-r.Width, r.Width - (r.Height), MatrixOrder.Append);
+                path.Transform(m);
+            }
+
+            if (closePath)
+                path.CloseAllFigures();
+
+            return path;
+        }
+
+        protected override void DrawTabBorder(TabItem tab, GraphicsPath path, TabColors colors, Graphics g)
+        {
+            Rectangle r = tab.DisplayRectangle;
+            eTabStripAlignment align = tab.TabAlignment;
+            Region oldClip = g.Clip;
+            Rectangle rClip = Rectangle.Ceiling(path.GetBounds());
+            if (tab.TabAlignment == eTabStripAlignment.Right || tab.TabAlignment == eTabStripAlignment.Bottom)
+                rClip.Inflate(1, 1);
+            else if (tab.TabAlignment == eTabStripAlignment.Left && !tab.IsSelected)
+                rClip.Width--;
+            
+            g.SetClip(rClip);
+
+            if (!colors.BorderColor.IsEmpty)
+            {
+                using (GraphicsPath borderPath = GetTabPath(r, align, false))
+                {
+                    using (Pen pen = new Pen(colors.BorderColor))
+                        g.DrawPath(pen, borderPath);
+                }
+            }
+
+            if (align == eTabStripAlignment.Top)
+            {
+                r.Offset(1, 1);
+                r.Width--;
+            }
+            else if (align == eTabStripAlignment.Bottom)
+            {
+                r.Offset(1, -1);
+                r.Width--;
+            }
+            else if (align == eTabStripAlignment.Left)
+            {
+                r.Offset(1, 1);
+                r.Height--;
+            }
+            else if (align == eTabStripAlignment.Right)
+            {
+                r.Offset(-1, 1);
+            }
+
+            if (!colors.LightBorderColor.IsEmpty)
+            {
+                using (GraphicsPath borderPath = GetTabPath(r, align, false))
+                {
+                    rClip = Rectangle.Ceiling(path.GetBounds());
+                    if (align == eTabStripAlignment.Left)
+                        rClip.Width--;
+                    g.SetClip(rClip);
+
+                    using (Pen pen = new Pen(colors.LightBorderColor))
+                        g.DrawPath(pen, borderPath);
+                }
+            }
+
+            g.Clip = oldClip;
+        }
+
+        protected override void DrawBackground(TabStrip tabStrip, Rectangle tabStripRect, Graphics g, TabColorScheme colors, Region tabsRegion, eTabStripAlignment tabAlignment, Rectangle selectedTabRect)
+        {
+            base.DrawBackground(tabStrip, tabStripRect, g, colors, tabsRegion, tabAlignment, selectedTabRect);
+
+            SmoothingMode sm = g.SmoothingMode;
+            g.SmoothingMode = SmoothingMode.Default;
+            using (Pen pen = new Pen(colors.TabItemBorder, 1))
+            {
+                int tabExtension = 9;
+                if (selectedTabRect.IsEmpty)
+                    tabExtension = 0;
+                Color tabItemSelectedColor2 = colors.TabItemSelectedBackground2;
+                if (tabStrip.SelectedTab != null)
+                {
+                    TabColors tc = tabStrip.GetTabColors(tabStrip.SelectedTab);
+                    tabItemSelectedColor2 = tc.BackColor2;
+                }
+                if (tabAlignment == eTabStripAlignment.Top)
+                {
+                    if (selectedTabRect.X > tabStripRect.Right || selectedTabRect.Bottom < tabStripRect.Bottom - 4)
+                    {
+                        selectedTabRect = Rectangle.Empty;
+                        tabExtension = 0;
+                    }
+                    Rectangle r = new Rectangle(tabStripRect.X, tabStripRect.Bottom - 1, tabStripRect.Width, 1);
+                    DisplayHelp.FillRectangle(g, r, tabItemSelectedColor2, Color.Empty);
+                    g.DrawLine(pen, r.X, r.Y, selectedTabRect.X, r.Y);
+                    g.DrawLine(pen, selectedTabRect.Right + tabExtension, r.Y, r.Right, r.Y);
+                    g.DrawLine(pen, r.X, r.Y, r.X, r.Bottom);
+                    g.DrawLine(pen, r.Right - 1, r.Y, r.Right - 1, r.Bottom);
+                }
+                else if (tabAlignment == eTabStripAlignment.Bottom)
+                {
+                    if (selectedTabRect.X > tabStripRect.Right || selectedTabRect.Y>4)
+                    {
+                        selectedTabRect = Rectangle.Empty;
+                        tabExtension = 0;
+                    }
+                    Rectangle r = new Rectangle(tabStripRect.X, tabStripRect.Y, tabStripRect.Width, 1);
+                    DisplayHelp.FillRectangle(g, r, tabItemSelectedColor2, Color.Empty);
+                    g.DrawLine(pen, r.X, r.Bottom -1, selectedTabRect.X, r.Bottom - 1);
+                    g.DrawLine(pen, selectedTabRect.Right + tabExtension, r.Bottom - 1, r.Right, r.Bottom - 1);
+                    g.DrawLine(pen, r.X, r.Y, r.X, r.Bottom -1);
+                    g.DrawLine(pen, r.Right - 1, r.Y, r.Right - 1, r.Bottom - 1);
+                }
+                else if (tabAlignment == eTabStripAlignment.Left)
+                {
+                    if (selectedTabRect.Y > tabStripRect.Bottom || selectedTabRect.Right < tabStripRect.Right - 4)
+                    {
+                        selectedTabRect = Rectangle.Empty;
+                        tabExtension = 0;
+                    }
+                    Rectangle r = new Rectangle(tabStripRect.Right -1, tabStripRect.Y, 1, tabStripRect.Height);
+                    DisplayHelp.FillRectangle(g, r, tabItemSelectedColor2, Color.Empty);
+                    g.DrawLine(pen, r.X, r.Y, r.X, selectedTabRect.Y);
+                    g.DrawLine(pen, r.X, selectedTabRect.Bottom + tabExtension, r.X, r.Bottom);
+                    g.DrawLine(pen, r.X, r.Y, r.Right, r.Y);
+                    g.DrawLine(pen, r.X, r.Bottom - 1, r.Right, r.Bottom - 1);
+                }
+                else if (tabAlignment == eTabStripAlignment.Right)
+                {
+                    if (selectedTabRect.Y > tabStripRect.Bottom || selectedTabRect.X>4)
+                    {
+                        selectedTabRect = Rectangle.Empty;
+                        tabExtension = 0;
+                    }
+                    Rectangle r = new Rectangle(tabStripRect.X, tabStripRect.Y, 1, tabStripRect.Height);
+                    DisplayHelp.FillRectangle(g, r, tabItemSelectedColor2, Color.Empty);
+                    g.DrawLine(pen, r.Right - 1, r.Y, r.Right - 1, selectedTabRect.Y);
+                    g.DrawLine(pen, r.Right - 1, selectedTabRect.Bottom + tabExtension, r.Right - 1, r.Bottom);
+                    g.DrawLine(pen, r.X, r.Y, r.Right, r.Y);
+                    g.DrawLine(pen, r.X, r.Bottom - 1, r.Right, r.Bottom - 1);
+                }
+            }
+            g.SmoothingMode = sm;
+        }
+
+        protected override void AdjustTextRectangle(ref Rectangle rText, eTabStripAlignment tabAlignment)
+        {
+            if (tabAlignment == eTabStripAlignment.Top || tabAlignment == eTabStripAlignment.Bottom)
+                rText.Width -= 3;
+            base.AdjustTextRectangle(ref rText, tabAlignment);
+        }
+
+        protected override void AdjustCloseButtonRectangle(ref Rectangle close, bool closeOnLeftSide, bool vertical)
+        {
+            if (!closeOnLeftSide)
+            {
+                if (!vertical)
+                    close.X -= TabCloseButtonSpacing + close.Height / 6;
+                else
+                    close.Y -= TabCloseButtonSpacing + close.Height / 6;
+
+            }
+        }
+        #endregion
+
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/TabStripRoundHeaderDisplay.cs b/PROMS/DotNetBar Source Code/TabStripRoundHeaderDisplay.cs
new file mode 100644
index 00000000..8af13973
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TabStripRoundHeaderDisplay.cs	
@@ -0,0 +1,216 @@
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Drawing.Text;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Represents class performing the display of tabs with RoundHeader style.
+	/// </summary>
+	internal class TabStripRoundHeaderDisplay:TabStripBaseDisplay
+	{
+		#region Methods
+		public override void Paint(Graphics g, TabStrip tabStrip)
+		{
+			base.Paint(g,tabStrip);
+
+			TabsCollection tabs=tabStrip.Tabs;
+			TabColorScheme colorScheme=tabStrip.ColorScheme;
+			Rectangle clientRect=tabStrip.ClientRectangle;
+			
+			Rectangle r=tabStrip.DisplayRectangle;
+			r.Inflate(2,2);
+			using(SolidBrush brush=new SolidBrush(tabStrip.BackColor))
+				g.FillRectangle(brush,r);
+			//g.Clear(tabStrip.BackColor);
+
+			TabItem lastTab=GetLastVisibleTab(tabs);
+
+            Rectangle selectedRect = Rectangle.Empty;
+            if (tabStrip.SelectedTab != null)
+                selectedRect = tabStrip.SelectedTab.DisplayRectangle;
+            DrawBackground(tabStrip, clientRect, g, colorScheme, GetTabsRegion(tabs, lastTab), tabStrip.TabAlignment, selectedRect);
+
+			bool bFirstVisible=true;
+
+			foreach(TabItem tab in tabs)
+			{
+				if(!tab.Visible)
+					continue;
+                if(tab.DisplayRectangle.IntersectsWith(clientRect))
+				    PaintTab(g,tab,bFirstVisible,(tab==lastTab));
+				
+				bFirstVisible=false;
+			}
+		}
+
+		protected override Region GetTabsRegion(TabsCollection tabs, TabItem lastTab)
+		{
+			bool bFirstVisible=true;
+			Region tabRegion=new Region();
+			tabRegion.MakeEmpty();
+			foreach(TabItem tab in tabs)
+			{
+				if(!tab.Visible)
+					continue;				
+				GraphicsPath path=GetTabItemPath(tab,bFirstVisible,(tab==lastTab));
+				tabRegion.Union(path);
+				bFirstVisible=false;
+			}
+			return tabRegion;
+		}
+
+		protected override LinearGradientBrush CreateTabGradientBrush(Rectangle r,Color color1,Color color2,int gradientAngle)
+		{
+			LinearGradientBrush brush=base.CreateTabGradientBrush(r,color1,color2,gradientAngle);
+			
+			Blend blend=new Blend(5);
+			blend.Factors=new float[]{0,.6f,1f,.6f,0f};
+			blend.Positions=new float[]{0,.3f,.5f,.7f,1f};
+			brush.Blend=blend;
+
+			return brush;
+		}
+
+        protected override void DrawBackground(TabStrip tabStrip, Rectangle tabStripRect, Graphics g, TabColorScheme colors, Region tabsRegion, eTabStripAlignment tabAlignment, Rectangle selectedTabRect)
+		{
+			int cornerDiameter=5;
+			Rectangle br;
+			GraphicsPath path=new GraphicsPath();
+			if(tabAlignment==eTabStripAlignment.Top)
+			{
+				br=new Rectangle(tabStripRect.X,tabStripRect.Y+tabStripRect.Height/2,tabStripRect.Width-1,tabStripRect.Height-tabStripRect.Height/2);
+				path.AddLine(br.X,br.Bottom,br.X,br.Top+cornerDiameter);
+				ArcData ad=GetCornerArc(br,cornerDiameter,eCornerArc.TopLeft);
+				path.AddArc(ad.X,ad.Y,ad.Width,ad.Height,ad.StartAngle,ad.SweepAngle);
+				path.AddLine(br.X+cornerDiameter,br.Y,br.Right-cornerDiameter,br.Y);
+				ad=GetCornerArc(br,cornerDiameter,eCornerArc.TopRight);
+				path.AddArc(ad.X,ad.Y,ad.Width,ad.Height,ad.StartAngle,ad.SweepAngle);
+				path.AddLine(br.Right,br.Y+cornerDiameter,br.Right,br.Bottom);
+			}
+			else if(tabAlignment==eTabStripAlignment.Bottom)
+			{
+				br=new Rectangle(tabStripRect.X,tabStripRect.Y,tabStripRect.Width-1,tabStripRect.Height/2);
+				path.AddLine(br.Right,br.Y,br.Right,br.Bottom-cornerDiameter);
+				ArcData ad=GetCornerArc(br,cornerDiameter,eCornerArc.BottomRight);
+				path.AddArc(ad.X,ad.Y,ad.Width,ad.Height,ad.StartAngle,ad.SweepAngle);
+				path.AddLine(br.Right-cornerDiameter,br.Bottom,br.X+cornerDiameter,br.Bottom);
+				ad=GetCornerArc(br,cornerDiameter,eCornerArc.BottomLeft);
+				path.AddArc(ad.X,ad.Y,ad.Width,ad.Height,ad.StartAngle,ad.SweepAngle);
+				path.AddLine(br.X,br.Bottom-cornerDiameter,br.X,br.Y);
+			}
+			else if(tabAlignment==eTabStripAlignment.Left)
+			{
+				br=new Rectangle(tabStripRect.X+tabStripRect.Width/2,tabStripRect.Y,tabStripRect.Width/2+1,tabStripRect.Height-1);
+				path.AddLine(br.Right,br.Bottom,br.X+cornerDiameter,br.Bottom);
+				ArcData ad=GetCornerArc(br,cornerDiameter,eCornerArc.BottomLeft);
+				path.AddArc(ad.X,ad.Y,ad.Width,ad.Height,ad.StartAngle,ad.SweepAngle);
+				path.AddLine(br.X,br.Bottom-cornerDiameter,br.X,br.Y+cornerDiameter);
+				ad=GetCornerArc(br,cornerDiameter,eCornerArc.TopLeft);
+				path.AddArc(ad.X,ad.Y,ad.Width,ad.Height,ad.StartAngle,ad.SweepAngle);
+				path.AddLine(br.X+cornerDiameter,br.Y,br.Right,br.Y);
+			}
+			else if(tabAlignment==eTabStripAlignment.Right)
+			{
+				br=new Rectangle(tabStripRect.X,tabStripRect.Y,tabStripRect.Width/2,tabStripRect.Height-1);
+				path.AddLine(br.X,br.Y,br.Right-cornerDiameter,br.Y);
+				ArcData ad=GetCornerArc(br,cornerDiameter,eCornerArc.TopRight);
+				path.AddArc(ad.X,ad.Y,ad.Width,ad.Height,ad.StartAngle,ad.SweepAngle);
+				path.AddLine(br.Right,br.Y+cornerDiameter,br.Right,br.Bottom-cornerDiameter);
+				ad=GetCornerArc(br,cornerDiameter,eCornerArc.BottomRight);
+				path.AddArc(ad.X,ad.Y,ad.Width,ad.Height,ad.StartAngle,ad.SweepAngle);
+				path.AddLine(br.Right-cornerDiameter,br.Bottom,br.X,br.Bottom);
+			}
+
+			// Paint background of the tab control
+			GraphicsPath backPath=path.Clone() as GraphicsPath;
+			backPath.CloseAllFigures();
+			g.SetClip(backPath,CombineMode.Replace);
+			g.SetClip(tabsRegion,CombineMode.Exclude);
+			g.Clear(colors.TabPanelBackground);
+			g.ResetClip();
+			backPath.Dispose();
+
+			g.SetClip(tabsRegion,CombineMode.Exclude);
+			
+			using(Pen pen=new Pen(colors.TabBorder,1))
+				g.DrawPath(pen,path);
+			path.Dispose();
+			g.ResetClip();
+		}
+		#endregion
+
+		#region Tab Path Functions
+		protected override GraphicsPath GetTabItemPath(TabItem tab, bool bFirst, bool bLast)
+		{
+			GraphicsPath path=new GraphicsPath();
+			int cornerDiameter=3;
+			
+			Rectangle clientRectangle=tab.DisplayRectangle;
+
+			if(!bFirst && !bLast)
+				path.AddRectangle(clientRectangle);
+			else
+			{
+				if(bFirst)
+				{
+					if(tab.Parent.TabAlignment==eTabStripAlignment.Top || tab.Parent.TabAlignment==eTabStripAlignment.Bottom)
+					{
+						path.AddLine(clientRectangle.Right-(bLast?cornerDiameter:0),clientRectangle.Bottom,clientRectangle.X+cornerDiameter,clientRectangle.Bottom);
+						ArcData ad=GetCornerArc(clientRectangle,cornerDiameter,eCornerArc.BottomLeft);
+						path.AddArc(ad.X,ad.Y,ad.Width,ad.Height,ad.StartAngle,ad.SweepAngle);
+						path.AddLine(clientRectangle.X,clientRectangle.Bottom-cornerDiameter,clientRectangle.X,clientRectangle.Y+cornerDiameter);
+						ad=GetCornerArc(clientRectangle,cornerDiameter,eCornerArc.TopLeft);
+						path.AddArc(ad.X,ad.Y,ad.Width,ad.Height,ad.StartAngle,ad.SweepAngle);
+						path.AddLine(clientRectangle.X+cornerDiameter,clientRectangle.Y,clientRectangle.Right-(bLast?cornerDiameter:0),clientRectangle.Y);
+					}
+					else
+					{
+						ArcData ad=GetCornerArc(clientRectangle,cornerDiameter,eCornerArc.TopLeft);
+						path.AddArc(ad.X,ad.Y,ad.Width,ad.Height,ad.StartAngle,ad.SweepAngle);
+						path.AddLine(clientRectangle.X+cornerDiameter,clientRectangle.Y,clientRectangle.Right-cornerDiameter,clientRectangle.Y);
+						ad=GetCornerArc(clientRectangle,cornerDiameter,eCornerArc.TopRight);
+						path.AddArc(ad.X,ad.Y,ad.Width,ad.Height,ad.StartAngle,ad.SweepAngle);
+						path.AddLine(clientRectangle.Right,clientRectangle.Y+cornerDiameter,clientRectangle.Right,clientRectangle.Bottom-(bLast?cornerDiameter:0));
+					}
+				}
+				else
+					path.AddLine(clientRectangle.X,clientRectangle.Y,clientRectangle.Right,clientRectangle.Y);
+				if(bLast)
+				{
+					if(tab.Parent.TabAlignment==eTabStripAlignment.Top || tab.Parent.TabAlignment==eTabStripAlignment.Bottom)
+					{
+						if(!bFirst)
+							path.AddLine(clientRectangle.X,clientRectangle.Y,clientRectangle.Right-cornerDiameter,clientRectangle.Y);
+						ArcData ad=GetCornerArc(clientRectangle,cornerDiameter,eCornerArc.TopRight);
+						path.AddArc(ad.X,ad.Y,ad.Width,ad.Height,ad.StartAngle,ad.SweepAngle);
+						path.AddLine(clientRectangle.Right,clientRectangle.Y+cornerDiameter,clientRectangle.Right,clientRectangle.Bottom-cornerDiameter);
+						ad=GetCornerArc(clientRectangle,cornerDiameter,eCornerArc.BottomRight);
+						path.AddArc(ad.X,ad.Y,ad.Width,ad.Height,ad.StartAngle,ad.SweepAngle);
+						if(!bFirst)
+							path.AddLine(clientRectangle.Right-cornerDiameter,clientRectangle.Bottom,clientRectangle.X,clientRectangle.Bottom);
+					}
+					else
+					{
+						if(!bFirst)
+							path.AddLine(clientRectangle.Right,clientRectangle.Y,clientRectangle.Right,clientRectangle.Bottom-cornerDiameter);
+						ArcData ad=GetCornerArc(clientRectangle,cornerDiameter,eCornerArc.BottomRight);
+						path.AddArc(ad.X,ad.Y,ad.Width,ad.Height,ad.StartAngle,ad.SweepAngle);
+						path.AddLine(clientRectangle.Right-cornerDiameter,clientRectangle.Bottom,clientRectangle.X+cornerDiameter,clientRectangle.Bottom);
+						ad=GetCornerArc(clientRectangle,cornerDiameter,eCornerArc.BottomLeft);
+						path.AddArc(ad.X,ad.Y,ad.Width,ad.Height,ad.StartAngle,ad.SweepAngle);
+						if(!bFirst)
+							path.AddLine(clientRectangle.X,clientRectangle.Bottom-cornerDiameter,clientRectangle.X,clientRectangle.Y);
+					}
+				}
+				else
+					path.AddLine(clientRectangle.Right,clientRectangle.Bottom,clientRectangle.X,clientRectangle.Bottom);
+				path.CloseAllFigures();
+
+			}
+
+			return path;
+		}
+		#endregion
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TabStripSimulatedThemeDisplay.cs b/PROMS/DotNetBar Source Code/TabStripSimulatedThemeDisplay.cs
new file mode 100644
index 00000000..77a7a6d0
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TabStripSimulatedThemeDisplay.cs	
@@ -0,0 +1,394 @@
+using System;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Provides display support for SimualtedTheme tab style.
+	/// </summary>
+	internal class TabStripSimulatedThemeDisplay:TabStripBaseDisplay
+	{
+		public TabStripSimulatedThemeDisplay()
+		{
+			this.HorizontalText=true;
+		}
+
+		#region Methods
+		public override void Paint(Graphics g, TabStrip tabStrip)
+		{
+			base.Paint(g,tabStrip);
+
+			TabColorScheme colorScheme=tabStrip.ColorScheme;
+			Rectangle clientRect=tabStrip.ClientRectangle;
+
+            if (tabStrip.BackColor != Color.Transparent || colorScheme.TabBackground != Color.Transparent)
+            {
+                if (colorScheme.TabPanelBackground2.IsEmpty)
+                {
+                    if (!colorScheme.TabPanelBackground.IsEmpty)
+                    {
+                        using (SolidBrush brush = new SolidBrush(colorScheme.TabPanelBackground))
+                            g.FillRectangle(brush, clientRect);
+                    }
+                }
+                else
+                {
+                    using (SolidBrush brush = new SolidBrush(Color.White))
+                        g.FillRectangle(brush, clientRect);
+                    using (LinearGradientBrush brush = CreateTabGradientBrush(clientRect, colorScheme.TabPanelBackground, colorScheme.TabPanelBackground2, colorScheme.TabPanelBackgroundGradientAngle))
+                        g.FillRectangle(brush, clientRect);
+                }
+            }
+
+			tabStrip.ClipExcludeSystemBox(g);
+
+			DrawBackgroundInternal(clientRect,g,colorScheme,new Region(tabStrip.DisplayRectangle),tabStrip.TabAlignment, tabStrip.TabItemsBounds);
+
+			for(int i=tabStrip.Tabs.Count-1;i>=0;i--)
+			{
+				TabItem tab=tabStrip.Tabs[i];
+
+				if(!tab.Visible || tab.IsSelected || !tab.DisplayRectangle.IntersectsWith(clientRect))
+					continue;
+			
+				PaintTab(g,tab,false,false);
+			}
+
+			if(tabStrip.SelectedTab!=null && tabStrip.Tabs.Contains(tabStrip.SelectedTab))
+				PaintTab(g,tabStrip.SelectedTab,false,false);
+
+			g.ResetClip();
+			tabStrip.PaintTabSystemBox(g);
+		}
+
+
+		protected override GraphicsPath GetTabItemPath(TabItem tab, bool bFirst, bool bLast)
+		{
+			Rectangle r=tab.DisplayRectangle;
+
+			GraphicsPath path=new GraphicsPath();
+
+			if(!tab.IsSelected && !tab.IsMouseOver)
+			{
+				if(tab.TabAlignment==eTabStripAlignment.Bottom)
+				{
+					r.Height--;
+				}
+				else if(tab.TabAlignment==eTabStripAlignment.Top)
+				{
+					r.Height--;
+					r.Y++;
+				}
+				else if(tab.TabAlignment==eTabStripAlignment.Left)
+				{
+					r.Width--;
+					r.X++;
+				}
+				else if(tab.TabAlignment==eTabStripAlignment.Right)
+				{
+					r.Width--;
+				}
+
+				path.AddRectangle(r);
+			}
+			else
+			{
+				if(tab.TabAlignment==eTabStripAlignment.Bottom)
+				{
+					//r.Height++;
+					path.AddLine(r.X+2,r.Bottom,r.X,r.Bottom-2);
+					path.AddLine(r.X,r.Y,r.Right,r.Y);
+					path.AddLine(r.Right,r.Bottom-2,r.Right-2,r.Bottom);
+					path.AddLine(r.Right-2,r.Bottom,r.X+2,r.Bottom);
+				}
+				else if(tab.TabAlignment==eTabStripAlignment.Top)
+				{
+					//r.Height++;
+					//r.Y--;
+					path.AddLine(r.X,r.Y+2,r.X+2,r.Y);
+					path.AddLine(r.Right-2,r.Y,r.Right,r.Y+2);
+					path.AddLine(r.Right,r.Bottom,r.X,r.Bottom);
+				}
+				else if(tab.TabAlignment==eTabStripAlignment.Left)
+				{
+					//r.Width++;
+					//r.X--;
+					path.AddLine(r.Right,r.Bottom,r.X+2,r.Bottom);
+					path.AddLine(r.X+2,r.Bottom,r.X,r.Bottom-2);
+					path.AddLine(r.X,r.Bottom-2,r.X,r.Y+2);
+					path.AddLine(r.X,r.Y+2,r.X+2,r.Y);
+					path.AddLine(r.Right-1,r.Y,r.Right-1,r.Bottom);
+				}
+				else if(tab.TabAlignment==eTabStripAlignment.Right)
+				{
+					//r.Width++;
+					path.AddLine(r.X,r.Y,r.Right-2,r.Y);
+					path.AddLine(r.Right-2,r.Y,r.Right,r.Y+2);
+					path.AddLine(r.Right,r.Y+2,r.Right,r.Bottom-2);
+					path.AddLine(r.Right,r.Bottom-2,r.Right-2,r.Bottom);
+					path.AddLine(r.X,r.Bottom,r.X,r.Y);
+				}
+				path.CloseAllFigures();
+			}
+
+			return path;
+		}
+
+		private GraphicsPath GetTabEdge(TabItem tab)
+		{
+			GraphicsPath path=new GraphicsPath();
+			Rectangle r=tab.DisplayRectangle;
+
+			if(tab.TabAlignment==eTabStripAlignment.Bottom)
+			{
+				r.Height++;
+				path.AddLine(r.Right,r.Bottom-2,r.Right-2,r.Bottom);
+				path.AddLine(r.Right-2,r.Bottom,r.X+2,r.Bottom);
+				path.AddLine(r.X+2,r.Bottom,r.X,r.Bottom-2);
+			}
+			else if(tab.TabAlignment==eTabStripAlignment.Top)
+			{
+				r.Height++;
+				r.Y--;
+				path.AddLine(r.X,r.Y+2,r.X+2,r.Y);
+				path.AddLine(r.X+2,r.Y,r.Right-2,r.Y);
+				path.AddLine(r.Right-2,r.Y,r.Right,r.Y+2);
+				
+			}
+			else if(tab.TabAlignment==eTabStripAlignment.Left)
+			{
+				r.Width++;
+				r.X--;
+				//path.AddLine(r.Right,r.Bottom,r.X+2,r.Bottom);
+				path.AddLine(r.X+2,r.Bottom,r.X,r.Bottom-2);
+				path.AddLine(r.X,r.Bottom-2,r.X,r.Y+2);
+				path.AddLine(r.X,r.Y+2,r.X+2,r.Y);
+				//path.AddLine(r.Right,r.Y,r.Right,r.Bottom);
+			}
+			else if(tab.TabAlignment==eTabStripAlignment.Right)
+			{
+				r.Width++;
+				//path.AddLine(r.X,r.Y,r.Right-2,r.Y);
+				path.AddLine(r.Right-2,r.Y,r.Right,r.Y+2);
+				path.AddLine(r.Right,r.Y+2,r.Right,r.Bottom-2);
+				path.AddLine(r.Right,r.Bottom-2,r.Right-2,r.Bottom);
+				//path.AddLine(r.X,r.Bottom,r.X,r.Y);
+			}
+			//path.CloseAllFigures();
+
+			return path;
+		}
+
+		private void DrawBackgroundInternal(Rectangle tabStripRect, Graphics g, TabColorScheme colors, Region tabsRegion, eTabStripAlignment tabAlignment, Rectangle tabItemsBounds)
+		{
+			int cornerDiameter=3;
+			Rectangle br;
+			GraphicsPath path=new GraphicsPath();
+			GraphicsPath backPath=null;
+
+			if(!tabItemsBounds.IsEmpty)
+			{
+				if(tabAlignment==eTabStripAlignment.Top)
+				{
+					tabItemsBounds.Width+=3;
+					br=new Rectangle(tabStripRect.X,tabItemsBounds.Y+1,(tabItemsBounds.Right>tabStripRect.Right?tabStripRect.Width:tabItemsBounds.Right),tabItemsBounds.Height-1);
+					path.AddLine(br.X,br.Bottom,br.X,br.Top+cornerDiameter);
+					ArcData ad=GetCornerArc(br,cornerDiameter,eCornerArc.TopLeft);
+					path.AddArc(ad.X,ad.Y,ad.Width,ad.Height,ad.StartAngle,ad.SweepAngle);
+					path.AddLine(br.X+cornerDiameter,br.Y,br.Right-cornerDiameter,br.Y);
+					ad=GetCornerArc(br,cornerDiameter,eCornerArc.TopRight);
+					path.AddArc(ad.X,ad.Y,ad.Width,ad.Height,ad.StartAngle,ad.SweepAngle);
+					path.AddLine(br.Right,br.Y+cornerDiameter,br.Right,br.Bottom);
+					
+					backPath=path.Clone() as GraphicsPath;
+					backPath.CloseAllFigures();
+
+					if(tabItemsBounds.Right<tabStripRect.Right)
+						path.AddLine(br.Right,br.Bottom,tabStripRect.Right,br.Bottom);
+				}
+				else if(tabAlignment==eTabStripAlignment.Bottom)
+				{
+					tabItemsBounds.Width+=3;
+					br=new Rectangle(tabStripRect.X,tabStripRect.Y,(tabItemsBounds.Right>tabStripRect.Right?tabStripRect.Width:tabItemsBounds.Right),tabItemsBounds.Height-1);
+					path.AddLine(br.Right,br.Y,br.Right,br.Bottom-cornerDiameter);
+					ArcData ad=GetCornerArc(br,cornerDiameter,eCornerArc.BottomRight);
+					path.AddArc(ad.X,ad.Y,ad.Width,ad.Height,ad.StartAngle,ad.SweepAngle);
+					path.AddLine(br.Right-cornerDiameter,br.Bottom,br.X+cornerDiameter,br.Bottom);
+					ad=GetCornerArc(br,cornerDiameter,eCornerArc.BottomLeft);
+					path.AddArc(ad.X,ad.Y,ad.Width,ad.Height,ad.StartAngle,ad.SweepAngle);
+					path.AddLine(br.X,br.Bottom-cornerDiameter,br.X,br.Y);
+
+					backPath=path.Clone() as GraphicsPath;
+					backPath.CloseAllFigures();
+
+					if(tabItemsBounds.Right<tabStripRect.Right)
+						path.AddLine(br.Right,br.Y,tabStripRect.Right,br.Y);
+				}
+				else if(tabAlignment==eTabStripAlignment.Left)
+				{
+					tabItemsBounds.Height+=3;
+					br=new Rectangle(tabItemsBounds.X+1,tabStripRect.Y,tabItemsBounds.Width-1,(tabItemsBounds.Bottom>tabStripRect.Bottom?tabStripRect.Height:tabItemsBounds.Bottom));
+                    
+                    path.AddLine(br.Right-1,br.Bottom,br.X+cornerDiameter,br.Bottom);
+                    ArcData ad=GetCornerArc(br,cornerDiameter,eCornerArc.BottomLeft);
+					path.AddArc(ad.X,ad.Y,ad.Width,ad.Height,ad.StartAngle,ad.SweepAngle);
+					path.AddLine(br.X,br.Bottom-cornerDiameter,br.X,br.Y+cornerDiameter);
+					ad=GetCornerArc(br,cornerDiameter,eCornerArc.TopLeft);
+					path.AddArc(ad.X,ad.Y,ad.Width,ad.Height,ad.StartAngle,ad.SweepAngle);
+                    path.AddLine(br.X+cornerDiameter,br.Y,br.Right-1,br.Y);
+
+					backPath=path.Clone() as GraphicsPath;
+					backPath.CloseAllFigures();
+
+					if(tabItemsBounds.Bottom<tabStripRect.Bottom)
+						path.AddLine(br.Right-1,br.Bottom,br.Right-1,tabStripRect.Bottom);
+				}
+				else if(tabAlignment==eTabStripAlignment.Right)
+				{
+					tabItemsBounds.Height+=3;
+					br=new Rectangle(tabStripRect.X,tabStripRect.Y,tabItemsBounds.Width-1,(tabItemsBounds.Bottom>tabStripRect.Bottom?tabStripRect.Height:tabItemsBounds.Bottom));
+					path.AddLine(br.X,br.Y,br.Right-cornerDiameter,br.Y);
+					ArcData ad=GetCornerArc(br,cornerDiameter,eCornerArc.TopRight);
+					path.AddArc(ad.X,ad.Y,ad.Width,ad.Height,ad.StartAngle,ad.SweepAngle);
+					path.AddLine(br.Right,br.Y+cornerDiameter,br.Right,br.Bottom-cornerDiameter);
+					ad=GetCornerArc(br,cornerDiameter,eCornerArc.BottomRight);
+					path.AddArc(ad.X,ad.Y,ad.Width,ad.Height,ad.StartAngle,ad.SweepAngle);
+					path.AddLine(br.Right-cornerDiameter,br.Bottom,br.X,br.Bottom);
+
+					backPath=path.Clone() as GraphicsPath;
+					backPath.CloseAllFigures();
+
+					if(tabItemsBounds.Bottom<tabStripRect.Bottom)
+						path.AddLine(br.X,br.Bottom,br.X,tabStripRect.Bottom);
+				}
+			}
+			else
+			{
+				path.AddRectangle(tabStripRect);
+			}
+
+			// Paint background of the tab control
+			//g.SetClip(backPath,CombineMode.Replace);
+			//g.SetClip(tabsRegion,CombineMode.Exclude);
+			
+			if(colors.TabPanelBackground2.IsEmpty)
+			{
+				if(!colors.TabPanelBackground.IsEmpty)
+				{
+					using(SolidBrush brush=new SolidBrush(colors.TabPanelBackground))
+						g.FillPath(brush,path);
+				}
+			}
+			else
+			{
+				using(SolidBrush brush=new SolidBrush(Color.White))
+					g.FillPath(brush,path);
+				using(LinearGradientBrush brush=CreateTabGradientBrush(tabStripRect,colors.TabPanelBackground,colors.TabPanelBackground2,colors.TabPanelBackgroundGradientAngle))
+					g.FillPath(brush,path);
+			}
+
+			if(!colors.TabBorder.IsEmpty)
+			{
+				path.CloseAllFigures();
+				using(Pen pen=new Pen(colors.TabBorder,1))
+					g.DrawPath(pen,path);
+			}
+
+            if (backPath != null)
+                backPath.Dispose();
+            if (path != null)
+                path.Dispose();
+		}
+
+		protected override void DrawTabItemBackground(TabItem tab, GraphicsPath path, TabColors colors, Graphics g)
+		{
+			RectangleF rf=path.GetBounds();
+			Rectangle tabRect=new Rectangle((int)rf.X, (int)rf.Y, (int)rf.Width, (int)rf.Height);
+
+			if(colors.BackColor2.IsEmpty)
+			{
+				if(!colors.BackColor.IsEmpty)
+				{
+					using(SolidBrush brush=new SolidBrush(colors.BackColor))
+						g.FillPath(brush,path);
+				}
+			}
+			else
+			{
+				using(SolidBrush brush=new SolidBrush(Color.White))
+					g.FillPath(brush,path);
+				using(LinearGradientBrush brush=CreateTabGradientBrush(tabRect,colors.BackColor,colors.BackColor2,colors.BackColorGradientAngle))
+					g.FillPath(brush,path);
+			}
+
+			using(Pen pen=new Pen(colors.BorderColor,1))
+			{
+				if(!colors.BorderColor.IsEmpty && (tab.IsSelected || tab.IsMouseOver))
+				{
+					g.DrawPath(pen,path);
+				}
+				else
+				{
+					if(tab.TabAlignment==eTabStripAlignment.Top || tab.TabAlignment==eTabStripAlignment.Bottom)
+					{
+						if(!colors.LightBorderColor.IsEmpty)
+						{
+							using(Pen border=new Pen(colors.LightBorderColor,1))
+								g.DrawLine(border,tabRect.Right-1,tabRect.Y+4,tabRect.Right-1,tabRect.Bottom-4);
+						}
+						if(!colors.DarkBorderColor.IsEmpty)
+						{
+							using(Pen border=new Pen(colors.DarkBorderColor,1))
+								g.DrawLine(border,tabRect.Right,tabRect.Y+4,tabRect.Right,tabRect.Bottom-4);
+						}
+
+						g.DrawLine(pen,tabRect.X,tabRect.Y,tabRect.Right,tabRect.Y);
+						g.DrawLine(pen,tabRect.X,tabRect.Bottom,tabRect.Right,tabRect.Bottom);
+					}
+					else if(tab.TabAlignment==eTabStripAlignment.Left || tab.TabAlignment==eTabStripAlignment.Right)
+					{
+						if(!colors.LightBorderColor.IsEmpty)
+						{
+							using(Pen border=new Pen(colors.LightBorderColor,1))
+								g.DrawLine(border,tabRect.X+4,tabRect.Bottom-1,tabRect.Right-4,tabRect.Bottom-1);
+						}
+						if(!colors.DarkBorderColor.IsEmpty)
+						{
+							using(Pen border=new Pen(colors.DarkBorderColor,1))
+								g.DrawLine(border,tabRect.X+4,tabRect.Bottom,tabRect.Right-4,tabRect.Bottom);
+						}
+
+						g.DrawLine(pen,tabRect.X,tabRect.Y,tabRect.X,tabRect.Bottom);
+						if(tab.TabAlignment==eTabStripAlignment.Left)
+							g.DrawLine(pen,tabRect.Right-1,tabRect.Y,tabRect.Right-1,tabRect.Bottom);
+						else
+							g.DrawLine(pen,tabRect.Right,tabRect.Y,tabRect.Right,tabRect.Bottom);
+					}
+				}
+			}
+
+			if(tab.IsSelected || tab.IsMouseOver)
+			{
+				GraphicsPath edge=GetTabEdge(tab);
+				if(!colors.LightBorderColor.IsEmpty)
+				{
+					GraphicsPath edgeFill=edge.Clone() as GraphicsPath;
+					edgeFill.CloseAllFigures();
+					using(SolidBrush brush=new SolidBrush(colors.LightBorderColor))
+						g.FillPath(brush,edgeFill);
+					edgeFill.Dispose();
+				}
+				if(!colors.DarkBorderColor.IsEmpty)
+				{
+					using(Pen pen=new Pen(colors.DarkBorderColor,1))
+						g.DrawPath(pen,edge);
+				}
+				edge.Dispose();
+			}
+		}
+
+		#endregion
+
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TabStripVS2005DockDisplay.cs b/PROMS/DotNetBar Source Code/TabStripVS2005DockDisplay.cs
new file mode 100644
index 00000000..ea5b8f58
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TabStripVS2005DockDisplay.cs	
@@ -0,0 +1,198 @@
+using System;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Drawing.Text;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Provides display capabilites for TabStrip with VS2005Dock style.
+	/// </summary>
+	internal class TabStripVS2005DockDisplay:TabStripBaseDisplay
+	{
+		#region Private Variable
+		private int m_xTabOffset=8;
+		#endregion
+		/// <summary>
+		/// Creates new instance of the class.
+		/// </summary>
+		public TabStripVS2005DockDisplay(){}
+
+		#region Methods
+		public override void Paint(Graphics g, TabStrip tabStrip)
+		{
+			base.Paint(g,tabStrip);
+
+			TabColorScheme colorScheme=tabStrip.ColorScheme;
+			Rectangle clientRect=tabStrip.DisplayRectangle;
+
+            if (tabStrip.BackColor != Color.Transparent || colorScheme.TabBackground != Color.Transparent)
+            {
+                if (colorScheme.TabPanelBackground2.IsEmpty)
+                {
+                    if (!colorScheme.TabPanelBackground.IsEmpty)
+                    {
+                        using (SolidBrush brush = new SolidBrush(colorScheme.TabPanelBackground))
+                            g.FillRectangle(brush, clientRect);
+                    }
+                }
+                else
+                {
+                    using (SolidBrush brush = new SolidBrush(Color.White))
+                        g.FillRectangle(brush, clientRect);
+                    using (LinearGradientBrush brush = CreateTabGradientBrush(clientRect, colorScheme.TabPanelBackground, colorScheme.TabPanelBackground2, colorScheme.TabPanelBackgroundGradientAngle))
+                        g.FillRectangle(brush, clientRect);
+                }
+            }
+
+            Rectangle selectedRect = Rectangle.Empty;
+            if (tabStrip.SelectedTab != null)
+                selectedRect = tabStrip.SelectedTab.DisplayRectangle;
+			DrawBackground(tabStrip, clientRect,g,colorScheme,new Region(tabStrip.DisplayRectangle),tabStrip.TabAlignment, selectedRect);
+
+            tabStrip.ClipExcludeSystemBox(g);
+
+			for(int i=tabStrip.Tabs.Count-1;i>=0;i--)
+			{
+				TabItem tab=tabStrip.Tabs[i];
+
+				if(!tab.Visible || tab==tabStrip.SelectedTab || !tab.DisplayRectangle.IntersectsWith(clientRect))
+					continue;
+			
+				PaintTab(g,tab,false,false);				
+			}
+
+			if(tabStrip.SelectedTab!=null && tabStrip.Tabs.Contains(tabStrip.SelectedTab))
+			{
+				PaintTab(g,tabStrip.SelectedTab,false,false);
+			}
+
+			g.ResetClip();
+			tabStrip.PaintTabSystemBox(g);
+		}
+
+		protected override GraphicsPath GetTabItemPath(TabItem tab, bool bFirst, bool bLast)
+		{
+			Rectangle r=tab.DisplayRectangle;
+			if(tab.TabAlignment==eTabStripAlignment.Right)
+				r=new Rectangle(r.X,r.Y,r.Height,r.Width);
+			else if(tab.TabAlignment==eTabStripAlignment.Left)
+                r=new Rectangle(r.X,r.Y,r.Height,r.Width);
+
+			r.Offset(0,1);
+
+			GraphicsPath path=new GraphicsPath();
+			
+			// Left line
+			path.AddPath(GetLeftLine(r),true);
+//			path.AddLine(r.X-m_xTabOffset,r.Bottom,r.X,r.Y+5);
+//			Point[] pc=new Point[3];
+//			pc[0]=new Point(r.X,r.Y+5);
+//			pc[1]=new Point(r.X+2,r.Y+2);
+//			pc[2]=new Point(r.X+5,r.Y);
+//			path.AddCurve(pc,.9f);
+
+			// Top line
+			path.AddLine(r.X+6,r.Y,r.Right-5,r.Y);
+
+			// Right line
+//			pc[0]=new Point(r.Right-5,r.Y);
+//			pc[1]=new Point(r.Right-2,r.Y+2);
+//			pc[2]=new Point(r.Right,r.Y+5);
+//			path.AddCurve(pc,.9f);
+//			path.AddLine(r.Right,r.Y+5,r.Right+m_xTabOffset,r.Bottom);
+			path.AddPath(GetRightLine(r),true);
+
+			// Bottom line
+			path.AddLine(r.Right+m_xTabOffset,r.Bottom,r.X-m_xTabOffset,r.Bottom);
+
+			path.CloseAllFigures();
+
+			if(tab.TabAlignment==eTabStripAlignment.Bottom)
+			{
+				// Bottom
+				Matrix m=new Matrix();
+				//RectangleF rf=path.GetBounds();
+				m.RotateAt(180,new PointF(r.X+r.Width/2,r.Y+r.Height/2));
+				path.Transform(m);
+			}
+			else if(tab.TabAlignment==eTabStripAlignment.Left)
+			{
+				// Left
+				Matrix m=new Matrix();
+				//RectangleF rf=path.GetBounds();
+				m.RotateAt(-90,new PointF(r.X,r.Bottom));
+				m.Translate(r.Height,r.Width-r.Height,MatrixOrder.Append);
+				path.Transform(m);
+			}
+			else if(tab.TabAlignment==eTabStripAlignment.Right)
+			{
+				// Right
+				Matrix m=new Matrix();
+				//RectangleF rf=path.GetBounds();
+				m.RotateAt(90,new PointF(r.Right,r.Bottom));
+				m.Translate(-r.Width,r.Width-(r.Height-1),MatrixOrder.Append);
+				path.Transform(m);
+			}
+
+			return path;
+		}
+
+		private GraphicsPath GetLeftLine(Rectangle r)
+		{
+			GraphicsPath path=new GraphicsPath();
+			// Left line
+			path.AddLine(r.X-m_xTabOffset,r.Bottom,r.X,r.Y+5);
+			Point[] pc=new Point[3];
+			pc[0]=new Point(r.X,r.Y+5);
+			pc[1]=new Point(r.X+2,r.Y+2);
+			pc[2]=new Point(r.X+5,r.Y);
+			path.AddCurve(pc,.9f);
+			return path;
+		}
+
+		private GraphicsPath GetRightLine(Rectangle r)
+		{
+			GraphicsPath path=new GraphicsPath();
+			// Right line
+			Point[] pc=new Point[3];
+			pc[0]=new Point(r.Right-5,r.Y);
+			pc[1]=new Point(r.Right-2,r.Y+2);
+			pc[2]=new Point(r.Right,r.Y+5);
+			path.AddCurve(pc,.9f);
+			path.AddLine(r.Right,r.Y+5,r.Right+m_xTabOffset,r.Bottom);
+			return path;
+		}
+
+        protected override void DrawBackground(TabStrip tabStrip, Rectangle tabStripRect, Graphics g, TabColorScheme colors, Region tabsRegion, eTabStripAlignment tabAlignment, Rectangle selectedTabRect)
+		{
+			base.DrawBackground(tabStrip, tabStripRect,g,colors,tabsRegion,tabAlignment, selectedTabRect);
+
+			if(!colors.TabItemBorder.IsEmpty)
+			{
+				using(Pen pen=new Pen(colors.TabItemBorder,1))
+				{
+					if(tabAlignment==eTabStripAlignment.Bottom)
+					{
+						g.DrawLine(pen,tabStripRect.X,tabStripRect.Y+1,tabStripRect.Right,tabStripRect.Y+1);
+					}
+					else if(tabAlignment==eTabStripAlignment.Left)
+					{
+						g.DrawLine(pen,tabStripRect.Right-1,tabStripRect.Y,tabStripRect.Right-1,tabStripRect.Bottom);
+					}
+					else if(tabAlignment==eTabStripAlignment.Right)
+					{
+						g.DrawLine(pen,tabStripRect.X,tabStripRect.Y,tabStripRect.X,tabStripRect.Bottom);
+					}
+					else if(tabAlignment==eTabStripAlignment.Top)
+					{
+						g.DrawLine(pen,tabStripRect.X,tabStripRect.Bottom-1,tabStripRect.Right,tabStripRect.Bottom-1);
+					}
+				}
+			}
+		}
+		#endregion
+
+		
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TabsCollection.cs b/PROMS/DotNetBar Source Code/TabsCollection.cs
new file mode 100644
index 00000000..ac8e4912
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TabsCollection.cs	
@@ -0,0 +1,157 @@
+using System;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Summary description for TabsCollection.
+	/// </summary>
+	public class TabsCollection:System.Collections.CollectionBase
+	{
+		#region Private Variables
+		private TabStrip m_Owner;
+		#endregion
+
+		#region Internal Implementation
+        private bool m_IgnoreEvents = false;
+		public TabsCollection(TabStrip owner)
+		{
+			m_Owner=owner;
+		}
+		public int Add(TabItem item)
+		{
+			m_Owner.NeedRecalcSize=true;
+			return List.Add(item);
+		}
+		public TabItem this[int index]
+		{
+			get {return (TabItem)(List[index]);}
+			set {List[index] = value;}
+		}
+
+        /// <summary>
+        /// Get the TabItem with given name. Name comparison is case insensitive.
+        /// </summary>
+        /// <param name="name"></param>
+        /// <returns></returns>
+        public TabItem this[string name]
+        {
+            get
+            {
+                if (name == null) return null;
+
+                int i = GetIndexOf(name);
+                if (i >= 0)
+                    return this[i];
+
+                return null;
+            }
+            set
+            {
+                int i = GetIndexOf(name);
+                if (i >= 0)
+                    List[i] = value;
+            }
+        }
+
+        private int GetIndexOf(string name)
+        {
+            name = name.ToLower();
+            for (int i = 0; i < this.Count; i++)
+            {
+                if (this[i].Name.ToLower() == name) return i;
+            }
+            return -1;
+        }
+
+		public void Insert(int index, TabItem value) 
+		{
+			value.Visible=true;
+			m_Owner.NeedRecalcSize=true;
+			List.Insert(index, value);
+		}
+
+        internal void _Insert(int index, TabItem value)
+        {
+            m_IgnoreEvents = true;
+            try
+            {
+                value.Visible = true;
+                m_Owner.NeedRecalcSize = true;
+                List.Insert(index, value);
+            }
+            finally
+            {
+                m_IgnoreEvents = false;
+            }
+        }
+
+		public int IndexOf(TabItem value) 
+		{
+			return List.IndexOf(value);
+		}
+
+		public bool Contains(TabItem value) 
+		{
+			return List.Contains(value);
+		}
+
+		public void Remove(TabItem value) 
+		{
+			List.Remove(value);
+		}
+
+        internal void _Remove(TabItem value)
+        {
+            m_IgnoreEvents = true;
+            try
+            {
+                List.Remove(value);
+            }
+            finally
+            {
+                m_IgnoreEvents = false;
+            }
+        }
+
+		protected override void OnRemoveComplete(int index,object value)
+		{
+			base.OnRemoveComplete(index,value);
+            if (m_IgnoreEvents) return;
+			TabItem item=value as TabItem;
+			m_Owner.InvokeTabRemoved(item);
+			item.SetParent(null);
+			item.Visible=true;
+			if(m_Owner.SelectedTab==item)
+			{
+				m_Owner.OnSelectedTabRemoved(index, item);
+			}
+
+			m_Owner.NeedRecalcSize=true;
+			if(m_Owner.IsDesignMode)
+				m_Owner.Refresh();
+		}
+		protected override void OnInsertComplete(int index,object value)
+		{
+			base.OnInsertComplete(index,value);
+            if (m_IgnoreEvents) return;
+			TabItem item=value as TabItem;
+			item.SetParent(m_Owner);
+			//item.Visible=true;
+			m_Owner.OnTabAdded(item);
+			m_Owner.NeedRecalcSize=true;
+			if(m_Owner.IsDesignMode)
+				m_Owner.Refresh();
+		}
+
+		public void CopyTo(TabItem[] array, int index) 
+		{
+			List.CopyTo(array, index);
+		}
+		protected override void OnClear()
+		{
+			m_Owner.InternalTabsCleared();
+			base.OnClear();
+		}
+		#endregion
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TaskDialog/TaskDialog.cs b/PROMS/DotNetBar Source Code/TaskDialog/TaskDialog.cs
new file mode 100644
index 00000000..34b898fa
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TaskDialog/TaskDialog.cs	
@@ -0,0 +1,660 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows.Forms;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represent a task-dialog message box window.
+    /// </summary>
+    public static class TaskDialog
+    {
+        /// <summary>
+        /// Displays TaskDialog message.
+        /// </summary>
+        /// <param name="dialogTitle">Title of the window.</param>
+        /// <param name="dialogHeader">Task dialog header.</param>
+        /// <param name="dialogText">Task dialog text.</param>
+        /// <param name="dialogButtons">Displayed buttons.</param>
+        /// <returns>Result from task-dialog.</returns>
+        public static eTaskDialogResult Show(string dialogTitle, string dialogHeader, string dialogText, eTaskDialogButton dialogButtons)
+        {
+            TaskDialogInfo info = new TaskDialogInfo(dialogTitle, eTaskDialogIcon.Information, dialogHeader, dialogText, dialogButtons);
+            return Show(info);
+        }
+
+        /// <summary>
+        /// Displays TaskDialog message.
+        /// </summary>
+        /// <param name="dialogTitle">Title of the window.</param>
+        /// <param name="dialogHeader">Task dialog header.</param>
+        /// <param name="dialogText">Task dialog text.</param>
+        /// <param name="dialogButtons">Displayed buttons.</param>
+        /// <param name="dialogColor">Specifies the predefined color for the dialog.</param>
+        /// <returns>Result from task-dialog.</returns>
+        public static eTaskDialogResult Show(string dialogTitle, string dialogHeader, string dialogText, eTaskDialogButton dialogButtons, eTaskDialogBackgroundColor dialogColor)
+        {
+            TaskDialogInfo info = new TaskDialogInfo(dialogTitle, eTaskDialogIcon.Information, dialogHeader, dialogText, dialogButtons, dialogColor);
+            return Show(info);
+        }
+
+        /// <summary>
+        /// Displays TaskDialog message.
+        /// </summary>
+        /// <param name="dialogTitle">Title of the window.</param>
+        /// <param name="dialogIcon">Icon displayed on dialog.</param>
+        /// <param name="dialogHeader">Task dialog header.</param>
+        /// <param name="dialogText">Task dialog text.</param>
+        /// <param name="dialogButtons">Displayed buttons.</param>
+        /// <returns>Result from task-dialog.</returns>
+        public static eTaskDialogResult Show(string dialogTitle, eTaskDialogIcon dialogIcon, string dialogHeader, string dialogText, eTaskDialogButton dialogButtons)
+        {
+            TaskDialogInfo info = new TaskDialogInfo(dialogTitle, dialogIcon, dialogHeader, dialogText, dialogButtons);
+            return Show(info);
+        }
+
+        /// <summary>
+        /// Displays TaskDialog message.
+        /// </summary>
+        /// <param name="dialogTitle">Title of the window.</param>
+        /// <param name="dialogIcon">Icon displayed on dialog.</param>
+        /// <param name="dialogHeader">Task dialog header.</param>
+        /// <param name="dialogText">Task dialog text.</param>
+        /// <param name="dialogButtons">Displayed buttons.</param>
+        /// <param name="dialogColor">Specifies the predefined color for the dialog.</param>
+        /// <returns>Result from task-dialog.</returns>
+        public static eTaskDialogResult Show(string dialogTitle, eTaskDialogIcon dialogIcon, string dialogHeader, string dialogText, eTaskDialogButton dialogButtons, eTaskDialogBackgroundColor dialogColor)
+        {
+            TaskDialogInfo info = new TaskDialogInfo(dialogTitle, dialogIcon, dialogHeader, dialogText, dialogButtons, dialogColor);
+            return Show(info);
+        }
+
+        /// <summary>
+        /// Displays TaskDialog message.
+        /// </summary>
+        /// <param name="info">Specifies the content of the task dialog.</param>
+        /// <returns>Result from task-dialog.</returns>
+        public static eTaskDialogResult Show(TaskDialogInfo info)
+        {
+            return Show(null, info);
+        }
+
+        private static TaskDialogForm _TaskDialogForm = null;
+        /// <summary>
+        /// Displays TaskDialog message.
+        /// </summary>
+        /// <param name="owner">Window owner of the task dialog.</param>
+        /// <param name="info">Specifies the content of the task dialog.</param>
+        /// <returns>Result from task-dialog.</returns>
+        public static eTaskDialogResult Show(IWin32Window owner, TaskDialogInfo info)
+        {
+            eTaskDialogResult result = eTaskDialogResult.None;
+            TaskDialogForm taskDialog = new TaskDialogForm();
+            try
+            {
+                _TaskDialogForm = taskDialog;
+                if (!_AntiAlias)
+                    taskDialog.AntiAlias = _AntiAlias;
+                taskDialog.EnableGlass = _EnableGlass && !StyleManager.IsMetro(StyleManager.Style);
+                taskDialog.TopMost = info.TopMost;
+                if (!info.FormCloseEnabled)
+                    taskDialog.CloseEnabled = false;
+                taskDialog.ShowTaskDialog(owner, info);
+                result = taskDialog.Result;
+            }
+            finally
+            {
+                taskDialog.Dispose();
+                _TaskDialogForm = null;
+            }
+            return result;
+        }
+
+        /// <summary>
+        /// Closes the task dialog if it is open with eTaskDialogResult.None result.
+        /// </summary>
+        public static void Close()
+        {
+            Close(eTaskDialogResult.None);
+        }
+        /// <summary>
+        /// Closes the task dialog if it is open with specified result value.
+        /// </summary>
+        /// <param name="result">Value that will be used as return value from Show method.</param>
+        public static void Close(eTaskDialogResult result)
+        {
+            if (_TaskDialogForm == null)
+                throw new NullReferenceException("Task Dialog Form is not shown.");
+            _TaskDialogForm.CloseDialog(result);
+        }
+
+        private static bool _EnableGlass = true;
+        /// <summary>
+        /// Gets or sets whether TaskDialog form has Windows Vista Glass enabled if running on 
+        /// Windows Vista with Glass enabled. Default value is true.
+        /// </summary>
+        public static bool EnableGlass
+        {
+            get { return _EnableGlass; }
+            set
+            {
+                _EnableGlass = value;
+            }
+        }
+
+        private static bool _AntiAlias = true;
+        /// <summary>
+        /// Gets or sets the anti-alias text-rendering setting for the controls on task-dialog. Default value is true.
+        /// </summary>
+        public static bool AntiAlias
+        {
+            get { return _AntiAlias; }
+            set
+            {
+                _AntiAlias = value;
+            }
+        }
+        
+
+        internal static Image GetImage(eTaskDialogIcon icon)
+        {
+            if (icon == eTaskDialogIcon.None) return null;
+            return BarFunctions.LoadBitmap("SystemImages.Task" + icon.ToString() + ".png");
+        }
+
+        /// <summary>
+        /// Occurs when any text markup link on Task-Dialog Box is clicked. Markup links can be created using "a" tag, for example:
+        /// <a name="MyLink">Markup link</a>
+        /// </summary>
+        public static event MarkupLinkClickEventHandler MarkupLinkClick;
+
+        internal static void InvokeMarkupLinkClick(object sender, MarkupLinkClickEventArgs e)
+        {
+            MarkupLinkClickEventHandler h = MarkupLinkClick;
+            if (h != null)
+                h(sender, e);
+        }
+    }
+
+    /// <summary>
+    /// Specifies the information displayed on task-dialog.
+    /// </summary>
+    public struct TaskDialogInfo
+    {
+        /// <summary>
+        /// Initializes a new instance of the TaskDialogInfo structure.
+        /// </summary>
+        /// <param name="title">Title of dialog.</param>
+        /// <param name="taskDialogIcon">Task-dialog icon</param>
+        /// <param name="header">Header text.</param>
+        /// <param name="text">Dialog main/content text.</param>
+        /// <param name="dialogButtons">Dialog buttons displayed.</param>
+        /// <param name="dialogColor">Dialog background color.</param>
+        /// <param name="radioButtons">Radio Button Commands</param>
+        /// <param name="buttons">Button commands.</param>
+        /// <param name="checkBoxCommand">Check-box command.</param>
+        /// <param name="footerText">Footer text</param>
+        /// <param name="footerImage">Footer image.</param>
+        public TaskDialogInfo(string title, eTaskDialogIcon taskDialogIcon, string header, string text, eTaskDialogButton dialogButtons, eTaskDialogBackgroundColor dialogColor, Command[] radioButtons, Command[] buttons, Command checkBoxCommand, string footerText, Image footerImage)
+        {
+            _Title = title;
+            _Header = header;
+            _Text = text;
+            _DialogButtons = dialogButtons;
+            _DialogColor = dialogColor;
+            _RadioButtons = radioButtons;
+            _Buttons = buttons;
+            _FooterText = footerText;
+            _CheckBoxCommand = checkBoxCommand;
+            _TaskDialogIcon = taskDialogIcon;
+            _FooterImage = footerImage;
+            _TopMost = false;
+            _DefaultButton = eTaskDialogButton.Ok;
+            _FormCloseEnabled = true;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the TaskDialogInfo structure.
+        /// </summary>
+        /// <param name="title">Title of dialog.</param>
+        /// <param name="taskDialogIcon">Task-dialog icon</param>
+        /// <param name="header">Header text.</param>
+        /// <param name="text">Dialog main/content text.</param>
+        /// <param name="dialogButtons">Dialog buttons displayed.</param>
+        /// <param name="dialogColor">Dialog background color.</param>
+        /// <param name="radioButtons">Radio Button Commands</param>
+        /// <param name="buttons">Button commands.</param>
+        /// <param name="checkBoxCommand">Check-box command.</param>
+        /// <param name="footerText">Footer text</param>
+        /// <param name="footerImage">Footer image.</param>
+        /// <param name="topMost">Indicates whether TaskDialog is top most.</param>
+        public TaskDialogInfo(string title, eTaskDialogIcon taskDialogIcon, string header, string text, eTaskDialogButton dialogButtons, eTaskDialogBackgroundColor dialogColor, Command[] radioButtons, Command[] buttons, Command checkBoxCommand, string footerText, Image footerImage, bool topMost)
+        {
+            _Title = title;
+            _Header = header;
+            _Text = text;
+            _DialogButtons = dialogButtons;
+            _DialogColor = dialogColor;
+            _RadioButtons = radioButtons;
+            _Buttons = buttons;
+            _FooterText = footerText;
+            _CheckBoxCommand = checkBoxCommand;
+            _TaskDialogIcon = taskDialogIcon;
+            _FooterImage = footerImage;
+            _TopMost = topMost;
+            _DefaultButton = eTaskDialogButton.Ok;
+            _FormCloseEnabled = true;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the TaskDialogInfo structure.
+        /// </summary>
+        /// <param name="title">Title of dialog.</param>
+        /// <param name="taskDialogIcon">Task-dialog icon</param>
+        /// <param name="header">Header text.</param>
+        /// <param name="text">Dialog main/content text.</param>
+        /// <param name="dialogButtons">Dialog buttons displayed.</param>
+        /// <param name="dialogColor">Dialog background color.</param>
+        public TaskDialogInfo(string title, eTaskDialogIcon taskDialogIcon, string header, string text, eTaskDialogButton dialogButtons, eTaskDialogBackgroundColor dialogColor)
+        {
+            _Title = title;
+            _Header = header;
+            _Text = text;
+            _DialogButtons = dialogButtons;
+            _DialogColor = dialogColor;
+            _RadioButtons = null;
+            _Buttons = null;
+            _FooterText = null;
+            _CheckBoxCommand = null;
+            _TaskDialogIcon = taskDialogIcon;
+            _FooterImage = null;
+            _TopMost = false;
+            _DefaultButton = eTaskDialogButton.Ok;
+            _FormCloseEnabled = true;
+        }
+
+
+        /// <summary>
+        /// Initializes a new instance of the TaskDialogInfo structure.
+        /// </summary>
+        /// <param name="title">Title of dialog.</param>
+        /// <param name="taskDialogIcon">Task-dialog icon</param>
+        /// <param name="header">Header text.</param>
+        /// <param name="text">Dialog main/content text.</param>
+        /// <param name="dialogButtons">Dialog buttons displayed.</param>
+        public TaskDialogInfo(string title, eTaskDialogIcon taskDialogIcon, string header, string text, eTaskDialogButton dialogButtons)
+        {
+            _Title = title;
+            _Header = header;
+            _Text = text;
+            _DialogButtons = dialogButtons;
+            _DialogColor = eTaskDialogBackgroundColor.Default;
+            _RadioButtons = null;
+            _Buttons = null;
+            _FooterText = null;
+            _CheckBoxCommand = null;
+            _TaskDialogIcon = taskDialogIcon;
+            _FooterImage = null;
+            _TopMost = false;
+            _DefaultButton = eTaskDialogButton.Ok;
+            _FormCloseEnabled = true;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the TaskDialogInfo structure.
+        /// </summary>
+        /// <param name="title">Title of dialog.</param>
+        /// <param name="taskDialogIcon">Task-dialog icon</param>
+        /// <param name="header">Header text.</param>
+        /// <param name="text">Dialog main/content text.</param>
+        /// <param name="dialogButtons">Dialog buttons displayed.</param>
+        public TaskDialogInfo(string title, eTaskDialogIcon taskDialogIcon, string header, string text, eTaskDialogButton dialogButtons, eTaskDialogButton defaultButton)
+        {
+            _Title = title;
+            _Header = header;
+            _Text = text;
+            _DialogButtons = dialogButtons;
+            _DialogColor = eTaskDialogBackgroundColor.Default;
+            _RadioButtons = null;
+            _Buttons = null;
+            _FooterText = null;
+            _CheckBoxCommand = null;
+            _TaskDialogIcon = taskDialogIcon;
+            _FooterImage = null;
+            _TopMost = false;
+            _DefaultButton = defaultButton;
+            _FormCloseEnabled = true;
+        }
+
+        private string _Title;
+        /// <summary>
+        /// Gets or sets the task-dialog window title.
+        /// </summary>
+        public string Title
+        {
+            get { return _Title; }
+            set
+            {
+                _Title = value;
+            }
+        }
+
+        private string _Header;
+        /// <summary>
+        /// Gets or sets the task-dialog header.
+        /// </summary>
+        public string Header
+        {
+            get { return _Header; }
+            set
+            {
+                _Header = value;
+            }
+        }
+
+        private string _Text;
+        /// <summary>
+        /// Gets or sets the task-dialog text.
+        /// </summary>
+        public string Text
+        {
+            get { return _Text; }
+            set
+            {
+                _Text = value;
+            }
+        }
+
+        private eTaskDialogButton _DialogButtons;
+        /// <summary>
+        /// Gets or sets the task-dialog buttons displayed.
+        /// </summary>
+        public eTaskDialogButton DialogButtons
+        {
+            get { return _DialogButtons; }
+            set { _DialogButtons = value; }
+        }
+
+        private eTaskDialogBackgroundColor _DialogColor;
+        /// <summary>
+        /// Gets or sets the task-dialog background color.
+        /// </summary>
+        public eTaskDialogBackgroundColor DialogColor
+        {
+            get { return _DialogColor; }
+            set { _DialogColor = value; }
+        }
+
+        private Command[] _RadioButtons;
+        /// <summary>
+        /// Gets or sets the array of commands that will be used to create the radio-buttons displayed on task-dialog. Each command will be executed as radio-buttons are checked by user.
+        /// </summary>
+        public Command[] RadioButtons
+        {
+            get { return _RadioButtons; }
+            set { _RadioButtons = value; }
+        }
+
+        private Command[] _Buttons;
+        /// <summary>
+        /// Gets or sets the array of commands that will be used to create the buttons displayed on task-dialog. Each command will be executed as buttons are clicked by user.
+        /// </summary>
+        public Command[] Buttons
+        {
+            get { return _Buttons; }
+            set { _Buttons = value; }
+        }
+
+        private string _FooterText;
+        /// <summary>
+        /// Gets or sets the footer text displayed on task-dialog.
+        /// </summary>
+        public string FooterText
+        {
+            get { return _FooterText; }
+            set
+            {
+                _FooterText = value;
+            }
+        }
+
+        private Command _CheckBoxCommand;
+        /// <summary>
+        /// Gets or sets the command that is used to initialize the footer check-box. Command will be executed when check-box state changes by end user.
+        /// </summary>
+        public Command CheckBoxCommand
+        {
+            get { return _CheckBoxCommand; }
+            set { _CheckBoxCommand = value; }
+        }
+
+        private eTaskDialogIcon _TaskDialogIcon;
+        /// <summary>
+        /// Gets or sets the icon that is displayed on task dialog.
+        /// </summary>
+        public eTaskDialogIcon TaskDialogIcon
+        {
+            get { return _TaskDialogIcon; }
+            set { _TaskDialogIcon = value; }
+        }
+
+        private Image _FooterImage;
+        /// <summary>
+        /// Gets or sets the image that is displayed in the task-dialog footer. Expected image size is 16x16 pixels.
+        /// </summary>
+        public Image FooterImage
+        {
+            get { return _FooterImage; }
+            set { _FooterImage = value; }
+        }
+
+        private bool _TopMost;
+        /// <summary>
+        ///  Gets or sets whether TaskDialog form is top-most. Default value is false.
+        /// </summary>
+        public bool TopMost
+        {
+            get { return _TopMost; }
+            set
+            {
+                _TopMost = value;
+            }
+        }
+
+        private eTaskDialogButton _DefaultButton;
+        /// <summary>
+        /// Gets or sets the TaskDialog default button.
+        /// </summary>
+        public eTaskDialogButton DefaultButton
+        {
+            get { return _DefaultButton; }
+            set { _DefaultButton = value; }
+        }
+
+        private bool _FormCloseEnabled;
+        /// <summary>
+        /// Indicates whether task dialog form close button is enabled, default value is true.
+        /// </summary>
+        public bool FormCloseEnabled
+        {
+            get { return _FormCloseEnabled; }
+            set
+            {
+                _FormCloseEnabled = value;
+            }
+        }
+        
+    }
+
+    /// <summary>
+    /// Specifies the task dialog buttons.
+    /// </summary>
+    [Flags]
+    public enum eTaskDialogButton
+    {
+        /// <summary>
+        /// OK button will be displayed.
+        /// </summary>
+        Ok = 1,
+        /// <summary>
+        /// Yes button will be displayed.
+        /// </summary>
+        Yes = 2,
+        /// <summary>
+        /// No button will be displayed.
+        /// </summary>
+        No = 4,
+        /// <summary>
+        /// Cancel button will be displayed.
+        /// </summary>
+        Cancel = 8,
+        /// <summary>
+        /// Retry button will be displayed.
+        /// </summary>
+        Retry = 16,
+        /// <summary>
+        /// Close button will be displayed.
+        /// </summary>
+        Close = 32
+    }
+
+    /// <summary>
+    /// Specifies the task dialog return values.
+    /// </summary>
+    public enum eTaskDialogResult
+    {
+        /// <summary>
+        /// No button was clicked because dialog was closed using TaskDialog.Close method.
+        /// </summary>
+        None,
+        /// <summary>
+        /// OK button was clicked.
+        /// </summary>
+        Ok,
+        /// <summary>
+        /// Yes button was clicked.
+        /// </summary>
+        Yes,
+        /// <summary>
+        /// No button was clicked.
+        /// </summary>
+        No,
+        /// <summary>
+        /// Cancel button was clicked.
+        /// </summary>
+        Cancel,
+        /// <summary>
+        /// Retry button was clicked.
+        /// </summary>
+        Retry,
+        /// <summary>
+        /// Close button was clicked.
+        /// </summary>
+        Close,
+        /// <summary>
+        /// Specifies the custom result. Custom result can be specified if TaskDialog.Close method is called to close dialog.
+        /// </summary>
+        Custom1,
+        /// <summary>
+        /// Specifies the custom result. Custom result can be specified if TaskDialog.Close method is called to close dialog.
+        /// </summary>
+        Custom2,
+        /// <summary>
+        /// Specifies the custom result. Custom result can be specified if TaskDialog.Close method is called to close dialog.
+        /// </summary>
+        Custom3
+    }
+
+    /// <summary>
+    /// Define icons available on TaskDialog.
+    /// </summary>
+    public enum eTaskDialogIcon
+    {
+        /// <summary>
+        /// No icon.
+        /// </summary>
+        None,
+        /// <summary>
+        /// Blue flag icon.
+        /// </summary>
+        BlueFlag,
+        /// <summary>
+        /// Blue stop icon.
+        /// </summary>
+        BlueStop,
+        /// <summary>
+        /// Light bulb, idea icon.
+        /// </summary>
+        Bulb,
+        /// <summary>
+        /// Check-mark icon.
+        /// </summary>
+        CheckMark,
+        /// <summary>
+        /// Check-mark icon.
+        /// </summary>
+        CheckMark2,
+        /// <summary>
+        /// Trash-can delete icon.
+        /// </summary>
+        Delete,
+        /// <summary>
+        /// Exclamation icon.
+        /// </summary>
+        Exclamation,
+        /// <summary>
+        /// Flag icon.
+        /// </summary>
+        Flag,
+        /// <summary>
+        /// Hand-stop icon.
+        /// </summary>
+        Hand,
+        /// <summary>
+        /// Help icon.
+        /// </summary>
+        Help,
+        /// <summary>
+        /// Informational icon.
+        /// </summary>
+        Information,
+        /// <summary>
+        /// Informational icon.
+        /// </summary>
+        Information2,
+        /// <summary>
+        /// No entry icon.
+        /// </summary>
+        NoEntry,
+        /// <summary>
+        /// Shield icon.
+        /// </summary>
+        Shield,
+        /// <summary>
+        /// Shield help icon.
+        /// </summary>
+        ShieldHelp,
+        /// <summary>
+        /// Shield OK icon.
+        /// </summary>
+        ShieldOk,
+        /// <summary>
+        /// Shield stop icon.
+        /// </summary>
+        ShieldStop,
+        /// <summary>
+        /// Stop icon.
+        /// </summary>
+        Stop,
+        /// <summary>
+        /// Stop icon.
+        /// </summary>
+        Stop2,
+        /// <summary>
+        /// Users icons.
+        /// </summary>
+        Users
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/TaskDialog/TaskDialogForm.Designer.cs b/PROMS/DotNetBar Source Code/TaskDialog/TaskDialogForm.Designer.cs
new file mode 100644
index 00000000..f87e7e89
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TaskDialog/TaskDialogForm.Designer.cs	
@@ -0,0 +1,350 @@
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar
+{
+    partial class TaskDialogForm
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form 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.headerImage = new System.Windows.Forms.PictureBox();
+            this.headerLabel = new DevComponents.DotNetBar.LabelX();
+            this.contentLabel = new DevComponents.DotNetBar.LabelX();
+            this.buttonsPanel = new DevComponents.DotNetBar.ItemPanel();
+            this.bottomPanel = new DevComponents.DotNetBar.PanelEx();
+            this.footerLabel = new DevComponents.DotNetBar.LabelX();
+            this.footerImage = new System.Windows.Forms.PictureBox();
+            this.taskCheckBox = new DevComponents.DotNetBar.Controls.CheckBoxX();
+            this.footerPanel = new DevComponents.DotNetBar.PanelEx();
+            this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();
+            this.buttonClose = new DevComponents.DotNetBar.ButtonX();
+            this.buttonRetry = new DevComponents.DotNetBar.ButtonX();
+            this.buttonCancel = new DevComponents.DotNetBar.ButtonX();
+            this.buttonOk = new DevComponents.DotNetBar.ButtonX();
+            this.buttonNo = new DevComponents.DotNetBar.ButtonX();
+            this.buttonYes = new DevComponents.DotNetBar.ButtonX();
+            ((System.ComponentModel.ISupportInitialize)(this.headerImage)).BeginInit();
+            this.bottomPanel.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.footerImage)).BeginInit();
+            this.flowLayoutPanel1.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // headerImage
+            // 
+            this.headerImage.Location = new System.Drawing.Point(12, 12);
+            this.headerImage.Name = "headerImage";
+            this.headerImage.Size = new System.Drawing.Size(32, 32);
+            this.headerImage.SizeMode = PictureBoxSizeMode.Zoom;
+            this.headerImage.TabIndex = 0;
+            this.headerImage.TabStop = false;
+            // 
+            // headerLabel
+            // 
+            this.headerLabel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                        | System.Windows.Forms.AnchorStyles.Right)));
+            // 
+            // 
+            // 
+            this.headerLabel.BackgroundStyle.Class = "";
+            this.headerLabel.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.headerLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.headerLabel.Location = new System.Drawing.Point(50, 12);
+            this.headerLabel.Name = "headerLabel";
+            this.headerLabel.Size = new System.Drawing.Size(444, 32);
+            this.headerLabel.TabIndex = 0;
+            this.headerLabel.Text = "Task Dialog Header Instructions";
+            this.headerLabel.TextLineAlignment = System.Drawing.StringAlignment.Near;
+            this.headerLabel.WordWrap = true;
+            // 
+            // contentLabel
+            // 
+            this.contentLabel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                        | System.Windows.Forms.AnchorStyles.Right)));
+            // 
+            // 
+            // 
+            this.contentLabel.BackgroundStyle.Class = "";
+            this.contentLabel.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.contentLabel.Location = new System.Drawing.Point(50, 60);
+            this.contentLabel.Name = "contentLabel";
+            this.contentLabel.Size = new System.Drawing.Size(444, 35);
+            this.contentLabel.TabIndex = 1;
+            this.contentLabel.Text = "Task Dialog actual content of the dialog with some instructions and more text wit" +
+                "h text-markup support and word wrapping.";
+            this.contentLabel.TextLineAlignment = System.Drawing.StringAlignment.Near;
+            this.contentLabel.WordWrap = true;
+            // 
+            // buttonsPanel
+            // 
+            this.buttonsPanel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                        | System.Windows.Forms.AnchorStyles.Right)));
+            // 
+            // 
+            // 
+            this.buttonsPanel.BackgroundStyle.Class = "";
+            this.buttonsPanel.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.buttonsPanel.ContainerControlProcessDialogKey = true;
+            this.buttonsPanel.LayoutOrientation = DevComponents.DotNetBar.eOrientation.Vertical;
+#if !TRIAL
+            this.buttonsPanel.LicenseKey = "F962CEC7-CD8F-4911-A9E9-CAB39962FC1F";
+#endif
+            this.buttonsPanel.Location = new System.Drawing.Point(50, 101);
+            this.buttonsPanel.Name = "buttonsPanel";
+            this.buttonsPanel.Size = new System.Drawing.Size(444, 120);
+            this.buttonsPanel.TabIndex = 2;
+            this.buttonsPanel.Text = "itemPanel1";
+            // 
+            // bottomPanel
+            // 
+            this.bottomPanel.CanvasColor = System.Drawing.SystemColors.Control;
+            this.bottomPanel.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.bottomPanel.Controls.Add(this.footerLabel);
+            this.bottomPanel.Controls.Add(this.footerImage);
+            this.bottomPanel.Controls.Add(this.taskCheckBox);
+            this.bottomPanel.Controls.Add(this.footerPanel);
+            this.bottomPanel.Controls.Add(this.flowLayoutPanel1);
+            this.bottomPanel.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.bottomPanel.Location = new System.Drawing.Point(0, 240);
+            this.bottomPanel.Name = "bottomPanel";
+            this.bottomPanel.Padding = new System.Windows.Forms.Padding(3, 3, 3, 0);
+            this.bottomPanel.Size = new System.Drawing.Size(506, 70);
+            this.bottomPanel.Style.Alignment = System.Drawing.StringAlignment.Center;
+            this.bottomPanel.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(227)))), ((int)(((byte)(239)))), ((int)(((byte)(255)))));
+            this.bottomPanel.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+            this.bottomPanel.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder;
+            this.bottomPanel.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.Top;
+            this.bottomPanel.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
+            this.bottomPanel.Style.GradientAngle = 90;
+            this.bottomPanel.TabIndex = 0;
+            // 
+            // footerLabel
+            // 
+            this.footerLabel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                        | System.Windows.Forms.AnchorStyles.Right)));
+            // 
+            // 
+            // 
+            this.footerLabel.BackgroundStyle.Class = "";
+            this.footerLabel.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.footerLabel.Location = new System.Drawing.Point(33, 49);
+            this.footerLabel.Name = "footerLabel";
+            this.footerLabel.Size = new System.Drawing.Size(467, 15);
+            this.footerLabel.TabIndex = 2;
+            this.footerLabel.Text = "Footer Label with text-markup support";
+            // 
+            // footerImage
+            // 
+            this.footerImage.Location = new System.Drawing.Point(8, 48);
+            this.footerImage.Name = "footerImage";
+            this.footerImage.Size = new System.Drawing.Size(16, 16);
+            this.footerImage.TabIndex = 8;
+            this.footerImage.SizeMode = PictureBoxSizeMode.Zoom;
+            this.footerImage.TabStop = false;
+            // 
+            // taskCheckBox
+            // 
+            this.taskCheckBox.AutoSize = true;
+            // 
+            // 
+            // 
+            this.taskCheckBox.BackgroundStyle.Class = "";
+            this.taskCheckBox.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.taskCheckBox.Location = new System.Drawing.Point(3, 10);
+            this.taskCheckBox.Name = "taskCheckBox";
+            this.taskCheckBox.Size = new System.Drawing.Size(75, 15);
+            this.taskCheckBox.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.taskCheckBox.TabIndex = 10;
+            this.taskCheckBox.Text = "Check-box";
+            // 
+            // footerPanel
+            // 
+            this.footerPanel.CanvasColor = System.Drawing.SystemColors.Control;
+            this.footerPanel.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.footerPanel.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.footerPanel.Location = new System.Drawing.Point(3, 40);
+            this.footerPanel.Name = "footerPanel";
+            this.footerPanel.Size = new System.Drawing.Size(500, 30);
+            this.footerPanel.Style.Alignment = System.Drawing.StringAlignment.Center;
+            this.footerPanel.Style.Border = DevComponents.DotNetBar.eBorderType.Raised;
+            this.footerPanel.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder;
+            this.footerPanel.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.Top;
+            this.footerPanel.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
+            this.footerPanel.Style.GradientAngle = 90;
+            this.footerPanel.TabIndex = 10;
+            // 
+            // flowLayoutPanel1
+            // 
+            this.flowLayoutPanel1.Controls.Add(this.buttonClose);
+            this.flowLayoutPanel1.Controls.Add(this.buttonCancel);
+            this.flowLayoutPanel1.Controls.Add(this.buttonOk);
+            this.flowLayoutPanel1.Controls.Add(this.buttonRetry);
+            this.flowLayoutPanel1.Controls.Add(this.buttonNo);
+            this.flowLayoutPanel1.Controls.Add(this.buttonYes);
+            this.flowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Top;
+            this.flowLayoutPanel1.FlowDirection = System.Windows.Forms.FlowDirection.RightToLeft;
+            this.flowLayoutPanel1.Location = new System.Drawing.Point(3, 3);
+            this.flowLayoutPanel1.Name = "flowLayoutPanel1";
+            this.flowLayoutPanel1.Size = new System.Drawing.Size(500, 35);
+            this.flowLayoutPanel1.TabIndex = 0;
+            this.flowLayoutPanel1.WrapContents = false;
+            // 
+            // buttonClose
+            // 
+            this.buttonClose.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+            this.buttonClose.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+            this.buttonClose.Location = new System.Drawing.Point(436, 5);
+            this.buttonClose.Margin = new System.Windows.Forms.Padding(3, 5, 3, 3);
+            this.buttonClose.Name = "buttonClose";
+            this.buttonClose.Size = new System.Drawing.Size(61, 24);
+            this.buttonClose.MinimumSize = new System.Drawing.Size(61, 24);
+            this.buttonClose.AutoSize = true;
+            this.buttonClose.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.buttonClose.TabIndex = 5;
+            this.buttonClose.Text = "&Close";
+            this.buttonClose.Click += new System.EventHandler(this.buttonClose_Click);
+            // 
+            // buttonRetry
+            // 
+            this.buttonRetry.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+            this.buttonRetry.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+            this.buttonRetry.Location = new System.Drawing.Point(369, 5);
+            this.buttonRetry.Margin = new System.Windows.Forms.Padding(3, 5, 3, 3);
+            this.buttonRetry.Name = "buttonRetry";
+            this.buttonRetry.Size = new System.Drawing.Size(61, 24);
+            this.buttonRetry.MinimumSize = new System.Drawing.Size(61, 24);
+            this.buttonRetry.AutoSize = true;
+            this.buttonRetry.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.buttonRetry.TabIndex = 4;
+            this.buttonRetry.Text = "&Retry";
+            this.buttonRetry.Click += new System.EventHandler(this.buttonRetry_Click);
+            // 
+            // buttonCancel
+            // 
+            this.buttonCancel.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+            this.buttonCancel.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+            this.buttonCancel.Location = new System.Drawing.Point(302, 5);
+            this.buttonCancel.Margin = new System.Windows.Forms.Padding(3, 5, 3, 3);
+            this.buttonCancel.Name = "buttonCancel";
+            this.buttonCancel.Size = new System.Drawing.Size(61, 24);
+            this.buttonCancel.MinimumSize = new System.Drawing.Size(61, 24);
+            this.buttonCancel.AutoSize = true;
+            this.buttonCancel.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.buttonCancel.TabIndex = 3;
+            this.buttonCancel.Text = "&Cancel";
+            this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click);
+            // 
+            // buttonOk
+            // 
+            this.buttonOk.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+            this.buttonOk.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+            this.buttonOk.Location = new System.Drawing.Point(235, 5);
+            this.buttonOk.Margin = new System.Windows.Forms.Padding(3, 5, 3, 3);
+            this.buttonOk.Name = "buttonOk";
+            this.buttonOk.Size = new System.Drawing.Size(61, 24);
+            this.buttonOk.MinimumSize = new System.Drawing.Size(61, 24);
+            this.buttonOk.AutoSize = true;
+            this.buttonOk.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.buttonOk.TabIndex = 2;
+            this.buttonOk.Text = "&OK";
+            this.buttonOk.Click += new System.EventHandler(this.buttonOk_Click);
+            // 
+            // buttonNo
+            // 
+            this.buttonNo.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+            this.buttonNo.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+            this.buttonNo.Location = new System.Drawing.Point(168, 5);
+            this.buttonNo.Margin = new System.Windows.Forms.Padding(3, 5, 3, 3);
+            this.buttonNo.Name = "buttonNo";
+            this.buttonNo.Size = new System.Drawing.Size(61, 24);
+            this.buttonNo.MinimumSize = new System.Drawing.Size(61, 24);
+            this.buttonNo.AutoSize = true;
+            this.buttonNo.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.buttonNo.TabIndex = 1;
+            this.buttonNo.Text = "&No";
+            this.buttonNo.Click += new System.EventHandler(this.buttonNo_Click);
+            // 
+            // buttonYes
+            // 
+            this.buttonYes.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+            this.buttonYes.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+            this.buttonYes.Location = new System.Drawing.Point(101, 5);
+            this.buttonYes.Margin = new System.Windows.Forms.Padding(3, 5, 3, 3);
+            this.buttonYes.Name = "buttonYes";
+            this.buttonYes.Size = new System.Drawing.Size(61, 24);
+            this.buttonYes.MinimumSize = new System.Drawing.Size(61, 24);
+            this.buttonYes.AutoSize = true;
+            this.buttonYes.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.buttonYes.TabIndex = 0;
+            this.buttonYes.Text = "&Yes";
+            this.buttonYes.Click += new System.EventHandler(this.buttonYes_Click);
+            // 
+            // TaskDialogForm
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+            this.BackColor = System.Drawing.Color.White;
+            this.ClientSize = new System.Drawing.Size(506, 310);
+            this.Controls.Add(this.bottomPanel);
+            this.Controls.Add(this.buttonsPanel);
+            this.Controls.Add(this.contentLabel);
+            this.Controls.Add(this.headerLabel);
+            this.Controls.Add(this.headerImage);
+            this.DoubleBuffered = true;
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.Name = "TaskDialogForm";
+            this.Text = "DotNetBar Task Dialog";
+            this.Load += new System.EventHandler(this.TaskDialogForm_Load);
+            ((System.ComponentModel.ISupportInitialize)(this.headerImage)).EndInit();
+            this.bottomPanel.ResumeLayout(false);
+            this.bottomPanel.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.footerImage)).EndInit();
+            this.flowLayoutPanel1.ResumeLayout(false);
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.PictureBox headerImage;
+        private LabelX headerLabel;
+        private LabelX contentLabel;
+        private ItemPanel buttonsPanel;
+        private PanelEx bottomPanel;
+        private ButtonX buttonOk;
+        private ButtonX buttonClose;
+        private ButtonX buttonRetry;
+        private ButtonX buttonCancel;
+        private ButtonX buttonNo;
+        private ButtonX buttonYes;
+        private DevComponents.DotNetBar.Controls.CheckBoxX taskCheckBox;
+        private LabelX footerLabel;
+        private System.Windows.Forms.PictureBox footerImage;
+        private PanelEx footerPanel;
+        private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1;
+    }
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/TaskDialog/TaskDialogForm.cs b/PROMS/DotNetBar Source Code/TaskDialog/TaskDialogForm.cs
new file mode 100644
index 00000000..51f899e3
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TaskDialog/TaskDialogForm.cs	
@@ -0,0 +1,495 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+using DevComponents.DotNetBar;
+using DevComponents.DotNetBar.Rendering;
+
+namespace DevComponents.DotNetBar
+{
+    internal partial class TaskDialogForm : DevComponents.DotNetBar.OfficeForm
+    {
+        public TaskDialogForm()
+        {
+            InitializeComponent();
+
+            Office2007ColorTable table = ((Office2007Renderer)GlobalManager.Renderer).ColorTable;
+            bottomPanel.Style.BackColor1.Color = table.Form.BackColor;
+
+            headerLabel.MarkupLinkClick += new MarkupLinkClickEventHandler(MarkupLinkClick);
+            contentLabel.MarkupLinkClick += new MarkupLinkClickEventHandler(MarkupLinkClick);
+            footerLabel.MarkupLinkClick += new MarkupLinkClickEventHandler(MarkupLinkClick);
+            this.ShowInTaskbar = false;
+        }
+
+        private void MarkupLinkClick(object sender, MarkupLinkClickEventArgs e)
+        {
+            TaskDialog.InvokeMarkupLinkClick(sender, e);
+        }
+
+        private void TaskDialogForm_Load(object sender, EventArgs e)
+        {
+
+        }
+
+        private eTaskDialogBackgroundColor _TaskBackgroundColor = eTaskDialogBackgroundColor.Default;
+        /// <summary>
+        /// Gets or sets the task-background color.
+        /// </summary>
+        [DefaultValue(eTaskDialogBackgroundColor.Default)]
+        public eTaskDialogBackgroundColor TaskBackgroundColor
+        {
+            get { return _TaskBackgroundColor; }
+            set { _TaskBackgroundColor = value; }
+        }
+
+        private eTaskDialogButton _DefaultButton =  eTaskDialogButton.Yes;
+        private static readonly int MinimumWidth = 420;
+        private static readonly int MinimumHeight = 200;
+        public eTaskDialogResult ShowTaskDialog(IWin32Window owner, TaskDialogInfo dialogInfo)
+        {
+            if (owner != null)
+                this.StartPosition = FormStartPosition.CenterParent;
+            else
+                this.StartPosition = FormStartPosition.CenterScreen;
+
+            UpdateDialogColor(dialogInfo);
+
+            int dialogButtonsWidth = Dpi.Width20;
+            int footerWidth = 0;
+            int contentHeight = Dpi.Height32;
+
+            this.Text = dialogInfo.Title;
+            headerLabel.Text = dialogInfo.Header;
+            contentLabel.Text = dialogInfo.Text;
+            _DefaultButton = dialogInfo.DefaultButton;
+
+            if (dialogInfo.TaskDialogIcon == eTaskDialogIcon.None)
+            {
+                int diff = this.Width - headerLabel.Right;
+                headerLabel.Left = headerImage.Left;
+                headerLabel.Width = this.Width - diff - headerLabel.Left;
+
+                diff = this.Width - contentLabel.Right;
+                contentLabel.Left = headerImage.Left;
+                contentLabel.Width = this.Width - diff - contentLabel.Left;
+
+                diff = this.Width - buttonsPanel.Right;
+                buttonsPanel.Left = headerImage.Left;
+                buttonsPanel.Width = this.Width - diff - buttonsPanel.Left;
+                headerImage.Visible = false;
+            }
+            else
+                headerImage.Image = TaskDialog.GetImage(dialogInfo.TaskDialogIcon);
+
+            if (dialogInfo.CheckBoxCommand != null)
+            {
+                taskCheckBox.Command = dialogInfo.CheckBoxCommand;
+                //taskCheckBox.Checked = dialogInfo.CheckBoxCommand.Checked;
+                dialogButtonsWidth += taskCheckBox.Width + Dpi.Width12;
+            }
+            else
+                taskCheckBox.Visible = false;
+            
+            if (!string.IsNullOrEmpty(dialogInfo.FooterText))
+            {
+                footerLabel.Text = dialogInfo.FooterText;
+                footerWidth += footerLabel.Width + Dpi.Width12;
+            }
+            else
+                footerLabel.Visible = false;
+
+            if (dialogInfo.FooterImage != null)
+            {
+                footerImage.Image = dialogInfo.FooterImage;
+                footerWidth += footerImage.Width;
+            }
+            else
+            {
+                footerImage.Visible = false;
+                footerLabel.Left = footerImage.Left;
+            }
+
+            if (dialogInfo.RadioButtons != null && dialogInfo.RadioButtons.Length > 0)
+            {
+                foreach (Command command in dialogInfo.RadioButtons)
+                {
+                    CheckBoxItem item = new CheckBoxItem();
+                    item.CheckBoxStyle = eCheckBoxStyle.RadioButton;
+                    //item.Checked = command.Checked;
+                    item.Command = command;
+                    buttonsPanel.Items.Add(item);
+                } 
+            }
+
+            if (dialogInfo.Buttons != null && dialogInfo.Buttons.Length > 0)
+            {
+                foreach (Command command in dialogInfo.Buttons)
+                {
+                    ButtonItem item = new ButtonItem();
+                    if (command.Image != null)
+                    {
+                        item.ButtonStyle = eButtonStyle.ImageAndText;
+                        item.ImagePosition = eImagePosition.Left;
+                    }
+                    
+                    item.Command = command;
+
+                    buttonsPanel.Items.Add(item);
+
+                    ButtonItemLayout.LayoutButton(item);
+                    footerWidth = Math.Max(footerWidth, item.WidthInternal + buttonsPanel.Left * 2);
+
+                }
+            }
+
+            if ((dialogInfo.DialogButtons & eTaskDialogButton.Ok) == 0)
+            {
+                buttonOk.Visible = false;
+            }
+            else
+            {
+                dialogButtonsWidth += buttonOk.Width + 3;
+                if (dialogInfo.DefaultButton == eTaskDialogButton.Ok)
+                    this.AcceptButton = buttonOk;
+            }
+            if ((dialogInfo.DialogButtons & eTaskDialogButton.Cancel) == 0)
+            {
+                buttonCancel.Visible = false;
+            }
+            else
+            {
+                dialogButtonsWidth += buttonCancel.Width + 3;
+                this.CancelButton = buttonCancel;
+                if (dialogInfo.DefaultButton == eTaskDialogButton.Cancel)
+                    this.AcceptButton = buttonCancel;
+            }
+            if ((dialogInfo.DialogButtons & eTaskDialogButton.Yes) == 0)
+            {
+                buttonYes.Visible = false;
+            }
+            else
+            {
+                dialogButtonsWidth += buttonYes.Width + 3;
+                if (dialogInfo.DefaultButton == eTaskDialogButton.Yes)
+                    this.AcceptButton = buttonYes;
+            }
+
+            if ((dialogInfo.DialogButtons & eTaskDialogButton.No) == 0)
+            {
+                buttonNo.Visible = false;
+            }
+            else
+            {
+                dialogButtonsWidth += buttonNo.Width + 3;
+                if (this.CancelButton == null)
+                    this.CancelButton = buttonNo;
+                if (dialogInfo.DefaultButton == eTaskDialogButton.No)
+                    this.AcceptButton = buttonNo;
+            }
+            if ((dialogInfo.DialogButtons & eTaskDialogButton.Close) == 0)
+            {
+                buttonClose.Visible = false;
+            }
+            else
+            {
+                dialogButtonsWidth += buttonClose.Width + 3;
+                if (this.CancelButton == null)
+                    this.CancelButton = buttonClose;
+                else if (dialogInfo.DefaultButton == eTaskDialogButton.Close)
+                    this.AcceptButton = buttonClose;
+            }
+            if ((dialogInfo.DialogButtons & eTaskDialogButton.Retry) == 0)
+            {
+                buttonRetry.Visible = false;
+            }
+            else
+            {
+                dialogButtonsWidth += buttonRetry.Width + Dpi.Width3;
+                if (dialogInfo.DefaultButton == eTaskDialogButton.Retry)
+                    this.AcceptButton = buttonRetry;
+            }
+
+            // If only OK button is visible it is cancel button as well
+            if (dialogInfo.DialogButtons == eTaskDialogButton.Ok)
+                this.CancelButton = buttonOk;
+
+            if (string.IsNullOrEmpty(dialogInfo.FooterText) && dialogInfo.FooterImage == null)
+            {
+                footerPanel.Visible = false;
+                bottomPanel.Height = flowLayoutPanel1.Height + Dpi.Height4;
+            }
+            else
+                contentHeight += footerImage.Height;
+
+            this.Width = Math.Max(Dpi.Width(MinimumWidth), Math.Max(footerWidth, dialogButtonsWidth));
+
+            using (Graphics g = headerLabel.CreateGraphics()) { }
+            headerLabel.MaximumSize=new Size(headerLabel.Width, 1000);
+            headerLabel.Height=headerLabel.GetPreferredSize(Size.Empty).Height;
+            contentHeight += headerLabel.Height + Dpi.Height3;
+
+            //float dpiY = 96f;
+            //using (Graphics g = contentLabel.CreateGraphics()) { dpiY = g.DpiY; }
+            contentLabel.Top = headerLabel.Bounds.Bottom + Dpi.Height3;
+            contentLabel.MaximumSize = new Size(contentLabel.Width, 1000);
+            using (Graphics g = contentLabel.CreateGraphics()) { } // Force handle creation
+            contentLabel.Height = contentLabel.GetPreferredSize(Size.Empty).Height; // * (dpiY >= 120f ? 1.05 : 1));
+            contentHeight += contentLabel.Height + Dpi.Height6;
+            if (contentLabel.IsUsingTextMarkup)
+                contentHeight += Dpi.Height8;
+
+            buttonsPanel.Top = contentLabel.Bottom + Dpi.Height3;
+            if (buttonsPanel.Items.Count == 0)
+            {
+                buttonsPanel.Visible = false;
+            }
+            else
+            {
+                using (Graphics g = buttonsPanel.CreateGraphics()) { }
+                buttonsPanel.Height = buttonsPanel.GetAutoSizeHeight() + Dpi.Height2;
+                contentHeight += buttonsPanel.Height + Dpi.Height6;
+                if (string.IsNullOrEmpty(dialogInfo.FooterText) && dialogInfo.FooterImage == null)
+                    contentHeight += Dpi.Height8;
+            }
+
+            contentHeight += bottomPanel.Height;
+
+            this.Height = Math.Max(Dpi.Height(MinimumHeight), contentHeight);
+
+            if (dialogInfo.TaskDialogIcon == eTaskDialogIcon.Help)
+                System.Media.SystemSounds.Question.Play();
+            else if (dialogInfo.TaskDialogIcon == eTaskDialogIcon.Information)
+                System.Media.SystemSounds.Asterisk.Play();
+            else
+                System.Media.SystemSounds.Exclamation.Play();
+
+            LocalizeText();
+
+            ShowDialog(owner);
+
+            return _Result;
+        }
+
+        protected override void OnShown(EventArgs e)
+        {
+            if (_DefaultButton == eTaskDialogButton.Cancel && buttonCancel.Visible)
+                buttonCancel.Focus();
+            else if (_DefaultButton == eTaskDialogButton.Close && buttonClose.Visible)
+                buttonClose.Focus();
+            else if (_DefaultButton == eTaskDialogButton.No && buttonNo.Visible)
+                buttonNo.Focus();
+            else if (_DefaultButton == eTaskDialogButton.Ok && buttonOk.Visible)
+                buttonOk.Focus();
+            else if (_DefaultButton == eTaskDialogButton.Retry && buttonRetry.Visible)
+                buttonRetry.Focus();
+            else if (_DefaultButton == eTaskDialogButton.Yes && buttonYes.Visible)
+                buttonYes.Focus();
+
+            base.OnShown(e);
+        }
+
+        private void LocalizeText()
+        {
+            buttonCancel.Text = LocalizationManager.GetLocalizedString(LocalizationKeys.MessageBoxCancelButton, buttonCancel.Text);
+            buttonClose.Text = LocalizationManager.GetLocalizedString(LocalizationKeys.MessageBoxCloseButton, buttonClose.Text);
+            buttonNo.Text = LocalizationManager.GetLocalizedString(LocalizationKeys.MessageBoxNoButton, buttonNo.Text);
+            buttonOk.Text = LocalizationManager.GetLocalizedString(LocalizationKeys.MessageBoxOkButton, buttonOk.Text);
+            buttonRetry.Text = LocalizationManager.GetLocalizedString(LocalizationKeys.MessageBoxRetryButton, buttonRetry.Text);
+            buttonYes.Text = LocalizationManager.GetLocalizedString(LocalizationKeys.MessageBoxYesButton, buttonYes.Text);
+        }
+
+        private void UpdateDialogColor(TaskDialogInfo dialogInfo)
+        {
+            eTaskDialogBackgroundColor color = dialogInfo.DialogColor;
+
+            if (StyleManager.IsMetro(StyleManager.Style))
+                color = eTaskDialogBackgroundColor.Default;
+
+            if (color == eTaskDialogBackgroundColor.Aqua)
+            {
+                //this.BackColor = ColorScheme.GetColor(0xDBEEF3);
+                bottomPanel.Style.BackColor1.Color = ColorScheme.GetColor(0xDBEEF3);
+                headerLabel.ForeColor = ColorScheme.GetColor(0x205867);
+                contentLabel.ForeColor = ColorScheme.GetColor(0x205867);
+            }
+            else if (color == eTaskDialogBackgroundColor.Blue)
+            {
+                bottomPanel.Style.BackColor1.Color = ColorScheme.GetColor(0xDBE5F1);
+                headerLabel.ForeColor = ColorScheme.GetColor(0x244061);
+                contentLabel.ForeColor = ColorScheme.GetColor(0x244061);
+            }
+            else if (color == eTaskDialogBackgroundColor.DarkBlue)
+            {
+                bottomPanel.Style.BackColor1.Color = ColorScheme.GetColor(0xC6D9F0);
+                headerLabel.ForeColor = ColorScheme.GetColor(0x0F243E);
+                contentLabel.ForeColor = ColorScheme.GetColor(0x0F243E);
+            }
+            else if (color == eTaskDialogBackgroundColor.OliveGreen)
+            {
+                bottomPanel.Style.BackColor1.Color = ColorScheme.GetColor(0xEBF1DD);
+                headerLabel.ForeColor = ColorScheme.GetColor(0x4F6128);
+                contentLabel.ForeColor = ColorScheme.GetColor(0x4F6128);
+            }
+            else if (color == eTaskDialogBackgroundColor.Orange)
+            {
+                bottomPanel.Style.BackColor1.Color = ColorScheme.GetColor(0xFDEADA);
+                headerLabel.ForeColor = ColorScheme.GetColor(0x974806);
+                contentLabel.ForeColor = ColorScheme.GetColor(0x974806);
+            }
+            else if (color == eTaskDialogBackgroundColor.Purple)
+            {
+                bottomPanel.Style.BackColor1.Color = ColorScheme.GetColor(0xE5E0EC);
+                headerLabel.ForeColor = ColorScheme.GetColor(0x3F3151);
+                contentLabel.ForeColor = ColorScheme.GetColor(0x3F3151);
+            }
+            else if (color == eTaskDialogBackgroundColor.Red)
+            {
+                bottomPanel.Style.BackColor1.Color = ColorScheme.GetColor(0xF2DCDB);
+                headerLabel.ForeColor = ColorScheme.GetColor(0x632423);
+                contentLabel.ForeColor = ColorScheme.GetColor(0x632423);
+            }
+            else if (color == eTaskDialogBackgroundColor.Silver)
+            {
+                bottomPanel.Style.BackColor1.Color = ColorScheme.GetColor(0xF2F2F2);
+                headerLabel.ForeColor = ColorScheme.GetColor(0x0C0C0C);
+                contentLabel.ForeColor = ColorScheme.GetColor(0x0C0C0C);
+            }
+            else if (color == eTaskDialogBackgroundColor.Tan)
+            {
+                bottomPanel.Style.BackColor1.Color = ColorScheme.GetColor(0xDDD9C3);
+                headerLabel.ForeColor = ColorScheme.GetColor(0x1D1B10);
+                contentLabel.ForeColor = ColorScheme.GetColor(0x1D1B10);
+            }
+
+            if (color != eTaskDialogBackgroundColor.Default)
+            {
+                bottomPanel.Style.BorderColor.Color = headerLabel.ForeColor;
+            }
+
+            if (StyleManager.IsMetro(StyleManager.Style))
+            {
+                this.BackColor = ((Office2007Renderer)GlobalManager.Renderer).ColorTable.Form.BackColor;
+                //bottomPanel.Style.BackColor1.Color = this.BackColor;
+            }
+        }
+
+        private eTaskDialogResult _Result = eTaskDialogResult.None;
+        /// <summary>
+        /// Gets the task-dialog result
+        /// </summary>
+        public eTaskDialogResult Result
+        {
+            get { return _Result; }
+        }
+
+        private bool _AntiAlias = true;
+        /// <summary>
+        /// Gets or sets the anti-alias text-rendering setting for the controls.
+        /// </summary>
+        public bool AntiAlias
+        {
+            get { return _AntiAlias; }
+            set
+            {
+                _AntiAlias = value;
+                headerLabel.AntiAlias = value;
+                contentLabel.AntiAlias = value;
+                buttonsPanel.AntiAlias = value;
+                buttonOk.AntiAlias = value;
+                buttonCancel.AntiAlias = value;
+                buttonYes.AntiAlias = value;
+                buttonNo.AntiAlias = value;
+                buttonRetry.AntiAlias = value;
+                footerLabel.AntiAlias = value;
+                taskCheckBox.AntiAlias = value;
+            }
+        }
+
+        private void buttonOk_Click(object sender, EventArgs e)
+        {
+            CloseDialog(eTaskDialogResult.Ok);
+        }
+
+        private void buttonYes_Click(object sender, EventArgs e)
+        {
+            CloseDialog(eTaskDialogResult.Yes);
+        }
+
+        private void buttonNo_Click(object sender, EventArgs e)
+        {
+            CloseDialog(eTaskDialogResult.No);
+        }
+
+        private void buttonCancel_Click(object sender, EventArgs e)
+        {
+            CloseDialog(eTaskDialogResult.Cancel);
+        }
+
+        private void buttonRetry_Click(object sender, EventArgs e)
+        {
+            CloseDialog(eTaskDialogResult.Retry);
+        }
+
+        private void buttonClose_Click(object sender, EventArgs e)
+        {
+            CloseDialog(eTaskDialogResult.Close);
+        }
+
+        internal void CloseDialog(eTaskDialogResult result)
+        {
+            _Result = result;
+            this.Close();
+        }
+    }
+
+    /// <summary>
+    /// Defines TaskDialog colors.
+    /// </summary>
+    public enum eTaskDialogBackgroundColor
+    {
+        /// <summary>
+        /// Task dialog will use default background as specified by current theme.
+        /// </summary>
+        Default,
+        /// <summary>
+        /// Task dialog will use silver background color.
+        /// </summary>
+        Silver,
+        /// <summary>
+        /// Task dialog will use tan background color.
+        /// </summary>
+        Tan,
+        /// <summary>
+        /// Task dialog will use dark-blue background color.
+        /// </summary>
+        DarkBlue,
+        /// <summary>
+        /// Task dialog will use blue background color.
+        /// </summary>
+        Blue,
+        /// <summary>
+        /// Task dialog will use red background color.
+        /// </summary>
+        Red,
+        /// <summary>
+        /// Task dialog will use olive-green background color.
+        /// </summary>
+        OliveGreen,
+        /// <summary>
+        /// Task dialog will use purple background color.
+        /// </summary>
+        Purple,
+        /// <summary>
+        /// Task dialog will use aqua background color.
+        /// </summary>
+        Aqua,
+        /// <summary>
+        /// Task dialog will use orange background color.
+        /// </summary>
+        Orange
+    }
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/TextBoxItem.cs b/PROMS/DotNetBar Source Code/TextBoxItem.cs
new file mode 100644
index 00000000..ee581419
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TextBoxItem.cs	
@@ -0,0 +1,1375 @@
+namespace DevComponents.DotNetBar
+{
+	using System;
+	using System.Drawing;
+    using DevComponents.DotNetBar.Controls;
+    using System.ComponentModel;
+    using DevComponents.DotNetBar.Rendering;
+    using System.Windows.Forms;
+    using DevComponents.Editors;
+
+	/// <summary>
+	///		Summary description for TextBoxItem.
+	/// </summary>
+    [System.ComponentModel.ToolboxItem(false), System.ComponentModel.DesignTimeVisible(false), Designer("DevComponents.DotNetBar.Design.TextBoxItemDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+	public class TextBoxItem:ImageItem,IPersonalizedMenuItem
+	{
+		public delegate void TextChangedEventHandler(object sender);
+		public event TextChangedEventHandler InputTextChanged;
+		public event System.Windows.Forms.KeyEventHandler KeyDown;
+		public event System.Windows.Forms.KeyPressEventHandler KeyPress;
+		public event System.Windows.Forms.KeyEventHandler KeyUp;
+
+#if FRAMEWORK20
+        /// <summary>
+        /// Occurs when ButtonCustom control is clicked.
+        /// </summary>
+        public event EventHandler ButtonCustomClick;
+
+        /// <summary>
+        /// Occurs when ButtonCustom2 control is clicked.
+        /// </summary>
+        public event EventHandler ButtonCustom2Click;
+#endif
+
+		private TextBoxX m_TextBox;
+		private bool m_MouseOver;
+		private bool m_AlwaysShowCaption;
+		private int m_TextBoxWidth;
+		//private string m_ControlText="";
+
+		// IPersonalizedMenuItem Implementation
+		private eMenuVisibility m_MenuVisibility=eMenuVisibility.VisibleAlways;
+		private bool m_RecentlyUsed=false;
+
+		public TextBoxItem():this("","") {}
+		public TextBoxItem(string sName):this(sName,"") {}
+
+		public TextBoxItem(string sName, string ItemText):base(sName,ItemText)
+		{
+			CreateTextBox();
+			m_MouseOver=false;
+			m_AlwaysShowCaption=false;
+			m_TextBoxWidth=64;
+			this.ImageSize=new Size(16,16);
+			m_SupportedOrientation=eSupportedOrientation.Horizontal;
+		}
+		private void CreateTextBox()
+		{
+            TextBoxX oldTextBox = null;
+            if (m_TextBox != null)
+            {
+                m_TextBox.MouseEnter -= new EventHandler(this.TextBoxMouseEnter);
+                m_TextBox.MouseLeave -= new EventHandler(this.TextBoxMouseLeave);
+                m_TextBox.MouseHover -= new EventHandler(this.TextBoxMouseHover);
+                m_TextBox.LostFocus -= new EventHandler(this.TextBoxLostFocus);
+                m_TextBox.GotFocus -= new EventHandler(this.TextBoxGotFocus);
+                m_TextBox.TextChanged -= new EventHandler(this.TextBoxTextChanged);
+                m_TextBox.KeyDown -= new System.Windows.Forms.KeyEventHandler(this.TextBoxKeyDown);
+                m_TextBox.KeyPress -= new System.Windows.Forms.KeyPressEventHandler(this.TextBoxKeyPress);
+                m_TextBox.KeyUp -= new System.Windows.Forms.KeyEventHandler(this.TextBoxKeyUp);
+                //m_TextBox.Click -= this.TextBoxClick;
+                m_TextBox.MouseDown -= TextBoxMouseDown;
+                m_TextBox.MouseUp -= TextBoxMouseUp;
+#if FRAMEWORK20
+                m_TextBox.ButtonCustomClick -= new EventHandler(TextBoxButtonCustomClick);
+                m_TextBox.ButtonCustom2Click -= new EventHandler(TextBoxButtonCustom2Click);
+#endif
+                oldTextBox = m_TextBox;
+                m_TextBox = null;
+            }
+			m_TextBox=new TextBoxX(true);
+			m_TextBox.BorderStyle=System.Windows.Forms.BorderStyle.None;
+			m_TextBox.AutoSize=false;
+			m_TextBox.Visible=false;
+            m_TextBox.TabStop = false;
+            if (oldTextBox != null)
+            {
+                m_TextBox.MaxLength = oldTextBox.MaxLength;
+                m_TextBox.UseSystemPasswordChar = oldTextBox.UseSystemPasswordChar;
+                m_TextBox.PasswordChar = oldTextBox.PasswordChar;
+                m_TextBox.WatermarkEnabled = oldTextBox.WatermarkEnabled;
+                m_TextBox.WatermarkText = oldTextBox.WatermarkText;
+                m_TextBox.WatermarkFont = oldTextBox.WatermarkFont;
+                m_TextBox.WatermarkColor = oldTextBox.WatermarkColor;
+                m_TextBox.WatermarkBehavior = oldTextBox.WatermarkBehavior;
+                m_TextBox.FocusHighlightEnabled = oldTextBox.FocusHighlightEnabled;
+                m_TextBox.FocusHighlightColor = oldTextBox.FocusHighlightColor;
+
+                oldTextBox.Dispose();
+            }
+			m_TextBox.MouseEnter+=new EventHandler(this.TextBoxMouseEnter);
+			m_TextBox.MouseLeave+=new EventHandler(this.TextBoxMouseLeave);
+			m_TextBox.MouseHover+=new EventHandler(this.TextBoxMouseHover);
+			m_TextBox.LostFocus+=new EventHandler(this.TextBoxLostFocus);
+			m_TextBox.GotFocus+=new EventHandler(this.TextBoxGotFocus);
+			m_TextBox.TextChanged+=new EventHandler(this.TextBoxTextChanged);
+			m_TextBox.KeyDown+=new System.Windows.Forms.KeyEventHandler(this.TextBoxKeyDown);
+			m_TextBox.KeyPress+=new System.Windows.Forms.KeyPressEventHandler(this.TextBoxKeyPress);
+			m_TextBox.KeyUp+=new System.Windows.Forms.KeyEventHandler(this.TextBoxKeyUp);
+            //m_TextBox.Click += this.TextBoxClick;
+            m_TextBox.MouseDown += TextBoxMouseDown;
+            m_TextBox.MouseUp += TextBoxMouseUp;
+			#if FRAMEWORK20
+            m_TextBox.ButtonCustomClick += new EventHandler(TextBoxButtonCustomClick);
+            m_TextBox.ButtonCustom2Click += new EventHandler(TextBoxButtonCustom2Click);
+			#endif
+			m_TextBox.Text=this.Text;
+			m_TextBox.SelectionStart=0;
+
+			if(this.ContainerControl!=null)
+			{
+				System.Windows.Forms.Control objCtrl=this.ContainerControl as System.Windows.Forms.Control;
+				if(objCtrl!=null)
+					objCtrl.Controls.Add(m_TextBox);
+			}
+
+			if(this.Displayed)
+			{
+				m_TextBox.Visible=true;
+				this.Refresh();
+			}
+
+			CustomizeChanged();
+
+		}
+#if FRAMEWORK20
+        private void TextBoxButtonCustomClick(object sender, EventArgs e)
+        {
+            if (ButtonCustomClick != null)
+                ButtonCustomClick(this, e);
+        }
+        private void TextBoxButtonCustom2Click(object sender, EventArgs e)
+        {
+            if (ButtonCustom2Click != null)
+                ButtonCustom2Click(this, e);
+        }
+#endif
+
+		public override BaseItem Copy()
+		{
+			TextBoxItem objCopy=new TextBoxItem(this.Name);
+			this.CopyToItem(objCopy);
+			return objCopy;
+		}
+		protected override void CopyToItem(BaseItem copy)
+		{
+			TextBoxItem objCopy=copy as TextBoxItem;
+			base.CopyToItem(objCopy);
+
+			objCopy.TextBoxWidth=m_TextBoxWidth;
+		}
+        protected override void Dispose(bool disposing)
+		{
+			if(m_TextBox!=null)
+			{
+                // Control gets disposed by the parent control it is added to
+                //if (m_TextBox.Parent == null && !m_TextBox.IsDisposed)
+                //    m_TextBox.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		protected internal override void Serialize(ItemSerializationContext context)
+		{
+			base.Serialize(context);
+            System.Xml.XmlElement ThisItem = context.ItemXmlElement;
+			ThisItem.SetAttribute("Caption",_Caption);
+			ThisItem.SetAttribute("TextBoxWidth",System.Xml.XmlConvert.ToString(m_TextBoxWidth));
+			ThisItem.SetAttribute("AlwaysShowCaption",System.Xml.XmlConvert.ToString(m_AlwaysShowCaption));
+
+			ThisItem.SetAttribute("MenuVisibility",System.Xml.XmlConvert.ToString((int)m_MenuVisibility));
+			ThisItem.SetAttribute("RecentlyUsed",System.Xml.XmlConvert.ToString(m_RecentlyUsed));
+		}
+
+		public override void Deserialize(ItemSerializationContext context)
+		{
+			base.Deserialize(context);
+            System.Xml.XmlElement ItemXmlSource = context.ItemXmlElement;
+            if(ItemXmlSource.HasAttribute("Caption"))
+                this.Caption = ItemXmlSource.GetAttribute("Caption");
+			
+			m_TextBoxWidth=System.Xml.XmlConvert.ToInt32(ItemXmlSource.GetAttribute("TextBoxWidth"));
+			m_AlwaysShowCaption=System.Xml.XmlConvert.ToBoolean(ItemXmlSource.GetAttribute("AlwaysShowCaption"));
+
+			m_MenuVisibility=(eMenuVisibility)System.Xml.XmlConvert.ToInt32(ItemXmlSource.GetAttribute("MenuVisibility"));
+			m_RecentlyUsed=System.Xml.XmlConvert.ToBoolean(ItemXmlSource.GetAttribute("RecentlyUsed"));
+		}
+
+        private static RoundRectangleShapeDescriptor _MenuShape = new RoundRectangleShapeDescriptor(3);
+        public override void Paint(ItemPaintArgs pa)
+        {
+            if (this.SuspendLayout)
+                return;
+            System.Drawing.Graphics g = pa.Graphics;
+            Rectangle r = this.DisplayRectangle;
+            bool enabled = GetEnabled(pa.ContainerControl);
+            Size objImageSize = GetMaxImageSize();
+            bool bOnMenu = this.IsOnMenu && !(this.Parent is ItemContainer);
+
+            eDotNetBarStyle effectiveStyle = this.EffectiveStyle;
+            if (this.Orientation == eOrientation.Horizontal)
+            {
+                if (bOnMenu && (effectiveStyle == eDotNetBarStyle.OfficeXP || effectiveStyle == eDotNetBarStyle.Office2003 || effectiveStyle == eDotNetBarStyle.VS2005 || BarFunctions.IsOffice2007Style(effectiveStyle)))
+                {
+                    objImageSize.Width += 7;
+                    r.Width -= objImageSize.Width;
+                    if (!pa.RightToLeft)
+                        r.X += objImageSize.Width;
+                    if (this.IsOnCustomizeMenu)
+                        objImageSize.Width += objImageSize.Height + 8;
+                    Rectangle sideRect = new Rectangle(m_Rect.Left, m_Rect.Top, objImageSize.Width, m_Rect.Height);
+                    if (pa.RightToLeft)
+                        sideRect.X = m_Rect.Right - sideRect.Width;
+                    // Draw side bar
+                    if (!BarFunctions.IsOffice2007Style(effectiveStyle))
+                    {
+                        if (this.MenuVisibility == eMenuVisibility.VisibleIfRecentlyUsed && !this.RecentlyUsed)
+                        {
+                            if (!pa.Colors.MenuUnusedSide2.IsEmpty)
+                            {
+                                System.Drawing.Drawing2D.LinearGradientBrush gradient = BarFunctions.CreateLinearGradientBrush(new Rectangle(m_Rect.Left, m_Rect.Top, objImageSize.Width, m_Rect.Height), pa.Colors.MenuUnusedSide, pa.Colors.MenuUnusedSide2, pa.Colors.MenuUnusedSideGradientAngle);
+                                g.FillRectangle(gradient, sideRect);
+                                gradient.Dispose();
+                            }
+                            else
+                                g.FillRectangle(new SolidBrush(pa.Colors.MenuUnusedSide), sideRect);
+                        }
+                        else
+                        {
+                            if (!pa.Colors.MenuSide2.IsEmpty)
+                            {
+                                System.Drawing.Drawing2D.LinearGradientBrush gradient = BarFunctions.CreateLinearGradientBrush(sideRect, pa.Colors.MenuSide, pa.Colors.MenuSide2, pa.Colors.MenuSideGradientAngle);
+                                g.FillRectangle(gradient, sideRect);
+                                gradient.Dispose();
+                            }
+                            else
+                                g.FillRectangle(new SolidBrush(pa.Colors.MenuSide), sideRect);
+                        }
+                    }
+                    if (BarFunctions.IsOffice2007Style(effectiveStyle) && GlobalManager.Renderer is Office2007Renderer)
+                    {
+                        Office2007MenuColorTable mt = ((Office2007Renderer)GlobalManager.Renderer).ColorTable.Menu;
+                        if (mt != null)
+                        {
+                            // Draw side bar
+                            if (this.MenuVisibility == eMenuVisibility.VisibleIfRecentlyUsed && !this.RecentlyUsed)
+                                DisplayHelp.FillRectangle(g, sideRect, mt.SideUnused);
+                            else
+                                DisplayHelp.FillRectangle(g, sideRect, mt.Side);
+                        }
+
+                        if (mt != null && !mt.SideBorder.IsEmpty)
+                        {
+                            if (pa.RightToLeft)
+                                DisplayHelp.DrawGradientLine(g, sideRect.X, sideRect.Y, sideRect.X, sideRect.Bottom - 1, mt.SideBorder, 1);
+                            else
+                                DisplayHelp.DrawGradientLine(g, sideRect.Right - 2, sideRect.Y, sideRect.Right - 2, sideRect.Bottom - 1, mt.SideBorder, 1);
+                        }
+                        if (mt != null && !mt.SideBorderLight.IsEmpty)
+                        {
+                            if (pa.RightToLeft)
+                                DisplayHelp.DrawGradientLine(g, sideRect.X + 1, sideRect.Y, sideRect.X + 1, sideRect.Bottom - 1, mt.SideBorderLight, 1);
+                            else
+                                DisplayHelp.DrawGradientLine(g, sideRect.Right - 1, sideRect.Y, sideRect.Right - 1, sideRect.Bottom - 1, mt.SideBorderLight, 1);
+                        }
+                    }
+                }
+
+                if (this.IsOnCustomizeMenu)
+                {
+                    if (effectiveStyle == eDotNetBarStyle.OfficeXP || effectiveStyle == eDotNetBarStyle.Office2003 || effectiveStyle == eDotNetBarStyle.VS2005 || BarFunctions.IsOffice2007Style(effectiveStyle))
+                    {
+                        r.X += (objImageSize.Height + 8);
+                        r.Width -= (objImageSize.Height + 8);
+                    }
+                    else
+                    {
+                        r.X += (objImageSize.Height + 4);
+                        r.Width -= (objImageSize.Height + 4);
+                    }
+                }
+
+                if (bOnMenu && (effectiveStyle == eDotNetBarStyle.OfficeXP || effectiveStyle == eDotNetBarStyle.Office2003 || effectiveStyle == eDotNetBarStyle.VS2005 || BarFunctions.IsOffice2007Style(effectiveStyle)))
+                {
+                    if (enabled)
+                    {
+                        if (m_MouseOver || this.Focused)
+                        {
+                            Rectangle rHover = this.DisplayRectangle;
+                            rHover.Inflate(-1, 0);
+                            if (BarFunctions.IsOffice2007Style(effectiveStyle) && !(pa.Owner is DotNetBarManager) && GlobalManager.Renderer is Office2007Renderer)
+                            {
+                                Office2007ButtonItemStateColorTable bt = ((Office2007Renderer)GlobalManager.Renderer).ColorTable.ButtonItemColors[0].MouseOver;
+                                Office2007ButtonItemPainter.PaintBackground(g, bt, rHover, _MenuShape);
+                            }
+                            else
+                            {
+                                if (!pa.Colors.ItemHotBackground2.IsEmpty)
+                                {
+                                    System.Drawing.Drawing2D.LinearGradientBrush gradient = BarFunctions.CreateLinearGradientBrush(rHover, pa.Colors.ItemHotBackground, pa.Colors.ItemHotBackground2, pa.Colors.ItemHotBackgroundGradientAngle);
+                                    g.FillRectangle(gradient, rHover);
+                                    gradient.Dispose();
+                                }
+                                else
+                                    g.FillRectangle(new SolidBrush(pa.Colors.ItemHotBackground), rHover);
+                                NativeFunctions.DrawRectangle(g, new Pen(pa.Colors.ItemHotBorder), rHover);
+                            }
+                        }
+                    }
+                }
+
+                // Draw text if needed
+                if (_Caption != "" && (m_AlwaysShowCaption || bOnMenu))
+                {
+                    eTextFormat objStringFormat = GetStringFormat();
+
+                    Font objFont = this.GetFont();
+                    Rectangle rText = new Rectangle(r.X + 8, r.Y, r.Width - 8, r.Height);
+                    if (pa.RightToLeft)
+                    {
+                        objStringFormat |= eTextFormat.Right;
+                        rText.Width -= 9;
+                    }
+
+                    Color textColor = pa.Colors.ItemText;
+                    if (BarFunctions.IsOffice2007Style(effectiveStyle) && GlobalManager.Renderer is Office2007Renderer)
+                    {
+                        textColor = enabled ? ((Office2007Renderer)GlobalManager.Renderer).ColorTable.ButtonItemColors[0].Default.Text : pa.Colors.ItemDisabledText;
+                    }
+
+                    if (effectiveStyle == eDotNetBarStyle.Office2000)
+                    {
+                        TextDrawing.DrawString(g, _Caption, objFont, textColor, rText, objStringFormat);
+                    }
+                    else
+                    {
+                        TextDrawing.DrawString(g, _Caption, objFont, textColor, rText, objStringFormat);
+                    }
+
+                    Size textSize = TextDrawing.MeasureString(g, _Caption, objFont, 0, objStringFormat);
+                    if (!pa.RightToLeft) r.X += (int)textSize.Width + 8;
+                    r.Width -= ((int)textSize.Width + 8);
+                }
+
+                int textBoxPreferredHeight = Math.Max(19, _TextBoxHeight > 0 ? _TextBoxHeight : m_TextBox.PreferredHeight);
+                if (this.DesignMode && !bOnMenu)
+                {
+                    Rectangle back = r;
+                    if (m_TextBox != null)
+                    {
+                        back.Inflate(-5, -3);
+                        back.Y += (back.Height - (textBoxPreferredHeight + 3)) / 2;
+                        back.Height = textBoxPreferredHeight + 3;
+                    }
+                    g.FillRectangle(SystemBrushes.Window, back);
+                    if (this.Text != "")
+                    {
+                        back.Inflate(-1, -1);
+                        TextDrawing.DrawString(g, this.Text, this.GetFont(), enabled ? pa.Colors.ItemText : pa.Colors.ItemDisabledText, back, this.GetStringFormat());
+                    }
+                }
+
+                if (m_TextBox != null)
+                {
+                    r.Inflate(-4, -3);
+                    r.X--;
+                    r.Y += (r.Height - textBoxPreferredHeight) / 2;
+                    r.Height = textBoxPreferredHeight;
+                    m_TextBox.Size = new Size(r.Width, (_TextBoxHeight > 0 ? _TextBoxHeight : m_TextBox.PreferredHeight));
+                    Point loc = r.Location;
+                    if (pa.RightToLeft)
+                        loc.Offset(0, (r.Height - m_TextBox.Height) / 2);
+                    else
+                        loc.Offset(2, (r.Height - m_TextBox.Height) / 2);
+                    m_TextBox.Location = loc;
+
+                    if (BarFunctions.IsOffice2007Style(effectiveStyle))
+                    {
+                        Color borderColor = Color.Empty;
+                        ElementStyle style = GetTextBoxElementStyle();
+                        if (!enabled)
+                        {
+                            borderColor = SystemColors.ControlDark;
+                        }
+                        else if (style != null)
+                            borderColor = style.BorderColor;
+                        if (!borderColor.IsEmpty)
+                        {
+                            r = new Rectangle(r.Location, new Size(m_TextBox.Width + 2, textBoxPreferredHeight));
+                            DisplayHelp.FillRectangle(g, r, m_TextBox.BackColor);
+                            r.Inflate(1, 1);
+                            if(!enabled)
+                                g.FillRectangle(SystemBrushes.Control, r);
+                            DisplayHelp.DrawRectangle(g, borderColor, r);
+                        }
+                    }
+                    else if (enabled && (m_MouseOver || this.Focused))
+                    {
+                        if (effectiveStyle == eDotNetBarStyle.Office2000)
+                        {
+                            r = new Rectangle(m_TextBox.Location, m_TextBox.Size);
+                            r.Inflate(2, 2);
+                            System.Windows.Forms.ControlPaint.DrawBorder3D(g, r, System.Windows.Forms.Border3DStyle.SunkenOuter, System.Windows.Forms.Border3DSide.All);
+                        }
+                        else if (effectiveStyle == eDotNetBarStyle.OfficeXP || effectiveStyle == eDotNetBarStyle.Office2003 || effectiveStyle == eDotNetBarStyle.VS2005)
+                        {
+                            r = new Rectangle(m_TextBox.Location, m_TextBox.Size);
+                            r.Inflate(1, 1);
+                            NativeFunctions.DrawRectangle(g, SystemPens.Highlight, r);
+                            //g.DrawRectangle(SystemPens.Highlight,r);
+                        }
+                    }
+                }
+                else
+                {
+                    r.Inflate(-3, -3);
+                    g.FillRectangle(SystemBrushes.Window, r);
+                }
+
+                if (this.IsOnCustomizeMenu && this.Visible)
+                {
+                    // Draw check box if this item is visible
+                    Rectangle rBox = new Rectangle(m_Rect.Left, m_Rect.Top, m_Rect.Height, m_Rect.Height);
+                    if (effectiveStyle == eDotNetBarStyle.OfficeXP || effectiveStyle == eDotNetBarStyle.Office2003 || effectiveStyle == eDotNetBarStyle.VS2005 || BarFunctions.IsOffice2007Style(effectiveStyle))
+                        rBox.Inflate(-1, -1);
+                    BarFunctions.DrawMenuCheckBox(pa, rBox, effectiveStyle, m_MouseOver);
+                }
+            }
+            else
+            {
+                string Caption = this.Text;
+                if (Caption == "")
+                    Caption = "...";
+                else
+                    Caption += " �";
+
+                if (effectiveStyle == eDotNetBarStyle.OfficeXP || effectiveStyle == eDotNetBarStyle.Office2003 || effectiveStyle == eDotNetBarStyle.VS2005 || BarFunctions.IsOffice2007Style(effectiveStyle))
+                    g.FillRectangle(new SolidBrush(pa.Colors.BarBackground), this.DisplayRectangle);
+                else
+                    g.FillRectangle(SystemBrushes.Control, this.DisplayRectangle);
+
+                if (m_MouseOver && !this.DesignMode)
+                {
+                    if (effectiveStyle == eDotNetBarStyle.Office2000)
+                    {
+                        //r.Inflate(-1,-1);
+                        System.Windows.Forms.ControlPaint.DrawBorder3D(g, r, System.Windows.Forms.Border3DStyle.RaisedInner, System.Windows.Forms.Border3DSide.All);
+                    }
+                    else if (effectiveStyle == eDotNetBarStyle.OfficeXP || effectiveStyle == eDotNetBarStyle.Office2003 || effectiveStyle == eDotNetBarStyle.VS2005 || BarFunctions.IsOffice2007Style(effectiveStyle))
+                    {
+                        r.Inflate(-1, -1);
+                        if (!pa.Colors.ItemHotBackground2.IsEmpty)
+                        {
+                            System.Drawing.Drawing2D.LinearGradientBrush gradient = BarFunctions.CreateLinearGradientBrush(r, pa.Colors.ItemHotBackground, pa.Colors.ItemHotBackground2, pa.Colors.ItemHotBackgroundGradientAngle);
+                            g.FillRectangle(gradient, r);
+                            gradient.Dispose();
+                        }
+                        else
+                            g.FillRectangle(new SolidBrush(pa.Colors.ItemHotBackground), r);
+                        NativeFunctions.DrawRectangle(g, new Pen(pa.Colors.ItemHotBorder), r);
+                    }
+                }
+
+                r = new Rectangle(m_Rect.Top, -m_Rect.Right, m_Rect.Height, m_Rect.Width);
+                g.RotateTransform(90);
+                eTextFormat sf = GetStringFormat();
+                sf |= eTextFormat.HorizontalCenter;
+
+                if (m_MouseOver && enabled)
+                    TextDrawing.DrawStringLegacy(g, Caption, GetFont(), pa.Colors.ItemHotText, r, sf);
+                else
+                    TextDrawing.DrawStringLegacy(g, Caption, GetFont(), enabled ? pa.Colors.ItemText : pa.Colors.ItemDisabledText, r, sf);
+                g.ResetTransform();
+            }
+
+            if (this.Focused && this.DesignMode)
+            {
+                r = this.DisplayRectangle;
+                r.Inflate(-1, -1);
+                DesignTime.DrawDesignTimeSelection(g, r, pa.Colors.ItemDesignTimeBorder);
+            }
+
+            this.DrawInsertMarker(g);
+        }
+
+        private ElementStyle GetTextBoxElementStyle()
+        {
+            ElementStyle style = null;
+            if (GlobalManager.Renderer is Office2007Renderer)
+            {
+                style = ((Office2007Renderer)GlobalManager.Renderer).ColorTable.StyleClasses[ElementStyleClassKeys.TextBoxBorderKey] as ElementStyle;
+            }
+            return style;
+        }
+
+        /// <summary>
+        /// IBlock member implementation
+        /// </summary>
+        [Browsable(false), DevCoBrowsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), EditorBrowsable(EditorBrowsableState.Never)]
+        public override System.Drawing.Rectangle Bounds
+        {
+            get { return base.Bounds; }
+            set
+            {
+                Control container = this.ContainerControl as Control;
+                if ((container is ItemPanel || container is ExplorerBar || container is SideBar) && base.Bounds != value)
+                {
+                    bool topLocationChanged = base.Bounds.Top != value.Top;
+                    bool leftLocationChanged = base.Bounds.Left != value.Left;
+                    base.Bounds = value;
+                    if (topLocationChanged || leftLocationChanged)
+                        UpdateControlLocation();
+                }
+                else
+                    base.Bounds = value;
+            }
+        }
+
+        private void UpdateControlLocation()
+        {
+            if (m_TextBox == null) return;
+            Rectangle r = this.DisplayRectangle;
+            r.Inflate(-5, -3);
+            m_TextBox.Location = r.Location;
+        }
+
+        public override void RecalcSize()
+        {
+            if (this.SuspendLayout)
+                return;
+
+            bool bOnMenu = this.IsOnMenu;
+            eDotNetBarStyle effectiveStyle = this.EffectiveStyle;
+
+            if (this.Orientation == eOrientation.Horizontal)
+            {
+                // Default Height
+                if (this.Parent != null && this.Parent is ImageItem)
+                    m_Rect.Height = ((ImageItem)this.Parent).SubItemsImageSize.Height + 4;
+                else
+                    m_Rect.Height = this.SubItemsImageSize.Height + 4;
+
+                // Default width
+                m_Rect.Width = m_TextBoxWidth + 4;
+
+                // Calculate Item Height
+                if (_Caption != "" && (m_AlwaysShowCaption || bOnMenu))
+                {
+                    System.Windows.Forms.Control objCtrl = this.ContainerControl as System.Windows.Forms.Control;
+                    if (objCtrl != null && IsHandleValid(objCtrl))
+                    {
+                        Graphics g = BarFunctions.CreateGraphics(objCtrl);
+                        try
+                        {
+                            Size textSize = TextDrawing.MeasureString(g, _Caption, GetFont(), 0, GetStringFormat());
+                            if (textSize.Height > this.SubItemsImageSize.Height)
+                                m_Rect.Height = (int)textSize.Height + 4;
+                            m_Rect.Width = m_TextBoxWidth + 4 + (int)textSize.Width + 8;
+                        }
+                        finally
+                        {
+                            g.Dispose();
+                        }
+                    }
+                }
+#if (FRAMEWORK20)
+                if (m_TextBox != null)
+                {
+                    if (m_TextBox.ButtonCustom.Visible && m_TextBox.ButtonCustom.Image != null)
+                        m_Rect.Height = Math.Max(m_Rect.Height, m_TextBox.ButtonCustom.Image.Height + 6);
+                    if (m_TextBox.ButtonCustom2.Visible && m_TextBox.ButtonCustom2.Image != null)
+                        m_Rect.Height = Math.Max(m_Rect.Height, m_TextBox.ButtonCustom2.Image.Height + 6);
+                }
+#endif
+
+                Size objImageSize = GetMaxImageSize();
+
+                if (m_TextBox != null)
+                {
+                    int textBoxPreferredHeight = Math.Max(19, (_TextBoxHeight > 0 ? _TextBoxHeight : m_TextBox.PreferredHeight)) + 2;
+                    if (m_Rect.Height < textBoxPreferredHeight)
+                    {
+                        m_Rect.Height = textBoxPreferredHeight;
+
+                        //m_TextBox.Height = objImageSize.Height + 2;
+                        //if (m_Rect.Height < m_TextBox.Height)
+                        //    m_Rect.Height = m_TextBox.Height + 4;
+                    }
+                }
+
+                if (this.IsOnMenu && (effectiveStyle == eDotNetBarStyle.OfficeXP || effectiveStyle == eDotNetBarStyle.Office2003 || effectiveStyle == eDotNetBarStyle.VS2005 || BarFunctions.IsOffice2007Style(effectiveStyle)))
+                {
+                    // Get the right image size that we will use for calculation
+                    m_Rect.Width += (objImageSize.Width + 7);
+                }
+
+                if (this.IsOnCustomizeMenu)
+                    m_Rect.Width += (objImageSize.Height + 2);
+            }
+            else
+            {
+                // Default width
+                m_Rect.Width = this.SubItemsImageSize.Width + 4;
+                string Caption = this.Text;
+                if (Caption == "")
+                    Caption = "...";
+                else
+                    Caption += " �";
+                System.Windows.Forms.Control objCtrl = this.ContainerControl as System.Windows.Forms.Control;
+                if (objCtrl != null && IsHandleValid(objCtrl))
+                {
+                    Graphics g = BarFunctions.CreateGraphics(objCtrl);
+                    try
+                    {
+                        Size textSize = TextDrawing.MeasureString(g, Caption, GetFont(), 0, GetStringFormat());
+                        if (textSize.Height > this.SubItemsImageSize.Height)
+                            m_Rect.Width = (int)textSize.Height + 4;
+                        m_Rect.Height = (int)textSize.Width + 8;
+                    }
+                    finally
+                    {
+                        g.Dispose();
+                    }
+                }
+
+            }
+
+            // Always call base implementation to reset resize flag
+            base.RecalcSize();
+        }
+		private Size GetMaxImageSize()
+		{
+			if(m_Parent!=null)
+			{
+				ImageItem objParentImageItem=m_Parent as ImageItem;
+				if(objParentImageItem!=null)
+					return objParentImageItem.SubItemsImageSize;
+				else
+					return this.ImageSize;
+			}
+			else
+				return this.ImageSize;
+		}
+		protected internal override void OnContainerChanged(object objOldContainer)
+		{	
+			base.OnContainerChanged(objOldContainer);
+			if(m_TextBox!=null)
+			{
+				if(m_TextBox.Parent!=null)
+					m_TextBox.Parent.Controls.Remove(m_TextBox);
+                if (objOldContainer is MenuPanel) // Recreate text box since it stops firing TextChanged events once it is removed and added again on menu
+                    CreateTextBox();
+				System.Windows.Forms.Control objCtrl=null;
+				if(this.ContainerControl!=null)
+				{
+					objCtrl=this.ContainerControl as System.Windows.Forms.Control;
+					if(objCtrl!=null)
+						objCtrl.Controls.Add(m_TextBox);
+				}
+			}
+		}
+        protected internal override void OnAfterItemRemoved(BaseItem item, int itemIndex)
+		{
+			base.OnAfterItemRemoved(item, itemIndex);
+			this.ContainerControl=null;
+		}
+
+		protected internal override void OnVisibleChanged(bool newValue)
+		{
+			if(m_TextBox!=null && !newValue)
+			{
+				m_TextBox.Visible=newValue;
+				CustomizeChanged();
+			}
+			base.OnVisibleChanged(newValue);
+		}
+		protected override void OnDisplayedChanged()
+		{
+			if(m_TextBox!=null)
+			{
+				m_TextBox.Visible=this.Displayed;
+				CustomizeChanged();
+			}
+		}
+		
+		private void TextBoxMouseEnter(object sender, EventArgs e)
+		{
+			if(!m_MouseOver)
+			{
+				m_MouseOver=true;			
+				this.Refresh();
+			}
+		}
+
+		private void TextBoxMouseLeave(object sender, EventArgs e)
+		{
+			this.HideToolTip();
+			if(m_MouseOver)
+			{
+				m_MouseOver=false;
+				this.Refresh();
+			}
+		}
+
+		private void TextBoxMouseHover(object sender, EventArgs e)
+		{
+			if(this.DesignMode)
+				return;
+			if(System.Windows.Forms.Control.MouseButtons==System.Windows.Forms.MouseButtons.None)
+				ShowToolTip();
+		}
+
+		private void TextBoxLostFocus(object sender, EventArgs e)
+		{
+			this.Text=m_TextBox.Text;
+			this.ReleaseFocus();
+			//if(!m_MouseOver)
+			//	return;
+			//m_MouseOver=false;
+			this.HideToolTip();
+			this.Refresh();
+
+            OnLostFocus(e);
+		}
+        [EditorBrowsable(EditorBrowsableState.Never)]
+		public override void OnLostFocus()
+		{
+			if(m_TextBox!=null)
+				this.Text=m_TextBox.Text;
+			base.OnLostFocus();
+		}
+        [EditorBrowsable(EditorBrowsableState.Never)]
+		public override void OnGotFocus()
+		{
+			base.OnGotFocus();
+			if(m_TextBox==null)
+				return;
+			if(m_TextBox.Focused || this.IsOnCustomizeMenu || this.IsOnCustomizeDialog || this.DesignMode)
+				return;
+			m_TextBox.Focus();
+		}
+
+		private void TextBoxGotFocus(object sender, EventArgs e)
+		{
+			this.HideToolTip();
+			this.Focus();
+
+            if (GetEnabled() && !this.DesignMode)
+			{
+				if(m_MenuVisibility==eMenuVisibility.VisibleIfRecentlyUsed && !m_RecentlyUsed && this.IsOnMenu)
+				{
+					// Propagate to the top
+					m_RecentlyUsed=true;
+					BaseItem objItem=this.Parent;
+					while(objItem!=null)
+					{
+						IPersonalizedMenuItem ipm=objItem as IPersonalizedMenuItem;
+						if(ipm!=null)
+							ipm.RecentlyUsed=true;
+						objItem=objItem.Parent;
+					}
+				}
+			}
+
+            OnGotFocus(e);
+		}
+
+		private void TextBoxKeyDown(object sender,System.Windows.Forms.KeyEventArgs e)
+		{
+			this.HideToolTip();
+			if(KeyDown!=null)
+				KeyDown(this,e);
+			if(e.KeyCode==System.Windows.Forms.Keys.Enter && this.Parent is PopupItem)
+			{
+				this.RaiseClick();
+				//((PopupItem)this.Parent).ClosePopup();
+			}
+            if (!e.Handled && e.KeyCode == System.Windows.Forms.Keys.Escape)
+			{
+				m_TextBox.ReleaseFocus();
+			}
+		}
+
+		private void TextBoxKeyPress(object sender,System.Windows.Forms.KeyPressEventArgs e)
+		{
+			if(KeyPress!=null)
+				KeyPress(this,e);
+		}
+
+		private void TextBoxKeyUp(object sender,System.Windows.Forms.KeyEventArgs e)
+		{
+			if(KeyUp!=null)
+				KeyUp(this,e);
+		}
+
+        private void TextBoxMouseUp(object sender, MouseEventArgs e)
+        {
+            RaiseMouseUp(e);
+        }
+        private void TextBoxMouseDown(object sender, MouseEventArgs e)
+        {
+            RaiseMouseDown(e);
+        }
+        //private void TextBoxClick(object sender, EventArgs e)
+        //{
+        //    RaiseClick(eEventSource.Mouse);
+        //}
+
+		private void TextBoxTextChanged(object sender, EventArgs e)
+		{
+            this.Text = m_TextBox.Text;
+
+			if(InputTextChanged!=null)
+			{
+				InputTextChanged(this);
+			}
+
+            DotNetBarManager owner = this.GetOwner() as DotNetBarManager;
+            if (owner != null)
+                owner.InvokeTextBoxItemTextChanged(this);
+		}
+
+		protected override void OnIsOnCustomizeDialogChanged()
+		{
+			base.OnIsOnCustomizeDialogChanged();
+			CustomizeChanged();
+		}
+
+		protected override void OnDesignModeChanged()
+		{
+			base.OnDesignModeChanged();
+			CustomizeChanged();
+		}
+
+		protected override void OnIsOnCustomizeMenuChanged()
+		{
+			base.OnIsOnCustomizeMenuChanged();
+			CustomizeChanged();
+		}
+
+		private void CustomizeChanged()
+		{
+			if(this.IsOnCustomizeMenu || this.IsOnCustomizeDialog || this.DesignMode)
+			{
+				if(m_TextBox!=null)
+					m_TextBox.Visible=false;
+			}
+			else
+			{
+				if(m_TextBox==null)
+					CreateTextBox();
+				else if(!m_TextBox.Visible)
+				{
+					m_TextBox.Visible=this.Displayed && this.Visible;
+				}
+			}
+		}
+
+		[DefaultValue(false), Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Behavior"),System.ComponentModel.Description("Indicates whether item caption is always shown.")]
+		public bool AlwaysShowCaption
+		{
+			get
+			{
+				return m_AlwaysShowCaption;
+			}
+			set
+			{
+				m_AlwaysShowCaption=value;
+			}
+		}
+
+		[DefaultValue(64), Browsable(true),DevCoBrowsable(true),System.ComponentModel.Category("Layout"),System.ComponentModel.Description("Indicates the Width of the Text Box part of the item.")]
+		public int TextBoxWidth
+		{
+			get
+			{
+				return m_TextBoxWidth;
+			}
+			set
+			{
+				if(m_TextBoxWidth!=value)
+				{
+					m_TextBoxWidth=value;
+                    if(ShouldSyncProperties)
+                        BarFunctions.SyncProperty(this, "TextBoxWidth");
+					OnExternalSizeChange();
+                    this.OnAppearanceChanged();
+				}
+			}
+		}
+
+        private int _TextBoxHeight = 0;
+        [DefaultValue(0), Category("Layout"), Description("Indicates explicit height of TextBox.")]
+        public int TextBoxHeight
+        {
+            get { return _TextBoxHeight; }
+            set
+            {
+                _TextBoxHeight = value;
+            }
+        }
+
+
+#if FRAMEWORK20
+        /// <summary>
+        /// Gets or sets a value indicating whether the text in the TextBox control should appear as the default password character.
+        /// </summary>
+        [Category("Behavior"), DefaultValue(false), Description("Gets or sets a value indicating whether the text in the TextBox control should appear as the default password character."), RefreshProperties(RefreshProperties.Repaint)]
+        public bool UseSystemPasswordChar
+        {
+            get
+            {
+                return m_TextBox.UseSystemPasswordChar;
+            }
+            set
+            {
+                m_TextBox.UseSystemPasswordChar = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the character used to mask characters of a password in a single-line TextBox control.
+        /// </summary>
+        [RefreshProperties(RefreshProperties.Repaint), Localizable(true), Description("Gets or sets the character used to mask characters of a password in a single-line TextBox control."), Category("Behavior"), DefaultValue('\0')]
+        public char PasswordChar
+        {
+            get
+            {
+                return m_TextBox.PasswordChar;
+            }
+            set
+            {
+                m_TextBox.PasswordChar = value;
+            }
+        }
+#endif
+
+		public override void InternalMouseEnter()
+		{
+			base.InternalMouseEnter();
+			//if(this.DesignMode || this.IsOnCustomizeMenu || this.IsOnCustomizeDialog || this.Orientation==eOrientation.Vertical)
+			if(!m_MouseOver)
+			{
+				m_MouseOver=true;
+				this.Refresh();
+			}
+		}
+
+		public override void InternalMouseLeave()
+		{
+			base.InternalMouseLeave();
+			if(m_MouseOver)
+			{
+				m_MouseOver=false;
+				this.Refresh();
+			}
+		}
+
+		public override void InternalKeyDown(System.Windows.Forms.KeyEventArgs objArg)
+		{
+			if(objArg.KeyCode==System.Windows.Forms.Keys.Escape)
+			{
+				if(m_TextBox.Focused)
+				{
+					m_TextBox.SelectionStart=0;
+					m_TextBox.Text=this.Text;
+				}
+			}
+			else if(objArg.KeyCode==System.Windows.Forms.Keys.Enter)
+			{
+				if(!m_TextBox.Focused)
+				{
+					m_TextBox.Focus();
+					objArg.Handled=true;
+					return;
+				}
+			}
+			base.InternalKeyDown(objArg);
+		}
+
+		protected virtual Font GetFont()
+		{
+			System.Windows.Forms.Control objCtrl=this.ContainerControl as System.Windows.Forms.Control;
+			if(objCtrl!=null)
+				return (Font)objCtrl.Font;
+            return SystemFonts.DefaultFont;
+		}
+
+		private eTextFormat GetStringFormat()
+		{
+            eTextFormat format = eTextFormat.Default | eTextFormat.VerticalCenter | eTextFormat.EndEllipsis | eTextFormat.SingleLine;
+            return format;
+            //StringFormat sfmt=BarFunctions.CreateStringFormat(); //new StringFormat(StringFormat.GenericDefault)
+            //sfmt.HotkeyPrefix=System.Drawing.Text.HotkeyPrefix.Show;
+            ////sfmt.FormatFlags=sfmt.FormatFlags & ~(sfmt.FormatFlags & StringFormatFlags.DisableKerning);
+            //sfmt.FormatFlags=sfmt.FormatFlags | StringFormatFlags.NoWrap;
+            //sfmt.Trimming=StringTrimming.EllipsisCharacter;
+            //sfmt.Alignment=System.Drawing.StringAlignment.Near;
+            //sfmt.LineAlignment=System.Drawing.StringAlignment.Center;
+
+            //return sfmt;
+		}
+
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), Browsable(false), Obsolete("Please use Text property instead to access TextBox text.")]
+		public virtual string ControlText
+		{
+			get
+			{
+				return this.Text;
+			}
+			set
+			{
+                this.Text = value;
+			}
+		}
+
+        /// <summary>
+        /// Gets or sets the text associated with the editable part of the item.
+        /// </summary>
+        [DefaultValue(""), Browsable(true), Category("Appearance"), Description("The text contained in the text box that user can edit.")]
+        public override string Text
+        {
+            get
+            {
+                return base.Text;
+            }
+            set
+            {
+                base.Text = value;
+            }
+        }
+        protected override void OnTextChanged()
+        {
+            if (m_TextBox != null && m_TextBox.Text != this.Text)
+                m_TextBox.Text = this.Text;
+            base.OnTextChanged();
+        }
+
+        private string _Caption = "";
+        /// <summary>
+        /// Gets or sets the item caption text displayed next to the text input.
+        /// </summary>
+        [DefaultValue(""), System.ComponentModel.Category("Appearance"), Description("Indicates the item Caption displayed next to the text input."), Localizable(true)]
+        public string Caption
+        {
+            get { return _Caption; }
+            set
+            {
+                if (value == null) value = "";
+                _Caption = value;
+                NeedRecalcSize = true;
+                Refresh();
+            }
+        }
+
+		[System.ComponentModel.Browsable(false)]
+		public System.Windows.Forms.TextBox TextBox
+		{
+			get
+			{
+				return m_TextBox;
+			}
+		}
+
+		public override void ReleaseFocus()
+		{
+			if(m_TextBox!=null && m_TextBox.Focused)
+				m_TextBox.ReleaseFocus();
+			base.ReleaseFocus();
+		}
+
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public int SelectionStart
+		{
+			get
+			{
+				if(m_TextBox!=null)
+					return m_TextBox.SelectionStart;
+				return 0;
+			}
+			set
+			{
+				if(m_TextBox!=null)
+					m_TextBox.SelectionStart=value;
+			}
+		}
+
+		[System.ComponentModel.Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public int SelectionLength
+		{
+			get
+			{
+				if(m_TextBox!=null)
+					return m_TextBox.SelectionLength;
+				return 0;
+			}
+			set
+			{
+				if(m_TextBox!=null)
+					m_TextBox.SelectionLength=value;
+			}
+		}
+
+		[System.ComponentModel.Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public string SelectedText
+		{
+			get
+			{
+				if(m_TextBox!=null)
+					return m_TextBox.SelectedText;
+				return "";
+			}
+			set
+			{
+				if(m_TextBox!=null)
+					m_TextBox.SelectedText=value;
+			}
+		}
+        /// <summary>
+        /// Selects all text in text box.
+        /// </summary>
+        public void SelectAll()
+        {
+            if (m_TextBox != null) m_TextBox.SelectAll();
+        }
+
+
+        /// <summary>
+        /// Gets or sets the maximum number of characters the user can type or paste into the text box control. 
+        /// </summary>
+        [DefaultValue(32767), Description("Indicates maximum number of characters the user can type or paste into the text box control. ")]
+        public int MaxLength
+        {
+            get { return m_TextBox.MaxLength; }
+            set
+            {
+                if (m_TextBox != null)
+                    m_TextBox.MaxLength = value;
+            }
+
+        }
+
+        [DefaultValue(eMenuVisibility.VisibleAlways), Browsable(true), DevCoBrowsable(true), System.ComponentModel.Category("Appearance"), System.ComponentModel.Description("Indicates item's visibility when on pop-up menu.")]
+		public eMenuVisibility MenuVisibility
+		{
+			get
+			{
+				return m_MenuVisibility;
+			}
+			set
+			{
+				if(m_MenuVisibility!=value)
+				{
+					m_MenuVisibility=value;
+                    if(ShouldSyncProperties)
+                        BarFunctions.SyncProperty(this, "MenuVisibility");
+				}
+			}
+		}
+		[Browsable(false), DefaultValue(false)]
+		public bool RecentlyUsed
+		{
+			get
+			{
+				return m_RecentlyUsed;
+			}
+			set
+			{
+				if(m_RecentlyUsed!=value)
+				{
+					m_RecentlyUsed=value;
+                    if(ShouldSyncProperties)
+                        BarFunctions.SyncProperty(this, "RecentlyUsed");
+				}
+			}
+		}
+
+		protected override void OnEnabledChanged()
+		{
+			base.OnEnabledChanged();
+			if(m_TextBox!=null)
+				m_TextBox.Enabled=this.Enabled;
+		}
+
+		[System.ComponentModel.Browsable(false),System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+		public override bool IsWindowed
+		{
+			get {return true;}
+		}
+
+        /// <summary>
+        /// Gets or sets whether watermark text is displayed when control is empty. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Description("Indicates whether watermark text is displayed when control is empty.")]
+        public virtual bool WatermarkEnabled
+        {
+            get { return m_TextBox.WatermarkEnabled; }
+            set { m_TextBox.WatermarkEnabled = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the watermark image displayed inside of the control when Text is not set and control does not have input focus.
+        /// </summary>
+        [DefaultValue(null), Category("Appearance"), Description("Indicates watermark image displayed inside of the control when Text is not set and control does not have input focus.")]
+        public Image WatermarkImage
+        {
+            get { return m_TextBox.WatermarkImage; }
+            set { m_TextBox.WatermarkImage = value; }
+        }
+        /// <summary>
+        /// Gets or sets the watermark image alignment.
+        /// </summary>
+        [DefaultValue(ContentAlignment.MiddleLeft), Category("Appearance"), Description("Indicates watermark image alignment.")]
+        public ContentAlignment WatermarkImageAlignment
+        {
+            get { return m_TextBox.WatermarkImageAlignment; }
+            set { m_TextBox.WatermarkImageAlignment = value; }
+        }
+
+        // <summary>
+        /// Gets or sets the watermark (tip) text displayed inside of the control when Text is not set and control does not have input focus. This property supports text-markup.
+        /// </summary>
+        [Browsable(true), DefaultValue(""), Localizable(true), Category("Appearance"), Description("Indicates watermark text displayed inside of the control when Text is not set and control does not have input focus."), Editor("DevComponents.DotNetBar.Design.TextMarkupUIEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor))]
+        public string WatermarkText
+        {
+            get { return m_TextBox.WatermarkText; }
+            set
+            {
+                m_TextBox.WatermarkText = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the watermark font.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), Description("Indicates watermark font."), DefaultValue(null)]
+        public Font WatermarkFont
+        {
+            get { return m_TextBox.WatermarkFont; }
+            set { m_TextBox.WatermarkFont = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the watermark text color.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), Description("Indicates watermark text color.")]
+        public Color WatermarkColor
+        {
+            get { return m_TextBox.WatermarkColor; }
+            set { m_TextBox.WatermarkColor = value; }
+        }
+        /// <summary>
+        /// Indicates whether property should be serialized by Windows Forms designer.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeWatermarkColor()
+        {
+            return m_TextBox.WatermarkColor != SystemColors.GrayText;
+        }
+        /// <summary>
+        /// Resets the property to default value.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetWatermarkColor()
+        {
+            this.WatermarkColor = SystemColors.GrayText;
+        }
+
+        /// <summary>
+        /// Gets or sets the watermark hiding behaviour. Default value indicates that watermark is hidden when control receives input focus.
+        /// </summary>
+        [DefaultValue(eWatermarkBehavior.HideOnFocus), Category("Behavior"), Description("Indicates watermark hiding behaviour.")]
+        public eWatermarkBehavior WatermarkBehavior
+        {
+            get { return m_TextBox.WatermarkBehavior; }
+            set { m_TextBox.WatermarkBehavior = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether FocusHighlightColor is used as background color to highlight text box when it has input focus. Default value is false.
+        /// </summary>
+        [DefaultValue(false), Browsable(true), Category("Appearance"), Description("Indicates whether FocusHighlightColor is used as background color to highlight text box when it has input focus.")]
+        public bool FocusHighlightEnabled
+        {
+            get { return m_TextBox.FocusHighlightEnabled; }
+            set
+            {
+                m_TextBox.FocusHighlightEnabled = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the color used as background color to highlight text box when it has input focus and focus highlight is enabled.
+        /// </summary>
+        [Browsable(true), Category("Appearance"), Description("Indicates color used as background color to highlight text box when it has input focus and focus highlight is enabled.")]
+        public Color FocusHighlightColor
+        {
+            get { return m_TextBox.FocusHighlightColor; }
+            set
+            {
+                m_TextBox.FocusHighlightColor = value;
+            }
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeFocusHighlightColor()
+        {
+            return m_TextBox.ShouldSerializeFocusHighlightColor();
+        }
+
+        [Browsable(false), EditorBrowsable(EditorBrowsableState.Never)]
+        public void ResetFocusHighlightColor()
+        {
+            m_TextBox.ResetFocusHighlightColor();
+        }
+
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content), RefreshProperties(RefreshProperties.All), ParenthesizePropertyName(true)]
+        public ControlBindingsCollection DataBindings
+        {
+            get { return m_TextBox.DataBindings; }
+        }
+
+        /// <summary>
+        /// Gets or sets the text-alignment inside of the text box.
+        /// </summary>
+        [Description("Indicates text-alignment inside of the text box."), Localizable(true), Category("Appearance"), DefaultValue(0)]
+        public HorizontalAlignment TextAlign
+        {
+            get
+            {
+                return m_TextBox.TextAlign;
+            }
+            set
+            {
+                m_TextBox.TextAlign = value;
+            }
+        }
+
+#if FRAMEWORK20
+        /// <summary>
+        /// Gets the object that describes the settings for the custom button that can execute an custom action of your choosing when clicked.
+        /// </summary>
+        [Browsable(true), Category("Buttons"), Description("Describes the settings for the custom button that can execute an custom action of your choosing when clicked."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public InputButtonSettings ButtonCustom
+        {
+            get
+            {
+                return m_TextBox.ButtonCustom;
+            }
+        }
+
+        /// <summary>
+        /// Gets the object that describes the settings for the custom button that can execute an custom action of your choosing when clicked.
+        /// </summary>
+        [Browsable(true), Category("Buttons"), Description("Describes the settings for the custom button that can execute an custom action of your choosing when clicked."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public InputButtonSettings ButtonCustom2
+        {
+            get
+            {
+                return m_TextBox.ButtonCustom2;
+            }
+        }
+#endif
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TextDrawing.cs b/PROMS/DotNetBar Source Code/TextDrawing.cs
new file mode 100644
index 00000000..63082125
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TextDrawing.cs	
@@ -0,0 +1,276 @@
+using System;
+using System.Text;
+using System.Drawing;
+using System.Windows.Forms;
+using System.Drawing.Text;
+using System.Collections.Generic;
+
+#if DOTNETBAR
+namespace DevComponents.DotNetBar
+#elif LAYOUT
+namespace DevComponents.DotNetBar.Layout
+#else
+namespace DevComponents.Tree
+#endif
+{
+    public class TextDrawing
+    {
+        static TextDrawing()
+        {
+            string lc = Application.CurrentCulture.TwoLetterISOLanguageName;
+            if (lc == "ja" || lc == "ko" || lc == "zh" || lc == "ar")
+                UseGenericDefault = true;
+        }
+
+        public static bool TextDrawingEnabled = true;
+        public static bool UseTextRenderer = false;
+
+        public static void DrawString(Graphics g, string text, Font font, Color color, int x, int y, eTextFormat format)
+        {
+            DrawString(g, text, font, color, new Rectangle(x, y, 0, 0), format);
+        }
+        public static void DrawString(Graphics g, string text, Font font, Color color, Rectangle bounds, eTextFormat format)
+        {
+            #if FRAMEWORK20
+            if (UseTextRenderer && (format & eTextFormat.Vertical) == 0)
+                TextRenderer.DrawText(g, text, font, bounds, color, GetTextFormatFlags(format));
+            else
+                DrawStringLegacy(g, text, font, color, bounds, format);
+            #else
+            DrawStringLegacy(g, text, font, color, bounds, format);
+            #endif
+        }
+
+        public static void DrawStringLegacy(Graphics g, string text, Font font, Color color, Rectangle bounds, eTextFormat format)
+        {
+            if (color.IsEmpty || !TextDrawingEnabled)
+                return;
+
+            using (SolidBrush brush = new SolidBrush(color))
+            {
+                //using (StringFormat sf = GetStringFormat(format))
+                StringFormat sf = GetStringFormat(format);
+                    g.DrawString(text, font, brush, bounds, sf);
+            }
+        }
+        public static void DrawStringLegacy(Graphics g, string text, Font font, Color color, RectangleF bounds, eTextFormat format)
+        {
+            if (color.IsEmpty || !TextDrawingEnabled)
+                return;
+
+            using (SolidBrush brush = new SolidBrush(color))
+            {
+                StringFormat sf = GetStringFormat(format);
+                g.DrawString(text, font, brush, bounds, sf);
+            }
+        }
+
+
+        public static Size MeasureString(Graphics g, string text, Font font)
+        {
+            return MeasureString(g, text, font, Size.Empty, eTextFormat.Default);
+        }
+
+        public static Size MeasureString(Graphics g, string text, Font font, int proposedWidth, eTextFormat format)
+        {
+            return MeasureString(g, text, font, new Size(proposedWidth, 0), format);
+        }
+
+        public static Size MeasureString(Graphics g, string text, Font font, int proposedWidth)
+        {
+            return MeasureString(g, text, font, new Size(proposedWidth, 0), eTextFormat.Default);
+        }
+
+        public static Size MeasureString(Graphics g, string text, Font font, Size proposedSize, eTextFormat format)
+        {
+            #if FRAMEWORK20
+            if (UseTextRenderer && (format & eTextFormat.Vertical) == 0)
+            {
+                format = format & ~(format & eTextFormat.VerticalCenter); // Bug in .NET Framework 2.0
+                format = format & ~(format & eTextFormat.Bottom); // Bug in .NET Framework 2.0
+                format = format & ~(format & eTextFormat.HorizontalCenter); // Bug in .NET Framework 2.0
+                format = format & ~(format & eTextFormat.Right); // Bug in .NET Framework 2.0
+                format = format & ~(format & eTextFormat.EndEllipsis); // Bug in .NET Framework 2.0
+                return Size.Ceiling(TextRenderer.MeasureText(g, text, font, proposedSize, GetTextFormatFlags(format)));
+            }
+            //using (StringFormat sf = GetStringFormat(format))
+            StringFormat sf = GetStringFormat(format);
+                return Size.Ceiling(g.MeasureString(text, font, proposedSize, sf));
+            #else
+            //using (StringFormat sf = GetStringFormat(format))
+            StringFormat sf = GetStringFormat(format);
+                return Size.Ceiling(g.MeasureString(text, font, proposedSize, sf));
+#endif
+            }
+
+        public static Size MeasureStringLegacy(Graphics g, string text, Font font, Size proposedSize, eTextFormat format)
+        {
+            //using (StringFormat sf = GetStringFormat(format))
+            StringFormat sf = GetStringFormat(format);
+                return g.MeasureString(text, font, proposedSize, sf).ToSize();
+        }
+
+
+        public static eTextFormat TranslateHorizontal(StringAlignment align)
+        {
+            if (align == StringAlignment.Center)
+                return eTextFormat.HorizontalCenter;
+            else if (align == StringAlignment.Far)
+                return eTextFormat.Right;
+            return eTextFormat.Default;
+        }
+
+        public static eTextFormat TranslateVertical(StringAlignment align)
+        {
+            if (align == StringAlignment.Center)
+                return eTextFormat.VerticalCenter;
+            else if (align == StringAlignment.Far)
+                return eTextFormat.Bottom;
+            return eTextFormat.Default;
+        }
+
+#if FRAMEWORK20
+        public static TextFormatFlags GetTextFormatFlags(eTextFormat format)
+        {
+            format |= eTextFormat.PreserveGraphicsTranslateTransform | eTextFormat.PreserveGraphicsClipping;
+            if((format & eTextFormat.SingleLine)==eTextFormat.SingleLine && (format & eTextFormat.WordBreak)==eTextFormat.WordBreak)
+                format = format & ~(format & eTextFormat.SingleLine);
+            return (TextFormatFlags)format;
+        }
+#endif
+        internal static bool UseGenericDefault = false;
+
+        private static Dictionary<eTextFormat, StringFormat> _CachedFormats = new Dictionary<eTextFormat, StringFormat>();
+        public static StringFormat GetStringFormat(eTextFormat format)
+        {
+            StringFormat sf;
+
+            if (_CachedFormats.TryGetValue(format, out sf)) return sf;
+
+            if (UseGenericDefault)
+                sf = (StringFormat)StringFormat.GenericDefault.Clone(); //new StringFormat(StringFormat.GenericDefault);
+            else
+                sf = (StringFormat)StringFormat.GenericTypographic.Clone(); // new StringFormat(StringFormat.GenericTypographic);
+
+            if (format == eTextFormat.Default)
+            {
+                sf.HotkeyPrefix = HotkeyPrefix.Show;
+                _CachedFormats.Add(format, sf);
+                return sf;
+            }
+            if ((format & eTextFormat.HorizontalCenter) == eTextFormat.HorizontalCenter)
+                sf.Alignment = StringAlignment.Center;
+            else if ((format & eTextFormat.Right) == eTextFormat.Right)
+                sf.Alignment=StringAlignment.Far;
+            if ((format & eTextFormat.VerticalCenter) == eTextFormat.VerticalCenter)
+                sf.LineAlignment=StringAlignment.Center;
+            else if ((format & eTextFormat.Bottom) == eTextFormat.Bottom)
+                sf.LineAlignment=StringAlignment.Far;
+
+            if ((format & eTextFormat.EndEllipsis) == eTextFormat.EndEllipsis)
+                sf.Trimming = StringTrimming.EllipsisCharacter;
+            else
+                sf.Trimming = StringTrimming.Character;
+
+            if ((format & eTextFormat.HidePrefix) == eTextFormat.HidePrefix)
+                sf.HotkeyPrefix = HotkeyPrefix.Hide;
+            else if ((format & eTextFormat.NoPrefix) == eTextFormat.NoPrefix)
+                sf.HotkeyPrefix = HotkeyPrefix.None;
+            else
+                sf.HotkeyPrefix = HotkeyPrefix.Show;
+
+            if ((format & eTextFormat.WordBreak) == eTextFormat.WordBreak)
+                sf.FormatFlags = sf.FormatFlags & ~(sf.FormatFlags & StringFormatFlags.NoWrap);
+            else
+                sf.FormatFlags |= StringFormatFlags.NoWrap;
+				
+			if ((format & eTextFormat.LeftAndRightPadding) == eTextFormat.LeftAndRightPadding)
+                sf.FormatFlags |= StringFormatFlags.MeasureTrailingSpaces;
+
+            if ((format & eTextFormat.RightToLeft) == eTextFormat.RightToLeft)
+                sf.FormatFlags |= StringFormatFlags.DirectionRightToLeft;
+
+            if ((format & eTextFormat.Vertical) == eTextFormat.Vertical)
+                sf.FormatFlags |= StringFormatFlags.DirectionVertical;
+
+            if ((format & eTextFormat.NoClipping) == eTextFormat.NoClipping)
+                sf.FormatFlags |= StringFormatFlags.NoClip;
+
+            _CachedFormats.Add(format, sf);
+
+            return sf;
+        }
+#if DOTNETBAR
+        public static ThemeTextFormat GetTextFormat(eTextFormat format)
+        {
+            ThemeTextFormat ttf = ThemeTextFormat.Left;
+            if (format == eTextFormat.Default)
+                return ttf;
+
+            if ((format & eTextFormat.HorizontalCenter) == eTextFormat.HorizontalCenter)
+                ttf |= ThemeTextFormat.Center;
+            else if ((format & eTextFormat.Right) == eTextFormat.Right)
+                ttf|= ThemeTextFormat.Right;
+            if ((format & eTextFormat.VerticalCenter) == eTextFormat.VerticalCenter)
+                ttf |= ThemeTextFormat.VCenter;
+            else if ((format & eTextFormat.Bottom) == eTextFormat.Bottom)
+                ttf |= ThemeTextFormat.Bottom;
+
+            if ((format & eTextFormat.EndEllipsis) == eTextFormat.EndEllipsis)
+                ttf |= ThemeTextFormat.EndEllipsis;
+
+            if ((format & eTextFormat.HidePrefix) == eTextFormat.HidePrefix)
+                ttf |= ThemeTextFormat.HidePrefix;
+            else if ((format & eTextFormat.NoPrefix) == eTextFormat.NoPrefix)
+                ttf |= ThemeTextFormat.NoPrefix;
+
+            if ((format & eTextFormat.WordBreak) == eTextFormat.WordBreak)
+                ttf |= ThemeTextFormat.WordBreak;
+            else
+                ttf |= ThemeTextFormat.SingleLine;
+
+            if ((format & eTextFormat.RightToLeft) == eTextFormat.RightToLeft)
+                ttf |= ThemeTextFormat.RtlReading;
+
+            if ((format & eTextFormat.NoClipping) == eTextFormat.NoClipping)
+                ttf |= ThemeTextFormat.NoClip;
+
+            return ttf;
+        }
+#endif
+    }
+
+    [Flags]
+    public enum eTextFormat
+    {
+        Bottom = 8,
+        Default = 0,
+        EndEllipsis = 0x8000,
+        ExpandTabs = 0x40,
+        ExternalLeading = 0x200,
+        GlyphOverhangPadding = 0,
+        HidePrefix = 0x100000,
+        HorizontalCenter = 1,
+        Internal = 0x1000,
+        Left = 0,
+        LeftAndRightPadding = 0x20000000,
+        ModifyString = 0x10000,
+        NoClipping = 0x100,
+        NoFullWidthCharacterBreak = 0x80000,
+        NoPadding = 0x10000000,
+        NoPrefix = 0x800,
+        PathEllipsis = 0x4000,
+        PrefixOnly = 0x200000,
+        PreserveGraphicsClipping = 0x1000000,
+        PreserveGraphicsTranslateTransform = 0x2000000,
+        Right = 2,
+        RightToLeft = 0x20000,
+        SingleLine = 0x20,
+        TextBoxControl = 0x2000,
+        Top = 0,
+        VerticalCenter = 4,
+        WordBreak = 0x10,
+        WordEllipsis = 0x40000,
+        Vertical = 0x40000000
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/TextMarkup/BodyElement.cs b/PROMS/DotNetBar Source Code/TextMarkup/BodyElement.cs
new file mode 100644
index 00000000..6dcee92e
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TextMarkup/BodyElement.cs	
@@ -0,0 +1,96 @@
+using System;
+using System.Text;
+using System.Windows.Forms;
+
+#if AdvTree
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#elif LAYOUT
+namespace DevComponents.DotNetBar.Layout.TextMarkup
+#endif
+{
+    internal class BodyElement : ContainerElement
+    {
+        #region Private Variables
+        private MarkupElementCollection m_ActiveElements=null;
+        private IActiveMarkupElement m_MouseOverElement = null;
+        internal bool HasExpandElement = false;
+        internal string PlainText = "";
+        #endregion
+
+        #region Events
+        public event EventHandler HyperLinkClick;
+        #endregion
+
+        #region Internal Implementation
+        public BodyElement()
+        {
+            m_ActiveElements = new MarkupElementCollection(null);
+        }
+
+        public MarkupElementCollection ActiveElements
+        {
+            get { return m_ActiveElements; }
+        }
+
+        public void MouseLeave(Control parent)
+        {
+            if (m_MouseOverElement != null)
+                m_MouseOverElement.MouseLeave(parent);
+            m_MouseOverElement = null;
+        }
+
+        public void MouseMove(Control parent, MouseEventArgs e)
+        {
+            if (m_MouseOverElement != null && m_MouseOverElement.HitTest(e.X, e.Y))
+                return;
+            if (m_MouseOverElement != null)
+                m_MouseOverElement.MouseLeave(parent);
+            
+            m_MouseOverElement = null;
+
+            foreach(IActiveMarkupElement el in m_ActiveElements)
+            {
+                if (el.HitTest(e.X, e.Y))
+                {
+                    m_MouseOverElement = el;
+                    m_MouseOverElement.MouseEnter(parent);
+                }
+            }
+        }
+
+        public void MouseDown(Control parent, MouseEventArgs e)
+        {
+            if (m_MouseOverElement != null)
+                m_MouseOverElement.MouseDown(parent, e);
+        }
+
+        public void MouseUp(Control parent, MouseEventArgs e)
+        {
+            if (m_MouseOverElement != null)
+                m_MouseOverElement.MouseUp(parent, e);
+        }
+
+        public void Click(Control parent)
+        {
+            if (m_MouseOverElement != null)
+            {
+                m_MouseOverElement.Click(parent);
+                if (m_MouseOverElement is HyperLink)
+                {
+                    if (HyperLinkClick != null)
+                        HyperLinkClick(m_MouseOverElement, new EventArgs());
+                }
+            }
+        }
+
+        public IActiveMarkupElement MouseOverElement
+        {
+            get { return m_MouseOverElement;}
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/TextMarkup/ContainerElement.cs b/PROMS/DotNetBar Source Code/TextMarkup/ContainerElement.cs
new file mode 100644
index 00000000..dabe4124
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TextMarkup/ContainerElement.cs	
@@ -0,0 +1,113 @@
+using System;
+using System.Text;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+
+#if AdvTree
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+using DevComponents.UI.ContentManager;
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#elif LAYOUT
+namespace DevComponents.DotNetBar.Layout.TextMarkup
+#endif
+{
+    internal class ContainerElement : MarkupElement
+    {
+        #region Private Variables
+        private SerialContentLayoutManager m_Layout = null;
+        private MarkupLayoutManager m_MarkupLayout = null;
+        #endregion
+
+        #region Internal Implementation
+        public override void Measure(Size availableSize, MarkupDrawContext d)
+        {
+            ArrangeInternal(new Rectangle(Point.Empty, availableSize), d);
+        }
+
+        protected virtual SerialContentLayoutManager GetLayoutManager(bool mutliLine)
+        {
+            if (m_Layout == null)
+            {
+                m_Layout = new SerialContentLayoutManager();
+                m_Layout.MultiLine = mutliLine;
+                m_Layout.ContentVerticalAlignment = eContentVerticalAlignment.Top;
+                m_Layout.BlockLineAlignment = eContentVerticalAlignment.Top;
+                m_Layout.BlockSpacing = 0;
+            }
+
+            m_Layout.EvenHeight = true;
+            return m_Layout;
+        }
+
+        private MarkupLayoutManager GetMarkupLayout()
+        {
+            if (m_MarkupLayout == null)
+            {
+                m_MarkupLayout = new MarkupLayoutManager();
+            }
+            return m_MarkupLayout;
+        }
+
+        public override void Render(MarkupDrawContext d)
+        {
+            Point offset = this.GetContainerOffset();
+            d.Offset.Offset(offset.X, offset.Y);
+
+            try
+            {
+                foreach (MarkupElement e in this.Elements)
+                {
+                    e.Render(d);
+                }
+            }
+            finally
+            {
+                d.Offset.Offset(-offset.X, -offset.Y);
+            }
+        }
+
+        protected virtual Point GetContainerOffset()
+        {
+            return this.Bounds.Location;
+        }
+
+        protected override void ArrangeCore(Rectangle finalRect, MarkupDrawContext d)
+        {
+            this.Bounds = finalRect;
+            ArrangeInternal(finalRect, d);
+        }
+
+        protected virtual void ArrangeInternal(Rectangle bounds, MarkupDrawContext d)
+        {
+            SerialContentLayoutManager layout = GetLayoutManager(d.AllowMultiLine);
+            layout.RightToLeft = d.RightToLeft;
+            MarkupLayoutManager markupLayout = GetMarkupLayout();
+            markupLayout.MarkupDrawContext = d;
+            try
+            {
+                MarkupElement[] blocks = new MarkupElement[this.Elements.Count];
+                this.Elements.CopyTo(blocks);
+
+                Rectangle r = layout.Layout(new Rectangle(Point.Empty, bounds.Size), blocks, markupLayout);
+                this.Bounds = new Rectangle(bounds.Location, r.Size);
+            }
+            finally
+            {
+                markupLayout.MarkupDrawContext = null;
+            }
+        }
+
+        /// <summary>
+        /// Returns whether markup element is an block element that always consumes a whole line in layout.
+        /// </summary>
+        public override bool IsBlockElement
+        {
+            get { return true; }
+        }
+        #endregion
+        
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/TextMarkup/Div.cs b/PROMS/DotNetBar Source Code/TextMarkup/Div.cs
new file mode 100644
index 00000000..8a240c34
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TextMarkup/Div.cs	
@@ -0,0 +1,226 @@
+using System;
+using System.Text;
+using System.Drawing;
+using System.Xml;
+
+#if AdvTree
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+using DevComponents.UI.ContentManager;
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#elif LAYOUT
+namespace DevComponents.DotNetBar.Layout.TextMarkup
+#endif
+{
+    internal class Div : ContainerElement
+    {
+        #region Private Variables
+        private eParagraphAlignment m_Align = eParagraphAlignment.Left;
+        private eParagraphVerticalAlignment m_VAlign = eParagraphVerticalAlignment.Top;
+        private int m_Width = 0;
+        private int m_Height = 0;
+        private Padding m_Padding = new Padding(0, 0, 0, 0);
+        private Color m_BackColor = Color.Empty;
+        #endregion
+
+        #region Internal Implementation
+        public override void Render(MarkupDrawContext d)
+        {
+            Rectangle r = this.Bounds;
+            r.Offset(d.Offset);
+            if (!m_BackColor.IsEmpty)
+            {
+                DisplayHelp.FillRectangle(d.Graphics, r, m_BackColor);
+            }
+
+            base.Render(d);
+        }
+
+        public eParagraphAlignment Align
+        {
+            get { return m_Align; }
+            set { m_Align = value; }
+        }
+
+        protected override SerialContentLayoutManager GetLayoutManager(bool multiLine)
+        {
+            SerialContentLayoutManager sm = base.GetLayoutManager(multiLine);
+            if (m_Align == eParagraphAlignment.Left)
+                sm.ContentAlignment = eContentAlignment.Left;
+            else if (m_Align == eParagraphAlignment.Right)
+                sm.ContentAlignment = eContentAlignment.Right;
+            else if (m_Align == eParagraphAlignment.Center)
+                sm.ContentAlignment = eContentAlignment.Center;
+
+            if (m_VAlign != eParagraphVerticalAlignment.Top)
+            {
+                sm.EvenHeight = false;
+                sm.ContentVerticalAlignment = (m_VAlign == eParagraphVerticalAlignment.Bottom ? eContentVerticalAlignment.Bottom : eContentVerticalAlignment.Middle);
+                //sm.BlockLineAlignment = (m_VAlign == eParagraphVerticalAlignment.Bottom ? eContentVerticalAlignment.Bottom : eContentVerticalAlignment.Middle);
+            }
+
+            return sm;
+        }
+
+        protected override Point GetContainerOffset()
+        {
+            if (m_Padding.Left == 0 && m_Padding.Top == 0)
+                return base.GetContainerOffset();
+            
+            Point p = base.GetContainerOffset();
+            p.X += m_Padding.Left;
+            p.Y += m_Padding.Top;
+            return p;
+        }
+
+        protected override void ArrangeInternal(Rectangle bounds, MarkupDrawContext d)
+        {
+            Rectangle r = bounds;
+            int width = Dpi.Width(m_Width);
+            if (width > 0)
+                r.Width = width;
+            int height = Dpi.Height(m_Height);
+            if (height > 0)
+                r.Height = height;
+            Padding padding = Dpi.Size(m_Padding);
+            if (padding.IsEmpty)
+            {
+                base.ArrangeInternal(r, d);
+                if (width > 0)
+                    this.Bounds = new Rectangle(this.Bounds.X, this.Bounds.Y, width, height > 0 ? height : this.Bounds.Height + padding.Bottom);
+                else if(height>0)
+                    this.Bounds = new Rectangle(this.Bounds.X, this.Bounds.Y, this.Bounds.Width, height);
+            }
+            else
+            {
+                r.X += padding.Left;
+                r.Y += padding.Top;
+                r.Width -= padding.Horizontal;
+                r.Height -= padding.Vertical;
+                base.ArrangeInternal(r, d);
+
+                r = new Rectangle(bounds.X, bounds.Y, this.Bounds.Width + padding.Horizontal, this.Bounds.Height + padding.Vertical);
+                if (width > 0)
+                    r.Width = width;
+                if (height > 0)
+                    r.Height = height;
+                
+                this.Bounds = r;
+            }
+        }
+
+        public override void ReadAttributes(XmlTextReader reader)
+        {
+            for (int i = 0; i < reader.AttributeCount; i++)
+            {
+                reader.MoveToAttribute(i);
+                if (reader.Name.ToLower() == "align")
+                {
+                    string s = reader.Value.ToLower();
+                    if (s == "left")
+                        m_Align = eParagraphAlignment.Left;
+                    else if (s == "right")
+                        m_Align = eParagraphAlignment.Right;
+                    else if (s == "center")
+                        m_Align = eParagraphAlignment.Center;
+                }
+                else if (reader.Name.ToLower() == "valign")
+                {
+                    string s = reader.Value.ToLower();
+                    if (s == "top")
+                        m_VAlign = eParagraphVerticalAlignment.Top;
+                    else if (s == "middle")
+                        m_VAlign = eParagraphVerticalAlignment.Middle;
+                    else if (s == "bottom")
+                        m_VAlign = eParagraphVerticalAlignment.Bottom;
+                }
+                else if (reader.Name.ToLower() == "width")
+                {
+                    try
+                    {
+                        m_Width = Int32.Parse(reader.Value);
+                    }
+                    catch
+                    {
+                        m_Width = 0;
+                    }
+                }
+                else if (reader.Name.ToLower() == "height")
+                {
+                    try
+                    {
+                        m_Height = Int32.Parse(reader.Value);
+                    }
+                    catch
+                    {
+                        m_Height = 0;
+                    }
+                }
+                else if (reader.Name.ToLower() == "padding")
+                {
+                    try
+                    {
+                        string[] values = reader.Value.Split(',');
+                        if (values.Length > 0)
+                            m_Padding.Left = Int32.Parse(values[0]);
+                        if (values.Length > 1)
+                            m_Padding.Right = Int32.Parse(values[1]);
+                        if (values.Length > 2)
+                            m_Padding.Top = Int32.Parse(values[2]);
+                        if (values.Length > 3)
+                            m_Padding.Bottom = Int32.Parse(values[3]);
+                    }
+                    catch
+                    {
+                        m_Padding = new Padding(0,0,0,0);
+                    }
+                }
+                else if (reader.Name.ToLower() == "bgcolor")
+                {
+                    try
+                    {
+                        string s = reader.Value;
+                        if (s.StartsWith("#"))
+                        {
+                            if (s.Length == 7)
+                                m_BackColor = ColorScheme.GetColor(s.Substring(1));
+                        }
+                        else
+                        {
+                            m_BackColor = Color.FromName(s);
+                        }
+                    }
+                    catch
+                    {
+                        m_BackColor = Color.Empty;
+                    }
+                }
+            }
+        }
+        #endregion
+    }
+
+    #region eParagraphAlignment
+    /// <summary>
+    /// Indicates paragraph content alignment
+    /// </summary>
+    internal enum eParagraphAlignment
+    {
+        Left,
+        Right,
+        Center
+    }
+
+    /// <summary>
+    /// Indicates paragraph content alignment
+    /// </summary>
+    internal enum eParagraphVerticalAlignment
+    {
+        Top,
+        Middle,
+        Bottom
+    }
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/TextMarkup/EndMarkupElement.cs b/PROMS/DotNetBar Source Code/TextMarkup/EndMarkupElement.cs
new file mode 100644
index 00000000..6196699b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TextMarkup/EndMarkupElement.cs	
@@ -0,0 +1,50 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+#if AdvTree
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#elif LAYOUT
+namespace DevComponents.DotNetBar.Layout.TextMarkup
+#endif
+{
+    internal class EndMarkupElement : MarkupElement
+    {
+        #region Internap Implementation
+        private MarkupElement m_StartElement = null;
+
+        public EndMarkupElement(MarkupElement startElement)
+        {
+            m_StartElement = startElement;
+        }
+
+        public override void Measure(System.Drawing.Size availableSize, MarkupDrawContext d)
+        {
+            m_StartElement.MeasureEnd(availableSize, d);
+            this.Bounds = Rectangle.Empty;
+        }
+
+        public override void Render(MarkupDrawContext d)
+        {
+            m_StartElement.RenderEnd(d);
+        }
+
+        protected override void ArrangeCore(System.Drawing.Rectangle finalRect, MarkupDrawContext d)
+        {
+            this.Bounds = Rectangle.Empty;
+        }
+
+        /// <summary>
+        /// Gets reference to markup start element.
+        /// </summary>
+        public MarkupElement StartElement
+        {
+            get { return m_StartElement; }
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/TextMarkup/ExpandElement.cs b/PROMS/DotNetBar Source Code/TextMarkup/ExpandElement.cs
new file mode 100644
index 00000000..5667b73d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TextMarkup/ExpandElement.cs	
@@ -0,0 +1,202 @@
+using System;
+using System.Text;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Xml;
+
+#if AdvTree
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#elif LAYOUT
+namespace DevComponents.DotNetBar.Layout.TextMarkup
+#endif
+{
+    internal class ExpandElement : MarkupElement
+    {
+        #region Internal Implementation
+        private Size m_DefaultSize = new Size(5, 4);
+        private eExpandDirection m_Direction = eExpandDirection.Default;
+
+        public override void Measure(System.Drawing.Size availableSize, MarkupDrawContext d)
+        {
+            this.Bounds = new Rectangle(Point.Empty, Dpi.Size(m_DefaultSize));
+        }
+
+        protected override void ArrangeCore(System.Drawing.Rectangle finalRect, MarkupDrawContext d) { }
+
+        public override void Render(MarkupDrawContext d)
+        {
+            Rectangle r = this.Bounds;
+            r.Offset(d.Offset);
+
+            if (!d.ClipRectangle.IsEmpty && !r.IntersectsWith(d.ClipRectangle))
+                return;
+
+            Graphics g = d.Graphics;
+            Color color = d.CurrentForeColor;
+            //Color shadeColor = Color.FromArgb(96, Color.White);
+
+            eExpandDirection direction = eExpandDirection.Bottom;
+            if (m_Direction != eExpandDirection.Default)
+                direction = m_Direction;
+
+            #if DOTNETBAR
+            if(d.ContextObject is ButtonItem)
+            {
+                if (m_Direction == eExpandDirection.Default)
+                {
+                    ButtonItem item = d.ContextObject as ButtonItem;
+                    if (item.IsOnMenu)
+                    {
+                        direction = eExpandDirection.Right;
+                        if (item.PopupSide == ePopupSide.Default && d.RightToLeft || item.PopupSide == ePopupSide.Left)
+                            direction = eExpandDirection.Left;
+                    }
+                    else if (item.PopupSide == ePopupSide.Default)
+                        direction = eExpandDirection.Bottom;
+                    else if (item.PopupSide == ePopupSide.Left)
+                        direction = eExpandDirection.Left;
+                    else if (item.PopupSide == ePopupSide.Right)
+                        direction = eExpandDirection.Right;
+                    else if (item.PopupSide == ePopupSide.Bottom)
+                        direction = eExpandDirection.Bottom;
+                    else if (item.PopupSide == ePopupSide.Top)
+                        direction = eExpandDirection.Top;
+                }
+            }
+            #endif
+
+            SmoothingMode sm = g.SmoothingMode;
+            g.SmoothingMode = SmoothingMode.None;
+
+            Rectangle shadeRect = r;
+            if (direction == eExpandDirection.Bottom || direction == eExpandDirection.PopupDropDown)
+                shadeRect.Offset(0, 1);
+            else if (direction == eExpandDirection.Top)
+                shadeRect.Offset(0, -1);
+            else if (direction == eExpandDirection.Left)
+                shadeRect.Offset(1, 0);
+            else if (direction == eExpandDirection.Right)
+                shadeRect.Offset(-1, 0);
+            Point[] p = GetExpandPolygon(shadeRect, direction);
+            //using (SolidBrush brush = new SolidBrush(shadeColor))
+            //    g.FillPolygon(brush, p);
+
+            p = GetExpandPolygon(r, direction);
+            using(SolidBrush brush = new SolidBrush(color))
+                g.FillPolygon(brush, p);
+
+            if (direction == eExpandDirection.PopupDropDown)
+            {
+                using (Pen pen = new Pen(color, Dpi.Height1))
+                    g.DrawLine(pen, r.X, r.Y - Dpi.Width2, r.Right - 1, r.Y - Dpi.Width2);
+                //using (Pen pen = new Pen(shadeColor, 1))
+                //    g.DrawLine(pen, r.X, r.Y - 1, r.Right - 1, r.Y - 1);
+            }
+
+            g.SmoothingMode = sm;
+
+            this.RenderBounds = r;
+        }
+
+        private Point[] GetExpandPolygon(Rectangle r, eExpandDirection direction)
+        {
+            Point[] p = new Point[3];
+            int signHeight = Dpi.Height(m_DefaultSize.Height);
+            switch (direction)
+            {
+                case eExpandDirection.Right:
+                    {
+                        p[0].X = r.Left + 1;
+                        p[0].Y = r.Top + (r.Height - signHeight) / 2 - 1;
+                        p[1].X = p[0].X;
+                        p[1].Y = p[0].Y + Dpi.Height6;
+                        p[2].X = p[0].X + Dpi.Width3;
+                        p[2].Y = p[0].Y + Dpi.Height3;
+                        break;
+                    }
+                case eExpandDirection.Left:
+                    {
+                        p[0].X = r.Left + Dpi.Width3;
+                        p[0].Y = r.Top + (r.Height - signHeight) / 2 - 1;
+                        p[1].X = p[0].X;
+                        p[1].Y = p[0].Y + Dpi.Height6;
+                        p[2].X = p[0].X - Dpi.Width3;
+                        p[2].Y = p[0].Y + Dpi.Height3;
+                        break;
+                    }
+                case eExpandDirection.Top:
+                    {
+                        p[0].X = r.Left - 1;
+                        p[0].Y = r.Top + (r.Height - signHeight) / 2 + signHeight;
+                        p[1].X = p[0].X + Dpi.Width6;
+                        p[1].Y = p[0].Y;
+                        p[2].X = p[0].X + Dpi.Width3;
+                        p[2].Y = p[0].Y - Dpi.Height4;
+                        break;
+                    }
+                case eExpandDirection.Bottom:
+                case eExpandDirection.PopupDropDown:
+                    {
+                        p[0].X = r.Left;
+                        p[0].Y = r.Top + (r.Height - signHeight) / 2 + 1;
+                        p[1].X = p[0].X + Dpi.Width5;
+                        p[1].Y = p[0].Y;
+                        p[2].X = p[0].X + Dpi.Width2;
+                        p[2].Y = p[0].Y + Dpi.Height3;
+                        break;
+                    }
+            }
+            return p;
+        }
+
+        public override void ReadAttributes(XmlTextReader reader)
+        {
+            m_Direction = eExpandDirection.Default;
+
+            for (int i = 0; i < reader.AttributeCount; i++)
+            {
+                reader.MoveToAttribute(i);
+                if (reader.Name.ToLower() == "direction")
+                {
+                    string s = reader.Value.ToLower();
+                    if (s == "left")
+                        m_Direction = eExpandDirection.Left;
+                    else if (s == "right")
+                        m_Direction = eExpandDirection.Right;
+                    else if (s == "top")
+                        m_Direction = eExpandDirection.Top;
+                    else if (s == "bottom")
+                        m_Direction = eExpandDirection.Bottom;
+                    else if (s == "popup")
+                        m_Direction = eExpandDirection.PopupDropDown;
+                    break;
+                }
+            }
+        }
+
+        private enum eExpandDirection
+        {
+            Left,
+            Right,
+            Top,
+            Bottom,
+            Default,
+            PopupDropDown
+        }
+
+        /// <summary>
+        /// Returns whether layout manager can start new line with this element.
+        /// </summary>
+        public override bool CanStartNewLine
+        {
+            get { return false; }
+        }
+        #endregion
+
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/TextMarkup/FontChangeElement.cs b/PROMS/DotNetBar Source Code/TextMarkup/FontChangeElement.cs
new file mode 100644
index 00000000..fbc1c7c7
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TextMarkup/FontChangeElement.cs	
@@ -0,0 +1,57 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+#if AdvTree
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#elif LAYOUT
+namespace DevComponents.DotNetBar.Layout.TextMarkup
+#endif
+{
+    internal class FontChangeElement : MarkupElement
+    {
+        #region Private Variables
+        protected Font m_OldFont = null;
+        #endregion
+
+        #region Internal Implementation
+
+        public override void Measure(Size availableSize, MarkupDrawContext d)
+        {
+            this.Bounds = Rectangle.Empty;
+            SetFont(d);
+        }
+
+        public override void Render(MarkupDrawContext d)
+        {
+            SetFont(d);
+        }
+
+        protected virtual void SetFont(MarkupDrawContext d)
+        {
+            
+        }
+
+        public override void RenderEnd(MarkupDrawContext d)
+        {
+            if(m_OldFont!=null)
+                d.CurrentFont = m_OldFont;
+            m_OldFont = null;
+            base.RenderEnd(d);
+        }
+
+        public override void MeasureEnd(Size availableSize, MarkupDrawContext d)
+        {
+            if (m_OldFont != null)
+                d.CurrentFont = m_OldFont;
+            m_OldFont = null;
+            base.MeasureEnd(availableSize, d);
+        }
+        protected override void ArrangeCore(Rectangle finalRect, MarkupDrawContext d) { }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/TextMarkup/FontElement.cs b/PROMS/DotNetBar Source Code/TextMarkup/FontElement.cs
new file mode 100644
index 00000000..9a91a977
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TextMarkup/FontElement.cs	
@@ -0,0 +1,187 @@
+using System;
+using System.Text;
+using System.Drawing;
+using System.Xml;
+
+#if AdvTree
+using DevComponents.Tree;
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#elif LAYOUT
+namespace DevComponents.DotNetBar.Layout.TextMarkup
+#endif
+{
+    internal class FontElement : FontChangeElement
+    {
+        #region Private Variables
+        private Color m_ForeColor = Color.Empty;
+        private Color m_OldForeColor = Color.Empty;
+        private int m_Size = 0;
+        private bool m_RelativeSize = false;
+        private string m_Face = "";
+        private string m_SystemColorName = "";
+        #endregion
+
+        #region Internal Implementation
+        protected override void SetFont(MarkupDrawContext d)
+        {
+            Font font = d.CurrentFont;
+            try
+            {
+                if (m_Face != "" || m_Size != 0 && m_RelativeSize || m_Size>4 && !m_RelativeSize)
+                {
+                    if (m_Face != "")
+                        d.CurrentFont = new Font(m_Face, ((m_RelativeSize || m_Size == 0)?font.SizeInPoints + m_Size:m_Size), font.Style);
+                    else
+                        d.CurrentFont = new Font(font.FontFamily, ((m_RelativeSize || m_Size == 0)? font.SizeInPoints + m_Size : m_Size), font.Style);
+                }
+                else
+                    font = null;
+            }
+            catch
+            {
+                font = null;
+            }
+
+            if (font != null)
+                m_OldFont = font;
+
+            if (!d.IgnoreFormattingColors)
+            {
+                if (!m_ForeColor.IsEmpty)
+                {
+                    m_OldForeColor = d.CurrentForeColor;
+                    d.CurrentForeColor = m_ForeColor;
+                }
+                else if (m_SystemColorName != "")
+                {
+#if DOTNETBAR
+                    if (Rendering.GlobalManager.Renderer is Rendering.Office2007Renderer)
+                    {
+                        m_OldForeColor = d.CurrentForeColor;
+                        d.CurrentForeColor = ((Rendering.Office2007Renderer)Rendering.GlobalManager.Renderer).ColorTable.Form.Active.CaptionTextExtra;
+                    }
+#endif
+                }
+            }
+        }
+
+        public override void RenderEnd(MarkupDrawContext d)
+        {
+            RestoreForeColor(d);
+
+            base.RenderEnd(d);
+        }
+
+        public override void MeasureEnd(Size availableSize, MarkupDrawContext d)
+        {
+            RestoreForeColor(d);
+            base.MeasureEnd(availableSize, d);
+        }
+
+        protected virtual void RestoreForeColor(MarkupDrawContext d)
+        {
+            if (d == null) return;
+            if (!m_OldForeColor.IsEmpty)
+                d.CurrentForeColor = m_OldForeColor;
+            m_OldForeColor = Color.Empty;
+        }
+
+        public Color ForeColor
+        {
+            get { return m_ForeColor; }
+            set { m_ForeColor = value; }
+        }
+
+        public int Size
+        {
+            get { return m_Size; }
+            set { m_Size = value; }
+        }
+
+        public string Face
+        {
+            get { return m_Face; }
+            set { m_Face = value; }
+        }
+
+        private Color GetColorFromName(string name)
+        {
+            string s = name.ToLower();
+            m_SystemColorName = "";
+            if (s == "syscaptiontextextra")
+            {
+                m_SystemColorName = s;
+                return Color.Empty;
+            }
+
+            return Color.FromName(name);
+        }
+
+        public override void ReadAttributes(XmlTextReader reader)
+        {
+            m_RelativeSize = false;
+            for (int i = 0; i < reader.AttributeCount; i++)
+            {
+                reader.MoveToAttribute(i);
+                if (reader.Name.ToLower() == "color")
+                {
+                    try
+                    {
+                        string s = reader.Value;
+                        if (s.StartsWith("#"))
+                        {
+                            if (s.Length == 7)
+                                m_ForeColor = ColorScheme.GetColor(s.Substring(1));
+                        }
+                        else
+                        {
+                            m_ForeColor = GetColorFromName(s);
+                        }
+                    }
+                    catch
+                    {
+                        m_ForeColor = Color.Empty;
+                    }
+                }
+                else if (reader.Name.ToLower() == "size")
+                {
+                    string s = reader.Value;
+                    if (s.StartsWith("+"))
+                    {
+                        try
+                        {
+                            m_Size = Int32.Parse(s.Substring(1));
+                            m_RelativeSize = true;
+                        }
+                        catch
+                        {
+                            m_Size = 0;
+                        }
+                    }
+                    else
+                    {
+                        if (s.StartsWith("-"))
+                            m_RelativeSize = true;
+                        try
+                        {
+                            m_Size = Int32.Parse(s);
+                        }
+                        catch
+                        {
+                            m_Size = 0;
+                        }
+                    }
+                }
+                else if (reader.Name.ToLower() == "face")
+                {
+                    m_Face = reader.Value;
+                }
+            }
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/TextMarkup/Heading.cs b/PROMS/DotNetBar Source Code/TextMarkup/Heading.cs
new file mode 100644
index 00000000..fa06d9c2
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TextMarkup/Heading.cs	
@@ -0,0 +1,97 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+#if AdvTree
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#elif LAYOUT
+namespace DevComponents.DotNetBar.Layout.TextMarkup
+#endif
+{
+    internal class Heading: ContainerElement
+    {
+        #region Private Variables
+        private int m_Level = 1;
+        private Font m_OldFont = null;
+        #endregion
+
+        #region Internal Implementation
+        public Heading() { }
+        public Heading(int level)
+        {
+            m_Level = level;
+        }
+
+        public override void Measure(Size availableSize, MarkupDrawContext d)
+        {
+            SetFont(d);
+            base.Measure(availableSize, d);
+            if (m_OldFont != null)
+                d.CurrentFont = m_OldFont;
+        }
+
+        public override void Render(MarkupDrawContext d)
+        {
+            SetFont(d);
+            base.Render(d);
+            if (m_OldFont != null)
+                d.CurrentFont = m_OldFont;
+        }
+
+        protected virtual void SetFont(MarkupDrawContext d)
+        {
+            Font font = d.CurrentFont;
+            try
+            {
+                float size = d.CurrentFont.SizeInPoints;
+                if (m_Level == 1)
+                {
+                    size += 12;
+                }
+                else if (m_Level == 2)
+                {
+                    size += 8;
+                }
+                else if (m_Level == 3)
+                {
+                    size += 6;
+                }
+                else if (m_Level == 4)
+                {
+                    size += 4;
+                }
+                else if (m_Level == 5)
+                {
+                    size += 2;
+                }
+                else if (m_Level == 6)
+                {
+                    size += 1;
+                }
+
+                d.CurrentFont = new Font(d.CurrentFont.FontFamily, size, FontStyle.Bold);
+            }
+            catch
+            {
+                font = null;
+            }
+
+            if (font != null)
+                m_OldFont = font;
+        }
+
+        /// <summary>
+        /// Gets or sets heading level. Values from 1 to 6 are valid. Default is 1.
+        /// </summary>
+        public int Level
+        {
+            get { return m_Level; }
+            set { m_Level = value; }
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/TextMarkup/HyperLink.cs b/PROMS/DotNetBar Source Code/TextMarkup/HyperLink.cs
new file mode 100644
index 00000000..7753b918
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TextMarkup/HyperLink.cs	
@@ -0,0 +1,249 @@
+using System;
+using System.Text;
+using System.Drawing;
+using System.Xml;
+using System.Windows.Forms;
+using System.Drawing.Drawing2D;
+
+#if AdvTree
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#elif LAYOUT
+namespace DevComponents.DotNetBar.Layout.TextMarkup
+#endif
+{
+    internal class HyperLink : MarkupElement, IActiveMarkupElement
+    {
+        #region Private Variables
+        private Color m_ForeColor = Color.Empty;
+        private Color m_OldForeColor = Color.Empty;
+        private string m_HRef = "";
+        private string m_Name = "";
+        private Cursor m_OldCursor = null;
+        private bool m_IsMouseOver = false;
+        private bool m_Visited = false;
+        #endregion
+
+        #region Internal Implementation
+        public override void Measure(Size availableSize, MarkupDrawContext d)
+        {
+            this.Bounds = Rectangle.Empty;
+            SetForeColor(d);
+        }
+
+        public override void Render(MarkupDrawContext d)
+        {
+            d.HyperLink = true;
+            d.HyperlinkStyle = GetHyperlinkStyle();
+            if (!d.HyperlinkStyle.BackColor.IsEmpty)
+            {
+                using (GraphicsPath gp = new GraphicsPath())
+                {
+                    MarkupElementCollection col = this.Parent.Elements;
+                    int start = col.IndexOf(this) + 1;
+                    for (int i = start; i < col.Count; i++)
+                    {
+                        MarkupElement elem = col[i];
+                        if (!elem.Visible) continue;
+                        if (elem is EndMarkupElement && ((EndMarkupElement)elem).StartElement == this)
+                            break;
+                        gp.AddRectangle(elem.RenderBounds);
+                    }
+
+                    using (SolidBrush brush = new SolidBrush(d.HyperlinkStyle.BackColor))
+                        d.Graphics.FillPath(brush, gp);
+                }
+            }
+            SetForeColor(d);
+        }
+
+        private HyperlinkStyle GetHyperlinkStyle()
+        {
+            if (m_IsMouseOver && MarkupSettings.MouseOverHyperlink.IsChanged)
+                return MarkupSettings.MouseOverHyperlink;
+            else if (m_Visited && MarkupSettings.VisitedHyperlink.IsChanged)
+                return MarkupSettings.VisitedHyperlink;
+
+            return MarkupSettings.NormalHyperlink;
+        }
+
+        protected virtual void SetForeColor(MarkupDrawContext d)
+        {
+            Color c = Color.Empty;
+            HyperlinkStyle style = GetHyperlinkStyle();
+            if (style != null && !style.TextColor.IsEmpty)
+                c = style.TextColor;
+
+            if (!m_ForeColor.IsEmpty)
+                c = m_ForeColor;
+            if (!c.IsEmpty)
+            {
+                m_OldForeColor = d.CurrentForeColor;
+                d.CurrentForeColor = c;
+            }
+        }
+
+        public override void RenderEnd(MarkupDrawContext d)
+        {
+            RestoreForeColor(d);
+            d.HyperLink = false;
+            d.HyperlinkStyle = null;
+            base.RenderEnd(d);
+        }
+
+        public override void MeasureEnd(Size availableSize, MarkupDrawContext d)
+        {
+            RestoreForeColor(d);
+            base.MeasureEnd(availableSize, d);
+        }
+
+        protected override void ArrangeCore(Rectangle finalRect, MarkupDrawContext d) { }
+
+        protected virtual void RestoreForeColor(MarkupDrawContext d)
+        {
+            if (d == null) return;
+            if (!m_OldForeColor.IsEmpty)
+                d.CurrentForeColor = m_OldForeColor;
+            m_OldForeColor = Color.Empty;
+        }
+
+        public Color ForeColor
+        {
+            get { return m_ForeColor; }
+            set { m_ForeColor = value; }
+        }
+
+        public string HRef
+        {
+            get { return m_HRef; }
+            set { m_HRef = value; }
+        }
+
+        public string Name
+        {
+            get { return m_Name; }
+            set { m_Name = value; }
+        }
+
+        public override void ReadAttributes(XmlTextReader reader)
+        {
+            for (int i = 0; i < reader.AttributeCount; i++)
+            {
+                reader.MoveToAttribute(i);
+                if (reader.Name.ToLower() == "href")
+                {
+                    m_HRef = reader.Value;
+                }
+                else if (reader.Name.ToLower() == "name")
+                {
+                    m_Name = reader.Value;
+                }
+                else if (reader.Name.ToLower() == "color")
+                {
+                    try
+                    {
+                        string s = reader.Value;
+                        if (s.StartsWith("#"))
+                        {
+                            if (s.Length == 7)
+                                m_ForeColor = ColorScheme.GetColor(s.Substring(1));
+                        }
+                        else
+                        {
+                            m_ForeColor = GetColorFromName(s);
+                        }
+                    }
+                    catch
+                    {
+                        m_ForeColor = Color.Empty;
+                    }
+                }
+            }
+        }
+
+        private Color GetColorFromName(string name)
+        {
+            return Color.FromName(name);
+        }
+
+        /// <summary>
+        /// Returns whether hyper-link contains specified coordinates.
+        /// </summary>
+        /// <param name="x"></param>
+        /// <param name="y"></param>
+        /// <returns></returns>
+        public bool HitTest(int x, int y)
+        {
+            if (this.Parent == null)
+                return false;
+
+            MarkupElementCollection col = this.Parent.Elements;
+            int start = col.IndexOf(this)+1;
+            for (int i = start; i < col.Count; i++)
+            {
+                MarkupElement el = col[i];
+                if (el is EndMarkupElement && ((EndMarkupElement)el).StartElement == this)
+                    break;
+
+                if (col[i].RenderBounds.Contains(x, y))
+                    return true;
+
+            }
+
+            return false;
+        }
+
+        public void MouseEnter(Control parent)
+        {
+            m_OldCursor = parent.Cursor;
+            parent.Cursor = Cursors.Hand;
+            m_IsMouseOver = true;
+            if (MarkupSettings.MouseOverHyperlink.IsChanged)
+            {
+                InvalidateElements(parent);
+            }
+        }
+
+        public void MouseLeave(Control parent)
+        {
+            if (m_OldCursor != null && parent!=null)
+                parent.Cursor = m_OldCursor;
+            m_OldCursor = null;
+            m_IsMouseOver = false;
+            if (MarkupSettings.MouseOverHyperlink.IsChanged)
+            {
+                InvalidateElements(parent);
+            }
+        }
+
+        public void MouseDown(Control parent, MouseEventArgs e) { }
+        public void MouseUp(Control parent, MouseEventArgs e) { }
+        public void Click(Control parent)
+        {
+            m_Visited = true;
+            if (MarkupSettings.VisitedHyperlink.IsChanged)
+            {
+                InvalidateElements(parent);
+            }
+        }
+
+        private void InvalidateElements(Control parent)
+        {
+            if (this.Parent == null) return;
+            MarkupElementCollection col = this.Parent.Elements;
+            int start = col.IndexOf(this) + 1;
+            for (int i = start; i < col.Count; i++)
+            {
+                MarkupElement elem = col[i];
+                if (!elem.Visible) continue;
+                if (elem is EndMarkupElement && ((EndMarkupElement)elem).StartElement == this)
+                    break;
+                parent.Invalidate(elem.RenderBounds);
+            }
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/TextMarkup/IActiveMarkupElement.cs b/PROMS/DotNetBar Source Code/TextMarkup/IActiveMarkupElement.cs
new file mode 100644
index 00000000..95fb6608
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TextMarkup/IActiveMarkupElement.cs	
@@ -0,0 +1,24 @@
+using System;
+using System.Text;
+using System.Windows.Forms;
+
+#if AdvTree
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#elif LAYOUT
+namespace DevComponents.DotNetBar.Layout.TextMarkup
+#endif
+{
+    internal interface IActiveMarkupElement
+    {
+        bool HitTest(int x, int y);
+        void MouseEnter(Control parent);
+        void MouseLeave(Control parent);
+        void MouseDown(Control parent, MouseEventArgs e);
+        void MouseUp(Control parent, MouseEventArgs e);
+        void Click(Control parent);
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/TextMarkup/ImageElement.cs b/PROMS/DotNetBar Source Code/TextMarkup/ImageElement.cs
new file mode 100644
index 00000000..d78a25c7
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TextMarkup/ImageElement.cs	
@@ -0,0 +1,202 @@
+using System;
+using System.Text;
+using System.Drawing;
+using System.Xml;
+using System.Reflection;
+
+#if AdvTree
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#elif LAYOUT
+namespace DevComponents.DotNetBar.Layout.TextMarkup
+#endif
+
+{
+    internal class ImageElement : MarkupElement
+    {
+        #region Private Variables
+        private Size m_ImageSize = Size.Empty;
+        private string m_ImageSource = "";
+        private Image m_Image = null;
+        #endregion
+
+        #region Internal Implementation
+        public override void Measure(System.Drawing.Size availableSize, MarkupDrawContext d)
+        {
+            if (!m_ImageSize.IsEmpty)
+                this.Bounds = new Rectangle(Point.Empty, m_ImageSize);
+            else if (m_ImageSource.Length == 0)
+                this.Bounds = Rectangle.Empty;
+            else
+            {
+                Image img = this.GetImage();
+                if (img != null)
+                    this.Bounds = new Rectangle(Point.Empty, img.Size);
+                else
+                    this.Bounds = new Rectangle(Point.Empty, new Size(16,16));
+            }
+        }
+
+        public override bool IsBlockElement
+        {
+            get
+            {
+                return false;
+            }
+        }
+
+        private Image GetImage()
+        {
+            if (m_Image != null) return m_Image;
+            Assembly a = null;
+
+            // Try static custom image resolver
+            ResolveImageEventArgs e = new ResolveImageEventArgs();
+            e.Key = m_ImageSource;
+            e.ResolvedImage = null;
+            MarkupSettings.InvokeResolveImage(e);
+            if (e.Handled)
+                return e.ResolvedImage;
+
+            // Load from format: ClassLibrary1/ClassLibrary1.MyImage.png or ClassLibrary1/global::ClassLibrary1.Resources.MyImage
+            if (m_ImageSource.IndexOf('/') >= 0)
+            {
+                string[] parts = m_ImageSource.Split('/');
+                a = Assembly.Load(parts[0]);
+                string ResourceName = parts[1];
+                if (a != null)
+                {
+                    m_Image = LoadImageGlobalResource(parts[1], a);
+                    if (m_Image == null)
+                        m_Image = LoadImageResource(parts[1], a);
+
+                    if (m_Image != null) return m_Image;
+                }
+            }
+
+            // Probe Executing Assembly
+            a = Assembly.GetExecutingAssembly();
+            m_Image = LoadImageGlobalResource(m_ImageSource, a);
+            if(m_Image==null)
+                m_Image = LoadImageResource(m_ImageSource, a);
+
+            // Probe Entry Assembly
+            if (m_Image == null)
+            {
+                a = Assembly.GetEntryAssembly();
+                m_Image = LoadImageGlobalResource(m_ImageSource, a);
+                if (m_Image == null)
+                    m_Image = LoadImageResource(m_ImageSource, a);
+            }
+
+            return m_Image;
+        }
+
+        private Image LoadImageGlobalResource(string imageSource, Assembly a)
+        {
+            Image img = null;
+#if FRAMEWORK20
+            if (imageSource.StartsWith("global::"))
+            {
+                string name = imageSource.Substring(8);
+                if (name.Length > 0)
+                {
+                    try
+                    {
+                        int i = name.LastIndexOf('.');
+                        string resName = name.Substring(0, i);
+                        name = name.Substring(i + 1);
+                        System.Resources.ResourceManager r = new System.Resources.ResourceManager(resName, a);
+                        object obj = r.GetObject(name);
+                        img = (Bitmap)obj;
+                    }
+                    catch
+                    {
+                        img = null;
+                    }
+                }
+            }
+#endif
+            return img;
+        }
+
+        private Image LoadImageResource(string imageSource, Assembly a)
+        {
+            Image img = null;
+            try
+            {
+                img = new Bitmap(a.GetManifestResourceStream(imageSource));
+            }
+            catch { }
+
+            return img;
+        }
+
+        public override void Render(MarkupDrawContext d)
+        {
+            Rectangle r = this.Bounds;
+            r.Offset(d.Offset);
+
+            if (!d.ClipRectangle.IsEmpty && !r.IntersectsWith(d.ClipRectangle))
+                return;
+
+            Image img = this.GetImage();
+            if (img != null)
+            {
+                Rectangle imageRect = r;
+                if (m_ImageSize.IsEmpty)
+                    imageRect.Size = img.Size;
+                else
+                    imageRect.Size = m_ImageSize;
+                d.Graphics.DrawImage(img, imageRect);
+            }
+            else
+            {
+                using (SolidBrush brush = new SolidBrush(Color.White))
+                {
+                    d.Graphics.FillRectangle(brush, r);
+                }
+                using (Pen pen = new Pen(Color.DarkGray, 1))
+                {
+                    d.Graphics.DrawRectangle(pen, r);
+                    d.Graphics.DrawLine(pen, r.X, r.Y, r.Right, r.Bottom);
+                    d.Graphics.DrawLine(pen, r.Right, r.Y, r.X, r.Bottom);
+                }
+            }
+
+            this.RenderBounds = r;
+        }
+
+        protected override void ArrangeCore(System.Drawing.Rectangle finalRect, MarkupDrawContext d)  { }
+
+        public override void ReadAttributes(XmlTextReader reader)
+        {
+            m_ImageSize = Size.Empty;
+            m_ImageSource = "";
+            m_Image = null;
+
+            for (int i = 0; i < reader.AttributeCount; i++)
+            {
+                reader.MoveToAttribute(i);
+                if (reader.Name.ToLower() == "width")
+                {
+                    string s = reader.Value;
+                    m_ImageSize.Width = int.Parse(s);
+                }
+                else if (reader.Name.ToLower() == "height")
+                {
+                    string s = reader.Value;
+                    m_ImageSize.Height = int.Parse(s);
+                }
+                else if (reader.Name.ToLower() == "src")
+                {
+                    m_ImageSource = reader.Value;
+                }
+            }
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/TextMarkup/Italic.cs b/PROMS/DotNetBar Source Code/TextMarkup/Italic.cs
new file mode 100644
index 00000000..d43310c7
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TextMarkup/Italic.cs	
@@ -0,0 +1,35 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+#if AdvTree
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#elif LAYOUT
+namespace DevComponents.DotNetBar.Layout.TextMarkup
+#endif
+{
+    internal class Italic : FontChangeElement
+    {
+        #region Internal Implementation
+        protected override void SetFont(MarkupDrawContext d)
+        {
+            Font font = d.CurrentFont;
+            FontStyle style=font.Style | FontStyle.Italic;
+
+            if (!font.Italic && d.CurrentFont.FontFamily.IsStyleAvailable(style))
+                d.CurrentFont = new Font(font, style);
+            else
+                font = null;
+
+            if (font != null)
+                m_OldFont = font;
+
+            base.SetFont(d);
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/TextMarkup/MarkupDrawContext.cs b/PROMS/DotNetBar Source Code/TextMarkup/MarkupDrawContext.cs
new file mode 100644
index 00000000..ad87cc3c
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TextMarkup/MarkupDrawContext.cs	
@@ -0,0 +1,58 @@
+using System;
+using System.Drawing;
+using System.Text;
+
+#if AdvTree
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#elif LAYOUT
+namespace DevComponents.DotNetBar.Layout.TextMarkup
+#endif
+{
+    public class MarkupDrawContext
+    {
+        public Graphics Graphics = null;
+        public Font CurrentFont = null;
+        public Color CurrentForeColor = SystemColors.ControlText;
+        public bool RightToLeft = false;
+        public Point Offset = Point.Empty;
+        public bool HyperLink = false;
+        public HyperlinkStyle HyperlinkStyle = null;
+        public bool Underline = false;
+        public Rectangle ClipRectangle = Rectangle.Empty;
+        public bool HotKeyPrefixVisible = false;
+        public object ContextObject = null;
+        public bool AllowMultiLine = true;
+        public bool IgnoreFormattingColors = false;
+        public bool StrikeOut;
+
+        public MarkupDrawContext(Graphics g, Font currentFont, Color currentForeColor, bool rightToLeft) : this(g, currentFont, currentForeColor, rightToLeft, Rectangle.Empty, false)
+        {
+        }
+
+        public MarkupDrawContext(Graphics g, Font currentFont, Color currentForeColor, bool rightToLeft, Rectangle clipRectangle, bool hotKeyPrefixVisible)
+        {
+            this.Graphics = g;
+            this.CurrentFont = currentFont;
+            this.CurrentForeColor  = currentForeColor;
+            this.RightToLeft = rightToLeft;
+            this.ClipRectangle = clipRectangle;
+            this.HotKeyPrefixVisible = hotKeyPrefixVisible;
+        }
+
+        public MarkupDrawContext(Graphics g, Font currentFont, Color currentForeColor, bool rightToLeft, Rectangle clipRectangle, bool hotKeyPrefixVisible, object contextObject)
+        {
+            this.Graphics = g;
+            this.CurrentFont = currentFont;
+            this.CurrentForeColor = currentForeColor;
+            this.RightToLeft = rightToLeft;
+            this.ClipRectangle = clipRectangle;
+            this.HotKeyPrefixVisible = hotKeyPrefixVisible;
+            this.ContextObject = contextObject;
+        }
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/TextMarkup/MarkupElement.cs b/PROMS/DotNetBar Source Code/TextMarkup/MarkupElement.cs
new file mode 100644
index 00000000..73efd74e
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TextMarkup/MarkupElement.cs	
@@ -0,0 +1,197 @@
+using System;
+using System.Drawing;
+using System.Text;
+using System.Xml;
+
+#if AdvTree
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+using DevComponents.UI.ContentManager;
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#elif LAYOUT
+namespace DevComponents.DotNetBar.Layout.TextMarkup
+#endif
+{
+    internal abstract class MarkupElement : IBlockExtended
+    {
+        #region Private Variables
+        private MarkupElementCollection m_Elements = null;
+        private MarkupElement m_Parent = null;
+        private Rectangle m_Bounds = Rectangle.Empty;
+        private bool m_Visible = true;
+        private bool m_SizeValid = false;
+        private Rectangle m_RenderBounds = Rectangle.Empty;
+        #endregion
+
+        #region Internal Implementation
+        public MarkupElement()
+        {
+            m_Elements = new MarkupElementCollection(this);
+        }
+        /// <summary>
+        /// Returns whether markup element is an container so it receives full available size of parent control for layout.
+        /// </summary>
+        public virtual bool IsBlockContainer
+        {
+            get { return false; }
+        }
+
+        /// <summary>
+        /// Returns whether markup element is an block element that always consumes a whole line in layout.
+        /// </summary>
+        public virtual bool IsBlockElement
+        {
+            get { return false; }
+        }
+
+        /// <summary>
+        /// Returns whether layout manager switches to new line after processing this element.
+        /// </summary>
+        public virtual bool IsNewLineAfterElement
+        {
+            get { return false; }
+        }
+
+        /// <summary>
+        /// Returns whether layout manager can start new line with this element.
+        /// </summary>
+        public virtual bool CanStartNewLine
+        {
+            get { return true; }
+        }
+
+        /// <summary>
+        /// Gets the collection of child elements if any for this markup element.
+        /// </summary>
+        public virtual MarkupElementCollection Elements
+        {
+            get
+            {
+                if (m_Elements == null)
+                    m_Elements = new MarkupElementCollection(this);
+                return m_Elements; 
+            }
+        }
+
+        internal void InvalidateElementsSize()
+        {
+            this.IsSizeValid = false;
+            if (m_Elements==null || m_Elements.Count == 0)
+                return;
+            foreach (MarkupElement e in m_Elements)
+            {
+                e.InvalidateElementsSize();
+                e.IsSizeValid = false;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether element size is valid. When size is not valid element Measure method will be called to validate size.
+        /// </summary>
+        public virtual bool IsSizeValid
+        {
+            get { return m_SizeValid; }
+            set { m_SizeValid = value; }
+        }
+
+        /// <summary>
+        /// Gets element parent or null if parent is not set.
+        /// </summary>
+        public virtual MarkupElement Parent
+        {
+            get { return m_Parent; }
+        }
+
+        internal void SetParent(MarkupElement parent)
+        {
+            m_Parent = parent;
+        }
+
+        /// <summary>
+        /// Gets or sets actual rendering bounds.
+        /// </summary>
+        public Rectangle Bounds
+        {
+            get { return m_Bounds; }
+            set { m_Bounds = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether markup element is visible.
+        /// </summary>
+        public bool Visible
+        {
+            get { return m_Visible; }
+            set { m_Visible = value; }
+        }
+
+        private Padding _Margin = new Padding(0);
+        /// <summary>
+        /// Gets or sets the element margin.
+        /// </summary>
+        public Padding Margin
+        {
+            get { return _Margin; }
+            set { _Margin = value; }
+        }
+
+        /// <summary>
+        /// Measures the element given available size.
+        /// </summary>
+        /// <param name="availableSize">Size available to element</param>
+        /// <param name="g">Reference to graphics object</param>
+        public abstract void Measure(Size availableSize, MarkupDrawContext d);
+
+        /// <summary>
+        /// Measures the end tag of an element. Most implementations do not need to do anything but implementations like the ones
+        /// that change color should return state back at this time.
+        /// </summary>
+        /// <param name="availableSize"></param>
+        /// <param name="d"></param>
+        public virtual void MeasureEnd(Size availableSize, MarkupDrawContext d) { }
+
+        /// <summary>
+        /// Renders element.
+        /// </summary>
+        /// <param name="d">Provides markup drawing context information.</param>
+        public abstract void Render(MarkupDrawContext d);
+
+        /// <summary>
+        /// Renders element tag end. Most implementations do not need to do anything but mplementations like the ones
+        /// that change color should return state back at this time.
+        /// </summary>
+        /// <param name="d">Provides markup drawing context information.</param>
+        public virtual void RenderEnd(MarkupDrawContext d) { }
+
+        /// <summary>
+        /// Provides final rectangle to element and lets it arrange it's content given new constraint.
+        /// </summary>
+        /// <param name="finalRect">Final rectangle.</param>
+        /// <param name="g"></param>
+        protected abstract void ArrangeCore(Rectangle finalRect, MarkupDrawContext d);
+
+        /// <summary>
+        /// Arranges the element given the final size. Layout is two step process with Measure followed by Arrange.
+        /// </summary>
+        /// <param name="finalSize"></param>
+        /// <param name="g"></param>
+        public void Arrange(Rectangle finalSize, MarkupDrawContext d)
+        {
+            this.ArrangeCore(finalSize, d);
+        }
+
+        public virtual void ReadAttributes(XmlTextReader reader) { }
+
+        /// <summary>
+        /// Gets or sets actual rendered bounds for a give markup element if applicable.
+        /// </summary>
+        public Rectangle RenderBounds
+        {
+            get { return m_RenderBounds; }
+            set { m_RenderBounds = value; }
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/TextMarkup/MarkupElementCollection.cs b/PROMS/DotNetBar Source Code/TextMarkup/MarkupElementCollection.cs
new file mode 100644
index 00000000..d98ff9dc
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TextMarkup/MarkupElementCollection.cs	
@@ -0,0 +1,141 @@
+using System;
+using System.Text;
+using System.Collections;
+
+#if AdvTree
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#elif LAYOUT
+namespace DevComponents.DotNetBar.Layout.TextMarkup
+#endif
+{
+    internal class MarkupElementCollection : CollectionBase
+    {
+        #region Private Variables
+        private MarkupElement m_Parent = null;
+        #endregion
+
+        #region Internal Implementation
+        /// <summary>Creates new instance of the class.</summary>
+        public MarkupElementCollection(MarkupElement parent)
+		{
+            m_Parent = parent;
+		}
+
+        /// <summary>
+        /// Gets or sets the collection parent element.
+        /// </summary>
+        public MarkupElement Parent
+        {
+            get { return m_Parent; }
+            set { m_Parent = value; }
+        }
+
+		/// <summary>
+		/// Adds new object to the collection.
+		/// </summary>
+		/// <param name="MarkupElement">Object to add.</param>
+		/// <returns>Index of newly added object.</returns>
+		public int Add(MarkupElement MarkupElement)
+		{
+			return List.Add(MarkupElement);
+		}
+		/// <summary>
+		/// Returns reference to the object in collection based on it's index.
+		/// </summary>
+		public MarkupElement this[int index]
+		{
+			get {return (MarkupElement)(List[index]);}
+			set {List[index] = value;}
+		}
+
+		/// <summary>
+		/// Inserts new object into the collection.
+		/// </summary>
+		/// <param name="index">Position of the object.</param>
+		/// <param name="value">Object to insert.</param>
+		public void Insert(int index, MarkupElement value) 
+		{
+			List.Insert(index, value);
+		}
+
+		/// <summary>
+		/// Returns index of the object inside of the collection.
+		/// </summary>
+		/// <param name="value">Reference to the object.</param>
+		/// <returns>Index of the object.</returns>
+		public int IndexOf(MarkupElement value) 
+		{
+			return List.IndexOf(value);
+		}
+
+		/// <summary>
+		/// Returns whether collection contains specified object.
+		/// </summary>
+		/// <param name="value">Object to look for.</param>
+		/// <returns>true if object is part of the collection, otherwise false.</returns>
+		public bool Contains(MarkupElement value) 
+		{
+			return List.Contains(value);
+		}
+
+		/// <summary>
+		/// Removes specified object from the collection.
+		/// </summary>
+		/// <param name="value"></param>
+		public void Remove(MarkupElement value) 
+		{
+			List.Remove(value);
+		}
+
+		protected override void OnRemoveComplete(int index,object value)
+		{
+			base.OnRemoveComplete(index,value);
+			MarkupElement me=value as MarkupElement;
+            if (m_Parent != null)
+            {
+                me.SetParent(null);
+                m_Parent.IsSizeValid = false;
+            }
+		}
+		protected override void OnInsertComplete(int index,object value)
+		{
+			base.OnInsertComplete(index,value);
+			MarkupElement me=value as MarkupElement;
+            if (m_Parent != null)
+            {
+                me.SetParent(m_Parent);
+                m_Parent.IsSizeValid = false;
+            }
+		}
+
+		/// <summary>
+		/// Copies collection into the specified array.
+		/// </summary>
+		/// <param name="array">Array to copy collection to.</param>
+		/// <param name="index">Starting index.</param>
+		public void CopyTo(MarkupElement[] array, int index) 
+		{
+			List.CopyTo(array, index);
+		}
+
+		/// <summary>
+		/// Copies contained items to the MarkupElement array.
+		/// </summary>
+		/// <param name="array">Array to copy to.</param>
+		internal void CopyTo(MarkupElement[] array)
+		{
+			List.CopyTo(array,0);
+		}
+
+		protected override void OnClear()
+		{
+			base.OnClear();
+		}
+
+		#endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/TextMarkup/MarkupLayoutManager.cs b/PROMS/DotNetBar Source Code/TextMarkup/MarkupLayoutManager.cs
new file mode 100644
index 00000000..660a8a98
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TextMarkup/MarkupLayoutManager.cs	
@@ -0,0 +1,41 @@
+using System.Collections;
+using System.Drawing;
+using System.Text;
+
+#if AdvTree
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+using DevComponents.UI.ContentManager;
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#elif LAYOUT
+namespace DevComponents.DotNetBar.Layout.TextMarkup
+#endif
+{
+    internal class MarkupLayoutManager : BlockLayoutManager
+    {
+        private MarkupDrawContext m_MarkupDrawContext = null;
+
+        public MarkupDrawContext MarkupDrawContext
+        {
+            get { return m_MarkupDrawContext; }
+            set { m_MarkupDrawContext = value; }
+        }
+
+        public override void Layout(IBlock block, Size availableSize)
+        {
+            if (block is MarkupElement)
+            {
+                MarkupElement m = block as MarkupElement;
+                if(!m.IsSizeValid)
+                    m.Measure(availableSize, m_MarkupDrawContext);
+            }
+        }
+
+        public override Rectangle FinalizeLayout(Rectangle containerBounds, Rectangle blocksBounds, ArrayList lines)
+        {
+            return (blocksBounds);
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/TextMarkup/MarkupParser.cs b/PROMS/DotNetBar Source Code/TextMarkup/MarkupParser.cs
new file mode 100644
index 00000000..ae82ba05
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TextMarkup/MarkupParser.cs	
@@ -0,0 +1,256 @@
+using System;
+using System.Text;
+using System.IO;
+using System.Xml;
+using System.Collections;
+using System.Text.RegularExpressions;
+
+#if AdvTree
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#elif LAYOUT
+namespace DevComponents.DotNetBar.Layout.TextMarkup
+#endif
+{
+    internal class MarkupParser
+    {
+        #region Private Variables
+        private static string TextElementName = "text";
+        private static string BodyTag = "body";
+        #endregion
+
+        #region Internal Implementation
+        public static BodyElement Parse(string text)
+        {
+            StringBuilder plainText = new StringBuilder(text.Length);
+            BodyElement root = new BodyElement();
+            root.HasExpandElement = false;
+            MarkupElement currentParent = root;
+            Stack openTags = new Stack();
+            openTags.Push(root);
+            // Input text is not wrapped into the container tag so we wrap it here
+            text = text.Replace("&nbsp;", "{ent_nbsp}");
+            text = text.Replace("&zwsp;", "{ent_zwsp}");
+            text = text.Replace("&lt;", "{ent_lt}");
+            text = text.Replace("&gt;", "{ent_gt}");
+            text = text.Replace("&amp;", "{ent_amp}");
+            text = text.Replace("|", "{ent_l}");
+            text = text.Replace("&", "|");
+            text = text.Replace("{ent_nbsp}", "&nbsp;");
+            text = text.Replace("{ent_zwsp}", "&zwsp;"); 
+            text = text.Replace("{ent_lt}", "&lt;");
+            text = text.Replace("{ent_gt}", "&gt;");
+            StringReader sr = new StringReader("<"+BodyTag+">" + text + "</"+BodyTag+">");
+#if !DEBUG
+            try
+#endif
+            {
+                XmlTextReader reader = new XmlTextReader(sr);
+                //reader.EntityHandling = EntityHandling.ExpandCharEntities;
+                while (reader.Read())
+                {
+                    if (reader.NodeType == XmlNodeType.Element)
+                    {
+                        if (reader.Name == BodyTag)
+                            continue;
+                        MarkupElement el = CreateMarkupElement(reader.Name);
+                        if (el == null)
+                        {
+                            reader.Skip();
+                            continue;
+                        }
+                        else if (el is ExpandElement)
+                            root.HasExpandElement = true;
+
+                        if (el is IActiveMarkupElement)
+                            root.ActiveElements.Add(el);
+
+                        // Parse any attributes here
+                        if (reader.AttributeCount > 0)
+                        {
+                            el.ReadAttributes(reader);
+                            reader.MoveToElement();
+                        }
+
+                        currentParent.Elements.Add(el);
+
+                        if (el is ContainerElement)
+                            currentParent = el;
+
+                        if (!reader.IsEmptyElement)
+                            openTags.Push(el);
+                    }
+                    else if (reader.NodeType == XmlNodeType.Text)
+                    {
+                        if (reader.Value.Length == 1)
+                        {
+                            TextElement el = CreateMarkupElement(TextElementName) as TextElement;
+                            if (reader.Value == " ")
+                            {
+                                el.TrailingSpace = true;
+                                plainText.Append(' ');
+                            }
+                            else
+                            {
+                                el.Text = reader.Value;
+                                el.Text = el.Text.Replace("|", "&");
+                                el.Text = el.Text.Replace("{ent_l}", "|");
+                                el.Text = el.Text.Replace("{ent_amp}", "&&");
+                                plainText.Append(el.Text+" ");
+                            }
+                            currentParent.Elements.Add(el);
+                        }
+                        else
+                        {
+                            string s = reader.Value;
+                            if (s.StartsWith("\r\n"))
+                                s = s.TrimStart(new char[] { '\r', '\n' });
+                            s = s.Replace("\r\n", " ");
+                            string[] words = s.Split(' ');
+                            bool space = false;
+                            if (currentParent.Elements.Count > 0 && currentParent.Elements[currentParent.Elements.Count - 1] is NewLine)
+                                space = true;
+                            for (int i = 0; i < words.Length; i++)
+                            {
+                                if (words[i].Length == 0)
+                                {
+                                    if (space)
+                                        continue;
+                                    space = true;
+                                }
+                                else
+                                    space = false;
+
+                                TextElement el = CreateMarkupElement(TextElementName) as TextElement;
+                                el.Text = words[i].Replace("|","&");
+                                el.Text = el.Text.Replace("{ent_l}", "|");
+                                el.Text = el.Text.Replace("{ent_amp}", "&&");
+                                plainText.Append(el.Text + " ");
+                                if (i < words.Length - 1)
+                                {
+                                    el.TrailingSpace = true;
+                                    space = true;
+                                }
+
+                                currentParent.Elements.Add(el);
+                            }
+                        }
+                    }
+                    else if (reader.NodeType == XmlNodeType.Whitespace)
+                    {
+                        if (reader.Value.IndexOf(' ') >= 0)
+                        {
+                            TextElement el = CreateMarkupElement(TextElementName) as TextElement;
+                            el.TrailingSpace = true;
+                            currentParent.Elements.Add(el);
+                        }
+                    }
+                    else if (reader.NodeType == XmlNodeType.EntityReference)
+                    {
+                        TextElement el = CreateMarkupElement(TextElementName) as TextElement;
+                        if (reader.Name == "nbsp")
+                        {
+                            el.TrailingSpace = true;
+                        }
+                        else if (reader.Name == "zwsp")
+                        {
+                            el.TrailingSpace = false;
+                        }
+                        else
+                            el.Text = reader.Name;
+                        el.EnablePrefixHandling = false;
+                        currentParent.Elements.Add(el);
+                    }
+                    else if (reader.NodeType == XmlNodeType.EndElement)
+                    {
+                        MarkupElement el = openTags.Pop() as MarkupElement;
+                        if (el != currentParent)
+                        {
+                            currentParent.Elements.Add(new EndMarkupElement(el));
+                        }
+                        else
+                        {
+                            if (currentParent != root)
+                                currentParent = currentParent.Parent;
+                        }
+                    }
+                }
+            }
+#if !DEBUG
+            catch
+            {
+                return null;
+            }
+#endif
+            root.PlainText = plainText.ToString();
+            return root;
+        }
+
+        public static MarkupElement CreateMarkupElement(string elementName)
+        {
+            if (elementName == "b" || elementName == "strong")
+                return new Strong();
+            else if (elementName == "i" || elementName == "em")
+                return new Italic();
+            else if (elementName == "u")
+                return new Underline();
+            else if (elementName == "br")
+                return new NewLine();
+            else if (elementName == "expand")
+                return new ExpandElement();
+            else if (elementName == "a")
+                return new HyperLink();
+            else if (elementName == "p")
+                return new Paragraph();
+            else if (elementName == "div")
+                return new Div();
+            else if (elementName == "span")
+                return new Span();
+            else if (elementName == "img")
+                return new ImageElement();
+            else if (elementName == "h1")
+                return new Heading();
+            else if (elementName == "h2")
+                return new Heading(2);
+            else if (elementName == "h3")
+                return new Heading(3);
+            else if (elementName == "h4")
+                return new Heading(4);
+            else if (elementName == "h5")
+                return new Heading(5);
+            else if (elementName == "h6")
+                return new Heading(6);
+            else if (elementName == "font")
+                return new FontElement();
+            else if (elementName == "s" || elementName == "strike")
+                return new Strike();
+            else if (elementName == TextElementName)
+                return new TextElement();
+            else if (elementName == "symbol")
+                return new SymbolElement();
+
+            return null;
+        }
+
+        /// <summary>
+        /// Tests whether input text could be markup text.
+        /// </summary>
+        /// <param name="text">Text to test.</param>
+        /// <returns>true if text could be markup, otherwise false</returns>
+        public static bool IsMarkup(ref string text)
+        {
+            if (text == null || text.IndexOf("</") < 0 && text.IndexOf("/>") < 0)
+                return false;
+            return true;
+        }
+
+        internal static string RemoveExpand(string text)
+        {
+            return Regex.Replace(text, "<expand.*?>", "", RegexOptions.IgnoreCase);
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/TextMarkup/MarkupSettings.cs b/PROMS/DotNetBar Source Code/TextMarkup/MarkupSettings.cs
new file mode 100644
index 00000000..1f4e47d9
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TextMarkup/MarkupSettings.cs	
@@ -0,0 +1,189 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+#if AdvTree
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#elif LAYOUT
+namespace DevComponents.DotNetBar.Layout.TextMarkup
+#endif
+{
+#if FRAMEWORK20
+    public static class MarkupSettings
+#else
+    public class MarkupSettings
+#endif
+    {
+        private static HyperlinkStyle _NormalHyperlink = new HyperlinkStyle(Color.Blue, eHyperlinkUnderlineStyle.SolidLine);
+        /// <summary>
+        /// Gets the style of the hyperlink in its default state.
+        /// </summary>
+        public static HyperlinkStyle NormalHyperlink
+        {
+            get { return _NormalHyperlink; }
+        }
+
+        private static HyperlinkStyle _MouseOverHyperlink = new HyperlinkStyle();
+        /// <summary>
+        /// Gets the style of the hyperlink when mouse is over the link.
+        /// </summary>
+        public static HyperlinkStyle MouseOverHyperlink
+        {
+            get { return _MouseOverHyperlink; }
+        }
+
+        private static HyperlinkStyle _VisitedHyperlink = new HyperlinkStyle();
+        /// <summary>
+        /// Gets the style of the visited hyperlink.
+        /// </summary>
+        public static HyperlinkStyle VisitedHyperlink
+        {
+            get { return _VisitedHyperlink; }
+        }
+
+        /// <summary>
+        /// Represents the method that will handle the ResolveImage event.
+        /// </summary>
+        public delegate void ResolveImageEventHandler(object sender, ResolveImageEventArgs e);
+        // <summary>
+        /// Occurs when DotNetBar is looking for an image for one of the internal img tags that is
+        /// used within the minimarkup. You need to set Handled=true if you want your custom image
+        /// to be used instead of the built-in resource resolving mechanism.
+        /// </summary>
+        public static event ResolveImageEventHandler ResolveImage;
+        internal static void InvokeResolveImage(ResolveImageEventArgs e)
+        {
+            if (ResolveImage != null)
+                ResolveImage(null, e);
+        }
+    }
+
+    /// <summary>
+    /// Defines the text-markup hyperlink appearance style.
+    /// </summary>
+    public class HyperlinkStyle
+    {
+        /// <summary>
+        /// Initializes a new instance of the HyperlinkStyle class.
+        /// </summary>
+        public HyperlinkStyle()
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the HyperlinkStyle class.
+        /// </summary>
+        /// <param name="textColor"></param>
+        /// <param name="underlineStyle"></param>
+        public HyperlinkStyle(Color textColor, eHyperlinkUnderlineStyle underlineStyle)
+        {
+            _TextColor = textColor;
+            _UnderlineStyle = underlineStyle;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the HyperlinkStyle class.
+        /// </summary>
+        /// <param name="textColor"></param>
+        /// <param name="backColor"></param>
+        /// <param name="underlineStyle"></param>
+        public HyperlinkStyle(Color textColor, Color backColor, eHyperlinkUnderlineStyle underlineStyle)
+        {
+            _TextColor = textColor;
+            _BackColor = backColor;
+            _UnderlineStyle = underlineStyle;
+        }
+        private Color _TextColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets hyperlink text color.
+        /// </summary>
+        public Color TextColor
+        {
+            get { return _TextColor; }
+            set
+            {
+                if (_TextColor != value)
+                {
+                    _TextColor = value;
+                }
+            }
+        }
+
+        private Color _BackColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets hyperlink back color.
+        /// </summary>
+        public Color BackColor
+        {
+            get { return _BackColor; }
+            set
+            {
+                if (_BackColor != value)
+                {
+                    _BackColor = value;
+                }
+            }
+        }
+
+        private eHyperlinkUnderlineStyle _UnderlineStyle = eHyperlinkUnderlineStyle.None;
+        /// <summary>
+        /// Gets or sets the underline style for the hyperlink.
+        /// </summary>
+        public eHyperlinkUnderlineStyle UnderlineStyle
+        {
+            get { return _UnderlineStyle; }
+            set
+            {
+                if (_UnderlineStyle != value)
+                {
+                    _UnderlineStyle = value;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether style has been changed from its default state.
+        /// </summary>
+        public bool IsChanged
+        {
+            get { return !_TextColor.IsEmpty || !_BackColor.IsEmpty || _UnderlineStyle != eHyperlinkUnderlineStyle.None; }
+        }
+    }
+
+    public enum eHyperlinkUnderlineStyle
+    {
+        None,
+        SolidLine,
+        DashedLine
+    }
+
+    /// <summary>
+    /// <summary>
+    /// Event arguments for ResolveImage event.
+    /// </summary>
+    public class ResolveImageEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Indicates that event has been handled and that ResolvedImage should be used.
+        /// </summary>
+        public bool Handled = false;
+        /// <summary>
+        /// Indicates the string key parameters in url-style for the image that needs to be resolved.
+        /// </summary>
+        public string Key = "";
+        /// <summary>
+        /// Indicates the resolved image value.
+        /// you need to set this value to the resolved image and you need to set Handled property to true.
+        /// </summary>
+       public Image ResolvedImage = null;
+        /// <summary>
+        /// Default constructor.
+        /// </summary>
+        public ResolveImageEventArgs() { }
+    }
+
+}
diff --git a/PROMS/DotNetBar Source Code/TextMarkup/NewLine.cs b/PROMS/DotNetBar Source Code/TextMarkup/NewLine.cs
new file mode 100644
index 00000000..74085447
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TextMarkup/NewLine.cs	
@@ -0,0 +1,47 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+#if AdvTree
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#elif LAYOUT
+namespace DevComponents.DotNetBar.Layout.TextMarkup
+#endif
+{
+    internal class NewLine : MarkupElement
+    {
+        #region Internal Implementation
+        public override void Measure(System.Drawing.Size availableSize, MarkupDrawContext d)
+        {
+            // Causes layout manager to switch to the new line
+            this.Bounds = new Rectangle(0, 0, 0, d.CurrentFont.Height);
+        }
+
+        /// <summary>
+        /// Gets or sets whether element size is valid. When size is not valid element Measure method will be called to validate size.
+        /// </summary>
+        public override bool IsSizeValid
+        {
+            get { return false; }
+            set {  }
+        }
+
+        public override void Render(MarkupDrawContext d) {}
+
+        protected override void ArrangeCore(System.Drawing.Rectangle finalRect, MarkupDrawContext d) { }
+
+        /// <summary>
+        /// Returns whether layout manager switches to new line after processing this element.
+        /// </summary>
+        public override bool IsNewLineAfterElement
+        {
+            get { return true; }
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/TextMarkup/Paragraph.cs b/PROMS/DotNetBar Source Code/TextMarkup/Paragraph.cs
new file mode 100644
index 00000000..e1bac6f6
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TextMarkup/Paragraph.cs	
@@ -0,0 +1,29 @@
+using System;
+using System.Text;
+using System.Drawing;
+using System.Xml;
+
+#if AdvTree
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+using DevComponents.UI.ContentManager;
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#elif LAYOUT
+namespace DevComponents.DotNetBar.Layout.TextMarkup
+#endif
+{
+    internal class Paragraph : Div
+    {
+        #region Internal Implementation
+        protected override void ArrangeInternal(Rectangle bounds, MarkupDrawContext d)
+        {
+            base.ArrangeInternal(bounds, d);
+            this.Bounds = new Rectangle(this.Bounds.X, this.Bounds.Y, this.Bounds.Width , this.Bounds.Height + d.CurrentFont.Height);
+        }
+        #endregion
+    }
+
+    
+}
diff --git a/PROMS/DotNetBar Source Code/TextMarkup/Span.cs b/PROMS/DotNetBar Source Code/TextMarkup/Span.cs
new file mode 100644
index 00000000..1947de36
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TextMarkup/Span.cs	
@@ -0,0 +1,25 @@
+using System;
+using System.Text;
+
+#if AdvTree
+using DevComponents.Tree;
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#elif LAYOUT
+namespace DevComponents.DotNetBar.Layout.TextMarkup
+#endif
+{
+    internal class Span : Div
+    {
+        /// <summary>
+        /// Returns whether markup element is an block element that always consumes a whole line in layout.
+        /// </summary>
+        public override bool IsBlockElement
+        {
+            get { return false; }
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/TextMarkup/Strike.cs b/PROMS/DotNetBar Source Code/TextMarkup/Strike.cs
new file mode 100644
index 00000000..0d49fd04
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TextMarkup/Strike.cs	
@@ -0,0 +1,36 @@
+using System.Drawing;
+
+#if AdvTree
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#elif LAYOUT
+namespace DevComponents.DotNetBar.Layout.TextMarkup
+#endif
+{
+    internal class Strike : MarkupElement
+    {
+        public override void Measure(Size availableSize, MarkupDrawContext d)
+        {
+            Bounds = Rectangle.Empty;
+        }
+
+        public override void Render(MarkupDrawContext d)
+        {
+            d.StrikeOut = true;
+        }
+
+        public override void RenderEnd(MarkupDrawContext d)
+        {
+            d.StrikeOut = false;
+
+            base.RenderEnd(d);
+        }
+
+        protected override void ArrangeCore(Rectangle finalRect, MarkupDrawContext d)
+        {
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/TextMarkup/Strong.cs b/PROMS/DotNetBar Source Code/TextMarkup/Strong.cs
new file mode 100644
index 00000000..c63ba948
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TextMarkup/Strong.cs	
@@ -0,0 +1,35 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+#if AdvTree
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#elif LAYOUT
+namespace DevComponents.DotNetBar.Layout.TextMarkup
+#endif
+{
+    internal class Strong : FontChangeElement
+    {
+        #region Internal Implementation
+        protected override void SetFont(MarkupDrawContext d)
+        {
+            Font font = d.CurrentFont;
+            FontStyle style = d.CurrentFont.Style | FontStyle.Bold;
+
+            if (!font.Bold && font.FontFamily.IsStyleAvailable(style))
+                d.CurrentFont = new Font(d.CurrentFont, style);
+            else
+                font = null;
+
+            if (font != null)
+                m_OldFont = font;
+
+            base.SetFont(d);
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/TextMarkup/SymbolElement.cs b/PROMS/DotNetBar Source Code/TextMarkup/SymbolElement.cs
new file mode 100644
index 00000000..70f34e76
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TextMarkup/SymbolElement.cs	
@@ -0,0 +1,95 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Xml;
+
+#if AdvTree
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#elif LAYOUT
+namespace DevComponents.DotNetBar.Layout.TextMarkup
+#endif
+{
+    internal class SymbolElement : MarkupElement
+    {
+        #region Internal Implementation
+        private Size _DefaultSize = new Size(16, 16);
+        private eSymbol _Symbol = eSymbol.XInCircle;
+
+        public override void Measure(System.Drawing.Size availableSize, MarkupDrawContext d)
+        {
+            this.Bounds = new Rectangle(Point.Empty, Dpi.Size(_DefaultSize));
+        }
+
+        protected override void ArrangeCore(System.Drawing.Rectangle finalRect, MarkupDrawContext d) { }
+
+        public override void Render(MarkupDrawContext d)
+        {
+            Rectangle r = this.Bounds;
+            r.Offset(d.Offset);
+
+            if (!d.ClipRectangle.IsEmpty && !r.IntersectsWith(d.ClipRectangle))
+                return;
+
+            Graphics g = d.Graphics;
+            Color color = d.CurrentForeColor;
+
+            SmoothingMode sm = g.SmoothingMode;
+            g.SmoothingMode = SmoothingMode.AntiAlias;
+
+            if (_Symbol == eSymbol.XInCircle)
+            {
+                Rectangle sr = new Rectangle(r.X + (r.Width - Dpi.Width14) / 2, r.Y + (r.Height - Dpi.Height14) / 2, Dpi.Width14, Dpi.Height14);
+                using (Pen pen = new Pen(color, 1.51f))
+                {
+                    //sr.Width-=2;
+                    //sr.Height-=2;
+                    g.DrawEllipse(pen, sr); 
+                    g.DrawLine(pen, sr.X + Dpi.Width4, sr.Y + Dpi.Height4, sr.X + Dpi.Width10, sr.Y + Dpi.Height10);
+                    g.DrawLine(pen, sr.X + Dpi.Width10, sr.Y + Dpi.Height4, sr.X + Dpi.Width4, sr.Y + Dpi.Height10);
+                }
+            }
+
+            g.SmoothingMode = sm;
+
+            this.RenderBounds = r;
+        }
+
+        public override void ReadAttributes(XmlTextReader reader)
+        {
+            _Symbol = eSymbol.XInCircle;
+
+            for (int i = 0; i < reader.AttributeCount; i++)
+            {
+                reader.MoveToAttribute(i);
+                if (reader.Name.ToLower() == "type")
+                {
+                    string s = reader.Value.ToLower();
+                    if (s == "xincircle")
+                        _Symbol = eSymbol.XInCircle;
+                    break;
+                }
+            }
+        }
+
+        private enum eSymbol
+        {
+            XInCircle
+        }
+
+        /// <summary>
+        /// Returns whether layout manager can start new line with this element.
+        /// </summary>
+        public override bool CanStartNewLine
+        {
+            get { return false; }
+        }
+        #endregion
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/TextMarkup/TextElement.cs b/PROMS/DotNetBar Source Code/TextMarkup/TextElement.cs
new file mode 100644
index 00000000..fb2c5797
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TextMarkup/TextElement.cs	
@@ -0,0 +1,224 @@
+using System;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Text;
+
+#if AdvTree
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#elif LAYOUT
+namespace DevComponents.DotNetBar.Layout.TextMarkup
+#endif
+{
+    internal class TextElement : MarkupElement
+    {
+        private static bool PadText = false;
+        static TextElement()
+        {
+            string lc = System.Windows.Forms.Application.CurrentCulture.TwoLetterISOLanguageName;
+            if (lc == "ja")
+                PadText = true;
+        }
+        #region Private Variables
+        private string m_Text = "";
+        private bool m_TrailingSpace = false;
+        private bool m_EnablePrefixHandling = true;
+        #endregion
+
+        #region Internal Implementation
+        public override void Measure(System.Drawing.Size availableSize, MarkupDrawContext d)
+        {
+#if (FRAMEWORK20)
+            if (BarUtilities.UseTextRenderer)
+            {
+                eTextFormat format = eTextFormat.Default | eTextFormat.NoPadding;
+                if (!d.HotKeyPrefixVisible || m_EnablePrefixHandling)
+                    format |= eTextFormat.HidePrefix;
+                Size size = Size.Empty;
+                if (m_TrailingSpace)
+                {
+                    if (d.CurrentFont.Italic)
+                    {
+                        size = Size.Ceiling(TextDrawing.MeasureString(d.Graphics, m_Text, d.CurrentFont, 0, format));
+                        size.Width += (int)(d.Graphics.MeasureString("||", d.CurrentFont).Width / 4);
+                    }
+                    else
+                        size = Size.Ceiling(TextDrawing.MeasureString(d.Graphics, m_Text + (BarFunctions.IsVista && m_Text.Length > 0 ? "|" : "||"), d.CurrentFont, 0, format));
+                }
+                else
+                    size = Size.Ceiling(TextDrawing.MeasureString(d.Graphics, m_Text, d.CurrentFont, 0, format));
+                if (PadText)
+                {
+                    size.Width += BarUtilities.TextMarkupCultureSpecificPadding;
+                    size.Height += BarUtilities.TextMarkupCultureSpecificPadding;
+                }
+                this.Bounds = new Rectangle(Point.Empty, size);
+            }
+            else
+#endif
+            {
+                using (StringFormat format = new StringFormat(StringFormat.GenericTypographic))
+                {
+                    format.FormatFlags = StringFormatFlags.NoWrap;
+                    if (d.HotKeyPrefixVisible || !m_EnablePrefixHandling)
+                        format.HotkeyPrefix = System.Drawing.Text.HotkeyPrefix.Show;
+                    else
+                        format.HotkeyPrefix = System.Drawing.Text.HotkeyPrefix.Hide;
+
+                    if (m_TrailingSpace)
+                    {
+                        if (d.CurrentFont.Italic)
+                        {
+                            Size size = Size.Ceiling(d.Graphics.MeasureString(m_Text, d.CurrentFont, 0, format));
+                            size.Width += (int)(d.Graphics.MeasureString("|", d.CurrentFont).Width / 4);
+                            if (PadText)
+                            {
+                                size.Width += BarUtilities.TextMarkupCultureSpecificPadding;
+                                size.Height += BarUtilities.TextMarkupCultureSpecificPadding;
+                            }
+                            this.Bounds = new Rectangle(Point.Empty, size);
+                        }
+                        else
+                        {
+                            Size size = Size.Ceiling(d.Graphics.MeasureString(m_Text + "|", d.CurrentFont, 0, format));
+                            if (PadText)
+                            {
+                                size.Width += BarUtilities.TextMarkupCultureSpecificPadding;
+                                size.Height += BarUtilities.TextMarkupCultureSpecificPadding;
+                            }
+                            this.Bounds = new Rectangle(Point.Empty, size);
+                        }
+                    }
+                    else
+                    {
+                        Size size = Size.Ceiling(d.Graphics.MeasureString(m_Text, d.CurrentFont, 0, format));
+                        if (PadText)
+                        {
+                            size.Width += BarUtilities.TextMarkupCultureSpecificPadding;
+                            size.Height += BarUtilities.TextMarkupCultureSpecificPadding;
+                        }
+                        this.Bounds = new Rectangle(Point.Empty, size);
+                    }
+                }
+            }
+            IsSizeValid = true;
+        }
+
+        public override void Render(MarkupDrawContext d)
+        {
+            Rectangle r = this.Bounds;
+            r.Offset(d.Offset);
+
+            if (!d.ClipRectangle.IsEmpty && !r.IntersectsWith(d.ClipRectangle))
+                return;
+
+            Graphics g = d.Graphics;
+            #if (FRAMEWORK20)
+            if (BarUtilities.UseTextRenderer)
+            {
+                eTextFormat format = eTextFormat.Default | eTextFormat.NoClipping | eTextFormat.NoPadding;
+                if (d.RightToLeft) format |= eTextFormat.RightToLeft;
+                if (!d.HotKeyPrefixVisible)
+                    format |= eTextFormat.HidePrefix;
+
+                if (!d.ClipRectangle.IsEmpty && r.Right > d.ClipRectangle.Right)
+                {
+                    format|= eTextFormat.EndEllipsis;
+                    r.Width -= (r.Right - d.ClipRectangle.Right);
+                }
+                TextDrawing.DrawString(g, m_Text, d.CurrentFont, d.CurrentForeColor, r, format);
+                
+            }
+            else
+            #endif
+            {
+                using (StringFormat format = new StringFormat(StringFormat.GenericTypographic))
+                {
+                    format.FormatFlags |= StringFormatFlags.NoWrap;
+                    if (d.RightToLeft) format.FormatFlags |= StringFormatFlags.DirectionRightToLeft;
+                    if (d.HotKeyPrefixVisible)
+                        format.HotkeyPrefix = System.Drawing.Text.HotkeyPrefix.Show;
+                    else
+                        format.HotkeyPrefix = System.Drawing.Text.HotkeyPrefix.Hide;
+                    if (!d.ClipRectangle.IsEmpty && r.Right > d.ClipRectangle.Right)
+                    {
+                        format.Trimming = StringTrimming.EllipsisCharacter;
+                        r.Width -= (r.Right - d.ClipRectangle.Right);
+                    }
+                    
+                    using (SolidBrush brush = new SolidBrush(d.CurrentForeColor))
+                        g.DrawString(m_Text, d.CurrentFont, brush, r, format);
+                }
+            }
+
+            if (d.StrikeOut == true)
+            {
+                // StrikeOut
+
+                float descent = d.CurrentFont.FontFamily.GetCellDescent(d.CurrentFont.Style) *
+                    d.CurrentFont.Size / d.CurrentFont.FontFamily.GetEmHeight(d.CurrentFont.Style) + 1;
+
+                using (Pen pen = new Pen(d.CurrentForeColor, 1))
+                {
+                    SmoothingMode sm = g.SmoothingMode;
+                    g.SmoothingMode = SmoothingMode.Default;
+
+                    float y = r.Top + (r.Height + descent) / 2;
+
+                    g.DrawLine(pen, r.X, y, r.Right - 1, y);
+                    g.SmoothingMode = sm;
+                }
+            }
+
+            if ((d.HyperLink && (d.HyperlinkStyle == null || d.HyperlinkStyle.UnderlineStyle != eHyperlinkUnderlineStyle.None)) || d.Underline)
+            {
+                // Underline Hyperlink
+                float descent = d.CurrentFont.FontFamily.GetCellDescent(d.CurrentFont.Style) * d.CurrentFont.Size / d.CurrentFont.FontFamily.GetEmHeight(d.CurrentFont.Style);
+                using (Pen pen = new Pen(d.CurrentForeColor, 1))
+                {
+                    if (d.HyperLink && d.HyperlinkStyle != null && d.HyperlinkStyle.UnderlineStyle == eHyperlinkUnderlineStyle.DashedLine)
+                        pen.DashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
+                    descent -= 1;
+                    System.Drawing.Drawing2D.SmoothingMode sm = g.SmoothingMode;
+                    g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.Default;
+                    g.DrawLine(pen, r.X, r.Bottom - descent, r.Right - 1, r.Bottom - descent);
+                    g.SmoothingMode = sm;
+                }
+            }
+
+            this.RenderBounds = r;
+        }
+
+        protected override void ArrangeCore(System.Drawing.Rectangle finalRect, MarkupDrawContext d) {}
+
+        public string Text
+        {
+            get { return m_Text; }
+            set
+            {
+                m_Text = value;
+                this.IsSizeValid = false;
+            }
+        }
+
+        public bool TrailingSpace
+        {
+            get { return m_TrailingSpace; }
+            set
+            {
+                m_TrailingSpace = value;
+                this.IsSizeValid = false;
+            }
+        }
+
+        public bool EnablePrefixHandling
+        {
+            get { return m_EnablePrefixHandling; }
+            set { m_EnablePrefixHandling = value; }
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/TextMarkup/Underline.cs b/PROMS/DotNetBar Source Code/TextMarkup/Underline.cs
new file mode 100644
index 00000000..1343a8cb
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TextMarkup/Underline.cs	
@@ -0,0 +1,48 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+#if AdvTree
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#elif LAYOUT
+namespace DevComponents.DotNetBar.Layout.TextMarkup
+#endif
+{
+    internal class Underline : FontChangeElement
+    {
+        #region Internal Implementation
+        protected override void SetFont(MarkupDrawContext d)
+        {
+            d.Underline = true;
+            //Font font = d.CurrentFont;
+            //FontStyle style = d.CurrentFont.Style | FontStyle.Underline;
+
+            //if (!font.Underline && font.FontFamily.IsStyleAvailable(style))
+            //    d.CurrentFont = new Font(font, style);
+            //else
+            //    font = null;
+
+            //if (font != null)
+            //    m_OldFont = font;
+
+            base.SetFont(d);
+        }
+
+        public override void MeasureEnd(Size availableSize, MarkupDrawContext d)
+        {
+            d.Underline = false;
+            base.MeasureEnd(availableSize, d);
+        }
+
+        public override void RenderEnd(MarkupDrawContext d)
+        {
+            d.Underline = false;
+            base.RenderEnd(d);
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Themes.cs b/PROMS/DotNetBar Source Code/Themes.cs
new file mode 100644
index 00000000..ea8fe4e4
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Themes.cs	
@@ -0,0 +1,1517 @@
+using System;
+using System.Runtime.InteropServices;
+using System.Windows.Forms;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Summary description for Themes.
+	/// </summary>
+	internal abstract class Themes:IDisposable
+	{
+		protected Control m_Parent=null;
+		protected IntPtr m_hTheme=IntPtr.Zero;
+
+        public static int DrawShadowText(Graphics g, Rectangle bounds, string text, ThemeTextFormat format, Color textColor, Color shadowColor, int shadowOffsetX, int shadowOffsetY)
+        {
+            int result = 0;
+            IntPtr hdc = g.GetHdc();
+            try
+            {
+                RECT r = new RECT(bounds);
+                result = DrawShadowText(hdc, text, (uint)text.Length, ref r, (int)format, new COLORREF(textColor), new COLORREF(shadowColor), shadowOffsetX, shadowOffsetY);
+            }
+            finally
+            {
+                g.ReleaseHdc(hdc);
+            }
+            return result;
+        }
+        [System.Runtime.InteropServices.DllImport("ComCtl32.dll", CharSet = System.Runtime.InteropServices.CharSet.Auto)]
+        public static extern int DrawShadowText(IntPtr hdc, string text, uint textLength, ref RECT r, int flags, COLORREF textColor, COLORREF shadowColor, int shadowXOffset, int shadowYOffset);
+
+		[StructLayoutAttribute(LayoutKind.Sequential)]
+		public struct RECT
+		{
+			public RECT(Rectangle r)
+			{
+				this.left=r.Left;
+				this.top=r.Top;
+				this.right=r.Right;
+				this.bottom=r.Bottom;
+			}
+			int left;
+			int top;
+			int right;
+			int bottom;
+            public void Offset(int x, int y)
+            {
+                left += x;
+                top += y;
+            }
+		};
+
+		[StructLayoutAttribute(LayoutKind.Sequential)]
+		public struct MARGINS
+		{
+			int cxLeftWidth;
+			int cxRightWidth;
+			int cyTopHeight;
+			int cyBottomHeight;
+		};
+
+		[StructLayoutAttribute(LayoutKind.Sequential)]
+			public struct SIZE
+		{
+			public int Width;
+			public int Height;
+		};
+        
+        [StructLayout(LayoutKind.Sequential)]
+        public struct COLORREF
+        {
+            public uint ColorDWORD;
+
+            public COLORREF(System.Drawing.Color color)
+            {
+                ColorDWORD = (uint)color.R + (((uint)color.G) << 8) + (((uint)color.B) << 16);
+            }
+
+            public System.Drawing.Color GetColor()
+            {
+                return System.Drawing.Color.FromArgb((int)(0x000000FFU & ColorDWORD),
+               (int)(0x0000FF00U & ColorDWORD) >> 8, (int)(0x00FF0000U & ColorDWORD) >> 16);
+            }
+
+            public void SetColor(System.Drawing.Color color)
+            {
+                ColorDWORD = (uint)color.R + (((uint)color.G) << 8) + (((uint)color.B) << 16);
+            }
+        }
+        public enum DTT_VALIDBITS : int
+        {
+            DTT_TEXTCOLOR = (1 << 0),      // crText has been specified
+            DTT_BORDERCOLOR = (1 << 1),      // crBorder has been specified
+            DTT_SHADOWCOLOR = (1 << 2),      // crShadow has been specified
+            DTT_SHADOWTYPE = (1 << 3),      // iTextShadowType has been specified
+            DTT_SHADOWOFFSET = (1 << 4),      // ptShadowOffset has been specified
+            DTT_BORDERSIZE = (1 << 5),      // iBorderSize has been specified
+            DTT_FONTPROP = (1 << 6),      // iFontPropId has been specified
+            DTT_COLORPROP = (1 << 7),      // iColorPropId has been specified
+            DTT_STATEID = (1 << 8),      // IStateId has been specified
+            DTT_CALCRECT = (1 << 9),      // Use pRect as and in/out parameter
+            DTT_APPLYOVERLAY = (1 << 10),     // fApplyOverlay has been specified
+            DTT_GLOWSIZE = (1 << 11),     // iGlowSize has been specified
+            DTT_CALLBACK = (1 << 12),     // pfnDrawTextCallback has been specified
+            DTT_COMPOSITED = (1 << 13)     // Draws text with antialiased alpha (needs a DIB section)
+        }
+
+        public enum ThemeFontId : int
+        {
+            TMT_CAPTIONFONT = 801,
+            TMT_SMALLCAPTIONFONT = 802,
+            TMT_MENUFONT = 803,
+            TMT_STATUSFONT = 804,
+            TMT_MSGBOXFONT = 805,
+            TMT_ICONTITLEFONT = 806
+        }
+
+        [StructLayoutAttribute(LayoutKind.Sequential)]
+        public struct DTTOPTS
+        {
+            public int dwSize;
+            public int dwFlags;
+            public COLORREF crText;
+            public COLORREF crBorder;
+            public COLORREF crShadow;
+            public int iTextShadowType;
+            public WinApi.POINT ptShadowOffset;
+            public int iBorderSize;
+            public int iFontPropId;
+            public int iColorPropId;
+            public int iStateId;
+            public bool fApplyOverlay;
+            public int iGlowSize;
+            public int pfnDrawTextCallback;
+            public int lParam;
+        };
+        
+		[DllImport("UxTheme.dll",CharSet=CharSet.Auto)]
+		protected static extern IntPtr OpenThemeData(IntPtr hWnd, string pszClassList);
+        [DllImport("UxTheme.dll", CharSet = CharSet.Auto)]
+        protected static extern IntPtr OpenThemeDataEx(IntPtr hWnd, string pszClassList, int flags);
+		[DllImport("UxTheme.dll",CharSet=CharSet.Auto)]
+		protected static extern int CloseThemeData(IntPtr hTheme);
+		[DllImport("UxTheme.dll",CharSet=CharSet.Auto)]
+		protected static extern int DrawThemeBackground(IntPtr hTheme, IntPtr hdc, int iPartId, int iStateId, ref RECT pRect, ref RECT pClipRect);
+		[DllImport("UxTheme.dll",CharSet=CharSet.Auto)]
+		protected static extern int DrawThemeBackground(IntPtr hTheme, IntPtr hdc, int iPartId, int iStateId, ref RECT pRect, IntPtr pCliprect);
+		[DllImport("UxTheme.dll",CharSet=CharSet.Auto)]
+		protected static extern int EnableTheming(bool fEnable);
+		[DllImport("UxTheme.dll",CharSet=CharSet.Auto)]
+		protected static extern int DrawThemeEdge(IntPtr hTheme, IntPtr hdc, int iPartId, int iStateId, ref RECT pDestRect,uint uEdge,uint uFlags,ref RECT pContentRect);
+		[DllImport("UxTheme.dll",CharSet=CharSet.Auto)]
+		protected static extern int DrawThemeIcon(IntPtr hTheme, IntPtr hdc, int iPartId, int iStateId, ref RECT pRect, IntPtr himl, int iImageIndex);
+		[DllImport("UxTheme.dll",CharSet=CharSet.Auto)]
+		protected static extern int DrawThemeParentBackground(IntPtr hwnd, IntPtr hdc, ref RECT prc);
+		[DllImport("UxTheme.dll",CharSet=CharSet.Auto)]
+		protected static extern int DrawThemeText(IntPtr hTheme, IntPtr hdc, int iPartId, int iStateId, string pszText, int iCharCount, int dwTextFlags, int dwTextFlags2,ref RECT pRect);
+        [DllImport("UxTheme.dll", CharSet = CharSet.Auto)]
+        public static extern int DrawThemeTextEx(IntPtr hTheme, IntPtr hdc, int iPartId, int iStateId, string pszText, int iCharCount, int dwTextFlags, ref RECT pRect, ref DTTOPTS options);
+        
+		[DllImport("UxTheme.dll",CharSet=CharSet.Auto)]
+		protected static extern int EnableThemeDialogTexture(IntPtr hwnd, long dwFlags);
+		[DllImport("uxtheme", ExactSpelling=true, CharSet=CharSet.Unicode)]
+		public extern static Int32 GetCurrentThemeName(string stringThemeName, int lengthThemeName, string stringColorName, int lengthColorName, string stringSizeName, int lengthSizeName);
+		[DllImport("UxTheme.dll",CharSet=CharSet.Auto)]
+		protected static extern long GetThemeAppProperties();
+		[DllImport("UxTheme.dll",CharSet=CharSet.Auto)]
+		protected static extern int GetThemeBackgroundContentRect(IntPtr hTheme, IntPtr hdc, int iPartId, int iStateId, ref RECT pBoundingRect, ref RECT pContentRect);
+		[DllImport("UxTheme.dll",CharSet=CharSet.Auto)]
+		protected static extern int GetThemeBackgroundExtent(IntPtr hTheme, IntPtr hdc, int iPartId, int iStateId, ref RECT pContentRect, ref RECT pExtentRect);
+		[DllImport("UxTheme.dll",CharSet=CharSet.Auto)]
+		protected static extern int GetThemeBackgroundRegion(IntPtr hTheme, IntPtr hdc, int iPartId, int iStateId, ref RECT pRect, ref IntPtr pRegion);
+		[DllImport("UxTheme.dll",CharSet=CharSet.Auto)]
+		protected static extern int GetThemeBool(IntPtr hTheme, int iPartId, int iStateId, int iPropId, ref bool pfVal);
+		[DllImport("UxTheme.dll",CharSet=CharSet.Auto)]
+		protected static extern int GetThemeColor(IntPtr hTheme, int iPartId, int iStateId, int iPropId, ref long pColor);
+		[DllImport("UxTheme.dll",CharSet=CharSet.Auto)]
+		protected static extern int GetThemeDocumentationProperty(string pszThemeName, string pszPropertyName, string pszValueBuff, int cchMaxValChars);
+		[DllImport("UxTheme.dll",CharSet=CharSet.Auto)]
+		protected static extern int GetThemeEnumValue(IntPtr hTheme, int iPartId, int iStateId, int iPropId, ref int piVal);
+		[DllImport("UxTheme.dll",CharSet=CharSet.Auto)]
+		protected static extern int GetThemeFilename(IntPtr hTheme, int iPartId, int iStateId, int iPropId, ref string pszThemeFilename, int cchMaxBuffChars);
+		//[DllImport("UxTheme.dll",CharSet=CharSet.Auto)]
+		//private static extern int GetThemeFont(IntPtr hTheme, IntPtr hdc, int iPartId, int iStateId, int iPropId, IntPtr pFont);
+		[DllImport("UxTheme.dll",CharSet=CharSet.Auto)]
+		protected static extern int GetThemeInt(IntPtr hTheme,int iPartId,int iStateId,int iPropId,ref int piVal);
+		[DllImport("UxTheme.dll",CharSet=CharSet.Auto)]
+		private static extern int GetThemeMargins(IntPtr hTheme, IntPtr hdc, int iPartId,int iStateId,int iPropId,ref RECT prc, ref MARGINS pMargins);
+		[DllImport("UxTheme.dll",CharSet=CharSet.Auto)]
+		protected static extern bool IsThemeActive();
+		[DllImport("UxTheme.dll",CharSet=CharSet.Auto)]
+		internal static extern int SetWindowTheme(IntPtr hwnd, string pszSubAppName, string pszSubIdList);
+		[DllImport("UxTheme.dll",CharSet=CharSet.Auto)]
+		protected static extern int SetWindowTheme(IntPtr hwnd, IntPtr pszSubAppName, string pszSubIdList);
+		[DllImport("UxTheme.dll",CharSet=CharSet.Auto)]
+		protected static extern int SetWindowTheme(IntPtr hwnd, IntPtr pszSubAppName, IntPtr pszSubIdList);
+		[DllImport("UxTheme.dll",CharSet=CharSet.Auto)]
+		protected static extern bool IsThemePartDefined(IntPtr hTheme, int iPartId,  int iStateId);
+		[DllImport("UxTheme.dll",CharSet=CharSet.Auto)]
+		protected static extern int GetThemePartSize(IntPtr hTheme, IntPtr hdc, int iPartId, int iStateId, ref RECT prc, int eSize, ref SIZE psz);
+		[DllImport("UxTheme.dll",CharSet=CharSet.Auto)]
+		protected static extern int GetThemePartSize(IntPtr hTheme, IntPtr hdc, int iPartId, int iStateId, IntPtr prc, int eSize, ref SIZE psz);
+
+
+		[DllImport("gdi32.dll",CharSet=CharSet.Auto)]
+		protected static extern IntPtr SelectObject(IntPtr hdc,IntPtr hgdiobj);
+        
+		protected abstract string ThemeClass {get;}
+
+		public static bool ThemesActive=_IsThemeActive();
+		
+		public Themes(Control parent)
+		{
+			m_Parent=parent;
+            m_hTheme=OpenThemeData(parent.Handle,this.ThemeClass);
+		}
+		~Themes()
+		{
+			if(m_hTheme!=IntPtr.Zero)
+				this.Dispose();
+		}
+
+		private static bool _IsThemeActive()
+		{
+			if(!BarFunctions.ThemedOS) // System.Windows.Forms.OSFeature.Feature.IsPresent(System.Windows.Forms.OSFeature.Themes))
+				return false;
+			return IsThemeActive();
+		}
+
+		public static void RefreshIsThemeActive()
+		{
+			ThemesActive=_IsThemeActive();
+		}
+
+		public static int SetWindowTheme(Control ctrl, string sTheme)
+		{
+			return SetWindowTheme(ctrl.Handle,IntPtr.Zero,sTheme);
+		}
+
+		protected virtual void InternalDrawBackground(Graphics g, ThemePart part, ThemeState state, Rectangle r)
+		{
+			RECT rDraw=new RECT(r);
+			IntPtr hdc=g.GetHdc();
+            try
+            {
+                int hresult = DrawThemeBackground(m_hTheme, hdc, part.Value, state.Value, ref rDraw, IntPtr.Zero);
+            }
+            finally
+            {
+                g.ReleaseHdc(hdc);
+            }
+		}
+
+		protected virtual void InternalDrawBackground(Graphics g, ThemePart part, ThemeState state, Rectangle r, Rectangle clip)
+		{
+			RECT rDraw=new RECT(r);
+			RECT rClip=new RECT(clip);
+			IntPtr hdc=g.GetHdc();
+            try
+            {
+                int hresult = DrawThemeBackground(m_hTheme, hdc, part.Value, state.Value, ref rDraw, ref rClip);
+            }
+            finally
+            {
+                g.ReleaseHdc(hdc);
+            }
+		}
+
+		protected virtual IntPtr InternalGetThemeBackgroundRegion(Graphics g, ThemePart part, ThemeState state, Rectangle r)
+		{
+			RECT rDraw=new RECT(r);
+			IntPtr hdc=g.GetHdc();
+            IntPtr region = IntPtr.Zero;
+            try
+            {
+                GetThemeBackgroundRegion(m_hTheme, hdc, part.Value, state.Value, ref rDraw, ref region);
+            }
+            finally
+            {
+                g.ReleaseHdc(hdc);
+            }
+			return region;
+		}
+
+		protected virtual void InternalDrawText(Graphics g, string text, Font font, Rectangle layoutRect, ThemePart part, ThemeState state, ThemeTextFormat format, bool drawdisabled)
+		{
+			RECT rDraw=new RECT(layoutRect);
+			IntPtr hdc=g.GetHdc();
+			IntPtr hFont=font.ToHfont();
+            IntPtr old=SelectObject(hdc,hFont);
+			int hresult=DrawThemeText(m_hTheme,hdc,part.Value,state.Value,text,text.Length,(int)format,(drawdisabled?1:0),ref rDraw);
+			SelectObject(hdc,old);
+            WinApi.DeleteObject(hFont);
+			g.ReleaseHdc(hdc);
+		}
+
+        protected virtual void InternalDrawTextEx(Graphics g, string text, Font font, Rectangle layoutRect, ThemePart part, ThemeState state, ThemeTextFormat format, DTTOPTS options)
+        {
+            RECT rDraw=new RECT(layoutRect);
+			IntPtr hdc=g.GetHdc();
+			IntPtr hFont=font.ToHfont();
+            IntPtr old=SelectObject(hdc,hFont);
+			//int hresult=DrawThemeText(m_hTheme,hdc,part.Value,state.Value,text,text.Length,(int)format,(drawdisabled?1:0),ref rDraw);
+            options.dwSize = Marshal.SizeOf(options);
+            int hresult = DrawThemeTextEx(m_hTheme, hdc, part.Value, state.Value, text, text.Length, (int)format, ref rDraw, ref options);
+
+			SelectObject(hdc,old);
+            WinApi.DeleteObject(hFont);
+			g.ReleaseHdc(hdc);
+        }
+
+		public virtual bool IsPartDefined(ThemePart part, ThemeState state)
+		{
+			return IsThemePartDefined(m_hTheme,part.Value,state.Value);
+		}
+
+		public void Dispose()
+		{
+			if(m_hTheme!=IntPtr.Zero)
+			{
+				CloseThemeData(m_hTheme);
+				m_hTheme=IntPtr.Zero;
+			}
+		}
+
+		public virtual System.Drawing.Size ThemeMinSize(Graphics g, ThemePart part, ThemeState state)
+		{
+			SIZE m=new SIZE();
+			IntPtr hdc=g.GetHdc();
+            try
+            {
+                int hresult = GetThemePartSize(m_hTheme, hdc, part.Value, state.Value, IntPtr.Zero, 0, ref m);
+            }
+            finally
+            {
+                g.ReleaseHdc(hdc);
+            }
+			return new System.Drawing.Size(m.Width,m.Height);
+		}
+		public virtual System.Drawing.Size ThemeTrueSize(Graphics g, ThemePart part, ThemeState state)
+		{
+			SIZE m=new SIZE();
+			IntPtr hdc=g.GetHdc();
+            try
+            {
+                int hresult = GetThemePartSize(m_hTheme, hdc, part.Value, state.Value, IntPtr.Zero, 1, ref m);
+            }
+            finally
+            {
+                g.ReleaseHdc(hdc);
+            }
+			return new System.Drawing.Size(m.Width,m.Height);
+		}
+		public virtual System.Drawing.Size ThemeDrawSize(Graphics g, ThemePart part, ThemeState state)
+		{
+			SIZE m=new SIZE();
+			IntPtr hdc=g.GetHdc();
+            try
+            {
+                int hresult = GetThemePartSize(m_hTheme, hdc, part.Value, state.Value, IntPtr.Zero, 2, ref m);
+            }
+            finally
+            {
+                g.ReleaseHdc(hdc);
+            }
+			return new System.Drawing.Size(m.Width,m.Height);
+		}
+	}
+
+	public enum ThemeTextFormat:int
+	{
+		Top=0x00000000,
+        Left=0x00000000,
+        Center=0x00000001,
+        Right=0x00000002,
+        VCenter=0x00000004,
+        Bottom=0x00000008,
+        WordBreak=0x00000010,
+        SingleLine=0x00000020,
+        ExpandTabs=0x00000040,
+        TabStop=0x00000080,
+        NoClip=0x00000100,
+        ExternalLeading=0x00000200,
+        CalcRect=0x00000400,
+        NoPrefix=0x00000800,
+        Internal=0x00001000,
+        EditControl=0x00002000,
+        PathElliosis=0x00004000,
+        EndEllipsis=0x00008000,
+        ModifyString=0x00010000,
+        RtlReading=0x00020000,
+        WordEllipsis=0x00040000,
+        NoFullWidthCharBreak=0x00080000,
+        HidePrefix=0x00100000,
+        PrefixOnly=0x00200000,
+	}
+
+	internal class ThemeButton:Themes
+	{
+		public ThemeButton(Control parent):base(parent)
+		{
+		}
+		protected override string ThemeClass
+		{
+			get
+			{
+				return "Button";
+			}
+		}
+		public void DrawBackground(Graphics g, ThemeButtonParts part, ThemeButtonStates state, Rectangle r)
+		{
+			InternalDrawBackground(g,part,state,r);
+		}
+		public void DrawText(Graphics g, string text, Font font, Rectangle layoutRect, ThemeButtonParts part, ThemeButtonStates state, ThemeTextFormat format, bool drawdisabled)
+		{
+			InternalDrawText(g,text,font,layoutRect,part,state,format,drawdisabled);
+		}
+		public void DrawText(Graphics g, string text, Font font, Rectangle layoutRect, ThemeButtonParts part, ThemeButtonStates state, ThemeTextFormat format)
+		{
+			InternalDrawText(g,text,font,layoutRect,part,state,format,false);
+		}
+		public void DrawText(Graphics g, string text, Font font, Rectangle layoutRect, ThemeButtonParts part, ThemeButtonStates state)
+		{
+			InternalDrawText(g,text,font,layoutRect,part,state,ThemeTextFormat.Left,false);
+		}
+	}
+
+	internal class ThemeButtonParts:ThemePart
+	{
+		protected ThemeButtonParts(int themepartvalue):base(themepartvalue)
+		{
+		}
+		public static ThemeButtonParts PushButton=new ThemeButtonParts(1);
+		public static ThemeButtonParts RadioButton=new ThemeButtonParts(2);
+		public static ThemeButtonParts CheckBox=new ThemeButtonParts(3);
+		public static ThemeButtonParts GroupBox=new ThemeButtonParts(4);
+		public static ThemeButtonParts UserButton=new ThemeButtonParts(5);
+	}
+
+	internal class ThemeButtonStates:ThemeState
+	{
+		protected ThemeButtonStates(int themestatevalue):base(themestatevalue)
+		{
+		}
+		// Push Buttons
+		public static ThemeButtonStates PushButtonNormal=new ThemeButtonStates(1);
+		public static ThemeButtonStates PushButtonHot=new ThemeButtonStates(2);
+		public static ThemeButtonStates PushButtonPressed=new ThemeButtonStates(3);
+		public static ThemeButtonStates PushButtonDisabled=new ThemeButtonStates(4);
+		public static ThemeButtonStates PushButtonDefaulted=new ThemeButtonStates(5);
+
+		// Radio Buttons
+		public static ThemeButtonStates RadioButtonUncheckedNormal=new ThemeButtonStates(1);
+		public static ThemeButtonStates RadioButtonUncheckedHot=new ThemeButtonStates(2);
+		public static ThemeButtonStates RadioButtonUncheckedPressed=new ThemeButtonStates(3);
+		public static ThemeButtonStates RadioButtonUncheckedDisabled=new ThemeButtonStates(4);
+		public static ThemeButtonStates RadioButtonCheckedNormal=new ThemeButtonStates(5);
+		public static ThemeButtonStates RadioButtonCheckedHot=new ThemeButtonStates(6);
+		public static ThemeButtonStates RadioButtonCheckedPressed=new ThemeButtonStates(7);
+		public static ThemeButtonStates RadioButtonCheckedDisabled=new ThemeButtonStates(8);
+
+		// Check Boxes
+		public static ThemeButtonStates CheckBoxUncheckedNormal=new ThemeButtonStates(1);
+		public static ThemeButtonStates CheckBoxUncheckedHot=new ThemeButtonStates(2);
+		public static ThemeButtonStates CheckBoxUncheckedPressed=new ThemeButtonStates(3);
+		public static ThemeButtonStates CheckBoxUncheckedDisabled=new ThemeButtonStates(4);
+		public static ThemeButtonStates CheckBoxCheckedNormal=new ThemeButtonStates(5);
+		public static ThemeButtonStates CheckBoxCheckedHot=new ThemeButtonStates(6);
+		public static ThemeButtonStates CheckBoxCheckedPressed=new ThemeButtonStates(7);
+		public static ThemeButtonStates CheckBoxCheckedDisabled=new ThemeButtonStates(8);
+		public static ThemeButtonStates CheckBoxMixedNormal=new ThemeButtonStates(9);
+		public static ThemeButtonStates CheckBoxMixedHot=new ThemeButtonStates(10);
+		public static ThemeButtonStates CheckBoxMixedPressed=new ThemeButtonStates(11);
+		public static ThemeButtonStates CheckBoxMixedDisabled=new ThemeButtonStates(12);
+
+		// Group Box
+		public static ThemeButtonStates GroupBoxNormal=new ThemeButtonStates(1);
+		public static ThemeButtonStates GroupBoxDisabled=new ThemeButtonStates(2);
+	}
+
+	internal class ThemeToolbar:Themes
+	{
+		public ThemeToolbar(Control parent):base(parent)
+		{
+		}
+		protected override string ThemeClass
+		{
+			get
+			{
+				return "Toolbar";
+			}
+		}
+		public void DrawBackground(Graphics g, ThemeToolbarParts part, ThemeToolbarStates state, Rectangle r)
+		{
+			InternalDrawBackground(g,part,state,r);
+		}
+		public void DrawText(Graphics g, string text, Font font, Rectangle layoutRect, ThemeToolbarParts part, ThemeToolbarStates state, ThemeTextFormat format, bool drawdisabled)
+		{
+			InternalDrawText(g,text,font,layoutRect,part,state,format,drawdisabled);
+		}
+		public void DrawText(Graphics g, string text, Font font, Rectangle layoutRect, ThemeToolbarParts part, ThemeToolbarStates state, ThemeTextFormat format)
+		{
+			InternalDrawText(g,text,font,layoutRect,part,state,format,false);
+		}
+		public void DrawText(Graphics g, string text, Font font, Rectangle layoutRect, ThemeToolbarParts part, ThemeToolbarStates state)
+		{
+			InternalDrawText(g,text,font,layoutRect,part,state,ThemeTextFormat.Left,false);
+		}
+	}
+
+	internal class ThemeToolbarParts:ThemePart
+	{
+		protected ThemeToolbarParts(int themepartvalue):base(themepartvalue) {}
+		public static ThemeToolbarParts Button=new ThemeToolbarParts(1);
+		public static ThemeToolbarParts DropDownButton=new ThemeToolbarParts(2);
+		public static ThemeToolbarParts SplitButton=new ThemeToolbarParts(3);
+		public static ThemeToolbarParts SplitButtonDropDown=new ThemeToolbarParts(4);
+		public static ThemeToolbarParts Separator=new ThemeToolbarParts(5);
+		public static ThemeToolbarParts SeparatorVert=new ThemeToolbarParts(6);
+	}
+
+	internal class ThemeToolbarStates:ThemeState
+	{
+		protected ThemeToolbarStates(int themestatevalue):base(themestatevalue) {}
+		public static ThemeToolbarStates Normal=new ThemeToolbarStates(1);
+		public static ThemeToolbarStates Hot=new ThemeToolbarStates(2);
+		public static ThemeToolbarStates Pressed=new ThemeToolbarStates(3);
+		public static ThemeToolbarStates Disabled=new ThemeToolbarStates(4);
+		public static ThemeToolbarStates Checked=new ThemeToolbarStates(5);
+		public static ThemeToolbarStates HotChecked=new ThemeToolbarStates(6);
+	}
+
+	internal class ThemeComboBox:Themes
+	{
+		public ThemeComboBox(Control parent):base(parent)
+		{
+		}
+		protected override string ThemeClass
+		{
+			get
+			{
+				return "COMBOBOX";
+			}
+		}
+		public void DrawBackground(Graphics g, ThemeComboBoxParts part, ThemeComboBoxStates state, Rectangle r)
+		{
+			InternalDrawBackground(g,part,state,r);
+		}
+	}
+	internal class ThemeComboBoxParts:ThemePart
+	{
+		protected ThemeComboBoxParts(int themepartvalue):base(themepartvalue) {}
+		public static ThemeComboBoxParts DropDownButton=new ThemeComboBoxParts(1);
+	}
+	internal class ThemeComboBoxStates:ThemeState
+	{
+		protected ThemeComboBoxStates(int themestatevalue):base(themestatevalue) {}
+		public static ThemeComboBoxStates Normal=new ThemeComboBoxStates(1);
+		public static ThemeComboBoxStates Hot=new ThemeComboBoxStates(2);
+		public static ThemeComboBoxStates Pressed=new ThemeComboBoxStates(3);
+		public static ThemeComboBoxStates Disabled=new ThemeComboBoxStates(4);
+	}
+
+	internal class ThemeEdit:Themes
+	{
+		public ThemeEdit(Control parent):base(parent)
+		{
+		}
+		protected override string ThemeClass
+		{
+			get
+			{
+				return "EDIT";
+			}
+		}
+		public void DrawBackground(Graphics g, ThemeEditParts part, ThemeEditStates state, Rectangle r)
+		{
+			InternalDrawBackground(g,part,state,r);
+		}
+	}
+	internal class ThemeEditParts:ThemePart
+	{
+		protected ThemeEditParts(int themepartvalue):base(themepartvalue) {}
+		public static ThemeEditParts EditText=new ThemeEditParts(1);
+		public static ThemeEditParts Caret=new ThemeEditParts(2);
+	}
+	internal class ThemeEditStates:ThemeState
+	{
+		protected ThemeEditStates(int themestatevalue):base(themestatevalue) {}
+		public static ThemeEditStates Normal=new ThemeEditStates(1);
+		public static ThemeEditStates Hot=new ThemeEditStates(2);
+		public static ThemeEditStates Selected=new ThemeEditStates(3);
+		public static ThemeEditStates Disabled=new ThemeEditStates(4);
+		public static ThemeEditStates Focused=new ThemeEditStates(5);
+		public static ThemeEditStates ReadOnly=new ThemeEditStates(6);
+		public static ThemeEditStates Assist=new ThemeEditStates(7);
+	}
+
+	internal class ThemeExplorerBar:Themes
+	{
+		public ThemeExplorerBar(Control parent):base(parent)
+		{
+		}
+		protected override string ThemeClass
+		{
+			get
+			{
+				return "EXPLORERBAR";
+			}
+		}
+		public void DrawBackground(Graphics g, ThemeExplorerBarParts part, ThemeExplorerBarStates state, Rectangle r)
+		{
+			InternalDrawBackground(g,part,state,r);
+		}
+		public void DrawText(Graphics g, string text, Font font, Rectangle layoutRect, ThemeExplorerBarParts part, ThemeExplorerBarStates state, ThemeTextFormat format, bool drawdisabled)
+		{
+			InternalDrawText(g,text,font,layoutRect,part,state,format,drawdisabled);
+		}
+		public void DrawText(Graphics g, string text, Font font, Rectangle layoutRect, ThemeExplorerBarParts part, ThemeExplorerBarStates state, ThemeTextFormat format)
+		{
+			InternalDrawText(g,text,font,layoutRect,part,state,format,false);
+		}
+		public void DrawText(Graphics g, string text, Font font, Rectangle layoutRect, ThemeExplorerBarParts part, ThemeExplorerBarStates state)
+		{
+			InternalDrawText(g,text,font,layoutRect,part,state,ThemeTextFormat.Left,false);
+		}
+	}
+	internal class ThemeExplorerBarParts:ThemePart
+	{
+		protected ThemeExplorerBarParts(int themepartvalue):base(themepartvalue) {}
+		public static ThemeExplorerBarParts HeaderBackground=new ThemeExplorerBarParts(1);
+		public static ThemeExplorerBarParts HeaderClose=new ThemeExplorerBarParts(2);
+		public static ThemeExplorerBarParts HeaderPin=new ThemeExplorerBarParts(3);
+		public static ThemeExplorerBarParts IeBarMenu=new ThemeExplorerBarParts(4);
+		public static ThemeExplorerBarParts NormalGroupBackground=new ThemeExplorerBarParts(5);
+		public static ThemeExplorerBarParts NormalGroupCollapse=new ThemeExplorerBarParts(6);
+		public static ThemeExplorerBarParts NormalGroupExpand=new ThemeExplorerBarParts(7);
+		public static ThemeExplorerBarParts NormalGroupHead=new ThemeExplorerBarParts(8);
+		public static ThemeExplorerBarParts SpecialGroupBackground=new ThemeExplorerBarParts(9);
+		public static ThemeExplorerBarParts SpecialGroupCollapse=new ThemeExplorerBarParts(10);
+		public static ThemeExplorerBarParts SpecialGroupExpand=new ThemeExplorerBarParts(11);
+		public static ThemeExplorerBarParts SpecialGroupHead=new ThemeExplorerBarParts(12);
+	}
+	internal class ThemeExplorerBarStates:ThemeState
+	{
+		protected ThemeExplorerBarStates(int themestatevalue):base(themestatevalue) {}
+		// Header Background
+		public static ThemeExplorerBarStates HeaderBackgroundNormal=new ThemeExplorerBarStates(1);
+		// Header Close
+		public static ThemeExplorerBarStates HeaderCloseNormal=new ThemeExplorerBarStates(1);
+		public static ThemeExplorerBarStates HeaderCloseHot=new ThemeExplorerBarStates(2);
+		public static ThemeExplorerBarStates HeaderClosePressed=new ThemeExplorerBarStates(3);
+		// Header Pin
+		public static ThemeExplorerBarStates HeaderPinNormal=new ThemeExplorerBarStates(1);
+		public static ThemeExplorerBarStates HeaderPinHot=new ThemeExplorerBarStates(2);
+		public static ThemeExplorerBarStates HeaderPinPressed=new ThemeExplorerBarStates(3);
+		public static ThemeExplorerBarStates HeaderPinSelectedNormal=new ThemeExplorerBarStates(4);
+		public static ThemeExplorerBarStates HeaderPinSelectedHot=new ThemeExplorerBarStates(5);
+		public static ThemeExplorerBarStates HeaderPinSelectedPressed=new ThemeExplorerBarStates(6);
+		// IE Bar Menu
+		public static ThemeExplorerBarStates IeBarMenuNormal=new ThemeExplorerBarStates(1);
+		public static ThemeExplorerBarStates IeBarMenuHot=new ThemeExplorerBarStates(2);
+		public static ThemeExplorerBarStates IeBarMenuPressed=new ThemeExplorerBarStates(3);
+		// Normal Group Background
+		public static ThemeExplorerBarStates NormalGroupBackgroundNormal=new ThemeExplorerBarStates(1);
+		// Normal Group Collapse
+		public static ThemeExplorerBarStates NormalGroupCollapseNormal=new ThemeExplorerBarStates(1);
+		public static ThemeExplorerBarStates NormalGroupCollapseHot=new ThemeExplorerBarStates(2);
+		public static ThemeExplorerBarStates NormalGroupCollapsePressed=new ThemeExplorerBarStates(3);
+		// Normal Group Expand
+		public static ThemeExplorerBarStates NormalGroupExpandNormal=new ThemeExplorerBarStates(1);
+		public static ThemeExplorerBarStates NormalGroupExpandHot=new ThemeExplorerBarStates(2);
+		public static ThemeExplorerBarStates NormalGroupExpandPressed=new ThemeExplorerBarStates(3);
+		// Normal Group Head
+		public static ThemeExplorerBarStates NormalGroupHeadNormal=new ThemeExplorerBarStates(1);
+		// Special Group Background
+		public static ThemeExplorerBarStates SpecialGroupBackgroundNormal=new ThemeExplorerBarStates(1);
+        // Special Group Collapse
+		public static ThemeExplorerBarStates SpecialGroupCollapseNormal=new ThemeExplorerBarStates(1);
+		public static ThemeExplorerBarStates SpecialGroupCollapseHot=new ThemeExplorerBarStates(2);
+		public static ThemeExplorerBarStates SpecialGroupCollapsePressed=new ThemeExplorerBarStates(3);
+		// Special Group Expand
+		public static ThemeExplorerBarStates SpecialGroupExpandNormal=new ThemeExplorerBarStates(1);
+		public static ThemeExplorerBarStates SpecialGroupExpandHot=new ThemeExplorerBarStates(2);
+		public static ThemeExplorerBarStates SpecialGroupExpandPressed=new ThemeExplorerBarStates(3);
+		// Special Group Head
+		public static ThemeExplorerBarStates SpecialGroupHeadNormal=new ThemeExplorerBarStates(1);
+	}
+
+
+	internal class ThemeHeader:Themes
+	{
+		public ThemeHeader(Control parent):base(parent)
+		{
+		}
+		protected override string ThemeClass
+		{
+			get
+			{
+				return "HEADER";
+			}
+		}
+		public void DrawBackground(Graphics g, ThemeHeaderParts part, ThemeHeaderStates state, Rectangle r)
+		{
+			InternalDrawBackground(g,part,state,r);
+		}
+		public void DrawText(Graphics g, string text, Font font, Rectangle layoutRect, ThemeHeaderParts part, ThemeHeaderStates state, ThemeTextFormat format, bool drawdisabled)
+		{
+			InternalDrawText(g,text,font,layoutRect,part,state,format,drawdisabled);
+		}
+		public void DrawText(Graphics g, string text, Font font, Rectangle layoutRect, ThemeHeaderParts part, ThemeHeaderStates state, ThemeTextFormat format)
+		{
+			InternalDrawText(g,text,font,layoutRect,part,state,format,false);
+		}
+		public void DrawText(Graphics g, string text, Font font, Rectangle layoutRect, ThemeHeaderParts part, ThemeHeaderStates state)
+		{
+			InternalDrawText(g,text,font,layoutRect,part,state,ThemeTextFormat.Left,false);
+		}
+	}
+	internal class ThemeHeaderParts:ThemePart
+	{
+		protected ThemeHeaderParts(int themepartvalue):base(themepartvalue) {}
+		public static ThemeHeaderParts HeaderItem=new ThemeHeaderParts(1);
+		public static ThemeHeaderParts HeaderItemLeft=new ThemeHeaderParts(2);
+		public static ThemeHeaderParts HeaderItemRight=new ThemeHeaderParts(3);
+		public static ThemeHeaderParts HeaderSortArrow=new ThemeHeaderParts(4);
+	}
+	internal class ThemeHeaderStates:ThemeState
+	{
+		protected ThemeHeaderStates(int themestatevalue):base(themestatevalue) {}
+		public static ThemeHeaderStates ItemNormal=new ThemeHeaderStates(1);
+		public static ThemeHeaderStates ItemHot=new ThemeHeaderStates(2);
+		public static ThemeHeaderStates ItemPressed=new ThemeHeaderStates(3);
+		// Header Sort Arrow
+		public static ThemeHeaderStates SortArrowSortedUp=new ThemeHeaderStates(1);
+		public static ThemeHeaderStates SortArrowSortedDown=new ThemeHeaderStates(2);
+	}
+
+	internal class ThemeListView:Themes
+	{
+		public ThemeListView(Control parent):base(parent)
+		{
+		}
+		protected override string ThemeClass
+		{
+			get
+			{
+				return "LISTVIEW";
+			}
+		}
+		public void DrawBackground(Graphics g, ThemeListViewParts part, ThemeListViewStates state, Rectangle r)
+		{
+			InternalDrawBackground(g,part,state,r);
+		}
+	}
+	internal class ThemeListViewParts:ThemePart
+	{
+		protected ThemeListViewParts(int themepartvalue):base(themepartvalue) {}
+		public static ThemeListViewParts ListItem=new ThemeListViewParts(1);
+		public static ThemeListViewParts ListGroup=new ThemeListViewParts(2);
+		public static ThemeListViewParts ListDetail=new ThemeListViewParts(3);
+		public static ThemeListViewParts ListSortedDetail=new ThemeListViewParts(4);
+		public static ThemeListViewParts EmptyText=new ThemeListViewParts(5);
+	}
+	internal class ThemeListViewStates:ThemeState
+	{
+		protected ThemeListViewStates(int themestatevalue):base(themestatevalue) {}
+		public static ThemeListViewStates ListGroupNormal=new ThemeListViewStates(1);
+		public static ThemeListViewStates ListDetailNormal=new ThemeListViewStates(1);
+		public static ThemeListViewStates ListSortedDetailNormal=new ThemeListViewStates(1);
+		public static ThemeListViewStates EmptyTextNormal=new ThemeListViewStates(1);
+
+		public static ThemeListViewStates ListItemNormal=new ThemeListViewStates(1);
+		public static ThemeListViewStates ListItemHot=new ThemeListViewStates(2);
+		public static ThemeListViewStates ListItemSelected=new ThemeListViewStates(3);
+		public static ThemeListViewStates ListItemDisabled=new ThemeListViewStates(4);
+		public static ThemeListViewStates ListItemSelectedNotFocus=new ThemeListViewStates(5);	
+	}
+
+	internal class ThemeMenu:Themes
+	{
+		public ThemeMenu(Control parent):base(parent)
+		{
+		}
+		protected override string ThemeClass
+		{
+			get
+			{
+				return "MENU";
+			}
+		}
+		public void DrawBackground(Graphics g, ThemeMenuParts part, ThemeMenuStates state, Rectangle r)
+		{
+			InternalDrawBackground(g,part,state,r);
+		}
+	}
+	internal class ThemeMenuParts:ThemePart
+	{
+		protected ThemeMenuParts(int themepartvalue):base(themepartvalue) {}
+		public static ThemeMenuParts MenuItem=new ThemeMenuParts(1);
+		public static ThemeMenuParts MenuDropDown=new ThemeMenuParts(2);
+		public static ThemeMenuParts MenuBarItem=new ThemeMenuParts(3);
+		public static ThemeMenuParts MenuBarDropDown=new ThemeMenuParts(4);
+		public static ThemeMenuParts Chevron=new ThemeMenuParts(5);
+		public static ThemeMenuParts Separator=new ThemeMenuParts(6);
+	}
+	internal class ThemeMenuStates:ThemeState
+	{
+		protected ThemeMenuStates(int themestatevalue):base(themestatevalue) {}
+		public static ThemeMenuStates Normal=new ThemeMenuStates(1);
+		public static ThemeMenuStates Selected=new ThemeMenuStates(2);
+		public static ThemeMenuStates Demoted=new ThemeMenuStates(3);
+	}
+
+	internal class ThemeMenuBand:Themes
+	{
+		public ThemeMenuBand(Control parent):base(parent)
+		{
+		}
+		protected override string ThemeClass
+		{
+			get
+			{
+				return "MENUBAND";
+			}
+		}
+		public void DrawBackground(Graphics g, ThemeMenuBandParts part, ThemeMenuBandStates state, Rectangle r)
+		{
+			InternalDrawBackground(g,part,state,r);
+		}
+	}
+	internal class ThemeMenuBandParts:ThemePart
+	{
+		protected ThemeMenuBandParts(int themepartvalue):base(themepartvalue) {}
+		public static ThemeMenuBandParts NewAppButton=new ThemeMenuBandParts(1);
+		public static ThemeMenuBandParts Separator=new ThemeMenuBandParts(2);
+	}
+	internal class ThemeMenuBandStates:ThemeState
+	{
+		protected ThemeMenuBandStates(int themestatevalue):base(themestatevalue) {}
+		public static ThemeMenuBandStates Normal=new ThemeMenuBandStates(1);
+		public static ThemeMenuBandStates Hot=new ThemeMenuBandStates(2);
+		public static ThemeMenuBandStates Pressed=new ThemeMenuBandStates(3);
+		public static ThemeMenuBandStates Disabled=new ThemeMenuBandStates(4);
+		public static ThemeMenuBandStates Checked=new ThemeMenuBandStates(5);
+		public static ThemeMenuBandStates HotChecked=new ThemeMenuBandStates(6);
+	}
+
+	internal class ThemePage:Themes
+	{
+		public ThemePage(Control parent):base(parent)
+		{
+		}
+		protected override string ThemeClass
+		{
+			get
+			{
+				return "PAGE";
+			}
+		}
+		public void DrawBackground(Graphics g, ThemePageParts part, ThemePageStates state, Rectangle r)
+		{
+			InternalDrawBackground(g,part,state,r);
+		}
+	}
+	internal class ThemePageParts:ThemePart
+	{
+		protected ThemePageParts(int themepartvalue):base(themepartvalue) {}
+		public static ThemePageParts Up=new ThemePageParts(1);
+		public static ThemePageParts Down=new ThemePageParts(2);
+		public static ThemePageParts UpHorz=new ThemePageParts(3);
+		public static ThemePageParts DownHorz=new ThemePageParts(4);
+	}
+	internal class ThemePageStates:ThemeState
+	{
+		protected ThemePageStates(int themestatevalue):base(themestatevalue) {}
+		public static ThemePageStates Normal=new ThemePageStates(1);
+		public static ThemePageStates Hot=new ThemePageStates(2);
+		public static ThemePageStates Pressed=new ThemePageStates(3);
+		public static ThemePageStates Disabled=new ThemePageStates(4);
+	}
+
+	internal class ThemeProgress:Themes
+	{
+		public ThemeProgress(Control parent):base(parent)
+		{
+		}
+		protected override string ThemeClass
+		{
+			get
+			{
+				return "PROGRESS";
+			}
+		}
+		public void DrawBackground(Graphics g, ThemeProgressParts part, ThemeProgressStates state, Rectangle r)
+		{
+			InternalDrawBackground(g,part,state,r);
+		}
+	}
+	internal class ThemeProgressParts:ThemePart
+	{
+		protected ThemeProgressParts(int themepartvalue):base(themepartvalue) {}
+		public static ThemeProgressParts Bar=new ThemeProgressParts(1);
+		public static ThemeProgressParts BarVert=new ThemeProgressParts(2);
+		public static ThemeProgressParts Chunk=new ThemeProgressParts(3);
+		public static ThemeProgressParts ChunkVert=new ThemeProgressParts(4);
+	}
+	internal class ThemeProgressStates:ThemeState
+	{
+		protected ThemeProgressStates(int themestatevalue):base(themestatevalue) {}
+		public static ThemeProgressStates Normal=new ThemeProgressStates(1);
+	}
+
+	internal class ThemeRebar:Themes
+	{
+		public ThemeRebar(Control parent):base(parent)
+		{
+		}
+		protected override string ThemeClass
+		{
+			get
+			{
+				return "REBAR";
+			}
+		}
+		public void DrawBackground(Graphics g, ThemeRebarParts part, ThemeRebarStates state, Rectangle r)
+		{
+			InternalDrawBackground(g,part,state,r);
+		}
+	}
+	internal class ThemeRebarParts:ThemePart
+	{
+		protected ThemeRebarParts(int themepartvalue):base(themepartvalue) {}
+		public static ThemeRebarParts Background=new ThemeRebarParts(0);
+		public static ThemeRebarParts Gripper=new ThemeRebarParts(1);
+		public static ThemeRebarParts GripperVert=new ThemeRebarParts(2);
+		public static ThemeRebarParts Band=new ThemeRebarParts(3);
+		public static ThemeRebarParts Chevron=new ThemeRebarParts(4);
+		public static ThemeRebarParts ChevronVert=new ThemeRebarParts(5);
+	}
+	internal class ThemeRebarStates:ThemeState
+	{
+		protected ThemeRebarStates(int themestatevalue):base(themestatevalue) {}
+		public static ThemeRebarStates Normal=new ThemeRebarStates(0);
+		public static ThemeRebarStates ChevronNormal=new ThemeRebarStates(1);
+		public static ThemeRebarStates ChevronHot=new ThemeRebarStates(2);
+		public static ThemeRebarStates ChevronPressed=new ThemeRebarStates(3);
+	}
+
+	internal class ThemeScrollBar:Themes
+	{
+		public ThemeScrollBar(Control parent):base(parent)
+		{
+		}
+		protected override string ThemeClass
+		{
+			get
+			{
+				return "SCROLLBAR";
+			}
+		}
+		public void DrawBackground(Graphics g, ThemeScrollBarParts part, ThemeScrollBarStates state, Rectangle r)
+		{
+			InternalDrawBackground(g,part,state,r);
+		}
+	}
+	internal class ThemeScrollBarParts:ThemePart
+	{
+		protected ThemeScrollBarParts(int themepartvalue):base(themepartvalue) {}
+		public static ThemeScrollBarParts ArrowBtn=new ThemeScrollBarParts(1);
+		public static ThemeScrollBarParts ThumbBtnHorz=new ThemeScrollBarParts(2);
+		public static ThemeScrollBarParts ThumbBtnVert=new ThemeScrollBarParts(3);
+		public static ThemeScrollBarParts LowerTrackHorz=new ThemeScrollBarParts(4);
+		public static ThemeScrollBarParts UpperTrackHorz=new ThemeScrollBarParts(5);
+		public static ThemeScrollBarParts LowerTrackVert=new ThemeScrollBarParts(6);
+		public static ThemeScrollBarParts UpperTrackVert=new ThemeScrollBarParts(7);
+		public static ThemeScrollBarParts GripperHorz=new ThemeScrollBarParts(8);
+		public static ThemeScrollBarParts GripperVert=new ThemeScrollBarParts(9);
+		public static ThemeScrollBarParts SizeBox=new ThemeScrollBarParts(10);
+	}
+	internal class ThemeScrollBarStates:ThemeState
+	{
+		protected ThemeScrollBarStates(int themestatevalue):base(themestatevalue) {}
+		public static ThemeScrollBarStates ArrowBtnUpNormal=new ThemeScrollBarStates(1);
+		public static ThemeScrollBarStates ArrowBtnUpHot=new ThemeScrollBarStates(2);
+		public static ThemeScrollBarStates ArrowBtnUpPressed=new ThemeScrollBarStates(3);
+		public static ThemeScrollBarStates ArrowBtnUpDisabled=new ThemeScrollBarStates(4);
+		public static ThemeScrollBarStates ArrowBtnDownNormal=new ThemeScrollBarStates(5);
+		public static ThemeScrollBarStates ArrowBtnDownHot=new ThemeScrollBarStates(6);
+		public static ThemeScrollBarStates ArrowBtnDownPressed=new ThemeScrollBarStates(7);
+		public static ThemeScrollBarStates ArrowBtnDownDisabled=new ThemeScrollBarStates(8);
+		public static ThemeScrollBarStates ArrowBtnLeftNormal=new ThemeScrollBarStates(9);
+		public static ThemeScrollBarStates ArrowBtnLeftHot=new ThemeScrollBarStates(10);
+		public static ThemeScrollBarStates ArrowBtnLeftPressed=new ThemeScrollBarStates(11);
+		public static ThemeScrollBarStates ArrowBtnLeftDisabled=new ThemeScrollBarStates(12);
+		public static ThemeScrollBarStates ArrowBtnRightNormal=new ThemeScrollBarStates(13);
+		public static ThemeScrollBarStates ArrowBtnRightHot=new ThemeScrollBarStates(14);
+		public static ThemeScrollBarStates ArrowBtnRightPressed=new ThemeScrollBarStates(15);
+		public static ThemeScrollBarStates ArrowBtnRightDisabled=new ThemeScrollBarStates(16);
+		public static ThemeScrollBarStates GripperHorzNormal=new ThemeScrollBarStates(0);
+		public static ThemeScrollBarStates GripperVertNormal=new ThemeScrollBarStates(0);
+		public static ThemeScrollBarStates TrackNormal=new ThemeScrollBarStates(1);
+		public static ThemeScrollBarStates TrackHot=new ThemeScrollBarStates(2);
+		public static ThemeScrollBarStates TrackPressed=new ThemeScrollBarStates(3);
+		public static ThemeScrollBarStates TrackDisabled=new ThemeScrollBarStates(4);
+		public static ThemeScrollBarStates ThumbNormal=new ThemeScrollBarStates(1);
+		public static ThemeScrollBarStates ThumbHot=new ThemeScrollBarStates(2);
+		public static ThemeScrollBarStates ThumbPressed=new ThemeScrollBarStates(3);
+		public static ThemeScrollBarStates ThumbDisabled=new ThemeScrollBarStates(4);
+		public static ThemeScrollBarStates SizeBoxRightAlign=new ThemeScrollBarStates(1);
+		public static ThemeScrollBarStates SizeBoxLeftAlign=new ThemeScrollBarStates(2);
+	}
+
+	internal class ThemeSpin:Themes
+	{
+		public ThemeSpin(Control parent):base(parent)
+		{
+		}
+		protected override string ThemeClass
+		{
+			get
+			{
+				return "SPIN";
+			}
+		}
+		public void DrawBackground(Graphics g, ThemeSpinParts part, ThemeSpinStates state, Rectangle r)
+		{
+			InternalDrawBackground(g,part,state,r);
+		}
+	}
+	internal class ThemeSpinParts:ThemePart
+	{
+		protected ThemeSpinParts(int themepartvalue):base(themepartvalue) {}
+		public static ThemeSpinParts Up=new ThemeSpinParts(1);
+		public static ThemeSpinParts Down=new ThemeSpinParts(2);
+		public static ThemeSpinParts UpHorz=new ThemeSpinParts(3);
+		public static ThemeSpinParts DownHorz=new ThemeSpinParts(4);
+	}
+	internal class ThemeSpinStates:ThemeState
+	{
+		protected ThemeSpinStates(int themestatevalue):base(themestatevalue) {}
+		public static ThemeSpinStates Normal=new ThemeSpinStates(1);
+		public static ThemeSpinStates Hot=new ThemeSpinStates(2);
+		public static ThemeSpinStates Pressed=new ThemeSpinStates(3);
+		public static ThemeSpinStates Disabled=new ThemeSpinStates(4);
+	}
+
+	internal class ThemeStartPanel:Themes
+	{
+		public ThemeStartPanel(Control parent):base(parent)
+		{
+		}
+		protected override string ThemeClass
+		{
+			get
+			{
+				return "STARTPANEL";
+			}
+		}
+		public void DrawBackground(Graphics g, ThemeStartPanelParts part, ThemeStartPanelStates state, Rectangle r)
+		{
+			InternalDrawBackground(g,part,state,r);
+		}
+	}
+	internal class ThemeStartPanelParts:ThemePart
+	{
+		protected ThemeStartPanelParts(int themepartvalue):base(themepartvalue) {}
+		public static ThemeStartPanelParts UserPane=new ThemeStartPanelParts(1);
+		public static ThemeStartPanelParts MorePrograms=new ThemeStartPanelParts(2);
+		public static ThemeStartPanelParts MoreProgramsArrow=new ThemeStartPanelParts(3);
+		public static ThemeStartPanelParts ProgList=new ThemeStartPanelParts(4);
+		public static ThemeStartPanelParts ProgListSeparator=new ThemeStartPanelParts(5);
+		public static ThemeStartPanelParts PlacesList=new ThemeStartPanelParts(6);
+		public static ThemeStartPanelParts PlacesListSeparator=new ThemeStartPanelParts(7);
+		public static ThemeStartPanelParts LogOff=new ThemeStartPanelParts(8);
+		public static ThemeStartPanelParts LogOffButtons=new ThemeStartPanelParts(9);
+		public static ThemeStartPanelParts UserPicture=new ThemeStartPanelParts(10);
+		public static ThemeStartPanelParts Preview=new ThemeStartPanelParts(11);
+	}
+	internal class ThemeStartPanelStates:ThemeState
+	{
+		protected ThemeStartPanelStates(int themestatevalue):base(themestatevalue) {}
+		public static ThemeStartPanelStates UserPaneNormal=new ThemeStartPanelStates(0);
+		public static ThemeStartPanelStates MoreProgramsNormal=new ThemeStartPanelStates(0);
+		public static ThemeStartPanelStates MoreProgramsArrowNormal=new ThemeStartPanelStates(1);
+		public static ThemeStartPanelStates MoreProgramsArrowHot=new ThemeStartPanelStates(2);
+		public static ThemeStartPanelStates MoreProgramsArrowPressed=new ThemeStartPanelStates(3);
+		public static ThemeStartPanelStates ProgListNormal=new ThemeStartPanelStates(0);
+		public static ThemeStartPanelStates ProgListSeparatorNormal=new ThemeStartPanelStates(0);
+		public static ThemeStartPanelStates PlacesListNormal=new ThemeStartPanelStates(0);
+		public static ThemeStartPanelStates PlacesListSeparatorNormal=new ThemeStartPanelStates(0);
+		public static ThemeStartPanelStates LogOffNormal=new ThemeStartPanelStates(0);
+		public static ThemeStartPanelStates LogOffButtonsNormal=new ThemeStartPanelStates(1);
+		public static ThemeStartPanelStates LogOffButtonsHot=new ThemeStartPanelStates(2);
+		public static ThemeStartPanelStates LogOffButtonsPressed=new ThemeStartPanelStates(3);
+		public static ThemeStartPanelStates UserPictureNormal=new ThemeStartPanelStates(0);
+		public static ThemeStartPanelStates PreviewNormal=new ThemeStartPanelStates(0);
+
+	}
+
+	internal class ThemeStatus:Themes
+	{
+		public ThemeStatus(Control parent):base(parent)
+		{
+		}
+		protected override string ThemeClass
+		{
+			get
+			{
+				return "STATUS";
+			}
+		}
+		public void DrawBackground(Graphics g, ThemeStatusParts part, ThemeStatusStates state, Rectangle r)
+		{
+			InternalDrawBackground(g,part,state,r);
+		}
+	}
+	internal class ThemeStatusParts:ThemePart
+	{
+		protected ThemeStatusParts(int themepartvalue):base(themepartvalue) {}
+		public static ThemeStatusParts Pane=new ThemeStatusParts(1);
+		public static ThemeStatusParts GripperPane=new ThemeStatusParts(2);
+		public static ThemeStatusParts Gripper=new ThemeStatusParts(3);
+	}
+	internal class ThemeStatusStates:ThemeState
+	{
+		protected ThemeStatusStates(int themestatevalue):base(themestatevalue) {}
+		public static ThemeStatusStates Normal=new ThemeStatusStates(0);
+	}
+
+	internal class ThemeTab:Themes
+	{
+		public ThemeTab(Control parent):base(parent)
+		{
+		}
+		protected override string ThemeClass
+		{
+			get
+			{
+				return "TAB";
+			}
+		}
+		public void DrawBackground(Graphics g, ThemeTabParts part, ThemeTabStates state, Rectangle r)
+		{
+			InternalDrawBackground(g,part,state,r);
+		}
+	}
+	internal class ThemeTabParts:ThemePart
+	{
+		protected ThemeTabParts(int themepartvalue):base(themepartvalue) {}
+		public static ThemeTabParts TabItem=new ThemeTabParts(1);
+		public static ThemeTabParts TabItemLeftEdge=new ThemeTabParts(2);
+		public static ThemeTabParts TabItemRightEdge=new ThemeTabParts(3);
+		public static ThemeTabParts TabItemBothEdge=new ThemeTabParts(4);
+		public static ThemeTabParts TopTabItem=new ThemeTabParts(5);
+		public static ThemeTabParts TopTabItemLeftEdge=new ThemeTabParts(6);
+		public static ThemeTabParts TopTabItemRightEdge=new ThemeTabParts(7);
+		public static ThemeTabParts TopTabItemBothEdge=new ThemeTabParts(8);
+		public static ThemeTabParts Pane=new ThemeTabParts(9);
+		public static ThemeTabParts Body=new ThemeTabParts(10);
+	}
+	internal class ThemeTabStates:ThemeState
+	{
+		protected ThemeTabStates(int themestatevalue):base(themestatevalue) {}
+		public static ThemeTabStates BodyNormal=new ThemeTabStates(0);
+		public static ThemeTabStates PaneNormal=new ThemeTabStates(0);
+		public static ThemeTabStates Normal=new ThemeTabStates(1);
+		public static ThemeTabStates Hot=new ThemeTabStates(2);
+		public static ThemeTabStates Selected=new ThemeTabStates(3);
+		public static ThemeTabStates Disabled=new ThemeTabStates(4);
+		public static ThemeTabStates Focused=new ThemeTabStates(4);
+
+	}
+
+	internal class ThemeTaskBand:Themes
+	{
+		public ThemeTaskBand(Control parent):base(parent)
+		{
+		}
+		protected override string ThemeClass
+		{
+			get
+			{
+				return "TASKBAND";
+			}
+		}
+		public void DrawBackground(Graphics g, ThemeTaskBandParts part, ThemeTaskBandStates state, Rectangle r)
+		{
+			InternalDrawBackground(g,part,state,r);
+		}
+	}
+	internal class ThemeTaskBandParts:ThemePart
+	{
+		protected ThemeTaskBandParts(int themepartvalue):base(themepartvalue) {}
+		public static ThemeTaskBandParts GroupCount=new ThemeTaskBandParts(1);
+		public static ThemeTaskBandParts FlashButton=new ThemeTaskBandParts(2);
+		public static ThemeTaskBandParts FlashButtonGroupMenu=new ThemeTaskBandParts(3);
+	}
+	internal class ThemeTaskBandStates:ThemeState
+	{
+		protected ThemeTaskBandStates(int themestatevalue):base(themestatevalue) {}
+		public static ThemeTaskBandStates Normal=new ThemeTaskBandStates(0);
+	}
+
+	internal class ThemeTaskBar:Themes
+	{
+		public ThemeTaskBar(Control parent):base(parent)
+		{
+		}
+		protected override string ThemeClass
+		{
+			get
+			{
+				return "TASKBAR";
+			}
+		}
+		public void DrawBackground(Graphics g, ThemeTaskBarParts part, ThemeTaskBarStates state, Rectangle r)
+		{
+			InternalDrawBackground(g,part,state,r);
+		}
+	}
+	internal class ThemeTaskBarParts:ThemePart
+	{
+		protected ThemeTaskBarParts(int themepartvalue):base(themepartvalue) {}
+		public static ThemeTaskBarParts BackgroundBottom=new ThemeTaskBarParts(1);
+		public static ThemeTaskBarParts BackgroundRight=new ThemeTaskBarParts(2);
+		public static ThemeTaskBarParts BackgroundTop=new ThemeTaskBarParts(3);
+		public static ThemeTaskBarParts BackgroundLeft=new ThemeTaskBarParts(4);
+		public static ThemeTaskBarParts SizingBarBottom=new ThemeTaskBarParts(5);
+		public static ThemeTaskBarParts SizingBarRight=new ThemeTaskBarParts(6);
+		public static ThemeTaskBarParts SizingBarTop=new ThemeTaskBarParts(7);
+		public static ThemeTaskBarParts SizingBarLeft=new ThemeTaskBarParts(8);
+	}
+	internal class ThemeTaskBarStates:ThemeState
+	{
+		protected ThemeTaskBarStates(int themestatevalue):base(themestatevalue) {}
+		public static ThemeTaskBarStates Normal=new ThemeTaskBarStates(0);
+	}
+
+	internal class ThemeTooltip:Themes
+	{
+		public ThemeTooltip(Control parent):base(parent)
+		{
+		}
+		protected override string ThemeClass
+		{
+			get
+			{
+				return "TOOLTIP";
+			}
+		}
+		public void DrawBackground(Graphics g, ThemeTooltipParts part, ThemeTooltipStates state, Rectangle r)
+		{
+			InternalDrawBackground(g,part,state,r);
+		}
+	}
+	internal class ThemeTooltipParts:ThemePart
+	{
+		protected ThemeTooltipParts(int themepartvalue):base(themepartvalue) {}
+		public static ThemeTooltipParts Standard=new ThemeTooltipParts(1);
+		public static ThemeTooltipParts StandardTitle=new ThemeTooltipParts(2);
+		public static ThemeTooltipParts Balloon=new ThemeTooltipParts(3);
+		public static ThemeTooltipParts BalloonTitle=new ThemeTooltipParts(4);
+		public static ThemeTooltipParts Close=new ThemeTooltipParts(5);
+	}
+	internal class ThemeTooltipStates:ThemeState
+	{
+		protected ThemeTooltipStates(int themestatevalue):base(themestatevalue) {}
+		public static ThemeTooltipStates StandardNormal=new ThemeTooltipStates(1);
+		public static ThemeTooltipStates StandardLink=new ThemeTooltipStates(2);
+		public static ThemeTooltipStates BalloonNormal=new ThemeTooltipStates(1);
+		public static ThemeTooltipStates BalloonLink=new ThemeTooltipStates(2);
+		public static ThemeTooltipStates CloseNormal=new ThemeTooltipStates(1);
+		public static ThemeTooltipStates CloseHot=new ThemeTooltipStates(2);
+		public static ThemeTooltipStates ClosePressed=new ThemeTooltipStates(3);
+	}
+
+	internal class ThemeTrackbar:Themes
+	{
+		public ThemeTrackbar(Control parent):base(parent)
+		{
+		}
+		protected override string ThemeClass
+		{
+			get
+			{
+				return "TRACKBAR";
+			}
+		}
+		public void DrawBackground(Graphics g, ThemeTrackbarParts part, ThemeTrackbarStates state, Rectangle r)
+		{
+			InternalDrawBackground(g,part,state,r);
+		}
+	}
+	internal class ThemeTrackbarParts:ThemePart
+	{
+		protected ThemeTrackbarParts(int themepartvalue):base(themepartvalue) {}
+		public static ThemeTrackbarParts Track=new ThemeTrackbarParts(1);
+		public static ThemeTrackbarParts TrackVert=new ThemeTrackbarParts(2);
+		public static ThemeTrackbarParts Thumb=new ThemeTrackbarParts(3);
+		public static ThemeTrackbarParts ThumbBottom=new ThemeTrackbarParts(4);
+		public static ThemeTrackbarParts ThumbTop=new ThemeTrackbarParts(5);
+		public static ThemeTrackbarParts ThumbVert=new ThemeTrackbarParts(6);
+		public static ThemeTrackbarParts ThumbLeft=new ThemeTrackbarParts(7);
+		public static ThemeTrackbarParts ThumbRight=new ThemeTrackbarParts(8);
+		public static ThemeTrackbarParts Tics=new ThemeTrackbarParts(9);
+		public static ThemeTrackbarParts TicsVert=new ThemeTrackbarParts(10);
+	}
+	internal class ThemeTrackbarStates:ThemeState
+	{
+		protected ThemeTrackbarStates(int themestatevalue):base(themestatevalue) {}
+		public static ThemeTrackbarStates TrackNormal=new ThemeTrackbarStates(1);
+		public static ThemeTrackbarStates TicsNormal=new ThemeTrackbarStates(1);
+        public static ThemeTrackbarStates ThumbNormal=new ThemeTrackbarStates(1);
+		public static ThemeTrackbarStates ThumbHot=new ThemeTrackbarStates(2);
+		public static ThemeTrackbarStates ThumbPressed=new ThemeTrackbarStates(3);
+		public static ThemeTrackbarStates ThumbFocused=new ThemeTrackbarStates(4);
+		public static ThemeTrackbarStates ThumbDisabled=new ThemeTrackbarStates(5);
+	}
+
+	internal class ThemeTrayNotify:Themes
+	{
+		public ThemeTrayNotify(Control parent):base(parent)
+		{
+		}
+		protected override string ThemeClass
+		{
+			get
+			{
+				return "TRAYNOTIFY";
+			}
+		}
+		public void DrawBackground(Graphics g, ThemeTrayNotifyParts part, ThemeTrayNotifyStates state, Rectangle r)
+		{
+			InternalDrawBackground(g,part,state,r);
+		}
+	}
+	internal class ThemeTrayNotifyParts:ThemePart
+	{
+		protected ThemeTrayNotifyParts(int themepartvalue):base(themepartvalue) {}
+		public static ThemeTrayNotifyParts Background=new ThemeTrayNotifyParts(1);
+		public static ThemeTrayNotifyParts AnimBackground=new ThemeTrayNotifyParts(2);
+	}
+	internal class ThemeTrayNotifyStates:ThemeState
+	{
+		protected ThemeTrayNotifyStates(int themestatevalue):base(themestatevalue) {}
+		public static ThemeTrayNotifyStates Normal=new ThemeTrayNotifyStates(0);
+	}
+
+	internal class ThemeTreeView:Themes
+	{
+		public ThemeTreeView(Control parent):base(parent)
+		{
+		}
+		protected override string ThemeClass
+		{
+			get
+			{
+				return "TREEVIEW";
+			}
+		}
+		public void DrawBackground(Graphics g, ThemeTreeViewParts part, ThemeTreeViewStates state, Rectangle r)
+		{
+			InternalDrawBackground(g,part,state,r);
+		}
+	}
+	internal class ThemeTreeViewParts:ThemePart
+	{
+		protected ThemeTreeViewParts(int themepartvalue):base(themepartvalue) {}
+		public static ThemeTreeViewParts TreeItem=new ThemeTreeViewParts(1);
+		public static ThemeTreeViewParts Glyph=new ThemeTreeViewParts(1);
+		public static ThemeTreeViewParts Branch=new ThemeTreeViewParts(1);
+	}
+	internal class ThemeTreeViewStates:ThemeState
+	{
+		protected ThemeTreeViewStates(int themestatevalue):base(themestatevalue) {}
+		public static ThemeTreeViewStates BranchNormal=new ThemeTreeViewStates(0);
+		public static ThemeTreeViewStates GlyphClosed=new ThemeTreeViewStates(1);
+		public static ThemeTreeViewStates GlyphOpen=new ThemeTreeViewStates(2);
+		public static ThemeTreeViewStates TreeItemNormal=new ThemeTreeViewStates(1);
+		public static ThemeTreeViewStates TreeItemHot=new ThemeTreeViewStates(2);
+		public static ThemeTreeViewStates TreeItemSelected=new ThemeTreeViewStates(3);
+		public static ThemeTreeViewStates TreeItemDisabled=new ThemeTreeViewStates(4);
+		public static ThemeTreeViewStates TreeItemSelectedNotFocus=new ThemeTreeViewStates(5);
+	}
+
+	internal class ThemeWindow:Themes
+	{
+		public ThemeWindow(Control parent):base(parent)
+		{
+		}
+		protected override string ThemeClass
+		{
+			get
+			{
+				return "WINDOW";
+			}
+		}
+		public void DrawBackground(Graphics g, ThemeWindowParts part, ThemeWindowStates state, Rectangle r)
+		{
+			InternalDrawBackground(g,part,state,r);
+		}
+		public void DrawText(Graphics g, string text, Font font, Rectangle layoutRect, ThemeWindowParts part, ThemeWindowStates state, ThemeTextFormat format, bool drawdisabled)
+		{
+			InternalDrawText(g,text,font,layoutRect,part,state,format,drawdisabled);
+		}
+		public void DrawText(Graphics g, string text, Font font, Rectangle layoutRect, ThemeWindowParts part, ThemeWindowStates state, ThemeTextFormat format)
+		{
+			InternalDrawText(g,text,font,layoutRect,part,state,format,false);
+		}
+		public void DrawText(Graphics g, string text, Font font, Rectangle layoutRect, ThemeWindowParts part, ThemeWindowStates state)
+		{
+			InternalDrawText(g,text,font,layoutRect,part,state,ThemeTextFormat.Left,false);
+		}
+        public void DrawTextEx(Graphics g, string text, Font font, Rectangle layoutRect, ThemePart part, ThemeState state, ThemeTextFormat format, DTTOPTS options)
+        {
+            InternalDrawTextEx(g, text, font, layoutRect, part, state, format, options);
+        }
+
+		public IntPtr GetThemeBackgroundRegion(Graphics g, ThemeWindowParts part, ThemeWindowStates state, Rectangle r)
+		{
+            return this.InternalGetThemeBackgroundRegion(g,part,state,r);
+		}
+	}
+	internal class ThemeWindowParts:ThemePart
+	{
+		protected ThemeWindowParts(int themepartvalue):base(themepartvalue) {}
+		public static ThemeWindowParts Root=new ThemeWindowParts(0);
+		public static ThemeWindowParts Caption=new ThemeWindowParts(1);
+		public static ThemeWindowParts SmallCaption=new ThemeWindowParts(2);
+		public static ThemeWindowParts MinCaption=new ThemeWindowParts(3);
+		public static ThemeWindowParts SmallMinCaption=new ThemeWindowParts(4);
+		public static ThemeWindowParts MaxCaption=new ThemeWindowParts(5);
+		public static ThemeWindowParts SmallMaxCaption=new ThemeWindowParts(6);
+		public static ThemeWindowParts FrameLeft=new ThemeWindowParts(7);
+		public static ThemeWindowParts FrameRight=new ThemeWindowParts(8);
+		public static ThemeWindowParts FrameBottom=new ThemeWindowParts(9);
+		public static ThemeWindowParts SmallFrameLeft=new ThemeWindowParts(10);
+		public static ThemeWindowParts SmallFrameRight=new ThemeWindowParts(11);
+		public static ThemeWindowParts SmallFrameBottom=new ThemeWindowParts(12);
+		public static ThemeWindowParts SysButton=new ThemeWindowParts(13);
+		public static ThemeWindowParts MdiSysButton=new ThemeWindowParts(14);
+		public static ThemeWindowParts MdiMinButton=new ThemeWindowParts(16);
+		public static ThemeWindowParts MaxButton=new ThemeWindowParts(17);
+		public static ThemeWindowParts CloseButton=new ThemeWindowParts(18);
+		public static ThemeWindowParts SmallCloseButton=new ThemeWindowParts(19);
+		public static ThemeWindowParts MdiCloseButton=new ThemeWindowParts(20);
+		public static ThemeWindowParts RestoreButton=new ThemeWindowParts(21);
+		public static ThemeWindowParts MdiRestoreButton=new ThemeWindowParts(22);
+		public static ThemeWindowParts HelpButton=new ThemeWindowParts(23);
+		public static ThemeWindowParts MdiHelpButton=new ThemeWindowParts(24);
+		public static ThemeWindowParts HorzScroll=new ThemeWindowParts(25);
+		public static ThemeWindowParts HorzThumb=new ThemeWindowParts(26);
+		public static ThemeWindowParts VertScroll=new ThemeWindowParts(27);
+		public static ThemeWindowParts VertThumb=new ThemeWindowParts(28);
+		public static ThemeWindowParts Dialog=new ThemeWindowParts(29);
+		//---- hit-test templates ---
+		public static ThemeWindowParts HtCaptionSizingTemplate=new ThemeWindowParts(30);
+		public static ThemeWindowParts HtSmallCaptionSizingTemplate=new ThemeWindowParts(31);
+		public static ThemeWindowParts HtFrameLeftSizingTemplate=new ThemeWindowParts(32);
+		public static ThemeWindowParts HtSmallFrameLeftSizingTemplate=new ThemeWindowParts(33);
+		public static ThemeWindowParts HtFrameRightSizingTemplate=new ThemeWindowParts(34);
+		public static ThemeWindowParts HtSmallFrameRightSizingTemplate=new ThemeWindowParts(35);
+		public static ThemeWindowParts HtFrameBottomSizingTemplate=new ThemeWindowParts(36);
+		public static ThemeWindowParts HtSmallFrameBottomSizingTemplate=new ThemeWindowParts(37);
+	}
+	internal class ThemeWindowStates:ThemeState
+	{
+		protected ThemeWindowStates(int themestatevalue):base(themestatevalue) {}
+		public static ThemeWindowStates Normal=new ThemeWindowStates(0);
+		public static ThemeWindowStates CaptionActive=new ThemeWindowStates(1);
+		public static ThemeWindowStates CaptionInactive=new ThemeWindowStates(2);
+		public static ThemeWindowStates CaptionDisabled=new ThemeWindowStates(3);
+		public static ThemeWindowStates FrameActive=new ThemeWindowStates(1);
+		public static ThemeWindowStates FrameInactive=new ThemeWindowStates(2);
+		public static ThemeWindowStates ButtonNormal=new ThemeWindowStates(1);
+		public static ThemeWindowStates ButtonHot=new ThemeWindowStates(2);
+		public static ThemeWindowStates ButtonPushed=new ThemeWindowStates(3);
+		public static ThemeWindowStates ButtonDisabled=new ThemeWindowStates(4);
+		public static ThemeWindowStates HorzScrollNormal=new ThemeWindowStates(1);
+		public static ThemeWindowStates HorzScrollHot=new ThemeWindowStates(2);
+		public static ThemeWindowStates HorzScrollPushed=new ThemeWindowStates(3);
+		public static ThemeWindowStates HorzScrollDisabled=new ThemeWindowStates(4);
+		public static ThemeWindowStates HorzThumbNormal=new ThemeWindowStates(1);
+		public static ThemeWindowStates HorzThumbHot=new ThemeWindowStates(2);
+		public static ThemeWindowStates HorzThumbPushed=new ThemeWindowStates(3);
+		public static ThemeWindowStates HorzThumbDisabled=new ThemeWindowStates(4);
+		public static ThemeWindowStates VertScrollNormal=new ThemeWindowStates(1);
+		public static ThemeWindowStates VertScrollHot=new ThemeWindowStates(2);
+		public static ThemeWindowStates VertScrollPushed=new ThemeWindowStates(3);
+		public static ThemeWindowStates VertScrollDisabled=new ThemeWindowStates(4);
+		public static ThemeWindowStates VertThumbNormal=new ThemeWindowStates(1);
+		public static ThemeWindowStates VertThumbHot=new ThemeWindowStates(2);
+		public static ThemeWindowStates VertThumbPushed=new ThemeWindowStates(3);
+		public static ThemeWindowStates VertThumbDisabled=new ThemeWindowStates(4);
+	}
+
+	internal class ThemePart
+	{
+		public readonly int Value;
+		public ThemePart(int themepartvalue)
+		{
+			this.Value=themepartvalue;
+		}
+	}
+
+	internal abstract class ThemeState
+	{
+		public readonly int Value;
+		public ThemeState(int themestatevalue)
+		{
+			this.Value=themestatevalue;
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TimeSelector.ico b/PROMS/DotNetBar Source Code/TimeSelector.ico
new file mode 100644
index 00000000..23759d96
Binary files /dev/null and b/PROMS/DotNetBar Source Code/TimeSelector.ico differ
diff --git a/PROMS/DotNetBar Source Code/ToastDisplay.cs b/PROMS/DotNetBar Source Code/ToastDisplay.cs
new file mode 100644
index 00000000..fcd4cc4e
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/ToastDisplay.cs	
@@ -0,0 +1,368 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows.Forms;
+using System.Drawing;
+using System.Drawing.Imaging;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represents toast display control. This class is not for public use.
+    /// </summary>
+    [ToolboxItem(false), EditorBrowsable(EditorBrowsableState.Never)]
+    public class ToastDisplay : Control
+    {
+        private const int GlowSize = 4;
+        private readonly Size TextPadding = new Size(4, 4);
+
+        #region Constructor
+        /// <summary>
+        /// Initializes a new instance of the ToastDisplay class.
+        /// </summary>
+        public ToastDisplay()
+        {
+            this.SetStyle(ControlStyles.AllPaintingInWmPaint
+                        | ControlStyles.OptimizedDoubleBuffer
+                        | ControlStyles.UserPaint
+                        | ControlStyles.SupportsTransparentBackColor, true);
+            this.ForeColor = Color.White;
+        }
+        protected override void Dispose(bool disposing)
+        {
+            if (_BackgroundImage != null)
+            {
+                _BackgroundImage.Dispose();
+                _BackgroundImage = null;
+            }
+            base.Dispose(disposing);
+        }
+        #endregion
+
+        #region Implementation
+
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            BufferedGraphicsContext context = new BufferedGraphicsContext();
+
+            using (Bitmap canvas = new Bitmap(this.Width, this.Height, e.Graphics))
+            {
+                Graphics g = Graphics.FromImage(canvas);
+                g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.AntiAlias;
+
+                Color glowColor = GetGlowColor(_GlowColor);
+                Rectangle r = this.ClientRectangle;
+                Color back = _ToastBackColor;
+
+                r.Inflate(-3, -3);
+
+                if (!glowColor.IsEmpty)
+                {
+                    for (int i = 0; i < GlowSize; i++)
+                    {
+                        using (Pen pen = new Pen(glowColor, 5))
+                        {
+                            pen.LineJoin = System.Drawing.Drawing2D.LineJoin.Round;
+                            g.DrawRectangle(pen, r);
+                        }
+                        r.Inflate(-1, -1);
+                    }
+                }
+
+                r = this.ClientRectangle;
+                r.Inflate(-GlowSize, -GlowSize);
+
+                using (Pen pen = new Pen(_ToastBackColor, 5))
+                {
+                    pen.LineJoin = System.Drawing.Drawing2D.LineJoin.Round;
+                    r.Inflate(-3, -3);
+                    g.DrawRectangle(pen, r);
+                }
+                DisplayHelp.FillRectangle(g, r, _ToastBackColor);
+
+                r = this.ClientRectangle;
+                r.Inflate(-(TextPadding.Width + GlowSize), -(TextPadding.Height + GlowSize));
+
+                if (_Image != null)
+                {
+                    if (_ImageBox != null)
+                    {
+                        _ImageBox.Bounds = new Rectangle(r.Location, _Image.Size);
+                    }
+                    else
+                        g.DrawImage(_Image, r.Location);
+
+                    r.X += _Image.Width + TextPadding.Width;
+                    r.Width -= _Image.Width + TextPadding.Width;
+                }
+
+                if (r.Width > 1)
+                {
+                    if (_TextMarkup == null)
+                    {
+                        eTextFormat format = TextFormat;
+                        if (this.RightToLeft == RightToLeft.Yes) format |= eTextFormat.RightToLeft;
+                        //TextDrawing.DrawString(g, Text, this.Font, this.ForeColor, r, format);
+                        TextRenderer.DrawText(g, Text, Font, r, this.ForeColor, _ToastBackColor);
+                    }
+                    else
+                    {
+                        TextMarkup.MarkupDrawContext d = new TextMarkup.MarkupDrawContext(g, this.Font, this.ForeColor,
+                            (this.RightToLeft == RightToLeft.Yes), r, true);
+                        _TextMarkup.Arrange(r, d);
+                        _TextMarkup.Render(d);
+                    }
+                }
+
+                g.Dispose();
+
+                if (_Alpha == 255)
+                {
+                    e.Graphics.DrawImage(canvas, 0, 0);
+                }
+                else
+                {
+                    ColorMatrix matrix = new ColorMatrix();
+                    matrix.Matrix33 = _Alpha / 255f;
+                    using (ImageAttributes imageAtt = new ImageAttributes())
+                    {
+                        imageAtt.SetColorMatrix(matrix);
+                        e.Graphics.DrawImage(canvas, new Rectangle(0, 0, canvas.Width, canvas.Height), 0, 0, canvas.Width, canvas.Height, GraphicsUnit.Pixel, imageAtt);
+                    }
+
+                }
+            }
+
+            base.OnPaint(e);
+        }
+        internal Size DesiredSize(Padding margin, Rectangle parentBounds)
+        {
+            parentBounds.Width -= margin.Horizontal;
+            parentBounds.Height -= margin.Vertical;
+            parentBounds.Width -= GlowSize + TextPadding.Width * 2;
+            parentBounds.Height -= GlowSize + TextPadding.Height * 2;
+
+            Size desiredSize = new Size(GlowSize * 2 + TextPadding.Width * 2, GlowSize * 2 + TextPadding.Height * 2);
+
+            using (Graphics g = this.CreateGraphics())
+            {
+                if (_TextMarkup != null)
+                {
+                    TextMarkup.MarkupDrawContext d = new TextMarkup.MarkupDrawContext(g, this.Font, Color.Black, (this.RightToLeft == RightToLeft.Yes));
+                    _TextMarkup.Measure(new Size(parentBounds.Width, 1), d);
+                    Size textSize = _TextMarkup.Bounds.Size;
+                    _TextMarkup.Arrange(new Rectangle(Point.Empty, new Size(parentBounds.Width, 1)), d);
+                    textSize = _TextMarkup.Bounds.Size;
+                    if (_Image != null)
+                    {
+                        textSize.Width += _Image.Width + TextPadding.Width;
+                        textSize.Height = Math.Max(_Image.Height, textSize.Height);
+                    }
+                    desiredSize.Width += textSize.Width;
+                    desiredSize.Height += textSize.Height;
+                }
+                else
+                {
+                    //Size textSize = TextDrawing.MeasureString(g, Text, this.Font, parentBounds.Size, TextFormat);
+                    Size textSize = TextRenderer.MeasureText(Text, this.Font, parentBounds.Size, TextFormatFlags.WordBreak);
+                    if (_Image != null)
+                    {
+                        textSize.Width += _Image.Width + TextPadding.Width;
+                        textSize.Height = Math.Max(_Image.Height, textSize.Height);
+                    }
+                    desiredSize.Width += textSize.Width;
+                    desiredSize.Height += textSize.Height;
+                }
+            }
+
+            return desiredSize;
+        }
+
+        private eTextFormat TextFormat
+        {
+            get
+            {
+                return eTextFormat.Default | eTextFormat.WordBreak | eTextFormat.VerticalCenter;
+            }
+        }
+        private int _Alpha = 255;
+        /// <summary>
+        /// Specifies the alpha-blending, opacity for the content rendered by the control. Setting this property allows fading in and out of the control content.
+        /// </summary>
+        [System.Reflection.Obfuscation(Exclude = true, ApplyToMembers = false)]
+        public int Alpha
+        {
+            get { return _Alpha; }
+            set
+            {
+                if (value == _Alpha) return;
+                if (value < 0) value = 0; else if (value > 255) value = 255;
+                _Alpha = value;
+
+                if (_Alpha == 0 && _BackgroundImage != null)
+                {
+                    _BackgroundImage.Dispose();
+                    _BackgroundImage = null;
+                }
+                if (this.IsHandleCreated)
+                {
+                    this.Invalidate();
+                }
+            }
+        }
+
+
+        private Color GetGlowColor(eToastGlowColor glowColor)
+        {
+            if (glowColor == eToastGlowColor.Blue)
+                return ColorScheme.GetColor(32, 0x0070C0); // Color.FromArgb(48, Color.Blue);
+            else if (glowColor == eToastGlowColor.Green)
+                return Color.FromArgb(32, Color.Green);
+            else if (glowColor == eToastGlowColor.Orange)
+                return Color.FromArgb(32, Color.Orange);
+            else if (glowColor == eToastGlowColor.Red)
+                return Color.FromArgb(32, Color.Red);
+            else if (glowColor == eToastGlowColor.None)
+                return Color.Empty;
+            else if (glowColor == eToastGlowColor.Custom)
+                return ToastNotification.CustomGlowColor;
+
+            return Color.FromArgb(50, Color.Red);
+        }
+
+        private Image _BackgroundImage = null;
+        protected override void OnPaintBackground(PaintEventArgs pevent)
+        {
+            if (_BackgroundImage != null) // Background image is cached during animation to improve performance its disposed once animation is done
+            {
+                pevent.Graphics.DrawImage(_BackgroundImage, Point.Empty);
+                if (_Alpha == 255)
+                {
+                    _BackgroundImage.Dispose();
+                    _BackgroundImage = null;
+                }
+                return;
+            }
+
+            if (_Alpha != 255 && _BackgroundImage == null && this.Width > 0 && this.Height > 0) // Create cached background image to improve performance on subsequent rendering
+            {
+                _BackgroundImage = new Bitmap(this.Width, this.Height, pevent.Graphics);
+                using (Graphics g = Graphics.FromImage(_BackgroundImage))
+                {
+                    PaintEventArgs pe = new PaintEventArgs(g, pevent.ClipRectangle);
+                    base.OnPaintBackground(pe);
+                    PaintParentControlOnBackground(g);
+                }
+                pevent.Graphics.DrawImage(_BackgroundImage, Point.Empty);
+                return;
+            }
+
+            base.OnPaintBackground(pevent);
+
+            PaintParentControlOnBackground(pevent.Graphics);
+        }
+
+        private void PaintParentControlOnBackground(Graphics g)
+        {
+            if (this.Parent != null)
+            {
+                for (int i = this.Parent.Controls.Count - 1; i >= 0; i--)
+                {
+                    Control ctrl = this.Parent.Controls[i];
+                    if (!(ctrl is ToastDisplay) && ctrl.Visible && ctrl.Bounds.IntersectsWith(this.Bounds) && ctrl.Bounds.Width > 0 && ctrl.Bounds.Height > 0)
+                    {
+                        using (Bitmap bmp = new Bitmap(ctrl.Width, ctrl.Height, g))
+                        {
+                            ctrl.DrawToBitmap(bmp, ctrl.ClientRectangle);
+                            g.TranslateTransform(ctrl.Left - Left, ctrl.Top - Top);
+                            g.DrawImage(bmp, Point.Empty);
+                            g.TranslateTransform(Left - ctrl.Left, Top - ctrl.Top);
+                        }
+                    }
+                }
+            }
+        }
+        private TextMarkup.BodyElement _TextMarkup = null;
+        protected override void OnTextChanged(EventArgs e)
+        {
+            string text = this.Text;
+            if (TextMarkup.MarkupParser.IsMarkup(ref text))
+            {
+                _TextMarkup = TextMarkup.MarkupParser.Parse(text);
+            }
+            else
+                _TextMarkup = null;
+            this.Invalidate();
+            base.OnTextChanged(e);
+        }
+
+        private Color _ToastBackColor = Color.FromArgb(7, 7, 7);
+        /// <summary>
+        /// Gets or sets the toast background color.
+        /// </summary>
+        public Color ToastBackColor
+        {
+            get { return _ToastBackColor; }
+            set { _ToastBackColor = value; }
+        }
+
+        private eToastGlowColor _GlowColor = eToastGlowColor.Blue;
+        /// <summary>
+        /// Gets or sets the toast glow color.
+        /// </summary>
+        public eToastGlowColor GlowColor
+        {
+            get { return _GlowColor; }
+            set { _GlowColor = value; }
+        }
+
+        private PictureBox _ImageBox = null;
+        private Image _Image = null;
+        /// <summary>
+        /// Gets or sets the image displayed on the toast.
+        /// </summary>
+        public Image Image
+        {
+            get { return _Image; }
+            set
+            {
+                _Image = value; this.Invalidate();
+                bool animatedGif = false;
+
+                if (_Image != null && _Image.RawFormat.Equals(ImageFormat.Gif))
+                {
+                    Guid[] dimensions = _Image.FrameDimensionsList;
+                    foreach (Guid guid in dimensions)
+                    {
+                        FrameDimension dimension = new FrameDimension(guid);
+                        if (dimension.Equals(FrameDimension.Time))
+                        {
+                            animatedGif = _Image.GetFrameCount(FrameDimension.Time) > 1;
+                            break;
+                        }
+                    }
+                }
+
+                if (animatedGif)
+                {
+                    if (_ImageBox == null)
+                    {
+                        _ImageBox = new PictureBox();
+                        _ImageBox.Image = _Image;
+                        this.Controls.Add(_ImageBox);
+                    }
+                }
+                else if (_ImageBox != null)
+                {
+                    this.Controls.Remove(_ImageBox);
+                    _ImageBox.Dispose();
+                }
+            }
+        }
+
+        public eToastPosition? ToastPosition { get; set; }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/ToastNotification.cs b/PROMS/DotNetBar Source Code/ToastNotification.cs
new file mode 100644
index 00000000..8eae12d6
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/ToastNotification.cs	
@@ -0,0 +1,423 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows.Forms;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represents class used to display toast notifications. A toast notification is a message that appears on the surface of the screen for a moment, 
+    /// but it does not take focus (or pause the current activity), so it cannot accept any user input.
+    /// Notification pops up on the surface of the specified Form or Control.
+    /// It only fills the amount of space required for the message and the user's current activity remains visible and interactive.
+    /// The notification automatically fades in and out after specified time interval.
+    /// Notification text supports text-markup.
+    /// </summary>
+    public static class ToastNotification
+    {
+        /// <summary>
+        /// Closes all toast notifications open on specified parent control.
+        /// </summary>
+        /// <param name="parent">Parent control.</param>
+        public static void Close(Control parent)
+        {
+            if (parent == null) throw new NullReferenceException("parent parameter for toast notification must be set.");
+            Close(parent, IntPtr.Zero);
+        }
+        /// <summary>
+        /// Closes specified toast notification on parent control.
+        /// </summary>
+        /// <param name="parent">Parent control.</param>
+        /// <param name="toastId">Toast ID as returned by the Show method.</param>
+        public static void Close(Control parent, IntPtr toastId)
+        {
+            if (parent == null) throw new NullReferenceException("parent parameter for toast notification must be set.");
+
+            if (toastId == IntPtr.Zero)
+            {
+                foreach (Control item in parent.Controls)
+                {
+                    if (item is ToastDisplay)
+                        item.Visible = false;
+                }
+            }
+            else
+            {
+                foreach (Control item in parent.Controls)
+                {
+                    if (item.Handle == toastId)
+                    {
+                        item.Visible = false;
+                        break;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Updates the already displayed toast text. Note that toast notification will not be resized.
+        /// </summary>
+        /// <param name="parent">Parent control which was used to show toast.</param>
+        /// <param name="toastId">Toast ID returned by the Show toast method.</param>
+        /// <param name="text">New toast notification text.</param>
+        public static void UpdateToast(Control parent, IntPtr toastId, string text)
+        {
+            if (toastId == IntPtr.Zero)
+                throw new ArgumentException("toastId must be non zero value.");
+            if(parent == null)
+                throw new ArgumentException("parent Control must be specified.");
+            foreach (Control item in parent.Controls)
+            {
+                if (item.Handle == toastId)
+                {
+                    ToastDisplay toast = (ToastDisplay)item;
+                    toast.Text = text;
+
+                    Size toastSize = toast.DesiredSize(_ToastMargin, parent.ClientRectangle);
+                    if (toast.ToastPosition != null)
+                        toast.Bounds = CalculateToastBounds(toast.ToastPosition.Value, parent.ClientRectangle, toastSize);
+                    else
+                        toast.Bounds = new Rectangle(toast.Bounds.X, toast.Bounds.Y, toastSize.Width, toastSize.Height);
+                    break;
+                }
+            }
+        }
+
+        private static IntPtr ShowInternal(Control parent, string message, Image image, int timeoutInterval, eToastGlowColor toastGlowColor, eToastPosition? toastPosition, int x, int y)
+        {
+            if (parent == null) throw new NullReferenceException("parent parameter for toast notification must be set.");
+
+            if (timeoutInterval < 1) timeoutInterval = 0;
+
+            ToastDisplay toast = new ToastDisplay();
+            toast.BackColor = Color.Transparent;
+            toast.ToastBackColor = _ToastBackColor;
+            toast.ForeColor = _ToastForeColor;
+            if (_ToastFont != null) toast.Font = _ToastFont;
+            bool isTerminalSession = NativeFunctions.IsTerminalSession();
+            toast.Alpha = isTerminalSession ? 255 : 0;
+            toast.Text = message;
+            toast.Image = image;
+            toast.GlowColor = toastGlowColor;
+            toast.ToastPosition = toastPosition;
+            parent.Controls.Add(toast);
+            Size toastSize = toast.DesiredSize(_ToastMargin, parent.ClientRectangle);
+            toast.BringToFront();
+            if (toastPosition != null)
+                toast.Bounds = CalculateToastBounds(toastPosition.Value, parent.ClientRectangle, toastSize);
+            else
+                toast.Bounds = new Rectangle(x, y, toastSize.Width, toastSize.Height);
+
+            toast.Visible = true;
+            IntPtr toastId = toast.Handle;
+            if (!isTerminalSession)
+            {
+                Animation.AnimationInt anim = new DevComponents.DotNetBar.Animation.AnimationInt(new Animation.AnimationRequest(toast, "Alpha", 0, 255),
+                        Animation.AnimationEasing.EaseOutQuad, 250);
+                //anim.FixedStepCount = 10;
+                anim.AutoDispose = true;
+                anim.Start();
+            }
+
+            if (timeoutInterval > 0)
+                BarUtilities.InvokeDelayed(new MethodInvoker(delegate { CloseToast(toast); }), timeoutInterval);
+
+            return toastId;
+        }
+
+        /// <summary>
+        /// Displays the toast notification on top of the specified parent control, we recommend always using a parent form.
+        /// </summary>
+        /// <param name="parent">Parent form to display toast notification on top of</param>
+        /// <param name="message">Message to display.</param>
+        /// <param name="image">Image to display next to toast text.</param>
+        /// <param name="timeoutInterval">Interval in milliseconds after which the notification is hidden.</param>
+        /// <param name="toastGlowColor">Specifies toast-glow color used.</param>
+        /// <param name="toastPosition">Specifies the position of the toast notification.</param>
+        public static IntPtr Show(Control parent, string message, Image image, int timeoutInterval, eToastGlowColor toastGlowColor, eToastPosition toastPosition)
+        {
+            return ShowInternal(parent, message, image, timeoutInterval, toastGlowColor, toastPosition, 0, 0);
+        }
+
+        /// <summary>
+        /// Displays the toast notification on top of the specified parent control, we recommend always using a parent form.
+        /// </summary>
+        /// <param name="parent">Parent form to display toast notification on top of</param>
+        /// <param name="message">Message to display.</param>
+        /// <param name="image">Image to display next to toast text.</param>
+        /// <param name="timeoutInterval">Interval in milliseconds after which the notification is hidden.</param>
+        /// <param name="toastGlowColor">Specifies toast-glow color used.</param>
+        /// <param name="x">Specifies the X position of the toast notification with its parent window.</param>
+        /// <param name="y">Specifies the Y position of the toast notification with its parent window.</param>
+        public static IntPtr Show(Control parent, string message, Image image, int timeoutInterval, eToastGlowColor toastGlowColor, int x, int y)
+        {
+            return ShowInternal(parent, message, image, timeoutInterval, toastGlowColor, null, x, y);
+        }
+
+        private static Rectangle CalculateToastBounds(eToastPosition toastPosition, Rectangle parentClientRectangle, Size toastSize)
+        {
+            Rectangle displayBounds = Rectangle.Empty;
+            if (toastPosition == eToastPosition.BottomCenter)
+                displayBounds = new Rectangle(parentClientRectangle.X + (parentClientRectangle.Width - toastSize.Width) / 2,
+                    parentClientRectangle.Bottom - toastSize.Height - _ToastMargin.Bottom,
+                    toastSize.Width, toastSize.Height);
+            else if (toastPosition == eToastPosition.BottomLeft)
+                displayBounds = new Rectangle(parentClientRectangle.X + _ToastMargin.Left,
+                    parentClientRectangle.Bottom - toastSize.Height - _ToastMargin.Bottom,
+                    toastSize.Width, toastSize.Height);
+            else if (toastPosition == eToastPosition.BottomRight)
+                displayBounds = new Rectangle(parentClientRectangle.Right - _ToastMargin.Right - toastSize.Width,
+                    parentClientRectangle.Bottom - toastSize.Height - _ToastMargin.Bottom,
+                    toastSize.Width, toastSize.Height);
+            else if (toastPosition == eToastPosition.MiddleCenter)
+                displayBounds = new Rectangle(parentClientRectangle.X + (parentClientRectangle.Width - toastSize.Width) / 2,
+                    parentClientRectangle.Y + (parentClientRectangle.Height - toastSize.Height) / 2,
+                    toastSize.Width, toastSize.Height);
+            else if (toastPosition == eToastPosition.MiddleLeft)
+                displayBounds = new Rectangle(parentClientRectangle.X + _ToastMargin.Left,
+                    parentClientRectangle.Y + (parentClientRectangle.Height - toastSize.Height) / 2,
+                    toastSize.Width, toastSize.Height);
+            else if (toastPosition == eToastPosition.MiddleRight)
+                displayBounds = new Rectangle(parentClientRectangle.Right - _ToastMargin.Right - toastSize.Width,
+                    parentClientRectangle.Y + (parentClientRectangle.Height - toastSize.Height) / 2,
+                    toastSize.Width, toastSize.Height);
+            else if (toastPosition == eToastPosition.TopCenter)
+                displayBounds = new Rectangle(parentClientRectangle.X + (parentClientRectangle.Width - toastSize.Width) / 2,
+                    parentClientRectangle.Y + _ToastMargin.Top,
+                    toastSize.Width, toastSize.Height);
+            else if (toastPosition == eToastPosition.TopLeft)
+                displayBounds = new Rectangle(parentClientRectangle.X + _ToastMargin.Left,
+                    parentClientRectangle.Y + _ToastMargin.Top,
+                    toastSize.Width, toastSize.Height);
+            else if (toastPosition == eToastPosition.TopRight)
+                displayBounds = new Rectangle(parentClientRectangle.Right - _ToastMargin.Right - toastSize.Width,
+                    parentClientRectangle.Y + _ToastMargin.Top,
+                    toastSize.Width, toastSize.Height);
+
+            return displayBounds;
+        }
+        /// <summary>
+        /// Displays the toast notification on top of the specified parent control, we recommend always using a parent form.
+        /// </summary>
+        /// <param name="parent">Parent form to display toast notification on top of</param>
+        /// <param name="message">Message to display.</param>
+        /// <param name="image">Image to display next to toast text.</param>
+        /// <param name="timeoutInterval">Interval in milliseconds after which the notification is hidden.</param>
+        /// /// <param name="toastGlowColor">Specifies toast-glow color used.</param>
+        public static IntPtr Show(Control parent, string message, Image image, int timeoutInterval, eToastGlowColor toastGlowColor)
+        {
+            return Show(parent, message, image, timeoutInterval, toastGlowColor, _DefaultToastPosition);
+        }
+
+        /// <summary>
+        /// Displays the toast notification on top of the specified parent control, we recommend always using a parent form, with default timeout interval.
+        /// </summary>
+        /// <param name="parent">Parent control to display toast notification on top of</param>
+        /// <param name="message">Message to display.</param>
+        public static IntPtr Show(Control parent, string message)
+        {
+            return Show(parent, message, null, _DefaultTimeoutInterval, _DefaultToastGlowColor);
+        }
+
+        /// <summary>
+        /// Displays the toast notification on top of the specified parent control, we recommend always using a parent form, with default timeout interval.
+        /// </summary>
+        /// <param name="parent">Parent control to display toast notification on top of</param>
+        /// <param name="message">Message to display.</param>
+        /// <param name="toastPosition">Specifies the position of the toast notification.</param>
+        public static IntPtr Show(Control parent, string message, eToastPosition toastPosition)
+        {
+            return Show(parent, message, null, _DefaultTimeoutInterval, _DefaultToastGlowColor, toastPosition);
+        }
+
+        /// <summary>
+        /// Displays the toast notification on top of the specified parent control, we recommend always using a parent form, with default timeout interval.
+        /// </summary>
+        /// <param name="parent">Parent control to display toast notification on top of</param>
+        /// <param name="message">Message to display.</param>
+        /// <param name="image">Image to display next to toast text.</param>
+        public static IntPtr Show(Control parent, string message, Image image)
+        {
+            return Show(parent, message, image, _DefaultTimeoutInterval, _DefaultToastGlowColor);
+        }
+
+        /// <summary>
+        /// Displays the toast notification on top of the specified parent control, we recommend always using a parent form.
+        /// </summary>
+        /// <param name="parent">Parent form to display toast notification on top of</param>
+        /// <param name="message">Message to display.</param>
+        /// <param name="image">Image to display next to toast text.</param>
+        /// <param name="timeoutInterval">Interval in milliseconds after which the notification is hidden.</param>
+        public static IntPtr Show(Control parent, string message, Image image, int timeoutInterval)
+        {
+            return Show(parent, message, image, timeoutInterval, _DefaultToastGlowColor);
+        }
+        /// <summary>
+        /// Displays the toast notification on top of the specified parent control, we recommend always using a parent form.
+        /// </summary>
+        /// <param name="parent">Parent form to display toast notification on top of</param>
+        /// <param name="message">Message to display.</param>
+        /// <param name="timeoutInterval">Interval in milliseconds after which the notification is hidden.</param>
+        public static IntPtr Show(Control parent, string message, int timeoutInterval)
+        {
+            return Show(parent, message, null, timeoutInterval, _DefaultToastGlowColor);
+        }
+        /// <summary>
+        /// Displays the toast notification on top of the specified parent control, we recommend always using a parent form.
+        /// </summary>
+        /// <param name="parent">Parent form to display toast notification on top of</param>
+        /// <param name="message">Message to display.</param>
+        /// <param name="timeoutInterval">Interval in milliseconds after which the notification is hidden.</param>
+        /// <param name="toastPosition">Specifies the position of the toast notification.</param>
+        public static IntPtr Show(Control parent, string message, int timeoutInterval, eToastPosition toastPosition)
+        {
+            return Show(parent, message, null, timeoutInterval, _DefaultToastGlowColor, toastPosition);
+        }
+
+        private static void CloseToast(ToastDisplay toast)
+        {
+            bool isTerminalSession = NativeFunctions.IsTerminalSession();
+
+            if (toast.IsDisposed)
+            {
+                if (toast.Parent != null)
+                    toast.Parent.Controls.Remove(toast);
+                return;
+            }
+
+            if (isTerminalSession)
+            {
+                toast.Visible = false;
+                toast.Parent.Controls.Remove(toast);
+                toast.Dispose();
+            }
+            else
+            {
+                Animation.AnimationInt anim = new DevComponents.DotNetBar.Animation.AnimationInt(new Animation.AnimationRequest(toast, "Alpha", 255, 0),
+                        Animation.AnimationEasing.EaseInQuad, 250);
+                anim.AutoDispose = true;
+                anim.Start();
+                anim.AnimationCompleted += new EventHandler(delegate { if (toast.Parent != null) toast.Parent.Controls.Remove(toast); toast.Dispose(); });
+            }
+        }
+
+        private static Padding _ToastMargin = new Padding(16);
+        /// <summary>
+        /// Specifies the toast margin from the edges of the parent control. Default value is 16 pixels on all sides.
+        /// </summary>
+        public static Padding ToastMargin
+        {
+            get
+            {
+                return _ToastMargin;
+            }
+            set
+            {
+                _ToastMargin = value;
+            }
+        }
+
+        private static eToastPosition _DefaultToastPosition = eToastPosition.BottomCenter;
+        /// <summary>
+        /// Specifies the default toast position within the parent control. Default value is BottomCenter.
+        /// </summary>
+        public static eToastPosition DefaultToastPosition
+        {
+            get { return _DefaultToastPosition; }
+            set { _DefaultToastPosition = value; }
+        }
+
+        private static eToastGlowColor _DefaultToastGlowColor = eToastGlowColor.Blue;
+        /// <summary>
+        /// Specifies default glow color around toast notification. Default value is Blue.
+        /// </summary>
+        public static eToastGlowColor DefaultToastGlowColor
+        {
+            get { return _DefaultToastGlowColor; }
+            set { _DefaultToastGlowColor = value; }
+        }
+
+        private static int _DefaultTimeoutInterval = 2500;
+        /// <summary>
+        /// Specifies the default timeout interval for the toast notification.
+        /// </summary>
+        public static int DefaultTimeoutInterval
+        {
+            get { return _DefaultTimeoutInterval; }
+            set
+            {
+                _DefaultTimeoutInterval = value;
+            }
+        }
+
+        private static Color _ToastBackColor = Color.FromArgb (7, 7, 7);
+        /// <summary>
+        /// Specifies the toast background color.
+        /// </summary>
+        public static Color ToastBackColor
+        {
+            get { return _ToastBackColor; }
+            set { _ToastBackColor = value; }
+        }
+
+        private static Color _ToastForeColor = Color.White;
+        /// <summary>
+        /// Specifies the toast text color.
+        /// </summary>
+        public static Color ToastForeColor
+        {
+            get { return _ToastForeColor; }
+            set { _ToastForeColor = value; }
+        }
+
+        private static Font _ToastFont = null;
+        /// <summary>
+        /// Specifies the font used for the toast.
+        /// </summary>
+        public static Font ToastFont
+        {
+            get { return _ToastFont; }
+            set { _ToastFont = value; }
+        }
+
+        private static Color _CustomGlowColor = Color.Brown;
+        /// <summary>
+        /// Specifies the custom glow color used when eToastGlowColor.Custom is used.
+        /// </summary>
+        public static Color CustomGlowColor
+        {
+            get { return _CustomGlowColor; }
+            set { _CustomGlowColor = value; }
+        }
+    }
+
+    /// <summary>
+    /// Specifies toast position within parent control.
+    /// </summary>
+    public enum eToastPosition
+    {
+        TopLeft,
+        TopCenter,
+        TopRight,
+        MiddleLeft,
+        MiddleCenter,
+        MiddleRight,
+        BottomLeft,
+        BottomCenter,
+        BottomRight
+    }
+
+    /// <summary>
+    /// Specifies the glow color around toast notification.
+    /// </summary>
+    public enum eToastGlowColor
+    {
+        None,
+        Red,
+        Blue,
+        Green,
+        Orange,
+        Custom
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/ToolMenu.cs b/PROMS/DotNetBar Source Code/ToolMenu.cs
new file mode 100644
index 00000000..e41545f5
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/ToolMenu.cs	
@@ -0,0 +1,441 @@
+namespace DevComponents.DotNetBar
+{
+    using System;
+	using System.Drawing;
+
+	public struct SideBarImage
+	{
+		public Image Picture;
+		public Color BackColor;
+		public System.Drawing.Drawing2D.LinearGradientBrush GradientBrush;
+		public eAlignment Alignment;
+		public bool StretchPicture;
+	}
+
+    /// <summary>
+    ///    Summary description for ToolMenu.
+    /// </summary>
+    [Serializable] public class ToolMenu:PopupItem
+    {
+		protected int m_PaddingTop, m_PaddingBottom, m_PaddingLeft, m_PaddingRight;
+		protected bool m_MouseOver;
+
+		public ToolMenu():this("") {}
+        public ToolMenu(string sName):base(sName)
+        {
+			// This Bar pops-up its children, so they are not contained
+			m_PaddingTop=2;
+			m_PaddingBottom=3;
+			m_PaddingLeft=7;
+			m_PaddingRight=9;
+			m_IsContainer=false;
+			m_MouseOver=false;
+			//m_SideBar=new SideBarImage();
+			this.PopupType=ePopupType.Menu;
+        }
+
+		/// <summary>
+		/// Returns copy of ToolMenu item
+		/// </summary>
+		public override BaseItem Copy()
+		{
+			ToolMenu objCopy=new ToolMenu();
+			this.CopyToItem(objCopy);
+			
+			return objCopy;
+		}
+
+		/// <summary>
+		/// Paints this base container
+		/// </summary>
+		public override void Paint(System.Drawing.Graphics g)
+		{
+			Font objFont=this.GetFont();
+			if(m_Expanded && !this.DesignMode || m_Expanded && this.DesignMode && !m_MouseOver)
+			{
+				// Office 2000 Style
+				if(m_Style==eDotNetBarStyle.Office)
+				{
+                    g.FillRectangle(SystemBrushes.Control,m_Rect);
+					System.Windows.Forms.ControlPaint.DrawBorder3D(g,m_Rect,System.Windows.Forms.Border3DStyle.SunkenOuter,System.Windows.Forms.Border3DSide.All);
+				}
+				else
+				{
+					// DotNet Style
+					g.FillRectangle(SystemBrushes.Control,m_Rect);
+					g.FillRectangle(new SolidBrush(ColorFunctions.ToolMenuFocusBackColor(g)),m_Rect.Left,m_Rect.Top,m_Rect.Width-2,m_Rect.Height);
+					Point[] p=new Point[4];
+					p[0].X=m_Rect.Left;
+					p[0].Y=m_Rect.Top+m_Rect.Height-1;
+					p[1].X=m_Rect.Left;
+					p[1].Y=m_Rect.Top;
+					p[2].X=m_Rect.Left+m_Rect.Width-3;
+					p[2].Y=m_Rect.Top;
+					p[3].X=m_Rect.Left+m_Rect.Width-3;
+					p[3].Y=m_Rect.Top+m_Rect.Height-1;
+					g.DrawLines(new Pen(ColorFunctions.MenuFocusBorderColor(g),1),p);
+					// Draw the shadow
+					g.FillRectangle(SystemBrushes.ControlDark,m_Rect.Left+m_Rect.Width-2,m_Rect.Top+2,2,m_Rect.Height-2);
+				}
+				
+			}
+			else if(m_MouseOver && (m_Enabled || this.DesignMode))
+			{
+				// Office 2000 Style
+				if(!this.DesignMode && m_MouseOver)
+				{
+					if(m_Style==eDotNetBarStyle.Office)
+					{
+						g.FillRectangle(SystemBrushes.Control,m_Rect);
+						System.Windows.Forms.ControlPaint.DrawBorder3D(g,m_Rect,System.Windows.Forms.Border3DStyle.RaisedInner,System.Windows.Forms.Border3DSide.All);
+					}
+					else
+					{
+						// DotNet Style
+						g.FillRectangle(SystemBrushes.Control,m_Rect);
+						g.FillRectangle(new SolidBrush(ColorFunctions.HoverBackColor(g)),m_Rect.Left,m_Rect.Top,m_Rect.Width-2,m_Rect.Height);
+						// TODO: Beta 2 fix --> g.DrawRectangle(SystemPens.Highlight,m_Rect.Left,m_Rect.Top,m_Rect.Width-2,m_Rect.Height);
+						NativeFunctions.DrawRectangle(g,SystemPens.Highlight,m_Rect.Left,m_Rect.Top,m_Rect.Width-2,m_Rect.Height);
+					}
+				}
+			}
+			else
+				g.FillRectangle(SystemBrushes.Control,m_Rect);
+
+			if(this.DesignMode && this.Focused)
+			{
+				Rectangle r=m_Rect;
+				r.Inflate(-1,-1);
+				g.DrawRectangle(new Pen(SystemColors.ControlText,2),r);
+			}
+			
+			StringFormat sf=StringFormat.GenericDefault;
+			sf.HotkeyPrefix=System.Drawing.Text.HotkeyPrefix.Show;
+			sf.Alignment=System.Drawing.StringAlignment.Center;
+			sf.LineAlignment=System.Drawing.StringAlignment.Center;
+			if(m_Enabled || this.DesignMode)
+			{
+				g.DrawString(m_Text,objFont,SystemBrushes.ControlText,m_Rect,sf);
+			}
+			else
+			{
+				if(m_Style==eDotNetBarStyle.DotNet)
+					g.DrawString(m_Text,objFont,SystemBrushes.ControlDark,m_Rect,sf);
+				else
+					System.Windows.Forms.ControlPaint.DrawStringDisabled(g,m_Text,objFont,SystemColors.Control,m_Rect,sf);
+			}
+		}
+
+		/// <summary>
+		/// Recalculate Size of this item
+		/// </summary>
+		public override void RecalcSize()
+		{
+			System.Windows.Forms.Control objCtrl=this.ContainerControl as System.Windows.Forms.Control;
+			if(IsHandleValid(objCtrl))
+			{
+				Graphics g=objCtrl.CreateGraphics();
+				Font f=this.GetFont();
+				SizeF sf;
+				StringFormat sfmt=StringFormat.GenericDefault;			
+				sfmt.HotkeyPrefix=System.Drawing.Text.HotkeyPrefix.Show;
+				sf=g.MeasureString(m_Text,f,0,sfmt);
+				
+				if(m_Style==eDotNetBarStyle.DotNet)
+				{
+					m_Rect.Width=(int)sf.Width+m_PaddingLeft+m_PaddingRight;
+					m_Rect.Height=(int)sf.Height+m_PaddingTop+m_PaddingBottom;
+				}
+				else
+				{
+					m_Rect.Width=(int)sf.Width+6;
+					m_Rect.Height=(int)sf.Height+6;
+				}
+				g.Dispose();
+				objCtrl=null;
+			}
+			base.RecalcSize();
+		}
+
+		public override void MouseEnter()
+		{
+			m_MouseOver=true;
+			this.Refresh();
+		}
+
+		public override void MouseLeave()
+		{
+			m_MouseOver=false;
+			this.Refresh();
+		}
+
+		public override void MouseDown(System.Windows.Forms.MouseEventArgs objArg)
+		{
+			if(objArg.Button != System.Windows.Forms.MouseButtons.Left || !m_Enabled && !this.DesignMode)
+			{
+				base.MouseDown(objArg);
+				return;
+			}
+
+			// This behaviour is specific to menus and maybe the popup Bar items.
+			// Needs to be incorporated when ToolMenu is moved into the ButtonItem
+			if(m_ParentItem!=null && !this.DesignMode)
+			{
+				if(this.Expanded)
+				{
+					m_ParentItem.AutoExpand=false;
+					Bar bar=this.ContainerControl as Bar;
+					this.Expanded=!this.Expanded;
+					if(bar!=null && bar.Focused)
+						bar.ReleaseFocus();
+				}
+				else
+				{
+					m_ParentItem.AutoExpand=true;
+					Bar bar=this.ContainerControl as Bar;
+					if(bar!=null && !bar.Focused)
+						bar.SetSystemFocus();
+					this.Expanded=!this.Expanded;
+				}
+			}
+			else if(this.DesignMode)
+				this.Expanded=!this.Expanded;
+
+			base.MouseDown(objArg);
+		}
+
+		/*public override void OnExpandChange()
+		{
+			base.OnExpandChange();
+			if(m_ParentItem!=null && !this.DesignMode)
+			{
+				if(this.Expanded)
+					m_ParentItem.AutoExpand=true;
+				else
+					m_ParentItem.AutoExpand=false;
+			}
+		}*/
+
+		public override void KeyDown(System.Windows.Forms.KeyEventArgs objArg)
+		{
+			base.KeyDown(objArg);
+			if(this.Expanded)
+				return;
+
+			if(objArg.KeyCode==System.Windows.Forms.Keys.Enter  || objArg.KeyCode==System.Windows.Forms.Keys.Return || objArg.KeyCode==System.Windows.Forms.Keys.Down)
+			{
+				if(SubItemsCount>0)
+				{
+					if(m_ParentItem!=null)
+						m_ParentItem.AutoExpand=true;
+					this.Expanded=true;
+					objArg.Handled=true;
+					return;
+				}
+			}
+			else if(objArg.KeyCode==System.Windows.Forms.Keys.Escape)
+			{
+				if(SubItemsCount>0 && this.Expanded)
+				{
+					if(m_ParentItem!=null)
+						m_ParentItem.AutoExpand=false;
+					this.Expanded=false;
+					objArg.Handled=true;
+					return;
+				}
+			}
+
+			//base.KeyDown(objArg);
+		}
+
+		protected virtual Font GetFont()
+		{
+			System.Windows.Forms.Control objCtrl=this.ContainerControl as System.Windows.Forms.Control;
+			if(objCtrl!=null)
+				return (Font)objCtrl.Font;
+			return (Font)System.Windows.Forms.SystemInformation.MenuFont;
+		}
+
+		/*public override void KeyDown(System.Windows.Forms.KeyEventArgs objArg)
+		{
+			base.KeyDown(objArg);
+			if(!m_Expanded && (objArg.KeyCode==System.Windows.Forms.Keys.Enter  || objArg.KeyCode==System.Windows.Forms.Keys.Return))
+			{
+				if(m_ParentItem!=null)
+					m_ParentItem.AutoExpand=true;
+				this.Expanded=true;
+			}
+			if(this.Expanded)
+			{
+				m_Popup.ExKeyDown(objArg);
+			}
+		}*/
+
+		/*public override void OnExpandedChange()
+		{
+			System.Windows.Forms.Control objCtrl=this.ContainerControl as System.Windows.Forms.Control;
+
+			if(!m_Expanded && m_Popup!=null)
+			{
+				ClosePopupMenu();
+			}
+
+			this.Refresh();
+
+			if(m_Expanded && m_Popup==null)
+			{
+				if(IsHandleValid(objCtrl))
+				{
+					Point p=new Point(m_Rect.Left,m_Rect.Top+m_Rect.Height-1), ps;
+					ps=objCtrl.PointToScreen(p);
+					PopupMenu(ps);
+				}	
+			}
+			objCtrl=null;
+		}*/
+
+		/*public void PopupMenu(Point p)
+		{
+			PopupMenu(p.X,p.Y);
+		}*/
+
+		/*public virtual void PopupMenu(int x, int y)
+		{
+			if(m_Popup!=null)
+				ClosePopupMenu();
+
+			if(m_Popup==null)
+			{
+				m_Popup=new PopupMenu();
+				m_Popup.ParentItem=this;
+				m_Popup.SideBar=m_SideBar;
+				m_Popup.CreateControl();
+				m_Popup.RecalcSize();
+			}
+			
+			// Make sure that menu is on-screen
+			System.Windows.Forms.Control objCtrl=this.ContainerControl as System.Windows.Forms.Control;
+			System.Windows.Forms.Screen objScreen=null;
+			if(IsHandleValid(objCtrl))
+			{
+				objScreen=System.Windows.Forms.Screen.FromControl(objCtrl);
+			}
+			else
+				objScreen=System.Windows.Forms.Screen.FromPoint(new Point(x,y));
+
+			if(x+m_Popup.Width>objScreen.WorkingArea.Right)
+			{
+				x=x-((x+m_Popup.Width)-objScreen.WorkingArea.Right);
+			}
+			// Try to fit whole popup menu "nicely"
+			if(y+m_Popup.Height>objScreen.WorkingArea.Bottom)
+			{
+				// If this container is displayed then try to put it above the menu item
+				if(this.Displayed &&IsHandleValid(objCtrl))
+				{
+					Point p=new Point(m_Rect.Left,m_Rect.Top), ps;
+					ps=objCtrl.PointToScreen(p);
+					ps.Y+=2;
+					if(ps.Y-m_Popup.Height>=objScreen.WorkingArea.Top)
+						y=ps.Y-m_Popup.Height;
+				}
+				else
+				{
+					y=objScreen.WorkingArea.Bottom-m_Popup.Height;
+					if(y<0)
+						y=0;
+				}
+			}
+			// If it still does not fit at this point, container will scale itself properly
+			// And allow item scrolling
+			
+			m_Popup.Location=new Point(x,y);
+			m_Popup.Show();
+			m_Expanded=true;
+
+			Bar bar=objCtrl as Bar;
+			if(bar==null || bar.BarState!=eBarState.Popup)
+			{
+				System.Windows.Forms.Application.AddMessageFilter(this);
+				m_FilterInstalled=true;
+			}
+			bar=null;
+		}*/
+
+		/*public virtual void ClosePopupMenu()
+		{
+			if(m_Popup!=null)
+			{
+				if(m_FilterInstalled)
+					System.Windows.Forms.Application.RemoveMessageFilter(this);
+				m_Popup.Hide();
+				m_Popup.Dispose();
+				m_Popup=null;
+			}
+			m_Expanded=false;
+		}*/
+
+//		public override void LostFocus()
+//		{
+//			base.LostFocus();
+//			if(m_Expanded)
+//			{
+//				this.Expanded=false;
+//				if(m_ParentItem!=null)
+//					m_ParentItem.AutoExpand=false;
+//			}
+//		}
+
+//		public override void SubItemSizeChanged(BaseItem objChildItem)
+//		{
+//			if(m_Popup!=null)
+//			{
+//				m_Popup.RecalcSize();
+//				m_Popup.Refresh();
+//			}
+//		}
+
+
+//		public bool PreFilterMessage(ref System.Windows.Forms.Message m)
+//		{
+//			// Block all the messages relating to the left mouse button.
+//			if ((m.Msg >= NativeFunctions.WM_LBUTTONDOWN && m.Msg <= NativeFunctions.WM_LBUTTONDBLCLK) ||
+//				(m.Msg>=NativeFunctions.WM_NCLBUTTONDOWN && m.Msg<=NativeFunctions.WM_NCMBUTTONDBLCLK))
+//			{
+//				System.Windows.Forms.Control objCtrl=this.ContainerControl as System.Windows.Forms.Control;
+//				
+//				bool bChildHandle=this.IsAnyOnHandle(m.HWnd.ToInt32());
+//
+//				if(objCtrl!=null && m.HWnd!=objCtrl.Handle && !bChildHandle)
+//				{
+//					if(m_ParentItem!=null)
+//					{
+//						if(m_Expanded)
+//						{
+//							m_ParentItem.AutoExpand=false;
+//						}
+//						else
+//						{
+//							m_ParentItem.AutoExpand=true;
+//						}
+//					}
+//					this.Expanded=!m_Expanded;
+//				}
+//				else if(objCtrl==null && !bChildHandle)
+//				{
+//					ClosePopupMenu();
+//				}
+//			}
+//			else if(m.Msg==NativeFunctions.WM_ACTIVATEAPP && m.WParam.ToInt32()==0)
+//			{
+//				ClosePopupMenu();
+//			}
+//			
+//			return false;
+//		}
+//
+//		public void PostFilterMessage(ref System.Windows.Forms.Message m)
+//		{
+//        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/ToolTip.cs b/PROMS/DotNetBar Source Code/ToolTip.cs
new file mode 100644
index 00000000..1a170f64
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/ToolTip.cs	
@@ -0,0 +1,422 @@
+namespace DevComponents.DotNetBar
+{
+    using System;
+	using System.Windows.Forms;
+	using System.Drawing;
+	using System.Drawing.Text;
+    using System.Drawing.Drawing2D;
+
+    /// <summary>
+    ///    Summary description for Tooltip.
+    /// </summary>
+    [System.ComponentModel.ToolboxItem(false),System.ComponentModel.DesignTimeVisible(false)]
+    public class ToolTip : System.Windows.Forms.Control
+    {
+		const long WS_POPUP=0x80000000L;
+		const long WS_CLIPSIBLINGS=0x04000000L;
+		const long WS_CLIPCHILDREN=0x02000000L;
+		const long WS_EX_TOOLWINDOW=0x00000080L;
+		const long WS_EX_TOPMOST=0x00000008L;
+
+		// When set to true tooltip will be shown Immediately without delay
+		//static bool bShowToolTip;
+		
+		private string m_ToolTip;
+        private TextMarkup.BodyElement m_TextMarkup = null;
+        private eDotNetBarStyle m_Style = eDotNetBarStyle.Office2003;
+		private PopupShadow m_DropShadow=null;
+        private bool m_AntiAlias = false;
+        /// <summary>
+        /// Gets or sets the rectangle of the control or item tooltip is displayed for.
+        /// </summary>
+        public Rectangle ReferenceRectangle = Rectangle.Empty;
+
+        public ToolTip()
+        {
+			m_ToolTip="";
+			this.SetStyle(ControlStyles.Selectable,false);
+			this.SetStyle(ControlStyles.AllPaintingInWmPaint,true);
+			this.SetStyle(ControlStyles.Opaque,true);
+			this.SetStyle(ControlStyles.ResizeRedraw,true);
+            this.Font = SystemFonts.DefaultFont; // System.Windows.Forms.SystemInformation.MenuFont.Clone() as Font;
+			this.BackColor=SystemColors.Control;
+			this.ForeColor=SystemColors.ControlText;
+        }
+
+        
+        public new string Text
+		{
+			get
+			{
+				return m_ToolTip;
+			}
+			set
+			{
+				m_ToolTip=value;
+                if (MarkupEnabled && TextMarkup.MarkupParser.IsMarkup(ref m_ToolTip))
+                    m_TextMarkup = TextMarkup.MarkupParser.Parse(m_ToolTip);
+                else
+                    m_TextMarkup = null;
+                if (m_TextMarkup != null)
+                    AntiAlias = true;
+
+                if (_TooltipShown)
+                {
+                    UpdateSize();
+                }
+			}
+		}
+
+        private static bool _MarkupEnabled = true;
+        /// <summary>
+        /// Gets or sets whether text-markup is enabled for the tooltips.
+        /// </summary>
+        public static bool MarkupEnabled
+        {
+            get { return _MarkupEnabled; }
+            set
+            {
+                _MarkupEnabled = value;
+            }
+        }
+        
+
+        public bool AntiAlias
+        {
+            get { return m_AntiAlias; }
+            set { m_AntiAlias = value; }
+        }
+        private int _ColorDepth = -1;
+		protected override void OnPaint(PaintEventArgs e)
+		{
+            // Get the Color of ToolTip text
+            Color textColor = SystemColors.InfoText;
+            Color backColor = SystemColors.Info;
+            Color backColor2=Color.Empty;
+            Color borderColor = ColorScheme.GetColor("767676");
+
+            if (_ColorDepth == -1)
+            {
+                _ColorDepth = Screen.FromControl(this).BitsPerPixel;
+            }
+            if (_ColorDepth < 8)
+            {
+                backColor = Color.White;
+                textColor = Color.Black;
+            }
+            else
+            {
+                if (StyleManager.IsMetro(m_Style))
+                {
+                    DevComponents.DotNetBar.Metro.ColorTables.MetroColorTable metroColors = DevComponents.DotNetBar.Metro.Rendering.MetroRender.GetColorTable();
+                    backColor = metroColors.CanvasColor;
+                    textColor = metroColors.ForeColor;
+                }
+                else if (BarFunctions.IsOffice2007Style(m_Style) && this.BackColor == SystemColors.Control)
+                {
+                    backColor = ColorScheme.GetColor("FFFFFF");
+                    backColor2 = ColorScheme.GetColor("E4E4F0");
+                    textColor = ColorScheme.GetColor("4C4C4C");
+                }
+                else
+                {
+                    textColor = GetToolTipColor();
+                    if (this.BackColor != SystemColors.Control)
+                        backColor = this.BackColor;
+                }
+            }
+
+			Graphics g=e.Graphics;
+			Rectangle r=this.ClientRectangle;
+
+            if (m_AntiAlias)
+            {
+                g.TextRenderingHint = DisplayHelp.AntiAliasTextRenderingHint;
+                g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.AntiAlias;
+            }
+
+            SmoothingMode sm = g.SmoothingMode;
+            g.SmoothingMode = SmoothingMode.None;
+            if (BarFunctions.IsOffice2007Style(m_Style))
+            {
+                DisplayHelp.DrawRectangle(g, borderColor, r);
+            }
+            else
+            {
+                System.Windows.Forms.ControlPaint.DrawBorder3D(g, r, System.Windows.Forms.Border3DStyle.Raised, System.Windows.Forms.Border3DSide.All);
+            }
+			
+			r.Inflate(-1,-1);
+            if (backColor2.IsEmpty)
+                DisplayHelp.FillRectangle(g, r, backColor);
+            else
+                DisplayHelp.FillRectangle(g, r, backColor, backColor2);
+			
+			r.Offset(1,0);
+
+            g.SmoothingMode = sm;
+
+            if (m_TextMarkup == null)
+                TextDrawing.DrawString(g, GetDrawText(), this.Font, textColor, r, GetStringFormat());
+            else
+            {
+                TextMarkup.MarkupDrawContext d = new TextMarkup.MarkupDrawContext(g, this.Font, textColor, (this.RightToLeft == RightToLeft.Yes), e.ClipRectangle, true);
+                m_TextMarkup.Bounds = new Rectangle(r.Location, m_TextMarkup.Bounds.Size);
+                m_TextMarkup.Render(d);
+            }
+		}
+
+        private void UpdateSize()
+        {
+            // Calculate Size of the window
+            using (Graphics g = this.CreateGraphics())
+            {
+                if (m_AntiAlias)
+                {
+                    g.TextRenderingHint = DisplayHelp.AntiAliasTextRenderingHint;
+                    g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.AntiAlias;
+                }
+                Size size = GetTooltipSize(g);
+                this.Size = size;
+                g.SmoothingMode = SmoothingMode.Default;
+                g.TextRenderingHint = TextRenderingHint.SystemDefault;
+            }
+
+            if (!_FixedLocation.IsEmpty)
+                this.Location = _FixedLocation;
+
+            this.Invalidate();
+
+            Rectangle r = this.Bounds;
+            if (m_DropShadow != null)
+            {
+                NativeFunctions.SetWindowPos(m_DropShadow.Handle, this.Handle, r.Left + 5, r.Top + 5, r.Width - 2, r.Height - 2, NativeFunctions.SWP_SHOWWINDOW | NativeFunctions.SWP_NOACTIVATE);
+                m_DropShadow.UpdateShadow();
+            }
+        }
+
+        private bool _TooltipShown = false;
+        private Size GetTooltipSize(Graphics g)
+        {
+            Size sz = Size.Empty;
+            if (m_TextMarkup == null)
+                sz = TextDrawing.MeasureString(g, GetDrawText(), this.Font, Screen.PrimaryScreen.WorkingArea.Size, GetStringFormat());
+            else
+            {
+                TextMarkup.MarkupDrawContext d = new TextMarkup.MarkupDrawContext(g, this.Font, SystemColors.Control, (this.RightToLeft == RightToLeft.Yes));
+                m_TextMarkup.Measure(Screen.PrimaryScreen.WorkingArea.Size, d);
+                sz = m_TextMarkup.Bounds.Size;
+                m_TextMarkup.Arrange(new Rectangle(Point.Empty, sz), d);
+            }
+            sz.Width += Dpi.Width4;
+            sz.Height += Dpi.Height4;
+            return sz;
+        }
+		public void ShowToolTip()
+		{
+			if (!this.IsHandleCreated)
+				this.CreateControl();
+
+            
+			// Calculate Size of the window
+			Graphics g=this.CreateGraphics();
+
+            if (m_AntiAlias)
+            {
+                g.TextRenderingHint = DisplayHelp.AntiAliasTextRenderingHint;
+                g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.AntiAlias;
+            }
+            Size sz = Size.Empty;
+            try
+            {
+                g.PageUnit = GraphicsUnit.Pixel;
+                sz = GetTooltipSize(g);
+                //if (m_TextMarkup == null)
+                //    sz = TextDrawing.MeasureString(g, GetDrawText(), this.Font, Screen.PrimaryScreen.WorkingArea.Size, GetStringFormat());
+                //else
+                //{
+                //    TextMarkup.MarkupDrawContext d = new TextMarkup.MarkupDrawContext(g, this.Font, SystemColors.Control, (this.RightToLeft == RightToLeft.Yes));
+                //    m_TextMarkup.Measure(Screen.PrimaryScreen.WorkingArea.Size, d);
+                //    sz = m_TextMarkup.Bounds.Size;
+                //    m_TextMarkup.Arrange(new Rectangle(Point.Empty, sz), d);
+                //}
+            }
+            finally
+            {
+                g.SmoothingMode = SmoothingMode.Default;
+                g.TextRenderingHint = TextRenderingHint.SystemDefault;
+                g.Dispose();
+            }
+			g=null;
+
+			Point mousePosition=System.Windows.Forms.Control.MousePosition;
+			Rectangle r=new Rectangle(System.Windows.Forms.Control.MousePosition.X,System.Windows.Forms.Control.MousePosition.Y,(int)sz.Width,(int)sz.Height);
+			//r.Inflate(2,2);
+			r.Offset(12,24);
+
+			ScreenInformation screen=BarFunctions.ScreenFromPoint(mousePosition);
+			if(screen!=null)
+			{
+				System.Drawing.Size layoutArea=screen.WorkingArea.Size;
+				layoutArea.Width-=(int)(layoutArea.Width*.2f);
+
+                if (r.Right > screen.WorkingArea.Right)
+                {
+                    r.X = r.Left - (r.Right - screen.WorkingArea.Right);
+                }
+
+                if (r.Bottom > screen.Bounds.Bottom)
+                {
+                    if (ReferenceRectangle.IsEmpty)
+                        r.Y = mousePosition.Y - r.Height;
+                    else
+                    {
+                        r.Y = ReferenceRectangle.Y - r.Height - 1;
+                    }
+                }
+				
+				if(r.Contains(System.Windows.Forms.Control.MousePosition.X,System.Windows.Forms.Control.MousePosition.Y))
+				{
+					// We have to move it out of mouse position
+                    if (r.Height + System.Windows.Forms.Control.MousePosition.Y + 1 <= screen.WorkingArea.Height && (ReferenceRectangle.IsEmpty || !ReferenceRectangle.IntersectsWith(new Rectangle(r.X, System.Windows.Forms.Control.MousePosition.Y + 1, r.Width, r.Height))))
+						r.Y=System.Windows.Forms.Control.MousePosition.Y+1;
+					else
+						r.Y=System.Windows.Forms.Control.MousePosition.Y-r.Height-1;
+				}
+			}
+            
+            if (!_FixedLocation.IsEmpty)
+                r.Location = _FixedLocation;
+
+			this.Location=r.Location;
+			this.ClientSize=r.Size;
+
+			if(NativeFunctions.ShowDropShadow && this.ShowDropShadow)
+			{
+				if(m_DropShadow==null)
+				{
+					m_DropShadow=new PopupShadow(NativeFunctions.AlphaBlendingSupported);
+					m_DropShadow.CreateControl();
+				}
+				//m_DropShadow.Location=new Point(r.Left+4,r.Top+4);
+				//m_DropShadow.Size=r.Size;
+				// TODO: Bug Cannot set size and location correctly using the Size and Location because Form caption is hidden
+				m_DropShadow.Hide();
+			}
+			NativeFunctions.SetWindowPos(this.Handle,new IntPtr(NativeFunctions.HWND_TOP),0,0,0,0,NativeFunctions.SWP_SHOWWINDOW | NativeFunctions.SWP_NOSIZE | NativeFunctions.SWP_NOACTIVATE | NativeFunctions.SWP_NOMOVE);
+			if(m_DropShadow!=null)
+			{
+				NativeFunctions.SetWindowPos(m_DropShadow.Handle,this.Handle,r.Left+5,r.Top+5,r.Width-2,r.Height-2,NativeFunctions.SWP_SHOWWINDOW | NativeFunctions.SWP_NOACTIVATE);
+				m_DropShadow.UpdateShadow();
+			}
+            _TooltipShown = true;
+		}
+
+        private string GetDrawText()
+        {
+            string s = m_ToolTip.Replace(@"\\n", "{spec_nl}");
+            s = s.Replace(@"\n", Environment.NewLine);
+            return s.Replace("{spec_nl}",@"\n");
+        }
+
+		private eTextFormat GetStringFormat()
+		{
+            eTextFormat format = eTextFormat.Default | eTextFormat.WordBreak | eTextFormat.VerticalCenter;
+            return format;
+		}
+
+		private Color GetToolTipColor()
+		{
+			if(this.ForeColor!=SystemColors.ControlText)
+				return this.ForeColor;
+
+			Color clrRet=SystemColors.WindowText;
+
+			try
+			{
+				Microsoft.Win32.RegistryKey objReg=Microsoft.Win32.Registry.CurrentUser.OpenSubKey("Control Panel\\Colors\\",false);
+				string sColor=objReg.GetValue("InfoText").ToString();
+				objReg.Close();
+				objReg=null;
+				
+				if(sColor==null || sColor=="")
+					return clrRet;
+
+				Char [] separator = {' '};
+				string[] sArr=sColor.Split(separator,3);
+				if(sArr.GetUpperBound(0)==2)
+					clrRet=Color.FromArgb(System.Convert.ToInt16(sArr[0]),System.Convert.ToInt16(sArr[1]),System.Convert.ToInt16(sArr[2]));
+			}
+			catch(Exception)
+			{
+			}
+
+			return clrRet;
+		}
+
+		protected override void OnLocationChanged(EventArgs e)
+		{
+			base.OnLocationChanged(e);
+			if(m_DropShadow!=null)
+			{
+				NativeFunctions.SetWindowPos(m_DropShadow.Handle,new IntPtr(NativeFunctions.HWND_TOP),this.Left+5,this.Top+5,0,0,NativeFunctions.SWP_SHOWWINDOW | NativeFunctions.SWP_NOACTIVATE | NativeFunctions.SWP_NOSIZE);
+			}
+		}
+
+        private Point _FixedLocation = Point.Empty;
+        /// <summary>
+        /// Specifies fixed location for tooltip window.
+        /// </summary>
+        public Point FixedLocation
+        {
+            get { return _FixedLocation; }
+            set { _FixedLocation = value; }
+        }
+
+		protected override CreateParams CreateParams
+		{
+			get
+			{
+				CreateParams p=base.CreateParams;
+				p.Style=unchecked((int)(WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN));
+				p.ExStyle=(int)(WS_EX_TOOLWINDOW | WS_EX_TOPMOST);
+				p.Caption="";
+				return p;
+			}
+		}
+
+		protected override void OnVisibleChanged(EventArgs e)
+		{
+			if(!this.Visible && m_DropShadow!=null)
+			{
+				m_DropShadow.Hide();
+				m_DropShadow.Dispose();
+				m_DropShadow=null;
+			}
+			base.OnVisibleChanged(e);
+		}
+
+        public eDotNetBarStyle Style
+        {
+            get { return m_Style; }
+            set
+            {
+                m_Style = value;
+                if (BarFunctions.IsOffice2007Style(m_Style))
+                    this.AntiAlias = true;
+            }
+        }
+
+        private bool _ShowDropShadow = true;
+        public bool ShowDropShadow
+        {
+            get { return _ShowDropShadow; }
+            set
+            {
+                _ShowDropShadow = value;
+            }
+        }
+        
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/ToolbarName.cs b/PROMS/DotNetBar Source Code/ToolbarName.cs
new file mode 100644
index 00000000..02a99c73
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/ToolbarName.cs	
@@ -0,0 +1,161 @@
+using System;
+using System.Drawing;
+using System.Collections;
+using System.ComponentModel;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Summary description for NewToolbar.
+	/// </summary>
+	[ToolboxItem(false)]
+	internal class ToolbarName : System.Windows.Forms.Form
+	{
+		public bool RenameDialog=false;
+		public System.Windows.Forms.TextBox txtName;
+		private System.Windows.Forms.Label label1;
+		private System.Windows.Forms.Button cmdOK;
+		private System.Windows.Forms.Button cmdCancel;
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.Container components = null;
+
+		public ToolbarName()
+		{
+			//
+			// Required for Windows Form Designer support
+			//
+			InitializeComponent();
+		}
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		protected override void Dispose( bool disposing )
+		{
+			if( disposing )
+			{
+				if(components != null)
+				{
+					components.Dispose();
+				}
+			}
+			base.Dispose( disposing );
+		}
+
+		#region Windows Form 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.cmdOK = new System.Windows.Forms.Button();
+			this.cmdCancel = new System.Windows.Forms.Button();
+			this.label1 = new System.Windows.Forms.Label();
+			this.txtName = new System.Windows.Forms.TextBox();
+			this.SuspendLayout();
+			// 
+			// cmdOK
+			// 
+			this.cmdOK.DialogResult = System.Windows.Forms.DialogResult.OK;
+			this.cmdOK.FlatStyle = System.Windows.Forms.FlatStyle.System;
+			this.cmdOK.Location = new System.Drawing.Point(113, 56);
+			this.cmdOK.Name = "cmdOK";
+			this.cmdOK.Size = new System.Drawing.Size(80, 24);
+			this.cmdOK.TabIndex = 2;
+			this.cmdOK.Text = "barname_ok";
+			// 
+			// cmdCancel
+			// 
+			this.cmdCancel.CausesValidation = false;
+			this.cmdCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.cmdCancel.FlatStyle = System.Windows.Forms.FlatStyle.System;
+			this.cmdCancel.Location = new System.Drawing.Point(197, 56);
+			this.cmdCancel.Name = "cmdCancel";
+			this.cmdCancel.Size = new System.Drawing.Size(80, 24);
+			this.cmdCancel.TabIndex = 3;
+			this.cmdCancel.Text = "barname_cancel";
+			// 
+			// label1
+			// 
+			this.label1.Location = new System.Drawing.Point(8, 8);
+			this.label1.Name = "label1";
+			this.label1.Size = new System.Drawing.Size(272, 16);
+			this.label1.TabIndex = 0;
+			this.label1.Text = "barname_name";
+			// 
+			// txtName
+			// 
+			this.txtName.Location = new System.Drawing.Point(8, 28);
+			this.txtName.Name = "txtName";
+			this.txtName.Size = new System.Drawing.Size(268, 20);
+			this.txtName.TabIndex = 1;
+			this.txtName.Text = "";
+			this.txtName.Validating += new System.ComponentModel.CancelEventHandler(this.OnOK);
+			// 
+			// ToolbarName
+			// 
+			this.AcceptButton = this.cmdOK;
+			this.AutoScaleBaseSize = new System.Drawing.Size(5, 13);
+			this.CancelButton = this.cmdCancel;
+			this.ClientSize = new System.Drawing.Size(286, 87);
+			this.Controls.AddRange(new System.Windows.Forms.Control[] {
+																		  this.cmdCancel,
+																		  this.cmdOK,
+																		  this.label1,
+																		  this.txtName});
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.Name = "ToolbarName";
+			this.ShowInTaskbar = false;
+			this.Text = "barname_caption";
+			this.Load += new System.EventHandler(this.OnLoad);
+			this.ResumeLayout(false);
+
+		}
+		#endregion
+
+		private void OnLoad(object sender, System.EventArgs e)
+		{
+			// Load localized strings...
+			DotNetBarManager manager=null;
+			if(this.Owner is frmCustomize)
+				manager=((frmCustomize)this.Owner).GetDotNetBarManager();
+			using(LocalizationManager lm=new LocalizationManager(manager))
+			{
+				foreach(Control ctrl in this.Controls)
+				{
+					if(ctrl is TextBox)
+						continue;
+					ctrl.Text=lm.GetLocalizedString(ctrl.Text);
+				}
+				
+				if(this.RenameDialog)
+					this.Text=lm.GetLocalizedString(LocalizationKeys.RenameBarDialogCaption);
+				else
+					this.Text=lm.GetLocalizedString(this.Text);
+			}
+			manager=null;
+		}
+
+		private void OnOK(object sender, System.ComponentModel.CancelEventArgs e)
+		{
+			if(txtName.Text.Trim()=="")
+			{
+				DotNetBarManager manager=null;
+				if(this.Owner is frmCustomize)
+					manager=((frmCustomize)this.Owner).GetDotNetBarManager();
+				using(LocalizationManager lm=new LocalizationManager(manager))
+				{
+					MessageBox.Show(lm.GetLocalizedString(LocalizationKeys.BarEditDialogInvalidNameMessage));
+				}
+				manager=null;
+				e.Cancel=true;
+			}
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/ToolbarName.resx b/PROMS/DotNetBar Source Code/ToolbarName.resx
new file mode 100644
index 00000000..1fb27ec9
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/ToolbarName.resx	
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+            Microsoft ResX Schema 
+        
+            Version 1.3
+                
+            The primary goals of this format is to allow a simple XML format 
+            that is mostly human readable. The generation and parsing of the 
+            various data types are done through the TypeConverter classes 
+            associated with the data types.
+        
+            Example:
+        
+                ... ado.net/XML headers & schema ...
+                <resheader name="resmimetype">text/microsoft-resx</resheader>
+                <resheader name="version">1.3</resheader>
+                <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+                <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+                <data name="Name1">this is my long string</data>
+                <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+                <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+                    [base64 mime encoded serialized .NET Framework object]
+                </data>
+                <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+                    [base64 mime encoded string representing a byte array form of the .NET Framework object]
+                </data>
+        
+            There are any number of "resheader" rows that contain simple 
+            name/value pairs.
+            
+            Each data row contains a name, and value. The row also contains a 
+            type or mimetype. Type corresponds to a .NET class that support 
+            text/value conversion through the TypeConverter architecture. 
+            Classes that don't support this are serialized and stored with the 
+            mimetype set.
+                     
+            The mimetype is used for serialized objects, and tells the 
+            ResXResourceReader how to depersist the object. This is currently not 
+            extensible. For a given mimetype the value must be set accordingly:
+        
+            Note - application/x-microsoft.net.object.binary.base64 is the format 
+                   that the ResXResourceWriter will generate, however the reader can 
+                   read any of the formats listed below.
+        
+            mimetype: application/x-microsoft.net.object.binary.base64
+            value   : The object must be serialized with 
+                    : System.Serialization.Formatters.Binary.BinaryFormatter
+                    : and then encoded with base64 encoding.
+        
+            mimetype: application/x-microsoft.net.object.soap.base64
+            value   : The object must be serialized with 
+                    : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+                    : and then encoded with base64 encoding.
+            mimetype: application/x-microsoft.net.object.bytearray.base64
+            value   : The object must be serialized into a byte array 
+                    : using a System.ComponentModel.TypeConverter
+                    : and then encoded with base64 encoding.
+        -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>1.3</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="txtName.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Public</value>
+  </data>
+  <data name="$this.Name">
+    <value>ToolbarName</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/Touch/TouchHandler.cs b/PROMS/DotNetBar Source Code/Touch/TouchHandler.cs
new file mode 100644
index 00000000..b4d98fcb
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Touch/TouchHandler.cs	
@@ -0,0 +1,968 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows.Forms;
+using System.Drawing;
+using System.Runtime.InteropServices;
+using System.Data;
+
+namespace DevComponents.DotNetBar.Touch
+{
+    public class TouchHandler
+    {
+        #region Events
+        public event EventHandler<GestureEventArgs> PanBegin;
+        /// <summary>
+        /// Raises PanBegin event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnPanBegin(GestureEventArgs e)
+        {
+            EventHandler<GestureEventArgs> handler = PanBegin;
+            if (handler != null)
+                handler(this, e);
+        }
+        public event EventHandler<GestureEventArgs> PanEnd;
+        /// <summary>
+        /// Raises PanBegin event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnPanEnd(GestureEventArgs e)
+        {
+            EventHandler<GestureEventArgs> handler = PanEnd;
+            if (handler != null)
+                handler(this, e);
+        }
+        public event EventHandler<GestureEventArgs> Pan;
+        /// <summary>
+        /// Raises PanBegin event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnPan(GestureEventArgs e)
+        {
+            EventHandler<GestureEventArgs> handler = Pan;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        public event EventHandler<GestureEventArgs> Begin;
+        /// <summary>
+        /// Raises Begin event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnBegin(GestureEventArgs e)
+        {
+            EventHandler<GestureEventArgs> handler = Begin;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        public event EventHandler<GestureEventArgs> End;
+        /// <summary>
+        /// Raises End event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnEnd(GestureEventArgs e)
+        {
+            EventHandler<GestureEventArgs> handler = End;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        public event EventHandler<GestureEventArgs> PressAndTap;
+        /// <summary>
+        /// Raises PressAndTap event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnPressAndTap(GestureEventArgs e)
+        {
+            EventHandler<GestureEventArgs> handler = PressAndTap;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        public event EventHandler<GestureEventArgs> RotateBegin;
+        /// <summary>
+        /// Raises RotateBegin event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnRotateBegin(GestureEventArgs e)
+        {
+            EventHandler<GestureEventArgs> handler = RotateBegin;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        public event EventHandler<GestureEventArgs> Rotate;
+        /// <summary>
+        /// Raises Rotate event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnRotate(GestureEventArgs e)
+        {
+            EventHandler<GestureEventArgs> handler = Rotate;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        public event EventHandler<GestureEventArgs> RotateEnd;
+        /// <summary>
+        /// Raises RotateEnd event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnRotateEnd(GestureEventArgs e)
+        {
+            EventHandler<GestureEventArgs> handler = RotateEnd;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        public event EventHandler<GestureEventArgs> TwoFingerTap;
+        /// <summary>
+        /// Raises TwoFingerTap event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnTwoFingerTap(GestureEventArgs e)
+        {
+            EventHandler<GestureEventArgs> handler = TwoFingerTap;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        public event EventHandler<GestureEventArgs> ZoomBegin;
+        /// <summary>
+        /// Raises ZoomBegin event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnZoomBegin(GestureEventArgs e)
+        {
+            EventHandler<GestureEventArgs> handler = ZoomBegin;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        public event EventHandler<GestureEventArgs> Zoom;
+        /// <summary>
+        /// Raises Zoom event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnZoom(GestureEventArgs e)
+        {
+            EventHandler<GestureEventArgs> handler = Zoom;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        public event EventHandler<GestureEventArgs> ZoomEnd;
+        /// <summary>
+        /// Raises ZoomEnd event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnZoomEnd(GestureEventArgs e)
+        {
+            EventHandler<GestureEventArgs> handler = ZoomEnd;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        // Touch events
+        public event EventHandler<TouchEventArgs> TouchDown;
+        /// <summary>
+        /// Raises TouchDown event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnTouchDown(TouchEventArgs e)
+        {
+            EventHandler<TouchEventArgs> handler = TouchDown;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        public event EventHandler<TouchEventArgs> TouchUp;
+        /// <summary>
+        /// Raises TouchDown event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnTouchUp(TouchEventArgs e)
+        {
+            EventHandler<TouchEventArgs> handler = TouchUp;
+            if (handler != null)
+                handler(this, e);
+        }
+
+        public event EventHandler<TouchEventArgs> TouchMove;
+        /// <summary>
+        /// Raises TouchDown event.
+        /// </summary>
+        /// <param name="e">Provides event arguments.</param>
+        protected virtual void OnTouchMove(TouchEventArgs e)
+        {
+            EventHandler<TouchEventArgs> handler = TouchMove;
+            if (handler != null)
+                handler(this, e);
+        }
+        #endregion
+
+        #region Constructor
+        private Control _ParentControl = null;
+        private eTouchHandlerType _HandlerType = eTouchHandlerType.Gesture;
+        /// <summary>
+        /// Initializes a new instance of the TouchHandler class.
+        /// </summary>
+        /// <param name="parentControl"></param>
+        public TouchHandler(Control parentControl) : this(parentControl, eTouchHandlerType.Gesture) { }
+
+        /// <summary>
+        /// Initializes a new instance of the TouchHandler class.
+        /// </summary>
+        /// <param name="parentControl"></param>
+        public TouchHandler(Control parentControl, eTouchHandlerType handlerType)
+        {
+            _ParentControl = parentControl;
+            _HandlerType = handlerType;
+            if (IsTouchEnabled)
+            {
+                _ParentControl.HandleCreated += new EventHandler(ParentControlHandleCreated);
+                if (_ParentControl.IsHandleCreated)
+                    Initialize();
+            }
+        }
+        #endregion
+
+        #region Implementation
+        void ParentControlHandleCreated(object sender, EventArgs e)
+        {
+            Initialize();
+        }
+
+        private IntPtr _originalWindowProcId;
+        private WinApi.WindowProcDelegate _windowProcDelegate;
+        /// <summary>
+        /// Initializes handler
+        /// </summary>
+        private void Initialize()
+        {
+            if (!RegisterTouchWindow())
+            {
+                throw new NotSupportedException("Cannot register window");
+            }
+
+            _windowProcDelegate = WindowProc;
+
+            _originalWindowProcId = IntPtr.Size == 4 ?
+                WinApi.SubclassWindow(_ParentControl.Handle, WinApi.GWLP_WNDPROC, _windowProcDelegate) :
+                WinApi.SubclassWindow64(_ParentControl.Handle, WinApi.GWLP_WNDPROC, _windowProcDelegate);
+
+            //take the desktop DPI
+            using (Graphics graphics = Graphics.FromHwnd(_ParentControl.Handle))
+            {
+                DpiX = graphics.DpiX;
+                DpiY = graphics.DpiY;
+            }
+        }
+
+        public void Release()
+        {
+            _ParentControl.HandleCreated -= new EventHandler(ParentControlHandleCreated);
+
+            if (_ParentControl.IsHandleCreated && !_ParentControl.IsDisposed && _originalWindowProcId != IntPtr.Zero)
+            {
+                IntPtr result = IntPtr.Size == 4 ?
+                WinApi.SubclassWindow(_ParentControl.Handle, WinApi.GWLP_WNDPROC, _originalWindowProcId) :
+                WinApi.SubclassWindow64(_ParentControl.Handle, WinApi.GWLP_WNDPROC, _originalWindowProcId);
+                _originalWindowProcId = IntPtr.Zero;
+            }
+        }
+
+        public Control ParentControl
+        {
+            get { return _ParentControl; }
+        }
+
+        /// <summary>
+        /// The Windows message handler.
+        /// </summary>
+        private uint WindowProc(IntPtr hWnd, int msg, IntPtr wParam, IntPtr lParam)
+        {
+            if(msg == WinApi.WM_TOUCH && (_HandlerType & eTouchHandlerType.Touch)== eTouchHandlerType.Touch)
+            {
+                bool handled = false;
+                foreach (TouchEventArgs arg in DecodeMessage(hWnd, msg, wParam, lParam, DpiX, DpiY))
+                {
+
+                    if (arg.IsTouchDown)
+                        OnTouchDown(arg);
+                
+                    if (arg.IsTouchMove)
+                        OnTouchMove(arg);
+                
+                    if (arg.IsTouchUp)
+                        OnTouchUp(arg);
+
+                    handled |= arg.Handled;
+                }
+                if (handled)
+                {
+                    WinApi.CloseTouchInputHandle(lParam);
+                    return 1;
+                }
+            }
+
+            // Handle only gesture message
+            if (msg != WinApi.WM_GESTURE)
+            {
+                return WinApi.CallWindowProc(_originalWindowProcId, hWnd, msg, wParam, lParam);
+            }
+
+            WinApi.GESTUREINFO gestureInfo = new WinApi.GESTUREINFO();
+            gestureInfo.cbSize = (uint)Marshal.SizeOf(typeof(WinApi.GESTUREINFO));
+
+            bool result = WinApi.GetGestureInfo(lParam, ref gestureInfo);
+
+            if (!result)
+                throw new Exception("Cannot retrieve gesture information");
+
+            //Decode the gesture info and get the message event argument
+            GestureEventArgs eventArgs = new GestureEventArgs(this, ref gestureInfo);
+            try
+            {
+                //Fire the event using the event map
+                uint gestureId = GetGestureEventId(gestureInfo.dwID, gestureInfo.dwFlags);
+                if (gestureId == GestureEventId.Begin)
+                    OnBegin(eventArgs);
+                else if (gestureId == GestureEventId.End)
+                    OnEnd(eventArgs);
+                else if (gestureId == GestureEventId.Pan)
+                    OnPan(eventArgs);
+                else if (gestureId == GestureEventId.PanBegin)
+                    OnPanBegin(eventArgs);
+                else if (gestureId == GestureEventId.PanEnd)
+                    OnPanEnd(eventArgs);
+                else if (gestureId == GestureEventId.PressAndTap)
+                    OnPressAndTap(eventArgs);
+                else if (gestureId == GestureEventId.Rotate)
+                    OnRotate(eventArgs);
+                else if (gestureId == GestureEventId.RotateBegin)
+                    OnRotateBegin(eventArgs);
+                else if (gestureId == GestureEventId.RotateEnd)
+                    OnRotateEnd(eventArgs);
+                else if (gestureId == GestureEventId.TwoFingerTap)
+                    OnTwoFingerTap(eventArgs);
+                else if (gestureId == GestureEventId.Zoom)
+                    OnZoom(eventArgs);
+                else if (gestureId == GestureEventId.ZoomBegin)
+                    OnZoomBegin(eventArgs);
+                else if (gestureId == GestureEventId.ZoomEnd)
+                    OnZoomEnd(eventArgs);
+            }
+            catch (ArgumentOutOfRangeException) //In case future releases will introduce new event values
+            {
+            }
+
+            //Keep the last message for relative calculations
+            LastEventArgs = eventArgs;
+
+            //Keep the first message for relative calculations
+            if (eventArgs.IsBegin)
+                LastBeginEventArgs = eventArgs;
+
+            if (eventArgs.Handled)
+            {
+                WinApi.CloseGestureInfoHandle(lParam);
+                return 1;
+            }
+            else
+                return WinApi.CallWindowProc(_originalWindowProcId, hWnd, msg, wParam, lParam);
+        }
+
+        /// <summary>
+        /// Decode the message and create a collection of event arguments
+        /// </summary>
+        private IEnumerable<TouchEventArgs> DecodeMessage(IntPtr hWnd, int msg, IntPtr wParam, IntPtr lParam, float dpiX, float dpiY)
+        {
+            // More than one touch input can be associated with a touch message
+            int inputCount = WinApi.LoWord(DevComponents.DotNetBar.WinApi.ToInt(wParam)); // Number of touch inputs, actual per-contact messages
+
+            WinApi.TOUCHINPUT[] inputs; // Array of TOUCHINPUT structures
+            inputs = new WinApi.TOUCHINPUT[inputCount]; // Allocate the storage for the parameters of the per-contact messages
+            try
+            {
+                // Unpack message parameters into the array of TOUCHINPUT structures, each representing a message for one single contact.
+                if (!WinApi.GetTouchInputInfo(lParam, inputCount, inputs, Marshal.SizeOf(inputs[0])))
+                {
+                    // Touch info failed.
+                    throw new Exception("Error calling GetTouchInputInfo API");
+                }
+
+                // For each contact, dispatch the message to the appropriate message handler.
+                // For WM_TOUCHDOWN you can get down & move notifications and for WM_TOUCHUP you can get up & move notifications
+                // WM_TOUCHMOVE will only contain move notifications and up & down notifications will never come in the same message
+                for (int i = 0; i < inputCount; i++)
+                {
+                    TouchEventArgs touchEventArgs = new TouchEventArgs(this, dpiX, dpiY, ref inputs[i]);
+                    yield return touchEventArgs;
+                }
+            }
+            finally
+            {
+                //WinApi.CloseTouchInputHandle(lParam);
+            }
+        }
+
+        private GestureEventArgs _LastBeginEventArgs;
+        /// <summary>
+        /// The event arguments that started the current gesture
+        /// </summary>
+        internal GestureEventArgs LastBeginEventArgs
+        {
+            get { return _LastBeginEventArgs; }
+            set { _LastBeginEventArgs = value; }
+        }
+        /// <summary>
+        /// The last event in the current gesture event sequence
+        /// </summary>
+        private GestureEventArgs _LastEventArgs;
+        internal GestureEventArgs LastEventArgs
+        {
+            get { return _LastEventArgs; }
+            set { _LastEventArgs = value; }
+        }
+
+
+        private static class GestureEventId
+        {
+            public static readonly uint Begin = GetGestureEventId(WinApi.GID_BEGIN, 0);
+            public static readonly uint End = GetGestureEventId(WinApi.GID_END, 0);
+            public static readonly uint PanBegin = GetGestureEventId(WinApi.GID_PAN, WinApi.GF_BEGIN);
+            public static readonly uint Pan = GetGestureEventId(WinApi.GID_PAN, 0);
+            public static readonly uint PanEnd = GetGestureEventId(WinApi.GID_PAN, WinApi.GF_END);
+            public static readonly uint PressAndTap = GetGestureEventId(WinApi.GID_PRESSANDTAP, 0);
+            public static readonly uint RotateBegin = GetGestureEventId(WinApi.GID_ROTATE, WinApi.GF_BEGIN);
+            public static readonly uint Rotate = GetGestureEventId(WinApi.GID_ROTATE, 0);
+            public static readonly uint RotateEnd = GetGestureEventId(WinApi.GID_ROTATE, WinApi.GF_END);
+            public static readonly uint TwoFingerTap = GetGestureEventId(WinApi.GID_TWOFINGERTAP, 0);
+            public static readonly uint ZoomBegin = GetGestureEventId(WinApi.GID_ZOOM, WinApi.GF_BEGIN);
+            public static readonly uint Zoom = GetGestureEventId(WinApi.GID_ZOOM, 0);
+            public static readonly uint ZoomEnd = GetGestureEventId(WinApi.GID_ZOOM, WinApi.GF_END);
+        }
+        private static uint GetGestureEventId(uint dwID, uint dwFlags)
+        {
+            return (dwID << 3) + (dwID == WinApi.GID_TWOFINGERTAP || dwID == WinApi.GID_PRESSANDTAP
+                || dwID == WinApi.GID_BEGIN || dwID == WinApi.GID_END ?
+                0 : dwFlags & 5);
+        }
+
+        /// <summary>
+        /// Register for touch event
+        /// </summary>
+        /// <returns>true if succeeded</returns>
+        private bool RegisterTouchWindow()
+        {
+            bool result = false;
+            if ((_HandlerType & eTouchHandlerType.Gesture) == eTouchHandlerType.Gesture)
+            {
+                WinApi.GESTURECONFIG[] gestureConfig = new WinApi.GESTURECONFIG[] { new WinApi.GESTURECONFIG(0, WinApi.GC_ALLGESTURES, 0) };
+                result = WinApi.SetGestureConfig(_ParentControl.Handle, 0, 1, gestureConfig, (uint)Marshal.SizeOf(typeof(WinApi.GESTURECONFIG)));
+            }
+
+            if ((_HandlerType & eTouchHandlerType.Touch) == eTouchHandlerType.Touch)
+            {
+                result |= WinApi.RegisterTouchWindow(_ParentControl.Handle, _DisablePalmRejection ? WinApi.TouchWindowFlag.WantPalm : 0);
+            }
+            return result;
+        }
+
+        private bool _DisablePalmRejection;
+        /// <summary>
+        /// Gets or sets whether palm rejection is enabled.
+        /// </summary>
+        public bool DisablePalmRejection
+        {
+            get
+            {
+                return _DisablePalmRejection;
+            }
+            set
+            {
+                if (_DisablePalmRejection == value)
+                    return;
+
+                _DisablePalmRejection = value;
+
+                if (_ParentControl.IsHandleCreated)
+                {
+                    WinApi.UnregisterTouchWindow(_ParentControl.Handle);
+                    RegisterTouchWindow();
+                }
+            }
+        }
+
+        private float _DpiX;
+        public float DpiX
+        {
+            get { return _DpiX; }
+            set { _DpiX = value; }
+        }
+
+        private float _DpiY;
+        public float DpiY
+        {
+            get { return _DpiY; }
+            set { _DpiY = value; }
+        }
+
+        /// <summary>
+        /// Check if Multi-touch support device is ready
+        /// </summary>
+        public static bool IsTouchEnabled
+        {
+            get
+            {
+                return _EnableTouchSupport && ((WinApi.GetDigitizerStatus() & (WinApi.DigitizerStatus.StackReady | WinApi.DigitizerStatus.MultiInput)) != 0);
+            }
+        }
+
+        private static bool _EnableTouchSupport = true;
+        /// <summary>
+        /// Gets or sets whether internal touch support is enabled for all DotNetBar controls.
+        /// </summary>
+        public static bool EnableTouchSupport
+        {
+            get { return _EnableTouchSupport; }
+            set { _EnableTouchSupport = value; }
+        }
+        #endregion
+    }
+    [Flags]
+    public enum eTouchHandlerType : short
+    {
+        Gesture = 1,
+        Touch = 2
+    }
+
+    public class GestureEventArgs : EventArgs
+    {
+        private readonly uint _Flags;
+
+        /// <summary>
+        /// Create new gesture event instance and decode the gesture info structure
+        /// </summary>
+        /// <param name="handler">The gesture handler</param>
+        /// <param name="gestureInfo">The gesture information</param>
+        internal GestureEventArgs(TouchHandler handler, ref WinApi.GESTUREINFO gestureInfo)
+        {
+            _Flags = gestureInfo.dwFlags;
+            GestureId = gestureInfo.dwID;
+            GestureArguments = gestureInfo.ullArguments;
+
+            //Get the last event from the handler
+            LastEvent = handler.LastEventArgs;
+
+            //Get the last begin event from the handler 
+            LastBeginEvent = handler.LastBeginEventArgs;
+
+            ParseGesture(handler.ParentControl, ref gestureInfo);
+
+            //new gesture, clear last and first event fields
+            if (IsBegin)
+            {
+                LastBeginEvent = null;
+                LastEvent = null;
+            }
+        }
+
+        //Decode the gesture
+        private void ParseGesture(Control parentControl, ref WinApi.GESTUREINFO gestureInfo)
+        {
+            Location = parentControl.PointToClient(new Point(gestureInfo.ptsLocation.x, gestureInfo.ptsLocation.y));
+
+            Center = Location;
+
+            switch (GestureId)
+            {
+                case WinApi.GID_ROTATE:
+                    ushort lastArguments = (ushort)(IsBegin ? 0 : LastEvent.GestureArguments);
+
+                    RotateAngle = WinApi.GID_ROTATE_ANGLE_FROM_ARGUMENT((ushort)(gestureInfo.ullArguments - lastArguments));
+                    break;
+
+
+                case WinApi.GID_ZOOM:
+                    Point first = IsBegin ? Location : LastBeginEvent.Location;
+                    Center = new Point((Location.X + first.X) / 2, (Location.Y + first.Y) / 2);
+                    ZoomFactor = IsBegin ? 1 : (double)gestureInfo.ullArguments / LastEvent.GestureArguments;
+                    //DistanceBetweenFingers = WinApi.LoDWord(gestureInfo.ullArguments);
+                    break;
+
+                case WinApi.GID_PAN:
+                    PanTranslation = IsBegin ? new Size(0, 0) :
+                        new Size(Location.X - LastEvent.Location.X, Location.Y - LastEvent.Location.Y);
+                    int panVelocity = WinApi.HiDWord((long)(gestureInfo.ullArguments));
+                    PanVelocity = new Size(WinApi.LoWord(panVelocity), WinApi.HiWord(panVelocity));
+                    //DistanceBetweenFingers = WinApi.LoDWord(gestureInfo.ullArguments);
+                    break;
+            }
+
+            
+        }
+
+        private uint _GestureId;
+        public uint GestureId
+        {
+            get { return _GestureId; }
+            private set { _GestureId = value; }
+        }
+
+        private ulong _GestureArguments;
+        public ulong GestureArguments
+        {
+            get { return _GestureArguments; }
+            private set { _GestureArguments = value; }
+        }
+
+        private Point _Location;
+        /// <summary>
+        /// The client location of gesture.
+        /// </summary>
+        public Point Location
+        {
+            get { return _Location; }
+            private set { _Location = value; }
+        }
+
+        /// <summary>
+        /// Is this the first event of a gesture.
+        /// </summary>
+        public bool IsBegin
+        {
+            get
+            {
+                return (_Flags & WinApi.GF_BEGIN) != 0;
+            }
+        }
+
+        /// <summary>
+        /// It this last event of a gesture.
+        /// </summary>
+        public bool IsEnd
+        {
+            get
+            {
+                return (_Flags & WinApi.GF_END) != 0;
+            }
+        }
+
+        /// <summary>
+        /// Has gesture triggered inertia.
+        /// </summary>
+        public bool IsInertia
+        {
+            get
+            {
+                return (_Flags & WinApi.GF_INERTIA) != 0;
+            }
+        }
+
+        /// <summary>
+        /// Gesture relative rotation angle for Rotate event.
+        /// </summary>
+        private double _RotateAngle;
+        public double RotateAngle
+        {
+            get { return _RotateAngle; }
+            private set { _RotateAngle = value; }
+        }
+
+        /// <summary>
+        /// Indicates calculated gesture center.
+        /// </summary>
+        private Point _Center;
+        public Point Center
+        {
+            get { return _Center; }
+            private set { _Center = value; }
+        }
+        
+        /// <summary>
+        /// Gesture zoom factor for Zoom event.
+        /// </summary>
+        private double _ZoomFactor;
+        public double ZoomFactor
+        {
+            get { return _ZoomFactor; }
+            private set { _ZoomFactor = value; }
+        }
+
+        /// <summary>
+        /// Gesture relative panning translation for Pan event.
+        /// </summary>
+        private Size _PanTranslation;
+        public Size PanTranslation
+        {
+            get { return _PanTranslation; }
+            set { _PanTranslation = value; }
+        }
+
+        /// <summary>
+        /// Gesture velocity vector of the pan gesture for custom inertia implementations.
+        /// </summary>
+        private Size _PanVelocity;
+        public Size PanVelocity
+        {
+            get { return _PanVelocity; }
+            private set { _PanVelocity = value; }
+        }
+
+        private GestureEventArgs _LastBeginEvent;
+        /// <summary>
+        /// The first touch arguments in this gesture event sequence.
+        /// </summary>
+        public GestureEventArgs LastBeginEvent
+        {
+            get { return _LastBeginEvent; }
+            internal set { _LastBeginEvent = value; }
+        }
+        
+        /// <summary>
+        /// The last touch arguments in this gesture event sequence.
+        /// </summary>
+        private GestureEventArgs _LastEvent;
+        public GestureEventArgs LastEvent
+        {
+            get { return _LastEvent; }
+            internal set { _LastEvent = value; }
+        }
+
+        private bool _Handled = false;
+        /// <summary>
+        /// Gets or sets whether event is handled.
+        /// </summary>
+        public bool Handled
+        {
+            get { return _Handled; }
+            set { _Handled = value; }
+        }
+    }
+
+    /// <summary>
+    /// EventArgs passed to Touch handlers 
+    /// </summary>
+    public class TouchEventArgs : EventArgs
+    {
+        private readonly TouchHandler _ParentHandler;
+        private readonly float _dpiXFactor;
+        private readonly float _dpiYFactor;
+
+        /// <summary>
+        /// Create new touch event argument instance
+        /// </summary>
+        /// <param name="hWndWrapper">The target control</param>
+        /// <param name="touchInput">one of the inner touch input in the message</param>
+        internal TouchEventArgs(TouchHandler parentHandler, float dpiX, float dpiY, ref WinApi.TOUCHINPUT touchInput)
+        {
+            _ParentHandler = parentHandler;
+            _dpiXFactor = 96F / dpiX;
+            _dpiYFactor = 96F / dpiY;
+            DecodeTouch(ref touchInput);
+        }
+
+        private bool CheckFlag(int value)
+        {
+            return (Flags & value) != 0;
+        }
+
+
+
+        // Decodes and handles WM_TOUCH* messages.
+        private void DecodeTouch(ref WinApi.TOUCHINPUT touchInput)
+        {
+            // TOUCHINFO point coordinates and contact size is in 1/100 of a pixel; convert it to pixels.
+            // Also convert screen to client coordinates.
+            if ((touchInput.dwMask & WinApi.TOUCHINPUTMASKF_CONTACTAREA) != 0)
+                ContactSize = new Size(AdjustDpiX(touchInput.cyContact / 100), AdjustDpiY(touchInput.cyContact / 100));
+
+            Id = touchInput.dwID;
+
+            Point p = _ParentHandler.ParentControl.PointToClient(new Point(touchInput.x / 100, touchInput.y / 100));
+            Location = p;// new Point(AdjustDpiX(p.X), AdjustDpiY(p.Y));
+
+            Time = touchInput.dwTime;
+            TimeSpan ellapse = TimeSpan.FromMilliseconds(Environment.TickCount - touchInput.dwTime);
+            AbsoluteTime = DateTime.Now - ellapse;
+
+            Mask = touchInput.dwMask;
+            Flags = touchInput.dwFlags;
+        }
+
+
+        private int AdjustDpiX(int value)
+        {
+            return (int)(value * _dpiXFactor);
+        }
+
+        private int AdjustDpiY(int value)
+        {
+            return (int)(value * _dpiYFactor);
+        }
+
+        /// <summary>
+        /// Touch client coordinate in pixels
+        /// </summary>
+        private Point _Location;
+        public Point Location
+        {
+            get { return _Location; }
+            private set
+            {
+                _Location = value;
+            }
+        }
+        
+        /// <summary>
+        /// A touch point identifier that distinguishes a particular touch input
+        /// </summary>
+        private int _Id;
+        public int Id
+        {
+            get { return _Id; }
+            private set
+            {
+                _Id = value;
+            }
+        }
+        
+        /// <summary>
+        /// A set of bit flags that specify various aspects of touch point
+        /// press, release, and motion. 
+        /// </summary>
+        private int _Flags;
+        public int Flags
+        {
+            get { return _Flags; }
+            private set
+            {
+                _Flags = value;
+            }
+        }
+        
+        /// <summary>
+        /// mask which fields in the structure are valid
+        /// </summary>
+        private int _Mask;
+        public int Mask
+        {
+            get { return _Mask; }
+            private set
+            {
+                _Mask = value;
+            }
+        }
+
+        /// <summary>
+        /// touch event time
+        /// </summary>
+        private DateTime _AbsoluteTime;
+        public DateTime AbsoluteTime
+        {
+            get { return _AbsoluteTime; }
+            private set { _AbsoluteTime = value; }
+        }
+
+        /// <summary>
+        /// touch event time from system up
+        /// </summary>
+        private int _Time;
+        public int Time
+        {
+            get { return _Time; }
+            private set
+            {
+                _Time = value;
+            }
+        }
+        /// <summary>
+        /// the size of the contact area in pixels
+        /// </summary>
+        private Size? _ContactSize;
+        public Size? ContactSize
+        {
+            get { return _ContactSize; }
+            private set { _ContactSize = value; }
+        }
+
+        /// <summary>
+        /// Is Primary Contact (The first touch sequence)
+        /// </summary>
+        public bool IsPrimaryContact
+        {
+            get { return (Flags & WinApi.TOUCHEVENTF_PRIMARY) != 0; }
+        }
+
+        /// <summary>
+        /// Specifies that movement occurred
+        /// </summary>
+        public bool IsTouchMove
+        {
+            get { return CheckFlag(WinApi.TOUCHEVENTF_MOVE); }
+        }
+
+        /// <summary>
+        /// Specifies that the corresponding touch point was established through a new contact
+        /// </summary>
+        public bool IsTouchDown
+        {
+            get { return CheckFlag(WinApi.TOUCHEVENTF_DOWN); }
+        }
+
+        /// <summary>
+        /// Specifies that a touch point was removed
+        /// </summary>
+        public bool IsTouchUp
+        {
+            get { return CheckFlag(WinApi.TOUCHEVENTF_UP); }
+        }
+
+        /// <summary>
+        /// Specifies that a touch point is in range
+        /// </summary>
+        public bool IsTouchInRange
+        {
+            get { return CheckFlag(WinApi.TOUCHEVENTF_INRANGE); }
+        }
+
+        /// <summary>
+        /// specifies that this input was not coalesced.
+        /// </summary>
+        public bool IsTouchNoCoalesce
+        {
+            get { return CheckFlag(WinApi.TOUCHEVENTF_NOCOALESCE); }
+        }
+
+        /// <summary>
+        /// Specifies that the touch point is associated with a pen contact
+        /// </summary>
+        public bool IsTouchPen
+        {
+            get { return CheckFlag(WinApi.TOUCHEVENTF_PEN); }
+        }
+
+        /// <summary>
+        /// The touch event came from the user's palm
+        /// </summary>
+        /// <remarks>Set <see cref="DisablePalmRejection"/> to true</remarks>
+        public bool IsTouchPalm
+        {
+            get { return CheckFlag(WinApi.TOUCHEVENTF_PALM); }
+        }
+
+        private bool _Handled = false;
+        /// <summary>
+        /// Gets or sets whether event is handled.
+        /// </summary>
+        public bool Handled
+        {
+            get { return _Handled; }
+            set { _Handled = value; }
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Touch/WinApi.cs b/PROMS/DotNetBar Source Code/Touch/WinApi.cs
new file mode 100644
index 00000000..c08c48ca
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Touch/WinApi.cs	
@@ -0,0 +1,307 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Runtime.InteropServices;
+
+namespace DevComponents.DotNetBar.Touch
+{
+    internal class WinApi
+    {
+        #region Functions
+        [DllImport("user32")]
+        public static extern bool SetGestureConfig(
+                                    IntPtr hwnd,                        // window for which configuration is specified
+                                    uint dwReserved,                    // reserved, must be 0
+                                    uint cIDs,                          // count of GESTURECONFIG structures
+                                    GESTURECONFIG[] pGestureConfig,    // array of GESTURECONFIG structures, dwIDs will be processed in the
+            // order specified and repeated occurances will overwrite previous ones
+                                    uint cbSize);                       // sizeof(GESTURECONFIG)
+
+        [DllImport("user32")]
+        public static extern bool RegisterTouchWindow(System.IntPtr hWnd, TouchWindowFlag flags);
+
+        [DllImport("user32")]
+        public static extern bool UnregisterTouchWindow(System.IntPtr hWnd);
+
+        [DllImport("user32")]
+        public static extern bool IsTouchWindow(System.IntPtr hWnd, out uint ulFlags);
+
+        [DllImport("user32")]
+        public static extern bool GetTouchInputInfo(System.IntPtr hTouchInput, int cInputs, [In, Out] TOUCHINPUT[] pInputs, int cbSize);
+
+        [DllImport("user32")]
+        public static extern void CloseTouchInputHandle(System.IntPtr lParam);
+
+        [DllImport("user32")]
+        public static extern bool SetProp(IntPtr hWnd, string lpString, IntPtr hData);
+
+        //Touch
+        [DllImport("user32", EntryPoint = "GetSystemMetrics")]
+        public static extern int GetDigitizerCapabilities(DigitizerIndex index);
+        [DllImport("user32")]
+        public static extern bool GetGestureInfo(IntPtr hGestureInfo, ref GESTUREINFO pGestureInfo);
+        [DllImport("user32")]
+        public static extern bool CloseGestureInfoHandle(IntPtr hGestureInfo);
+        [DllImport("user32", EntryPoint = "SetWindowLongPtr")]
+        public static extern IntPtr SubclassWindow64(IntPtr hWnd, int nIndex, WindowProcDelegate dwNewLong);
+        [DllImport("user32", EntryPoint = "SetWindowLong")]
+        public static extern IntPtr SubclassWindow(IntPtr hWnd, int nIndex, WindowProcDelegate dwNewLong);
+        [DllImport("user32", EntryPoint = "SetWindowLongPtr")]
+        public static extern IntPtr SubclassWindow64(IntPtr hWnd, int nIndex, IntPtr dwNewLong);
+        [DllImport("user32", EntryPoint = "SetWindowLong")]
+        public static extern IntPtr SubclassWindow(IntPtr hWnd, int nIndex, IntPtr dwNewLong);
+
+
+        [DllImport("user32")]
+        public static extern uint CallWindowProc(IntPtr prevWndFunc, IntPtr hWnd, int msg, IntPtr wparam, IntPtr lparam);
+
+        public delegate uint WindowProcDelegate(IntPtr hWnd, int msg, IntPtr wparam, IntPtr lparam);
+
+        /// <summary>
+        /// Get the current Digitizer Status
+        /// </summary>
+        public static DigitizerStatus GetDigitizerStatus()
+        {
+            return (DigitizerStatus)GetDigitizerCapabilities(DigitizerIndex.SM_DIGITIZER);
+        }
+        #endregion
+
+        #region Structures & Constants
+        [StructLayout(LayoutKind.Sequential)]
+        public struct GESTURECONFIG
+        {
+            public uint dwID;                     // gesture ID
+            public uint dwWant;                   // settings related to gesture ID that are to be turned on
+            public uint dwBlock;                  // settings related to gesture ID that are to be turned off
+            /// <summary>
+            /// Initializes a new instance of the GESTURECONFIG structure.
+            /// </summary>
+            /// <param name="dwID"></param>
+            /// <param name="dwWant"></param>
+            /// <param name="dwBlock"></param>
+            public GESTURECONFIG(uint dwID, uint dwWant, uint dwBlock)
+            {
+                this.dwID = dwID;
+                this.dwWant = dwWant;
+                this.dwBlock = dwBlock;
+            }
+        }
+        /// <summary>
+        /// Specifies available digitizer capabilities
+        /// </summary>
+        [Flags]
+        public enum DigitizerStatus : byte
+        {
+            IntegratedTouch = 0x01,
+            ExternalTouch = 0x02,
+            IntegratedPan = 0x04,
+            ExternalPan = 0x08,
+            MultiInput = 0x40,
+            StackReady = 0x80
+        }
+        public enum DigitizerIndex
+        {
+            SM_DIGITIZER = 94,
+            SM_MAXIMUMTOUCHES = 95
+        }
+        public const int GWLP_WNDPROC = -4;
+        // Gesture argument helpers
+        //   - Angle should be a double in the range of -2pi to +2pi
+        //   - Argument should be an unsigned 16-bit value
+        //
+        public static ushort GID_ROTATE_ANGLE_TO_ARGUMENT(ushort arg) { return ((ushort)(((arg + 2.0 * 3.14159265) / (4.0 * 3.14159265)) * 65535.0)); }
+        public static double GID_ROTATE_ANGLE_FROM_ARGUMENT(ushort arg) { return ((((double)arg / 65535.0) * 4.0 * 3.14159265) - 2.0 * 3.14159265); }
+
+        //Gesture flags - GESTUREINFO.dwFlags
+        public const uint GF_BEGIN = 0x00000001;
+        public const uint GF_INERTIA = 0x00000002;
+        public const uint GF_END = 0x00000004;
+
+        //Gesture IDs
+        public const uint GID_BEGIN = 1;
+        public const uint GID_END = 2;
+        public const uint GID_ZOOM = 3;
+        public const uint GID_PAN = 4;
+        public const uint GID_ROTATE = 5;
+        public const uint GID_TWOFINGERTAP = 6;
+        public const uint GID_PRESSANDTAP = 7;
+
+        public const uint GC_ALLGESTURES = 0x00000001;
+
+        public const uint WM_GESTURE = 0x0119;
+
+        public const uint WM_GESTURENOTIFY = 0x011A;
+
+        // Touch event window message constants [winuser.h]
+        public const int WM_TOUCH = 0x0240;
+
+        // Touch input mask values (TOUCHINPUT.dwMask) [winuser.h]
+        public const int TOUCHINPUTMASKF_TIMEFROMSYSTEM = 0x0001; // the dwTime field contains a system generated value
+        public const int TOUCHINPUTMASKF_EXTRAINFO = 0x0002; // the dwExtraInfo field is valid
+        public const int TOUCHINPUTMASKF_CONTACTAREA = 0x0004; // the cxContact and cyContact fields are valid
+
+        // Touch event flags ((TOUCHINPUT.dwFlags) [winuser.h]
+        public const int TOUCHEVENTF_MOVE = 0x0001;
+        public const int TOUCHEVENTF_DOWN = 0x0002;
+        public const int TOUCHEVENTF_UP = 0x0004;
+        public const int TOUCHEVENTF_INRANGE = 0x0008;
+        public const int TOUCHEVENTF_PRIMARY = 0x0010;
+        public const int TOUCHEVENTF_NOCOALESCE = 0x0020;
+        public const int TOUCHEVENTF_PEN = 0x0040;
+        public const int TOUCHEVENTF_PALM = 0x0080;
+
+        public enum TouchWindowFlag : uint
+        {
+            FineTouch = 0x1,
+            WantPalm = 0x2
+        }
+        /// <summary>
+        /// Gesture Info Interop Structure
+        /// </summary>
+        [StructLayout(LayoutKind.Sequential)]
+        public struct GESTUREINFO
+        {
+            public uint cbSize;                // size, in bytes, of this structure (including variable length Args field)
+            public uint dwFlags;               // see GF_* flags
+            public uint dwID;                  // gesture ID, see GID_* defines
+            public IntPtr hwndTarget;          // handle to window targeted by this gesture
+            public POINTS ptsLocation;          // current location of this gesture
+            public uint dwInstanceID;          // internally used
+            public uint dwSequenceID;          // internally used
+            public ulong ullArguments;         // arguments for gestures whose arguments fit in 8 BYTES
+            public uint cbExtraArgs;           // size, in bytes, of extra arguments, if any, that accompany this gesture
+        }
+        /// <summary>
+        /// A Simple POINTS Interop structure
+        /// </summary>
+        [StructLayout(LayoutKind.Sequential)]
+        public struct POINTS
+        {
+            public short x;
+            public short y;
+        }
+
+        /// <summary>
+        /// A Simple POINT Interop structure
+        /// </summary>
+        [StructLayout(LayoutKind.Sequential)]
+        public struct POINT
+        {
+            public int x;
+            public int y;
+        }
+        /// <summary>
+        /// Touch API defined structures [winuser.h]
+        /// </summary>
+        [StructLayout(LayoutKind.Sequential)]
+        public struct TOUCHINPUT
+        {
+            public int x;
+            public int y;
+            public System.IntPtr hSource;
+            public int dwID;
+            public int dwFlags;
+            public int dwMask;
+            public int dwTime;
+            public System.IntPtr dwExtraInfo;
+            public int cxContact;
+            public int cyContact;
+        }
+
+        // Extracts lower 16-bit word from an 32-bit int.
+        // in:
+        //      number      int
+        // returns:
+        //      lower word
+        public static ushort LoWord(uint number)
+        {
+            return (ushort)(number & 0xffff);
+        }
+
+        // Extracts higher 16-bit word from an 32-bit int.
+        // in:
+        //      number      uint
+        // returns:
+        //      lower word
+        public static ushort HiWord(uint number)
+        {
+            return (ushort)((number >> 16) & 0xffff);
+        }
+
+        // Extracts lower 32-bit word from an 64-bit int.
+        // in:
+        //      number      ulong
+        // returns:
+        //      lower word
+        public static uint LoDWord(ulong number)
+        {
+            return (uint)(number & 0xffffffff);
+        }
+
+        // Extracts higher 32-bit word from an 64-bit int.
+        // in:
+        //      number      ulong
+        // returns:
+        //      lower word
+        public static uint HiDWord(ulong number)
+        {
+            return (uint)((number >> 32) & 0xffffffff);
+        }
+
+
+        // Extracts lower 16-bit word from an 32-bit int.
+        // in:
+        //      number      int
+        // returns:
+        //      lower word
+        public static short LoWord(int number)
+        {
+            return (short)number;
+        }
+
+        // Extracts higher 16-bit word from an 32-bit int.
+        // in:
+        //      number      int
+        // returns:
+        //      lower word
+        public static short HiWord(int number)
+        {
+            return (short)(number >> 16);
+        }
+
+        // Extracts lower 32-bit word from an 64-bit int.
+        // in:
+        //      number      long
+        // returns:
+        //      lower word
+        public static int LoDWord(long number)
+        {
+            return (int)(number);
+        }
+
+        // Extracts higher 32-bit word from an 64-bit int.
+        // in:
+        //      number      long
+        // returns:
+        //      lower word
+        public static int HiDWord(long number)
+        {
+            return (int)((number >> 32));
+        }
+
+        // Gesture notification structure
+        //  - The WM_GESTURENOTIFY message lParam contains a pointer to this structure.
+        //  - The WM_GESTURENOTIFY message notifies a window that gesture recognition is
+        //    in progress and a gesture will be generated if one is recognized under the
+        //    current gesture settings.
+        public struct GESTURENOTIFYSTRUCT
+        {
+            public uint cbSize;                   // size, in bytes, of this structure
+            public uint dwFlags;                  // unused
+            public IntPtr hwndTarget;               // handle to window targeted by the gesture
+            public POINTS ptsLocation;              // starting location
+            public uint dwInstanceID;             // internally used
+        };
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/Cell.cs b/PROMS/DotNetBar Source Code/TreeGX/Cell.cs
new file mode 100644
index 00000000..9a275881
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/Cell.cs	
@@ -0,0 +1,1170 @@
+using System;
+using System.Drawing;
+using System.ComponentModel;
+using System.Windows.Forms;
+using DevComponents.Tree.Display;
+
+namespace DevComponents.Tree
+{
+	/// <summary>Represents a cell assigned to the Node.</summary>
+	/// <remarks>
+	/// 	<para>The Cell with Index 0 (zero) always exists for a Node and it is a cell that
+	///     you can interact with through the properties on a node, which are forwarding to the
+	///     Cell(0), or you can go directly to the Cell(0).</para>
+	/// 	<para>When Node has multiple columns defined each column corresponds to Cell in
+	///     Node's Cells collection. The first Column has Index 0, second Column Index 1 and so
+	///     forth.</para>
+	/// 	<para>Note that there is always at least one Cell in a Node even if multiple
+	///     columns are not used.</para>
+	/// </remarks>
+	[DesignTimeVisible(false),ToolboxItem(false)]
+	public class Cell:Component
+	{
+		#region Private Variables
+		private ElementStyle m_StyleNormal=null;
+		private ElementStyle m_StyleDisabled=null;
+		private ElementStyle m_StyleMouseDown=null;
+		private ElementStyle m_StyleMouseOver=null;
+		private ElementStyle m_StyleSelected=null;
+		private bool m_Enabled=true;
+		private CellImages m_Images=null;
+		private Rectangle m_Bounds=Rectangle.Empty;
+		private Rectangle m_TextBounds=Rectangle.Empty;
+		private Rectangle m_TextContentBounds=Rectangle.Empty;
+		private Rectangle m_ImageBounds=Rectangle.Empty;
+		private Rectangle m_CheckBoxBounds=Rectangle.Empty;
+		private object m_Tag=null;
+		private string m_Text="";
+		private eCellPartAlignment m_ImageAlignment=eCellPartAlignment.NearCenter;
+		private eCellPartAlignment m_CheckBoxAlignment=eCellPartAlignment.NearCenter;
+		private bool m_CheckBoxVisible=false;
+		private bool m_Checked=false;
+		private bool m_MouseDown=false;
+		private bool m_MouseOver=false;
+		private bool m_Selected=false;
+		private Node m_Parent=null;
+		private bool m_Visible=true;
+		private eTreeAction m_ActionSource=eTreeAction.Code;
+		private eCellPartLayout m_Layout=eCellPartLayout.Default;
+		private System.Windows.Forms.Cursor m_Cursor=null;
+		private bool m_WordWrap=false;
+		private string m_Name="";
+		private Control m_HostedControl=null;
+		private Size m_HostedControlSize=Size.Empty;
+		private bool m_IgnoreHostedControlSizeChange=false;
+		#endregion
+
+		#region Constructor/Dispose
+		/// <summary>
+		/// Initializes new instance of Cell class.
+		/// </summary>
+		public Cell():this("")
+		{
+		}
+
+		/// <summary>
+		/// Initializes new instance of Cell class.
+		/// </summary>
+		/// <param name="text">Cell text.</param>
+		public Cell(string text)
+		{
+			m_Text=text;
+			m_Images=new CellImages(this);
+		}
+
+		/// <summary>
+		/// Releases the resources used by the Component.
+		/// </summary>
+		/// <param name="disposing">true to release both managed and unmanaged resources; false to release only unmanaged resources.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if(m_HostedControl!=null)
+				m_HostedControl.SizeChanged-=new EventHandler(this.HostedControlSizedChanged);
+			m_HostedControl=null;
+			base.Dispose(disposing);
+		}
+		#endregion
+
+		#region Properties
+		/// <summary>
+		/// Gets or sets the control hosted inside of the cell.
+		/// </summary>
+		/// <remarks>
+		/// 	<para>When control is hosted inside of the cell, cell size is determined by the
+		///     size of the control hosted inside of it. The cell will not display its text but it will display any image assigned
+		///     or check box when control is hosted inside of it. The Style settings like Margin
+		///     and Padding will still apply.</para>
+		/// </remarks>
+		[Browsable(true),Category("Behavior"),Description("Indicates control hosted inside of the cell."),DefaultValue(null)]
+		public Control HostedControl
+		{
+			get {return m_HostedControl;}
+			set
+			{
+				SetHostedControl(value);
+			}
+		}
+		
+		/// <summary>
+		/// Gets or sets whether hosted control size change event is ignored.
+		/// </summary>
+		internal bool IgnoreHostedControlSizeChange
+		{
+			get { return m_IgnoreHostedControlSizeChange;}
+			set { m_IgnoreHostedControlSizeChange=value; }
+		}
+		
+		/// <summary>
+		/// Gets or sets the hosted control size. Property is used to correctly scale control when TreeGX.Zoom is used to zoom view.
+		/// </summary>
+		internal Size HostedControlSize
+		{
+			get { return m_HostedControlSize;}
+			set { m_HostedControlSize = value;}	
+		}
+
+		/// <summary>
+		/// Returns name of the cell that can be used to identify it from the code.
+		/// </summary>
+		[Browsable(false),Category("Design"),Description("Indicates the name used to identify cell.")]
+		public string Name
+		{
+			get
+			{
+				if(this.Site!=null)
+					m_Name=this.Site.Name;
+				return m_Name;
+			}
+			set
+			{
+				if(this.Site!=null)
+					this.Site.Name=value;
+				if(value==null)
+					m_Name="";
+				else
+					m_Name=value;
+			}
+		}
+
+		/// <summary>
+		/// Gets the relative bounds of the cell.
+		/// </summary>
+		[Browsable(false)]
+		internal Rectangle BoundsRelative
+		{
+			get
+			{
+				return m_Bounds;			
+			}
+		}
+		
+		/// <summary>
+		/// Gets the bounds of the cell.
+		/// </summary>
+		[Browsable(false)]
+		public Rectangle Bounds
+		{
+			get
+			{
+				TreeGX tree=this.TreeControl;
+				if(tree!=null)
+				{
+					return NodeDisplay.GetCellRectangle(eCellRectanglePart.CellBounds, this, tree.NodeDisplay.Offset);
+				}
+				return Rectangle.Empty;			
+			}
+		}
+
+		/// <summary>
+		/// Sets the bounds of the cell.
+		/// </summary>
+		/// <param name="bounds">New cell bounds.</param>
+		internal void SetBounds(Rectangle bounds)
+		{
+			m_Bounds=bounds;
+		}
+
+//		/// <summary>
+//		/// Gets the bounds of the text inside of cell.
+//		/// </summary>
+//		[Browsable(false)]
+//		public Rectangle TextBounds
+//		{
+//			get
+//			{
+//				return m_TextBounds;			
+//			}
+//		}
+
+//		/// <summary>
+//		/// Sets the bounds of the text inside of the cell.
+//		/// </summary>
+//		/// <param name="bounds">New cell bounds.</param>
+//		internal void SetTextBounds(Rectangle bounds)
+//		{
+//			m_TextBounds=bounds;
+//		}
+
+		/// <summary>
+		/// Gets or sets the available content bounds for the text. Text will fitted into these bounds
+		/// but it's true location can be obtained only after it is displayed.
+		/// </summary>
+		internal Rectangle TextContentBounds
+		{
+			get {return m_TextContentBounds;}
+			set {m_TextContentBounds=value;}
+		}
+
+		/// <summary>
+		/// Gets the relative bounds of the image inside of cell.
+		/// </summary>
+		[Browsable(false)]
+		internal Rectangle ImageBoundsRelative
+		{
+			get
+			{
+				return m_ImageBounds;			
+			}
+		}
+		
+		/// <summary>
+		/// Gets the bounds of the image inside of cell.
+		/// </summary>
+		[Browsable(false)]
+		public Rectangle ImageBounds
+		{
+			get
+			{
+				TreeGX tree=this.TreeControl;
+				if(tree!=null)
+				{
+					return NodeDisplay.GetCellRectangle(eCellRectanglePart.ImageBounds, this, tree.NodeDisplay.Offset);
+				}
+				return Rectangle.Empty;			
+			}
+		}
+
+		/// <summary>
+		/// Sets the bounds of the image inside of the cell.
+		/// </summary>
+		/// <param name="bounds">New cell bounds.</param>
+		internal void SetImageBounds(Rectangle bounds)
+		{
+			m_ImageBounds=bounds;
+		}
+
+		/// <summary>
+		/// Gets the bounds of the image inside of cell.
+		/// </summary>
+		[Browsable(false)]
+		internal Rectangle CheckBoxBoundsRelative
+		{
+			get
+			{
+				return m_CheckBoxBounds;			
+			}
+		}
+		
+		/// <summary>
+		/// Gets the bounds of the image inside of cell.
+		/// </summary>
+		[Browsable(false)]
+		internal Rectangle CheckBoxBounds
+		{
+			get
+			{
+				TreeGX tree=this.TreeControl;
+				if(tree!=null)
+				{
+					return NodeDisplay.GetCellRectangle(eCellRectanglePart.CheckBoxBounds, this, tree.NodeDisplay.Offset);
+				}
+				return Rectangle.Empty;			
+			}
+		}
+
+		/// <summary>
+		/// Sets the bounds of the check box inside of the cell.
+		/// </summary>
+		/// <param name="bounds">New cell bounds.</param>
+		internal void SetCheckBoxBounds(Rectangle bounds)
+		{
+			m_CheckBoxBounds=bounds;
+		}
+
+		/// <summary>
+		/// Gets a value indicating whether the cell is in an editable state. true if the cell is in editable state; otherwise, false.
+		/// </summary>
+		[Browsable(false)]
+		public bool IsEditing
+		{
+			get
+			{
+				return false;
+			}
+		}
+
+		/// <summary>
+		/// Gets a value indicating whether the cell is in the selected state. true if the cell is in the selected state; otherwise, false.
+		/// </summary>
+		[Browsable(false)]
+		public bool IsSelected
+		{
+			get
+			{
+				return m_Selected;
+			}
+		}
+
+		internal void SetSelected(bool selected)
+		{
+			m_Selected=selected;
+		}
+
+		/// <summary>
+		/// Gets a value indicating whether the cell is visible. Cell is considered to be visible when it's Bounds are within the display rectangle of tree.
+		/// </summary>
+		[Browsable(false)]
+		public bool IsVisible
+		{
+			get
+			{
+				return m_Visible;
+			}
+		}
+
+		/// <summary>
+		/// Sets whether cells is visible or not. This is set by node layout manager and it is based on column visibility.
+		/// </summary>
+		/// <param name="visible">True if visible otherwise false.</param>
+		internal void SetVisible(bool visible)
+		{
+			if(m_Visible!=visible)
+			{
+				m_Visible=visible;
+				OnVisibleChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets the parent node of the current cell.
+		/// </summary>
+		[Browsable(false)]
+		public Node Parent
+		{
+			get
+			{
+				return m_Parent;
+			}
+		}
+
+		/// <summary>
+		/// Sets the parent of the cell.
+		/// </summary>
+		/// <param name="parent">Parent node.</param>
+		internal void SetParent(Node parent)
+		{
+			m_Parent=parent;
+		}
+
+		/// <summary>
+		/// Gets or sets the object that contains data about the cell. Any Object derived type can be assigned to this property. If this property is being set through the Windows Forms designer, only text can be assigned.
+		/// </summary>
+		[Browsable(false),DefaultValue(null),Category("Data"),Description("Indicates text that contains data about the cell.")]
+		public object Tag
+		{
+			get
+			{
+				return m_Tag;
+			}
+			set
+			{
+				m_Tag=value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the object that contains data about the cell. Any Object derived type can be assigned to this property. If this property is being set through the Windows Forms designer, only text can be assigned.
+		/// </summary>
+		[Browsable(true),DefaultValue(""),Category("Data"),Description("Indicates text that contains data about the cell."),DevCoSerialize()]
+		public string TagString
+		{
+			get
+			{
+				if(m_Tag==null)
+					return "";
+				return m_Tag.ToString();
+			}
+			set
+			{
+				m_Tag=value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the text displayed in the cell.
+		/// </summary>
+		[Browsable(true),DefaultValue(""),Category("Appearance"),Localizable(true),Description("Indicates text displayed in the cell."), DevCoSerialize()]
+		public string Text
+		{
+			get
+			{
+				return m_Text;
+			}
+			set
+			{
+				if(m_Text!=value)
+				{
+					m_Text=value;
+					OnTextChanged();
+					this.OnSizeChanged();
+				}
+			}
+		}
+		
+		/// <summary>
+		/// Occurs after text has changed.
+		/// </summary>
+		protected virtual void OnTextChanged()
+		{
+			MarkupTextChanged();
+		}
+
+		/// <summary>
+		/// Gets the parent tree control that the cell belongs to.
+		/// </summary>
+		[Browsable(false)]
+		public TreeGX TreeControl
+		{
+			get
+			{
+				if(this.Parent!=null)
+					return this.Parent.TreeControl;
+				return null;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the style class assigned to the cell. Null value indicates that
+		/// default style is used as specified on cell's parent.
+		/// </summary>
+		/// <value>
+		/// Reference to the style assigned to the cell or null (VB Nothing) indicating that default
+		/// style setting from tree control is applied. Default value is null.
+		/// </value>
+		/// <remarks>
+		/// When property is set to null (VB Nothing) the style setting from parent tree
+		/// controls is used. CellStyleNormal on TreeGX control is a root style for a cell.
+		/// </remarks>
+		/// <seealso cref="StyleDisabled">StyleDisabled Property</seealso>
+		/// <seealso cref="StyleMouseDown">StyleMouseDown Property</seealso>
+		/// <seealso cref="StyleMouseOver">StyleMouseOver Property</seealso>
+		/// <seealso cref="StyleSelected">StyleSelected Property</seealso>
+		[Browsable(true),DefaultValue(null),Category("Style"),Editor(typeof(Design.ElementStyleTypeEditor),typeof(System.Drawing.Design.UITypeEditor)),Description("Indicates the style class assigned to the cell.")]
+		public ElementStyle StyleNormal
+		{
+			get {return m_StyleNormal;}
+			set
+			{
+				m_StyleNormal=value;
+			}
+		}
+		
+		/// <summary>
+		/// Gets or sets the style name used by cell. This member is provided for internal use only. To set or get the style use StyleNormal property instead.
+		/// </summary>
+		[Browsable(false), DefaultValue(""), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), EditorBrowsable(EditorBrowsableState.Never) , DevCoSerialize()]
+		public string StyleNormalName
+		{
+			get
+			{
+				if(m_StyleNormal!=null)
+					return m_StyleNormal.Name;
+				return "";
+			}
+			set
+			{
+				if(value.Length==0)
+				{
+					TypeDescriptor.GetProperties(this)["StyleNormal"].SetValue(this, null);
+					return;
+				}
+				
+				TreeGX tree=this.TreeControl;
+				if(tree!=null)
+				{
+					TypeDescriptor.GetProperties(this)["StyleNormal"].SetValue(this, tree.Styles[value]);
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the style class that is to when cell is selected. Null value indicates that
+		/// default style is used as specified on cell's parent.
+		/// </summary>
+		/// <value>
+		/// Reference to the style assigned to the cell or null value indicating that default
+		/// style setting from tree control is applied. Default is null value.
+		/// </value>
+		/// <remarks>
+		/// When property is set to null value the style setting from parent tree
+		/// controls is used. CellStyleSelected on TreeGX control is a root style for a cell.
+		/// </remarks>
+		/// <seealso cref="StyleNormal">StyleNormal Property</seealso>
+		/// <seealso cref="StyleDisabled">StyleDisabled Property</seealso>
+		/// <seealso cref="StyleMouseDown">StyleMouseDown Property</seealso>
+		/// <seealso cref="StyleMouseOver">StyleMouseOver Property</seealso>
+		[Browsable(true),DefaultValue(null),Category("Style"),Editor(typeof(Design.ElementStyleTypeEditor),typeof(System.Drawing.Design.UITypeEditor)),Description("Indicates the style class assigned to the cell.")]
+		public ElementStyle StyleSelected
+		{
+			get {return m_StyleSelected;}
+			set
+			{
+				m_StyleSelected=value;
+			}
+		}
+		
+		/// <summary>
+		/// Gets or sets the selected style name used by cell. This member is provided for internal use only. To set or get the style use StyleSelected property instead.
+		/// </summary>
+		[Browsable(false), DefaultValue(""), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), EditorBrowsable(EditorBrowsableState.Never) , DevCoSerialize()]
+		public string StyleSelectedName
+		{
+			get
+			{
+				if(m_StyleSelected!=null)
+					return m_StyleSelected.Name;
+				return "";
+			}
+			set
+			{
+				if(value.Length==0)
+				{
+					TypeDescriptor.GetProperties(this)["StyleSelected"].SetValue(this, null);
+					return;
+				}
+				
+				TreeGX tree=this.TreeControl;
+				if(tree!=null)
+				{
+					TypeDescriptor.GetProperties(this)["StyleSelected"].SetValue(this, tree.Styles[value]);
+				}
+			}
+		}
+
+
+		/// <summary>
+		/// Gets or sets the disabled style class assigned to the cell. Null value indicates
+		/// that default style is used as specified on cell's parent.
+		/// </summary>
+		/// <value>
+		/// Reference to the style assigned to the cell or null value indicating that default
+		/// style setting from tree control is applied. Default value is null.
+		/// </value>
+		/// <remarks>
+		/// When property is set to null value the style setting from parent tree
+		/// controls is used. CellStyleDisabled on TreeGX control is a root style for a
+		/// cell.
+		/// </remarks>
+		/// <seealso cref="StyleNormal">StyleNormal Property</seealso>
+		/// <seealso cref="StyleMouseDown">StyleMouseDown Property</seealso>
+		/// <seealso cref="StyleMouseOver">StyleMouseOver Property</seealso>
+		/// <seealso cref="StyleSelected">StyleSelected Property</seealso>
+		[Browsable(true),DefaultValue(null),Category("Style"),Editor(typeof(Design.ElementStyleTypeEditor),typeof(System.Drawing.Design.UITypeEditor)),Description("Indicates the disabled style class assigned to the cell.")]
+		public ElementStyle StyleDisabled
+		{
+			get {return m_StyleDisabled;}
+			set
+			{
+				m_StyleDisabled=value;
+			}
+		}
+		
+		/// <summary>
+		/// Gets or sets the disabled style name used by cell. This member is provided for internal use only. To set or get the style use StyleDisabled property instead.
+		/// </summary>
+		[Browsable(false), DefaultValue(""), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), EditorBrowsable(EditorBrowsableState.Never) , DevCoSerialize()]
+		public string StyleDisabledName
+		{
+			get
+			{
+				if(m_StyleDisabled!=null)
+					return m_StyleDisabled.Name;
+				return "";
+			}
+			set
+			{
+				if(value.Length==0)
+				{
+					TypeDescriptor.GetProperties(this)["StyleDisabled"].SetValue(this, null);
+					return;
+				}
+				
+				TreeGX tree=this.TreeControl;
+				if(tree!=null)
+				{
+					TypeDescriptor.GetProperties(this)["StyleDisabled"].SetValue(this, tree.Styles[value]);
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the style class assigned to the cell which is applied when mouse
+		/// button is pressed while mouse is over the cell. Null value indicates that default
+		/// style is used as specified on cell's parent.
+		/// </summary>
+		/// <value>
+		/// Reference to the style assigned to the cell or null value indicating that default
+		/// style setting from tree control is applied. Default value is null.
+		/// </value>
+		/// <remarks>
+		/// When property is set to null value style setting from parent tree
+		/// controls is used. CellStyleMouseDown on TreeGX control is a root style for a
+		/// cell.
+		/// </remarks>
+		/// <seealso cref="StyleNormal">StyleNormal Property</seealso>
+		/// <seealso cref="StyleDisabled">StyleDisabled Property</seealso>
+		/// <seealso cref="StyleMouseOver">StyleMouseOver Property</seealso>
+		/// <seealso cref="StyleSelected">StyleSelected Property</seealso>
+		[Browsable(true),DefaultValue(null),Category("Style"),Editor(typeof(Design.ElementStyleTypeEditor),typeof(System.Drawing.Design.UITypeEditor)),Description("Indicates the style class assigned to the cell when mouse is down.")]
+		public ElementStyle StyleMouseDown
+		{
+			get {return m_StyleMouseDown;}
+			set
+			{
+				m_StyleMouseDown=value;
+			}
+		}
+		
+		/// <summary>
+		/// Gets or sets the mouse down style name used by cell. This member is provided for internal use only. To set or get the style use StyleMouseDown property instead.
+		/// </summary>
+		[Browsable(false), DefaultValue(""), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), EditorBrowsable(EditorBrowsableState.Never) , DevCoSerialize()]
+		public string StyleMouseDownName
+		{
+			get
+			{
+				if(m_StyleMouseDown!=null)
+					return m_StyleMouseDown.Name;
+				return "";
+			}
+			set
+			{
+				if(value.Length==0)
+				{
+					TypeDescriptor.GetProperties(this)["StyleMouseDown"].SetValue(this, null);
+					return;
+				}
+				
+				TreeGX tree=this.TreeControl;
+				if(tree!=null)
+				{
+					TypeDescriptor.GetProperties(this)["StyleMouseDown"].SetValue(this, tree.Styles[value]);
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the style class assigned to the cell which is applied when mouse is
+		/// over the cell. Null value indicates that default style is used as specified on cell's
+		/// parent.
+		/// </summary>
+		/// <value>
+		/// Reference to the style assigned to the cell or null value indicating that default
+		/// style setting from tree control is applied. Default value is null.
+		/// </value>
+		/// <remarks>
+		/// When property is set to null value the style setting from parent tree
+		/// controls is used. CellStyleMouseOver on TreeGX control is a root style for a
+		/// cell.
+		/// </remarks>
+		/// <seealso cref="StyleNormal">StyleNormal Property</seealso>
+		/// <seealso cref="StyleDisabled">StyleDisabled Property</seealso>
+		/// <seealso cref="StyleMouseDown">StyleMouseDown Property</seealso>
+		/// <seealso cref="StyleSelected">StyleSelected Property</seealso>
+		[Browsable(true),DefaultValue(""),Category("Style"),Editor(typeof(Design.ElementStyleTypeEditor),typeof(System.Drawing.Design.UITypeEditor)),Description("Indicates the style class assigned to the cell when mouse is over the cell.")]
+		public ElementStyle StyleMouseOver
+		{
+			get {return m_StyleMouseOver;}
+			set
+			{
+				m_StyleMouseOver=value;
+			}
+		}
+		
+		/// <summary>
+		/// Gets or sets the mouse over style name used by cell. This member is provided for internal use only. To set or get the style use StyleMouseOver property instead.
+		/// </summary>
+		[Browsable(false), DefaultValue(""), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), EditorBrowsable(EditorBrowsableState.Never) , DevCoSerialize()]
+		public string StyleMouseOverName
+		{
+			get
+			{
+				if(m_StyleMouseOver!=null)
+					return m_StyleMouseOver.Name;
+				return "";
+			}
+			set
+			{
+				if(value.Length==0)
+				{
+					TypeDescriptor.GetProperties(this)["StyleMouseOver"].SetValue(this, null);
+					return;
+				}
+				
+				TreeGX tree=this.TreeControl;
+				if(tree!=null)
+				{
+					TypeDescriptor.GetProperties(this)["StyleMouseOver"].SetValue(this, tree.Styles[value]);
+				}
+			}
+		}
+
+
+		/// <summary>
+		/// Gets or sets whether cell is enabled or not.
+		/// </summary>
+		[Browsable(true),DefaultValue(true),Category("Behavior"),Description("Gets or sets whether cell is enabled or not."),DevCoSerialize()]
+		public bool Enabled
+		{
+			get {return m_Enabled;}
+			set
+			{
+				m_Enabled=value;
+			}
+		}
+
+		/// <summary>
+		/// Gets the reference to images associated with this cell.
+		/// </summary>
+		[Browsable(true),Category("Images"),Description("Gets the reference to images associated with this cell."),DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+		public CellImages Images
+		{
+			get {return m_Images;}
+		}
+		/// <summary>
+		/// Sets the Images to the new CellImages object.
+		/// </summary>
+		/// <param name="ci">CellImages object.</param>
+		internal void SetCellImages(CellImages ci)
+		{
+			m_Images=ci;
+			m_Images.Parent=this;
+		}
+		/// <summary>
+		/// Returns whether Images property should be serialized. Used internally for windows forms designer support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		internal bool ShouldSerializeImages()
+		{
+			return m_Images.ShouldSerialize;
+		}
+
+		/// <summary>
+		/// Gets or sets the image alignment in relation to the text displayed by cell.
+		/// </summary>
+		[Browsable(true),Category("Image Properties"),DefaultValue(eCellPartAlignment.NearCenter),Description("Gets or sets the image alignment in relation to the text displayed by cell."),DevCoSerialize()]
+		public eCellPartAlignment ImageAlignment
+		{
+			get
+			{
+				return m_ImageAlignment;
+			}
+			set
+			{
+				if(m_ImageAlignment!=value)
+				{
+					m_ImageAlignment=value;
+					this.OnAppearanceChanged();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the checkbox alignment in relation to the text displayed by cell.
+		/// </summary>
+		[Browsable(true),Category("Check-box Properties"),DefaultValue(eCellPartAlignment.NearCenter),Description("Indicates checkbox alignment in relation to the text displayed by cell.")]
+		public eCellPartAlignment CheckBoxAlignment
+		{
+			get
+			{
+				return m_CheckBoxAlignment;
+			}
+			set
+			{
+				if(m_CheckBoxAlignment!=value)
+				{
+					m_CheckBoxAlignment=value;
+					this.OnAppearanceChanged();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets whether check box is visible inside the cell.
+		/// </summary>
+		[Browsable(true),Category("Check-box Properties"),DefaultValue(false),Description("Indicates whether check box is visible inside the cell."),DevCoSerialize()]
+		public bool CheckBoxVisible
+		{
+			get
+			{
+				return m_CheckBoxVisible;
+			}
+			set
+			{
+				if(m_CheckBoxVisible!=value)
+				{
+					m_CheckBoxVisible=value;
+					this.OnAppearanceChanged();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or set a value indicating whether the check box is in the checked state.
+		/// </summary>
+		[Browsable(true),Category("Check-box Properties"),DefaultValue(false),Description("Indicates whether the check box is in the checked state."),DevCoSerialize()]
+		public bool Checked
+		{
+			get {return m_Checked;}
+			set
+			{
+				if(m_Checked!=value)
+				{
+					m_Checked=value;
+					this.OnAppearanceChanged();
+					InvokeAfterCheck();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets whether mouse is over the cell.
+		/// </summary>
+		[Browsable(false)]
+		public bool IsMouseOver
+		{
+			get{return m_MouseOver;}
+		}
+		/// <summary>
+		/// Sets the mouse over flag.
+		/// </summary>
+		/// <param name="over">true if mouse is over the cell otherwise false.</param>
+		internal void SetMouseOver(bool over)
+		{
+			m_MouseOver=over;
+		}
+
+		/// <summary>
+		/// Gets whether left mouse button is pressed while over the cell.
+		/// </summary>
+		[Browsable(false)]
+		public bool IsMouseDown
+		{
+			get{return m_MouseDown;}
+		}
+		/// <summary>
+		/// Sets the mouse down flag.
+		/// </summary>
+		/// <param name="over">true if left mouse button is pressed while over the cell otherwise false.</param>
+		internal void SetMouseDown(bool over)
+		{
+			m_MouseDown=over;
+		}
+
+		/// <summary>
+		/// Gets or sets the layout of the cell parts like check box, image and text. Layout can be horizontal (default)
+		/// where parts of the cell are positioned next to each other horizontally, or vertical where
+		/// parts of the cell are positioned on top of each other vertically.
+		/// Alignment of the each part is controlled by alignment properties.
+		/// </summary>
+		/// <seealso cref="ImageAlignment">ImageAlignment Property</seealso>
+		/// <seealso cref="CheckBoxAlignment">CheckBoxAlignment Property</seealso>
+		[Browsable(true),DefaultValue(eCellPartLayout.Default),Category("Cells"),Description("Indicates the layout of the cell parts like check box, image and text."), DevCoSerialize()]
+		public eCellPartLayout Layout
+		{
+			get {return m_Layout;}
+			set
+			{
+				if(m_Layout!=value)
+				{
+					m_Layout=value;
+					this.OnAppearanceChanged();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Specifes the mouse cursor displayed when mouse is over the cell.
+		/// </summary>
+		[Browsable(true),DefaultValue(null),Category("Appearance"),Description("Specifies the mouse cursor displayed when mouse is over the cell.")]
+		public System.Windows.Forms.Cursor Cursor
+		{
+			get
+			{
+				return m_Cursor;
+			}
+			set
+			{
+				if(m_Cursor!=value)
+				{
+					m_Cursor=value;
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets whether cell wrapped the text during the layout.
+		/// </summary>
+		internal bool WordWrap
+		{
+			get {return m_WordWrap;}
+			set {m_WordWrap=value;}
+		}
+		#endregion
+
+		#region Methods
+		/// <summary>Makes a copy of a Cell.</summary>
+		public virtual Cell Copy()
+		{
+			// TODO: Make sure that new properties are copied
+			Cell c=new Cell();
+			c.CheckBoxAlignment=this.CheckBoxAlignment;
+			c.CheckBoxVisible=this.CheckBoxVisible;
+			c.Checked=this.Checked;
+			c.Cursor=this.Cursor;
+			c.Enabled=this.Enabled;
+			c.ImageAlignment=this.ImageAlignment;
+			c.SetCellImages(this.Images.Copy());
+			c.Layout=this.Layout;
+			c.StyleDisabled=this.StyleDisabled;
+			c.StyleMouseDown=this.StyleMouseDown;
+			c.StyleMouseOver=this.StyleMouseOver;
+			c.StyleNormal=this.StyleNormal;
+			c.StyleSelected=this.StyleSelected;
+			c.Tag=this.Tag;
+			c.Text=this.Text;
+			return c;
+		}
+
+		private void OnAppearanceChanged()
+		{
+			if(this.Parent!=null)
+			{
+				this.Parent.SizeChanged=true;
+				this.Parent.OnDisplayChanged();
+			}
+		}
+
+		private void OnSizeChanged()
+		{
+			if(this.Parent!=null)
+			{
+				this.Parent.SizeChanged=true;
+				this.Parent.OnDisplayChanged();
+			}
+		}
+
+		/// <summary>
+		/// Occurs when any image property for the cell has changed.
+		/// </summary>
+		internal void OnImageChanged()
+		{
+			if(m_Parent!=null)
+				m_Parent.OnImageChanged();
+		}
+
+		/// <summary>
+		/// Invokes <see cref="TreeGX.AfterCheck">AfterCheck</see> event on TreeGX
+		/// control.
+		/// </summary>
+		protected virtual void InvokeAfterCheck()
+		{
+			TreeGX tree=this.TreeControl;
+			if(tree!=null)
+			{
+				tree.InvokeAfterCheck(new TreeGXCellEventArgs(m_ActionSource,this));
+			}
+			m_ActionSource=eTreeAction.Code;
+		}
+
+		/// <summary>
+		/// Called just before cell layout is to be performed.
+		/// </summary>
+		internal void OnLayoutCell()
+		{
+			if(m_HostedControl!=null && m_HostedControl.Parent==null)
+			{
+				AddHostedControlToTree();	
+			}
+		}
+		
+		private void AddHostedControlToTree()
+		{
+			TreeGX tree = this.TreeControl;
+			if(tree!=null)
+			{
+				tree.Controls.Add(m_HostedControl);
+				tree.HostedControlCells.Add(this);
+			}
+		}
+		
+		private void RemoveHostedControlFromTree()
+		{
+			TreeGX tree = m_HostedControl.Parent as TreeGX;
+			if(tree!=null)
+			{
+				tree.Controls.Remove(m_HostedControl);
+				tree.HostedControlCells.Remove(this);
+			}
+		}
+
+		private void SetHostedControl(Control value)
+		{
+			// Note that hosted control when set is guided by the size of the text. So the TextContentBounds are actually bounds of the control.
+			if(value==this.TreeControl)
+				return;
+			
+			if(m_HostedControl!=null)
+			{
+				m_HostedControl.SizeChanged-=new EventHandler(this.HostedControlSizedChanged);
+				RemoveHostedControlFromTree();
+			}
+			
+			m_HostedControl=value;
+			if(m_HostedControl!=null)
+			{
+				m_HostedControl.SizeChanged+=new EventHandler(this.HostedControlSizedChanged);
+				TypeDescriptor.GetProperties(m_HostedControl)["Dock"].SetValue(m_HostedControl,DockStyle.None);
+				if(m_HostedControl.Parent!=null)
+					m_HostedControl.Parent.Controls.Remove(m_HostedControl);
+				
+				if(!this.DesignMode)
+					m_HostedControl.Visible = false;
+				if(this.DesignMode || this.Parent!=null && this.Parent.Site!=null && this.Parent.Site.DesignMode)
+				{
+					bool visible=GetVisible();
+					TypeDescriptor.GetProperties(m_HostedControl)["Visible"].SetValue(m_HostedControl,visible);
+				}
+				
+				AddHostedControlToTree();
+			}
+
+			OnSizeChanged();
+		}
+		private void HostedControlSizedChanged(object sender, EventArgs e)
+		{
+			if(m_IgnoreHostedControlSizeChange)
+				return;
+			if(!m_HostedControlSize.IsEmpty && m_HostedControl!=null)
+				m_HostedControlSize = m_HostedControl.Size;
+			OnSizeChanged();
+		}
+
+		internal void OnVisibleChanged()
+		{
+			if(m_HostedControl!=null)
+			{
+				TypeDescriptor.GetProperties(m_HostedControl)["Visible"].SetValue(m_HostedControl,GetVisible());
+			}
+		}
+		
+		private bool GetVisible()
+		{
+			if(m_Parent!=null && !NodeOperations.GetIsNodeVisible(m_Parent))
+				return false;
+			return m_Visible;
+		}
+		
+		internal void OnParentExpandedChanged(bool expanded)
+		{
+			if(m_HostedControl!=null && m_HostedControl.Visible != expanded)
+			{
+				bool visible=GetVisible();
+				m_HostedControl.Visible = visible;
+				if(this.DesignMode || this.Parent!=null && this.Parent.Site!=null && this.Parent.Site.DesignMode)
+					TypeDescriptor.GetProperties(m_HostedControl)["Visible"].SetValue(m_HostedControl,visible);
+			}
+		}
+		#endregion
+		
+		#region Markup Implementation
+		private TextMarkup.BodyElement m_TextMarkup = null;
+
+		private void MarkupTextChanged()
+		{
+			if (!IsMarkupSupported)
+				return;
+
+			if(m_TextMarkup!=null)
+				m_TextMarkup.HyperLinkClick -= new EventHandler(this.TextMarkupLinkClick);
+			
+			m_TextMarkup = null;
+
+			if (!TextMarkup.MarkupParser.IsMarkup(ref m_Text))
+				return;
+
+			m_TextMarkup = TextMarkup.MarkupParser.Parse(m_Text);
+
+			if(m_TextMarkup!=null)
+				m_TextMarkup.HyperLinkClick += new EventHandler(TextMarkupLinkClick);
+		}
+
+		/// <summary>
+		/// Occurs when text markup link is clicked.
+		/// </summary>
+		protected virtual void TextMarkupLinkClick(object sender, EventArgs e)
+		{
+			TextMarkup.HyperLink link = sender as TextMarkup.HyperLink;
+			
+			if(link!=null && this.Parent!=null)
+				this.Parent.InvokeMarkupLinkClick(this, new MarkupLinkClickEventArgs(link.Name, link.HRef));
+		}
+
+		/// <summary>
+		/// Gets reference to parsed markup body element if text was markup otherwise returns null.
+		/// </summary>
+		internal TextMarkup.BodyElement TextMarkupBody
+		{
+			get { return m_TextMarkup; }
+		}
+
+		/// <summary>
+		/// Gets whether item supports text markup. Default is false.
+		/// </summary>
+		protected virtual bool IsMarkupSupported
+		{
+			get { return true; }
+		}
+
+		protected internal virtual void InvokeNodeMouseMove(object sender, MouseEventArgs e)
+		{
+			if(m_TextMarkup!=null)
+				m_TextMarkup.MouseMove(sender as Control, e);
+		}
+		
+		protected internal virtual void InvokeNodeMouseDown(object sender, MouseEventArgs e)
+		{
+			if(m_TextMarkup!=null)
+				m_TextMarkup.MouseDown(sender as Control, e);
+		}
+		
+		protected internal virtual void InvokeNodeMouseUp(object sender, MouseEventArgs e)
+		{
+			if(m_TextMarkup!=null)
+				m_TextMarkup.MouseUp(sender as Control, e);
+		}
+		
+		protected internal virtual void InvokeNodeMouseLeave(object sender, EventArgs e)
+		{
+			if(m_TextMarkup!=null)
+				m_TextMarkup.MouseLeave(sender as Control);
+		}
+		
+		protected internal virtual void InvokeNodeClick(object sender, EventArgs e)
+		{
+			if(m_TextMarkup!=null)
+				m_TextMarkup.Click(sender as Control);
+		}
+		#endregion
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/Cell.resx b/PROMS/DotNetBar Source Code/TreeGX/Cell.resx
new file mode 100644
index 00000000..3f337e08
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/Cell.resx	
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<root>
+	<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+		<xsd:element name="root" msdata:IsDataSet="true">
+			<xsd:complexType>
+				<xsd:choice maxOccurs="unbounded">
+					<xsd:element name="data">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+								<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" />
+							<xsd:attribute name="type" type="xsd:string" />
+							<xsd:attribute name="mimetype" type="xsd:string" />
+						</xsd:complexType>
+					</xsd:element>
+					<xsd:element name="resheader">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" use="required" />
+						</xsd:complexType>
+					</xsd:element>
+				</xsd:choice>
+			</xsd:complexType>
+		</xsd:element>
+	</xsd:schema>
+	<resheader name="ResMimeType">
+		<value>text/microsoft-resx</value>
+	</resheader>
+	<resheader name="Version">
+		<value>1.0.0.0</value>
+	</resheader>
+	<resheader name="Reader">
+		<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+	<resheader name="Writer">
+		<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+</root>
diff --git a/PROMS/DotNetBar Source Code/TreeGX/CellCollection.cs b/PROMS/DotNetBar Source Code/TreeGX/CellCollection.cs
new file mode 100644
index 00000000..3f452a3e
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/CellCollection.cs	
@@ -0,0 +1,171 @@
+using System;
+using System.Collections;
+using System.ComponentModel;
+
+namespace DevComponents.Tree
+{
+	///<summary>
+	/// A strongly-typed collection of <see cref="Cell"/> objects.
+	///</summary>
+	public class CellCollection:CollectionBase 
+	{
+		#region Private Variables
+		private Node m_ParentNode=null;
+		#endregion
+
+		#region Internal Implementation
+		/// <summary>Creates new instance of the class.</summary>
+		public CellCollection()
+		{
+		}
+		/// <summary>
+		/// Adds new object to the collection.
+		/// </summary>
+		/// <param name="cell">Object to add.</param>
+		/// <returns>Index of newly added object.</returns>
+		public int Add(Cell cell)
+		{
+			return List.Add(cell);
+		}
+		/// <summary>
+		/// Returns reference to the object in collection based on it's index.
+		/// </summary>
+		public Cell this[int index]
+		{
+			get {return (Cell)(List[index]);}
+			set {List[index] = value;}
+		}
+
+		/// <summary>
+		/// Inserts new object into the collection.
+		/// </summary>
+		/// <param name="index">Position of the object.</param>
+		/// <param name="value">Object to insert.</param>
+		public void Insert(int index, Cell value) 
+		{
+			List.Insert(index, value);
+		}
+
+		/// <summary>
+		/// Returns index of the object inside of the collection.
+		/// </summary>
+		/// <param name="value">Reference to the object.</param>
+		/// <returns>Index of the object.</returns>
+		public int IndexOf(Cell value) 
+		{
+			return List.IndexOf(value);
+		}
+
+		/// <summary>
+		/// Returns whether collection contains specified object.
+		/// </summary>
+		/// <param name="value">Object to look for.</param>
+		/// <returns>true if object is part of the collection, otherwise false.</returns>
+		public bool Contains(Cell value) 
+		{
+			return List.Contains(value);
+		}
+
+		/// <summary>
+		/// Removes specified object from the collection.
+		/// </summary>
+		/// <param name="value"></param>
+		public void Remove(Cell value) 
+		{
+			List.Remove(value);
+		}
+
+		protected override void OnRemoveComplete(int index,object value)
+		{
+			base.OnRemoveComplete(index,value);
+			Cell cell=value as Cell;
+			cell.SetParent(null);
+			if(m_ParentNode!=null)
+				m_ParentNode.OnCellRemoved(cell);
+		}
+		protected override void OnInsertComplete(int index,object value)
+		{
+			base.OnInsertComplete(index,value);
+			Cell cell=value as Cell;
+			if(cell.Parent!=null && cell.Parent!=m_ParentNode)
+				cell.Parent.Cells.Remove(cell);
+			cell.SetParent(m_ParentNode);
+			if(m_ParentNode!=null)
+				m_ParentNode.OnCellInserted(cell);
+		}
+
+		/// <summary>
+		/// Copies collection into the specified array.
+		/// </summary>
+		/// <param name="array">Array to copy collection to.</param>
+		/// <param name="index">Starting index.</param>
+		public void CopyTo(Cell[] array, int index) 
+		{
+			List.CopyTo(array, index);
+		}
+
+		/// <summary>
+		/// Copies contained items to the Cell array.
+		/// </summary>
+		/// <param name="array">Array to copy to.</param>
+		internal void CopyTo(Cell[] array)
+		{
+			List.CopyTo(array,0);
+		}
+
+		protected override void OnClear()
+		{
+			base.OnClear();
+		}
+
+		/// <summary>
+		/// Gets or sets the node this collection is associated with.
+		/// </summary>
+		[Browsable(false),DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public Node ParentNode
+		{
+			get {return m_ParentNode;}
+		}
+		/// <summary>
+		/// Sets the node collection belongs to.
+		/// </summary>
+		/// <param name="parent">Cell that is parent of this collection.</param>
+		internal void SetParentNode(Node parent)
+		{
+			m_ParentNode=parent;
+		}
+		#endregion
+	}
+
+	#region CellCollectionEditor
+	/// <summary>
+	/// Support for Cell tabs design-time editor.
+	/// </summary>
+	public class CellCollectionEditor:System.ComponentModel.Design.CollectionEditor
+	{
+		/// <summary>Creates new instance of cell collection editor.</summary>
+		/// <param name="type">Type to initialize editor with.</param>
+		public CellCollectionEditor(Type type):base(type)
+		{
+		}
+		protected override Type CreateCollectionItemType()
+		{
+			return typeof(Cell);
+		}
+		protected override Type[] CreateNewItemTypes()
+		{
+			return new Type[] {typeof(Cell)};
+		}
+		protected override object CreateInstance(Type itemType)
+		{
+			object item=base.CreateInstance(itemType);
+			if(item is Cell)
+			{
+				Cell cell=item as Cell;
+				cell.Text=cell.Name;
+			}
+			return item;
+		}
+	}
+	#endregion
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/CellEditEventArgs.cs b/PROMS/DotNetBar Source Code/TreeGX/CellEditEventArgs.cs
new file mode 100644
index 00000000..fcc8efb2
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/CellEditEventArgs.cs	
@@ -0,0 +1,44 @@
+using System;
+
+namespace DevComponents.Tree
+{
+	/// <summary>
+	/// Represents event arguments for cell editing events.
+	/// </summary>
+	public class CellEditEventArgs
+	{
+		/// <summary>
+		/// Indicates the action that caused the event.
+		/// </summary>
+		public eTreeAction Action=eTreeAction.Code;
+		/// <summary>
+		/// Indicates the cell that is affected.
+		/// </summary>
+		public DevComponents.Tree.Cell Cell=null;
+		/// <summary>
+		/// Indicates new text that will be assigned to the cell if one is appropriate for given event.
+		/// </summary>
+		public string NewText="";
+
+		/// <summary>
+		/// Indicates whether the current action is cancelled. For BeforeCellEdit event setting this
+		/// property to true will cancel the editing. For AfterCellEdit event setting this property to
+		/// true will cancel any changes made to the text and edits will not be accepted. For CellEditEnding
+		/// event setting this property to true will keep the cell in edit mode.
+		/// </summary>
+		public bool Cancel=false;
+
+		/// <summary>
+		/// Initializes new instance of CellEditEventArgs class.
+		/// </summary>
+		/// <param name="cell">Reference to Cell this event is raised for.</param>
+		/// <param name="action">Indicates the action that caused the event.</param>
+		/// <param name="newText">Indicates new text of the cell if it applies to given event.</param>
+		public CellEditEventArgs(Cell cell, eTreeAction action, string newText)
+		{
+			this.Action=action;
+			this.Cell=cell;
+			this.NewText=newText;
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/CellImages.cs b/PROMS/DotNetBar Source Code/TreeGX/CellImages.cs
new file mode 100644
index 00000000..bf37271d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/CellImages.cs	
@@ -0,0 +1,375 @@
+using System;
+using System.Drawing;
+using System.ComponentModel;
+
+namespace DevComponents.Tree
+{
+	/// <summary>
+	/// Represents class that holds images for a cell.
+	/// </summary>
+	/// <remarks>
+	/// If you plan to use alpha-blended images we recommend using PNG-24 format which
+	/// supports alpha-blending. As of this writting .NET Framework 1.0 and 1.1 do not support
+	/// alpha-blending when used through Image class.
+	/// </remarks>
+	[ToolboxItem(false), TypeConverter(typeof(System.ComponentModel.ExpandableObjectConverter))]
+	public class CellImages
+	{
+		// Image variables
+		private System.Drawing.Image m_Image=null;
+		private int m_ImageIndex=-1; // Image index if image from ImageList is used
+		private System.Drawing.Image m_ImageMouseOver=null;
+		private int m_ImageMouseOverIndex=-1; // Image index if image from ImageList is used
+//		private System.Drawing.Image m_ImageDisabled=null;
+//		private bool m_DisabledImageCustom=false;
+//		private int m_ImageDisabledIndex=-1; // Image index if image from ImageList is used
+		private System.Drawing.Image m_ImageExpanded=null;
+		private int m_ImageExpandedIndex=-1;
+		private Cell m_ParentCell=null;
+		private Size m_LargestImageSize=Size.Empty;
+
+		/// <summary>
+		/// Initializes new instance of CellImages class.
+		/// </summary>
+		/// <param name="parentCell">Reference to parent cell.</param>
+		public CellImages(Cell parentCell)
+		{
+			m_ParentCell=parentCell;
+		}
+
+		#region Properties
+
+		/// <summary>
+		/// Gets or sets default cell image. Setting this property to valid image will
+		/// override any setting of ImageIndex property.
+		/// </summary>
+		/// <remarks>
+		/// 	<para>The image set through this property will be serialized with the cell. If you
+		///     plan to use ImageList then use <see cref="ImageIndex">ImageIndex</see>
+		///     property.</para>
+		/// 	<para>
+		/// 		<para>If you plan to use alpha-blended images we recommend using PNG-24 format
+		///         which supports alpha-blending. As of this writting .NET Framework 1.0 and 1.1
+		///         do not support alpha-blending when used through Image class.</para>
+		/// 	</para>
+		/// </remarks>
+		/// <value>Image object or <strong>null (Nothing)</strong> if no image is assigned.</value>
+		[Browsable(true),DefaultValue(null),Category("Images"),Description("Indicates default cell image"), DevCoSerialize()]
+		public System.Drawing.Image Image
+		{
+			get {return m_Image;}
+			set
+			{
+				m_Image=value;
+				this.OnImageChanged();
+			}
+		}
+
+		/// <summary>
+		/// Resets Image property to it's default value (null, VB nothing).
+		/// </summary>
+		public void ResetImage()
+		{
+			TypeDescriptor.GetProperties(this)["Image"].SetValue(this, null);
+		}
+
+		/// <summary>
+		/// Gets or sets the image that is displayed when mouse is over the cell. Setting
+		/// this property to valid image will override any setting of ImageMouseOverIndex
+		/// property.
+		/// </summary>
+		/// <remarks>
+		/// If you plan to use alpha-blended images we recommend using PNG-24 format which
+		/// supports alpha-blending. As of this writting .NET Framework 1.0 and 1.1 do not support
+		/// alpha-blending when used through Image class.
+		/// </remarks>
+		[Browsable(true),DefaultValue(null),Category("Images"),Description("Indicates cell image when mouse is over the cell"), DevCoSerialize()]
+		public System.Drawing.Image ImageMouseOver
+		{
+			get {return m_ImageMouseOver;}
+			set
+			{
+				m_ImageMouseOver=value;
+				this.OnImageChanged();
+			}
+		}
+
+		/// <summary>
+		/// Resets ImageMouseOver to it's default value (null, VB nothing).
+		/// </summary>
+		public void ResetImageMouseOver()
+		{
+			TypeDescriptor.GetProperties(this)["ImageMouseOver"].SetValue(this, null);
+		}
+
+//		/// <summary>
+//		/// Gets or sets the image that is displayed when cell is disabled. If not assigned
+//		/// disabled image is created from default cell image. Setting this property to valid image
+//		/// will override any setting of ImageDisabledIndex property.
+//		/// </summary>
+//		/// <remarks>
+//		/// If you plan to use alpha-blended images we recommend using PNG-24 format which
+//		/// supports alpha-blending. As of this writting .NET Framework 1.0 and 1.1 do not support
+//		/// alpha-blending when used through Image class.
+//		/// </remarks>
+//		[Browsable(true),DefaultValue(null),Category("Images"),Description("Indicates disabled cell image")]
+//		public System.Drawing.Image ImageDisabled
+//		{
+//			get {return m_ImageDisabled;}
+//			set
+//			{
+//				m_ImageDisabled=value;
+//				this.OnImageChanged();
+//			}
+//		}
+//
+//		/// <summary>
+//		/// Resets ImageDisabled to it's default value (null, VB nothing).
+//		/// </summary>
+//		public void ResetImageDisabled()
+//		{
+//			this.ImageDisabled=null;
+//		}
+
+		/// <summary>
+		/// Gets or sets image that is displayed when Node that this cell belongs to is
+		/// expanded. Setting this property to valid image will override any setting of
+		/// ImageExpandedIndex property.
+		/// </summary>
+		/// <remarks>
+		/// If you plan to use alpha-blended images we recommend using PNG-24 format which
+		/// supports alpha-blending. As of this writting .NET Framework 1.0 and 1.1 do not support
+		/// alpha-blending when used through Image class.
+		/// </remarks>
+        [Browsable(true),DefaultValue(null),Category("Images"),Description("Indicates cell image when node associtaed with this cell is expanded"), DevCoSerialize()]
+		public System.Drawing.Image ImageExpanded
+		{
+			get {return m_ImageExpanded;}
+			set
+			{
+				m_ImageExpanded=value;
+				this.OnImageChanged();
+			}
+		}
+
+		/// <summary>
+		/// Resets ImageExpanded to it's default value (null, VB nothing).
+		/// </summary>
+		public void ResetImageExpanded()
+		{
+			TypeDescriptor.GetProperties(this)["ImageExpanded"].SetValue(this, null);
+		}
+
+		/// <summary>
+		/// Gets or sets the Index of default cell image from ImageList specified on TreeGX
+		/// control.
+		/// </summary>
+		/// <remarks>
+		/// If you plan to use alpha-blended images we recommend using PNG-24 format which
+		/// supports alpha-blending. As of this writting .NET Framework 1.0 and 1.1 do not support
+		/// alpha-blending when used through Image class.
+		/// </remarks>
+		[Browsable(true),DefaultValue(-1),Category("ImageList Images"),Description("Indicates default cell image"), DevCoSerialize()]
+		public int ImageIndex
+		{
+			get {return m_ImageIndex;}
+			set
+			{
+				m_ImageIndex=value;
+				this.OnImageChanged();
+			}
+		}
+
+		/// <summary>
+		/// Property Editor support for ImageIndex selection
+		/// </summary>
+		[System.ComponentModel.Browsable(false),System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+		public System.Windows.Forms.ImageList ImageList
+		{
+			get
+			{
+				if(this.Parent!=null)
+				{
+					TreeGX tree=this.Parent.TreeControl;
+					if(tree!=null)
+					{
+						return tree.ImageList;
+					}
+				}
+
+				return null;
+			}
+		}
+
+		/// <remarks>
+		/// If you plan to use alpha-blended images we recommend using PNG-24 format which
+		/// supports alpha-blending. As of this writting .NET Framework 1.0 and 1.1 do not support
+		/// alpha-blending when used through Image class.
+		/// </remarks>
+		/// <summary>
+		/// Gets or sets the Index of cell image when mouse is over the cell from ImageList
+		/// specified on TreeGX control.
+		/// </summary>
+		[Browsable(true),DefaultValue(-1),Category("ImageList Images"),Description("Indicates cell image when mouse is over the cell"), DevCoSerialize()]
+		public int ImageMouseOverIndex
+		{
+			get {return m_ImageMouseOverIndex;}
+			set
+			{
+				m_ImageMouseOverIndex=value;
+				this.OnImageChanged();
+			}
+		}
+
+//		/// <remarks>
+//		/// If you plan to use alpha-blended images we recommend using PNG-24 format which
+//		/// supports alpha-blending. As of this writting .NET Framework 1.0 and 1.1 do not support
+//		/// alpha-blending when used through Image class.
+//		/// </remarks>
+//		/// <summary>
+//		/// Gets or sets the Index of disabled cell image from ImageList specified on TreeGX
+//		/// control.
+//		/// </summary>
+//		[Browsable(true),DefaultValue(-1),Category("ImageList Images"),Description("Indicates disabled cell image")]
+//		public int ImageDisabledIndex
+//		{
+//			get {return m_ImageDisabledIndex;}
+//			set
+//			{
+//				m_ImageDisabledIndex=value;
+//				this.OnImageChanged();
+//			}
+//		}
+
+		/// <remarks>
+		/// If you plan to use alpha-blended images we recommend using PNG-24 format which
+		/// supports alpha-blending. As of this writting .NET Framework 1.0 and 1.1 do not support
+		/// alpha-blending when used through Image class.
+		/// </remarks>
+		/// <summary>
+		/// Gets or sets the Index of cell image from ImageList specified on TreeGX control
+		/// that is used when Node associated with this cell is expanded
+		/// </summary>
+		[Browsable(true),DefaultValue(-1),Category("ImageList Images"),Description("Indicates expanded cell image"), DevCoSerialize()]
+		public int ImageExpandedIndex
+		{
+			get {return m_ImageExpandedIndex;}
+			set
+			{
+				m_ImageExpandedIndex=value;
+				this.OnImageChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the parent node of the cell.
+		/// </summary>
+		[Browsable(false),DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public Cell Parent
+		{
+			get {return m_ParentCell;}
+			set {m_ParentCell=value;}
+		}
+
+		/// <summary>
+		/// Gets whether CellImages object should be serialized or not. If object has all
+		/// default values then this property will return <strong>false</strong>.
+		/// </summary>
+		internal bool ShouldSerialize
+		{
+			get
+			{
+				if(m_Image==null && /*m_ImageDisabled==null && m_ImageDisabledIndex==-1 &&*/
+					m_ImageExpanded==null && m_ImageExpandedIndex==-1 && m_ImageIndex==-1 &&
+					m_ImageMouseOver==null && m_ImageMouseOverIndex==-1)
+					return false;
+				return true;
+			}
+		}
+
+		/// <summary>
+		/// Returns largest image size in this set of images.
+		/// </summary>
+		internal Size LargestImageSize
+		{
+			get
+			{
+				return m_LargestImageSize;
+			}
+		}
+
+		#endregion
+
+		#region Methods
+
+		/// <summary>Makes a copy of a CellImages object.</summary>
+		public virtual CellImages Copy()
+		{
+			CellImages ci=new CellImages(null);
+			ci.Image=this.Image;
+//			ci.ImageDisabled=this.ImageDisabled;
+//			ci.ImageDisabledIndex=this.ImageDisabledIndex;
+			ci.ImageExpanded=this.ImageExpanded;
+			ci.ImageExpandedIndex=this.ImageExpandedIndex;
+			ci.ImageIndex=this.ImageIndex;
+			ci.ImageMouseOver=this.ImageMouseOver;
+			ci.ImageMouseOverIndex=this.ImageMouseOverIndex;
+			return ci;
+		}
+
+		#endregion
+
+		#region Internals
+		private void OnImageChanged()
+		{
+			RefreshLargestImageSize();
+			if(this.Parent!=null)
+				this.Parent.OnImageChanged();
+		}
+
+		private void RefreshLargestImageSize()
+		{
+			m_LargestImageSize=Size.Empty;
+			AdjustSize(m_Image,ref m_LargestImageSize);
+//			AdjustSize(m_ImageDisabled,ref m_LargestImageSize);
+			AdjustSize(m_ImageExpanded,ref m_LargestImageSize);
+			AdjustSize(m_ImageMouseOver,ref m_LargestImageSize);
+			AdjustSize(GetImageByIndex(m_ImageIndex),ref m_LargestImageSize);
+//			AdjustSize(GetImageByIndex(m_ImageDisabledIndex),ref m_LargestImageSize);
+			AdjustSize(GetImageByIndex(m_ImageExpandedIndex),ref m_LargestImageSize);
+			AdjustSize(GetImageByIndex(m_ImageMouseOverIndex),ref m_LargestImageSize);
+            if (m_ImageIndex >= 0 && m_LargestImageSize.IsEmpty)
+            {
+                if (this.Parent != null && this.Parent.TreeControl != null && this.Parent.TreeControl.ImageList != null)
+                    m_LargestImageSize = this.Parent.TreeControl.ImageList.ImageSize;
+            }
+		}
+		private void AdjustSize(System.Drawing.Image image, ref Size size)
+		{
+			if(image!=null)
+			{
+				if(image.Width>size.Width)
+					size.Width=image.Width;
+				if(image.Height>size.Height)
+					size.Height=image.Height;
+			}
+		}
+		/// <summary>
+		/// Returns image from image list based on the image index.
+		/// </summary>
+		/// <param name="imageIndex">Index of the image to return.</param>
+		/// <returns>Image object from image list.</returns>
+		internal System.Drawing.Image GetImageByIndex(int imageIndex)
+		{
+			if(imageIndex>=0 && this.Parent!=null && this.Parent.TreeControl!=null && this.Parent.TreeControl.ImageList!=null)
+			{
+                if (this.Parent.TreeControl.ImageList.Images.Count > imageIndex)
+                    return this.Parent.TreeControl.ImageList.Images[imageIndex];
+                return null;
+			}
+			else
+				return null;
+		}
+		#endregion
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/ColorFunctions.cs b/PROMS/DotNetBar Source Code/TreeGX/ColorFunctions.cs
new file mode 100644
index 00000000..e7a23ba1
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/ColorFunctions.cs	
@@ -0,0 +1,472 @@
+using System;
+using System.Drawing;
+
+namespace DevComponents.Tree
+{
+    /// <summary>
+    /// Represents the class that provides color support to ColorScheme object.
+    /// </summary>
+    internal class ColorFunctions
+    {
+		#region Private Variables
+		private static Color m_HoverBackColor;
+		private static Color m_HoverBackColor2;
+		private static Color m_HoverBackColor3;
+		private static Color m_CheckBoxBackColor;
+		private static Color m_MenuBackColor;
+		private static Color m_MenuFocusBorderColor;
+		private static Color m_PressedBackColor;
+		private static Color m_ToolMenuFocusBackColor;
+		private static Color m_SideRecentlyBackColor;
+		private static Color m_RecentlyUsedOfficeBackColor;
+		private static bool m_ThemedOS=false;
+		private static Bitmap m_PushedBrushBmp=null;
+		#endregion
+
+		#region Win32 Interop
+		[System.Runtime.InteropServices.StructLayout(System.Runtime.InteropServices.LayoutKind.Sequential)]
+			public struct OSVERSIONINFO 
+		{
+			public int dwOSVersionInfoSize;
+			public int dwMajorVersion;
+			public int dwMinorVersion;
+			public int dwBuildNumber;
+			public int dwPlatformId;
+			[System.Runtime.InteropServices.MarshalAs(System.Runtime.InteropServices.UnmanagedType.ByValTStr, SizeConst=128)]
+			public string szCSDVersion;
+		}
+		[System.Runtime.InteropServices.DllImport("kernel32.Dll")] private static extern short GetVersionEx(ref OSVERSIONINFO o);
+		[System.Runtime.InteropServices.DllImport("gdi32")]
+		private static extern int CreateDC(string lpszDriver, int lpszDevice, int lpszOutput, int lpInitData);
+		[System.Runtime.InteropServices.DllImport("gdi32")]
+		private static extern bool DeleteDC(int hDC);
+		[System.Runtime.InteropServices.DllImport("gdi32",SetLastError=true, CharSet=System.Runtime.InteropServices.CharSet.Auto)]
+		private static extern int GetDeviceCaps(int hdc, int nIndex);
+		private const int BITSPIXEL = 12; // Number of bits per pixel
+
+		#endregion
+
+		public static void Initialize()
+		{
+			OnDisplayChange();
+			OSVERSIONINFO os = new OSVERSIONINFO();
+			os.dwOSVersionInfoSize=System.Runtime.InteropServices.Marshal.SizeOf(typeof(OSVERSIONINFO)); 
+			GetVersionEx(ref os);
+			if(os.dwMajorVersion>=5 && os.dwMinorVersion>=1 && os.dwPlatformId==2)
+				m_ThemedOS=System.Windows.Forms.OSFeature.Feature.IsPresent(System.Windows.Forms.OSFeature.Themes);
+
+			RefreshColors();
+		}
+
+		public static void RefreshColors()
+		{
+			if(ColorDepth>=16)
+			{
+				int red=(int)((System.Drawing.SystemColors.Highlight.R-System.Drawing.SystemColors.Window.R)*.30+System.Drawing.SystemColors.Window.R);
+				int green=(int)((System.Drawing.SystemColors.Highlight.G-System.Drawing.SystemColors.Window.G)*.30+System.Drawing.SystemColors.Window.G);
+				int blue=(int)((System.Drawing.SystemColors.Highlight.B-System.Drawing.SystemColors.Window.B)*.30+System.Drawing.SystemColors.Window.B);
+				m_HoverBackColor=Color.FromArgb(red,green,blue);
+
+				red=(int)((System.Drawing.SystemColors.Highlight.R-System.Drawing.SystemColors.Window.R)*.45+System.Drawing.SystemColors.Window.R);
+				green=(int)((System.Drawing.SystemColors.Highlight.G-System.Drawing.SystemColors.Window.G)*.45+System.Drawing.SystemColors.Window.G);
+				blue=(int)((System.Drawing.SystemColors.Highlight.B-System.Drawing.SystemColors.Window.B)*.45+System.Drawing.SystemColors.Window.B);
+				m_HoverBackColor2=Color.FromArgb(red,green,blue);
+
+				red=(int)((System.Drawing.SystemColors.Highlight.R-System.Drawing.SystemColors.Window.R)*.10+System.Drawing.SystemColors.Window.R);
+				green=(int)((System.Drawing.SystemColors.Highlight.G-System.Drawing.SystemColors.Window.G)*.10+System.Drawing.SystemColors.Window.G);
+				blue=(int)((System.Drawing.SystemColors.Highlight.B-System.Drawing.SystemColors.Window.B)*.10+System.Drawing.SystemColors.Window.B);
+				m_HoverBackColor3=Color.FromArgb(red,green,blue);
+
+				red=(int)((System.Drawing.SystemColors.Highlight.R-System.Drawing.SystemColors.Window.R)*.25+System.Drawing.SystemColors.Window.R);
+				green=(int)((System.Drawing.SystemColors.Highlight.G-System.Drawing.SystemColors.Window.G)*.25+System.Drawing.SystemColors.Window.G);
+				blue=(int)((System.Drawing.SystemColors.Highlight.B-System.Drawing.SystemColors.Window.B)*.25+System.Drawing.SystemColors.Window.B);
+				m_CheckBoxBackColor=Color.FromArgb(red,green,blue);
+
+				if(ColorDepth<=16)
+				{
+					m_MenuBackColor=System.Drawing.SystemColors.ControlLightLight;
+				}
+				else
+				{
+					red=(int)((System.Drawing.SystemColors.Control.R-System.Drawing.Color.White.R)*.20+System.Drawing.Color.White.R);
+					green=(int)((System.Drawing.SystemColors.Control.G-System.Drawing.Color.White.G)*.20+System.Drawing.Color.White.G);
+					blue=(int)((System.Drawing.SystemColors.Control.B-System.Drawing.Color.White.B)*.20+System.Drawing.Color.White.B);
+					m_MenuBackColor=Color.FromArgb(red,green,blue);
+				}
+
+				red=(int)(System.Drawing.SystemColors.ControlDark.R*.80);
+				green=(int)(System.Drawing.SystemColors.ControlDark.G*.80);
+				blue=(int)(System.Drawing.SystemColors.ControlDark.B*.80);
+				m_MenuFocusBorderColor=Color.FromArgb(red,green,blue);
+
+				// and Highlight color
+				red=(int)((System.Drawing.SystemColors.Highlight.R-System.Drawing.SystemColors.Window.R)*.25+System.Drawing.SystemColors.Window.R);
+				green=(int)((System.Drawing.SystemColors.Highlight.G-System.Drawing.SystemColors.Window.G)*.25+System.Drawing.SystemColors.Window.G);
+				blue=(int)((System.Drawing.SystemColors.Highlight.B-System.Drawing.SystemColors.Window.B)*.25+System.Drawing.SystemColors.Window.B);
+				m_PressedBackColor=Color.FromArgb(red,green,blue);
+
+				red=(int)((System.Drawing.SystemColors.Control.R-System.Drawing.Color.White.R)*.80+System.Drawing.Color.White.R);
+				green=(int)((System.Drawing.SystemColors.Control.G-System.Drawing.Color.White.G)*.80+System.Drawing.Color.White.G);
+				blue=(int)((System.Drawing.SystemColors.Control.B-System.Drawing.Color.White.B)*.80+System.Drawing.Color.White.B);
+				m_ToolMenuFocusBackColor=Color.FromArgb(red,green,blue);
+
+				red=(int)((System.Drawing.SystemColors.Control.R-System.Drawing.Color.White.R)*.50+System.Drawing.Color.White.R);
+				green=(int)((System.Drawing.SystemColors.Control.G-System.Drawing.Color.White.G)*.50+System.Drawing.Color.White.G);
+				blue=(int)((System.Drawing.SystemColors.Control.B-System.Drawing.Color.White.B)*.50+System.Drawing.Color.White.B);
+				m_RecentlyUsedOfficeBackColor=Color.FromArgb(red,green,blue);
+
+				m_SideRecentlyBackColor=System.Drawing.SystemColors.Control;
+			}
+			else
+			{
+                m_HoverBackColor=System.Drawing.SystemColors.ControlLightLight;
+				m_HoverBackColor2=m_HoverBackColor;
+				m_HoverBackColor3=m_HoverBackColor;
+                m_CheckBoxBackColor=System.Drawing.SystemColors.ControlLight;
+				m_MenuBackColor=System.Drawing.SystemColors.ControlLightLight;
+                m_MenuFocusBorderColor=System.Drawing.SystemColors.ControlDark;
+				m_PressedBackColor=System.Drawing.SystemColors.ControlLight;
+                m_ToolMenuFocusBackColor=System.Drawing.SystemColors.ControlLight;
+				m_RecentlyUsedOfficeBackColor=System.Drawing.SystemColors.ControlLight;
+                m_SideRecentlyBackColor=System.Drawing.SystemColors.Control;
+			}
+
+			if(m_PushedBrushBmp!=null)
+			{
+				m_PushedBrushBmp.Dispose();
+				m_PushedBrushBmp=new System.Drawing.Bitmap(2,2);
+				m_PushedBrushBmp.SetPixel(0,0,System.Drawing.SystemColors.Control);
+				m_PushedBrushBmp.SetPixel(1,0,System.Drawing.SystemColors.ControlLightLight);
+				m_PushedBrushBmp.SetPixel(0,1,System.Drawing.SystemColors.ControlLightLight);
+				m_PushedBrushBmp.SetPixel(1,1,System.Drawing.SystemColors.Control);
+			}
+		}
+
+		public struct HLSColor
+		{
+			public double Hue;
+			public double Lightness;
+			public double Saturation;
+		}
+		public struct RGBColor
+		{
+			public int Red;
+			public int Green;
+			public int Blue;
+		}
+		public static HLSColor RGBToHSL(int Red, int Green, int Blue)
+		{
+			double Max, Min, delta;
+			double rR, rG, rB;
+			HLSColor ret=new HLSColor();
+
+			rR = (double)Red / 255;
+			rG = (double)Green / 255;
+			rB = (double)Blue / 255;
+
+			// Given: rgb each in [0,1].
+			// Desired: h in [0,360] and s in [0,1], except if s=0, then h=UNDEFINED.}
+			Max = Maximum(rR, rG, rB);
+			Min = Minimum(rR, rG, rB);
+			ret.Lightness = (Max + Min) / 2;    // {This is the lightness}
+			// {Next calculate saturation}
+			
+			if(Max == Min)
+			{
+				// begin {Acrhomatic case}
+			    ret.Saturation = 0;
+			    ret.Hue = 0;
+			    // end {Acrhomatic case}	
+			}
+			else
+			{
+                // begin {Chromatic case}
+			    // {First calculate the saturation.}
+                if(ret.Lightness <= 0.5)
+			         ret.Saturation = (Max - Min) / (Max + Min);
+			    else
+			         ret.Saturation = (Max - Min) / (2 - Max - Min);
+			    // {Next calculate the hue.}
+			    delta = Max - Min;
+			    if(rR == Max)
+					ret.Hue = (rG - rB) / delta;		//{Resulting color is between yellow and magenta}
+			    else if(rG == Max)
+					ret.Hue = 2 + (rB - rR) / delta;	// {Resulting color is between cyan and yellow}
+				else if(rB == Max)
+					ret.Hue = 4 + (rR - rG) / delta;	// {Resulting color is between magenta and cyan}
+			}
+			return ret;
+		}
+
+		public static HLSColor RGBToHSL(RGBColor clr)
+		{
+			return RGBToHSL(clr.Red,clr.Green,clr.Blue);
+		}
+
+		private static double Maximum(double rR, double rG, double rB)
+		{
+			double ret=0;
+			if(rR > rG)
+			{			
+			   if(rR > rB)
+			      ret = rR;
+			   else
+			      ret = rB;
+			}
+			else
+			{
+			   if(rB > rG)
+			      ret = rB;
+			   else
+			      ret = rG;
+			}
+			return ret;
+		}
+
+		private static double Minimum(double rR, double rG, double rB)
+		{
+			double ret=0;
+			if(rR < rG)
+			{
+			   if(rR < rB)
+			      ret = rR;
+			   else
+			      ret = rB;
+			}
+			else
+			{
+			   if(rB < rG)
+			      ret = rB;
+			   else
+			      ret = rG;
+			}
+			return ret;
+		}
+
+		public static RGBColor HLSToRGB(double Hue, double Lightness, double Saturation)
+		{
+			double rR, rG, rB;
+			double Min, Max;
+			RGBColor ret=new RGBColor();
+
+			if(Saturation == 0)
+			{
+				// Achromatic case:
+				rR = Lightness;
+                rG = Lightness;
+				rB = Lightness;	
+			}
+			else
+			{
+                // Chromatic case:
+                // delta = Max-Min
+				if(Lightness <= 0.5)
+				{
+					Min = Lightness * (1 - Saturation);
+				}
+				else
+				{
+					Min = Lightness - Saturation * (1 - Lightness);
+				}
+				// Get the Max value:
+				Max = 2 * Lightness - Min;
+		      
+				// Now depending on sector we can evaluate the h,l,s:
+				if(Hue < 1)
+				{
+                    rR = Max;
+					if(Hue < 0)
+					{
+						rG = Min;
+						rB = rG - Hue * (Max - Min);
+					}
+					else
+					{
+						rB = Min;
+						rG = Hue * (Max - Min) + rB;
+					}
+				}
+				else if (Hue < 3)
+				{
+					rG = Max;
+					if(Hue < 2)
+					{
+						rB = Min;
+						rR = rB - (Hue - 2) * (Max - Min);
+					}
+					else
+					{
+						rR = Min;
+						rB = (Hue - 2) * (Max - Min) + rR;
+					}
+				}
+				else
+				{
+					rB = Max;
+					if(Hue < 4)
+					{
+						rR = Min;
+						rG = rR - (Hue - 4) * (Max - Min);
+					}
+					else
+					{
+					   rG = Min;
+					   rR = (Hue - 4) * (Max - Min) + rG;
+					}
+				}
+			}
+			ret.Red = (int)(rR * 255);
+			ret.Green = (int)(rG * 255);
+			ret.Blue = (int)(rB * 255);
+			if(ret.Red>255)
+				ret.Red=255;
+			if(ret.Green>255)
+				ret.Green=255;
+			if(ret.Blue>255)
+				ret.Blue=255;
+			return ret;
+		}
+
+		public static RGBColor HLSToRGB(HLSColor clr)
+		{
+			return HLSToRGB(clr.Hue,clr.Lightness,clr.Saturation);
+		}
+
+		public static System.Drawing.Color HoverBackColor()
+		{
+			return m_HoverBackColor;
+		}
+
+		public static System.Drawing.Color HoverBackColor2()
+		{
+			return m_HoverBackColor2;
+		}
+
+		public static System.Drawing.Color HoverBackColor3()
+		{
+			return m_HoverBackColor3;
+		}
+
+		public static System.Drawing.Color HoverBackColor(System.Drawing.Graphics g)
+		{
+			return g.GetNearestColor(HoverBackColor());
+		}
+
+		public static System.Drawing.Color PressedBackColor()
+		{
+			return m_PressedBackColor;
+		}
+
+		public static System.Drawing.Color PressedBackColor(System.Drawing.Graphics g)
+		{
+			return g.GetNearestColor(PressedBackColor());
+		}
+
+		public static System.Drawing.Color CheckBoxBackColor()
+		{
+			return m_CheckBoxBackColor;
+		}
+
+		public static System.Drawing.Color CheckBoxBackColor(System.Drawing.Graphics g)
+		{
+			return g.GetNearestColor(CheckBoxBackColor());
+		}
+
+		public static System.Drawing.Color ToolMenuFocusBackColor()
+		{
+			return m_ToolMenuFocusBackColor;
+		}
+
+		public static System.Drawing.Color RecentlyUsedOfficeBackColor()
+		{
+			return m_RecentlyUsedOfficeBackColor;
+		}
+
+		public static System.Drawing.Color RecentlyUsedOfficeBackColor(System.Drawing.Graphics g)
+		{
+			return g.GetNearestColor(RecentlyUsedOfficeBackColor());
+		}
+
+		public static System.Drawing.Color SideRecentlyBackColor(System.Drawing.Graphics g)
+		{
+			return g.GetNearestColor(SideRecentlyBackColor());
+		}
+
+		public static System.Drawing.Color SideRecentlyBackColor()
+		{
+			return m_SideRecentlyBackColor;
+		}
+
+		public static System.Drawing.Color ToolMenuFocusBackColor(System.Drawing.Graphics g)
+		{
+			return g.GetNearestColor(ToolMenuFocusBackColor());
+		}
+
+		public static System.Drawing.Color MenuFocusBorderColor()
+		{
+			return m_MenuFocusBorderColor;
+		}
+
+		public static System.Drawing.Color MenuFocusBorderColor(System.Drawing.Graphics g)
+		{
+			return g.GetNearestColor(MenuFocusBorderColor());
+		}
+
+		public static System.Drawing.Color MenuBackColor()
+		{
+			return m_MenuBackColor;
+		}
+
+		public static System.Drawing.Color MenuBackColor(System.Drawing.Graphics g)
+		{
+			return g.GetNearestColor(MenuBackColor());
+		}
+
+		public static System.Drawing.TextureBrush GetPushedBrush()
+		{
+			if(m_PushedBrushBmp==null)
+			{
+				m_PushedBrushBmp=new System.Drawing.Bitmap(2,2);
+				m_PushedBrushBmp.SetPixel(0,0,System.Drawing.SystemColors.Control);
+				m_PushedBrushBmp.SetPixel(1,0,System.Drawing.SystemColors.ControlLightLight);
+				m_PushedBrushBmp.SetPixel(0,1,System.Drawing.SystemColors.ControlLightLight);
+				m_PushedBrushBmp.SetPixel(1,1,System.Drawing.SystemColors.Control);
+			}
+			return (new System.Drawing.TextureBrush(m_PushedBrushBmp));
+		}
+
+		public static bool ThemedOS
+		{
+			get{return m_ThemedOS;}
+			set{m_ThemedOS=value;}
+		}
+
+		public static eWinXPColorScheme WinXPColorScheme
+		{
+			get
+			{
+				eWinXPColorScheme c=eWinXPColorScheme.Undetermined;
+				if(ThemedOS && ColorDepth>=16)
+				{
+					if(SystemColors.Control.ToArgb()==Color.FromArgb(236,233,216).ToArgb() && SystemColors.Highlight.ToArgb()==Color.FromArgb(49,106,197).ToArgb())
+						c=eWinXPColorScheme.Blue;
+					else if(SystemColors.Control.ToArgb()==Color.FromArgb(224,223,227).ToArgb() && SystemColors.Highlight.ToArgb()==Color.FromArgb(178,180,191).ToArgb())
+						c=eWinXPColorScheme.Silver;
+					else if(SystemColors.Control.ToArgb()==Color.FromArgb(236,233,216).ToArgb() && SystemColors.Highlight.ToArgb()==Color.FromArgb(147,160,112).ToArgb())
+						c=eWinXPColorScheme.OliveGreen;
+				}
+
+				return c;
+			}
+		}
+
+		public static int ColorDepth=0;
+
+		internal static void OnDisplayChange()
+		{
+			int hdc = CreateDC("DISPLAY", 0, 0, 0);
+			ColorDepth = GetDeviceCaps(hdc, BITSPIXEL);
+			DeleteDC(hdc);
+		}
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/ColorPicker.cs b/PROMS/DotNetBar Source Code/TreeGX/ColorPicker.cs
new file mode 100644
index 00000000..659465a2
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/ColorPicker.cs	
@@ -0,0 +1,658 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Reflection;
+using System.Windows.Forms;
+
+namespace DevComponents.UI
+{
+	/// <summary>
+	/// Provides popup color picker.
+	/// </summary>
+	[ToolboxItem(false)]
+	internal class ColorPicker : UserControl
+	{
+		#region Private Variables
+		private Color[] m_CustomColors=new Color[48];
+		private Rectangle[] m_CustomColorsPos=new Rectangle[48];
+		private object m_ColorScheme=null;
+		private string m_TransText="";
+
+		private TabControl tabControl1;
+		private TabPage tabPage1;
+		private TabPage tabPage2;
+		private TabPage tabPage3;
+		private TabPage tabPage4;
+		private Label label1;
+		private ListBox listScheme;
+		private Button btnOK;
+		private Button btnCancel;
+		private Panel colorPanel;
+		private ListBox listSystem;
+		private ListBox listWeb;
+
+		private Color m_SelectedColor=Color.Empty;
+		private string m_SelectedColorSchemeName="";
+		private Panel colorPreview;
+		private TrackBar transparencyTrack;
+
+		private bool m_Canceled=false;
+		private System.Windows.Forms.Design.IWindowsFormsEditorService m_EditorService=null;
+		/// <summary> 
+		/// Required designer variable.
+		/// </summary>
+		private Container components = null;
+		#endregion
+
+		#region Constructor and Dispose
+		public ColorPicker()
+		{
+			// This call is required by the Windows.Forms Form Designer.
+			InitializeComponent();
+
+			InitCustomColors();
+			InitOtherColors();
+			m_TransText=label1.Text;
+		}
+
+		/// <summary> 
+		/// Clean up any resources being used.
+		/// </summary>
+		protected override void Dispose( bool disposing )
+		{
+			if( disposing )
+			{
+				if(components != null)
+				{
+					components.Dispose();
+				}
+			}
+			base.Dispose( disposing );
+		}
+		#endregion
+
+		#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.tabControl1 = new System.Windows.Forms.TabControl();
+			this.tabPage1 = new System.Windows.Forms.TabPage();
+			this.listScheme = new System.Windows.Forms.ListBox();
+			this.tabPage2 = new System.Windows.Forms.TabPage();
+			this.listSystem = new System.Windows.Forms.ListBox();
+			this.tabPage3 = new System.Windows.Forms.TabPage();
+			this.listWeb = new System.Windows.Forms.ListBox();
+			this.tabPage4 = new System.Windows.Forms.TabPage();
+			this.colorPanel = new System.Windows.Forms.Panel();
+			this.transparencyTrack = new System.Windows.Forms.TrackBar();
+			this.label1 = new System.Windows.Forms.Label();
+			this.colorPreview = new System.Windows.Forms.Panel();
+			this.btnOK = new System.Windows.Forms.Button();
+			this.btnCancel = new System.Windows.Forms.Button();
+			this.tabControl1.SuspendLayout();
+			this.tabPage1.SuspendLayout();
+			this.tabPage2.SuspendLayout();
+			this.tabPage3.SuspendLayout();
+			this.tabPage4.SuspendLayout();
+			((System.ComponentModel.ISupportInitialize)(this.transparencyTrack)).BeginInit();
+			this.SuspendLayout();
+			// 
+			// tabControl1
+			// 
+			this.tabControl1.Controls.Add(this.tabPage1);
+			this.tabControl1.Controls.Add(this.tabPage2);
+			this.tabControl1.Controls.Add(this.tabPage3);
+			this.tabControl1.Controls.Add(this.tabPage4);
+			this.tabControl1.Location = new System.Drawing.Point(1, 1);
+			this.tabControl1.Name = "tabControl1";
+			this.tabControl1.SelectedIndex = 0;
+			this.tabControl1.Size = new System.Drawing.Size(208, 192);
+			this.tabControl1.TabIndex = 0;
+			this.tabControl1.SelectedIndexChanged += new System.EventHandler(this.tabControl1_SelectedIndexChanged);
+			// 
+			// tabPage1
+			// 
+			this.tabPage1.Controls.Add(this.listScheme);
+			this.tabPage1.Location = new System.Drawing.Point(4, 22);
+			this.tabPage1.Name = "tabPage1";
+			this.tabPage1.Size = new System.Drawing.Size(200, 166);
+			this.tabPage1.TabIndex = 0;
+			this.tabPage1.Text = "Scheme";
+			// 
+			// listScheme
+			// 
+			this.listScheme.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.listScheme.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed;
+			this.listScheme.IntegralHeight = false;
+			this.listScheme.Location = new System.Drawing.Point(0, 0);
+			this.listScheme.Name = "listScheme";
+			this.listScheme.Size = new System.Drawing.Size(200, 166);
+			this.listScheme.TabIndex = 0;
+			this.listScheme.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.DrawColorItem);
+			this.listScheme.SelectedIndexChanged += new System.EventHandler(this.ListSelectionChange);
+			// 
+			// tabPage2
+			// 
+			this.tabPage2.Controls.Add(this.listSystem);
+			this.tabPage2.Location = new System.Drawing.Point(4, 22);
+			this.tabPage2.Name = "tabPage2";
+			this.tabPage2.Size = new System.Drawing.Size(200, 166);
+			this.tabPage2.TabIndex = 1;
+			this.tabPage2.Text = "System";
+			// 
+			// listSystem
+			// 
+			this.listSystem.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.listSystem.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed;
+			this.listSystem.IntegralHeight = false;
+			this.listSystem.Location = new System.Drawing.Point(0, 0);
+			this.listSystem.Name = "listSystem";
+			this.listSystem.Size = new System.Drawing.Size(200, 166);
+			this.listSystem.TabIndex = 1;
+			this.listSystem.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.DrawColorItem);
+			this.listSystem.SelectedIndexChanged += new System.EventHandler(this.ListSelectionChange);
+			// 
+			// tabPage3
+			// 
+			this.tabPage3.Controls.Add(this.listWeb);
+			this.tabPage3.Location = new System.Drawing.Point(4, 22);
+			this.tabPage3.Name = "tabPage3";
+			this.tabPage3.Size = new System.Drawing.Size(200, 166);
+			this.tabPage3.TabIndex = 2;
+			this.tabPage3.Text = "Web";
+			// 
+			// listWeb
+			// 
+			this.listWeb.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.listWeb.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed;
+			this.listWeb.IntegralHeight = false;
+			this.listWeb.Location = new System.Drawing.Point(0, 0);
+			this.listWeb.Name = "listWeb";
+			this.listWeb.Size = new System.Drawing.Size(200, 166);
+			this.listWeb.TabIndex = 1;
+			this.listWeb.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.DrawColorItem);
+			this.listWeb.SelectedIndexChanged += new System.EventHandler(this.ListSelectionChange);
+			// 
+			// tabPage4
+			// 
+			this.tabPage4.Controls.Add(this.colorPanel);
+			this.tabPage4.Location = new System.Drawing.Point(4, 22);
+			this.tabPage4.Name = "tabPage4";
+			this.tabPage4.Size = new System.Drawing.Size(200, 166);
+			this.tabPage4.TabIndex = 3;
+			this.tabPage4.Text = "Custom";
+			// 
+			// colorPanel
+			// 
+			this.colorPanel.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.colorPanel.Location = new System.Drawing.Point(0, 0);
+			this.colorPanel.Name = "colorPanel";
+			this.colorPanel.Size = new System.Drawing.Size(200, 166);
+			this.colorPanel.TabIndex = 0;
+			this.colorPanel.MouseUp += new System.Windows.Forms.MouseEventHandler(this.CustomColorMouseUp);
+			this.colorPanel.Paint += new System.Windows.Forms.PaintEventHandler(this.PaintCustomColors);
+			// 
+			// transparencyTrack
+			// 
+			this.transparencyTrack.Enabled = false;
+			this.transparencyTrack.Location = new System.Drawing.Point(1, 204);
+			this.transparencyTrack.Maximum = 255;
+			this.transparencyTrack.Name = "transparencyTrack";
+			this.transparencyTrack.Size = new System.Drawing.Size(200, 45);
+			this.transparencyTrack.TabIndex = 1;
+			this.transparencyTrack.TickFrequency = 16;
+			this.transparencyTrack.Value = 255;
+			this.transparencyTrack.ValueChanged += new System.EventHandler(this.transparencyTrack_ValueChanged);
+			// 
+			// label1
+			// 
+			this.label1.Location = new System.Drawing.Point(1, 194);
+			this.label1.Name = "label1";
+			this.label1.Size = new System.Drawing.Size(136, 16);
+			this.label1.TabIndex = 2;
+			this.label1.Text = "Transparency";
+			// 
+			// colorPreview
+			// 
+			this.colorPreview.BackColor = System.Drawing.Color.White;
+			this.colorPreview.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+			this.colorPreview.Location = new System.Drawing.Point(8, 240);
+			this.colorPreview.Name = "colorPreview";
+			this.colorPreview.Size = new System.Drawing.Size(40, 32);
+			this.colorPreview.TabIndex = 3;
+			this.colorPreview.Paint += new System.Windows.Forms.PaintEventHandler(this.colorPreview_Paint);
+			// 
+			// btnOK
+			// 
+			this.btnOK.FlatStyle = System.Windows.Forms.FlatStyle.System;
+			this.btnOK.Location = new System.Drawing.Point(72, 248);
+			this.btnOK.Name = "btnOK";
+			this.btnOK.Size = new System.Drawing.Size(64, 24);
+			this.btnOK.TabIndex = 4;
+			this.btnOK.Text = "OK";
+			this.btnOK.Click += new System.EventHandler(this.btnOK_Click);
+			// 
+			// btnCancel
+			// 
+			this.btnCancel.FlatStyle = System.Windows.Forms.FlatStyle.System;
+			this.btnCancel.Location = new System.Drawing.Point(142, 248);
+			this.btnCancel.Name = "btnCancel";
+			this.btnCancel.Size = new System.Drawing.Size(64, 24);
+			this.btnCancel.TabIndex = 5;
+			this.btnCancel.Text = "Cancel";
+			this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
+			// 
+			// ColorPicker
+			// 
+			this.Controls.Add(this.btnCancel);
+			this.Controls.Add(this.btnOK);
+			this.Controls.Add(this.colorPreview);
+			this.Controls.Add(this.label1);
+			this.Controls.Add(this.tabControl1);
+			this.Controls.Add(this.transparencyTrack);
+			this.DockPadding.All = 1;
+			this.Name = "ColorPicker";
+			this.Size = new System.Drawing.Size(211, 280);
+			this.Paint += new System.Windows.Forms.PaintEventHandler(this.ColorPicker_Paint);
+			this.tabControl1.ResumeLayout(false);
+			this.tabPage1.ResumeLayout(false);
+			this.tabPage2.ResumeLayout(false);
+			this.tabPage3.ResumeLayout(false);
+			this.tabPage4.ResumeLayout(false);
+			((System.ComponentModel.ISupportInitialize)(this.transparencyTrack)).EndInit();
+			this.ResumeLayout(false);
+
+		}
+		#endregion
+
+		#region Color Init
+		private void InitCustomColors()
+		{
+			m_CustomColors[0]=Color.FromArgb(255,255,255);
+			m_CustomColors[1]=Color.FromArgb(255,195,198);
+			m_CustomColors[2]=Color.FromArgb(255,227,198);
+			m_CustomColors[3]=Color.FromArgb(255,255,198);
+			m_CustomColors[4]=Color.FromArgb(198,255,198);
+			m_CustomColors[5]=Color.FromArgb(198,255,255);
+			m_CustomColors[6]=Color.FromArgb(198,195,255);
+			m_CustomColors[7]=Color.FromArgb(255,195,255);
+
+			m_CustomColors[8]=Color.FromArgb(231,227,231);
+			m_CustomColors[9]=Color.FromArgb(255,130,132);
+			m_CustomColors[10]=Color.FromArgb(255,195,132);
+			m_CustomColors[11]=Color.FromArgb(255,255,132);
+			m_CustomColors[12]=Color.FromArgb(132,255,132);
+			m_CustomColors[13]=Color.FromArgb(132,255,255);
+			m_CustomColors[14]=Color.FromArgb(132,130,255);
+			m_CustomColors[15]=Color.FromArgb(255,130,255);
+
+			m_CustomColors[16]=Color.FromArgb(198,195,198);
+			m_CustomColors[17]=Color.FromArgb(255,0,0);
+			m_CustomColors[18]=Color.FromArgb(255,130,0);
+			m_CustomColors[19]=Color.FromArgb(255,255,0);
+			m_CustomColors[20]=Color.FromArgb(0,255,0);
+			m_CustomColors[21]=Color.FromArgb(0,255,255);
+			m_CustomColors[22]=Color.FromArgb(0,0,255);
+			m_CustomColors[23]=Color.FromArgb(255,0,255);
+
+			m_CustomColors[24]=Color.FromArgb(132,130,132);
+			m_CustomColors[25]=Color.FromArgb(198,0,0);
+			m_CustomColors[26]=Color.FromArgb(198,65,0);
+			m_CustomColors[27]=Color.FromArgb(198,195,0);
+			m_CustomColors[28]=Color.FromArgb(0,195,0);
+			m_CustomColors[29]=Color.FromArgb(0,195,198);
+			m_CustomColors[30]=Color.FromArgb(0,0,198);
+			m_CustomColors[31]=Color.FromArgb(198,0,198);
+
+			m_CustomColors[32]=Color.FromArgb(66,65,66);
+			m_CustomColors[33]=Color.FromArgb(132,0,0);
+			m_CustomColors[34]=Color.FromArgb(132,65,0);
+			m_CustomColors[35]=Color.FromArgb(132,130,0);
+			m_CustomColors[36]=Color.FromArgb(0,130,0);
+			m_CustomColors[37]=Color.FromArgb(0,130,132);
+			m_CustomColors[38]=Color.FromArgb(0,0,132);
+			m_CustomColors[39]=Color.FromArgb(132,0,132);
+
+			m_CustomColors[40]=Color.FromArgb(0,0,0);
+			m_CustomColors[41]=Color.FromArgb(66,0,0);
+			m_CustomColors[42]=Color.FromArgb(132,65,66);
+			m_CustomColors[43]=Color.FromArgb(66,65,0);
+			m_CustomColors[44]=Color.FromArgb(0,65,0);
+			m_CustomColors[45]=Color.FromArgb(0,65,66);
+			m_CustomColors[46]=Color.FromArgb(0,0,66);
+			m_CustomColors[47]=Color.FromArgb(66,0,66);
+		}
+
+		private void InitOtherColors()
+		{
+			listWeb.BeginUpdate();
+			listWeb.Items.Clear();
+			Type type = typeof(Color);
+			PropertyInfo[] fields=type.GetProperties(BindingFlags.Public | BindingFlags.Static);
+			Color clr=new Color();
+			foreach(PropertyInfo pi in fields)
+				listWeb.Items.Add(pi.GetValue(clr,null));
+			listWeb.EndUpdate();
+
+			listSystem.BeginUpdate();
+			listSystem.Items.Clear();
+			type=typeof(SystemColors);
+			fields=type.GetProperties(BindingFlags.Public | BindingFlags.Static);
+			foreach(PropertyInfo pi in fields)
+				listSystem.Items.Add(pi.GetValue(clr,null));
+			listSystem.EndUpdate();
+		}
+
+		private void InitColorSchemeColors()
+		{
+			if(m_ColorScheme!=null)
+			{
+				if(!tabControl1.TabPages.Contains(tabPage1))
+				{
+					tabControl1.TabPages.Add(tabPage1);
+				}
+				listScheme.BeginUpdate();
+				listScheme.Items.Clear();
+				Type type=m_ColorScheme.GetType();
+				PropertyInfo[] fields=type.GetProperties();
+				foreach(PropertyInfo pi in fields)
+				{
+					if(pi.PropertyType==typeof(Color))
+						listScheme.Items.Add(pi.Name);
+				}
+				listScheme.EndUpdate();
+			}
+			else
+			{
+				if(tabControl1.TabPages.Contains(tabPage1))
+					tabControl1.TabPages.Remove(tabPage1);
+			}
+		}
+		#endregion
+
+		#region Public Interface
+		/// <summary>
+		/// Gets or sets the windows forms editor service. This property must be set if color picker is used with UITypeEditorEditStyle.DropDown style.
+		/// </summary>
+		public System.Windows.Forms.Design.IWindowsFormsEditorService EditorService
+		{
+			get {return m_EditorService;}
+			set {m_EditorService=value;}
+		}
+		/// <summary>
+		/// Gets or sets the ColorScheme object for Scheme colors.
+		/// </summary>
+		[Browsable(false),DefaultValue(null)]
+		public object ColorScheme
+		{
+			get {return m_ColorScheme;}
+			set
+			{
+				m_ColorScheme=value;
+				InitColorSchemeColors();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets currently selected color.
+		/// </summary>
+		public Color SelectedColor
+		{
+			get {return m_SelectedColor;}
+			set
+			{
+				m_SelectedColor=value;
+				OnSelectedColorChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets the selected color color scheme name if color scheme color is selected otherwise it returns an empty string.
+		/// </summary>
+		public string SelectedColorSchemeName
+		{
+			get {return m_SelectedColorSchemeName;}
+			set
+			{
+				m_SelectedColorSchemeName=value;
+			}
+		}
+
+		/// <summary>
+		/// Returns true if color selection was cancelled.
+		/// </summary>
+		public bool Canceled
+		{
+			get {return m_Canceled;}
+		}
+		#endregion
+
+		#region Painting
+		private void PaintCustomColors(object sender, PaintEventArgs e)
+		{
+			Rectangle r=Rectangle.Empty;
+			int x=6, y=12;
+			Graphics g=e.Graphics;
+			Border3DSide side=(Border3DSide.Left | Border3DSide.Right | Border3DSide.Top | Border3DSide.Bottom);
+			int width=colorPanel.ClientRectangle.Width;
+			int iIndex=0;
+			foreach(Color clr in m_CustomColors)
+			{
+				r=new Rectangle(x,y,21,21);
+				if(r.Right>width)
+				{
+					y+=25;
+					x=6;
+					r.X=x;
+					r.Y=y;
+				}
+				ControlPaint.DrawBorder3D(g,x,y,21,21,Border3DStyle.Sunken,side);
+				r.Inflate(-2,-2);
+				g.FillRectangle(new SolidBrush(clr),r);
+
+				m_CustomColorsPos[iIndex]=r;
+				iIndex++;
+
+				x+=24;
+			}
+		}
+
+		private void DrawColorItem(object sender, DrawItemEventArgs e)
+		{
+			Rectangle r=e.Bounds;
+			Rectangle rClr=new Rectangle(r.X+1,r.Y+2,24,r.Height-4);
+			ListBox list=sender as ListBox;
+			
+			Brush textbrush=SystemBrushes.ControlText;
+			if((e.State & DrawItemState.Selected)!=0)
+			{
+				textbrush=SystemBrushes.HighlightText;
+				e.Graphics.FillRectangle(SystemBrushes.Highlight,e.Bounds);
+			}
+			else
+				e.Graphics.FillRectangle(SystemBrushes.Window,e.Bounds);
+
+			Color clr=Color.Empty;
+			string colorName="";
+			if(list.Items[e.Index].GetType()==typeof(Color))
+			{
+				clr=(Color)list.Items[e.Index];
+				colorName=clr.Name;
+			}
+			else
+			{
+				colorName=list.Items[e.Index].ToString();
+				clr=(Color)m_ColorScheme.GetType().GetProperty(colorName).GetValue(m_ColorScheme,null);
+			}
+
+			e.Graphics.FillRectangle(new SolidBrush(clr),rClr);
+			e.Graphics.DrawRectangle(SystemPens.ControlText,rClr);
+			r.Offset(30,0);
+			r.Width-=30;
+			e.Graphics.DrawString(colorName,list.Font,textbrush,r,StringFormat.GenericTypographic);
+		}
+		#endregion
+
+		#region Internals
+
+		private void CustomColorMouseUp(object sender, MouseEventArgs e)
+		{
+			for(int i=0;i<48;i++)
+			{
+				if(m_CustomColorsPos[i].Contains(e.X,e.Y))
+				{
+					this.SelectedColor=m_CustomColors[i];
+					m_SelectedColorSchemeName="";
+					break;					
+				}
+			}
+		}
+
+		private void ListSelectionChange(object sender, EventArgs e)
+		{
+			ListBox list=sender as ListBox;
+
+			if(list.SelectedItem!=null)
+			{
+				if(list.SelectedItem is Color)
+				{
+					this.SelectedColor=(Color)list.SelectedItem;
+					m_SelectedColorSchemeName="";
+				}
+				else
+				{
+					m_SelectedColorSchemeName=list.SelectedItem.ToString();
+					this.SelectedColor=(Color)m_ColorScheme.GetType().GetProperty(this.SelectedColorSchemeName).GetValue(m_ColorScheme,null);
+				}
+			}
+			else
+			{
+				this.SelectedColor=Color.Empty;
+				m_SelectedColorSchemeName="";
+			}
+		}
+
+		private void OnSelectedColorChanged()
+		{
+			colorPreview.BackColor=m_SelectedColor;
+			transparencyTrack.Value=m_SelectedColor.A;
+			UpdateTransparencyText();
+		}
+		
+		public void UpdateUIWithSelection()
+		{
+			listSystem.SelectedIndex = -1;
+			listWeb.SelectedIndex = -1;
+			listScheme.SelectedIndex = -1;
+			if(m_SelectedColor.IsSystemColor)
+			{
+				tabControl1.SelectedTab = tabPage2;
+				SelectListBoxItem(listSystem,m_SelectedColor.Name); 
+			}
+			else if(m_SelectedColor.IsNamedColor)
+			{
+				tabControl1.SelectedTab = tabPage3;
+				SelectListBoxItem(listWeb,m_SelectedColor.Name);
+			}
+			else if(m_SelectedColorSchemeName!="")
+			{
+				tabControl1.SelectedTab = tabPage1;
+				SelectListBoxItem(listScheme,m_SelectedColorSchemeName);
+			}
+			else
+			{
+				tabControl1.SelectedTab = tabPage4;
+			}
+		}
+		
+		private void SelectListBoxItem(ListBox listBox, string item)
+		{
+			foreach(object o in listBox.Items)
+			{
+				if(o.ToString()==item)
+				{
+					listBox.SelectedItem = o;
+					return;
+				}
+			}
+		}
+
+		private void UpdateTransparencyText()
+		{
+			if(!this.SelectedColor.IsEmpty)
+			{
+				label1.Text=m_TransText + " (" + this.SelectedColor.A.ToString()+")";
+			}
+			else
+				label1.Text=m_TransText;
+		}
+
+		private void transparencyTrack_ValueChanged(object sender, EventArgs e)
+		{
+			if(!this.SelectedColor.IsEmpty && this.SelectedColor.A!=transparencyTrack.Value)
+			{
+				this.SelectedColor=Color.FromArgb(transparencyTrack.Value,this.SelectedColor);
+				m_SelectedColorSchemeName="";
+			}
+			UpdateTransparencyText();
+		}
+
+		private void colorPreview_Paint(object sender, PaintEventArgs e)
+		{
+			if(this.SelectedColor.IsEmpty)
+			{
+				Rectangle r=this.colorPreview.ClientRectangle;
+				r.Inflate(-2,-2);
+				e.Graphics.DrawLine(SystemPens.ControlText,r.X,r.Y,r.Right,r.Bottom);
+				e.Graphics.DrawLine(SystemPens.ControlText,r.Right,r.Y,r.X,r.Bottom);
+			}
+		}
+
+		private void btnOK_Click(object sender, EventArgs e)
+		{
+			this.ClosePicker();
+		}
+
+		private void btnCancel_Click(object sender, EventArgs e)
+		{
+			m_Canceled=true;
+			this.ClosePicker();
+		}
+
+		private void ClosePicker()
+		{
+			if(m_EditorService!=null)
+			{
+				m_EditorService.CloseDropDown();
+				return;
+			}
+
+			if(this.Parent!=null)
+				this.Parent.Hide();
+			else
+				this.Hide();	
+		}
+
+		private void ColorPicker_Paint(object sender, PaintEventArgs e)
+		{
+			Rectangle r=this.ClientRectangle;
+			r.Width--;
+			r.Height--;
+			e.Graphics.DrawRectangle(SystemPens.ControlDarkDark,r);
+		}
+
+		private void tabControl1_SelectedIndexChanged(object sender, System.EventArgs e)
+		{
+			if(tabControl1.SelectedIndex==0 && m_ColorScheme!=null)
+			{
+				transparencyTrack.Enabled=false;
+			}
+			else
+				transparencyTrack.Enabled=true;
+		}
+		#endregion
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/ColorPicker.resx b/PROMS/DotNetBar Source Code/TreeGX/ColorPicker.resx
new file mode 100644
index 00000000..ddae5a77
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/ColorPicker.resx	
@@ -0,0 +1,319 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 1.3
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">1.3</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1">this is my long string</data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        [base64 mime encoded serialized .NET Framework object]
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        [base64 mime encoded string representing a byte array form of the .NET Framework object]
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used forserialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>1.3</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="tabControl1.SnapToGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="tabControl1.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+  <data name="tabControl1.DrawGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+  <data name="tabControl1.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="tabControl1.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="tabControl1.GridSize" type="System.Drawing.Size, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>8, 8</value>
+  </data>
+  <data name="tabPage1.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+  <data name="tabPage1.SnapToGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="tabPage1.DrawGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+  <data name="tabPage1.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="tabPage1.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="tabPage1.GridSize" type="System.Drawing.Size, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>8, 8</value>
+  </data>
+  <data name="listScheme.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="listScheme.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="listScheme.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+  <data name="tabPage2.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+  <data name="tabPage2.SnapToGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="tabPage2.DrawGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+  <data name="tabPage2.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="tabPage2.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="tabPage2.GridSize" type="System.Drawing.Size, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>8, 8</value>
+  </data>
+  <data name="listSystem.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="listSystem.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+  <data name="listSystem.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="tabPage3.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+  <data name="tabPage3.SnapToGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="tabPage3.DrawGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+  <data name="tabPage3.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="tabPage3.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="tabPage3.GridSize" type="System.Drawing.Size, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>8, 8</value>
+  </data>
+  <data name="listWeb.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+  <data name="listWeb.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="listWeb.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="tabPage4.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+  <data name="tabPage4.SnapToGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="tabPage4.DrawGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+  <data name="tabPage4.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="tabPage4.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="tabPage4.GridSize" type="System.Drawing.Size, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>8, 8</value>
+  </data>
+  <data name="colorPanel.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+  <data name="colorPanel.SnapToGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="colorPanel.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="colorPanel.GridSize" type="System.Drawing.Size, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>8, 8</value>
+  </data>
+  <data name="colorPanel.DrawGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+  <data name="colorPanel.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="transparencyTrack.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+  <data name="transparencyTrack.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="transparencyTrack.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="label1.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+  <data name="label1.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="label1.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="colorPreview.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+  <data name="colorPreview.SnapToGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="colorPreview.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="colorPreview.GridSize" type="System.Drawing.Size, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>8, 8</value>
+  </data>
+  <data name="colorPreview.DrawGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+  <data name="colorPreview.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="btnOK.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+  <data name="btnOK.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="btnOK.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="btnCancel.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+  <data name="btnCancel.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="btnCancel.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="$this.TrayLargeIcon" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="$this.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+  <data name="$this.SnapToGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="$this.DrawGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+  <data name="$this.TrayHeight" type="System.Int32, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>80</value>
+  </data>
+  <data name="$this.Language" type="System.Globalization.CultureInfo, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>(Default)</value>
+  </data>
+  <data name="$this.Localizable" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="$this.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="$this.GridSize" type="System.Drawing.Size, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>8, 8</value>
+  </data>
+  <data name="$this.Name">
+    <value>ColorPicker</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/TreeGX/ColorScheme.cs b/PROMS/DotNetBar Source Code/TreeGX/ColorScheme.cs
new file mode 100644
index 00000000..ff153bd8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/ColorScheme.cs	
@@ -0,0 +1,4320 @@
+using System;
+using System.Drawing;
+using System.ComponentModel;
+
+namespace DevComponents.Tree
+{
+	/// <summary>
+	/// Represents the Color scheme used by items on the Bar.
+	/// </summary>
+	public class ColorScheme
+	{
+		#region Private Variables
+		private Color m_MenuBarBackground;
+		private bool m_MenuBarBackgroundCustom=false;
+
+		private Color m_MenuBarBackground2=Color.Empty;
+		private bool m_MenuBarBackground2Custom=false;
+
+		private int m_MenuBarBackgroundGradientAngle=90;
+
+		private Color m_BarBackground;
+		private bool m_BarBackgroundCustom=false;
+
+		private Color m_BarBackground2=Color.Empty;
+		private bool m_BarBackground2Custom=false;
+
+		private int m_BarBackgroundGradientAngle=90;
+
+		private Color m_BarCaptionBackground;
+		private bool m_BarCaptionBackgroundCustom=false;
+
+		private Color m_BarCaptionBackground2=Color.Empty;
+		private bool m_BarCaptionBackground2Custom=false;
+
+		private int m_BarCaptionBackgroundGradientAngle=0;
+
+		private Color m_BarCaptionText;
+		private bool m_BarCaptionTextCustom=false;
+
+		private Color m_BarCaptionInactiveBackground;
+		private bool m_BarCaptionInactiveBackgroundCustom=false;
+
+		private Color m_BarCaptionInactiveBackground2=Color.Empty;
+		private bool m_BarCaptionInactiveBackground2Custom=false;
+
+		private int m_BarCaptionInactiveBackgroundGAngle=0;
+
+		private Color m_BarCaptionInactiveText;
+		private bool m_BarCaptionInactiveTextCustom=false;
+
+		private Color m_BarPopupBackground;
+		private bool m_BarPopupBackgroundCustom=false;
+
+		private Color m_BarPopupBorder;
+		private bool m_BarPopupBorderCustom=false;
+
+		private Color m_BarDockedBorder;
+		private bool m_BarDockedBorderCustom=false;
+
+		private Color m_BarStripeColor;
+		private bool m_BarStripeColorCustom=false;
+
+		private Color m_BarFloatingBorder;
+		private bool m_BarFloatingBorderCustom=false;
+
+		private Color m_ItemBackground;
+		private bool m_ItemBackgroundCustom=false;
+
+		private Color m_ItemBackground2;
+		private bool m_ItemBackground2Custom=false;
+
+		private int m_ItemBackgroundGradientAngle=90;
+
+		private Color m_ItemText;
+		private bool m_ItemTextCustom=false;
+
+		private Color m_ItemDisabledBackground;
+		private bool m_ItemDisabledBackgroundCustom=false;
+
+		private Color m_ItemDisabledText;
+		private bool m_ItemDisabledTextCustom=false;
+
+		private Color m_ItemHotBackground;
+		private bool m_ItemHotBackgroundCustom=false;
+
+		private Color m_ItemHotBackground2=Color.Empty;
+		private bool m_ItemHotBackground2Custom=false;
+
+		private int m_ItemHotBackgroundGradientAngle=90;
+
+		private Color m_ItemHotText;
+		private bool m_ItemHotTextCustom=false;
+
+		private Color m_ItemHotBorder;
+		private bool m_ItemHotBorderCustom=false;
+
+		private Color m_ItemPressedBackground;
+		private bool m_ItemPressedBackgroundCustom=false;
+
+		private Color m_ItemPressedBackground2=Color.Empty;
+		private bool m_ItemPressedBackground2Custom=false;
+		private int m_ItemPressedBackgroundGradientAngle=90;
+
+		private Color m_ItemPressedText;
+		private bool m_ItemPressedTextCustom=false;
+
+		private Color m_ItemPressedBorder;
+		private bool m_ItemPressedBorderCustom=false;
+		
+		private Color m_ItemSeparator;
+		private bool m_ItemSeparatorCustom=false;
+
+		private Color m_ItemSeparatorShade=Color.Empty;
+		private bool m_ItemSeparatorShadeCustom=false;
+
+		private Color m_ItemExpandedBackground;
+		private bool m_ItemExpandedBackgroundCustom=false;
+
+		private Color m_ItemExpandedBackground2=Color.Empty;
+		private bool m_ItemExpandedBackground2Custom=false;
+		private int m_ItemExpandedBackgroundGradientAngle=90;
+
+		private Color m_ItemExpandedText;
+		private bool m_ItemExpandedTextCustom=false;
+
+		private Color m_ItemExpandedShadow;
+		private bool m_ItemExpandedShadowCustom=false;
+
+		private Color m_ItemExpandedBorder;
+		private bool m_ItemExpandedBorderCustom=false;
+
+		private Color m_ItemCheckedBackground;
+		private bool m_ItemCheckedBackgroundCustom=false;
+
+		private int m_ItemCheckedBackgroundGradientAngle=90;
+
+		private Color m_ItemCheckedBackground2=Color.Empty;
+		private bool m_ItemCheckedBackground2Custom=false;
+
+		private Color m_ItemCheckedBorder;
+		private bool m_ItemCheckedBorderCustom=false;
+
+		private Color m_ItemCheckedText;
+		private bool m_ItemCheckedTextCustom=false;
+
+		private Color m_MenuBorder;
+		private bool m_MenuBorderCustom=false;
+
+		private Color m_MenuBackground;
+		private bool m_MenuBackgroundCustom=false;
+
+		private Color m_MenuBackground2=Color.Empty;
+		private bool m_MenuBackground2Custom=false;
+
+		private int m_MenuBackgroundGradientAngle=0;
+
+		private Color m_MenuSide;
+		private bool m_MenuSideCustom=false;
+
+		private Color m_MenuSide2=Color.Empty;
+		private bool m_MenuSide2Custom=false;
+
+		private int m_MenuSideGradientAngle=0;
+		
+		private Color m_MenuUnusedBackground;
+		private bool m_MenuUnusedBackgroundCustom=false;
+
+		private Color m_MenuUnusedSide;
+		private bool m_MenuUnusedSideCustom=false;
+
+		private Color m_MenuUnusedSide2=Color.Empty;
+		private bool m_MenuUnusedSide2Custom=false;
+
+		private int m_MenuUnusedSideGradientAngle=0;
+
+		private Color m_ItemDesignTimeBorder;
+		private bool m_ItemDesignTimeBorderCustom=false;
+
+		private Color m_CustomizeBackground=Color.Empty;
+		private bool m_CustomizeBackgroundCustom=false;
+		private Color m_CustomizeBackground2=Color.Empty;
+		private bool m_CustomizeBackground2Custom=false;
+		private int m_CustomizeBackgroundGradientAngle=90;
+		private Color m_CustomizeText=Color.Empty;
+		private bool m_CustomizeTextCustom=false;
+
+		// Panel Colors
+		private Color m_PanelBackground=Color.Empty;
+		private bool m_PanelBackgroundCustom=false;
+
+		private Color m_PanelBackground2=Color.Empty;
+		private bool m_PanelBackground2Custom=false;
+
+		private int m_PanelBackgroundGradientAngle=90;
+
+		private Color m_PanelText=Color.Empty;
+		private bool m_PanelTextCustom=false;
+
+		private Color m_PanelBorder=Color.Empty;
+		private bool m_PanelBorderCustom=false;
+
+		private Color m_ExplorerBarBackground=Color.Empty;
+		private bool m_ExplorerBarBackgroundCustom=false;
+		private Color m_ExplorerBarBackground2=Color.Empty;
+		private bool m_ExplorerBarBackground2Custom=false;
+		private int m_ExplorerBarBackgroundGradientAngle=90;
+
+		internal bool _DesignTimeSchemeChanged=false;
+
+		private eColorSchemeStyle m_Style=eColorSchemeStyle.OfficeXP;
+
+		internal Color DockSiteBackColor=Color.Empty;
+		internal Color DockSiteBackColor2=Color.Empty;
+
+		private ePredefinedColorScheme m_PredefinedColorScheme=ePredefinedColorScheme.AutoGenerated;
+		#endregion
+
+		#region Win32 Interop
+		[System.Runtime.InteropServices.DllImport("user32")]
+		private static extern IntPtr GetDesktopWindow();
+		#endregion
+
+		#region Public Interface
+		/// <summary>
+		/// Initializes new instance of ColorScheme class.
+		/// </summary>
+		public ColorScheme()
+		{
+			Refresh(null,false);
+		}
+		/// <summary>
+		/// Initializes new instance of ColorScheme class.
+		/// </summary>
+		/// <param name="graphics">Reference to graphics object.</param>
+		public ColorScheme(System.Drawing.Graphics graphics)
+		{
+			Refresh(graphics,false);
+		}
+
+		/// <summary>
+		/// Initializes new instance of ColorScheme class.
+		/// </summary>
+		/// <param name="style">Style to initialize color scheme with.</param>
+		public ColorScheme(eColorSchemeStyle style)
+		{
+			m_Style=style;
+			Refresh(null,false);
+		}
+
+		internal eColorSchemeStyle Style
+		{
+			get {return m_Style;}
+			set
+			{
+				if(m_Style!=value)
+				{
+					m_Style=value;
+					this.Refresh();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Specifies the menu bar background color.
+		/// </summary>
+		[Browsable(true),System.ComponentModel.Category("Bar Colors"),System.ComponentModel.Description("Specifies the menu bar background color.")]
+		public Color MenuBarBackground
+		{
+			get{return m_MenuBarBackground;}
+			set
+			{
+				if(m_MenuBarBackground!=value)
+				{
+					m_MenuBarBackground=value;
+					m_MenuBarBackgroundCustom=true;
+				}
+			}
+		}
+		/// <summary>
+		/// Gets whether property should be serialized. Used by windows forms designer.
+		/// </summary>
+		/// <returns>True if property should be serialized otherwise false.</returns>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeMenuBarBackground()
+		{
+			return m_MenuBarBackgroundCustom;
+		}
+		/// <summary>
+		/// Specifies the target menu bar gradient background color.
+		/// </summary>
+		[Browsable(true),System.ComponentModel.Category("Bar Colors"),System.ComponentModel.Description("Specifies the target menu bar gradient background color.")]
+		public Color MenuBarBackground2
+		{
+			get{return m_MenuBarBackground2;}
+			set
+			{
+				if(m_MenuBarBackground2!=value)
+				{
+					m_MenuBarBackground2=value;
+					m_MenuBarBackground2Custom=true;
+				}
+			}
+		}
+		/// <summary>
+		/// Gets whether property should be serialized. Used by windows forms designer.
+		/// </summary>
+		/// <returns>True if property should be serialized otherwise false.</returns>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeMenuBarBackground2()
+		{
+			return m_MenuBarBackground2Custom;
+		}
+		/// <summary>
+		/// Specifies the gradient angle.
+		/// </summary>
+		[Browsable(true),System.ComponentModel.Category("Bar Colors"),System.ComponentModel.Description("Specifies the gradient angle."),DefaultValue(90)]
+		public int MenuBarBackgroundGradientAngle
+		{
+			get {return m_MenuBarBackgroundGradientAngle;}
+			set {m_MenuBarBackgroundGradientAngle=value;}
+		}
+		/// <summary>
+		/// Specifies the background color for the bar when floating or when docked.
+		/// </summary>
+		[Browsable(true),System.ComponentModel.Category("Bar Colors"),System.ComponentModel.Description("Specifies the background color for the bar when floating or when docked.")]
+		public Color BarBackground
+		{
+			get {return m_BarBackground;}
+			set 
+			{
+				if(m_BarBackground!=value)
+				{
+					m_BarBackground=value;
+					m_BarBackgroundCustom=true;
+				}
+			}
+		}
+		/// <summary>
+		/// Gets whether property should be serialized. Used by windows forms designer.
+		/// </summary>
+		/// <returns>True if property should be serialized otherwise false.</returns>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeBarBackground()
+		{
+			return m_BarBackgroundCustom;
+		}
+		/// <summary>
+		/// Specifies the target gradient background color for the bar when floating or when docked.
+		/// </summary>
+		[Browsable(true),System.ComponentModel.Category("Bar Colors"),System.ComponentModel.Description("Specifies the target gradient background color for the bar when floating or when docked.")]
+		public Color BarBackground2
+		{
+			get {return m_BarBackground2;}
+			set 
+			{
+				if(m_BarBackground2!=value)
+				{
+					m_BarBackground2=value;
+					m_BarBackground2Custom=true;
+				}
+			}
+		}
+		/// <summary>
+		/// Gets whether property should be serialized. Used by windows forms designer.
+		/// </summary>
+		/// <returns>True if property should be serialized otherwise false.</returns>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeBarBackground2()
+		{
+			return m_BarBackground2Custom;
+		}
+
+		/// <summary>
+		/// Specifies the gradient angle.
+		/// </summary>
+		[Browsable(true),System.ComponentModel.Category("Bar Colors"),System.ComponentModel.Description("Specifies the gradient angle."),DefaultValue(90)]
+		public int BarBackgroundGradientAngle
+		{
+			get {return m_BarBackgroundGradientAngle;}
+			set {m_BarBackgroundGradientAngle=value;}
+		}
+
+		/// <summary>
+		/// Specifies the background color for the bar Caption.
+		/// </summary>
+		[Browsable(true),System.ComponentModel.Category("Bar Colors"),System.ComponentModel.Description("Specifies the background color for the bar Caption.")]
+		public Color BarCaptionBackground
+		{
+			get{return m_BarCaptionBackground;}
+			set
+			{
+				if(m_BarCaptionBackground!=value)
+				{
+					m_BarCaptionBackground=value;
+					m_BarCaptionBackgroundCustom=true;
+				}
+			}
+		}
+		/// <summary>
+		/// Gets whether property should be serialized. Used by windows forms designer.
+		/// </summary>
+		/// <returns>True if property should be serialized otherwise false.</returns>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeBarCaptionBackground()
+		{
+			return m_BarCaptionBackgroundCustom;
+		}
+		/// <summary>
+		/// Specifies the target gradient background color for the bar Caption.
+		/// </summary>
+		[Browsable(true),System.ComponentModel.Category("Bar Colors"),System.ComponentModel.Description("Specifies the target bar gradient background color for the bar Caption.")]
+		public Color BarCaptionBackground2
+		{
+			get{return m_BarCaptionBackground2;}
+			set
+			{
+				if(m_BarCaptionBackground2!=value)
+				{
+					m_BarCaptionBackground2=value;
+					m_BarCaptionBackground2Custom=true;
+				}
+			}
+		}
+		/// <summary>
+		/// Gets whether property should be serialized. Used by windows forms designer.
+		/// </summary>
+		/// <returns>True if property should be serialized otherwise false.</returns>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeBarCaptionBackground2()
+		{
+			return m_BarCaptionBackground2Custom;
+		}
+		/// <summary>
+		/// Specifies the gradient angle.
+		/// </summary>
+		[Browsable(true),System.ComponentModel.Category("Bar Colors"),System.ComponentModel.Description("Specifies the gradient angle."),DefaultValue(0)]
+		internal int BarCaptionBackgroundGradientAngle
+		{
+			get {return m_BarCaptionBackgroundGradientAngle;}
+			set {m_BarCaptionBackgroundGradientAngle=value;}
+		}
+		/// <summary>
+		/// Specifies the color for text of the Caption.
+		/// </summary>
+		[Browsable(true),System.ComponentModel.Category("Bar Colors"),System.ComponentModel.Description("Specifies the color for text of the Caption.")]
+		public Color BarCaptionText
+		{
+			get {return m_BarCaptionText;}
+			set
+			{
+				if(m_BarCaptionText!=value)
+				{
+					m_BarCaptionText=value;
+					m_BarCaptionTextCustom=true;
+				}
+			}
+		}
+		/// <summary>
+		/// Gets whether property should be serialized. Used by windows forms designer.
+		/// </summary>
+		/// <returns>True if property should be serialized otherwise false.</returns>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeBarCaptionText()
+		{
+			return m_BarCaptionTextCustom;
+		}
+		/// <summary>
+		/// Specifies the Bar Caption inactive (lost focus) background color.
+		/// </summary>
+		[Browsable(true),System.ComponentModel.Category("Bar Colors"),System.ComponentModel.Description("Specifies the Bar Caption inactive (lost focus) background color.")]
+		public Color BarCaptionInactiveBackground
+		{
+			get {return m_BarCaptionInactiveBackground;}
+			set
+			{
+				if(m_BarCaptionInactiveBackground!=value)
+				{
+					m_BarCaptionInactiveBackground=value;
+					m_BarCaptionInactiveBackgroundCustom=true;
+				}
+			}
+		}
+		/// <summary>
+		/// Gets whether property should be serialized. Used by windows forms designer.
+		/// </summary>
+		/// <returns>True if property should be serialized otherwise false.</returns>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeBarCaptionInactiveBackground()
+		{
+			return m_BarCaptionInactiveBackgroundCustom;
+		}
+		/// <summary>
+		/// Specifies the target background gradient Bar Caption inactive (lost focus) color.
+		/// </summary>
+		[Browsable(true),System.ComponentModel.Category("Bar Colors"),System.ComponentModel.Description("Specifies the target background gradient Bar Caption inactive (lost focus) color.")]
+		public Color BarCaptionInactiveBackground2
+		{
+			get {return m_BarCaptionInactiveBackground2;}
+			set
+			{
+				if(m_BarCaptionInactiveBackground2!=value)
+				{
+					m_BarCaptionInactiveBackground2=value;
+					m_BarCaptionInactiveBackground2Custom=true;
+				}
+			}
+		}
+		/// <summary>
+		/// Gets whether property should be serialized. Used by windows forms designer.
+		/// </summary>
+		/// <returns>True if property should be serialized otherwise false.</returns>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeBarCaptionInactiveBackground2()
+		{
+			return m_BarCaptionInactiveBackground2Custom;
+		}
+		/// <summary>
+		/// Specifies the gradient angle.
+		/// </summary>
+		[Browsable(true),System.ComponentModel.Category("Bar Colors"),System.ComponentModel.Description("Specifies the gradient angle."),DefaultValue(0)]
+		internal int BarCaptionInactiveBackgroundGAngle
+		{
+			get {return m_BarCaptionInactiveBackgroundGAngle;}
+			set {m_BarCaptionInactiveBackgroundGAngle=value;}
+		}
+		/// <summary>
+		/// Specifies the Bar inactive (lost focus) text color.
+		/// </summary>
+		[Browsable(true),System.ComponentModel.Category("Bar Colors"),System.ComponentModel.Description("Specifies the Bar inactive (lost focus) text color.")]
+		public Color BarCaptionInactiveText
+		{
+			get {return m_BarCaptionInactiveText;}
+			set
+			{
+				if(m_BarCaptionInactiveText!=value)
+				{
+					m_BarCaptionInactiveText=value;
+					m_BarCaptionInactiveTextCustom=true;
+				}
+			}
+		}
+		/// <summary>
+		/// Gets whether property should be serialized. Used by windows forms designer.
+		/// </summary>
+		/// <returns>True if property should be serialized otherwise false.</returns>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeBarCaptionInactiveText()
+		{
+			return m_BarCaptionInactiveTextCustom;
+		}
+		/// <summary>
+		/// Specifies the background color for popup bars.
+		/// </summary>
+		[Browsable(true),System.ComponentModel.Category("Bar Colors"),System.ComponentModel.Description("Specifies the background color for popup bars.")]
+		public Color BarPopupBackground
+		{
+			get {return m_BarPopupBackground;}
+			set
+			{
+				if(m_BarPopupBackground!=value)
+				{
+					m_BarPopupBackground=value;
+					m_BarPopupBackgroundCustom=true;
+				}
+			}
+		}
+		/// <summary>
+		/// Gets whether property should be serialized. Used by windows forms designer.
+		/// </summary>
+		/// <returns>True if property should be serialized otherwise false.</returns>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeBarPopupBackground()
+		{
+			return m_BarPopupBackgroundCustom;
+		}
+		/// <summary>
+		/// Specifies the border color for popup bars.
+		/// </summary>
+		[Browsable(true),System.ComponentModel.Category("Bar Colors"),System.ComponentModel.Description("Specifies the border color for popup bars.")]
+		public Color BarPopupBorder
+		{
+			get {return m_BarPopupBorder;}
+			set
+			{
+				if(m_BarPopupBorder!=value)
+				{
+					m_BarPopupBorder=value;
+					m_BarPopupBorderCustom=true;
+				}
+			}
+		}
+		/// <summary>
+		/// Gets whether property should be serialized. Used by windows forms designer.
+		/// </summary>
+		/// <returns>True if property should be serialized otherwise false.</returns>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeBarPopupBorder()
+		{
+			return m_BarPopupBorderCustom;
+		}
+		/// <summary>
+		/// Specifies the border color for docked bars.
+		/// </summary>
+		[Browsable(true),System.ComponentModel.Category("Bar Colors"),System.ComponentModel.Description("Specifies the border color for docked bars.")]
+		public Color BarDockedBorder
+		{
+			get {return m_BarDockedBorder;}
+			set
+			{
+				if(m_BarDockedBorder!=value)
+				{
+					m_BarDockedBorder=value;
+					m_BarDockedBorderCustom=true;
+				}
+			}
+		}
+		/// <summary>
+		/// Gets whether property should be serialized. Used by windows forms designer.
+		/// </summary>
+		/// <returns>True if property should be serialized otherwise false.</returns>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeBarDockedBorder()
+		{
+			return m_BarDockedBorderCustom;
+		}
+		/// <summary>
+		/// Specifies the color of the grab handle stripes.
+		/// </summary>
+		[Browsable(true),System.ComponentModel.Category("Bar Colors"),System.ComponentModel.Description("Specifies the color of the grab handle stripes.")]
+		public Color BarStripeColor
+		{
+			get {return m_BarStripeColor;}
+			set
+			{
+				if(m_BarStripeColor!=value)
+				{
+					m_BarStripeColor=value;
+					m_BarStripeColorCustom=true;
+				}
+			}
+		}
+		/// <summary>
+		/// Gets whether property should be serialized. Used by windows forms designer.
+		/// </summary>
+		/// <returns>True if property should be serialized otherwise false.</returns>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeBarStripeColor()
+		{
+			return m_BarStripeColorCustom;
+		}
+		/// <summary>
+		///  Specifies the border color for floating bars.
+		/// </summary>
+		[Browsable(true),System.ComponentModel.Category("Bar Colors"),System.ComponentModel.Description("Specifies the border color for floating bars.")]
+		public Color BarFloatingBorder
+		{
+			get {return m_BarFloatingBorder;}
+			set
+			{
+				if(m_BarFloatingBorder!=value)
+				{
+					m_BarFloatingBorder=value;
+					m_BarFloatingBorderCustom=true;
+				}
+			}
+		}
+		/// <summary>
+		/// Gets whether property should be serialized. Used by windows forms designer.
+		/// </summary>
+		/// <returns>True if property should be serialized otherwise false.</returns>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeBarFloatingBorder()
+		{
+			return m_BarFloatingBorderCustom;
+		}
+		/// <summary>
+		/// Specifies the item background color.
+		/// </summary>
+		[Browsable(true),System.ComponentModel.Category("Item Colors"),System.ComponentModel.Description("Specifies the item background color.")]
+		public Color ItemBackground
+		{
+			get {return m_ItemBackground;}
+			set
+			{
+				if(m_ItemBackground!=value)
+				{
+					m_ItemBackground=value;
+					m_ItemBackgroundCustom=true;
+				}
+			}
+		}
+		/// <summary>
+		/// Gets whether property should be serialized. Used by windows forms designer.
+		/// </summary>
+		/// <returns>True if property should be serialized otherwise false.</returns>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeItemBackground()
+		{
+			return m_ItemBackgroundCustom;
+		}
+		/// <summary>
+		/// Specifies the target item background gradient color.
+		/// </summary>
+		[Browsable(true),System.ComponentModel.Category("Item Colors"),System.ComponentModel.Description("Specifies the target item background gradient color.")]
+		public Color ItemBackground2
+		{
+			get {return m_ItemBackground2;}
+			set
+			{
+				if(m_ItemBackground2!=value)
+				{
+					m_ItemBackground2=value;
+					m_ItemBackground2Custom=true;
+				}
+			}
+		}
+		/// <summary>
+		/// Gets whether property should be serialized. Used by windows forms designer.
+		/// </summary>
+		/// <returns>True if property should be serialized otherwise false.</returns>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeItemBackground2()
+		{
+			return m_ItemBackground2Custom;
+		}
+		/// <summary>
+		/// Specifies the gradient angle.
+		/// </summary>
+		[Browsable(true),System.ComponentModel.Category("Item Colors"),System.ComponentModel.Description("Specifies the gradient angle."),DefaultValue(90)]
+		public int ItemBackgroundGradientAngle
+		{
+			get {return m_ItemBackgroundGradientAngle;}
+			set {m_ItemBackgroundGradientAngle=value;}
+		}
+
+		/// <summary>
+		/// Specifies the item text color.
+		/// </summary>
+		[Browsable(true),System.ComponentModel.Category("Item Colors"),System.ComponentModel.Description("Specifies the item text color.")]
+		public Color ItemText
+		{
+			get {return m_ItemText;}
+			set
+			{
+				if(m_ItemText!=value)
+				{
+					m_ItemText=value;
+					m_ItemTextCustom=true;
+				}
+			}
+		}
+		/// <summary>
+		/// Gets whether property should be serialized. Used by windows forms designer.
+		/// </summary>
+		/// <returns>True if property should be serialized otherwise false.</returns>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeItemText()
+		{
+			return m_ItemTextCustom;
+		}
+		/// <summary>
+		/// Specifies the background color for the item that is disabled.
+		/// </summary>
+		[Browsable(true),System.ComponentModel.Category("Item Colors"),System.ComponentModel.Description("Specifies the background color for the item that is disabled.")]
+		public Color ItemDisabledBackground
+		{
+			get {return m_ItemDisabledBackground;}
+			set
+			{
+				if(m_ItemDisabledBackground!=value)
+				{
+					m_ItemDisabledBackground=value;
+					m_ItemDisabledBackgroundCustom=true;
+				}
+			}
+		}
+		/// <summary>
+		/// Gets whether property should be serialized. Used by windows forms designer.
+		/// </summary>
+		/// <returns>True if property should be serialized otherwise false.</returns>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeItemDisabledBackground()
+		{
+			return m_ItemDisabledBackgroundCustom;
+		}
+		/// <summary>
+		/// Specifies the text color for the item that is disabled.
+		/// </summary>
+		[Browsable(true),System.ComponentModel.Category("Item Colors"),System.ComponentModel.Description("Specifies the text color for the item that is disabled.")]
+		public Color ItemDisabledText
+		{
+			get {return m_ItemDisabledText;}
+			set
+			{
+				if(m_ItemDisabledText!=value)
+				{
+					m_ItemDisabledText=value;
+					m_ItemDisabledTextCustom=true;
+				}
+			}
+		}
+		/// <summary>
+		/// Gets whether property should be serialized. Used by windows forms designer.
+		/// </summary>
+		/// <returns>True if property should be serialized otherwise false.</returns>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeItemDisabledText()
+		{
+			return m_ItemDisabledTextCustom;
+		}
+		/// <summary>
+		/// Specifies the background color when mouse is over the item.
+		/// </summary>
+		[Browsable(true),System.ComponentModel.Category("Item Colors"),System.ComponentModel.Description("Specifies the background color when mouse is over the item.")]
+		public Color ItemHotBackground
+		{
+			get {return m_ItemHotBackground;}
+			set
+			{
+				if(m_ItemHotBackground!=value)
+				{
+					m_ItemHotBackground=value;
+					m_ItemHotBackgroundCustom=true;
+				}
+			}
+		}
+		/// <summary>
+		/// Gets whether property should be serialized. Used by windows forms designer.
+		/// </summary>
+		/// <returns>True if property should be serialized otherwise false.</returns>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeItemHotBackground()
+		{
+			return m_ItemHotBackgroundCustom;
+		}
+		/// <summary>
+		/// Specifies the target gradient background color when mouse is over the item.
+		/// </summary>
+		[Browsable(true),System.ComponentModel.Category("Item Colors"),System.ComponentModel.Description("Specifies the target gradient background color when mouse is over the item.")]
+		public Color ItemHotBackground2
+		{
+			get {return m_ItemHotBackground2;}
+			set
+			{
+				if(m_ItemHotBackground2!=value)
+				{
+					m_ItemHotBackground2=value;
+					m_ItemHotBackground2Custom=true;
+				}
+			}
+		}
+		/// <summary>
+		/// Gets whether property should be serialized. Used by windows forms designer.
+		/// </summary>
+		/// <returns>True if property should be serialized otherwise false.</returns>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeItemHotBackground2()
+		{
+			return m_ItemHotBackground2Custom;
+		}
+		/// <summary>
+		/// Specifies the gradient angle.
+		/// </summary>
+		[Browsable(true),System.ComponentModel.Category("Item Colors"),System.ComponentModel.Description("Specifies the gradient angle."),DefaultValue(90)]
+		public int ItemHotBackgroundGradientAngle
+		{
+			get {return m_ItemHotBackgroundGradientAngle;}
+			set {m_ItemHotBackgroundGradientAngle=value;}
+		}
+		/// <summary>
+		/// Specifies the text color when mouse is over the item.
+		/// </summary>
+		[Browsable(true),System.ComponentModel.Category("Item Colors"),System.ComponentModel.Description("Specifies the text color when mouse is over the item.")]
+		public Color ItemHotText
+		{
+			get {return m_ItemHotText;}
+			set
+			{
+				if(m_ItemHotText!=value)
+				{
+					m_ItemHotText=value;
+					m_ItemHotTextCustom=true;
+				}
+			}
+		}
+		/// <summary>
+		/// Gets whether property should be serialized. Used by windows forms designer.
+		/// </summary>
+		/// <returns>True if property should be serialized otherwise false.</returns>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeItemHotText()
+		{
+			return m_ItemHotTextCustom;
+		}
+		/// <summary>
+		/// Specifies the border color when mouse is over the item.
+		/// </summary>
+		[Browsable(true),System.ComponentModel.Category("Item Colors"),System.ComponentModel.Description("Specifies the border color when mouse is over the item.")]
+		public Color ItemHotBorder
+		{
+			get {return m_ItemHotBorder;}
+			set
+			{
+				if(m_ItemHotBorder!=value)
+				{
+					m_ItemHotBorder=value;
+					m_ItemHotBorderCustom=true;
+				}
+			}
+		}
+		/// <summary>
+		/// Gets whether property should be serialized. Used by windows forms designer.
+		/// </summary>
+		/// <returns>True if property should be serialized otherwise false.</returns>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeItemHotBorder()
+		{
+			return m_ItemHotBorderCustom;
+		}
+		/// <summary>
+		/// Specifies the background color when item is pressed.
+		/// </summary>
+		[Browsable(true),System.ComponentModel.Category("Item Colors"),System.ComponentModel.Description("Specifies the background color when item is pressed.")]
+		public Color ItemPressedBackground
+		{
+			get {return m_ItemPressedBackground;}
+			set
+			{
+				if(m_ItemPressedBackground!=value)
+				{
+					m_ItemPressedBackground=value;
+					m_ItemPressedBackgroundCustom=true;
+				}
+			}
+		}
+		/// <summary>
+		/// Gets whether property should be serialized. Used by windows forms designer.
+		/// </summary>
+		/// <returns>True if property should be serialized otherwise false.</returns>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeItemPressedBackground()
+		{
+			return m_ItemPressedBackgroundCustom;
+		}
+		/// <summary>
+		/// Specifies the target gradient background color when item is pressed.
+		/// </summary>
+		[Browsable(true),System.ComponentModel.Category("Item Colors"),System.ComponentModel.Description("Specifies the target gradient background color when item is pressed.")]
+		public Color ItemPressedBackground2
+		{
+			get {return m_ItemPressedBackground2;}
+			set
+			{
+				if(m_ItemPressedBackground2!=value)
+				{
+					m_ItemPressedBackground2=value;
+					m_ItemPressedBackground2Custom=true;
+				}
+			}
+		}
+		/// <summary>
+		/// Gets whether property should be serialized. Used by windows forms designer.
+		/// </summary>
+		/// <returns>True if property should be serialized otherwise false.</returns>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeItemPressedBackground2()
+		{
+			return m_ItemPressedBackground2Custom;
+		}
+		/// <summary>
+		/// Specifies the gradient angle.
+		/// </summary>
+		[Browsable(true),System.ComponentModel.Category("Item Colors"),System.ComponentModel.Description("Specifies the gradient angle."),DefaultValue(90)]
+		public int ItemPressedBackgroundGradientAngle
+		{
+			get {return m_ItemPressedBackgroundGradientAngle;}
+			set {m_ItemPressedBackgroundGradientAngle=value;}
+		}
+		/// <summary>
+		/// Specifies the text color when item is pressed.
+		/// </summary>
+		[Browsable(true),System.ComponentModel.Category("Item Colors"),System.ComponentModel.Description("Specifies the text color when item is pressed.")]
+		public Color ItemPressedText
+		{
+			get {return m_ItemPressedText;}
+			set
+			{
+				if(m_ItemPressedText!=value)
+				{
+					m_ItemPressedText=value;
+					m_ItemPressedTextCustom=true;
+				}
+			}
+		}
+		/// <summary>
+		/// Gets whether property should be serialized. Used by windows forms designer.
+		/// </summary>
+		/// <returns>True if property should be serialized otherwise false.</returns>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeItemPressedText()
+		{
+			return m_ItemPressedTextCustom;
+		}
+		/// <summary>
+		/// Specifies the border color when item is pressed.
+		/// </summary>
+		[Browsable(true),System.ComponentModel.Category("Item Colors"),System.ComponentModel.Description("Specifies the border color when item is pressed.")]
+		public Color ItemPressedBorder
+		{
+			get {return m_ItemPressedBorder;}
+			set
+			{
+				if(m_ItemPressedBorder!=value)
+				{
+					m_ItemPressedBorder=value;
+					m_ItemPressedBorderCustom=true;
+				}
+			}
+		}
+		/// <summary>
+		/// Gets whether property should be serialized. Used by windows forms designer.
+		/// </summary>
+		/// <returns>True if property should be serialized otherwise false.</returns>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeItemPressedBorder()
+		{
+			return m_ItemPressedBorderCustom;
+		}
+		/// <summary>
+		/// Specifies the color for the item group separator.
+		/// </summary>
+		[Browsable(true),System.ComponentModel.Category("Item Colors"),System.ComponentModel.Description("Specifies the color for the item group separator.")]
+		public Color ItemSeparator
+		{
+			get {return m_ItemSeparator;}
+			set
+			{
+				if(m_ItemSeparator!=value)
+				{
+					m_ItemSeparator=value;
+					m_ItemSeparatorCustom=true;
+				}
+			}
+		}
+		/// <summary>
+		/// Gets whether property should be serialized. Used by windows forms designer.
+		/// </summary>
+		/// <returns>True if property should be serialized otherwise false.</returns>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeItemSeparator()
+		{
+			return m_ItemSeparatorCustom;
+		}
+		/// <summary>
+		/// Specifies the color for the item group separator shade.
+		/// </summary>
+		[Browsable(true),System.ComponentModel.Category("Item Colors"),System.ComponentModel.Description("Specifies the color for the item group separator shade.")]
+		public Color ItemSeparatorShade
+		{
+			get {return m_ItemSeparatorShade;}
+			set
+			{
+				if(m_ItemSeparatorShade!=value)
+				{
+					m_ItemSeparatorShade=value;
+					m_ItemSeparatorShadeCustom=true;
+				}
+			}
+		}
+		/// <summary>
+		/// Gets whether property should be serialized. Used by windows forms designer.
+		/// </summary>
+		/// <returns>True if property should be serialized otherwise false.</returns>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeItemSeparatorShade()
+		{
+			return m_ItemSeparatorShadeCustom;
+		}
+		/// <summary>
+		/// Specifies the background color for the shadow of expanded item.
+		/// </summary>
+		[Browsable(true),System.ComponentModel.Category("Item Colors"),System.ComponentModel.Description("Specifies the background color for the shadow of expanded item.")]
+		public Color ItemExpandedShadow
+		{
+			get {return m_ItemExpandedShadow;}
+			set
+			{
+				if(m_ItemExpandedShadow!=value)
+				{
+					m_ItemExpandedShadow=value;
+					m_ItemExpandedShadowCustom=true;
+				}
+			}
+		}
+		/// <summary>
+		/// Gets whether property should be serialized. Used by windows forms designer.
+		/// </summary>
+		/// <returns>True if property should be serialized otherwise false.</returns>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeItemExpandedShadow()
+		{
+			return m_ItemExpandedShadowCustom;
+		}
+		/// <summary>
+		/// Specifies the background color for the expanded item.
+		/// </summary>
+		[Browsable(true),System.ComponentModel.Category("Item Colors"),System.ComponentModel.Description("Specifies the background color for the expanded item.")]
+		public Color ItemExpandedBackground
+		{
+			get {return m_ItemExpandedBackground;}
+			set
+			{
+				if(m_ItemExpandedBackground!=value)
+				{
+					m_ItemExpandedBackground=value;
+					m_ItemExpandedBackgroundCustom=true;
+				}
+			}
+		}
+		/// <summary>
+		/// Gets whether property should be serialized. Used by windows forms designer.
+		/// </summary>
+		/// <returns>True if property should be serialized otherwise false.</returns>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeItemExpandedBackground()
+		{
+			return m_ItemExpandedBackgroundCustom;
+		}
+		/// <summary>
+		/// Specifies the target gradient background color for the expanded item.
+		/// </summary>
+		[Browsable(true),System.ComponentModel.Category("Item Colors"),System.ComponentModel.Description("Specifies the target gradient background color for the expanded item.")]
+		public Color ItemExpandedBackground2
+		{
+			get {return m_ItemExpandedBackground2;}
+			set
+			{
+				if(m_ItemExpandedBackground2!=value)
+				{
+					m_ItemExpandedBackground2=value;
+					m_ItemExpandedBackground2Custom=true;
+				}
+			}
+		}
+		/// <summary>
+		/// Gets whether property should be serialized. Used by windows forms designer.
+		/// </summary>
+		/// <returns>True if property should be serialized otherwise false.</returns>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeItemExpandedBackground2()
+		{
+			return m_ItemExpandedBackground2Custom;
+		}
+		/// <summary>
+		/// Specifies the gradient angle.
+		/// </summary>
+		[Browsable(true),System.ComponentModel.Category("Item Colors"),System.ComponentModel.Description("Specifies the gradient angle."),DefaultValue(90)]
+		public int ItemExpandedBackgroundGradientAngle
+		{
+			get {return m_ItemExpandedBackgroundGradientAngle;}
+			set {m_ItemExpandedBackgroundGradientAngle=value;}
+		}
+
+		/// <summary>
+		/// Specifies the text color for the expanded item.
+		/// </summary>
+		[Browsable(true),System.ComponentModel.Category("Item Colors"),System.ComponentModel.Description("Specifies the text color for the expanded item.")]
+		public Color ItemExpandedText
+		{
+			get {return m_ItemExpandedText;}
+			set
+			{
+				if(m_ItemExpandedText!=value)
+				{
+					m_ItemExpandedText=value;
+					m_ItemExpandedTextCustom=true;
+				}
+			}
+		}
+		/// <summary>
+		/// Gets whether property should be serialized. Used by windows forms designer.
+		/// </summary>
+		/// <returns>True if property should be serialized otherwise false.</returns>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeItemExpandedText()
+		{
+			return m_ItemExpandedTextCustom;
+		}
+		/// <summary>
+		/// Specifies the border color for the expanded item.
+		/// </summary>
+		[Browsable(true),System.ComponentModel.Category("Item Colors"),System.ComponentModel.Description("Specifies the border color for the expanded item.")]
+		public Color ItemExpandedBorder
+		{
+			get {return m_ItemExpandedBorder;}
+			set
+			{
+				if(m_ItemExpandedBorder!=value)
+				{
+					m_ItemExpandedBorder=value;
+					m_ItemExpandedBorderCustom=true;
+				}
+			}
+		}
+		/// <summary>
+		/// Gets whether property should be serialized. Used by windows forms designer.
+		/// </summary>
+		/// <returns>True if property should be serialized otherwise false.</returns>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeItemExpandedBorder()
+		{
+			return m_ItemExpandedBorderCustom;
+		}
+
+		/// <summary>
+		/// Specifies the background color for the checked item.
+		/// </summary>
+		[Browsable(true),System.ComponentModel.Category("Item Colors"),System.ComponentModel.Description("Specifies the background color for the checked item.")]
+		public Color ItemCheckedBackground
+		{
+			get {return m_ItemCheckedBackground;}
+			set
+			{
+				if(m_ItemCheckedBackground!=value)
+				{
+					m_ItemCheckedBackground=value;
+					m_ItemCheckedBackgroundCustom=true;
+				}
+			}
+		}
+		/// <summary>
+		/// Gets whether property should be serialized. Used by windows forms designer.
+		/// </summary>
+		/// <returns>True if property should be serialized otherwise false.</returns>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeItemCheckedBackground()
+		{
+			return m_ItemCheckedBackgroundCustom;
+		}
+		/// <summary>
+		/// Specifies the target gradient background color for the checked item.
+		/// </summary>
+		[Browsable(true),System.ComponentModel.Category("Item Colors"),System.ComponentModel.Description("Specifies the target gradient background color for the checked item.")]
+		public Color ItemCheckedBackground2
+		{
+			get {return m_ItemCheckedBackground2;}
+			set
+			{
+				if(m_ItemCheckedBackground2!=value)
+				{
+					m_ItemCheckedBackground2=value;
+					m_ItemCheckedBackground2Custom=true;
+				}
+			}
+		}
+		/// <summary>
+		/// Gets whether property should be serialized. Used by windows forms designer.
+		/// </summary>
+		/// <returns>True if property should be serialized otherwise false.</returns>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeItemCheckedBackground2()
+		{
+			return m_ItemCheckedBackground2Custom;
+		}
+		/// <summary>
+		/// Specifies the gradient angle.
+		/// </summary>
+		[Browsable(true),System.ComponentModel.Category("Item Colors"),System.ComponentModel.Description("Specifies the gradient angle."),DefaultValue(90)]
+		public int ItemCheckedBackgroundGradientAngle
+		{
+			get {return m_ItemCheckedBackgroundGradientAngle;}
+			set {m_ItemCheckedBackgroundGradientAngle=value;}
+		}
+
+		/// <summary>
+		/// Specifies the border color for the checked item.
+		/// </summary>
+		[Browsable(true),System.ComponentModel.Category("Item Colors"),System.ComponentModel.Description("Specifies the border color for the checked item.")]
+		public Color ItemCheckedBorder
+		{
+			get {return m_ItemCheckedBorder;}
+			set
+			{
+				if(m_ItemCheckedBorder!=value)
+				{
+					m_ItemCheckedBorder=value;
+					m_ItemCheckedBorderCustom=true;
+				}
+			}
+		}
+		/// <summary>
+		/// Gets whether property should be serialized. Used by windows forms designer.
+		/// </summary>
+		/// <returns>True if property should be serialized otherwise false.</returns>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeItemCheckedBorder()
+		{
+			return m_ItemCheckedBorderCustom;
+		}
+		/// <summary>
+		/// Specifies the text color for the checked item.
+		/// </summary>
+		[Browsable(true),System.ComponentModel.Category("Item Colors"),System.ComponentModel.Description("Specifies the text color for the checked item.")]
+		public Color ItemCheckedText
+		{
+			get {return m_ItemCheckedText;}
+			set
+			{
+				if(m_ItemCheckedText!=value)
+				{
+					m_ItemCheckedText=value;
+					m_ItemCheckedTextCustom=true;
+				}
+			}
+
+		}
+		/// <summary>
+		/// Gets whether property should be serialized. Used by windows forms designer.
+		/// </summary>
+		/// <returns>True if property should be serialized otherwise false.</returns>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeItemCheckedText()
+		{
+			return m_ItemCheckedTextCustom;
+		}
+		/// <summary>
+		/// Specifies the customize item background color. Applies to Office2003 style only.
+		/// </summary>
+		[Browsable(true),System.ComponentModel.Category("Special Item Colors"),System.ComponentModel.Description("Specifies the customize item background color.")]
+		public Color CustomizeBackground
+		{
+			get {return m_CustomizeBackground;}
+			set
+			{
+				if(m_CustomizeBackground!=value)
+				{
+					m_CustomizeBackground=value;
+					m_CustomizeBackgroundCustom=true;
+				}
+			}
+		}
+		/// <summary>
+		/// Gets whether property should be serialized. Used by windows forms designer.
+		/// </summary>
+		/// <returns>True if property should be serialized otherwise false.</returns>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeCustomizeBackground()
+		{
+			return m_CustomizeBackgroundCustom;
+		}
+		/// <summary>
+		/// Specifies the customize item target gradient background color. Applies to Office2003 style only.
+		/// </summary>
+		[Browsable(true),System.ComponentModel.Category("Special Item Colors"),System.ComponentModel.Description("Specifies the customize item target gradient background color.")]
+		public Color CustomizeBackground2
+		{
+			get {return m_CustomizeBackground2;}
+			set
+			{
+				if(m_CustomizeBackground2!=value)
+				{
+					m_CustomizeBackground2=value;
+					m_CustomizeBackground2Custom=true;
+				}
+			}
+		}
+		/// <summary>
+		/// Gets whether property should be serialized. Used by windows forms designer.
+		/// </summary>
+		/// <returns>True if property should be serialized otherwise false.</returns>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeCustomizeBackground2()
+		{
+			return m_CustomizeBackground2Custom;
+		}
+		/// <summary>
+		/// Specifies the customize item background color gradient angle. Applies to Office2003 style only.
+		/// </summary>
+		[Browsable(true),System.ComponentModel.Category("Special Item Colors"),System.ComponentModel.Description("Specifies the customize item background color gradient angle."),DefaultValue(90)]
+		public int CustomizeBackgroundGradientAngle
+		{
+			get {return m_CustomizeBackgroundGradientAngle;}
+			set {m_CustomizeBackgroundGradientAngle=value;}
+		}
+		/// <summary>
+		/// Specifies the customize item text color. Applies to Office2003 style only.
+		/// </summary>
+		[Browsable(true),System.ComponentModel.Category("Special Item Colors"),System.ComponentModel.Description("Specifies the customize item text color.")]
+		public Color CustomizeText
+		{
+			get {return m_CustomizeText;}
+			set
+			{
+				if(m_CustomizeText!=value)
+				{
+					m_CustomizeText=value;
+					m_CustomizeTextCustom=true;
+				}
+			}
+		}
+		/// <summary>
+		/// Gets whether property should be serialized. Used by windows forms designer.
+		/// </summary>
+		/// <returns>True if property should be serialized otherwise false.</returns>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeCustomizeText()
+		{
+			return m_CustomizeTextCustom;
+		}
+		/// <summary>
+		/// Specifies the color of the menu border.
+		/// </summary>
+		[Browsable(true),System.ComponentModel.Category("Menu Colors"),System.ComponentModel.Description("Specifies the color of the menu border.")]
+		public Color MenuBorder
+		{
+			get {return m_MenuBorder;}
+			set
+			{
+				if(m_MenuBorder!=value)
+				{
+					m_MenuBorder=value;
+					m_MenuBorderCustom=true;
+				}
+			}
+		}
+		/// <summary>
+		/// Gets whether property should be serialized. Used by windows forms designer.
+		/// </summary>
+		/// <returns>True if property should be serialized otherwise false.</returns>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeMenuBorder()
+		{
+			return m_MenuBorderCustom;
+		}
+		/// <summary>
+		/// Specifies the background color of the menu.
+		/// </summary>
+		[Browsable(true),System.ComponentModel.Category("Menu Colors"),System.ComponentModel.Description("Specifies the background color of the menu.")]
+		public Color MenuBackground
+		{
+			get {return m_MenuBackground;}
+			set
+			{
+				if(m_MenuBackground!=value)
+				{
+					m_MenuBackground=value;
+					m_MenuBackgroundCustom=true;
+				}
+			}
+		}
+		/// <summary>
+		/// Gets whether property should be serialized. Used by windows forms designer.
+		/// </summary>
+		/// <returns>True if property should be serialized otherwise false.</returns>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeMenuBackground()
+		{
+			return m_MenuBackgroundCustom;
+		}
+		/// <summary>
+		/// Specifies the target gradient background color of the menu.
+		/// </summary>
+		[Browsable(true),System.ComponentModel.Category("Menu Colors"),System.ComponentModel.Description("Specifies the target gradient background color of the menu.")]
+		public Color MenuBackground2
+		{
+			get {return m_MenuBackground2;}
+			set
+			{
+				if(m_MenuBackground2!=value)
+				{
+					m_MenuBackground2=value;
+					m_MenuBackground2Custom=true;
+				}
+			}
+		}
+		/// <summary>
+		/// Gets whether property should be serialized. Used by windows forms designer.
+		/// </summary>
+		/// <returns>True if property should be serialized otherwise false.</returns>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeMenuBackground2()
+		{
+			return m_MenuBackground2Custom;
+		}
+		/// <summary>
+		/// Specifies the angle of the gradient fill for the menu background.
+		/// </summary>
+		[Browsable(true),System.ComponentModel.Category("Menu Colors"),System.ComponentModel.Description("Specifies the angle of the gradient fill for the menu background."),DefaultValue(0)]
+		public int MenuBackgroundGradientAngle
+		{
+			get {return m_MenuBackgroundGradientAngle;}
+			set
+			{
+				if(m_MenuBackgroundGradientAngle!=value)
+				{
+					m_MenuBackgroundGradientAngle=value;
+				}
+			}
+		}
+		/// <summary>
+		/// Specifies the background color of the menu part (left side)  that is showing the images.
+		/// </summary>
+		[Browsable(true),System.ComponentModel.Category("Menu Colors"),System.ComponentModel.Description("Specifies the background color of the menu part (left side)  that is showing the images.")]
+		public Color MenuSide
+		{
+			get {return m_MenuSide;}
+			set
+			{
+				if(m_MenuSide!=value)
+				{
+					m_MenuSide=value;
+					m_MenuSideCustom=true;
+				}
+			}
+		}
+		/// <summary>
+		/// Gets whether property should be serialized. Used by windows forms designer.
+		/// </summary>
+		/// <returns>True if property should be serialized otherwise false.</returns>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeMenuSide()
+		{
+			return m_MenuSideCustom;
+		}
+		/// <summary>
+		/// Specifies the target gradient background color of the menu part (left side)  that is showing the images.
+		/// </summary>
+		[Browsable(true),System.ComponentModel.Category("Menu Colors"),System.ComponentModel.Description("Specifies the target gradient background color of the menu part (left side)  that is showing the images.")]
+		public Color MenuSide2
+		{
+			get {return m_MenuSide2;}
+			set
+			{
+				if(m_MenuSide2!=value)
+				{
+					m_MenuSide2=value;
+					m_MenuSide2Custom=true;
+				}
+			}
+		}
+		/// <summary>
+		/// Gets whether property should be serialized. Used by windows forms designer.
+		/// </summary>
+		/// <returns>True if property should be serialized otherwise false.</returns>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeMenuSide2()
+		{
+			return m_MenuSide2Custom;
+		}
+		/// <summary>
+		/// Specifies the angle of the gradient fill for the menu part (left side) that is showing the images.
+		/// </summary>
+		[Browsable(true),System.ComponentModel.Category("Menu Colors"),System.ComponentModel.Description("Specifies the angle of the gradient fill for the menu part (left side) that is showing the images."),DefaultValue(0)]
+		public int MenuSideGradientAngle
+		{
+			get {return m_MenuSideGradientAngle;}
+			set
+			{
+				if(m_MenuSideGradientAngle!=value)
+				{
+					m_MenuSideGradientAngle=value;
+				}
+			}
+		}
+		/// <summary>
+		/// Specifies the background color for the items that were not recently used.
+		/// </summary>
+		[Browsable(true),System.ComponentModel.Category("Menu Colors"),System.ComponentModel.Description("Specifies the background color for the items that were not recently used.")]
+		public Color MenuUnusedBackground
+		{
+			get {return m_MenuUnusedBackground;}
+			set
+			{
+				if(m_MenuUnusedBackground!=value)
+				{
+					m_MenuUnusedBackground=value;
+					m_MenuUnusedBackgroundCustom=true;
+				}
+			}
+		}
+		/// <summary>
+		/// Gets whether property should be serialized. Used by windows forms designer.
+		/// </summary>
+		/// <returns>True if property should be serialized otherwise false.</returns>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeMenuUnusedBackground()
+		{
+			return m_MenuUnusedBackgroundCustom;
+		}
+		/// <summary>
+		/// Specifies the side bar color for the items that were not recently used.
+		/// </summary>
+		[Browsable(true),System.ComponentModel.Category("Menu Colors"),System.ComponentModel.Description("Specifies the side bar color for the items that were not recently used.")]
+		public Color MenuUnusedSide
+		{
+			get {return m_MenuUnusedSide;}
+			set
+			{
+				if(m_MenuUnusedSide!=value)
+				{
+					m_MenuUnusedSide=value;
+					m_MenuUnusedSideCustom=true;
+				}
+			}
+		}
+		/// <summary>
+		/// Gets whether property should be serialized. Used by windows forms designer.
+		/// </summary>
+		/// <returns>True if property should be serialized otherwise false.</returns>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeMenuUnusedSide()
+		{
+			return m_MenuUnusedSideCustom;
+		}
+		/// <summary>
+		/// Specifies the target gradient side bar color for the items that were not recently used.
+		/// </summary>
+		[Browsable(true),System.ComponentModel.Category("Menu Colors"),System.ComponentModel.Description("Specifies the target gradient side bar color for the items that were not recently used.")]
+		public Color MenuUnusedSide2
+		{
+			get {return m_MenuUnusedSide2;}
+			set
+			{
+				if(m_MenuUnusedSide2!=value)
+				{
+					m_MenuUnusedSide2=value;
+					m_MenuUnusedSide2Custom=true;
+				}
+			}
+		}
+		/// <summary>
+		/// Gets whether property should be serialized. Used by windows forms designer.
+		/// </summary>
+		/// <returns>True if property should be serialized otherwise false.</returns>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeMenuUnusedSide2()
+		{
+			return m_MenuUnusedSide2Custom;
+		}
+		/// <summary>
+		/// Specifies the angle of the gradient fill for the menu part (left side) that is showing the images.
+		/// </summary>
+		[Browsable(true),System.ComponentModel.Category("Menu Colors"),System.ComponentModel.Description("Specifies the angle of the gradient fill for the menu part (left side) that is showing the images."),DefaultValue(0)]
+		public int MenuUnusedSideGradientAngle
+		{
+			get {return m_MenuUnusedSideGradientAngle;}
+			set
+			{
+				if(m_MenuUnusedSideGradientAngle!=value)
+				{
+					m_MenuUnusedSideGradientAngle=value;
+				}
+			}
+		}
+		/// <summary>
+		/// Specifies the border color for focused design-time item.
+		/// </summary>
+		[Browsable(true),System.ComponentModel.Category("Design Colors"),System.ComponentModel.Description("Specifies the border color for focused design-time item.")]
+		public Color ItemDesignTimeBorder
+		{
+			get {return m_ItemDesignTimeBorder;}
+			set
+			{
+				if(m_ItemDesignTimeBorder!=value)
+				{
+					m_ItemDesignTimeBorder=value;
+					m_ItemDesignTimeBorderCustom=true;
+				}
+			}
+		}
+		/// <summary>
+		/// Gets whether property should be serialized. Used by windows forms designer.
+		/// </summary>
+		/// <returns>True if property should be serialized otherwise false.</returns>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeItemDesignTimeBorder()
+		{
+			return m_ItemDesignTimeBorderCustom;
+		}
+
+		/// <summary>
+		/// Gets or sets predefined color scheme. By default DotNetBar will automatically change and generate color scheme depending on system colors.
+		/// </summary>
+		[Browsable(true),System.ComponentModel.Category("Color Scheme"),System.ComponentModel.Description("Indicates predefined color scheme. By default DotNetBar will automatically change and generate color scheme depending on system colors."),DefaultValue(ePredefinedColorScheme.AutoGenerated)]
+		public ePredefinedColorScheme PredefinedColorScheme
+		{
+			get {return m_PredefinedColorScheme;}
+			set
+			{
+				if(m_PredefinedColorScheme!=value)
+				{
+					m_PredefinedColorScheme=value;
+					this.Refresh();
+				}
+			}
+		}
+		
+		/// <summary>
+		/// Specifies the background color of the panel.
+		/// </summary>
+		[Browsable(true),System.ComponentModel.Category("Panel Colors"),System.ComponentModel.Description("Specifies the background color of the panel.")]
+		public Color PanelBackground
+		{
+			get {return m_PanelBackground;}
+			set
+			{
+				if(m_PanelBackground!=value)
+				{
+					m_PanelBackground=value;
+					m_PanelBackgroundCustom=true;
+				}
+			}
+		}
+		/// <summary>
+		/// Gets whether property should be serialized. Used by windows forms designer.
+		/// </summary>
+		/// <returns>True if property should be serialized otherwise false.</returns>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializePanelBackground()
+		{
+			return m_PanelBackgroundCustom;
+		}
+		/// <summary>
+		/// Specifies the target background gradient color of the panel.
+		/// </summary>
+		[Browsable(true),System.ComponentModel.Category("Panel Colors"),System.ComponentModel.Description("Specifies the target background gradient color of the panel.")]
+		public Color PanelBackground2
+		{
+			get {return m_PanelBackground2;}
+			set
+			{
+				if(m_PanelBackground2!=value)
+				{
+					m_PanelBackground2=value;
+					m_PanelBackground2Custom=true;
+				}
+			}
+		}
+		/// <summary>
+		/// Gets whether property should be serialized. Used by windows forms designer.
+		/// </summary>
+		/// <returns>True if property should be serialized otherwise false.</returns>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializePanelBackground2()
+		{
+			return m_PanelBackground2Custom;
+		}
+		/// <summary>
+		/// Specifies the angle of the gradient fill for the panel background.
+		/// </summary>
+		[Browsable(true),System.ComponentModel.Category("Panel Colors"),System.ComponentModel.Description("Specifies the angle of the gradient fill for the panel background."),DefaultValue(90)]
+		public int PanelBackgroundGradientAngle
+		{
+			get {return m_PanelBackgroundGradientAngle;}
+			set
+			{
+				if(m_PanelBackgroundGradientAngle!=value)
+				{
+					m_PanelBackgroundGradientAngle=value;
+				}
+			}
+		}
+		/// <summary>
+		/// Specifies border color of the panel.
+		/// </summary>
+		[Browsable(true),System.ComponentModel.Category("Panel Colors"),System.ComponentModel.Description("Specifies border color of the panel.")]
+		public Color PanelBorder
+		{
+			get {return m_PanelBorder;}
+			set
+			{
+				if(m_PanelBorder!=value)
+				{
+					m_PanelBorder=value;
+					m_PanelBorderCustom=true;
+				}
+			}
+		}
+		/// <summary>
+		/// Gets whether property should be serialized. Used by windows forms designer.
+		/// </summary>
+		/// <returns>True if property should be serialized otherwise false.</returns>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializePanelBorder()
+		{
+			return m_PanelBorderCustom;
+		}
+		/// <summary>
+		/// Specifies color of the text on the panel.
+		/// </summary>
+		[Browsable(true),System.ComponentModel.Category("Panel Colors"),System.ComponentModel.Description("Specifies color of the text on the panel.")]
+		public Color PanelText
+		{
+			get {return m_PanelText;}
+			set
+			{
+				if(m_PanelText!=value)
+				{
+					m_PanelText=value;
+					m_PanelTextCustom=true;
+				}
+			}
+		}
+		/// <summary>
+		/// Gets whether property should be serialized. Used by windows forms designer.
+		/// </summary>
+		/// <returns>True if property should be serialized otherwise false.</returns>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializePanelText()
+		{
+			return m_PanelTextCustom;
+		}
+
+		/// <summary>
+		/// Specifies the background color of the explorer bar.
+		/// </summary>
+		[Browsable(true),System.ComponentModel.Category("Explorer Bar Colors"),System.ComponentModel.Description("Specifies the background color of the explorer bar.")]
+		public Color ExplorerBarBackground
+		{
+			get {return m_ExplorerBarBackground;}
+			set
+			{
+				if(m_ExplorerBarBackground!=value)
+				{
+					m_ExplorerBarBackground=value;
+					m_ExplorerBarBackgroundCustom=true;
+				}
+			}
+		}
+		/// <summary>
+		/// Gets whether property should be serialized. Used by windows forms designer.
+		/// </summary>
+		/// <returns>True if property should be serialized otherwise false.</returns>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeExplorerBarBackground()
+		{
+			return m_ExplorerBarBackgroundCustom;
+		}
+		/// <summary>
+		/// Specifies the target gradient background color of the explorer bar.
+		/// </summary>
+		[Browsable(true),System.ComponentModel.Category("Explorer Bar Colors"),System.ComponentModel.Description("Specifies target gradient background color of the explorer bar.")]
+		public Color ExplorerBarBackground2
+		{
+			get {return m_ExplorerBarBackground2;}
+			set
+			{
+				if(m_ExplorerBarBackground2!=value)
+				{
+					m_ExplorerBarBackground2=value;
+					m_ExplorerBarBackground2Custom=true;
+				}
+			}
+		}
+		/// <summary>
+		/// Gets whether property should be serialized. Used by windows forms designer.
+		/// </summary>
+		/// <returns>True if property should be serialized otherwise false.</returns>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeExplorerBarBackground2()
+		{
+			return m_ExplorerBarBackground2Custom;
+		}
+		/// <summary>
+		/// Specifies the angle of the gradient fill for the explorer bar background.
+		/// </summary>
+		[Browsable(true),System.ComponentModel.Category("Explorer Bar Colors"),System.ComponentModel.Description("Specifies the angle of the gradient fill for the explorer bar background."),DefaultValue(90)]
+		public int ExplorerBarBackgroundGradientAngle
+		{
+			get {return m_ExplorerBarBackgroundGradientAngle;}
+			set
+			{
+				if(m_ExplorerBarBackgroundGradientAngle!=value)
+				{
+					m_ExplorerBarBackgroundGradientAngle=value;
+				}
+			}
+		}
+
+		/// <summary>
+		/// Refreshes all automatically generated colors.
+		/// </summary>
+		public void Refresh()
+		{
+			this.Refresh(null,false);
+		}
+		/// <summary>
+		/// Resets all changed flags.
+		/// </summary>
+		public void ResetChangedFlag()
+		{
+			m_BarCaptionBackgroundCustom=false;
+			m_BarCaptionBackground2Custom=false;
+			m_BarStripeColorCustom=false;
+			m_BarCaptionInactiveBackgroundCustom=false;
+			m_BarCaptionInactiveBackground2Custom=false;
+			m_BarCaptionInactiveTextCustom=false;
+			m_BarCaptionTextCustom=false;
+			m_BarFloatingBorderCustom=false;
+			m_BarPopupBackgroundCustom=false;
+			m_BarPopupBorderCustom=false;
+			m_BarDockedBorderCustom=false;
+			m_BarBackgroundCustom=false;
+			m_BarBackground2Custom=false;
+			m_ItemBackgroundCustom=false;
+			m_ItemBackground2Custom=false;
+			m_ItemCheckedBackgroundCustom=false;
+			m_ItemCheckedBackground2Custom=false;
+			m_ItemCheckedBorderCustom=false;
+			m_ItemCheckedTextCustom=false;
+			m_ItemDisabledBackgroundCustom=false;
+			m_ItemDisabledTextCustom=false;
+			m_ItemExpandedShadowCustom=false;
+			m_ItemExpandedBackgroundCustom=false;
+			m_ItemExpandedBackground2Custom=false;
+			m_ItemExpandedTextCustom=false;
+			m_ItemExpandedBorderCustom=false;
+			m_ItemHotBackgroundCustom=false;
+			m_ItemHotBackground2Custom=false;
+			m_ItemHotBorderCustom=false;
+			m_ItemHotTextCustom=false;
+			m_ItemPressedBackgroundCustom=false;
+			m_ItemPressedBackground2Custom=false;
+			m_ItemPressedBorderCustom=false;
+			m_ItemPressedTextCustom=false;
+			m_ItemSeparatorCustom=false;
+			m_ItemSeparatorShadeCustom=false;
+			m_ItemTextCustom=false;
+			m_MenuBackgroundCustom=false;
+			m_MenuBackground2Custom=false;
+			m_MenuBarBackgroundCustom=false;
+			m_MenuBarBackground2Custom=false;
+			m_MenuBorderCustom=false;
+			m_MenuSideCustom=false;
+			m_MenuSide2Custom=false;
+			m_MenuUnusedBackgroundCustom=false;
+			m_MenuUnusedSideCustom=false;
+			m_MenuUnusedSide2Custom=false;
+			m_ItemDesignTimeBorderCustom=false;
+			m_CustomizeBackgroundCustom=false;
+			m_CustomizeBackground2Custom=false;
+			m_CustomizeTextCustom=false;
+			m_PanelBackgroundCustom=false;
+			m_PanelBackground2Custom=false;
+			m_PanelBorderCustom=false;
+			m_PanelTextCustom=false;
+			m_ExplorerBarBackgroundCustom=false;
+			m_ExplorerBarBackground2Custom=false;
+		}
+
+		/// <summary>
+		/// Gets whether color scheme object has been changed.
+		/// </summary>
+		[Browsable(false)]
+		public bool SchemeChanged
+		{
+			get
+			{
+				return m_BarCaptionBackgroundCustom ||
+					m_BarCaptionBackground2Custom ||
+					m_BarStripeColorCustom ||
+					m_BarCaptionInactiveBackgroundCustom ||
+					m_BarCaptionInactiveBackground2Custom ||
+					m_BarCaptionInactiveTextCustom ||
+					m_BarCaptionTextCustom ||
+					m_BarFloatingBorderCustom ||
+					m_BarPopupBackgroundCustom ||
+					m_BarPopupBorderCustom ||
+					m_BarBackgroundCustom ||
+					m_BarBackground2Custom ||
+					m_ItemBackgroundCustom ||
+					m_ItemCheckedBackgroundCustom ||
+					m_ItemCheckedBackground2Custom ||
+					m_ItemCheckedBorderCustom ||
+					m_ItemCheckedTextCustom ||
+					m_ItemDisabledBackgroundCustom ||
+					m_ItemDisabledTextCustom ||
+					m_ItemExpandedShadowCustom ||
+					m_ItemExpandedBackgroundCustom ||
+					m_ItemExpandedBackground2Custom ||
+					m_ItemExpandedTextCustom ||
+					m_ItemExpandedBorderCustom ||
+					m_ItemHotBackgroundCustom ||
+					m_ItemHotBackground2Custom ||
+					m_ItemHotBorderCustom ||
+					m_ItemHotTextCustom ||
+					m_ItemPressedBackgroundCustom ||
+					m_ItemPressedBackground2Custom ||
+					m_ItemPressedBorderCustom ||
+					m_ItemPressedTextCustom ||
+					m_ItemSeparatorCustom ||
+					m_ItemTextCustom ||
+					m_MenuBackgroundCustom ||
+					m_MenuBackground2Custom ||
+					m_MenuBarBackgroundCustom ||
+					m_MenuBarBackground2Custom ||
+					m_MenuBorderCustom ||
+					m_MenuSideCustom ||
+					m_MenuSide2Custom ||
+					m_MenuUnusedBackgroundCustom ||
+					m_MenuUnusedSideCustom ||
+					m_MenuUnusedSide2Custom ||
+					m_ItemDesignTimeBorderCustom ||
+					m_CustomizeBackgroundCustom ||
+					m_CustomizeBackground2Custom ||
+					(m_PredefinedColorScheme!=ePredefinedColorScheme.AutoGenerated);
+			}
+		}
+		#endregion
+
+		#region Color Scheme Generation
+		/// <summary>
+		/// Refreshes all automatically generated colors.
+		/// </summary>
+		/// <param name="graphics">Reference to graphics object.</param>
+		/// <param name="bSystemColorEvent">Indicates whether refresh is caused by system event.</param>
+		public void Refresh(System.Drawing.Graphics graphics, bool bSystemColorEvent)
+		{
+			if(!bSystemColorEvent)
+			{
+				ResetChangedFlag();
+			}
+
+			if(m_PredefinedColorScheme==ePredefinedColorScheme.Blue2003)
+				SchemeXpBlue2003();
+			else if(m_PredefinedColorScheme==ePredefinedColorScheme.OliveGreen2003)
+				SchemeXpOliveGreen2003();
+			else if(m_PredefinedColorScheme==ePredefinedColorScheme.Silver2003)
+				SchemeXpSilver2003();
+			else
+			{
+				eWinXPColorScheme xpc=ColorFunctions.WinXPColorScheme;
+				if(xpc!=eWinXPColorScheme.Undetermined)
+				{
+					if(xpc==eWinXPColorScheme.Blue)
+					{
+						if(Style==eColorSchemeStyle.Office2003)
+							SchemeXpBlue2003();
+						else if(Style==eColorSchemeStyle.VS2005)
+							SchemeXpBlueVS2005();
+						else
+							SchemeXpBlue();
+					}
+					else if(xpc==eWinXPColorScheme.Silver)
+					{
+						if(Style==eColorSchemeStyle.Office2003)
+							SchemeXpSilver2003();
+						else if(Style==eColorSchemeStyle.VS2005)
+							SchemeXpSilverVS2005();
+						else
+							SchemeXpSilver();
+					}
+					else if(xpc==eWinXPColorScheme.OliveGreen)
+					{
+						if(Style==eColorSchemeStyle.Office2003)
+							SchemeXpOliveGreen2003();
+						else if(Style==eColorSchemeStyle.VS2005)
+							SchemeXpOliveGreenVS2005();
+						else
+							SchemeXpOliveGreen();
+					}
+					else
+						GenerateScheme();
+				}
+				else
+					GenerateScheme();
+			}
+
+			bool bDisposeGraphics=false;
+			if(graphics==null)
+			{
+				IntPtr wnd=GetDesktopWindow();
+				if(wnd!=IntPtr.Zero)
+				{
+					graphics=System.Drawing.Graphics.FromHwnd(wnd);
+					bDisposeGraphics=true;
+				}
+			}
+			try
+			{
+				if(graphics!=null)
+				{
+					if(!m_BarCaptionBackground.IsSystemColor && !m_BarCaptionBackground.IsEmpty)
+						m_BarCaptionBackground=graphics.GetNearestColor(m_BarCaptionBackground);
+					if(!m_BarCaptionBackground2.IsSystemColor && !m_BarCaptionBackground2.IsEmpty)
+						m_BarCaptionBackground2=graphics.GetNearestColor(m_BarCaptionBackground2);
+					if(!m_BarStripeColor.IsSystemColor && !m_BarStripeColor.IsEmpty)
+						m_BarStripeColor=graphics.GetNearestColor(m_BarStripeColor);
+					if(!m_BarCaptionInactiveBackground.IsSystemColor && !m_BarCaptionInactiveBackground.IsEmpty)
+						m_BarCaptionInactiveBackground=graphics.GetNearestColor(m_BarCaptionInactiveBackground);
+					if(!m_BarCaptionInactiveBackground2.IsSystemColor && !m_BarCaptionInactiveBackground2.IsEmpty)
+						m_BarCaptionInactiveBackground2=graphics.GetNearestColor(m_BarCaptionInactiveBackground2);
+					if(!m_BarCaptionInactiveText.IsSystemColor && !m_BarCaptionInactiveText.IsEmpty)
+						m_BarCaptionInactiveText=graphics.GetNearestColor(m_BarCaptionInactiveText);
+					if(!m_BarCaptionText.IsSystemColor && !m_BarCaptionText.IsEmpty)
+						m_BarCaptionText=graphics.GetNearestColor(m_BarCaptionText);
+					if(!m_BarFloatingBorder.IsSystemColor && !m_BarFloatingBorder.IsEmpty)
+						m_BarFloatingBorder=graphics.GetNearestColor(m_BarFloatingBorder);
+					if(!m_BarPopupBackground.IsSystemColor && !m_BarPopupBackground.IsEmpty)
+						m_BarPopupBackground=graphics.GetNearestColor(m_BarPopupBackground);
+					if(!m_BarPopupBorder.IsSystemColor && !m_BarPopupBorder.IsEmpty)
+						m_BarPopupBorder=graphics.GetNearestColor(m_BarPopupBorder);
+					if(!m_BarDockedBorder.IsSystemColor && !m_BarDockedBorder.IsEmpty)
+						m_BarDockedBorder=graphics.GetNearestColor(m_BarDockedBorder);
+					if(!m_BarBackground.IsSystemColor && !m_BarBackground.IsEmpty)
+						m_BarBackground=graphics.GetNearestColor(m_BarBackground);
+					if(!m_BarBackground2.IsEmpty && !m_BarBackground2.IsSystemColor)
+						m_BarBackground2=graphics.GetNearestColor(m_BarBackground2);
+					if(!m_ItemBackground.IsEmpty)
+						m_ItemBackground=graphics.GetNearestColor(m_ItemBackground);
+					if(!m_ItemBackground2.IsEmpty)
+						m_ItemBackground2=graphics.GetNearestColor(m_ItemBackground2);
+					if(!m_ItemCheckedBackground.IsSystemColor)
+						m_ItemCheckedBackground=graphics.GetNearestColor(m_ItemCheckedBackground);
+					if(!m_ItemCheckedBackground2.IsEmpty && !m_ItemCheckedBackground2.IsSystemColor)
+						m_ItemCheckedBackground2=graphics.GetNearestColor(m_ItemCheckedBackground2);
+					if(!m_ItemCheckedBorder.IsSystemColor)
+						m_ItemCheckedBorder=graphics.GetNearestColor(m_ItemCheckedBorder);
+					if(!m_ItemCheckedText.IsSystemColor)
+						m_ItemCheckedText=graphics.GetNearestColor(m_ItemCheckedText);
+					if(!m_ItemDisabledBackground.IsEmpty && !m_ItemDisabledBackground.IsSystemColor)
+						m_ItemDisabledBackground=graphics.GetNearestColor(m_ItemDisabledBackground);
+					if(!m_ItemDisabledText.IsSystemColor)
+						m_ItemDisabledText=graphics.GetNearestColor(m_ItemDisabledText);
+					if(!m_ItemExpandedShadow.IsSystemColor && !m_ItemExpandedShadow.IsEmpty)
+						m_ItemExpandedShadow=graphics.GetNearestColor(m_ItemExpandedShadow);
+					if(!m_ItemExpandedBackground.IsSystemColor)
+						m_ItemExpandedBackground=graphics.GetNearestColor(m_ItemExpandedBackground);
+					if(!m_ItemExpandedText.IsSystemColor)
+						m_ItemExpandedText=graphics.GetNearestColor(m_ItemExpandedText);
+					if(!m_ItemExpandedBorder.IsSystemColor)
+						m_ItemExpandedBorder=graphics.GetNearestColor(m_ItemExpandedBorder);
+					if(!m_ItemHotBackground.IsSystemColor)
+						m_ItemHotBackground=graphics.GetNearestColor(m_ItemHotBackground);
+					if(!m_ItemHotBackground2.IsEmpty && !m_ItemHotBackground2.IsSystemColor)
+						m_ItemHotBackground2=graphics.GetNearestColor(m_ItemHotBackground2);
+					if(!m_ItemHotBorder.IsSystemColor)
+						m_ItemHotBorder=graphics.GetNearestColor(m_ItemHotBorder);
+					if(!m_ItemHotText.IsSystemColor)
+						m_ItemHotText=graphics.GetNearestColor(m_ItemHotText);
+					if(!m_ItemPressedBackground.IsSystemColor)
+						m_ItemPressedBackground=graphics.GetNearestColor(m_ItemPressedBackground);
+					if(!m_ItemPressedBackground2.IsEmpty && !m_ItemPressedBackground2.IsSystemColor)
+						m_ItemPressedBackground2=graphics.GetNearestColor(m_ItemPressedBackground2);
+					if(!m_ItemPressedBorder.IsSystemColor)
+						m_ItemPressedBorder=graphics.GetNearestColor(m_ItemPressedBorder);
+					if(!m_ItemPressedText.IsSystemColor)
+						m_ItemPressedText=graphics.GetNearestColor(m_ItemPressedText);
+					if(!m_ItemSeparator.IsSystemColor)
+						m_ItemSeparator=graphics.GetNearestColor(m_ItemSeparator);
+					if(!m_ItemSeparatorShade.IsSystemColor && !m_ItemSeparatorShade.IsEmpty)
+						m_ItemSeparatorShade=graphics.GetNearestColor(m_ItemSeparatorShade);
+					if(!m_ItemText.IsSystemColor)
+						m_ItemText=graphics.GetNearestColor(m_ItemText);
+					if(!m_MenuBackground.IsSystemColor)
+						m_MenuBackground=graphics.GetNearestColor(m_MenuBackground);
+					if(!m_MenuBarBackground.IsSystemColor)
+						m_MenuBarBackground=graphics.GetNearestColor(m_MenuBarBackground);
+					if(!m_MenuBarBackground2.IsEmpty && !m_MenuBarBackground2.IsSystemColor)
+						m_MenuBarBackground2=graphics.GetNearestColor(m_MenuBarBackground2);
+					if(!m_MenuBorder.IsSystemColor)
+						m_MenuBorder=graphics.GetNearestColor(m_MenuBorder);
+					if(!m_MenuSide.IsSystemColor)
+						m_MenuSide=graphics.GetNearestColor(m_MenuSide);
+					if(!m_MenuUnusedBackground.IsSystemColor)
+						m_MenuUnusedBackground=graphics.GetNearestColor(m_MenuUnusedBackground);
+					if(!m_MenuUnusedSide.IsSystemColor)
+						m_MenuUnusedSide=graphics.GetNearestColor(m_MenuUnusedSide);
+					if(!m_ItemDesignTimeBorder.IsSystemColor)
+						m_ItemDesignTimeBorder=graphics.GetNearestColor(m_ItemDesignTimeBorder);
+					if(!m_CustomizeBackground.IsEmpty && !m_CustomizeBackground.IsSystemColor)
+						m_CustomizeBackground=graphics.GetNearestColor(m_CustomizeBackground);
+					if(!m_CustomizeBackground2.IsEmpty && !m_CustomizeBackground2.IsSystemColor)
+						m_CustomizeBackground2=graphics.GetNearestColor(m_CustomizeBackground2);
+					if(!m_CustomizeText.IsEmpty && !m_CustomizeText.IsSystemColor)
+						m_CustomizeText=graphics.GetNearestColor(m_CustomizeText);
+				}
+			}
+			finally
+			{
+				if(bDisposeGraphics)
+					graphics.Dispose();
+			}
+		}
+		private void GenerateScheme()
+		{
+			if(m_Style==eColorSchemeStyle.Office2003 || m_Style==eColorSchemeStyle.VS2005)
+				GenerateScheme2003();
+			else
+				GenerateSchemeDefault();
+		}
+		private void GenerateSchemeDefault()
+		{
+			if(!m_BarCaptionBackgroundCustom)
+				m_BarCaptionBackground=ColorFunctions.MenuFocusBorderColor();
+			m_BarCaptionBackground2=Color.Empty;
+			if(!m_BarStripeColorCustom)
+				m_BarStripeColor=SystemColors.ControlDark;
+			if(!m_BarCaptionInactiveBackgroundCustom)
+				m_BarCaptionInactiveBackground=SystemColors.Control;
+			m_BarCaptionInactiveBackground2=Color.Empty;
+			if(!m_BarCaptionInactiveTextCustom)
+				m_BarCaptionInactiveText=SystemColors.ControlText;
+			if(!m_BarCaptionTextCustom)
+				m_BarCaptionText=SystemColors.ActiveCaptionText;
+			if(!m_BarFloatingBorderCustom)
+				m_BarFloatingBorder=ColorFunctions.MenuFocusBorderColor();
+			if(!m_BarPopupBackgroundCustom)
+				m_BarPopupBackground=SystemColors.Control;
+			if(!m_BarPopupBorderCustom)
+				m_BarPopupBorder=ColorFunctions.MenuFocusBorderColor();
+			if(!m_BarBackgroundCustom)
+				m_BarBackground=ColorFunctions.ToolMenuFocusBackColor();
+			if(!m_ItemBackgroundCustom)
+				m_ItemBackground=Color.Empty;
+			if(!m_ItemBackground2Custom)
+				m_ItemBackground2=Color.Empty;
+			if(!m_ItemCheckedBackgroundCustom)
+				m_ItemCheckedBackground=ColorFunctions.CheckBoxBackColor();
+			if(!m_ItemCheckedBorderCustom)
+				m_ItemCheckedBorder=SystemColors.Highlight;
+			if(!m_ItemCheckedTextCustom)
+				m_ItemCheckedText=SystemColors.ControlText;
+			if(!m_ItemDisabledBackgroundCustom)
+				m_ItemDisabledBackground=Color.Empty;
+			if(!m_ItemDisabledTextCustom)
+				m_ItemDisabledText=SystemColors.ControlDark;
+			if(!m_ItemExpandedShadowCustom)
+				m_ItemExpandedShadow=SystemColors.ControlDark;
+			if(!m_ItemExpandedBackgroundCustom)
+				m_ItemExpandedBackground=ColorFunctions.ToolMenuFocusBackColor();
+			if(!m_ItemExpandedTextCustom)
+				m_ItemExpandedText=SystemColors.ControlText;
+			if(!m_ItemHotBackgroundCustom)
+				m_ItemHotBackground=ColorFunctions.HoverBackColor();
+			if(!m_ItemHotBorderCustom)
+				m_ItemHotBorder=SystemColors.Highlight;
+			if(!m_ItemHotTextCustom)
+				m_ItemHotText=SystemColors.ControlText;
+			if(!m_ItemPressedBackgroundCustom)
+				m_ItemPressedBackground=ColorFunctions.PressedBackColor();
+			if(!m_ItemPressedBorderCustom)
+				m_ItemPressedBorder=SystemColors.Highlight;
+			if(!m_ItemPressedTextCustom)
+				m_ItemPressedText=SystemColors.ControlDarkDark;
+			if(!m_ItemSeparatorCustom)
+				m_ItemSeparator=SystemColors.ControlDark;
+			if(!m_ItemTextCustom)
+				m_ItemText=SystemColors.ControlText;
+			if(!m_MenuBackgroundCustom)
+				m_MenuBackground=ColorFunctions.MenuBackColor();
+			if(!m_MenuBarBackgroundCustom)
+				m_MenuBarBackground=SystemColors.Control;
+			if(!m_MenuBorderCustom)
+				m_MenuBorder=SystemColors.ControlDark;
+			if(!m_ItemExpandedBorderCustom)
+				m_ItemExpandedBorder=m_MenuBorder;
+			if(!m_MenuSideCustom)
+				m_MenuSide=ColorFunctions.ToolMenuFocusBackColor();
+			if(!m_MenuUnusedBackgroundCustom)
+				m_MenuUnusedBackground=m_MenuBackground;
+			if(!m_MenuUnusedSideCustom)
+				m_MenuUnusedSide=ColorFunctions.SideRecentlyBackColor();
+			if(!m_ItemDesignTimeBorderCustom)
+				m_ItemDesignTimeBorder=SystemColors.Highlight;
+
+			if(!m_BarBackground2Custom)
+				m_BarBackground2=Color.Empty;
+			if(!m_MenuBarBackground2Custom)
+				m_MenuBarBackground2=Color.Empty;
+			if(!m_ItemHotBackground2Custom)
+				m_ItemHotBackground2=Color.Empty;
+			if(!m_ItemPressedBackground2Custom)
+				m_ItemPressedBackground2=Color.Empty;
+			if(!m_ItemExpandedBackground2Custom)
+				m_ItemExpandedBackground2=Color.Empty;
+			if(!m_ItemCheckedBackground2Custom)
+				m_ItemCheckedBackground2=Color.Empty;
+			if(!m_MenuBackground2Custom)
+				m_MenuBackground2=Color.Empty;
+			if(!m_MenuSide2Custom)
+				m_MenuSide2=Color.Empty;
+			if(!m_MenuUnusedSide2Custom)
+				m_MenuUnusedSide2=Color.Empty;
+			if(m_BarDockedBorderCustom)
+				m_BarDockedBorder=Color.Empty;
+			if(!m_ItemSeparatorShadeCustom)
+				m_ItemSeparatorShade=Color.Empty;
+
+			DockSiteBackColor=Color.Empty;
+			DockSiteBackColor2=Color.Empty;
+
+			if(!m_CustomizeBackgroundCustom)
+				m_CustomizeBackground=Color.Empty;
+			if(!m_CustomizeBackground2Custom)
+				m_CustomizeBackground2=Color.Empty;
+			if(!m_CustomizeTextCustom)
+				m_CustomizeText=Color.Empty;
+
+			if(!m_PanelBackgroundCustom)
+				m_PanelBackground=System.Windows.Forms.ControlPaint.Dark(m_BarBackground);
+			if(!m_PanelBackground2Custom)
+				m_PanelBackground2=System.Windows.Forms.ControlPaint.DarkDark(m_BarBackground);
+			if(!m_PanelTextCustom)
+				m_PanelText=System.Windows.Forms.ControlPaint.LightLight(m_BarBackground);
+			if(!m_PanelBorderCustom)
+				m_PanelBorder=System.Windows.Forms.ControlPaint.DarkDark(m_BarBackground);
+
+			if(!m_ExplorerBarBackgroundCustom) m_ExplorerBarBackground=m_MenuBarBackground;
+			if(!m_ExplorerBarBackground2Custom) m_ExplorerBarBackground2=m_ItemSeparator;
+
+		}
+
+		private void GenerateScheme2003()
+		{
+			if(!m_BarCaptionBackgroundCustom)
+				m_BarCaptionBackground=ColorFunctions.MenuFocusBorderColor();
+			m_BarCaptionBackground2=Color.Empty;
+			if(!m_BarStripeColorCustom)
+				m_BarStripeColor=SystemColors.ControlDark;
+			if(!m_BarCaptionInactiveBackgroundCustom)
+				m_BarCaptionInactiveBackground=SystemColors.Control;
+			m_BarCaptionInactiveBackground2=Color.Empty;
+			if(!m_BarCaptionInactiveTextCustom)
+				m_BarCaptionInactiveText=SystemColors.ControlText;
+			if(!m_BarCaptionTextCustom)
+				m_BarCaptionText=SystemColors.ActiveCaptionText;
+			if(!m_BarFloatingBorderCustom)
+				m_BarFloatingBorder=ColorFunctions.MenuFocusBorderColor();
+			if(!m_BarPopupBackgroundCustom)
+				m_BarPopupBackground=SystemColors.Control;
+			if(!m_BarPopupBorderCustom)
+				m_BarPopupBorder=ColorFunctions.MenuFocusBorderColor();
+			if(!m_BarBackgroundCustom)
+				m_BarBackground=ColorFunctions.MenuBackColor();
+			if(!m_ItemBackgroundCustom)
+				m_ItemBackground=Color.Empty;
+			if(!m_ItemBackground2Custom)
+				m_ItemBackground2=Color.Empty;
+			if(!m_ItemCheckedBackgroundCustom)
+				m_ItemCheckedBackground=ColorFunctions.CheckBoxBackColor();
+			if(!m_ItemCheckedBackground2Custom)
+				m_ItemCheckedBackground2=Color.Empty;
+			if(!m_ItemCheckedBorderCustom)
+				m_ItemCheckedBorder=SystemColors.Highlight;
+			if(!m_ItemCheckedTextCustom)
+				m_ItemCheckedText=SystemColors.ControlText;
+			if(!m_ItemDisabledBackgroundCustom)
+				m_ItemDisabledBackground=Color.Empty;
+			if(!m_ItemDisabledTextCustom)
+				m_ItemDisabledText=SystemColors.ControlDark;
+			if(!m_ItemExpandedShadowCustom)
+				m_ItemExpandedShadow=Color.Empty;
+			if(!m_ItemExpandedBackgroundCustom)
+				m_ItemExpandedBackground=ColorFunctions.ToolMenuFocusBackColor();
+			if(!m_ItemExpandedTextCustom)
+				m_ItemExpandedText=SystemColors.ControlText;
+			if(!m_ItemHotBackgroundCustom)
+				m_ItemHotBackground=ColorFunctions.HoverBackColor3();
+			if(!m_ItemHotBorderCustom)
+				m_ItemHotBorder=SystemColors.Highlight;
+			if(!m_ItemHotTextCustom)
+				m_ItemHotText=SystemColors.ControlText;
+			if(!m_ItemPressedBackgroundCustom)
+				m_ItemPressedBackground=ColorFunctions.HoverBackColor2();
+			if(!m_ItemPressedBorderCustom)
+				m_ItemPressedBorder=SystemColors.Highlight;
+			if(!m_ItemPressedTextCustom)
+				m_ItemPressedText=SystemColors.ControlDarkDark;
+			if(!m_ItemSeparatorCustom)
+				m_ItemSeparator=SystemColors.ControlDark;
+			if(!m_ItemTextCustom)
+				m_ItemText=SystemColors.ControlText;
+			if(!m_MenuBackgroundCustom)
+				m_MenuBackground=ColorFunctions.MenuBackColor();
+			if(!m_MenuBarBackgroundCustom)
+				m_MenuBarBackground=SystemColors.Control;
+			if(!m_MenuBorderCustom)
+				m_MenuBorder=SystemColors.ControlDark;
+			if(!m_ItemExpandedBorderCustom)
+				m_ItemExpandedBorder=m_MenuBorder;
+			if(!m_MenuSideCustom)
+				m_MenuSide=ColorFunctions.MenuBackColor();
+			if(!m_MenuUnusedBackgroundCustom)
+				m_MenuUnusedBackground=m_MenuBackground;
+			if(!m_MenuUnusedSideCustom)
+				m_MenuUnusedSide=ColorFunctions.SideRecentlyBackColor();
+			if(!m_ItemDesignTimeBorderCustom)
+				m_ItemDesignTimeBorder=SystemColors.Highlight;
+
+			if(!m_BarBackground2Custom)
+				m_BarBackground2=SystemColors.Control;
+			if(!m_MenuBarBackground2Custom)
+				m_MenuBarBackground2=Color.Empty;
+			if(!m_ItemHotBackground2Custom)
+				m_ItemHotBackground2=ColorFunctions.HoverBackColor2();
+			if(!m_ItemPressedBackground2Custom)
+				m_ItemPressedBackground2=ColorFunctions.HoverBackColor3();
+			if(!m_ItemExpandedBackground2Custom)
+				m_ItemExpandedBackground2=Color.Empty;
+			if(!m_ItemCheckedBackground2Custom)
+				m_ItemCheckedBackground2=Color.Empty;
+			if(!m_MenuBackground2Custom)
+				m_MenuBackground2=Color.Empty;
+			if(!m_MenuSide2Custom)
+				m_MenuSide2=ColorFunctions.ToolMenuFocusBackColor();
+			if(!m_MenuUnusedSide2Custom)
+				m_MenuUnusedSide2=Color.Empty;
+			if(!m_BarDockedBorderCustom)
+				m_BarDockedBorder=SystemColors.ControlDarkDark;
+			if(!m_ItemSeparatorShadeCustom)
+				m_ItemSeparatorShade=SystemColors.ControlLightLight;
+
+			DockSiteBackColor=SystemColors.Control;
+			DockSiteBackColor2=ColorFunctions.MenuBackColor();
+
+			if(!m_CustomizeBackgroundCustom)
+				m_CustomizeBackground=SystemColors.ControlDark;
+			if(!m_CustomizeBackground2Custom)
+				m_CustomizeBackground2=ColorFunctions.MenuFocusBorderColor();
+			if(!m_CustomizeTextCustom)
+				m_CustomizeText=SystemColors.ControlText;
+
+			if(!m_PanelBackgroundCustom)
+				m_PanelBackground=(m_BarBackground2);
+			if(!m_PanelBackground2Custom)
+				m_PanelBackground2=System.Windows.Forms.ControlPaint.Dark(m_BarBackground2);
+			if(!m_PanelTextCustom)
+				m_PanelText=System.Windows.Forms.ControlPaint.LightLight(m_BarBackground);
+			if(!m_PanelBorderCustom)
+				m_PanelBorder=System.Windows.Forms.ControlPaint.DarkDark(m_BarBackground2);
+
+			if(!m_ExplorerBarBackgroundCustom) m_ExplorerBarBackground=m_MenuBarBackground;
+			if(!m_ExplorerBarBackground2Custom) m_ExplorerBarBackground2=m_ItemSeparator;
+		}
+
+		private void SchemeXpBlue()
+		{
+			if(!m_BarBackgroundCustom)
+				m_BarBackground=Color.FromArgb(239,237,222);
+			if(!m_BarStripeColorCustom)
+				m_BarStripeColor=Color.FromArgb(191,188,177);
+			if(!m_BarCaptionBackgroundCustom)
+				m_BarCaptionBackground=Color.FromArgb(172,168,153);
+			m_BarCaptionBackground2=Color.Empty;
+			if(!m_BarCaptionInactiveBackgroundCustom)
+				m_BarCaptionInactiveBackground=SystemColors.Control;
+			m_BarCaptionInactiveBackground2=Color.Empty;
+			if(!m_BarCaptionInactiveTextCustom)
+				m_BarCaptionInactiveText=SystemColors.ControlText;
+			if(!m_BarCaptionTextCustom)
+				m_BarCaptionText=Color.FromArgb(64,64,64);
+			if(!m_BarFloatingBorderCustom)
+				m_BarFloatingBorder=Color.FromArgb(172,168,153);
+			if(!m_BarPopupBackgroundCustom)
+				m_BarPopupBackground=Color.FromArgb(252,252,249);
+			if(!m_BarPopupBorderCustom)
+				m_BarPopupBorder=Color.FromArgb(138,134,122);
+			if(!m_ItemBackgroundCustom)
+				m_ItemBackground=Color.Empty;
+			if(!m_ItemBackground2Custom)
+				m_ItemBackground2=Color.Empty;
+			if(!m_ItemCheckedBackgroundCustom)
+				m_ItemCheckedBackground=Color.FromArgb(225,230,232);
+			if(!m_ItemCheckedBorderCustom)
+				m_ItemCheckedBorder=SystemColors.Highlight;
+			if(!m_ItemCheckedTextCustom)
+				m_ItemCheckedText=SystemColors.ControlText;
+			if(!m_ItemDisabledBackgroundCustom)
+				m_ItemDisabledBackground=Color.Empty;
+			if(!m_ItemDisabledTextCustom)
+				m_ItemDisabledText=SystemColors.ControlDark;
+			if(!m_ItemExpandedShadowCustom)
+				m_ItemExpandedShadow=SystemColors.ControlDark;
+			if(!m_ItemExpandedBackgroundCustom)
+				m_ItemExpandedBackground=Color.FromArgb(239,237,222);
+			if(!m_ItemExpandedTextCustom)
+				m_ItemExpandedText=SystemColors.ControlText;
+			if(!m_ItemHotBackgroundCustom)
+				m_ItemHotBackground=Color.FromArgb(193,210,238);
+			if(!m_ItemHotBorderCustom)
+				m_ItemHotBorder=SystemColors.Highlight;
+			if(!m_ItemHotTextCustom)
+				m_ItemHotText=SystemColors.ControlText;
+			if(!m_ItemPressedBackgroundCustom)
+				m_ItemPressedBackground=Color.FromArgb(152,181,226);
+			if(!m_ItemPressedBorderCustom)
+				m_ItemPressedBorder=SystemColors.Highlight;
+			if(!m_ItemPressedTextCustom)
+				m_ItemPressedText=Color.FromArgb(73,73,73);
+			if(!m_ItemSeparatorCustom)
+				m_ItemSeparator=Color.FromArgb(197,194,184);
+			if(!m_ItemTextCustom)
+				m_ItemText=SystemColors.ControlText;
+			if(!m_MenuBackgroundCustom)
+				m_MenuBackground=Color.FromArgb(252,252,249);
+			if(!m_MenuBarBackgroundCustom)
+				m_MenuBarBackground=SystemColors.Control;
+			if(!m_MenuBorderCustom)
+				m_MenuBorder=SystemColors.ControlDark;
+			if(!m_ItemExpandedBorderCustom)
+				m_ItemExpandedBorder=m_MenuBorder;
+			if(!m_MenuSideCustom)
+				m_MenuSide=Color.FromArgb(239,237,222);
+			if(!m_MenuUnusedBackgroundCustom)
+				m_MenuUnusedBackground=m_MenuBackground;
+			if(!m_MenuUnusedSideCustom)
+				m_MenuUnusedSide=Color.FromArgb(230,227,210);
+			if(!m_ItemDesignTimeBorderCustom)
+				m_ItemDesignTimeBorder=SystemColors.Highlight;
+
+			if(!m_BarBackground2Custom)
+				m_BarBackground2=Color.Empty;
+			if(!m_MenuBarBackground2Custom)
+				m_MenuBarBackground2=Color.Empty;
+			if(!m_ItemHotBackground2Custom)
+				m_ItemHotBackground2=Color.Empty;
+			if(!m_ItemPressedBackground2Custom)
+				m_ItemPressedBackground2=Color.Empty;
+			if(!m_ItemExpandedBackground2Custom)
+				m_ItemExpandedBackground2=Color.Empty;
+			if(!m_ItemCheckedBackground2Custom)
+				m_ItemCheckedBackground2=Color.Empty;
+			if(!m_MenuBackground2Custom)
+				m_MenuBackground2=Color.Empty;
+			if(!m_MenuSide2Custom)
+                m_MenuSide2=Color.Empty;
+			if(!m_MenuUnusedSide2Custom)
+				m_MenuUnusedSide2=Color.Empty;
+			if(!m_BarDockedBorderCustom)
+				m_BarDockedBorder=Color.Empty;
+			if(!m_ItemSeparatorShadeCustom)
+				m_ItemSeparatorShade=Color.Empty;
+
+			DockSiteBackColor=Color.Empty;
+			DockSiteBackColor2=Color.Empty;
+
+			if(!m_CustomizeBackgroundCustom)
+				m_CustomizeBackground=Color.Empty;
+			if(!m_CustomizeBackground2Custom)
+				m_CustomizeBackground2=Color.Empty;
+			if(!m_CustomizeTextCustom)
+				m_CustomizeText=Color.Empty;
+
+			if(!m_PanelBackgroundCustom)
+				m_PanelBackground=Color.FromArgb(89,135,214);
+			if(!m_PanelBackground2Custom)
+				m_PanelBackground2=Color.FromArgb(3,56,148);
+			if(!m_PanelTextCustom)
+				m_PanelText=Color.White;
+			if(!m_PanelBorderCustom)
+				m_PanelBorder=Color.FromArgb(0,45,150);
+
+			if(!m_ExplorerBarBackgroundCustom) m_ExplorerBarBackground=Color.FromArgb(123,162,231);
+			if(!m_ExplorerBarBackground2Custom) m_ExplorerBarBackground2=Color.FromArgb(99,117,214);
+		}
+		private void SchemeXpOliveGreen()
+		{
+			if(!m_BarBackgroundCustom)
+				m_BarBackground=Color.FromArgb(239,237,222);
+			if(!m_BarStripeColorCustom)
+				m_BarStripeColor=Color.FromArgb(191,188,177);
+			if(!m_BarCaptionBackgroundCustom)
+				m_BarCaptionBackground=Color.FromArgb(153,153,153);
+			m_BarCaptionBackground2=Color.Empty;
+			if(!m_BarCaptionInactiveBackgroundCustom)
+				m_BarCaptionInactiveBackground=SystemColors.Control;
+			m_BarCaptionInactiveBackground2=Color.Empty;
+			if(!m_BarCaptionInactiveTextCustom)
+				m_BarCaptionInactiveText=SystemColors.ControlText;
+			if(!m_BarCaptionTextCustom)
+				m_BarCaptionText=Color.FromArgb(64,64,64);
+			if(!m_BarFloatingBorderCustom)
+				m_BarFloatingBorder=Color.FromArgb(153,153,153);
+			if(!m_BarPopupBackgroundCustom)
+				m_BarPopupBackground=Color.FromArgb(252,252,249);
+			if(!m_BarPopupBorderCustom)
+				m_BarPopupBorder=Color.FromArgb(138,134,122);
+			if(!m_ItemBackgroundCustom)
+				m_ItemBackground=Color.Empty;
+			if(!m_ItemBackground2Custom)
+				m_ItemBackground2=Color.Empty;
+			if(!m_ItemCheckedBackgroundCustom)
+				m_ItemCheckedBackground=Color.FromArgb(234,235,223);
+			if(!m_ItemCheckedBorderCustom)
+				m_ItemCheckedBorder=SystemColors.Highlight;
+			if(!m_ItemCheckedTextCustom)
+				m_ItemCheckedText=SystemColors.ControlText;
+			if(!m_ItemDisabledBackgroundCustom)
+				m_ItemDisabledBackground=Color.Empty;
+			if(!m_ItemDisabledTextCustom)
+				m_ItemDisabledText=SystemColors.ControlDark;
+			if(!m_ItemExpandedShadowCustom)
+				m_ItemExpandedShadow=SystemColors.ControlDark;
+			if(!m_ItemExpandedBackgroundCustom)
+				m_ItemExpandedBackground=Color.FromArgb(239,237,222);
+			if(!m_ItemExpandedTextCustom)
+				m_ItemExpandedText=SystemColors.ControlText;
+			if(!m_ItemHotBackgroundCustom)
+				m_ItemHotBackground=Color.FromArgb(206,209,195);
+			if(!m_ItemHotBorderCustom)
+				m_ItemHotBorder=SystemColors.Highlight;
+			if(!m_ItemHotTextCustom)
+				m_ItemHotText=SystemColors.ControlText;
+			if(!m_ItemPressedBackgroundCustom)
+				m_ItemPressedBackground=Color.FromArgb(201,208,184);
+			if(!m_ItemPressedBorderCustom)
+				m_ItemPressedBorder=SystemColors.Highlight;
+			if(!m_ItemPressedTextCustom)
+				m_ItemPressedText=Color.FromArgb(102,102,102);
+			if(!m_ItemSeparatorCustom)
+				m_ItemSeparator=Color.FromArgb(197,194,184);
+			if(!m_ItemTextCustom)
+				m_ItemText=SystemColors.ControlText;
+			if(!m_MenuBackgroundCustom)
+				m_MenuBackground=Color.FromArgb(252,252,249);
+			if(!m_MenuBarBackgroundCustom)
+				m_MenuBarBackground=SystemColors.Control;
+			if(!m_MenuBorderCustom)
+				m_MenuBorder=SystemColors.ControlDark;
+			if(!m_ItemExpandedBorderCustom)
+				m_ItemExpandedBorder=m_MenuBorder;
+			if(!m_MenuSideCustom)
+				m_MenuSide=Color.FromArgb(239,237,222);
+			if(!m_MenuUnusedBackgroundCustom)
+				m_MenuUnusedBackground=m_MenuBackground;
+			if(!m_MenuUnusedSideCustom)
+				m_MenuUnusedSide=Color.FromArgb(230,227,210);
+			if(!m_ItemDesignTimeBorderCustom)
+				m_ItemDesignTimeBorder=SystemColors.Highlight;
+
+			if(!m_BarBackground2Custom)
+				m_BarBackground2=Color.Empty;
+			if(!m_MenuBarBackground2Custom)
+				m_MenuBarBackground2=Color.Empty;
+			if(!m_ItemHotBackground2Custom)
+				m_ItemHotBackground2=Color.Empty;
+			if(!m_ItemPressedBackground2Custom)
+				m_ItemPressedBackground2=Color.Empty;
+			if(!m_ItemExpandedBackground2Custom)
+				m_ItemExpandedBackground2=Color.Empty;
+			if(!m_ItemCheckedBackground2Custom)
+				m_ItemCheckedBackground2=Color.Empty;
+			if(!m_MenuBackground2Custom)
+				m_MenuBackground2=Color.Empty;
+			if(!m_MenuSide2Custom)
+				m_MenuSide2=Color.Empty;
+			if(!m_MenuUnusedSide2Custom)
+				m_MenuUnusedSide2=Color.Empty;
+			if(!m_BarDockedBorderCustom)
+				m_BarDockedBorder=Color.Empty;
+			if(!m_ItemSeparatorShadeCustom)
+				m_ItemSeparatorShade=Color.Empty;
+
+			DockSiteBackColor=Color.Empty;
+			DockSiteBackColor2=Color.Empty;
+
+			if(!m_CustomizeBackgroundCustom)
+				m_CustomizeBackground=Color.Empty;
+			if(!m_CustomizeBackground2Custom)
+				m_CustomizeBackground2=Color.Empty;
+			if(!m_CustomizeTextCustom)
+				m_CustomizeText=Color.Empty;
+
+			if(!m_PanelBackgroundCustom)
+				m_PanelBackground=Color.FromArgb(175,192,130);
+			if(!m_PanelBackground2Custom)
+				m_PanelBackground2=Color.FromArgb(99,122,68);
+			if(!m_PanelTextCustom)
+				m_PanelText=Color.White;
+			if(!m_PanelBorderCustom)
+				m_PanelBorder=Color.FromArgb(96,128,88);
+
+			if(!m_ExplorerBarBackgroundCustom) m_ExplorerBarBackground=Color.FromArgb(204,217,173);
+			if(!m_ExplorerBarBackground2Custom) m_ExplorerBarBackground2=Color.FromArgb(165,189,132);
+		}
+		private void SchemeXpSilver()
+		{
+			if(!m_BarBackgroundCustom)
+				m_BarBackground=Color.FromArgb(229,228,232);
+			if(!m_BarStripeColorCustom)
+				m_BarStripeColor=Color.FromArgb(179,179,182);
+			if(!m_BarCaptionBackgroundCustom)
+				m_BarCaptionBackground=Color.FromArgb(157,157,161);
+			m_BarCaptionBackground2=Color.Empty;
+			if(!m_BarCaptionInactiveBackgroundCustom)
+				m_BarCaptionInactiveBackground=SystemColors.Control;
+			m_BarCaptionInactiveBackground2=Color.Empty;
+			if(!m_BarCaptionInactiveTextCustom)
+				m_BarCaptionInactiveText=SystemColors.ControlText;
+			if(!m_BarCaptionTextCustom)
+				m_BarCaptionText=Color.FromArgb(53,53,53);
+			if(!m_BarFloatingBorderCustom)
+				m_BarFloatingBorder=Color.FromArgb(157,157,161);
+			if(!m_BarPopupBackgroundCustom)
+				m_BarPopupBackground=Color.FromArgb(251,250,251);
+			if(!m_BarPopupBorderCustom)
+				m_BarPopupBorder=Color.FromArgb(126,126,129);
+			if(!m_ItemBackgroundCustom)
+				m_ItemBackground=Color.Empty;
+			if(!m_ItemBackground2Custom)
+				m_ItemBackground2=Color.Empty;
+			if(!m_ItemCheckedBackgroundCustom)
+				m_ItemCheckedBackground=Color.FromArgb(233,234,237);
+			if(!m_ItemCheckedBorderCustom)
+				m_ItemCheckedBorder=SystemColors.Highlight;
+			if(!m_ItemCheckedTextCustom)
+				m_ItemCheckedText=SystemColors.ControlText;
+			if(!m_ItemDisabledBackgroundCustom)
+				m_ItemDisabledBackground=Color.Empty;
+			if(!m_ItemDisabledTextCustom)
+				m_ItemDisabledText=SystemColors.ControlDark;
+			if(!m_ItemExpandedShadowCustom)
+				m_ItemExpandedShadow=SystemColors.ControlDark;
+			if(!m_ItemExpandedBackgroundCustom)
+				m_ItemExpandedBackground=Color.FromArgb(229,228,232);
+			if(!m_ItemExpandedTextCustom)
+				m_ItemExpandedText=SystemColors.ControlText;
+			if(!m_ItemHotBackgroundCustom)
+				m_ItemHotBackground=Color.FromArgb(199,199,202);
+			if(!m_ItemHotBorderCustom)
+				m_ItemHotBorder=Color.FromArgb(169,171,181);
+			if(!m_ItemHotTextCustom)
+				m_ItemHotText=SystemColors.ControlText;
+			if(!m_ItemPressedBackgroundCustom)
+				m_ItemPressedBackground=Color.FromArgb(210,211,216);
+			if(!m_ItemPressedBorderCustom)
+				m_ItemPressedBorder=SystemColors.Highlight;
+			if(!m_ItemPressedTextCustom)
+				m_ItemPressedText=SystemColors.ControlText;
+			if(!m_ItemSeparatorCustom)
+				m_ItemSeparator=Color.FromArgb(186,186,189);
+			if(!m_ItemTextCustom)
+				m_ItemText=SystemColors.ControlText;
+			if(!m_MenuBackgroundCustom)
+				m_MenuBackground=Color.FromArgb(251,250,251);
+			if(!m_MenuBarBackgroundCustom)
+				m_MenuBarBackground=SystemColors.Control;
+			if(!m_MenuBorderCustom)
+				m_MenuBorder=SystemColors.ControlDark;
+			if(!m_ItemExpandedBorderCustom)
+				m_ItemExpandedBorder=m_MenuBorder;
+			if(!m_MenuSideCustom)
+				m_MenuSide=Color.FromArgb(229,228,232);
+			if(!m_MenuUnusedBackgroundCustom)
+				m_MenuUnusedBackground=m_MenuBackground;
+			if(!m_MenuUnusedSideCustom)
+				m_MenuUnusedSide=Color.FromArgb(217,216,220);
+			if(!m_ItemDesignTimeBorderCustom)
+				m_ItemDesignTimeBorder=SystemColors.Highlight;
+
+			if(!m_BarBackground2Custom)
+				m_BarBackground2=Color.Empty;
+			if(!m_MenuBarBackground2Custom)
+				m_MenuBarBackground2=Color.Empty;
+			if(!m_ItemHotBackground2Custom)
+				m_ItemHotBackground2=Color.Empty;
+			if(!m_ItemPressedBackground2Custom)
+				m_ItemPressedBackground2=Color.Empty;
+			if(!m_ItemExpandedBackground2Custom)
+				m_ItemExpandedBackground2=Color.Empty;
+			if(!m_ItemCheckedBackground2Custom)
+				m_ItemCheckedBackground2=Color.Empty;
+			if(!m_MenuBackground2Custom)
+				m_MenuBackground2=Color.Empty;
+			if(!m_MenuSide2Custom)
+				m_MenuSide2=Color.Empty;
+			if(!m_MenuUnusedSide2Custom)
+				m_MenuUnusedSide2=Color.Empty;
+			if(!m_BarDockedBorderCustom)
+				m_BarDockedBorder=Color.Empty;
+			if(!m_ItemSeparatorShadeCustom)
+				m_ItemSeparatorShade=Color.Empty;
+
+			DockSiteBackColor=Color.Empty;
+			DockSiteBackColor2=Color.Empty;
+
+			if(!m_CustomizeBackgroundCustom)
+				m_CustomizeBackground=Color.Empty;
+			if(!m_CustomizeBackground2Custom)
+				m_CustomizeBackground2=Color.Empty;
+			if(!m_CustomizeTextCustom)
+				m_CustomizeText=Color.Empty;
+
+			if(!m_PanelBackgroundCustom)
+				m_PanelBackground=Color.FromArgb(168,167,191);
+			if(!m_PanelBackground2Custom)
+				m_PanelBackground2=Color.FromArgb(112,111,145);
+			if(!m_PanelTextCustom)
+				m_PanelText=Color.White;
+			if(!m_PanelBorderCustom)
+				m_PanelBorder=Color.FromArgb(124,124,148);
+
+			if(!m_ExplorerBarBackgroundCustom) m_ExplorerBarBackground=Color.FromArgb(196,200,212);
+			if(!m_ExplorerBarBackground2Custom) m_ExplorerBarBackground2=Color.FromArgb(177,179,200);
+		}
+
+		private void SchemeXpBlue2003()
+		{
+			if(!m_BarBackgroundCustom)
+				m_BarBackground=Color.FromArgb(223,237,254);
+			if(!m_BarBackground2Custom)
+				m_BarBackground2=Color.FromArgb(142,179,231);
+			if(!m_BarStripeColorCustom)
+				m_BarStripeColor=Color.FromArgb(39,65,118);
+			if(!m_BarCaptionBackgroundCustom)
+				m_BarCaptionBackground=Color.FromArgb(42,102,201);
+			m_BarCaptionBackground2=Color.Empty;
+			if(!m_BarCaptionInactiveBackgroundCustom)
+				m_BarCaptionInactiveBackground=Color.FromArgb(42,102,201);
+			m_BarCaptionInactiveBackground2=Color.Empty;
+			if(!m_BarCaptionInactiveTextCustom)
+				m_BarCaptionInactiveText=Color.White;
+			if(!m_BarCaptionTextCustom)
+				m_BarCaptionText=Color.White;
+			if(!m_BarFloatingBorderCustom)
+				m_BarFloatingBorder=Color.FromArgb(42,102,201);
+			if(!m_BarPopupBackgroundCustom)
+				m_BarPopupBackground=Color.FromArgb(246,246,246);
+			if(!m_BarPopupBorderCustom)
+				m_BarPopupBorder=Color.FromArgb(0,45,150);
+			if(!m_ItemBackgroundCustom)
+				m_ItemBackground=Color.Empty;
+			if(!m_ItemBackground2Custom)
+				m_ItemBackground2=Color.Empty;
+			if(!m_ItemCheckedBackgroundCustom)
+				m_ItemCheckedBackground=Color.FromArgb(255,213,140);
+			if(!m_ItemCheckedBackground2Custom)
+				m_ItemCheckedBackground2=Color.FromArgb(255,173,85);
+			if(!m_ItemCheckedBorderCustom)
+				m_ItemCheckedBorder=Color.FromArgb(0,0,128);
+			if(!m_ItemCheckedTextCustom)
+				m_ItemCheckedText=SystemColors.ControlText;
+			if(!m_ItemDisabledBackgroundCustom)
+				m_ItemDisabledBackground=Color.Empty;
+			if(!m_ItemDisabledTextCustom)
+				m_ItemDisabledText=Color.FromArgb(141,141,141);
+			if(!m_ItemExpandedShadowCustom)
+				m_ItemExpandedShadow=Color.Empty;
+			if(!m_ItemExpandedBackgroundCustom)
+				m_ItemExpandedBackground=Color.FromArgb(227,239,255);
+			if(!m_ItemExpandedBackground2Custom)
+				m_ItemExpandedBackground2=Color.FromArgb(147,181,231);
+			if(!m_ItemExpandedTextCustom)
+				m_ItemExpandedText=SystemColors.ControlText;
+			if(!m_ItemHotBackgroundCustom)
+				m_ItemHotBackground=Color.FromArgb(255,244,204);
+			if(!m_ItemHotBackground2Custom)
+				m_ItemHotBackground2=Color.FromArgb(255,208,145);
+			if(!m_ItemHotBorderCustom)
+				m_ItemHotBorder=Color.FromArgb(0,0,128);
+			if(!m_ItemHotTextCustom)
+				m_ItemHotText=SystemColors.ControlText;
+			if(!m_ItemPressedBackgroundCustom)
+				m_ItemPressedBackground=Color.FromArgb(254,142,75);
+			if(!m_ItemPressedBackground2Custom)
+				m_ItemPressedBackground2=Color.FromArgb(255,207,139);
+			if(!m_ItemPressedBorderCustom)
+				m_ItemPressedBorder=Color.FromArgb(0,0,128);
+			if(!m_ItemPressedTextCustom)
+				m_ItemPressedText=SystemColors.ControlText;
+			if(!m_ItemSeparatorCustom)
+				m_ItemSeparator=Color.FromArgb(106,140,203);
+			if(!m_ItemSeparatorShadeCustom)
+				m_ItemSeparatorShade=Color.FromArgb(241,249,255);
+			if(!m_ItemTextCustom)
+				m_ItemText=SystemColors.ControlText;
+			if(!m_MenuBackgroundCustom)
+				m_MenuBackground=Color.FromArgb(246,246,246);
+			if(!m_MenuBackground2Custom)
+				m_MenuBackground2=Color.Empty;// Color.FromArgb(246,246,246);
+			if(!m_MenuBarBackgroundCustom)
+				m_MenuBarBackground=Color.FromArgb(158,190,245);
+			if(!m_MenuBorderCustom)
+				m_MenuBorder=Color.FromArgb(0,45,150);
+			if(!m_ItemExpandedBorderCustom)
+				m_ItemExpandedBorder=m_MenuBorder;
+			if(!m_MenuSideCustom)
+				m_MenuSide=Color.FromArgb(227,239,255);
+			if(!m_MenuSide2Custom)
+				m_MenuSide2=Color.FromArgb(135,173,228);
+			if(!m_MenuUnusedBackgroundCustom)
+				m_MenuUnusedBackground=m_MenuBackground;
+			if(!m_MenuUnusedSideCustom)
+				m_MenuUnusedSide=Color.FromArgb(203,221,246);
+			if(!m_MenuUnusedSide2Custom)
+				m_MenuUnusedSide2=Color.FromArgb(121,161,220);
+			if(!m_ItemDesignTimeBorderCustom)
+				m_ItemDesignTimeBorder=Color.FromArgb(0,0,128);
+			if(!m_BarDockedBorderCustom)
+				m_BarDockedBorder=Color.FromArgb(59,97,156);
+
+			DockSiteBackColor=Color.FromArgb(158,190,245);
+			DockSiteBackColor2=Color.FromArgb(195,218,249);
+
+			if(!m_CustomizeBackgroundCustom)
+				m_CustomizeBackground=Color.FromArgb(117,166,241);
+			if(!m_CustomizeBackground2Custom)
+				m_CustomizeBackground2=Color.FromArgb(0,53,145);
+			if(!m_CustomizeTextCustom)
+				m_CustomizeText=SystemColors.ControlText;
+
+			if(!m_PanelBackgroundCustom)
+				m_PanelBackground=Color.FromArgb(89,135,214);
+			if(!m_PanelBackground2Custom)
+				m_PanelBackground2=Color.FromArgb(3,56,148);
+			if(!m_PanelTextCustom)
+				m_PanelText=Color.White;
+			if(!m_PanelBorderCustom)
+				m_PanelBorder=Color.FromArgb(0,45,150);
+
+			if(!m_ExplorerBarBackgroundCustom) m_ExplorerBarBackground=Color.FromArgb(123,162,231);
+			if(!m_ExplorerBarBackground2Custom) m_ExplorerBarBackground2=Color.FromArgb(99,117,214);
+		}
+
+		private void SchemeXpOliveGreen2003()
+		{
+			if(!m_BarBackgroundCustom)
+				m_BarBackground=Color.FromArgb(244,247,222);
+			if(!m_BarBackground2Custom)
+				m_BarBackground2=Color.FromArgb(183,198,145);
+			if(!m_BarStripeColorCustom)
+				m_BarStripeColor=Color.FromArgb(81,94,51);
+			if(!m_BarCaptionBackgroundCustom)
+				m_BarCaptionBackground=Color.FromArgb(116,134,94);
+			m_BarCaptionBackground2=Color.Empty;
+			if(!m_BarCaptionInactiveBackgroundCustom)
+				m_BarCaptionInactiveBackground=Color.FromArgb(116,134,94);
+			m_BarCaptionInactiveBackground2=Color.Empty;
+			if(!m_BarCaptionInactiveTextCustom)
+				m_BarCaptionInactiveText=Color.White;
+			if(!m_BarCaptionTextCustom)
+				m_BarCaptionText=Color.White;
+			if(!m_BarFloatingBorderCustom)
+				m_BarFloatingBorder=Color.FromArgb(116,134,94);
+			if(!m_BarPopupBackgroundCustom)
+				m_BarPopupBackground=Color.FromArgb(244,244,238);
+			if(!m_BarPopupBorderCustom)
+				m_BarPopupBorder=Color.FromArgb(117,141,94);
+			if(!m_ItemBackgroundCustom)
+				m_ItemBackground=Color.Empty;
+			if(!m_ItemBackground2Custom)
+				m_ItemBackground2=Color.Empty;
+			if(!m_ItemCheckedBackgroundCustom)
+				m_ItemCheckedBackground=Color.FromArgb(255,213,140);
+			if(!m_ItemCheckedBackground2Custom)
+				m_ItemCheckedBackground2=Color.FromArgb(255,173,85);
+			if(!m_ItemCheckedBorderCustom)
+				m_ItemCheckedBorder=Color.FromArgb(63,93,56);
+			if(!m_ItemCheckedTextCustom)
+				m_ItemCheckedText=SystemColors.ControlText;
+			if(!m_ItemDisabledBackgroundCustom)
+				m_ItemDisabledBackground=Color.Empty;
+			if(!m_ItemDisabledTextCustom)
+				m_ItemDisabledText=Color.FromArgb(141,141,141);
+			if(!m_ItemExpandedShadowCustom)
+				m_ItemExpandedShadow=Color.Empty;
+			if(!m_ItemExpandedBackgroundCustom)
+				m_ItemExpandedBackground=Color.FromArgb(236,240,213);
+			if(!m_ItemExpandedBackground2Custom)
+				m_ItemExpandedBackground2=Color.FromArgb(194,206,159);
+			if(!m_ItemExpandedTextCustom)
+				m_ItemExpandedText=SystemColors.ControlText;
+			if(!m_ItemHotBackgroundCustom)
+				m_ItemHotBackground=Color.FromArgb(255,244,204);
+			if(!m_ItemHotBackground2Custom)
+				m_ItemHotBackground2=Color.FromArgb(255,208,145);
+			if(!m_ItemHotBorderCustom)
+				m_ItemHotBorder=Color.FromArgb(63,93,56);
+			if(!m_ItemHotTextCustom)
+				m_ItemHotText=SystemColors.ControlText;
+			if(!m_ItemPressedBackgroundCustom)
+				m_ItemPressedBackground=Color.FromArgb(254,142,75);
+			if(!m_ItemPressedBackground2Custom)
+				m_ItemPressedBackground2=Color.FromArgb(255,207,139);
+			if(!m_ItemPressedBorderCustom)
+				m_ItemPressedBorder=Color.FromArgb(63,93,56);
+			if(!m_ItemPressedTextCustom)
+				m_ItemPressedText=SystemColors.ControlText;
+			if(!m_ItemSeparatorCustom)
+				m_ItemSeparator=Color.FromArgb(96,128,88);
+			if(!m_ItemSeparatorShadeCustom)
+				m_ItemSeparatorShade=Color.FromArgb(244,247,222);
+			if(!m_ItemTextCustom)
+				m_ItemText=SystemColors.ControlText;
+			if(!m_MenuBackgroundCustom)
+				m_MenuBackground=Color.FromArgb(244,244,238);
+			if(!m_MenuBackground2Custom)
+				m_MenuBackground2=Color.Empty;
+			if(!m_MenuBarBackgroundCustom)
+				m_MenuBarBackground=Color.FromArgb(217,217,168);
+			if(!m_MenuBorderCustom)
+				m_MenuBorder=Color.FromArgb(117,141,94);
+			if(!m_ItemExpandedBorderCustom)
+				m_ItemExpandedBorder=m_MenuBorder;
+			if(!m_MenuSideCustom)
+				m_MenuSide=Color.FromArgb(255,255,237);
+			if(!m_MenuSide2Custom)
+				m_MenuSide2=Color.FromArgb(184,199,146);
+			if(!m_MenuUnusedBackgroundCustom)
+				m_MenuUnusedBackground=m_MenuBackground;
+			if(!m_MenuUnusedSideCustom)
+				m_MenuUnusedSide=Color.FromArgb(230,230,239);
+			if(!m_MenuUnusedSide2Custom)
+				m_MenuUnusedSide2=Color.FromArgb(164,180,120);
+			if(!m_ItemDesignTimeBorderCustom)
+				m_ItemDesignTimeBorder=Color.FromArgb(63,93,56);
+			if(!m_BarDockedBorderCustom)
+				m_BarDockedBorder=Color.FromArgb(96,128,88);
+
+			DockSiteBackColor=Color.FromArgb(217,217,167);
+			DockSiteBackColor2=Color.FromArgb(242,240,228);
+
+			if(!m_CustomizeBackgroundCustom)
+				m_CustomizeBackground=Color.FromArgb(176,194,140);
+			if(!m_CustomizeBackground2Custom)
+				m_CustomizeBackground2=Color.FromArgb(96,119,107);
+			if(!m_CustomizeTextCustom)
+				m_CustomizeText=SystemColors.ControlText;
+
+			if(!m_PanelBackgroundCustom)
+				m_PanelBackground=Color.FromArgb(175,192,130);
+			if(!m_PanelBackground2Custom)
+				m_PanelBackground2=Color.FromArgb(99,122,68);
+			if(!m_PanelTextCustom)
+				m_PanelText=Color.White;
+			if(!m_PanelBorderCustom)
+				m_PanelBorder=Color.FromArgb(96,128,88);
+
+			if(!m_ExplorerBarBackgroundCustom) m_ExplorerBarBackground=Color.FromArgb(204,217,173);
+			if(!m_ExplorerBarBackground2Custom) m_ExplorerBarBackground2=Color.FromArgb(165,189,132);
+		}
+
+		private void SchemeXpSilver2003()
+		{
+			if(!m_BarBackgroundCustom)
+				m_BarBackground=Color.FromArgb(243,244,250);
+			if(!m_BarBackground2Custom)
+				m_BarBackground2=Color.FromArgb(153,151,181);
+			if(!m_BarStripeColorCustom)
+				m_BarStripeColor=Color.FromArgb(84,84,117);
+			if(!m_BarCaptionBackgroundCustom)
+				m_BarCaptionBackground=Color.FromArgb(122,121,153);
+			m_BarCaptionBackground2=Color.Empty;
+			if(!m_BarCaptionInactiveBackgroundCustom)
+				m_BarCaptionInactiveBackground=Color.FromArgb(122,121,153);
+			m_BarCaptionInactiveBackground2=Color.Empty;
+			if(!m_BarCaptionInactiveTextCustom)
+				m_BarCaptionInactiveText=Color.White;
+			if(!m_BarCaptionTextCustom)
+				m_BarCaptionText=Color.White;
+			if(!m_BarFloatingBorderCustom)
+				m_BarFloatingBorder=Color.FromArgb(122,121,153);
+			if(!m_BarPopupBackgroundCustom)
+				m_BarPopupBackground=Color.FromArgb(253,250,255);
+			if(!m_BarPopupBorderCustom)
+				m_BarPopupBorder=Color.FromArgb(124,124,148);
+			if(!m_ItemBackgroundCustom)
+				m_ItemBackground=Color.Empty;
+			if(!m_ItemBackground2Custom)
+				m_ItemBackground2=Color.Empty;
+			if(!m_ItemCheckedBackgroundCustom)
+				m_ItemCheckedBackground=Color.FromArgb(255,213,140);
+			if(!m_ItemCheckedBackground2Custom)
+				m_ItemCheckedBackground2=Color.FromArgb(255,173,85);
+			if(!m_ItemCheckedBorderCustom)
+				m_ItemCheckedBorder=Color.FromArgb(75,75,111);
+			if(!m_ItemCheckedTextCustom)
+				m_ItemCheckedText=SystemColors.ControlText;
+			if(!m_ItemDisabledBackgroundCustom)
+				m_ItemDisabledBackground=Color.Empty;
+			if(!m_ItemDisabledTextCustom)
+				m_ItemDisabledText=Color.FromArgb(141,141,141);
+			if(!m_ItemExpandedShadowCustom)
+				m_ItemExpandedShadow=Color.Empty;
+			if(!m_ItemExpandedBackgroundCustom)
+				m_ItemExpandedBackground=Color.FromArgb(232,233,241);
+			if(!m_ItemExpandedBackground2Custom)
+				m_ItemExpandedBackground2=Color.FromArgb(177,176,198);
+			if(!m_ItemExpandedTextCustom)
+				m_ItemExpandedText=SystemColors.ControlText;
+			if(!m_ItemHotBackgroundCustom)
+				m_ItemHotBackground=Color.FromArgb(255,244,204);
+			if(!m_ItemHotBackground2Custom)
+				m_ItemHotBackground2=Color.FromArgb(255,208,145);
+			if(!m_ItemHotBorderCustom)
+				m_ItemHotBorder=Color.FromArgb(75,75,111);
+			if(!m_ItemHotTextCustom)
+				m_ItemHotText=SystemColors.ControlText;
+			if(!m_ItemPressedBackgroundCustom)
+				m_ItemPressedBackground=Color.FromArgb(254,142,75);
+			if(!m_ItemPressedBackground2Custom)
+				m_ItemPressedBackground2=Color.FromArgb(255,207,139);
+			if(!m_ItemPressedBorderCustom)
+				m_ItemPressedBorder=Color.FromArgb(75,75,111);
+			if(!m_ItemPressedTextCustom)
+				m_ItemPressedText=SystemColors.ControlText;
+			if(!m_ItemSeparatorCustom)
+				m_ItemSeparator=Color.FromArgb(110,109,143);
+			if(!m_ItemSeparatorShadeCustom)
+				m_ItemSeparatorShade=Color.White;
+			if(!m_ItemTextCustom)
+				m_ItemText=SystemColors.ControlText;
+			if(!m_MenuBackgroundCustom)
+				m_MenuBackground=Color.FromArgb(253,250,255);
+			if(!m_MenuBackground2Custom)
+				m_MenuBackground2=Color.Empty;
+			if(!m_MenuBarBackgroundCustom)
+				m_MenuBarBackground=Color.FromArgb(215,215,229);
+			if(!m_MenuBorderCustom)
+				m_MenuBorder=Color.FromArgb(124,124,148);
+			if(!m_ItemExpandedBorderCustom)
+				m_ItemExpandedBorder=m_MenuBorder;
+			if(!m_MenuSideCustom)
+				m_MenuSide=Color.FromArgb(249,249,255);
+			if(!m_MenuSide2Custom)
+				m_MenuSide2=Color.FromArgb(159,157,185);
+			if(!m_MenuUnusedBackgroundCustom)
+				m_MenuUnusedBackground=m_MenuBackground;
+			if(!m_MenuUnusedSideCustom)
+				m_MenuUnusedSide=Color.FromArgb(215,215,226);
+			if(!m_MenuUnusedSide2Custom)
+				m_MenuUnusedSide2=Color.FromArgb(128,126,158);
+			if(!m_ItemDesignTimeBorderCustom)
+				m_ItemDesignTimeBorder=Color.FromArgb(84,84,117);
+			if(!m_BarDockedBorderCustom)
+				m_BarDockedBorder=Color.FromArgb(124,124,148);
+
+			DockSiteBackColor=Color.FromArgb(215,215,229);
+			DockSiteBackColor2=Color.FromArgb(243,243,247);
+
+			if(!m_CustomizeBackgroundCustom)
+				m_CustomizeBackground=Color.FromArgb(179,178,200);
+			if(!m_CustomizeBackground2Custom)
+				m_CustomizeBackground2=Color.FromArgb(118,116,146);
+			if(!m_CustomizeTextCustom)
+				m_CustomizeText=SystemColors.ControlText;
+
+			if(!m_PanelBackgroundCustom)
+				m_PanelBackground=Color.FromArgb(168,167,191);
+			if(!m_PanelBackground2Custom)
+				m_PanelBackground2=Color.FromArgb(112,111,145);
+			if(!m_PanelTextCustom)
+				m_PanelText=Color.White;
+			if(!m_PanelBorderCustom)
+				m_PanelBorder=Color.FromArgb(124,124,148);
+
+			if(!m_ExplorerBarBackgroundCustom) m_ExplorerBarBackground=Color.FromArgb(196,200,212);
+			if(!m_ExplorerBarBackground2Custom) m_ExplorerBarBackground2=Color.FromArgb(177,179,200);
+		}
+
+		/// <summary>
+		/// VS.NET 2005 Blue Color Scheme
+		/// </summary>
+		private void SchemeXpBlueVS2005()
+		{
+			if(!m_BarBackgroundCustom)
+				m_BarBackground=Color.FromArgb(251,250,247);
+			if(!m_BarBackground2Custom)
+				m_BarBackground2=Color.FromArgb(181,181,154);
+			if(!m_BarStripeColorCustom)
+				m_BarStripeColor=Color.FromArgb(193,190,179);
+			if(!m_BarCaptionBackgroundCustom)
+				m_BarCaptionBackground=Color.FromArgb(0,84,227);
+			if(!m_BarCaptionBackground2Custom)
+				m_BarCaptionBackground2=Color.FromArgb(60,148,254);
+			if(!m_BarCaptionInactiveBackgroundCustom)
+				m_BarCaptionInactiveBackground=Color.FromArgb(216,215,198);
+			if(!m_BarCaptionInactiveBackground2Custom)
+				m_BarCaptionInactiveBackground2=Color.FromArgb(238,238,229);
+			if(!m_BarCaptionInactiveTextCustom)
+				m_BarCaptionInactiveText=Color.Black;
+			if(!m_BarCaptionTextCustom)
+				m_BarCaptionText=Color.White;
+			if(!m_BarFloatingBorderCustom)
+				m_BarFloatingBorder=Color.FromArgb(146,143,130);
+			if(!m_BarPopupBackgroundCustom)
+				m_BarPopupBackground=Color.FromArgb(252,252,249);
+			if(!m_BarPopupBorderCustom)
+				m_BarPopupBorder=Color.FromArgb(138,134,122);
+			if(!m_ItemBackgroundCustom)
+				m_ItemBackground=Color.Empty;
+			if(!m_ItemBackground2Custom)
+				m_ItemBackground2=Color.Empty;
+			if(!m_ItemCheckedBackgroundCustom)
+				m_ItemCheckedBackground=Color.FromArgb(225,230,232);
+			if(!m_ItemCheckedBackground2Custom)
+				m_ItemCheckedBackground2=Color.Empty;
+			if(!m_ItemCheckedBorderCustom)
+				m_ItemCheckedBorder=Color.FromArgb(49,106,197);
+			if(!m_ItemCheckedTextCustom)
+				m_ItemCheckedText=SystemColors.ControlText;
+			if(!m_ItemDisabledBackgroundCustom)
+				m_ItemDisabledBackground=Color.Empty;
+			if(!m_ItemDisabledTextCustom)
+				m_ItemDisabledText=Color.FromArgb(180,177,163);
+			if(!m_ItemExpandedShadowCustom)
+				m_ItemExpandedShadow=Color.Empty;
+			if(!m_ItemExpandedBackgroundCustom)
+				m_ItemExpandedBackground=Color.FromArgb(251,250,247);
+			if(!m_ItemExpandedBackground2Custom)
+				m_ItemExpandedBackground2=Color.Empty;
+			if(!m_ItemExpandedTextCustom)
+				m_ItemExpandedText=SystemColors.ControlText;
+			if(!m_ItemHotBackgroundCustom)
+				m_ItemHotBackground=Color.FromArgb(193,210,238);
+			if(!m_ItemHotBackground2Custom)
+				m_ItemHotBackground2=Color.Empty;
+			if(!m_ItemHotBorderCustom)
+				m_ItemHotBorder=Color.FromArgb(49,106,197);
+			if(!m_ItemHotTextCustom)
+				m_ItemHotText=SystemColors.ControlText;
+			if(!m_ItemPressedBackgroundCustom)
+				m_ItemPressedBackground=Color.FromArgb(152,181,226);
+			if(!m_ItemPressedBackground2Custom)
+				m_ItemPressedBackground2=Color.Empty;
+			if(!m_ItemPressedBorderCustom)
+				m_ItemPressedBorder=Color.FromArgb(75,75,111);
+			if(!m_ItemPressedTextCustom)
+				m_ItemPressedText=SystemColors.ControlText;
+			if(!m_ItemSeparatorCustom)
+				m_ItemSeparator=Color.FromArgb(197,194,184);
+			if(!m_ItemSeparatorShadeCustom)
+				m_ItemSeparatorShade=Color.Empty;
+			if(!m_ItemTextCustom)
+				m_ItemText=SystemColors.ControlText;
+			if(!m_MenuBackgroundCustom)
+				m_MenuBackground=Color.FromArgb(252,252,249);
+			if(!m_MenuBackground2Custom)
+				m_MenuBackground2=Color.Empty;
+			if(!m_MenuBarBackgroundCustom)
+				m_MenuBarBackground=Color.FromArgb(229,229,215);
+			if(!m_MenuBorderCustom)
+				m_MenuBorder=Color.FromArgb(138,134,122);
+			if(!m_ItemExpandedBorderCustom)
+				m_ItemExpandedBorder=m_MenuBorder;
+			if(!m_MenuSideCustom)
+				m_MenuSide=m_MenuBackground;
+			if(!m_MenuSide2Custom)
+				m_MenuSide2=Color.FromArgb(186,186,160);
+			if(!m_MenuUnusedBackgroundCustom)
+				m_MenuUnusedBackground=m_MenuBackground;
+			if(!m_MenuUnusedSideCustom)
+				m_MenuUnusedSide=m_MenuBackground;
+			if(!m_MenuUnusedSide2Custom)
+				m_MenuUnusedSide2=System.Windows.Forms.ControlPaint.Light(Color.FromArgb(186,186,160));
+			if(!m_ItemDesignTimeBorderCustom)
+				m_ItemDesignTimeBorder=Color.Black;
+			if(!m_BarDockedBorderCustom)
+				m_BarDockedBorder=Color.FromArgb(146,146,118);
+
+			DockSiteBackColor=Color.FromArgb(229,229,215);
+			DockSiteBackColor2=Color.FromArgb(250,250,247);
+
+			if(!m_CustomizeBackgroundCustom)
+				m_CustomizeBackground=Color.FromArgb(239,238,235);
+			if(!m_CustomizeBackground2Custom)
+				m_CustomizeBackground2=Color.FromArgb(152,152,126);
+			if(!m_CustomizeTextCustom)
+				m_CustomizeText=SystemColors.ControlText;
+
+			if(!m_PanelBackgroundCustom)
+				m_PanelBackground=Color.FromArgb(152,152,126);
+			if(!m_PanelBackground2Custom)
+				m_PanelBackground2=Color.Empty;
+			if(!m_PanelTextCustom)
+				m_PanelText=Color.Black;
+			if(!m_PanelBorderCustom)
+				m_PanelBorder=Color.FromArgb(172,168,235);
+
+			if(!m_ExplorerBarBackgroundCustom) m_ExplorerBarBackground=Color.FromArgb(123,162,231);
+			if(!m_ExplorerBarBackground2Custom) m_ExplorerBarBackground2=Color.FromArgb(99,117,214);
+		}
+
+		private void SchemeXpOliveGreenVS2005()
+		{
+			if(!m_BarBackgroundCustom)
+				m_BarBackground=GetColor("FAFAF6");
+			if(!m_BarBackground2Custom)
+				m_BarBackground2=GetColor("EDEADB");
+			if(!m_BarStripeColorCustom)
+				m_BarStripeColor=GetColor("C1BEB3");
+			if(!m_BarCaptionBackgroundCustom)
+				m_BarCaptionBackground=GetColor("8BA169");
+			if(!m_BarCaptionBackground2Custom)
+				m_BarCaptionBackground2=GetColor("C5D1A1");
+			if(!m_BarCaptionInactiveBackgroundCustom)
+				m_BarCaptionInactiveBackground=GetColor("D8D7C6");
+			if(!m_BarCaptionInactiveBackground2Custom)
+				m_BarCaptionInactiveBackground2=GetColor("EEEEE5");
+			if(!m_BarCaptionInactiveTextCustom)
+				m_BarCaptionInactiveText=Color.Black;
+			if(!m_BarCaptionTextCustom)
+				m_BarCaptionText=Color.White;
+			if(!m_BarFloatingBorderCustom)
+				m_BarFloatingBorder=GetColor("928F82");
+			if(!m_BarPopupBackgroundCustom)
+				m_BarPopupBackground=GetColor("FCFCF9");
+			if(!m_BarPopupBorderCustom)
+				m_BarPopupBorder=GetColor("8A867A");
+			if(!m_ItemBackgroundCustom)
+				m_ItemBackground=Color.Empty;
+			if(!m_ItemBackground2Custom)
+				m_ItemBackground2=Color.Empty;
+			if(!m_ItemCheckedBackgroundCustom)
+				m_ItemCheckedBackground=GetColor("B6C68D");
+			if(!m_ItemCheckedBackground2Custom)
+				m_ItemCheckedBackground2=Color.Empty;
+			if(!m_ItemCheckedBorderCustom)
+				m_ItemCheckedBorder=GetColor("93A070");
+			if(!m_ItemCheckedTextCustom)
+				m_ItemCheckedText=SystemColors.ControlText;
+			if(!m_ItemDisabledBackgroundCustom)
+				m_ItemDisabledBackground=Color.Empty;
+			if(!m_ItemDisabledTextCustom)
+				m_ItemDisabledText=GetColor("B4B1A3");
+			if(!m_ItemExpandedShadowCustom)
+				m_ItemExpandedShadow=Color.Empty;
+			if(!m_ItemExpandedBackgroundCustom)
+				m_ItemExpandedBackground=GetColor("F9F9F4");
+			if(!m_ItemExpandedBackground2Custom)
+				m_ItemExpandedBackground2=Color.Empty;
+			if(!m_ItemExpandedTextCustom)
+				m_ItemExpandedText=SystemColors.ControlText;
+			if(!m_ItemHotBackgroundCustom)
+				m_ItemHotBackground=GetColor("B6C68D");
+			if(!m_ItemHotBackground2Custom)
+				m_ItemHotBackground2=Color.Empty;
+			if(!m_ItemHotBorderCustom)
+				m_ItemHotBorder=GetColor("93A070");
+			if(!m_ItemHotTextCustom)
+				m_ItemHotText=SystemColors.ControlText;
+			if(!m_ItemPressedBackgroundCustom)
+				m_ItemPressedBackground=GetColor("93A070");
+			if(!m_ItemPressedBackground2Custom)
+				m_ItemPressedBackground2=Color.Empty;
+			if(!m_ItemPressedBorderCustom)
+				m_ItemPressedBorder=GetColor("93A070");
+			if(!m_ItemPressedTextCustom)
+				m_ItemPressedText=Color.White;
+			if(!m_ItemSeparatorCustom)
+				m_ItemSeparator=GetColor("C5C2B8");
+			if(!m_ItemSeparatorShadeCustom)
+				m_ItemSeparatorShade=Color.Empty;
+			if(!m_ItemTextCustom)
+				m_ItemText=SystemColors.ControlText;
+			if(!m_MenuBackgroundCustom)
+				m_MenuBackground=GetColor("FCFCF9");
+			if(!m_MenuBackground2Custom)
+				m_MenuBackground2=Color.Empty;
+			if(!m_MenuBarBackgroundCustom)
+				m_MenuBarBackground=GetColor("ECE9D8");
+			if(!m_MenuBorderCustom)
+				m_MenuBorder=GetColor("8A867A");
+			if(!m_ItemExpandedBorderCustom)
+				m_ItemExpandedBorder=m_MenuBorder;
+			if(!m_MenuSideCustom)
+				m_MenuSide=GetColor("FCFCF9");
+			if(!m_MenuSide2Custom)
+				m_MenuSide2=GetColor("EDEADB");
+			if(!m_MenuUnusedBackgroundCustom)
+				m_MenuUnusedBackground=m_MenuBackground;
+			if(!m_MenuUnusedSideCustom)
+				m_MenuUnusedSide=m_MenuSide;
+			if(!m_MenuUnusedSide2Custom)
+				m_MenuUnusedSide2=System.Windows.Forms.ControlPaint.Light(m_MenuSide2);
+			if(!m_ItemDesignTimeBorderCustom)
+				m_ItemDesignTimeBorder=Color.Black;
+			if(!m_BarDockedBorderCustom)
+				m_BarDockedBorder=GetColor("EFEDDE");
+
+			DockSiteBackColor=GetColor("ECE9D8");
+			DockSiteBackColor2=GetColor("FAF9F6");
+
+			if(!m_CustomizeBackgroundCustom)
+				m_CustomizeBackground=GetColor("EFEEEB");
+			if(!m_CustomizeBackground2Custom)
+				m_CustomizeBackground2=GetColor("ACA899");
+			if(!m_CustomizeTextCustom)
+				m_CustomizeText=SystemColors.ControlText;
+
+			if(!m_PanelBackgroundCustom)
+				m_PanelBackground=GetColor("E4E2D5");
+			if(!m_PanelBackground2Custom)
+				m_PanelBackground2=GetColor("E4E2D5");
+			if(!m_PanelTextCustom)
+				m_PanelText=Color.Black;
+			if(!m_PanelBorderCustom)
+				m_PanelBorder=GetColor("ACA899");
+
+			if(!m_ExplorerBarBackgroundCustom) m_ExplorerBarBackground=Color.FromArgb(204,217,173);
+			if(!m_ExplorerBarBackground2Custom) m_ExplorerBarBackground2=Color.FromArgb(165,189,132);
+		}
+
+		private void SchemeXpSilverVS2005()
+		{
+			if(!m_BarBackgroundCustom)
+				m_BarBackground=GetColor("F3F4FA");
+			if(!m_BarBackground2Custom)
+				m_BarBackground2=GetColor("9997B5");
+			if(!m_BarStripeColorCustom)
+				m_BarStripeColor=GetColor("545475");
+			if(!m_BarCaptionBackgroundCustom)
+				m_BarCaptionBackground=GetColor("A09EBA");
+			if(!m_BarCaptionBackground2Custom)
+				m_BarCaptionBackground2=GetColor("E1E2EC");
+			if(!m_BarCaptionInactiveBackgroundCustom)
+				m_BarCaptionInactiveBackground=GetColor("E0E0EB");
+			if(!m_BarCaptionInactiveBackground2Custom)
+				m_BarCaptionInactiveBackground2=GetColor("F2F2F6");
+			if(!m_BarCaptionInactiveTextCustom)
+				m_BarCaptionInactiveText=Color.Black;
+			if(!m_BarCaptionTextCustom)
+				m_BarCaptionText=Color.Black;
+			if(!m_BarFloatingBorderCustom)
+				m_BarFloatingBorder=GetColor("7A7999");
+			if(!m_BarPopupBackgroundCustom)
+				m_BarPopupBackground=GetColor("FDFAFF");
+			if(!m_BarPopupBorderCustom)
+				m_BarPopupBorder=GetColor("7C7C94");
+			if(!m_ItemBackgroundCustom)
+				m_ItemBackground=Color.Empty;
+			if(!m_ItemBackground2Custom)
+				m_ItemBackground2=Color.Empty;
+			if(!m_ItemCheckedBackgroundCustom)
+				m_ItemCheckedBackground=GetColor("FFD58C");
+			if(!m_ItemCheckedBackground2Custom)
+				m_ItemCheckedBackground2=GetColor("FFAD55");
+			if(!m_ItemCheckedBorderCustom)
+				m_ItemCheckedBorder=GetColor("4B4B6F");
+			if(!m_ItemCheckedTextCustom)
+				m_ItemCheckedText=SystemColors.ControlText;
+			if(!m_ItemDisabledBackgroundCustom)
+				m_ItemDisabledBackground=Color.Empty;
+			if(!m_ItemDisabledTextCustom)
+				m_ItemDisabledText=GetColor("8D8D8D");
+			if(!m_ItemExpandedShadowCustom)
+				m_ItemExpandedShadow=Color.Empty;
+			if(!m_ItemExpandedBackgroundCustom)
+				m_ItemExpandedBackground=GetColor("E8E9F1");
+			if(!m_ItemExpandedBackground2Custom)
+				m_ItemExpandedBackground2=GetColor("BAB9CD");
+			if(!m_ItemExpandedTextCustom)
+				m_ItemExpandedText=SystemColors.ControlText;
+			if(!m_ItemHotBackgroundCustom)
+				m_ItemHotBackground=GetColor("FFF4CC");
+			if(!m_ItemHotBackground2Custom)
+				m_ItemHotBackground2=GetColor("FFD091");
+			if(!m_ItemHotBorderCustom)
+				m_ItemHotBorder=GetColor("4B4B6F");
+			if(!m_ItemHotTextCustom)
+				m_ItemHotText=SystemColors.ControlText;
+			if(!m_ItemPressedBackgroundCustom)
+				m_ItemPressedBackground=GetColor("FE914E");
+			if(!m_ItemPressedBackground2Custom)
+				m_ItemPressedBackground2=GetColor("FFD38E");
+			if(!m_ItemPressedBorderCustom)
+				m_ItemPressedBorder=GetColor("4B4B6F");
+			if(!m_ItemPressedTextCustom)
+				m_ItemPressedText=Color.Black;
+			if(!m_ItemSeparatorCustom)
+				m_ItemSeparator=GetColor("6E6D8F");
+			if(!m_ItemSeparatorShadeCustom)
+				m_ItemSeparatorShade=Color.Empty;
+			if(!m_ItemTextCustom)
+				m_ItemText=SystemColors.ControlText;
+			if(!m_MenuBackgroundCustom)
+				m_MenuBackground=GetColor("FDFAFF");
+			if(!m_MenuBackground2Custom)
+				m_MenuBackground2=Color.Empty;
+			if(!m_MenuBarBackgroundCustom)
+				m_MenuBarBackground=GetColor("D7D7E5");
+			if(!m_MenuBorderCustom)
+				m_MenuBorder=GetColor("7C7C94");
+			if(!m_ItemExpandedBorderCustom)
+				m_ItemExpandedBorder=m_MenuBorder;
+			if(!m_MenuSideCustom)
+				m_MenuSide=GetColor("F9F9FF");
+			if(!m_MenuSide2Custom)
+				m_MenuSide2=GetColor("9F9DB9");
+			if(!m_MenuUnusedBackgroundCustom)
+				m_MenuUnusedBackground=m_MenuBackground;
+			if(!m_MenuUnusedSideCustom)
+				m_MenuUnusedSide=m_MenuSide;
+			if(!m_MenuUnusedSide2Custom)
+				m_MenuUnusedSide2=System.Windows.Forms.ControlPaint.Light(m_MenuSide2);
+			if(!m_ItemDesignTimeBorderCustom)
+				m_ItemDesignTimeBorder=Color.Black;
+			if(!m_BarDockedBorderCustom)
+				m_BarDockedBorder=GetColor("7C7C94");
+
+			DockSiteBackColor=GetColor("D7D7E5");
+			DockSiteBackColor2=GetColor("F3F3F7");
+
+			if(!m_CustomizeBackgroundCustom)
+				m_CustomizeBackground=GetColor("B3B2C8");
+			if(!m_CustomizeBackground2Custom)
+				m_CustomizeBackground2=GetColor("797794");
+			if(!m_CustomizeTextCustom)
+				m_CustomizeText=SystemColors.ControlText;
+
+			if(!m_PanelBackgroundCustom)
+				m_PanelBackground=GetColor("EEEEEE");
+			if(!m_PanelBackground2Custom)
+				m_PanelBackground2=GetColor("FFFFFF");
+			if(!m_PanelTextCustom)
+				m_PanelText=Color.Black;
+			if(!m_PanelBorderCustom)
+				m_PanelBorder=GetColor("9D9DA1");
+
+			if(!m_ExplorerBarBackgroundCustom) m_ExplorerBarBackground=Color.FromArgb(196,200,212);
+			if(!m_ExplorerBarBackground2Custom) m_ExplorerBarBackground2=Color.FromArgb(177,179,200);
+		}
+
+		internal static Color GetColor(string rgbHex)
+		{
+			if(rgbHex=="" || rgbHex==null)
+				return Color.Empty;
+			return Color.FromArgb(Convert.ToInt32(rgbHex.Substring(0,2),16),
+				Convert.ToInt32(rgbHex.Substring(2,2),16),
+				Convert.ToInt32(rgbHex.Substring(4,2),16));
+		}
+
+		/// <summary>
+		/// Converts hex string to Color type.
+		/// </summary>
+		/// <param name="rgb">Color representation as 32-bit RGB value.</param>
+		/// <returns>Reference to Color object.</returns>
+		internal static Color GetColor(int rgb)
+		{
+			if (rgb == -1) return Color.Empty;
+			return Color.FromArgb((rgb & 0xFF0000) >> 16, (rgb & 0xFF00) >> 8, rgb & 0xFF);
+		}
+		#endregion
+
+		#region Serialization
+		private string ColorToString(Color clr)
+		{
+			if(clr.IsSystemColor)
+				return ("."+clr.Name);
+			else
+				return clr.ToArgb().ToString();
+		}
+
+		private Color ColorFromString(string sclr)
+		{
+			if(sclr=="")
+				return Color.Empty;
+			if(sclr[0]=='.')
+				return Color.FromName(sclr.Substring(1));
+			else
+				return Color.FromArgb(System.Xml.XmlConvert.ToInt32(sclr));
+		}
+
+		/// <summary>
+		/// Serializes the color scheme object.
+		/// </summary>
+		/// <param name="xmlElem">XmlElement to serialize the object to.</param>
+		public void Serialize(System.Xml.XmlElement xmlElem)
+		{
+			if(m_BarBackgroundCustom)
+				xmlElem.SetAttribute("barback",ColorToString(m_BarBackground));
+			if(m_BarBackground2Custom)
+				xmlElem.SetAttribute("barback2",ColorToString(m_BarBackground2));
+			if(m_BarBackgroundGradientAngle!=90)
+				xmlElem.SetAttribute("barbackga",m_BarBackgroundGradientAngle.ToString());
+			if(m_BarStripeColorCustom)
+				xmlElem.SetAttribute("barstripeclr",ColorToString(m_BarStripeColor));
+			if(m_BarCaptionBackgroundCustom)
+				xmlElem.SetAttribute("barcapback",ColorToString(m_BarCaptionBackground));
+			if(m_BarCaptionBackground2Custom)
+				xmlElem.SetAttribute("barcapback2",ColorToString(m_BarCaptionBackground2));
+			if(m_BarCaptionBackgroundGradientAngle!=0)
+				xmlElem.SetAttribute("barcapbackga",m_BarCaptionBackgroundGradientAngle.ToString());
+			if(m_BarCaptionInactiveBackgroundCustom)
+				xmlElem.SetAttribute("barcapiback",ColorToString(m_BarCaptionInactiveBackground));
+			if(m_BarCaptionInactiveBackground2Custom)
+				xmlElem.SetAttribute("barcapiback2",ColorToString(m_BarCaptionInactiveBackground2));
+			if(m_BarCaptionInactiveBackgroundGAngle!=0)
+				xmlElem.SetAttribute("barcapibackga",m_BarCaptionInactiveBackgroundGAngle.ToString());
+			if(m_BarDockedBorderCustom)
+				xmlElem.SetAttribute("bardockborder",ColorToString(m_BarDockedBorder));
+			if(m_BarCaptionInactiveTextCustom)
+				xmlElem.SetAttribute("barcapitext",ColorToString(m_BarCaptionInactiveText));
+			if(m_BarCaptionTextCustom)
+				xmlElem.SetAttribute("barcaptext",ColorToString(m_BarCaptionText));
+			if(m_BarFloatingBorderCustom)
+				xmlElem.SetAttribute("barfloatb",ColorToString(m_BarFloatingBorder));
+			if(m_BarPopupBackgroundCustom)
+				xmlElem.SetAttribute("barpopupback",ColorToString(m_BarPopupBackground));
+			if(m_BarPopupBorderCustom)
+				xmlElem.SetAttribute("barpopupb",ColorToString(m_BarPopupBorder));
+			if(m_ItemBackgroundCustom)
+				xmlElem.SetAttribute("itemback",ColorToString(m_ItemBackground));
+			if(m_ItemBackground2Custom)
+				xmlElem.SetAttribute("itemback2",ColorToString(m_ItemBackground2));
+			if(m_ItemBackgroundGradientAngle!=90)
+				xmlElem.SetAttribute("itembackga",m_ItemBackgroundGradientAngle.ToString());
+			if(m_ItemCheckedBackgroundCustom)
+				xmlElem.SetAttribute("itemchkback",ColorToString(m_ItemCheckedBackground));
+			if(m_ItemCheckedBackground2Custom)
+				xmlElem.SetAttribute("itemchkback2",ColorToString(m_ItemCheckedBackground2));
+			if(m_ItemCheckedBackgroundGradientAngle!=90)
+				xmlElem.SetAttribute("itemchkbackga",m_ItemCheckedBackgroundGradientAngle.ToString());
+			if(m_ItemCheckedBorderCustom)
+				xmlElem.SetAttribute("itemchkb",ColorToString(m_ItemCheckedBorder));
+			if(m_ItemCheckedTextCustom)
+				xmlElem.SetAttribute("itemchktext",ColorToString(m_ItemCheckedText));
+			if(m_ItemDisabledBackgroundCustom && !m_ItemDisabledBackground.IsEmpty)
+				xmlElem.SetAttribute("itemdisback",ColorToString(m_ItemDisabledBackground));
+			if(m_ItemDisabledTextCustom)
+				xmlElem.SetAttribute("itemdistext",ColorToString(m_ItemDisabledText));
+			if(m_ItemExpandedShadowCustom)
+				xmlElem.SetAttribute("itemexpshadow",ColorToString(m_ItemExpandedShadow));
+			if(m_ItemExpandedBackgroundCustom)
+				xmlElem.SetAttribute("itemexpback",ColorToString(m_ItemExpandedBackground));
+			if(m_ItemExpandedBackground2Custom)
+				xmlElem.SetAttribute("itemexpback2",ColorToString(m_ItemExpandedBackground2));
+			if(m_ItemExpandedBackgroundGradientAngle!=90)
+				xmlElem.SetAttribute("itemexpbackga",m_ItemExpandedBackgroundGradientAngle.ToString());
+			if(m_ItemExpandedTextCustom)
+				xmlElem.SetAttribute("itemexptext",ColorToString(m_ItemExpandedText));
+			if(m_ItemExpandedBorderCustom)
+				xmlElem.SetAttribute("itemexpborder",ColorToString(m_ItemExpandedBorder));
+			if(m_ItemHotBackgroundCustom)
+				xmlElem.SetAttribute("itemhotback",ColorToString(m_ItemHotBackground));
+			if(m_ItemHotBackground2Custom)
+				xmlElem.SetAttribute("itemhotback2",ColorToString(m_ItemHotBackground2));
+			if(m_ItemHotBackgroundGradientAngle!=90)
+				xmlElem.SetAttribute("itemhotbackga",m_ItemHotBackgroundGradientAngle.ToString());
+			if(m_ItemHotBorderCustom)
+				xmlElem.SetAttribute("itemhotb",ColorToString(m_ItemHotBorder));
+			if(m_ItemHotTextCustom)
+				xmlElem.SetAttribute("itemhottext",ColorToString(m_ItemHotText));
+			if(m_ItemPressedBackgroundCustom)
+				xmlElem.SetAttribute("itempressback",ColorToString(m_ItemPressedBackground));
+			if(m_ItemPressedBackground2Custom)
+				xmlElem.SetAttribute("itempressback2",ColorToString(m_ItemPressedBackground2));
+			if(m_ItemPressedBackgroundGradientAngle!=90)
+				xmlElem.SetAttribute("itempressbackga",m_ItemPressedBackgroundGradientAngle.ToString());
+			if(m_ItemPressedBorderCustom)
+				xmlElem.SetAttribute("itempressb",ColorToString(m_ItemPressedBorder));
+			if(m_ItemPressedTextCustom)
+				xmlElem.SetAttribute("itempresstext",ColorToString(m_ItemPressedText));
+			if(m_ItemSeparatorCustom)
+				xmlElem.SetAttribute("itemsep",ColorToString(m_ItemSeparator));
+			if(m_ItemTextCustom)
+				xmlElem.SetAttribute("itemtext",ColorToString(m_ItemText));
+			if(m_MenuBackgroundCustom)
+				xmlElem.SetAttribute("menuback",ColorToString(m_MenuBackground));
+			if(m_MenuBackground2Custom)
+				xmlElem.SetAttribute("menuback2",ColorToString(m_MenuBackground2));
+			if(m_MenuBackgroundGradientAngle!=0)
+				xmlElem.SetAttribute("menubackga",m_MenuBackgroundGradientAngle.ToString());
+			if(m_MenuBarBackgroundCustom)
+				xmlElem.SetAttribute("menubarback",ColorToString(m_MenuBarBackground));
+			if(m_MenuBarBackground2Custom)
+				xmlElem.SetAttribute("menubarback2",ColorToString(m_MenuBarBackground2));
+			if(m_MenuBarBackgroundGradientAngle!=90)
+				xmlElem.SetAttribute("menubarbackga",m_MenuBarBackgroundGradientAngle.ToString());
+			if(m_MenuBorderCustom)
+				xmlElem.SetAttribute("menub",ColorToString(m_MenuBorder));
+			if(m_MenuSideCustom)
+				xmlElem.SetAttribute("menuside",ColorToString(m_MenuSide));
+			if(m_MenuSide2Custom)
+				xmlElem.SetAttribute("menuside2",ColorToString(m_MenuSide2));
+			if(m_MenuSideGradientAngle!=0)
+				xmlElem.SetAttribute("menusidega",m_MenuSideGradientAngle.ToString());
+			if(m_MenuUnusedBackgroundCustom)
+				xmlElem.SetAttribute("menuuback",ColorToString(m_MenuUnusedBackground));
+			if(m_MenuUnusedSideCustom)
+				xmlElem.SetAttribute("menuuside",ColorToString(m_MenuUnusedSide));
+			if(m_MenuUnusedSide2Custom)
+				xmlElem.SetAttribute("menuuside2",ColorToString(m_MenuUnusedSide2));
+			if(m_MenuSideGradientAngle!=0)
+				xmlElem.SetAttribute("menuusidega",m_MenuSideGradientAngle.ToString());
+			if(m_ItemDesignTimeBorderCustom)
+				xmlElem.SetAttribute("menudtb",ColorToString(m_ItemDesignTimeBorder));
+			if(m_CustomizeBackgroundCustom)
+				xmlElem.SetAttribute("customback",ColorToString(m_CustomizeBackground));
+			if(m_CustomizeBackground2Custom)
+				xmlElem.SetAttribute("customback2",ColorToString(m_CustomizeBackground2));
+			if(m_CustomizeTextCustom)
+				xmlElem.SetAttribute("customtext",ColorToString(m_CustomizeText));
+			if(m_CustomizeBackgroundGradientAngle!=90)
+				xmlElem.SetAttribute("custombackga",m_CustomizeBackgroundGradientAngle.ToString());
+
+			// Panel Colors
+			if(m_PanelBackgroundCustom)
+				xmlElem.SetAttribute("panelback",ColorToString(m_PanelBackground));
+			if(m_PanelBackground2Custom)
+				xmlElem.SetAttribute("panelback2",ColorToString(m_PanelBackground2));
+			if(m_PanelBorderCustom)
+				xmlElem.SetAttribute("panelborder",ColorToString(m_PanelBorder));
+			if(m_PanelTextCustom)
+				xmlElem.SetAttribute("paneltext",ColorToString(m_PanelText));
+			if(m_PanelBackgroundGradientAngle!=90)
+				xmlElem.SetAttribute("panelbackga",m_PanelBackgroundGradientAngle.ToString());
+
+			// Explorer Bar
+			if(m_ExplorerBarBackgroundCustom)
+				xmlElem.SetAttribute("exbarback",ColorToString(m_ExplorerBarBackground));
+			if(m_ExplorerBarBackground2Custom)
+				xmlElem.SetAttribute("exbarback2",ColorToString(m_ExplorerBarBackground2));
+			if(m_ExplorerBarBackgroundGradientAngle!=90)
+				xmlElem.SetAttribute("exbarbackga",m_ExplorerBarBackgroundGradientAngle.ToString());
+
+			if(m_PredefinedColorScheme!=ePredefinedColorScheme.AutoGenerated)
+				xmlElem.SetAttribute("predefcolorscheme",System.Xml.XmlConvert.ToString(((int)m_PredefinedColorScheme)));
+		}
+
+		/// <summary>
+		/// Deserializes color scheme object from XmlElement.
+		/// </summary>
+		/// <param name="xmlElem">Element to deserialize color scheme from.</param>
+		public void Deserialize(System.Xml.XmlElement xmlElem)
+		{
+			if(xmlElem.HasAttribute("predefcolorscheme"))
+				m_PredefinedColorScheme=(ePredefinedColorScheme)System.Xml.XmlConvert.ToInt32(xmlElem.GetAttribute("predefcolorscheme"));
+
+			this.Refresh();
+
+			if(xmlElem.HasAttribute("barback"))
+			{
+				m_BarBackground=ColorFromString(xmlElem.GetAttribute("barback"));
+				m_BarBackgroundCustom=true;
+			}
+			if(xmlElem.HasAttribute("barback2"))
+			{
+				m_BarBackground2=ColorFromString(xmlElem.GetAttribute("barback2"));
+				m_BarBackground2Custom=true;
+			}
+			if(xmlElem.HasAttribute("barbackga"))
+			{
+				m_BarBackgroundGradientAngle=System.Xml.XmlConvert.ToInt32(xmlElem.GetAttribute("barbackga"));
+			}
+			if(xmlElem.HasAttribute("barstripeclr"))
+			{
+				m_BarStripeColor=ColorFromString(xmlElem.GetAttribute("barstripeclr"));
+				m_BarStripeColorCustom=true;
+			}
+			if(xmlElem.HasAttribute("barcapback"))
+			{
+				m_BarCaptionBackground=ColorFromString(xmlElem.GetAttribute("barcapback"));
+				m_BarCaptionBackgroundCustom=true;
+			}
+			if(xmlElem.HasAttribute("barcapback2"))
+			{
+				m_BarCaptionBackground2=ColorFromString(xmlElem.GetAttribute("barcapback2"));
+				m_BarCaptionBackground2Custom=true;
+			}
+			if(xmlElem.HasAttribute("barcapbackga"))
+			{
+				m_BarCaptionBackgroundGradientAngle=System.Xml.XmlConvert.ToInt32(xmlElem.GetAttribute("barcapbackga"));
+			}
+			if(xmlElem.HasAttribute("barcapiback"))
+			{
+				m_BarCaptionInactiveBackground=ColorFromString(xmlElem.GetAttribute("barcapiback"));
+				m_BarCaptionInactiveBackgroundCustom=true;
+			}
+			if(xmlElem.HasAttribute("barcapiback2"))
+			{
+				m_BarCaptionInactiveBackground2=ColorFromString(xmlElem.GetAttribute("barcapiback2"));
+				m_BarCaptionInactiveBackground2Custom=true;
+			}
+			if(xmlElem.HasAttribute("barcapibackga"))
+			{
+				m_BarCaptionInactiveBackgroundGAngle=System.Xml.XmlConvert.ToInt32(xmlElem.GetAttribute("barcapibackga"));
+			}
+			if(xmlElem.HasAttribute("barcapitext"))
+			{
+				m_BarCaptionInactiveText=ColorFromString(xmlElem.GetAttribute("barcapitext"));
+				m_BarCaptionInactiveTextCustom=true;
+			}
+			if(xmlElem.HasAttribute("barcaptext"))
+			{
+				m_BarCaptionText=ColorFromString(xmlElem.GetAttribute("barcaptext"));
+				m_BarCaptionTextCustom=true;
+			}
+			if(xmlElem.HasAttribute("barfloatb"))
+			{
+				m_BarFloatingBorder=ColorFromString(xmlElem.GetAttribute("barfloatb"));
+				m_BarFloatingBorderCustom=true;
+			}
+			if(xmlElem.HasAttribute("bardockborder"))
+			{
+				m_BarDockedBorder=ColorFromString(xmlElem.GetAttribute("bardockborder"));
+				m_BarDockedBorderCustom=true;
+			}
+			if(xmlElem.HasAttribute("barpopupback"))
+			{
+				m_BarPopupBackground=ColorFromString(xmlElem.GetAttribute("barpopupback"));
+				m_BarPopupBackgroundCustom=true;
+			}
+			if(xmlElem.HasAttribute("barpopupb"))
+			{
+				m_BarPopupBorder=ColorFromString(xmlElem.GetAttribute("barpopupb"));
+				m_BarPopupBorderCustom=true;
+			}
+			if(xmlElem.HasAttribute("itemback"))
+			{
+				m_ItemBackground=ColorFromString(xmlElem.GetAttribute("itemback"));
+				m_ItemBackgroundCustom=true;
+			}
+			if(xmlElem.HasAttribute("itemback2"))
+			{
+				m_ItemBackground2=ColorFromString(xmlElem.GetAttribute("itemback2"));
+				m_ItemBackground2Custom=true;
+			}
+			if(xmlElem.HasAttribute("itembackga"))
+			{
+				m_ItemBackgroundGradientAngle=System.Xml.XmlConvert.ToInt32(xmlElem.GetAttribute("itembackga"));
+			}
+
+			if(xmlElem.HasAttribute("itemchkback"))
+			{
+				m_ItemCheckedBackground=ColorFromString(xmlElem.GetAttribute("itemchkback"));
+				m_ItemCheckedBackgroundCustom=true;
+			}
+			if(xmlElem.HasAttribute("itemchkback2"))
+			{
+				m_ItemCheckedBackground2=ColorFromString(xmlElem.GetAttribute("itemchkback2"));
+				m_ItemCheckedBackground2Custom=true;
+			}
+			if(xmlElem.HasAttribute("itemchkbackga"))
+			{
+				m_ItemCheckedBackgroundGradientAngle=System.Xml.XmlConvert.ToInt32(xmlElem.GetAttribute("itemchkbackga"));
+			}
+			if(xmlElem.HasAttribute("itemchkb"))
+			{
+				m_ItemCheckedBorder=ColorFromString(xmlElem.GetAttribute("itemchkb"));
+				m_ItemCheckedBorderCustom=true;
+			}
+			if(xmlElem.HasAttribute("itemchktext"))
+			{
+				m_ItemCheckedText=ColorFromString(xmlElem.GetAttribute("itemchktext"));
+				m_ItemCheckedTextCustom=true;
+			}
+			if(xmlElem.HasAttribute("itemdisback"))
+			{
+				m_ItemDisabledBackground=ColorFromString(xmlElem.GetAttribute("itemdisback"));
+				m_ItemDisabledBackgroundCustom=true;
+			}
+			if(xmlElem.HasAttribute("itemdistext"))
+			{
+				m_ItemDisabledText=ColorFromString(xmlElem.GetAttribute("itemdistext"));
+				m_ItemDisabledTextCustom=true;
+			}
+			if(xmlElem.HasAttribute("itemexpshadow"))
+			{
+				m_ItemExpandedShadow=ColorFromString(xmlElem.GetAttribute("itemexpshadow"));
+				m_ItemExpandedShadowCustom=true;
+			}
+			if(xmlElem.HasAttribute("itemexpback"))
+			{
+				m_ItemExpandedBackground=ColorFromString(xmlElem.GetAttribute("itemexpback"));
+				m_ItemExpandedBackgroundCustom=true;
+			}
+			if(xmlElem.HasAttribute("itemexpback2"))
+			{
+				m_ItemExpandedBackground2=ColorFromString(xmlElem.GetAttribute("itemexpback2"));
+				m_ItemExpandedBackground2Custom=true;
+			}
+			if(xmlElem.HasAttribute("itemexpbackga"))
+			{
+				m_ItemExpandedBackgroundGradientAngle=System.Xml.XmlConvert.ToInt32(xmlElem.GetAttribute("itemexpbackga"));
+			}
+			if(xmlElem.HasAttribute("itemexptext"))
+			{
+				m_ItemExpandedText=ColorFromString(xmlElem.GetAttribute("itemexptext"));
+				m_ItemExpandedTextCustom=true;
+			}
+			if(xmlElem.HasAttribute("itemexpborder"))
+			{
+				m_ItemExpandedBorder=ColorFromString(xmlElem.GetAttribute("itemexpborder"));
+				m_ItemExpandedBorderCustom=true;
+			}
+			if(xmlElem.HasAttribute("itemhotback"))
+			{
+				m_ItemHotBackground=ColorFromString(xmlElem.GetAttribute("itemhotback"));
+				m_ItemHotBackgroundCustom=true;
+			}
+			if(xmlElem.HasAttribute("itemhotback2"))
+			{
+				m_ItemHotBackground2=ColorFromString(xmlElem.GetAttribute("itemhotback2"));
+				m_ItemHotBackground2Custom=true;
+			}
+			if(xmlElem.HasAttribute("itemhotbackga"))
+			{
+				m_ItemHotBackgroundGradientAngle=System.Xml.XmlConvert.ToInt32(xmlElem.GetAttribute("itemhotbackga"));
+			}
+			if(xmlElem.HasAttribute("itemhotb"))
+			{
+				m_ItemHotBorder=ColorFromString(xmlElem.GetAttribute("itemhotb"));
+				m_ItemHotBorderCustom=true;
+			}
+			if(xmlElem.HasAttribute("itemhottext"))
+			{
+				m_ItemHotText=ColorFromString(xmlElem.GetAttribute("itemhottext"));
+				m_ItemHotTextCustom=true;
+			}
+			if(xmlElem.HasAttribute("itempressback"))
+			{
+				m_ItemPressedBackground=ColorFromString(xmlElem.GetAttribute("itempressback"));
+				m_ItemPressedBackgroundCustom=true;
+			}
+			if(xmlElem.HasAttribute("itempressback2"))
+			{
+				m_ItemPressedBackground2=ColorFromString(xmlElem.GetAttribute("itempressback2"));
+				m_ItemPressedBackground2Custom=true;
+			}
+			if(xmlElem.HasAttribute("itempressbackga"))
+			{
+				m_ItemPressedBackgroundGradientAngle=System.Xml.XmlConvert.ToInt32(xmlElem.GetAttribute("itempressbackga"));
+			}
+			if(xmlElem.HasAttribute("itempressb"))
+			{
+				m_ItemPressedBorder=ColorFromString(xmlElem.GetAttribute("itempressb"));
+				m_ItemPressedBorderCustom=true;
+			}
+			if(xmlElem.HasAttribute("itempresstext"))
+			{
+				m_ItemPressedText=ColorFromString(xmlElem.GetAttribute("itempresstext"));
+				m_ItemPressedTextCustom=true;
+			}
+			if(xmlElem.HasAttribute("itemsep"))
+			{
+				m_ItemSeparator=ColorFromString(xmlElem.GetAttribute("itemsep"));
+				m_ItemSeparatorCustom=true;
+			}
+			if(xmlElem.HasAttribute("itemtext"))
+			{
+				m_ItemText=ColorFromString(xmlElem.GetAttribute("itemtext"));
+				m_ItemTextCustom=true;
+			}
+			if(xmlElem.HasAttribute("menuback"))
+			{
+				m_MenuBackground=ColorFromString(xmlElem.GetAttribute("menuback"));
+				m_MenuBackgroundCustom=true;
+			}
+			if(xmlElem.HasAttribute("menuback2"))
+			{
+				m_MenuBackground2=ColorFromString(xmlElem.GetAttribute("menuback2"));
+				m_MenuBackground2Custom=true;
+			}
+			if(xmlElem.HasAttribute("menubackga"))
+			{
+				m_MenuBackgroundGradientAngle=System.Xml.XmlConvert.ToInt32(xmlElem.GetAttribute("menubackga"));
+			}
+			if(xmlElem.HasAttribute("menubarback"))
+			{
+				m_MenuBarBackground=ColorFromString(xmlElem.GetAttribute("menubarback"));
+				m_MenuBarBackgroundCustom=true;
+			}
+			if(xmlElem.HasAttribute("menubarback2"))
+			{
+				m_MenuBarBackground2=ColorFromString(xmlElem.GetAttribute("menubarback2"));
+				m_MenuBarBackground2Custom=true;
+			}
+			if(xmlElem.HasAttribute("menubarbackga"))
+			{
+				m_MenuBarBackgroundGradientAngle=System.Xml.XmlConvert.ToInt32(xmlElem.GetAttribute("menubarbackga"));
+			}
+			else m_MenuBarBackgroundGradientAngle=90;
+			if(xmlElem.HasAttribute("menub"))
+			{
+				m_MenuBorder=ColorFromString(xmlElem.GetAttribute("menub"));
+				m_MenuBorderCustom=true;
+			}
+			if(xmlElem.HasAttribute("menuside"))
+			{
+				m_MenuSide=ColorFromString(xmlElem.GetAttribute("menuside"));
+				m_MenuSideCustom=true;
+			}
+			if(xmlElem.HasAttribute("menuside2"))
+			{
+				m_MenuSide2=ColorFromString(xmlElem.GetAttribute("menuside2"));
+				m_MenuSide2Custom=true;
+			}
+			if(xmlElem.HasAttribute("menusidega"))
+			{
+				m_MenuSideGradientAngle=System.Xml.XmlConvert.ToInt32(xmlElem.GetAttribute("menusidega"));
+			}
+			if(xmlElem.HasAttribute("menuuback"))
+			{
+				m_MenuUnusedBackground=ColorFromString(xmlElem.GetAttribute("menuuback"));
+				m_MenuUnusedBackgroundCustom=true;
+			}
+			if(xmlElem.HasAttribute("menuuside"))
+			{
+				m_MenuUnusedSide=ColorFromString(xmlElem.GetAttribute("menuuside"));
+				m_MenuUnusedSideCustom=true;
+			}
+			if(xmlElem.HasAttribute("menuuside2"))
+			{
+				m_MenuUnusedSide2=ColorFromString(xmlElem.GetAttribute("menuuside2"));
+				m_MenuUnusedSide2Custom=true;
+			}
+			if(xmlElem.HasAttribute("menuusidega"))
+			{
+				m_MenuUnusedSideGradientAngle=System.Xml.XmlConvert.ToInt32(xmlElem.GetAttribute("menuusidega"));
+			}
+			if(xmlElem.HasAttribute("menudtb"))
+			{
+				m_ItemDesignTimeBorder=ColorFromString(xmlElem.GetAttribute("menudtb"));
+				m_ItemDesignTimeBorderCustom=true;
+			}
+			if(xmlElem.HasAttribute("customback"))
+			{
+				m_CustomizeBackground=ColorFromString(xmlElem.GetAttribute("customback"));
+				m_CustomizeBackgroundCustom=true;
+			}
+			if(xmlElem.HasAttribute("customback2"))
+			{
+				m_CustomizeBackground2=ColorFromString(xmlElem.GetAttribute("customback2"));
+				m_CustomizeBackground2Custom=true;
+			}
+			if(xmlElem.HasAttribute("customtext"))
+			{
+				m_CustomizeText=ColorFromString(xmlElem.GetAttribute("customtext"));
+				m_CustomizeTextCustom=true;
+			}
+			if(xmlElem.HasAttribute("custombackga"))
+			{
+				m_CustomizeBackgroundGradientAngle=System.Xml.XmlConvert.ToInt32(xmlElem.GetAttribute("custombackga"));
+			}
+
+			// Panel Colors
+			if(xmlElem.HasAttribute("panelback"))
+			{
+				m_PanelBackgroundCustom=true;
+				m_PanelBackground=ColorFromString(xmlElem.GetAttribute("panelback"));
+			}
+			if(xmlElem.HasAttribute("panelback2"))
+			{
+				m_PanelBackground2Custom=true;
+				m_PanelBackground2=ColorFromString(xmlElem.GetAttribute("panelback2"));
+			}
+			if(xmlElem.HasAttribute("panelborder"))
+			{
+				m_PanelBorderCustom=true;
+				m_PanelBorder=ColorFromString(xmlElem.GetAttribute("panelborder"));
+			}
+			if(xmlElem.HasAttribute("paneltext"))
+			{
+				m_PanelTextCustom=true;
+				m_PanelText=ColorFromString(xmlElem.GetAttribute("paneltext"));
+			}
+			if(xmlElem.HasAttribute("panelbackga"))
+			{
+				m_PanelBackgroundGradientAngle=System.Xml.XmlConvert.ToInt32(xmlElem.GetAttribute("panelbackga"));
+			}
+
+			// Explorer Bar Colors
+			if(xmlElem.HasAttribute("exbarback"))
+			{
+				m_ExplorerBarBackgroundCustom=true;
+				m_ExplorerBarBackground=ColorFromString(xmlElem.GetAttribute("exbarback"));
+			}
+			if(xmlElem.HasAttribute("exbarback2"))
+			{
+				m_ExplorerBarBackground2Custom=true;
+				m_ExplorerBarBackground2=ColorFromString(xmlElem.GetAttribute("exbarback2"));
+			}
+			if(xmlElem.HasAttribute("exbarbackga"))
+			{
+				m_ExplorerBarBackgroundGradientAngle=System.Xml.XmlConvert.ToInt32(xmlElem.GetAttribute("exbarbackga"));
+			}
+		}
+		#endregion
+	}
+
+	#region Enums
+	/// <summary>
+	/// Specifies the type of predefined color scheme in ColorScheme object.
+	/// </summary>
+	public enum ePredefinedColorScheme
+	{
+		/// <summary>
+		/// Default value. DotNetBar will automatically change and generate color scheme depending on system colors.
+		/// </summary>
+		AutoGenerated=0,
+		/// <summary>
+		/// Blue Office 2003 Color Scheme. This setting specifies that this color scheme will be used regardless of system color setting on user machine.
+		/// </summary>
+		Blue2003=1,
+		/// <summary>
+		/// Olive Green Office 2003 Color Scheme. This setting specifies that this color scheme will be used regardless of system color setting on user machine.
+		/// </summary>
+		OliveGreen2003=2,
+		/// <summary>
+		/// Silver Office 2003 Color Scheme. This setting specifies that this color scheme will be used regardless of system color setting on user machine.
+		/// </summary>
+		Silver2003=3
+	}
+
+	/// <summary>
+	///     Specifies a color scheme member.
+	/// </summary>
+	public enum eColorSchemePart
+	{
+		/// <summary>
+		/// Specifies bar background color.
+		/// </summary>
+		BarBackground,
+		/// <summary>
+		/// Specifies bar target gradient background color.
+		/// </summary>
+		BarBackground2,
+		/// <summary>
+		/// Specifies color of bar caption.
+		/// </summary>
+		BarCaptionBackground,
+		/// <summary>
+		/// Specifies  color of inactive bar caption.
+		/// </summary>
+		BarCaptionInactiveBackground,
+		/// <summary>
+		/// Specifies inactive caption text color.
+		/// </summary>
+		BarCaptionInactiveText,
+		/// <summary>
+		/// Specifies caption text color.
+		/// </summary>
+		BarCaptionText,
+		/// <summary>
+		/// Specifies color of docked bar border.
+		/// </summary>
+		BarDockedBorder,
+		/// <summary>
+		/// Specifies color of floating bar border.
+		/// </summary>
+		BarFloatingBorder,
+		/// <summary>
+		/// Specifies color of popup bar background. 
+		/// </summary>
+		BarPopupBackground,
+		/// <summary>
+		/// Specifies color of popup bar border. 
+		/// </summary>
+		BarPopupBorder,
+		/// <summary>
+		/// Specifies bar strips color.
+		/// </summary>
+		BarStripeColor,
+		/// <summary>
+		/// Specifies customize item background.
+		/// </summary>
+		CustomizeBackground,
+		/// <summary>
+		/// Specifies target gradient color for customize item background.
+		/// </summary>
+		CustomizeBackground2,
+		/// <summary>
+		/// Specifies text color of customize item.
+		/// </summary>
+		CustomizeText,
+		/// <summary>
+		/// Specifies background color of item.
+		/// </summary>
+		ItemBackground,
+		/// <summary>
+		/// Specifies background color of checked item.
+		/// </summary>
+		ItemCheckedBackground,
+		/// <summary>
+		/// Specifies target gradient background color of checked item.
+		/// </summary>
+		ItemCheckedBackground2,
+		/// <summary>
+		/// Specifies color if checked item border.
+		/// </summary>
+		ItemCheckedBorder,
+		/// <summary>
+		/// Specifies text color of checked item.
+		/// </summary>
+		ItemCheckedText,
+		/// <summary>
+		/// Specifies color of item design time border.
+		/// </summary>
+		ItemDesignTimeBorder,
+		/// <summary>
+		/// Specifies disabled item background color.
+		/// </summary>
+		ItemDisabledBackground,
+		/// <summary>
+		/// Specifies text color of disabled item.
+		/// </summary>
+		ItemDisabledText,
+		/// <summary>
+		/// Specifies background color of expanded item.
+		/// </summary>
+		ItemExpandedBackground,
+		/// <summary>
+		/// Specifies target gradient background color of expanded item.
+		/// </summary>
+		ItemExpandedBackground2,
+		/// <summary>
+		/// Specifies color of expanded item shadow.
+		/// </summary>
+		ItemExpandedShadow,
+		/// <summary>
+		/// Specifies color of expanded item text.
+		/// </summary>
+		ItemExpandedText,
+		/// <summary>
+		/// Specifies background color of hot item. 
+		/// </summary>
+		ItemHotBackground,
+		/// <summary>
+		/// Specifies target background gradient color of hot item.
+		/// </summary>
+		ItemHotBackground2,
+		/// <summary>
+		/// Specifies color of hot item border.
+		/// </summary>
+		ItemHotBorder,
+		/// <summary>
+		/// Specifies text color of hot item.
+		/// </summary>
+		ItemHotText,
+		/// <summary>
+		/// Specifies pressed item background color.
+		/// </summary>
+		ItemPressedBackground,
+		/// <summary>
+		/// Specifies target background color of pressed item. 
+		/// </summary>
+		ItemPressedBackground2,
+		/// <summary>
+		/// Specifies color of pressed item border.
+		/// </summary>
+        ItemPressedBorder,
+		/// <summary>
+		/// Specifies color of pressed item text.
+		/// </summary>
+        ItemPressedText,
+		/// <summary>
+		/// Specifies color of item separator.
+		/// </summary>
+		ItemSeparator,
+		/// <summary>
+		/// Specifies color of item separator shade.
+		/// </summary>
+		ItemSeparatorShade,
+		/// <summary>
+		/// Specifies color of item text.
+		/// </summary>
+        ItemText,
+		/// <summary>
+		/// Specifies menu background color.
+		/// </summary>
+        MenuBackground,
+		/// <summary>
+		/// Specifies target background color of menu.
+		/// </summary>
+		MenuBackground2,
+		/// <summary>
+		/// Specifies menu bar background color.
+		/// </summary>
+		MenuBarBackground,
+		/// <summary>
+		/// Specifies target gradient background color of menu bar.
+		/// </summary>
+        MenuBarBackground2,
+		/// <summary>
+		/// Specifies color of menu border.
+		/// </summary>
+		MenuBorder,
+		/// <summary>
+		/// Specifies color of menu side.
+		/// </summary>
+        MenuSide,
+		/// <summary>
+		/// Specifies target gradient background color of menu side.
+		/// </summary>
+		MenuSide2,
+		/// <summary>
+		/// Specifies background color of unused menu portion.
+		/// </summary>
+        MenuUnusedBackground,
+		/// <summary>
+		/// Specifies unused menu side color.
+		/// </summary>
+		MenuUnusedSide,
+		/// <summary>
+		/// Specifies target background color of unused menu side.
+		/// </summary>
+		MenuUnusedSide2,
+		/// <summary>
+		/// Specifies background color of panel.
+		/// </summary>
+		PanelBackground,
+		/// <summary>
+		/// Specifies target gradient background color of panel.
+		/// </summary>
+		PanelBackground2,
+		/// <summary>
+		/// Specifies color of panel border.
+		/// </summary>
+		PanelBorder,
+		/// <summary>
+		/// Specifies color of panel text.
+		/// </summary>
+		PanelText,
+		/// <summary>
+		/// Specifies explorer bar background color.
+		/// </summary>
+		ExplorerBarBackground,
+		/// <summary>
+		/// Specifies explorer bar target background gradient color.
+		/// </summary>
+		ExplorerBarBackground2,
+		/// <summary>
+		/// Specifies that color scheme color is not used.
+		/// </summary>
+		None
+	}
+	#endregion
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/ColorTypeEditor.cs b/PROMS/DotNetBar Source Code/TreeGX/ColorTypeEditor.cs
new file mode 100644
index 00000000..cd0a5a34
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/ColorTypeEditor.cs	
@@ -0,0 +1,99 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Reflection;
+using System.Windows.Forms.Design;
+using DevComponents.UI;
+
+#if TREEGX
+namespace DevComponents.Tree
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar
+#endif
+{
+	/// <summary>
+	/// Represents Color type editor with support for color schemes.
+	/// </summary>
+	public class ColorTypeEditor:UITypeEditor 
+	{
+		private IWindowsFormsEditorService m_EditorService=null;
+
+		/// <summary>
+		/// Edits the value of the specified object using the editor style indicated by GetEditStyle.
+		/// </summary>
+		/// <param name="context">An ITypeDescriptorContext that can be used to gain additional context information.</param>
+		/// <param name="provider">An IServiceProvider that this editor can use to obtain services.</param>
+		/// <param name="value">The object to edit.</param>
+		/// <returns>The new value of the object.</returns>
+		public override object EditValue(ITypeDescriptorContext context, IServiceProvider provider, object value) 
+		{
+			if (context != null && context.Instance != null && provider != null) 
+			{
+				m_EditorService = provider.GetService(typeof(IWindowsFormsEditorService)) as IWindowsFormsEditorService;
+
+				ColorScheme cs=null;
+				if(context.Instance!=null)
+				{
+					MethodInfo method=context.Instance.GetType().GetMethod("GetColorScheme",BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance);
+                    if(method!=null)
+                    {
+                    	cs=method.Invoke(context.Instance,null) as ColorScheme;
+                    }
+				}
+				
+				Color colorValue=(Color)value;
+
+				if(m_EditorService!=null)
+				{
+					ColorPicker colorPicker=new ColorPicker();
+					colorPicker.EditorService=m_EditorService;
+					colorPicker.BackColor=SystemColors.Control;
+					colorPicker.ColorScheme=cs;
+					colorPicker.SelectedColor=colorValue;
+
+					string propertyName=context.PropertyDescriptor.Name;
+					PropertyInfo property=context.Instance.GetType().GetProperty(propertyName+"SchemePart",BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance);
+					if(property!=null)
+					{
+						colorPicker.SelectedColorSchemeName=property.GetValue(context.Instance,null).ToString();	
+					}
+					colorPicker.UpdateUIWithSelection();
+
+					m_EditorService.DropDownControl(colorPicker);
+					if(!colorPicker.Canceled)
+					{
+						Color returnColor=colorPicker.SelectedColor;
+						eColorSchemePart schemePart=eColorSchemePart.None;
+						if(colorPicker.SelectedColorSchemeName!="")
+						{
+							schemePart=(eColorSchemePart)Enum.Parse(typeof(eColorSchemePart),colorPicker.SelectedColorSchemeName);
+						}
+						if(property!=null)
+						{
+							property.SetValue(context.Instance,schemePart,null);
+						}
+						return returnColor;
+					}
+				}
+			}
+
+			return value;
+		}
+
+		/// <summary>
+		/// Gets the editor style used by the EditValue method.
+		/// </summary>
+		/// <param name="context">An ITypeDescriptorContext that can be used to gain additional context information.</param>
+		/// <returns>A UITypeEditorEditStyle value that indicates the style of editor used by EditValue. If the UITypeEditor does not support this method, then GetEditStyle will return None.
+		/// </returns>
+		public override UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext context) 
+		{
+			if (context != null && context.Instance != null) 
+			{
+				return UITypeEditorEditStyle.DropDown;
+			}
+			return base.GetEditStyle(context);
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/ColumnHeader.cs b/PROMS/DotNetBar Source Code/TreeGX/ColumnHeader.cs
new file mode 100644
index 00000000..688a9e5c
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/ColumnHeader.cs	
@@ -0,0 +1,268 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+
+namespace DevComponents.Tree
+{
+	/// <summary>Represents the node or tree ColumnHeader.</summary>
+	[ToolboxItem(false)]
+	public class ColumnHeader:Component
+	{
+		#region Private Variables
+		private string m_Text="";
+		private ColumnWidth m_Width=null;
+		private string m_StyleNormal="";
+		private string m_StyleMouseDown="";
+		private string m_StyleMouseOver="";
+		private string m_ColumnName="";
+		private bool m_Visible=true;
+		private Rectangle m_Bounds=Rectangle.Empty;
+		private bool m_SizeChanged=true;
+		private string m_Name="";
+
+		internal event EventHandler HeaderSizeChanged;
+		#endregion
+
+		#region Constructor
+		/// <summary>
+		/// Creates new instance of the object.
+		/// </summary>
+		public ColumnHeader():this("")
+		{
+			
+		}
+
+		/// <summary>
+		/// Creates new instance of the object and initalizes it with text.
+		/// </summary>
+		/// <param name="text">Text to initalize object with.</param>
+		public ColumnHeader(string text)
+		{
+			m_Text=text;
+			m_Width=new ColumnWidth();
+			m_Width.WidthChanged+=new EventHandler(this.WidthChanged);
+		}
+		#endregion
+
+		#region Methods
+		/// <summary>
+		/// Makes a copy of ColumnHeader object.
+		/// </summary>
+		/// <returns>Returns new instance of column header object.</returns>
+		public virtual ColumnHeader Copy()
+		{
+			ColumnHeader c=new ColumnHeader();
+			c.ColumnName=this.ColumnName;
+			c.StyleMouseDown=this.StyleMouseDown;
+			c.StyleMouseOver=this.StyleMouseOver;
+			c.StyleNormal=this.StyleNormal;
+			c.Text=this.Text;
+			c.Visible=this.Visible;
+			c.Width.Absolute=this.Width.Absolute;
+			c.Width.Relative=this.Width.Relative;
+
+			return c;
+		}
+		#endregion
+
+		#region Properties
+		/// <summary>
+		/// Returns name of the column header that can be used to identify it from the code.
+		/// </summary>
+		[Browsable(false),Category("Design"),Description("Indicates the name used to identify column header.")]
+		public string Name
+		{
+			get
+			{
+				if(this.Site!=null)
+					m_Name=this.Site.Name;
+				return m_Name;
+			}
+			set
+			{
+				if(this.Site!=null)
+					this.Site.Name=value;
+				if(value==null)
+					m_Name="";
+				else
+					m_Name=value;
+			}
+		}
+		/// <summary>
+		/// Returns rectangle that this column occupies. If the layout has not been performed on the column the return value will be Rectangle.Empty.
+		/// </summary>
+		[Browsable(false)]
+		public Rectangle Bounds
+		{
+			get {return m_Bounds;}
+		}
+		/// <summary>
+		/// Sets the column bounds.
+		/// </summary>
+		internal void SetBounds(Rectangle bounds)
+		{
+			m_Bounds=bounds;
+		}
+		
+		/// <summary>
+		/// Gets the reference to the object that represents width of the column as either
+		/// absolute or relative value.
+		/// </summary>
+		/// <remarks>
+		/// Set Width using Absolute or Relative properties of ColumnWidth object.
+		/// </remarks>
+		/// <seealso cref="ColumnWidth.Absolute">Absolute Property (DevComponents.Tree.ColumnWidth)</seealso>
+		/// <seealso cref="ColumnWidth.Relative">Relative Property (DevComponents.Tree.ColumnWidth)</seealso>
+		[Browsable(true),Category("Layout"),Description("Gets or sets the width of the column."),DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+		public ColumnWidth Width
+		{
+			// TODO: Add Proper TypeConverter for ColumnWidth object and test design-time support
+			get {return m_Width;}
+		}
+
+		/// <summary>
+		/// Gets or sets the style class assigned to the column. Empty value indicates that
+		/// default style is used as specified on cell's parent's control.
+		/// </summary>
+		/// <value>
+		/// Name of the style assigned to the cell or an empty string indicating that default
+		/// style setting from tree control is applied. Default is empty string.
+		/// </value>
+		/// <remarks>
+		/// When property is set to an empty string the style setting from parent tree
+		/// controls is used. ColumnStyleNormal on TreeGX control is a root style for a cell.
+		/// </remarks>
+		/// <seealso cref="StyleMouseDown">StyleMouseDown Property</seealso>
+		/// <seealso cref="StyleMouseOver">StyleMouseOver Property</seealso>
+		[Browsable(true),DefaultValue(""),Category("Style"),Description("Indicates the style class assigned to the column.")]
+		public string StyleNormal
+		{
+			get {return m_StyleNormal;}
+			set
+			{
+				m_StyleNormal=value;
+				this.OnSizeChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the style class assigned to the column which is applied when mouse
+		/// button is pressed over the header. Empty value indicates that default
+		/// style is used as specified on column's parent.
+		/// </summary>
+		/// <value>
+		/// Name of the style assigned to the column or an empty string indicating that default
+		/// style setting from tree control is applied. Default is empty string.
+		/// </value>
+		/// <remarks>
+		/// When property is set to an empty string the style setting from parent tree
+		/// controls is used. ColumnStyleMouseDown on TreeGX control is a root style for a
+		/// cell.
+		/// </remarks>
+		/// <seealso cref="StyleNormal">StyleNormal Property</seealso>
+		/// <seealso cref="StyleMouseOver">StyleMouseOver Property</seealso>
+		[Browsable(true),DefaultValue(""),Category("Style"),Description("Indicates the style class assigned to the column when mouse is down.")]
+		public string StyleMouseDown
+		{
+			get {return m_StyleMouseDown;}
+			set
+			{
+				m_StyleMouseDown=value;
+				this.OnSizeChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the style class assigned to the column which is applied when mouse is
+		/// over the column. Empty value indicates that default style is used as specified on column's
+		/// parent control.
+		/// </summary>
+		/// <value>
+		/// Name of the style assigned to the column or an empty string indicating that default
+		/// style setting from tree control is applied. Default is empty string.
+		/// </value>
+		/// <remarks>
+		/// When property is set to an empty string the style setting from parent tree
+		/// controls is used. ColumnStyleMouseOver on TreeGX control is a root style for a
+		/// cell.
+		/// </remarks>
+		/// <seealso cref="StyleNormal">StyleNormal Property</seealso>
+		/// <seealso cref="StyleMouseDown">StyleMouseDown Property</seealso>
+		[Browsable(true),DefaultValue(""),Category("Style"),Description("Indicates the style class assigned to the cell when mouse is over the column.")]
+		public string StyleMouseOver
+		{
+			get {return m_StyleMouseOver;}
+			set
+			{
+				m_StyleMouseOver=value;
+				this.OnSizeChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the name of the column in the ColumnHeaderCollection.
+		/// </summary>
+		[Browsable(true),DefaultValue(""),Category("Data"),Description("Indicates the name of the column in the ColumnHeaderCollection.")]
+		public string ColumnName
+		{
+			get {return m_ColumnName;}
+			set
+			{
+				m_ColumnName=value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the column caption.
+		/// </summary>
+		[Browsable(true),DefaultValue(""),Category("Appearance"),Description("Indicates column caption.")]
+		public string Text
+		{
+			get {return m_Text;}
+			set
+			{
+				m_Text=value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets whether column is visible. Hidding the header column will also hide coresponding data column.
+		/// </summary>
+		[Browsable(true),DefaultValue(true),Category("Behavior"),Description("Indicates whether column is visible.")]
+		public bool Visible
+		{
+			get {return m_Visible;}
+			set
+			{
+				if(m_Visible!=value)
+				{
+					m_Visible=value;
+				}
+			}
+		}
+		#endregion
+
+		#region Internal Implementation
+		/// <summary>
+		/// Gets or sets whether column size has changed and it's layout needs to be recalculated.
+		/// </summary>
+		internal bool SizeChanged
+		{
+			get {return m_SizeChanged;}
+			set {m_SizeChanged=value;}
+		}
+
+		private void OnSizeChanged()
+		{
+			m_SizeChanged=true;
+			if(HeaderSizeChanged!=null)
+				HeaderSizeChanged(this,new EventArgs());
+		}
+
+		private void WidthChanged(object sender, EventArgs e)
+		{
+			this.OnSizeChanged();
+		}
+		#endregion
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/ColumnHeaderCollection.cs b/PROMS/DotNetBar Source Code/TreeGX/ColumnHeaderCollection.cs
new file mode 100644
index 00000000..263b8239
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/ColumnHeaderCollection.cs	
@@ -0,0 +1,163 @@
+using System;
+using System.Collections;
+using System.ComponentModel;
+
+namespace DevComponents.Tree 
+{
+	/// <summary>
+	/// Represents collection for ColumnHeader objects.
+	/// </summary>
+	public class ColumnHeaderCollection:CollectionBase 
+	{
+		#region Private Variables
+		private Node m_ParentNode=null;
+		#endregion
+
+		#region Internal Implementation
+		/// <summary>
+		/// Default constructor.
+		/// </summary>
+		public ColumnHeaderCollection()
+		{
+		}
+		/// <summary>
+		/// Gets or sets the node this collection is associated with.
+		/// </summary>
+		[Browsable(false),DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public Node ParentNode
+		{
+			get {return m_ParentNode;}
+		}
+		/// <summary>
+		/// Sets the node collection belongs to.
+		/// </summary>
+		/// <param name="parent">ColumnHeader that is parent of this collection.</param>
+		internal void SetParentNode(Node parent)
+		{
+			m_ParentNode=parent;
+		}
+
+		/// <summary>
+		/// Adds new object to the collection.
+		/// </summary>
+		/// <param name="ch">Object to add.</param>
+		/// <returns>Index of newly added object.</returns>
+		public int Add(ColumnHeader ch)
+		{
+			return List.Add(ch);
+		}
+		/// <summary>
+		/// Returns reference to the object in collection based on it's index.
+		/// </summary>
+		public ColumnHeader this[int index]
+		{
+			get {return (ColumnHeader)(List[index]);}
+			set {List[index] = value;}
+		}
+
+		/// <summary>
+		/// Inserts new object into the collection.
+		/// </summary>
+		/// <param name="index">Position of the object.</param>
+		/// <param name="value">Object to insert.</param>
+		public void Insert(int index, ColumnHeader value) 
+		{
+			List.Insert(index, value);
+		}
+
+		/// <summary>
+		/// Returns index of the object inside of the collection.
+		/// </summary>
+		/// <param name="value">Reference to the object.</param>
+		/// <returns>Index of the object.</returns>
+		public int IndexOf(ColumnHeader value) 
+		{
+			return List.IndexOf(value);
+		}
+
+		/// <summary>
+		/// Returns whether collection contains specified object.
+		/// </summary>
+		/// <param name="value">Object to look for.</param>
+		/// <returns>true if object is part of the collection, otherwise false.</returns>
+		public bool Contains(ColumnHeader value) 
+		{
+			return List.Contains(value);
+		}
+
+		/// <summary>
+		/// Removes specified object from the collection.
+		/// </summary>
+		/// <param name="value"></param>
+		public void Remove(ColumnHeader value) 
+		{
+			List.Remove(value);
+		}
+
+		protected override void OnRemoveComplete(int index,object value)
+		{
+			base.OnRemoveComplete(index,value);
+		}
+		protected override void OnInsertComplete(int index,object value)
+		{
+			base.OnInsertComplete(index,value);
+		}
+
+		/// <summary>
+		/// Copies collection into the specified array.
+		/// </summary>
+		/// <param name="array">Array to copy collection to.</param>
+		/// <param name="index">Starting index.</param>
+		public void CopyTo(ColumnHeader[] array, int index) 
+		{
+			List.CopyTo(array, index);
+		}
+
+		/// <summary>
+		/// Copies contained items to the ColumnHeader array.
+		/// </summary>
+		/// <param name="array">Array to copy to.</param>
+		internal void CopyTo(ColumnHeader[] array)
+		{
+			List.CopyTo(array,0);
+		}
+
+		protected override void OnClear()
+		{
+			base.OnClear();
+		}
+		#endregion
+	}
+
+	#region ColumnHeaderCollectionEditor
+	/// <summary>
+	/// Support for ColumnHeader tabs design-time editor.
+	/// </summary>
+	public class ColumnHeaderCollectionEditor:System.ComponentModel.Design.CollectionEditor
+	{
+		/// <summary>Creates new instance of the class</summary>
+		/// <param name="type">Type to initialize editor with.</param>
+		public ColumnHeaderCollectionEditor(Type type):base(type)
+		{
+		}
+		protected override Type CreateCollectionItemType()
+		{
+			return typeof(ColumnHeader);
+		}
+		protected override Type[] CreateNewItemTypes()
+		{
+			return new Type[] {typeof(ColumnHeader)};
+		}
+		protected override object CreateInstance(Type itemType)
+		{
+			object item=base.CreateInstance(itemType);
+			if(item is ColumnHeader)
+			{
+				ColumnHeader ch=item as ColumnHeader;
+				ch.Text=ch.Name;
+			}
+			return item;
+		}
+	}
+	#endregion
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/ColumnHeaderLayout.cs b/PROMS/DotNetBar Source Code/TreeGX/ColumnHeaderLayout.cs
new file mode 100644
index 00000000..4b804d9c
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/ColumnHeaderLayout.cs	
@@ -0,0 +1,76 @@
+using System;
+using System.Drawing;
+
+namespace DevComponents.Tree
+{
+	/// <summary>
+	/// Class that is used to layout column header.
+	/// </summary>
+	internal class ColumnHeaderLayout
+	{
+		public ColumnHeaderLayout()
+		{
+		}
+
+		// Assumes that layoutInfo is up-to-date and that Node that is connected with
+		// columns is already processed and it's size and location calculated.
+		// layoutInfo.Top member reflects the next position below the node
+		// layoutInfo.LevelOffset should reflect the X offset for the child nodes.
+		public static int LayoutColumnHeader(NodeLayoutContextInfo layoutInfo,int x, int y, int clientWidth, int cellHorizontalSpacing)
+		{
+			Node node=layoutInfo.ContextNode;
+            int height=0;
+			
+			foreach(ColumnHeader col in node.NodesColumns)
+			{
+				if(!col.Visible)
+					continue;
+
+				if(col.SizeChanged)
+				{
+					// Column for child nodes is always placed below the current node and
+					// is not included in the node's rectangle
+					Rectangle bounds=Rectangle.Empty;
+					bounds.X=x;
+					bounds.Y=y;
+					if(col.Width.Relative>0)
+						bounds.Width=(clientWidth*col.Width.Relative)/100-1;
+					else
+						bounds.Width=col.Width.Absolute;
+
+					if(col.StyleNormal=="" && col.StyleMouseDown=="" && col.StyleMouseOver=="")
+					{
+						bounds.Height=layoutInfo.DefaultHeaderSize.Height;
+					}
+					else
+					{
+						Size sz=Size.Empty;
+						if(col.StyleNormal!="")
+						{
+							ElementStyleLayout.CalculateStyleSize(layoutInfo.Styles[col.StyleNormal],layoutInfo.DefaultFont);
+							sz=layoutInfo.Styles[col.StyleNormal].Size;
+						}
+												
+						if(sz.Height==0)
+							bounds.Height=layoutInfo.DefaultHeaderSize.Height;
+						else
+							bounds.Height=sz.Height;
+					}
+
+					col.SetBounds(bounds);
+					col.SizeChanged=false;
+					
+					x+=(bounds.Width+cellHorizontalSpacing);
+
+					if(bounds.Height>height)
+						height=bounds.Height;
+				}
+				else if(col.Bounds.Height>height)
+					height=col.Bounds.Height;
+			}
+
+			return height;
+		}
+
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/ColumnWidth.cs b/PROMS/DotNetBar Source Code/TreeGX/ColumnWidth.cs
new file mode 100644
index 00000000..48fda742
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/ColumnWidth.cs	
@@ -0,0 +1,77 @@
+using System;
+using System.ComponentModel;
+
+namespace DevComponents.Tree
+{
+	/// <summary>
+	/// Represents the width of the Column. Supports absolute width in Pixels and
+	/// relative width as percentage of the width of parent control.
+	/// </summary>
+	public class ColumnWidth
+	{
+		private int m_Relative=0;
+		private int m_Absolute=0;
+		internal event EventHandler WidthChanged;
+
+		/// <summary>
+		/// Creates new instance of the object.
+		/// </summary>
+		public ColumnWidth()
+		{
+		}
+
+		/// <summary>
+		/// Gets or sets relative width expressed as percentage between 1-100. 0 indicates that
+		/// absolute width will be used.
+		/// </summary>
+		/// <remarks>
+		/// Relative width is expressed as percentage between 1-100 of the parent controls
+		/// width. 0 indicates that absolute width will be used. Absolute width always takes
+		/// priority over relative width. For example value of 30 assigned to this property
+		/// indicates that width of the column will be 30% of the total client width of the
+		/// control.
+		/// </remarks>
+		[DefaultValue(0),Browsable(true),Description("Gets or sets relative width in percent. Valid values are between 1-100 with 0 indicating that absolute width will be used.")]
+		public int Relative
+		{
+			get {return m_Relative;}
+			set
+			{
+				if(m_Relative!=value)
+				{
+					m_Relative=value;
+					OnSizeChanged();
+				}
+			}
+		}
+
+		/// <summary>Gets or sets the absolute width of the column in pixels.</summary>
+		/// <remarks>
+		/// Absolute width always takes precedence over the relative width of the
+		/// column.
+		/// </remarks>
+		[DefaultValue(0),Browsable(true),Description("Gets or sets the absolute width of the column in pixels.")]
+		public int Absolute
+		{
+			get {return m_Absolute;}
+			set
+			{
+				if(m_Absolute<0)
+					return;
+				if(m_Absolute!=value)
+				{
+					m_Absolute=value;
+					if(m_Absolute!=0)
+						m_Relative=0;
+					OnSizeChanged();
+				}
+			}
+		}
+
+		private void OnSizeChanged()
+		{
+			if(WidthChanged!=null)
+				WidthChanged(this,new EventArgs());
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/CommandButtonEventArgs.cs b/PROMS/DotNetBar Source Code/TreeGX/CommandButtonEventArgs.cs
new file mode 100644
index 00000000..852b7d8e
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/CommandButtonEventArgs.cs	
@@ -0,0 +1,30 @@
+using System;
+
+namespace DevComponents.Tree
+{
+	/// <summary>
+	/// Provides event arguments for command button events.
+	/// </summary>
+	public class CommandButtonEventArgs:EventArgs
+	{
+		/// <summary>
+		/// Default constructor.
+		/// </summary>
+		/// <param name="action">Action type.</param>
+		/// <param name="node">Context node.</param>
+		public CommandButtonEventArgs(eTreeAction action, Node node)
+		{
+			this.Action=action;
+			this.Node=node;
+		}
+		
+		/// <summary>
+		/// Indicates the action type that caused the event.
+		/// </summary>
+		public eTreeAction Action=eTreeAction.Code;
+		/// <summary>
+		/// Indicates the node action is peformed on.
+		/// </summary>
+		public DevComponents.Tree.Node Node=null;
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/ConnectorPointsCollection.cs b/PROMS/DotNetBar Source Code/TreeGX/ConnectorPointsCollection.cs
new file mode 100644
index 00000000..b86bba91
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/ConnectorPointsCollection.cs	
@@ -0,0 +1,154 @@
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.Drawing;
+
+namespace DevComponents.Tree
+{
+	/// <summary>
+	/// Represents collection of connector points for a node.
+	/// </summary>
+	public class ConnectorPointsCollection:CollectionBase 
+	{
+		#region Private Variables
+		private Node m_ParentNode=null;
+		#endregion
+
+		#region Internal Implementation
+		/// <summary>
+		/// Default constructor.
+		/// </summary>
+		public ConnectorPointsCollection()
+		{
+		}
+		/// <summary>
+		/// Gets or sets the node this collection is associated with.
+		/// </summary>
+		[Browsable(false),DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public Node ParentNode
+		{
+			get {return m_ParentNode;}
+		}
+		/// <summary>
+		/// Sets the node collection belongs to.
+		/// </summary>
+		/// <param name="parent">Node that is parent of this collection.</param>
+		internal void SetParentNode(Node parent)
+		{
+			m_ParentNode=parent;
+		}
+
+		/// <summary>
+		/// Adds new object to the collection.
+		/// </summary>
+		/// <param name="p">Object to add.</param>
+		/// <returns>Index of newly added object.</returns>
+		public int Add(Point p)
+		{
+			return List.Add(p);
+		}
+
+		/// <summary>
+		/// Adds range of objects to the array.
+		/// </summary>
+		/// <param name="ap">Array to add.</param>
+		public void AddRange(Point[] ap)
+		{
+			foreach(Point p in ap)
+				this.Add(p);
+		}
+
+		/// <summary>
+		/// Copies objects of the collection to the array.
+		/// </summary>
+		/// <returns></returns>
+		public Point[] ToArray()
+		{
+			Point[] ap=new Point[this.Count];
+			this.CopyTo(ap);
+			return ap;
+		}
+
+		/// <summary>
+		/// Returns reference to the object in collection based on it's index.
+		/// </summary>
+		public Point this[int index]
+		{
+			get {return (Point)(List[index]);}
+			set {List[index] = value;}
+		}
+
+		/// <summary>
+		/// Inserts new object into the collection.
+		/// </summary>
+		/// <param name="index">Position of the object.</param>
+		/// <param name="value">Object to insert.</param>
+		public void Insert(int index, Point value) 
+		{
+			List.Insert(index, value);
+		}
+
+		/// <summary>
+		/// Returns index of the object inside of the collection.
+		/// </summary>
+		/// <param name="value">Reference to the object.</param>
+		/// <returns>Index of the object.</returns>
+		public int IndexOf(Point value) 
+		{
+			return List.IndexOf(value);
+		}
+
+		/// <summary>
+		/// Returns whether collection contains specified object.
+		/// </summary>
+		/// <param name="value">Object to look for.</param>
+		/// <returns>true if object is part of the collection, otherwise false.</returns>
+		public bool Contains(Point value) 
+		{
+			return List.Contains(value);
+		}
+
+		/// <summary>
+		/// Removes specified object from the collection.
+		/// </summary>
+		/// <param name="value"></param>
+		public void Remove(Point value) 
+		{
+			List.Remove(value);
+		}
+
+		protected override void OnRemoveComplete(int index,object value)
+		{
+			base.OnRemoveComplete(index,value);
+		}
+		protected override void OnInsertComplete(int index,object value)
+		{
+			base.OnInsertComplete(index,value);
+		}
+
+		/// <summary>
+		/// Copies collection into the specified array.
+		/// </summary>
+		/// <param name="array">Array to copy collection to.</param>
+		/// <param name="index">Starting index.</param>
+		public void CopyTo(Point[] array, int index) 
+		{
+			List.CopyTo(array, index);
+		}
+
+		/// <summary>
+		/// Copies contained items to the ColumnHeader array.
+		/// </summary>
+		/// <param name="array">Array to copy to.</param>
+		internal void CopyTo(Point[] array)
+		{
+			List.CopyTo(array,0);
+		}
+
+		protected override void OnClear()
+		{
+			base.OnClear();
+		}
+		#endregion
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/ContentManager/BlockLayoutManager.cs b/PROMS/DotNetBar Source Code/TreeGX/ContentManager/BlockLayoutManager.cs
new file mode 100644
index 00000000..1da5a75f
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/ContentManager/BlockLayoutManager.cs	
@@ -0,0 +1,44 @@
+using System.Collections;
+using System.Drawing;
+
+#if TREEGX
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.UI.ContentManager
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#endif
+{
+	/// <summary>
+	/// Represents block layout manager responsible for sizing the content blocks.
+	/// </summary>
+	public abstract class BlockLayoutManager
+	{
+		private Graphics m_Graphics;
+
+	    /// <summary>
+		/// Resizes the content block and sets it's Bounds property to reflect new size.
+		/// </summary>
+		/// <param name="block">Content block to resize.</param>
+        /// <param name="availableSize">Content size available for the block in the given line.</param>
+		public abstract void Layout(IBlock block, Size availableSize);
+
+        /// <summary>
+        /// Performs layout finalization
+        /// </summary>
+        /// <param name="containerBounds"></param>
+        /// <param name="blocksBounds"></param>
+        /// <param name="lines"></param>
+        /// <returns></returns>
+        public abstract Rectangle FinalizeLayout(Rectangle containerBounds, Rectangle blocksBounds, ArrayList lines);
+
+		/// <summary>
+		/// Gets or sets the graphics object used by layout manager.
+		/// </summary>
+		public System.Drawing.Graphics Graphics
+		{
+			get {return m_Graphics;}
+			set {m_Graphics=value;}
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/ContentManager/Enums.cs b/PROMS/DotNetBar Source Code/TreeGX/ContentManager/Enums.cs
new file mode 100644
index 00000000..365ebd0f
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/ContentManager/Enums.cs	
@@ -0,0 +1,62 @@
+using System;
+
+#if TREEGX
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.UI.ContentManager
+#endif
+
+{
+	/// <summary>
+	/// Specifies orientation of content.
+	/// </summary>
+	public enum eContentOrientation
+	{
+		/// <summary>
+		/// Indicates Horizontal orientation of the content.
+		/// </summary>
+		Horizontal,
+		/// <summary>
+		/// Indicates Vertical orientation of the content.
+		/// </summary>
+		Vertical
+	}
+
+	/// <summary>
+	/// Specifies content horizontal alignment.
+	/// </summary>
+	public enum eContentAlignment
+	{
+		/// <summary>
+		/// Content is left aligned.UI
+		/// </summary>
+		Left,
+		/// <summary>
+		/// Content is right aligned.
+		/// </summary>
+		Right,
+		/// <summary>
+		/// Content is centered.
+		/// </summary>
+		Center
+	}
+
+	/// <summary>
+	/// Specifies content vertical alignment.
+	/// </summary>
+	public enum eContentVerticalAlignment
+	{
+		/// <summary>
+		/// Content is top aligned.
+		/// </summary>
+		Top,
+		/// <summary>
+		/// Content is bottom aligned.
+		/// </summary>
+		Bottom,
+		/// <summary>
+		/// Content is in the middle.
+		/// </summary>
+		Middle
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/ContentManager/IBlock.cs b/PROMS/DotNetBar Source Code/TreeGX/ContentManager/IBlock.cs
new file mode 100644
index 00000000..278629af
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/ContentManager/IBlock.cs	
@@ -0,0 +1,25 @@
+using System;
+using System.Drawing;
+
+#if TREEGX
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.UI.ContentManager
+#endif
+
+{
+	/// <summary>
+	/// Represents a content block interface.
+	/// </summary>
+	public interface IBlock
+	{
+		/// <summary>
+		/// Gets or sets the bounds of the content block.
+		/// </summary>
+		Rectangle Bounds {get;set;}
+		/// <summary>
+		/// Gets or sets whether content block is visible.
+		/// </summary>
+		bool Visible {get;set;}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/ContentManager/IBlockExtended.cs b/PROMS/DotNetBar Source Code/TreeGX/ContentManager/IBlockExtended.cs
new file mode 100644
index 00000000..38932ff1
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/ContentManager/IBlockExtended.cs	
@@ -0,0 +1,19 @@
+using System;
+using System.Text;
+
+#if TREEGX
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.UI.ContentManager
+#endif
+
+{
+    /// <summary>
+    /// Represents a extended content block interface for advanced layout information.
+    /// </summary>
+    public interface IBlockExtended : IBlock
+    {
+        bool IsBlockElement { get;}
+        bool IsNewLineAfterElement { get;}
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/ContentManager/IContentLayoutManager.cs b/PROMS/DotNetBar Source Code/TreeGX/ContentManager/IContentLayoutManager.cs
new file mode 100644
index 00000000..46d11a2d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/ContentManager/IContentLayoutManager.cs	
@@ -0,0 +1,25 @@
+using System;
+using System.Drawing;
+
+#if TREEGX
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.UI.ContentManager
+#endif
+
+{
+	/// <summary>
+	/// Represents interface for block layout.
+	/// </summary>
+	public interface IContentLayout
+	{
+		/// <summary>
+		/// Performs layout of the content block.
+		/// </summary>
+		/// <param name="containerBounds">Container bounds to layout content blocks in.</param>
+		/// <param name="contentBlocks">Content blocks to layout.</param>
+		/// <param name="blockLayout">Block layout manager that resizes the content blocks.</param>
+		/// <returns>The bounds of the content blocks within the container bounds.</returns>
+		Rectangle Layout(Rectangle containerBounds, IBlock[] contentBlocks, BlockLayoutManager blockLayout);
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/ContentManager/SerialContentLayoutManager.cs b/PROMS/DotNetBar Source Code/TreeGX/ContentManager/SerialContentLayoutManager.cs
new file mode 100644
index 00000000..901ec296
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/ContentManager/SerialContentLayoutManager.cs	
@@ -0,0 +1,559 @@
+using System;
+using System.Collections;
+using System.Drawing;
+
+#if TREEGX
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.UI.ContentManager
+#endif
+
+{
+	/// <summary>
+	/// Represents the serial content layout manager that arranges content blocks in series next to each other.
+	/// </summary>
+	public class SerialContentLayoutManager:IContentLayout
+    {
+        #region Events
+        /// <summary>
+        /// Occurs when X, Y position of next block is calcualted.
+        /// </summary>
+        public event LayoutManagerPositionEventHandler NextPosition;
+
+        /// <summary>
+        /// Occurs before new block is layed out.
+        /// </summary>
+        public event LayoutManagerLayoutEventHandler BeforeNewBlockLayout;
+        #endregion
+
+        #region Private Variables
+        private int m_BlockSpacing=0;
+		private bool m_FitContainerOversize=false;
+		private bool m_FitContainer=false;
+        private bool m_VerticalFitContainerWidth = false;
+		private eContentOrientation m_ContentOrientation=eContentOrientation.Horizontal;
+		private eContentAlignment m_ContentAlignment=eContentAlignment.Left;
+		private eContentVerticalAlignment m_ContentVerticalAlignment=eContentVerticalAlignment.Middle;
+        private eContentVerticalAlignment m_BlockLineAlignment = eContentVerticalAlignment.Middle;
+		private bool m_EvenHeight=false;
+		private bool m_MultiLine=false;
+        private bool m_RightToLeft = false;
+		#endregion
+
+		/// <summary>
+		/// Creates new instance of the class.
+		/// </summary>
+		public SerialContentLayoutManager()
+		{
+		}
+
+		#region IContentLayout Members
+		/// <summary>
+		/// Performs layout of the content block.
+		/// </summary>
+		/// <param name="containerBounds">Container bounds to layout content blocks in.</param>
+		/// <param name="contentBlocks">Content blocks to layout.</param>
+		/// <param name="blockLayout">Block layout manager that resizes the content blocks.</param>
+		/// <returns>The bounds of the content blocks within the container bounds.</returns>
+		public virtual Rectangle Layout(Rectangle containerBounds, IBlock[] contentBlocks, BlockLayoutManager blockLayout)
+		{
+			Rectangle blocksBounds=Rectangle.Empty;
+			Point position=containerBounds.Location;
+			ArrayList lines=new ArrayList();
+			lines.Add(new BlockLineInfo());
+			BlockLineInfo currentLine=lines[0] as BlockLineInfo;
+            bool switchToNewLine = false;
+            int visibleIndex = 0;
+
+			foreach(IBlock block in contentBlocks)
+			{
+				if(!block.Visible)
+                {
+                    block.Bounds = Rectangle.Empty;
+					continue;
+                }
+
+                if (BeforeNewBlockLayout != null)
+                {
+                    LayoutManagerLayoutEventArgs e = new LayoutManagerLayoutEventArgs(block, position, visibleIndex);
+                    BeforeNewBlockLayout(this, e);
+                    position = e.CurrentPosition;
+                    if (e.CancelLayout)
+                        continue;
+                }
+                visibleIndex++;
+
+                Size availableSize = containerBounds.Size;
+                bool isBlockElement = false;
+                bool isNewLineTriggger = false;
+                if (block is IBlockExtended)
+                {
+                    IBlockExtended ex = block as IBlockExtended;
+                    isBlockElement = ex.IsBlockElement;
+                    isNewLineTriggger = ex.IsNewLineAfterElement;
+                }
+
+                if (!isBlockElement)
+                {
+                    if (m_ContentOrientation == eContentOrientation.Horizontal)
+                        availableSize.Width = (containerBounds.Right - position.X);
+                    else
+                        availableSize.Height = (containerBounds.Bottom - position.Y);
+                }
+
+				// Resize the content block
+                blockLayout.Layout(block, availableSize);
+
+				if(m_MultiLine && currentLine.Blocks.Count > 0)
+				{
+                    if (m_ContentOrientation == eContentOrientation.Horizontal && position.X + block.Bounds.Width > containerBounds.Right || isBlockElement || switchToNewLine)
+					{
+						position.X=containerBounds.X;
+						position.Y+=(currentLine.LineSize.Height+m_BlockSpacing);
+						currentLine=new BlockLineInfo();
+						currentLine.Line=lines.Count;
+						lines.Add(currentLine);
+					}
+                    else if (m_ContentOrientation == eContentOrientation.Vertical && position.Y + block.Bounds.Height > containerBounds.Bottom || isBlockElement || switchToNewLine)
+					{
+						position.Y=containerBounds.Y;
+						position.X+=(currentLine.LineSize.Width+m_BlockSpacing);
+						currentLine=new BlockLineInfo();
+						currentLine.Line=lines.Count;
+						lines.Add(currentLine);
+					}
+				}
+
+				if(m_ContentOrientation==eContentOrientation.Horizontal)
+				{
+					if(block.Bounds.Height>currentLine.LineSize.Height)
+						currentLine.LineSize.Height=block.Bounds.Height;
+					currentLine.LineSize.Width=position.X+block.Bounds.Width-containerBounds.X;
+				}
+				else if(m_ContentOrientation==eContentOrientation.Vertical)
+				{
+					if(block.Bounds.Width>currentLine.LineSize.Width)
+						currentLine.LineSize.Width=block.Bounds.Width;
+					currentLine.LineSize.Height=position.Y+block.Bounds.Height-containerBounds.Y;
+				}
+
+				currentLine.Blocks.Add(block);
+				block.Bounds=new Rectangle(position,block.Bounds.Size);
+
+				if(blocksBounds.IsEmpty)
+					blocksBounds=block.Bounds;
+				else
+					blocksBounds=Rectangle.Union(blocksBounds,block.Bounds);
+
+                switchToNewLine = isBlockElement | isNewLineTriggger;
+
+                position=GetNextPosition(block, position);    
+			}
+
+			blocksBounds=AlignResizeBlocks(containerBounds, blocksBounds, lines);
+
+            if (m_RightToLeft)
+                blocksBounds = MirrorContent(containerBounds, blocksBounds, contentBlocks);
+
+			return blocksBounds;
+		}
+
+		#endregion
+
+		#region Internals
+
+		private Rectangle AlignResizeBlocks(Rectangle containerBounds,Rectangle blocksBounds,ArrayList lines)
+		{
+			Rectangle newBounds=Rectangle.Empty;
+			if(containerBounds.IsEmpty || blocksBounds.IsEmpty || ((BlockLineInfo)lines[0]).Blocks.Count==0)
+				return newBounds;
+	
+			if(m_ContentAlignment==eContentAlignment.Left && m_ContentVerticalAlignment==eContentVerticalAlignment.Top && 
+                !m_FitContainer && !m_FitContainerOversize && !m_EvenHeight)
+				return blocksBounds;
+
+			Point[] offset=new Point[lines.Count];
+			Size[] sizeOffset=new Size[lines.Count];
+			foreach(BlockLineInfo lineInfo in lines)
+			{
+				if(m_ContentOrientation==eContentOrientation.Horizontal)
+				{
+					if(m_FitContainer && containerBounds.Width>lineInfo.LineSize.Width ||
+						m_FitContainerOversize && lineInfo.LineSize.Width>containerBounds.Width)
+					{
+						sizeOffset[lineInfo.Line].Width=(containerBounds.Width-lineInfo.LineSize.Width)/lineInfo.Blocks.Count;
+						blocksBounds.Width=containerBounds.Width;
+					}
+				}
+				else
+				{
+					if(m_FitContainer && containerBounds.Height>lineInfo.LineSize.Height ||
+						m_FitContainerOversize && lineInfo.LineSize.Height>containerBounds.Height)
+					{
+						sizeOffset[lineInfo.Line].Height=(containerBounds.Height-lineInfo.LineSize.Height)/lineInfo.Blocks.Count;
+						blocksBounds.Height=containerBounds.Height;
+					}
+
+                    if (m_VerticalFitContainerWidth && containerBounds.Width > blocksBounds.Width)
+                        sizeOffset[lineInfo.Line].Width = (containerBounds.Width - lineInfo.LineSize.Width) / lines.Count;
+				}
+
+
+				if(m_ContentOrientation==eContentOrientation.Horizontal && !m_FitContainer)
+				{
+					if(containerBounds.Width>blocksBounds.Width && m_FitContainerOversize || !m_FitContainerOversize)
+					{
+						switch(m_ContentAlignment)
+						{
+							case eContentAlignment.Right:
+								offset[lineInfo.Line].X=containerBounds.Width-lineInfo.LineSize.Width;
+								break;
+							case eContentAlignment.Center:
+								offset[lineInfo.Line].X=(containerBounds.Width-lineInfo.LineSize.Width)/2;
+								break;
+						}
+					}
+				}
+
+				if(m_ContentOrientation==eContentOrientation.Vertical && !m_FitContainer)
+				{
+					if(containerBounds.Height>blocksBounds.Height && m_FitContainerOversize || !m_FitContainerOversize)
+					{
+						switch(m_ContentVerticalAlignment)
+						{
+							case eContentVerticalAlignment.Bottom:
+								offset[lineInfo.Line].Y=containerBounds.Height-lineInfo.LineSize.Height;
+								break;
+							case eContentVerticalAlignment.Middle:
+								offset[lineInfo.Line].Y=(containerBounds.Height-lineInfo.LineSize.Height)/2;
+								break;
+						}
+					}
+				}
+			}
+
+            if (m_VerticalFitContainerWidth && containerBounds.Width > blocksBounds.Width)
+                blocksBounds.Width = containerBounds.Width;
+
+			if(m_ContentOrientation==eContentOrientation.Horizontal)
+			{
+				foreach(BlockLineInfo lineInfo in lines)
+				{
+					foreach(IBlock block in lineInfo.Blocks)
+					{
+						if(!block.Visible)
+							continue;
+						Rectangle r=block.Bounds;
+						if(m_EvenHeight && lineInfo.LineSize.Height>0)
+							r.Height=lineInfo.LineSize.Height;
+						r.Offset(offset[lineInfo.Line]);
+						
+						if(m_ContentVerticalAlignment==eContentVerticalAlignment.Middle)
+						{
+							// Takes care of offset rounding error when both content is vertically centered and blocks in line are centered
+							if (m_BlockLineAlignment == eContentVerticalAlignment.Middle)
+								r.Offset(0,((containerBounds.Height-blocksBounds.Height)+(lineInfo.LineSize.Height-r.Height))/2);
+							else
+								r.Offset(0,(containerBounds.Height-blocksBounds.Height)/2);
+
+							// Line alignment of the block
+							if (m_BlockLineAlignment == eContentVerticalAlignment.Bottom)
+								r.Offset(0, lineInfo.LineSize.Height - r.Height);
+						}
+						else if(m_ContentVerticalAlignment==eContentVerticalAlignment.Bottom)
+							r.Offset(0,containerBounds.Height-blocksBounds.Height);
+						
+						// To avoid rounding offset errors when dividing this is split see upper part
+						if(m_ContentVerticalAlignment!=eContentVerticalAlignment.Middle)
+						{
+							// Line alignment of the block
+							if (m_BlockLineAlignment == eContentVerticalAlignment.Middle)
+								r.Offset(0, (lineInfo.LineSize.Height - r.Height) / 2);
+							else if (m_BlockLineAlignment == eContentVerticalAlignment.Bottom)
+								r.Offset(0, lineInfo.LineSize.Height - r.Height);
+						}
+
+						if(sizeOffset[lineInfo.Line].Width!=0)
+						{
+							r.Width+=sizeOffset[lineInfo.Line].Width;
+							offset[lineInfo.Line].X+=sizeOffset[lineInfo.Line].Width;
+						}
+						r.Height+=sizeOffset[lineInfo.Line].Height;
+						block.Bounds=r;
+						if(newBounds.IsEmpty)
+							newBounds=block.Bounds;
+						else
+							newBounds=Rectangle.Union(newBounds,block.Bounds);
+					}
+					// Adjust for left-over size adjustment for odd difference between container width and the total block width
+					if(sizeOffset[lineInfo.Line].Width!=0 && containerBounds.Width-(lineInfo.LineSize.Width+sizeOffset[lineInfo.Line].Width*lineInfo.Blocks.Count)!=0)
+					{
+						Rectangle r=((IBlock)lineInfo.Blocks[lineInfo.Blocks.Count-1]).Bounds;
+						r.Width+=containerBounds.Width-(lineInfo.LineSize.Width+sizeOffset[lineInfo.Line].Width*lineInfo.Blocks.Count);
+						((IBlock)lineInfo.Blocks[lineInfo.Blocks.Count-1]).Bounds=r;
+					}
+				}
+			}
+			else
+			{
+				foreach(BlockLineInfo lineInfo in lines)
+				{
+					foreach(IBlock block in lineInfo.Blocks)
+					{
+						if(!block.Visible)
+							continue;
+						Rectangle r=block.Bounds;
+						if(m_EvenHeight && lineInfo.LineSize.Width>0)
+							r.Width=lineInfo.LineSize.Width;
+						r.Offset(offset[lineInfo.Line]);
+						if(m_ContentAlignment==eContentAlignment.Center)
+							r.Offset(((containerBounds.Width-blocksBounds.Width)+(lineInfo.LineSize.Width-r.Width))/2,0); //r.Offset((containerBounds.Width-blocksBounds.Width)/2+(lineInfo.LineSize.Width-r.Width)/2,0);
+						else if(m_ContentAlignment==eContentAlignment.Right)
+							r.Offset((containerBounds.Width-blocksBounds.Width)+lineInfo.LineSize.Width-r.Width,0);
+						r.Width+=sizeOffset[lineInfo.Line].Width;
+						if(sizeOffset[lineInfo.Line].Height!=0)
+						{
+							r.Height+=sizeOffset[lineInfo.Line].Height;
+							offset[lineInfo.Line].Y+=sizeOffset[lineInfo.Line].Height;
+						}
+						block.Bounds=r;
+						if(newBounds.IsEmpty)
+							newBounds=block.Bounds;
+						else
+							newBounds=Rectangle.Union(newBounds,block.Bounds);
+					}
+					if(sizeOffset[lineInfo.Line].Height!=0 && containerBounds.Height-(lineInfo.LineSize.Height+sizeOffset[lineInfo.Line].Height*lineInfo.Blocks.Count)!=0)
+					{
+						Rectangle r=((IBlock)lineInfo.Blocks[lineInfo.Blocks.Count-1]).Bounds;
+						r.Height+=containerBounds.Height-(lineInfo.LineSize.Height+sizeOffset[lineInfo.Line].Height*lineInfo.Blocks.Count);
+						((IBlock)lineInfo.Blocks[lineInfo.Blocks.Count-1]).Bounds=r;
+					}
+				}
+			}
+			return newBounds;
+		}
+
+		private Point GetNextPosition(IBlock block, Point position)
+		{
+            if (NextPosition != null)
+            {
+                LayoutManagerPositionEventArgs e = new LayoutManagerPositionEventArgs();
+                e.Block = block;
+                e.CurrentPosition = position;
+                NextPosition(this, e);
+                if (e.Cancel)
+                    return e.NextPosition;
+            }
+
+			if(m_ContentOrientation==eContentOrientation.Horizontal)
+				position.X+=block.Bounds.Width+m_BlockSpacing;
+			else
+				position.Y+=block.Bounds.Height+m_BlockSpacing;
+			return position;
+		}
+
+		private class BlockLineInfo
+		{
+			public BlockLineInfo() {}
+			public ArrayList Blocks=new ArrayList();
+			public Size LineSize=Size.Empty;
+			public int Line=0;
+		}
+
+        private Rectangle MirrorContent(Rectangle containerBounds, Rectangle blockBounds, IBlock[] contentBlocks)
+        {
+            int xOffset = (blockBounds.X - containerBounds.X);
+
+            if (blockBounds.Width < containerBounds.Width)
+                blockBounds.X = containerBounds.Right - ((blockBounds.X - containerBounds.X) + blockBounds.Width);
+            else if (blockBounds.Width > containerBounds.Width)
+                containerBounds.Width = blockBounds.Width;
+            foreach (IBlock block in contentBlocks)
+            {
+                if (!block.Visible)
+                    continue;
+                Rectangle r = block.Bounds;
+                block.Bounds = new Rectangle(containerBounds.Right - ((r.X - containerBounds.X) + r.Width), r.Y, r.Width, r.Height);
+            }
+
+            return blockBounds;
+        }
+		#endregion
+
+		#region Properties
+		/// <summary>
+		/// Gets or sets the spacing in pixels between content blocks. Default value is 0.
+		/// </summary>
+		public virtual int BlockSpacing
+		{
+			get {return m_BlockSpacing;}
+			set {m_BlockSpacing=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets whether content blocks are forced to fit the container bounds if they 
+		/// occupy more space than it is available by container. Default value is false.
+		/// </summary>
+		public virtual bool FitContainerOversize
+		{
+			get {return m_FitContainerOversize;}
+			set {m_FitContainerOversize=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets whether content blocks are resized to fit the container bound if they
+		/// occupy less space than it is available by container. Default value is false.
+		/// </summary>
+		public virtual bool FitContainer
+		{
+			get {return m_FitContainer;}
+			set {m_FitContainer=value;}
+		}
+
+        /// <summary>
+        /// Gets or sets whether content blocks are resized (Width) to fit container bounds if they
+        /// occupy less space than the actual container width. Applies to the Vertical orientation only. Default value is false.
+        /// </summary>
+        public virtual bool VerticalFitContainerWidth
+        {
+            get { return m_VerticalFitContainerWidth; }
+            set { m_VerticalFitContainerWidth = value; }
+        }
+
+		/// <summary>
+		/// Gets or sets the content orientation. Default value is Horizontal.
+		/// </summary>
+		public virtual eContentOrientation ContentOrientation
+		{
+			get {return m_ContentOrientation;}
+			set {m_ContentOrientation=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets the content vertical alignment. Default value is Middle.
+		/// </summary>
+		public virtual eContentVerticalAlignment ContentVerticalAlignment
+		{
+			get {return m_ContentVerticalAlignment;}
+			set {m_ContentVerticalAlignment=value;}
+		}
+
+        /// <summary>
+        /// Gets or sets the block line vertical alignment. Default value is Middle.
+        /// </summary>
+        public virtual eContentVerticalAlignment BlockLineAlignment
+        {
+            get { return m_BlockLineAlignment; }
+            set { m_BlockLineAlignment = value; }
+        }
+
+		/// <summary>
+		/// Gets or sets the content horiznontal alignment. Default value is Left.
+		/// </summary>
+		public virtual eContentAlignment ContentAlignment
+		{
+			get {return m_ContentAlignment;}
+			set {m_ContentAlignment=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets whether all content blocks are resized so they have same height which is height of the talles content block. Default value is false.
+		/// </summary>
+		public virtual bool EvenHeight
+		{
+			get {return m_EvenHeight;}
+			set {m_EvenHeight=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets whether content is wrapped into new line if it exceeds the width of the container.
+		/// </summary>
+		public bool MultiLine
+		{
+			get {return m_MultiLine;}
+			set {m_MultiLine=value;}
+		}
+
+        /// <summary>
+        /// Gets or sets whether layout is right-to-left.
+        /// </summary>
+        public bool RightToLeft
+        {
+            get { return m_RightToLeft; }
+            set { m_RightToLeft = value; }
+        }
+
+		#endregion
+	}
+
+    /// <summary>
+    /// Represents event arguments for SerialContentLayoutManager.NextPosition event.
+    /// </summary>
+    public class LayoutManagerPositionEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets or sets the block that is layed out.
+        /// </summary>
+        public IBlock Block = null;
+        /// <summary>
+        /// Gets or sets the current block position.
+        /// </summary>
+        public Point CurrentPosition = Point.Empty;
+        /// <summary>
+        /// Gets or sets the calculated next block position.
+        /// </summary>
+        public Point NextPosition = Point.Empty;
+        /// <summary>
+        /// Cancels default position calculation.
+        /// </summary>
+        public bool Cancel = false;
+    }
+
+    /// <summary>
+    /// Represents event arguments for the SerialContentLayoutManager layout events.
+    /// </summary>
+    public class LayoutManagerLayoutEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets or sets the reference block object.
+        /// </summary>
+        public IBlock Block = null;
+
+        /// <summary>
+        /// Gets or sets the position block will assume.
+        /// </summary>
+        public Point CurrentPosition = Point.Empty;
+
+        /// <summary>
+        /// Cancel the layout of the block, applies only to BeforeXXX layout event.
+        /// </summary>
+        public bool CancelLayout = false;
+
+        /// <summary>
+        /// Gets or sets the visibility index of the block.
+        /// </summary>
+        public int BlockVisibleIndex = 0;
+
+        /// <summary>
+        /// Creates new instance of the class and initializes it with default values.
+        /// </summary>
+        public LayoutManagerLayoutEventArgs(IBlock block, Point currentPosition, int visibleIndex)
+        {
+            this.Block = block;
+            this.CurrentPosition = currentPosition;
+            this.BlockVisibleIndex = visibleIndex;
+        }
+    }
+
+    /// <summary>
+    /// Delegate for SerialContentLayoutManager.NextPosition event.
+    /// </summary>
+    public delegate void LayoutManagerPositionEventHandler(object sender, LayoutManagerPositionEventArgs e);
+
+    /// <summary>
+    /// Delegate for the SerialContentLayoutManager layout events.
+    /// </summary>
+    public delegate void LayoutManagerLayoutEventHandler(object sender, LayoutManagerLayoutEventArgs e);
+    
+
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/Design/ColorSchemeColorConverter.cs b/PROMS/DotNetBar Source Code/TreeGX/Design/ColorSchemeColorConverter.cs
new file mode 100644
index 00000000..d71254b7
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/Design/ColorSchemeColorConverter.cs	
@@ -0,0 +1,68 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Globalization;
+using System.Reflection;
+
+#if TREEGX
+namespace DevComponents.Tree.Design
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar.Design
+#endif
+{
+	/// <summary>
+	/// Summary description for ColorSchemeColorConverter.
+	/// </summary>
+	public class ColorSchemeColorConverter:ColorConverter   
+	{
+		/// <summary>
+		/// This member supports the .NET Framework infrastructure and is not intended to be used directly from your code.
+		/// </summary>
+		/// <param name="context">An ITypeDescriptorContext that provides a format context. </param>
+		/// <param name="culture">The CultureInfo to use as the current culture. </param>
+		/// <param name="value">The Object to convert. </param>
+		/// <returns>An Object that represents the converted value.</returns>
+		public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
+		{
+			Color color=Color.Empty;
+			if(value is string && value.ToString().StartsWith("CS."))
+			{
+				string propertyName=context.PropertyDescriptor.Name;
+				PropertyInfo property=context.Instance.GetType().GetProperty(propertyName+"SchemePart",BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance);
+				if(property!=null)
+				{
+					property.SetValue(context.Instance,Enum.Parse(typeof(eColorSchemePart),value.ToString().Substring(4)),new object[]{});
+					color=(Color)context.PropertyDescriptor.GetValue(context.Instance);
+				}
+			}
+			else
+				return base.ConvertFrom(context, culture, value);
+			
+			return color;
+		}
+		
+		/// <summary>
+		/// Converts the given value object to the specified type.
+		/// </summary>
+		/// <param name="context">An ITypeDescriptorContext that provides a format context. </param>
+		/// <param name="culture">A CultureInfo object. If a null reference (Nothing in Visual Basic) is passed, the current culture is assumed. </param>
+		/// <param name="value">The Object to convert.</param>
+		/// <param name="destinationType">The Type to convert the value parameter to. </param>
+		/// <returns>An Object that represents the converted value.</returns>
+		public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+		{
+			if(context!=null && (destinationType == typeof(string)) && (value is Color))
+			{
+				string propertyName=context.PropertyDescriptor.Name;
+				PropertyInfo property=context.Instance.GetType().GetProperty(propertyName+"SchemePart",BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance);
+				if(property!=null)
+				{
+					eColorSchemePart part = (eColorSchemePart)property.GetValue(context.Instance, new object[] {});
+					if(part!=eColorSchemePart.None)
+						return "CS." + part.ToString();
+				}
+			}
+			return base.ConvertTo(context, culture, value, destinationType); 
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/Design/ComponentNotLicensed.cs b/PROMS/DotNetBar Source Code/TreeGX/Design/ComponentNotLicensed.cs
new file mode 100644
index 00000000..3dc14d59
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/Design/ComponentNotLicensed.cs	
@@ -0,0 +1,271 @@
+using System;
+using System.Drawing;
+using System.Collections;
+using System.ComponentModel;
+using System.Windows.Forms;
+
+namespace DevComponents.Tree.Design
+{
+	/// <summary>
+	/// Summary description for ComponentNotLicensed.
+	/// </summary>
+	public class ComponentNotLicensed : System.Windows.Forms.Form
+	{
+		private System.Windows.Forms.GroupBox groupBox1;
+		private System.Windows.Forms.Label label7;
+		private System.Windows.Forms.LinkLabel linkOrder;
+		private System.Windows.Forms.Label label6;
+		private System.Windows.Forms.Label label5;
+		private System.Windows.Forms.Label label4;
+		private System.Windows.Forms.Label label3;
+		private System.Windows.Forms.Label label2;
+		private System.Windows.Forms.Label label1;
+		private System.Windows.Forms.LinkLabel linkHome;
+		private System.Windows.Forms.LinkLabel linkEmail;
+		private System.Windows.Forms.Button button2;
+		private System.Windows.Forms.Button button1;
+		private System.Windows.Forms.Timer timer1;
+		private System.ComponentModel.IContainer components;
+
+		public ComponentNotLicensed()
+		{
+			//
+			// Required for Windows Form Designer support
+			//
+			InitializeComponent();
+
+			//
+			// TODO: Add any constructor code after InitializeComponent call
+			//
+		}
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		protected override void Dispose( bool disposing )
+		{
+			if( disposing )
+			{
+				if(components != null)
+				{
+					components.Dispose();
+				}
+			}
+			base.Dispose( disposing );
+		}
+
+		#region Windows Form 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.groupBox1 = new System.Windows.Forms.GroupBox();
+			this.label7 = new System.Windows.Forms.Label();
+			this.linkOrder = new System.Windows.Forms.LinkLabel();
+			this.label6 = new System.Windows.Forms.Label();
+			this.label5 = new System.Windows.Forms.Label();
+			this.label4 = new System.Windows.Forms.Label();
+			this.label3 = new System.Windows.Forms.Label();
+			this.label2 = new System.Windows.Forms.Label();
+			this.label1 = new System.Windows.Forms.Label();
+			this.linkHome = new System.Windows.Forms.LinkLabel();
+			this.linkEmail = new System.Windows.Forms.LinkLabel();
+			this.button2 = new System.Windows.Forms.Button();
+			this.button1 = new System.Windows.Forms.Button();
+			this.timer1 = new System.Windows.Forms.Timer(this.components);
+			this.groupBox1.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// groupBox1
+			// 
+			this.groupBox1.Controls.Add(this.label7);
+			this.groupBox1.Controls.Add(this.linkOrder);
+			this.groupBox1.Controls.Add(this.label6);
+			this.groupBox1.Controls.Add(this.label5);
+			this.groupBox1.Location = new System.Drawing.Point(11, 54);
+			this.groupBox1.Name = "groupBox1";
+			this.groupBox1.Size = new System.Drawing.Size(294, 135);
+			this.groupBox1.TabIndex = 17;
+			this.groupBox1.TabStop = false;
+			// 
+			// label7
+			// 
+			this.label7.Location = new System.Drawing.Point(3, 104);
+			this.label7.Name = "label7";
+			this.label7.Size = new System.Drawing.Size(285, 12);
+			this.label7.TabIndex = 3;
+			this.label7.Text = "Order at:";
+			this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+			// 
+			// linkOrder
+			// 
+			this.linkOrder.Location = new System.Drawing.Point(6, 116);
+			this.linkOrder.Name = "linkOrder";
+			this.linkOrder.Size = new System.Drawing.Size(280, 15);
+			this.linkOrder.TabIndex = 2;
+			this.linkOrder.TabStop = true;
+			this.linkOrder.Text = "http://www.devcomponents.com/treegx/order.html";
+			this.linkOrder.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+			this.linkOrder.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkOrder_LinkClicked);
+			// 
+			// label6
+			// 
+			this.label6.Location = new System.Drawing.Point(9, 72);
+			this.label6.Name = "label6";
+			this.label6.Size = new System.Drawing.Size(276, 31);
+			this.label6.TabIndex = 1;
+			this.label6.Text = "For pricing and licensing information please visit our web site. ";
+			// 
+			// label5
+			// 
+			this.label5.ForeColor = System.Drawing.Color.Maroon;
+			this.label5.Location = new System.Drawing.Point(8, 20);
+			this.label5.Name = "label5";
+			this.label5.Size = new System.Drawing.Size(276, 52);
+			this.label5.TabIndex = 0;
+			this.label5.Text = "This component is not registered and it is provided for evaluation purposes only." +
+				" This message will not appear after you register the component.";
+			// 
+			// label4
+			// 
+			this.label4.AutoSize = true;
+			this.label4.Location = new System.Drawing.Point(10, 216);
+			this.label4.Name = "label4";
+			this.label4.Size = new System.Drawing.Size(31, 16);
+			this.label4.TabIndex = 16;
+			this.label4.Text = "Web:";
+			// 
+			// label3
+			// 
+			this.label3.AutoSize = true;
+			this.label3.Location = new System.Drawing.Point(9, 200);
+			this.label3.Name = "label3";
+			this.label3.Size = new System.Drawing.Size(40, 16);
+			this.label3.TabIndex = 14;
+			this.label3.Text = "E-Mail:";
+			// 
+			// label2
+			// 
+			this.label2.AutoSize = true;
+			this.label2.Location = new System.Drawing.Point(7, 31);
+			this.label2.Name = "label2";
+			this.label2.Size = new System.Drawing.Size(307, 16);
+			this.label2.TabIndex = 11;
+			this.label2.Text = "(c) 2005-2006 by DevComponents.com, All Rights Reserved";
+			// 
+			// label1
+			// 
+			this.label1.AutoSize = true;
+			this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((System.Byte)(0)));
+			this.label1.Location = new System.Drawing.Point(9, 7);
+			this.label1.Name = "label1";
+			this.label1.Size = new System.Drawing.Size(236, 18);
+			this.label1.TabIndex = 9;
+			this.label1.Text = "DevComponents TreeGX Component";
+			// 
+			// linkHome
+			// 
+			this.linkHome.Location = new System.Drawing.Point(50, 215);
+			this.linkHome.Name = "linkHome";
+			this.linkHome.Size = new System.Drawing.Size(145, 16);
+			this.linkHome.TabIndex = 15;
+			this.linkHome.TabStop = true;
+			this.linkHome.Text = "www.devcomponents.com";
+			this.linkHome.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkHome_LinkClicked);
+			// 
+			// linkEmail
+			// 
+			this.linkEmail.Location = new System.Drawing.Point(49, 199);
+			this.linkEmail.Name = "linkEmail";
+			this.linkEmail.Size = new System.Drawing.Size(167, 16);
+			this.linkEmail.TabIndex = 13;
+			this.linkEmail.TabStop = true;
+			this.linkEmail.Text = "support@devcomponents.com";
+			this.linkEmail.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkEmail_LinkClicked);
+			// 
+			// button2
+			// 
+			this.button2.Location = new System.Drawing.Point(232, 240);
+			this.button2.Name = "button2";
+			this.button2.Size = new System.Drawing.Size(72, 24);
+			this.button2.TabIndex = 12;
+			this.button2.Text = "Buy Now";
+			this.button2.Click += new System.EventHandler(this.button2_Click);
+			// 
+			// button1
+			// 
+			this.button1.Enabled = false;
+			this.button1.Location = new System.Drawing.Point(152, 240);
+			this.button1.Name = "button1";
+			this.button1.Size = new System.Drawing.Size(72, 24);
+			this.button1.TabIndex = 10;
+			this.button1.Text = "OK";
+			this.button1.Click += new System.EventHandler(this.button1_Click);
+			// 
+			// timer1
+			// 
+			this.timer1.Enabled = true;
+			this.timer1.Interval = 800;
+			this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
+			// 
+			// ComponentNotLicensed
+			// 
+			this.AutoScaleBaseSize = new System.Drawing.Size(5, 13);
+			this.BackColor = System.Drawing.Color.BlanchedAlmond;
+			this.ClientSize = new System.Drawing.Size(314, 273);
+			this.ControlBox = false;
+			this.Controls.Add(this.groupBox1);
+			this.Controls.Add(this.label4);
+			this.Controls.Add(this.label3);
+			this.Controls.Add(this.label2);
+			this.Controls.Add(this.label1);
+			this.Controls.Add(this.linkHome);
+			this.Controls.Add(this.linkEmail);
+			this.Controls.Add(this.button2);
+			this.Controls.Add(this.button1);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.MaximizeBox = false;
+			this.Name = "ComponentNotLicensed";
+			this.Text = "TreeGX License not found";
+			this.groupBox1.ResumeLayout(false);
+			this.ResumeLayout(false);
+
+		}
+		#endregion
+
+		private void button2_Click(object sender, System.EventArgs e)
+		{
+			System.Diagnostics.Process.Start(linkOrder.Text);
+		}
+
+		private void button1_Click(object sender, System.EventArgs e)
+		{
+			this.Close();
+		}
+
+		private void linkHome_LinkClicked(object sender, System.Windows.Forms.LinkLabelLinkClickedEventArgs e)
+		{
+			System.Diagnostics.Process.Start("http://www.devcomponents.com");
+		}
+
+		private void linkOrder_LinkClicked(object sender, System.Windows.Forms.LinkLabelLinkClickedEventArgs e)
+		{
+			System.Diagnostics.Process.Start(linkOrder.Text);
+		}
+
+		private void linkEmail_LinkClicked(object sender, System.Windows.Forms.LinkLabelLinkClickedEventArgs e)
+		{
+			System.Diagnostics.Process.Start(linkEmail.Text);
+		}
+
+		private void timer1_Tick(object sender, System.EventArgs e)
+		{
+			timer1.Enabled=false;
+			button1.Enabled=true;
+			button1.Focus();
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/Design/ComponentNotLicensed.resx b/PROMS/DotNetBar Source Code/TreeGX/Design/ComponentNotLicensed.resx
new file mode 100644
index 00000000..6f118cb1
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/Design/ComponentNotLicensed.resx	
@@ -0,0 +1,265 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 1.3
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">1.3</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1">this is my long string</data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        [base64 mime encoded serialized .NET Framework object]
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        [base64 mime encoded string representing a byte array form of the .NET Framework object]
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used forserialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>1.3</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="groupBox1.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="groupBox1.GridSize" type="System.Drawing.Size, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>8, 8</value>
+  </data>
+  <data name="groupBox1.SnapToGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+  <data name="groupBox1.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="groupBox1.DrawGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+  <data name="groupBox1.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="label7.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="label7.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="label7.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="linkOrder.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="linkOrder.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="linkOrder.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="label6.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="label6.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="label6.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="label5.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="label5.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="label5.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="label4.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="label4.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="label4.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="label3.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="label3.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="label3.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="label2.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="label2.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="label2.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="label1.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="label1.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="label1.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="linkHome.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="linkHome.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="linkHome.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="linkEmail.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="linkEmail.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="linkEmail.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="button2.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="button2.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="button2.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="button1.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="button1.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="button1.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="timer1.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="timer1.Location" type="System.Drawing.Point, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </data>
+  <data name="timer1.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="$this.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="$this.Language" type="System.Globalization.CultureInfo, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>(Default)</value>
+  </data>
+  <data name="$this.TrayLargeIcon" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="$this.Localizable" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="$this.GridSize" type="System.Drawing.Size, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>8, 8</value>
+  </data>
+  <data name="$this.Name">
+    <value>ComponentNotLicensed</value>
+  </data>
+  <data name="$this.DrawGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="$this.TrayHeight" type="System.Int32, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>80</value>
+  </data>
+  <data name="$this.SnapToGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+  <data name="$this.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/TreeGX/Design/ElementStyleTypeEditor.cs b/PROMS/DotNetBar Source Code/TreeGX/Design/ElementStyleTypeEditor.cs
new file mode 100644
index 00000000..0370daf2
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/Design/ElementStyleTypeEditor.cs	
@@ -0,0 +1,150 @@
+using System;
+using System.ComponentModel;
+using System.Drawing.Design;
+using System.Windows.Forms.Design;
+using System.Windows.Forms;
+using System.ComponentModel.Design;
+
+namespace DevComponents.Tree.Design
+{
+	/// <summary>
+	/// Represents type editor for ElementStyle used for Windows Forms design-time support.
+	/// </summary>
+	public class ElementStyleTypeEditor:System.Drawing.Design.UITypeEditor 
+	{
+		#region Private Variables
+		private IWindowsFormsEditorService m_EditorService = null;
+		private const string OPTION_CREATE="Create style";
+		private const string OPTION_REMOVE="Delete selected style";
+		private const string OPTION_STYLES="Styles.";
+		#endregion
+
+		#region Internal Implementation
+		public override object EditValue(ITypeDescriptorContext context, IServiceProvider provider, object value) 
+		{
+			if (context != null
+				&& context.Instance != null
+				&& provider != null) 
+			{				
+				ElementStyle es=value as ElementStyle;
+				
+				m_EditorService = provider.GetService(typeof(IWindowsFormsEditorService)) as IWindowsFormsEditorService;
+								
+				if(m_EditorService!=null)
+				{
+					TreeGX tree = null;
+					if(context.Instance is TreeGX)
+						tree=context.Instance as TreeGX;
+					else if(context.Instance is Node)
+						tree=((Node)context.Instance).TreeControl;
+					else if(context.Instance is Cell)
+						tree=((Cell)context.Instance).TreeControl;
+					
+					ListBox lb=new ListBox();
+					
+					if(es==null)
+						lb.Items.Add(OPTION_CREATE);
+					else
+						lb.Items.Add(OPTION_REMOVE);
+					
+					if(tree!=null)
+					{
+						foreach(ElementStyle style in tree.Styles)
+							lb.Items.Add(style);
+					}
+					
+					string[] styles = Enum.GetNames(typeof (ePredefinedElementStyle));
+					foreach(string s in styles)
+						lb.Items.Add(OPTION_STYLES + s);
+
+					lb.SelectedIndexChanged+=new EventHandler(this.SelectedChanged);
+					m_EditorService.DropDownControl(lb);
+					
+					IDesignerHost dh=(IDesignerHost)provider.GetService(typeof(IDesignerHost));
+					if(lb.SelectedItem!=null && dh!=null)
+					{
+						if(lb.SelectedItem is ElementStyle)
+						{
+							value=lb.SelectedItem as ElementStyle;
+						}
+						else if(lb.SelectedItem!=null && lb.SelectedItem.ToString().StartsWith(OPTION_STYLES))
+						{
+							string styleName = lb.SelectedItem.ToString().Substring(OPTION_STYLES.Length);
+							Type t = typeof (NodeStyles);
+							ElementStyle predefinedStyle=t.GetProperty(styleName).GetValue(null, null) as ElementStyle;
+							ElementStyle newStyle=dh.CreateComponent(typeof(ElementStyle)) as ElementStyle;
+							newStyle.ApplyStyle(predefinedStyle);
+							newStyle.Description = styleName;
+							value = newStyle;
+							if(tree!=null)
+							{
+								IComponentChangeService cc = provider.GetService(typeof (IComponentChangeService)) as IComponentChangeService;
+								if(cc!=null)
+									cc.OnComponentChanging(tree, TypeDescriptor.GetProperties(tree)["Style"]);
+								tree.Styles.Add(value as ElementStyle);
+								if(cc!=null)
+									cc.OnComponentChanged(tree, TypeDescriptor.GetProperties(tree)["Style"],null,null);
+							}
+						}
+						else if(lb.SelectedItem!=null && lb.SelectedItem.ToString()==OPTION_CREATE)
+						{
+							value=dh.CreateComponent(typeof(ElementStyle)) as ElementStyle;
+							if(tree!=null)
+							{
+								IComponentChangeService cc = provider.GetService(typeof (IComponentChangeService)) as IComponentChangeService;
+								if(cc!=null)
+									cc.OnComponentChanging(tree, TypeDescriptor.GetProperties(tree)["Style"]);
+								tree.Styles.Add(value as ElementStyle);
+								if(cc!=null)
+									cc.OnComponentChanged(tree, TypeDescriptor.GetProperties(tree)["Style"],null,null);
+							}
+						}
+						else if(lb.SelectedItem!=null && lb.SelectedItem.ToString()==OPTION_REMOVE)
+						{
+							if(tree!=null)
+							{
+								IComponentChangeService cc = provider.GetService(typeof (IComponentChangeService)) as IComponentChangeService;
+								if(cc!=null)
+									cc.OnComponentChanging(tree, TypeDescriptor.GetProperties(tree)["Style"]);
+								if(tree!=null)
+									tree.Styles.Remove(value as ElementStyle);
+								if(cc!=null)
+									cc.OnComponentChanged(tree, TypeDescriptor.GetProperties(tree)["Style"],null,null);
+								if(tree.Styles.Count>0)
+									value = tree.Styles[0];
+								else
+									value=null;
+							}
+							else
+								value=null;
+							dh.DestroyComponent(es);
+						}
+					}
+				}
+			}
+
+			return value;
+		}
+
+		private void SelectedChanged(object sender, EventArgs e)
+		{
+			if(m_EditorService!=null)
+				m_EditorService.CloseDropDown();
+		}
+
+		/// <summary>
+		/// Gets the editor style used by the EditValue method.
+		/// </summary>
+		/// <param name="context">An ITypeDescriptorContext that can be used to gain additional context information.</param>
+		/// <returns>A UITypeEditorEditStyle value that indicates the style of editor used by EditValue. If the UITypeEditor does not support this method, then GetEditStyle will return None</returns>
+		public override UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext context) 
+		{
+			if (context != null && context.Instance != null) 
+			{
+				return UITypeEditorEditStyle.DropDown;
+			}
+			return base.GetEditStyle(context);
+		}
+		#endregion
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/Design/NodeConnectorTypeEditor.cs b/PROMS/DotNetBar Source Code/TreeGX/Design/NodeConnectorTypeEditor.cs
new file mode 100644
index 00000000..c026980e
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/Design/NodeConnectorTypeEditor.cs	
@@ -0,0 +1,86 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Windows.Forms.Design;
+using System.Windows.Forms;
+using System.ComponentModel.Design;
+
+namespace DevComponents.Tree.Design
+{
+	/// <summary>
+	/// Represents type editor for NodeConnector used for Windows Forms design-time support.
+	/// </summary>
+	public class NodeConnectorTypeEditor:System.Drawing.Design.UITypeEditor
+	{
+		#region Private Variables
+		private IWindowsFormsEditorService m_EditorService = null;
+		private const string OPTION_CREATE="Create new connector";
+		private const string OPTION_REMOVE="Remove connector";
+		#endregion
+
+		#region Internal Implementation
+		public override object EditValue(ITypeDescriptorContext context, IServiceProvider provider, object value) 
+		{
+			if (context != null
+				&& context.Instance != null
+				&& provider != null) 
+			{				
+				NodeConnector conn=value as NodeConnector;
+				
+				m_EditorService = provider.GetService(typeof(IWindowsFormsEditorService)) as IWindowsFormsEditorService;
+								
+				if(m_EditorService!=null)
+				{
+					ListBox lb=new ListBox();
+					lb.SelectedIndexChanged+=new EventHandler(this.SelectedChanged);
+					if(conn==null)
+						lb.Items.Add(OPTION_CREATE);
+					else
+						lb.Items.Add(OPTION_REMOVE);
+
+					m_EditorService.DropDownControl(lb);
+					
+					IDesignerHost dh=(IDesignerHost)provider.GetService(typeof(IDesignerHost));
+					if(lb.SelectedItem!=null && dh!=null)
+					{
+						if(lb.SelectedItem.ToString()==OPTION_CREATE)
+						{
+							NodeConnector nd=dh.CreateComponent(typeof(NodeConnector)) as NodeConnector;
+							nd.LineWidth = 5;
+							value = nd;
+						}
+						else if(lb.SelectedItem.ToString()==OPTION_REMOVE)
+						{
+							value=null;
+							dh.DestroyComponent(conn);
+						}
+					}
+				}
+			}
+
+			return value;
+		}
+
+		private void SelectedChanged(object sender, EventArgs e)
+		{
+			if(m_EditorService!=null)
+				m_EditorService.CloseDropDown();
+		}
+
+		/// <summary>
+		/// Gets the editor style used by the EditValue method.
+		/// </summary>
+		/// <param name="context">An ITypeDescriptorContext that can be used to gain additional context information.</param>
+		/// <returns>A UITypeEditorEditStyle value that indicates the style of editor used by EditValue. If the UITypeEditor does not support this method, then GetEditStyle will return None</returns>
+		public override UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext context) 
+		{
+			if (context != null && context.Instance != null) 
+			{
+				return UITypeEditorEditStyle.DropDown;
+			}
+			return base.GetEditStyle(context);
+		}
+		#endregion
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/Design/NodeContextMenuTypeEditor.cs b/PROMS/DotNetBar Source Code/TreeGX/Design/NodeContextMenuTypeEditor.cs
new file mode 100644
index 00000000..10336170
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/Design/NodeContextMenuTypeEditor.cs	
@@ -0,0 +1,104 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Windows.Forms.Design;
+using System.Windows.Forms;
+using System.ComponentModel.Design;
+using System.Collections;
+
+namespace DevComponents.Tree.Design
+{
+	/// <summary>
+	/// Represents context menu type editor for Node.ContextMenu property.
+	/// </summary>
+	public class NodeContextMenuTypeEditor:System.Drawing.Design.UITypeEditor
+	{
+		#region Private Variables
+		private IWindowsFormsEditorService m_EditorService = null;
+		public static string DotNetBarPrefix="DotNetBar.";
+		#endregion
+		
+		#region Internal Implementation
+		public override object EditValue(ITypeDescriptorContext context, IServiceProvider provider, object value) 
+		{
+			if (context != null
+				&& context.Instance != null
+				&& provider != null) 
+			{								
+				m_EditorService = provider.GetService(typeof(IWindowsFormsEditorService)) as IWindowsFormsEditorService;
+								
+				if(m_EditorService!=null)
+				{
+					ListBox lb=new ListBox();
+					object dotNetBarManager=null;
+					lb.SelectedIndexChanged+=new EventHandler(this.SelectedChanged);
+					
+					IDesignerHost host = (IDesignerHost)provider.GetService(typeof(IDesignerHost));
+					foreach(IComponent component in host.Container.Components)
+					{
+						if(component is ContextMenu || component.GetType().FullName=="System.Windows.Forms.ContextMenuStrip")
+						{
+							lb.Items.Add(component);
+						}
+						if(component.GetType().FullName=="DevComponents.DotNetBar.DotNetBarManager")
+						{
+							dotNetBarManager=component;
+							IList contextMenus=component.GetType().InvokeMember("ContextMenus", 
+								System.Reflection.BindingFlags.GetProperty, null, component, null) as IList;
+							if(contextMenus!=null)
+							{
+								foreach(object o in contextMenus)
+								{
+									string name=o.GetType().InvokeMember("Name", System.Reflection.BindingFlags.GetProperty, null, o, null).ToString();
+									if(name!=null)
+									{
+										lb.Items.Add(DotNetBarPrefix+name);
+									}
+								}
+							}
+						}
+					}
+
+					m_EditorService.DropDownControl(lb);
+					
+					if(lb.SelectedItem!=null)
+					{
+						if(lb.SelectedItem.ToString().StartsWith(DotNetBarPrefix))
+						{
+							Node node=context.Instance as Node;
+							if(node!=null && node.TreeControl!=null)
+							{
+								TypeDescriptor.GetProperties(node.TreeControl)["DotNetBarManager"].SetValue(node.TreeControl, dotNetBarManager);
+							}
+						}
+						return lb.SelectedItem;
+					}
+				}
+			}
+
+			return value;
+		}
+
+		private void SelectedChanged(object sender, EventArgs e)
+		{
+			if(m_EditorService!=null)
+				m_EditorService.CloseDropDown();
+		}
+
+		/// <summary>
+		/// Gets the editor style used by the EditValue method.
+		/// </summary>
+		/// <param name="context">An ITypeDescriptorContext that can be used to gain additional context information.</param>
+		/// <returns>A UITypeEditorEditStyle value that indicates the style of editor used by EditValue. If the UITypeEditor does not support this method, then GetEditStyle will return None</returns>
+		public override UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext context) 
+		{
+			if (context != null && context.Instance != null) 
+			{
+				return UITypeEditorEditStyle.DropDown;
+			}
+			return base.GetEditStyle(context);
+		}
+		#endregion
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/Design/NodeDesigner.cs b/PROMS/DotNetBar Source Code/TreeGX/Design/NodeDesigner.cs
new file mode 100644
index 00000000..593b5879
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/Design/NodeDesigner.cs	
@@ -0,0 +1,195 @@
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.ComponentModel.Design;
+using System.Windows.Forms;
+using System.Windows.Forms.Design;
+
+namespace DevComponents.Tree.Design
+{
+	/// <summary>
+	/// Represents Windows Forms designer for Node object.
+	/// </summary>
+	public class NodeDesigner:ComponentDesigner
+	{
+		/// <summary>
+		/// Initializes designer with given component.
+		/// </summary>
+		/// <param name="component">Component to initalize designer with.</param>
+		public override void Initialize(IComponent component) 
+		{
+			base.Initialize(component);
+			if(!component.Site.DesignMode)
+				return;
+
+			ISelectionService ss =(ISelectionService)GetService(typeof(ISelectionService));
+			if(ss!=null)
+				ss.SelectionChanged+=new EventHandler(OnSelectionChanged);
+			
+			Node n=component as Node;
+			if(n!=null)
+				this.Visible=n.Visible;
+		}
+		private void OnSelectionChanged(object sender, EventArgs e) 
+		{
+			ISelectionService ss = (ISelectionService)sender;
+            if (this.Component != null && ss.PrimarySelection != this.Component)
+            {
+                Node node = this.Component as Node;
+                if (ss.PrimarySelection is Node)
+                {
+                    Node selected = ss.PrimarySelection as Node;
+
+                    if (selected.TreeControl != node.TreeControl)
+                    {
+                        node.TreeControl.SelectedNode = null;
+                    }
+                }
+                else if (node != null && node.TreeControl != null)
+                    node.TreeControl.SelectedNode = null;
+            }
+		}
+
+		protected override void PreFilterProperties(System.Collections.IDictionary properties)
+		{
+			base.PreFilterProperties(properties);
+			properties["Visible"] = TypeDescriptor.CreateProperty(typeof(NodeDesigner),(PropertyDescriptor)properties["Visible"], new Attribute[]
+				{
+					new DefaultValueAttribute(true),
+					new BrowsableAttribute(true),
+					new CategoryAttribute("Layout")});
+//			properties["HostedControl"] = TypeDescriptor.CreateProperty(typeof(NodeDesigner),(PropertyDescriptor)properties["HostedControl"], new Attribute[]
+//				{
+//					new DefaultValueAttribute(null),
+//					new BrowsableAttribute(true),
+//					new CategoryAttribute("Behavior"),
+//					new DescriptionAttribute("Indicates control hosted inside of the cell.")});
+
+		}
+		
+		/// <summary>
+		/// Gets or sets whether item is visible.
+		/// </summary>
+		[DefaultValue(true),Browsable(true),Category("Layout"),Description("Gets or sets whether node is visible.")]
+		public bool Visible 
+		{
+			get 
+			{
+				return (bool)ShadowProperties["Visible"];
+			}
+			set 
+			{
+				// this value is not passed to the actual control
+				this.ShadowProperties["Visible"] = value;
+			}
+		}
+		
+//		/// <summary>
+//		/// Gets or sets whether item is visible.
+//		/// </summary>
+//		[DefaultValue(null),Browsable(true),Category("Behavior"),Description("Indicates control hosted inside of the cell.")]
+//		public Control HostedControl 
+//		{
+//			get 
+//			{
+//				Node node = this.Component as Node;
+//				return node.HostedControl;
+//			}
+//			set 
+//			{
+//				Node node = this.Component as Node;
+//				node.HostedControl = value;
+//				if(value!=null)
+//				{
+//					IDesignerHost dh = this.GetService(typeof (IDesignerHost)) as IDesignerHost;
+//					if(dh!=null)
+//					{
+//						TreeGXDesigner ds = dh.GetDesigner(node.TreeControl) as TreeGXDesigner;
+//						if(ds!=null)
+//							ds.HookControl(value);
+//					}
+//				}
+//			}
+//		}
+		
+		/// <summary>Returns design-time commands applicable to this designer.</summary>
+		public override DesignerVerbCollection Verbs 
+		{
+			get 
+			{
+				DesignerVerb[] verbs = new DesignerVerb[]
+					{
+						new DesignerVerb("Create Child Node", new EventHandler(CreateNode))
+				};
+				return new DesignerVerbCollection(verbs);
+			}
+		}
+
+		private void CreateNode(object sender, EventArgs e)
+		{
+			Node node=CreateNode(this.Component as Node);
+			if(node!=null)
+			{
+				ISelectionService sel = this.GetService(typeof (ISelectionService)) as ISelectionService;
+				ArrayList list=new ArrayList(1);
+				list.Add(node);
+				if(sel!=null)
+				{
+					sel.SetSelectedComponents(list, SelectionTypes.Primary);
+					node.TreeControl.SelectedNode = node;
+				}
+			}
+		}
+		
+		private Node CreateNode(Node parentNode)
+		{
+			IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+			if(dh==null)
+				return null;
+            
+			Node node=null;
+			TreeGX tree=((Node)this.Component).TreeControl;
+			tree.BeginUpdate();
+			try
+			{
+				IComponentChangeService change=this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+				if(change!=null)
+				{
+					if(parentNode!=null)
+						change.OnComponentChanging(this.Component,TypeDescriptor.GetProperties(parentNode).Find("Nodes",true));
+					else
+						change.OnComponentChanging(this.Component,TypeDescriptor.GetProperties(tree).Find("Nodes",true));
+				}
+
+				node=dh.CreateComponent(typeof(Node)) as Node;
+				if(node!=null)
+				{
+					node.Text=node.Name;
+					node.Expanded = true;
+					if(parentNode==null)
+						tree.Nodes.Add(node);
+					else
+					{
+						parentNode.Nodes.Add(node);
+						parentNode.Expand();
+						TypeDescriptor.GetProperties(node)["Style"].SetValue(node,parentNode.Style);
+					}
+					
+					if(change!=null)
+					{
+						if(parentNode!=null)
+							change.OnComponentChanged(this.Component,TypeDescriptor.GetProperties(parentNode).Find("Nodes",true),null,null);
+						else
+							change.OnComponentChanged(this.Component,TypeDescriptor.GetProperties(tree).Find("Nodes",true),null,null);
+					}
+				}
+			}
+			finally
+			{
+				tree.EndUpdate();
+			}
+
+			return node;
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/Design/TreeGXDesigner.cs b/PROMS/DotNetBar Source Code/TreeGX/Design/TreeGXDesigner.cs
new file mode 100644
index 00000000..209cd881
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/Design/TreeGXDesigner.cs	
@@ -0,0 +1,854 @@
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.ComponentModel.Design;
+using System.Drawing;
+using System.Windows.Forms;
+using System.Windows.Forms.Design;
+
+namespace DevComponents.Tree.Design
+{
+	/// <summary>
+	/// Represents windows forms designer for the control.
+	/// </summary>
+	public class TreeGXDesigner:ParentControlDesigner
+	{
+		#region Private Variables
+//		private Point m_MouseDownPosition=Point.Empty;
+//		private bool m_IgnoreMouseUp=false;
+//		private bool m_Capture=false;
+		private bool m_DragDropStarted=false;
+		const string TEMP_NAME="tempDragDropItem";
+		const int WM_RBUTTONDOWN=0x0204;
+		const int WM_LBUTTONDOWN=0x0201;
+//		const int WM_LBUTTONUP=0x0202;
+//		const int WM_RBUTTONUP=0x0205;
+//		const int WM_MOUSEMOVE=0x0200;
+		const int WM_LBUTTONDBLCLK=0x0203;
+		
+		private Timer m_TimerAdded=null;
+		private Timer m_TimerDragDrop=null;
+		private bool m_DragLeave=false;
+		private bool m_ControlRemoved=false;
+		private DateTime m_JustAdded=DateTime.MinValue;
+		private bool m_NewControlAdded=false;
+		private Point m_MouseDownPoint=Point.Empty;
+		#endregion
+		
+		#region Designer Implementation
+		/// <summary>Initializes designer with given component.</summary>
+		/// <param name="component">Component to initialize designer with.</param>
+		public override void Initialize(IComponent component) 
+		{
+			base.Initialize(component);
+			if(!component.Site.DesignMode)
+				return;
+
+			ISelectionService ss =(ISelectionService)GetService(typeof(ISelectionService));
+			if(ss!=null)
+				ss.SelectionChanged+=new EventHandler(OnSelectionChanged);
+
+			// If our component is removed we need to clean-up
+			IComponentChangeService cc=(IComponentChangeService)GetService(typeof(IComponentChangeService));
+			if(cc!=null)
+			{
+				cc.ComponentRemoving+=new ComponentEventHandler(this.OnComponentRemoving);
+			}
+			
+			if(component is Control)
+			{
+				((Control)component).ControlAdded+=new ControlEventHandler(this.ControlAdded);
+				((Control)component).ControlRemoved+=new ControlEventHandler(this.ControlRemoved);
+			}
+			
+			#if !TRIAL
+			IDesignerHost dh = this.GetService(typeof (IDesignerHost)) as IDesignerHost;
+			if(dh!=null)
+				dh.LoadComplete+=new EventHandler(dh_LoadComplete);			
+			#endif
+		}
+
+		protected override void Dispose(bool disposing)
+		{
+			
+			ISelectionService ss =(ISelectionService)GetService(typeof(ISelectionService));
+			if(ss!=null)
+				ss.SelectionChanged-=new EventHandler(OnSelectionChanged);
+
+			// If our component is removed we need to clean-up
+			IComponentChangeService cc=(IComponentChangeService)GetService(typeof(IComponentChangeService));
+			if(cc!=null)
+				cc.ComponentRemoving-=new ComponentEventHandler(this.OnComponentRemoving);
+		
+			if(this.Control!=null)
+			{
+				this.Control.ControlAdded-=new ControlEventHandler(this.ControlAdded);
+				this.Control.ControlRemoved-=new ControlEventHandler(this.ControlRemoved);
+			}
+			
+			base.Dispose (disposing);
+		}
+
+		internal void HookControl(Control c)
+		{
+			this.HookChildControls(c);
+		}
+
+//		public override DesignerVerbCollection Verbs 
+//		{
+//			get 
+//			{
+//				DesignerVerb[] verbs = new DesignerVerb[]
+//					{
+//						new DesignerVerb("Create Node", new EventHandler(CreateNode))};
+//				return new DesignerVerbCollection(verbs);
+//			}
+//		}
+
+        public override void InitializeNewComponent(IDictionary defaultValues)
+        {
+            base.InitializeNewComponent(defaultValues);
+            SetDefaults();
+        }
+		
+		private void SetDefaults()
+		{
+			CreateNode(null,true);
+			IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+			if(dh==null)
+				return;
+			Utilites.InitializeTree(this.Control as TreeGX,new ComponentFactory(dh));
+#if !TRIAL
+			string key=GetLicenseKey();
+			TreeGX tree=this.Control as TreeGX;
+			tree.LicenseKey=key;
+#endif
+		}
+
+		private Node CreateNode(Node parentNode, bool addToCollections)
+		{
+			TreeGX tree=this.Control as TreeGX;
+
+			IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+			if(dh==null)
+				return null;
+            
+			Node node=null;
+			tree.BeginUpdate();
+			try
+			{
+				IComponentChangeService change=this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+				if(addToCollections)
+				{
+					if(change!=null)
+					{
+						if(parentNode!=null)
+							change.OnComponentChanging(this.Component,TypeDescriptor.GetProperties(parentNode).Find("Nodes",true));
+						else
+							change.OnComponentChanging(this.Component,TypeDescriptor.GetProperties(tree).Find("Nodes",true));
+					}
+				}
+
+				node=dh.CreateComponent(typeof(Node)) as Node;
+				
+				if(node!=null)
+				{
+					node.Text=node.Name;
+					node.Expanded = true;
+					if(addToCollections)
+					{
+						if(parentNode==null)
+							tree.Nodes.Add(node);
+						else
+							parentNode.Nodes.Add(node);
+
+						if(change!=null)
+						{
+							if(parentNode!=null)
+								change.OnComponentChanged(this.Component,TypeDescriptor.GetProperties(parentNode).Find("Nodes",true),null,null);
+							else
+								change.OnComponentChanged(this.Component,TypeDescriptor.GetProperties(tree).Find("Nodes",true),null,null);
+						}
+					}
+				}
+			}
+			finally
+			{
+				tree.EndUpdate();
+			}
+
+			return node;
+		}
+		
+		private void OnSelectionChanged(object sender,EventArgs e)
+		{
+			ISelectionService ss = (ISelectionService)sender;
+			if(ss.PrimarySelection==this.Component)
+			{
+				TreeGX tree=this.Control as TreeGX;
+				tree.SelectedNode=null;
+			}
+		}
+
+		/// <summary>Called when component is about to be removed from designer.</summary>
+		/// <param name="sender">Event sender.</param>
+		/// <param name="e">Event arguments.</param>
+		public void OnComponentRemoving(object sender,ComponentEventArgs e)
+		{
+			if(e.Component==this.Component)
+			{
+				IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+				if(dh==null)
+					return;
+				
+				ArrayList list = new ArrayList(this.AssociatedComponents);
+				foreach(IComponent c in list)
+					dh.DestroyComponent(c);
+			}
+			else if(e.Component is Node && ((Node)e.Component).TreeControl==this.Control)
+			{
+				OnNodeRemoving(e.Component as Node);
+			}
+		}
+
+		private void OnNodeRemoving(Node node)
+		{
+			IComponentChangeService cc=this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+			IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+
+			if(node.Parent!=null)
+			{
+				Node parent=node.Parent;
+				if(cc!=null)
+					cc.OnComponentChanging(parent,TypeDescriptor.GetProperties(parent)["Nodes"]);
+				node.Remove();
+				if(cc!=null)
+					cc.OnComponentChanged(parent,TypeDescriptor.GetProperties(parent)["Nodes"],null,null);
+			}
+
+			if(node.Nodes.Count>0)
+			{
+				Node[] nodes=new Node[node.Nodes.Count];
+				node.Nodes.CopyTo(nodes);
+				foreach(Node n in nodes)
+				{
+					n.Remove();
+
+					if(n.ParentConnector!=null && dh!=null)
+						dh.DestroyComponent(n.ParentConnector);
+
+					if(dh!=null)
+						dh.DestroyComponent(n);
+				}
+			}
+
+			this.RecalcLayout();
+		}
+
+		/// <summary>
+		/// Returns all components associated with this control
+		/// </summary>
+		public override ICollection AssociatedComponents
+		{
+			get
+			{
+				ArrayList c=new ArrayList(base.AssociatedComponents);
+				TreeGX tree=this.Control as TreeGX;
+				if(tree!=null)
+				{
+					foreach(Node node in tree.Nodes)
+						GetNodesRecursive(node,c);
+
+					foreach(ElementStyle style in tree.Styles)
+						c.Add(style);
+
+					if(tree.NodesConnector!=null)
+						c.Add(tree.NodesConnector);
+					if(tree.RootConnector!=null)
+						c.Add(tree.RootConnector);
+					if(tree.LinkConnector!=null)
+						c.Add(tree.LinkConnector);
+					if(tree.SelectedPathConnector!=null)
+						c.Add(tree.SelectedPathConnector);
+				}
+				return c;
+			}
+		}
+
+		private void GetNodesRecursive(Node parent,ArrayList c)
+		{
+			c.Add(parent);
+			
+			if(parent.ParentConnector!=null)
+				c.Add(parent.ParentConnector);
+			foreach(Node node in parent.Nodes)
+			{
+				c.Add(node);
+                if (node.Cells.Count > 1)
+                {
+                    for (int i = 1; i < node.Cells.Count; i++)
+                    {
+                        c.Add(node.Cells[i]);
+                    }
+                }
+                if (node.NodesColumns.Count > 0)
+                {
+                    foreach (ColumnHeader ch in node.NodesColumns)
+                    {
+                        c.Add(ch);
+                    }
+                }
+				GetNodesRecursive(node,c);
+			}
+		}
+
+		/// <summary>
+		/// Selection support for items on container.
+		/// </summary>
+		protected override void WndProc(ref Message m)
+		{
+			switch(m.Msg)
+			{
+				case WM_LBUTTONDOWN:
+				{
+					if(OnMouseDown(ref m,MouseButtons.Left))
+						return;
+					break;
+				}
+				case WM_RBUTTONDOWN:
+				{
+					if(OnMouseDown(ref m,MouseButtons.Right))
+						return;
+					break;
+				}
+//				case WM_LBUTTONUP:
+//				{
+//					if(OnMouseUp(ref m,MouseButtons.Left))
+//						return;
+//					break;
+//				}
+//				case WM_RBUTTONUP:
+//				{
+//					if(OnMouseUp(ref m,MouseButtons.Right))
+//						return;
+//					break;
+//				}
+//				case WM_MOUSEMOVE:
+//				{
+//					if(OnMouseMove(ref m))
+//						return;
+//					break;
+//				}
+				case WM_LBUTTONDBLCLK:
+				{
+					if(OnMouseDoubleClick())
+						return;
+					break;
+				}
+			}
+
+			base.WndProc(ref m);
+		}
+
+		private bool OnMouseDoubleClick()
+		{
+			bool processed=false;
+
+			ISelectionService selection = (ISelectionService) this.GetService(typeof(ISelectionService));
+			if(selection.PrimarySelection is Node && ((Node)selection.PrimarySelection).TreeControl==this.Control)
+			{
+				IDesignerHost host=(IDesignerHost) this.GetService(typeof(IDesignerHost));
+				if(host!=null)
+				{
+					IDesigner designer=host.GetDesigner(selection.PrimarySelection as IComponent);
+					if(designer!=null)
+					{
+						designer.DoDefaultAction();
+						processed=true;
+					}
+				}
+			}
+
+			return processed;
+		}
+
+		protected virtual bool OnMouseDown(ref Message m, MouseButtons button)
+		{
+			
+			TreeGX tree=this.Control as TreeGX;
+
+			if(tree==null)
+				return false;
+
+			Point pos=tree.PointToClient(System.Windows.Forms.Control.MousePosition);
+			//m_MouseDownPosition=pos;
+
+			Node node=tree.GetNodeAt(pos);
+			if(node!=null && button==MouseButtons.Right)
+			{
+				ISelectionService selection = (ISelectionService) this.GetService(typeof(ISelectionService));
+				ArrayList arr=new ArrayList(1);
+				arr.Add(node);
+				selection.SetSelectedComponents(arr,SelectionTypes.Primary);
+
+				tree.SelectedNode=node;
+				this.OnContextMenu(System.Windows.Forms.Control.MousePosition.X,System.Windows.Forms.Control.MousePosition.Y);
+
+				return true;
+			}
+					
+			return false;
+		}
+
+		/// <summary>Specifies selection rules for designer.</summary>
+		public override SelectionRules SelectionRules
+		{
+			get
+			{
+				return (SelectionRules.AllSizeable | SelectionRules.Moveable | SelectionRules.Visible);
+			}
+		}
+		#endregion
+		
+		#region Drag & Drop External Control Support
+		private void DestroyComponent(IComponent c)
+		{
+			IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+			if(dh==null)
+				return;
+			dh.DestroyComponent(c);
+		}
+		
+		private void RecalcLayout()
+		{
+			TreeGX tree = this.Control as TreeGX;
+			if(tree!=null)
+			{
+				tree.RecalcLayout();
+				tree.Refresh();
+			}
+		}
+		private void ControlAdded(object sender, ControlEventArgs e)
+		{
+			if(!m_NewControlAdded)
+			{
+				if(!m_NewControlAdded)
+				{
+					if(!OnControlAdded(e))
+						return;
+				}
+				else
+					return;
+			}
+
+			m_TimerAdded=new Timer();
+			m_TimerAdded.Tick+=new EventHandler(this.TimerTick);
+			m_TimerAdded.Interval=50;
+			m_TimerAdded.Enabled=true;
+			m_TimerAdded.Start();
+			m_NewControlAdded=false;
+		}
+
+		/// <summary>
+		/// Called after control has been added to container but not through drag & drop. Control added could also be
+		/// internal control by the bar container.
+		/// </summary>
+		/// <param name="e">Event arguments</param>
+		/// <returns>true if acted upon this new control otherwise false.</returns>
+		protected virtual bool OnControlAdded(ControlEventArgs e)
+		{
+			return false;
+		}
+
+		private void ControlRemoved(object sender, ControlEventArgs e)
+		{
+			IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+			if(dh==null || dh.Loading)
+				return;
+
+			if(m_JustAdded!=DateTime.MinValue && DateTime.Now.Subtract(m_JustAdded).Seconds<2)
+			{
+				m_JustAdded=DateTime.MinValue;
+				return;
+			}
+			m_JustAdded=DateTime.MinValue;
+			if(m_DragLeave)
+				ControlRemoved(e.Control);
+			else if(m_TimerDragDrop!=null)
+				m_ControlRemoved=true;
+			else
+			{
+				ISelectionService ss =(ISelectionService)GetService(typeof(ISelectionService));
+				if(ss!=null && ss.PrimarySelection==e.Control && Utilites.FindNodeForControl(this.Control as TreeGX, e.Control)!=null)
+				{
+					ControlRemoved(e.Control);
+				}
+			}
+		}
+
+		private void ControlRemoved(Control control)
+		{
+			TreeGX tree = this.Control as TreeGX;
+			
+			if(control!=null)
+			{
+				Node node=Utilites.FindNodeForControl(tree,control);
+				if(node!=null)
+				{
+					if(m_DragDropStarted)
+					{
+						tree.InternalDragLeave();
+						m_DragDropStarted = false;
+					}
+					
+					if(node.Parent!=null)
+					{
+						Node parent=node.Parent;
+						IComponentChangeService cc = this.GetService(typeof (IComponentChangeService)) as IComponentChangeService;
+						if(cc!=null)
+							cc.OnComponentChanging(parent, TypeDescriptor.GetProperties(parent)["Nodes"]);
+						node.Remove();
+						if(cc!=null)
+							cc.OnComponentChanged(parent, TypeDescriptor.GetProperties(parent)["Nodes"],null,null);
+					}
+					
+					this.DestroyComponent(node);
+					this.RecalcLayout();
+				}
+			}
+		}
+
+		private void TimerTick(object sender, EventArgs e)
+		{
+			m_TimerAdded.Stop();
+			m_TimerAdded.Enabled=false;
+			m_TimerAdded=null;
+			this.RecalcLayout();
+			ISelectionService sel=(ISelectionService)this.GetService(typeof(ISelectionService));
+			if(sel!=null && sel.PrimarySelection is Control && this.Control.Controls.Contains((Control)sel.PrimarySelection))
+			{
+				IComponentChangeService cc=this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+				cc.OnComponentChanged(sel.PrimarySelection,null,null,null);
+			}
+		}
+		
+		private void TimerTickDragDrop(object sender, EventArgs e)
+		{
+			Point p=this.Control.PointToClient(System.Windows.Forms.Control.MousePosition);
+			if(this.Control.Bounds.Contains(p))
+				m_DragLeave=false;
+			else
+				m_DragLeave=true;
+
+			if(System.Windows.Forms.Control.MouseButtons!=MouseButtons.Left)
+			{
+				m_TimerDragDrop.Enabled=false;
+				m_TimerDragDrop.Stop();
+				m_TimerDragDrop.Tick-=new EventHandler(TimerTickDragDrop);
+				m_TimerDragDrop.Dispose();
+				m_TimerDragDrop=null;
+				if(m_ControlRemoved)
+				{
+					m_ControlRemoved=false;
+					ISelectionService sel=this.GetService(typeof(ISelectionService)) as ISelectionService;
+					if(sel!=null && sel.PrimarySelection is Control)
+						ControlRemoved((Control)sel.PrimarySelection);
+				}
+			}
+		}
+		
+		protected override void OnDragLeave(EventArgs e)
+		{
+			if(m_DragDropStarted)
+			{
+				TreeGX tree=this.Control as TreeGX;
+				tree.InternalDragLeave();
+				m_DragDropStarted = false;
+			}
+			base.OnDragLeave (e);
+		}
+		
+		protected override void OnDragOver(DragEventArgs de)
+		{
+			TreeGX tree=this.Control as TreeGX;
+			if(tree==null)
+			{
+				base.OnDragOver(de);
+				return;
+			}
+			
+			if(m_DragDropStarted)
+			{
+				DragEventArgs d=new DragEventArgs(null,de.KeyState,de.X,de.Y,DragDropEffects.All,DragDropEffects.Move);
+				tree.InternalDragOver(d);
+				de.Effect=DragDropEffects.Move;
+				return;
+			}
+
+			ISelectionService sel=(ISelectionService)this.GetService(typeof(ISelectionService));
+			if(sel!=null && sel.PrimarySelection!=this.Component)
+			{
+				if(sel.PrimarySelection is Control && this.Control.Controls.Contains((Control)sel.PrimarySelection))
+				{			
+					Node node=Utilites.FindNodeForControl(tree,sel.PrimarySelection as Control);
+					if(node!=null)
+					{
+						if(tree.StartDragDrop(node))
+						{
+							if(m_TimerDragDrop==null)
+							{
+								m_TimerDragDrop=new Timer();
+								m_TimerDragDrop.Tick+=new EventHandler(this.TimerTickDragDrop);
+								m_TimerDragDrop.Interval=100;
+								m_TimerDragDrop.Enabled=true;
+								m_TimerDragDrop.Start();
+							}
+							m_DragDropStarted = true;
+						}
+					}
+					return;
+				}
+				else if(sel.SelectionCount>1)
+				{
+					de.Effect=DragDropEffects.None;
+					return;
+				}
+				else if(sel.PrimarySelection is Control && ((Control)sel.PrimarySelection).Parent!=null)
+				{
+					// New control being added to the container
+					Node node=new Node();
+					node.Name=TEMP_NAME;
+					node.Text = ((Control) sel.PrimarySelection).Name;
+					if(tree.StartDragDrop(node))
+						m_DragDropStarted = true;
+				}
+			}
+			
+			base.OnDragOver (de);
+		}
+
+		protected override void OnDragDrop(DragEventArgs de)
+		{
+			TreeGX tree=this.Control as TreeGX;
+			if(tree==null)
+			{
+				base.OnDragDrop(de);
+				return;
+			}
+			
+			ISelectionService sel=(ISelectionService)this.GetService(typeof(ISelectionService));
+			if(sel!=null && sel.PrimarySelection is Control && this.Control.Controls.Contains((Control)sel.PrimarySelection))
+			{
+				de.Effect=DragDropEffects.Move;
+				tree.InternalDragDrop(new DragEventArgs(null,0,0,0,DragDropEffects.Move,DragDropEffects.All));
+			}
+			else
+			{
+				if(sel.SelectionCount>1)
+				{
+					de.Effect=DragDropEffects.None;
+					return;
+				}
+				else
+				{
+					Node node = tree.GetDragNode();
+					if(node!=null && node.Tag is Node && ((Node)node.Tag).Name==TEMP_NAME)
+					{
+						m_JustAdded=DateTime.Now;
+						Node dragNode=CreateNode(null,false);
+						TypeDescriptor.GetProperties(dragNode)["HostedControl"].SetValue(dragNode,sel.PrimarySelection as Control);
+						TypeDescriptor.GetProperties(dragNode)["Text"].SetValue(dragNode,dragNode.HostedControl.Name);
+						node.Tag = dragNode;
+						tree.InternalDragDrop(new DragEventArgs(null,0,0,0,DragDropEffects.Move,DragDropEffects.All));
+						m_NewControlAdded=true;
+						m_DragDropStarted = false;
+					}
+				}
+			}
+		
+			base.OnDragDrop(de);
+		}
+		#endregion
+
+		#region Drag & Drop support
+		/// <summary>
+		/// Called after node has been selected by designer as response to mouse action
+		/// </summary>
+		/// <param name="node">Node that is selected</param>
+		protected virtual void OnNodeSelected(Node node)
+		{
+			
+		}
+		
+		/// <summary>
+		/// Returns whether specified node can be dragged and dropped
+		/// </summary>
+		/// <param name="node">Node to verify</param>
+		/// <returns>true if node can be dragged and dropped</returns>
+		protected virtual bool CanDragNode(Node node)
+		{
+			return true;
+		}
+		
+		protected override void OnMouseDragBegin(int x, int y)
+		{
+			TreeGX tree=this.Control as TreeGX;
+			if(tree==null)
+			{
+				base.OnMouseDragBegin(x,y);
+				return;
+			}
+			
+			Point pos=tree.PointToClient(new Point(x,y));
+			Node node = tree.GetNodeAt(pos);
+			
+			if(node!=null)
+			{
+				Rectangle expandedRect=Display.NodeDisplay.GetNodeRectangle(eNodeRectanglePart.ExpandBounds,node,tree.NodeDisplay.Offset);
+				if(!expandedRect.IsEmpty && expandedRect.Contains(pos))
+				{
+					node.Expanded=!node.Expanded;
+					return;
+				}
+				ISelectionService selection = (ISelectionService) this.GetService(typeof(ISelectionService));
+				if(selection!=null)
+				{
+					ArrayList arr=new ArrayList(1);
+					arr.Add(node);
+					selection.SetSelectedComponents(arr,SelectionTypes.Primary);
+					OnNodeSelected(node);
+				}
+				tree.SelectedNode = node;
+			}
+			else
+				tree.SelectedNode = null;
+
+			if(node==null || !CanDragNode(node))
+			{
+				if(node==null)
+					base.OnMouseDragBegin(x,y);
+				else
+					this.Control.Capture = true; // Does same as base implementation
+				return;
+			}
+			
+			m_MouseDownPoint=new Point(x,y);
+			this.Control.Capture = true;
+		}
+		
+		protected override void OnMouseDragMove(int x, int y)
+		{
+			TreeGX tree=this.Control as TreeGX;
+			if(!m_MouseDownPoint.IsEmpty && tree.SelectedNode!=null)
+			{
+				if(Math.Abs(m_MouseDownPoint.X-x)>=SystemInformation.DragSize.Width || Math.Abs(m_MouseDownPoint.Y-y)>=SystemInformation.DragSize.Height)
+				{
+					tree.StartDragDrop(tree.SelectedNode);
+					m_MouseDownPoint=Point.Empty;
+					m_DragDropStarted=true;
+					return;
+				}
+			}
+
+			if(m_DragDropStarted)
+			{
+				DragEventArgs de=new DragEventArgs(null,(int)Control.ModifierKeys,x,y,DragDropEffects.All,DragDropEffects.Move);
+				tree.InternalDragOver(de);
+			}
+		}
+		
+		protected override void OnMouseDragEnd(bool cancel)
+		{
+			this.Control.Capture = false;
+			Cursor.Clip = Rectangle.Empty;
+			TreeGX tree=this.Control as TreeGX;
+			if(m_DragDropStarted)
+			{
+				if(tree!=null && tree.IsDragDropInProgress)
+				{
+					if(cancel)
+						tree.InternalDragLeave();
+					else if(tree.GetDragNode()!=null)
+					{
+						IComponentChangeService change=this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+
+						Node dragNode=tree.GetDragNode().Tag as Node;
+						if(dragNode!=null)
+						{
+							Node newParent=tree.GetDragNode().Parent;
+							Node parent=dragNode.Parent;
+
+							if(change!=null)
+							{
+								if(parent!=null)
+									change.OnComponentChanging(this.Component,TypeDescriptor.GetProperties(parent).Find("Nodes",true));
+								else
+									change.OnComponentChanging(this.Component,TypeDescriptor.GetProperties(tree).Find("Nodes",true));
+
+								if(newParent!=null)
+									change.OnComponentChanging(this.Component,TypeDescriptor.GetProperties(newParent).Find("Nodes",true));
+								else
+									change.OnComponentChanging(this.Component,TypeDescriptor.GetProperties(tree).Find("Nodes",true));
+							}
+
+							tree.InternalDragDrop(new DragEventArgs(null,0,0,0,DragDropEffects.None,DragDropEffects.None));
+
+                            newParent = dragNode.Parent;
+					
+							if(change!=null)
+							{
+								if(parent!=null)
+									change.OnComponentChanged(this.Component,TypeDescriptor.GetProperties(parent).Find("Nodes",true),null,null);
+								else
+									change.OnComponentChanged(this.Component,TypeDescriptor.GetProperties(tree).Find("Nodes",true),null,null);
+								if(newParent!=null)
+									change.OnComponentChanged(this.Component,TypeDescriptor.GetProperties(newParent).Find("Nodes",true),null,null);
+								else
+									change.OnComponentChanged(this.Component,TypeDescriptor.GetProperties(tree).Find("Nodes",true),null,null);
+							}
+						}
+					}
+				}
+				cancel=true;
+			}
+			else
+			{
+				if(tree.SelectedNode!=null)
+					cancel=true;
+			}
+			
+			m_DragDropStarted = false;
+			base.OnMouseDragEnd(cancel);
+		}
+		#endregion
+		
+		#region Licensing Stuff
+		#if !TRIAL
+		private string GetLicenseKey()
+		{
+			string key="";
+			Microsoft.Win32.RegistryKey regkey=Microsoft.Win32.Registry.LocalMachine;
+			regkey=regkey.OpenSubKey("Software\\DevComponents\\Licenses",false);
+			if(regkey!=null)
+			{
+				object keyValue=regkey.GetValue("DevComponents.Tree.TreeGX");
+				if(keyValue!=null)
+					key=keyValue.ToString();
+			}
+			return key;
+		}
+		private void dh_LoadComplete(object sender, EventArgs e)
+		{
+			IDesignerHost dh = this.GetService(typeof (IDesignerHost)) as IDesignerHost;
+			if(dh!=null)
+				dh.LoadComplete-=new EventHandler(dh_LoadComplete);
+			
+			string key=GetLicenseKey();
+			TreeGX tree=this.Control as TreeGX;
+			if(key!="" && tree!=null && tree.LicenseKey=="" && tree.LicenseKey!=key)
+				TypeDescriptor.GetProperties(tree)["LicenseKey"].SetValue(tree,key);
+		}
+		#endif
+		#endregion
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/DevComponents.TreeGX.dxc b/PROMS/DotNetBar Source Code/TreeGX/DevComponents.TreeGX.dxc
new file mode 100644
index 00000000..d4f1159e
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/DevComponents.TreeGX.dxc	
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<DocumentXComments Version="4.00" DocType="dx.Net" Moniker="obj\Debug\DevComponents.TreeGX.dll" ShowInherited="False" Template="" RelatedProject="TreeGXDocumentation.dxp"/>
diff --git a/PROMS/DotNetBar Source Code/TreeGX/DevComponents.TreeGX.xml b/PROMS/DotNetBar Source Code/TreeGX/DevComponents.TreeGX.xml
new file mode 100644
index 00000000..f8dcd8f7
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/DevComponents.TreeGX.xml	
@@ -0,0 +1,9376 @@
+<?xml version="1.0"?>
+<doc>
+    <assembly>
+        <name>DevComponents.TreeGX</name>
+    </assembly>
+    <members>
+        <member name="T:DevComponents.Tree.Cell">
+            <summary>Represents a cell assigned to the Node.</summary>
+            <remarks>
+            	<para>The Cell with Index 0 (zero) always exists for a Node and it is a cell that
+                you can interact with through the properties on a node, which are forwarding to the
+                Cell(0), or you can go directly to the Cell(0).</para>
+            	<para>When Node has multiple columns defined each column corresponds to Cell in
+                Node's Cells collection. The first Column has Index 0, second Column Index 1 and so
+                forth.</para>
+            	<para>Note that there is always at least one Cell in a Node even if multiple
+                columns are not used.</para>
+            </remarks>
+        </member>
+        <member name="M:DevComponents.Tree.Cell.#ctor">
+            <summary>
+            Initializes new instance of Cell class.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.Cell.#ctor(System.String)">
+            <summary>
+            Initializes new instance of Cell class.
+            </summary>
+            <param name="text">Cell text.</param>
+        </member>
+        <member name="M:DevComponents.Tree.Cell.Dispose(System.Boolean)">
+            <summary>
+            Releases the resources used by the Component.
+            </summary>
+            <param name="disposing">true to release both managed and unmanaged resources; false to release only unmanaged resources.</param>
+        </member>
+        <member name="M:DevComponents.Tree.Cell.SetBounds(System.Drawing.Rectangle)">
+            <summary>
+            Sets the bounds of the cell.
+            </summary>
+            <param name="bounds">New cell bounds.</param>
+        </member>
+        <member name="M:DevComponents.Tree.Cell.SetImageBounds(System.Drawing.Rectangle)">
+            <summary>
+            Sets the bounds of the image inside of the cell.
+            </summary>
+            <param name="bounds">New cell bounds.</param>
+        </member>
+        <member name="M:DevComponents.Tree.Cell.SetCheckBoxBounds(System.Drawing.Rectangle)">
+            <summary>
+            Sets the bounds of the check box inside of the cell.
+            </summary>
+            <param name="bounds">New cell bounds.</param>
+        </member>
+        <member name="M:DevComponents.Tree.Cell.SetVisible(System.Boolean)">
+            <summary>
+            Sets whether cells is visible or not. This is set by node layout manager and it is based on column visibility.
+            </summary>
+            <param name="visible">True if visible otherwise false.</param>
+        </member>
+        <member name="M:DevComponents.Tree.Cell.SetParent(DevComponents.Tree.Node)">
+            <summary>
+            Sets the parent of the cell.
+            </summary>
+            <param name="parent">Parent node.</param>
+        </member>
+        <member name="M:DevComponents.Tree.Cell.OnTextChanged">
+            <summary>
+            Occurs after text has changed.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.Cell.SetCellImages(DevComponents.Tree.CellImages)">
+            <summary>
+            Sets the Images to the new CellImages object.
+            </summary>
+            <param name="ci">CellImages object.</param>
+        </member>
+        <member name="M:DevComponents.Tree.Cell.ShouldSerializeImages">
+            <summary>
+            Returns whether Images property should be serialized. Used internally for windows forms designer support.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.Cell.SetMouseOver(System.Boolean)">
+            <summary>
+            Sets the mouse over flag.
+            </summary>
+            <param name="over">true if mouse is over the cell otherwise false.</param>
+        </member>
+        <member name="M:DevComponents.Tree.Cell.SetMouseDown(System.Boolean)">
+            <summary>
+            Sets the mouse down flag.
+            </summary>
+            <param name="over">true if left mouse button is pressed while over the cell otherwise false.</param>
+        </member>
+        <member name="M:DevComponents.Tree.Cell.Copy">
+            <summary>Makes a copy of a Cell.</summary>
+        </member>
+        <member name="M:DevComponents.Tree.Cell.OnImageChanged">
+            <summary>
+            Occurs when any image property for the cell has changed.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.Cell.InvokeAfterCheck">
+            <summary>
+            Invokes <see cref="E:DevComponents.Tree.TreeGX.AfterCheck">AfterCheck</see> event on TreeGX
+            control.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.Cell.OnLayoutCell">
+            <summary>
+            Called just before cell layout is to be performed.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.Cell.TextMarkupLinkClick(System.Object,System.EventArgs)">
+            <summary>
+            Occurs when text markup link is clicked.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Cell.HostedControl">
+            <summary>
+            Gets or sets the control hosted inside of the cell.
+            </summary>
+            <remarks>
+            	<para>When control is hosted inside of the cell, cell size is determined by the
+                size of the control hosted inside of it. The cell will not display its text but it will display any image assigned
+                or check box when control is hosted inside of it. The Style settings like Margin
+                and Padding will still apply.</para>
+            </remarks>
+        </member>
+        <member name="P:DevComponents.Tree.Cell.IgnoreHostedControlSizeChange">
+            <summary>
+            Gets or sets whether hosted control size change event is ignored.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Cell.HostedControlSize">
+            <summary>
+            Gets or sets the hosted control size. Property is used to correctly scale control when TreeGX.Zoom is used to zoom view.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Cell.Name">
+            <summary>
+            Returns name of the cell that can be used to identify it from the code.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Cell.BoundsRelative">
+            <summary>
+            Gets the relative bounds of the cell.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Cell.Bounds">
+            <summary>
+            Gets the bounds of the cell.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Cell.TextContentBounds">
+            <summary>
+            Gets or sets the available content bounds for the text. Text will fitted into these bounds
+            but it's true location can be obtained only after it is displayed.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Cell.ImageBoundsRelative">
+            <summary>
+            Gets the relative bounds of the image inside of cell.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Cell.ImageBounds">
+            <summary>
+            Gets the bounds of the image inside of cell.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Cell.CheckBoxBoundsRelative">
+            <summary>
+            Gets the bounds of the image inside of cell.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Cell.CheckBoxBounds">
+            <summary>
+            Gets the bounds of the image inside of cell.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Cell.IsEditing">
+            <summary>
+            Gets a value indicating whether the cell is in an editable state. true if the cell is in editable state; otherwise, false.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Cell.IsSelected">
+            <summary>
+            Gets a value indicating whether the cell is in the selected state. true if the cell is in the selected state; otherwise, false.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Cell.IsVisible">
+            <summary>
+            Gets a value indicating whether the cell is visible. Cell is considered to be visible when it's Bounds are within the display rectangle of tree.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Cell.Parent">
+            <summary>
+            Gets the parent node of the current cell.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Cell.Tag">
+            <summary>
+            Gets or sets the object that contains data about the cell. Any Object derived type can be assigned to this property. If this property is being set through the Windows Forms designer, only text can be assigned.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Cell.TagString">
+            <summary>
+            Gets or sets the object that contains data about the cell. Any Object derived type can be assigned to this property. If this property is being set through the Windows Forms designer, only text can be assigned.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Cell.Text">
+            <summary>
+            Gets or sets the text displayed in the cell.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Cell.TreeControl">
+            <summary>
+            Gets the parent tree control that the cell belongs to.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Cell.StyleNormal">
+            <summary>
+            Gets or sets the style class assigned to the cell. Null value indicates that
+            default style is used as specified on cell's parent.
+            </summary>
+            <value>
+            Reference to the style assigned to the cell or null (VB Nothing) indicating that default
+            style setting from tree control is applied. Default value is null.
+            </value>
+            <remarks>
+            When property is set to null (VB Nothing) the style setting from parent tree
+            controls is used. CellStyleNormal on TreeGX control is a root style for a cell.
+            </remarks>
+            <seealso cref="P:DevComponents.Tree.Cell.StyleDisabled">StyleDisabled Property</seealso>
+            <seealso cref="P:DevComponents.Tree.Cell.StyleMouseDown">StyleMouseDown Property</seealso>
+            <seealso cref="P:DevComponents.Tree.Cell.StyleMouseOver">StyleMouseOver Property</seealso>
+            <seealso cref="P:DevComponents.Tree.Cell.StyleSelected">StyleSelected Property</seealso>
+        </member>
+        <member name="P:DevComponents.Tree.Cell.StyleNormalName">
+            <summary>
+            Gets or sets the style name used by cell. This member is provided for internal use only. To set or get the style use StyleNormal property instead.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Cell.StyleSelected">
+            <summary>
+            Gets or sets the style class that is to when cell is selected. Null value indicates that
+            default style is used as specified on cell's parent.
+            </summary>
+            <value>
+            Reference to the style assigned to the cell or null value indicating that default
+            style setting from tree control is applied. Default is null value.
+            </value>
+            <remarks>
+            When property is set to null value the style setting from parent tree
+            controls is used. CellStyleSelected on TreeGX control is a root style for a cell.
+            </remarks>
+            <seealso cref="P:DevComponents.Tree.Cell.StyleNormal">StyleNormal Property</seealso>
+            <seealso cref="P:DevComponents.Tree.Cell.StyleDisabled">StyleDisabled Property</seealso>
+            <seealso cref="P:DevComponents.Tree.Cell.StyleMouseDown">StyleMouseDown Property</seealso>
+            <seealso cref="P:DevComponents.Tree.Cell.StyleMouseOver">StyleMouseOver Property</seealso>
+        </member>
+        <member name="P:DevComponents.Tree.Cell.StyleSelectedName">
+            <summary>
+            Gets or sets the selected style name used by cell. This member is provided for internal use only. To set or get the style use StyleSelected property instead.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Cell.StyleDisabled">
+            <summary>
+            Gets or sets the disabled style class assigned to the cell. Null value indicates
+            that default style is used as specified on cell's parent.
+            </summary>
+            <value>
+            Reference to the style assigned to the cell or null value indicating that default
+            style setting from tree control is applied. Default value is null.
+            </value>
+            <remarks>
+            When property is set to null value the style setting from parent tree
+            controls is used. CellStyleDisabled on TreeGX control is a root style for a
+            cell.
+            </remarks>
+            <seealso cref="P:DevComponents.Tree.Cell.StyleNormal">StyleNormal Property</seealso>
+            <seealso cref="P:DevComponents.Tree.Cell.StyleMouseDown">StyleMouseDown Property</seealso>
+            <seealso cref="P:DevComponents.Tree.Cell.StyleMouseOver">StyleMouseOver Property</seealso>
+            <seealso cref="P:DevComponents.Tree.Cell.StyleSelected">StyleSelected Property</seealso>
+        </member>
+        <member name="P:DevComponents.Tree.Cell.StyleDisabledName">
+            <summary>
+            Gets or sets the disabled style name used by cell. This member is provided for internal use only. To set or get the style use StyleDisabled property instead.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Cell.StyleMouseDown">
+            <summary>
+            Gets or sets the style class assigned to the cell which is applied when mouse
+            button is pressed while mouse is over the cell. Null value indicates that default
+            style is used as specified on cell's parent.
+            </summary>
+            <value>
+            Reference to the style assigned to the cell or null value indicating that default
+            style setting from tree control is applied. Default value is null.
+            </value>
+            <remarks>
+            When property is set to null value style setting from parent tree
+            controls is used. CellStyleMouseDown on TreeGX control is a root style for a
+            cell.
+            </remarks>
+            <seealso cref="P:DevComponents.Tree.Cell.StyleNormal">StyleNormal Property</seealso>
+            <seealso cref="P:DevComponents.Tree.Cell.StyleDisabled">StyleDisabled Property</seealso>
+            <seealso cref="P:DevComponents.Tree.Cell.StyleMouseOver">StyleMouseOver Property</seealso>
+            <seealso cref="P:DevComponents.Tree.Cell.StyleSelected">StyleSelected Property</seealso>
+        </member>
+        <member name="P:DevComponents.Tree.Cell.StyleMouseDownName">
+            <summary>
+            Gets or sets the mouse down style name used by cell. This member is provided for internal use only. To set or get the style use StyleMouseDown property instead.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Cell.StyleMouseOver">
+            <summary>
+            Gets or sets the style class assigned to the cell which is applied when mouse is
+            over the cell. Null value indicates that default style is used as specified on cell's
+            parent.
+            </summary>
+            <value>
+            Reference to the style assigned to the cell or null value indicating that default
+            style setting from tree control is applied. Default value is null.
+            </value>
+            <remarks>
+            When property is set to null value the style setting from parent tree
+            controls is used. CellStyleMouseOver on TreeGX control is a root style for a
+            cell.
+            </remarks>
+            <seealso cref="P:DevComponents.Tree.Cell.StyleNormal">StyleNormal Property</seealso>
+            <seealso cref="P:DevComponents.Tree.Cell.StyleDisabled">StyleDisabled Property</seealso>
+            <seealso cref="P:DevComponents.Tree.Cell.StyleMouseDown">StyleMouseDown Property</seealso>
+            <seealso cref="P:DevComponents.Tree.Cell.StyleSelected">StyleSelected Property</seealso>
+        </member>
+        <member name="P:DevComponents.Tree.Cell.StyleMouseOverName">
+            <summary>
+            Gets or sets the mouse over style name used by cell. This member is provided for internal use only. To set or get the style use StyleMouseOver property instead.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Cell.Enabled">
+            <summary>
+            Gets or sets whether cell is enabled or not.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Cell.Images">
+            <summary>
+            Gets the reference to images associated with this cell.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Cell.ImageAlignment">
+            <summary>
+            Gets or sets the image alignment in relation to the text displayed by cell.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Cell.CheckBoxAlignment">
+            <summary>
+            Gets or sets the checkbox alignment in relation to the text displayed by cell.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Cell.CheckBoxVisible">
+            <summary>
+            Gets or sets whether check box is visible inside the cell.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Cell.Checked">
+            <summary>
+            Gets or set a value indicating whether the check box is in the checked state.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Cell.IsMouseOver">
+            <summary>
+            Gets whether mouse is over the cell.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Cell.IsMouseDown">
+            <summary>
+            Gets whether left mouse button is pressed while over the cell.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Cell.Layout">
+            <summary>
+            Gets or sets the layout of the cell parts like check box, image and text. Layout can be horizontal (default)
+            where parts of the cell are positioned next to each other horizontally, or vertical where
+            parts of the cell are positioned on top of each other vertically.
+            Alignment of the each part is controlled by alignment properties.
+            </summary>
+            <seealso cref="P:DevComponents.Tree.Cell.ImageAlignment">ImageAlignment Property</seealso>
+            <seealso cref="P:DevComponents.Tree.Cell.CheckBoxAlignment">CheckBoxAlignment Property</seealso>
+        </member>
+        <member name="P:DevComponents.Tree.Cell.Cursor">
+            <summary>
+            Specifes the mouse cursor displayed when mouse is over the cell.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Cell.WordWrap">
+            <summary>
+            Gets or sets whether cell wrapped the text during the layout.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Cell.TextMarkupBody">
+            <summary>
+            Gets reference to parsed markup body element if text was markup otherwise returns null.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Cell.IsMarkupSupported">
+            <summary>
+            Gets whether item supports text markup. Default is false.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.CellCollection">
+            <summary>
+             A strongly-typed collection of <see cref="T:DevComponents.Tree.Cell"/> objects.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.CellCollection.#ctor">
+            <summary>Creates new instance of the class.</summary>
+        </member>
+        <member name="M:DevComponents.Tree.CellCollection.Add(DevComponents.Tree.Cell)">
+            <summary>
+            Adds new object to the collection.
+            </summary>
+            <param name="cell">Object to add.</param>
+            <returns>Index of newly added object.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.CellCollection.Insert(System.Int32,DevComponents.Tree.Cell)">
+            <summary>
+            Inserts new object into the collection.
+            </summary>
+            <param name="index">Position of the object.</param>
+            <param name="value">Object to insert.</param>
+        </member>
+        <member name="M:DevComponents.Tree.CellCollection.IndexOf(DevComponents.Tree.Cell)">
+            <summary>
+            Returns index of the object inside of the collection.
+            </summary>
+            <param name="value">Reference to the object.</param>
+            <returns>Index of the object.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.CellCollection.Contains(DevComponents.Tree.Cell)">
+            <summary>
+            Returns whether collection contains specified object.
+            </summary>
+            <param name="value">Object to look for.</param>
+            <returns>true if object is part of the collection, otherwise false.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.CellCollection.Remove(DevComponents.Tree.Cell)">
+            <summary>
+            Removes specified object from the collection.
+            </summary>
+            <param name="value"></param>
+        </member>
+        <member name="M:DevComponents.Tree.CellCollection.CopyTo(DevComponents.Tree.Cell[],System.Int32)">
+            <summary>
+            Copies collection into the specified array.
+            </summary>
+            <param name="array">Array to copy collection to.</param>
+            <param name="index">Starting index.</param>
+        </member>
+        <member name="M:DevComponents.Tree.CellCollection.CopyTo(DevComponents.Tree.Cell[])">
+            <summary>
+            Copies contained items to the Cell array.
+            </summary>
+            <param name="array">Array to copy to.</param>
+        </member>
+        <member name="M:DevComponents.Tree.CellCollection.SetParentNode(DevComponents.Tree.Node)">
+            <summary>
+            Sets the node collection belongs to.
+            </summary>
+            <param name="parent">Cell that is parent of this collection.</param>
+        </member>
+        <member name="P:DevComponents.Tree.CellCollection.Item(System.Int32)">
+            <summary>
+            Returns reference to the object in collection based on it's index.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.CellCollection.ParentNode">
+            <summary>
+            Gets or sets the node this collection is associated with.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.CellCollectionEditor">
+            <summary>
+            Support for Cell tabs design-time editor.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.CellCollectionEditor.#ctor(System.Type)">
+            <summary>Creates new instance of cell collection editor.</summary>
+            <param name="type">Type to initialize editor with.</param>
+        </member>
+        <member name="T:DevComponents.Tree.CellEditEventArgs">
+            <summary>
+            Represents event arguments for cell editing events.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.CellEditEventArgs.Action">
+            <summary>
+            Indicates the action that caused the event.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.CellEditEventArgs.Cell">
+            <summary>
+            Indicates the cell that is affected.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.CellEditEventArgs.NewText">
+            <summary>
+            Indicates new text that will be assigned to the cell if one is appropriate for given event.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.CellEditEventArgs.Cancel">
+            <summary>
+            Indicates whether the current action is cancelled. For BeforeCellEdit event setting this
+            property to true will cancel the editing. For AfterCellEdit event setting this property to
+            true will cancel any changes made to the text and edits will not be accepted. For CellEditEnding
+            event setting this property to true will keep the cell in edit mode.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.CellEditEventArgs.#ctor(DevComponents.Tree.Cell,DevComponents.Tree.eTreeAction,System.String)">
+            <summary>
+            Initializes new instance of CellEditEventArgs class.
+            </summary>
+            <param name="cell">Reference to Cell this event is raised for.</param>
+            <param name="action">Indicates the action that caused the event.</param>
+            <param name="newText">Indicates new text of the cell if it applies to given event.</param>
+        </member>
+        <member name="T:DevComponents.Tree.CellImages">
+            <summary>
+            Represents class that holds images for a cell.
+            </summary>
+            <remarks>
+            If you plan to use alpha-blended images we recommend using PNG-24 format which
+            supports alpha-blending. As of this writting .NET Framework 1.0 and 1.1 do not support
+            alpha-blending when used through Image class.
+            </remarks>
+        </member>
+        <member name="M:DevComponents.Tree.CellImages.#ctor(DevComponents.Tree.Cell)">
+            <summary>
+            Initializes new instance of CellImages class.
+            </summary>
+            <param name="parentCell">Reference to parent cell.</param>
+        </member>
+        <member name="M:DevComponents.Tree.CellImages.ResetImage">
+            <summary>
+            Resets Image property to it's default value (null, VB nothing).
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.CellImages.ResetImageMouseOver">
+            <summary>
+            Resets ImageMouseOver to it's default value (null, VB nothing).
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.CellImages.ResetImageExpanded">
+            <summary>
+            Resets ImageExpanded to it's default value (null, VB nothing).
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.CellImages.Copy">
+            <summary>Makes a copy of a CellImages object.</summary>
+        </member>
+        <member name="M:DevComponents.Tree.CellImages.GetImageByIndex(System.Int32)">
+            <summary>
+            Returns image from image list based on the image index.
+            </summary>
+            <param name="imageIndex">Index of the image to return.</param>
+            <returns>Image object from image list.</returns>
+        </member>
+        <member name="P:DevComponents.Tree.CellImages.Image">
+            <summary>
+            Gets or sets default cell image. Setting this property to valid image will
+            override any setting of ImageIndex property.
+            </summary>
+            <remarks>
+            	<para>The image set through this property will be serialized with the cell. If you
+                plan to use ImageList then use <see cref="P:DevComponents.Tree.CellImages.ImageIndex">ImageIndex</see>
+                property.</para>
+            	<para>
+            		<para>If you plan to use alpha-blended images we recommend using PNG-24 format
+                    which supports alpha-blending. As of this writting .NET Framework 1.0 and 1.1
+                    do not support alpha-blending when used through Image class.</para>
+            	</para>
+            </remarks>
+            <value>Image object or <strong>null (Nothing)</strong> if no image is assigned.</value>
+        </member>
+        <member name="P:DevComponents.Tree.CellImages.ImageMouseOver">
+            <summary>
+            Gets or sets the image that is displayed when mouse is over the cell. Setting
+            this property to valid image will override any setting of ImageMouseOverIndex
+            property.
+            </summary>
+            <remarks>
+            If you plan to use alpha-blended images we recommend using PNG-24 format which
+            supports alpha-blending. As of this writting .NET Framework 1.0 and 1.1 do not support
+            alpha-blending when used through Image class.
+            </remarks>
+        </member>
+        <member name="P:DevComponents.Tree.CellImages.ImageExpanded">
+            <summary>
+            Gets or sets image that is displayed when Node that this cell belongs to is
+            expanded. Setting this property to valid image will override any setting of
+            ImageExpandedIndex property.
+            </summary>
+            <remarks>
+            If you plan to use alpha-blended images we recommend using PNG-24 format which
+            supports alpha-blending. As of this writting .NET Framework 1.0 and 1.1 do not support
+            alpha-blending when used through Image class.
+            </remarks>
+        </member>
+        <member name="P:DevComponents.Tree.CellImages.ImageIndex">
+            <summary>
+            Gets or sets the Index of default cell image from ImageList specified on TreeGX
+            control.
+            </summary>
+            <remarks>
+            If you plan to use alpha-blended images we recommend using PNG-24 format which
+            supports alpha-blending. As of this writting .NET Framework 1.0 and 1.1 do not support
+            alpha-blending when used through Image class.
+            </remarks>
+        </member>
+        <member name="P:DevComponents.Tree.CellImages.ImageList">
+            <summary>
+            Property Editor support for ImageIndex selection
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.CellImages.ImageMouseOverIndex">
+            <remarks>
+            If you plan to use alpha-blended images we recommend using PNG-24 format which
+            supports alpha-blending. As of this writting .NET Framework 1.0 and 1.1 do not support
+            alpha-blending when used through Image class.
+            </remarks>
+            <summary>
+            Gets or sets the Index of cell image when mouse is over the cell from ImageList
+            specified on TreeGX control.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.CellImages.ImageExpandedIndex">
+            <remarks>
+            If you plan to use alpha-blended images we recommend using PNG-24 format which
+            supports alpha-blending. As of this writting .NET Framework 1.0 and 1.1 do not support
+            alpha-blending when used through Image class.
+            </remarks>
+            <summary>
+            Gets or sets the Index of cell image from ImageList specified on TreeGX control
+            that is used when Node associated with this cell is expanded
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.CellImages.Parent">
+            <summary>
+            Gets or sets the parent node of the cell.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.CellImages.ShouldSerialize">
+            <summary>
+            Gets whether CellImages object should be serialized or not. If object has all
+            default values then this property will return <strong>false</strong>.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.CellImages.LargestImageSize">
+            <summary>
+            Returns largest image size in this set of images.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.ColorFunctions">
+            <summary>
+            Represents the class that provides color support to ColorScheme object.
+            </summary>
+        </member>
+        <member name="T:DevComponents.UI.ColorPicker">
+            <summary>
+            Provides popup color picker.
+            </summary>
+        </member>
+        <member name="F:DevComponents.UI.ColorPicker.components">
+            <summary> 
+            Required designer variable.
+            </summary>
+        </member>
+        <member name="M:DevComponents.UI.ColorPicker.Dispose(System.Boolean)">
+            <summary> 
+            Clean up any resources being used.
+            </summary>
+        </member>
+        <member name="M:DevComponents.UI.ColorPicker.InitializeComponent">
+            <summary> 
+            Required method for Designer support - do not modify 
+            the contents of this method with the code editor.
+            </summary>
+        </member>
+        <member name="P:DevComponents.UI.ColorPicker.EditorService">
+            <summary>
+            Gets or sets the windows forms editor service. This property must be set if color picker is used with UITypeEditorEditStyle.DropDown style.
+            </summary>
+        </member>
+        <member name="P:DevComponents.UI.ColorPicker.ColorScheme">
+            <summary>
+            Gets or sets the ColorScheme object for Scheme colors.
+            </summary>
+        </member>
+        <member name="P:DevComponents.UI.ColorPicker.SelectedColor">
+            <summary>
+            Gets or sets currently selected color.
+            </summary>
+        </member>
+        <member name="P:DevComponents.UI.ColorPicker.SelectedColorSchemeName">
+            <summary>
+            Gets the selected color color scheme name if color scheme color is selected otherwise it returns an empty string.
+            </summary>
+        </member>
+        <member name="P:DevComponents.UI.ColorPicker.Canceled">
+            <summary>
+            Returns true if color selection was cancelled.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.ColorScheme">
+            <summary>
+            Represents the Color scheme used by items on the Bar.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.ColorScheme.#ctor">
+            <summary>
+            Initializes new instance of ColorScheme class.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.ColorScheme.#ctor(System.Drawing.Graphics)">
+            <summary>
+            Initializes new instance of ColorScheme class.
+            </summary>
+            <param name="graphics">Reference to graphics object.</param>
+        </member>
+        <member name="M:DevComponents.Tree.ColorScheme.#ctor(DevComponents.Tree.eColorSchemeStyle)">
+            <summary>
+            Initializes new instance of ColorScheme class.
+            </summary>
+            <param name="style">Style to initialize color scheme with.</param>
+        </member>
+        <member name="M:DevComponents.Tree.ColorScheme.ShouldSerializeMenuBarBackground">
+            <summary>
+            Gets whether property should be serialized. Used by windows forms designer.
+            </summary>
+            <returns>True if property should be serialized otherwise false.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.ColorScheme.ShouldSerializeMenuBarBackground2">
+            <summary>
+            Gets whether property should be serialized. Used by windows forms designer.
+            </summary>
+            <returns>True if property should be serialized otherwise false.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.ColorScheme.ShouldSerializeBarBackground">
+            <summary>
+            Gets whether property should be serialized. Used by windows forms designer.
+            </summary>
+            <returns>True if property should be serialized otherwise false.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.ColorScheme.ShouldSerializeBarBackground2">
+            <summary>
+            Gets whether property should be serialized. Used by windows forms designer.
+            </summary>
+            <returns>True if property should be serialized otherwise false.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.ColorScheme.ShouldSerializeBarCaptionBackground">
+            <summary>
+            Gets whether property should be serialized. Used by windows forms designer.
+            </summary>
+            <returns>True if property should be serialized otherwise false.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.ColorScheme.ShouldSerializeBarCaptionBackground2">
+            <summary>
+            Gets whether property should be serialized. Used by windows forms designer.
+            </summary>
+            <returns>True if property should be serialized otherwise false.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.ColorScheme.ShouldSerializeBarCaptionText">
+            <summary>
+            Gets whether property should be serialized. Used by windows forms designer.
+            </summary>
+            <returns>True if property should be serialized otherwise false.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.ColorScheme.ShouldSerializeBarCaptionInactiveBackground">
+            <summary>
+            Gets whether property should be serialized. Used by windows forms designer.
+            </summary>
+            <returns>True if property should be serialized otherwise false.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.ColorScheme.ShouldSerializeBarCaptionInactiveBackground2">
+            <summary>
+            Gets whether property should be serialized. Used by windows forms designer.
+            </summary>
+            <returns>True if property should be serialized otherwise false.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.ColorScheme.ShouldSerializeBarCaptionInactiveText">
+            <summary>
+            Gets whether property should be serialized. Used by windows forms designer.
+            </summary>
+            <returns>True if property should be serialized otherwise false.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.ColorScheme.ShouldSerializeBarPopupBackground">
+            <summary>
+            Gets whether property should be serialized. Used by windows forms designer.
+            </summary>
+            <returns>True if property should be serialized otherwise false.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.ColorScheme.ShouldSerializeBarPopupBorder">
+            <summary>
+            Gets whether property should be serialized. Used by windows forms designer.
+            </summary>
+            <returns>True if property should be serialized otherwise false.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.ColorScheme.ShouldSerializeBarDockedBorder">
+            <summary>
+            Gets whether property should be serialized. Used by windows forms designer.
+            </summary>
+            <returns>True if property should be serialized otherwise false.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.ColorScheme.ShouldSerializeBarStripeColor">
+            <summary>
+            Gets whether property should be serialized. Used by windows forms designer.
+            </summary>
+            <returns>True if property should be serialized otherwise false.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.ColorScheme.ShouldSerializeBarFloatingBorder">
+            <summary>
+            Gets whether property should be serialized. Used by windows forms designer.
+            </summary>
+            <returns>True if property should be serialized otherwise false.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.ColorScheme.ShouldSerializeItemBackground">
+            <summary>
+            Gets whether property should be serialized. Used by windows forms designer.
+            </summary>
+            <returns>True if property should be serialized otherwise false.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.ColorScheme.ShouldSerializeItemBackground2">
+            <summary>
+            Gets whether property should be serialized. Used by windows forms designer.
+            </summary>
+            <returns>True if property should be serialized otherwise false.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.ColorScheme.ShouldSerializeItemText">
+            <summary>
+            Gets whether property should be serialized. Used by windows forms designer.
+            </summary>
+            <returns>True if property should be serialized otherwise false.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.ColorScheme.ShouldSerializeItemDisabledBackground">
+            <summary>
+            Gets whether property should be serialized. Used by windows forms designer.
+            </summary>
+            <returns>True if property should be serialized otherwise false.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.ColorScheme.ShouldSerializeItemDisabledText">
+            <summary>
+            Gets whether property should be serialized. Used by windows forms designer.
+            </summary>
+            <returns>True if property should be serialized otherwise false.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.ColorScheme.ShouldSerializeItemHotBackground">
+            <summary>
+            Gets whether property should be serialized. Used by windows forms designer.
+            </summary>
+            <returns>True if property should be serialized otherwise false.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.ColorScheme.ShouldSerializeItemHotBackground2">
+            <summary>
+            Gets whether property should be serialized. Used by windows forms designer.
+            </summary>
+            <returns>True if property should be serialized otherwise false.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.ColorScheme.ShouldSerializeItemHotText">
+            <summary>
+            Gets whether property should be serialized. Used by windows forms designer.
+            </summary>
+            <returns>True if property should be serialized otherwise false.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.ColorScheme.ShouldSerializeItemHotBorder">
+            <summary>
+            Gets whether property should be serialized. Used by windows forms designer.
+            </summary>
+            <returns>True if property should be serialized otherwise false.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.ColorScheme.ShouldSerializeItemPressedBackground">
+            <summary>
+            Gets whether property should be serialized. Used by windows forms designer.
+            </summary>
+            <returns>True if property should be serialized otherwise false.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.ColorScheme.ShouldSerializeItemPressedBackground2">
+            <summary>
+            Gets whether property should be serialized. Used by windows forms designer.
+            </summary>
+            <returns>True if property should be serialized otherwise false.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.ColorScheme.ShouldSerializeItemPressedText">
+            <summary>
+            Gets whether property should be serialized. Used by windows forms designer.
+            </summary>
+            <returns>True if property should be serialized otherwise false.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.ColorScheme.ShouldSerializeItemPressedBorder">
+            <summary>
+            Gets whether property should be serialized. Used by windows forms designer.
+            </summary>
+            <returns>True if property should be serialized otherwise false.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.ColorScheme.ShouldSerializeItemSeparator">
+            <summary>
+            Gets whether property should be serialized. Used by windows forms designer.
+            </summary>
+            <returns>True if property should be serialized otherwise false.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.ColorScheme.ShouldSerializeItemSeparatorShade">
+            <summary>
+            Gets whether property should be serialized. Used by windows forms designer.
+            </summary>
+            <returns>True if property should be serialized otherwise false.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.ColorScheme.ShouldSerializeItemExpandedShadow">
+            <summary>
+            Gets whether property should be serialized. Used by windows forms designer.
+            </summary>
+            <returns>True if property should be serialized otherwise false.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.ColorScheme.ShouldSerializeItemExpandedBackground">
+            <summary>
+            Gets whether property should be serialized. Used by windows forms designer.
+            </summary>
+            <returns>True if property should be serialized otherwise false.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.ColorScheme.ShouldSerializeItemExpandedBackground2">
+            <summary>
+            Gets whether property should be serialized. Used by windows forms designer.
+            </summary>
+            <returns>True if property should be serialized otherwise false.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.ColorScheme.ShouldSerializeItemExpandedText">
+            <summary>
+            Gets whether property should be serialized. Used by windows forms designer.
+            </summary>
+            <returns>True if property should be serialized otherwise false.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.ColorScheme.ShouldSerializeItemExpandedBorder">
+            <summary>
+            Gets whether property should be serialized. Used by windows forms designer.
+            </summary>
+            <returns>True if property should be serialized otherwise false.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.ColorScheme.ShouldSerializeItemCheckedBackground">
+            <summary>
+            Gets whether property should be serialized. Used by windows forms designer.
+            </summary>
+            <returns>True if property should be serialized otherwise false.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.ColorScheme.ShouldSerializeItemCheckedBackground2">
+            <summary>
+            Gets whether property should be serialized. Used by windows forms designer.
+            </summary>
+            <returns>True if property should be serialized otherwise false.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.ColorScheme.ShouldSerializeItemCheckedBorder">
+            <summary>
+            Gets whether property should be serialized. Used by windows forms designer.
+            </summary>
+            <returns>True if property should be serialized otherwise false.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.ColorScheme.ShouldSerializeItemCheckedText">
+            <summary>
+            Gets whether property should be serialized. Used by windows forms designer.
+            </summary>
+            <returns>True if property should be serialized otherwise false.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.ColorScheme.ShouldSerializeCustomizeBackground">
+            <summary>
+            Gets whether property should be serialized. Used by windows forms designer.
+            </summary>
+            <returns>True if property should be serialized otherwise false.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.ColorScheme.ShouldSerializeCustomizeBackground2">
+            <summary>
+            Gets whether property should be serialized. Used by windows forms designer.
+            </summary>
+            <returns>True if property should be serialized otherwise false.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.ColorScheme.ShouldSerializeCustomizeText">
+            <summary>
+            Gets whether property should be serialized. Used by windows forms designer.
+            </summary>
+            <returns>True if property should be serialized otherwise false.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.ColorScheme.ShouldSerializeMenuBorder">
+            <summary>
+            Gets whether property should be serialized. Used by windows forms designer.
+            </summary>
+            <returns>True if property should be serialized otherwise false.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.ColorScheme.ShouldSerializeMenuBackground">
+            <summary>
+            Gets whether property should be serialized. Used by windows forms designer.
+            </summary>
+            <returns>True if property should be serialized otherwise false.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.ColorScheme.ShouldSerializeMenuBackground2">
+            <summary>
+            Gets whether property should be serialized. Used by windows forms designer.
+            </summary>
+            <returns>True if property should be serialized otherwise false.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.ColorScheme.ShouldSerializeMenuSide">
+            <summary>
+            Gets whether property should be serialized. Used by windows forms designer.
+            </summary>
+            <returns>True if property should be serialized otherwise false.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.ColorScheme.ShouldSerializeMenuSide2">
+            <summary>
+            Gets whether property should be serialized. Used by windows forms designer.
+            </summary>
+            <returns>True if property should be serialized otherwise false.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.ColorScheme.ShouldSerializeMenuUnusedBackground">
+            <summary>
+            Gets whether property should be serialized. Used by windows forms designer.
+            </summary>
+            <returns>True if property should be serialized otherwise false.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.ColorScheme.ShouldSerializeMenuUnusedSide">
+            <summary>
+            Gets whether property should be serialized. Used by windows forms designer.
+            </summary>
+            <returns>True if property should be serialized otherwise false.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.ColorScheme.ShouldSerializeMenuUnusedSide2">
+            <summary>
+            Gets whether property should be serialized. Used by windows forms designer.
+            </summary>
+            <returns>True if property should be serialized otherwise false.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.ColorScheme.ShouldSerializeItemDesignTimeBorder">
+            <summary>
+            Gets whether property should be serialized. Used by windows forms designer.
+            </summary>
+            <returns>True if property should be serialized otherwise false.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.ColorScheme.ShouldSerializePanelBackground">
+            <summary>
+            Gets whether property should be serialized. Used by windows forms designer.
+            </summary>
+            <returns>True if property should be serialized otherwise false.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.ColorScheme.ShouldSerializePanelBackground2">
+            <summary>
+            Gets whether property should be serialized. Used by windows forms designer.
+            </summary>
+            <returns>True if property should be serialized otherwise false.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.ColorScheme.ShouldSerializePanelBorder">
+            <summary>
+            Gets whether property should be serialized. Used by windows forms designer.
+            </summary>
+            <returns>True if property should be serialized otherwise false.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.ColorScheme.ShouldSerializePanelText">
+            <summary>
+            Gets whether property should be serialized. Used by windows forms designer.
+            </summary>
+            <returns>True if property should be serialized otherwise false.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.ColorScheme.ShouldSerializeExplorerBarBackground">
+            <summary>
+            Gets whether property should be serialized. Used by windows forms designer.
+            </summary>
+            <returns>True if property should be serialized otherwise false.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.ColorScheme.ShouldSerializeExplorerBarBackground2">
+            <summary>
+            Gets whether property should be serialized. Used by windows forms designer.
+            </summary>
+            <returns>True if property should be serialized otherwise false.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.ColorScheme.Refresh">
+            <summary>
+            Refreshes all automatically generated colors.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.ColorScheme.ResetChangedFlag">
+            <summary>
+            Resets all changed flags.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.ColorScheme.Refresh(System.Drawing.Graphics,System.Boolean)">
+            <summary>
+            Refreshes all automatically generated colors.
+            </summary>
+            <param name="graphics">Reference to graphics object.</param>
+            <param name="bSystemColorEvent">Indicates whether refresh is caused by system event.</param>
+        </member>
+        <member name="M:DevComponents.Tree.ColorScheme.SchemeXpBlueVS2005">
+            <summary>
+            VS.NET 2005 Blue Color Scheme
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.ColorScheme.GetColor(System.Int32)">
+            <summary>
+            Converts hex string to Color type.
+            </summary>
+            <param name="rgb">Color representation as 32-bit RGB value.</param>
+            <returns>Reference to Color object.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.ColorScheme.Serialize(System.Xml.XmlElement)">
+            <summary>
+            Serializes the color scheme object.
+            </summary>
+            <param name="xmlElem">XmlElement to serialize the object to.</param>
+        </member>
+        <member name="M:DevComponents.Tree.ColorScheme.Deserialize(System.Xml.XmlElement)">
+            <summary>
+            Deserializes color scheme object from XmlElement.
+            </summary>
+            <param name="xmlElem">Element to deserialize color scheme from.</param>
+        </member>
+        <member name="P:DevComponents.Tree.ColorScheme.MenuBarBackground">
+            <summary>
+            Specifies the menu bar background color.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ColorScheme.MenuBarBackground2">
+            <summary>
+            Specifies the target menu bar gradient background color.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ColorScheme.MenuBarBackgroundGradientAngle">
+            <summary>
+            Specifies the gradient angle.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ColorScheme.BarBackground">
+            <summary>
+            Specifies the background color for the bar when floating or when docked.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ColorScheme.BarBackground2">
+            <summary>
+            Specifies the target gradient background color for the bar when floating or when docked.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ColorScheme.BarBackgroundGradientAngle">
+            <summary>
+            Specifies the gradient angle.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ColorScheme.BarCaptionBackground">
+            <summary>
+            Specifies the background color for the bar Caption.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ColorScheme.BarCaptionBackground2">
+            <summary>
+            Specifies the target gradient background color for the bar Caption.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ColorScheme.BarCaptionBackgroundGradientAngle">
+            <summary>
+            Specifies the gradient angle.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ColorScheme.BarCaptionText">
+            <summary>
+            Specifies the color for text of the Caption.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ColorScheme.BarCaptionInactiveBackground">
+            <summary>
+            Specifies the Bar Caption inactive (lost focus) background color.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ColorScheme.BarCaptionInactiveBackground2">
+            <summary>
+            Specifies the target background gradient Bar Caption inactive (lost focus) color.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ColorScheme.BarCaptionInactiveBackgroundGAngle">
+            <summary>
+            Specifies the gradient angle.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ColorScheme.BarCaptionInactiveText">
+            <summary>
+            Specifies the Bar inactive (lost focus) text color.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ColorScheme.BarPopupBackground">
+            <summary>
+            Specifies the background color for popup bars.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ColorScheme.BarPopupBorder">
+            <summary>
+            Specifies the border color for popup bars.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ColorScheme.BarDockedBorder">
+            <summary>
+            Specifies the border color for docked bars.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ColorScheme.BarStripeColor">
+            <summary>
+            Specifies the color of the grab handle stripes.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ColorScheme.BarFloatingBorder">
+            <summary>
+             Specifies the border color for floating bars.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ColorScheme.ItemBackground">
+            <summary>
+            Specifies the item background color.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ColorScheme.ItemBackground2">
+            <summary>
+            Specifies the target item background gradient color.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ColorScheme.ItemBackgroundGradientAngle">
+            <summary>
+            Specifies the gradient angle.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ColorScheme.ItemText">
+            <summary>
+            Specifies the item text color.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ColorScheme.ItemDisabledBackground">
+            <summary>
+            Specifies the background color for the item that is disabled.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ColorScheme.ItemDisabledText">
+            <summary>
+            Specifies the text color for the item that is disabled.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ColorScheme.ItemHotBackground">
+            <summary>
+            Specifies the background color when mouse is over the item.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ColorScheme.ItemHotBackground2">
+            <summary>
+            Specifies the target gradient background color when mouse is over the item.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ColorScheme.ItemHotBackgroundGradientAngle">
+            <summary>
+            Specifies the gradient angle.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ColorScheme.ItemHotText">
+            <summary>
+            Specifies the text color when mouse is over the item.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ColorScheme.ItemHotBorder">
+            <summary>
+            Specifies the border color when mouse is over the item.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ColorScheme.ItemPressedBackground">
+            <summary>
+            Specifies the background color when item is pressed.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ColorScheme.ItemPressedBackground2">
+            <summary>
+            Specifies the target gradient background color when item is pressed.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ColorScheme.ItemPressedBackgroundGradientAngle">
+            <summary>
+            Specifies the gradient angle.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ColorScheme.ItemPressedText">
+            <summary>
+            Specifies the text color when item is pressed.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ColorScheme.ItemPressedBorder">
+            <summary>
+            Specifies the border color when item is pressed.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ColorScheme.ItemSeparator">
+            <summary>
+            Specifies the color for the item group separator.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ColorScheme.ItemSeparatorShade">
+            <summary>
+            Specifies the color for the item group separator shade.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ColorScheme.ItemExpandedShadow">
+            <summary>
+            Specifies the background color for the shadow of expanded item.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ColorScheme.ItemExpandedBackground">
+            <summary>
+            Specifies the background color for the expanded item.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ColorScheme.ItemExpandedBackground2">
+            <summary>
+            Specifies the target gradient background color for the expanded item.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ColorScheme.ItemExpandedBackgroundGradientAngle">
+            <summary>
+            Specifies the gradient angle.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ColorScheme.ItemExpandedText">
+            <summary>
+            Specifies the text color for the expanded item.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ColorScheme.ItemExpandedBorder">
+            <summary>
+            Specifies the border color for the expanded item.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ColorScheme.ItemCheckedBackground">
+            <summary>
+            Specifies the background color for the checked item.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ColorScheme.ItemCheckedBackground2">
+            <summary>
+            Specifies the target gradient background color for the checked item.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ColorScheme.ItemCheckedBackgroundGradientAngle">
+            <summary>
+            Specifies the gradient angle.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ColorScheme.ItemCheckedBorder">
+            <summary>
+            Specifies the border color for the checked item.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ColorScheme.ItemCheckedText">
+            <summary>
+            Specifies the text color for the checked item.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ColorScheme.CustomizeBackground">
+            <summary>
+            Specifies the customize item background color. Applies to Office2003 style only.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ColorScheme.CustomizeBackground2">
+            <summary>
+            Specifies the customize item target gradient background color. Applies to Office2003 style only.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ColorScheme.CustomizeBackgroundGradientAngle">
+            <summary>
+            Specifies the customize item background color gradient angle. Applies to Office2003 style only.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ColorScheme.CustomizeText">
+            <summary>
+            Specifies the customize item text color. Applies to Office2003 style only.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ColorScheme.MenuBorder">
+            <summary>
+            Specifies the color of the menu border.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ColorScheme.MenuBackground">
+            <summary>
+            Specifies the background color of the menu.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ColorScheme.MenuBackground2">
+            <summary>
+            Specifies the target gradient background color of the menu.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ColorScheme.MenuBackgroundGradientAngle">
+            <summary>
+            Specifies the angle of the gradient fill for the menu background.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ColorScheme.MenuSide">
+            <summary>
+            Specifies the background color of the menu part (left side)  that is showing the images.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ColorScheme.MenuSide2">
+            <summary>
+            Specifies the target gradient background color of the menu part (left side)  that is showing the images.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ColorScheme.MenuSideGradientAngle">
+            <summary>
+            Specifies the angle of the gradient fill for the menu part (left side) that is showing the images.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ColorScheme.MenuUnusedBackground">
+            <summary>
+            Specifies the background color for the items that were not recently used.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ColorScheme.MenuUnusedSide">
+            <summary>
+            Specifies the side bar color for the items that were not recently used.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ColorScheme.MenuUnusedSide2">
+            <summary>
+            Specifies the target gradient side bar color for the items that were not recently used.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ColorScheme.MenuUnusedSideGradientAngle">
+            <summary>
+            Specifies the angle of the gradient fill for the menu part (left side) that is showing the images.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ColorScheme.ItemDesignTimeBorder">
+            <summary>
+            Specifies the border color for focused design-time item.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ColorScheme.PredefinedColorScheme">
+            <summary>
+            Gets or sets predefined color scheme. By default DotNetBar will automatically change and generate color scheme depending on system colors.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ColorScheme.PanelBackground">
+            <summary>
+            Specifies the background color of the panel.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ColorScheme.PanelBackground2">
+            <summary>
+            Specifies the target background gradient color of the panel.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ColorScheme.PanelBackgroundGradientAngle">
+            <summary>
+            Specifies the angle of the gradient fill for the panel background.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ColorScheme.PanelBorder">
+            <summary>
+            Specifies border color of the panel.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ColorScheme.PanelText">
+            <summary>
+            Specifies color of the text on the panel.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ColorScheme.ExplorerBarBackground">
+            <summary>
+            Specifies the background color of the explorer bar.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ColorScheme.ExplorerBarBackground2">
+            <summary>
+            Specifies the target gradient background color of the explorer bar.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ColorScheme.ExplorerBarBackgroundGradientAngle">
+            <summary>
+            Specifies the angle of the gradient fill for the explorer bar background.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ColorScheme.SchemeChanged">
+            <summary>
+            Gets whether color scheme object has been changed.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.ePredefinedColorScheme">
+            <summary>
+            Specifies the type of predefined color scheme in ColorScheme object.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.ePredefinedColorScheme.AutoGenerated">
+            <summary>
+            Default value. DotNetBar will automatically change and generate color scheme depending on system colors.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.ePredefinedColorScheme.Blue2003">
+            <summary>
+            Blue Office 2003 Color Scheme. This setting specifies that this color scheme will be used regardless of system color setting on user machine.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.ePredefinedColorScheme.OliveGreen2003">
+            <summary>
+            Olive Green Office 2003 Color Scheme. This setting specifies that this color scheme will be used regardless of system color setting on user machine.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.ePredefinedColorScheme.Silver2003">
+            <summary>
+            Silver Office 2003 Color Scheme. This setting specifies that this color scheme will be used regardless of system color setting on user machine.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.eColorSchemePart">
+            <summary>
+                Specifies a color scheme member.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eColorSchemePart.BarBackground">
+            <summary>
+            Specifies bar background color.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eColorSchemePart.BarBackground2">
+            <summary>
+            Specifies bar target gradient background color.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eColorSchemePart.BarCaptionBackground">
+            <summary>
+            Specifies color of bar caption.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eColorSchemePart.BarCaptionInactiveBackground">
+            <summary>
+            Specifies  color of inactive bar caption.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eColorSchemePart.BarCaptionInactiveText">
+            <summary>
+            Specifies inactive caption text color.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eColorSchemePart.BarCaptionText">
+            <summary>
+            Specifies caption text color.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eColorSchemePart.BarDockedBorder">
+            <summary>
+            Specifies color of docked bar border.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eColorSchemePart.BarFloatingBorder">
+            <summary>
+            Specifies color of floating bar border.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eColorSchemePart.BarPopupBackground">
+            <summary>
+            Specifies color of popup bar background. 
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eColorSchemePart.BarPopupBorder">
+            <summary>
+            Specifies color of popup bar border. 
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eColorSchemePart.BarStripeColor">
+            <summary>
+            Specifies bar strips color.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eColorSchemePart.CustomizeBackground">
+            <summary>
+            Specifies customize item background.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eColorSchemePart.CustomizeBackground2">
+            <summary>
+            Specifies target gradient color for customize item background.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eColorSchemePart.CustomizeText">
+            <summary>
+            Specifies text color of customize item.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eColorSchemePart.ItemBackground">
+            <summary>
+            Specifies background color of item.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eColorSchemePart.ItemCheckedBackground">
+            <summary>
+            Specifies background color of checked item.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eColorSchemePart.ItemCheckedBackground2">
+            <summary>
+            Specifies target gradient background color of checked item.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eColorSchemePart.ItemCheckedBorder">
+            <summary>
+            Specifies color if checked item border.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eColorSchemePart.ItemCheckedText">
+            <summary>
+            Specifies text color of checked item.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eColorSchemePart.ItemDesignTimeBorder">
+            <summary>
+            Specifies color of item design time border.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eColorSchemePart.ItemDisabledBackground">
+            <summary>
+            Specifies disabled item background color.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eColorSchemePart.ItemDisabledText">
+            <summary>
+            Specifies text color of disabled item.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eColorSchemePart.ItemExpandedBackground">
+            <summary>
+            Specifies background color of expanded item.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eColorSchemePart.ItemExpandedBackground2">
+            <summary>
+            Specifies target gradient background color of expanded item.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eColorSchemePart.ItemExpandedShadow">
+            <summary>
+            Specifies color of expanded item shadow.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eColorSchemePart.ItemExpandedText">
+            <summary>
+            Specifies color of expanded item text.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eColorSchemePart.ItemHotBackground">
+            <summary>
+            Specifies background color of hot item. 
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eColorSchemePart.ItemHotBackground2">
+            <summary>
+            Specifies target background gradient color of hot item.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eColorSchemePart.ItemHotBorder">
+            <summary>
+            Specifies color of hot item border.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eColorSchemePart.ItemHotText">
+            <summary>
+            Specifies text color of hot item.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eColorSchemePart.ItemPressedBackground">
+            <summary>
+            Specifies pressed item background color.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eColorSchemePart.ItemPressedBackground2">
+            <summary>
+            Specifies target background color of pressed item. 
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eColorSchemePart.ItemPressedBorder">
+            <summary>
+            Specifies color of pressed item border.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eColorSchemePart.ItemPressedText">
+            <summary>
+            Specifies color of pressed item text.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eColorSchemePart.ItemSeparator">
+            <summary>
+            Specifies color of item separator.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eColorSchemePart.ItemSeparatorShade">
+            <summary>
+            Specifies color of item separator shade.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eColorSchemePart.ItemText">
+            <summary>
+            Specifies color of item text.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eColorSchemePart.MenuBackground">
+            <summary>
+            Specifies menu background color.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eColorSchemePart.MenuBackground2">
+            <summary>
+            Specifies target background color of menu.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eColorSchemePart.MenuBarBackground">
+            <summary>
+            Specifies menu bar background color.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eColorSchemePart.MenuBarBackground2">
+            <summary>
+            Specifies target gradient background color of menu bar.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eColorSchemePart.MenuBorder">
+            <summary>
+            Specifies color of menu border.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eColorSchemePart.MenuSide">
+            <summary>
+            Specifies color of menu side.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eColorSchemePart.MenuSide2">
+            <summary>
+            Specifies target gradient background color of menu side.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eColorSchemePart.MenuUnusedBackground">
+            <summary>
+            Specifies background color of unused menu portion.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eColorSchemePart.MenuUnusedSide">
+            <summary>
+            Specifies unused menu side color.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eColorSchemePart.MenuUnusedSide2">
+            <summary>
+            Specifies target background color of unused menu side.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eColorSchemePart.PanelBackground">
+            <summary>
+            Specifies background color of panel.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eColorSchemePart.PanelBackground2">
+            <summary>
+            Specifies target gradient background color of panel.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eColorSchemePart.PanelBorder">
+            <summary>
+            Specifies color of panel border.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eColorSchemePart.PanelText">
+            <summary>
+            Specifies color of panel text.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eColorSchemePart.ExplorerBarBackground">
+            <summary>
+            Specifies explorer bar background color.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eColorSchemePart.ExplorerBarBackground2">
+            <summary>
+            Specifies explorer bar target background gradient color.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eColorSchemePart.None">
+            <summary>
+            Specifies that color scheme color is not used.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.ColorTypeEditor">
+            <summary>
+            Represents Color type editor with support for color schemes.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.ColorTypeEditor.EditValue(System.ComponentModel.ITypeDescriptorContext,System.IServiceProvider,System.Object)">
+            <summary>
+            Edits the value of the specified object using the editor style indicated by GetEditStyle.
+            </summary>
+            <param name="context">An ITypeDescriptorContext that can be used to gain additional context information.</param>
+            <param name="provider">An IServiceProvider that this editor can use to obtain services.</param>
+            <param name="value">The object to edit.</param>
+            <returns>The new value of the object.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.ColorTypeEditor.GetEditStyle(System.ComponentModel.ITypeDescriptorContext)">
+            <summary>
+            Gets the editor style used by the EditValue method.
+            </summary>
+            <param name="context">An ITypeDescriptorContext that can be used to gain additional context information.</param>
+            <returns>A UITypeEditorEditStyle value that indicates the style of editor used by EditValue. If the UITypeEditor does not support this method, then GetEditStyle will return None.
+            </returns>
+        </member>
+        <member name="T:DevComponents.Tree.ColumnHeader">
+            <summary>Represents the node or tree ColumnHeader.</summary>
+        </member>
+        <member name="M:DevComponents.Tree.ColumnHeader.#ctor">
+            <summary>
+            Creates new instance of the object.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.ColumnHeader.#ctor(System.String)">
+            <summary>
+            Creates new instance of the object and initalizes it with text.
+            </summary>
+            <param name="text">Text to initalize object with.</param>
+        </member>
+        <member name="M:DevComponents.Tree.ColumnHeader.Copy">
+            <summary>
+            Makes a copy of ColumnHeader object.
+            </summary>
+            <returns>Returns new instance of column header object.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.ColumnHeader.SetBounds(System.Drawing.Rectangle)">
+            <summary>
+            Sets the column bounds.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ColumnHeader.Name">
+            <summary>
+            Returns name of the column header that can be used to identify it from the code.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ColumnHeader.Bounds">
+            <summary>
+            Returns rectangle that this column occupies. If the layout has not been performed on the column the return value will be Rectangle.Empty.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ColumnHeader.Width">
+            <summary>
+            Gets the reference to the object that represents width of the column as either
+            absolute or relative value.
+            </summary>
+            <remarks>
+            Set Width using Absolute or Relative properties of ColumnWidth object.
+            </remarks>
+            <seealso cref="P:DevComponents.Tree.ColumnWidth.Absolute">Absolute Property (DevComponents.Tree.ColumnWidth)</seealso>
+            <seealso cref="P:DevComponents.Tree.ColumnWidth.Relative">Relative Property (DevComponents.Tree.ColumnWidth)</seealso>
+        </member>
+        <member name="P:DevComponents.Tree.ColumnHeader.StyleNormal">
+            <summary>
+            Gets or sets the style class assigned to the column. Empty value indicates that
+            default style is used as specified on cell's parent's control.
+            </summary>
+            <value>
+            Name of the style assigned to the cell or an empty string indicating that default
+            style setting from tree control is applied. Default is empty string.
+            </value>
+            <remarks>
+            When property is set to an empty string the style setting from parent tree
+            controls is used. ColumnStyleNormal on TreeGX control is a root style for a cell.
+            </remarks>
+            <seealso cref="P:DevComponents.Tree.ColumnHeader.StyleMouseDown">StyleMouseDown Property</seealso>
+            <seealso cref="P:DevComponents.Tree.ColumnHeader.StyleMouseOver">StyleMouseOver Property</seealso>
+        </member>
+        <member name="P:DevComponents.Tree.ColumnHeader.StyleMouseDown">
+            <summary>
+            Gets or sets the style class assigned to the column which is applied when mouse
+            button is pressed over the header. Empty value indicates that default
+            style is used as specified on column's parent.
+            </summary>
+            <value>
+            Name of the style assigned to the column or an empty string indicating that default
+            style setting from tree control is applied. Default is empty string.
+            </value>
+            <remarks>
+            When property is set to an empty string the style setting from parent tree
+            controls is used. ColumnStyleMouseDown on TreeGX control is a root style for a
+            cell.
+            </remarks>
+            <seealso cref="P:DevComponents.Tree.ColumnHeader.StyleNormal">StyleNormal Property</seealso>
+            <seealso cref="P:DevComponents.Tree.ColumnHeader.StyleMouseOver">StyleMouseOver Property</seealso>
+        </member>
+        <member name="P:DevComponents.Tree.ColumnHeader.StyleMouseOver">
+            <summary>
+            Gets or sets the style class assigned to the column which is applied when mouse is
+            over the column. Empty value indicates that default style is used as specified on column's
+            parent control.
+            </summary>
+            <value>
+            Name of the style assigned to the column or an empty string indicating that default
+            style setting from tree control is applied. Default is empty string.
+            </value>
+            <remarks>
+            When property is set to an empty string the style setting from parent tree
+            controls is used. ColumnStyleMouseOver on TreeGX control is a root style for a
+            cell.
+            </remarks>
+            <seealso cref="P:DevComponents.Tree.ColumnHeader.StyleNormal">StyleNormal Property</seealso>
+            <seealso cref="P:DevComponents.Tree.ColumnHeader.StyleMouseDown">StyleMouseDown Property</seealso>
+        </member>
+        <member name="P:DevComponents.Tree.ColumnHeader.ColumnName">
+            <summary>
+            Gets or sets the name of the column in the ColumnHeaderCollection.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ColumnHeader.Text">
+            <summary>
+            Gets or sets the column caption.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ColumnHeader.Visible">
+            <summary>
+            Gets or sets whether column is visible. Hidding the header column will also hide coresponding data column.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ColumnHeader.SizeChanged">
+            <summary>
+            Gets or sets whether column size has changed and it's layout needs to be recalculated.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.ColumnHeaderCollection">
+            <summary>
+            Represents collection for ColumnHeader objects.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.ColumnHeaderCollection.#ctor">
+            <summary>
+            Default constructor.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.ColumnHeaderCollection.SetParentNode(DevComponents.Tree.Node)">
+            <summary>
+            Sets the node collection belongs to.
+            </summary>
+            <param name="parent">ColumnHeader that is parent of this collection.</param>
+        </member>
+        <member name="M:DevComponents.Tree.ColumnHeaderCollection.Add(DevComponents.Tree.ColumnHeader)">
+            <summary>
+            Adds new object to the collection.
+            </summary>
+            <param name="ch">Object to add.</param>
+            <returns>Index of newly added object.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.ColumnHeaderCollection.Insert(System.Int32,DevComponents.Tree.ColumnHeader)">
+            <summary>
+            Inserts new object into the collection.
+            </summary>
+            <param name="index">Position of the object.</param>
+            <param name="value">Object to insert.</param>
+        </member>
+        <member name="M:DevComponents.Tree.ColumnHeaderCollection.IndexOf(DevComponents.Tree.ColumnHeader)">
+            <summary>
+            Returns index of the object inside of the collection.
+            </summary>
+            <param name="value">Reference to the object.</param>
+            <returns>Index of the object.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.ColumnHeaderCollection.Contains(DevComponents.Tree.ColumnHeader)">
+            <summary>
+            Returns whether collection contains specified object.
+            </summary>
+            <param name="value">Object to look for.</param>
+            <returns>true if object is part of the collection, otherwise false.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.ColumnHeaderCollection.Remove(DevComponents.Tree.ColumnHeader)">
+            <summary>
+            Removes specified object from the collection.
+            </summary>
+            <param name="value"></param>
+        </member>
+        <member name="M:DevComponents.Tree.ColumnHeaderCollection.CopyTo(DevComponents.Tree.ColumnHeader[],System.Int32)">
+            <summary>
+            Copies collection into the specified array.
+            </summary>
+            <param name="array">Array to copy collection to.</param>
+            <param name="index">Starting index.</param>
+        </member>
+        <member name="M:DevComponents.Tree.ColumnHeaderCollection.CopyTo(DevComponents.Tree.ColumnHeader[])">
+            <summary>
+            Copies contained items to the ColumnHeader array.
+            </summary>
+            <param name="array">Array to copy to.</param>
+        </member>
+        <member name="P:DevComponents.Tree.ColumnHeaderCollection.ParentNode">
+            <summary>
+            Gets or sets the node this collection is associated with.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ColumnHeaderCollection.Item(System.Int32)">
+            <summary>
+            Returns reference to the object in collection based on it's index.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.ColumnHeaderCollectionEditor">
+            <summary>
+            Support for ColumnHeader tabs design-time editor.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.ColumnHeaderCollectionEditor.#ctor(System.Type)">
+            <summary>Creates new instance of the class</summary>
+            <param name="type">Type to initialize editor with.</param>
+        </member>
+        <member name="T:DevComponents.Tree.ColumnWidth">
+            <summary>
+            Represents the width of the Column. Supports absolute width in Pixels and
+            relative width as percentage of the width of parent control.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.ColumnWidth.#ctor">
+            <summary>
+            Creates new instance of the object.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ColumnWidth.Relative">
+            <summary>
+            Gets or sets relative width expressed as percentage between 1-100. 0 indicates that
+            absolute width will be used.
+            </summary>
+            <remarks>
+            Relative width is expressed as percentage between 1-100 of the parent controls
+            width. 0 indicates that absolute width will be used. Absolute width always takes
+            priority over relative width. For example value of 30 assigned to this property
+            indicates that width of the column will be 30% of the total client width of the
+            control.
+            </remarks>
+        </member>
+        <member name="P:DevComponents.Tree.ColumnWidth.Absolute">
+            <summary>Gets or sets the absolute width of the column in pixels.</summary>
+            <remarks>
+            Absolute width always takes precedence over the relative width of the
+            column.
+            </remarks>
+        </member>
+        <member name="T:DevComponents.Tree.CommandButtonEventArgs">
+            <summary>
+            Provides event arguments for command button events.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.CommandButtonEventArgs.#ctor(DevComponents.Tree.eTreeAction,DevComponents.Tree.Node)">
+            <summary>
+            Default constructor.
+            </summary>
+            <param name="action">Action type.</param>
+            <param name="node">Context node.</param>
+        </member>
+        <member name="F:DevComponents.Tree.CommandButtonEventArgs.Action">
+            <summary>
+            Indicates the action type that caused the event.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.CommandButtonEventArgs.Node">
+            <summary>
+            Indicates the node action is peformed on.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.ConnectorPointsCollection">
+            <summary>
+            Represents collection of connector points for a node.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.ConnectorPointsCollection.#ctor">
+            <summary>
+            Default constructor.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.ConnectorPointsCollection.SetParentNode(DevComponents.Tree.Node)">
+            <summary>
+            Sets the node collection belongs to.
+            </summary>
+            <param name="parent">Node that is parent of this collection.</param>
+        </member>
+        <member name="M:DevComponents.Tree.ConnectorPointsCollection.Add(System.Drawing.Point)">
+            <summary>
+            Adds new object to the collection.
+            </summary>
+            <param name="p">Object to add.</param>
+            <returns>Index of newly added object.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.ConnectorPointsCollection.AddRange(System.Drawing.Point[])">
+            <summary>
+            Adds range of objects to the array.
+            </summary>
+            <param name="ap">Array to add.</param>
+        </member>
+        <member name="M:DevComponents.Tree.ConnectorPointsCollection.ToArray">
+            <summary>
+            Copies objects of the collection to the array.
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:DevComponents.Tree.ConnectorPointsCollection.Insert(System.Int32,System.Drawing.Point)">
+            <summary>
+            Inserts new object into the collection.
+            </summary>
+            <param name="index">Position of the object.</param>
+            <param name="value">Object to insert.</param>
+        </member>
+        <member name="M:DevComponents.Tree.ConnectorPointsCollection.IndexOf(System.Drawing.Point)">
+            <summary>
+            Returns index of the object inside of the collection.
+            </summary>
+            <param name="value">Reference to the object.</param>
+            <returns>Index of the object.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.ConnectorPointsCollection.Contains(System.Drawing.Point)">
+            <summary>
+            Returns whether collection contains specified object.
+            </summary>
+            <param name="value">Object to look for.</param>
+            <returns>true if object is part of the collection, otherwise false.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.ConnectorPointsCollection.Remove(System.Drawing.Point)">
+            <summary>
+            Removes specified object from the collection.
+            </summary>
+            <param name="value"></param>
+        </member>
+        <member name="M:DevComponents.Tree.ConnectorPointsCollection.CopyTo(System.Drawing.Point[],System.Int32)">
+            <summary>
+            Copies collection into the specified array.
+            </summary>
+            <param name="array">Array to copy collection to.</param>
+            <param name="index">Starting index.</param>
+        </member>
+        <member name="M:DevComponents.Tree.ConnectorPointsCollection.CopyTo(System.Drawing.Point[])">
+            <summary>
+            Copies contained items to the ColumnHeader array.
+            </summary>
+            <param name="array">Array to copy to.</param>
+        </member>
+        <member name="P:DevComponents.Tree.ConnectorPointsCollection.ParentNode">
+            <summary>
+            Gets or sets the node this collection is associated with.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ConnectorPointsCollection.Item(System.Int32)">
+            <summary>
+            Returns reference to the object in collection based on it's index.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.TextMarkup.BlockLayoutManager">
+            <summary>
+            Represents block layout manager responsible for sizing the content blocks.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.TextMarkup.BlockLayoutManager.Layout(DevComponents.Tree.TextMarkup.IBlock,System.Drawing.Size)">
+            <summary>
+            Resizes the content block and sets it's Bounds property to reflect new size.
+            </summary>
+            <param name="block">Content block to resize.</param>
+            <param name="availableSize">Content size available for the block in the given line.</param>
+        </member>
+        <member name="M:DevComponents.Tree.TextMarkup.BlockLayoutManager.FinalizeLayout(System.Drawing.Rectangle,System.Drawing.Rectangle,System.Collections.ArrayList)">
+            <summary>
+            Performs layout finalization
+            </summary>
+            <param name="containerBounds"></param>
+            <param name="blocksBounds"></param>
+            <param name="lines"></param>
+            <returns></returns>
+        </member>
+        <member name="P:DevComponents.Tree.TextMarkup.BlockLayoutManager.Graphics">
+            <summary>
+            Gets or sets the graphics object used by layout manager.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.TextMarkup.eContentOrientation">
+            <summary>
+            Specifies orientation of content.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.TextMarkup.eContentOrientation.Horizontal">
+            <summary>
+            Indicates Horizontal orientation of the content.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.TextMarkup.eContentOrientation.Vertical">
+            <summary>
+            Indicates Vertical orientation of the content.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.TextMarkup.eContentAlignment">
+            <summary>
+            Specifies content horizontal alignment.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.TextMarkup.eContentAlignment.Left">
+            <summary>
+            Content is left aligned.UI
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.TextMarkup.eContentAlignment.Right">
+            <summary>
+            Content is right aligned.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.TextMarkup.eContentAlignment.Center">
+            <summary>
+            Content is centered.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.TextMarkup.eContentVerticalAlignment">
+            <summary>
+            Specifies content vertical alignment.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.TextMarkup.eContentVerticalAlignment.Top">
+            <summary>
+            Content is top aligned.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.TextMarkup.eContentVerticalAlignment.Bottom">
+            <summary>
+            Content is bottom aligned.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.TextMarkup.eContentVerticalAlignment.Middle">
+            <summary>
+            Content is in the middle.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.TextMarkup.IBlock">
+            <summary>
+            Represents a content block interface.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TextMarkup.IBlock.Bounds">
+            <summary>
+            Gets or sets the bounds of the content block.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TextMarkup.IBlock.Visible">
+            <summary>
+            Gets or sets whether content block is visible.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.TextMarkup.IBlockExtended">
+            <summary>
+            Represents a extended content block interface for advanced layout information.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.TextMarkup.IContentLayout">
+            <summary>
+            Represents interface for block layout.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.TextMarkup.IContentLayout.Layout(System.Drawing.Rectangle,DevComponents.Tree.TextMarkup.IBlock[],DevComponents.Tree.TextMarkup.BlockLayoutManager)">
+            <summary>
+            Performs layout of the content block.
+            </summary>
+            <param name="containerBounds">Container bounds to layout content blocks in.</param>
+            <param name="contentBlocks">Content blocks to layout.</param>
+            <param name="blockLayout">Block layout manager that resizes the content blocks.</param>
+            <returns>The bounds of the content blocks within the container bounds.</returns>
+        </member>
+        <member name="T:DevComponents.Tree.TextMarkup.SerialContentLayoutManager">
+            <summary>
+            Represents the serial content layout manager that arranges content blocks in series next to each other.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.TextMarkup.SerialContentLayoutManager.#ctor">
+            <summary>
+            Creates new instance of the class.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.TextMarkup.SerialContentLayoutManager.Layout(System.Drawing.Rectangle,DevComponents.Tree.TextMarkup.IBlock[],DevComponents.Tree.TextMarkup.BlockLayoutManager)">
+            <summary>
+            Performs layout of the content block.
+            </summary>
+            <param name="containerBounds">Container bounds to layout content blocks in.</param>
+            <param name="contentBlocks">Content blocks to layout.</param>
+            <param name="blockLayout">Block layout manager that resizes the content blocks.</param>
+            <returns>The bounds of the content blocks within the container bounds.</returns>
+        </member>
+        <member name="E:DevComponents.Tree.TextMarkup.SerialContentLayoutManager.NextPosition">
+            <summary>
+            Occurs when X, Y position of next block is calcualted.
+            </summary>
+        </member>
+        <member name="E:DevComponents.Tree.TextMarkup.SerialContentLayoutManager.BeforeNewBlockLayout">
+            <summary>
+            Occurs before new block is layed out.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TextMarkup.SerialContentLayoutManager.BlockSpacing">
+            <summary>
+            Gets or sets the spacing in pixels between content blocks. Default value is 0.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TextMarkup.SerialContentLayoutManager.FitContainerOversize">
+            <summary>
+            Gets or sets whether content blocks are forced to fit the container bounds if they 
+            occupy more space than it is available by container. Default value is false.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TextMarkup.SerialContentLayoutManager.FitContainer">
+            <summary>
+            Gets or sets whether content blocks are resized to fit the container bound if they
+            occupy less space than it is available by container. Default value is false.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TextMarkup.SerialContentLayoutManager.VerticalFitContainerWidth">
+            <summary>
+            Gets or sets whether content blocks are resized (Width) to fit container bounds if they
+            occupy less space than the actual container width. Applies to the Vertical orientation only. Default value is false.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TextMarkup.SerialContentLayoutManager.ContentOrientation">
+            <summary>
+            Gets or sets the content orientation. Default value is Horizontal.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TextMarkup.SerialContentLayoutManager.ContentVerticalAlignment">
+            <summary>
+            Gets or sets the content vertical alignment. Default value is Middle.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TextMarkup.SerialContentLayoutManager.BlockLineAlignment">
+            <summary>
+            Gets or sets the block line vertical alignment. Default value is Middle.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TextMarkup.SerialContentLayoutManager.ContentAlignment">
+            <summary>
+            Gets or sets the content horiznontal alignment. Default value is Left.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TextMarkup.SerialContentLayoutManager.EvenHeight">
+            <summary>
+            Gets or sets whether all content blocks are resized so they have same height which is height of the talles content block. Default value is false.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TextMarkup.SerialContentLayoutManager.MultiLine">
+            <summary>
+            Gets or sets whether content is wrapped into new line if it exceeds the width of the container.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TextMarkup.SerialContentLayoutManager.RightToLeft">
+            <summary>
+            Gets or sets whether layout is right-to-left.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.TextMarkup.LayoutManagerPositionEventArgs">
+            <summary>
+            Represents event arguments for SerialContentLayoutManager.NextPosition event.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.TextMarkup.LayoutManagerPositionEventArgs.Block">
+            <summary>
+            Gets or sets the block that is layed out.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.TextMarkup.LayoutManagerPositionEventArgs.CurrentPosition">
+            <summary>
+            Gets or sets the current block position.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.TextMarkup.LayoutManagerPositionEventArgs.NextPosition">
+            <summary>
+            Gets or sets the calculated next block position.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.TextMarkup.LayoutManagerPositionEventArgs.Cancel">
+            <summary>
+            Cancels default position calculation.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.TextMarkup.LayoutManagerLayoutEventArgs">
+            <summary>
+            Represents event arguments for the SerialContentLayoutManager layout events.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.TextMarkup.LayoutManagerLayoutEventArgs.Block">
+            <summary>
+            Gets or sets the reference block object.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.TextMarkup.LayoutManagerLayoutEventArgs.CurrentPosition">
+            <summary>
+            Gets or sets the position block will assume.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.TextMarkup.LayoutManagerLayoutEventArgs.CancelLayout">
+            <summary>
+            Cancel the layout of the block, applies only to BeforeXXX layout event.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.TextMarkup.LayoutManagerLayoutEventArgs.BlockVisibleIndex">
+            <summary>
+            Gets or sets the visibility index of the block.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.TextMarkup.LayoutManagerLayoutEventArgs.#ctor(DevComponents.Tree.TextMarkup.IBlock,System.Drawing.Point,System.Int32)">
+            <summary>
+            Creates new instance of the class and initializes it with default values.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.TextMarkup.LayoutManagerPositionEventHandler">
+            <summary>
+            Delegate for SerialContentLayoutManager.NextPosition event.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.TextMarkup.LayoutManagerLayoutEventHandler">
+            <summary>
+            Delegate for the SerialContentLayoutManager layout events.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.Design.ColorSchemeColorConverter">
+            <summary>
+            Summary description for ColorSchemeColorConverter.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.Design.ColorSchemeColorConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object)">
+            <summary>
+            This member supports the .NET Framework infrastructure and is not intended to be used directly from your code.
+            </summary>
+            <param name="context">An ITypeDescriptorContext that provides a format context. </param>
+            <param name="culture">The CultureInfo to use as the current culture. </param>
+            <param name="value">The Object to convert. </param>
+            <returns>An Object that represents the converted value.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.Design.ColorSchemeColorConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext,System.Globalization.CultureInfo,System.Object,System.Type)">
+            <summary>
+            Converts the given value object to the specified type.
+            </summary>
+            <param name="context">An ITypeDescriptorContext that provides a format context. </param>
+            <param name="culture">A CultureInfo object. If a null reference (Nothing in Visual Basic) is passed, the current culture is assumed. </param>
+            <param name="value">The Object to convert.</param>
+            <param name="destinationType">The Type to convert the value parameter to. </param>
+            <returns>An Object that represents the converted value.</returns>
+        </member>
+        <member name="T:DevComponents.Tree.Design.ComponentNotLicensed">
+            <summary>
+            Summary description for ComponentNotLicensed.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.Design.ComponentNotLicensed.Dispose(System.Boolean)">
+            <summary>
+            Clean up any resources being used.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.Design.ComponentNotLicensed.InitializeComponent">
+            <summary>
+            Required method for Designer support - do not modify
+            the contents of this method with the code editor.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.Design.ElementStyleTypeEditor">
+            <summary>
+            Represents type editor for ElementStyle used for Windows Forms design-time support.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.Design.ElementStyleTypeEditor.GetEditStyle(System.ComponentModel.ITypeDescriptorContext)">
+            <summary>
+            Gets the editor style used by the EditValue method.
+            </summary>
+            <param name="context">An ITypeDescriptorContext that can be used to gain additional context information.</param>
+            <returns>A UITypeEditorEditStyle value that indicates the style of editor used by EditValue. If the UITypeEditor does not support this method, then GetEditStyle will return None</returns>
+        </member>
+        <member name="T:DevComponents.Tree.Design.NodeConnectorTypeEditor">
+            <summary>
+            Represents type editor for NodeConnector used for Windows Forms design-time support.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.Design.NodeConnectorTypeEditor.GetEditStyle(System.ComponentModel.ITypeDescriptorContext)">
+            <summary>
+            Gets the editor style used by the EditValue method.
+            </summary>
+            <param name="context">An ITypeDescriptorContext that can be used to gain additional context information.</param>
+            <returns>A UITypeEditorEditStyle value that indicates the style of editor used by EditValue. If the UITypeEditor does not support this method, then GetEditStyle will return None</returns>
+        </member>
+        <member name="T:DevComponents.Tree.Design.NodeContextMenuTypeEditor">
+            <summary>
+            Represents context menu type editor for Node.ContextMenu property.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.Design.NodeContextMenuTypeEditor.GetEditStyle(System.ComponentModel.ITypeDescriptorContext)">
+            <summary>
+            Gets the editor style used by the EditValue method.
+            </summary>
+            <param name="context">An ITypeDescriptorContext that can be used to gain additional context information.</param>
+            <returns>A UITypeEditorEditStyle value that indicates the style of editor used by EditValue. If the UITypeEditor does not support this method, then GetEditStyle will return None</returns>
+        </member>
+        <member name="T:DevComponents.Tree.Design.NodeDesigner">
+            <summary>
+            Represents Windows Forms designer for Node object.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.Design.NodeDesigner.Initialize(System.ComponentModel.IComponent)">
+            <summary>
+            Initializes designer with given component.
+            </summary>
+            <param name="component">Component to initalize designer with.</param>
+        </member>
+        <member name="P:DevComponents.Tree.Design.NodeDesigner.Visible">
+            <summary>
+            Gets or sets whether item is visible.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Design.NodeDesigner.Verbs">
+            <summary>Returns design-time commands applicable to this designer.</summary>
+        </member>
+        <member name="T:DevComponents.Tree.Design.TreeGXDesigner">
+            <summary>
+            Represents windows forms designer for the control.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.Design.TreeGXDesigner.Initialize(System.ComponentModel.IComponent)">
+            <summary>Initializes designer with given component.</summary>
+            <param name="component">Component to initialize designer with.</param>
+        </member>
+        <member name="M:DevComponents.Tree.Design.TreeGXDesigner.OnComponentRemoving(System.Object,System.ComponentModel.Design.ComponentEventArgs)">
+            <summary>Called when component is about to be removed from designer.</summary>
+            <param name="sender">Event sender.</param>
+            <param name="e">Event arguments.</param>
+        </member>
+        <member name="M:DevComponents.Tree.Design.TreeGXDesigner.WndProc(System.Windows.Forms.Message@)">
+            <summary>
+            Selection support for items on container.
+            </summary>
+        </member>
+        <!-- Badly formed XML comment ignored for member "M:DevComponents.Tree.Design.TreeGXDesigner.OnControlAdded(System.Windows.Forms.ControlEventArgs)" -->
+        <member name="M:DevComponents.Tree.Design.TreeGXDesigner.OnNodeSelected(DevComponents.Tree.Node)">
+            <summary>
+            Called after node has been selected by designer as response to mouse action
+            </summary>
+            <param name="node">Node that is selected</param>
+        </member>
+        <member name="M:DevComponents.Tree.Design.TreeGXDesigner.CanDragNode(DevComponents.Tree.Node)">
+            <summary>
+            Returns whether specified node can be dragged and dropped
+            </summary>
+            <param name="node">Node to verify</param>
+            <returns>true if node can be dragged and dropped</returns>
+        </member>
+        <member name="P:DevComponents.Tree.Design.TreeGXDesigner.AssociatedComponents">
+            <summary>
+            Returns all components associated with this control
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Design.TreeGXDesigner.SelectionRules">
+            <summary>Specifies selection rules for designer.</summary>
+        </member>
+        <member name="T:DevComponents.Tree.DisplayHelp">
+            <summary>
+            Summary description for Display.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.Display.CellDisplay">
+            <summary>
+            Represents cell display class.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.Display.CellDisplayInfo">
+            <summary>
+            Represents information neccessary to paint the cell on canvas.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.Display.ConnectorRendererEventArgs">
+            <summary>
+            Represents helper class for node connector display.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.Display.ConnectorRendererEventArgs.FromNode">
+            <summary>
+            From node reference.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.Display.ConnectorRendererEventArgs.StyleFromNode">
+            <summary>
+            From node style reference.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.Display.ConnectorRendererEventArgs.ToNode">
+            <summary>
+            To node reference.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.Display.ConnectorRendererEventArgs.StyleToNode">
+            <summary>
+            To node style reference.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.Display.ConnectorRendererEventArgs.Graphics">
+            <summary>
+            Graphics object used for drawing.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.Display.ConnectorRendererEventArgs.Offset">
+            <summary>
+            Node offset since some node coordinates are relative.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.Display.ConnectorRendererEventArgs.IsRootNode">
+            <summary>
+            Indicates whether from node is a root node.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.Display.ConnectorRendererEventArgs.NodeConnector">
+            <summary>
+            Reference to node connector object that describes connector type.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.Display.ConnectorRendererEventArgs.LinkConnector">
+            <summary>
+            Gets or sets whether connector is link connector.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.Display.ConnectorRendererEventArgs.ConnectorPoints">
+            <summary>
+            Reference to the collection of the connector path points. Default value is null indicating there are no path points.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.Display.CurveConnectorDisplay">
+            <summary>
+            Represents the connector display for map type.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.Display.NodeConnectorDisplay">
+            <summary>
+            Base class for drawing node connectors.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.Display.NodeConnectorDisplay.#ctor">
+            <summary>
+            Creates new instance of the object.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.Display.NodeConnectorDisplay.DrawConnector(DevComponents.Tree.Display.ConnectorRendererEventArgs)">
+            <summary>
+            Draws connector line between two nodes.
+            </summary>
+            <param name="info">Connector context information.</param>
+        </member>
+        <member name="M:DevComponents.Tree.Display.NodeConnectorDisplay.GetStartPoint(DevComponents.Tree.Display.ConnectorRendererEventArgs)">
+            <summary>
+            Returns the connector starting coordinates.
+            </summary>
+            <param name="info">Connector display information.</param>
+            <returns>Point object.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.Display.NodeConnectorDisplay.IsAbove(DevComponents.Tree.Node,DevComponents.Tree.Node)">
+            <summary>
+            Returns true if fromNode is above the toNode.
+            </summary>
+            <param name="fromNode">From Node object.</param>
+            <param name="toNode">To Node object</param>
+            <returns>True if fromNode is above toNode.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.Display.NodeConnectorDisplay.IsBelow(DevComponents.Tree.Node,DevComponents.Tree.Node)">
+            <summary>
+            Returns true if fromNode is below toNode.
+            </summary>
+            <param name="fromNode">From Node object.</param>
+            <param name="toNode">To Node object.</param>
+            <returns>True if fromNode is below toNode.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.Display.NodeConnectorDisplay.UnderlineNode(DevComponents.Tree.ElementStyle)">
+            <summary>
+            Returns whether connector is extended to underline the node.
+            </summary>
+            <param name="nodeStyle">Refernce to Node style.</param>
+            <returns>True if node should be underlined by connector.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.Display.NodeConnectorDisplay.GetEndPoint(DevComponents.Tree.Display.ConnectorRendererEventArgs)">
+            <summary>
+            Returns the connector end point. The array of end points. Two valid points will be returned if node needs to be underlined by connector.
+            </summary>
+            <param name="info">Connector display info.</param>
+            <returns>Array of point objects.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.Display.NodeConnectorDisplay.GetCapWidthOffset(DevComponents.Tree.eConnectorCap,System.Drawing.Size)">
+            <summary>
+            Returns the offest for the node connector cap.
+            </summary>
+            <param name="cap">Cap type.</param>
+            <param name="size">Cap size.</param>
+            <returns></returns>
+        </member>
+        <member name="M:DevComponents.Tree.Display.NodeConnectorDisplay.IsOnLeftSide(DevComponents.Tree.Node,DevComponents.Tree.Node)">
+            <summary>
+            Returns true if source node is on the left side of the target node.
+            </summary>
+            <param name="source">Reference to source node.</param>
+            <param name="target">Reference to target node.</param>
+            <returns>True if source is on the left side of target.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.Display.NodeConnectorDisplay.GetLinePen(DevComponents.Tree.Display.ConnectorRendererEventArgs)">
+            <summary>
+            Returns new instance of pen object for node connector line. Caller is responsible for
+            disposing of this object.
+            </summary>
+            <param name="info">Node connector display info.</param>
+            <returns>New instance of Pen object.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.Display.NodeConnectorDisplay.GetEndLinePen(DevComponents.Tree.Display.ConnectorRendererEventArgs)">
+            <summary>
+            Returns new instance of pen object for the end node connector line. Caller is responsible for
+            disposing of this object.
+            </summary>
+            <param name="info">Node connector display info.</param>
+            <returns>New instance of Pen object.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.Display.NodeConnectorDisplay.GetEndUnderlinePen(DevComponents.Tree.Display.ConnectorRendererEventArgs)">
+            <summary>
+            Returns new instance of pen object for the node underline line. Caller is responsible for
+            disposing of this object.
+            </summary>
+            <param name="info">Node connector display info.</param>
+            <returns>New instance of Pen object.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.Display.NodeConnectorDisplay.DrawLineConnector(DevComponents.Tree.Display.ConnectorRendererEventArgs,System.Drawing.Point,System.Drawing.Point,System.Drawing.Point)">
+            <summary>
+            Draws straight line connector between start and end point.
+            </summary>
+            <param name="info">Node connector display info.</param>
+            <param name="pStart">Start point.</param>
+            <param name="pEnd">End point.</param>
+            <param name="pEndUnderLine">Underline end point if any.</param>
+        </member>
+        <member name="M:DevComponents.Tree.Display.CurveConnectorDisplay.DrawConnector(DevComponents.Tree.Display.ConnectorRendererEventArgs)">
+            <summary>
+            Draws connector line between two nodes.
+            </summary>
+            <param name="info">Connector context information.</param>
+        </member>
+        <member name="T:DevComponents.Tree.Display.LineConnectorDisplay">
+            <summary>
+            Represents the line connector display class.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.Display.LineConnectorDisplay.DrawConnector(DevComponents.Tree.Display.ConnectorRendererEventArgs)">
+            <summary>
+            Draws connector line between two nodes.
+            </summary>
+            <param name="info">Connector context information.</param>
+        </member>
+        <member name="T:DevComponents.Tree.Display.NodeCellRendererEventArgs">
+            <summary>
+            Provides information for cell rendering methods and events.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.Display.NodeRendererEventArgs">
+            <summary>
+            Summary description for NodeRendererEventArgs.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.Display.NodeRendererEventArgs.Graphics">
+            <summary>
+            Gets or sets reference to Graphics object, canvas node is rendered on.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.Display.NodeRendererEventArgs.Node">
+            <summary>
+            Gets or sets the reference to Node object being rendered.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.Display.NodeRendererEventArgs.NodeBounds">
+            <summary>
+            Gets or sets the absolute node bounds.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.Display.NodeRendererEventArgs.Style">
+            <summary>
+            Gets or sets the reference to element style for rendered node or cell. Style provided here is the style
+            for current node or cell state.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.Display.NodeRendererEventArgs.#ctor">
+            <summary>
+            Creates new instance of the class.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.Display.NodeCellRendererEventArgs.Cell">
+            <summary>
+            Gets or sets the cell being rendered.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.Display.NodeCellRendererEventArgs.CellBounds">
+            <summary>
+            Gets or sets absolute cell bounds.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.Display.NodeCellRendererEventArgs.CellTextBounds">
+            <summary>
+            Gets or sets absolute bounds for cell text.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.Display.NodeCellRendererEventArgs.CellOffset">
+            <summary>
+            Gets or sets the internal cell offset.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.Display.NodeCellRendererEventArgs.#ctor">
+            <summary>
+            Creates new instance of the class.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.Display.NodeCellRendererEventArgs.#ctor(System.Drawing.Graphics,DevComponents.Tree.Node,System.Drawing.Rectangle,DevComponents.Tree.ElementStyle,DevComponents.Tree.Cell,System.Drawing.Rectangle)">
+            <summary>
+            Creates new instance of the class and initializes it with default values.
+            </summary>
+            <param name="g">Reference to graphics object.</param>
+            <param name="node">Reference to context node.</param>
+            <param name="bounds">Reference to node bounds</param>
+            <param name="style">Reference to cell style</param>
+            <param name="cell">Reference to cell</param>
+            <param name="cellBounds">Reference to cell bounds</param>
+        </member>
+        <member name="T:DevComponents.Tree.Display.NodeCommandDisplay">
+            <summary>
+            Paints node command button.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.Display.NodeCommandPartRendererEventArgs">
+            <summary>
+            Summary description for NodeCommandPartRendererEventArgs.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.Display.NodeCommandPartRendererEventArgs.Graphics">
+            <summary>
+            Gets or sets reference to Graphics object, canvas node is rendered on.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.Display.NodeCommandPartRendererEventArgs.Node">
+            <summary>
+            Gets or sets the reference to Node object being rendered.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.Display.NodeCommandPartRendererEventArgs.CommandPartBounds">
+            <summary>
+            Gets or sets command part absolute bounds.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.Display.NodeCommandPartRendererEventArgs.BackColor">
+            <summary>
+            Gets or sets command part back color.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.Display.NodeCommandPartRendererEventArgs.BackColor2">
+            <summary>
+            Gets or sets command part end gradient color.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.Display.NodeCommandPartRendererEventArgs.ForeColor">
+            <summary>
+            Gets or sets command part text color.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.Display.NodeCommandPartRendererEventArgs.BackColorGradientAngle">
+            <summary>
+            Gets or sets gradient angle.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.Display.NodeCommandPartRendererEventArgs.MouseOverBackColor">
+            <summary>
+            Gets or sets command part back color when mouse is over the part.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.Display.NodeCommandPartRendererEventArgs.MouseOverBackColor2">
+            <summary>
+            Gets or sets command part end gradient back color when mouse is over the part.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.Display.NodeCommandPartRendererEventArgs.MouseOverForeColor">
+            <summary>
+            Gets or sets text color when mouse is over the part.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.Display.NodeCommandPartRendererEventArgs.MouseOverBackColorGradientAngle">
+            <summary>
+            Gets or sets gradient angle.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.Display.NodeCommandPartRendererEventArgs.#ctor(System.Drawing.Graphics)">
+            <summary>
+            Creates new instance of the class.
+            </summary>
+            <param name="g"></param>
+        </member>
+        <member name="T:DevComponents.Tree.ConnectorPointInfo">
+            <summary>
+            Represents custom connector path info.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.Display.NodeDisplay">
+            <summary>
+            Summary description for NodeDisplay.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.Display.NodeDisplay.#ctor(DevComponents.Tree.TreeGX)">
+            <summary>Creates new instance of the class</summary>
+            <param name="tree">Object to initialize class with.</param>
+        </member>
+        <member name="M:DevComponents.Tree.Display.NodeDisplay.Paint(System.Drawing.Graphics,System.Drawing.Rectangle)">
+            <summary>
+            Paints the layout on canvas.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.Display.NodeDisplay.SetLockedOffset(System.Drawing.Point)">
+            <summary>
+            Sets locked offset to specific value. Point.Empty means there is no locked offset set.
+            </summary>
+            <param name="p">New locked offset.</param>
+        </member>
+        <member name="M:DevComponents.Tree.Display.NodeDisplay.GetLockedOffset">
+            <summary>
+            
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="P:DevComponents.Tree.Display.NodeDisplay.Offset">
+            <summary>
+            Gets or sets the offset of the tree content relative to the size of the container control.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Display.NodeDisplay.LockOffset">
+            <summary>Gets or sets whether offset is locked, i.e. cannot be changed.</summary>
+        </member>
+        <member name="P:DevComponents.Tree.Display.NodeDisplay.DefaultOffset">
+            <summary>
+            Returns the default offset for the tree content relative to the size of the container.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Display.NodeDisplay.Tree">
+            <summary>
+            Gets or sets the reference to the tree control managed by display class.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.Display.NodeExpandDisplay">
+            <summary>
+            Base class for node expand button display.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.Display.NodeExpandDisplay.#ctor">
+            <summary>Creates new instance of the class</summary>
+        </member>
+        <member name="M:DevComponents.Tree.Display.NodeExpandDisplay.DrawExpandButton(DevComponents.Tree.NodeExpandPartRendererEventArgs)">
+            <summary>Draws expand button.</summary>
+            <param name="e">Context parameters for drawing expand button.</param>
+        </member>
+        <member name="T:DevComponents.Tree.Display.NodeExpandEllipseDisplay">
+            <summary>
+            Represents class that paints elliptical expand button.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.Display.NodeExpandEllipseDisplay.DrawExpandButton(DevComponents.Tree.NodeExpandPartRendererEventArgs)">
+            <summary>Draws ellipse type expand button.</summary>
+            <param name="e">Expand context drawing information.</param>
+        </member>
+        <member name="T:DevComponents.Tree.Display.NodeExpandImageDisplay">
+            <summary>
+            Represents expand button display using predefined images.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.Display.NodeExpandImageDisplay.DrawExpandButton(DevComponents.Tree.NodeExpandPartRendererEventArgs)">
+            <summary>
+            Draws image type expand button.
+            </summary>
+            <param name="e">Expand context information</param>
+        </member>
+        <member name="T:DevComponents.Tree.NodeExpandPartRendererEventArgs">
+            <summary>
+            Represents event arguments for RenderExpandPart event.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.NodeExpandPartRendererEventArgs.Graphics">
+            <summary>
+            Gets or sets reference to Graphics object, canvas node is rendered on.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.NodeExpandPartRendererEventArgs.Node">
+            <summary>
+            Gets or sets the reference to Node object being rendered.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.NodeExpandPartRendererEventArgs.ExpandPartBounds">
+            <summary>Expand part bounds</summary>
+        </member>
+        <member name="F:DevComponents.Tree.NodeExpandPartRendererEventArgs.BorderColor">
+            <summary>Expand part border color</summary>
+        </member>
+        <member name="F:DevComponents.Tree.NodeExpandPartRendererEventArgs.ExpandLineColor">
+            <summary>Expand part line color</summary>
+        </member>
+        <member name="F:DevComponents.Tree.NodeExpandPartRendererEventArgs.BackColor">
+            <summary>Expand part background color</summary>
+        </member>
+        <member name="F:DevComponents.Tree.NodeExpandPartRendererEventArgs.BackColor2">
+            <summary>Expand part target gradient background color</summary>
+        </member>
+        <member name="F:DevComponents.Tree.NodeExpandPartRendererEventArgs.BackColorGradientAngle">
+            <summary>Gradient angle</summary>
+        </member>
+        <member name="F:DevComponents.Tree.NodeExpandPartRendererEventArgs.ExpandImage">
+            <summary>Expand part image when node is expanded</summary>
+        </member>
+        <member name="F:DevComponents.Tree.NodeExpandPartRendererEventArgs.ExpandImageCollapse">
+            <summary>Expand part image when node is collapsed</summary>
+        </member>
+        <member name="F:DevComponents.Tree.NodeExpandPartRendererEventArgs.ExpandButtonType">
+            <summary>Internal support for expand button types</summary>
+        </member>
+        <member name="M:DevComponents.Tree.NodeExpandPartRendererEventArgs.#ctor(System.Drawing.Graphics)">
+            <summary>
+            Creates new instance of the class and initializes it with default values.
+            </summary>
+            <param name="g">Reference to graphics object.</param>
+        </member>
+        <member name="T:DevComponents.Tree.Display.NodeExpandRectDisplay">
+            <summary>
+            Represents class that paints rectangular expand button.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.Display.NodeExpandRectDisplay.DrawExpandButton(DevComponents.Tree.NodeExpandPartRendererEventArgs)">
+            <summary>
+            Draw rectangular type expand button.
+            </summary>
+            <param name="e">Expand button context information.</param>
+        </member>
+        <member name="T:DevComponents.Tree.Display.NodeProfessionalColorTable">
+            <summary>
+            Describes colors used by Professional Renderer.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.Display.NodeProfessionalColorTable.NodeTopGradientBegin">
+            <summary>
+            Gets or sets the gradient begin color for top part of background.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.Display.NodeProfessionalColorTable.NodeTopGradientMiddle">
+            <summary>
+            Gets or sets the middle gradient color for top part of background.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.Display.NodeProfessionalColorTable.NodeTopGradientEnd">
+            <summary>
+            Gets or sets the end gradient color for top part of background.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.Display.NodeProfessionalColorTable.NodeTopGradientType">
+            <summary>
+            Gets or sets the end gradient type for top part of background.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.Display.NodeProfessionalColorTable.NodeTopGradientAngle">
+            <summary>
+            Gets or sets the end gradient angle for top part of background.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.Display.NodeProfessionalColorTable.NodeBottomGradientBegin">
+            <summary>
+            Gets or sets the starting gradient color for bottom part of background.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.Display.NodeProfessionalColorTable.NodeBottomGradientMiddle">
+            <summary>
+            Gets or sets the middle gradient color for bottom part of background.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.Display.NodeProfessionalColorTable.NodeBottomGradientEnd">
+            <summary>
+            Gets or sets the end gradient color for bottom part of background.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.Display.NodeProfessionalColorTable.NodeBottomGradientType">
+            <summary>
+            Gets or sets the type of the gradient for bottom part of background.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.Display.NodeProfessionalColorTable.NodeBottomGradientAngle">
+            <summary>
+            Gets or sets the gradient angle for bottom part of background.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.Display.NodeProfessionalColorTable.NodeMouseOverTopGradientBegin">
+            <summary>
+            Gets or sets the starting gradient color for top part of background when mouse is over the node.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.Display.NodeProfessionalColorTable.NodeMouseOverTopGradientMiddle">
+            <summary>
+            Gets or sets the middle gradient color for top part of background when mouse is over the node.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.Display.NodeProfessionalColorTable.NodeMouseOverTopGradientEnd">
+            <summary>
+            Gets or sets the end gradient color for top part of background when mouse is over the node.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.Display.NodeProfessionalColorTable.NodeMouseOverTopGradientType">
+            <summary>
+            Gets or sets the gradient type for top part of background when mouse is over the node.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.Display.NodeProfessionalColorTable.NodeMouseOverTopGradientAngle">
+            <summary>
+            Gets or sets the gradient angle for top part of background when mouse is over the node.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.Display.NodeProfessionalColorTable.NodeMouseOverBottomGradientBegin">
+            <summary>
+            Gets or sets the starting gradient color for bottom part of background when mouse is over the node.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.Display.NodeProfessionalColorTable.NodeMouseOverBottomGradientMiddle">
+            <summary>
+            Gets or sets the middle gradient color for bottom part of background when mouse is over the node.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.Display.NodeProfessionalColorTable.NodeMouseOverBottomGradientEnd">
+            <summary>
+            Gets or sets the end gradient color for bottom part of background when mouse is over the node.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.Display.NodeProfessionalColorTable.NodeMouseOverBottomGradientType">
+            <summary>
+            Gets or sets the gradient type for bottom part of background when mouse is over the node.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.Display.NodeProfessionalColorTable.NodeMouseOverBottomGradientAngle">
+            <summary>
+            Gets or sets the gradient angle for bottom part of background when mouse is over the node.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.Display.NodeProfessionalRenderer">
+            <summary>
+            Represents professional rendered which provides extensive rendering above and beyond the NodeSystemRenderer.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.Display.NodeSystemRenderer">
+            <summary>
+            Represents default system node and cell renderer.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.Display.NodeRenderer">
+            <summary>
+            Represents abstract renderer class for node objects.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.Display.NodeRenderer.DrawNodeBackground(DevComponents.Tree.Display.NodeRendererEventArgs)">
+            <summary>
+            Draws node background. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+            do not want default rendering to occur do not call the base implementation. You can call OnRenderNodeBackground method so events can occur.
+            </summary>
+            <param name="e">Information provided for rendering.</param>
+        </member>
+        <member name="M:DevComponents.Tree.Display.NodeRenderer.OnRenderNodeBackground(DevComponents.Tree.Display.NodeRendererEventArgs)">
+            <summary>
+            Raises RenderNodeBackground event.
+            </summary>
+            <param name="e">Event arguments.</param>
+        </member>
+        <member name="M:DevComponents.Tree.Display.NodeRenderer.DrawNodeExpandPart(DevComponents.Tree.NodeExpandPartRendererEventArgs)">
+            <summary>
+            Draws node expand part. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+            do not want default rendering to occur do not call the base implementation. You can call OnRenderNodeExpandPart method so events can occur.
+            </summary>
+            <param name="e">Information provided for rendering.</param>
+        </member>
+        <member name="M:DevComponents.Tree.Display.NodeRenderer.OnRenderNodeExpandPart(DevComponents.Tree.NodeExpandPartRendererEventArgs)">
+            <summary>
+            Raises RenderNodeExpandPart event.
+            </summary>
+            <param name="e"></param>
+        </member>
+        <member name="M:DevComponents.Tree.Display.NodeRenderer.DrawNodeCommandPart(DevComponents.Tree.Display.NodeCommandPartRendererEventArgs)">
+            <summary>
+            Draws node command part. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+            do not want default rendering to occur do not call the base implementation. You can call OnRenderNodeCommandPart method so events can occur.
+            </summary>
+            <param name="e">Information provided for rendering.</param>
+        </member>
+        <member name="M:DevComponents.Tree.Display.NodeRenderer.OnRenderNodeCommandPart(DevComponents.Tree.Display.NodeCommandPartRendererEventArgs)">
+            <summary>
+            Raises RenderNodeCommandPart event.
+            </summary>
+            <param name="e">Event arguments.</param>
+        </member>
+        <member name="M:DevComponents.Tree.Display.NodeRenderer.DrawCellBackground(DevComponents.Tree.Display.NodeCellRendererEventArgs)">
+            <summary>
+            Draws cell background. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+            do not want default rendering to occur do not call the base implementation. You can call OnRenderCellBackground method so events can occur.
+            </summary>
+            <param name="e">Information provided for rendering.</param>
+        </member>
+        <member name="M:DevComponents.Tree.Display.NodeRenderer.OnRenderCellBackground(DevComponents.Tree.Display.NodeCellRendererEventArgs)">
+            <summary>
+            Raises RenderCellBackground event.
+            </summary>
+            <param name="e">Event arguments</param>
+        </member>
+        <member name="M:DevComponents.Tree.Display.NodeRenderer.DrawCellCheckBox(DevComponents.Tree.Display.NodeCellRendererEventArgs)">
+            <summary>
+            Draws cell check box.  If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+            do not want default rendering to occur do not call the base implementation. You can call OnRenderCellCheckBox method so events can occur.
+            </summary>
+            <param name="e">Information provided for rendering.</param>
+        </member>
+        <member name="M:DevComponents.Tree.Display.NodeRenderer.OnRenderCellCheckBox(DevComponents.Tree.Display.NodeCellRendererEventArgs)">
+            <summary>
+            Raises RenderCellCheckBox event.
+            </summary>
+            <param name="e">Event arguments</param>
+        </member>
+        <member name="M:DevComponents.Tree.Display.NodeRenderer.DrawCellImage(DevComponents.Tree.Display.NodeCellRendererEventArgs)">
+            <summary>
+            Draws cell image. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+            do not want default rendering to occur do not call the base implementation. You can call OnRenderCellImage method so events can occur.
+            </summary>
+            <param name="e">Information provided for rendering.</param>
+        </member>
+        <member name="M:DevComponents.Tree.Display.NodeRenderer.OnRenderCellImage(DevComponents.Tree.Display.NodeCellRendererEventArgs)">
+            <summary>
+            Raises RenderCellImage event.
+            </summary>
+            <param name="e">Event arguments</param>
+        </member>
+        <member name="M:DevComponents.Tree.Display.NodeRenderer.DrawCellText(DevComponents.Tree.Display.NodeCellRendererEventArgs)">
+            <summary>
+            Draws cell text. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+            do not want default rendering to occur do not call the base implementation. You can call OnRenderCellText method so events can occur.
+            </summary>
+            <param name="e">Information provided for rendering.</param>
+        </member>
+        <member name="M:DevComponents.Tree.Display.NodeRenderer.OnRenderCellText(DevComponents.Tree.Display.NodeCellRendererEventArgs)">
+            <summary>
+            Raises RenderCellImage event.
+            </summary>
+            <param name="e">Event arguments</param>
+        </member>
+        <member name="M:DevComponents.Tree.Display.NodeRenderer.DrawSelection(DevComponents.Tree.SelectionRendererEventArgs)">
+            <summary>
+            Draws selection for SelectedNode. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+            do not want default rendering to occur do not call the base implementation. You can call OnRenderSelection method so events can occur.
+            </summary>
+            <param name="e">Information provided for rendering.</param>
+        </member>
+        <member name="M:DevComponents.Tree.Display.NodeRenderer.OnRenderSelection(DevComponents.Tree.SelectionRendererEventArgs)">
+            <summary>
+            Raises RenderSelection event.
+            </summary>
+            <param name="e">Event data.</param>
+        </member>
+        <member name="M:DevComponents.Tree.Display.NodeRenderer.DrawConnector(DevComponents.Tree.Display.ConnectorRendererEventArgs)">
+            <summary>
+            Draws connector between nodes. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+            do not want default rendering to occur do not call the base implementation. You can call OnRenderConnector method so events can occur.
+            </summary>
+            <param name="e">Information provided for rendering.</param>
+        </member>
+        <member name="M:DevComponents.Tree.Display.NodeRenderer.OnRenderConnector(DevComponents.Tree.Display.ConnectorRendererEventArgs)">
+            <summary>
+            Raises RenderConnector event.
+            </summary>
+            <param name="e">Event data.</param>
+        </member>
+        <member name="M:DevComponents.Tree.Display.NodeRenderer.DrawTreeBackground(DevComponents.Tree.Display.TreeBackgroundRendererEventArgs)">
+            <summary>
+            Draws the tree background. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+            do not want default rendering to occur do not call the base implementation. You can call OnRenderTreeBackground method so events can occur.
+            </summary>
+            <param name="e">Information provided for rendering.</param>
+        </member>
+        <member name="M:DevComponents.Tree.Display.NodeRenderer.OnRenderTreeBackground(DevComponents.Tree.Display.TreeBackgroundRendererEventArgs)">
+            <summary>
+            Raises RenderTreeBackground event.
+            </summary>
+            <param name="e">Event data.</param>
+        </member>
+        <member name="E:DevComponents.Tree.Display.NodeRenderer.RenderNodeBackground">
+            <summary>
+            Occurs when node background is being drawn.
+            </summary>
+        </member>
+        <member name="E:DevComponents.Tree.Display.NodeRenderer.RenderNodeExpandPart">
+            <summary>
+            Occurs when node expand part is being drawn.
+            </summary>
+        </member>
+        <member name="E:DevComponents.Tree.Display.NodeRenderer.RenderNodeCommandPart">
+            <summary>
+            Occurs when node command part is being drawn.
+            </summary>
+        </member>
+        <member name="E:DevComponents.Tree.Display.NodeRenderer.RenderCellBackground">
+            <summary>
+            Occurs when cell bacgkround is being drawn.
+            </summary>
+        </member>
+        <member name="E:DevComponents.Tree.Display.NodeRenderer.RenderCellCheckBox">
+            <summary>
+            Occurs when cell check-box is being drawn.
+            </summary>
+        </member>
+        <member name="E:DevComponents.Tree.Display.NodeRenderer.RenderCellImage">
+            <summary>
+            Occurs when cell image is being drawn.
+            </summary>
+        </member>
+        <member name="E:DevComponents.Tree.Display.NodeRenderer.RenderCellText">
+            <summary>
+            Occurs when cell text is being drawn.
+            </summary>
+        </member>
+        <member name="E:DevComponents.Tree.Display.NodeRenderer.RenderSelection">
+            <summary>
+            Occurs when cell text is being drawn.
+            </summary>
+        </member>
+        <member name="E:DevComponents.Tree.Display.NodeRenderer.RenderConnector">
+            <summary>
+            Occurs when node connector is being drawn.
+            </summary>
+        </member>
+        <member name="E:DevComponents.Tree.Display.NodeRenderer.RenderTreeBackground">
+            <summary>
+            Occurs when tree background is rendered.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.Display.NodeSystemRenderer.GetElementStyleDisplayInfo(DevComponents.Tree.ElementStyle,System.Drawing.Graphics,System.Drawing.Rectangle)">
+            <summary>
+            Returns ElementStyleDisplayInfo class that provides information for ElementStyle rendering.
+            </summary>
+            <param name="style">Reference to style.</param>
+            <param name="g">Reference to graphics object.</param>
+            <param name="bounds">Style bounds</param>
+            <returns>New instance of ElementStyleDisplayInfo</returns>
+        </member>
+        <member name="M:DevComponents.Tree.Display.NodeSystemRenderer.DrawNodeBackground(DevComponents.Tree.Display.NodeRendererEventArgs)">
+            <summary>
+            Draws node background. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+            do not want default rendering to occur do not call the base implementation. You can call OnRenderNodeBackground method so events can occur.
+            </summary>
+            <param name="e">Information provided for rendering.</param>
+        </member>
+        <member name="M:DevComponents.Tree.Display.NodeSystemRenderer.DrawNodeExpandPart(DevComponents.Tree.NodeExpandPartRendererEventArgs)">
+            <summary>
+            Draws node expand part. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+            do not want default rendering to occur do not call the base implementation. You can call OnRenderNodeExpandPart method so events can occur.
+            </summary>
+            <param name="e">Information provided for rendering.</param>
+        </member>
+        <member name="M:DevComponents.Tree.Display.NodeSystemRenderer.DrawNodeCommandPart(DevComponents.Tree.Display.NodeCommandPartRendererEventArgs)">
+            <summary>
+            Draws node command part. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+            do not want default rendering to occur do not call the base implementation. You can call OnRenderNodeCommandPart method so events can occur.
+            </summary>
+            <param name="e">Information provided for rendering.</param>
+        </member>
+        <member name="M:DevComponents.Tree.Display.NodeSystemRenderer.DrawCellBackground(DevComponents.Tree.Display.NodeCellRendererEventArgs)">
+            <summary>
+            Draws cell background. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+            do not want default rendering to occur do not call the base implementation. You can call OnRenderCellBackground method so events can occur.
+            </summary>
+            <param name="e">Information provided for rendering.</param>
+        </member>
+        <member name="M:DevComponents.Tree.Display.NodeSystemRenderer.DrawCellCheckBox(DevComponents.Tree.Display.NodeCellRendererEventArgs)">
+            <summary>
+            Draws cell check box.  If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+            do not want default rendering to occur do not call the base implementation. You can call OnRenderCellCheckBox method so events can occur.
+            </summary>
+            <param name="e">Information provided for rendering.</param>
+        </member>
+        <member name="M:DevComponents.Tree.Display.NodeSystemRenderer.DrawCellImage(DevComponents.Tree.Display.NodeCellRendererEventArgs)">
+            <summary>
+            Draws cell image. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+            do not want default rendering to occur do not call the base implementation. You can call OnRenderCellImage method so events can occur.
+            </summary>
+            <param name="e">Information provided for rendering.</param>
+        </member>
+        <member name="M:DevComponents.Tree.Display.NodeSystemRenderer.DrawCellText(DevComponents.Tree.Display.NodeCellRendererEventArgs)">
+            <summary>
+            Draws cell text. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+            do not want default rendering to occur do not call the base implementation. You can call OnRenderCellText method so events can occur.
+            </summary>
+            <param name="e">Information provided for rendering.</param>
+        </member>
+        <member name="M:DevComponents.Tree.Display.NodeSystemRenderer.DrawSelection(DevComponents.Tree.SelectionRendererEventArgs)">
+            <summary>
+            Draws selection for SelectedNode. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+            do not want default rendering to occur do not call the base implementation. You can call OnRenderSelection method so events can occur.
+            </summary>
+            <param name="e">Information provided for rendering.</param>
+        </member>
+        <member name="M:DevComponents.Tree.Display.NodeSystemRenderer.DrawConnector(DevComponents.Tree.Display.ConnectorRendererEventArgs)">
+            <summary>
+            Draws connector between nodes. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+            do not want default rendering to occur do not call the base implementation. You can call OnRenderConnector method so events can occur.
+            </summary>
+            <param name="e">Information provided for rendering.</param>
+        </member>
+        <member name="M:DevComponents.Tree.Display.NodeSystemRenderer.DrawTreeBackground(DevComponents.Tree.Display.TreeBackgroundRendererEventArgs)">
+            <summary>
+            Draws the tree background. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+            do not want default rendering to occur do not call the base implementation. You can call OnRenderTreeBackground method so events can occur.
+            </summary>
+            <param name="e">Information provided for rendering.</param>
+        </member>
+        <member name="M:DevComponents.Tree.Display.NodeProfessionalRenderer.DrawNodeBackground(DevComponents.Tree.Display.NodeRendererEventArgs)">
+            <summary>
+            Draws node background. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+            do not want default rendering to occur do not call the base implementation. You can call OnRenderNodeBackground method so events can occur.
+            </summary>
+            <param name="e">Information provided for rendering.</param>
+        </member>
+        <member name="M:DevComponents.Tree.Display.NodeProfessionalRenderer.PaintBackground(DevComponents.Tree.Display.NodeRendererEventArgs)">
+            <summary>
+            Paints background of the node.
+            </summary>
+            <param name="e">Context information.</param>
+        </member>
+        <member name="P:DevComponents.Tree.Display.NodeProfessionalRenderer.ColorTable">
+            <summary>
+            Gets or sets the color table used by renderer.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.Display.NodeSelectionDisplay">
+            <summary>
+            Represent class that paints selection around node.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.Display.NodeTreeDisplay">
+            <summary>
+            Summary description for NodeTreeDisplay.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.Display.NodeTreeDisplay.#ctor(DevComponents.Tree.TreeGX)">
+            <summary>Creates new instance of the class</summary>
+            <param name="tree">Object to initialize class with.</param>
+        </member>
+        <member name="M:DevComponents.Tree.Display.NodeTreeDisplay.Paint(System.Drawing.Graphics,System.Drawing.Rectangle)">
+            <summary>
+            Paints the treee on canvas.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.SelectionRendererEventArgs">
+            <summary>
+            Data form RenderSelection event.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.SelectionRendererEventArgs.Graphics">
+            <summary>
+            Gets or sets reference to Graphics object, canvas node is rendered on.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.SelectionRendererEventArgs.Node">
+            <summary>
+            Gets or sets the reference to selected Node object.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.SelectionRendererEventArgs.Bounds">
+            <summary>
+            Gets or sets the selection bounds.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.SelectionRendererEventArgs.BorderColor">
+            <summary>
+            Gets or sets border color of the selection rectangle.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.SelectionRendererEventArgs.FillColor">
+            <summary>
+            Gets or sets fill color of the selection rectangle.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.SelectionRendererEventArgs.Width">
+            <summary>
+            Gets or sets the width in pixels of the border of the selection rectangle.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.Display.TreeBackgroundRendererEventArgs">
+            <summary>
+            Provides data for tree background rendering events.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.Display.TreeBackgroundRendererEventArgs.Graphics">
+            <summary>
+            Gets or sets reference to Graphics object, canvas tree background is rendered on.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.Display.TreeBackgroundRendererEventArgs.TreeGX">
+            <summary>
+            Gets or sets the reference to TreeGX control.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.Display.TreeBackgroundRendererEventArgs.#ctor(System.Drawing.Graphics,DevComponents.Tree.TreeGX)">
+            <summary>
+            Creates new instance of the class and initializes it with default values.
+            </summary>
+            <param name="g">Reference to graphics object.</param>
+        </member>
+        <member name="T:DevComponents.Tree.Dpi">
+            <summary>
+            Provides High DPI support for DotNetBar controls.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Dpi.NormalizeScaleFactor">
+            <summary>
+            Gets or sets whether scale factor when set is normalized so both Width and Height values are the same. Default value is false.
+            If using ScaleMode=font the scale factor might not be same for Width and Height so this allows opportunity to keep existing size ratios on the DotNetBar sized controls.
+            When set to true the scale factor Height will always be set to scale factor Width.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.ElementSerializer">
+            <summary>
+            Represents class that can serialize compatible marked properties.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.ElementSerializer.DeserializeImage(System.Xml.XmlElement)">
+            <summary>
+            XML element is expected to be something like <image>Image data Base64 encoded</image>
+            </summary>
+            <param name="xml">Image data</param>
+            <returns></returns>
+        </member>
+        <member name="T:DevComponents.Tree.ElementStyle">
+            <summary>
+            Represents visual style of an User Interface Element.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.ElementStyle.#ctor">
+            <summary>Creates new instance of the class.</summary>
+        </member>
+        <member name="M:DevComponents.Tree.ElementStyle.ShouldSerializeBackColor">
+            <summary>
+            Indicates whether BackgroundColor should be serialized. Used by windows forms designer design-time support.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.ElementStyle.ResetBackColor">
+            <summary>
+            Resets BackgroundColor to it's default value. Used by windows forms designer design-time support.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.ElementStyle.ShouldSerializeBackColor2">
+            <summary>
+            Indicates whether BackgroundColor2 should be serialized. Used by windows forms designer design-time support.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.ElementStyle.ResetBackColor2">
+            <summary>
+            Resets BackgroundColor2 to it's default value. Used by windows forms designer design-time support.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.ElementStyle.ResetBackgroundImage">
+            <summary>
+            Resets BackgroundImage to it's default value null (VB Nothing). Used by windows forms designer design-time support.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.ElementStyle.ShouldSerializeTextColor">
+            <summary>
+            Indicates whether TextColor should be serialized. Used by windows forms designer design-time support.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.ElementStyle.ResetTextColor">
+            <summary>
+            Resets TextColor to it's default value. Used by windows forms designer design-time support.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.ElementStyle.ShouldSerializeTextShadowColor">
+            <summary>
+            Indicates whether TextShadowColor should be serialized. Used by windows forms designer design-time support.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.ElementStyle.ResetTextShadowColor">
+            <summary>
+            Resets TextColor to it's default value. Used by windows forms designer design-time support.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.ElementStyle.ShouldSerializeTextShadowOffset">
+            <summary>
+            Indicates whether TextShadowOffset should be serialized. Used by windows forms designer design-time support.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.ElementStyle.ResetTextShadowOffset">
+            <summary>
+            Resets TextShadowOffset to it's default value. Used by windows forms designer design-time support.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.ElementStyle.SetSize(System.Drawing.Size)">
+            <summary>
+            Sets size of the element style.
+            </summary>
+            <param name="size">Indicates new size.</param>
+        </member>
+        <member name="M:DevComponents.Tree.ElementStyle.ShouldSerializeBorderColor">
+            <summary>
+            Indicates whether BorderColor should be serialized. Used by windows forms designer design-time support.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.ElementStyle.ResetBorderColor">
+            <summary>
+            Resets BorderColor to it's default value. Used by windows forms designer design-time support.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.ElementStyle.ShouldSerializeBorderColor2">
+            <summary>
+            Indicates whether BorderColor3 should be serialized. Used by windows forms designer design-time support.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.ElementStyle.ResetBorderColor2">
+            <summary>
+            Resets BorderColor to it's default value. Used by windows forms designer design-time support.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.ElementStyle.ShouldSerializeBorderColorLight">
+            <summary>
+            Indicates whether BorderColorLight should be serialized. Used by windows forms designer design-time support.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.ElementStyle.ResetBorderColorLight">
+            <summary>
+            Resets BorderColor to it's default value. Used by windows forms designer design-time support.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.ElementStyle.ShouldSerializeBorderColorLight2">
+            <summary>
+            Indicates whether BorderColor2 should be serialized. Used by windows forms designer design-time support.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.ElementStyle.ResetBorderColorLight2">
+            <summary>
+            Resets BorderColorLight2 to it's default value. Used by windows forms designer design-time support.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.ElementStyle.ShouldSerializeBorderLeftColor">
+            <summary>
+            Indicates whether property should be serialized. Used by windows forms designer design-time support.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.ElementStyle.ResetBorderLeftColor">
+            <summary>
+            Resets property to it's default value. Used by windows forms designer design-time support.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.ElementStyle.ShouldSerializeBorderRightColor">
+            <summary>
+            Indicates whether property should be serialized. Used by windows forms designer design-time support.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.ElementStyle.ResetBorderRightColor">
+            <summary>
+            Resets property to it's default value. Used by windows forms designer design-time support.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.ElementStyle.ShouldSerializeBorderTopColor">
+            <summary>
+            Indicates whether property should be serialized. Used by windows forms designer design-time support.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.ElementStyle.ResetBorderTopColor">
+            <summary>
+            Resets property to it's default value. Used by windows forms designer design-time support.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.ElementStyle.ShouldSerializeBorderBottomColor">
+            <summary>
+            Indicates whether property should be serialized. Used by windows forms designer design-time support.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.ElementStyle.ResetBorderBottomColor">
+            <summary>
+            Resets property to it's default value. Used by windows forms designer design-time support.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.ElementStyle.Dispose">
+            <summary>
+            Releases all resurces used in this control. After calling Dispose()
+            object is not in valid state and cannot be recovered to the valid state.
+            Recreation of the object is required.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.ElementStyle.ApplyStyle(DevComponents.Tree.ElementStyle)">
+            <summary>
+            Applies a "child/inherited" style to this style. Use this method to create style
+            hierarchies.
+            </summary>
+            <remarks>
+            This method is used to support style hierarchies where a base style is defined
+            and inherited/child styles are derived and based on it. By using this method on the
+            base style you can apply only style changes defined by the child style. For example if
+            you defined a base style for normal user interface element then in most cases you do
+            not want to redefine the styling for the case when same user interface element is
+            selected. You will just defined the behavior of the selected state and then apply it to
+            the base normal style using ApplyStyle method.
+            </remarks>
+            <param name="style">Style to apply to current style.</param>
+        </member>
+        <member name="M:DevComponents.Tree.ElementStyle.Copy">
+            <summary>
+            Makes an exact copy of the style.
+            </summary>
+            <returns>New copy of ElementStyle object.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.ElementStyle.Reset">
+            <summary>
+            Reset all style properties to default values.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.ElementStyle.GetDefaultCellStyle(DevComponents.Tree.ElementStyle)">
+            <summary>Returns default style for the Cell object.</summary>
+            <param name="defaultNodeStyle">
+            Reference to the default style for the Node. Cell style is based on the given
+            node style.
+            </param>
+        </member>
+        <member name="M:DevComponents.Tree.ElementStyle.GetDefaultDisabledCellStyle">
+            <summary>Returns default style for disabled cells.</summary>
+            <returns>Returns new instance of ElementStyle object.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.ElementStyle.GetDefaultSelectedCellStyle">
+            <summary>Returns default style for the selected cell object.</summary>
+            <returns>New instance of the ElementStyle object.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.ElementStyle.SetColorsAlpha(DevComponents.Tree.ElementStyle,System.Int32)">
+            <summary>
+            Sets Alpha value for all colors defined by style to specified value.
+            </summary>
+            <param name="style">Style to change.</param>		
+            <param name="alpha">Alpha value for the colors.</param>
+        </member>
+        <member name="M:DevComponents.Tree.ElementStyle.GetColorScheme">
+            <summary>
+            Returns reference to ColorScheme object used by this style.
+            </summary>
+            <returns>Instance of ColorScheme object or null if object could not be obtained.</returns>
+        </member>
+        <member name="E:DevComponents.Tree.ElementStyle.StyleChanged">
+            <summary>
+            Occurs when appearance property of the style has changed.
+            </summary>
+        </member>
+        <member name="E:DevComponents.Tree.ElementStyle.Disposed">
+            <summary>
+            Occurs when component is Disposed.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.BackColorBlend">
+            <summary>
+            Gets the collection that defines the multicolor gradient background.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.BackColor">
+            <summary>
+            Gets or sets the background color for UI element. If used in combination with
+            BackgroundColor2 is specifies starting gradient color.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.BackColorSchemePart">
+            <summary>
+            Gets or sets the color scheme color that is used as background color. Setting
+            this property overrides the setting of the corresponding BackColor property.
+            Color scheme colors are automatically managed and are based on current system colors.
+            That means if colors on the system change the color scheme will ensure that it's colors
+            are changed as well to fit in the color scheme of target system. Set this property to
+            <a href="TreeGX~DevComponents.Tree.eColorSchemePart.html">eColorSchemePart.None</a> to
+            specify explicit color to use through BackColor property.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.BackColor2">
+            <summary>
+            Gets or sets the target gradient background color for UI element.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.BackColor2SchemePart">
+            <summary>
+            Gets or sets the color scheme color that is used as target gradient background color. Setting
+            this property overrides the setting of the corresponding BackColor2 property.
+            Color scheme colors are automatically managed and are based on current system colors.
+            That means if colors on the system change the color scheme will ensure that it's colors
+            are changed as well to fit in the color scheme of target system. Set this property to
+            <a href="TreeGX~DevComponents.Tree.eColorSchemePart.html">eColorSchemePart.None</a> to
+            specify explicit color to use through BackColor2 property.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.BackColorGradientAngle">
+            <summary>
+            Gets or sets the background gradient angle.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.BackColorGradientType">
+            <summary>
+            Gets or sets the background gradient fill type. Default value is Linear.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.BackgroundImage">
+            <summary>
+            Specifies background image.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.BackgroundImagePosition">
+            <summary>
+            Specifies background image position when container is larger than image.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.BackgroundImageAlpha">
+            <summary>
+            Specifies the transparency of background image.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.TextColor">
+            <summary>
+            Gets or sets the text color displayed in this UI element.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.TextColorSchemePart">
+            <summary>
+            Gets or sets the color scheme color that is used as text color. Setting
+            this property overrides the setting of the corresponding TextColor property.
+            Color scheme colors are automatically managed and are based on current system colors.
+            That means if colors on the system change the color scheme will ensure that it's colors
+            are changed as well to fit in the color scheme of target system. Set this property to
+            <a href="TreeGX~DevComponents.Tree.eColorSchemePart.html">eColorSchemePart.None</a> to
+            specify explicit color to use through TextColor property.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.TextShadowColor">
+            <summary>
+            Gets or sets the text shadow color.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.TextShadowColorSchemePart">
+            <summary>
+            Gets or sets the color scheme color that is used as text shadow color. Setting
+            this property overrides the setting of the corresponding TextShadowColor property.
+            Color scheme colors are automatically managed and are based on current system colors.
+            That means if colors on the system change the color scheme will ensure that it's colors
+            are changed as well to fit in the color scheme of target system. Set this property to
+            <a href="TreeGX~DevComponents.Tree.eColorSchemePart.html">eColorSchemePart.None</a> to
+            specify explicit color to use through TextColor property.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.TextShadowOffset">
+            <summary>
+            Indicates text shadow offset in pixels
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.Font">
+            <summary>
+            Gets or sets the Font used to draw this the text.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.WordWrap">
+            <summary>
+            Gets or sets a value that determines whether text is displayed in multiple lines or one long line.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.TextAlignment">
+            <summary>
+            Specifies alignment of the text.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.TextLineAlignment">
+            <summary>
+            Specifies alignment of the text.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.TextTrimming">
+            <summary>
+            Specifies how to trim characters when text does not fit.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.MarginHorizontal">
+            <summary>
+            Gets the total horizontal margin (Left + Right)
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.MarginVertical">
+            <summary>
+            Gets the total vertical margin (Top + Bottom)
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.MarginLeft">
+            <summary>
+            Gets or sets the left margin.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.MarginRight">
+            <summary>
+            Gets or sets the right margin.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.MarginTop">
+            <summary>
+            Gets or sets the top margin.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.MarginBottom">
+            <summary>
+            Gets or sets the bottom margin.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.SizeChanged">
+            <summary>
+            Gets or sets whether any style property has changed which could influence the size of the style.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.Size">
+            <summary>
+            Gets the calcuated size of the element style.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.Border">
+            <summary>
+            Gets or sets the border type for all sides of the element.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.BorderWidth">
+            <summary>
+            Gets or sets border width in pixels.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.BorderTop">
+            <summary>
+            Gets or sets the border type for top side of the element.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.BorderBottom">
+            <summary>
+            Gets or sets the border type for bottom side of the element.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.BorderLeft">
+            <summary>
+            Gets or sets the border type for left side of the element.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.BorderRight">
+            <summary>
+            Gets or sets the border type for right side of the element.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.BorderTopWidth">
+            <summary>
+            Gets or sets border width in pixels.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.BorderBottomWidth">
+            <summary>
+            Gets or sets border width in pixels.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.BorderLeftWidth">
+            <summary>
+            Gets or sets border width in pixels.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.BorderRightWidth">
+            <summary>
+            Gets or sets border width in pixels.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.BorderColor">
+            <summary>
+            Gets or sets the border color for all sides. Specifing the color for the side will override this value.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.BorderColorSchemePart">
+            <summary>
+            Gets or sets the color scheme color that is used as border color. Setting
+            this property overrides the setting of the corresponding BorderColor property.
+            Color scheme colors are automatically managed and are based on current system colors.
+            That means if colors on the system change the color scheme will ensure that it's colors
+            are changed as well to fit in the color scheme of target system. Set this property to
+            <a href="TreeGX~DevComponents.Tree.eColorSchemePart.html">eColorSchemePart.None</a> to
+            specify explicit color to use through BorderColor property.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.BorderColor2">
+            <summary>
+            Gets or sets the target background gradient color for border on all sides. Specifing the color for the side will override this value. Gradient border colors
+            be employed only when per side border color is not specified.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.BorderColor2SchemePart">
+            <summary>
+            Gets or sets the color scheme color that is used as taget gradient border color. Setting
+            this property overrides the setting of the corresponding BorderColor property.
+            Color scheme colors are automatically managed and are based on current system colors.
+            That means if colors on the system change the color scheme will ensure that it's colors
+            are changed as well to fit in the color scheme of target system. Set this property to
+            <a href="TreeGX~DevComponents.Tree.eColorSchemePart.html">eColorSchemePart.None</a> to
+            specify explicit color to use through BorderColor property.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.BorderGradientAngle">
+            <summary>
+            Gets or sets the border gradient angle. Default value is 90.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.BorderColorLight">
+            <summary>
+            Gets or sets the color for light border part when etched border is used.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.BorderColorLightSchemePart">
+            <summary>
+            Gets or sets the color scheme color that is used as border light color for etched border style. Setting
+            this property overrides the setting of the corresponding BorderColor property.
+            Color scheme colors are automatically managed and are based on current system colors.
+            That means if colors on the system change the color scheme will ensure that it's colors
+            are changed as well to fit in the color scheme of target system. Set this property to
+            <a href="TreeGX~DevComponents.Tree.eColorSchemePart.html">eColorSchemePart.None</a> to
+            specify explicit color to use through BorderColor property.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.BorderColorLight2">
+            <summary>
+            Gets or sets the target background gradient color for border on all sides. Specifing the color for the side will override this value. Gradient border colors
+            be employed only when per side border color is not specified.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.BorderColorLight2SchemePart">
+            <summary>
+            Gets or sets the color scheme color that is used as taget gradient border light color for etched border style. Setting
+            this property overrides the setting of the corresponding BorderColor property.
+            Color scheme colors are automatically managed and are based on current system colors.
+            That means if colors on the system change the color scheme will ensure that it's colors
+            are changed as well to fit in the color scheme of target system. Set this property to
+            <a href="TreeGX~DevComponents.Tree.eColorSchemePart.html">eColorSchemePart.None</a> to
+            specify explicit color to use through BorderColor property.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.BorderLightGradientAngle">
+            <summary>
+            Gets or sets the light border gradient angle. Default value is 90.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.BorderLeftColor">
+            <summary>
+            Gets or sets the background color for the left side border.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.BorderLeftColorSchemePart">
+            <summary>
+            Gets or sets the color scheme color that is used as left border color. Setting
+            this property overrides the setting of the corresponding BorderLeftColor property.
+            Color scheme colors are automatically managed and are based on current system colors.
+            That means if colors on the system change the color scheme will ensure that it's colors
+            are changed as well to fit in the color scheme of target system. Set this property to
+            <a href="TreeGX~DevComponents.Tree.eColorSchemePart.html">eColorSchemePart.None</a> to
+            specify explicit color to use through BorderLeftColor property.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.BorderRightColor">
+            <summary>
+            Gets or sets the background color for the right side border.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.BorderRightColorSchemePart">
+            <summary>
+            Gets or sets the color scheme color that is used as right border color. Setting
+            this property overrides the setting of the corresponding BorderRightColor property.
+            Color scheme colors are automatically managed and are based on current system colors.
+            That means if colors on the system change the color scheme will ensure that it's colors
+            are changed as well to fit in the color scheme of target system. Set this property to
+            <a href="TreeGX~DevComponents.Tree.eColorSchemePart.html">eColorSchemePart.None</a> to
+            specify explicit color to use through BorderRightColor property.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.BorderTopColor">
+            <summary>
+            Gets or sets the background color for the top side border.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.BorderTopColorSchemePart">
+            <summary>
+            Gets or sets the color scheme color that is used as top border color. Setting
+            this property overrides the setting of the corresponding BorderTopColor property.
+            Color scheme colors are automatically managed and are based on current system colors.
+            That means if colors on the system change the color scheme will ensure that it's colors
+            are changed as well to fit in the color scheme of target system. Set this property to
+            <a href="TreeGX~DevComponents.Tree.eColorSchemePart.html">eColorSchemePart.None</a> to
+            specify explicit color to use through BorderTopColor property.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.BorderBottomColor">
+            <summary>
+            Gets or sets the background color for the bottom side border.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.BorderBottomColorSchemePart">
+            <summary>
+            Gets or sets the color scheme color that is used as bottom border color. Setting
+            this property overrides the setting of the corresponding BorderBottomColor property.
+            Color scheme colors are automatically managed and are based on current system colors.
+            That means if colors on the system change the color scheme will ensure that it's colors
+            are changed as well to fit in the color scheme of target system. Set this property to
+            <a href="TreeGX~DevComponents.Tree.eColorSchemePart.html">eColorSchemePart.None</a> to
+            specify explicit color to use through BorderBottomColor property.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.PaddingHorizontal">
+            <summary>
+            Gets the total horizontal padding (Left + Right)
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.PaddingVertical">
+            <summary>
+            Gets the total vertical padding (Top + Bottom)
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.PaddingTop">
+            <summary>
+            Gets or sets the amount of space to insert between the top border of the element and the content. 
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.PaddingBottom">
+            <summary>
+            Gets or sets the amount of space to insert between the bottom border of the element and the content. 
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.PaddingLeft">
+            <summary>
+            Gets or sets the amount of space to insert between the left border of the element and the content. 
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.PaddingRight">
+            <summary>
+            Gets or sets the amount of space to insert between the right border of the element and the content. 
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.Name">
+            <summary>
+            Gets or sets the name of the style.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.Class">
+            <summary>
+            Gets or sets the class style belongs to. The Class styles are used to apply predefined values to the styles that belong to the same class.
+            This feature is used to manage color schemes/tables per class style.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.Description">
+            <summary>
+            Gets or sets the description of the style.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.Site">
+            <summary>
+            Gets or sets the Site associated with this component. Used by Windows forms designer.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.MaximumHeight">
+            <summary>
+            Gets or sets the maximum height of the element. This property should be used in
+            conjunction with the <see cref="P:DevComponents.Tree.ElementStyle.WordWrap">WordWrap</see> property to limit the size of
+            text bounding box.
+            </summary>
+            <remarks>Default value is 0 which indicates that height of the style is unlimited.</remarks>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.MaximumWidth">
+            <summary>
+            Gets or sets the maximum width of the element. This property should be used in
+            conjunction with the <see cref="P:DevComponents.Tree.ElementStyle.WordWrap">WordWrap</see> property to limit the size of
+            text bounding box.
+            </summary>
+            <remarks>Default value is 0 which indicates that width of the style is not limited.</remarks>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.StringFormat">
+            <summary>
+            Returns System.Drawing.StringFormat constructed from current style settings.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.TextFormat">
+            <summary>
+            Returns eTextFormat constructed from current style settings.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.CornerType">
+            <summary>
+            Gets or sets the border corner type for all 4 sides. Default corner type is Square.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.CornerTypeTopLeft">
+            <summary>
+            Gets or sets the border corner type for top left corner. Default value is Inherit which means that setting from CornerType property is used.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.CornerTypeTopRight">
+            <summary>
+            Gets or sets the border corner type for top right corner. Default value is Inherit which means that setting from CornerType property is used.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.CornerTypeBottomLeft">
+            <summary>
+            Gets or sets the border corner type for bottom left corner. Default value is Inherit which means that setting from CornerType property is used.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.CornerTypeBottomRight">
+            <summary>
+            Gets or sets the border corner type for bottom right corner. Default value is Inherit which means that setting from CornerType property is used.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.CornerDiameter">
+            <summary>
+            Gets or sets the diameter in pixels of the corner type rounded or diagonal.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.PaintLeftBorder">
+            <summary>
+            Gets whether to paint left border for the style.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.PaintRightBorder">
+            <summary>
+            Gets whether to paint right border for the style.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.PaintTopBorder">
+            <summary>
+            Gets whether to paint top border for the style.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.PaintBottomBorder">
+            <summary>
+            Gets whether to paint bottom border for the style.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.PaintBorder">
+            <summary>
+            Gets whether to paint any border for the style.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.Custom">
+            <summary>
+            Gets whether custom has any of properties changed.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.DesignMode">
+            <summary>
+            Gets or sets whether ElementStyle is in design mode.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.Parent">
+            <summary>
+            Gets or sets the reference to the parent collection.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyle.TreeControl">
+            <summary>
+            Gets or sets the tree control style is assigned to.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.eGradientType">
+            <summary>
+            Specifies the type of the gradient fill.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eGradientType.Linear">
+            <summary>
+            Represents linear gradient fill.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eGradientType.Radial">
+            <summary>
+            Represents radial gradient fill.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.ElementStyleCollection">
+            <summary>
+            Represents collection for Node objects.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.ElementStyleCollection.#ctor">
+            <summary>Creates new instance of the object.</summary>
+        </member>
+        <member name="M:DevComponents.Tree.ElementStyleCollection.Add(DevComponents.Tree.ElementStyle)">
+            <summary>
+            Adds new object to the collection.
+            </summary>
+            <param name="tab">Object to add.</param>
+            <returns>Index of newly added object.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.ElementStyleCollection.Insert(System.Int32,DevComponents.Tree.ElementStyle)">
+            <summary>
+            Inserts new object into the collection.
+            </summary>
+            <param name="index">Position of the object.</param>
+            <param name="value">Object to insert.</param>
+        </member>
+        <member name="M:DevComponents.Tree.ElementStyleCollection.IndexOf(DevComponents.Tree.ElementStyle)">
+            <summary>
+            Returns index of the object inside of the collection.
+            </summary>
+            <param name="value">Reference to the object.</param>
+            <returns>Index of the object.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.ElementStyleCollection.Contains(DevComponents.Tree.ElementStyle)">
+            <summary>
+            Returns whether collection contains specified object.
+            </summary>
+            <param name="value">Object to look for.</param>
+            <returns>true if object is part of the collection, otherwise false.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.ElementStyleCollection.Remove(DevComponents.Tree.ElementStyle)">
+            <summary>
+            Removes specified object from the collection.
+            </summary>
+            <param name="value"></param>
+        </member>
+        <member name="M:DevComponents.Tree.ElementStyleCollection.CopyTo(DevComponents.Tree.ElementStyle[],System.Int32)">
+            <summary>
+            Copies collection into the specified array.
+            </summary>
+            <param name="array">Array to copy collection to.</param>
+            <param name="index">Starting index.</param>
+        </member>
+        <member name="M:DevComponents.Tree.ElementStyleCollection.CopyTo(DevComponents.Tree.ElementStyle[])">
+            <summary>
+            Copies contained items to the Node array.
+            </summary>
+            <param name="array">Array to copy to.</param>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyleCollection.Item(System.Int32)">
+            <summary>
+            Returns reference to the object in collection based on it's index.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.ElementStyleCollection.Item(System.String)">
+            <summary>
+            Returns reference to the object in collection based on it's name.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.ElementStyleCollectionEditor">
+            <summary>
+            Support for ElementStyle design-time editor.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.ElementStyleCollectionEditor.#ctor(System.Type)">
+            <summary>Creates new instance of the object.</summary>
+        </member>
+        <member name="T:DevComponents.Tree.ElementStyleDisplay">
+            <summary>
+            Paints the ElementStyle
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.ElementStyleDisplay.#ctor">
+            <summary>Creates new instance of the object.</summary>
+        </member>
+        <member name="M:DevComponents.Tree.ElementStyleDisplay.PaintText(DevComponents.Tree.ElementStyleDisplayInfo,System.String,System.Drawing.Font)">
+            <summary>
+            Paints text for given style.
+            </summary>
+            <param name="e">Display information.</param>
+            <param name="text">Text to paint.</param>
+            <param name="defaultFont">Default font if no font by style is specified.</param>
+        </member>
+        <!-- Badly formed XML comment ignored for member "M:DevComponents.Tree.ElementStyleDisplay.PaintText(DevComponents.Tree.ElementStyleDisplayInfo,System.String,System.Drawing.Font,System.Boolean)" -->
+        <!-- Badly formed XML comment ignored for member "M:DevComponents.Tree.ElementStyleDisplay.PaintText(DevComponents.Tree.ElementStyleDisplayInfo,System.String,System.Drawing.Font,System.Boolean,DevComponents.Tree.eTextFormat)" -->
+        <member name="M:DevComponents.Tree.ElementStyleDisplay.GetStyleRegion(DevComponents.Tree.ElementStyleDisplayInfo)">
+            <summary>Returns new Region object for given ElementStyle.</summary>
+            <returns>New instance of Region object.</returns>
+            <param name="e">Information to describe ElementStyle.</param>
+        </member>
+        <member name="M:DevComponents.Tree.ElementStyleDisplay.GetInsideClip(DevComponents.Tree.ElementStyleDisplayInfo)">
+            <summary>
+            Returns the clipping for the content of the element style.
+            </summary>
+            <param name="e"></param>
+            <returns></returns>
+        </member>
+        <member name="M:DevComponents.Tree.ElementStyleDisplay.Paint(DevComponents.Tree.ElementStyleDisplayInfo)">
+            <summary>
+            Paints the element style on the canvas.
+            </summary>
+            <param name="e">Holds information neccessary to paint style on canvas.</param>
+        </member>
+        <member name="M:DevComponents.Tree.ElementStyleDisplay.PaintBorder(DevComponents.Tree.ElementStyleDisplayInfo)">
+            <summary>
+            Paint style border.
+            </summary>
+            <param name="e">Style display information.</param>
+        </member>
+        <member name="M:DevComponents.Tree.ElementStyleDisplay.PaintBackground(DevComponents.Tree.ElementStyleDisplayInfo)">
+            <summary>
+            Paints style background.
+            </summary>
+            <param name="e">Style display information.</param>
+        </member>
+        <member name="M:DevComponents.Tree.ElementStyleDisplay.PaintBackgroundImage(DevComponents.Tree.ElementStyleDisplayInfo)">
+            <summary>
+            Paints style background image.
+            </summary>
+            <param name="e">Style display information.</param>
+        </member>
+        <member name="M:DevComponents.Tree.ElementStyleDisplay.GetBackgroundRectangle(DevComponents.Tree.ElementStyle,System.Drawing.Rectangle)">
+            <summary>
+            Returns background rectangle for given style by taking in account margins.
+            </summary>
+            <param name="style">Reference to style object.</param>
+            <param name="bounds">Style bounds</param>
+            <returns>Background rectangle.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.ElementStyleDisplay.GetBackgroundPath(DevComponents.Tree.ElementStyle,System.Drawing.Rectangle)">
+            <summary>
+            Returns GraphicsPath for given style.
+            </summary>
+            <param name="style">Reference to style.</param>
+            <param name="bounds">Style bounds.</param>
+            <returns>New instance of GraphicsPath</returns>
+        </member>
+        <member name="M:DevComponents.Tree.ElementStyleDisplay.GetBackgroundPath(DevComponents.Tree.ElementStyle,System.Drawing.Rectangle,DevComponents.Tree.eStyleBackgroundPathPart)">
+            <summary>
+            Returns GraphicsPath for given style.
+            </summary>
+            <param name="style">Reference to style.</param>
+            <param name="bounds">Style bounds.</param>
+            <returns>New instance of GraphicsPath</returns>
+        </member>
+        <member name="T:DevComponents.Tree.ElementStyleDisplayInfo">
+            <summary>
+            Represents information neccessary to paint the style on canvas.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.ElementStyleDisplayInfo.Style">
+            <summary>Reference to ElementStyle object.</summary>
+        </member>
+        <member name="F:DevComponents.Tree.ElementStyleDisplayInfo.Graphics">
+            <summary>Reference to Graphics object.</summary>
+        </member>
+        <member name="F:DevComponents.Tree.ElementStyleDisplayInfo.Bounds">
+            <summary>ElementStyle bounds.</summary>
+        </member>
+        <member name="F:DevComponents.Tree.ElementStyleDisplayInfo.RightToLeft">
+            <summary>Get or sets whether layout is right-to-left.</summary>
+        </member>
+        <member name="M:DevComponents.Tree.ElementStyleDisplayInfo.#ctor">
+            <summary>Creates new instance of the object.</summary>
+        </member>
+        <member name="M:DevComponents.Tree.ElementStyleDisplayInfo.#ctor(DevComponents.Tree.ElementStyle,System.Drawing.Graphics,System.Drawing.Rectangle)">
+            <summary>Creates new instance of the object and initializes it with default values.</summary>
+            <param name="style">Style to initialize object with.</param>
+            <param name="g">Graphics object to initialize object with.</param>
+            <param name="bounds">Bounds to initialize object with.</param>
+        </member>
+        <member name="T:DevComponents.Tree.eStyleBackgroundPathPart">
+            <summary>
+            Specifies part of the background path.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eStyleBackgroundPathPart.Complete">
+            <summary>
+            Indicates complete background path
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eStyleBackgroundPathPart.TopHalf">
+            <summary>
+            Indicates Top half of background path
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eStyleBackgroundPathPart.BottomHalf">
+            <summary>
+            Indicates Bottom half of background path
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.ElementStyleLayout">
+            <summary>
+            Represents the layout for the element style.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.ElementStyleLayout.CalculateStyleSize(DevComponents.Tree.ElementStyle,System.Drawing.Font)">
+            <summary>
+            Calculates size of an style element.
+            </summary>
+            <param name="style">Style to calculate size for.</param>
+            <param name="defaultFont">Default font that will be used by style if style does not uses it's own font.</param>
+            <returns>Size of the style element. At this time only Height memeber will be calculated.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.ElementStyleLayout.HorizontalStyleWhiteSpace(DevComponents.Tree.ElementStyle)">
+            <summary>
+            Returns the total white space for a style. Whitespace is the space between the edge of the element and inner content of the element.
+            </summary>
+            <param name="es">Style to return white space for</param>
+            <returns></returns>
+        </member>
+        <member name="M:DevComponents.Tree.ElementStyleLayout.VerticalStyleWhiteSpace(DevComponents.Tree.ElementStyle)">
+            <summary>
+            Returns the total white space for a style. Whitespace is the space between the edge of the element and inner content of the element.
+            </summary>
+            <param name="es">Style to return white space for.</param>
+            <returns></returns>
+        </member>
+        <member name="M:DevComponents.Tree.ElementStyleLayout.LeftWhiteSpace(DevComponents.Tree.ElementStyle)">
+            <summary>
+            Returns total white space for left side of the style. Whitespace is the space between the edge of the element and inner content of the element.
+            </summary>
+            <param name="es">Style to return white space for.</param>
+            <returns></returns>
+        </member>
+        <member name="M:DevComponents.Tree.ElementStyleLayout.RightWhiteSpace(DevComponents.Tree.ElementStyle)">
+            <summary>
+            Returns total white space for right side of the style. Whitespace is the space between the edge of the element and inner content of the element.
+            </summary>
+            <param name="es">Style to return white space for.</param>
+            <returns></returns>
+        </member>
+        <member name="M:DevComponents.Tree.ElementStyleLayout.TopWhiteSpace(DevComponents.Tree.ElementStyle)">
+            <summary>
+            Returns total white space for top side of the style. Whitespace is the space between the edge of the element and inner content of the element.
+            </summary>
+            <param name="es">Style to return white space for.</param>
+            <returns></returns>
+        </member>
+        <member name="M:DevComponents.Tree.ElementStyleLayout.BottomWhiteSpace(DevComponents.Tree.ElementStyle)">
+            <summary>
+            Returns total white space for top side of the style. Whitespace is the space between the edge of the element and inner content of the element.
+            </summary>
+            <param name="es">Style to return white space for.</param>
+            <returns></returns>
+        </member>
+        <member name="M:DevComponents.Tree.ElementStyleLayout.StyleSpacing(DevComponents.Tree.ElementStyle,DevComponents.Tree.eSpacePart,DevComponents.Tree.eStyleSide)">
+            <summary>
+            Returns amount of spacing for specified style parts.
+            </summary>
+            <param name="es">Style to calculate spacing for.</param>
+            <param name="part">Part of the style spacing is calculated for. Values can be combined.</param>
+            <param name="side">Side of the style to use for calculation.</param>
+            <returns></returns>
+        </member>
+        <member name="M:DevComponents.Tree.ElementStyleLayout.GetInnerRect(DevComponents.Tree.ElementStyle,System.Drawing.Rectangle)">
+            <summary>
+            Gets inner rectangle taking in account style padding, margins and border.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.BackgroundColorBlend">
+            <summary>
+            Defines single color blend point for the multicolor gradient fills.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.BackgroundColorBlend.#ctor">
+            <summary>
+            Creates new instance of the class. When defining multicolor gradinet blends and using the percentage positions the positions created
+            must start with 0f and end with 1f.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.BackgroundColorBlend.#ctor(System.Drawing.Color,System.Single)">
+            <summary>
+            Creates new instance of the class and initialize it with default values.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.BackgroundColorBlend.#ctor(System.Int32,System.Single)">
+            <summary>
+            Creates new instance of the class and initialize it with default values.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.BackgroundColorBlend.Color">
+            <summary>
+            Gets or sets Color to use in multicolor gradient blend at specified position.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.BackgroundColorBlend.Position">
+            <summary>
+            Gets or sets the color position in multicolor gradient blend. Values less or equal to 1 are used as percentage specifing percentages of distance along the gradient line.
+            Values greater than 1 are used as absolute pixel values of distance along the gradient line.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.BackgroundColorBlendCollection">
+            <summary>
+            Represents Collection for the BackgroundColorBlend objects.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.BackgroundColorBlendCollection.#ctor">
+            <summary>Creates new instance of the class.</summary>
+        </member>
+        <member name="M:DevComponents.Tree.BackgroundColorBlendCollection.Add(DevComponents.Tree.BackgroundColorBlend)">
+            <summary>
+            Adds new object to the collection.
+            </summary>
+            <param name="item">Object to add.</param>
+            <returns>Index of newly added object.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.BackgroundColorBlendCollection.AddRange(DevComponents.Tree.BackgroundColorBlend[])">
+            <summary>
+            Adds array of new objects to the collection.
+            </summary>
+            <param name="items">Array of object to add.</param>
+        </member>
+        <member name="M:DevComponents.Tree.BackgroundColorBlendCollection.Insert(System.Int32,DevComponents.Tree.BackgroundColorBlend)">
+            <summary>
+            Inserts new object into the collection.
+            </summary>
+            <param name="index">Position of the object.</param>
+            <param name="value">Object to insert.</param>
+        </member>
+        <member name="M:DevComponents.Tree.BackgroundColorBlendCollection.IndexOf(DevComponents.Tree.BackgroundColorBlend)">
+            <summary>
+            Returns index of the object inside of the collection.
+            </summary>
+            <param name="value">Reference to the object.</param>
+            <returns>Index of the object.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.BackgroundColorBlendCollection.Contains(DevComponents.Tree.BackgroundColorBlend)">
+            <summary>
+            Returns whether collection contains specified object.
+            </summary>
+            <param name="value">Object to look for.</param>
+            <returns>true if object is part of the collection, otherwise false.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.BackgroundColorBlendCollection.Remove(DevComponents.Tree.BackgroundColorBlend)">
+            <summary>
+            Removes specified object from the collection.
+            </summary>
+            <param name="value"></param>
+        </member>
+        <member name="M:DevComponents.Tree.BackgroundColorBlendCollection.CopyTo(DevComponents.Tree.BackgroundColorBlend[],System.Int32)">
+            <summary>
+            Copies collection into the specified array.
+            </summary>
+            <param name="array">Array to copy collection to.</param>
+            <param name="index">Starting index.</param>
+        </member>
+        <member name="M:DevComponents.Tree.BackgroundColorBlendCollection.CopyTo(DevComponents.Tree.BackgroundColorBlend[])">
+            <summary>
+            Copies contained items to the BackgroundColorBlend array.
+            </summary>
+            <param name="array">Array to copy to.</param>
+        </member>
+        <member name="M:DevComponents.Tree.BackgroundColorBlendCollection.GetColorBlend">
+            <summary>
+            Creates ColorBlend object based on the members of the collection. ColorBlend object will be valid only if all members of the collection
+            represents relative/percentage based color blends.
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:DevComponents.Tree.BackgroundColorBlendCollection.CopyFrom(DevComponents.Tree.BackgroundColorBlendCollection)">
+            <summary>
+            Adds the BackgroundColorBlend objects from the collection.
+            </summary>
+            <param name="col">Collection to copy objects from</param>
+        </member>
+        <member name="M:DevComponents.Tree.BackgroundColorBlendCollection.InitializeCollection(DevComponents.Tree.BackgroundColorBlendCollection,System.Int32,System.Int32)">
+            <summary>
+            Initializes the collection with the two color blend.
+            </summary>
+            <param name="collection">Collection to initialize.</param>
+            <param name="backColor1">Start color.</param>
+            <param name="backColor2">End color.</param>
+        </member>
+        <member name="M:DevComponents.Tree.BackgroundColorBlendCollection.InitializeCollection(DevComponents.Tree.BackgroundColorBlendCollection,System.Drawing.Color,System.Drawing.Color)">
+            <summary>
+            Initializes the collection with the two color blend.
+            </summary>
+            <param name="collection">Collection to initialize.</param>
+            <param name="backColor1">Start color.</param>
+            <param name="backColor2">End color.</param>
+        </member>
+        <member name="P:DevComponents.Tree.BackgroundColorBlendCollection.Item(System.Int32)">
+            <summary>
+            Returns reference to the object in collection based on it's index.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.BackgroundColorBlendConverter">
+            <summary>
+            Represents BackgroundColorBlend object converter.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.IElementStyleClassProvider">
+            <summary>
+            Defines the provider for the element style classes support.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.IElementStyleClassProvider.GetClass(System.String)">
+            <summary>
+            Returns the instance of the ElementStyle with given class name or null if there is no class with that name defined.
+            </summary>
+            <param name="className">Class name. See static members of ElementStyleClassKeys class for the list of available keys.</param>
+            <returns>Instance of ElementStyle for given class name or null if class cannot be found.</returns>
+        </member>
+        <member name="T:DevComponents.Tree.eStyleBackgroundImage">
+            <summary>Specifies the way background image is displayed on background.</summary>
+        </member>
+        <member name="F:DevComponents.Tree.eStyleBackgroundImage.Stretch">
+            <summary>Image is stretched to fill the background</summary>
+        </member>
+        <member name="F:DevComponents.Tree.eStyleBackgroundImage.Center">
+            <summary>Image is centered inside the background</summary>
+        </member>
+        <member name="F:DevComponents.Tree.eStyleBackgroundImage.Tile">
+            <summary>Image is tiled inside the background</summary>
+        </member>
+        <member name="F:DevComponents.Tree.eStyleBackgroundImage.TopLeft">
+            <summary>
+            Image is drawn in top left corner of container space.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eStyleBackgroundImage.TopRight">
+            <summary>
+            Image is drawn in top right corner of container space.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eStyleBackgroundImage.BottomLeft">
+            <summary>
+            Image is drawn in bottom left corner of container space.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eStyleBackgroundImage.BottomRight">
+            <summary>
+            Image is drawn in bottom right corner of container space.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.eCellPartAlignment">
+            <summary>Indicates alignment of a part of the cell like image or check box in relation to the text.</summary>
+        </member>
+        <member name="F:DevComponents.Tree.eCellPartAlignment.NearCenter">
+            <summary>
+            Part is aligned to the left center of the text assuming left-to-right
+            orientation.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eCellPartAlignment.FarCenter">
+            <summary>
+            Part is aligned to the right center of the text assuming left-to-right
+            orientation.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eCellPartAlignment.NearTop">
+            <summary>
+            Part is aligned to the top left of the text assuming left-to-right
+            orientation.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eCellPartAlignment.CenterTop">
+            <summary>Part is aligned above the text and centered.</summary>
+        </member>
+        <member name="F:DevComponents.Tree.eCellPartAlignment.FarTop">
+            <summary>
+            Part is aligned to the top right of the text assuming left-to-right
+            orientation.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eCellPartAlignment.NearBottom">
+            <summary>
+            Part is aligned to the bottom left of the text assuming left-to-right
+            orientation.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eCellPartAlignment.CenterBottom">
+            <summary>Part is aligned below the text and centered.</summary>
+        </member>
+        <member name="F:DevComponents.Tree.eCellPartAlignment.FarBottom">
+            <summary>
+            Part is aligned to the bottom right of the text assuming left-to-right
+            orientation.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.eStyleTextAlignment">
+            <summary>
+            Specifies the alignment of a text string relative to its element's rectangle.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eStyleTextAlignment.Near">
+            <summary>
+            Specifies the text be aligned near from the origin position of the element's rectangle. In a left-to-right layout, the near position is left. In a right-to-left layout, the near position is right.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eStyleTextAlignment.Center">
+            <summary>
+            Specifies that text is aligned in the center of the element's rectangle.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eStyleTextAlignment.Far">
+            <summary>
+            Specifies that text is aligned far from the origin position of the element's rectangle. In a left-to-right layout, the far position is right. In a right-to-left layout, the far position is left.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.eStyleTextTrimming">
+            <summary>
+            Specifies how to trim characters from a text that does not completely fit into a element's shape.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eStyleTextTrimming.Character">
+            <summary>
+            Specifies that the text is trimmed to the nearest character.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eStyleTextTrimming.EllipsisCharacter">
+            <summary>
+            Specifies that the text is trimmed to the nearest character, and an ellipsis is inserted at the end of a trimmed line.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eStyleTextTrimming.EllipsisPath">
+            <summary>
+            The center is removed from trimmed lines and replaced by an ellipsis. The algorithm keeps as much of the last slash-delimited segment of the line as possible.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eStyleTextTrimming.EllipsisWord">
+            <summary>
+            Specifies that text is trimmed to the nearest word, and an ellipsis is inserted at the end of a trimmed line.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eStyleTextTrimming.None">
+            <summary>
+            Specifies no trimming.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eStyleTextTrimming.Word">
+            <summary>
+            Specifies that text is trimmed to the nearest word.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.eStyleBorderType">
+            <summary>
+            Specifies the border type for style element.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eStyleBorderType.None">
+            <summary>Indicates no border</summary>
+        </member>
+        <member name="F:DevComponents.Tree.eStyleBorderType.Solid">
+            <summary>Border is a solid line</summary>
+        </member>
+        <member name="F:DevComponents.Tree.eStyleBorderType.Dash">
+            <summary>Border is a solid dash line</summary>
+        </member>
+        <member name="F:DevComponents.Tree.eStyleBorderType.DashDot">
+            <summary>Border is solid dash-dot line</summary>
+        </member>
+        <member name="F:DevComponents.Tree.eStyleBorderType.DashDotDot">
+            <summary>Border is solid dash-dot-dot line</summary>
+        </member>
+        <member name="F:DevComponents.Tree.eStyleBorderType.Dot">
+            <summary>Border consists of dots</summary>
+        </member>
+        <member name="F:DevComponents.Tree.eStyleBorderType.Etched">
+            <summary>Etched Border</summary>
+        </member>
+        <member name="F:DevComponents.Tree.eStyleBorderType.Double">
+            <summary>Double Border</summary>
+        </member>
+        <member name="T:DevComponents.Tree.eVerticalAlign">
+            <summary>
+            Indicates absolute vertical alignment of the content.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eVerticalAlign.Top">
+            <summary>
+            Content is aligned to the top
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eVerticalAlign.Middle">
+            <summary>
+            Content is aligned in the middle
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eVerticalAlign.Bottom">
+            <summary>
+            Content is aligned at the bottom
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.eHorizontalAlign">
+            <summary>
+            Indicates absolute horizontal alignment
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eHorizontalAlign.Left">
+            <summary>
+            Content is left aligned
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eHorizontalAlign.Center">
+            <summary>
+            Content is centered
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eHorizontalAlign.Right">
+            <summary>
+            Content is right aligned
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.eMapPosition">
+            <summary>
+            Indicates prefered node layout position on Map tree layout when node is the child node of the top-level root node.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eMapPosition.Default">
+            <summary>
+            Node is positioned based on default algorithm.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eMapPosition.Near">
+            <summary>
+            Sub-root node and all nodes after it are positioned to the left of the root.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eMapPosition.Far">
+            <summary>
+            Sub-root node and all nodes before it are positioned to the right of the root.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.eCornerType">
+            <summary>
+            Indicates corner type for the border around visual element.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eCornerType.Inherit">
+            <summary>
+            Specifies that corner type is inherited from parent setting.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eCornerType.Square">
+            <summary>
+            Specifies square corner.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eCornerType.Rounded">
+            <summary>
+            Specifies rounded corner.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eCornerType.Diagonal">
+            <summary>
+            Specifies diagonal corner.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.eNodeHeaderVisibility">
+            <summary>
+            Specifies the column header visibility for the node.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eNodeHeaderVisibility.Automatic">
+            <summary>
+            Column header is automatically shown/hidden based on the node's position in the tree. When
+            Node is first child node i.e. with index=0 the header will be shown, otherwise header will
+            be hidden.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eNodeHeaderVisibility.AlwaysShow">
+            <summary>
+            Column header is always displayed regardless of node's position.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eNodeHeaderVisibility.AlwaysHide">
+            <summary>
+            Column header is always hidden regardless of node's position.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.eNodeRectanglePart">
+            <summary>
+            Indicates the part of the node.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eNodeRectanglePart.NodeContentBounds">
+            <summary>
+            Bounds of complete node content except expand button. This also includes the child node bounds if node is expanded.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eNodeRectanglePart.ExpandBounds">
+            <summary>
+            Bounds of the expand button which collapses/expands the node.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eNodeRectanglePart.ChildNodeBounds">
+            <summary>
+            Bounds of all child nodes of give node.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eNodeRectanglePart.CellsBounds">
+            <summary>
+            Bounds for cells inside a node.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eNodeRectanglePart.NodeBounds">
+            <summary>
+            Complete node bounds including expand button.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eNodeRectanglePart.CommandBounds">
+            <summary>
+            Bounds of the command button.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.eCellRectanglePart">
+            <summary>
+            Indicates the part of the cell.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eCellRectanglePart.CheckBoxBounds">
+            <summary>
+            Bounds of check box or Rectangle.Empty if there is no check-box.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eCellRectanglePart.ImageBounds">
+            <summary>
+            Bounds of image inside the cell or Rectangle.Empty if there is no image.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eCellRectanglePart.TextBounds">
+            <summary>
+            Text bounds inside of cell.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eCellRectanglePart.CellBounds">
+            <summary>
+            Cell bounds
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.eMouseOverNodePart">
+            <summary>
+            Indicates part of the node mouse is placed over.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eMouseOverNodePart.None">
+            <summary>
+            Mouse is not over any node part.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eMouseOverNodePart.Node">
+            <summary>
+            Mouse is placed over the node.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eMouseOverNodePart.Expand">
+            <summary>
+            Mouse is placed over node expand button.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eMouseOverNodePart.Cell">
+            <summary>
+            Mouse is placed over the cell.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eMouseOverNodePart.Command">
+            <summary>
+            Mouse is placed over the command button.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.eSpacePart">
+            <summary>
+            Indicates white-space part of the style.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eSpacePart.Padding">
+            <summary>
+            Represents style padding.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eSpacePart.Border">
+            <summary>
+            Represents style border.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eSpacePart.Margin">
+            <summary>
+            Represents style margin.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.eStyleSide">
+            <summary>
+            Indicates the style side.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eStyleSide.Left">
+            <summary>
+            Specifies left side of the style.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eStyleSide.Right">
+            <summary>
+            Specifies right side of the style.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eStyleSide.Top">
+            <summary>
+            Specifies top side of the style.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eStyleSide.Bottom">
+            <summary>
+            Specifies bottom side of the style.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.eNodeExpandVisibility">
+            <summary>
+            Indicates the visibility of node expand part which allows user to expand/collaps node.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eNodeExpandVisibility.Auto">
+            <summary>
+            Default setting which indicates that when node has child nodes expand part is visible otherwise it is hidden.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eNodeExpandVisibility.Visible">
+            <summary>
+            Expand part is always visible regardless of whether child nodes are present or not.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eNodeExpandVisibility.Hidden">
+            <summary>
+            Expand part is always hidden regardless of whether child nodes are present or not.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.eTreeAction">
+            <summary>
+            Specifies the action that raised a TreeGXEventArgs event
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eTreeAction.Keyboard">
+            <summary>
+            The event was caused by a keystroke.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eTreeAction.Mouse">
+            <summary>
+            The event was caused by a mouse operation.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eTreeAction.Collapse">
+            <summary>
+            The event was caused by the Node collapsing.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eTreeAction.Expand">
+            <summary>
+            The event was caused by the Node expanding.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eTreeAction.Code">
+            <summary>
+            The event is caused programmatically from user code.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.eNodeConnectorType">
+            <summary>
+            Specifies node connector type. Node connector is the type of the line/connection that is drawn to connect child node to it's parent node.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eNodeConnectorType.Curve">
+            <summary>
+            Curved line connector type.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eNodeConnectorType.Line">
+            <summary>
+            Straight line connector type.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.eConnectorCap">
+            <summary>
+            Specifies the cap style with which the connector line will start or end.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eConnectorCap.None">
+            <summary>
+            Specifies no cap.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eConnectorCap.Ellipse">
+            <summary>
+            Round cap type.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eConnectorCap.Arrow">
+            <summary>
+            Arrow cap type.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.eCellLayout">
+            <summary>
+            Specifies the layout type used to position the cells within the nodes.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eCellLayout.Default">
+            <summary>
+            Specifies that default setting is to be used for cell layout. Default is Horizontal. When set to default on the Node, setting from Tree control is used.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eCellLayout.Horizontal">
+            <summary>Horizontal layout positions the cells horizontally next to each other.</summary>
+        </member>
+        <member name="F:DevComponents.Tree.eCellLayout.Vertical">
+            <summary>
+            Vertical layout positions cell vertically on top of each other.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.eCellPartLayout">
+            <summary>
+            Specifies the layout type used to position the parts of the cell like image, checkbox and text.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eCellPartLayout.Default">
+            <summary>
+            Specifies that default setting is to be used for cell parts layout. Default is Horizontal. When set to default on the Cell, setting from Tree control is used.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eCellPartLayout.Horizontal">
+            <summary>Horizontal layout positions the parts of the cell horizontally next to each other.</summary>
+        </member>
+        <member name="F:DevComponents.Tree.eCellPartLayout.Vertical">
+            <summary>
+            Vertical layout positions parts of the cell vertically on top of each other.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.eColorSchemeStyle">
+            <summary>
+            Specifies the color scheme loaded by ColorScheme object.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eColorSchemeStyle.Office2003">
+            <summary>
+            Indicates Office 2003 like color scheme.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eColorSchemeStyle.OfficeXP">
+            <summary>
+            Indicates Office XP like color scheme.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eColorSchemeStyle.VS2005">
+            <summary>
+            Indicates VS.NET 2005 like color scheme.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.eWinXPColorScheme">
+            <summary>
+            Specifies the currently selected system color scheme if running on Windows XP.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eWinXPColorScheme.Undetermined">
+            <summary>
+            Color scheme cannot be determined.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eWinXPColorScheme.Blue">
+            <summary>
+            Blue color scheme.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eWinXPColorScheme.OliveGreen">
+            <summary>
+            Olive green color scheme.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eWinXPColorScheme.Silver">
+            <summary>
+            Silver color scheme.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.eDiagramFlow">
+            <summary>
+            Specifies the flow of diagram layout related to the root node.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eDiagramFlow.LeftToRight">
+            <summary>
+            Nodes are positioned from left to right with root node being the left-most node.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eDiagramFlow.RightToLeft">
+            <summary>
+            Nodes are positioned from right to left with root node being the right-most
+            node.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eDiagramFlow.TopToBottom">
+            <summary>
+            Nodes are positioned from top to bottom with root node being the top node.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eDiagramFlow.BottomToTop">
+            <summary>
+            Nodes are positioned from bottom to top with root node being bottom node.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.eMapFlow">
+            <summary>
+            Specifies the flow of the map layout.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eMapFlow.Spread">
+            <summary>
+            Nodes are arranged around the root node.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eMapFlow.TopToBottom">
+            <summary>
+            Nodes are arranged from below the root node.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eMapFlow.BottomToTop">
+            <summary>
+            Nodes are arranged above the root node.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eMapFlow.LeftToRight">
+            <summary>
+            Nodes are arranged to the right of the root node.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eMapFlow.RightToLeft">
+            <summary>
+            Nodes are arranged to the left of the root node.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.eExpandButtonType">
+            <summary>
+            Specifies the type of the expand button.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eExpandButtonType.Ellipse">
+            <summary>
+            Indicates elliptical expand button.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eExpandButtonType.Rectangle">
+            <summary>
+            Indicates rectangular expand button.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eExpandButtonType.Image">
+            <summary>
+            Indicates that images are used for expand button. See 
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.eVisualStyle">
+            <summary>
+            Specifies the visual style for the tree control.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eVisualStyle.Default">
+            <summary>
+            Indicates default visual style.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.eNodeLayout">
+            <summary>
+            Specifies the layout type for the nodes.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eNodeLayout.Map">
+            <summary>
+            Nodes are arranged arround root node in map format.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eNodeLayout.Diagram">
+            <summary>
+            Nodes are arranged from left-to-right in diagram format.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.eNodeRenderMode">
+            <summary>
+            Specifies renderer type used to render nodes.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eNodeRenderMode.Default">
+            <summary>
+            Specifies default renderer which allows most customization through TreeGX
+            properties. Default renderer integrates with the Style architecture to provide
+            customization on renderer behavior.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eNodeRenderMode.Professional">
+            <summary>
+            	<para>Specifies professional renderer. Professional renderer is custom renderer
+                which does not rely on Style architecture for customization of renderer appearance
+                since it provides much richer appearance than Default renderer.</para>
+            	<para>Professional renderer colors can be controls through
+                NodeProfessionalColorTable object which is exposed by
+                NodeProfessionalRenderer.ColorTable property.</para>
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.eNodeRenderMode.Custom">
+            <summary>
+            Specifies that custom renderer is used. When set you must also set NodeRenderer
+            to renderer you want to use.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.TreeGXCellEventHandler">
+            <summary>
+            Defines the delegate for TreeGX cell based action events.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.TreeGXCellCancelEventHandler">
+            <summary>
+            Defines the delegate for TreeGX cell based action events.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.TreeGXNodeCancelEventHandler">
+            <summary>
+            Defines the delegate for TreeGX node based action events that can be cancelled.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.TreeGXNodeEventHandler">
+            <summary>
+            Defines the delegate for TreeGX node based action events.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.CommandButtonEventHandler">
+            <summary>
+            Defines delegate for Command button events.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.CellEditEventHandler">
+            <summary>
+            Defines delegate for label editing events.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.TreeGXNodeCollectionEventHandler">
+            <summary>
+            Defines the delegate for TreeGX node based action events.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.TreeGXDragDropEventHandler">
+            <summary>
+            Defines the delegate for BeforeNodeDrop and AfterNodeDrop events
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.TreeGXNodeMouseEventHandler">
+            <summary>
+            Defines the delegate for mouse based node events
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.NodeRendererEventHandler">
+            <summary>
+            Defines delegate for node rendering events.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.NodeCellRendererEventHandler">
+            <summary>
+            Defines delegate for cell rendering events.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.NodeExpandPartRendererEventHandler">
+            <summary>
+            Defines delegate for RenderExpandPart event.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.NodeCommandPartRendererEventHandler">
+            <summary>
+            Defines delegate for RenderExpandPart event.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.SelectionRendererEventHandler">
+            <summary>
+            Defines delegate for RenderExpandPart event.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.ConnectorRendererEventHandler">
+            <summary>
+            Defines delegate for RenderConnector event.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.TreeBackgroundRendererEventHandler">
+            <summary>
+            Defines delegate for TreeBackgroundRenderer events.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.MarkupLinkClickEventArgs">
+            <summary>
+            Provides more information about MarkupLinkClick event.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.MarkupLinkClickEventArgs.HRef">
+            <summary>
+            Gets the value of href attribute from the markup link that was clicked.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.MarkupLinkClickEventArgs.Name">
+            <summary>
+            Gets the value of name attribute from the markup link that was clicked.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.MarkupLinkClickEventArgs.#ctor(System.String,System.String)">
+            <summary>
+            Creates new instance of the object.
+            </summary>
+            <param name="name">Value of name attribute.</param>
+            <param name="href">Value of href attribute.</param>
+        </member>
+        <member name="T:DevComponents.Tree.MarkupLinkClickEventHandler">
+            <summary>
+            Defines delegate for MarkupLinkClick event.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.SerializeNodeEventArgs">
+            <summary>
+            Represents arguments for SerializeNode event which allows you to add custom serialization data to definitions saved by control.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.SerializeNodeEventArgs.Node">
+            <summary>
+            Gets reference to the node being serialized or de-serialized.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.SerializeNodeEventArgs.ItemXmlElement">
+            <summary>
+            Gets reference to instance of XmlElement that item is serialized to or is being de-serialized from. You should not change any data directly on this element.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.SerializeNodeEventArgs.CustomXmlElement">
+            <summary>
+            Gets the reference to XmlElement that you can serialize to or de-serialize any custom data from. You can add child elements or set the attributes on
+            this XmlElement when handling SerializeItem event. When handling DeserializeItem event you can load your data from this element.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.SerializeNodeEventHandler">
+            <summary>
+            Defines delegate for SerializeItem event.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.HeaderDefinition">
+            <summary>
+            Represents the table header.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.HeaderDefinition.#ctor">
+            <summary>
+            Default constructor.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.HeaderDefinition.Columns">
+            <summary>
+            Gets the reference to the collection that contains the columns associated with header.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.HeaderDefinition.Name">
+            <summary>
+            Gets or sets the name associated with this header definition.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.HeadersCollection">
+            <summary>
+            Represents collection for HeaderDefinition objects.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.HeadersCollection.SetParent(DevComponents.Tree.TreeGX)">
+            <summary>
+            Sets the node collection belongs to.
+            </summary>
+            <param name="parent">HeaderDefinition that is parent of this collection.</param>
+        </member>
+        <member name="M:DevComponents.Tree.HeadersCollection.Add(DevComponents.Tree.HeaderDefinition)">
+            <summary>
+            Adds new object to the collection.
+            </summary>
+            <param name="ch">Object to add.</param>
+            <returns>Index of newly added object.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.HeadersCollection.Insert(System.Int32,DevComponents.Tree.HeaderDefinition)">
+            <summary>
+            Inserts new object into the collection.
+            </summary>
+            <param name="index">Position of the object.</param>
+            <param name="value">Object to insert.</param>
+        </member>
+        <member name="M:DevComponents.Tree.HeadersCollection.IndexOf(DevComponents.Tree.HeaderDefinition)">
+            <summary>
+            Returns index of the object inside of the collection.
+            </summary>
+            <param name="value">Reference to the object.</param>
+            <returns>Index of the object.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.HeadersCollection.Contains(DevComponents.Tree.HeaderDefinition)">
+            <summary>
+            Returns whether collection contains specified object.
+            </summary>
+            <param name="value">Object to look for.</param>
+            <returns>true if object is part of the collection, otherwise false.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.HeadersCollection.Remove(DevComponents.Tree.HeaderDefinition)">
+            <summary>
+            Removes specified object from the collection.
+            </summary>
+            <param name="value"></param>
+        </member>
+        <member name="M:DevComponents.Tree.HeadersCollection.CopyTo(DevComponents.Tree.HeaderDefinition[],System.Int32)">
+            <summary>
+            Copies collection into the specified array.
+            </summary>
+            <param name="array">Array to copy collection to.</param>
+            <param name="index">Starting index.</param>
+        </member>
+        <member name="M:DevComponents.Tree.HeadersCollection.CopyTo(DevComponents.Tree.HeaderDefinition[])">
+            <summary>
+            Copies contained items to the HeaderDefinition array.
+            </summary>
+            <param name="array">Array to copy to.</param>
+        </member>
+        <member name="P:DevComponents.Tree.HeadersCollection.Parent">
+            <summary>
+            Gets or sets the node this collection is associated with.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.HeadersCollection.Item(System.Int32)">
+            <summary>
+            Returns reference to the object in collection based on it's index.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.Helpers.SystemHelpers">
+            <summary>
+            Defines various system information based helper functions.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.ImageIndexEditor">
+            <summary>
+            Represents the class used by windows forms editor for picking an image from image list.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.INodeNotify">
+            <summary>
+            Specifies the notification interface that node uses to communicate status changes to it's parent tree.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.INodeNotify.ExpandedChanged(DevComponents.Tree.Node)">
+            <summary>Called when Node.Expanded property has changed.</summary>
+            <param name="node">Node which Expanded property has changed.</param>
+        </member>
+        <member name="M:DevComponents.Tree.INodeNotify.OnBeforeCollapse(DevComponents.Tree.TreeGXNodeCancelEventArgs)">
+            <summary>Called before node is collapsed</summary>
+            <param name="e">Context information.</param>
+        </member>
+        <member name="M:DevComponents.Tree.INodeNotify.OnBeforeExpand(DevComponents.Tree.TreeGXNodeCancelEventArgs)">
+            <summary>Called before node is expanded</summary>
+            <param name="e">Context information.</param>
+        </member>
+        <member name="M:DevComponents.Tree.INodeNotify.OnAfterCollapse(DevComponents.Tree.TreeGXNodeEventArgs)">
+            <summary>Called after node is collapsed.</summary>
+            <param name="e">Context information.</param>
+        </member>
+        <member name="M:DevComponents.Tree.INodeNotify.OnAfterExpand(DevComponents.Tree.TreeGXNodeEventArgs)">
+            <summary>Called after node is expanded</summary>
+            <param name="e">Context information</param>
+        </member>
+        <member name="T:DevComponents.Tree.Interop.WinApi">
+            <summary>
+            Provides WinApi functions to rest of the application.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.Interop.WinApi.ResetHover(System.Windows.Forms.Control)">
+            <summary>
+            Resets Hoover timer for specified control.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.KeyNavigation">
+            <summary>
+            Provides TreeGX Keyboard handling.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.Layout.ColumnHeaderLayout">
+            <summary>
+            Class that is used to layout column header.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.Layout.CellLayout">
+            <summary>
+            Represents class for Node's cell layout.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.Layout.CellLayout.Offset(DevComponents.Tree.Cell,System.Int32,System.Int32)">
+            <summary>
+            Offset cell bounds, check box bounds, image bounds and text bounds by specified offset.
+            </summary>
+            <param name="cell">Cell to offset.</param>
+            <param name="x">Horizontal offset in pixels.</param>
+            <param name="y">Vertical offset in pixels.</param>
+        </member>
+        <member name="P:DevComponents.Tree.Layout.CellLayout.ImageCheckBoxSpacing">
+            <summary>
+            Returns spacing between check box and image if both are displayed
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Layout.CellLayout.ImageTextSpacing">
+            <summary>
+            Returns spacing between image or checkbox and text
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Layout.CellLayout.CellHorizontalSpacing">
+            <summary>
+            Returns horizontal spacing between cells in a node
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Layout.CellLayout.CellVerticalSpacing">
+            <summary>
+            Returns vertical spacing between cells in a node
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Layout.CellLayout.CellPartSpacing">
+            <summary>
+            Spacing between different parts of the cell, like image, option button, text and expand button area
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.Layout.NodeDiagramLayout">
+            <summary>
+            Represents the class that performs node diagram layout.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.Layout.NodeLayout">
+            <summary>
+            Summary description for NodeLayout.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.Layout.NodeLayout.PerformLayout">
+            <summary>
+            Performs layout of the nodes inside of the tree control.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.Layout.NodeLayout.PerformSingleNodeLayout(DevComponents.Tree.Node)">
+            <summary>
+            Performs layout for single unassigned node. Node does not have to be part of the tree control.
+            </summary>
+            <param name="node">Node to perform layout on.</param>
+        </member>
+        <member name="M:DevComponents.Tree.Layout.NodeLayout.PrepareStyles">
+            <summary>
+            Resizes all styles and prepares them for layout.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.Layout.NodeLayout.GetDefaultColumnInfo">
+            <summary>
+            Returns default top-level columns for tree control.
+            </summary>
+            <returns>Returns array list of ColumnInfo objects.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.Layout.NodeLayout.GetNodeColumnInfo(DevComponents.Tree.Node)">
+            <summary>
+            Returns column information for a given node.
+            </summary>
+            <param name="node">Node to return column information for</param>
+            <returns>Returns array list of ColumnInfo objects or null if there are no columns defined.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.Layout.NodeLayout.GetColumnHeader(System.String)">
+            <summary>
+            Returns column header collection for the given column template name.
+            </summary>
+            <param name="name">Name of the column template.</param>
+            <returns>Column header collection or null if template name cannot be found.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.Layout.NodeLayout.LayoutCommandPart(DevComponents.Tree.Layout.NodeLayoutContextInfo,DevComponents.Tree.ElementStyle)">
+            <summary>
+            Sets the position and size of the node command button.
+            </summary>
+            <param name="layoutInfo">Node layout context information</param>
+        </member>
+        <member name="M:DevComponents.Tree.Layout.NodeLayout.LayoutExpandPart(DevComponents.Tree.Layout.NodeLayoutContextInfo,System.Boolean)">
+            <summary>
+            Determines the rectangle of the +/- part of the tree node that is used to expand node.
+            </summary>
+            <param name="layoutInfo">Node layout context information</param>
+        </member>
+        <member name="M:DevComponents.Tree.Layout.NodeLayout.GetExpandPartSize">
+            <summary>
+            Returns the size of the node expand part.
+            </summary>
+            <returns>Size of the expand part, default 8,8.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.Layout.NodeLayout.LayoutNode(DevComponents.Tree.Layout.NodeLayoutContextInfo)">
+            <summary>
+            Provides the layout for single node.
+            </summary>
+            <param name="layoutInfo">Layout information.</param>
+        </member>
+        <member name="M:DevComponents.Tree.Layout.NodeLayout.HasExpandPart(DevComponents.Tree.Layout.NodeLayoutContextInfo)">
+            <summary>
+            Returns true if given node has expand part.
+            </summary>
+            <param name="layoutInfo">Layout context information.</param>
+            <returns></returns>
+        </member>
+        <member name="M:DevComponents.Tree.Layout.NodeLayout.HasCommandPart(DevComponents.Tree.Layout.NodeLayoutContextInfo)">
+            <summary>
+            Returns whether given node has command part.
+            </summary>
+            <param name="layoutInfo">Layout context information.</param>
+            <returns>True if command part should be drawn otherwise false.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.Layout.NodeLayout.GetCellLayout">
+            <summary>
+            Returns class responsible for cell layout.
+            </summary>
+            <returns>Cell layout class.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.Layout.NodeLayout.OffsetNodeLocation(DevComponents.Tree.Node,System.Int32,System.Int32)">
+            <summary>
+            Offsets node location and location of it's child nodes bounds.
+            </summary>
+            <param name="node">Node to offset.</param>
+            <param name="x">Horizontal offset.</param>
+            <param name="y">Vertical offset.</param>
+        </member>
+        <member name="P:DevComponents.Tree.Layout.NodeLayout.NodeVerticalSpacing">
+            <summary>
+            Gets or sets the vertical spacing between nodes in pixels.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Layout.NodeLayout.NodeHorizontalSpacing">
+            <summary>
+            Gets or sets the horizontal spacing between nodes in pixels.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Layout.NodeLayout.TreeLayoutChildNodeIndent">
+            <summary>
+            Gets or sets the child node indent in pixels.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Layout.NodeLayout.ExpandAreaWidth">
+            <summary>
+            Returns width of the expand button area. Default is 8 pixels.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Layout.NodeLayout.CommandAreaWidth">
+            <summary>
+            Gets or sets width of command button area. Default is 8 pixels.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Layout.NodeLayout.ExpandPartSize">
+            <summary>
+            Gets or sets the size of the expand part that is expanding/collapsing the node. Default value is 8,8.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Layout.NodeLayout.RootHasExpandedPart">
+            <summary>
+            Returns true if root node should have expanded part
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Layout.NodeLayout.ReserveExpandPartSpace">
+            <summary>
+            Returns true if expand part space should be accounted for even if they expand part is not visible or need to be displayed. Default value is false.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Layout.NodeDiagramLayout.RootHasExpandedPart">
+            <summary>
+            Returns true if root node should have expanded part
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Layout.NodeDiagramLayout.DiagramFlow">
+            <summary>
+            Indicates the layout flow for the nodes.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.Layout.NodeLayoutContextInfo">
+            <summary>
+            Used to pass node contextual information used for layout of the node.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.Layout.NodeListLayout">
+            <summary>
+            Internal class that orders one level of the nodes in list like layout. Nodes are ordered from top to bottom.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.Layout.NodeMapLayout">
+            <summary>
+            Represents the class that performs node map layout.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Layout.NodeMapLayout.RootHasExpandedPart">
+            <summary>
+            Returns true if root node should have expanded part
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Layout.NodeMapLayout.MapFlow">
+            <summary>
+            Gets or sets the flow of the sub-root nodes for Map layout.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.Layout.NodeTreeLayout">
+            <summary>
+            Summary description for NodeTreeLayout.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.Layout.NodeTreeLayout.ExpandPartAlignedNear(DevComponents.Tree.Node)">
+            <summary>
+            Gets whether the expand part of the node +/- is aligned to the left of the node in left-to-right layout.
+            </summary>
+            <param name="node">Node to get expand part alignment for</param>
+            <returns>true if node expand part is aligned to the left in left-to-right layout.</returns>
+        </member>
+        <member name="P:DevComponents.Tree.Layout.NodeTreeLayout.ReserveExpandPartSpace">
+            <summary>
+            Returns true if expand part space should be accounted for even if they expand part is not visible or need to be displayed. Default value is false.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.LinkedNode">
+            <summary>
+            Represents a description of linked node and any connector points that link nodes.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.LinkedNode.#ctor">
+            <summary>
+            Creates new instance of the object.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.LinkedNode.#ctor(DevComponents.Tree.Node)">
+            <summary>
+            Creates new instance of the object.
+            </summary>
+            <param name="linkedNode">Linkded node to initialize new instace with.</param>
+        </member>
+        <member name="M:DevComponents.Tree.LinkedNode.#ctor(DevComponents.Tree.Node,DevComponents.Tree.ConnectorPointsCollection)">
+            <summary>
+            Creates new instance of the object.
+            </summary>
+            <param name="linkedNode">Linkded node to initialize new instace with.</param>
+            <param name="connectorPoints">Connector points collection to initialize new instance with.</param>
+        </member>
+        <member name="M:DevComponents.Tree.LinkedNode.SetParent(DevComponents.Tree.Node)">
+            <summary>
+            Sets the parent node.
+            </summary>
+            <param name="node">Reference to parent node.</param>
+        </member>
+        <member name="P:DevComponents.Tree.LinkedNode.Node">
+            <summary>
+            Gets or sets reference to linked node.
+            </summary>
+            <remarks>
+            Linked nodes are nodes that are related to given node but do not have strict
+            parent child relationship with the node. Each linked node must be already added as
+            child node to some other node or it will not be displayed. Linked nodes are used in Map
+            and Diagram layout styles to indicates relationships between nodes. Also See TreeGX.LinkConnector property.
+            </remarks>
+        </member>
+        <member name="P:DevComponents.Tree.LinkedNode.ConnectorPoints">
+            <summary>
+            Gets the collection of the link connector line relative points. If a node has a link to this node through LinkedNodes collection
+            this these points outline the path connector will be drawn through from this node to it's parent linked node. By default this collection is empty which indicates that
+            connector line is drawn using predefined path. Points added here are the points through which the connector line will travel to the
+            parent node. The point coordinates added to this collection are relative from the top-left corner of this node.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.LinkedNode.Parent">
+            <summary>
+            Gets the Node this linked node description is attached to.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.LinkedNodesCollection">
+            <summary>
+            Represents collection of LinkedNode objects that describe linked node properties.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.LinkedNodesCollection.#ctor">
+            <summary>
+            Default constructor.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.LinkedNodesCollection.SetParentNode(DevComponents.Tree.Node)">
+            <summary>
+            Sets the node collection belongs to.
+            </summary>
+            <param name="parent">Node that is parent of this collection.</param>
+        </member>
+        <member name="M:DevComponents.Tree.LinkedNodesCollection.Add(DevComponents.Tree.LinkedNode)">
+            <summary>
+            Adds new object to the collection.
+            </summary>
+            <param name="p">Object to add.</param>
+            <returns>Index of newly added object.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.LinkedNodesCollection.AddRange(DevComponents.Tree.LinkedNode[])">
+            <summary>
+            Adds range of objects to the array.
+            </summary>
+            <param name="ap">Array to add.</param>
+        </member>
+        <member name="M:DevComponents.Tree.LinkedNodesCollection.ToArray">
+            <summary>
+            Copies objects of the collection to the array.
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:DevComponents.Tree.LinkedNodesCollection.Insert(System.Int32,DevComponents.Tree.LinkedNode)">
+            <summary>
+            Inserts new object into the collection.
+            </summary>
+            <param name="index">Position of the object.</param>
+            <param name="value">Object to insert.</param>
+        </member>
+        <member name="M:DevComponents.Tree.LinkedNodesCollection.IndexOf(DevComponents.Tree.LinkedNode)">
+            <summary>
+            Returns index of the object inside of the collection.
+            </summary>
+            <param name="value">Reference to the object.</param>
+            <returns>Index of the object.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.LinkedNodesCollection.Contains(DevComponents.Tree.LinkedNode)">
+            <summary>
+            Returns whether collection contains specified object.
+            </summary>
+            <param name="value">Object to look for.</param>
+            <returns>true if object is part of the collection, otherwise false.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.LinkedNodesCollection.Remove(DevComponents.Tree.LinkedNode)">
+            <summary>
+            Removes specified object from the collection.
+            </summary>
+            <param name="value"></param>
+        </member>
+        <member name="M:DevComponents.Tree.LinkedNodesCollection.CopyTo(DevComponents.Tree.LinkedNode[],System.Int32)">
+            <summary>
+            Copies collection into the specified array.
+            </summary>
+            <param name="array">Array to copy collection to.</param>
+            <param name="index">Starting index.</param>
+        </member>
+        <member name="M:DevComponents.Tree.LinkedNodesCollection.CopyTo(DevComponents.Tree.LinkedNode[])">
+            <summary>
+            Copies contained items to the ColumnHeader array.
+            </summary>
+            <param name="array">Array to copy to.</param>
+        </member>
+        <member name="P:DevComponents.Tree.LinkedNodesCollection.ParentNode">
+            <summary>
+            Gets or sets the node this collection is associated with.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.LinkedNodesCollection.Item(System.Int32)">
+            <summary>
+            Returns reference to the object in collection based on it's index.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.Node">
+            <summary>
+            Represents the Node in Tree control.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.Node.#ctor">
+            <summary>Default Constructor.</summary>
+        </member>
+        <member name="M:DevComponents.Tree.Node.SetBounds(System.Drawing.Rectangle)">
+            <summary>
+            Sets the bounds of the node.
+            </summary>
+            <param name="r">New location and size of the node.</param>
+        </member>
+        <member name="M:DevComponents.Tree.Node.SetContentBounds(System.Drawing.Rectangle)">
+            <summary>
+            Sets the content bounds of the node. Content bound is bound for the the cells inside the node
+            and it excludes the expand rectangle. Bounds also include the node style padding and
+            reflect node margin.
+            </summary>
+            <param name="r">New location and size of the node.</param>
+        </member>
+        <member name="M:DevComponents.Tree.Node.SetCellsBounds(System.Drawing.Rectangle)">
+            <summary>
+            Sets cell bounds.
+            </summary>
+            <param name="r">New cells bounds.</param>
+        </member>
+        <member name="M:DevComponents.Tree.Node.SetParent(DevComponents.Tree.Node)">
+            <summary>
+            Sets node parent.
+            </summary>
+            <param name="parent">Parent node object.</param>
+        </member>
+        <member name="M:DevComponents.Tree.Node.SetExpandPartRectangle(System.Drawing.Rectangle)">
+            <summary>
+            Sets the bounds of the expand part.
+            </summary>
+            <param name="r">New part bounds.</param>
+        </member>
+        <member name="M:DevComponents.Tree.Node.SetEditing(System.Boolean)">
+            <summary>
+            Sets whether node is in edit mode or not.
+            </summary>
+            <param name="b">True indicating that node is in edit mode false otherwise.</param>
+        </member>
+        <member name="M:DevComponents.Tree.Node.ResetImage">
+            <summary>
+            Resets image to its default value. Windows Forms designer support.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.Node.ResetImageMouseOver">
+            <summary>
+            Resets ImageMouseOver to its default value. Windows Forms designer support.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.Node.ResetImageDisabled">
+            <summary>
+            Resets ImageDisabled to its default value. Windows Forms designer support.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.Node.ResetImageExpanded">
+            <summary>
+            Resets ImageExpanded to its default value. Windows Forms designer support.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.Node.SetMapSubRootPosition(DevComponents.Tree.eMapPosition)">
+            <summary>
+            Sets the node relative position form the root when map layout is used.
+            </summary>
+            <param name="pos">Relative node position.</param>
+        </member>
+        <member name="M:DevComponents.Tree.Node.Invalidate">
+            <summary>
+            Invalidates node and causes a paint message to be sent to the tree.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.Node.BeginEdit">
+            <summary>Initiates the editing of node text.</summary>
+            <remarks>
+            This method by default edits text stored in Node.Text. Call to this method is
+            same as calling the overload method BeginData(0) with zero as parameter. Use BeginData
+            overload method to begin editing the specific column for multi-column nodes.
+            </remarks>
+        </member>
+        <member name="M:DevComponents.Tree.Node.BeginEdit(System.String)">
+            <summary>Initiates the editing of node text.</summary>
+            <param name="initialText">
+            The initial text to be entered into the edit TextBox. Specify null to use existing text.
+            </param>
+        </member>
+        <member name="M:DevComponents.Tree.Node.BeginEdit(System.Int32)">
+            <summary>Initiates text editing of certain Node column.</summary>
+            <param name="iColumnIndex">
+            Zero based index of a column to begin editing for. Column 0 always corresponds to
+            Node.Text property.
+            </param>
+        </member>
+        <member name="M:DevComponents.Tree.Node.BeginEdit(System.Int32,System.String)">
+            <summary>Initiates text editing of certain Node column.</summary>
+            <param name="iColumnIndex">
+            Zero based index of a column to begin editing for. Column 0 always corresponds to
+            Node.Text property.
+            </param>
+            <param name="initialText">
+            The initial text to be entered into the edit TextBox. Specify null to edit existing text.
+            </param>
+        </member>
+        <member name="M:DevComponents.Tree.Node.Copy">
+            <summary>Makes a "shallow" copy of a Node.</summary>
+            <remarks>
+            Shallow copy of a Node is a exact copy of Node but <strong>without</strong> copy
+            of all child nodes in Nodes collection.
+            </remarks>
+        </member>
+        <member name="M:DevComponents.Tree.Node.DeepCopy">
+            <summary>Makes a "deep" copy of a node.</summary>
+            <remarks>
+            Deep copy of Node is a exact copy of Node including exact copies of all child nodes
+            in this node's Nodes collection.
+            </remarks>
+        </member>
+        <member name="M:DevComponents.Tree.Node.Collapse">
+            <summary>
+            Collapses the tree node.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.Node.Collapse(DevComponents.Tree.eTreeAction)">
+            <summary>
+            Collapses the tree node.
+            </summary>
+            <param name="action">Action that caused the event</param>
+        </member>
+        <member name="M:DevComponents.Tree.Node.CollapseAll">
+            <summary>
+            Collapses all the child tree nodes.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.Node.EndEdit(System.Boolean)">
+            <summary>
+            Ends the editing of the node text or column.
+            </summary>
+            <param name="cancelChanges"><strong>true</strong> if the editing of the tree node label text was canceled without being saved; otherwise, <strong>false</strong>. </param>
+        </member>
+        <member name="M:DevComponents.Tree.Node.EnsureVisible">
+            <summary>
+            Ensures that the node is visible, expanding nodes and scrolling the control as necessary.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.Node.Expand">
+            <summary>
+            Expands the node.
+            </summary>
+            <remarks>
+            The Expand method expands the current Node down to the next level of nodes.
+            The state of a Node is persisted. For example, if the next level of child nodes was not collapsed previously, when the Expand method is called, the child nodes appear in their previously expanded state.
+            </remarks>
+        </member>
+        <member name="M:DevComponents.Tree.Node.Expand(DevComponents.Tree.eTreeAction)">
+            <summary>
+            Expands the node.
+            </summary>
+            <remarks>
+            The Expand method expands the current Node down to the next level of nodes.
+            The state of a Node is persisted. For example, if the next level of child nodes was not collapsed previously, when the Expand method is called, the child nodes appear in their previously expanded state.
+            </remarks>
+            <param name="action">Action that caused the event.</param>
+        </member>
+        <member name="M:DevComponents.Tree.Node.ExpandAll">
+            <summary>
+            Expands all the child tree nodes.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.Node.Remove">
+            <summary>
+            Removes the current node from the control.
+            </summary>
+            <remarks>
+            When the Remove method is called, the node and any child nodes assigned to the Node are removed from the Tree. The removed child nodes are removed from the Tree, but are still attached to this node.
+            </remarks>
+        </member>
+        <member name="M:DevComponents.Tree.Node.Remove(DevComponents.Tree.eTreeAction)">
+            <summary>
+            Removes the current node from the control and provides information about source of action
+            </summary>
+            <remarks>
+            When the Remove method is called, the node and any child nodes assigned to the Node are removed from the Tree. The removed child nodes are removed from the Tree, but are still attached to this node.
+            </remarks>
+        </member>
+        <member name="M:DevComponents.Tree.Node.Toggle">
+            <summary>
+            Toggles the node to either the expanded or collapsed state.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.Node.Toggle(DevComponents.Tree.eTreeAction)">
+            <summary>
+            Toggles the node to either the expanded or collapsed state.
+            </summary>
+            <param name="action">Action that caused the event.</param>
+        </member>
+        <member name="M:DevComponents.Tree.Node.ToString">
+            <summary>Returns string representation of the Node.</summary>
+        </member>
+        <member name="M:DevComponents.Tree.Node.OnCellInserted(DevComponents.Tree.Cell)">
+            <summary>
+            Called after new cell has been added to Cells collection.
+            </summary>
+            <param name="cell">Reference to the new cell added.</param>
+        </member>
+        <member name="M:DevComponents.Tree.Node.OnCellRemoved(DevComponents.Tree.Cell)">
+            <summary>
+            Called after cell has  been removed from Cells collection.
+            </summary>
+            <param name="cell">Reference to the removed cell.</param>
+        </member>
+        <member name="M:DevComponents.Tree.Node.OnSizeChanged">
+            <summary>
+            Occurs when property on the node has changed that influences the size of the node.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.Node.OnImageChanged">
+            <summary>
+            Occurs when any image property for the cell has changed.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.Node.OnChildNodesSizeChanged">
+            <summary>
+            Occurs when size of the child nodes has changed.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.Node.OnDisplayChanged">
+            <summary>
+            Called when visual part of the node has changed due to the changes of its properties or properties of the cells contained by node.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.Node.OnChildNodeInserted(DevComponents.Tree.Node)">
+            <summary>
+            Called after new node has been addded to Nodes collection.
+            </summary>
+            <param name="node">Reference to the new node.</param>
+        </member>
+        <member name="M:DevComponents.Tree.Node.OnChildNodeRemoved(DevComponents.Tree.Node)">
+            <summary>
+            Called after node has been removed from Nodes collection.
+            </summary>
+            <param name="node">Reference to the node that is removed.</param>
+        </member>
+        <member name="E:DevComponents.Tree.Node.NodeMouseDown">
+            <summary>
+            Occurs when the mouse pointer is over the node and a mouse button is pressed.
+            </summary>
+        </member>
+        <member name="E:DevComponents.Tree.Node.NodeMouseUp">
+            <summary>
+            Occurs when the mouse pointer is over the node and a mouse button is released.
+            </summary>
+        </member>
+        <member name="E:DevComponents.Tree.Node.NodeMouseMove">
+            <summary>
+            Occurs when the mouse pointer is moved over the node.
+            </summary>
+        </member>
+        <member name="E:DevComponents.Tree.Node.NodeMouseEnter">
+            <summary>
+            Occurs when the mouse enters the node.
+            </summary>
+        </member>
+        <member name="E:DevComponents.Tree.Node.NodeMouseLeave">
+            <summary>
+            Occurs when the mouse leaves the node.
+            </summary>
+        </member>
+        <member name="E:DevComponents.Tree.Node.NodeMouseHover">
+            <summary>
+            Occurs when the mouse hovers over the node.
+            </summary>
+        </member>
+        <member name="E:DevComponents.Tree.Node.NodeClick">
+            <summary>
+            Occurs when the node is clicked with left mouse button. If you need to know more information like if another mouse button is clicked etc. use
+            NodeMouseDown event.
+            </summary>
+        </member>
+        <member name="E:DevComponents.Tree.Node.NodeDoubleClick">
+            <summary>
+            Occurs when the node is double-clicked.
+            </summary>
+        </member>
+        <member name="E:DevComponents.Tree.Node.MarkupLinkClick">
+            <summary>
+            Occurs when hyperlink in text-markup is clicked.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Node.ContextMenu">
+            <summary>
+            Gets or sets the context menu assigned to this node. Standard Context Menus, VS.NET 2005 Context Menus and DotNetBar Suite context menus are supported.
+            Default value is null (Nothing) which indicates that no context menu is assigned.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Node.HasHostedControls">
+            <summary>
+            Gets whether any of the cells inside the node has HostedControl property set.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Node.NodeRenderer">
+            <summary>
+            Gets or sets custom node renderer. You can set this property to your custom renderer. When set the RenderMode should be set to custom to enable
+            your custom renderer. To choose one of the system renderer use RenderMode property. Default value is null.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Node.RenderMode">
+            <summary>
+            Gets or sets the render mode used to render the node. Default value is eNodeRenderMode.Default which indicates that system default renderer is used.
+            Note that if you specify custom renderer you need to set either TreeGX.NodeRenderer or Node.NodeRenderer property.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Node.Expanded">
+            <summary>
+            Gets or sets whether node is expanded. Expanded node shows it's child nodes.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Node.Name">
+            <summary>
+            Returns name of the node that can be used to identify it from the code.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Node.DragDropEnabled">
+            <summary>
+            Gets or sets whether node can be dragged and dropped. Default value is true.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Node.ExpandVisibility">
+            <summary>
+            Gets or sets visibility of the expand button. Default value is <strong>Auto</strong> meaning that
+            expand button is displayed only if node has at least one child node.
+            </summary>
+            <remarks>
+            You can use this property for example to dynamically load the child nodes when user
+            tries to expand the node. You could for example handle BeforeExpand event to load child
+            nodes into the node.
+            </remarks>
+        </member>
+        <member name="P:DevComponents.Tree.Node.SizeChanged">
+            <summary>
+            Gets or sets whether any operation on the node has been performed that would affect node's size. Size changed flag 
+            internally indicates that node's size needs to be recalculated becouse it has changed
+            due to the changes in data.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Node.BoundsRelative">
+            <summary>
+            Gets the relative bounds of the tree node including the expand part of the node.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Node.Bounds">
+            <summary>
+            Gets the absolute bounds of the tree node including the expand part of the node.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Node.ContentBounds">
+            <summary>
+            Gets the node content bounds.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Node.CellsBoundsRelative">
+            <summary>
+            Gets the bounds for all the cells inside the node. The bounds do not include the expand part.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Node.CellsBounds">
+            <summary>
+            Gets the bounds for all the cells inside the node. The bounds do not include the expand part.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Node.ChildNodesBounds">
+            <summary>
+            Gets or sets the bounds of child nodes.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Node.ExpandPartRectangleRelative">
+            <summary>
+            Gets the expand part rectangle. Expand part is used to expand/collapse node.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Node.ExpandPartRectangle">
+            <summary>
+            Gets the expand part rectangle. Expand part is used to expand/collapse node.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Node.CommandBounds">
+            <summary>
+            Gets or sets the Command part bounds if command part is visible.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Node.Checked">
+            <summary>
+            Gets or sets a value indicating whether the tree node is in a checked state.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Node.CheckBoxAlignment">
+            <summary>
+            Gets or sets the checkbox alignment in relation to the text displayed by first default cell.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Node.CheckBoxVisible">
+            <summary>
+            Gets or sets whether check box is visible inside the cell.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Node.FullPath">
+            <summary>
+            Gets the path from the root tree node to the current tree node. The path consists of the labels of all the tree nodes that must be navigated to get to this tree node, starting at the root tree node. The node labels are separated by the delimiter character specified in the PathSeparator property of the Tree control that contains this node.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Node.Index">
+            <summary>
+            Gets the zero based index of position of the tree node in the tree node collection. -1 is returned if node is not added to the nodes collection.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Node.IsEditing">
+            <summary>
+            Gets a value indicating whether the tree node is in an editable state. true if the tree node is in editable state; otherwise, false.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Node.IsMouseDown">
+            <summary>
+            Gets whether left mouse button is pressed on any cell contained by this node.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Node.IsMouseOver">
+            <summary>
+            Gets whether mouse cursor is over on any cell contained by this node.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Node.IsSelected">
+            <summary>
+            Gets a value indicating whether the tree node is in the selected state. true if the tree node is in the selected state; otherwise, false.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Node.Enabled">
+            <summary>
+            Gets or sets whether node is enabled. Default value is true. Setting this value to false will set Enabled=false on all child cells.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Node.Selectable">
+            <summary>
+            Gets or sets whether node can be selected by user by clicking it with the mouse or using keyboard. Default value is true.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Node.CanSelect">
+            <summary>
+            Gets whether node can be selected. Node must be Visible, Enabled and Selectable in order for it to be selected.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Node.SelectedCell">
+            <summary>
+            Gets or sets a cell that is in selected state otherwise it retuns null.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Node.IsVisible">
+            <summary>
+            Gets a value indicating whether the tree node is visible. Node is considered to be visible when it's Visible property is set to true and path to the node is available i.e. all parent nodes are expanded.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Node.IsDisplayed">
+            <summary>
+            Returns whether node is displayed on the screen and visible to the user. When node is outside of the viewable area this property will return false. It will also return false if node is not visible.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Node.LastNode">
+            <summary>
+            Gets the last child tree node. The LastNode is the last child Node in the NodeCollection stored in the Nodes property of the current tree node. If the Node has no child tree node, the LastNode property returns a null reference (Nothing in Visual Basic).
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Node.NextNode">
+            <summary>
+            Gets the next sibling tree node. The NextNode is the next sibling Node in the NodeCollection stored in the Nodes property of the tree node's parent Node. If there is no next tree node, the NextNode property returns a null reference (Nothing in Visual Basic).
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Node.NextVisibleNode">
+            <summary>
+            Gets the next visible tree node. The NextVisibleNode can be a child, sibling, or a tree node from another branch. If there is no next tree node, the NextVisibleNode property returns a null reference (Nothing in Visual Basic).
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Node.Nodes">
+            <summary>
+            Gets the collection of Node objects assigned to the current tree node. The Nodes property can hold a collection of other Node objects. Each of the tree node in the collection has a Nodes property that can contain its own NodeCollection. Nesting of tree nodes can make it difficult to navigate a tree structure. The FullPath property makes it easier to determine your location in a tree.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Node.LinkedNodes">
+            <summary>
+            Gets the collection of LinkedNode objects that describe nodes linked to this node.
+            </summary>
+            <remarks>
+            Linked nodes are nodes that are related to given node but do not have strict
+            parent child relationship with the node. Each linked node must be already added as
+            child node to some other node or it will not be displayed. Linked nodes are used in Map
+            and Diagram layout styles to display relationships between nodes.
+            </remarks>
+        </member>
+        <member name="P:DevComponents.Tree.Node.HasLinkedNodes">
+            <summary>
+            Gets whether Node has any linked nodes.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Node.AnyVisibleNodes">
+            <summary>
+            Gets whether there is at least one child node that has its Visible property set to true.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Node.Parent">
+            <summary>
+            Gets the parent tree node of the current tree node. If the tree node is at the root level, the Parent property returns a null reference (Nothing in Visual Basic).
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Node.PrevNode">
+            <summary>
+            Gets the previous sibling tree node. The PrevNode is the previous sibling Node in the NodeCollection stored in the Nodes property of the tree node's parent Node. If there is no previous tree node, the PrevNode property returns a null reference (Nothing in Visual Basic).
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Node.PrevVisibleNode">
+            <summary>
+            Gets the previous visible tree node. The PrevVisibleNode can be a child, sibling, or a tree node from another branch. If there is no previous tree node, the PrevVisibleNode property returns a null reference (Nothing in Visual Basic).
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Node.Tag">
+            <summary>
+            Gets or sets the object that contains data about the tree node. Any Object derived type can be assigned to this property. If this property is being set through the Windows Forms designer, only text can be assigned.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Node.TagString">
+            <summary>
+            Gets or sets the object that contains data about the tree node. Any Object derived type can be assigned to this property. If this property is being set through the Windows Forms designer, only text can be assigned.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Node.DataKey">
+            <summary>
+            Gets or sets the object that contains additional data about the tree node. Any Object derived type can be assigned to this property. If this property is being set through the Windows Forms designer, only text can be assigned.
+            This property has same function as Tag property and provides you with additional separate storage of data.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Node.DataKeyString">
+            <summary>
+            Gets or sets the object that contains additional data about the tree node. Any Object derived type can be assigned to this property. If this property is being set through the Windows Forms designer, only text can be assigned.
+            This property has same function as Tag property and provides you with additional separate storage of data.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Node.Text">
+            <summary>
+            Gets or sets the text displayed in the tree node.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Node.HostedControl">
+            <summary>
+            Gets or sets the control hosted inside of the first node cell.
+            </summary>
+            <remarks>
+            	<para>When control is hosted inside of the cell, cell size is determined by the
+                size of the control hosted inside of it. The cell will not display its text but it will display any image assigned
+                or check box when control is hosted inside of it. The Style settings like Margin
+                and Padding will still apply.</para>
+            </remarks>
+        </member>
+        <member name="P:DevComponents.Tree.Node.TreeControl">
+            <summary>
+            Gets the parent tree control that the tree node is assigned to.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Node.CellLayout">
+            <summary>
+            Gets or sets the layout of the cells inside the node. Default value is Horizontal layout which
+            means that cell are positioned horizontally next to each other.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Node.CellPartLayout">
+            <summary>
+            Gets or sets the layout of the cell parts like check box, image and text. Layout can be horizontal (default)
+            where parts of the cell are positioned next to each other horizontally, or vertical where
+            parts of the cell are positioned on top of each other vertically.
+            Alignment of the each part is controlled by alignment properties. This property affects only the first cell inside of the node.
+            Use Cell.Layout property to change the part layout on each cell contained by node.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Node.Cells">
+            <summary>
+            Gets the collection of all Cells assigned to this node. There should be always at least one cell in a node which is default cell. Default
+            collection contains a single cell.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Node.NodesColumns">
+            <summary>
+            Get collection of child node columns.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Node.StyleExpanded">
+            <summary>Gets or sets the style of the cells when node is expanded.</summary>
+            <value>
+            Reference to the style assigned to the node/cell or null value indicating that
+            default style setting from tree control is applied. Default value is null.
+            </value>
+            <remarks>
+            	<para>When node is expanded the style specified here will be used on all cells
+                associated with this node instead of the
+                <see cref="P:DevComponents.Tree.Cell.StyleNormal">Cell.StyleNormal</see>. That way you can give
+                different appearance to your node's cells when node is expanded.</para>
+            	<para>When property is set to null value the style setting from parent tree
+                controls is used. <see cref="P:DevComponents.Tree.TreeGX.NodeStyleExpanded">NodeStyleExpanded</see> on
+                TreeGX control is a root style for a cell.</para>
+            </remarks>
+        </member>
+        <member name="P:DevComponents.Tree.Node.StyleExpandedName">
+            <summary>
+            Gets or sets the expanded style name used by node. This member is provided for internal use only. To set or get the style use StyleExpanded property instead.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Node.StyleSelected">
+            <summary>
+            Gets or sets the style used when Node is selected. Default value is NULL (VB
+            Nothing)
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Node.StyleSelectedName">
+            <summary>
+            Gets or sets the selected style name used by node. This member is provided for internal use only. To set or get the style use StyleSelected property instead.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Node.StyleMouseOver">
+            <summary>
+            Gets or sets the style used when mouse is over the Node. Default value is NULL
+            (VB Nothing)
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Node.StyleMouseOverName">
+            <summary>
+            Gets or sets the mouse over style name used by node. This member is provided for internal use only. To set or get the style use StyleMouseOver property instead.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Node.Style">
+            <summary>
+                Gets or sets the node style.
+            </summary>
+            <value>
+            Reference to the style assigned to the node or null value indicating that default
+            style setting from tree control is applied. Default value is null.
+            </value>
+            <remarks>
+            	<para>Style specified by this property will be used as default style for the node.
+                Each cell within the node can also specify it's own style. Since node contains the
+                cells using this style property can you for example create a border around all cell
+                contained by the node.</para>
+            	<para>When this property is set to null value (default value) NodeStyle
+                property on TreeGX control is used.</para>
+            </remarks>
+        </member>
+        <member name="P:DevComponents.Tree.Node.StyleName">
+            <summary>
+            Gets or sets the style name used by node. This member is provided for internal use only. To set or get the style use Style property instead.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Node.MouseOverNodePart">
+            <summary>
+            Gets or sets the part of the node mouse is over.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Node.Offset">
+            <summary>
+            Gets or sets the node horizontal offset from the position determined by the layout manager.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Node.MapSubRootPosition">
+            <summary>
+            Gets layout position of the node when tree is in Map layout mode and node is the first child note of top-level root node.
+            To set the layout position for a node use TreeGX.SetNodeMapPosition method.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Node.ImageAlignment">
+            <summary>
+            Gets or sets the image alignment in relation to the text displayed by cell. This property affects only first default cell inside the node.
+            Property with same name is available on each cell and you can use it to affect each cell individually.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Node.Image">
+            <summary>
+            Gets or sets the image displayed when the tree node is in the unselected state.
+            </summary>
+            <remarks>
+            Image specified will be used as a default image for any other node state where
+            different image is not specified.
+            </remarks>
+        </member>
+        <member name="P:DevComponents.Tree.Node.ImageIndex">
+            <summary>
+            Gets or sets the image-list index value of the default image that is displayed by the tree nodes.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Node.ImageMouseOver">
+            <summary>
+            Gets or sets the image displayed when mouse is over the tree node.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Node.ImageMouseOverIndex">
+            <summary>
+            Gets or sets the image-list index value of the image that is displayed by the tree nodes when mouse is over the node.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Node.ImageExpanded">
+            <summary>
+            Gets or sets the image displayed when node is expanded.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Node.ImageExpandedIndex">
+            <summary>
+            Gets or sets the image-list index value of the image that is displayed by the tree nodes when node is expanded.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Node.ImageList">
+            <summary>
+            Property Editor support for ImageIndex selection
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Node.ParentConnector">
+            <summary>
+            Gets or sets the NodeConnector object that describes the type of the connector used for
+            displaying connection between current node and its parent node. 
+            Default value is null which means that settings from TreeGX control are used.
+            </summary>
+            <seealso cref="P:DevComponents.Tree.TreeGX.RootConnector">RootConnector Property (DevComponents.Tree.TreeGX)</seealso>
+            <seealso cref="P:DevComponents.Tree.TreeGX.NodesConnector">NodesConnector Property (DevComponents.Tree.TreeGX)</seealso>
+        </member>
+        <member name="P:DevComponents.Tree.Node.ParentConnectorPoints">
+            <summary>
+            Gets the collection of the parent connector line relative points. By default this collection is empty which indicates that
+            connector line is drawn using predefined path. Points added here are the points through which the connector line will travel to the
+            parent node. The point coordinates added to this collection are relative from the top-left corner of this node.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Node.Visible">
+            <summary>
+            Gets or sets whether node is visible.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Node.CommandButton">
+            <summary>
+            Gets or sets whether command button is visible. Default value is false.
+            Command button can be used to display for example popup menu with commands for node,
+            or to display the list of linked nodes.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Node.SelectedConnectorMarker">
+            <summary>
+            Gets or sets internal value that indicates that node is on "path" of the selected node.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Node.ColumnHeaderHeight">
+            <summary>
+            Gets or sets the child column header height.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.NodeCollection">
+            <summary>
+            Represents collection for Node objects.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.NodeCollection.SetParentNode(DevComponents.Tree.Node)">
+            <summary>
+            Sets the node collection belongs to.
+            </summary>
+            <param name="parent">Node that is parent of this collection.</param>
+        </member>
+        <member name="M:DevComponents.Tree.NodeCollection.Add(DevComponents.Tree.Node)">
+            <summary>
+            Adds new object to the collection.
+            </summary>
+            <param name="node">Object to add.</param>
+            <returns>Index of newly added object.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.NodeCollection.Add(DevComponents.Tree.Node,DevComponents.Tree.eTreeAction)">
+            <summary>
+            Adds new object to the collection and provides information about the source of the command
+            </summary>
+            <param name="node">Node to add</param>
+            <param name="action">Source action</param>
+            <returns></returns>
+        </member>
+        <member name="M:DevComponents.Tree.NodeCollection.AddRange(DevComponents.Tree.Node[])">
+            <summary>
+            Adds an array of objects to the collection. 
+            </summary>
+            <param name="nodes">Array of Node objects.</param>
+        </member>
+        <member name="M:DevComponents.Tree.NodeCollection.Insert(System.Int32,DevComponents.Tree.Node)">
+            <summary>
+            Inserts new object into the collection.
+            </summary>
+            <param name="index">Position of the object.</param>
+            <param name="value">Object to insert.</param>
+        </member>
+        <member name="M:DevComponents.Tree.NodeCollection.Insert(System.Int32,DevComponents.Tree.Node,DevComponents.Tree.eTreeAction)">
+            <summary>
+            Inserts new object into the collection.
+            </summary>
+            <param name="index">Position of the object.</param>
+            <param name="value">Object to insert.</param>
+            <param name="action">Action that is causing the event</param>
+        </member>
+        <member name="M:DevComponents.Tree.NodeCollection.IndexOf(DevComponents.Tree.Node)">
+            <summary>
+            Returns index of the object inside of the collection.
+            </summary>
+            <param name="value">Reference to the object.</param>
+            <returns>Index of the object.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.NodeCollection.Contains(DevComponents.Tree.Node)">
+            <summary>
+            Returns whether collection contains specified object.
+            </summary>
+            <param name="value">Object to look for.</param>
+            <returns>true if object is part of the collection, otherwise false.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.NodeCollection.Remove(DevComponents.Tree.Node)">
+            <summary>
+            Removes specified object from the collection.
+            </summary>
+            <param name="value"></param>
+        </member>
+        <member name="M:DevComponents.Tree.NodeCollection.Remove(DevComponents.Tree.Node,DevComponents.Tree.eTreeAction)">
+            <summary>
+            Removes specified object from the collection and provides information about source of the command
+            </summary>
+            <param name="node">Node to remove</param>
+            <param name="action">Source action</param>
+        </member>
+        <member name="M:DevComponents.Tree.NodeCollection.CopyTo(DevComponents.Tree.Node[],System.Int32)">
+            <summary>
+            Copies collection into the specified array.
+            </summary>
+            <param name="array">Array to copy collection to.</param>
+            <param name="index">Starting index.</param>
+        </member>
+        <member name="M:DevComponents.Tree.NodeCollection.CopyTo(DevComponents.Tree.Node[])">
+            <summary>
+            Copies contained items to the Node array.
+            </summary>
+            <param name="array">Array to copy to.</param>
+        </member>
+        <member name="P:DevComponents.Tree.NodeCollection.ParentNode">
+            <summary>
+            Gets or sets the node this collection is associated with.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.NodeCollection.Item(System.Int32)">
+            <summary>
+            Returns reference to the object in collection based on it's index.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.NodeCollectionEditor">
+            <summary>
+            Support for Node tabs design-time editor.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.NodeConnector">
+            <summary>
+            Represents node connector. Node connector is the line that is drawn to indicate connection between child and parent node.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.NodeConnector.#ctor">
+            <summary>
+            Default Constructor.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.NodeConnector.#ctor(System.Int32,DevComponents.Tree.eNodeConnectorType)">
+            <summary>
+            Creates new instance of the object with specified parameters.
+            </summary>
+            <param name="lineWidth">Connector line width.</param>
+            <param name="type">Connector type.</param>
+        </member>
+        <member name="M:DevComponents.Tree.NodeConnector.ShouldSerializeLineColor">
+            <summary>
+            Returns true if editor should serialize LineColor property.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.NodeConnector.ShouldSerializeEndCapSize">
+            <summary>
+            Returns true if EndCapSize property should be serialized by editor.
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="E:DevComponents.Tree.NodeConnector.AppearanceChanged">
+            <summary>
+            Occurs when appearance of the connector has changed as result of changed settings on the connector.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.NodeConnector.LineWidth">
+            <summary>
+            Gets or sets the connector line width.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.NodeConnector.LineColor">
+            <summary>
+            Gets or sets the color of the connector line.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.NodeConnector.ConnectorType">
+            <summary>
+            Gets or sets the type of the connector.
+            </summary>
+            <remarks>
+            See <see cref="T:DevComponents.Tree.eNodeConnectorType">eNodeConnectorType</see> enum for list of
+            available connectors.
+            </remarks>
+            <seealso cref="T:DevComponents.Tree.eNodeConnectorType">eNodeConnectorType Enumeration</seealso>
+        </member>
+        <member name="P:DevComponents.Tree.NodeConnector.UnderlineNoBorderNode">
+            <summary>
+            Gets or sets whether the child node without borders is underlined as a
+            continuation of the connector from node's parent. Default value is true.
+            </summary>
+            <remarks>
+            To enhance visual appearance of the connectors that are connecting to the node
+            with no borders assigned the connector is continued as a single line under the node
+            when this property is set to true (default) value.
+            </remarks>
+        </member>
+        <member name="P:DevComponents.Tree.NodeConnector.EndCap">
+            <summary>
+            Gets or sets the type of the cap that connector is ended with. Note that connector starts with parent node and ends with the child node. Default value is Ellipse.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.NodeConnector.EndCapSize">
+            <summary>
+            Gets or sets the size of the end cap.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.NodeOperations">
+            <summary>
+            Represents node operations.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.NodeOperations.GetFullPath(DevComponents.Tree.Node,System.String)">
+            <summary>
+            Returns full path to the given node.
+            </summary>
+            <param name="node">Node to return path to.</param>
+            <returns>Full path to the node.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.NodeOperations.GetLastNode(DevComponents.Tree.Node)">
+            <summary>
+            Gets the last child tree node. The LastNode is the last child Node in the NodeCollection stored in the Nodes property of the current tree node. If the Node has no child tree node, the LastNode property returns a null reference (Nothing in Visual Basic).
+            </summary>
+            <param name="node">Reference node.</param>
+            <returns>Last node if found or null if there is no last node.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.NodeOperations.GetNextNode(DevComponents.Tree.Node)">
+            <summary>
+            Gets the next sibling tree node. The NextNode is the next sibling Node in the NodeCollection stored in the Nodes property of the tree node's parent Node. If there is no next tree node, the NextNode property returns a null reference (Nothing in Visual Basic).
+            </summary>
+            <param name="node">Reference node.</param>
+            <returns>Node object or null if node cannot be found.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.NodeOperations.GetNextVisibleSibling(DevComponents.Tree.Node)">
+            <summary>
+            Returns next visible sibling tree node.
+            </summary>
+            <param name="node">Reference node</param>
+            <returns>Node object or null if next visible node cannot be found</returns>
+        </member>
+        <member name="M:DevComponents.Tree.NodeOperations.GetAnyNextNode(DevComponents.Tree.Node)">
+            <summary>
+            Gets the next visible tree node. The NextVisibleNode can be a child, sibling, or a tree node from another branch. If there is no next tree node, the NextVisibleNode property returns a null reference (Nothing in Visual Basic).
+            </summary>
+            <param name="node">Reference node.</param>
+            <returns>Node object or null if node cannot be found.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.NodeOperations.GetNextVisibleNode(DevComponents.Tree.Node)">
+            <summary>
+            Gets the next visible tree node. The NextVisibleNode can be a child, sibling, or a tree node from another branch. If there is no next tree node, the NextVisibleNode property returns a null reference (Nothing in Visual Basic).
+            </summary>
+            <param name="node">Reference node.</param>
+            <returns>Node object or null if node cannot be found.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.NodeOperations.GetIsNodeVisible(DevComponents.Tree.Node)">
+            <summary>
+            Gets a value indicating whether the tree node is visible. Node is considered to be visible when it's Visible property is set to true and path to the node is available i.e. all parent nodes are expanded.
+            </summary>
+            <param name="node"></param>
+            <returns></returns>
+        </member>
+        <member name="M:DevComponents.Tree.NodeOperations.GetIsNodeDisplayed(DevComponents.Tree.Node)">
+            <summary>
+            Returns whether node is displayed on the screen and visible to the user. When node is outside of the viewable area this property will return false. It will also return false if node is not visible.
+            </summary>
+            <param name="node"></param>
+            <returns></returns>
+        </member>
+        <member name="M:DevComponents.Tree.NodeOperations.GetLastDisplayedNode(DevComponents.Tree.TreeGX)">
+            <summary>
+            Returns last rendered node on screen.
+            </summary>
+            <param name="tree">Tree control.</param>
+            <returns>Last rendered node or null</returns>
+        </member>
+        <member name="M:DevComponents.Tree.NodeOperations.GetNodeIndex(DevComponents.Tree.Node)">
+            <summary>
+            Gets the zero based index of position of the tree node in the tree node collection. -1 is returned if node is not added to the nodes collection.
+            </summary>
+            <param name="node">Reference node.</param>
+            <returns>Zero based index or -1 if node is not in collection.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.NodeOperations.GetPreviousNode(DevComponents.Tree.Node)">
+            <summary>
+            Gets the previous sibling tree node. The PrevNode is the previous sibling Node in the NodeCollection stored in the Nodes property of the tree node's parent Node. If there is no previous tree node, the PrevNode property returns a null reference (Nothing in Visual Basic).
+            </summary>
+            <param name="node">Reference node.</param>
+            <returns>Node object or null if node cannot be found.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.NodeOperations.GetAnyPreviousNode(DevComponents.Tree.Node)">
+            <summary>
+            Gets the previous tree node. The Previous Node can be a child, sibling, or a tree node from another branch. If there is no previous tree node, the PrevNode property returns a null reference (Nothing in Visual Basic).
+            </summary>
+            <param name="node">Reference node.</param>
+            <returns>Node object or null if node cannot be found.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.NodeOperations.GetPreviousVisibleNode(DevComponents.Tree.Node)">
+            <summary>
+            Gets the previous visible tree node. The PrevVisibleNode can be a child, sibling, or a tree node from another branch. If there is no previous tree node, the PrevVisibleNode property returns a null reference (Nothing in Visual Basic).
+            </summary>
+            <param name="node">Reference node.</param>
+            <returns>Node object or null if node cannot be found.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.NodeOperations.IsRootNode(DevComponents.Tree.TreeGX,DevComponents.Tree.Node)">
+            <summary>
+            Returns true if node passed is considered root node for display purposes.
+            </summary>
+            <param name="tree">Reference to the tree control.</param>
+            <param name="node">Node to test.</param>
+            <returns>true if node is root node for display purposes otherwise false.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.NodeOperations.EnsureVisible(DevComponents.Tree.Node)">
+            <summary>
+            Ensures that the node is visible, expanding nodes and scrolling the control as necessary.
+            </summary>
+            <param name="reference">Node to be made visible.</param>
+        </member>
+        <member name="M:DevComponents.Tree.NodeOperations.GetVisibleNodesCount(DevComponents.Tree.Node)">
+            <summary>
+            Returns number of visible child nodes for given node.
+            </summary>
+            <param name="node">Reference node.</param>
+            <returns>Number of visible child nodes.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.NodeOperations.GetFirstVisibleNode(DevComponents.Tree.TreeGX)">
+            <summary>
+            Gets first visible node.
+            </summary>
+            <param name="tree">Reference to tree.</param>
+            <returns>Last visible node found or null</returns>
+        </member>
+        <member name="M:DevComponents.Tree.NodeOperations.GetAnyVisibleNodes(DevComponents.Tree.Node)">
+            <summary>
+            Returns true if node has at least single visible child node.
+            </summary>
+            <param name="node">Reference node.</param>
+            <returns>True if at least single child node is visible otherwise false.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.NodeOperations.GetNodeAt(DevComponents.Tree.TreeGX,System.Drawing.Point)">
+            <summary>
+            Retrieves the tree node that is at the specified location.
+            </summary>
+            <returns>The Node at the specified point, in tree view coordinates.</returns>
+            <remarks>
+            	<para>You can pass the MouseEventArgs.X and MouseEventArgs.Y coordinates of the
+                MouseDown event as the x and y parameters.</para>
+            </remarks>
+            <param name="p">The Point to evaluate and retrieve the node from.</param>
+            <param name="tree">Tree control to find node at.</param>
+        </member>
+        <member name="M:DevComponents.Tree.NodeOperations.GetNodeAt(DevComponents.Tree.TreeGX,System.Int32,System.Int32)">
+            <summary>
+            Retrieves the tree node that is at the specified location.
+            </summary>
+            <returns>The TreeNode at the specified location, in tree view coordinates.</returns>
+            <remarks>
+            	<para>You can pass the MouseEventArgs.X and MouseEventArgs.Y coordinates of the
+                MouseDown event as the x and y parameters.</para>
+            </remarks>
+            <param name="x">The X position to evaluate and retrieve the node from.</param>
+            <param name="y">The Y position to evaluate and retrieve the node from.</param>
+            <param name="tree">Tree control to find node at.</param>
+        </member>
+        <member name="M:DevComponents.Tree.NodeOperations.GetVisibleChildNodesCount(DevComponents.Tree.Node)">
+            <summary>
+            Gets the count of visible child nodes (Visible=true) for given node.
+            </summary>
+            <param name="parent">Reference to Node object.</param>
+            <returns>Number of visible nodes.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.NodeOperations.GetFirstVisibleChildNode(DevComponents.Tree.Node)">
+            <summary>
+            Gets the first visible child node or returns null if node cannot be found.
+            </summary>
+            <param name="parent">Reference to Node object.</param>
+            <returns>First visible node or null if node cannot be found.</returns>
+        </member>
+        <member name="T:DevComponents.Tree.NodeStyles">
+            <summary>
+            Class that provides predefined styles for the nodes. Styles are defined as static memeber of the class
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.NodeStyles.Apple">
+            <summary>
+            Returns Apple element style
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.NodeStyles.Blue">
+            <summary>
+            Returns Blue element style
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.NodeStyles.BlueLight">
+            <summary>
+            Returns BlueLight element style
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.NodeStyles.BlueNight">
+            <summary>
+            Returns BlueNight element style
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.NodeStyles.BlueMist">
+            <summary>
+            Returns BlueMist element style
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.NodeStyles.Cyan">
+            <summary>
+            Returns Cyan element style
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.NodeStyles.Green">
+            <summary>
+            Returns Green element style
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.NodeStyles.Lemon">
+            <summary>
+            Returns Lemon element style
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.NodeStyles.Magenta">
+            <summary>
+            Returns Magenta element style
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.NodeStyles.Orange">
+            <summary>
+            Returns Orange element style
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.NodeStyles.OrangeLight">
+            <summary>
+            Returns OrangeLight element style
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.NodeStyles.Purple">
+            <summary>
+            Returns Purple element style
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.NodeStyles.PurpleMist">
+            <summary>
+            Returns PurpleMist element style
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.NodeStyles.Red">
+            <summary>
+            Returns Red element style
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.NodeStyles.Silver">
+            <summary>
+            Returns Silver element style
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.NodeStyles.SilverMist">
+            <summary>
+            Returns SilverMist element style
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.NodeStyles.Tan">
+            <summary>
+            Returns Tan element style
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.NodeStyles.Teal">
+            <summary>
+            Returns Teal element style
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.NodeStyles.Yellow">
+            <summary>
+            Returns Yellow element style
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.NodeStyles.Gray">
+            <summary>
+            Returns Gray element style
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.ePredefinedElementStyle">
+            <summary>
+            Indicates predefined element style.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.Padding">
+            <summary>
+            Represents class that holds padding information for user interface elements.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.Padding._Left">
+            <summary>
+            Gets or sets padding on left side. Default value is 0
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.Padding._Right">
+            <summary>
+            Gets or sets padding on right side. Default value is 0
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.Padding._Top">
+            <summary>
+            Gets or sets padding on top side. Default value is 0
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.Padding._Bottom">
+            <summary>
+            Gets or sets padding on bottom side. Default value is 0
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.Padding.#ctor(System.Int32,System.Int32,System.Int32,System.Int32)">
+            <summary>
+            Creates new instance of the class and initializes it.
+            </summary>
+            <param name="left">Left padding</param>
+            <param name="right">Right padding</param>
+            <param name="top">Top padding</param>
+            <param name="bottom">Bottom padding</param>
+        </member>
+        <member name="M:DevComponents.Tree.Padding.OnPropertyChanged(System.ComponentModel.PropertyChangedEventArgs)">
+            <summary>
+            Raises the PropertyChanged event.
+            </summary>
+            <param name="e">Event arguments</param>
+        </member>
+        <member name="P:DevComponents.Tree.Padding.Top">
+            <summary>
+            Gets amount of Top padding
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Padding.Left">
+            <summary>
+            Gets amount of Left padding
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Padding.Bottom">
+            <summary>
+            Gets amount of Bottom padding
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Padding.Right">
+            <summary>
+            Gets amount of Right padding
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Padding.Horizontal">
+            <summary>
+            Gets amount of horizontal padding (Left+Right)
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Padding.Vertical">
+            <summary>
+            Gets amount of vertical padding (Top+Bottom)
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.Padding.IsEmpty">
+            <summary>
+            Gets whether Padding is empty.
+            </summary>
+        </member>
+        <member name="E:DevComponents.Tree.Padding.PropertyChanged">
+            <summary>
+            Occurs when property value has changed.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.TextBoxEx">
+            <summary>
+            Represents the text box for editing cell's text.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TextBoxEx.EditWordWrap">
+            <summary>
+            Gets or sets whether the editing is in word-wrap mode.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.TextMarkup.MarkupElement.Measure(System.Drawing.Size,DevComponents.Tree.TextMarkup.MarkupDrawContext)">
+            <summary>
+            Measures the element given available size.
+            </summary>
+            <param name="availableSize">Size available to element</param>
+            <param name="g">Reference to graphics object</param>
+        </member>
+        <member name="M:DevComponents.Tree.TextMarkup.MarkupElement.MeasureEnd(System.Drawing.Size,DevComponents.Tree.TextMarkup.MarkupDrawContext)">
+            <summary>
+            Measures the end tag of an element. Most implementations do not need to do anything but implementations like the ones
+            that change color should return state back at this time.
+            </summary>
+            <param name="availableSize"></param>
+            <param name="d"></param>
+        </member>
+        <member name="M:DevComponents.Tree.TextMarkup.MarkupElement.Render(DevComponents.Tree.TextMarkup.MarkupDrawContext)">
+            <summary>
+            Renders element.
+            </summary>
+            <param name="d">Provides markup drawing context information.</param>
+        </member>
+        <member name="M:DevComponents.Tree.TextMarkup.MarkupElement.RenderEnd(DevComponents.Tree.TextMarkup.MarkupDrawContext)">
+            <summary>
+            Renders element tag end. Most implementations do not need to do anything but mplementations like the ones
+            that change color should return state back at this time.
+            </summary>
+            <param name="d">Provides markup drawing context information.</param>
+        </member>
+        <member name="M:DevComponents.Tree.TextMarkup.MarkupElement.ArrangeCore(System.Drawing.Rectangle,DevComponents.Tree.TextMarkup.MarkupDrawContext)">
+            <summary>
+            Provides final rectangle to element and lets it arrange it's content given new constraint.
+            </summary>
+            <param name="finalRect">Final rectangle.</param>
+            <param name="g"></param>
+        </member>
+        <member name="M:DevComponents.Tree.TextMarkup.MarkupElement.Arrange(System.Drawing.Rectangle,DevComponents.Tree.TextMarkup.MarkupDrawContext)">
+            <summary>
+            Arranges the element given the final size. Layout is two step process with Measure followed by Arrange.
+            </summary>
+            <param name="finalSize"></param>
+            <param name="g"></param>
+        </member>
+        <member name="P:DevComponents.Tree.TextMarkup.MarkupElement.IsBlockElement">
+            <summary>
+            Returns whether markup element is an block element that always consumes a whole line in layout.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TextMarkup.MarkupElement.IsNewLineAfterElement">
+            <summary>
+            Returns whether layout manager switches to new line after processing this element.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TextMarkup.MarkupElement.CanStartNewLine">
+            <summary>
+            Returns whether layout manager can start new line with this element.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TextMarkup.MarkupElement.Elements">
+            <summary>
+            Gets the collection of child elements if any for this markup element.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TextMarkup.MarkupElement.IsSizeValid">
+            <summary>
+            Gets or sets whether element size is valid. When size is not valid element Measure method will be called to validate size.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TextMarkup.MarkupElement.Parent">
+            <summary>
+            Gets element parent or null if parent is not set.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TextMarkup.MarkupElement.Bounds">
+            <summary>
+            Gets or sets actual rendering bounds.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TextMarkup.MarkupElement.Visible">
+            <summary>
+            Gets or sets whether markup element is visible.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TextMarkup.MarkupElement.RenderBounds">
+            <summary>
+            Gets or sets actual rendered bounds for a give markup element if applicable.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TextMarkup.ContainerElement.IsBlockElement">
+            <summary>
+            Returns whether markup element is an block element that always consumes a whole line in layout.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.TextMarkup.eParagraphAlignment">
+            <summary>
+            Indicates paragraph content alignment
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.TextMarkup.eParagraphVerticalAlignment">
+            <summary>
+            Indicates paragraph content alignment
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TextMarkup.EndMarkupElement.StartElement">
+            <summary>
+            Gets reference to markup start element.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TextMarkup.ExpandElement.CanStartNewLine">
+            <summary>
+            Returns whether layout manager can start new line with this element.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TextMarkup.Heading.Level">
+            <summary>
+            Gets or sets heading level. Values from 1 to 6 are valid. Default is 1.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.TextMarkup.HyperLink.HitTest(System.Int32,System.Int32)">
+            <summary>
+            Returns whether hyper-link contains specified coordinates.
+            </summary>
+            <param name="x"></param>
+            <param name="y"></param>
+            <returns></returns>
+        </member>
+        <member name="M:DevComponents.Tree.TextMarkup.MarkupElementCollection.#ctor(DevComponents.Tree.TextMarkup.MarkupElement)">
+            <summary>Creates new instance of the class.</summary>
+        </member>
+        <member name="M:DevComponents.Tree.TextMarkup.MarkupElementCollection.Add(DevComponents.Tree.TextMarkup.MarkupElement)">
+            <summary>
+            Adds new object to the collection.
+            </summary>
+            <param name="MarkupElement">Object to add.</param>
+            <returns>Index of newly added object.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.TextMarkup.MarkupElementCollection.Insert(System.Int32,DevComponents.Tree.TextMarkup.MarkupElement)">
+            <summary>
+            Inserts new object into the collection.
+            </summary>
+            <param name="index">Position of the object.</param>
+            <param name="value">Object to insert.</param>
+        </member>
+        <member name="M:DevComponents.Tree.TextMarkup.MarkupElementCollection.IndexOf(DevComponents.Tree.TextMarkup.MarkupElement)">
+            <summary>
+            Returns index of the object inside of the collection.
+            </summary>
+            <param name="value">Reference to the object.</param>
+            <returns>Index of the object.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.TextMarkup.MarkupElementCollection.Contains(DevComponents.Tree.TextMarkup.MarkupElement)">
+            <summary>
+            Returns whether collection contains specified object.
+            </summary>
+            <param name="value">Object to look for.</param>
+            <returns>true if object is part of the collection, otherwise false.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.TextMarkup.MarkupElementCollection.Remove(DevComponents.Tree.TextMarkup.MarkupElement)">
+            <summary>
+            Removes specified object from the collection.
+            </summary>
+            <param name="value"></param>
+        </member>
+        <member name="M:DevComponents.Tree.TextMarkup.MarkupElementCollection.CopyTo(DevComponents.Tree.TextMarkup.MarkupElement[],System.Int32)">
+            <summary>
+            Copies collection into the specified array.
+            </summary>
+            <param name="array">Array to copy collection to.</param>
+            <param name="index">Starting index.</param>
+        </member>
+        <member name="M:DevComponents.Tree.TextMarkup.MarkupElementCollection.CopyTo(DevComponents.Tree.TextMarkup.MarkupElement[])">
+            <summary>
+            Copies contained items to the MarkupElement array.
+            </summary>
+            <param name="array">Array to copy to.</param>
+        </member>
+        <member name="P:DevComponents.Tree.TextMarkup.MarkupElementCollection.Parent">
+            <summary>
+            Gets or sets the collection parent element.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TextMarkup.MarkupElementCollection.Item(System.Int32)">
+            <summary>
+            Returns reference to the object in collection based on it's index.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.TextMarkup.MarkupParser.IsMarkup(System.String@)">
+            <summary>
+            Tests whether input text could be markup text.
+            </summary>
+            <param name="text">Text to test.</param>
+            <returns>true if text could be markup, otherwise false</returns>
+        </member>
+        <member name="P:DevComponents.Tree.TextMarkup.MarkupSettings.NormalHyperlink">
+            <summary>
+            Gets the style of the hyperlink in its default state.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TextMarkup.MarkupSettings.MouseOverHyperlink">
+            <summary>
+            Gets the style of the hyperlink when mouse is over the link.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TextMarkup.MarkupSettings.VisitedHyperlink">
+            <summary>
+            Gets the style of the visited hyperlink.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.TextMarkup.HyperlinkStyle">
+            <summary>
+            Defines the text-markup hyperlink appearance style.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.TextMarkup.HyperlinkStyle.#ctor">
+            <summary>
+            Initializes a new instance of the HyperlinkStyle class.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.TextMarkup.HyperlinkStyle.#ctor(System.Drawing.Color,DevComponents.Tree.TextMarkup.eHyperlinkUnderlineStyle)">
+            <summary>
+            Initializes a new instance of the HyperlinkStyle class.
+            </summary>
+            <param name="textColor"></param>
+            <param name="underlineStyle"></param>
+        </member>
+        <member name="M:DevComponents.Tree.TextMarkup.HyperlinkStyle.#ctor(System.Drawing.Color,System.Drawing.Color,DevComponents.Tree.TextMarkup.eHyperlinkUnderlineStyle)">
+            <summary>
+            Initializes a new instance of the HyperlinkStyle class.
+            </summary>
+            <param name="textColor"></param>
+            <param name="backColor"></param>
+            <param name="underlineStyle"></param>
+        </member>
+        <member name="P:DevComponents.Tree.TextMarkup.HyperlinkStyle.TextColor">
+            <summary>
+            Gets or sets hyperlink text color.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TextMarkup.HyperlinkStyle.BackColor">
+            <summary>
+            Gets or sets hyperlink back color.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TextMarkup.HyperlinkStyle.UnderlineStyle">
+            <summary>
+            Gets or sets the underline style for the hyperlink.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TextMarkup.HyperlinkStyle.IsChanged">
+            <summary>
+            Gets whether style has been changed from its default state.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TextMarkup.NewLine.IsSizeValid">
+            <summary>
+            Gets or sets whether element size is valid. When size is not valid element Measure method will be called to validate size.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TextMarkup.NewLine.IsNewLineAfterElement">
+            <summary>
+            Returns whether layout manager switches to new line after processing this element.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TextMarkup.Span.IsBlockElement">
+            <summary>
+            Returns whether markup element is an block element that always consumes a whole line in layout.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.TextSettings">
+            <summary>
+            Defines settings for text rendering.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TextSettings.TextMarkupCultureSpecificPadding">
+            <summary>
+            Get or sets the text-markup padding for text measurement when running on Japanese version of Windows.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.TreeAreaInfo">
+            <summary>
+            Summary description for TreeAreaInfo.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.TreeAreaInfo.ParentAreaNode">
+            <summary>
+            Reference to parent node in which child bounds the coordinates are. Can be null if no parent node contains given coordinates.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.TreeAreaInfo.NodeAt">
+            <summary>
+            Node which contains specified coordinates. Can be null if no node contains coordinates.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.TreeAreaInfo.PreviousNode">
+            <summary>
+            Previous reference node for given coordinates. If coordinates fall between two nodes this will indicate previous node or null.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.TreeAreaInfo.NextNode">
+            <summary>
+            Next reference node for given coordinates. If coordinates fall between two nodes this will indicate next node or null.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.TreeGX">
+            <summary>
+            Summary description for UserControl1.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.TreeGX.components">
+            <summary>
+            Required designer variable.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.#ctor">
+            <summary>Creates new instance of the class.</summary>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.Dispose(System.Boolean)">
+            <summary>
+            Clean up any resources being used.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.InitializeComponent">
+            <summary>
+            Required method for Designer support - do not modify 
+            the contents of this method with the code editor.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.InvalidateNode(DevComponents.Tree.Node)">
+            <summary>
+            Invalidates node bounds on canvas.
+            </summary>
+            <param name="node">Reference node.</param>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.ShouldSerializeSelectionBoxBorderColor">
+            <summary>
+            Indicates whether SelectionBoxBorderColor should be serialized. Used by windows forms designer design-time support.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.ResetSelectionBoxBorderColor">
+            <summary>
+            Resets SelectionBoxBorderColor to it's default value. Used by windows forms designer design-time support.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.ShouldSerializeSelectionBoxFillColor">
+            <summary>
+            Indicates whether SelectionBoxFillColor should be serialized. Used by windows forms designer design-time support.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.ResetSelectionBoxFillColor">
+            <summary>
+            Resets SelectionBoxFillColor to it's default value. Used by windows forms designer design-time support.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.ShouldSerializeExpandButtonSize">
+            <summary>
+            Indicates whether SelectionBoxFillColor should be serialized. Used by windows forms designer design-time support.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.ResetExpandButtonSize">
+            <summary>
+            Resets SelectionBoxFillColor to it's default value. Used by windows forms designer design-time support.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.ShouldSerializeExpandBorderColor">
+            <summary>
+            Indicates whether ExpandBorderColor should be serialized. Used by windows forms designer design-time support.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.ResetExpandBorderColor">
+            <summary>
+            Resets ExpandBorderColor to it's default value. Used by windows forms designer design-time support.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.ShouldSerializeExpandBackColor">
+            <summary>
+            Indicates whether ExpandBackColor should be serialized. Used by windows forms designer design-time support.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.ResetExpandBackColor">
+            <summary>
+            Resets ExpandBackColor to it's default value. Used by windows forms designer design-time support.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.ShouldSerializeExpandBackColor2">
+            <summary>
+            Indicates whether ExpandBackColor2 should be serialized. Used by windows forms designer design-time support.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.ResetExpandBackColor2">
+            <summary>
+            Resets ExpandBackColor2 to it's default value. Used by windows forms designer design-time support.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.ShouldSerializeExpandLineColor">
+            <summary>
+            Indicates whether ExpandLineColor should be serialized. Used by windows forms designer design-time support.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.ResetExpandLineColor">
+            <summary>
+            Resets ExpandLineColor to it's default value. Used by windows forms designer design-time support.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.ShouldSerializeCommandBackColor">
+            <summary>
+            Indicates whether CommandBackColor should be serialized. Used by windows forms designer design-time support.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.ResetCommandBackColor">
+            <summary>
+            Resets CommandBackColor to it's default value. Used by windows forms designer design-time support.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.ShouldSerializeCommandBackColor2">
+            <summary>
+            Indicates whether CommandBackColor2 should be serialized. Used by windows forms designer design-time support.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.ResetCommandBackColor2">
+            <summary>
+            Resets CommandBackColor2 to it's default value. Used by windows forms designer design-time support.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.ShouldSerializeCommandForeColor">
+            <summary>
+            Indicates whether CommandForeColor should be serialized. Used by windows forms designer design-time support.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.ResetCommandForeColor">
+            <summary>
+            Resets CommandForeColor to it's default value. Used by windows forms designer design-time support.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.ShouldSerializeCommandMouseOverBackColor">
+            <summary>
+            Indicates whether CommandMouseOverBackColor should be serialized. Used by windows forms designer design-time support.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.ResetCommandMouseOverBackColor">
+            <summary>
+            Resets CommandMouseOverBackColor to it's default value. Used by windows forms designer design-time support.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.ShouldSerializeCommandMouseOverBackColor2">
+            <summary>
+            Indicates whether CommandMouseOverBackColor2 should be serialized. Used by windows forms designer design-time support.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.ResetCommandMouseOverBackColor2">
+            <summary>
+            Resets CommandMouseOverBackColor2 to it's default value. Used by windows forms designer design-time support.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.ShouldSerializeCommandMouseOverForeColor">
+            <summary>
+            Indicates whether CommandMouseOverForeColor should be serialized. Used by windows forms designer design-time support.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.ResetCommandMouseOverForeColor">
+            <summary>
+            Resets CommandMouseOverForeColor to it's default value. Used by windows forms designer design-time support.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.GetColor(System.Drawing.Color,DevComponents.Tree.eColorSchemePart)">
+            <summary>
+            Returns color scheme part color if set otherwise returns color passed in.
+            </summary>
+            <param name="color">Color.</param>
+            <param name="p">Color scheme part.</param>
+            <returns>Color.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.PaintTo(System.Drawing.Graphics,System.Boolean)">
+            <summary>
+            Paints control to canvas. This method might be used for print output.
+            </summary>
+            <param name="g">Graphics object to paint control to.</param>
+            <param name="background">Indicates whether to paint control background.</param>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.PaintTo(System.Drawing.Graphics,System.Boolean,System.Drawing.Rectangle)">
+            <summary>
+            Paints control to canvas. This method might be used for print output.
+            </summary>
+            <param name="g">Graphics object to paint control to.</param>
+            <param name="background">Indicates whether to paint control background.</param>
+            <param name="clipRectangle">Indicates clipping rectangle. Nodes outside of clipping rectangle will not be painted. You can pass Rectangle.Empty and all nodes will be painted.</param>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.SelectNode(DevComponents.Tree.Node,DevComponents.Tree.eTreeAction)">
+            <summary>
+            Selected specified node.
+            </summary>
+            <param name="node">Node to select.</param>
+            <param name="action">Action that is selecting the node.</param>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.ValidateSelectedNode">
+            <summary>
+            Ensures that selected node is visible i.e. that all parents of the selected node are expanded. If not selects the first parent node not expanded.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.EditCell(DevComponents.Tree.Cell,DevComponents.Tree.eTreeAction)">
+            <summary>
+            Starts editing specified cell, places the cell into the edit mode.
+            </summary>
+            <param name="cell">Cell to start editing.</param>
+            <param name="action">Action that is a cause for the edit.</param>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.EditCell(DevComponents.Tree.Cell,DevComponents.Tree.eTreeAction,System.String)">
+            <summary>
+            Starts editing specified cell, places the cell into the edit mode.
+            </summary>
+            <param name="cell">Cell to start editing.</param>
+            <param name="action">Action that is a cause for the edit.</param>
+            <param name="initialText">Specifies the text to be edited instead of the text of the cell. Passing the NULL value will edit the text of the cell.</param>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.EndCellEditing(DevComponents.Tree.eTreeAction)">
+            <summary>
+            Ends cell editing.
+            </summary>
+            <param name="action">Specifies which action is cause for end of the editing.</param>
+            <returns>Returns true if edits were applied to the cell or false otherwise.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.CancelCellEdit(DevComponents.Tree.eTreeAction)">
+            <summary>
+            Cancels the cell editing if it is in progress.
+            </summary>
+            <param name="action">Specifies which action is cause for canceling of editing.</param>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.InvokeBeforeNodeInsert(DevComponents.Tree.eTreeAction,DevComponents.Tree.Node,DevComponents.Tree.Node)">
+            <summary>
+            Raises BeforeNodeInsert event
+            </summary>
+            <param name="node">Node that is about to be inserted</param>
+            <param name="action">Source of the event</param>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.InvokeAfterNodeInsert(DevComponents.Tree.eTreeAction,DevComponents.Tree.Node,DevComponents.Tree.Node)">
+            <summary>
+            Raises AfterNodeInsert event
+            </summary>
+            <param name="node">Node that is inserted</param>
+            <param name="action">Source of the event</param>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.InvokeBeforeNodeRemove(DevComponents.Tree.eTreeAction,DevComponents.Tree.Node,DevComponents.Tree.Node)">
+            <summary>
+            Raises BeforeNodeRemove event
+            </summary>
+            <param name="node">Node that is about to be removed</param>
+            <param name="action">Source of the event</param>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.InvokeAfterNodeRemove(DevComponents.Tree.eTreeAction,DevComponents.Tree.Node,DevComponents.Tree.Node)">
+            <summary>
+            Raises AfterNodeRemove event
+            </summary>
+            <param name="node">Node that is removed</param>
+            <param name="action">Source of the event</param>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.NodeRemoved(DevComponents.Tree.eTreeAction,DevComponents.Tree.Node,DevComponents.Tree.Node,System.Int32)">
+            <summary>
+            Called after node has been removed
+            </summary>
+            <param name="node">Node that is removed</param>
+            <param name="action">Source of the event</param>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.InvokeBeforeNodeDrop(DevComponents.Tree.TreeGXDragDropEventArgs)">
+            <summary>
+            Invokes BeforeNodeDrop event. If overriden base implementation must be called in order for event to fire.
+            </summary>
+            <param name="e">Provides information about event</param>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.InvokeAfterNodeDrop(DevComponents.Tree.TreeGXDragDropEventArgs)">
+            <summary>
+            Invokes AfterNodeDrop event. If overriden base implementation must be called in order for event to fire.
+            </summary>
+            <param name="e">Provides information about event</param>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.InvokeNodeMouseDown(DevComponents.Tree.TreeGXNodeMouseEventArgs)">
+            <summary>
+            Invokes NodeMouseDown event. If overriden base implementation must be called in order for event to fire.
+            </summary>
+            <param name="e">Provides information about event</param>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.InvokeNodeMouseUp(DevComponents.Tree.TreeGXNodeMouseEventArgs)">
+            <summary>
+            Invokes NodeMouseUp event. If overriden base implementation must be called in order for event to fire.
+            </summary>
+            <param name="e">Provides information about event</param>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.InvokeNodeMouseMove(DevComponents.Tree.TreeGXNodeMouseEventArgs)">
+            <summary>
+            Invokes NodeMouseMove event. If overriden base implementation must be called in order for event to fire.
+            </summary>
+            <param name="e">Provides information about event</param>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.InvokeNodeClick(DevComponents.Tree.TreeGXNodeMouseEventArgs)">
+            <summary>
+            Invokes NodeClick event. If overriden base implementation must be called in order for event to fire.
+            </summary>
+            <param name="e">Provides information about event</param>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.InvokeNodeDoubleClick(DevComponents.Tree.TreeGXNodeMouseEventArgs)">
+            <summary>
+            Invokes NodeDoubleClick event. If overriden base implementation must be called in order for event to fire.
+            </summary>
+            <param name="e">Provides information about event</param>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.InvokeNodeMouseEnter(DevComponents.Tree.TreeGXNodeMouseEventArgs)">
+            <summary>
+            Invokes NodeMouseEnter event.  If overriden base implementation must be called in order for event to fire.
+            </summary>
+            <param name="e">Provides information about event</param>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.InvokeNodeMouseLeave(DevComponents.Tree.TreeGXNodeMouseEventArgs)">
+            <summary>
+            Invokes NodeMouseLeave event.  If overriden base implementation must be called in order for event to fire.
+            </summary>
+            <param name="e">Provides information about event</param>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.InvokeNodeMouseHover(DevComponents.Tree.TreeGXNodeMouseEventArgs)">
+            <summary>
+            Invokes NodeMouseHover event.  If overriden base implementation must be called in order for event to fire.
+            </summary>
+            <param name="e">Provides information about event</param>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.Save(System.Xml.XmlDocument)">
+            <summary>
+            Save nodes to XmlDocument. New Node TreeGX is created and nodes are serialized into it.
+            </summary>
+            <param name="document">Reference to an instance of XmlDocument object</param>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.Save(System.String)">
+            <summary>
+            Saves nodes to a file.
+            </summary>
+            <param name="fileName">File name to save nodes to.</param>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.Save(System.IO.Stream)">
+            <summary>
+            Saves nodes to specified stream.
+            </summary>
+            <param name="outStream">Stream to save nodes to.</param>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.Save(System.IO.TextWriter)">
+            <summary>
+            Saves nodes to specified writer.
+            </summary>
+            <param name="writer">Writer to save nodes to.</param>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.Save(System.Xml.XmlWriter)">
+            <summary>
+            Saves nodes to specified writer.
+            </summary>
+            <param name="writer">Writer to save nodes to.</param>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.Load(System.String)">
+            <summary>
+            Load nodes from file.
+            </summary>
+            <param name="fileName">File to load nodes from</param>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.Load(System.IO.Stream)">
+            <summary>
+            Load nodes from stream.
+            </summary>
+            <param name="inStream">Stream to load from</param>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.Load(System.Xml.XmlReader)">
+            <summary>
+            Load nodes from reader.
+            </summary>
+            <param name="reader">Reader to load from.</param>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.Load(System.IO.TextReader)">
+            <summary>
+            Load nodes from reader.
+            </summary>
+            <param name="reader">Reader to load from.</param>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.Load(System.Xml.XmlDocument)">
+            <summary>
+            Load nodes from an XmlDocument object.
+            </summary>
+            <param name="document">Document to load Nodes from.</param>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.Refresh">
+            <summary>
+            Forces the control to invalidate its client area and immediately redraw itself
+            and any child controls. Note however that this method will node do anything if refresh
+            is suspended as result of call to BeginUpdate method without corresponding EndUpdate
+            call or if SuspendPaint property is set to true.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.SetNodeMapPosition(DevComponents.Tree.Node,DevComponents.Tree.eMapPosition)">
+            <summary>
+            Sets the node map position when tree is in Map layout mode. The node's position
+            can be set only for the sub-root nodes, i.e. nodes that are parented directly to
+            top-level root node. Setting map position for any other node does not have any effect.
+            </summary>
+            <remarks>
+            	<para>Note that setting map position explicitly can change the position for other
+                nodes that are on the same level as the node that you pass into this method. Since
+                Map mode layouts the nodes clock-wise, setting the node position to Near will cause
+                all nodes that are in collection <strong>after</strong> the reference node to be
+                positioned Near as well.</para>
+            	<para>Similarly, setting the node position to Far will cause all nodes that are in
+                collection <strong>before</strong> the reference node to be positioned Far as
+                well.</para>
+            </remarks>
+            <param name="node">Sub-root node to set layout position for.</param>
+            <param name="position">The position relative to the root node should take</param>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.BeginUpdate">
+            <summary>
+            Disables any redrawing of the tree control. To maintain performance while items
+            are added one at a time to the control, call the BeginUpdate method. The BeginUpdate
+            method prevents the control from painting until the
+            <see cref="M:DevComponents.Tree.TreeGX.EndUpdate">EndUpdate</see> method is called.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.EndUpdate">
+            <summary>
+            Enables the redrawing of the tree view. To maintain performance while items are
+            added one at a time to the control, call the <see cref="M:DevComponents.Tree.TreeGX.BeginUpdate">BeginUpdate</see>
+            method. The BeginUpdate method prevents the control from painting until the EndUpdate
+            method is called.
+            </summary>
+            <remarks>
+            Call to EndUpdate will enable the layout and painting in tree control. If there
+            are any pending layouts the EndUpdate will call
+            <see cref="M:DevComponents.Tree.TreeGX.RecalcLayout">RecalcLayout</see> method to perform the layout and it will
+            repaint the control.
+            </remarks>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.EndUpdate(System.Boolean)">
+            <summary>
+            Enables the redrawing of the tree view. To maintain performance while items are
+            added one at a time to the control, call the <see cref="M:DevComponents.Tree.TreeGX.BeginUpdate">BeginUpdate</see>
+            method. The BeginUpdate method prevents the control from painting until the EndUpdate
+            method is called.
+            </summary>
+            <param name="performLayoutAndRefresh">Gets or sets whether layout and refresh of control is performed if there are no other update blocks pending.</param>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.GetNodeAt(System.Drawing.Point)">
+            <summary>
+            Retrieves the tree node that is at the specified location.
+            </summary>
+            <returns>The Node at the specified point, in tree view coordinates.</returns>
+            <remarks>
+            	<para>You can pass the MouseEventArgs.X and MouseEventArgs.Y coordinates of the
+                MouseDown event as the x and y parameters.</para>
+            </remarks>
+            <param name="p">The Point to evaluate and retrieve the node from.</param>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.GetNodeAt(System.Int32,System.Int32)">
+            <summary>
+            Retrieves the tree node that is at the specified location.
+            </summary>
+            <returns>The TreeNode at the specified location, in tree view coordinates.</returns>
+            <remarks>
+            	<para>You can pass the MouseEventArgs.X and MouseEventArgs.Y coordinates of the
+                MouseDown event as the x and y parameters.</para>
+            </remarks>
+            <param name="x">The X position to evaluate and retrieve the node from.</param>
+            <param name="y">The Y position to evaluate and retrieve the node from.</param>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.GetCellAt(System.Drawing.Point)">
+            <summary>
+            Retrieves the node cell that is at the specified location.
+            </summary>
+            <param name="p">The Point to evaluate and retrieve the cell from.</param>
+            <returns>The Cell at the specified point, in tree view coordinates.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.GetCellAt(System.Int32,System.Int32)">
+            <summary>
+            Retrieves the node cell that is at the specified location.
+            </summary>
+            <param name="x">The X position to evaluate and retrieve the cell from.</param>
+            <param name="y">The Y position to evaluate and retrieve the cell from.</param>
+            <returns>The Cell at the specified point, in tree view coordinates.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.RecalcLayout">
+            <summary>Applies any layout changes to the tree control.</summary>
+            <remarks>
+            Layout will not be performed if BeginUpdate is called. Any calls to the
+            RecalcLayout will return without executing requested layout operation.
+            </remarks>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.WndProc(System.Windows.Forms.Message@)">
+            <summary>
+            This member overrides Control.WndProc.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.RecalcLayoutInternal">
+            <summary>
+            Recalculates layout for the tree control. Not afffected by BeginUpdate call.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.GetTranslationMatrix">
+            <summary>
+            Returns translation matrix for current Zoom. Translation matrix is used to translate internal node coordinates to screen
+            coordinates when Zoom is not set to 1.
+            </summary>
+            <returns>Returns new instance of Matrix object.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.GetLayoutRectangle(System.Drawing.Rectangle)">
+            <summary>
+            Returns layout based rectangle from screen rectangle. Layout based rectangle will be different
+            from screen rectangle when Zoom is not set to 1. This method will translate the screen rectangle enlarged by Zoom
+            to layout rectangle which does not have Zoom applied.
+            </summary>
+            <param name="r">Screen rectangle</param>
+            <returns>Layout rectangle</returns>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.GetLayoutPosition(System.Windows.Forms.MouseEventArgs)">
+            <summary>
+            Returns mouse position which is translated if control Zoom is not equal 1
+            </summary>
+            <param name="e">Mouse event arguments</param>
+            <returns>Returns translated position</returns>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.GetLayoutPosition(System.Drawing.Point)">
+            <summary>
+            Returns mouse position which is translated if control Zoom is not equal 1
+            </summary>
+            <param name="mousePosition">Mouse position</param>
+            <returns>Returns translated position</returns>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.GetLayoutPosition(System.Int32,System.Int32)">
+            <summary>
+            Returns mouse position which is translated if control Zoom is not equal 1
+            </summary>
+            <param name="x">X coordinate</param>
+            <param name="y">Y coordinate</param>
+            <returns></returns>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.GetScreenRectangle(System.Drawing.Rectangle)">
+            <summary>
+            Returns rectangle translated to screen rectangle if Zoom is not equal 1.
+            </summary>
+            <param name="r">Rectangle to translate</param>
+            <returns>Screen Rectangle</returns>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.GetScreenSize(System.Drawing.Size)">
+            <summary>
+            Returns size translated to screen dimension if Zoom is not equal 1.
+            </summary>
+            <param name="s">Size to translate</param>
+            <returns>Screen Size</returns>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.InvokeAfterCheck(DevComponents.Tree.TreeGXCellEventArgs)">
+            <summary>
+            Calls <see cref="M:DevComponents.Tree.TreeGX.OnAfterCheck(DevComponents.Tree.TreeGXCellEventArgs)">OnAfterCheck</see> method which fired
+            <see cref="E:DevComponents.Tree.TreeGX.AfterCheck">AfterCheck</see> event.
+            </summary>
+            <param name="e">Event arguments.</param>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.OnAfterCheck(DevComponents.Tree.TreeGXCellEventArgs)">
+            <summary>Raises the <see cref="E:DevComponents.Tree.TreeGX.AfterCheck">AfterCheck</see> event.</summary>
+            <param name="e">
+            A <see cref="T:DevComponents.Tree.TreeGXCellEventArgs">TreeGXEventArgs</see> that contains the event
+            data.
+            </param>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.InvokeCommandButtonClick(DevComponents.Tree.Node,DevComponents.Tree.CommandButtonEventArgs)">
+            <summary>
+            Invokes CommandButtonClick event.
+            </summary>
+            <param name="node">Context node.</param>
+            <param name="e">Event arguments.</param>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.OnDeserializeNode(DevComponents.Tree.SerializeNodeEventArgs)">
+            <summary>
+            Invokes DeserializeNode event.
+            </summary>
+            <param name="e">Provides more information about the event</param>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.OnSerializeNode(DevComponents.Tree.SerializeNodeEventArgs)">
+            <summary>
+            Invokes SerializeNode event.
+            </summary>
+            <param name="e">Provides more information about the event</param>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.OnMarkupLinkClick(System.Object,DevComponents.Tree.MarkupLinkClickEventArgs)">
+            <summary>
+            Invokes the MarkupLinkClick evcent.
+            </summary>
+            <param name="sender">Sender of the event, usually instance Cell object.</param>
+            <param name="e">Event arguments</param>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.InternalDragOver(System.Windows.Forms.DragEventArgs)">
+            <summary>
+            Processes drag over event.
+            </summary>
+            <param name="drgevent">Drag event arguments.</param>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.GetDisplayRootNode">
+            <summary>
+            Returns the display root node.
+            </summary>
+            <returns>Instance of node or null if there is no display root node.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.GetDragNode">
+            <summary>
+            Returns reference to the node involved in drag-drop operation if any.
+            </summary>
+            <returns>Reference to node object or null if there is no drag node.</returns>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.BeginInit">
+            <summary>
+            This member supports the .NET Framework infrastructure and is not intended to be
+            used directly from your code.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGX.EndInit">
+            <summary>
+            This member supports the .NET Framework infrastructure and is not intended to be
+            used directly from your code.
+            </summary>
+        </member>
+        <member name="E:DevComponents.Tree.TreeGX.AfterCheck">
+            <summary>
+            Occurs after the cell check box is checked.
+            </summary>
+        </member>
+        <member name="E:DevComponents.Tree.TreeGX.AfterCollapse">
+            <summary>
+            Occurs after the tree node is collapsed.
+            </summary>
+        </member>
+        <member name="E:DevComponents.Tree.TreeGX.BeforeCollapse">
+            <summary>
+            Occurs before the tree node is collapsed.
+            </summary>
+        </member>
+        <member name="E:DevComponents.Tree.TreeGX.AfterExpand">
+            <summary>
+            Occurs after the tree node is expanded.
+            </summary>
+        </member>
+        <member name="E:DevComponents.Tree.TreeGX.BeforeExpand">
+            <summary>
+            Occurs before the tree node is expanded.
+            </summary>
+        </member>
+        <member name="E:DevComponents.Tree.TreeGX.CommandButtonClick">
+            <summary>
+            Occurs when command button on node is clicked.
+            </summary>
+        </member>
+        <member name="E:DevComponents.Tree.TreeGX.BeforeCellEdit">
+            <summary>
+            Occurs before cell is edited. The order of the cell editing events is as follows:
+            BeforeCellEdit, CellEditEnding, AfterCellEdit.
+            </summary>
+        </member>
+        <member name="E:DevComponents.Tree.TreeGX.CellEditEnding">
+            <summary>
+            Occurs just before the cell editing is ended. The text box for editing is still visible and you can cancel
+            the exit out of editing mode at this point. The order of the cell editing events is as follows:
+            BeforeCellEdit, CellEditEnding, AfterCellEdit.
+            </summary>
+        </member>
+        <member name="E:DevComponents.Tree.TreeGX.AfterCellEdit">
+            <summary>
+            Occurs after cell editing has ended and before the new text entered by the user is assigned to the cell. You can abort the edits in this event.
+            The order of the cell editing events is as follows:
+            BeforeCellEdit, CellEditEnding, AfterCellEdit.
+            </summary>
+        </member>
+        <member name="E:DevComponents.Tree.TreeGX.BeforeNodeSelect">
+            <summary>
+            Occurs after Node has been selected by user or through the SelectedNode property. Event can be cancelled.
+            </summary>
+        </member>
+        <member name="E:DevComponents.Tree.TreeGX.AfterNodeSelect">
+            <summary>
+            Occurs after node has been selected by user or through the SelectedNode property.
+            </summary>
+        </member>
+        <member name="E:DevComponents.Tree.TreeGX.BeforeNodeRemove">
+            <summary>
+            Occurs before node has been removed from its parent.
+            </summary>
+        </member>
+        <member name="E:DevComponents.Tree.TreeGX.AfterNodeRemove">
+            <summary>
+            Occurs after node has been removed from its parent.
+            </summary>
+        </member>
+        <member name="E:DevComponents.Tree.TreeGX.BeforeNodeInsert">
+            <summary>
+            Occurs before node is inserted or added as child node to parent node.
+            </summary>
+        </member>
+        <member name="E:DevComponents.Tree.TreeGX.AfterNodeInsert">
+            <summary>
+            Occurs after node is inserted or added as child node.
+            </summary>
+        </member>
+        <member name="E:DevComponents.Tree.TreeGX.BeforeNodeDrop">
+            <summary>
+            Occurs before Drag-Drop of a node is completed and gives you information about new parent of the node that is being dragged
+            as well as opportunity to cancel the operation.
+            </summary>
+        </member>
+        <member name="E:DevComponents.Tree.TreeGX.AfterNodeDrop">
+            <summary>
+            Occurs after Drag-Drop of a node is completed. This operation cannot be cancelled.
+            </summary>
+        </member>
+        <member name="E:DevComponents.Tree.TreeGX.NodeMouseDown">
+            <summary>
+            Occurs when the mouse pointer is over the node and a mouse button is pressed.
+            </summary>
+        </member>
+        <member name="E:DevComponents.Tree.TreeGX.NodeMouseUp">
+            <summary>
+            Occurs when the mouse pointer is over the node and a mouse button is released.
+            </summary>
+        </member>
+        <member name="E:DevComponents.Tree.TreeGX.NodeMouseMove">
+            <summary>
+            Occurs when the mouse pointer is moved over the node.
+            </summary>
+        </member>
+        <member name="E:DevComponents.Tree.TreeGX.NodeMouseEnter">
+            <summary>
+            Occurs when the mouse enters the node.
+            </summary>
+        </member>
+        <member name="E:DevComponents.Tree.TreeGX.NodeMouseLeave">
+            <summary>
+            Occurs when the mouse leaves the node.
+            </summary>
+        </member>
+        <member name="E:DevComponents.Tree.TreeGX.NodeMouseHover">
+            <summary>
+            Occurs when the mouse hovers over the node.
+            </summary>
+        </member>
+        <member name="E:DevComponents.Tree.TreeGX.NodeClick">
+            <summary>
+            Occurs when the node is clicked with left mouse button. If you need to know more information like if another mouse button is clicked etc. use
+            NodeMouseDown event.
+            </summary>
+        </member>
+        <member name="E:DevComponents.Tree.TreeGX.NodeDoubleClick">
+            <summary>
+            Occurs when the node is double-clicked.
+            </summary>
+        </member>
+        <member name="E:DevComponents.Tree.TreeGX.SerializeNode">
+            <summary>
+            Occurs after an node has been serialized to XmlElement and provides you with opportunity to add any custom data
+            to serialized XML. This allows you to serialize any data associated with the node and load it back up in DeserializeNode event.
+            </summary>
+            <remarks>
+            	<para>To serialize custom data to XML definition control creates handle this event and use CustomXmlElement
+            property on SerializeNodeEventArgs to add new nodes or set attributes with custom data you want saved.</para>
+            </remarks>
+        </member>
+        <member name="E:DevComponents.Tree.TreeGX.DeserializeNode">
+            <summary>
+            Occurs after an node has been de-serialized (loaded) from XmlElement and provides you with opportunity to load any custom data
+            you have serialized during SerializeItem event.
+            </summary>
+            <remarks>
+            	<para>To de-serialize custom data from XML definition handle this event and use CustomXmlElement
+            property on SerializeItemEventArgs to retrive any data you saved in SerializeNode event.</para>
+            </remarks>
+        </member>
+        <member name="E:DevComponents.Tree.TreeGX.MarkupLinkClick">
+            <summary>
+            Occurs when hyperlink in text-markup is clicked.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.DotNetBarManager">
+            <summary>
+            Gets or sets the reference to DotNetBar DotNetBarManager component which is used to provide context menu for nodes. This property
+            is automatically maintained by TreeGX.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.Zoom">
+            <summary>
+            Gets or sets zoom factor for the control. Default value is 1. To zoom display of the nodes for 20% set zoom factor to 1.2
+            To zoom view 2 times set zoom factor to 2. Value must be greater than 0.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.TreeSize">
+            <summary>
+            Gets the size of the tree.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.NodeRenderer">
+            <summary>
+            Gets or sets custom node renderer. You can set this property to your custom renderer. When set the RenderMode should be set to Custom to enable
+            your custom renderer. To choose one of the system renderer use RenderMode property. Default value is null.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.RenderMode">
+            <summary>
+            Gets or sets the render mode used to render all nodes. Default value is eNodeRenderMode.Default which indicates that system default renderer is used.
+            Note that if you specify custom renderer you need to set TreeGX.NodeRenderer property to your custom renderer.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.BackgroundStyle">
+            <summary>
+            Gets the style for the background of the control.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.DiagramLayoutFlow">
+            <summary>
+            Gets or sets the flow of nodes when Diagram layout is used. Note that this setting applies only to Diagram layout type.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.MapLayoutFlow">
+            <summary>
+            Gets or sets the flow of nodes when Map layout is used. Note that this setting applies only to Map layout type.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.NodeHorizontalSpacing">
+            <summary>
+            Gets or sets the horizontal spacing in pixels between nodes. Default value is 32.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.NodeVerticalSpacing">
+            <summary>
+            Gets or sets the vertical spacing in pixels between nodes. Default value is 16.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.LayoutType">
+            <summary>
+            Gets or sets the layout type for the nodes.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.DragDropEnabled">
+            <summary>
+            Gets or sets whether automatic drag and drop is enabled. Default value is true.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.AntiAlias">
+            <summary>
+            Gets or sets whether anti-alias smoothing is used while painting the tree.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.PathSeparator">
+            <summary>
+            Gets or sets the delimiter string that the tree node path uses.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.Columns">
+            <summary>
+            Gets the collection of all column headers that appear in the tree.
+            </summary>
+            <remarks>
+            	<para>By default there are no column headers defined. In that case tree control
+                functions as regular tree control where text has unrestricted width.</para>
+            	<para>If you want to restrict the horizontal width of the text but not display
+                column header you can create one column and set its width to the width desired and
+                set its Visible property to false.</para>
+            </remarks>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.Styles">
+            <summary>
+            Gets the collection of all style elements created for the tree.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.CellStyleDefault">
+            <summary>
+            Gets or sets default style for the node cell.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.CellStyleMouseDown">
+            <summary>
+            Gets or sets default style for the node cell when mouse is pressed.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.CellStyleMouseOver">
+            <summary>
+            Gets or sets default style for the node cell when mouse is over the cell.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.CellStyleSelected">
+            <summary>
+            Gets or sets default style for the node cell when cell is selected.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.CellStyleDisabled">
+            <summary>
+            Gets or sets default style for the node cell when cell is disabled.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.NodeStyleExpanded">
+            <summary>
+            Gets or sets default style for the node when node is expanded.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.NodeStyle">
+            <summary>
+            Gets or sets default style for all nodes where style is not specified
+            explicity.
+            </summary>
+            <value>
+            Name of the style assigned or null value indicating that no style is used.
+            Default value is null.
+            </value>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.NodeStyleSelected">
+            <summary>
+            Gets or sets style for the node when node is selected. Note that this style is applied to the default node style.
+            </summary>
+            <value>
+            Reference to the style assigned or null value indicating that no style is used.
+            Default value is null.
+            </value>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.NodeStyleMouseOver">
+            <summary>
+            Gets or sets style for the node when mouse is over node. Note that this style is applied to the default node style.
+            </summary>
+            <value>
+            Reference to the style assigned or null value indicating that no style is used.
+            Default value is null.
+            </value>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.Nodes">
+            <summary>
+            Gets the collection of tree nodes that are assigned to the tree view control.
+            </summary>
+            <value>
+            A <see cref="T:DevComponents.Tree.NodeCollection">NodeCollection</see> that represents the tree nodes
+            assigned to the tree control.
+            </value>
+            <remarks>
+            	<para>The Nodes property holds a collection of Node objects, each of which has a
+                Nodes property that can contain its own NodeCollection.</para>
+            </remarks>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.ColumnStyleNormal">
+            <summary>
+            Gets or sets the default style class assigned to the column headers.
+            </summary>
+            <value>
+            Reference to the style assigned to the column header.
+            </value>
+            <remarks>
+            When style is not set on ColumnHeader objects then style setting from this property is used instead.
+            </remarks>
+            <seealso cref="P:DevComponents.Tree.TreeGX.ColumnStyleMouseDown">ColumnStyleMouseDown Property</seealso>
+            <seealso cref="P:DevComponents.Tree.TreeGX.ColumnStyleMouseOver">ColumnStyleMouseOver Property</seealso>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.ColumnStyleMouseDown">
+            <summary>
+            Gets or sets default style class assigned to the column which is applied when mouse
+            button is pressed over the header.
+            </summary>
+            <value>
+            Name of the style assigned to the column.
+            </value>
+            <remarks>
+            When style is not set on ColumnHeader objects then style setting from this property is used instead.
+            </remarks>
+            <seealso cref="P:DevComponents.Tree.TreeGX.ColumnStyleNormal">ColumnStyleNormal Property</seealso>
+            <seealso cref="P:DevComponents.Tree.TreeGX.ColumnStyleMouseOver">ColumnStyleMouseOver Property</seealso>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.ColumnStyleMouseOver">
+            <summary>
+            Gets or sets default style class assigned to the column which is applied when mouse is
+            over the column.
+            </summary>
+            <value>
+            Name of the style assigned to the column.
+            </value>
+            <remarks>
+            When style is not set on ColumnHeader objects then style setting from this property is used instead.
+            </remarks>
+            <seealso cref="P:DevComponents.Tree.TreeGX.ColumnStyleNormal">ColumnStyleNormal Property</seealso>
+            <seealso cref="P:DevComponents.Tree.TreeGX.ColumnStyleMouseDown">ColumnStyleMouseDown Property</seealso>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.Headers">
+            <summary>
+            Gets collection that holds definition of column headers associated with nodes.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.SelectedNode">
+            <summary>
+            Gets or sets the tree node that is currently selected in the tree view control.
+            </summary>
+            <remarks>
+            	<para>If no <see cref="T:DevComponents.Tree.Node">Node</see> is currently selected, the
+                <b>SelectedNode</b> property is a null reference (<b>Nothing</b> in Visual
+                Basic).</para>
+            </remarks>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.NodeLayout">
+            <summary>
+            Returns reference to node layout object.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.NodeDisplay">
+            <summary>
+            Returns reference to node display object.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.IsUpdateSuspended">
+            <summary>
+            Gets whether layout is suspended for tree control. Layout is suspended after
+            call to <see cref="M:DevComponents.Tree.TreeGX.BeginUpdate">BeginUpdate</see> method and it is resumed after the
+            call to <see cref="M:DevComponents.Tree.TreeGX.EndUpdate">EndUpdate</see> method.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.SuspendPaint">
+            <summary>
+            Gets or sets whether paint operations are suspended for the control. You should use this method
+            if you need the RecalcLayout operations to proceed but you want to stop painting of the control.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.ImageList">
+            <summary>
+            Gets or sets the ImageList that contains the Image objects used by the tree nodes.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.ImageIndex">
+            <summary>
+            Gets or sets the image-list index value of the default image that is displayed by the tree nodes.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.RootConnector">
+            <summary>
+            Gets or sets the NodeConnector object that describes the type of the connector used for
+            displaying connection between root node and it's nested nodes. The root node is defined as
+            the top level node i.e. which belongs directly to TreeGX.Nodes collection. Default value is null.
+            </summary>
+            <remarks>
+            You can use
+            <a href="TreeGX~DevComponents.Tree.Node~ParentConnector.html">Node.ParentConnector</a>
+            property to specify per node connectors.
+            </remarks>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.NodesConnector">
+            <summary>
+            Gets or sets the NodeConnector object that describes the type of the connector used for
+            displaying connection between nested nodes. RootConnector property specifies the connector
+            between root node and it's imidate nested nodes. This property specifies connector for all other nested levels.
+            Default value is null.
+            </summary>
+            <remarks>
+            You can use
+            <a href="TreeGX~DevComponents.Tree.Node~ParentConnector.html">Node.ParentConnector</a>
+            property to specify per node connectors.
+            </remarks>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.LinkConnector">
+            <summary>
+            Gets or sets the NodeConnector object that describes the type of the connector used for
+            displaying connection between linked nodes. This property specifies connector for all linked nodes.
+            Default value is null.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.SelectedPathConnector">
+            <summary>
+            Gets or sets the NodeConnector object that describes the type of the connector used for
+            displaying connection between linked nodes. Connector specified here is used to display the connection
+            between nodes that are on the path to the selected node. When set you can use it to visually indicate the path to the currently selected node.
+            Default value is null.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.CellLayout">
+            <summary>
+            Gets or sets the layout of the cells inside the node. Default value is Horizontal layout which
+            means that cell are positioned horizontally next to each other.
+            </summary>
+            <remarks>
+            You can specify cell layout on each node by using
+            <a href="TreeGX~DevComponents.Tree.Node~CellLayout.html">Node.CellLayout</a>
+            property.
+            </remarks>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.CellPartLayout">
+            <summary>
+            Gets or sets the layout of the cells inside the node. Default value is Horizontal layout which
+            means that cell are positioned horizontally next to each other.
+            </summary>
+            <remarks>
+            You can specify cell layout on each node by using
+            <a href="TreeGX~DevComponents.Tree.Node~CellLayout.html">Node.CellLayout</a>
+            property.
+            </remarks>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.ColorSchemeStyle">
+            <summary>
+            Gets or sets the color scheme style. Color scheme provides predefined colors based on popular visual styles.
+            We recommend that you use "SchemePart" color settings since they maintain consistant look that is
+            based on target system color scheme setting.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.ColorScheme">
+            <summary>
+            Gets the reference to the color scheme object.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.CenterContent">
+            <summary>
+            Gets or sets whether the content of the control is centered within the bounds of control. Default value is true.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.SelectionBox">
+            <summary>
+            Gets or sets the value that indicates whether selection box is drawn around the
+            selected node. Default value is true. Another way to provide the visual indication that
+            node is selected is by using selected state style properties like
+            <a href="TreeGX~DevComponents.Tree.TreeGX~NodeStyleSelected.html">NodeStyleSelected</a>
+            and
+            <a href="TreeGX~DevComponents.Tree.TreeGX~CellStyleSelected.html">CellStyleSelected</a>.
+            </summary>
+            <seealso cref="P:DevComponents.Tree.TreeGX.CellStyleSelected">CellStyleSelected Property</seealso>
+            <seealso cref="P:DevComponents.Tree.TreeGX.NodeStyleSelected">NodeStyleSelected Property</seealso>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.SelectionBoxSize">
+            <summary>
+            Gets or sets the size/thickness in pixel of the selection box drawn around selected
+            node.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.SelectionBoxBorderColor">
+            <summary>
+            Gets or sets the selection box border color.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.SelectionBoxFillColor">
+            <summary>
+            Gets or sets the selection box fill color.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.ExpandButtonSize">
+            <summary>
+            Gets or sets the size of the expand button that is used to expand/collapse node. Default value is 8,8.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.ExpandBorderColor">
+            <summary>
+            Gets or sets expand button border color. Note that setting ExpandBorderColorSchemePart property will override the value that you set here.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.ExpandBorderColorSchemePart">
+            <summary>
+            Gets or sets expand button color scheme border color. Setting
+            this property overrides the setting of the corresponding ExpandBorderColor property.
+            Color scheme colors are automatically managed and are based on current system colors.
+            That means if colors on the system change the color scheme will ensure that it's colors
+            are changed as well to fit in the color scheme of target system. Set this property to
+            <a href="TreeGX~DevComponents.Tree.eColorSchemePart.html">eColorSchemePart.None</a> to
+            specify explicit color to use through ExpandBorderColor property.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.ExpandBackColor">
+            <summary>
+            Gets or sets expand button back color. Note that setting ExpandBackColorSchemePart property will override the value that you set here.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.ExpandBackColorSchemePart">
+            <summary>
+            Gets or sets expand button color scheme back color. Setting
+            this property overrides the setting of the corresponding ExpandBackColor property.
+            Color scheme colors are automatically managed and are based on current system colors.
+            That means if colors on the system change the color scheme will ensure that it's colors
+            are changed as well to fit in the color scheme of target system. Set this property to
+            <a href="TreeGX~DevComponents.Tree.eColorSchemePart.html">eColorSchemePart.None</a> to
+            specify explicit color to use through ExpandBackColor property.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.ExpandBackColor2">
+            <summary>
+            Gets or sets expand button target gradientback color. Note that setting ExpandBackColor2SchemePart property will override the value that you set here.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.ExpandBackColor2SchemePart">
+            <summary>
+            Gets or sets expand button color scheme target gradient back color. Setting
+            this property overrides the setting of the corresponding ExpandBackColor2 property.
+            Color scheme colors are automatically managed and are based on current system colors.
+            That means if colors on the system change the color scheme will ensure that it's colors
+            are changed as well to fit in the color scheme of target system. Set this property to
+            <a href="TreeGX~DevComponents.Tree.eColorSchemePart.html">eColorSchemePart.None</a> to
+            specify explicit color to use through ExpandBackColor2 property.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.ExpandLineColor">
+            <summary>
+            Gets or sets expand button line color. Note that setting ExpandLineColorSchemePart property will override the value that you set here.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.ExpandLineColorSchemePart">
+            <summary>
+            Gets or sets expand button color scheme line color. Setting
+            this property overrides the setting of the corresponding ExpandLineColor property.
+            Color scheme colors are automatically managed and are based on current system colors.
+            That means if colors on the system change the color scheme will ensure that it's colors
+            are changed as well to fit in the color scheme of target system. Set this property to
+            <a href="TreeGX~DevComponents.Tree.eColorSchemePart.html">eColorSchemePart.None</a> to
+            specify explicit color to use through ExpandLineColor property.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.ExpandBackColorGradientAngle">
+            <summary>
+            Gets or sets the expand button background gradient angle.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.ExpandImage">
+            <summary>
+            Gets or sets the expand button image which is used to indicate that node will be expanded. To use images as expand buttons you also need to set ExpandButtonType=eExpandButtonType.Image.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.ExpandImageCollapse">
+            <summary>
+            Gets or sets the expand button image which is used to indicate that node will be collapsed. To use images as expand buttons you also need to set ExpandButtonType=eExpandButtonType.Image.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.ExpandButtonType">
+            <summary>
+            Gets or sets the type of the expand button used to expand/collapse nodes.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.DisplayRootNode">
+            <summary>
+            Gets or sets the display root node. For example in Map or Diagram layout single node
+            is always used as root node for display. Setting this property allows you to use any
+            Node as root display node. Default value is Null which means that first node from
+            TreeGX.Nodes collection is used as display root node.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.CommandWidth">
+            <summary>
+            Gets or sets the width of the command button. Default value is 10 pixels.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.CommandBackColor">
+            <summary>
+            Gets or sets command button back color. Note that setting CommandBackColorSchemePart property will override the value that you set here.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.CommandBackColorSchemePart">
+            <summary>
+            Gets or sets command button color scheme back color. Setting
+            this property overrides the setting of the corresponding CommandBackColor property.
+            Color scheme colors are automatically managed and are based on current system colors.
+            That means if colors on the system change the color scheme will ensure that it's colors
+            are changed as well to fit in the color scheme of target system. Set this property to
+            <a href="TreeGX~DevComponents.Tree.eColorSchemePart.html">eColorSchemePart.None</a> to
+            specify explicit color to use through CommandBackColor property.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.CommandBackColor2">
+            <summary>
+            Gets or sets command button target gradient back color. Note that setting CommandBackColor2SchemePart property will override the value that you set here.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.CommandBackColor2SchemePart">
+            <summary>
+            Gets or sets command button color scheme target gradient back color. Setting
+            this property overrides the setting of the corresponding CommandBackColor2 property.
+            Color scheme colors are automatically managed and are based on current system colors.
+            That means if colors on the system change the color scheme will ensure that it's colors
+            are changed as well to fit in the color scheme of target system. Set this property to
+            <a href="TreeGX~DevComponents.Tree.eColorSchemePart.html">eColorSchemePart.None</a> to
+            specify explicit color to use through CommandBackColor2 property.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.CommandForeColor">
+            <summary>
+            Gets or sets command button foreground color. Note that setting CommandForeColorSchemePart property will override the value that you set here.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.CommandForeColorSchemePart">
+            <summary>
+            Gets or sets command button color scheme foreground color. Setting
+            this property overrides the setting of the corresponding CommandForeColor property.
+            Color scheme colors are automatically managed and are based on current system colors.
+            That means if colors on the system change the color scheme will ensure that it's colors
+            are changed as well to fit in the color scheme of target system. Set this property to
+            <a href="TreeGX~DevComponents.Tree.eColorSchemePart.html">eColorSchemePart.None</a> to
+            specify explicit color to use through CommandForeColor property.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.CommandBackColorGradientAngle">
+            <summary>
+            Gets or sets the command button background gradient angle.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.CommandMouseOverBackColor">
+            <summary>
+            Gets or sets command button mouse over back color. Note that setting CommandMouseOverBackColorSchemePart property will override the value that you set here.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.CommandMouseOverBackColorSchemePart">
+            <summary>
+            Gets or sets command button color scheme mouse over back color. Setting
+            this property overrides the setting of the corresponding CommandMouseOverBackColor property.
+            Color scheme colors are automatically managed and are based on current system colors.
+            That means if colors on the system change the color scheme will ensure that it's colors
+            are changed as well to fit in the color scheme of target system. Set this property to
+            <a href="TreeGX~DevComponents.Tree.eColorSchemePart.html">eColorSchemePart.None</a> to
+            specify explicit color to use through CommandMouseOverBackColor property.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.CommandMouseOverBackColor2">
+            <summary>
+            Gets or sets command button mouse over target gradient back color. Note that setting CommandMouseOverBackColor2SchemePart property will override the value that you set here.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.CommandMouseOverBackColor2SchemePart">
+            <summary>
+            Gets or sets command button mouse over color scheme target gradient back color. Setting
+            this property overrides the setting of the corresponding CommandMouseOverBackColor2 property.
+            Color scheme colors are automatically managed and are based on current system colors.
+            That means if colors on the system change the color scheme will ensure that it's colors
+            are changed as well to fit in the color scheme of target system. Set this property to
+            <a href="TreeGX~DevComponents.Tree.eColorSchemePart.html">eColorSchemePart.None</a> to
+            specify explicit color to use through CommandMouseOverBackColor2 property.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.CommandMouseOverForeColor">
+            <summary>
+            Gets or sets command button mouse over foreground color. Note that setting CommandMouseOverForeColorSchemePart property will override the value that you set here.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.CommandMouseOverForeColorSchemePart">
+            <summary>
+            Gets or sets command button mouse over color scheme foreground color. Setting
+            this property overrides the setting of the corresponding CommandMouseOverForeColor property.
+            Color scheme colors are automatically managed and are based on current system colors.
+            That means if colors on the system change the color scheme will ensure that it's colors
+            are changed as well to fit in the color scheme of target system. Set this property to
+            <a href="TreeGX~DevComponents.Tree.eColorSchemePart.html">eColorSchemePart.None</a> to
+            specify explicit color to use through CommandMouseOverForeColor property.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.CommandMouseOverBackColorGradientAngle">
+            <summary>
+            Gets or sets the command button mouse over background gradient angle.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.CellEdit">
+            <summary>
+            Gets or sets a value indicating whether the label text of the node cells can be edited. Default value is false.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.IsCellEditing">
+            <summary>
+            Returns whether cell editing is in progress.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.EndCellEditingOnLostFocus">
+            <summary>
+            Gets or sets whether cell editing is completed when control loses input focus. Default value is true.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.IsKeyboardFocusWithin">
+            <summary>
+            Gets whether keyboard focus is within the control.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.MouseOverNode">
+            <summary>
+            Returns the reference to the node mouse is currently over or null (Nothing) if mouse is not over any node in tree.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.DefaultCellCursor">
+            <summary>
+            Specifies the mouse cursor displayed when mouse is over the cell. Default value
+            is null which means that default control cursor is used.
+            </summary>
+            <remarks>
+            To specify cursor for each individual cell use
+            <a href="TreeGX~DevComponents.Tree.Cell~Cursor.html">Cell.Cursor</a> property.
+            </remarks>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.HostedControlCells">
+            <summary>
+            Gets reference to array of Cell objects that have HostedControl property set.
+            </summary>
+        </member>
+        <member name="P:DevComponents.Tree.TreeGX.IsDragDropInProgress">
+            <summary>
+            Gets or sets whether drag and drop operation is in progress. This member supports
+            the TreeGX infrastructure and is not intended to be used directly from your
+            code.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.TreeGXCellCancelEventArgs">
+            <summary>
+            rovides data for TreeGX Cell events that can be canceled.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.TreeGXCellEventArgs">
+            <summary>
+            Provides data for TreeGX Cell events.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGXCellEventArgs.#ctor(DevComponents.Tree.eTreeAction,DevComponents.Tree.Cell)">
+            <summary>
+            Default constructor for event data.
+            </summary>
+            <param name="action">Type of the action event is raised for.</param>
+            <param name="cell">Cell that event is raised for.</param>
+        </member>
+        <member name="F:DevComponents.Tree.TreeGXCellEventArgs.Action">
+            <summary>
+            Indicates the type of the action performed on a cell.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.TreeGXCellEventArgs.Cell">
+            <summary>
+            Indicates the cell that action is peformed on.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGXCellCancelEventArgs.#ctor(DevComponents.Tree.eTreeAction,DevComponents.Tree.Cell)">
+            <summary>
+            Default constructor for event data.
+            </summary>
+            <param name="action">Type of the action event is raised for.</param>
+            <param name="cell">Cell that event is raised for.</param>
+        </member>
+        <member name="F:DevComponents.Tree.TreeGXCellCancelEventArgs.Cancel">
+            <summary>
+            Indicates that event action should be canceled.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.TreeGXDragDropEventArgs">
+            <summary>
+            Represents event arguments for BeforeNodeDrop and AfterNodeDrop events
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.TreeGXNodeCancelEventArgs">
+            <summary>
+            Provides data for TreeGX Node events that can be cancelled.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.TreeGXNodeEventArgs">
+            <summary>
+            Provides data for TreeGX Node events.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGXNodeEventArgs.#ctor(DevComponents.Tree.eTreeAction,DevComponents.Tree.Node)">
+            <summary>
+            Default constructor.
+            </summary>
+            <param name="action">Default action</param>
+            <param name="node">Default node.</param>
+        </member>
+        <member name="F:DevComponents.Tree.TreeGXNodeEventArgs.Action">
+            <summary>
+            Indicates the type of the action performed on a node.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.TreeGXNodeEventArgs.Node">
+            <summary>
+            Indicates the node that action is peformed on.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGXNodeCancelEventArgs.#ctor(DevComponents.Tree.eTreeAction,DevComponents.Tree.Node)">
+            <summary>
+            Default constructor.
+            </summary>
+            <param name="action">Default action</param>
+            <param name="node">Default node.</param>
+        </member>
+        <member name="F:DevComponents.Tree.TreeGXNodeCancelEventArgs.Cancel">
+            <summary>
+            Indicates that event action should be canceled.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.TreeGXDragDropEventArgs.OldParentNode">
+            <summary>
+            Returns reference to the old parent node.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.TreeGXDragDropEventArgs.NewParentNode">
+            <summary>
+            Reference to the new parent node if event is not canceled.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.TreeGXDragDropEventArgs.IsCopy">
+            <summary>
+            Gets or sets whether drag node is being copied instead of moved.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.TreeGXNodeCollectionEventArgs">
+            <summary>
+            Represents event arguments for NodeCollection based events, like BeforeNodeInsert, AfterNodeInsert etc.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGXNodeCollectionEventArgs.#ctor(DevComponents.Tree.eTreeAction,DevComponents.Tree.Node,DevComponents.Tree.Node)">
+            <summary>
+            Creates new instance of the class.
+            </summary>
+            <param name="action">Source action</param>
+            <param name="node">Affected node</param>
+            <param name="parentNode">Parent of the node if any</param>
+        </member>
+        <member name="F:DevComponents.Tree.TreeGXNodeCollectionEventArgs.ParentNode">
+            <summary>
+            Indicates parent node of the affected node. For example if event handled is BeforeNodeInsert parent of the Node is has
+            not been set yet so this property provides information on the node that will become parent. If this property returns null
+            then node is being added or removed from the main TreeGX.Nodes collection.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.TreeGXNodeMouseEventArgs">
+            <summary>
+            Represents event arguments for node mouse based events.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.TreeGXNodeMouseEventArgs.Node">
+            <summary>
+            Gets node affected by mouse action.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.TreeGXNodeMouseEventArgs.Button">
+            <summary>
+            Gets which mouse button was pressed.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.TreeGXNodeMouseEventArgs.Clicks">
+            <summary>
+            Gets the number of times the mouse button was pressed and released.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.TreeGXNodeMouseEventArgs.Delta">
+            <summary>
+            Gets a signed count of the number of detents the mouse wheel has rotated. A detent is one notch of the mouse wheel.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.TreeGXNodeMouseEventArgs.X">
+            <summary>
+            Gets the x-coordinate of the mouse.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.TreeGXNodeMouseEventArgs.Y">
+            <summary>
+            Gets the y-coordinate of the mouse.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.TreeGXRootSelector">
+            <summary>
+            Represents controls that provides user interface to select root node from TreeGX control.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.TreeGXRootSelector.components">
+            <summary> 
+            Required designer variable.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGXRootSelector.Dispose(System.Boolean)">
+            <summary> 
+            Clean up any resources being used.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.TreeGXRootSelector.InitializeComponent">
+            <summary> 
+            Required method for Designer support - do not modify 
+            the contents of this method with the code editor.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.TreeSerializer">
+            <summary>
+            Provides means for TreeGX serialization.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.TreeSerializer.Save(DevComponents.Tree.TreeGX,System.String)">
+            <summary>
+            Saves Nodes to specified file.
+            </summary>
+            <param name="tree">TreeGX to save</param>
+            <param name="fileName">Target file name</param>
+        </member>
+        <member name="M:DevComponents.Tree.TreeSerializer.Save(DevComponents.Tree.TreeGX,System.IO.Stream)">
+            <summary>
+            Saves Nodes to stream.
+            </summary>
+            <param name="tree">TreeGX to save</param>
+            <param name="outStream">Stream to save nodes to.</param>
+        </member>
+        <member name="M:DevComponents.Tree.TreeSerializer.Save(DevComponents.Tree.TreeGX,System.IO.TextWriter)">
+            <summary>
+            Saves Nodes to TextWriter
+            </summary>
+            <param name="tree">TreeGX to save</param>
+            <param name="writer">TextWriter to write nodes to.</param>
+        </member>
+        <member name="M:DevComponents.Tree.TreeSerializer.Save(DevComponents.Tree.TreeGX,System.Xml.XmlWriter)">
+            <summary>
+            Saves nodes to XmlWriter.
+            </summary>
+            <param name="tree">TreeGX to save</param>
+            <param name="writer">XmlWriter to write nodes to</param>
+        </member>
+        <!-- Badly formed XML comment ignored for member "M:DevComponents.Tree.TreeSerializer.Save(DevComponents.Tree.TreeGX)" -->
+        <member name="M:DevComponents.Tree.TreeSerializer.Save(DevComponents.Tree.TreeGX,System.Xml.XmlDocument)">
+            <summary>
+            Saves TreeGX to an existing XmlDocument. New node TreeGX is created in document and Nodes are serialized into it.
+            </summary>
+            <param name="tree">TreeGX to serialize</param>
+            <param name="document">XmlDocument instance.</param>
+        </member>
+        <member name="M:DevComponents.Tree.TreeSerializer.Save(DevComponents.Tree.TreeGX,System.Xml.XmlElement)">
+            <summary>
+            Serializes TreeGX object to XmlElement object.
+            </summary>
+            <param name="tree">Instance of TreeGX to serialize.</param>
+            <param name="parent">XmlElement to serialize to.</param>
+        </member>
+        <member name="M:DevComponents.Tree.TreeSerializer.Save(DevComponents.Tree.Node,DevComponents.Tree.NodeSerializationContext)">
+            <summary>
+            Serializes Node and all child nodes to XmlElement object.
+            </summary>
+            <param name="node">Node to serialize.</param>
+            <param name="context">Provides serialization context.</param>
+        </member>
+        <member name="M:DevComponents.Tree.TreeSerializer.Load(DevComponents.Tree.TreeGX,System.String)">
+            <summary>
+            Load TreeGX Nodes from file.
+            </summary>
+            <param name="tree">Reference to TreeGX to populate</param>
+            <param name="fileName">File name.</param>
+        </member>
+        <member name="M:DevComponents.Tree.TreeSerializer.Load(DevComponents.Tree.TreeGX,System.IO.Stream)">
+            <summary>
+            Load TreeGX Nodes from stream.
+            </summary>
+            <param name="tree">Reference to TreeGX to populate</param>
+            <param name="inStream">Reference to stream</param>
+        </member>
+        <member name="M:DevComponents.Tree.TreeSerializer.Load(DevComponents.Tree.TreeGX,System.IO.TextReader)">
+            <summary>
+            Load TreeGX Nodes from reader.
+            </summary>
+            <param name="tree">Reference to TreeGX to populate</param>
+            <param name="reader">Reference to reader.</param>
+        </member>
+        <member name="M:DevComponents.Tree.TreeSerializer.Load(DevComponents.Tree.TreeGX,System.Xml.XmlReader)">
+            <summary>
+            Load TreeGX Nodes from reader.
+            </summary>
+            <param name="tree">Reference to TreeGX to populate</param>
+            <param name="reader">Reference to reader.</param>
+        </member>
+        <member name="M:DevComponents.Tree.TreeSerializer.Load(DevComponents.Tree.TreeGX,System.Xml.XmlDocument)">
+            <summary>
+            Load TreeGX from XmlDocument that was created by Save method.
+            </summary>
+            <param name="tree">Tree Control to load</param>
+            <param name="document">XmlDocument to load control from</param>
+        </member>
+        <member name="M:DevComponents.Tree.TreeSerializer.Load(DevComponents.Tree.TreeGX,System.Xml.XmlElement)">
+            <summary>
+            Load nodes from XmlElement.
+            </summary>
+            <param name="tree">Reference to TreeGX to be populated.</param>
+            <param name="parent">XmlElement that tree was serialized to.</param>
+        </member>
+        <member name="M:DevComponents.Tree.TreeSerializer.LoadNode(DevComponents.Tree.Node,DevComponents.Tree.NodeSerializationContext)">
+            <summary>
+            Load single node and it's child nodes if any.
+            </summary>
+            <param name="nodeToLoad">New instance of node that is populated with loaded data.</param>
+            <param name="context">Provides deserialization context.</param>
+        </member>
+        <member name="T:DevComponents.Tree.NodeSerializationContext">
+            <summary>
+            Provides context information for serialization.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.NodeSerializationContext.RefXmlElement">
+            <summary>
+            Gets or sets reference to context parent XmlElement when serializing or actual Node element when deserializing.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.NodeSerializationContext.HasSerializeNodeHandlers">
+            <summary>
+            Gets or sets whether SerializeNode event handler has been defined and whether event should be fired.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.NodeSerializationContext.HasDeserializeNodeHandlers">
+            <summary>
+            Gets or sets whether DeserializeNode event handler has been defined and whether event should be fired.
+            </summary>
+        </member>
+        <member name="F:DevComponents.Tree.NodeSerializationContext.TreeGX">
+            <summary>
+            Provides access to serializer.
+            </summary>
+        </member>
+        <member name="T:DevComponents.Tree.Utilites">
+            <summary>
+            Represents class for static tree utilities.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.Utilites.InitializeTree(DevComponents.Tree.TreeGX)">
+            <summary>
+            Initializes control with default settings for connectors and nodes.
+            </summary>
+            <param name="tree">Control to initialize.</param>
+        </member>
+        <member name="M:DevComponents.Tree.Utilites.InitializeTree(DevComponents.Tree.TreeGX,DevComponents.Tree.ComponentFactory)">
+            <summary>
+            Initializes control with default settings for connectors and nodes.
+            </summary>
+            <param name="tree">Control to initialize.</param>
+            <param name="factory">Factory to use to create new instances of objects.</param>
+        </member>
+        <member name="M:DevComponents.Tree.Utilites.CreateStyle(DevComponents.Tree.ComponentFactory,System.String,System.Drawing.Color,System.Drawing.Color,System.Drawing.Color,System.Int32,System.Drawing.Color)">
+            <summary>
+            Creates new style and adds it to styles collection
+            </summary>
+            <param name="tree">Tree to assign style to</param>
+            <param name="factory">Style factory</param>
+            <param name="backColor"></param>
+            <param name="backColor2"></param>
+            <param name="gradientAngle"></param>
+            <param name="textColor"></param>
+        </member>
+        <member name="M:DevComponents.Tree.Utilites.FindNodeForControl(DevComponents.Tree.TreeGX,System.Windows.Forms.Control)">
+            <summary>
+            Returns reference to a node that is hosting given control.
+            </summary>
+            <param name="tree">Reference to the TreeGX control instance</param>
+            <param name="c">Control instance to look for</param>
+            <returns>Reference to a node hosting control or null if node could not be found</returns>
+        </member>
+        <member name="T:DevComponents.Tree.ComponentFactory">
+            <summary>
+            Represents internal component factory with design-time support.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.ComponentFactory.#ctor(System.ComponentModel.Design.IDesignerHost)">
+            <summary>
+            Creates new instace of the class.
+            </summary>
+            <param name="designer">Reference to DesignerHost to use for creation of new components.</param>
+        </member>
+        <member name="M:DevComponents.Tree.ComponentFactory.#ctor">
+            <summary>
+            Creates new instace of the class.
+            </summary>
+        </member>
+        <member name="M:DevComponents.Tree.ComponentFactory.CreateComponent(System.Type)">
+            <summary>
+            Creates component and returns reference to the new instace.
+            </summary>
+            <param name="type">Type that identifies component to create.</param>
+            <returns>New instace of the component.</returns>
+        </member>
+        <member name="T:DevComponents.Tree.WinApi">
+            <summary>
+            Defines Windows API function access.
+            </summary>
+        </member>
+    </members>
+</doc>
diff --git a/PROMS/DotNetBar Source Code/TreeGX/Display/CellDisplay.cs b/PROMS/DotNetBar Source Code/TreeGX/Display/CellDisplay.cs
new file mode 100644
index 00000000..524d09fb
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/Display/CellDisplay.cs	
@@ -0,0 +1,171 @@
+using System;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+
+namespace DevComponents.Tree.Display
+{
+	/// <summary>
+	/// Represents cell display class.
+	/// </summary>
+	internal class CellDisplay
+	{
+		public CellDisplay()
+		{
+		}
+
+		public static void PaintCell(NodeCellRendererEventArgs ci)
+		{
+			if(ci.Cell.CheckBoxVisible)
+				CellDisplay.PaintCellCheckBox(ci);
+			if(!ci.Cell.Images.LargestImageSize.IsEmpty)
+				CellDisplay.PaintCellImage(ci);
+			CellDisplay.PaintText(ci);
+		}
+
+		public static void PaintCellCheckBox(NodeCellRendererEventArgs ci)
+		{
+			if(!ci.Cell.CheckBoxVisible)
+				return;
+			Rectangle r=ci.Cell.CheckBoxBoundsRelative;
+			r.Offset(ci.CellOffset);
+			System.Windows.Forms.ButtonState state=System.Windows.Forms.ButtonState.Normal;
+			if(ci.Cell.Checked)
+				state=System.Windows.Forms.ButtonState.Checked;
+            System.Windows.Forms.ControlPaint.DrawCheckBox(ci.Graphics,r,state);
+
+		}
+
+		public static void PaintCellImage(NodeCellRendererEventArgs ci)
+		{
+			if(ci.Cell.Images.LargestImageSize.IsEmpty)
+				return;
+			Rectangle r=ci.Cell.ImageBoundsRelative;
+			r.Offset(ci.CellOffset);
+			
+			Image image = CellDisplay.GetCellImage(ci.Cell);
+			
+			if(image!=null)
+			{
+                Size imageSize = Dpi.Size(image.Size);
+				ci.Graphics.DrawImage(image,r.X+(r.Width-imageSize.Width)/2,
+				                      r.Y+(r.Height-imageSize.Height)/2, imageSize.Width, imageSize.Height);
+			}
+		}
+
+		public static void PaintText(NodeCellRendererEventArgs ci)
+		{
+			Cell cell=ci.Cell;
+			if(cell.HostedControl==null && (cell.Text=="" || ci.Style.TextColor.IsEmpty) || cell.TextContentBounds.IsEmpty )
+				return;
+			Rectangle bounds=ci.Cell.TextContentBounds;
+			bounds.Offset(ci.CellOffset);
+			
+			if(cell.HostedControl!=null)
+			{
+//				if(ci.Graphics.Transform!=null)
+//				{
+//					Point[] p=new Point[] {new Point(bounds.X, bounds.Y), new Point(bounds.Right, bounds.Bottom)};
+//					ci.Graphics.Transform.TransformPoints(p);
+//					bounds = new Rectangle(p[0].X, p[0].Y, p[1].X-p[0].X, p[1].Y-p[0].Y);
+//				}
+//				if(cell.HostedControl.Bounds!=bounds)
+//				{
+//					cell.IgnoreHostedControlSizeChange = true;
+//					cell.HostedControl.Bounds=bounds;
+//					cell.IgnoreHostedControlSizeChange = false;
+//				}
+				if(!cell.HostedControl.Visible)
+					cell.HostedControl.Visible = true;
+				return;
+			}
+
+			Font font=ci.Style.Font;
+			bounds.Inflate(1,1);
+			if (cell.TextMarkupBody == null)
+				TextDrawing.DrawString(ci.Graphics , cell.Text, font, ci.Style.TextColor, bounds, ci.Style.TextFormat);
+			else
+			{
+				TextMarkup.MarkupDrawContext d = new TextMarkup.MarkupDrawContext(ci.Graphics, font, ci.Style.TextColor, false);
+				d.HotKeyPrefixVisible = !((ci.Style.TextFormat & eTextFormat.HidePrefix) == eTextFormat.HidePrefix);
+				Rectangle mr = new Rectangle(bounds.X, bounds.Y + (bounds.Height - cell.TextMarkupBody.Bounds.Height) / 2, cell.TextMarkupBody.Bounds.Width, cell.TextMarkupBody.Bounds.Height);
+				mr.Offset((bounds.Width - mr.Width) / 2, 0);
+				cell.TextMarkupBody.Bounds = mr;
+				cell.TextMarkupBody.Render(d);
+			}
+		}
+
+		private static Image GetCellImage(Cell cell)
+		{
+			Image img=cell.Images.Image;
+			if(img==null && cell.Images.ImageIndex>=0)
+				img=cell.Images.GetImageByIndex(cell.Images.ImageIndex);
+			
+			if(cell.IsMouseOver && (cell.Images.ImageMouseOver!=null || cell.Images.ImageMouseOverIndex>=0))
+			{
+				if(cell.Images.ImageMouseOver!=null)
+					img=cell.Images.ImageMouseOver;
+				else
+					img=cell.Images.GetImageByIndex(cell.Images.ImageMouseOverIndex);
+			}
+			else if(cell.Parent.Expanded && (cell.Images.ImageExpanded!=null || cell.Images.ImageExpandedIndex>=0))
+			{
+				if(cell.Images.ImageExpanded!=null)
+					img=cell.Images.ImageExpanded;
+				else
+					img=cell.Images.GetImageByIndex(cell.Images.ImageExpandedIndex);
+			}
+			return img;
+		}
+
+		public static Font GetCellFont(TreeGX tree, Cell cell)
+		{
+			Font font=tree.Font;
+			ElementStyle style=null;
+			
+			if(cell.StyleNormal!=null)
+			{
+				style=cell.StyleNormal;
+			}
+			else
+			{
+				if(tree.NodeStyle!=null)
+					style=tree.NodeStyle;
+				else
+					style=new ElementStyle();
+
+				if(tree.CellStyleDefault!=null)
+					style=tree.CellStyleDefault;
+				else
+					style=ElementStyle.GetDefaultCellStyle(style);
+			}
+
+			if(style!=null && style.Font!=null)
+				font=style.Font;
+
+			return font;
+		}
+	}
+
+	/// <summary>
+	/// Represents information neccessary to paint the cell on canvas.
+	/// </summary>
+	internal class CellDisplayInfo
+	{
+		public ElementStyle Style=null;
+		public System.Drawing.Graphics Graphics=null;
+		public Cell ContextCell=null;
+		public Point CellOffset=Point.Empty;
+
+		public CellDisplayInfo()
+		{
+		}
+
+		public CellDisplayInfo(ElementStyle style, System.Drawing.Graphics g, Cell cell, Point cellOffset)
+		{
+			this.Style=style;
+			this.Graphics=g;
+			this.ContextCell=cell;
+			this.CellOffset=cellOffset;
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/Display/ConnectorRendererEventArgs.cs b/PROMS/DotNetBar Source Code/TreeGX/Display/ConnectorRendererEventArgs.cs
new file mode 100644
index 00000000..1bf75b10
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/Display/ConnectorRendererEventArgs.cs	
@@ -0,0 +1,52 @@
+using System;
+using System.Drawing;
+
+namespace DevComponents.Tree.Display
+{
+	/// <summary>
+	/// Represents helper class for node connector display.
+	/// </summary>
+	public class ConnectorRendererEventArgs:EventArgs
+	{
+		/// <summary>
+		/// From node reference.
+		/// </summary>
+		public Node FromNode=null;
+		/// <summary>
+		/// From node style reference.
+		/// </summary>
+		public ElementStyle StyleFromNode=null;
+		/// <summary>
+		/// To node reference.
+		/// </summary>
+		public Node ToNode=null;
+		/// <summary>
+		/// To node style reference.
+		/// </summary>
+		public ElementStyle StyleToNode=null;
+		/// <summary>
+		/// Graphics object used for drawing.
+		/// </summary>
+		public System.Drawing.Graphics Graphics=null;
+		/// <summary>
+		/// Node offset since some node coordinates are relative.
+		/// </summary>
+		public Point Offset=Point.Empty;
+		/// <summary>
+		/// Indicates whether from node is a root node.
+		/// </summary>
+		public bool IsRootNode=false;
+		/// <summary>
+		/// Reference to node connector object that describes connector type.
+		/// </summary>
+		public NodeConnector NodeConnector=null;
+		/// <summary>
+		/// Gets or sets whether connector is link connector.
+		/// </summary>
+		public bool LinkConnector=false;
+		/// <summary>
+		/// Reference to the collection of the connector path points. Default value is null indicating there are no path points.
+		/// </summary>
+		public ConnectorPointsCollection ConnectorPoints=null;
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/Display/CurveConnectorDisplay.cs b/PROMS/DotNetBar Source Code/TreeGX/Display/CurveConnectorDisplay.cs
new file mode 100644
index 00000000..93ab9dac
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/Display/CurveConnectorDisplay.cs	
@@ -0,0 +1,141 @@
+using System;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+
+namespace DevComponents.Tree.Display
+{
+	/// <summary>
+	/// Represents the connector display for map type.
+	/// </summary>
+	public class CurveConnectorDisplay:NodeConnectorDisplay
+	{		
+		/// <summary>
+		/// Draws connector line between two nodes.
+		/// </summary>
+		/// <param name="info">Connector context information.</param>
+		public override void DrawConnector(ConnectorRendererEventArgs info)
+		{
+			if(info.NodeConnector.LineColor.IsEmpty || info.NodeConnector.LineWidth<=0)
+				return;
+
+			DrawCurveConnector(info);
+		}
+
+		private void DrawCurveConnector(ConnectorRendererEventArgs info)
+		{
+			Point pStart=this.GetStartPoint(info);
+			Point[] parr=this.GetEndPoint(info);
+			Point pEnd=parr[0];
+			Point pEndUnderLine=parr[1];
+			int lineWidth=info.NodeConnector.LineWidth;
+
+			int xMulti=1, yMulti=1;
+					
+			// used for direction control
+			if(pStart.X>pEnd.X)
+				xMulti=-1;
+			if(pStart.Y>pEnd.Y)
+				yMulti=-1;
+
+			if(info.ConnectorPoints==null || info.ConnectorPoints.Count == 0)
+			{
+				// Determine whether curve can be drawn
+				if(Math.Abs(pStart.X-pEnd.X)<=6 || Math.Abs(pStart.Y-pEnd.Y)<=10)
+				{
+					DrawLineConnector(info,pStart,pEnd,pEndUnderLine);
+				}
+				else
+				{
+					// Create two points in between the start and end point
+					Point[] p=new Point[4];
+
+					p[1].X=pStart.X+(int)(Math.Abs(pStart.X-pEnd.X)*.15f*xMulti);
+					p[1].Y=pStart.Y+(int)(Math.Abs(pStart.Y-pEnd.Y)*.15f*yMulti);
+
+					p[2].X=pStart.X+(int)(Math.Abs(pStart.X-pEnd.X)*.5f*xMulti);
+					p[2].Y=pEnd.Y-(int)(yMulti*(Math.Abs(pStart.Y-pEnd.Y)*.15f));
+
+					p[0]=pStart;
+					p[3]=pEnd;
+
+					if(lineWidth>1)
+					{
+						GraphicsPath path=new GraphicsPath();
+						
+						path.AddCurve(p,.5f);
+						
+						// Check whether pStart is starting from left or right side
+						Rectangle fromNodeRect=info.FromNode.BoundsRelative;
+						fromNodeRect.Offset(info.Offset);
+						fromNodeRect.Inflate(-1,-1);
+//						if(pStart.Y>fromNodeRect.Y && pStart.Y<fromNodeRect.Bottom && pStart.X>=fromNodeRect.Right)
+//						{
+//							path.AddLine(pStart.X, pStart.Y-lineWidth*xMulti, pStart.X, pStart.Y);
+//						}
+						
+						path.AddLine(p[0].X,p[0].Y,p[0].X+lineWidth*xMulti,p[0].Y);
+						
+						if(pStart.Y>fromNodeRect.Y && pStart.Y<fromNodeRect.Bottom && pStart.X>=fromNodeRect.Right && info.IsRootNode)
+						{
+							path.AddLine(p[0].X-1,p[0].Y,p[0].X-1,p[0].Y+lineWidth*yMulti);
+							p[0].Y -= lineWidth*yMulti;
+						}
+						else if(pStart.Y>fromNodeRect.Y && pStart.Y<fromNodeRect.Bottom && pStart.X<=fromNodeRect.Left && info.IsRootNode)
+						{
+							path.AddLine(p[0].X+1,p[0].Y,p[0].X+1,p[0].Y+lineWidth*yMulti);
+							p[0].Y -= lineWidth*yMulti;
+						}
+						else
+							p[0].X+=(lineWidth*xMulti);
+						
+						p[1].X+=(lineWidth*xMulti);
+						p[2].X+=(lineWidth*xMulti);
+						p[3].Y-=yMulti;
+						path.AddCurve(p,.5f);
+						path.AddLine(p[3].X,p[3].Y,p[3].X,p[3].Y+yMulti);
+						path.CloseAllFigures();
+						using(Brush brush=this.GetLineBrush(info))
+						{
+							info.Graphics.FillPath(brush,path);
+						}
+					}
+					else
+					{
+						using(Pen pen=this.GetLinePen(info))
+						{
+							info.Graphics.DrawCurve(pen,p,.5f);
+						}
+					}
+				}
+			}
+			else
+			{
+				ConnectorPointInfo pointInfo=GetConnectorPointInfo(info,pStart,pEnd);
+				
+				if(pointInfo.Points2==null)
+				{
+					using(Pen pen=this.GetLinePen(info))
+					{
+						info.Graphics.DrawCurve(pen,pointInfo.Points1,.5f);
+					}
+				}
+				else
+				{
+					using(GraphicsPath path=new GraphicsPath())
+					{
+						path.AddCurve(pointInfo.Points1,.5f);
+						path.AddCurve(pointInfo.Points2,.5f);
+						path.CloseAllFigures();
+
+						using(Brush brush=this.GetLineBrush(info))
+						{
+							info.Graphics.FillPath(brush,path);
+						}
+					}
+				}
+			}
+
+			DrawEndLine(info,pStart,pEnd,pEndUnderLine);
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/Display/LineConnectorDisplay.cs b/PROMS/DotNetBar Source Code/TreeGX/Display/LineConnectorDisplay.cs
new file mode 100644
index 00000000..c7594342
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/Display/LineConnectorDisplay.cs	
@@ -0,0 +1,97 @@
+using System;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using DevComponents.Tree.Display;
+
+namespace DevComponents.Tree.Display
+{
+	/// <summary>
+	/// Represents the line connector display class.
+	/// </summary>
+	public class LineConnectorDisplay:NodeConnectorDisplay
+	{
+		/// <summary>
+		/// Draws connector line between two nodes.
+		/// </summary>
+		/// <param name="info">Connector context information.</param>
+		public override void DrawConnector(ConnectorRendererEventArgs info)
+		{
+			if(info.NodeConnector.LineColor.IsEmpty || info.NodeConnector.LineWidth<=0)
+				return;
+
+			DrawStarConnector(info);
+		}
+
+		private void DrawStarConnector(ConnectorRendererEventArgs info)
+		{
+			Point pStart=this.GetStartPoint(info);
+			Point[] parr=this.GetEndPoint(info);
+			Point pEnd=parr[0];
+			Point pEndUnderLine=parr[1];
+
+			if(info.ConnectorPoints==null)
+			{
+				// Determine whether curve can be drawn
+				if(Math.Abs(pStart.X-pEnd.X)<=6 || Math.Abs(pStart.Y-pEnd.Y)<=10)
+				{
+					DrawLineConnector(info,pStart,pEnd,pEndUnderLine);
+				}
+				else
+				{
+					Point pBottom=new Point();
+					Point pTop=new Point();
+					if(pEnd.X<pStart.X)
+					{
+						pBottom.X=pStart.X-info.NodeConnector.LineWidth;
+						pTop.X=pEnd.X+1;
+					}
+					else
+					{
+						pBottom.X=pStart.X+info.NodeConnector.LineWidth;
+						pTop.X=pEnd.X-1;
+					}
+					pBottom.Y=pStart.Y;
+					pTop.Y=pEnd.Y;
+
+					GraphicsPath path=new GraphicsPath();
+					path.AddLine(pStart,pBottom);
+					path.AddLine(pBottom,pEnd);
+					path.AddLine(pEnd,pTop);
+					path.AddLine(pTop,pStart);
+					path.CloseAllFigures();
+
+					using(Brush brush=this.GetLineBrush(info))
+						info.Graphics.FillPath(brush,path);
+				}
+			}
+			else
+			{
+				ConnectorPointInfo pointInfo=GetConnectorPointInfo(info,pStart,pEnd);
+				
+				if(pointInfo.Points2==null)
+				{
+					using(Pen pen=this.GetLinePen(info))
+					{
+						info.Graphics.DrawLines(pen,pointInfo.Points1);
+					}
+				}
+				else
+				{
+					using(GraphicsPath path=new GraphicsPath())
+					{
+						path.AddLines(pointInfo.Points1);
+						path.AddLines(pointInfo.Points2);
+						path.CloseAllFigures();
+
+						using(Brush brush=this.GetLineBrush(info))
+						{
+							info.Graphics.FillPath(brush,path);
+						}
+					}
+				}
+			}
+
+			DrawEndLine(info,pStart,pEnd,pEndUnderLine);
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/Display/NodeCellRendererEventArgs.cs b/PROMS/DotNetBar Source Code/TreeGX/Display/NodeCellRendererEventArgs.cs
new file mode 100644
index 00000000..c2a2f73b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/Display/NodeCellRendererEventArgs.cs	
@@ -0,0 +1,53 @@
+using System;
+using System.Drawing;
+
+namespace DevComponents.Tree.Display
+{
+	/// <summary>
+	/// Provides information for cell rendering methods and events.
+	/// </summary>
+	public class NodeCellRendererEventArgs:NodeRendererEventArgs
+	{
+		/// <summary>
+		/// Gets or sets the cell being rendered.
+		/// </summary>
+		public Cell Cell=null;
+		
+		/// <summary>
+		/// Gets or sets absolute cell bounds.
+		/// </summary>
+		public Rectangle CellBounds=Rectangle.Empty;
+
+        /// <summary>
+        /// Gets or sets absolute bounds for cell text.
+        /// </summary>
+        public Rectangle CellTextBounds = Rectangle.Empty;
+		
+		/// <summary>
+		/// Gets or sets the internal cell offset.
+		/// </summary>
+		internal Point CellOffset=Point.Empty;
+		
+		/// <summary>
+		/// Creates new instance of the class.
+		/// </summary>
+		public NodeCellRendererEventArgs():base(null,null,Rectangle.Empty,null)
+		{
+		}
+		
+		/// <summary>
+		/// Creates new instance of the class and initializes it with default values.
+		/// </summary>
+		/// <param name="g">Reference to graphics object.</param>
+		/// <param name="node">Reference to context node.</param>
+		/// <param name="bounds">Reference to node bounds</param>
+		/// <param name="style">Reference to cell style</param>
+		/// <param name="cell">Reference to cell</param>
+		/// <param name="cellBounds">Reference to cell bounds</param>
+		public NodeCellRendererEventArgs(Graphics g, Node node, Rectangle bounds, ElementStyle style, Cell cell, Rectangle cellBounds):base(g,node,bounds,style)
+		{
+			this.Cell = cell;
+			this.CellBounds = cellBounds;
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/Display/NodeCommandDisplay.cs b/PROMS/DotNetBar Source Code/TreeGX/Display/NodeCommandDisplay.cs
new file mode 100644
index 00000000..fdaca83d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/Display/NodeCommandDisplay.cs	
@@ -0,0 +1,78 @@
+using System.Drawing;
+using System.Drawing.Drawing2D;
+
+namespace DevComponents.Tree.Display
+{
+	/// <summary>
+	/// Paints node command button.
+	/// </summary>
+	internal class NodeCommandDisplay
+	{
+		public virtual void DrawCommandButton(NodeCommandPartRendererEventArgs info)
+		{
+			bool mouseOver = (info.Node.MouseOverNodePart == eMouseOverNodePart.Command);
+			CommandColors c=new CommandColors();
+			if(mouseOver)
+			{
+				c.BackColor = info.MouseOverBackColor;
+				c.BackColor2 = info.MouseOverBackColor2;
+				c.BackColorGradientAngle = info.MouseOverBackColorGradientAngle;
+				c.ForeColor = info.MouseOverForeColor;
+			}
+			else
+			{
+				c.BackColor = info.BackColor;
+				c.BackColor2 = info.BackColor2;
+				c.BackColorGradientAngle = info.BackColorGradientAngle;
+				c.ForeColor = info.ForeColor;
+			}
+			
+			Rectangle fillBounds = info.CommandPartBounds;
+			fillBounds.Width--;
+			fillBounds.Height--;
+			
+			Region oldRegion = info.Graphics.Clip.Clone() as Region;
+			info.Graphics.SetClip(fillBounds,CombineMode.Intersect);
+			
+			if(c.BackColor2.IsEmpty)
+			{
+				if(!c.BackColor.IsEmpty)
+				{
+					using(SolidBrush brush=new SolidBrush(c.BackColor))
+						info.Graphics.FillRectangle(brush,fillBounds);
+				}
+			}
+			else
+			{
+				using(LinearGradientBrush brush=DisplayHelp.CreateLinearGradientBrush(info.CommandPartBounds, c.BackColor, c.BackColor2, c.BackColorGradientAngle))
+					info.Graphics.FillRectangle(brush,fillBounds);
+			}
+
+			if(c.ForeColor.IsEmpty) return;
+
+			int width=6;
+			int height=3;
+			GraphicsPath path=new GraphicsPath();
+			Point p=new Point(info.CommandPartBounds.X+(info.CommandPartBounds.Width-width)/2,info.CommandPartBounds.Y+(info.CommandPartBounds.Height-height)/2);
+			path.AddLine(p.X, p.Y, p.X+width,p.Y);
+			path.AddLine(p.X+width,p.Y,p.X+width/2,p.Y+height);
+			path.AddLine(p.X, p.Y,p.X+width/2,p.Y+height);
+			path.CloseAllFigures();
+			
+			using(SolidBrush brush=new SolidBrush(c.ForeColor))
+				info.Graphics.FillPath(brush,path);
+
+			path.Dispose();
+			
+			info.Graphics.Clip = oldRegion;
+		}
+
+		private class CommandColors
+		{
+			public Color BackColor=Color.Empty;
+			public Color BackColor2=Color.Empty;
+			public Color ForeColor=Color.Empty;
+			public int BackColorGradientAngle=0;
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/Display/NodeCommandPartRendererEventArgs.cs b/PROMS/DotNetBar Source Code/TreeGX/Display/NodeCommandPartRendererEventArgs.cs
new file mode 100644
index 00000000..60bd0e1c
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/Display/NodeCommandPartRendererEventArgs.cs	
@@ -0,0 +1,64 @@
+using System;
+using System.Drawing;
+
+namespace DevComponents.Tree.Display
+{
+	/// <summary>
+	/// Summary description for NodeCommandPartRendererEventArgs.
+	/// </summary>
+	public class NodeCommandPartRendererEventArgs:EventArgs
+	{  
+		/// <summary>
+		/// Gets or sets reference to Graphics object, canvas node is rendered on.
+		/// </summary>
+		public System.Drawing.Graphics Graphics=null;
+		/// <summary>
+		/// Gets or sets the reference to Node object being rendered.
+		/// </summary>
+		public DevComponents.Tree.Node Node=null;
+		/// <summary>
+		/// Gets or sets command part absolute bounds.
+		/// </summary>
+		public Rectangle CommandPartBounds=Rectangle.Empty;
+		/// <summary>
+		/// Gets or sets command part back color.
+		/// </summary>
+		public Color BackColor=Color.Empty;
+		/// <summary>
+		/// Gets or sets command part end gradient color.
+		/// </summary>
+		public Color BackColor2=Color.Empty;
+		/// <summary>
+		/// Gets or sets command part text color.
+		/// </summary>
+		public Color ForeColor=Color.Empty;
+		/// <summary>
+		/// Gets or sets gradient angle.
+		/// </summary>
+		public int BackColorGradientAngle=0;
+		/// <summary>
+		/// Gets or sets command part back color when mouse is over the part.
+		/// </summary>
+		public Color MouseOverBackColor=Color.Empty;
+		/// <summary>
+		/// Gets or sets command part end gradient back color when mouse is over the part.
+		/// </summary>
+		public Color MouseOverBackColor2=Color.Empty;
+		/// <summary>
+		/// Gets or sets text color when mouse is over the part.
+		/// </summary>
+		public Color MouseOverForeColor=Color.Empty;
+		/// <summary>
+		/// Gets or sets gradient angle.
+		/// </summary>
+		public int MouseOverBackColorGradientAngle=0;
+		
+		/// <summary>
+		/// Creates new instance of the class.
+		/// </summary>
+		/// <param name="g"></param>
+		public NodeCommandPartRendererEventArgs(Graphics g)
+		{
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/Display/NodeConnectorDisplay.cs b/PROMS/DotNetBar Source Code/TreeGX/Display/NodeConnectorDisplay.cs
new file mode 100644
index 00000000..e4c7d6d3
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/Display/NodeConnectorDisplay.cs	
@@ -0,0 +1,487 @@
+using System;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+
+namespace DevComponents.Tree
+{
+	namespace Display
+	{
+		/// <summary>
+		/// Base class for drawing node connectors.
+		/// </summary>
+		public abstract class NodeConnectorDisplay
+		{
+			//private bool m_RootNode=false;
+			//private bool m_DrawRootAllLevels=false;
+			private bool m_EndCap=true;
+			//private bool m_DrawConnectorUnderNodes=true;
+
+			/// <summary>
+			/// Creates new instance of the object.
+			/// </summary>
+			public NodeConnectorDisplay()
+			{
+			}
+
+			/// <summary>
+			/// Draws connector line between two nodes.
+			/// </summary>
+			/// <param name="info">Connector context information.</param>
+			public virtual void DrawConnector(ConnectorRendererEventArgs info){}
+
+			/// <summary>
+			/// Returns the connector starting coordinates.
+			/// </summary>
+			/// <param name="info">Connector display information.</param>
+			/// <returns>Point object.</returns>
+			protected Point GetStartPoint(ConnectorRendererEventArgs info)
+			{
+				Point p=Point.Empty;
+
+				if(info.IsRootNode)
+				{
+					//int toMidPoint=info.ToNode.Bounds.Top+info.ToNode.Bounds.Height/2;
+					//if(info.FromNode.Bounds.Top>toMidPoint)
+					if(IsAbove(info.FromNode,info.ToNode))
+						p=new Point(info.FromNode.BoundsRelative.Left+info.FromNode.BoundsRelative.Width/2,info.FromNode.BoundsRelative.Top);
+						//else if(info.FromNode.Bounds.Bottom<toMidPoint)
+					else if(IsBelow(info.FromNode,info.ToNode))
+						p=new Point(info.FromNode.BoundsRelative.Left+info.FromNode.BoundsRelative.Width/2,info.FromNode.BoundsRelative.Bottom-1);
+				}
+
+				if(p.IsEmpty)
+				{
+					// To element to the Left
+					if(this.IsOnLeftSide(info.FromNode,info.ToNode))
+						p=new Point(info.FromNode.BoundsRelative.Left,info.FromNode.BoundsRelative.Top+info.FromNode.BoundsRelative.Height/2);
+					else
+					{
+						p=new Point(info.FromNode.BoundsRelative.Right,info.FromNode.BoundsRelative.Top+info.FromNode.BoundsRelative.Height/2);
+						if(info.IsRootNode)
+							p.X--;
+						if(!NodeDisplay.DrawExpandPart(info.FromNode) && info.FromNode.ExpandVisibility==eNodeExpandVisibility.Auto)
+							p.X-=(info.FromNode.BoundsRelative.Width-info.FromNode.ContentBounds.Width);
+					}
+				}
+
+				if(!p.IsEmpty)
+					p.Offset(info.Offset.X,info.Offset.Y);
+
+				return p;
+			}
+
+			/// <summary>
+			/// Returns true if fromNode is above the toNode.
+			/// </summary>
+			/// <param name="fromNode">From Node object.</param>
+			/// <param name="toNode">To Node object</param>
+			/// <returns>True if fromNode is above toNode.</returns>
+			protected bool IsAbove(Node fromNode, Node toNode)
+			{
+				//int toMidPoint=toNode.Bounds.Top+toNode.Bounds.Height/2;
+				//if(fromNode.Bounds.Top>toMidPoint)
+				if(fromNode.BoundsRelative.Top>=toNode.BoundsRelative.Bottom)
+					return true;
+				return false;
+			}
+
+			/// <summary>
+			/// Returns true if fromNode is below toNode.
+			/// </summary>
+			/// <param name="fromNode">From Node object.</param>
+			/// <param name="toNode">To Node object.</param>
+			/// <returns>True if fromNode is below toNode.</returns>
+			protected bool IsBelow(Node fromNode, Node toNode)
+			{
+				int toMidPoint=toNode.BoundsRelative.Top+toNode.BoundsRelative.Height/2;
+				if(fromNode.BoundsRelative.Bottom<toMidPoint)
+					return true;
+				return false;
+			}
+
+			/// <summary>
+			/// Returns whether connector is extended to underline the node.
+			/// </summary>
+			/// <param name="nodeStyle">Refernce to Node style.</param>
+			/// <returns>True if node should be underlined by connector.</returns>
+			protected bool UnderlineNode(ElementStyle nodeStyle)
+			{
+				if(!nodeStyle.PaintBottomBorder && !nodeStyle.PaintTopBorder &&
+				   !nodeStyle.PaintLeftBorder && !nodeStyle.PaintRightBorder)
+					return true;
+				return false;
+			}
+
+			/// <summary>
+			/// Returns the connector end point. The array of end points. Two valid points will be returned if node needs to be underlined by connector.
+			/// </summary>
+			/// <param name="info">Connector display info.</param>
+			/// <returns>Array of point objects.</returns>
+			protected Point[] GetEndPoint(ConnectorRendererEventArgs info)
+			{
+				// If to element is to the right of the from node and has left border end point is the vertical mid-point
+				// If to element is to the left of the from node and has right border end point is the vertical mid-point
+				// If there is no border end point is text bottom
+				// If this is link connector the end point is the middle bottom or top point of the node
+
+				Point p=Point.Empty;
+				Point pLineEnd=Point.Empty;
+				int capWidthOffset=GetCapWidthOffset(info.NodeConnector.EndCap,info.NodeConnector.EndCapSize);
+				bool leftSide=this.IsOnLeftSide(info.FromNode,info.ToNode);
+
+				if(info.LinkConnector && info.FromNode.BoundsRelative.Top>info.ToNode.BoundsRelative.Bottom)
+					p=new Point(info.ToNode.BoundsRelative.X+info.ToNode.BoundsRelative.Width/2+(leftSide?capWidthOffset:-capWidthOffset),info.ToNode.BoundsRelative.Bottom+1);
+				else if(info.LinkConnector && info.FromNode.BoundsRelative.Bottom<info.ToNode.BoundsRelative.Top)
+					p=new Point(info.ToNode.BoundsRelative.X+info.ToNode.BoundsRelative.Width/2+(leftSide?capWidthOffset:-capWidthOffset),info.ToNode.BoundsRelative.Top-info.NodeConnector.EndCapSize.Height);
+				else
+				{
+					if(leftSide)
+					{
+						// To element is to the left of from node
+						Rectangle r=info.ToNode.BoundsRelative;
+						if(info.StyleToNode==null || UnderlineNode(info.StyleToNode))
+						{
+							p=new Point(r.Right,r.Bottom);
+							if(m_EndCap)
+								p.X+=capWidthOffset;
+
+							if(info.NodeConnector.UnderlineNoBorderNode)
+							{
+								Rectangle rc=NodeDisplay.GetNodeRectangle(eNodeRectanglePart.NodeContentBounds,info.ToNode,Point.Empty);
+								pLineEnd=new Point(rc.Left+1,r.Bottom);
+							}
+						}
+						else
+						{
+							p=new Point(r.Right,r.Y+r.Height/2);
+							if(m_EndCap)
+								p.X+=capWidthOffset;
+						}
+					}
+					else
+					{
+						// To element to the right of from node
+						Rectangle r=info.ToNode.BoundsRelative;
+						if(info.StyleToNode==null || UnderlineNode(info.StyleToNode))
+						{
+							//r=NodeDisplay.GetCellRectangle(eCellRectanglePart.TextBounds,info.ToNode.Cells[0],Point.Empty);
+							//r=info.ToNode.Cells[0].TextContentBounds;
+							p=new Point(r.X,r.Bottom);
+							if(m_EndCap)
+								p.X-=capWidthOffset;
+							if(info.NodeConnector.UnderlineNoBorderNode)
+							{
+								Rectangle rc=NodeDisplay.GetNodeRectangle(eNodeRectanglePart.NodeContentBounds,info.ToNode,Point.Empty);
+								pLineEnd=new Point(rc.Right-1,r.Bottom);
+							}
+						}
+						else
+						{
+							p=new Point(r.X,r.Y+r.Height/2);
+							if(m_EndCap)
+								p.X-=capWidthOffset;
+						}
+					}
+				}
+			
+				if(!p.IsEmpty)
+					p.Offset(info.Offset.X,info.Offset.Y);
+				if(!pLineEnd.IsEmpty)
+					pLineEnd.Offset(info.Offset.X,info.Offset.Y);
+
+				return new Point[] {p,pLineEnd};
+			}
+
+			/// <summary>
+			/// Returns the offest for the node connector cap.
+			/// </summary>
+			/// <param name="cap">Cap type.</param>
+			/// <param name="size">Cap size.</param>
+			/// <returns></returns>
+			protected int GetCapWidthOffset(eConnectorCap cap,Size size)
+			{
+				int capWidthOffset=0;
+				switch(cap)
+				{
+					case eConnectorCap.Arrow:
+						capWidthOffset=size.Width+1;
+						break;
+					case eConnectorCap.Ellipse:
+						capWidthOffset=size.Width;
+						break;
+				}
+				return capWidthOffset;
+			}
+
+			/// <summary>
+			/// Returns true if source node is on the left side of the target node.
+			/// </summary>
+			/// <param name="source">Reference to source node.</param>
+			/// <param name="target">Reference to target node.</param>
+			/// <returns>True if source is on the left side of target.</returns>
+			protected bool IsOnLeftSide(Node source, Node target)
+			{
+				if((source.BoundsRelative.Left+source.BoundsRelative.Width/2)>target.BoundsRelative.Left)
+					return true;
+				return false;
+			}
+
+			/// <summary>
+			/// Returns new instance of pen object for node connector line. Caller is responsible for
+			/// disposing of this object.
+			/// </summary>
+			/// <param name="info">Node connector display info.</param>
+			/// <returns>New instance of Pen object.</returns>
+			protected Pen GetLinePen(ConnectorRendererEventArgs info)
+			{
+				return new Pen(info.NodeConnector.LineColor,info.NodeConnector.LineWidth);
+			}
+
+			/// <summary>
+			/// Returns new instance of pen object for the end node connector line. Caller is responsible for
+			/// disposing of this object.
+			/// </summary>
+			/// <param name="info">Node connector display info.</param>
+			/// <returns>New instance of Pen object.</returns>
+			protected Pen GetEndLinePen(ConnectorRendererEventArgs info)
+			{
+				return new Pen(info.NodeConnector.LineColor,EndLineWidth);
+			}
+
+			/// <summary>
+			/// Returns new instance of pen object for the node underline line. Caller is responsible for
+			/// disposing of this object.
+			/// </summary>
+			/// <param name="info">Node connector display info.</param>
+			/// <returns>New instance of Pen object.</returns>
+			protected Pen GetEndUnderlinePen(ConnectorRendererEventArgs info)
+			{
+				return new Pen(info.NodeConnector.LineColor,EndLineWidth);
+			}
+
+			private int EndLineWidth
+			{
+				get {return 1;}
+			}
+
+			/// <summary>
+			/// Draws straight line connector between start and end point.
+			/// </summary>
+			/// <param name="info">Node connector display info.</param>
+			/// <param name="pStart">Start point.</param>
+			/// <param name="pEnd">End point.</param>
+			/// <param name="pEndUnderLine">Underline end point if any.</param>
+			protected void DrawLineConnector(ConnectorRendererEventArgs info,Point pStart,Point pEnd, Point pEndUnderLine)
+			{
+				if(info.NodeConnector.LineWidth>1)
+				{
+					// Merge lines nicely by filling and creating path...
+					int rootLineWidth=this.EndLineWidth;
+					int lineWidth=info.NodeConnector.LineWidth;
+				
+					using(Brush brush=GetLineBrush(info))
+					{
+						GraphicsPath path=GetConnectingPath(pStart,pEnd,lineWidth,rootLineWidth,info.IsRootNode,!(IsAbove(info.FromNode,info.ToNode) || IsBelow(info.FromNode,info.ToNode)));
+						info.Graphics.FillPath(brush,path);
+					}
+				}
+				else
+				{
+					using(Pen pen=this.GetLinePen(info))
+					{
+						info.Graphics.DrawLine(pen,pStart,pEnd);
+					}
+				}
+
+				if(!pEndUnderLine.IsEmpty)
+				{
+					using(Pen pen=this.GetEndUnderlinePen(info))
+					{
+						info.Graphics.DrawLine(pen,pEnd,pEndUnderLine);
+					}
+				}
+			}
+
+			private GraphicsPath GetConnectingPath(Point pStart, Point pEnd, int lineStartWidth, int lineEndWidth, bool bRoot, bool bRootSide)
+			{
+				int direction=1;
+				if(pStart.X>pEnd.X)
+					direction=-1;
+				lineStartWidth++;
+				lineEndWidth++;
+				GraphicsPath path=new GraphicsPath();
+				if(bRoot && !bRootSide)
+				{
+					path.AddLine(pStart.X,pStart.Y,pStart.X+lineStartWidth*direction,pStart.Y);
+//					if(direction>0)
+//						path.AddLine(pEnd.X+lineEndWidth*direction,pEnd.Y,pEnd.X,pEnd.Y);
+//					else
+//						path.AddLine(pEnd.X,pEnd.Y,pEnd.X+lineEndWidth*direction,pEnd.Y);
+					if(direction>0)
+					{
+						path.AddLine(pStart.X+lineStartWidth*direction,pStart.Y, pEnd.X, pEnd.Y);
+						path.AddLine(pEnd.X, pEnd.Y, pEnd.X, pEnd.Y + lineEndWidth*direction);
+						path.AddLine(pEnd.X, pEnd.Y + lineEndWidth*direction, pStart.X, pStart.Y);
+					}
+					else
+						path.AddLine(pEnd.X, pEnd.Y, pEnd.X, pEnd.Y + lineEndWidth*direction);
+						
+					path.CloseAllFigures();
+//					if(Math.Abs(pEnd.Y-pStart.Y)<=8)
+//						path.Widen(SystemPens.Highlight);
+				}
+				else
+				{
+					int offsetStart=lineStartWidth/2;
+					int offsetEnd=lineEndWidth/2;
+					path.AddLine(pStart.X,pStart.Y-offsetStart,pStart.X,pStart.Y+offsetStart);
+					path.AddLine(pEnd.X,pEnd.Y+offsetEnd,pEnd.X,pEnd.Y-offsetEnd);
+					path.AddLine(pEnd.X,pEnd.Y-offsetEnd,pStart.X,pStart.Y-offsetStart);
+					path.CloseAllFigures();
+				}
+			
+				return path;
+			}
+
+			protected Brush GetLineBrush(ConnectorRendererEventArgs info)
+			{
+				return new SolidBrush(info.NodeConnector.LineColor);
+			}
+
+			protected void DrawEndLine(ConnectorRendererEventArgs info,Point pStart,Point pEnd,Point pEndUnderLine)
+			{
+				if(pEndUnderLine.IsEmpty)
+				{
+					switch(info.NodeConnector.EndCap)
+					{
+						case eConnectorCap.Ellipse:
+							{
+								using(Pen pen=this.GetEndLinePen(info))
+								{
+									Size endCapSize=info.NodeConnector.EndCapSize;
+									if(pStart.X<pEnd.X)
+										info.Graphics.DrawEllipse(pen,pEnd.X-1,pEnd.Y-endCapSize.Height/2,endCapSize.Width,endCapSize.Height);
+									else
+										info.Graphics.DrawEllipse(pen,pEnd.X-endCapSize.Width,pEnd.Y-endCapSize.Height/2,endCapSize.Width,endCapSize.Height);
+								}
+								break;
+							}
+						case eConnectorCap.Arrow:
+							{
+								using(Pen pen=this.GetEndLinePen(info))
+								{
+									// Connects connector line to arrow
+									int direction=1;
+									if(pStart.X>pEnd.X)
+										direction=-1;
+									info.Graphics.DrawLine(pen,pEnd,new Point(pEnd.X+info.NodeConnector.EndCapSize.Width/3*direction,pEnd.Y));
+
+									Size endCapSize=info.NodeConnector.EndCapSize;
+									GraphicsPath arrow=GetArrowPath(endCapSize,pStart,pEnd);
+									info.Graphics.DrawPath(pen,arrow);
+								}
+								break;
+							}
+					}
+				}
+				else
+				{
+					using(Pen pen=this.GetEndUnderlinePen(info))
+					{
+						info.Graphics.DrawLine(pen,pEnd,pEndUnderLine);
+					
+						// Connect underline to expand part
+						if(NodeDisplay.DrawExpandPart(info.ToNode))
+						{
+							Rectangle re=NodeDisplay.GetNodeRectangle(eNodeRectanglePart.ExpandBounds,info.ToNode,info.Offset);
+                            if (re.IsEmpty) return;
+							Point p2=new Point((re.X>pEndUnderLine.X?re.X:re.Right)+(re.Width/2*(re.X>pEndUnderLine.X?1:-1)),re.Bottom);
+							Point p1=new Point(p2.X,pEndUnderLine.Y+(pEndUnderLine.Y>p2.Y?(p2.Y-pEndUnderLine.Y)/2:-(p2.Y-pEndUnderLine.Y)/2));
+							info.Graphics.DrawCurve(pen,new Point[]{pEndUnderLine,p1,p2},.5f);
+						}
+					}
+				}
+			}
+
+			private GraphicsPath GetArrowPath(Size capSize,Point pStart,Point pEnd)
+			{
+				GraphicsPath path=new GraphicsPath();
+				int direction=1;
+				if(pStart.X>pEnd.X)
+					direction=-1;
+			
+				pEnd.X+=(GetCapWidthOffset(eConnectorCap.Arrow,capSize)*direction);
+				path.AddLine(pEnd.X,pEnd.Y,pEnd.X-capSize.Width*direction,pEnd.Y-capSize.Height/2);
+				path.AddLine(pEnd.X-(2*capSize.Width/3*direction),pEnd.Y,pEnd.X-capSize.Width*direction,pEnd.Y+capSize.Height/2);
+
+				path.CloseAllFigures();
+				return path;
+			}
+
+			internal virtual ConnectorPointInfo GetConnectorPointInfo(ConnectorRendererEventArgs info, Point pStart, Point pEnd)
+			{
+				ConnectorPointInfo pointInfo=new ConnectorPointInfo();
+
+				int xMulti=1/*, yMulti=1*/;
+				int lineWidth=info.NodeConnector.LineWidth;
+
+				// used for direction control
+				if(pStart.X>pEnd.X)
+					xMulti=-1;
+				//if(pStart.Y>pEnd.Y)
+				//	yMulti=-1;
+
+				if(info.ConnectorPoints!=null)
+				{
+					Point connPointsOffset=info.ToNode.BoundsRelative.Location;
+					connPointsOffset.Offset(info.Offset.X,info.Offset.Y);
+					GraphicsPath path=new GraphicsPath();
+				
+					pointInfo.Points1=new Point[info.ConnectorPoints.Count+2];
+					pointInfo.Points1[0]=pStart;
+					pointInfo.Points1[pointInfo.Points1.Length-1]=pEnd;
+
+					if(lineWidth>1)
+					{
+						pointInfo.Points2=new Point[info.ConnectorPoints.Count+2];
+						pointInfo.Points2[pointInfo.Points2.Length-1]=pStart;
+						pointInfo.Points2[0]=pEnd;
+
+						int i=pointInfo.Points1.Length-2;
+						int k=1;
+
+						foreach(Point pcp in info.ConnectorPoints)
+						{
+							pointInfo.Points1[i]=pcp;
+							pointInfo.Points1[i].Offset(connPointsOffset.X,connPointsOffset.Y);
+							pointInfo.Points2[k]=new Point(pcp.X+lineWidth*xMulti,pcp.Y);
+							pointInfo.Points2[k].Offset(connPointsOffset.X,connPointsOffset.Y);
+							k++;
+							i--;
+						}
+					}
+					else
+					{
+						int i=pointInfo.Points1.Length-2;
+						foreach(Point pcp in info.ConnectorPoints)
+						{
+							pointInfo.Points1[i]=pcp;
+							pointInfo.Points1[i].Offset(connPointsOffset.X,connPointsOffset.Y);
+							i--;
+						}
+					}	
+				}
+				return pointInfo;
+			}
+		}
+	}
+
+	/// <summary>
+	/// Represents custom connector path info.
+	/// </summary>
+	internal class ConnectorPointInfo
+	{
+		public Point[] Points1=null;
+		public Point[] Points2=null;
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/Display/NodeDisplay.cs b/PROMS/DotNetBar Source Code/TreeGX/Display/NodeDisplay.cs
new file mode 100644
index 00000000..127a15e6
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/Display/NodeDisplay.cs	
@@ -0,0 +1,334 @@
+using System;
+using System.Drawing;
+using DevComponents.Tree.Layout;
+
+namespace DevComponents.Tree.Display
+{
+	/// <summary>
+	/// Summary description for NodeDisplay.
+	/// </summary>
+	public class NodeDisplay
+	{
+		#region Private Variables
+		private Point m_Offset=Point.Empty;
+		private Point m_LockedOffset=Point.Empty;
+		private TreeGX m_Tree=null;
+#if !TRIAL
+		internal static bool keyInvalid=false;
+#endif
+		#endregion
+		/// <summary>Creates new instance of the class</summary>
+		/// <param name="tree">Object to initialize class with.</param>
+		public NodeDisplay(TreeGX tree)
+		{
+			m_Tree=tree;
+		}
+
+		/// <summary>
+		/// Paints the layout on canvas.
+		/// </summary>
+		public virtual void Paint(Graphics g, Rectangle clipRectangle)
+		{
+		}
+
+		/// <summary>
+		/// Gets or sets the offset of the tree content relative to the size of the container control.
+		/// </summary>
+		public virtual Point Offset
+		{
+			get
+			{
+				if(!m_LockedOffset.IsEmpty)
+					return m_LockedOffset;
+				
+				Node displayNode=m_Tree.GetDisplayRootNode();
+				if(displayNode==null)
+					return Point.Empty;;
+				
+				Size nodesSize = m_Tree.GetScreenSize(new Size(m_Tree.NodeLayout.Width, m_Tree.NodeLayout.Height));
+				// Must change offset value since map layout assumes that root node is in the center
+				// of container control.
+				if(m_Tree.NodeLayout is NodeMapLayout && m_Tree.AutoScroll)
+				{
+					Point p=m_Offset;
+					Point displayNodeChildLocation =
+						new Point(Math.Abs((int)(displayNode.ChildNodesBounds.Left * m_Tree.Zoom)), Math.Abs((int)(displayNode.ChildNodesBounds.Top * m_Tree.Zoom)));
+					
+					p.Offset(displayNodeChildLocation.X, displayNodeChildLocation.Y);
+					
+					int offsetX=0, offsetY=0;
+					if(m_Tree.CenterContent && m_Tree.Height>nodesSize.Height)
+					{
+						offsetY=(m_Tree.Height-nodesSize.Height)/2;
+					}
+					
+					if(m_Tree.CenterContent && m_Tree.Width>nodesSize.Width)
+					{
+						offsetX=(m_Tree.Width-nodesSize.Width)/2;
+					}
+					
+					p.Offset(offsetX,offsetY);
+					return m_Tree.GetLayoutPosition(p);
+				}
+				else if(m_Tree.NodeLayout is Layout.NodeDiagramLayout && m_Tree.AutoScroll)
+				{
+					Point p=m_Offset;
+					int offsetX=0, offsetY=0;
+					if(m_Tree.CenterContent && m_Tree.Height>nodesSize.Height)
+						offsetY=(m_Tree.Height-nodesSize.Height)/2;
+					if(m_Tree.CenterContent && m_Tree.Width>nodesSize.Width)
+						offsetX=(m_Tree.Width-nodesSize.Width)/2;
+					p.Offset(offsetX,offsetY);
+					return m_Tree.GetLayoutPosition(p);
+				}
+				else
+					return m_Offset;
+			}
+			set {m_Offset=value;}
+		}
+
+		/// <summary>Gets or sets whether offset is locked, i.e. cannot be changed.</summary>
+		public bool LockOffset
+		{
+			get {return (!m_LockedOffset.IsEmpty);}
+			set
+			{
+				if(value)
+					m_LockedOffset=this.Offset;
+				else
+					m_LockedOffset=Point.Empty;
+			}
+		}
+		
+		/// <summary>
+		/// Sets locked offset to specific value. Point.Empty means there is no locked offset set.
+		/// </summary>
+		/// <param name="p">New locked offset.</param>
+		public void SetLockedOffset(Point p)
+		{
+			m_LockedOffset=p;
+		}
+		
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <returns></returns>
+		public Point GetLockedOffset()
+		{
+			return m_LockedOffset;
+		}
+
+		/// <summary>
+		/// Returns the default offset for the tree content relative to the size of the container.
+		/// </summary>
+		public virtual Point DefaultOffset
+		{
+			get
+			{
+				Node displayNode=m_Tree.GetDisplayRootNode();
+				if(displayNode==null)
+					return Point.Empty;;
+				
+				if(m_Tree.NodeLayout is NodeMapLayout && m_Tree.Nodes.Count>0)
+				{
+					if(!m_Tree.CenterContent)
+						return new Point(Math.Abs(displayNode.ChildNodesBounds.Left),Math.Abs(displayNode.ChildNodesBounds.Top));
+					else
+                        return new Point(m_Tree.SelectionBoxSize+(m_Tree.Width - m_Tree.SelectionBoxSize * 2 - m_Tree.NodeLayout.Width) / 2 + Math.Abs(displayNode.ChildNodesBounds.Left),
+                            m_Tree.SelectionBoxSize + (m_Tree.Height - m_Tree.SelectionBoxSize * 2 - m_Tree.NodeLayout.Height) / 2 + Math.Abs(displayNode.ChildNodesBounds.Top));
+				}
+				if(m_Tree.NodeLayout is Layout.NodeDiagramLayout)
+				{
+					if(!m_Tree.CenterContent)
+						return m_Tree.ClientRectangle.Location;
+					else
+						return new Point((m_Tree.Width-m_Tree.NodeLayout.Width)/2,(m_Tree.Height-m_Tree.NodeLayout.Height)/2);
+				}
+				else
+					return m_Tree.ClientRectangle.Location;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the reference to the tree control managed by display class.
+		/// </summary>
+		protected virtual TreeGX Tree
+		{
+			get {return m_Tree;}
+			set {m_Tree=value;}
+		}
+
+		internal static Rectangle GetNodeRectangle(eNodeRectanglePart part, Node node, Point offset)
+		{
+			Rectangle r=Rectangle.Empty;
+			if(part==eNodeRectanglePart.CellsBounds)
+			{
+				r=node.CellsBoundsRelative;
+				if(!r.IsEmpty)
+				{
+					r.Offset(offset);
+					r.Offset(node.BoundsRelative.Location);
+				}
+			}
+			else if(part==eNodeRectanglePart.ExpandBounds)
+			{
+				r=node.ExpandPartRectangleRelative;
+				if(!r.IsEmpty)
+				{
+					r.Offset(offset);
+					r.Offset(node.BoundsRelative.Location);
+				}
+			}
+			else if(part==eNodeRectanglePart.CommandBounds)
+			{
+				r=node.CommandBoundsRelative;
+				if(!r.IsEmpty)
+				{
+					r.Offset(offset);
+					r.Offset(node.BoundsRelative.Location);
+				}
+			}	
+			else if(part==eNodeRectanglePart.NodeContentBounds)
+			{
+				r=node.ContentBounds;
+				if(!r.IsEmpty)
+				{
+					r.Offset(offset);
+					r.Offset(node.BoundsRelative.Location);
+				}
+			}
+			else if(part==eNodeRectanglePart.NodeBounds)
+			{
+				r=node.BoundsRelative;
+				if(!r.IsEmpty)
+					r.Offset(offset);
+			}
+			else if(part==eNodeRectanglePart.ChildNodeBounds)
+			{
+				r=node.ChildNodesBounds;
+				if(!r.IsEmpty)
+				{
+					//r.Offset(node.Bounds.Location);
+					r.Offset(offset);
+				}
+			}
+			return r;
+		}
+
+		internal static Rectangle GetCellRectangle(eCellRectanglePart part, Cell cell, Point offset)
+		{
+			Rectangle r=Rectangle.Empty;
+			
+			// If cell parent is not assigned rectangle cannot be returned.
+			if(cell.Parent==null)
+				return r;
+
+			if(part==eCellRectanglePart.CheckBoxBounds)
+			{
+				r=cell.CheckBoxBoundsRelative;
+				if(!r.IsEmpty)
+				{
+					r.Offset(offset);
+					r.Offset(cell.Parent.BoundsRelative.Location);
+				}
+			}
+			else if(part==eCellRectanglePart.ImageBounds)
+			{
+				r=cell.ImageBoundsRelative;
+				if(!r.IsEmpty)
+				{
+					r.Offset(offset);
+					r.Offset(cell.Parent.BoundsRelative.Location);
+				}
+			}
+			else if(part==eCellRectanglePart.TextBounds)
+			{
+				r=cell.TextContentBounds;
+				if(!r.IsEmpty)
+				{
+					r.Offset(offset);
+					r.Offset(cell.Parent.BoundsRelative.Location);
+				}
+			}
+			else if(part==eCellRectanglePart.CellBounds)
+			{
+				r=cell.BoundsRelative;
+				if(!r.IsEmpty)
+				{
+					r.Offset(offset);
+				}
+			}
+			return r;
+		}
+
+		internal static bool DrawExpandPart(Node node)
+		{
+			if(node.Nodes.Count>0 && node.ExpandVisibility!=eNodeExpandVisibility.Hidden || node.ExpandVisibility==eNodeExpandVisibility.Visible)
+				return true;
+			return false;
+		}
+
+		protected NodeExpandDisplay GetExpandDisplay(eExpandButtonType e)
+		{
+			NodeExpandDisplay d=null;
+			switch(e)
+			{
+				case eExpandButtonType.Ellipse:
+					d=new NodeExpandEllipseDisplay();
+					break;
+				case eExpandButtonType.Rectangle:
+					d=new NodeExpandRectDisplay();
+					break;
+				case eExpandButtonType.Image:
+					d=new NodeExpandImageDisplay();
+					break;
+			}
+			return d;
+		}
+
+		protected bool IsRootNode(Node node)
+		{
+			return NodeOperations.IsRootNode(m_Tree,node);
+		}
+
+		protected ElementStyle GetDefaultNodeStyle()
+		{
+			ElementStyle style=new ElementStyle();
+			style.TextColorSchemePart=eColorSchemePart.ItemText;
+
+			return style;
+		}
+
+		public void MoveHostedControls()
+		{
+			Point offset=this.Offset;
+			float zoom = this.Tree.Zoom;
+			foreach(Cell cell in this.Tree.HostedControlCells)
+			{
+				Rectangle bounds = NodeDisplay.GetCellRectangle(eCellRectanglePart.TextBounds, cell, offset);
+				Rectangle screenBounds=this.Tree.GetScreenRectangle(bounds);
+				if(!bounds.IsEmpty && cell.HostedControl.Bounds!=screenBounds)
+				{
+					if(zoom!=1)
+					{
+						cell.HostedControlSize = bounds.Size;
+						cell.IgnoreHostedControlSizeChange = true;
+					}
+					else
+					{
+						cell.HostedControlSize = Size.Empty;
+					}
+					cell.HostedControl.Bounds=screenBounds;
+					if(zoom!=1)
+						cell.IgnoreHostedControlSizeChange = false;
+					if(cell.Parent!=null)
+					{
+						bool visible = NodeOperations.GetIsNodeVisible(cell.Parent);
+						if(visible!=cell.HostedControl.Visible)
+							cell.HostedControl.Visible = visible;
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/Display/NodeExpandDisplay.cs b/PROMS/DotNetBar Source Code/TreeGX/Display/NodeExpandDisplay.cs
new file mode 100644
index 00000000..83b09ec0
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/Display/NodeExpandDisplay.cs	
@@ -0,0 +1,47 @@
+using System.Drawing;
+using System.Drawing.Drawing2D;
+
+namespace DevComponents.Tree
+{
+	namespace Display
+	{
+		/// <summary>
+		/// Base class for node expand button display.
+		/// </summary>
+		public abstract class NodeExpandDisplay
+		{
+			/// <summary>Creates new instance of the class</summary>
+			public NodeExpandDisplay()
+			{
+			}
+
+			/// <summary>Draws expand button.</summary>
+			/// <param name="e">Context parameters for drawing expand button.</param>
+			public abstract void DrawExpandButton(NodeExpandPartRendererEventArgs e);
+
+			protected Pen GetBorderPen(NodeExpandPartRendererEventArgs e)
+			{
+                return new Pen(e.BorderColor, Dpi.Width1);
+			}
+
+			protected Pen GetExpandPen(NodeExpandPartRendererEventArgs e)
+			{
+				return new Pen(e.ExpandLineColor,Dpi.Width1);
+			}
+
+			protected Brush GetBackgroundBrush(NodeExpandPartRendererEventArgs e)
+			{
+				if(e.BackColor.IsEmpty && e.BackColor2.IsEmpty)
+					return null;
+
+				if(e.BackColor2.IsEmpty)
+					return new SolidBrush(e.BackColor);
+			
+				System.Drawing.Drawing2D.LinearGradientBrush brush=DisplayHelp.CreateLinearGradientBrush(e.ExpandPartBounds,e.BackColor,e.BackColor2,e.BackColorGradientAngle);
+				//brush.SetSigmaBellShape(0.8f);
+				return brush;
+			}
+		
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/Display/NodeExpandEllipseDisplay.cs b/PROMS/DotNetBar Source Code/TreeGX/Display/NodeExpandEllipseDisplay.cs
new file mode 100644
index 00000000..3a6e2bba
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/Display/NodeExpandEllipseDisplay.cs	
@@ -0,0 +1,51 @@
+using System.Drawing;
+
+namespace DevComponents.Tree.Display
+{
+	/// <summary>
+	/// Represents class that paints elliptical expand button.
+	/// </summary>
+	public class NodeExpandEllipseDisplay:NodeExpandDisplay
+	{
+		/// <summary>Draws ellipse type expand button.</summary>
+		/// <param name="e">Expand context drawing information.</param>
+        public override void DrawExpandButton(NodeExpandPartRendererEventArgs e)
+        {
+            Rectangle expandPartBounds = e.ExpandPartBounds;
+            if (expandPartBounds.IsEmpty)
+                return;
+
+            Brush brush = GetBackgroundBrush(e);
+
+            expandPartBounds.Width--;
+            expandPartBounds.Height--;
+
+            if (brush != null)
+            {
+                e.Graphics.FillEllipse(brush, expandPartBounds);
+                brush.Dispose();
+            }
+
+            using (Pen pen = GetBorderPen(e))
+            {
+                e.Graphics.DrawEllipse(pen, expandPartBounds);
+            }
+
+            if (e.Node.Expanded)
+            {
+                using (Pen pen = GetExpandPen(e))
+                {
+                    e.Graphics.DrawLine(pen, expandPartBounds.X + 2, expandPartBounds.Y + expandPartBounds.Height / 2, expandPartBounds.Right - 2, expandPartBounds.Y + expandPartBounds.Height / 2);
+                }
+            }
+            else
+            {
+                using (Pen pen = GetExpandPen(e))
+                {
+                    e.Graphics.DrawLine(pen, expandPartBounds.X + 2, expandPartBounds.Y + expandPartBounds.Height / 2, expandPartBounds.Right - 2, expandPartBounds.Y + expandPartBounds.Height / 2);
+                    e.Graphics.DrawLine(pen, expandPartBounds.X + expandPartBounds.Width / 2, expandPartBounds.Y + 2, expandPartBounds.X + expandPartBounds.Width / 2, expandPartBounds.Bottom - 2);
+                }
+            }
+        }
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/Display/NodeExpandImageDisplay.cs b/PROMS/DotNetBar Source Code/TreeGX/Display/NodeExpandImageDisplay.cs
new file mode 100644
index 00000000..0bcc55bc
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/Display/NodeExpandImageDisplay.cs	
@@ -0,0 +1,25 @@
+
+
+namespace DevComponents.Tree.Display
+{
+	/// <summary>
+	/// Represents expand button display using predefined images.
+	/// </summary>
+	public class NodeExpandImageDisplay:NodeExpandDisplay
+	{
+		/// <summary>
+		/// Draws image type expand button.
+		/// </summary>
+		/// <param name="e">Expand context information</param>
+		public override void DrawExpandButton(NodeExpandPartRendererEventArgs e)
+		{
+			if(e.Node.Expanded)
+			{
+				if(e.ExpandImageCollapse!=null)
+					e.Graphics.DrawImage(e.ExpandImageCollapse,e.ExpandPartBounds);
+			}
+			else if(e.ExpandImage!=null)
+				e.Graphics.DrawImage(e.ExpandImage,e.ExpandPartBounds);
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/Display/NodeExpandPartRendererEventArgs.cs b/PROMS/DotNetBar Source Code/TreeGX/Display/NodeExpandPartRendererEventArgs.cs
new file mode 100644
index 00000000..612f65cc
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/Display/NodeExpandPartRendererEventArgs.cs	
@@ -0,0 +1,48 @@
+using System;
+using System.Drawing;
+
+namespace DevComponents.Tree
+{
+	/// <summary>
+	/// Represents event arguments for RenderExpandPart event.
+	/// </summary>
+	public class NodeExpandPartRendererEventArgs:EventArgs
+	{
+		/// <summary>
+		/// Gets or sets reference to Graphics object, canvas node is rendered on.
+		/// </summary>
+		public System.Drawing.Graphics Graphics=null;
+		/// <summary>
+		/// Gets or sets the reference to Node object being rendered.
+		/// </summary>
+		public DevComponents.Tree.Node Node=null;
+		/// <summary>Expand part bounds</summary>
+		public Rectangle ExpandPartBounds=Rectangle.Empty;
+		/// <summary>Expand part border color</summary>
+		public Color BorderColor=Color.Empty;
+		/// <summary>Expand part line color</summary>
+		public Color ExpandLineColor=Color.Empty;
+		/// <summary>Expand part background color</summary>
+		public Color BackColor=Color.Empty;
+		/// <summary>Expand part target gradient background color</summary>
+		public Color BackColor2=Color.Empty;
+		/// <summary>Gradient angle</summary>
+		public int BackColorGradientAngle=90;
+//		/// <summary>Indicates whether mouse is over the expand part</summary>
+//		public bool MouseOver=false;
+		/// <summary>Expand part image when node is expanded</summary>
+		public Image ExpandImage=null;
+		/// <summary>Expand part image when node is collapsed</summary>
+		public Image ExpandImageCollapse=null;
+		/// <summary>Internal support for expand button types</summary>
+		internal eExpandButtonType ExpandButtonType=eExpandButtonType.Ellipse;
+		/// <summary>
+		/// Creates new instance of the class and initializes it with default values.
+		/// </summary>
+		/// <param name="g">Reference to graphics object.</param>
+		public NodeExpandPartRendererEventArgs(Graphics g)
+		{
+			this.Graphics = g;
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/Display/NodeExpandRectDisplay.cs b/PROMS/DotNetBar Source Code/TreeGX/Display/NodeExpandRectDisplay.cs
new file mode 100644
index 00000000..4041fa21
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/Display/NodeExpandRectDisplay.cs	
@@ -0,0 +1,53 @@
+using System;
+using System.Drawing;
+
+namespace DevComponents.Tree.Display
+{
+	/// <summary>
+	/// Represents class that paints rectangular expand button.
+	/// </summary>
+	public class NodeExpandRectDisplay:NodeExpandDisplay
+	{
+		/// <summary>
+		/// Draw rectangular type expand button.
+		/// </summary>
+		/// <param name="e">Expand button context information.</param>
+        public override void DrawExpandButton(NodeExpandPartRendererEventArgs e)
+        {
+            Rectangle expandPartBounds = e.ExpandPartBounds;
+            if (expandPartBounds.IsEmpty)
+                return;
+
+            expandPartBounds.Width--;
+            expandPartBounds.Height--;
+
+            Brush brush = GetBackgroundBrush(e);
+            if (brush != null)
+            {
+                e.Graphics.FillRectangle(brush, expandPartBounds);
+                brush.Dispose();
+            }
+
+            using (Pen pen = GetBorderPen(e))
+            {
+                e.Graphics.DrawRectangle(pen, expandPartBounds);
+            }
+
+            if (e.Node.Expanded)
+            {
+                using (Pen pen = GetExpandPen(e))
+                {
+                    e.Graphics.DrawLine(pen, expandPartBounds.X + 2, expandPartBounds.Y + expandPartBounds.Height / 2, expandPartBounds.Right - 2, expandPartBounds.Y + expandPartBounds.Height / 2);
+                }
+            }
+            else
+            {
+                using (Pen pen = GetExpandPen(e))
+                {
+                    e.Graphics.DrawLine(pen, expandPartBounds.X + 2, expandPartBounds.Y + expandPartBounds.Height / 2, expandPartBounds.Right - 2, expandPartBounds.Y + expandPartBounds.Height / 2);
+                    e.Graphics.DrawLine(pen, expandPartBounds.X + expandPartBounds.Width / 2, expandPartBounds.Y + 2, expandPartBounds.X + expandPartBounds.Width / 2, expandPartBounds.Bottom - 2);
+                }
+            }
+        }
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/Display/NodeProfessionalColorTable.cs b/PROMS/DotNetBar Source Code/TreeGX/Display/NodeProfessionalColorTable.cs
new file mode 100644
index 00000000..5adb5b39
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/Display/NodeProfessionalColorTable.cs	
@@ -0,0 +1,102 @@
+using System.Drawing;
+
+namespace DevComponents.Tree.Display
+{
+	/// <summary>
+	/// Describes colors used by Professional Renderer.
+	/// </summary>
+	public class NodeProfessionalColorTable
+	{
+		/// <summary>
+		/// Gets or sets the gradient begin color for top part of background.
+		/// </summary>
+		public Color NodeTopGradientBegin = ColorScheme.GetColor("B0CCF9");
+		/// <summary>
+		/// Gets or sets the middle gradient color for top part of background.
+		/// </summary>
+		public Color NodeTopGradientMiddle = ColorScheme.GetColor("E2EDFF"); // Color.FromArgb(242, 245, 250);
+		/// <summary>
+		/// Gets or sets the end gradient color for top part of background.
+		/// </summary>
+		public Color NodeTopGradientEnd = Color.Empty;
+		/// <summary>
+		/// Gets or sets the end gradient type for top part of background.
+		/// </summary>
+		public eGradientType NodeTopGradientType = eGradientType.Linear;
+		/// <summary>
+		/// Gets or sets the end gradient angle for top part of background.
+		/// </summary>
+		public int NodeTopGradientAngle = 90;
+
+		/// <summary>
+		/// Gets or sets the starting gradient color for bottom part of background.
+		/// </summary>
+		public Color NodeBottomGradientBegin = ColorScheme.GetColor("75ABFF");
+		/// <summary>
+		/// Gets or sets the middle gradient color for bottom part of background.
+		/// </summary>
+		public Color NodeBottomGradientMiddle = Color.FromArgb(208, 242, 248);
+		/// <summary>
+		/// Gets or sets the end gradient color for bottom part of background.
+		/// </summary>
+		public Color NodeBottomGradientEnd = Color.Empty;
+		/// <summary>
+		/// Gets or sets the type of the gradient for bottom part of background.
+		/// </summary>
+		public eGradientType NodeBottomGradientType = eGradientType.Linear;
+		/// <summary>
+		/// Gets or sets the gradient angle for bottom part of background.
+		/// </summary>
+		public int NodeBottomGradientAngle = 90;
+
+		/// <summary>
+		/// Gets or sets the starting gradient color for top part of background when mouse is over the node.
+		/// </summary>
+		public Color NodeMouseOverTopGradientBegin = ColorScheme.GetColor("B0CCF9");
+		/// <summary>
+		/// Gets or sets the middle gradient color for top part of background when mouse is over the node.
+		/// </summary>
+		public Color NodeMouseOverTopGradientMiddle = Color.White;
+		/// <summary>
+		/// Gets or sets the end gradient color for top part of background when mouse is over the node.
+		/// </summary>
+		public Color NodeMouseOverTopGradientEnd = Color.Empty;
+		/// <summary>
+		/// Gets or sets the gradient type for top part of background when mouse is over the node.
+		/// </summary>
+		public eGradientType NodeMouseOverTopGradientType = eGradientType.Linear;
+		/// <summary>
+		/// Gets or sets the gradient angle for top part of background when mouse is over the node.
+		/// </summary>
+		public int NodeMouseOverTopGradientAngle = 90;
+
+		/// <summary>
+		/// Gets or sets the starting gradient color for bottom part of background when mouse is over the node.
+		/// </summary>
+		public Color NodeMouseOverBottomGradientBegin = ColorScheme.GetColor("6599EA");
+		/// <summary>
+		/// Gets or sets the middle gradient color for bottom part of background when mouse is over the node.
+		/// </summary>
+		public Color NodeMouseOverBottomGradientMiddle = Color.Cyan;
+		/// <summary>
+		/// Gets or sets the end gradient color for bottom part of background when mouse is over the node.
+		/// </summary>
+		public Color NodeMouseOverBottomGradientEnd = Color.Empty;
+		/// <summary>
+		/// Gets or sets the gradient type for bottom part of background when mouse is over the node.
+		/// </summary>
+		public eGradientType NodeMouseOverBottomGradientType = eGradientType.Linear;
+		/// <summary>
+		/// Gets or sets the gradient angle for bottom part of background when mouse is over the node.
+		/// </summary>
+		public int NodeMouseOverBottomGradientAngle = 90;
+
+//		public Color NodeTopGradientBegin=ColorScheme.GetColor("BDCCD9");
+//		public Color NodeTopGradientMiddle=Color.White;
+//		public Color NodeTopGradientEnd=ColorScheme.GetColor("406986");
+//		
+//		public Color NodeBottomGradientBegin=ColorScheme.GetColor("03436D");
+//		public Color NodeBottomGradientMiddle=ColorScheme.GetColor("0BC0E9");
+//		public Color NodeBottomGradientEnd=ColorScheme.GetColor("0C84C1");
+	}
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/TreeGX/Display/NodeProfessionalRenderer.cs b/PROMS/DotNetBar Source Code/TreeGX/Display/NodeProfessionalRenderer.cs
new file mode 100644
index 00000000..b5844390
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/Display/NodeProfessionalRenderer.cs	
@@ -0,0 +1,213 @@
+using System;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Drawing.Imaging;
+
+namespace DevComponents.Tree.Display
+{
+	/// <summary>
+	/// Represents professional rendered which provides extensive rendering above and beyond the NodeSystemRenderer.
+	/// </summary>
+	public class NodeProfessionalRenderer : NodeSystemRenderer
+	{
+		#region Private Variables
+		private NodeProfessionalColorTable m_ColorTable=new NodeProfessionalColorTable();
+		#endregion
+		
+		/// <summary>
+		/// Gets or sets the color table used by renderer.
+		/// </summary>
+		public NodeProfessionalColorTable ColorTable
+		{
+			get { return m_ColorTable;}
+			set
+			{
+				m_ColorTable = value;
+			}
+		}
+		/// <summary>
+		/// Draws node background. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+		/// do not want default rendering to occur do not call the base implementation. You can call OnRenderNodeBackground method so events can occur.
+		/// </summary>
+		/// <param name="e">Information provided for rendering.</param>
+		public override void DrawNodeBackground(NodeRendererEventArgs e)
+		{
+			ElementStyleDisplayInfo di=GetElementStyleDisplayInfo(e.Style,e.Graphics,DisplayHelp.GetDrawRectangle(e.NodeBounds));
+			PaintBackground(e);
+			ElementStyleDisplay.PaintBackgroundImage(di);
+			ElementStyleDisplay.PaintBorder(di);
+			
+			// Let events occur
+			OnRenderNodeBackground(e);
+		}
+		
+		private void PaintBackgroundPart(Graphics g, Rectangle bounds, GraphicsPath path, Color color1, Color color2, eGradientType gradientType, int gradientAngle)
+		{
+			if(color2.IsEmpty)
+			{
+				if(!color1.IsEmpty)
+				{
+					using(SolidBrush brush=new SolidBrush(color1))
+						g.FillPath(brush,path);
+				}
+			}
+			else if(!m_ColorTable.NodeTopGradientBegin.IsEmpty)
+			{
+				if (gradientType == eGradientType.Linear)
+				{
+					Rectangle rb = bounds;
+					rb.X--;
+					rb.Height++;
+					rb.Width += 2;
+					using (LinearGradientBrush brush = DisplayHelp.CreateLinearGradientBrush(rb, color1, color2, gradientAngle))
+					{
+						g.FillPath(brush, path);
+					}
+				}
+				else if (gradientType == eGradientType.Radial)
+				{
+					int d = (int)Math.Sqrt(bounds.Width * bounds.Width + bounds.Height * bounds.Height);
+					GraphicsPath fillPath = new GraphicsPath();
+					fillPath.AddEllipse(bounds.X - (d - bounds.Width), bounds.Y - (d - bounds.Height) / 2, d, d);
+					using (PathGradientBrush brush = new PathGradientBrush(fillPath))
+					{
+						brush.CenterColor = color1;
+						brush.SurroundColors = new Color[] { color2 };
+						g.FillPath(brush, path);
+					}
+					fillPath.Dispose();
+				}
+			}
+		}
+		
+		/// <summary>
+		/// Paints background of the node.
+		/// </summary>
+		/// <param name="e">Context information.</param>
+		protected virtual void PaintBackground(NodeRendererEventArgs e)
+		{
+			Graphics g = e.Graphics;
+			bool mouseOver = e.Node.IsMouseOver;
+			
+			Region oldClip = g.Clip;
+			Rectangle clipRect=e.NodeBounds;
+			clipRect.Width--;
+			clipRect.Height--;
+			g.SetClip(clipRect, CombineMode.Replace);
+			
+			// Prepare colors
+			NodeColors colors=new NodeColors();
+			colors.NodeTopGradientBegin = m_ColorTable.NodeTopGradientBegin;
+			colors.NodeTopGradientMiddle = m_ColorTable.NodeTopGradientMiddle;
+			colors.NodeTopGradientEnd = m_ColorTable.NodeTopGradientEnd;
+			colors.NodeTopGradientType = m_ColorTable.NodeTopGradientType;
+			colors.NodeTopGradientAngle = m_ColorTable.NodeTopGradientAngle;
+			colors.NodeBottomGradientBegin = m_ColorTable.NodeBottomGradientBegin;
+			colors.NodeBottomGradientMiddle = m_ColorTable.NodeBottomGradientMiddle;
+			colors.NodeBottomGradientEnd = m_ColorTable.NodeBottomGradientEnd;
+			colors.NodeBottomGradientType = m_ColorTable.NodeBottomGradientType;
+			colors.NodeBottomGradientAngle = m_ColorTable.NodeBottomGradientAngle;
+			if(mouseOver)
+			{
+				colors.NodeTopGradientBegin = m_ColorTable.NodeMouseOverTopGradientBegin;
+				colors.NodeTopGradientMiddle = m_ColorTable.NodeMouseOverTopGradientMiddle;
+				colors.NodeTopGradientEnd = m_ColorTable.NodeMouseOverTopGradientEnd;
+				colors.NodeTopGradientType = m_ColorTable.NodeMouseOverTopGradientType;
+				colors.NodeTopGradientAngle = m_ColorTable.NodeMouseOverTopGradientAngle;
+				colors.NodeBottomGradientBegin = m_ColorTable.NodeMouseOverBottomGradientBegin;
+				colors.NodeBottomGradientMiddle = m_ColorTable.NodeMouseOverBottomGradientMiddle;
+				colors.NodeBottomGradientEnd = m_ColorTable.NodeMouseOverBottomGradientEnd;
+				colors.NodeBottomGradientType = m_ColorTable.NodeMouseOverBottomGradientType;
+				colors.NodeBottomGradientAngle = m_ColorTable.NodeMouseOverBottomGradientAngle;
+			}
+			
+			// Paint Background, Top Part
+			Rectangle bounds=DisplayHelp.GetDrawRectangle(ElementStyleDisplay.GetBackgroundRectangle(e.Style,e.NodeBounds));
+			GraphicsPath path;
+			if (g.SmoothingMode == SmoothingMode.AntiAlias)
+			{
+				Rectangle r = bounds;
+				r.Width--;
+				path = ElementStyleDisplay.GetBackgroundPath(e.Style, r, eStyleBackgroundPathPart.TopHalf);
+			}
+			else
+				path = ElementStyleDisplay.GetBackgroundPath(e.Style, bounds, eStyleBackgroundPathPart.TopHalf);
+			path.CloseAllFigures();
+			Rectangle backRect = bounds;
+			backRect.Height = backRect.Height/2;
+			PaintBackgroundPart(g, backRect, path, colors.NodeTopGradientBegin, colors.NodeTopGradientEnd,
+			                    colors.NodeTopGradientType, colors.NodeTopGradientAngle);
+			
+			Rectangle ellipse = new Rectangle(bounds.X, bounds.Y - bounds.Height / 2, bounds.Width, bounds.Height);
+			GraphicsPath pathFill=new GraphicsPath();
+			pathFill.AddEllipse(ellipse);
+			PathGradientBrush pathBrush = new PathGradientBrush(pathFill);
+			pathBrush.CenterColor = colors.NodeTopGradientMiddle;
+			pathBrush.SurroundColors = new Color[] { Color.Transparent };
+			pathBrush.CenterPoint = new PointF(ellipse.X + ellipse.Width / 2, bounds.Y);
+			Blend blend = new Blend();
+			blend.Factors = new float[] { 0f, .8f, 1f };
+			blend.Positions = new float[] { .0f, .8f, 1f };
+			pathBrush.Blend = blend;
+			pathFill.Dispose();
+			g.FillPath(pathBrush, path);
+			pathBrush.Dispose();
+			path.Dispose();
+			
+			// Bottom Part
+			if (g.SmoothingMode == SmoothingMode.AntiAlias)
+			{
+				Rectangle r = bounds;
+				r.Width--;
+				path = ElementStyleDisplay.GetBackgroundPath(e.Style, r, eStyleBackgroundPathPart.BottomHalf);
+			}
+			else
+				path = ElementStyleDisplay.GetBackgroundPath(e.Style, bounds, eStyleBackgroundPathPart.BottomHalf);
+			path.CloseAllFigures();
+			
+			backRect.Y += backRect.Height;
+			PaintBackgroundPart(g, backRect, path, colors.NodeBottomGradientBegin, colors.NodeBottomGradientEnd,
+				colors.NodeBottomGradientType, colors.NodeBottomGradientAngle);
+			
+			ellipse = new Rectangle(bounds.X, bounds.Y + bounds.Height / 2 - 2, bounds.Width, bounds.Height + 4);
+			pathFill=new GraphicsPath();
+			pathFill.AddEllipse(ellipse);
+			pathBrush = new PathGradientBrush(pathFill);
+			pathBrush.CenterColor = colors.NodeBottomGradientMiddle;
+			pathBrush.SurroundColors = new Color[] { Color.Transparent };
+			pathBrush.CenterPoint = new PointF(ellipse.X + ellipse.Width / 2, bounds.Bottom);
+			blend = new Blend();
+			blend.Factors = new float[] { 0f, .5f, 1f };
+			blend.Positions = new float[] { .0f, .4f, 1f };
+			pathBrush.Blend = blend;
+			//path.Dispose();
+
+			g.FillPath(pathBrush, path);
+			pathBrush.Dispose();
+			pathFill.Dispose();
+			path.Dispose();
+			
+			if (oldClip != null)
+				g.Clip = oldClip;
+			else
+				g.ResetClip();
+			
+		}
+		
+		private class NodeColors
+		{
+			public Color NodeTopGradientBegin;
+			public Color NodeTopGradientMiddle;
+			public Color NodeTopGradientEnd;
+			public eGradientType NodeTopGradientType=eGradientType.Linear;
+			public int NodeTopGradientAngle=90;
+		
+			public Color NodeBottomGradientBegin;
+			public Color NodeBottomGradientMiddle;
+			public Color NodeBottomGradientEnd;
+			public eGradientType NodeBottomGradientType=eGradientType.Linear;
+			public int NodeBottomGradientAngle=90;
+		}
+		
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/Display/NodeRenderer.cs b/PROMS/DotNetBar Source Code/TreeGX/Display/NodeRenderer.cs
new file mode 100644
index 00000000..2fa6d67e
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/Display/NodeRenderer.cs	
@@ -0,0 +1,267 @@
+using System;
+using System.Drawing;
+
+namespace DevComponents.Tree.Display
+{
+	/// <summary>
+	/// Represents abstract renderer class for node objects.
+	/// </summary>
+	public abstract class NodeRenderer
+	{
+		#region Events
+		/// <summary>
+		/// Occurs when node background is being drawn.
+		/// </summary>
+		public event NodeRendererEventHandler RenderNodeBackground;
+		/// <summary>
+		/// Occurs when node expand part is being drawn.
+		/// </summary>
+		public event NodeExpandPartRendererEventHandler RenderNodeExpandPart;
+		/// <summary>
+		/// Occurs when node command part is being drawn.
+		/// </summary>
+		public event NodeCommandPartRendererEventHandler RenderNodeCommandPart;
+		/// <summary>
+		/// Occurs when cell bacgkround is being drawn.
+		/// </summary>
+		public event NodeCellRendererEventHandler RenderCellBackground;
+		/// <summary>
+		/// Occurs when cell check-box is being drawn.
+		/// </summary>
+		public event NodeCellRendererEventHandler RenderCellCheckBox;
+		/// <summary>
+		/// Occurs when cell image is being drawn.
+		/// </summary>
+		public event NodeCellRendererEventHandler RenderCellImage;
+		/// <summary>
+		/// Occurs when cell text is being drawn.
+		/// </summary>
+		public event NodeCellRendererEventHandler RenderCellText;
+		/// <summary>
+		/// Occurs when cell text is being drawn.
+		/// </summary>
+		public event SelectionRendererEventHandler RenderSelection;
+		/// <summary>
+		/// Occurs when node connector is being drawn.
+		/// </summary>
+		public event ConnectorRendererEventHandler RenderConnector;
+		
+		/// <summary>
+		/// Occurs when tree background is rendered.
+		/// </summary>
+		public event TreeBackgroundRendererEventHandler RenderTreeBackground;
+		#endregion
+		
+		#region Private Variables
+		#endregion
+		
+		#region Constructor
+		public NodeRenderer()
+		{
+		}
+		#endregion
+		
+		#region Internal Implementation
+		/// <summary>
+		/// Draws node background. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+		/// do not want default rendering to occur do not call the base implementation. You can call OnRenderNodeBackground method so events can occur.
+		/// </summary>
+		/// <param name="e">Information provided for rendering.</param>
+		public virtual void DrawNodeBackground(NodeRendererEventArgs e)
+		{
+			OnRenderNodeBackground(e);
+		}
+		
+		/// <summary>
+		/// Raises RenderNodeBackground event.
+		/// </summary>
+		/// <param name="e">Event arguments.</param>
+		protected virtual void OnRenderNodeBackground(NodeRendererEventArgs e)
+		{
+			if(RenderNodeBackground!=null)
+				RenderNodeBackground(this,e);
+		}
+		
+		/// <summary>
+		/// Draws node expand part. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+		/// do not want default rendering to occur do not call the base implementation. You can call OnRenderNodeExpandPart method so events can occur.
+		/// </summary>
+		/// <param name="e">Information provided for rendering.</param>
+		public virtual void DrawNodeExpandPart(NodeExpandPartRendererEventArgs e)
+		{
+			OnRenderNodeExpandPart(e);
+		}
+		
+		/// <summary>
+		/// Raises RenderNodeExpandPart event.
+		/// </summary>
+		/// <param name="e"></param>
+		protected virtual void OnRenderNodeExpandPart(NodeExpandPartRendererEventArgs e)
+		{
+			if(RenderNodeExpandPart!=null)
+				RenderNodeExpandPart(this,e);
+		}
+		
+		/// <summary>
+		/// Draws node command part. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+		/// do not want default rendering to occur do not call the base implementation. You can call OnRenderNodeCommandPart method so events can occur.
+		/// </summary>
+		/// <param name="e">Information provided for rendering.</param>
+		public virtual void DrawNodeCommandPart(NodeCommandPartRendererEventArgs e)
+		{
+			OnRenderNodeCommandPart(e);
+		}
+		
+		/// <summary>
+		/// Raises RenderNodeCommandPart event.
+		/// </summary>
+		/// <param name="e">Event arguments.</param>
+		protected virtual void OnRenderNodeCommandPart(NodeCommandPartRendererEventArgs e)
+		{
+			if(RenderNodeCommandPart!=null)
+				RenderNodeCommandPart(this,e);
+		}
+		
+		/// <summary>
+		/// Draws cell background. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+		/// do not want default rendering to occur do not call the base implementation. You can call OnRenderCellBackground method so events can occur.
+		/// </summary>
+		/// <param name="e">Information provided for rendering.</param>
+		public virtual void DrawCellBackground(NodeCellRendererEventArgs e)
+		{
+			OnRenderCellBackground(e);
+		}
+		
+		/// <summary>
+		/// Raises RenderCellBackground event.
+		/// </summary>
+		/// <param name="e">Event arguments</param>
+		protected virtual void OnRenderCellBackground(NodeCellRendererEventArgs e)
+		{
+			if(RenderCellBackground!=null)
+				RenderCellBackground(this, e);
+		}
+		
+		/// <summary>
+		/// Draws cell check box.  If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+		/// do not want default rendering to occur do not call the base implementation. You can call OnRenderCellCheckBox method so events can occur.
+		/// </summary>
+		/// <param name="e">Information provided for rendering.</param>
+		public virtual void DrawCellCheckBox(NodeCellRendererEventArgs e)
+		{
+			OnRenderCellCheckBox(e);
+		}
+		
+		/// <summary>
+		/// Raises RenderCellCheckBox event.
+		/// </summary>
+		/// <param name="e">Event arguments</param>
+		protected virtual void OnRenderCellCheckBox(NodeCellRendererEventArgs e)
+		{
+			if(RenderCellCheckBox!=null)
+				RenderCellCheckBox(this, e);
+		}
+		
+		/// <summary>
+		/// Draws cell image. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+		/// do not want default rendering to occur do not call the base implementation. You can call OnRenderCellImage method so events can occur.
+		/// </summary>
+		/// <param name="e">Information provided for rendering.</param>
+		public virtual void DrawCellImage(NodeCellRendererEventArgs e)
+		{
+			OnRenderCellImage(e);
+		}
+		
+		/// <summary>
+		/// Raises RenderCellImage event.
+		/// </summary>
+		/// <param name="e">Event arguments</param>
+		protected virtual void OnRenderCellImage(NodeCellRendererEventArgs e)
+		{
+			if(RenderCellImage!=null)
+				RenderCellImage(this, e);
+		}
+		
+		/// <summary>
+		/// Draws cell text. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+		/// do not want default rendering to occur do not call the base implementation. You can call OnRenderCellText method so events can occur.
+		/// </summary>
+		/// <param name="e">Information provided for rendering.</param>
+		public virtual void DrawCellText(NodeCellRendererEventArgs e)
+		{
+			OnRenderCellText(e);
+		}
+		
+		/// <summary>
+		/// Raises RenderCellImage event.
+		/// </summary>
+		/// <param name="e">Event arguments</param>
+		protected virtual void OnRenderCellText(NodeCellRendererEventArgs e)
+		{
+			if(RenderCellText!=null)
+				RenderCellText(this, e);
+		}
+		
+		/// <summary>
+		/// Draws selection for SelectedNode. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+		/// do not want default rendering to occur do not call the base implementation. You can call OnRenderSelection method so events can occur.
+		/// </summary>
+		/// <param name="e">Information provided for rendering.</param>
+		public virtual void DrawSelection(SelectionRendererEventArgs e)
+		{
+			OnRenderSelection(e);
+		}
+
+		/// <summary>
+		/// Raises RenderSelection event.
+		/// </summary>
+		/// <param name="e">Event data.</param>
+		protected virtual void OnRenderSelection(SelectionRendererEventArgs e)
+		{
+			if(RenderSelection!=null)
+				RenderSelection(this, e);
+		}
+		
+		/// <summary>
+		/// Draws connector between nodes. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+		/// do not want default rendering to occur do not call the base implementation. You can call OnRenderConnector method so events can occur.
+		/// </summary>
+		/// <param name="e">Information provided for rendering.</param>
+		public virtual void DrawConnector(ConnectorRendererEventArgs e)
+		{
+			OnRenderConnector(e);
+		}
+
+		/// <summary>
+		/// Raises RenderConnector event.
+		/// </summary>
+		/// <param name="e">Event data.</param>
+		protected virtual void OnRenderConnector(ConnectorRendererEventArgs e)
+		{
+			if(RenderConnector!=null)
+				RenderConnector(this, e);
+		}
+
+		/// <summary>
+		/// Draws the tree background. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+		/// do not want default rendering to occur do not call the base implementation. You can call OnRenderTreeBackground method so events can occur.
+		/// </summary>
+		/// <param name="e">Information provided for rendering.</param>
+		public virtual void DrawTreeBackground(TreeBackgroundRendererEventArgs e)
+		{
+			OnRenderTreeBackground(e);
+		}
+
+		/// <summary>
+		/// Raises RenderTreeBackground event.
+		/// </summary>
+		/// <param name="e">Event data.</param>
+		protected virtual void OnRenderTreeBackground(TreeBackgroundRendererEventArgs e)
+		{
+			if(RenderTreeBackground!=null)
+				RenderTreeBackground(this, e);
+		}
+		#endregion
+	}
+
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/Display/NodeRendererEventArgs.cs b/PROMS/DotNetBar Source Code/TreeGX/Display/NodeRendererEventArgs.cs
new file mode 100644
index 00000000..5210e0d8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/Display/NodeRendererEventArgs.cs	
@@ -0,0 +1,44 @@
+using System;
+using System.Drawing;
+
+namespace DevComponents.Tree.Display
+{
+	/// <summary>
+	/// Summary description for NodeRendererEventArgs.
+	/// </summary>
+	public class NodeRendererEventArgs:EventArgs
+	{
+		/// <summary>
+		/// Gets or sets reference to Graphics object, canvas node is rendered on.
+		/// </summary>
+		public System.Drawing.Graphics Graphics=null;
+		/// <summary>
+		/// Gets or sets the reference to Node object being rendered.
+		/// </summary>
+		public DevComponents.Tree.Node Node=null;
+		/// <summary>
+		/// Gets or sets the absolute node bounds.
+		/// </summary>
+		public Rectangle NodeBounds=Rectangle.Empty;
+		/// <summary>
+		/// Gets or sets the reference to element style for rendered node or cell. Style provided here is the style
+		/// for current node or cell state.
+		/// </summary>
+		public ElementStyle Style=null;
+		
+		/// <summary>
+		/// Creates new instance of the class.
+		/// </summary>
+		public NodeRendererEventArgs()
+		{
+		}
+		
+		public NodeRendererEventArgs(Graphics g, Node node, Rectangle bounds, ElementStyle style)
+		{
+			this.Graphics = g;
+			this.Node = node;
+			this.NodeBounds = bounds;
+			this.Style = style;
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/Display/NodeSelectionDisplay.cs b/PROMS/DotNetBar Source Code/TreeGX/Display/NodeSelectionDisplay.cs
new file mode 100644
index 00000000..d329010b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/Display/NodeSelectionDisplay.cs	
@@ -0,0 +1,51 @@
+using System.Drawing;
+
+namespace DevComponents.Tree.Display
+{
+	/// <summary>
+	/// Represent class that paints selection around node.
+	/// </summary>
+	internal class NodeSelectionDisplay
+	{
+		public void PaintSelection(SelectionRendererEventArgs info)
+		{
+			Rectangle inside=info.Bounds;
+			inside.Inflate(1,1);
+			inside.Width--;
+			inside.Height--;
+			Rectangle outside=info.Bounds;
+			outside.Inflate(info.Width,info.Width);
+			outside.Width--;
+			outside.Height--;
+
+			if(!info.BorderColor.IsEmpty)
+			{
+				using(Pen pen=new Pen(info.BorderColor,1))
+				{
+					info.Graphics.DrawRectangle(pen,inside);
+					info.Graphics.DrawRectangle(pen,outside);
+				}
+			}
+
+			if(!info.FillColor.IsEmpty)
+			{
+				using(SolidBrush brush=new SolidBrush(info.FillColor))
+				{
+					Region region=new Region(outside);
+					region.Exclude(inside);
+					info.Graphics.FillRegion(brush,region);
+				}
+			}
+		}
+	}
+
+	internal class NodeSelectionDisplayInfo
+	{
+		public Node Node=null;
+		public Graphics Graphics=null;
+		public Rectangle Bounds=Rectangle.Empty;
+		public Color BorderColor=Color.Empty;
+		public Color FillColor=Color.Empty;
+		public int Width=4;
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/Display/NodeSystemRenderer.cs b/PROMS/DotNetBar Source Code/TreeGX/Display/NodeSystemRenderer.cs
new file mode 100644
index 00000000..51aa7a73
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/Display/NodeSystemRenderer.cs	
@@ -0,0 +1,215 @@
+using System;
+using System.Drawing;
+
+namespace DevComponents.Tree.Display
+{
+	/// <summary>
+	/// Represents default system node and cell renderer.
+	/// </summary>
+	public class NodeSystemRenderer:NodeRenderer
+	{
+		#region Private Variables
+		private NodeExpandEllipseDisplay m_NodeExpandEllipseDisplay=new NodeExpandEllipseDisplay();
+		private NodeExpandRectDisplay m_NodeExpandRectDisplay=new NodeExpandRectDisplay();
+		private NodeExpandImageDisplay m_NodeExpandImageDisplay=new NodeExpandImageDisplay();
+		private NodeCommandDisplay m_NodeCommandDisplay=new NodeCommandDisplay();
+		private ElementStyleDisplayInfo m_ElementStyleDisplayInfo=new ElementStyleDisplayInfo();
+		private NodeSelectionDisplay m_SelectionDisplay=new NodeSelectionDisplay();
+		private CurveConnectorDisplay m_CurveConnectorDisplay=null;
+		private LineConnectorDisplay m_LineConnectorDisplay=null;
+		#endregion
+		
+		#region Internal Implementation
+		/// <summary>
+		/// Returns ElementStyleDisplayInfo class that provides information for ElementStyle rendering.
+		/// </summary>
+		/// <param name="style">Reference to style.</param>
+		/// <param name="g">Reference to graphics object.</param>
+		/// <param name="bounds">Style bounds</param>
+		/// <returns>New instance of ElementStyleDisplayInfo</returns>
+		protected ElementStyleDisplayInfo GetElementStyleDisplayInfo(ElementStyle style, Graphics g, Rectangle bounds)
+		{
+			m_ElementStyleDisplayInfo.Style=style;
+			m_ElementStyleDisplayInfo.Graphics=g;
+			m_ElementStyleDisplayInfo.Bounds=bounds;
+			return m_ElementStyleDisplayInfo;
+		}
+		
+		private NodeConnectorDisplay GetConnectorDisplay(NodeConnector c)
+		{
+			NodeConnectorDisplay d=null;
+			if(c==null)
+				return null;
+
+			switch(c.ConnectorType)
+			{
+				case eNodeConnectorType.Curve:
+				{
+					if(m_CurveConnectorDisplay==null)
+						m_CurveConnectorDisplay=new CurveConnectorDisplay();
+					d=m_CurveConnectorDisplay;
+					break;
+				}
+				case eNodeConnectorType.Line:
+				{
+					if(m_LineConnectorDisplay==null)
+						m_LineConnectorDisplay=new LineConnectorDisplay();
+					d=m_LineConnectorDisplay;
+					break;
+				}
+			}
+			return d;
+		}
+		
+		/// <summary>
+		/// Draws node background. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+		/// do not want default rendering to occur do not call the base implementation. You can call OnRenderNodeBackground method so events can occur.
+		/// </summary>
+		/// <param name="e">Information provided for rendering.</param>
+		public override void DrawNodeBackground(NodeRendererEventArgs e)
+		{
+			ElementStyleDisplayInfo di=GetElementStyleDisplayInfo(e.Style,e.Graphics,DisplayHelp.GetDrawRectangle(e.NodeBounds));
+			ElementStyleDisplay.Paint(di);
+			
+			base.DrawNodeBackground(e);
+		}
+		
+		/// <summary>
+		/// Draws node expand part. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+		/// do not want default rendering to occur do not call the base implementation. You can call OnRenderNodeExpandPart method so events can occur.
+		/// </summary>
+		/// <param name="e">Information provided for rendering.</param>
+		public override void DrawNodeExpandPart(NodeExpandPartRendererEventArgs e)
+		{
+			GetExpandDisplay(e.ExpandButtonType).DrawExpandButton(e);
+			base.DrawNodeExpandPart(e);
+		}
+		
+		private NodeExpandDisplay GetExpandDisplay(eExpandButtonType e)
+		{
+			NodeExpandDisplay d=null;
+			switch(e)
+			{
+				case eExpandButtonType.Ellipse:
+					d=m_NodeExpandEllipseDisplay;
+					break;
+				case eExpandButtonType.Rectangle:
+					d=m_NodeExpandRectDisplay;
+					break;
+				case eExpandButtonType.Image:
+					d= m_NodeExpandImageDisplay;
+					break;
+			}
+			return d;
+		}
+		
+		/// <summary>
+		/// Draws node command part. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+		/// do not want default rendering to occur do not call the base implementation. You can call OnRenderNodeCommandPart method so events can occur.
+		/// </summary>
+		/// <param name="e">Information provided for rendering.</param>
+		public override void DrawNodeCommandPart(NodeCommandPartRendererEventArgs e)
+		{
+			m_NodeCommandDisplay.DrawCommandButton(e);
+			base.DrawNodeCommandPart(e);
+		}
+		
+		/// <summary>
+		/// Draws cell background. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+		/// do not want default rendering to occur do not call the base implementation. You can call OnRenderCellBackground method so events can occur.
+		/// </summary>
+		/// <param name="e">Information provided for rendering.</param>
+		public override void DrawCellBackground(NodeCellRendererEventArgs e)
+		{
+			ElementStyleDisplayInfo di=GetElementStyleDisplayInfo(e.Style,e.Graphics,DisplayHelp.GetDrawRectangle(e.CellBounds));
+			ElementStyleDisplay.Paint(di);
+			
+			base.DrawCellBackground(e);
+		}
+		
+		/// <summary>
+		/// Draws cell check box.  If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+		/// do not want default rendering to occur do not call the base implementation. You can call OnRenderCellCheckBox method so events can occur.
+		/// </summary>
+		/// <param name="e">Information provided for rendering.</param>
+		public override void DrawCellCheckBox(NodeCellRendererEventArgs e)
+		{
+			CellDisplay.PaintCellCheckBox(e);
+			base.DrawCellCheckBox(e);
+		}
+		
+		/// <summary>
+		/// Draws cell image. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+		/// do not want default rendering to occur do not call the base implementation. You can call OnRenderCellImage method so events can occur.
+		/// </summary>
+		/// <param name="e">Information provided for rendering.</param>
+		public override void DrawCellImage(NodeCellRendererEventArgs e)
+		{
+			CellDisplay.PaintCellImage(e);
+			base.DrawCellImage(e);
+		}
+		
+		/// <summary>
+		/// Draws cell text. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+		/// do not want default rendering to occur do not call the base implementation. You can call OnRenderCellText method so events can occur.
+		/// </summary>
+		/// <param name="e">Information provided for rendering.</param>
+		public override void DrawCellText(NodeCellRendererEventArgs e)
+		{
+			CellDisplay.PaintText(e);
+			base.DrawCellText(e);
+		}
+		
+		/// <summary>
+		/// Draws selection for SelectedNode. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+		/// do not want default rendering to occur do not call the base implementation. You can call OnRenderSelection method so events can occur.
+		/// </summary>
+		/// <param name="e">Information provided for rendering.</param>
+		public override void DrawSelection(SelectionRendererEventArgs e)
+		{
+			m_SelectionDisplay.PaintSelection(e);
+			base.DrawSelection(e);
+		}
+		
+		/// <summary>
+		/// Draws connector between nodes. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+		/// do not want default rendering to occur do not call the base implementation. You can call OnRenderConnector method so events can occur.
+		/// </summary>
+		/// <param name="e">Information provided for rendering.</param>
+		public override void DrawConnector(ConnectorRendererEventArgs e)
+		{
+			NodeConnectorDisplay display = GetConnectorDisplay(e.NodeConnector);
+			if(display!=null)
+				display.DrawConnector(e);
+
+			base.DrawConnector(e);
+		}
+		
+		/// <summary>
+		/// Draws the tree background. If you need to provide custom rendering this is the method that you should override in your custom rendered. If you
+		/// do not want default rendering to occur do not call the base implementation. You can call OnRenderTreeBackground method so events can occur.
+		/// </summary>
+		/// <param name="e">Information provided for rendering.</param>
+		public override void DrawTreeBackground(TreeBackgroundRendererEventArgs e)
+		{
+			TreeGX tree = e.TreeGX;
+			Graphics g = e.Graphics;
+			
+			if(!tree.BackColor.IsEmpty)
+			{
+				using(SolidBrush brush=new SolidBrush(tree.BackColor))
+					g.FillRectangle(brush,tree.DisplayRectangle);
+			}
+
+			ElementStyleDisplayInfo info=new ElementStyleDisplayInfo();
+			info.Bounds=tree.DisplayRectangle;
+			info.Graphics=g;
+			info.Style=tree.BackgroundStyle;
+			ElementStyleDisplay.Paint(info);
+			
+			base.DrawTreeBackground (e);
+		}
+
+		#endregion
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/Display/NodeTreeDisplay.cs b/PROMS/DotNetBar Source Code/TreeGX/Display/NodeTreeDisplay.cs
new file mode 100644
index 00000000..2fca4f6a
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/Display/NodeTreeDisplay.cs	
@@ -0,0 +1,557 @@
+using System.Drawing;
+using System.Drawing.Drawing2D;
+
+namespace DevComponents.Tree.Display
+{
+	/// <summary>
+	/// Summary description for NodeTreeDisplay.
+	/// </summary>
+	public class NodeTreeDisplay:NodeDisplay
+	{
+		#region Private Variables
+		// Cashed objects
+		ElementStyleDisplayInfo m_ElementStyleDisplayInfo=new ElementStyleDisplayInfo();
+		NodeCellRendererEventArgs m_CellDisplayInfo=new NodeCellRendererEventArgs();
+//		CurveConnectorDisplay m_CurveConnectorDisplay=null;
+//		LineConnectorDisplay m_LineConnectorDisplay=null;
+		private NodeSystemRenderer m_SystemRenderer=new NodeSystemRenderer();
+		private NodeProfessionalRenderer m_ProfRenderer=new NodeProfessionalRenderer();
+		#endregion
+		/// <summary>Creates new instance of the class</summary>
+		/// <param name="tree">Object to initialize class with.</param>
+		public NodeTreeDisplay(TreeGX tree):base(tree)
+		{
+		}
+
+		/// <summary>
+		/// Paints the treee on canvas.
+		/// </summary>
+		public override void Paint(Graphics g, Rectangle clipRectangle)
+		{
+			base.Paint(g,clipRectangle);
+
+			// Paint header
+
+			// Paint Nodes...
+			NodeDisplayContext context=new NodeDisplayContext();
+			context.Graphics=g;
+			context.DefaultFont=this.Tree.Font;
+			context.ClipRectangle=clipRectangle;
+			context.Offset=this.Offset;
+			context.Styles=this.Tree.Styles;
+			
+			// Setup rendering
+			context.NodeRenderer = m_SystemRenderer;
+			if(this.Tree.NodeRenderer!=null && this.Tree.RenderMode==eNodeRenderMode.Custom)
+				context.NodeRenderer=this.Tree.NodeRenderer;
+			else if(this.Tree.RenderMode==eNodeRenderMode.Professional)
+				context.NodeRenderer = m_ProfRenderer;
+				
+			context.NodeRendererEventArgs=new NodeRendererEventArgs();
+				
+			if(this.Tree.NodeStyle!=null)
+				context.DefaultNodeStyle=this.Tree.NodeStyle;
+			else
+				context.DefaultNodeStyle=GetDefaultNodeStyle();
+			if(this.Tree.NodeStyleExpanded!=null)
+				context.ExpandedNodeStyle=this.Tree.NodeStyleExpanded;
+			if(this.Tree.NodeStyleSelected!=null)
+				context.SelectedNodeStyle=this.Tree.NodeStyleSelected;
+			if(this.Tree.NodeStyleMouseOver!=null)
+				context.MouseOverNodeStyle=this.Tree.NodeStyleMouseOver;
+
+			if(this.Tree.CellStyleDefault!=null)
+				context.CellStyleDefault=this.Tree.CellStyleDefault;
+//			else
+//				context.CellStyleDefault=ElementStyle.GetDefaultCellStyle(context.DefaultNodeStyle);
+			if(this.Tree.CellStyleDisabled!=null)
+				context.CellStyleDisabled=this.Tree.CellStyleDisabled;
+			else
+				context.CellStyleDisabled=ElementStyle.GetDefaultDisabledCellStyle();
+			if(this.Tree.CellStyleMouseDown!=null)
+				context.CellStyleMouseDown=this.Tree.CellStyleMouseDown;
+			if(this.Tree.CellStyleMouseOver!=null)
+				context.CellStyleMouseOver=this.Tree.CellStyleMouseOver;
+			if(this.Tree.CellStyleSelected!=null)
+				context.CellStyleSelected=this.Tree.CellStyleSelected;
+			else
+				context.CellStyleSelected=ElementStyle.GetDefaultSelectedCellStyle();
+
+			// Setup connector
+			//context.RootConnectorDisplay=GetConnectorDisplay(this.Tree.RootConnector);
+			//context.NodesConnectorDisplay=GetConnectorDisplay(this.Tree.NodesConnector);
+			//context.LinkConnectorDisplay=GetConnectorDisplay(this.Tree.LinkConnector);
+			context.ConnectorDisplayInfo=new ConnectorRendererEventArgs();
+			context.ConnectorDisplayInfo.Graphics=context.Graphics;
+			if(this.Tree.SelectedPathConnector!=null)
+			{
+				// Prepare nodes for path display. Downstream nodes are easily recognized when
+				// path upstream nodes need special treatment to improve performance
+				if(this.Tree.SelectedNode!=null)
+				{
+					Node n=this.Tree.SelectedNode;
+					while(n!=null)
+					{
+						// This marker will be reset once node is painted...
+						n.SelectedConnectorMarker = true;
+						n=n.Parent;
+					}
+				}
+				//context.SelectedPathConnectorDisplay=GetConnectorDisplay(this.Tree.SelectedPathConnector);
+			}
+
+			// Setup Node Expander Painter
+			context.ExpandDisplayInfo=new NodeExpandPartRendererEventArgs(context.Graphics);
+			context.ExpandDisplayInfo.BackColor=this.Tree.GetColor(this.Tree.ExpandBackColor, this.Tree.ExpandBackColorSchemePart);
+			context.ExpandDisplayInfo.BackColor2=this.Tree.GetColor(this.Tree.ExpandBackColor2, this.Tree.ExpandBackColor2SchemePart);
+			context.ExpandDisplayInfo.BackColorGradientAngle=this.Tree.ExpandBackColorGradientAngle;
+			context.ExpandDisplayInfo.BorderColor=this.Tree.GetColor(this.Tree.ExpandBorderColor, this.Tree.ExpandBorderColorSchemePart);
+			context.ExpandDisplayInfo.ExpandLineColor=this.Tree.GetColor(this.Tree.ExpandLineColor, this.Tree.ExpandLineColorSchemePart);
+			context.ExpandDisplayInfo.Graphics=context.Graphics;
+            context.ExpandDisplayInfo.ExpandButtonType = this.Tree.ExpandButtonType;
+			context.ExpandDisplayInfo.ExpandImage=this.Tree.ExpandImage;
+			context.ExpandDisplayInfo.ExpandImageCollapse=this.Tree.ExpandImageCollapse;
+			//context.ExpandDisplay=this.GetExpandDisplay(this.Tree.ExpandButtonType);
+
+
+			// Setup Selection Display
+			//context.SelectionDisplay=new NodeSelectionDisplay();
+			context.SelectionDisplayInfo=new SelectionRendererEventArgs();
+			context.SelectionDisplayInfo.Graphics=context.Graphics;
+			context.SelectionDisplayInfo.FillColor=this.Tree.SelectionBoxFillColor;
+			context.SelectionDisplayInfo.BorderColor=this.Tree.SelectionBoxBorderColor;
+			context.SelectionDisplayInfo.Width=this.Tree.SelectionBoxSize;
+
+			// Setup Node Command Display
+			//context.CommandDisplay=new NodeCommandDisplay();
+			context.CommandDisplayInfo=new NodeCommandPartRendererEventArgs(context.Graphics);
+			context.CommandDisplayInfo.BackColor=this.Tree.GetColor(this.Tree.CommandBackColor, this.Tree.CommandBackColorSchemePart);
+			context.CommandDisplayInfo.BackColor2=this.Tree.GetColor(this.Tree.CommandBackColor2, this.Tree.CommandBackColor2SchemePart);
+			context.CommandDisplayInfo.BackColorGradientAngle=this.Tree.CommandBackColorGradientAngle;
+			context.CommandDisplayInfo.ForeColor=this.Tree.GetColor(this.Tree.CommandForeColor, this.Tree.CommandForeColorSchemePart);
+			context.CommandDisplayInfo.MouseOverBackColor=this.Tree.GetColor(this.Tree.CommandMouseOverBackColor, this.Tree.CommandMouseOverBackColorSchemePart);
+			context.CommandDisplayInfo.MouseOverBackColor2=this.Tree.GetColor(this.Tree.CommandMouseOverBackColor2, this.Tree.CommandMouseOverBackColor2SchemePart);
+			context.CommandDisplayInfo.MouseOverBackColorGradientAngle=this.Tree.CommandMouseOverBackColorGradientAngle;
+			context.CommandDisplayInfo.MouseOverForeColor=this.Tree.GetColor(this.Tree.CommandMouseOverForeColor, this.Tree.CommandMouseOverForeColorSchemePart);
+				
+			if(this.Tree.DisplayRootNode!=null)
+				this.PaintNode(this.Tree.DisplayRootNode, context);
+			else
+				this.PaintNodes(this.Tree.Nodes, context);
+
+			Node dragNode=this.Tree.GetDragNode();
+			if(dragNode!=null && dragNode.Parent==null)
+			{
+				Point p=context.Offset;
+				context.Offset=Point.Empty;
+				PaintNode(dragNode,context);
+				context.Offset=p;
+			}
+
+			PaintSelection(context);
+		}
+		
+		private void PaintSelection(NodeDisplayContext context)
+		{
+			if(this.Tree.SelectedNode!=null && this.Tree.SelectedNode.Visible && this.Tree.SelectionBox)
+			{
+				context.SelectionDisplayInfo.Node=this.Tree.SelectedNode;
+				context.SelectionDisplayInfo.Bounds=NodeDisplay.GetNodeRectangle(eNodeRectanglePart.NodeContentBounds, context.SelectionDisplayInfo.Node, context.Offset);
+				//context.SelectionDisplay.PaintSelection(context.SelectionDisplayInfo);
+				context.NodeRenderer.DrawSelection(context.SelectionDisplayInfo);
+			}
+		}
+
+		private void PaintNodes(NodeCollection nodes,NodeDisplayContext context)
+		{
+			foreach(Node node in nodes)
+			{
+				PaintNode(node, context);
+			}
+		}
+
+		private void PaintNode(Node node, NodeDisplayContext context)
+		{
+			if(!node.Visible)
+			{
+				node.SelectedConnectorMarker = false;
+				return;
+			}
+
+			Rectangle r=NodeDisplay.GetNodeRectangle(eNodeRectanglePart.NodeContentBounds,node,context.Offset);
+			if(r.IsEmpty)
+			{
+				node.SelectedConnectorMarker = false;
+				return;
+			}
+			
+			if(node.Parent!=null && !node.Parent.BoundsRelative.IsEmpty)
+			{
+				this.PaintConnector(node, context);
+			}
+
+			if(node.HasLinkedNodes)
+			{
+				foreach(LinkedNode linkedNode in node.LinkedNodes)
+				{
+					if(!linkedNode.Node.IsVisible)
+						continue;
+					this.PaintConnector(node,linkedNode.Node, context,true, linkedNode.ConnectorPoints);	
+				}
+			}
+			
+			node.SelectedConnectorMarker = false;
+
+			if(r.IntersectsWith(context.ClipRectangle) || context.ClipRectangle.IsEmpty)
+				PaintSingleNode(node, context);
+//			else if(node.HasHostedControls) // Move controls to proper location
+//				MoveHostedControls(node, context);
+
+			if(node.Expanded && node.Nodes.Count>0)
+				PaintNodes(node.Nodes,context);
+		}
+
+		private void PaintSingleNode(Node node, NodeDisplayContext context)
+		{
+			Rectangle r=NodeDisplay.GetNodeRectangle(eNodeRectanglePart.NodeContentBounds,node,context.Offset);
+			NodeRenderer renderer=context.NodeRenderer;
+			if(node.NodeRenderer!=null && node.RenderMode==eNodeRenderMode.Custom)
+				renderer = node.NodeRenderer;
+			
+			// Paint node background
+			ElementStyle style=context.DefaultNodeStyle.Copy();
+			if(node.Style!=null)
+				style=node.Style.Copy();
+
+			bool bApllyStyles=true;
+
+			if(node.MouseOverNodePart==eMouseOverNodePart.Node && style!=null)
+			{
+				ElementStyle mouseOverStyle=context.MouseOverNodeStyle;
+				if(node.StyleMouseOver!=null)
+					mouseOverStyle=node.StyleMouseOver;
+                if (mouseOverStyle != null)
+                {
+                    style.ApplyStyle(mouseOverStyle);
+                    bApllyStyles = false;
+                }
+			}
+
+			// On default style apply expanded style
+			if(bApllyStyles && node.Expanded && style!=null)
+			{
+				ElementStyle expandedStyle=context.ExpandedNodeStyle;
+				if(node.StyleExpanded!=null)
+					expandedStyle=node.StyleExpanded;
+				if(expandedStyle!=null)
+					style.ApplyStyle(expandedStyle);
+			}
+
+			// Apply selected style if needed too
+			if(bApllyStyles && node.IsSelected && style!=null)
+			{
+				ElementStyle selectedStyle=context.SelectedNodeStyle;
+				if(node.StyleSelected!=null)
+					selectedStyle=node.StyleSelected;
+				if(selectedStyle!=null)
+					style.ApplyStyle(selectedStyle);
+			}
+
+			Region backRegion=null;
+			if(style!=null)
+			{
+				if(style.Font==null)
+					style.Font=context.DefaultFont;
+				context.NodeRendererEventArgs.Graphics=context.Graphics;
+				context.NodeRendererEventArgs.Node = node;
+				context.NodeRendererEventArgs.NodeBounds = r;
+				context.NodeRendererEventArgs.Style = style;
+				renderer.DrawNodeBackground(context.NodeRendererEventArgs);
+				ElementStyleDisplayInfo di=new ElementStyleDisplayInfo(style,context.Graphics,DisplayHelp.GetDrawRectangle(r));
+				//ElementStyleDisplay.Paint(di);
+				backRegion=ElementStyleDisplay.GetStyleRegion(di);
+			}
+						
+			if(NodeDisplay.DrawExpandPart(node))
+			{
+				r=NodeDisplay.GetNodeRectangle(eNodeRectanglePart.ExpandBounds,node,context.Offset);
+				context.ExpandDisplayInfo.Node=node;
+				context.ExpandDisplayInfo.ExpandPartBounds=r;
+				//context.ExpandDisplayInfo.MouseOver=(node.MouseOverNodePart==eMouseOverNodePart.Expand);
+				//context.ExpandDisplay.DrawExpandButton(context.ExpandDisplayInfo);
+				
+				renderer.DrawNodeExpandPart(context.ExpandDisplayInfo);
+			}
+
+			// TODO: Support for display of columns should go here
+//			if(node.NodesColumnHeaderVisible)
+//			{
+//				foreach(ColumnHeader col in node.NodesColumns)
+//				{
+//					r=col.Bounds;
+//					r.Offset(context.Offset);
+//					r.Offset(node.Bounds.Location);
+//					using(Pen pen=new Pen(Color.Yellow))
+//						context.Graphics.DrawRectangle(pen,Display.GetDrawRectangle(r));
+//				}
+//			}
+
+			Region oldRegion=null;
+			if(backRegion!=null)
+			{
+				oldRegion=context.Graphics.Clip;
+				context.Graphics.SetClip(backRegion,CombineMode.Replace);
+			}
+
+			if(!node.CommandBoundsRelative.IsEmpty)
+			{
+				r=NodeDisplay.GetNodeRectangle(eNodeRectanglePart.CommandBounds,node,context.Offset);
+                context.CommandDisplayInfo.Node=node;
+				context.CommandDisplayInfo.CommandPartBounds=r;
+				context.CommandDisplayInfo.Graphics = context.Graphics;
+				//context.CommandDisplay.DrawCommandButton(context.CommandDisplayInfo);
+				renderer.DrawNodeCommandPart(context.CommandDisplayInfo);
+				context.CommandDisplayInfo.Graphics = null;
+			}
+			
+			ElementStyle cellStyle = null;
+			if(context.CellStyleDefault==null)
+			{
+				cellStyle=new ElementStyle();
+				cellStyle.TextColor = style.TextColor;
+				cellStyle.TextShadowColor = style.TextShadowColor;
+				cellStyle.TextShadowOffset = style.TextShadowOffset;
+				cellStyle.TextAlignment = style.TextAlignment;
+				cellStyle.TextLineAlignment = style.TextLineAlignment;
+				cellStyle.WordWrap = style.WordWrap;
+				cellStyle.Font = style.Font;
+			}
+
+			foreach(Cell cell in node.Cells)
+			{
+				if(cell.StyleNormal!=null)
+					style=cell.StyleNormal;
+				else if(context.CellStyleDefault!=null)
+					style=context.CellStyleDefault.Copy();
+				else
+					style = cellStyle;
+
+				if(!cell.Enabled && cell.StyleDisabled!=null)
+					style.ApplyStyle(cell.StyleDisabled);
+				else if(!cell.Enabled && context.CellStyleDisabled!=null)
+					style.ApplyStyle(context.CellStyleDisabled);
+				else if(cell.IsMouseDown && cell.StyleMouseDown!=null)
+					style.ApplyStyle(cell.StyleMouseDown);
+				else if(cell.IsMouseDown && context.CellStyleMouseDown!=null)
+					style.ApplyStyle(context.CellStyleMouseDown);
+				else 
+				{
+					if(cell.IsSelected && cell.StyleSelected!=null)
+						style.ApplyStyle(cell.StyleSelected);
+					else if(cell.IsSelected && context.CellStyleSelected!=null)
+						style.ApplyStyle(context.CellStyleSelected);
+
+					if(cell.IsMouseOver && cell.StyleMouseOver!=null)
+						style.ApplyStyle(cell.StyleMouseOver);
+					else if(cell.IsMouseOver && context.CellStyleMouseOver!=null)
+						style.ApplyStyle(context.CellStyleMouseOver);
+				}
+
+				r=NodeDisplay.GetNodeRectangle(eNodeRectanglePart.NodeBounds,node,context.Offset);
+				
+				if(style!=null)
+				{
+					if(style.Font==null)
+						style.Font=context.DefaultFont;
+					Rectangle rCell=cell.BoundsRelative;
+					Rectangle rText=cell.TextContentBounds;
+					rCell.Offset(r.Location);
+					rText.Offset(r.Location);
+					ElementStyleDisplayInfo di=GetElementStyleDisplayInfo(style,context.Graphics,DisplayHelp.GetDrawRectangle(rCell));
+					ElementStyleDisplay.Paint(di);
+					NodeCellRendererEventArgs ci=GetCellDisplayInfo(style,context.Graphics,cell,r.Location, rCell, rText);
+					
+					if(ci.Cell.CheckBoxVisible)
+						renderer.DrawCellCheckBox(ci); //CellDisplay.PaintCellCheckBox(ci);
+					if(!ci.Cell.Images.LargestImageSize.IsEmpty)
+						renderer.DrawCellImage(ci); //CellDisplay.PaintCellImage(ci);
+					renderer.DrawCellText(ci) ; //CellDisplay.PaintText(ci);
+					
+					//CellDisplay.PaintCell(ci);
+				}
+			}
+
+			if(backRegion!=null)
+				context.Graphics.SetClip(oldRegion,CombineMode.Replace);
+		}
+
+		private void PaintConnector(Node fromNode, Node toNode, NodeDisplayContext context,bool linkConnector)
+		{
+			PaintConnector(fromNode, toNode, context, linkConnector, null);
+		}
+		
+		private void PaintConnector(Node fromNode, Node toNode, NodeDisplayContext context,bool linkConnector, ConnectorPointsCollection connectorPoints)
+		{
+			bool isRootNode=IsRootNode(fromNode);
+//			if(context.RootConnectorDisplay==null && isRootNode || context.NodesConnectorDisplay==null && !isRootNode || linkConnector && context.LinkConnectorDisplay==null)
+//				return;
+
+			context.ConnectorDisplayInfo.FromNode=fromNode;
+			context.ConnectorDisplayInfo.ToNode=toNode;
+			context.ConnectorDisplayInfo.IsRootNode=isRootNode;
+			context.ConnectorDisplayInfo.LinkConnector=linkConnector;
+			if(fromNode.Style!=null)
+				context.ConnectorDisplayInfo.StyleFromNode=fromNode.Style;
+			else
+				context.ConnectorDisplayInfo.StyleFromNode=context.DefaultNodeStyle;
+			if(toNode.Style!=null)
+				context.ConnectorDisplayInfo.StyleToNode=toNode.Style;
+			else
+				context.ConnectorDisplayInfo.StyleToNode=context.DefaultNodeStyle;
+			context.ConnectorDisplayInfo.Offset=context.Offset;
+			
+			//NodeConnectorDisplay display=null;
+			if(linkConnector)
+			{
+				context.ConnectorDisplayInfo.NodeConnector=this.Tree.LinkConnector;
+			}
+			else if(toNode.SelectedConnectorMarker)
+			{
+				//display = context.SelectedPathConnectorDisplay;
+				context.ConnectorDisplayInfo.NodeConnector=this.Tree.SelectedPathConnector;
+			}
+			else if(toNode.ParentConnector!=null)
+			{
+				//display=this.GetConnectorDisplay(toNode.ParentConnector);
+				context.ConnectorDisplayInfo.NodeConnector=toNode.ParentConnector;
+			}
+			else if(isRootNode)
+			{
+				//display=context.RootConnectorDisplay;
+				context.ConnectorDisplayInfo.NodeConnector=this.Tree.RootConnector;
+			}
+			else
+			{
+				//display=context.NodesConnectorDisplay;
+				context.ConnectorDisplayInfo.NodeConnector=this.Tree.NodesConnector;
+			}
+
+			if(linkConnector)
+			{
+                if (connectorPoints != null && connectorPoints.Count > 0)
+				    context.ConnectorDisplayInfo.ConnectorPoints=connectorPoints;
+			}
+			else
+			{
+				if(connectorPoints!=null)
+					context.ConnectorDisplayInfo.ConnectorPoints=connectorPoints;
+				else if(toNode.ParentConnectorPoints.Count>0)
+					context.ConnectorDisplayInfo.ConnectorPoints=toNode.ParentConnectorPoints;
+				else
+					context.ConnectorDisplayInfo.ConnectorPoints=null;
+			}
+
+			context.NodeRenderer.DrawConnector(context.ConnectorDisplayInfo);
+			//if(display!=null)
+			//	display.DrawConnector(context.ConnectorDisplayInfo);
+		}
+
+		private void PaintConnector(Node toNode, NodeDisplayContext context)
+		{
+			PaintConnector(toNode.Parent, toNode, context,false);
+		}
+		
+//		private void MoveHostedControls(Node node, NodeDisplayContext context)
+//		{
+//			foreach(Cell cell in node.Cells)
+//			{
+//				if(cell.HostedControl!=null && cell.HostedControl.Visible)
+//				{
+//					Rectangle bounds = NodeDisplay.GetCellRectangle(eCellRectanglePart.TextBounds, cell, context.Offset);
+//					if(cell.HostedControl.Bounds!=bounds)
+//						cell.HostedControl.Bounds=bounds;
+//					return;
+//				}
+//			}
+//		}
+
+		private ElementStyleDisplayInfo GetElementStyleDisplayInfo(ElementStyle style, Graphics g, Rectangle bounds)
+		{
+			m_ElementStyleDisplayInfo.Style=style;
+			m_ElementStyleDisplayInfo.Graphics=g;
+			m_ElementStyleDisplayInfo.Bounds=bounds;
+			return m_ElementStyleDisplayInfo;
+		}
+
+		private NodeCellRendererEventArgs GetCellDisplayInfo(ElementStyle style, Graphics g, Cell cell, Point cellOffset, Rectangle cellBounds, Rectangle cellTextBounds)
+		{
+			m_CellDisplayInfo.Cell=cell;
+			m_CellDisplayInfo.Graphics=g;
+			m_CellDisplayInfo.Style=style;
+			m_CellDisplayInfo.CellOffset=cellOffset;
+            m_CellDisplayInfo.CellBounds = cellBounds;
+            m_CellDisplayInfo.CellTextBounds = cellTextBounds;
+			return m_CellDisplayInfo;
+		}
+
+//		private NodeConnectorDisplay GetConnectorDisplay(NodeConnector c)
+//		{
+//			NodeConnectorDisplay d=null;
+//			if(c==null)
+//				return null;
+//
+//			switch(c.ConnectorType)
+//			{
+//				case eNodeConnectorType.Curve:
+//				{
+//					if(m_CurveConnectorDisplay==null)
+//						m_CurveConnectorDisplay=new CurveConnectorDisplay();
+//					d=m_CurveConnectorDisplay;
+//					break;
+//				}
+//				case eNodeConnectorType.Line:
+//				{
+//					if(m_LineConnectorDisplay==null)
+//						m_LineConnectorDisplay=new LineConnectorDisplay();
+//					d=m_LineConnectorDisplay;
+//					break;
+//				}
+//			}
+//			return d;
+//		}
+
+		private class NodeDisplayContext
+		{
+			public Graphics Graphics=null;
+			public Font DefaultFont=null;
+			public Rectangle ClipRectangle=Rectangle.Empty;
+			public Point Offset=Point.Empty;
+			public ElementStyle DefaultNodeStyle=null;
+			public ElementStyle ExpandedNodeStyle=null;
+			public ElementStyle SelectedNodeStyle=null;
+			public ElementStyle MouseOverNodeStyle=null;
+			public ElementStyle CellStyleDefault=null;
+			public ElementStyle CellStyleMouseDown=null;
+			public ElementStyle CellStyleMouseOver=null;
+			public ElementStyle CellStyleSelected=null;
+			public ElementStyle CellStyleDisabled=null;
+			public ElementStyleCollection Styles=null;
+			//public NodeConnectorDisplay RootConnectorDisplay=null;
+			//public NodeConnectorDisplay NodesConnectorDisplay=null;
+			//public NodeConnectorDisplay LinkConnectorDisplay=null;
+			//public NodeConnectorDisplay SelectedPathConnectorDisplay=null;
+			public ConnectorRendererEventArgs ConnectorDisplayInfo=null;
+			public NodeExpandPartRendererEventArgs ExpandDisplayInfo=null;
+			//public NodeExpandDisplay ExpandDisplay=null;
+			//public NodeSelectionDisplay SelectionDisplay=null;
+			public SelectionRendererEventArgs SelectionDisplayInfo=null;
+			//public NodeCommandDisplay CommandDisplay=null;
+			public NodeCommandPartRendererEventArgs CommandDisplayInfo=null;
+			public bool SelectedNodePath=false;
+			public NodeRenderer NodeRenderer=null;
+			public NodeRendererEventArgs NodeRendererEventArgs=null;
+		}
+
+		
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/Display/SelectionRendererEventArgs.cs b/PROMS/DotNetBar Source Code/TreeGX/Display/SelectionRendererEventArgs.cs
new file mode 100644
index 00000000..8134af35
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/Display/SelectionRendererEventArgs.cs	
@@ -0,0 +1,36 @@
+using System;
+using System.Drawing;
+
+namespace DevComponents.Tree
+{
+	/// <summary>
+	/// Data form RenderSelection event.
+	/// </summary>
+	public class SelectionRendererEventArgs : EventArgs
+	{
+		/// <summary>
+		/// Gets or sets reference to Graphics object, canvas node is rendered on.
+		/// </summary>
+		public System.Drawing.Graphics Graphics=null;
+		/// <summary>
+		/// Gets or sets the reference to selected Node object.
+		/// </summary>
+		public DevComponents.Tree.Node Node=null;
+		/// <summary>
+		/// Gets or sets the selection bounds.
+		/// </summary>
+		public Rectangle Bounds=Rectangle.Empty;
+		/// <summary>
+		/// Gets or sets border color of the selection rectangle.
+		/// </summary>
+		public Color BorderColor=Color.Empty;
+		/// <summary>
+		/// Gets or sets fill color of the selection rectangle.
+		/// </summary>
+		public Color FillColor=Color.Empty;
+		/// <summary>
+		/// Gets or sets the width in pixels of the border of the selection rectangle.
+		/// </summary>
+		public int Width=4;
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/Display/TreeBackgroundRendererEventArgs.cs b/PROMS/DotNetBar Source Code/TreeGX/Display/TreeBackgroundRendererEventArgs.cs
new file mode 100644
index 00000000..9334fad3
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/Display/TreeBackgroundRendererEventArgs.cs	
@@ -0,0 +1,31 @@
+using System;
+using System.Drawing;
+
+namespace DevComponents.Tree.Display
+{
+	/// <summary>
+	/// Provides data for tree background rendering events.
+	/// </summary>
+	public class TreeBackgroundRendererEventArgs
+	{
+		/// <summary>
+		/// Gets or sets reference to Graphics object, canvas tree background is rendered on.
+		/// </summary>
+		public System.Drawing.Graphics Graphics=null;
+		
+		/// <summary>
+		/// Gets or sets the reference to TreeGX control.
+		/// </summary>
+		public TreeGX TreeGX = null;
+		
+		/// <summary>
+		/// Creates new instance of the class and initializes it with default values.
+		/// </summary>
+		/// <param name="g">Reference to graphics object.</param>
+		public TreeBackgroundRendererEventArgs(Graphics g, TreeGX tree)
+		{
+			this.Graphics = g;
+			this.TreeGX = tree;
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/DisplayHelp.cs b/PROMS/DotNetBar Source Code/TreeGX/DisplayHelp.cs
new file mode 100644
index 00000000..eace98b8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/DisplayHelp.cs	
@@ -0,0 +1,695 @@
+using System.Drawing;
+using System.Drawing.Drawing2D;
+
+#if TREEGX
+namespace DevComponents.Tree
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar
+#endif
+{
+	/// <summary>
+	/// Summary description for Display.
+	/// </summary>
+	internal class DisplayHelp
+	{
+		private DisplayHelp()
+		{
+		}
+
+		public static LinearGradientBrush CreateLinearGradientBrush(Rectangle r,Color color1, Color color2,float gradientAngle)
+		{
+			if(r.Width<=0)
+				r.Width=1;
+			if(r.Height<=0)
+				r.Height=1;
+			return new LinearGradientBrush(new Rectangle(r.X,r.Y-1,r.Width,r.Height+1),color1,color2,gradientAngle);
+		}
+
+		public static LinearGradientBrush CreateLinearGradientBrush(RectangleF r,Color color1, Color color2,float gradientAngle)
+		{
+			if(r.Width<=0)
+				r.Width=1;
+			if(r.Height<=0)
+				r.Height=1;
+			return new LinearGradientBrush(new RectangleF(r.X,r.Y-1,r.Width,r.Height+1),color1,color2,gradientAngle);
+		}
+
+		public static LinearGradientBrush CreateLinearGradientBrush(Rectangle r,Color color1, Color color2,float gradientAngle, bool isAngleScalable)
+		{
+			if(r.Width<=0)
+				r.Width=1;
+			if(r.Height<=0)
+				r.Height=1;
+			return new LinearGradientBrush(new Rectangle(r.X,r.Y-1,r.Width,r.Height+1),color1,color2,gradientAngle,isAngleScalable);
+		}
+
+		public static Rectangle GetDrawRectangle(Rectangle r)
+		{
+			r.Width--;
+			r.Height--;
+			return r;
+		}
+
+		public static Rectangle GetPathRectangle(Rectangle r)
+		{
+			//r.Width++;
+			//r.Height++;
+			return r;
+		}
+
+        public static void DrawRectangle(System.Drawing.Graphics g, Color color, int x, int y, int width, int height)
+        {
+            using (Pen pen = new Pen(color, 1))
+                DrawRectangle(g, pen, x, y, width, height);
+        }
+        public static void DrawRectangle(System.Drawing.Graphics g, Color color, System.Drawing.Rectangle r)
+        {
+            DrawRectangle(g, color, r.X, r.Y, r.Width, r.Height);
+        }
+
+		public static void DrawRectangle(System.Drawing.Graphics g, System.Drawing.Pen pen,  int x, int y, int width, int height)
+		{
+			// Fix for GDI issue
+			width--;
+			height--;
+			g.DrawRectangle(pen,x,y,width,height);
+		}
+		public static void DrawRectangle(System.Drawing.Graphics g, System.Drawing.Pen pen, System.Drawing.Rectangle r)
+		{
+			DrawRectangle(g,pen,r.X,r.Y,r.Width,r.Height);
+		}
+
+        public static void DrawRoundedRectangle(System.Drawing.Graphics g, Color color, Rectangle bounds, int cornerSize)
+        {
+            if (!color.IsEmpty)
+            {
+                using (Pen pen = new Pen(color))
+                    DrawRoundedRectangle(g, pen, bounds.X, bounds.Y, bounds.Width, bounds.Height, cornerSize);
+            }
+        }
+
+        public static void DrawRoundedRectangle(System.Drawing.Graphics g, Color color, int x, int y, int width, int height, int cornerSize)
+        {
+            if (!color.IsEmpty)
+            {
+                using (Pen pen = new Pen(color))
+                    DrawRoundedRectangle(g, pen, x, y, width, height, cornerSize);
+            }
+        }
+
+        public static void DrawRoundedRectangle(System.Drawing.Graphics g, System.Drawing.Pen pen, Rectangle bounds, int cornerSize)
+        {
+            DrawRoundedRectangle(g, pen, bounds.X, bounds.Y, bounds.Width, bounds.Height, cornerSize);
+        }
+        public static void DrawRoundedRectangle(System.Drawing.Graphics g, System.Drawing.Pen pen, int x, int y, int width, int height, int cornerSize)
+        {
+            // Fix for GDI issue
+            width--;
+            height--;
+
+            Rectangle r = new Rectangle(x, y, width, height);
+
+            SmoothingMode sm = g.SmoothingMode;
+            //g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.HighQuality;
+            
+            using (GraphicsPath path = GetRoundedRectanglePath(r, cornerSize))
+            {
+                g.DrawPath(pen, path);
+            }
+
+            g.SmoothingMode = sm;
+        }
+
+        public static GraphicsPath GetRoundedRectanglePath(Rectangle r, int cornerSize)
+        {
+            GraphicsPath path = new GraphicsPath();
+            ElementStyleDisplay.AddCornerArc(path, r, cornerSize, eCornerArc.TopLeft);
+            ElementStyleDisplay.AddCornerArc(path, r, cornerSize, eCornerArc.TopRight);
+            ElementStyleDisplay.AddCornerArc(path, r, cornerSize, eCornerArc.BottomRight);
+            ElementStyleDisplay.AddCornerArc(path, r, cornerSize, eCornerArc.BottomLeft);
+            path.CloseAllFigures();
+            return path;
+        }
+
+        public static GraphicsPath GetRoundedRectanglePath(Rectangle clientRectangle, int cornerSize, eStyleBackgroundPathPart pathPart,
+            eCornerType topLeftCornerType, eCornerType topRightCornerType, eCornerType bottomLeftCornerType, eCornerType bottomRightCornerType)
+        {
+            GraphicsPath path = new GraphicsPath();
+
+            if (pathPart == eStyleBackgroundPathPart.TopHalf)
+                clientRectangle.Height = clientRectangle.Height / 2;
+            else if (pathPart == eStyleBackgroundPathPart.BottomHalf)
+            {
+                int h = clientRectangle.Height;
+                clientRectangle.Height = clientRectangle.Height / 2;
+                clientRectangle.Y += (h - clientRectangle.Height - 1);
+            }
+
+            eCornerType corner = topLeftCornerType;
+            if (corner == eCornerType.Inherit)
+                corner = eCornerType.Square;
+
+            if (pathPart == eStyleBackgroundPathPart.BottomHalf)
+                corner = eCornerType.Square;
+
+            if (corner == eCornerType.Rounded)
+            {
+                ArcData ad = ElementStyleDisplay.GetCornerArc(clientRectangle, cornerSize, eCornerArc.TopLeft);
+                path.AddArc(ad.X, ad.Y, ad.Width, ad.Height, ad.StartAngle, ad.SweepAngle);
+            }
+            else if (corner == eCornerType.Diagonal)
+            {
+                path.AddLine(clientRectangle.X, clientRectangle.Y + cornerSize, clientRectangle.X + cornerSize, clientRectangle.Y);
+            }
+            else
+            {
+                path.AddLine(clientRectangle.X, clientRectangle.Y + 2, clientRectangle.X, clientRectangle.Y);
+                path.AddLine(clientRectangle.X, clientRectangle.Y, clientRectangle.X + 2, clientRectangle.Y);
+            }
+
+            corner = topRightCornerType;
+            if (corner == eCornerType.Inherit)
+                corner = eCornerType.Square;
+            if (pathPart == eStyleBackgroundPathPart.BottomHalf)
+                corner = eCornerType.Square;
+            if (corner == eCornerType.Rounded)
+            {
+                ArcData ad = ElementStyleDisplay.GetCornerArc(clientRectangle, cornerSize, eCornerArc.TopRight);
+                path.AddArc(ad.X, ad.Y, ad.Width, ad.Height, ad.StartAngle, ad.SweepAngle);
+            }
+            else if (corner == eCornerType.Diagonal)
+            {
+                path.AddLine(clientRectangle.Right - cornerSize - 1, clientRectangle.Y, clientRectangle.Right, clientRectangle.Y + cornerSize);
+            }
+            else
+            {
+                path.AddLine(clientRectangle.Right - 2, clientRectangle.Y, clientRectangle.Right, clientRectangle.Y);
+                path.AddLine(clientRectangle.Right, clientRectangle.Y, clientRectangle.Right, clientRectangle.Y + 2);
+            }
+
+            corner = bottomRightCornerType;
+            if (corner == eCornerType.Inherit)
+                corner = eCornerType.Square;
+            if (pathPart == eStyleBackgroundPathPart.TopHalf)
+                corner = eCornerType.Square;
+            if (corner == eCornerType.Rounded)
+            {
+                ArcData ad = ElementStyleDisplay.GetCornerArc(clientRectangle, cornerSize, eCornerArc.BottomRight);
+                path.AddArc(ad.X, ad.Y, ad.Width, ad.Height, ad.StartAngle, ad.SweepAngle);
+            }
+            else if (corner == eCornerType.Diagonal)
+            {
+                path.AddLine(clientRectangle.Right, clientRectangle.Bottom - cornerSize - 1, clientRectangle.Right - cornerSize - 1, clientRectangle.Bottom);
+            }
+            else
+            {
+                path.AddLine(clientRectangle.Right, clientRectangle.Bottom - 2, clientRectangle.Right, clientRectangle.Bottom);
+                path.AddLine(clientRectangle.Right, clientRectangle.Bottom, clientRectangle.Right - 2, clientRectangle.Bottom);
+            }
+
+            corner = bottomLeftCornerType;
+            if (corner == eCornerType.Inherit)
+                corner = eCornerType.Square;
+            if (pathPart == eStyleBackgroundPathPart.TopHalf)
+                corner = eCornerType.Square;
+            if (corner == eCornerType.Rounded)
+            {
+                ArcData ad = ElementStyleDisplay.GetCornerArc(clientRectangle, cornerSize, eCornerArc.BottomLeft);
+                path.AddArc(ad.X, ad.Y, ad.Width, ad.Height, ad.StartAngle, ad.SweepAngle);
+            }
+            else if (corner == eCornerType.Diagonal)
+            {
+                path.AddLine(clientRectangle.X + 2, clientRectangle.Bottom, clientRectangle.X, clientRectangle.Bottom - cornerSize - 1);
+            }
+            else
+            {
+                path.AddLine(clientRectangle.X + 2, clientRectangle.Bottom, clientRectangle.X, clientRectangle.Bottom);
+                path.AddLine(clientRectangle.X, clientRectangle.Bottom, clientRectangle.X, clientRectangle.Bottom - 2);
+            }
+
+            path.CloseAllFigures();
+            return path;
+        }
+
+        public static GraphicsPath GetBorderPath(Rectangle clientRectangle, int cornerSize, eStyleBackgroundPathPart pathPart,
+            eCornerType topLeftCornerType, eCornerType topRightCornerType, eCornerType bottomLeftCornerType, eCornerType bottomRightCornerType,
+            bool leftBorder, bool rightBorder, bool topBorder, bool bottomBorder)
+        {
+            GraphicsPath path = new GraphicsPath();
+
+            if (pathPart == eStyleBackgroundPathPart.TopHalf)
+                clientRectangle.Height = clientRectangle.Height / 2;
+            else if (pathPart == eStyleBackgroundPathPart.BottomHalf)
+            {
+                int h = clientRectangle.Height;
+                clientRectangle.Height = clientRectangle.Height / 2;
+                clientRectangle.Y += (h - clientRectangle.Height - 1);
+            }
+
+            eCornerType corner = topLeftCornerType;
+            if (corner == eCornerType.Inherit)
+                corner = eCornerType.Square;
+
+            if (pathPart == eStyleBackgroundPathPart.BottomHalf)
+                corner = eCornerType.Square;
+
+            if (leftBorder)
+            {
+                path.AddLine(clientRectangle.X, clientRectangle.Bottom -
+                    (bottomBorder && (bottomLeftCornerType == eCornerType.Diagonal || bottomLeftCornerType == eCornerType.Rounded) ? cornerSize : 0),
+                    clientRectangle.X, clientRectangle.Y +
+                    (topBorder && (topLeftCornerType == eCornerType.Diagonal || topLeftCornerType == eCornerType.Rounded) ? cornerSize : 0));
+            }
+
+            if (leftBorder && topBorder)
+            {
+                if (corner == eCornerType.Rounded)
+                {
+                    ArcData ad = ElementStyleDisplay.GetCornerArc(clientRectangle, cornerSize, eCornerArc.TopLeft);
+                    path.AddArc(ad.X, ad.Y, ad.Width, ad.Height, ad.StartAngle, ad.SweepAngle);
+                }
+                else if (corner == eCornerType.Diagonal)
+                {
+                    path.AddLine(clientRectangle.X, clientRectangle.Y + cornerSize, clientRectangle.X + cornerSize, clientRectangle.Y);
+                }
+            }
+
+            if (topBorder)
+            {
+                path.AddLine(clientRectangle.X + 
+                    ((topLeftCornerType == eCornerType.Diagonal || topLeftCornerType == eCornerType.Rounded) ? cornerSize : 0)
+                    , clientRectangle.Y, clientRectangle.Right -
+                    (rightBorder && (topRightCornerType == eCornerType.Diagonal || topRightCornerType == eCornerType.Rounded) ? cornerSize : 0),
+                    clientRectangle.Y);
+            }
+
+            corner = topRightCornerType;
+            if (corner == eCornerType.Inherit)
+                corner = eCornerType.Square;
+            if (pathPart == eStyleBackgroundPathPart.BottomHalf)
+                corner = eCornerType.Square;
+
+            if (topBorder && rightBorder)
+            {
+                if (corner == eCornerType.Rounded)
+                {
+                    ArcData ad = ElementStyleDisplay.GetCornerArc(clientRectangle, cornerSize, eCornerArc.TopRight);
+                    path.AddArc(ad.X, ad.Y, ad.Width, ad.Height, ad.StartAngle, ad.SweepAngle);
+                }
+                else if (corner == eCornerType.Diagonal)
+                {
+                    path.AddLine(clientRectangle.Right - cornerSize - 1, clientRectangle.Y, clientRectangle.Right, clientRectangle.Y + cornerSize);
+                }
+            }
+
+            if (rightBorder)
+            {
+                path.AddLine(clientRectangle.Right, clientRectangle.Y +
+                    ((topRightCornerType == eCornerType.Diagonal || topRightCornerType == eCornerType.Rounded) ? cornerSize : 0),
+                    clientRectangle.Right, clientRectangle.Bottom -
+                    (bottomBorder && (bottomRightCornerType == eCornerType.Diagonal || bottomRightCornerType == eCornerType.Rounded) ? cornerSize : 0));
+            }
+
+            corner = bottomRightCornerType;
+            if (corner == eCornerType.Inherit)
+                corner = eCornerType.Square;
+            if (pathPart == eStyleBackgroundPathPart.TopHalf)
+                corner = eCornerType.Square;
+            if (corner == eCornerType.Rounded)
+            {
+                ArcData ad = ElementStyleDisplay.GetCornerArc(clientRectangle, cornerSize, eCornerArc.BottomRight);
+                path.AddArc(ad.X, ad.Y, ad.Width, ad.Height, ad.StartAngle, ad.SweepAngle);
+            }
+            else if (corner == eCornerType.Diagonal)
+            {
+                path.AddLine(clientRectangle.Right, clientRectangle.Bottom - cornerSize - 1, clientRectangle.Right - cornerSize - 1, clientRectangle.Bottom);
+            }
+
+            if (bottomBorder)
+            {
+                path.AddLine(clientRectangle.Right -
+                    ((bottomRightCornerType == eCornerType.Diagonal || bottomRightCornerType == eCornerType.Rounded) ? cornerSize : 0),
+                    clientRectangle.Bottom,
+                    clientRectangle.X + 
+                    ((bottomLeftCornerType == eCornerType.Diagonal || bottomLeftCornerType == eCornerType.Rounded) ? cornerSize : 0),
+                    clientRectangle.Bottom);
+            }
+
+            corner = bottomLeftCornerType;
+            if (corner == eCornerType.Inherit)
+                corner = eCornerType.Square;
+            if (pathPart == eStyleBackgroundPathPart.TopHalf)
+                corner = eCornerType.Square;
+            if (corner == eCornerType.Rounded)
+            {
+                ArcData ad = ElementStyleDisplay.GetCornerArc(clientRectangle, cornerSize, eCornerArc.BottomLeft);
+                path.AddArc(ad.X, ad.Y, ad.Width, ad.Height, ad.StartAngle, ad.SweepAngle);
+            }
+            else if (corner == eCornerType.Diagonal)
+            {
+                path.AddLine(clientRectangle.X + 2, clientRectangle.Bottom, clientRectangle.X, clientRectangle.Bottom - cornerSize - 1);
+            }
+            
+            return path;
+        }
+
+        public static void FillRoundedRectangle(Graphics g, Rectangle bounds, int cornerSize, Color color1, Color color2, int gradientAngle)
+        {
+            if (color2.IsEmpty)
+            {
+                if (!color1.IsEmpty)
+                {
+                    using (SolidBrush brush = new SolidBrush(color1))
+                        FillRoundedRectangle(g, brush, bounds, cornerSize);
+                }
+            }
+            else
+            {
+                using (LinearGradientBrush brush = CreateLinearGradientBrush(bounds, color1, color2, gradientAngle))
+                    FillRoundedRectangle(g, brush, bounds, cornerSize);
+            }
+        }
+
+        public static void FillRoundedRectangle(Graphics g, Rectangle bounds, int cornerSize, Color color1, Color color2)
+        {
+            FillRoundedRectangle(g, bounds, cornerSize, color1, color2, 90);
+        }
+
+        public static void FillRoundedRectangle(Graphics g, Rectangle bounds, int cornerSize, Color color1)
+        {
+            using (SolidBrush brush = new SolidBrush(color1))
+                FillRoundedRectangle(g, brush, bounds, cornerSize);
+        }
+
+        public static void FillRoundedRectangle(Graphics g, Brush brush, Rectangle bounds, int cornerSize)
+        {
+            // Fix for GDI issue
+            bounds.Width--;
+            bounds.Height--;
+
+            using (GraphicsPath path = GetRoundedRectanglePath(bounds, cornerSize))
+            {
+                g.FillPath(brush, path);
+            }
+        }
+
+        public static void FillRectangle(Graphics g, Rectangle bounds, Color color1)
+        {
+            FillRectangle(g, bounds, color1, Color.Empty, 90);
+        }
+
+        public static void FillRectangle(Graphics g, Rectangle bounds, Color color1, Color color2)
+        {
+            FillRectangle(g, bounds, color1, color2, 90);
+        }
+
+		#if DOTNETBAR
+        public static void FillRectangle(Graphics g, Rectangle r, Rendering.LinearGradientColorTable table)
+        {
+            FillRectangle(g, r, table.Start, table.End, table.GradientAngle);
+        }
+		#endif
+
+        public static void FillRectangle(Graphics g, Rectangle r, Color color1, Color color2, int gradientAngle)
+        {
+            if (r.Width == 0 || r.Height == 0)
+                return;
+
+            if (color2.IsEmpty)
+            {
+                if (!color1.IsEmpty)
+                {
+                    using (SolidBrush brush = new SolidBrush(color1))
+                        g.FillRectangle(brush, r);
+                }
+            }
+            else
+            {
+                using (LinearGradientBrush brush = CreateLinearGradientBrush(r, color1, color2, gradientAngle))
+                    g.FillRectangle(brush, r);
+            }
+        }
+
+        public static void FillRectangle(Graphics g, Rectangle r, Color color1, Color color2, int gradientAngle, float[] factors, float[] positions)
+        {
+            if (r.Width == 0 || r.Height == 0)
+                return;
+
+            if (color2.IsEmpty)
+            {
+                if (!color1.IsEmpty)
+                {
+                    using (SolidBrush brush = new SolidBrush(color1))
+                        g.FillRectangle(brush, r);
+                }
+            }
+            else
+            {
+                using (LinearGradientBrush brush = CreateLinearGradientBrush(r, color1, color2, gradientAngle))
+                {
+                    Blend blend = new Blend(factors.Length);
+                    blend.Factors = factors;
+                    blend.Positions = positions;
+                    brush.Blend = blend;
+                    g.FillRectangle(brush, r);
+                }
+            }
+        }
+
+        public static void FillPath(Graphics g, GraphicsPath path, Color color1, Color color2)
+        {
+            FillPath(g, path, color1, color2, 90);
+        }
+        
+		#if DOTNETBAR
+        public static void FillPath(Graphics g, GraphicsPath path, Rendering.LinearGradientColorTable table)
+        {
+            FillPath(g, path, table.Start, table.End, table.GradientAngle);
+        }
+		#endif
+
+        public static void FillPath(Graphics g, GraphicsPath path, Color color1, Color color2, int gradientAngle)
+        {
+            if (color2.IsEmpty)
+            {
+                if (!color1.IsEmpty)
+                {
+                    using (SolidBrush brush = new SolidBrush(color1))
+                        g.FillPath(brush, path);
+                }
+            }
+            else if(!color1.IsEmpty)
+            {
+                using (LinearGradientBrush brush = CreateLinearGradientBrush(path.GetBounds(), color1, color2, gradientAngle))
+                    g.FillPath(brush, path);
+            }
+        }
+
+        //public static void DrawGradientLine(Graphics g, Point start, Point end, Color color1, Color color2, int gradientAngle, int penWidth)
+        //{
+        //    if (color1.IsEmpty || penWidth <= 0 || start == end)
+        //        return;
+
+        //    using (GraphicsPath path = new GraphicsPath())
+        //    {
+        //        start.Offset(-1, -1);
+        //        end.Offset(-1, -1);
+        //        path.AddLine(start, end);
+        //        using (Pen pen = new Pen(Color.White, penWidth))
+        //            path.Widen(pen);
+        //        Rectangle r = Rectangle.Ceiling(path.GetBounds());
+        //        r.Inflate(1, 1);
+        //        using (LinearGradientBrush brush = CreateLinearGradientBrush(r, color1, color2, gradientAngle))
+        //            g.FillPath(brush, path);
+        //    }
+        //}
+
+        public static void DrawLine(Graphics g, Point start, Point end, Color color, int penWidth)
+        {
+            if (!color.IsEmpty)
+            {
+                using (Pen pen = new Pen(color, penWidth))
+                    g.DrawLine(pen, start, end);
+            }
+        }
+
+        public static void DrawLine(Graphics g, int x1, int y1, int x2, int y2, Color color, int penWidth)
+        {
+            if (!color.IsEmpty)
+            {
+                using (Pen pen = new Pen(color, penWidth))
+                    g.DrawLine(pen, x1, y1, x2, y2);
+            }
+        }
+
+		#if DOTNETBAR
+        public static void DrawGradientRectangle(Graphics g, Rectangle bounds, Rendering.LinearGradientColorTable table, int penWidth)
+        {
+            DrawGradientRectangle(g, bounds, table.Start, table.End, table.GradientAngle, penWidth);
+        }
+		#endif
+
+        public static void DrawGradientRectangle(Graphics g, Rectangle bounds, Color color1, Color color2, int gradientAngle, int penWidth)
+        {
+            if (color1.IsEmpty || bounds.Width <= 0 || bounds.Height <= 0 || penWidth <= 0)
+                return;
+
+            Rectangle r = bounds;
+            // Workaround for GDI+ bug
+            r.Width--;
+            r.Height--;
+
+            using (GraphicsPath path = new GraphicsPath())
+            {
+                path.AddRectangle(r);
+
+                using (Pen pen = new Pen(color1, penWidth))
+                    path.Widen(pen);
+
+                if (color2.IsEmpty)
+                {
+                    if (!color1.IsEmpty)
+                    {
+                        using (SolidBrush brush = new SolidBrush(color1))
+                            g.FillPath(brush, path);
+                    }
+                }
+                else if (!color1.IsEmpty)
+                {
+                    using (LinearGradientBrush brush = new LinearGradientBrush(bounds, color1, color2, gradientAngle))
+                        g.FillPath(brush, path);
+                }
+            }
+        }
+
+		#if DOTNETBAR
+        public static void DrawRoundGradientRectangle(Graphics g, Rectangle bounds, Rendering.LinearGradientColorTable table, int penWidth, int roundCornerSize)
+        {
+            DrawRoundGradientRectangle(g, bounds, table.Start, table.End, table.GradientAngle, penWidth, roundCornerSize);
+        }
+		#endif
+
+        public static void DrawRoundGradientRectangle(Graphics g, Rectangle bounds, Color color1, Color color2, int gradientAngle, int penWidth, int roundCornerSize)
+        {
+            if (color1.IsEmpty && color2.IsEmpty || bounds.Width <= 0 || bounds.Height <= 0 || roundCornerSize <= 0 || penWidth <= 0)
+                return;
+
+            Rectangle r = bounds;
+            // Workaround for GDI+ bug
+            r.Width--;
+            r.Height--;
+
+            using (GraphicsPath roundPath = GetRoundedRectanglePath(r, roundCornerSize))
+            {
+                using (Pen pen = new Pen(color1, penWidth))
+                    roundPath.Widen(pen);
+
+                if (color2.IsEmpty)
+                {
+                    using (SolidBrush brush = new SolidBrush(color1))
+                        g.FillPath(brush, roundPath);
+                }
+                else if(!color1.IsEmpty)
+                {
+                    using (LinearGradientBrush brush = new LinearGradientBrush(bounds, color1, color2, gradientAngle))
+                        g.FillPath(brush, roundPath);
+                }
+            }
+        }
+
+		#if DOTNETBAR
+        public static void DrawGradientPathBorder(Graphics g, GraphicsPath path, Rendering.LinearGradientColorTable table, int penWidth)
+        {
+            DrawGradientPathBorder(g, path, table.Start, table.End, table.GradientAngle, penWidth);
+        }
+		#endif
+
+        public static void DrawGradientPathBorder(Graphics g, GraphicsPath path, Color color1, Color color2, int gradientAngle, int penWidth)
+        {
+            using (Pen pen = new Pen(color1, penWidth))
+                path.Widen(pen);
+
+            Rectangle r = Rectangle.Ceiling(path.GetBounds());
+            r.Inflate(1, 1);
+
+            if (color2.IsEmpty)
+            {
+                if (!color1.IsEmpty)
+                {
+                    using (SolidBrush brush = new SolidBrush(color1))
+                        g.FillPath(brush, path);
+                }
+            }
+            else if(!color1.IsEmpty)
+            {
+                using (LinearGradientBrush brush = new LinearGradientBrush(r, color1, color2, gradientAngle))
+                    g.FillPath(brush, path);
+            }
+        }
+		#if DOTNETBAR
+        public static void DrawGradientLine(Graphics g, Point start, Point end, Rendering.LinearGradientColorTable table, int penWidth)
+        {
+            DrawGradientLine(g, start, end, table.Start, table.End, table.GradientAngle, penWidth);
+        }
+		#endif
+        public static void DrawGradientLine(Graphics g, Point start, Point end, Color color1, Color color2, int gradientAngle, int penWidth)
+        {
+            if (color2.IsEmpty)
+            {
+                if (!color1.IsEmpty)
+                {
+                    using (Pen pen = new Pen(color1, penWidth))
+                        g.DrawLine(pen, start, end);
+                }
+            }
+            else if (!color1.IsEmpty)
+            {
+                using (GraphicsPath path = new GraphicsPath())
+                {
+                    start.Offset(-1, -1);
+                    end.Offset(-1, -1);
+                    path.AddLine(start, end);
+                    using (Pen pen = new Pen(color1, penWidth))
+                        path.Widen(pen);
+                    Rectangle r = Rectangle.Ceiling(path.GetBounds());
+                    r.Inflate(1, 1);
+                    using (LinearGradientBrush brush = DisplayHelp.CreateLinearGradientBrush(r, color1, color2, gradientAngle))
+                        g.FillPath(brush, path);
+                }
+            }
+        }
+
+        public static void DrawGradientLine(Graphics g, Point start, Point end, Color color1, Color color2, int gradientAngle, int penWidth, float[] factors, float[] positions)
+        {
+            if (color2.IsEmpty)
+            {
+                if (!color1.IsEmpty)
+                {
+                    using (Pen pen = new Pen(color1, penWidth))
+                        g.DrawLine(pen, start, end);
+                }
+            }
+            else if (!color1.IsEmpty)
+            {
+                using (GraphicsPath path = new GraphicsPath())
+                {
+                    start.Offset(-1, -1);
+                    end.Offset(-1, -1);
+                    path.AddLine(start, end);
+                    using (Pen pen = new Pen(color1, penWidth))
+                        path.Widen(pen);
+                    Rectangle r = Rectangle.Ceiling(path.GetBounds());
+                    r.Inflate(1, 1);
+                    using (LinearGradientBrush brush = DisplayHelp.CreateLinearGradientBrush(r, color1, color2, gradientAngle))
+                    {
+                        Blend blend = new Blend(factors.Length);
+                        blend.Factors = factors;
+                        blend.Positions = positions;
+                        brush.Blend = blend;
+                        g.FillPath(brush, path);
+                    }
+                }
+            }
+        }
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/Dpi.cs b/PROMS/DotNetBar Source Code/TreeGX/Dpi.cs
new file mode 100644
index 00000000..1f8d48bb
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/Dpi.cs	
@@ -0,0 +1,248 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Text;
+
+namespace DevComponents.Tree
+{
+    /// <summary>
+    /// Provides High DPI support for DotNetBar controls.
+    /// </summary>
+    public static class Dpi
+    {
+        private static SizeF _Factor = new SizeF(1f, 1f);
+        private static bool _UseFactor = false;
+        private static bool _NormalizeScaleFactor = false;
+
+        static Dpi()
+        {
+            //Debug.WriteLine("Static constructor");
+        }
+
+        /// <summary>
+        /// Gets or sets whether scale factor when set is normalized so both Width and Height values are the same. Default value is false.
+        /// If using ScaleMode=font the scale factor might not be same for Width and Height so this allows opportunity to keep existing size ratios on the DotNetBar sized controls.
+        /// When set to true the scale factor Height will always be set to scale factor Width.
+        /// </summary>
+        public static bool NormalizeScaleFactor
+        {
+            get { return _NormalizeScaleFactor; }
+            set { _NormalizeScaleFactor = value; }
+        }
+
+        public static SizeF Factor
+        {
+            get { return _Factor; }
+        }
+        public static Size Size(Size size)
+        {
+            if (!_UseFactor) return size;
+            size.Width = (int)(size.Width * _Factor.Width);
+            size.Height = (int)(size.Height * _Factor.Height);
+            return size;
+        }
+        public static Rectangle Size(Rectangle r)
+        {
+            if (!_UseFactor) return r;
+            r.Width = (int)(r.Width * _Factor.Width);
+            r.Height = (int)(r.Height * _Factor.Height);
+            return r;
+        }
+
+        public static Point Size(Point p)
+        {
+            if (!_UseFactor) return p;
+            p.X = (int)(p.X * _Factor.Width);
+            p.Y = (int)(p.Y * _Factor.Height);
+            return p;
+        }
+
+        //public static DevComponents.DotNetBar.Padding Size(DevComponents.DotNetBar.Padding padding)
+        //{
+        //    if (!_UseFactor) return padding;
+        //    return new Padding((int)(padding.Left * _Factor.Width), (int)(padding.Right * _Factor.Width), (int)(padding.Top * _Factor.Height), (int)(padding.Bottom * _Factor.Height));
+        //}
+
+        public static int DescaleWidth(int width)
+        {
+            if (!_UseFactor) return width;
+            return (int)(width / _Factor.Width);
+        }
+        public static int DescaleHeight(int height)
+        {
+            if (!_UseFactor) return height;
+            return (int)(height / _Factor.Height);
+        }
+
+        internal static System.Drawing.Size Descale(System.Drawing.Size size)
+        {
+            if (!_UseFactor) return size;
+            size.Width = (int)(size.Width / _Factor.Width);
+            size.Height = (int)(size.Height / _Factor.Height);
+            return size;
+        }
+
+        public static int Width(int width)
+        {
+            if (!_UseFactor) return width;
+            return (int)(width * _Factor.Width);
+        }
+
+        public static int Height(int height)
+        {
+            if (!_UseFactor) return height;
+            return (int)(height * _Factor.Height);
+        }
+
+        public static float Height(float height)
+        {
+            if (!_UseFactor) return height;
+            return (height * _Factor.Height);
+        }
+
+        private static int _CaptionVerticalPadding = 10;
+        public static int CaptionVerticalPadding
+        {
+            get
+            {
+                if (!_UseFactor) return 0;
+                return _CaptionVerticalPadding;
+            }
+        }
+
+        public static void SetScaling(SizeF factor)
+        {
+            if (factor == _Factor) return;
+
+            if (_NormalizeScaleFactor)
+                factor.Height = factor.Width;
+
+            if (factor.Width == 1f && factor.Height == 1f)
+            {
+                _UseFactor = false;
+                _Factor = factor;
+            }
+            else
+            {
+                _UseFactor = true;
+                _Factor = factor;
+            }
+
+            UpdateStaticSizes();
+        }
+
+        private static void UpdateStaticSizes()
+        {
+            Width1 = Dpi.Width(1);
+            Width2 = Dpi.Width(2);
+            Width3 = Dpi.Width(3);
+            Width4 = Dpi.Width(4);
+            Width5 = Dpi.Width(5);
+            Width6 = Dpi.Width(6);
+            Width7 = Dpi.Width(7);
+            Width8 = Dpi.Width(8);
+            Width9 = Dpi.Width(9);
+            Width10 = Dpi.Width(10);
+            Width11 = Dpi.Width(11);
+            Width12 = Dpi.Width(12);
+            Width13 = Dpi.Width(13);
+            Width14 = Dpi.Width(14);
+            Width15 = Dpi.Width(15);
+            Width16 = Dpi.Width(16);
+            Width17 = Dpi.Width(17);
+            Width18 = Dpi.Width(18);
+            Width20 = Dpi.Width(20);
+            Width22 = Dpi.Width(22);
+            Width24 = Dpi.Width(24);
+            Width25 = Dpi.Width(25);
+            Width26 = Dpi.Width(26);
+            Width28 = Dpi.Width(28);
+            Width32 = Dpi.Width(32);
+            Width34 = Dpi.Width(34);
+
+            Height1 = Dpi.Height(1);
+            Height2 = Dpi.Height(2);
+            Height3 = Dpi.Height(3);
+            Height4 = Dpi.Height(4);
+            Height5 = Dpi.Height(5);
+            Height6 = Dpi.Height(6);
+            Height7 = Dpi.Height(7);
+            Height8 = Dpi.Height(8);
+            Height9 = Dpi.Height(9);
+            Height10 = Dpi.Height(10);
+            Height11 = Dpi.Height(11);
+            Height12 = Dpi.Height(12);
+            Height13 = Dpi.Height(13);
+            Height14 = Dpi.Height(14);
+            Height15 = Dpi.Height(15);
+            Height16 = Dpi.Height(16);
+            Height17 = Dpi.Height(17);
+            Height18 = Dpi.Height(18);
+            Height20 = Dpi.Height(20);
+            Height22 = Dpi.Height(22);
+            Height23 = Dpi.Height(23);
+            Height24 = Dpi.Height(24);
+            Height25 = Dpi.Height(25);
+            Height28 = Dpi.Height(28);
+            Height32 = Dpi.Height(32);
+        }
+
+        #region Static Sizes
+
+        public static int Width1 = 1;
+        public static int Width2 = 2;
+        public static int Width3 = 3;
+        public static int Width5 = 5;
+        public static int Width4 = 4;
+        public static int Width6 = 6;
+        public static int Width7 = 7;
+        public static int Width8 = 8;
+        public static int Width9 = 9;
+        public static int Width10 = 10;
+        public static int Width11 = 11;
+        public static int Width12 = 12;
+        public static int Width13 = 13;
+        public static int Width14 = 14;
+        public static int Width15 = 15;
+        public static int Width16 = 16;
+        public static int Width17 = 17;
+        public static int Width18 = 18;
+        public static int Width20 = 20;
+        public static int Width22 = 22;
+        public static int Width24 = 24;
+        public static int Width25 = 25;
+        public static int Width26 = 26;
+        public static int Width28 = 28;
+        public static int Width32 = 32;
+        public static int Width34 = 34;
+
+        public static int Height1 = 1;
+        public static int Height2 = 2;
+        public static int Height3 = 3;
+        public static int Height4 = 4;
+        public static int Height5 = 5;
+        public static int Height6 = 6;
+        public static int Height7 = 7;
+        public static int Height8 = 8;
+        public static int Height9 = 9;
+        public static int Height10 = 10;
+        public static int Height11 = 11;
+        public static int Height12 = 12;
+        public static int Height13 = 13;
+        public static int Height14 = 14;
+        public static int Height15 = 15;
+        public static int Height16 = 16;
+        public static int Height17 = 17;
+        public static int Height18 = 18;
+        public static int Height20 = 20;
+        public static int Height22 = 22;
+        public static int Height23 = 23;
+        public static int Height24 = 24;
+        public static int Height25 = 25;
+        public static int Height28 = 28;
+        public static int Height32 = 32;
+
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/ElementSerializer.cs b/PROMS/DotNetBar Source Code/TreeGX/ElementSerializer.cs
new file mode 100644
index 00000000..4c2698db
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/ElementSerializer.cs	
@@ -0,0 +1,368 @@
+using System;
+using System.Text;
+using System.Xml;
+using System.Reflection;
+using System.Drawing;
+using System.ComponentModel;
+
+#if DOTNETBAR
+namespace DevComponents.DotNetBar
+#else
+namespace DevComponents.Tree
+#endif
+{
+    [AttributeUsage(AttributeTargets.Property | AttributeTargets.Method | AttributeTargets.Field)]
+    public class DevCoSerialize : Attribute
+    {
+        public DevCoSerialize(){}
+    }
+
+	/// <summary>
+	/// Represents class that can serialize compatible marked properties.
+	/// </summary>
+    public class ElementSerializer
+    {
+        private static string XmlImageName="image";
+        private static string XmlIconName="icon";
+        private static string XmlAttributeName="name";
+//    	private static string XmlCollectionName="collection";
+//    	private static string XmlTypeName="type";
+//    	private static string XmlObjectName="object";
+
+        public static void Serialize(object element, XmlElement xmlElem)
+        {
+            PropertyInfo[] propInfo = element.GetType().GetProperties(BindingFlags.DeclaredOnly | BindingFlags.Instance | BindingFlags.Public);
+            foreach (PropertyInfo prop in propInfo)
+            {
+                if (prop.GetCustomAttributes(typeof(DevCoSerialize), true).Length > 0)
+                {
+                	// Check whether property needs to be serialized
+                	object[] attributesDefaultValue=prop.GetCustomAttributes(typeof(DefaultValueAttribute), true);
+                	if (attributesDefaultValue.Length > 0)
+                	{
+                		DefaultValueAttribute att=attributesDefaultValue[0] as DefaultValueAttribute;
+                		object propertyValue = prop.GetValue(element, null);
+                		if(propertyValue==att.Value)
+                			continue;
+                		if(propertyValue!=null && att.Value!=null && propertyValue.Equals(att.Value))
+                			continue;
+                	}
+                	else if(element.GetType().GetMethod("ShouldSerialize" + prop.Name,BindingFlags.Default | BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance)!=null)
+                	{
+                		MethodInfo mi=element.GetType().GetMethod("ShouldSerialize" + prop.Name,BindingFlags.Default | BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance);
+                		object result=mi.Invoke(element,null);
+                		if(result is bool && !((bool)result))
+                			continue;
+                	}
+                	
+                    string attributeName=XmlConvert.EncodeName(prop.Name);
+                    Type t=prop.PropertyType;
+                    if (t.IsPrimitive || t == typeof(string) || t.IsEnum)
+                    {
+                        if (t == typeof(string))
+                            xmlElem.SetAttribute(attributeName, prop.GetValue(element, null).ToString());
+                        else if (t.IsEnum)
+                        {
+                            xmlElem.SetAttribute(attributeName, Enum.Format(t, prop.GetValue(element, null), "g"));
+                        }
+                        else if (t == typeof(bool))
+                            xmlElem.SetAttribute(attributeName, XmlConvert.ToString((bool)prop.GetValue(element, null)));
+                        else if (t == typeof(Int32))
+                            xmlElem.SetAttribute(attributeName, XmlConvert.ToString((Int32)prop.GetValue(element, null)));
+                        else if (t == typeof(double))
+                            xmlElem.SetAttribute(attributeName, XmlConvert.ToString((double)prop.GetValue(element, null)));
+                        else if (t == typeof(float))
+                            xmlElem.SetAttribute(attributeName, XmlConvert.ToString((float)prop.GetValue(element, null)));
+                        else if (t == typeof(Int16))
+                            xmlElem.SetAttribute(attributeName, XmlConvert.ToString((Int16)prop.GetValue(element, null)));
+                        else if (t == typeof(Int64))
+                            xmlElem.SetAttribute(attributeName, XmlConvert.ToString((Int64)prop.GetValue(element, null)));
+                        else if (t == typeof(byte))
+                            xmlElem.SetAttribute(attributeName, XmlConvert.ToString((byte)prop.GetValue(element, null)));
+                        else if (t == typeof(char))
+                            xmlElem.SetAttribute(attributeName, XmlConvert.ToString((char)prop.GetValue(element, null)));
+                        else if (t == typeof(decimal))
+                            xmlElem.SetAttribute(attributeName, XmlConvert.ToString((decimal)prop.GetValue(element, null)));
+                        else if (t == typeof(Guid))
+                            xmlElem.SetAttribute(attributeName, XmlConvert.ToString((Guid)prop.GetValue(element, null)));
+                        else if (t == typeof(sbyte))
+                            xmlElem.SetAttribute(attributeName, XmlConvert.ToString((sbyte)prop.GetValue(element, null)));
+                        else if (t == typeof(TimeSpan))
+                            xmlElem.SetAttribute(attributeName, XmlConvert.ToString((TimeSpan)prop.GetValue(element, null)));
+                        else if (t == typeof(ushort))
+                            xmlElem.SetAttribute(attributeName, XmlConvert.ToString((ushort)prop.GetValue(element, null)));
+                        else if (t == typeof(uint))
+                            xmlElem.SetAttribute(attributeName, XmlConvert.ToString((uint)prop.GetValue(element, null)));
+                        else if (t == typeof(ulong))
+                            xmlElem.SetAttribute(attributeName, XmlConvert.ToString((ulong)prop.GetValue(element, null)));
+                        else
+                            throw new ApplicationException("Unsupported serialization type '" + t.ToString() + "' on property '" + attributeName + "'");
+                    }
+                    else if (t == typeof(Color))
+                        xmlElem.SetAttribute(attributeName, ColorToString((Color)prop.GetValue(element, null)));
+                    else if (t == typeof(Image))
+                    {
+                        XmlElement imageXmlElement = xmlElem.OwnerDocument.CreateElement(XmlImageName);
+                        imageXmlElement.SetAttribute(XmlAttributeName, attributeName);
+                        xmlElem.AppendChild(imageXmlElement);
+                        SerializeImage((Image)prop.GetValue(element, null), imageXmlElement);
+                    }
+                    else if (t == typeof(Icon))
+                    {
+                        XmlElement imageXmlElement = xmlElem.OwnerDocument.CreateElement(XmlIconName);
+                        imageXmlElement.SetAttribute(XmlAttributeName, attributeName);
+                        xmlElem.AppendChild(imageXmlElement);
+                        SerializeIcon((Icon)prop.GetValue(element, null), imageXmlElement);
+                    }
+                    else if (t == typeof(Font))
+                    {
+                        xmlElem.SetAttribute(attributeName, FontToString((Font)prop.GetValue(element, null)));
+                    }
+                    else
+                        throw new ApplicationException("Unsupported serialization type '" + t.ToString() + "'" + "' on property '" + attributeName + "'");
+                }
+            }
+        }
+
+        private static string ColorToString(Color clr)
+        {
+            if (clr.IsSystemColor || clr.IsNamedColor || clr.IsKnownColor)
+                return ("." + clr.Name);
+            else
+                return clr.ToArgb().ToString();
+        }
+
+        private static Color ColorFromString(string sclr)
+        {
+            if (sclr == "")
+                return Color.Empty;
+            if (sclr[0] == '.')
+                return Color.FromName(sclr.Substring(1));
+            else
+                return Color.FromArgb(System.Xml.XmlConvert.ToInt32(sclr));
+        }
+
+        private static string FontToString(Font font)
+        {
+            if (font == null)
+                return "";
+
+            string s = font.Name + "," + XmlConvert.ToString(font.Size) + "," + XmlConvert.ToString(font.Bold) + "," + XmlConvert.ToString(font.Italic) + "," +
+                XmlConvert.ToString(font.Underline) + "," + XmlConvert.ToString(font.Strikeout);
+
+            return s;
+        }
+
+        private static Font FontFromString(string fontString)
+        {
+            if(fontString=="")
+                return null;
+
+            string[] options=fontString.Split(',');
+            FontStyle fontStyle = FontStyle.Regular;
+            if (XmlConvert.ToBoolean(options[2]))
+                fontStyle |= FontStyle.Bold;
+            if (XmlConvert.ToBoolean(options[3]))
+                fontStyle |= FontStyle.Italic;
+            if (XmlConvert.ToBoolean(options[4]))
+                fontStyle |= FontStyle.Underline;
+            if (XmlConvert.ToBoolean(options[5]))
+                fontStyle |= FontStyle.Strikeout;
+            Font font = new Font(options[0], XmlConvert.ToSingle(options[1]), fontStyle);
+            return font;
+        }
+
+        public static void Deserialize(object element, XmlElement xmlElem)
+        {
+            Type type=element.GetType();
+            foreach(XmlAttribute att in xmlElem.Attributes)
+            {
+                string name=XmlConvert.DecodeName(att.Name);
+                PropertyInfo prop=type.GetProperty(name);
+                if(prop!=null)
+                {
+                    Type t=prop.PropertyType;
+
+                    if (t.IsPrimitive)
+                    {
+                        if(t==typeof(bool))
+                            prop.SetValue(element, XmlConvert.ToBoolean(att.Value), null);
+                        else if (t == typeof(Int32))
+                            prop.SetValue(element, XmlConvert.ToInt32(att.Value), null);
+                        else if (t == typeof(double))
+                            prop.SetValue(element, XmlConvert.ToDouble(att.Value), null);
+                        else if (t == typeof(float))
+                            prop.SetValue(element, XmlConvert.ToSingle(att.Value), null);
+                        else if (t == typeof(Int16))
+                            prop.SetValue(element, XmlConvert.ToInt16(att.Value), null);
+                        else if (t == typeof(Int64))
+                            prop.SetValue(element, XmlConvert.ToInt64(att.Value), null);
+                        else if (t == typeof(byte))
+                            prop.SetValue(element, XmlConvert.ToByte(att.Value), null);
+                        else if (t == typeof(char))
+                            prop.SetValue(element, XmlConvert.ToChar(att.Value), null);
+                        else if (t == typeof(decimal))
+                            prop.SetValue(element, XmlConvert.ToDecimal(att.Value), null);
+                        else if (t == typeof(Guid))
+                            prop.SetValue(element, XmlConvert.ToGuid(att.Value), null);
+                        else if (t == typeof(sbyte))
+                            prop.SetValue(element, XmlConvert.ToSByte(att.Value), null);
+                        else if (t == typeof(TimeSpan))
+                            prop.SetValue(element, XmlConvert.ToTimeSpan(att.Value), null);
+                        else if (t == typeof(ushort))
+                            prop.SetValue(element, XmlConvert.ToUInt16(att.Value), null);
+                        else if (t == typeof(uint))
+                            prop.SetValue(element, XmlConvert.ToUInt32(att.Value), null);
+                        else if (t == typeof(ulong))
+                            prop.SetValue(element, XmlConvert.ToUInt64(att.Value), null);
+                    }
+                    else if (t == typeof(string))
+                        prop.SetValue(element, att.Value, null);
+                    else if (t.IsEnum)
+                        prop.SetValue(element, Enum.Parse(t, att.Value), null);
+                    else if (t == typeof(Color))
+                        prop.SetValue(element, ColorFromString(att.Value), null);
+                    else if (t == typeof(Font))
+                        prop.SetValue(element, FontFromString(att.Value), null);
+                }
+            }
+
+            foreach(XmlElement childElem in xmlElem.ChildNodes)
+            {
+                if (childElem.Name == XmlImageName)
+                {
+                    string name = XmlConvert.DecodeName(childElem.GetAttribute(XmlAttributeName));
+                    PropertyInfo prop = type.GetProperty(name);
+                    if (prop != null)
+                    {
+                        prop.SetValue(element, DeserializeImage(childElem), null);
+                    }
+                }
+                else if (childElem.Name == XmlIconName)
+                {
+                    string name = XmlConvert.DecodeName(childElem.GetAttribute(XmlAttributeName));
+                    PropertyInfo prop = type.GetProperty(name);
+                    if (prop != null)
+                    {
+                        prop.SetValue(element, DeserializeIcon(childElem), null);
+                    }
+                }
+            }
+        }
+
+		public static void SerializeImage(System.Drawing.Image image,XmlElement xml)
+		{
+			if(image==null)
+				return;
+
+			System.IO.MemoryStream mem=new System.IO.MemoryStream(1024);
+			// TODO: Beta 2 issue with the ImageFormat. RawFormat on image object does not return the actual image format
+			// Right now it is hard coded to PNG but in final version we should get the original image format
+			image.Save(mem,System.Drawing.Imaging.ImageFormat.Png);
+
+			System.Text.StringBuilder sb=new System.Text.StringBuilder();
+			System.IO.StringWriter sw=new System.IO.StringWriter(sb);
+				
+			System.Xml.XmlTextWriter xt=new System.Xml.XmlTextWriter(sw);
+			xt.WriteBase64(mem.GetBuffer(),0,(int)mem.Length);
+
+			xml.InnerText=sb.ToString();
+		}
+
+		public static void SerializeIcon(System.Drawing.Icon icon, XmlElement xml)
+		{
+			if(icon==null)
+				return;
+
+			System.IO.MemoryStream mem=new System.IO.MemoryStream(1024);
+			// TODO: Beta 2 issue with the ImageFormat. RawFormat on image object does not return the actual image format
+			// Right now it is hard coded to PNG but in final version we should get the original image format
+			icon.Save(mem);
+
+			System.Text.StringBuilder sb=new System.Text.StringBuilder();
+			System.IO.StringWriter sw=new System.IO.StringWriter(sb);
+				
+			System.Xml.XmlTextWriter xt=new System.Xml.XmlTextWriter(sw);
+
+			xml.SetAttribute("encoding","binhex");
+			//xt.WriteBase64(mem.GetBuffer(),0,(int)mem.Length);
+			xt.WriteBinHex(mem.GetBuffer(),0,(int)mem.Length);
+
+			xml.InnerText=sb.ToString();
+		}
+
+		/// <summary>
+		/// XML element is expected to be something like <image>Image data Base64 encoded</image>
+		/// </summary>
+		/// <param name="xml">Image data</param>
+		/// <returns></returns>
+		public static System.Drawing.Image DeserializeImage(XmlElement xml)
+		{
+			System.Drawing.Image img=null;
+			if(xml==null || xml.InnerText=="")
+				return null;
+
+			System.IO.StringReader sr=new System.IO.StringReader(xml.OuterXml);
+			System.Xml.XmlTextReader xr= new System.Xml.XmlTextReader(sr);
+			System.IO.MemoryStream mem=new System.IO.MemoryStream(1024);
+			// Skip <image> to data
+			xr.Read();
+				
+			byte[] base64 = new byte[1024];
+			int base64len = 0;
+			do
+			{
+				base64len = xr.ReadBase64(base64, 0, 1024);
+				if(base64len>0)
+					mem.Write(base64,0,base64len);
+
+			} while (base64len!=0);
+
+			img=System.Drawing.Image.FromStream(mem);
+
+			return img;
+		}
+
+		public static System.Drawing.Icon DeserializeIcon(XmlElement xml)
+		{
+			System.Drawing.Icon img=null;
+			if(xml==null || xml.InnerText=="")
+				return null;
+			bool bDecodeBinHex=false;
+			if(xml.HasAttribute("encoding") && xml.GetAttribute("encoding")=="binhex")
+				bDecodeBinHex=true;
+			System.IO.StringReader sr=new System.IO.StringReader(xml.OuterXml);
+			System.Xml.XmlTextReader xr= new System.Xml.XmlTextReader(sr);
+			System.IO.MemoryStream mem=new System.IO.MemoryStream(1024);
+			// Skip <image> to data
+			xr.Read();
+				
+			byte[] base64 = new byte[1024];
+			int base64len = 0;
+			if(bDecodeBinHex)
+			{
+				do
+				{
+					base64len = xr.ReadBinHex(base64, 0, 1024);
+					if(base64len>0)
+						mem.Write(base64,0,base64len);
+
+				} while (base64len!=0);
+			}
+			else
+			{
+				do
+				{
+					base64len = xr.ReadBase64(base64, 0, 1024);
+					if(base64len>0)
+						mem.Write(base64,0,base64len);
+
+				} while (base64len!=0);
+			}
+			mem.Position=0;
+			img=new System.Drawing.Icon(mem);
+
+			return img;
+		}
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/ElementStyle.cs b/PROMS/DotNetBar Source Code/TreeGX/ElementStyle.cs
new file mode 100644
index 00000000..35c77d9d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/ElementStyle.cs	
@@ -0,0 +1,2322 @@
+using System;
+using System.Drawing;
+using System.ComponentModel;
+
+#if TREEGX
+using DevComponents.Tree.Design;
+namespace DevComponents.Tree
+#elif DOTNETBAR
+using DevComponents.DotNetBar.Design;
+namespace DevComponents.DotNetBar
+#endif
+{
+	/// <summary>
+	/// Represents visual style of an User Interface Element.
+	/// </summary>
+	[System.ComponentModel.ToolboxItem(false),System.ComponentModel.DesignTimeVisible(false),TypeConverter(typeof(System.ComponentModel.ExpandableObjectConverter))]
+	public class ElementStyle:System.ComponentModel.IComponent
+	{
+		#region Events
+		/// <summary>
+		/// Occurs when appearance property of the style has changed.
+		/// </summary>
+		public event EventHandler StyleChanged;
+		/// <summary>
+		/// Occurs when component is Disposed.
+		/// </summary>
+		[System.ComponentModel.Description("Occurs when component is Disposed.")]
+		public event EventHandler Disposed;
+		#endregion
+
+		#region Private Variables
+		const int DEFAULT_CORNER_DIAMETER=8;
+
+		private Color m_BackColor=Color.Empty;
+		private eColorSchemePart m_BackColorSchemePart=eColorSchemePart.None;
+		private Color m_BackColor2=Color.Empty;
+		private eColorSchemePart m_BackColor2SchemePart=eColorSchemePart.None;
+		private int m_BackColorGradientAngle=0;
+		private Image m_BackgroundImage=null;
+		private eStyleBackgroundImage m_BackgroundImagePosition=eStyleBackgroundImage.Stretch;
+		private byte m_BackgroundImageAlpha=255;
+        private eGradientType m_BackColorGradientType = eGradientType.Linear;
+
+		// Font
+		private Font m_Font=null;
+
+		// Text Formating
+		private bool m_WordWrap=false;
+		private eStyleTextAlignment m_TextAlignment=eStyleTextAlignment.Near;
+		private eStyleTextAlignment m_TextLineAlignment=eStyleTextAlignment.Center;
+		private eStyleTextTrimming m_TextTrimming=eStyleTextTrimming.EllipsisCharacter;
+		//private string m_TextFormat="";
+
+		private Color m_TextColor=Color.Empty;
+		private eColorSchemePart m_TextColorSchemePart=eColorSchemePart.None;
+		private Color m_TextShadowColor=Color.Empty;
+		private eColorSchemePart m_TextShadowColorSchemePart=eColorSchemePart.None;
+		private Point m_TextShadowOffset=Point.Empty;
+
+		// Style margins
+		private int m_MarginLeft=0;
+		private int m_MarginRight=0;
+		private int m_MarginTop=0;
+		private int m_MarginBottom=0;
+
+		// Style inside padding
+		private int m_PaddingLeft=0;
+		private int m_PaddingRight=0;
+		private int m_PaddingTop=0;
+		private int m_PaddingBottom=0;
+
+		// Border
+		private eStyleBorderType m_BorderLeft=eStyleBorderType.None;
+		private eStyleBorderType m_BorderRight=eStyleBorderType.None;
+		private eStyleBorderType m_BorderTop=eStyleBorderType.None;
+		private eStyleBorderType m_BorderBottom=eStyleBorderType.None;
+
+		private Color m_BorderColor=Color.Empty;
+		private eColorSchemePart m_BorderColorSchemePart=eColorSchemePart.None;
+        private Color m_BorderColor2 = Color.Empty;
+        private eColorSchemePart m_BorderColor2SchemePart = eColorSchemePart.None;
+        private int m_BorderGradientAngle = 90;
+
+        private Color m_BorderColorLight = Color.Empty;
+        private eColorSchemePart m_BorderColorLightSchemePart = eColorSchemePart.None;
+        private Color m_BorderColorLight2 = Color.Empty;
+        private eColorSchemePart m_BorderColorLight2SchemePart = eColorSchemePart.None;
+        private int m_BorderLightGradientAngle = 90;
+
+		private Color m_BorderLeftColor=Color.Empty;
+		private eColorSchemePart m_BorderLeftColorSchemePart=eColorSchemePart.None;
+		private Color m_BorderRightColor=Color.Empty;
+		private eColorSchemePart m_BorderRightColorSchemePart=eColorSchemePart.None;
+		private Color m_BorderTopColor=Color.Empty;
+		private eColorSchemePart m_BorderTopColorSchemePart=eColorSchemePart.None;
+		private Color m_BorderBottomColor=Color.Empty;
+		private eColorSchemePart m_BorderBottomColorSchemePart=eColorSchemePart.None;
+
+		private int m_BorderLeftWidth=0;
+		private int m_BorderRightWidth=0;
+		private int m_BorderTopWidth=0;
+		private int m_BorderBottomWidth=0;
+
+		private eCornerType m_CornerType=eCornerType.Square;
+		private eCornerType m_CornerTypeTopLeft=eCornerType.Inherit;
+		private eCornerType m_CornerTypeTopRight=eCornerType.Inherit;
+		private eCornerType m_CornerTypeBottomLeft=eCornerType.Inherit;
+		private eCornerType m_CornerTypeBottomRight=eCornerType.Inherit;
+		private int m_CornerDiameter=DEFAULT_CORNER_DIAMETER;
+
+		private Size m_Size=Size.Empty;
+		private bool m_SizeChanged=true;
+
+		private string m_Name="";
+		private string m_Description="";
+
+		private int m_MaximumHeight=0;
+		private System.ComponentModel.ISite m_ComponentSite=null;
+		private bool m_DesignMode=false;
+		#if TREEGX
+		private ElementStyleCollection m_Parent=null;
+		private int m_MaximumWidth=0;
+		#endif
+		//private ColorScheme m_ColorScheme=null;
+        private BackgroundColorBlendCollection m_BackColorBlend = new BackgroundColorBlendCollection();
+        private string m_Class = "";
+        private bool m_FreezeEvents = false;
+		#endregion
+
+		/// <summary>Creates new instance of the class.</summary>
+		public ElementStyle()
+		{
+            m_BackColorBlend.Parent = this;
+		}
+
+		#region Properties
+        /// <summary>
+        /// Gets the collection that defines the multicolor gradient background.
+        /// </summary>
+        [Browsable(true), DesignerSerializationVisibility(DesignerSerializationVisibility.Content), Description("Collection that defines the multicolor gradient background.")]
+        public BackgroundColorBlendCollection BackColorBlend
+        {
+            get { return m_BackColorBlend; }
+        }
+
+		/// <summary>
+		/// Gets or sets the background color for UI element. If used in combination with
+		/// BackgroundColor2 is specifies starting gradient color.
+		/// </summary>
+		[DevCoSerialize(),Browsable(true),Category("Background"),Description("Gets or sets the background color for UI element."),Editor(typeof(ColorTypeEditor), typeof(System.Drawing.Design.UITypeEditor)),TypeConverter(typeof(ColorSchemeColorConverter))]
+		public Color BackColor
+		{
+			get
+			{
+				return GetColor(m_BackColor,m_BackColorSchemePart);
+			}
+			set
+			{
+				if(value!=this.BackColor && (m_BackColorSchemePart!=eColorSchemePart.None && !value.IsEmpty || value.IsEmpty))
+					this.BackColorSchemePart=eColorSchemePart.None;
+				m_BackColor=value;
+				this.OnStyleChanged();
+			}
+		}
+		/// <summary>
+		/// Indicates whether BackgroundColor should be serialized. Used by windows forms designer design-time support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeBackColor()
+		{return (!m_BackColor.IsEmpty && m_BackColorSchemePart==eColorSchemePart.None);}
+		/// <summary>
+		/// Resets BackgroundColor to it's default value. Used by windows forms designer design-time support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetBackColor()
+		{
+			m_BackColor=Color.Empty;
+            this.OnStyleChanged();
+		}
+
+		/// <summary>
+		/// Gets or sets the color scheme color that is used as background color. Setting
+		/// this property overrides the setting of the corresponding BackColor property.
+		/// Color scheme colors are automatically managed and are based on current system colors.
+		/// That means if colors on the system change the color scheme will ensure that it's colors
+		/// are changed as well to fit in the color scheme of target system. Set this property to
+		/// <a href="TreeGX~DevComponents.Tree.eColorSchemePart.html">eColorSchemePart.None</a> to
+		/// specify explicit color to use through BackColor property.
+		/// </summary>
+        [DevCoSerialize(), Browsable(false), DefaultValue(eColorSchemePart.None)]
+		public eColorSchemePart BackColorSchemePart
+		{
+			get {return m_BackColorSchemePart;}
+			set
+			{
+				m_BackColorSchemePart=value;
+				this.OnStyleChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the target gradient background color for UI element.
+		/// </summary>
+        [DevCoSerialize(), Browsable(true), Category("Background"), Editor(typeof(ColorTypeEditor), typeof(System.Drawing.Design.UITypeEditor)), Description("Gets or sets the target gradient background color for UI element."), TypeConverter(typeof(ColorSchemeColorConverter))]
+		public Color BackColor2
+		{
+			get {return GetColor(m_BackColor2,m_BackColor2SchemePart);}
+			set
+			{
+				if(value!=this.BackColor2 && (m_BackColor2SchemePart!=eColorSchemePart.None && !value.IsEmpty || value.IsEmpty))
+					this.BackColor2SchemePart=eColorSchemePart.None;
+				m_BackColor2=value;
+				this.OnStyleChanged();
+			}
+		}
+		/// <summary>
+		/// Indicates whether BackgroundColor2 should be serialized. Used by windows forms designer design-time support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeBackColor2()
+		{return (!m_BackColor2.IsEmpty && m_BackColor2SchemePart==eColorSchemePart.None);}
+		/// <summary>
+		/// Resets BackgroundColor2 to it's default value. Used by windows forms designer design-time support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetBackColor2()
+		{
+			m_BackColor2=Color.Empty;
+		}
+
+		/// <summary>
+		/// Gets or sets the color scheme color that is used as target gradient background color. Setting
+		/// this property overrides the setting of the corresponding BackColor2 property.
+		/// Color scheme colors are automatically managed and are based on current system colors.
+		/// That means if colors on the system change the color scheme will ensure that it's colors
+		/// are changed as well to fit in the color scheme of target system. Set this property to
+		/// <a href="TreeGX~DevComponents.Tree.eColorSchemePart.html">eColorSchemePart.None</a> to
+		/// specify explicit color to use through BackColor2 property.
+		/// </summary>
+        [DevCoSerialize(), Browsable(false), DefaultValue(eColorSchemePart.None)]
+		public eColorSchemePart BackColor2SchemePart
+		{
+			get {return m_BackColor2SchemePart;}
+			set
+			{
+				m_BackColor2SchemePart=value;
+				this.OnStyleChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the background gradient angle.
+		/// </summary>
+        [DevCoSerialize(), Browsable(true), Category("Background"), DefaultValue(0), Description("Gets or sets the background gradient angle.")]
+		public int BackColorGradientAngle
+		{
+			get
+			{
+				return m_BackColorGradientAngle;
+			}
+			set
+			{
+				if(m_BackColorGradientAngle!=value)
+				{
+					m_BackColorGradientAngle=value;
+					this.OnStyleChanged();
+
+				}
+			}
+		}
+
+        /// <summary>
+        /// Gets or sets the background gradient fill type. Default value is Linear.
+        /// </summary>
+        [DevCoSerialize(), Browsable(true), Category("Background"), DefaultValue(eGradientType.Linear), Description("Indicates background gradient fill type.")]
+        public eGradientType BackColorGradientType
+        {
+            get { return m_BackColorGradientType; }
+            set
+            {
+                if (m_BackColorGradientType != value)
+                {
+                    m_BackColorGradientType = value;
+                    this.OnStyleChanged();
+                }
+            }
+        }
+
+		/// <summary>
+		/// Specifies background image.
+		/// </summary>
+        [DevCoSerialize(), Browsable(true), Category("Background"), DefaultValue(null), Description("Specifies background image."), DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
+		public Image BackgroundImage
+		{
+			get {return m_BackgroundImage;}
+			set
+			{
+				m_BackgroundImage=value;
+				this.OnStyleChanged();
+			}
+		}
+		/// <summary>
+		/// Resets BackgroundImage to it's default value null (VB Nothing). Used by windows forms designer design-time support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetBackgroundImage()
+		{
+			m_BackgroundImage=null;
+		}
+
+		/// <summary>
+		/// Specifies background image position when container is larger than image.
+		/// </summary>
+        [DevCoSerialize(), Browsable(true), Category("Background"), DefaultValue(eStyleBackgroundImage.Stretch), Description("Specifies background image position when container is larger than image.")]
+		public eStyleBackgroundImage BackgroundImagePosition
+		{
+			get {return m_BackgroundImagePosition;}
+			set
+			{
+				if(m_BackgroundImagePosition!=value)
+				{
+					m_BackgroundImagePosition=value;
+					this.OnStyleChanged();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Specifies the transparency of background image.
+		/// </summary>
+        [DevCoSerialize(), Browsable(true), Category("Background"), DefaultValue((byte)255), Description("Specifies the transparency of background image.")]
+		public byte BackgroundImageAlpha
+		{
+			get {return m_BackgroundImageAlpha;}
+			set
+			{
+				if(m_BackgroundImageAlpha!=value)
+				{
+					m_BackgroundImageAlpha=value;
+					this.OnStyleChanged();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the text color displayed in this UI element.
+		/// </summary>
+        [DevCoSerialize(), Browsable(true), Category("Text Properties"), Editor(typeof(ColorTypeEditor), typeof(System.Drawing.Design.UITypeEditor)), Description("Gets or sets the text color displayed in this UI element."), TypeConverter(typeof(ColorSchemeColorConverter))]
+		public Color TextColor
+		{
+			get {return GetColor(m_TextColor,m_TextColorSchemePart);}
+			set
+			{
+				if(value!=this.TextColor && (m_TextColorSchemePart!=eColorSchemePart.None && !value.IsEmpty || value.IsEmpty))
+					this.TextColorSchemePart=eColorSchemePart.None;
+				m_TextColor=value;
+				this.OnStyleChanged();
+			}
+		}
+		/// <summary>
+		/// Indicates whether TextColor should be serialized. Used by windows forms designer design-time support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeTextColor()
+		{return (!m_TextColor.IsEmpty && m_TextColorSchemePart==eColorSchemePart.None);}
+		/// <summary>
+		/// Resets TextColor to it's default value. Used by windows forms designer design-time support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetTextColor()
+		{
+			m_TextColor=Color.Empty;
+		}
+
+		/// <summary>
+		/// Gets or sets the color scheme color that is used as text color. Setting
+		/// this property overrides the setting of the corresponding TextColor property.
+		/// Color scheme colors are automatically managed and are based on current system colors.
+		/// That means if colors on the system change the color scheme will ensure that it's colors
+		/// are changed as well to fit in the color scheme of target system. Set this property to
+		/// <a href="TreeGX~DevComponents.Tree.eColorSchemePart.html">eColorSchemePart.None</a> to
+		/// specify explicit color to use through TextColor property.
+		/// </summary>
+        [DevCoSerialize(), Browsable(false), DefaultValue(eColorSchemePart.None)]
+		public eColorSchemePart TextColorSchemePart
+		{
+			get {return m_TextColorSchemePart;}
+			set
+			{
+				m_TextColorSchemePart=value;
+				this.OnStyleChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the text shadow color.
+		/// </summary>
+		[DevCoSerialize(), Browsable(true),Category("Text Properties"),Editor(typeof(ColorTypeEditor), typeof(System.Drawing.Design.UITypeEditor)),Description("Indicates text shadow color."),TypeConverter(typeof(ColorConverter))]
+		public Color TextShadowColor
+		{
+			get {return GetColor(m_TextShadowColor,m_TextShadowColorSchemePart);}
+			set
+			{
+				if(m_TextShadowColorSchemePart!=eColorSchemePart.None && !value.IsEmpty || value.IsEmpty)
+					this.TextShadowColorSchemePart=eColorSchemePart.None;
+				m_TextShadowColor=value;
+				this.OnStyleChanged();
+			}
+		}
+		/// <summary>
+		/// Indicates whether TextShadowColor should be serialized. Used by windows forms designer design-time support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeTextShadowColor()
+		{return (!m_TextShadowColor.IsEmpty && m_TextShadowColorSchemePart==eColorSchemePart.None);}
+		/// <summary>
+		/// Resets TextColor to it's default value. Used by windows forms designer design-time support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetTextShadowColor()
+		{
+			m_TextShadowColor=Color.Empty;
+		}
+
+		/// <summary>
+		/// Gets or sets the color scheme color that is used as text shadow color. Setting
+		/// this property overrides the setting of the corresponding TextShadowColor property.
+		/// Color scheme colors are automatically managed and are based on current system colors.
+		/// That means if colors on the system change the color scheme will ensure that it's colors
+		/// are changed as well to fit in the color scheme of target system. Set this property to
+		/// <a href="TreeGX~DevComponents.Tree.eColorSchemePart.html">eColorSchemePart.None</a> to
+		/// specify explicit color to use through TextColor property.
+		/// </summary>
+		[DevCoSerialize(), Browsable(false),DefaultValue(eColorSchemePart.None)]
+		public eColorSchemePart TextShadowColorSchemePart
+		{
+			get {return m_TextShadowColorSchemePart;}
+			set
+			{
+				m_TextShadowColorSchemePart=value;
+				this.OnStyleChanged();
+			}
+		}
+
+		/// <summary>
+		/// Indicates text shadow offset in pixels
+		/// </summary>
+		[DevCoSerialize(), Browsable(true),Category("Text Properties"),Description("Indicates text shadow offset in pixels.")]
+		public Point TextShadowOffset
+		{
+			get { return m_TextShadowOffset; }
+			set
+			{
+				m_TextShadowOffset=value;
+				OnStyleChanged();
+			}
+		}
+		/// <summary>
+		/// Indicates whether TextShadowOffset should be serialized. Used by windows forms designer design-time support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeTextShadowOffset()
+		{return (!m_TextShadowOffset.IsEmpty);}
+		/// <summary>
+		/// Resets TextShadowOffset to it's default value. Used by windows forms designer design-time support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetTextShadowOffset()
+		{
+			m_TextShadowOffset=Point.Empty;
+		}
+
+		/// <summary>
+		/// Gets or sets the Font used to draw this the text.
+		/// </summary>
+        [DevCoSerialize(), Browsable(true), Category("Text Properties"), DefaultValue(null), Description("Gets or sets the Font used to draw this the text.")]
+		public System.Drawing.Font Font
+		{
+			get
+			{
+				return m_Font;
+			}
+			set
+			{
+				m_Font=value;
+				this.OnStyleChanged();
+				this.OnSizePropertyChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets a value that determines whether text is displayed in multiple lines or one long line.
+		/// </summary>
+        [DevCoSerialize(), Browsable(true), Category("Text Formatting"), DefaultValue(false), Description("Gets or sets a value that determines whether text is displayed in multiple lines or one long line.")]
+		public bool WordWrap
+		{
+			get {return m_WordWrap;}
+			set
+			{
+				m_WordWrap=value;
+				this.OnStyleChanged();
+				this.OnSizePropertyChanged();
+			}
+		}
+
+		/// <summary>
+		/// Specifies alignment of the text.
+		/// </summary>
+        [DevCoSerialize(), Browsable(true), Category("Text Formatting"), DefaultValue(eStyleTextAlignment.Near), Description("Specifies alignment of the text.")]
+		public eStyleTextAlignment TextAlignment
+		{
+			get {return m_TextAlignment;}
+			set
+			{
+				m_TextAlignment=value;
+				this.OnStyleChanged();
+			}
+		}
+
+		/// <summary>
+		/// Specifies alignment of the text.
+		/// </summary>
+        [DevCoSerialize(), Browsable(true), Category("Text Formatting"), DefaultValue(eStyleTextAlignment.Center), Description("Specifies alignment of the text.")]
+		public eStyleTextAlignment TextLineAlignment
+		{
+			get {return m_TextLineAlignment;}
+			set
+			{
+				m_TextLineAlignment=value;
+				this.OnStyleChanged();
+			}
+		}
+
+		/// <summary>
+		/// Specifies how to trim characters when text does not fit.
+		/// </summary>
+        [DevCoSerialize(), Browsable(true), Category("Text Formatting"), DefaultValue(eStyleTextTrimming.EllipsisCharacter), Description("Specifies how to trim characters when text does not fit.")]
+		public eStyleTextTrimming TextTrimming
+		{
+			get {return m_TextTrimming;}
+			set
+			{
+				if(m_TextTrimming!=value)
+				{
+					m_TextTrimming=value;
+					this.OnStyleChanged();
+				}
+			}
+		}
+
+//		/// <summary>
+//		/// Gets or sets the text formatting options.
+//		/// </summary>
+//		[Browsable(true),Category("Text Formatting"),DefaultValue(""),Description("Gets or sets the text formatting options.")]
+//		public string TextFormat
+//		{
+//			get {return m_TextFormat;}
+//			set
+//			{
+//				m_TextFormat=value;
+//				this.OnStyleChanged();
+//			}
+//		}
+
+        /// <summary>
+        /// Gets the total horizontal margin (Left + Right)
+        /// </summary>
+        [Browsable(false)]
+        public int MarginHorizontal
+        {
+            get { return m_MarginLeft + m_MarginRight; }
+        }
+
+        /// <summary>
+        /// Gets the total vertical margin (Top + Bottom)
+        /// </summary>
+        [Browsable(false)]
+        public int MarginVertical
+        {
+            get { return m_MarginTop + m_MarginBottom; }
+        }
+
+
+		/// <summary>
+		/// Gets or sets the left margin.
+		/// </summary>
+        [DevCoSerialize(), Browsable(true), Category("Margins"), DefaultValue(0), Description("Specifies left margin.")]
+		public int MarginLeft
+		{
+			get {return m_MarginLeft;}
+			set 
+			{
+				m_MarginLeft=value;
+				this.OnStyleChanged();
+				this.OnSizePropertyChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the right margin.
+		/// </summary>
+        [DevCoSerialize(), Browsable(true), Category("Margins"), DefaultValue(0), Description("Specifies right margin.")]
+		public int MarginRight
+		{
+			get {return m_MarginRight;}
+			set 
+			{
+				m_MarginRight=value;
+				this.OnStyleChanged();
+				this.OnSizePropertyChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the top margin.
+		/// </summary>
+        [DevCoSerialize(), Browsable(true), Category("Margins"), DefaultValue(0), Description("Specifies top margin.")]
+		public int MarginTop
+		{
+			get {return m_MarginTop;}
+			set 
+			{
+				m_MarginTop=value;
+				this.OnStyleChanged();
+				this.OnSizePropertyChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the bottom margin.
+		/// </summary>
+        [DevCoSerialize(), Browsable(true), Category("Margins"), DefaultValue(0), Description("Specifies bottom margin.")]
+		public int MarginBottom
+		{
+			get {return m_MarginBottom;}
+			set 
+			{
+				m_MarginBottom=value;
+				this.OnStyleChanged();
+				this.OnSizePropertyChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets whether any style property has changed which could influence the size of the style.
+		/// </summary>
+		internal bool SizeChanged
+		{
+			get {return m_SizeChanged;}
+			set {m_SizeChanged=value;}
+		}
+
+		/// <summary>
+		/// Gets the calcuated size of the element style.
+		/// </summary>
+		[Browsable(false)]
+		public System.Drawing.Size Size
+		{
+			get {return m_Size;}
+		}
+		/// <summary>
+		/// Sets size of the element style.
+		/// </summary>
+		/// <param name="size">Indicates new size.</param>
+		internal void SetSize(Size size)
+		{
+			m_Size=size;
+		}
+
+		/// <summary>
+		/// Gets or sets the border type for all sides of the element.
+		/// </summary>
+		[DefaultValue(eStyleBorderType.None),Browsable(true),Category("Border"),DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden),Description("Indicates the border type for all sides of the element.")]
+		public eStyleBorderType Border
+		{
+			get {return m_BorderTop;}
+			set
+			{
+                if (this.DesignMode)
+                {
+                    TypeDescriptor.GetProperties(this)["BorderLeft"].SetValue(this, value);
+                    TypeDescriptor.GetProperties(this)["BorderRight"].SetValue(this, value);
+                    TypeDescriptor.GetProperties(this)["BorderTop"].SetValue(this, value);
+                    TypeDescriptor.GetProperties(this)["BorderBottom"].SetValue(this, value);
+                }
+                else
+                {
+                    this.BorderLeft = value;
+                    this.BorderRight = value;
+                    this.BorderTop = value;
+                    this.BorderBottom = value;
+                }
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets border width in pixels.
+		/// </summary>
+		[Browsable(true),DefaultValue(0),DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden),Category("Border"),Description("Indicates border width in pixels.")]
+		public int BorderWidth
+		{
+			get {return m_BorderTopWidth;}
+			set
+			{
+                if (this.DesignMode)
+                {
+                    TypeDescriptor.GetProperties(this)["BorderLeftWidth"].SetValue(this, value);
+                    TypeDescriptor.GetProperties(this)["BorderRightWidth"].SetValue(this, value);
+                    TypeDescriptor.GetProperties(this)["BorderTopWidth"].SetValue(this, value);
+                    TypeDescriptor.GetProperties(this)["BorderBottomWidth"].SetValue(this, value);
+                }
+                else
+                {
+                    this.BorderLeftWidth = value;
+                    this.BorderRightWidth = value;
+                    this.BorderTopWidth = value;
+                    this.BorderBottomWidth = value;
+                }
+				this.OnStyleChanged();
+				this.OnSizePropertyChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the border type for top side of the element.
+		/// </summary>
+        [DevCoSerialize(), DefaultValue(eStyleBorderType.None), Browsable(true), Category("Border"), Description("Indicates the border type for top side of the element.")]
+		public eStyleBorderType BorderTop
+		{
+			get {return m_BorderTop;}
+			set
+			{
+				if(m_BorderTop!=value)
+				{
+					m_BorderTop=value;
+					this.OnStyleChanged();
+					this.OnSizePropertyChanged();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the border type for bottom side of the element.
+		/// </summary>
+        [DevCoSerialize(), DefaultValue(eStyleBorderType.None), Browsable(true), Category("Border"), Description("Indicates the border type for bottom side of the element.")]
+		public eStyleBorderType BorderBottom
+		{
+			get {return m_BorderBottom;}
+			set
+			{
+				if(m_BorderBottom!=value)
+				{
+					m_BorderBottom=value;
+					this.OnStyleChanged();
+					this.OnSizePropertyChanged();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the border type for left side of the element.
+		/// </summary>
+        [DevCoSerialize(), DefaultValue(eStyleBorderType.None), Browsable(true), Category("Border"), Description("Indicates the border type for left side of the element.")]
+		public eStyleBorderType BorderLeft
+		{
+			get {return m_BorderLeft;}
+			set
+			{
+				if(m_BorderLeft!=value)
+				{
+					m_BorderLeft=value;
+					this.OnStyleChanged();
+					this.OnSizePropertyChanged();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the border type for right side of the element.
+		/// </summary>
+        [DevCoSerialize(), DefaultValue(eStyleBorderType.None), Browsable(true), Category("Border"), Description("Indicates the border type for right side of the element.")]
+		public eStyleBorderType BorderRight
+		{
+			get {return m_BorderRight;}
+			set
+			{
+				if(m_BorderRight!=value)
+				{
+					m_BorderRight=value;
+					this.OnStyleChanged();
+					this.OnSizePropertyChanged();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets border width in pixels.
+		/// </summary>
+        [DevCoSerialize(), Browsable(true), DefaultValue(0), Category("Border"), Description("Indicates border width in pixels.")]
+		public int BorderTopWidth
+		{
+			get {return m_BorderTopWidth;}
+			set
+			{
+				if(m_BorderTopWidth!=value)
+				{
+					m_BorderTopWidth=value;
+					this.OnStyleChanged();
+					this.OnSizePropertyChanged();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets border width in pixels.
+		/// </summary>
+        [DevCoSerialize(), Browsable(true), DefaultValue(0), Category("Border"), Description("Indicates border width in pixels.")]
+		public int BorderBottomWidth
+		{
+			get {return m_BorderBottomWidth;}
+			set
+			{
+				if(m_BorderBottomWidth!=value)
+				{
+					m_BorderBottomWidth=value;
+					this.OnStyleChanged();
+					this.OnSizePropertyChanged();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets border width in pixels.
+		/// </summary>
+        [DevCoSerialize(), Browsable(true), DefaultValue(0), Category("Border"), Description("Indicates border width in pixels.")]
+		public int BorderLeftWidth
+		{
+			get {return m_BorderLeftWidth;}
+			set
+			{
+				if(m_BorderLeftWidth!=value)
+				{
+					m_BorderLeftWidth=value;
+					this.OnStyleChanged();
+					this.OnSizePropertyChanged();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets border width in pixels.
+		/// </summary>
+        [DevCoSerialize(), Browsable(true), DefaultValue(0), Category("Border"), Description("Indicates border width in pixels.")]
+		public int BorderRightWidth
+		{
+			get {return m_BorderRightWidth;}
+			set
+			{
+				if(m_BorderRightWidth!=value)
+				{
+					m_BorderRightWidth=value;
+					this.OnStyleChanged();
+					this.OnSizePropertyChanged();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the border color for all sides. Specifing the color for the side will override this value.
+		/// </summary>
+        [DevCoSerialize(), Browsable(true), Category("Border"), Editor(typeof(ColorTypeEditor), typeof(System.Drawing.Design.UITypeEditor)), Description("Indicates border color for all sides. Specifing the color for the side will override this value."), TypeConverter(typeof(ColorSchemeColorConverter))]
+		public Color BorderColor
+		{
+			get {return GetColor(m_BorderColor,m_BorderColorSchemePart);}
+			set
+			{
+				if(value!=this.BorderColor && (m_BorderColorSchemePart!=eColorSchemePart.None && !value.IsEmpty || value.IsEmpty))
+					this.BorderColorSchemePart=eColorSchemePart.None;
+				m_BorderColor=value;
+				this.OnStyleChanged();
+			}
+		}
+		/// <summary>
+		/// Indicates whether BorderColor should be serialized. Used by windows forms designer design-time support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeBorderColor()
+		{return (!m_BorderColor.IsEmpty && m_BorderColorSchemePart==eColorSchemePart.None);}
+		/// <summary>
+		/// Resets BorderColor to it's default value. Used by windows forms designer design-time support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetBorderColor()
+		{
+			m_BorderColor=Color.Empty;
+		}
+
+		/// <summary>
+		/// Gets or sets the color scheme color that is used as border color. Setting
+		/// this property overrides the setting of the corresponding BorderColor property.
+		/// Color scheme colors are automatically managed and are based on current system colors.
+		/// That means if colors on the system change the color scheme will ensure that it's colors
+		/// are changed as well to fit in the color scheme of target system. Set this property to
+		/// <a href="TreeGX~DevComponents.Tree.eColorSchemePart.html">eColorSchemePart.None</a> to
+		/// specify explicit color to use through BorderColor property.
+		/// </summary>
+        [DevCoSerialize(), Browsable(false), DefaultValue(eColorSchemePart.None)]
+		public eColorSchemePart BorderColorSchemePart
+		{
+			get {return m_BorderColorSchemePart;}
+			set
+			{
+				m_BorderColorSchemePart=value;
+				this.OnStyleChanged();
+			}
+		}
+
+        /// <summary>
+        /// Gets or sets the target background gradient color for border on all sides. Specifing the color for the side will override this value. Gradient border colors
+        /// be employed only when per side border color is not specified.
+        /// </summary>
+        [DevCoSerialize(), Browsable(true), Category("Border"), Editor(typeof(ColorTypeEditor), typeof(System.Drawing.Design.UITypeEditor)), Description("Indicates target background gradient color for border on all sides. "), TypeConverter(typeof(ColorSchemeColorConverter))]
+        public Color BorderColor2
+        {
+            get { return GetColor(m_BorderColor2, m_BorderColor2SchemePart); }
+            set
+            {
+                if (value != this.BorderColor2 && (m_BorderColor2SchemePart != eColorSchemePart.None && !value.IsEmpty || value.IsEmpty))
+                    this.BorderColor2SchemePart = eColorSchemePart.None;
+                m_BorderColor2 = value;
+                this.OnStyleChanged();
+            }
+        }
+        /// <summary>
+        /// Indicates whether BorderColor3 should be serialized. Used by windows forms designer design-time support.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeBorderColor2()
+        { return (!m_BorderColor2.IsEmpty && m_BorderColor2SchemePart == eColorSchemePart.None); }
+        /// <summary>
+        /// Resets BorderColor to it's default value. Used by windows forms designer design-time support.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetBorderColor2()
+        {
+            m_BorderColor2 = Color.Empty;
+        }
+
+        /// <summary>
+        /// Gets or sets the color scheme color that is used as taget gradient border color. Setting
+        /// this property overrides the setting of the corresponding BorderColor property.
+        /// Color scheme colors are automatically managed and are based on current system colors.
+        /// That means if colors on the system change the color scheme will ensure that it's colors
+        /// are changed as well to fit in the color scheme of target system. Set this property to
+        /// <a href="TreeGX~DevComponents.Tree.eColorSchemePart.html">eColorSchemePart.None</a> to
+        /// specify explicit color to use through BorderColor property.
+        /// </summary>
+        [DevCoSerialize(), Browsable(false), DefaultValue(eColorSchemePart.None)]
+        public eColorSchemePart BorderColor2SchemePart
+        {
+            get { return m_BorderColor2SchemePart; }
+            set
+            {
+                m_BorderColor2SchemePart = value;
+                this.OnStyleChanged();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the border gradient angle. Default value is 90.
+        /// </summary>
+        [DevCoSerialize(), Browsable(true), Category("Background"), DefaultValue(90), Description("Gets or sets the border gradient angle.")]
+        public int BorderGradientAngle
+        {
+            get
+            {
+                return m_BorderGradientAngle;
+            }
+            set
+            {
+                if (m_BorderGradientAngle != value)
+                {
+                    m_BorderGradientAngle = value;
+                    this.OnStyleChanged();
+
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the color for light border part when etched border is used.
+        /// </summary>
+        [DevCoSerialize(), Browsable(true), Category("Border"), Editor(typeof(ColorTypeEditor), typeof(System.Drawing.Design.UITypeEditor)), Description("Indicates color for light border part when etched border is used."), TypeConverter(typeof(ColorSchemeColorConverter))]
+        public Color BorderColorLight
+        {
+            get { return GetColor(m_BorderColorLight, m_BorderColorLightSchemePart); }
+            set
+            {
+                if (value != this.BorderColorLight && (m_BorderColorLightSchemePart != eColorSchemePart.None && !value.IsEmpty || value.IsEmpty))
+                    this.BorderColorLightSchemePart = eColorSchemePart.None;
+                m_BorderColorLight = value;
+                this.OnStyleChanged();
+            }
+        }
+        /// <summary>
+        /// Indicates whether BorderColorLight should be serialized. Used by windows forms designer design-time support.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeBorderColorLight()
+        { return (!m_BorderColorLight.IsEmpty && m_BorderColorLightSchemePart == eColorSchemePart.None); }
+        /// <summary>
+        /// Resets BorderColor to it's default value. Used by windows forms designer design-time support.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetBorderColorLight()
+        {
+            m_BorderColorLight = Color.Empty;
+        }
+
+        /// <summary>
+        /// Gets or sets the color scheme color that is used as border light color for etched border style. Setting
+        /// this property overrides the setting of the corresponding BorderColor property.
+        /// Color scheme colors are automatically managed and are based on current system colors.
+        /// That means if colors on the system change the color scheme will ensure that it's colors
+        /// are changed as well to fit in the color scheme of target system. Set this property to
+        /// <a href="TreeGX~DevComponents.Tree.eColorSchemePart.html">eColorSchemePart.None</a> to
+        /// specify explicit color to use through BorderColor property.
+        /// </summary>
+        [DevCoSerialize(), Browsable(false), DefaultValue(eColorSchemePart.None)]
+        public eColorSchemePart BorderColorLightSchemePart
+        {
+            get { return m_BorderColorLightSchemePart; }
+            set
+            {
+                m_BorderColorLightSchemePart = value;
+                this.OnStyleChanged();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the target background gradient color for border on all sides. Specifing the color for the side will override this value. Gradient border colors
+        /// be employed only when per side border color is not specified.
+        /// </summary>
+        [DevCoSerialize(), Browsable(true), Category("Border"), Editor(typeof(ColorTypeEditor), typeof(System.Drawing.Design.UITypeEditor)), Description("Indicates target background gradient color for border on all sides. "), TypeConverter(typeof(ColorSchemeColorConverter))]
+        public Color BorderColorLight2
+        {
+            get { return GetColor(m_BorderColorLight2, m_BorderColorLight2SchemePart); }
+            set
+            {
+                if (value != this.BorderColorLight2 && (m_BorderColorLight2SchemePart != eColorSchemePart.None && !value.IsEmpty || value.IsEmpty))
+                    this.BorderColorLight2SchemePart = eColorSchemePart.None;
+                m_BorderColorLight2 = value;
+                this.OnStyleChanged();
+            }
+        }
+        /// <summary>
+        /// Indicates whether BorderColor2 should be serialized. Used by windows forms designer design-time support.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool ShouldSerializeBorderColorLight2()
+        { return (!m_BorderColorLight2.IsEmpty && m_BorderColorLight2SchemePart == eColorSchemePart.None); }
+        /// <summary>
+        /// Resets BorderColorLight2 to it's default value. Used by windows forms designer design-time support.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        private void ResetBorderColorLight2()
+        {
+            m_BorderColorLight2 = Color.Empty;
+        }
+
+        /// <summary>
+        /// Gets or sets the color scheme color that is used as taget gradient border light color for etched border style. Setting
+        /// this property overrides the setting of the corresponding BorderColor property.
+        /// Color scheme colors are automatically managed and are based on current system colors.
+        /// That means if colors on the system change the color scheme will ensure that it's colors
+        /// are changed as well to fit in the color scheme of target system. Set this property to
+        /// <a href="TreeGX~DevComponents.Tree.eColorSchemePart.html">eColorSchemePart.None</a> to
+        /// specify explicit color to use through BorderColor property.
+        /// </summary>
+        [DevCoSerialize(), Browsable(false), DefaultValue(eColorSchemePart.None)]
+        public eColorSchemePart BorderColorLight2SchemePart
+        {
+            get { return m_BorderColorLight2SchemePart; }
+            set
+            {
+                m_BorderColorLight2SchemePart = value;
+                this.OnStyleChanged();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the light border gradient angle. Default value is 90.
+        /// </summary>
+        [DevCoSerialize(), Browsable(true), Category("Background"), DefaultValue(90), Description("Gets or sets the border gradient angle.")]
+        public int BorderLightGradientAngle
+        {
+            get
+            {
+                return m_BorderLightGradientAngle;
+            }
+            set
+            {
+                if (m_BorderLightGradientAngle != value)
+                {
+                    m_BorderLightGradientAngle = value;
+                    this.OnStyleChanged();
+
+                }
+            }
+        }
+
+		/// <summary>
+		/// Gets or sets the background color for the left side border.
+		/// </summary>
+        [DevCoSerialize(), Browsable(true), Category("Border"), Editor(typeof(ColorTypeEditor), typeof(System.Drawing.Design.UITypeEditor)), Description("Indicates background color for the left side border."), TypeConverter(typeof(ColorSchemeColorConverter))]
+		public Color BorderLeftColor
+		{
+			get {return GetColor(m_BorderLeftColor,m_BorderLeftColorSchemePart);}
+			set
+			{
+				if(value!=this.BorderLeftColor && (m_BorderLeftColorSchemePart!=eColorSchemePart.None && !value.IsEmpty || value.IsEmpty))
+					this.BorderLeftColorSchemePart=eColorSchemePart.None;
+				m_BorderLeftColor=value;
+				this.OnStyleChanged();
+			}
+		}
+		/// <summary>
+		/// Indicates whether property should be serialized. Used by windows forms designer design-time support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeBorderLeftColor()
+		{return (!m_BorderLeftColor.IsEmpty && m_BorderLeftColorSchemePart==eColorSchemePart.None);}
+		/// <summary>
+		/// Resets property to it's default value. Used by windows forms designer design-time support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetBorderLeftColor()
+		{
+			m_BorderLeftColor=Color.Empty;
+		}
+
+		/// <summary>
+		/// Gets or sets the color scheme color that is used as left border color. Setting
+		/// this property overrides the setting of the corresponding BorderLeftColor property.
+		/// Color scheme colors are automatically managed and are based on current system colors.
+		/// That means if colors on the system change the color scheme will ensure that it's colors
+		/// are changed as well to fit in the color scheme of target system. Set this property to
+		/// <a href="TreeGX~DevComponents.Tree.eColorSchemePart.html">eColorSchemePart.None</a> to
+		/// specify explicit color to use through BorderLeftColor property.
+		/// </summary>
+        [DevCoSerialize(), Browsable(false), DefaultValue(eColorSchemePart.None)]
+		public eColorSchemePart BorderLeftColorSchemePart
+		{
+			get {return m_BorderLeftColorSchemePart;}
+			set
+			{
+				m_BorderLeftColorSchemePart=value;
+				this.OnStyleChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the background color for the right side border.
+		/// </summary>
+        [DevCoSerialize(), Browsable(true), Category("Border"), Editor(typeof(ColorTypeEditor), typeof(System.Drawing.Design.UITypeEditor)), Description("Indicates background color for the right side border."), TypeConverter(typeof(ColorSchemeColorConverter))]
+		public Color BorderRightColor
+		{
+			get {return GetColor(m_BorderRightColor,m_BorderRightColorSchemePart);}
+			set
+			{
+				if(value!=this.BorderRightColor && (m_BorderRightColorSchemePart!=eColorSchemePart.None && !value.IsEmpty || value.IsEmpty))
+					this.BorderRightColorSchemePart=eColorSchemePart.None;
+				m_BorderRightColor=value;
+				this.OnStyleChanged();
+			}
+		}
+		/// <summary>
+		/// Indicates whether property should be serialized. Used by windows forms designer design-time support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeBorderRightColor()
+		{return (!m_BorderRightColor.IsEmpty && m_BorderRightColorSchemePart==eColorSchemePart.None);}
+		/// <summary>
+		/// Resets property to it's default value. Used by windows forms designer design-time support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetBorderRightColor()
+		{
+			m_BorderRightColor=Color.Empty;
+		}
+
+		/// <summary>
+		/// Gets or sets the color scheme color that is used as right border color. Setting
+		/// this property overrides the setting of the corresponding BorderRightColor property.
+		/// Color scheme colors are automatically managed and are based on current system colors.
+		/// That means if colors on the system change the color scheme will ensure that it's colors
+		/// are changed as well to fit in the color scheme of target system. Set this property to
+		/// <a href="TreeGX~DevComponents.Tree.eColorSchemePart.html">eColorSchemePart.None</a> to
+		/// specify explicit color to use through BorderRightColor property.
+		/// </summary>
+        [DevCoSerialize(), Browsable(false), DefaultValue(eColorSchemePart.None)]
+		public eColorSchemePart BorderRightColorSchemePart
+		{
+			get {return m_BorderRightColorSchemePart;}
+			set
+			{
+				m_BorderRightColorSchemePart=value;
+				this.OnStyleChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the background color for the top side border.
+		/// </summary>
+        [DevCoSerialize(), Browsable(true), Category("Border"), Editor(typeof(ColorTypeEditor), typeof(System.Drawing.Design.UITypeEditor)), Description("Indicates background color for the top side border."), TypeConverter(typeof(ColorSchemeColorConverter))]
+		public Color BorderTopColor
+		{
+			get {return GetColor(m_BorderTopColor,m_BorderTopColorSchemePart);}
+			set
+			{
+				if(value!=this.BorderTopColor && (m_BorderTopColorSchemePart!=eColorSchemePart.None && !value.IsEmpty || value.IsEmpty))
+					this.BorderTopColorSchemePart=eColorSchemePart.None;
+				m_BorderTopColor=value;
+				this.OnStyleChanged();
+			}
+		}
+		/// <summary>
+		/// Indicates whether property should be serialized. Used by windows forms designer design-time support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeBorderTopColor()
+		{return (!m_BorderTopColor.IsEmpty && m_BorderTopColorSchemePart==eColorSchemePart.None);}
+		/// <summary>
+		/// Resets property to it's default value. Used by windows forms designer design-time support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetBorderTopColor()
+		{
+			m_BorderTopColor=Color.Empty;
+		}
+
+		/// <summary>
+		/// Gets or sets the color scheme color that is used as top border color. Setting
+		/// this property overrides the setting of the corresponding BorderTopColor property.
+		/// Color scheme colors are automatically managed and are based on current system colors.
+		/// That means if colors on the system change the color scheme will ensure that it's colors
+		/// are changed as well to fit in the color scheme of target system. Set this property to
+		/// <a href="TreeGX~DevComponents.Tree.eColorSchemePart.html">eColorSchemePart.None</a> to
+		/// specify explicit color to use through BorderTopColor property.
+		/// </summary>
+        [DevCoSerialize(), Browsable(false), DefaultValue(eColorSchemePart.None)]
+		public eColorSchemePart BorderTopColorSchemePart
+		{
+			get {return m_BorderTopColorSchemePart;}
+			set
+			{
+				m_BorderTopColorSchemePart=value;
+				this.OnStyleChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the background color for the bottom side border.
+		/// </summary>
+        [DevCoSerialize(), Browsable(true), Category("Border"), Editor(typeof(ColorTypeEditor), typeof(System.Drawing.Design.UITypeEditor)), Description("Indicates background color for the bottom side border."), TypeConverter(typeof(ColorSchemeColorConverter))]
+		public Color BorderBottomColor
+		{
+			get {return GetColor(m_BorderBottomColor,m_BorderBottomColorSchemePart);}
+			set
+			{
+				if(value!=this.BorderBottomColor && (m_BorderBottomColorSchemePart!=eColorSchemePart.None && !value.IsEmpty || value.IsEmpty))
+					this.BorderBottomColorSchemePart=eColorSchemePart.None;
+				m_BorderBottomColor=value;
+				this.OnStyleChanged();
+			}
+		}
+		/// <summary>
+		/// Indicates whether property should be serialized. Used by windows forms designer design-time support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeBorderBottomColor()
+		{return (!m_BorderBottomColor.IsEmpty && m_BorderBottomColorSchemePart==eColorSchemePart.None);}
+		/// <summary>
+		/// Resets property to it's default value. Used by windows forms designer design-time support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetBorderBottomColor()
+		{
+			m_BorderBottomColor=Color.Empty;
+		}
+
+		/// <summary>
+		/// Gets or sets the color scheme color that is used as bottom border color. Setting
+		/// this property overrides the setting of the corresponding BorderBottomColor property.
+		/// Color scheme colors are automatically managed and are based on current system colors.
+		/// That means if colors on the system change the color scheme will ensure that it's colors
+		/// are changed as well to fit in the color scheme of target system. Set this property to
+		/// <a href="TreeGX~DevComponents.Tree.eColorSchemePart.html">eColorSchemePart.None</a> to
+		/// specify explicit color to use through BorderBottomColor property.
+		/// </summary>
+        [DevCoSerialize(), Browsable(false), DefaultValue(eColorSchemePart.None)]
+		public eColorSchemePart BorderBottomColorSchemePart
+		{
+			get {return m_BorderBottomColorSchemePart;}
+			set
+			{
+				m_BorderBottomColorSchemePart=value;
+				this.OnStyleChanged();
+			}
+		}
+
+        /// <summary>
+        /// Gets the total horizontal padding (Left + Right)
+        /// </summary>
+        [Browsable(false)]
+        public int PaddingHorizontal
+        {
+            get { return m_PaddingLeft + m_PaddingRight; }
+        }
+
+        /// <summary>
+        /// Gets the total vertical padding (Top + Bottom)
+        /// </summary>
+        [Browsable(false)]
+        public int PaddingVertical
+        {
+            get { return m_PaddingTop + m_PaddingBottom; }
+        }
+
+		/// <summary>
+		/// Gets or sets the amount of space to insert between the top border of the element and the content. 
+		/// </summary>
+        [DevCoSerialize(), Browsable(true), Category("Padding"), DefaultValue(0), Description("Indicates the amount of space to insert between the top border of the element and the content.")]
+		public int PaddingTop
+		{
+			get {return m_PaddingTop;}
+			set 
+			{
+				m_PaddingTop=value;
+				this.OnStyleChanged();
+				this.OnSizePropertyChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the amount of space to insert between the bottom border of the element and the content. 
+		/// </summary>
+        [DevCoSerialize(), Browsable(true), Category("Padding"), DefaultValue(0), Description("Indicates the amount of space to insert between the bottom border of the element and the content.")]
+		public int PaddingBottom
+		{
+			get {return m_PaddingBottom;}
+			set 
+			{
+				m_PaddingBottom=value;
+				this.OnStyleChanged();
+				this.OnSizePropertyChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the amount of space to insert between the left border of the element and the content. 
+		/// </summary>
+        [DevCoSerialize(), Browsable(true), Category("Padding"), DefaultValue(0), Description("Indicates the amount of space to insert between the left border of the element and the content.")]
+		public int PaddingLeft
+		{
+			get {return m_PaddingLeft;}
+			set 
+			{
+				m_PaddingLeft=value;
+				this.OnStyleChanged();
+				this.OnSizePropertyChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the amount of space to insert between the right border of the element and the content. 
+		/// </summary>
+        [DevCoSerialize(), Browsable(true), Category("Padding"), DefaultValue(0), Description("Indicates the amount of space to insert between the right border of the element and the content.")]
+		public int PaddingRight
+		{
+			get {return m_PaddingRight;}
+			set 
+			{
+				m_PaddingRight=value;
+				this.OnStyleChanged();
+				this.OnSizePropertyChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the name of the style.
+		/// </summary>
+        [DevCoSerialize(), Browsable(true), DefaultValue(""), Category("Design"), Description("Indicates name of the style.")]
+		public string Name
+		{
+			get
+			{
+				if(m_ComponentSite!=null)
+					m_Name=m_ComponentSite.Name;
+				return m_Name;
+			}
+			set
+			{
+				if(m_ComponentSite!=null)
+					m_ComponentSite.Name=value;
+				if(value==null)
+					m_Name="";
+				else
+					m_Name=value;
+			}
+		}
+
+        /// <summary>
+        /// Gets or sets the class style belongs to. The Class styles are used to apply predefined values to the styles that belong to the same class.
+        /// This feature is used to manage color schemes/tables per class style.
+        /// </summary>
+        [DevCoSerialize(), Browsable(true), DefaultValue(""), Category("Design"), Description("Indicates the class style belongs to.")]
+        public string Class
+        {
+            get { return m_Class; }
+            set
+            {
+                if (value == null)
+                    throw new NullReferenceException("null is not valid value for this property");
+
+                m_Class = value;
+            }
+        }
+		
+		/// <summary>
+		/// Gets or sets the description of the style.
+		/// </summary>
+		[DevCoSerialize(), Browsable(true), DefaultValue(""), Category("Design"), Description("Indicates description of the style.")]
+		public string Description
+		{
+			get
+			{
+				return m_Description;
+			}
+			set
+			{
+				m_Description=value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the Site associated with this component. Used by Windows forms designer.
+		/// </summary>
+		[System.ComponentModel.Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public virtual System.ComponentModel.ISite Site
+		{
+			get
+			{
+				return m_ComponentSite;
+			}
+			set
+			{
+				m_ComponentSite = value;
+			}
+		}
+
+
+		/// <summary>
+		/// Gets or sets the maximum height of the element. This property should be used in
+		/// conjunction with the <see cref="WordWrap">WordWrap</see> property to limit the size of
+		/// text bounding box.
+		/// </summary>
+		/// <remarks>Default value is 0 which indicates that height of the style is unlimited.</remarks>
+        [DevCoSerialize(), Browsable(true), Category("Text Formatting"), DefaultValue(0), Description("Indicates the maximum height of the element. This property should be used in conjunction with the WordWrap property to limit the size of text bounding box.")]
+		public int MaximumHeight
+		{
+			get {return m_MaximumHeight;}
+			set
+			{
+				if(m_MaximumHeight!=value)
+				{
+					m_MaximumHeight=value;
+					this.OnStyleChanged();
+					this.OnSizePropertyChanged();
+				}
+			}
+		}
+#if TREEGX
+		/// <summary>
+		/// Gets or sets the maximum width of the element. This property should be used in
+		/// conjunction with the <see cref="WordWrap">WordWrap</see> property to limit the size of
+		/// text bounding box.
+		/// </summary>
+		/// <remarks>Default value is 0 which indicates that width of the style is not limited.</remarks>
+		[DevCoSerialize(), Browsable(true), Category("Text Formatting"), DefaultValue(0), Description("Indicates the maximum width of the element. This property should be used in conjunction with the WordWrap property to limit the size of text bounding box.")]
+		public int MaximumWidth
+		{
+			get {return m_MaximumWidth;}
+			set
+			{
+				if(m_MaximumWidth!=value)
+				{
+					m_MaximumWidth=value;
+					this.OnStyleChanged();
+					this.OnSizePropertyChanged();
+				}
+			}
+		}
+#endif
+
+		/// <summary>
+		/// Returns System.Drawing.StringFormat constructed from current style settings.
+		/// </summary>
+		internal System.Drawing.StringFormat StringFormat
+		{
+			get
+			{
+				System.Drawing.StringFormat format=new System.Drawing.StringFormat(System.Drawing.StringFormat.GenericDefault);
+				format.Alignment=(StringAlignment)m_TextAlignment;
+				format.LineAlignment=(StringAlignment)m_TextLineAlignment;
+				format.Trimming=(StringTrimming)m_TextTrimming;
+				if(m_WordWrap)
+					format.FormatFlags=format.FormatFlags & ~(format.FormatFlags & StringFormatFlags.NoWrap);
+				else
+					format.FormatFlags=format.FormatFlags | StringFormatFlags.NoWrap;
+				return format;
+			}
+		}
+
+        /// <summary>
+        /// Returns eTextFormat constructed from current style settings.
+        /// </summary>
+        internal eTextFormat TextFormat
+        {
+            get
+            {
+                eTextFormat format = eTextFormat.Default;
+                if (m_TextAlignment == eStyleTextAlignment.Center)
+                    format |= eTextFormat.HorizontalCenter;
+                else if (m_TextAlignment == eStyleTextAlignment.Far)
+                    format |= eTextFormat.Right;
+
+                if (m_TextLineAlignment == eStyleTextAlignment.Center)
+                    format |= eTextFormat.VerticalCenter;
+                else if (m_TextLineAlignment == eStyleTextAlignment.Far)
+                    format |= eTextFormat.Bottom;
+
+                if (m_WordWrap)
+                    format |= eTextFormat.WordBreak;
+                else
+                    format |= eTextFormat.SingleLine;
+
+                if (m_TextTrimming != eStyleTextTrimming.None)
+                    format |= eTextFormat.EndEllipsis;
+                format |= eTextFormat.HidePrefix;
+
+                return format;
+            }
+        }
+
+		/// <summary>
+		/// Gets or sets the border corner type for all 4 sides. Default corner type is Square.
+		/// </summary>
+        [DevCoSerialize(), DefaultValue(eCornerType.Square), Browsable(true), Category("Border"), Description("Indicates border corner type.")]
+		public eCornerType CornerType
+		{
+			get {return m_CornerType;}
+			set
+			{
+				if(m_CornerType!=value)
+				{
+					m_CornerType=value;
+					if(m_CornerType==eCornerType.Inherit)
+						m_CornerType=eCornerType.Square;
+					this.OnStyleChanged();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the border corner type for top left corner. Default value is Inherit which means that setting from CornerType property is used.
+		/// </summary>
+        [DevCoSerialize(), DefaultValue(eCornerType.Inherit), Browsable(true), Category("Border"), Description("Indicates top left border corner type.")]
+		public eCornerType CornerTypeTopLeft
+		{
+			get {return m_CornerTypeTopLeft;}
+			set
+			{
+				if(m_CornerTypeTopLeft!=value)
+				{
+					m_CornerTypeTopLeft=value;
+					this.OnStyleChanged();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the border corner type for top right corner. Default value is Inherit which means that setting from CornerType property is used.
+		/// </summary>
+        [DevCoSerialize(), DefaultValue(eCornerType.Inherit), Browsable(true), Category("Border"), Description("Indicates top right border corner type.")]
+		public eCornerType CornerTypeTopRight
+		{
+			get {return m_CornerTypeTopRight;}
+			set
+			{
+				if(m_CornerTypeTopRight!=value)
+				{
+					m_CornerTypeTopRight=value;
+					this.OnStyleChanged();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the border corner type for bottom left corner. Default value is Inherit which means that setting from CornerType property is used.
+		/// </summary>
+        [DevCoSerialize(), DefaultValue(eCornerType.Inherit), Browsable(true), Category("Border"), Description("Indicates bottom left border corner type.")]
+		public eCornerType CornerTypeBottomLeft
+		{
+			get {return m_CornerTypeBottomLeft;}
+			set
+			{
+				if(m_CornerTypeBottomLeft!=value)
+				{
+					m_CornerTypeBottomLeft=value;
+					this.OnStyleChanged();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the border corner type for bottom right corner. Default value is Inherit which means that setting from CornerType property is used.
+		/// </summary>
+        [DevCoSerialize(), DefaultValue(eCornerType.Inherit), Browsable(true), Category("Border"), Description("Indicates bottom right border corner type.")]
+		public eCornerType CornerTypeBottomRight
+		{
+			get {return m_CornerTypeBottomRight;}
+			set
+			{
+				if(m_CornerTypeBottomRight!=value)
+				{
+					m_CornerTypeBottomRight=value;
+					this.OnStyleChanged();
+				}
+			}
+		}
+
+
+		/// <summary>
+		/// Gets or sets the diameter in pixels of the corner type rounded or diagonal.
+		/// </summary>
+        [DevCoSerialize(), Browsable(true), Category("Border"), DefaultValue(DEFAULT_CORNER_DIAMETER), Description("Indicates diameter in pixels of the corner type rounded or diagonal.")]
+		public int CornerDiameter
+		{
+			get {return m_CornerDiameter;}
+			set
+			{
+				if(m_CornerDiameter!=value)
+				{
+					m_CornerDiameter=value;
+					OnStyleChanged();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets whether to paint left border for the style.
+		/// </summary>
+		internal bool PaintLeftBorder
+		{
+			get
+			{
+				if(this.BorderLeft!=eStyleBorderType.None && this.BorderLeftWidth>0 && 
+					(!this.BorderColor.IsEmpty || !this.BorderLeftColor.IsEmpty))
+					return true;
+				return false;
+			}
+		}
+
+		/// <summary>
+		/// Gets whether to paint right border for the style.
+		/// </summary>
+		internal bool PaintRightBorder
+		{
+			get
+			{
+				if(this.BorderRight!=eStyleBorderType.None && this.BorderRightWidth>0 && 
+					(!this.BorderColor.IsEmpty || !this.BorderRightColor.IsEmpty))
+					return true;
+				return false;
+			}
+		}
+
+		/// <summary>
+		/// Gets whether to paint top border for the style.
+		/// </summary>
+		internal bool PaintTopBorder
+		{
+			get
+			{
+				if(this.BorderTop!=eStyleBorderType.None && this.BorderTopWidth>0 && 
+					(!this.BorderColor.IsEmpty || !this.BorderTopColor.IsEmpty))
+					return true;
+				return false;
+			}
+		}
+
+		/// <summary>
+		/// Gets whether to paint bottom border for the style.
+		/// </summary>
+		internal bool PaintBottomBorder
+		{
+			get
+			{
+				if(this.BorderBottom!=eStyleBorderType.None && this.BorderBottomWidth>0 && 
+					(!this.BorderColor.IsEmpty || !this.BorderBottomColor.IsEmpty))
+					return true;
+				return false;
+			}
+		}
+
+		/// <summary>
+		/// Gets whether to paint any border for the style.
+		/// </summary>
+		internal bool PaintBorder
+		{
+			get
+			{
+				return PaintTopBorder | PaintBottomBorder | PaintLeftBorder | PaintRightBorder;
+			}
+		}
+		#endregion
+
+		#region Methods
+		/// <summary>
+		/// Releases all resurces used in this control. After calling Dispose()
+		/// object is not in valid state and cannot be recovered to the valid state.
+		/// Recreation of the object is required.
+		/// </summary>
+		public virtual void Dispose()
+		{
+			if(Disposed != null)
+				Disposed(this,EventArgs.Empty);
+		}
+
+		/// <summary>
+		/// Applies a "child/inherited" style to this style. Use this method to create style
+		/// hierarchies.
+		/// </summary>
+		/// <remarks>
+		/// This method is used to support style hierarchies where a base style is defined
+		/// and inherited/child styles are derived and based on it. By using this method on the
+		/// base style you can apply only style changes defined by the child style. For example if
+		/// you defined a base style for normal user interface element then in most cases you do
+		/// not want to redefine the styling for the case when same user interface element is
+		/// selected. You will just defined the behavior of the selected state and then apply it to
+		/// the base normal style using ApplyStyle method.
+		/// </remarks>
+		/// <param name="style">Style to apply to current style.</param>
+		public virtual void ApplyStyle(ElementStyle style)
+		{
+			// TODO: Verify that ALL properties are applied!
+			if(!style.BackColor.IsEmpty)
+				this.BackColor=style.BackColor;
+			if(!style.BackColor2.IsEmpty)
+				this.BackColor2=style.BackColor2;
+			if(style.BackColorGradientAngle!=0)
+				this.BackColorGradientAngle=style.BackColorGradientAngle;
+            this.BackColorGradientType=style.BackColorGradientType;
+			if(style.BackgroundImage!=null)
+				this.BackgroundImage=style.BackgroundImage;
+			if(style.BackgroundImageAlpha!=255)
+				this.BackgroundImageAlpha=style.BackgroundImageAlpha;
+			if(style.BackgroundImagePosition!=eStyleBackgroundImage.Stretch)
+				this.BackgroundImagePosition=style.BackgroundImagePosition;
+			if(style.BorderBottom!=eStyleBorderType.None)
+				this.BorderBottom=style.BorderBottom;
+			if(!style.BorderBottomColor.IsEmpty)
+				this.BorderBottomColor=style.BorderBottomColor;
+			if(style.BorderBottomWidth!=0)
+				this.BorderBottomWidth=style.BorderBottomWidth;
+			
+            if(!style.BorderColor.IsEmpty)
+				this.BorderColor=style.BorderColor;
+            if (!style.BorderColor2.IsEmpty || !style.BorderColor.IsEmpty)
+                this.BorderColor2 = style.BorderColor2;
+            if (style.BorderGradientAngle != 90)
+                this.BorderGradientAngle = style.BorderGradientAngle;
+
+            if (!style.BorderColorLight.IsEmpty)
+                this.BorderColorLight = style.BorderColorLight;
+            if (!style.BorderColorLight2.IsEmpty || !style.BorderColorLight.IsEmpty)
+                this.BorderColorLight2 = style.BorderColorLight2;
+            if (style.BorderLightGradientAngle != 90)
+                this.BorderLightGradientAngle = style.BorderLightGradientAngle;
+
+			if(style.BorderLeft!=eStyleBorderType.None)
+				this.BorderLeft=style.BorderLeft;
+			if(!style.BorderLeftColor.IsEmpty)
+				this.BorderLeftColor=style.BorderLeftColor;
+			if(style.BorderLeftWidth!=0)
+				this.BorderLeftWidth=style.BorderLeftWidth;
+			if(style.BorderTop!=eStyleBorderType.None)
+				this.BorderTop=style.BorderTop;
+			if(!style.BorderTopColor.IsEmpty)
+				this.BorderTopColor=style.BorderTopColor;
+			if(style.BorderTopWidth!=0)
+				this.BorderTopWidth=style.BorderTopWidth;
+			if(style.BorderRight!=eStyleBorderType.None)
+				this.BorderRight=style.BorderRight;
+			if(!style.BorderRightColor.IsEmpty)
+				this.BorderRightColor=style.BorderRightColor;
+			if(style.BorderRightWidth!=0)
+				this.BorderRightWidth=style.BorderRightWidth;
+			if(style.CornerDiameter!=DEFAULT_CORNER_DIAMETER)
+				this.CornerDiameter=style.CornerDiameter;
+			if(style.CornerType!=eCornerType.Square)
+				this.CornerType=style.CornerType;
+			if(style.CornerTypeTopLeft!=eCornerType.Inherit)
+				this.CornerTypeTopLeft=style.CornerTypeTopLeft;
+			if(style.CornerTypeTopRight!=eCornerType.Inherit)
+				this.CornerTypeTopRight=style.CornerTypeTopRight;
+			if(style.CornerTypeBottomLeft!=eCornerType.Inherit)
+				this.CornerTypeBottomLeft=style.CornerTypeBottomLeft;
+			if(style.CornerTypeBottomRight!=eCornerType.Inherit)
+				this.CornerTypeBottomRight=style.CornerTypeBottomRight;
+			if(style.Font!=null)
+				this.Font=style.Font;
+			if(style.MarginBottom!=0)
+				this.MarginBottom=style.MarginBottom;
+			if(style.MarginLeft!=0)
+				this.MarginLeft=style.MarginLeft;
+			if(style.MarginRight!=0)
+				this.MarginRight=style.MarginRight;
+			if(style.MarginTop!=0)
+				this.MarginTop=style.MarginTop;
+			if(style.MaximumHeight!=0)
+				this.MaximumHeight=style.MaximumHeight;
+            if(style.PaddingBottom!=0)
+				this.PaddingBottom=style.PaddingBottom;
+			if(style.PaddingLeft!=0)
+				this.PaddingLeft=style.PaddingLeft;
+			if(style.PaddingRight!=0)
+				this.PaddingRight=style.PaddingRight;
+			if(style.PaddingTop!=0)
+				this.PaddingTop=style.PaddingTop;
+			if(style.TextAlignment!=this.TextAlignment)
+				this.TextAlignment=style.TextAlignment;
+			if(!style.TextColor.IsEmpty)
+				this.TextColor=style.TextColor;
+//			if(style.TextFormat!="")
+//				this.TextFormat=style.TextFormat;
+            if (style.TextLineAlignment != this.TextLineAlignment)
+                this.TextLineAlignment=style.TextLineAlignment;
+			if(style.TextTrimming==eStyleTextTrimming.EllipsisCharacter)
+				this.TextTrimming=style.TextTrimming;
+			if(style.WordWrap!=false)
+				this.WordWrap=style.WordWrap;
+            if (!style.TextShadowColor.IsEmpty)
+                this.TextShadowColor = style.TextShadowColor;
+            if (!style.TextShadowOffset.IsEmpty)
+                this.TextShadowOffset = style.TextShadowOffset;
+
+            if (style.BackColorBlend.Count > 0)
+            {
+                this.BackColorBlend.Clear();
+                foreach (BackgroundColorBlend b in style.BackColorBlend)
+                    this.BackColorBlend.Add(new BackgroundColorBlend(b.Color, b.Position));
+            }
+            else if (!style.BackColor.IsEmpty || !style.BackColor2.IsEmpty)
+                this.BackColorBlend.Clear();
+		}
+
+        /// <summary>
+        /// Gets whether custom has any of properties changed.
+        /// </summary>
+        [Browsable(false),DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public virtual bool Custom
+        {
+            get
+            {
+                // TODO: Verify that ALL properties are applied!
+                if (!this.BackColor.IsEmpty)
+                    return true;
+                if (!this.BackColor2.IsEmpty)
+                    return true;
+                if (this.BackColorBlend.Count > 0)
+                    return true;
+                if (this.BackColorGradientAngle != 0)
+                    return true;
+                if (this.BackColorGradientType != eGradientType.Linear)
+                    return true;
+                if (this.BackgroundImage != null)
+                    return true;
+                if (this.BackgroundImageAlpha != 255)
+                    return true;
+                if (this.BackgroundImagePosition != eStyleBackgroundImage.Stretch)
+                    return true;
+                if (this.BorderBottom != eStyleBorderType.None)
+                    return true;
+                if (!this.BorderBottomColor.IsEmpty)
+                    return true;
+                if (this.BorderBottomWidth != 0)
+                    return true;
+                if (!this.BorderColor.IsEmpty)
+                    return true;
+                if (this.BorderLeft != eStyleBorderType.None)
+                    return true;
+                if (!this.BorderLeftColor.IsEmpty)
+                    return true;
+                if (this.BorderLeftWidth != 0)
+                    return true;
+                if (this.BorderTop != eStyleBorderType.None)
+                    return true;
+                if (!this.BorderTopColor.IsEmpty)
+                    return true;
+                if (this.BorderTopWidth != 0)
+                    return true;
+                if (this.BorderRight != eStyleBorderType.None)
+                    return true;
+                if (!this.BorderRightColor.IsEmpty)
+                    return true;
+                if (this.BorderRightWidth != 0)
+                    return true;
+                if (this.CornerDiameter != DEFAULT_CORNER_DIAMETER)
+                    return true;
+                if (this.CornerType != eCornerType.Square)
+                    return true;
+                if (this.CornerTypeTopLeft != eCornerType.Inherit)
+                    return true;
+                if (this.CornerTypeTopRight != eCornerType.Inherit)
+                    return true;
+                if (this.CornerTypeBottomLeft != eCornerType.Inherit)
+                    return true;
+                if (this.CornerTypeBottomRight != eCornerType.Inherit)
+                    return true;
+                if (this.Font != null)
+                    return true;
+                if (this.MarginBottom != 0)
+                    return true;
+                if (this.MarginLeft != 0)
+                    return true;
+                if (this.MarginRight != 0)
+                    return true;
+                if (this.MarginTop != 0)
+                    return true;
+                if (this.MaximumHeight != 0)
+                    return true;
+                if (this.PaddingBottom != 0)
+                    return true;
+                if (this.PaddingLeft != 0)
+                    return true;
+                if (this.PaddingRight != 0)
+                    return true;
+                if (this.PaddingTop != 0)
+                    return true;
+                if (this.TextAlignment != eStyleTextAlignment.Near)
+                    return true;
+                if (!this.TextColor.IsEmpty)
+                    return true;
+                if (this.TextLineAlignment != eStyleTextAlignment.Center)
+                    return true;
+                if (this.TextTrimming != eStyleTextTrimming.EllipsisCharacter)
+                    return true;
+                if (this.WordWrap != false)
+                    return true;
+                if (!this.TextShadowColor.IsEmpty)
+                    return true;
+                if (!this.TextShadowOffset.IsEmpty)
+                    return true;
+#if TREEGX
+				if (this.MaximumWidth!=0)
+					return true;
+#endif
+                return false;
+            }
+        }
+
+		/// <summary>
+		/// Makes an exact copy of the style.
+		/// </summary>
+		/// <returns>New copy of ElementStyle object.</returns>
+		public ElementStyle Copy()
+		{
+			ElementStyle style=new ElementStyle();
+			style.BackColor=this.BackColor;
+			style.BackColorSchemePart=this.BackColorSchemePart;
+			style.BackColor2=this.BackColor2;
+			style.BackColor2SchemePart=this.BackColor2SchemePart;
+			style.BackColorGradientAngle=this.BackColorGradientAngle;
+            style.BackColorGradientType = this.BackColorGradientType;
+			style.BackgroundImage=this.BackgroundImage;
+			style.BackgroundImageAlpha=this.BackgroundImageAlpha;
+			style.BackgroundImagePosition=this.BackgroundImagePosition;
+			style.BorderColor=this.BorderColor;
+			style.BorderColorSchemePart=this.BorderColorSchemePart;
+            style.BorderColor2 = this.BorderColor2;
+            style.BorderColor2SchemePart = this.BorderColor2SchemePart;
+            style.BorderGradientAngle = this.BorderGradientAngle;
+
+            style.BorderColorLight = this.BorderColorLight;
+            style.BorderColorLightSchemePart = this.BorderColorLightSchemePart;
+            style.BorderColorLight2 = this.BorderColorLight2;
+            style.BorderColorLight2SchemePart = this.BorderColorLight2SchemePart;
+            style.BorderLightGradientAngle = this.BorderLightGradientAngle;
+
+			style.BorderBottom=this.BorderBottom;
+			style.BorderBottomColor=this.BorderBottomColor;
+			style.BorderBottomColorSchemePart=this.BorderBottomColorSchemePart;
+			style.BorderBottomWidth=this.BorderBottomWidth;
+			style.BorderLeft=this.BorderLeft;
+			style.BorderLeftWidth=this.BorderLeftWidth;
+			style.BorderLeftColor=this.BorderLeftColor;
+			style.BorderLeftColorSchemePart=this.BorderLeftColorSchemePart;
+			style.BorderRight=this.BorderRight;
+			style.BorderRightWidth=this.BorderRightWidth;
+			style.BorderRightColor=this.BorderRightColor;
+			style.BorderRightColorSchemePart=this.BorderRightColorSchemePart;
+			style.BorderTop=this.BorderTop;
+			style.BorderTopWidth=this.BorderTopWidth;
+			style.BorderBottomColor=this.BorderBottomColor;
+			style.BorderBottomColorSchemePart=this.BorderBottomColorSchemePart;
+			style.CornerDiameter=this.CornerDiameter;
+			style.CornerType=this.CornerType;
+			style.CornerTypeTopLeft=this.CornerTypeTopLeft;
+			style.CornerTypeTopRight=this.CornerTypeTopRight;
+			style.CornerTypeBottomLeft=this.CornerTypeBottomLeft;
+			style.CornerTypeBottomRight=this.CornerTypeBottomRight;
+			style.Font=this.Font;
+			style.MarginBottom=this.MarginBottom;
+			style.MarginLeft=this.MarginLeft;
+			style.MarginRight=this.MarginRight;
+			style.MarginTop=this.MarginTop;
+			style.PaddingBottom=this.PaddingBottom;
+			style.PaddingLeft=this.PaddingLeft;
+			style.PaddingRight=this.PaddingRight;
+			style.PaddingTop=this.PaddingTop;
+			style.TextAlignment=this.TextAlignment;
+			style.TextColor=this.TextColor;
+			style.TextColorSchemePart=this.TextColorSchemePart;
+			style.TextLineAlignment=this.TextLineAlignment;
+			style.TextTrimming=this.TextTrimming;
+			style.WordWrap=this.WordWrap;
+			style.Description=this.Description;
+            style.TextShadowColor = this.TextShadowColor;
+            style.TextShadowColorSchemePart = this.TextShadowColorSchemePart;
+            style.TextShadowOffset = this.TextShadowOffset;
+            style.Class = m_Class;
+#if TREEGX
+			style.MaximumWidth = this.MaximumWidth;
+#endif
+            foreach (BackgroundColorBlend b in m_BackColorBlend)
+                style.BackColorBlend.Add(new BackgroundColorBlend(b.Color, b.Position));
+
+			return style;
+		}
+
+        /// <summary>
+        /// Reset all style properties to default values.
+        /// </summary>
+        public void Reset()
+        {
+            m_BackColor=Color.Empty;
+		    m_BackColorSchemePart=eColorSchemePart.None;
+		    m_BackColor2=Color.Empty;
+		    m_BackColor2SchemePart=eColorSchemePart.None;
+		    m_BackColorGradientAngle=0;
+            m_BackColorGradientType = eGradientType.Linear;
+		    m_BackgroundImage=null;
+		    m_BackgroundImagePosition=eStyleBackgroundImage.Stretch;
+		    m_BackgroundImageAlpha=255;
+            m_BackColorBlend.Clear();
+
+		    // Font
+		    m_Font=null;
+
+		    // Text Formating
+		    m_WordWrap=false;
+		    m_TextAlignment=eStyleTextAlignment.Near;
+		    m_TextLineAlignment=eStyleTextAlignment.Center;
+		    m_TextTrimming=eStyleTextTrimming.EllipsisCharacter;
+		
+            m_TextColor=Color.Empty;
+		    m_TextColorSchemePart=eColorSchemePart.None;
+            m_TextShadowColor = Color.Empty;
+            m_TextShadowColorSchemePart = eColorSchemePart.None;
+            m_TextShadowOffset = Point.Empty;
+
+		    // Style margins
+		    m_MarginLeft=0;
+		    m_MarginRight=0;
+		    m_MarginTop=0;
+		    m_MarginBottom=0;
+
+		    // Style inside padding
+		    m_PaddingLeft=0;
+		    m_PaddingRight=0;
+		    m_PaddingTop=0;
+		    m_PaddingBottom=0;
+
+		    // Border
+		    m_BorderLeft=eStyleBorderType.None;
+		    m_BorderRight=eStyleBorderType.None;
+		    m_BorderTop=eStyleBorderType.None;
+		    m_BorderBottom=eStyleBorderType.None;
+
+		    m_BorderColor=Color.Empty;
+		    m_BorderColorSchemePart=eColorSchemePart.None;
+            m_BorderColor2 = Color.Empty;
+            m_BorderColor2SchemePart = eColorSchemePart.None;
+            m_BorderGradientAngle = 90;
+            m_BorderColorLight = Color.Empty;
+            m_BorderColorLightSchemePart = eColorSchemePart.None;
+            m_BorderColorLight2 = Color.Empty;
+            m_BorderColorLight2SchemePart = eColorSchemePart.None;
+            m_BorderLightGradientAngle = 90;
+
+		    m_BorderLeftColor=Color.Empty;
+		    m_BorderLeftColorSchemePart=eColorSchemePart.None;
+		    m_BorderRightColor=Color.Empty;
+		    m_BorderRightColorSchemePart=eColorSchemePart.None;
+		    m_BorderTopColor=Color.Empty;
+		    m_BorderTopColorSchemePart=eColorSchemePart.None;
+		    m_BorderBottomColor=Color.Empty;
+		    m_BorderBottomColorSchemePart=eColorSchemePart.None;
+
+		    m_BorderLeftWidth=0;
+		    m_BorderRightWidth=0;
+		    m_BorderTopWidth=0;
+		    m_BorderBottomWidth=0;
+
+		    m_CornerType=eCornerType.Square;
+		    m_CornerTypeTopLeft=eCornerType.Inherit;
+		    m_CornerTypeTopRight=eCornerType.Inherit;
+		    m_CornerTypeBottomLeft=eCornerType.Inherit;
+		    m_CornerTypeBottomRight=eCornerType.Inherit;
+		    m_CornerDiameter=DEFAULT_CORNER_DIAMETER;
+            m_Class = "";
+		    m_MaximumHeight=0;
+        }
+
+		/// <summary>Returns default style for the Cell object.</summary>
+		/// <param name="defaultNodeStyle">
+		/// Reference to the default style for the Node. Cell style is based on the given
+		/// node style.
+		/// </param>
+		public static ElementStyle GetDefaultCellStyle(ElementStyle defaultNodeStyle)
+		{
+			ElementStyle es=new ElementStyle();
+			if(defaultNodeStyle!=null)
+			{
+				es.TextColor=defaultNodeStyle.TextColor;
+				es.Font=defaultNodeStyle.Font;
+				es.TextAlignment=defaultNodeStyle.TextAlignment;
+//				es.TextFormat=defaultNodeStyle.TextFormat;
+				es.TextLineAlignment=defaultNodeStyle.TextLineAlignment;
+				es.TextTrimming=defaultNodeStyle.TextTrimming;
+				es.WordWrap=defaultNodeStyle.WordWrap;
+			}
+			if(es.TextColor.IsEmpty)
+				es.TextColor=SystemColors.ControlText;
+			return es;
+		}
+
+		/// <summary>Returns default style for disabled cells.</summary>
+		/// <returns>Returns new instance of ElementStyle object.</returns>
+		public static ElementStyle GetDefaultDisabledCellStyle()
+		{
+			ElementStyle es=new ElementStyle();
+			es.TextColor=SystemColors.GrayText;
+			return es;
+		}
+
+		/// <summary>Returns default style for the selected cell object.</summary>
+		/// <returns>New instance of the ElementStyle object.</returns>
+		public static ElementStyle GetDefaultSelectedCellStyle()
+		{
+			ElementStyle es=new ElementStyle();
+//			es.TextColor=SystemColors.HighlightText;
+//			es.BackgroundColor=SystemColors.Highlight;
+			return es;
+		}
+
+		/// <summary>
+		/// Sets Alpha value for all colors defined by style to specified value.
+		/// </summary>
+		/// <param name="style">Style to change.</param>		
+		/// <param name="alpha">Alpha value for the colors.</param>
+		public static void SetColorsAlpha(ElementStyle style, int alpha)
+		{
+			if(!style.TextColor.IsEmpty)
+				style.TextColor=Color.FromArgb(alpha,style.TextColor);
+			if(!style.BackColor.IsEmpty)
+				style.BackColor=Color.FromArgb(alpha,style.BackColor);
+			if(!style.BackColor2.IsEmpty)
+				style.BackColor2=Color.FromArgb(alpha,style.BackColor2);
+			if(!style.BorderColor.IsEmpty)
+				style.BorderColor=Color.FromArgb(alpha,style.BorderColor);
+			if(!style.BorderBottomColor.IsEmpty)
+				style.BorderBottomColor=Color.FromArgb(alpha,style.BorderBottomColor);
+			if(!style.BorderLeftColor.IsEmpty)
+				style.BorderLeftColor=Color.FromArgb(alpha,style.BorderLeftColor);
+			if(!style.BorderRightColor.IsEmpty)
+				style.BorderRightColor=Color.FromArgb(alpha,style.BorderRightColor);
+			if(!style.BorderRightColor.IsEmpty)
+				style.BorderRightColor=Color.FromArgb(alpha,style.BorderRightColor);
+			if(!style.BorderTopColor.IsEmpty)
+				style.BorderTopColor=Color.FromArgb(alpha,style.BorderTopColor);
+		}
+		
+
+		#endregion
+
+		#region Private Implementation
+        internal bool FreezeEvents
+        {
+            get { return m_FreezeEvents; }
+            set { m_FreezeEvents = value; }
+        }
+
+		private void OnStyleChanged()
+		{
+            if (m_FreezeEvents) return;
+			if(StyleChanged!=null)
+				StyleChanged(this,new EventArgs());
+		}
+		private void OnSizePropertyChanged()
+		{
+			m_SizeChanged=true;
+		}
+
+		/// <summary>
+		/// Gets or sets whether ElementStyle is in design mode.
+		/// </summary>
+		internal bool DesignMode
+		{
+			get {return m_DesignMode;}
+			set {m_DesignMode=value;}
+		}
+
+		private Color GetColor(Color color, eColorSchemePart p)
+		{
+			if(p==eColorSchemePart.None)
+				return color;
+			ColorScheme cs=this.GetColorScheme();
+			if(cs==null)
+				return color;
+			return (Color)cs.GetType().GetProperty(p.ToString()).GetValue(cs,null);
+		}
+		
+		public override string ToString()
+		{
+			string s=this.Name;
+			if(this.Description!="")
+				s+=" "+this.Description;
+			return s;
+		}
+
+
+		#if TREEGX
+		/// <summary>
+		/// Returns reference to ColorScheme object used by this style.
+		/// </summary>
+		/// <returns>Instance of ColorScheme object or null if object could not be obtained.</returns>
+		internal ColorScheme GetColorScheme()
+		{
+			if(m_Parent!=null && m_Parent.TreeControl!=null)
+				return m_Parent.TreeControl.ColorScheme;
+			else if(m_TreeControl!=null)
+				return m_TreeControl.ColorScheme;
+			return null;
+		}
+
+		/// <summary>
+		/// Gets or sets the reference to the parent collection.
+		/// </summary>
+		internal ElementStyleCollection Parent
+		{
+			get {return m_Parent;}
+			set {m_Parent=value;}
+		}
+
+		private TreeGX m_TreeControl;
+		/// <summary>
+		/// Gets or sets the tree control style is assigned to.
+		/// </summary>
+		internal TreeGX TreeControl
+		{
+			get {return m_TreeControl;}
+			set {m_TreeControl=value;}
+		}
+
+		#elif DOTNETBAR
+		/// <summary>
+		/// Returns reference to ColorScheme object used by this style.
+		/// </summary>
+		/// <returns>Instance of ColorScheme object or null if object could not be obtained.</returns>
+		internal ColorScheme GetColorScheme()
+		{
+			return m_ColorScheme;
+		}
+		internal void SetColorScheme(ColorScheme cs)
+		{
+			m_ColorScheme=cs;
+		}
+		#endif
+
+		#endregion
+    }
+
+    #region eGradientType
+    /// <summary>
+    /// Specifies the type of the gradient fill.
+    /// </summary>
+    public enum eGradientType
+    {
+        /// <summary>
+        /// Represents linear gradient fill.
+        /// </summary>
+        Linear,
+        /// <summary>
+        /// Represents radial gradient fill.
+        /// </summary>
+        Radial
+    }
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/ElementStyle/BackgroundColorBlend.cs b/PROMS/DotNetBar Source Code/TreeGX/ElementStyle/BackgroundColorBlend.cs
new file mode 100644
index 00000000..61b7ebb7
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/ElementStyle/BackgroundColorBlend.cs	
@@ -0,0 +1,87 @@
+using System;
+using System.Text;
+using System.Drawing;
+using System.ComponentModel;
+
+#if TREEGX
+namespace DevComponents.Tree
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar
+#endif
+{
+    /// <summary>
+    /// Defines single color blend point for the multicolor gradient fills.
+    /// </summary>
+    [ToolboxItem(false),DesignTimeVisible(false),TypeConverter(typeof(BackgroundColorBlendConverter))]
+    public class BackgroundColorBlend
+    {
+        #region Private Variables
+        private Color m_Color = Color.Empty;
+        private float m_Position = 0;
+        #endregion
+
+        #region Internal Implementation
+        /// <summary>
+        /// Creates new instance of the class. When defining multicolor gradinet blends and using the percentage positions the positions created
+        /// must start with 0f and end with 1f.
+        /// </summary>
+        public BackgroundColorBlend() {}
+
+        /// <summary>
+        /// Creates new instance of the class and initialize it with default values.
+        /// </summary>
+        public BackgroundColorBlend(Color color, float position)
+        {
+            m_Color=color;
+            m_Position=position;
+        }
+
+        /// <summary>
+        /// Creates new instance of the class and initialize it with default values.
+        /// </summary>
+        public BackgroundColorBlend(int color, float position)
+        {
+            m_Color = ColorScheme.GetColor(color);
+            m_Position = position;
+        }
+
+        /// <summary>
+        /// Gets or sets Color to use in multicolor gradient blend at specified position.
+        /// </summary>
+        [Browsable(true), Description("Indicates the Color to use in multicolor gradient blend at specified position.")]
+        public Color Color
+        {
+            get { return m_Color; }
+            set
+            {
+                m_Color = value;
+                OnColorBlendChanged();
+            }
+        }
+        private bool ShouldSerializeColor()
+        {
+            return !m_Color.IsEmpty;
+        }
+
+        /// <summary>
+        /// Gets or sets the color position in multicolor gradient blend. Values less or equal to 1 are used as percentage specifing percentages of distance along the gradient line.
+        /// Values greater than 1 are used as absolute pixel values of distance along the gradient line.
+        /// </summary>
+        [Browsable(true), DefaultValue(0f), Description("")]
+        public float Position
+        {
+            get { return m_Position; }
+            set
+            {
+                m_Position = value;
+                OnColorBlendChanged();
+            }
+        }
+
+        private void OnColorBlendChanged()
+        {
+        }
+        #endregion
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/ElementStyle/BackgroundColorBlendCollection.cs b/PROMS/DotNetBar Source Code/TreeGX/ElementStyle/BackgroundColorBlendCollection.cs
new file mode 100644
index 00000000..61abf1ac
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/ElementStyle/BackgroundColorBlendCollection.cs	
@@ -0,0 +1,244 @@
+using System;
+using System.Collections;
+using System.Text;
+using System.Drawing.Drawing2D;
+using System.Drawing;
+
+#if TREEGX
+namespace DevComponents.Tree
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar
+#endif
+{
+    /// <summary>
+    /// Represents Collection for the BackgroundColorBlend objects.
+    /// </summary>
+    public class BackgroundColorBlendCollection : CollectionBase
+    {
+        #region Private Variables
+        private ElementStyle m_Parent = null; 
+        #endregion
+
+        #region Internal Implementation
+        /// <summary>Creates new instance of the class.</summary>
+        public BackgroundColorBlendCollection() {}
+
+        internal ElementStyle Parent
+        {
+            get { return m_Parent; }
+            set { m_Parent = value; }
+        }
+
+        /// <summary>
+		/// Adds new object to the collection.
+		/// </summary>
+        /// <param name="item">Object to add.</param>
+		/// <returns>Index of newly added object.</returns>
+		public int Add(BackgroundColorBlend item)
+		{
+			return List.Add(item);
+		}
+
+        /// <summary>
+        /// Adds array of new objects to the collection.
+        /// </summary>
+        /// <param name="items">Array of object to add.</param>
+        public void AddRange(BackgroundColorBlend[] items)
+        {
+            foreach (BackgroundColorBlend item in items)
+                this.Add(item);
+        }
+
+		/// <summary>
+		/// Returns reference to the object in collection based on it's index.
+		/// </summary>
+		public BackgroundColorBlend this[int index]
+		{
+			get {return (BackgroundColorBlend)(List[index]);}
+			set {List[index] = value;}
+		}
+
+		/// <summary>
+		/// Inserts new object into the collection.
+		/// </summary>
+		/// <param name="index">Position of the object.</param>
+		/// <param name="value">Object to insert.</param>
+		public void Insert(int index, BackgroundColorBlend value) 
+		{
+			List.Insert(index, value);
+		}
+
+		/// <summary>
+		/// Returns index of the object inside of the collection.
+		/// </summary>
+		/// <param name="value">Reference to the object.</param>
+		/// <returns>Index of the object.</returns>
+		public int IndexOf(BackgroundColorBlend value) 
+		{
+			return List.IndexOf(value);
+		}
+
+		/// <summary>
+		/// Returns whether collection contains specified object.
+		/// </summary>
+		/// <param name="value">Object to look for.</param>
+		/// <returns>true if object is part of the collection, otherwise false.</returns>
+		public bool Contains(BackgroundColorBlend value) 
+		{
+			return List.Contains(value);
+		}
+
+		/// <summary>
+		/// Removes specified object from the collection.
+		/// </summary>
+		/// <param name="value"></param>
+		public void Remove(BackgroundColorBlend value) 
+		{
+			List.Remove(value);
+		}
+
+        //protected override void OnRemoveComplete(int index,object value)
+        //{
+        //    base.OnRemoveComplete(index,value);
+        //    BackgroundColorBlend me=value as BackgroundColorBlend;
+        //}
+        //protected override void OnInsertComplete(int index,object value)
+        //{
+        //    base.OnInsertComplete(index,value);
+        //    BackgroundColorBlend me=value as BackgroundColorBlend;
+        //}
+
+		/// <summary>
+		/// Copies collection into the specified array.
+		/// </summary>
+		/// <param name="array">Array to copy collection to.</param>
+		/// <param name="index">Starting index.</param>
+		public void CopyTo(BackgroundColorBlend[] array, int index) 
+		{
+			List.CopyTo(array, index);
+		}
+
+		/// <summary>
+		/// Copies contained items to the BackgroundColorBlend array.
+		/// </summary>
+		/// <param name="array">Array to copy to.</param>
+		internal void CopyTo(BackgroundColorBlend[] array)
+		{
+			List.CopyTo(array,0);
+		}
+
+        /// <summary>
+        /// Creates ColorBlend object based on the members of the collection. ColorBlend object will be valid only if all members of the collection
+        /// represents relative/percentage based color blends.
+        /// </summary>
+        /// <returns></returns>
+        public ColorBlend GetColorBlend()
+        {
+            ColorBlend blend = new ColorBlend();
+            Color[] colors = new Color[this.Count];
+            float[] positions = new float[this.Count];
+
+            for(int i=0; i<this.Count; i++)
+            {
+                BackgroundColorBlend b = this[i];
+                colors[i] = b.Color;
+                positions[i] = b.Position;
+            }
+
+            blend.Colors = colors;
+            blend.Positions = positions;
+            
+            return blend;
+        }
+
+        /// <summary>
+        /// Adds the BackgroundColorBlend objects from the collection.
+        /// </summary>
+        /// <param name="col">Collection to copy objects from</param>
+        public void CopyFrom(BackgroundColorBlendCollection col)
+        {
+            foreach (BackgroundColorBlend b in col)
+                this.Add(b);
+        }
+
+        internal eBackgroundColorBlendType GetBlendType()
+        {
+            BackgroundColorBlendCollection c = this;
+            if (c.Count <= 1)
+                return eBackgroundColorBlendType.Invalid;
+
+            eBackgroundColorBlendType t = eBackgroundColorBlendType.Invalid;
+
+            foreach (BackgroundColorBlend b in c)
+            {
+                if (b.Position == 0 || b.Position == 1f)
+                    continue;
+                if (b.Position <= 1f)
+                {
+                    if (t == eBackgroundColorBlendType.Invalid)
+                        t = eBackgroundColorBlendType.Relative;
+                    else if (t == eBackgroundColorBlendType.Absolute)
+                    {
+                        t = eBackgroundColorBlendType.Invalid;
+                        break;
+                    }
+                }
+                else
+                {
+                    if (t == eBackgroundColorBlendType.Invalid)
+                        t = eBackgroundColorBlendType.Absolute;
+                    else if (t == eBackgroundColorBlendType.Relative)
+                    {
+                        t = eBackgroundColorBlendType.Invalid;
+                        break;
+                    }
+                }
+            }
+
+            if (c.Count == 2 && c[0].Position == 0f && c[1].Position == 1f)
+                return eBackgroundColorBlendType.Relative;
+
+            if (t == eBackgroundColorBlendType.Invalid)
+                return t;
+
+            if (t == eBackgroundColorBlendType.Relative && c[0].Position != 0f && c[c.Count - 1].Position != 1f)
+                return eBackgroundColorBlendType.Invalid;
+            else if (t == eBackgroundColorBlendType.Absolute && ((c.Count / 2) * 2 != c.Count))
+                return eBackgroundColorBlendType.Invalid;
+
+            return t;
+        }
+
+        /// <summary>
+        /// Initializes the collection with the two color blend.
+        /// </summary>
+        /// <param name="collection">Collection to initialize.</param>
+        /// <param name="backColor1">Start color.</param>
+        /// <param name="backColor2">End color.</param>
+        public static void InitializeCollection(BackgroundColorBlendCollection collection, int backColor1, int backColor2)
+        {
+            InitializeCollection(collection, ColorScheme.GetColor(backColor1), ColorScheme.GetColor(backColor2));
+        }
+
+        /// <summary>
+        /// Initializes the collection with the two color blend.
+        /// </summary>
+        /// <param name="collection">Collection to initialize.</param>
+        /// <param name="backColor1">Start color.</param>
+        /// <param name="backColor2">End color.</param>
+        public static void InitializeCollection(BackgroundColorBlendCollection collection, Color backColor1, Color backColor2)
+        {
+            collection.Clear();
+            collection.Add(new BackgroundColorBlend(backColor1, 0f));
+            collection.Add(new BackgroundColorBlend(backColor2, 1f));
+        }
+		#endregion
+    }
+
+    internal enum eBackgroundColorBlendType
+    {
+        Invalid,
+        Relative,
+        Absolute
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/ElementStyle/BackgroundColorBlendConverter.cs b/PROMS/DotNetBar Source Code/TreeGX/ElementStyle/BackgroundColorBlendConverter.cs
new file mode 100644
index 00000000..afdbf263
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/ElementStyle/BackgroundColorBlendConverter.cs	
@@ -0,0 +1,53 @@
+using System;
+using System.ComponentModel;
+using System.ComponentModel.Design.Serialization;
+using System.Globalization;
+using System.Reflection;
+using System.Drawing;
+
+#if TREEGX
+namespace DevComponents.Tree
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar
+#endif
+{
+    /// <summary>
+    /// Represents BackgroundColorBlend object converter.
+    /// </summary>
+    public class BackgroundColorBlendConverter : TypeConverter
+    {
+        public BackgroundColorBlendConverter() { }
+
+		public override bool CanConvertTo(ITypeDescriptorContext context, Type destinationType)
+		{
+			if(destinationType==typeof(InstanceDescriptor))
+				return true;
+			return base.CanConvertTo(context, destinationType);
+		}
+
+		public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+		{
+			if(destinationType==null)
+				throw new ArgumentNullException("destinationType");
+
+			if((destinationType==typeof(InstanceDescriptor)) && (value is BackgroundColorBlend))
+			{
+                BackgroundColorBlend doc = (BackgroundColorBlend)value;
+                Type[] constructorParams = null;
+                MemberInfo constructorMemberInfo = null;
+                object[] constructorValues = null;
+
+                constructorParams = new Type[2] { typeof(Color), typeof(float) };
+                constructorMemberInfo = typeof(BackgroundColorBlend).GetConstructor(constructorParams);
+                constructorValues = new object[2] { doc.Color, doc.Position };
+
+                if (constructorMemberInfo != null)
+                {
+                    return new InstanceDescriptor(constructorMemberInfo, constructorValues);
+                }
+			}
+
+			return base.ConvertTo(context, culture, value, destinationType);
+		}
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/ElementStyle/IElementStyleClassProvider.cs b/PROMS/DotNetBar Source Code/TreeGX/ElementStyle/IElementStyleClassProvider.cs
new file mode 100644
index 00000000..3ed79edb
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/ElementStyle/IElementStyleClassProvider.cs	
@@ -0,0 +1,23 @@
+using System;
+using System.Text;
+
+#if TREEGX
+namespace DevComponents.Tree
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar
+#endif
+
+{
+    /// <summary>
+    /// Defines the provider for the element style classes support.
+    /// </summary>
+    public interface IElementStyleClassProvider
+    {
+        /// <summary>
+        /// Returns the instance of the ElementStyle with given class name or null if there is no class with that name defined.
+        /// </summary>
+        /// <param name="className">Class name. See static members of ElementStyleClassKeys class for the list of available keys.</param>
+        /// <returns>Instance of ElementStyle for given class name or null if class cannot be found.</returns>
+        ElementStyle GetClass(string className);
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/ElementStyleCollection.cs b/PROMS/DotNetBar Source Code/TreeGX/ElementStyleCollection.cs
new file mode 100644
index 00000000..5fc91630
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/ElementStyleCollection.cs	
@@ -0,0 +1,168 @@
+using System;
+using System.Collections;
+
+namespace DevComponents.Tree
+{
+	/// <summary>
+	/// Represents collection for Node objects.
+	/// </summary>
+	public class ElementStyleCollection:CollectionBase 
+	{
+		#region Private Variables
+		private TreeGX m_TreeControl=null;
+		//private Hashtable m_InnerHashtable=new Hashtable();
+		#endregion
+
+		#region Internal Implementation
+		/// <summary>Creates new instance of the object.</summary>
+		public ElementStyleCollection()
+		{
+		}
+		internal TreeGX TreeControl
+		{
+			get {return m_TreeControl;}
+			set {m_TreeControl=value;}
+		}
+
+		/// <summary>
+		/// Adds new object to the collection.
+		/// </summary>
+		/// <param name="tab">Object to add.</param>
+		/// <returns>Index of newly added object.</returns>
+		public int Add(ElementStyle style)
+		{
+			return List.Add(style);
+		}
+		/// <summary>
+		/// Returns reference to the object in collection based on it's index.
+		/// </summary>
+		public ElementStyle this[int index]
+		{
+			get {return (ElementStyle)(List[index]);}
+			set {List[index] = value;}
+		}
+
+		/// <summary>
+		/// Returns reference to the object in collection based on it's name.
+		/// </summary>
+		public ElementStyle this[string name]
+		{
+			get
+			{
+				foreach(ElementStyle style in this.List)
+				{
+					if(style.Name==name)
+						return style;
+				}
+				return null;
+			}
+		}
+
+		/// <summary>
+		/// Inserts new object into the collection.
+		/// </summary>
+		/// <param name="index">Position of the object.</param>
+		/// <param name="value">Object to insert.</param>
+		public void Insert(int index, ElementStyle value) 
+		{
+			List.Insert(index, value);
+		}
+
+		/// <summary>
+		/// Returns index of the object inside of the collection.
+		/// </summary>
+		/// <param name="value">Reference to the object.</param>
+		/// <returns>Index of the object.</returns>
+		public int IndexOf(ElementStyle value) 
+		{
+			return List.IndexOf(value);
+		}
+
+		/// <summary>
+		/// Returns whether collection contains specified object.
+		/// </summary>
+		/// <param name="value">Object to look for.</param>
+		/// <returns>true if object is part of the collection, otherwise false.</returns>
+		public bool Contains(ElementStyle value) 
+		{
+			return List.Contains(value);
+		}
+
+		/// <summary>
+		/// Removes specified object from the collection.
+		/// </summary>
+		/// <param name="value"></param>
+		public void Remove(ElementStyle value) 
+		{
+			List.Remove(value);
+		}
+
+		protected override void OnRemoveComplete(int index,object value)
+		{
+			base.OnRemoveComplete(index,value);
+			ElementStyle style=value as ElementStyle;
+			style.Parent=null;
+			//m_InnerHashtable.Remove(style.Name);
+		}
+		protected override void OnInsertComplete(int index,object value)
+		{
+			base.OnInsertComplete(index,value);
+			ElementStyle style=value as ElementStyle;
+			if(style.Parent!=null && style.Parent!=this)
+				style.Parent.Remove(style);
+			style.Parent=this;
+			//m_InnerHashtable.Add(style.Name,style);
+		}
+
+		/// <summary>
+		/// Copies collection into the specified array.
+		/// </summary>
+		/// <param name="array">Array to copy collection to.</param>
+		/// <param name="index">Starting index.</param>
+		public void CopyTo(ElementStyle[] array, int index) 
+		{
+			List.CopyTo(array, index);
+		}
+
+		/// <summary>
+		/// Copies contained items to the Node array.
+		/// </summary>
+		/// <param name="array">Array to copy to.</param>
+		internal void CopyTo(ElementStyle[] array)
+		{
+			List.CopyTo(array,0);
+		}
+
+		protected override void OnClear()
+		{
+			base.OnClear();
+		}
+		#endregion
+	}
+
+	#region ElementStyleCollectionEditor
+	/// <summary>
+	/// Support for ElementStyle design-time editor.
+	/// </summary>
+	public class ElementStyleCollectionEditor:System.ComponentModel.Design.CollectionEditor
+	{
+		/// <summary>Creates new instance of the object.</summary>
+		public ElementStyleCollectionEditor(Type type):base(type)
+		{
+		}
+		protected override Type CreateCollectionItemType()
+		{
+			return typeof(ElementStyle);
+		}
+		protected override Type[] CreateNewItemTypes()
+		{
+			return new Type[] {typeof(ElementStyle)};
+		}
+		protected override object CreateInstance(Type itemType)
+		{
+			object item=base.CreateInstance(itemType);
+			return item;
+		}
+	}
+	#endregion
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/ElementStyleDisplay.cs b/PROMS/DotNetBar Source Code/TreeGX/ElementStyleDisplay.cs
new file mode 100644
index 00000000..a500b423
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/ElementStyleDisplay.cs	
@@ -0,0 +1,1225 @@
+using System;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Drawing.Imaging;
+
+#if TREEGX
+namespace DevComponents.Tree
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar
+#endif
+{
+	/// <summary>
+	/// Paints the ElementStyle
+	/// </summary>
+	public class ElementStyleDisplay
+	{
+		/// <summary>Creates new instance of the object.</summary>
+		public ElementStyleDisplay()
+		{
+		}
+
+        /// <summary>
+        /// Paints text for given style.
+        /// </summary>
+        /// <param name="e">Display information.</param>
+        /// <param name="text">Text to paint.</param>
+        /// <param name="defaultFont">Default font if no font by style is specified.</param>
+        public static void PaintText(ElementStyleDisplayInfo e, string text, Font defaultFont)
+        {
+            PaintText(e, text, defaultFont, false);
+        }
+
+		/// <summary>
+        /// Paints text for given style.
+		/// </summary>
+        /// <param name="e">Display information.</param>
+        /// <param name="text"><Text to paint./param>
+        /// <param name="defaultFont">Default font if no font by style is specified.</param>
+		/// <param name="useDefaultFont">Specifies whether to use default font for painting regardless of style settings.</param>
+		public static void PaintText(ElementStyleDisplayInfo e, string text, Font defaultFont, bool useDefaultFont)
+		{
+            PaintText(e, text, defaultFont, useDefaultFont, e.Style.TextFormat);
+		}
+
+        /// <summary>
+        /// Paints text for given style.
+        /// </summary>
+        /// <param name="e">Display information.</param>
+        /// <param name="text"><Text to paint./param>
+        /// <param name="defaultFont">Default font if no font by style is specified.</param>
+        /// <param name="useDefaultFont">Specifies whether to use default font for painting regardless of style settings.</param>
+        public static void PaintText(ElementStyleDisplayInfo e, string text, Font defaultFont, bool useDefaultFont, eTextFormat textFormat)
+        {
+            Rectangle textBounds = e.Bounds;
+            ElementStyle style = GetElementStyle(e.Style);
+
+            if (text == "" || textBounds.IsEmpty || style.TextColor.IsEmpty)
+                return;
+
+            Font font = style.Font;
+            if (font == null || useDefaultFont)
+                font = defaultFont;
+
+            textBounds.X += style.MarginLeft;
+            textBounds.Width -= (style.MarginLeft + style.MarginRight);
+            textBounds.Y += style.MarginTop;
+            textBounds.Height -= (style.MarginTop + style.MarginBottom);
+
+            if (!style.TextShadowColor.IsEmpty && Math.Abs(style.TextShadowColor.GetBrightness() - style.TextColor.GetBrightness()) > .2)
+            {
+                using (SolidBrush brush = new SolidBrush(style.TextShadowColor))
+                {
+                    Rectangle r = textBounds;
+                    r.Offset(style.TextShadowOffset);
+                    TextDrawing.DrawString(e.Graphics, text, font, style.TextShadowColor, r, textFormat);
+                    //e.Graphics.DrawString(text,font,brush,r,style.StringFormat);
+                }
+            }
+
+            if (!style.TextColor.IsEmpty)
+                TextDrawing.DrawString(e.Graphics, text, font, style.TextColor, textBounds, textFormat);
+        }
+
+		/// <summary>Returns new Region object for given ElementStyle.</summary>
+		/// <returns>New instance of Region object.</returns>
+		/// <param name="e">Information to describe ElementStyle.</param>
+		public static Region GetStyleRegion(ElementStyleDisplayInfo e)
+		{
+            Rectangle rectPath = e.Bounds;
+            if (e.Style.PaintBorder && e.Style.CornerType!=eCornerType.Square)
+            {
+                rectPath.Width--;
+                rectPath.Height--;
+            }
+
+            GraphicsPath path = ElementStyleDisplay.GetBackgroundPath(e.Style, rectPath);
+            Region r = new Region();
+            r.MakeEmpty();
+            r.Union(path);
+            // Widen path for the border...
+            if (e.Style.PaintBorder && (e.Style.CornerType == eCornerType.Rounded || e.Style.CornerType == eCornerType.Diagonal || 
+                e.Style.CornerTypeTopLeft == eCornerType.Rounded || e.Style.CornerTypeTopLeft == eCornerType.Diagonal ||
+                e.Style.CornerTypeTopRight==eCornerType.Rounded || e.Style.CornerTypeTopRight==eCornerType.Diagonal ||
+                e.Style.CornerTypeBottomLeft==eCornerType.Rounded || e.Style.CornerTypeBottomLeft==eCornerType.Diagonal ||
+                e.Style.CornerTypeBottomRight==eCornerType.Rounded || e.Style.CornerTypeBottomRight==eCornerType.Diagonal))
+            {
+                using (Pen pen = new Pen(Color.Black, (e.Style.BorderTopWidth>0?e.Style.BorderTopWidth:1)))
+                {
+                    path.Widen(pen);
+                }
+                //Region r2 = new Region(path);
+                r.Union(path);
+            }
+
+            return r;
+            //GraphicsPath path=ElementStyleDisplay.GetBackgroundPath(e.Style,e.Bounds,false);
+            //return new Region(path);
+		}
+
+        /// <summary>
+        /// Returns the clipping for the content of the element style.
+        /// </summary>
+        /// <param name="e"></param>
+        /// <returns></returns>
+        public static GraphicsPath GetInsideClip(ElementStyleDisplayInfo e)
+        {
+            Rectangle rectPath = e.Bounds;
+            // GDI bug
+            if (e.Style.PaintBorder)
+            {
+                if (e.Style.PaintTopBorder)
+                {
+                    rectPath.Y += e.Style.BorderTopWidth;
+                    rectPath.Height -= e.Style.BorderTopWidth;
+
+                    if (e.Style.BorderTop == eStyleBorderType.Etched || e.Style.BorderTop == eStyleBorderType.Double)
+                    {
+                        rectPath.Y += e.Style.BorderTopWidth;
+                        rectPath.Height -= e.Style.BorderTopWidth;
+                    }
+                }
+
+                if (e.Style.PaintBottomBorder)
+                {
+                    rectPath.Height -= e.Style.BorderBottomWidth;
+                    if (e.Style.BorderBottom == eStyleBorderType.Etched || e.Style.BorderBottom == eStyleBorderType.Double)
+                        rectPath.Height -= e.Style.BorderBottomWidth;
+                }
+
+                if (e.Style.PaintLeftBorder)
+                {
+                    rectPath.X += e.Style.BorderLeftWidth;
+                    rectPath.Width -= e.Style.BorderLeftWidth;
+                    if (e.Style.BorderLeft == eStyleBorderType.Etched || e.Style.BorderLeft == eStyleBorderType.Double)
+                    {
+                        rectPath.X += e.Style.BorderLeftWidth;
+                        rectPath.Width -= e.Style.BorderLeftWidth;
+                    }
+                }
+
+                if (e.Style.PaintRightBorder)
+                {
+                    rectPath.Width -= e.Style.BorderRightWidth;
+                    if (e.Style.BorderRight == eStyleBorderType.Etched || e.Style.BorderRight == eStyleBorderType.Double)
+                        rectPath.Width -= e.Style.BorderRightWidth;
+                }
+            }
+
+            GraphicsPath path = ElementStyleDisplay.GetBackgroundPath(e.Style, rectPath);
+
+            return path;
+        }
+
+		/// <summary>
+		/// Paints the element style on the canvas.
+		/// </summary>
+		/// <param name="e">Holds information neccessary to paint style on canvas.</param>
+		public static void Paint(ElementStyleDisplayInfo e)
+		{
+			ElementStyleDisplay.PaintBackground(e);
+			ElementStyleDisplay.PaintBackgroundImage(e);
+			ElementStyleDisplay.PaintBorder(e);
+		}
+
+		private static eCornerType GetCornerType(eCornerType baseType, eCornerType specificType)
+		{
+			if(specificType!=eCornerType.Inherit)
+				return specificType;
+			return baseType;
+		}
+
+		/// <summary>
+		/// Paint style border.
+		/// </summary>
+		/// <param name="e">Style display information.</param>
+		public static void PaintBorder(ElementStyleDisplayInfo e)
+		{
+            ElementStyle style = GetElementStyle(e.Style);
+			Rectangle bounds=ElementStyleDisplay.GetBorderRectangle(style,e.Bounds);
+            if (bounds.Width < 2 || bounds.Height < 2)
+                return;
+
+            eCornerType cornerTopLeft = GetCornerType(style.CornerType, style.CornerTypeTopLeft);
+            eCornerType cornerTopRight = GetCornerType(style.CornerType, style.CornerTypeTopRight);
+            eCornerType cornerBottomLeft = GetCornerType(style.CornerType, style.CornerTypeBottomLeft);
+            eCornerType cornerBottomRight = GetCornerType(style.CornerType, style.CornerTypeBottomRight);
+
+            if (!style.BorderColor2.IsEmpty || !style.BorderColorLight.IsEmpty)
+            {
+                if (style.Border == eStyleBorderType.Solid)
+                {
+                    using (GraphicsPath path = DisplayHelp.GetRoundedRectanglePath(bounds, style.CornerDiameter, eStyleBackgroundPathPart.Complete,
+                        cornerTopLeft, cornerTopRight, cornerBottomLeft, cornerBottomRight))
+                    {
+                        DisplayHelp.DrawGradientPathBorder(e.Graphics, path, style.BorderColor, style.BorderColor2, style.BorderGradientAngle, style.BorderWidth);
+                    }
+                    return;
+                }
+                else if (style.Border == eStyleBorderType.Etched)
+                {
+                    Rectangle r = bounds;
+                    
+                    r.Width -= style.BorderWidth;
+                    r.Height -= style.BorderWidth;
+                    r.Offset(style.BorderWidth, style.BorderWidth);
+                    if (r.Width > 2 && r.Height > 2)
+                    {
+                        using (GraphicsPath path = DisplayHelp.GetRoundedRectanglePath(r, style.CornerDiameter, eStyleBackgroundPathPart.Complete,
+                            cornerTopLeft, cornerTopRight, cornerBottomLeft, cornerBottomRight))
+                        {
+                            DisplayHelp.DrawGradientPathBorder(e.Graphics, path, style.BorderColorLight, style.BorderColorLight2, style.BorderLightGradientAngle, style.BorderWidth);
+                        }
+                        r.Offset(-style.BorderWidth, -style.BorderWidth);
+                        using (GraphicsPath path = DisplayHelp.GetRoundedRectanglePath(r, style.CornerDiameter, eStyleBackgroundPathPart.Complete,
+                            cornerTopLeft, cornerTopRight, cornerBottomLeft, cornerBottomRight))
+                        {
+                            DisplayHelp.DrawGradientPathBorder(e.Graphics, path, style.BorderColor, style.BorderColor2, style.BorderGradientAngle, style.BorderWidth);
+                        }
+                    }
+                    return;
+                }
+                else if ((style.BorderTop == eStyleBorderType.Double && style.BorderLeft == eStyleBorderType.Double &&
+                    style.BorderRight == eStyleBorderType.Double && style.BorderBottom == eStyleBorderType.Double) ||
+                   (style.BorderTop == eStyleBorderType.None && style.BorderLeft == eStyleBorderType.Double &&
+                   style.BorderRight == eStyleBorderType.Double && style.BorderBottom == eStyleBorderType.Double))
+                    {
+                    Rectangle r = bounds;
+                    Region oldClip = null;
+                    bool clipSet = false;
+                    if (style.BorderTop == eStyleBorderType.None)
+                    {
+                        Rectangle clipRect = r;
+                        clipRect.Width++;
+                        clipRect.Height++;
+                        e.Graphics.SetClip(clipRect);
+                        r.Y -= 3;
+                        r.Height += 3;
+                    }
+                    using(GraphicsPath path = DisplayHelp.GetBorderPath(r, style.CornerDiameter, eStyleBackgroundPathPart.Complete,
+                        cornerTopLeft, cornerTopRight, cornerBottomLeft, cornerBottomRight, style.PaintLeftBorder, style.PaintRightBorder, 
+                        style.PaintTopBorder, style.PaintBottomBorder))
+                    {
+                        using (Pen pen = new Pen(style.BorderColor, style.BorderWidth))
+                            path.Widen(pen);
+                        DisplayHelp.FillPath(e.Graphics, path, style.BorderColor, style.BorderColor2);
+                    }
+                    r.Inflate(-style.BorderWidth, -style.BorderWidth);
+                    using (GraphicsPath path = DisplayHelp.GetBorderPath(r, style.CornerDiameter, eStyleBackgroundPathPart.Complete,
+                        cornerTopLeft, cornerTopRight, cornerBottomLeft, cornerBottomRight, style.PaintLeftBorder, style.PaintRightBorder,
+                        style.PaintTopBorder, style.PaintBottomBorder))
+                    {
+                        using (Pen pen = new Pen(style.BorderColor, style.BorderWidth))
+                            path.Widen(pen);
+                        DisplayHelp.FillPath(e.Graphics, path, style.BorderColorLight, style.BorderColorLight2);
+                    }
+
+                    if (clipSet)
+                        e.Graphics.Clip = oldClip;
+
+                    return;
+                }
+            }
+
+            Color colorStart = style.BorderColor;
+            Color colorEnd = style.BorderColor2;
+            Color colorLightStart = style.BorderColorLight;
+            Color colorLightEnd = style.BorderColorLight2;
+
+			if(style.PaintLeftBorder)
+			{
+				Color color=style.BorderColor;
+				if(!style.BorderLeftColor.IsEmpty)
+					color=style.BorderLeftColor;
+				Point[] p=new Point[2];
+
+				// Corner type square is default setting
+				p[0]=bounds.Location;
+				p[1].X=bounds.X;
+				p[1].Y=bounds.Bottom;
+
+				if(cornerTopLeft!=eCornerType.Square)
+				{
+					p[0].Y+=style.CornerDiameter;
+				}
+				if(cornerBottomLeft!=eCornerType.Square)
+				{
+					p[1].Y-=style.CornerDiameter;
+				}
+
+                ElementStyleDisplay.DrawBorderLine(e.Graphics, p, style.BorderLeft, style.BorderLeftWidth, color, colorEnd, colorLightStart, colorLightEnd, eBorderSide.Left);
+
+				if(style.PaintTopBorder && cornerTopLeft!=eCornerType.Square)
+				{
+					if(cornerTopLeft==eCornerType.Diagonal)
+					{
+						p[0].X=bounds.X;
+						p[0].Y=bounds.Y+style.CornerDiameter;
+						p[1].X=bounds.X+style.CornerDiameter;
+						p[1].Y=bounds.Y;
+                        ElementStyleDisplay.DrawBorderLine(e.Graphics, p, style.BorderLeft, style.BorderLeftWidth, color, colorEnd, colorLightStart, colorLightEnd, eBorderSide.TopLeft);
+					}
+					else if(cornerTopLeft==eCornerType.Rounded)
+					{
+						ArcData a=GetCornerArc(bounds,style.CornerDiameter,eCornerArc.TopLeft);// new ArcData(bounds.X,bounds.Y,style.CornerDiameter*2,style.CornerDiameter*2,180,90);
+						ElementStyleDisplay.DrawCornerArc(e.Graphics,a,style.BorderLeft,style.BorderLeftWidth,color);
+					}
+				}
+
+				if(style.PaintBottomBorder && cornerBottomLeft!=eCornerType.Square)
+				{
+					if(cornerBottomLeft==eCornerType.Diagonal)
+					{
+						p[0].X=bounds.X;
+						p[0].Y=bounds.Bottom-style.CornerDiameter;
+						p[1].X=bounds.X+style.CornerDiameter;
+						p[1].Y=bounds.Bottom;
+                        ElementStyleDisplay.DrawBorderLine(e.Graphics, p, style.BorderLeft, style.BorderLeftWidth, color, colorEnd, colorLightStart, colorLightEnd, eBorderSide.BottomLeft);
+					}
+					else if(cornerBottomLeft==eCornerType.Rounded)
+					{
+						ArcData a=GetCornerArc(bounds,style.CornerDiameter,eCornerArc.BottomLeft);// new ArcData(bounds.X,bounds.Y,style.CornerDiameter*2,style.CornerDiameter*2,180,90);
+						ElementStyleDisplay.DrawCornerArc(e.Graphics,a,style.BorderLeft,style.BorderLeftWidth,color);
+					}
+				}
+			}
+
+			if(style.PaintTopBorder)
+			{
+				Color color=style.BorderColor;
+				if(!style.BorderTopColor.IsEmpty)
+					color=style.BorderTopColor;
+				Point[] p=new Point[2];
+				// Default setting for Square corner type on both sides
+				p[0]=bounds.Location;
+				p[1].X=bounds.Right;
+				p[1].Y=bounds.Y;
+
+				if(cornerTopLeft!=eCornerType.Square)
+				{
+					p[0].X+=style.CornerDiameter;
+				}
+				if(cornerTopRight!=eCornerType.Square)
+				{
+					p[1].X-=style.CornerDiameter;
+				}
+                ElementStyleDisplay.DrawBorderLine(e.Graphics, p, style.BorderTop, style.BorderTopWidth, color, colorEnd, colorLightStart, colorLightEnd, eBorderSide.Top);
+			}
+
+			if(style.PaintBottomBorder)
+			{
+				Color color=style.BorderColor;
+				if(!style.BorderBottomColor.IsEmpty)
+					color=style.BorderBottomColor;
+				Point[] p=new Point[2];
+				// Default for Square corner type on both sides
+				p[0].X=bounds.X;
+				p[0].Y=bounds.Bottom;
+				p[1].X=bounds.Right;
+				p[1].Y=bounds.Bottom;
+
+				if(cornerBottomLeft!=eCornerType.Square)
+				{
+					p[0].X+=style.CornerDiameter;
+				}
+				if(cornerBottomRight!=eCornerType.Square)
+				{
+					p[1].X-=style.CornerDiameter;
+				}
+
+                ElementStyleDisplay.DrawBorderLine(e.Graphics, p, style.BorderBottom, style.BorderBottomWidth, color, colorEnd, colorLightStart, colorLightEnd, eBorderSide.Bottom);
+			}
+
+			if(style.PaintRightBorder)
+			{
+				Color color=style.BorderColor;
+				if(!style.BorderRightColor.IsEmpty)
+					color=style.BorderRightColor;
+				Point[] p=new Point[2];
+				// Default for Square corner type on both sides
+				p[0].X=bounds.Right;
+				p[0].Y=bounds.Y;
+				p[1].X=bounds.Right;
+				p[1].Y=bounds.Bottom;
+
+				if(cornerTopRight!=eCornerType.Square)
+				{
+					p[0].Y+=style.CornerDiameter;
+				}
+				if(cornerBottomRight!=eCornerType.Square)
+				{
+					p[1].Y-=style.CornerDiameter;
+				}
+
+                ElementStyleDisplay.DrawBorderLine(e.Graphics, p, style.BorderRight, style.BorderRightWidth, color, colorEnd, colorLightStart, colorLightEnd, eBorderSide.Right);
+
+				if(style.PaintTopBorder && cornerTopRight!=eCornerType.Square)
+				{
+					if(cornerTopRight==eCornerType.Diagonal)
+					{
+						p[0].X=bounds.Right-style.CornerDiameter;
+						p[0].Y=bounds.Y;
+						p[1].X=bounds.Right;
+						p[1].Y=bounds.Y+style.CornerDiameter;
+                        ElementStyleDisplay.DrawBorderLine(e.Graphics, p, style.BorderLeft, style.BorderRightWidth, color, colorEnd, colorLightStart, colorLightEnd, eBorderSide.TopRight);
+					}
+					else if(cornerTopRight==eCornerType.Rounded)
+					{
+						ArcData a=GetCornerArc(bounds,style.CornerDiameter,eCornerArc.TopRight);// new ArcData(bounds.X,bounds.Y,style.CornerDiameter*2,style.CornerDiameter*2,180,90);
+						ElementStyleDisplay.DrawCornerArc(e.Graphics,a,style.BorderLeft,style.BorderLeftWidth,color);
+					}
+				}
+
+				if(style.PaintBottomBorder && cornerBottomRight!=eCornerType.Square)
+				{
+					if(cornerBottomRight==eCornerType.Diagonal)
+					{
+						p[0].X=bounds.Right;
+						p[0].Y=bounds.Bottom-style.CornerDiameter;
+						p[1].X=bounds.Right-style.CornerDiameter;
+						p[1].Y=bounds.Bottom;
+						ElementStyleDisplay.DrawBorderLine(e.Graphics,p,style.BorderLeft,style.BorderRightWidth,color, colorEnd, colorLightStart, colorLightEnd,eBorderSide.BottomRight);
+					}
+					else if(cornerBottomRight==eCornerType.Rounded)
+					{
+						ArcData a=GetCornerArc(bounds,style.CornerDiameter,eCornerArc.BottomRight);// new ArcData(bounds.X,bounds.Y,style.CornerDiameter*2,style.CornerDiameter*2,180,90);
+						ElementStyleDisplay.DrawCornerArc(e.Graphics,a,style.BorderLeft,style.BorderLeftWidth,color);
+					}
+				}
+			}
+
+		}
+
+		private static Pen CreatePen(eStyleBorderType border,int lineWidth, Color color)
+		{
+			Pen pen=new Pen(color,lineWidth);
+			pen.Alignment=PenAlignment.Inset;
+			pen.DashStyle=ElementStyleDisplay.GetDashStyle(border);
+			return pen;
+		}
+
+		private static void DrawBorderLine(Graphics g,Point[] p,eStyleBorderType border,int lineWidth, Color colorStart, Color colorEnd, Color colorLightStart, Color colorLightEnd, eBorderSide side)
+		{
+            if (border == eStyleBorderType.Etched || border == eStyleBorderType.Double)
+            {
+                if (colorLightStart.IsEmpty)
+                {
+                    colorLightStart = System.Windows.Forms.ControlPaint.Light(colorStart);
+                    colorStart = System.Windows.Forms.ControlPaint.Dark(colorStart);
+                }
+
+                if (side == eBorderSide.Bottom || side == eBorderSide.Right)
+                {
+                    Color ct1 = colorStart;
+                    Color ct2 = colorEnd;
+                    colorStart = colorLightStart;
+                    colorEnd = colorLightEnd;
+                    colorLightStart = ct1;
+                    colorLightEnd = ct2;
+                }
+
+                DisplayHelp.DrawGradientLine(g, p[0], p[1], colorStart, colorEnd, 90, lineWidth);
+                
+                if (side == eBorderSide.Top)
+                {
+                    p[0].Y+=lineWidth;
+                    p[1].Y += lineWidth;
+                }
+                else if (side == eBorderSide.Bottom)
+                {
+                    p[0].Y -= lineWidth;
+                    p[1].Y -= lineWidth;
+                }
+                else if (side == eBorderSide.Left || side == eBorderSide.BottomLeft || side == eBorderSide.TopLeft)
+                {
+                    p[0].X += lineWidth;
+                    p[1].X += lineWidth;
+                }
+                else if (side == eBorderSide.Right || side == eBorderSide.BottomRight || side == eBorderSide.TopRight)
+                {
+                    p[0].X -= lineWidth;
+                    p[1].X -= lineWidth;
+                }
+
+                DisplayHelp.DrawGradientLine(g, p[0], p[1], colorLightStart, colorLightEnd, 90, lineWidth);
+            }
+            else
+            {
+                if (colorEnd.IsEmpty)
+                {
+                    SmoothingMode sm = g.SmoothingMode;
+                    g.SmoothingMode = SmoothingMode.None;
+                    using (Pen pen = CreatePen(border, lineWidth, colorStart))
+                        g.DrawLine(pen, p[0], p[1]);
+                    g.SmoothingMode = sm;
+                }
+                else
+                    DisplayHelp.DrawGradientLine(g, p[0], p[1], colorStart, colorEnd, 90, lineWidth);
+            }
+		}
+
+		private static void DrawCornerArc(Graphics g,ArcData arc,eStyleBorderType border,int lineWidth, Color color)
+		{
+			using(Pen pen=CreatePen(border,lineWidth,color))
+			{
+				g.DrawArc(pen,arc.X,arc.Y,arc.Width,arc.Height,arc.StartAngle,arc.SweepAngle);
+			}
+		}
+
+		private static DashStyle GetDashStyle(eStyleBorderType border)
+		{
+			DashStyle style=DashStyle.Solid;
+			switch(border)
+			{
+				case eStyleBorderType.Dash:
+                    style=DashStyle.Dash;
+					break;
+				case eStyleBorderType.DashDot:
+					style=DashStyle.DashDot;
+					break;
+				case eStyleBorderType.DashDotDot:
+					style=DashStyle.DashDotDot;
+					break;
+				case eStyleBorderType.Dot:
+					style=DashStyle.Dot;
+					break;
+			}
+			return style;
+		}
+
+        internal static ElementStyle GetElementStyle(ElementStyle style)
+        {
+            if (style.Class == "")
+                return style;
+            IElementStyleClassProvider provider = GetIElementStyleClassProvider();
+            if (provider != null)
+            {
+                ElementStyle baseStyle = provider.GetClass(style.Class);
+                if (baseStyle != null)
+                {
+                    return baseStyle;
+                }
+            }
+
+            return style;
+        }
+
+        private static IElementStyleClassProvider GetIElementStyleClassProvider()
+        {
+#if DOTNETBAR
+            if (Rendering.GlobalManager.Renderer is Rendering.Office2007Renderer)
+            {
+                return ((Rendering.Office2007Renderer)Rendering.GlobalManager.Renderer).ColorTable as IElementStyleClassProvider;
+            }
+#endif
+            return null;
+        }
+
+		/// <summary>
+		/// Paints style background.
+		/// </summary>
+		/// <param name="e">Style display information.</param>
+		public static void PaintBackground(ElementStyleDisplayInfo e)
+		{
+            Region oldClip = e.Graphics.Clip;
+            if (oldClip != null)
+                e.Graphics.SetClip(e.Bounds, CombineMode.Intersect);
+            else
+                e.Graphics.SetClip(e.Bounds, CombineMode.Replace);
+
+            ElementStyle style = GetElementStyle(e.Style);
+
+            SmoothingMode sm = e.Graphics.SmoothingMode;
+            e.Graphics.SmoothingMode = SmoothingMode.Default;
+
+			// Paint Background
+			Rectangle bounds=DisplayHelp.GetDrawRectangle(ElementStyleDisplay.GetBackgroundRectangle(style,e.Bounds));
+			GraphicsPath path;
+            path = ElementStyleDisplay.GetBackgroundPath(style, e.Bounds);
+
+            eBackgroundColorBlendType blendType = style.BackColorBlend.GetBlendType();
+            if (blendType!=eBackgroundColorBlendType.Invalid)
+            {
+                if (blendType == eBackgroundColorBlendType.Relative)
+                {
+                    try
+                    {
+                        if (style.BackColorGradientType == eGradientType.Linear)
+                        {
+                            Rectangle rb = bounds;
+                            rb.Inflate(1, 1);
+                            using (LinearGradientBrush brush = DisplayHelp.CreateLinearGradientBrush(rb, style.BackColor, style.BackColor2, style.BackColorGradientAngle))
+                            {
+                                brush.InterpolationColors = style.BackColorBlend.GetColorBlend();
+                                e.Graphics.FillPath(brush, path);
+                            }
+                        }
+                        else if (style.BackColorGradientType == eGradientType.Radial)
+                        {
+                            int d = (int)Math.Sqrt(bounds.Width * bounds.Width + bounds.Height * bounds.Height) + 4;
+                            GraphicsPath fillPath = new GraphicsPath();
+                            fillPath.AddEllipse(bounds.X - (d - bounds.Width) / 2, bounds.Y - (d - bounds.Height) / 2, d, d);
+                            using (PathGradientBrush brush = new PathGradientBrush(fillPath))
+                            {
+                                brush.CenterColor = style.BackColor;
+                                brush.SurroundColors = new Color[] { style.BackColor2 };
+                                brush.InterpolationColors = style.BackColorBlend.GetColorBlend();
+                                e.Graphics.FillPath(brush, path);
+                            }
+                            fillPath.Dispose();
+                        }
+                    }
+                    catch
+                    {
+                        blendType = eBackgroundColorBlendType.Invalid;
+                    }
+                }
+                else
+                {
+                    Graphics g = e.Graphics;
+                    bounds = e.Bounds;
+                    if (oldClip != null)
+                    {
+                        e.Graphics.SetClip(oldClip, CombineMode.Replace);
+                        e.Graphics.SetClip(path, CombineMode.Intersect);
+                    }
+                    else
+                        e.Graphics.SetClip(path, CombineMode.Replace);
+                    BackgroundColorBlendCollection bc = style.BackColorBlend;
+                    for (int i = 0; i < bc.Count; i+=2)
+                    {
+                        BackgroundColorBlend b1 = bc[i];
+                        BackgroundColorBlend b2 = null;
+                        if (i < bc.Count)
+                            b2 = bc[i + 1];
+                        if (b1 != null && b2 != null)
+                        {
+                            Rectangle rb = new Rectangle(bounds.X, bounds.Y + (int)b1.Position, bounds.Width,
+                                (b2.Position == 1f ? bounds.Height : (int)b2.Position) - (int)b1.Position);
+                            using (LinearGradientBrush brush = DisplayHelp.CreateLinearGradientBrush(rb, b1.Color, b2.Color, style.BackColorGradientAngle))
+                                g.FillRectangle(brush, rb);
+                        }
+                    }
+                }
+            }
+            
+            if(blendType==eBackgroundColorBlendType.Invalid)
+            {
+                if (style.BackColor2.IsEmpty)
+                {
+                    if (!style.BackColor.IsEmpty)
+                    {
+                        using (SolidBrush brush = new SolidBrush(style.BackColor))
+                            e.Graphics.FillPath(brush, path);
+                        //if(e.Style.BackColor.A==255)
+                        //{
+                        //    // Correct problems with FillPath where path was not filled properly...
+                        //    using(Pen pen=new Pen(e.Style.BackColor,1))
+                        //        e.Graphics.DrawPath(pen,path);
+                        //}
+                    }
+                }
+                else if (!style.BackColor.IsEmpty)
+                {
+                    if (style.BackColorGradientType == eGradientType.Linear)
+                    {
+                        Rectangle rb = bounds;
+                        rb.X--;
+                        rb.Height++;
+                        rb.Width += 2;
+                        using (LinearGradientBrush brush = DisplayHelp.CreateLinearGradientBrush(rb, style.BackColor, style.BackColor2, style.BackColorGradientAngle))
+                        {
+                            e.Graphics.FillPath(brush, path);
+                        }
+                    }
+                    else if (style.BackColorGradientType == eGradientType.Radial)
+                    {
+                        int d = (int)Math.Sqrt(bounds.Width * bounds.Width + bounds.Height * bounds.Height) + 4;
+                        GraphicsPath fillPath = new GraphicsPath();
+                        fillPath.AddEllipse(bounds.X - (d - bounds.Width) / 2, bounds.Y - (d - bounds.Height) / 2, d, d);
+                        using (PathGradientBrush brush = new PathGradientBrush(fillPath))
+                        {
+                            brush.CenterColor = style.BackColor;
+                            brush.SurroundColors = new Color[] { style.BackColor2 };
+                            e.Graphics.FillPath(brush, path);
+                        }
+                        fillPath.Dispose();
+                    }
+                }
+            }
+
+            e.Graphics.SmoothingMode = sm;
+
+            if (oldClip != null)
+                e.Graphics.Clip = oldClip;
+            else
+                e.Graphics.ResetClip();
+
+			
+		}
+		
+		/// <summary>
+		/// Paints style background image.
+		/// </summary>
+		/// <param name="e">Style display information.</param>
+		public static void PaintBackgroundImage(ElementStyleDisplayInfo e)
+		{
+            ElementStyle style = GetElementStyle(e.Style);
+			if(style.BackgroundImage==null)
+				return;
+
+            Rectangle bounds = DisplayHelp.GetDrawRectangle(ElementStyleDisplay.GetBackgroundRectangle(style, e.Bounds));
+			GraphicsPath path;
+			if (e.Graphics.SmoothingMode == SmoothingMode.AntiAlias)
+			{
+				Rectangle r = e.Bounds;
+				r.Width--;
+				//r.Height--;
+                path = ElementStyleDisplay.GetBackgroundPath(style, r);
+			}
+			else
+                path = ElementStyleDisplay.GetBackgroundPath(style, e.Bounds);
+			
+			ImageAttributes imageAtt=null;
+
+            if (style.BackgroundImageAlpha != 255)
+			{
+				ColorMatrix colorMatrix=new ColorMatrix();
+                colorMatrix.Matrix33 = 255 - style.BackgroundImageAlpha;
+				imageAtt=new ImageAttributes();
+				imageAtt.SetColorMatrix(colorMatrix,ColorMatrixFlag.Default,ColorAdjustType.Bitmap);
+			}
+
+			Region clip=e.Graphics.Clip;
+			e.Graphics.SetClip(path);
+
+            eStyleBackgroundImage imagePosition = style.BackgroundImagePosition;
+            bool transform = false;
+            Image backgroundImage = style.BackgroundImage;
+
+            if (e.RightToLeft)
+            {
+                if (imagePosition == eStyleBackgroundImage.TopLeft)
+                {
+                    imagePosition = eStyleBackgroundImage.TopRight;
+                    transform = true;
+                }
+                else if (imagePosition == eStyleBackgroundImage.TopRight)
+                    imagePosition = eStyleBackgroundImage.TopLeft;
+                else if (imagePosition == eStyleBackgroundImage.BottomLeft)
+                    imagePosition = eStyleBackgroundImage.BottomRight;
+                else if (imagePosition == eStyleBackgroundImage.BottomRight)
+                    imagePosition = eStyleBackgroundImage.BottomLeft;
+            }
+
+            if (transform)
+            {
+                backgroundImage = backgroundImage.Clone() as Image;
+                backgroundImage.RotateFlip(RotateFlipType.RotateNoneFlipX);
+            }
+
+            switch (imagePosition)
+			{
+				case eStyleBackgroundImage.Stretch:
+				{
+					if(imageAtt!=null)
+                        e.Graphics.DrawImage(backgroundImage, bounds, 0, 0, backgroundImage.Width, backgroundImage.Height, GraphicsUnit.Pixel, imageAtt);
+					else
+                        e.Graphics.DrawImage(backgroundImage, bounds, 0, 0, backgroundImage.Width, backgroundImage.Height, GraphicsUnit.Pixel);
+					break;
+				}
+				case eStyleBackgroundImage.Center:
+				{
+                    Rectangle destRect = new Rectangle(bounds.X, bounds.Y, backgroundImage.Width, backgroundImage.Height);
+                    if (bounds.Width > backgroundImage.Width)
+                        destRect.X += (bounds.Width - backgroundImage.Width) / 2;
+                    if (bounds.Height > backgroundImage.Height)
+                        destRect.Y += (bounds.Height - backgroundImage.Height) / 2;
+					if(imageAtt!=null)
+                        e.Graphics.DrawImage(backgroundImage, destRect, 0, 0, backgroundImage.Width, backgroundImage.Height, GraphicsUnit.Pixel, imageAtt);
+					else
+                        e.Graphics.DrawImage(backgroundImage, destRect, 0, 0, backgroundImage.Width, backgroundImage.Height, GraphicsUnit.Pixel);
+					
+					break;
+				}
+				case eStyleBackgroundImage.TopLeft:
+				case eStyleBackgroundImage.TopRight:
+				case eStyleBackgroundImage.BottomLeft:
+				case eStyleBackgroundImage.BottomRight:
+				{
+                    Rectangle destRect = new Rectangle(bounds.X, bounds.Y, backgroundImage.Width, backgroundImage.Height);
+                    if (imagePosition == eStyleBackgroundImage.TopRight)
+                        destRect.X = bounds.Right - backgroundImage.Width;
+                    else if (imagePosition == eStyleBackgroundImage.BottomLeft)
+                        destRect.Y = bounds.Bottom - backgroundImage.Height;
+                    else if (imagePosition == eStyleBackgroundImage.BottomRight)
+					{
+                        destRect.Y = bounds.Bottom - backgroundImage.Height;
+                        destRect.X = bounds.Right - backgroundImage.Width;
+					}
+
+					if(imageAtt!=null)
+                        e.Graphics.DrawImage(backgroundImage, destRect, 0, 0, backgroundImage.Width, backgroundImage.Height, GraphicsUnit.Pixel, imageAtt);
+					else
+                        e.Graphics.DrawImage(backgroundImage, destRect, 0, 0, backgroundImage.Width, backgroundImage.Height, GraphicsUnit.Pixel);
+					break;
+				}
+				case eStyleBackgroundImage.Tile:
+				{
+					if(imageAtt!=null)
+					{
+                        if (bounds.Width > backgroundImage.Width || bounds.Height > backgroundImage.Height)
+						{
+							int x=bounds.X,y=bounds.Y;
+							while(y<bounds.Bottom)
+							{
+								while(x<bounds.Right)
+								{
+                                    Rectangle destRect = new Rectangle(x, y, backgroundImage.Width, backgroundImage.Height);
+									if(destRect.Right>bounds.Right)
+										destRect.Width=destRect.Width-(destRect.Right-bounds.Right);
+									if(destRect.Bottom>bounds.Bottom)
+										destRect.Height=destRect.Height-(destRect.Bottom-bounds.Bottom);
+                                    e.Graphics.DrawImage(backgroundImage, destRect, 0, 0, destRect.Width, destRect.Height, GraphicsUnit.Pixel, imageAtt);
+                                    x += backgroundImage.Width;
+								}
+								x=bounds.X;
+                                y += backgroundImage.Height;
+							}
+						}
+						else
+						{
+                            e.Graphics.DrawImage(backgroundImage, new Rectangle(0, 0, backgroundImage.Width, backgroundImage.Height), 0, 0, backgroundImage.Width, backgroundImage.Height, GraphicsUnit.Pixel, imageAtt);
+						}
+					}
+					else
+					{
+                        TextureBrush brush = new TextureBrush(backgroundImage);
+						brush.WrapMode=WrapMode.Tile;
+						e.Graphics.FillPath(brush,path);
+						brush.Dispose();
+					}
+					break;
+				}
+			}
+            if (transform)
+            {
+                backgroundImage.Dispose();
+            }
+
+			if (clip != null)
+				e.Graphics.Clip = clip;
+			else
+				e.Graphics.ResetClip();
+		}
+
+		/// <summary>
+		/// Returns background rectangle for given style by taking in account margins.
+		/// </summary>
+		/// <param name="style">Reference to style object.</param>
+		/// <param name="bounds">Style bounds</param>
+		/// <returns>Background rectangle.</returns>
+		public static Rectangle GetBackgroundRectangle(ElementStyle style, Rectangle bounds)
+		{
+			// Reduce the bounds rectangle size by the margin size
+			bounds.X+=style.MarginLeft;
+			bounds.Width-=(style.MarginLeft+style.MarginRight);
+			bounds.Y+=style.MarginTop;
+			bounds.Height-=(style.MarginTop+style.MarginBottom);
+			return bounds;
+		}
+
+		private static Rectangle GetBorderRectangle(ElementStyle style, Rectangle bounds)
+		{
+			bounds=GetBackgroundRectangle(style,bounds);
+			if(style.PaintRightBorder)
+			{
+				if(style.BorderRightWidth<=1)
+					bounds.Width-=style.BorderRightWidth;
+				else
+					bounds.Width-=style.BorderRightWidth/2;
+			}
+
+			if(style.PaintBottomBorder)
+			{
+				if(style.BorderBottomWidth<=1)
+					bounds.Height-=style.BorderBottomWidth;
+				else
+					bounds.Height-=style.BorderBottomWidth/2;
+			}
+
+			if(style.PaintLeftBorder && style.BorderLeftWidth>1)
+			{
+				bounds.X+=style.BorderLeftWidth/2;
+				bounds.Width-=style.BorderLeftWidth/2;
+			}
+
+			if(style.PaintTopBorder && style.BorderTopWidth>1)
+			{
+				bounds.X+=style.BorderTopWidth/2;
+				bounds.Width-=style.BorderTopWidth/2;
+			}
+
+			return bounds;
+		}
+
+		private static Rectangle GetTextRectangle(ElementStyle style, Rectangle bounds)
+		{
+			bounds=ElementStyleDisplay.GetBackgroundRectangle(style,bounds);
+
+			// Reduce the bounds rectangle size by the padding size
+			bounds.X+=style.PaddingLeft;
+			bounds.Width-=(style.PaddingLeft+style.PaddingRight);
+			bounds.Y+=style.PaddingTop;
+			bounds.Height-=(style.PaddingTop+style.PaddingBottom);
+			return bounds;
+		}
+		
+		/// <summary>
+		/// Returns GraphicsPath for given style.
+		/// </summary>
+		/// <param name="style">Reference to style.</param>
+		/// <param name="bounds">Style bounds.</param>
+		/// <returns>New instance of GraphicsPath</returns>
+		public static GraphicsPath GetBackgroundPath(ElementStyle style, Rectangle bounds)
+		{
+			return GetBackgroundPath(style, bounds, eStyleBackgroundPathPart.Complete);
+		}
+
+		/// <summary>
+		/// Returns GraphicsPath for given style.
+		/// </summary>
+		/// <param name="style">Reference to style.</param>
+		/// <param name="bounds">Style bounds.</param>
+		/// <returns>New instance of GraphicsPath</returns>
+		public static GraphicsPath GetBackgroundPath(ElementStyle style, Rectangle bounds, eStyleBackgroundPathPart pathPart)
+		{
+			GraphicsPath path=new GraphicsPath();
+			
+			Rectangle clientRectangle;
+			//if(drawPath)
+				clientRectangle=/*DisplayHelp.GetDrawRectangle*/(ElementStyleDisplay.GetBackgroundRectangle(style,bounds));
+			//else
+            //   clientRectangle =/*DisplayHelp.GetDrawRectangle*/(ElementStyleDisplay.GetBackgroundRectangle(style, bounds));
+
+            if (pathPart==eStyleBackgroundPathPart.Complete && style.CornerTypeBottomLeft == eCornerType.Inherit && style.CornerTypeBottomRight == eCornerType.Inherit &&
+                style.CornerTypeTopLeft == eCornerType.Inherit && style.CornerTypeTopRight == eCornerType.Inherit)
+            {
+                switch (style.CornerType)
+                {
+                    case eCornerType.Square:
+                        {
+                            path.AddRectangle(clientRectangle);
+                            break;
+                        }
+                    case eCornerType.Rounded:
+                        {
+                            ArcData ad = GetCornerArc(clientRectangle, style.CornerDiameter, eCornerArc.TopLeft);
+                            path.AddArc(ad.X, ad.Y, ad.Width, ad.Height, ad.StartAngle, ad.SweepAngle);
+                            ad = GetCornerArc(clientRectangle, style.CornerDiameter, eCornerArc.TopRight);
+                            path.AddArc(ad.X, ad.Y, ad.Width, ad.Height, ad.StartAngle, ad.SweepAngle);
+                            ad = GetCornerArc(clientRectangle, style.CornerDiameter, eCornerArc.BottomRight);
+                            path.AddArc(ad.X, ad.Y, ad.Width, ad.Height, ad.StartAngle, ad.SweepAngle);
+                            ad = GetCornerArc(clientRectangle, style.CornerDiameter, eCornerArc.BottomLeft);
+                            path.AddArc(ad.X, ad.Y, ad.Width, ad.Height, ad.StartAngle, ad.SweepAngle);
+                            path.CloseAllFigures();
+                            break;
+                        }
+                    case eCornerType.Diagonal:
+                        {
+                            path.AddLine(clientRectangle.X, clientRectangle.Bottom - style.CornerDiameter - 1, clientRectangle.X, clientRectangle.Y + style.CornerDiameter);
+                            path.AddLine(clientRectangle.X + style.CornerDiameter, clientRectangle.Y, clientRectangle.Right - style.CornerDiameter, clientRectangle.Y);
+                            path.AddLine(clientRectangle.Right, clientRectangle.Y + style.CornerDiameter, clientRectangle.Right, clientRectangle.Bottom - style.CornerDiameter - 1);
+                            path.AddLine(clientRectangle.Right - style.CornerDiameter - 1, clientRectangle.Bottom, clientRectangle.X + style.CornerDiameter, clientRectangle.Bottom);
+                            path.CloseAllFigures();
+                            break;
+                        }
+                }
+            }
+            else
+            {
+				if(pathPart==eStyleBackgroundPathPart.TopHalf)
+					clientRectangle.Height = clientRectangle.Height/2;
+				else if(pathPart==eStyleBackgroundPathPart.BottomHalf)
+				{
+					int h=clientRectangle.Height;
+					clientRectangle.Height = clientRectangle.Height/2;
+					clientRectangle.Y += (h - clientRectangle.Height-1);
+				}
+            	
+                eCornerType corner = style.CornerTypeTopLeft;
+                if (corner == eCornerType.Inherit)
+                    corner = style.CornerType;
+
+            	if(pathPart==eStyleBackgroundPathPart.BottomHalf)
+            		corner=eCornerType.Square;
+            		
+                if (corner == eCornerType.Rounded)
+                {
+                    ArcData ad = GetCornerArc(clientRectangle, style.CornerDiameter, eCornerArc.TopLeft);
+                    path.AddArc(ad.X, ad.Y, ad.Width, ad.Height, ad.StartAngle, ad.SweepAngle);
+                }
+                else if (corner == eCornerType.Diagonal)
+                {
+                    path.AddLine(clientRectangle.X, clientRectangle.Y + style.CornerDiameter, clientRectangle.X + style.CornerDiameter, clientRectangle.Y);
+                }
+                else
+                {
+                    path.AddLine(clientRectangle.X, clientRectangle.Y + 2, clientRectangle.X, clientRectangle.Y);
+                    path.AddLine(clientRectangle.X, clientRectangle.Y ,clientRectangle.X+2, clientRectangle.Y);
+                }
+
+                corner = style.CornerTypeTopRight;
+                if (corner == eCornerType.Inherit)
+                    corner = style.CornerType;
+				if(pathPart==eStyleBackgroundPathPart.BottomHalf)
+					corner=eCornerType.Square;
+                if (corner == eCornerType.Rounded)
+                {
+                    ArcData ad = GetCornerArc(clientRectangle, style.CornerDiameter, eCornerArc.TopRight);
+                    path.AddArc(ad.X, ad.Y, ad.Width, ad.Height, ad.StartAngle, ad.SweepAngle);
+                }
+                else if (corner == eCornerType.Diagonal)
+                {
+                    path.AddLine(clientRectangle.Right-style.CornerDiameter-1, clientRectangle.Y , clientRectangle.Right, clientRectangle.Y+style.CornerDiameter);
+                }
+                else
+                {
+                    path.AddLine(clientRectangle.Right-2, clientRectangle.Y, clientRectangle.Right, clientRectangle.Y);
+                    path.AddLine(clientRectangle.Right, clientRectangle.Y, clientRectangle.Right, clientRectangle.Y+2);
+                }
+
+                corner = style.CornerTypeBottomRight;
+                if (corner == eCornerType.Inherit)
+                    corner = style.CornerType;
+				if(pathPart==eStyleBackgroundPathPart.TopHalf)
+					corner=eCornerType.Square;
+                if (corner == eCornerType.Rounded)
+                {
+                    ArcData ad = GetCornerArc(clientRectangle, style.CornerDiameter, eCornerArc.BottomRight);
+                    path.AddArc(ad.X, ad.Y, ad.Width, ad.Height, ad.StartAngle, ad.SweepAngle);
+                }
+                else if (corner == eCornerType.Diagonal)
+                {
+                    path.AddLine(clientRectangle.Right, clientRectangle.Bottom - style.CornerDiameter - 1, clientRectangle.Right - style.CornerDiameter - 1, clientRectangle.Bottom);
+                }
+                else
+                {
+                    path.AddLine(clientRectangle.Right, clientRectangle.Bottom-2, clientRectangle.Right, clientRectangle.Bottom);
+                    path.AddLine(clientRectangle.Right, clientRectangle.Bottom, clientRectangle.Right-2, clientRectangle.Bottom);
+                }
+
+                corner = style.CornerTypeBottomLeft;
+                if (corner == eCornerType.Inherit)
+                    corner = style.CornerType;
+				if(pathPart==eStyleBackgroundPathPart.TopHalf)
+					corner=eCornerType.Square;
+                if (corner == eCornerType.Rounded)
+                {
+                    ArcData ad = GetCornerArc(clientRectangle, style.CornerDiameter, eCornerArc.BottomLeft);
+                    path.AddArc(ad.X, ad.Y, ad.Width, ad.Height, ad.StartAngle, ad.SweepAngle);
+                }
+                else if (corner == eCornerType.Diagonal)
+                {
+                    path.AddLine(clientRectangle.X + 2, clientRectangle.Bottom, clientRectangle.X, clientRectangle.Bottom - style.CornerDiameter - 1);
+                }
+                else
+                {
+                    path.AddLine(clientRectangle.X+2, clientRectangle.Bottom, clientRectangle.X, clientRectangle.Bottom);
+                    path.AddLine(clientRectangle.X, clientRectangle.Bottom, clientRectangle.X, clientRectangle.Bottom-2);
+                }
+            }
+
+			return path;
+		}
+
+        internal static void AddCornerArc(GraphicsPath path, Rectangle bounds, int cornerDiameter, eCornerArc corner)
+        {
+            ArcData a = GetCornerArc(bounds, cornerDiameter, corner);
+            path.AddArc(a.X, a.Y, a.Width, a.Height, a.StartAngle, a.SweepAngle);
+        }
+
+		internal static ArcData GetCornerArc(Rectangle bounds, int cornerDiameter, eCornerArc corner)
+		{
+			ArcData a;
+			int diameter=cornerDiameter*2;
+			switch(corner)
+			{
+				case eCornerArc.TopLeft:
+					a=new ArcData(bounds.X,bounds.Y,diameter,diameter,180,90);
+					break;
+                case eCornerArc.TopRight:
+					a=new ArcData(bounds.Right-diameter,bounds.Y,diameter,diameter,270,90);
+					break;
+				case eCornerArc.BottomLeft:
+					a=new ArcData(bounds.X,bounds.Bottom-diameter,diameter,diameter,90,90);
+					break;
+				default: // eCornerArc.BottomRight:
+					a=new ArcData(bounds.Right-diameter,bounds.Bottom-diameter,diameter,diameter,0,90);
+					break;
+			}
+			return a; 
+		}
+
+		enum eBorderSide
+		{
+			Top,
+			Bottom,
+			Left,
+			Right,
+			TopLeft,
+			TopRight,
+			BottomLeft,
+			BottomRight
+		}
+	}
+
+    internal enum eCornerArc
+    {
+        TopLeft,
+        TopRight,
+        BottomLeft,
+        BottomRight
+    }
+
+	/// <summary>
+	/// Represents information neccessary to paint the style on canvas.
+	/// </summary>
+	public class ElementStyleDisplayInfo
+	{
+		/// <summary>Reference to ElementStyle object.</summary>
+		public ElementStyle Style=null;
+		/// <summary>Reference to Graphics object.</summary>
+		public Graphics Graphics=null;
+		/// <summary>ElementStyle bounds.</summary>
+		public Rectangle Bounds=Rectangle.Empty;
+        /// <summary>Get or sets whether layout is right-to-left.</summary>
+        public bool RightToLeft = false;
+
+        /// <summary>Creates new instance of the object.</summary>
+		public ElementStyleDisplayInfo()
+		{
+		}
+
+		/// <summary>Creates new instance of the object and initializes it with default values.</summary>
+		/// <param name="style">Style to initialize object with.</param>
+		/// <param name="g">Graphics object to initialize object with.</param>
+		/// <param name="bounds">Bounds to initialize object with.</param>
+		public ElementStyleDisplayInfo(ElementStyle style, Graphics g, Rectangle bounds)
+		{
+			this.Style=style;
+			this.Graphics=g;
+			this.Bounds=bounds;
+		}
+//		public ElementStyleDisplayInfo(ElementStyle style, System.Drawing.Graphics g, Rectangle bounds, string text, Rectangle textBounds)
+//		{
+//			this.Style=style;
+//			this.Graphics=g;
+//			this.Bounds=bounds;
+//			this.Text=text;
+//			this.TextBounds=textBounds;
+//		}
+	}
+	
+	#region eStyleBackgroundPathPart
+	/// <summary>
+	/// Specifies part of the background path.
+	/// </summary>
+	public enum eStyleBackgroundPathPart
+	{
+		/// <summary>
+		/// Indicates complete background path
+		/// </summary>
+		Complete,
+		/// <summary>
+		/// Indicates Top half of background path
+		/// </summary>
+		TopHalf,
+		/// <summary>
+		/// Indicates Bottom half of background path
+		/// </summary>
+		BottomHalf
+	}
+	#endregion
+
+	#region ArcData
+	internal struct ArcData
+	{
+		public int X;
+		public int Y;
+		public int Width;
+		public int Height;
+		public float StartAngle;
+		public float SweepAngle;
+		public ArcData(int x, int y, int width, int height, float startAngle, float sweepAngle)
+		{
+			this.X=x;
+			this.Y=y;
+			this.Width=width;
+			this.Height=height;
+			this.StartAngle=startAngle;
+			this.SweepAngle=sweepAngle;
+		}
+	}
+	#endregion
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/ElementStyleLayout.cs b/PROMS/DotNetBar Source Code/TreeGX/ElementStyleLayout.cs
new file mode 100644
index 00000000..e0643a3c
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/ElementStyleLayout.cs	
@@ -0,0 +1,213 @@
+using System;
+using System.Drawing;
+using System.Collections;
+
+#if TREEGX
+namespace DevComponents.Tree
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar
+#endif
+{
+	/// <summary>
+	/// Represents the layout for the element style.
+	/// </summary>
+	internal class ElementStyleLayout
+	{
+		public ElementStyleLayout()
+		{
+		}
+
+		/// <summary>
+		/// Calculates size of an style element.
+		/// </summary>
+		/// <param name="style">Style to calculate size for.</param>
+		/// <param name="defaultFont">Default font that will be used by style if style does not uses it's own font.</param>
+		/// <returns>Size of the style element. At this time only Height memeber will be calculated.</returns>
+		public static void CalculateStyleSize(ElementStyle style, Font defaultFont)
+		{
+			int height=defaultFont.Height;
+            ElementStyle s = ElementStyleDisplay.GetElementStyle(style);
+			if(s.Font!=null)
+				height=s.Font.Height;
+			
+			if(s.PaintTopBorder)
+			{
+				height+=s.BorderTopWidth;
+			}
+
+			if(s.PaintBottomBorder)
+			{
+				height+=s.BorderBottomWidth;
+			}
+			
+			height+=(s.MarginTop+style.MarginBottom);
+			height+=(s.PaddingTop+s.PaddingBottom);
+			
+			style.SetSize(new Size(0,height));
+		}
+
+		/// <summary>
+		/// Returns the total white space for a style. Whitespace is the space between the edge of the element and inner content of the element.
+		/// </summary>
+		/// <param name="es">Style to return white space for</param>
+		/// <returns></returns>
+		public static int HorizontalStyleWhiteSpace(ElementStyle es)
+		{
+			return LeftWhiteSpace(es)+RightWhiteSpace(es);
+		}
+
+		/// <summary>
+		/// Returns the total white space for a style. Whitespace is the space between the edge of the element and inner content of the element.
+		/// </summary>
+		/// <param name="es">Style to return white space for.</param>
+		/// <returns></returns>
+		public static int VerticalStyleWhiteSpace(ElementStyle es)
+		{
+			return TopWhiteSpace(es)+BottomWhiteSpace(es);
+		}
+
+		/// <summary>
+		/// Returns total white space for left side of the style. Whitespace is the space between the edge of the element and inner content of the element.
+		/// </summary>
+		/// <param name="es">Style to return white space for.</param>
+		/// <returns></returns>
+		public static int LeftWhiteSpace(ElementStyle es)
+		{
+			return ElementStyleLayout.StyleSpacing(es,eSpacePart.Border | eSpacePart.Margin | eSpacePart.Padding,eStyleSide.Left);
+		}
+
+		/// <summary>
+		/// Returns total white space for right side of the style. Whitespace is the space between the edge of the element and inner content of the element.
+		/// </summary>
+		/// <param name="es">Style to return white space for.</param>
+		/// <returns></returns>
+		public static int RightWhiteSpace(ElementStyle es)
+		{
+			return ElementStyleLayout.StyleSpacing(es,eSpacePart.Border | eSpacePart.Margin | eSpacePart.Padding,eStyleSide.Right);
+		}
+
+		/// <summary>
+		/// Returns total white space for top side of the style. Whitespace is the space between the edge of the element and inner content of the element.
+		/// </summary>
+		/// <param name="es">Style to return white space for.</param>
+		/// <returns></returns>
+		public static int TopWhiteSpace(ElementStyle es)
+		{
+			return ElementStyleLayout.StyleSpacing(es,eSpacePart.Border | eSpacePart.Margin | eSpacePart.Padding,eStyleSide.Top);
+		}
+
+		/// <summary>
+		/// Returns total white space for top side of the style. Whitespace is the space between the edge of the element and inner content of the element.
+		/// </summary>
+		/// <param name="es">Style to return white space for.</param>
+		/// <returns></returns>
+		public static int BottomWhiteSpace(ElementStyle es)
+		{
+			return ElementStyleLayout.StyleSpacing(es,eSpacePart.Border | eSpacePart.Margin | eSpacePart.Padding,eStyleSide.Bottom);
+		}
+
+		/// <summary>
+		/// Returns amount of spacing for specified style parts.
+		/// </summary>
+		/// <param name="es">Style to calculate spacing for.</param>
+		/// <param name="part">Part of the style spacing is calculated for. Values can be combined.</param>
+		/// <param name="side">Side of the style to use for calculation.</param>
+		/// <returns></returns>
+		public static int StyleSpacing(ElementStyle style, eSpacePart part, eStyleSide side)
+		{
+            ElementStyle es = ElementStyleDisplay.GetElementStyle(style);
+			int space=0;
+			if((part & eSpacePart.Margin)==eSpacePart.Margin)
+			{
+				switch(side)
+				{
+					case eStyleSide.Bottom:
+						space+=es.MarginBottom;
+						break;
+					case eStyleSide.Left:
+						space+=es.MarginLeft;
+						break;
+					case eStyleSide.Right:
+						space+=es.MarginRight;
+						break;
+					case eStyleSide.Top:
+						space+=es.MarginTop;
+						break;
+				}
+			}
+
+			if((part & eSpacePart.Padding)==eSpacePart.Padding)
+			{
+				switch(side)
+				{
+					case eStyleSide.Bottom:
+						space+=es.PaddingBottom;
+						break;
+					case eStyleSide.Left:
+						space+=es.PaddingLeft;
+						break;
+					case eStyleSide.Right:
+						space+=es.PaddingRight;
+						break;
+					case eStyleSide.Top:
+						space+=es.PaddingTop;
+						break;
+				}
+			}
+
+			if((part & eSpacePart.Border)==eSpacePart.Border)
+			{
+				switch(side)
+				{
+					case eStyleSide.Bottom:
+					{
+						if(es.PaintBottomBorder)
+							space+=es.BorderBottomWidth;
+                        if (es.BorderBottom == eStyleBorderType.Etched || es.BorderBottom == eStyleBorderType.Double)
+                            space += es.BorderBottomWidth;
+						break;
+					}
+					case eStyleSide.Left:
+					{
+						if(es.PaintLeftBorder)
+							space+=es.BorderLeftWidth;
+                        if (es.BorderLeft == eStyleBorderType.Etched || es.BorderLeft == eStyleBorderType.Double)
+                            space += es.BorderLeftWidth;
+						break;
+					}
+					case eStyleSide.Right:
+					{
+						if(es.PaintRightBorder)
+							space+=es.BorderRightWidth;
+                        if (es.BorderRight == eStyleBorderType.Etched || es.BorderRight == eStyleBorderType.Double)
+                            space += es.BorderRightWidth;
+						break;
+					}
+					case eStyleSide.Top:
+					{
+						if(es.PaintTopBorder)
+							space+=es.BorderTopWidth;
+                        if (es.BorderTop == eStyleBorderType.Etched || es.BorderTop == eStyleBorderType.Double)
+                            space += es.BorderTopWidth;
+						break;
+					}
+				}
+			}
+
+			return space;
+		}
+
+        /// <summary>
+        /// Gets inner rectangle taking in account style padding, margins and border.
+        /// </summary>
+        public static Rectangle GetInnerRect(ElementStyle style, Rectangle bounds)
+        {
+            bounds.X += LeftWhiteSpace(style);
+            bounds.Width -= HorizontalStyleWhiteSpace(style);
+            bounds.Y += TopWhiteSpace(style);
+            bounds.Height -= VerticalStyleWhiteSpace(style);
+
+            return bounds;
+        }
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/ElementStyleTypeEditor.cs b/PROMS/DotNetBar Source Code/TreeGX/ElementStyleTypeEditor.cs
new file mode 100644
index 00000000..430594be
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/ElementStyleTypeEditor.cs	
@@ -0,0 +1,84 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Windows.Forms.Design;
+using System.Windows.Forms;
+using System.ComponentModel.Design;
+
+namespace DevComponents.Tree
+{
+	/// <summary>
+	/// Represents type editor for ElementStyle used for Windows Forms design-time support.
+	/// </summary>
+	public class ElementStyleTypeEditor:System.Drawing.Design.UITypeEditor 
+	{
+		#region Private Variables
+		private IWindowsFormsEditorService m_EditorService = null;
+		private const string OPTION_CREATE="Create new style";
+		private const string OPTION_REMOVE="Remove style";
+		#endregion
+
+		#region Internal Implementation
+		public override object EditValue(ITypeDescriptorContext context, IServiceProvider provider, object value) 
+		{
+			if (context != null
+				&& context.Instance != null
+				&& provider != null) 
+			{				
+				ElementStyle es=value as ElementStyle;
+				
+				m_EditorService = provider.GetService(typeof(IWindowsFormsEditorService)) as IWindowsFormsEditorService;
+								
+				if(m_EditorService!=null)
+				{
+					ListBox lb=new ListBox();
+					lb.SelectedIndexChanged+=new EventHandler(this.SelectedChanged);
+					if(es==null)
+						lb.Items.Add(OPTION_CREATE);
+					else
+						lb.Items.Add(OPTION_REMOVE);
+
+					m_EditorService.DropDownControl(lb);
+					
+					IDesignerHost dh=(IDesignerHost)provider.GetService(typeof(IDesignerHost));
+					if(lb.SelectedItem!=null && dh!=null)
+					{
+						if(lb.SelectedItem.ToString()==OPTION_CREATE)
+						{
+							value=dh.CreateComponent(typeof(ElementStyle)) as ElementStyle;
+						}
+						else if(lb.SelectedItem.ToString()==OPTION_REMOVE)
+						{
+							value=null;
+							dh.DestroyComponent(es);
+						}
+					}
+				}
+			}
+
+			return value;
+		}
+
+		private void SelectedChanged(object sender, EventArgs e)
+		{
+			if(m_EditorService!=null)
+				m_EditorService.CloseDropDown();
+		}
+
+		/// <summary>
+		/// Gets the editor style used by the EditValue method.
+		/// </summary>
+		/// <param name="context">An ITypeDescriptorContext that can be used to gain additional context information.</param>
+		/// <returns>A UITypeEditorEditStyle value that indicates the style of editor used by EditValue. If the UITypeEditor does not support this method, then GetEditStyle will return None</returns>
+		public override UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext context) 
+		{
+			if (context != null && context.Instance != null) 
+			{
+				return UITypeEditorEditStyle.DropDown;
+			}
+			return base.GetEditStyle(context);
+		}
+		#endregion
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/Enums.cs b/PROMS/DotNetBar Source Code/TreeGX/Enums.cs
new file mode 100644
index 00000000..80cb4414
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/Enums.cs	
@@ -0,0 +1,648 @@
+using System;
+
+namespace DevComponents.Tree
+{
+	/// <summary>Specifies the way background image is displayed on background.</summary>
+	public enum eStyleBackgroundImage:int
+	{
+		/// <summary>Image is stretched to fill the background</summary>
+		Stretch=0,
+		/// <summary>Image is centered inside the background</summary>
+		Center=1,
+		/// <summary>Image is tiled inside the background</summary>
+		Tile=2,
+		/// <summary>
+		/// Image is drawn in top left corner of container space.
+		/// </summary>
+		TopLeft=3,
+		/// <summary>
+		/// Image is drawn in top right corner of container space.
+		/// </summary>
+		TopRight=4,
+		/// <summary>
+		/// Image is drawn in bottom left corner of container space.
+		/// </summary>
+		BottomLeft=5,
+		/// <summary>
+		/// Image is drawn in bottom right corner of container space.
+		/// </summary>
+		BottomRight=6
+	}
+
+	/// <summary>Indicates alignment of a part of the cell like image or check box in relation to the text.</summary>
+	public enum eCellPartAlignment:int
+	{
+		/// <summary>
+		/// Part is aligned to the left center of the text assuming left-to-right
+		/// orientation.
+		/// </summary>
+		NearCenter=0,
+		/// <summary>
+		/// Part is aligned to the right center of the text assuming left-to-right
+		/// orientation.
+		/// </summary>
+		FarCenter=1,
+		/// <summary>
+		/// Part is aligned to the top left of the text assuming left-to-right
+		/// orientation.
+		/// </summary>
+		NearTop=2,
+		/// <summary>Part is aligned above the text and centered.</summary>
+		CenterTop=3,
+		/// <summary>
+		/// Part is aligned to the top right of the text assuming left-to-right
+		/// orientation.
+		/// </summary>
+		FarTop=4,
+		/// <summary>
+		/// Part is aligned to the bottom left of the text assuming left-to-right
+		/// orientation.
+		/// </summary>
+		NearBottom=5,
+		/// <summary>Part is aligned below the text and centered.</summary>
+		CenterBottom=6,
+		/// <summary>
+		/// Part is aligned to the bottom right of the text assuming left-to-right
+		/// orientation.
+		/// </summary>
+		FarBottom=7
+	}
+
+	/// <summary>
+	/// Specifies the alignment of a text string relative to its element's rectangle.
+	/// </summary>
+	public enum eStyleTextAlignment
+	{
+		/// <summary>
+		/// Specifies the text be aligned near from the origin position of the element's rectangle. In a left-to-right layout, the near position is left. In a right-to-left layout, the near position is right.
+		/// </summary>
+		Near=System.Drawing.StringAlignment.Near,
+		/// <summary>
+		/// Specifies that text is aligned in the center of the element's rectangle.
+		/// </summary>
+		Center=System.Drawing.StringAlignment.Center,
+		/// <summary>
+		/// Specifies that text is aligned far from the origin position of the element's rectangle. In a left-to-right layout, the far position is right. In a right-to-left layout, the far position is left.
+		/// </summary>
+		Far=System.Drawing.StringAlignment.Far
+	}
+
+	/// <summary>
+	/// Specifies how to trim characters from a text that does not completely fit into a element's shape.
+	/// </summary>
+	public enum eStyleTextTrimming
+	{
+		/// <summary>
+		/// Specifies that the text is trimmed to the nearest character.
+		/// </summary>
+		Character=System.Drawing.StringTrimming.Character,
+		/// <summary>
+		/// Specifies that the text is trimmed to the nearest character, and an ellipsis is inserted at the end of a trimmed line.
+		/// </summary>
+		EllipsisCharacter=System.Drawing.StringTrimming.EllipsisCharacter,
+		/// <summary>
+		/// The center is removed from trimmed lines and replaced by an ellipsis. The algorithm keeps as much of the last slash-delimited segment of the line as possible.
+		/// </summary>
+		EllipsisPath=System.Drawing.StringTrimming.EllipsisPath,
+		/// <summary>
+		/// Specifies that text is trimmed to the nearest word, and an ellipsis is inserted at the end of a trimmed line.
+		/// </summary>
+		EllipsisWord=System.Drawing.StringTrimming.EllipsisWord,
+		/// <summary>
+		/// Specifies no trimming.
+		/// </summary>
+		None=System.Drawing.StringTrimming.None,
+		/// <summary>
+		/// Specifies that text is trimmed to the nearest word.
+		/// </summary>
+		Word=System.Drawing.StringTrimming.Word
+	}
+
+	/// <summary>
+	/// Specifies the border type for style element.
+	/// </summary>
+	public enum eStyleBorderType:int
+	{
+		/// <summary>Indicates no border</summary>
+		None,
+		/// <summary>Border is a solid line</summary>
+		Solid,
+		/// <summary>Border is a solid dash line</summary>
+		Dash,
+		/// <summary>Border is solid dash-dot line</summary>
+		DashDot,
+		/// <summary>Border is solid dash-dot-dot line</summary>
+		DashDotDot,
+		/// <summary>Border consists of dots</summary>
+		Dot,
+		/// <summary>Etched Border</summary>
+		Etched,
+		/// <summary>Double Border</summary>
+		Double
+	}
+
+	/// <summary>
+	/// Indicates absolute vertical alignment of the content.
+	/// </summary>
+	internal enum eVerticalAlign
+	{
+		/// <summary>
+		/// Content is aligned to the top
+		/// </summary>
+		Top,
+		/// <summary>
+		/// Content is aligned in the middle
+		/// </summary>
+		Middle,
+		/// <summary>
+		/// Content is aligned at the bottom
+		/// </summary>
+		Bottom
+	}
+
+	/// <summary>
+	/// Indicates absolute horizontal alignment
+	/// </summary>
+	internal enum eHorizontalAlign
+	{
+		/// <summary>
+		/// Content is left aligned
+		/// </summary>
+		Left,
+		/// <summary>
+		/// Content is centered
+		/// </summary>
+		Center,
+		/// <summary>
+		/// Content is right aligned
+		/// </summary>
+		Right
+	}
+
+	/// <summary>
+	/// Indicates prefered node layout position on Map tree layout when node is the child node of the top-level root node.
+	/// </summary>
+	public enum eMapPosition
+	{
+		/// <summary>
+		/// Node is positioned based on default algorithm.
+		/// </summary>
+		Default,
+		/// <summary>
+		/// Sub-root node and all nodes after it are positioned to the left of the root.
+		/// </summary>
+		Near,
+		/// <summary>
+		/// Sub-root node and all nodes before it are positioned to the right of the root.
+		/// </summary>
+		Far
+	}
+
+	/// <summary>
+	/// Indicates corner type for the border around visual element.
+	/// </summary>
+	public enum eCornerType
+	{
+		/// <summary>
+		/// Specifies that corner type is inherited from parent setting.
+		/// </summary>
+		Inherit,
+		/// <summary>
+		/// Specifies square corner.
+		/// </summary>
+		Square,
+		/// <summary>
+		/// Specifies rounded corner.
+		/// </summary>
+		Rounded,
+		/// <summary>
+		/// Specifies diagonal corner.
+		/// </summary>
+		Diagonal
+	}
+
+	/// <summary>
+	/// Specifies the column header visibility for the node.
+	/// </summary>
+	public enum eNodeHeaderVisibility
+	{
+		/// <summary>
+		/// Column header is automatically shown/hidden based on the node's position in the tree. When
+		/// Node is first child node i.e. with index=0 the header will be shown, otherwise header will
+		/// be hidden.
+		/// </summary>
+		Automatic,
+		/// <summary>
+		/// Column header is always displayed regardless of node's position.
+		/// </summary>
+		AlwaysShow,
+		/// <summary>
+		/// Column header is always hidden regardless of node's position.
+		/// </summary>
+		AlwaysHide
+	}
+
+	/// <summary>
+	/// Indicates the part of the node.
+	/// </summary>
+	internal enum eNodeRectanglePart
+	{
+		/// <summary>
+		/// Bounds of complete node content except expand button. This also includes the child node bounds if node is expanded.
+		/// </summary>
+		NodeContentBounds,
+		/// <summary>
+		/// Bounds of the expand button which collapses/expands the node.
+		/// </summary>
+		ExpandBounds,
+		/// <summary>
+		/// Bounds of all child nodes of give node.
+		/// </summary>
+		ChildNodeBounds,
+		/// <summary>
+		/// Bounds for cells inside a node.
+		/// </summary>
+		CellsBounds,
+		/// <summary>
+		/// Complete node bounds including expand button.
+		/// </summary>
+		NodeBounds,
+		/// <summary>
+		/// Bounds of the command button.
+		/// </summary>
+		CommandBounds
+	}
+
+	/// <summary>
+	/// Indicates the part of the cell.
+	/// </summary>
+	internal enum eCellRectanglePart
+	{
+		/// <summary>
+		/// Bounds of check box or Rectangle.Empty if there is no check-box.
+		/// </summary>
+		CheckBoxBounds,
+		/// <summary>
+		/// Bounds of image inside the cell or Rectangle.Empty if there is no image.
+		/// </summary>
+		ImageBounds,
+		/// <summary>
+		/// Text bounds inside of cell.
+		/// </summary>
+		TextBounds,
+		/// <summary>
+		/// Cell bounds
+		/// </summary>
+		CellBounds
+	}
+
+	/// <summary>
+	/// Indicates part of the node mouse is placed over.
+	/// </summary>
+	internal enum eMouseOverNodePart
+	{
+		/// <summary>
+		/// Mouse is not over any node part.
+		/// </summary>
+		None,
+		/// <summary>
+		/// Mouse is placed over the node.
+		/// </summary>
+		Node,
+		/// <summary>
+		/// Mouse is placed over node expand button.
+		/// </summary>
+		Expand,
+		/// <summary>
+		/// Mouse is placed over the cell.
+		/// </summary>
+		Cell,
+		/// <summary>
+		/// Mouse is placed over the command button.
+		/// </summary>
+		Command
+	}
+
+	/// <summary>
+	/// Indicates white-space part of the style.
+	/// </summary>
+	[Flags()]
+	public enum eSpacePart
+	{
+		/// <summary>
+		/// Represents style padding.
+		/// </summary>
+		Padding=1,
+		/// <summary>
+		/// Represents style border.
+		/// </summary>
+		Border=2,
+		/// <summary>
+		/// Represents style margin.
+		/// </summary>
+		Margin=4
+	}
+
+	/// <summary>
+	/// Indicates the style side.
+	/// </summary>
+	public enum eStyleSide
+	{
+		/// <summary>
+		/// Specifies left side of the style.
+		/// </summary>
+		Left,
+		/// <summary>
+		/// Specifies right side of the style.
+		/// </summary>
+		Right,
+		/// <summary>
+		/// Specifies top side of the style.
+		/// </summary>
+		Top,
+		/// <summary>
+		/// Specifies bottom side of the style.
+		/// </summary>
+		Bottom
+	}
+
+	/// <summary>
+	/// Indicates the visibility of node expand part which allows user to expand/collaps node.
+	/// </summary>
+	public enum eNodeExpandVisibility
+	{
+		/// <summary>
+		/// Default setting which indicates that when node has child nodes expand part is visible otherwise it is hidden.
+		/// </summary>
+		Auto,
+		/// <summary>
+		/// Expand part is always visible regardless of whether child nodes are present or not.
+		/// </summary>
+		Visible,
+		/// <summary>
+		/// Expand part is always hidden regardless of whether child nodes are present or not.
+		/// </summary>
+		Hidden
+	}
+
+	/// <summary>
+	/// Specifies the action that raised a TreeGXEventArgs event
+	/// </summary>
+	public enum eTreeAction
+	{
+		/// <summary>
+		/// The event was caused by a keystroke.
+		/// </summary>
+		Keyboard,
+		/// <summary>
+		/// The event was caused by a mouse operation.
+		/// </summary>
+		Mouse,
+		/// <summary>
+		/// The event was caused by the Node collapsing.
+		/// </summary>
+		Collapse,
+		/// <summary>
+		/// The event was caused by the Node expanding.
+		/// </summary>
+		Expand,
+		/// <summary>
+		/// The event is caused programmatically from user code.
+		/// </summary>
+		Code
+	}
+
+	/// <summary>
+	/// Specifies node connector type. Node connector is the type of the line/connection that is drawn to connect child node to it's parent node.
+	/// </summary>
+	public enum eNodeConnectorType
+	{
+		/// <summary>
+		/// Curved line connector type.
+		/// </summary>
+		Curve,
+		/// <summary>
+		/// Straight line connector type.
+		/// </summary>
+		Line
+	}
+
+	/// <summary>
+	/// Specifies the cap style with which the connector line will start or end.
+	/// </summary>
+	public enum eConnectorCap
+	{
+		/// <summary>
+		/// Specifies no cap.
+		/// </summary>
+		None,
+		/// <summary>
+		/// Round cap type.
+		/// </summary>
+		Ellipse,
+		/// <summary>
+		/// Arrow cap type.
+		/// </summary>
+		Arrow
+	}
+
+	/// <summary>
+	/// Specifies the layout type used to position the cells within the nodes.
+	/// </summary>
+	public enum eCellLayout
+	{
+		/// <summary>
+		/// Specifies that default setting is to be used for cell layout. Default is Horizontal. When set to default on the Node, setting from Tree control is used.
+		/// </summary>
+		Default,
+		/// <summary>Horizontal layout positions the cells horizontally next to each other.</summary>
+		Horizontal,
+		/// <summary>
+		/// Vertical layout positions cell vertically on top of each other.
+		/// </summary>
+		Vertical
+	}
+
+	/// <summary>
+	/// Specifies the layout type used to position the parts of the cell like image, checkbox and text.
+	/// </summary>
+	public enum eCellPartLayout
+	{
+		/// <summary>
+		/// Specifies that default setting is to be used for cell parts layout. Default is Horizontal. When set to default on the Cell, setting from Tree control is used.
+		/// </summary>
+		Default,
+		/// <summary>Horizontal layout positions the parts of the cell horizontally next to each other.</summary>
+		Horizontal,
+		/// <summary>
+		/// Vertical layout positions parts of the cell vertically on top of each other.
+		/// </summary>
+		Vertical
+	}
+
+	/// <summary>
+	/// Specifies the color scheme loaded by ColorScheme object.
+	/// </summary>
+	public enum eColorSchemeStyle
+	{
+		/// <summary>
+		/// Indicates Office 2003 like color scheme.
+		/// </summary>
+		Office2003,
+		/// <summary>
+		/// Indicates Office XP like color scheme.
+		/// </summary>
+		OfficeXP,
+		/// <summary>
+		/// Indicates VS.NET 2005 like color scheme.
+		/// </summary>
+		VS2005
+	}
+
+	/// <summary>
+	/// Specifies the currently selected system color scheme if running on Windows XP.
+	/// </summary>
+	internal enum eWinXPColorScheme
+	{
+		/// <summary>
+		/// Color scheme cannot be determined.
+		/// </summary>
+		Undetermined,
+		/// <summary>
+		/// Blue color scheme.
+		/// </summary>
+		Blue,
+		/// <summary>
+		/// Olive green color scheme.
+		/// </summary>
+		OliveGreen,
+		/// <summary>
+		/// Silver color scheme.
+		/// </summary>
+		Silver
+	}
+
+	/// <summary>
+	/// Specifies the flow of diagram layout related to the root node.
+	/// </summary>
+	public enum eDiagramFlow
+	{
+		/// <summary>
+		/// Nodes are positioned from left to right with root node being the left-most node.
+		/// </summary>
+		LeftToRight,
+		/// <summary>
+		/// Nodes are positioned from right to left with root node being the right-most
+		/// node.
+		/// </summary>
+		RightToLeft,
+		/// <summary>
+		/// Nodes are positioned from top to bottom with root node being the top node.
+		/// </summary>
+		TopToBottom,
+		/// <summary>
+		/// Nodes are positioned from bottom to top with root node being bottom node.
+		/// </summary>
+		BottomToTop
+	}
+	
+	/// <summary>
+	/// Specifies the flow of the map layout.
+	/// </summary>
+	public enum eMapFlow
+	{
+		/// <summary>
+		/// Nodes are arranged around the root node.
+		/// </summary>
+		Spread,
+		/// <summary>
+		/// Nodes are arranged from below the root node.
+		/// </summary>
+		TopToBottom,
+		/// <summary>
+		/// Nodes are arranged above the root node.
+		/// </summary>
+		BottomToTop,
+		/// <summary>
+		/// Nodes are arranged to the right of the root node.
+		/// </summary>
+		LeftToRight,
+		/// <summary>
+		/// Nodes are arranged to the left of the root node.
+		/// </summary>
+		RightToLeft
+	}
+
+	/// <summary>
+	/// Specifies the type of the expand button.
+	/// </summary>
+	public enum eExpandButtonType
+	{
+		/// <summary>
+		/// Indicates elliptical expand button.
+		/// </summary>
+		Ellipse,
+		/// <summary>
+		/// Indicates rectangular expand button.
+		/// </summary>
+		Rectangle,
+		/// <summary>
+		/// Indicates that images are used for expand button. See 
+		/// </summary>
+		Image
+	}
+	
+	/// <summary>
+	/// Specifies the visual style for the tree control.
+	/// </summary>
+	public enum eVisualStyle
+	{
+		/// <summary>
+		/// Indicates default visual style.
+		/// </summary>
+		Default
+	}
+
+	/// <summary>
+	/// Specifies the layout type for the nodes.
+	/// </summary>
+	public enum eNodeLayout
+	{
+		/// <summary>
+		/// Nodes are arranged arround root node in map format.
+		/// </summary>
+		Map,
+		/// <summary>
+		/// Nodes are arranged from left-to-right in diagram format.
+		/// </summary>
+		Diagram
+	}
+	
+	/// <summary>
+	/// Specifies renderer type used to render nodes.
+	/// </summary>
+	public enum eNodeRenderMode
+	{
+		
+		/// <summary>
+		/// Specifies default renderer which allows most customization through TreeGX
+		/// properties. Default renderer integrates with the Style architecture to provide
+		/// customization on renderer behavior.
+		/// </summary>
+		Default,
+		/// <summary>
+		/// 	<para>Specifies professional renderer. Professional renderer is custom renderer
+		///     which does not rely on Style architecture for customization of renderer appearance
+		///     since it provides much richer appearance than Default renderer.</para>
+		/// 	<para>Professional renderer colors can be controls through
+		///     NodeProfessionalColorTable object which is exposed by
+		///     NodeProfessionalRenderer.ColorTable property.</para>
+		/// </summary>
+		Professional,
+		/// <summary>
+		/// Specifies that custom renderer is used. When set you must also set NodeRenderer
+		/// to renderer you want to use.
+		/// </summary>
+		Custom
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/EventDelegates.cs b/PROMS/DotNetBar Source Code/TreeGX/EventDelegates.cs
new file mode 100644
index 00000000..1eb92e91
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/EventDelegates.cs	
@@ -0,0 +1,83 @@
+using System;
+using DevComponents.Tree.Display;
+
+namespace DevComponents.Tree
+{
+	/// <summary>
+	/// Defines the delegate for TreeGX cell based action events.
+	/// </summary>
+	public delegate void TreeGXCellEventHandler(object sender, TreeGXCellEventArgs e);
+	
+	/// <summary>
+	/// Defines the delegate for TreeGX cell based action events.
+	/// </summary>
+	public delegate void TreeGXCellCancelEventHandler(object sender, TreeGXCellCancelEventArgs e);
+	
+	/// <summary>
+	/// Defines the delegate for TreeGX node based action events that can be cancelled.
+	/// </summary>
+	public delegate void TreeGXNodeCancelEventHandler(object sender, TreeGXNodeCancelEventArgs e);
+	
+	/// <summary>
+	/// Defines the delegate for TreeGX node based action events.
+	/// </summary>
+	public delegate void TreeGXNodeEventHandler(object sender, TreeGXNodeEventArgs e);
+
+	/// <summary>
+	/// Defines delegate for Command button events.
+	/// </summary>
+	public delegate void CommandButtonEventHandler(object sender, CommandButtonEventArgs e);
+
+	/// <summary>
+	/// Defines delegate for label editing events.
+	/// </summary>
+	public delegate void CellEditEventHandler(object sender, CellEditEventArgs e);
+	
+	/// <summary>
+	/// Defines the delegate for TreeGX node based action events.
+	/// </summary>
+	public delegate void TreeGXNodeCollectionEventHandler(object sender, TreeGXNodeCollectionEventArgs e);
+	
+	/// <summary>
+	/// Defines the delegate for BeforeNodeDrop and AfterNodeDrop events
+	/// </summary>
+	public delegate void TreeGXDragDropEventHandler(object sender, TreeGXDragDropEventArgs e);
+	
+	/// <summary>
+	/// Defines the delegate for mouse based node events
+	/// </summary>
+	public delegate void TreeGXNodeMouseEventHandler(object sender, TreeGXNodeMouseEventArgs e);
+	
+	/// <summary>
+	/// Defines delegate for node rendering events.
+	/// </summary>
+	public delegate void NodeRendererEventHandler(object sender, NodeRendererEventArgs e);
+	
+	/// <summary>
+	/// Defines delegate for cell rendering events.
+	/// </summary>
+	public delegate void NodeCellRendererEventHandler(object sender, NodeCellRendererEventArgs e);
+	
+	/// <summary>
+	/// Defines delegate for RenderExpandPart event.
+	/// </summary>
+	public delegate void NodeExpandPartRendererEventHandler(object sender, NodeExpandPartRendererEventArgs e);
+	
+	/// <summary>
+	/// Defines delegate for RenderExpandPart event.
+	/// </summary>
+	public delegate void NodeCommandPartRendererEventHandler(object sender, NodeCommandPartRendererEventArgs e);
+	
+	/// <summary>
+	/// Defines delegate for RenderExpandPart event.
+	/// </summary>
+	public delegate void SelectionRendererEventHandler(object sender, SelectionRendererEventArgs e);
+	/// <summary>
+	/// Defines delegate for RenderConnector event.
+	/// </summary>
+	public delegate void ConnectorRendererEventHandler(object sender, ConnectorRendererEventArgs e);
+	/// <summary>
+	/// Defines delegate for TreeBackgroundRenderer events.
+	/// </summary>
+	public delegate void TreeBackgroundRendererEventHandler(object sender, TreeBackgroundRendererEventArgs e);
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/Events/MarkupLinkClickEventArgs.cs b/PROMS/DotNetBar Source Code/TreeGX/Events/MarkupLinkClickEventArgs.cs
new file mode 100644
index 00000000..b0529bfc
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/Events/MarkupLinkClickEventArgs.cs	
@@ -0,0 +1,36 @@
+using System;
+
+namespace DevComponents.Tree
+{
+	/// <summary>
+	/// Provides more information about MarkupLinkClick event.
+	/// </summary>
+	public class MarkupLinkClickEventArgs : EventArgs
+	{
+		/// <summary>
+		/// Gets the value of href attribute from the markup link that was clicked.
+		/// </summary>
+		public readonly string HRef = "";
+
+		/// <summary>
+		/// Gets the value of name attribute from the markup link that was clicked.
+		/// </summary>
+		public readonly string Name = "";
+
+		/// <summary>
+		/// Creates new instance of the object.
+		/// </summary>
+		/// <param name="name">Value of name attribute.</param>
+		/// <param name="href">Value of href attribute.</param>
+		public MarkupLinkClickEventArgs(string name, string href)
+		{
+			this.HRef = href;
+			this.Name = name;
+		}
+	}
+
+	/// <summary>
+	/// Defines delegate for MarkupLinkClick event.
+	/// </summary>
+	public delegate void MarkupLinkClickEventHandler(object sender, MarkupLinkClickEventArgs e);
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/Events/SerializeNodeEventArgs.cs b/PROMS/DotNetBar Source Code/TreeGX/Events/SerializeNodeEventArgs.cs
new file mode 100644
index 00000000..cbf58708
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/Events/SerializeNodeEventArgs.cs	
@@ -0,0 +1,38 @@
+using System;
+
+namespace DevComponents.Tree
+{
+	/// <summary>
+	/// Represents arguments for SerializeNode event which allows you to add custom serialization data to definitions saved by control.
+	/// </summary>
+	public class SerializeNodeEventArgs : EventArgs
+	{
+		/// <summary>
+		/// Gets reference to the node being serialized or de-serialized.
+		/// </summary>
+		public Node Node = null;
+
+		/// <summary>
+		/// Gets reference to instance of XmlElement that item is serialized to or is being de-serialized from. You should not change any data directly on this element.
+		/// </summary>
+		public System.Xml.XmlElement ItemXmlElement = null;
+
+		/// <summary>
+		/// Gets the reference to XmlElement that you can serialize to or de-serialize any custom data from. You can add child elements or set the attributes on
+		/// this XmlElement when handling SerializeItem event. When handling DeserializeItem event you can load your data from this element.
+		/// </summary>
+		public System.Xml.XmlElement CustomXmlElement = null;
+
+		public SerializeNodeEventArgs(Node node, System.Xml.XmlElement itemXmlElement, System.Xml.XmlElement customXmlElement)
+		{
+			this.Node = node;
+			this.ItemXmlElement = itemXmlElement;
+			this.CustomXmlElement = customXmlElement;
+		}
+	}
+	
+	/// <summary>
+	/// Defines delegate for SerializeItem event.
+	/// </summary>
+	public delegate void SerializeNodeEventHandler(object sender, SerializeNodeEventArgs e);
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/HeaderDefinition.cs b/PROMS/DotNetBar Source Code/TreeGX/HeaderDefinition.cs
new file mode 100644
index 00000000..b740ada9
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/HeaderDefinition.cs	
@@ -0,0 +1,40 @@
+using System;
+using System.ComponentModel;
+
+namespace DevComponents.Tree
+{
+	/// <summary>
+	/// Represents the table header.
+	/// </summary>
+	public class HeaderDefinition
+	{
+		private string m_Name="";
+		private ColumnHeaderCollection m_Columns=new ColumnHeaderCollection();
+
+		/// <summary>
+		/// Default constructor.
+		/// </summary>
+		public HeaderDefinition()
+		{
+		}
+
+		/// <summary>
+		/// Gets the reference to the collection that contains the columns associated with header.
+		/// </summary>
+		[Browsable(true),Category("Columns"),Description("Gets the reference to the collection that contains the columns associated with header."),DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+		public ColumnHeaderCollection Columns
+		{
+			get {return m_Columns;}
+		}
+
+		/// <summary>
+		/// Gets or sets the name associated with this header definition.
+		/// </summary>
+		[Browsable(true),Category("Design"),Description("Indicates name associated with this header definition."),DefaultValue("")]
+		public string Name
+		{
+			get {return m_Name;}
+			set {m_Name=value;}
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/HeadersCollection.cs b/PROMS/DotNetBar Source Code/TreeGX/HeadersCollection.cs
new file mode 100644
index 00000000..db82dca8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/HeadersCollection.cs	
@@ -0,0 +1,135 @@
+using System;
+using System.Collections;
+using System.ComponentModel;
+
+namespace DevComponents.Tree 
+{
+	/// <summary>
+	/// Represents collection for HeaderDefinition objects.
+	/// </summary>
+	public class HeadersCollection:CollectionBase 
+	{
+		#region Private Variables
+		private TreeGX m_Parent=null;
+		#endregion
+
+		#region Internal Implementation
+		/// <summary>
+		/// Gets or sets the node this collection is associated with.
+		/// </summary>
+		[Browsable(false),DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public TreeGX Parent
+		{
+			get {return m_Parent;}
+		}
+		/// <summary>
+		/// Sets the node collection belongs to.
+		/// </summary>
+		/// <param name="parent">HeaderDefinition that is parent of this collection.</param>
+		internal void SetParent(TreeGX parent)
+		{
+			m_Parent=parent;
+		}
+
+		/// <summary>
+		/// Adds new object to the collection.
+		/// </summary>
+		/// <param name="ch">Object to add.</param>
+		/// <returns>Index of newly added object.</returns>
+		public int Add(HeaderDefinition ch)
+		{
+			return List.Add(ch);
+		}
+		/// <summary>
+		/// Returns reference to the object in collection based on it's index.
+		/// </summary>
+		public HeaderDefinition this[int index]
+		{
+			get {return (HeaderDefinition)(List[index]);}
+			set {List[index] = value;}
+		}
+
+		/// <summary>
+		/// Inserts new object into the collection.
+		/// </summary>
+		/// <param name="index">Position of the object.</param>
+		/// <param name="value">Object to insert.</param>
+		public void Insert(int index, HeaderDefinition value) 
+		{
+			List.Insert(index, value);
+		}
+
+		/// <summary>
+		/// Returns index of the object inside of the collection.
+		/// </summary>
+		/// <param name="value">Reference to the object.</param>
+		/// <returns>Index of the object.</returns>
+		public int IndexOf(HeaderDefinition value) 
+		{
+			return List.IndexOf(value);
+		}
+
+		/// <summary>
+		/// Returns whether collection contains specified object.
+		/// </summary>
+		/// <param name="value">Object to look for.</param>
+		/// <returns>true if object is part of the collection, otherwise false.</returns>
+		public bool Contains(HeaderDefinition value) 
+		{
+			return List.Contains(value);
+		}
+
+		/// <summary>
+		/// Removes specified object from the collection.
+		/// </summary>
+		/// <param name="value"></param>
+		public void Remove(HeaderDefinition value) 
+		{
+			List.Remove(value);
+		}
+
+		protected override void OnRemoveComplete(int index,object value)
+		{
+			base.OnRemoveComplete(index,value);
+		}
+		protected override void OnInsertComplete(int index,object value)
+		{
+			base.OnInsertComplete(index,value);
+		}
+
+		/// <summary>
+		/// Copies collection into the specified array.
+		/// </summary>
+		/// <param name="array">Array to copy collection to.</param>
+		/// <param name="index">Starting index.</param>
+		public void CopyTo(HeaderDefinition[] array, int index) 
+		{
+			List.CopyTo(array, index);
+		}
+
+		/// <summary>
+		/// Copies contained items to the HeaderDefinition array.
+		/// </summary>
+		/// <param name="array">Array to copy to.</param>
+		internal void CopyTo(HeaderDefinition[] array)
+		{
+			List.CopyTo(array,0);
+		}
+
+		protected override void OnClear()
+		{
+			base.OnClear();
+		}
+		
+		public HeaderDefinition GetByName(string name)
+		{
+			foreach(HeaderDefinition d in this.List)
+			{
+				if(d.Name==name)
+					return d;
+			}
+			return null;
+		}
+		#endregion
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/Helpers/SystemHelpers.cs b/PROMS/DotNetBar Source Code/TreeGX/Helpers/SystemHelpers.cs
new file mode 100644
index 00000000..b3ede40c
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/Helpers/SystemHelpers.cs	
@@ -0,0 +1,85 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace DevComponents.Tree.Helpers
+{
+    /// <summary>
+    /// Defines various system information based helper functions.
+    /// </summary>
+    internal static class SystemHelpers
+    {
+        #region Private Variables
+        private static bool _ThemedOS = false;
+        private static bool _SupportsAnimation = false;
+        private static bool _IsWindowsXP = false;
+        private static bool _IsVista = false;
+        private static bool _IsWindows7 = false;
+        #endregion
+
+        #region Internal Implementation
+        static SystemHelpers()
+        {
+
+            WinApi.OSVERSIONINFO os = new WinApi.OSVERSIONINFO();
+            os.dwOSVersionInfoSize = System.Runtime.InteropServices.Marshal.SizeOf(typeof(WinApi.OSVERSIONINFO));
+            WinApi.GetVersionEx(ref os);
+            if (os.dwPlatformId == 2 && os.dwMajorVersion == 4)
+                _SupportsAnimation = false;
+            if (os.dwMajorVersion == 5 && os.dwMinorVersion >= 1 && os.dwPlatformId == 2 ||
+                os.dwMajorVersion > 5 && os.dwPlatformId == 2)
+                _ThemedOS = System.Windows.Forms.OSFeature.Feature.IsPresent(System.Windows.Forms.OSFeature.Themes);
+            Version osVersion = System.Environment.OSVersion.Version;
+            _IsWindowsXP = osVersion.Major <= 5;
+            _IsVista = osVersion.Major >= 6;
+            _IsWindows7 = osVersion.Major >= 6 && osVersion.Minor >= 1 && osVersion.Build >= 7000;
+        }
+
+        public static bool ThemedOS
+        {
+            get { return _ThemedOS; }
+            set
+            {
+                _ThemedOS = value;
+            }
+        }
+
+        public static bool SupportsAnimation
+        {
+            get { return _SupportsAnimation; }
+            set
+            {
+                _SupportsAnimation = value;
+            }
+        }
+
+        public static bool IsWindowsXP
+        {
+            get { return _IsWindowsXP; }
+            set
+            {
+                _IsWindowsXP = value;
+            }
+        }
+
+        public static bool IsVista
+        {
+            get { return _IsVista; }
+            set
+            {
+                _IsVista = value;
+            }
+        }
+
+        public static bool IsWindows7
+        {
+            get { return _IsWindows7; }
+            set
+            {
+                _IsWindows7 = value;
+            }
+        }
+        #endregion
+        
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/IElementStyleClassProvider.cs b/PROMS/DotNetBar Source Code/TreeGX/IElementStyleClassProvider.cs
new file mode 100644
index 00000000..f4302164
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/IElementStyleClassProvider.cs	
@@ -0,0 +1,18 @@
+using System;
+using System.Text;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Defines the provider for the element style classes support.
+    /// </summary>
+    public interface IElementStyleClassProvider
+    {
+        /// <summary>
+        /// Returns the instance of the ElementStyle with given class name or null if there is no class with that name defined.
+        /// </summary>
+        /// <param name="className">Class name. See static members of ElementStyleClassKeys class for the list of available keys.</param>
+        /// <returns>Instance of ElementStyle for given class name or null if class cannot be found.</returns>
+        ElementStyle GetClass(string className);
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/INodeNotify.cs b/PROMS/DotNetBar Source Code/TreeGX/INodeNotify.cs
new file mode 100644
index 00000000..f87f50eb
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/INodeNotify.cs	
@@ -0,0 +1,26 @@
+using System;
+
+namespace DevComponents.Tree
+{
+	/// <summary>
+	/// Specifies the notification interface that node uses to communicate status changes to it's parent tree.
+	/// </summary>
+	public interface INodeNotify
+	{
+		/// <summary>Called when Node.Expanded property has changed.</summary>
+		/// <param name="node">Node which Expanded property has changed.</param>
+		void ExpandedChanged(Node node);
+		/// <summary>Called before node is collapsed</summary>
+		/// <param name="e">Context information.</param>
+		void OnBeforeCollapse(TreeGXNodeCancelEventArgs e);
+		/// <summary>Called before node is expanded</summary>
+		/// <param name="e">Context information.</param>
+		void OnBeforeExpand(TreeGXNodeCancelEventArgs e);
+		/// <summary>Called after node is collapsed.</summary>
+		/// <param name="e">Context information.</param>
+		void OnAfterCollapse(TreeGXNodeEventArgs e);
+		/// <summary>Called after node is expanded</summary>
+		/// <param name="e">Context information</param>
+		void OnAfterExpand(TreeGXNodeEventArgs e);
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/ImageIndexEditor.cs b/PROMS/DotNetBar Source Code/TreeGX/ImageIndexEditor.cs
new file mode 100644
index 00000000..2def5cfe
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/ImageIndexEditor.cs	
@@ -0,0 +1,75 @@
+using System;
+using System.ComponentModel.Design;
+using System.Drawing.Design;
+using System.ComponentModel;
+using System.Windows.Forms.ComponentModel;
+using System.Windows.Forms.Design;
+
+namespace DevComponents.Tree
+{
+	/// <summary>
+	/// Represents the class used by windows forms editor for picking an image from image list.
+	/// </summary>
+	public class ImageIndexEditor:UITypeEditor
+	{
+		private ImageEditor m_ImageEditor;
+		private System.Windows.Forms.ImageList m_ImageList=null;
+		public ImageIndexEditor():base()
+		{
+			m_ImageEditor=System.ComponentModel.TypeDescriptor.GetEditor(typeof(System.Drawing.Image),typeof(UITypeEditor)) as ImageEditor;
+		}
+		
+		public override bool GetPaintValueSupported(ITypeDescriptorContext context)
+		{
+			return true;
+		}
+
+		public override void PaintValue(PaintValueEventArgs e)
+		{
+			try
+			{
+				if(e==null || e.Value==null)
+					return;
+				int iIndex=(int)e.Value;
+				System.Drawing.Image img=this.GetImage(e.Context,iIndex);
+				if(img==null)
+					return;
+				PaintValueEventArgs pi=new PaintValueEventArgs(e.Context,img,e.Graphics,e.Bounds);
+				m_ImageEditor.PaintValue(pi);
+				//m_ImageEditor.PaintValue(img,e.Graphics,e.Bounds);
+			}
+			catch{}
+		}
+
+		private System.Drawing.Image GetImage(System.ComponentModel.ITypeDescriptorContext context,int index)
+		{
+			if(m_ImageList!=null && index>=0 && index<=m_ImageList.Images.Count)
+			{
+				return m_ImageList.Images[index];
+			}
+			if(context==null)
+				return null;
+
+			object o=context.Instance;
+			if(o==null)
+				return null;
+			System.ComponentModel.PropertyDescriptorCollection pd=System.ComponentModel.TypeDescriptor.GetProperties(o);
+			if(pd==null)
+				return null;
+
+			foreach(System.ComponentModel.PropertyDescriptor prop in pd)
+			{
+				if(prop.PropertyType==typeof(System.Windows.Forms.ImageList))
+				{
+					m_ImageList=prop.GetValue(o) as System.Windows.Forms.ImageList;
+					if(m_ImageList!=null && index>=0 && index<=m_ImageList.Images.Count)
+					{
+						return m_ImageList.Images[index];
+					}
+					break;
+				}
+			}
+			return null;
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/Interop/WinApi.cs b/PROMS/DotNetBar Source Code/TreeGX/Interop/WinApi.cs
new file mode 100644
index 00000000..8d886d6b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/Interop/WinApi.cs	
@@ -0,0 +1,57 @@
+using System.Windows.Forms;
+using System.Runtime.InteropServices;
+
+namespace DevComponents.Tree.Interop
+{
+	/// <summary>
+	/// Provides WinApi functions to rest of the application.
+	/// </summary>
+	internal class WinApi
+	{
+	
+		#region API Calls Declaration
+		
+		[DllImport("user32")]
+		private static extern bool TrackMouseEvent(ref TRACKMOUSEEVENT tme);
+		
+		[StructLayout(LayoutKind.Sequential)]
+		private struct TRACKMOUSEEVENT 
+		{
+			public int cbSize;
+			public uint dwFlags;
+			public int dwHoverTime;
+			public int hwndTrack;
+		}
+		
+		// Track Mouse Event Flags
+		private const uint
+			TME_HOVER=0x00000001,
+			TME_LEAVE=0x00000002,
+			TME_NONCLIENT=0x00000010,
+			TME_QUERY=0x40000000,
+			TME_CANCEL=0x80000000,
+			HOVER_DEFAULT=0xFFFFFFFF;
+
+		#endregion
+		
+		#region Functions
+		/// <summary>
+		/// Resets Hoover timer for specified control.
+		/// </summary>
+		public static void ResetHover(System.Windows.Forms.Control c)
+		{
+			if (c==null || !c.IsHandleCreated)
+				return;
+			
+			// We need to reset hover thing since it is fired only first time mouse hovers inside the window and we need it for each of our items
+			TRACKMOUSEEVENT tme = new TRACKMOUSEEVENT();
+			tme.dwFlags = TME_QUERY;
+			tme.hwndTrack = (int)c.Handle;
+			tme.cbSize = System.Runtime.InteropServices.Marshal.SizeOf(tme);
+			TrackMouseEvent(ref tme);
+			tme.dwFlags = tme.dwFlags | TME_HOVER;
+			TrackMouseEvent(ref tme);
+		}
+		#endregion
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/KeyNavigation.cs b/PROMS/DotNetBar Source Code/TreeGX/KeyNavigation.cs
new file mode 100644
index 00000000..634f7bed
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/KeyNavigation.cs	
@@ -0,0 +1,148 @@
+using System;
+using System.Windows.Forms;
+
+namespace DevComponents.Tree
+{
+	/// <summary>
+	/// Provides TreeGX Keyboard handling.
+	/// </summary>
+	internal class KeyNavigation
+	{
+		public static void KeyDown(TreeGX tree, KeyEventArgs e)
+		{
+			switch(e.KeyCode)
+			{
+				case Keys.Enter:
+					{
+						EnterKeyDown(tree, e);
+						e.Handled = true;
+						break;
+					}
+				case Keys.Up:
+				case Keys.Down:
+				case Keys.Left:
+				case Keys.Right:
+					{
+						NavigateKeyDown(tree, e);
+						e.Handled = true;
+						break;
+					}
+			}
+		}
+		
+		public static void EnterKeyDown(TreeGX tree, KeyEventArgs e)
+		{
+			if(tree.SelectedNode!=null && tree.SelectedNode.Nodes.Count>0)
+			{
+				tree.SelectedNode.Toggle(eTreeAction.Keyboard);
+			}
+		}
+		
+		public static void NavigateKeyDown(TreeGX tree, KeyEventArgs e)
+		{
+			if(tree.SelectedNode==null)
+			{
+				if(tree.DisplayRootNode!=null)
+					tree.SelectNode(tree.DisplayRootNode, eTreeAction.Keyboard);
+				else if(tree.Nodes.Count>0)
+					tree.SelectNode(tree.Nodes[0], eTreeAction.Keyboard);
+				return;
+			}
+			
+			Node node=tree.SelectedNode;
+			
+			if(e.KeyCode == Keys.Down || e.KeyCode == Keys.Right && NodeOperations.GetVisibleChildNodesCount(node) == 0)
+			{
+                int currentCell = 0;
+
+                if (node != null && node.SelectedCell != null) currentCell = node.Cells.IndexOf(node.SelectedCell);
+
+                Node nextNode = NodeOperations.GetNextVisibleNode(node);
+
+                //// Adjust nextNode so the multi-selection is proper
+                //if ((e.KeyData & Keys.Shift) == Keys.Shift && tree.MultiSelect && tree.SelectedNodes.Count > 1)
+                //{
+                //    if (tree.SelectedNodes[0].Bounds.Y > tree.SelectedNodes[tree.SelectedNodes.Count - 1].Bounds.Y)
+                //        nextNode = tree.SelectedNodes[tree.SelectedNodes.Count - 1];
+                //}
+
+                if (nextNode != null)
+                {
+                    if (!nextNode.CanSelect)
+                    {
+                        int counter = 0;
+                        while (nextNode != null && counter < 100)
+                        {
+                            nextNode = NodeOperations.GetNextVisibleNode(nextNode);
+                            if (nextNode != null && nextNode.CanSelect) break;
+                        }
+                    }
+                    //if ((e.KeyData & Keys.Shift) == Keys.Shift && tree.MultiSelect && tree.SelectedNodes.Count > 0)
+                    //{
+                    //    if (tree.MultiSelectRule == eMultiSelectRule.SameParent && tree.SelectedNodes[0].Parent != nextNode.Parent) return true;
+
+                    //    if (nextNode.IsSelected)
+                    //        tree.SelectedNodes.Remove(nextNode, eTreeAction.Keyboard);
+                    //    else
+                    //        tree.SelectedNodes.Add(nextNode, eTreeAction.Keyboard);
+                    //    nextNode.EnsureVisible();
+                    //}
+                    //else
+                    {
+                        tree.SelectNode(nextNode, eTreeAction.Keyboard);
+                        //if (tree.SelectionPerCell && currentCell < nextNode.Cells.Count && currentCell > 0)
+                        //    nextNode.SetSelectedCell(nextNode.Cells[currentCell], eTreeAction.Keyboard);
+                    }
+                }
+			}
+			else if(e.KeyCode == Keys.Up || e.KeyCode == Keys.Left && node.Parent == null)
+			{
+                int currentCell = 0;
+                if (node != null && node.SelectedCell != null) currentCell = node.Cells.IndexOf(node.SelectedCell);
+
+                Node prevNode = NodeOperations.GetPreviousVisibleNode(node);
+                if (prevNode != null)
+                {
+                    if (!prevNode.CanSelect)
+                    {
+                        int counter = 0;
+                        while (prevNode != null && counter < 100)
+                        {
+                            prevNode = NodeOperations.GetPreviousVisibleNode(prevNode);
+                            if (prevNode != null && prevNode.CanSelect) break;
+                        }
+                    }
+                    //if ((e.KeyData & Keys.Shift) == Keys.Shift && tree.MultiSelect && tree.SelectedNodes.Count > 0)
+                    //{
+                    //    if (tree.MultiSelectRule == eMultiSelectRule.SameParent && tree.SelectedNodes[0].Parent != prevNode.Parent) return true;
+                    //    if (prevNode.IsSelected)
+                    //    {
+                    //        tree.SelectedNodes.Remove(tree.SelectedNodes[tree.SelectedNodes.Count - 1], eTreeAction.Keyboard);
+                    //    }
+                    //    else
+                    //        tree.SelectedNodes.Add(prevNode, eTreeAction.Keyboard);
+                    //    prevNode.EnsureVisible();
+                    //}
+                    //else 
+                    if (prevNode != null)
+                    {
+                        tree.SelectNode(prevNode, eTreeAction.Keyboard);
+                        //if (tree.SelectionPerCell && currentCell < prevNode.Cells.Count && currentCell > 0)
+                        //    prevNode.SetSelectedCell(prevNode.Cells[currentCell], eTreeAction.Keyboard);
+                    }
+                }
+			}
+			else if(e.KeyCode == Keys.Right)
+			{
+				Node childNode = NodeOperations.GetFirstVisibleChildNode(node);
+				if(childNode!=null)
+					tree.SelectNode(childNode, eTreeAction.Keyboard);
+			}
+			else if(e.KeyCode == Keys.Left)
+			{
+				if(node.Parent!=null)
+					tree.SelectNode(node.Parent, eTreeAction.Keyboard);
+			}
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/Layout/ColumnHeaderLayout.cs b/PROMS/DotNetBar Source Code/TreeGX/Layout/ColumnHeaderLayout.cs
new file mode 100644
index 00000000..a33d0a69
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/Layout/ColumnHeaderLayout.cs	
@@ -0,0 +1,76 @@
+using System;
+using System.Drawing;
+
+namespace DevComponents.Tree.Layout
+{
+	/// <summary>
+	/// Class that is used to layout column header.
+	/// </summary>
+	internal class ColumnHeaderLayout
+	{
+		public ColumnHeaderLayout()
+		{
+		}
+
+		// Assumes that layoutInfo is up-to-date and that Node that is connected with
+		// columns is already processed and it's size and location calculated.
+		// layoutInfo.Top member reflects the next position below the node
+		// layoutInfo.LevelOffset should reflect the X offset for the child nodes.
+		public static int LayoutColumnHeader(NodeLayoutContextInfo layoutInfo,int x, int y, int clientWidth, int cellHorizontalSpacing)
+		{
+			Node node=layoutInfo.ContextNode;
+            int height=0;
+			
+			foreach(ColumnHeader col in node.NodesColumns)
+			{
+				if(!col.Visible)
+					continue;
+
+				if(col.SizeChanged)
+				{
+					// Column for child nodes is always placed below the current node and
+					// is not included in the node's rectangle
+					Rectangle bounds=Rectangle.Empty;
+					bounds.X=x;
+					bounds.Y=y;
+					if(col.Width.Relative>0)
+						bounds.Width=(clientWidth*col.Width.Relative)/100-1;
+					else
+						bounds.Width=col.Width.Absolute;
+
+					if(col.StyleNormal=="" && col.StyleMouseDown=="" && col.StyleMouseOver=="")
+					{
+						bounds.Height=layoutInfo.DefaultHeaderSize.Height;
+					}
+					else
+					{
+						Size sz=Size.Empty;
+						if(col.StyleNormal!="")
+						{
+							ElementStyleLayout.CalculateStyleSize(layoutInfo.Styles[col.StyleNormal],layoutInfo.DefaultFont);
+							sz=layoutInfo.Styles[col.StyleNormal].Size;
+						}
+												
+						if(sz.Height==0)
+							bounds.Height=layoutInfo.DefaultHeaderSize.Height;
+						else
+							bounds.Height=sz.Height;
+					}
+
+					col.SetBounds(bounds);
+					col.SizeChanged=false;
+					
+					x+=(bounds.Width+cellHorizontalSpacing);
+
+					if(bounds.Height>height)
+						height=bounds.Height;
+				}
+				else if(col.Bounds.Height>height)
+					height=col.Bounds.Height;
+			}
+
+			return height;
+		}
+
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/Layout/NodeCellLayout.cs b/PROMS/DotNetBar Source Code/TreeGX/Layout/NodeCellLayout.cs
new file mode 100644
index 00000000..062c51de
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/Layout/NodeCellLayout.cs	
@@ -0,0 +1,608 @@
+using System;
+using System.Drawing;
+
+namespace DevComponents.Tree
+{
+	namespace Layout
+	{
+		/// <summary>
+		/// Represents class for Node's cell layout.
+		/// </summary>
+		internal class CellLayout
+		{
+			public CellLayout()
+			{
+			}
+
+			/// <summary>
+			/// Offset cell bounds, check box bounds, image bounds and text bounds by specified offset.
+			/// </summary>
+			/// <param name="cell">Cell to offset.</param>
+			/// <param name="x">Horizontal offset in pixels.</param>
+			/// <param name="y">Vertical offset in pixels.</param>
+			public void Offset(Cell cell, int x, int y)
+			{
+				cell.SetBounds(new Rectangle(cell.BoundsRelative.X+x,cell.BoundsRelative.Y+y,cell.BoundsRelative.Width,cell.BoundsRelative.Height));
+				if(!cell.CheckBoxBoundsRelative.IsEmpty)
+					cell.SetCheckBoxBounds(new Rectangle(cell.CheckBoxBoundsRelative.X+x,cell.CheckBoxBoundsRelative.Y+y,cell.CheckBoxBoundsRelative.Width,cell.CheckBoxBoundsRelative.Height));
+				if(!cell.ImageBoundsRelative.IsEmpty)
+					cell.SetImageBounds(new Rectangle(cell.ImageBoundsRelative.X+x,cell.ImageBoundsRelative.Y+y,cell.ImageBoundsRelative.Width,cell.ImageBoundsRelative.Height));
+				if(!cell.TextContentBounds.IsEmpty)
+					cell.TextContentBounds=new Rectangle(cell.TextContentBounds.X+x,cell.TextContentBounds.Y+y,cell.TextContentBounds.Width,cell.TextContentBounds.Height);
+			}
+
+			public void LayoutSingleCell(LayoutCellInfo info)
+			{
+				Size textSize=Size.Empty;
+				Font font=info.Font;
+				int height=0;
+				if(info.LayoutStyle.Font!=null)
+					font=info.LayoutStyle.Font;
+
+				info.ContextCell.OnLayoutCell();
+
+			    Size largestImageSize = Dpi.Size(info.ContextCell.Images.LargestImageSize);
+			    if(info.ContextCell.HostedControl!=null)
+				{
+					Size controlSize=info.ContextCell.HostedControl.Size;
+					if(!info.ContextCell.HostedControlSize.IsEmpty)
+						controlSize = info.ContextCell.HostedControlSize;
+					if(info.CellWidth==0)
+						textSize=new Size(controlSize.Width,controlSize.Height);
+					else
+					{
+						int availTextWidth=info.CellWidth-
+						                   ElementStyleLayout.HorizontalStyleWhiteSpace(info.LayoutStyle);
+						textSize=new Size(availTextWidth,controlSize.Height);
+					}
+				}
+				else
+				{
+					// Calculate Text Width and Height
+					if(info.CellWidth==0)
+					{
+						if (info.ContextCell.TextMarkupBody == null)
+						{
+							string text=info.ContextCell.Text;
+							if(text!="")
+							{
+								if(info.LayoutStyle.WordWrap && info.LayoutStyle.MaximumWidth>0)
+									textSize=TextDrawing.MeasureString(info.Graphics, text, font, info.LayoutStyle.MaximumWidth);
+								else if(info.ContextCell.Parent!=null && info.ContextCell.Parent.Style!=null && info.ContextCell.Parent.Style.WordWrap && info.ContextCell.Parent.Style.MaximumWidth>0)
+									textSize=TextDrawing.MeasureString(info.Graphics, text, font, info.ContextCell.Parent.Style.MaximumWidth);
+								else
+									textSize=TextDrawing.MeasureString(info.Graphics, text, font);
+							}
+						}
+						else
+						{
+							Size availSize = new Size(1600, 1);
+							if(info.LayoutStyle.WordWrap && info.LayoutStyle.MaximumWidth>0)
+								availSize.Width = info.LayoutStyle.MaximumWidth;
+							else if(info.ContextCell.Parent!=null && info.ContextCell.Parent.Style!=null && info.ContextCell.Parent.Style.WordWrap && info.ContextCell.Parent.Style.MaximumWidth>0)
+								availSize.Width = info.ContextCell.Parent.Style.MaximumWidth;
+
+							TextMarkup.MarkupDrawContext d = new TextMarkup.MarkupDrawContext(info.Graphics, font, Color.Empty, false);
+							info.ContextCell.TextMarkupBody.Measure(availSize, d);
+							availSize = info.ContextCell.TextMarkupBody.Bounds.Size;
+							d.RightToLeft = !info.LeftToRight;
+							info.ContextCell.TextMarkupBody.Arrange(new Rectangle(0, 0, availSize.Width, availSize.Height), d);
+
+							textSize = info.ContextCell.TextMarkupBody.Bounds.Size;
+						}
+					}
+					else
+					{
+						int availTextWidth=info.CellWidth-
+						                   ElementStyleLayout.HorizontalStyleWhiteSpace(info.LayoutStyle);
+
+						availTextWidth-=largestImageSize.Width;
+						if(info.ContextCell.CheckBoxVisible)
+							availTextWidth-=CheckBoxSize.Width;
+						int cellHeight=font.Height;
+
+						if(info.LayoutStyle.WordWrap)
+						{
+							cellHeight=info.LayoutStyle.MaximumHeight-info.LayoutStyle.MarginTop-
+							           info.LayoutStyle.MarginBottom-info.LayoutStyle.PaddingTop-info.LayoutStyle.PaddingBottom;
+							
+							if (info.ContextCell.TextMarkupBody == null)
+							{
+								if(availTextWidth>0)
+								{
+									if(cellHeight>0)
+										textSize=TextDrawing.MeasureString(info.Graphics, info.ContextCell.Text,font,new Size(availTextWidth,cellHeight),info.LayoutStyle.TextFormat);
+									else
+										textSize=TextDrawing.MeasureString(info.Graphics, info.ContextCell.Text, font, availTextWidth, info.LayoutStyle.TextFormat);
+								}
+							}
+							else
+							{
+								Size availSize = new Size(availTextWidth, 1);
+								TextMarkup.MarkupDrawContext d = new TextMarkup.MarkupDrawContext(info.Graphics, font, Color.Empty, false);
+								info.ContextCell.TextMarkupBody.Measure(availSize, d);
+								availSize = info.ContextCell.TextMarkupBody.Bounds.Size;
+								availSize.Width = availTextWidth;
+								d.RightToLeft = !info.LeftToRight;
+								info.ContextCell.TextMarkupBody.Arrange(new Rectangle(0, 0, availSize.Width, availSize.Height), d);
+
+								textSize = info.ContextCell.TextMarkupBody.Bounds.Size;
+							}
+						}
+						else
+							textSize=new Size(availTextWidth,cellHeight);
+					}
+				}
+
+				if(info.LayoutStyle.WordWrap)
+					info.ContextCell.WordWrap=true;
+				else
+					info.ContextCell.WordWrap=false;
+
+				height=(int)Math.Ceiling((double)textSize.Height);
+				if(info.VerticalPartAlignment)
+				{
+					if(largestImageSize.Height>0)
+						height+=largestImageSize.Height;
+					if(info.ContextCell.CheckBoxVisible)
+						height+=CheckBoxSize.Height;
+				}
+				else
+				{
+					if(largestImageSize.Height>height)
+						height=largestImageSize.Height;
+					if(info.ContextCell.CheckBoxVisible && CheckBoxSize.Height>height)
+						height=CheckBoxSize.Height;
+				}
+
+				Rectangle r=new Rectangle(info.Left+ElementStyleLayout.LeftWhiteSpace(info.LayoutStyle),
+				                          info.Top+ElementStyleLayout.TopWhiteSpace(info.LayoutStyle)
+				                          ,info.CellWidth,height);
+
+				if(r.Width==0)
+				{
+					if(info.VerticalPartAlignment)
+					{
+						r.Width=(int)Math.Ceiling((double)textSize.Width);
+						if(largestImageSize.Width>r.Width)
+							r.Width=(largestImageSize.Width+this.ImageTextSpacing);
+						if(info.ContextCell.CheckBoxVisible && CheckBoxSize.Width>r.Width)
+							r.Width+=(CheckBoxSize.Width+this.ImageTextSpacing);
+					}
+					else
+					{
+						r.Width=(int)Math.Ceiling((double)textSize.Width);
+						if(largestImageSize.Width>0)
+							r.Width+=(largestImageSize.Width+this.ImageTextSpacing);
+						if(info.ContextCell.CheckBoxVisible)
+							r.Width+=(CheckBoxSize.Width+this.ImageTextSpacing);
+					}
+				}
+
+				// Now that we have cell bounds store them
+				Rectangle rCellBounds=new Rectangle(info.Left,info.Top,info.CellWidth,r.Height+info.LayoutStyle.MarginTop+info.LayoutStyle.MarginBottom+info.LayoutStyle.PaddingTop+info.LayoutStyle.PaddingBottom);
+				if(rCellBounds.Width==0)
+					rCellBounds.Width=r.Width+ElementStyleLayout.HorizontalStyleWhiteSpace(info.LayoutStyle);
+				info.ContextCell.SetBounds(rCellBounds);
+
+				// Set Position of the image
+				if(!largestImageSize.IsEmpty)
+				{
+					eVerticalAlign va=GetVerticalAlign(info.ContextCell.ImageAlignment);
+					eHorizontalAlign ha=GetHorizontalAlign(info.ContextCell.ImageAlignment,info.LeftToRight);
+					if(info.VerticalPartAlignment)
+						info.ContextCell.SetImageBounds(AlignContentVertical(largestImageSize, ref r, ha, va, this.ImageTextSpacing));
+					else
+						info.ContextCell.SetImageBounds(AlignContent(largestImageSize, ref r, ha, va, this.ImageTextSpacing));
+				}
+				else
+					info.ContextCell.SetImageBounds(Rectangle.Empty);
+
+				// Set position of the check box
+				if(info.ContextCell.CheckBoxVisible)
+				{
+					eVerticalAlign va=GetVerticalAlign(info.ContextCell.CheckBoxAlignment);
+					eHorizontalAlign ha=GetHorizontalAlign(info.ContextCell.CheckBoxAlignment,info.LeftToRight);
+					if(info.VerticalPartAlignment)
+						info.ContextCell.SetCheckBoxBounds(AlignContentVertical(this.CheckBoxSize, ref r, ha, va, this.ImageTextSpacing));
+					else
+						info.ContextCell.SetCheckBoxBounds(AlignContent(this.CheckBoxSize, ref r, ha, va, this.ImageTextSpacing));
+				}
+				else
+					info.ContextCell.SetCheckBoxBounds(Rectangle.Empty);
+			
+				// Set position of the text
+				//info.ContextCell.SetTextBounds(Rectangle.Empty);
+				if(!textSize.IsEmpty)
+					info.ContextCell.TextContentBounds=r;
+				else
+					info.ContextCell.TextContentBounds=Rectangle.Empty;
+            
+			}
+
+			private Rectangle AlignContent(System.Drawing.Size contentSize, ref Rectangle boundingRectangle, eHorizontalAlign horizAlign, eVerticalAlign vertAlign, int contentSpacing)
+			{
+				Rectangle contentRect=new Rectangle(Point.Empty,contentSize);
+				switch(horizAlign)
+				{
+					case eHorizontalAlign.Right:
+						{
+							contentRect.X=boundingRectangle.Right-contentRect.Width;
+							boundingRectangle.Width-=(contentRect.Width+contentSpacing);
+							break;
+						}
+						//case eHorizontalAlign.Left:
+					default:
+						{
+							contentRect.X=boundingRectangle.X;
+							boundingRectangle.X=contentRect.Right+contentSpacing;
+							boundingRectangle.Width-=(contentRect.Width+contentSpacing);
+							break;
+						}
+//				case eHorizontalAlign.Center:
+//				{
+//					contentRect.X=boundingRectangle.X+(boundingRectangle.Width-contentRect.Width)/2;
+//					break;
+//				}
+				}
+
+				switch(vertAlign)
+				{
+					case eVerticalAlign.Top:
+						{
+							contentRect.Y=boundingRectangle.Y;
+							break;
+						}
+					case eVerticalAlign.Middle:
+						{
+							contentRect.Y=boundingRectangle.Y+(boundingRectangle.Height-contentRect.Height)/2;
+							break;
+						}
+					case eVerticalAlign.Bottom:
+						{
+							contentRect.Y=boundingRectangle.Bottom-contentRect.Height;
+							break;
+						}
+				}
+
+				return contentRect;
+			}
+
+			private Rectangle AlignContentVertical(System.Drawing.Size contentSize, ref Rectangle boundingRectangle, eHorizontalAlign horizAlign, eVerticalAlign vertAlign, int contentSpacing)
+			{
+				Rectangle contentRect=new Rectangle(Point.Empty,contentSize);
+				switch(horizAlign)
+				{
+					case eHorizontalAlign.Left:
+						{
+							contentRect.X=boundingRectangle.X;
+							break;
+						}
+					case eHorizontalAlign.Right:
+						{
+							contentRect.X=boundingRectangle.Right-contentRect.Width;
+							break;
+						}
+					case eHorizontalAlign.Center:
+						{
+							contentRect.X=boundingRectangle.X+(boundingRectangle.Width-contentRect.Width)/2;
+							break;
+						}
+				}
+
+				switch(vertAlign)
+				{
+					case eVerticalAlign.Bottom:
+						{
+							contentRect.Y=boundingRectangle.Bottom-contentRect.Height;
+							boundingRectangle.Height-=(contentRect.Height+contentSpacing);
+							break;
+						}
+						//case eVerticalAlign.Top:
+					default:
+						{
+							contentRect.Y=boundingRectangle.Y;
+							boundingRectangle.Y=contentRect.Bottom+contentSpacing;
+							boundingRectangle.Height-=(contentRect.Height+contentSpacing);
+							break;
+						}
+//				case eVerticalAlign.Middle:
+//				{
+//					contentRect.Y=boundingRectangle.Y+(boundingRectangle.Height-contentRect.Height)/2;
+//					break;
+//				}
+				}
+
+				return contentRect;
+			}
+
+			private eHorizontalAlign GetHorizontalAlign(eCellPartAlignment align, bool leftToRight)
+			{
+				if(((align==eCellPartAlignment.NearBottom || align==eCellPartAlignment.NearCenter ||
+				     align==eCellPartAlignment.NearTop) && leftToRight) ||
+				   ((align==eCellPartAlignment.FarBottom || align==eCellPartAlignment.FarCenter ||
+				     align==eCellPartAlignment.FarTop) && !leftToRight))
+					return eHorizontalAlign.Left;
+				else if(align==eCellPartAlignment.CenterBottom || align==eCellPartAlignment.CenterTop)
+					return eHorizontalAlign.Center;
+				return eHorizontalAlign.Right;
+			}
+
+			private eVerticalAlign GetVerticalAlign(eCellPartAlignment align)
+			{
+				eVerticalAlign va=eVerticalAlign.Middle;
+
+				switch(align)
+				{
+					case eCellPartAlignment.FarBottom:
+					case eCellPartAlignment.NearBottom:
+					case eCellPartAlignment.CenterBottom:
+						va=eVerticalAlign.Bottom;
+						break;
+					case eCellPartAlignment.FarTop:
+					case eCellPartAlignment.NearTop:
+					case eCellPartAlignment.CenterTop:
+						va=eVerticalAlign.Top;
+						break;
+				}
+
+				return va;
+			}
+
+			private System.Drawing.Size CheckBoxSize
+			{
+				get
+				{
+					return new Size(Dpi.Width12,Dpi.Height12);
+				}
+			}
+
+			/// <summary>
+			/// Returns spacing between check box and image if both are displayed
+			/// </summary>
+			private int ImageCheckBoxSpacing
+			{
+				get {return Dpi.Width1;}
+			}
+
+			/// <summary>
+			/// Returns spacing between image or checkbox and text
+			/// </summary>
+			private int ImageTextSpacing
+			{
+				get {return Dpi.Width1;}
+			}
+
+			/// <summary>
+			/// Returns horizontal spacing between cells in a node
+			/// </summary>
+			public int CellHorizontalSpacing
+			{
+				get {return Dpi.Width1;}
+			}
+
+			/// <summary>
+			/// Returns vertical spacing between cells in a node
+			/// </summary>
+			public int CellVerticalSpacing
+			{
+                get { return Dpi.Height1; }
+			}
+
+			/// <summary>
+			/// Spacing between different parts of the cell, like image, option button, text and expand button area
+			/// </summary>
+			public int CellPartSpacing
+			{
+                get { return Dpi.Width1; }
+			}
+
+			public Size LayoutCells(NodeLayoutContextInfo layoutInfo, int x, int y)
+			{
+				eCellLayout layout=layoutInfo.CellLayout;
+				if(layoutInfo.ContextNode.CellLayout!=layoutInfo.CellLayout && layoutInfo.ContextNode.CellLayout!=eCellLayout.Default)
+					layout=layoutInfo.ContextNode.CellLayout;
+				if(layout==eCellLayout.Horizontal || layout==eCellLayout.Default)
+					return this.LayoutCellsHorizontal(layoutInfo,x,y);
+				else
+					return this.LayoutCellsVertical(layoutInfo,x,y);
+			}
+
+			private Size LayoutCellsHorizontal(NodeLayoutContextInfo layoutInfo, int x, int y)
+			{
+				Node node=layoutInfo.ContextNode;
+				int height=0, width=0;
+
+				for(int i=0;i<node.Cells.Count;i++)
+				{
+					Cell cell=node.Cells[i];
+
+					bool bCellVisible=true;
+
+					// Setup cell layout helper class
+					LayoutCellInfo cellLayout=this.GetLayoutCellInfo();
+					cellLayout.Top=y;
+					cellLayout.Left=x;
+					cellLayout.CellWidth=0;
+					cellLayout.ContextCell=cell;
+					cellLayout.Graphics=layoutInfo.Graphics;
+					cellLayout.LeftToRight=layoutInfo.LeftToRight;
+					cellLayout.Font=layoutInfo.DefaultFont;
+					if(cell.Layout!=eCellPartLayout.Default)
+						cellLayout.VerticalPartAlignment=(cell.Layout==eCellPartLayout.Vertical);
+					else if(layoutInfo.CellPartLayout!=eCellPartLayout.Default)
+						cellLayout.VerticalPartAlignment=(layoutInfo.CellPartLayout==eCellPartLayout.Vertical);
+
+				
+					if(layoutInfo.DefaultColumns.Count>0 || layoutInfo.ChildColumns!=null && layoutInfo.ChildColumns.Count>0)
+					{
+						ColumnInfo ci=null;
+						if(layoutInfo.ChildColumns!=null && layoutInfo.ChildColumns.Count>0)
+							ci=layoutInfo.ChildColumns[i] as ColumnInfo;
+						else
+							ci=layoutInfo.DefaultColumns[i] as ColumnInfo;
+					
+						bCellVisible=ci.Visible;
+						cellLayout.CellWidth=ci.Width;
+					}
+
+					// Prepare union style
+					if(cell.StyleNormal!=null)
+						cellLayout.LayoutStyle=cell.StyleNormal;
+					else
+					{
+						if(layoutInfo.ContextNode.Style!=null)
+						{
+							ElementStyle styleCopy = layoutInfo.DefaultCellStyle.Copy();
+							styleCopy.ApplyStyle(layoutInfo.ContextNode.Style);
+							cellLayout.LayoutStyle = styleCopy;
+						}
+						else
+							cellLayout.LayoutStyle=layoutInfo.DefaultCellStyle;
+					}
+
+					this.LayoutSingleCell(cellLayout);
+
+					if(bCellVisible)
+					{
+						x+=cell.BoundsRelative.Width;
+						width+=cell.BoundsRelative.Width;
+						if(cell.BoundsRelative.Width>0)
+						{
+							x+=this.CellHorizontalSpacing;
+							width+=this.CellHorizontalSpacing;
+						}
+						if(cell.BoundsRelative.Height>height)
+							height=cell.BoundsRelative.Height;
+					}
+				}
+
+				// Take last added spacing off
+				x-=this.CellHorizontalSpacing;
+				width-=this.CellHorizontalSpacing;
+
+				return new Size(width,height);
+			}
+
+			private Size LayoutCellsVertical(NodeLayoutContextInfo layoutInfo, int x, int y)
+			{
+				Node node=layoutInfo.ContextNode;
+				int height=0, width=0;
+				eHorizontalAlign align=eHorizontalAlign.Center;
+				int iVisibleCells=0;
+
+				for(int i=0;i<node.Cells.Count;i++)
+				{
+					Cell cell=node.Cells[i];
+
+					bool bCellVisible=true;
+
+					// Setup cell layout helper class
+					LayoutCellInfo cellLayout=this.GetLayoutCellInfo();
+					cellLayout.Top=y;
+					cellLayout.Left=x;
+					cellLayout.CellWidth=0;
+					cellLayout.ContextCell=cell;
+					cellLayout.Graphics=layoutInfo.Graphics;
+					cellLayout.LeftToRight=layoutInfo.LeftToRight;
+					cellLayout.Font=layoutInfo.DefaultFont;
+					if(cell.Layout!=eCellPartLayout.Default)
+						cellLayout.VerticalPartAlignment=(cell.Layout==eCellPartLayout.Vertical);
+					else if(layoutInfo.CellPartLayout!=eCellPartLayout.Default)
+						cellLayout.VerticalPartAlignment=(layoutInfo.CellPartLayout==eCellPartLayout.Vertical);
+					
+					if(layoutInfo.DefaultColumns.Count>0 || layoutInfo.ChildColumns!=null && layoutInfo.ChildColumns.Count>0)
+					{
+						ColumnInfo ci=null;
+						if(layoutInfo.ChildColumns!=null && layoutInfo.ChildColumns.Count>0)
+							ci=layoutInfo.ChildColumns[i] as ColumnInfo;
+						else
+							ci=layoutInfo.DefaultColumns[i] as ColumnInfo;
+					
+						bCellVisible=ci.Visible;
+						cellLayout.CellWidth=ci.Width;
+					}
+
+					// Prepare union style
+					if(cell.StyleNormal!=null)
+						cellLayout.LayoutStyle=cell.StyleNormal;
+					else
+						cellLayout.LayoutStyle=layoutInfo.DefaultCellStyle;
+
+					this.LayoutSingleCell(cellLayout);
+
+					cell.SetVisible(bCellVisible);
+					if(bCellVisible)
+					{
+						iVisibleCells++;
+						y+=cell.BoundsRelative.Height;
+						height+=cell.BoundsRelative.Height;
+						if(cell.BoundsRelative.Height>0)
+						{
+							y+=this.CellVerticalSpacing;
+							height+=this.CellVerticalSpacing;
+						}
+						if(cell.BoundsRelative.Width>width)
+							width=cell.BoundsRelative.Width;
+					}
+				}
+
+				// Take last added spacing off
+				y-=this.CellVerticalSpacing;
+				height-=this.CellVerticalSpacing;
+
+				// Additional pass needed if horizontal alignment is other than left and there is more than one cell visible
+				if(align!=eHorizontalAlign.Left && iVisibleCells>1)
+				{
+					foreach(Cell cell in node.Cells)
+					{
+						if(!cell.IsVisible)
+							continue;
+						if(align==eHorizontalAlign.Center)
+							this.Offset(cell,(width-cell.BoundsRelative.Width)/2,0);
+						else // Right aligned cells
+							this.Offset(cell,width-cell.BoundsRelative.Width,0);
+					}
+				}
+
+				return new Size(width,height);
+			}
+
+			private LayoutCellInfo m_LayoutCellInfo=null;
+			private LayoutCellInfo GetLayoutCellInfo()
+			{
+				if(m_LayoutCellInfo==null)
+					m_LayoutCellInfo=new LayoutCellInfo();
+				return m_LayoutCellInfo;
+			}
+		}
+	}
+
+	internal class LayoutCellInfo
+	{
+		public Cell ContextCell=null;
+		public int CellWidth=0;
+		public System.Drawing.Graphics Graphics=null;
+		public System.Drawing.Font Font=null;
+		public int Left=0;
+		public int Top=0;
+		public ElementStyle LayoutStyle=null;
+		public bool LeftToRight=true;
+		public bool VerticalPartAlignment=false;
+
+		public LayoutCellInfo()
+		{
+		}
+	}
+
+	internal class ColumnInfo
+	{
+		public bool Visible;
+		public int Width;
+		public ColumnInfo(int width, bool visible)
+		{
+			this.Width=width;
+			this.Visible=visible;
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/Layout/NodeDiagramLayout.cs b/PROMS/DotNetBar Source Code/TreeGX/Layout/NodeDiagramLayout.cs
new file mode 100644
index 00000000..eebb1366
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/Layout/NodeDiagramLayout.cs	
@@ -0,0 +1,335 @@
+using System;
+using System.Collections;
+using System.Drawing;
+
+namespace DevComponents.Tree.Layout
+{
+	/// <summary>
+	/// Represents the class that performs node diagram layout.
+	/// </summary>
+	internal class NodeDiagramLayout:NodeLayout
+	{
+		private eDiagramFlow m_DiagramFlow=eDiagramFlow.LeftToRight;
+
+		public NodeDiagramLayout(TreeGX treeControl, Rectangle clientArea):base(treeControl,clientArea)
+		{
+		}
+
+		public override void PerformLayout()
+		{
+			this.PrepareStyles();
+
+			// Get default Columns
+			ArrayList defaultColInfoList=this.GetDefaultColumnInfo();
+
+			if(m_Tree.Nodes.Count==0)
+				return;
+
+			System.Drawing.Graphics graphics=this.GetGraphics();
+			try
+			{
+				// Loop through each top-level node
+				Node[] topLevelNodes=this.GetTopLevelNodes();
+				NodeLayoutContextInfo layoutInfo=this.GetDefaultNodeLayoutContextInfo(graphics);
+
+				foreach(Node childNode in topLevelNodes)
+				{
+					if(!childNode.Visible)
+						continue;
+					layoutInfo.ContextNode=childNode;
+					ProcessRootNode(layoutInfo);
+					break;
+				}
+				EmptyBoundsUnusedNodes(topLevelNodes);
+			}
+			finally
+			{
+				if(this.DisposeGraphics)
+					graphics.Dispose();
+			}
+		}
+
+		private void ProcessRootNode(NodeLayoutContextInfo layoutInfo)
+		{
+			if(m_DiagramFlow==eDiagramFlow.RightToLeft || m_DiagramFlow==eDiagramFlow.BottomToTop)
+				layoutInfo.MapPositionNear=true;
+			ProcessSubNode(layoutInfo);
+			PositionRootNode(layoutInfo);
+		}
+
+		private void PositionRootNode(NodeLayoutContextInfo layoutInfo)
+		{
+			Point location=Point.Empty;
+			Node root=layoutInfo.ContextNode;
+			switch(m_DiagramFlow)
+			{
+				case eDiagramFlow.LeftToRight:
+				{
+					location.Y=(root.ChildNodesBounds.Height-root.BoundsRelative.Height)/2;
+					break;
+				}
+				case eDiagramFlow.RightToLeft:
+				{
+					location.X=root.ChildNodesBounds.Width+this.NodeHorizontalSpacing;
+					location.Y=(root.ChildNodesBounds.Height-root.BoundsRelative.Height)/2;
+					break;
+				}
+				case eDiagramFlow.TopToBottom:
+				{
+					location.X=0; //(root.ChildNodesBounds.Width-root.Bounds.Width)/2;
+					break;
+				}
+				case eDiagramFlow.BottomToTop:
+				{
+					location.X=root.ChildNodesBounds.Width; //-root.Bounds.Width; //-root.Bounds.Width)/2;
+					location.Y=root.ChildNodesBounds.Height+this.NodeVerticalSpacing; //-root.Bounds.Height; //+this.NodeVerticalSpacing;
+					break;
+				}
+			}
+			OffsetNodeLocation(root,location.X,location.Y);
+
+			Rectangle area=Rectangle.Empty;
+			area=Rectangle.Union(area,root.BoundsRelative);
+
+			PositionSubNodes(root);
+			
+			area=Rectangle.Union(area,root.ChildNodesBounds);
+			root.ChildNodesBounds=area;
+			m_Width=area.Width;
+			m_Height=area.Height;
+		}
+//		private int GetMaxChildNodeWidth(Node parent)
+//		{
+//			int width=0;
+//			foreach(Node node in parent.Nodes)
+//			{
+//				if(node.Bounds.Width>width)
+//					width=node.Bounds.Width;
+//			}
+//			return width;
+//		}
+
+		private void PositionSubNodes(Node parentNode)
+		{
+			if(parentNode.Nodes.Count==0)
+				return;
+
+			Rectangle rChildBounds=Rectangle.Empty;
+			bool bFirst=true;
+			bool rootNode=IsRootNode(parentNode);
+
+			if(m_DiagramFlow==eDiagramFlow.LeftToRight || !rootNode && m_DiagramFlow==eDiagramFlow.TopToBottom)
+			{
+				int y=parentNode.BoundsRelative.Y-(parentNode.ChildNodesBounds.Height-parentNode.BoundsRelative.Height)/2;
+				int x=0;
+//				if(parentNode.Parent!=null)
+//					x=parentNode.Bounds.X+GetMaxChildNodeWidth(parentNode.Parent)+this.NodeHorizontalSpacing;
+//				else
+					x=parentNode.BoundsRelative.Right+this.NodeHorizontalSpacing;
+
+				foreach(Node node in parentNode.Nodes)
+				{
+					if(!node.Visible)
+						continue;
+
+					int top=y;
+					bool anyVisibleNodes=node.AnyVisibleNodes;
+					if(node.ChildNodesBounds.Height>node.BoundsRelative.Height && node.Expanded && anyVisibleNodes)
+						top+=(node.ChildNodesBounds.Height-node.BoundsRelative.Height)/2;
+					OffsetNodeLocation(node,x,top);
+					if(node.Expanded && anyVisibleNodes)
+					{
+						PositionSubNodes(node);
+						y+=(Math.Max(node.BoundsRelative.Height,node.ChildNodesBounds.Height)+this.NodeVerticalSpacing);
+					}
+					else y+=(node.BoundsRelative.Height+this.NodeVerticalSpacing);
+					if(bFirst)
+					{
+						rChildBounds=node.BoundsRelative;
+						bFirst=false;
+					}
+					else
+						rChildBounds=Rectangle.Union(rChildBounds,node.BoundsRelative);
+					if(!node.ChildNodesBounds.IsEmpty)
+						rChildBounds=Rectangle.Union(rChildBounds,node.ChildNodesBounds);
+				}
+			}
+			else if(m_DiagramFlow==eDiagramFlow.RightToLeft || !rootNode && m_DiagramFlow==eDiagramFlow.BottomToTop)
+			{
+				int y=parentNode.BoundsRelative.Y-(parentNode.ChildNodesBounds.Height-parentNode.BoundsRelative.Height)/2;
+				int x=parentNode.BoundsRelative.X-this.NodeHorizontalSpacing;
+
+				foreach(Node node in parentNode.Nodes)
+				{
+					if(!node.Visible)
+						continue;
+
+					int left=x-node.BoundsRelative.Width;
+					int top=y;
+					bool anyVisibleNodes=node.AnyVisibleNodes;
+					if(node.ChildNodesBounds.Height>node.BoundsRelative.Height && node.Expanded && anyVisibleNodes)
+						top+=(node.ChildNodesBounds.Height-node.BoundsRelative.Height)/2;
+					OffsetNodeLocation(node,left,top);
+					if(node.Expanded && anyVisibleNodes)
+					{
+						PositionSubNodes(node);
+						y+=(Math.Max(node.BoundsRelative.Height,node.ChildNodesBounds.Height)+this.NodeVerticalSpacing);
+					}
+					else y+=(node.BoundsRelative.Height+this.NodeVerticalSpacing);
+					if(bFirst)
+					{
+						rChildBounds=node.BoundsRelative;
+						bFirst=false;
+					}
+					else
+						rChildBounds=Rectangle.Union(rChildBounds,node.BoundsRelative);
+					if(!node.ChildNodesBounds.IsEmpty)
+						rChildBounds=Rectangle.Union(rChildBounds,node.ChildNodesBounds);
+				}
+			}
+			else if(m_DiagramFlow==eDiagramFlow.TopToBottom)
+			{
+				int y=parentNode.BoundsRelative.Bottom+this.NodeVerticalSpacing;
+				
+				foreach(Node node in parentNode.Nodes)
+				{
+					if(!node.Visible)
+						continue;
+
+					int left=parentNode.BoundsRelative.Right+this.NodeHorizontalSpacing;
+					int top=y;
+					bool anyVisibleNodes=node.AnyVisibleNodes;
+					if(node.ChildNodesBounds.Height>node.BoundsRelative.Height && node.Expanded && anyVisibleNodes)
+						top+=(node.ChildNodesBounds.Height-node.BoundsRelative.Height)/2;
+					OffsetNodeLocation(node,left,top);
+					if(node.Expanded && anyVisibleNodes)
+					{
+						PositionSubNodes(node);
+						y+=(Math.Max(node.BoundsRelative.Height,node.ChildNodesBounds.Height)+this.NodeVerticalSpacing);
+					}
+					else y+=(node.BoundsRelative.Height+this.NodeVerticalSpacing);
+					if(bFirst)
+					{
+						rChildBounds=node.BoundsRelative;
+						bFirst=false;
+					}
+					else
+						rChildBounds=Rectangle.Union(rChildBounds,node.BoundsRelative);
+					if(!node.ChildNodesBounds.IsEmpty)
+						rChildBounds=Rectangle.Union(rChildBounds,node.ChildNodesBounds);
+				}
+			}
+			else if(m_DiagramFlow==eDiagramFlow.BottomToTop)
+			{
+				int y=parentNode.BoundsRelative.Top-this.NodeVerticalSpacing;
+				
+				foreach(Node node in parentNode.Nodes)
+				{
+					if(!node.Visible)
+						continue;
+
+					int left=parentNode.BoundsRelative.Left-this.NodeHorizontalSpacing-node.BoundsRelative.Width;
+					int top=y-node.BoundsRelative.Height;
+					bool anyVisibleNodes=node.AnyVisibleNodes;
+					if(node.ChildNodesBounds.Height>node.BoundsRelative.Height && node.Expanded && anyVisibleNodes)
+						top-=(node.ChildNodesBounds.Height-node.BoundsRelative.Height)/2;
+					OffsetNodeLocation(node,left,top);
+					if(node.Expanded && anyVisibleNodes)
+					{
+						PositionSubNodes(node);
+						y-=(Math.Max(node.BoundsRelative.Height,node.ChildNodesBounds.Height)+this.NodeVerticalSpacing);
+					}
+					else y-=(node.BoundsRelative.Height+this.NodeVerticalSpacing);
+					if(bFirst)
+					{
+						rChildBounds=node.BoundsRelative;
+						bFirst=false;
+					}
+					else
+						rChildBounds=Rectangle.Union(rChildBounds,node.BoundsRelative);
+					if(!node.ChildNodesBounds.IsEmpty)
+						rChildBounds=Rectangle.Union(rChildBounds,node.ChildNodesBounds);
+				}
+			}
+			parentNode.ChildNodesBounds=rChildBounds;
+		}
+
+		private void ProcessSubNode(NodeLayoutContextInfo layoutInfo)
+		{
+			Node node=layoutInfo.ContextNode;
+			bool bHorizontalFlow=true;//(m_DiagramFlow==eDiagramFlow.LeftToRight || m_DiagramFlow==eDiagramFlow.RightToLeft);
+			if(node.SizeChanged)
+			{
+				// Calculate size of the node itself...
+				LayoutNode(layoutInfo);
+			}
+			else
+				node.SetBounds(new Rectangle(Point.Empty,node.BoundsRelative.Size));
+			
+			if(node.Expanded)
+			{
+				ArrayList parentColumns=layoutInfo.ChildColumns;
+				ArrayList childColumns=GetNodeColumnInfo(node);
+
+				Rectangle childNodesBounds=Rectangle.Empty;
+				foreach(Node childNode in node.Nodes)
+				{
+					if(!childNode.Visible)
+						continue;
+					layoutInfo.ContextNode=childNode;
+				
+					layoutInfo.ChildColumns=childColumns;
+					ProcessSubNode(layoutInfo);
+
+					if(bHorizontalFlow)
+					{
+						childNodesBounds.Height+=(Math.Max(childNode.BoundsRelative.Height,childNode.ChildNodesBounds.Height)+this.NodeVerticalSpacing);
+						childNodesBounds.Width=Math.Max(childNodesBounds.Width,childNode.BoundsRelative.Width+(childNode.ChildNodesBounds.Width>0?this.NodeHorizontalSpacing+childNode.ChildNodesBounds.Width:0));
+					}
+					else
+					{
+						childNodesBounds.Width+=(Math.Max(childNode.BoundsRelative.Width,childNode.ChildNodesBounds.Width)+this.NodeHorizontalSpacing);
+						childNodesBounds.Height=Math.Max(childNodesBounds.Height,childNode.BoundsRelative.Height+(childNode.ChildNodesBounds.Height>0?this.NodeVerticalSpacing+childNode.ChildNodesBounds.Height:0));
+					}
+				}
+
+				layoutInfo.ChildColumns=parentColumns;
+
+				if(bHorizontalFlow)
+				{
+					if(childNodesBounds.Height>0)
+						childNodesBounds.Height-=this.NodeVerticalSpacing;
+				}
+				else
+				{
+					if(childNodesBounds.Width>0)
+						childNodesBounds.Width-=this.NodeHorizontalSpacing;
+				}
+				node.ChildNodesBounds=childNodesBounds;
+				layoutInfo.ChildColumns=null;
+				layoutInfo.ContextNode=node;
+			}
+			else node.ChildNodesBounds=Rectangle.Empty;
+		}
+
+		/// <summary>
+		/// Returns true if root node should have expanded part
+		/// </summary>
+		protected override bool RootHasExpandedPart
+		{
+			get {return false;}
+		}
+
+		/// <summary>
+		/// Indicates the layout flow for the nodes.
+		/// </summary>
+		public eDiagramFlow DiagramFlow
+		{
+			get {return m_DiagramFlow;}
+			set
+			{
+				m_DiagramFlow=value;
+			}
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/Layout/NodeLayout.cs b/PROMS/DotNetBar Source Code/TreeGX/Layout/NodeLayout.cs
new file mode 100644
index 00000000..872e6b69
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/Layout/NodeLayout.cs	
@@ -0,0 +1,591 @@
+using System;
+using System.Drawing;
+using System.Collections;
+
+namespace DevComponents.Tree.Layout
+{
+	/// <summary>
+	/// Summary description for NodeLayout.
+	/// </summary>
+	internal abstract class NodeLayout
+	{
+		#region Private Variables
+		protected int m_Height=0;
+		protected int m_Width=0;
+		protected TreeGX m_Tree=null;
+		protected Rectangle m_ClientArea;
+		//protected int m_ExpandAreaWidth=8;
+        private Size m_ExpandPartSize = new Size(9, 9);
+		private int m_CommandAreaWidth=10;
+		private int m_TreeLayoutChildNodeIndent = 16;
+
+		private System.Windows.Forms.LeftRightAlignment m_LeftRight=System.Windows.Forms.LeftRightAlignment.Left;
+		private int m_NodeVerticalSpacing=0;
+		private int m_NodeHorizontalSpacing=0;
+		private CellLayout m_CellLayout=null;
+		private Graphics m_Graphics=null;
+		#endregion
+
+		public NodeLayout(TreeGX treeControl, Rectangle clientArea)
+		{
+			m_Tree=treeControl;
+			m_ClientArea=clientArea;
+		}
+
+		/// <summary>
+		/// Performs layout of the nodes inside of the tree control.
+		/// </summary>
+		public virtual void PerformLayout()
+		{
+		}
+
+		/// <summary>
+		/// Performs layout for single unassigned node. Node does not have to be part of the tree control.
+		/// </summary>
+		/// <param name="node">Node to perform layout on.</param>
+		public virtual void PerformSingleNodeLayout(Node node)
+		{
+			if(node==null)
+				return;
+
+			this.PrepareStyles();
+			// Get default Columns
+
+			System.Drawing.Graphics graphics=this.GetGraphics();
+			try
+			{
+				NodeLayoutContextInfo layoutInfo=this.GetDefaultNodeLayoutContextInfo(graphics);
+				layoutInfo.ContextNode=node;
+				LayoutNode(layoutInfo);
+			}
+			finally
+			{
+				graphics.Dispose();
+			}
+		}
+
+		public int Width
+		{
+			get {return m_Width;}
+		}
+
+		public int Height
+		{
+			get {return m_Height;}
+		}
+
+		public Rectangle ClientArea
+		{
+			get {return m_ClientArea;}
+			set {m_ClientArea=value;}
+		}
+		
+		public Graphics Graphics
+		{
+			get { return m_Graphics;}
+			set { m_Graphics = value;}
+		}
+		
+		internal bool DisposeGraphics
+		{
+			get
+			{
+				return (m_Graphics == null);
+			}
+		}
+
+		protected virtual System.Drawing.Graphics GetGraphics()
+		{
+			if(m_Graphics!=null)
+				return m_Graphics;
+			
+			Graphics g=m_Tree.CreateGraphics();
+			if(m_Tree.AntiAlias)
+			{
+				g.SmoothingMode=System.Drawing.Drawing2D.SmoothingMode.AntiAlias;
+				g.TextRenderingHint = System.Drawing.Text.TextRenderingHint.ClearTypeGridFit;
+			}
+			return g;
+		}
+
+		/// <summary>
+		/// Resizes all styles and prepares them for layout.
+		/// </summary>
+		protected virtual void PrepareStyles()
+		{
+			// Resize styles if needed
+			foreach(ElementStyle es in m_Tree.Styles)
+			{
+				if(es.SizeChanged)
+					ElementStyleLayout.CalculateStyleSize(es,m_Tree.Font);
+			}
+		}
+
+		/// <summary>
+		/// Returns default top-level columns for tree control.
+		/// </summary>
+		/// <returns>Returns array list of ColumnInfo objects.</returns>
+		protected virtual ArrayList GetDefaultColumnInfo()
+		{
+			ArrayList ci=new ArrayList();
+			
+			ColumnHeaderCollection columns=m_Tree.Columns;
+			if(columns!=null)
+			{
+				foreach(ColumnHeader h in columns)
+				{
+					ci.Add(new ColumnInfo(h.Bounds.Width, h.Visible));
+				}
+			}
+
+			return ci;
+		}
+
+		/// <summary>
+		/// Returns column information for a given node.
+		/// </summary>
+		/// <param name="node">Node to return column information for</param>
+		/// <returns>Returns array list of ColumnInfo objects or null if there are no columns defined.</returns>
+		protected virtual ArrayList GetNodeColumnInfo(Node node)
+		{
+			if(node.NodesColumns.Count==0)
+				return null;
+
+			ArrayList ci=new ArrayList();
+			foreach(ColumnHeader h in node.NodesColumns)
+			{
+				ci.Add(new ColumnInfo(h.Width.Absolute, h.Visible));
+			}
+			return ci;
+		}
+
+		/// <summary>
+		/// Gets or sets the vertical spacing between nodes in pixels.
+		/// </summary>
+		public virtual int NodeVerticalSpacing
+		{
+			get {return m_NodeVerticalSpacing;}
+			set {m_NodeVerticalSpacing=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets the horizontal spacing between nodes in pixels.
+		/// </summary>
+		public virtual int NodeHorizontalSpacing
+		{
+			get {return m_NodeHorizontalSpacing;}
+			set {m_NodeHorizontalSpacing=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets the child node indent in pixels.
+		/// </summary>
+		public virtual int TreeLayoutChildNodeIndent
+		{
+			get {return m_TreeLayoutChildNodeIndent; }
+			set { m_TreeLayoutChildNodeIndent = value; }
+		}
+
+		/// <summary>
+		/// Returns column header collection for the given column template name.
+		/// </summary>
+		/// <param name="name">Name of the column template.</param>
+		/// <returns>Column header collection or null if template name cannot be found.</returns>
+		public virtual ColumnHeaderCollection GetColumnHeader(string name)
+		{
+			if(name=="" || name==null)
+				return null;
+			return m_Tree.Headers.GetByName(name).Columns;
+		}
+
+		/// <summary>
+		/// Returns width of the expand button area. Default is 8 pixels.
+		/// </summary>
+		protected virtual int ExpandAreaWidth
+		{
+			get {return Dpi.Width(m_ExpandPartSize.Width);}
+		}
+
+		/// <summary>
+		/// Gets or sets width of command button area. Default is 8 pixels.
+		/// </summary>
+		public virtual int CommandAreaWidth
+		{
+			get {return m_CommandAreaWidth;}
+			set {m_CommandAreaWidth=value;}
+		}
+
+		/// <summary>
+		/// Sets the position and size of the node command button.
+		/// </summary>
+		/// <param name="layoutInfo">Node layout context information</param>
+		protected virtual void LayoutCommandPart(NodeLayoutContextInfo layoutInfo, ElementStyle nodeStyle)
+		{
+			// Command part is right-aligned just before the node border
+			Rectangle bounds=new Rectangle(layoutInfo.ContextNode.ContentBounds.Right-this.CommandAreaWidth-
+				ElementStyleLayout.StyleSpacing(nodeStyle,eSpacePart.Border,eStyleSide.Right),layoutInfo.ContextNode.ContentBounds.Y+
+				ElementStyleLayout.StyleSpacing(nodeStyle,eSpacePart.Border,eStyleSide.Top), 
+				this.CommandAreaWidth, layoutInfo.ContextNode.ContentBounds.Height-
+				ElementStyleLayout.StyleSpacing(nodeStyle,eSpacePart.Border,eStyleSide.Top)-
+				ElementStyleLayout.StyleSpacing(nodeStyle,eSpacePart.Border,eStyleSide.Bottom));
+//			Rectangle bounds=new Rectangle(layoutInfo.ContextNode.ContentBounds.Right-this.CommandAreaWidth-
+//				ElementStyleLayout.StyleSpacing(nodeStyle,eSpacePart.Border,eStyleSide.Right),layoutInfo.ContextNode.ContentBounds.Y, 
+//				this.CommandAreaWidth, layoutInfo.ContextNode.ContentBounds.Height);
+			layoutInfo.ContextNode.CommandBoundsRelative=bounds;
+		}
+
+		/// <summary>
+		/// Determines the rectangle of the +/- part of the tree node that is used to expand node.
+		/// </summary>
+		/// <param name="layoutInfo">Node layout context information</param>
+		protected virtual void LayoutExpandPart(NodeLayoutContextInfo layoutInfo, bool bLeftNode)
+		{
+			Node node=layoutInfo.ContextNode;
+
+			Size partSize=Dpi.Size(GetExpandPartSize());
+
+			Rectangle bounds=new Rectangle(0,0,partSize.Width,partSize.Height);
+			
+			bounds.Y=(node.BoundsRelative.Height-bounds.Height)/2;
+
+			if(bLeftNode)
+				bounds.X=(this.ExpandAreaWidth-bounds.Width)/2;
+			else
+				bounds.X=node.BoundsRelative.Right-this.ExpandAreaWidth+(this.ExpandAreaWidth-partSize.Width)/2;
+
+			node.SetExpandPartRectangle(bounds);
+		}
+
+		/// <summary>
+		/// Returns the size of the node expand part.
+		/// </summary>
+		/// <returns>Size of the expand part, default 8,8.</returns>
+		protected virtual Size GetExpandPartSize()
+		{
+			return m_ExpandPartSize;
+		}
+
+		/// <summary>
+		/// Gets or sets the size of the expand part that is expanding/collapsing the node. Default value is 8,8.
+		/// </summary>
+		public System.Drawing.Size ExpandPartSize
+		{
+			get {return m_ExpandPartSize;}
+			set 
+            {
+                m_ExpandPartSize=value;
+            }
+		}
+
+		/// <summary>
+		/// Provides the layout for single node.
+		/// </summary>
+		/// <param name="layoutInfo">Layout information.</param>
+		protected virtual void LayoutNode(NodeLayoutContextInfo layoutInfo)
+		{
+//			if(!layoutInfo.ContextNode.SizeChanged)
+//				return;
+
+			bool bHasExpandPart=this.HasExpandPart(layoutInfo);
+			bool bHasCommandPart=this.HasCommandPart(layoutInfo);
+
+			Node node=layoutInfo.ContextNode;
+			
+			Rectangle nodeRect=Rectangle.Empty;
+			Rectangle nodeContentRect=Rectangle.Empty; // Node content rect excludes expand rect
+
+			int height=0, width=0;
+			
+			// Left node relative to the main root node...
+			bool bLeftNode=(layoutInfo.MapPositionNear && layoutInfo.LeftToRight);
+			if(bLeftNode && bHasExpandPart || this.ReserveExpandPartSpace)
+			{
+				width+=(this.ExpandAreaWidth+this.GetCellLayout().CellPartSpacing);
+			}
+
+			int x=width;		// relative to 0,0 of the node
+			int y=0;			// Relative to 0,0 of the node
+			
+			// Apply node style
+			ElementStyle nodeStyle=null;
+			if(node.Expanded && node.StyleExpanded!=null)
+				nodeStyle=node.StyleExpanded;
+			else if(node.Style!=null)
+				nodeStyle=node.Style;
+			else
+				nodeStyle=layoutInfo.DefaultNodeStyle;
+
+			nodeContentRect.X=x;
+
+			if(nodeStyle!=null)
+			{
+				x+=ElementStyleLayout.LeftWhiteSpace(nodeStyle); // nodeStyle.MarginLeft+nodeStyle.PaddingLeft;
+				y+=ElementStyleLayout.TopWhiteSpace(nodeStyle); //nodeStyle.MarginTop+nodeStyle.PaddingTop;
+				nodeContentRect.X+=nodeStyle.MarginLeft;
+				nodeContentRect.Y+=nodeStyle.MarginTop;
+			}
+
+			Size size=this.GetCellLayout().LayoutCells(layoutInfo,x,y);
+
+			node.SetCellsBounds(new Rectangle(x,y,size.Width,size.Height));
+
+			height=size.Height;
+			width+=size.Width;
+
+			nodeContentRect.Width=size.Width;
+			nodeContentRect.Height=size.Height;
+
+			if(nodeStyle!=null)
+			{
+				nodeContentRect.Width+=(ElementStyleLayout.StyleSpacing(nodeStyle,eSpacePart.Padding | eSpacePart.Border,eStyleSide.Left)+
+					ElementStyleLayout.StyleSpacing(nodeStyle,eSpacePart.Padding | eSpacePart.Border,eStyleSide.Right));
+				nodeContentRect.Height+=(ElementStyleLayout.StyleSpacing(nodeStyle,eSpacePart.Padding | eSpacePart.Border,eStyleSide.Top)+
+					ElementStyleLayout.StyleSpacing(nodeStyle,eSpacePart.Padding | eSpacePart.Border,eStyleSide.Bottom));
+
+				width+=(ElementStyleLayout.HorizontalStyleWhiteSpace(nodeStyle));
+				height+=(ElementStyleLayout.VerticalStyleWhiteSpace(nodeStyle));
+			}
+
+			if(!bLeftNode && bHasExpandPart)
+				width+=this.ExpandAreaWidth;
+
+			if(bHasCommandPart)
+			{
+				width+=this.CommandAreaWidth;
+				nodeContentRect.Width+=this.CommandAreaWidth;
+			}
+
+			nodeRect.Height=height;
+			nodeRect.Width=width;
+			node.SetBounds(nodeRect);
+			node.SetContentBounds(nodeContentRect);
+
+			if(bHasCommandPart)
+				LayoutCommandPart(layoutInfo, nodeStyle);
+			else
+				node.CommandBoundsRelative=Rectangle.Empty;
+
+			if(bHasExpandPart)
+				LayoutExpandPart(layoutInfo,bLeftNode);
+			else
+				node.SetExpandPartRectangle(Rectangle.Empty);
+
+			node.SizeChanged=false;
+
+			// Calculate size and location of node column header if any
+			//if(node.NodesColumnHeaderVisible)
+			{
+				//layoutInfo.Left+=this.NodeLevelOffset;
+				LayoutColumnHeader(layoutInfo);
+				//layoutInfo.Left-=this.NodeLevelOffset;
+			}
+		}
+
+		/// <summary>
+		/// Returns true if given node has expand part.
+		/// </summary>
+		/// <param name="layoutInfo">Layout context information.</param>
+		/// <returns></returns>
+		protected virtual bool HasExpandPart(NodeLayoutContextInfo layoutInfo)
+		{
+			Node node=layoutInfo.ContextNode;
+			if(node.ExpandVisibility==eNodeExpandVisibility.Auto)
+			{
+				if(IsRootNode(node) && !RootHasExpandedPart || !NodeOperations.GetAnyVisibleNodes(node))
+					return false;
+				return true;
+			}
+			else
+				return (node.ExpandVisibility==eNodeExpandVisibility.Visible);
+		}
+
+		/// <summary>
+		/// Returns whether given node has command part.
+		/// </summary>
+		/// <param name="layoutInfo">Layout context information.</param>
+		/// <returns>True if command part should be drawn otherwise false.</returns>
+		protected virtual bool HasCommandPart(NodeLayoutContextInfo layoutInfo)
+		{
+			return layoutInfo.ContextNode.CommandButton;
+		}
+
+		/// <summary>
+		/// Returns true if root node should have expanded part
+		/// </summary>
+		protected virtual bool RootHasExpandedPart
+		{
+			get {return true;}
+		}
+
+		/// <summary>
+		/// Returns true if expand part space should be accounted for even if they expand part is not visible or need to be displayed. Default value is false.
+		/// </summary>
+		protected virtual bool ReserveExpandPartSpace
+		{
+			get
+			{
+				return false;
+			}
+		}
+
+		/// <summary>
+		/// Returns class responsible for cell layout.
+		/// </summary>
+		/// <returns>Cell layout class.</returns>
+		protected virtual CellLayout GetCellLayout()
+		{
+			if(m_CellLayout==null)
+				m_CellLayout=new CellLayout();
+			return m_CellLayout;
+		}
+
+		/// <summary>
+		/// Offsets node location and location of it's child nodes bounds.
+		/// </summary>
+		/// <param name="node">Node to offset.</param>
+		/// <param name="x">Horizontal offset.</param>
+		/// <param name="y">Vertical offset.</param>
+		protected virtual void OffsetNodeLocation(Node node, int x, int y)
+		{
+			node.SetBounds(new Rectangle(node.BoundsRelative.X+x,node.BoundsRelative.Y+y,node.BoundsRelative.Width,node.BoundsRelative.Height));
+			if(node.Expanded)
+				node.ChildNodesBounds=new Rectangle(node.ChildNodesBounds.X+x,node.ChildNodesBounds.Y+y,node.ChildNodesBounds.Width,node.ChildNodesBounds.Height);
+		}
+
+		protected virtual NodeLayoutContextInfo GetDefaultNodeLayoutContextInfo(System.Drawing.Graphics graphics)
+		{
+			NodeLayoutContextInfo layoutInfo=new NodeLayoutContextInfo();
+			layoutInfo.ClientRectangle=m_ClientArea;
+			layoutInfo.DefaultColumns=this.GetDefaultColumnInfo();
+			layoutInfo.ChildColumns=null;
+			layoutInfo.Left=0;
+			layoutInfo.Top=0; // TODO: Include Columns if visible into this...
+			layoutInfo.DefaultFont=m_Tree.Font;
+			layoutInfo.LeftToRight=(this.LeftRight==System.Windows.Forms.LeftRightAlignment.Left);
+			layoutInfo.Graphics=graphics;
+			layoutInfo.Styles=m_Tree.Styles;
+			if(m_Tree.CellLayout!=eCellLayout.Default)
+				layoutInfo.CellLayout=m_Tree.CellLayout;
+			if(m_Tree.CellPartLayout!=eCellPartLayout.Default)
+				layoutInfo.CellPartLayout=m_Tree.CellPartLayout;
+				
+			if(m_Tree.NodeStyle!=null)
+				layoutInfo.DefaultNodeStyle=m_Tree.NodeStyle;
+
+			if(m_Tree.CellStyleDefault!=null)
+				layoutInfo.DefaultCellStyle=m_Tree.CellStyleDefault;
+			else
+				layoutInfo.DefaultCellStyle=ElementStyle.GetDefaultCellStyle(layoutInfo.DefaultNodeStyle);
+
+			// Determine size of the default Column Header
+			if(m_Tree.ColumnStyleNormal!=null)
+			{
+				ElementStyleLayout.CalculateStyleSize(m_Tree.ColumnStyleNormal,layoutInfo.DefaultFont);
+				layoutInfo.DefaultHeaderSize=m_Tree.ColumnStyleNormal.Size;
+			}
+
+			if(layoutInfo.DefaultHeaderSize.IsEmpty)
+				layoutInfo.DefaultHeaderSize.Height=layoutInfo.DefaultFont.Height+4;
+
+			return layoutInfo;
+		}
+
+		protected Node[] GetTopLevelNodes()
+		{
+			if(m_Tree.DisplayRootNode!=null)
+				return new Node[] {m_Tree.DisplayRootNode};
+			else
+			{
+				Node[] nodes=new Node[m_Tree.Nodes.Count];
+				m_Tree.Nodes.CopyTo(nodes);
+				return nodes;
+			}
+		}
+
+		protected bool IsRootNode(Node node)
+		{
+			return NodeOperations.IsRootNode(m_Tree,node);
+		}
+
+		protected virtual void EmptyBoundsUnusedNodes(Node[] topLevelNodes)
+		{
+			if(m_Tree.DisplayRootNode!=null)
+			{
+				Node node=m_Tree.DisplayRootNode.PrevVisibleNode;
+				while(node!=null)
+				{
+					node.SetBounds(Rectangle.Empty);
+					node=node.PrevVisibleNode;
+				}
+				node=m_Tree.DisplayRootNode.NextNode;
+				if(node==null)
+				{
+					node=m_Tree.DisplayRootNode.Parent;
+					while(node!=null)
+					{
+						if(node.NextNode!=null)
+						{
+							node=node.NextNode;
+							break;
+						}
+						else
+							node=node.Parent;
+					}
+				}
+				while(node!=null)
+				{
+					node.SetBounds(Rectangle.Empty);
+					node=node.NextVisibleNode;
+				}
+			}
+			else
+			{
+				for(int i=1;i<topLevelNodes.Length;i++)
+				{
+					topLevelNodes[i].SetBounds(Rectangle.Empty);
+				}
+			}
+		}
+
+		#region Column Support
+		// Assumes that layoutInfo is up-to-date and that Node that is connected with
+		// columns is already processed and it's size and location calculated.
+		// layoutInfo.Top member reflects the next position below the node
+		// layoutInfo.LevelOffset should reflect the X offset for the child nodes.
+		public void LayoutColumnHeader(NodeLayoutContextInfo layoutInfo)
+		{
+			Node node=layoutInfo.ContextNode;
+
+			if(node.NodesColumns.Count==0)
+			{
+				node.ColumnHeaderHeight=0;
+				return;
+			}
+			
+			int x=layoutInfo.Left;
+			int y=layoutInfo.ContextNode.BoundsRelative.Bottom;
+
+			bool bLeftNode=(layoutInfo.MapPositionNear && layoutInfo.LeftToRight);
+			int expandPartWidth=this.ExpandAreaWidth;
+			int cellPartSpacing=GetCellLayout().CellPartSpacing;
+
+			if(!bLeftNode)
+				x+=(expandPartWidth+cellPartSpacing);
+
+			int clientWidth=layoutInfo.ClientRectangle.Width-(layoutInfo.Left+expandPartWidth);
+			if(clientWidth<=0)
+				clientWidth=layoutInfo.ClientRectangle.Width;
+			
+			node.ColumnHeaderHeight=Layout.ColumnHeaderLayout.LayoutColumnHeader(layoutInfo,x,y,clientWidth,this.GetCellLayout().CellHorizontalSpacing);
+		}
+		#endregion
+		
+		#region RTL Support
+		public virtual System.Windows.Forms.LeftRightAlignment LeftRight
+		{
+			get {return m_LeftRight;}
+			set {m_LeftRight=value;}
+		}
+		#endregion
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/Layout/NodeLayoutContextInfo.cs b/PROMS/DotNetBar Source Code/TreeGX/Layout/NodeLayoutContextInfo.cs
new file mode 100644
index 00000000..e0faff00
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/Layout/NodeLayoutContextInfo.cs	
@@ -0,0 +1,30 @@
+using System;
+using System.Drawing;
+using System.Collections;
+
+namespace DevComponents.Tree.Layout
+{
+	/// <summary>
+	/// Used to pass node contextual information used for layout of the node.
+	/// </summary>
+	internal class NodeLayoutContextInfo
+	{
+		public Node ContextNode=null;
+		public Rectangle ClientRectangle=Rectangle.Empty;
+		public int Left;
+		public int Top;
+		public ArrayList DefaultColumns=null;
+		public ArrayList ChildColumns=null;
+		public Font DefaultFont=null;
+		public ElementStyle DefaultCellStyle=null;
+		public ElementStyle DefaultNodeStyle=null;
+		public Size DefaultHeaderSize=Size.Empty;
+		public bool LeftToRight=true;
+		public bool HasExpandPart=true;
+		public System.Drawing.Graphics Graphics=null;
+		public ElementStyleCollection Styles=null;
+		public eCellLayout CellLayout=eCellLayout.Horizontal;
+		public eCellPartLayout CellPartLayout=eCellPartLayout.Horizontal;
+		public bool MapPositionNear=false;
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/Layout/NodeListLayout.cs b/PROMS/DotNetBar Source Code/TreeGX/Layout/NodeListLayout.cs
new file mode 100644
index 00000000..d9bdf22d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/Layout/NodeListLayout.cs	
@@ -0,0 +1,61 @@
+using System;
+using System.Drawing;
+using System.Collections;
+
+namespace DevComponents.Tree.Layout
+{
+	/// <summary>
+	/// Internal class that orders one level of the nodes in list like layout. Nodes are ordered from top to bottom.
+	/// </summary>
+	internal class NodeListLayout:Layout.NodeLayout
+	{
+		public NodeListLayout(TreeGX treeControl, Rectangle clientArea):base(treeControl,clientArea)
+		{
+		}
+
+		public override void PerformLayout()
+		{
+			if(m_Tree.Nodes.Count==0)
+				return;
+
+			this.PrepareStyles();
+			System.Drawing.Graphics graphics=this.GetGraphics();
+			m_Width=0;
+			m_Height=0;
+
+			try
+			{
+				NodeCollection nodes=this.GetLayoutNodes();
+				NodeLayoutContextInfo layoutInfo=this.GetDefaultNodeLayoutContextInfo(graphics);
+				foreach(Node childNode in nodes)
+				{
+					if(!childNode.Visible)
+						continue;
+					layoutInfo.ContextNode=childNode;
+					ProcessNode(layoutInfo);
+					if(childNode.BoundsRelative.Width>this.Width)
+						m_Width=childNode.BoundsRelative.Width;
+				}
+				m_Height=layoutInfo.Top-this.NodeVerticalSpacing;
+			}
+			finally
+			{
+				if(this.DisposeGraphics)
+					graphics.Dispose();
+			}
+		}
+
+		private void ProcessNode(NodeLayoutContextInfo layoutInfo)
+		{
+			LayoutNode(layoutInfo);
+			layoutInfo.ContextNode.SetBounds(new Rectangle(layoutInfo.Left,layoutInfo.Top,layoutInfo.ContextNode.BoundsRelative.Width,layoutInfo.ContextNode.BoundsRelative.Height));
+			//OffsetNodeLocation(layoutInfo.ContextNode,layoutInfo.Left,layoutInfo.Top);
+			layoutInfo.Top+=(layoutInfo.ContextNode.BoundsRelative.Height+this.NodeVerticalSpacing);
+		}
+
+		private NodeCollection GetLayoutNodes()
+		{
+			return m_Tree.Nodes;
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/Layout/NodeMapLayout.cs b/PROMS/DotNetBar Source Code/TreeGX/Layout/NodeMapLayout.cs
new file mode 100644
index 00000000..46e05489
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/Layout/NodeMapLayout.cs	
@@ -0,0 +1,525 @@
+using System;
+using System.Drawing;
+using System.Collections;
+
+namespace DevComponents.Tree.Layout
+{
+	/// <summary>
+	/// Represents the class that performs node map layout.
+	/// </summary>
+	internal class NodeMapLayout:NodeLayout
+	{
+		#region Private Variables
+		private eMapFlow m_MapFlow=eMapFlow.Spread;
+		#endregion
+
+		public NodeMapLayout(TreeGX treeControl, Rectangle clientArea):base(treeControl,clientArea)
+		{
+		}
+
+		public override void PerformLayout()
+		{
+			this.PrepareStyles();
+			// Get default Columns
+			//ArrayList defaultColInfoList=this.GetDefaultColumnInfo();
+
+			if(m_Tree.Nodes.Count==0)
+				return;
+
+			Graphics graphics=this.GetGraphics();
+			try
+			{
+				// Loop through each top-level node
+				Node[] topLevelNodes=this.GetTopLevelNodes();
+				NodeLayoutContextInfo layoutInfo=this.GetDefaultNodeLayoutContextInfo(graphics);
+
+				foreach(Node childNode in topLevelNodes)
+				{
+					if(!childNode.Visible)
+						continue;
+					layoutInfo.ContextNode=childNode;
+					ProcessRootNode(layoutInfo);
+					break;
+				}
+
+				EmptyBoundsUnusedNodes(topLevelNodes);
+			}
+			finally
+			{
+				if(this.DisposeGraphics)
+					graphics.Dispose();
+			}
+		}
+
+		private void ProcessRootNode(NodeLayoutContextInfo layoutInfo)
+		{
+			Node node=layoutInfo.ContextNode;
+
+			// Center root node on the screen
+			//if(node.SizeChanged)
+			//{
+				// Calculate size of the node itself...
+				LayoutNode(layoutInfo);
+
+				// Calculate size and location of node column header if any
+				//				if(node.NodesColumnHeaderVisible)
+				//				{
+				//					LayoutColumnHeader(layoutInfo);
+				//				}
+			//}
+			
+			
+			//			if(node.Expanded && node.NodesColumnHeaderVisible && node.NodesColumns.Count>0)
+			//				layoutInfo.Top+=node.ColumnHeaderHeight;
+			NodesMapPosition positions=NodesMapPosition.Empty;
+			bool bNear=false;
+			if(node.Expanded)
+			{
+				if(node.NodesColumns.Count>0)
+					layoutInfo.ChildColumns=GetNodeColumnInfo(node);
+				foreach(Node childNode in node.Nodes)
+				{
+					if(!childNode.Visible)
+						continue;
+
+					layoutInfo.ContextNode=childNode;
+					
+					if(bNear || childNode.MapSubRootPosition==eMapPosition.Near)
+					{
+						layoutInfo.MapPositionNear=true;
+						ProcessSubNode(layoutInfo);
+
+						positions.Near.Add(childNode);
+						positions.NearHeight+=GetTotalChildNodeHeight(childNode);
+						bNear=true;
+					}
+					else if(childNode.MapSubRootPosition==eMapPosition.Far)
+					{
+						layoutInfo.MapPositionNear=false;
+						ProcessSubNode(layoutInfo);
+
+						positions.Far.Add(childNode);
+						positions.FarHeight+=GetTotalChildNodeHeight(childNode);
+					}
+					else
+						positions.Default.Add(childNode);
+				}
+
+				// Assign nodes to appropriate sides....
+				if(positions.Default.Count>0)
+				{
+					int toFar=0;
+					if(positions.Near.Count==0 && positions.Far.Count==0 && positions.Default.Count<=4)
+						toFar=2;
+					else
+						toFar=(int)Math.Ceiling((double)((positions.Near.Count-positions.Far.Count+positions.Default.Count))/2);
+					for(int i=0;i<toFar;i++)
+					{
+						layoutInfo.ContextNode=positions.Default[0] as Node;
+						if(m_MapFlow==eMapFlow.RightToLeft)
+							layoutInfo.MapPositionNear=true;
+						else
+							layoutInfo.MapPositionNear=false;
+						ProcessSubNode(layoutInfo);
+
+						positions.Far.Add(positions.Default[0]);
+						positions.FarHeight+=GetTotalChildNodeHeight(positions.Default[0] as Node);
+						positions.Default.RemoveAt(0);
+						if(positions.Default.Count==0)
+							break;
+					}
+					for(int i=0;i<positions.Default.Count;i++)
+					{
+						layoutInfo.ContextNode=positions.Default[i] as Node;
+						if(m_MapFlow==eMapFlow.LeftToRight)
+							layoutInfo.MapPositionNear=false;
+						else
+							layoutInfo.MapPositionNear=true;
+						ProcessSubNode(layoutInfo);
+
+						positions.Near.Add(positions.Default[i]);
+						positions.NearHeight+=GetTotalChildNodeHeight(positions.Default[i] as Node); //+this.NodeVerticalSpacing;
+					}
+					positions.Default.Clear();
+				}
+
+				layoutInfo.ChildColumns=null;
+				layoutInfo.ContextNode=node;
+			}
+
+			// Set the position of the root node
+            Point pRoot = new Point(0, 0);
+			pRoot.Offset(node.Offset,0);
+
+			// Adjust top position
+			node.SetBounds(new Rectangle(pRoot,node.BoundsRelative.Size));
+			node.ExpandPartRectangleRelative.Offset(pRoot);
+			foreach(Cell c in node.Cells)
+				c.BoundsRelative.Offset(pRoot);
+
+			// Set the position of the child nodes
+			if(node.Expanded)
+			{
+				PositionCenterRootSubNodes(node, positions);
+			}
+			else
+			{
+				node.ChildNodesBounds = Rectangle.Empty;
+				m_Width = node.Bounds.Width;
+				m_Height = node.Bounds.Height;
+			}
+		}
+
+		private int GetTotalChildNodeHeight(Node childNode)
+		{
+			if(childNode.Expanded)
+				return Math.Max(childNode.BoundsRelative.Height,childNode.ChildNodesBounds.Height);
+			return childNode.BoundsRelative.Height;
+		}
+
+		private void ProcessSubNode(NodeLayoutContextInfo layoutInfo)
+		{
+			Node node=layoutInfo.ContextNode;
+
+			//if(node.SizeChanged)
+			//{
+				// Calculate size of the node itself...
+				LayoutNode(layoutInfo);
+			//}
+			//else
+			//	node.SetBounds(new Rectangle(Point.Empty,node.Bounds.Size));
+			
+			if(node.Expanded && node.AnyVisibleNodes)
+			{
+				ArrayList parentColumns=layoutInfo.ChildColumns;
+				ArrayList childColumns=GetNodeColumnInfo(node);
+
+				if(node.NodesColumns.Count>0)
+					layoutInfo.ChildColumns=GetNodeColumnInfo(node);
+				Rectangle childNodesBounds=Rectangle.Empty;
+				foreach(Node childNode in node.Nodes)
+				{
+					if(!childNode.Visible)
+						continue;
+
+					layoutInfo.ContextNode=childNode;
+					layoutInfo.ChildColumns=childColumns;
+					ProcessSubNode(layoutInfo);
+
+					childNodesBounds.Height+=(Math.Max(childNode.BoundsRelative.Height,childNode.ChildNodesBounds.Height)+this.NodeVerticalSpacing);
+					childNodesBounds.Width=Math.Max(childNodesBounds.Width,childNode.BoundsRelative.Width+(childNode.ChildNodesBounds.Width>0?this.NodeHorizontalSpacing+childNode.ChildNodesBounds.Width:0));
+				}
+				
+				layoutInfo.ChildColumns=parentColumns;
+
+				if(childNodesBounds.Height>0)
+					childNodesBounds.Height-=this.NodeVerticalSpacing;
+				node.ChildNodesBounds=childNodesBounds;
+				layoutInfo.ChildColumns=null;
+				layoutInfo.ContextNode=node;
+			}
+			else node.ChildNodesBounds=Rectangle.Empty;
+		}
+
+		private void PositionCenterRootSubNodes(Node root, NodesMapPosition positions)
+		{
+			Rectangle area=Rectangle.Empty;
+			area=Rectangle.Union(area,root.BoundsRelative);
+			
+			// Far Nodes Layout
+			//int y=0, x=0;
+			int areaHeight=positions.FarHeight;
+			int minAreaHeight=this.GetMinimumAreaHeight(positions.Far,root.BoundsRelative.Height);
+			if(areaHeight<minAreaHeight)
+				areaHeight=minAreaHeight;
+
+			int areaLeft=root.BoundsRelative.Right-root.BoundsRelative.Width/3;
+			int areaTop=0;
+			if(m_MapFlow==eMapFlow.TopToBottom)
+				areaTop=root.BoundsRelative.Bottom+this.NodeVerticalSpacing; // Top Bottom Orientation
+			else if(m_MapFlow==eMapFlow.BottomToTop)
+				areaTop=root.BoundsRelative.Y-(areaHeight+this.NodeVerticalSpacing*((positions.Far.Count==1?1:positions.Far.Count-1))); //Bottom Top Orientation
+			else if(m_MapFlow==eMapFlow.LeftToRight || m_MapFlow==eMapFlow.RightToLeft)
+				areaTop=root.BoundsRelative.Y-(areaHeight+this.NodeVerticalSpacing*((positions.Far.Count==1?1:positions.Far.Count-1)));
+			else // Spread
+				areaTop=root.BoundsRelative.Y+root.BoundsRelative.Height/2-(areaHeight+this.NodeVerticalSpacing*((positions.Far.Count==1?1:positions.Far.Count-1)))/2; // Around spread orientation
+
+			if(m_MapFlow==eMapFlow.RightToLeft)
+			{
+				int areaRightMost=root.BoundsRelative.X+root.BoundsRelative.Width/3;
+				PositionNearSubRootNodes(root,positions.Far,areaRightMost,areaTop,areaHeight,ref area);
+			}
+			else
+			{
+				PositionFarSubRootNodes(root,positions.Far,areaLeft,areaTop,ref area);
+			}
+			
+			if(m_MapFlow==eMapFlow.LeftToRight)
+			{
+				areaTop=root.BoundsRelative.Bottom+this.NodeVerticalSpacing;
+				PositionFarSubRootNodes(root,positions.Near,areaLeft,areaTop,ref area);
+			}
+			else
+			{
+				// Near nodes layout
+				areaHeight=positions.NearHeight;
+				minAreaHeight=this.GetMinimumAreaHeight(positions.Near,root.BoundsRelative.Height);
+				if(areaHeight<minAreaHeight)
+					areaHeight=minAreaHeight;
+				int areaRightMost=root.BoundsRelative.X+root.BoundsRelative.Width/3;
+				
+				if(m_MapFlow==eMapFlow.TopToBottom)
+					areaTop=root.BoundsRelative.Bottom+this.NodeVerticalSpacing; // Top Bottom Orientation
+				else if(m_MapFlow==eMapFlow.BottomToTop)
+					areaTop=root.BoundsRelative.Y-(areaHeight+this.NodeVerticalSpacing*((positions.Near.Count==1?1:positions.Near.Count-1))); //Bottom Top Orientation
+				else if(m_MapFlow==eMapFlow.LeftToRight || m_MapFlow==eMapFlow.RightToLeft)
+					areaTop=root.BoundsRelative.Bottom+this.NodeVerticalSpacing; // Top Bottom Orientation
+				else // Spread
+					areaTop=root.BoundsRelative.Y+root.BoundsRelative.Height/2-(areaHeight+this.NodeVerticalSpacing*((positions.Near.Count==1?1:positions.Near.Count-1)))/2; // Around spread orientation
+
+				PositionNearSubRootNodes(root,positions.Near,areaRightMost,areaTop,areaHeight,ref area);
+			}
+
+			m_Width=area.Width;
+			m_Height=area.Height;
+			root.ChildNodesBounds=area;
+		}
+
+		private void PositionFarSubRootNodes(Node root, ArrayList farNodes, int areaLeft, int areaTop, ref Rectangle usedArea)
+		{
+			int top=areaTop;
+			bool twoNodesLayout = (farNodes.Count == 2);
+			for(int index=0;index<farNodes.Count;index++)
+			{
+				Node node=farNodes[index] as Node;
+				int x=areaLeft+this.NodeHorizontalSpacing;
+				int y=top;
+				if(node.ChildNodesBounds.Height>node.BoundsRelative.Height && node.Expanded && node.AnyVisibleNodes)
+					y+=(node.ChildNodesBounds.Height-node.BoundsRelative.Height)/2;
+
+				if(root.BoundsRelative.IntersectsWith(new Rectangle(root.BoundsRelative.X,y,node.BoundsRelative.Width,node.BoundsRelative.Height)))
+				{
+					if(twoNodesLayout && index==1)
+					{
+						y = root.BoundsRelative.Bottom + this.NodeVerticalSpacing/2;
+						if(node.ChildNodesBounds.Height>node.BoundsRelative.Height && node.Expanded && node.AnyVisibleNodes)
+							y+=(node.ChildNodesBounds.Height-node.BoundsRelative.Height)/2;
+					}
+					else
+					{
+						// Change X position since Y is already accounted for...
+						x+=(root.BoundsRelative.Right-x+this.NodeHorizontalSpacing);
+					}
+				}
+				x+=node.Offset;
+
+				OffsetNodeLocation(node,x,y);
+				if(node.Expanded && node.AnyVisibleNodes)
+				{
+					PositionSubNodes(node,true);
+					usedArea=Rectangle.Union(usedArea,node.ChildNodesBounds);
+				}
+				else
+					usedArea=Rectangle.Union(usedArea,node.BoundsRelative);
+
+				if(node.Expanded && node.AnyVisibleNodes)
+				{
+					top+=(Math.Max(node.ChildNodesBounds.Height,node.BoundsRelative.Height)+this.NodeVerticalSpacing);
+				}
+				else
+				{
+					top+=(node.BoundsRelative.Height+this.NodeVerticalSpacing);
+				}
+			}
+		}
+
+		private void PositionNearSubRootNodes(Node root, ArrayList nearNodes, int areaRightMost, int areaTop, int areaHeight, ref Rectangle usedArea)
+		{
+			int bottom=areaTop+(areaHeight+this.NodeVerticalSpacing*(nearNodes.Count-1));
+			bool twoNodesLayout = (nearNodes.Count == 2);
+			
+			for(int index=0;index<nearNodes.Count;index++)
+			{
+				Node node=nearNodes[index] as Node;
+				int x=areaRightMost-node.BoundsRelative.Width-this.NodeHorizontalSpacing;
+				int y=0;
+				
+				if(node.ChildNodesBounds.Height>node.BoundsRelative.Height && node.Expanded && node.AnyVisibleNodes)
+					y=bottom-((node.ChildNodesBounds.Height-node.BoundsRelative.Height)/2+node.BoundsRelative.Height);
+				else
+					y=bottom-node.BoundsRelative.Height;
+					
+//				Rectangle rNodeArea=new Rectangle(x,y,node.Bounds.Width,node.Bounds.Height);
+//				rNodeArea.Inflate(this.NodeHorizontalSpacing,this.NodeVerticalSpacing);
+				//if(root.Bounds.IntersectsWith(rNodeArea))
+				if(root.BoundsRelative.IntersectsWith(new Rectangle(root.BoundsRelative.X,y,node.BoundsRelative.Width,node.BoundsRelative.Height)))
+				{
+					if(twoNodesLayout && index==1)
+					{
+						y = root.BoundsRelative.Top - this.NodeVerticalSpacing/2;
+						if(node.ChildNodesBounds.Height>node.BoundsRelative.Height && node.Expanded && node.AnyVisibleNodes)
+							y-=((node.ChildNodesBounds.Height-node.BoundsRelative.Height)/2+node.BoundsRelative.Height);
+						else
+							y-=node.BoundsRelative.Height;
+					}
+					else
+					{
+						// Change X position since Y is already accounted for...
+						x-=(x+node.BoundsRelative.Width-root.BoundsRelative.X+this.NodeHorizontalSpacing);
+					}
+				}
+				x-=node.Offset;
+				OffsetNodeLocation(node,x,y);
+				if(node.Expanded && node.AnyVisibleNodes)
+				{
+					PositionSubNodes(node,false);
+                    usedArea = Rectangle.Union(usedArea, node.BoundsRelative);
+					usedArea=Rectangle.Union(usedArea,node.ChildNodesBounds);
+				}
+				else
+					usedArea=Rectangle.Union(usedArea,node.BoundsRelative);
+				
+				if(node.Expanded && node.AnyVisibleNodes)
+				{
+					bottom-=(Math.Max(node.ChildNodesBounds.Height,node.BoundsRelative.Height)+this.NodeVerticalSpacing);
+				}
+				else
+				{
+					bottom-=(node.BoundsRelative.Height+this.NodeVerticalSpacing);
+				}
+			}
+		}
+
+		private void PositionSubNodes(Node parentNode,bool bFar)
+		{
+			if(parentNode.Nodes.Count==0)
+				return;
+
+			int y=parentNode.BoundsRelative.Y-(parentNode.ChildNodesBounds.Height-parentNode.BoundsRelative.Height)/2;
+			int x=parentNode.BoundsRelative.Right+this.SubNodeHorizontalSpacing;
+			if(!bFar)
+			{
+				x=parentNode.BoundsRelative.X-this.SubNodeHorizontalSpacing;
+			}
+
+			Rectangle rChildBounds=Rectangle.Empty;
+			bool bFirst=true;
+
+			if(bFar)
+			{
+				foreach(Node node in parentNode.Nodes)
+				{
+					if(!node.Visible)
+						continue;
+
+					int top=y;
+					bool anyVisibleNodes=node.AnyVisibleNodes;
+					if(node.ChildNodesBounds.Height>node.BoundsRelative.Height && node.Expanded && anyVisibleNodes)
+						top+=(node.ChildNodesBounds.Height-node.BoundsRelative.Height)/2;
+					OffsetNodeLocation(node,x,top);
+					if(node.Expanded && anyVisibleNodes)
+					{
+						PositionSubNodes(node,bFar);
+						y+=(Math.Max(node.BoundsRelative.Height,node.ChildNodesBounds.Height)+this.NodeVerticalSpacing);
+					}
+					else y+=(node.BoundsRelative.Height+this.NodeVerticalSpacing);
+					if(bFirst)
+					{
+						rChildBounds=node.BoundsRelative;
+						bFirst=false;
+					}
+					else
+						rChildBounds=Rectangle.Union(rChildBounds,node.BoundsRelative);
+					if(!node.ChildNodesBounds.IsEmpty)
+						rChildBounds=Rectangle.Union(rChildBounds,node.ChildNodesBounds);
+				}
+			}
+			else
+			{
+				foreach(Node node in parentNode.Nodes)
+				{
+					if(!node.Visible)
+						continue;
+
+					int left=x-node.BoundsRelative.Width;
+					int top=y;
+					bool anyVisibleNodes=node.AnyVisibleNodes;
+					if(node.ChildNodesBounds.Height>node.BoundsRelative.Height && node.Expanded && anyVisibleNodes)
+						top+=(node.ChildNodesBounds.Height-node.BoundsRelative.Height)/2;
+					OffsetNodeLocation(node,left,top);
+					if(node.Expanded && anyVisibleNodes)
+					{
+						PositionSubNodes(node,bFar);
+						y+=(Math.Max(node.BoundsRelative.Height,node.ChildNodesBounds.Height)+this.NodeVerticalSpacing);
+					}
+					else y+=(node.BoundsRelative.Height+this.NodeVerticalSpacing);
+					if(bFirst)
+					{
+						rChildBounds=node.BoundsRelative;
+						bFirst=false;
+					}
+					else
+						rChildBounds=Rectangle.Union(rChildBounds,node.BoundsRelative);
+					if(!node.ChildNodesBounds.IsEmpty)
+						rChildBounds=Rectangle.Union(rChildBounds,node.ChildNodesBounds);
+				}
+			}
+			parentNode.ChildNodesBounds=rChildBounds;
+		}
+
+		private int GetMinimumAreaHeight(ArrayList nodes, int rootHeight)
+		{
+			int height=rootHeight;
+			if(nodes.Count==1)
+				height+=(((Node)nodes[0]).BoundsRelative.Height*2);
+			else if(nodes.Count>=2)
+				height+=(((Node)nodes[0]).BoundsRelative.Height+((Node)nodes[1]).BoundsRelative.Height);
+			return height;
+		}
+
+		private int SubNodeHorizontalSpacing
+		{
+			get {return 24;}
+		}
+
+		/// <summary>
+		/// Returns true if root node should have expanded part
+		/// </summary>
+		protected override bool RootHasExpandedPart
+		{
+			get {return false;}
+		}
+
+
+		private struct NodesMapPosition
+		{
+			public ArrayList Near;
+			public ArrayList Far;
+			public ArrayList Default;
+			public int NearHeight;
+			public int FarHeight;
+			public static NodesMapPosition Empty
+			{
+				get
+				{
+					NodesMapPosition m;
+					m.Default=new ArrayList();
+					m.Near=new ArrayList();
+					m.Far=new ArrayList();
+					m.NearHeight=0;
+					m.FarHeight=0;
+					return m;
+				}
+			}			
+		}
+
+		/// <summary>
+		/// Gets or sets the flow of the sub-root nodes for Map layout.
+		/// </summary>
+		public eMapFlow MapFlow
+		{
+			get{return m_MapFlow;}
+			set{m_MapFlow=value;}
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/Layout/NodeTreeLayout.cs b/PROMS/DotNetBar Source Code/TreeGX/Layout/NodeTreeLayout.cs
new file mode 100644
index 00000000..b868f761
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/Layout/NodeTreeLayout.cs	
@@ -0,0 +1,132 @@
+using System.Collections;
+using System.Drawing;
+using System.Windows.Forms;
+
+namespace DevComponents.Tree.Layout
+{
+	/// <summary>
+	/// Summary description for NodeTreeLayout.
+	/// </summary>
+	internal class NodeTreeLayout:NodeLayout
+	{
+		//private bool m_LayoutPerformed=false;
+
+		public NodeTreeLayout(TreeGX treeControl, Rectangle clientArea):base(treeControl,clientArea)
+		{
+			ExpandPartSize=new Size(9,9);
+		}
+
+		public override void PerformLayout()
+		{
+			this.PrepareStyles();
+
+			// Get default Columns
+			ArrayList defaultColInfoList=this.GetDefaultColumnInfo();
+
+			Graphics graphics=this.GetGraphics();
+			try
+			{
+				// Loop through each top-level node
+				Node[] topLevelNodes=this.GetTopLevelNodes();
+				NodeLayoutContextInfo layoutInfo=GetDefaultNodeLayoutContextInfo(graphics);
+
+				foreach(Node childNode in topLevelNodes)
+				{
+					layoutInfo.ContextNode=childNode;
+					ProcessNode(layoutInfo);
+				}
+			}
+			finally
+			{
+				if(this.DisposeGraphics)
+					graphics.Dispose();
+			}
+		}
+
+		#region Node routines
+		private void ProcessNode(NodeLayoutContextInfo layoutInfo)
+		{
+			Node node=layoutInfo.ContextNode;
+			if(node.SizeChanged)
+			{
+				// Calculate size of the node itself...
+				LayoutNode(layoutInfo);
+
+				// Calculate size and location of node column header if any
+//				if(node.NodesColumnHeaderVisible)
+//				{
+//					layoutInfo.Left+=this.NodeLevelOffset;
+//					LayoutColumnHeader(layoutInfo);
+//					layoutInfo.Left-=this.NodeLevelOffset;
+//				}
+			}
+			else if(node.BoundsRelative.Top!=layoutInfo.Top)
+			{
+				// Adjust top position
+				node.SetBounds(new Rectangle(node.BoundsRelative.X,layoutInfo.Top,node.BoundsRelative.Width,node.BoundsRelative.Height));
+				foreach(Cell c in node.Cells)
+					c.SetBounds(new Rectangle(c.BoundsRelative.X,layoutInfo.Top,c.BoundsRelative.Width,c.BoundsRelative.Height));
+			}
+
+			// Need to set the Top position properly
+			layoutInfo.Top+=(node.BoundsRelative.Height+this.NodeVerticalSpacing);
+//			if(node.Expanded && node.NodesColumnHeaderVisible && node.NodesColumns.Count>0)
+//				layoutInfo.Top+=node.ColumnHeaderHeight;
+			
+			if(node.Expanded)
+			{
+				int originalLevelOffset=layoutInfo.Left;
+				layoutInfo.Left+=this.NodeLevelOffset;
+				
+				ArrayList parentColumns=layoutInfo.ChildColumns;
+				ArrayList childColumns=GetNodeColumnInfo(node);
+
+				foreach(Node childNode in node.Nodes)
+				{
+					layoutInfo.ContextNode=childNode;
+					layoutInfo.ChildColumns=childColumns;
+					ProcessNode(layoutInfo);
+				}
+				layoutInfo.ChildColumns=parentColumns;
+
+				layoutInfo.ContextNode=node;
+				layoutInfo.Left=originalLevelOffset;
+			}
+		}
+
+		/// <summary>
+		/// Returns true if expand part space should be accounted for even if they expand part is not visible or need to be displayed. Default value is false.
+		/// </summary>
+		protected override bool ReserveExpandPartSpace
+		{
+			get
+			{
+				return true;
+			}
+		}
+
+		/// <summary>
+		/// Gets whether the expand part of the node +/- is aligned to the left of the node in left-to-right layout.
+		/// </summary>
+		/// <param name="node">Node to get expand part alignment for</param>
+		/// <returns>true if node expand part is aligned to the left in left-to-right layout.</returns>
+		private bool ExpandPartAlignedNear(Node node)
+		{
+			return true; // If changed LayoutExpandPart needs to be updated as well
+		}
+
+//		private NodeCollection GetTopLevelNodes()
+//		{
+//			return m_Tree.Nodes;
+//		}
+
+		private int NodeLevelOffset
+		{
+			get {return 10;}
+		}
+
+		#endregion
+
+		
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/LinkedNode.cs b/PROMS/DotNetBar Source Code/TreeGX/LinkedNode.cs
new file mode 100644
index 00000000..415eb74e
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/LinkedNode.cs	
@@ -0,0 +1,98 @@
+using System;
+using System.ComponentModel;
+
+namespace DevComponents.Tree
+{
+	/// <summary>
+	/// Represents a description of linked node and any connector points that link nodes.
+	/// </summary>
+	public class LinkedNode
+	{
+		#region Private Variables
+		private ConnectorPointsCollection m_ConnectorPoints=null;
+		private Node m_Node=null;
+		private Node m_Parent=null;
+		#endregion
+		
+		#region Internal Implementation
+		/// <summary>
+		/// Creates new instance of the object.
+		/// </summary>
+		public LinkedNode()
+		{
+			m_ConnectorPoints=new ConnectorPointsCollection();
+		}
+		
+		/// <summary>
+		/// Creates new instance of the object.
+		/// </summary>
+		/// <param name="linkedNode">Linkded node to initialize new instace with.</param>
+		public LinkedNode(Node linkedNode) : this()
+		{
+			this.Node = linkedNode;
+		}
+		
+		/// <summary>
+		/// Creates new instance of the object.
+		/// </summary>
+		/// <param name="linkedNode">Linkded node to initialize new instace with.</param>
+		/// <param name="connectorPoints">Connector points collection to initialize new instance with.</param>
+		public LinkedNode(Node linkedNode, ConnectorPointsCollection connectorPoints) : this()
+		{
+			this.Node = linkedNode;
+			if(connectorPoints!=null)
+			{
+				m_ConnectorPoints = connectorPoints;
+				m_ConnectorPoints.SetParentNode(m_Parent);
+			}
+		}
+		
+		/// <summary>
+		/// Gets or sets reference to linked node.
+		/// </summary>
+		/// <remarks>
+		/// Linked nodes are nodes that are related to given node but do not have strict
+		/// parent child relationship with the node. Each linked node must be already added as
+		/// child node to some other node or it will not be displayed. Linked nodes are used in Map
+		/// and Diagram layout styles to indicates relationships between nodes. Also See TreeGX.LinkConnector property.
+		/// </remarks>
+		[Browsable(true), DefaultValue(null)]
+		public Node Node
+		{
+			get { return m_Node;}
+			set { m_Node = value;}
+		}
+		
+		/// <summary>
+		/// Gets the collection of the link connector line relative points. If a node has a link to this node through LinkedNodes collection
+		/// this these points outline the path connector will be drawn through from this node to it's parent linked node. By default this collection is empty which indicates that
+		/// connector line is drawn using predefined path. Points added here are the points through which the connector line will travel to the
+		/// parent node. The point coordinates added to this collection are relative from the top-left corner of this node.
+		/// </summary>
+		[Browsable(true),Category("Connectors"),DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+		public ConnectorPointsCollection ConnectorPoints
+		{
+			get {return m_ConnectorPoints;}
+		}
+		
+		/// <summary>
+		/// Gets the Node this linked node description is attached to.
+		/// </summary>
+		[Browsable(false)]
+		public Node Parent
+		{
+			get { return m_Parent;}
+		}
+		
+		/// <summary>
+		/// Sets the parent node.
+		/// </summary>
+		/// <param name="node">Reference to parent node.</param>
+		internal void SetParent(Node node)
+		{
+			m_Parent = node;
+			m_ConnectorPoints.SetParentNode(node);
+		}
+		#endregion
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/LinkedNodesCollection.cs b/PROMS/DotNetBar Source Code/TreeGX/LinkedNodesCollection.cs
new file mode 100644
index 00000000..28774ec7
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/LinkedNodesCollection.cs	
@@ -0,0 +1,154 @@
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.Drawing;
+
+namespace DevComponents.Tree
+{
+	/// <summary>
+	/// Represents collection of LinkedNode objects that describe linked node properties.
+	/// </summary>
+	public class LinkedNodesCollection:CollectionBase 
+	{
+		#region Private Variables
+		private Node m_ParentNode=null;
+		#endregion
+
+		#region Internal Implementation
+		/// <summary>
+		/// Default constructor.
+		/// </summary>
+		public LinkedNodesCollection()
+		{
+		}
+		/// <summary>
+		/// Gets or sets the node this collection is associated with.
+		/// </summary>
+		[Browsable(false),DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public Node ParentNode
+		{
+			get {return m_ParentNode;}
+		}
+		/// <summary>
+		/// Sets the node collection belongs to.
+		/// </summary>
+		/// <param name="parent">Node that is parent of this collection.</param>
+		internal void SetParentNode(Node parent)
+		{
+			m_ParentNode=parent;
+		}
+
+		/// <summary>
+		/// Adds new object to the collection.
+		/// </summary>
+		/// <param name="p">Object to add.</param>
+		/// <returns>Index of newly added object.</returns>
+		public int Add(LinkedNode p)
+		{
+			return List.Add(p);
+		}
+
+		/// <summary>
+		/// Adds range of objects to the array.
+		/// </summary>
+		/// <param name="ap">Array to add.</param>
+		public void AddRange(LinkedNode[] ap)
+		{
+			foreach(LinkedNode p in ap)
+				this.Add(p);
+		}
+
+		/// <summary>
+		/// Copies objects of the collection to the array.
+		/// </summary>
+		/// <returns></returns>
+		public LinkedNode[] ToArray()
+		{
+			LinkedNode[] ap=new LinkedNode[this.Count];
+			this.CopyTo(ap);
+			return ap;
+		}
+
+		/// <summary>
+		/// Returns reference to the object in collection based on it's index.
+		/// </summary>
+		public LinkedNode this[int index]
+		{
+			get {return (LinkedNode)(List[index]);}
+			set {List[index] = value;}
+		}
+
+		/// <summary>
+		/// Inserts new object into the collection.
+		/// </summary>
+		/// <param name="index">Position of the object.</param>
+		/// <param name="value">Object to insert.</param>
+		public void Insert(int index, LinkedNode value) 
+		{
+			List.Insert(index, value);
+		}
+
+		/// <summary>
+		/// Returns index of the object inside of the collection.
+		/// </summary>
+		/// <param name="value">Reference to the object.</param>
+		/// <returns>Index of the object.</returns>
+		public int IndexOf(LinkedNode value) 
+		{
+			return List.IndexOf(value);
+		}
+
+		/// <summary>
+		/// Returns whether collection contains specified object.
+		/// </summary>
+		/// <param name="value">Object to look for.</param>
+		/// <returns>true if object is part of the collection, otherwise false.</returns>
+		public bool Contains(LinkedNode value) 
+		{
+			return List.Contains(value);
+		}
+
+		/// <summary>
+		/// Removes specified object from the collection.
+		/// </summary>
+		/// <param name="value"></param>
+		public void Remove(LinkedNode value) 
+		{
+			List.Remove(value);
+		}
+
+		protected override void OnRemoveComplete(int index,object value)
+		{
+			base.OnRemoveComplete(index,value);
+		}
+		protected override void OnInsertComplete(int index,object value)
+		{
+			base.OnInsertComplete(index,value);
+		}
+
+		/// <summary>
+		/// Copies collection into the specified array.
+		/// </summary>
+		/// <param name="array">Array to copy collection to.</param>
+		/// <param name="index">Starting index.</param>
+		public void CopyTo(LinkedNode[] array, int index) 
+		{
+			List.CopyTo(array, index);
+		}
+
+		/// <summary>
+		/// Copies contained items to the ColumnHeader array.
+		/// </summary>
+		/// <param name="array">Array to copy to.</param>
+		internal void CopyTo(LinkedNode[] array)
+		{
+			List.CopyTo(array,0);
+		}
+
+		protected override void OnClear()
+		{
+			base.OnClear();
+		}
+		#endregion
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/MapConnectorDisplay.cs b/PROMS/DotNetBar Source Code/TreeGX/MapConnectorDisplay.cs
new file mode 100644
index 00000000..330ba5b7
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/MapConnectorDisplay.cs	
@@ -0,0 +1,165 @@
+using System;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+
+namespace DevComponents.Tree
+{
+	/// <summary>
+	/// Represents the connector display for map type.
+	/// </summary>
+	public class MapConnectorDisplay:NodeConnectorDisplay
+	{
+		private int m_RootNodeConnectorWidth=4;
+		public MapConnectorDisplay()
+		{
+		}
+
+		/// <summary>
+		/// Draws connector line between two nodes.
+		/// </summary>
+		/// <param name="info">Connector context information.</param>
+		public override void DrawConnector(NodeConnectorDisplayInfo info)
+		{
+			if(info.LineColor.IsEmpty && info.FillColor.IsEmpty)
+				return;
+
+			DrawCurveConnector(info);
+		}
+
+		private void DrawCurveConnector(NodeConnectorDisplayInfo info)
+		{
+			Point pStart=this.GetStartPoint(info);
+			Point pEnd=this.GetEndPoint(info);
+
+			pStart.Offset(info.Offset.X,info.Offset.Y);
+			pEnd.Offset(info.Offset.X,info.Offset.Y);
+
+			// Determine whether curve can be drawn
+			if(Math.Abs(pStart.X-pEnd.X)<=6 || Math.Abs(pStart.Y-pEnd.Y)<=10)
+			{
+				using(Pen pen=this.GetCurvePen(info))
+				{
+					info.Graphics.DrawLine(pen,pStart,pEnd);
+				}
+			}
+			else
+			{
+				// Create two points in between the start and end point
+				Point[] p=new Point[4];
+				int xMulti=1, yMulti=1;
+				
+				// used for direction control
+				if(pStart.X>pEnd.X)
+					xMulti=-1;
+				if(pStart.Y>pEnd.Y)
+					yMulti=-1;
+				
+                p[1].X=pStart.X+(int)(Math.Abs(pStart.X-pEnd.X)*.15f*xMulti);
+				p[1].Y=pStart.Y+(int)(Math.Abs(pStart.Y-pEnd.Y)*.15f*yMulti);
+
+				p[2].X=pStart.X+(int)(Math.Abs(pStart.X-pEnd.X)*.5f*xMulti);
+				p[2].Y=pEnd.Y-(int)(yMulti*(Math.Abs(pStart.Y-pEnd.Y)*.15f));
+
+				p[0]=pStart;
+				p[3]=pEnd;
+
+				if(info.IsRootNode && m_RootNodeConnectorWidth>1)
+				{
+					GraphicsPath path=new GraphicsPath();
+					path.AddCurve(p,.5f);
+					path.AddLine(p[0].X,p[0].Y,p[0].X+m_RootNodeConnectorWidth*xMulti,p[0].Y);
+					p[0].X+=(m_RootNodeConnectorWidth*xMulti);
+					p[1].X+=(m_RootNodeConnectorWidth*xMulti);
+					p[2].X+=(m_RootNodeConnectorWidth*xMulti);
+					p[3].Y-=yMulti;
+					path.AddCurve(p,.5f);
+					path.AddLine(p[3].X,p[3].Y,p[3].X,p[3].Y+yMulti);
+					path.CloseAllFigures();
+					using(Brush brush=this.GetCurveBrush(info))
+					{
+						info.Graphics.FillPath(brush,path);
+					}
+				}
+				else
+				{
+					using(Pen pen=this.GetCurvePen(info))
+					{
+						info.Graphics.DrawCurve(pen,p,.5f);
+					}
+				}
+			}
+		}
+
+		private Pen GetCurvePen(NodeConnectorDisplayInfo info)
+		{
+			return new Pen(info.LineColor,1);
+		}
+
+		private Brush GetCurveBrush(NodeConnectorDisplayInfo info)
+		{
+			return new SolidBrush(info.LineColor);
+		}
+
+		private Point GetStartPoint(NodeConnectorDisplayInfo info)
+		{
+			Point p=Point.Empty;
+
+			if(info.IsRootNode)
+			{
+				int toMidPoint=info.ToNode.Bounds.Top+info.ToNode.Bounds.Height/2;
+				if(info.FromNode.Bounds.Top>toMidPoint)
+					p=new Point(info.FromNode.Bounds.Left+info.FromNode.Bounds.Width/2,info.FromNode.Bounds.Top);
+				else if(info.FromNode.Bounds.Bottom<toMidPoint)
+					p=new Point(info.FromNode.Bounds.Left+info.FromNode.Bounds.Width/2,info.FromNode.Bounds.Bottom-1);
+			}
+
+			if(p.IsEmpty)
+			{
+				// To element to the Left of from node
+				if(this.IsOnLeftSide(info.FromNode,info.ToNode))
+					p=new Point(info.FromNode.Bounds.Left,info.FromNode.Bounds.Top+info.FromNode.Bounds.Height/2);
+				else
+					p=new Point(info.FromNode.Bounds.Right,info.FromNode.Bounds.Top+info.FromNode.Bounds.Height/2);
+			}
+
+			return p;
+		}
+
+		private Point GetEndPoint(NodeConnectorDisplayInfo info)
+		{
+			// If to element is to the right of the from node and has left border end point is the vertical mid-point
+			// If to element is to the left of the from node and has right border end point is the vertical mid-point
+			// If there is no border end point is text bottom
+
+			Point p=Point.Empty;
+
+			if(this.IsOnLeftSide(info.FromNode,info.ToNode))
+			{
+				// To element is to the left of from node
+				Rectangle r=info.ToNode.Bounds;
+				if(info.StyleToNode==null || !info.StyleToNode.PaintRightBorder)
+					r=info.ToNode.Cells[0].TextContentBounds;
+
+				p=new Point(r.Right,r.Y+r.Height/2);
+			}
+			else
+			{
+				// To element to the right of from node
+				Rectangle r=info.ToNode.Bounds;
+				if(info.StyleToNode==null || !info.StyleToNode.PaintLeftBorder)
+					r=info.ToNode.Cells[0].TextContentBounds;
+				
+				p=new Point(r.X,r.Y+r.Height/2);
+			}
+
+			return p;
+		}
+
+		private bool IsOnLeftSide(Node source, Node target)
+		{
+			if((source.Bounds.Left+source.Bounds.Width/2)>target.Bounds.Left)
+				return true;
+			return false;
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/Node.cs b/PROMS/DotNetBar Source Code/TreeGX/Node.cs
new file mode 100644
index 00000000..61b2dfa6
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/Node.cs	
@@ -0,0 +1,2106 @@
+using System;
+using System.Drawing;
+using System.ComponentModel;
+using System.Windows.Forms;
+using DevComponents.Tree.Display;
+
+namespace DevComponents.Tree
+{
+	/// <summary>
+	/// Represents the Node in Tree control.
+	/// </summary>
+	[DesignTimeVisible(false),ToolboxItem(false),Designer(typeof(Design.NodeDesigner))]
+	public class Node:Component
+	{
+		#region Events
+		/// <summary>
+		/// Occurs when the mouse pointer is over the node and a mouse button is pressed.
+		/// </summary>
+		public event MouseEventHandler NodeMouseDown;
+		
+		/// <summary>
+		/// Occurs when the mouse pointer is over the node and a mouse button is released.
+		/// </summary>
+		public event MouseEventHandler NodeMouseUp;
+		
+		/// <summary>
+		/// Occurs when the mouse pointer is moved over the node.
+		/// </summary>
+		public event MouseEventHandler NodeMouseMove;
+		
+		/// <summary>
+		/// Occurs when the mouse enters the node.
+		/// </summary>
+		public event EventHandler NodeMouseEnter;
+		
+		/// <summary>
+		/// Occurs when the mouse leaves the node.
+		/// </summary>
+		public event EventHandler NodeMouseLeave;
+		
+		/// <summary>
+		/// Occurs when the mouse hovers over the node.
+		/// </summary>
+		public event EventHandler NodeMouseHover;
+		
+		/// <summary>
+		/// Occurs when the node is clicked with left mouse button. If you need to know more information like if another mouse button is clicked etc. use
+		/// NodeMouseDown event.
+		/// </summary>
+		public event EventHandler NodeClick;
+		
+		/// <summary>
+		/// Occurs when the node is double-clicked.
+		/// </summary>
+		public event EventHandler NodeDoubleClick;
+		
+		/// <summary>
+		/// Occurs when hyperlink in text-markup is clicked.
+		/// </summary>
+		public event MarkupLinkClickEventHandler MarkupLinkClick;
+		#endregion
+		
+		#region Private Variables
+		private Rectangle m_BoundsRelative=Rectangle.Empty;
+		private Rectangle m_ChildNodesBounds=Rectangle.Empty;
+		private Rectangle m_CellsBounds=Rectangle.Empty;
+		private Rectangle m_ContentBounds=Rectangle.Empty;
+		private Rectangle m_CommandBoundsRelative=Rectangle.Empty;
+		private NodeCollection m_Nodes=null;
+		private LinkedNodesCollection m_LinkedNodes=null;
+		private CellCollection m_Cells=new CellCollection();
+		//private string m_Header="";
+		private ColumnHeaderCollection m_NodesColumns;
+		//private bool m_NodesColumnHeaderVisible=true;
+		private object m_DataKey=null;
+		private string m_Text="";
+		private bool m_Expanded=false;
+		private eNodeExpandVisibility m_ExpandVisibility=eNodeExpandVisibility.Auto;
+		private Rectangle m_ExpandPartRectangle=Rectangle.Empty;
+		private Node m_Parent=null;
+		
+		private ElementStyle m_StyleExpanded=null;
+		private ElementStyle m_StyleSelected=null;
+		private ElementStyle m_StyleMouseOver=null;
+		private bool m_SizeChanged=true;
+		//private eNodeHeaderVisibility m_HeaderVisibility=eNodeHeaderVisibility.Automatic;
+		private int m_ColumnHeaderHeight=0;
+		private eMapPosition m_MapSubRootPosition=eMapPosition.Default;
+		private int m_Offset=0;
+		internal TreeGX internalTreeControl=null;
+		private ElementStyle m_Style=null;
+		private eMouseOverNodePart m_MouseOverNodePart=eMouseOverNodePart.None;
+		private NodeConnector m_ParentConnector=null;
+		private eCellLayout m_CellLayout=eCellLayout.Default;
+		private bool m_Visible=true;
+		private bool m_CommandButton=false;
+		private bool m_Editing=false;
+		private bool m_DragDropEnabled=true;
+		private string m_Name="";
+		private ConnectorPointsCollection m_ParentConnectorPoints=null;
+		private bool m_SelectedConnectorMarker=false;
+		private eNodeRenderMode m_RenderMode=eNodeRenderMode.Default;
+		private NodeRenderer m_NodeRenderer=null;
+		private object m_ContextMenu=null;
+		#endregion
+
+		/// <summary>Default Constructor.</summary>
+		public Node()
+		{
+			m_NodesColumns=new ColumnHeaderCollection();
+			m_Cells.SetParentNode(this);
+			m_ParentConnectorPoints=new ConnectorPointsCollection();
+			m_ParentConnectorPoints.SetParentNode(this);
+
+			Cell defaultCell=new Cell();
+			this.Cells.Add(defaultCell);
+		}
+
+		#region Properties
+		/// <summary>
+		/// Gets or sets the context menu assigned to this node. Standard Context Menus, VS.NET 2005 Context Menus and DotNetBar Suite context menus are supported.
+		/// Default value is null (Nothing) which indicates that no context menu is assigned.
+		/// </summary>
+		[Browsable(true), DefaultValue(null), Description("Indicates the context menu assigned to this node."), Editor(typeof(Design.NodeContextMenuTypeEditor),typeof(System.Drawing.Design.UITypeEditor))]
+		public object ContextMenu
+		{
+			get { return m_ContextMenu; }
+			set { m_ContextMenu=value; }
+		}
+		
+		/// <summary>
+		/// Gets whether any of the cells inside the node has HostedControl property set.
+		/// </summary>
+		[Browsable(false)]
+		public bool HasHostedControls
+		{
+			get
+			{
+				foreach(Cell cell in m_Cells)
+				{
+					if(cell.HostedControl!=null)
+						return true;
+				}
+				return false;
+			}
+		}
+		/// <summary>
+		/// Gets or sets custom node renderer. You can set this property to your custom renderer. When set the RenderMode should be set to custom to enable
+		/// your custom renderer. To choose one of the system renderer use RenderMode property. Default value is null.
+		/// </summary>
+		[Browsable(false), Category("Style"), DefaultValue(null), Description("Indicates render mode used to render the node.")]
+		public NodeRenderer NodeRenderer
+		{
+			get { return m_NodeRenderer;}
+			set
+			{
+				m_NodeRenderer = value;
+				OnDisplayChanged();
+			}
+		}
+		/// <summary>
+		/// Gets or sets the render mode used to render the node. Default value is eNodeRenderMode.Default which indicates that system default renderer is used.
+		/// Note that if you specify custom renderer you need to set either TreeGX.NodeRenderer or Node.NodeRenderer property.
+		/// </summary>
+		[Browsable(true), Category("Style"), DefaultValue(eNodeRenderMode.Default), Description("Indicates render mode used to render the node.")]
+		public eNodeRenderMode RenderMode
+		{
+			get { return m_RenderMode;}
+			set
+			{
+				m_RenderMode = value;
+				OnDisplayChanged();
+			}
+		}
+		/// <summary>
+		/// Gets or sets whether node is expanded. Expanded node shows it's child nodes.
+		/// </summary>
+		[Browsable(true),Category("Node State"),DefaultValue(false),Description("Indicates whether node is expanded."),DevCoSerialize()]
+		public bool Expanded
+		{
+			get {return m_Expanded;}
+			set
+			{
+				if(value)
+					this.Expand();
+				else
+					this.Collapse();
+			}
+		}
+		/// <summary>
+		/// Returns name of the node that can be used to identify it from the code.
+		/// </summary>
+		[Browsable(false),Category("Design"),Description("Indicates the name used to identify node."), DevCoSerialize()]
+		public string Name
+		{
+			get
+			{
+				if(this.Site!=null)
+					m_Name=this.Site.Name;
+				return m_Name;
+			}
+			set
+			{
+				if(this.Site!=null)
+					this.Site.Name=value;
+				if(value==null)
+					m_Name="";
+				else
+					m_Name=value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets whether node can be dragged and dropped. Default value is true.
+		/// </summary>
+		[Browsable(true),Category("Behavior"),Description("Indicates whether node can be dragged and dropped."),DefaultValue(true),DevCoSerialize()]
+		public bool DragDropEnabled
+		{
+			get {return m_DragDropEnabled;}
+			set {m_DragDropEnabled=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets visibility of the expand button. Default value is <strong>Auto</strong> meaning that
+		/// expand button is displayed only if node has at least one child node.
+		/// </summary>
+		/// <remarks>
+		/// You can use this property for example to dynamically load the child nodes when user
+		/// tries to expand the node. You could for example handle BeforeExpand event to load child
+		/// nodes into the node.
+		/// </remarks>
+		[Category("Appearance"),Browsable(true),DefaultValue(eNodeExpandVisibility.Auto),Description("Indicates whether the expand button is always visible regardless of whether node contains child nodes or not."),DevCoSerialize()]
+		public eNodeExpandVisibility ExpandVisibility
+		{
+			get {return m_ExpandVisibility;}
+			set
+			{
+				m_ExpandVisibility=value;
+				this.SizeChanged = true;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets whether any operation on the node has been performed that would affect node's size. Size changed flag 
+		/// internally indicates that node's size needs to be recalculated becouse it has changed
+		/// due to the changes in data.
+		/// </summary>
+		[Browsable(false),DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public bool SizeChanged
+		{
+			get {return m_SizeChanged;}
+			set
+			{
+				m_SizeChanged=value;
+				OnSizeChanged();
+			}
+		}
+		
+		/// <summary>
+		/// Gets the relative bounds of the tree node including the expand part of the node.
+		/// </summary>
+		[Browsable(false)]
+		internal Rectangle BoundsRelative
+		{
+			get
+			{
+				return m_BoundsRelative;
+			}
+		}
+		
+		/// <summary>
+		/// Gets the absolute bounds of the tree node including the expand part of the node.
+		/// </summary>
+		[Browsable(false)]
+		public Rectangle Bounds
+		{
+			get
+			{
+				TreeGX tree=this.TreeControl;
+				if(tree!=null)
+				{
+					return NodeDisplay.GetNodeRectangle(eNodeRectanglePart.NodeContentBounds,this,tree.NodeDisplay.Offset);
+				}
+				return Rectangle.Empty;
+			}
+		}
+
+		/// <summary>
+		/// Sets the bounds of the node.
+		/// </summary>
+		/// <param name="r">New location and size of the node.</param>
+		internal void SetBounds(Rectangle r)
+		{
+			m_BoundsRelative=r;
+		}
+
+		/// <summary>
+		/// Sets the content bounds of the node. Content bound is bound for the the cells inside the node
+		/// and it excludes the expand rectangle. Bounds also include the node style padding and
+		/// reflect node margin.
+		/// </summary>
+		/// <param name="r">New location and size of the node.</param>
+		internal void SetContentBounds(Rectangle r)
+		{
+			m_ContentBounds=r;
+		}
+
+		/// <summary>
+		/// Gets the node content bounds.
+		/// </summary>
+		internal Rectangle ContentBounds
+		{
+			get {return m_ContentBounds;}
+		}
+
+		/// <summary>
+		/// Gets the bounds for all the cells inside the node. The bounds do not include the expand part.
+		/// </summary>
+		[Browsable(false)]
+		internal Rectangle CellsBoundsRelative
+		{
+			get {return m_CellsBounds;}
+		}
+		
+		/// <summary>
+		/// Gets the bounds for all the cells inside the node. The bounds do not include the expand part.
+		/// </summary>
+		[Browsable(false)]
+		public Rectangle CellsBounds
+		{
+			get
+			{
+				TreeGX tree=this.TreeControl;
+				if(tree!=null)
+				{
+					return NodeDisplay.GetNodeRectangle(eNodeRectanglePart.CellsBounds,this,tree.NodeDisplay.Offset);
+				}
+				return Rectangle.Empty;
+			}
+		}
+
+		/// <summary>
+		/// Sets cell bounds.
+		/// </summary>
+		/// <param name="r">New cells bounds.</param>
+		internal void SetCellsBounds(Rectangle r)
+		{
+			m_CellsBounds=r;
+		}
+
+		/// <summary>
+		/// Sets node parent.
+		/// </summary>
+		/// <param name="parent">Parent node object.</param>
+		internal void SetParent(Node parent)
+		{
+			m_Parent=parent;
+			if(m_Parent==null)
+			{
+				foreach(Cell cell in m_Cells)
+				{
+					if(cell.HostedControl!=null && cell.HostedControl.Parent is TreeGX)
+						cell.HostedControl.Parent = null;
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the bounds of child nodes.
+		/// </summary>
+		internal Rectangle ChildNodesBounds
+		{
+			get {return m_ChildNodesBounds;}
+			set {m_ChildNodesBounds=value;}
+		}
+
+		/// <summary>
+		/// Gets the expand part rectangle. Expand part is used to expand/collapse node.
+		/// </summary>
+		[Browsable(false)]
+		internal Rectangle ExpandPartRectangleRelative
+		{
+			get {return m_ExpandPartRectangle;}
+		}
+		
+		/// <summary>
+		/// Gets the expand part rectangle. Expand part is used to expand/collapse node.
+		/// </summary>
+		[Browsable(false)]
+		public Rectangle ExpandPartRectangle
+		{
+			get
+			{
+				TreeGX tree=this.TreeControl;
+				if(tree!=null)
+				{
+					return NodeDisplay.GetNodeRectangle(eNodeRectanglePart.ExpandBounds,this,tree.NodeDisplay.Offset);
+				}
+				return Rectangle.Empty;
+			}
+		}
+
+		/// <summary>
+		/// Sets the bounds of the expand part.
+		/// </summary>
+		/// <param name="r">New part bounds.</param>
+		internal void SetExpandPartRectangle(Rectangle r)
+		{
+			m_ExpandPartRectangle=r;
+		}
+		
+		/// <summary>
+		/// Gets or sets the Command part bounds if command part is visible.
+		/// </summary>
+		[Browsable(false)]
+		public Rectangle CommandBounds
+		{
+			get
+			{
+				if(!m_CommandBoundsRelative.IsEmpty)
+				{
+					TreeGX tree=this.TreeControl;
+					if(tree!=null)
+					{
+						return NodeDisplay.GetNodeRectangle(eNodeRectanglePart.CommandBounds,this,tree.NodeDisplay.Offset);
+					}
+				}
+				return Rectangle.Empty;
+			}
+		}
+
+		internal Rectangle CommandBoundsRelative
+		{
+			get {return m_CommandBoundsRelative;}
+			set { m_CommandBoundsRelative = value;}
+		}
+
+		/// <summary>
+		/// Gets or sets a value indicating whether the tree node is in a checked state.
+		/// </summary>
+		[Browsable(true),DefaultValue(false),Category("Appearance"),Description("Indicates whether the tree node is in a checked state."),DevCoSerialize()]
+		public bool Checked
+		{
+			get
+			{
+				return m_Cells[0].Checked;
+			}
+			set
+			{
+				m_Cells[0].Checked=value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the checkbox alignment in relation to the text displayed by first default cell.
+		/// </summary>
+		[Browsable(true),Category("Check-box Properties"),DefaultValue(eCellPartAlignment.NearCenter),Description("Indicates checkbox alignment in relation to the text displayed by cell."), DevCoSerialize()]
+		public eCellPartAlignment CheckBoxAlignment
+		{
+			get
+			{
+				return m_Cells[0].CheckBoxAlignment;
+			}
+			set
+			{
+				m_Cells[0].CheckBoxAlignment=value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets whether check box is visible inside the cell.
+		/// </summary>
+		[Browsable(true),Category("Check-box Properties"),DefaultValue(false),Description("Indicates whether check box is visible inside the cell."),DevCoSerialize()]
+		public bool CheckBoxVisible
+		{
+			get
+			{
+				return m_Cells[0].CheckBoxVisible;
+			}
+			set
+			{
+				m_Cells[0].CheckBoxVisible=value;
+			}
+		}
+
+		/// <summary>
+		/// Gets the path from the root tree node to the current tree node. The path consists of the labels of all the tree nodes that must be navigated to get to this tree node, starting at the root tree node. The node labels are separated by the delimiter character specified in the PathSeparator property of the Tree control that contains this node.
+		/// </summary>
+		[Browsable(false)]
+		public string FullPath
+		{
+			get
+			{
+				if(this.TreeControl==null)
+					return "";
+				return NodeOperations.GetFullPath(this,this.TreeControl.PathSeparator);
+			}
+		}
+
+		/// <summary>
+		/// Gets the zero based index of position of the tree node in the tree node collection. -1 is returned if node is not added to the nodes collection.
+		/// </summary>
+		[Browsable(false)]
+		public int Index
+		{
+			get
+			{
+				return NodeOperations.GetNodeIndex(this);
+			}
+		}
+
+		/// <summary>
+		/// Gets a value indicating whether the tree node is in an editable state. true if the tree node is in editable state; otherwise, false.
+		/// </summary>
+		[Browsable(false)]
+		public bool IsEditing
+		{
+			get { return m_Editing;}
+		}
+		/// <summary>
+		/// Sets whether node is in edit mode or not.
+		/// </summary>
+		/// <param name="b">True indicating that node is in edit mode false otherwise.</param>
+		internal void SetEditing(bool b)
+		{
+			m_Editing=b;	
+		}
+
+		/// <summary>
+		/// Gets whether left mouse button is pressed on any cell contained by this node.
+		/// </summary>
+		[Browsable(false)]
+		public bool IsMouseDown
+		{
+			get
+			{
+				foreach(Cell cell in this.Cells)
+				{
+					if(cell.IsMouseDown)
+						return true;
+				}
+				return false;
+			}
+		}
+		
+		/// <summary>
+		/// Gets whether mouse cursor is over on any cell contained by this node.
+		/// </summary>
+		[Browsable(false)]
+		public bool IsMouseOver
+		{
+			get
+			{
+				foreach(Cell cell in this.Cells)
+				{
+					if(cell.IsMouseOver)
+						return true;
+				}
+				return false;
+			}
+		}
+
+		/// <summary>
+		/// Gets a value indicating whether the tree node is in the selected state. true if the tree node is in the selected state; otherwise, false.
+		/// </summary>
+		[Browsable(false)]
+		public bool IsSelected
+		{
+			get
+			{
+				TreeGX tree=this.TreeControl;
+				if(tree!=null)
+				{
+					if(tree.SelectedNode==this)
+						return true;
+				}
+				return false;
+			}
+		}
+
+        internal void OnNodesCleared()
+        {
+            this.SizeChanged = true;
+        }
+
+        private bool _Enabled = true;
+        /// <summary>
+        /// Gets or sets whether node is enabled. Default value is true. Setting this value to false will set Enabled=false on all child cells.
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Behavior"), Description("Gets or sets whether node is enabled."), DevCoSerialize()]
+        public bool Enabled
+        {
+            get { return _Enabled; }
+            set
+            {
+                _Enabled = value;
+                foreach (Cell c in m_Cells)
+                {
+                    c.Enabled = _Enabled;
+                }
+            }
+        }
+
+        private bool _Selectable = true;
+        /// <summary>
+        /// Gets or sets whether node can be selected by user by clicking it with the mouse or using keyboard. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether node can be selected by user by clicking it with the mouse or using keyboard.")]
+        public bool Selectable
+        {
+            get { return _Selectable; }
+            set
+            {
+                _Selectable = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets whether node can be selected. Node must be Visible, Enabled and Selectable in order for it to be selected.
+        /// </summary>
+        [Browsable(false)]
+        public bool CanSelect
+        {
+            get
+            {
+                return this.Enabled & this.Visible & this.Selectable;
+            }
+        }
+
+		/// <summary>
+		/// Gets or sets a cell that is in selected state otherwise it retuns null.
+		/// </summary>
+		[Browsable(false),DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public Cell SelectedCell
+		{
+			get
+			{
+				if(this.IsSelected)
+				{
+					foreach(Cell cell in m_Cells)
+						if(cell.IsSelected)
+							return cell;
+				}
+				return null;
+			}
+			set
+			{
+				TreeGX tree=this.TreeControl;
+
+				if(!this.IsSelected)
+				{
+					if(tree!=null)
+						tree.SelectedNode=this;
+				}
+				foreach(Cell cell in m_Cells)
+				{
+					if(cell==value)
+						cell.SetSelected(true);
+					else
+						cell.SetSelected(false);
+				}
+				if(tree!=null)
+				{
+					tree.InvalidateNode(this);
+					tree.Update();
+				}
+
+			}
+		}
+
+		/// <summary>
+		/// Gets a value indicating whether the tree node is visible. Node is considered to be visible when it's Visible property is set to true and path to the node is available i.e. all parent nodes are expanded.
+		/// </summary>
+		[Browsable(false)]
+		public bool IsVisible
+		{
+			get
+			{
+				return NodeOperations.GetIsNodeVisible(this);
+			}
+		}
+
+		/// <summary>
+		/// Returns whether node is displayed on the screen and visible to the user. When node is outside of the viewable area this property will return false. It will also return false if node is not visible.
+		/// </summary>
+		[Browsable(false)]
+		public bool IsDisplayed
+		{
+			get {return NodeOperations.GetIsNodeDisplayed(this);}	
+		}
+
+		/// <summary>
+		/// Gets the last child tree node. The LastNode is the last child Node in the NodeCollection stored in the Nodes property of the current tree node. If the Node has no child tree node, the LastNode property returns a null reference (Nothing in Visual Basic).
+		/// </summary>
+		[Browsable(false)]
+		public Node LastNode
+		{
+			get
+			{
+				return NodeOperations.GetLastNode(this);
+			}
+		}
+
+		/// <summary>
+		/// Gets the next sibling tree node. The NextNode is the next sibling Node in the NodeCollection stored in the Nodes property of the tree node's parent Node. If there is no next tree node, the NextNode property returns a null reference (Nothing in Visual Basic).
+		/// </summary>
+		[Browsable(false)]
+		public Node NextNode
+		{
+			get
+			{
+				return NodeOperations.GetNextNode(this);
+			}
+		}
+
+		/// <summary>
+		/// Gets the next visible tree node. The NextVisibleNode can be a child, sibling, or a tree node from another branch. If there is no next tree node, the NextVisibleNode property returns a null reference (Nothing in Visual Basic).
+		/// </summary>
+		[Browsable(false)]
+		public Node NextVisibleNode
+		{
+			get
+			{
+				return NodeOperations.GetNextVisibleNode(this);
+			}
+		}
+
+		/// <summary>
+		/// Gets the collection of Node objects assigned to the current tree node. The Nodes property can hold a collection of other Node objects. Each of the tree node in the collection has a Nodes property that can contain its own NodeCollection. Nesting of tree nodes can make it difficult to navigate a tree structure. The FullPath property makes it easier to determine your location in a tree.
+		/// </summary>
+		[Browsable(true),Category("Nodes"),DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+		public NodeCollection Nodes
+		{
+			get
+			{
+				if(m_Nodes==null)
+				{
+					m_Nodes=new NodeCollection();
+					m_Nodes.SetParentNode(this);
+				}
+				return m_Nodes;
+			}
+		}
+
+		/// <summary>
+		/// Gets the collection of LinkedNode objects that describe nodes linked to this node.
+		/// </summary>
+		/// <remarks>
+		/// Linked nodes are nodes that are related to given node but do not have strict
+		/// parent child relationship with the node. Each linked node must be already added as
+		/// child node to some other node or it will not be displayed. Linked nodes are used in Map
+		/// and Diagram layout styles to display relationships between nodes.
+		/// </remarks>
+		[Browsable(true),Category("Nodes"), Description("Collection of LinkedNode objects that describe nodes linked to this node")]
+		public LinkedNodesCollection LinkedNodes
+		{
+			get
+			{
+				if(m_LinkedNodes==null)
+				{
+					m_LinkedNodes=new LinkedNodesCollection();	
+				}
+				return m_LinkedNodes;
+			}
+		}
+
+		/// <summary>
+		/// Gets whether Node has any linked nodes.
+		/// </summary>
+		[Browsable(false)]
+		public bool HasLinkedNodes
+		{
+            get {return (m_LinkedNodes!=null && m_LinkedNodes.Count>0);}
+		}
+
+		/// <summary>
+		/// Gets whether there is at least one child node that has its Visible property set to true.
+		/// </summary>
+		[Browsable(false)]
+		public bool AnyVisibleNodes
+		{
+			get
+			{
+				return NodeOperations.GetAnyVisibleNodes(this);
+			}
+		}
+
+		/// <summary>
+		/// Gets the parent tree node of the current tree node. If the tree node is at the root level, the Parent property returns a null reference (Nothing in Visual Basic).
+		/// </summary>
+		[Browsable(false)]
+		public Node Parent
+		{
+			get
+			{
+				return m_Parent;
+			}
+		}
+
+		/// <summary>
+		/// Gets the previous sibling tree node. The PrevNode is the previous sibling Node in the NodeCollection stored in the Nodes property of the tree node's parent Node. If there is no previous tree node, the PrevNode property returns a null reference (Nothing in Visual Basic).
+		/// </summary>
+		[Browsable(false)]
+		public Node PrevNode
+		{
+			get
+			{
+				return NodeOperations.GetPreviousNode(this);
+			}
+		}
+
+		/// <summary>
+		/// Gets the previous visible tree node. The PrevVisibleNode can be a child, sibling, or a tree node from another branch. If there is no previous tree node, the PrevVisibleNode property returns a null reference (Nothing in Visual Basic).
+		/// </summary>
+		[Browsable(false)]
+		public Node PrevVisibleNode
+		{
+			get
+			{
+				return NodeOperations.GetPreviousVisibleNode(this);
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the object that contains data about the tree node. Any Object derived type can be assigned to this property. If this property is being set through the Windows Forms designer, only text can be assigned.
+		/// </summary>
+		[Browsable(false),DefaultValue(null),Category("Data"),Description("Indicates text that contains data about the tree node."),DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public object Tag
+		{
+			get
+			{
+				return m_Cells[0].Tag;
+			}
+			set
+			{
+				m_Cells[0].Tag = value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the object that contains data about the tree node. Any Object derived type can be assigned to this property. If this property is being set through the Windows Forms designer, only text can be assigned.
+		/// </summary>
+		[Browsable(true),DefaultValue(""),Category("Data"),Description("Indicates text that contains data about the tree node."), DevCoSerialize()]
+		public string TagString
+		{
+			get
+			{
+				return m_Cells[0].TagString;
+			}
+			set
+			{
+				m_Cells[0].TagString=value;
+			}
+		}
+		
+		/// <summary>
+		/// Gets or sets the object that contains additional data about the tree node. Any Object derived type can be assigned to this property. If this property is being set through the Windows Forms designer, only text can be assigned.
+		/// This property has same function as Tag property and provides you with additional separate storage of data.
+		/// </summary>
+		[Browsable(false),DefaultValue(null),Category("Data"),Description("Indicates text that contains data about the tree node."),DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public object DataKey
+		{
+			get
+			{
+				return m_DataKey;
+			}
+			set
+			{
+				m_DataKey=value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the object that contains additional data about the tree node. Any Object derived type can be assigned to this property. If this property is being set through the Windows Forms designer, only text can be assigned.
+		/// This property has same function as Tag property and provides you with additional separate storage of data.
+		/// </summary>
+		[Browsable(true),DefaultValue(""),Category("Data"),Description("Indicates text that contains data about the tree node."),DevCoSerialize()]
+		public string DataKeyString
+		{
+			get
+			{
+				if(m_DataKey==null)
+					return "";
+				return m_DataKey.ToString();
+			}
+			set
+			{
+				m_DataKey=value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the text displayed in the tree node.
+		/// </summary>
+		[Browsable(true),DefaultValue(""),Category("Appearance"),Localizable(true),Description("Indicates text displayed in the tree node."),DevCoSerialize()]
+		public string Text
+		{
+			get
+			{
+				return this.Cells[0].Text;
+			}
+			set
+			{
+				this.Cells[0].Text=value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the control hosted inside of the first node cell.
+		/// </summary>
+		/// <remarks>
+		/// 	<para>When control is hosted inside of the cell, cell size is determined by the
+		///     size of the control hosted inside of it. The cell will not display its text but it will display any image assigned
+		///     or check box when control is hosted inside of it. The Style settings like Margin
+		///     and Padding will still apply.</para>
+		/// </remarks>
+		[Browsable(true),Category("Behavior"),Description("Indicates control hosted inside of the cell."),DefaultValue(null)]
+		public Control HostedControl
+		{
+			get {return this.Cells[0].HostedControl;}
+			set
+			{
+				this.Cells[0].HostedControl=value;
+			}
+		}
+
+		/// <summary>
+		/// Gets the parent tree control that the tree node is assigned to.
+		/// </summary>
+		[Browsable(false)]
+		public TreeGX TreeControl
+		{
+			get
+			{
+				return this.GetTreeControl();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the layout of the cells inside the node. Default value is Horizontal layout which
+		/// means that cell are positioned horizontally next to each other.
+		/// </summary>
+		[Browsable(true),DefaultValue(eCellLayout.Default),Category("Cells"),Description("Indicates layout of the cells inside the node."), DevCoSerialize()]
+		public eCellLayout CellLayout
+		{
+			get {return m_CellLayout;}
+			set
+			{
+				m_CellLayout=value;
+				this.SizeChanged = true;
+			}
+		}
+		
+		/// <summary>
+		/// Gets or sets the layout of the cell parts like check box, image and text. Layout can be horizontal (default)
+		/// where parts of the cell are positioned next to each other horizontally, or vertical where
+		/// parts of the cell are positioned on top of each other vertically.
+		/// Alignment of the each part is controlled by alignment properties. This property affects only the first cell inside of the node.
+		/// Use Cell.Layout property to change the part layout on each cell contained by node.
+		/// </summary>
+		[Browsable(true),DefaultValue(eCellPartLayout.Default),Category("Cells"),Description("Indicates the layout of the cell parts like check box, image and text."), DevCoSerialize()]
+		public eCellPartLayout CellPartLayout
+		{
+			get {return m_Cells[0].Layout;}
+			set
+			{
+				if(m_Cells[0].Layout!=value)
+				{
+					m_Cells[0].Layout=value;
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets the collection of all Cells assigned to this node. There should be always at least one cell in a node which is default cell. Default
+		/// collection contains a single cell.
+		/// </summary>
+		[Browsable(true),DesignerSerializationVisibility(DesignerSerializationVisibility.Content),Category("Cells"),Description("Collection of Cells assigned to this node.")]
+		public CellCollection Cells
+		{
+			get {return m_Cells;}
+		}
+
+		/// <summary>
+		/// Get collection of child node columns.
+		/// </summary>
+		[Browsable(true),DesignerSerializationVisibility(DesignerSerializationVisibility.Content),Category("Columns"),Description("Child nodes columns definition.")]
+		public ColumnHeaderCollection NodesColumns
+		{
+			get {return m_NodesColumns;}
+		}
+
+//		/// <summary>
+//		/// Gets or sets whether child node column header is visible or not.
+//		/// </summary>
+//		[Browsable(true),DefaultValue(true),Category("Columns"),Description("Indicates whether child node column header is visible or not.")]
+//		public bool NodesColumnHeaderVisible
+//		{
+//			get {return m_NodesColumnHeaderVisible;}
+//			set
+//			{
+//				if(m_NodesColumnHeaderVisible!=value)
+//				{
+//					m_NodesColumnHeaderVisible=value;
+//					if(this.Expanded)
+//						this.OnChildNodesSizeChanged();
+//				}
+//			}
+//		}
+
+		/// <summary>Gets or sets the style of the cells when node is expanded.</summary>
+		/// <value>
+		/// Reference to the style assigned to the node/cell or null value indicating that
+		/// default style setting from tree control is applied. Default value is null.
+		/// </value>
+		/// <remarks>
+		/// 	<para>When node is expanded the style specified here will be used on all cells
+		///     associated with this node instead of the
+		///     <see cref="Cell.StyleNormal">Cell.StyleNormal</see>. That way you can give
+		///     different appearance to your node's cells when node is expanded.</para>
+		/// 	<para>When property is set to null value the style setting from parent tree
+		///     controls is used. <see cref="TreeGX.NodeStyleExpanded">NodeStyleExpanded</see> on
+		///     TreeGX control is a root style for a cell.</para>
+		/// </remarks>
+		[Browsable(true),DefaultValue(null),Category("Style"),Editor(typeof(Design.ElementStyleTypeEditor),typeof(System.Drawing.Design.UITypeEditor)),Description("Indicates the style for the child nodes when node is expanded.")]
+		public ElementStyle StyleExpanded
+		{
+			get {return m_StyleExpanded;}
+			set
+			{
+				if(m_StyleExpanded!=value)
+				{
+					if(m_StyleExpanded!=null)
+						m_StyleExpanded.StyleChanged-=new EventHandler(this.ElementStyleChanged);
+					if(value!=null)
+						value.StyleChanged+=new EventHandler(this.ElementStyleChanged);
+					m_StyleExpanded=value;
+					if(this.Expanded)
+						this.SizeChanged = true;
+				}
+			}
+		}
+		
+		/// <summary>
+		/// Gets or sets the expanded style name used by node. This member is provided for internal use only. To set or get the style use StyleExpanded property instead.
+		/// </summary>
+		[Browsable(false), DefaultValue(""), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), EditorBrowsable(EditorBrowsableState.Never) , DevCoSerialize()]
+		public string StyleExpandedName
+		{
+			get
+			{
+				if(m_StyleExpanded!=null)
+					return m_StyleExpanded.Name;
+				return "";
+			}
+			set
+			{
+				if(value.Length==0)
+				{
+					TypeDescriptor.GetProperties(this)["StyleExpanded"].SetValue(this, null);
+					return;
+				}
+				
+				TreeGX tree=this.TreeControl;
+				if(tree!=null)
+				{
+					TypeDescriptor.GetProperties(this)["StyleExpanded"].SetValue(this, tree.Styles[value]);
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the style used when Node is selected. Default value is NULL (VB
+		/// Nothing)
+		/// </summary>
+		[Browsable(true),DefaultValue(null),Category("Style"),Editor(typeof(Design.ElementStyleTypeEditor),typeof(System.Drawing.Design.UITypeEditor)),Description("Indicates the style for the nodes when node is selected.")]
+		public ElementStyle StyleSelected
+		{
+			get {return m_StyleSelected;}
+			set
+			{
+				if(m_StyleSelected!=value)
+				{
+					if(m_StyleSelected!=null)
+						m_StyleSelected.StyleChanged-=new EventHandler(this.ElementStyleChanged);
+					if(value!=null)
+						value.StyleChanged+=new EventHandler(this.ElementStyleChanged);
+					m_StyleSelected=value;
+					if(this.IsSelected)
+						this.SizeChanged = true;
+				}
+			}
+		}
+		
+		/// <summary>
+		/// Gets or sets the selected style name used by node. This member is provided for internal use only. To set or get the style use StyleSelected property instead.
+		/// </summary>
+		[Browsable(false), DefaultValue(""), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), EditorBrowsable(EditorBrowsableState.Never) , DevCoSerialize()]
+		public string StyleSelectedName
+		{
+			get
+			{
+				if(m_StyleSelected!=null)
+					return m_StyleSelected.Name;
+				return "";
+			}
+			set
+			{
+				if(value.Length==0)
+				{
+					TypeDescriptor.GetProperties(this)["StyleSelected"].SetValue(this, null);
+					return;
+				}
+				
+				TreeGX tree=this.TreeControl;
+				if(tree!=null)
+				{
+					TypeDescriptor.GetProperties(this)["StyleSelected"].SetValue(this, tree.Styles[value]);
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the style used when mouse is over the Node. Default value is NULL
+		/// (VB Nothing)
+		/// </summary>
+		[Browsable(true),DefaultValue(null),Category("Style"),Editor(typeof(Design.ElementStyleTypeEditor),typeof(System.Drawing.Design.UITypeEditor)),Description("Indicates the style for the nodes when node is selected.")]
+		public ElementStyle StyleMouseOver
+		{
+			get {return m_StyleMouseOver;}
+			set
+			{
+				if(m_StyleMouseOver!=value)
+				{
+					if(m_StyleMouseOver!=null)
+						m_StyleMouseOver.StyleChanged-=new EventHandler(this.ElementStyleChanged);
+					if(value!=null)
+						value.StyleChanged+=new EventHandler(this.ElementStyleChanged);
+					m_StyleMouseOver=value;
+				}
+			}
+		}
+		
+		/// <summary>
+		/// Gets or sets the mouse over style name used by node. This member is provided for internal use only. To set or get the style use StyleMouseOver property instead.
+		/// </summary>
+		[Browsable(false), DefaultValue(""), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), EditorBrowsable(EditorBrowsableState.Never) , DevCoSerialize()]
+		public string StyleMouseOverName
+		{
+			get
+			{
+				if(m_StyleMouseOver!=null)
+					return m_StyleMouseOver.Name;
+				return "";
+			}
+			set
+			{
+				if(value.Length==0)
+				{
+					TypeDescriptor.GetProperties(this)["StyleMouseOver"].SetValue(this, null);
+					return;
+				}
+				
+				TreeGX tree=this.TreeControl;
+				if(tree!=null)
+				{
+					TypeDescriptor.GetProperties(this)["StyleMouseOver"].SetValue(this, tree.Styles[value]);
+				}
+			}
+		}
+
+		/// <summary>
+		///     Gets or sets the node style.
+		/// </summary>
+		/// <value>
+		/// Reference to the style assigned to the node or null value indicating that default
+		/// style setting from tree control is applied. Default value is null.
+		/// </value>
+		/// <remarks>
+		/// 	<para>Style specified by this property will be used as default style for the node.
+		///     Each cell within the node can also specify it's own style. Since node contains the
+		///     cells using this style property can you for example create a border around all cell
+		///     contained by the node.</para>
+		/// 	<para>When this property is set to null value (default value) NodeStyle
+		///     property on TreeGX control is used.</para>
+		/// </remarks>
+		[Browsable(true),DefaultValue(null),Category("Style"),Editor(typeof(Design.ElementStyleTypeEditor),typeof(System.Drawing.Design.UITypeEditor)),Description("Indicates the node style.")]
+		public ElementStyle Style
+		{
+			get {return m_Style;}
+			set
+			{
+				if(m_Style!=value)
+				{
+					if(m_Style!=null)
+						m_Style.StyleChanged-=new EventHandler(this.ElementStyleChanged);
+					if(value!=null)
+						value.StyleChanged+=new EventHandler(this.ElementStyleChanged);
+					m_Style=value;
+					this.SizeChanged = true;
+					this.Invalidate();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the style name used by node. This member is provided for internal use only. To set or get the style use Style property instead.
+		/// </summary>
+		[Browsable(false), DefaultValue(""), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), EditorBrowsable(EditorBrowsableState.Never) , DevCoSerialize()]
+		public string StyleName
+		{
+			get
+			{
+				if(m_Style!=null)
+					return m_Style.Name;
+				return "";
+			}
+			set
+			{
+				if(value.Length==0)
+				{
+					TypeDescriptor.GetProperties(this)["Style"].SetValue(this, null);
+					return;
+				}
+				
+				TreeGX tree=this.TreeControl;
+				if(tree!=null)
+				{
+					TypeDescriptor.GetProperties(this)["Style"].SetValue(this, tree.Styles[value]);
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the part of the node mouse is over.
+		/// </summary>
+		internal eMouseOverNodePart MouseOverNodePart
+		{
+			get {return m_MouseOverNodePart;}
+			set {m_MouseOverNodePart=value;}
+		}
+
+
+		/// <summary>
+		/// Gets or sets the node horizontal offset from the position determined by the layout manager.
+		/// </summary>
+		[Browsable(false),DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden),DefaultValue(0)]
+		internal int Offset
+		{
+			get {return m_Offset;}
+			set
+			{
+				m_Offset=value;
+				this.SizeChanged = true;
+			}
+		}
+
+		/// <summary>
+		/// Gets layout position of the node when tree is in Map layout mode and node is the first child note of top-level root node.
+		/// To set the layout position for a node use TreeGX.SetNodeMapPosition method.
+		/// </summary>
+		[Browsable(false),DefaultValue(eMapPosition.Default),Category("Behavior"),Description("Indicates the position of the node when tree is in Map layout mode.")]
+		public eMapPosition MapSubRootPosition
+		{
+			get {return m_MapSubRootPosition;}
+		}
+		
+		/// <summary>
+		/// Gets or sets the image alignment in relation to the text displayed by cell. This property affects only first default cell inside the node.
+		/// Property with same name is available on each cell and you can use it to affect each cell individually.
+		/// </summary>
+		[Browsable(true),Category("Image Properties"),DefaultValue(eCellPartAlignment.NearCenter),Description("Gets or sets the image alignment in relation to the text displayed by cell."),DevCoSerialize()]
+		public eCellPartAlignment ImageAlignment
+		{
+			get
+			{
+				return m_Cells[0].ImageAlignment;
+			}
+			set
+			{
+				if(m_Cells[0].ImageAlignment!=value)
+				{
+					m_Cells[0].ImageAlignment=value;
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the image displayed when the tree node is in the unselected state.
+		/// </summary>
+		/// <remarks>
+		/// Image specified will be used as a default image for any other node state where
+		/// different image is not specified.
+		/// </remarks>
+		[Browsable(true),Category("Images"),Description("Indicates image displayed when the tree node is in the unselected state."),DefaultValue(null),DevCoSerialize()]
+		public System.Drawing.Image Image
+		{
+			get{return m_Cells[0].Images.Image;}
+			set
+			{
+				this.SizeChanged = true;
+				m_Cells[0].Images.Image=value;
+			}
+		}
+		
+		/// <summary>
+		/// Resets image to its default value. Windows Forms designer support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetImage()
+		{
+			TypeDescriptor.GetProperties(this)["Image"].SetValue(this, null);
+		}
+
+		/// <summary>
+		/// Gets or sets the image-list index value of the default image that is displayed by the tree nodes.
+		/// </summary>
+		[Browsable(true),Category("Images"),Description("Indicates the image-list index value of the default image that is displayed by the tree nodes."),System.ComponentModel.Editor(typeof(ImageIndexEditor), typeof(System.Drawing.Design.UITypeEditor)),System.ComponentModel.TypeConverter(typeof(System.Windows.Forms.ImageIndexConverter)),DefaultValue(-1),DevCoSerialize()]
+		public int ImageIndex
+		{
+			get {return this.Cells[0].Images.ImageIndex;}
+			set
+			{
+				this.SizeChanged = true;
+				this.Cells[0].Images.ImageIndex = value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the image displayed when mouse is over the tree node.
+		/// </summary>
+		[Browsable(true),Category("Images"),Description("Indicates the image displayed when mouse is over the tree node."),DefaultValue(null),DevCoSerialize()]
+		public System.Drawing.Image ImageMouseOver
+		{
+			get{return this.Cells[0].Images.ImageMouseOver;}
+			set
+			{
+				this.Cells[0].Images.ImageMouseOver = value;
+				this.SizeChanged = true;
+			}
+		}
+		
+		/// <summary>
+		/// Resets ImageMouseOver to its default value. Windows Forms designer support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetImageMouseOver()
+		{
+			TypeDescriptor.GetProperties(this)["ImageMouseOver"].SetValue(this, null);
+		}
+
+		/// <summary>
+		/// Gets or sets the image-list index value of the image that is displayed by the tree nodes when mouse is over the node.
+		/// </summary>
+		[Browsable(true),Category("Images"),Description("Indicates the image-list index value of the image that is displayed by the tree nodes when mouse is over the node."),System.ComponentModel.Editor(typeof(ImageIndexEditor), typeof(System.Drawing.Design.UITypeEditor)),System.ComponentModel.TypeConverter(typeof(System.Windows.Forms.ImageIndexConverter)),DefaultValue(-1),DevCoSerialize()]
+		public int ImageMouseOverIndex
+		{
+			get {return this.Cells[0].Images.ImageMouseOverIndex;}
+			set
+			{
+				this.SizeChanged = true;
+				this.Cells[0].Images.ImageMouseOverIndex = value;
+			}
+		}
+
+//		/// <summary>
+//		/// Gets or sets the image displayed when node is disabled.
+//		/// </summary>
+//		[Browsable(true),Category("Images"),Description("Indicates the image displayed when node is disabled."),DefaultValue(null),DevCoSerialize()]
+//		public System.Drawing.Image ImageDisabled
+//		{
+//			get{return m_Image Disabled;}
+//			set
+//			{
+//				if(m_ImageDisabled!=value)
+//				{
+//					this.SizeChanged = true;
+//					m_ImageDisabled=value;
+//				}
+//			}
+//		}
+		
+		/// <summary>
+		/// Resets ImageDisabled to its default value. Windows Forms designer support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetImageDisabled()
+		{
+			TypeDescriptor.GetProperties(this)["ImageDisabled"].SetValue(this, null);
+		}
+
+//		/// <summary>
+//		/// Gets or sets the image-list index value of the image that is displayed by the tree nodes when node is disabled.
+//		/// </summary>
+//		[Browsable(true),Category("Images"),Description("Indicates the image-list index value of the image that is displayed by the tree nodes when node is disabled."),System.ComponentModel.Editor(typeof(ImageIndexEditor), typeof(System.Drawing.Design.UITypeEditor)),System.ComponentModel.TypeConverter(typeof(System.Windows.Forms.ImageIndexConverter)),DefaultValue(-1),DevCoSerialize()]
+//		public int ImageDisabledIndex
+//		{
+//			get {return m_ImageDisabledIndex;}
+//			set
+//			{
+//				if(m_ImageDisabledIndex!=value)
+//				{
+//					this.SizeChanged = true;
+//					m_ImageDisabledIndex=value;
+//				}
+//			}
+//		}
+
+		/// <summary>
+		/// Gets or sets the image displayed when node is expanded.
+		/// </summary>
+		[Browsable(true),Category("Images"),Description("Indicates the image displayed when node is expanded."),DefaultValue(null),DevCoSerialize()]
+		public System.Drawing.Image ImageExpanded
+		{
+			get{return this.Cells[0].Images.ImageExpanded;}
+			set
+			{
+				this.Cells[0].Images.ImageExpanded = value;
+				this.SizeChanged = true;
+			}
+		}
+		
+		/// <summary>
+		/// Resets ImageExpanded to its default value. Windows Forms designer support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetImageExpanded()
+		{
+			TypeDescriptor.GetProperties(this)["ImageExpanded"].SetValue(this, null);
+		}
+
+		/// <summary>
+		/// Gets or sets the image-list index value of the image that is displayed by the tree nodes when node is expanded.
+		/// </summary>
+		[Browsable(true),Category("Images"),Description("Indicates the image-list index value of the image that is displayed by the tree nodes when node is expanded."),System.ComponentModel.Editor(typeof(ImageIndexEditor), typeof(System.Drawing.Design.UITypeEditor)),System.ComponentModel.TypeConverter(typeof(System.Windows.Forms.ImageIndexConverter)),DefaultValue(-1),DevCoSerialize()]
+		public int ImageExpandedIndex
+		{
+			get {return this.Cells[0].Images.ImageExpandedIndex;}
+			set
+			{
+				this.SizeChanged = true;
+				this.Cells[0].Images.ImageExpandedIndex = value;
+			}
+		}
+
+		/// <summary>
+		/// Property Editor support for ImageIndex selection
+		/// </summary>
+		[System.ComponentModel.Browsable(false),System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+		public System.Windows.Forms.ImageList ImageList
+		{
+			get
+			{
+				TreeGX tree=this.TreeControl;
+				if(tree!=null)
+				{
+					return tree.ImageList;
+				}
+				return null;
+			}
+		}
+		
+		/// <summary>
+		/// Sets the node relative position form the root when map layout is used.
+		/// </summary>
+		/// <param name="pos">Relative node position.</param>
+		internal void SetMapSubRootPosition(eMapPosition pos)
+		{
+			m_MapSubRootPosition=pos;
+		}
+
+		/// <summary>
+		/// Gets or sets the NodeConnector object that describes the type of the connector used for
+		/// displaying connection between current node and its parent node. 
+		/// Default value is null which means that settings from TreeGX control are used.
+		/// </summary>
+		/// <seealso cref="TreeGX.RootConnector">RootConnector Property (DevComponents.Tree.TreeGX)</seealso>
+		/// <seealso cref="TreeGX.NodesConnector">NodesConnector Property (DevComponents.Tree.TreeGX)</seealso>
+		[Browsable(true),Category("Connectors"),DefaultValue(null),Editor(typeof(Design.NodeConnectorTypeEditor),typeof(System.Drawing.Design.UITypeEditor)),Description("Indicates the nested nodes connector.")]
+		public NodeConnector ParentConnector
+		{
+			get {return m_ParentConnector;}
+			set
+			{
+				if(m_ParentConnector!=value)
+				{
+					if(m_ParentConnector!=null)
+						m_ParentConnector.AppearanceChanged-=new EventHandler(this.ConnectorAppearanceChanged);
+					if(value!=null)
+						value.AppearanceChanged+=new EventHandler(this.ConnectorAppearanceChanged);
+					m_ParentConnector=value;
+					this.OnDisplayChanged();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets the collection of the parent connector line relative points. By default this collection is empty which indicates that
+		/// connector line is drawn using predefined path. Points added here are the points through which the connector line will travel to the
+		/// parent node. The point coordinates added to this collection are relative from the top-left corner of this node.
+		/// </summary>
+		[Browsable(true),Category("Connectors"),DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+		public ConnectorPointsCollection ParentConnectorPoints
+		{
+			get {return m_ParentConnectorPoints;}
+		}
+
+		/// <summary>
+		/// Gets or sets whether node is visible.
+		/// </summary>
+		[Browsable(true),Category("Behavior"),DefaultValue(true),Description("Indicated whether node is visible"),DevCoSerialize()]
+		public bool Visible
+		{
+			get {return m_Visible;}
+			set
+			{
+				m_Visible=value;
+				this.OnVisibleChanged();
+				this.SizeChanged = true;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets whether command button is visible. Default value is false.
+		/// Command button can be used to display for example popup menu with commands for node,
+		/// or to display the list of linked nodes.
+		/// </summary>
+		[Browsable(true),DefaultValue(false),Category("Command Button"),Description("Indicates visibility of command button."),DevCoSerialize()]
+		public bool CommandButton
+		{
+			get {return m_CommandButton;}
+			set
+			{
+				m_CommandButton=value;
+				this.OnDisplayChanged();
+			}
+		}
+		
+		/// <summary>
+		/// Gets or sets internal value that indicates that node is on "path" of the selected node.
+		/// </summary>
+		internal bool SelectedConnectorMarker
+		{
+			get { return m_SelectedConnectorMarker; }
+			set { m_SelectedConnectorMarker = value; }
+		}
+
+		#endregion
+
+		#region Methods
+		/// <summary>
+		/// Invalidates node and causes a paint message to be sent to the tree.
+		/// </summary>
+		public void Invalidate()
+		{
+			TreeGX tree=this.TreeControl;
+			if(tree!=null)
+				tree.InvalidateNode(this);
+		}
+
+		/// <summary>Initiates the editing of node text.</summary>
+		/// <remarks>
+		/// This method by default edits text stored in Node.Text. Call to this method is
+		/// same as calling the overload method BeginData(0) with zero as parameter. Use BeginData
+		/// overload method to begin editing the specific column for multi-column nodes.
+		/// </remarks>
+		public void BeginEdit()
+		{
+			BeginEdit(0);
+		}
+		
+		/// <summary>Initiates the editing of node text.</summary>
+		/// <param name="initialText">
+		/// The initial text to be entered into the edit TextBox. Specify null to use existing text.
+		/// </param>
+		public void BeginEdit(string initialText)
+		{
+			BeginEdit(0, initialText);
+		}
+
+		/// <summary>Initiates text editing of certain Node column.</summary>
+		/// <param name="iColumnIndex">
+		/// Zero based index of a column to begin editing for. Column 0 always corresponds to
+		/// Node.Text property.
+		/// </param>
+		public void BeginEdit(int iColumnIndex)
+		{
+			BeginEdit(iColumnIndex, null);
+		}
+		
+		/// <summary>Initiates text editing of certain Node column.</summary>
+		/// <param name="iColumnIndex">
+		/// Zero based index of a column to begin editing for. Column 0 always corresponds to
+		/// Node.Text property.
+		/// </param>
+		/// <param name="initialText">
+		/// The initial text to be entered into the edit TextBox. Specify null to edit existing text.
+		/// </param>
+		public void BeginEdit(int iColumnIndex, string initialText)
+		{
+			TreeGX tree=this.TreeControl;
+			if(tree==null)
+				return;
+			tree.EditCell(this.Cells[iColumnIndex], eTreeAction.Code, initialText);
+		}
+
+		/// <summary>Makes a "shallow" copy of a Node.</summary>
+		/// <remarks>
+		/// Shallow copy of a Node is a exact copy of Node but <strong>without</strong> copy
+		/// of all child nodes in Nodes collection.
+		/// </remarks>
+		public virtual Node Copy()
+		{
+			// TODO: Verify that all properties are copied
+			Node n=new Node();
+			n.CellLayout=this.CellLayout;
+			n.Cells.Clear();
+			foreach(Cell c in this.Cells)
+				n.Cells.Add(c.Copy());
+			n.Checked=this.Checked;
+			n.CommandButton=this.CommandButton;
+			n.ExpandVisibility=this.ExpandVisibility;
+			n.Image=this.Image;
+//			n.ImageDisabled=this.ImageDisabled;
+//			n.ImageDisabledIndex=this.ImageDisabledIndex;
+			n.ImageExpanded=this.ImageExpanded;
+			n.ImageExpandedIndex=this.ImageExpandedIndex;
+			n.ImageIndex=this.ImageIndex;
+			n.ImageMouseOver=this.ImageMouseOver;
+			n.ImageMouseOverIndex=this.ImageMouseOverIndex;
+			//n.NodesColumnHeaderVisible=this.NodesColumnHeaderVisible;
+			foreach(ColumnHeader c in this.NodesColumns)
+				n.NodesColumns.Add(c.Copy());
+			n.ParentConnector=this.ParentConnector;
+			n.Style=this.Style;
+			n.StyleExpanded=this.StyleExpanded;
+			n.StyleMouseOver=this.StyleMouseOver;
+			n.StyleSelected=this.StyleSelected;
+			n.Tag=this.Tag;
+			n.DataKey = this.DataKey;
+			n.Text=this.Text;
+			n.Visible=this.Visible;
+            n.Selectable = this.Selectable;
+			n.ParentConnectorPoints.AddRange(this.ParentConnectorPoints.ToArray());
+			
+			return n;
+		}
+
+		/// <summary>Makes a "deep" copy of a node.</summary>
+		/// <remarks>
+		/// Deep copy of Node is a exact copy of Node including exact copies of all child nodes
+		/// in this node's Nodes collection.
+		/// </remarks>
+		public virtual Node DeepCopy()
+		{
+			Node n=this.Copy();
+			foreach(Node c in this.Nodes)
+				n.Nodes.Add(c.DeepCopy());
+			return n;
+		}
+
+		/// <summary>
+		/// Collapses the tree node.
+		/// </summary>
+		public void Collapse()
+		{
+			this.SetExpanded(false,eTreeAction.Code);
+		}
+		
+		/// <summary>
+		/// Collapses the tree node.
+		/// </summary>
+		/// <param name="action">Action that caused the event</param>
+		public void Collapse(eTreeAction action)
+		{
+			this.SetExpanded(false,action);
+		}
+
+		/// <summary>
+		/// Collapses all the child tree nodes.
+		/// </summary>
+		public void CollapseAll()
+		{
+			TreeGX tree=this.TreeControl;
+			if(tree!=null)
+				tree.BeginUpdate();
+			this.Collapse();
+			foreach(Node node in this.Nodes)
+				node.CollapseAll();
+			if(tree!=null)
+				tree.EndUpdate();
+		}
+
+		/// <summary>
+		/// Ends the editing of the node text or column.
+		/// </summary>
+		/// <param name="cancelChanges"><strong>true</strong> if the editing of the tree node label text was canceled without being saved; otherwise, <strong>false</strong>. </param>
+		public void EndEdit(bool cancelChanges)
+		{
+			if(!this.IsEditing)
+				return;
+			TreeGX tree=this.TreeControl;
+			if(tree==null)
+				return;
+			if(cancelChanges)
+				tree.CancelCellEdit(eTreeAction.Code);
+			else
+				tree.EndCellEditing(eTreeAction.Code);
+		}
+
+		/// <summary>
+		/// Ensures that the node is visible, expanding nodes and scrolling the control as necessary.
+		/// </summary>
+		public void EnsureVisible()
+		{
+			NodeOperations.EnsureVisible(this);
+		}
+
+		/// <summary>
+		/// Expands the node.
+		/// </summary>
+		/// <remarks>
+		/// The Expand method expands the current Node down to the next level of nodes.
+		/// The state of a Node is persisted. For example, if the next level of child nodes was not collapsed previously, when the Expand method is called, the child nodes appear in their previously expanded state.
+		/// </remarks>
+		public void Expand()
+		{
+			SetExpanded(true,eTreeAction.Code);
+		}
+		
+		/// <summary>
+		/// Expands the node.
+		/// </summary>
+		/// <remarks>
+		/// The Expand method expands the current Node down to the next level of nodes.
+		/// The state of a Node is persisted. For example, if the next level of child nodes was not collapsed previously, when the Expand method is called, the child nodes appear in their previously expanded state.
+		/// </remarks>
+		/// <param name="action">Action that caused the event.</param>
+		public void Expand(eTreeAction action)
+		{
+			SetExpanded(true,action);
+		}
+
+		/// <summary>
+		/// Expands all the child tree nodes.
+		/// </summary>
+		public void ExpandAll()
+		{
+			TreeGX tree=this.TreeControl;
+			if(tree!=null)
+				tree.BeginUpdate();
+			try
+			{
+				foreach(Node node in this.Nodes)
+				{
+					node.Expand();
+					node.ExpandAll();
+				}
+			}
+			finally
+			{
+				if(tree!=null)
+					tree.EndUpdate();
+			}
+		}
+
+		/// <summary>
+		/// Removes the current node from the control.
+		/// </summary>
+		/// <remarks>
+		/// When the Remove method is called, the node and any child nodes assigned to the Node are removed from the Tree. The removed child nodes are removed from the Tree, but are still attached to this node.
+		/// </remarks>
+		public void Remove()
+		{
+			if(this.Parent!=null)
+				this.Parent.Nodes.Remove(this);
+			else if(this.TreeControl!=null && this.TreeControl.Nodes.Contains(this))
+				this.TreeControl.Nodes.Remove(this);
+		}
+		
+		/// <summary>
+		/// Removes the current node from the control and provides information about source of action
+		/// </summary>
+		/// <remarks>
+		/// When the Remove method is called, the node and any child nodes assigned to the Node are removed from the Tree. The removed child nodes are removed from the Tree, but are still attached to this node.
+		/// </remarks>
+		public void Remove(eTreeAction source)
+		{
+			if(this.Parent!=null)
+				this.Parent.Nodes.Remove(this, source);
+			else if(this.TreeControl!=null && this.TreeControl.Nodes.Contains(this))
+				this.TreeControl.Nodes.Remove(this, source);
+		}
+
+		/// <summary>
+		/// Toggles the node to either the expanded or collapsed state.
+		/// </summary>
+		public void Toggle()
+		{
+			if(this.Expanded)
+				this.Collapse();
+			else
+				this.Expand();
+		}
+		
+		/// <summary>
+		/// Toggles the node to either the expanded or collapsed state.
+		/// </summary>
+		/// <param name="action">Action that caused the event.</param>
+		public void Toggle(eTreeAction action)
+		{
+			if(this.Expanded)
+				this.Collapse(action);
+			else
+				this.Expand(action);
+		}
+
+		/// <summary>Returns string representation of the Node.</summary>
+		public override string ToString()
+		{
+			return m_Text;
+		}
+		#endregion
+
+		#region Private Implementation
+		/// <summary>
+		/// Called after new cell has been added to Cells collection.
+		/// </summary>
+		/// <param name="cell">Reference to the new cell added.</param>
+		internal void OnCellInserted(Cell cell)
+		{
+			this.SizeChanged = true;
+			OnDisplayChanged();
+		}
+
+		/// <summary>
+		/// Called after cell has  been removed from Cells collection.
+		/// </summary>
+		/// <param name="cell">Reference to the removed cell.</param>
+		internal void OnCellRemoved(Cell cell)
+		{
+			this.SizeChanged = true;
+			OnDisplayChanged();
+		}
+
+		/// <summary>
+		/// Gets or sets the child column header height.
+		/// </summary>
+		internal int ColumnHeaderHeight
+		{
+			get {return m_ColumnHeaderHeight;}
+			set {m_ColumnHeaderHeight=value;}
+		}
+		
+		/// <summary>
+		/// Occurs when property on the node has changed that influences the size of the node.
+		/// </summary>
+		private void OnSizeChanged()
+		{
+			if(m_SizeChanged)
+			{
+				TreeGX tree = this.TreeControl;
+				if(tree!=null)
+					tree.SetPendingLayout();
+			}
+		}
+
+		/// <summary>
+		/// Occurs when any image property for the cell has changed.
+		/// </summary>
+		internal void OnImageChanged()
+		{
+			this.SizeChanged = true;
+			OnDisplayChanged();
+		}
+
+		/// <summary>
+		/// Occurs when size of the child nodes has changed.
+		/// </summary>
+		internal void OnChildNodesSizeChanged()
+		{
+			foreach(Node node in this.Nodes)
+			{
+				node.SizeChanged = true;
+				node.OnChildNodesSizeChanged();
+			}
+		}
+		private void OnColumnHeaderSizeChanged(object sender, EventArgs e)
+		{
+			if(this.Expanded)
+				this.SizeChanged = true;
+		}
+		private void SetExpanded(bool e, eTreeAction action)
+		{
+			if(e==m_Expanded)
+				return;
+
+			INodeNotify notification=GetINodeNotify();
+			if(notification!=null)
+			{
+				TreeGXNodeCancelEventArgs cancelArgs=new TreeGXNodeCancelEventArgs(action , this);
+				if(e)
+					notification.OnBeforeExpand(cancelArgs);
+				else
+					notification.OnBeforeCollapse(cancelArgs);
+				if(cancelArgs.Cancel)
+					return;				
+			}
+#if TRIAL
+			if(NodeOperations.ColorCountExp==0)
+				return;
+#endif
+			m_Expanded=e;
+			
+			if(notification!=null)
+				notification.ExpandedChanged(this);
+			
+			if(notification!=null)
+			{
+				TreeGXNodeEventArgs args=new TreeGXNodeEventArgs(action,this);
+				if(e)
+					notification.OnAfterExpand(args);
+				else
+					notification.OnAfterCollapse(args);
+			}
+			
+			foreach(Node node in this.Nodes)
+			{
+				node.OnParentExpandedChanged(m_Expanded);	
+			}
+		}
+		
+		internal void OnParentExpandedChanged(bool expanded)
+		{
+			foreach(Cell cell in this.Cells)
+				cell.OnParentExpandedChanged(expanded);
+			foreach(Node node in this.Nodes)
+			{
+				node.OnParentExpandedChanged(expanded);
+			}
+		}
+		
+		private TreeGX GetTreeControl()
+		{
+			Node node=this;
+			while(node.Parent!=null)
+				node=node.Parent;
+			return node.internalTreeControl;
+		}
+		private INodeNotify GetINodeNotify()
+		{
+			TreeGX tree=this.TreeControl;
+			if(tree!=null) return tree as INodeNotify;
+			return null;
+		}
+		private void ElementStyleChanged(object sender, EventArgs e)
+		{
+			this.SizeChanged=true;
+			this.OnDisplayChanged();
+		}
+		/// <summary>
+		/// Called when visual part of the node has changed due to the changes of its properties or properties of the cells contained by node.
+		/// </summary>
+		internal void OnDisplayChanged()
+		{
+			TreeGX tree = this.TreeControl;
+			if(tree!=null && !tree.SuspendPaint)
+			{
+				if(this.SizeChanged)
+					this.TreeControl.RecalcLayout();
+				this.TreeControl.Invalidate(true);
+			}
+		}
+
+		private void ConnectorAppearanceChanged(object sender, EventArgs e)
+		{
+			this.OnDisplayChanged();
+		}
+
+		/// <summary>
+		/// Called after new node has been addded to Nodes collection.
+		/// </summary>
+		/// <param name="node">Reference to the new node.</param>
+		internal void OnChildNodeInserted(Node node)
+		{
+			SizeChanged=true;
+		}
+
+		/// <summary>
+		/// Called after node has been removed from Nodes collection.
+		/// </summary>
+		/// <param name="node">Reference to the node that is removed.</param>
+		internal void OnChildNodeRemoved(Node node)
+		{
+			SizeChanged=true;
+			if(node.IsSelected)
+			{
+				if(this.TreeControl!=null)
+					this.TreeControl.SelectedNode=null;
+			}
+		}
+		
+		internal void OnVisibleChanged()
+		{
+			foreach (Cell cell in this.Cells)
+			{
+				cell.OnVisibleChanged();
+			}
+			
+			foreach(Node node in this.Nodes)
+			{
+				node.OnVisibleChanged();
+			}
+		}
+		#endregion
+
+		#region Event Invokation
+		protected internal virtual void InvokeNodeMouseDown(object sender, MouseEventArgs e)
+		{
+			if(NodeMouseDown!=null)
+				NodeMouseDown(this, e);
+			
+			foreach(Cell cell in m_Cells)
+			{
+				cell.InvokeNodeMouseDown(sender, e);
+			}
+		}
+		
+		protected internal virtual void InvokeNodeMouseUp(object sender, MouseEventArgs e)
+		{
+			if(NodeMouseUp!=null)
+				NodeMouseUp(this, e);
+			
+			foreach(Cell cell in m_Cells)
+			{
+				cell.InvokeNodeMouseUp(sender, e);
+			}
+		}
+		
+		protected internal virtual void InvokeNodeMouseMove(object sender, MouseEventArgs e)
+		{
+			if(NodeMouseMove!=null)
+				NodeMouseMove(this, e);
+			
+			foreach(Cell cell in m_Cells)
+			{
+				cell.InvokeNodeMouseMove(sender, e);
+			}
+		}
+		
+		protected internal virtual void InvokeNodeClick(object sender, EventArgs e)
+		{
+			if(NodeClick!=null)
+				NodeClick(this, e);
+			
+			foreach(Cell cell in m_Cells)
+			{
+				cell.InvokeNodeClick(sender, e);
+			}
+		}
+		
+		protected internal virtual void InvokeNodeDoubleClick(object sender, EventArgs e)
+		{
+			if(NodeDoubleClick!=null)
+				NodeDoubleClick(this, e);
+		}
+		
+		protected internal virtual void InvokeNodeMouseEnter(object sender, EventArgs e)
+		{
+			if(NodeMouseEnter!=null)
+				NodeMouseEnter(this, e);
+		}
+		
+		protected internal virtual void InvokeNodeMouseLeave(object sender, EventArgs e)
+		{
+			if(NodeMouseLeave!=null)
+				NodeMouseLeave(this, e);
+			
+			foreach(Cell cell in m_Cells)
+			{
+				cell.InvokeNodeMouseLeave(sender, e);
+			}
+		}
+		
+		protected internal virtual void InvokeNodeMouseHover(object sender, EventArgs e)
+		{
+			if(NodeMouseHover!=null)
+				NodeMouseHover(this, e);
+		}
+		
+		internal bool FireHoverEvent
+		{
+			get { return NodeMouseHover!=null; }
+		}
+		
+		protected internal virtual void InvokeMarkupLinkClick(Cell cell, MarkupLinkClickEventArgs args)
+		{
+			if(MarkupLinkClick!=null)
+				MarkupLinkClick(cell, args);
+			TreeGX tree = this.TreeControl;
+			if(tree!=null)
+				tree.InvokeMarkupLinkClick(cell, args);
+		}
+		#endregion
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/NodeCellLayout.cs b/PROMS/DotNetBar Source Code/TreeGX/NodeCellLayout.cs
new file mode 100644
index 00000000..ca71ba69
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/NodeCellLayout.cs	
@@ -0,0 +1,547 @@
+using System;
+using System.Drawing;
+
+namespace DevComponents.Tree
+{
+	/// <summary>
+	/// Represents class for Node's cell layout.
+	/// </summary>
+	internal class CellLayout
+	{
+		public CellLayout()
+		{
+		}
+
+		/// <summary>
+		/// Offset cell bounds, check box bounds, image bounds and text bounds by specified offset.
+		/// </summary>
+		/// <param name="cell">Cell to offset.</param>
+		/// <param name="x">Horizontal offset in pixels.</param>
+		/// <param name="y">Vertical offset in pixels.</param>
+		public void Offset(Cell cell, int x, int y)
+		{
+			cell.SetBounds(new Rectangle(cell.Bounds.X+x,cell.Bounds.Y+y,cell.Bounds.Width,cell.Bounds.Height));
+			if(!cell.CheckBoxBounds.IsEmpty)
+				cell.SetCheckBoxBounds(new Rectangle(cell.CheckBoxBounds.X+x,cell.CheckBoxBounds.Y+y,cell.CheckBoxBounds.Width,cell.CheckBoxBounds.Height));
+			if(!cell.ImageBounds.IsEmpty)
+				cell.SetImageBounds(new Rectangle(cell.ImageBounds.X+x,cell.ImageBounds.Y+y,cell.ImageBounds.Width,cell.ImageBounds.Height));
+			if(!cell.TextContentBounds.IsEmpty)
+				cell.TextContentBounds=new Rectangle(cell.TextContentBounds.X+x,cell.TextContentBounds.Y+y,cell.TextContentBounds.Width,cell.TextContentBounds.Height);
+		}
+
+		public void LayoutSingleCell(LayoutCellInfo info)
+		{
+			SizeF textSize=SizeF.Empty;
+			Font font=info.Font;
+			int height=0;
+			if(info.LayoutStyle.Font!=null)
+				font=info.LayoutStyle.Font;
+
+			info.ContextCell.OnLayoutCell();
+
+			if(info.ContextCell.HostedControl!=null)
+			{
+				if(info.CellWidth==0)
+					textSize=new SizeF(info.ContextCell.HostedControl.Width,info.ContextCell.HostedControl.Height);
+				else
+				{
+					int availTextWidth=info.CellWidth-
+						ElementStyleLayout.HorizontalStyleWhiteSpace(info.LayoutStyle);
+					textSize=new SizeF(availTextWidth,info.ContextCell.HostedControl.Height);
+				}
+			}
+			else
+			{
+				// Calculate Text Width and Height
+				if(info.CellWidth==0)
+				{
+					string text=info.ContextCell.Text;
+					if(text!="")
+						textSize=info.Graphics.MeasureString(text,font);
+				}
+				else
+				{
+					int availTextWidth=info.CellWidth-
+						ElementStyleLayout.HorizontalStyleWhiteSpace(info.LayoutStyle);
+
+					availTextWidth-=info.ContextCell.Images.LargestImageSize.Width;
+					if(info.ContextCell.CheckBoxVisible)
+						availTextWidth-=CheckBoxSize.Width;
+					int cellHeight=font.Height;
+
+					if(info.LayoutStyle.WordWrap)
+					{
+						cellHeight=info.LayoutStyle.MaximumHeight-info.LayoutStyle.MarginTop-
+							info.LayoutStyle.MarginBottom-info.LayoutStyle.PaddingTop-info.LayoutStyle.PaddingBottom;
+						if(availTextWidth>0)
+						{
+							if(cellHeight>0)
+								textSize=info.Graphics.MeasureString(info.ContextCell.Text,font,new SizeF(availTextWidth,cellHeight),info.LayoutStyle.StringFormat);
+							else
+								textSize=info.Graphics.MeasureString(info.ContextCell.Text,font,availTextWidth,info.LayoutStyle.StringFormat);
+						}
+						//info.ContextCell.WordWrap=true;
+					}
+					else
+						textSize=new SizeF(availTextWidth,cellHeight);
+				}
+			}
+
+			if(info.LayoutStyle.WordWrap)
+				info.ContextCell.WordWrap=true;
+			else
+                info.ContextCell.WordWrap=false;
+
+			height=(int)Math.Ceiling(textSize.Height);
+			if(info.VerticalPartAlignment)
+			{
+				if(info.ContextCell.Images.LargestImageSize.Height>0)
+					height+=info.ContextCell.Images.LargestImageSize.Height;
+				if(info.ContextCell.CheckBoxVisible)
+					height+=CheckBoxSize.Height;
+			}
+			else
+			{
+				if(info.ContextCell.Images.LargestImageSize.Height>height)
+					height=info.ContextCell.Images.LargestImageSize.Height;
+				if(info.ContextCell.CheckBoxVisible && CheckBoxSize.Height>height)
+					height=CheckBoxSize.Height;
+			}
+
+			Rectangle r=new Rectangle(info.Left+ElementStyleLayout.LeftWhiteSpace(info.LayoutStyle),
+				info.Top+ElementStyleLayout.TopWhiteSpace(info.LayoutStyle)
+				,info.CellWidth,height);
+
+			if(r.Width==0)
+			{
+				if(info.VerticalPartAlignment)
+				{
+					r.Width=(int)Math.Ceiling(textSize.Width);
+					if(info.ContextCell.Images.LargestImageSize.Width>r.Width)
+						r.Width=(info.ContextCell.Images.LargestImageSize.Width+this.ImageTextSpacing);
+					if(info.ContextCell.CheckBoxVisible && CheckBoxSize.Width>r.Width)
+						r.Width+=(CheckBoxSize.Width+this.ImageTextSpacing);
+				}
+				else
+				{
+					r.Width=(int)Math.Ceiling(textSize.Width);
+					if(info.ContextCell.Images.LargestImageSize.Width>0)
+						r.Width+=(info.ContextCell.Images.LargestImageSize.Width+this.ImageTextSpacing);
+					if(info.ContextCell.CheckBoxVisible)
+						r.Width+=(CheckBoxSize.Width+this.ImageTextSpacing);
+				}
+			}
+
+			// Now that we have cell bounds store them
+			Rectangle rCellBounds=new Rectangle(info.Left,info.Top,info.CellWidth,r.Height+info.LayoutStyle.MarginTop+info.LayoutStyle.MarginBottom+info.LayoutStyle.PaddingTop+info.LayoutStyle.PaddingBottom);
+			if(rCellBounds.Width==0)
+				rCellBounds.Width=r.Width+ElementStyleLayout.HorizontalStyleWhiteSpace(info.LayoutStyle);
+			info.ContextCell.SetBounds(rCellBounds);
+
+            // Set Position of the image
+			if(!info.ContextCell.Images.LargestImageSize.IsEmpty)
+			{
+				eVerticalAlign va=GetVerticalAlign(info.ContextCell.ImageAlignment);
+				eHorizontalAlign ha=GetHorizontalAlign(info.ContextCell.ImageAlignment,info.LeftToRight);
+				if(info.VerticalPartAlignment)
+					info.ContextCell.SetImageBounds(AlignContentVertical(info.ContextCell.Images.LargestImageSize, ref r, ha, va, this.ImageTextSpacing));
+				else
+					info.ContextCell.SetImageBounds(AlignContent(info.ContextCell.Images.LargestImageSize, ref r, ha, va, this.ImageTextSpacing));
+			}
+			else
+				info.ContextCell.SetImageBounds(Rectangle.Empty);
+
+			// Set position of the check box
+			if(info.ContextCell.CheckBoxVisible)
+			{
+				eVerticalAlign va=GetVerticalAlign(info.ContextCell.CheckBoxAlignment);
+				eHorizontalAlign ha=GetHorizontalAlign(info.ContextCell.CheckBoxAlignment,info.LeftToRight);
+				if(info.VerticalPartAlignment)
+					info.ContextCell.SetCheckBoxBounds(AlignContentVertical(this.CheckBoxSize, ref r, ha, va, this.ImageTextSpacing));
+				else
+					info.ContextCell.SetCheckBoxBounds(AlignContent(this.CheckBoxSize, ref r, ha, va, this.ImageTextSpacing));
+			}
+			else
+				info.ContextCell.SetCheckBoxBounds(Rectangle.Empty);
+			
+            // Set position of the text
+			//info.ContextCell.SetTextBounds(Rectangle.Empty);
+			if(!textSize.IsEmpty)
+				info.ContextCell.TextContentBounds=r;
+			else
+				info.ContextCell.TextContentBounds=Rectangle.Empty;
+            
+		}
+
+		private Rectangle AlignContent(System.Drawing.Size contentSize, ref Rectangle boundingRectangle, eHorizontalAlign horizAlign, eVerticalAlign vertAlign, int contentSpacing)
+		{
+			Rectangle contentRect=new Rectangle(Point.Empty,contentSize);
+			switch(horizAlign)
+			{
+				case eHorizontalAlign.Right:
+				{
+					contentRect.X=boundingRectangle.Right-contentRect.Width;
+					boundingRectangle.Width-=(contentRect.Width+contentSpacing);
+					break;
+				}
+				//case eHorizontalAlign.Left:
+				default:
+				{
+					contentRect.X=boundingRectangle.X;
+					boundingRectangle.X=contentRect.Right+contentSpacing;
+					boundingRectangle.Width-=(contentRect.Width+contentSpacing);
+					break;
+				}
+//				case eHorizontalAlign.Center:
+//				{
+//					contentRect.X=boundingRectangle.X+(boundingRectangle.Width-contentRect.Width)/2;
+//					break;
+//				}
+			}
+
+			switch(vertAlign)
+			{
+				case eVerticalAlign.Top:
+				{
+					contentRect.Y=boundingRectangle.Y;
+					break;
+				}
+				case eVerticalAlign.Middle:
+				{
+					contentRect.Y=boundingRectangle.Y+(boundingRectangle.Height-contentRect.Height)/2;
+					break;
+				}
+				case eVerticalAlign.Bottom:
+				{
+					contentRect.Y=boundingRectangle.Bottom-contentRect.Height;
+					break;
+				}
+			}
+
+			return contentRect;
+		}
+
+		private Rectangle AlignContentVertical(System.Drawing.Size contentSize, ref Rectangle boundingRectangle, eHorizontalAlign horizAlign, eVerticalAlign vertAlign, int contentSpacing)
+		{
+			Rectangle contentRect=new Rectangle(Point.Empty,contentSize);
+			switch(horizAlign)
+			{
+				case eHorizontalAlign.Left:
+				{
+					contentRect.X=boundingRectangle.X;
+					break;
+				}
+				case eHorizontalAlign.Right:
+				{
+					contentRect.X=boundingRectangle.Right-contentRect.Width;
+					break;
+				}
+				case eHorizontalAlign.Center:
+				{
+					contentRect.X=boundingRectangle.X+(boundingRectangle.Width-contentRect.Width)/2;
+					break;
+				}
+			}
+
+			switch(vertAlign)
+			{
+				case eVerticalAlign.Bottom:
+				{
+					contentRect.Y=boundingRectangle.Bottom-contentRect.Height;
+					boundingRectangle.Height-=(contentRect.Height+contentSpacing);
+					break;
+				}
+				//case eVerticalAlign.Top:
+				default:
+				{
+					contentRect.Y=boundingRectangle.Y;
+					boundingRectangle.Y=contentRect.Bottom+contentSpacing;
+					boundingRectangle.Height-=(contentRect.Height+contentSpacing);
+					break;
+				}
+//				case eVerticalAlign.Middle:
+//				{
+//					contentRect.Y=boundingRectangle.Y+(boundingRectangle.Height-contentRect.Height)/2;
+//					break;
+//				}
+			}
+
+			return contentRect;
+		}
+
+		private eHorizontalAlign GetHorizontalAlign(eCellPartAlignment align, bool leftToRight)
+		{
+			if(((align==eCellPartAlignment.NearBottom || align==eCellPartAlignment.NearCenter ||
+				align==eCellPartAlignment.NearTop) && leftToRight) ||
+				((align==eCellPartAlignment.FarBottom || align==eCellPartAlignment.FarCenter ||
+				align==eCellPartAlignment.FarTop) && !leftToRight))
+				return eHorizontalAlign.Left;
+			else if(align==eCellPartAlignment.CenterBottom || align==eCellPartAlignment.CenterTop)
+				return eHorizontalAlign.Center;
+			return eHorizontalAlign.Right;
+		}
+
+		private eVerticalAlign GetVerticalAlign(eCellPartAlignment align)
+		{
+			eVerticalAlign va=eVerticalAlign.Middle;
+
+			switch(align)
+			{
+				case eCellPartAlignment.FarBottom:
+				case eCellPartAlignment.NearBottom:
+				case eCellPartAlignment.CenterBottom:
+					va=eVerticalAlign.Bottom;
+					break;
+				case eCellPartAlignment.FarTop:
+				case eCellPartAlignment.NearTop:
+				case eCellPartAlignment.CenterTop:
+					va=eVerticalAlign.Top;
+					break;
+			}
+
+			return va;
+		}
+
+		private System.Drawing.Size CheckBoxSize
+		{
+			get
+			{
+				return new Size(12,12);
+			}
+		}
+
+		/// <summary>
+		/// Returns spacing between check box and image if both are displayed
+		/// </summary>
+		private int ImageCheckBoxSpacing
+		{
+			get {return 1;}
+		}
+
+		/// <summary>
+		/// Returns spacing between image or checkbox and text
+		/// </summary>
+		private int ImageTextSpacing
+		{
+			get {return 1;}
+		}
+
+		/// <summary>
+		/// Returns horizontal spacing between cells in a node
+		/// </summary>
+		public int CellHorizontalSpacing
+		{
+			get {return 1;}
+		}
+
+		/// <summary>
+		/// Returns vertical spacing between cells in a node
+		/// </summary>
+		public int CellVerticalSpacing
+		{
+			get {return 1;}
+		}
+
+		/// <summary>
+		/// Spacing between different parts of the cell, like image, option button, text and expand button area
+		/// </summary>
+		public int CellPartSpacing
+		{
+			get {return 1;}
+		}
+
+		public Size LayoutCells(NodeLayoutContextInfo layoutInfo, int x, int y)
+		{
+			eCellLayout layout=layoutInfo.CellLayout;
+			if(layoutInfo.ContextNode.CellLayout!=layoutInfo.CellLayout && layoutInfo.ContextNode.CellLayout!=eCellLayout.Default)
+				layout=layoutInfo.ContextNode.CellLayout;
+			if(layout==eCellLayout.Horizontal || layout==eCellLayout.Default)
+                return this.LayoutCellsHorizontal(layoutInfo,x,y);
+			else
+				return this.LayoutCellsVertical(layoutInfo,x,y);
+		}
+
+		private Size LayoutCellsHorizontal(NodeLayoutContextInfo layoutInfo, int x, int y)
+		{
+			Node node=layoutInfo.ContextNode;
+			int height=0, width=0;
+
+			for(int i=0;i<node.Cells.Count;i++)
+			{
+				Cell cell=node.Cells[i];
+
+				bool bCellVisible=true;
+
+				// Setup cell layout helper class
+				LayoutCellInfo cellLayout=this.GetLayoutCellInfo();
+				cellLayout.Top=y;
+				cellLayout.Left=x;
+				cellLayout.CellWidth=0;
+				cellLayout.ContextCell=cell;
+				cellLayout.Graphics=layoutInfo.Graphics;
+				cellLayout.LeftToRight=layoutInfo.LeftToRight;
+				cellLayout.Font=layoutInfo.DefaultFont;
+				if(cell.Layout!=eCellPartLayout.Default)
+					cellLayout.VerticalPartAlignment=(cell.Layout==eCellPartLayout.Vertical);
+				else if(layoutInfo.CellPartLayout!=eCellPartLayout.Default)
+					cellLayout.VerticalPartAlignment=(layoutInfo.CellPartLayout==eCellPartLayout.Vertical);
+
+				
+				if(layoutInfo.DefaultColumns.Count>0 || layoutInfo.ChildColumns!=null && layoutInfo.ChildColumns.Count>0)
+				{
+					ColumnInfo ci=null;
+					if(layoutInfo.ChildColumns!=null && layoutInfo.ChildColumns.Count>0)
+						ci=layoutInfo.ChildColumns[i] as ColumnInfo;
+					else
+						ci=layoutInfo.DefaultColumns[i] as ColumnInfo;
+					
+					bCellVisible=ci.Visible;
+					cellLayout.CellWidth=ci.Width;
+				}
+
+				// Prepare union style
+				if(cell.StyleNormal!=null)
+					cellLayout.LayoutStyle=cell.StyleNormal;
+				else
+					cellLayout.LayoutStyle=layoutInfo.DefaultCellStyle;
+
+				this.LayoutSingleCell(cellLayout);
+
+				if(bCellVisible)
+				{
+					x+=cell.Bounds.Width;
+					width+=cell.Bounds.Width;
+					if(cell.Bounds.Width>0)
+					{
+						x+=this.CellHorizontalSpacing;
+						width+=this.CellHorizontalSpacing;
+					}
+					if(cell.Bounds.Height>height)
+						height=cell.Bounds.Height;
+				}
+			}
+
+			// Take last added spacing off
+			x-=this.CellHorizontalSpacing;
+			width-=this.CellHorizontalSpacing;
+
+			return new Size(width,height);
+		}
+
+		private Size LayoutCellsVertical(NodeLayoutContextInfo layoutInfo, int x, int y)
+		{
+			Node node=layoutInfo.ContextNode;
+			int height=0, width=0;
+			eHorizontalAlign align=eHorizontalAlign.Center;
+			int iVisibleCells=0;
+
+			for(int i=0;i<node.Cells.Count;i++)
+			{
+				Cell cell=node.Cells[i];
+
+				bool bCellVisible=true;
+
+				// Setup cell layout helper class
+				LayoutCellInfo cellLayout=this.GetLayoutCellInfo();
+				cellLayout.Top=y;
+				cellLayout.Left=x;
+				cellLayout.CellWidth=0;
+				cellLayout.ContextCell=cell;
+				cellLayout.Graphics=layoutInfo.Graphics;
+				cellLayout.LeftToRight=layoutInfo.LeftToRight;
+				cellLayout.Font=layoutInfo.DefaultFont;
+				
+				if(layoutInfo.DefaultColumns.Count>0 || layoutInfo.ChildColumns!=null && layoutInfo.ChildColumns.Count>0)
+				{
+					ColumnInfo ci=null;
+					if(layoutInfo.ChildColumns!=null && layoutInfo.ChildColumns.Count>0)
+						ci=layoutInfo.ChildColumns[i] as ColumnInfo;
+					else
+						ci=layoutInfo.DefaultColumns[i] as ColumnInfo;
+					
+					bCellVisible=ci.Visible;
+					cellLayout.CellWidth=ci.Width;
+				}
+
+				// Prepare union style
+				if(cell.StyleNormal!=null)
+					cellLayout.LayoutStyle=cell.StyleNormal;
+				else
+					cellLayout.LayoutStyle=layoutInfo.DefaultCellStyle;
+
+				this.LayoutSingleCell(cellLayout);
+
+				cell.SetVisible(bCellVisible);
+				if(bCellVisible)
+				{
+					iVisibleCells++;
+					y+=cell.Bounds.Height;
+					height+=cell.Bounds.Height;
+					if(cell.Bounds.Height>0)
+					{
+						y+=this.CellVerticalSpacing;
+						height+=this.CellVerticalSpacing;
+					}
+					if(cell.Bounds.Width>width)
+						width=cell.Bounds.Width;
+				}
+			}
+
+			// Take last added spacing off
+			y-=this.CellVerticalSpacing;
+			height-=this.CellVerticalSpacing;
+
+			// Additional pass needed if horizontal alignment is other than left and there is more than one cell visible
+			if(align!=eHorizontalAlign.Left && iVisibleCells>1)
+			{
+				foreach(Cell cell in node.Cells)
+				{
+					if(!cell.IsVisible)
+						continue;
+					if(align==eHorizontalAlign.Center)
+						this.Offset(cell,(width-cell.Bounds.Width)/2,0);
+					else // Right aligned cells
+						this.Offset(cell,width-cell.Bounds.Width,0);
+				}
+			}
+
+			return new Size(width,height);
+		}
+
+		private LayoutCellInfo m_LayoutCellInfo=null;
+		private LayoutCellInfo GetLayoutCellInfo()
+		{
+			if(m_LayoutCellInfo==null)
+				m_LayoutCellInfo=new LayoutCellInfo();
+			return m_LayoutCellInfo;
+		}
+	}
+
+	internal class LayoutCellInfo
+	{
+		public Cell ContextCell=null;
+		public int CellWidth=0;
+		public System.Drawing.Graphics Graphics=null;
+		public System.Drawing.Font Font=null;
+		public int Left=0;
+		public int Top=0;
+		public ElementStyle LayoutStyle=null;
+		public bool LeftToRight=true;
+		public bool VerticalPartAlignment=false;
+
+		public LayoutCellInfo()
+		{
+		}
+	}
+
+	internal class ColumnInfo
+	{
+		public bool Visible;
+		public int Width;
+		public ColumnInfo(int width, bool visible)
+		{
+			this.Width=width;
+			this.Visible=visible;
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/NodeCollection.cs b/PROMS/DotNetBar Source Code/TreeGX/NodeCollection.cs
new file mode 100644
index 00000000..5c2f7620
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/NodeCollection.cs	
@@ -0,0 +1,300 @@
+using System;
+using System.Collections;
+using System.ComponentModel;
+
+namespace DevComponents.Tree
+{
+	/// <summary>
+	/// Represents collection for Node objects.
+	/// </summary>
+	public class NodeCollection:CollectionBase 
+	{
+		#region Private Variables
+		private Node m_ParentNode=null;
+		private TreeGX m_TreeControl=null;
+		private eTreeAction m_SourceAction=eTreeAction.Code;
+		#endregion
+
+		#region Internal Implementation
+		public NodeCollection()
+		{
+		}
+		/// <summary>
+		/// Gets or sets the node this collection is associated with.
+		/// </summary>
+		[Browsable(false),DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public Node ParentNode
+		{
+			get {return m_ParentNode;}
+		}
+		/// <summary>
+		/// Sets the node collection belongs to.
+		/// </summary>
+		/// <param name="parent">Node that is parent of this collection.</param>
+		internal void SetParentNode(Node parent)
+		{
+			m_ParentNode=parent;
+		}
+
+		internal TreeGX TreeControl
+		{
+			get {return m_TreeControl;}
+			set {m_TreeControl=value;}
+		}
+
+		/// <summary>
+		/// Adds new object to the collection.
+		/// </summary>
+		/// <param name="node">Object to add.</param>
+		/// <returns>Index of newly added object.</returns>
+		public int Add(Node node)
+		{
+			return List.Add(node);
+		}
+		
+		/// <summary>
+		/// Adds new object to the collection and provides information about the source of the command
+		/// </summary>
+		/// <param name="node">Node to add</param>
+		/// <param name="action">Source action</param>
+		/// <returns></returns>
+		public int Add(Node node, eTreeAction action)
+		{
+			m_SourceAction = action;
+			return List.Add(node);
+		}
+		
+		/// <summary>
+		/// Adds an array of objects to the collection. 
+		/// </summary>
+		/// <param name="nodes">Array of Node objects.</param>
+		public void AddRange(Node[] nodes)
+		{
+			foreach(Node node in nodes)
+				List.Add(node);
+		}
+		
+		/// <summary>
+		/// Returns reference to the object in collection based on it's index.
+		/// </summary>
+		public Node this[int index]
+		{
+			get {return (Node)(List[index]);}
+			set {List[index] = value;}
+		}
+
+		/// <summary>
+		/// Inserts new object into the collection.
+		/// </summary>
+		/// <param name="index">Position of the object.</param>
+		/// <param name="value">Object to insert.</param>
+		public void Insert(int index, Node value) 
+		{
+			List.Insert(index, value);
+		}
+		
+		/// <summary>
+		/// Inserts new object into the collection.
+		/// </summary>
+		/// <param name="index">Position of the object.</param>
+		/// <param name="value">Object to insert.</param>
+		/// <param name="action">Action that is causing the event</param>
+		public void Insert(int index, Node value, eTreeAction action) 
+		{
+			m_SourceAction = action;
+			List.Insert(index, value);
+		}
+
+		/// <summary>
+		/// Returns index of the object inside of the collection.
+		/// </summary>
+		/// <param name="value">Reference to the object.</param>
+		/// <returns>Index of the object.</returns>
+		public int IndexOf(Node value) 
+		{
+			return List.IndexOf(value);
+		}
+
+		/// <summary>
+		/// Returns whether collection contains specified object.
+		/// </summary>
+		/// <param name="value">Object to look for.</param>
+		/// <returns>true if object is part of the collection, otherwise false.</returns>
+		public bool Contains(Node value) 
+		{
+			return List.Contains(value);
+		}
+
+		/// <summary>
+		/// Removes specified object from the collection.
+		/// </summary>
+		/// <param name="value"></param>
+		public void Remove(Node value) 
+		{
+			List.Remove(value);
+		}
+		
+		/// <summary>
+		/// Removes specified object from the collection and provides information about source of the command
+		/// </summary>
+		/// <param name="node">Node to remove</param>
+		/// <param name="action">Source action</param>
+		public void Remove(Node node, eTreeAction action)
+		{
+			m_SourceAction = action;
+			List.Remove(node);
+		}
+		
+		protected override void OnRemove(int index, object value)
+		{
+			TreeGX tree = GetTreeControl();
+			if(tree!=null)
+				tree.InvokeBeforeNodeRemove(m_SourceAction, value as Node, m_ParentNode);
+			base.OnRemove (index, value);
+		}
+
+
+		protected override void OnRemoveComplete(int index,object value)
+		{
+			base.OnRemoveComplete(index,value);
+			Node node=value as Node;
+			node.SetParent(null);
+			node.internalTreeControl=null;
+			if(m_ParentNode!=null) m_ParentNode.OnChildNodeRemoved(node);
+			
+			TreeGX tree = GetTreeControl();
+			if(tree!=null)
+			{
+				tree.InvokeAfterNodeRemove(m_SourceAction, value as Node, m_ParentNode);
+				tree.NodeRemoved(m_SourceAction, value as Node, m_ParentNode, index);
+			}
+		}
+		
+		protected override void OnInsert(int index, object value)
+		{
+			TreeGX tree = GetTreeControl();
+			if(tree!=null)
+				tree.InvokeBeforeNodeInsert(m_SourceAction, value as Node, m_ParentNode);
+			base.OnInsert (index, value);
+		}
+
+		protected override void OnInsertComplete(int index,object value)
+		{
+			base.OnInsertComplete(index,value);
+			Node node=value as Node;
+			if(m_ParentNode!=null)
+			{
+				if(node.Parent!=null && node.Parent!=m_ParentNode)
+					node.Remove();
+				node.SetParent(m_ParentNode);
+			}
+			node.internalTreeControl=m_TreeControl;
+			
+			if(m_ParentNode!=null) m_ParentNode.OnChildNodeInserted(node);
+			
+			TreeGX tree = GetTreeControl();
+			if(tree!=null)
+				tree.InvokeAfterNodeInsert(m_SourceAction, value as Node, m_ParentNode);
+			
+			m_SourceAction = eTreeAction.Code;
+		}
+
+		/// <summary>
+		/// Copies collection into the specified array.
+		/// </summary>
+		/// <param name="array">Array to copy collection to.</param>
+		/// <param name="index">Starting index.</param>
+		public void CopyTo(Node[] array, int index) 
+		{
+			List.CopyTo(array, index);
+		}
+
+		/// <summary>
+		/// Copies contained items to the Node array.
+		/// </summary>
+		/// <param name="array">Array to copy to.</param>
+		internal void CopyTo(Node[] array)
+		{
+			List.CopyTo(array,0);
+		}
+
+		protected override void OnClear()
+		{
+			foreach(Node node in this.List)
+			{
+				node.SetParent(null);
+				node.internalTreeControl=null;
+			}
+			
+			base.OnClear();
+		}
+
+        protected override void OnClearComplete()
+        {
+            if (m_TreeControl != null && !PassiveCollection)
+            {
+                m_TreeControl.OnNodesCleared();
+            }
+            else if (m_ParentNode != null && !PassiveCollection)
+                m_ParentNode.OnNodesCleared();
+
+            TreeGX tree = GetTreeControl();
+            if (tree != null)
+            {
+                tree.ValidateSelectedNode();
+            }
+
+            base.OnClearComplete();
+        }
+		
+		private TreeGX GetTreeControl()
+		{
+			if(m_TreeControl!=null)
+				return m_TreeControl;
+			if(m_ParentNode!=null)
+				return m_ParentNode.TreeControl;
+			return null;
+		}
+
+        private bool _PassiveCollection = false;
+        internal bool PassiveCollection
+        {
+            get { return _PassiveCollection; }
+            set
+            {
+                _PassiveCollection = value;
+            }
+        }
+		#endregion
+	}
+
+	#region NodeCollectionEditor
+	/// <summary>
+	/// Support for Node tabs design-time editor.
+	/// </summary>
+	public class NodeCollectionEditor:System.ComponentModel.Design.CollectionEditor
+	{
+		public NodeCollectionEditor(Type type):base(type)
+		{
+		}
+		protected override Type CreateCollectionItemType()
+		{
+			return typeof(Node);
+		}
+		protected override Type[] CreateNewItemTypes()
+		{
+			return new Type[] {typeof(Node)};
+		}
+		protected override object CreateInstance(Type itemType)
+		{
+			object item=base.CreateInstance(itemType);
+			if(item is Node)
+			{
+				Node node=item as Node;
+				node.Text=node.Name;
+			}
+			return item;
+		}
+	}
+	#endregion
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/NodeConnector.cs b/PROMS/DotNetBar Source Code/TreeGX/NodeConnector.cs
new file mode 100644
index 00000000..4ed0ea3b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/NodeConnector.cs	
@@ -0,0 +1,203 @@
+using System;
+using System.Drawing;
+using System.ComponentModel;
+
+namespace DevComponents.Tree
+{
+	/// <summary>
+	/// Represents node connector. Node connector is the line that is drawn to indicate connection between child and parent node.
+	/// </summary>
+	[ToolboxItem(false),System.ComponentModel.DesignTimeVisible(false),TypeConverter(typeof(System.ComponentModel.ExpandableObjectConverter))]
+	public class NodeConnector:Component
+	{
+		#region Private Variables
+		private int m_LineWidth=1;
+		private Color m_LineColor=SystemColors.Highlight;
+		private eNodeConnectorType m_ConnectorType=eNodeConnectorType.Curve;
+		private bool m_UnderlineNoBorderNode=true;
+		private eConnectorCap m_EndCap=eConnectorCap.Ellipse;
+		//private eConnectorCap m_StartCap=eConnectorCap.None;
+		private Size m_EndCapSize=new Size(5,5);
+		//private Size m_StartCapSize=new Size(5,5);
+		#endregion
+
+		#region Events
+		/// <summary>
+		/// Occurs when appearance of the connector has changed as result of changed settings on the connector.
+		/// </summary>
+		public event EventHandler AppearanceChanged;
+		#endregion
+
+		#region Public Interface
+		/// <summary>
+		/// Default Constructor.
+		/// </summary>
+		public NodeConnector()
+		{
+		}
+
+		/// <summary>
+		/// Creates new instance of the object with specified parameters.
+		/// </summary>
+		/// <param name="lineWidth">Connector line width.</param>
+		/// <param name="type">Connector type.</param>
+		public NodeConnector(int lineWidth, eNodeConnectorType type)
+		{
+			this.LineWidth=lineWidth;
+			this.ConnectorType=type;
+		}
+
+		/// <summary>
+		/// Gets or sets the connector line width.
+		/// </summary>
+		[Browsable(true),DefaultValue(1),Category("Appearance"),Description("Indicates connector line width.")]
+		public int LineWidth
+		{
+			get {return m_LineWidth;}
+			set 
+			{
+				m_LineWidth=value;
+				OnAppearanceChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the color of the connector line.
+		/// </summary>
+		[Browsable(true),Category("Appearance"),Description("Indicates color of the connector line.")]
+		public Color LineColor
+		{
+			get {return m_LineColor;}
+			set
+			{
+				m_LineColor=value;
+				OnAppearanceChanged();
+			}
+		}
+
+		/// <summary>
+		/// Returns true if editor should serialize LineColor property.
+		/// </summary>
+		[Browsable(false),EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeLineColor()
+		{
+			return m_LineColor!=SystemColors.Highlight;
+		}
+
+		/// <summary>
+		/// Gets or sets the type of the connector.
+		/// </summary>
+		/// <remarks>
+		/// See <see cref="eNodeConnectorType">eNodeConnectorType</see> enum for list of
+		/// available connectors.
+		/// </remarks>
+		/// <seealso cref="eNodeConnectorType">eNodeConnectorType Enumeration</seealso>
+		[Browsable(true),DefaultValue(eNodeConnectorType.Curve),Category("Appearance"),Description("Indicates visual type of the connector.")]
+		public eNodeConnectorType ConnectorType
+		{
+			get {return m_ConnectorType;}
+			set 
+			{
+				m_ConnectorType=value;
+				OnAppearanceChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets whether the child node without borders is underlined as a
+		/// continuation of the connector from node's parent. Default value is true.
+		/// </summary>
+		/// <remarks>
+		/// To enhance visual appearance of the connectors that are connecting to the node
+		/// with no borders assigned the connector is continued as a single line under the node
+		/// when this property is set to true (default) value.
+		/// </remarks>
+		[Browsable(true),DefaultValue(true),Category("Behavior"),Description("Indicates whether connector is drawn under the nodes with no borders assigned.")]
+		public bool UnderlineNoBorderNode
+		{
+			get {return m_UnderlineNoBorderNode;}
+			set
+			{
+				m_UnderlineNoBorderNode=value;
+				OnAppearanceChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the type of the cap that connector is ended with. Note that connector starts with parent node and ends with the child node. Default value is Ellipse.
+		/// </summary>
+		[Browsable(true),DefaultValue(eConnectorCap.Ellipse),Category("Appearance"),Description("Indicates type of the cap that connector is ended with.")]
+		public eConnectorCap EndCap
+		{
+			get {return m_EndCap;}
+			set
+			{
+				m_EndCap=value;
+				OnAppearanceChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the size of the end cap.
+		/// </summary>
+		[Browsable(true),Category("Appearance"),Description("Indicates the size of the end cap.")]
+		public System.Drawing.Size EndCapSize
+		{
+			get {return m_EndCapSize;}
+			set
+			{
+				m_EndCapSize=value;
+				OnAppearanceChanged();
+			}
+		}
+
+		/// <summary>
+		/// Returns true if EndCapSize property should be serialized by editor.
+		/// </summary>
+		/// <returns></returns>
+		[Browsable(false),EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeEndCapSize()
+		{
+			return (m_EndCapSize.Width!=5 || m_EndCapSize.Height!=5);
+		}
+		#endregion
+
+		#region Private Implementation
+		private void OnAppearanceChanged()
+		{
+			if(AppearanceChanged!=null)
+				AppearanceChanged(this,new EventArgs());
+		}
+		#endregion
+
+//		/// <summary>
+//		/// Gets or sets the type of the cap that connector is started with. Note that connector starts with parent node and ends with the child node.  Default value is None.
+//		/// </summary>
+//		[Browsable(true),DefaultValue(eConnectorCap.None),Category("Appearance"),Description("Indicates type of the cap that connector is starts with.")]
+//		public eConnectorCap StartCap
+//		{
+//			get {return m_StartCap;}
+//			set {m_StartCap=value;}
+//		}
+//
+//		/// <summary>
+//		/// Gets or sets the size of the start cap.
+//		/// </summary>
+//		[Browsable(true),Category("Appearance"),Description("Indicates the size of the start cap.")]
+//		public System.Drawing.Size StartCapSize
+//		{
+//			get {return m_StartCapSize;}
+//			set {m_StartCapSize=value;}
+//		}
+//
+//		/// <summary>
+//		/// Returns true if StartCapSize property should be serialized by editor.
+//		/// </summary>
+//		/// <returns></returns>
+//		[Browsable(false),EditorBrowsable(EditorBrowsableState.Never)]
+//		public bool ShouldSerializeStartCapSize()
+//		{
+//			return (m_StartCapSize.Width!=5 || m_StartCapSize.Height!=5);
+//		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/NodeConnectorTypeEditor.cs b/PROMS/DotNetBar Source Code/TreeGX/NodeConnectorTypeEditor.cs
new file mode 100644
index 00000000..83d48b65
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/NodeConnectorTypeEditor.cs	
@@ -0,0 +1,86 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Design;
+using System.Windows.Forms.Design;
+using System.Windows.Forms;
+using System.ComponentModel.Design;
+
+namespace DevComponents.Tree
+{
+	/// <summary>
+	/// Represents type editor for NodeConnector used for Windows Forms design-time support.
+	/// </summary>
+	public class NodeConnectorTypeEditor:System.Drawing.Design.UITypeEditor
+	{
+		#region Private Variables
+		private IWindowsFormsEditorService m_EditorService = null;
+		private const string OPTION_CREATE="Create new connector";
+		private const string OPTION_REMOVE="Remove connector";
+		#endregion
+
+		#region Internal Implementation
+		public override object EditValue(ITypeDescriptorContext context, IServiceProvider provider, object value) 
+		{
+			if (context != null
+				&& context.Instance != null
+				&& provider != null) 
+			{				
+				NodeConnector conn=value as NodeConnector;
+				
+				m_EditorService = provider.GetService(typeof(IWindowsFormsEditorService)) as IWindowsFormsEditorService;
+								
+				if(m_EditorService!=null)
+				{
+					ListBox lb=new ListBox();
+					lb.SelectedIndexChanged+=new EventHandler(this.SelectedChanged);
+					if(conn==null)
+						lb.Items.Add(OPTION_CREATE);
+					else
+						lb.Items.Add(OPTION_REMOVE);
+
+					m_EditorService.DropDownControl(lb);
+					
+					IDesignerHost dh=(IDesignerHost)provider.GetService(typeof(IDesignerHost));
+					if(lb.SelectedItem!=null && dh!=null)
+					{
+						if(lb.SelectedItem.ToString()==OPTION_CREATE)
+						{
+							NodeConnector nd=dh.CreateComponent(typeof(NodeConnector)) as NodeConnector;
+							nd.LineWidth = 5;
+							value = nd;
+						}
+						else if(lb.SelectedItem.ToString()==OPTION_REMOVE)
+						{
+							value=null;
+							dh.DestroyComponent(conn);
+						}
+					}
+				}
+			}
+
+			return value;
+		}
+
+		private void SelectedChanged(object sender, EventArgs e)
+		{
+			if(m_EditorService!=null)
+				m_EditorService.CloseDropDown();
+		}
+
+		/// <summary>
+		/// Gets the editor style used by the EditValue method.
+		/// </summary>
+		/// <param name="context">An ITypeDescriptorContext that can be used to gain additional context information.</param>
+		/// <returns>A UITypeEditorEditStyle value that indicates the style of editor used by EditValue. If the UITypeEditor does not support this method, then GetEditStyle will return None</returns>
+		public override UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext context) 
+		{
+			if (context != null && context.Instance != null) 
+			{
+				return UITypeEditorEditStyle.DropDown;
+			}
+			return base.GetEditStyle(context);
+		}
+		#endregion
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/NodeDesigner.cs b/PROMS/DotNetBar Source Code/TreeGX/NodeDesigner.cs
new file mode 100644
index 00000000..35bc1e5d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/NodeDesigner.cs	
@@ -0,0 +1,116 @@
+using System;
+using System.ComponentModel;
+using System.ComponentModel.Design;
+
+namespace DevComponents.Tree
+{
+	/// <summary>
+	/// Represents Windows Forms designer for Node object.
+	/// </summary>
+	public class NodeDesigner:ComponentDesigner
+	{
+		/// <summary>
+		/// Creates news instance of the class.
+		/// </summary>
+		public NodeDesigner()
+		{
+		}
+		
+		public override void Initialize(IComponent component) 
+		{
+			base.Initialize(component);
+			if(!component.Site.DesignMode)
+				return;
+
+			ISelectionService ss =(ISelectionService)GetService(typeof(ISelectionService));
+			if(ss!=null)
+				ss.SelectionChanged+=new EventHandler(OnSelectionChanged);
+		}
+		private void OnSelectionChanged(object sender, EventArgs e) 
+		{
+			ISelectionService ss = (ISelectionService)sender;
+			if(ss.PrimarySelection!=this.Component)
+			{
+				Node node = this.Component as Node;
+				if(ss.PrimarySelection is Node)
+				{
+					Node selected=ss.PrimarySelection as Node;
+					
+					if(selected.TreeControl!=node.TreeControl)
+					{
+						node.TreeControl.SelectedNode = null;
+					}
+				}
+				else
+                    node.TreeControl.SelectedNode=null;
+			}
+		}
+
+		public override DesignerVerbCollection Verbs 
+		{
+			get 
+			{
+				DesignerVerb[] verbs = new DesignerVerb[]
+					{
+						new DesignerVerb("Create Child Node", new EventHandler(CreateNode))
+				};
+				return new DesignerVerbCollection(verbs);
+			}
+		}
+
+		private void CreateNode(object sender, EventArgs e)
+		{
+			CreateNode(this.Component as Node);
+		}
+		
+		private Node CreateNode(Node parentNode)
+		{
+			IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+			if(dh==null)
+				return null;
+            
+			Node node=null;
+			TreeGX tree=((Node)this.Component).TreeControl;
+			tree.BeginUpdate();
+			try
+			{
+				IComponentChangeService change=this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+				if(change!=null)
+				{
+					if(parentNode!=null)
+						change.OnComponentChanging(this.Component,TypeDescriptor.GetProperties(parentNode).Find("Nodes",true));
+					else
+						change.OnComponentChanging(this.Component,TypeDescriptor.GetProperties(tree).Find("Nodes",true));
+				}
+
+				node=dh.CreateComponent(typeof(Node)) as Node;
+				if(node!=null)
+				{
+					node.Text=node.Name;
+					node.Expanded = true;
+					if(parentNode==null)
+						tree.Nodes.Add(node);
+					else
+					{
+						parentNode.Nodes.Add(node);
+						parentNode.Expand();
+					}
+					
+					if(change!=null)
+					{
+						if(parentNode!=null)
+							change.OnComponentChanged(this.Component,TypeDescriptor.GetProperties(parentNode).Find("Nodes",true),null,null);
+						else
+							change.OnComponentChanged(this.Component,TypeDescriptor.GetProperties(tree).Find("Nodes",true),null,null);
+					}
+				}
+			}
+			finally
+			{
+				tree.EndUpdate();
+			}
+
+			return node;
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/NodeLayoutContextInfo.cs b/PROMS/DotNetBar Source Code/TreeGX/NodeLayoutContextInfo.cs
new file mode 100644
index 00000000..af4b4574
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/NodeLayoutContextInfo.cs	
@@ -0,0 +1,30 @@
+using System;
+using System.Drawing;
+using System.Collections;
+
+namespace DevComponents.Tree
+{
+	/// <summary>
+	/// Used to pass node contextual information used for layout of the node.
+	/// </summary>
+	internal class NodeLayoutContextInfo
+	{
+		public Node ContextNode=null;
+		public Rectangle ClientRectangle=Rectangle.Empty;
+		public int Left;
+		public int Top;
+		public ArrayList DefaultColumns=null;
+		public ArrayList ChildColumns=null;
+		public Font DefaultFont=null;
+		public ElementStyle DefaultCellStyle=null;
+		public ElementStyle DefaultNodeStyle=null;
+		public Size DefaultHeaderSize=Size.Empty;
+		public bool LeftToRight=true;
+		public bool HasExpandPart=true;
+		public System.Drawing.Graphics Graphics=null;
+		public ElementStyleCollection Styles=null;
+		public eCellLayout CellLayout=eCellLayout.Horizontal;
+		public eCellPartLayout CellPartLayout=eCellPartLayout.Horizontal;
+		public bool MapPositionNear=false;
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/NodeOperations.cs b/PROMS/DotNetBar Source Code/TreeGX/NodeOperations.cs
new file mode 100644
index 00000000..99e55228
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/NodeOperations.cs	
@@ -0,0 +1,831 @@
+using System;
+using System.Drawing;
+using System.Text;
+using DevComponents.Tree.Display;
+
+namespace DevComponents.Tree
+{
+	/// <summary>
+	/// Represents node operations.
+	/// </summary>
+	internal class NodeOperations
+	{
+		/// <summary>
+		/// Returns full path to the given node.
+		/// </summary>
+		/// <param name="node">Node to return path to.</param>
+		/// <returns>Full path to the node.</returns>
+		public static string GetFullPath(Node node,string pathSeparator)
+		{
+			if(node==null)
+				throw new ArgumentNullException("node");
+			
+			StringBuilder sb=new StringBuilder(node.Text);
+			node=node.Parent;
+			while(node!=null)
+			{
+				sb.Insert(0,pathSeparator+node.Text);
+				node=node.Parent;
+			}
+
+			return sb.ToString();
+		}
+
+		/// <summary>
+		/// Gets the last child tree node. The LastNode is the last child Node in the NodeCollection stored in the Nodes property of the current tree node. If the Node has no child tree node, the LastNode property returns a null reference (Nothing in Visual Basic).
+		/// </summary>
+		/// <param name="node">Reference node.</param>
+		/// <returns>Last node if found or null if there is no last node.</returns>
+		public static Node GetLastNode(Node node)
+		{
+			if(node.Nodes.Count>0)
+			{
+				return node.Nodes[node.Nodes.Count-1];
+			}
+			return null;
+		}
+
+		/// <summary>
+		/// Gets the next sibling tree node. The NextNode is the next sibling Node in the NodeCollection stored in the Nodes property of the tree node's parent Node. If there is no next tree node, the NextNode property returns a null reference (Nothing in Visual Basic).
+		/// </summary>
+		/// <param name="node">Reference node.</param>
+		/// <returns>Node object or null if node cannot be found.</returns>
+		public static Node GetNextNode(Node node)
+		{
+            if (node == null)
+                return null;
+            NodeCollection parentNodes = null;
+            if (node.Parent != null)
+                parentNodes = node.Parent.Nodes;
+            else if (node.internalTreeControl != null)
+                parentNodes = node.internalTreeControl.Nodes;
+
+            if (parentNodes != null)
+            {
+                int index = parentNodes.IndexOf(node);
+                if (index < parentNodes.Count - 1)
+                    return parentNodes[index + 1];
+            }
+
+            return null;
+		}
+		
+		/// <summary>
+		/// Returns next visible sibling tree node.
+		/// </summary>
+		/// <param name="node">Reference node</param>
+		/// <returns>Node object or null if next visible node cannot be found</returns>
+		public static Node GetNextVisibleSibling(Node node)
+		{
+			if(node==null)
+				return null;
+			Node ret = GetNextNode(node);
+			while(ret!=null && !ret.Visible)
+				ret = GetNextNode(ret);
+			return ret;
+		}
+
+        /// <summary>
+        /// Gets the next visible tree node. The NextVisibleNode can be a child, sibling, or a tree node from another branch. If there is no next tree node, the NextVisibleNode property returns a null reference (Nothing in Visual Basic).
+        /// </summary>
+        /// <param name="node">Reference node.</param>
+        /// <returns>Node object or null if node cannot be found.</returns>
+        public static Node GetAnyNextNode(Node node)
+        {
+            Node nextNode = null;
+
+            // Walk into the child nodes
+            if (node.Nodes.Count > 0)
+            {
+                return node.Nodes[0];
+            }
+
+            // Get next sibling
+            nextNode = GetNextNode(node);
+
+            // Walk-up...
+            if (nextNode == null)
+            {
+                while (nextNode == null && node != null)
+                {
+                    node = node.Parent;
+                    nextNode = GetNextNode(node);
+                }
+            }
+
+            return nextNode;
+        }
+
+		/// <summary>
+		/// Gets the next visible tree node. The NextVisibleNode can be a child, sibling, or a tree node from another branch. If there is no next tree node, the NextVisibleNode property returns a null reference (Nothing in Visual Basic).
+		/// </summary>
+		/// <param name="node">Reference node.</param>
+		/// <returns>Node object or null if node cannot be found.</returns>
+		public static Node GetNextVisibleNode(Node node)
+		{
+            Node nextVisibleNode = null;
+
+            // First see whether all parent nodes are expanded and if not find the first one that is
+            Node parent = node.Parent;
+            Node lastNotExpanded = null;
+            while (parent != null)
+            {
+                if (!parent.Expanded)
+                    lastNotExpanded = parent;
+                parent = parent.Parent;
+            }
+            if (lastNotExpanded != null)
+            {
+                // Last parent node expanded
+                if (lastNotExpanded.Parent != null)
+                    lastNotExpanded = lastNotExpanded.Parent;
+                while (lastNotExpanded != null)
+                {
+                    lastNotExpanded = GetNextNode(lastNotExpanded);
+                    if (lastNotExpanded != null && lastNotExpanded.Visible) return lastNotExpanded;
+                }
+            }
+
+            // Walk into the child nodes
+            if (node.Expanded && node.Nodes.Count > 0)
+            {
+                foreach (Node n in node.Nodes)
+                {
+                    if (n.Visible) return n;
+                }
+                //return null;
+            }
+
+            // Get next sibling
+            nextVisibleNode = GetAnyNextNode(node);
+            while (nextVisibleNode != null)
+            {
+                if (nextVisibleNode.Visible && nextVisibleNode.IsVisible)
+                    return nextVisibleNode;
+                nextVisibleNode = GetAnyNextNode(nextVisibleNode);
+            }
+
+            // Walk-up...
+            //while (nextVisibleNode == null && node != null)
+            //{
+            //    node = node.Parent;
+            //    nextVisibleNode = GetAnyNextNode(node);
+            //    if (nextVisibleNode != null && !nextVisibleNode.Visible)
+            //        nextVisibleNode = null;
+            //}
+            return nextVisibleNode;
+		}
+
+		/// <summary>
+		/// Gets a value indicating whether the tree node is visible. Node is considered to be visible when it's Visible property is set to true and path to the node is available i.e. all parent nodes are expanded.
+		/// </summary>
+		/// <param name="node"></param>
+		/// <returns></returns>
+		public static bool GetIsNodeVisible(Node node)
+		{
+			if(!node.Visible)
+				return false;
+
+			Node n=node;
+			while(n.Parent!=null)
+			{
+				n=n.Parent;
+				if(!n.Expanded || !n.Visible)
+					return false;
+			}
+			return true;
+		}
+
+		/// <summary>
+		/// Returns whether node is displayed on the screen and visible to the user. When node is outside of the viewable area this property will return false. It will also return false if node is not visible.
+		/// </summary>
+		/// <param name="node"></param>
+		/// <returns></returns>
+		public static bool GetIsNodeDisplayed(Node node)
+		{
+			if(!node.Visible || !GetIsNodeVisible(node))
+				return false;
+			TreeGX tree=node.TreeControl;
+			if(tree!=null)
+			{
+                if (tree.Zoom == 1)
+                {
+                    Rectangle r = NodeDisplay.GetNodeRectangle(eNodeRectanglePart.NodeBounds, node, tree.NodeDisplay.Offset);
+                    return tree.ClientRectangle.IntersectsWith(r);
+                }
+                else
+                {
+                    Rectangle r = NodeDisplay.GetNodeRectangle(eNodeRectanglePart.NodeBounds, node, tree.NodeDisplay.Offset);
+                    Rectangle clientRect = tree.GetLayoutRectangle(tree.ClientRectangle);
+                    return clientRect.IntersectsWith(r);
+                }
+			}
+			return false;
+		}
+
+        /// <summary>
+        /// Returns last rendered node on screen.
+        /// </summary>
+        /// <param name="tree">Tree control.</param>
+        /// <returns>Last rendered node or null</returns>
+        public static Node GetLastDisplayedNode(TreeGX tree)
+        {
+            Rectangle r = tree.ClientRectangle;
+            Node node = tree.SelectedNode;
+            if (node == null) node = GetFirstVisibleNode(tree);
+            Point scrollPos = Point.Empty;
+            if (tree.AutoScroll)
+                scrollPos = tree.GetAutoScrollPositionOffset();
+
+            // Find last fully rendered node
+            Node lastNode = null;
+            if (r.Contains(node.Bounds))
+                lastNode = node;
+            while (node != null)
+            {
+                node = NodeOperations.GetNextVisibleNode(node);
+                if (node != null && node.Selectable)
+                {
+                    Rectangle nodeRect = NodeDisplay.GetNodeRectangle(eNodeRectanglePart.NodeContentBounds, node, scrollPos);
+                    if (r.Contains(nodeRect))
+                        lastNode = node;
+                    else if (nodeRect.Y > r.Bottom)
+                        break;
+                }
+            }
+
+            return lastNode;
+        }
+
+		/// <summary>
+		/// Gets the zero based index of position of the tree node in the tree node collection. -1 is returned if node is not added to the nodes collection.
+		/// </summary>
+		/// <param name="node">Reference node.</param>
+		/// <returns>Zero based index or -1 if node is not in collection.</returns>
+		public static int GetNodeIndex(Node node)
+		{
+			if(node.Parent==null)
+				return -1;
+			return node.Parent.Nodes.IndexOf(node);
+		}
+
+        /// <summary>
+        /// Gets the previous sibling tree node. The PrevNode is the previous sibling Node in the NodeCollection stored in the Nodes property of the tree node's parent Node. If there is no previous tree node, the PrevNode property returns a null reference (Nothing in Visual Basic).
+        /// </summary>
+        /// <param name="node">Reference node.</param>
+        /// <returns>Node object or null if node cannot be found.</returns>
+        public static Node GetPreviousNode(Node node)
+        {
+            if (node == null)
+                return null;
+            NodeCollection parentNodes = null;
+            if (node.Parent != null)
+                parentNodes = node.Parent.Nodes;
+            else if (node.internalTreeControl != null)
+                parentNodes = node.internalTreeControl.Nodes;
+
+            if (parentNodes != null)
+            {
+                int index = parentNodes.IndexOf(node);
+                if (index > 0)
+                    return parentNodes[index - 1];
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Gets the previous tree node. The Previous Node can be a child, sibling, or a tree node from another branch. If there is no previous tree node, the PrevNode property returns a null reference (Nothing in Visual Basic).
+        /// </summary>
+        /// <param name="node">Reference node.</param>
+        /// <returns>Node object or null if node cannot be found.</returns>
+        public static Node GetAnyPreviousNode(Node node)
+        {
+            Node prevNode = null;
+
+            Node referenceNode = node;
+
+            // Walk into the previous node parent
+            if (referenceNode.Parent != null)
+            {
+                if (referenceNode.Parent.Nodes.IndexOf(referenceNode) > 0)
+                {
+                    prevNode = GetPreviousNode(referenceNode);
+                }
+                else
+                {
+                    return referenceNode.Parent;
+                }
+            }
+            else if (referenceNode.TreeControl != null)
+                prevNode = GetPreviousNode(referenceNode);
+            else
+                return null;
+
+            if (prevNode == null)
+                return null;
+
+            // Walk into the node
+            while (prevNode.Nodes.Count > 0)
+            {
+                prevNode = prevNode.Nodes[prevNode.Nodes.Count - 1];
+            }
+
+            return prevNode;
+        }
+
+		/// <summary>
+		/// Gets the previous visible tree node. The PrevVisibleNode can be a child, sibling, or a tree node from another branch. If there is no previous tree node, the PrevVisibleNode property returns a null reference (Nothing in Visual Basic).
+		/// </summary>
+		/// <param name="node">Reference node.</param>
+		/// <returns>Node object or null if node cannot be found.</returns>
+		public static Node GetPreviousVisibleNode(Node node)
+		{
+            Node prevVisibleNode = null;
+
+            // First see whether all parent nodes are expanded and if not find the first one that is
+            Node referenceNode = node.Parent;
+            Node lastNotExpanded = null;
+            while (referenceNode != null)
+            {
+                if (!referenceNode.Expanded)
+                    lastNotExpanded = referenceNode;
+                referenceNode = referenceNode.Parent;
+            }
+            if (lastNotExpanded != null)
+            {
+                if (lastNotExpanded.IsVisible) return lastNotExpanded;
+                referenceNode = lastNotExpanded;
+            }
+            else
+                referenceNode = node;
+
+            // Walk into the previous node parent
+            if (referenceNode.Parent != null)
+            {
+                if (referenceNode.Parent.Nodes.IndexOf(referenceNode) > 0)
+                {
+                    prevVisibleNode = GetAnyPreviousNode(referenceNode);
+                    while (prevVisibleNode != null)
+                    {
+                        if (prevVisibleNode.IsVisible) break;
+                        prevVisibleNode = GetAnyPreviousNode(prevVisibleNode);
+                    }
+                    if (prevVisibleNode != null) return prevVisibleNode;
+                }
+                else
+                {
+                    while (referenceNode.Parent != null)
+                    {
+                        if (referenceNode.Parent.IsVisible)
+                            return referenceNode.Parent;
+                        referenceNode = referenceNode.Parent;
+                    }
+                    if (referenceNode.TreeControl != null)
+                        prevVisibleNode = GetAnyPreviousNode(referenceNode);
+                }
+            }
+            else if (referenceNode.TreeControl != null)
+            {
+                prevVisibleNode = GetPreviousNode(referenceNode);
+                if (prevVisibleNode != null && (!prevVisibleNode.Visible || !prevVisibleNode.Selectable))
+                {
+                    while (prevVisibleNode != null && !(prevVisibleNode.Visible || prevVisibleNode.Selectable))
+                        prevVisibleNode = GetPreviousNode(prevVisibleNode);
+                }
+            }
+            else
+                return null;
+
+            if (prevVisibleNode == null)
+                return null;
+
+            // Walk into the node
+            while (prevVisibleNode.Expanded && prevVisibleNode.Nodes.Count > 0)
+            {
+                prevVisibleNode = prevVisibleNode.Nodes[prevVisibleNode.Nodes.Count - 1];
+            }
+
+            return prevVisibleNode;
+		}
+
+		/// <summary>
+		/// Returns true if node passed is considered root node for display purposes.
+		/// </summary>
+		/// <param name="tree">Reference to the tree control.</param>
+		/// <param name="node">Node to test.</param>
+		/// <returns>true if node is root node for display purposes otherwise false.</returns>
+		public static bool IsRootNode(TreeGX tree, Node node)
+		{
+			if(node.Parent==null || node==tree.DisplayRootNode)
+				return true;
+			return false;
+		}
+
+		/// <summary>
+		/// Ensures that the node is visible, expanding nodes and scrolling the control as necessary.
+		/// </summary>
+		/// <param name="reference">Node to be made visible.</param>
+		public static void EnsureVisible(Node reference)
+		{
+			// First expand all parents
+			TreeGX tree=reference.TreeControl;
+			if(tree!=null)
+				tree.SuspendPaint=true;
+			try
+			{
+				Node node=reference;
+				bool layout=false;
+				while(node.Parent!=null)
+				{
+					if(!node.Parent.Expanded)
+					{
+						node.Parent.Expand();
+						layout=true;
+					}
+					node=node.Parent;
+				}
+
+				if(layout)
+					tree.RecalcLayoutInternal();
+
+				Rectangle r=NodeDisplay.GetNodeRectangle(eNodeRectanglePart.NodeBounds,reference,tree.NodeDisplay.Offset);
+				if(tree!=null && tree.AutoScroll)
+				{	
+					if(tree.Zoom!=1)
+					{
+						r = tree.GetScreenRectangle(r);
+					}
+					r.Offset(-tree.AutoScrollPosition.X,-tree.AutoScrollPosition.Y);
+
+                    Rectangle treeClientRectangle = tree.GetInnerRectangle();
+					if(!treeClientRectangle.Contains(r))
+					{
+						Point p=Point.Empty;
+						if(r.Right>treeClientRectangle.Right)
+							p.X=r.Right-treeClientRectangle.Right;
+						else if(r.X<treeClientRectangle.X)
+							p.X=r.X;
+						if(r.Bottom>treeClientRectangle.Bottom)
+                            p.Y = r.Y - r.Height;
+						else if(r.Y<treeClientRectangle.Y)
+							p.Y=r.Y;
+						// Scroll it to show the node
+						tree.AutoScrollPosition=p;
+					}
+				}
+			}
+			finally
+			{
+				if(tree!=null)
+					tree.SuspendPaint=false;
+			}
+		}
+
+		/// <summary>
+		/// Returns number of visible child nodes for given node.
+		/// </summary>
+		/// <param name="node">Reference node.</param>
+		/// <returns>Number of visible child nodes.</returns>
+		public static int GetVisibleNodesCount(Node node)
+		{
+			if(node.Nodes.Count==0)
+				return 0;
+			int count=0;
+			foreach(Node n in node.Nodes)
+			{
+				if(n.Visible)
+					count++;
+			}
+			return count;
+		}
+
+        /// <summary>
+        /// Gets first visible node.
+        /// </summary>
+        /// <param name="tree">Reference to tree.</param>
+        /// <returns>Last visible node found or null</returns>
+        public static Node GetFirstVisibleNode(TreeGX tree)
+        {
+            if (tree.Nodes.Count == 0) return null;
+
+            Node node = tree.DisplayRootNode == null ? tree.Nodes[0] : tree.DisplayRootNode;
+            if (node.Visible)
+                return node;
+            return GetNextVisibleNode(node);
+        }
+
+		/// <summary>
+		/// Returns true if node has at least single visible child node.
+		/// </summary>
+		/// <param name="node">Reference node.</param>
+		/// <returns>True if at least single child node is visible otherwise false.</returns>
+		public static bool GetAnyVisibleNodes(Node node)
+		{
+			if(node.Nodes.Count==0)
+				return false;
+			foreach(Node n in node.Nodes)
+			{
+				if(n.Visible)
+					return true;
+			}
+			return false;
+		}
+		
+		/// <summary>
+		/// Retrieves the tree node that is at the specified location.
+		/// </summary>
+		/// <returns>The Node at the specified point, in tree view coordinates.</returns>
+		/// <remarks>
+		/// 	<para>You can pass the MouseEventArgs.X and MouseEventArgs.Y coordinates of the
+		///     MouseDown event as the x and y parameters.</para>
+		/// </remarks>
+		/// <param name="p">The Point to evaluate and retrieve the node from.</param>
+		/// <param name="tree">Tree control to find node at.</param>
+		public static Node GetNodeAt(TreeGX tree, Point p)
+		{
+			return GetNodeAt(tree,p.X,p.Y);
+		}
+
+		/// <summary>
+		/// Retrieves the tree node that is at the specified location.
+		/// </summary>
+		/// <returns>The TreeNode at the specified location, in tree view coordinates.</returns>
+		/// <remarks>
+		/// 	<para>You can pass the MouseEventArgs.X and MouseEventArgs.Y coordinates of the
+		///     MouseDown event as the x and y parameters.</para>
+		/// </remarks>
+		/// <param name="x">The X position to evaluate and retrieve the node from.</param>
+		/// <param name="y">The Y position to evaluate and retrieve the node from.</param>
+		/// <param name="tree">Tree control to find node at.</param>
+		public static Node GetNodeAt(TreeGX tree, int x, int y)
+		{
+            if (tree.Nodes.Count == 0 || !tree.DisplayRectangle.Contains(x, y) && tree.Zoom == 1)
+                return null;
+
+			Node node=tree.Nodes[0];
+			Node retNode=null;
+			if(tree.DisplayRootNode!=null)
+				node=tree.DisplayRootNode;
+			while(node!=null)
+			{
+				Rectangle r=NodeDisplay.GetNodeRectangle(eNodeRectanglePart.NodeBounds,node,tree.NodeDisplay.Offset);
+				if(r.Contains(x,y))
+				{
+					retNode=node;
+					break;
+				}
+				r=NodeDisplay.GetNodeRectangle(eNodeRectanglePart.ChildNodeBounds,node,tree.NodeDisplay.Offset);
+				if(!r.Contains(x,y))
+					node = GetNextVisibleSibling(node);
+				else
+					node=node.NextVisibleNode;
+			}
+
+			return retNode;
+		}
+		
+		public static TreeAreaInfo GetTreeAreaInfo(TreeGX tree, int x, int y)
+		{
+			TreeAreaInfo areaInfo=new TreeAreaInfo();
+
+            if (tree.Nodes.Count == 0 || !tree.DisplayRectangle.Contains(x, y) && tree.Zoom == 1)
+				return null;
+
+			Node node=tree.Nodes[0];
+			if(tree.DisplayRootNode!=null)
+				node = tree.DisplayRootNode;
+			
+			Node dragNode = tree.GetDragNode();
+			Rectangle dragNodeBounds=NodeDisplay.GetNodeRectangle(eNodeRectanglePart.NodeBounds,dragNode,tree.NodeDisplay.Offset);
+			if(dragNodeBounds.Contains(x,y))
+			{
+				areaInfo.NodeAt=dragNode;
+				return areaInfo;
+			}
+
+			int dragNodeWidth = dragNode.BoundsRelative.Width;
+			Node previousNode = null;
+			Rectangle previousRect=Rectangle.Empty;
+			
+			if(tree.DisplayRootNode!=null)
+				node=tree.DisplayRootNode;
+			while(node!=null)
+			{
+				if(!node.IsDisplayed)
+				{
+					node = node.NextVisibleNode;
+					continue;
+				}
+				Rectangle r=NodeDisplay.GetNodeRectangle(eNodeRectanglePart.NodeBounds,node,tree.NodeDisplay.Offset);
+				if(r.Contains(x,y))
+				{
+					areaInfo.NodeAt = node;
+					break;
+				}
+				
+				if(previousNode!=null && node.Parent==previousNode.Parent)
+				{
+					Rectangle totalArea;
+					if(r.Width<dragNodeWidth || previousRect.Width<dragNodeWidth)
+					{
+						totalArea =
+							Rectangle.Union(new Rectangle(r.Location, new Size(dragNodeWidth, r.Height)),
+							                new Rectangle(previousRect.Location, new Size(dragNodeWidth, previousRect.Height)));
+					}
+					else
+						totalArea=Rectangle.Union(r,previousRect);
+					if(totalArea.Contains(x,y))
+					{
+						Rectangle r1 = r;
+						Rectangle r2 = previousRect;
+						if(totalArea.Width>r1.Width) r1.Width = totalArea.Width;
+						if(totalArea.Width>r2.Width) r2.Width = totalArea.Width;
+						if(!r1.Contains(x,y) && !r2.Contains(x,y))
+						{
+							areaInfo.PreviousNode = previousNode;
+							areaInfo.NextNode = node;
+							areaInfo.NodeAt = null;
+							areaInfo.ParentAreaNode = node.Parent;
+							break;
+						}
+					}
+				}
+				
+				previousNode = node;
+				previousRect = r;
+				
+                //r=NodeDisplay.GetNodeRectangle(eNodeRectanglePart.ChildNodeBounds,node,tree.NodeDisplay.Offset);
+
+                //if (!r.Contains(x, y))
+                //    node = GetNextVisibleSibling(node);
+                //else
+				node = node.NextVisibleNode;
+			}
+			return areaInfo;
+		}
+		
+		/// <summary>
+		/// Gets the count of visible child nodes (Visible=true) for given node.
+		/// </summary>
+		/// <param name="parent">Reference to Node object.</param>
+		/// <returns>Number of visible nodes.</returns>
+		public static int GetVisibleChildNodesCount(Node parent)
+		{
+			int count = 0;
+			foreach(Node node in parent.Nodes)
+			{
+				if(node.Visible)
+					count++;
+			}
+			return count;
+		}
+		
+		/// <summary>
+		/// Gets the first visible child node or returns null if node cannot be found.
+		/// </summary>
+		/// <param name="parent">Reference to Node object.</param>
+		/// <returns>First visible node or null if node cannot be found.</returns>
+		public static Node GetFirstVisibleChildNode(Node parent)
+		{
+			foreach(Node node in parent.Nodes)
+			{
+				if(node.Visible)
+					return node;
+			}
+			return null;
+		}
+		
+		#region Licensing
+#if !TRIAL
+		internal static bool keyValidated=false;
+		internal static int keyValidated2=0;
+		internal static bool ValidateLicenseKey(string key)
+		{
+			bool ret = false;
+			string[] parts = key.Split('-');
+			int i = 10;
+			foreach(string s in parts)
+			{
+				if(s=="88405280")
+					i++;
+				else if(s=="D06E")
+					i += 10;
+				else if(s=="4617")
+					i += 8;
+				else if(s=="8810")
+					i += 12;
+				else if(s=="64462F60FA93")
+					i += 3;
+			}
+			if(i==29)
+				return true;
+			keyValidated = true;
+			return ret;
+		}
+		
+		internal static bool CheckLicenseKey(string key)
+		{
+			// {EB364C34-3CE3-4cd6-BB1B-13513ABE0D62}, 114
+			string[] parts = key.Split('-');
+			int test = 0;
+			for(int i=parts.Length-1;i>=0;i--)
+			{
+				if(parts[i]=="3CE3")
+					test += 12;
+				else if(parts[i]=="13513ABE0D62")
+					test += 2;
+				else if(parts[i]=="4cd6")
+					test += 3;
+				else if(parts[i]=="BB1B")
+					test += 7;
+				else if(parts[i]=="EB364C34")
+					test += 13;
+			}
+
+			keyValidated2 = test + 77;
+
+			if(test==23)
+				return false;
+			
+			return true;
+		}
+#endif
+		
+#if TRIAL
+		private static Color m_ColorExpFlag=Color.Empty;
+		internal static int ColorCountExp=0;
+		internal static bool ColorExpAlt()
+		{
+			Color clr=SystemColors.Control;
+			Color clr2;
+			Color clr3;
+			clr2=clr;
+			if(clr2.ToArgb()==clr.ToArgb())
+			{
+				clr3=clr2;
+			}
+			else
+			{
+				clr3=clr;
+			}
+
+			ColorCountExp=clr.A;
+
+			if(!m_ColorExpFlag.IsEmpty)
+			{
+				return (m_ColorExpFlag==Color.Black?false:true);
+			}
+			try
+			{
+				Microsoft.Win32.RegistryKey key=Microsoft.Win32.Registry.ClassesRoot;
+				key=key.CreateSubKey("CLSID\\{EB84498D-DBDA-4806-A10C-B668BD4F1BB1}\\InprocServer32");
+			
+				try
+				{
+					if(key.GetValue("")==null || key.GetValue("").ToString()=="")
+					{
+						key.SetValue("",DateTime.Today.ToOADate().ToString());
+					}
+					else
+					{
+						if(key.GetValue("").ToString()=="windows3.dll")
+						{
+							m_ColorExpFlag=Color.White;
+							key.Close();
+							key=null;
+							return true;
+						}
+						DateTime date=DateTime.FromOADate(double.Parse(key.GetValue("").ToString()));
+						if(((TimeSpan)DateTime.Today.Subtract(date)).TotalDays>30)
+						{
+							m_ColorExpFlag=Color.White;
+							key.SetValue("","windows3.dll");
+							key.Close();
+							key=null;
+							return true;
+						}
+						if(((TimeSpan)DateTime.Today.Subtract(date)).TotalDays<0)
+						{
+							m_ColorExpFlag=Color.White;
+							key.SetValue("","windows2.dll");
+							key.Close();
+							key=null;
+							return true;
+						}
+					}
+				}
+				finally
+				{
+					if(key!=null)
+						key.Close();
+				}
+			}
+			catch{}
+			m_ColorExpFlag=Color.Black;
+			return false;
+		}
+#endif
+		#endregion
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/NodeStyles.cs b/PROMS/DotNetBar Source Code/TreeGX/NodeStyles.cs
new file mode 100644
index 00000000..1baef63c
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/NodeStyles.cs	
@@ -0,0 +1,462 @@
+using System;
+using System.ComponentModel;
+using System.Drawing;
+
+namespace DevComponents.Tree
+{
+	/// <summary>
+	/// Class that provides predefined styles for the nodes. Styles are defined as static memeber of the class
+	/// </summary>
+	public class NodeStyles
+	{
+		private static ElementStyle s_AppleStyle=null;
+		private static ElementStyle s_BlueStyle=null;
+		private static ElementStyle s_BlueLightStyle=null;
+		private static ElementStyle s_BlueNightStyle=null;
+		private static ElementStyle s_BlueMistStyle=null;
+		private static ElementStyle s_CyanStyle=null;
+		private static ElementStyle s_GreenStyle=null;
+		private static ElementStyle s_LemonStyle=null;
+		private static ElementStyle s_MagentaStyle=null;
+		private static ElementStyle s_OrangeStyle=null;
+		private static ElementStyle s_OrangeLightStyle=null;
+		private static ElementStyle s_PurpleStyle=null;
+		private static ElementStyle s_PurpleMistStyle=null;
+		private static ElementStyle s_RedStyle=null;
+		private static ElementStyle s_SilverStyle=null;
+		private static ElementStyle s_SilverMistStyle=null;
+		private static ElementStyle s_TanStyle=null;
+		private static ElementStyle s_TealStyle=null;
+		private static ElementStyle s_YellowStyle=null;
+		private static ElementStyle s_GrayStyle=null;
+		
+		/// <summary>
+		/// Returns Apple element style
+		/// </summary>
+		public static ElementStyle Apple
+		{
+			get
+			{
+				if(s_AppleStyle==null)
+					s_AppleStyle = GetStyle(ePredefinedElementStyle.Apple);
+				return s_AppleStyle;
+			}	
+		}
+		
+		/// <summary>
+		/// Returns Blue element style
+		/// </summary>
+		public static ElementStyle Blue
+		{
+			get
+			{
+				if(s_BlueStyle==null)
+					s_BlueStyle= GetStyle(ePredefinedElementStyle.Blue);
+				return s_BlueStyle;
+			}	
+		}
+		
+		/// <summary>
+		/// Returns BlueLight element style
+		/// </summary>
+		public static ElementStyle BlueLight
+		{
+			get
+			{
+				if(s_BlueLightStyle==null)
+					s_BlueLightStyle= GetStyle(ePredefinedElementStyle.BlueLight);
+				return s_BlueLightStyle;
+			}	
+		}
+		
+		/// <summary>
+		/// Returns BlueNight element style
+		/// </summary>
+		public static ElementStyle BlueNight
+		{
+			get
+			{
+				if(s_BlueNightStyle==null)
+					s_BlueNightStyle= GetStyle(ePredefinedElementStyle.BlueNight);
+				return s_BlueNightStyle;
+			}	
+		}
+		
+		/// <summary>
+		/// Returns BlueMist element style
+		/// </summary>
+		public static ElementStyle BlueMist
+		{
+			get
+			{
+				if(s_BlueMistStyle==null)
+					s_BlueMistStyle= GetStyle(ePredefinedElementStyle.BlueMist);
+				return s_BlueMistStyle;
+			}	
+		}
+		
+		/// <summary>
+		/// Returns Cyan element style
+		/// </summary>
+		public static ElementStyle Cyan
+		{
+			get
+			{
+				if(s_CyanStyle==null)
+					s_CyanStyle= GetStyle(ePredefinedElementStyle.Cyan);
+				return s_CyanStyle;
+			}	
+		}
+		
+		/// <summary>
+		/// Returns Green element style
+		/// </summary>
+		public static ElementStyle Green
+		{
+			get
+			{
+				if(s_GreenStyle==null)
+					s_GreenStyle= GetStyle(ePredefinedElementStyle.Green);
+				return s_GreenStyle;
+			}	
+		}
+		
+		/// <summary>
+		/// Returns Lemon element style
+		/// </summary>
+		public static ElementStyle Lemon
+		{
+			get
+			{
+				if(s_LemonStyle==null)
+					s_LemonStyle= GetStyle(ePredefinedElementStyle.Lemon);
+				return s_LemonStyle;
+			}	
+		}
+		
+		/// <summary>
+		/// Returns Magenta element style
+		/// </summary>
+		public static ElementStyle Magenta
+		{
+			get
+			{
+				if(s_MagentaStyle==null)
+					s_MagentaStyle= GetStyle(ePredefinedElementStyle.Magenta);
+				return s_MagentaStyle;
+			}	
+		}
+		
+		/// <summary>
+		/// Returns Orange element style
+		/// </summary>
+		public static ElementStyle Orange
+		{
+			get
+			{
+				if(s_OrangeStyle==null)
+					s_OrangeStyle= GetStyle(ePredefinedElementStyle.Orange);
+				return s_OrangeStyle;
+			}	
+		}
+		
+		/// <summary>
+		/// Returns OrangeLight element style
+		/// </summary>
+		public static ElementStyle OrangeLight
+		{
+			get
+			{
+				if(s_OrangeLightStyle==null)
+					s_OrangeLightStyle= GetStyle(ePredefinedElementStyle.OrangeLight);
+				return s_OrangeLightStyle;
+			}	
+		}
+		
+		/// <summary>
+		/// Returns Purple element style
+		/// </summary>
+		public static ElementStyle Purple
+		{
+			get
+			{
+				if(s_PurpleStyle==null)
+					s_PurpleStyle= GetStyle(ePredefinedElementStyle.Purple);
+				return s_PurpleStyle;
+			}	
+		}
+		
+		/// <summary>
+		/// Returns PurpleMist element style
+		/// </summary>
+		public static ElementStyle PurpleMist
+		{
+			get
+			{
+				if(s_PurpleMistStyle==null)
+					s_PurpleMistStyle= GetStyle(ePredefinedElementStyle.PurpleMist);
+				return s_PurpleMistStyle;
+			}	
+		}
+		
+		/// <summary>
+		/// Returns Red element style
+		/// </summary>
+		public static ElementStyle Red
+		{
+			get
+			{
+				if(s_RedStyle==null)
+					s_RedStyle= GetStyle(ePredefinedElementStyle.Red);
+				return s_RedStyle;
+			}	
+		}
+		
+		/// <summary>
+		/// Returns Silver element style
+		/// </summary>
+		public static ElementStyle Silver
+		{
+			get
+			{
+				if(s_SilverStyle==null)
+					s_SilverStyle= GetStyle(ePredefinedElementStyle.Silver);
+				return s_SilverStyle;
+			}	
+		}
+		
+		/// <summary>
+		/// Returns SilverMist element style
+		/// </summary>
+		public static ElementStyle SilverMist
+		{
+			get
+			{
+				if(s_SilverMistStyle==null)
+					s_SilverMistStyle= GetStyle(ePredefinedElementStyle.SilverMist);
+				return s_SilverMistStyle;
+			}	
+		}
+		
+		/// <summary>
+		/// Returns Tan element style
+		/// </summary>
+		public static ElementStyle Tan
+		{
+			get
+			{
+				if(s_TanStyle==null)
+					s_TanStyle= GetStyle(ePredefinedElementStyle.Tan);
+				return s_TanStyle;
+			}	
+		}
+		
+		/// <summary>
+		/// Returns Teal element style
+		/// </summary>
+		public static ElementStyle Teal
+		{
+			get
+			{
+				if(s_TealStyle==null)
+					s_TealStyle= GetStyle(ePredefinedElementStyle.Teal);
+				return s_TealStyle;
+			}	
+		}
+		
+		/// <summary>
+		/// Returns Yellow element style
+		/// </summary>
+		public static ElementStyle Yellow
+		{
+			get
+			{
+				if(s_YellowStyle==null)
+					s_YellowStyle= GetStyle(ePredefinedElementStyle.Yellow);
+				return s_YellowStyle;
+			}	
+		}
+		
+		/// <summary>
+		/// Returns Gray element style
+		/// </summary>
+		public static ElementStyle Gray
+		{
+			get
+			{
+				if(s_GrayStyle==null)
+					s_GrayStyle= GetStyle(ePredefinedElementStyle.Gray);
+				return s_GrayStyle;
+			}	
+		}
+		
+		private static ElementStyle GetStyle(ePredefinedElementStyle c)
+		{
+			Color color1=Color.Empty;
+			Color color2=Color.Empty;
+			int gradientAngle = 90;
+			Color textColor=Color.Black;
+			Color borderColor = Color.DarkGray;
+			
+			switch (c)
+			
+			{
+				case ePredefinedElementStyle.Apple:
+				{
+					color1 = Color.FromArgb(232, 248, 224);
+					color2 = Color.FromArgb(173, 231, 146);
+					break;
+				}
+				case ePredefinedElementStyle.Blue:
+				{
+					color1 = Color.FromArgb(221, 230, 247);
+					color2 = Color.FromArgb(138, 168, 228);
+					break;
+				}
+				case ePredefinedElementStyle.BlueLight:
+				{
+					color1=Color.FromArgb(255,255,255);
+					color2=Color.FromArgb(210,224,252);
+					textColor=Color.FromArgb(69,84,115);
+					break;
+				}
+				case ePredefinedElementStyle.BlueMist:
+				{
+					color1 = Color.FromArgb(227, 236, 243);
+					color2 = Color.FromArgb(155, 187, 210);
+					break;
+				}
+				case ePredefinedElementStyle.BlueNight:
+				{
+					color1=Color.FromArgb(77,108,152);
+					color2=Color.Navy;
+					textColor=Color.White;
+					borderColor=Color.Navy;
+					break;
+				}
+				case ePredefinedElementStyle.Cyan:
+				{
+					color1 = Color.FromArgb(227, 236, 243);
+					color2 = Color.FromArgb(155, 187, 210);
+					break;
+				}
+				case ePredefinedElementStyle.Green:
+				{
+					color1 = Color.FromArgb(234, 240, 226);
+					color2 = Color.FromArgb(183, 201, 151);
+					break;
+				}
+				case ePredefinedElementStyle.Lemon:
+				{
+					color1 = Color.FromArgb(252, 253, 215);
+					color2 = Color.FromArgb(245, 249, 111);
+					break;
+				}
+				case ePredefinedElementStyle.Magenta:
+				{
+					color1 = Color.FromArgb(243, 229, 236);
+					color2 = Color.FromArgb(213, 164, 187);
+					break;
+				}
+				case ePredefinedElementStyle.Orange:
+				{
+					color1 = Color.FromArgb(252, 233, 217);
+					color2 = Color.FromArgb(246, 176, 120);
+					break;
+				}
+				case ePredefinedElementStyle.OrangeLight:
+				{
+					color1=Color.FromArgb(255,239,201);
+					color2=Color.FromArgb(242,210,132);
+					textColor=Color.FromArgb(117,83,2);
+					break;
+				}
+				case ePredefinedElementStyle.Purple:
+				{
+					color1 = Color.FromArgb(234, 227, 245);
+					color2 = Color.FromArgb(180, 158, 222);
+					break;
+				}
+				case ePredefinedElementStyle.PurpleMist:
+				{
+					color1 = Color.FromArgb(232, 227, 234);
+					color2 = Color.FromArgb(171, 156, 183);
+					break;
+				}
+				case ePredefinedElementStyle.Red:
+				{
+					color1 = Color.FromArgb(249, 225, 226);
+					color2 = Color.FromArgb(238, 149, 151);
+					break;
+				}
+				case ePredefinedElementStyle.Silver:
+				{
+					color1 = Color.FromArgb(225, 225, 232);
+					color2 = Color.FromArgb(149, 149, 170);
+					break;
+				}
+				case ePredefinedElementStyle.SilverMist:
+				{
+					color1 = Color.FromArgb(243,244,250);
+					color2=Color.FromArgb(155,153,183);
+					textColor=Color.FromArgb(87,86,113);
+					break;
+				}
+				case ePredefinedElementStyle.Tan:
+				{
+					color1 = Color.FromArgb(248, 242, 226);
+					color2 = Color.FromArgb(232, 209, 153);
+					break;
+				}
+				case ePredefinedElementStyle.Teal:
+				{
+					color1 = Color.FromArgb(205, 236, 240);
+					color2 = Color.FromArgb(78, 188, 202);
+					break;
+				}
+				case ePredefinedElementStyle.Yellow:
+				{
+					color1 = Color.FromArgb(255, 244, 213);
+					color2 = Color.FromArgb(255, 216, 105);
+					break;
+				}
+				case ePredefinedElementStyle.Gray:
+				{
+					color1 = Color.White;
+					color2 = ColorScheme.GetColor("E4E4F0");
+					break;
+				}
+			}
+			
+			ElementStyle style=Utilites.CreateStyle(new ComponentFactory(),Enum.GetName(typeof(ePredefinedElementStyle),c),borderColor,color1, color2, gradientAngle,textColor);
+			return style;
+		}
+	}
+	
+	/// <summary>
+	/// Indicates predefined element style.
+	/// </summary>
+	public enum ePredefinedElementStyle
+	{
+		Blue,
+		BlueLight,
+		BlueNight,
+		Yellow,
+		Green,
+		Red,
+		Purple,
+		Cyan,
+		Orange,
+		OrangeLight,
+		Magenta,
+		BlueMist,
+		PurpleMist,
+		Tan,
+		Lemon,
+		Apple,
+		Teal,
+		Silver,
+		SilverMist,
+		Gray
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/NodeTreeLayout.cs b/PROMS/DotNetBar Source Code/TreeGX/NodeTreeLayout.cs
new file mode 100644
index 00000000..ada0ddd2
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/NodeTreeLayout.cs	
@@ -0,0 +1,235 @@
+using System.Collections;
+using System.Drawing;
+using System.Windows.Forms;
+
+namespace DevComponents.Tree
+{
+	/// <summary>
+	/// Summary description for NodeTreeLayout.
+	/// </summary>
+	internal class NodeTreeLayout:NodeLayout
+	{
+		//private bool m_LayoutPerformed=false;
+
+		public NodeTreeLayout(TreeGX treeControl, Rectangle clientArea):base(treeControl,clientArea)
+		{
+			//m_ExpandAreaWidth=16;
+			m_ExpandPartSize=new Size(9,9);
+		}
+
+		public override void PerformLayout()
+		{
+			this.PrepareStyles();
+
+			// Get default Columns
+			ArrayList defaultColInfoList=this.GetDefaultColumnInfo();
+
+			Graphics graphics=this.GetGraphics();
+			try
+			{
+				// Loop through each top-level node
+				Node[] topLevelNodes=this.GetTopLevelNodes();
+				NodeLayoutContextInfo layoutInfo=GetDefaultNodeLayoutContextInfo(GetGraphics());
+
+				foreach(Node childNode in topLevelNodes)
+				{
+					layoutInfo.ContextNode=childNode;
+					ProcessNode(layoutInfo);
+				}
+			}
+			finally
+			{
+				graphics.Dispose();
+			}
+		}
+
+		#region Node routines
+		private void ProcessNode(NodeLayoutContextInfo layoutInfo)
+		{
+			Node node=layoutInfo.ContextNode;
+			if(node.SizeChanged)
+			{
+				// Calculate size of the node itself...
+				LayoutNode(layoutInfo);
+
+				// Calculate size and location of node column header if any
+//				if(node.NodesColumnHeaderVisible)
+//				{
+//					layoutInfo.Left+=this.NodeLevelOffset;
+//					LayoutColumnHeader(layoutInfo);
+//					layoutInfo.Left-=this.NodeLevelOffset;
+//				}
+			}
+			else if(node.Bounds.Top!=layoutInfo.Top)
+			{
+				// Adjust top position
+				node.SetBounds(new Rectangle(node.Bounds.X,layoutInfo.Top,node.Bounds.Width,node.Bounds.Height));
+				foreach(Cell c in node.Cells)
+					c.SetBounds(new Rectangle(c.Bounds.X,layoutInfo.Top,c.Bounds.Width,c.Bounds.Height));
+			}
+
+			// Need to set the Top position properly
+			layoutInfo.Top+=(node.Bounds.Height+this.NodeVerticalSpacing);
+//			if(node.Expanded && node.NodesColumnHeaderVisible && node.NodesColumns.Count>0)
+//				layoutInfo.Top+=node.ColumnHeaderHeight;
+			
+			if(node.Expanded)
+			{
+				int originalLevelOffset=layoutInfo.Left;
+				layoutInfo.Left+=this.NodeLevelOffset;
+				
+				ArrayList parentColumns=layoutInfo.ChildColumns;
+				ArrayList childColumns=GetNodeColumnInfo(node);
+
+				foreach(Node childNode in node.Nodes)
+				{
+					layoutInfo.ContextNode=childNode;
+					layoutInfo.ChildColumns=childColumns;
+					ProcessNode(layoutInfo);
+				}
+				layoutInfo.ChildColumns=parentColumns;
+
+				layoutInfo.ContextNode=node;
+				layoutInfo.Left=originalLevelOffset;
+			}
+		}
+
+//		private void LayoutNode(NodeLayoutContextInfo layoutInfo)
+//		{
+//			if(!layoutInfo.ContextNode.SizeChanged)
+//				return;
+//
+//			Node node=layoutInfo.ContextNode;
+//			Rectangle nodeContentRect=Rectangle.Empty; // Node content rect excludes expand rect
+//			
+//			Rectangle nodeRect=Rectangle.Empty;
+//			nodeRect.X=layoutInfo.Left;
+//			nodeRect.Y=layoutInfo.Top;
+//
+//			int height=0, width=0;
+//
+//            bool bExpandPartAlignedNear=this.ExpandPartAlignedNear(node);
+//			if(bExpandPartAlignedNear)
+//			{
+//				width+=(this.ExpandAreaWidth+this.GetCellLayout().CellPartSpacing);
+//			}
+//
+//			int x=width;		// relative to 0,0 of the node
+//			int y=0;			// Relative to 0,0 of the node
+//			
+//			// Apply node style
+//			ElementStyle nodeStyle=null;
+//			if(node.Expanded && node.StyleExpanded!=null)
+//				nodeStyle=node.StyleExpanded;
+//			else if(node.Style!=null)
+//				nodeStyle=node.Style;
+//			else
+//				nodeStyle=layoutInfo.DefaultNodeStyle;
+//
+//			nodeContentRect.X=x;
+//
+//			if(nodeStyle!=null)
+//			{
+//				x+=ElementStyleLayout.LeftWhiteSpace(nodeStyle); // nodeStyle.MarginLeft+nodeStyle.PaddingLeft;
+//				y+=ElementStyleLayout.TopWhiteSpace(nodeStyle); // nodeStyle.MarginTop+nodeStyle.PaddingTop;
+//				nodeContentRect.X+=nodeStyle.MarginLeft;
+//				nodeContentRect.Y+=nodeStyle.MarginTop;
+//			}
+//
+//			Size size=this.GetCellLayout().LayoutCells(layoutInfo,x,y);
+//			height=size.Height;
+//			width+=size.Width;
+//
+//			nodeContentRect.Width=size.Width;
+//			nodeContentRect.Height=size.Height;
+//
+//			node.SetCellsBounds(new Rectangle(x,y,size.Width,size.Height));
+//
+//			if(nodeStyle!=null)
+//			{
+//				nodeContentRect.Width+=(ElementStyleLayout.StyleSpacing(nodeStyle,eSpacePart.Padding | eSpacePart.Border,eStyleSide.Left)+
+//					ElementStyleLayout.StyleSpacing(nodeStyle,eSpacePart.Padding | eSpacePart.Border,eStyleSide.Right));
+//				nodeContentRect.Height+=(ElementStyleLayout.StyleSpacing(nodeStyle,eSpacePart.Padding | eSpacePart.Border,eStyleSide.Top)+
+//					ElementStyleLayout.StyleSpacing(nodeStyle,eSpacePart.Padding | eSpacePart.Border,eStyleSide.Bottom));
+//
+//				width+=(ElementStyleLayout.HorizontalStyleWhiteSpace(nodeStyle));
+//				height+=(ElementStyleLayout.VerticalStyleWhiteSpace(nodeStyle));
+//			}
+//
+//			if(!bExpandPartAlignedNear)
+//				width+=this.ExpandAreaWidth;
+//			
+//			nodeRect.Height=height;
+//			nodeRect.Width=width;
+//
+//			node.SetBounds(nodeRect);
+//			node.SetContentBounds(nodeContentRect);
+//
+//			LayoutExpandPart(layoutInfo,true);
+//
+//			node.SizeChanged=false;
+//		}
+
+		/// <summary>
+		/// Returns true if expand part space should be accounted for even if they expand part is not visible or need to be displayed. Default value is false.
+		/// </summary>
+		protected override bool ReserveExpandPartSpace
+		{
+			get
+			{
+				return true;
+			}
+		}
+//
+//		private CellLayout m_CellLayout=null;
+//		private CellLayout GetCellLayout()
+//		{
+//			if(m_CellLayout==null)
+//				m_CellLayout=new CellLayout();
+//			return m_CellLayout;
+//		}
+
+//		/// <summary>
+//		/// Determines the rectangle of the +/- part of the tree node that is used to expand node.
+//		/// </summary>
+//		/// <param name="layoutInfo">Node layout context information</param>
+//		private void LayoutExpandPart(NodeLayoutContextInfo layoutInfo)
+//		{
+//			Node node=layoutInfo.ContextNode;
+//
+//			Size partSize=new Size(9,9);
+//
+//			// For different styles of the nodes the expand part +/- might be aligned to the right of the node etc.
+//			// this routine does default left position
+//			Rectangle bounds=new Rectangle(0,0,partSize.Width,partSize.Height);
+//			bounds.Y=(node.Bounds.Height-bounds.Height)/2;
+//			bounds.X=(this.ExpandAreaWidth-bounds.Width)/2;
+//
+//			node.SetExpandPartRectangle(bounds);
+//		}
+
+		/// <summary>
+		/// Gets whether the expand part of the node +/- is aligned to the left of the node in left-to-right layout.
+		/// </summary>
+		/// <param name="node">Node to get expand part alignment for</param>
+		/// <returns>true if node expand part is aligned to the left in left-to-right layout.</returns>
+		private bool ExpandPartAlignedNear(Node node)
+		{
+			return true; // If changed LayoutExpandPart needs to be updated as well
+		}
+
+//		private NodeCollection GetTopLevelNodes()
+//		{
+//			return m_Tree.Nodes;
+//		}
+
+		private int NodeLevelOffset
+		{
+			get {return 10;}
+		}
+
+		#endregion
+
+		
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/NodeUIOperations.cs b/PROMS/DotNetBar Source Code/TreeGX/NodeUIOperations.cs
new file mode 100644
index 00000000..eb411819
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/NodeUIOperations.cs	
@@ -0,0 +1,18 @@
+using System;
+using System.Windows.Forms;
+using System.Drawing;
+
+namespace DevComponents.Tree
+{
+	/// <summary>
+	/// Summary description for NodeUIOperations.
+	/// </summary>
+	public class NodeUIOperations
+	{
+		public NodeUIOperations()
+		{
+		}
+
+		
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/Padding.cs b/PROMS/DotNetBar Source Code/TreeGX/Padding.cs
new file mode 100644
index 00000000..b30abdfc
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/Padding.cs	
@@ -0,0 +1,225 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel;
+using System.Globalization;
+
+namespace DevComponents.Tree
+{
+    #region Padding Class
+
+    /// <summary>
+    /// Represents class that holds padding information for user interface elements.
+    /// </summary>
+    [TypeConverter(typeof(PaddingConvertor))]
+    public class Padding : INotifyPropertyChanged
+    {
+        #region Private variables
+
+        /// <summary>
+        /// Gets or sets padding on left side. Default value is 0
+        /// </summary>
+        private int _Left;
+
+        /// <summary>
+        /// Gets or sets padding on right side. Default value is 0
+        /// </summary>
+        private int _Right;
+
+        /// <summary>
+        /// Gets or sets padding on top side. Default value is 0
+        /// </summary>
+        private int _Top;
+
+        /// <summary>
+        /// Gets or sets padding on bottom side. Default value is 0
+        /// </summary>
+        private int _Bottom;
+
+        #endregion
+
+        /// <summary>
+        /// Creates new instance of the class and initializes it.
+        /// </summary>
+        /// <param name="left">Left padding</param>
+        /// <param name="right">Right padding</param>
+        /// <param name="top">Top padding</param>
+        /// <param name="bottom">Bottom padding</param>
+        public Padding(int left, int right, int top, int bottom)
+        {
+            _Left = left;
+            _Right = right;
+            _Top = top;
+            _Bottom = bottom;
+        }
+
+        #region Public properties
+
+        /// <summary>
+        /// Gets amount of Top padding
+        /// </summary>
+        [Browsable(true), DefaultValue(0)]
+        [Description("Indicates the amount of Top padding.")]
+        [NotifyParentProperty(true)]
+        public int Top
+        {
+            get { return (_Top); }
+            set { _Top = value; OnPropertyChanged(new PropertyChangedEventArgs("Top")); }
+        }
+
+        /// <summary>
+        /// Gets amount of Left padding
+        /// </summary>
+        [Browsable(true), DefaultValue(0)]
+        [Description("Indicates the amount of Left padding.")]
+        [NotifyParentProperty(true)]
+        public int Left
+        {
+            get { return (_Left); }
+            set { _Left = value; OnPropertyChanged(new PropertyChangedEventArgs("Left")); }
+        }
+
+        /// <summary>
+        /// Gets amount of Bottom padding
+        /// </summary>
+        [Browsable(true), DefaultValue(0)]
+        [Description("Indicates the amount of Bottom padding.")]
+        [NotifyParentProperty(true)]
+        public int Bottom
+        {
+            get { return (_Bottom); }
+            set { _Bottom = value; OnPropertyChanged(new PropertyChangedEventArgs("Bottom")); }
+        }
+
+        /// <summary>
+        /// Gets amount of Right padding
+        /// </summary>
+        [Browsable(true), DefaultValue(0)]
+        [Description("Indicates the amount of Right padding.")]
+        [NotifyParentProperty(true)]
+        public int Right
+        {
+            get { return (_Right); }
+            set { _Right = value; OnPropertyChanged(new PropertyChangedEventArgs("Right")); }
+        }
+
+        /// <summary>
+        /// Gets amount of horizontal padding (Left+Right)
+        /// </summary>
+        [Browsable(false)]
+        public int Horizontal
+        {
+            get { return (_Left + _Right); }
+        }
+
+        /// <summary>
+        /// Gets amount of vertical padding (Top+Bottom)
+        /// </summary>
+        [Browsable(false)]
+        public int Vertical
+        {
+            get { return (_Top + _Bottom); }
+        }
+
+        /// <summary>
+        /// Gets whether Padding is empty.
+        /// </summary>
+        [Browsable(false)]
+        public bool IsEmpty
+        {
+            get { return (_Left == 0 && _Right == 0 && _Top == 0 && _Bottom == 0); }
+        }
+
+        #endregion
+
+        #region INotifyPropertyChanged Members
+        /// <summary>
+        /// Occurs when property value has changed.
+        /// </summary>
+        public event PropertyChangedEventHandler PropertyChanged;
+        /// <summary>
+        /// Raises the PropertyChanged event.
+        /// </summary>
+        /// <param name="e">Event arguments</param>
+        protected virtual void OnPropertyChanged(PropertyChangedEventArgs e)
+        {
+            PropertyChangedEventHandler eh = PropertyChanged;
+            if (eh != null) eh(this, e);
+        }
+        #endregion
+    }
+
+    #endregion
+
+    #region PaddingConvertor
+
+    public class PaddingConvertor : ExpandableObjectConverter
+    {
+        public override bool CanConvertTo(
+            ITypeDescriptorContext context, Type destinationType)
+        {
+            if (destinationType == typeof(string))
+                return (true);
+
+            return (base.CanConvertTo(context, destinationType));
+        }
+
+        public override object ConvertTo(
+            ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+        {
+            if (destinationType == typeof(string))
+            {
+                Padding pad = value as Padding;
+
+                if (pad != null)
+                {
+                    return (String.Format("{0:D}, {1:D}, {2:D}, {3:D}",
+                        pad.Bottom, pad.Left, pad.Right, pad.Top));
+                }
+            }
+
+            return (base.ConvertTo(context, culture, value, destinationType));
+        }
+
+        public override bool CanConvertFrom(
+            ITypeDescriptorContext context, Type sourceType)
+        {
+            if (sourceType == typeof(string))
+                return (true);
+
+            return (base.CanConvertFrom(context, sourceType));
+        }
+
+        public override object ConvertFrom(
+            ITypeDescriptorContext context, CultureInfo culture, object value)
+        {
+            if (value is string)
+            {
+                string[] values = ((string)value).Split(',');
+
+                if (values.Length != 4)
+                    throw new ArgumentException("Invalid value to convert.");
+
+                try
+                {
+                    int bottom = int.Parse(values[0]);
+                    int left = int.Parse(values[1]);
+                    int right = int.Parse(values[2]);
+                    int top = int.Parse(values[3]);
+
+                    Padding pad = new Padding(left, right, top, bottom);
+
+                    return (pad);
+                }
+                catch (Exception exp)
+                {
+                    throw new ArgumentException("Invalid value to convert.");
+                }
+            }
+
+            return base.ConvertFrom(context, culture, value);
+        }
+    }
+
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/TextBoxEx.cs b/PROMS/DotNetBar Source Code/TreeGX/TextBoxEx.cs
new file mode 100644
index 00000000..60ffa224
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/TextBoxEx.cs	
@@ -0,0 +1,99 @@
+using System;
+using System.Drawing;
+using System.Windows.Forms;
+using System.ComponentModel;
+
+namespace DevComponents.Tree
+{
+	/// <summary>
+	/// Represents the text box for editing cell's text.
+	/// </summary>
+	[Designer(typeof(System.Windows.Forms.Design.ControlDesigner)),ToolboxItem(false)]
+	internal class TextBoxEx:TextBox
+	{
+		#region Private variables
+		private bool m_WordWrap=false;
+		#endregion
+
+		#region Events
+		public event EventHandler EndEdit;
+		public event EventHandler CancelEdit;
+		#endregion
+
+		#region Constructor
+		public TextBoxEx():base()
+		{
+			this.AutoSize=false;
+			this.BorderStyle=System.Windows.Forms.BorderStyle.None;
+		}
+		#endregion
+
+		#region Internal Implementation
+		protected override void OnKeyDown(KeyEventArgs e)
+		{
+			base.OnKeyDown(e);
+
+			if(e.KeyCode==Keys.Enter && !m_WordWrap || e.KeyCode==Keys.Enter && e.Modifiers==Keys.Control)
+			{
+				if(EndEdit!=null)
+					EndEdit(this, new EventArgs());
+			}
+			else if(e.KeyCode==Keys.Escape)
+			{
+				if(CancelEdit!=null)
+					CancelEdit(this,new EventArgs());
+			}
+		}
+
+		protected override void OnTextChanged(EventArgs e)
+		{
+			base.OnTextChanged (e);
+			ResizeControl();
+		}
+
+		private void ResizeControl()
+		{
+			Graphics g=this.CreateGraphics();
+			SizeF size=g.MeasureString(this.Text,this.Font);
+			int width=(int)Math.Ceiling(size.Width);
+			int height=(int)Math.Ceiling(size.Height);
+			if(this.Parent!=null && this.Right+(width-this.Width)>this.Parent.Right)
+				return;
+			if(width>this.Width)
+				this.Width=width;
+
+			if(m_WordWrap)
+			{
+				if(this.Parent!=null && this.Bottom+(height-this.Height)>this.Parent.Bottom)
+					return;
+				if(height>this.Height)
+					this.Height=height;
+			}
+		}
+		#endregion
+
+		#region Public Properties
+
+		/// <summary>
+		/// Gets or sets whether the editing is in word-wrap mode.
+		/// </summary>
+		public bool EditWordWrap
+		{
+			get {return m_WordWrap;}
+			set
+			{
+				m_WordWrap=value;
+				if(m_WordWrap)
+				{
+					this.Multiline=true;
+					this.ScrollBars=ScrollBars.None;
+				}
+				else
+				{
+					this.Multiline=false;
+				}
+			}
+		}
+		#endregion
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/TextDrawing.cs b/PROMS/DotNetBar Source Code/TreeGX/TextDrawing.cs
new file mode 100644
index 00000000..50ceede7
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/TextDrawing.cs	
@@ -0,0 +1,244 @@
+using System;
+using System.Text;
+using System.Drawing;
+using System.Windows.Forms;
+using System.Drawing.Text;
+
+#if DOTNETBAR
+namespace DevComponents.DotNetBar
+#else
+namespace DevComponents.Tree
+#endif
+{
+    internal class TextDrawing
+    {
+        static TextDrawing()
+        {
+            string lc = Application.CurrentCulture.TwoLetterISOLanguageName;
+            if (lc == "ja" || lc == "ko" || lc == "zh" || lc == "ar")
+                UseGenericDefault = true;
+        }
+
+        public static bool TextDrawingEnabled = true;
+        public static bool UseTextRenderer = false;
+
+        public static void DrawString(Graphics g, string text, Font font, Color color, int x, int y, eTextFormat format)
+        {
+            DrawString(g, text, font, color, new Rectangle(x, y, 0, 0), format);
+        }
+        public static void DrawString(Graphics g, string text, Font font, Color color, Rectangle bounds, eTextFormat format)
+        {
+#if FRAMEWORK20
+            if (UseTextRenderer && (format & eTextFormat.Vertical) == 0)
+                TextRenderer.DrawText(g, text, font, bounds, color, GetTextFormatFlags(format));
+            else
+                DrawStringLegacy(g, text, font, color, bounds, format);
+#else
+            DrawStringLegacy(g, text, font, color, bounds, format);
+#endif
+        }
+
+        public static void DrawStringLegacy(Graphics g, string text, Font font, Color color, Rectangle bounds, eTextFormat format)
+        {
+            if (color.IsEmpty || !TextDrawingEnabled)
+                return;
+
+            using (SolidBrush brush = new SolidBrush(color))
+            {
+                using (StringFormat sf = GetStringFormat(format))
+                    g.DrawString(text, font, brush, bounds, sf);
+            }
+        }
+
+
+        public static Size MeasureString(Graphics g, string text, Font font)
+        {
+            return MeasureString(g, text, font, Size.Empty, eTextFormat.Default);
+        }
+
+        public static Size MeasureString(Graphics g, string text, Font font, int proposedWidth, eTextFormat format)
+        {
+            return MeasureString(g, text, font, new Size(proposedWidth, 0), format);
+        }
+
+        public static Size MeasureString(Graphics g, string text, Font font, int proposedWidth)
+        {
+            return MeasureString(g, text, font, new Size(proposedWidth, 0), eTextFormat.Default);
+        }
+
+        public static Size MeasureString(Graphics g, string text, Font font, Size proposedSize, eTextFormat format)
+        {
+#if FRAMEWORK20
+            if (UseTextRenderer && (format & eTextFormat.Vertical) == 0)
+            {
+                format = format & ~(format & eTextFormat.VerticalCenter); // Bug in .NET Framework 2.0
+                format = format & ~(format & eTextFormat.Bottom); // Bug in .NET Framework 2.0
+                format = format & ~(format & eTextFormat.HorizontalCenter); // Bug in .NET Framework 2.0
+                format = format & ~(format & eTextFormat.Right); // Bug in .NET Framework 2.0
+                format = format & ~(format & eTextFormat.EndEllipsis); // Bug in .NET Framework 2.0
+                return Size.Ceiling(TextRenderer.MeasureText(g, text, font, proposedSize, GetTextFormatFlags(format)));
+            }
+            using (StringFormat sf = GetStringFormat(format))
+                return Size.Ceiling(g.MeasureString(text, font, proposedSize, sf));
+#else
+            using (StringFormat sf = GetStringFormat(format))
+                return Size.Ceiling(g.MeasureString(text, font, proposedSize, sf));
+#endif
+        }
+
+        public static Size MeasureStringLegacy(Graphics g, string text, Font font, Size proposedSize, eTextFormat format)
+        {
+            using (StringFormat sf = GetStringFormat(format))
+                return g.MeasureString(text, font, proposedSize, sf).ToSize();
+        }
+
+
+        public static eTextFormat TranslateHorizontal(StringAlignment align)
+        {
+            if (align == StringAlignment.Center)
+                return eTextFormat.HorizontalCenter;
+            else if (align == StringAlignment.Far)
+                return eTextFormat.Right;
+            return eTextFormat.Default;
+        }
+
+        public static eTextFormat TranslateVertical(StringAlignment align)
+        {
+            if (align == StringAlignment.Center)
+                return eTextFormat.VerticalCenter;
+            else if (align == StringAlignment.Far)
+                return eTextFormat.Bottom;
+            return eTextFormat.Default;
+        }
+
+#if FRAMEWORK20
+        private static TextFormatFlags GetTextFormatFlags(eTextFormat format)
+        {
+            format |= eTextFormat.PreserveGraphicsTranslateTransform | eTextFormat.PreserveGraphicsClipping;
+            if((format & eTextFormat.SingleLine)==eTextFormat.SingleLine && (format & eTextFormat.WordBreak)==eTextFormat.WordBreak)
+                format = format & ~(format & eTextFormat.SingleLine);
+            return (TextFormatFlags)format;
+        }
+#endif
+        internal static bool UseGenericDefault = false;
+
+        public static StringFormat GetStringFormat(eTextFormat format)
+        {
+            StringFormat sf = new StringFormat(UseGenericDefault ? StringFormat.GenericDefault : StringFormat.GenericTypographic);
+
+            if (format == eTextFormat.Default)
+                return sf;
+            if ((format & eTextFormat.HorizontalCenter) == eTextFormat.HorizontalCenter)
+                sf.Alignment = StringAlignment.Center;
+            else if ((format & eTextFormat.Right) == eTextFormat.Right)
+                sf.Alignment = StringAlignment.Far;
+            if ((format & eTextFormat.VerticalCenter) == eTextFormat.VerticalCenter)
+                sf.LineAlignment = StringAlignment.Center;
+            else if ((format & eTextFormat.Bottom) == eTextFormat.Bottom)
+                sf.LineAlignment = StringAlignment.Far;
+
+            if ((format & eTextFormat.EndEllipsis) == eTextFormat.EndEllipsis)
+                sf.Trimming = StringTrimming.EllipsisCharacter;
+            else
+                sf.Trimming = StringTrimming.Character;
+
+            if ((format & eTextFormat.HidePrefix) == eTextFormat.HidePrefix)
+                sf.HotkeyPrefix = HotkeyPrefix.Hide;
+            else if ((format & eTextFormat.NoPrefix) == eTextFormat.NoPrefix)
+                sf.HotkeyPrefix = HotkeyPrefix.None;
+            else
+                sf.HotkeyPrefix = HotkeyPrefix.Show;
+
+            if ((format & eTextFormat.WordBreak) == eTextFormat.WordBreak)
+                sf.FormatFlags = sf.FormatFlags & ~(sf.FormatFlags & StringFormatFlags.NoWrap);
+            else
+                sf.FormatFlags |= StringFormatFlags.NoWrap;
+
+            if ((format & eTextFormat.LeftAndRightPadding) == eTextFormat.LeftAndRightPadding)
+                sf.FormatFlags |= StringFormatFlags.MeasureTrailingSpaces;
+
+            if ((format & eTextFormat.RightToLeft) == eTextFormat.RightToLeft)
+                sf.FormatFlags |= StringFormatFlags.DirectionRightToLeft;
+
+            if ((format & eTextFormat.Vertical) == eTextFormat.Vertical)
+                sf.FormatFlags |= StringFormatFlags.DirectionVertical;
+
+            if ((format & eTextFormat.NoClipping) == eTextFormat.NoClipping)
+                sf.FormatFlags |= StringFormatFlags.NoClip;
+
+            return sf;
+        }
+#if DOTNETBAR
+        public static ThemeTextFormat GetTextFormat(eTextFormat format)
+        {
+            ThemeTextFormat ttf = ThemeTextFormat.Left;
+            if (format == eTextFormat.Default)
+                return ttf;
+
+            if ((format & eTextFormat.HorizontalCenter) == eTextFormat.HorizontalCenter)
+                ttf |= ThemeTextFormat.Center;
+            else if ((format & eTextFormat.Right) == eTextFormat.Right)
+                ttf|= ThemeTextFormat.Right;
+            if ((format & eTextFormat.VerticalCenter) == eTextFormat.VerticalCenter)
+                ttf |= ThemeTextFormat.VCenter;
+            else if ((format & eTextFormat.Bottom) == eTextFormat.Bottom)
+                ttf |= ThemeTextFormat.Bottom;
+
+            if ((format & eTextFormat.EndEllipsis) == eTextFormat.EndEllipsis)
+                ttf |= ThemeTextFormat.EndEllipsis;
+
+            if ((format & eTextFormat.HidePrefix) == eTextFormat.HidePrefix)
+                ttf |= ThemeTextFormat.HidePrefix;
+            else if ((format & eTextFormat.NoPrefix) == eTextFormat.NoPrefix)
+                ttf |= ThemeTextFormat.NoPrefix;
+
+            if ((format & eTextFormat.WordBreak) == eTextFormat.WordBreak)
+                ttf |= ThemeTextFormat.WordBreak;
+            else
+                ttf |= ThemeTextFormat.SingleLine;
+
+            if ((format & eTextFormat.RightToLeft) == eTextFormat.RightToLeft)
+                ttf |= ThemeTextFormat.RtlReading;
+
+            if ((format & eTextFormat.NoClipping) == eTextFormat.NoClipping)
+                ttf |= ThemeTextFormat.NoClip;
+
+            return ttf;
+        }
+#endif
+    }
+
+    [Flags]
+    public enum eTextFormat
+    {
+        Bottom = 8,
+        Default = 0,
+        EndEllipsis = 0x8000,
+        ExpandTabs = 0x40,
+        ExternalLeading = 0x200,
+        GlyphOverhangPadding = 0,
+        HidePrefix = 0x100000,
+        HorizontalCenter = 1,
+        Internal = 0x1000,
+        Left = 0,
+        LeftAndRightPadding = 0x20000000,
+        ModifyString = 0x10000,
+        NoClipping = 0x100,
+        NoFullWidthCharacterBreak = 0x80000,
+        NoPadding = 0x10000000,
+        NoPrefix = 0x800,
+        PathEllipsis = 0x4000,
+        PrefixOnly = 0x200000,
+        PreserveGraphicsClipping = 0x1000000,
+        PreserveGraphicsTranslateTransform = 0x2000000,
+        Right = 2,
+        RightToLeft = 0x20000,
+        SingleLine = 0x20,
+        TextBoxControl = 0x2000,
+        Top = 0,
+        VerticalCenter = 4,
+        WordBreak = 0x10,
+        WordEllipsis = 0x40000,
+        Vertical = 0x40000000
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/TextMarkup/BodyElement.cs b/PROMS/DotNetBar Source Code/TreeGX/TextMarkup/BodyElement.cs
new file mode 100644
index 00000000..51c46c0a
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/TextMarkup/BodyElement.cs	
@@ -0,0 +1,89 @@
+using System;
+using System.Text;
+using System.Windows.Forms;
+
+#if TREEGX
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#endif
+{
+    internal class BodyElement : ContainerElement
+    {
+        #region Private Variables
+        private MarkupElementCollection m_ActiveElements=null;
+        private IActiveMarkupElement m_MouseOverElement = null;
+        internal bool HasExpandElement = false;
+        internal string PlainText = "";
+        #endregion
+
+        #region Events
+        public event EventHandler HyperLinkClick;
+        #endregion
+
+        #region Internal Implementation
+        public BodyElement()
+        {
+            m_ActiveElements = new MarkupElementCollection(null);
+        }
+
+        public MarkupElementCollection ActiveElements
+        {
+            get { return m_ActiveElements; }
+        }
+
+        public void MouseLeave(Control parent)
+        {
+            if (m_MouseOverElement != null)
+                m_MouseOverElement.MouseLeave(parent);
+            m_MouseOverElement = null;
+        }
+
+        public void MouseMove(Control parent, MouseEventArgs e)
+        {
+            if (m_MouseOverElement != null && m_MouseOverElement.HitTest(e.X, e.Y))
+                return;
+            if (m_MouseOverElement != null)
+                m_MouseOverElement.MouseLeave(parent);
+            
+            m_MouseOverElement = null;
+
+            foreach(IActiveMarkupElement el in m_ActiveElements)
+            {
+                if (el.HitTest(e.X, e.Y))
+                {
+                    m_MouseOverElement = el;
+                    m_MouseOverElement.MouseEnter(parent);
+                }
+            }
+        }
+
+        public void MouseDown(Control parent, MouseEventArgs e)
+        {
+            if (m_MouseOverElement != null)
+                m_MouseOverElement.MouseDown(parent, e);
+        }
+
+        public void MouseUp(Control parent, MouseEventArgs e)
+        {
+            if (m_MouseOverElement != null)
+                m_MouseOverElement.MouseUp(parent, e);
+        }
+
+        public void Click(Control parent)
+        {
+            if (m_MouseOverElement != null)
+            {
+                m_MouseOverElement.Click(parent);
+                if (m_MouseOverElement is HyperLink)
+                {
+                    if (HyperLinkClick != null)
+                        HyperLinkClick(m_MouseOverElement, new EventArgs());
+                }
+            }
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/TextMarkup/ContainerElement.cs b/PROMS/DotNetBar Source Code/TreeGX/TextMarkup/ContainerElement.cs
new file mode 100644
index 00000000..3eec0331
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/TextMarkup/ContainerElement.cs	
@@ -0,0 +1,111 @@
+using System;
+using System.Text;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+
+#if TREEGX
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+using DevComponents.UI.ContentManager;
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#endif
+{
+    internal class ContainerElement : MarkupElement
+    {
+        #region Private Variables
+        private SerialContentLayoutManager m_Layout = null;
+        private MarkupLayoutManager m_MarkupLayout = null;
+        #endregion
+
+        #region Internal Implementation
+        public override void Measure(Size availableSize, MarkupDrawContext d)
+        {
+            ArrangeInternal(new Rectangle(Point.Empty, availableSize), d);
+        }
+
+        protected virtual SerialContentLayoutManager GetLayoutManager(bool mutliLine)
+        {
+            if (m_Layout == null)
+            {
+                m_Layout = new SerialContentLayoutManager();
+                m_Layout.MultiLine = mutliLine;
+                m_Layout.ContentVerticalAlignment = eContentVerticalAlignment.Top;
+                m_Layout.BlockLineAlignment = eContentVerticalAlignment.Top;
+                m_Layout.BlockSpacing = 0;
+            }
+
+            m_Layout.EvenHeight = true;
+            return m_Layout;
+        }
+
+        private MarkupLayoutManager GetMarkupLayout()
+        {
+            if (m_MarkupLayout == null)
+            {
+                m_MarkupLayout = new MarkupLayoutManager();
+            }
+            return m_MarkupLayout;
+        }
+
+        public override void Render(MarkupDrawContext d)
+        {
+            Point offset = this.GetContainerOffset();
+            d.Offset.Offset(offset.X, offset.Y);
+
+            try
+            {
+                foreach (MarkupElement e in this.Elements)
+                {
+                    e.Render(d);
+                }
+            }
+            finally
+            {
+                d.Offset.Offset(-offset.X, -offset.Y);
+            }
+        }
+
+        protected virtual Point GetContainerOffset()
+        {
+            return this.Bounds.Location;
+        }
+
+        protected override void ArrangeCore(Rectangle finalRect, MarkupDrawContext d)
+        {
+            this.Bounds = finalRect;
+            ArrangeInternal(finalRect, d);
+        }
+
+        protected virtual void ArrangeInternal(Rectangle bounds, MarkupDrawContext d)
+        {
+            SerialContentLayoutManager layout = GetLayoutManager(d.AllowMultiLine);
+            layout.RightToLeft = d.RightToLeft;
+            MarkupLayoutManager markupLayout = GetMarkupLayout();
+            markupLayout.MarkupDrawContext = d;
+            try
+            {
+                MarkupElement[] blocks = new MarkupElement[this.Elements.Count];
+                this.Elements.CopyTo(blocks);
+
+                Rectangle r = layout.Layout(new Rectangle(Point.Empty, bounds.Size), blocks, markupLayout);
+                this.Bounds = new Rectangle(bounds.Location, r.Size);
+            }
+            finally
+            {
+                markupLayout.MarkupDrawContext = null;
+            }
+        }
+
+        /// <summary>
+        /// Returns whether markup element is an block element that always consumes a whole line in layout.
+        /// </summary>
+        public override bool IsBlockElement
+        {
+            get { return true; }
+        }
+        #endregion
+        
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/TextMarkup/Div.cs b/PROMS/DotNetBar Source Code/TreeGX/TextMarkup/Div.cs
new file mode 100644
index 00000000..6884bdd1
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/TextMarkup/Div.cs	
@@ -0,0 +1,168 @@
+using System;
+using System.Text;
+using System.Drawing;
+using System.Xml;
+using System.Windows.Forms;
+
+#if TREEGX
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+using DevComponents.UI.ContentManager;
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#endif
+{
+    internal class Div : ContainerElement
+    {
+        #region Private Variables
+        private eParagraphAlignment m_Align = eParagraphAlignment.Left;
+        private eParagraphVerticalAlignment m_VAlign = eParagraphVerticalAlignment.Top;
+        private int m_Width = 0;
+        private Padding m_Padding = new Padding(0, 0, 0, 0);
+        #endregion
+
+        #region Internal Implementation
+        public eParagraphAlignment Align
+        {
+            get { return m_Align; }
+            set { m_Align = value; }
+        }
+
+        protected override SerialContentLayoutManager GetLayoutManager(bool multiLine)
+        {
+            SerialContentLayoutManager sm = base.GetLayoutManager(multiLine);
+            if (m_Align == eParagraphAlignment.Left)
+                sm.ContentAlignment = eContentAlignment.Left;
+            else if (m_Align == eParagraphAlignment.Right)
+                sm.ContentAlignment = eContentAlignment.Right;
+            else if (m_Align == eParagraphAlignment.Center)
+                sm.ContentAlignment = eContentAlignment.Center;
+
+            if (m_VAlign != eParagraphVerticalAlignment.Top)
+            {
+                sm.EvenHeight = false;
+                sm.BlockLineAlignment = (m_VAlign == eParagraphVerticalAlignment.Bottom ? eContentVerticalAlignment.Bottom : eContentVerticalAlignment.Middle);
+            }
+
+            return sm;
+        }
+
+        protected override Point GetContainerOffset()
+        {
+            if (m_Padding.Left == 0 && m_Padding.Top == 0)
+                return base.GetContainerOffset();
+            
+            Point p = base.GetContainerOffset();
+            p.X += m_Padding.Left;
+            p.Y += m_Padding.Top;
+            return p;
+        }
+
+        protected override void ArrangeInternal(Rectangle bounds, MarkupDrawContext d)
+        {
+            Rectangle r = bounds;
+            if (m_Width > 0)
+                r.Width = m_Width;
+            if (m_Padding.IsEmpty)
+            {
+                base.ArrangeInternal(r, d);
+                if (m_Width > 0)
+                    this.Bounds = new Rectangle(this.Bounds.X, this.Bounds.Y, m_Width, this.Bounds.Height + m_Padding.Bottom);
+            }
+            else
+            {
+                r.X += m_Padding.Left;
+                r.Y += m_Padding.Top;
+                base.ArrangeInternal(r, d);
+
+                r = new Rectangle(bounds.X, bounds.Y, this.Bounds.Width + m_Padding.Horizontal, this.Bounds.Height + m_Padding.Vertical);
+                if (m_Width > 0)
+                    r.Width = m_Width;
+                
+                this.Bounds = r;
+            }
+        }
+
+        public override void ReadAttributes(XmlTextReader reader)
+        {
+            for (int i = 0; i < reader.AttributeCount; i++)
+            {
+                reader.MoveToAttribute(i);
+                if (reader.Name.ToLower() == "align")
+                {
+                    string s = reader.Value.ToLower();
+                    if (s == "left")
+                        m_Align = eParagraphAlignment.Left;
+                    else if (s == "right")
+                        m_Align = eParagraphAlignment.Right;
+                    else if (s == "center")
+                        m_Align = eParagraphAlignment.Center;
+                }
+                else if (reader.Name.ToLower() == "valign")
+                {
+                    string s = reader.Value.ToLower();
+                    if (s == "top")
+                        m_VAlign = eParagraphVerticalAlignment.Top;
+                    else if (s == "middle")
+                        m_VAlign = eParagraphVerticalAlignment.Middle;
+                    else if (s == "bottom")
+                        m_VAlign = eParagraphVerticalAlignment.Bottom;
+                }
+                else if (reader.Name.ToLower() == "width")
+                {
+                    try
+                    {
+                        m_Width = Int32.Parse(reader.Value);
+                    }
+                    catch
+                    {
+                        m_Width = 0;
+                    }
+                }
+                else if (reader.Name.ToLower() == "padding")
+                {
+                    try
+                    {
+                        string[] values = reader.Value.Split(',');
+                        if (values.Length > 0)
+                            m_Padding.Left = Int32.Parse(values[0]);
+                        if (values.Length > 1)
+                            m_Padding.Right = Int32.Parse(values[1]);
+                        if (values.Length > 2)
+                            m_Padding.Top = Int32.Parse(values[2]);
+                        if (values.Length > 3)
+                            m_Padding.Bottom = Int32.Parse(values[3]);
+                    }
+                    catch
+                    {
+                        m_Padding = new Padding(0,0,0,0);
+                    }
+                }
+            }
+        }
+        #endregion
+    }
+
+    #region eParagraphAlignment
+    /// <summary>
+    /// Indicates paragraph content alignment
+    /// </summary>
+    internal enum eParagraphAlignment
+    {
+        Left,
+        Right,
+        Center
+    }
+
+    /// <summary>
+    /// Indicates paragraph content alignment
+    /// </summary>
+    internal enum eParagraphVerticalAlignment
+    {
+        Top,
+        Middle,
+        Bottom
+    }
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/TextMarkup/EndMarkupElement.cs b/PROMS/DotNetBar Source Code/TreeGX/TextMarkup/EndMarkupElement.cs
new file mode 100644
index 00000000..693973d4
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/TextMarkup/EndMarkupElement.cs	
@@ -0,0 +1,48 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+#if TREEGX
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#endif
+{
+    internal class EndMarkupElement : MarkupElement
+    {
+        #region Internap Implementation
+        private MarkupElement m_StartElement = null;
+
+        public EndMarkupElement(MarkupElement startElement)
+        {
+            m_StartElement = startElement;
+        }
+
+        public override void Measure(System.Drawing.Size availableSize, MarkupDrawContext d)
+        {
+            m_StartElement.MeasureEnd(availableSize, d);
+            this.Bounds = Rectangle.Empty;
+        }
+
+        public override void Render(MarkupDrawContext d)
+        {
+            m_StartElement.RenderEnd(d);
+        }
+
+        protected override void ArrangeCore(System.Drawing.Rectangle finalRect, MarkupDrawContext d)
+        {
+            this.Bounds = Rectangle.Empty;
+        }
+
+        /// <summary>
+        /// Gets reference to markup start element.
+        /// </summary>
+        public MarkupElement StartElement
+        {
+            get { return m_StartElement; }
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/TextMarkup/ExpandElement.cs b/PROMS/DotNetBar Source Code/TreeGX/TextMarkup/ExpandElement.cs
new file mode 100644
index 00000000..4270a552
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/TextMarkup/ExpandElement.cs	
@@ -0,0 +1,199 @@
+using System;
+using System.Text;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Xml;
+
+#if TREEGX
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#endif
+{
+    internal class ExpandElement : MarkupElement
+    {
+        #region Internal Implementation
+        private Size m_DefaultSize = new Size(5, 4);
+        private eExpandDirection m_Direction = eExpandDirection.Default;
+
+        public override void Measure(System.Drawing.Size availableSize, MarkupDrawContext d)
+        {
+            this.Bounds = new Rectangle(Point.Empty, m_DefaultSize);
+        }
+
+        protected override void ArrangeCore(System.Drawing.Rectangle finalRect, MarkupDrawContext d) { }
+
+        public override void Render(MarkupDrawContext d)
+        {
+            Rectangle r = this.Bounds;
+            r.Offset(d.Offset);
+
+            if (!d.ClipRectangle.IsEmpty && !r.IntersectsWith(d.ClipRectangle))
+                return;
+
+            Graphics g = d.Graphics;
+            Color color = d.CurrentForeColor;
+            //Color shadeColor = Color.FromArgb(96, Color.White);
+
+            eExpandDirection direction = eExpandDirection.Bottom;
+            if (m_Direction != eExpandDirection.Default)
+                direction = m_Direction;
+
+            #if DOTNETBAR
+            if(d.ContextObject is ButtonItem)
+            {
+                if (m_Direction == eExpandDirection.Default)
+                {
+                    ButtonItem item = d.ContextObject as ButtonItem;
+                    if (item.IsOnMenu)
+                    {
+                        direction = eExpandDirection.Right;
+                        if (item.PopupSide == ePopupSide.Default && d.RightToLeft || item.PopupSide == ePopupSide.Left)
+                            direction = eExpandDirection.Left;
+                    }
+                    else if (item.PopupSide == ePopupSide.Default)
+                        direction = eExpandDirection.Bottom;
+                    else if (item.PopupSide == ePopupSide.Left)
+                        direction = eExpandDirection.Left;
+                    else if (item.PopupSide == ePopupSide.Right)
+                        direction = eExpandDirection.Right;
+                    else if (item.PopupSide == ePopupSide.Bottom)
+                        direction = eExpandDirection.Bottom;
+                    else if (item.PopupSide == ePopupSide.Top)
+                        direction = eExpandDirection.Top;
+                }
+            }
+            #endif
+
+            SmoothingMode sm = g.SmoothingMode;
+            g.SmoothingMode = SmoothingMode.None;
+
+            Rectangle shadeRect = r;
+            if (direction == eExpandDirection.Bottom || direction == eExpandDirection.PopupDropDown)
+                shadeRect.Offset(0, 1);
+            else if (direction == eExpandDirection.Top)
+                shadeRect.Offset(0, -1);
+            else if (direction == eExpandDirection.Left)
+                shadeRect.Offset(1, 0);
+            else if (direction == eExpandDirection.Right)
+                shadeRect.Offset(-1, 0);
+            Point[] p = GetExpandPolygon(shadeRect, direction);
+            //using (SolidBrush brush = new SolidBrush(shadeColor))
+            //    g.FillPolygon(brush, p);
+
+            p = GetExpandPolygon(r, direction);
+            using(SolidBrush brush = new SolidBrush(color))
+                g.FillPolygon(brush, p);
+
+            if (direction == eExpandDirection.PopupDropDown)
+            {
+                using (Pen pen = new Pen(color, 1))
+                    g.DrawLine(pen, r.X, r.Y - 2, r.Right - 1, r.Y - 2);
+                //using (Pen pen = new Pen(shadeColor, 1))
+                //    g.DrawLine(pen, r.X, r.Y - 1, r.Right - 1, r.Y - 1);
+            }
+
+            g.SmoothingMode = sm;
+
+            this.RenderBounds = r;
+        }
+
+        private Point[] GetExpandPolygon(Rectangle r, eExpandDirection direction)
+        {
+            Point[] p = new Point[3];
+            switch (direction)
+            {
+                case eExpandDirection.Right:
+                    {
+                        p[0].X = r.Left + 1;
+                        p[0].Y = r.Top + (r.Height - m_DefaultSize.Height) / 2 - 1;
+                        p[1].X = p[0].X;
+                        p[1].Y = p[0].Y + 6;
+                        p[2].X = p[0].X + 3;
+                        p[2].Y = p[0].Y + 3;
+                        break;
+                    }
+                case eExpandDirection.Left:
+                    {
+                        p[0].X = r.Left + 3;
+                        p[0].Y = r.Top + (r.Height - m_DefaultSize.Height) / 2 - 1;
+                        p[1].X = p[0].X;
+                        p[1].Y = p[0].Y + 6;
+                        p[2].X = p[0].X - 3;
+                        p[2].Y = p[0].Y + 3;
+                        break;
+                    }
+                case eExpandDirection.Top:
+                    {
+                        p[0].X = r.Left - 1;
+                        p[0].Y = r.Top + (r.Height - m_DefaultSize.Height) / 2 + m_DefaultSize.Height;
+                        p[1].X = p[0].X + 6;
+                        p[1].Y = p[0].Y;
+                        p[2].X = p[0].X + 3;
+                        p[2].Y = p[0].Y - 4;
+                        break;
+                    }
+                case eExpandDirection.Bottom:
+                case eExpandDirection.PopupDropDown:
+                    {
+                        p[0].X = r.Left;
+                        p[0].Y = r.Top + (r.Height - m_DefaultSize.Height) / 2 + 1;
+                        p[1].X = p[0].X + 5;
+                        p[1].Y = p[0].Y;
+                        p[2].X = p[0].X + 2;
+                        p[2].Y = p[0].Y + 3;
+                        break;
+                    }
+            }
+            return p;
+        }
+
+        public override void ReadAttributes(XmlTextReader reader)
+        {
+            m_Direction = eExpandDirection.Default;
+
+            for (int i = 0; i < reader.AttributeCount; i++)
+            {
+                reader.MoveToAttribute(i);
+                if (reader.Name.ToLower() == "direction")
+                {
+                    string s = reader.Value.ToLower();
+                    if (s == "left")
+                        m_Direction = eExpandDirection.Left;
+                    else if (s == "right")
+                        m_Direction = eExpandDirection.Right;
+                    else if (s == "top")
+                        m_Direction = eExpandDirection.Top;
+                    else if (s == "bottom")
+                        m_Direction = eExpandDirection.Bottom;
+                    else if (s == "popup")
+                        m_Direction = eExpandDirection.PopupDropDown;
+                    break;
+                }
+            }
+        }
+
+        private enum eExpandDirection
+        {
+            Left,
+            Right,
+            Top,
+            Bottom,
+            Default,
+            PopupDropDown
+        }
+
+        /// <summary>
+        /// Returns whether layout manager can start new line with this element.
+        /// </summary>
+        public override bool CanStartNewLine
+        {
+            get { return false; }
+        }
+        #endregion
+
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/TextMarkup/FontChangeElement.cs b/PROMS/DotNetBar Source Code/TreeGX/TextMarkup/FontChangeElement.cs
new file mode 100644
index 00000000..675ba3fa
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/TextMarkup/FontChangeElement.cs	
@@ -0,0 +1,55 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+#if TREEGX
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#endif
+{
+    internal class FontChangeElement : MarkupElement
+    {
+        #region Private Variables
+        protected Font m_OldFont = null;
+        #endregion
+
+        #region Internal Implementation
+
+        public override void Measure(Size availableSize, MarkupDrawContext d)
+        {
+            this.Bounds = Rectangle.Empty;
+            SetFont(d);
+        }
+
+        public override void Render(MarkupDrawContext d)
+        {
+            SetFont(d);
+        }
+
+        protected virtual void SetFont(MarkupDrawContext d)
+        {
+            
+        }
+
+        public override void RenderEnd(MarkupDrawContext d)
+        {
+            if(m_OldFont!=null)
+                d.CurrentFont = m_OldFont;
+            m_OldFont = null;
+            base.RenderEnd(d);
+        }
+
+        public override void MeasureEnd(Size availableSize, MarkupDrawContext d)
+        {
+            if (m_OldFont != null)
+                d.CurrentFont = m_OldFont;
+            m_OldFont = null;
+            base.MeasureEnd(availableSize, d);
+        }
+        protected override void ArrangeCore(Rectangle finalRect, MarkupDrawContext d) { }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/TextMarkup/FontElement.cs b/PROMS/DotNetBar Source Code/TreeGX/TextMarkup/FontElement.cs
new file mode 100644
index 00000000..f70dd991
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/TextMarkup/FontElement.cs	
@@ -0,0 +1,184 @@
+using System;
+using System.Text;
+using System.Drawing;
+using System.Xml;
+
+#if TREEGX
+using DevComponents.Tree;
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#endif
+{
+    internal class FontElement : FontChangeElement
+    {
+        #region Private Variables
+        private Color m_ForeColor = Color.Empty;
+        private Color m_OldForeColor = Color.Empty;
+        private int m_Size = 0;
+        private bool m_RelativeSize = false;
+        private string m_Face = "";
+        private string m_SystemColorName = "";
+        #endregion
+
+        #region Internal Implementation
+        protected override void SetFont(MarkupDrawContext d)
+        {
+            Font font = d.CurrentFont;
+            try
+            {
+                if (m_Face != "" || m_Size != 0 && m_RelativeSize || m_Size>4 && !m_RelativeSize)
+                {
+                    if (m_Face != "")
+                        d.CurrentFont = new Font(m_Face, ((m_RelativeSize || m_Size == 0)?font.SizeInPoints + m_Size:m_Size), font.Style);
+                    else
+                        d.CurrentFont = new Font(font.FontFamily, ((m_RelativeSize || m_Size == 0)? font.SizeInPoints + m_Size : m_Size), font.Style);
+                }
+                else
+                    font = null;
+            }
+            catch
+            {
+                font = null;
+            }
+
+            if (font != null)
+                m_OldFont = font;
+
+            if (!d.IgnoreFormattingColors)
+            {
+                if (!m_ForeColor.IsEmpty)
+                {
+                    m_OldForeColor = d.CurrentForeColor;
+                    d.CurrentForeColor = m_ForeColor;
+                }
+                else if (m_SystemColorName != "")
+                {
+#if DOTNETBAR
+                    if (Rendering.GlobalManager.Renderer is Rendering.Office2007Renderer)
+                    {
+                        m_OldForeColor = d.CurrentForeColor;
+                        d.CurrentForeColor = ((Rendering.Office2007Renderer)Rendering.GlobalManager.Renderer).ColorTable.Form.Active.CaptionTextExtra;
+                    }
+#endif
+                }
+            }
+        }
+
+        public override void RenderEnd(MarkupDrawContext d)
+        {
+            RestoreForeColor(d);
+
+            base.RenderEnd(d);
+        }
+
+        public override void MeasureEnd(Size availableSize, MarkupDrawContext d)
+        {
+            RestoreForeColor(d);
+            base.MeasureEnd(availableSize, d);
+        }
+
+        protected virtual void RestoreForeColor(MarkupDrawContext d)
+        {
+            if (!m_OldForeColor.IsEmpty)
+                d.CurrentForeColor = m_OldForeColor;
+            m_OldForeColor = Color.Empty;
+        }
+
+        public Color ForeColor
+        {
+            get { return m_ForeColor; }
+            set { m_ForeColor = value; }
+        }
+
+        public int Size
+        {
+            get { return m_Size; }
+            set { m_Size = value; }
+        }
+
+        public string Face
+        {
+            get { return m_Face; }
+            set { m_Face = value; }
+        }
+
+        private Color GetColorFromName(string name)
+        {
+            string s = name.ToLower();
+            m_SystemColorName = "";
+            if (s == "syscaptiontextextra")
+            {
+                m_SystemColorName = s;
+                return Color.Empty;
+            }
+
+            return Color.FromName(name);
+        }
+
+        public override void ReadAttributes(XmlTextReader reader)
+        {
+            m_RelativeSize = false;
+            for (int i = 0; i < reader.AttributeCount; i++)
+            {
+                reader.MoveToAttribute(i);
+                if (reader.Name.ToLower() == "color")
+                {
+                    try
+                    {
+                        string s = reader.Value;
+                        if (s.StartsWith("#"))
+                        {
+                            if (s.Length == 7)
+                                m_ForeColor = ColorScheme.GetColor(s.Substring(1));
+                        }
+                        else
+                        {
+                            m_ForeColor = GetColorFromName(s);
+                        }
+                    }
+                    catch
+                    {
+                        m_ForeColor = Color.Empty;
+                    }
+                }
+                else if (reader.Name.ToLower() == "size")
+                {
+                    string s = reader.Value;
+                    if (s.StartsWith("+"))
+                    {
+                        try
+                        {
+                            m_Size = Int32.Parse(s.Substring(1));
+                            m_RelativeSize = true;
+                        }
+                        catch
+                        {
+                            m_Size = 0;
+                        }
+                    }
+                    else
+                    {
+                        if (s.StartsWith("-"))
+                            m_RelativeSize = true;
+                        try
+                        {
+                            m_Size = Int32.Parse(s);
+                        }
+                        catch
+                        {
+                            m_Size = 0;
+                        }
+                    }
+                }
+                else if (reader.Name.ToLower() == "face")
+                {
+                    m_Face = reader.Value;
+                }
+            }
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/TextMarkup/Heading.cs b/PROMS/DotNetBar Source Code/TreeGX/TextMarkup/Heading.cs
new file mode 100644
index 00000000..46e2cd66
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/TextMarkup/Heading.cs	
@@ -0,0 +1,95 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+#if TREEGX
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#endif
+{
+    internal class Heading: ContainerElement
+    {
+        #region Private Variables
+        private int m_Level = 1;
+        private Font m_OldFont = null;
+        #endregion
+
+        #region Internal Implementation
+        public Heading() { }
+        public Heading(int level)
+        {
+            m_Level = level;
+        }
+
+        public override void Measure(Size availableSize, MarkupDrawContext d)
+        {
+            SetFont(d);
+            base.Measure(availableSize, d);
+            if (m_OldFont != null)
+                d.CurrentFont = m_OldFont;
+        }
+
+        public override void Render(MarkupDrawContext d)
+        {
+            SetFont(d);
+            base.Render(d);
+            if (m_OldFont != null)
+                d.CurrentFont = m_OldFont;
+        }
+
+        protected virtual void SetFont(MarkupDrawContext d)
+        {
+            Font font = d.CurrentFont;
+            try
+            {
+                float size = d.CurrentFont.SizeInPoints;
+                if (m_Level == 1)
+                {
+                    size += 12;
+                }
+                else if (m_Level == 2)
+                {
+                    size += 8;
+                }
+                else if (m_Level == 3)
+                {
+                    size += 6;
+                }
+                else if (m_Level == 4)
+                {
+                    size += 4;
+                }
+                else if (m_Level == 5)
+                {
+                    size += 2;
+                }
+                else if (m_Level == 6)
+                {
+                    size += 1;
+                }
+
+                d.CurrentFont = new Font(d.CurrentFont.FontFamily, size, FontStyle.Bold);
+            }
+            catch
+            {
+                font = null;
+            }
+
+            if (font != null)
+                m_OldFont = font;
+        }
+
+        /// <summary>
+        /// Gets or sets heading level. Values from 1 to 6 are valid. Default is 1.
+        /// </summary>
+        public int Level
+        {
+            get { return m_Level; }
+            set { m_Level = value; }
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/TextMarkup/HyperLink.cs b/PROMS/DotNetBar Source Code/TreeGX/TextMarkup/HyperLink.cs
new file mode 100644
index 00000000..92477262
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/TextMarkup/HyperLink.cs	
@@ -0,0 +1,221 @@
+using System;
+using System.Text;
+using System.Drawing;
+using System.Xml;
+using System.Windows.Forms;
+using System.Drawing.Drawing2D;
+
+#if TREEGX
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#endif
+{
+    internal class HyperLink : MarkupElement, IActiveMarkupElement
+    {
+        #region Private Variables
+        private Color m_ForeColor = Color.Empty;
+        private Color m_OldForeColor = Color.Empty;
+        private string m_HRef = "";
+        private string m_Name = "";
+        private Cursor m_OldCursor = null;
+        private bool m_IsMouseOver = false;
+        private bool m_Visited = false;
+        #endregion
+
+        #region Internal Implementation
+        public override void Measure(Size availableSize, MarkupDrawContext d)
+        {
+            this.Bounds = Rectangle.Empty;
+            SetForeColor(d);
+        }
+
+        public override void Render(MarkupDrawContext d)
+        {
+            d.HyperLink = true;
+            d.HyperlinkStyle = GetHyperlinkStyle();
+            if (!d.HyperlinkStyle.BackColor.IsEmpty)
+            {
+                using (GraphicsPath gp = new GraphicsPath())
+                {
+                    MarkupElementCollection col = this.Parent.Elements;
+                    int start = col.IndexOf(this) + 1;
+                    for (int i = start; i < col.Count; i++)
+                    {
+                        MarkupElement elem = col[i];
+                        if (!elem.Visible) continue;
+                        if (elem is EndMarkupElement && ((EndMarkupElement)elem).StartElement == this)
+                            break;
+                        gp.AddRectangle(elem.RenderBounds);
+                    }
+
+                    using (SolidBrush brush = new SolidBrush(d.HyperlinkStyle.BackColor))
+                        d.Graphics.FillPath(brush, gp);
+                }
+            }
+            SetForeColor(d);
+        }
+
+        private HyperlinkStyle GetHyperlinkStyle()
+        {
+            if (m_IsMouseOver && MarkupSettings.MouseOverHyperlink.IsChanged)
+                return MarkupSettings.MouseOverHyperlink;
+            else if (m_Visited && MarkupSettings.VisitedHyperlink.IsChanged)
+                return MarkupSettings.VisitedHyperlink;
+
+            return MarkupSettings.NormalHyperlink;
+        }
+
+        protected virtual void SetForeColor(MarkupDrawContext d)
+        {
+            Color c = Color.Empty;
+            HyperlinkStyle style = GetHyperlinkStyle();
+            if (style != null && !style.TextColor.IsEmpty)
+                c = style.TextColor;
+
+            if (!m_ForeColor.IsEmpty)
+                c = m_ForeColor;
+            if (!c.IsEmpty)
+            {
+                m_OldForeColor = d.CurrentForeColor;
+                d.CurrentForeColor = c;
+            }
+        }
+
+        public override void RenderEnd(MarkupDrawContext d)
+        {
+            RestoreForeColor(d);
+            d.HyperLink = false;
+            d.HyperlinkStyle = null;
+            base.RenderEnd(d);
+        }
+
+        public override void MeasureEnd(Size availableSize, MarkupDrawContext d)
+        {
+            RestoreForeColor(d);
+            base.MeasureEnd(availableSize, d);
+        }
+
+        protected override void ArrangeCore(Rectangle finalRect, MarkupDrawContext d) { }
+
+        protected virtual void RestoreForeColor(MarkupDrawContext d)
+        {
+            if (!m_OldForeColor.IsEmpty)
+                d.CurrentForeColor = m_OldForeColor;
+            m_OldForeColor = Color.Empty;
+        }
+
+        public Color ForeColor
+        {
+            get { return m_ForeColor; }
+            set { m_ForeColor = value; }
+        }
+
+        public string HRef
+        {
+            get { return m_HRef; }
+            set { m_HRef = value; }
+        }
+
+        public string Name
+        {
+            get { return m_Name; }
+            set { m_Name = value; }
+        }
+
+        public override void ReadAttributes(XmlTextReader reader)
+        {
+            for (int i = 0; i < reader.AttributeCount; i++)
+            {
+                reader.MoveToAttribute(i);
+                if (reader.Name.ToLower() == "href")
+                {
+                    m_HRef = reader.Value;
+                }
+                else if (reader.Name.ToLower() == "name")
+                {
+                    m_Name = reader.Value;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Returns whether hyper-link contains specified coordinates.
+        /// </summary>
+        /// <param name="x"></param>
+        /// <param name="y"></param>
+        /// <returns></returns>
+        public bool HitTest(int x, int y)
+        {
+            if (this.Parent == null)
+                return false;
+
+            MarkupElementCollection col = this.Parent.Elements;
+            int start = col.IndexOf(this)+1;
+            for (int i = start; i < col.Count; i++)
+            {
+                MarkupElement el = col[i];
+                if (el is EndMarkupElement && ((EndMarkupElement)el).StartElement == this)
+                    break;
+
+                if (col[i].RenderBounds.Contains(x, y))
+                    return true;
+
+            }
+
+            return false;
+        }
+
+        public void MouseEnter(Control parent)
+        {
+            m_OldCursor = parent.Cursor;
+            parent.Cursor = Cursors.Hand;
+            m_IsMouseOver = true;
+            if (MarkupSettings.MouseOverHyperlink.IsChanged)
+            {
+                InvalidateElements(parent);
+            }
+        }
+
+        public void MouseLeave(Control parent)
+        {
+            if (m_OldCursor != null && parent!=null)
+                parent.Cursor = m_OldCursor;
+            m_OldCursor = null;
+            m_IsMouseOver = false;
+            if (MarkupSettings.MouseOverHyperlink.IsChanged)
+            {
+                InvalidateElements(parent);
+            }
+        }
+
+        public void MouseDown(Control parent, MouseEventArgs e) { }
+        public void MouseUp(Control parent, MouseEventArgs e) { }
+        public void Click(Control parent)
+        {
+            m_Visited = true;
+            if (MarkupSettings.VisitedHyperlink.IsChanged)
+            {
+                InvalidateElements(parent);
+            }
+        }
+
+        private void InvalidateElements(Control parent)
+        {
+            if (this.Parent == null) return;
+            MarkupElementCollection col = this.Parent.Elements;
+            int start = col.IndexOf(this) + 1;
+            for (int i = start; i < col.Count; i++)
+            {
+                MarkupElement elem = col[i];
+                if (!elem.Visible) continue;
+                if (elem is EndMarkupElement && ((EndMarkupElement)elem).StartElement == this)
+                    break;
+                parent.Invalidate(elem.RenderBounds);
+            }
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/TextMarkup/IActiveMarkupElement.cs b/PROMS/DotNetBar Source Code/TreeGX/TextMarkup/IActiveMarkupElement.cs
new file mode 100644
index 00000000..142457ed
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/TextMarkup/IActiveMarkupElement.cs	
@@ -0,0 +1,22 @@
+using System;
+using System.Text;
+using System.Windows.Forms;
+
+#if TREEGX
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#endif
+{
+    internal interface IActiveMarkupElement
+    {
+        bool HitTest(int x, int y);
+        void MouseEnter(Control parent);
+        void MouseLeave(Control parent);
+        void MouseDown(Control parent, MouseEventArgs e);
+        void MouseUp(Control parent, MouseEventArgs e);
+        void Click(Control parent);
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/TextMarkup/ImageElement.cs b/PROMS/DotNetBar Source Code/TreeGX/TextMarkup/ImageElement.cs
new file mode 100644
index 00000000..6dbc7558
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/TextMarkup/ImageElement.cs	
@@ -0,0 +1,187 @@
+using System;
+using System.Text;
+using System.Drawing;
+using System.Xml;
+using System.Reflection;
+
+#if TREEGX
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#endif
+
+{
+    internal class ImageElement : MarkupElement
+    {
+        #region Private Variables
+        private Size m_ImageSize = Size.Empty;
+        private string m_ImageSource = "";
+        private Image m_Image = null;
+        #endregion
+
+        #region Internal Implementation
+        public override void Measure(System.Drawing.Size availableSize, MarkupDrawContext d)
+        {
+            if (!m_ImageSize.IsEmpty)
+                this.Bounds = new Rectangle(Point.Empty, m_ImageSize);
+            else if (m_ImageSource.Length == 0)
+                this.Bounds = Rectangle.Empty;
+            else
+            {
+                Image img = this.GetImage();
+                if (img != null)
+                    this.Bounds = new Rectangle(Point.Empty, img.Size);
+                else
+                    this.Bounds = new Rectangle(Point.Empty, new Size(16,16));
+            }
+        }
+
+        public override bool IsBlockElement
+        {
+            get
+            {
+                return false;
+            }
+        }
+
+        private Image GetImage()
+        {
+            if (m_Image != null) return m_Image;
+            Assembly a = null;
+
+            // Load from format: ClassLibrary1/ClassLibrary1.MyImage.png or ClassLibrary1/global::ClassLibrary1.Resources.MyImage
+            if (m_ImageSource.IndexOf('/') >= 0)
+            {
+                string[] parts = m_ImageSource.Split('/');
+                a = Assembly.Load(parts[0]);
+                string ResourceName = parts[1];
+                if (a != null)
+                {
+                    m_Image = LoadImageGlobalResource(parts[1], a);
+                    if (m_Image == null)
+                        m_Image = LoadImageResource(parts[1], a);
+
+                    if (m_Image != null) return m_Image;
+                }
+            }
+
+            // Probe Executing Assembly
+            a = Assembly.GetExecutingAssembly();
+            m_Image = LoadImageGlobalResource(m_ImageSource, a);
+            if(m_Image==null)
+                m_Image = LoadImageResource(m_ImageSource, a);
+
+            // Probe Entry Assembly
+            if (m_Image == null)
+            {
+                a = Assembly.GetEntryAssembly();
+                m_Image = LoadImageGlobalResource(m_ImageSource, a);
+                if (m_Image == null)
+                    m_Image = LoadImageResource(m_ImageSource, a);
+            }
+
+            return m_Image;
+        }
+
+        private Image LoadImageGlobalResource(string imageSource, Assembly a)
+        {
+            Image img = null;
+#if FRAMEWORK20
+            if (imageSource.StartsWith("global::"))
+            {
+                string name = imageSource.Substring(8);
+                if (name.Length > 0)
+                {
+                    try
+                    {
+                        int i = name.LastIndexOf('.');
+                        string resName = name.Substring(0, i);
+                        name = name.Substring(i + 1);
+                        System.Resources.ResourceManager r = new System.Resources.ResourceManager(resName, a);
+                        object obj = r.GetObject(name);
+                        img = (Bitmap)obj;
+                    }
+                    catch
+                    {
+                        img = null;
+                    }
+                }
+            }
+#endif
+            return img;
+        }
+
+        private Image LoadImageResource(string imageSource, Assembly a)
+        {
+            Image img = null;
+            try
+            {
+                img = new Bitmap(a.GetManifestResourceStream(imageSource));
+            }
+            catch { }
+
+            return img;
+        }
+
+        public override void Render(MarkupDrawContext d)
+        {
+            Rectangle r = this.Bounds;
+            r.Offset(d.Offset);
+
+            if (!d.ClipRectangle.IsEmpty && !r.IntersectsWith(d.ClipRectangle))
+                return;
+
+            Image img = this.GetImage();
+            if (img != null)
+            {
+                Rectangle imageRect = r;
+                imageRect.Size = img.Size;
+                d.Graphics.DrawImage(img, imageRect);
+            }
+            else
+            {
+                using (SolidBrush brush = new SolidBrush(Color.White))
+                {
+                    d.Graphics.FillRectangle(brush, r);
+                }
+                using (Pen pen = new Pen(Color.DarkGray, 1))
+                {
+                    d.Graphics.DrawRectangle(pen, r);
+                    d.Graphics.DrawLine(pen, r.X, r.Y, r.Right, r.Bottom);
+                    d.Graphics.DrawLine(pen, r.Right, r.Y, r.X, r.Bottom);
+                }
+            }
+        }
+
+        protected override void ArrangeCore(System.Drawing.Rectangle finalRect, MarkupDrawContext d)  { }
+
+        public override void ReadAttributes(XmlTextReader reader)
+        {
+            m_ImageSize = Size.Empty;
+            m_ImageSource = "";
+            m_Image = null;
+
+            for (int i = 0; i < reader.AttributeCount; i++)
+            {
+                reader.MoveToAttribute(i);
+                if (reader.Name.ToLower() == "width")
+                {
+                    string s = reader.Value;
+                    m_ImageSize.Width = int.Parse(s);
+                }
+                else if (reader.Name.ToLower() == "height")
+                {
+                    string s = reader.Value;
+                    m_ImageSize.Height = int.Parse(s);
+                }
+                else if (reader.Name.ToLower() == "src")
+                {
+                    m_ImageSource = reader.Value;
+                }
+            }
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/TextMarkup/Italic.cs b/PROMS/DotNetBar Source Code/TreeGX/TextMarkup/Italic.cs
new file mode 100644
index 00000000..ca42d0df
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/TextMarkup/Italic.cs	
@@ -0,0 +1,33 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+#if TREEGX
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#endif
+{
+    internal class Italic : FontChangeElement
+    {
+        #region Internal Implementation
+        protected override void SetFont(MarkupDrawContext d)
+        {
+            Font font = d.CurrentFont;
+            FontStyle style=font.Style | FontStyle.Italic;
+
+            if (!font.Italic && d.CurrentFont.FontFamily.IsStyleAvailable(style))
+                d.CurrentFont = new Font(font, style);
+            else
+                font = null;
+
+            if (font != null)
+                m_OldFont = font;
+
+            base.SetFont(d);
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/TextMarkup/MarkupDrawContext.cs b/PROMS/DotNetBar Source Code/TreeGX/TextMarkup/MarkupDrawContext.cs
new file mode 100644
index 00000000..64d44914
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/TextMarkup/MarkupDrawContext.cs	
@@ -0,0 +1,56 @@
+using System;
+using System.Drawing;
+using System.Text;
+
+#if TREEGX
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#endif
+{
+    internal class MarkupDrawContext
+    {
+        public Graphics Graphics = null;
+        public Font CurrentFont = null;
+        public Color CurrentForeColor = SystemColors.ControlText;
+        public bool RightToLeft = false;
+        public Point Offset = Point.Empty;
+        public bool HyperLink = false;
+        public HyperlinkStyle HyperlinkStyle = null;
+        public bool Underline = false;
+        public Rectangle ClipRectangle = Rectangle.Empty;
+        public bool HotKeyPrefixVisible = false;
+        public object ContextObject = null;
+        public bool AllowMultiLine = true;
+        public bool IgnoreFormattingColors = false;
+        public bool StrikeOut;
+
+        public MarkupDrawContext(Graphics g, Font currentFont, Color currentForeColor, bool rightToLeft) : this(g, currentFont, currentForeColor, rightToLeft, Rectangle.Empty, false)
+        {
+        }
+
+        public MarkupDrawContext(Graphics g, Font currentFont, Color currentForeColor, bool rightToLeft, Rectangle clipRectangle, bool hotKeyPrefixVisible)
+        {
+            this.Graphics = g;
+            this.CurrentFont = currentFont;
+            this.CurrentForeColor  = currentForeColor;
+            this.RightToLeft = rightToLeft;
+            this.ClipRectangle = clipRectangle;
+            this.HotKeyPrefixVisible = hotKeyPrefixVisible;
+        }
+
+        public MarkupDrawContext(Graphics g, Font currentFont, Color currentForeColor, bool rightToLeft, Rectangle clipRectangle, bool hotKeyPrefixVisible, object contextObject)
+        {
+            this.Graphics = g;
+            this.CurrentFont = currentFont;
+            this.CurrentForeColor = currentForeColor;
+            this.RightToLeft = rightToLeft;
+            this.ClipRectangle = clipRectangle;
+            this.HotKeyPrefixVisible = hotKeyPrefixVisible;
+            this.ContextObject = contextObject;
+        }
+
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/TextMarkup/MarkupElement.cs b/PROMS/DotNetBar Source Code/TreeGX/TextMarkup/MarkupElement.cs
new file mode 100644
index 00000000..a176b422
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/TextMarkup/MarkupElement.cs	
@@ -0,0 +1,178 @@
+using System;
+using System.Drawing;
+using System.Text;
+using System.Xml;
+
+#if TREEGX
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+using DevComponents.UI.ContentManager;
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#endif
+{
+    internal abstract class MarkupElement : IBlockExtended
+    {
+        #region Private Variables
+        private MarkupElementCollection m_Elements = null;
+        private MarkupElement m_Parent = null;
+        private Rectangle m_Bounds = Rectangle.Empty;
+        private bool m_Visible = true;
+        private bool m_SizeValid = false;
+        private Rectangle m_RenderBounds = Rectangle.Empty;
+        #endregion
+
+        #region Internal Implementation
+        public MarkupElement()
+        {
+            m_Elements = new MarkupElementCollection(this);
+        }
+
+        /// <summary>
+        /// Returns whether markup element is an block element that always consumes a whole line in layout.
+        /// </summary>
+        public virtual bool IsBlockElement
+        {
+            get { return false; }
+        }
+
+        /// <summary>
+        /// Returns whether layout manager switches to new line after processing this element.
+        /// </summary>
+        public virtual bool IsNewLineAfterElement
+        {
+            get { return false; }
+        }
+
+        /// <summary>
+        /// Returns whether layout manager can start new line with this element.
+        /// </summary>
+        public virtual bool CanStartNewLine
+        {
+            get { return true; }
+        }
+
+        /// <summary>
+        /// Gets the collection of child elements if any for this markup element.
+        /// </summary>
+        public virtual MarkupElementCollection Elements
+        {
+            get
+            {
+                if (m_Elements == null)
+                    m_Elements = new MarkupElementCollection(this);
+                return m_Elements; 
+            }
+        }
+
+        internal void InvalidateElementsSize()
+        {
+            this.IsSizeValid = false;
+            if (m_Elements==null || m_Elements.Count == 0)
+                return;
+            foreach (MarkupElement e in m_Elements)
+            {
+                e.InvalidateElementsSize();
+                e.IsSizeValid = false;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether element size is valid. When size is not valid element Measure method will be called to validate size.
+        /// </summary>
+        public virtual bool IsSizeValid
+        {
+            get { return m_SizeValid; }
+            set { m_SizeValid = value; }
+        }
+
+        /// <summary>
+        /// Gets element parent or null if parent is not set.
+        /// </summary>
+        public virtual MarkupElement Parent
+        {
+            get { return m_Parent; }
+        }
+
+        internal void SetParent(MarkupElement parent)
+        {
+            m_Parent = parent;
+        }
+
+        /// <summary>
+        /// Gets or sets actual rendering bounds.
+        /// </summary>
+        public Rectangle Bounds
+        {
+            get { return m_Bounds; }
+            set { m_Bounds = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether markup element is visible.
+        /// </summary>
+        public bool Visible
+        {
+            get { return m_Visible; }
+            set { m_Visible = value; }
+        }
+
+        /// <summary>
+        /// Measures the element given available size.
+        /// </summary>
+        /// <param name="availableSize">Size available to element</param>
+        /// <param name="g">Reference to graphics object</param>
+        public abstract void Measure(Size availableSize, MarkupDrawContext d);
+
+        /// <summary>
+        /// Measures the end tag of an element. Most implementations do not need to do anything but implementations like the ones
+        /// that change color should return state back at this time.
+        /// </summary>
+        /// <param name="availableSize"></param>
+        /// <param name="d"></param>
+        public virtual void MeasureEnd(Size availableSize, MarkupDrawContext d) { }
+
+        /// <summary>
+        /// Renders element.
+        /// </summary>
+        /// <param name="d">Provides markup drawing context information.</param>
+        public abstract void Render(MarkupDrawContext d);
+
+        /// <summary>
+        /// Renders element tag end. Most implementations do not need to do anything but mplementations like the ones
+        /// that change color should return state back at this time.
+        /// </summary>
+        /// <param name="d">Provides markup drawing context information.</param>
+        public virtual void RenderEnd(MarkupDrawContext d) { }
+
+        /// <summary>
+        /// Provides final rectangle to element and lets it arrange it's content given new constraint.
+        /// </summary>
+        /// <param name="finalRect">Final rectangle.</param>
+        /// <param name="g"></param>
+        protected abstract void ArrangeCore(Rectangle finalRect, MarkupDrawContext d);
+
+        /// <summary>
+        /// Arranges the element given the final size. Layout is two step process with Measure followed by Arrange.
+        /// </summary>
+        /// <param name="finalSize"></param>
+        /// <param name="g"></param>
+        public void Arrange(Rectangle finalSize, MarkupDrawContext d)
+        {
+            this.ArrangeCore(finalSize, d);
+        }
+
+        public virtual void ReadAttributes(XmlTextReader reader) { }
+
+        /// <summary>
+        /// Gets or sets actual rendered bounds for a give markup element if applicable.
+        /// </summary>
+        public Rectangle RenderBounds
+        {
+            get { return m_RenderBounds; }
+            set { m_RenderBounds = value; }
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/TextMarkup/MarkupElementCollection.cs b/PROMS/DotNetBar Source Code/TreeGX/TextMarkup/MarkupElementCollection.cs
new file mode 100644
index 00000000..5c784ec5
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/TextMarkup/MarkupElementCollection.cs	
@@ -0,0 +1,139 @@
+using System;
+using System.Text;
+using System.Collections;
+
+#if TREEGX
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#endif
+{
+    internal class MarkupElementCollection : CollectionBase
+    {
+        #region Private Variables
+        private MarkupElement m_Parent = null;
+        #endregion
+
+        #region Internal Implementation
+        /// <summary>Creates new instance of the class.</summary>
+        public MarkupElementCollection(MarkupElement parent)
+		{
+            m_Parent = parent;
+		}
+
+        /// <summary>
+        /// Gets or sets the collection parent element.
+        /// </summary>
+        public MarkupElement Parent
+        {
+            get { return m_Parent; }
+            set { m_Parent = value; }
+        }
+
+		/// <summary>
+		/// Adds new object to the collection.
+		/// </summary>
+		/// <param name="MarkupElement">Object to add.</param>
+		/// <returns>Index of newly added object.</returns>
+		public int Add(MarkupElement MarkupElement)
+		{
+			return List.Add(MarkupElement);
+		}
+		/// <summary>
+		/// Returns reference to the object in collection based on it's index.
+		/// </summary>
+		public MarkupElement this[int index]
+		{
+			get {return (MarkupElement)(List[index]);}
+			set {List[index] = value;}
+		}
+
+		/// <summary>
+		/// Inserts new object into the collection.
+		/// </summary>
+		/// <param name="index">Position of the object.</param>
+		/// <param name="value">Object to insert.</param>
+		public void Insert(int index, MarkupElement value) 
+		{
+			List.Insert(index, value);
+		}
+
+		/// <summary>
+		/// Returns index of the object inside of the collection.
+		/// </summary>
+		/// <param name="value">Reference to the object.</param>
+		/// <returns>Index of the object.</returns>
+		public int IndexOf(MarkupElement value) 
+		{
+			return List.IndexOf(value);
+		}
+
+		/// <summary>
+		/// Returns whether collection contains specified object.
+		/// </summary>
+		/// <param name="value">Object to look for.</param>
+		/// <returns>true if object is part of the collection, otherwise false.</returns>
+		public bool Contains(MarkupElement value) 
+		{
+			return List.Contains(value);
+		}
+
+		/// <summary>
+		/// Removes specified object from the collection.
+		/// </summary>
+		/// <param name="value"></param>
+		public void Remove(MarkupElement value) 
+		{
+			List.Remove(value);
+		}
+
+		protected override void OnRemoveComplete(int index,object value)
+		{
+			base.OnRemoveComplete(index,value);
+			MarkupElement me=value as MarkupElement;
+            if (m_Parent != null)
+            {
+                me.SetParent(null);
+                m_Parent.IsSizeValid = false;
+            }
+		}
+		protected override void OnInsertComplete(int index,object value)
+		{
+			base.OnInsertComplete(index,value);
+			MarkupElement me=value as MarkupElement;
+            if (m_Parent != null)
+            {
+                me.SetParent(m_Parent);
+                m_Parent.IsSizeValid = false;
+            }
+		}
+
+		/// <summary>
+		/// Copies collection into the specified array.
+		/// </summary>
+		/// <param name="array">Array to copy collection to.</param>
+		/// <param name="index">Starting index.</param>
+		public void CopyTo(MarkupElement[] array, int index) 
+		{
+			List.CopyTo(array, index);
+		}
+
+		/// <summary>
+		/// Copies contained items to the MarkupElement array.
+		/// </summary>
+		/// <param name="array">Array to copy to.</param>
+		internal void CopyTo(MarkupElement[] array)
+		{
+			List.CopyTo(array,0);
+		}
+
+		protected override void OnClear()
+		{
+			base.OnClear();
+		}
+
+		#endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/TextMarkup/MarkupLayoutManager.cs b/PROMS/DotNetBar Source Code/TreeGX/TextMarkup/MarkupLayoutManager.cs
new file mode 100644
index 00000000..6bd76204
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/TextMarkup/MarkupLayoutManager.cs	
@@ -0,0 +1,39 @@
+using System.Collections;
+using System.Drawing;
+using System.Text;
+
+#if TREEGX
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+using DevComponents.UI.ContentManager;
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#endif
+{
+    internal class MarkupLayoutManager : BlockLayoutManager
+    {
+        private MarkupDrawContext m_MarkupDrawContext = null;
+
+        public MarkupDrawContext MarkupDrawContext
+        {
+            get { return m_MarkupDrawContext; }
+            set { m_MarkupDrawContext = value; }
+        }
+
+        public override void Layout(IBlock block, Size availableSize)
+        {
+            if (block is MarkupElement)
+            {
+                MarkupElement m = block as MarkupElement;
+                if(!m.IsSizeValid)
+                    m.Measure(availableSize, m_MarkupDrawContext);
+            }
+        }
+
+        public override Rectangle FinalizeLayout(Rectangle containerBounds, Rectangle blocksBounds, ArrayList lines)
+        {
+            return (blocksBounds);
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/TextMarkup/MarkupParser.cs b/PROMS/DotNetBar Source Code/TreeGX/TextMarkup/MarkupParser.cs
new file mode 100644
index 00000000..4b8f86fe
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/TextMarkup/MarkupParser.cs	
@@ -0,0 +1,252 @@
+using System;
+using System.Text;
+using System.IO;
+using System.Xml;
+using System.Collections;
+using System.Text.RegularExpressions;
+
+#if TREEGX
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#endif
+{
+    internal class MarkupParser
+    {
+        #region Private Variables
+        private static string TextElementName = "text";
+        private static string BodyTag = "body";
+        #endregion
+
+        #region Internal Implementation
+        public static BodyElement Parse(string text)
+        {
+            StringBuilder plainText = new StringBuilder(text.Length);
+            BodyElement root = new BodyElement();
+            root.HasExpandElement = false;
+            MarkupElement currentParent = root;
+            Stack openTags = new Stack();
+            openTags.Push(root);
+            // Input text is not wrapped into the container tag so we wrap it here
+            text = text.Replace("&nbsp;", "{ent_nbsp}");
+            text = text.Replace("&zwsp;", "{ent_zwsp}");
+            text = text.Replace("&lt;", "{ent_lt}");
+            text = text.Replace("&gt;", "{ent_gt}");
+            text = text.Replace("&amp;", "{ent_amp}");
+            text = text.Replace("|", "{ent_l}");
+            text = text.Replace("&", "|");
+            text = text.Replace("{ent_nbsp}", "&nbsp;");
+            text = text.Replace("{ent_zwsp}", "&zwsp;"); 
+            text = text.Replace("{ent_lt}", "&lt;");
+            text = text.Replace("{ent_gt}", "&gt;");
+            StringReader sr = new StringReader("<"+BodyTag+">" + text + "</"+BodyTag+">");
+#if !DEBUG
+            try
+#endif
+            {
+                XmlTextReader reader = new XmlTextReader(sr);
+                //reader.EntityHandling = EntityHandling.ExpandCharEntities;
+                while (reader.Read())
+                {
+                    if (reader.NodeType == XmlNodeType.Element)
+                    {
+                        if (reader.Name == BodyTag)
+                            continue;
+                        MarkupElement el = CreateMarkupElement(reader.Name);
+                        if (el == null)
+                        {
+                            reader.Skip();
+                            continue;
+                        }
+                        else if (el is ExpandElement)
+                            root.HasExpandElement = true;
+
+                        if (el is IActiveMarkupElement)
+                            root.ActiveElements.Add(el);
+
+                        // Parse any attributes here
+                        if (reader.AttributeCount > 0)
+                        {
+                            el.ReadAttributes(reader);
+                            reader.MoveToElement();
+                        }
+
+                        currentParent.Elements.Add(el);
+
+                        if (el is ContainerElement)
+                            currentParent = el;
+
+                        if (!reader.IsEmptyElement)
+                            openTags.Push(el);
+                    }
+                    else if (reader.NodeType == XmlNodeType.Text)
+                    {
+                        if (reader.Value.Length == 1)
+                        {
+                            TextElement el = CreateMarkupElement(TextElementName) as TextElement;
+                            if (reader.Value == " ")
+                            {
+                                el.TrailingSpace = true;
+                                plainText.Append(' ');
+                            }
+                            else
+                            {
+                                el.Text = reader.Value;
+                                el.Text = el.Text.Replace("|", "&");
+                                el.Text = el.Text.Replace("{ent_l}", "|");
+                                el.Text = el.Text.Replace("{ent_amp}", "&&");
+                                plainText.Append(el.Text+" ");
+                            }
+                            currentParent.Elements.Add(el);
+                        }
+                        else
+                        {
+                            string s = reader.Value;
+                            if (s.StartsWith("\r\n"))
+                                s = s.TrimStart(new char[] { '\r', '\n' });
+                            s = s.Replace("\r\n", " ");
+                            string[] words = s.Split(' ');
+                            bool space = false;
+                            if (currentParent.Elements.Count > 0 && currentParent.Elements[currentParent.Elements.Count - 1] is NewLine)
+                                space = true;
+                            for (int i = 0; i < words.Length; i++)
+                            {
+                                if (words[i].Length == 0)
+                                {
+                                    if (space)
+                                        continue;
+                                    space = true;
+                                }
+                                else
+                                    space = false;
+
+                                TextElement el = CreateMarkupElement(TextElementName) as TextElement;
+                                el.Text = words[i].Replace("|","&");
+                                el.Text = el.Text.Replace("{ent_l}", "|");
+                                el.Text = el.Text.Replace("{ent_amp}", "&&");
+                                plainText.Append(el.Text + " ");
+                                if (i < words.Length - 1)
+                                {
+                                    el.TrailingSpace = true;
+                                    space = true;
+                                }
+
+                                currentParent.Elements.Add(el);
+                            }
+                        }
+                    }
+                    else if (reader.NodeType == XmlNodeType.Whitespace)
+                    {
+                        if (reader.Value.IndexOf(' ') >= 0)
+                        {
+                            TextElement el = CreateMarkupElement(TextElementName) as TextElement;
+                            el.TrailingSpace = true;
+                            currentParent.Elements.Add(el);
+                        }
+                    }
+                    else if (reader.NodeType == XmlNodeType.EntityReference)
+                    {
+                        TextElement el = CreateMarkupElement(TextElementName) as TextElement;
+                        if (reader.Name == "nbsp")
+                        {
+                            el.TrailingSpace = true;
+                        }
+                        else if (reader.Name == "zwsp")
+                        {
+                            el.TrailingSpace = false;
+                        }
+                        else
+                            el.Text = reader.Name;
+                        el.EnablePrefixHandling = false;
+                        currentParent.Elements.Add(el);
+                    }
+                    else if (reader.NodeType == XmlNodeType.EndElement)
+                    {
+                        MarkupElement el = openTags.Pop() as MarkupElement;
+                        if (el != currentParent)
+                        {
+                            currentParent.Elements.Add(new EndMarkupElement(el));
+                        }
+                        else
+                        {
+                            if (currentParent != root)
+                                currentParent = currentParent.Parent;
+                        }
+                    }
+                }
+            }
+#if !DEBUG
+            catch
+            {
+                return null;
+            }
+#endif
+            root.PlainText = plainText.ToString();
+            return root;
+        }
+
+        public static MarkupElement CreateMarkupElement(string elementName)
+        {
+            if (elementName == "b" || elementName == "strong")
+                return new Strong();
+            else if (elementName == "i" || elementName == "em")
+                return new Italic();
+            else if (elementName == "u")
+                return new Underline();
+            else if (elementName == "br")
+                return new NewLine();
+            else if (elementName == "expand")
+                return new ExpandElement();
+            else if (elementName == "a")
+                return new HyperLink();
+            else if (elementName == "p")
+                return new Paragraph();
+            else if (elementName == "div")
+                return new Div();
+            else if (elementName == "span")
+                return new Span();
+            else if (elementName == "img")
+                return new ImageElement();
+            else if (elementName == "h1")
+                return new Heading();
+            else if (elementName == "h2")
+                return new Heading(2);
+            else if (elementName == "h3")
+                return new Heading(3);
+            else if (elementName == "h4")
+                return new Heading(4);
+            else if (elementName == "h5")
+                return new Heading(5);
+            else if (elementName == "h6")
+                return new Heading(6);
+            else if (elementName == "font")
+                return new FontElement();
+            else if (elementName == "s" || elementName == "strike")
+                return new Strike();
+            else if (elementName == TextElementName)
+                return new TextElement();
+
+            return null;
+        }
+
+        /// <summary>
+        /// Tests whether input text could be markup text.
+        /// </summary>
+        /// <param name="text">Text to test.</param>
+        /// <returns>true if text could be markup, otherwise false</returns>
+        public static bool IsMarkup(ref string text)
+        {
+            if (text.IndexOf("</") < 0 && text.IndexOf("/>") < 0)
+                return false;
+            return true;
+        }
+
+        internal static string RemoveExpand(string text)
+        {
+            return Regex.Replace(text, "<expand.*?>", "", RegexOptions.IgnoreCase);
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/TextMarkup/MarkupSettings.cs b/PROMS/DotNetBar Source Code/TreeGX/TextMarkup/MarkupSettings.cs
new file mode 100644
index 00000000..c929bdba
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/TextMarkup/MarkupSettings.cs	
@@ -0,0 +1,145 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+#if TREEGX
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#endif
+{
+#if FRAMEWORK20
+    public static class MarkupSettings
+#else
+    public class MarkupSettings
+#endif
+    {
+        private static HyperlinkStyle _NormalHyperlink = new HyperlinkStyle(Color.Blue, eHyperlinkUnderlineStyle.SolidLine);
+        /// <summary>
+        /// Gets the style of the hyperlink in its default state.
+        /// </summary>
+        public static HyperlinkStyle NormalHyperlink
+        {
+            get { return _NormalHyperlink; }
+        }
+
+        private static HyperlinkStyle _MouseOverHyperlink = new HyperlinkStyle();
+        /// <summary>
+        /// Gets the style of the hyperlink when mouse is over the link.
+        /// </summary>
+        public static HyperlinkStyle MouseOverHyperlink
+        {
+            get { return _MouseOverHyperlink; }
+        }
+
+        private static HyperlinkStyle _VisitedHyperlink = new HyperlinkStyle();
+        /// <summary>
+        /// Gets the style of the visited hyperlink.
+        /// </summary>
+        public static HyperlinkStyle VisitedHyperlink
+        {
+            get { return _VisitedHyperlink; }
+        }
+    }
+
+    /// <summary>
+    /// Defines the text-markup hyperlink appearance style.
+    /// </summary>
+    public class HyperlinkStyle
+    {
+        /// <summary>
+        /// Initializes a new instance of the HyperlinkStyle class.
+        /// </summary>
+        public HyperlinkStyle()
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the HyperlinkStyle class.
+        /// </summary>
+        /// <param name="textColor"></param>
+        /// <param name="underlineStyle"></param>
+        public HyperlinkStyle(Color textColor, eHyperlinkUnderlineStyle underlineStyle)
+        {
+            _TextColor = textColor;
+            _UnderlineStyle = underlineStyle;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the HyperlinkStyle class.
+        /// </summary>
+        /// <param name="textColor"></param>
+        /// <param name="backColor"></param>
+        /// <param name="underlineStyle"></param>
+        public HyperlinkStyle(Color textColor, Color backColor, eHyperlinkUnderlineStyle underlineStyle)
+        {
+            _TextColor = textColor;
+            _BackColor = backColor;
+            _UnderlineStyle = underlineStyle;
+        }
+        private Color _TextColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets hyperlink text color.
+        /// </summary>
+        public Color TextColor
+        {
+            get { return _TextColor; }
+            set
+            {
+                if (_TextColor != value)
+                {
+                    _TextColor = value;
+                }
+            }
+        }
+
+        private Color _BackColor = Color.Empty;
+        /// <summary>
+        /// Gets or sets hyperlink back color.
+        /// </summary>
+        public Color BackColor
+        {
+            get { return _BackColor; }
+            set
+            {
+                if (_BackColor != value)
+                {
+                    _BackColor = value;
+                }
+            }
+        }
+
+        private eHyperlinkUnderlineStyle _UnderlineStyle = eHyperlinkUnderlineStyle.None;
+        /// <summary>
+        /// Gets or sets the underline style for the hyperlink.
+        /// </summary>
+        public eHyperlinkUnderlineStyle UnderlineStyle
+        {
+            get { return _UnderlineStyle; }
+            set
+            {
+                if (_UnderlineStyle != value)
+                {
+                    _UnderlineStyle = value;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets whether style has been changed from its default state.
+        /// </summary>
+        public bool IsChanged
+        {
+            get { return !_TextColor.IsEmpty || !_BackColor.IsEmpty || _UnderlineStyle != eHyperlinkUnderlineStyle.None; }
+        }
+    }
+
+    public enum eHyperlinkUnderlineStyle
+    {
+        None,
+        SolidLine,
+        DashedLine
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/TextMarkup/NewLine.cs b/PROMS/DotNetBar Source Code/TreeGX/TextMarkup/NewLine.cs
new file mode 100644
index 00000000..369c18b4
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/TextMarkup/NewLine.cs	
@@ -0,0 +1,45 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+#if TREEGX
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#endif
+{
+    internal class NewLine : MarkupElement
+    {
+        #region Internal Implementation
+        public override void Measure(System.Drawing.Size availableSize, MarkupDrawContext d)
+        {
+            // Causes layout manager to switch to the new line
+            this.Bounds = new Rectangle(0, 0, 0, d.CurrentFont.Height);
+        }
+
+        /// <summary>
+        /// Gets or sets whether element size is valid. When size is not valid element Measure method will be called to validate size.
+        /// </summary>
+        public override bool IsSizeValid
+        {
+            get { return false; }
+            set {  }
+        }
+
+        public override void Render(MarkupDrawContext d) {}
+
+        protected override void ArrangeCore(System.Drawing.Rectangle finalRect, MarkupDrawContext d) { }
+
+        /// <summary>
+        /// Returns whether layout manager switches to new line after processing this element.
+        /// </summary>
+        public override bool IsNewLineAfterElement
+        {
+            get { return true; }
+        }
+
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/TextMarkup/Paragraph.cs b/PROMS/DotNetBar Source Code/TreeGX/TextMarkup/Paragraph.cs
new file mode 100644
index 00000000..8d3c756a
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/TextMarkup/Paragraph.cs	
@@ -0,0 +1,27 @@
+using System;
+using System.Text;
+using System.Drawing;
+using System.Xml;
+
+#if TREEGX
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+using DevComponents.UI.ContentManager;
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#endif
+{
+    internal class Paragraph : Div
+    {
+        #region Internal Implementation
+        protected override void ArrangeInternal(Rectangle bounds, MarkupDrawContext d)
+        {
+            base.ArrangeInternal(bounds, d);
+            this.Bounds = new Rectangle(this.Bounds.X, this.Bounds.Y, this.Bounds.Width , this.Bounds.Height + d.CurrentFont.Height);
+        }
+        #endregion
+    }
+
+    
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/TextMarkup/Span.cs b/PROMS/DotNetBar Source Code/TreeGX/TextMarkup/Span.cs
new file mode 100644
index 00000000..ecde34fe
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/TextMarkup/Span.cs	
@@ -0,0 +1,23 @@
+using System;
+using System.Text;
+
+#if TREEGX
+using DevComponents.Tree;
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#endif
+{
+    internal class Span : Div
+    {
+        /// <summary>
+        /// Returns whether markup element is an block element that always consumes a whole line in layout.
+        /// </summary>
+        public override bool IsBlockElement
+        {
+            get { return false; }
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/TextMarkup/Strike.cs b/PROMS/DotNetBar Source Code/TreeGX/TextMarkup/Strike.cs
new file mode 100644
index 00000000..1a4d76ae
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/TextMarkup/Strike.cs	
@@ -0,0 +1,34 @@
+using System.Drawing;
+
+#if TREEGX
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#endif
+{
+    internal class Strike : MarkupElement
+    {
+        public override void Measure(Size availableSize, MarkupDrawContext d)
+        {
+            Bounds = Rectangle.Empty;
+        }
+
+        public override void Render(MarkupDrawContext d)
+        {
+            d.StrikeOut = true;
+        }
+
+        public override void RenderEnd(MarkupDrawContext d)
+        {
+            d.StrikeOut = false;
+
+            base.RenderEnd(d);
+        }
+
+        protected override void ArrangeCore(Rectangle finalRect, MarkupDrawContext d)
+        {
+        }
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/TextMarkup/Strong.cs b/PROMS/DotNetBar Source Code/TreeGX/TextMarkup/Strong.cs
new file mode 100644
index 00000000..15d1edbb
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/TextMarkup/Strong.cs	
@@ -0,0 +1,33 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+#if TREEGX
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#endif
+{
+    internal class Strong : FontChangeElement
+    {
+        #region Internal Implementation
+        protected override void SetFont(MarkupDrawContext d)
+        {
+            Font font = d.CurrentFont;
+            FontStyle style = d.CurrentFont.Style | FontStyle.Bold;
+
+            if (!font.Bold && font.FontFamily.IsStyleAvailable(style))
+                d.CurrentFont = new Font(d.CurrentFont, style);
+            else
+                font = null;
+
+            if (font != null)
+                m_OldFont = font;
+
+            base.SetFont(d);
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/TextMarkup/TextElement.cs b/PROMS/DotNetBar Source Code/TreeGX/TextMarkup/TextElement.cs
new file mode 100644
index 00000000..81e8ea7d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/TextMarkup/TextElement.cs	
@@ -0,0 +1,221 @@
+using System;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Text;
+using DevComponents.Tree.Helpers;
+
+#if TREEGX
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#endif
+{
+    internal class TextElement : MarkupElement
+    {
+        private static bool PadText = false;
+        static TextElement()
+        {
+            string lc = System.Windows.Forms.Application.CurrentCulture.TwoLetterISOLanguageName;
+            if (lc == "ja")
+                PadText = true;
+        }
+        #region Private Variables
+        private string m_Text = "";
+        private bool m_TrailingSpace = false;
+        private bool m_EnablePrefixHandling = true;
+        #endregion
+
+        #region Internal Implementation
+        public override void Measure(System.Drawing.Size availableSize, MarkupDrawContext d)
+        {
+            if (TextDrawing.UseTextRenderer)
+            {
+                eTextFormat format = eTextFormat.Default | eTextFormat.NoPadding;
+                if (!d.HotKeyPrefixVisible || m_EnablePrefixHandling)
+                    format |= eTextFormat.HidePrefix;
+                Size size = Size.Empty;
+                if (m_TrailingSpace)
+                {
+                    if (d.CurrentFont.Italic)
+                    {
+                        size = Size.Ceiling(TextDrawing.MeasureString(d.Graphics, m_Text, d.CurrentFont, 0, format));
+                        size.Width += (int)(d.Graphics.MeasureString("||", d.CurrentFont).Width / 4);
+                    }
+                    else
+                        size = Size.Ceiling(TextDrawing.MeasureString(d.Graphics, m_Text + (SystemHelpers.IsVista && m_Text.Length > 0 ? "|" : "||"), d.CurrentFont, 0, format));
+                }
+                else
+                    size = Size.Ceiling(TextDrawing.MeasureString(d.Graphics, m_Text, d.CurrentFont, 0, format));
+                if (PadText)
+                {
+                    size.Width += TextSettings.TextMarkupCultureSpecificPadding;
+                    size.Height += TextSettings.TextMarkupCultureSpecificPadding;
+                }
+                this.Bounds = new Rectangle(Point.Empty, size);
+            }
+            else
+            {
+                using (StringFormat format = new StringFormat(StringFormat.GenericTypographic))
+                {
+                    format.FormatFlags = StringFormatFlags.NoWrap;
+                    if (d.HotKeyPrefixVisible || !m_EnablePrefixHandling)
+                        format.HotkeyPrefix = System.Drawing.Text.HotkeyPrefix.Show;
+                    else
+                        format.HotkeyPrefix = System.Drawing.Text.HotkeyPrefix.Hide;
+
+                    if (m_TrailingSpace)
+                    {
+                        if (d.CurrentFont.Italic)
+                        {
+                            Size size = Size.Ceiling(d.Graphics.MeasureString(m_Text, d.CurrentFont, 0, format));
+                            size.Width += (int)(d.Graphics.MeasureString("|", d.CurrentFont).Width / 4);
+                            if (PadText)
+                            {
+                                size.Width += TextSettings.TextMarkupCultureSpecificPadding;
+                                size.Height += TextSettings.TextMarkupCultureSpecificPadding;
+                            }
+                            this.Bounds = new Rectangle(Point.Empty, size);
+                        }
+                        else
+                        {
+                            Size size = Size.Ceiling(d.Graphics.MeasureString(m_Text + "|", d.CurrentFont, 0, format));
+                            if (PadText)
+                            {
+                                size.Width += TextSettings.TextMarkupCultureSpecificPadding;
+                                size.Height += TextSettings.TextMarkupCultureSpecificPadding;
+                            }
+                            this.Bounds = new Rectangle(Point.Empty, size);
+                        }
+                    }
+                    else
+                    {
+                        Size size = Size.Ceiling(d.Graphics.MeasureString(m_Text, d.CurrentFont, 0, format));
+                        if (PadText)
+                        {
+                            size.Width += TextSettings.TextMarkupCultureSpecificPadding;
+                            size.Height += TextSettings.TextMarkupCultureSpecificPadding;
+                        }
+                        this.Bounds = new Rectangle(Point.Empty, size);
+                    }
+                }
+            }
+            IsSizeValid = true;
+        }
+
+        public override void Render(MarkupDrawContext d)
+        {
+            Rectangle r = this.Bounds;
+            r.Offset(d.Offset);
+
+            if (!d.ClipRectangle.IsEmpty && !r.IntersectsWith(d.ClipRectangle))
+                return;
+
+            Graphics g = d.Graphics;
+            #if (FRAMEWORK20)
+            if (TextDrawing.UseTextRenderer)
+            {
+                eTextFormat format = eTextFormat.Default | eTextFormat.NoClipping | eTextFormat.NoPadding;
+                if (d.RightToLeft) format |= eTextFormat.RightToLeft;
+                if (!d.HotKeyPrefixVisible)
+                    format |= eTextFormat.HidePrefix;
+
+                if (!d.ClipRectangle.IsEmpty && r.Right > d.ClipRectangle.Right)
+                {
+                    format|= eTextFormat.EndEllipsis;
+                    r.Width -= (r.Right - d.ClipRectangle.Right);
+                }
+                TextDrawing.DrawString(g, m_Text, d.CurrentFont, d.CurrentForeColor, r, format);
+                
+            }
+            else
+            #endif
+            {
+                using (StringFormat format = new StringFormat(StringFormat.GenericTypographic))
+                {
+                    format.FormatFlags |= StringFormatFlags.NoWrap;
+                    if (d.RightToLeft) format.FormatFlags |= StringFormatFlags.DirectionRightToLeft;
+                    if (d.HotKeyPrefixVisible)
+                        format.HotkeyPrefix = System.Drawing.Text.HotkeyPrefix.Show;
+                    else
+                        format.HotkeyPrefix = System.Drawing.Text.HotkeyPrefix.Hide;
+                    if (!d.ClipRectangle.IsEmpty && r.Right > d.ClipRectangle.Right)
+                    {
+                        format.Trimming = StringTrimming.EllipsisCharacter;
+                        r.Width -= (r.Right - d.ClipRectangle.Right);
+                    }
+                    
+                    using (SolidBrush brush = new SolidBrush(d.CurrentForeColor))
+                        g.DrawString(m_Text, d.CurrentFont, brush, r, format);
+                }
+            }
+
+            if (d.StrikeOut == true)
+            {
+                // StrikeOut
+
+                float descent = d.CurrentFont.FontFamily.GetCellDescent(d.CurrentFont.Style) *
+                    d.CurrentFont.Size / d.CurrentFont.FontFamily.GetEmHeight(d.CurrentFont.Style) + 1;
+
+                using (Pen pen = new Pen(d.CurrentForeColor, 1))
+                {
+                    SmoothingMode sm = g.SmoothingMode;
+                    g.SmoothingMode = SmoothingMode.Default;
+
+                    float y = r.Top + (r.Height + descent) / 2;
+
+                    g.DrawLine(pen, r.X, y, r.Right - 1, y);
+                    g.SmoothingMode = sm;
+                }
+            }
+
+            if ((d.HyperLink && (d.HyperlinkStyle == null || d.HyperlinkStyle.UnderlineStyle != eHyperlinkUnderlineStyle.None)) || d.Underline)
+            {
+                // Underline Hyperlink
+                float descent = d.CurrentFont.FontFamily.GetCellDescent(d.CurrentFont.Style) * d.CurrentFont.Size / d.CurrentFont.FontFamily.GetEmHeight(d.CurrentFont.Style);
+                using (Pen pen = new Pen(d.CurrentForeColor, 1))
+                {
+                    if (d.HyperLink && d.HyperlinkStyle != null && d.HyperlinkStyle.UnderlineStyle == eHyperlinkUnderlineStyle.DashedLine)
+                        pen.DashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
+                    descent -= 1;
+                    System.Drawing.Drawing2D.SmoothingMode sm = g.SmoothingMode;
+                    g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.Default;
+                    g.DrawLine(pen, r.X, r.Bottom - descent, r.Right - 1, r.Bottom - descent);
+                    g.SmoothingMode = sm;
+                }
+            }
+
+            this.RenderBounds = r;
+        }
+
+        protected override void ArrangeCore(System.Drawing.Rectangle finalRect, MarkupDrawContext d) {}
+
+        public string Text
+        {
+            get { return m_Text; }
+            set
+            {
+                m_Text = value;
+                this.IsSizeValid = false;
+            }
+        }
+
+        public bool TrailingSpace
+        {
+            get { return m_TrailingSpace; }
+            set
+            {
+                m_TrailingSpace = value;
+                this.IsSizeValid = false;
+            }
+        }
+
+        public bool EnablePrefixHandling
+        {
+            get { return m_EnablePrefixHandling; }
+            set { m_EnablePrefixHandling = value; }
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/TextMarkup/Underline.cs b/PROMS/DotNetBar Source Code/TreeGX/TextMarkup/Underline.cs
new file mode 100644
index 00000000..60e690f4
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/TextMarkup/Underline.cs	
@@ -0,0 +1,46 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+#if TREEGX
+namespace DevComponents.Tree.TextMarkup
+#elif DOTNETBAR
+namespace DevComponents.DotNetBar.TextMarkup
+#elif SUPERGRID
+namespace DevComponents.SuperGrid.TextMarkup
+#endif
+{
+    internal class Underline : FontChangeElement
+    {
+        #region Internal Implementation
+        protected override void SetFont(MarkupDrawContext d)
+        {
+            d.Underline = true;
+            //Font font = d.CurrentFont;
+            //FontStyle style = d.CurrentFont.Style | FontStyle.Underline;
+
+            //if (!font.Underline && font.FontFamily.IsStyleAvailable(style))
+            //    d.CurrentFont = new Font(font, style);
+            //else
+            //    font = null;
+
+            //if (font != null)
+            //    m_OldFont = font;
+
+            base.SetFont(d);
+        }
+
+        public override void MeasureEnd(Size availableSize, MarkupDrawContext d)
+        {
+            d.Underline = false;
+            base.MeasureEnd(availableSize, d);
+        }
+
+        public override void RenderEnd(MarkupDrawContext d)
+        {
+            d.Underline = false;
+            base.RenderEnd(d);
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/TextSettings.cs b/PROMS/DotNetBar Source Code/TreeGX/TextSettings.cs
new file mode 100644
index 00000000..df2dc9ec
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/TextSettings.cs	
@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace DevComponents.Tree
+{
+    /// <summary>
+    /// Defines settings for text rendering.
+    /// </summary>
+    internal static class TextSettings
+    {
+        private static int _TextMarkupCultureSpecific = 3;
+        /// <summary>
+        /// Get or sets the text-markup padding for text measurement when running on Japanese version of Windows.
+        /// </summary>
+        public static int TextMarkupCultureSpecificPadding
+        {
+            get { return _TextMarkupCultureSpecific; }
+            set
+            {
+                _TextMarkupCultureSpecific = value;
+            }
+        }
+        
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/TreeAreaInfo.cs b/PROMS/DotNetBar Source Code/TreeGX/TreeAreaInfo.cs
new file mode 100644
index 00000000..36dd076d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/TreeAreaInfo.cs	
@@ -0,0 +1,25 @@
+namespace DevComponents.Tree
+{
+	/// <summary>
+	/// Summary description for TreeAreaInfo.
+	/// </summary>
+	internal class TreeAreaInfo
+	{
+		/// <summary>
+		/// Reference to parent node in which child bounds the coordinates are. Can be null if no parent node contains given coordinates.
+		/// </summary>
+		public Node ParentAreaNode=null;
+		/// <summary>
+		/// Node which contains specified coordinates. Can be null if no node contains coordinates.
+		/// </summary>
+		public Node NodeAt=null;
+		/// <summary>
+		/// Previous reference node for given coordinates. If coordinates fall between two nodes this will indicate previous node or null.
+		/// </summary>
+		public Node PreviousNode=null;
+		/// <summary>
+		/// Next reference node for given coordinates. If coordinates fall between two nodes this will indicate next node or null.
+		/// </summary>
+		public Node NextNode=null;
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/TreeGX.cs b/PROMS/DotNetBar Source Code/TreeGX/TreeGX.cs
new file mode 100644
index 00000000..996c9781
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/TreeGX.cs	
@@ -0,0 +1,4549 @@
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.Drawing;
+using System.Data;
+using System.Runtime.InteropServices;
+using System.Windows.Forms;
+using DevComponents.Tree.Display;
+using DevComponents.Tree.Layout;
+using System.Xml;
+using System.IO;
+
+namespace DevComponents.Tree
+{
+	/// <summary>
+	/// Summary description for UserControl1.
+	/// </summary>
+	[ToolboxItem(true),DefaultEvent("Click"),System.Runtime.InteropServices.ComVisible(false),Designer(typeof(Design.TreeGXDesigner)),ToolboxBitmap(typeof(TreeGX),"TreeGX.ico")]
+	public class TreeGX : System.Windows.Forms.ContainerControl, INodeNotify, ISupportInitialize
+	{
+		#region Private Variables
+		private ElementStyleCollection m_Styles=new ElementStyleCollection();
+		private ColumnHeaderCollection m_Columns=new ColumnHeaderCollection();
+		private NodeCollection m_Nodes=new NodeCollection();
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.Container components = null;
+
+		private ElementStyle m_CellStyleDefault=null;
+		private ElementStyle m_CellStyleMouseDown=null;
+		private ElementStyle m_CellStyleMouseOver=null;
+		private ElementStyle m_CellStyleSelected=null;
+		private ElementStyle m_CellStyleDisabled=null;
+		private ElementStyle m_NodeStyleExpanded=null;
+		private ElementStyle m_NodeStyle=null;
+		private ElementStyle m_NodeStyleSelected=null;
+		private ElementStyle m_NodeStyleMouseOver=null;
+
+		private ElementStyle m_ColumnStyleNormal=null;
+		private ElementStyle m_ColumnStyleMouseOver=null;
+		private ElementStyle m_ColumnStyleMouseDown=null;
+
+		private Layout.NodeLayout m_NodeLayout=null;
+		private NodeDisplay m_NodeDisplay=null;
+
+		private HeadersCollection m_Headers=null;
+
+		private string m_PathSeparator=System.IO.Path.PathSeparator.ToString();
+
+		private int m_UpdateSuspended=0;
+		private bool m_PendingLayout=false;
+		private bool m_SuspendPaint=false;
+
+		private Node m_SelectedNode=null;
+		//private Cell m_SelectedCell=null;
+		private Node m_MouseOverNode=null;
+		private Cell m_MouseOverCell=null;
+		private int m_CellMouseDownCounter=0;
+
+		private ImageList m_ImageList=null;
+		private int m_ImageIndex=-1;
+		private bool m_AntiAlias=true;
+		
+		private NodeConnector m_RootConnector=null;
+		private NodeConnector m_NodesConnector=null;
+		private NodeConnector m_LinkConnector=null;
+		private NodeConnector m_SelectedPathConnector=null;
+		private eCellLayout m_CellLayout=eCellLayout.Default;
+		private eCellPartLayout m_CellPartLayout=eCellPartLayout.Default;
+		private Cursor m_OriginalCursor=null;
+		private Cursor m_DefaultCellCursor=null;
+		private ColorScheme m_ColorScheme=null;
+		private bool m_CenterContent=true;
+
+		// Selection box properties
+		private bool m_SelectionBox=true;
+		private int m_SelectionBoxSize=4;
+		private Color m_SelectionBoxBorderColor=Color.Empty;
+		private Color m_SelectionBoxFillColor=Color.Empty;
+
+		// Expand Part Properties
+		private Size m_DefaultExpandPartSize=new Size(9,9);
+		private Size m_ExpandButtonSize=Size.Empty;
+		private Color m_ExpandBorderColor=Color.Empty;
+		private eColorSchemePart m_ExpandBorderColorSchemePart=eColorSchemePart.BarDockedBorder;
+		private Color m_ExpandBackColor=Color.Empty;
+		private eColorSchemePart m_ExpandBackColorSchemePart=eColorSchemePart.None;
+		private Color m_ExpandBackColor2=Color.Empty;
+		private eColorSchemePart m_ExpandBackColor2SchemePart=eColorSchemePart.None;
+		private int m_ExpandBackColorGradientAngle=0;
+		private Color m_ExpandLineColor=Color.Empty;
+		private eColorSchemePart m_ExpandLineColorSchemePart=eColorSchemePart.BarDockedBorder;
+		private Image m_ExpandImage=null;
+		private Image m_ExpandImageCollapse=null;
+		private eExpandButtonType m_ExpandButtonType=eExpandButtonType.Ellipse;
+
+		private Node m_DisplayRootNode=null;
+
+		// Command button properties
+		private int m_CommandWidth=10;
+		private Color m_CommandBackColor=Color.Empty;
+		private eColorSchemePart m_CommandBackColorSchemePart=eColorSchemePart.CustomizeBackground;
+		private Color m_CommandBackColor2=Color.Empty;
+		private eColorSchemePart m_CommandBackColor2SchemePart=eColorSchemePart.CustomizeBackground2;
+		private Color m_CommandForeColor=Color.Empty;
+		private eColorSchemePart m_CommandForeColorSchemePart=eColorSchemePart.CustomizeText;
+		private int m_CommandBackColorGradientAngle=90;
+		private Color m_CommandMouseOverBackColor=Color.Empty;
+		private eColorSchemePart m_CommandMouseOverBackColorSchemePart=eColorSchemePart.ItemHotBackground;
+		private Color m_CommandMouseOverBackColor2=Color.Empty;
+		private eColorSchemePart m_CommandMouseOverBackColor2SchemePart=eColorSchemePart.ItemHotBackground2;
+		private Color m_CommandMouseOverForeColor=Color.Empty;
+		private eColorSchemePart m_CommandMouseOverForeColorSchemePart=eColorSchemePart.ItemHotText;
+		private int m_CommandMouseOverBackColorGradientAngle=90;
+
+		// Cell editing support
+		private bool m_CellEdit=false;
+		private bool m_CellEditing=false;
+		private Cell m_EditedCell=null;
+		private TextBoxEx m_EditTextBox=null;
+
+		// Drag & Drop
+		private bool m_DragDropEnabled=true;
+		private Node m_DragNode=null;
+		private Point m_MouseDownLocation=Point.Empty;
+
+		// Layout
+		private eNodeLayout m_Layout=eNodeLayout.Map;
+		private int m_NodeHorizontalSpacing=32;
+		private int m_NodeVerticalSpacing=32;
+		private eDiagramFlow m_DiagramLayoutFlow=eDiagramFlow.LeftToRight;
+		private eMapFlow m_MapLayoutFlow=eMapFlow.Spread;
+
+		private ElementStyle m_BackgroundStyle=new ElementStyle();
+		private eNodeRenderMode m_RenderMode=eNodeRenderMode.Default;
+		private NodeRenderer m_NodeRenderer=null;
+		
+		private ArrayList m_HostedControlCells=new ArrayList();
+		private float m_ZoomFactor=1f;
+		private object m_DotNetBarManager=null;
+		#endregion
+
+		#region Events
+		/// <summary>
+		/// Occurs after the cell check box is checked.
+		/// </summary>
+		public event TreeGXCellEventHandler AfterCheck;
+		
+		/// <summary>
+		/// Occurs after the tree node is collapsed.
+		/// </summary>
+		public event TreeGXNodeEventHandler AfterCollapse;
+		
+		/// <summary>
+		/// Occurs before the tree node is collapsed.
+		/// </summary>
+		public event TreeGXNodeCancelEventHandler BeforeCollapse;
+		
+		/// <summary>
+		/// Occurs after the tree node is expanded.
+		/// </summary>
+		public event TreeGXNodeEventHandler AfterExpand;
+		
+		/// <summary>
+		/// Occurs before the tree node is expanded.
+		/// </summary>
+		public event TreeGXNodeCancelEventHandler BeforeExpand;
+
+		/// <summary>
+		/// Occurs when command button on node is clicked.
+		/// </summary>
+		public event CommandButtonEventHandler CommandButtonClick;
+
+		/// <summary>
+		/// Occurs before cell is edited. The order of the cell editing events is as follows:
+		/// BeforeCellEdit, CellEditEnding, AfterCellEdit.
+		/// </summary>
+		public event CellEditEventHandler BeforeCellEdit;
+		/// <summary>
+		/// Occurs just before the cell editing is ended. The text box for editing is still visible and you can cancel
+		/// the exit out of editing mode at this point. The order of the cell editing events is as follows:
+		/// BeforeCellEdit, CellEditEnding, AfterCellEdit.
+		/// </summary>
+		public event CellEditEventHandler CellEditEnding;
+		/// <summary>
+		/// Occurs after cell editing has ended and before the new text entered by the user is assigned to the cell. You can abort the edits in this event.
+		/// The order of the cell editing events is as follows:
+		/// BeforeCellEdit, CellEditEnding, AfterCellEdit.
+		/// </summary>
+		public event CellEditEventHandler AfterCellEdit;
+		
+		/// <summary>
+		/// Occurs after Node has been selected by user or through the SelectedNode property. Event can be cancelled.
+		/// </summary>
+		public event TreeGXNodeCancelEventHandler BeforeNodeSelect;
+		
+		/// <summary>
+		/// Occurs after node has been selected by user or through the SelectedNode property.
+		/// </summary>
+		public event TreeGXNodeEventHandler AfterNodeSelect;
+		
+		/// <summary>
+		/// Occurs before node has been removed from its parent.
+		/// </summary>
+		public event TreeGXNodeCollectionEventHandler BeforeNodeRemove;
+
+		/// <summary>
+		/// Occurs after node has been removed from its parent.
+		/// </summary>
+		public event TreeGXNodeCollectionEventHandler AfterNodeRemove;
+
+		/// <summary>
+		/// Occurs before node is inserted or added as child node to parent node.
+		/// </summary>
+		public event TreeGXNodeCollectionEventHandler BeforeNodeInsert;
+
+		/// <summary>
+		/// Occurs after node is inserted or added as child node.
+		/// </summary>
+		public event TreeGXNodeCollectionEventHandler AfterNodeInsert;
+		
+		/// <summary>
+		/// Occurs before Drag-Drop of a node is completed and gives you information about new parent of the node that is being dragged
+		/// as well as opportunity to cancel the operation.
+		/// </summary>
+		public event TreeGXDragDropEventHandler BeforeNodeDrop;
+		
+		/// <summary>
+		/// Occurs after Drag-Drop of a node is completed. This operation cannot be cancelled.
+		/// </summary>
+		public event TreeGXDragDropEventHandler AfterNodeDrop;
+
+		/// <summary>
+		/// Occurs when the mouse pointer is over the node and a mouse button is pressed.
+		/// </summary>
+		public event TreeGXNodeMouseEventHandler NodeMouseDown;
+		
+		/// <summary>
+		/// Occurs when the mouse pointer is over the node and a mouse button is released.
+		/// </summary>
+		public event TreeGXNodeMouseEventHandler NodeMouseUp;
+		
+		/// <summary>
+		/// Occurs when the mouse pointer is moved over the node.
+		/// </summary>
+		public event TreeGXNodeMouseEventHandler NodeMouseMove;
+		
+		/// <summary>
+		/// Occurs when the mouse enters the node.
+		/// </summary>
+		public event TreeGXNodeMouseEventHandler NodeMouseEnter;
+		
+		/// <summary>
+		/// Occurs when the mouse leaves the node.
+		/// </summary>
+		public event TreeGXNodeMouseEventHandler NodeMouseLeave;
+		
+		/// <summary>
+		/// Occurs when the mouse hovers over the node.
+		/// </summary>
+		public event TreeGXNodeMouseEventHandler NodeMouseHover;
+		
+		/// <summary>
+		/// Occurs when the node is clicked with left mouse button. If you need to know more information like if another mouse button is clicked etc. use
+		/// NodeMouseDown event.
+		/// </summary>
+		public event TreeGXNodeMouseEventHandler NodeClick;
+		
+		/// <summary>
+		/// Occurs when the node is double-clicked.
+		/// </summary>
+		public event TreeGXNodeMouseEventHandler NodeDoubleClick;
+		
+		/// <summary>
+		/// Occurs after an node has been serialized to XmlElement and provides you with opportunity to add any custom data
+		/// to serialized XML. This allows you to serialize any data associated with the node and load it back up in DeserializeNode event.
+		/// </summary>
+		/// <remarks>
+		/// 	<para>To serialize custom data to XML definition control creates handle this event and use CustomXmlElement
+		/// property on SerializeNodeEventArgs to add new nodes or set attributes with custom data you want saved.</para>
+		/// </remarks>
+		public event SerializeNodeEventHandler SerializeNode;
+
+		/// <summary>
+		/// Occurs after an node has been de-serialized (loaded) from XmlElement and provides you with opportunity to load any custom data
+		/// you have serialized during SerializeItem event.
+		/// </summary>
+		/// <remarks>
+		/// 	<para>To de-serialize custom data from XML definition handle this event and use CustomXmlElement
+		/// property on SerializeItemEventArgs to retrive any data you saved in SerializeNode event.</para>
+		/// </remarks>
+		public event SerializeNodeEventHandler DeserializeNode;
+		
+		/// <summary>
+		/// Occurs when hyperlink in text-markup is clicked.
+		/// </summary>
+		public event MarkupLinkClickEventHandler MarkupLinkClick;
+		#endregion
+
+		#region Constructor/Dispose
+		/// <summary>Creates new instance of the class.</summary>
+		public TreeGX()
+		{
+			ColorFunctions.Initialize();
+
+			this.SetStyle(ControlStyles.UserPaint, true);
+			this.SetStyle(ControlStyles.AllPaintingInWmPaint, true);
+			this.SetStyle(ControlStyles.Opaque, true);
+			this.SetStyle(ControlStyles.ResizeRedraw, true);
+			this.SetStyle(ControlStyles.DoubleBuffer, true);
+			this.SetStyle(ControlStyles.Selectable, true);
+
+			// This call is required by the Windows.Forms Form Designer.
+			InitializeComponent();
+			
+			m_BackgroundStyle.StyleChanged+=new EventHandler(ElementStyleChanged);
+			m_BackgroundStyle.TreeControl=this;
+
+			// Setup layout helper
+			//m_NodeLayout=new NodeTreeLayout(this,this.ClientRectangle);
+			//m_NodeLayout=new NodeListLayout(this,this.ClientRectangle);
+			//m_NodeLayout=new NodeDiagramLayout(this,this.ClientRectangle);
+			m_NodeLayout=new NodeMapLayout(this,this.ClientRectangle);
+			m_NodeLayout.NodeHorizontalSpacing=m_NodeHorizontalSpacing;
+			m_NodeLayout.NodeVerticalSpacing=m_NodeVerticalSpacing;
+
+			m_NodeLayout.LeftRight=this.RtlTranslateLeftRight(LeftRightAlignment.Left);
+
+#if TRIAL
+			NodeOperations.ColorExpAlt();
+#endif
+			// Setup display helper
+			m_NodeDisplay=new NodeTreeDisplay(this);
+
+			m_Headers=new HeadersCollection();
+
+			m_Nodes.TreeControl=this;
+			m_Styles.TreeControl=this;
+
+			m_ColorScheme=new ColorScheme(eColorSchemeStyle.Office2003);
+
+			m_SelectionBoxBorderColor=GetDefaultSelectionBoxBorderColor();
+			m_SelectionBoxFillColor=GetDefaultSelectionBoxFillColor();
+
+			m_ExpandButtonSize=GetDefaultExpandButtonSize();
+
+			this.AllowDrop = true;
+		}
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		protected override void Dispose( bool disposing )
+		{
+			if( disposing )
+			{
+				if( components != null )
+					components.Dispose();
+			}
+			base.Dispose( disposing );
+		}
+		#endregion
+
+		#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();
+		}
+		#endregion
+
+		#region Properties
+		/// <summary>
+		/// Gets or sets the reference to DotNetBar DotNetBarManager component which is used to provide context menu for nodes. This property
+		/// is automatically maintained by TreeGX.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never), DefaultValue(null), Browsable(false)]
+		public object DotNetBarManager
+		{
+			get { return m_DotNetBarManager; }
+			set { m_DotNetBarManager=value; }
+		}
+		
+		/// <summary>
+		/// Gets or sets zoom factor for the control. Default value is 1. To zoom display of the nodes for 20% set zoom factor to 1.2
+		/// To zoom view 2 times set zoom factor to 2. Value must be greater than 0.
+		/// </summary>
+		[Browsable(false), DefaultValue(1f), Category("Layout"), Description("Indicates zoom factor for the control.")]
+		public float Zoom
+		{
+			get { return m_ZoomFactor;}
+			set
+			{
+				if(value<=0.1)
+					return;
+				m_ZoomFactor = value;
+				this.RecalcLayout();
+			}
+		}
+		
+		/// <summary>
+		/// Gets the size of the tree.
+		/// </summary>
+		[Browsable(false)]
+		public Size TreeSize
+		{
+			get
+			{
+				return new Size(m_NodeLayout.Width, m_NodeLayout.Height);
+			}
+		}
+		
+		/// <summary>
+		/// Gets or sets custom node renderer. You can set this property to your custom renderer. When set the RenderMode should be set to Custom to enable
+		/// your custom renderer. To choose one of the system renderer use RenderMode property. Default value is null.
+		/// </summary>
+		[Browsable(false), Category("Style"), DefaultValue(null), Description("Indicates render mode used to render the node.")]
+		public NodeRenderer NodeRenderer
+		{
+			get { return m_NodeRenderer;}
+			set
+			{
+				m_NodeRenderer = value;
+				OnDisplayChanged();
+			}
+		}
+		/// <summary>
+		/// Gets or sets the render mode used to render all nodes. Default value is eNodeRenderMode.Default which indicates that system default renderer is used.
+		/// Note that if you specify custom renderer you need to set TreeGX.NodeRenderer property to your custom renderer.
+		/// </summary>
+		[Browsable(true), Category("Style"), DefaultValue(eNodeRenderMode.Default), Description("Indicates render mode used to render the node.")]
+		public eNodeRenderMode RenderMode
+		{
+			get { return m_RenderMode;}
+			set
+			{
+				m_RenderMode = value;
+				OnDisplayChanged();
+			}
+		}
+		
+		/// <summary>
+		/// Gets the style for the background of the control.
+		/// </summary>
+		[Browsable(true),Category("Appearance"),Description("Gets the style for the background of the control."),DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+		public ElementStyle BackgroundStyle
+		{
+			get {return m_BackgroundStyle;}
+		}
+
+		/// <summary>
+		/// Gets or sets the flow of nodes when Diagram layout is used. Note that this setting applies only to Diagram layout type.
+		/// </summary>
+		[Browsable(true),Category("Layout"),DefaultValue(eDiagramFlow.LeftToRight),Description("Indicates flow of nodes when Diagram layout is used.")]
+		public eDiagramFlow DiagramLayoutFlow
+		{
+			get {return m_DiagramLayoutFlow;}
+			set
+			{
+				m_DiagramLayoutFlow=value;
+				OnLayoutChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the flow of nodes when Map layout is used. Note that this setting applies only to Map layout type.
+		/// </summary>
+		[Browsable(true),Category("Layout"),DefaultValue(eMapFlow.Spread),Description("Indicates flow of nodes when Map layout is used.")]
+		public eMapFlow MapLayoutFlow
+		{
+			get {return m_MapLayoutFlow;}
+			set
+			{
+				m_MapLayoutFlow=value;
+				OnLayoutChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the horizontal spacing in pixels between nodes. Default value is 32.
+		/// </summary>
+		[Browsable(true),Category("Layout"),DefaultValue(32),Description("Indicates horizontal spacing in pixels between nodes.")]
+		public int NodeHorizontalSpacing
+		{
+			get {return m_NodeHorizontalSpacing;}
+			set
+			{
+				m_NodeHorizontalSpacing=value;
+				OnLayoutChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the vertical spacing in pixels between nodes. Default value is 16.
+		/// </summary>
+		[Browsable(true),Category("Layout"),DefaultValue(32),Description("Indicates vertical spacing in pixels between nodes.")]
+		public int NodeVerticalSpacing
+		{
+			get {return m_NodeVerticalSpacing;}
+			set
+			{
+				m_NodeVerticalSpacing=value;
+				OnLayoutChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the layout type for the nodes.
+		/// </summary>
+		[Browsable(true),Category("Layout"),DefaultValue(eNodeLayout.Map),Description("Indicates layout type for the nodes.")]
+		public eNodeLayout LayoutType
+		{
+			get {return m_Layout;}
+			set
+			{
+				if(m_Layout!=value)
+				{
+					SetLayout(value);
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets whether automatic drag and drop is enabled. Default value is true.
+		/// </summary>
+		[Browsable(true),Category("Behavior"),Description("Indicates whether automatic drag and drop is enabled."),DefaultValue(true)]
+		public bool DragDropEnabled
+		{
+			get {return m_DragDropEnabled;}
+			set {m_DragDropEnabled=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets whether anti-alias smoothing is used while painting the tree.
+		/// </summary>
+		[DefaultValue(true),Browsable(true),Category("Appearance"),Description("Gets or sets whether anti-aliasing is used while painting the tree.")]
+		public bool AntiAlias
+		{
+			get {return m_AntiAlias;}
+			set
+			{
+				if(m_AntiAlias!=value)
+				{
+					m_AntiAlias=value;
+					this.Refresh();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the delimiter string that the tree node path uses.
+		/// </summary>
+		[DefaultValue("\\"),Browsable(false),Description("Indicates the delimiter string that the tree node path uses.")]
+		public string PathSeparator
+		{
+			get{return m_PathSeparator;}
+			set{m_PathSeparator=value;}
+		}
+
+		/// <summary>
+		/// Gets the collection of all column headers that appear in the tree.
+		/// </summary>
+		/// <remarks>
+		/// 	<para>By default there are no column headers defined. In that case tree control
+		///     functions as regular tree control where text has unrestricted width.</para>
+		/// 	<para>If you want to restrict the horizontal width of the text but not display
+		///     column header you can create one column and set its width to the width desired and
+		///     set its Visible property to false.</para>
+		/// </remarks>
+		public ColumnHeaderCollection Columns
+		{
+			get
+			{
+				return m_Columns;
+			}
+		}
+
+		/// <summary>
+		/// Gets the collection of all style elements created for the tree.
+		/// </summary>
+		[Browsable(true),DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+		public ElementStyleCollection Styles
+		{
+			get {return m_Styles;}
+		}
+
+		/// <summary>
+		/// Gets or sets default style for the node cell.
+		/// </summary>
+		[Browsable(true),Category("Node Style"),DefaultValue(null),Editor(typeof(Design.ElementStyleTypeEditor),typeof(System.Drawing.Design.UITypeEditor)),Description("Indicates default style for the node cell.")]
+		public ElementStyle CellStyleDefault
+		{
+			get {return m_CellStyleDefault;}
+			set
+			{
+				if(m_CellStyleDefault!=value)
+				{
+					if(m_CellStyleDefault!=null)
+						m_CellStyleDefault.StyleChanged-=new EventHandler(this.ElementStyleChanged);
+					if(value!=null)
+						value.StyleChanged+=new EventHandler(this.ElementStyleChanged);
+					m_CellStyleDefault=value;
+					this.OnCellStyleChanged();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets default style for the node cell when mouse is pressed.
+		/// </summary>
+		[Browsable(true),Category("Node Style"),DefaultValue(null),Editor(typeof(Design.ElementStyleTypeEditor),typeof(System.Drawing.Design.UITypeEditor)),Description("Indicates default style for the node cell when mouse is pressed.")]
+		public ElementStyle CellStyleMouseDown
+		{
+			get {return m_CellStyleMouseDown;}
+			set
+			{
+				if(m_CellStyleMouseDown!=value)
+				{
+					if(m_CellStyleMouseDown!=null)
+						m_CellStyleMouseDown.StyleChanged-=new EventHandler(this.ElementStyleChanged);
+					if(value!=null)
+						value.StyleChanged+=new EventHandler(this.ElementStyleChanged);
+					m_CellStyleMouseDown=value;
+					this.OnCellStyleChanged();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets default style for the node cell when mouse is over the cell.
+		/// </summary>
+		[Browsable(true),Category("Node Style"),DefaultValue(null),Editor(typeof(Design.ElementStyleTypeEditor),typeof(System.Drawing.Design.UITypeEditor)),Description("Indicates default style for the node cell when mouse is over the cell.")]
+		public ElementStyle CellStyleMouseOver
+		{
+			get {return m_CellStyleMouseOver;}
+			set
+			{
+				if(m_CellStyleMouseOver!=value)
+				{
+					if(m_CellStyleMouseOver!=null)
+						m_CellStyleMouseOver.StyleChanged-=new EventHandler(this.ElementStyleChanged);
+					if(value!=null)
+						value.StyleChanged+=new EventHandler(this.ElementStyleChanged);
+					m_CellStyleMouseOver=value;
+					this.OnCellStyleChanged();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets default style for the node cell when cell is selected.
+		/// </summary>
+		[Browsable(true),Category("Node Style"),DefaultValue(null),Editor(typeof(Design.ElementStyleTypeEditor),typeof(System.Drawing.Design.UITypeEditor)),Description("Indicates default style for the node cell when cell is selected.")]
+		public ElementStyle CellStyleSelected
+		{
+			get {return m_CellStyleSelected;}
+			set
+			{
+				if(m_CellStyleSelected!=value)
+				{
+					if(m_CellStyleSelected!=null)
+						m_CellStyleSelected.StyleChanged-=new EventHandler(this.ElementStyleChanged);
+					if(value!=null)
+						value.StyleChanged+=new EventHandler(this.ElementStyleChanged);
+					m_CellStyleSelected=value;
+					this.OnCellStyleChanged();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets default style for the node cell when cell is disabled.
+		/// </summary>
+		[Browsable(true),Category("Node Style"),DefaultValue(null),Editor(typeof(Design.ElementStyleTypeEditor),typeof(System.Drawing.Design.UITypeEditor)),Description("Indicates default style for the node cell when cell is disabled.")]
+		public ElementStyle CellStyleDisabled
+		{
+			get {return m_CellStyleDisabled;}
+			set
+			{
+				if(m_CellStyleDisabled!=value)
+				{
+					if(m_CellStyleDisabled!=null)
+						m_CellStyleDisabled.StyleChanged-=new EventHandler(this.ElementStyleChanged);
+					if(value!=null)
+						value.StyleChanged+=new EventHandler(this.ElementStyleChanged);
+					m_CellStyleDisabled=value;
+					this.OnCellStyleChanged();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets default style for the node when node is expanded.
+		/// </summary>
+		[Browsable(true),Category("Node Style"),DefaultValue(null),Editor(typeof(Design.ElementStyleTypeEditor),typeof(System.Drawing.Design.UITypeEditor)),Description("Gets or sets default style for the node cell when node that cell belongs to is expanded.")]
+		public ElementStyle NodeStyleExpanded
+		{
+			get {return m_NodeStyleExpanded;}
+			set
+			{
+				if(m_NodeStyleExpanded!=value)
+				{
+					if(m_NodeStyleExpanded!=null)
+						m_NodeStyleExpanded.StyleChanged-=new EventHandler(this.ElementStyleChanged);
+					if(value!=null)
+						value.StyleChanged+=new EventHandler(this.ElementStyleChanged);
+					m_NodeStyleExpanded=value;
+					this.OnCellStyleChanged();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets default style for all nodes where style is not specified
+		/// explicity.
+		/// </summary>
+		/// <value>
+		/// Name of the style assigned or null value indicating that no style is used.
+		/// Default value is null.
+		/// </value>
+		[Browsable(true),Category("Node Style"),DefaultValue(null),Editor(typeof(Design.ElementStyleTypeEditor),typeof(System.Drawing.Design.UITypeEditor)),Description("Gets or sets default style for the node.")]
+		public ElementStyle NodeStyle
+		{
+			get {return m_NodeStyle;}
+			set
+			{
+				if(m_NodeStyle!=value)
+				{
+					if(m_NodeStyle!=null)
+						m_NodeStyle.StyleChanged-=new EventHandler(this.ElementStyleChanged);
+					if(value!=null)
+						value.StyleChanged+=new EventHandler(this.ElementStyleChanged);
+					m_NodeStyle=value;
+					this.OnCellStyleChanged();
+				}
+			}
+		}
+		/// <summary>
+		/// Gets or sets style for the node when node is selected. Note that this style is applied to the default node style.
+		/// </summary>
+		/// <value>
+		/// Reference to the style assigned or null value indicating that no style is used.
+		/// Default value is null.
+		/// </value>
+		[Browsable(true),Category("Node Style"),DefaultValue(null),Editor(typeof(Design.ElementStyleTypeEditor),typeof(System.Drawing.Design.UITypeEditor)),Description("Gets or sets style of the node when node is selected.")]
+		public ElementStyle NodeStyleSelected
+		{
+			get {return m_NodeStyleSelected;}
+			set
+			{
+				if(m_NodeStyleSelected!=value)
+				{
+					if(m_NodeStyleSelected!=null)
+						m_NodeStyleSelected.StyleChanged-=new EventHandler(this.ElementStyleChanged);
+					if(value!=null)
+						value.StyleChanged+=new EventHandler(this.ElementStyleChanged);
+					m_NodeStyleSelected=value;
+					this.OnCellStyleChanged();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets style for the node when mouse is over node. Note that this style is applied to the default node style.
+		/// </summary>
+		/// <value>
+		/// Reference to the style assigned or null value indicating that no style is used.
+		/// Default value is null.
+		/// </value>
+		[Browsable(true),Category("Node Style"),DefaultValue(null),Editor(typeof(Design.ElementStyleTypeEditor),typeof(System.Drawing.Design.UITypeEditor)),Description("Gets or sets style of the node when mouse is over node.")]
+		public ElementStyle NodeStyleMouseOver
+		{
+			get {return m_NodeStyleMouseOver;}
+			set
+			{
+				if(m_NodeStyleMouseOver!=value)
+				{
+					if(m_NodeStyleMouseOver!=null)
+						m_NodeStyleMouseOver.StyleChanged-=new EventHandler(this.ElementStyleChanged);
+					if(value!=null)
+						value.StyleChanged+=new EventHandler(this.ElementStyleChanged);
+					m_NodeStyleMouseOver=value;
+					this.OnCellStyleChanged();
+				}
+			}
+		}
+
+
+		/// <summary>
+		/// Gets the collection of tree nodes that are assigned to the tree view control.
+		/// </summary>
+		/// <value>
+		/// A <see cref="NodeCollection">NodeCollection</see> that represents the tree nodes
+		/// assigned to the tree control.
+		/// </value>
+		/// <remarks>
+		/// 	<para>The Nodes property holds a collection of Node objects, each of which has a
+		///     Nodes property that can contain its own NodeCollection.</para>
+		/// </remarks>
+		[Browsable(true),DesignerSerializationVisibility(DesignerSerializationVisibility.Content),Description("Gets the collection of tree nodes that are assigned to the tree control.")]
+		public NodeCollection Nodes
+		{
+			get {return m_Nodes;}
+		}
+
+		/// <summary>
+		/// Gets or sets the default style class assigned to the column headers.
+		/// </summary>
+		/// <value>
+		/// Reference to the style assigned to the column header.
+		/// </value>
+		/// <remarks>
+		/// When style is not set on ColumnHeader objects then style setting from this property is used instead.
+		/// </remarks>
+		/// <seealso cref="ColumnStyleMouseDown">ColumnStyleMouseDown Property</seealso>
+		/// <seealso cref="ColumnStyleMouseOver">ColumnStyleMouseOver Property</seealso>
+		[Browsable(true),DefaultValue(null),Category("Column Header Style"),Editor(typeof(Design.ElementStyleTypeEditor),typeof(System.Drawing.Design.UITypeEditor)),Description("Indicates the style class assigned to the column.")]
+		public ElementStyle ColumnStyleNormal
+		{
+			get {return m_ColumnStyleNormal;}
+			set
+			{
+				if(m_ColumnStyleNormal!=null)
+					m_ColumnStyleNormal.StyleChanged-=new EventHandler(this.ElementStyleChanged);
+				if(value!=null)
+					value.StyleChanged+=new EventHandler(this.ElementStyleChanged);
+				m_ColumnStyleNormal=value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets default style class assigned to the column which is applied when mouse
+		/// button is pressed over the header.
+		/// </summary>
+		/// <value>
+		/// Name of the style assigned to the column.
+		/// </value>
+		/// <remarks>
+		/// When style is not set on ColumnHeader objects then style setting from this property is used instead.
+		/// </remarks>
+		/// <seealso cref="ColumnStyleNormal">ColumnStyleNormal Property</seealso>
+		/// <seealso cref="ColumnStyleMouseOver">ColumnStyleMouseOver Property</seealso>
+		[Browsable(true),DefaultValue(null),Category("Column Header Style"),Editor(typeof(Design.ElementStyleTypeEditor),typeof(System.Drawing.Design.UITypeEditor)),Description("Indicates the style class assigned to the column when mouse is down.")]
+		public ElementStyle ColumnStyleMouseDown
+		{
+			get {return m_ColumnStyleMouseDown;}
+			set
+			{
+				if(m_ColumnStyleMouseDown!=null)
+					m_ColumnStyleMouseDown.StyleChanged-=new EventHandler(this.ElementStyleChanged);
+				if(value!=null)
+					value.StyleChanged+=new EventHandler(this.ElementStyleChanged);
+				m_ColumnStyleMouseDown=value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets default style class assigned to the column which is applied when mouse is
+		/// over the column.
+		/// </summary>
+		/// <value>
+		/// Name of the style assigned to the column.
+		/// </value>
+		/// <remarks>
+		/// When style is not set on ColumnHeader objects then style setting from this property is used instead.
+		/// </remarks>
+		/// <seealso cref="ColumnStyleNormal">ColumnStyleNormal Property</seealso>
+		/// <seealso cref="ColumnStyleMouseDown">ColumnStyleMouseDown Property</seealso>
+		[Browsable(true),DefaultValue(null),Category("Column Header Style"),Editor(typeof(Design.ElementStyleTypeEditor),typeof(System.Drawing.Design.UITypeEditor)),Description("Indicates the style class assigned to the cell when mouse is over the column.")]
+		public ElementStyle ColumnStyleMouseOver
+		{
+			get {return m_ColumnStyleMouseOver;}
+			set
+			{
+				if(m_ColumnStyleMouseOver!=null)
+					m_ColumnStyleMouseOver.StyleChanged-=new EventHandler(this.ElementStyleChanged);
+				if(value!=null)
+					value.StyleChanged+=new EventHandler(this.ElementStyleChanged);
+				m_ColumnStyleMouseOver=value;
+			}
+		}
+
+		/// <summary>
+		/// Gets collection that holds definition of column headers associated with nodes.
+		/// </summary>
+		[Browsable(true),DesignerSerializationVisibility(DesignerSerializationVisibility.Content),Description("Collection that holds definition of column headers associated with nodes.")]
+		public HeadersCollection Headers
+		{
+			get {return m_Headers;}
+		}
+
+		/// <summary>
+		/// Gets or sets the tree node that is currently selected in the tree view control.
+		/// </summary>
+		/// <remarks>
+		/// 	<para>If no <see cref="Node">Node</see> is currently selected, the
+		///     <b>SelectedNode</b> property is a null reference (<b>Nothing</b> in Visual
+		///     Basic).</para>
+		/// </remarks>
+		[Browsable(false),DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public Node SelectedNode
+		{
+			get {return m_SelectedNode;}
+			set
+			{
+				if(m_SelectedNode!=value)
+				{
+					SelectNode(value,eTreeAction.Code);
+				}
+			}
+		}
+
+		/// <summary>
+		/// Invalidates node bounds on canvas.
+		/// </summary>
+		/// <param name="node">Reference node.</param>
+		internal void InvalidateNode(Node node)
+		{
+			if(node==null)
+				return;
+
+			Rectangle r;
+			//if(node.Parent!=null)
+			if(node==m_DragNode && m_DragNode.Parent==null)
+				r=m_DragNode.BoundsRelative;
+			else
+				r=NodeDisplay.GetNodeRectangle(eNodeRectanglePart.NodeContentBounds,node,m_NodeDisplay.Offset);
+			//else
+			//	r=node.Bounds;
+
+			if(m_SelectionBox)
+				r.Inflate(m_SelectionBoxSize,m_SelectionBoxSize);
+			
+			r = GetScreenRectangle(r);
+			
+			this.Invalidate(r);
+		}
+
+		/// <summary>
+		/// Returns reference to node layout object.
+		/// </summary>
+		internal Layout.NodeLayout NodeLayout
+		{
+			get {return m_NodeLayout;}
+		}
+
+		/// <summary>
+		/// Returns reference to node display object.
+		/// </summary>
+		internal NodeDisplay NodeDisplay
+		{
+			get {return m_NodeDisplay;}
+		}
+
+		/// <summary>
+		/// Gets whether layout is suspended for tree control. Layout is suspended after
+		/// call to <see cref="BeginUpdate">BeginUpdate</see> method and it is resumed after the
+		/// call to <see cref="EndUpdate">EndUpdate</see> method.
+		/// </summary>
+		[Browsable(false)]
+		public bool IsUpdateSuspended
+		{
+			get {return (m_UpdateSuspended>0);}
+		}
+		
+		internal void SetPendingLayout()
+		{
+			m_PendingLayout = true;
+		}
+
+		/// <summary>
+		/// Gets or sets whether paint operations are suspended for the control. You should use this method
+		/// if you need the RecalcLayout operations to proceed but you want to stop painting of the control.
+		/// </summary>
+		[Browsable(false)]
+		public bool SuspendPaint
+		{
+			get {return m_SuspendPaint;}
+			set {m_SuspendPaint=value;}
+		}
+
+		/// <summary>
+		/// Gets or sets the ImageList that contains the Image objects used by the tree nodes.
+		/// </summary>
+		[Browsable(true),DefaultValue(null),Category("Images"),Description("Indicates the ImageList that contains the Image objects used by the tree nodes.")]
+		public ImageList ImageList
+		{
+			get
+			{
+				return m_ImageList;
+			}
+			set
+			{
+				if(m_ImageList!=null)
+					m_ImageList.Disposed-=new EventHandler(this.ImageListDisposed);
+				m_ImageList=value;
+				if(m_ImageList!=null)
+					m_ImageList.Disposed+=new EventHandler(this.ImageListDisposed);
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the image-list index value of the default image that is displayed by the tree nodes.
+		/// </summary>
+		[Browsable(true),Category("Images"),Description("Indicates the image-list index value of the default image that is displayed by the tree nodes."),Editor(typeof(ImageIndexEditor), typeof(System.Drawing.Design.UITypeEditor)),TypeConverter(typeof(ImageIndexConverter)),DefaultValue(-1)]
+		public int ImageIndex
+		{
+			get {return m_ImageIndex;}
+			set
+			{
+				if(m_ImageIndex!=value)
+				{
+					m_ImageIndex=value;
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the NodeConnector object that describes the type of the connector used for
+		/// displaying connection between root node and it's nested nodes. The root node is defined as
+		/// the top level node i.e. which belongs directly to TreeGX.Nodes collection. Default value is null.
+		/// </summary>
+		/// <remarks>
+		/// You can use
+		/// <a href="TreeGX~DevComponents.Tree.Node~ParentConnector.html">Node.ParentConnector</a>
+		/// property to specify per node connectors.
+		/// </remarks>
+		[Browsable(true),Category("Connectors"),DefaultValue(null),Editor(typeof(Design.NodeConnectorTypeEditor),typeof(System.Drawing.Design.UITypeEditor)),Description("Indicates the root node connector.")]
+		public NodeConnector RootConnector
+		{
+			get {return m_RootConnector;}
+			set
+			{
+				if(m_RootConnector!=value)
+				{
+					if(m_RootConnector!=null)
+						m_RootConnector.AppearanceChanged-=new EventHandler(this.ConnectorAppearanceChanged);
+					if(value!=null)
+						value.AppearanceChanged+=new EventHandler(this.ConnectorAppearanceChanged);
+					m_RootConnector=value;
+					this.OnDisplayChanged();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the NodeConnector object that describes the type of the connector used for
+		/// displaying connection between nested nodes. RootConnector property specifies the connector
+		/// between root node and it's imidate nested nodes. This property specifies connector for all other nested levels.
+		/// Default value is null.
+		/// </summary>
+		/// <remarks>
+		/// You can use
+		/// <a href="TreeGX~DevComponents.Tree.Node~ParentConnector.html">Node.ParentConnector</a>
+		/// property to specify per node connectors.
+		/// </remarks>
+		[Browsable(true),Category("Connectors"),DefaultValue(null),Editor(typeof(Design.NodeConnectorTypeEditor),typeof(System.Drawing.Design.UITypeEditor)),Description("Indicates the nested nodes connector.")]
+		public NodeConnector NodesConnector
+		{
+			get {return m_NodesConnector;}
+			set
+			{
+				if(m_NodesConnector!=value)
+				{
+					if(m_NodesConnector!=null)
+						m_NodesConnector.AppearanceChanged-=new EventHandler(this.ConnectorAppearanceChanged);
+					if(value!=null)
+						value.AppearanceChanged+=new EventHandler(this.ConnectorAppearanceChanged);
+					m_NodesConnector=value;
+					this.OnDisplayChanged();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the NodeConnector object that describes the type of the connector used for
+		/// displaying connection between linked nodes. This property specifies connector for all linked nodes.
+		/// Default value is null.
+		/// </summary>
+		[Browsable(true),Category("Connectors"),DefaultValue(null),Editor(typeof(Design.NodeConnectorTypeEditor),typeof(System.Drawing.Design.UITypeEditor)),Description("Indicates the linked nodes connector.")]
+		public NodeConnector LinkConnector
+		{
+			get {return m_LinkConnector;}
+			set
+			{
+				if(m_LinkConnector!=value)
+				{
+					if(m_LinkConnector!=null)
+						m_LinkConnector.AppearanceChanged-=new EventHandler(this.ConnectorAppearanceChanged);
+					if(value!=null)
+						value.AppearanceChanged+=new EventHandler(this.ConnectorAppearanceChanged);
+					m_LinkConnector=value;
+					this.OnDisplayChanged();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the NodeConnector object that describes the type of the connector used for
+		/// displaying connection between linked nodes. Connector specified here is used to display the connection
+		/// between nodes that are on the path to the selected node. When set you can use it to visually indicate the path to the currently selected node.
+		/// Default value is null.
+		/// </summary>
+		[Browsable(true),Category("Connectors"),DefaultValue(null),Editor(typeof(Design.NodeConnectorTypeEditor),typeof(System.Drawing.Design.UITypeEditor)),Description("Indicates the linked nodes connector.")]
+		public NodeConnector SelectedPathConnector
+		{
+			get {return m_SelectedPathConnector;}
+			set
+			{
+				if(m_SelectedPathConnector!=value)
+				{
+					if(m_SelectedPathConnector!=null)
+						m_SelectedPathConnector.AppearanceChanged-=new EventHandler(this.ConnectorAppearanceChanged);
+					if(value!=null)
+						value.AppearanceChanged+=new EventHandler(this.ConnectorAppearanceChanged);
+					m_SelectedPathConnector=value;
+					this.OnDisplayChanged();
+				}
+			}
+		}
+		
+		/// <summary>
+		/// Gets or sets the layout of the cells inside the node. Default value is Horizontal layout which
+		/// means that cell are positioned horizontally next to each other.
+		/// </summary>
+		/// <remarks>
+		/// You can specify cell layout on each node by using
+		/// <a href="TreeGX~DevComponents.Tree.Node~CellLayout.html">Node.CellLayout</a>
+		/// property.
+		/// </remarks>
+		[Browsable(true),DefaultValue(eCellLayout.Default),Category("Appearance"),Description("Indicates layout of the cells inside the node.")]
+		public eCellLayout CellLayout
+		{
+			get {return m_CellLayout;}
+			set
+			{
+				m_CellLayout=value;
+				this.RecalcLayout();
+				this.Refresh();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the layout of the cells inside the node. Default value is Horizontal layout which
+		/// means that cell are positioned horizontally next to each other.
+		/// </summary>
+		/// <remarks>
+		/// You can specify cell layout on each node by using
+		/// <a href="TreeGX~DevComponents.Tree.Node~CellLayout.html">Node.CellLayout</a>
+		/// property.
+		/// </remarks>
+		[Browsable(true),DefaultValue(eCellPartLayout.Default),Category("Appearance"),Description("Indicates layout of the cells inside the node.")]
+		public eCellPartLayout CellPartLayout
+		{
+			get {return m_CellPartLayout;}
+			set
+			{
+				m_CellPartLayout=value;
+				this.RecalcLayout();
+				this.Refresh();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the color scheme style. Color scheme provides predefined colors based on popular visual styles.
+		/// We recommend that you use "SchemePart" color settings since they maintain consistant look that is
+		/// based on target system color scheme setting.
+		/// </summary>
+		[Browsable(true),DefaultValue(eColorSchemeStyle.Office2003),Category("Appearance"),Description("Indicates the color scheme style.")]
+		public eColorSchemeStyle ColorSchemeStyle
+		{
+			get {return m_ColorScheme.Style;}
+			set
+			{
+				m_ColorScheme.Style=value;
+				if(this.DesignMode)
+					this.Refresh();
+			}
+		}
+
+		/// <summary>
+		/// Gets the reference to the color scheme object.
+		/// </summary>
+		internal ColorScheme ColorScheme
+		{
+			get {return m_ColorScheme;}
+		}
+
+		/// <summary>
+		/// Gets or sets whether the content of the control is centered within the bounds of control. Default value is true.
+		/// </summary>
+		[Browsable(true),DefaultValue(true),Description("Indicates whether the content of the control is centered within the bounds of control."),Category("Layout")]
+		public bool CenterContent
+		{
+			get {return m_CenterContent;}
+			set
+			{
+				m_CenterContent=value;
+				OnLayoutChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the value that indicates whether selection box is drawn around the
+		/// selected node. Default value is true. Another way to provide the visual indication that
+		/// node is selected is by using selected state style properties like
+		/// <a href="TreeGX~DevComponents.Tree.TreeGX~NodeStyleSelected.html">NodeStyleSelected</a>
+		/// and
+		/// <a href="TreeGX~DevComponents.Tree.TreeGX~CellStyleSelected.html">CellStyleSelected</a>.
+		/// </summary>
+		/// <seealso cref="CellStyleSelected">CellStyleSelected Property</seealso>
+		/// <seealso cref="NodeStyleSelected">NodeStyleSelected Property</seealso>
+		[Browsable(true),DefaultValue(true),Category("Selected Node"),Description("Indicates whether selection box is drawn around selected node.")]
+		public bool SelectionBox
+		{
+			get {return m_SelectionBox;}
+			set
+			{
+				if(m_SelectionBox!=value)
+				{
+					m_SelectionBox=value;
+					this.OnSelectionBoxChanged();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the size/thickness in pixel of the selection box drawn around selected
+		/// node.
+		/// </summary>
+		[Browsable(true),DefaultValue(4),Category("Selected Node"),Description("Indicates the size in pixels of the selection box drawn around selected node.")]
+		public int SelectionBoxSize
+		{
+			get {return m_SelectionBoxSize;}
+			set
+			{
+				if(m_SelectionBoxSize!=value)
+				{
+					m_SelectionBoxSize=value;
+					this.OnSelectionBoxChanged();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the selection box border color.
+		/// </summary>
+		[Browsable(true),Category("Selected Node"),Description("Indicates the selection box border color.")]
+		public Color SelectionBoxBorderColor
+		{
+			get {return m_SelectionBoxBorderColor;}
+			set
+			{
+				if(m_SelectionBoxBorderColor!=value)
+				{
+					m_SelectionBoxBorderColor=value;
+					this.OnSelectionBoxChanged();
+				}
+			}
+
+		}
+		/// <summary>
+		/// Indicates whether SelectionBoxBorderColor should be serialized. Used by windows forms designer design-time support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeSelectionBoxBorderColor()
+		{return (m_SelectionBoxBorderColor!=GetDefaultSelectionBoxBorderColor());}
+		/// <summary>
+		/// Resets SelectionBoxBorderColor to it's default value. Used by windows forms designer design-time support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetSelectionBoxBorderColor()
+		{
+			m_SelectionBoxBorderColor=GetDefaultSelectionBoxBorderColor();
+		}
+
+		/// <summary>
+		/// Gets or sets the selection box fill color.
+		/// </summary>
+		[Browsable(true),Category("Selected Node"),Description("Indicates the selection box fill color.")]
+		public Color SelectionBoxFillColor
+		{
+			get {return m_SelectionBoxFillColor;}
+			set
+			{
+				if(m_SelectionBoxFillColor!=value)
+				{
+					m_SelectionBoxFillColor=value;
+					this.OnSelectionBoxChanged();
+				}
+			}
+
+		}
+		/// <summary>
+		/// Indicates whether SelectionBoxFillColor should be serialized. Used by windows forms designer design-time support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeSelectionBoxFillColor()
+		{return (m_SelectionBoxFillColor!=GetDefaultSelectionBoxFillColor());}
+		/// <summary>
+		/// Resets SelectionBoxFillColor to it's default value. Used by windows forms designer design-time support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetSelectionBoxFillColor()
+		{
+			m_SelectionBoxFillColor=GetDefaultSelectionBoxFillColor();
+		}
+
+		/// <summary>
+		/// Gets or sets the size of the expand button that is used to expand/collapse node. Default value is 8,8.
+		/// </summary>
+		[Browsable(true),Category("Expand Button"),Description("Indicates size of the expand button that is used to expand/collapse node.")]
+		public Size ExpandButtonSize
+		{
+			get {return m_ExpandButtonSize;}
+			set
+			{
+				if(m_ExpandButtonSize!=value && !m_ExpandButtonSize.IsEmpty)
+				{
+					m_ExpandButtonSize=value;
+					this.OnExpandButtonChanged();
+				}
+			}
+		}
+		/// <summary>
+		/// Indicates whether SelectionBoxFillColor should be serialized. Used by windows forms designer design-time support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeExpandButtonSize()
+		{return (m_ExpandButtonSize!=GetDefaultExpandButtonSize());}
+		/// <summary>
+		/// Resets SelectionBoxFillColor to it's default value. Used by windows forms designer design-time support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetExpandButtonSize()
+		{
+			this.ExpandButtonSize=GetDefaultExpandButtonSize();
+		}
+
+		/// <summary>
+		/// Gets or sets expand button border color. Note that setting ExpandBorderColorSchemePart property will override the value that you set here.
+		/// </summary>
+		[Browsable(true),Category("Expand Button"),Description("Indicates expand button border color.")]
+		public Color ExpandBorderColor
+		{
+			get {return m_ExpandBorderColor;}
+			set
+			{
+				m_ExpandBorderColor=value;
+				this.OnExpandButtonChanged();
+			}
+		}
+		/// <summary>
+		/// Indicates whether ExpandBorderColor should be serialized. Used by windows forms designer design-time support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeExpandBorderColor()
+		{return (!m_ExpandBorderColor.IsEmpty && m_ExpandBorderColorSchemePart==eColorSchemePart.None);}
+		/// <summary>
+		/// Resets ExpandBorderColor to it's default value. Used by windows forms designer design-time support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetExpandBorderColor()
+		{
+			this.ExpandBorderColor=Color.Empty;
+		}
+		/// <summary>
+		/// Gets or sets expand button color scheme border color. Setting
+		/// this property overrides the setting of the corresponding ExpandBorderColor property.
+		/// Color scheme colors are automatically managed and are based on current system colors.
+		/// That means if colors on the system change the color scheme will ensure that it's colors
+		/// are changed as well to fit in the color scheme of target system. Set this property to
+		/// <a href="TreeGX~DevComponents.Tree.eColorSchemePart.html">eColorSchemePart.None</a> to
+		/// specify explicit color to use through ExpandBorderColor property.
+		/// </summary>
+		[Browsable(true),Category("Expand Button"),DefaultValue(eColorSchemePart.BarDockedBorder),Description("Indicates expand button border color.")]
+		public eColorSchemePart ExpandBorderColorSchemePart
+		{
+			get {return m_ExpandBorderColorSchemePart;}
+			set
+			{
+				m_ExpandBorderColorSchemePart=value;
+				this.OnExpandButtonChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets expand button back color. Note that setting ExpandBackColorSchemePart property will override the value that you set here.
+		/// </summary>
+		[Browsable(true),Category("Expand Button"),Description("Indicates expand button back color.")]
+		public Color ExpandBackColor
+		{
+			get {return m_ExpandBackColor;}
+			set
+			{
+				m_ExpandBackColor=value;
+				this.OnExpandButtonChanged();
+			}
+		}
+		/// <summary>
+		/// Indicates whether ExpandBackColor should be serialized. Used by windows forms designer design-time support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeExpandBackColor()
+		{return (!m_ExpandBackColor.IsEmpty && m_ExpandBackColorSchemePart==eColorSchemePart.None);}
+		/// <summary>
+		/// Resets ExpandBackColor to it's default value. Used by windows forms designer design-time support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetExpandBackColor()
+		{
+			this.ExpandBackColor=Color.Empty;
+		}
+		/// <summary>
+		/// Gets or sets expand button color scheme back color. Setting
+		/// this property overrides the setting of the corresponding ExpandBackColor property.
+		/// Color scheme colors are automatically managed and are based on current system colors.
+		/// That means if colors on the system change the color scheme will ensure that it's colors
+		/// are changed as well to fit in the color scheme of target system. Set this property to
+		/// <a href="TreeGX~DevComponents.Tree.eColorSchemePart.html">eColorSchemePart.None</a> to
+		/// specify explicit color to use through ExpandBackColor property.
+		/// </summary>
+		[Browsable(true),Category("Expand Button"),DefaultValue(eColorSchemePart.None),Description("Indicates expand button back color.")]
+		public eColorSchemePart ExpandBackColorSchemePart
+		{
+			get {return m_ExpandBackColorSchemePart;}
+			set
+			{
+				m_ExpandBackColorSchemePart=value;
+				this.OnExpandButtonChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets expand button target gradientback color. Note that setting ExpandBackColor2SchemePart property will override the value that you set here.
+		/// </summary>
+		[Browsable(true),Category("Expand Button"),Description("Indicates expand button target gradient back color.")]
+		public Color ExpandBackColor2
+		{
+			get {return m_ExpandBackColor2;}
+			set
+			{
+				m_ExpandBackColor2=value;
+				this.OnExpandButtonChanged();
+			}
+		}
+		/// <summary>
+		/// Indicates whether ExpandBackColor2 should be serialized. Used by windows forms designer design-time support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeExpandBackColor2()
+		{return (!m_ExpandBackColor2.IsEmpty && m_ExpandBackColor2SchemePart==eColorSchemePart.None);}
+		/// <summary>
+		/// Resets ExpandBackColor2 to it's default value. Used by windows forms designer design-time support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetExpandBackColor2()
+		{
+			this.ExpandBackColor2=Color.Empty;
+		}
+		/// <summary>
+		/// Gets or sets expand button color scheme target gradient back color. Setting
+		/// this property overrides the setting of the corresponding ExpandBackColor2 property.
+		/// Color scheme colors are automatically managed and are based on current system colors.
+		/// That means if colors on the system change the color scheme will ensure that it's colors
+		/// are changed as well to fit in the color scheme of target system. Set this property to
+		/// <a href="TreeGX~DevComponents.Tree.eColorSchemePart.html">eColorSchemePart.None</a> to
+		/// specify explicit color to use through ExpandBackColor2 property.
+		/// </summary>
+		[Browsable(true),Category("Expand Button"),DefaultValue(eColorSchemePart.None),Description("Indicates expand button target gradient back color.")]
+		public eColorSchemePart ExpandBackColor2SchemePart
+		{
+			get {return m_ExpandBackColor2SchemePart;}
+			set
+			{
+				m_ExpandBackColor2SchemePart=value;
+				this.OnExpandButtonChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets expand button line color. Note that setting ExpandLineColorSchemePart property will override the value that you set here.
+		/// </summary>
+		[Browsable(true),Category("Expand Button"),Description("Indicates expand button line color.")]
+		public Color ExpandLineColor
+		{
+			get {return m_ExpandLineColor;}
+			set
+			{
+				m_ExpandLineColor=value;
+				this.OnExpandButtonChanged();
+			}
+		}
+		/// <summary>
+		/// Indicates whether ExpandLineColor should be serialized. Used by windows forms designer design-time support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeExpandLineColor()
+		{return (!m_ExpandLineColor.IsEmpty && m_ExpandLineColorSchemePart==eColorSchemePart.None);}
+		/// <summary>
+		/// Resets ExpandLineColor to it's default value. Used by windows forms designer design-time support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetExpandLineColor()
+		{
+			this.ExpandLineColor=Color.Empty;
+		}
+		/// <summary>
+		/// Gets or sets expand button color scheme line color. Setting
+		/// this property overrides the setting of the corresponding ExpandLineColor property.
+		/// Color scheme colors are automatically managed and are based on current system colors.
+		/// That means if colors on the system change the color scheme will ensure that it's colors
+		/// are changed as well to fit in the color scheme of target system. Set this property to
+		/// <a href="TreeGX~DevComponents.Tree.eColorSchemePart.html">eColorSchemePart.None</a> to
+		/// specify explicit color to use through ExpandLineColor property.
+		/// </summary>
+		[Browsable(true),Category("Expand Button"),DefaultValue(eColorSchemePart.None),Description("Indicates expand button line color.")]
+		public eColorSchemePart ExpandLineColorSchemePart
+		{
+			get {return m_ExpandLineColorSchemePart;}
+			set
+			{
+				m_ExpandLineColorSchemePart=value;
+				this.OnExpandButtonChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the expand button background gradient angle.
+		/// </summary>
+		[Browsable(true),Category("Expand Button"),DefaultValue(0),Description("Indicates expand button background gradient angle.")]
+		public int ExpandBackColorGradientAngle
+		{
+			get
+			{
+				return m_ExpandBackColorGradientAngle;
+			}
+			set
+			{
+				if(m_ExpandBackColorGradientAngle!=value)
+				{
+					m_ExpandBackColorGradientAngle=value;
+					this.OnExpandButtonChanged();
+
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the expand button image which is used to indicate that node will be expanded. To use images as expand buttons you also need to set ExpandButtonType=eExpandButtonType.Image.
+		/// </summary>
+		[Browsable(true),DefaultValue(null),Description("Indicates expand button image which is used to indicate that node will be expanded."),Category("Expand Button")]
+		public Image ExpandImage
+		{
+			get {return m_ExpandImage;}
+			set
+			{
+				if(m_ExpandImage!=value)
+				{
+					m_ExpandImage=value;
+					if(m_ExpandButtonType==eExpandButtonType.Image)
+						this.OnExpandButtonChanged();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the expand button image which is used to indicate that node will be collapsed. To use images as expand buttons you also need to set ExpandButtonType=eExpandButtonType.Image.
+		/// </summary>
+		[Browsable(true),DefaultValue(null),Description("Indicates expand button image which is used to indicate that node will be collapsed."),Category("Expand Button")]
+		public Image ExpandImageCollapse
+		{
+			get {return m_ExpandImageCollapse;}
+			set
+			{
+				if(m_ExpandImageCollapse!=value)
+				{
+					m_ExpandImageCollapse=value;
+					if(m_ExpandButtonType==eExpandButtonType.Image)
+						this.OnExpandButtonChanged();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the type of the expand button used to expand/collapse nodes.
+		/// </summary>
+		[Browsable(true),DefaultValue(eExpandButtonType.Ellipse),Category("Expand Button"),Description("Indicates type of the expand button used to expand/collapse nodes.")]
+		public eExpandButtonType ExpandButtonType
+		{
+			get {return m_ExpandButtonType;}
+			set
+			{
+				if(m_ExpandButtonType!=value)
+				{
+					m_ExpandButtonType=value;
+					this.OnExpandButtonChanged();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the display root node. For example in Map or Diagram layout single node
+		/// is always used as root node for display. Setting this property allows you to use any
+		/// Node as root display node. Default value is Null which means that first node from
+		/// TreeGX.Nodes collection is used as display root node.
+		/// </summary>
+		[Browsable(true),DefaultValue(null),Category("Appearance"),Description("Indicates display root node.")]
+		public Node DisplayRootNode
+		{
+			get {return m_DisplayRootNode;}
+			set
+			{
+				if(m_DisplayRootNode!=value)
+				{
+					m_DisplayRootNode=value;
+					InvalidateNodesSize();
+					this.RecalcLayout();
+					this.Refresh();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the width of the command button. Default value is 10 pixels.
+		/// </summary>
+		[Browsable(true),Category("Command Button"),DefaultValue(10),Description("Indicates width of the command button.")]
+		public int CommandWidth
+		{
+			get{return m_CommandWidth;}
+			set
+			{
+				m_CommandWidth=value;
+				OnCommandButtonChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets command button back color. Note that setting CommandBackColorSchemePart property will override the value that you set here.
+		/// </summary>
+		[Browsable(true),Category("Command Button"),Description("Indicates command button back color.")]
+		public Color CommandBackColor
+		{
+			get {return m_CommandBackColor;}
+			set
+			{
+				m_CommandBackColor=value;
+				this.OnCommandButtonChanged();
+			}
+		}
+		/// <summary>
+		/// Indicates whether CommandBackColor should be serialized. Used by windows forms designer design-time support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeCommandBackColor()
+		{return (!m_CommandBackColor.IsEmpty && m_CommandBackColorSchemePart==eColorSchemePart.None);}
+		/// <summary>
+		/// Resets CommandBackColor to it's default value. Used by windows forms designer design-time support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetCommandBackColor()
+		{
+			this.CommandBackColor=Color.Empty;
+		}
+		/// <summary>
+		/// Gets or sets command button color scheme back color. Setting
+		/// this property overrides the setting of the corresponding CommandBackColor property.
+		/// Color scheme colors are automatically managed and are based on current system colors.
+		/// That means if colors on the system change the color scheme will ensure that it's colors
+		/// are changed as well to fit in the color scheme of target system. Set this property to
+		/// <a href="TreeGX~DevComponents.Tree.eColorSchemePart.html">eColorSchemePart.None</a> to
+		/// specify explicit color to use through CommandBackColor property.
+		/// </summary>
+		[Browsable(true),Category("Command Button"),DefaultValue(eColorSchemePart.CustomizeBackground),Description("Indicates command button back color.")]
+		public eColorSchemePart CommandBackColorSchemePart
+		{
+			get {return m_CommandBackColorSchemePart;}
+			set
+			{
+				m_CommandBackColorSchemePart=value;
+				this.OnCommandButtonChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets command button target gradient back color. Note that setting CommandBackColor2SchemePart property will override the value that you set here.
+		/// </summary>
+		[Browsable(true),Category("Command Button"),Description("Indicates command button target gradient back color.")]
+		public Color CommandBackColor2
+		{
+			get {return m_CommandBackColor2;}
+			set
+			{
+				m_CommandBackColor2=value;
+				this.OnCommandButtonChanged();
+			}
+		}
+		/// <summary>
+		/// Indicates whether CommandBackColor2 should be serialized. Used by windows forms designer design-time support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeCommandBackColor2()
+		{return (!m_CommandBackColor2.IsEmpty && m_CommandBackColor2SchemePart==eColorSchemePart.None);}
+		/// <summary>
+		/// Resets CommandBackColor2 to it's default value. Used by windows forms designer design-time support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetCommandBackColor2()
+		{
+			this.CommandBackColor2=Color.Empty;
+		}
+		/// <summary>
+		/// Gets or sets command button color scheme target gradient back color. Setting
+		/// this property overrides the setting of the corresponding CommandBackColor2 property.
+		/// Color scheme colors are automatically managed and are based on current system colors.
+		/// That means if colors on the system change the color scheme will ensure that it's colors
+		/// are changed as well to fit in the color scheme of target system. Set this property to
+		/// <a href="TreeGX~DevComponents.Tree.eColorSchemePart.html">eColorSchemePart.None</a> to
+		/// specify explicit color to use through CommandBackColor2 property.
+		/// </summary>
+		[Browsable(true),Category("Command Button"),DefaultValue(eColorSchemePart.CustomizeBackground2),Description("Indicates command button target gradient back color.")]
+		public eColorSchemePart CommandBackColor2SchemePart
+		{
+			get {return m_CommandBackColor2SchemePart;}
+			set
+			{
+				m_CommandBackColor2SchemePart=value;
+				this.OnCommandButtonChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets command button foreground color. Note that setting CommandForeColorSchemePart property will override the value that you set here.
+		/// </summary>
+		[Browsable(true),Category("Command Button"),Description("Indicates command button fore color.")]
+		public Color CommandForeColor
+		{
+			get {return m_CommandForeColor;}
+			set
+			{
+				m_CommandForeColor=value;
+				this.OnCommandButtonChanged();
+			}
+		}
+		/// <summary>
+		/// Indicates whether CommandForeColor should be serialized. Used by windows forms designer design-time support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeCommandForeColor()
+		{return (!m_CommandForeColor.IsEmpty && m_CommandForeColorSchemePart==eColorSchemePart.None);}
+		/// <summary>
+		/// Resets CommandForeColor to it's default value. Used by windows forms designer design-time support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetCommandForeColor()
+		{
+			this.CommandForeColor=Color.Empty;
+		}
+		/// <summary>
+		/// Gets or sets command button color scheme foreground color. Setting
+		/// this property overrides the setting of the corresponding CommandForeColor property.
+		/// Color scheme colors are automatically managed and are based on current system colors.
+		/// That means if colors on the system change the color scheme will ensure that it's colors
+		/// are changed as well to fit in the color scheme of target system. Set this property to
+		/// <a href="TreeGX~DevComponents.Tree.eColorSchemePart.html">eColorSchemePart.None</a> to
+		/// specify explicit color to use through CommandForeColor property.
+		/// </summary>
+		[Browsable(true),Category("Command Button"),DefaultValue(eColorSchemePart.CustomizeText),Description("Indicates command button foreground color.")]
+		public eColorSchemePart CommandForeColorSchemePart
+		{
+			get {return m_CommandForeColorSchemePart;}
+			set
+			{
+				m_CommandForeColorSchemePart=value;
+				this.OnCommandButtonChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the command button background gradient angle.
+		/// </summary>
+		[Browsable(true),Category("Expand Button"),DefaultValue(0),Description("Indicates command button background gradient angle.")]
+		public int CommandBackColorGradientAngle
+		{
+			get
+			{
+				return m_CommandBackColorGradientAngle;
+			}
+			set
+			{
+				if(m_CommandBackColorGradientAngle!=value)
+				{
+					m_CommandBackColorGradientAngle=value;
+					this.OnExpandButtonChanged();
+
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets command button mouse over back color. Note that setting CommandMouseOverBackColorSchemePart property will override the value that you set here.
+		/// </summary>
+		[Browsable(true),Category("Command Button"),Description("Indicates command button mouse over back color.")]
+		public Color CommandMouseOverBackColor
+		{
+			get {return m_CommandMouseOverBackColor;}
+			set
+			{
+				m_CommandMouseOverBackColor=value;
+				this.OnCommandButtonChanged();
+			}
+		}
+		/// <summary>
+		/// Indicates whether CommandMouseOverBackColor should be serialized. Used by windows forms designer design-time support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeCommandMouseOverBackColor()
+		{return (!m_CommandMouseOverBackColor.IsEmpty && m_CommandMouseOverBackColorSchemePart==eColorSchemePart.None);}
+		/// <summary>
+		/// Resets CommandMouseOverBackColor to it's default value. Used by windows forms designer design-time support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetCommandMouseOverBackColor()
+		{
+			this.CommandMouseOverBackColor=Color.Empty;
+		}
+		/// <summary>
+		/// Gets or sets command button color scheme mouse over back color. Setting
+		/// this property overrides the setting of the corresponding CommandMouseOverBackColor property.
+		/// Color scheme colors are automatically managed and are based on current system colors.
+		/// That means if colors on the system change the color scheme will ensure that it's colors
+		/// are changed as well to fit in the color scheme of target system. Set this property to
+		/// <a href="TreeGX~DevComponents.Tree.eColorSchemePart.html">eColorSchemePart.None</a> to
+		/// specify explicit color to use through CommandMouseOverBackColor property.
+		/// </summary>
+		[Browsable(true),Category("Command Button"),DefaultValue(eColorSchemePart.ItemHotBackground),Description("Indicates command button mouse over back color.")]
+		public eColorSchemePart CommandMouseOverBackColorSchemePart
+		{
+			get {return m_CommandMouseOverBackColorSchemePart;}
+			set
+			{
+				m_CommandMouseOverBackColorSchemePart=value;
+				this.OnCommandButtonChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets command button mouse over target gradient back color. Note that setting CommandMouseOverBackColor2SchemePart property will override the value that you set here.
+		/// </summary>
+		[Browsable(true),Category("Command Button"),Description("Indicates command button mouse over target gradient back color.")]
+		public Color CommandMouseOverBackColor2
+		{
+			get {return m_CommandMouseOverBackColor2;}
+			set
+			{
+				m_CommandMouseOverBackColor2=value;
+				this.OnCommandButtonChanged();
+			}
+		}
+		/// <summary>
+		/// Indicates whether CommandMouseOverBackColor2 should be serialized. Used by windows forms designer design-time support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeCommandMouseOverBackColor2()
+		{return (!m_CommandMouseOverBackColor2.IsEmpty && m_CommandMouseOverBackColor2SchemePart==eColorSchemePart.None);}
+		/// <summary>
+		/// Resets CommandMouseOverBackColor2 to it's default value. Used by windows forms designer design-time support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetCommandMouseOverBackColor2()
+		{
+			this.CommandMouseOverBackColor2=Color.Empty;
+		}
+		/// <summary>
+		/// Gets or sets command button mouse over color scheme target gradient back color. Setting
+		/// this property overrides the setting of the corresponding CommandMouseOverBackColor2 property.
+		/// Color scheme colors are automatically managed and are based on current system colors.
+		/// That means if colors on the system change the color scheme will ensure that it's colors
+		/// are changed as well to fit in the color scheme of target system. Set this property to
+		/// <a href="TreeGX~DevComponents.Tree.eColorSchemePart.html">eColorSchemePart.None</a> to
+		/// specify explicit color to use through CommandMouseOverBackColor2 property.
+		/// </summary>
+		[Browsable(true),Category("Command Button"),DefaultValue(eColorSchemePart.ItemPressedBackground2),Description("Indicates command button mouse over target gradient back color.")]
+		public eColorSchemePart CommandMouseOverBackColor2SchemePart
+		{
+			get {return m_CommandMouseOverBackColor2SchemePart;}
+			set
+			{
+				m_CommandMouseOverBackColor2SchemePart=value;
+				this.OnCommandButtonChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets command button mouse over foreground color. Note that setting CommandMouseOverForeColorSchemePart property will override the value that you set here.
+		/// </summary>
+		[Browsable(true),Category("Command Button"),Description("Indicates command button mouse over fore color.")]
+		public Color CommandMouseOverForeColor
+		{
+			get {return m_CommandMouseOverForeColor;}
+			set
+			{
+				m_CommandMouseOverForeColor=value;
+				this.OnCommandButtonChanged();
+			}
+		}
+		/// <summary>
+		/// Indicates whether CommandMouseOverForeColor should be serialized. Used by windows forms designer design-time support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public bool ShouldSerializeCommandMouseOverForeColor()
+		{return (!m_CommandMouseOverForeColor.IsEmpty && m_CommandMouseOverForeColorSchemePart==eColorSchemePart.None);}
+		/// <summary>
+		/// Resets CommandMouseOverForeColor to it's default value. Used by windows forms designer design-time support.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public void ResetCommandMouseOverForeColor()
+		{
+			this.CommandMouseOverForeColor=Color.Empty;
+		}
+		/// <summary>
+		/// Gets or sets command button mouse over color scheme foreground color. Setting
+		/// this property overrides the setting of the corresponding CommandMouseOverForeColor property.
+		/// Color scheme colors are automatically managed and are based on current system colors.
+		/// That means if colors on the system change the color scheme will ensure that it's colors
+		/// are changed as well to fit in the color scheme of target system. Set this property to
+		/// <a href="TreeGX~DevComponents.Tree.eColorSchemePart.html">eColorSchemePart.None</a> to
+		/// specify explicit color to use through CommandMouseOverForeColor property.
+		/// </summary>
+		[Browsable(true),Category("Command Button"),DefaultValue(eColorSchemePart.ItemHotText),Description("Indicates command button mouse over foreground color.")]
+		public eColorSchemePart CommandMouseOverForeColorSchemePart
+		{
+			get {return m_CommandMouseOverForeColorSchemePart;}
+			set
+			{
+				m_CommandMouseOverForeColorSchemePart=value;
+				this.OnCommandButtonChanged();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the command button mouse over background gradient angle.
+		/// </summary>
+		[Browsable(true),Category("Expand Button"),DefaultValue(0),Description("Indicates command button mouse over background gradient angle.")]
+		public int CommandMouseOverBackColorGradientAngle
+		{
+			get
+			{
+				return m_CommandMouseOverBackColorGradientAngle;
+			}
+			set
+			{
+				if(m_CommandMouseOverBackColorGradientAngle!=value)
+				{
+					m_CommandMouseOverBackColorGradientAngle=value;
+					this.OnExpandButtonChanged();
+
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets a value indicating whether the label text of the node cells can be edited. Default value is false.
+		/// </summary>
+		[Browsable(true),DefaultValue(false),Description("Indicates whether the label text of the node cells can be edited."),Category("Editing")]
+		public bool CellEdit
+		{
+			get {return m_CellEdit;}
+			set {m_CellEdit=value;}
+		}
+
+		/// <summary>
+		/// Returns whether cell editing is in progress.
+		/// </summary>
+		[Browsable(false)]
+		public bool IsCellEditing
+		{
+			get {return m_CellEditing;}
+		}
+		#endregion
+
+		#region Private implementation
+        protected override void ScaleControl(SizeF factor, BoundsSpecified specified)
+        {
+            Dpi.SetScaling(factor);
+            ScaleHostedControls(factor);
+            this.InvalidateNodesSize();
+            base.ScaleControl(factor, specified);
+        }
+
+        private void ScaleHostedControls(SizeF factor)
+        {
+            foreach (Cell cell in m_HostedControlCells)
+            {
+                System.Windows.Forms.Control cellHostedControl = cell.HostedControl;
+                if (cellHostedControl == null) continue;
+                cellHostedControl.Scale(factor);
+            }
+        }
+
+        protected override bool ScaleChildren
+        {
+            get { return false; }
+        }
+
+		/// <summary>
+		/// Returns color scheme part color if set otherwise returns color passed in.
+		/// </summary>
+		/// <param name="color">Color.</param>
+		/// <param name="p">Color scheme part.</param>
+		/// <returns>Color.</returns>
+		internal Color GetColor(Color color, eColorSchemePart p)
+		{
+			if(p==eColorSchemePart.None)
+				return color;
+			ColorScheme cs=this.ColorScheme;
+			if(cs==null)
+				return color;
+			return (Color)cs.GetType().GetProperty(p.ToString()).GetValue(cs,null);
+		}
+		private void OnExpandButtonChanged()
+		{
+			m_NodeLayout.ExpandPartSize=m_ExpandButtonSize;
+			this.InvalidateNodesSize();
+            this.RecalcLayout();
+			this.Refresh();
+		}
+		private Size GetDefaultExpandButtonSize()
+		{
+			return m_DefaultExpandPartSize;
+		}
+		private void ElementStyleChanged(object sender, EventArgs e)
+		{
+			this.InvalidateNodesSize();
+			if(this.DesignMode)
+				this.RecalcLayout();
+			this.OnDisplayChanged();
+		}
+		private void OnDisplayChanged()
+		{
+			if(this.DesignMode)
+				this.Refresh();
+		}
+		private void OnLayoutChanged()
+		{
+			m_NodeLayout.NodeHorizontalSpacing=m_NodeHorizontalSpacing;
+			m_NodeLayout.NodeVerticalSpacing=m_NodeVerticalSpacing;
+			
+			// Layout specific properties
+			if(m_Layout==eNodeLayout.Diagram)
+			{
+				Layout.NodeDiagramLayout nd=m_NodeLayout as Layout.NodeDiagramLayout;
+				nd.DiagramFlow=m_DiagramLayoutFlow;
+			}
+            else if(m_Layout==eNodeLayout.Map)
+			{
+				NodeMapLayout nd=m_NodeLayout as NodeMapLayout;
+				nd.MapFlow=m_MapLayoutFlow;
+			}
+
+            this.RecalcLayout();
+			OnDisplayChanged();
+		}
+		private void ConnectorAppearanceChanged(object sender, EventArgs e)
+		{
+			OnDisplayChanged();
+		}
+		private void SetLayout(eNodeLayout layout)
+		{
+			m_Layout=layout;
+			if(m_Layout==eNodeLayout.Map)
+			{
+				m_NodeLayout=new NodeMapLayout(this,this.ClientRectangle);
+			}
+			else if(m_Layout==eNodeLayout.Diagram)
+			{
+				m_NodeLayout=new Layout.NodeDiagramLayout(this,this.ClientRectangle);
+			}
+			InvalidateNodesSize();
+			OnLayoutChanged();
+		}
+		
+		private void PaintStyleBackground(Graphics g)
+		{
+			Display.NodeRenderer renderer = this.NodeRenderer;
+			if(renderer!=null)
+			{
+				this.NodeRenderer.DrawTreeBackground(new TreeBackgroundRendererEventArgs(g, this));
+				return;
+			}
+			
+			if(!this.BackColor.IsEmpty)
+			{
+				using(SolidBrush brush=new SolidBrush(this.BackColor))
+					g.FillRectangle(brush,this.DisplayRectangle);
+			}
+
+			ElementStyleDisplayInfo info=new ElementStyleDisplayInfo();
+			info.Bounds=this.DisplayRectangle;
+			info.Graphics=g;
+			info.Style=m_BackgroundStyle;
+			ElementStyleDisplay.Paint(info);
+		}
+		
+		protected override void OnPaint(PaintEventArgs e)
+		{
+			if(this.SuspendPaint)
+				return;
+			
+			if(m_PendingLayout)
+			{
+				this.RecalcLayout();
+			}
+
+			if(this.BackColor.A<255)
+			{
+				base.OnPaintBackground(e);
+			}
+			
+			Graphics g=e.Graphics;
+
+			PaintStyleBackground(g);
+			Point offset=Point.Empty;
+			bool setOffset=false;
+			if(this.AutoScroll)
+			{
+                offset = GetAutoScrollPositionOffset();
+				setOffset=true;
+			}
+			
+			if(m_AntiAlias)
+			{
+				g.SmoothingMode=System.Drawing.Drawing2D.SmoothingMode.AntiAlias;
+				g.TextRenderingHint = System.Drawing.Text.TextRenderingHint.ClearTypeGridFit;
+			}
+			
+			PaintTree(g, e.ClipRectangle, offset, setOffset, m_ZoomFactor);
+
+            base.OnPaint(e);
+		}
+
+        internal Rectangle GetInnerRectangle()
+        {
+            Rectangle r = ElementStyleLayout.GetInnerRect(this.BackgroundStyle, this.ClientRectangle);
+            return r;
+        }
+
+        internal Point GetAutoScrollPositionOffset()
+        {
+            Point p = this.AutoScrollPosition;
+            p.Y += this.SelectionBoxSize;
+            p.X += this.SelectionBoxSize;
+            return p;
+        }
+		
+		private void PaintTree(Graphics g, Rectangle clipRectangle, Point offset, bool setOffset, float zoomFactor)
+		{
+			
+#if TRIAL
+			if(NodeOperations.ColorExpAlt())
+			{
+				StringFormat format=new StringFormat(StringFormat.GenericDefault);
+				format.Alignment=StringAlignment.Center;
+				format.FormatFlags=format.FormatFlags & ~(format.FormatFlags & StringFormatFlags.NoWrap);	
+				g.DrawString("Thank you very much for trying TreeGX. Unfortunately your trial period is over. To continue using TreeGX you should purchase license at http://www.devcomponents.com",new Font(this.Font.FontFamily,12),SystemBrushes.Highlight,this.ClientRectangle,format);
+				format.Dispose();
+				return;
+			}
+#else
+			if(NodeOperations.keyValidated2!=114)
+			{
+				Font trial=new Font(this.Font.FontFamily,7);
+				SolidBrush brushTrial = new SolidBrush(Color.FromArgb(200, SystemColors.Highlight));
+				StringFormat format=new StringFormat(StringFormat.GenericDefault);
+				format.Alignment=StringAlignment.Center;
+				g.DrawString("TreeGX license not found. Please purchase license at http://www.devcomponents.com",
+					trial, brushTrial, this.DisplayRectangle.X+this.DisplayRectangle.Width/2, this.DisplayRectangle.Bottom - 14, format);
+				brushTrial.Dispose();
+				format.Dispose();
+				trial.Dispose();
+			}
+#endif
+				
+			//Creates the drawing matrix with the right zoom;
+			if(zoomFactor!=1)
+			{
+				System.Drawing.Drawing2D.Matrix mx = GetTranslationMatrix(zoomFactor);
+				//use it for drawing
+				g.Transform=mx;
+				
+				// Translate ClipRectangle
+				clipRectangle = GetLayoutRectangle(clipRectangle);
+			}
+
+			if(setOffset)
+			{
+				m_NodeDisplay.Offset = offset;
+			}
+			m_NodeDisplay.Paint(g,clipRectangle);
+			
+#if TRIAL
+			Font trial=new Font(this.Font.FontFamily,7);
+			SolidBrush brushTrial = new SolidBrush(Color.FromArgb(220, SystemColors.Highlight));
+			StringFormat formatTrial=new StringFormat(StringFormat.GenericDefault);
+			formatTrial.Alignment=StringAlignment.Center;
+			g.DrawString("Thank you for trying TreeGX. Please purchase license at http://www.devcomponents.com",
+			                      trial, brushTrial, this.DisplayRectangle.X+this.DisplayRectangle.Width/2, this.DisplayRectangle.Bottom - 14, formatTrial);
+			brushTrial.Dispose();
+			formatTrial.Dispose();
+			trial.Dispose();
+#endif
+		}
+		
+		/// <summary>
+		/// Paints control to canvas. This method might be used for print output.
+		/// </summary>
+		/// <param name="g">Graphics object to paint control to.</param>
+		/// <param name="background">Indicates whether to paint control background.</param>
+		public void PaintTo(Graphics g, bool background)
+		{
+			PaintTo(g, background, Rectangle.Empty);
+		}
+				
+		/// <summary>
+		/// Paints control to canvas. This method might be used for print output.
+		/// </summary>
+		/// <param name="g">Graphics object to paint control to.</param>
+		/// <param name="background">Indicates whether to paint control background.</param>
+		/// <param name="clipRectangle">Indicates clipping rectangle. Nodes outside of clipping rectangle will not be painted. You can pass Rectangle.Empty and all nodes will be painted.</param>
+		public void PaintTo(Graphics g, bool background, Rectangle clipRectangle)
+		{
+			if(background)
+				PaintStyleBackground(g);
+			Point lockedOffset=m_NodeDisplay.GetLockedOffset();
+			Point offsetDisplay = m_NodeDisplay.Offset;
+			Point offset=Point.Empty;
+			
+			m_NodeLayout.Graphics = g;
+			try
+			{
+				m_NodeLayout.PerformLayout();
+			}
+			finally
+			{
+				m_NodeLayout.Graphics = null;
+			}
+			
+			Node displayNode=this.GetDisplayRootNode();
+			
+			if(displayNode!=null)
+			{
+				if(this.NodeLayout is NodeMapLayout)
+				{
+					offset = new Point(Math.Abs(displayNode.ChildNodesBounds.Left),Math.Abs(displayNode.ChildNodesBounds.Top));
+				}
+			}
+			
+			m_NodeDisplay.SetLockedOffset(offset);
+			
+			try
+			{
+				PaintTree(g, clipRectangle, Point.Empty, true, 1f);
+			}
+			finally
+			{
+				m_NodeLayout.PerformLayout();
+				m_NodeDisplay.SetLockedOffset(lockedOffset);
+				if(lockedOffset.IsEmpty)
+					m_NodeDisplay.Offset = offsetDisplay;
+			}
+		}
+		
+		protected override void OnRightToLeftChanged(EventArgs e)
+		{
+			this.RecalcLayout();
+			base.OnRightToLeftChanged(e);			
+		}
+
+		protected override void OnHandleCreated(EventArgs e)
+		{
+			base.OnHandleCreated (e);
+			#if TRIAL
+			if(!this.DesignMode)
+			{
+				Design.ComponentNotLicensed f = new Design.ComponentNotLicensed();
+				f.ShowDialog();
+				f.Dispose();
+			}
+			#endif
+		}
+
+		protected override void OnResize(EventArgs e)
+		{
+			base.OnResize(e);
+			if(this.Size.Width==0 || this.Size.Height==0)
+				return;
+
+			this.RecalcLayout();
+		}
+
+        private bool _EndCellEditingOnLostFocus = true;
+        /// <summary>
+        /// Gets or sets whether cell editing is completed when control loses input focus. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Editing"), Description("Indicates whether cell editing is completed when control loses input focus. Default value is true.")]
+        public bool EndCellEditingOnLostFocus
+        {
+            get { return _EndCellEditingOnLostFocus; }
+            set
+            {
+                _EndCellEditingOnLostFocus = value;
+            }
+        }
+		protected override void OnKeyDown(KeyEventArgs e)
+		{
+			KeyNavigation.KeyDown(this, e);
+			base.OnKeyDown (e);
+		}
+
+        protected override void OnEnter(EventArgs e)
+        {
+            this.IsKeyboardFocusWithin = true;
+            base.OnEnter(e);
+        }
+        protected override void OnLeave(EventArgs e)
+        {
+            this.IsKeyboardFocusWithin = false;
+            base.OnLeave(e);
+        }
+        private bool _IsKeyboardFocusWithin = false;
+        /// <summary>
+        /// Gets whether keyboard focus is within the control.
+        /// </summary>
+        [Browsable(false)]
+        public bool IsKeyboardFocusWithin
+        {
+            get { return _IsKeyboardFocusWithin; }
+#if FRAMEWORK20
+            internal set
+#else
+            set
+#endif
+            {
+                _IsKeyboardFocusWithin = value;
+                OnIsKeyboardFocusWithinChanged();
+            }
+        }
+        protected virtual void OnIsKeyboardFocusWithinChanged()
+        {
+            if (_IsKeyboardFocusWithin)
+            {
+                if (this.SelectedNode != null)
+                    InvalidateNode(this.SelectedNode);
+            }
+            else
+            {
+                if (this.SelectedNode != null)
+                    InvalidateNode(this.SelectedNode);
+
+                if (m_CellEditing && _EndCellEditingOnLostFocus)
+                    EndCellEditing(eTreeAction.Keyboard);
+            }
+        }
+		
+		protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
+		{
+            if (this.IsKeyboardFocusWithin && !this.Focused)
+            {
+                foreach (Cell item in m_HostedControlCells)
+                {
+                    if (item.HostedControl != null && (item.HostedControl.Focused || item.HostedControl.ContainsFocus))
+                        return base.ProcessCmdKey(ref msg, keyData);
+                }
+            }
+
+			if(!m_CellEditing && (keyData==Keys.Left || keyData==Keys.Right || keyData==Keys.Up || keyData==Keys.Down))
+			{
+				KeyNavigation.NavigateKeyDown(this, new KeyEventArgs(keyData));
+				return true;
+			}
+			return base.ProcessCmdKey (ref msg, keyData);
+		}
+
+
+
+		protected override void OnMouseDown(MouseEventArgs e)
+		{
+			base.OnMouseDown(e);
+			
+			if(!this.Focused)
+				this.Focus();
+			
+			Point mousePos = GetLayoutPosition(e);
+            Node node = this.GetNodeAt(mousePos.X, mousePos.Y);
+
+            if (m_CellEditing)
+			{
+			    if (node == null)
+			        m_CellMouseDownCounter = 1;
+                else
+                    m_CellMouseDownCounter =0;
+				if(!EndCellEditing(eTreeAction.Mouse))
+					return;
+                this.Focus();
+			}
+
+			if(node!=null)
+				OnNodeMouseDown(node,e,m_NodeDisplay.Offset);
+			m_MouseDownLocation=mousePos;
+			
+#if !TRIAL
+			if(NodeOperations.keyValidated2!=114 && !m_DialogDisplayed)
+			{
+				Design.ComponentNotLicensed f = new Design.ComponentNotLicensed();
+				f.ShowDialog();
+				f.Dispose();
+				m_DialogDisplayed=true;
+			}
+#endif
+		}
+
+		protected override void OnMouseUp(MouseEventArgs e)
+		{
+			base.OnMouseUp(e);
+			OnNodeMouseUp(e);
+		}
+
+		protected override void OnClick(EventArgs e)
+		{
+			base.OnClick (e);
+            MouseEventArgs mouseArgs = e as MouseEventArgs;
+            MouseButtons mb = MouseButtons.Left;
+            if (mouseArgs != null)
+                mb = mouseArgs.Button;
+			OnNodeMouseClick(mb);
+		}
+		
+		protected override void OnDoubleClick(EventArgs e)
+		{
+			base.OnDoubleClick (e);
+			if(this.SelectedNode!=null)
+			{
+				Point p=this.PointToClient(Control.MousePosition);
+				InvokeNodeDoubleClick(new TreeGXNodeMouseEventArgs(this.SelectedNode, MouseButtons.Left, 2, 0, p.X, p.Y));
+			}
+		}
+
+		protected override void OnMouseLeave(EventArgs e)
+		{
+			base.OnMouseLeave(e);
+			
+			if(m_MouseOverNode!=null)
+				this.SetMouseOverNode(null);
+		}
+		
+		protected override void OnMouseHover(EventArgs e)
+		{
+			base.OnMouseHover (e);
+			if(m_MouseOverNode!=null && (FireHoverEvent || m_MouseOverNode.FireHoverEvent))
+			{
+				Point p=this.PointToClient(Control.MousePosition);
+				p=GetLayoutPosition(p);
+				InvokeNodeMouseHover(new TreeGXNodeMouseEventArgs(m_MouseOverNode, Control.MouseButtons, 0, 0, p.X, p.Y));
+			}
+		}
+
+
+		protected override void OnMouseMove(MouseEventArgs e)
+		{
+			base.OnMouseMove(e);
+			bool bUpdate=false;
+			
+			Point mousePos=GetLayoutPosition(e);
+			
+			if(e.Button==MouseButtons.Left && !m_CellEditing && m_DragDropEnabled && m_MouseOverNode!=null && m_DragNode==null && m_MouseOverNode.DragDropEnabled &&
+				(Math.Abs(m_MouseDownLocation.X-mousePos.X)>=SystemInformation.DragSize.Width || Math.Abs(m_MouseDownLocation.Y-mousePos.Y)>=SystemInformation.DragSize.Height))
+			{
+				StartDragDrop();
+			}
+
+			Rectangle r=Rectangle.Empty;
+			if(m_MouseOverNode!=null)
+				r=NodeDisplay.GetNodeRectangle(eNodeRectanglePart.NodeBounds,m_MouseOverNode,m_NodeDisplay.Offset);
+
+			if(!r.IsEmpty && r.Contains(mousePos))
+				bUpdate=OnNodeMouseMove(m_MouseOverNode,e,m_NodeDisplay.Offset);
+			else
+			{
+				Node node=GetNodeAt(mousePos);
+				if(node!=m_MouseOverNode)
+					bUpdate=SetMouseOverNode(node);
+				if(m_MouseOverNode!=null)
+					bUpdate=bUpdate | OnNodeMouseMove(m_MouseOverNode,e,m_NodeDisplay.Offset);
+			}
+
+			if(bUpdate)
+				this.Update();
+		}
+
+		/// <summary>
+		/// Selected specified node.
+		/// </summary>
+		/// <param name="node">Node to select.</param>
+		/// <param name="action">Action that is selecting the node.</param>
+		public void SelectNode(Node node, eTreeAction action)
+		{
+            if (node != null && !node.Selectable && !this.DesignMode) return;
+
+			TreeGXNodeCancelEventArgs cancelArgs = new TreeGXNodeCancelEventArgs(action, node);
+			OnBeforeNodeSelect(cancelArgs);
+			if(cancelArgs.Cancel)
+				return;
+			
+			bool bUpdate=false;
+
+			if(m_CellEditing)
+			{
+				if(!EndCellEditing(eTreeAction.Code))
+					return;
+			}
+			
+#if !TRIAL
+			if(NodeOperations.keyValidated2<114)
+			{
+				NodeDisplay.keyInvalid = true;
+				NodeOperations.keyValidated2 = NodeOperations.keyValidated2 + 124;
+			}
+			else if(NodeOperations.keyValidated2>114)
+				return;
+#endif
+			if(m_SelectedNode!=null)
+			{
+				InvalidateNode(m_SelectedNode);
+				bUpdate=true;
+				if(m_SelectedNode.SelectedCell!=null)
+					m_SelectedNode.SelectedCell.SetSelected(false);
+			}
+
+			m_SelectedNode=node;
+
+			if(m_SelectedNode!=null)
+			{
+				InvalidateNode(m_SelectedNode);
+				bUpdate=true;
+				if(m_SelectedNode.SelectedCell==null)
+					m_SelectedNode.Cells[0].SetSelected(true);
+			}
+			
+			if(this.SelectedPathConnector!=null)
+				this.Invalidate();
+
+			if(bUpdate)
+				this.Update();
+			
+			TreeGXNodeEventArgs args = new TreeGXNodeEventArgs(action, node);
+			OnAfterNodeSelect(args);
+		}
+
+		private void OnCellStyleChanged()
+		{
+			InvalidateNodesSize();
+			if(this.DesignMode)
+			{
+				this.RecalcLayout();
+				this.Refresh();
+			}
+		}
+
+		private void SetSizeChanged(Node node)
+		{
+			node.SizeChanged=true;
+			foreach(Node c in node.Nodes)
+				SetSizeChanged(c);
+		}
+
+		private void InvalidateNodesSize()
+		{
+			foreach(Node node in m_Nodes)
+				SetSizeChanged(node);
+		}
+
+		private void ImageListDisposed(object sender, EventArgs e)
+		{
+			if(sender==m_ImageList)
+			{
+				this.ImageList=null;
+			}
+		}
+
+		/// <summary>
+		/// Ensures that selected node is visible i.e. that all parents of the selected node are expanded. If not selects the first parent node not expanded.
+		/// </summary>
+		internal void ValidateSelectedNode()
+		{
+            Node node = this.SelectedNode;
+            Node nodeSelected = node;
+            if (node == null)
+                return;
+            if (node.TreeControl != this)
+            {
+                nodeSelected = null;
+            }
+            else
+            {
+                while (node != null)
+                {
+                    node = node.Parent;
+                    if (node != null && !node.Expanded && node.Selectable)
+                        nodeSelected = node;
+                }
+            }
+            if (nodeSelected == null || !nodeSelected.IsVisible)
+            {
+                if (!SelectFirstNode(eTreeAction.Code))
+                    this.SelectedNode = null;
+            }
+            else
+            {
+                //if (_MultiSelect)
+                //{
+                //    if (!this.SelectedNodes.Contains(nodeSelected))
+                //        this.SelectedNode = nodeSelected;
+                //}
+                //else
+                {
+                    if (this.SelectedNode != nodeSelected)
+                        this.SelectedNode = nodeSelected;
+                }
+            }
+		}
+
+        internal void OnNodesCleared()
+        {
+            this.SelectedNode = null;
+
+            if (this.IsHandleCreated)
+                this.RecalcLayout();
+            else
+                SetPendingLayout();
+        }
+
+		private bool SetMouseOverCell(Cell mouseOverCell)
+		{
+			bool bUpdate=false;
+			if(mouseOverCell==m_MouseOverCell)
+				return bUpdate;
+
+			if(m_MouseOverCell!=null && m_MouseOverCell!=mouseOverCell)
+			{
+				if(this.CellStyleMouseOver!=null || m_MouseOverCell.StyleMouseOver!=null || m_RenderMode!=eNodeRenderMode.Default || m_MouseOverCell.Parent!=null && m_MouseOverCell.Parent.RenderMode!=eNodeRenderMode.Default)
+					bUpdate=true;
+				m_MouseOverCell.SetMouseOver(false);
+			}
+
+			m_MouseOverCell=mouseOverCell;
+			if(m_MouseOverCell!=null)
+			{
+				m_MouseOverCell.SetMouseOver(true);
+				if(this.CellStyleMouseOver!=null || m_MouseOverCell.StyleMouseOver!=null || m_RenderMode!=eNodeRenderMode.Default || m_MouseOverCell.Parent!=null && m_MouseOverCell.Parent.RenderMode!=eNodeRenderMode.Default )
+					bUpdate=true;
+			}
+
+			UpdateTreeCursor();
+
+			return bUpdate;
+		}
+
+		private bool SetMouseOverNode(Node mouseOverNode)
+		{
+			bool bUpdate=false;
+			if(m_MouseOverNode!=null)
+			{
+				bUpdate=bUpdate | SetMouseOverCell(null);
+				m_MouseOverNode.MouseOverNodePart=eMouseOverNodePart.None;
+				if(this.NodeStyleMouseOver!=null || this.CellStyleMouseOver!=null || m_MouseOverNode.StyleMouseOver!=null || this.NodeStyleMouseOver!=null ||
+					m_RenderMode!=eNodeRenderMode.Default || m_MouseOverNode.RenderMode!=eNodeRenderMode.Default || m_MouseOverNode.CommandButton || bUpdate)
+				{
+					InvalidateNode(m_MouseOverNode);
+					bUpdate=true;
+				}
+				
+				if(m_MouseOverNode!=mouseOverNode && m_MouseOverNode!=null)
+				{
+					Point p=this.PointToClient(Control.MousePosition);
+					InvokeNodeMouseLeave(new TreeGXNodeMouseEventArgs(m_MouseOverNode, Control.MouseButtons, 0, 0, p.X, p.Y));
+				}
+			}
+			
+			m_MouseOverNode=mouseOverNode;
+			
+			if(m_MouseOverNode!=null)
+			{
+				m_MouseOverNode.MouseOverNodePart=eMouseOverNodePart.Node;
+				if(m_MouseOverNode.StyleMouseOver!=null || this.NodeStyleMouseOver!=null ||
+					m_RenderMode!=eNodeRenderMode.Default || m_MouseOverNode.RenderMode!=eNodeRenderMode.Default || m_MouseOverNode.CommandButton)
+				{
+					InvalidateNode(m_MouseOverNode);
+					bUpdate=true;
+				}
+				
+				Point p=this.PointToClient(Control.MousePosition);
+				InvokeNodeMouseEnter(new TreeGXNodeMouseEventArgs(m_MouseOverNode, Control.MouseButtons, 0, 0, p.X, p.Y));
+				
+				if(FireHoverEvent || m_MouseOverNode.FireHoverEvent)
+					Interop.WinApi.ResetHover(this);
+			}
+
+			return bUpdate;
+		}
+
+		private void OnNodeMouseDown(Node node, MouseEventArgs e, Point offset)
+		{
+			Point mousePos = GetLayoutPosition(e);
+			
+			InvokeNodeMouseDown(new TreeGXNodeMouseEventArgs(node, e.Button, e.Clicks, e.Delta, mousePos.X, mousePos.Y));
+			
+			if(e.Button==MouseButtons.Left)
+			{
+				Rectangle r=NodeDisplay.GetNodeRectangle(eNodeRectanglePart.ExpandBounds,node,offset);
+								
+				if(r.Contains(mousePos))
+				{
+					m_CellMouseDownCounter=0;
+					node.Toggle();
+					return;
+				}
+
+				if(node.CommandButton)
+				{
+					m_CellMouseDownCounter=0;
+					r=NodeDisplay.GetNodeRectangle(eNodeRectanglePart.CommandBounds,node,offset);
+					if(r.Contains(mousePos))
+					{
+						InvokeCommandButtonClick(node,new CommandButtonEventArgs(eTreeAction.Mouse,node));
+						return;
+					}
+				}
+
+				r=NodeDisplay.GetNodeRectangle(eNodeRectanglePart.NodeContentBounds,node,offset);
+				if(r.Contains(mousePos) && node.TreeControl!=null)
+				{
+					if(node.TreeControl.SelectedNode!=node)
+						m_CellMouseDownCounter=0;
+                    if (node.Selectable)
+                    {
+                        SelectNode(node, eTreeAction.Mouse);
+                        if (node.TreeControl.SelectedNode != node) // Action cancelled
+                            return;
+
+                        Cell cell = GetCellAt(node, mousePos.X, mousePos.Y, offset);
+                        if (cell != null)
+                        {
+                            bool checkBoxSelection = false;
+                            if (cell.CheckBoxVisible)
+                            {
+                                Rectangle rCheckBox = cell.CheckBoxBoundsRelative;
+                                r = NodeDisplay.GetNodeRectangle(eNodeRectanglePart.NodeBounds, node, offset);
+                                rCheckBox.Offset(r.Location);
+                                if (rCheckBox.Contains(mousePos))
+                                {
+                                    cell.Checked = !cell.Checked;
+                                    checkBoxSelection = true;
+                                    m_CellMouseDownCounter = 0;
+                                }
+                            }
+                            if (!checkBoxSelection)
+                                m_CellMouseDownCounter++;
+                            node.SelectedCell = cell;
+                            cell.SetMouseDown(true);
+                        }
+                    }
+				}
+				else
+					m_CellMouseDownCounter=0;
+			}
+			else if(e.Button==MouseButtons.Right)
+			{
+				SelectNode(node, eTreeAction.Mouse);
+				if(node.TreeControl.SelectedNode!=node) // Action cancelled
+					return;
+				if(node.ContextMenu!=null)
+				{
+					if(node.ContextMenu is ContextMenu)
+					{
+						ContextMenu cm=node.ContextMenu as ContextMenu;
+						cm.Show(this, new Point(e.X, e.Y));
+					}
+					else if(node.ContextMenu.GetType().FullName=="System.Windows.Forms.ContextMenuStrip")
+					{
+						node.ContextMenu.GetType().InvokeMember("Show", System.Reflection.BindingFlags.InvokeMethod, null,
+						                                        node.ContextMenu, new object[] {this, new Point(e.X, e.Y)});
+					}
+					else if(node.ContextMenu.GetType().FullName=="DevComponents.DotNetBar.ButtonItem")
+					{
+						Point p=this.PointToScreen(new Point(e.X, e.Y));
+						node.ContextMenu.GetType().InvokeMember("Popup", System.Reflection.BindingFlags.InvokeMethod,
+							null, node.ContextMenu, new object[]{p});
+					}
+					else if(node.ContextMenu.ToString().StartsWith(Design.NodeContextMenuTypeEditor.DotNetBarPrefix) && m_DotNetBarManager!=null)
+					{
+						string menuName=node.ContextMenu.ToString().Substring(Design.NodeContextMenuTypeEditor.DotNetBarPrefix.Length);
+						object contextMenus=m_DotNetBarManager.GetType().InvokeMember("ContextMenus", 
+							System.Reflection.BindingFlags.GetProperty, null, m_DotNetBarManager, null);
+						int index=(int)contextMenus.GetType().InvokeMember("IndexOf", System.Reflection.BindingFlags.InvokeMethod,
+							null, contextMenus, new string[]{menuName});
+						if(index>=0)
+						{
+							IList list=contextMenus as IList;
+							object popup=list[index];
+							// Older version of DotNetBar do not have this method exposed so ignore the error...
+							try
+							{
+								popup.GetType().InvokeMember("SetSourceControl", System.Reflection.BindingFlags.InvokeMethod,
+									null, popup, new object[]{this});
+							}
+							catch {}
+							
+							Point p=this.PointToScreen(new Point(e.X, e.Y));
+							popup.GetType().InvokeMember("Popup", System.Reflection.BindingFlags.InvokeMethod,
+								null, popup, new object[]{p});
+						}
+					}
+				}
+			}
+		}
+
+		private void OnNodeMouseUp(MouseEventArgs e)
+		{
+			bool bUpdate=false;
+			Point mousePos = GetLayoutPosition(e);
+			if(this.SelectedNode!=null)
+			{
+				if(this.SelectedNode.SelectedCell!=null && this.SelectedNode.SelectedCell.IsMouseDown)
+				{
+					this.SelectedNode.SelectedCell.SetMouseDown(false);
+					this.InvalidateNode(this.SelectedNode);
+					bUpdate=true;
+				}
+			}
+
+			if(bUpdate)
+				this.Update();
+			
+			if(NodeMouseUp!=null)
+			{
+				Node node = this.GetNodeAt(mousePos);
+				if(node!=null)
+				{
+					InvokeNodeMouseUp(new TreeGXNodeMouseEventArgs(node, e.Button, e.Clicks, e.Delta, mousePos.X, mousePos.Y));
+				}
+			}
+		}
+
+		private void OnNodeMouseClick(MouseButtons mouseButton)
+		{
+			if(this.SelectedNode==null)
+				return;
+			
+			InvokeNodeClick(new TreeGXNodeMouseEventArgs(this.SelectedNode, mouseButton, 1, 0, 0, 0));
+
+			// Start editing if allowed
+			if(this.CellEdit && this.SelectedNode.SelectedCell!=null && m_CellMouseDownCounter>1)
+			{
+				EditCell(this.SelectedNode.SelectedCell,eTreeAction.Mouse);
+			}
+		}
+
+		/// <summary>
+		/// Starts editing specified cell, places the cell into the edit mode.
+		/// </summary>
+		/// <param name="cell">Cell to start editing.</param>
+		/// <param name="action">Action that is a cause for the edit.</param>
+		internal void EditCell(Cell cell, eTreeAction action)
+		{
+			EditCell(cell, action, null);
+		}
+		
+		/// <summary>
+		/// Starts editing specified cell, places the cell into the edit mode.
+		/// </summary>
+		/// <param name="cell">Cell to start editing.</param>
+		/// <param name="action">Action that is a cause for the edit.</param>
+		/// <param name="initialText">Specifies the text to be edited instead of the text of the cell. Passing the NULL value will edit the text of the cell.</param>
+		internal void EditCell(Cell cell, eTreeAction action, string initialText)
+		{
+			if(cell==null) return;
+			
+			if(m_CellEditing)
+			{
+				if(!EndCellEditing(action))
+					return;
+			}
+			
+			CellEditEventArgs e = new CellEditEventArgs(cell,action,"");
+			OnBeforeCellEdit(e);
+			if(e.Cancel)
+				return;
+
+			TextBoxEx textBox=GetTextBox();
+			Rectangle rCell=NodeDisplay.GetCellRectangle(eCellRectanglePart.TextBounds, cell,m_NodeDisplay.Offset);
+		    rCell.Inflate(Dpi.Width2, Dpi.Height2);
+		    rCell.Height += Dpi.Height3;
+			rCell = GetScreenRectangle(rCell);
+			// It is important that text is assigned first or textbox will be resized to different size otherwise
+			textBox.Text=cell.Text;
+			textBox.EditWordWrap=cell.WordWrap;
+			Font font =CellDisplay.GetCellFont(this,cell);
+			if(m_ZoomFactor!=1 && font!=null)
+			{
+				font=new Font(font.FontFamily, font.SizeInPoints * m_ZoomFactor);
+			}
+			textBox.Font = font;
+			textBox.Location=rCell.Location;
+			textBox.Size=rCell.Size;
+			textBox.Visible=true;
+			textBox.Focus();
+			
+			//if initial text is null then follow default behaviour of selecting all text
+			//if initial text is not null, set that as the default text and set the caret to the end of the text
+			if (initialText == null)
+			{
+				textBox.SelectAll();
+			} 
+			else 
+			{
+				textBox.Text = initialText;
+				textBox.Select(textBox.Text.Length, 0);
+			}
+			
+			cell.Parent.SetEditing(true);
+			m_EditedCell=cell;
+			m_CellEditing=true;
+		}
+
+		/// <summary>
+		/// Ends cell editing.
+		/// </summary>
+		/// <param name="action">Specifies which action is cause for end of the editing.</param>
+		/// <returns>Returns true if edits were applied to the cell or false otherwise.</returns>
+		internal bool EndCellEditing(eTreeAction action)
+		{
+			if(m_EditedCell==null || m_EditTextBox==null)
+			{
+				m_CellEditing=false;
+				return true;
+			}
+
+			TextBox textBox=m_EditTextBox;
+			string text=textBox.Text;
+
+			CellEditEventArgs e=new CellEditEventArgs(m_EditedCell,action,text);
+			InvokeCellEditEnding(e);
+			if(e.Cancel)
+				return false;
+
+			textBox.Visible=false;
+
+			text=e.NewText;
+			InvokeAfterCellEdit(e);
+			text=e.NewText;
+
+			if(!e.Cancel && m_EditedCell.Text!=text)
+			{
+				if(this.DesignMode && m_EditedCell.Parent.Cells[0]==m_EditedCell)
+					TypeDescriptor.GetProperties(m_EditedCell.Parent)["Text"].SetValue(m_EditedCell.Parent, text);
+				else
+					TypeDescriptor.GetProperties(m_EditedCell)["Text"].SetValue(m_EditedCell, text);
+				this.BeginUpdate();
+				this.RecalcLayout();
+				this.EndUpdate();
+			}
+			
+			m_EditedCell.Parent.SetEditing(false);
+			m_EditedCell=null;
+			m_CellEditing=false;
+			return true;
+		}
+
+		/// <summary>
+		/// Cancels the cell editing if it is in progress.
+		/// </summary>
+		/// <param name="action">Specifies which action is cause for canceling of editing.</param>
+		internal void CancelCellEdit(eTreeAction action)
+		{
+			if(m_EditedCell==null)
+				return;
+
+			m_EditTextBox.Text=m_EditedCell.Text;
+			this.EndCellEditing(action);		
+		}
+
+		private TextBoxEx GetTextBox()
+		{
+			if(m_EditTextBox==null)
+			{
+				m_EditTextBox=new TextBoxEx();
+				m_EditTextBox.AutoSize=false;
+				this.Controls.Add(m_EditTextBox);
+				m_EditTextBox.EndEdit+= new EventHandler(EditTextBoxEndEdit);
+				m_EditTextBox.CancelEdit+=new EventHandler(EditTextBoxCancelEdit);
+			}
+			return m_EditTextBox;
+		}
+
+		private void EditTextBoxEndEdit(object sender, EventArgs e)
+		{
+			if(m_EditedCell==null)
+				return;
+
+			this.EndCellEditing(eTreeAction.Keyboard);	
+		}
+
+		private void EditTextBoxCancelEdit(object sender, EventArgs e)
+		{
+			CancelCellEdit(eTreeAction.Keyboard);
+		}
+
+		private void UpdateTreeCursor()
+		{
+			if(m_MouseOverCell!=null)
+			{
+				if(m_MouseOverCell.Cursor!=null && this.Cursor!=m_MouseOverCell.Cursor)
+				{
+					if(m_OriginalCursor==null)
+						m_OriginalCursor=this.Cursor;
+					this.Cursor=m_MouseOverCell.Cursor;
+				}
+				else if(m_DefaultCellCursor!=null && this.Cursor!=m_DefaultCellCursor)
+				{
+					if(m_OriginalCursor==null)
+						m_OriginalCursor=this.Cursor;
+					this.Cursor=m_DefaultCellCursor;
+				}
+			}
+			else if(m_OriginalCursor!=null)
+			{
+				this.Cursor=m_OriginalCursor;
+				m_OriginalCursor=null;
+			}
+		}
+
+		private Cell GetCellAt(Node node, int x, int y, Point offset)
+		{
+			Cell cellAt=null;
+			Rectangle r=NodeDisplay.GetNodeRectangle(eNodeRectanglePart.NodeBounds,node,offset);
+			foreach(Cell cell in node.Cells)
+			{
+				Rectangle rCell=cell.BoundsRelative;
+				rCell.Offset(r.Location);
+				if(rCell.Contains(x,y))
+				{
+					cellAt=cell;
+					break;
+				}
+			}
+			return cellAt;
+		}
+
+		private bool OnNodeMouseMove(Node node, MouseEventArgs e, Point offset)
+		{
+			Point mousePos = GetLayoutPosition(e);
+			
+			InvokeNodeMouseMove(new TreeGXNodeMouseEventArgs(node, e.Button, e.Clicks, e.Delta, mousePos.X, mousePos.Y));
+			
+			Rectangle r=NodeDisplay.GetNodeRectangle(eNodeRectanglePart.ExpandBounds,node,offset);
+			bool bUpdate=false;
+			if(r.Contains(mousePos))
+			{
+				node.MouseOverNodePart=eMouseOverNodePart.Expand;
+				if(m_MouseOverCell!=null)
+				{
+					bUpdate|=SetMouseOverCell(null);
+				}
+				bUpdate=true;
+			}
+
+			r=NodeDisplay.GetNodeRectangle(eNodeRectanglePart.CommandBounds,node,offset);
+			if(r.Contains(mousePos))
+			{
+				node.MouseOverNodePart=eMouseOverNodePart.Command;
+				if(m_MouseOverCell!=null)
+				{
+					bUpdate|=SetMouseOverCell(null);
+				}
+				bUpdate=true;
+			}
+			else
+			{
+				if(node.MouseOverNodePart!=eMouseOverNodePart.Node)
+				{
+					node.MouseOverNodePart=eMouseOverNodePart.Node;
+					bUpdate=true;
+				}
+				Cell cell=GetCellAt(node,mousePos.X,mousePos.Y,offset);
+                if (cell == null && node.Cells.Count == 1)
+                    cell = node.Cells[0];
+				if(cell!=null)
+				{
+					bUpdate|=SetMouseOverCell(cell);
+				}
+			}
+			
+			if(bUpdate)
+				InvalidateNode(node);
+			return bUpdate;
+		}
+//
+//		private class MouseOverInfo
+//		{
+//			public DevComponents.Tree.Node Node=null;
+//			public DevComponents.Tree.Cell Cell=null;
+//			MouseOverInfo()
+//			{
+//				this.Node=null;
+//				this.Cell=null;
+//			}
+//		}
+
+		private void OnSelectionBoxChanged()
+		{
+			if(this.SelectedNode!=null)
+			{
+				InvalidateNode(this.SelectedNode);
+				this.Update();
+			}
+		}
+
+		private Color GetDefaultSelectionBoxBorderColor()
+		{
+			return Color.FromArgb(96,SystemColors.Highlight);
+		}
+
+		private Color GetDefaultSelectionBoxFillColor()
+		{
+			return Color.FromArgb(64,SystemColors.Highlight);
+		}
+
+		private void OnCommandButtonChanged()
+		{
+			m_NodeLayout.CommandAreaWidth=m_CommandWidth;
+			this.RecalcLayout();
+		}
+
+		private void InvokeCellEditEnding(CellEditEventArgs e)
+		{
+			if(CellEditEnding!=null)
+				CellEditEnding(this,e);
+		}
+
+		private void InvokeAfterCellEdit(CellEditEventArgs e)
+		{
+			if(AfterCellEdit!=null)
+				AfterCellEdit(this,e);
+		}
+		
+		/// <summary>
+		/// Raises BeforeNodeInsert event
+		/// </summary>
+		/// <param name="node">Node that is about to be inserted</param>
+		/// <param name="action">Source of the event</param>
+		internal protected virtual void InvokeBeforeNodeInsert(eTreeAction action, Node node, Node parentNode)
+		{
+			if(BeforeNodeInsert!=null)
+			{
+				TreeGXNodeCollectionEventArgs e=new TreeGXNodeCollectionEventArgs(action, node, parentNode);
+				BeforeNodeInsert(this, e);
+			}
+		}
+		
+		/// <summary>
+		/// Raises AfterNodeInsert event
+		/// </summary>
+		/// <param name="node">Node that is inserted</param>
+		/// <param name="action">Source of the event</param>
+		internal protected virtual void InvokeAfterNodeInsert(eTreeAction action, Node node, Node parentNode)
+		{
+			if(AfterNodeInsert!=null)
+			{
+				TreeGXNodeCollectionEventArgs e=new TreeGXNodeCollectionEventArgs(action, node, parentNode);
+				AfterNodeInsert(this, e);
+			}
+		}
+		
+		/// <summary>
+		/// Raises BeforeNodeRemove event
+		/// </summary>
+		/// <param name="node">Node that is about to be removed</param>
+		/// <param name="action">Source of the event</param>
+		internal protected virtual void InvokeBeforeNodeRemove(eTreeAction action, Node node, Node parentNode)
+		{
+			if(BeforeNodeRemove!=null)
+			{
+				TreeGXNodeCollectionEventArgs e=new TreeGXNodeCollectionEventArgs(action, node, parentNode);
+				BeforeNodeRemove(this, e);
+			}
+		}
+		
+		/// <summary>
+		/// Raises AfterNodeRemove event
+		/// </summary>
+		/// <param name="node">Node that is removed</param>
+		/// <param name="action">Source of the event</param>
+		internal protected virtual void InvokeAfterNodeRemove(eTreeAction action, Node node, Node parentNode)
+		{
+			if(AfterNodeRemove!=null)
+			{
+				TreeGXNodeCollectionEventArgs e=new TreeGXNodeCollectionEventArgs(action, node, parentNode);
+				AfterNodeRemove(this, e);
+			}
+		}
+		
+		/// <summary>
+		/// Called after node has been removed
+		/// </summary>
+		/// <param name="node">Node that is removed</param>
+		/// <param name="action">Source of the event</param>
+        internal protected virtual void NodeRemoved(eTreeAction action, Node node, Node parentNode, int indexOfRemovedNode)
+		{
+            InvokeAfterNodeRemove(action, node, parentNode);
+
+            //if (m_NodeDisplay != null) m_NodeDisplay.PaintedNodes.Clear();
+
+            if (!this.IsDisposed)
+                RecalcLayout();
+
+            if (!this.IsUpdateSuspended)
+            {
+                bool updateSelection = false;
+                if (node.IsSelected)
+                    updateSelection = true;
+                else
+                {
+                    Node n = this.SelectedNode;
+                    while (n != null)
+                    {
+                        if (n != null && n == node)
+                        {
+                            updateSelection = true;
+                            break;
+                        }
+                        n = n.Parent;
+                    }
+                }
+
+                if (updateSelection)
+                {
+                    Node refNode = parentNode;
+                    bool selectFirst = true;
+                    if (parentNode != null)
+                    {
+                        if (parentNode.Nodes.Count > 0)
+                        {
+                            if (indexOfRemovedNode >= parentNode.Nodes.Count)
+                                indexOfRemovedNode = parentNode.Nodes.Count - 1;
+                            refNode = parentNode.Nodes[indexOfRemovedNode];
+                            if (refNode.CanSelect)
+                            {
+                                this.SelectNode(refNode, action);
+                                selectFirst = false;
+                                refNode = null;
+                            }
+                        }
+                        else
+                        {
+                            if (refNode.CanSelect)
+                            {
+                                this.SelectNode(refNode, action);
+                                selectFirst = false;
+                                refNode = null;
+                            }
+                        }
+
+                        if (refNode != null)
+                        {
+                            while (refNode != null)
+                            {
+                                refNode = NodeOperations.GetPreviousVisibleNode(refNode);
+                                if (refNode != null && refNode.CanSelect)
+                                {
+                                    this.SelectNode(refNode, action);
+                                    selectFirst = false;
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                    else
+                    {
+                        int startIndex = indexOfRemovedNode;
+                        if (this.Nodes.Count == indexOfRemovedNode) startIndex--;
+                        if (startIndex > 0 && this.Nodes.Count > startIndex)
+                        {
+                            for (int i = startIndex; i >= 0; i--)
+                            {
+                                refNode = this.Nodes[i];
+                                if (refNode.CanSelect && refNode.Visible && refNode.Enabled)
+                                {
+                                    this.SelectNode(refNode, action);
+                                    selectFirst = false;
+                                    break;
+                                }
+                            }
+                        }
+                    }
+
+                    if (selectFirst && !SelectFirstNode(action))
+                        this.SelectNode(null, action);
+                }
+                this.Invalidate();
+            }
+		}
+
+        private bool SelectFirstNode(eTreeAction action)
+        {
+            bool selected = false;
+            foreach (Node node in this.Nodes)
+            {
+                if (node.Selectable && node.Visible && node.Enabled)
+                {
+                    this.SelectNode(node, action);
+                    if (this.SelectedNode == node)
+                    {
+                        return true;
+                    }
+                }
+            }
+            return false;
+        }
+		
+		/// <summary>
+		/// Invokes BeforeNodeDrop event. If overriden base implementation must be called in order for event to fire.
+		/// </summary>
+		/// <param name="e">Provides information about event</param>
+		protected virtual void InvokeBeforeNodeDrop(TreeGXDragDropEventArgs e)
+		{
+			if(BeforeNodeDrop!=null)
+				BeforeNodeDrop(this, e);
+		}
+		
+		/// <summary>
+		/// Invokes AfterNodeDrop event. If overriden base implementation must be called in order for event to fire.
+		/// </summary>
+		/// <param name="e">Provides information about event</param>
+		protected virtual void InvokeAfterNodeDrop(TreeGXDragDropEventArgs e)
+		{
+			if(AfterNodeDrop!=null)
+				AfterNodeDrop(this, e);
+		}
+		
+		/// <summary>
+		/// Invokes NodeMouseDown event. If overriden base implementation must be called in order for event to fire.
+		/// </summary>
+		/// <param name="e">Provides information about event</param>
+		protected virtual void InvokeNodeMouseDown(TreeGXNodeMouseEventArgs e)
+		{
+			if(e.Node!=null)
+				e.Node.InvokeNodeMouseDown(this, new MouseEventArgs(e.Button, e.Clicks, e.X, e.Y, e.Delta));
+			
+			if(NodeMouseDown!=null)
+				NodeMouseDown(this, e);
+		}
+		
+		/// <summary>
+		/// Invokes NodeMouseUp event. If overriden base implementation must be called in order for event to fire.
+		/// </summary>
+		/// <param name="e">Provides information about event</param>
+		protected virtual void InvokeNodeMouseUp(TreeGXNodeMouseEventArgs e)
+		{
+			if(e.Node!=null)
+				e.Node.InvokeNodeMouseUp(this, new MouseEventArgs(e.Button, e.Clicks, e.X, e.Y, e.Delta));
+			
+			if(NodeMouseUp!=null)
+				NodeMouseUp(this, e);
+		}
+		
+		/// <summary>
+		/// Invokes NodeMouseMove event. If overriden base implementation must be called in order for event to fire.
+		/// </summary>
+		/// <param name="e">Provides information about event</param>
+		protected virtual void InvokeNodeMouseMove(TreeGXNodeMouseEventArgs e)
+		{
+			if(e.Node!=null)
+				e.Node.InvokeNodeMouseMove(this, new MouseEventArgs(e.Button, e.Clicks, e.X, e.Y, e.Delta));
+			
+			if(NodeMouseMove!=null)
+				NodeMouseMove(this, e);
+		}
+		
+		/// <summary>
+		/// Invokes NodeClick event. If overriden base implementation must be called in order for event to fire.
+		/// </summary>
+		/// <param name="e">Provides information about event</param>
+		protected virtual void InvokeNodeClick(TreeGXNodeMouseEventArgs e)
+		{
+			if(e.Node!=null)
+				e.Node.InvokeNodeClick(this, e);
+			
+			if(NodeClick!=null)
+				NodeClick(this, e);
+		}
+		
+		/// <summary>
+		/// Invokes NodeDoubleClick event. If overriden base implementation must be called in order for event to fire.
+		/// </summary>
+		/// <param name="e">Provides information about event</param>
+		protected virtual void InvokeNodeDoubleClick(TreeGXNodeMouseEventArgs e)
+		{
+			if(e.Node!=null)
+				e.Node.InvokeNodeDoubleClick(this, e);
+			
+			if(NodeDoubleClick!=null)
+				NodeDoubleClick(this, e);
+		}
+		
+		/// <summary>
+		/// Invokes NodeMouseEnter event.  If overriden base implementation must be called in order for event to fire.
+		/// </summary>
+		/// <param name="e">Provides information about event</param>
+		protected virtual void InvokeNodeMouseEnter(TreeGXNodeMouseEventArgs e)
+		{
+			if(e.Node!=null)
+				e.Node.InvokeNodeMouseEnter(this, e);
+			
+			if(NodeMouseEnter!=null)
+				NodeMouseEnter(this, e);
+		}
+		
+		/// <summary>
+		/// Invokes NodeMouseLeave event.  If overriden base implementation must be called in order for event to fire.
+		/// </summary>
+		/// <param name="e">Provides information about event</param>
+		protected virtual void InvokeNodeMouseLeave(TreeGXNodeMouseEventArgs e)
+		{
+			if(e.Node!=null)
+				e.Node.InvokeNodeMouseLeave(this, e);
+			
+			if(NodeMouseLeave!=null)
+				NodeMouseLeave(this, e);
+		}
+		
+		/// <summary>
+		/// Invokes NodeMouseHover event.  If overriden base implementation must be called in order for event to fire.
+		/// </summary>
+		/// <param name="e">Provides information about event</param>
+		protected virtual void InvokeNodeMouseHover(TreeGXNodeMouseEventArgs e)
+		{
+			if(e.Node!=null)
+				e.Node.InvokeNodeMouseHover(this, e);
+			
+			if(NodeMouseHover!=null)
+				NodeMouseHover(this, e);
+		}
+		
+		private bool FireHoverEvent
+		{
+			get { return NodeMouseHover!=null; }
+		}
+		#endregion
+
+		#region INodeNotify
+		void INodeNotify.ExpandedChanged(Node node)
+		{
+			ValidateSelectedNode();
+			if(!this.IsUpdateSuspended)
+			{
+				this.RecalcLayout();
+				this.Refresh();
+			}
+		}
+
+		#endregion
+
+		#region Public Interface
+		/// <summary>
+		/// Save nodes to XmlDocument. New Node TreeGX is created and nodes are serialized into it.
+		/// </summary>
+		/// <param name="document">Reference to an instance of XmlDocument object</param>
+		public void Save(XmlDocument document)
+		{
+			TreeSerializer.Save(this, document);
+		}
+		
+		/// <summary>
+		/// Saves nodes to a file.
+		/// </summary>
+		/// <param name="fileName">File name to save nodes to.</param>
+		public void Save(string fileName)
+		{
+			TreeSerializer.Save(this, fileName);
+		}
+		
+		/// <summary>
+		/// Saves nodes to specified stream.
+		/// </summary>
+		/// <param name="outStream">Stream to save nodes to.</param>
+		public void Save(Stream outStream)
+		{
+			TreeSerializer.Save(this, outStream);
+		}
+		
+		/// <summary>
+		/// Saves nodes to specified writer.
+		/// </summary>
+		/// <param name="writer">Writer to save nodes to.</param>
+		public void Save(TextWriter writer)
+		{
+			TreeSerializer.Save(this, writer);
+		}
+		
+		/// <summary>
+		/// Saves nodes to specified writer.
+		/// </summary>
+		/// <param name="writer">Writer to save nodes to.</param>
+		public void Save(XmlWriter writer)
+		{
+			TreeSerializer.Save(this, writer);
+		}
+		
+		/// <summary>
+		/// Load nodes from file.
+		/// </summary>
+		/// <param name="fileName">File to load nodes from</param>
+		public void Load(string fileName)
+		{
+			TreeSerializer.Load(this, fileName);
+		}
+		
+		/// <summary>
+		/// Load nodes from stream.
+		/// </summary>
+		/// <param name="inStream">Stream to load from</param>
+		public void Load(Stream inStream)
+		{
+			TreeSerializer.Load(this, inStream);
+		}
+		
+		/// <summary>
+		/// Load nodes from reader.
+		/// </summary>
+		/// <param name="reader">Reader to load from.</param>
+		public void Load(XmlReader reader)
+		{
+			TreeSerializer.Load(this, reader);
+		}
+		
+		/// <summary>
+		/// Load nodes from reader.
+		/// </summary>
+		/// <param name="reader">Reader to load from.</param>
+		public void Load(TextReader reader)
+		{
+			TreeSerializer.Load(this, reader);
+		}
+		
+		/// <summary>
+		/// Load nodes from an XmlDocument object.
+		/// </summary>
+		/// <param name="document">Document to load Nodes from.</param>
+		public void Load(XmlDocument document)
+		{
+			TreeSerializer.Load(this, document);
+		}
+		
+		/// <summary>
+		/// Forces the control to invalidate its client area and immediately redraw itself
+		/// and any child controls. Note however that this method will node do anything if refresh
+		/// is suspended as result of call to BeginUpdate method without corresponding EndUpdate
+		/// call or if SuspendPaint property is set to true.
+		/// </summary>
+		public override void Refresh()
+		{
+			if(!this.IsUpdateSuspended && !this.SuspendPaint)
+				base.Refresh();
+		}
+		
+		/// <summary>
+		/// Sets the node map position when tree is in Map layout mode. The node's position
+		/// can be set only for the sub-root nodes, i.e. nodes that are parented directly to
+		/// top-level root node. Setting map position for any other node does not have any effect.
+		/// </summary>
+		/// <remarks>
+		/// 	<para>Note that setting map position explicitly can change the position for other
+		///     nodes that are on the same level as the node that you pass into this method. Since
+		///     Map mode layouts the nodes clock-wise, setting the node position to Near will cause
+		///     all nodes that are in collection <strong>after</strong> the reference node to be
+		///     positioned Near as well.</para>
+		/// 	<para>Similarly, setting the node position to Far will cause all nodes that are in
+		///     collection <strong>before</strong> the reference node to be positioned Far as
+		///     well.</para>
+		/// </remarks>
+		/// <param name="node">Sub-root node to set layout position for.</param>
+		/// <param name="position">The position relative to the root node should take</param>
+		public void SetNodeMapPosition(Node node, eMapPosition position)
+		{
+			if(node==null || node.Parent==null)
+				return;
+            
+			if(position==eMapPosition.Default)
+			{
+				node.SetMapSubRootPosition(position);
+			}
+			else if(position==eMapPosition.Near)
+			{
+				int start=node.Parent.Nodes.IndexOf(node);
+				int end=node.Parent.Nodes.Count;
+				for(int i=start;i<end;i++)
+					node.Parent.Nodes[i].SetMapSubRootPosition(position);
+			}
+			else if(position==eMapPosition.Far)
+			{
+				int start=node.Parent.Nodes.IndexOf(node);
+				for(int i=start;i>=0;i--)
+					node.Parent.Nodes[i].SetMapSubRootPosition(position);
+			}
+		}
+
+		/// <summary>
+		/// Disables any redrawing of the tree control. To maintain performance while items
+		/// are added one at a time to the control, call the BeginUpdate method. The BeginUpdate
+		/// method prevents the control from painting until the
+		/// <see cref="EndUpdate">EndUpdate</see> method is called.
+		/// </summary>
+		public void BeginUpdate()
+		{
+			m_UpdateSuspended++;
+		}
+
+		/// <summary>
+		/// Enables the redrawing of the tree view. To maintain performance while items are
+		/// added one at a time to the control, call the <see cref="BeginUpdate">BeginUpdate</see>
+		/// method. The BeginUpdate method prevents the control from painting until the EndUpdate
+		/// method is called.
+		/// </summary>
+		/// <remarks>
+		/// Call to EndUpdate will enable the layout and painting in tree control. If there
+		/// are any pending layouts the EndUpdate will call
+		/// <see cref="RecalcLayout">RecalcLayout</see> method to perform the layout and it will
+		/// repaint the control.
+		/// </remarks>
+		public void EndUpdate()
+		{
+			EndUpdate(true);
+		}
+		
+		/// <summary>
+		/// Enables the redrawing of the tree view. To maintain performance while items are
+		/// added one at a time to the control, call the <see cref="BeginUpdate">BeginUpdate</see>
+		/// method. The BeginUpdate method prevents the control from painting until the EndUpdate
+		/// method is called.
+		/// </summary>
+		/// <param name="performLayoutAndRefresh">Gets or sets whether layout and refresh of control is performed if there are no other update blocks pending.</param>
+		public void EndUpdate(bool performLayoutAndRefresh)
+		{
+			if(m_UpdateSuspended>0) m_UpdateSuspended--;
+			if(m_UpdateSuspended==0 && performLayoutAndRefresh)
+			{
+				this.RecalcLayout();
+				this.Invalidate(true);
+			}
+		}
+
+		/// <summary>
+		/// Retrieves the tree node that is at the specified location.
+		/// </summary>
+		/// <returns>The Node at the specified point, in tree view coordinates.</returns>
+		/// <remarks>
+		/// 	<para>You can pass the MouseEventArgs.X and MouseEventArgs.Y coordinates of the
+		///     MouseDown event as the x and y parameters.</para>
+		/// </remarks>
+		/// <param name="p">The Point to evaluate and retrieve the node from.</param>
+		public Node GetNodeAt(Point p)
+		{
+			return GetNodeAt(p.X,p.Y);
+		}
+
+		/// <summary>
+		/// Retrieves the tree node that is at the specified location.
+		/// </summary>
+		/// <returns>The TreeNode at the specified location, in tree view coordinates.</returns>
+		/// <remarks>
+		/// 	<para>You can pass the MouseEventArgs.X and MouseEventArgs.Y coordinates of the
+		///     MouseDown event as the x and y parameters.</para>
+		/// </remarks>
+		/// <param name="x">The X position to evaluate and retrieve the node from.</param>
+		/// <param name="y">The Y position to evaluate and retrieve the node from.</param>
+		public Node GetNodeAt(int x, int y)
+		{
+			return NodeOperations.GetNodeAt(this, x, y);
+		}
+		
+		/// <summary>
+		/// Retrieves the node cell that is at the specified location.
+		/// </summary>
+		/// <param name="p">The Point to evaluate and retrieve the cell from.</param>
+		/// <returns>The Cell at the specified point, in tree view coordinates.</returns>
+		public Cell GetCellAt(Point p)
+		{
+			return GetCellAt(p.X, p.Y);
+		}
+		
+		/// <summary>
+		/// Retrieves the node cell that is at the specified location.
+		/// </summary>
+		/// <param name="x">The X position to evaluate and retrieve the cell from.</param>
+		/// <param name="y">The Y position to evaluate and retrieve the cell from.</param>
+		/// <returns>The Cell at the specified point, in tree view coordinates.</returns>
+		public Cell GetCellAt(int x, int y)
+		{
+			Node node = GetNodeAt(x, y);
+			if(node!=null)
+			{
+				return GetCellAt(node, x, y, m_NodeDisplay.Offset);
+			}
+			return null;
+		}
+
+		/// <summary>
+		/// Returns the reference to the node mouse is currently over or null (Nothing) if mouse is not over any node in tree.
+		/// </summary>
+		[Browsable(false)]
+		public Node MouseOverNode
+		{
+			get
+			{
+				return m_MouseOverNode;
+			}
+		}
+
+		/// <summary>
+		/// Specifies the mouse cursor displayed when mouse is over the cell. Default value
+		/// is null which means that default control cursor is used.
+		/// </summary>
+		/// <remarks>
+		/// To specify cursor for each individual cell use
+		/// <a href="TreeGX~DevComponents.Tree.Cell~Cursor.html">Cell.Cursor</a> property.
+		/// </remarks>
+		[Browsable(true),DefaultValue(null),Category("Appearance"),Description("Specifies the default mouse cursor displayed when mouse is over the cell.")]
+		public Cursor DefaultCellCursor
+		{
+			get
+			{
+				return m_DefaultCellCursor;
+			}
+			set
+			{
+				if(m_DefaultCellCursor!=value)
+				{
+					m_DefaultCellCursor=value;
+				}
+			}
+		}
+
+		/// <summary>Applies any layout changes to the tree control.</summary>
+		/// <remarks>
+		/// Layout will not be performed if BeginUpdate is called. Any calls to the
+		/// RecalcLayout will return without executing requested layout operation.
+		/// </remarks>
+		public void RecalcLayout()
+		{
+			if(this.IsUpdateSuspended)
+			{
+				m_PendingLayout=true;
+				return;
+			}
+			RecalcLayoutInternal();
+		}
+
+		/// <summary>
+		/// Gets reference to array of Cell objects that have HostedControl property set.
+		/// </summary>
+		internal ArrayList HostedControlCells
+		{
+			get { return m_HostedControlCells;}
+		}
+		
+		/// <summary>
+		/// This member overrides Control.WndProc.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Advanced)]
+		protected override void WndProc(ref Message m)
+		{
+			const int WM_HSCROLL        = 0x0114;
+			const int WM_VSCROLL = 0x115;
+			const int WM_MOUSEWHEEL = 0x020A;
+
+			base.WndProc(ref m);
+			
+			if(this.AutoScroll)
+			{
+				if (m.Msg==WM_HSCROLL || m.Msg==WM_VSCROLL || m.Msg==WM_MOUSEWHEEL)
+				{
+					this.ActiveControl = null; // Must set to null otherwise scrolling will get reset if active control goes out of view
+					RepositionHostedControls(false);
+					this.Invalidate();
+				}
+			}
+		}
+		
+		/// <summary>
+		/// Recalculates layout for the tree control. Not afffected by BeginUpdate call.
+		/// </summary>
+		internal void RecalcLayoutInternal()
+		{
+            Rectangle clientArea = this.ClientRectangle;
+            clientArea.Inflate(-this.SelectionBoxSize, -this.SelectionBoxSize);
+            m_NodeLayout.ClientArea = clientArea;
+			m_NodeLayout.LeftRight=this.RtlTranslateLeftRight(LeftRightAlignment.Left);
+			m_NodeLayout.PerformLayout();
+			m_PendingLayout=false;
+			
+			float zoom = m_ZoomFactor;
+			Rectangle screenRect=GetScreenRectangle(new Rectangle(0,0,m_NodeLayout.Width,m_NodeLayout.Height));
+			Size nodeLayoutSize=screenRect.Size;
+			if(nodeLayoutSize.Width>this.Bounds.Width || nodeLayoutSize.Height>this.Bounds.Height)
+			{
+				Size autoScrollMinSize =nodeLayoutSize;
+                autoScrollMinSize.Width += this.SelectionBoxSize * 2;
+                autoScrollMinSize.Height += this.SelectionBoxSize * 2;
+				if(!this.AutoScroll)
+				{
+					this.BeginUpdate();
+					this.Invalidate();
+					this.AutoScroll=true;
+					this.AutoScrollMinSize = autoScrollMinSize;
+					this.AutoScrollPosition=m_NodeDisplay.DefaultOffset;
+					this.EndUpdate(false);
+				}
+				else if(this.AutoScrollMinSize!=nodeLayoutSize)
+				{
+					this.BeginUpdate();
+					this.AutoScrollMinSize = autoScrollMinSize;
+					this.EndUpdate(false);
+				}
+			}
+			else if(this.AutoScroll)
+			{
+				this.BeginUpdate();
+				this.AutoScroll=false;
+				m_NodeDisplay.Offset=m_NodeDisplay.DefaultOffset;
+				this.EndUpdate(false);
+			}
+			else
+				m_NodeDisplay.Offset=m_NodeDisplay.DefaultOffset;
+			
+			RepositionHostedControls(true);
+			this.Invalidate(true);
+		}
+		
+		private void RepositionHostedControls(bool performLayout)
+		{
+			if(m_HostedControlCells.Count>0)
+			{
+				this.SuspendLayout();
+				if(this.AutoScroll)
+                    m_NodeDisplay.Offset = GetAutoScrollPositionOffset();
+				m_NodeDisplay.MoveHostedControls();
+				this.ResumeLayout(performLayout);
+			}
+		}
+		
+		private System.Drawing.Drawing2D.Matrix GetTranslationMatrix(float zoom)
+		{
+			System.Drawing.Drawing2D.Matrix mx = new System.Drawing.Drawing2D.Matrix(zoom, 0, 0, zoom, 0, 0);
+			if(this.CenterContent)
+			{
+				float offsetX = 0, offsetY = 0;
+				if(this.AutoScroll)
+				{
+					if(this.Width>this.NodeLayout.Width)
+					{
+						if(this.Width<this.NodeLayout.Width*zoom)
+							offsetX = - (this.Width - this.NodeLayout.Width)/2;
+						else
+							offsetX = (this.Width*(1.0f/zoom) - this.Width)/2;
+					}
+					
+					if(this.Height>this.NodeLayout.Height)
+					{
+						if(this.Height<this.NodeLayout.Height*zoom)
+							offsetY = - (this.Height - this.NodeLayout.Height)/2;
+						else
+							offsetY = (this.Height*(1.0f/zoom) - this.Height)/2;
+					}
+				}
+				else
+				{
+					offsetX = (this.Width*(1.0f/zoom) - this.Width)/2;
+					offsetY = (this.Height*(1.0f/zoom) - this.Height)/2;
+				}
+					
+				mx.Translate(offsetX, offsetY);
+			}
+			return mx;
+		}
+		
+		/// <summary>
+		/// Returns translation matrix for current Zoom. Translation matrix is used to translate internal node coordinates to screen
+		/// coordinates when Zoom is not set to 1.
+		/// </summary>
+		/// <returns>Returns new instance of Matrix object.</returns>
+		public System.Drawing.Drawing2D.Matrix GetTranslationMatrix()
+		{
+			return GetTranslationMatrix(m_ZoomFactor);
+		}
+		
+		/// <summary>
+		/// Returns layout based rectangle from screen rectangle. Layout based rectangle will be different
+		/// from screen rectangle when Zoom is not set to 1. This method will translate the screen rectangle enlarged by Zoom
+		/// to layout rectangle which does not have Zoom applied.
+		/// </summary>
+		/// <param name="r">Screen rectangle</param>
+		/// <returns>Layout rectangle</returns>
+		public virtual Rectangle GetLayoutRectangle(Rectangle r)
+		{
+			if(m_ZoomFactor==1)
+				return r;
+			
+			Point[] p=new Point[] {new Point(r.X, r.Y), new Point(r.Right, r.Bottom)};
+			using(System.Drawing.Drawing2D.Matrix mx = GetTranslationMatrix())
+			{
+				mx.Invert();
+				mx.TransformPoints(p);
+			}
+			return new Rectangle(p[0].X, p[0].Y, p[1].X-p[0].X, p[1].Y-p[0].Y);
+		}
+		
+		/// <summary>
+		/// Returns mouse position which is translated if control Zoom is not equal 1
+		/// </summary>
+		/// <param name="e">Mouse event arguments</param>
+		/// <returns>Returns translated position</returns>
+		protected virtual Point GetLayoutPosition(MouseEventArgs e)
+		{
+			return GetLayoutPosition(e.X, e.Y);
+		}
+		
+		/// <summary>
+		/// Returns mouse position which is translated if control Zoom is not equal 1
+		/// </summary>
+		/// <param name="mousePosition">Mouse position</param>
+		/// <returns>Returns translated position</returns>
+		public virtual Point GetLayoutPosition(Point mousePosition)
+		{
+			return GetLayoutPosition(mousePosition.X, mousePosition.Y);
+		}
+		
+		/// <summary>
+		/// Returns mouse position which is translated if control Zoom is not equal 1
+		/// </summary>
+		/// <param name="x">X coordinate</param>
+		/// <param name="y">Y coordinate</param>
+		/// <returns></returns>
+		public virtual Point GetLayoutPosition(int x, int y)
+		{
+			if(m_ZoomFactor==1)
+				return new Point(x, y);
+			Point[] p=new Point[] {new Point(x, y)};
+			using(System.Drawing.Drawing2D.Matrix mx = GetTranslationMatrix())
+			{
+				mx.Invert();
+				mx.TransformPoints(p);
+			}
+			return p[0];
+		}
+		
+		/// <summary>
+		/// Returns rectangle translated to screen rectangle if Zoom is not equal 1.
+		/// </summary>
+		/// <param name="r">Rectangle to translate</param>
+		/// <returns>Screen Rectangle</returns>
+		public virtual Rectangle GetScreenRectangle(Rectangle r)
+		{
+			if(m_ZoomFactor==1)
+				return r;
+			Point[] p=new Point[] {new Point(r.X, r.Y), new Point(r.Right, r.Bottom)};
+			using(System.Drawing.Drawing2D.Matrix mx = GetTranslationMatrix())
+			{
+				mx.TransformPoints(p);
+			}
+			return new Rectangle(p[0].X, p[0].Y, p[1].X-p[0].X, p[1].Y-p[0].Y);
+		}
+		
+		/// <summary>
+		/// Returns size translated to screen dimension if Zoom is not equal 1.
+		/// </summary>
+		/// <param name="s">Size to translate</param>
+		/// <returns>Screen Size</returns>
+		public virtual Size GetScreenSize(Size s)
+		{
+			return GetScreenRectangle(new Rectangle(Point.Empty, s)).Size;
+		}
+		
+		#endregion
+
+		#region Event Invocation
+		/// <summary>
+		/// Calls <see cref="OnAfterCheck">OnAfterCheck</see> method which fired
+		/// <see cref="AfterCheck">AfterCheck</see> event.
+		/// </summary>
+		/// <param name="e">Event arguments.</param>
+		internal void InvokeAfterCheck(TreeGXCellEventArgs e)
+		{
+			OnAfterCheck(e);
+		}
+
+		/// <summary>Raises the <see cref="AfterCheck">AfterCheck</see> event.</summary>
+		/// <param name="e">
+		/// A <see cref="TreeGXCellEventArgs">TreeGXEventArgs</see> that contains the event
+		/// data.
+		/// </param>
+		protected virtual void OnAfterCheck(TreeGXCellEventArgs e)
+		{
+			if(AfterCheck!=null)
+				AfterCheck(this,e);
+		}
+
+		/// <summary>
+		/// Invokes CommandButtonClick event.
+		/// </summary>
+		/// <param name="node">Context node.</param>
+		/// <param name="e">Event arguments.</param>
+		internal void InvokeCommandButtonClick(Node node, CommandButtonEventArgs e)
+		{
+			if(CommandButtonClick!=null)
+				CommandButtonClick(node,e);
+		}
+		
+		protected virtual void OnBeforeCellEdit(CellEditEventArgs e)
+		{
+			if(BeforeCellEdit!=null)
+				BeforeCellEdit(this, e);
+		}
+		
+		void INodeNotify.OnBeforeCollapse(TreeGXNodeCancelEventArgs e)
+		{
+			if(BeforeCollapse!=null)
+				BeforeCollapse(this, e);
+		}
+		
+		void INodeNotify.OnAfterCollapse(TreeGXNodeEventArgs e)
+		{
+			if(AfterCollapse!=null)
+				AfterCollapse(this, e);
+		}
+		
+		void INodeNotify.OnBeforeExpand(TreeGXNodeCancelEventArgs e)
+		{
+			if(BeforeExpand!=null)
+				BeforeExpand(this, e);
+		}
+		
+		void INodeNotify.OnAfterExpand(TreeGXNodeEventArgs e)
+		{
+			if(AfterExpand!=null)
+				AfterExpand(this, e);
+		}
+		
+		protected virtual void OnAfterNodeSelect(TreeGXNodeEventArgs args)
+		{
+			if(AfterNodeSelect!=null)
+				AfterNodeSelect(this, args);
+		}
+
+		protected virtual void OnBeforeNodeSelect(TreeGXNodeCancelEventArgs args)
+		{
+			if(BeforeNodeSelect!=null)
+				BeforeNodeSelect(this,args);
+		}
+		
+		/// <summary>
+		/// Invokes DeserializeNode event.
+		/// </summary>
+		/// <param name="e">Provides more information about the event</param>
+		protected virtual void OnDeserializeNode(SerializeNodeEventArgs e)
+		{
+			if(DeserializeNode!=null)
+				DeserializeNode(this, e);
+		}
+		
+		/// <summary>
+		/// Invokes SerializeNode event.
+		/// </summary>
+		/// <param name="e">Provides more information about the event</param>
+		protected virtual void OnSerializeNode(SerializeNodeEventArgs e)
+		{
+			if(SerializeNode!=null)
+				SerializeNode(this, e);
+		}
+		
+		internal void InvokeSerializeNode(SerializeNodeEventArgs e)
+		{
+			OnSerializeNode(e);
+		}
+		
+		internal void InvokeDeserializeNode(SerializeNodeEventArgs e)
+		{
+			OnDeserializeNode(e);
+		}
+		
+		internal bool HasSerializeNodeHandlers
+		{
+			get { return (SerializeNode != null);}
+		}
+		
+		internal bool HasDeserializeNodeHandlers
+		{
+			get { return (DeserializeNode != null);}
+		}
+		
+		internal void InvokeMarkupLinkClick(object sender, MarkupLinkClickEventArgs e)
+		{
+			OnMarkupLinkClick(sender, e);
+			m_CellMouseDownCounter = 0;
+		}
+		
+		/// <summary>
+		/// Invokes the MarkupLinkClick evcent.
+		/// </summary>
+		/// <param name="sender">Sender of the event, usually instance Cell object.</param>
+		/// <param name="e">Event arguments</param>
+		protected virtual void OnMarkupLinkClick(object sender, MarkupLinkClickEventArgs e)
+		{
+			if(MarkupLinkClick!=null)
+				MarkupLinkClick(sender, e);
+		}
+		#endregion
+		
+		#region Drag & Drop Support
+		[DllImport("user32.dll", SetLastError=true)] 
+		[return:MarshalAs(UnmanagedType.Bool)] 
+		private static extern bool SetCursorPos(int X, int Y); 
+
+		protected override void OnDragDrop(DragEventArgs drgevent)
+		{
+			base.OnDragDrop (drgevent);
+			InternalDragDrop(drgevent);
+		}
+
+		internal void InternalDragDrop(DragEventArgs drgevent)
+		{
+			ReleaseDragNode(true);
+		}
+
+		protected override void OnDragLeave(EventArgs e)
+		{
+			base.OnDragLeave (e);
+			InternalDragLeave();
+		}
+
+		internal void InternalDragLeave()
+		{
+			ReleaseDragNode(false);
+		}
+
+		protected override void OnDragOver(DragEventArgs drgevent)
+		{
+			base.OnDragOver (drgevent);
+			InternalDragOver(drgevent);
+		}
+
+		/// <summary>
+		/// Processes drag over event.
+		/// </summary>
+		/// <param name="drgevent">Drag event arguments.</param>
+		internal void InternalDragOver(DragEventArgs drgevent)
+		{
+			if(!m_DragDropEnabled)
+				return;
+
+			if(m_DragNode==null)
+				CreateDragNode(drgevent);
+
+			if(m_DragNode==null)
+			{
+				drgevent.Effect=DragDropEffects.None;
+				return;
+			}
+
+			drgevent.Effect=DragDropEffects.Move;
+			InvalidateNode(m_DragNode);
+			Point p=this.PointToClient(new Point(drgevent.X,drgevent.Y));
+			p=GetLayoutPosition(p);
+			TreeAreaInfo areaInfo = NodeOperations.GetTreeAreaInfo(this, p.X, p.Y);
+			Point insideNodeOffset=Point.Empty;
+			Node offsetNode=null;
+			bool recalcLayout=false;
+
+            //if (areaInfo == null)
+            //    Console.WriteLine("{0} Area info null   Point:{1}", DateTime.Now, p);
+            //else if (areaInfo.NodeAt != null)
+            //    Console.WriteLine("{0} Area found node at: {1}   Point:{2}", DateTime.Now, areaInfo.NodeAt, p);
+            //else
+            //    Console.WriteLine("{0} Area found NO NODE AT: {1}    Point:{2}", DateTime.Now, areaInfo.NodeAt, p);
+
+			if(areaInfo!=null && areaInfo.PreviousNode!=m_DragNode && areaInfo.NextNode!=m_DragNode &&
+			   (areaInfo.NodeAt!=m_DragNode || m_DragNode.Parent==null))
+			{
+				if(areaInfo.NodeAt!=null && areaInfo.NodeAt!=m_DragNode.Tag && areaInfo.NodeAt!=m_DragNode)
+				{
+					if(areaInfo.NodeAt!=m_DragNode.Parent)
+					{
+						Rectangle r=NodeDisplay.GetNodeRectangle(eNodeRectanglePart.NodeBounds,areaInfo.NodeAt,m_NodeDisplay.Offset);
+						insideNodeOffset=new Point(p.X-r.X,p.Y-r.Y);
+
+						recalcLayout=true;
+						m_DragNode.Remove(eTreeAction.Mouse);
+						areaInfo.NodeAt.Nodes.Add(m_DragNode, eTreeAction.Mouse);
+
+						offsetNode = areaInfo.NodeAt;
+					}
+				}
+				else if(areaInfo.PreviousNode!=null && areaInfo.NextNode!=null)
+				{
+					if(m_DragNode.Parent==null || !(m_DragNode.Parent==areaInfo.ParentAreaNode && areaInfo.ParentAreaNode.Nodes.IndexOf(areaInfo.NextNode)==areaInfo.ParentAreaNode.Nodes.IndexOf(m_DragNode)))
+					{						
+						Rectangle r=NodeDisplay.GetNodeRectangle(eNodeRectanglePart.NodeBounds,m_DragNode,m_NodeDisplay.Offset);
+						
+						recalcLayout=true;
+						m_DragNode.Remove(eTreeAction.Mouse);
+						areaInfo.ParentAreaNode.Nodes.Insert(areaInfo.ParentAreaNode.Nodes.IndexOf(areaInfo.NextNode), m_DragNode, eTreeAction.Mouse);
+
+						insideNodeOffset=new Point(m_DragNode.BoundsRelative.Width/2,m_DragNode.BoundsRelative.Height/2);
+						offsetNode=m_DragNode;
+					}
+				}
+				else
+				{
+					if(m_DragNode.Parent!=null)
+					{
+						//System.Diagnostics.Trace.WriteLine("Floating");
+						Rectangle r=NodeDisplay.GetNodeRectangle(eNodeRectanglePart.NodeBounds,m_DragNode.Parent,m_NodeDisplay.Offset);
+						insideNodeOffset=new Point(p.X-r.X,p.Y-r.Y);
+						offsetNode=m_DragNode.Parent;
+						recalcLayout=true;
+						m_DragNode.Remove(eTreeAction.Mouse);
+						m_DragNode.internalTreeControl=this;
+					}
+					if(m_NodeDisplay.LockOffset)
+					{
+						m_NodeDisplay.LockOffset=false;
+						recalcLayout=true;
+					}
+					m_DragNode.SetBounds(new Rectangle(p.X,p.Y,m_DragNode.BoundsRelative.Width,m_DragNode.BoundsRelative.Height));
+				}
+				m_DragNode.Visible=true;
+				if(recalcLayout)
+				{
+					this.RecalcLayout();
+					if(!insideNodeOffset.IsEmpty)
+					{
+						if(offsetNode!=null)
+						{
+							offsetNode.EnsureVisible();
+							this.Refresh();
+
+							Rectangle r=GetScreenRectangle(NodeDisplay.GetNodeRectangle(eNodeRectanglePart.NodeBounds,offsetNode,m_NodeDisplay.Offset));
+							Point screenPos=r.Location;
+							screenPos.Offset((int)(insideNodeOffset.X*m_ZoomFactor), (int)(insideNodeOffset.Y*m_ZoomFactor));
+							screenPos=this.PointToScreen(screenPos);
+							SetCursorPos(screenPos.X,screenPos.Y);
+						}
+					}
+					this.Refresh();
+				}
+				else
+				{
+					InvalidateNode(m_DragNode);
+					if(this.DesignMode)
+						this.Refresh();
+					else
+						this.Update();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets whether drag and drop operation is in progress. This member supports
+		/// the TreeGX infrastructure and is not intended to be used directly from your
+		/// code.
+		/// </summary>
+		[Browsable(false)]
+		public bool IsDragDropInProgress
+		{
+			get {return (m_DragNode!=null);}
+		}
+
+		private void ReleaseDragNode(bool drop)
+		{
+			if(m_DragNode==null)
+				return;
+			this.BeginUpdate();
+			try
+			{
+				if(m_NodeDisplay.LockOffset)
+					m_NodeDisplay.LockOffset=false;
+				Node node=m_DragNode.Tag as Node;
+				node.Visible = true;
+				if(m_DragNode.Parent!=null)
+				{
+					int index=m_DragNode.Parent.Nodes.IndexOf(m_DragNode);
+					if(drop)
+					{
+						Node parent=m_DragNode.Parent;
+						m_DragNode.Remove(eTreeAction.Mouse);
+						
+						// Fire off events and cancel processing if needed
+						TreeGXDragDropEventArgs e=new TreeGXDragDropEventArgs(eTreeAction.Mouse, node, node.Parent,  parent);
+						InvokeBeforeNodeDrop(e);
+						if(!e.Cancel)
+						{
+                            bool isCopy = e.IsCopy;
+							bool recursive=false;
+                            Node test = parent;
+                            if (!isCopy && test != null)
+                            {
+                                do
+                                {
+                                    if (test.Parent == node)
+                                    {
+                                        recursive = true;
+                                        break;
+                                    }
+                                    test = test.Parent;
+                                } while (test != null && test.Parent != null);
+                            }
+
+							if(recursive)
+							{
+								Node rp=node.Parent;
+								int rpi=0;
+								if(node.Parent!=null)
+									rpi=node.Parent.Nodes.IndexOf(node);
+								else
+									rpi=this.Nodes.IndexOf(node);
+
+								Node[] na=new Node[node.Nodes.Count];
+								node.Nodes.CopyTo(na);
+								foreach(Node childNode in na)
+								{
+									if(rp==null)
+									{
+										childNode.Remove(eTreeAction.Mouse);
+										this.Nodes.Insert(rpi,childNode, eTreeAction.Mouse);
+										break;
+									}
+									childNode.Remove(eTreeAction.Mouse);
+									rp.Nodes.Insert(rpi,childNode, eTreeAction.Mouse);
+									rpi++;
+								}
+							}
+                            if (isCopy)
+                            {
+                                node = node.DeepCopy();
+                            }
+                            else
+    							node.Remove(eTreeAction.Mouse);
+							node.SizeChanged = true;
+							if(parent!=null && index>parent.Nodes.Count)
+								index=parent.Nodes.Count;
+							if(parent!=null)
+								parent.Nodes.Insert(index,node, eTreeAction.Mouse);
+							else
+								this.Nodes.Insert(index,node, eTreeAction.Mouse);
+							node.EnsureVisible();
+							
+							InvokeAfterNodeDrop(e);
+						}
+					}
+					else
+						m_DragNode.Remove(eTreeAction.Mouse);
+				}
+			}
+			finally
+			{
+				m_DragNode=null;
+				if(!m_PendingLayout)
+				{
+					this.EndUpdate();
+					this.RecalcLayout();
+					this.Refresh();
+				}
+				else
+					this.EndUpdate();
+			}
+		}
+
+		private void CreateDragNode(DragEventArgs e)
+		{
+            if (e.Data != null)
+            {
+                Node node = null;
+                if (e.Data.GetDataPresent(typeof(Node)))
+                    node = e.Data.GetData(typeof(Node)) as Node;
+                else if (e.Data.GetFormats().Length > 0)
+                    node = e.Data.GetData(e.Data.GetFormats()[0]) as Node;
+                if (node != null)
+                    CreateDragNode(node);
+            }
+		}
+
+		private void CreateDragNode(Node node)
+		{
+			m_DragNode=node.Copy();
+			m_DragNode.Tag=node;
+			PrepareDragNodeElementStyle(m_DragNode, node);
+			m_DragNode.Visible=false;
+			m_NodeLayout.PerformSingleNodeLayout(m_DragNode);
+			node.Visible = false;
+			this.RecalcLayout();
+			this.Refresh();
+		}
+
+		private void PrepareDragNodeElementStyle(Node dragNode, Node originalNode)
+		{
+			// Setup half transparent styles
+			int alpha=128;
+			ElementStyle style=null;
+			if(originalNode.Style!=null)
+				style=originalNode.Style.Copy();
+			else if(this.NodeStyle!=null)
+				style=this.NodeStyle.Copy();
+			else
+			{
+				style=new ElementStyle();
+				style.TextColorSchemePart=eColorSchemePart.ItemText;	
+			}
+			ElementStyle.SetColorsAlpha(style,alpha);
+			dragNode.Style=style;
+
+			if(this.CellStyleDefault!=null)
+				style=this.CellStyleDefault.Copy();
+			else
+				style=ElementStyle.GetDefaultCellStyle(dragNode.Style);
+			ElementStyle.SetColorsAlpha(style,alpha);
+			foreach(Cell cell in dragNode.Cells)
+			{
+				cell.StyleNormal=style;
+			}
+
+			for(int i=0;i<dragNode.Cells.Count;i++)
+			{
+				if(originalNode.Cells[i].StyleNormal!=null)
+				{
+					ElementStyle cellStyle=originalNode.Cells[i].StyleNormal.Copy();
+					ElementStyle.SetColorsAlpha(style,alpha);
+					dragNode.Cells[i].StyleNormal=cellStyle;
+				}
+				else
+					dragNode.Cells[i].StyleNormal=style;
+			}
+		}
+
+		private bool StartDragDrop()
+		{
+			if(m_MouseOverNode==null)
+				return false;
+			
+			return StartDragDrop(m_MouseOverNode);
+		}
+
+		internal bool StartDragDrop(Node node)
+		{
+			if(IsDragDropInProgress)
+				return false;
+			
+			this.EndCellEditing(eTreeAction.Mouse);
+
+			if(node.IsMouseDown)
+				OnNodeMouseUp(new MouseEventArgs(Control.MouseButtons,0,0,0,0));
+
+			if(node == m_DisplayRootNode /*|| node.Parent==null*/) // Drag & drop in designer means that parent is null
+				return false;
+
+			Point m_MouseDownPoint=Control.MousePosition;
+
+			if(this.DesignMode)
+				CreateDragNode(node);
+			else
+				this.DoDragDrop(node,DragDropEffects.All);
+
+			return true;
+		}
+		
+		/// <summary>
+		/// Returns the display root node.
+		/// </summary>
+		/// <returns>Instance of node or null if there is no display root node.</returns>
+		internal Node GetDisplayRootNode()
+		{
+			if(m_DisplayRootNode!=null)
+				return m_DisplayRootNode;
+			if(this.Nodes.Count>0)
+				return this.Nodes[0];
+			return null;
+		}
+
+		/// <summary>
+		/// Returns reference to the node involved in drag-drop operation if any.
+		/// </summary>
+		/// <returns>Reference to node object or null if there is no drag node.</returns>
+		internal Node GetDragNode()
+		{
+			return m_DragNode;
+		}
+		#endregion
+
+		#region ISupportInitialize
+		/// <summary>
+		/// This member supports the .NET Framework infrastructure and is not intended to be
+		/// used directly from your code.
+		/// </summary>
+		public void BeginInit()
+		{
+			this.BeginUpdate();
+		}
+
+		/// <summary>
+		/// This member supports the .NET Framework infrastructure and is not intended to be
+		/// used directly from your code.
+		/// </summary>
+		public void EndInit()
+		{
+			this.EndUpdate();
+		}
+		#endregion
+		
+		#region Licensing
+#if !TRIAL
+		private string m_LicenseKey="";
+		private bool m_DialogDisplayed=false;
+		[Browsable(false), DefaultValue("")]
+		public string LicenseKey
+		{
+			get {return m_LicenseKey;}
+			set
+			{
+				if(NodeOperations.ValidateLicenseKey(value))
+					return;
+				m_LicenseKey = (!NodeOperations.CheckLicenseKey(value) ? "9dsjkhds7" : value);
+			}
+		}
+#endif
+		#endregion
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/TreeGX.csproj b/PROMS/DotNetBar Source Code/TreeGX/TreeGX.csproj
new file mode 100644
index 00000000..25871913
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/TreeGX.csproj	
@@ -0,0 +1,559 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{F6575883-1BDD-40BB-BEEC-6B0154C5C85E}</ProjectGuid>
+    <SccProjectName>
+    </SccProjectName>
+    <SccLocalPath>
+    </SccLocalPath>
+    <SccAuxPath>
+    </SccAuxPath>
+    <SccProvider>
+    </SccProvider>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon>
+    </ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>DevComponents.TreeGX</AssemblyName>
+    <AssemblyOriginatorKeyFile>TreeGX.snk</AssemblyOriginatorKeyFile>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Library</OutputType>
+    <RootNamespace>DevComponents.Tree</RootNamespace>
+    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
+    <StartupObject>
+    </StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <SignAssembly>false</SignAssembly>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <OldToolsVersion>2.0</OldToolsVersion>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>bin\Debug\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DEBUG;TREEGX;FRAMEWORK20</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>true</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>
+    </NoWarn>
+    <Optimize>false</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>full</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>bin\Release\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;TREEGX;FRAMEWORK20</DefineConstants>
+    <DocumentationFile>DevComponents.TreeGX.xml</DocumentationFile>
+    <DebugSymbols>false</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>
+    </NoWarn>
+    <Optimize>true</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>none</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseTrial|AnyCPU' ">
+    <OutputPath>bin\Release\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;TREEGX;TRIAL;FRAMEWORK20</DefineConstants>
+    <DocumentationFile>DevComponents.TreeGX.xml</DocumentationFile>
+    <DebugSymbols>false</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>
+    </NoWarn>
+    <Optimize>true</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>none</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System">
+      <Name>System</Name>
+    </Reference>
+    <Reference Include="System.Data">
+      <Name>System.Data</Name>
+    </Reference>
+    <Reference Include="System.Design">
+      <Name>System.Design</Name>
+    </Reference>
+    <Reference Include="System.Drawing">
+      <Name>System.Drawing</Name>
+    </Reference>
+    <Reference Include="System.Drawing.Design">
+      <Name>System.Drawing.Design</Name>
+    </Reference>
+    <Reference Include="System.Windows.Forms">
+      <Name>System.Windows.Forms</Name>
+    </Reference>
+    <Reference Include="System.Xml">
+      <Name>System.XML</Name>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Cell.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="CellCollection.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="CellEditEventArgs.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="CellImages.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ColorFunctions.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ColorPicker.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="ColorScheme.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ColorTypeEditor.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ColumnHeader.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="ColumnHeaderCollection.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ColumnWidth.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="CommandButtonEventArgs.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ConnectorPointsCollection.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ContentManager\BlockLayoutManager.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ContentManager\Enums.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ContentManager\IBlock.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ContentManager\IBlockExtended.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ContentManager\IContentLayoutManager.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ContentManager\SerialContentLayoutManager.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Design\ColorSchemeColorConverter.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Design\ComponentNotLicensed.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Design\ElementStyleTypeEditor.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Design\NodeConnectorTypeEditor.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Design\NodeContextMenuTypeEditor.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Design\NodeDesigner.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Design\TreeGXDesigner.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="DisplayHelp.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Display\CellDisplay.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Display\ConnectorRendererEventArgs.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Display\CurveConnectorDisplay.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Display\LineConnectorDisplay.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Display\NodeCellRendererEventArgs.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Display\NodeCommandDisplay.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Display\NodeCommandPartRendererEventArgs.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Display\NodeConnectorDisplay.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Display\NodeDisplay.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Display\NodeExpandDisplay.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Display\NodeExpandEllipseDisplay.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Display\NodeExpandImageDisplay.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Display\NodeExpandPartRendererEventArgs.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Display\NodeExpandRectDisplay.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Display\NodeProfessionalColorTable.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Display\NodeProfessionalRenderer.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Display\NodeRenderer.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Display\NodeRendererEventArgs.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Display\NodeSelectionDisplay.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Display\NodeSystemRenderer.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Display\NodeTreeDisplay.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Display\SelectionRendererEventArgs.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Display\TreeBackgroundRendererEventArgs.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Dpi.cs" />
+    <Compile Include="ElementSerializer.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ElementStyle.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ElementStyleCollection.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ElementStyleDisplay.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ElementStyleLayout.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ElementStyle\BackgroundColorBlend.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ElementStyle\BackgroundColorBlendCollection.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ElementStyle\BackgroundColorBlendConverter.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ElementStyle\IElementStyleClassProvider.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Enums.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="EventDelegates.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Events\MarkupLinkClickEventArgs.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Events\SerializeNodeEventArgs.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="HeaderDefinition.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="HeadersCollection.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Helpers\SystemHelpers.cs" />
+    <Compile Include="ImageIndexEditor.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="INodeNotify.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Interop\WinApi.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="KeyNavigation.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Layout\ColumnHeaderLayout.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Layout\NodeCellLayout.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Layout\NodeDiagramLayout.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Layout\NodeLayout.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Layout\NodeLayoutContextInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Layout\NodeListLayout.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Layout\NodeMapLayout.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Layout\NodeTreeLayout.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="LinkedNode.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="LinkedNodesCollection.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Node.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="NodeCollection.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="NodeConnector.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="NodeOperations.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="NodeStyles.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Padding.cs" />
+    <Compile Include="TextBoxEx.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="TextDrawing.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="TextMarkup\BodyElement.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="TextMarkup\ContainerElement.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="TextMarkup\Div.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="TextMarkup\EndMarkupElement.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="TextMarkup\ExpandElement.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="TextMarkup\FontChangeElement.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="TextMarkup\FontElement.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="TextMarkup\Heading.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="TextMarkup\HyperLink.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="TextMarkup\IActiveMarkupElement.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="TextMarkup\ImageElement.cs" />
+    <Compile Include="TextMarkup\Italic.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="TextMarkup\MarkupDrawContext.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="TextMarkup\MarkupElement.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="TextMarkup\MarkupElementCollection.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="TextMarkup\MarkupLayoutManager.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="TextMarkup\MarkupParser.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="TextMarkup\MarkupSettings.cs" />
+    <Compile Include="TextMarkup\NewLine.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="TextMarkup\Paragraph.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="TextMarkup\Span.cs" />
+    <Compile Include="TextMarkup\Strike.cs" />
+    <Compile Include="TextMarkup\Strong.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="TextMarkup\TextElement.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="TextMarkup\Underline.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="TextSettings.cs" />
+    <Compile Include="TreeAreaInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="TreeGX.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="TreeGXCellCancelEventArgs.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="TreeGXCellEventArgs.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="TreeGXDragDropEventArgs.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="TreeGXNodeCancelEventArgs.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="TreeGXNodeCollectionEventArgs.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="TreeGXNodeEventArgs.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="TreeGXNodeMouseEventArgs.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="TreeGXRootSelector.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="TreeSerializer.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Utilites.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="WinApi.cs" />
+    <EmbeddedResource Include="ColorPicker.resx">
+      <DependentUpon>ColorPicker.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Design\ComponentNotLicensed.resx">
+      <DependentUpon>ComponentNotLicensed.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="TreeGX.ico" />
+    <EmbeddedResource Include="TreeGXRootSelector.resx">
+      <DependentUpon>TreeGXRootSelector.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="TreeGX.snk" />
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+      <Visible>False</Visible>
+      <ProductName>Windows Installer 3.1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/TreeGX/TreeGX.ico b/PROMS/DotNetBar Source Code/TreeGX/TreeGX.ico
new file mode 100644
index 00000000..07e4dddd
Binary files /dev/null and b/PROMS/DotNetBar Source Code/TreeGX/TreeGX.ico differ
diff --git a/PROMS/DotNetBar Source Code/TreeGX/TreeGX.resx b/PROMS/DotNetBar Source Code/TreeGX/TreeGX.resx
new file mode 100644
index 00000000..7e323966
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/TreeGX.resx	
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<root>
+	<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+		<xsd:element name="root" msdata:IsDataSet="true">
+			<xsd:complexType>
+				<xsd:choice maxOccurs="unbounded">
+					<xsd:element name="data">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+								<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" />
+							<xsd:attribute name="type" type="xsd:string" />
+							<xsd:attribute name="mimetype" type="xsd:string" />
+						</xsd:complexType>
+					</xsd:element>
+					<xsd:element name="resheader">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" use="required" />
+						</xsd:complexType>
+					</xsd:element>
+				</xsd:choice>
+			</xsd:complexType>
+		</xsd:element>
+	</xsd:schema>
+	<resheader name="ResMimeType">
+		<value>text/microsoft-resx</value>
+	</resheader>
+	<resheader name="Version">
+		<value>1.0.0.0</value>
+	</resheader>
+	<resheader name="Reader">
+		<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.3102.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+	<resheader name="Writer">
+		<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.3102.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+</root>
diff --git a/PROMS/DotNetBar Source Code/TreeGX/TreeGXCellCancelEventArgs.cs b/PROMS/DotNetBar Source Code/TreeGX/TreeGXCellCancelEventArgs.cs
new file mode 100644
index 00000000..c492fa2a
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/TreeGXCellCancelEventArgs.cs	
@@ -0,0 +1,24 @@
+using System;
+
+namespace DevComponents.Tree
+{
+	/// <summary>
+	/// rovides data for TreeGX Cell events that can be canceled.
+	/// </summary>
+	public class TreeGXCellCancelEventArgs:TreeGXCellEventArgs
+	{
+		/// <summary>
+		/// Default constructor for event data.
+		/// </summary>
+		/// <param name="action">Type of the action event is raised for.</param>
+		/// <param name="cell">Cell that event is raised for.</param>
+		public TreeGXCellCancelEventArgs(eTreeAction action, Cell cell):base(action,cell)
+		{
+		}
+		
+		/// <summary>
+		/// Indicates that event action should be canceled.
+		/// </summary>
+		public bool Cancel=false;
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/TreeGXCellEventArgs.cs b/PROMS/DotNetBar Source Code/TreeGX/TreeGXCellEventArgs.cs
new file mode 100644
index 00000000..86d1fa63
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/TreeGXCellEventArgs.cs	
@@ -0,0 +1,30 @@
+using System;
+
+namespace DevComponents.Tree
+{
+	/// <summary>
+	/// Provides data for TreeGX Cell events.
+	/// </summary>
+	public class TreeGXCellEventArgs:EventArgs
+	{
+		/// <summary>
+		/// Default constructor for event data.
+		/// </summary>
+		/// <param name="action">Type of the action event is raised for.</param>
+		/// <param name="cell">Cell that event is raised for.</param>
+		public TreeGXCellEventArgs(eTreeAction action, Cell cell)
+		{
+			this.Action=action;
+			this.Cell=cell;
+		}
+
+		/// <summary>
+		/// Indicates the type of the action performed on a cell.
+		/// </summary>
+		public eTreeAction Action=eTreeAction.Code;
+		/// <summary>
+		/// Indicates the cell that action is peformed on.
+		/// </summary>
+		public DevComponents.Tree.Cell Cell=null;
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/TreeGXDesigner.cs b/PROMS/DotNetBar Source Code/TreeGX/TreeGXDesigner.cs
new file mode 100644
index 00000000..354a88b3
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/TreeGXDesigner.cs	
@@ -0,0 +1,521 @@
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.ComponentModel.Design;
+using System.Drawing;
+using System.Windows.Forms;
+using System.Windows.Forms.Design;
+
+namespace DevComponents.Tree
+{
+	/// <summary>
+	/// Represents windows forms designer for the control.
+	/// </summary>
+	public class TreeGXDesigner:ParentControlDesigner
+	{
+		#region Private Variables
+//		private Point m_MouseDownPosition=Point.Empty;
+//		private bool m_IgnoreMouseUp=false;
+//		private bool m_Capture=false;
+		private bool m_DragDropStarted=false;
+
+		const int WM_RBUTTONDOWN=0x0204;
+		const int WM_LBUTTONDOWN=0x0201;
+		const int WM_LBUTTONUP=0x0202;
+		const int WM_RBUTTONUP=0x0205;
+		const int WM_MOUSEMOVE=0x0200;
+		const int WM_LBUTTONDBLCLK=0x0203;
+		#endregion
+		
+		public override void Initialize(IComponent component) 
+		{
+			base.Initialize(component);
+			if(!component.Site.DesignMode)
+				return;
+
+			ISelectionService ss =(ISelectionService)GetService(typeof(ISelectionService));
+			if(ss!=null)
+				ss.SelectionChanged+=new EventHandler(OnSelectionChanged);
+
+			// If our component is removed we need to clean-up
+			IComponentChangeService cc=(IComponentChangeService)GetService(typeof(IComponentChangeService));
+			if(cc!=null)
+				cc.ComponentRemoving+=new ComponentEventHandler(this.OnComponentRemoving);
+		}
+
+//		public override DesignerVerbCollection Verbs 
+//		{
+//			get 
+//			{
+//				DesignerVerb[] verbs = new DesignerVerb[]
+//					{
+//						new DesignerVerb("Create Node", new EventHandler(CreateNode))};
+//				return new DesignerVerbCollection(verbs);
+//			}
+//		}
+
+		public override void OnSetComponentDefaults()
+		{
+			base.OnSetComponentDefaults();
+			CreateNode(null);
+			IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+			if(dh==null)
+				return;
+			TreeUtilites.InitializeTree(this.Control as TreeGX,new ComponentFactory(dh));
+		}
+
+		private Node CreateNode(Node parentNode)
+		{
+			TreeGX tree=this.Control as TreeGX;
+
+			IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+			if(dh==null)
+				return null;
+            
+			Node node=null;
+			tree.BeginUpdate();
+			try
+			{
+				IComponentChangeService change=this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+				if(change!=null)
+				{
+					if(parentNode!=null)
+						change.OnComponentChanging(this.Component,TypeDescriptor.GetProperties(parentNode).Find("Nodes",true));
+					else
+						change.OnComponentChanging(this.Component,TypeDescriptor.GetProperties(tree).Find("Nodes",true));
+				}
+
+				node=dh.CreateComponent(typeof(Node)) as Node;
+				if(node!=null)
+				{
+					node.Text=node.Name;
+					node.Expanded = true;
+					if(parentNode==null)
+						tree.Nodes.Add(node);
+					else
+						parentNode.Nodes.Add(node);
+
+					if(change!=null)
+					{
+						if(parentNode!=null)
+							change.OnComponentChanged(this.Component,TypeDescriptor.GetProperties(parentNode).Find("Nodes",true),null,null);
+						else
+							change.OnComponentChanged(this.Component,TypeDescriptor.GetProperties(tree).Find("Nodes",true),null,null);
+					}
+				}
+			}
+			finally
+			{
+				tree.EndUpdate();
+			}
+
+			return node;
+		}
+
+		#region Drag & Drop support
+		/// <summary>
+		/// Called after node has been selected by designer as response to mouse action
+		/// </summary>
+		/// <param name="node">Node that is selected</param>
+		protected virtual void OnNodeSelected(Node node)
+		{
+			
+		}
+		
+		/// <summary>
+		/// Returns whether specified node can be dragged and dropped
+		/// </summary>
+		/// <param name="node">Node to verify</param>
+		/// <returns>true if node can be dragged and dropped</returns>
+		protected virtual bool CanDragNode(Node node)
+		{
+			return true;
+		}
+		
+		protected override void OnMouseDragBegin(int x, int y)
+		{
+			TreeGX tree=this.Control as TreeGX;
+			if(tree==null)
+			{
+				base.OnMouseDragBegin(x,y);
+				return;
+			}
+			
+			Point pos=tree.PointToClient(new Point(x,y));
+			Node node = tree.GetNodeAt(pos);
+			
+			if(node!=null)
+			{
+				ISelectionService selection = (ISelectionService) this.GetService(typeof(ISelectionService));
+				if(selection!=null)
+				{
+					ArrayList arr=new ArrayList(1);
+					arr.Add(node);
+					selection.SetSelectedComponents(arr,SelectionTypes.MouseDown);
+					OnNodeSelected(node);
+				}
+				tree.SelectedNode = node;
+			}
+			else
+				tree.SelectedNode = null;
+
+			if(node==null || !CanDragNode(node))
+			{
+				if(node==null)
+					base.OnMouseDragBegin(x,y);
+				else
+					this.Control.Capture = true; // Does same as base implementation
+				return;
+			}
+			
+			if(tree.StartDragDrop(node))
+			{
+				m_DragDropStarted=true;
+//				DevComponents.Tree.Interop.WinA.RECT rect = new NativeFunctions.RECT(0,0,0,0);
+//				NativeFunctions.GetWindowRect(bar.Handle, ref rect);
+//				Rectangle r=Rectangle.FromLTRB(rect.Left, rect.Top, rect.Right, rect.Bottom);
+//				Cursor.Clip=r;
+				
+				this.Control.Capture = true;
+			}
+			else
+				base.OnMouseDragBegin(x,y);
+		}
+		
+		protected override void OnMouseDragMove(int x, int y)
+		{
+			if(m_DragDropStarted)
+			{
+				TreeGX tree=this.Control as TreeGX;
+				DragEventArgs de=new DragEventArgs(null,(int)Control.ModifierKeys,x,y,DragDropEffects.All,DragDropEffects.Move);
+				tree.InternalDragOver(de);
+			}
+		}
+		
+		protected override void OnMouseDragEnd(bool cancel)
+		{
+			this.Control.Capture = false;
+			Cursor.Clip = Rectangle.Empty;
+			TreeGX tree=this.Control as TreeGX;
+
+			if(m_DragDropStarted)
+			{
+				if(tree!=null && tree.IsDragDropInProgress)
+				{
+					if(cancel)
+						tree.InternalDragLeave();
+					else
+					{
+						IComponentChangeService change=this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+
+						Node dragNode=tree.GetDragNode().Tag as Node;
+						Node newParent=tree.GetDragNode().Parent;
+						Node parent=dragNode.Parent;
+
+						if(change!=null)
+						{
+							if(parent!=null)
+								change.OnComponentChanging(this.Component,TypeDescriptor.GetProperties(parent).Find("Nodes",true));
+							else
+								change.OnComponentChanging(this.Component,TypeDescriptor.GetProperties(tree).Find("Nodes",true));
+
+							if(newParent!=null)
+								change.OnComponentChanging(this.Component,TypeDescriptor.GetProperties(newParent).Find("Nodes",true));
+							else
+								change.OnComponentChanging(this.Component,TypeDescriptor.GetProperties(tree).Find("Nodes",true));
+						}
+
+						tree.InternalDragDrop(new DragEventArgs(null,0,0,0,DragDropEffects.None,DragDropEffects.None));
+					
+						if(change!=null)
+						{
+							if(parent!=null)
+								change.OnComponentChanged(this.Component,TypeDescriptor.GetProperties(parent).Find("Nodes",true),null,null);
+							else
+								change.OnComponentChanged(this.Component,TypeDescriptor.GetProperties(tree).Find("Nodes",true),null,null);
+							if(newParent!=null)
+								change.OnComponentChanged(this.Component,TypeDescriptor.GetProperties(newParent).Find("Nodes",true),null,null);
+							else
+								change.OnComponentChanged(this.Component,TypeDescriptor.GetProperties(tree).Find("Nodes",true),null,null);
+						}
+					}
+				}
+				cancel=true;
+			}
+			else
+			{
+				if(tree.SelectedNode!=null)
+					cancel=true;
+			}
+			
+			m_DragDropStarted = false;
+			base.OnMouseDragEnd(cancel);
+		}
+		#endregion
+		
+
+		private void OnSelectionChanged(object sender,EventArgs e)
+		{
+			ISelectionService ss = (ISelectionService)sender;
+			if(ss.PrimarySelection==this.Component)
+			{
+				TreeGX tree=this.Control as TreeGX;
+				tree.SelectedNode=null;
+			}
+		}
+
+		public void OnComponentRemoving(object sender,ComponentEventArgs e)
+		{
+			if(e.Component==this.Component)
+			{
+				IDesignerHost dh=(IDesignerHost)GetService(typeof(IDesignerHost));
+				if(dh==null)
+					return;
+				
+				ArrayList list = new ArrayList(this.AssociatedComponents);
+				foreach(IComponent c in list)
+					dh.DestroyComponent(c);
+			}
+		}
+
+		/// <summary>
+		/// Returns all components associated with this control
+		/// </summary>
+		public override ICollection AssociatedComponents
+		{
+			get
+			{
+				ArrayList c=new ArrayList(base.AssociatedComponents);
+				TreeGX tree=this.Control as TreeGX;
+				if(tree!=null)
+				{
+					foreach(Node node in tree.Nodes)
+						GetNodesRecursive(node,c);
+
+					foreach(ElementStyle style in tree.Styles)
+						c.Add(style);
+
+					if(tree.NodesConnector!=null)
+						c.Add(tree.NodesConnector);
+					if(tree.RootConnector!=null)
+						c.Add(tree.RootConnector);
+					if(tree.LinkConnector!=null)
+						c.Add(tree.LinkConnector);
+				}
+				return c;
+			}
+		}
+
+		private void GetNodesRecursive(Node parent,ArrayList c)
+		{
+			c.Add(parent);
+			if(parent.ParentConnector!=null)
+				c.Add(parent.ParentConnector);
+			foreach(Node node in parent.Nodes)
+			{
+				c.Add(node);
+				GetNodesRecursive(node,c);
+			}
+		}
+
+		/// <summary>
+		/// Selection support for items on container.
+		/// </summary>
+		protected override void WndProc(ref Message m)
+		{
+			switch(m.Msg)
+			{
+				case WM_LBUTTONDOWN:
+				{
+					if(OnMouseDown(ref m,MouseButtons.Left))
+						return;
+					break;
+				}
+				case WM_RBUTTONDOWN:
+				{
+					if(OnMouseDown(ref m,MouseButtons.Right))
+						return;
+					break;
+				}
+				case WM_LBUTTONUP:
+				{
+					if(OnMouseUp(ref m,MouseButtons.Left))
+						return;
+					break;
+				}
+				case WM_RBUTTONUP:
+				{
+					if(OnMouseUp(ref m,MouseButtons.Right))
+						return;
+					break;
+				}
+				case WM_MOUSEMOVE:
+				{
+					if(OnMouseMove(ref m))
+						return;
+					break;
+				}
+				case WM_LBUTTONDBLCLK:
+				{
+					if(OnMouseDoubleClick())
+						return;
+					break;
+				}
+			}
+
+			base.WndProc(ref m);
+		}
+
+		private bool OnMouseDoubleClick()
+		{
+			bool processed=false;
+
+			ISelectionService selection = (ISelectionService) this.GetService(typeof(ISelectionService));
+			if(selection.PrimarySelection is Node && ((Node)selection.PrimarySelection).TreeControl==this.Control)
+			{
+				IDesignerHost host=(IDesignerHost) this.GetService(typeof(IDesignerHost));
+				if(host!=null)
+				{
+					IDesigner designer=host.GetDesigner(selection.PrimarySelection as IComponent);
+					if(designer!=null)
+					{
+						designer.DoDefaultAction();
+						processed=true;
+					}
+				}
+			}
+
+			return processed;
+		}
+
+		protected virtual bool OnMouseDown(ref Message m, MouseButtons button)
+		{
+			
+			TreeGX tree=this.Control as TreeGX;
+
+			if(tree==null)
+				return false;
+
+			Point pos=tree.PointToClient(System.Windows.Forms.Control.MousePosition);
+			//m_MouseDownPosition=pos;
+
+			Node node=tree.GetNodeAt(pos);
+			if(node!=null && button==MouseButtons.Right)
+			{
+				ISelectionService selection = (ISelectionService) this.GetService(typeof(ISelectionService));
+				ArrayList arr=new ArrayList(1);
+				arr.Add(node);
+				selection.SetSelectedComponents(arr,SelectionTypes.MouseDown);
+
+				this.OnContextMenu(System.Windows.Forms.Control.MousePosition.X,System.Windows.Forms.Control.MousePosition.Y);
+				tree.SelectedNode=node;
+				return true;
+			}
+					
+			return false;
+		}
+
+
+		protected virtual bool OnMouseMove(ref Message m)
+		{
+//			TreeGX tree=this.Control as TreeGX;
+//			Point posScreen=System.Windows.Forms.Control.MousePosition;
+//			Point pos=tree.PointToClient(posScreen);
+//
+//			if(Control.MouseButtons==MouseButtons.Left)
+//			{
+//				if(m_DragDropStarted)
+//				{
+//					DragEventArgs de=new DragEventArgs(null,(int)Control.ModifierKeys,posScreen.X,posScreen.Y,DragDropEffects.All,DragDropEffects.Move);
+//					tree.InternalDragOver(de);
+//					return true;
+//				}
+//				if(Control.MouseButtons==MouseButtons.Left && !tree.IsCellEditing && tree.SelectedNode!=null && 
+//					(Math.Abs(m_MouseDownPosition.X-pos.X)>=SystemInformation.DragSize.Width || Math.Abs(m_MouseDownPosition.Y-pos.Y)>=SystemInformation.DragSize.Height))
+//				{
+//					if(tree.StartDragDrop(tree.SelectedNode))
+//					{
+//						m_DragDropStarted=true;
+//						System.Windows.Forms.Control c=System.Windows.Forms.Control.FromHandle(m.HWnd);
+//						if(c!=null)
+//						{
+//							m_Capture=true;
+//							c.Capture=true;
+//						}
+//						return true;
+//					}
+//					m_MouseDownPosition=Point.Empty;
+//				}
+//
+//			}
+
+			return false;
+		}
+
+		private bool OnMouseUp(ref Message m, MouseButtons button)
+		{
+//			if(m_Capture)
+//			{
+//				System.Windows.Forms.Control c=System.Windows.Forms.Control.FromHandle(m.HWnd);
+//				if(c!=null)
+//					c.Capture=false;
+//				m_Capture=false;
+//			}
+//			m_DragDropStarted=false;
+//
+//			TreeGX tree=this.Control as TreeGX;
+//			if(tree!=null && tree.IsDragDropInProgress)
+//			{
+//				IComponentChangeService change=this.GetService(typeof(IComponentChangeService)) as IComponentChangeService;
+//
+//				Node dragNode=tree.GetDragNode().Tag as Node;
+//				Node newParent=tree.GetDragNode().Parent;
+//				Node parent=dragNode.Parent;
+//
+//				if(change!=null)
+//				{
+//					if(parent!=null)
+//						change.OnComponentChanging(this.Component,TypeDescriptor.GetProperties(parent).Find("Nodes",true));
+//					else
+//						change.OnComponentChanging(this.Component,TypeDescriptor.GetProperties(tree).Find("Nodes",true));
+//
+//					if(newParent!=null)
+//						change.OnComponentChanging(this.Component,TypeDescriptor.GetProperties(newParent).Find("Nodes",true));
+//					else
+//						change.OnComponentChanging(this.Component,TypeDescriptor.GetProperties(tree).Find("Nodes",true));
+//				}
+//
+//				tree.InternalDragDrop(new DragEventArgs(null,0,0,0,DragDropEffects.None,DragDropEffects.None));
+//				
+//				if(change!=null)
+//				{
+//					if(parent!=null)
+//						change.OnComponentChanged(this.Component,TypeDescriptor.GetProperties(parent).Find("Nodes",true),null,null);
+//					else
+//						change.OnComponentChanged(this.Component,TypeDescriptor.GetProperties(tree).Find("Nodes",true),null,null);
+//					if(newParent!=null)
+//						change.OnComponentChanged(this.Component,TypeDescriptor.GetProperties(newParent).Find("Nodes",true),null,null);
+//					else
+//						change.OnComponentChanged(this.Component,TypeDescriptor.GetProperties(tree).Find("Nodes",true),null,null);
+//				}
+//
+//			}
+//
+//			if(m_IgnoreMouseUp)
+//			{
+//				m_IgnoreMouseUp=false;
+//				return true;
+//			}
+
+			return false;
+		}
+
+		public override SelectionRules SelectionRules
+		{
+			get
+			{
+				return (SelectionRules.AllSizeable | SelectionRules.Moveable | SelectionRules.Visible);
+			}
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/TreeGXDragDropEventArgs.cs b/PROMS/DotNetBar Source Code/TreeGX/TreeGXDragDropEventArgs.cs
new file mode 100644
index 00000000..8cd05d9a
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/TreeGXDragDropEventArgs.cs	
@@ -0,0 +1,31 @@
+using System;
+
+namespace DevComponents.Tree
+{
+	/// <summary>
+	/// Represents event arguments for BeforeNodeDrop and AfterNodeDrop events
+	/// </summary>
+	public class TreeGXDragDropEventArgs : TreeGXNodeCancelEventArgs
+	{
+		public TreeGXDragDropEventArgs(eTreeAction action, Node node, Node oldParentNode, Node newParentNode):base(action,node)
+		{
+			this.NewParentNode = newParentNode;
+			this.OldParentNode = oldParentNode;
+		}
+		
+		/// <summary>
+		/// Returns reference to the old parent node.
+		/// </summary>
+		public readonly Node OldParentNode=null;
+		
+		/// <summary>
+		/// Reference to the new parent node if event is not canceled.
+		/// </summary>
+		public readonly Node NewParentNode=null;
+
+        /// <summary>
+        /// Gets or sets whether drag node is being copied instead of moved.
+        /// </summary>
+        public bool IsCopy = false;
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/TreeGXNodeCancelEventArgs.cs b/PROMS/DotNetBar Source Code/TreeGX/TreeGXNodeCancelEventArgs.cs
new file mode 100644
index 00000000..c1fe3391
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/TreeGXNodeCancelEventArgs.cs	
@@ -0,0 +1,24 @@
+using System;
+
+namespace DevComponents.Tree
+{
+	/// <summary>
+	/// Provides data for TreeGX Node events that can be cancelled.
+	/// </summary>
+	public class TreeGXNodeCancelEventArgs:TreeGXNodeEventArgs
+	{
+		/// <summary>
+		/// Default constructor.
+		/// </summary>
+		/// <param name="action">Default action</param>
+		/// <param name="node">Default node.</param>
+		public TreeGXNodeCancelEventArgs(eTreeAction action, Node node):base(action,node)
+		{
+		}
+		
+		/// <summary>
+		/// Indicates that event action should be canceled.
+		/// </summary>
+		public bool Cancel=false;
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/TreeGXNodeCollectionEventArgs.cs b/PROMS/DotNetBar Source Code/TreeGX/TreeGXNodeCollectionEventArgs.cs
new file mode 100644
index 00000000..0a2f8311
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/TreeGXNodeCollectionEventArgs.cs	
@@ -0,0 +1,28 @@
+using System;
+
+namespace DevComponents.Tree
+{
+	/// <summary>
+	/// Represents event arguments for NodeCollection based events, like BeforeNodeInsert, AfterNodeInsert etc.
+	/// </summary>
+	public class TreeGXNodeCollectionEventArgs : TreeGXNodeEventArgs
+	{
+		/// <summary>
+		/// Creates new instance of the class.
+		/// </summary>
+		/// <param name="action">Source action</param>
+		/// <param name="node">Affected node</param>
+		/// <param name="parentNode">Parent of the node if any</param>
+		public TreeGXNodeCollectionEventArgs(eTreeAction action, Node node, Node parentNode):base(action, node)
+		{
+			this.ParentNode = parentNode;
+		}
+		
+		/// <summary>
+		/// Indicates parent node of the affected node. For example if event handled is BeforeNodeInsert parent of the Node is has
+		/// not been set yet so this property provides information on the node that will become parent. If this property returns null
+		/// then node is being added or removed from the main TreeGX.Nodes collection.
+		/// </summary>
+		public DevComponents.Tree.Node ParentNode=null;
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/TreeGXNodeEventArgs.cs b/PROMS/DotNetBar Source Code/TreeGX/TreeGXNodeEventArgs.cs
new file mode 100644
index 00000000..f5a372bb
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/TreeGXNodeEventArgs.cs	
@@ -0,0 +1,31 @@
+using System;
+
+namespace DevComponents.Tree
+{
+	/// <summary>
+	/// Provides data for TreeGX Node events.
+	/// </summary>
+	public class TreeGXNodeEventArgs:EventArgs
+	{
+		/// <summary>
+		/// Default constructor.
+		/// </summary>
+		/// <param name="action">Default action</param>
+		/// <param name="node">Default node.</param>
+		public TreeGXNodeEventArgs(eTreeAction action, Node node)
+		{
+			this.Action = action;
+			this.Node = node;
+		}
+		
+		/// <summary>
+		/// Indicates the type of the action performed on a node.
+		/// </summary>
+		public eTreeAction Action=eTreeAction.Code;
+		
+		/// <summary>
+		/// Indicates the node that action is peformed on.
+		/// </summary>
+		public DevComponents.Tree.Node Node=null;
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/TreeGXNodeMouseEventArgs.cs b/PROMS/DotNetBar Source Code/TreeGX/TreeGXNodeMouseEventArgs.cs
new file mode 100644
index 00000000..6456f236
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/TreeGXNodeMouseEventArgs.cs	
@@ -0,0 +1,51 @@
+using System;
+using System.Windows.Forms;
+
+namespace DevComponents.Tree
+{
+	/// <summary>
+	/// Represents event arguments for node mouse based events.
+	/// </summary>
+	public class TreeGXNodeMouseEventArgs:EventArgs
+	{
+		public TreeGXNodeMouseEventArgs(Node node, MouseButtons button, int clicks, int delta, int x, int y)
+		{
+			this.Node = node;
+			this.Button = button;
+			this.Clicks = clicks;
+			this.Delta = delta;
+			this.X = x;
+			this.Y = y;
+		}
+		
+		/// <summary>
+		/// Gets node affected by mouse action.
+		/// </summary>
+		public readonly Node Node;
+		
+		/// <summary>
+		/// Gets which mouse button was pressed.
+		/// </summary>
+		public readonly MouseButtons Button;
+		
+		/// <summary>
+		/// Gets the number of times the mouse button was pressed and released.
+		/// </summary>
+		public readonly int Clicks;
+		
+		/// <summary>
+		/// Gets a signed count of the number of detents the mouse wheel has rotated. A detent is one notch of the mouse wheel.
+		/// </summary>
+		public readonly int Delta;
+		
+		/// <summary>
+		/// Gets the x-coordinate of the mouse.
+		/// </summary>
+		public readonly int X;
+		
+		/// <summary>
+		/// Gets the y-coordinate of the mouse.
+		/// </summary>
+		public readonly int Y;
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/TreeGXRootSelector.cs b/PROMS/DotNetBar Source Code/TreeGX/TreeGXRootSelector.cs
new file mode 100644
index 00000000..8d7527c2
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/TreeGXRootSelector.cs	
@@ -0,0 +1,57 @@
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.Drawing;
+using System.Data;
+using System.Windows.Forms;
+
+namespace DevComponents.Tree
+{
+	/// <summary>
+	/// Represents controls that provides user interface to select root node from TreeGX control.
+	/// </summary>
+	[ToolboxItem(false)]
+	public class TreeGXRootSelector : System.Windows.Forms.UserControl
+	{
+		/// <summary> 
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.Container components = null;
+
+		public TreeGXRootSelector()
+		{
+			InitializeComponent();
+		}
+
+		/// <summary> 
+		/// Clean up any resources being used.
+		/// </summary>
+		protected override void Dispose( bool disposing )
+		{
+			if( disposing )
+			{
+				if(components != null)
+				{
+					components.Dispose();
+				}
+			}
+			base.Dispose( disposing );
+		}
+
+		#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()
+		{
+			// 
+			// TreeGXRootSelector
+			// 
+			this.Name = "TreeGXRootSelector";
+			this.Size = new System.Drawing.Size(400, 256);
+
+		}
+		#endregion
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/TreeGXRootSelector.resx b/PROMS/DotNetBar Source Code/TreeGX/TreeGXRootSelector.resx
new file mode 100644
index 00000000..5f95ae91
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/TreeGXRootSelector.resx	
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+            Microsoft ResX Schema 
+        
+            Version 1.3
+                
+            The primary goals of this format is to allow a simple XML format 
+            that is mostly human readable. The generation and parsing of the 
+            various data types are done through the TypeConverter classes 
+            associated with the data types.
+        
+            Example:
+        
+                ... ado.net/XML headers & schema ...
+                <resheader name="resmimetype">text/microsoft-resx</resheader>
+                <resheader name="version">1.3</resheader>
+                <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+                <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+                <data name="Name1">this is my long string</data>
+                <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+                <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+                    [base64 mime encoded serialized .NET Framework object]
+                </data>
+                <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+                    [base64 mime encoded string representing a byte array form of the .NET Framework object]
+                </data>
+        
+            There are any number of "resheader" rows that contain simple 
+            name/value pairs.
+            
+            Each data row contains a name, and value. The row also contains a 
+            type or mimetype. Type corresponds to a .NET class that support 
+            text/value conversion through the TypeConverter architecture. 
+            Classes that don't support this are serialized and stored with the 
+            mimetype set.
+                     
+            The mimetype is used for serialized objects, and tells the 
+            ResXResourceReader how to depersist the object. This is currently not 
+            extensible. For a given mimetype the value must be set accordingly:
+        
+            Note - application/x-microsoft.net.object.binary.base64 is the format 
+                   that the ResXResourceWriter will generate, however the reader can 
+                   read any of the formats listed below.
+        
+            mimetype: application/x-microsoft.net.object.binary.base64
+            value   : The object must be serialized with 
+                    : System.Serialization.Formatters.Binary.BinaryFormatter
+                    : and then encoded with base64 encoding.
+        
+            mimetype: application/x-microsoft.net.object.soap.base64
+            value   : The object must be serialized with 
+                    : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+                    : and then encoded with base64 encoding.
+            mimetype: application/x-microsoft.net.object.bytearray.base64
+            value   : The object must be serialized into a byte array 
+                    : using a System.ComponentModel.TypeConverter
+                    : and then encoded with base64 encoding.
+        -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>1.3</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="$this.Name">
+    <value>TreeGXRootSelector</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/TreeGX/TreeSerializer.cs b/PROMS/DotNetBar Source Code/TreeGX/TreeSerializer.cs
new file mode 100644
index 00000000..2b01d51f
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/TreeSerializer.cs	
@@ -0,0 +1,350 @@
+using System;
+using System.Xml;
+using System.IO;
+
+namespace DevComponents.Tree
+{
+	/// <summary>
+	/// Provides means for TreeGX serialization.
+	/// </summary>
+	public class TreeSerializer
+	{
+		#region Private Variables
+		private static string XmlNodeName="Node";
+		private static string XmlCellsName="Cells";
+		private static string XmlCellName="Cell";
+		private static string XmlCellImagesName="Images";
+		private static string XmlTreeGXName="TreeGX";
+		private static string XmlCustomName = "Custom";
+		#endregion
+		
+		#region Saving
+		/// <summary>
+		/// Saves Nodes to specified file.
+		/// </summary>
+		/// <param name="tree">TreeGX to save</param>
+		/// <param name="fileName">Target file name</param>
+		public static void Save(TreeGX tree, string fileName)
+		{
+			XmlDocument document=Save(tree);
+			document.Save(fileName);
+		}
+		
+		/// <summary>
+		/// Saves Nodes to stream.
+		/// </summary>
+		/// <param name="tree">TreeGX to save</param>
+		/// <param name="outStream">Stream to save nodes to.</param>
+		public static void Save(TreeGX tree, Stream outStream)
+		{
+			XmlDocument document=Save(tree);
+			document.Save(outStream);
+		}
+		
+		/// <summary>
+		/// Saves Nodes to TextWriter
+		/// </summary>
+		/// <param name="tree">TreeGX to save</param>
+		/// <param name="writer">TextWriter to write nodes to.</param>
+		public static void Save(TreeGX tree, TextWriter writer)
+		{
+			XmlDocument document=Save(tree);
+			document.Save(writer);
+		}
+		
+		/// <summary>
+		/// Saves nodes to XmlWriter.
+		/// </summary>
+		/// <param name="tree">TreeGX to save</param>
+		/// <param name="writer">XmlWriter to write nodes to</param>
+		public static void Save(TreeGX tree, XmlWriter writer)
+		{
+			XmlDocument document=Save(tree);
+			document.Save(writer);
+		}
+		
+		/// <summary>
+		/// Creates new XmlDocument and serializes TreeGX into it.
+		/// </summary>
+		/// <param name="tree">TreeGX to serialize</param>
+		/// <returns>New instance of XmlDocument/returns>
+		public static XmlDocument Save(TreeGX tree)
+		{
+			XmlDocument document=new XmlDocument();
+			Save(tree, document);
+			return document;
+		}
+		
+		/// <summary>
+		/// Saves TreeGX to an existing XmlDocument. New node TreeGX is created in document and Nodes are serialized into it.
+		/// </summary>
+		/// <param name="tree">TreeGX to serialize</param>
+		/// <param name="document">XmlDocument instance.</param>
+		public static void Save(TreeGX tree, XmlDocument document)
+		{
+			XmlElement parent = document.CreateElement(XmlTreeGXName);
+			document.AppendChild(parent);
+			TreeSerializer.Save(tree, parent);
+		}
+		
+		/// <summary>
+		/// Serializes TreeGX object to XmlElement object.
+		/// </summary>
+		/// <param name="tree">Instance of TreeGX to serialize.</param>
+		/// <param name="parent">XmlElement to serialize to.</param>
+		public static void Save(TreeGX tree, XmlElement parent)
+		{
+			NodeSerializationContext context = new NodeSerializationContext();
+			context.RefXmlElement = parent;
+			context.TreeGX = tree;
+			context.HasSerializeNodeHandlers = tree.HasSerializeNodeHandlers;
+			context.HasDeserializeNodeHandlers = tree.HasDeserializeNodeHandlers;
+			
+			foreach(Node node in tree.Nodes)
+			{
+				Save(node, context);
+			}
+		}
+		
+		/// <summary>
+		/// Serializes Node and all child nodes to XmlElement object.
+		/// </summary>
+		/// <param name="node">Node to serialize.</param>
+		/// <param name="context">Provides serialization context.</param>
+		public static void Save(Node node, NodeSerializationContext context)
+		{
+			XmlElement parent = context.RefXmlElement;
+			
+			XmlElement xmlNode=parent.OwnerDocument.CreateElement(XmlNodeName);
+			parent.AppendChild(xmlNode);
+			
+			ElementSerializer.Serialize(node, xmlNode);
+			
+			if(node.Cells.Count>1)
+			{
+				XmlElement xmlCells = parent.OwnerDocument.CreateElement(XmlCellsName);
+				xmlNode.AppendChild(xmlCells);
+				
+				for(int i=1; i<node.Cells.Count;i++)
+				{
+					Cell cell=node.Cells[i];
+					XmlElement xmlCell= parent.OwnerDocument.CreateElement(XmlCellName);
+					xmlCells.AppendChild(xmlCell);
+					ElementSerializer.Serialize(cell, xmlCell);
+					if(cell.ShouldSerializeImages())
+					{
+						XmlElement xmlCellImages = parent.OwnerDocument.CreateElement(XmlCellImagesName);
+						xmlCell.AppendChild(xmlCellImages);
+						ElementSerializer.Serialize(cell.Images, xmlCellImages);
+					}
+				}
+			}
+
+            if (context.HasSerializeNodeHandlers)
+            {
+                XmlElement customXml = parent.OwnerDocument.CreateElement(XmlCustomName);
+                SerializeNodeEventArgs e = new SerializeNodeEventArgs(node, xmlNode, customXml);
+                context.TreeGX.InvokeSerializeNode(e);
+                if (customXml.Attributes.Count > 0 || customXml.ChildNodes.Count > 0)
+                    xmlNode.AppendChild(customXml);
+            }
+			
+			context.RefXmlElement = xmlNode;
+			foreach(Node childNode in node.Nodes)
+			{
+				Save(childNode, context);
+			}
+			context.RefXmlElement = parent;
+		}
+		#endregion
+		
+		#region Loading
+		/// <summary>
+		/// Load TreeGX Nodes from file.
+		/// </summary>
+		/// <param name="tree">Reference to TreeGX to populate</param>
+		/// <param name="fileName">File name.</param>
+		public static void Load(TreeGX tree, string fileName)
+		{
+			XmlDocument document=new XmlDocument();
+			document.Load(fileName);
+			Load(tree, document);
+		}
+		
+		/// <summary>
+		/// Load TreeGX Nodes from stream.
+		/// </summary>
+		/// <param name="tree">Reference to TreeGX to populate</param>
+		/// <param name="inStream">Reference to stream</param>
+		public static void Load(TreeGX tree, Stream inStream)
+		{
+			XmlDocument document=new XmlDocument();
+			document.Load(inStream);
+			Load(tree, document);
+		}
+		
+		/// <summary>
+		/// Load TreeGX Nodes from reader.
+		/// </summary>
+		/// <param name="tree">Reference to TreeGX to populate</param>
+		/// <param name="reader">Reference to reader.</param>
+		public static void Load(TreeGX tree, TextReader reader)
+		{
+			XmlDocument document=new XmlDocument();
+			document.Load(reader);
+			Load(tree, document);
+		}
+		
+		/// <summary>
+		/// Load TreeGX Nodes from reader.
+		/// </summary>
+		/// <param name="tree">Reference to TreeGX to populate</param>
+		/// <param name="reader">Reference to reader.</param>
+		public static void Load(TreeGX tree, XmlReader reader)
+		{
+			XmlDocument document=new XmlDocument();
+			document.Load(reader);
+			Load(tree, document);
+		}
+		
+		/// <summary>
+		/// Load TreeGX from XmlDocument that was created by Save method.
+		/// </summary>
+		/// <param name="tree">Tree Control to load</param>
+		/// <param name="document">XmlDocument to load control from</param>
+		public static void Load(TreeGX tree, XmlDocument document)
+		{
+			foreach(XmlNode xmlNode in document.ChildNodes)
+			{
+				if(xmlNode.Name==XmlTreeGXName && xmlNode is XmlElement)
+				{
+					Load(tree, xmlNode as XmlElement);
+					break;
+				}
+			}
+		}
+		
+		/// <summary>
+		/// Load nodes from XmlElement.
+		/// </summary>
+		/// <param name="tree">Reference to TreeGX to be populated.</param>
+		/// <param name="parent">XmlElement that tree was serialized to.</param>
+		public static void Load(TreeGX tree, XmlElement parent)
+		{
+			tree.BeginUpdate();
+			tree.DisplayRootNode = null;
+			tree.Nodes.Clear();
+			
+			NodeSerializationContext context = new NodeSerializationContext();
+			context.TreeGX = tree;
+			context.HasDeserializeNodeHandlers  = tree.HasDeserializeNodeHandlers;
+			context.HasSerializeNodeHandlers = tree.HasSerializeNodeHandlers;
+			
+			try
+			{
+				foreach(XmlNode xmlNode in parent.ChildNodes)
+				{
+					if(xmlNode.Name==XmlNodeName && xmlNode is XmlElement)
+					{
+						Node node=new Node();
+						tree.Nodes.Add(node);
+						context.RefXmlElement = xmlNode as XmlElement;
+						LoadNode(node, context);
+					}
+				}
+			}
+			finally
+			{
+				tree.EndUpdate();
+			}
+		}
+		
+		/// <summary>
+		/// Load single node and it's child nodes if any.
+		/// </summary>
+		/// <param name="nodeToLoad">New instance of node that is populated with loaded data.</param>
+		/// <param name="context">Provides deserialization context.</param>
+		public static void LoadNode(Node nodeToLoad, NodeSerializationContext context)
+		{
+			XmlElement xmlNode = context.RefXmlElement;
+			
+			ElementSerializer.Deserialize(nodeToLoad, xmlNode);
+
+			foreach(XmlNode xmlChild in xmlNode.ChildNodes)
+			{
+				XmlElement xmlElem = xmlChild as XmlElement;
+				if(xmlElem == null)
+					continue;
+				if(xmlElem.Name==XmlNodeName)
+				{
+					Node node=new Node();
+					nodeToLoad.Nodes.Add(node);
+					context.RefXmlElement = xmlElem;
+					LoadNode(node, context);
+				}
+				else if(xmlElem.Name == XmlCellsName)
+				{
+					LoadCells(nodeToLoad, xmlElem);
+				}
+				else if(xmlElem.Name == XmlCustomName)
+				{
+					if(context.HasDeserializeNodeHandlers)
+					{
+						SerializeNodeEventArgs e = new SerializeNodeEventArgs(nodeToLoad, xmlNode, xmlElem);
+						context.TreeGX.InvokeDeserializeNode(e);
+					}
+				}
+			}
+			context.RefXmlElement = xmlNode;
+		}
+		
+		private static void LoadCells(Node parentNode, XmlElement xmlCells)
+		{
+			foreach(XmlNode xmlChild in xmlCells.ChildNodes)
+			{
+				if(xmlChild.Name==XmlCellName && xmlChild is XmlElement)
+				{
+					Cell cell=new Cell();
+					parentNode.Cells.Add(cell);
+					ElementSerializer.Deserialize(cell, xmlChild as XmlElement);
+					// Load images if any
+					foreach(XmlElement xmlImage in xmlChild.ChildNodes)
+					{
+						if(xmlImage.Name==XmlCellImagesName)
+						{
+							ElementSerializer.Deserialize(cell.Images, xmlImage);
+							break;
+						}
+					}
+				}
+			}
+		}
+		#endregion
+	}
+	
+	/// <summary>
+	/// Provides context information for serialization.
+	/// </summary>
+	public class NodeSerializationContext
+	{
+		/// <summary>
+		/// Gets or sets reference to context parent XmlElement when serializing or actual Node element when deserializing.
+		/// </summary>
+		public System.Xml.XmlElement RefXmlElement = null;
+
+		/// <summary>
+		/// Gets or sets whether SerializeNode event handler has been defined and whether event should be fired.
+		/// </summary>
+		public bool HasSerializeNodeHandlers = false;
+
+		/// <summary>
+		/// Gets or sets whether DeserializeNode event handler has been defined and whether event should be fired.
+		/// </summary>
+		public bool HasDeserializeNodeHandlers = false;
+
+		/// <summary>
+		/// Provides access to serializer.
+		/// </summary>
+		public TreeGX TreeGX = null;
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/Utilites.cs b/PROMS/DotNetBar Source Code/TreeGX/Utilites.cs
new file mode 100644
index 00000000..f8aca3e0
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/Utilites.cs	
@@ -0,0 +1,164 @@
+using System;
+using System.ComponentModel.Design;
+using System.Drawing;
+
+namespace DevComponents.Tree
+{
+	/// <summary>
+	/// Represents class for static tree utilities.
+	/// </summary>
+	public class Utilites
+	{
+		/// <summary>
+		/// Initializes control with default settings for connectors and nodes.
+		/// </summary>
+		/// <param name="tree">Control to initialize.</param>
+		public static void InitializeTree(TreeGX tree)
+		{
+			InitializeTree(tree,new ComponentFactory());
+		}
+		
+		/// <summary>
+		/// Initializes control with default settings for connectors and nodes.
+		/// </summary>
+		/// <param name="tree">Control to initialize.</param>
+		/// <param name="factory">Factory to use to create new instances of objects.</param>
+		internal static void InitializeTree(TreeGX tree, ComponentFactory factory)
+		{
+			tree.RootConnector=factory.CreateComponent(typeof(NodeConnector)) as NodeConnector;
+			tree.RootConnector.LineWidth=5;
+			tree.RootConnector.LineColor=SystemColors.Highlight;
+			tree.NodesConnector=factory.CreateComponent(typeof(NodeConnector)) as NodeConnector;
+			tree.NodesConnector.LineWidth=5;
+			tree.NodesConnector.LineColor=SystemColors.Highlight;
+
+			eStyleBorderType border=eStyleBorderType.Solid;
+			ElementStyle style=factory.CreateComponent(typeof(ElementStyle)) as ElementStyle;
+			
+			style.BackColorSchemePart=eColorSchemePart.BarBackground;
+			style.BackColor2SchemePart=eColorSchemePart.BarBackground2;
+			style.BackColorGradientAngle=90;
+			style.CornerDiameter=4;
+			style.CornerType=eCornerType.Rounded;
+			style.BorderLeft=border;
+			style.BorderLeftWidth=1;
+			style.BorderTop=border;
+			style.BorderTopWidth=1;
+			style.BorderBottom=border;
+			style.BorderBottomWidth=1;
+			style.BorderRight=border;
+			style.BorderRightWidth=1;
+			style.BorderColorSchemePart=eColorSchemePart.BarDockedBorder;
+			style.PaddingBottom=3;
+			style.PaddingLeft=3;
+			style.PaddingRight=3;
+			style.PaddingTop=3;
+			style.TextColor=Color.FromArgb(0,0,128);
+			style.Font=tree.Font;
+			tree.Styles.Add(style);
+
+			tree.NodeStyle=style;
+		}
+		
+		/// <summary>
+		/// Creates new style and adds it to styles collection
+		/// </summary>
+		/// <param name="tree">Tree to assign style to</param>
+		/// <param name="factory">Style factory</param>
+		/// <param name="backColor"></param>
+		/// <param name="backColor2"></param>
+		/// <param name="gradientAngle"></param>
+		/// <param name="textColor"></param>
+		internal static ElementStyle CreateStyle(ComponentFactory factory, string description, Color borderColor, Color backColor, Color backColor2, int gradientAngle, Color textColor)
+		{
+			eStyleBorderType border=eStyleBorderType.Solid;
+			ElementStyle style=factory.CreateComponent(typeof(ElementStyle)) as ElementStyle;
+			
+			style.Description = description;
+			style.BackColor = backColor;
+			style.BackColor2=backColor2;
+			style.BackColorGradientAngle=gradientAngle;
+			style.CornerDiameter=4;
+			style.CornerType=eCornerType.Rounded;
+			style.BorderLeft=border;
+			style.BorderLeftWidth=1;
+			style.BorderTop=border;
+			style.BorderTopWidth=1;
+			style.BorderBottom=border;
+			style.BorderBottomWidth=1;
+			style.BorderRight=border;
+			style.BorderRightWidth=1;
+			style.BorderColor=borderColor;
+			style.PaddingBottom=3;
+			style.PaddingLeft=3;
+			style.PaddingRight=3;
+			style.PaddingTop=3;
+			style.TextColor=textColor;
+			
+			return style;
+		}
+
+		/// <summary>
+		/// Returns reference to a node that is hosting given control.
+		/// </summary>
+		/// <param name="tree">Reference to the TreeGX control instance</param>
+		/// <param name="c">Control instance to look for</param>
+		/// <returns>Reference to a node hosting control or null if node could not be found</returns>
+		public static Node FindNodeForControl(TreeGX tree, System.Windows.Forms.Control c)
+		{
+			if(tree==null || c==null || tree.Nodes.Count==0)
+				return null;
+			
+			Node node = tree.Nodes[0];
+			while(node!=null)
+			{
+				foreach(Cell cell in node.Cells)
+				{
+					if(cell.HostedControl==c)
+						return node;
+				}
+				node = node.NextVisibleNode;
+			}
+			
+			return null;
+		}
+	}
+	
+	#region ComponentFactory
+	/// <summary>
+	/// Represents internal component factory with design-time support.
+	/// </summary>
+	internal class ComponentFactory
+	{
+		private IDesignerHost m_Designer=null; 
+		/// <summary>
+		/// Creates new instace of the class.
+		/// </summary>
+		/// <param name="designer">Reference to DesignerHost to use for creation of new components.</param>
+		public ComponentFactory(IDesignerHost designer)
+		{
+			m_Designer=designer;
+		}
+
+		/// <summary>
+		/// Creates new instace of the class.
+		/// </summary>
+		public ComponentFactory() {}
+
+		/// <summary>
+		/// Creates component and returns reference to the new instace.
+		/// </summary>
+		/// <param name="type">Type that identifies component to create.</param>
+		/// <returns>New instace of the component.</returns>
+		public object CreateComponent(Type type)
+		{
+			object o=null;
+			if(m_Designer!=null)
+				o=m_Designer.CreateComponent(type);
+			else
+				o=type.Assembly.CreateInstance(type.FullName);
+			return o;
+		}
+	}
+	#endregion
+}
diff --git a/PROMS/DotNetBar Source Code/TreeGX/WinApi.cs b/PROMS/DotNetBar Source Code/TreeGX/WinApi.cs
new file mode 100644
index 00000000..9e629153
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/TreeGX/WinApi.cs	
@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Runtime.InteropServices;
+
+namespace DevComponents.Tree
+{
+    /// <summary>
+    /// Defines Windows API function access.
+    /// </summary>
+    internal static class WinApi
+    {
+        [StructLayout(LayoutKind.Sequential)]
+        public struct OSVERSIONINFO
+        {
+            public int dwOSVersionInfoSize;
+            public int dwMajorVersion;
+            public int dwMinorVersion;
+            public int dwBuildNumber;
+            public int dwPlatformId;
+            [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 128)]
+            public string szCSDVersion;
+        }
+        [DllImport("kernel32.Dll")]
+        public static extern short GetVersionEx(ref OSVERSIONINFO o);
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/UIGraphics.cs b/PROMS/DotNetBar Source Code/UIGraphics.cs
new file mode 100644
index 00000000..edb41587
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/UIGraphics.cs	
@@ -0,0 +1,176 @@
+using System;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Drawing.Imaging;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Represents class that holds User Interface static methods.
+	/// </summary>
+	internal class UIGraphics
+	{
+		private UIGraphics()
+		{
+		}
+
+		/// <summary>
+		/// Gets the graphics path that represents triangle.
+		/// </summary>
+		/// <param name="p">Top left position of the triangle.</param>
+		/// <param name="size">Size of the triangle.</param>
+		/// <param name="direction">Pointing direction of the triangle.</param>
+		/// <returns>Returns graphics path for the triangle of given size and pointing in given direction.</returns>
+		public static GraphicsPath GetTrianglePath(Point p, int size, eTriangleDirection direction)
+		{
+			GraphicsPath path=new GraphicsPath();
+			switch(direction)
+			{
+				case eTriangleDirection.Left:
+				{
+					p.X--;
+					path.AddLine(p.X+size/2,p.Y,p.X+size/2,p.Y+size);
+					path.AddLine(p.X,p.Y+size/2,p.X+size/2,p.Y);
+					path.CloseAllFigures();
+					break;
+				}
+				case eTriangleDirection.Right:
+				{
+					path.AddLine(p.X,p.Y,p.X,p.Y+size);
+					path.AddLine(p.X+size/2,p.Y+size/2,p.X,p.Y);
+					path.CloseAllFigures();
+					break;
+				}
+				case eTriangleDirection.Top:
+				{
+                    int midY = (int)Math.Ceiling(p.Y + (float)size / 2);
+                    int midX = (int)Math.Ceiling(p.X + (float)size / 2);
+                    path.AddLine(p.X, midY, p.X + size, midY);
+                    path.AddLine(midX, p.Y, p.X, midY);
+					path.CloseAllFigures();
+					break;
+				}
+				case eTriangleDirection.Bottom:
+				{
+                    int midY = (int)Math.Floor(p.Y + (float)size / 2);
+                    int midX = (int)Math.Floor(p.X + (float)size / 2);
+                    path.AddLine(p.X, p.Y, p.X + size - 1, p.Y); // -1 hack for GDI+ FillPath bug
+                    path.AddLine(midX, midY, p.X, p.Y);
+					path.CloseAllFigures();
+					break;
+				}
+			}
+
+			return path;
+		}
+
+        /// <summary>
+        /// Creates the double arrow >> collapse expand image for the collapsable controls.
+        /// </summary>
+        /// <param name="collapse">Indicates the direction of the arrow</param>
+        /// <param name="color">Color for the arrows</param>
+        /// <param name="verticalCollapse">Indicates whether image is for vertical collapse/expand</param>
+        /// <returns></returns>
+        public static Image CreateExpandButtonImage(bool collapse, Color color, bool verticalCollapse)
+        {
+            Bitmap bmp = new Bitmap(16, 16, PixelFormat.Format24bppRgb);
+            bmp.MakeTransparent();
+            Image img = bmp;
+            Graphics g = Graphics.FromImage(img);
+            g.SmoothingMode = SmoothingMode.AntiAlias;
+
+            if (collapse)
+            {
+                if (verticalCollapse)
+                {
+                    using (Pen pen = new Pen(color, 1))
+                    {
+                        g.DrawLine(pen, 4, 7, 7, 4);
+                        g.DrawLine(pen, 7, 4, 10, 7);
+                        g.DrawLine(pen, 5, 7, 7, 5);
+                        g.DrawLine(pen, 7, 5, 9, 7);
+
+                        g.DrawLine(pen, 4, 10, 7, 7);
+                        g.DrawLine(pen, 7, 7, 10, 10);
+                        g.DrawLine(pen, 5, 10, 7, 8);
+                        g.DrawLine(pen, 7, 8, 9, 10);
+                    }
+                }
+                else
+                {
+                    using (Pen pen = new Pen(color, 1))
+                    {
+                        g.DrawLine(pen, 7, 4, 4, 7);
+                        g.DrawLine(pen, 4, 7, 7, 10);
+                        g.DrawLine(pen, 7, 5, 5, 7);
+                        g.DrawLine(pen, 5, 7, 7, 9);
+
+                        g.DrawLine(pen, 10, 4, 7, 7);
+                        g.DrawLine(pen, 7, 7, 10, 10);
+                        g.DrawLine(pen, 10, 5, 8, 7);
+                        g.DrawLine(pen, 8, 7, 10, 9);
+                    }
+                }
+            }
+            else
+            {
+                if (verticalCollapse)
+                {
+                    using (Pen pen = new Pen(color, 1))
+                    {
+                        g.DrawLine(pen, 4, 4, 7, 7);
+                        g.DrawLine(pen, 7, 7, 10, 4);
+                        g.DrawLine(pen, 5, 4, 7, 6);
+                        g.DrawLine(pen, 7, 6, 9, 4);
+
+                        g.DrawLine(pen, 4, 7, 7, 10);
+                        g.DrawLine(pen, 7, 10, 10, 7);
+                        g.DrawLine(pen, 5, 7, 7, 9);
+                        g.DrawLine(pen, 7, 9, 9, 7);
+                    }
+                }
+                else
+                {
+                    using (Pen pen = new Pen(color, 1))
+                    {
+                        g.DrawLine(pen, 4, 4, 7, 7);
+                        g.DrawLine(pen, 7, 7, 4, 10);
+                        g.DrawLine(pen, 4, 5, 6, 7);
+                        g.DrawLine(pen, 6, 7, 4, 9);
+
+                        g.DrawLine(pen, 7, 4, 10, 7);
+                        g.DrawLine(pen, 10, 7, 7, 10);
+                        g.DrawLine(pen, 7, 5, 9, 7);
+                        g.DrawLine(pen, 9, 7, 7, 9);
+                    }
+                }
+            }
+            g.Dispose();
+
+            return img;
+        }
+	}
+
+	/// <summary>
+	/// Specifies the pointing direction of triangle.
+	/// </summary>
+	internal enum eTriangleDirection
+	{
+		/// <summary>
+		/// Triangle point to the left.
+		/// </summary>
+		Left,
+		/// <summary>
+		/// Triangle point to the right.
+		/// </summary>
+		Right,
+		/// <summary>
+		/// Triangle point to the top.
+		/// </summary>
+		Top,
+		/// <summary>
+		/// Triangle point to the bottom.
+		/// </summary>
+		Bottom
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual Basic/MetroAppForm/MetroAppForm.zip b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual Basic/MetroAppForm/MetroAppForm.zip
new file mode 100644
index 00000000..e464b16b
Binary files /dev/null and b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual Basic/MetroAppForm/MetroAppForm.zip differ
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual Basic/MetroForm/Form.Designer.vb b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual Basic/MetroForm/Form.Designer.vb
new file mode 100644
index 00000000..7d926fa4
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual Basic/MetroForm/Form.Designer.vb	
@@ -0,0 +1,33 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class $safeitemrootname$
+    Inherits DevComponents.DotNetBar.Metro.MetroForm
+
+    'Form overrides dispose to clean up the component list.
+    <System.Diagnostics.DebuggerNonUserCode()> _
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+        Try
+            If disposing AndAlso components IsNot Nothing Then
+                components.Dispose()
+            End If
+        Finally
+            MyBase.Dispose(disposing)
+        End Try
+    End Sub
+
+    'Required by the Windows Form Designer
+    Private components As System.ComponentModel.IContainer
+
+    'NOTE: The following procedure is required by the Windows Form Designer
+    'It can be modified using the Windows Form Designer.  
+    'Do not modify it using the code editor.
+    <System.Diagnostics.DebuggerStepThrough()> _
+    Private Sub InitializeComponent()
+        components = New System.ComponentModel.Container
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.ClientSize = New System.Drawing.Size(653, 436)
+		Me.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+		Me.Name = "$safeitemrootname$"
+        Me.Text = "MetroForm"
+    End Sub
+End Class
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual Basic/MetroForm/Form.vb b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual Basic/MetroForm/Form.vb
new file mode 100644
index 00000000..9b12d76d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual Basic/MetroForm/Form.vb	
@@ -0,0 +1,3 @@
+Public Class $safeitemrootname$
+
+End Class
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual Basic/MetroForm/MetroForm.zip b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual Basic/MetroForm/MetroForm.zip
new file mode 100644
index 00000000..1742cb89
Binary files /dev/null and b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual Basic/MetroForm/MetroForm.zip differ
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual Basic/MetroForm/metroform.vstemplate b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual Basic/MetroForm/metroform.vstemplate
new file mode 100644
index 00000000..62cc1786
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual Basic/MetroForm/metroform.vstemplate	
@@ -0,0 +1,36 @@
+<VSTemplate Version="3.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name>Metro Form</Name>
+    <Description>DotNetBar Metro Form</Description>
+    <Icon Package="{164B10B9-B200-11D0-8C61-00A0C91E29D5}" ID="4527" />
+	<TemplateID>DevComponents.VB.MetroForm</TemplateID>
+    <ProjectType>VisualBasic</ProjectType>
+    <SortOrder>11</SortOrder>
+    <DefaultName>Form.vb</DefaultName>
+	<RequiredFrameworkVersion>2.0</RequiredFrameworkVersion>
+    <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
+  </TemplateData>
+  <TemplateContent>
+        <References>
+            <Reference>
+                <Assembly>System</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+            <Reference>
+                <Assembly>System.Drawing</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+            <Reference>
+                <Assembly>System.Windows.Forms</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+			<Reference>
+                <Assembly>DevComponents.DotNetBar2</Assembly>
+                <URL>http://www.devcomponents.com</URL>
+            </Reference>
+        </References>
+
+    <ProjectItem ReplaceParameters="true" SubType="Form">Form.vb</ProjectItem>
+    <ProjectItem ReplaceParameters="true">Form.Designer.vb</ProjectItem>
+  </TemplateContent>
+</VSTemplate>
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual Basic/Office2007Form/DotNetBarOffice2007Form.zip b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual Basic/Office2007Form/DotNetBarOffice2007Form.zip
new file mode 100644
index 00000000..bbbe8da0
Binary files /dev/null and b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual Basic/Office2007Form/DotNetBarOffice2007Form.zip differ
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual Basic/Office2007Form/Form.Designer.vb b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual Basic/Office2007Form/Form.Designer.vb
new file mode 100644
index 00000000..2f6f306f
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual Basic/Office2007Form/Form.Designer.vb	
@@ -0,0 +1,29 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class $safeitemrootname$
+    Inherits DevComponents.DotNetBar.OfficeForm
+
+    'Form overrides dispose to clean up the component list.
+    <System.Diagnostics.DebuggerNonUserCode()> _
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+        Try
+            If disposing AndAlso components IsNot Nothing Then
+                components.Dispose()
+            End If
+        Finally
+            MyBase.Dispose(disposing)
+        End Try
+    End Sub
+
+    'Required by the Windows Form Designer
+    Private components As System.ComponentModel.IContainer
+
+    'NOTE: The following procedure is required by the Windows Form Designer
+    'It can be modified using the Windows Form Designer.  
+    'Do not modify it using the code editor.
+    <System.Diagnostics.DebuggerStepThrough()> _
+    Private Sub InitializeComponent()
+        components = New System.ComponentModel.Container
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.Text = "$safeitemrootname$"
+    End Sub
+End Class
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual Basic/Office2007Form/Form.vb b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual Basic/Office2007Form/Form.vb
new file mode 100644
index 00000000..9b12d76d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual Basic/Office2007Form/Form.vb	
@@ -0,0 +1,3 @@
+Public Class $safeitemrootname$
+
+End Class
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual Basic/Office2007Form/office2007form.vstemplate b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual Basic/Office2007Form/office2007form.vstemplate
new file mode 100644
index 00000000..1bf5f9f1
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual Basic/Office2007Form/office2007form.vstemplate	
@@ -0,0 +1,36 @@
+<VSTemplate Version="3.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name>Office Form</Name>
+    <Description>DotNetBar Office Style Form</Description>
+    <Icon Package="{164B10B9-B200-11D0-8C61-00A0C91E29D5}" ID="4527" />
+	<TemplateID>DevComponents.VB.Office2007Form</TemplateID>
+    <ProjectType>VisualBasic</ProjectType>
+    <SortOrder>11</SortOrder>
+    <DefaultName>Form.vb</DefaultName>
+	<RequiredFrameworkVersion>2.0</RequiredFrameworkVersion>
+    <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
+  </TemplateData>
+  <TemplateContent>
+        <References>
+            <Reference>
+                <Assembly>System</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+            <Reference>
+                <Assembly>System.Drawing</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+            <Reference>
+                <Assembly>System.Windows.Forms</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+			<Reference>
+                <Assembly>DevComponents.DotNetBar2</Assembly>
+                <URL>http://www.devcomponents.com</URL>
+            </Reference>
+        </References>
+
+    <ProjectItem ReplaceParameters="true" SubType="Form">Form.vb</ProjectItem>
+    <ProjectItem ReplaceParameters="true">Form.Designer.vb</ProjectItem>
+  </TemplateContent>
+</VSTemplate>
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual Basic/RibbonForm/DotNetBarRibbonForm.zip b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual Basic/RibbonForm/DotNetBarRibbonForm.zip
new file mode 100644
index 00000000..fbfe10c8
Binary files /dev/null and b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual Basic/RibbonForm/DotNetBarRibbonForm.zip differ
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual Basic/RibbonForm/Form.Designer.vb b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual Basic/RibbonForm/Form.Designer.vb
new file mode 100644
index 00000000..abbb321e
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual Basic/RibbonForm/Form.Designer.vb	
@@ -0,0 +1,28 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class $safeitemrootname$
+    Inherits DevComponents.DotNetBar.RibbonForm
+
+    'Form overrides dispose to clean up the component list.
+    <System.Diagnostics.DebuggerNonUserCode()> _
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+        Try
+            If disposing AndAlso components IsNot Nothing Then
+                components.Dispose()
+            End If
+        Finally
+            MyBase.Dispose(disposing)
+        End Try
+    End Sub
+
+    'Required by the Windows Form Designer
+    Private components As System.ComponentModel.IContainer
+
+    'NOTE: The following procedure is required by the Windows Form Designer
+    'It can be modified using the Windows Form Designer.  
+    'Do not modify it using the code editor.
+    <System.Diagnostics.DebuggerStepThrough()> _
+    Private Sub InitializeComponent()
+        components = New System.ComponentModel.Container
+        Me.Text = "$safeitemrootname$"
+    End Sub
+End Class
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual Basic/RibbonForm/Form.vb b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual Basic/RibbonForm/Form.vb
new file mode 100644
index 00000000..9b12d76d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual Basic/RibbonForm/Form.vb	
@@ -0,0 +1,3 @@
+Public Class $safeitemrootname$
+
+End Class
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual Basic/RibbonForm/ribbonform.vstemplate b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual Basic/RibbonForm/ribbonform.vstemplate
new file mode 100644
index 00000000..13e12ed8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual Basic/RibbonForm/ribbonform.vstemplate	
@@ -0,0 +1,36 @@
+<VSTemplate Version="3.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name>Ribbon Form</Name>
+    <Description>DotNetBar Ribbon Form</Description>
+    <Icon Package="{164B10B9-B200-11D0-8C61-00A0C91E29D5}" ID="4527" />
+	<TemplateID>DevComponents.VB.RibbonForm</TemplateID>
+    <ProjectType>VisualBasic</ProjectType>
+    <SortOrder>11</SortOrder>
+    <DefaultName>Form.vb</DefaultName>
+	<RequiredFrameworkVersion>2.0</RequiredFrameworkVersion>
+    <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
+  </TemplateData>
+  <TemplateContent>
+        <References>
+            <Reference>
+                <Assembly>System</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+            <Reference>
+                <Assembly>System.Drawing</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+            <Reference>
+                <Assembly>System.Windows.Forms</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+			<Reference>
+                <Assembly>DevComponents.DotNetBar2</Assembly>
+                <URL>http://www.devcomponents.com</URL>
+            </Reference>
+        </References>
+
+    <ProjectItem ReplaceParameters="true" SubType="Form">Form.vb</ProjectItem>
+    <ProjectItem ReplaceParameters="true">Form.Designer.vb</ProjectItem>
+  </TemplateContent>
+</VSTemplate>
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual Basic/TabbedForm/Form.Designer.vb b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual Basic/TabbedForm/Form.Designer.vb
new file mode 100644
index 00000000..7fcc4215
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual Basic/TabbedForm/Form.Designer.vb	
@@ -0,0 +1,176 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class $safeitemrootname$
+    Inherits DevComponents.DotNetBar.Controls.TabParentForm
+
+    'Form overrides dispose to clean up the component list.
+    <System.Diagnostics.DebuggerNonUserCode()> _
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+        Try
+            If disposing AndAlso components IsNot Nothing Then
+                components.Dispose()
+            End If
+        Finally
+            MyBase.Dispose(disposing)
+        End Try
+    End Sub
+
+    'Required by the Windows Form Designer
+    Private components As System.ComponentModel.IContainer
+
+    'NOTE: The following procedure is required by the Windows Form Designer
+    'It can be modified using the Windows Form Designer.  
+    'Do not modify it using the code editor.
+    <System.Diagnostics.DebuggerStepThrough()> _
+    Private Sub InitializeComponent()
+        Me.TabFormControl1 = New DevComponents.DotNetBar.Controls.TabFormControl()
+        Me.TabFormPanel1 = New DevComponents.DotNetBar.Controls.TabFormPanel()
+        Me.TabFormPanel2 = New DevComponents.DotNetBar.Controls.TabFormPanel()
+        Me.TabFormItem1 = New DevComponents.DotNetBar.Controls.TabFormItem()
+        Me.TabFormItem2 = New DevComponents.DotNetBar.Controls.TabFormItem()
+        Me.Label1 = New System.Windows.Forms.Label()
+        Me.Label2 = New System.Windows.Forms.Label()
+        Me.TabFormControl1.SuspendLayout
+        Me.TabFormPanel1.SuspendLayout
+        Me.TabFormPanel2.SuspendLayout
+        Me.SuspendLayout
+        '
+        'TabFormControl1
+        '
+        Me.TabFormControl1.BackColor = System.Drawing.Color.White
+        '
+        '
+        '
+        Me.TabFormControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        Me.TabFormControl1.Controls.Add(Me.TabFormPanel1)
+        Me.TabFormControl1.Controls.Add(Me.TabFormPanel2)
+        Me.TabFormControl1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.TabFormControl1.ForeColor = System.Drawing.Color.Black
+        Me.TabFormControl1.Items.AddRange(New DevComponents.DotNetBar.BaseItem() {Me.TabFormItem1, Me.TabFormItem2})
+        Me.TabFormControl1.Location = New System.Drawing.Point(1, 1)
+        Me.TabFormControl1.Name = "TabFormControl1"
+        Me.TabFormControl1.Size = New System.Drawing.Size(444, 311)
+        Me.TabFormControl1.SystemText.MaximizeRibbonText = "&Maximize the Ribbon"
+        Me.TabFormControl1.SystemText.MinimizeRibbonText = "Mi&nimize the Ribbon"
+        Me.TabFormControl1.SystemText.QatAddItemText = "&Add to Quick Access Toolbar"
+        Me.TabFormControl1.SystemText.QatCustomizeMenuLabel = "<b>Customize Quick Access Toolbar</b>"
+        Me.TabFormControl1.SystemText.QatCustomizeText = "&Customize Quick Access Toolbar..."
+        Me.TabFormControl1.SystemText.QatDialogAddButton = "&Add >>"
+        Me.TabFormControl1.SystemText.QatDialogCancelButton = "Cancel"
+        Me.TabFormControl1.SystemText.QatDialogCaption = "Customize Quick Access Toolbar"
+        Me.TabFormControl1.SystemText.QatDialogCategoriesLabel = "&Choose commands from:"
+        Me.TabFormControl1.SystemText.QatDialogOkButton = "OK"
+        Me.TabFormControl1.SystemText.QatDialogPlacementCheckbox = "&Place Quick Access Toolbar below the Ribbon"
+        Me.TabFormControl1.SystemText.QatDialogRemoveButton = "&Remove"
+        Me.TabFormControl1.SystemText.QatPlaceAboveRibbonText = "&Place Quick Access Toolbar above the Ribbon"
+        Me.TabFormControl1.SystemText.QatPlaceBelowRibbonText = "&Place Quick Access Toolbar below the Ribbon"
+        Me.TabFormControl1.SystemText.QatRemoveItemText = "&Remove from Quick Access Toolbar"
+        Me.TabFormControl1.TabIndex = 0
+        Me.TabFormControl1.TabStripFont = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+        Me.TabFormControl1.Text = "TabFormControl1"
+        '
+        'TabFormPanel1
+        '
+        Me.TabFormPanel1.Controls.Add(Me.Label1)
+        Me.TabFormPanel1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.TabFormPanel1.Location = New System.Drawing.Point(0, 28)
+        Me.TabFormPanel1.Name = "TabFormPanel1"
+        Me.TabFormPanel1.Padding = New System.Windows.Forms.Padding(3, 0, 3, 3)
+        Me.TabFormPanel1.Size = New System.Drawing.Size(444, 283)
+        '
+        '
+        '
+        Me.TabFormPanel1.Style.Class = "TabFormPanel"
+        Me.TabFormPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        '
+        '
+        '
+        Me.TabFormPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        '
+        '
+        '
+        Me.TabFormPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        Me.TabFormPanel1.TabIndex = 1
+        '
+        'TabFormPanel2
+        '
+        Me.TabFormPanel2.Controls.Add(Me.Label2)
+        Me.TabFormPanel2.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.TabFormPanel2.Location = New System.Drawing.Point(0, 28)
+        Me.TabFormPanel2.Name = "TabFormPanel2"
+        Me.TabFormPanel2.Padding = New System.Windows.Forms.Padding(3, 0, 3, 3)
+        Me.TabFormPanel2.Size = New System.Drawing.Size(444, 283)
+        '
+        '
+        '
+        Me.TabFormPanel2.Style.Class = "TabFormPanel"
+        Me.TabFormPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        '
+        '
+        '
+        Me.TabFormPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        '
+        '
+        '
+        Me.TabFormPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        Me.TabFormPanel2.TabIndex = 2
+        Me.TabFormPanel2.Visible = false
+        '
+        'TabFormItem1
+        '
+        Me.TabFormItem1.Checked = true
+        Me.TabFormItem1.Name = "TabFormItem1"
+        Me.TabFormItem1.Panel = Me.TabFormPanel1
+        Me.TabFormItem1.Text = "Document 1"
+        '
+        'TabFormItem2
+        '
+        Me.TabFormItem2.Name = "TabFormItem2"
+        Me.TabFormItem2.Panel = Me.TabFormPanel2
+        Me.TabFormItem2.Text = "Document 2"
+        '
+        'Label1
+        '
+        Me.Label1.AutoSize = true
+        Me.Label1.BackColor = System.Drawing.Color.Transparent
+        Me.Label1.Location = New System.Drawing.Point(155, 127)
+        Me.Label1.Name = "Label1"
+        Me.Label1.Size = New System.Drawing.Size(101, 13)
+        Me.Label1.TabIndex = 0
+        Me.Label1.Text = "Your content here..."
+        '
+        'Label2
+        '
+        Me.Label2.AutoSize = true
+        Me.Label2.BackColor = System.Drawing.Color.Transparent
+        Me.Label2.Location = New System.Drawing.Point(172, 135)
+        Me.Label2.Name = "Label2"
+        Me.Label2.Size = New System.Drawing.Size(101, 13)
+        Me.Label2.TabIndex = 1
+        Me.Label2.Text = "Your content here..."
+        '
+        '$safeitemrootname$
+        '
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.ClientSize = New System.Drawing.Size(446, 313)
+        Me.Controls.Add(Me.TabFormControl1)
+        Me.Name = "$safeitemrootname$"
+        Me.Text = "DotNetBar Tabbed Form"
+        Me.TabFormControl1.ResumeLayout(false)
+        Me.TabFormControl1.PerformLayout
+        Me.TabFormPanel1.ResumeLayout(false)
+        Me.TabFormPanel1.PerformLayout
+        Me.TabFormPanel2.ResumeLayout(false)
+        Me.TabFormPanel2.PerformLayout
+        Me.ResumeLayout(false)
+
+    End Sub
+    Friend WithEvents TabFormControl1 As DevComponents.DotNetBar.Controls.TabFormControl
+    Friend WithEvents TabFormPanel1 As DevComponents.DotNetBar.Controls.TabFormPanel
+    Friend WithEvents TabFormPanel2 As DevComponents.DotNetBar.Controls.TabFormPanel
+    Friend WithEvents TabFormItem1 As DevComponents.DotNetBar.Controls.TabFormItem
+    Friend WithEvents TabFormItem2 As DevComponents.DotNetBar.Controls.TabFormItem
+    Friend WithEvents Label1 As System.Windows.Forms.Label
+    Friend WithEvents Label2 As System.Windows.Forms.Label
+
+End Class
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual Basic/TabbedForm/Form.resx b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual Basic/TabbedForm/Form.resx
new file mode 100644
index 00000000..19dc0dd8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual Basic/TabbedForm/Form.resx	
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual Basic/TabbedForm/Form.vb b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual Basic/TabbedForm/Form.vb
new file mode 100644
index 00000000..64eb4330
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual Basic/TabbedForm/Form.vb	
@@ -0,0 +1,3 @@
+Public Class $safeitemrootname$
+
+End Class
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual Basic/TabbedForm/TabbedForm.zip b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual Basic/TabbedForm/TabbedForm.zip
new file mode 100644
index 00000000..66f60672
Binary files /dev/null and b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual Basic/TabbedForm/TabbedForm.zip differ
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual Basic/TabbedForm/tabbedform.vstemplate b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual Basic/TabbedForm/tabbedform.vstemplate
new file mode 100644
index 00000000..865bb1b6
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual Basic/TabbedForm/tabbedform.vstemplate	
@@ -0,0 +1,36 @@
+<VSTemplate Version="3.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name>Tabbed Form</Name>
+    <Description>DotNetBar Tabbed Form</Description>
+    <Icon Package="{164B10B9-B200-11D0-8C61-00A0C91E29D5}" ID="4527" />
+	<TemplateID>DevComponents.VB.TabbedForm</TemplateID>
+    <ProjectType>VisualBasic</ProjectType>
+    <SortOrder>12</SortOrder>
+    <DefaultName>Form.vb</DefaultName>
+	<RequiredFrameworkVersion>2.0</RequiredFrameworkVersion>
+    <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
+  </TemplateData>
+  <TemplateContent>
+        <References>
+            <Reference>
+                <Assembly>System</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+            <Reference>
+                <Assembly>System.Drawing</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+            <Reference>
+                <Assembly>System.Windows.Forms</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+			<Reference>
+                <Assembly>DevComponents.DotNetBar2</Assembly>
+                <URL>http://www.devcomponents.com</URL>
+            </Reference>
+        </References>
+
+    <ProjectItem ReplaceParameters="true" SubType="Form">Form.vb</ProjectItem>
+    <ProjectItem ReplaceParameters="true">Form.Designer.vb</ProjectItem>
+  </TemplateContent>
+</VSTemplate>
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual C#/MetroAppForm/MetroAppForm.zip b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual C#/MetroAppForm/MetroAppForm.zip
new file mode 100644
index 00000000..e72433e8
Binary files /dev/null and b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual C#/MetroAppForm/MetroAppForm.zip differ
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual C#/MetroForm/MetroForm.zip b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual C#/MetroForm/MetroForm.zip
new file mode 100644
index 00000000..b98a2499
Binary files /dev/null and b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual C#/MetroForm/MetroForm.zip differ
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual C#/MetroForm/form.cs b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual C#/MetroForm/form.cs
new file mode 100644
index 00000000..11692b62
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual C#/MetroForm/form.cs	
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+using DevComponents.DotNetBar;
+
+namespace $rootnamespace$
+{
+	public partial class $safeitemrootname$: DevComponents.DotNetBar.Metro.MetroForm
+	{
+		public $safeitemrootname$()
+		{
+			InitializeComponent();
+		}
+	}
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual C#/MetroForm/form.designer.cs b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual C#/MetroForm/form.designer.cs
new file mode 100644
index 00000000..3a1a31d0
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual C#/MetroForm/form.designer.cs	
@@ -0,0 +1,42 @@
+namespace $rootnamespace$
+{
+	partial class $safeitemrootname$
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if (disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form 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.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(625, 396);
+            this.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.Name = "$safeitemrootname$";
+			this.Text = "MetroForm";
+		}
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual C#/MetroForm/metroform.vstemplate b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual C#/MetroForm/metroform.vstemplate
new file mode 100644
index 00000000..3961f06f
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual C#/MetroForm/metroform.vstemplate	
@@ -0,0 +1,38 @@
+<VSTemplate Version="3.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name>Metro Form</Name>
+    <Description>DotNetBar Metro Form</Description>
+    <Icon Package="{FAE04EC1-301F-11d3-BF4B-00C04F79EFBC}" ID="4535" />
+	<TemplateID>DevComponents.CS.MetroForm</TemplateID>
+    <ProjectType>CSharp</ProjectType>
+    <SortOrder>41</SortOrder>
+    <DefaultName>Form.cs</DefaultName>
+	<RequiredFrameworkVersion>2.0</RequiredFrameworkVersion>
+    <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
+  </TemplateData>
+  <TemplateContent>
+		<References>
+			<Reference>
+				<Assembly>System</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Data</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Drawing</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Windows.Forms</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Xml</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>DevComponents.DotNetBar2</Assembly>
+			</Reference>
+		</References>
+
+    <ProjectItem ReplaceParameters="true" SubType="Form">Form.cs</ProjectItem>
+    <ProjectItem ReplaceParameters="true">Form.Designer.cs</ProjectItem>
+  </TemplateContent>
+</VSTemplate>
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual C#/Office2007Form/DotNetBarOffice2007Form.zip b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual C#/Office2007Form/DotNetBarOffice2007Form.zip
new file mode 100644
index 00000000..e5924f7c
Binary files /dev/null and b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual C#/Office2007Form/DotNetBarOffice2007Form.zip differ
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual C#/Office2007Form/form.cs b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual C#/Office2007Form/form.cs
new file mode 100644
index 00000000..8e61cb27
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual C#/Office2007Form/form.cs	
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+using DevComponents.DotNetBar;
+
+namespace $rootnamespace$
+{
+	public partial class $safeitemrootname$: DevComponents.DotNetBar.OfficeForm
+	{
+		public $safeitemrootname$()
+		{
+			InitializeComponent();
+		}
+	}
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual C#/Office2007Form/form.designer.cs b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual C#/Office2007Form/form.designer.cs
new file mode 100644
index 00000000..6bc0536d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual C#/Office2007Form/form.designer.cs	
@@ -0,0 +1,37 @@
+namespace $rootnamespace$
+{
+	partial class $safeitemrootname$
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if (disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form 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.Text = "$safeitemrootname$";
+		}
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual C#/Office2007Form/office2007form.vstemplate b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual C#/Office2007Form/office2007form.vstemplate
new file mode 100644
index 00000000..f2bf2593
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual C#/Office2007Form/office2007form.vstemplate	
@@ -0,0 +1,38 @@
+<VSTemplate Version="3.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name>Office Form</Name>
+    <Description>DotNetBar Office Style Form</Description>
+    <Icon Package="{FAE04EC1-301F-11d3-BF4B-00C04F79EFBC}" ID="4535" />
+	<TemplateID>DevComponents.CS.Office2007Form</TemplateID>
+    <ProjectType>CSharp</ProjectType>
+    <SortOrder>41</SortOrder>
+    <DefaultName>Form.cs</DefaultName>
+	<RequiredFrameworkVersion>2.0</RequiredFrameworkVersion>
+    <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
+  </TemplateData>
+  <TemplateContent>
+		<References>
+			<Reference>
+				<Assembly>System</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Data</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Drawing</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Windows.Forms</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Xml</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>DevComponents.DotNetBar2</Assembly>
+			</Reference>
+		</References>
+
+    <ProjectItem ReplaceParameters="true" SubType="Form">Form.cs</ProjectItem>
+    <ProjectItem ReplaceParameters="true">Form.Designer.cs</ProjectItem>
+  </TemplateContent>
+</VSTemplate>
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual C#/RibbonForm/DotNetBarRibbonForm.zip b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual C#/RibbonForm/DotNetBarRibbonForm.zip
new file mode 100644
index 00000000..33693820
Binary files /dev/null and b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual C#/RibbonForm/DotNetBarRibbonForm.zip differ
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual C#/RibbonForm/form.cs b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual C#/RibbonForm/form.cs
new file mode 100644
index 00000000..bfd40b47
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual C#/RibbonForm/form.cs	
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+using DevComponents.DotNetBar;
+
+namespace $rootnamespace$
+{
+	public partial class $safeitemrootname$: DevComponents.DotNetBar.RibbonForm
+	{
+		public $safeitemrootname$()
+		{
+			InitializeComponent();
+		}
+	}
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual C#/RibbonForm/form.designer.cs b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual C#/RibbonForm/form.designer.cs
new file mode 100644
index 00000000..6bc0536d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual C#/RibbonForm/form.designer.cs	
@@ -0,0 +1,37 @@
+namespace $rootnamespace$
+{
+	partial class $safeitemrootname$
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if (disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form 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.Text = "$safeitemrootname$";
+		}
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual C#/RibbonForm/ribbonform.vstemplate b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual C#/RibbonForm/ribbonform.vstemplate
new file mode 100644
index 00000000..a0273570
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual C#/RibbonForm/ribbonform.vstemplate	
@@ -0,0 +1,38 @@
+<VSTemplate Version="3.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name>Ribbon Form</Name>
+    <Description>DotNetBar Ribbon Form</Description>
+    <Icon Package="{FAE04EC1-301F-11d3-BF4B-00C04F79EFBC}" ID="4535" />
+	<TemplateID>DevComponents.CS.RibbonForm</TemplateID>
+    <ProjectType>CSharp</ProjectType>
+    <SortOrder>41</SortOrder>
+	<RequiredFrameworkVersion>2.0</RequiredFrameworkVersion>
+    <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
+    <DefaultName>RibbonForm.cs</DefaultName>
+  </TemplateData>
+  <TemplateContent>
+		<References>
+			<Reference>
+				<Assembly>System</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Data</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Drawing</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Windows.Forms</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Xml</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>DevComponents.DotNetBar2</Assembly>
+			</Reference>
+		</References>
+
+    <ProjectItem ReplaceParameters="true" SubType="Form">Form.cs</ProjectItem>
+    <ProjectItem ReplaceParameters="true">Form.Designer.cs</ProjectItem>
+  </TemplateContent>
+</VSTemplate>
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual C#/TabbedForm/Form.Designer.cs b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual C#/TabbedForm/Form.Designer.cs
new file mode 100644
index 00000000..6a057d83
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual C#/TabbedForm/Form.Designer.cs	
@@ -0,0 +1,175 @@
+namespace $rootnamespace$
+{
+    partial class $safeitemrootname$
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form 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.tabFormControl1 = new DevComponents.DotNetBar.Controls.TabFormControl();
+            this.tabFormPanel1 = new DevComponents.DotNetBar.Controls.TabFormPanel();
+            this.tabFormPanel2 = new DevComponents.DotNetBar.Controls.TabFormPanel();
+            this.tabFormItem1 = new DevComponents.DotNetBar.Controls.TabFormItem();
+            this.tabFormItem2 = new DevComponents.DotNetBar.Controls.TabFormItem();
+            this.label1 = new System.Windows.Forms.Label();
+            this.label2 = new System.Windows.Forms.Label();
+            this.tabFormControl1.SuspendLayout();
+            this.tabFormPanel1.SuspendLayout();
+            this.tabFormPanel2.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // tabFormControl1
+            // 
+            this.tabFormControl1.BackColor = System.Drawing.Color.White;
+            // 
+            // 
+            // 
+            this.tabFormControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.tabFormControl1.Controls.Add(this.tabFormPanel1);
+            this.tabFormControl1.Controls.Add(this.tabFormPanel2);
+            this.tabFormControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tabFormControl1.ForeColor = System.Drawing.Color.Black;
+            this.tabFormControl1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+            this.tabFormItem1,
+            this.tabFormItem2});
+            this.tabFormControl1.Location = new System.Drawing.Point(1, 1);
+            this.tabFormControl1.Name = "tabFormControl1";
+            this.tabFormControl1.Size = new System.Drawing.Size(614, 412);
+            this.tabFormControl1.TabIndex = 0;
+            this.tabFormControl1.TabStripFont = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.tabFormControl1.Text = "tabFormControl1";
+            // 
+            // tabFormPanel1
+            // 
+            this.tabFormPanel1.Controls.Add(this.label1);
+            this.tabFormPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tabFormPanel1.Location = new System.Drawing.Point(0, 28);
+            this.tabFormPanel1.Name = "tabFormPanel1";
+            this.tabFormPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3);
+            this.tabFormPanel1.Size = new System.Drawing.Size(614, 384);
+            // 
+            // 
+            // 
+            this.tabFormPanel1.Style.Class = "TabFormPanel";
+            this.tabFormPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.tabFormPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.tabFormPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.tabFormPanel1.TabIndex = 1;
+            // 
+            // tabFormPanel2
+            // 
+            this.tabFormPanel2.Controls.Add(this.label2);
+            this.tabFormPanel2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tabFormPanel2.Location = new System.Drawing.Point(0, 28);
+            this.tabFormPanel2.Name = "tabFormPanel2";
+            this.tabFormPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3);
+            this.tabFormPanel2.Size = new System.Drawing.Size(614, 384);
+            // 
+            // 
+            // 
+            this.tabFormPanel2.Style.Class = "TabFormPanel";
+            this.tabFormPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.tabFormPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.tabFormPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.tabFormPanel2.TabIndex = 2;
+            this.tabFormPanel2.Visible = false;
+            // 
+            // tabFormItem1
+            // 
+            this.tabFormItem1.Checked = true;
+            this.tabFormItem1.Name = "tabFormItem1";
+            this.tabFormItem1.Panel = this.tabFormPanel1;
+            this.tabFormItem1.Text = "Document 1";
+            // 
+            // tabFormItem2
+            // 
+            this.tabFormItem2.Name = "tabFormItem2";
+            this.tabFormItem2.Panel = this.tabFormPanel2;
+            this.tabFormItem2.Text = "Document 2";
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.BackColor = System.Drawing.Color.Transparent;
+            this.label1.Location = new System.Drawing.Point(241, 175);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(101, 13);
+            this.label1.TabIndex = 0;
+            this.label1.Text = "Your content here...";
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.BackColor = System.Drawing.Color.Transparent;
+            this.label2.Location = new System.Drawing.Point(257, 186);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(101, 13);
+            this.label2.TabIndex = 1;
+            this.label2.Text = "Your content here...";
+            // 
+            // $safeitemrootname$
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(616, 414);
+            this.Controls.Add(this.tabFormControl1);
+            this.ForeColor = System.Drawing.Color.Black;
+            this.Name = "$safeitemrootname$";
+            this.Text = "DotNetBar Tabbed App Form";
+            this.tabFormControl1.ResumeLayout(false);
+            this.tabFormControl1.PerformLayout();
+            this.tabFormPanel1.ResumeLayout(false);
+            this.tabFormPanel1.PerformLayout();
+            this.tabFormPanel2.ResumeLayout(false);
+            this.tabFormPanel2.PerformLayout();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private DevComponents.DotNetBar.Controls.TabFormControl tabFormControl1;
+        private DevComponents.DotNetBar.Controls.TabFormPanel tabFormPanel1;
+        private DevComponents.DotNetBar.Controls.TabFormPanel tabFormPanel2;
+        private DevComponents.DotNetBar.Controls.TabFormItem tabFormItem1;
+        private DevComponents.DotNetBar.Controls.TabFormItem tabFormItem2;
+		private System.Windows.Forms.Label label1;
+		private System.Windows.Forms.Label label2;
+
+    }
+}
+
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual C#/TabbedForm/Form.cs b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual C#/TabbedForm/Form.cs
new file mode 100644
index 00000000..47530f09
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual C#/TabbedForm/Form.cs	
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+
+namespace $rootnamespace$
+{
+    public partial class $safeitemrootname$ : DevComponents.DotNetBar.Controls.TabParentForm
+    {
+        public $safeitemrootname$()
+        {
+            InitializeComponent();
+        }
+    }
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual C#/TabbedForm/Form.resx b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual C#/TabbedForm/Form.resx
new file mode 100644
index 00000000..19dc0dd8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual C#/TabbedForm/Form.resx	
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual C#/TabbedForm/TabbedForm.zip b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual C#/TabbedForm/TabbedForm.zip
new file mode 100644
index 00000000..7cd94f8b
Binary files /dev/null and b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual C#/TabbedForm/TabbedForm.zip differ
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual C#/TabbedForm/tabbedform.vstemplate b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual C#/TabbedForm/tabbedform.vstemplate
new file mode 100644
index 00000000..c22546e3
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2005/Visual C#/TabbedForm/tabbedform.vstemplate	
@@ -0,0 +1,38 @@
+<VSTemplate Version="3.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name>Tabbed Form</Name>
+    <Description>DotNetBar Tabbed Form</Description>
+    <Icon Package="{FAE04EC1-301F-11d3-BF4B-00C04F79EFBC}" ID="4535" />
+	<TemplateID>DevComponents.CS.TabbedForm</TemplateID>
+    <ProjectType>CSharp</ProjectType>
+    <SortOrder>41</SortOrder>
+    <DefaultName>Form.cs</DefaultName>
+	<RequiredFrameworkVersion>2.0</RequiredFrameworkVersion>
+    <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
+  </TemplateData>
+  <TemplateContent>
+		<References>
+			<Reference>
+				<Assembly>System</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Data</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Drawing</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Windows.Forms</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Xml</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>DevComponents.DotNetBar2</Assembly>
+			</Reference>
+		</References>
+
+    <ProjectItem ReplaceParameters="true" SubType="Form">Form.cs</ProjectItem>
+    <ProjectItem ReplaceParameters="true">Form.Designer.cs</ProjectItem>
+  </TemplateContent>
+</VSTemplate>
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual Basic/MetroAppForm/Form.Designer.vb b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual Basic/MetroAppForm/Form.Designer.vb
new file mode 100644
index 00000000..913e8b3c
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual Basic/MetroAppForm/Form.Designer.vb	
@@ -0,0 +1,217 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class $safeitemrootname$
+    Inherits DevComponents.DotNetBar.Metro.MetroAppForm
+
+    'Form overrides dispose to clean up the component list.
+    <System.Diagnostics.DebuggerNonUserCode()> _
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+        Try
+            If disposing AndAlso components IsNot Nothing Then
+                components.Dispose()
+            End If
+        Finally
+            MyBase.Dispose(disposing)
+        End Try
+    End Sub
+
+    'Required by the Windows Form Designer
+    Private components As System.ComponentModel.IContainer
+
+    'NOTE: The following procedure is required by the Windows Form Designer
+    'It can be modified using the Windows Form Designer.  
+    'Do not modify it using the code editor.
+    <System.Diagnostics.DebuggerStepThrough()> _
+    Private Sub InitializeComponent()
+        Me.components = New System.ComponentModel.Container
+        Me.MetroShell1 = New DevComponents.DotNetBar.Metro.MetroShell
+        Me.MetroTabItem1 = New DevComponents.DotNetBar.Metro.MetroTabItem
+        Me.MetroTabPanel1 = New DevComponents.DotNetBar.Metro.MetroTabPanel
+        Me.MetroTabItem2 = New DevComponents.DotNetBar.Metro.MetroTabItem
+        Me.MetroTabPanel2 = New DevComponents.DotNetBar.Metro.MetroTabPanel
+        Me.StyleManager1 = New DevComponents.DotNetBar.StyleManager(Me.components)
+        Me.QatCustomizeItem1 = New DevComponents.DotNetBar.QatCustomizeItem
+        Me.MetroAppButton1 = New DevComponents.DotNetBar.Metro.MetroAppButton
+        Me.ButtonItem1 = New DevComponents.DotNetBar.ButtonItem
+        Me.MetroStatusBar1 = New DevComponents.DotNetBar.Metro.MetroStatusBar
+        Me.LabelItem1 = New DevComponents.DotNetBar.LabelItem
+        Me.MetroShell1.SuspendLayout()
+        Me.SuspendLayout()
+        '
+        'MetroShell1
+        '
+        Me.MetroShell1.BackColor = System.Drawing.Color.White
+        '
+        '
+        '
+        Me.MetroShell1.BackgroundStyle.Class = ""
+        Me.MetroShell1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        Me.MetroShell1.CaptionVisible = True
+        Me.MetroShell1.Controls.Add(Me.MetroTabPanel1)
+        Me.MetroShell1.Controls.Add(Me.MetroTabPanel2)
+        Me.MetroShell1.Dock = System.Windows.Forms.DockStyle.Top
+        Me.MetroShell1.ForeColor = System.Drawing.Color.Black
+        Me.MetroShell1.HelpButtonText = Nothing
+        Me.MetroShell1.Items.AddRange(New DevComponents.DotNetBar.BaseItem() {Me.MetroAppButton1, Me.MetroTabItem1, Me.MetroTabItem2})
+        Me.MetroShell1.KeyTipsFont = New System.Drawing.Font("Tahoma", 7.0!)
+        Me.MetroShell1.Location = New System.Drawing.Point(0, 1)
+        Me.MetroShell1.Name = "MetroShell1"
+        Me.MetroShell1.QuickToolbarItems.AddRange(New DevComponents.DotNetBar.BaseItem() {Me.ButtonItem1, Me.QatCustomizeItem1})
+        Me.MetroShell1.Size = New System.Drawing.Size(652, 234)
+        Me.MetroShell1.SystemText.MaximizeRibbonText = "&Maximize the Ribbon"
+        Me.MetroShell1.SystemText.MinimizeRibbonText = "Mi&nimize the Ribbon"
+        Me.MetroShell1.SystemText.QatAddItemText = "&Add to Quick Access Toolbar"
+        Me.MetroShell1.SystemText.QatCustomizeMenuLabel = "<b>Customize Quick Access Toolbar</b>"
+        Me.MetroShell1.SystemText.QatCustomizeText = "&Customize Quick Access Toolbar..."
+        Me.MetroShell1.SystemText.QatDialogAddButton = "&Add >>"
+        Me.MetroShell1.SystemText.QatDialogCancelButton = "Cancel"
+        Me.MetroShell1.SystemText.QatDialogCaption = "Customize Quick Access Toolbar"
+        Me.MetroShell1.SystemText.QatDialogCategoriesLabel = "&Choose commands from:"
+        Me.MetroShell1.SystemText.QatDialogOkButton = "OK"
+        Me.MetroShell1.SystemText.QatDialogPlacementCheckbox = "&Place Quick Access Toolbar below the Ribbon"
+        Me.MetroShell1.SystemText.QatDialogRemoveButton = "&Remove"
+        Me.MetroShell1.SystemText.QatPlaceAboveRibbonText = "&Place Quick Access Toolbar above the Ribbon"
+        Me.MetroShell1.SystemText.QatPlaceBelowRibbonText = "&Place Quick Access Toolbar below the Ribbon"
+        Me.MetroShell1.SystemText.QatRemoveItemText = "&Remove from Quick Access Toolbar"
+        Me.MetroShell1.TabIndex = 0
+        Me.MetroShell1.TabStripFont = New System.Drawing.Font("Segoe UI", 10.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.MetroShell1.Text = "MetroShell1"
+        '
+        'MetroTabItem1
+        '
+        Me.MetroTabItem1.Checked = True
+        Me.MetroTabItem1.Name = "MetroTabItem1"
+        Me.MetroTabItem1.Panel = Me.MetroTabPanel1
+        Me.MetroTabItem1.Text = "&HOME"
+        '
+        'MetroTabPanel1
+        '
+        Me.MetroTabPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled
+        Me.MetroTabPanel1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.MetroTabPanel1.Location = New System.Drawing.Point(0, 51)
+        Me.MetroTabPanel1.Name = "MetroTabPanel1"
+        Me.MetroTabPanel1.Padding = New System.Windows.Forms.Padding(3, 0, 3, 3)
+        Me.MetroTabPanel1.Size = New System.Drawing.Size(652, 183)
+        '
+        '
+        '
+        Me.MetroTabPanel1.Style.Class = ""
+        Me.MetroTabPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        '
+        '
+        '
+        Me.MetroTabPanel1.StyleMouseDown.Class = ""
+        Me.MetroTabPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        '
+        '
+        '
+        Me.MetroTabPanel1.StyleMouseOver.Class = ""
+        Me.MetroTabPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        Me.MetroTabPanel1.TabIndex = 1
+        '
+        'MetroTabItem2
+        '
+        Me.MetroTabItem2.Name = "MetroTabItem2"
+        Me.MetroTabItem2.Panel = Me.MetroTabPanel2
+        Me.MetroTabItem2.Text = "&VIEW"
+        '
+        'MetroTabPanel2
+        '
+        Me.MetroTabPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled
+        Me.MetroTabPanel2.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.MetroTabPanel2.Location = New System.Drawing.Point(0, 0)
+        Me.MetroTabPanel2.Name = "MetroTabPanel2"
+        Me.MetroTabPanel2.Padding = New System.Windows.Forms.Padding(3, 0, 3, 3)
+        Me.MetroTabPanel2.Size = New System.Drawing.Size(200, 100)
+        '
+        '
+        '
+        Me.MetroTabPanel2.Style.Class = ""
+        Me.MetroTabPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        '
+        '
+        '
+        Me.MetroTabPanel2.StyleMouseDown.Class = ""
+        Me.MetroTabPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        '
+        '
+        '
+        Me.MetroTabPanel2.StyleMouseOver.Class = ""
+        Me.MetroTabPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        Me.MetroTabPanel2.TabIndex = 2
+        '
+        'StyleManager1
+        '
+        Me.StyleManager1.ManagerStyle = DevComponents.DotNetBar.eStyle.Metro
+        Me.StyleManager1.MetroColorParameters = New DevComponents.DotNetBar.Metro.ColorTables.MetroColorGeneratorParameters(System.Drawing.Color.White, System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(163, Byte), Integer), CType(CType(26, Byte), Integer)))
+        '
+        'QatCustomizeItem1
+        '
+        Me.QatCustomizeItem1.BeginGroup = True
+        Me.QatCustomizeItem1.Name = "QatCustomizeItem1"
+        '
+        'MetroAppButton1
+        '
+        Me.MetroAppButton1.AutoExpandOnClick = True
+        Me.MetroAppButton1.CanCustomize = False
+        Me.MetroAppButton1.ImageFixedSize = New System.Drawing.Size(16, 16)
+        Me.MetroAppButton1.ImagePaddingHorizontal = 0
+        Me.MetroAppButton1.ImagePaddingVertical = 0
+        Me.MetroAppButton1.Name = "MetroAppButton1"
+        Me.MetroAppButton1.ShowSubItems = False
+        Me.MetroAppButton1.Text = "&File"
+        '
+        'ButtonItem1
+        '
+        Me.ButtonItem1.Name = "ButtonItem1"
+        Me.ButtonItem1.Text = "ButtonItem1"
+        '
+        'MetroStatusBar1
+        '
+        '
+        '
+        '
+        Me.MetroStatusBar1.BackgroundStyle.Class = ""
+        Me.MetroStatusBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        Me.MetroStatusBar1.ContainerControlProcessDialogKey = True
+        Me.MetroStatusBar1.Dock = System.Windows.Forms.DockStyle.Bottom
+        Me.MetroStatusBar1.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.MetroStatusBar1.Items.AddRange(New DevComponents.DotNetBar.BaseItem() {Me.LabelItem1})
+        Me.MetroStatusBar1.Location = New System.Drawing.Point(0, 413)
+        Me.MetroStatusBar1.Name = "MetroStatusBar1"
+        Me.MetroStatusBar1.Size = New System.Drawing.Size(652, 22)
+        Me.MetroStatusBar1.TabIndex = 1
+        Me.MetroStatusBar1.Text = "MetroStatusBar1"
+        '
+        'LabelItem1
+        '
+        Me.LabelItem1.Name = "LabelItem1"
+        Me.LabelItem1.Text = "READY"
+        '
+        '$safeitemrootname$
+        '
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.ClientSize = New System.Drawing.Size(653, 436)
+        Me.Controls.Add(Me.MetroStatusBar1)
+        Me.Controls.Add(Me.MetroShell1)
+        Me.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Name = "$safeitemrootname$"
+        Me.Text = "DotNetBar Metro App Form"
+        Me.MetroShell1.ResumeLayout(False)
+        Me.MetroShell1.PerformLayout()
+        Me.ResumeLayout(False)
+
+    End Sub
+    Friend WithEvents MetroShell1 As DevComponents.DotNetBar.Metro.MetroShell
+    Friend WithEvents MetroTabPanel1 As DevComponents.DotNetBar.Metro.MetroTabPanel
+    Friend WithEvents MetroTabPanel2 As DevComponents.DotNetBar.Metro.MetroTabPanel
+    Friend WithEvents MetroAppButton1 As DevComponents.DotNetBar.Metro.MetroAppButton
+    Friend WithEvents MetroTabItem1 As DevComponents.DotNetBar.Metro.MetroTabItem
+    Friend WithEvents MetroTabItem2 As DevComponents.DotNetBar.Metro.MetroTabItem
+    Friend WithEvents ButtonItem1 As DevComponents.DotNetBar.ButtonItem
+    Friend WithEvents QatCustomizeItem1 As DevComponents.DotNetBar.QatCustomizeItem
+    Friend WithEvents StyleManager1 As DevComponents.DotNetBar.StyleManager
+    Friend WithEvents MetroStatusBar1 As DevComponents.DotNetBar.Metro.MetroStatusBar
+    Friend WithEvents LabelItem1 As DevComponents.DotNetBar.LabelItem
+
+End Class
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual Basic/MetroAppForm/Form.resx b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual Basic/MetroAppForm/Form.resx
new file mode 100644
index 00000000..998f01fd
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual Basic/MetroAppForm/Form.resx	
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="StyleManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual Basic/MetroAppForm/Form.vb b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual Basic/MetroAppForm/Form.vb
new file mode 100644
index 00000000..64eb4330
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual Basic/MetroAppForm/Form.vb	
@@ -0,0 +1,3 @@
+Public Class $safeitemrootname$
+
+End Class
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual Basic/MetroAppForm/MetroAppForm.zip b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual Basic/MetroAppForm/MetroAppForm.zip
new file mode 100644
index 00000000..e464b16b
Binary files /dev/null and b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual Basic/MetroAppForm/MetroAppForm.zip differ
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual Basic/MetroAppForm/metroappform.vstemplate b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual Basic/MetroAppForm/metroappform.vstemplate
new file mode 100644
index 00000000..9cbac33b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual Basic/MetroAppForm/metroappform.vstemplate	
@@ -0,0 +1,36 @@
+<VSTemplate Version="3.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name>Metro UI App Form</Name>
+    <Description>DotNetBar Metro Application Form</Description>
+    <Icon Package="{164B10B9-B200-11D0-8C61-00A0C91E29D5}" ID="4527" />
+	<TemplateID>DevComponents.VB.MetroAppForm</TemplateID>
+    <ProjectType>VisualBasic</ProjectType>
+    <SortOrder>11</SortOrder>
+    <DefaultName>Form.vb</DefaultName>
+	<RequiredFrameworkVersion>2.0</RequiredFrameworkVersion>
+    <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
+  </TemplateData>
+  <TemplateContent>
+        <References>
+            <Reference>
+                <Assembly>System</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+            <Reference>
+                <Assembly>System.Drawing</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+            <Reference>
+                <Assembly>System.Windows.Forms</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+			<Reference>
+                <Assembly>DevComponents.DotNetBar2</Assembly>
+                <URL>http://www.devcomponents.com</URL>
+            </Reference>
+        </References>
+
+    <ProjectItem ReplaceParameters="true" SubType="Form">Form.vb</ProjectItem>
+    <ProjectItem ReplaceParameters="true">Form.Designer.vb</ProjectItem>
+  </TemplateContent>
+</VSTemplate>
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual Basic/MetroForm/Form.Designer.vb b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual Basic/MetroForm/Form.Designer.vb
new file mode 100644
index 00000000..7d926fa4
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual Basic/MetroForm/Form.Designer.vb	
@@ -0,0 +1,33 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class $safeitemrootname$
+    Inherits DevComponents.DotNetBar.Metro.MetroForm
+
+    'Form overrides dispose to clean up the component list.
+    <System.Diagnostics.DebuggerNonUserCode()> _
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+        Try
+            If disposing AndAlso components IsNot Nothing Then
+                components.Dispose()
+            End If
+        Finally
+            MyBase.Dispose(disposing)
+        End Try
+    End Sub
+
+    'Required by the Windows Form Designer
+    Private components As System.ComponentModel.IContainer
+
+    'NOTE: The following procedure is required by the Windows Form Designer
+    'It can be modified using the Windows Form Designer.  
+    'Do not modify it using the code editor.
+    <System.Diagnostics.DebuggerStepThrough()> _
+    Private Sub InitializeComponent()
+        components = New System.ComponentModel.Container
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.ClientSize = New System.Drawing.Size(653, 436)
+		Me.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+		Me.Name = "$safeitemrootname$"
+        Me.Text = "MetroForm"
+    End Sub
+End Class
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual Basic/MetroForm/Form.vb b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual Basic/MetroForm/Form.vb
new file mode 100644
index 00000000..9b12d76d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual Basic/MetroForm/Form.vb	
@@ -0,0 +1,3 @@
+Public Class $safeitemrootname$
+
+End Class
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual Basic/MetroForm/MetroForm.zip b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual Basic/MetroForm/MetroForm.zip
new file mode 100644
index 00000000..1742cb89
Binary files /dev/null and b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual Basic/MetroForm/MetroForm.zip differ
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual Basic/MetroForm/metroform.vstemplate b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual Basic/MetroForm/metroform.vstemplate
new file mode 100644
index 00000000..62cc1786
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual Basic/MetroForm/metroform.vstemplate	
@@ -0,0 +1,36 @@
+<VSTemplate Version="3.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name>Metro Form</Name>
+    <Description>DotNetBar Metro Form</Description>
+    <Icon Package="{164B10B9-B200-11D0-8C61-00A0C91E29D5}" ID="4527" />
+	<TemplateID>DevComponents.VB.MetroForm</TemplateID>
+    <ProjectType>VisualBasic</ProjectType>
+    <SortOrder>11</SortOrder>
+    <DefaultName>Form.vb</DefaultName>
+	<RequiredFrameworkVersion>2.0</RequiredFrameworkVersion>
+    <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
+  </TemplateData>
+  <TemplateContent>
+        <References>
+            <Reference>
+                <Assembly>System</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+            <Reference>
+                <Assembly>System.Drawing</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+            <Reference>
+                <Assembly>System.Windows.Forms</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+			<Reference>
+                <Assembly>DevComponents.DotNetBar2</Assembly>
+                <URL>http://www.devcomponents.com</URL>
+            </Reference>
+        </References>
+
+    <ProjectItem ReplaceParameters="true" SubType="Form">Form.vb</ProjectItem>
+    <ProjectItem ReplaceParameters="true">Form.Designer.vb</ProjectItem>
+  </TemplateContent>
+</VSTemplate>
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual Basic/Office2007Form/DotNetBarOffice2007Form.zip b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual Basic/Office2007Form/DotNetBarOffice2007Form.zip
new file mode 100644
index 00000000..bbbe8da0
Binary files /dev/null and b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual Basic/Office2007Form/DotNetBarOffice2007Form.zip differ
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual Basic/Office2007Form/Form.Designer.vb b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual Basic/Office2007Form/Form.Designer.vb
new file mode 100644
index 00000000..2f6f306f
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual Basic/Office2007Form/Form.Designer.vb	
@@ -0,0 +1,29 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class $safeitemrootname$
+    Inherits DevComponents.DotNetBar.OfficeForm
+
+    'Form overrides dispose to clean up the component list.
+    <System.Diagnostics.DebuggerNonUserCode()> _
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+        Try
+            If disposing AndAlso components IsNot Nothing Then
+                components.Dispose()
+            End If
+        Finally
+            MyBase.Dispose(disposing)
+        End Try
+    End Sub
+
+    'Required by the Windows Form Designer
+    Private components As System.ComponentModel.IContainer
+
+    'NOTE: The following procedure is required by the Windows Form Designer
+    'It can be modified using the Windows Form Designer.  
+    'Do not modify it using the code editor.
+    <System.Diagnostics.DebuggerStepThrough()> _
+    Private Sub InitializeComponent()
+        components = New System.ComponentModel.Container
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.Text = "$safeitemrootname$"
+    End Sub
+End Class
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual Basic/Office2007Form/Form.vb b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual Basic/Office2007Form/Form.vb
new file mode 100644
index 00000000..9b12d76d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual Basic/Office2007Form/Form.vb	
@@ -0,0 +1,3 @@
+Public Class $safeitemrootname$
+
+End Class
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual Basic/Office2007Form/office2007form.vstemplate b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual Basic/Office2007Form/office2007form.vstemplate
new file mode 100644
index 00000000..1bf5f9f1
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual Basic/Office2007Form/office2007form.vstemplate	
@@ -0,0 +1,36 @@
+<VSTemplate Version="3.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name>Office Form</Name>
+    <Description>DotNetBar Office Style Form</Description>
+    <Icon Package="{164B10B9-B200-11D0-8C61-00A0C91E29D5}" ID="4527" />
+	<TemplateID>DevComponents.VB.Office2007Form</TemplateID>
+    <ProjectType>VisualBasic</ProjectType>
+    <SortOrder>11</SortOrder>
+    <DefaultName>Form.vb</DefaultName>
+	<RequiredFrameworkVersion>2.0</RequiredFrameworkVersion>
+    <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
+  </TemplateData>
+  <TemplateContent>
+        <References>
+            <Reference>
+                <Assembly>System</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+            <Reference>
+                <Assembly>System.Drawing</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+            <Reference>
+                <Assembly>System.Windows.Forms</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+			<Reference>
+                <Assembly>DevComponents.DotNetBar2</Assembly>
+                <URL>http://www.devcomponents.com</URL>
+            </Reference>
+        </References>
+
+    <ProjectItem ReplaceParameters="true" SubType="Form">Form.vb</ProjectItem>
+    <ProjectItem ReplaceParameters="true">Form.Designer.vb</ProjectItem>
+  </TemplateContent>
+</VSTemplate>
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual Basic/RibbonForm/DotNetBarRibbonForm.zip b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual Basic/RibbonForm/DotNetBarRibbonForm.zip
new file mode 100644
index 00000000..fbfe10c8
Binary files /dev/null and b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual Basic/RibbonForm/DotNetBarRibbonForm.zip differ
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual Basic/RibbonForm/Form.Designer.vb b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual Basic/RibbonForm/Form.Designer.vb
new file mode 100644
index 00000000..abbb321e
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual Basic/RibbonForm/Form.Designer.vb	
@@ -0,0 +1,28 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class $safeitemrootname$
+    Inherits DevComponents.DotNetBar.RibbonForm
+
+    'Form overrides dispose to clean up the component list.
+    <System.Diagnostics.DebuggerNonUserCode()> _
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+        Try
+            If disposing AndAlso components IsNot Nothing Then
+                components.Dispose()
+            End If
+        Finally
+            MyBase.Dispose(disposing)
+        End Try
+    End Sub
+
+    'Required by the Windows Form Designer
+    Private components As System.ComponentModel.IContainer
+
+    'NOTE: The following procedure is required by the Windows Form Designer
+    'It can be modified using the Windows Form Designer.  
+    'Do not modify it using the code editor.
+    <System.Diagnostics.DebuggerStepThrough()> _
+    Private Sub InitializeComponent()
+        components = New System.ComponentModel.Container
+        Me.Text = "$safeitemrootname$"
+    End Sub
+End Class
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual Basic/RibbonForm/Form.vb b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual Basic/RibbonForm/Form.vb
new file mode 100644
index 00000000..9b12d76d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual Basic/RibbonForm/Form.vb	
@@ -0,0 +1,3 @@
+Public Class $safeitemrootname$
+
+End Class
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual Basic/RibbonForm/ribbonform.vstemplate b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual Basic/RibbonForm/ribbonform.vstemplate
new file mode 100644
index 00000000..13e12ed8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual Basic/RibbonForm/ribbonform.vstemplate	
@@ -0,0 +1,36 @@
+<VSTemplate Version="3.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name>Ribbon Form</Name>
+    <Description>DotNetBar Ribbon Form</Description>
+    <Icon Package="{164B10B9-B200-11D0-8C61-00A0C91E29D5}" ID="4527" />
+	<TemplateID>DevComponents.VB.RibbonForm</TemplateID>
+    <ProjectType>VisualBasic</ProjectType>
+    <SortOrder>11</SortOrder>
+    <DefaultName>Form.vb</DefaultName>
+	<RequiredFrameworkVersion>2.0</RequiredFrameworkVersion>
+    <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
+  </TemplateData>
+  <TemplateContent>
+        <References>
+            <Reference>
+                <Assembly>System</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+            <Reference>
+                <Assembly>System.Drawing</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+            <Reference>
+                <Assembly>System.Windows.Forms</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+			<Reference>
+                <Assembly>DevComponents.DotNetBar2</Assembly>
+                <URL>http://www.devcomponents.com</URL>
+            </Reference>
+        </References>
+
+    <ProjectItem ReplaceParameters="true" SubType="Form">Form.vb</ProjectItem>
+    <ProjectItem ReplaceParameters="true">Form.Designer.vb</ProjectItem>
+  </TemplateContent>
+</VSTemplate>
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual Basic/TabbedForm/Form.Designer.vb b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual Basic/TabbedForm/Form.Designer.vb
new file mode 100644
index 00000000..7fcc4215
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual Basic/TabbedForm/Form.Designer.vb	
@@ -0,0 +1,176 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class $safeitemrootname$
+    Inherits DevComponents.DotNetBar.Controls.TabParentForm
+
+    'Form overrides dispose to clean up the component list.
+    <System.Diagnostics.DebuggerNonUserCode()> _
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+        Try
+            If disposing AndAlso components IsNot Nothing Then
+                components.Dispose()
+            End If
+        Finally
+            MyBase.Dispose(disposing)
+        End Try
+    End Sub
+
+    'Required by the Windows Form Designer
+    Private components As System.ComponentModel.IContainer
+
+    'NOTE: The following procedure is required by the Windows Form Designer
+    'It can be modified using the Windows Form Designer.  
+    'Do not modify it using the code editor.
+    <System.Diagnostics.DebuggerStepThrough()> _
+    Private Sub InitializeComponent()
+        Me.TabFormControl1 = New DevComponents.DotNetBar.Controls.TabFormControl()
+        Me.TabFormPanel1 = New DevComponents.DotNetBar.Controls.TabFormPanel()
+        Me.TabFormPanel2 = New DevComponents.DotNetBar.Controls.TabFormPanel()
+        Me.TabFormItem1 = New DevComponents.DotNetBar.Controls.TabFormItem()
+        Me.TabFormItem2 = New DevComponents.DotNetBar.Controls.TabFormItem()
+        Me.Label1 = New System.Windows.Forms.Label()
+        Me.Label2 = New System.Windows.Forms.Label()
+        Me.TabFormControl1.SuspendLayout
+        Me.TabFormPanel1.SuspendLayout
+        Me.TabFormPanel2.SuspendLayout
+        Me.SuspendLayout
+        '
+        'TabFormControl1
+        '
+        Me.TabFormControl1.BackColor = System.Drawing.Color.White
+        '
+        '
+        '
+        Me.TabFormControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        Me.TabFormControl1.Controls.Add(Me.TabFormPanel1)
+        Me.TabFormControl1.Controls.Add(Me.TabFormPanel2)
+        Me.TabFormControl1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.TabFormControl1.ForeColor = System.Drawing.Color.Black
+        Me.TabFormControl1.Items.AddRange(New DevComponents.DotNetBar.BaseItem() {Me.TabFormItem1, Me.TabFormItem2})
+        Me.TabFormControl1.Location = New System.Drawing.Point(1, 1)
+        Me.TabFormControl1.Name = "TabFormControl1"
+        Me.TabFormControl1.Size = New System.Drawing.Size(444, 311)
+        Me.TabFormControl1.SystemText.MaximizeRibbonText = "&Maximize the Ribbon"
+        Me.TabFormControl1.SystemText.MinimizeRibbonText = "Mi&nimize the Ribbon"
+        Me.TabFormControl1.SystemText.QatAddItemText = "&Add to Quick Access Toolbar"
+        Me.TabFormControl1.SystemText.QatCustomizeMenuLabel = "<b>Customize Quick Access Toolbar</b>"
+        Me.TabFormControl1.SystemText.QatCustomizeText = "&Customize Quick Access Toolbar..."
+        Me.TabFormControl1.SystemText.QatDialogAddButton = "&Add >>"
+        Me.TabFormControl1.SystemText.QatDialogCancelButton = "Cancel"
+        Me.TabFormControl1.SystemText.QatDialogCaption = "Customize Quick Access Toolbar"
+        Me.TabFormControl1.SystemText.QatDialogCategoriesLabel = "&Choose commands from:"
+        Me.TabFormControl1.SystemText.QatDialogOkButton = "OK"
+        Me.TabFormControl1.SystemText.QatDialogPlacementCheckbox = "&Place Quick Access Toolbar below the Ribbon"
+        Me.TabFormControl1.SystemText.QatDialogRemoveButton = "&Remove"
+        Me.TabFormControl1.SystemText.QatPlaceAboveRibbonText = "&Place Quick Access Toolbar above the Ribbon"
+        Me.TabFormControl1.SystemText.QatPlaceBelowRibbonText = "&Place Quick Access Toolbar below the Ribbon"
+        Me.TabFormControl1.SystemText.QatRemoveItemText = "&Remove from Quick Access Toolbar"
+        Me.TabFormControl1.TabIndex = 0
+        Me.TabFormControl1.TabStripFont = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+        Me.TabFormControl1.Text = "TabFormControl1"
+        '
+        'TabFormPanel1
+        '
+        Me.TabFormPanel1.Controls.Add(Me.Label1)
+        Me.TabFormPanel1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.TabFormPanel1.Location = New System.Drawing.Point(0, 28)
+        Me.TabFormPanel1.Name = "TabFormPanel1"
+        Me.TabFormPanel1.Padding = New System.Windows.Forms.Padding(3, 0, 3, 3)
+        Me.TabFormPanel1.Size = New System.Drawing.Size(444, 283)
+        '
+        '
+        '
+        Me.TabFormPanel1.Style.Class = "TabFormPanel"
+        Me.TabFormPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        '
+        '
+        '
+        Me.TabFormPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        '
+        '
+        '
+        Me.TabFormPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        Me.TabFormPanel1.TabIndex = 1
+        '
+        'TabFormPanel2
+        '
+        Me.TabFormPanel2.Controls.Add(Me.Label2)
+        Me.TabFormPanel2.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.TabFormPanel2.Location = New System.Drawing.Point(0, 28)
+        Me.TabFormPanel2.Name = "TabFormPanel2"
+        Me.TabFormPanel2.Padding = New System.Windows.Forms.Padding(3, 0, 3, 3)
+        Me.TabFormPanel2.Size = New System.Drawing.Size(444, 283)
+        '
+        '
+        '
+        Me.TabFormPanel2.Style.Class = "TabFormPanel"
+        Me.TabFormPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        '
+        '
+        '
+        Me.TabFormPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        '
+        '
+        '
+        Me.TabFormPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        Me.TabFormPanel2.TabIndex = 2
+        Me.TabFormPanel2.Visible = false
+        '
+        'TabFormItem1
+        '
+        Me.TabFormItem1.Checked = true
+        Me.TabFormItem1.Name = "TabFormItem1"
+        Me.TabFormItem1.Panel = Me.TabFormPanel1
+        Me.TabFormItem1.Text = "Document 1"
+        '
+        'TabFormItem2
+        '
+        Me.TabFormItem2.Name = "TabFormItem2"
+        Me.TabFormItem2.Panel = Me.TabFormPanel2
+        Me.TabFormItem2.Text = "Document 2"
+        '
+        'Label1
+        '
+        Me.Label1.AutoSize = true
+        Me.Label1.BackColor = System.Drawing.Color.Transparent
+        Me.Label1.Location = New System.Drawing.Point(155, 127)
+        Me.Label1.Name = "Label1"
+        Me.Label1.Size = New System.Drawing.Size(101, 13)
+        Me.Label1.TabIndex = 0
+        Me.Label1.Text = "Your content here..."
+        '
+        'Label2
+        '
+        Me.Label2.AutoSize = true
+        Me.Label2.BackColor = System.Drawing.Color.Transparent
+        Me.Label2.Location = New System.Drawing.Point(172, 135)
+        Me.Label2.Name = "Label2"
+        Me.Label2.Size = New System.Drawing.Size(101, 13)
+        Me.Label2.TabIndex = 1
+        Me.Label2.Text = "Your content here..."
+        '
+        '$safeitemrootname$
+        '
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.ClientSize = New System.Drawing.Size(446, 313)
+        Me.Controls.Add(Me.TabFormControl1)
+        Me.Name = "$safeitemrootname$"
+        Me.Text = "DotNetBar Tabbed Form"
+        Me.TabFormControl1.ResumeLayout(false)
+        Me.TabFormControl1.PerformLayout
+        Me.TabFormPanel1.ResumeLayout(false)
+        Me.TabFormPanel1.PerformLayout
+        Me.TabFormPanel2.ResumeLayout(false)
+        Me.TabFormPanel2.PerformLayout
+        Me.ResumeLayout(false)
+
+    End Sub
+    Friend WithEvents TabFormControl1 As DevComponents.DotNetBar.Controls.TabFormControl
+    Friend WithEvents TabFormPanel1 As DevComponents.DotNetBar.Controls.TabFormPanel
+    Friend WithEvents TabFormPanel2 As DevComponents.DotNetBar.Controls.TabFormPanel
+    Friend WithEvents TabFormItem1 As DevComponents.DotNetBar.Controls.TabFormItem
+    Friend WithEvents TabFormItem2 As DevComponents.DotNetBar.Controls.TabFormItem
+    Friend WithEvents Label1 As System.Windows.Forms.Label
+    Friend WithEvents Label2 As System.Windows.Forms.Label
+
+End Class
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual Basic/TabbedForm/Form.resx b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual Basic/TabbedForm/Form.resx
new file mode 100644
index 00000000..19dc0dd8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual Basic/TabbedForm/Form.resx	
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual Basic/TabbedForm/Form.vb b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual Basic/TabbedForm/Form.vb
new file mode 100644
index 00000000..64eb4330
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual Basic/TabbedForm/Form.vb	
@@ -0,0 +1,3 @@
+Public Class $safeitemrootname$
+
+End Class
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual Basic/TabbedForm/TabbedForm.zip b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual Basic/TabbedForm/TabbedForm.zip
new file mode 100644
index 00000000..66f60672
Binary files /dev/null and b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual Basic/TabbedForm/TabbedForm.zip differ
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual Basic/TabbedForm/tabbedform.vstemplate b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual Basic/TabbedForm/tabbedform.vstemplate
new file mode 100644
index 00000000..865bb1b6
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual Basic/TabbedForm/tabbedform.vstemplate	
@@ -0,0 +1,36 @@
+<VSTemplate Version="3.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name>Tabbed Form</Name>
+    <Description>DotNetBar Tabbed Form</Description>
+    <Icon Package="{164B10B9-B200-11D0-8C61-00A0C91E29D5}" ID="4527" />
+	<TemplateID>DevComponents.VB.TabbedForm</TemplateID>
+    <ProjectType>VisualBasic</ProjectType>
+    <SortOrder>12</SortOrder>
+    <DefaultName>Form.vb</DefaultName>
+	<RequiredFrameworkVersion>2.0</RequiredFrameworkVersion>
+    <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
+  </TemplateData>
+  <TemplateContent>
+        <References>
+            <Reference>
+                <Assembly>System</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+            <Reference>
+                <Assembly>System.Drawing</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+            <Reference>
+                <Assembly>System.Windows.Forms</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+			<Reference>
+                <Assembly>DevComponents.DotNetBar2</Assembly>
+                <URL>http://www.devcomponents.com</URL>
+            </Reference>
+        </References>
+
+    <ProjectItem ReplaceParameters="true" SubType="Form">Form.vb</ProjectItem>
+    <ProjectItem ReplaceParameters="true">Form.Designer.vb</ProjectItem>
+  </TemplateContent>
+</VSTemplate>
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual C#/MetroAppForm/Form.Designer.cs b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual C#/MetroAppForm/Form.Designer.cs
new file mode 100644
index 00000000..8d1bb1bc
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual C#/MetroAppForm/Form.Designer.cs	
@@ -0,0 +1,234 @@
+namespace $rootnamespace$
+{
+    partial class $safeitemrootname$
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form 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.metroShell1 = new DevComponents.DotNetBar.Metro.MetroShell();
+            this.metroTabItem1 = new DevComponents.DotNetBar.Metro.MetroTabItem();
+            this.metroTabPanel1 = new DevComponents.DotNetBar.Metro.MetroTabPanel();
+            this.metroTabItem2 = new DevComponents.DotNetBar.Metro.MetroTabItem();
+            this.metroTabPanel2 = new DevComponents.DotNetBar.Metro.MetroTabPanel();
+            this.styleManager1 = new DevComponents.DotNetBar.StyleManager(this.components);
+            this.qatCustomizeItem1 = new DevComponents.DotNetBar.QatCustomizeItem();
+            this.metroAppButton1 = new DevComponents.DotNetBar.Metro.MetroAppButton();
+            this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem();
+            this.metroStatusBar1 = new DevComponents.DotNetBar.Metro.MetroStatusBar();
+            this.labelItem1 = new DevComponents.DotNetBar.LabelItem();
+            this.metroShell1.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // metroShell1
+            // 
+            this.metroShell1.BackColor = System.Drawing.Color.White;
+            // 
+            // 
+            // 
+            this.metroShell1.BackgroundStyle.Class = "";
+            this.metroShell1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.metroShell1.CaptionVisible = true;
+            this.metroShell1.Controls.Add(this.metroTabPanel1);
+            this.metroShell1.Controls.Add(this.metroTabPanel2);
+            this.metroShell1.Dock = System.Windows.Forms.DockStyle.Top;
+            this.metroShell1.ForeColor = System.Drawing.Color.Black;
+            this.metroShell1.HelpButtonText = null;
+            this.metroShell1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+            this.metroAppButton1,
+            this.metroTabItem1,
+            this.metroTabItem2});
+            this.metroShell1.KeyTipsFont = new System.Drawing.Font("Tahoma", 7F);
+            this.metroShell1.Location = new System.Drawing.Point(0, 1);
+            this.metroShell1.Name = "metroShell1";
+            this.metroShell1.QuickToolbarItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+            this.buttonItem1,
+            this.qatCustomizeItem1});
+            this.metroShell1.Size = new System.Drawing.Size(624, 218);
+            this.metroShell1.SystemText.MaximizeRibbonText = "&Maximize the Ribbon";
+            this.metroShell1.SystemText.MinimizeRibbonText = "Mi&nimize the Ribbon";
+            this.metroShell1.SystemText.QatAddItemText = "&Add to Quick Access Toolbar";
+            this.metroShell1.SystemText.QatCustomizeMenuLabel = "<b>Customize Quick Access Toolbar</b>";
+            this.metroShell1.SystemText.QatCustomizeText = "&Customize Quick Access Toolbar...";
+            this.metroShell1.SystemText.QatDialogAddButton = "&Add >>";
+            this.metroShell1.SystemText.QatDialogCancelButton = "Cancel";
+            this.metroShell1.SystemText.QatDialogCaption = "Customize Quick Access Toolbar";
+            this.metroShell1.SystemText.QatDialogCategoriesLabel = "&Choose commands from:";
+            this.metroShell1.SystemText.QatDialogOkButton = "OK";
+            this.metroShell1.SystemText.QatDialogPlacementCheckbox = "&Place Quick Access Toolbar below the Ribbon";
+            this.metroShell1.SystemText.QatDialogRemoveButton = "&Remove";
+            this.metroShell1.SystemText.QatPlaceAboveRibbonText = "&Place Quick Access Toolbar above the Ribbon";
+            this.metroShell1.SystemText.QatPlaceBelowRibbonText = "&Place Quick Access Toolbar below the Ribbon";
+            this.metroShell1.SystemText.QatRemoveItemText = "&Remove from Quick Access Toolbar";
+            this.metroShell1.TabIndex = 0;
+            this.metroShell1.TabStripFont = new System.Drawing.Font("Segoe UI", 10.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.metroShell1.Text = "metroShell1";
+            // 
+            // metroTabItem1
+            // 
+            this.metroTabItem1.Checked = true;
+            this.metroTabItem1.Name = "metroTabItem1";
+            this.metroTabItem1.Panel = this.metroTabPanel1;
+            this.metroTabItem1.Text = "&HOME";
+            // 
+            // metroTabPanel1
+            // 
+            this.metroTabPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.metroTabPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.metroTabPanel1.Location = new System.Drawing.Point(0, 51);
+            this.metroTabPanel1.Name = "metroTabPanel1";
+            this.metroTabPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3);
+            this.metroTabPanel1.Size = new System.Drawing.Size(624, 167);
+            // 
+            // 
+            // 
+            this.metroTabPanel1.Style.Class = "";
+            this.metroTabPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.metroTabPanel1.StyleMouseDown.Class = "";
+            this.metroTabPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.metroTabPanel1.StyleMouseOver.Class = "";
+            this.metroTabPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.metroTabPanel1.TabIndex = 1;
+            // 
+            // metroTabItem2
+            // 
+            this.metroTabItem2.Name = "metroTabItem2";
+            this.metroTabItem2.Panel = this.metroTabPanel2;
+            this.metroTabItem2.Text = "&VIEW";
+            // 
+            // metroTabPanel2
+            // 
+            this.metroTabPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.metroTabPanel2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.metroTabPanel2.Location = new System.Drawing.Point(0, 0);
+            this.metroTabPanel2.Name = "metroTabPanel2";
+            this.metroTabPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3);
+            this.metroTabPanel2.Size = new System.Drawing.Size(200, 100);
+            // 
+            // 
+            // 
+            this.metroTabPanel2.Style.Class = "";
+            this.metroTabPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.metroTabPanel2.StyleMouseDown.Class = "";
+            this.metroTabPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.metroTabPanel2.StyleMouseOver.Class = "";
+            this.metroTabPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.metroTabPanel2.TabIndex = 2;
+            // 
+            // styleManager1
+            // 
+            this.styleManager1.ManagerStyle = DevComponents.DotNetBar.eStyle.Metro;
+            this.styleManager1.MetroColorParameters = new DevComponents.DotNetBar.Metro.ColorTables.MetroColorGeneratorParameters(System.Drawing.Color.White, System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(163)))), ((int)(((byte)(26))))));
+            // 
+            // qatCustomizeItem1
+            // 
+            this.qatCustomizeItem1.BeginGroup = true;
+            this.qatCustomizeItem1.Name = "qatCustomizeItem1";
+            // 
+            // metroAppButton1
+            // 
+            this.metroAppButton1.AutoExpandOnClick = true;
+            this.metroAppButton1.CanCustomize = false;
+            this.metroAppButton1.ImageFixedSize = new System.Drawing.Size(16, 16);
+            this.metroAppButton1.ImagePaddingHorizontal = 0;
+            this.metroAppButton1.ImagePaddingVertical = 0;
+            this.metroAppButton1.Name = "metroAppButton1";
+            this.metroAppButton1.ShowSubItems = false;
+            this.metroAppButton1.Text = "&File";
+            // 
+            // buttonItem1
+            // 
+            this.buttonItem1.Name = "buttonItem1";
+            this.buttonItem1.Text = "buttonItem1";
+            // 
+            // metroStatusBar1
+            // 
+            // 
+            // 
+            // 
+            this.metroStatusBar1.BackgroundStyle.Class = "";
+            this.metroStatusBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.metroStatusBar1.ContainerControlProcessDialogKey = true;
+            this.metroStatusBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.metroStatusBar1.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.metroStatusBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+            this.labelItem1});
+            this.metroStatusBar1.Location = new System.Drawing.Point(0, 374);
+            this.metroStatusBar1.Name = "metroStatusBar1";
+            this.metroStatusBar1.Size = new System.Drawing.Size(624, 21);
+            this.metroStatusBar1.TabIndex = 1;
+            this.metroStatusBar1.Text = "metroStatusBar1";
+            // 
+            // labelItem1
+            // 
+            this.labelItem1.Name = "labelItem1";
+            this.labelItem1.Text = "READY";
+            // 
+            // $safeitemrootname$
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(625, 396);
+            this.Controls.Add(this.metroStatusBar1);
+            this.Controls.Add(this.metroShell1);
+            this.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.Name = "$safeitemrootname$";
+            this.Text = "DotNetBar Metro App Form";
+            this.metroShell1.ResumeLayout(false);
+            this.metroShell1.PerformLayout();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private DevComponents.DotNetBar.Metro.MetroShell metroShell1;
+        private DevComponents.DotNetBar.Metro.MetroTabPanel metroTabPanel1;
+        private DevComponents.DotNetBar.Metro.MetroTabPanel metroTabPanel2;
+        private DevComponents.DotNetBar.Metro.MetroAppButton metroAppButton1;
+        private DevComponents.DotNetBar.Metro.MetroTabItem metroTabItem1;
+        private DevComponents.DotNetBar.Metro.MetroTabItem metroTabItem2;
+        private DevComponents.DotNetBar.ButtonItem buttonItem1;
+        private DevComponents.DotNetBar.QatCustomizeItem qatCustomizeItem1;
+        private DevComponents.DotNetBar.StyleManager styleManager1;
+        private DevComponents.DotNetBar.Metro.MetroStatusBar metroStatusBar1;
+        private DevComponents.DotNetBar.LabelItem labelItem1;
+
+    }
+}
+
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual C#/MetroAppForm/Form.cs b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual C#/MetroAppForm/Form.cs
new file mode 100644
index 00000000..ff2c3a9b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual C#/MetroAppForm/Form.cs	
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+
+namespace $rootnamespace$
+{
+    public partial class $safeitemrootname$ : DevComponents.DotNetBar.Metro.MetroAppForm
+    {
+        public $safeitemrootname$()
+        {
+            InitializeComponent();
+        }
+    }
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual C#/MetroAppForm/Form.resx b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual C#/MetroAppForm/Form.resx
new file mode 100644
index 00000000..c3d21cf2
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual C#/MetroAppForm/Form.resx	
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="styleManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual C#/MetroAppForm/MetroAppForm.zip b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual C#/MetroAppForm/MetroAppForm.zip
new file mode 100644
index 00000000..e72433e8
Binary files /dev/null and b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual C#/MetroAppForm/MetroAppForm.zip differ
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual C#/MetroAppForm/metroappform.vstemplate b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual C#/MetroAppForm/metroappform.vstemplate
new file mode 100644
index 00000000..ae758d3b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual C#/MetroAppForm/metroappform.vstemplate	
@@ -0,0 +1,38 @@
+<VSTemplate Version="3.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name>Metro App Form</Name>
+    <Description>DotNetBar Metro Application Form</Description>
+    <Icon Package="{FAE04EC1-301F-11d3-BF4B-00C04F79EFBC}" ID="4535" />
+	<TemplateID>DevComponents.CS.MetroAppForm</TemplateID>
+    <ProjectType>CSharp</ProjectType>
+    <SortOrder>41</SortOrder>
+    <DefaultName>Form.cs</DefaultName>
+	<RequiredFrameworkVersion>2.0</RequiredFrameworkVersion>
+    <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
+  </TemplateData>
+  <TemplateContent>
+		<References>
+			<Reference>
+				<Assembly>System</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Data</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Drawing</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Windows.Forms</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Xml</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>DevComponents.DotNetBar2</Assembly>
+			</Reference>
+		</References>
+
+    <ProjectItem ReplaceParameters="true" SubType="Form">Form.cs</ProjectItem>
+    <ProjectItem ReplaceParameters="true">Form.Designer.cs</ProjectItem>
+  </TemplateContent>
+</VSTemplate>
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual C#/MetroForm/MetroForm.zip b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual C#/MetroForm/MetroForm.zip
new file mode 100644
index 00000000..b98a2499
Binary files /dev/null and b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual C#/MetroForm/MetroForm.zip differ
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual C#/MetroForm/form.cs b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual C#/MetroForm/form.cs
new file mode 100644
index 00000000..11692b62
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual C#/MetroForm/form.cs	
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+using DevComponents.DotNetBar;
+
+namespace $rootnamespace$
+{
+	public partial class $safeitemrootname$: DevComponents.DotNetBar.Metro.MetroForm
+	{
+		public $safeitemrootname$()
+		{
+			InitializeComponent();
+		}
+	}
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual C#/MetroForm/form.designer.cs b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual C#/MetroForm/form.designer.cs
new file mode 100644
index 00000000..3a1a31d0
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual C#/MetroForm/form.designer.cs	
@@ -0,0 +1,42 @@
+namespace $rootnamespace$
+{
+	partial class $safeitemrootname$
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if (disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form 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.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(625, 396);
+            this.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.Name = "$safeitemrootname$";
+			this.Text = "MetroForm";
+		}
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual C#/MetroForm/metroform.vstemplate b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual C#/MetroForm/metroform.vstemplate
new file mode 100644
index 00000000..3961f06f
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual C#/MetroForm/metroform.vstemplate	
@@ -0,0 +1,38 @@
+<VSTemplate Version="3.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name>Metro Form</Name>
+    <Description>DotNetBar Metro Form</Description>
+    <Icon Package="{FAE04EC1-301F-11d3-BF4B-00C04F79EFBC}" ID="4535" />
+	<TemplateID>DevComponents.CS.MetroForm</TemplateID>
+    <ProjectType>CSharp</ProjectType>
+    <SortOrder>41</SortOrder>
+    <DefaultName>Form.cs</DefaultName>
+	<RequiredFrameworkVersion>2.0</RequiredFrameworkVersion>
+    <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
+  </TemplateData>
+  <TemplateContent>
+		<References>
+			<Reference>
+				<Assembly>System</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Data</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Drawing</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Windows.Forms</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Xml</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>DevComponents.DotNetBar2</Assembly>
+			</Reference>
+		</References>
+
+    <ProjectItem ReplaceParameters="true" SubType="Form">Form.cs</ProjectItem>
+    <ProjectItem ReplaceParameters="true">Form.Designer.cs</ProjectItem>
+  </TemplateContent>
+</VSTemplate>
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual C#/Office2007Form/DotNetBarOffice2007Form.zip b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual C#/Office2007Form/DotNetBarOffice2007Form.zip
new file mode 100644
index 00000000..e5924f7c
Binary files /dev/null and b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual C#/Office2007Form/DotNetBarOffice2007Form.zip differ
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual C#/Office2007Form/form.cs b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual C#/Office2007Form/form.cs
new file mode 100644
index 00000000..8e61cb27
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual C#/Office2007Form/form.cs	
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+using DevComponents.DotNetBar;
+
+namespace $rootnamespace$
+{
+	public partial class $safeitemrootname$: DevComponents.DotNetBar.OfficeForm
+	{
+		public $safeitemrootname$()
+		{
+			InitializeComponent();
+		}
+	}
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual C#/Office2007Form/form.designer.cs b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual C#/Office2007Form/form.designer.cs
new file mode 100644
index 00000000..6bc0536d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual C#/Office2007Form/form.designer.cs	
@@ -0,0 +1,37 @@
+namespace $rootnamespace$
+{
+	partial class $safeitemrootname$
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if (disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form 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.Text = "$safeitemrootname$";
+		}
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual C#/Office2007Form/office2007form.vstemplate b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual C#/Office2007Form/office2007form.vstemplate
new file mode 100644
index 00000000..f2bf2593
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual C#/Office2007Form/office2007form.vstemplate	
@@ -0,0 +1,38 @@
+<VSTemplate Version="3.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name>Office Form</Name>
+    <Description>DotNetBar Office Style Form</Description>
+    <Icon Package="{FAE04EC1-301F-11d3-BF4B-00C04F79EFBC}" ID="4535" />
+	<TemplateID>DevComponents.CS.Office2007Form</TemplateID>
+    <ProjectType>CSharp</ProjectType>
+    <SortOrder>41</SortOrder>
+    <DefaultName>Form.cs</DefaultName>
+	<RequiredFrameworkVersion>2.0</RequiredFrameworkVersion>
+    <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
+  </TemplateData>
+  <TemplateContent>
+		<References>
+			<Reference>
+				<Assembly>System</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Data</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Drawing</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Windows.Forms</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Xml</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>DevComponents.DotNetBar2</Assembly>
+			</Reference>
+		</References>
+
+    <ProjectItem ReplaceParameters="true" SubType="Form">Form.cs</ProjectItem>
+    <ProjectItem ReplaceParameters="true">Form.Designer.cs</ProjectItem>
+  </TemplateContent>
+</VSTemplate>
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual C#/RibbonForm/DotNetBarRibbonForm.zip b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual C#/RibbonForm/DotNetBarRibbonForm.zip
new file mode 100644
index 00000000..33693820
Binary files /dev/null and b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual C#/RibbonForm/DotNetBarRibbonForm.zip differ
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual C#/RibbonForm/form.cs b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual C#/RibbonForm/form.cs
new file mode 100644
index 00000000..bfd40b47
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual C#/RibbonForm/form.cs	
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+using DevComponents.DotNetBar;
+
+namespace $rootnamespace$
+{
+	public partial class $safeitemrootname$: DevComponents.DotNetBar.RibbonForm
+	{
+		public $safeitemrootname$()
+		{
+			InitializeComponent();
+		}
+	}
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual C#/RibbonForm/form.designer.cs b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual C#/RibbonForm/form.designer.cs
new file mode 100644
index 00000000..6bc0536d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual C#/RibbonForm/form.designer.cs	
@@ -0,0 +1,37 @@
+namespace $rootnamespace$
+{
+	partial class $safeitemrootname$
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if (disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form 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.Text = "$safeitemrootname$";
+		}
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual C#/RibbonForm/ribbonform.vstemplate b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual C#/RibbonForm/ribbonform.vstemplate
new file mode 100644
index 00000000..a0273570
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual C#/RibbonForm/ribbonform.vstemplate	
@@ -0,0 +1,38 @@
+<VSTemplate Version="3.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name>Ribbon Form</Name>
+    <Description>DotNetBar Ribbon Form</Description>
+    <Icon Package="{FAE04EC1-301F-11d3-BF4B-00C04F79EFBC}" ID="4535" />
+	<TemplateID>DevComponents.CS.RibbonForm</TemplateID>
+    <ProjectType>CSharp</ProjectType>
+    <SortOrder>41</SortOrder>
+	<RequiredFrameworkVersion>2.0</RequiredFrameworkVersion>
+    <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
+    <DefaultName>RibbonForm.cs</DefaultName>
+  </TemplateData>
+  <TemplateContent>
+		<References>
+			<Reference>
+				<Assembly>System</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Data</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Drawing</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Windows.Forms</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Xml</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>DevComponents.DotNetBar2</Assembly>
+			</Reference>
+		</References>
+
+    <ProjectItem ReplaceParameters="true" SubType="Form">Form.cs</ProjectItem>
+    <ProjectItem ReplaceParameters="true">Form.Designer.cs</ProjectItem>
+  </TemplateContent>
+</VSTemplate>
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual C#/TabbedForm/Form.Designer.cs b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual C#/TabbedForm/Form.Designer.cs
new file mode 100644
index 00000000..6a057d83
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual C#/TabbedForm/Form.Designer.cs	
@@ -0,0 +1,175 @@
+namespace $rootnamespace$
+{
+    partial class $safeitemrootname$
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form 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.tabFormControl1 = new DevComponents.DotNetBar.Controls.TabFormControl();
+            this.tabFormPanel1 = new DevComponents.DotNetBar.Controls.TabFormPanel();
+            this.tabFormPanel2 = new DevComponents.DotNetBar.Controls.TabFormPanel();
+            this.tabFormItem1 = new DevComponents.DotNetBar.Controls.TabFormItem();
+            this.tabFormItem2 = new DevComponents.DotNetBar.Controls.TabFormItem();
+            this.label1 = new System.Windows.Forms.Label();
+            this.label2 = new System.Windows.Forms.Label();
+            this.tabFormControl1.SuspendLayout();
+            this.tabFormPanel1.SuspendLayout();
+            this.tabFormPanel2.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // tabFormControl1
+            // 
+            this.tabFormControl1.BackColor = System.Drawing.Color.White;
+            // 
+            // 
+            // 
+            this.tabFormControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.tabFormControl1.Controls.Add(this.tabFormPanel1);
+            this.tabFormControl1.Controls.Add(this.tabFormPanel2);
+            this.tabFormControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tabFormControl1.ForeColor = System.Drawing.Color.Black;
+            this.tabFormControl1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+            this.tabFormItem1,
+            this.tabFormItem2});
+            this.tabFormControl1.Location = new System.Drawing.Point(1, 1);
+            this.tabFormControl1.Name = "tabFormControl1";
+            this.tabFormControl1.Size = new System.Drawing.Size(614, 412);
+            this.tabFormControl1.TabIndex = 0;
+            this.tabFormControl1.TabStripFont = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.tabFormControl1.Text = "tabFormControl1";
+            // 
+            // tabFormPanel1
+            // 
+            this.tabFormPanel1.Controls.Add(this.label1);
+            this.tabFormPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tabFormPanel1.Location = new System.Drawing.Point(0, 28);
+            this.tabFormPanel1.Name = "tabFormPanel1";
+            this.tabFormPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3);
+            this.tabFormPanel1.Size = new System.Drawing.Size(614, 384);
+            // 
+            // 
+            // 
+            this.tabFormPanel1.Style.Class = "TabFormPanel";
+            this.tabFormPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.tabFormPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.tabFormPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.tabFormPanel1.TabIndex = 1;
+            // 
+            // tabFormPanel2
+            // 
+            this.tabFormPanel2.Controls.Add(this.label2);
+            this.tabFormPanel2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tabFormPanel2.Location = new System.Drawing.Point(0, 28);
+            this.tabFormPanel2.Name = "tabFormPanel2";
+            this.tabFormPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3);
+            this.tabFormPanel2.Size = new System.Drawing.Size(614, 384);
+            // 
+            // 
+            // 
+            this.tabFormPanel2.Style.Class = "TabFormPanel";
+            this.tabFormPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.tabFormPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.tabFormPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.tabFormPanel2.TabIndex = 2;
+            this.tabFormPanel2.Visible = false;
+            // 
+            // tabFormItem1
+            // 
+            this.tabFormItem1.Checked = true;
+            this.tabFormItem1.Name = "tabFormItem1";
+            this.tabFormItem1.Panel = this.tabFormPanel1;
+            this.tabFormItem1.Text = "Document 1";
+            // 
+            // tabFormItem2
+            // 
+            this.tabFormItem2.Name = "tabFormItem2";
+            this.tabFormItem2.Panel = this.tabFormPanel2;
+            this.tabFormItem2.Text = "Document 2";
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.BackColor = System.Drawing.Color.Transparent;
+            this.label1.Location = new System.Drawing.Point(241, 175);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(101, 13);
+            this.label1.TabIndex = 0;
+            this.label1.Text = "Your content here...";
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.BackColor = System.Drawing.Color.Transparent;
+            this.label2.Location = new System.Drawing.Point(257, 186);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(101, 13);
+            this.label2.TabIndex = 1;
+            this.label2.Text = "Your content here...";
+            // 
+            // $safeitemrootname$
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(616, 414);
+            this.Controls.Add(this.tabFormControl1);
+            this.ForeColor = System.Drawing.Color.Black;
+            this.Name = "$safeitemrootname$";
+            this.Text = "DotNetBar Tabbed App Form";
+            this.tabFormControl1.ResumeLayout(false);
+            this.tabFormControl1.PerformLayout();
+            this.tabFormPanel1.ResumeLayout(false);
+            this.tabFormPanel1.PerformLayout();
+            this.tabFormPanel2.ResumeLayout(false);
+            this.tabFormPanel2.PerformLayout();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private DevComponents.DotNetBar.Controls.TabFormControl tabFormControl1;
+        private DevComponents.DotNetBar.Controls.TabFormPanel tabFormPanel1;
+        private DevComponents.DotNetBar.Controls.TabFormPanel tabFormPanel2;
+        private DevComponents.DotNetBar.Controls.TabFormItem tabFormItem1;
+        private DevComponents.DotNetBar.Controls.TabFormItem tabFormItem2;
+		private System.Windows.Forms.Label label1;
+		private System.Windows.Forms.Label label2;
+
+    }
+}
+
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual C#/TabbedForm/Form.cs b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual C#/TabbedForm/Form.cs
new file mode 100644
index 00000000..47530f09
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual C#/TabbedForm/Form.cs	
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+
+namespace $rootnamespace$
+{
+    public partial class $safeitemrootname$ : DevComponents.DotNetBar.Controls.TabParentForm
+    {
+        public $safeitemrootname$()
+        {
+            InitializeComponent();
+        }
+    }
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual C#/TabbedForm/Form.resx b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual C#/TabbedForm/Form.resx
new file mode 100644
index 00000000..19dc0dd8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual C#/TabbedForm/Form.resx	
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual C#/TabbedForm/TabbedForm.zip b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual C#/TabbedForm/TabbedForm.zip
new file mode 100644
index 00000000..7cd94f8b
Binary files /dev/null and b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual C#/TabbedForm/TabbedForm.zip differ
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual C#/TabbedForm/tabbedform.vstemplate b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual C#/TabbedForm/tabbedform.vstemplate
new file mode 100644
index 00000000..c22546e3
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2008/Visual C#/TabbedForm/tabbedform.vstemplate	
@@ -0,0 +1,38 @@
+<VSTemplate Version="3.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name>Tabbed Form</Name>
+    <Description>DotNetBar Tabbed Form</Description>
+    <Icon Package="{FAE04EC1-301F-11d3-BF4B-00C04F79EFBC}" ID="4535" />
+	<TemplateID>DevComponents.CS.TabbedForm</TemplateID>
+    <ProjectType>CSharp</ProjectType>
+    <SortOrder>41</SortOrder>
+    <DefaultName>Form.cs</DefaultName>
+	<RequiredFrameworkVersion>2.0</RequiredFrameworkVersion>
+    <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
+  </TemplateData>
+  <TemplateContent>
+		<References>
+			<Reference>
+				<Assembly>System</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Data</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Drawing</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Windows.Forms</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Xml</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>DevComponents.DotNetBar2</Assembly>
+			</Reference>
+		</References>
+
+    <ProjectItem ReplaceParameters="true" SubType="Form">Form.cs</ProjectItem>
+    <ProjectItem ReplaceParameters="true">Form.Designer.cs</ProjectItem>
+  </TemplateContent>
+</VSTemplate>
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual Basic/MetroAppForm/Form.Designer.vb b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual Basic/MetroAppForm/Form.Designer.vb
new file mode 100644
index 00000000..913e8b3c
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual Basic/MetroAppForm/Form.Designer.vb	
@@ -0,0 +1,217 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class $safeitemrootname$
+    Inherits DevComponents.DotNetBar.Metro.MetroAppForm
+
+    'Form overrides dispose to clean up the component list.
+    <System.Diagnostics.DebuggerNonUserCode()> _
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+        Try
+            If disposing AndAlso components IsNot Nothing Then
+                components.Dispose()
+            End If
+        Finally
+            MyBase.Dispose(disposing)
+        End Try
+    End Sub
+
+    'Required by the Windows Form Designer
+    Private components As System.ComponentModel.IContainer
+
+    'NOTE: The following procedure is required by the Windows Form Designer
+    'It can be modified using the Windows Form Designer.  
+    'Do not modify it using the code editor.
+    <System.Diagnostics.DebuggerStepThrough()> _
+    Private Sub InitializeComponent()
+        Me.components = New System.ComponentModel.Container
+        Me.MetroShell1 = New DevComponents.DotNetBar.Metro.MetroShell
+        Me.MetroTabItem1 = New DevComponents.DotNetBar.Metro.MetroTabItem
+        Me.MetroTabPanel1 = New DevComponents.DotNetBar.Metro.MetroTabPanel
+        Me.MetroTabItem2 = New DevComponents.DotNetBar.Metro.MetroTabItem
+        Me.MetroTabPanel2 = New DevComponents.DotNetBar.Metro.MetroTabPanel
+        Me.StyleManager1 = New DevComponents.DotNetBar.StyleManager(Me.components)
+        Me.QatCustomizeItem1 = New DevComponents.DotNetBar.QatCustomizeItem
+        Me.MetroAppButton1 = New DevComponents.DotNetBar.Metro.MetroAppButton
+        Me.ButtonItem1 = New DevComponents.DotNetBar.ButtonItem
+        Me.MetroStatusBar1 = New DevComponents.DotNetBar.Metro.MetroStatusBar
+        Me.LabelItem1 = New DevComponents.DotNetBar.LabelItem
+        Me.MetroShell1.SuspendLayout()
+        Me.SuspendLayout()
+        '
+        'MetroShell1
+        '
+        Me.MetroShell1.BackColor = System.Drawing.Color.White
+        '
+        '
+        '
+        Me.MetroShell1.BackgroundStyle.Class = ""
+        Me.MetroShell1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        Me.MetroShell1.CaptionVisible = True
+        Me.MetroShell1.Controls.Add(Me.MetroTabPanel1)
+        Me.MetroShell1.Controls.Add(Me.MetroTabPanel2)
+        Me.MetroShell1.Dock = System.Windows.Forms.DockStyle.Top
+        Me.MetroShell1.ForeColor = System.Drawing.Color.Black
+        Me.MetroShell1.HelpButtonText = Nothing
+        Me.MetroShell1.Items.AddRange(New DevComponents.DotNetBar.BaseItem() {Me.MetroAppButton1, Me.MetroTabItem1, Me.MetroTabItem2})
+        Me.MetroShell1.KeyTipsFont = New System.Drawing.Font("Tahoma", 7.0!)
+        Me.MetroShell1.Location = New System.Drawing.Point(0, 1)
+        Me.MetroShell1.Name = "MetroShell1"
+        Me.MetroShell1.QuickToolbarItems.AddRange(New DevComponents.DotNetBar.BaseItem() {Me.ButtonItem1, Me.QatCustomizeItem1})
+        Me.MetroShell1.Size = New System.Drawing.Size(652, 234)
+        Me.MetroShell1.SystemText.MaximizeRibbonText = "&Maximize the Ribbon"
+        Me.MetroShell1.SystemText.MinimizeRibbonText = "Mi&nimize the Ribbon"
+        Me.MetroShell1.SystemText.QatAddItemText = "&Add to Quick Access Toolbar"
+        Me.MetroShell1.SystemText.QatCustomizeMenuLabel = "<b>Customize Quick Access Toolbar</b>"
+        Me.MetroShell1.SystemText.QatCustomizeText = "&Customize Quick Access Toolbar..."
+        Me.MetroShell1.SystemText.QatDialogAddButton = "&Add >>"
+        Me.MetroShell1.SystemText.QatDialogCancelButton = "Cancel"
+        Me.MetroShell1.SystemText.QatDialogCaption = "Customize Quick Access Toolbar"
+        Me.MetroShell1.SystemText.QatDialogCategoriesLabel = "&Choose commands from:"
+        Me.MetroShell1.SystemText.QatDialogOkButton = "OK"
+        Me.MetroShell1.SystemText.QatDialogPlacementCheckbox = "&Place Quick Access Toolbar below the Ribbon"
+        Me.MetroShell1.SystemText.QatDialogRemoveButton = "&Remove"
+        Me.MetroShell1.SystemText.QatPlaceAboveRibbonText = "&Place Quick Access Toolbar above the Ribbon"
+        Me.MetroShell1.SystemText.QatPlaceBelowRibbonText = "&Place Quick Access Toolbar below the Ribbon"
+        Me.MetroShell1.SystemText.QatRemoveItemText = "&Remove from Quick Access Toolbar"
+        Me.MetroShell1.TabIndex = 0
+        Me.MetroShell1.TabStripFont = New System.Drawing.Font("Segoe UI", 10.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.MetroShell1.Text = "MetroShell1"
+        '
+        'MetroTabItem1
+        '
+        Me.MetroTabItem1.Checked = True
+        Me.MetroTabItem1.Name = "MetroTabItem1"
+        Me.MetroTabItem1.Panel = Me.MetroTabPanel1
+        Me.MetroTabItem1.Text = "&HOME"
+        '
+        'MetroTabPanel1
+        '
+        Me.MetroTabPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled
+        Me.MetroTabPanel1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.MetroTabPanel1.Location = New System.Drawing.Point(0, 51)
+        Me.MetroTabPanel1.Name = "MetroTabPanel1"
+        Me.MetroTabPanel1.Padding = New System.Windows.Forms.Padding(3, 0, 3, 3)
+        Me.MetroTabPanel1.Size = New System.Drawing.Size(652, 183)
+        '
+        '
+        '
+        Me.MetroTabPanel1.Style.Class = ""
+        Me.MetroTabPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        '
+        '
+        '
+        Me.MetroTabPanel1.StyleMouseDown.Class = ""
+        Me.MetroTabPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        '
+        '
+        '
+        Me.MetroTabPanel1.StyleMouseOver.Class = ""
+        Me.MetroTabPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        Me.MetroTabPanel1.TabIndex = 1
+        '
+        'MetroTabItem2
+        '
+        Me.MetroTabItem2.Name = "MetroTabItem2"
+        Me.MetroTabItem2.Panel = Me.MetroTabPanel2
+        Me.MetroTabItem2.Text = "&VIEW"
+        '
+        'MetroTabPanel2
+        '
+        Me.MetroTabPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled
+        Me.MetroTabPanel2.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.MetroTabPanel2.Location = New System.Drawing.Point(0, 0)
+        Me.MetroTabPanel2.Name = "MetroTabPanel2"
+        Me.MetroTabPanel2.Padding = New System.Windows.Forms.Padding(3, 0, 3, 3)
+        Me.MetroTabPanel2.Size = New System.Drawing.Size(200, 100)
+        '
+        '
+        '
+        Me.MetroTabPanel2.Style.Class = ""
+        Me.MetroTabPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        '
+        '
+        '
+        Me.MetroTabPanel2.StyleMouseDown.Class = ""
+        Me.MetroTabPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        '
+        '
+        '
+        Me.MetroTabPanel2.StyleMouseOver.Class = ""
+        Me.MetroTabPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        Me.MetroTabPanel2.TabIndex = 2
+        '
+        'StyleManager1
+        '
+        Me.StyleManager1.ManagerStyle = DevComponents.DotNetBar.eStyle.Metro
+        Me.StyleManager1.MetroColorParameters = New DevComponents.DotNetBar.Metro.ColorTables.MetroColorGeneratorParameters(System.Drawing.Color.White, System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(163, Byte), Integer), CType(CType(26, Byte), Integer)))
+        '
+        'QatCustomizeItem1
+        '
+        Me.QatCustomizeItem1.BeginGroup = True
+        Me.QatCustomizeItem1.Name = "QatCustomizeItem1"
+        '
+        'MetroAppButton1
+        '
+        Me.MetroAppButton1.AutoExpandOnClick = True
+        Me.MetroAppButton1.CanCustomize = False
+        Me.MetroAppButton1.ImageFixedSize = New System.Drawing.Size(16, 16)
+        Me.MetroAppButton1.ImagePaddingHorizontal = 0
+        Me.MetroAppButton1.ImagePaddingVertical = 0
+        Me.MetroAppButton1.Name = "MetroAppButton1"
+        Me.MetroAppButton1.ShowSubItems = False
+        Me.MetroAppButton1.Text = "&File"
+        '
+        'ButtonItem1
+        '
+        Me.ButtonItem1.Name = "ButtonItem1"
+        Me.ButtonItem1.Text = "ButtonItem1"
+        '
+        'MetroStatusBar1
+        '
+        '
+        '
+        '
+        Me.MetroStatusBar1.BackgroundStyle.Class = ""
+        Me.MetroStatusBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        Me.MetroStatusBar1.ContainerControlProcessDialogKey = True
+        Me.MetroStatusBar1.Dock = System.Windows.Forms.DockStyle.Bottom
+        Me.MetroStatusBar1.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.MetroStatusBar1.Items.AddRange(New DevComponents.DotNetBar.BaseItem() {Me.LabelItem1})
+        Me.MetroStatusBar1.Location = New System.Drawing.Point(0, 413)
+        Me.MetroStatusBar1.Name = "MetroStatusBar1"
+        Me.MetroStatusBar1.Size = New System.Drawing.Size(652, 22)
+        Me.MetroStatusBar1.TabIndex = 1
+        Me.MetroStatusBar1.Text = "MetroStatusBar1"
+        '
+        'LabelItem1
+        '
+        Me.LabelItem1.Name = "LabelItem1"
+        Me.LabelItem1.Text = "READY"
+        '
+        '$safeitemrootname$
+        '
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.ClientSize = New System.Drawing.Size(653, 436)
+        Me.Controls.Add(Me.MetroStatusBar1)
+        Me.Controls.Add(Me.MetroShell1)
+        Me.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Name = "$safeitemrootname$"
+        Me.Text = "DotNetBar Metro App Form"
+        Me.MetroShell1.ResumeLayout(False)
+        Me.MetroShell1.PerformLayout()
+        Me.ResumeLayout(False)
+
+    End Sub
+    Friend WithEvents MetroShell1 As DevComponents.DotNetBar.Metro.MetroShell
+    Friend WithEvents MetroTabPanel1 As DevComponents.DotNetBar.Metro.MetroTabPanel
+    Friend WithEvents MetroTabPanel2 As DevComponents.DotNetBar.Metro.MetroTabPanel
+    Friend WithEvents MetroAppButton1 As DevComponents.DotNetBar.Metro.MetroAppButton
+    Friend WithEvents MetroTabItem1 As DevComponents.DotNetBar.Metro.MetroTabItem
+    Friend WithEvents MetroTabItem2 As DevComponents.DotNetBar.Metro.MetroTabItem
+    Friend WithEvents ButtonItem1 As DevComponents.DotNetBar.ButtonItem
+    Friend WithEvents QatCustomizeItem1 As DevComponents.DotNetBar.QatCustomizeItem
+    Friend WithEvents StyleManager1 As DevComponents.DotNetBar.StyleManager
+    Friend WithEvents MetroStatusBar1 As DevComponents.DotNetBar.Metro.MetroStatusBar
+    Friend WithEvents LabelItem1 As DevComponents.DotNetBar.LabelItem
+
+End Class
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual Basic/MetroAppForm/Form.resx b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual Basic/MetroAppForm/Form.resx
new file mode 100644
index 00000000..998f01fd
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual Basic/MetroAppForm/Form.resx	
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="StyleManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual Basic/MetroAppForm/Form.vb b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual Basic/MetroAppForm/Form.vb
new file mode 100644
index 00000000..64eb4330
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual Basic/MetroAppForm/Form.vb	
@@ -0,0 +1,3 @@
+Public Class $safeitemrootname$
+
+End Class
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual Basic/MetroAppForm/MetroAppForm.zip b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual Basic/MetroAppForm/MetroAppForm.zip
new file mode 100644
index 00000000..e464b16b
Binary files /dev/null and b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual Basic/MetroAppForm/MetroAppForm.zip differ
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual Basic/MetroAppForm/metroappform.vstemplate b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual Basic/MetroAppForm/metroappform.vstemplate
new file mode 100644
index 00000000..9cbac33b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual Basic/MetroAppForm/metroappform.vstemplate	
@@ -0,0 +1,36 @@
+<VSTemplate Version="3.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name>Metro UI App Form</Name>
+    <Description>DotNetBar Metro Application Form</Description>
+    <Icon Package="{164B10B9-B200-11D0-8C61-00A0C91E29D5}" ID="4527" />
+	<TemplateID>DevComponents.VB.MetroAppForm</TemplateID>
+    <ProjectType>VisualBasic</ProjectType>
+    <SortOrder>11</SortOrder>
+    <DefaultName>Form.vb</DefaultName>
+	<RequiredFrameworkVersion>2.0</RequiredFrameworkVersion>
+    <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
+  </TemplateData>
+  <TemplateContent>
+        <References>
+            <Reference>
+                <Assembly>System</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+            <Reference>
+                <Assembly>System.Drawing</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+            <Reference>
+                <Assembly>System.Windows.Forms</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+			<Reference>
+                <Assembly>DevComponents.DotNetBar2</Assembly>
+                <URL>http://www.devcomponents.com</URL>
+            </Reference>
+        </References>
+
+    <ProjectItem ReplaceParameters="true" SubType="Form">Form.vb</ProjectItem>
+    <ProjectItem ReplaceParameters="true">Form.Designer.vb</ProjectItem>
+  </TemplateContent>
+</VSTemplate>
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual Basic/MetroForm/Form.Designer.vb b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual Basic/MetroForm/Form.Designer.vb
new file mode 100644
index 00000000..7d926fa4
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual Basic/MetroForm/Form.Designer.vb	
@@ -0,0 +1,33 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class $safeitemrootname$
+    Inherits DevComponents.DotNetBar.Metro.MetroForm
+
+    'Form overrides dispose to clean up the component list.
+    <System.Diagnostics.DebuggerNonUserCode()> _
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+        Try
+            If disposing AndAlso components IsNot Nothing Then
+                components.Dispose()
+            End If
+        Finally
+            MyBase.Dispose(disposing)
+        End Try
+    End Sub
+
+    'Required by the Windows Form Designer
+    Private components As System.ComponentModel.IContainer
+
+    'NOTE: The following procedure is required by the Windows Form Designer
+    'It can be modified using the Windows Form Designer.  
+    'Do not modify it using the code editor.
+    <System.Diagnostics.DebuggerStepThrough()> _
+    Private Sub InitializeComponent()
+        components = New System.ComponentModel.Container
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.ClientSize = New System.Drawing.Size(653, 436)
+		Me.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+		Me.Name = "$safeitemrootname$"
+        Me.Text = "MetroForm"
+    End Sub
+End Class
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual Basic/MetroForm/Form.vb b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual Basic/MetroForm/Form.vb
new file mode 100644
index 00000000..9b12d76d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual Basic/MetroForm/Form.vb	
@@ -0,0 +1,3 @@
+Public Class $safeitemrootname$
+
+End Class
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual Basic/MetroForm/MetroForm.zip b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual Basic/MetroForm/MetroForm.zip
new file mode 100644
index 00000000..1742cb89
Binary files /dev/null and b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual Basic/MetroForm/MetroForm.zip differ
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual Basic/MetroForm/metroform.vstemplate b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual Basic/MetroForm/metroform.vstemplate
new file mode 100644
index 00000000..62cc1786
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual Basic/MetroForm/metroform.vstemplate	
@@ -0,0 +1,36 @@
+<VSTemplate Version="3.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name>Metro Form</Name>
+    <Description>DotNetBar Metro Form</Description>
+    <Icon Package="{164B10B9-B200-11D0-8C61-00A0C91E29D5}" ID="4527" />
+	<TemplateID>DevComponents.VB.MetroForm</TemplateID>
+    <ProjectType>VisualBasic</ProjectType>
+    <SortOrder>11</SortOrder>
+    <DefaultName>Form.vb</DefaultName>
+	<RequiredFrameworkVersion>2.0</RequiredFrameworkVersion>
+    <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
+  </TemplateData>
+  <TemplateContent>
+        <References>
+            <Reference>
+                <Assembly>System</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+            <Reference>
+                <Assembly>System.Drawing</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+            <Reference>
+                <Assembly>System.Windows.Forms</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+			<Reference>
+                <Assembly>DevComponents.DotNetBar2</Assembly>
+                <URL>http://www.devcomponents.com</URL>
+            </Reference>
+        </References>
+
+    <ProjectItem ReplaceParameters="true" SubType="Form">Form.vb</ProjectItem>
+    <ProjectItem ReplaceParameters="true">Form.Designer.vb</ProjectItem>
+  </TemplateContent>
+</VSTemplate>
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual Basic/Office2007Form/DotNetBarOffice2007Form.zip b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual Basic/Office2007Form/DotNetBarOffice2007Form.zip
new file mode 100644
index 00000000..bbbe8da0
Binary files /dev/null and b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual Basic/Office2007Form/DotNetBarOffice2007Form.zip differ
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual Basic/Office2007Form/Form.Designer.vb b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual Basic/Office2007Form/Form.Designer.vb
new file mode 100644
index 00000000..2f6f306f
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual Basic/Office2007Form/Form.Designer.vb	
@@ -0,0 +1,29 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class $safeitemrootname$
+    Inherits DevComponents.DotNetBar.OfficeForm
+
+    'Form overrides dispose to clean up the component list.
+    <System.Diagnostics.DebuggerNonUserCode()> _
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+        Try
+            If disposing AndAlso components IsNot Nothing Then
+                components.Dispose()
+            End If
+        Finally
+            MyBase.Dispose(disposing)
+        End Try
+    End Sub
+
+    'Required by the Windows Form Designer
+    Private components As System.ComponentModel.IContainer
+
+    'NOTE: The following procedure is required by the Windows Form Designer
+    'It can be modified using the Windows Form Designer.  
+    'Do not modify it using the code editor.
+    <System.Diagnostics.DebuggerStepThrough()> _
+    Private Sub InitializeComponent()
+        components = New System.ComponentModel.Container
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.Text = "$safeitemrootname$"
+    End Sub
+End Class
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual Basic/Office2007Form/Form.vb b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual Basic/Office2007Form/Form.vb
new file mode 100644
index 00000000..9b12d76d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual Basic/Office2007Form/Form.vb	
@@ -0,0 +1,3 @@
+Public Class $safeitemrootname$
+
+End Class
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual Basic/Office2007Form/office2007form.vstemplate b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual Basic/Office2007Form/office2007form.vstemplate
new file mode 100644
index 00000000..1bf5f9f1
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual Basic/Office2007Form/office2007form.vstemplate	
@@ -0,0 +1,36 @@
+<VSTemplate Version="3.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name>Office Form</Name>
+    <Description>DotNetBar Office Style Form</Description>
+    <Icon Package="{164B10B9-B200-11D0-8C61-00A0C91E29D5}" ID="4527" />
+	<TemplateID>DevComponents.VB.Office2007Form</TemplateID>
+    <ProjectType>VisualBasic</ProjectType>
+    <SortOrder>11</SortOrder>
+    <DefaultName>Form.vb</DefaultName>
+	<RequiredFrameworkVersion>2.0</RequiredFrameworkVersion>
+    <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
+  </TemplateData>
+  <TemplateContent>
+        <References>
+            <Reference>
+                <Assembly>System</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+            <Reference>
+                <Assembly>System.Drawing</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+            <Reference>
+                <Assembly>System.Windows.Forms</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+			<Reference>
+                <Assembly>DevComponents.DotNetBar2</Assembly>
+                <URL>http://www.devcomponents.com</URL>
+            </Reference>
+        </References>
+
+    <ProjectItem ReplaceParameters="true" SubType="Form">Form.vb</ProjectItem>
+    <ProjectItem ReplaceParameters="true">Form.Designer.vb</ProjectItem>
+  </TemplateContent>
+</VSTemplate>
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual Basic/RibbonForm/DotNetBarRibbonForm.zip b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual Basic/RibbonForm/DotNetBarRibbonForm.zip
new file mode 100644
index 00000000..fbfe10c8
Binary files /dev/null and b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual Basic/RibbonForm/DotNetBarRibbonForm.zip differ
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual Basic/RibbonForm/Form.Designer.vb b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual Basic/RibbonForm/Form.Designer.vb
new file mode 100644
index 00000000..abbb321e
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual Basic/RibbonForm/Form.Designer.vb	
@@ -0,0 +1,28 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class $safeitemrootname$
+    Inherits DevComponents.DotNetBar.RibbonForm
+
+    'Form overrides dispose to clean up the component list.
+    <System.Diagnostics.DebuggerNonUserCode()> _
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+        Try
+            If disposing AndAlso components IsNot Nothing Then
+                components.Dispose()
+            End If
+        Finally
+            MyBase.Dispose(disposing)
+        End Try
+    End Sub
+
+    'Required by the Windows Form Designer
+    Private components As System.ComponentModel.IContainer
+
+    'NOTE: The following procedure is required by the Windows Form Designer
+    'It can be modified using the Windows Form Designer.  
+    'Do not modify it using the code editor.
+    <System.Diagnostics.DebuggerStepThrough()> _
+    Private Sub InitializeComponent()
+        components = New System.ComponentModel.Container
+        Me.Text = "$safeitemrootname$"
+    End Sub
+End Class
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual Basic/RibbonForm/Form.vb b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual Basic/RibbonForm/Form.vb
new file mode 100644
index 00000000..9b12d76d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual Basic/RibbonForm/Form.vb	
@@ -0,0 +1,3 @@
+Public Class $safeitemrootname$
+
+End Class
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual Basic/RibbonForm/ribbonform.vstemplate b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual Basic/RibbonForm/ribbonform.vstemplate
new file mode 100644
index 00000000..13e12ed8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual Basic/RibbonForm/ribbonform.vstemplate	
@@ -0,0 +1,36 @@
+<VSTemplate Version="3.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name>Ribbon Form</Name>
+    <Description>DotNetBar Ribbon Form</Description>
+    <Icon Package="{164B10B9-B200-11D0-8C61-00A0C91E29D5}" ID="4527" />
+	<TemplateID>DevComponents.VB.RibbonForm</TemplateID>
+    <ProjectType>VisualBasic</ProjectType>
+    <SortOrder>11</SortOrder>
+    <DefaultName>Form.vb</DefaultName>
+	<RequiredFrameworkVersion>2.0</RequiredFrameworkVersion>
+    <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
+  </TemplateData>
+  <TemplateContent>
+        <References>
+            <Reference>
+                <Assembly>System</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+            <Reference>
+                <Assembly>System.Drawing</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+            <Reference>
+                <Assembly>System.Windows.Forms</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+			<Reference>
+                <Assembly>DevComponents.DotNetBar2</Assembly>
+                <URL>http://www.devcomponents.com</URL>
+            </Reference>
+        </References>
+
+    <ProjectItem ReplaceParameters="true" SubType="Form">Form.vb</ProjectItem>
+    <ProjectItem ReplaceParameters="true">Form.Designer.vb</ProjectItem>
+  </TemplateContent>
+</VSTemplate>
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual Basic/TabbedForm/Form.Designer.vb b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual Basic/TabbedForm/Form.Designer.vb
new file mode 100644
index 00000000..7fcc4215
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual Basic/TabbedForm/Form.Designer.vb	
@@ -0,0 +1,176 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class $safeitemrootname$
+    Inherits DevComponents.DotNetBar.Controls.TabParentForm
+
+    'Form overrides dispose to clean up the component list.
+    <System.Diagnostics.DebuggerNonUserCode()> _
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+        Try
+            If disposing AndAlso components IsNot Nothing Then
+                components.Dispose()
+            End If
+        Finally
+            MyBase.Dispose(disposing)
+        End Try
+    End Sub
+
+    'Required by the Windows Form Designer
+    Private components As System.ComponentModel.IContainer
+
+    'NOTE: The following procedure is required by the Windows Form Designer
+    'It can be modified using the Windows Form Designer.  
+    'Do not modify it using the code editor.
+    <System.Diagnostics.DebuggerStepThrough()> _
+    Private Sub InitializeComponent()
+        Me.TabFormControl1 = New DevComponents.DotNetBar.Controls.TabFormControl()
+        Me.TabFormPanel1 = New DevComponents.DotNetBar.Controls.TabFormPanel()
+        Me.TabFormPanel2 = New DevComponents.DotNetBar.Controls.TabFormPanel()
+        Me.TabFormItem1 = New DevComponents.DotNetBar.Controls.TabFormItem()
+        Me.TabFormItem2 = New DevComponents.DotNetBar.Controls.TabFormItem()
+        Me.Label1 = New System.Windows.Forms.Label()
+        Me.Label2 = New System.Windows.Forms.Label()
+        Me.TabFormControl1.SuspendLayout
+        Me.TabFormPanel1.SuspendLayout
+        Me.TabFormPanel2.SuspendLayout
+        Me.SuspendLayout
+        '
+        'TabFormControl1
+        '
+        Me.TabFormControl1.BackColor = System.Drawing.Color.White
+        '
+        '
+        '
+        Me.TabFormControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        Me.TabFormControl1.Controls.Add(Me.TabFormPanel1)
+        Me.TabFormControl1.Controls.Add(Me.TabFormPanel2)
+        Me.TabFormControl1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.TabFormControl1.ForeColor = System.Drawing.Color.Black
+        Me.TabFormControl1.Items.AddRange(New DevComponents.DotNetBar.BaseItem() {Me.TabFormItem1, Me.TabFormItem2})
+        Me.TabFormControl1.Location = New System.Drawing.Point(1, 1)
+        Me.TabFormControl1.Name = "TabFormControl1"
+        Me.TabFormControl1.Size = New System.Drawing.Size(444, 311)
+        Me.TabFormControl1.SystemText.MaximizeRibbonText = "&Maximize the Ribbon"
+        Me.TabFormControl1.SystemText.MinimizeRibbonText = "Mi&nimize the Ribbon"
+        Me.TabFormControl1.SystemText.QatAddItemText = "&Add to Quick Access Toolbar"
+        Me.TabFormControl1.SystemText.QatCustomizeMenuLabel = "<b>Customize Quick Access Toolbar</b>"
+        Me.TabFormControl1.SystemText.QatCustomizeText = "&Customize Quick Access Toolbar..."
+        Me.TabFormControl1.SystemText.QatDialogAddButton = "&Add >>"
+        Me.TabFormControl1.SystemText.QatDialogCancelButton = "Cancel"
+        Me.TabFormControl1.SystemText.QatDialogCaption = "Customize Quick Access Toolbar"
+        Me.TabFormControl1.SystemText.QatDialogCategoriesLabel = "&Choose commands from:"
+        Me.TabFormControl1.SystemText.QatDialogOkButton = "OK"
+        Me.TabFormControl1.SystemText.QatDialogPlacementCheckbox = "&Place Quick Access Toolbar below the Ribbon"
+        Me.TabFormControl1.SystemText.QatDialogRemoveButton = "&Remove"
+        Me.TabFormControl1.SystemText.QatPlaceAboveRibbonText = "&Place Quick Access Toolbar above the Ribbon"
+        Me.TabFormControl1.SystemText.QatPlaceBelowRibbonText = "&Place Quick Access Toolbar below the Ribbon"
+        Me.TabFormControl1.SystemText.QatRemoveItemText = "&Remove from Quick Access Toolbar"
+        Me.TabFormControl1.TabIndex = 0
+        Me.TabFormControl1.TabStripFont = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+        Me.TabFormControl1.Text = "TabFormControl1"
+        '
+        'TabFormPanel1
+        '
+        Me.TabFormPanel1.Controls.Add(Me.Label1)
+        Me.TabFormPanel1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.TabFormPanel1.Location = New System.Drawing.Point(0, 28)
+        Me.TabFormPanel1.Name = "TabFormPanel1"
+        Me.TabFormPanel1.Padding = New System.Windows.Forms.Padding(3, 0, 3, 3)
+        Me.TabFormPanel1.Size = New System.Drawing.Size(444, 283)
+        '
+        '
+        '
+        Me.TabFormPanel1.Style.Class = "TabFormPanel"
+        Me.TabFormPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        '
+        '
+        '
+        Me.TabFormPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        '
+        '
+        '
+        Me.TabFormPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        Me.TabFormPanel1.TabIndex = 1
+        '
+        'TabFormPanel2
+        '
+        Me.TabFormPanel2.Controls.Add(Me.Label2)
+        Me.TabFormPanel2.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.TabFormPanel2.Location = New System.Drawing.Point(0, 28)
+        Me.TabFormPanel2.Name = "TabFormPanel2"
+        Me.TabFormPanel2.Padding = New System.Windows.Forms.Padding(3, 0, 3, 3)
+        Me.TabFormPanel2.Size = New System.Drawing.Size(444, 283)
+        '
+        '
+        '
+        Me.TabFormPanel2.Style.Class = "TabFormPanel"
+        Me.TabFormPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        '
+        '
+        '
+        Me.TabFormPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        '
+        '
+        '
+        Me.TabFormPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        Me.TabFormPanel2.TabIndex = 2
+        Me.TabFormPanel2.Visible = false
+        '
+        'TabFormItem1
+        '
+        Me.TabFormItem1.Checked = true
+        Me.TabFormItem1.Name = "TabFormItem1"
+        Me.TabFormItem1.Panel = Me.TabFormPanel1
+        Me.TabFormItem1.Text = "Document 1"
+        '
+        'TabFormItem2
+        '
+        Me.TabFormItem2.Name = "TabFormItem2"
+        Me.TabFormItem2.Panel = Me.TabFormPanel2
+        Me.TabFormItem2.Text = "Document 2"
+        '
+        'Label1
+        '
+        Me.Label1.AutoSize = true
+        Me.Label1.BackColor = System.Drawing.Color.Transparent
+        Me.Label1.Location = New System.Drawing.Point(155, 127)
+        Me.Label1.Name = "Label1"
+        Me.Label1.Size = New System.Drawing.Size(101, 13)
+        Me.Label1.TabIndex = 0
+        Me.Label1.Text = "Your content here..."
+        '
+        'Label2
+        '
+        Me.Label2.AutoSize = true
+        Me.Label2.BackColor = System.Drawing.Color.Transparent
+        Me.Label2.Location = New System.Drawing.Point(172, 135)
+        Me.Label2.Name = "Label2"
+        Me.Label2.Size = New System.Drawing.Size(101, 13)
+        Me.Label2.TabIndex = 1
+        Me.Label2.Text = "Your content here..."
+        '
+        '$safeitemrootname$
+        '
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.ClientSize = New System.Drawing.Size(446, 313)
+        Me.Controls.Add(Me.TabFormControl1)
+        Me.Name = "$safeitemrootname$"
+        Me.Text = "DotNetBar Tabbed Form"
+        Me.TabFormControl1.ResumeLayout(false)
+        Me.TabFormControl1.PerformLayout
+        Me.TabFormPanel1.ResumeLayout(false)
+        Me.TabFormPanel1.PerformLayout
+        Me.TabFormPanel2.ResumeLayout(false)
+        Me.TabFormPanel2.PerformLayout
+        Me.ResumeLayout(false)
+
+    End Sub
+    Friend WithEvents TabFormControl1 As DevComponents.DotNetBar.Controls.TabFormControl
+    Friend WithEvents TabFormPanel1 As DevComponents.DotNetBar.Controls.TabFormPanel
+    Friend WithEvents TabFormPanel2 As DevComponents.DotNetBar.Controls.TabFormPanel
+    Friend WithEvents TabFormItem1 As DevComponents.DotNetBar.Controls.TabFormItem
+    Friend WithEvents TabFormItem2 As DevComponents.DotNetBar.Controls.TabFormItem
+    Friend WithEvents Label1 As System.Windows.Forms.Label
+    Friend WithEvents Label2 As System.Windows.Forms.Label
+
+End Class
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual Basic/TabbedForm/Form.resx b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual Basic/TabbedForm/Form.resx
new file mode 100644
index 00000000..19dc0dd8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual Basic/TabbedForm/Form.resx	
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual Basic/TabbedForm/Form.vb b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual Basic/TabbedForm/Form.vb
new file mode 100644
index 00000000..64eb4330
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual Basic/TabbedForm/Form.vb	
@@ -0,0 +1,3 @@
+Public Class $safeitemrootname$
+
+End Class
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual Basic/TabbedForm/TabbedForm.zip b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual Basic/TabbedForm/TabbedForm.zip
new file mode 100644
index 00000000..66f60672
Binary files /dev/null and b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual Basic/TabbedForm/TabbedForm.zip differ
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual Basic/TabbedForm/tabbedform.vstemplate b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual Basic/TabbedForm/tabbedform.vstemplate
new file mode 100644
index 00000000..865bb1b6
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual Basic/TabbedForm/tabbedform.vstemplate	
@@ -0,0 +1,36 @@
+<VSTemplate Version="3.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name>Tabbed Form</Name>
+    <Description>DotNetBar Tabbed Form</Description>
+    <Icon Package="{164B10B9-B200-11D0-8C61-00A0C91E29D5}" ID="4527" />
+	<TemplateID>DevComponents.VB.TabbedForm</TemplateID>
+    <ProjectType>VisualBasic</ProjectType>
+    <SortOrder>12</SortOrder>
+    <DefaultName>Form.vb</DefaultName>
+	<RequiredFrameworkVersion>2.0</RequiredFrameworkVersion>
+    <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
+  </TemplateData>
+  <TemplateContent>
+        <References>
+            <Reference>
+                <Assembly>System</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+            <Reference>
+                <Assembly>System.Drawing</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+            <Reference>
+                <Assembly>System.Windows.Forms</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+			<Reference>
+                <Assembly>DevComponents.DotNetBar2</Assembly>
+                <URL>http://www.devcomponents.com</URL>
+            </Reference>
+        </References>
+
+    <ProjectItem ReplaceParameters="true" SubType="Form">Form.vb</ProjectItem>
+    <ProjectItem ReplaceParameters="true">Form.Designer.vb</ProjectItem>
+  </TemplateContent>
+</VSTemplate>
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual C#/MetroAppForm/Form.Designer.cs b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual C#/MetroAppForm/Form.Designer.cs
new file mode 100644
index 00000000..8d1bb1bc
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual C#/MetroAppForm/Form.Designer.cs	
@@ -0,0 +1,234 @@
+namespace $rootnamespace$
+{
+    partial class $safeitemrootname$
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form 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.metroShell1 = new DevComponents.DotNetBar.Metro.MetroShell();
+            this.metroTabItem1 = new DevComponents.DotNetBar.Metro.MetroTabItem();
+            this.metroTabPanel1 = new DevComponents.DotNetBar.Metro.MetroTabPanel();
+            this.metroTabItem2 = new DevComponents.DotNetBar.Metro.MetroTabItem();
+            this.metroTabPanel2 = new DevComponents.DotNetBar.Metro.MetroTabPanel();
+            this.styleManager1 = new DevComponents.DotNetBar.StyleManager(this.components);
+            this.qatCustomizeItem1 = new DevComponents.DotNetBar.QatCustomizeItem();
+            this.metroAppButton1 = new DevComponents.DotNetBar.Metro.MetroAppButton();
+            this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem();
+            this.metroStatusBar1 = new DevComponents.DotNetBar.Metro.MetroStatusBar();
+            this.labelItem1 = new DevComponents.DotNetBar.LabelItem();
+            this.metroShell1.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // metroShell1
+            // 
+            this.metroShell1.BackColor = System.Drawing.Color.White;
+            // 
+            // 
+            // 
+            this.metroShell1.BackgroundStyle.Class = "";
+            this.metroShell1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.metroShell1.CaptionVisible = true;
+            this.metroShell1.Controls.Add(this.metroTabPanel1);
+            this.metroShell1.Controls.Add(this.metroTabPanel2);
+            this.metroShell1.Dock = System.Windows.Forms.DockStyle.Top;
+            this.metroShell1.ForeColor = System.Drawing.Color.Black;
+            this.metroShell1.HelpButtonText = null;
+            this.metroShell1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+            this.metroAppButton1,
+            this.metroTabItem1,
+            this.metroTabItem2});
+            this.metroShell1.KeyTipsFont = new System.Drawing.Font("Tahoma", 7F);
+            this.metroShell1.Location = new System.Drawing.Point(0, 1);
+            this.metroShell1.Name = "metroShell1";
+            this.metroShell1.QuickToolbarItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+            this.buttonItem1,
+            this.qatCustomizeItem1});
+            this.metroShell1.Size = new System.Drawing.Size(624, 218);
+            this.metroShell1.SystemText.MaximizeRibbonText = "&Maximize the Ribbon";
+            this.metroShell1.SystemText.MinimizeRibbonText = "Mi&nimize the Ribbon";
+            this.metroShell1.SystemText.QatAddItemText = "&Add to Quick Access Toolbar";
+            this.metroShell1.SystemText.QatCustomizeMenuLabel = "<b>Customize Quick Access Toolbar</b>";
+            this.metroShell1.SystemText.QatCustomizeText = "&Customize Quick Access Toolbar...";
+            this.metroShell1.SystemText.QatDialogAddButton = "&Add >>";
+            this.metroShell1.SystemText.QatDialogCancelButton = "Cancel";
+            this.metroShell1.SystemText.QatDialogCaption = "Customize Quick Access Toolbar";
+            this.metroShell1.SystemText.QatDialogCategoriesLabel = "&Choose commands from:";
+            this.metroShell1.SystemText.QatDialogOkButton = "OK";
+            this.metroShell1.SystemText.QatDialogPlacementCheckbox = "&Place Quick Access Toolbar below the Ribbon";
+            this.metroShell1.SystemText.QatDialogRemoveButton = "&Remove";
+            this.metroShell1.SystemText.QatPlaceAboveRibbonText = "&Place Quick Access Toolbar above the Ribbon";
+            this.metroShell1.SystemText.QatPlaceBelowRibbonText = "&Place Quick Access Toolbar below the Ribbon";
+            this.metroShell1.SystemText.QatRemoveItemText = "&Remove from Quick Access Toolbar";
+            this.metroShell1.TabIndex = 0;
+            this.metroShell1.TabStripFont = new System.Drawing.Font("Segoe UI", 10.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.metroShell1.Text = "metroShell1";
+            // 
+            // metroTabItem1
+            // 
+            this.metroTabItem1.Checked = true;
+            this.metroTabItem1.Name = "metroTabItem1";
+            this.metroTabItem1.Panel = this.metroTabPanel1;
+            this.metroTabItem1.Text = "&HOME";
+            // 
+            // metroTabPanel1
+            // 
+            this.metroTabPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.metroTabPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.metroTabPanel1.Location = new System.Drawing.Point(0, 51);
+            this.metroTabPanel1.Name = "metroTabPanel1";
+            this.metroTabPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3);
+            this.metroTabPanel1.Size = new System.Drawing.Size(624, 167);
+            // 
+            // 
+            // 
+            this.metroTabPanel1.Style.Class = "";
+            this.metroTabPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.metroTabPanel1.StyleMouseDown.Class = "";
+            this.metroTabPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.metroTabPanel1.StyleMouseOver.Class = "";
+            this.metroTabPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.metroTabPanel1.TabIndex = 1;
+            // 
+            // metroTabItem2
+            // 
+            this.metroTabItem2.Name = "metroTabItem2";
+            this.metroTabItem2.Panel = this.metroTabPanel2;
+            this.metroTabItem2.Text = "&VIEW";
+            // 
+            // metroTabPanel2
+            // 
+            this.metroTabPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.metroTabPanel2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.metroTabPanel2.Location = new System.Drawing.Point(0, 0);
+            this.metroTabPanel2.Name = "metroTabPanel2";
+            this.metroTabPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3);
+            this.metroTabPanel2.Size = new System.Drawing.Size(200, 100);
+            // 
+            // 
+            // 
+            this.metroTabPanel2.Style.Class = "";
+            this.metroTabPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.metroTabPanel2.StyleMouseDown.Class = "";
+            this.metroTabPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.metroTabPanel2.StyleMouseOver.Class = "";
+            this.metroTabPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.metroTabPanel2.TabIndex = 2;
+            // 
+            // styleManager1
+            // 
+            this.styleManager1.ManagerStyle = DevComponents.DotNetBar.eStyle.Metro;
+            this.styleManager1.MetroColorParameters = new DevComponents.DotNetBar.Metro.ColorTables.MetroColorGeneratorParameters(System.Drawing.Color.White, System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(163)))), ((int)(((byte)(26))))));
+            // 
+            // qatCustomizeItem1
+            // 
+            this.qatCustomizeItem1.BeginGroup = true;
+            this.qatCustomizeItem1.Name = "qatCustomizeItem1";
+            // 
+            // metroAppButton1
+            // 
+            this.metroAppButton1.AutoExpandOnClick = true;
+            this.metroAppButton1.CanCustomize = false;
+            this.metroAppButton1.ImageFixedSize = new System.Drawing.Size(16, 16);
+            this.metroAppButton1.ImagePaddingHorizontal = 0;
+            this.metroAppButton1.ImagePaddingVertical = 0;
+            this.metroAppButton1.Name = "metroAppButton1";
+            this.metroAppButton1.ShowSubItems = false;
+            this.metroAppButton1.Text = "&File";
+            // 
+            // buttonItem1
+            // 
+            this.buttonItem1.Name = "buttonItem1";
+            this.buttonItem1.Text = "buttonItem1";
+            // 
+            // metroStatusBar1
+            // 
+            // 
+            // 
+            // 
+            this.metroStatusBar1.BackgroundStyle.Class = "";
+            this.metroStatusBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.metroStatusBar1.ContainerControlProcessDialogKey = true;
+            this.metroStatusBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.metroStatusBar1.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.metroStatusBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+            this.labelItem1});
+            this.metroStatusBar1.Location = new System.Drawing.Point(0, 374);
+            this.metroStatusBar1.Name = "metroStatusBar1";
+            this.metroStatusBar1.Size = new System.Drawing.Size(624, 21);
+            this.metroStatusBar1.TabIndex = 1;
+            this.metroStatusBar1.Text = "metroStatusBar1";
+            // 
+            // labelItem1
+            // 
+            this.labelItem1.Name = "labelItem1";
+            this.labelItem1.Text = "READY";
+            // 
+            // $safeitemrootname$
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(625, 396);
+            this.Controls.Add(this.metroStatusBar1);
+            this.Controls.Add(this.metroShell1);
+            this.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.Name = "$safeitemrootname$";
+            this.Text = "DotNetBar Metro App Form";
+            this.metroShell1.ResumeLayout(false);
+            this.metroShell1.PerformLayout();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private DevComponents.DotNetBar.Metro.MetroShell metroShell1;
+        private DevComponents.DotNetBar.Metro.MetroTabPanel metroTabPanel1;
+        private DevComponents.DotNetBar.Metro.MetroTabPanel metroTabPanel2;
+        private DevComponents.DotNetBar.Metro.MetroAppButton metroAppButton1;
+        private DevComponents.DotNetBar.Metro.MetroTabItem metroTabItem1;
+        private DevComponents.DotNetBar.Metro.MetroTabItem metroTabItem2;
+        private DevComponents.DotNetBar.ButtonItem buttonItem1;
+        private DevComponents.DotNetBar.QatCustomizeItem qatCustomizeItem1;
+        private DevComponents.DotNetBar.StyleManager styleManager1;
+        private DevComponents.DotNetBar.Metro.MetroStatusBar metroStatusBar1;
+        private DevComponents.DotNetBar.LabelItem labelItem1;
+
+    }
+}
+
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual C#/MetroAppForm/Form.cs b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual C#/MetroAppForm/Form.cs
new file mode 100644
index 00000000..ff2c3a9b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual C#/MetroAppForm/Form.cs	
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+
+namespace $rootnamespace$
+{
+    public partial class $safeitemrootname$ : DevComponents.DotNetBar.Metro.MetroAppForm
+    {
+        public $safeitemrootname$()
+        {
+            InitializeComponent();
+        }
+    }
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual C#/MetroAppForm/Form.resx b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual C#/MetroAppForm/Form.resx
new file mode 100644
index 00000000..c3d21cf2
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual C#/MetroAppForm/Form.resx	
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="styleManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual C#/MetroAppForm/MetroAppForm.zip b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual C#/MetroAppForm/MetroAppForm.zip
new file mode 100644
index 00000000..e72433e8
Binary files /dev/null and b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual C#/MetroAppForm/MetroAppForm.zip differ
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual C#/MetroAppForm/metroappform.vstemplate b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual C#/MetroAppForm/metroappform.vstemplate
new file mode 100644
index 00000000..ae758d3b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual C#/MetroAppForm/metroappform.vstemplate	
@@ -0,0 +1,38 @@
+<VSTemplate Version="3.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name>Metro App Form</Name>
+    <Description>DotNetBar Metro Application Form</Description>
+    <Icon Package="{FAE04EC1-301F-11d3-BF4B-00C04F79EFBC}" ID="4535" />
+	<TemplateID>DevComponents.CS.MetroAppForm</TemplateID>
+    <ProjectType>CSharp</ProjectType>
+    <SortOrder>41</SortOrder>
+    <DefaultName>Form.cs</DefaultName>
+	<RequiredFrameworkVersion>2.0</RequiredFrameworkVersion>
+    <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
+  </TemplateData>
+  <TemplateContent>
+		<References>
+			<Reference>
+				<Assembly>System</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Data</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Drawing</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Windows.Forms</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Xml</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>DevComponents.DotNetBar2</Assembly>
+			</Reference>
+		</References>
+
+    <ProjectItem ReplaceParameters="true" SubType="Form">Form.cs</ProjectItem>
+    <ProjectItem ReplaceParameters="true">Form.Designer.cs</ProjectItem>
+  </TemplateContent>
+</VSTemplate>
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual C#/MetroForm/MetroForm.zip b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual C#/MetroForm/MetroForm.zip
new file mode 100644
index 00000000..b98a2499
Binary files /dev/null and b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual C#/MetroForm/MetroForm.zip differ
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual C#/MetroForm/form.cs b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual C#/MetroForm/form.cs
new file mode 100644
index 00000000..11692b62
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual C#/MetroForm/form.cs	
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+using DevComponents.DotNetBar;
+
+namespace $rootnamespace$
+{
+	public partial class $safeitemrootname$: DevComponents.DotNetBar.Metro.MetroForm
+	{
+		public $safeitemrootname$()
+		{
+			InitializeComponent();
+		}
+	}
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual C#/MetroForm/form.designer.cs b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual C#/MetroForm/form.designer.cs
new file mode 100644
index 00000000..3a1a31d0
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual C#/MetroForm/form.designer.cs	
@@ -0,0 +1,42 @@
+namespace $rootnamespace$
+{
+	partial class $safeitemrootname$
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if (disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form 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.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(625, 396);
+            this.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.Name = "$safeitemrootname$";
+			this.Text = "MetroForm";
+		}
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual C#/MetroForm/metroform.vstemplate b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual C#/MetroForm/metroform.vstemplate
new file mode 100644
index 00000000..3961f06f
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual C#/MetroForm/metroform.vstemplate	
@@ -0,0 +1,38 @@
+<VSTemplate Version="3.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name>Metro Form</Name>
+    <Description>DotNetBar Metro Form</Description>
+    <Icon Package="{FAE04EC1-301F-11d3-BF4B-00C04F79EFBC}" ID="4535" />
+	<TemplateID>DevComponents.CS.MetroForm</TemplateID>
+    <ProjectType>CSharp</ProjectType>
+    <SortOrder>41</SortOrder>
+    <DefaultName>Form.cs</DefaultName>
+	<RequiredFrameworkVersion>2.0</RequiredFrameworkVersion>
+    <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
+  </TemplateData>
+  <TemplateContent>
+		<References>
+			<Reference>
+				<Assembly>System</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Data</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Drawing</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Windows.Forms</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Xml</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>DevComponents.DotNetBar2</Assembly>
+			</Reference>
+		</References>
+
+    <ProjectItem ReplaceParameters="true" SubType="Form">Form.cs</ProjectItem>
+    <ProjectItem ReplaceParameters="true">Form.Designer.cs</ProjectItem>
+  </TemplateContent>
+</VSTemplate>
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual C#/Office2007Form/DotNetBarOffice2007Form.zip b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual C#/Office2007Form/DotNetBarOffice2007Form.zip
new file mode 100644
index 00000000..e5924f7c
Binary files /dev/null and b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual C#/Office2007Form/DotNetBarOffice2007Form.zip differ
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual C#/Office2007Form/form.cs b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual C#/Office2007Form/form.cs
new file mode 100644
index 00000000..8e61cb27
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual C#/Office2007Form/form.cs	
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+using DevComponents.DotNetBar;
+
+namespace $rootnamespace$
+{
+	public partial class $safeitemrootname$: DevComponents.DotNetBar.OfficeForm
+	{
+		public $safeitemrootname$()
+		{
+			InitializeComponent();
+		}
+	}
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual C#/Office2007Form/form.designer.cs b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual C#/Office2007Form/form.designer.cs
new file mode 100644
index 00000000..6bc0536d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual C#/Office2007Form/form.designer.cs	
@@ -0,0 +1,37 @@
+namespace $rootnamespace$
+{
+	partial class $safeitemrootname$
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if (disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form 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.Text = "$safeitemrootname$";
+		}
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual C#/Office2007Form/office2007form.vstemplate b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual C#/Office2007Form/office2007form.vstemplate
new file mode 100644
index 00000000..f2bf2593
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual C#/Office2007Form/office2007form.vstemplate	
@@ -0,0 +1,38 @@
+<VSTemplate Version="3.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name>Office Form</Name>
+    <Description>DotNetBar Office Style Form</Description>
+    <Icon Package="{FAE04EC1-301F-11d3-BF4B-00C04F79EFBC}" ID="4535" />
+	<TemplateID>DevComponents.CS.Office2007Form</TemplateID>
+    <ProjectType>CSharp</ProjectType>
+    <SortOrder>41</SortOrder>
+    <DefaultName>Form.cs</DefaultName>
+	<RequiredFrameworkVersion>2.0</RequiredFrameworkVersion>
+    <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
+  </TemplateData>
+  <TemplateContent>
+		<References>
+			<Reference>
+				<Assembly>System</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Data</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Drawing</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Windows.Forms</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Xml</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>DevComponents.DotNetBar2</Assembly>
+			</Reference>
+		</References>
+
+    <ProjectItem ReplaceParameters="true" SubType="Form">Form.cs</ProjectItem>
+    <ProjectItem ReplaceParameters="true">Form.Designer.cs</ProjectItem>
+  </TemplateContent>
+</VSTemplate>
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual C#/RibbonForm/DotNetBarRibbonForm.zip b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual C#/RibbonForm/DotNetBarRibbonForm.zip
new file mode 100644
index 00000000..33693820
Binary files /dev/null and b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual C#/RibbonForm/DotNetBarRibbonForm.zip differ
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual C#/RibbonForm/form.cs b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual C#/RibbonForm/form.cs
new file mode 100644
index 00000000..bfd40b47
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual C#/RibbonForm/form.cs	
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+using DevComponents.DotNetBar;
+
+namespace $rootnamespace$
+{
+	public partial class $safeitemrootname$: DevComponents.DotNetBar.RibbonForm
+	{
+		public $safeitemrootname$()
+		{
+			InitializeComponent();
+		}
+	}
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual C#/RibbonForm/form.designer.cs b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual C#/RibbonForm/form.designer.cs
new file mode 100644
index 00000000..6bc0536d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual C#/RibbonForm/form.designer.cs	
@@ -0,0 +1,37 @@
+namespace $rootnamespace$
+{
+	partial class $safeitemrootname$
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if (disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form 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.Text = "$safeitemrootname$";
+		}
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual C#/RibbonForm/ribbonform.vstemplate b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual C#/RibbonForm/ribbonform.vstemplate
new file mode 100644
index 00000000..a0273570
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual C#/RibbonForm/ribbonform.vstemplate	
@@ -0,0 +1,38 @@
+<VSTemplate Version="3.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name>Ribbon Form</Name>
+    <Description>DotNetBar Ribbon Form</Description>
+    <Icon Package="{FAE04EC1-301F-11d3-BF4B-00C04F79EFBC}" ID="4535" />
+	<TemplateID>DevComponents.CS.RibbonForm</TemplateID>
+    <ProjectType>CSharp</ProjectType>
+    <SortOrder>41</SortOrder>
+	<RequiredFrameworkVersion>2.0</RequiredFrameworkVersion>
+    <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
+    <DefaultName>RibbonForm.cs</DefaultName>
+  </TemplateData>
+  <TemplateContent>
+		<References>
+			<Reference>
+				<Assembly>System</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Data</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Drawing</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Windows.Forms</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Xml</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>DevComponents.DotNetBar2</Assembly>
+			</Reference>
+		</References>
+
+    <ProjectItem ReplaceParameters="true" SubType="Form">Form.cs</ProjectItem>
+    <ProjectItem ReplaceParameters="true">Form.Designer.cs</ProjectItem>
+  </TemplateContent>
+</VSTemplate>
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual C#/TabbedForm/Form.Designer.cs b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual C#/TabbedForm/Form.Designer.cs
new file mode 100644
index 00000000..6a057d83
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual C#/TabbedForm/Form.Designer.cs	
@@ -0,0 +1,175 @@
+namespace $rootnamespace$
+{
+    partial class $safeitemrootname$
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form 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.tabFormControl1 = new DevComponents.DotNetBar.Controls.TabFormControl();
+            this.tabFormPanel1 = new DevComponents.DotNetBar.Controls.TabFormPanel();
+            this.tabFormPanel2 = new DevComponents.DotNetBar.Controls.TabFormPanel();
+            this.tabFormItem1 = new DevComponents.DotNetBar.Controls.TabFormItem();
+            this.tabFormItem2 = new DevComponents.DotNetBar.Controls.TabFormItem();
+            this.label1 = new System.Windows.Forms.Label();
+            this.label2 = new System.Windows.Forms.Label();
+            this.tabFormControl1.SuspendLayout();
+            this.tabFormPanel1.SuspendLayout();
+            this.tabFormPanel2.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // tabFormControl1
+            // 
+            this.tabFormControl1.BackColor = System.Drawing.Color.White;
+            // 
+            // 
+            // 
+            this.tabFormControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.tabFormControl1.Controls.Add(this.tabFormPanel1);
+            this.tabFormControl1.Controls.Add(this.tabFormPanel2);
+            this.tabFormControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tabFormControl1.ForeColor = System.Drawing.Color.Black;
+            this.tabFormControl1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+            this.tabFormItem1,
+            this.tabFormItem2});
+            this.tabFormControl1.Location = new System.Drawing.Point(1, 1);
+            this.tabFormControl1.Name = "tabFormControl1";
+            this.tabFormControl1.Size = new System.Drawing.Size(614, 412);
+            this.tabFormControl1.TabIndex = 0;
+            this.tabFormControl1.TabStripFont = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.tabFormControl1.Text = "tabFormControl1";
+            // 
+            // tabFormPanel1
+            // 
+            this.tabFormPanel1.Controls.Add(this.label1);
+            this.tabFormPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tabFormPanel1.Location = new System.Drawing.Point(0, 28);
+            this.tabFormPanel1.Name = "tabFormPanel1";
+            this.tabFormPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3);
+            this.tabFormPanel1.Size = new System.Drawing.Size(614, 384);
+            // 
+            // 
+            // 
+            this.tabFormPanel1.Style.Class = "TabFormPanel";
+            this.tabFormPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.tabFormPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.tabFormPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.tabFormPanel1.TabIndex = 1;
+            // 
+            // tabFormPanel2
+            // 
+            this.tabFormPanel2.Controls.Add(this.label2);
+            this.tabFormPanel2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tabFormPanel2.Location = new System.Drawing.Point(0, 28);
+            this.tabFormPanel2.Name = "tabFormPanel2";
+            this.tabFormPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3);
+            this.tabFormPanel2.Size = new System.Drawing.Size(614, 384);
+            // 
+            // 
+            // 
+            this.tabFormPanel2.Style.Class = "TabFormPanel";
+            this.tabFormPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.tabFormPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.tabFormPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.tabFormPanel2.TabIndex = 2;
+            this.tabFormPanel2.Visible = false;
+            // 
+            // tabFormItem1
+            // 
+            this.tabFormItem1.Checked = true;
+            this.tabFormItem1.Name = "tabFormItem1";
+            this.tabFormItem1.Panel = this.tabFormPanel1;
+            this.tabFormItem1.Text = "Document 1";
+            // 
+            // tabFormItem2
+            // 
+            this.tabFormItem2.Name = "tabFormItem2";
+            this.tabFormItem2.Panel = this.tabFormPanel2;
+            this.tabFormItem2.Text = "Document 2";
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.BackColor = System.Drawing.Color.Transparent;
+            this.label1.Location = new System.Drawing.Point(241, 175);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(101, 13);
+            this.label1.TabIndex = 0;
+            this.label1.Text = "Your content here...";
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.BackColor = System.Drawing.Color.Transparent;
+            this.label2.Location = new System.Drawing.Point(257, 186);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(101, 13);
+            this.label2.TabIndex = 1;
+            this.label2.Text = "Your content here...";
+            // 
+            // $safeitemrootname$
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(616, 414);
+            this.Controls.Add(this.tabFormControl1);
+            this.ForeColor = System.Drawing.Color.Black;
+            this.Name = "$safeitemrootname$";
+            this.Text = "DotNetBar Tabbed App Form";
+            this.tabFormControl1.ResumeLayout(false);
+            this.tabFormControl1.PerformLayout();
+            this.tabFormPanel1.ResumeLayout(false);
+            this.tabFormPanel1.PerformLayout();
+            this.tabFormPanel2.ResumeLayout(false);
+            this.tabFormPanel2.PerformLayout();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private DevComponents.DotNetBar.Controls.TabFormControl tabFormControl1;
+        private DevComponents.DotNetBar.Controls.TabFormPanel tabFormPanel1;
+        private DevComponents.DotNetBar.Controls.TabFormPanel tabFormPanel2;
+        private DevComponents.DotNetBar.Controls.TabFormItem tabFormItem1;
+        private DevComponents.DotNetBar.Controls.TabFormItem tabFormItem2;
+		private System.Windows.Forms.Label label1;
+		private System.Windows.Forms.Label label2;
+
+    }
+}
+
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual C#/TabbedForm/Form.cs b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual C#/TabbedForm/Form.cs
new file mode 100644
index 00000000..47530f09
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual C#/TabbedForm/Form.cs	
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+
+namespace $rootnamespace$
+{
+    public partial class $safeitemrootname$ : DevComponents.DotNetBar.Controls.TabParentForm
+    {
+        public $safeitemrootname$()
+        {
+            InitializeComponent();
+        }
+    }
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual C#/TabbedForm/Form.resx b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual C#/TabbedForm/Form.resx
new file mode 100644
index 00000000..19dc0dd8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual C#/TabbedForm/Form.resx	
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual C#/TabbedForm/TabbedForm.zip b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual C#/TabbedForm/TabbedForm.zip
new file mode 100644
index 00000000..7cd94f8b
Binary files /dev/null and b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual C#/TabbedForm/TabbedForm.zip differ
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual C#/TabbedForm/tabbedform.vstemplate b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual C#/TabbedForm/tabbedform.vstemplate
new file mode 100644
index 00000000..c22546e3
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2010/Visual C#/TabbedForm/tabbedform.vstemplate	
@@ -0,0 +1,38 @@
+<VSTemplate Version="3.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name>Tabbed Form</Name>
+    <Description>DotNetBar Tabbed Form</Description>
+    <Icon Package="{FAE04EC1-301F-11d3-BF4B-00C04F79EFBC}" ID="4535" />
+	<TemplateID>DevComponents.CS.TabbedForm</TemplateID>
+    <ProjectType>CSharp</ProjectType>
+    <SortOrder>41</SortOrder>
+    <DefaultName>Form.cs</DefaultName>
+	<RequiredFrameworkVersion>2.0</RequiredFrameworkVersion>
+    <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
+  </TemplateData>
+  <TemplateContent>
+		<References>
+			<Reference>
+				<Assembly>System</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Data</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Drawing</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Windows.Forms</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Xml</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>DevComponents.DotNetBar2</Assembly>
+			</Reference>
+		</References>
+
+    <ProjectItem ReplaceParameters="true" SubType="Form">Form.cs</ProjectItem>
+    <ProjectItem ReplaceParameters="true">Form.Designer.cs</ProjectItem>
+  </TemplateContent>
+</VSTemplate>
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual Basic/MetroAppForm/Form.Designer.vb b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual Basic/MetroAppForm/Form.Designer.vb
new file mode 100644
index 00000000..913e8b3c
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual Basic/MetroAppForm/Form.Designer.vb	
@@ -0,0 +1,217 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class $safeitemrootname$
+    Inherits DevComponents.DotNetBar.Metro.MetroAppForm
+
+    'Form overrides dispose to clean up the component list.
+    <System.Diagnostics.DebuggerNonUserCode()> _
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+        Try
+            If disposing AndAlso components IsNot Nothing Then
+                components.Dispose()
+            End If
+        Finally
+            MyBase.Dispose(disposing)
+        End Try
+    End Sub
+
+    'Required by the Windows Form Designer
+    Private components As System.ComponentModel.IContainer
+
+    'NOTE: The following procedure is required by the Windows Form Designer
+    'It can be modified using the Windows Form Designer.  
+    'Do not modify it using the code editor.
+    <System.Diagnostics.DebuggerStepThrough()> _
+    Private Sub InitializeComponent()
+        Me.components = New System.ComponentModel.Container
+        Me.MetroShell1 = New DevComponents.DotNetBar.Metro.MetroShell
+        Me.MetroTabItem1 = New DevComponents.DotNetBar.Metro.MetroTabItem
+        Me.MetroTabPanel1 = New DevComponents.DotNetBar.Metro.MetroTabPanel
+        Me.MetroTabItem2 = New DevComponents.DotNetBar.Metro.MetroTabItem
+        Me.MetroTabPanel2 = New DevComponents.DotNetBar.Metro.MetroTabPanel
+        Me.StyleManager1 = New DevComponents.DotNetBar.StyleManager(Me.components)
+        Me.QatCustomizeItem1 = New DevComponents.DotNetBar.QatCustomizeItem
+        Me.MetroAppButton1 = New DevComponents.DotNetBar.Metro.MetroAppButton
+        Me.ButtonItem1 = New DevComponents.DotNetBar.ButtonItem
+        Me.MetroStatusBar1 = New DevComponents.DotNetBar.Metro.MetroStatusBar
+        Me.LabelItem1 = New DevComponents.DotNetBar.LabelItem
+        Me.MetroShell1.SuspendLayout()
+        Me.SuspendLayout()
+        '
+        'MetroShell1
+        '
+        Me.MetroShell1.BackColor = System.Drawing.Color.White
+        '
+        '
+        '
+        Me.MetroShell1.BackgroundStyle.Class = ""
+        Me.MetroShell1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        Me.MetroShell1.CaptionVisible = True
+        Me.MetroShell1.Controls.Add(Me.MetroTabPanel1)
+        Me.MetroShell1.Controls.Add(Me.MetroTabPanel2)
+        Me.MetroShell1.Dock = System.Windows.Forms.DockStyle.Top
+        Me.MetroShell1.ForeColor = System.Drawing.Color.Black
+        Me.MetroShell1.HelpButtonText = Nothing
+        Me.MetroShell1.Items.AddRange(New DevComponents.DotNetBar.BaseItem() {Me.MetroAppButton1, Me.MetroTabItem1, Me.MetroTabItem2})
+        Me.MetroShell1.KeyTipsFont = New System.Drawing.Font("Tahoma", 7.0!)
+        Me.MetroShell1.Location = New System.Drawing.Point(0, 1)
+        Me.MetroShell1.Name = "MetroShell1"
+        Me.MetroShell1.QuickToolbarItems.AddRange(New DevComponents.DotNetBar.BaseItem() {Me.ButtonItem1, Me.QatCustomizeItem1})
+        Me.MetroShell1.Size = New System.Drawing.Size(652, 234)
+        Me.MetroShell1.SystemText.MaximizeRibbonText = "&Maximize the Ribbon"
+        Me.MetroShell1.SystemText.MinimizeRibbonText = "Mi&nimize the Ribbon"
+        Me.MetroShell1.SystemText.QatAddItemText = "&Add to Quick Access Toolbar"
+        Me.MetroShell1.SystemText.QatCustomizeMenuLabel = "<b>Customize Quick Access Toolbar</b>"
+        Me.MetroShell1.SystemText.QatCustomizeText = "&Customize Quick Access Toolbar..."
+        Me.MetroShell1.SystemText.QatDialogAddButton = "&Add >>"
+        Me.MetroShell1.SystemText.QatDialogCancelButton = "Cancel"
+        Me.MetroShell1.SystemText.QatDialogCaption = "Customize Quick Access Toolbar"
+        Me.MetroShell1.SystemText.QatDialogCategoriesLabel = "&Choose commands from:"
+        Me.MetroShell1.SystemText.QatDialogOkButton = "OK"
+        Me.MetroShell1.SystemText.QatDialogPlacementCheckbox = "&Place Quick Access Toolbar below the Ribbon"
+        Me.MetroShell1.SystemText.QatDialogRemoveButton = "&Remove"
+        Me.MetroShell1.SystemText.QatPlaceAboveRibbonText = "&Place Quick Access Toolbar above the Ribbon"
+        Me.MetroShell1.SystemText.QatPlaceBelowRibbonText = "&Place Quick Access Toolbar below the Ribbon"
+        Me.MetroShell1.SystemText.QatRemoveItemText = "&Remove from Quick Access Toolbar"
+        Me.MetroShell1.TabIndex = 0
+        Me.MetroShell1.TabStripFont = New System.Drawing.Font("Segoe UI", 10.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.MetroShell1.Text = "MetroShell1"
+        '
+        'MetroTabItem1
+        '
+        Me.MetroTabItem1.Checked = True
+        Me.MetroTabItem1.Name = "MetroTabItem1"
+        Me.MetroTabItem1.Panel = Me.MetroTabPanel1
+        Me.MetroTabItem1.Text = "&HOME"
+        '
+        'MetroTabPanel1
+        '
+        Me.MetroTabPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled
+        Me.MetroTabPanel1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.MetroTabPanel1.Location = New System.Drawing.Point(0, 51)
+        Me.MetroTabPanel1.Name = "MetroTabPanel1"
+        Me.MetroTabPanel1.Padding = New System.Windows.Forms.Padding(3, 0, 3, 3)
+        Me.MetroTabPanel1.Size = New System.Drawing.Size(652, 183)
+        '
+        '
+        '
+        Me.MetroTabPanel1.Style.Class = ""
+        Me.MetroTabPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        '
+        '
+        '
+        Me.MetroTabPanel1.StyleMouseDown.Class = ""
+        Me.MetroTabPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        '
+        '
+        '
+        Me.MetroTabPanel1.StyleMouseOver.Class = ""
+        Me.MetroTabPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        Me.MetroTabPanel1.TabIndex = 1
+        '
+        'MetroTabItem2
+        '
+        Me.MetroTabItem2.Name = "MetroTabItem2"
+        Me.MetroTabItem2.Panel = Me.MetroTabPanel2
+        Me.MetroTabItem2.Text = "&VIEW"
+        '
+        'MetroTabPanel2
+        '
+        Me.MetroTabPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled
+        Me.MetroTabPanel2.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.MetroTabPanel2.Location = New System.Drawing.Point(0, 0)
+        Me.MetroTabPanel2.Name = "MetroTabPanel2"
+        Me.MetroTabPanel2.Padding = New System.Windows.Forms.Padding(3, 0, 3, 3)
+        Me.MetroTabPanel2.Size = New System.Drawing.Size(200, 100)
+        '
+        '
+        '
+        Me.MetroTabPanel2.Style.Class = ""
+        Me.MetroTabPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        '
+        '
+        '
+        Me.MetroTabPanel2.StyleMouseDown.Class = ""
+        Me.MetroTabPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        '
+        '
+        '
+        Me.MetroTabPanel2.StyleMouseOver.Class = ""
+        Me.MetroTabPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        Me.MetroTabPanel2.TabIndex = 2
+        '
+        'StyleManager1
+        '
+        Me.StyleManager1.ManagerStyle = DevComponents.DotNetBar.eStyle.Metro
+        Me.StyleManager1.MetroColorParameters = New DevComponents.DotNetBar.Metro.ColorTables.MetroColorGeneratorParameters(System.Drawing.Color.White, System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(163, Byte), Integer), CType(CType(26, Byte), Integer)))
+        '
+        'QatCustomizeItem1
+        '
+        Me.QatCustomizeItem1.BeginGroup = True
+        Me.QatCustomizeItem1.Name = "QatCustomizeItem1"
+        '
+        'MetroAppButton1
+        '
+        Me.MetroAppButton1.AutoExpandOnClick = True
+        Me.MetroAppButton1.CanCustomize = False
+        Me.MetroAppButton1.ImageFixedSize = New System.Drawing.Size(16, 16)
+        Me.MetroAppButton1.ImagePaddingHorizontal = 0
+        Me.MetroAppButton1.ImagePaddingVertical = 0
+        Me.MetroAppButton1.Name = "MetroAppButton1"
+        Me.MetroAppButton1.ShowSubItems = False
+        Me.MetroAppButton1.Text = "&File"
+        '
+        'ButtonItem1
+        '
+        Me.ButtonItem1.Name = "ButtonItem1"
+        Me.ButtonItem1.Text = "ButtonItem1"
+        '
+        'MetroStatusBar1
+        '
+        '
+        '
+        '
+        Me.MetroStatusBar1.BackgroundStyle.Class = ""
+        Me.MetroStatusBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        Me.MetroStatusBar1.ContainerControlProcessDialogKey = True
+        Me.MetroStatusBar1.Dock = System.Windows.Forms.DockStyle.Bottom
+        Me.MetroStatusBar1.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.MetroStatusBar1.Items.AddRange(New DevComponents.DotNetBar.BaseItem() {Me.LabelItem1})
+        Me.MetroStatusBar1.Location = New System.Drawing.Point(0, 413)
+        Me.MetroStatusBar1.Name = "MetroStatusBar1"
+        Me.MetroStatusBar1.Size = New System.Drawing.Size(652, 22)
+        Me.MetroStatusBar1.TabIndex = 1
+        Me.MetroStatusBar1.Text = "MetroStatusBar1"
+        '
+        'LabelItem1
+        '
+        Me.LabelItem1.Name = "LabelItem1"
+        Me.LabelItem1.Text = "READY"
+        '
+        '$safeitemrootname$
+        '
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.ClientSize = New System.Drawing.Size(653, 436)
+        Me.Controls.Add(Me.MetroStatusBar1)
+        Me.Controls.Add(Me.MetroShell1)
+        Me.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Name = "$safeitemrootname$"
+        Me.Text = "DotNetBar Metro App Form"
+        Me.MetroShell1.ResumeLayout(False)
+        Me.MetroShell1.PerformLayout()
+        Me.ResumeLayout(False)
+
+    End Sub
+    Friend WithEvents MetroShell1 As DevComponents.DotNetBar.Metro.MetroShell
+    Friend WithEvents MetroTabPanel1 As DevComponents.DotNetBar.Metro.MetroTabPanel
+    Friend WithEvents MetroTabPanel2 As DevComponents.DotNetBar.Metro.MetroTabPanel
+    Friend WithEvents MetroAppButton1 As DevComponents.DotNetBar.Metro.MetroAppButton
+    Friend WithEvents MetroTabItem1 As DevComponents.DotNetBar.Metro.MetroTabItem
+    Friend WithEvents MetroTabItem2 As DevComponents.DotNetBar.Metro.MetroTabItem
+    Friend WithEvents ButtonItem1 As DevComponents.DotNetBar.ButtonItem
+    Friend WithEvents QatCustomizeItem1 As DevComponents.DotNetBar.QatCustomizeItem
+    Friend WithEvents StyleManager1 As DevComponents.DotNetBar.StyleManager
+    Friend WithEvents MetroStatusBar1 As DevComponents.DotNetBar.Metro.MetroStatusBar
+    Friend WithEvents LabelItem1 As DevComponents.DotNetBar.LabelItem
+
+End Class
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual Basic/MetroAppForm/Form.resx b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual Basic/MetroAppForm/Form.resx
new file mode 100644
index 00000000..998f01fd
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual Basic/MetroAppForm/Form.resx	
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="StyleManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual Basic/MetroAppForm/Form.vb b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual Basic/MetroAppForm/Form.vb
new file mode 100644
index 00000000..64eb4330
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual Basic/MetroAppForm/Form.vb	
@@ -0,0 +1,3 @@
+Public Class $safeitemrootname$
+
+End Class
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual Basic/MetroAppForm/MetroAppForm.zip b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual Basic/MetroAppForm/MetroAppForm.zip
new file mode 100644
index 00000000..e464b16b
Binary files /dev/null and b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual Basic/MetroAppForm/MetroAppForm.zip differ
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual Basic/MetroAppForm/metroappform.vstemplate b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual Basic/MetroAppForm/metroappform.vstemplate
new file mode 100644
index 00000000..9cbac33b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual Basic/MetroAppForm/metroappform.vstemplate	
@@ -0,0 +1,36 @@
+<VSTemplate Version="3.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name>Metro UI App Form</Name>
+    <Description>DotNetBar Metro Application Form</Description>
+    <Icon Package="{164B10B9-B200-11D0-8C61-00A0C91E29D5}" ID="4527" />
+	<TemplateID>DevComponents.VB.MetroAppForm</TemplateID>
+    <ProjectType>VisualBasic</ProjectType>
+    <SortOrder>11</SortOrder>
+    <DefaultName>Form.vb</DefaultName>
+	<RequiredFrameworkVersion>2.0</RequiredFrameworkVersion>
+    <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
+  </TemplateData>
+  <TemplateContent>
+        <References>
+            <Reference>
+                <Assembly>System</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+            <Reference>
+                <Assembly>System.Drawing</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+            <Reference>
+                <Assembly>System.Windows.Forms</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+			<Reference>
+                <Assembly>DevComponents.DotNetBar2</Assembly>
+                <URL>http://www.devcomponents.com</URL>
+            </Reference>
+        </References>
+
+    <ProjectItem ReplaceParameters="true" SubType="Form">Form.vb</ProjectItem>
+    <ProjectItem ReplaceParameters="true">Form.Designer.vb</ProjectItem>
+  </TemplateContent>
+</VSTemplate>
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual Basic/MetroForm/Form.Designer.vb b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual Basic/MetroForm/Form.Designer.vb
new file mode 100644
index 00000000..7d926fa4
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual Basic/MetroForm/Form.Designer.vb	
@@ -0,0 +1,33 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class $safeitemrootname$
+    Inherits DevComponents.DotNetBar.Metro.MetroForm
+
+    'Form overrides dispose to clean up the component list.
+    <System.Diagnostics.DebuggerNonUserCode()> _
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+        Try
+            If disposing AndAlso components IsNot Nothing Then
+                components.Dispose()
+            End If
+        Finally
+            MyBase.Dispose(disposing)
+        End Try
+    End Sub
+
+    'Required by the Windows Form Designer
+    Private components As System.ComponentModel.IContainer
+
+    'NOTE: The following procedure is required by the Windows Form Designer
+    'It can be modified using the Windows Form Designer.  
+    'Do not modify it using the code editor.
+    <System.Diagnostics.DebuggerStepThrough()> _
+    Private Sub InitializeComponent()
+        components = New System.ComponentModel.Container
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.ClientSize = New System.Drawing.Size(653, 436)
+		Me.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+		Me.Name = "$safeitemrootname$"
+        Me.Text = "MetroForm"
+    End Sub
+End Class
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual Basic/MetroForm/Form.vb b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual Basic/MetroForm/Form.vb
new file mode 100644
index 00000000..9b12d76d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual Basic/MetroForm/Form.vb	
@@ -0,0 +1,3 @@
+Public Class $safeitemrootname$
+
+End Class
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual Basic/MetroForm/MetroForm.zip b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual Basic/MetroForm/MetroForm.zip
new file mode 100644
index 00000000..1742cb89
Binary files /dev/null and b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual Basic/MetroForm/MetroForm.zip differ
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual Basic/MetroForm/metroform.vstemplate b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual Basic/MetroForm/metroform.vstemplate
new file mode 100644
index 00000000..62cc1786
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual Basic/MetroForm/metroform.vstemplate	
@@ -0,0 +1,36 @@
+<VSTemplate Version="3.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name>Metro Form</Name>
+    <Description>DotNetBar Metro Form</Description>
+    <Icon Package="{164B10B9-B200-11D0-8C61-00A0C91E29D5}" ID="4527" />
+	<TemplateID>DevComponents.VB.MetroForm</TemplateID>
+    <ProjectType>VisualBasic</ProjectType>
+    <SortOrder>11</SortOrder>
+    <DefaultName>Form.vb</DefaultName>
+	<RequiredFrameworkVersion>2.0</RequiredFrameworkVersion>
+    <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
+  </TemplateData>
+  <TemplateContent>
+        <References>
+            <Reference>
+                <Assembly>System</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+            <Reference>
+                <Assembly>System.Drawing</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+            <Reference>
+                <Assembly>System.Windows.Forms</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+			<Reference>
+                <Assembly>DevComponents.DotNetBar2</Assembly>
+                <URL>http://www.devcomponents.com</URL>
+            </Reference>
+        </References>
+
+    <ProjectItem ReplaceParameters="true" SubType="Form">Form.vb</ProjectItem>
+    <ProjectItem ReplaceParameters="true">Form.Designer.vb</ProjectItem>
+  </TemplateContent>
+</VSTemplate>
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual Basic/Office2007Form/DotNetBarOffice2007Form.zip b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual Basic/Office2007Form/DotNetBarOffice2007Form.zip
new file mode 100644
index 00000000..bbbe8da0
Binary files /dev/null and b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual Basic/Office2007Form/DotNetBarOffice2007Form.zip differ
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual Basic/Office2007Form/Form.Designer.vb b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual Basic/Office2007Form/Form.Designer.vb
new file mode 100644
index 00000000..2f6f306f
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual Basic/Office2007Form/Form.Designer.vb	
@@ -0,0 +1,29 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class $safeitemrootname$
+    Inherits DevComponents.DotNetBar.OfficeForm
+
+    'Form overrides dispose to clean up the component list.
+    <System.Diagnostics.DebuggerNonUserCode()> _
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+        Try
+            If disposing AndAlso components IsNot Nothing Then
+                components.Dispose()
+            End If
+        Finally
+            MyBase.Dispose(disposing)
+        End Try
+    End Sub
+
+    'Required by the Windows Form Designer
+    Private components As System.ComponentModel.IContainer
+
+    'NOTE: The following procedure is required by the Windows Form Designer
+    'It can be modified using the Windows Form Designer.  
+    'Do not modify it using the code editor.
+    <System.Diagnostics.DebuggerStepThrough()> _
+    Private Sub InitializeComponent()
+        components = New System.ComponentModel.Container
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.Text = "$safeitemrootname$"
+    End Sub
+End Class
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual Basic/Office2007Form/Form.vb b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual Basic/Office2007Form/Form.vb
new file mode 100644
index 00000000..9b12d76d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual Basic/Office2007Form/Form.vb	
@@ -0,0 +1,3 @@
+Public Class $safeitemrootname$
+
+End Class
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual Basic/Office2007Form/office2007form.vstemplate b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual Basic/Office2007Form/office2007form.vstemplate
new file mode 100644
index 00000000..1bf5f9f1
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual Basic/Office2007Form/office2007form.vstemplate	
@@ -0,0 +1,36 @@
+<VSTemplate Version="3.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name>Office Form</Name>
+    <Description>DotNetBar Office Style Form</Description>
+    <Icon Package="{164B10B9-B200-11D0-8C61-00A0C91E29D5}" ID="4527" />
+	<TemplateID>DevComponents.VB.Office2007Form</TemplateID>
+    <ProjectType>VisualBasic</ProjectType>
+    <SortOrder>11</SortOrder>
+    <DefaultName>Form.vb</DefaultName>
+	<RequiredFrameworkVersion>2.0</RequiredFrameworkVersion>
+    <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
+  </TemplateData>
+  <TemplateContent>
+        <References>
+            <Reference>
+                <Assembly>System</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+            <Reference>
+                <Assembly>System.Drawing</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+            <Reference>
+                <Assembly>System.Windows.Forms</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+			<Reference>
+                <Assembly>DevComponents.DotNetBar2</Assembly>
+                <URL>http://www.devcomponents.com</URL>
+            </Reference>
+        </References>
+
+    <ProjectItem ReplaceParameters="true" SubType="Form">Form.vb</ProjectItem>
+    <ProjectItem ReplaceParameters="true">Form.Designer.vb</ProjectItem>
+  </TemplateContent>
+</VSTemplate>
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual Basic/RibbonForm/DotNetBarRibbonForm.zip b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual Basic/RibbonForm/DotNetBarRibbonForm.zip
new file mode 100644
index 00000000..fbfe10c8
Binary files /dev/null and b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual Basic/RibbonForm/DotNetBarRibbonForm.zip differ
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual Basic/RibbonForm/Form.Designer.vb b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual Basic/RibbonForm/Form.Designer.vb
new file mode 100644
index 00000000..abbb321e
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual Basic/RibbonForm/Form.Designer.vb	
@@ -0,0 +1,28 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class $safeitemrootname$
+    Inherits DevComponents.DotNetBar.RibbonForm
+
+    'Form overrides dispose to clean up the component list.
+    <System.Diagnostics.DebuggerNonUserCode()> _
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+        Try
+            If disposing AndAlso components IsNot Nothing Then
+                components.Dispose()
+            End If
+        Finally
+            MyBase.Dispose(disposing)
+        End Try
+    End Sub
+
+    'Required by the Windows Form Designer
+    Private components As System.ComponentModel.IContainer
+
+    'NOTE: The following procedure is required by the Windows Form Designer
+    'It can be modified using the Windows Form Designer.  
+    'Do not modify it using the code editor.
+    <System.Diagnostics.DebuggerStepThrough()> _
+    Private Sub InitializeComponent()
+        components = New System.ComponentModel.Container
+        Me.Text = "$safeitemrootname$"
+    End Sub
+End Class
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual Basic/RibbonForm/Form.vb b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual Basic/RibbonForm/Form.vb
new file mode 100644
index 00000000..9b12d76d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual Basic/RibbonForm/Form.vb	
@@ -0,0 +1,3 @@
+Public Class $safeitemrootname$
+
+End Class
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual Basic/RibbonForm/ribbonform.vstemplate b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual Basic/RibbonForm/ribbonform.vstemplate
new file mode 100644
index 00000000..13e12ed8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual Basic/RibbonForm/ribbonform.vstemplate	
@@ -0,0 +1,36 @@
+<VSTemplate Version="3.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name>Ribbon Form</Name>
+    <Description>DotNetBar Ribbon Form</Description>
+    <Icon Package="{164B10B9-B200-11D0-8C61-00A0C91E29D5}" ID="4527" />
+	<TemplateID>DevComponents.VB.RibbonForm</TemplateID>
+    <ProjectType>VisualBasic</ProjectType>
+    <SortOrder>11</SortOrder>
+    <DefaultName>Form.vb</DefaultName>
+	<RequiredFrameworkVersion>2.0</RequiredFrameworkVersion>
+    <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
+  </TemplateData>
+  <TemplateContent>
+        <References>
+            <Reference>
+                <Assembly>System</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+            <Reference>
+                <Assembly>System.Drawing</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+            <Reference>
+                <Assembly>System.Windows.Forms</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+			<Reference>
+                <Assembly>DevComponents.DotNetBar2</Assembly>
+                <URL>http://www.devcomponents.com</URL>
+            </Reference>
+        </References>
+
+    <ProjectItem ReplaceParameters="true" SubType="Form">Form.vb</ProjectItem>
+    <ProjectItem ReplaceParameters="true">Form.Designer.vb</ProjectItem>
+  </TemplateContent>
+</VSTemplate>
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual Basic/TabbedForm/Form.Designer.vb b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual Basic/TabbedForm/Form.Designer.vb
new file mode 100644
index 00000000..7fcc4215
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual Basic/TabbedForm/Form.Designer.vb	
@@ -0,0 +1,176 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class $safeitemrootname$
+    Inherits DevComponents.DotNetBar.Controls.TabParentForm
+
+    'Form overrides dispose to clean up the component list.
+    <System.Diagnostics.DebuggerNonUserCode()> _
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+        Try
+            If disposing AndAlso components IsNot Nothing Then
+                components.Dispose()
+            End If
+        Finally
+            MyBase.Dispose(disposing)
+        End Try
+    End Sub
+
+    'Required by the Windows Form Designer
+    Private components As System.ComponentModel.IContainer
+
+    'NOTE: The following procedure is required by the Windows Form Designer
+    'It can be modified using the Windows Form Designer.  
+    'Do not modify it using the code editor.
+    <System.Diagnostics.DebuggerStepThrough()> _
+    Private Sub InitializeComponent()
+        Me.TabFormControl1 = New DevComponents.DotNetBar.Controls.TabFormControl()
+        Me.TabFormPanel1 = New DevComponents.DotNetBar.Controls.TabFormPanel()
+        Me.TabFormPanel2 = New DevComponents.DotNetBar.Controls.TabFormPanel()
+        Me.TabFormItem1 = New DevComponents.DotNetBar.Controls.TabFormItem()
+        Me.TabFormItem2 = New DevComponents.DotNetBar.Controls.TabFormItem()
+        Me.Label1 = New System.Windows.Forms.Label()
+        Me.Label2 = New System.Windows.Forms.Label()
+        Me.TabFormControl1.SuspendLayout
+        Me.TabFormPanel1.SuspendLayout
+        Me.TabFormPanel2.SuspendLayout
+        Me.SuspendLayout
+        '
+        'TabFormControl1
+        '
+        Me.TabFormControl1.BackColor = System.Drawing.Color.White
+        '
+        '
+        '
+        Me.TabFormControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        Me.TabFormControl1.Controls.Add(Me.TabFormPanel1)
+        Me.TabFormControl1.Controls.Add(Me.TabFormPanel2)
+        Me.TabFormControl1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.TabFormControl1.ForeColor = System.Drawing.Color.Black
+        Me.TabFormControl1.Items.AddRange(New DevComponents.DotNetBar.BaseItem() {Me.TabFormItem1, Me.TabFormItem2})
+        Me.TabFormControl1.Location = New System.Drawing.Point(1, 1)
+        Me.TabFormControl1.Name = "TabFormControl1"
+        Me.TabFormControl1.Size = New System.Drawing.Size(444, 311)
+        Me.TabFormControl1.SystemText.MaximizeRibbonText = "&Maximize the Ribbon"
+        Me.TabFormControl1.SystemText.MinimizeRibbonText = "Mi&nimize the Ribbon"
+        Me.TabFormControl1.SystemText.QatAddItemText = "&Add to Quick Access Toolbar"
+        Me.TabFormControl1.SystemText.QatCustomizeMenuLabel = "<b>Customize Quick Access Toolbar</b>"
+        Me.TabFormControl1.SystemText.QatCustomizeText = "&Customize Quick Access Toolbar..."
+        Me.TabFormControl1.SystemText.QatDialogAddButton = "&Add >>"
+        Me.TabFormControl1.SystemText.QatDialogCancelButton = "Cancel"
+        Me.TabFormControl1.SystemText.QatDialogCaption = "Customize Quick Access Toolbar"
+        Me.TabFormControl1.SystemText.QatDialogCategoriesLabel = "&Choose commands from:"
+        Me.TabFormControl1.SystemText.QatDialogOkButton = "OK"
+        Me.TabFormControl1.SystemText.QatDialogPlacementCheckbox = "&Place Quick Access Toolbar below the Ribbon"
+        Me.TabFormControl1.SystemText.QatDialogRemoveButton = "&Remove"
+        Me.TabFormControl1.SystemText.QatPlaceAboveRibbonText = "&Place Quick Access Toolbar above the Ribbon"
+        Me.TabFormControl1.SystemText.QatPlaceBelowRibbonText = "&Place Quick Access Toolbar below the Ribbon"
+        Me.TabFormControl1.SystemText.QatRemoveItemText = "&Remove from Quick Access Toolbar"
+        Me.TabFormControl1.TabIndex = 0
+        Me.TabFormControl1.TabStripFont = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+        Me.TabFormControl1.Text = "TabFormControl1"
+        '
+        'TabFormPanel1
+        '
+        Me.TabFormPanel1.Controls.Add(Me.Label1)
+        Me.TabFormPanel1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.TabFormPanel1.Location = New System.Drawing.Point(0, 28)
+        Me.TabFormPanel1.Name = "TabFormPanel1"
+        Me.TabFormPanel1.Padding = New System.Windows.Forms.Padding(3, 0, 3, 3)
+        Me.TabFormPanel1.Size = New System.Drawing.Size(444, 283)
+        '
+        '
+        '
+        Me.TabFormPanel1.Style.Class = "TabFormPanel"
+        Me.TabFormPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        '
+        '
+        '
+        Me.TabFormPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        '
+        '
+        '
+        Me.TabFormPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        Me.TabFormPanel1.TabIndex = 1
+        '
+        'TabFormPanel2
+        '
+        Me.TabFormPanel2.Controls.Add(Me.Label2)
+        Me.TabFormPanel2.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.TabFormPanel2.Location = New System.Drawing.Point(0, 28)
+        Me.TabFormPanel2.Name = "TabFormPanel2"
+        Me.TabFormPanel2.Padding = New System.Windows.Forms.Padding(3, 0, 3, 3)
+        Me.TabFormPanel2.Size = New System.Drawing.Size(444, 283)
+        '
+        '
+        '
+        Me.TabFormPanel2.Style.Class = "TabFormPanel"
+        Me.TabFormPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        '
+        '
+        '
+        Me.TabFormPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        '
+        '
+        '
+        Me.TabFormPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        Me.TabFormPanel2.TabIndex = 2
+        Me.TabFormPanel2.Visible = false
+        '
+        'TabFormItem1
+        '
+        Me.TabFormItem1.Checked = true
+        Me.TabFormItem1.Name = "TabFormItem1"
+        Me.TabFormItem1.Panel = Me.TabFormPanel1
+        Me.TabFormItem1.Text = "Document 1"
+        '
+        'TabFormItem2
+        '
+        Me.TabFormItem2.Name = "TabFormItem2"
+        Me.TabFormItem2.Panel = Me.TabFormPanel2
+        Me.TabFormItem2.Text = "Document 2"
+        '
+        'Label1
+        '
+        Me.Label1.AutoSize = true
+        Me.Label1.BackColor = System.Drawing.Color.Transparent
+        Me.Label1.Location = New System.Drawing.Point(155, 127)
+        Me.Label1.Name = "Label1"
+        Me.Label1.Size = New System.Drawing.Size(101, 13)
+        Me.Label1.TabIndex = 0
+        Me.Label1.Text = "Your content here..."
+        '
+        'Label2
+        '
+        Me.Label2.AutoSize = true
+        Me.Label2.BackColor = System.Drawing.Color.Transparent
+        Me.Label2.Location = New System.Drawing.Point(172, 135)
+        Me.Label2.Name = "Label2"
+        Me.Label2.Size = New System.Drawing.Size(101, 13)
+        Me.Label2.TabIndex = 1
+        Me.Label2.Text = "Your content here..."
+        '
+        '$safeitemrootname$
+        '
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.ClientSize = New System.Drawing.Size(446, 313)
+        Me.Controls.Add(Me.TabFormControl1)
+        Me.Name = "$safeitemrootname$"
+        Me.Text = "DotNetBar Tabbed Form"
+        Me.TabFormControl1.ResumeLayout(false)
+        Me.TabFormControl1.PerformLayout
+        Me.TabFormPanel1.ResumeLayout(false)
+        Me.TabFormPanel1.PerformLayout
+        Me.TabFormPanel2.ResumeLayout(false)
+        Me.TabFormPanel2.PerformLayout
+        Me.ResumeLayout(false)
+
+    End Sub
+    Friend WithEvents TabFormControl1 As DevComponents.DotNetBar.Controls.TabFormControl
+    Friend WithEvents TabFormPanel1 As DevComponents.DotNetBar.Controls.TabFormPanel
+    Friend WithEvents TabFormPanel2 As DevComponents.DotNetBar.Controls.TabFormPanel
+    Friend WithEvents TabFormItem1 As DevComponents.DotNetBar.Controls.TabFormItem
+    Friend WithEvents TabFormItem2 As DevComponents.DotNetBar.Controls.TabFormItem
+    Friend WithEvents Label1 As System.Windows.Forms.Label
+    Friend WithEvents Label2 As System.Windows.Forms.Label
+
+End Class
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual Basic/TabbedForm/Form.resx b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual Basic/TabbedForm/Form.resx
new file mode 100644
index 00000000..19dc0dd8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual Basic/TabbedForm/Form.resx	
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual Basic/TabbedForm/Form.vb b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual Basic/TabbedForm/Form.vb
new file mode 100644
index 00000000..64eb4330
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual Basic/TabbedForm/Form.vb	
@@ -0,0 +1,3 @@
+Public Class $safeitemrootname$
+
+End Class
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual Basic/TabbedForm/TabbedForm.zip b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual Basic/TabbedForm/TabbedForm.zip
new file mode 100644
index 00000000..66f60672
Binary files /dev/null and b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual Basic/TabbedForm/TabbedForm.zip differ
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual Basic/TabbedForm/tabbedform.vstemplate b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual Basic/TabbedForm/tabbedform.vstemplate
new file mode 100644
index 00000000..865bb1b6
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual Basic/TabbedForm/tabbedform.vstemplate	
@@ -0,0 +1,36 @@
+<VSTemplate Version="3.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name>Tabbed Form</Name>
+    <Description>DotNetBar Tabbed Form</Description>
+    <Icon Package="{164B10B9-B200-11D0-8C61-00A0C91E29D5}" ID="4527" />
+	<TemplateID>DevComponents.VB.TabbedForm</TemplateID>
+    <ProjectType>VisualBasic</ProjectType>
+    <SortOrder>12</SortOrder>
+    <DefaultName>Form.vb</DefaultName>
+	<RequiredFrameworkVersion>2.0</RequiredFrameworkVersion>
+    <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
+  </TemplateData>
+  <TemplateContent>
+        <References>
+            <Reference>
+                <Assembly>System</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+            <Reference>
+                <Assembly>System.Drawing</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+            <Reference>
+                <Assembly>System.Windows.Forms</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+			<Reference>
+                <Assembly>DevComponents.DotNetBar2</Assembly>
+                <URL>http://www.devcomponents.com</URL>
+            </Reference>
+        </References>
+
+    <ProjectItem ReplaceParameters="true" SubType="Form">Form.vb</ProjectItem>
+    <ProjectItem ReplaceParameters="true">Form.Designer.vb</ProjectItem>
+  </TemplateContent>
+</VSTemplate>
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual C#/MetroAppForm/Form.Designer.cs b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual C#/MetroAppForm/Form.Designer.cs
new file mode 100644
index 00000000..8d1bb1bc
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual C#/MetroAppForm/Form.Designer.cs	
@@ -0,0 +1,234 @@
+namespace $rootnamespace$
+{
+    partial class $safeitemrootname$
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form 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.metroShell1 = new DevComponents.DotNetBar.Metro.MetroShell();
+            this.metroTabItem1 = new DevComponents.DotNetBar.Metro.MetroTabItem();
+            this.metroTabPanel1 = new DevComponents.DotNetBar.Metro.MetroTabPanel();
+            this.metroTabItem2 = new DevComponents.DotNetBar.Metro.MetroTabItem();
+            this.metroTabPanel2 = new DevComponents.DotNetBar.Metro.MetroTabPanel();
+            this.styleManager1 = new DevComponents.DotNetBar.StyleManager(this.components);
+            this.qatCustomizeItem1 = new DevComponents.DotNetBar.QatCustomizeItem();
+            this.metroAppButton1 = new DevComponents.DotNetBar.Metro.MetroAppButton();
+            this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem();
+            this.metroStatusBar1 = new DevComponents.DotNetBar.Metro.MetroStatusBar();
+            this.labelItem1 = new DevComponents.DotNetBar.LabelItem();
+            this.metroShell1.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // metroShell1
+            // 
+            this.metroShell1.BackColor = System.Drawing.Color.White;
+            // 
+            // 
+            // 
+            this.metroShell1.BackgroundStyle.Class = "";
+            this.metroShell1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.metroShell1.CaptionVisible = true;
+            this.metroShell1.Controls.Add(this.metroTabPanel1);
+            this.metroShell1.Controls.Add(this.metroTabPanel2);
+            this.metroShell1.Dock = System.Windows.Forms.DockStyle.Top;
+            this.metroShell1.ForeColor = System.Drawing.Color.Black;
+            this.metroShell1.HelpButtonText = null;
+            this.metroShell1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+            this.metroAppButton1,
+            this.metroTabItem1,
+            this.metroTabItem2});
+            this.metroShell1.KeyTipsFont = new System.Drawing.Font("Tahoma", 7F);
+            this.metroShell1.Location = new System.Drawing.Point(0, 1);
+            this.metroShell1.Name = "metroShell1";
+            this.metroShell1.QuickToolbarItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+            this.buttonItem1,
+            this.qatCustomizeItem1});
+            this.metroShell1.Size = new System.Drawing.Size(624, 218);
+            this.metroShell1.SystemText.MaximizeRibbonText = "&Maximize the Ribbon";
+            this.metroShell1.SystemText.MinimizeRibbonText = "Mi&nimize the Ribbon";
+            this.metroShell1.SystemText.QatAddItemText = "&Add to Quick Access Toolbar";
+            this.metroShell1.SystemText.QatCustomizeMenuLabel = "<b>Customize Quick Access Toolbar</b>";
+            this.metroShell1.SystemText.QatCustomizeText = "&Customize Quick Access Toolbar...";
+            this.metroShell1.SystemText.QatDialogAddButton = "&Add >>";
+            this.metroShell1.SystemText.QatDialogCancelButton = "Cancel";
+            this.metroShell1.SystemText.QatDialogCaption = "Customize Quick Access Toolbar";
+            this.metroShell1.SystemText.QatDialogCategoriesLabel = "&Choose commands from:";
+            this.metroShell1.SystemText.QatDialogOkButton = "OK";
+            this.metroShell1.SystemText.QatDialogPlacementCheckbox = "&Place Quick Access Toolbar below the Ribbon";
+            this.metroShell1.SystemText.QatDialogRemoveButton = "&Remove";
+            this.metroShell1.SystemText.QatPlaceAboveRibbonText = "&Place Quick Access Toolbar above the Ribbon";
+            this.metroShell1.SystemText.QatPlaceBelowRibbonText = "&Place Quick Access Toolbar below the Ribbon";
+            this.metroShell1.SystemText.QatRemoveItemText = "&Remove from Quick Access Toolbar";
+            this.metroShell1.TabIndex = 0;
+            this.metroShell1.TabStripFont = new System.Drawing.Font("Segoe UI", 10.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.metroShell1.Text = "metroShell1";
+            // 
+            // metroTabItem1
+            // 
+            this.metroTabItem1.Checked = true;
+            this.metroTabItem1.Name = "metroTabItem1";
+            this.metroTabItem1.Panel = this.metroTabPanel1;
+            this.metroTabItem1.Text = "&HOME";
+            // 
+            // metroTabPanel1
+            // 
+            this.metroTabPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.metroTabPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.metroTabPanel1.Location = new System.Drawing.Point(0, 51);
+            this.metroTabPanel1.Name = "metroTabPanel1";
+            this.metroTabPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3);
+            this.metroTabPanel1.Size = new System.Drawing.Size(624, 167);
+            // 
+            // 
+            // 
+            this.metroTabPanel1.Style.Class = "";
+            this.metroTabPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.metroTabPanel1.StyleMouseDown.Class = "";
+            this.metroTabPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.metroTabPanel1.StyleMouseOver.Class = "";
+            this.metroTabPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.metroTabPanel1.TabIndex = 1;
+            // 
+            // metroTabItem2
+            // 
+            this.metroTabItem2.Name = "metroTabItem2";
+            this.metroTabItem2.Panel = this.metroTabPanel2;
+            this.metroTabItem2.Text = "&VIEW";
+            // 
+            // metroTabPanel2
+            // 
+            this.metroTabPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.metroTabPanel2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.metroTabPanel2.Location = new System.Drawing.Point(0, 0);
+            this.metroTabPanel2.Name = "metroTabPanel2";
+            this.metroTabPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3);
+            this.metroTabPanel2.Size = new System.Drawing.Size(200, 100);
+            // 
+            // 
+            // 
+            this.metroTabPanel2.Style.Class = "";
+            this.metroTabPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.metroTabPanel2.StyleMouseDown.Class = "";
+            this.metroTabPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.metroTabPanel2.StyleMouseOver.Class = "";
+            this.metroTabPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.metroTabPanel2.TabIndex = 2;
+            // 
+            // styleManager1
+            // 
+            this.styleManager1.ManagerStyle = DevComponents.DotNetBar.eStyle.Metro;
+            this.styleManager1.MetroColorParameters = new DevComponents.DotNetBar.Metro.ColorTables.MetroColorGeneratorParameters(System.Drawing.Color.White, System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(163)))), ((int)(((byte)(26))))));
+            // 
+            // qatCustomizeItem1
+            // 
+            this.qatCustomizeItem1.BeginGroup = true;
+            this.qatCustomizeItem1.Name = "qatCustomizeItem1";
+            // 
+            // metroAppButton1
+            // 
+            this.metroAppButton1.AutoExpandOnClick = true;
+            this.metroAppButton1.CanCustomize = false;
+            this.metroAppButton1.ImageFixedSize = new System.Drawing.Size(16, 16);
+            this.metroAppButton1.ImagePaddingHorizontal = 0;
+            this.metroAppButton1.ImagePaddingVertical = 0;
+            this.metroAppButton1.Name = "metroAppButton1";
+            this.metroAppButton1.ShowSubItems = false;
+            this.metroAppButton1.Text = "&File";
+            // 
+            // buttonItem1
+            // 
+            this.buttonItem1.Name = "buttonItem1";
+            this.buttonItem1.Text = "buttonItem1";
+            // 
+            // metroStatusBar1
+            // 
+            // 
+            // 
+            // 
+            this.metroStatusBar1.BackgroundStyle.Class = "";
+            this.metroStatusBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.metroStatusBar1.ContainerControlProcessDialogKey = true;
+            this.metroStatusBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.metroStatusBar1.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.metroStatusBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+            this.labelItem1});
+            this.metroStatusBar1.Location = new System.Drawing.Point(0, 374);
+            this.metroStatusBar1.Name = "metroStatusBar1";
+            this.metroStatusBar1.Size = new System.Drawing.Size(624, 21);
+            this.metroStatusBar1.TabIndex = 1;
+            this.metroStatusBar1.Text = "metroStatusBar1";
+            // 
+            // labelItem1
+            // 
+            this.labelItem1.Name = "labelItem1";
+            this.labelItem1.Text = "READY";
+            // 
+            // $safeitemrootname$
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(625, 396);
+            this.Controls.Add(this.metroStatusBar1);
+            this.Controls.Add(this.metroShell1);
+            this.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.Name = "$safeitemrootname$";
+            this.Text = "DotNetBar Metro App Form";
+            this.metroShell1.ResumeLayout(false);
+            this.metroShell1.PerformLayout();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private DevComponents.DotNetBar.Metro.MetroShell metroShell1;
+        private DevComponents.DotNetBar.Metro.MetroTabPanel metroTabPanel1;
+        private DevComponents.DotNetBar.Metro.MetroTabPanel metroTabPanel2;
+        private DevComponents.DotNetBar.Metro.MetroAppButton metroAppButton1;
+        private DevComponents.DotNetBar.Metro.MetroTabItem metroTabItem1;
+        private DevComponents.DotNetBar.Metro.MetroTabItem metroTabItem2;
+        private DevComponents.DotNetBar.ButtonItem buttonItem1;
+        private DevComponents.DotNetBar.QatCustomizeItem qatCustomizeItem1;
+        private DevComponents.DotNetBar.StyleManager styleManager1;
+        private DevComponents.DotNetBar.Metro.MetroStatusBar metroStatusBar1;
+        private DevComponents.DotNetBar.LabelItem labelItem1;
+
+    }
+}
+
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual C#/MetroAppForm/Form.cs b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual C#/MetroAppForm/Form.cs
new file mode 100644
index 00000000..ff2c3a9b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual C#/MetroAppForm/Form.cs	
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+
+namespace $rootnamespace$
+{
+    public partial class $safeitemrootname$ : DevComponents.DotNetBar.Metro.MetroAppForm
+    {
+        public $safeitemrootname$()
+        {
+            InitializeComponent();
+        }
+    }
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual C#/MetroAppForm/Form.resx b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual C#/MetroAppForm/Form.resx
new file mode 100644
index 00000000..c3d21cf2
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual C#/MetroAppForm/Form.resx	
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="styleManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual C#/MetroAppForm/MetroAppForm.zip b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual C#/MetroAppForm/MetroAppForm.zip
new file mode 100644
index 00000000..e72433e8
Binary files /dev/null and b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual C#/MetroAppForm/MetroAppForm.zip differ
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual C#/MetroAppForm/metroappform.vstemplate b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual C#/MetroAppForm/metroappform.vstemplate
new file mode 100644
index 00000000..ae758d3b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual C#/MetroAppForm/metroappform.vstemplate	
@@ -0,0 +1,38 @@
+<VSTemplate Version="3.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name>Metro App Form</Name>
+    <Description>DotNetBar Metro Application Form</Description>
+    <Icon Package="{FAE04EC1-301F-11d3-BF4B-00C04F79EFBC}" ID="4535" />
+	<TemplateID>DevComponents.CS.MetroAppForm</TemplateID>
+    <ProjectType>CSharp</ProjectType>
+    <SortOrder>41</SortOrder>
+    <DefaultName>Form.cs</DefaultName>
+	<RequiredFrameworkVersion>2.0</RequiredFrameworkVersion>
+    <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
+  </TemplateData>
+  <TemplateContent>
+		<References>
+			<Reference>
+				<Assembly>System</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Data</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Drawing</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Windows.Forms</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Xml</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>DevComponents.DotNetBar2</Assembly>
+			</Reference>
+		</References>
+
+    <ProjectItem ReplaceParameters="true" SubType="Form">Form.cs</ProjectItem>
+    <ProjectItem ReplaceParameters="true">Form.Designer.cs</ProjectItem>
+  </TemplateContent>
+</VSTemplate>
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual C#/MetroForm/MetroForm.zip b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual C#/MetroForm/MetroForm.zip
new file mode 100644
index 00000000..b98a2499
Binary files /dev/null and b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual C#/MetroForm/MetroForm.zip differ
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual C#/MetroForm/form.cs b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual C#/MetroForm/form.cs
new file mode 100644
index 00000000..11692b62
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual C#/MetroForm/form.cs	
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+using DevComponents.DotNetBar;
+
+namespace $rootnamespace$
+{
+	public partial class $safeitemrootname$: DevComponents.DotNetBar.Metro.MetroForm
+	{
+		public $safeitemrootname$()
+		{
+			InitializeComponent();
+		}
+	}
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual C#/MetroForm/form.designer.cs b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual C#/MetroForm/form.designer.cs
new file mode 100644
index 00000000..3a1a31d0
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual C#/MetroForm/form.designer.cs	
@@ -0,0 +1,42 @@
+namespace $rootnamespace$
+{
+	partial class $safeitemrootname$
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if (disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form 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.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(625, 396);
+            this.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.Name = "$safeitemrootname$";
+			this.Text = "MetroForm";
+		}
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual C#/MetroForm/metroform.vstemplate b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual C#/MetroForm/metroform.vstemplate
new file mode 100644
index 00000000..3961f06f
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual C#/MetroForm/metroform.vstemplate	
@@ -0,0 +1,38 @@
+<VSTemplate Version="3.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name>Metro Form</Name>
+    <Description>DotNetBar Metro Form</Description>
+    <Icon Package="{FAE04EC1-301F-11d3-BF4B-00C04F79EFBC}" ID="4535" />
+	<TemplateID>DevComponents.CS.MetroForm</TemplateID>
+    <ProjectType>CSharp</ProjectType>
+    <SortOrder>41</SortOrder>
+    <DefaultName>Form.cs</DefaultName>
+	<RequiredFrameworkVersion>2.0</RequiredFrameworkVersion>
+    <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
+  </TemplateData>
+  <TemplateContent>
+		<References>
+			<Reference>
+				<Assembly>System</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Data</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Drawing</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Windows.Forms</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Xml</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>DevComponents.DotNetBar2</Assembly>
+			</Reference>
+		</References>
+
+    <ProjectItem ReplaceParameters="true" SubType="Form">Form.cs</ProjectItem>
+    <ProjectItem ReplaceParameters="true">Form.Designer.cs</ProjectItem>
+  </TemplateContent>
+</VSTemplate>
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual C#/Office2007Form/DotNetBarOffice2007Form.zip b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual C#/Office2007Form/DotNetBarOffice2007Form.zip
new file mode 100644
index 00000000..e5924f7c
Binary files /dev/null and b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual C#/Office2007Form/DotNetBarOffice2007Form.zip differ
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual C#/Office2007Form/form.cs b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual C#/Office2007Form/form.cs
new file mode 100644
index 00000000..8e61cb27
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual C#/Office2007Form/form.cs	
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+using DevComponents.DotNetBar;
+
+namespace $rootnamespace$
+{
+	public partial class $safeitemrootname$: DevComponents.DotNetBar.OfficeForm
+	{
+		public $safeitemrootname$()
+		{
+			InitializeComponent();
+		}
+	}
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual C#/Office2007Form/form.designer.cs b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual C#/Office2007Form/form.designer.cs
new file mode 100644
index 00000000..6bc0536d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual C#/Office2007Form/form.designer.cs	
@@ -0,0 +1,37 @@
+namespace $rootnamespace$
+{
+	partial class $safeitemrootname$
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if (disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form 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.Text = "$safeitemrootname$";
+		}
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual C#/Office2007Form/office2007form.vstemplate b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual C#/Office2007Form/office2007form.vstemplate
new file mode 100644
index 00000000..f2bf2593
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual C#/Office2007Form/office2007form.vstemplate	
@@ -0,0 +1,38 @@
+<VSTemplate Version="3.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name>Office Form</Name>
+    <Description>DotNetBar Office Style Form</Description>
+    <Icon Package="{FAE04EC1-301F-11d3-BF4B-00C04F79EFBC}" ID="4535" />
+	<TemplateID>DevComponents.CS.Office2007Form</TemplateID>
+    <ProjectType>CSharp</ProjectType>
+    <SortOrder>41</SortOrder>
+    <DefaultName>Form.cs</DefaultName>
+	<RequiredFrameworkVersion>2.0</RequiredFrameworkVersion>
+    <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
+  </TemplateData>
+  <TemplateContent>
+		<References>
+			<Reference>
+				<Assembly>System</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Data</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Drawing</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Windows.Forms</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Xml</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>DevComponents.DotNetBar2</Assembly>
+			</Reference>
+		</References>
+
+    <ProjectItem ReplaceParameters="true" SubType="Form">Form.cs</ProjectItem>
+    <ProjectItem ReplaceParameters="true">Form.Designer.cs</ProjectItem>
+  </TemplateContent>
+</VSTemplate>
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual C#/RibbonForm/DotNetBarRibbonForm.zip b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual C#/RibbonForm/DotNetBarRibbonForm.zip
new file mode 100644
index 00000000..33693820
Binary files /dev/null and b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual C#/RibbonForm/DotNetBarRibbonForm.zip differ
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual C#/RibbonForm/form.cs b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual C#/RibbonForm/form.cs
new file mode 100644
index 00000000..bfd40b47
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual C#/RibbonForm/form.cs	
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+using DevComponents.DotNetBar;
+
+namespace $rootnamespace$
+{
+	public partial class $safeitemrootname$: DevComponents.DotNetBar.RibbonForm
+	{
+		public $safeitemrootname$()
+		{
+			InitializeComponent();
+		}
+	}
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual C#/RibbonForm/form.designer.cs b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual C#/RibbonForm/form.designer.cs
new file mode 100644
index 00000000..6bc0536d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual C#/RibbonForm/form.designer.cs	
@@ -0,0 +1,37 @@
+namespace $rootnamespace$
+{
+	partial class $safeitemrootname$
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if (disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form 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.Text = "$safeitemrootname$";
+		}
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual C#/RibbonForm/ribbonform.vstemplate b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual C#/RibbonForm/ribbonform.vstemplate
new file mode 100644
index 00000000..a0273570
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual C#/RibbonForm/ribbonform.vstemplate	
@@ -0,0 +1,38 @@
+<VSTemplate Version="3.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name>Ribbon Form</Name>
+    <Description>DotNetBar Ribbon Form</Description>
+    <Icon Package="{FAE04EC1-301F-11d3-BF4B-00C04F79EFBC}" ID="4535" />
+	<TemplateID>DevComponents.CS.RibbonForm</TemplateID>
+    <ProjectType>CSharp</ProjectType>
+    <SortOrder>41</SortOrder>
+	<RequiredFrameworkVersion>2.0</RequiredFrameworkVersion>
+    <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
+    <DefaultName>RibbonForm.cs</DefaultName>
+  </TemplateData>
+  <TemplateContent>
+		<References>
+			<Reference>
+				<Assembly>System</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Data</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Drawing</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Windows.Forms</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Xml</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>DevComponents.DotNetBar2</Assembly>
+			</Reference>
+		</References>
+
+    <ProjectItem ReplaceParameters="true" SubType="Form">Form.cs</ProjectItem>
+    <ProjectItem ReplaceParameters="true">Form.Designer.cs</ProjectItem>
+  </TemplateContent>
+</VSTemplate>
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual C#/TabbedForm/Form.Designer.cs b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual C#/TabbedForm/Form.Designer.cs
new file mode 100644
index 00000000..6a057d83
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual C#/TabbedForm/Form.Designer.cs	
@@ -0,0 +1,175 @@
+namespace $rootnamespace$
+{
+    partial class $safeitemrootname$
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form 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.tabFormControl1 = new DevComponents.DotNetBar.Controls.TabFormControl();
+            this.tabFormPanel1 = new DevComponents.DotNetBar.Controls.TabFormPanel();
+            this.tabFormPanel2 = new DevComponents.DotNetBar.Controls.TabFormPanel();
+            this.tabFormItem1 = new DevComponents.DotNetBar.Controls.TabFormItem();
+            this.tabFormItem2 = new DevComponents.DotNetBar.Controls.TabFormItem();
+            this.label1 = new System.Windows.Forms.Label();
+            this.label2 = new System.Windows.Forms.Label();
+            this.tabFormControl1.SuspendLayout();
+            this.tabFormPanel1.SuspendLayout();
+            this.tabFormPanel2.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // tabFormControl1
+            // 
+            this.tabFormControl1.BackColor = System.Drawing.Color.White;
+            // 
+            // 
+            // 
+            this.tabFormControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.tabFormControl1.Controls.Add(this.tabFormPanel1);
+            this.tabFormControl1.Controls.Add(this.tabFormPanel2);
+            this.tabFormControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tabFormControl1.ForeColor = System.Drawing.Color.Black;
+            this.tabFormControl1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+            this.tabFormItem1,
+            this.tabFormItem2});
+            this.tabFormControl1.Location = new System.Drawing.Point(1, 1);
+            this.tabFormControl1.Name = "tabFormControl1";
+            this.tabFormControl1.Size = new System.Drawing.Size(614, 412);
+            this.tabFormControl1.TabIndex = 0;
+            this.tabFormControl1.TabStripFont = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.tabFormControl1.Text = "tabFormControl1";
+            // 
+            // tabFormPanel1
+            // 
+            this.tabFormPanel1.Controls.Add(this.label1);
+            this.tabFormPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tabFormPanel1.Location = new System.Drawing.Point(0, 28);
+            this.tabFormPanel1.Name = "tabFormPanel1";
+            this.tabFormPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3);
+            this.tabFormPanel1.Size = new System.Drawing.Size(614, 384);
+            // 
+            // 
+            // 
+            this.tabFormPanel1.Style.Class = "TabFormPanel";
+            this.tabFormPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.tabFormPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.tabFormPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.tabFormPanel1.TabIndex = 1;
+            // 
+            // tabFormPanel2
+            // 
+            this.tabFormPanel2.Controls.Add(this.label2);
+            this.tabFormPanel2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tabFormPanel2.Location = new System.Drawing.Point(0, 28);
+            this.tabFormPanel2.Name = "tabFormPanel2";
+            this.tabFormPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3);
+            this.tabFormPanel2.Size = new System.Drawing.Size(614, 384);
+            // 
+            // 
+            // 
+            this.tabFormPanel2.Style.Class = "TabFormPanel";
+            this.tabFormPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.tabFormPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.tabFormPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.tabFormPanel2.TabIndex = 2;
+            this.tabFormPanel2.Visible = false;
+            // 
+            // tabFormItem1
+            // 
+            this.tabFormItem1.Checked = true;
+            this.tabFormItem1.Name = "tabFormItem1";
+            this.tabFormItem1.Panel = this.tabFormPanel1;
+            this.tabFormItem1.Text = "Document 1";
+            // 
+            // tabFormItem2
+            // 
+            this.tabFormItem2.Name = "tabFormItem2";
+            this.tabFormItem2.Panel = this.tabFormPanel2;
+            this.tabFormItem2.Text = "Document 2";
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.BackColor = System.Drawing.Color.Transparent;
+            this.label1.Location = new System.Drawing.Point(241, 175);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(101, 13);
+            this.label1.TabIndex = 0;
+            this.label1.Text = "Your content here...";
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.BackColor = System.Drawing.Color.Transparent;
+            this.label2.Location = new System.Drawing.Point(257, 186);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(101, 13);
+            this.label2.TabIndex = 1;
+            this.label2.Text = "Your content here...";
+            // 
+            // $safeitemrootname$
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(616, 414);
+            this.Controls.Add(this.tabFormControl1);
+            this.ForeColor = System.Drawing.Color.Black;
+            this.Name = "$safeitemrootname$";
+            this.Text = "DotNetBar Tabbed App Form";
+            this.tabFormControl1.ResumeLayout(false);
+            this.tabFormControl1.PerformLayout();
+            this.tabFormPanel1.ResumeLayout(false);
+            this.tabFormPanel1.PerformLayout();
+            this.tabFormPanel2.ResumeLayout(false);
+            this.tabFormPanel2.PerformLayout();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private DevComponents.DotNetBar.Controls.TabFormControl tabFormControl1;
+        private DevComponents.DotNetBar.Controls.TabFormPanel tabFormPanel1;
+        private DevComponents.DotNetBar.Controls.TabFormPanel tabFormPanel2;
+        private DevComponents.DotNetBar.Controls.TabFormItem tabFormItem1;
+        private DevComponents.DotNetBar.Controls.TabFormItem tabFormItem2;
+		private System.Windows.Forms.Label label1;
+		private System.Windows.Forms.Label label2;
+
+    }
+}
+
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual C#/TabbedForm/Form.cs b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual C#/TabbedForm/Form.cs
new file mode 100644
index 00000000..47530f09
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual C#/TabbedForm/Form.cs	
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+
+namespace $rootnamespace$
+{
+    public partial class $safeitemrootname$ : DevComponents.DotNetBar.Controls.TabParentForm
+    {
+        public $safeitemrootname$()
+        {
+            InitializeComponent();
+        }
+    }
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual C#/TabbedForm/Form.resx b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual C#/TabbedForm/Form.resx
new file mode 100644
index 00000000..19dc0dd8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual C#/TabbedForm/Form.resx	
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual C#/TabbedForm/TabbedForm.zip b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual C#/TabbedForm/TabbedForm.zip
new file mode 100644
index 00000000..7cd94f8b
Binary files /dev/null and b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual C#/TabbedForm/TabbedForm.zip differ
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual C#/TabbedForm/tabbedform.vstemplate b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual C#/TabbedForm/tabbedform.vstemplate
new file mode 100644
index 00000000..c22546e3
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2011/Visual C#/TabbedForm/tabbedform.vstemplate	
@@ -0,0 +1,38 @@
+<VSTemplate Version="3.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name>Tabbed Form</Name>
+    <Description>DotNetBar Tabbed Form</Description>
+    <Icon Package="{FAE04EC1-301F-11d3-BF4B-00C04F79EFBC}" ID="4535" />
+	<TemplateID>DevComponents.CS.TabbedForm</TemplateID>
+    <ProjectType>CSharp</ProjectType>
+    <SortOrder>41</SortOrder>
+    <DefaultName>Form.cs</DefaultName>
+	<RequiredFrameworkVersion>2.0</RequiredFrameworkVersion>
+    <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
+  </TemplateData>
+  <TemplateContent>
+		<References>
+			<Reference>
+				<Assembly>System</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Data</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Drawing</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Windows.Forms</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Xml</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>DevComponents.DotNetBar2</Assembly>
+			</Reference>
+		</References>
+
+    <ProjectItem ReplaceParameters="true" SubType="Form">Form.cs</ProjectItem>
+    <ProjectItem ReplaceParameters="true">Form.Designer.cs</ProjectItem>
+  </TemplateContent>
+</VSTemplate>
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual Basic/MetroAppForm/Form.Designer.vb b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual Basic/MetroAppForm/Form.Designer.vb
new file mode 100644
index 00000000..913e8b3c
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual Basic/MetroAppForm/Form.Designer.vb	
@@ -0,0 +1,217 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class $safeitemrootname$
+    Inherits DevComponents.DotNetBar.Metro.MetroAppForm
+
+    'Form overrides dispose to clean up the component list.
+    <System.Diagnostics.DebuggerNonUserCode()> _
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+        Try
+            If disposing AndAlso components IsNot Nothing Then
+                components.Dispose()
+            End If
+        Finally
+            MyBase.Dispose(disposing)
+        End Try
+    End Sub
+
+    'Required by the Windows Form Designer
+    Private components As System.ComponentModel.IContainer
+
+    'NOTE: The following procedure is required by the Windows Form Designer
+    'It can be modified using the Windows Form Designer.  
+    'Do not modify it using the code editor.
+    <System.Diagnostics.DebuggerStepThrough()> _
+    Private Sub InitializeComponent()
+        Me.components = New System.ComponentModel.Container
+        Me.MetroShell1 = New DevComponents.DotNetBar.Metro.MetroShell
+        Me.MetroTabItem1 = New DevComponents.DotNetBar.Metro.MetroTabItem
+        Me.MetroTabPanel1 = New DevComponents.DotNetBar.Metro.MetroTabPanel
+        Me.MetroTabItem2 = New DevComponents.DotNetBar.Metro.MetroTabItem
+        Me.MetroTabPanel2 = New DevComponents.DotNetBar.Metro.MetroTabPanel
+        Me.StyleManager1 = New DevComponents.DotNetBar.StyleManager(Me.components)
+        Me.QatCustomizeItem1 = New DevComponents.DotNetBar.QatCustomizeItem
+        Me.MetroAppButton1 = New DevComponents.DotNetBar.Metro.MetroAppButton
+        Me.ButtonItem1 = New DevComponents.DotNetBar.ButtonItem
+        Me.MetroStatusBar1 = New DevComponents.DotNetBar.Metro.MetroStatusBar
+        Me.LabelItem1 = New DevComponents.DotNetBar.LabelItem
+        Me.MetroShell1.SuspendLayout()
+        Me.SuspendLayout()
+        '
+        'MetroShell1
+        '
+        Me.MetroShell1.BackColor = System.Drawing.Color.White
+        '
+        '
+        '
+        Me.MetroShell1.BackgroundStyle.Class = ""
+        Me.MetroShell1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        Me.MetroShell1.CaptionVisible = True
+        Me.MetroShell1.Controls.Add(Me.MetroTabPanel1)
+        Me.MetroShell1.Controls.Add(Me.MetroTabPanel2)
+        Me.MetroShell1.Dock = System.Windows.Forms.DockStyle.Top
+        Me.MetroShell1.ForeColor = System.Drawing.Color.Black
+        Me.MetroShell1.HelpButtonText = Nothing
+        Me.MetroShell1.Items.AddRange(New DevComponents.DotNetBar.BaseItem() {Me.MetroAppButton1, Me.MetroTabItem1, Me.MetroTabItem2})
+        Me.MetroShell1.KeyTipsFont = New System.Drawing.Font("Tahoma", 7.0!)
+        Me.MetroShell1.Location = New System.Drawing.Point(0, 1)
+        Me.MetroShell1.Name = "MetroShell1"
+        Me.MetroShell1.QuickToolbarItems.AddRange(New DevComponents.DotNetBar.BaseItem() {Me.ButtonItem1, Me.QatCustomizeItem1})
+        Me.MetroShell1.Size = New System.Drawing.Size(652, 234)
+        Me.MetroShell1.SystemText.MaximizeRibbonText = "&Maximize the Ribbon"
+        Me.MetroShell1.SystemText.MinimizeRibbonText = "Mi&nimize the Ribbon"
+        Me.MetroShell1.SystemText.QatAddItemText = "&Add to Quick Access Toolbar"
+        Me.MetroShell1.SystemText.QatCustomizeMenuLabel = "<b>Customize Quick Access Toolbar</b>"
+        Me.MetroShell1.SystemText.QatCustomizeText = "&Customize Quick Access Toolbar..."
+        Me.MetroShell1.SystemText.QatDialogAddButton = "&Add >>"
+        Me.MetroShell1.SystemText.QatDialogCancelButton = "Cancel"
+        Me.MetroShell1.SystemText.QatDialogCaption = "Customize Quick Access Toolbar"
+        Me.MetroShell1.SystemText.QatDialogCategoriesLabel = "&Choose commands from:"
+        Me.MetroShell1.SystemText.QatDialogOkButton = "OK"
+        Me.MetroShell1.SystemText.QatDialogPlacementCheckbox = "&Place Quick Access Toolbar below the Ribbon"
+        Me.MetroShell1.SystemText.QatDialogRemoveButton = "&Remove"
+        Me.MetroShell1.SystemText.QatPlaceAboveRibbonText = "&Place Quick Access Toolbar above the Ribbon"
+        Me.MetroShell1.SystemText.QatPlaceBelowRibbonText = "&Place Quick Access Toolbar below the Ribbon"
+        Me.MetroShell1.SystemText.QatRemoveItemText = "&Remove from Quick Access Toolbar"
+        Me.MetroShell1.TabIndex = 0
+        Me.MetroShell1.TabStripFont = New System.Drawing.Font("Segoe UI", 10.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.MetroShell1.Text = "MetroShell1"
+        '
+        'MetroTabItem1
+        '
+        Me.MetroTabItem1.Checked = True
+        Me.MetroTabItem1.Name = "MetroTabItem1"
+        Me.MetroTabItem1.Panel = Me.MetroTabPanel1
+        Me.MetroTabItem1.Text = "&HOME"
+        '
+        'MetroTabPanel1
+        '
+        Me.MetroTabPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled
+        Me.MetroTabPanel1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.MetroTabPanel1.Location = New System.Drawing.Point(0, 51)
+        Me.MetroTabPanel1.Name = "MetroTabPanel1"
+        Me.MetroTabPanel1.Padding = New System.Windows.Forms.Padding(3, 0, 3, 3)
+        Me.MetroTabPanel1.Size = New System.Drawing.Size(652, 183)
+        '
+        '
+        '
+        Me.MetroTabPanel1.Style.Class = ""
+        Me.MetroTabPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        '
+        '
+        '
+        Me.MetroTabPanel1.StyleMouseDown.Class = ""
+        Me.MetroTabPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        '
+        '
+        '
+        Me.MetroTabPanel1.StyleMouseOver.Class = ""
+        Me.MetroTabPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        Me.MetroTabPanel1.TabIndex = 1
+        '
+        'MetroTabItem2
+        '
+        Me.MetroTabItem2.Name = "MetroTabItem2"
+        Me.MetroTabItem2.Panel = Me.MetroTabPanel2
+        Me.MetroTabItem2.Text = "&VIEW"
+        '
+        'MetroTabPanel2
+        '
+        Me.MetroTabPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled
+        Me.MetroTabPanel2.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.MetroTabPanel2.Location = New System.Drawing.Point(0, 0)
+        Me.MetroTabPanel2.Name = "MetroTabPanel2"
+        Me.MetroTabPanel2.Padding = New System.Windows.Forms.Padding(3, 0, 3, 3)
+        Me.MetroTabPanel2.Size = New System.Drawing.Size(200, 100)
+        '
+        '
+        '
+        Me.MetroTabPanel2.Style.Class = ""
+        Me.MetroTabPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        '
+        '
+        '
+        Me.MetroTabPanel2.StyleMouseDown.Class = ""
+        Me.MetroTabPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        '
+        '
+        '
+        Me.MetroTabPanel2.StyleMouseOver.Class = ""
+        Me.MetroTabPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        Me.MetroTabPanel2.TabIndex = 2
+        '
+        'StyleManager1
+        '
+        Me.StyleManager1.ManagerStyle = DevComponents.DotNetBar.eStyle.Metro
+        Me.StyleManager1.MetroColorParameters = New DevComponents.DotNetBar.Metro.ColorTables.MetroColorGeneratorParameters(System.Drawing.Color.White, System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(163, Byte), Integer), CType(CType(26, Byte), Integer)))
+        '
+        'QatCustomizeItem1
+        '
+        Me.QatCustomizeItem1.BeginGroup = True
+        Me.QatCustomizeItem1.Name = "QatCustomizeItem1"
+        '
+        'MetroAppButton1
+        '
+        Me.MetroAppButton1.AutoExpandOnClick = True
+        Me.MetroAppButton1.CanCustomize = False
+        Me.MetroAppButton1.ImageFixedSize = New System.Drawing.Size(16, 16)
+        Me.MetroAppButton1.ImagePaddingHorizontal = 0
+        Me.MetroAppButton1.ImagePaddingVertical = 0
+        Me.MetroAppButton1.Name = "MetroAppButton1"
+        Me.MetroAppButton1.ShowSubItems = False
+        Me.MetroAppButton1.Text = "&File"
+        '
+        'ButtonItem1
+        '
+        Me.ButtonItem1.Name = "ButtonItem1"
+        Me.ButtonItem1.Text = "ButtonItem1"
+        '
+        'MetroStatusBar1
+        '
+        '
+        '
+        '
+        Me.MetroStatusBar1.BackgroundStyle.Class = ""
+        Me.MetroStatusBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        Me.MetroStatusBar1.ContainerControlProcessDialogKey = True
+        Me.MetroStatusBar1.Dock = System.Windows.Forms.DockStyle.Bottom
+        Me.MetroStatusBar1.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.MetroStatusBar1.Items.AddRange(New DevComponents.DotNetBar.BaseItem() {Me.LabelItem1})
+        Me.MetroStatusBar1.Location = New System.Drawing.Point(0, 413)
+        Me.MetroStatusBar1.Name = "MetroStatusBar1"
+        Me.MetroStatusBar1.Size = New System.Drawing.Size(652, 22)
+        Me.MetroStatusBar1.TabIndex = 1
+        Me.MetroStatusBar1.Text = "MetroStatusBar1"
+        '
+        'LabelItem1
+        '
+        Me.LabelItem1.Name = "LabelItem1"
+        Me.LabelItem1.Text = "READY"
+        '
+        '$safeitemrootname$
+        '
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.ClientSize = New System.Drawing.Size(653, 436)
+        Me.Controls.Add(Me.MetroStatusBar1)
+        Me.Controls.Add(Me.MetroShell1)
+        Me.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Name = "$safeitemrootname$"
+        Me.Text = "DotNetBar Metro App Form"
+        Me.MetroShell1.ResumeLayout(False)
+        Me.MetroShell1.PerformLayout()
+        Me.ResumeLayout(False)
+
+    End Sub
+    Friend WithEvents MetroShell1 As DevComponents.DotNetBar.Metro.MetroShell
+    Friend WithEvents MetroTabPanel1 As DevComponents.DotNetBar.Metro.MetroTabPanel
+    Friend WithEvents MetroTabPanel2 As DevComponents.DotNetBar.Metro.MetroTabPanel
+    Friend WithEvents MetroAppButton1 As DevComponents.DotNetBar.Metro.MetroAppButton
+    Friend WithEvents MetroTabItem1 As DevComponents.DotNetBar.Metro.MetroTabItem
+    Friend WithEvents MetroTabItem2 As DevComponents.DotNetBar.Metro.MetroTabItem
+    Friend WithEvents ButtonItem1 As DevComponents.DotNetBar.ButtonItem
+    Friend WithEvents QatCustomizeItem1 As DevComponents.DotNetBar.QatCustomizeItem
+    Friend WithEvents StyleManager1 As DevComponents.DotNetBar.StyleManager
+    Friend WithEvents MetroStatusBar1 As DevComponents.DotNetBar.Metro.MetroStatusBar
+    Friend WithEvents LabelItem1 As DevComponents.DotNetBar.LabelItem
+
+End Class
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual Basic/MetroAppForm/Form.resx b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual Basic/MetroAppForm/Form.resx
new file mode 100644
index 00000000..998f01fd
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual Basic/MetroAppForm/Form.resx	
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="StyleManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual Basic/MetroAppForm/Form.vb b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual Basic/MetroAppForm/Form.vb
new file mode 100644
index 00000000..64eb4330
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual Basic/MetroAppForm/Form.vb	
@@ -0,0 +1,3 @@
+Public Class $safeitemrootname$
+
+End Class
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual Basic/MetroAppForm/MetroAppForm.zip b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual Basic/MetroAppForm/MetroAppForm.zip
new file mode 100644
index 00000000..e464b16b
Binary files /dev/null and b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual Basic/MetroAppForm/MetroAppForm.zip differ
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual Basic/MetroAppForm/metroappform.vstemplate b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual Basic/MetroAppForm/metroappform.vstemplate
new file mode 100644
index 00000000..9cbac33b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual Basic/MetroAppForm/metroappform.vstemplate	
@@ -0,0 +1,36 @@
+<VSTemplate Version="3.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name>Metro UI App Form</Name>
+    <Description>DotNetBar Metro Application Form</Description>
+    <Icon Package="{164B10B9-B200-11D0-8C61-00A0C91E29D5}" ID="4527" />
+	<TemplateID>DevComponents.VB.MetroAppForm</TemplateID>
+    <ProjectType>VisualBasic</ProjectType>
+    <SortOrder>11</SortOrder>
+    <DefaultName>Form.vb</DefaultName>
+	<RequiredFrameworkVersion>2.0</RequiredFrameworkVersion>
+    <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
+  </TemplateData>
+  <TemplateContent>
+        <References>
+            <Reference>
+                <Assembly>System</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+            <Reference>
+                <Assembly>System.Drawing</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+            <Reference>
+                <Assembly>System.Windows.Forms</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+			<Reference>
+                <Assembly>DevComponents.DotNetBar2</Assembly>
+                <URL>http://www.devcomponents.com</URL>
+            </Reference>
+        </References>
+
+    <ProjectItem ReplaceParameters="true" SubType="Form">Form.vb</ProjectItem>
+    <ProjectItem ReplaceParameters="true">Form.Designer.vb</ProjectItem>
+  </TemplateContent>
+</VSTemplate>
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual Basic/MetroForm/Form.Designer.vb b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual Basic/MetroForm/Form.Designer.vb
new file mode 100644
index 00000000..7d926fa4
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual Basic/MetroForm/Form.Designer.vb	
@@ -0,0 +1,33 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class $safeitemrootname$
+    Inherits DevComponents.DotNetBar.Metro.MetroForm
+
+    'Form overrides dispose to clean up the component list.
+    <System.Diagnostics.DebuggerNonUserCode()> _
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+        Try
+            If disposing AndAlso components IsNot Nothing Then
+                components.Dispose()
+            End If
+        Finally
+            MyBase.Dispose(disposing)
+        End Try
+    End Sub
+
+    'Required by the Windows Form Designer
+    Private components As System.ComponentModel.IContainer
+
+    'NOTE: The following procedure is required by the Windows Form Designer
+    'It can be modified using the Windows Form Designer.  
+    'Do not modify it using the code editor.
+    <System.Diagnostics.DebuggerStepThrough()> _
+    Private Sub InitializeComponent()
+        components = New System.ComponentModel.Container
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.ClientSize = New System.Drawing.Size(653, 436)
+		Me.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+		Me.Name = "$safeitemrootname$"
+        Me.Text = "MetroForm"
+    End Sub
+End Class
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual Basic/MetroForm/Form.vb b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual Basic/MetroForm/Form.vb
new file mode 100644
index 00000000..9b12d76d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual Basic/MetroForm/Form.vb	
@@ -0,0 +1,3 @@
+Public Class $safeitemrootname$
+
+End Class
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual Basic/MetroForm/MetroForm.zip b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual Basic/MetroForm/MetroForm.zip
new file mode 100644
index 00000000..1742cb89
Binary files /dev/null and b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual Basic/MetroForm/MetroForm.zip differ
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual Basic/MetroForm/metroform.vstemplate b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual Basic/MetroForm/metroform.vstemplate
new file mode 100644
index 00000000..62cc1786
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual Basic/MetroForm/metroform.vstemplate	
@@ -0,0 +1,36 @@
+<VSTemplate Version="3.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name>Metro Form</Name>
+    <Description>DotNetBar Metro Form</Description>
+    <Icon Package="{164B10B9-B200-11D0-8C61-00A0C91E29D5}" ID="4527" />
+	<TemplateID>DevComponents.VB.MetroForm</TemplateID>
+    <ProjectType>VisualBasic</ProjectType>
+    <SortOrder>11</SortOrder>
+    <DefaultName>Form.vb</DefaultName>
+	<RequiredFrameworkVersion>2.0</RequiredFrameworkVersion>
+    <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
+  </TemplateData>
+  <TemplateContent>
+        <References>
+            <Reference>
+                <Assembly>System</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+            <Reference>
+                <Assembly>System.Drawing</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+            <Reference>
+                <Assembly>System.Windows.Forms</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+			<Reference>
+                <Assembly>DevComponents.DotNetBar2</Assembly>
+                <URL>http://www.devcomponents.com</URL>
+            </Reference>
+        </References>
+
+    <ProjectItem ReplaceParameters="true" SubType="Form">Form.vb</ProjectItem>
+    <ProjectItem ReplaceParameters="true">Form.Designer.vb</ProjectItem>
+  </TemplateContent>
+</VSTemplate>
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual Basic/Office2007Form/DotNetBarOffice2007Form.zip b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual Basic/Office2007Form/DotNetBarOffice2007Form.zip
new file mode 100644
index 00000000..bbbe8da0
Binary files /dev/null and b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual Basic/Office2007Form/DotNetBarOffice2007Form.zip differ
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual Basic/Office2007Form/Form.Designer.vb b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual Basic/Office2007Form/Form.Designer.vb
new file mode 100644
index 00000000..2f6f306f
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual Basic/Office2007Form/Form.Designer.vb	
@@ -0,0 +1,29 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class $safeitemrootname$
+    Inherits DevComponents.DotNetBar.OfficeForm
+
+    'Form overrides dispose to clean up the component list.
+    <System.Diagnostics.DebuggerNonUserCode()> _
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+        Try
+            If disposing AndAlso components IsNot Nothing Then
+                components.Dispose()
+            End If
+        Finally
+            MyBase.Dispose(disposing)
+        End Try
+    End Sub
+
+    'Required by the Windows Form Designer
+    Private components As System.ComponentModel.IContainer
+
+    'NOTE: The following procedure is required by the Windows Form Designer
+    'It can be modified using the Windows Form Designer.  
+    'Do not modify it using the code editor.
+    <System.Diagnostics.DebuggerStepThrough()> _
+    Private Sub InitializeComponent()
+        components = New System.ComponentModel.Container
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.Text = "$safeitemrootname$"
+    End Sub
+End Class
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual Basic/Office2007Form/Form.vb b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual Basic/Office2007Form/Form.vb
new file mode 100644
index 00000000..9b12d76d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual Basic/Office2007Form/Form.vb	
@@ -0,0 +1,3 @@
+Public Class $safeitemrootname$
+
+End Class
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual Basic/Office2007Form/office2007form.vstemplate b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual Basic/Office2007Form/office2007form.vstemplate
new file mode 100644
index 00000000..1bf5f9f1
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual Basic/Office2007Form/office2007form.vstemplate	
@@ -0,0 +1,36 @@
+<VSTemplate Version="3.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name>Office Form</Name>
+    <Description>DotNetBar Office Style Form</Description>
+    <Icon Package="{164B10B9-B200-11D0-8C61-00A0C91E29D5}" ID="4527" />
+	<TemplateID>DevComponents.VB.Office2007Form</TemplateID>
+    <ProjectType>VisualBasic</ProjectType>
+    <SortOrder>11</SortOrder>
+    <DefaultName>Form.vb</DefaultName>
+	<RequiredFrameworkVersion>2.0</RequiredFrameworkVersion>
+    <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
+  </TemplateData>
+  <TemplateContent>
+        <References>
+            <Reference>
+                <Assembly>System</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+            <Reference>
+                <Assembly>System.Drawing</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+            <Reference>
+                <Assembly>System.Windows.Forms</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+			<Reference>
+                <Assembly>DevComponents.DotNetBar2</Assembly>
+                <URL>http://www.devcomponents.com</URL>
+            </Reference>
+        </References>
+
+    <ProjectItem ReplaceParameters="true" SubType="Form">Form.vb</ProjectItem>
+    <ProjectItem ReplaceParameters="true">Form.Designer.vb</ProjectItem>
+  </TemplateContent>
+</VSTemplate>
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual Basic/RibbonForm/DotNetBarRibbonForm.zip b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual Basic/RibbonForm/DotNetBarRibbonForm.zip
new file mode 100644
index 00000000..fbfe10c8
Binary files /dev/null and b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual Basic/RibbonForm/DotNetBarRibbonForm.zip differ
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual Basic/RibbonForm/Form.Designer.vb b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual Basic/RibbonForm/Form.Designer.vb
new file mode 100644
index 00000000..abbb321e
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual Basic/RibbonForm/Form.Designer.vb	
@@ -0,0 +1,28 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class $safeitemrootname$
+    Inherits DevComponents.DotNetBar.RibbonForm
+
+    'Form overrides dispose to clean up the component list.
+    <System.Diagnostics.DebuggerNonUserCode()> _
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+        Try
+            If disposing AndAlso components IsNot Nothing Then
+                components.Dispose()
+            End If
+        Finally
+            MyBase.Dispose(disposing)
+        End Try
+    End Sub
+
+    'Required by the Windows Form Designer
+    Private components As System.ComponentModel.IContainer
+
+    'NOTE: The following procedure is required by the Windows Form Designer
+    'It can be modified using the Windows Form Designer.  
+    'Do not modify it using the code editor.
+    <System.Diagnostics.DebuggerStepThrough()> _
+    Private Sub InitializeComponent()
+        components = New System.ComponentModel.Container
+        Me.Text = "$safeitemrootname$"
+    End Sub
+End Class
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual Basic/RibbonForm/Form.vb b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual Basic/RibbonForm/Form.vb
new file mode 100644
index 00000000..9b12d76d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual Basic/RibbonForm/Form.vb	
@@ -0,0 +1,3 @@
+Public Class $safeitemrootname$
+
+End Class
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual Basic/RibbonForm/ribbonform.vstemplate b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual Basic/RibbonForm/ribbonform.vstemplate
new file mode 100644
index 00000000..13e12ed8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual Basic/RibbonForm/ribbonform.vstemplate	
@@ -0,0 +1,36 @@
+<VSTemplate Version="3.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name>Ribbon Form</Name>
+    <Description>DotNetBar Ribbon Form</Description>
+    <Icon Package="{164B10B9-B200-11D0-8C61-00A0C91E29D5}" ID="4527" />
+	<TemplateID>DevComponents.VB.RibbonForm</TemplateID>
+    <ProjectType>VisualBasic</ProjectType>
+    <SortOrder>11</SortOrder>
+    <DefaultName>Form.vb</DefaultName>
+	<RequiredFrameworkVersion>2.0</RequiredFrameworkVersion>
+    <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
+  </TemplateData>
+  <TemplateContent>
+        <References>
+            <Reference>
+                <Assembly>System</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+            <Reference>
+                <Assembly>System.Drawing</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+            <Reference>
+                <Assembly>System.Windows.Forms</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+			<Reference>
+                <Assembly>DevComponents.DotNetBar2</Assembly>
+                <URL>http://www.devcomponents.com</URL>
+            </Reference>
+        </References>
+
+    <ProjectItem ReplaceParameters="true" SubType="Form">Form.vb</ProjectItem>
+    <ProjectItem ReplaceParameters="true">Form.Designer.vb</ProjectItem>
+  </TemplateContent>
+</VSTemplate>
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual Basic/TabbedForm/Form.Designer.vb b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual Basic/TabbedForm/Form.Designer.vb
new file mode 100644
index 00000000..7fcc4215
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual Basic/TabbedForm/Form.Designer.vb	
@@ -0,0 +1,176 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class $safeitemrootname$
+    Inherits DevComponents.DotNetBar.Controls.TabParentForm
+
+    'Form overrides dispose to clean up the component list.
+    <System.Diagnostics.DebuggerNonUserCode()> _
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+        Try
+            If disposing AndAlso components IsNot Nothing Then
+                components.Dispose()
+            End If
+        Finally
+            MyBase.Dispose(disposing)
+        End Try
+    End Sub
+
+    'Required by the Windows Form Designer
+    Private components As System.ComponentModel.IContainer
+
+    'NOTE: The following procedure is required by the Windows Form Designer
+    'It can be modified using the Windows Form Designer.  
+    'Do not modify it using the code editor.
+    <System.Diagnostics.DebuggerStepThrough()> _
+    Private Sub InitializeComponent()
+        Me.TabFormControl1 = New DevComponents.DotNetBar.Controls.TabFormControl()
+        Me.TabFormPanel1 = New DevComponents.DotNetBar.Controls.TabFormPanel()
+        Me.TabFormPanel2 = New DevComponents.DotNetBar.Controls.TabFormPanel()
+        Me.TabFormItem1 = New DevComponents.DotNetBar.Controls.TabFormItem()
+        Me.TabFormItem2 = New DevComponents.DotNetBar.Controls.TabFormItem()
+        Me.Label1 = New System.Windows.Forms.Label()
+        Me.Label2 = New System.Windows.Forms.Label()
+        Me.TabFormControl1.SuspendLayout
+        Me.TabFormPanel1.SuspendLayout
+        Me.TabFormPanel2.SuspendLayout
+        Me.SuspendLayout
+        '
+        'TabFormControl1
+        '
+        Me.TabFormControl1.BackColor = System.Drawing.Color.White
+        '
+        '
+        '
+        Me.TabFormControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        Me.TabFormControl1.Controls.Add(Me.TabFormPanel1)
+        Me.TabFormControl1.Controls.Add(Me.TabFormPanel2)
+        Me.TabFormControl1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.TabFormControl1.ForeColor = System.Drawing.Color.Black
+        Me.TabFormControl1.Items.AddRange(New DevComponents.DotNetBar.BaseItem() {Me.TabFormItem1, Me.TabFormItem2})
+        Me.TabFormControl1.Location = New System.Drawing.Point(1, 1)
+        Me.TabFormControl1.Name = "TabFormControl1"
+        Me.TabFormControl1.Size = New System.Drawing.Size(444, 311)
+        Me.TabFormControl1.SystemText.MaximizeRibbonText = "&Maximize the Ribbon"
+        Me.TabFormControl1.SystemText.MinimizeRibbonText = "Mi&nimize the Ribbon"
+        Me.TabFormControl1.SystemText.QatAddItemText = "&Add to Quick Access Toolbar"
+        Me.TabFormControl1.SystemText.QatCustomizeMenuLabel = "<b>Customize Quick Access Toolbar</b>"
+        Me.TabFormControl1.SystemText.QatCustomizeText = "&Customize Quick Access Toolbar..."
+        Me.TabFormControl1.SystemText.QatDialogAddButton = "&Add >>"
+        Me.TabFormControl1.SystemText.QatDialogCancelButton = "Cancel"
+        Me.TabFormControl1.SystemText.QatDialogCaption = "Customize Quick Access Toolbar"
+        Me.TabFormControl1.SystemText.QatDialogCategoriesLabel = "&Choose commands from:"
+        Me.TabFormControl1.SystemText.QatDialogOkButton = "OK"
+        Me.TabFormControl1.SystemText.QatDialogPlacementCheckbox = "&Place Quick Access Toolbar below the Ribbon"
+        Me.TabFormControl1.SystemText.QatDialogRemoveButton = "&Remove"
+        Me.TabFormControl1.SystemText.QatPlaceAboveRibbonText = "&Place Quick Access Toolbar above the Ribbon"
+        Me.TabFormControl1.SystemText.QatPlaceBelowRibbonText = "&Place Quick Access Toolbar below the Ribbon"
+        Me.TabFormControl1.SystemText.QatRemoveItemText = "&Remove from Quick Access Toolbar"
+        Me.TabFormControl1.TabIndex = 0
+        Me.TabFormControl1.TabStripFont = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+        Me.TabFormControl1.Text = "TabFormControl1"
+        '
+        'TabFormPanel1
+        '
+        Me.TabFormPanel1.Controls.Add(Me.Label1)
+        Me.TabFormPanel1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.TabFormPanel1.Location = New System.Drawing.Point(0, 28)
+        Me.TabFormPanel1.Name = "TabFormPanel1"
+        Me.TabFormPanel1.Padding = New System.Windows.Forms.Padding(3, 0, 3, 3)
+        Me.TabFormPanel1.Size = New System.Drawing.Size(444, 283)
+        '
+        '
+        '
+        Me.TabFormPanel1.Style.Class = "TabFormPanel"
+        Me.TabFormPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        '
+        '
+        '
+        Me.TabFormPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        '
+        '
+        '
+        Me.TabFormPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        Me.TabFormPanel1.TabIndex = 1
+        '
+        'TabFormPanel2
+        '
+        Me.TabFormPanel2.Controls.Add(Me.Label2)
+        Me.TabFormPanel2.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.TabFormPanel2.Location = New System.Drawing.Point(0, 28)
+        Me.TabFormPanel2.Name = "TabFormPanel2"
+        Me.TabFormPanel2.Padding = New System.Windows.Forms.Padding(3, 0, 3, 3)
+        Me.TabFormPanel2.Size = New System.Drawing.Size(444, 283)
+        '
+        '
+        '
+        Me.TabFormPanel2.Style.Class = "TabFormPanel"
+        Me.TabFormPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        '
+        '
+        '
+        Me.TabFormPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        '
+        '
+        '
+        Me.TabFormPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        Me.TabFormPanel2.TabIndex = 2
+        Me.TabFormPanel2.Visible = false
+        '
+        'TabFormItem1
+        '
+        Me.TabFormItem1.Checked = true
+        Me.TabFormItem1.Name = "TabFormItem1"
+        Me.TabFormItem1.Panel = Me.TabFormPanel1
+        Me.TabFormItem1.Text = "Document 1"
+        '
+        'TabFormItem2
+        '
+        Me.TabFormItem2.Name = "TabFormItem2"
+        Me.TabFormItem2.Panel = Me.TabFormPanel2
+        Me.TabFormItem2.Text = "Document 2"
+        '
+        'Label1
+        '
+        Me.Label1.AutoSize = true
+        Me.Label1.BackColor = System.Drawing.Color.Transparent
+        Me.Label1.Location = New System.Drawing.Point(155, 127)
+        Me.Label1.Name = "Label1"
+        Me.Label1.Size = New System.Drawing.Size(101, 13)
+        Me.Label1.TabIndex = 0
+        Me.Label1.Text = "Your content here..."
+        '
+        'Label2
+        '
+        Me.Label2.AutoSize = true
+        Me.Label2.BackColor = System.Drawing.Color.Transparent
+        Me.Label2.Location = New System.Drawing.Point(172, 135)
+        Me.Label2.Name = "Label2"
+        Me.Label2.Size = New System.Drawing.Size(101, 13)
+        Me.Label2.TabIndex = 1
+        Me.Label2.Text = "Your content here..."
+        '
+        '$safeitemrootname$
+        '
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.ClientSize = New System.Drawing.Size(446, 313)
+        Me.Controls.Add(Me.TabFormControl1)
+        Me.Name = "$safeitemrootname$"
+        Me.Text = "DotNetBar Tabbed Form"
+        Me.TabFormControl1.ResumeLayout(false)
+        Me.TabFormControl1.PerformLayout
+        Me.TabFormPanel1.ResumeLayout(false)
+        Me.TabFormPanel1.PerformLayout
+        Me.TabFormPanel2.ResumeLayout(false)
+        Me.TabFormPanel2.PerformLayout
+        Me.ResumeLayout(false)
+
+    End Sub
+    Friend WithEvents TabFormControl1 As DevComponents.DotNetBar.Controls.TabFormControl
+    Friend WithEvents TabFormPanel1 As DevComponents.DotNetBar.Controls.TabFormPanel
+    Friend WithEvents TabFormPanel2 As DevComponents.DotNetBar.Controls.TabFormPanel
+    Friend WithEvents TabFormItem1 As DevComponents.DotNetBar.Controls.TabFormItem
+    Friend WithEvents TabFormItem2 As DevComponents.DotNetBar.Controls.TabFormItem
+    Friend WithEvents Label1 As System.Windows.Forms.Label
+    Friend WithEvents Label2 As System.Windows.Forms.Label
+
+End Class
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual Basic/TabbedForm/Form.resx b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual Basic/TabbedForm/Form.resx
new file mode 100644
index 00000000..19dc0dd8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual Basic/TabbedForm/Form.resx	
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual Basic/TabbedForm/Form.vb b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual Basic/TabbedForm/Form.vb
new file mode 100644
index 00000000..64eb4330
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual Basic/TabbedForm/Form.vb	
@@ -0,0 +1,3 @@
+Public Class $safeitemrootname$
+
+End Class
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual Basic/TabbedForm/TabbedForm.zip b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual Basic/TabbedForm/TabbedForm.zip
new file mode 100644
index 00000000..66f60672
Binary files /dev/null and b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual Basic/TabbedForm/TabbedForm.zip differ
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual Basic/TabbedForm/tabbedform.vstemplate b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual Basic/TabbedForm/tabbedform.vstemplate
new file mode 100644
index 00000000..865bb1b6
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual Basic/TabbedForm/tabbedform.vstemplate	
@@ -0,0 +1,36 @@
+<VSTemplate Version="3.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name>Tabbed Form</Name>
+    <Description>DotNetBar Tabbed Form</Description>
+    <Icon Package="{164B10B9-B200-11D0-8C61-00A0C91E29D5}" ID="4527" />
+	<TemplateID>DevComponents.VB.TabbedForm</TemplateID>
+    <ProjectType>VisualBasic</ProjectType>
+    <SortOrder>12</SortOrder>
+    <DefaultName>Form.vb</DefaultName>
+	<RequiredFrameworkVersion>2.0</RequiredFrameworkVersion>
+    <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
+  </TemplateData>
+  <TemplateContent>
+        <References>
+            <Reference>
+                <Assembly>System</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+            <Reference>
+                <Assembly>System.Drawing</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+            <Reference>
+                <Assembly>System.Windows.Forms</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+			<Reference>
+                <Assembly>DevComponents.DotNetBar2</Assembly>
+                <URL>http://www.devcomponents.com</URL>
+            </Reference>
+        </References>
+
+    <ProjectItem ReplaceParameters="true" SubType="Form">Form.vb</ProjectItem>
+    <ProjectItem ReplaceParameters="true">Form.Designer.vb</ProjectItem>
+  </TemplateContent>
+</VSTemplate>
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual C#/MetroAppForm/Form.Designer.cs b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual C#/MetroAppForm/Form.Designer.cs
new file mode 100644
index 00000000..8d1bb1bc
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual C#/MetroAppForm/Form.Designer.cs	
@@ -0,0 +1,234 @@
+namespace $rootnamespace$
+{
+    partial class $safeitemrootname$
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form 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.metroShell1 = new DevComponents.DotNetBar.Metro.MetroShell();
+            this.metroTabItem1 = new DevComponents.DotNetBar.Metro.MetroTabItem();
+            this.metroTabPanel1 = new DevComponents.DotNetBar.Metro.MetroTabPanel();
+            this.metroTabItem2 = new DevComponents.DotNetBar.Metro.MetroTabItem();
+            this.metroTabPanel2 = new DevComponents.DotNetBar.Metro.MetroTabPanel();
+            this.styleManager1 = new DevComponents.DotNetBar.StyleManager(this.components);
+            this.qatCustomizeItem1 = new DevComponents.DotNetBar.QatCustomizeItem();
+            this.metroAppButton1 = new DevComponents.DotNetBar.Metro.MetroAppButton();
+            this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem();
+            this.metroStatusBar1 = new DevComponents.DotNetBar.Metro.MetroStatusBar();
+            this.labelItem1 = new DevComponents.DotNetBar.LabelItem();
+            this.metroShell1.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // metroShell1
+            // 
+            this.metroShell1.BackColor = System.Drawing.Color.White;
+            // 
+            // 
+            // 
+            this.metroShell1.BackgroundStyle.Class = "";
+            this.metroShell1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.metroShell1.CaptionVisible = true;
+            this.metroShell1.Controls.Add(this.metroTabPanel1);
+            this.metroShell1.Controls.Add(this.metroTabPanel2);
+            this.metroShell1.Dock = System.Windows.Forms.DockStyle.Top;
+            this.metroShell1.ForeColor = System.Drawing.Color.Black;
+            this.metroShell1.HelpButtonText = null;
+            this.metroShell1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+            this.metroAppButton1,
+            this.metroTabItem1,
+            this.metroTabItem2});
+            this.metroShell1.KeyTipsFont = new System.Drawing.Font("Tahoma", 7F);
+            this.metroShell1.Location = new System.Drawing.Point(0, 1);
+            this.metroShell1.Name = "metroShell1";
+            this.metroShell1.QuickToolbarItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+            this.buttonItem1,
+            this.qatCustomizeItem1});
+            this.metroShell1.Size = new System.Drawing.Size(624, 218);
+            this.metroShell1.SystemText.MaximizeRibbonText = "&Maximize the Ribbon";
+            this.metroShell1.SystemText.MinimizeRibbonText = "Mi&nimize the Ribbon";
+            this.metroShell1.SystemText.QatAddItemText = "&Add to Quick Access Toolbar";
+            this.metroShell1.SystemText.QatCustomizeMenuLabel = "<b>Customize Quick Access Toolbar</b>";
+            this.metroShell1.SystemText.QatCustomizeText = "&Customize Quick Access Toolbar...";
+            this.metroShell1.SystemText.QatDialogAddButton = "&Add >>";
+            this.metroShell1.SystemText.QatDialogCancelButton = "Cancel";
+            this.metroShell1.SystemText.QatDialogCaption = "Customize Quick Access Toolbar";
+            this.metroShell1.SystemText.QatDialogCategoriesLabel = "&Choose commands from:";
+            this.metroShell1.SystemText.QatDialogOkButton = "OK";
+            this.metroShell1.SystemText.QatDialogPlacementCheckbox = "&Place Quick Access Toolbar below the Ribbon";
+            this.metroShell1.SystemText.QatDialogRemoveButton = "&Remove";
+            this.metroShell1.SystemText.QatPlaceAboveRibbonText = "&Place Quick Access Toolbar above the Ribbon";
+            this.metroShell1.SystemText.QatPlaceBelowRibbonText = "&Place Quick Access Toolbar below the Ribbon";
+            this.metroShell1.SystemText.QatRemoveItemText = "&Remove from Quick Access Toolbar";
+            this.metroShell1.TabIndex = 0;
+            this.metroShell1.TabStripFont = new System.Drawing.Font("Segoe UI", 10.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.metroShell1.Text = "metroShell1";
+            // 
+            // metroTabItem1
+            // 
+            this.metroTabItem1.Checked = true;
+            this.metroTabItem1.Name = "metroTabItem1";
+            this.metroTabItem1.Panel = this.metroTabPanel1;
+            this.metroTabItem1.Text = "&HOME";
+            // 
+            // metroTabPanel1
+            // 
+            this.metroTabPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.metroTabPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.metroTabPanel1.Location = new System.Drawing.Point(0, 51);
+            this.metroTabPanel1.Name = "metroTabPanel1";
+            this.metroTabPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3);
+            this.metroTabPanel1.Size = new System.Drawing.Size(624, 167);
+            // 
+            // 
+            // 
+            this.metroTabPanel1.Style.Class = "";
+            this.metroTabPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.metroTabPanel1.StyleMouseDown.Class = "";
+            this.metroTabPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.metroTabPanel1.StyleMouseOver.Class = "";
+            this.metroTabPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.metroTabPanel1.TabIndex = 1;
+            // 
+            // metroTabItem2
+            // 
+            this.metroTabItem2.Name = "metroTabItem2";
+            this.metroTabItem2.Panel = this.metroTabPanel2;
+            this.metroTabItem2.Text = "&VIEW";
+            // 
+            // metroTabPanel2
+            // 
+            this.metroTabPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.metroTabPanel2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.metroTabPanel2.Location = new System.Drawing.Point(0, 0);
+            this.metroTabPanel2.Name = "metroTabPanel2";
+            this.metroTabPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3);
+            this.metroTabPanel2.Size = new System.Drawing.Size(200, 100);
+            // 
+            // 
+            // 
+            this.metroTabPanel2.Style.Class = "";
+            this.metroTabPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.metroTabPanel2.StyleMouseDown.Class = "";
+            this.metroTabPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.metroTabPanel2.StyleMouseOver.Class = "";
+            this.metroTabPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.metroTabPanel2.TabIndex = 2;
+            // 
+            // styleManager1
+            // 
+            this.styleManager1.ManagerStyle = DevComponents.DotNetBar.eStyle.Metro;
+            this.styleManager1.MetroColorParameters = new DevComponents.DotNetBar.Metro.ColorTables.MetroColorGeneratorParameters(System.Drawing.Color.White, System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(163)))), ((int)(((byte)(26))))));
+            // 
+            // qatCustomizeItem1
+            // 
+            this.qatCustomizeItem1.BeginGroup = true;
+            this.qatCustomizeItem1.Name = "qatCustomizeItem1";
+            // 
+            // metroAppButton1
+            // 
+            this.metroAppButton1.AutoExpandOnClick = true;
+            this.metroAppButton1.CanCustomize = false;
+            this.metroAppButton1.ImageFixedSize = new System.Drawing.Size(16, 16);
+            this.metroAppButton1.ImagePaddingHorizontal = 0;
+            this.metroAppButton1.ImagePaddingVertical = 0;
+            this.metroAppButton1.Name = "metroAppButton1";
+            this.metroAppButton1.ShowSubItems = false;
+            this.metroAppButton1.Text = "&File";
+            // 
+            // buttonItem1
+            // 
+            this.buttonItem1.Name = "buttonItem1";
+            this.buttonItem1.Text = "buttonItem1";
+            // 
+            // metroStatusBar1
+            // 
+            // 
+            // 
+            // 
+            this.metroStatusBar1.BackgroundStyle.Class = "";
+            this.metroStatusBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.metroStatusBar1.ContainerControlProcessDialogKey = true;
+            this.metroStatusBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.metroStatusBar1.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.metroStatusBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+            this.labelItem1});
+            this.metroStatusBar1.Location = new System.Drawing.Point(0, 374);
+            this.metroStatusBar1.Name = "metroStatusBar1";
+            this.metroStatusBar1.Size = new System.Drawing.Size(624, 21);
+            this.metroStatusBar1.TabIndex = 1;
+            this.metroStatusBar1.Text = "metroStatusBar1";
+            // 
+            // labelItem1
+            // 
+            this.labelItem1.Name = "labelItem1";
+            this.labelItem1.Text = "READY";
+            // 
+            // $safeitemrootname$
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(625, 396);
+            this.Controls.Add(this.metroStatusBar1);
+            this.Controls.Add(this.metroShell1);
+            this.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.Name = "$safeitemrootname$";
+            this.Text = "DotNetBar Metro App Form";
+            this.metroShell1.ResumeLayout(false);
+            this.metroShell1.PerformLayout();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private DevComponents.DotNetBar.Metro.MetroShell metroShell1;
+        private DevComponents.DotNetBar.Metro.MetroTabPanel metroTabPanel1;
+        private DevComponents.DotNetBar.Metro.MetroTabPanel metroTabPanel2;
+        private DevComponents.DotNetBar.Metro.MetroAppButton metroAppButton1;
+        private DevComponents.DotNetBar.Metro.MetroTabItem metroTabItem1;
+        private DevComponents.DotNetBar.Metro.MetroTabItem metroTabItem2;
+        private DevComponents.DotNetBar.ButtonItem buttonItem1;
+        private DevComponents.DotNetBar.QatCustomizeItem qatCustomizeItem1;
+        private DevComponents.DotNetBar.StyleManager styleManager1;
+        private DevComponents.DotNetBar.Metro.MetroStatusBar metroStatusBar1;
+        private DevComponents.DotNetBar.LabelItem labelItem1;
+
+    }
+}
+
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual C#/MetroAppForm/Form.cs b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual C#/MetroAppForm/Form.cs
new file mode 100644
index 00000000..ff2c3a9b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual C#/MetroAppForm/Form.cs	
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+
+namespace $rootnamespace$
+{
+    public partial class $safeitemrootname$ : DevComponents.DotNetBar.Metro.MetroAppForm
+    {
+        public $safeitemrootname$()
+        {
+            InitializeComponent();
+        }
+    }
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual C#/MetroAppForm/Form.resx b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual C#/MetroAppForm/Form.resx
new file mode 100644
index 00000000..c3d21cf2
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual C#/MetroAppForm/Form.resx	
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="styleManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual C#/MetroAppForm/MetroAppForm.zip b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual C#/MetroAppForm/MetroAppForm.zip
new file mode 100644
index 00000000..e72433e8
Binary files /dev/null and b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual C#/MetroAppForm/MetroAppForm.zip differ
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual C#/MetroAppForm/metroappform.vstemplate b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual C#/MetroAppForm/metroappform.vstemplate
new file mode 100644
index 00000000..ae758d3b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual C#/MetroAppForm/metroappform.vstemplate	
@@ -0,0 +1,38 @@
+<VSTemplate Version="3.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name>Metro App Form</Name>
+    <Description>DotNetBar Metro Application Form</Description>
+    <Icon Package="{FAE04EC1-301F-11d3-BF4B-00C04F79EFBC}" ID="4535" />
+	<TemplateID>DevComponents.CS.MetroAppForm</TemplateID>
+    <ProjectType>CSharp</ProjectType>
+    <SortOrder>41</SortOrder>
+    <DefaultName>Form.cs</DefaultName>
+	<RequiredFrameworkVersion>2.0</RequiredFrameworkVersion>
+    <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
+  </TemplateData>
+  <TemplateContent>
+		<References>
+			<Reference>
+				<Assembly>System</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Data</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Drawing</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Windows.Forms</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Xml</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>DevComponents.DotNetBar2</Assembly>
+			</Reference>
+		</References>
+
+    <ProjectItem ReplaceParameters="true" SubType="Form">Form.cs</ProjectItem>
+    <ProjectItem ReplaceParameters="true">Form.Designer.cs</ProjectItem>
+  </TemplateContent>
+</VSTemplate>
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual C#/MetroForm/MetroForm.zip b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual C#/MetroForm/MetroForm.zip
new file mode 100644
index 00000000..b98a2499
Binary files /dev/null and b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual C#/MetroForm/MetroForm.zip differ
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual C#/MetroForm/form.cs b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual C#/MetroForm/form.cs
new file mode 100644
index 00000000..11692b62
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual C#/MetroForm/form.cs	
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+using DevComponents.DotNetBar;
+
+namespace $rootnamespace$
+{
+	public partial class $safeitemrootname$: DevComponents.DotNetBar.Metro.MetroForm
+	{
+		public $safeitemrootname$()
+		{
+			InitializeComponent();
+		}
+	}
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual C#/MetroForm/form.designer.cs b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual C#/MetroForm/form.designer.cs
new file mode 100644
index 00000000..3a1a31d0
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual C#/MetroForm/form.designer.cs	
@@ -0,0 +1,42 @@
+namespace $rootnamespace$
+{
+	partial class $safeitemrootname$
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if (disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form 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.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(625, 396);
+            this.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.Name = "$safeitemrootname$";
+			this.Text = "MetroForm";
+		}
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual C#/MetroForm/metroform.vstemplate b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual C#/MetroForm/metroform.vstemplate
new file mode 100644
index 00000000..3961f06f
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual C#/MetroForm/metroform.vstemplate	
@@ -0,0 +1,38 @@
+<VSTemplate Version="3.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name>Metro Form</Name>
+    <Description>DotNetBar Metro Form</Description>
+    <Icon Package="{FAE04EC1-301F-11d3-BF4B-00C04F79EFBC}" ID="4535" />
+	<TemplateID>DevComponents.CS.MetroForm</TemplateID>
+    <ProjectType>CSharp</ProjectType>
+    <SortOrder>41</SortOrder>
+    <DefaultName>Form.cs</DefaultName>
+	<RequiredFrameworkVersion>2.0</RequiredFrameworkVersion>
+    <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
+  </TemplateData>
+  <TemplateContent>
+		<References>
+			<Reference>
+				<Assembly>System</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Data</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Drawing</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Windows.Forms</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Xml</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>DevComponents.DotNetBar2</Assembly>
+			</Reference>
+		</References>
+
+    <ProjectItem ReplaceParameters="true" SubType="Form">Form.cs</ProjectItem>
+    <ProjectItem ReplaceParameters="true">Form.Designer.cs</ProjectItem>
+  </TemplateContent>
+</VSTemplate>
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual C#/Office2007Form/DotNetBarOffice2007Form.zip b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual C#/Office2007Form/DotNetBarOffice2007Form.zip
new file mode 100644
index 00000000..e5924f7c
Binary files /dev/null and b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual C#/Office2007Form/DotNetBarOffice2007Form.zip differ
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual C#/Office2007Form/form.cs b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual C#/Office2007Form/form.cs
new file mode 100644
index 00000000..8e61cb27
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual C#/Office2007Form/form.cs	
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+using DevComponents.DotNetBar;
+
+namespace $rootnamespace$
+{
+	public partial class $safeitemrootname$: DevComponents.DotNetBar.OfficeForm
+	{
+		public $safeitemrootname$()
+		{
+			InitializeComponent();
+		}
+	}
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual C#/Office2007Form/form.designer.cs b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual C#/Office2007Form/form.designer.cs
new file mode 100644
index 00000000..6bc0536d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual C#/Office2007Form/form.designer.cs	
@@ -0,0 +1,37 @@
+namespace $rootnamespace$
+{
+	partial class $safeitemrootname$
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if (disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form 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.Text = "$safeitemrootname$";
+		}
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual C#/Office2007Form/office2007form.vstemplate b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual C#/Office2007Form/office2007form.vstemplate
new file mode 100644
index 00000000..f2bf2593
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual C#/Office2007Form/office2007form.vstemplate	
@@ -0,0 +1,38 @@
+<VSTemplate Version="3.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name>Office Form</Name>
+    <Description>DotNetBar Office Style Form</Description>
+    <Icon Package="{FAE04EC1-301F-11d3-BF4B-00C04F79EFBC}" ID="4535" />
+	<TemplateID>DevComponents.CS.Office2007Form</TemplateID>
+    <ProjectType>CSharp</ProjectType>
+    <SortOrder>41</SortOrder>
+    <DefaultName>Form.cs</DefaultName>
+	<RequiredFrameworkVersion>2.0</RequiredFrameworkVersion>
+    <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
+  </TemplateData>
+  <TemplateContent>
+		<References>
+			<Reference>
+				<Assembly>System</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Data</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Drawing</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Windows.Forms</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Xml</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>DevComponents.DotNetBar2</Assembly>
+			</Reference>
+		</References>
+
+    <ProjectItem ReplaceParameters="true" SubType="Form">Form.cs</ProjectItem>
+    <ProjectItem ReplaceParameters="true">Form.Designer.cs</ProjectItem>
+  </TemplateContent>
+</VSTemplate>
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual C#/RibbonForm/DotNetBarRibbonForm.zip b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual C#/RibbonForm/DotNetBarRibbonForm.zip
new file mode 100644
index 00000000..33693820
Binary files /dev/null and b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual C#/RibbonForm/DotNetBarRibbonForm.zip differ
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual C#/RibbonForm/form.cs b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual C#/RibbonForm/form.cs
new file mode 100644
index 00000000..bfd40b47
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual C#/RibbonForm/form.cs	
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+using DevComponents.DotNetBar;
+
+namespace $rootnamespace$
+{
+	public partial class $safeitemrootname$: DevComponents.DotNetBar.RibbonForm
+	{
+		public $safeitemrootname$()
+		{
+			InitializeComponent();
+		}
+	}
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual C#/RibbonForm/form.designer.cs b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual C#/RibbonForm/form.designer.cs
new file mode 100644
index 00000000..6bc0536d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual C#/RibbonForm/form.designer.cs	
@@ -0,0 +1,37 @@
+namespace $rootnamespace$
+{
+	partial class $safeitemrootname$
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if (disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form 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.Text = "$safeitemrootname$";
+		}
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual C#/RibbonForm/ribbonform.vstemplate b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual C#/RibbonForm/ribbonform.vstemplate
new file mode 100644
index 00000000..a0273570
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual C#/RibbonForm/ribbonform.vstemplate	
@@ -0,0 +1,38 @@
+<VSTemplate Version="3.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name>Ribbon Form</Name>
+    <Description>DotNetBar Ribbon Form</Description>
+    <Icon Package="{FAE04EC1-301F-11d3-BF4B-00C04F79EFBC}" ID="4535" />
+	<TemplateID>DevComponents.CS.RibbonForm</TemplateID>
+    <ProjectType>CSharp</ProjectType>
+    <SortOrder>41</SortOrder>
+	<RequiredFrameworkVersion>2.0</RequiredFrameworkVersion>
+    <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
+    <DefaultName>RibbonForm.cs</DefaultName>
+  </TemplateData>
+  <TemplateContent>
+		<References>
+			<Reference>
+				<Assembly>System</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Data</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Drawing</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Windows.Forms</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Xml</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>DevComponents.DotNetBar2</Assembly>
+			</Reference>
+		</References>
+
+    <ProjectItem ReplaceParameters="true" SubType="Form">Form.cs</ProjectItem>
+    <ProjectItem ReplaceParameters="true">Form.Designer.cs</ProjectItem>
+  </TemplateContent>
+</VSTemplate>
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual C#/TabbedForm/Form.Designer.cs b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual C#/TabbedForm/Form.Designer.cs
new file mode 100644
index 00000000..6a057d83
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual C#/TabbedForm/Form.Designer.cs	
@@ -0,0 +1,175 @@
+namespace $rootnamespace$
+{
+    partial class $safeitemrootname$
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form 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.tabFormControl1 = new DevComponents.DotNetBar.Controls.TabFormControl();
+            this.tabFormPanel1 = new DevComponents.DotNetBar.Controls.TabFormPanel();
+            this.tabFormPanel2 = new DevComponents.DotNetBar.Controls.TabFormPanel();
+            this.tabFormItem1 = new DevComponents.DotNetBar.Controls.TabFormItem();
+            this.tabFormItem2 = new DevComponents.DotNetBar.Controls.TabFormItem();
+            this.label1 = new System.Windows.Forms.Label();
+            this.label2 = new System.Windows.Forms.Label();
+            this.tabFormControl1.SuspendLayout();
+            this.tabFormPanel1.SuspendLayout();
+            this.tabFormPanel2.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // tabFormControl1
+            // 
+            this.tabFormControl1.BackColor = System.Drawing.Color.White;
+            // 
+            // 
+            // 
+            this.tabFormControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.tabFormControl1.Controls.Add(this.tabFormPanel1);
+            this.tabFormControl1.Controls.Add(this.tabFormPanel2);
+            this.tabFormControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tabFormControl1.ForeColor = System.Drawing.Color.Black;
+            this.tabFormControl1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+            this.tabFormItem1,
+            this.tabFormItem2});
+            this.tabFormControl1.Location = new System.Drawing.Point(1, 1);
+            this.tabFormControl1.Name = "tabFormControl1";
+            this.tabFormControl1.Size = new System.Drawing.Size(614, 412);
+            this.tabFormControl1.TabIndex = 0;
+            this.tabFormControl1.TabStripFont = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.tabFormControl1.Text = "tabFormControl1";
+            // 
+            // tabFormPanel1
+            // 
+            this.tabFormPanel1.Controls.Add(this.label1);
+            this.tabFormPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tabFormPanel1.Location = new System.Drawing.Point(0, 28);
+            this.tabFormPanel1.Name = "tabFormPanel1";
+            this.tabFormPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3);
+            this.tabFormPanel1.Size = new System.Drawing.Size(614, 384);
+            // 
+            // 
+            // 
+            this.tabFormPanel1.Style.Class = "TabFormPanel";
+            this.tabFormPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.tabFormPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.tabFormPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.tabFormPanel1.TabIndex = 1;
+            // 
+            // tabFormPanel2
+            // 
+            this.tabFormPanel2.Controls.Add(this.label2);
+            this.tabFormPanel2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tabFormPanel2.Location = new System.Drawing.Point(0, 28);
+            this.tabFormPanel2.Name = "tabFormPanel2";
+            this.tabFormPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3);
+            this.tabFormPanel2.Size = new System.Drawing.Size(614, 384);
+            // 
+            // 
+            // 
+            this.tabFormPanel2.Style.Class = "TabFormPanel";
+            this.tabFormPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.tabFormPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.tabFormPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.tabFormPanel2.TabIndex = 2;
+            this.tabFormPanel2.Visible = false;
+            // 
+            // tabFormItem1
+            // 
+            this.tabFormItem1.Checked = true;
+            this.tabFormItem1.Name = "tabFormItem1";
+            this.tabFormItem1.Panel = this.tabFormPanel1;
+            this.tabFormItem1.Text = "Document 1";
+            // 
+            // tabFormItem2
+            // 
+            this.tabFormItem2.Name = "tabFormItem2";
+            this.tabFormItem2.Panel = this.tabFormPanel2;
+            this.tabFormItem2.Text = "Document 2";
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.BackColor = System.Drawing.Color.Transparent;
+            this.label1.Location = new System.Drawing.Point(241, 175);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(101, 13);
+            this.label1.TabIndex = 0;
+            this.label1.Text = "Your content here...";
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.BackColor = System.Drawing.Color.Transparent;
+            this.label2.Location = new System.Drawing.Point(257, 186);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(101, 13);
+            this.label2.TabIndex = 1;
+            this.label2.Text = "Your content here...";
+            // 
+            // $safeitemrootname$
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(616, 414);
+            this.Controls.Add(this.tabFormControl1);
+            this.ForeColor = System.Drawing.Color.Black;
+            this.Name = "$safeitemrootname$";
+            this.Text = "DotNetBar Tabbed App Form";
+            this.tabFormControl1.ResumeLayout(false);
+            this.tabFormControl1.PerformLayout();
+            this.tabFormPanel1.ResumeLayout(false);
+            this.tabFormPanel1.PerformLayout();
+            this.tabFormPanel2.ResumeLayout(false);
+            this.tabFormPanel2.PerformLayout();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private DevComponents.DotNetBar.Controls.TabFormControl tabFormControl1;
+        private DevComponents.DotNetBar.Controls.TabFormPanel tabFormPanel1;
+        private DevComponents.DotNetBar.Controls.TabFormPanel tabFormPanel2;
+        private DevComponents.DotNetBar.Controls.TabFormItem tabFormItem1;
+        private DevComponents.DotNetBar.Controls.TabFormItem tabFormItem2;
+		private System.Windows.Forms.Label label1;
+		private System.Windows.Forms.Label label2;
+
+    }
+}
+
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual C#/TabbedForm/Form.cs b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual C#/TabbedForm/Form.cs
new file mode 100644
index 00000000..47530f09
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual C#/TabbedForm/Form.cs	
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+
+namespace $rootnamespace$
+{
+    public partial class $safeitemrootname$ : DevComponents.DotNetBar.Controls.TabParentForm
+    {
+        public $safeitemrootname$()
+        {
+            InitializeComponent();
+        }
+    }
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual C#/TabbedForm/Form.resx b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual C#/TabbedForm/Form.resx
new file mode 100644
index 00000000..19dc0dd8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual C#/TabbedForm/Form.resx	
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual C#/TabbedForm/TabbedForm.zip b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual C#/TabbedForm/TabbedForm.zip
new file mode 100644
index 00000000..7cd94f8b
Binary files /dev/null and b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual C#/TabbedForm/TabbedForm.zip differ
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual C#/TabbedForm/tabbedform.vstemplate b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual C#/TabbedForm/tabbedform.vstemplate
new file mode 100644
index 00000000..c22546e3
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2013/Visual C#/TabbedForm/tabbedform.vstemplate	
@@ -0,0 +1,38 @@
+<VSTemplate Version="3.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name>Tabbed Form</Name>
+    <Description>DotNetBar Tabbed Form</Description>
+    <Icon Package="{FAE04EC1-301F-11d3-BF4B-00C04F79EFBC}" ID="4535" />
+	<TemplateID>DevComponents.CS.TabbedForm</TemplateID>
+    <ProjectType>CSharp</ProjectType>
+    <SortOrder>41</SortOrder>
+    <DefaultName>Form.cs</DefaultName>
+	<RequiredFrameworkVersion>2.0</RequiredFrameworkVersion>
+    <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
+  </TemplateData>
+  <TemplateContent>
+		<References>
+			<Reference>
+				<Assembly>System</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Data</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Drawing</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Windows.Forms</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Xml</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>DevComponents.DotNetBar2</Assembly>
+			</Reference>
+		</References>
+
+    <ProjectItem ReplaceParameters="true" SubType="Form">Form.cs</ProjectItem>
+    <ProjectItem ReplaceParameters="true">Form.Designer.cs</ProjectItem>
+  </TemplateContent>
+</VSTemplate>
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual Basic/MetroAppForm/Form.Designer.vb b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual Basic/MetroAppForm/Form.Designer.vb
new file mode 100644
index 00000000..913e8b3c
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual Basic/MetroAppForm/Form.Designer.vb	
@@ -0,0 +1,217 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class $safeitemrootname$
+    Inherits DevComponents.DotNetBar.Metro.MetroAppForm
+
+    'Form overrides dispose to clean up the component list.
+    <System.Diagnostics.DebuggerNonUserCode()> _
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+        Try
+            If disposing AndAlso components IsNot Nothing Then
+                components.Dispose()
+            End If
+        Finally
+            MyBase.Dispose(disposing)
+        End Try
+    End Sub
+
+    'Required by the Windows Form Designer
+    Private components As System.ComponentModel.IContainer
+
+    'NOTE: The following procedure is required by the Windows Form Designer
+    'It can be modified using the Windows Form Designer.  
+    'Do not modify it using the code editor.
+    <System.Diagnostics.DebuggerStepThrough()> _
+    Private Sub InitializeComponent()
+        Me.components = New System.ComponentModel.Container
+        Me.MetroShell1 = New DevComponents.DotNetBar.Metro.MetroShell
+        Me.MetroTabItem1 = New DevComponents.DotNetBar.Metro.MetroTabItem
+        Me.MetroTabPanel1 = New DevComponents.DotNetBar.Metro.MetroTabPanel
+        Me.MetroTabItem2 = New DevComponents.DotNetBar.Metro.MetroTabItem
+        Me.MetroTabPanel2 = New DevComponents.DotNetBar.Metro.MetroTabPanel
+        Me.StyleManager1 = New DevComponents.DotNetBar.StyleManager(Me.components)
+        Me.QatCustomizeItem1 = New DevComponents.DotNetBar.QatCustomizeItem
+        Me.MetroAppButton1 = New DevComponents.DotNetBar.Metro.MetroAppButton
+        Me.ButtonItem1 = New DevComponents.DotNetBar.ButtonItem
+        Me.MetroStatusBar1 = New DevComponents.DotNetBar.Metro.MetroStatusBar
+        Me.LabelItem1 = New DevComponents.DotNetBar.LabelItem
+        Me.MetroShell1.SuspendLayout()
+        Me.SuspendLayout()
+        '
+        'MetroShell1
+        '
+        Me.MetroShell1.BackColor = System.Drawing.Color.White
+        '
+        '
+        '
+        Me.MetroShell1.BackgroundStyle.Class = ""
+        Me.MetroShell1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        Me.MetroShell1.CaptionVisible = True
+        Me.MetroShell1.Controls.Add(Me.MetroTabPanel1)
+        Me.MetroShell1.Controls.Add(Me.MetroTabPanel2)
+        Me.MetroShell1.Dock = System.Windows.Forms.DockStyle.Top
+        Me.MetroShell1.ForeColor = System.Drawing.Color.Black
+        Me.MetroShell1.HelpButtonText = Nothing
+        Me.MetroShell1.Items.AddRange(New DevComponents.DotNetBar.BaseItem() {Me.MetroAppButton1, Me.MetroTabItem1, Me.MetroTabItem2})
+        Me.MetroShell1.KeyTipsFont = New System.Drawing.Font("Tahoma", 7.0!)
+        Me.MetroShell1.Location = New System.Drawing.Point(0, 1)
+        Me.MetroShell1.Name = "MetroShell1"
+        Me.MetroShell1.QuickToolbarItems.AddRange(New DevComponents.DotNetBar.BaseItem() {Me.ButtonItem1, Me.QatCustomizeItem1})
+        Me.MetroShell1.Size = New System.Drawing.Size(652, 234)
+        Me.MetroShell1.SystemText.MaximizeRibbonText = "&Maximize the Ribbon"
+        Me.MetroShell1.SystemText.MinimizeRibbonText = "Mi&nimize the Ribbon"
+        Me.MetroShell1.SystemText.QatAddItemText = "&Add to Quick Access Toolbar"
+        Me.MetroShell1.SystemText.QatCustomizeMenuLabel = "<b>Customize Quick Access Toolbar</b>"
+        Me.MetroShell1.SystemText.QatCustomizeText = "&Customize Quick Access Toolbar..."
+        Me.MetroShell1.SystemText.QatDialogAddButton = "&Add >>"
+        Me.MetroShell1.SystemText.QatDialogCancelButton = "Cancel"
+        Me.MetroShell1.SystemText.QatDialogCaption = "Customize Quick Access Toolbar"
+        Me.MetroShell1.SystemText.QatDialogCategoriesLabel = "&Choose commands from:"
+        Me.MetroShell1.SystemText.QatDialogOkButton = "OK"
+        Me.MetroShell1.SystemText.QatDialogPlacementCheckbox = "&Place Quick Access Toolbar below the Ribbon"
+        Me.MetroShell1.SystemText.QatDialogRemoveButton = "&Remove"
+        Me.MetroShell1.SystemText.QatPlaceAboveRibbonText = "&Place Quick Access Toolbar above the Ribbon"
+        Me.MetroShell1.SystemText.QatPlaceBelowRibbonText = "&Place Quick Access Toolbar below the Ribbon"
+        Me.MetroShell1.SystemText.QatRemoveItemText = "&Remove from Quick Access Toolbar"
+        Me.MetroShell1.TabIndex = 0
+        Me.MetroShell1.TabStripFont = New System.Drawing.Font("Segoe UI", 10.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.MetroShell1.Text = "MetroShell1"
+        '
+        'MetroTabItem1
+        '
+        Me.MetroTabItem1.Checked = True
+        Me.MetroTabItem1.Name = "MetroTabItem1"
+        Me.MetroTabItem1.Panel = Me.MetroTabPanel1
+        Me.MetroTabItem1.Text = "&HOME"
+        '
+        'MetroTabPanel1
+        '
+        Me.MetroTabPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled
+        Me.MetroTabPanel1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.MetroTabPanel1.Location = New System.Drawing.Point(0, 51)
+        Me.MetroTabPanel1.Name = "MetroTabPanel1"
+        Me.MetroTabPanel1.Padding = New System.Windows.Forms.Padding(3, 0, 3, 3)
+        Me.MetroTabPanel1.Size = New System.Drawing.Size(652, 183)
+        '
+        '
+        '
+        Me.MetroTabPanel1.Style.Class = ""
+        Me.MetroTabPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        '
+        '
+        '
+        Me.MetroTabPanel1.StyleMouseDown.Class = ""
+        Me.MetroTabPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        '
+        '
+        '
+        Me.MetroTabPanel1.StyleMouseOver.Class = ""
+        Me.MetroTabPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        Me.MetroTabPanel1.TabIndex = 1
+        '
+        'MetroTabItem2
+        '
+        Me.MetroTabItem2.Name = "MetroTabItem2"
+        Me.MetroTabItem2.Panel = Me.MetroTabPanel2
+        Me.MetroTabItem2.Text = "&VIEW"
+        '
+        'MetroTabPanel2
+        '
+        Me.MetroTabPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled
+        Me.MetroTabPanel2.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.MetroTabPanel2.Location = New System.Drawing.Point(0, 0)
+        Me.MetroTabPanel2.Name = "MetroTabPanel2"
+        Me.MetroTabPanel2.Padding = New System.Windows.Forms.Padding(3, 0, 3, 3)
+        Me.MetroTabPanel2.Size = New System.Drawing.Size(200, 100)
+        '
+        '
+        '
+        Me.MetroTabPanel2.Style.Class = ""
+        Me.MetroTabPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        '
+        '
+        '
+        Me.MetroTabPanel2.StyleMouseDown.Class = ""
+        Me.MetroTabPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        '
+        '
+        '
+        Me.MetroTabPanel2.StyleMouseOver.Class = ""
+        Me.MetroTabPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        Me.MetroTabPanel2.TabIndex = 2
+        '
+        'StyleManager1
+        '
+        Me.StyleManager1.ManagerStyle = DevComponents.DotNetBar.eStyle.Metro
+        Me.StyleManager1.MetroColorParameters = New DevComponents.DotNetBar.Metro.ColorTables.MetroColorGeneratorParameters(System.Drawing.Color.White, System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(163, Byte), Integer), CType(CType(26, Byte), Integer)))
+        '
+        'QatCustomizeItem1
+        '
+        Me.QatCustomizeItem1.BeginGroup = True
+        Me.QatCustomizeItem1.Name = "QatCustomizeItem1"
+        '
+        'MetroAppButton1
+        '
+        Me.MetroAppButton1.AutoExpandOnClick = True
+        Me.MetroAppButton1.CanCustomize = False
+        Me.MetroAppButton1.ImageFixedSize = New System.Drawing.Size(16, 16)
+        Me.MetroAppButton1.ImagePaddingHorizontal = 0
+        Me.MetroAppButton1.ImagePaddingVertical = 0
+        Me.MetroAppButton1.Name = "MetroAppButton1"
+        Me.MetroAppButton1.ShowSubItems = False
+        Me.MetroAppButton1.Text = "&File"
+        '
+        'ButtonItem1
+        '
+        Me.ButtonItem1.Name = "ButtonItem1"
+        Me.ButtonItem1.Text = "ButtonItem1"
+        '
+        'MetroStatusBar1
+        '
+        '
+        '
+        '
+        Me.MetroStatusBar1.BackgroundStyle.Class = ""
+        Me.MetroStatusBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        Me.MetroStatusBar1.ContainerControlProcessDialogKey = True
+        Me.MetroStatusBar1.Dock = System.Windows.Forms.DockStyle.Bottom
+        Me.MetroStatusBar1.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.MetroStatusBar1.Items.AddRange(New DevComponents.DotNetBar.BaseItem() {Me.LabelItem1})
+        Me.MetroStatusBar1.Location = New System.Drawing.Point(0, 413)
+        Me.MetroStatusBar1.Name = "MetroStatusBar1"
+        Me.MetroStatusBar1.Size = New System.Drawing.Size(652, 22)
+        Me.MetroStatusBar1.TabIndex = 1
+        Me.MetroStatusBar1.Text = "MetroStatusBar1"
+        '
+        'LabelItem1
+        '
+        Me.LabelItem1.Name = "LabelItem1"
+        Me.LabelItem1.Text = "READY"
+        '
+        '$safeitemrootname$
+        '
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.ClientSize = New System.Drawing.Size(653, 436)
+        Me.Controls.Add(Me.MetroStatusBar1)
+        Me.Controls.Add(Me.MetroShell1)
+        Me.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Name = "$safeitemrootname$"
+        Me.Text = "DotNetBar Metro App Form"
+        Me.MetroShell1.ResumeLayout(False)
+        Me.MetroShell1.PerformLayout()
+        Me.ResumeLayout(False)
+
+    End Sub
+    Friend WithEvents MetroShell1 As DevComponents.DotNetBar.Metro.MetroShell
+    Friend WithEvents MetroTabPanel1 As DevComponents.DotNetBar.Metro.MetroTabPanel
+    Friend WithEvents MetroTabPanel2 As DevComponents.DotNetBar.Metro.MetroTabPanel
+    Friend WithEvents MetroAppButton1 As DevComponents.DotNetBar.Metro.MetroAppButton
+    Friend WithEvents MetroTabItem1 As DevComponents.DotNetBar.Metro.MetroTabItem
+    Friend WithEvents MetroTabItem2 As DevComponents.DotNetBar.Metro.MetroTabItem
+    Friend WithEvents ButtonItem1 As DevComponents.DotNetBar.ButtonItem
+    Friend WithEvents QatCustomizeItem1 As DevComponents.DotNetBar.QatCustomizeItem
+    Friend WithEvents StyleManager1 As DevComponents.DotNetBar.StyleManager
+    Friend WithEvents MetroStatusBar1 As DevComponents.DotNetBar.Metro.MetroStatusBar
+    Friend WithEvents LabelItem1 As DevComponents.DotNetBar.LabelItem
+
+End Class
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual Basic/MetroAppForm/Form.resx b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual Basic/MetroAppForm/Form.resx
new file mode 100644
index 00000000..998f01fd
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual Basic/MetroAppForm/Form.resx	
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="StyleManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual Basic/MetroAppForm/Form.vb b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual Basic/MetroAppForm/Form.vb
new file mode 100644
index 00000000..64eb4330
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual Basic/MetroAppForm/Form.vb	
@@ -0,0 +1,3 @@
+Public Class $safeitemrootname$
+
+End Class
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual Basic/MetroAppForm/MetroAppForm.zip b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual Basic/MetroAppForm/MetroAppForm.zip
new file mode 100644
index 00000000..e464b16b
Binary files /dev/null and b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual Basic/MetroAppForm/MetroAppForm.zip differ
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual Basic/MetroAppForm/metroappform.vstemplate b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual Basic/MetroAppForm/metroappform.vstemplate
new file mode 100644
index 00000000..9cbac33b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual Basic/MetroAppForm/metroappform.vstemplate	
@@ -0,0 +1,36 @@
+<VSTemplate Version="3.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name>Metro UI App Form</Name>
+    <Description>DotNetBar Metro Application Form</Description>
+    <Icon Package="{164B10B9-B200-11D0-8C61-00A0C91E29D5}" ID="4527" />
+	<TemplateID>DevComponents.VB.MetroAppForm</TemplateID>
+    <ProjectType>VisualBasic</ProjectType>
+    <SortOrder>11</SortOrder>
+    <DefaultName>Form.vb</DefaultName>
+	<RequiredFrameworkVersion>2.0</RequiredFrameworkVersion>
+    <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
+  </TemplateData>
+  <TemplateContent>
+        <References>
+            <Reference>
+                <Assembly>System</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+            <Reference>
+                <Assembly>System.Drawing</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+            <Reference>
+                <Assembly>System.Windows.Forms</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+			<Reference>
+                <Assembly>DevComponents.DotNetBar2</Assembly>
+                <URL>http://www.devcomponents.com</URL>
+            </Reference>
+        </References>
+
+    <ProjectItem ReplaceParameters="true" SubType="Form">Form.vb</ProjectItem>
+    <ProjectItem ReplaceParameters="true">Form.Designer.vb</ProjectItem>
+  </TemplateContent>
+</VSTemplate>
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual Basic/MetroForm/Form.Designer.vb b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual Basic/MetroForm/Form.Designer.vb
new file mode 100644
index 00000000..7d926fa4
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual Basic/MetroForm/Form.Designer.vb	
@@ -0,0 +1,33 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class $safeitemrootname$
+    Inherits DevComponents.DotNetBar.Metro.MetroForm
+
+    'Form overrides dispose to clean up the component list.
+    <System.Diagnostics.DebuggerNonUserCode()> _
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+        Try
+            If disposing AndAlso components IsNot Nothing Then
+                components.Dispose()
+            End If
+        Finally
+            MyBase.Dispose(disposing)
+        End Try
+    End Sub
+
+    'Required by the Windows Form Designer
+    Private components As System.ComponentModel.IContainer
+
+    'NOTE: The following procedure is required by the Windows Form Designer
+    'It can be modified using the Windows Form Designer.  
+    'Do not modify it using the code editor.
+    <System.Diagnostics.DebuggerStepThrough()> _
+    Private Sub InitializeComponent()
+        components = New System.ComponentModel.Container
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.ClientSize = New System.Drawing.Size(653, 436)
+		Me.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+		Me.Name = "$safeitemrootname$"
+        Me.Text = "MetroForm"
+    End Sub
+End Class
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual Basic/MetroForm/Form.vb b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual Basic/MetroForm/Form.vb
new file mode 100644
index 00000000..9b12d76d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual Basic/MetroForm/Form.vb	
@@ -0,0 +1,3 @@
+Public Class $safeitemrootname$
+
+End Class
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual Basic/MetroForm/MetroForm.zip b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual Basic/MetroForm/MetroForm.zip
new file mode 100644
index 00000000..1742cb89
Binary files /dev/null and b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual Basic/MetroForm/MetroForm.zip differ
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual Basic/MetroForm/metroform.vstemplate b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual Basic/MetroForm/metroform.vstemplate
new file mode 100644
index 00000000..62cc1786
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual Basic/MetroForm/metroform.vstemplate	
@@ -0,0 +1,36 @@
+<VSTemplate Version="3.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name>Metro Form</Name>
+    <Description>DotNetBar Metro Form</Description>
+    <Icon Package="{164B10B9-B200-11D0-8C61-00A0C91E29D5}" ID="4527" />
+	<TemplateID>DevComponents.VB.MetroForm</TemplateID>
+    <ProjectType>VisualBasic</ProjectType>
+    <SortOrder>11</SortOrder>
+    <DefaultName>Form.vb</DefaultName>
+	<RequiredFrameworkVersion>2.0</RequiredFrameworkVersion>
+    <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
+  </TemplateData>
+  <TemplateContent>
+        <References>
+            <Reference>
+                <Assembly>System</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+            <Reference>
+                <Assembly>System.Drawing</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+            <Reference>
+                <Assembly>System.Windows.Forms</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+			<Reference>
+                <Assembly>DevComponents.DotNetBar2</Assembly>
+                <URL>http://www.devcomponents.com</URL>
+            </Reference>
+        </References>
+
+    <ProjectItem ReplaceParameters="true" SubType="Form">Form.vb</ProjectItem>
+    <ProjectItem ReplaceParameters="true">Form.Designer.vb</ProjectItem>
+  </TemplateContent>
+</VSTemplate>
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual Basic/Office2007Form/DotNetBarOffice2007Form.zip b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual Basic/Office2007Form/DotNetBarOffice2007Form.zip
new file mode 100644
index 00000000..bbbe8da0
Binary files /dev/null and b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual Basic/Office2007Form/DotNetBarOffice2007Form.zip differ
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual Basic/Office2007Form/Form.Designer.vb b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual Basic/Office2007Form/Form.Designer.vb
new file mode 100644
index 00000000..2f6f306f
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual Basic/Office2007Form/Form.Designer.vb	
@@ -0,0 +1,29 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class $safeitemrootname$
+    Inherits DevComponents.DotNetBar.OfficeForm
+
+    'Form overrides dispose to clean up the component list.
+    <System.Diagnostics.DebuggerNonUserCode()> _
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+        Try
+            If disposing AndAlso components IsNot Nothing Then
+                components.Dispose()
+            End If
+        Finally
+            MyBase.Dispose(disposing)
+        End Try
+    End Sub
+
+    'Required by the Windows Form Designer
+    Private components As System.ComponentModel.IContainer
+
+    'NOTE: The following procedure is required by the Windows Form Designer
+    'It can be modified using the Windows Form Designer.  
+    'Do not modify it using the code editor.
+    <System.Diagnostics.DebuggerStepThrough()> _
+    Private Sub InitializeComponent()
+        components = New System.ComponentModel.Container
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.Text = "$safeitemrootname$"
+    End Sub
+End Class
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual Basic/Office2007Form/Form.vb b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual Basic/Office2007Form/Form.vb
new file mode 100644
index 00000000..9b12d76d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual Basic/Office2007Form/Form.vb	
@@ -0,0 +1,3 @@
+Public Class $safeitemrootname$
+
+End Class
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual Basic/Office2007Form/office2007form.vstemplate b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual Basic/Office2007Form/office2007form.vstemplate
new file mode 100644
index 00000000..1bf5f9f1
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual Basic/Office2007Form/office2007form.vstemplate	
@@ -0,0 +1,36 @@
+<VSTemplate Version="3.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name>Office Form</Name>
+    <Description>DotNetBar Office Style Form</Description>
+    <Icon Package="{164B10B9-B200-11D0-8C61-00A0C91E29D5}" ID="4527" />
+	<TemplateID>DevComponents.VB.Office2007Form</TemplateID>
+    <ProjectType>VisualBasic</ProjectType>
+    <SortOrder>11</SortOrder>
+    <DefaultName>Form.vb</DefaultName>
+	<RequiredFrameworkVersion>2.0</RequiredFrameworkVersion>
+    <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
+  </TemplateData>
+  <TemplateContent>
+        <References>
+            <Reference>
+                <Assembly>System</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+            <Reference>
+                <Assembly>System.Drawing</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+            <Reference>
+                <Assembly>System.Windows.Forms</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+			<Reference>
+                <Assembly>DevComponents.DotNetBar2</Assembly>
+                <URL>http://www.devcomponents.com</URL>
+            </Reference>
+        </References>
+
+    <ProjectItem ReplaceParameters="true" SubType="Form">Form.vb</ProjectItem>
+    <ProjectItem ReplaceParameters="true">Form.Designer.vb</ProjectItem>
+  </TemplateContent>
+</VSTemplate>
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual Basic/RibbonForm/DotNetBarRibbonForm.zip b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual Basic/RibbonForm/DotNetBarRibbonForm.zip
new file mode 100644
index 00000000..fbfe10c8
Binary files /dev/null and b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual Basic/RibbonForm/DotNetBarRibbonForm.zip differ
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual Basic/RibbonForm/Form.Designer.vb b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual Basic/RibbonForm/Form.Designer.vb
new file mode 100644
index 00000000..abbb321e
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual Basic/RibbonForm/Form.Designer.vb	
@@ -0,0 +1,28 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class $safeitemrootname$
+    Inherits DevComponents.DotNetBar.RibbonForm
+
+    'Form overrides dispose to clean up the component list.
+    <System.Diagnostics.DebuggerNonUserCode()> _
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+        Try
+            If disposing AndAlso components IsNot Nothing Then
+                components.Dispose()
+            End If
+        Finally
+            MyBase.Dispose(disposing)
+        End Try
+    End Sub
+
+    'Required by the Windows Form Designer
+    Private components As System.ComponentModel.IContainer
+
+    'NOTE: The following procedure is required by the Windows Form Designer
+    'It can be modified using the Windows Form Designer.  
+    'Do not modify it using the code editor.
+    <System.Diagnostics.DebuggerStepThrough()> _
+    Private Sub InitializeComponent()
+        components = New System.ComponentModel.Container
+        Me.Text = "$safeitemrootname$"
+    End Sub
+End Class
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual Basic/RibbonForm/Form.vb b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual Basic/RibbonForm/Form.vb
new file mode 100644
index 00000000..9b12d76d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual Basic/RibbonForm/Form.vb	
@@ -0,0 +1,3 @@
+Public Class $safeitemrootname$
+
+End Class
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual Basic/RibbonForm/ribbonform.vstemplate b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual Basic/RibbonForm/ribbonform.vstemplate
new file mode 100644
index 00000000..13e12ed8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual Basic/RibbonForm/ribbonform.vstemplate	
@@ -0,0 +1,36 @@
+<VSTemplate Version="3.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name>Ribbon Form</Name>
+    <Description>DotNetBar Ribbon Form</Description>
+    <Icon Package="{164B10B9-B200-11D0-8C61-00A0C91E29D5}" ID="4527" />
+	<TemplateID>DevComponents.VB.RibbonForm</TemplateID>
+    <ProjectType>VisualBasic</ProjectType>
+    <SortOrder>11</SortOrder>
+    <DefaultName>Form.vb</DefaultName>
+	<RequiredFrameworkVersion>2.0</RequiredFrameworkVersion>
+    <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
+  </TemplateData>
+  <TemplateContent>
+        <References>
+            <Reference>
+                <Assembly>System</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+            <Reference>
+                <Assembly>System.Drawing</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+            <Reference>
+                <Assembly>System.Windows.Forms</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+			<Reference>
+                <Assembly>DevComponents.DotNetBar2</Assembly>
+                <URL>http://www.devcomponents.com</URL>
+            </Reference>
+        </References>
+
+    <ProjectItem ReplaceParameters="true" SubType="Form">Form.vb</ProjectItem>
+    <ProjectItem ReplaceParameters="true">Form.Designer.vb</ProjectItem>
+  </TemplateContent>
+</VSTemplate>
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual Basic/TabbedForm/Form.Designer.vb b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual Basic/TabbedForm/Form.Designer.vb
new file mode 100644
index 00000000..7fcc4215
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual Basic/TabbedForm/Form.Designer.vb	
@@ -0,0 +1,176 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class $safeitemrootname$
+    Inherits DevComponents.DotNetBar.Controls.TabParentForm
+
+    'Form overrides dispose to clean up the component list.
+    <System.Diagnostics.DebuggerNonUserCode()> _
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+        Try
+            If disposing AndAlso components IsNot Nothing Then
+                components.Dispose()
+            End If
+        Finally
+            MyBase.Dispose(disposing)
+        End Try
+    End Sub
+
+    'Required by the Windows Form Designer
+    Private components As System.ComponentModel.IContainer
+
+    'NOTE: The following procedure is required by the Windows Form Designer
+    'It can be modified using the Windows Form Designer.  
+    'Do not modify it using the code editor.
+    <System.Diagnostics.DebuggerStepThrough()> _
+    Private Sub InitializeComponent()
+        Me.TabFormControl1 = New DevComponents.DotNetBar.Controls.TabFormControl()
+        Me.TabFormPanel1 = New DevComponents.DotNetBar.Controls.TabFormPanel()
+        Me.TabFormPanel2 = New DevComponents.DotNetBar.Controls.TabFormPanel()
+        Me.TabFormItem1 = New DevComponents.DotNetBar.Controls.TabFormItem()
+        Me.TabFormItem2 = New DevComponents.DotNetBar.Controls.TabFormItem()
+        Me.Label1 = New System.Windows.Forms.Label()
+        Me.Label2 = New System.Windows.Forms.Label()
+        Me.TabFormControl1.SuspendLayout
+        Me.TabFormPanel1.SuspendLayout
+        Me.TabFormPanel2.SuspendLayout
+        Me.SuspendLayout
+        '
+        'TabFormControl1
+        '
+        Me.TabFormControl1.BackColor = System.Drawing.Color.White
+        '
+        '
+        '
+        Me.TabFormControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        Me.TabFormControl1.Controls.Add(Me.TabFormPanel1)
+        Me.TabFormControl1.Controls.Add(Me.TabFormPanel2)
+        Me.TabFormControl1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.TabFormControl1.ForeColor = System.Drawing.Color.Black
+        Me.TabFormControl1.Items.AddRange(New DevComponents.DotNetBar.BaseItem() {Me.TabFormItem1, Me.TabFormItem2})
+        Me.TabFormControl1.Location = New System.Drawing.Point(1, 1)
+        Me.TabFormControl1.Name = "TabFormControl1"
+        Me.TabFormControl1.Size = New System.Drawing.Size(444, 311)
+        Me.TabFormControl1.SystemText.MaximizeRibbonText = "&Maximize the Ribbon"
+        Me.TabFormControl1.SystemText.MinimizeRibbonText = "Mi&nimize the Ribbon"
+        Me.TabFormControl1.SystemText.QatAddItemText = "&Add to Quick Access Toolbar"
+        Me.TabFormControl1.SystemText.QatCustomizeMenuLabel = "<b>Customize Quick Access Toolbar</b>"
+        Me.TabFormControl1.SystemText.QatCustomizeText = "&Customize Quick Access Toolbar..."
+        Me.TabFormControl1.SystemText.QatDialogAddButton = "&Add >>"
+        Me.TabFormControl1.SystemText.QatDialogCancelButton = "Cancel"
+        Me.TabFormControl1.SystemText.QatDialogCaption = "Customize Quick Access Toolbar"
+        Me.TabFormControl1.SystemText.QatDialogCategoriesLabel = "&Choose commands from:"
+        Me.TabFormControl1.SystemText.QatDialogOkButton = "OK"
+        Me.TabFormControl1.SystemText.QatDialogPlacementCheckbox = "&Place Quick Access Toolbar below the Ribbon"
+        Me.TabFormControl1.SystemText.QatDialogRemoveButton = "&Remove"
+        Me.TabFormControl1.SystemText.QatPlaceAboveRibbonText = "&Place Quick Access Toolbar above the Ribbon"
+        Me.TabFormControl1.SystemText.QatPlaceBelowRibbonText = "&Place Quick Access Toolbar below the Ribbon"
+        Me.TabFormControl1.SystemText.QatRemoveItemText = "&Remove from Quick Access Toolbar"
+        Me.TabFormControl1.TabIndex = 0
+        Me.TabFormControl1.TabStripFont = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+        Me.TabFormControl1.Text = "TabFormControl1"
+        '
+        'TabFormPanel1
+        '
+        Me.TabFormPanel1.Controls.Add(Me.Label1)
+        Me.TabFormPanel1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.TabFormPanel1.Location = New System.Drawing.Point(0, 28)
+        Me.TabFormPanel1.Name = "TabFormPanel1"
+        Me.TabFormPanel1.Padding = New System.Windows.Forms.Padding(3, 0, 3, 3)
+        Me.TabFormPanel1.Size = New System.Drawing.Size(444, 283)
+        '
+        '
+        '
+        Me.TabFormPanel1.Style.Class = "TabFormPanel"
+        Me.TabFormPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        '
+        '
+        '
+        Me.TabFormPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        '
+        '
+        '
+        Me.TabFormPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        Me.TabFormPanel1.TabIndex = 1
+        '
+        'TabFormPanel2
+        '
+        Me.TabFormPanel2.Controls.Add(Me.Label2)
+        Me.TabFormPanel2.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.TabFormPanel2.Location = New System.Drawing.Point(0, 28)
+        Me.TabFormPanel2.Name = "TabFormPanel2"
+        Me.TabFormPanel2.Padding = New System.Windows.Forms.Padding(3, 0, 3, 3)
+        Me.TabFormPanel2.Size = New System.Drawing.Size(444, 283)
+        '
+        '
+        '
+        Me.TabFormPanel2.Style.Class = "TabFormPanel"
+        Me.TabFormPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        '
+        '
+        '
+        Me.TabFormPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        '
+        '
+        '
+        Me.TabFormPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        Me.TabFormPanel2.TabIndex = 2
+        Me.TabFormPanel2.Visible = false
+        '
+        'TabFormItem1
+        '
+        Me.TabFormItem1.Checked = true
+        Me.TabFormItem1.Name = "TabFormItem1"
+        Me.TabFormItem1.Panel = Me.TabFormPanel1
+        Me.TabFormItem1.Text = "Document 1"
+        '
+        'TabFormItem2
+        '
+        Me.TabFormItem2.Name = "TabFormItem2"
+        Me.TabFormItem2.Panel = Me.TabFormPanel2
+        Me.TabFormItem2.Text = "Document 2"
+        '
+        'Label1
+        '
+        Me.Label1.AutoSize = true
+        Me.Label1.BackColor = System.Drawing.Color.Transparent
+        Me.Label1.Location = New System.Drawing.Point(155, 127)
+        Me.Label1.Name = "Label1"
+        Me.Label1.Size = New System.Drawing.Size(101, 13)
+        Me.Label1.TabIndex = 0
+        Me.Label1.Text = "Your content here..."
+        '
+        'Label2
+        '
+        Me.Label2.AutoSize = true
+        Me.Label2.BackColor = System.Drawing.Color.Transparent
+        Me.Label2.Location = New System.Drawing.Point(172, 135)
+        Me.Label2.Name = "Label2"
+        Me.Label2.Size = New System.Drawing.Size(101, 13)
+        Me.Label2.TabIndex = 1
+        Me.Label2.Text = "Your content here..."
+        '
+        '$safeitemrootname$
+        '
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.ClientSize = New System.Drawing.Size(446, 313)
+        Me.Controls.Add(Me.TabFormControl1)
+        Me.Name = "$safeitemrootname$"
+        Me.Text = "DotNetBar Tabbed Form"
+        Me.TabFormControl1.ResumeLayout(false)
+        Me.TabFormControl1.PerformLayout
+        Me.TabFormPanel1.ResumeLayout(false)
+        Me.TabFormPanel1.PerformLayout
+        Me.TabFormPanel2.ResumeLayout(false)
+        Me.TabFormPanel2.PerformLayout
+        Me.ResumeLayout(false)
+
+    End Sub
+    Friend WithEvents TabFormControl1 As DevComponents.DotNetBar.Controls.TabFormControl
+    Friend WithEvents TabFormPanel1 As DevComponents.DotNetBar.Controls.TabFormPanel
+    Friend WithEvents TabFormPanel2 As DevComponents.DotNetBar.Controls.TabFormPanel
+    Friend WithEvents TabFormItem1 As DevComponents.DotNetBar.Controls.TabFormItem
+    Friend WithEvents TabFormItem2 As DevComponents.DotNetBar.Controls.TabFormItem
+    Friend WithEvents Label1 As System.Windows.Forms.Label
+    Friend WithEvents Label2 As System.Windows.Forms.Label
+
+End Class
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual Basic/TabbedForm/Form.resx b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual Basic/TabbedForm/Form.resx
new file mode 100644
index 00000000..19dc0dd8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual Basic/TabbedForm/Form.resx	
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual Basic/TabbedForm/Form.vb b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual Basic/TabbedForm/Form.vb
new file mode 100644
index 00000000..64eb4330
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual Basic/TabbedForm/Form.vb	
@@ -0,0 +1,3 @@
+Public Class $safeitemrootname$
+
+End Class
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual Basic/TabbedForm/TabbedForm.zip b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual Basic/TabbedForm/TabbedForm.zip
new file mode 100644
index 00000000..66f60672
Binary files /dev/null and b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual Basic/TabbedForm/TabbedForm.zip differ
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual Basic/TabbedForm/tabbedform.vstemplate b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual Basic/TabbedForm/tabbedform.vstemplate
new file mode 100644
index 00000000..865bb1b6
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual Basic/TabbedForm/tabbedform.vstemplate	
@@ -0,0 +1,36 @@
+<VSTemplate Version="3.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name>Tabbed Form</Name>
+    <Description>DotNetBar Tabbed Form</Description>
+    <Icon Package="{164B10B9-B200-11D0-8C61-00A0C91E29D5}" ID="4527" />
+	<TemplateID>DevComponents.VB.TabbedForm</TemplateID>
+    <ProjectType>VisualBasic</ProjectType>
+    <SortOrder>12</SortOrder>
+    <DefaultName>Form.vb</DefaultName>
+	<RequiredFrameworkVersion>2.0</RequiredFrameworkVersion>
+    <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
+  </TemplateData>
+  <TemplateContent>
+        <References>
+            <Reference>
+                <Assembly>System</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+            <Reference>
+                <Assembly>System.Drawing</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+            <Reference>
+                <Assembly>System.Windows.Forms</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+			<Reference>
+                <Assembly>DevComponents.DotNetBar2</Assembly>
+                <URL>http://www.devcomponents.com</URL>
+            </Reference>
+        </References>
+
+    <ProjectItem ReplaceParameters="true" SubType="Form">Form.vb</ProjectItem>
+    <ProjectItem ReplaceParameters="true">Form.Designer.vb</ProjectItem>
+  </TemplateContent>
+</VSTemplate>
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual C#/MetroAppForm/Form.Designer.cs b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual C#/MetroAppForm/Form.Designer.cs
new file mode 100644
index 00000000..8d1bb1bc
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual C#/MetroAppForm/Form.Designer.cs	
@@ -0,0 +1,234 @@
+namespace $rootnamespace$
+{
+    partial class $safeitemrootname$
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form 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.metroShell1 = new DevComponents.DotNetBar.Metro.MetroShell();
+            this.metroTabItem1 = new DevComponents.DotNetBar.Metro.MetroTabItem();
+            this.metroTabPanel1 = new DevComponents.DotNetBar.Metro.MetroTabPanel();
+            this.metroTabItem2 = new DevComponents.DotNetBar.Metro.MetroTabItem();
+            this.metroTabPanel2 = new DevComponents.DotNetBar.Metro.MetroTabPanel();
+            this.styleManager1 = new DevComponents.DotNetBar.StyleManager(this.components);
+            this.qatCustomizeItem1 = new DevComponents.DotNetBar.QatCustomizeItem();
+            this.metroAppButton1 = new DevComponents.DotNetBar.Metro.MetroAppButton();
+            this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem();
+            this.metroStatusBar1 = new DevComponents.DotNetBar.Metro.MetroStatusBar();
+            this.labelItem1 = new DevComponents.DotNetBar.LabelItem();
+            this.metroShell1.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // metroShell1
+            // 
+            this.metroShell1.BackColor = System.Drawing.Color.White;
+            // 
+            // 
+            // 
+            this.metroShell1.BackgroundStyle.Class = "";
+            this.metroShell1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.metroShell1.CaptionVisible = true;
+            this.metroShell1.Controls.Add(this.metroTabPanel1);
+            this.metroShell1.Controls.Add(this.metroTabPanel2);
+            this.metroShell1.Dock = System.Windows.Forms.DockStyle.Top;
+            this.metroShell1.ForeColor = System.Drawing.Color.Black;
+            this.metroShell1.HelpButtonText = null;
+            this.metroShell1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+            this.metroAppButton1,
+            this.metroTabItem1,
+            this.metroTabItem2});
+            this.metroShell1.KeyTipsFont = new System.Drawing.Font("Tahoma", 7F);
+            this.metroShell1.Location = new System.Drawing.Point(0, 1);
+            this.metroShell1.Name = "metroShell1";
+            this.metroShell1.QuickToolbarItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+            this.buttonItem1,
+            this.qatCustomizeItem1});
+            this.metroShell1.Size = new System.Drawing.Size(624, 218);
+            this.metroShell1.SystemText.MaximizeRibbonText = "&Maximize the Ribbon";
+            this.metroShell1.SystemText.MinimizeRibbonText = "Mi&nimize the Ribbon";
+            this.metroShell1.SystemText.QatAddItemText = "&Add to Quick Access Toolbar";
+            this.metroShell1.SystemText.QatCustomizeMenuLabel = "<b>Customize Quick Access Toolbar</b>";
+            this.metroShell1.SystemText.QatCustomizeText = "&Customize Quick Access Toolbar...";
+            this.metroShell1.SystemText.QatDialogAddButton = "&Add >>";
+            this.metroShell1.SystemText.QatDialogCancelButton = "Cancel";
+            this.metroShell1.SystemText.QatDialogCaption = "Customize Quick Access Toolbar";
+            this.metroShell1.SystemText.QatDialogCategoriesLabel = "&Choose commands from:";
+            this.metroShell1.SystemText.QatDialogOkButton = "OK";
+            this.metroShell1.SystemText.QatDialogPlacementCheckbox = "&Place Quick Access Toolbar below the Ribbon";
+            this.metroShell1.SystemText.QatDialogRemoveButton = "&Remove";
+            this.metroShell1.SystemText.QatPlaceAboveRibbonText = "&Place Quick Access Toolbar above the Ribbon";
+            this.metroShell1.SystemText.QatPlaceBelowRibbonText = "&Place Quick Access Toolbar below the Ribbon";
+            this.metroShell1.SystemText.QatRemoveItemText = "&Remove from Quick Access Toolbar";
+            this.metroShell1.TabIndex = 0;
+            this.metroShell1.TabStripFont = new System.Drawing.Font("Segoe UI", 10.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.metroShell1.Text = "metroShell1";
+            // 
+            // metroTabItem1
+            // 
+            this.metroTabItem1.Checked = true;
+            this.metroTabItem1.Name = "metroTabItem1";
+            this.metroTabItem1.Panel = this.metroTabPanel1;
+            this.metroTabItem1.Text = "&HOME";
+            // 
+            // metroTabPanel1
+            // 
+            this.metroTabPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.metroTabPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.metroTabPanel1.Location = new System.Drawing.Point(0, 51);
+            this.metroTabPanel1.Name = "metroTabPanel1";
+            this.metroTabPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3);
+            this.metroTabPanel1.Size = new System.Drawing.Size(624, 167);
+            // 
+            // 
+            // 
+            this.metroTabPanel1.Style.Class = "";
+            this.metroTabPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.metroTabPanel1.StyleMouseDown.Class = "";
+            this.metroTabPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.metroTabPanel1.StyleMouseOver.Class = "";
+            this.metroTabPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.metroTabPanel1.TabIndex = 1;
+            // 
+            // metroTabItem2
+            // 
+            this.metroTabItem2.Name = "metroTabItem2";
+            this.metroTabItem2.Panel = this.metroTabPanel2;
+            this.metroTabItem2.Text = "&VIEW";
+            // 
+            // metroTabPanel2
+            // 
+            this.metroTabPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.metroTabPanel2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.metroTabPanel2.Location = new System.Drawing.Point(0, 0);
+            this.metroTabPanel2.Name = "metroTabPanel2";
+            this.metroTabPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3);
+            this.metroTabPanel2.Size = new System.Drawing.Size(200, 100);
+            // 
+            // 
+            // 
+            this.metroTabPanel2.Style.Class = "";
+            this.metroTabPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.metroTabPanel2.StyleMouseDown.Class = "";
+            this.metroTabPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.metroTabPanel2.StyleMouseOver.Class = "";
+            this.metroTabPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.metroTabPanel2.TabIndex = 2;
+            // 
+            // styleManager1
+            // 
+            this.styleManager1.ManagerStyle = DevComponents.DotNetBar.eStyle.Metro;
+            this.styleManager1.MetroColorParameters = new DevComponents.DotNetBar.Metro.ColorTables.MetroColorGeneratorParameters(System.Drawing.Color.White, System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(163)))), ((int)(((byte)(26))))));
+            // 
+            // qatCustomizeItem1
+            // 
+            this.qatCustomizeItem1.BeginGroup = true;
+            this.qatCustomizeItem1.Name = "qatCustomizeItem1";
+            // 
+            // metroAppButton1
+            // 
+            this.metroAppButton1.AutoExpandOnClick = true;
+            this.metroAppButton1.CanCustomize = false;
+            this.metroAppButton1.ImageFixedSize = new System.Drawing.Size(16, 16);
+            this.metroAppButton1.ImagePaddingHorizontal = 0;
+            this.metroAppButton1.ImagePaddingVertical = 0;
+            this.metroAppButton1.Name = "metroAppButton1";
+            this.metroAppButton1.ShowSubItems = false;
+            this.metroAppButton1.Text = "&File";
+            // 
+            // buttonItem1
+            // 
+            this.buttonItem1.Name = "buttonItem1";
+            this.buttonItem1.Text = "buttonItem1";
+            // 
+            // metroStatusBar1
+            // 
+            // 
+            // 
+            // 
+            this.metroStatusBar1.BackgroundStyle.Class = "";
+            this.metroStatusBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.metroStatusBar1.ContainerControlProcessDialogKey = true;
+            this.metroStatusBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.metroStatusBar1.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.metroStatusBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+            this.labelItem1});
+            this.metroStatusBar1.Location = new System.Drawing.Point(0, 374);
+            this.metroStatusBar1.Name = "metroStatusBar1";
+            this.metroStatusBar1.Size = new System.Drawing.Size(624, 21);
+            this.metroStatusBar1.TabIndex = 1;
+            this.metroStatusBar1.Text = "metroStatusBar1";
+            // 
+            // labelItem1
+            // 
+            this.labelItem1.Name = "labelItem1";
+            this.labelItem1.Text = "READY";
+            // 
+            // $safeitemrootname$
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(625, 396);
+            this.Controls.Add(this.metroStatusBar1);
+            this.Controls.Add(this.metroShell1);
+            this.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.Name = "$safeitemrootname$";
+            this.Text = "DotNetBar Metro App Form";
+            this.metroShell1.ResumeLayout(false);
+            this.metroShell1.PerformLayout();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private DevComponents.DotNetBar.Metro.MetroShell metroShell1;
+        private DevComponents.DotNetBar.Metro.MetroTabPanel metroTabPanel1;
+        private DevComponents.DotNetBar.Metro.MetroTabPanel metroTabPanel2;
+        private DevComponents.DotNetBar.Metro.MetroAppButton metroAppButton1;
+        private DevComponents.DotNetBar.Metro.MetroTabItem metroTabItem1;
+        private DevComponents.DotNetBar.Metro.MetroTabItem metroTabItem2;
+        private DevComponents.DotNetBar.ButtonItem buttonItem1;
+        private DevComponents.DotNetBar.QatCustomizeItem qatCustomizeItem1;
+        private DevComponents.DotNetBar.StyleManager styleManager1;
+        private DevComponents.DotNetBar.Metro.MetroStatusBar metroStatusBar1;
+        private DevComponents.DotNetBar.LabelItem labelItem1;
+
+    }
+}
+
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual C#/MetroAppForm/Form.cs b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual C#/MetroAppForm/Form.cs
new file mode 100644
index 00000000..ff2c3a9b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual C#/MetroAppForm/Form.cs	
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+
+namespace $rootnamespace$
+{
+    public partial class $safeitemrootname$ : DevComponents.DotNetBar.Metro.MetroAppForm
+    {
+        public $safeitemrootname$()
+        {
+            InitializeComponent();
+        }
+    }
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual C#/MetroAppForm/Form.resx b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual C#/MetroAppForm/Form.resx
new file mode 100644
index 00000000..c3d21cf2
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual C#/MetroAppForm/Form.resx	
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="styleManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual C#/MetroAppForm/MetroAppForm.zip b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual C#/MetroAppForm/MetroAppForm.zip
new file mode 100644
index 00000000..e72433e8
Binary files /dev/null and b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual C#/MetroAppForm/MetroAppForm.zip differ
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual C#/MetroAppForm/metroappform.vstemplate b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual C#/MetroAppForm/metroappform.vstemplate
new file mode 100644
index 00000000..ae758d3b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual C#/MetroAppForm/metroappform.vstemplate	
@@ -0,0 +1,38 @@
+<VSTemplate Version="3.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name>Metro App Form</Name>
+    <Description>DotNetBar Metro Application Form</Description>
+    <Icon Package="{FAE04EC1-301F-11d3-BF4B-00C04F79EFBC}" ID="4535" />
+	<TemplateID>DevComponents.CS.MetroAppForm</TemplateID>
+    <ProjectType>CSharp</ProjectType>
+    <SortOrder>41</SortOrder>
+    <DefaultName>Form.cs</DefaultName>
+	<RequiredFrameworkVersion>2.0</RequiredFrameworkVersion>
+    <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
+  </TemplateData>
+  <TemplateContent>
+		<References>
+			<Reference>
+				<Assembly>System</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Data</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Drawing</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Windows.Forms</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Xml</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>DevComponents.DotNetBar2</Assembly>
+			</Reference>
+		</References>
+
+    <ProjectItem ReplaceParameters="true" SubType="Form">Form.cs</ProjectItem>
+    <ProjectItem ReplaceParameters="true">Form.Designer.cs</ProjectItem>
+  </TemplateContent>
+</VSTemplate>
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual C#/MetroForm/MetroForm.zip b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual C#/MetroForm/MetroForm.zip
new file mode 100644
index 00000000..b98a2499
Binary files /dev/null and b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual C#/MetroForm/MetroForm.zip differ
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual C#/MetroForm/form.cs b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual C#/MetroForm/form.cs
new file mode 100644
index 00000000..11692b62
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual C#/MetroForm/form.cs	
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+using DevComponents.DotNetBar;
+
+namespace $rootnamespace$
+{
+	public partial class $safeitemrootname$: DevComponents.DotNetBar.Metro.MetroForm
+	{
+		public $safeitemrootname$()
+		{
+			InitializeComponent();
+		}
+	}
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual C#/MetroForm/form.designer.cs b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual C#/MetroForm/form.designer.cs
new file mode 100644
index 00000000..3a1a31d0
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual C#/MetroForm/form.designer.cs	
@@ -0,0 +1,42 @@
+namespace $rootnamespace$
+{
+	partial class $safeitemrootname$
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if (disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form 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.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(625, 396);
+            this.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.Name = "$safeitemrootname$";
+			this.Text = "MetroForm";
+		}
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual C#/MetroForm/metroform.vstemplate b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual C#/MetroForm/metroform.vstemplate
new file mode 100644
index 00000000..3961f06f
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual C#/MetroForm/metroform.vstemplate	
@@ -0,0 +1,38 @@
+<VSTemplate Version="3.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name>Metro Form</Name>
+    <Description>DotNetBar Metro Form</Description>
+    <Icon Package="{FAE04EC1-301F-11d3-BF4B-00C04F79EFBC}" ID="4535" />
+	<TemplateID>DevComponents.CS.MetroForm</TemplateID>
+    <ProjectType>CSharp</ProjectType>
+    <SortOrder>41</SortOrder>
+    <DefaultName>Form.cs</DefaultName>
+	<RequiredFrameworkVersion>2.0</RequiredFrameworkVersion>
+    <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
+  </TemplateData>
+  <TemplateContent>
+		<References>
+			<Reference>
+				<Assembly>System</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Data</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Drawing</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Windows.Forms</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Xml</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>DevComponents.DotNetBar2</Assembly>
+			</Reference>
+		</References>
+
+    <ProjectItem ReplaceParameters="true" SubType="Form">Form.cs</ProjectItem>
+    <ProjectItem ReplaceParameters="true">Form.Designer.cs</ProjectItem>
+  </TemplateContent>
+</VSTemplate>
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual C#/Office2007Form/DotNetBarOffice2007Form.zip b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual C#/Office2007Form/DotNetBarOffice2007Form.zip
new file mode 100644
index 00000000..e5924f7c
Binary files /dev/null and b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual C#/Office2007Form/DotNetBarOffice2007Form.zip differ
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual C#/Office2007Form/form.cs b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual C#/Office2007Form/form.cs
new file mode 100644
index 00000000..8e61cb27
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual C#/Office2007Form/form.cs	
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+using DevComponents.DotNetBar;
+
+namespace $rootnamespace$
+{
+	public partial class $safeitemrootname$: DevComponents.DotNetBar.OfficeForm
+	{
+		public $safeitemrootname$()
+		{
+			InitializeComponent();
+		}
+	}
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual C#/Office2007Form/form.designer.cs b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual C#/Office2007Form/form.designer.cs
new file mode 100644
index 00000000..6bc0536d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual C#/Office2007Form/form.designer.cs	
@@ -0,0 +1,37 @@
+namespace $rootnamespace$
+{
+	partial class $safeitemrootname$
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if (disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form 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.Text = "$safeitemrootname$";
+		}
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual C#/Office2007Form/office2007form.vstemplate b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual C#/Office2007Form/office2007form.vstemplate
new file mode 100644
index 00000000..f2bf2593
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual C#/Office2007Form/office2007form.vstemplate	
@@ -0,0 +1,38 @@
+<VSTemplate Version="3.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name>Office Form</Name>
+    <Description>DotNetBar Office Style Form</Description>
+    <Icon Package="{FAE04EC1-301F-11d3-BF4B-00C04F79EFBC}" ID="4535" />
+	<TemplateID>DevComponents.CS.Office2007Form</TemplateID>
+    <ProjectType>CSharp</ProjectType>
+    <SortOrder>41</SortOrder>
+    <DefaultName>Form.cs</DefaultName>
+	<RequiredFrameworkVersion>2.0</RequiredFrameworkVersion>
+    <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
+  </TemplateData>
+  <TemplateContent>
+		<References>
+			<Reference>
+				<Assembly>System</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Data</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Drawing</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Windows.Forms</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Xml</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>DevComponents.DotNetBar2</Assembly>
+			</Reference>
+		</References>
+
+    <ProjectItem ReplaceParameters="true" SubType="Form">Form.cs</ProjectItem>
+    <ProjectItem ReplaceParameters="true">Form.Designer.cs</ProjectItem>
+  </TemplateContent>
+</VSTemplate>
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual C#/RibbonForm/DotNetBarRibbonForm.zip b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual C#/RibbonForm/DotNetBarRibbonForm.zip
new file mode 100644
index 00000000..33693820
Binary files /dev/null and b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual C#/RibbonForm/DotNetBarRibbonForm.zip differ
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual C#/RibbonForm/form.cs b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual C#/RibbonForm/form.cs
new file mode 100644
index 00000000..bfd40b47
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual C#/RibbonForm/form.cs	
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+using DevComponents.DotNetBar;
+
+namespace $rootnamespace$
+{
+	public partial class $safeitemrootname$: DevComponents.DotNetBar.RibbonForm
+	{
+		public $safeitemrootname$()
+		{
+			InitializeComponent();
+		}
+	}
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual C#/RibbonForm/form.designer.cs b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual C#/RibbonForm/form.designer.cs
new file mode 100644
index 00000000..6bc0536d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual C#/RibbonForm/form.designer.cs	
@@ -0,0 +1,37 @@
+namespace $rootnamespace$
+{
+	partial class $safeitemrootname$
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if (disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form 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.Text = "$safeitemrootname$";
+		}
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual C#/RibbonForm/ribbonform.vstemplate b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual C#/RibbonForm/ribbonform.vstemplate
new file mode 100644
index 00000000..a0273570
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual C#/RibbonForm/ribbonform.vstemplate	
@@ -0,0 +1,38 @@
+<VSTemplate Version="3.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name>Ribbon Form</Name>
+    <Description>DotNetBar Ribbon Form</Description>
+    <Icon Package="{FAE04EC1-301F-11d3-BF4B-00C04F79EFBC}" ID="4535" />
+	<TemplateID>DevComponents.CS.RibbonForm</TemplateID>
+    <ProjectType>CSharp</ProjectType>
+    <SortOrder>41</SortOrder>
+	<RequiredFrameworkVersion>2.0</RequiredFrameworkVersion>
+    <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
+    <DefaultName>RibbonForm.cs</DefaultName>
+  </TemplateData>
+  <TemplateContent>
+		<References>
+			<Reference>
+				<Assembly>System</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Data</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Drawing</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Windows.Forms</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Xml</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>DevComponents.DotNetBar2</Assembly>
+			</Reference>
+		</References>
+
+    <ProjectItem ReplaceParameters="true" SubType="Form">Form.cs</ProjectItem>
+    <ProjectItem ReplaceParameters="true">Form.Designer.cs</ProjectItem>
+  </TemplateContent>
+</VSTemplate>
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual C#/TabbedForm/Form.Designer.cs b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual C#/TabbedForm/Form.Designer.cs
new file mode 100644
index 00000000..6a057d83
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual C#/TabbedForm/Form.Designer.cs	
@@ -0,0 +1,175 @@
+namespace $rootnamespace$
+{
+    partial class $safeitemrootname$
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form 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.tabFormControl1 = new DevComponents.DotNetBar.Controls.TabFormControl();
+            this.tabFormPanel1 = new DevComponents.DotNetBar.Controls.TabFormPanel();
+            this.tabFormPanel2 = new DevComponents.DotNetBar.Controls.TabFormPanel();
+            this.tabFormItem1 = new DevComponents.DotNetBar.Controls.TabFormItem();
+            this.tabFormItem2 = new DevComponents.DotNetBar.Controls.TabFormItem();
+            this.label1 = new System.Windows.Forms.Label();
+            this.label2 = new System.Windows.Forms.Label();
+            this.tabFormControl1.SuspendLayout();
+            this.tabFormPanel1.SuspendLayout();
+            this.tabFormPanel2.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // tabFormControl1
+            // 
+            this.tabFormControl1.BackColor = System.Drawing.Color.White;
+            // 
+            // 
+            // 
+            this.tabFormControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.tabFormControl1.Controls.Add(this.tabFormPanel1);
+            this.tabFormControl1.Controls.Add(this.tabFormPanel2);
+            this.tabFormControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tabFormControl1.ForeColor = System.Drawing.Color.Black;
+            this.tabFormControl1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+            this.tabFormItem1,
+            this.tabFormItem2});
+            this.tabFormControl1.Location = new System.Drawing.Point(1, 1);
+            this.tabFormControl1.Name = "tabFormControl1";
+            this.tabFormControl1.Size = new System.Drawing.Size(614, 412);
+            this.tabFormControl1.TabIndex = 0;
+            this.tabFormControl1.TabStripFont = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.tabFormControl1.Text = "tabFormControl1";
+            // 
+            // tabFormPanel1
+            // 
+            this.tabFormPanel1.Controls.Add(this.label1);
+            this.tabFormPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tabFormPanel1.Location = new System.Drawing.Point(0, 28);
+            this.tabFormPanel1.Name = "tabFormPanel1";
+            this.tabFormPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3);
+            this.tabFormPanel1.Size = new System.Drawing.Size(614, 384);
+            // 
+            // 
+            // 
+            this.tabFormPanel1.Style.Class = "TabFormPanel";
+            this.tabFormPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.tabFormPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.tabFormPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.tabFormPanel1.TabIndex = 1;
+            // 
+            // tabFormPanel2
+            // 
+            this.tabFormPanel2.Controls.Add(this.label2);
+            this.tabFormPanel2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tabFormPanel2.Location = new System.Drawing.Point(0, 28);
+            this.tabFormPanel2.Name = "tabFormPanel2";
+            this.tabFormPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3);
+            this.tabFormPanel2.Size = new System.Drawing.Size(614, 384);
+            // 
+            // 
+            // 
+            this.tabFormPanel2.Style.Class = "TabFormPanel";
+            this.tabFormPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.tabFormPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.tabFormPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.tabFormPanel2.TabIndex = 2;
+            this.tabFormPanel2.Visible = false;
+            // 
+            // tabFormItem1
+            // 
+            this.tabFormItem1.Checked = true;
+            this.tabFormItem1.Name = "tabFormItem1";
+            this.tabFormItem1.Panel = this.tabFormPanel1;
+            this.tabFormItem1.Text = "Document 1";
+            // 
+            // tabFormItem2
+            // 
+            this.tabFormItem2.Name = "tabFormItem2";
+            this.tabFormItem2.Panel = this.tabFormPanel2;
+            this.tabFormItem2.Text = "Document 2";
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.BackColor = System.Drawing.Color.Transparent;
+            this.label1.Location = new System.Drawing.Point(241, 175);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(101, 13);
+            this.label1.TabIndex = 0;
+            this.label1.Text = "Your content here...";
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.BackColor = System.Drawing.Color.Transparent;
+            this.label2.Location = new System.Drawing.Point(257, 186);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(101, 13);
+            this.label2.TabIndex = 1;
+            this.label2.Text = "Your content here...";
+            // 
+            // $safeitemrootname$
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(616, 414);
+            this.Controls.Add(this.tabFormControl1);
+            this.ForeColor = System.Drawing.Color.Black;
+            this.Name = "$safeitemrootname$";
+            this.Text = "DotNetBar Tabbed App Form";
+            this.tabFormControl1.ResumeLayout(false);
+            this.tabFormControl1.PerformLayout();
+            this.tabFormPanel1.ResumeLayout(false);
+            this.tabFormPanel1.PerformLayout();
+            this.tabFormPanel2.ResumeLayout(false);
+            this.tabFormPanel2.PerformLayout();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private DevComponents.DotNetBar.Controls.TabFormControl tabFormControl1;
+        private DevComponents.DotNetBar.Controls.TabFormPanel tabFormPanel1;
+        private DevComponents.DotNetBar.Controls.TabFormPanel tabFormPanel2;
+        private DevComponents.DotNetBar.Controls.TabFormItem tabFormItem1;
+        private DevComponents.DotNetBar.Controls.TabFormItem tabFormItem2;
+		private System.Windows.Forms.Label label1;
+		private System.Windows.Forms.Label label2;
+
+    }
+}
+
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual C#/TabbedForm/Form.cs b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual C#/TabbedForm/Form.cs
new file mode 100644
index 00000000..47530f09
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual C#/TabbedForm/Form.cs	
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+
+namespace $rootnamespace$
+{
+    public partial class $safeitemrootname$ : DevComponents.DotNetBar.Controls.TabParentForm
+    {
+        public $safeitemrootname$()
+        {
+            InitializeComponent();
+        }
+    }
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual C#/TabbedForm/Form.resx b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual C#/TabbedForm/Form.resx
new file mode 100644
index 00000000..19dc0dd8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual C#/TabbedForm/Form.resx	
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual C#/TabbedForm/TabbedForm.zip b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual C#/TabbedForm/TabbedForm.zip
new file mode 100644
index 00000000..7cd94f8b
Binary files /dev/null and b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual C#/TabbedForm/TabbedForm.zip differ
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual C#/TabbedForm/tabbedform.vstemplate b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual C#/TabbedForm/tabbedform.vstemplate
new file mode 100644
index 00000000..c22546e3
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2015/Visual C#/TabbedForm/tabbedform.vstemplate	
@@ -0,0 +1,38 @@
+<VSTemplate Version="3.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name>Tabbed Form</Name>
+    <Description>DotNetBar Tabbed Form</Description>
+    <Icon Package="{FAE04EC1-301F-11d3-BF4B-00C04F79EFBC}" ID="4535" />
+	<TemplateID>DevComponents.CS.TabbedForm</TemplateID>
+    <ProjectType>CSharp</ProjectType>
+    <SortOrder>41</SortOrder>
+    <DefaultName>Form.cs</DefaultName>
+	<RequiredFrameworkVersion>2.0</RequiredFrameworkVersion>
+    <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
+  </TemplateData>
+  <TemplateContent>
+		<References>
+			<Reference>
+				<Assembly>System</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Data</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Drawing</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Windows.Forms</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Xml</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>DevComponents.DotNetBar2</Assembly>
+			</Reference>
+		</References>
+
+    <ProjectItem ReplaceParameters="true" SubType="Form">Form.cs</ProjectItem>
+    <ProjectItem ReplaceParameters="true">Form.Designer.cs</ProjectItem>
+  </TemplateContent>
+</VSTemplate>
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual Basic/MetroAppForm/Form.Designer.vb b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual Basic/MetroAppForm/Form.Designer.vb
new file mode 100644
index 00000000..913e8b3c
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual Basic/MetroAppForm/Form.Designer.vb	
@@ -0,0 +1,217 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class $safeitemrootname$
+    Inherits DevComponents.DotNetBar.Metro.MetroAppForm
+
+    'Form overrides dispose to clean up the component list.
+    <System.Diagnostics.DebuggerNonUserCode()> _
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+        Try
+            If disposing AndAlso components IsNot Nothing Then
+                components.Dispose()
+            End If
+        Finally
+            MyBase.Dispose(disposing)
+        End Try
+    End Sub
+
+    'Required by the Windows Form Designer
+    Private components As System.ComponentModel.IContainer
+
+    'NOTE: The following procedure is required by the Windows Form Designer
+    'It can be modified using the Windows Form Designer.  
+    'Do not modify it using the code editor.
+    <System.Diagnostics.DebuggerStepThrough()> _
+    Private Sub InitializeComponent()
+        Me.components = New System.ComponentModel.Container
+        Me.MetroShell1 = New DevComponents.DotNetBar.Metro.MetroShell
+        Me.MetroTabItem1 = New DevComponents.DotNetBar.Metro.MetroTabItem
+        Me.MetroTabPanel1 = New DevComponents.DotNetBar.Metro.MetroTabPanel
+        Me.MetroTabItem2 = New DevComponents.DotNetBar.Metro.MetroTabItem
+        Me.MetroTabPanel2 = New DevComponents.DotNetBar.Metro.MetroTabPanel
+        Me.StyleManager1 = New DevComponents.DotNetBar.StyleManager(Me.components)
+        Me.QatCustomizeItem1 = New DevComponents.DotNetBar.QatCustomizeItem
+        Me.MetroAppButton1 = New DevComponents.DotNetBar.Metro.MetroAppButton
+        Me.ButtonItem1 = New DevComponents.DotNetBar.ButtonItem
+        Me.MetroStatusBar1 = New DevComponents.DotNetBar.Metro.MetroStatusBar
+        Me.LabelItem1 = New DevComponents.DotNetBar.LabelItem
+        Me.MetroShell1.SuspendLayout()
+        Me.SuspendLayout()
+        '
+        'MetroShell1
+        '
+        Me.MetroShell1.BackColor = System.Drawing.Color.White
+        '
+        '
+        '
+        Me.MetroShell1.BackgroundStyle.Class = ""
+        Me.MetroShell1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        Me.MetroShell1.CaptionVisible = True
+        Me.MetroShell1.Controls.Add(Me.MetroTabPanel1)
+        Me.MetroShell1.Controls.Add(Me.MetroTabPanel2)
+        Me.MetroShell1.Dock = System.Windows.Forms.DockStyle.Top
+        Me.MetroShell1.ForeColor = System.Drawing.Color.Black
+        Me.MetroShell1.HelpButtonText = Nothing
+        Me.MetroShell1.Items.AddRange(New DevComponents.DotNetBar.BaseItem() {Me.MetroAppButton1, Me.MetroTabItem1, Me.MetroTabItem2})
+        Me.MetroShell1.KeyTipsFont = New System.Drawing.Font("Tahoma", 7.0!)
+        Me.MetroShell1.Location = New System.Drawing.Point(0, 1)
+        Me.MetroShell1.Name = "MetroShell1"
+        Me.MetroShell1.QuickToolbarItems.AddRange(New DevComponents.DotNetBar.BaseItem() {Me.ButtonItem1, Me.QatCustomizeItem1})
+        Me.MetroShell1.Size = New System.Drawing.Size(652, 234)
+        Me.MetroShell1.SystemText.MaximizeRibbonText = "&Maximize the Ribbon"
+        Me.MetroShell1.SystemText.MinimizeRibbonText = "Mi&nimize the Ribbon"
+        Me.MetroShell1.SystemText.QatAddItemText = "&Add to Quick Access Toolbar"
+        Me.MetroShell1.SystemText.QatCustomizeMenuLabel = "<b>Customize Quick Access Toolbar</b>"
+        Me.MetroShell1.SystemText.QatCustomizeText = "&Customize Quick Access Toolbar..."
+        Me.MetroShell1.SystemText.QatDialogAddButton = "&Add >>"
+        Me.MetroShell1.SystemText.QatDialogCancelButton = "Cancel"
+        Me.MetroShell1.SystemText.QatDialogCaption = "Customize Quick Access Toolbar"
+        Me.MetroShell1.SystemText.QatDialogCategoriesLabel = "&Choose commands from:"
+        Me.MetroShell1.SystemText.QatDialogOkButton = "OK"
+        Me.MetroShell1.SystemText.QatDialogPlacementCheckbox = "&Place Quick Access Toolbar below the Ribbon"
+        Me.MetroShell1.SystemText.QatDialogRemoveButton = "&Remove"
+        Me.MetroShell1.SystemText.QatPlaceAboveRibbonText = "&Place Quick Access Toolbar above the Ribbon"
+        Me.MetroShell1.SystemText.QatPlaceBelowRibbonText = "&Place Quick Access Toolbar below the Ribbon"
+        Me.MetroShell1.SystemText.QatRemoveItemText = "&Remove from Quick Access Toolbar"
+        Me.MetroShell1.TabIndex = 0
+        Me.MetroShell1.TabStripFont = New System.Drawing.Font("Segoe UI", 10.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.MetroShell1.Text = "MetroShell1"
+        '
+        'MetroTabItem1
+        '
+        Me.MetroTabItem1.Checked = True
+        Me.MetroTabItem1.Name = "MetroTabItem1"
+        Me.MetroTabItem1.Panel = Me.MetroTabPanel1
+        Me.MetroTabItem1.Text = "&HOME"
+        '
+        'MetroTabPanel1
+        '
+        Me.MetroTabPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled
+        Me.MetroTabPanel1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.MetroTabPanel1.Location = New System.Drawing.Point(0, 51)
+        Me.MetroTabPanel1.Name = "MetroTabPanel1"
+        Me.MetroTabPanel1.Padding = New System.Windows.Forms.Padding(3, 0, 3, 3)
+        Me.MetroTabPanel1.Size = New System.Drawing.Size(652, 183)
+        '
+        '
+        '
+        Me.MetroTabPanel1.Style.Class = ""
+        Me.MetroTabPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        '
+        '
+        '
+        Me.MetroTabPanel1.StyleMouseDown.Class = ""
+        Me.MetroTabPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        '
+        '
+        '
+        Me.MetroTabPanel1.StyleMouseOver.Class = ""
+        Me.MetroTabPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        Me.MetroTabPanel1.TabIndex = 1
+        '
+        'MetroTabItem2
+        '
+        Me.MetroTabItem2.Name = "MetroTabItem2"
+        Me.MetroTabItem2.Panel = Me.MetroTabPanel2
+        Me.MetroTabItem2.Text = "&VIEW"
+        '
+        'MetroTabPanel2
+        '
+        Me.MetroTabPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled
+        Me.MetroTabPanel2.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.MetroTabPanel2.Location = New System.Drawing.Point(0, 0)
+        Me.MetroTabPanel2.Name = "MetroTabPanel2"
+        Me.MetroTabPanel2.Padding = New System.Windows.Forms.Padding(3, 0, 3, 3)
+        Me.MetroTabPanel2.Size = New System.Drawing.Size(200, 100)
+        '
+        '
+        '
+        Me.MetroTabPanel2.Style.Class = ""
+        Me.MetroTabPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        '
+        '
+        '
+        Me.MetroTabPanel2.StyleMouseDown.Class = ""
+        Me.MetroTabPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        '
+        '
+        '
+        Me.MetroTabPanel2.StyleMouseOver.Class = ""
+        Me.MetroTabPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        Me.MetroTabPanel2.TabIndex = 2
+        '
+        'StyleManager1
+        '
+        Me.StyleManager1.ManagerStyle = DevComponents.DotNetBar.eStyle.Metro
+        Me.StyleManager1.MetroColorParameters = New DevComponents.DotNetBar.Metro.ColorTables.MetroColorGeneratorParameters(System.Drawing.Color.White, System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(163, Byte), Integer), CType(CType(26, Byte), Integer)))
+        '
+        'QatCustomizeItem1
+        '
+        Me.QatCustomizeItem1.BeginGroup = True
+        Me.QatCustomizeItem1.Name = "QatCustomizeItem1"
+        '
+        'MetroAppButton1
+        '
+        Me.MetroAppButton1.AutoExpandOnClick = True
+        Me.MetroAppButton1.CanCustomize = False
+        Me.MetroAppButton1.ImageFixedSize = New System.Drawing.Size(16, 16)
+        Me.MetroAppButton1.ImagePaddingHorizontal = 0
+        Me.MetroAppButton1.ImagePaddingVertical = 0
+        Me.MetroAppButton1.Name = "MetroAppButton1"
+        Me.MetroAppButton1.ShowSubItems = False
+        Me.MetroAppButton1.Text = "&File"
+        '
+        'ButtonItem1
+        '
+        Me.ButtonItem1.Name = "ButtonItem1"
+        Me.ButtonItem1.Text = "ButtonItem1"
+        '
+        'MetroStatusBar1
+        '
+        '
+        '
+        '
+        Me.MetroStatusBar1.BackgroundStyle.Class = ""
+        Me.MetroStatusBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        Me.MetroStatusBar1.ContainerControlProcessDialogKey = True
+        Me.MetroStatusBar1.Dock = System.Windows.Forms.DockStyle.Bottom
+        Me.MetroStatusBar1.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.MetroStatusBar1.Items.AddRange(New DevComponents.DotNetBar.BaseItem() {Me.LabelItem1})
+        Me.MetroStatusBar1.Location = New System.Drawing.Point(0, 413)
+        Me.MetroStatusBar1.Name = "MetroStatusBar1"
+        Me.MetroStatusBar1.Size = New System.Drawing.Size(652, 22)
+        Me.MetroStatusBar1.TabIndex = 1
+        Me.MetroStatusBar1.Text = "MetroStatusBar1"
+        '
+        'LabelItem1
+        '
+        Me.LabelItem1.Name = "LabelItem1"
+        Me.LabelItem1.Text = "READY"
+        '
+        '$safeitemrootname$
+        '
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.ClientSize = New System.Drawing.Size(653, 436)
+        Me.Controls.Add(Me.MetroStatusBar1)
+        Me.Controls.Add(Me.MetroShell1)
+        Me.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Name = "$safeitemrootname$"
+        Me.Text = "DotNetBar Metro App Form"
+        Me.MetroShell1.ResumeLayout(False)
+        Me.MetroShell1.PerformLayout()
+        Me.ResumeLayout(False)
+
+    End Sub
+    Friend WithEvents MetroShell1 As DevComponents.DotNetBar.Metro.MetroShell
+    Friend WithEvents MetroTabPanel1 As DevComponents.DotNetBar.Metro.MetroTabPanel
+    Friend WithEvents MetroTabPanel2 As DevComponents.DotNetBar.Metro.MetroTabPanel
+    Friend WithEvents MetroAppButton1 As DevComponents.DotNetBar.Metro.MetroAppButton
+    Friend WithEvents MetroTabItem1 As DevComponents.DotNetBar.Metro.MetroTabItem
+    Friend WithEvents MetroTabItem2 As DevComponents.DotNetBar.Metro.MetroTabItem
+    Friend WithEvents ButtonItem1 As DevComponents.DotNetBar.ButtonItem
+    Friend WithEvents QatCustomizeItem1 As DevComponents.DotNetBar.QatCustomizeItem
+    Friend WithEvents StyleManager1 As DevComponents.DotNetBar.StyleManager
+    Friend WithEvents MetroStatusBar1 As DevComponents.DotNetBar.Metro.MetroStatusBar
+    Friend WithEvents LabelItem1 As DevComponents.DotNetBar.LabelItem
+
+End Class
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual Basic/MetroAppForm/Form.resx b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual Basic/MetroAppForm/Form.resx
new file mode 100644
index 00000000..998f01fd
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual Basic/MetroAppForm/Form.resx	
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="StyleManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual Basic/MetroAppForm/Form.vb b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual Basic/MetroAppForm/Form.vb
new file mode 100644
index 00000000..64eb4330
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual Basic/MetroAppForm/Form.vb	
@@ -0,0 +1,3 @@
+Public Class $safeitemrootname$
+
+End Class
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual Basic/MetroAppForm/MetroAppForm.zip b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual Basic/MetroAppForm/MetroAppForm.zip
new file mode 100644
index 00000000..e464b16b
Binary files /dev/null and b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual Basic/MetroAppForm/MetroAppForm.zip differ
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual Basic/MetroAppForm/metroappform.vstemplate b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual Basic/MetroAppForm/metroappform.vstemplate
new file mode 100644
index 00000000..9cbac33b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual Basic/MetroAppForm/metroappform.vstemplate	
@@ -0,0 +1,36 @@
+<VSTemplate Version="3.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name>Metro UI App Form</Name>
+    <Description>DotNetBar Metro Application Form</Description>
+    <Icon Package="{164B10B9-B200-11D0-8C61-00A0C91E29D5}" ID="4527" />
+	<TemplateID>DevComponents.VB.MetroAppForm</TemplateID>
+    <ProjectType>VisualBasic</ProjectType>
+    <SortOrder>11</SortOrder>
+    <DefaultName>Form.vb</DefaultName>
+	<RequiredFrameworkVersion>2.0</RequiredFrameworkVersion>
+    <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
+  </TemplateData>
+  <TemplateContent>
+        <References>
+            <Reference>
+                <Assembly>System</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+            <Reference>
+                <Assembly>System.Drawing</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+            <Reference>
+                <Assembly>System.Windows.Forms</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+			<Reference>
+                <Assembly>DevComponents.DotNetBar2</Assembly>
+                <URL>http://www.devcomponents.com</URL>
+            </Reference>
+        </References>
+
+    <ProjectItem ReplaceParameters="true" SubType="Form">Form.vb</ProjectItem>
+    <ProjectItem ReplaceParameters="true">Form.Designer.vb</ProjectItem>
+  </TemplateContent>
+</VSTemplate>
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual Basic/MetroForm/Form.Designer.vb b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual Basic/MetroForm/Form.Designer.vb
new file mode 100644
index 00000000..7d926fa4
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual Basic/MetroForm/Form.Designer.vb	
@@ -0,0 +1,33 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class $safeitemrootname$
+    Inherits DevComponents.DotNetBar.Metro.MetroForm
+
+    'Form overrides dispose to clean up the component list.
+    <System.Diagnostics.DebuggerNonUserCode()> _
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+        Try
+            If disposing AndAlso components IsNot Nothing Then
+                components.Dispose()
+            End If
+        Finally
+            MyBase.Dispose(disposing)
+        End Try
+    End Sub
+
+    'Required by the Windows Form Designer
+    Private components As System.ComponentModel.IContainer
+
+    'NOTE: The following procedure is required by the Windows Form Designer
+    'It can be modified using the Windows Form Designer.  
+    'Do not modify it using the code editor.
+    <System.Diagnostics.DebuggerStepThrough()> _
+    Private Sub InitializeComponent()
+        components = New System.ComponentModel.Container
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.ClientSize = New System.Drawing.Size(653, 436)
+		Me.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+		Me.Name = "$safeitemrootname$"
+        Me.Text = "MetroForm"
+    End Sub
+End Class
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual Basic/MetroForm/Form.vb b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual Basic/MetroForm/Form.vb
new file mode 100644
index 00000000..9b12d76d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual Basic/MetroForm/Form.vb	
@@ -0,0 +1,3 @@
+Public Class $safeitemrootname$
+
+End Class
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual Basic/MetroForm/MetroForm.zip b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual Basic/MetroForm/MetroForm.zip
new file mode 100644
index 00000000..1742cb89
Binary files /dev/null and b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual Basic/MetroForm/MetroForm.zip differ
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual Basic/MetroForm/metroform.vstemplate b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual Basic/MetroForm/metroform.vstemplate
new file mode 100644
index 00000000..62cc1786
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual Basic/MetroForm/metroform.vstemplate	
@@ -0,0 +1,36 @@
+<VSTemplate Version="3.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name>Metro Form</Name>
+    <Description>DotNetBar Metro Form</Description>
+    <Icon Package="{164B10B9-B200-11D0-8C61-00A0C91E29D5}" ID="4527" />
+	<TemplateID>DevComponents.VB.MetroForm</TemplateID>
+    <ProjectType>VisualBasic</ProjectType>
+    <SortOrder>11</SortOrder>
+    <DefaultName>Form.vb</DefaultName>
+	<RequiredFrameworkVersion>2.0</RequiredFrameworkVersion>
+    <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
+  </TemplateData>
+  <TemplateContent>
+        <References>
+            <Reference>
+                <Assembly>System</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+            <Reference>
+                <Assembly>System.Drawing</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+            <Reference>
+                <Assembly>System.Windows.Forms</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+			<Reference>
+                <Assembly>DevComponents.DotNetBar2</Assembly>
+                <URL>http://www.devcomponents.com</URL>
+            </Reference>
+        </References>
+
+    <ProjectItem ReplaceParameters="true" SubType="Form">Form.vb</ProjectItem>
+    <ProjectItem ReplaceParameters="true">Form.Designer.vb</ProjectItem>
+  </TemplateContent>
+</VSTemplate>
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual Basic/Office2007Form/DotNetBarOffice2007Form.zip b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual Basic/Office2007Form/DotNetBarOffice2007Form.zip
new file mode 100644
index 00000000..bbbe8da0
Binary files /dev/null and b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual Basic/Office2007Form/DotNetBarOffice2007Form.zip differ
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual Basic/Office2007Form/Form.Designer.vb b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual Basic/Office2007Form/Form.Designer.vb
new file mode 100644
index 00000000..2f6f306f
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual Basic/Office2007Form/Form.Designer.vb	
@@ -0,0 +1,29 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class $safeitemrootname$
+    Inherits DevComponents.DotNetBar.OfficeForm
+
+    'Form overrides dispose to clean up the component list.
+    <System.Diagnostics.DebuggerNonUserCode()> _
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+        Try
+            If disposing AndAlso components IsNot Nothing Then
+                components.Dispose()
+            End If
+        Finally
+            MyBase.Dispose(disposing)
+        End Try
+    End Sub
+
+    'Required by the Windows Form Designer
+    Private components As System.ComponentModel.IContainer
+
+    'NOTE: The following procedure is required by the Windows Form Designer
+    'It can be modified using the Windows Form Designer.  
+    'Do not modify it using the code editor.
+    <System.Diagnostics.DebuggerStepThrough()> _
+    Private Sub InitializeComponent()
+        components = New System.ComponentModel.Container
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.Text = "$safeitemrootname$"
+    End Sub
+End Class
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual Basic/Office2007Form/Form.vb b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual Basic/Office2007Form/Form.vb
new file mode 100644
index 00000000..9b12d76d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual Basic/Office2007Form/Form.vb	
@@ -0,0 +1,3 @@
+Public Class $safeitemrootname$
+
+End Class
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual Basic/Office2007Form/office2007form.vstemplate b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual Basic/Office2007Form/office2007form.vstemplate
new file mode 100644
index 00000000..1bf5f9f1
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual Basic/Office2007Form/office2007form.vstemplate	
@@ -0,0 +1,36 @@
+<VSTemplate Version="3.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name>Office Form</Name>
+    <Description>DotNetBar Office Style Form</Description>
+    <Icon Package="{164B10B9-B200-11D0-8C61-00A0C91E29D5}" ID="4527" />
+	<TemplateID>DevComponents.VB.Office2007Form</TemplateID>
+    <ProjectType>VisualBasic</ProjectType>
+    <SortOrder>11</SortOrder>
+    <DefaultName>Form.vb</DefaultName>
+	<RequiredFrameworkVersion>2.0</RequiredFrameworkVersion>
+    <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
+  </TemplateData>
+  <TemplateContent>
+        <References>
+            <Reference>
+                <Assembly>System</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+            <Reference>
+                <Assembly>System.Drawing</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+            <Reference>
+                <Assembly>System.Windows.Forms</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+			<Reference>
+                <Assembly>DevComponents.DotNetBar2</Assembly>
+                <URL>http://www.devcomponents.com</URL>
+            </Reference>
+        </References>
+
+    <ProjectItem ReplaceParameters="true" SubType="Form">Form.vb</ProjectItem>
+    <ProjectItem ReplaceParameters="true">Form.Designer.vb</ProjectItem>
+  </TemplateContent>
+</VSTemplate>
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual Basic/RibbonForm/DotNetBarRibbonForm.zip b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual Basic/RibbonForm/DotNetBarRibbonForm.zip
new file mode 100644
index 00000000..fbfe10c8
Binary files /dev/null and b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual Basic/RibbonForm/DotNetBarRibbonForm.zip differ
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual Basic/RibbonForm/Form.Designer.vb b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual Basic/RibbonForm/Form.Designer.vb
new file mode 100644
index 00000000..abbb321e
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual Basic/RibbonForm/Form.Designer.vb	
@@ -0,0 +1,28 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class $safeitemrootname$
+    Inherits DevComponents.DotNetBar.RibbonForm
+
+    'Form overrides dispose to clean up the component list.
+    <System.Diagnostics.DebuggerNonUserCode()> _
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+        Try
+            If disposing AndAlso components IsNot Nothing Then
+                components.Dispose()
+            End If
+        Finally
+            MyBase.Dispose(disposing)
+        End Try
+    End Sub
+
+    'Required by the Windows Form Designer
+    Private components As System.ComponentModel.IContainer
+
+    'NOTE: The following procedure is required by the Windows Form Designer
+    'It can be modified using the Windows Form Designer.  
+    'Do not modify it using the code editor.
+    <System.Diagnostics.DebuggerStepThrough()> _
+    Private Sub InitializeComponent()
+        components = New System.ComponentModel.Container
+        Me.Text = "$safeitemrootname$"
+    End Sub
+End Class
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual Basic/RibbonForm/Form.vb b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual Basic/RibbonForm/Form.vb
new file mode 100644
index 00000000..9b12d76d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual Basic/RibbonForm/Form.vb	
@@ -0,0 +1,3 @@
+Public Class $safeitemrootname$
+
+End Class
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual Basic/RibbonForm/ribbonform.vstemplate b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual Basic/RibbonForm/ribbonform.vstemplate
new file mode 100644
index 00000000..13e12ed8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual Basic/RibbonForm/ribbonform.vstemplate	
@@ -0,0 +1,36 @@
+<VSTemplate Version="3.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name>Ribbon Form</Name>
+    <Description>DotNetBar Ribbon Form</Description>
+    <Icon Package="{164B10B9-B200-11D0-8C61-00A0C91E29D5}" ID="4527" />
+	<TemplateID>DevComponents.VB.RibbonForm</TemplateID>
+    <ProjectType>VisualBasic</ProjectType>
+    <SortOrder>11</SortOrder>
+    <DefaultName>Form.vb</DefaultName>
+	<RequiredFrameworkVersion>2.0</RequiredFrameworkVersion>
+    <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
+  </TemplateData>
+  <TemplateContent>
+        <References>
+            <Reference>
+                <Assembly>System</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+            <Reference>
+                <Assembly>System.Drawing</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+            <Reference>
+                <Assembly>System.Windows.Forms</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+			<Reference>
+                <Assembly>DevComponents.DotNetBar2</Assembly>
+                <URL>http://www.devcomponents.com</URL>
+            </Reference>
+        </References>
+
+    <ProjectItem ReplaceParameters="true" SubType="Form">Form.vb</ProjectItem>
+    <ProjectItem ReplaceParameters="true">Form.Designer.vb</ProjectItem>
+  </TemplateContent>
+</VSTemplate>
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual Basic/TabbedForm/Form.Designer.vb b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual Basic/TabbedForm/Form.Designer.vb
new file mode 100644
index 00000000..f9b0d381
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual Basic/TabbedForm/Form.Designer.vb	
@@ -0,0 +1,176 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class $safeitemrootname$
+    Inherits DevComponents.DotNetBar.Controls.TabParentForm
+
+    'Form overrides dispose to clean up the component list.
+    <System.Diagnostics.DebuggerNonUserCode()> _
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+        Try
+            If disposing AndAlso components IsNot Nothing Then
+                components.Dispose()
+            End If
+        Finally
+            MyBase.Dispose(disposing)
+        End Try
+    End Sub
+
+    'Required by the Windows Form Designer
+    Private components As System.ComponentModel.IContainer
+
+    'NOTE: The following procedure is required by the Windows Form Designer
+    'It can be modified using the Windows Form Designer.  
+    'Do not modify it using the code editor.
+    <System.Diagnostics.DebuggerStepThrough()> _
+    Private Sub InitializeComponent()
+        Me.TabFormControl1 = New DevComponents.DotNetBar.Controls.TabFormControl()
+        Me.TabFormPanel1 = New DevComponents.DotNetBar.Controls.TabFormPanel()
+        Me.TabFormPanel2 = New DevComponents.DotNetBar.Controls.TabFormPanel()
+        Me.TabFormItem1 = New DevComponents.DotNetBar.Controls.TabFormItem()
+        Me.TabFormItem2 = New DevComponents.DotNetBar.Controls.TabFormItem()
+        Me.Label1 = New System.Windows.Forms.Label()
+        Me.Label2 = New System.Windows.Forms.Label()
+        Me.TabFormControl1.SuspendLayout
+        Me.TabFormPanel1.SuspendLayout
+        Me.TabFormPanel2.SuspendLayout
+        Me.SuspendLayout
+        '
+        'TabFormControl1
+        '
+        Me.TabFormControl1.BackColor = System.Drawing.Color.White
+        '
+        '
+        '
+        Me.TabFormControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        Me.TabFormControl1.Controls.Add(Me.TabFormPanel1)
+        Me.TabFormControl1.Controls.Add(Me.TabFormPanel2)
+        Me.TabFormControl1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.TabFormControl1.ForeColor = System.Drawing.Color.Black
+        Me.TabFormControl1.Items.AddRange(New DevComponents.DotNetBar.BaseItem() {Me.TabFormItem1, Me.TabFormItem2})
+        Me.TabFormControl1.Location = New System.Drawing.Point(1, 1)
+        Me.TabFormControl1.Name = "TabFormControl1"
+        Me.TabFormControl1.Size = New System.Drawing.Size(444, 311)
+        Me.TabFormControl1.SystemText.MaximizeRibbonText = "Maximize the Ribbon"
+        Me.TabFormControl1.SystemText.MinimizeRibbonText = "Minimize the Ribbon"
+        Me.TabFormControl1.SystemText.QatAddItemText = "Add to Quick Access Toolbar"
+        Me.TabFormControl1.SystemText.QatCustomizeMenuLabel = "<b>Customize Quick Access Toolbar</b>"
+        Me.TabFormControl1.SystemText.QatCustomizeText = "Customize Quick Access Toolbar..."
+        Me.TabFormControl1.SystemText.QatDialogAddButton = "Add >>"
+        Me.TabFormControl1.SystemText.QatDialogCancelButton = "Cancel"
+        Me.TabFormControl1.SystemText.QatDialogCaption = "Customize Quick Access Toolbar"
+        Me.TabFormControl1.SystemText.QatDialogCategoriesLabel = "Choose commands from:"
+        Me.TabFormControl1.SystemText.QatDialogOkButton = "OK"
+        Me.TabFormControl1.SystemText.QatDialogPlacementCheckbox = "Place Quick Access Toolbar below the Ribbon"
+        Me.TabFormControl1.SystemText.QatDialogRemoveButton = "Remove"
+        Me.TabFormControl1.SystemText.QatPlaceAboveRibbonText = "Place Quick Access Toolbar above the Ribbon"
+        Me.TabFormControl1.SystemText.QatPlaceBelowRibbonText = "Place Quick Access Toolbar below the Ribbon"
+        Me.TabFormControl1.SystemText.QatRemoveItemText = "Remove from Quick Access Toolbar"
+        Me.TabFormControl1.TabIndex = 0
+        Me.TabFormControl1.TabStripFont = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+        Me.TabFormControl1.Text = "TabFormControl1"
+        '
+        'TabFormPanel1
+        '
+        Me.TabFormPanel1.Controls.Add(Me.Label1)
+        Me.TabFormPanel1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.TabFormPanel1.Location = New System.Drawing.Point(0, 28)
+        Me.TabFormPanel1.Name = "TabFormPanel1"
+        Me.TabFormPanel1.Padding = New System.Windows.Forms.Padding(3, 0, 3, 3)
+        Me.TabFormPanel1.Size = New System.Drawing.Size(444, 283)
+        '
+        '
+        '
+        Me.TabFormPanel1.Style.Class = "TabFormPanel"
+        Me.TabFormPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        '
+        '
+        '
+        Me.TabFormPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        '
+        '
+        '
+        Me.TabFormPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        Me.TabFormPanel1.TabIndex = 1
+        '
+        'TabFormPanel2
+        '
+        Me.TabFormPanel2.Controls.Add(Me.Label2)
+        Me.TabFormPanel2.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.TabFormPanel2.Location = New System.Drawing.Point(0, 28)
+        Me.TabFormPanel2.Name = "TabFormPanel2"
+        Me.TabFormPanel2.Padding = New System.Windows.Forms.Padding(3, 0, 3, 3)
+        Me.TabFormPanel2.Size = New System.Drawing.Size(444, 283)
+        '
+        '
+        '
+        Me.TabFormPanel2.Style.Class = "TabFormPanel"
+        Me.TabFormPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        '
+        '
+        '
+        Me.TabFormPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        '
+        '
+        '
+        Me.TabFormPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square
+        Me.TabFormPanel2.TabIndex = 2
+        Me.TabFormPanel2.Visible = false
+        '
+        'TabFormItem1
+        '
+        Me.TabFormItem1.Checked = true
+        Me.TabFormItem1.Name = "TabFormItem1"
+        Me.TabFormItem1.Panel = Me.TabFormPanel1
+        Me.TabFormItem1.Text = "Document 1"
+        '
+        'TabFormItem2
+        '
+        Me.TabFormItem2.Name = "TabFormItem2"
+        Me.TabFormItem2.Panel = Me.TabFormPanel2
+        Me.TabFormItem2.Text = "Document 2"
+        '
+        'Label1
+        '
+        Me.Label1.AutoSize = true
+        Me.Label1.BackColor = System.Drawing.Color.Transparent
+        Me.Label1.Location = New System.Drawing.Point(155, 127)
+        Me.Label1.Name = "Label1"
+        Me.Label1.Size = New System.Drawing.Size(101, 13)
+        Me.Label1.TabIndex = 0
+        Me.Label1.Text = "Your content here..."
+        '
+        'Label2
+        '
+        Me.Label2.AutoSize = true
+        Me.Label2.BackColor = System.Drawing.Color.Transparent
+        Me.Label2.Location = New System.Drawing.Point(172, 135)
+        Me.Label2.Name = "Label2"
+        Me.Label2.Size = New System.Drawing.Size(101, 13)
+        Me.Label2.TabIndex = 1
+        Me.Label2.Text = "Your content here..."
+        '
+        '$safeitemrootname$
+        '
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.ClientSize = New System.Drawing.Size(446, 313)
+        Me.Controls.Add(Me.TabFormControl1)
+        Me.Name = "$safeitemrootname$"
+        Me.Text = "DotNetBar Tabbed Form"
+        Me.TabFormControl1.ResumeLayout(false)
+        Me.TabFormControl1.PerformLayout
+        Me.TabFormPanel1.ResumeLayout(false)
+        Me.TabFormPanel1.PerformLayout
+        Me.TabFormPanel2.ResumeLayout(false)
+        Me.TabFormPanel2.PerformLayout
+        Me.ResumeLayout(false)
+
+    End Sub
+    Friend WithEvents TabFormControl1 As DevComponents.DotNetBar.Controls.TabFormControl
+    Friend WithEvents TabFormPanel1 As DevComponents.DotNetBar.Controls.TabFormPanel
+    Friend WithEvents TabFormPanel2 As DevComponents.DotNetBar.Controls.TabFormPanel
+    Friend WithEvents TabFormItem1 As DevComponents.DotNetBar.Controls.TabFormItem
+    Friend WithEvents TabFormItem2 As DevComponents.DotNetBar.Controls.TabFormItem
+    Friend WithEvents Label1 As System.Windows.Forms.Label
+    Friend WithEvents Label2 As System.Windows.Forms.Label
+
+End Class
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual Basic/TabbedForm/Form.resx b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual Basic/TabbedForm/Form.resx
new file mode 100644
index 00000000..19dc0dd8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual Basic/TabbedForm/Form.resx	
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual Basic/TabbedForm/Form.vb b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual Basic/TabbedForm/Form.vb
new file mode 100644
index 00000000..64eb4330
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual Basic/TabbedForm/Form.vb	
@@ -0,0 +1,3 @@
+Public Class $safeitemrootname$
+
+End Class
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual Basic/TabbedForm/TabbedForm.zip b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual Basic/TabbedForm/TabbedForm.zip
new file mode 100644
index 00000000..2b0df933
Binary files /dev/null and b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual Basic/TabbedForm/TabbedForm.zip differ
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual Basic/TabbedForm/tabbedform.vstemplate b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual Basic/TabbedForm/tabbedform.vstemplate
new file mode 100644
index 00000000..865bb1b6
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual Basic/TabbedForm/tabbedform.vstemplate	
@@ -0,0 +1,36 @@
+<VSTemplate Version="3.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name>Tabbed Form</Name>
+    <Description>DotNetBar Tabbed Form</Description>
+    <Icon Package="{164B10B9-B200-11D0-8C61-00A0C91E29D5}" ID="4527" />
+	<TemplateID>DevComponents.VB.TabbedForm</TemplateID>
+    <ProjectType>VisualBasic</ProjectType>
+    <SortOrder>12</SortOrder>
+    <DefaultName>Form.vb</DefaultName>
+	<RequiredFrameworkVersion>2.0</RequiredFrameworkVersion>
+    <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
+  </TemplateData>
+  <TemplateContent>
+        <References>
+            <Reference>
+                <Assembly>System</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+            <Reference>
+                <Assembly>System.Drawing</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+            <Reference>
+                <Assembly>System.Windows.Forms</Assembly>
+                <URL>http://www.microsoft.com</URL>
+            </Reference>
+			<Reference>
+                <Assembly>DevComponents.DotNetBar2</Assembly>
+                <URL>http://www.devcomponents.com</URL>
+            </Reference>
+        </References>
+
+    <ProjectItem ReplaceParameters="true" SubType="Form">Form.vb</ProjectItem>
+    <ProjectItem ReplaceParameters="true">Form.Designer.vb</ProjectItem>
+  </TemplateContent>
+</VSTemplate>
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual C#/MetroAppForm/Form.Designer.cs b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual C#/MetroAppForm/Form.Designer.cs
new file mode 100644
index 00000000..8d1bb1bc
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual C#/MetroAppForm/Form.Designer.cs	
@@ -0,0 +1,234 @@
+namespace $rootnamespace$
+{
+    partial class $safeitemrootname$
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form 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.metroShell1 = new DevComponents.DotNetBar.Metro.MetroShell();
+            this.metroTabItem1 = new DevComponents.DotNetBar.Metro.MetroTabItem();
+            this.metroTabPanel1 = new DevComponents.DotNetBar.Metro.MetroTabPanel();
+            this.metroTabItem2 = new DevComponents.DotNetBar.Metro.MetroTabItem();
+            this.metroTabPanel2 = new DevComponents.DotNetBar.Metro.MetroTabPanel();
+            this.styleManager1 = new DevComponents.DotNetBar.StyleManager(this.components);
+            this.qatCustomizeItem1 = new DevComponents.DotNetBar.QatCustomizeItem();
+            this.metroAppButton1 = new DevComponents.DotNetBar.Metro.MetroAppButton();
+            this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem();
+            this.metroStatusBar1 = new DevComponents.DotNetBar.Metro.MetroStatusBar();
+            this.labelItem1 = new DevComponents.DotNetBar.LabelItem();
+            this.metroShell1.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // metroShell1
+            // 
+            this.metroShell1.BackColor = System.Drawing.Color.White;
+            // 
+            // 
+            // 
+            this.metroShell1.BackgroundStyle.Class = "";
+            this.metroShell1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.metroShell1.CaptionVisible = true;
+            this.metroShell1.Controls.Add(this.metroTabPanel1);
+            this.metroShell1.Controls.Add(this.metroTabPanel2);
+            this.metroShell1.Dock = System.Windows.Forms.DockStyle.Top;
+            this.metroShell1.ForeColor = System.Drawing.Color.Black;
+            this.metroShell1.HelpButtonText = null;
+            this.metroShell1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+            this.metroAppButton1,
+            this.metroTabItem1,
+            this.metroTabItem2});
+            this.metroShell1.KeyTipsFont = new System.Drawing.Font("Tahoma", 7F);
+            this.metroShell1.Location = new System.Drawing.Point(0, 1);
+            this.metroShell1.Name = "metroShell1";
+            this.metroShell1.QuickToolbarItems.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+            this.buttonItem1,
+            this.qatCustomizeItem1});
+            this.metroShell1.Size = new System.Drawing.Size(624, 218);
+            this.metroShell1.SystemText.MaximizeRibbonText = "&Maximize the Ribbon";
+            this.metroShell1.SystemText.MinimizeRibbonText = "Mi&nimize the Ribbon";
+            this.metroShell1.SystemText.QatAddItemText = "&Add to Quick Access Toolbar";
+            this.metroShell1.SystemText.QatCustomizeMenuLabel = "<b>Customize Quick Access Toolbar</b>";
+            this.metroShell1.SystemText.QatCustomizeText = "&Customize Quick Access Toolbar...";
+            this.metroShell1.SystemText.QatDialogAddButton = "&Add >>";
+            this.metroShell1.SystemText.QatDialogCancelButton = "Cancel";
+            this.metroShell1.SystemText.QatDialogCaption = "Customize Quick Access Toolbar";
+            this.metroShell1.SystemText.QatDialogCategoriesLabel = "&Choose commands from:";
+            this.metroShell1.SystemText.QatDialogOkButton = "OK";
+            this.metroShell1.SystemText.QatDialogPlacementCheckbox = "&Place Quick Access Toolbar below the Ribbon";
+            this.metroShell1.SystemText.QatDialogRemoveButton = "&Remove";
+            this.metroShell1.SystemText.QatPlaceAboveRibbonText = "&Place Quick Access Toolbar above the Ribbon";
+            this.metroShell1.SystemText.QatPlaceBelowRibbonText = "&Place Quick Access Toolbar below the Ribbon";
+            this.metroShell1.SystemText.QatRemoveItemText = "&Remove from Quick Access Toolbar";
+            this.metroShell1.TabIndex = 0;
+            this.metroShell1.TabStripFont = new System.Drawing.Font("Segoe UI", 10.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.metroShell1.Text = "metroShell1";
+            // 
+            // metroTabItem1
+            // 
+            this.metroTabItem1.Checked = true;
+            this.metroTabItem1.Name = "metroTabItem1";
+            this.metroTabItem1.Panel = this.metroTabPanel1;
+            this.metroTabItem1.Text = "&HOME";
+            // 
+            // metroTabPanel1
+            // 
+            this.metroTabPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.metroTabPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.metroTabPanel1.Location = new System.Drawing.Point(0, 51);
+            this.metroTabPanel1.Name = "metroTabPanel1";
+            this.metroTabPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3);
+            this.metroTabPanel1.Size = new System.Drawing.Size(624, 167);
+            // 
+            // 
+            // 
+            this.metroTabPanel1.Style.Class = "";
+            this.metroTabPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.metroTabPanel1.StyleMouseDown.Class = "";
+            this.metroTabPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.metroTabPanel1.StyleMouseOver.Class = "";
+            this.metroTabPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.metroTabPanel1.TabIndex = 1;
+            // 
+            // metroTabItem2
+            // 
+            this.metroTabItem2.Name = "metroTabItem2";
+            this.metroTabItem2.Panel = this.metroTabPanel2;
+            this.metroTabItem2.Text = "&VIEW";
+            // 
+            // metroTabPanel2
+            // 
+            this.metroTabPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.metroTabPanel2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.metroTabPanel2.Location = new System.Drawing.Point(0, 0);
+            this.metroTabPanel2.Name = "metroTabPanel2";
+            this.metroTabPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3);
+            this.metroTabPanel2.Size = new System.Drawing.Size(200, 100);
+            // 
+            // 
+            // 
+            this.metroTabPanel2.Style.Class = "";
+            this.metroTabPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.metroTabPanel2.StyleMouseDown.Class = "";
+            this.metroTabPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.metroTabPanel2.StyleMouseOver.Class = "";
+            this.metroTabPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.metroTabPanel2.TabIndex = 2;
+            // 
+            // styleManager1
+            // 
+            this.styleManager1.ManagerStyle = DevComponents.DotNetBar.eStyle.Metro;
+            this.styleManager1.MetroColorParameters = new DevComponents.DotNetBar.Metro.ColorTables.MetroColorGeneratorParameters(System.Drawing.Color.White, System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(163)))), ((int)(((byte)(26))))));
+            // 
+            // qatCustomizeItem1
+            // 
+            this.qatCustomizeItem1.BeginGroup = true;
+            this.qatCustomizeItem1.Name = "qatCustomizeItem1";
+            // 
+            // metroAppButton1
+            // 
+            this.metroAppButton1.AutoExpandOnClick = true;
+            this.metroAppButton1.CanCustomize = false;
+            this.metroAppButton1.ImageFixedSize = new System.Drawing.Size(16, 16);
+            this.metroAppButton1.ImagePaddingHorizontal = 0;
+            this.metroAppButton1.ImagePaddingVertical = 0;
+            this.metroAppButton1.Name = "metroAppButton1";
+            this.metroAppButton1.ShowSubItems = false;
+            this.metroAppButton1.Text = "&File";
+            // 
+            // buttonItem1
+            // 
+            this.buttonItem1.Name = "buttonItem1";
+            this.buttonItem1.Text = "buttonItem1";
+            // 
+            // metroStatusBar1
+            // 
+            // 
+            // 
+            // 
+            this.metroStatusBar1.BackgroundStyle.Class = "";
+            this.metroStatusBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.metroStatusBar1.ContainerControlProcessDialogKey = true;
+            this.metroStatusBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.metroStatusBar1.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.metroStatusBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+            this.labelItem1});
+            this.metroStatusBar1.Location = new System.Drawing.Point(0, 374);
+            this.metroStatusBar1.Name = "metroStatusBar1";
+            this.metroStatusBar1.Size = new System.Drawing.Size(624, 21);
+            this.metroStatusBar1.TabIndex = 1;
+            this.metroStatusBar1.Text = "metroStatusBar1";
+            // 
+            // labelItem1
+            // 
+            this.labelItem1.Name = "labelItem1";
+            this.labelItem1.Text = "READY";
+            // 
+            // $safeitemrootname$
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(625, 396);
+            this.Controls.Add(this.metroStatusBar1);
+            this.Controls.Add(this.metroShell1);
+            this.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.Name = "$safeitemrootname$";
+            this.Text = "DotNetBar Metro App Form";
+            this.metroShell1.ResumeLayout(false);
+            this.metroShell1.PerformLayout();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private DevComponents.DotNetBar.Metro.MetroShell metroShell1;
+        private DevComponents.DotNetBar.Metro.MetroTabPanel metroTabPanel1;
+        private DevComponents.DotNetBar.Metro.MetroTabPanel metroTabPanel2;
+        private DevComponents.DotNetBar.Metro.MetroAppButton metroAppButton1;
+        private DevComponents.DotNetBar.Metro.MetroTabItem metroTabItem1;
+        private DevComponents.DotNetBar.Metro.MetroTabItem metroTabItem2;
+        private DevComponents.DotNetBar.ButtonItem buttonItem1;
+        private DevComponents.DotNetBar.QatCustomizeItem qatCustomizeItem1;
+        private DevComponents.DotNetBar.StyleManager styleManager1;
+        private DevComponents.DotNetBar.Metro.MetroStatusBar metroStatusBar1;
+        private DevComponents.DotNetBar.LabelItem labelItem1;
+
+    }
+}
+
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual C#/MetroAppForm/Form.cs b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual C#/MetroAppForm/Form.cs
new file mode 100644
index 00000000..ff2c3a9b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual C#/MetroAppForm/Form.cs	
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+
+namespace $rootnamespace$
+{
+    public partial class $safeitemrootname$ : DevComponents.DotNetBar.Metro.MetroAppForm
+    {
+        public $safeitemrootname$()
+        {
+            InitializeComponent();
+        }
+    }
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual C#/MetroAppForm/Form.resx b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual C#/MetroAppForm/Form.resx
new file mode 100644
index 00000000..c3d21cf2
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual C#/MetroAppForm/Form.resx	
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="styleManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual C#/MetroAppForm/MetroAppForm.zip b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual C#/MetroAppForm/MetroAppForm.zip
new file mode 100644
index 00000000..e72433e8
Binary files /dev/null and b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual C#/MetroAppForm/MetroAppForm.zip differ
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual C#/MetroAppForm/metroappform.vstemplate b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual C#/MetroAppForm/metroappform.vstemplate
new file mode 100644
index 00000000..ae758d3b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual C#/MetroAppForm/metroappform.vstemplate	
@@ -0,0 +1,38 @@
+<VSTemplate Version="3.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name>Metro App Form</Name>
+    <Description>DotNetBar Metro Application Form</Description>
+    <Icon Package="{FAE04EC1-301F-11d3-BF4B-00C04F79EFBC}" ID="4535" />
+	<TemplateID>DevComponents.CS.MetroAppForm</TemplateID>
+    <ProjectType>CSharp</ProjectType>
+    <SortOrder>41</SortOrder>
+    <DefaultName>Form.cs</DefaultName>
+	<RequiredFrameworkVersion>2.0</RequiredFrameworkVersion>
+    <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
+  </TemplateData>
+  <TemplateContent>
+		<References>
+			<Reference>
+				<Assembly>System</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Data</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Drawing</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Windows.Forms</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Xml</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>DevComponents.DotNetBar2</Assembly>
+			</Reference>
+		</References>
+
+    <ProjectItem ReplaceParameters="true" SubType="Form">Form.cs</ProjectItem>
+    <ProjectItem ReplaceParameters="true">Form.Designer.cs</ProjectItem>
+  </TemplateContent>
+</VSTemplate>
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual C#/MetroForm/MetroForm.zip b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual C#/MetroForm/MetroForm.zip
new file mode 100644
index 00000000..b98a2499
Binary files /dev/null and b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual C#/MetroForm/MetroForm.zip differ
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual C#/MetroForm/form.cs b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual C#/MetroForm/form.cs
new file mode 100644
index 00000000..11692b62
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual C#/MetroForm/form.cs	
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+using DevComponents.DotNetBar;
+
+namespace $rootnamespace$
+{
+	public partial class $safeitemrootname$: DevComponents.DotNetBar.Metro.MetroForm
+	{
+		public $safeitemrootname$()
+		{
+			InitializeComponent();
+		}
+	}
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual C#/MetroForm/form.designer.cs b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual C#/MetroForm/form.designer.cs
new file mode 100644
index 00000000..3a1a31d0
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual C#/MetroForm/form.designer.cs	
@@ -0,0 +1,42 @@
+namespace $rootnamespace$
+{
+	partial class $safeitemrootname$
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if (disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form 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.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(625, 396);
+            this.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.Name = "$safeitemrootname$";
+			this.Text = "MetroForm";
+		}
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual C#/MetroForm/metroform.vstemplate b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual C#/MetroForm/metroform.vstemplate
new file mode 100644
index 00000000..3961f06f
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual C#/MetroForm/metroform.vstemplate	
@@ -0,0 +1,38 @@
+<VSTemplate Version="3.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name>Metro Form</Name>
+    <Description>DotNetBar Metro Form</Description>
+    <Icon Package="{FAE04EC1-301F-11d3-BF4B-00C04F79EFBC}" ID="4535" />
+	<TemplateID>DevComponents.CS.MetroForm</TemplateID>
+    <ProjectType>CSharp</ProjectType>
+    <SortOrder>41</SortOrder>
+    <DefaultName>Form.cs</DefaultName>
+	<RequiredFrameworkVersion>2.0</RequiredFrameworkVersion>
+    <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
+  </TemplateData>
+  <TemplateContent>
+		<References>
+			<Reference>
+				<Assembly>System</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Data</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Drawing</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Windows.Forms</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Xml</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>DevComponents.DotNetBar2</Assembly>
+			</Reference>
+		</References>
+
+    <ProjectItem ReplaceParameters="true" SubType="Form">Form.cs</ProjectItem>
+    <ProjectItem ReplaceParameters="true">Form.Designer.cs</ProjectItem>
+  </TemplateContent>
+</VSTemplate>
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual C#/Office2007Form/DotNetBarOffice2007Form.zip b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual C#/Office2007Form/DotNetBarOffice2007Form.zip
new file mode 100644
index 00000000..e5924f7c
Binary files /dev/null and b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual C#/Office2007Form/DotNetBarOffice2007Form.zip differ
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual C#/Office2007Form/form.cs b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual C#/Office2007Form/form.cs
new file mode 100644
index 00000000..8e61cb27
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual C#/Office2007Form/form.cs	
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+using DevComponents.DotNetBar;
+
+namespace $rootnamespace$
+{
+	public partial class $safeitemrootname$: DevComponents.DotNetBar.OfficeForm
+	{
+		public $safeitemrootname$()
+		{
+			InitializeComponent();
+		}
+	}
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual C#/Office2007Form/form.designer.cs b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual C#/Office2007Form/form.designer.cs
new file mode 100644
index 00000000..6bc0536d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual C#/Office2007Form/form.designer.cs	
@@ -0,0 +1,37 @@
+namespace $rootnamespace$
+{
+	partial class $safeitemrootname$
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if (disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form 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.Text = "$safeitemrootname$";
+		}
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual C#/Office2007Form/office2007form.vstemplate b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual C#/Office2007Form/office2007form.vstemplate
new file mode 100644
index 00000000..f2bf2593
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual C#/Office2007Form/office2007form.vstemplate	
@@ -0,0 +1,38 @@
+<VSTemplate Version="3.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name>Office Form</Name>
+    <Description>DotNetBar Office Style Form</Description>
+    <Icon Package="{FAE04EC1-301F-11d3-BF4B-00C04F79EFBC}" ID="4535" />
+	<TemplateID>DevComponents.CS.Office2007Form</TemplateID>
+    <ProjectType>CSharp</ProjectType>
+    <SortOrder>41</SortOrder>
+    <DefaultName>Form.cs</DefaultName>
+	<RequiredFrameworkVersion>2.0</RequiredFrameworkVersion>
+    <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
+  </TemplateData>
+  <TemplateContent>
+		<References>
+			<Reference>
+				<Assembly>System</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Data</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Drawing</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Windows.Forms</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Xml</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>DevComponents.DotNetBar2</Assembly>
+			</Reference>
+		</References>
+
+    <ProjectItem ReplaceParameters="true" SubType="Form">Form.cs</ProjectItem>
+    <ProjectItem ReplaceParameters="true">Form.Designer.cs</ProjectItem>
+  </TemplateContent>
+</VSTemplate>
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual C#/RibbonForm/DotNetBarRibbonForm.zip b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual C#/RibbonForm/DotNetBarRibbonForm.zip
new file mode 100644
index 00000000..33693820
Binary files /dev/null and b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual C#/RibbonForm/DotNetBarRibbonForm.zip differ
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual C#/RibbonForm/form.cs b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual C#/RibbonForm/form.cs
new file mode 100644
index 00000000..bfd40b47
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual C#/RibbonForm/form.cs	
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+using DevComponents.DotNetBar;
+
+namespace $rootnamespace$
+{
+	public partial class $safeitemrootname$: DevComponents.DotNetBar.RibbonForm
+	{
+		public $safeitemrootname$()
+		{
+			InitializeComponent();
+		}
+	}
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual C#/RibbonForm/form.designer.cs b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual C#/RibbonForm/form.designer.cs
new file mode 100644
index 00000000..6bc0536d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual C#/RibbonForm/form.designer.cs	
@@ -0,0 +1,37 @@
+namespace $rootnamespace$
+{
+	partial class $safeitemrootname$
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if (disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form 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.Text = "$safeitemrootname$";
+		}
+
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual C#/RibbonForm/ribbonform.vstemplate b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual C#/RibbonForm/ribbonform.vstemplate
new file mode 100644
index 00000000..a0273570
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual C#/RibbonForm/ribbonform.vstemplate	
@@ -0,0 +1,38 @@
+<VSTemplate Version="3.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name>Ribbon Form</Name>
+    <Description>DotNetBar Ribbon Form</Description>
+    <Icon Package="{FAE04EC1-301F-11d3-BF4B-00C04F79EFBC}" ID="4535" />
+	<TemplateID>DevComponents.CS.RibbonForm</TemplateID>
+    <ProjectType>CSharp</ProjectType>
+    <SortOrder>41</SortOrder>
+	<RequiredFrameworkVersion>2.0</RequiredFrameworkVersion>
+    <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
+    <DefaultName>RibbonForm.cs</DefaultName>
+  </TemplateData>
+  <TemplateContent>
+		<References>
+			<Reference>
+				<Assembly>System</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Data</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Drawing</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Windows.Forms</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Xml</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>DevComponents.DotNetBar2</Assembly>
+			</Reference>
+		</References>
+
+    <ProjectItem ReplaceParameters="true" SubType="Form">Form.cs</ProjectItem>
+    <ProjectItem ReplaceParameters="true">Form.Designer.cs</ProjectItem>
+  </TemplateContent>
+</VSTemplate>
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual C#/TabbedForm/Form.Designer.cs b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual C#/TabbedForm/Form.Designer.cs
new file mode 100644
index 00000000..6a057d83
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual C#/TabbedForm/Form.Designer.cs	
@@ -0,0 +1,175 @@
+namespace $rootnamespace$
+{
+    partial class $safeitemrootname$
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form 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.tabFormControl1 = new DevComponents.DotNetBar.Controls.TabFormControl();
+            this.tabFormPanel1 = new DevComponents.DotNetBar.Controls.TabFormPanel();
+            this.tabFormPanel2 = new DevComponents.DotNetBar.Controls.TabFormPanel();
+            this.tabFormItem1 = new DevComponents.DotNetBar.Controls.TabFormItem();
+            this.tabFormItem2 = new DevComponents.DotNetBar.Controls.TabFormItem();
+            this.label1 = new System.Windows.Forms.Label();
+            this.label2 = new System.Windows.Forms.Label();
+            this.tabFormControl1.SuspendLayout();
+            this.tabFormPanel1.SuspendLayout();
+            this.tabFormPanel2.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // tabFormControl1
+            // 
+            this.tabFormControl1.BackColor = System.Drawing.Color.White;
+            // 
+            // 
+            // 
+            this.tabFormControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.tabFormControl1.Controls.Add(this.tabFormPanel1);
+            this.tabFormControl1.Controls.Add(this.tabFormPanel2);
+            this.tabFormControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tabFormControl1.ForeColor = System.Drawing.Color.Black;
+            this.tabFormControl1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+            this.tabFormItem1,
+            this.tabFormItem2});
+            this.tabFormControl1.Location = new System.Drawing.Point(1, 1);
+            this.tabFormControl1.Name = "tabFormControl1";
+            this.tabFormControl1.Size = new System.Drawing.Size(614, 412);
+            this.tabFormControl1.TabIndex = 0;
+            this.tabFormControl1.TabStripFont = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.tabFormControl1.Text = "tabFormControl1";
+            // 
+            // tabFormPanel1
+            // 
+            this.tabFormPanel1.Controls.Add(this.label1);
+            this.tabFormPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tabFormPanel1.Location = new System.Drawing.Point(0, 28);
+            this.tabFormPanel1.Name = "tabFormPanel1";
+            this.tabFormPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3);
+            this.tabFormPanel1.Size = new System.Drawing.Size(614, 384);
+            // 
+            // 
+            // 
+            this.tabFormPanel1.Style.Class = "TabFormPanel";
+            this.tabFormPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.tabFormPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.tabFormPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.tabFormPanel1.TabIndex = 1;
+            // 
+            // tabFormPanel2
+            // 
+            this.tabFormPanel2.Controls.Add(this.label2);
+            this.tabFormPanel2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tabFormPanel2.Location = new System.Drawing.Point(0, 28);
+            this.tabFormPanel2.Name = "tabFormPanel2";
+            this.tabFormPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3);
+            this.tabFormPanel2.Size = new System.Drawing.Size(614, 384);
+            // 
+            // 
+            // 
+            this.tabFormPanel2.Style.Class = "TabFormPanel";
+            this.tabFormPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.tabFormPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.tabFormPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.tabFormPanel2.TabIndex = 2;
+            this.tabFormPanel2.Visible = false;
+            // 
+            // tabFormItem1
+            // 
+            this.tabFormItem1.Checked = true;
+            this.tabFormItem1.Name = "tabFormItem1";
+            this.tabFormItem1.Panel = this.tabFormPanel1;
+            this.tabFormItem1.Text = "Document 1";
+            // 
+            // tabFormItem2
+            // 
+            this.tabFormItem2.Name = "tabFormItem2";
+            this.tabFormItem2.Panel = this.tabFormPanel2;
+            this.tabFormItem2.Text = "Document 2";
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.BackColor = System.Drawing.Color.Transparent;
+            this.label1.Location = new System.Drawing.Point(241, 175);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(101, 13);
+            this.label1.TabIndex = 0;
+            this.label1.Text = "Your content here...";
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.BackColor = System.Drawing.Color.Transparent;
+            this.label2.Location = new System.Drawing.Point(257, 186);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(101, 13);
+            this.label2.TabIndex = 1;
+            this.label2.Text = "Your content here...";
+            // 
+            // $safeitemrootname$
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(616, 414);
+            this.Controls.Add(this.tabFormControl1);
+            this.ForeColor = System.Drawing.Color.Black;
+            this.Name = "$safeitemrootname$";
+            this.Text = "DotNetBar Tabbed App Form";
+            this.tabFormControl1.ResumeLayout(false);
+            this.tabFormControl1.PerformLayout();
+            this.tabFormPanel1.ResumeLayout(false);
+            this.tabFormPanel1.PerformLayout();
+            this.tabFormPanel2.ResumeLayout(false);
+            this.tabFormPanel2.PerformLayout();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private DevComponents.DotNetBar.Controls.TabFormControl tabFormControl1;
+        private DevComponents.DotNetBar.Controls.TabFormPanel tabFormPanel1;
+        private DevComponents.DotNetBar.Controls.TabFormPanel tabFormPanel2;
+        private DevComponents.DotNetBar.Controls.TabFormItem tabFormItem1;
+        private DevComponents.DotNetBar.Controls.TabFormItem tabFormItem2;
+		private System.Windows.Forms.Label label1;
+		private System.Windows.Forms.Label label2;
+
+    }
+}
+
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual C#/TabbedForm/Form.cs b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual C#/TabbedForm/Form.cs
new file mode 100644
index 00000000..47530f09
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual C#/TabbedForm/Form.cs	
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+
+namespace $rootnamespace$
+{
+    public partial class $safeitemrootname$ : DevComponents.DotNetBar.Controls.TabParentForm
+    {
+        public $safeitemrootname$()
+        {
+            InitializeComponent();
+        }
+    }
+}
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual C#/TabbedForm/Form.resx b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual C#/TabbedForm/Form.resx
new file mode 100644
index 00000000..19dc0dd8
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual C#/TabbedForm/Form.resx	
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual C#/TabbedForm/TabbedForm.zip b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual C#/TabbedForm/TabbedForm.zip
new file mode 100644
index 00000000..7cd94f8b
Binary files /dev/null and b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual C#/TabbedForm/TabbedForm.zip differ
diff --git a/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual C#/TabbedForm/tabbedform.vstemplate b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual C#/TabbedForm/tabbedform.vstemplate
new file mode 100644
index 00000000..c22546e3
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VSItemTemplates/VS.NET 2017/Visual C#/TabbedForm/tabbedform.vstemplate	
@@ -0,0 +1,38 @@
+<VSTemplate Version="3.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name>Tabbed Form</Name>
+    <Description>DotNetBar Tabbed Form</Description>
+    <Icon Package="{FAE04EC1-301F-11d3-BF4B-00C04F79EFBC}" ID="4535" />
+	<TemplateID>DevComponents.CS.TabbedForm</TemplateID>
+    <ProjectType>CSharp</ProjectType>
+    <SortOrder>41</SortOrder>
+    <DefaultName>Form.cs</DefaultName>
+	<RequiredFrameworkVersion>2.0</RequiredFrameworkVersion>
+    <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
+  </TemplateData>
+  <TemplateContent>
+		<References>
+			<Reference>
+				<Assembly>System</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Data</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Drawing</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Windows.Forms</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>System.Xml</Assembly>
+			</Reference>
+			<Reference>
+				<Assembly>DevComponents.DotNetBar2</Assembly>
+			</Reference>
+		</References>
+
+    <ProjectItem ReplaceParameters="true" SubType="Form">Form.cs</ProjectItem>
+    <ProjectItem ReplaceParameters="true">Form.Designer.cs</ProjectItem>
+  </TemplateContent>
+</VSTemplate>
diff --git a/PROMS/DotNetBar Source Code/Validator/CompareValidator.cs b/PROMS/DotNetBar Source Code/Validator/CompareValidator.cs
new file mode 100644
index 00000000..ab4c71bd
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Validator/CompareValidator.cs	
@@ -0,0 +1,366 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows.Forms;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar.Validator
+{
+    /// <summary>
+    /// Represents compare validator for SuperValidator control used to compare two input fields or input fields to specified value.
+    /// </summary>
+    public class CompareValidator : ValidatorBase
+    {
+        #region Constructors
+        /// <summary>
+        /// Initializes a new instance of the RequiredFieldValidator class.
+        /// </summary>
+        public CompareValidator()
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the RequiredFieldValidator class.
+        /// </summary>
+        public CompareValidator(string errorMessage)
+        {
+            this.ErrorMessage = errorMessage;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the RequiredFieldValidator class.
+        /// </summary>
+        public CompareValidator(string errorMessage, string optionalValidationGroup)
+        {
+            this.ErrorMessage = errorMessage;
+            this.OptionalValidationGroup = optionalValidationGroup;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the RequiredFieldValidator class.
+        /// </summary>
+        public CompareValidator(string errorMessage, string optionalValidationGroup, Control controlToCompare, eValidationCompareOperator compareOperator)
+        {
+            this.ErrorMessage = errorMessage;
+            this.OptionalValidationGroup = optionalValidationGroup;
+            this.ControlToCompare = controlToCompare;
+            this.Operator = compareOperator;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the RequiredFieldValidator class.
+        /// </summary>
+        public CompareValidator(string errorMessage, Control controlToCompare, eValidationCompareOperator compareOperator)
+        {
+            this.ErrorMessage = errorMessage;
+            this.ControlToCompare = controlToCompare;
+            this.Operator = compareOperator;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the RequiredFieldValidator class.
+        /// </summary>
+        public CompareValidator(string errorMessage, string optionalValidationGroup, object valueToCompare, eValidationCompareOperator compareOperator)
+        {
+            this.ErrorMessage = errorMessage;
+            this.OptionalValidationGroup = optionalValidationGroup;
+            this.ValueToCompare = valueToCompare;
+            this.Operator = compareOperator;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the RequiredFieldValidator class.
+        /// </summary>
+        public CompareValidator(string errorMessage, object valueToCompare, eValidationCompareOperator compareOperator)
+        {
+            this.ErrorMessage = errorMessage;
+            this.ValueToCompare = valueToCompare;
+            this.Operator = compareOperator;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the RequiredFieldValidator class.
+        /// </summary>
+        public CompareValidator(string errorMessage, string optionalValidationGroup, Control controlToCompare, object valueToCompare, eValidationCompareOperator compareOperator)
+        {
+            this.ErrorMessage = errorMessage;
+            this.OptionalValidationGroup = optionalValidationGroup;
+            this.ControlToCompare = controlToCompare;
+            this.Operator = compareOperator;
+            this.ValueToCompare = valueToCompare;
+        }
+        #endregion
+
+        #region Implementation
+        public override bool Validate(System.Windows.Forms.Control input)
+        {
+            object leftValue = GetControlValue(input);
+            object rightValue = null;
+            if (_ControlToCompare != null)
+                rightValue = GetControlValue(_ControlToCompare);
+            else
+                rightValue = _ValueToCompare;
+
+            this.LastValidationResult = Compare(leftValue, rightValue, _Operator);
+            return LastValidationResult;
+        }
+
+        private Control _ControlToCompare = null;
+        /// <summary>
+        /// Gets or sets the control to compare validated control to.
+        /// </summary>
+        [DefaultValue(null), Category("Behavior"), Description("Indicates control to compare validated control to.")]
+        public Control ControlToCompare
+        {
+            get { return _ControlToCompare; }
+            set { _ControlToCompare = value; }
+        }
+
+        private string _ControlToCompareValuePropertyName="";
+        /// <summary>
+        /// Gets or sets the Value property name for the ControlToCompare control.
+        /// </summary>
+        [DefaultValue(""), Category("Behavior"), Description("Indicates Value property name for the ControlToCompare control.")]
+        public string ControlToCompareValuePropertyName
+        {
+            get { return _ControlToCompareValuePropertyName; }
+            set
+            {
+                _ControlToCompareValuePropertyName = value;
+            }
+        }
+        
+
+        private object _ValueToCompare;
+        /// <summary>
+        /// Gets or sets the value to compare to the validation control.
+        /// </summary>
+        [DefaultValue((string)null), Category("Behavior"), Description("Indicates value to compare to the validation control."), TypeConverter(typeof(StringConverter))]
+        public object ValueToCompare
+        {
+            get { return _ValueToCompare; }
+            set { _ValueToCompare = value; }
+        }
+
+        private eValidationCompareOperator _Operator = eValidationCompareOperator.Equal;
+        /// <summary>
+        /// Gets or sets the operator used for comparison.
+        /// </summary>
+        [DefaultValue(eValidationCompareOperator.Equal), Category("Behavior"), Description("Indicates operator used for comparison")]
+        public eValidationCompareOperator Operator
+        {
+            get { return _Operator; }
+            set { _Operator = value; }
+        }
+
+        internal static bool Compare(object leftValue, object rightValue, eValidationCompareOperator compareOperator)
+        {
+            if (compareOperator == eValidationCompareOperator.DataTypeCheck)
+            {
+                if (leftValue != null && rightValue != null)
+                    return leftValue.GetType().Equals(rightValue.GetType());
+                else
+                    return leftValue == rightValue;
+            }
+            if (leftValue == null && rightValue == null) return true;
+            if (leftValue == null || rightValue == null) return false;
+
+            if (!leftValue.GetType().Equals(rightValue.GetType()) && rightValue is string)
+            {
+                object temp = null;
+                if (ConvertRightToLeftType(leftValue, rightValue, out temp))
+                    rightValue = temp;
+            }
+
+            if (!leftValue.GetType().Equals(rightValue.GetType()))
+                return false;
+
+            int compareResult = 0;
+
+            if (leftValue is string)
+                compareResult = ((string)leftValue).CompareTo(rightValue);
+            else if (leftValue is int)
+                compareResult = ((int)leftValue).CompareTo(rightValue);
+            else if (leftValue is double)
+                compareResult = ((double)leftValue).CompareTo(rightValue);
+            else if (leftValue is long)
+                compareResult = ((long)leftValue).CompareTo(rightValue);
+            else if (leftValue is DateTime)
+                compareResult = ((DateTime)leftValue).CompareTo(rightValue);
+            else if (leftValue is decimal)
+                compareResult = ((decimal)leftValue).CompareTo(rightValue);
+            else if (leftValue is Single)
+                compareResult = ((Single)leftValue).CompareTo(rightValue);
+            else if (leftValue is bool)
+                compareResult = ((bool)leftValue).CompareTo(rightValue);
+            else if (leftValue is TimeSpan)
+                compareResult = ((TimeSpan)leftValue).CompareTo(rightValue);
+            else if (leftValue is byte)
+                compareResult = ((byte)leftValue).CompareTo(rightValue);
+            else if (leftValue is char)
+                compareResult = ((char)leftValue).CompareTo(rightValue);
+            else if (leftValue is Guid)
+                compareResult = ((Guid)leftValue).CompareTo(rightValue);
+            else
+                return true;
+
+            switch (compareOperator)
+            {
+                case eValidationCompareOperator.Equal:
+                    return (compareResult == 0);
+
+                case eValidationCompareOperator.NotEqual:
+                    return (compareResult != 0);
+
+                case eValidationCompareOperator.GreaterThan:
+                    return (compareResult > 0);
+
+                case eValidationCompareOperator.GreaterThanEqual:
+                    return (compareResult >= 0);
+
+                case eValidationCompareOperator.LessThan:
+                    return (compareResult < 0);
+
+                case eValidationCompareOperator.LessThanEqual:
+                    return (compareResult <= 0);
+            }
+            return true;
+        }
+
+        internal static bool ConvertRightToLeftType(object leftValue, object rightValue, out object temp)
+        {
+            temp = null;
+            if (rightValue == null || leftValue == null || !(rightValue is string)) return false;
+            if (rightValue.GetType().Equals(leftValue.GetType()))
+            {
+                temp = rightValue;
+                return true;
+            }
+
+            Type type = leftValue.GetType();
+            string right = (string)rightValue;
+            
+            if (type == typeof(int))
+            {
+                int result=0;
+                if (int.TryParse(right, out result))
+                {
+                    temp = result;
+                    return true;
+                }
+            }
+            else if (type == typeof(long))
+            {
+                long result = 0;
+                if (long.TryParse(right, out result))
+                {
+                    temp = result;
+                    return true;
+                }
+            }
+            else if (type == typeof(double))
+            {
+                double result = 0;
+                if (double.TryParse(right, out result))
+                {
+                    temp = result;
+                    return true;
+                }
+            }
+            else if (type == typeof(Single))
+            {
+                Single result = 0;
+                if (Single.TryParse(right, out result))
+                {
+                    temp = result;
+                    return true;
+                }
+            }
+            else if (type == typeof(DateTime))
+            {
+                DateTime result;
+                if (DateTime.TryParse(right, out result))
+                {
+                    temp = result;
+                    return true;
+                }
+            }
+            else if (type == typeof(TimeSpan))
+            {
+                TimeSpan result;
+                if (TimeSpan.TryParse(right, out result))
+                {
+                    temp = result;
+                    return true;
+                }
+            }
+            else if (type == typeof(bool))
+            {
+                bool result;
+                if (bool.TryParse(right, out result))
+                {
+                    temp = result;
+                    return true;
+                }
+            }
+            else if (type == typeof(byte))
+            {
+                byte result;
+                if (byte.TryParse(right, out result))
+                {
+                    temp = result;
+                    return true;
+                }
+            }
+            else if (type == typeof(char))
+            {
+                char result;
+                if (char.TryParse(right, out result))
+                {
+                    temp = result;
+                    return true;
+                }
+            }
+            
+
+            return false;
+        }
+        #endregion
+    }
+    /// <summary>
+    /// Specifies the validation comparison operators used by the CompareValidator.
+    /// </summary>
+    public enum eValidationCompareOperator
+    {
+        /// <summary>
+        /// A comparison for equality.
+        /// </summary>
+        Equal,
+        /// <summary>
+        /// A comparison for inequality.
+        /// </summary>
+        NotEqual,
+        /// <summary>
+        /// A comparison for greater than.
+        /// </summary>
+        GreaterThan,
+        /// <summary>
+        /// A comparison for greater than or equal to.
+        /// </summary>
+        GreaterThanEqual,
+        /// <summary>
+        /// A comparison for less than.
+        /// </summary>
+        LessThan,
+        /// <summary>
+        /// A comparison for less than or equal to.
+        /// </summary>
+        LessThanEqual,
+        /// <summary>
+        /// A comparison for data type only.
+        /// </summary>
+        DataTypeCheck
+    }
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/Validator/CustomValidator.cs b/PROMS/DotNetBar Source Code/Validator/CustomValidator.cs
new file mode 100644
index 00000000..6acf410a
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Validator/CustomValidator.cs	
@@ -0,0 +1,83 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows.Forms;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar.Validator
+{
+    public class CustomValidator : ValidatorBase
+    {
+        #region Events
+        public event ValidateValueEventHandler ValidateValue;
+        #endregion
+
+        #region Constructors
+        /// <summary>
+        /// Initializes a new instance of the CustomValidator class.
+        /// </summary>
+        public CustomValidator()
+        {
+        }
+        #endregion
+
+        #region Implementation
+        public override bool Validate(System.Windows.Forms.Control input)
+        {
+            ValidateValueEventArgs e = new ValidateValueEventArgs(input);
+            OnValidateValue(e);
+
+            if (this.SuperValidator != null)
+                this.SuperValidator.InvokeCustomValidatorValidateValue(this, e);
+
+            this.LastValidationResult = e.IsValid;
+            return LastValidationResult;
+        }
+        protected virtual void OnValidateValue(ValidateValueEventArgs e)
+        {
+            ValidateValueEventHandler h = ValidateValue;
+            if (h != null) h(this, e);
+        }
+
+        private object _Tag;
+        /// <summary>
+        /// Gets or sets custom data associated with the validator
+        /// </summary>
+        [DefaultValue((string)null), Localizable(false), TypeConverter(typeof(StringConverter)), Category("Data"), Description("Custom data associated with the validator")]
+        public object Tag
+        {
+            get { return _Tag; }
+            set { _Tag = value; }
+        }
+        #endregion
+    }
+    /// <summary>
+    /// Defines delegate for CustomValidator ValidateValue event.
+    /// </summary>
+    /// <param name="sender">Sender</param>
+    /// <param name="e">Event arguments</param>
+    public delegate void ValidateValueEventHandler(object sender, ValidateValueEventArgs e);
+
+    public class ValidateValueEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets the reference to the control to validate.
+        /// </summary>
+        public readonly Control ControlToValidate;
+        /// <summary>
+        /// Gets or sets whether control's value is valid.
+        /// </summary>
+        public bool IsValid = false;
+
+        /// <summary>
+        /// Initializes a new instance of the ValidateValueEventArgs class.
+        /// </summary>
+        /// <param name="controlToValidate">Control to validate.</param>
+        public ValidateValueEventArgs(Control controlToValidate)
+        {
+            ControlToValidate = controlToValidate;
+        }
+    }
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/Validator/ErrorProviderWrapper.cs b/PROMS/DotNetBar Source Code/Validator/ErrorProviderWrapper.cs
new file mode 100644
index 00000000..0e2a6460
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Validator/ErrorProviderWrapper.cs	
@@ -0,0 +1,65 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Validator
+{
+    internal class ErrorProviderWrapper : IErrorProvider
+    {
+        #region Constructors
+        private ErrorProvider _ErrorProvider = null;
+
+        /// <summary>
+        /// Initializes a new instance of the ErrorProviderWrapper class.
+        /// </summary>
+        /// <param name="errorProvider"></param>
+        public ErrorProviderWrapper(ErrorProvider errorProvider)
+        {
+            _ErrorProvider = errorProvider;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the ErrorProviderWrapper class.
+        /// </summary>
+        /// <param name="errorProvider"></param>
+        /// <param name="iconPadding"></param>
+        public ErrorProviderWrapper(ErrorProvider errorProvider, int iconPadding)
+        {
+            _ErrorProvider = errorProvider;
+            _IconPadding = iconPadding;
+        }
+
+        private int _IconPadding = 0;
+        public int IconPadding
+        {
+            get { return _IconPadding; }
+            set
+            {
+                _IconPadding = value;
+            }
+        }
+        #endregion
+
+
+
+        #region IErrorProvider Members
+        public void SetError(Control control, string value)
+        {
+            _ErrorProvider.SetError(control, value);
+            if (_IconPadding != 0)
+                _ErrorProvider.SetIconPadding(control, _IconPadding);
+        }
+       
+        public void ClearError(Control control)
+        {
+            _ErrorProvider.SetError(control, null);
+            if (_IconPadding != 0)
+                _ErrorProvider.SetIconPadding(control, 0);
+        }
+
+        #endregion
+    }
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/Validator/HighlightPanel.cs b/PROMS/DotNetBar Source Code/Validator/HighlightPanel.cs
new file mode 100644
index 00000000..b4294009
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Validator/HighlightPanel.cs	
@@ -0,0 +1,288 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows.Forms;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Validator
+{
+    internal class HighlightPanel : Control
+    {
+        #region Private Variables
+        private Dictionary<Control, eHighlightColor> _Highlights = null;
+        private List<HighlightRegion> _HighlightRegions = new List<HighlightRegion>();
+        #endregion
+
+        #region Constructor
+        /// <summary>
+        /// Initializes a new instance of the HighlightPanel class.
+        /// </summary>
+        /// <param name="highlights"></param>
+        public HighlightPanel(Dictionary<Control, eHighlightColor> highlights)
+        {
+            _Highlights = highlights;
+
+            this.SetStyle(ControlStyles.UserPaint, true);
+            this.SetStyle(ControlStyles.AllPaintingInWmPaint, true);
+            this.SetStyle(ControlStyles.Opaque, true);
+            this.SetStyle(ControlStyles.ResizeRedraw, true);
+            this.SetStyle(DisplayHelp.DoubleBufferFlag, true);
+            this.SetStyle(ControlStyles.Selectable, false);
+            //this.SetStyle(ControlStyles.SupportsTransparentBackColor, true);
+        }
+        #endregion
+
+        #region Implementation
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            Graphics g = e.Graphics;
+            g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.AntiAlias;
+
+            //g.FillRectangle(Brushes.Yellow, this.ClientRectangle);
+            //return;
+
+            foreach (HighlightRegion highlightRegion in _HighlightRegions)
+            {
+                Color[] colors = GetHighlightColors(highlightRegion.HighlightColor);
+                Rectangle r = highlightRegion.Bounds;
+                Color back = highlightRegion.BackColor;
+
+                r.Inflate(1, 1);
+                DisplayHelp.FillRectangle(g, r, back);
+                r.Inflate(-1, -1);
+
+                DisplayHelp.FillRoundedRectangle(g, r, 2, colors[0]);
+                r.Inflate(-2, -2);
+                DisplayHelp.DrawRectangle(g, colors[2], r);
+                r.Inflate(1, 1);
+                DisplayHelp.DrawRoundedRectangle(g, colors[1], r, 2);
+            }
+
+            base.OnPaint(e);
+        }
+
+        private Color[] GetHighlightColors(eHighlightColor color)
+        {
+            Color[] colors = new Color[3];
+            if (color == eHighlightColor.Blue)
+            {
+                colors[0] = ColorScheme.GetColor(172, 0x6A9CD4);
+                colors[1] = ColorScheme.GetColor(0x6A9CD4);
+                colors[2] = ColorScheme.GetColor(0x5D7EA4);
+            }
+            else if (color == eHighlightColor.Orange)
+            {
+                colors[0] = ColorScheme.GetColor(172, 0xFF9C00);
+                colors[1] = ColorScheme.GetColor(0xFF9C00);
+                colors[2] = ColorScheme.GetColor(0xCC6600);
+            }
+            else if (color == eHighlightColor.Green)
+            {
+                colors[0] = ColorScheme.GetColor(172, 0x71B171);
+                colors[1] = ColorScheme.GetColor(0x71B171);
+                colors[2] = ColorScheme.GetColor(0x339933);
+            }
+            else if (color == eHighlightColor.Custom)
+            {
+                if (_CustomHighlightColors == null || _CustomHighlightColors.Length < 3)
+                {
+                    colors[0] = Color.Red;
+                    colors[1] = Color.Red;
+                    colors[2] = Color.Red;
+                }
+                else
+                {
+                    colors[0] = _CustomHighlightColors[0];
+                    colors[1] = _CustomHighlightColors[1];
+                    colors[2] = _CustomHighlightColors[2];
+                }
+            }
+            else
+            {
+                colors[0] = ColorScheme.GetColor(172, 0xC63030);
+                colors[1] = ColorScheme.GetColor(0xC63030);
+                colors[2] = ColorScheme.GetColor(0x990000);
+            }
+            return colors;
+        }
+
+        protected override void OnVisibleChanged(EventArgs e)
+        {
+            if (this.Visible && !_UpdatingRegion) UpdateRegion();
+            base.OnVisibleChanged(e);
+        }
+
+        protected override void OnHandleCreated(EventArgs e)
+        {
+            if (!_RegionInitialized) UpdateRegion();
+            base.OnHandleCreated(e);
+        }
+        private bool _RegionInitialized = false;
+        private bool _UpdatingRegion = false;
+        internal void UpdateRegion()
+        {
+            if (_UpdatingRegion || !this.IsHandleCreated) return;
+
+            try
+            {
+                _UpdatingRegion = true;
+                this.Region = null;
+                _HighlightRegions.Clear();
+                if (_Highlights == null) return;
+                if (_Highlights.Count == 0 && _FocusHighlightControl == null)
+                {
+                    this.Visible = false;
+                    return;
+                }
+
+                bool processFocusControl = true;
+                Region region = null;
+                foreach (KeyValuePair<Control, eHighlightColor> item in _Highlights)
+                {
+                    if (item.Value == eHighlightColor.None || !GetIsVisible(item.Key)) continue;
+                    if (item.Key == _FocusHighlightControl) processFocusControl = false;
+
+                    Rectangle r = GetControlRect(item.Key);
+                    if (r.IsEmpty) continue;
+                    r.Inflate(2, 2);
+                    _HighlightRegions.Add(new HighlightRegion(r, GetBackColor(item.Key.Parent), item.Value));
+                    if (region == null)
+                        region = new Region(r);
+                    else
+                        region.Union(r);
+                    r.Inflate(-3, -3);
+                    region.Exclude(r);
+                }
+
+                if (processFocusControl && _FocusHighlightControl != null && _FocusHighlightControl.Visible)
+                {
+                    Rectangle r = GetControlRect(_FocusHighlightControl);
+                    if (!r.IsEmpty)
+                    {
+                        r.Inflate(2, 2);
+                        _HighlightRegions.Add(new HighlightRegion(r, GetBackColor(_FocusHighlightControl.Parent), _FocusHighlightColor));
+                        if (region == null)
+                            region = new Region(r);
+                        else
+                            region.Union(r);
+                        r.Inflate(-3, -3);
+                        region.Exclude(r);
+                    }
+                }
+
+                this.Region = region;
+                if (region == null)
+                    this.Visible = false;
+                else if (!this.Visible)
+                {
+                    this.Visible = true;
+                    this.BringToFront();
+                }
+                this.Invalidate();
+            }
+            finally
+            {
+                _UpdatingRegion = false;
+                _RegionInitialized = true;
+            }
+        }
+
+        private bool GetIsVisible(Control control)
+        {
+            if (!control.Visible) return false;
+            if (control.Parent == null || !control.IsHandleCreated) return control.Visible;
+
+            WinApi.RECT rect = new WinApi.RECT();
+            WinApi.GetWindowRect(control.Handle, ref rect);
+            Point pp = control.Parent.PointToClient(new Point(rect.Left + 3, rect.Top + 3));
+            //IntPtr handle = NativeFunctions.ChildWindowFromPoint(control.Parent.Handle, new NativeFunctions.POINT(pp.X, pp.Y));
+            IntPtr handle = NativeFunctions.ChildWindowFromPointEx(control.Parent.Handle, new NativeFunctions.POINT(pp.X, pp.Y), (uint)NativeFunctions.WindowFromPointFlags.CWP_SKIPINVISIBLE);
+            if (handle == IntPtr.Zero) return control.Visible;
+
+            Control c = Control.FromHandle(handle);
+            if (c != null && c != control && c != this && c != control.Parent)
+            {
+                return false;
+            }
+
+            return control.Visible;
+        }
+        private Color GetBackColor(Control control)
+        {
+            Color backColor = control.BackColor;
+            if (backColor.IsEmpty || backColor == Color.Transparent)
+                backColor = SystemColors.Control;
+            else if (backColor.A < 255)
+                backColor = Color.FromArgb(255, backColor);
+            return backColor;
+        }
+        protected override void OnResize(EventArgs e)
+        {
+            UpdateRegion();
+            base.OnResize(e);
+        }
+
+        private Rectangle GetControlRect(Control c)
+        {
+            if (!c.IsHandleCreated) return Rectangle.Empty;
+
+            WinApi.RECT rect = new WinApi.RECT();
+            WinApi.GetWindowRect(c.Handle, ref rect);
+            Point p = this.PointToClient(rect.Location);
+            return new Rectangle(p, rect.Size);
+
+            //Point p = c.PointToScreen(Point.Empty);
+            //p = this.PointToClient(p);
+            //return new Rectangle(p, c.Size);
+        }
+
+        private struct HighlightRegion
+        {
+            public Rectangle Bounds;
+            public Color BackColor;
+            public eHighlightColor HighlightColor;
+            /// <summary>
+            /// Initializes a new instance of the HighlightRegion structure.
+            /// </summary>
+            /// <param name="bounds"></param>
+            /// <param name="backColor"></param>
+            /// <param name="highlightColor"></param>
+            public HighlightRegion(Rectangle bounds, Color backColor, eHighlightColor highlightColor)
+            {
+                Bounds = bounds;
+                BackColor = backColor;
+                HighlightColor = highlightColor;
+            }
+        }
+
+        private Control _FocusHighlightControl;
+        public Control FocusHighlightControl
+        {
+            get { return _FocusHighlightControl; }
+            set { _FocusHighlightControl = value; }
+        }
+
+        private eHighlightColor _FocusHighlightColor = eHighlightColor.Blue;
+        public eHighlightColor FocusHighlightColor
+        {
+            get { return _FocusHighlightColor; }
+            set { _FocusHighlightColor = value; }
+        }
+
+        private Color[] _CustomHighlightColors = null;
+        /// <summary>
+        /// Gets or sets the array of colors used to render custom highlight color. Control expects 3 colors in array to be specified which define the highlight border.
+        /// </summary>
+        public Color[] CustomHighlightColors
+        {
+            get { return _CustomHighlightColors; }
+            set
+            {
+                _CustomHighlightColors = value;
+            }
+        }
+        #endregion
+    }
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/Validator/Highlighter.cs b/PROMS/DotNetBar Source Code/Validator/Highlighter.cs
new file mode 100644
index 00000000..aada4c04
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Validator/Highlighter.cs	
@@ -0,0 +1,599 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Windows.Forms;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar.Validator
+{
+    [ToolboxBitmap(typeof(Highlighter), "Validator.Highlighter.ico"), ToolboxItem(true), ProvideProperty("HighlightColor", typeof(Control)),
+    ProvideProperty("HighlightOnFocus", typeof(Control)),
+   System.Runtime.InteropServices.ComVisible(false), Designer("DevComponents.DotNetBar.Design.HighlighterDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+    public class Highlighter : Component, IExtenderProvider, IErrorProvider
+    {
+        #region Private Variables
+        private Dictionary<Control, eHighlightColor> _Highlights = new Dictionary<Control, eHighlightColor>();
+        private Dictionary<Control, bool> _HighlightOnFocus = new Dictionary<Control, bool>();
+        #endregion
+
+        #region Implementation
+        protected override void Dispose(bool disposing)
+        {
+            if (_ContainerControl != null)
+            {
+                _ContainerControl.SizeChanged -= ContainerControlSizeChanged;
+                _ContainerControl.HandleCreated -= ContainerControlHandleCreated;
+            }
+
+            if (_HighlightPanel != null && _HighlightPanel.Parent == null && !_HighlightPanel.IsDisposed)
+            {
+                _HighlightPanel.Dispose();
+                _HighlightPanel = null;
+            }
+            else
+                _HighlightPanel = null;
+
+            base.Dispose(disposing);
+        }
+
+
+        /// <summary>
+        /// Retrieves whether control is highlighted when it receives input focus.
+        /// </summary>
+        [DefaultValue(false), Localizable(true), Description("Indicates whether control is highlighted when it receives input focus.")]
+        public bool GetHighlightOnFocus(Control c)
+        {
+            if (_HighlightOnFocus.ContainsKey(c))
+            {
+                return _HighlightOnFocus[c];
+            }
+            return false;
+        }
+        /// <summary>
+        /// Sets whether control is highlighted when it receives input focus.
+        /// </summary>
+        /// <param name="c">Reference to supported control.</param>
+        /// <param name="highlight">Indicates whether to highlight control on focus.</param>
+        public void SetHighlightOnFocus(Control c, bool highlight)
+        {
+            if (c == null) throw new NullReferenceException();
+
+            if (_HighlightOnFocus.ContainsKey(c))
+            {
+                if (!highlight)
+                {
+                    RemoveHighlightOnFocus(_HighlightOnFocus, c);
+                }
+                return;
+            }
+            if(highlight)
+                AddHighlightOnFocus(_HighlightOnFocus, c);
+        }
+        private void AddHighlightOnFocus(Dictionary<Control, bool> highlightOnFocus, Control c)
+        {
+            c.Enter += ControlHighlightEnter;
+            c.Leave += ControlHighlightLeave;
+            c.VisibleChanged += ControlHighlightVisibleChanged;
+            highlightOnFocus.Add(c, true);
+        }
+
+        void ControlHighlightVisibleChanged(object sender, EventArgs e)
+        {
+            if(_HighlightPanel!=null && _HighlightPanel.FocusHighlightControl == sender)
+                UpdateHighlighterRegion();
+        }
+        void ControlHighlightLeave(object sender, EventArgs e)
+        {
+            if (_HighlightPanel != null) _HighlightPanel.FocusHighlightControl = null;
+            UpdateHighlighterRegion();
+        }
+        void ControlHighlightEnter(object sender, EventArgs e)
+        {
+            if (_HighlightPanel != null)
+            {
+                if (!_HighlightPanel.Visible) _HighlightPanel.Visible = true;
+                _HighlightPanel.BringToFront();
+                _HighlightPanel.FocusHighlightControl = (Control)sender;
+            }
+            UpdateHighlighterRegion();
+        }
+        private void RemoveHighlightOnFocus(Dictionary<Control, bool> highlightOnFocus, Control c)
+        {
+            c.Enter -= ControlHighlightEnter;
+            c.Leave -= ControlHighlightLeave;
+            c.VisibleChanged -= ControlHighlightVisibleChanged;
+            highlightOnFocus.Remove(c);
+        }
+
+        /// <summary>
+        /// Retrieves the highlight color that is applied to the control.
+        /// </summary>
+        [DefaultValue(eHighlightColor.None), Localizable(true), Description("Indicates the highlight color that is applied to the control.")]
+        public eHighlightColor GetHighlightColor(Control c)
+        {
+            if (_Highlights.ContainsKey(c))
+            {
+                return _Highlights[c];
+            }
+            return eHighlightColor.None;
+        }
+        /// <summary>
+        /// Sets the highlight color for the control.
+        /// </summary>
+        /// <param name="c">Reference to supported control.</param>
+        /// <param name="highlightColor">Highlight color.</param>
+        public void SetHighlightColor(Control c, eHighlightColor highlightColor)
+        {
+            if (_Highlights.ContainsKey(c))
+            {
+                if (highlightColor == eHighlightColor.None)
+                {
+                    RemoveHighlight(_Highlights, c);
+                }
+                else
+                {
+                    eHighlightColor color = _Highlights[c];
+                    RemoveHighlight(_Highlights, c);
+                    AddHighlight(_Highlights, c, highlightColor);
+                }
+            }
+            else if (highlightColor != eHighlightColor.None)
+            {
+                AddHighlight(_Highlights, c, highlightColor);
+            }
+        }
+
+        private Dictionary<TabControl, int> _TabControl1 = new Dictionary<TabControl, int>();
+        private Dictionary<SuperTabControl, int> _SuperTabControl1 = new Dictionary<SuperTabControl, int>();
+        private Dictionary<System.Windows.Forms.TabControl, int> _TabControl2 = new Dictionary<System.Windows.Forms.TabControl, int>();
+        private Dictionary<Panel, int> _ParentPanel = new Dictionary<Panel, int>();
+
+        private void AddHighlight(Dictionary<Control, eHighlightColor> highlights, Control c, eHighlightColor highlightColor)
+        {
+            highlights.Add(c, highlightColor);
+            c.LocationChanged += new EventHandler(ControlLocationChanged);
+            c.SizeChanged += new EventHandler(ControlSizeChanged);
+            c.VisibleChanged += new EventHandler(ControlVisibleChanged);
+            if (_HighlightPanel != null)
+            {
+                if (!_HighlightPanel.Visible) _HighlightPanel.Visible = true;
+                _HighlightPanel.BringToFront();
+            }
+
+            if(c.Parent == null)
+                c.ParentChanged += ControlParentChanged;
+            else
+                AddTabControlHandlers(c);
+
+            UpdateHighlighterRegion();
+        }
+
+        private void ControlParentChanged(object sender, EventArgs e)
+        {
+            Control c = (Control)sender;
+            c.ParentChanged -= ControlParentChanged;
+            AddTabControlHandlers(c);
+        }
+
+        private void AddTabControlHandlers(Control c)
+        {
+            TabControl tab1 = GetParentControl(c, typeof(TabControl)) as TabControl;
+
+            if (tab1 != null)
+            {
+                if (_TabControl1.ContainsKey(tab1))
+                    _TabControl1[tab1] = _TabControl1[tab1] + 1;
+                else
+                {
+                    _TabControl1.Add(tab1, 1);
+                    tab1.SelectedTabChanged += TabControl1SelectedTabChanged;
+                }
+            }
+            else
+            {
+                SuperTabControl tab = GetParentControl(c, typeof(SuperTabControl)) as SuperTabControl;
+
+                if (tab != null)
+                {
+                    if (_SuperTabControl1.ContainsKey(tab))
+                        _SuperTabControl1[tab] = _SuperTabControl1[tab] + 1;
+                    else
+                    {
+                        _SuperTabControl1.Add(tab, 1);
+                        tab.SelectedTabChanged += SuperTabControl1SelectedTabChanged;
+                    }
+                }
+                else
+                {
+                    System.Windows.Forms.TabControl tab2 =
+                        GetParentControl(c, typeof (System.Windows.Forms.TabControl)) as System.Windows.Forms.TabControl;
+
+                    if (tab2 != null)
+                    {
+                        if (_TabControl2.ContainsKey(tab2))
+                            _TabControl2[tab2] = _TabControl2[tab2] + 1;
+                        else
+                        {
+                            _TabControl2.Add(tab2, 1);
+                            tab2.SelectedIndexChanged += WinFormsTabSelectedIndexChanged;
+                        }
+                    }
+                    else
+                    {
+                        Panel parentPanel = GetParentControl(c, typeof (Panel)) as Panel;
+
+                        if (parentPanel != null)
+                        {
+                            if (_ParentPanel.ContainsKey(parentPanel))
+                                _ParentPanel[parentPanel] = _ParentPanel[parentPanel] + 1;
+                            else
+                            {
+                                _ParentPanel.Add(parentPanel, 1);
+                                parentPanel.Resize += ParentPanelResized;
+                                parentPanel.LocationChanged += ParentPanelLocationChanged;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        private void ParentPanelLocationChanged(object sender, EventArgs e)
+        {
+            UpdateHighlights();
+        }
+        private void ParentPanelResized(object sender, EventArgs e)
+        {
+            UpdateHighlights();
+        }
+        private void WinFormsTabSelectedIndexChanged(object sender, EventArgs e)
+        {
+            UpdateHighlighterRegion();
+        }
+
+        private void TabControl1SelectedTabChanged(object sender, TabStripTabChangedEventArgs e)
+        {
+            UpdateHighlighterRegion();
+        }
+
+        private void SuperTabControl1SelectedTabChanged(object sender, SuperTabStripSelectedTabChangedEventArgs e)
+        {
+            UpdateHighlighterRegion();
+        }
+
+        private Control GetParentControl(Control c, Type parentType)
+        {
+            Control parent = c.Parent;
+            while (parent != null)
+            {
+                if (parentType.IsAssignableFrom(parent.GetType())) return parent;
+                parent = parent.Parent;
+            }
+            return null;
+        }
+
+        void ControlVisibleChanged(object sender, EventArgs e)
+        {
+            UpdateHighlighterRegion();
+        }
+
+        private void ControlSizeChanged(object sender, EventArgs e)
+        {
+            UpdateHighlighterRegion();
+        }
+        private void ControlLocationChanged(object sender, EventArgs e)
+        {
+            UpdateHighlighterRegion();
+        }
+
+        private void UpdateHighlighterRegion()
+        {
+            if (_HighlightPanel != null) _HighlightPanel.UpdateRegion();
+        }
+
+        /// <summary>
+        /// Updates the highlighted controls border. Usually call to this method is not needed but under
+        /// certain scenarios where highlighter does not automatically detects the change in visibility of 
+        /// the highlighted control call to this method is necessary.
+        /// </summary>
+        public void UpdateHighlights()
+        {
+            UpdateHighlighterRegion();
+        }
+
+        private void RemoveHighlight(Dictionary<Control, eHighlightColor> highlights, Control c)
+        {
+            highlights.Remove(c);
+            c.LocationChanged -= new EventHandler(ControlLocationChanged);
+            c.SizeChanged -= new EventHandler(ControlSizeChanged);
+            c.VisibleChanged -= new EventHandler(ControlVisibleChanged);
+
+            TabControl tab1 = GetParentControl(c, typeof(TabControl)) as TabControl;
+            if (tab1 != null)
+            {
+                if (_TabControl1.ContainsKey(tab1))
+                {
+                    if (_TabControl1[tab1] == 1)
+                    {
+                        _TabControl1.Remove(tab1);
+                        tab1.SelectedTabChanged -= TabControl1SelectedTabChanged;
+                    }
+                    else
+                        _TabControl1[tab1] = _TabControl1[tab1] - 1;
+                }
+            }
+            else
+            {
+                SuperTabControl tab = GetParentControl(c, typeof(SuperTabControl)) as SuperTabControl;
+
+                if (tab != null)
+                {
+                    if (_SuperTabControl1.ContainsKey(tab))
+                    {
+                        if (_SuperTabControl1[tab] == 1)
+                        {
+                            _SuperTabControl1.Remove(tab);
+                            tab.SelectedTabChanged -= SuperTabControl1SelectedTabChanged;
+                        }
+                        else
+                            _SuperTabControl1[tab] = _SuperTabControl1[tab] - 1;
+                    }
+                }
+                else
+                {
+                    System.Windows.Forms.TabControl tab2 =
+                        GetParentControl(c, typeof (System.Windows.Forms.TabControl)) as System.Windows.Forms.TabControl;
+
+                    if (tab2 != null)
+                    {
+                        if (_TabControl2.ContainsKey(tab2))
+                        {
+                            if (_TabControl2[tab2] == 1)
+                            {
+                                _TabControl2.Remove(tab2);
+                                tab2.SelectedIndexChanged -= WinFormsTabSelectedIndexChanged;
+                            }
+                            else
+                                _TabControl2[tab2] = _TabControl2[tab2] - 1;
+                        }
+                    }
+                    else
+                    {
+                        Panel parentPanel = GetParentControl(c, typeof (Panel)) as Panel;
+
+                        if (parentPanel != null)
+                        {
+                            if (_ParentPanel.ContainsKey(parentPanel))
+                            {
+                                if (_ParentPanel[parentPanel] == 1)
+                                {
+                                    _ParentPanel.Remove(parentPanel);
+                                    parentPanel.LocationChanged -= ParentPanelLocationChanged;
+                                    parentPanel.SizeChanged -= ParentPanelResized;
+                                }
+                                else
+                                    _ParentPanel[parentPanel] = _ParentPanel[parentPanel] - 1;
+                            }
+                        }
+                    }
+                }
+            }
+
+            UpdateHighlighterRegion();
+        }
+
+        internal Dictionary<Control, eHighlightColor> Highlights
+        {
+            get
+            {
+                return _Highlights;
+            }
+        }
+
+        private eHighlightColor _FocusHighlightColor = eHighlightColor.Blue;
+        /// <summary>
+        /// Indicates the highlight focus color.
+        /// </summary>
+        [DefaultValue(eHighlightColor.Blue), Category("Appearance"), Description("Indicates the highlight focus color."), Localizable(true)]
+        public eHighlightColor FocusHighlightColor
+        {
+            get { return _FocusHighlightColor; }
+            set
+            {
+                _FocusHighlightColor = value;
+                if (_HighlightPanel != null)
+                {
+                    _HighlightPanel.FocusHighlightColor = value;
+                    UpdateHighlighterRegion();
+                }
+            }
+        }
+
+        private HighlightPanel _HighlightPanel = null;
+        private Control _ContainerControl = null;
+        /// <summary>
+        /// Gets or sets the container control highlighter is bound to. The container control must be set in order for highlighter to work.
+        /// Container control should always be a form.
+        /// </summary>
+        [DefaultValue(null), Description("Indicates container control highlighter is bound to. Should be set to parent form."), Category("Behavior")]
+        public Control ContainerControl
+        {
+            get
+            {
+                return _ContainerControl;
+            }
+            set
+            {
+                if (this.DesignMode)
+                {
+                    _ContainerControl = value;
+                    return;
+                }
+
+                if (_ContainerControl != value)
+                {
+                    if (_ContainerControl != null)
+                    {
+                        _ContainerControl.SizeChanged -= ContainerControlSizeChanged;
+                        _ContainerControl.HandleCreated -= ContainerControlHandleCreated;
+                        if (_HighlightPanel != null && _HighlightPanel.Parent == _ContainerControl)
+                            _ContainerControl.Controls.Remove(_HighlightPanel);
+                    }
+
+                    _ContainerControl = value;
+
+                    if (_ContainerControl != null)
+                    {
+                        if (_HighlightPanel == null)
+                        {
+                            _HighlightPanel = new HighlightPanel(_Highlights);
+                            _HighlightPanel.FocusHighlightColor = _FocusHighlightColor;
+                            _HighlightPanel.Margin = new System.Windows.Forms.Padding(0);
+                            _HighlightPanel.Padding = new System.Windows.Forms.Padding(0);
+                            _HighlightPanel.CustomHighlightColors = _CustomHighlightColors;
+                            _HighlightPanel.Visible = false;
+                        }
+                        _ContainerControl.SizeChanged += ContainerControlSizeChanged;
+                        _ContainerControl.HandleCreated += ContainerControlHandleCreated;
+                        _ContainerControl.Controls.Add(_HighlightPanel);
+                        UpdateHighlightPanelBounds();
+                    }
+
+                }
+            }
+        }
+
+        void ContainerControlHandleCreated(object sender, EventArgs e)
+        {
+            if (_Highlights.Count > 0 && _HighlightPanel != null && !_HighlightPanel.Visible)
+                _HighlightPanel.Visible = true;
+        }
+
+        private void UpdateHighlightPanelBounds()
+        {
+            Rectangle bounds = new Rectangle(0, 0, _ContainerControl.ClientRectangle.Width, _ContainerControl.ClientRectangle.Height);
+            if (_HighlightPanel.Parent is Form)
+            {
+                Form form = _HighlightPanel.Parent as Form;
+                if (form.AutoSize)
+                {
+                    bounds.X += form.Padding.Left;
+                    bounds.Y += form.Padding.Top;
+                    bounds.Width -= form.Padding.Horizontal;
+                    bounds.Height -= form.Padding.Vertical;
+                }
+            }
+            if(_HighlightPanel.Bounds.Equals(bounds))
+                _HighlightPanel.UpdateRegion();
+            else
+                _HighlightPanel.Bounds = bounds;
+            //_HighlightPanel.UpdateRegion();
+            _HighlightPanel.BringToFront();
+        }
+
+        private Timer _DelayTimer = null;
+        private void ContainerControlSizeChanged(object sender, EventArgs e)
+        {
+            if (!BarFunctions.IsVista)
+            {
+                Form form = sender as Form;
+                if (form != null)
+                {
+                    if (_DelayTimer == null)
+                    {
+                        _DelayTimer = new Timer();
+                        _DelayTimer.Interval = 100;
+                        _DelayTimer.Tick += new EventHandler(DelayTimerTick);
+                        _DelayTimer.Start();
+                    }
+                    return;
+                }
+            }
+            UpdateHighlightPanelBounds();
+        }
+
+        void DelayTimerTick(object sender, EventArgs e)
+        {
+            Timer timer = _DelayTimer;
+            _DelayTimer = null;
+            timer.Tick -= new EventHandler(DelayTimerTick);
+            timer.Stop();
+            timer.Dispose();
+            UpdateHighlightPanelBounds();
+        }
+
+        private Color[] _CustomHighlightColors = null;
+        /// <summary>
+        /// Gets or sets the array of colors used to render custom highlight color. Control expects 3 colors in array to be specified which define the highlight border.
+        /// </summary>
+        [DefaultValue(null), Category("Appearance"), Description("Array of colors used to render custom highlight color. Control expects 3 colors in array to be specified which define the highlight border.")]
+        public Color[] CustomHighlightColors
+        {
+            get { return _CustomHighlightColors; }
+            set 
+            {
+                _CustomHighlightColors = value;
+                if (_HighlightPanel != null)
+                {
+                    _HighlightPanel.CustomHighlightColors = _CustomHighlightColors;
+                    _HighlightPanel.Invalidate();
+                }
+            }
+        }
+        #endregion
+
+        #region IExtenderProvider Members
+
+        public bool CanExtend(object extendee)
+        {
+            return (extendee is Control);
+        }
+
+        #endregion
+
+        #region Licensing
+#if !TRIAL
+        private string _LicenseKey = "";
+        [Browsable(false), DefaultValue("")]
+        public string LicenseKey
+        {
+            get { return _LicenseKey; }
+            set
+            {
+                if (NativeFunctions.ValidateLicenseKey(value))
+                    return;
+                _LicenseKey = (!NativeFunctions.CheckLicenseKey(value) ? "9dsjkhds7" : value);
+            }
+        }
+#endif
+        #endregion
+
+        #region IErrorProvider Members
+
+        void IErrorProvider.SetError(Control control, string value)
+        {
+            this.SetHighlightColor(control, eHighlightColor.Red);
+        }
+
+        void IErrorProvider.ClearError(Control control)
+        {
+            this.SetHighlightColor(control, eHighlightColor.None);
+        }
+
+        #endregion
+    }
+    /// <summary>
+    /// Defines highlight colors provided by Highlighter control.
+    /// </summary>
+    public enum eHighlightColor
+    {
+        None,
+        Red,
+        Blue,
+        Green,
+        Orange,
+        Custom
+    }
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/Validator/Highlighter.ico b/PROMS/DotNetBar Source Code/Validator/Highlighter.ico
new file mode 100644
index 00000000..829e0bf2
Binary files /dev/null and b/PROMS/DotNetBar Source Code/Validator/Highlighter.ico differ
diff --git a/PROMS/DotNetBar Source Code/Validator/IErrorProvider.cs b/PROMS/DotNetBar Source Code/Validator/IErrorProvider.cs
new file mode 100644
index 00000000..d75c2e69
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Validator/IErrorProvider.cs	
@@ -0,0 +1,27 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar.Validator
+{
+    /// <summary>
+    /// Defines an interface that can be implemented by custom error providers to be used with SuperValidator.
+    /// </summary>
+    public interface IErrorProvider
+    {
+        /// <summary>
+        /// Sets the error state on the control.
+        /// </summary>
+        /// <param name="control">Control for which error state is being set.</param>
+        /// <param name="value">The error message from validator.</param>
+        void SetError(Control control, string value);
+        /// <summary>
+        /// Clears the error state for the control.
+        /// </summary>
+        /// <param name="control">Control to clear error state for.</param>
+        void ClearError(Control control);
+    }
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/Validator/RangeValidator.cs b/PROMS/DotNetBar Source Code/Validator/RangeValidator.cs
new file mode 100644
index 00000000..cfdea0dc
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Validator/RangeValidator.cs	
@@ -0,0 +1,110 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar.Validator
+{
+    public class RangeValidator : ValidatorBase
+    {
+        #region Constructors
+        /// <summary>
+        /// Initializes a new instance of the RangeValidator class.
+        /// </summary>
+        public RangeValidator()
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the RangeValidator class.
+        /// </summary>
+        public RangeValidator(string errorMessage, object minimumValue, object maximumValue)
+        {
+            this.ErrorMessage = errorMessage;
+            this.MinimumValue = minimumValue;
+            this.MaximumValue = maximumValue;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the RangeValidator class.
+        /// </summary>
+        public RangeValidator(string errorMessage, string optionalValidationGroup, object minimumValue, object maximumValue)
+        {
+            this.ErrorMessage = errorMessage;
+            this.OptionalValidationGroup = optionalValidationGroup;
+            this.MinimumValue = minimumValue;
+            this.MaximumValue = maximumValue;
+        }
+        #endregion
+
+        #region Implementation
+        public override bool Validate(System.Windows.Forms.Control input)
+        {
+            if (_MaximumValue == null && _MinimumValue == null) return true;
+            object value = GetControlValue(input);
+
+            if (value == null)
+            {
+                if (_MinimumValue == null) return true;
+                return false;
+            }
+
+            if(value == "" && _IsEmptyStringValid)
+                return true;
+
+            bool isMinimumValid = true;
+            if (_MinimumValue != null)
+            {
+                isMinimumValid = CompareValidator.Compare(value, _MinimumValue, eValidationCompareOperator.GreaterThanEqual);
+                if (!isMinimumValid) return false;
+            }
+            bool isMaximumValid = true;
+            if (_MaximumValue != null)
+            {
+                isMaximumValid = CompareValidator.Compare(value, _MaximumValue, eValidationCompareOperator.LessThanEqual);
+            }
+
+            this.LastValidationResult = isMinimumValid & isMaximumValid;
+            return this.LastValidationResult;
+        }
+
+        private object _MaximumValue = null;
+        /// <summary>
+        /// Gets or sets the maximum value control may have.
+        /// </summary>
+        [DefaultValue((string)null), Category("Behavior"), Description("Indicates maximum value control may have."), TypeConverter(typeof(StringConverter))]
+        public object MaximumValue
+        {
+            get { return _MaximumValue; }
+            set { _MaximumValue = value; }
+        }
+
+        private object _MinimumValue = null;
+        /// <summary>
+        /// Gets or sets the minimum value control may have.
+        /// </summary>
+        [DefaultValue((string)null), Category("Behavior"), Description("Indicates minimum value control may have."), TypeConverter(typeof(StringConverter))]
+        public object MinimumValue
+        {
+            get { return _MinimumValue; }
+            set { _MinimumValue = value; }
+        }
+
+        private bool _IsEmptyStringValid = false;
+        /// <summary>
+        /// Indicates whether empty string of zero length is considered valid input.
+        /// </summary>
+        [DefaultValue(false), Category("Behavior"), Description("Indicates whether empty string of zero length is considered valid input.")]
+        public bool IsEmptyStringValid
+        {
+            get { return _IsEmptyStringValid; }
+            set
+            {
+                _IsEmptyStringValid = value;
+            }
+        }
+        #endregion
+    }
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/Validator/RegularExpressionValidator.cs b/PROMS/DotNetBar Source Code/Validator/RegularExpressionValidator.cs
new file mode 100644
index 00000000..728987b3
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Validator/RegularExpressionValidator.cs	
@@ -0,0 +1,113 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel;
+using System.Text.RegularExpressions;
+
+namespace DevComponents.DotNetBar.Validator
+{
+    /// <summary>
+    /// Represents the regular expression validator used with SuperValidator control.
+    /// </summary>
+    public class RegularExpressionValidator : ValidatorBase
+    {
+        #region Implementation
+        /// <summary>
+        /// Initializes a new instance of the RegularExpressionValidator class.
+        /// </summary>
+        public RegularExpressionValidator()
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the RegularExpressionValidator class.
+        /// </summary>
+        /// <param name="validationExpression"></param>
+        public RegularExpressionValidator(string errorMessage, string validationExpression)
+        {
+            _ValidationExpression = validationExpression;
+            this.ErrorMessage = errorMessage;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the RegularExpressionValidator class.
+        /// </summary>
+        /// <param name="validationExpression"></param>
+        public RegularExpressionValidator(string errorMessage, string validationExpression, bool emptyValueIsValid)
+        {
+            _ValidationExpression = validationExpression;
+            this.ErrorMessage = errorMessage;
+            this.EmptyValueIsValid = emptyValueIsValid;
+        }
+
+         /// <summary>
+        /// Initializes a new instance of the RegularExpressionValidator class.
+        /// </summary>
+        /// <param name="validationExpression"></param>
+        public RegularExpressionValidator(string errorMessage, string validationExpression, string optionalValidationGroup, bool emptyValueIsValid)
+        {
+            _ValidationExpression = validationExpression;
+            this.ErrorMessage = errorMessage;
+            this.OptionalValidationGroup = optionalValidationGroup;
+        }
+
+        private string _ValidationExpression = "";
+        /// <summary>
+        /// Gets or sets regular expression used to validate controls value.
+        /// </summary>
+        [DefaultValue(""), Category("Behavior"), Description("Indicates regular expression used to validate controls value."), Editor("DevComponents.DotNetBar.Design.ValidationExpressionEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor))]
+        public string ValidationExpression
+        {
+            get { return _ValidationExpression; }
+            set
+            {
+                _ValidationExpression = value;
+            }
+        }
+
+        private bool _EmptyValueIsValid = false;
+        /// <summary>
+        /// Gets or sets whether empty value is considered valid value by the validator. Default value is false.
+        /// </summary>
+        [DefaultValue(false), Category("Behavior"), Description("Indicates whether empty value is considered valid value by the validator")]
+        public bool EmptyValueIsValid
+        {
+            get { return _EmptyValueIsValid; }
+            set
+            {
+                _EmptyValueIsValid = value;
+            }
+        }
+        
+
+        public override bool Validate(System.Windows.Forms.Control input)
+        {
+            if (string.IsNullOrEmpty(_ValidationExpression))
+            {
+                this.LastValidationResult = true;
+                return true;
+            }
+            object value = GetControlValue(input);
+            string textValue = "";
+
+            if (value != null)
+            {
+                textValue = value.ToString();
+            }
+
+            if (_EmptyValueIsValid && string.IsNullOrEmpty(textValue))
+            {
+                this.LastValidationResult = true;
+                return true;
+            }
+
+            Regex regularExpression = new Regex(_ValidationExpression);
+
+            this.LastValidationResult = regularExpression.IsMatch(textValue);
+            return LastValidationResult;
+        }
+        #endregion
+    }
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/Validator/RequiredFieldValidator.cs b/PROMS/DotNetBar Source Code/Validator/RequiredFieldValidator.cs
new file mode 100644
index 00000000..e9105813
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Validator/RequiredFieldValidator.cs	
@@ -0,0 +1,158 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows.Forms;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar.Validator
+{
+    /// <summary>
+    /// Describes required field validator used with SuperValidator control.
+    /// </summary>
+    [TypeConverter("DevComponents.DotNetBar.Design.RequiredFieldValidatorConverter, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf"), DesignTimeVisible(false), ToolboxItem(false), Localizable(true)]
+    public class RequiredFieldValidator : ValidatorBase
+    {
+        #region Events
+        /// <summary>
+        /// Occurs when controls value needs to be evaluated to check whether it is empty. You can use this event to perform custom evaluation.
+        /// </summary>
+        public event EvaluateIsEmptyEventHandler EvaluateIsEmpty;
+        #endregion
+
+        #region Constructors
+        /// <summary>
+        /// Initializes a new instance of the RequiredFieldValidator class.
+        /// </summary>
+        public RequiredFieldValidator()
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the RequiredFieldValidator class.
+        /// </summary>
+        public RequiredFieldValidator(string errorMessage)
+        {
+            this.ErrorMessage = errorMessage;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the RequiredFieldValidator class.
+        /// </summary>
+        public RequiredFieldValidator(string errorMessage, string optionalValidationGroup)
+        {
+            this.ErrorMessage = errorMessage;
+            this.OptionalValidationGroup = optionalValidationGroup;
+        }
+        #endregion
+
+        #region Implementation
+        public override bool Validate(System.Windows.Forms.Control input)
+        {
+            object value = GetControlValue(input);
+            this.LastValidationResult = !IsEmpty(input, value);
+            return LastValidationResult;
+        }
+
+        protected virtual bool IsEmpty(System.Windows.Forms.Control input, object value)
+        {
+            EvaluateIsEmptyEventArgs args = new EvaluateIsEmptyEventArgs(input, value, this);
+            OnEvaluateIsEmpty(args);
+            if (args.IsEmptySet) return args.IsEmpty;
+
+            if (value == null) return true;
+            if (value is string)
+            {
+                if (_IsEmptyStringValid)
+                    return value == null;
+                else
+                    return string.IsNullOrEmpty((string)value);
+            }
+            else if ((input is ComboBox || input is DevComponents.DotNetBar.Controls.ComboTree) && value is int)
+                return ((int)value) < 0;
+
+            return false;
+        }
+        /// <summary>
+        /// Raises EvaluateIsEmpty event.
+        /// </summary>
+        /// <param name="args">Event Arguments</param>
+        protected virtual void OnEvaluateIsEmpty(EvaluateIsEmptyEventArgs args)
+        {
+            EvaluateIsEmptyEventHandler h = EvaluateIsEmpty;
+            if (h != null) h(this, args);
+        }
+
+        private bool _IsEmptyStringValid = false;
+        /// <summary>
+        /// Indicates whether empty string of zero length is considered valid input.
+        /// </summary>
+        [DefaultValue(false), Category("Behavior"), Description("Indicates whether empty string of zero length is considered valid input.")]
+        public bool IsEmptyStringValid
+        {
+            get { return _IsEmptyStringValid; }
+            set
+            {
+                _IsEmptyStringValid = value;
+            }
+        }
+        
+        #endregion
+    }
+
+    #region EvaluateIsEmptyEventArgs
+    public class EvaluateIsEmptyEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Initializes a new instance of the ValidatorGetValueEventArgs class.
+        /// </summary>
+        /// <param name="control"></param>
+        /// <param name="validator"></param>
+        public EvaluateIsEmptyEventArgs(Control control, object value, ValidatorBase validator)
+        {
+            Control = control;
+            Validator = validator;
+            Value = value;
+        }
+
+        /// <summary>
+        /// Gets Control to retrieve value for.
+        /// </summary>
+        public readonly object Control;
+        /// <summary>
+        /// Gets the Value to evaluate.
+        /// </summary>
+        public readonly object Value;
+
+        /// <summary>
+        /// Gets validator that is requesting value.
+        /// </summary>
+        public readonly ValidatorBase Validator;
+
+        private bool _IsEmpty;
+        /// <summary>
+        /// Gets or sets the value that will be used by validator.
+        /// </summary>
+        public bool IsEmpty
+        {
+            get { return _IsEmpty; }
+            set
+            {
+                _IsEmpty = value;
+                IsEmptySet = true;
+            }
+        }
+        internal bool IsEmptySet = false;
+        /// <summary>
+        /// Resets the Value set and indicates that validator will internally retrieve value for the control.
+        /// </summary>
+        public void ResetIsEmpty()
+        {
+            _IsEmpty = false;
+            IsEmptySet = false;
+        }
+    }
+    public delegate void EvaluateIsEmptyEventHandler(object sender, EvaluateIsEmptyEventArgs ea);
+    #endregion
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/Validator/SuperValidator.cs b/PROMS/DotNetBar Source Code/Validator/SuperValidator.cs
new file mode 100644
index 00000000..6daa1724
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Validator/SuperValidator.cs	
@@ -0,0 +1,789 @@
+#if FRAMEWORK20
+using System;
+using System.Text;
+using System.ComponentModel;
+using System.Drawing;
+using System.Windows.Forms;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel.Design;
+using System.Collections.ObjectModel;
+
+namespace DevComponents.DotNetBar.Validator
+{
+    [ToolboxBitmap(typeof(SuperTooltip), "Validator.SuperValidator.ico"), ToolboxItem(true), ProvideProperty("Validator1", typeof(Control)),
+    ProvideProperty("Validator2", typeof(Control)), ProvideProperty("Validator3", typeof(Control)),
+   System.Runtime.InteropServices.ComVisible(false), Designer("DevComponents.DotNetBar.Design.SuperValidatorDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+    public class SuperValidator : Component, IExtenderProvider
+    {
+        #region Private Variables
+        private Dictionary<Control, ValidatorBase> _Validators1 = new Dictionary<Control, ValidatorBase>();
+        private Dictionary<Control, ValidatorBase> _Validators2 = new Dictionary<Control, ValidatorBase>();
+        private Dictionary<Control, ValidatorBase> _Validators3 = new Dictionary<Control, ValidatorBase>();
+        #endregion
+
+        #region Constructor
+
+        #endregion
+
+        #region Events
+        /// <summary>
+        /// Occurs when validator retrieves the value for the control. It allows you to return value for the controls validator does not recognize.
+        /// </summary>
+        public event ValidatorGetValueEventHandler GetValue;
+        /// <summary>
+        /// Occurs when CustomValidator needs to validate the control value.
+        /// </summary>
+        public event ValidateValueEventHandler CustomValidatorValidateValue;
+        #endregion
+
+        #region Implementation
+        protected override void Dispose(bool disposing)
+        {
+            ClearAllValidators();
+            ContainerControl = null;
+            base.Dispose(disposing);
+        }
+
+        private void ClearAllValidators()
+        {
+            ClearValidator(_Validators1);
+            ClearValidator(_Validators2);
+            ClearValidator(_Validators3);
+        }
+
+        private void ClearValidator(Dictionary<Control, ValidatorBase> validators)
+        {
+            if (validators == null || validators.Count == 0) return;
+
+            foreach (KeyValuePair<Control, ValidatorBase> item in validators)
+            {
+                item.Key.Validating -= ControlValidating;
+            }
+
+            validators.Clear();
+        }
+
+
+        internal void InvokeCustomValidatorValidateValue(CustomValidator validator, ValidateValueEventArgs e)
+        {
+            OnCustomValidatorValidateValue(validator, e);
+        }
+        /// <summary>
+        /// Raises the CustomValidatorValidateValue event.
+        /// </summary>
+        /// <param name="validator">Validator that needs validation.</param>
+        /// <param name="e">Control to validate.</param>
+        protected virtual void OnCustomValidatorValidateValue(CustomValidator validator, ValidateValueEventArgs e)
+        {
+            ValidateValueEventHandler h = CustomValidatorValidateValue;
+            if (h != null) h(validator, e);
+        }
+
+        /// <summary>
+        /// Retrieves first level Validator for given control or return null if control does not have validator associated with it.
+        /// </summary>
+        [Editor("DevComponents.DotNetBar.Design.ValidatorEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), DefaultValue(null), Localizable(true)]
+        public ValidatorBase GetValidator1(Control c)
+        {
+            if (_Validators1.ContainsKey(c))
+            {
+                ValidatorBase info = _Validators1[c];
+                return info;
+            }
+            return null;
+        }
+        /// <summary>
+        /// Associates first level Validator with given control.
+        /// </summary>
+        /// <param name="c">Reference to supported control.</param>
+        /// <param name="info">Instance of validator class. If null is passed existing Validator is detached from the given control.</param>
+        public void SetValidator1(Control c, ValidatorBase info)
+        {
+            if (_Validators1.ContainsKey(c))
+            {
+                if (info == null)
+                {
+                    ValidatorBase validator = _Validators1[c];
+                    this.RemoveValidator(_Validators1, c);
+
+                    DestroyValidator(validator);
+                }
+                else
+                {
+                    ValidatorBase validator = _Validators1[c];
+                    if (validator != info)
+                        DestroyValidator(validator);
+                    _Validators1[c] = info;
+                }
+            }
+            else if (info != null)
+            {
+                this.AddValidator(_Validators1, c, info);
+            }
+        }
+
+        /// <summary>
+        /// Retrieves second level Validator for given control or return null if control does not have validator associated with it.
+        /// </summary>
+        [Editor("DevComponents.DotNetBar.Design.ValidatorEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), DefaultValue(null), Localizable(true)]
+        public ValidatorBase GetValidator2(Control c)
+        {
+            if (_Validators2.ContainsKey(c))
+            {
+                ValidatorBase info = _Validators2[c];
+                return info;
+            }
+            return null;
+        }
+        /// <summary>
+        /// Associates second level Validator with given control.
+        /// </summary>
+        /// <param name="c">Reference to supported control.</param>
+        /// <param name="info">Instance of validator class. If null is passed existing Validator is detached from the given control.</param>
+        public void SetValidator2(Control c, ValidatorBase info)
+        {
+            if (_Validators2.ContainsKey(c))
+            {
+                if (info == null)
+                {
+                    ValidatorBase validator = _Validators2[c];
+                    this.RemoveValidator(_Validators2, c);
+
+                    DestroyValidator(validator);
+                }
+                else
+                {
+                    ValidatorBase validator = _Validators2[c];
+                    if (validator != info)
+                        DestroyValidator(validator);
+                    _Validators2[c] = info;
+                }
+            }
+            else if (info != null)
+            {
+                this.AddValidator(_Validators2, c, info);
+            }
+        }
+
+        /// <summary>
+        /// Retrieves third level Validator for given control or return null if control does not have validator associated with it.
+        /// </summary>
+        [Editor("DevComponents.DotNetBar.Design.ValidatorEditor, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf", typeof(System.Drawing.Design.UITypeEditor)), DefaultValue(null), Localizable(true)]
+        public ValidatorBase GetValidator3(Control c)
+        {
+            if (_Validators3.ContainsKey(c))
+            {
+                ValidatorBase info = _Validators3[c];
+                return info;
+            }
+            return null;
+        }
+        /// <summary>
+        /// Associates third level Validator with given control.
+        /// </summary>
+        /// <param name="c">Reference to supported control.</param>
+        /// <param name="info">Instance of validator class. If null is passed existing Validator is detached from the given control.</param>
+        public void SetValidator3(Control c, ValidatorBase info)
+        {
+            if (_Validators3.ContainsKey(c))
+            {
+                if (info == null)
+                {
+                    ValidatorBase validator = _Validators3[c];
+                    this.RemoveValidator(_Validators3, c);
+
+                    DestroyValidator(validator);
+                }
+                else
+                {
+                    ValidatorBase validator = _Validators3[c];
+                    if (validator != info)
+                        DestroyValidator(validator);
+                    _Validators3[c] = info;
+                }
+            }
+            else if (info != null)
+            {
+                this.AddValidator(_Validators3, c, info);
+            }
+        }
+
+        private void DestroyValidator(ValidatorBase validator)
+        {
+            if (this.Site != null && this.DesignMode)
+            {
+                IDesignerHost dh = this.Site.GetService(typeof(IDesignerHost)) as IDesignerHost;
+                if (dh != null)
+                {
+                    dh.DestroyComponent(validator);
+                }
+            }
+        }
+        private void RemoveValidator(Dictionary<Control, ValidatorBase> validatorCollection, Control control)
+        {
+            ValidatorBase info = validatorCollection[control];
+            info.SuperValidator = null;
+            validatorCollection.Remove(control);
+            control.Validating -= ControlValidating;
+        }
+        private void AddValidator(Dictionary<Control, ValidatorBase> validatorCollection, Control control, ValidatorBase info)
+        {
+            info.SuperValidator = this;
+            validatorCollection.Add(control, info);
+            control.Validating += ControlValidating;
+        }
+
+        private void ControlValidating(object sender, CancelEventArgs e)
+        {
+            if (!this.Enabled)
+                return;
+            if (_ValidationType == eValidationType.Manual)
+                return;
+            if ((_ValidationType & eValidationType.ValidatingEventPerControl) != eValidationType.ValidatingEventPerControl)
+                return;
+
+            Control control = sender as Control;
+            if (control == null) return;
+
+            ValidatorBase validator = null;
+            bool isValid = true;
+            if (_Validators1.TryGetValue(control, out validator))
+            {
+                bool cancelValidating = false;
+                isValid = ValidateSingleControl(validator, control, out cancelValidating);
+                if (!isValid) AddToLastFailedValidations(validator, control);
+                e.Cancel = cancelValidating;
+            }
+
+            if (isValid && _Validators2.TryGetValue(control, out validator))
+            {
+                bool cancelValidating = false;
+                isValid = ValidateSingleControl(validator, control, out cancelValidating);
+                if (!isValid) AddToLastFailedValidations(validator, control);
+                e.Cancel = cancelValidating;
+            }
+
+            if (isValid && _Validators3.TryGetValue(control, out validator))
+            {
+                bool cancelValidating = false;
+                isValid = ValidateSingleControl(validator, control, out cancelValidating);
+                if (!isValid) AddToLastFailedValidations(validator, control);
+                e.Cancel = cancelValidating;
+            }
+        }
+        private void AddToLastFailedValidations(ValidatorBase validator, Control control)
+        {
+            foreach (ValidatorControlPair item in _LastFailedValidations)
+            {
+                if (item.Control == control && item.Validator == validator) return;
+            }
+            _LastFailedValidations.Add(new ValidatorControlPair(validator, control));
+        }
+
+        private bool ValidateSingleControl(ValidatorBase validator, Control control, out bool cancelValidating)
+        {
+            cancelValidating = false;
+            if (!validator.Enabled) return true;
+
+            bool result = true;
+            bool validateControl = true;
+            if (!string.IsNullOrEmpty(validator.OptionalValidationGroup))
+            {
+                List<ValidatorControlPair> optionalValidators = GetOptionalValidators(validator.OptionalValidationGroup);
+                if (optionalValidators.Count > 1)
+                {
+                    result = false;
+                    foreach (ValidatorControlPair pair in optionalValidators)
+                    {
+                        result |= pair.Validator.Validate(pair.Control);
+                    }
+
+#if !TRIAL
+                    if (NativeFunctions.keyValidated2 != 266)
+                        result = false;
+#endif
+
+                    if (!result)
+                    {
+                        foreach (ValidatorControlPair pair in optionalValidators)
+                        {
+                            if (pair.Validator.DisplayError)
+                                SetError(pair.Validator, pair.Control);
+                        }
+                    }
+                    else
+                    {
+                        foreach (ValidatorControlPair pair in optionalValidators)
+                        {
+                            ClearError(pair.Validator, pair.Control);
+                        }
+                    }
+                    validateControl = false;
+                }
+            }
+
+            if (validateControl)
+            {
+                result = validator.Validate(control);
+
+#if !TRIAL
+                if (NativeFunctions.keyValidated2 != 266)
+                    result = false;
+#endif
+
+                if (!result)
+                {
+                    if (validator.DisplayError)
+                        SetError(validator, control);
+                    cancelValidating = _CancelValidatingOnControl;
+                }
+                else
+                {
+                    ClearError(validator, control);
+                }
+            }
+
+            return result;
+        }
+
+        private List<ValidatorControlPair> GetOptionalValidators(string optionalValidationGroup)
+        {
+            List<ValidatorControlPair> list = new List<ValidatorControlPair>();
+
+            FindOptionalValidators(_Validators1, optionalValidationGroup, list);
+            FindOptionalValidators(_Validators2, optionalValidationGroup, list);
+            FindOptionalValidators(_Validators3, optionalValidationGroup, list);
+
+            return list;
+        }
+
+        private void FindOptionalValidators(Dictionary<Control, ValidatorBase> validators, string optionalValidationGroup, List<ValidatorControlPair> list)
+        {
+            foreach (KeyValuePair<Control, ValidatorBase> item in validators)
+            {
+                if (item.Value.OptionalValidationGroup.Equals(optionalValidationGroup, StringComparison.CurrentCultureIgnoreCase))
+                {
+                    list.Add(new ValidatorControlPair(item.Value, item.Key));
+                }
+            }
+        }
+        /// <summary>
+        /// Raises the GetValue event.
+        /// </summary>
+        /// <param name="e">Event arguments.</param>
+        protected virtual void OnGetValue(ValidatorGetValueEventArgs e)
+        {
+            ValidatorGetValueEventHandler handler = GetValue;
+            if (handler != null) handler(this, e);
+        }
+
+        internal void InvokeGetValue(ValidatorGetValueEventArgs e)
+        {
+            OnGetValue(e);
+        }
+
+        private bool _SteppedValidation = false;
+        /// <summary>
+        /// Gets or sets whether validation is performed in steps meaning that if first level validation fails, second level is not validated
+        /// until first level validation succeeds. Default value is false which means that all validation levels are validated even if first level fails.
+        /// </summary>
+        [DefaultValue(false), Category("Behavior"), Description("Indicates whether validation is performed in steps meaning that if first level validation fails, second level is not validated until first level validation succeeds")]
+        public bool SteppedValidation
+        {
+            get { return _SteppedValidation; }
+            set
+            {
+                _SteppedValidation = value;
+            }
+        }
+
+        /// <summary>
+        /// Performs validation on all validators. It also uses error provider to display failed validations if validator has that enabled.
+        /// </summary>
+        /// <returns>Returns true if all validations succeeded or false if at least one validation has failed.</returns>
+        public bool Validate()
+        {
+            bool validated = true;
+
+            Dictionary<string, bool> table = new Dictionary<string, bool>();
+            _LastFailedValidations.Clear();
+
+            validated &= ValidateSingleTable(_Validators1, table);
+            if (!validated && _SteppedValidation) return validated;
+            validated &= ValidateSingleTable(_Validators2, table);
+            if (!validated && _SteppedValidation) return validated;
+            validated &= ValidateSingleTable(_Validators3, table);
+
+            return validated;
+        }
+
+        /// <summary>
+        /// Validate single control. Note that control must have validator assigned to it. This method will change LastFailedValidationResults collection.
+        /// </summary>
+        /// <param name="controlToValidate">Control to validate.</param>
+        /// <returns>returns true if validation succeeds or false if it fails</returns>
+        public bool Validate(Control controlToValidate)
+        {
+            return Validate(controlToValidate, true);
+        }
+        /// <summary>
+        /// Validate single control. Note that control must have validator assigned to it. This method will change LastFailedValidationResults collection.
+        /// </summary>
+        /// <param name="controlToValidate">Control to validate.</param>
+        /// <param name="clearLastFailedValidations">Indicates whether to clear the last set of failed validations by calling ClearFailedValidations() method.</param>
+        /// <returns>returns true if validation succeeds or false if it fails</returns>
+        public bool Validate(Control controlToValidate, bool clearLastFailedValidations)
+        {
+            bool result = true;
+            bool cancelValidating = false;
+            if (clearLastFailedValidations)
+                ClearFailedValidations();
+
+            ValidatorBase validator = null;
+            if (_Validators1.ContainsKey(controlToValidate))
+            {
+                validator = _Validators1[controlToValidate];
+                bool b = ValidateSingleControl(validator, controlToValidate, out cancelValidating);
+                if (!b) _LastFailedValidations.Add(new ValidatorControlPair(validator, controlToValidate));
+                result &= b;
+            }
+            if (!result && _SteppedValidation) return result;
+
+            if (_Validators2.ContainsKey(controlToValidate))
+            {
+                validator = _Validators2[controlToValidate];
+                bool b = ValidateSingleControl(validator, controlToValidate, out cancelValidating);
+                if (!b) _LastFailedValidations.Add(new ValidatorControlPair(validator, controlToValidate));
+                result &= b;
+            }
+            if (!result && _SteppedValidation) return result;
+
+            if (_Validators3.ContainsKey(controlToValidate))
+            {
+                validator = _Validators3[controlToValidate];
+                bool b = ValidateSingleControl(validator, controlToValidate, out cancelValidating);
+                if (!b) _LastFailedValidations.Add(new ValidatorControlPair(validator, controlToValidate));
+                result &= b;
+            }
+            if (!result && _SteppedValidation) return result;
+
+            return result;
+        }
+        private List<ValidatorControlPair> _LastFailedValidations = new List<ValidatorControlPair>();
+        /// <summary>
+        /// Gets the readonly collection that returns failed validations that were result of last Validate method call.
+        /// </summary>
+        [Browsable(false)]
+        public ReadOnlyCollection<ValidatorControlPair> LastFailedValidationResults
+        {
+            get
+            {
+                return new ReadOnlyCollection<ValidatorControlPair>(_LastFailedValidations);
+            }
+        }
+
+        private bool ValidateSingleTable(Dictionary<Control, ValidatorBase> validators, Dictionary<string, bool> table)
+        {
+            bool validated = true;
+            foreach (KeyValuePair<Control, ValidatorBase> item in validators)
+            {
+                // If control has already failed validation do not validate with second/third level validator again
+                if (ControlFailedValidation(item.Key)) continue;
+                string optionalValidationGroup = item.Value.OptionalValidationGroup;
+                if (!string.IsNullOrEmpty(optionalValidationGroup))
+                {
+                    if (table.ContainsKey(optionalValidationGroup))
+                        continue;
+                    else
+                        table.Add(optionalValidationGroup, true);
+                }
+                
+                bool cancelValidatingEvent = false;
+                bool b = ValidateSingleControl(item.Value, item.Key, out cancelValidatingEvent);
+                if (!b) _LastFailedValidations.Add(new ValidatorControlPair(item.Value, item.Key));
+                validated &= b;
+            }
+
+            return validated;
+        }
+
+        private bool ControlFailedValidation(Control control)
+        {
+            foreach (ValidatorControlPair item in _LastFailedValidations)
+            {
+                if (item.Control == control) return true;
+            }
+            return false;
+        }
+        private void SetError(ValidatorBase validator, Control controlToValidate)
+        {
+            List<IErrorProvider> errorProviders = GetErrorProviders();
+            if (errorProviders == null || errorProviders.Count == 0) return;
+
+            foreach (IErrorProvider errorProvider in errorProviders)
+            {
+#if !TRIAL
+                if (NativeFunctions.keyValidated2 != 266)
+                {
+                    errorProvider.SetError(controlToValidate, "Invalid license key for SuperValidator control. Control is disabled.");
+                    continue;
+                }
+#endif
+                if (errorProvider is Highlighter)
+                    ((Highlighter)errorProvider).SetHighlightColor(controlToValidate, validator.HighlightColor);
+                else
+                    errorProvider.SetError(controlToValidate, validator.ErrorMessage);
+            }
+        }
+
+        /// <summary>
+        /// Removes all visual markers from failed validations that were placed on the controls.
+        /// </summary>
+        public void ClearFailedValidations()
+        {
+            foreach (ValidatorControlPair item in _LastFailedValidations)
+            {
+                ClearError(item.Validator, item.Control);
+            }
+            _LastFailedValidations.Clear();
+        }
+
+        private void ClearError(ValidatorBase validator, Control controlToValidate)
+        {
+            List<IErrorProvider> errorProviders = GetErrorProviders();
+            if (errorProviders == null || errorProviders.Count == 0) return;
+
+            foreach (IErrorProvider errorProvider in errorProviders)
+            {
+                errorProvider.ClearError(controlToValidate);
+            }
+        }
+
+        private int _DefaultErrorProviderHighlighterIconPadding = 2;
+        /// <summary>
+        /// Indicates default ErrorProvider IconPadding when Highlighter is used with SuperValidator. Setting this property to 0 will allow you to set IconPadding for each control manually.
+        /// </summary>
+        [DefaultValue(2), Category("Behavior"), Description("Indicates default ErrorProvider IconPadding when Highlighter is used with SuperValidator. Setting this property to 0 will allow you to set IconPadding for each control manually.")]
+        public int DefaultErrorProviderHighlighterIconPadding
+        {
+            get { return _DefaultErrorProviderHighlighterIconPadding; }
+            set
+            {
+                _DefaultErrorProviderHighlighterIconPadding = value;
+            }
+        }
+        
+
+        private List<IErrorProvider> GetErrorProviders()
+        {
+            List<IErrorProvider> providers = new List<IErrorProvider>();
+            if (_ErrorProvider != null)
+                providers.Add(new ErrorProviderWrapper(_ErrorProvider, (_Highlighter != null ? _DefaultErrorProviderHighlighterIconPadding : 0)));
+            if (_CustomErrorProvider != null)
+                providers.Add(_CustomErrorProvider);
+            if (_Highlighter != null)
+                providers.Add(_Highlighter);
+
+            return providers;
+        }
+
+        private ErrorProvider _ErrorProvider;
+        /// <summary>
+        /// Gets or sets the error provider that is used by the validator to report validation errors.
+        /// </summary>
+        [DefaultValue(null), Category("Behavior"), Description("Indicates error provider that is used by the validator to report validation errors.")]
+        public ErrorProvider ErrorProvider
+        {
+            get { return _ErrorProvider; }
+            set { _ErrorProvider = value; }
+        }
+
+        private IErrorProvider _CustomErrorProvider = null;
+        /// <summary>
+        /// Gets or sets the custom error provider that is used by validator to report errors. You can provide your own error validators by implementing IErrorProvider interface.
+        /// </summary>
+        [DefaultValue(null), Browsable(false), Category("Behavior"), Description("Indicates custom error provider that is used by validator to report errors. You can provide your own error validators by implementing IErrorProvider interface.")]
+        public IErrorProvider CustomErrorProvider
+        {
+            get { return _CustomErrorProvider; }
+            set { _CustomErrorProvider = value; }
+        }
+
+        private Highlighter _Highlighter;
+        /// <summary>
+        /// Gets or sets the Highlighter component that is used to highlight validation errors.
+        /// </summary>
+        [DefaultValue(null), Category("Appearance"), Description("Highlighter component that is used to highlight validation errors.")]
+        public Highlighter Highlighter
+        {
+            get { return _Highlighter; }
+            set { _Highlighter = value; }
+        }
+
+        private eValidationType _ValidationType = eValidationType.Manual;
+        /// <summary>
+        /// Gets or sets the validation type performed by the control. Default value is Manual.
+        /// </summary>
+        [DefaultValue(eValidationType.Manual), Category("Behavior"), Description("Indicates validation type performed by the control.")]
+        public eValidationType ValidationType
+        {
+            get { return _ValidationType; }
+            set { _ValidationType = value; }
+        }
+
+        private Control _ContainerControl = null;
+        /// <summary>
+        /// Gets or sets the container control validator is bound to. The container control must be set for the ValidationType ValidatingEventOnContainer.
+        /// When ContainerControl is Form the validator handles the Closing event of the form to perform the validation and cancel the form closing.
+        /// You can disable that by setting either Enabled=false or Form.CausesValidation=false.
+        /// </summary>
+        [DefaultValue(null), Description("Indicates container control validator is bound to. Should be set to parent form."), Category("Behavior")]
+        public Control ContainerControl
+        {
+            get
+            {
+                return _ContainerControl;
+            }
+            set
+            {
+                if (_ContainerControl != value)
+                {
+                    if (_ContainerControl != null)
+                    {
+                        if (_ContainerControl is Form)
+                            ((Form)_ContainerControl).FormClosing -= ContainerFormClosing;
+                        else
+                            _ContainerControl.Validating -= ContainerValidating;
+                    }
+
+                    _ContainerControl = value;
+
+                    if (_ContainerControl != null)
+                    {
+                        if (_ContainerControl is Form)
+                            ((Form)_ContainerControl).FormClosing += ContainerFormClosing;
+                        else
+                            _ContainerControl.Validating += ContainerValidating;
+                    }
+                }
+            }
+        }
+        private void ContainerFormClosing(object sender, FormClosingEventArgs e)
+        {
+            if (!this.Enabled || (_ValidationType & eValidationType.ValidatingEventOnContainer) != eValidationType.ValidatingEventOnContainer || !((Form)sender).CausesValidation)
+                return;
+
+            e.Cancel = !Validate();
+        }
+        private void ContainerValidating(object sender, CancelEventArgs e)
+        {
+            if (!this.Enabled) return;
+
+            if (_ValidationType == eValidationType.ValidatingEventOnContainer)
+                e.Cancel = !Validate();
+        }
+
+        private bool _Enabled = true;
+        /// <summary>
+        /// Gets or sets whether validation is performed. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether validation is performed.")]
+        public bool Enabled
+        {
+            get { return _Enabled; }
+            set
+            {
+                _Enabled = value;
+            }
+        }
+
+        private bool _CancelValidatingOnControl = true;
+        /// <summary>
+        /// Gets or sets whether Cancel argument in Validating event for validation type ValidatingEventPerControl is set to true when validation fails.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether Cancel argument in Validating event for validation type ValidatingEventPerControl is set to true when validation fails.")]
+        public bool CancelValidatingOnControl
+        {
+            get { return _CancelValidatingOnControl; }
+            set
+            {
+                _CancelValidatingOnControl = value;
+            }
+        }
+
+        #endregion
+
+        #region IExtenderProvider Members
+
+        public bool CanExtend(object extendee)
+        {
+            return extendee is Control;
+        }
+
+        #endregion
+
+        #region Licensing
+#if !TRIAL
+        private string _LicenseKey = "";
+        [Browsable(false), DefaultValue("")]
+        public string LicenseKey
+        {
+            get { return _LicenseKey; }
+            set
+            {
+                if (NativeFunctions.ValidateLicenseKey(value))
+                    return;
+                _LicenseKey = (!NativeFunctions.CheckLicenseKey(value) ? "9dsjkhds7" : value);
+            }
+        }
+#endif
+        #endregion
+    }
+
+    /// <summary>
+    /// Specifies the validation type for SuperValidator control.
+    /// </summary>
+    [Flags()]
+    public enum eValidationType
+    {
+        /// <summary>
+        /// SuperValidator uses manual validation, i.e. you will call Validate method to perform validation.
+        /// </summary>
+        Manual = 1,
+        /// <summary>
+        /// Validation is performed per control from each controls Validating event. The Cancel is set to true on event arguments if validation fails.
+        /// </summary>
+        ValidatingEventPerControl = 2,
+        /// <summary>
+        /// Validation is performed for all controls from Validating event on container control. By default container control is Form that SuperValidator is on.
+        /// </summary>
+        ValidatingEventOnContainer = 4
+    }
+    /// <summary>
+    /// Defines validator control pair used by SuperValidator control.
+    /// </summary>
+    public struct ValidatorControlPair
+    {
+        /// <summary>
+        /// Gets the validator associated with the control.
+        /// </summary>
+        public readonly ValidatorBase Validator;
+        /// <summary>
+        /// Gets control reference.
+        /// </summary>
+        public readonly Control Control;
+
+        /// <summary>
+        /// Initializes a new instance of the ValidatorControlPair structure.
+        /// </summary>
+        /// <param name="validator">Validator associated with the control</param>
+        /// <param name="control">Control reference</param>
+        public ValidatorControlPair(ValidatorBase validator, Control control)
+        {
+            Validator = validator;
+            Control = control;
+        }
+    }
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/Validator/SuperValidator.ico b/PROMS/DotNetBar Source Code/Validator/SuperValidator.ico
new file mode 100644
index 00000000..90e7d938
Binary files /dev/null and b/PROMS/DotNetBar Source Code/Validator/SuperValidator.ico differ
diff --git a/PROMS/DotNetBar Source Code/Validator/ValidatorBase.cs b/PROMS/DotNetBar Source Code/Validator/ValidatorBase.cs
new file mode 100644
index 00000000..72b9a2dc
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Validator/ValidatorBase.cs	
@@ -0,0 +1,269 @@
+#if FRAMEWORK20
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.ComponentModel;
+using System.Windows.Forms;
+using DevComponents.Editors;
+using DevComponents.Editors.DateTimeAdv;
+using System.Runtime.Serialization;
+
+namespace DevComponents.DotNetBar.Validator
+{
+    /// <summary>
+    /// Represents base validator used by SuperValidator component.
+    /// </summary>
+    [ToolboxItem(false), DesignTimeVisible(false)]
+    public abstract class ValidatorBase : Component
+    {
+        #region Events
+        /// <summary>
+        /// Occurs when validator retrieves the value for the control. It allows you to return value for the controls validator does not recognize.
+        /// </summary>
+        public event ValidatorGetValueEventHandler GetValue;
+        #endregion
+        #region Implementation
+        private string _ErrorMessage = "";
+        /// <summary>
+        /// Gets or sets the error message that is displayed by error provider when validation fails.
+        /// </summary>
+        [DefaultValue(""), Category("Appearance"), Description("Indicates error message that is displayed when validation fails."), Localizable(true)]
+        public virtual string ErrorMessage
+        {
+            get { return _ErrorMessage; }
+            set
+            {
+                _ErrorMessage = value;
+            }
+        }
+
+        private bool _LastValidationResult = true;
+        /// <summary>
+        /// Gets the last validation result returned from Validate call. True if validation was successful or false if validation failed.
+        /// </summary>
+        [Browsable(false)]
+        public bool LastValidationResult
+        {
+            get { return _LastValidationResult; }
+            internal set
+            {
+            	_LastValidationResult = value;
+            }
+        }
+        
+
+        /// <summary>
+        /// Validates the input control.
+        /// </summary>
+        /// <param name="input">Input control to validate.</param>
+        /// <returns>true if validation is successful otherwise false</returns>
+        public abstract bool Validate(Control input);
+
+        /// <summary>
+        /// Gets the input control value.
+        /// </summary>
+        /// <param name="input">Control to return value for.</param>
+        /// <returns>Controls value</returns>
+        protected virtual object GetControlValue(Control input)
+        {
+            return GetControlValue(input, _ValuePropertyName);
+        }
+
+        /// <summary>
+        /// Gets the input control value.
+        /// </summary>
+        /// <param name="input">Control to return value for.</param>
+        /// <returns>Controls value</returns>
+        protected virtual object GetControlValue(Control input, string valuePropertyName)
+        {
+            ValidatorGetValueEventArgs args = new ValidatorGetValueEventArgs(input, this);
+            OnGetValue(args);
+            if (args.ValueSet) return args.Value;
+
+            if (_SuperValidator != null)
+            {
+                _SuperValidator.InvokeGetValue(args);
+                if (args.ValueSet) return args.Value;
+            }
+
+            if (!string.IsNullOrEmpty(valuePropertyName))
+            {
+                return TypeDescriptor.GetProperties(input)[valuePropertyName].GetValue(input);
+            }
+
+            if (input is ComboBox)
+            {
+                ComboBox box = (ComboBox)input;
+                return box.SelectedIndex;
+            }
+            else if (input is DevComponents.DotNetBar.Controls.ComboTree)
+            {
+                DevComponents.DotNetBar.Controls.ComboTree cbt = (DevComponents.DotNetBar.Controls.ComboTree)input;
+                return cbt.SelectedIndex;
+            }
+
+            if (input is DoubleInput)
+                return ((DoubleInput)input).ValueObject;
+            else if(input is IntegerInput)
+                return ((IntegerInput)input).ValueObject;
+            else if (input is DateTimeInput)
+                return ((DateTimeInput)input).ValueObject;
+
+            object value = input.Text;
+            string text = input.Text;
+            long l = 0;
+            int i = 0;
+            double d = 0;
+            if (long.TryParse(text, out l))
+                value = l;
+            else if (int.TryParse(text, out i))
+                value = i;
+            else if (double.TryParse(text, out d))
+                value = d;
+
+            return value;
+        }
+
+        private SuperValidator _SuperValidator = null;
+        /// <summary>
+        /// Returns SuperValidator control validator is assigned to.
+        /// </summary>
+        [Browsable(false)]
+        public SuperValidator SuperValidator
+        {
+            get { return _SuperValidator; }
+            internal set { _SuperValidator = value; }
+        }
+
+        /// <summary>
+        /// Raises the GetValue event.
+        /// </summary>
+        /// <param name="e">Event arguments.</param>
+        protected virtual void OnGetValue(ValidatorGetValueEventArgs e)
+        {
+            ValidatorGetValueEventHandler handler = GetValue;
+            if (handler != null) handler(this, e);
+        }
+
+        private bool _DisplayError = true;
+        /// <summary>
+        /// Gets or sets whether error is displayed using the error provider on SuperValidator when validation fails. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether error is displayed using the error provider on SuperValidator when validation fails.")]
+        public bool DisplayError
+        {
+            get { return _DisplayError; }
+            set
+            {
+                _DisplayError = value;
+            }
+        }
+
+        private bool _Enabled = true;
+        /// <summary>
+        /// Gets or sets whether validator is enabled. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether validator is enabled.")]
+        public bool Enabled
+        {
+            get { return _Enabled; }
+            set
+            {
+                _Enabled = value;
+            }
+        }
+
+        private string _OptionalValidationGroup = "";
+        /// <summary>
+        /// Gets or sets the group name validation belongs to. When control belongs to optional validation group the validation is considered successful when any of the controls in the group validates.
+        /// </summary>
+        [DefaultValue(""), Category("Behavior"), Description("Specifies group name validation belongs to. When control belongs to optional validation group the validation is considered successful when any of the controls in the group validates.")]
+        public string OptionalValidationGroup
+        {
+            get { return _OptionalValidationGroup; }
+            set
+            {
+                if (value == null) value = "";
+                _OptionalValidationGroup = value;
+            }
+        }
+
+        private eHighlightColor _HighlightColor = eHighlightColor.None;
+        /// <summary>
+        /// Gets or sets the highlight color for control when validation fails if Highlighter component is used on SuperValidator. Default Value is None.
+        /// </summary>
+        [DefaultValue(eHighlightColor.None), Category("Appearance"), Description("Indicates highlight color for control when validation fails if Highlighter component is used on SuperValidator.")]
+        public eHighlightColor HighlightColor
+        {
+            get { return _HighlightColor; }
+            set { _HighlightColor = value; }
+        }
+
+        private string _ValuePropertyName = "";
+        /// <summary>
+        /// Gets or sets the value property name for the control to validate.
+        /// </summary>
+        [DefaultValue(""), Category("Behavior"), Description("Indicates value property name for the control to validate.")]
+        public string ValuePropertyName
+        {
+            get { return _ValuePropertyName; }
+            set
+            {
+                _ValuePropertyName = value;
+            }
+        }
+        
+        #endregion
+    }
+
+    #region ValidatorGetValue
+    public class ValidatorGetValueEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Initializes a new instance of the ValidatorGetValueEventArgs class.
+        /// </summary>
+        /// <param name="control"></param>
+        /// <param name="validator"></param>
+        public ValidatorGetValueEventArgs(Control control, ValidatorBase validator)
+        {
+            Control = control;
+            Validator = validator;
+        }
+
+        /// <summary>
+        /// Gets Control to retrieve value for.
+        /// </summary>
+        public readonly Control Control;
+
+        /// <summary>
+        /// Gets validator that is requesting value.
+        /// </summary>
+        public readonly ValidatorBase Validator;
+
+        private object _Value;
+        /// <summary>
+        /// Gets or sets the value that will be used by validator.
+        /// </summary>
+        public object Value
+        {
+            get { return _Value; }
+            set
+            {
+                _Value = value;
+                ValueSet = true;
+            }
+        }
+        internal bool ValueSet = false;
+        /// <summary>
+        /// Resets the Value set and indicates that validator will internally retrieve value for the control.
+        /// </summary>
+        public void ResetValue()
+        {
+            _Value = null;
+            ValueSet = false;
+        }
+    }
+    public delegate void ValidatorGetValueEventHandler(object sender, ValidatorGetValueEventArgs ea);
+    #endregion
+}
+#endif
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/VerticalContainerItem.cs b/PROMS/DotNetBar Source Code/VerticalContainerItem.cs
new file mode 100644
index 00000000..c7b9d16d
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/VerticalContainerItem.cs	
@@ -0,0 +1,376 @@
+using System;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Represents the container which layouts items vertically.
+	/// </summary>
+	[System.ComponentModel.ToolboxItem(false),System.ComponentModel.DesignTimeVisible(false)]
+	public class VerticalContainerItem:ImageItem
+	{
+		#region Private Variables
+		private int m_ItemSpacing=0;
+		#endregion
+
+		#region Constructor
+		/// <summary>
+		/// Creates new instance of the object.
+		/// </summary>
+		public VerticalContainerItem():base()
+		{
+			m_IsContainer=true;
+			m_SystemItem=true;
+			m_SupportedOrientation=eSupportedOrientation.Horizontal;
+			m_AllowOnlyOneSubItemExpanded=false;
+		}
+		#endregion
+
+		#region Overrides Implementation
+		/// <summary>
+		/// Returns copy of VerticalContainerItem item
+		/// </summary>
+		public override BaseItem Copy()
+		{
+			VerticalContainerItem objCopy=new VerticalContainerItem();
+			this.CopyToItem(objCopy);
+			return objCopy;
+		}
+		/// <summary>
+		/// Copies this object into the different instance.
+		/// </summary>
+		/// <param name="copy">Instance of the object to copy to. Must be of the same type.</param>
+		protected override void CopyToItem(BaseItem copy)
+		{
+			VerticalContainerItem objCopy=copy as VerticalContainerItem;
+			base.CopyToItem(objCopy);
+		}
+
+		/// <summary>
+		/// Gets or sets a value indicating whether the item is expanded or not. For Popup items this would indicate whether the item is popped up or not.
+		/// </summary>
+		[System.ComponentModel.Browsable(false),System.ComponentModel.DefaultValue(false),System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
+		public override bool Expanded
+		{
+			get
+			{
+				return base.Expanded;
+			}
+			set
+			{
+				if(!value)
+				{
+					foreach(BaseItem item in m_SubItems)
+					{
+						if(item.IsContainer)
+						{
+							foreach(BaseItem popup in item.SubItems)
+							{
+								if(popup is PopupItem && item.Expanded)
+									popup.Expanded=false;
+							}
+						}
+					}
+				}
+				base.Expanded=value;
+			}
+		}
+
+		/// <summary>
+		/// Recalculates the size of the item
+		/// </summary>
+		public override void RecalcSize()
+		{
+			// Vertical Container can have none or one or more container items expanded at a time
+			// The Control itself is displaying the scroll-bars and handling the
+			// case when this container is oversized. It is only possible to have
+			// vertical oversize. The items are always made to fit horizontally
+			int iY=m_Rect.Top;
+			if(m_SubItems!=null)
+			{
+				foreach(BaseItem item in m_SubItems)
+				{
+					if(item.Visible)
+					{
+						// Give it our maximum size
+						item.WidthInternal=this.WidthInternal;
+						item.HeightInternal=0;
+						// Set item position
+						item.LeftInternal=m_Rect.Left;
+						item.TopInternal=iY;
+
+						item.RecalcSize();
+						if(item.WidthInternal!=this.WidthInternal)
+							item.WidthInternal=this.WidthInternal;
+						
+						iY+=(item.HeightInternal+m_ItemSpacing);
+
+						item.Displayed=true;
+					}
+				}
+			}
+			iY-=m_ItemSpacing;
+			this.HeightInternal=iY;
+			base.RecalcSize();
+		}
+
+		/// <summary>
+		/// Indicates whether TopInternal property has changed.
+		/// </summary>
+		/// <param name="oldValue">Specifies old value of TopInternal property.</param>
+		protected override void OnTopLocationChanged(int oldValue)
+		{
+			int iDiff=m_Rect.Top-oldValue;
+			if(m_SubItems!=null)
+			{
+				foreach(BaseItem item in m_SubItems)
+				{
+					if(item.Visible)
+					{
+						// Set item position
+						item.TopInternal+=iDiff;
+					}
+				}
+			}
+		}
+
+		/// <summary>
+		/// Paints contained items.
+		/// </summary>
+		public override void Paint(ItemPaintArgs pa)
+		{
+			if(this.SuspendLayout)
+				return;
+			System.Drawing.Graphics g=pa.Graphics;
+			if(m_NeedRecalcSize)
+				RecalcSize();
+
+			if(m_SubItems==null)
+				return;
+
+			foreach(BaseItem item in m_SubItems)
+			{
+				if(item.Visible && item.Displayed)
+				{
+					if(item is IContainerWordWrap)
+					{
+						if(((IContainerWordWrap)item).WordWrapSubItems)
+							pa.ButtonStringFormat.FormatFlags=pa.ButtonStringFormat.FormatFlags & ~(pa.ButtonStringFormat.FormatFlags & StringFormatFlags.NoWrap);
+						else
+							pa.ButtonStringFormat.FormatFlags=pa.ButtonStringFormat.FormatFlags | StringFormatFlags.NoWrap;
+					}
+					else
+						pa.ButtonStringFormat.FormatFlags=pa.ButtonStringFormat.FormatFlags & ~(pa.ButtonStringFormat.FormatFlags & StringFormatFlags.NoWrap);
+					item.Paint(pa);
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets the orientation of the container. Cannot be used on VerticalContainerItem.
+		/// </summary>
+		[System.ComponentModel.Browsable(false)]
+		public override eOrientation Orientation
+		{
+			get
+			{
+				return eOrientation.Horizontal;
+			}
+			set
+			{
+				return;
+			}
+		}
+
+		/// <summary>
+		/// Occurs when the mouse pointer is over the item and a mouse button is pressed. This is used by internal implementation only.
+		/// </summary>
+		[System.ComponentModel.Browsable(false),System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+		public override void InternalMouseDown(System.Windows.Forms.MouseEventArgs objArg)
+		{
+			base.InternalMouseDown(objArg);
+			if(this.DesignMode)
+			{
+				if(this.ItemAtLocation(objArg.X,objArg.Y)==null)
+				{
+					IOwner owner=this.GetOwner() as IOwner;
+					if(owner!=null)
+						owner.SetFocusItem(null);
+				}
+			}
+		}
+
+		/// <summary>
+		/// Occurs when the mouse pointer is over the item and a mouse button is released. This is used by internal implementation only.
+		/// </summary>
+		[System.ComponentModel.Browsable(false),System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+		public override void InternalMouseUp(System.Windows.Forms.MouseEventArgs objArg)
+		{
+			if(m_HotSubItem!=null)
+			{
+				m_HotSubItem.InternalMouseUp(objArg);
+			}
+			else
+				base.InternalMouseUp(objArg);
+		}
+
+		/// <summary>
+		/// Sets input focus to next visible item in container.
+		/// </summary>
+		/// <returns>True if focus was set to next visible item otherwise false.</returns>
+		public bool FocusNextItem()
+		{
+			bool bBaseCall=true;
+			
+			BaseItem focusItem=((IOwner)this.GetOwner()).GetFocusItem();
+			bool bFocusNext=false;
+			if(focusItem==null)
+				bFocusNext=true;
+			int iLoopCount=0;
+			while(iLoopCount<2)
+			{
+				foreach(BaseItem item in this.SubItems)
+				{
+					if(item==focusItem)
+						bFocusNext=true;
+					else if(item.Visible && bFocusNext) 
+					{
+						((IOwner)this.GetOwner()).SetFocusItem(item);
+						iLoopCount=2;
+						bBaseCall=false;
+						break;
+					}
+					if(item.Expanded && item.Visible)
+					{
+						foreach(BaseItem child in item.SubItems)
+						{
+							if(child==focusItem)
+								bFocusNext=true;
+							else if(item.Visible && bFocusNext) 
+							{
+								((IOwner)this.GetOwner()).SetFocusItem(child);
+								iLoopCount=2;
+								bBaseCall=false;
+								break;
+							}
+						}
+						if(iLoopCount==2)
+							break;
+					}
+				}
+				iLoopCount++;
+			}				
+
+			return bBaseCall;
+		}
+
+		/// <summary>
+		/// Sets input focus to previous visible item in Explorer Bar.
+		/// </summary>
+		/// <returns>True if focus was set to previous visible item otherwise false.</returns>
+		public bool FocusPreviousItem()
+		{
+			bool bBaseCall=true;
+			
+			BaseItem focusItem=((IOwner)this.GetOwner()).GetFocusItem();
+			bool bFocusNext=false;
+			if(focusItem==null)
+				bFocusNext=true;
+			int iLoopCount=0;
+			while(iLoopCount<2)
+			{
+				for(int groupIndex=this.SubItems.Count-1;groupIndex>=0;groupIndex--)
+				{
+					BaseItem item=this.SubItems[groupIndex];
+					
+					if(item.Expanded && item.Visible)
+					{
+						for(int index=item.SubItems.Count-1;index>=0;index--)
+						{
+							BaseItem child=item.SubItems[index];
+							if(child==focusItem)
+								bFocusNext=true;
+							else if(item.Visible && bFocusNext) 
+							{
+								((IOwner)this.GetOwner()).SetFocusItem(child);
+								iLoopCount=2;
+								bBaseCall=false;
+								break;
+							}
+						}
+						if(iLoopCount==2)
+							break;
+					}
+
+					if(item==focusItem)
+						bFocusNext=true;
+					else if(item.Visible && bFocusNext) 
+					{
+						((IOwner)this.GetOwner()).SetFocusItem(item);
+						iLoopCount=2;
+						bBaseCall=false;
+						break;
+					}
+				}
+				iLoopCount++;
+			}				
+
+			return bBaseCall;
+		}
+
+		/// <summary>
+		/// Occurs after an item has been added to the container. This procedure is called on both item being added and the parent of the item. To distinguish between those two states check the item parameter.
+		/// </summary>
+		/// <param name="item">When occurring on the parent this will hold the reference to the item that has been added. When occurring on the item being added this will be null (Nothing).</param>
+		protected internal override void OnItemAdded(BaseItem item)
+		{
+			base.OnItemAdded(item);
+			m_NeedRecalcSize=true;
+			if(this.DesignMode)
+			{
+				BarBaseControl bar=this.ContainerControl as BarBaseControl;
+				if(bar!=null)
+					this.Refresh();
+			}
+		}
+
+		/// <summary>
+		/// Occurs after an item has been removed.
+		/// </summary>
+		/// <param name="item">Item being removed.</param>
+		protected internal override void OnAfterItemRemoved(BaseItem item)
+		{
+			base.OnAfterItemRemoved(item);
+			m_NeedRecalcSize=true;
+			if(this.DesignMode)
+				this.Refresh();
+		}
+
+		/// <summary>
+		/// Occurs after SubItems Collection has been cleared.
+		/// </summary>
+		protected internal override void OnSubItemsClear()
+		{
+			base.OnSubItemsClear();
+			m_NeedRecalcSize=true;
+			if(this.DesignMode)
+				this.Refresh();
+		}
+		#endregion
+
+		#region Properties
+		/// <summary>
+		/// Gets or sets the vertical spacing between items in pixels.
+		/// </summary>
+		public int ItemSpacing
+		{
+			get {return m_ItemSpacing;}
+			set
+			{
+				m_NeedRecalcSize=true;
+				m_ItemSpacing=value;
+			}
+		}
+		#endregion
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/WinApi.cs b/PROMS/DotNetBar Source Code/WinApi.cs
new file mode 100644
index 00000000..54dcb645
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/WinApi.cs	
@@ -0,0 +1,1083 @@
+using System;
+using System.Text;
+using System.Drawing;
+using System.Runtime.InteropServices;
+
+namespace DevComponents.DotNetBar
+{
+    internal class WinApi
+    {
+        #region Windows Messages
+        public enum WindowsMessages
+        {
+            WM_DESTROY = 0x0002,
+            WM_NCPAINT = 0x0085,
+            WM_NCCALCSIZE = 0x0083,
+            WM_NCACTIVATE = 0x0086,
+            WM_SETTEXT = 0x000C,
+            WM_INITMENUPOPUP = 0x0117,
+            WM_WINDOWPOSCHANGED = 0x0047,
+            WM_NCHITTEST = 0x0084,
+            WM_ERASEBKGND = 0x0014,
+            WM_NCMOUSEMOVE = 0xA0,
+            WM_NCLBUTTONDOWN = 0xA1,
+            WM_NCMOUSELEAVE = 0x2A2,
+            WM_NCLBUTTONUP = 0xA2,
+            WM_NCMOUSEHOVER = 0x2A0,
+            WM_SETCURSOR = 0x20,
+            WM_SETICON = 0x0080,
+            WM_HSCROLL = 0x0114,
+            WM_VSCROLL = 0x115,
+            WM_MOUSEWHEEL = 0x020A,
+            WM_STYLECHANGING = 0x007C,
+            WM_STYLECHANGED = 0x7D,
+            WM_NCLBUTTONDBLCLK = 0xA3,
+            WM_MOUSEACTIVATE = 0x21,
+            WM_MOUSEMOVE = 0x0200,
+            WM_MDISETMENU = 0x230,
+            WM_MDIREFRESHMENU = 0x234,
+            WM_KEYDOWN = 0x0100,
+            WM_SIZE = 0x5,
+            WM_DWMCOMPOSITIONCHANGED = 0x031E,
+            WM_DRAWITEM = 0x002B,
+            SBM_SETPOS = 0x00E0,
+            SBM_SETSCROLLINFO = 0x00E9,
+            EM_GETMODIFY = 0x00B8,
+            EM_SETMODIFY = 0x00B9,
+            WM_LBUTTONUP = 0x0202,
+            WM_LBUTTONDOWN = 0x0201,
+            WM_LBUTTONDBLCLK = 0x0203,
+            WM_SYSTIMER = 0x0118,
+            WM_SETFOCUS = 0x0007,
+            WM_KILLFOCUS = 0x0008,
+            WM_PAINT = 0x000F,
+            WM_COMMAND = 0x0111,
+            WM_CTLCOLORBTN = 0x0135,
+            WM_CTLCOLORSCROLLBAR = 0x0137,
+            WM_MDIACTIVATE = 0x222,
+            WM_CAPTURECHANGED = 0x0215,
+            CB_GETDROPPEDSTATE = 0x0157,
+            WVR_VALIDRECTS = 0x400,
+            WM_GETMINMAXINFO = 0x0024,
+            WM_APPCOMMAND = 0x0319,
+            WM_USER = 0x0400,
+            WM_REFLECT = WM_USER + 0x1C00,
+            WM_REFLECTCOMMAND = WM_REFLECT + WM_COMMAND,
+            WM_DPICHANGED = 0x02E0,
+            WM_SETREDRAW=0x000B,
+            WM_MOVE=0x3
+        }
+
+        public enum ComboNotificationCodes : int
+        {
+            CBN_DROPDOWN = 7,
+            CBN_CLOSEUP = 8
+        }
+
+        public enum MouseKeyState : int
+        {
+            MK_LBUTTON = 0x0001,
+            MK_RBUTTON = 0x0002,
+            MK_SHIFT = 0x0004,
+            MK_CONTROL = 0x0008,
+            MK_MBUTTON = 0x0010,
+            MK_XBUTTON1 = 0x0020,
+            MK_XBUTTON2 = 0x0040
+
+        }
+
+        /// <summary>Options available when a form is tested for mose positions.</summary>
+        public enum WindowHitTestRegions
+        {
+            /// <summary>HTERROR: On the screen background or on a dividing line between windows 
+            /// (same as HTNOWHERE, except that the DefWindowProc function produces a system 
+            /// beep to indicate an error).</summary>
+            Error = -2,
+            /// <summary>HTTRANSPARENT: In a window currently covered by another window in the 
+            /// same thread (the message will be sent to underlying windows in the same thread 
+            /// until one of them returns a code that is not HTTRANSPARENT).</summary>
+            TransparentOrCovered = -1,
+            /// <summary>HTNOWHERE: On the screen background or on a dividing line between 
+            /// windows.</summary>
+            NoWhere = 0,
+            /// <summary>HTCLIENT: In a client area.</summary>
+            ClientArea = 1,
+            /// <summary>HTCAPTION: In a title bar.</summary>
+            TitleBar = 2,
+            /// <summary>HTSYSMENU: In a window menu or in a Close button in a child window.</summary>
+            SystemMenu = 3,
+            /// <summary>HTGROWBOX: In a size box (same as HTSIZE).</summary>
+            GrowBox = 4,
+            /// <summary>HTMENU: In a menu.</summary>
+            Menu = 5,
+            /// <summary>HTHSCROLL: In a horizontal scroll bar.</summary>
+            HorizontalScrollBar = 6,
+            /// <summary>HTVSCROLL: In the vertical scroll bar.</summary>
+            VerticalScrollBar = 7,
+            /// <summary>HTMINBUTTON: In a Minimize button. </summary>
+            MinimizeButton = 8,
+            /// <summary>HTMAXBUTTON: In a Maximize button.</summary>
+            MaximizeButton = 9,
+            /// <summary>HTLEFT: In the left border of a resizable window (the user can click 
+            /// the mouse to resize the window horizontally).</summary>
+            LeftSizeableBorder = 10,
+            /// <summary>HTRIGHT: In the right border of a resizable window (the user can click 
+            /// the mouse to resize the window horizontally).</summary>
+            RightSizeableBorder = 11,
+            /// <summary>HTTOP: In the upper-horizontal border of a window.</summary>
+            TopSizeableBorder = 12,
+            /// <summary>HTTOPLEFT: In the upper-left corner of a window border.</summary>
+            TopLeftSizeableCorner = 13,
+            /// <summary>HTTOPRIGHT: In the upper-right corner of a window border.</summary>
+            TopRightSizeableCorner = 14,
+            /// <summary>HTBOTTOM: In the lower-horizontal border of a resizable window (the 
+            /// user can click the mouse to resize the window vertically).</summary>
+            BottomSizeableBorder = 15,
+            /// <summary>HTBOTTOMLEFT: In the lower-left corner of a border of a resizable 
+            /// window (the user can click the mouse to resize the window diagonally).</summary>
+            BottomLeftSizeableCorner = 16,
+            /// <summary>HTBOTTOMRIGHT: In the lower-right corner of a border of a resizable 
+            /// window (the user can click the mouse to resize the window diagonally).</summary>
+            BottomRightSizeableCorner = 17,
+            /// <summary>HTBORDER: In the border of a window that does not have a sizing 
+            /// border.</summary>
+            NonSizableBorder = 18,
+            /// <summary>HTOBJECT: Unknown...No Documentation Found</summary>
+            Object = 19,
+            /// <summary>HTCLOSE: In a Close button.</summary>
+            CloseButton = 20,
+            /// <summary>HTHELP: In a Help button.</summary>
+            HelpButton = 21,
+            /// <summary>HTSIZE: In a size box (same as HTGROWBOX). (Same as GrowBox).</summary>
+            SizeBox = GrowBox,
+            /// <summary>HTREDUCE: In a Minimize button. (Same as MinimizeButton).</summary>
+            ReduceButton = MaximizeButton,
+            /// <summary>HTZOOM: In a Maximize button. (Same as MaximizeButton).</summary>
+            ZoomButton = MaximizeButton,
+        }
+
+        public enum GWL
+        {
+            GWL_WNDPROC = (-4),
+            GWL_HINSTANCE = (-6),
+            GWL_HWNDPARENT = (-8),
+            GWL_STYLE = (-16),
+            GWL_EXSTYLE = (-20),
+            GWL_USERDATA = (-21),
+            GWL_ID = (-12)
+        }
+
+        public enum RedrawWindowFlags : uint
+        {
+            RDW_INVALIDATE = 0x0001,
+            RDW_INTERNALPAINT = 0x0002,
+            RDW_ERASE = 0x0004,
+            RDW_VALIDATE = 0x0008,
+            RDW_NOINTERNALPAINT = 0x0010,
+            RDW_NOERASE = 0x0020,
+            RDW_NOCHILDREN = 0x0040,
+            RDW_ALLCHILDREN = 0x0080,
+            RDW_UPDATENOW = 0x0100,
+            RDW_ERASENOW = 0x0200,
+            RDW_FRAME = 0x0400,
+            RDW_NOFRAME = 0x0800
+        }
+        [Flags()]
+        public enum WindowStyles
+        {
+            WS_VISIBLE = 0x10000000,
+            WS_CAPTION = 0x00C00000,
+            WS_BORDER = 0x800000,
+            WS_DLGFRAME = 0x400000,
+            WS_THICKFRAME = 0x00040000,
+            WS_HSCROLL = 0x100000,
+            WS_VSCROLL = 0x200000
+        }
+        #endregion
+
+        #region Windows API
+        [DllImport("user32", EntryPoint = "SetWindowLongPtr")]
+        public static extern IntPtr SubclassWindow64(IntPtr hWnd, GWL nIndex, WindowProcDelegate dwNewLong);
+        [DllImport("user32", EntryPoint = "SetWindowLong")]
+        public static extern IntPtr SubclassWindow(IntPtr hWnd, GWL nIndex, WindowProcDelegate dwNewLong);
+        [DllImport("user32", EntryPoint = "SetWindowLongPtr")]
+        public static extern IntPtr SubclassWindow64(IntPtr hWnd, GWL nIndex, IntPtr dwNewLong);
+        [DllImport("user32", EntryPoint = "SetWindowLong")]
+        public static extern IntPtr SubclassWindow(IntPtr hWnd, GWL nIndex, IntPtr dwNewLong);
+        [DllImport("user32.dll", CharSet = CharSet.Auto)]
+        public static extern uint CallWindowProc(IntPtr prevWndFunc, IntPtr hWnd, int msg, IntPtr wparam, IntPtr lparam);
+        public delegate uint WindowProcDelegate(IntPtr hWnd, int msg, IntPtr wparam, IntPtr lparam);
+
+        [DllImport("user32.dll")]
+        public static extern bool EnableMenuItem(IntPtr hMenu, uint uIDEnableItem, uint uEnable);
+
+        public static char ToAscii(uint virtualKey)
+        {
+            StringBuilder outputBuilder = new StringBuilder(2);
+            byte[] keyState = new byte[256];
+            NativeFunctions.GetKeyboardState(keyState);
+            int result = ToAscii(virtualKey, 0, keyState,
+                                 outputBuilder, 0);
+            if (result == 1)
+                return outputBuilder[0];
+            else
+                return '\0';
+        }
+        [DllImport("user32.dll")]
+        private static extern int ToAscii(uint uVirtKey, uint uScanCode, byte[] lpKeyState, [Out] StringBuilder lpChar, uint uFlags);
+        [DllImport("user32.dll", CharSet = CharSet.Auto, ExactSpelling = true)]
+        public static extern short GetKeyState(int keyCode);
+
+        [DllImport("user32.dll")]
+        public static extern bool IsZoomed(IntPtr hWnd);
+        //[DllImport("user32.dll")]
+        //public static extern bool GetClientRect(IntPtr hWnd, out RECT lpRect);
+
+        [System.Runtime.InteropServices.DllImport("User32.dll", CharSet = System.Runtime.InteropServices.CharSet.Auto)]
+        public static extern IntPtr BeginPaint(IntPtr hWnd, ref PAINTSTRUCT ps);
+
+        [System.Runtime.InteropServices.DllImport("User32.dll", CharSet = System.Runtime.InteropServices.CharSet.Auto)]
+        public static extern bool EndPaint(IntPtr hWnd, ref PAINTSTRUCT ps);
+
+        [DllImport("gdi32.dll")]
+        public static extern int ExcludeClipRect(IntPtr hdc, int nLeftRect, int nTopRect, int nRightRect, int nBottomRect);
+
+        [DllImport("user32")]
+        public static extern int SendMessage(IntPtr hWnd, int Msg, IntPtr wParam, IntPtr lParam);
+        [DllImport("user32")]
+        public static extern int SendMessage(IntPtr hWnd, int Msg, int wParam, int lParam);
+
+        [DllImport("gdi32.dll", CharSet = CharSet.Auto)]
+        public static extern bool GetTextMetrics(HandleRef hdc, TEXTMETRIC tm);
+
+        [DllImport("user32.dll")]
+        public static extern bool SetMenu(IntPtr hWnd, IntPtr hMenu);
+
+        [DllImport("user32.dll")]
+        public static extern IntPtr GetMenu(IntPtr hWnd);
+
+        [DllImport("user32")]
+        public static extern bool RedrawWindow(IntPtr hWnd, [In] ref RECT lprcUpdate, IntPtr hrgnUpdate, RedrawWindowFlags flags);
+        [DllImport("user32")]
+        public static extern bool RedrawWindow(IntPtr hWnd, IntPtr lprcUpdate, IntPtr hrgnUpdate, RedrawWindowFlags flags);
+
+        [DllImport("user32")]
+        public static extern bool GetWindowRect(IntPtr hWnd, ref RECT r);
+
+        [DllImport("user32.dll", SetLastError = true, EntryPoint = "GetScrollBarInfo")]
+        public static extern int GetScrollBarInfo(IntPtr hWnd, uint idObject, ref SCROLLBARINFO psbi);
+
+        public enum SBOrientation : int
+        {
+             SB_HORZ = 0x0,
+             SB_VERT = 0x1,
+             SB_CTL = 0x2,
+             SB_BOTH = 0x3
+        }
+        [Flags()]
+        internal enum ScrollInfoMask:int
+        {
+            SIF_RANGE           = 0x0001,
+            SIF_PAGE            = 0x0002,
+            SIF_POS             = 0x0004,
+            SIF_DISABLENOSCROLL = 0x0008,
+            SIF_TRACKPOS        = 0x0010,
+            SIF_ALL             = (SIF_RANGE | SIF_PAGE | SIF_POS | SIF_TRACKPOS)
+        }
+        public enum ScrollBarCommands
+        {
+            SB_LINEUP = 0,
+            SB_LINELEFT = 0,
+            SB_LINEDOWN = 1,
+            SB_LINERIGHT = 1,
+            SB_PAGEUP = 2,
+            SB_PAGELEFT = 2,
+            SB_PAGEDOWN = 3,
+            SB_PAGERIGHT = 3,
+            SB_THUMBPOSITION = 4,
+            SB_THUMBTRACK = 5,
+            SB_TOP = 6,
+            SB_LEFT = 6,
+            SB_BOTTOM = 7,
+            SB_RIGHT = 7,
+            SB_ENDSCROLL = 8
+        }
+        [DllImport("user32.dll")]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        public static extern bool GetScrollInfo(IntPtr hwnd, SBOrientation fnBar, ref SCROLLINFO lpsi);
+
+        [DllImport("user32.dll", CharSet = CharSet.Auto, ExactSpelling = true)]
+        public static extern int SetScrollInfo(IntPtr hWnd, SBOrientation fnBar, ref SCROLLINFO si, bool redraw);
+
+        [DllImport("user32.dll")]
+        public static extern IntPtr GetWindowDC(IntPtr hWnd);
+        [DllImport("user32.dll")]
+        public static extern int ReleaseDC(IntPtr hWnd, IntPtr hDC);
+
+        [DllImport("user32.dll")]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        public static extern bool SetForegroundWindow(IntPtr hWnd);
+
+        [DllImport("user32.dll")]
+        public static extern bool AdjustWindowRectEx(ref RECT lpRect, int dwStyle,
+           bool bMenu, int dwExStyle);
+
+        // This static method is required because legacy OSes do not support
+        // GetWindowLongPtr 
+        public static IntPtr GetWindowLongPtr(IntPtr hWnd, int nIndex)
+        {
+            if (IntPtr.Size == 8)
+                return GetWindowLongPtr64(hWnd, nIndex);
+            else
+                return new IntPtr(GetWindowLong32(hWnd, nIndex));
+        }
+
+        [DllImport("user32.dll", EntryPoint = "GetWindowLong")]
+        public static extern int GetWindowLong32(IntPtr hWnd, int nIndex);
+
+        [DllImport("user32.dll", EntryPoint = "GetWindowLongPtr")]
+        public static extern IntPtr GetWindowLongPtr64(IntPtr hWnd, int nIndex);
+
+        [DllImport("user32.dll")]
+        public static extern int SetWindowLong(IntPtr hWnd, int nIndex, int dwNewLong);
+
+        public static IntPtr SetWindowLongPtr(IntPtr hwnd, int nIndex, IntPtr dwNewLong)
+        {
+            if (IntPtr.Size == 8)
+            {
+                return SetWindowLongPtr64(hwnd, nIndex, dwNewLong);
+            }
+            return new IntPtr(SetWindowLongPtr32(hwnd, nIndex, dwNewLong.ToInt32()));
+        }
+        [DllImport("user32.dll", EntryPoint = "SetWindowLong", SetLastError = true)]
+        private static extern int SetWindowLongPtr32(IntPtr hWnd, int nIndex, int dwNewLong);
+        [DllImport("user32.dll", EntryPoint = "SetWindowLongPtr", SetLastError = true)]
+        private static extern IntPtr SetWindowLongPtr64(IntPtr hWnd, int nIndex, IntPtr dwNewLong);
+
+        [DllImport("user32.dll", CharSet = CharSet.Auto, ExactSpelling = true)]
+        public static extern int MapWindowPoints(IntPtr hwndFrom, IntPtr hwndTo, ref POINT lpPoints, [MarshalAs(UnmanagedType.U4)] int cPoints);
+
+        [DllImport("user32")]
+        public static extern bool PostMessage(int hWnd, int Msg, int wParam, int lParam);
+        [DllImport("user32")]
+        public static extern bool PostMessage(IntPtr hWnd, int Msg, IntPtr wParam, IntPtr lParam);
+
+        [DllImport("gdi32.dll", CharSet = CharSet.Auto)]
+        public static extern bool DeleteDC(IntPtr hDC);
+
+        [DllImport("gdi32.dll", CharSet = CharSet.Auto)]
+        public static extern IntPtr SelectObject(IntPtr hDC, IntPtr hObject);
+
+        [DllImport("gdi32.dll", CharSet = CharSet.Auto)]
+        public static extern IntPtr CreateCompatibleDC(IntPtr hDC);
+
+        [DllImport("gdi32.dll", CharSet = CharSet.Auto)]
+        public static extern IntPtr CreateDIBSection(IntPtr hdc, BITMAPINFO pbmi, uint iUsage, int ppvBits, IntPtr hSection, uint dwOffset);
+
+        [DllImport("gdi32.dll", CharSet = CharSet.Auto)]
+        public static extern bool BitBlt(IntPtr hdc, int nXDest, int nYDest, int nWidth, int nHeight, IntPtr hdcSrc, int nXSrc, int nYSrc, uint dwRop);
+
+        [DllImport("gdi32")]
+        public static extern bool DeleteObject(IntPtr hObject);
+        [DllImport("gdi32")]
+        public static extern bool DeleteObject(int hObject);
+
+        public delegate void TimerDelegate(IntPtr hWnd, IntPtr uMsg, IntPtr idEvent, int dwTime);
+        [DllImport("user32.dll")]
+        public static extern UIntPtr SetTimer(IntPtr hWnd, UIntPtr nIDEvent, uint uElapse, TimerDelegate lpTimerFunc);
+        [DllImport("user32.dll")]
+        public static extern bool KillTimer(IntPtr hWnd, UIntPtr uIDEvent);
+
+        //[DllImport("gdi32.dll")]
+        //public static extern int CombineRgn(IntPtr hrgnDest, IntPtr hrgnSrc1, IntPtr hrgnSrc2, CombineRgnStyles fnCombineMode);
+        //public enum CombineRgnStyles : int
+        //{
+        //    RGN_AND = 1,
+        //    RGN_OR = 2,
+        //    RGN_XOR = 3,
+        //    RGN_DIFF = 4,
+        //    RGN_COPY = 5,
+        //    RGN_MIN = RGN_AND,
+        //    RGN_MAX = RGN_COPY
+        //}
+        //[DllImport("gdi32.dll")]
+        //public static extern IntPtr CreateRectRgn(int nLeftRect, int nTopRect, int nRightRect, int nBottomRect);
+
+        internal static bool ModifyHwndStyle(IntPtr hwnd, int removeStyle, int addStyle)
+        {
+            int curWindowStyle = GetWindowLongPtr(hwnd, (int)GWL.GWL_STYLE).ToInt32();
+            int newStyle = (curWindowStyle & ~removeStyle) | addStyle;
+            if (curWindowStyle == newStyle)
+            {
+                return false;
+            }
+
+            SetWindowLong(hwnd, (int)GWL.GWL_STYLE, newStyle);
+            return true;
+        }
+
+        #endregion
+
+        #region Structures
+        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
+        public class STYLESTRUCT
+        {
+            public uint styleOld;
+            public uint styleNew;
+        }
+
+        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
+        public class TEXTMETRIC
+        {
+            public int tmHeight;
+            public int tmAscent;
+            public int tmDescent;
+            public int tmInternalLeading;
+            public int tmExternalLeading;
+            public int tmAveCharWidth;
+            public int tmMaxCharWidth;
+            public int tmWeight;
+            public int tmOverhang;
+            public int tmDigitizedAspectX;
+            public int tmDigitizedAspectY;
+            public char tmFirstChar;
+            public char tmLastChar;
+            public char tmDefaultChar;
+            public char tmBreakChar;
+            public byte tmItalic;
+            public byte tmUnderlined;
+            public byte tmStruckOut;
+            public byte tmPitchAndFamily;
+            public byte tmCharSet;
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        public struct SCROLLBARINFO
+        {
+            public int cbSize;
+            public RECT rcScrollBar;
+            public int dxyLineButton;
+            public int xyThumbTop;
+            public int xyThumbBottom;
+            public int reserved;
+            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 6)]
+            public int[] rgstate;
+        }
+
+        public enum eScrollBarDirection
+        {
+            SB_HORZ = 0,
+            SB_VERT = 1
+        }
+
+        public enum eScrollInfoMask
+        {
+            SIF_RANGE = 0x1,
+            SIF_PAGE = 0x2,
+            SIF_POS = 0x4,
+            SIF_DISABLENOSCROLL = 0x8,
+            SIF_TRACKPOS = 0x10,
+            SIF_ALL = SIF_RANGE + SIF_PAGE + SIF_POS + SIF_TRACKPOS
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        public struct SCROLLINFO
+        {
+            public int cbSize;
+            public ScrollInfoMask fMask;
+            public int nMin;
+            public int nMax;
+            public int nPage;
+            public int nPos;
+            public int nTrackPos;
+            public override string ToString()
+            {
+                return string.Format("nMin={0}, nMax={1}, nPage={2}, nPos={3}, nTrackPos={4}",
+                    nMin, nMax, nPage, nPos, nTrackPos);
+            }
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        public struct POINT
+        {
+            public int x;
+            public int y;
+
+            public POINT(System.Drawing.Point p)
+            {
+                this.x = p.X;
+                this.y = p.Y;
+            }
+            public POINT(int x, int y)
+            {
+                this.x = x;
+                this.y = y;
+            }
+
+            public override string ToString()
+            {
+                return string.Format("{0},{1}", x, y);
+            }
+        }
+        public enum ShowWindowCommands : int
+        {
+            /// <summary>
+            /// Hides the window and activates another window.
+            /// </summary>
+            Hide = 0,
+            /// <summary>
+            /// Activates and displays a window. If the window is minimized or
+            /// maximized, the system restores it to its original size and position.
+            /// An application should specify this flag when displaying the window
+            /// for the first time.
+            /// </summary>
+            Normal = 1,
+            /// <summary>
+            /// Activates the window and displays it as a minimized window.
+            /// </summary>
+            ShowMinimized = 2,
+            /// <summary>
+            /// Maximizes the specified window.
+            /// </summary>
+            Maximize = 3, // is this the right value?
+            /// <summary>
+            /// Activates the window and displays it as a maximized window.
+            /// </summary>      
+            ShowMaximized = 3,
+            /// <summary>
+            /// Displays a window in its most recent size and position. This value
+            /// is similar to <see cref="Win32.ShowWindowCommand.Normal"/>, except
+            /// the window is not actived.
+            /// </summary>
+            ShowNoActivate = 4,
+            /// <summary>
+            /// Activates the window and displays it in its current size and position.
+            /// </summary>
+            Show = 5,
+            /// <summary>
+            /// Minimizes the specified window and activates the next top-level
+            /// window in the Z order.
+            /// </summary>
+            Minimize = 6,
+            /// <summary>
+            /// Displays the window as a minimized window. This value is similar to
+            /// <see cref="Win32.ShowWindowCommand.ShowMinimized"/>, except the
+            /// window is not activated.
+            /// </summary>
+            ShowMinNoActive = 7,
+            /// <summary>
+            /// Displays the window in its current size and position. This value is
+            /// similar to <see cref="Win32.ShowWindowCommand.Show"/>, except the
+            /// window is not activated.
+            /// </summary>
+            ShowNA = 8,
+            /// <summary>
+            /// Activates and displays the window. If the window is minimized or
+            /// maximized, the system restores it to its original size and position.
+            /// An application should specify this flag when restoring a minimized window.
+            /// </summary>
+            Restore = 9,
+            /// <summary>
+            /// Sets the show state based on the SW_* value specified in the
+            /// STARTUPINFO structure passed to the CreateProcess function by the
+            /// program that started the application.
+            /// </summary>
+            ShowDefault = 10,
+            /// <summary>
+            ///  <b>Windows 2000/XP:</b> Minimizes a window, even if the thread
+            /// that owns the window is not responding. This flag should only be
+            /// used when minimizing windows from a different thread.
+            /// </summary>
+            ForceMinimize = 11
+        }
+
+        public struct WINDOWPLACEMENT
+        {
+            public int length;
+            public int flags;
+            public int showCmd;
+            public POINT ptMinPosition;
+            public POINT ptMaxPosition;
+            public RECT rcNormalPosition;
+        }
+        /// <summary>
+        /// Retrieves the show state and the restored, minimized, and maximized positions of the specified window.
+        /// </summary>
+        /// <param name="hWnd">
+        /// A handle to the window.
+        /// </param>
+        /// <param name="lpwndpl">
+        /// A pointer to the WINDOWPLACEMENT structure that receives the show state and position information.
+        /// <para>
+        /// Before calling GetWindowPlacement, set the length member to sizeof(WINDOWPLACEMENT). GetWindowPlacement fails if lpwndpl-> length is not set correctly.
+        /// </para>
+        /// </param>
+        /// <returns>
+        /// If the function succeeds, the return value is nonzero.
+        /// <para>
+        /// If the function fails, the return value is zero. To get extended error information, call GetLastError.
+        /// </para>
+        /// </returns>
+        [DllImport("user32.dll", SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        internal static extern bool GetWindowPlacement(IntPtr hWnd, out WINDOWPLACEMENT lpwndpl);
+
+        [StructLayout(LayoutKind.Sequential)]
+        public struct NCCALCSIZE_PARAMS
+        {
+            public RECT rgrc0, rgrc1, rgrc2;
+            public IntPtr lppos;
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        public struct WINDOWPOS
+        {
+            public IntPtr hwnd;
+            public IntPtr hwndInsertAfter;
+            public int x, y;
+            public int cx, cy;
+            public int flags;
+            public override string ToString()
+            {
+                return string.Format("x={0}, y={1}, right={2}, bottom={3}", x, y, cx, cy);
+            }
+        }
+
+        [Serializable, StructLayout(LayoutKind.Sequential)]
+        public struct RECT
+        {
+            public int Left;
+            public int Top;
+            public int Right;
+            public int Bottom;
+
+            public RECT(int left_, int top_, int right_, int bottom_)
+            {
+                Left = left_;
+                Top = top_;
+                Right = right_;
+                Bottom = bottom_;
+            }
+
+            public RECT(Rectangle r)
+            {
+                Left = r.Left;
+                Top = r.Top;
+                Right = r.Right;
+                Bottom = r.Bottom;
+            }
+
+            public int Height { get { return Bottom - Top; } }
+            public int Width { get { return Right - Left; } }
+            public Size Size { get { return new Size(Width, Height); } }
+
+            public Point Location { get { return new Point(Left, Top); } }
+
+            // Handy method for converting to a System.Drawing.Rectangle
+            public Rectangle ToRectangle()
+            { return Rectangle.FromLTRB(Left, Top, Right, Bottom); }
+
+            public static RECT FromRectangle(Rectangle rectangle)
+            {
+                return new RECT(rectangle.Left, rectangle.Top, rectangle.Right, rectangle.Bottom);
+            }
+
+            public override int GetHashCode()
+            {
+                return Left ^ ((Top << 13) | (Top >> 0x13))
+                  ^ ((Width << 0x1a) | (Width >> 6))
+                  ^ ((Height << 7) | (Height >> 0x19));
+            }
+
+            public static RECT FromXYWH(int x, int y, int width, int height)
+            {
+                return new RECT(x, y, x + width, y + height);
+            }
+
+            #region Operator overloads
+
+            public static implicit operator Rectangle(RECT rect)
+            {
+                return Rectangle.FromLTRB(rect.Left, rect.Top, rect.Right, rect.Bottom);
+            }
+
+            public static implicit operator RECT(Rectangle rect)
+            {
+                return new RECT(rect.Left, rect.Top, rect.Right, rect.Bottom);
+            }
+
+            public override string ToString()
+            {
+                return "Left=" + this.Left + ", Top=" + this.Top + ", Right=" + this.Right + ", Bottom=" + this.Bottom;
+            }
+            #endregion
+        }
+
+        [System.Runtime.InteropServices.StructLayout(System.Runtime.InteropServices.LayoutKind.Sequential)]
+        public struct PAINTSTRUCT
+        {
+            public IntPtr hdc;
+            public int fErase;
+            public WinApi.RECT rcPaint;
+            public int fRestore;
+            public int fIncUpdate;
+            public int Reserved1;
+            public int Reserved2;
+            public int Reserved3;
+            public int Reserved4;
+            public int Reserved5;
+            public int Reserved6;
+            public int Reserved7;
+            public int Reserved8;
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        public class BITMAPINFO
+        {
+            public int biSize = 0;
+            public int biWidth = 0;
+            public int biHeight = 0;
+            public short biPlanes = 0;
+            public short biBitCount = 0;
+            public int biCompression = 0;
+            public int biSizeImage = 0;
+            public int biXPelsPerMeter = 0;
+            public int biYPelsPerMeter = 0;
+            public int biClrUsed = 0;
+            public int biClrImportant = 0;
+            public byte bmiColors_rgbBlue = 0;
+            public byte bmiColors_rgbGreen = 0;
+            public byte bmiColors_rgbRed = 0;
+            public byte bmiColors_rgbReserved = 0;
+        }
+
+        public enum eObjectId : uint
+        {
+            OBJID_CLIENT = 0xFFFFFFFC,
+            OBJID_VSCROLL = 0xFFFFFFFB,
+            OBJID_HSCROLL = 0xFFFFFFFA
+        }
+
+        public enum eStateFlags
+        {
+            STATE_SYSTEM_INVISIBLE = 0x00008000,
+            STATE_SYSTEM_OFFSCREEN = 0x00010000,
+            STATE_SYSTEM_PRESSED = 0x00000008,
+            STATE_SYSTEM_UNAVAILABLE = 0x00000001
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        public struct MINMAXINFO
+        {
+            public Point reserved;
+            public Size maxSize;
+            public Point maxPosition;
+            public Size minTrackSize;
+            public Size maxTrackSize;
+        }
+        #endregion
+
+        #region Functions
+        [DllImport("user32.dll", CharSet = CharSet.Auto, SetLastError = true, ExactSpelling = true)]
+        public static extern int ScrollWindowEx(HandleRef hWnd, int nXAmount, int nYAmount, ref RECT rectScrollRegion, ref RECT rectClip, IntPtr hrgnUpdate, ref RECT prcUpdate, int flags);
+
+        [DllImport("Gdi32.dll", EntryPoint = "CreateRoundRectRgn")]
+        public static extern IntPtr CreateRoundRectRgn
+        (
+            int nLeftRect, // x-coordinate of upper-left corner
+            int nTopRect, // y-coordinate of upper-left corner
+            int nRightRect, // x-coordinate of lower-right corner
+            int nBottomRect, // y-coordinate of lower-right corner
+            int nWidthEllipse, // height of ellipse
+            int nHeightEllipse // width of ellipse
+         );
+
+        public enum AppCommands
+        {
+            APPCOMMAND_BROWSER_BACKWARD = 1,
+            APPCOMMAND_BROWSER_FORWARD = 2
+        }
+        private static int FAPPCOMMAND_MASK = 0xF000;
+        public static short GetAppCommandLParam(IntPtr lParam)
+        {
+            return (short)((short)HIWORD(lParam) & ~FAPPCOMMAND_MASK);
+        }
+        public static int LOWORD(int n)
+        {
+            return (short)(n & 0xffff);
+        }
+        public static int HIWORD(int n)
+        {
+            return (int)((n >> 0x10) & 0xffff);
+        }
+        public static int LOWORD(IntPtr n)
+        {
+            return unchecked((short)(long)n);
+            //return LOWORD((int)((long)n));
+        }
+        public static int HIWORD(IntPtr n)
+        {
+            //return (IntPtr.Size == 8 ? unchecked((int)n.ToInt64()) : n.ToInt32()) >> 16;
+            return unchecked((short)((long)n >> 16));
+        }
+
+        public static IntPtr CreateLParam(int loWord, int hiWord)
+        {
+            byte[] bx = BitConverter.GetBytes(loWord);
+            byte[] by = BitConverter.GetBytes(hiWord);
+            byte[] blp = new byte[] { bx[0], bx[1], by[0], by[1] };
+            return new IntPtr(BitConverter.ToInt32(blp, 0));
+        }
+
+        public static int ToInt(IntPtr ptr)
+        {
+            int result = 0;
+            try { result = (int)((long)ptr); }
+            catch { }
+            return result;
+        }
+        #endregion
+
+        #region DWM
+        [StructLayout(LayoutKind.Sequential)]
+        public struct MARGINS
+        {
+            public int cxLeftWidth;
+            public int cxRightWidth;
+            public int cyTopHeight;
+            public int cyBottomHeight;
+        }
+
+        [DllImport("dwmapi.dll")]
+        public static extern int DwmSetWindowAttribute(
+           IntPtr hWnd,
+           int dwAttribute,
+           ref int attributeValue,
+            int sizeOfValueRetrived
+        );
+        [DllImport("dwmapi.dll")]
+        public static extern int DwmGetWindowAttribute(
+            IntPtr hwnd,
+            int dwAttribute,
+            ref int pvAttribute,
+            int sizeOfValueRetrived);
+
+        [DllImport("dwmapi.dll", PreserveSig = false)]
+        static extern bool DwmIsCompositionEnabled();
+
+        [DllImport("dwmapi.dll")]
+        public static extern int DwmDefWindowProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, out IntPtr plResult);
+        [DllImport("user32.dll", CharSet = CharSet.Unicode, EntryPoint = "DefWindowProcW")]
+        public static extern IntPtr DefWindowProc(IntPtr hWnd, WindowsMessages Msg, IntPtr wParam, IntPtr lParam);
+        [DllImport("user32.dll", CharSet = CharSet.Unicode, EntryPoint = "DefWindowProcW")]
+        public static extern IntPtr DefWindowProc(IntPtr hWnd, int Msg, IntPtr wParam, IntPtr lParam);
+
+        [DllImport("dwmapi.dll")]
+        public static extern int DwmExtendFrameIntoClientArea(IntPtr hWnd, ref MARGINS pMargins);
+
+        public static void ExtendGlass(IntPtr handle, int glassHeight)
+        {
+            MARGINS margins = new MARGINS();
+            margins.cxLeftWidth = 0;
+            margins.cxRightWidth = 0;
+            margins.cyTopHeight = glassHeight;
+            margins.cyBottomHeight = 0;
+
+            int result = DwmExtendFrameIntoClientArea(handle, ref margins);
+
+        }
+
+        public static bool IsGlassEnabled
+        {
+            get
+            {
+                if (System.Environment.OSVersion.Version.Major < 6)
+                    return false;
+                return DwmIsCompositionEnabled() && (System.Windows.Forms.Application.VisualStyleState == System.Windows.Forms.VisualStyles.VisualStyleState.ClientAndNonClientAreasEnabled);
+            }
+        }
+
+        public enum DWMWINDOWATTRIBUTE : int
+        {
+            DWMWA_NCRENDERING_ENABLED = 1,
+            DWMWA_NCRENDERING_POLICY = 2,
+            DWMWA_TRANSITIONS_FORCEDISABLED = 3,
+            DWMWA_ALLOW_NCPAINT = 4,
+            DWMWA_LAST = 5
+        }
+
+        public enum DWMNCRENDERINGPOLICY : int
+        {
+            DWMNCRP_USEWINDOWSTYLE = 0,
+            DWMNCRP_DISABLED = 1,
+            DWMNCRP_ENABLED = 2,
+            DWMNCRP_LAST = 3
+        }
+
+        public enum WVR
+        {
+            ALIGNTOP = 0x0010,
+            ALIGNLEFT = 0x0020,
+            ALIGNBOTTOM = 0x0040,
+            ALIGNRIGHT = 0x0080,
+            HREDRAW = 0x0100,
+            VREDRAW = 0x0200,
+            VALIDRECTS = 0x0400,
+            REDRAW = HREDRAW | VREDRAW,
+        }
+
+        #endregion
+    }
+
+    #region Taskbar
+    public enum TaskbarPosition
+    {
+        Unknown = -1,
+        Left,
+        Top,
+        Right,
+        Bottom,
+    }
+
+    internal sealed class Taskbar
+    {
+        private const string ClassName = "Shell_TrayWnd";
+
+        private Rectangle _Bounds = Rectangle.Empty;
+        public Rectangle Bounds
+        {
+            get { return _Bounds; }
+            private set { _Bounds=value;}
+        }
+
+        private TaskbarPosition _Position = TaskbarPosition.Unknown;
+        public TaskbarPosition Position
+        {
+            get { return _Position; }
+            private set { _Position = value; }
+        }
+        public Point Location
+        {
+            get
+            {
+                return this.Bounds.Location;
+            }
+        }
+        public Size Size
+        {
+            get
+            {
+                return this.Bounds.Size;
+            }
+        }
+
+        private bool _AlwaysOnTop = false;
+        //Always returns false under Windows 7
+        public bool AlwaysOnTop
+        {
+            get
+            {
+                return _AlwaysOnTop;
+            }
+            private set
+                    {
+                        _AlwaysOnTop = value;
+                    }
+        }
+        private bool _AutoHide = false;
+        public bool AutoHide
+        {
+            get
+            {
+                return _AutoHide;
+            }
+            private set
+                    {
+                        _AutoHide = value;
+                    }
+        }
+
+        public Taskbar()
+        {
+            IntPtr taskbarHandle = User32.FindWindow(Taskbar.ClassName, null);
+
+            APPBARDATA data = new APPBARDATA();
+            data.cbSize = (uint)Marshal.SizeOf(typeof(APPBARDATA));
+            data.hWnd = taskbarHandle;
+            IntPtr result = Shell32.SHAppBarMessage(ABM.GetTaskbarPos, ref data);
+            if (result == IntPtr.Zero)
+                throw new InvalidOperationException();
+
+            this.Position = (TaskbarPosition)data.uEdge;
+            this.Bounds = Rectangle.FromLTRB(data.rc.left, data.rc.top, data.rc.right, data.rc.bottom);
+
+            data.cbSize = (uint)Marshal.SizeOf(typeof(APPBARDATA));
+            result = Shell32.SHAppBarMessage(ABM.GetState, ref data);
+            int state = result.ToInt32();
+            this.AlwaysOnTop = (state & ABS.AlwaysOnTop) == ABS.AlwaysOnTop;
+            this.AutoHide = (state & ABS.Autohide) == ABS.Autohide;
+        }
+    }
+
+    public enum ABM : uint
+    {
+        New = 0x00000000,
+        Remove = 0x00000001,
+        QueryPos = 0x00000002,
+        SetPos = 0x00000003,
+        GetState = 0x00000004,
+        GetTaskbarPos = 0x00000005,
+        Activate = 0x00000006,
+        GetAutoHideBar = 0x00000007,
+        SetAutoHideBar = 0x00000008,
+        WindowPosChanged = 0x00000009,
+        SetState = 0x0000000A,
+    }
+
+    public enum ABE : uint
+    {
+        Left = 0,
+        Top = 1,
+        Right = 2,
+        Bottom = 3
+    }
+
+    public static class ABS
+    {
+        public const int Autohide = 0x0000001;
+        public const int AlwaysOnTop = 0x0000002;
+    }
+
+    public static class Shell32
+    {
+        [DllImport("shell32.dll", SetLastError = true)]
+        public static extern IntPtr SHAppBarMessage(ABM dwMessage, [In] ref APPBARDATA pData);
+    }
+
+    public static class User32
+    {
+        [DllImport("user32.dll", SetLastError = true)]
+        public static extern IntPtr FindWindow(string lpClassName, string lpWindowName);
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    public struct APPBARDATA
+    {
+        public uint cbSize;
+        public IntPtr hWnd;
+        public uint uCallbackMessage;
+        public ABE uEdge;
+        public RECT rc;
+        public int lParam;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    public struct RECT
+    {
+        public int left;
+        public int top;
+        public int right;
+        public int bottom;
+    }
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/WindowsHook.cs b/PROMS/DotNetBar Source Code/WindowsHook.cs
new file mode 100644
index 00000000..13c8b97b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/WindowsHook.cs	
@@ -0,0 +1,99 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Summary description for WindowsHook.
+	/// </summary>
+	internal class WindowsHook:IDisposable
+	{
+		[StructLayout(LayoutKind.Sequential)]
+		private struct CWPSTRUCT 
+		{ 
+			public int lParam; 
+			public int wParam; 
+			public int message; 
+			public int hwnd; 
+		}
+		[DllImport("user32")]
+		private static extern int SetWindowsHookEx(int HookType, CWPCallBack pfnCallBack, uint hInstance, int dwThreadId);
+		[DllImport("user32")]
+		private static extern int CallNextHookEx(int CurrentHookHandle, int nCode, int wParam, ref CWPSTRUCT lParam);
+		[DllImport("user32")]
+		private static extern bool UnhookWindowsHookEx(int HookHandle);
+		[DllImport("kernel32")]
+		private static extern int GetLastError();
+		[DllImport("kernel32.dll")]
+		private static extern uint GetModuleHandle([MarshalAs(UnmanagedType.LPTStr)]string /*LPCTSTR*/ lpModuleName);
+
+		private delegate int CWPCallBack(int nCode, int wParam, ref CWPSTRUCT lParam);
+
+		private const int WH_CALLWNDPROC=4;
+		private const int WH_GETMESSAGE = 3;
+		private const int WH_MOUSE = 7;
+
+
+		private int m_HookHandle=0;
+		private DotNetBarManager m_DotNetBar=null;
+
+		public WindowsHook(DotNetBarManager dm)
+		{
+			m_DotNetBar=dm;
+		}
+
+		public void Dispose()
+		{
+			this.UnHook();
+		}
+
+		public void Hook()
+		{
+			//uint m=GetModuleHandle(null);
+			//System.Windows.Forms.MessageBox.Show("Module="+GetLastError().ToString());
+			m_HookHandle=SetWindowsHookEx(WH_CALLWNDPROC,new CWPCallBack(this.HookCallBack),0,System.AppDomain.GetCurrentThreadId());
+			if(m_HookHandle==0)
+				Console.WriteLine("HOOOK DOES NOT WORK="+GetLastError().ToString());
+		}
+		public void UnHook()
+		{
+			if(m_HookHandle!=0)
+			{
+				UnhookWindowsHookEx(m_HookHandle);
+				m_HookHandle=0;
+			}
+		}
+		public bool Hooked
+		{
+			get
+			{
+				if(m_HookHandle!=0)
+					return true;
+				return false;
+			}
+		}
+		private int HookCallBack(int nCode, int wParam, ref CWPSTRUCT lParam)
+		{
+			if(lParam.message == NativeFunctions.WM_SYSKEYDOWN)
+			{
+				//m_DotNetBar.OnSysKeyDown(lParam.hwnd,lParam.wParam,lParam.lParam);
+			}
+			else if(lParam.message == NativeFunctions.WM_SYSKEYUP)
+			{
+				//m_DotNetBar.OnSysKeyUp(lParam.hwnd,lParam.wParam,lParam.lParam);
+			}
+			else if(lParam.message == NativeFunctions.WM_KEYDOWN)
+			{
+				//m_DotNetBar.OnKeyDown(lParam.hwnd,lParam.wParam,lParam.lParam);
+			}
+			else if(lParam.message == NativeFunctions.WM_LBUTTONDOWN || lParam.message==NativeFunctions.WM_NCLBUTTONDOWN ||
+				lParam.message==NativeFunctions.WM_RBUTTONDOWN || lParam.message==NativeFunctions.WM_MBUTTONDOWN || 
+				lParam.message==NativeFunctions.WM_NCMBUTTONDOWN || lParam.message==NativeFunctions.WM_NCRBUTTONDOWN)
+			{
+				//m_DotNetBar.OnMouseDown(lParam.hwnd,lParam.wParam,lParam.lParam);
+			}
+			
+			return CallNextHookEx(m_HookHandle,nCode,wParam,ref lParam);
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/Wizard/Wizard.cs b/PROMS/DotNetBar Source Code/Wizard/Wizard.cs
new file mode 100644
index 00000000..10887a2e
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Wizard/Wizard.cs	
@@ -0,0 +1,2174 @@
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.Drawing;
+using System.Data;
+using System.Windows.Forms;
+
+namespace DevComponents.DotNetBar
+{
+	/// <summary>
+	/// Represents Wizard control.
+	/// </summary>
+    [ToolboxBitmap(typeof(Wizard), "Wizard.Wizard.ico"), ToolboxItem(true), Designer("DevComponents.DotNetBar.Design.WizardDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+    public class Wizard : UserControl
+    {
+        #region Private Variables
+        private PanelControl panelHeader;
+        private int m_ButtonSpacingMajor = 8;
+        private int m_ButtonSpacingMinor = 1;
+        private int m_ButtonHeight = 22;
+        private FlatStyle m_ButtonFlatStyle = FlatStyle.System;
+        [EditorBrowsable(EditorBrowsableState.Never), Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public PanelControl panelFooter;
+        private ButtonX buttonHelp;
+        private ButtonX buttonCancel;
+        private ButtonX buttonFinish;
+        private ButtonX buttonNext;
+        private ButtonX buttonBack;
+
+        private bool m_FinishButtonAlwaysVisible = false;
+        private Label labelDescription;
+        private Label labelCaption;
+        
+        private WizardPageCollection m_WizardPages = new WizardPageCollection();
+        private Stack m_PagesHistory = new Stack();
+        private int m_SelectedPageIndex = 0;
+
+        private bool m_PageChangeDisableButtons = true;
+        private bool m_PageChangeWaitCursor = true;
+        private eWizardFormAcceptButton m_FormAcceptButton = eWizardFormAcceptButton.FinishAndNext;
+        private eWizardFormCancelButton m_FormCancelButton = eWizardFormCancelButton.Cancel;
+        private PictureBox pictureHeader;
+        private Image m_HeaderImage = null;
+        private bool m_HeaderImageChanged = false;
+		private bool m_HeaderImageVisible = true;
+        private bool m_HelpButtonVisible = true;
+
+        /// <summary> 
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.Container components = null;
+        #endregion
+
+        #region Events
+        /// <summary>
+        /// Occurs when Back button is clicked. You can cancel any default processing performed by Wizard control by setting Cancel=true on event arguments.
+        /// </summary>
+        [Description("Occurs when Back button is clicked.")]
+        public event CancelEventHandler BackButtonClick;
+        /// <summary>
+        /// Occurs when Next button is clicked. You can cancel any default processing performed by Wizard control by setting Cancel=true on event arguments.
+        /// </summary>
+        [Description("Occurs when Next button is clicked.")]
+        public event CancelEventHandler NextButtonClick;
+        /// <summary>
+        /// Occurs when Finish button is clicked. You can cancel any default processing performed by Wizard control by setting Cancel=true on event arguments.
+        /// </summary>
+        [Description("Occurs when Finish button is clicked.")]
+        public event CancelEventHandler FinishButtonClick;
+        /// <summary>
+        /// Occurs when Cancel button is clicked. You can cancel any default processing performed by Wizard control by setting Cancel=true on event arguments.
+        /// </summary>
+        [Description("Occurs when Cancel button is clicked.")]
+        public event CancelEventHandler CancelButtonClick;
+        /// <summary>
+        /// Occurs when Help button is clicked. You can cancel any default processing performed by Wizard control by setting Cancel=true on event arguments.
+        /// </summary>
+        [Description("Occurs when Help button is clicked.")]
+        public event CancelEventHandler HelpButtonClick;
+
+        /// <summary>
+        /// Occurs before wizard page has changed and gives you opportunity to cancel the change.
+        /// </summary>
+        [Description("Occurs before wizard page has changed and gives you opportunity to cancel the change.")]
+        public event WizardCancelPageChangeEventHandler WizardPageChanging;
+        /// <summary>
+        /// Occurs after wizard page has changed. This event cannot be cancelled. To cancel the page change please use WizardPageChanging event.
+        /// </summary>
+        [Description("Occurs after wizard page has changed.")]
+        public event WizardPageChangeEventHandler WizardPageChanged;
+
+        /// <summary>
+        /// Occurs when wizard buttons (Back, Next, Finish etc) are positioned and resized.
+        /// </summary>
+        [Description("Occurs when wizard buttons (Back, Next, Finish etc) are positioned and resized.")]
+        public event WizardButtonsLayoutEventHandler LayoutWizardButtons;
+        #endregion
+
+        #region Constructor Dispose
+        public Wizard()
+		{
+			// This call is required by the Windows.Forms Form Designer.
+			InitializeComponent();
+
+            m_WizardPages.ParentWizard = this;
+            pictureHeader.BackgroundImage = BarFunctions.LoadBitmap("SystemImages.WizardHeaderImage.png");
+            panelFooter.Style.StyleChanged += new EventHandler(FooterStyleStyleChanged);
+		}
+
+        private void FooterStyleStyleChanged(object sender, EventArgs e)
+        {
+            if (panelFooter.Style.BackColor == Color.Transparent && panelFooter.Style.BackColor2.IsEmpty && panelFooter.Style.BackColorBlend.Count == 0)
+                panelFooter.BackColor = Color.Transparent;
+            else if (panelFooter.BackColor != SystemColors.Control)
+                panelFooter.BackColor = SystemColors.Control;
+        }
+
+		/// <summary> 
+		/// Clean up any resources being used.
+		/// </summary>
+		protected override void Dispose( bool disposing )
+		{
+			if( disposing )
+			{
+				if(components != null)
+				{
+					components.Dispose();
+				}
+			}
+
+            if (BarUtilities.DisposeItemImages && !this.DesignMode)
+            {
+                BarUtilities.DisposeImage(ref m_HeaderImage);
+            }
+
+			base.Dispose( disposing );
+        }
+        #endregion
+
+        #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.panelHeader = new DevComponents.DotNetBar.PanelControl();
+            this.pictureHeader = new System.Windows.Forms.PictureBox();
+            this.labelDescription = new System.Windows.Forms.Label();
+            this.labelCaption = new System.Windows.Forms.Label();
+            this.panelFooter = new DevComponents.DotNetBar.PanelControl();
+            this.buttonHelp = new ButtonX();
+            this.buttonCancel = new ButtonX();
+            this.buttonFinish = new ButtonX();
+            this.buttonNext = new ButtonX();
+            this.buttonBack = new ButtonX();
+            this.panelHeader.SuspendLayout();
+            this.panelFooter.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // panelHeader
+            // 
+            this.panelHeader.AntiAlias=false;
+            this.panelHeader.BackColor = Color.Transparent;
+			this.panelHeader.CanvasColor = System.Drawing.SystemColors.Control;
+            this.panelHeader.Controls.Add(this.pictureHeader);
+            this.panelHeader.Controls.Add(this.labelDescription);
+            this.panelHeader.Controls.Add(this.labelCaption);
+            this.panelHeader.Dock = System.Windows.Forms.DockStyle.Top;
+            this.panelHeader.Location = new System.Drawing.Point(0, 0);
+            this.panelHeader.Name = "panelHeader";
+            this.panelHeader.Size = new System.Drawing.Size(548, 60);
+            // 
+            // 
+            // 
+            this.panelHeader.Style.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
+            this.panelHeader.Style.BackColorGradientAngle = 90;
+            this.panelHeader.Style.BorderBottom = DevComponents.DotNetBar.eStyleBorderType.Etched;
+            this.panelHeader.Style.BorderBottomWidth = 1;
+            this.panelHeader.Style.BorderColor = System.Drawing.SystemColors.Control;
+            this.panelHeader.Style.BorderLeftWidth = 1;
+            this.panelHeader.Style.BorderRightWidth = 1;
+            this.panelHeader.Style.BorderTopWidth = 1;
+            this.panelHeader.Style.TextAlignment = DevComponents.DotNetBar.eStyleTextAlignment.Center;
+            this.panelHeader.Style.TextColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
+            this.panelHeader.TabIndex = 5;
+            // 
+            // pictureHeader
+            // 
+            this.pictureHeader.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.pictureHeader.Location = new System.Drawing.Point(496, 6);
+            this.pictureHeader.Name = "pictureHeader";
+            this.pictureHeader.Size = new System.Drawing.Size(48, 48);
+            this.pictureHeader.TabIndex = 7;
+            this.pictureHeader.TabStop = false;
+            this.pictureHeader.BackgroundImageLayout = ImageLayout.None;
+            // 
+            // labelDescription
+            // 
+            this.labelDescription.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+                        | System.Windows.Forms.AnchorStyles.Left)
+                        | System.Windows.Forms.AnchorStyles.Right)));
+            this.labelDescription.Location = new System.Drawing.Point(44, 22);
+            this.labelDescription.Name = "labelDescription";
+            this.labelDescription.Size = new System.Drawing.Size(446, 32);
+            this.labelDescription.TabIndex = 1;
+            // 
+            // labelCaption
+            // 
+            this.labelCaption.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                        | System.Windows.Forms.AnchorStyles.Right)));
+            this.labelCaption.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.labelCaption.Location = new System.Drawing.Point(16, 5);
+            this.labelCaption.Name = "labelCaption";
+            this.labelCaption.Size = new System.Drawing.Size(474, 17);
+            this.labelCaption.TabIndex = 0;
+            // 
+            // panelFooter
+            // 
+			this.panelFooter.BackColor = System.Drawing.SystemColors.Control;
+			this.panelFooter.CanvasColor = System.Drawing.SystemColors.Control;
+            this.panelFooter.Controls.Add(this.buttonHelp);
+            this.panelFooter.Controls.Add(this.buttonCancel);
+            this.panelFooter.Controls.Add(this.buttonFinish);
+            this.panelFooter.Controls.Add(this.buttonNext);
+            this.panelFooter.Controls.Add(this.buttonBack);
+            this.panelFooter.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.panelFooter.Location = new System.Drawing.Point(0, 329);
+            this.panelFooter.Name = "panelFooter";
+            this.panelFooter.Size = new System.Drawing.Size(548, 46);
+			this.panelFooter.AntiAlias = false;
+            // 
+            // 
+            // 
+            this.panelFooter.TabIndex = 6;
+            this.panelFooter.Resize += new System.EventHandler(this.panelFooter_Resize);
+            // 
+            // buttonHelp
+            // 
+            this.buttonHelp.CausesValidation = false;
+            this.buttonHelp.Location = new System.Drawing.Point(462, 13);
+            this.buttonHelp.Name = "buttonHelp";
+            this.buttonHelp.Size = new System.Drawing.Size(74, 22);
+            this.buttonHelp.TabIndex = 5;
+            this.buttonHelp.Text = "Help";
+            this.buttonHelp.VisibleChanged += new System.EventHandler(this.CommandButtonVisibleChanged);
+            this.buttonHelp.Click += new System.EventHandler(this.buttonHelp_Click);
+            this.buttonHelp.ThemeAware = true;
+            this.buttonHelp.Style = eDotNetBarStyle.Office2000;
+            this.buttonHelp.ColorTable = eButtonColor.Office2007WithBackground;
+            // 
+            // buttonCancel
+            // 
+            this.buttonCancel.CausesValidation = false;
+            this.buttonCancel.Location = new System.Drawing.Point(382, 13);
+            this.buttonCancel.Name = "buttonCancel";
+            this.buttonCancel.Size = new System.Drawing.Size(74, 22);
+            this.buttonCancel.TabIndex = 4;
+            this.buttonCancel.Text = "Cancel";
+            this.buttonCancel.VisibleChanged += new System.EventHandler(this.CommandButtonVisibleChanged);
+            this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click);
+            this.buttonCancel.ThemeAware = true;
+            this.buttonCancel.Style = eDotNetBarStyle.Office2000;
+            this.buttonCancel.ColorTable = eButtonColor.Office2007WithBackground;
+            // 
+            // buttonFinish
+            // 
+            this.buttonFinish.Location = new System.Drawing.Point(148, 13);
+            this.buttonFinish.Name = "buttonFinish";
+            this.buttonFinish.Size = new System.Drawing.Size(74, 22);
+            this.buttonFinish.TabIndex = 3;
+            this.buttonFinish.Text = "Finish";
+            this.buttonFinish.VisibleChanged += new System.EventHandler(this.CommandButtonVisibleChanged);
+            this.buttonFinish.Click += new System.EventHandler(this.buttonFinish_Click);
+            this.buttonFinish.ThemeAware = true;
+            this.buttonFinish.Style = eDotNetBarStyle.Office2000;
+            this.buttonFinish.ColorTable = eButtonColor.Office2007WithBackground;
+            // 
+            // buttonNext
+            // 
+            this.buttonNext.Location = new System.Drawing.Point(302, 13);
+            this.buttonNext.Name = "buttonNext";
+            this.buttonNext.Size = new System.Drawing.Size(74, 22);
+            this.buttonNext.TabIndex = 2;
+            this.buttonNext.Text = "Next >";
+            this.buttonNext.VisibleChanged += new System.EventHandler(this.CommandButtonVisibleChanged);
+            this.buttonNext.Click += new System.EventHandler(this.buttonNext_Click);
+            this.buttonNext.ThemeAware = true;
+            this.buttonNext.Style = eDotNetBarStyle.Office2000;
+            this.buttonNext.ColorTable = eButtonColor.Office2007WithBackground;
+            // 
+            // buttonBack
+            // 
+            this.buttonBack.CausesValidation = false;
+            this.buttonBack.Location = new System.Drawing.Point(228, 13);
+            this.buttonBack.Name = "buttonBack";
+            this.buttonBack.Size = new System.Drawing.Size(74, 22);
+            this.buttonBack.TabIndex = 1;
+            this.buttonBack.Text = "< Back";
+            this.buttonBack.VisibleChanged += new System.EventHandler(this.CommandButtonVisibleChanged);
+            this.buttonBack.Click += new System.EventHandler(this.buttonBack_Click);
+            this.buttonBack.ThemeAware = true;
+            this.buttonBack.Style = eDotNetBarStyle.Office2000;
+            this.buttonBack.ColorTable = eButtonColor.Office2007WithBackground;
+            // 
+            // Wizard
+            // 
+            this.Controls.Add(this.panelHeader);
+            this.Controls.Add(this.panelFooter);
+            this.Name = "Wizard";
+            this.Size = new System.Drawing.Size(548, 375);
+            this.panelHeader.ResumeLayout(false);
+            this.panelFooter.ResumeLayout(false);
+            this.ResumeLayout(false);
+
+		}
+		#endregion
+
+        #region Public Properties
+        /// <summary>
+        /// Gets or sets the header image. Default value is null which means that internal header image is used. You can hide header image
+        /// by setting HeaderImageVisible property.
+        /// </summary>
+        [Browsable(true), Category("Header and Footer"), DefaultValue(null), Description("Indicates the header image.")]
+        public Image HeaderImage
+        {
+            get { return m_HeaderImage; }
+            set
+            {
+                m_HeaderImage = value;
+                m_HeaderImageChanged = true;
+                UpdatePageDisplay();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether header image is visible. Default value is true.
+        /// </summary>
+        [Browsable(true), Category("Header and Footer"), DefaultValue(true), Description("Indicates whether header image is visible.")]
+        public bool HeaderImageVisible
+        {
+            get { return m_HeaderImageVisible; }
+            set
+            {
+				m_HeaderImageVisible=value;
+                if (pictureHeader.Visible != m_HeaderImageVisible)
+                {
+                    pictureHeader.Visible = m_HeaderImageVisible;
+                    LayoutHeader();
+                }
+            }
+        }
+
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public new Control.ControlCollection Controls
+        {
+            get
+            {
+                return base.Controls;
+            }
+        }
+        /// <summary>
+        /// Gets or sets wizard button that is clicked when ENTER key is pressed. Default value is eWizardFormAcceptButton.FinishAndNext which 
+        /// indicates that finish button will be clicked if available otherwise next button will be clicked.
+        /// </summary>
+        [Browsable(true), DefaultValue(eWizardFormAcceptButton.FinishAndNext), Category("Wizard Behavior"), Description("Indicates wizard button that is clicked when ENTER key is pressed.")]
+        public eWizardFormAcceptButton FormAcceptButton
+        {
+            get { return m_FormAcceptButton; }
+            set
+            {
+                m_FormAcceptButton = value;
+                SetFormAcceptButton();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets wizard button that is clicked when ESCAPE key is pressed. Default value is eWizardFormCancelButton.Cancel which 
+        /// indicates that Cancel button will be clicked.
+        /// </summary>
+        [Browsable(true), DefaultValue(eWizardFormCancelButton.Cancel), Category("Wizard Behavior"), Description("Indicates wizard button that is clicked when ESCAPE key is pressed.")]
+        public eWizardFormCancelButton FormCancelButton
+        {
+            get { return m_FormCancelButton; }
+            set
+            {
+                m_FormCancelButton = value;
+                SetFormCancelButton();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether all buttons are disabled while wizard page is changed which prevents users from clicking the buttons
+        /// if page change is taking longer. Default value is true.
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Wizard Behavior"), Description("Indicates whether all buttons are disabled while wizard page is changed.")]
+        public bool PageChangeDisableButtons
+        {
+            get { return m_PageChangeDisableButtons; }
+            set { m_PageChangeDisableButtons = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether wait cursor is displayed while page is changed. Default value is true.
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Wizard Behavior"), Description("Indicates whether wait cursor is displayed while page is changed.")]
+        public bool PageChangeWaitCursor
+        {
+            get { return m_PageChangeWaitCursor; }
+            set { m_PageChangeWaitCursor = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the selected page index. You can set this property to change the currently selected wizard page.
+        /// </summary>
+        [Browsable(false), Category("Wizard Pages"), Description("Indicates selected page index."), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public int SelectedPageIndex
+        {
+            get { return m_SelectedPageIndex; }
+            set
+            {
+                if (value < 0)
+                    value = 0;
+
+                if (value < m_WizardPages.Count)
+                    ShowPage(m_WizardPages[value], eWizardPageChangeSource.Code);
+                else
+                    m_SelectedPageIndex = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets selected wizard page. You can set this property to change the currently selected wizard page.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public WizardPage SelectedPage
+        {
+            get
+            {
+                if (m_SelectedPageIndex < m_WizardPages.Count)
+                    return m_WizardPages[m_SelectedPageIndex];
+                return null;
+            }
+            set
+            {
+                if (!m_WizardPages.Contains(value))
+                    throw new InvalidOperationException("WizardPage is not member of WizardPages collection. Add page to the WizardPages collection before setting this property");
+                ShowPage(value, eWizardPageChangeSource.Code);
+            }
+        }
+
+        /// <summary>
+        /// Gets the collection of Wizard pages. The order of WizardPage objects inside of this collection determines the flow of the wizard.
+        /// </summary>
+        [Browsable(true), Category("Wizard Pages"), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public WizardPageCollection WizardPages
+        {
+            get
+            {
+                return m_WizardPages;
+            }
+        }
+
+        /// <summary>
+        /// Returns a Stack of page history. Each time next page is displayed by wizard, previously visited page is added to the history.
+        /// When user commands Wizard back, the last page from the history is shown and removed from the stack. You should not modify this collection
+        /// directly since it is maintained by Wizard control.
+        /// </summary>
+        [Browsable(false), Category("Wizard Pages"), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public Stack PagesHistory
+        {
+            get
+            {
+                return m_PagesHistory;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the FlatStyle setting for the wizard buttons. Default value is FlatStyle.System
+        /// </summary>
+        [DefaultValue(FlatStyle.System), Browsable(false), Category("Wizard Buttons"), Description("Indicates flat style for buttons"), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden), Obsolete("Property is obsolete and no longer applies")]
+        public FlatStyle ButtonFlatStyle
+        {
+            get { return m_ButtonFlatStyle; }
+            set
+            {
+                m_ButtonFlatStyle = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets height of wizard command buttons. Default value is 22 pixels.
+        /// </summary>
+        [Browsable(true), DefaultValue(22), Category("Wizard Buttons"), Description("Indicates the height of the wizard command buttons")]
+        public int ButtonHeight
+        {
+            get { return m_ButtonHeight; }
+            set
+            {
+                if (m_ButtonHeight != value)
+                {
+                    m_ButtonHeight = value;
+                    RepositionButtons();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether back button causes validation to be performed on any controls that require validation when it receives focus. Default value is false.
+        /// </summary>
+        [Browsable(true), DefaultValue(false), Category("Wizard Buttons"), Description("Indicates whether back button causes validation to be performed on any controls that require validation when it receives focus.")]
+        public bool BackButtonCausesValidation
+        {
+            get { return buttonBack.CausesValidation; }
+            set {buttonBack.CausesValidation = value;}
+        }
+
+        /// <summary>
+        /// Gets or sets tab index of back button. Default value is 1.
+        /// </summary>
+        [Browsable(true), DefaultValue(1), Category("Wizard Buttons"), Description("Indicates tab index of back button.")]
+        public int BackButtonTabIndex
+        {
+            get { return buttonBack.TabIndex; }
+            set { buttonBack.TabIndex = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the user can give the focus to this back button using the TAB key. Default value is true.
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Wizard Buttons"), Description("Indicates whether the user can give the focus to this back button using the TAB key.")]
+        public bool BackButtonTabStop
+        {
+            get { return buttonBack.TabStop; }
+            set { buttonBack.TabStop = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets caption of the back button.
+        /// </summary>
+        [Browsable(true), Localizable(true), DefaultValue("< Back"), Category("Wizard Buttons"), Description("Indicates caption of the button")]
+        public string BackButtonText
+        {
+            get { return buttonBack.Text; }
+            set { buttonBack.Text = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets width of the back button. Default value is 74.
+        /// </summary>
+        [Browsable(true), DefaultValue(74), Category("Wizard Buttons"), Description("Indicates width of button")]
+        public int BackButtonWidth
+        {
+            get { return buttonBack.Width; }
+            set
+            {
+                if (buttonBack.Width != value)
+                {
+                    buttonBack.Width = value;
+                    RepositionButtons();
+                }
+            }
+        }
+
+#if FRAMEWORK20
+        /// <summary>
+        /// Gets or sets auto size of the button. Default value is false.
+        /// </summary>
+        [Browsable(true), DefaultValue(false), Category("Wizard Buttons"), Description("Indicates whether button is auto sized")]
+        public bool BackButtonAutoSize
+        {
+            get { return buttonBack.AutoSize; }
+            set
+            {
+                if (buttonBack.AutoSize != value)
+                {
+                    buttonBack.AutoSize = value;
+                    RepositionButtons();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets auto size mode of the button. Default value is AutoSizeMode.GrowOnly.
+        /// </summary>
+        [Browsable(true), DefaultValue(AutoSizeMode.GrowOnly), Category("Wizard Buttons"), Description("Indicates button auto-size mode")]
+        public AutoSizeMode BackButtonAutoSizeMode
+        {
+            get { return buttonBack.AutoSizeMode; }
+            set
+            {
+                if (buttonBack.AutoSizeMode != value)
+                {
+                    buttonBack.AutoSizeMode = value;
+                    RepositionButtons();
+                }
+            }
+        }
+#endif
+
+        /// <summary>
+        /// Gets or sets whether next button causes validation to be performed on any controls that require validation when it receives focus. Default value is true.
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Wizard Buttons"), Description("Indicates whether button causes validation to be performed on any controls that require validation when it receives focus.")]
+        public bool NextButtonCausesValidation
+        {
+            get { return buttonNext.CausesValidation; }
+            set { buttonNext.CausesValidation = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets tab index of next button. Default value is 2.
+        /// </summary>
+        [Browsable(true), DefaultValue(2), Category("Wizard Buttons"), Description("Indicates tab index of next button.")]
+        public int NextButtonTabIndex
+        {
+            get { return buttonNext.TabIndex; }
+            set { buttonNext.TabIndex = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the user can give the focus to button using the TAB key. Default value is true.
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Wizard Buttons"), Description("Indicates whether the user can give the focus to button using the TAB key.")]
+        public bool NextButtonTabStop
+        {
+            get { return buttonNext.TabStop; }
+            set { buttonNext.TabStop = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets caption of the next button.
+        /// </summary>
+        [Browsable(true), Localizable(true), DefaultValue("Next >"), Category("Wizard Buttons"), Description("Indicates caption of the button")]
+        public string NextButtonText
+        {
+            get { return buttonNext.Text; }
+            set { buttonNext.Text = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets width of the next button. Default value is 74.
+        /// </summary>
+        [Browsable(true), DefaultValue(74), Category("Wizard Buttons"), Description("Indicates width of button")]
+        public int NextButtonWidth
+        {
+            get { return buttonNext.Width; }
+            set
+            {
+                if (buttonNext.Width != value)
+                {
+                    buttonNext.Width = value;
+                    RepositionButtons();
+                }
+            }
+        }
+
+#if FRAMEWORK20
+        /// <summary>
+        /// Gets or sets auto size of the button. Default value is false.
+        /// </summary>
+        [Browsable(true), DefaultValue(false), Category("Wizard Buttons"), Description("Indicates whether button is auto sized")]
+        public bool NextButtonAutoSize
+        {
+            get { return buttonNext.AutoSize; }
+            set
+            {
+                if (buttonNext.AutoSize != value)
+                {
+                    buttonNext.AutoSize = value;
+                    RepositionButtons();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets auto size mode of the button. Default value is AutoSizeMode.GrowOnly.
+        /// </summary>
+        [Browsable(true), DefaultValue(AutoSizeMode.GrowOnly), Category("Wizard Buttons"), Description("Indicates button auto-size mode")]
+        public AutoSizeMode NextButtonAutoSizeMode
+        {
+            get { return buttonNext.AutoSizeMode; }
+            set
+            {
+                if (buttonNext.AutoSizeMode != value)
+                {
+                    buttonNext.AutoSizeMode = value;
+                    RepositionButtons();
+                }
+            }
+        }
+#endif
+
+        /// <summary>
+        /// Gets or sets whether button causes validation to be performed on any controls that require validation when it receives focus. Default value is false.
+        /// </summary>
+        [Browsable(true), DefaultValue(false), Category("Wizard Buttons"), Description("Indicates whether button causes validation to be performed on any controls that require validation when it receives focus.")]
+        public bool CancelButtonCausesValidation
+        {
+            get { return buttonCancel.CausesValidation; }
+            set { buttonCancel.CausesValidation = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets tab index of the button. Default value is 4.
+        /// </summary>
+        [Browsable(true), DefaultValue(4), Category("Wizard Buttons"), Description("Indicates tab index of the button.")]
+        public int CancelButtonTabIndex
+        {
+            get { return buttonCancel.TabIndex; }
+            set { buttonCancel.TabIndex = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the user can give the focus to button using the TAB key. Default value is true.
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Wizard Buttons"), Description("Indicates whether the user can give the focus to button using the TAB key.")]
+        public bool CancelButtonTabStop
+        {
+            get { return buttonCancel.TabStop; }
+            set { buttonCancel.TabStop = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets caption of the button.
+        /// </summary>
+        [Browsable(true), Localizable(true), Category("Wizard Buttons"), Description("Indicates caption of the button")] // DefaultValue("Cancel") attribute removed since WinForms designer had trouble localizing with it
+        public string CancelButtonText
+        {
+            get { return buttonCancel.Text; }
+            set { buttonCancel.Text = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets width of the button. Default value is 74.
+        /// </summary>
+        [Browsable(true), DefaultValue(74), Category("Wizard Buttons"), Description("Indicates width of button")]
+        public int CancelButtonWidth
+        {
+            get { return buttonCancel.Width; }
+            set
+            {
+                if (buttonCancel.Width != value)
+                {
+                    buttonCancel.Width = value;
+                    RepositionButtons();
+                }
+            }
+        }
+
+#if FRAMEWORK20
+        /// <summary>
+        /// Gets or sets auto size of the button. Default value is false.
+        /// </summary>
+        [Browsable(true), DefaultValue(false), Category("Wizard Buttons"), Description("Indicates whether button is auto sized")]
+        public bool CancelButtonAutoSize
+        {
+            get { return buttonCancel.AutoSize; }
+            set
+            {
+                if (buttonCancel.AutoSize != value)
+                {
+                    buttonCancel.AutoSize = value;
+                    RepositionButtons();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets auto size mode of the button. Default value is AutoSizeMode.GrowOnly.
+        /// </summary>
+        [Browsable(true), DefaultValue(AutoSizeMode.GrowOnly), Category("Wizard Buttons"), Description("Indicates button auto-size mode")]
+        public AutoSizeMode CancelButtonAutoSizeMode
+        {
+            get { return buttonCancel.AutoSizeMode; }
+            set
+            {
+                if (buttonCancel.AutoSizeMode != value)
+                {
+                    buttonCancel.AutoSizeMode = value;
+                    RepositionButtons();
+                }
+            }
+        }
+#endif
+
+        /// <summary>
+        /// Gets or sets whether button causes validation to be performed on any controls that require validation when it receives focus. Default value is true.
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Wizard Buttons"), Description("Indicates whether button causes validation to be performed on any controls that require validation when it receives focus.")]
+        public bool FinishButtonCausesValidation
+        {
+            get { return buttonFinish.CausesValidation; }
+            set { buttonFinish.CausesValidation = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets tab index of the button. Default value is 4.
+        /// </summary>
+        [Browsable(true), DefaultValue(4), Category("Wizard Buttons"), Description("Indicates tab index of the button.")]
+        public int FinishButtonTabIndex
+        {
+            get { return buttonFinish.TabIndex; }
+            set { buttonFinish.TabIndex = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the user can give the focus to button using the TAB key. Default value is true.
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Wizard Buttons"), Description("Indicates whether the user can give the focus to button using the TAB key.")]
+        public bool FinishButtonTabStop
+        {
+            get { return buttonFinish.TabStop; }
+            set { buttonFinish.TabStop = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets caption of the button.
+        /// </summary>
+        [Browsable(true), Localizable(true), DefaultValue("Finish"), Category("Wizard Buttons"), Description("Indicates caption of the button")]
+        public string FinishButtonText
+        {
+            get { return buttonFinish.Text; }
+            set { buttonFinish.Text = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets width of the button. Default value is 74.
+        /// </summary>
+        [Browsable(true), DefaultValue(74), Category("Wizard Buttons"), Description("Indicates width of button")]
+        public int FinishButtonWidth
+        {
+            get { return buttonFinish.Width; }
+            set
+            {
+                if (buttonFinish.Width != value)
+                {
+                    buttonFinish.Width = value;
+                    RepositionButtons();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether finish button is always visible next to the Next button. Default value is false which means that Finish
+        /// button will be visible only on last Wizard page and it will replace the Next button. When set to true Finish button is always visible next
+        /// to the Next button except on first Welcome wizard page.
+        /// </summary>
+        [Browsable(true), DefaultValue(false), Category("Wizard Buttons"), Description("Indicates whether Finish button is always visible or only when needed.")]
+        public bool FinishButtonAlwaysVisible
+        {
+            get { return m_FinishButtonAlwaysVisible; }
+            set
+            {
+                if (m_FinishButtonAlwaysVisible != value)
+                {
+                    m_FinishButtonAlwaysVisible = value;
+                    OnFinishButtonAlwaysVisibleChanged();
+                    RepositionButtons();
+                }
+            }
+        }
+
+#if FRAMEWORK20
+        /// <summary>
+        /// Gets or sets auto size of the button. Default value is false.
+        /// </summary>
+        [Browsable(true), DefaultValue(false), Category("Wizard Buttons"), Description("Indicates whether button is auto sized")]
+        public bool FinishButtonAutoSize
+        {
+            get { return buttonFinish.AutoSize; }
+            set
+            {
+                if (buttonFinish.AutoSize != value)
+                {
+                    buttonFinish.AutoSize = value;
+                    RepositionButtons();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets auto size mode of the button. Default value is AutoSizeMode.GrowOnly.
+        /// </summary>
+        [Browsable(true), DefaultValue(AutoSizeMode.GrowOnly), Category("Wizard Buttons"), Description("Indicates button auto-size mode")]
+        public AutoSizeMode FinishButtonAutoSizeMode
+        {
+            get { return buttonFinish.AutoSizeMode; }
+            set
+            {
+                if (buttonFinish.AutoSizeMode != value)
+                {
+                    buttonFinish.AutoSizeMode = value;
+                    RepositionButtons();
+                }
+            }
+        }
+#endif
+
+        /// <summary>
+        /// Gets or sets whether button causes validation to be performed on any controls that require validation when it receives focus. Default value is false.
+        /// </summary>
+        [Browsable(true), DefaultValue(false), Category("Wizard Buttons"), Description("Indicates whether button causes validation to be performed on any controls that require validation when it receives focus.")]
+        public bool HelpButtonCausesValidation
+        {
+            get { return buttonHelp.CausesValidation; }
+            set { buttonHelp.CausesValidation = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets whether button is visible. Default value is true.
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Wizard Buttons"), Description("Indicates whether button is visible")]
+        public bool HelpButtonVisible
+        {
+            get { return m_HelpButtonVisible; }
+            set
+            {
+                m_HelpButtonVisible = value;
+                buttonHelp.Visible = m_HelpButtonVisible;
+                RepositionButtons();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets tab index of the button. Default value is 5.
+        /// </summary>
+        [Browsable(true), DefaultValue(5), Category("Wizard Buttons"), Description("Indicates tab index of the button.")]
+        public int HelpButtonTabIndex
+        {
+            get { return buttonHelp.TabIndex; }
+            set { buttonHelp.TabIndex = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the user can give the focus to button using the TAB key. Default value is true.
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Wizard Buttons"), Description("Indicates whether the user can give the focus to button using the TAB key.")]
+        public bool HelpButtonTabStop
+        {
+            get { return buttonHelp.TabStop; }
+            set { buttonHelp.TabStop = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets caption of the button.
+        /// </summary>
+        [Browsable(true), Localizable(true), DefaultValue("Help"), Category("Wizard Buttons"), Description("Indicates caption of the button")]
+        public string HelpButtonText
+        {
+            get { return buttonHelp.Text; }
+            set { buttonHelp.Text = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets width of the button. Default value is 74.
+        /// </summary>
+        [Browsable(true), DefaultValue(74), Category("Wizard Buttons"), Description("Indicates width of button")]
+        public int HelpButtonWidth
+        {
+            get { return buttonHelp.Width; }
+            set
+            {
+                if (buttonHelp.Width != value)
+                {
+                    buttonHelp.Width = value;
+                    RepositionButtons();
+                }
+            }
+        }
+
+#if FRAMEWORK20
+        /// <summary>
+        /// Gets or sets auto size of the button. Default value is false.
+        /// </summary>
+        [Browsable(true), DefaultValue(false), Category("Wizard Buttons"), Description("Indicates whether button is auto sized")]
+        public bool HelpButtonAutoSize
+        {
+            get { return buttonHelp.AutoSize; }
+            set
+            {
+                if (buttonHelp.AutoSize != value)
+                {
+                    buttonHelp.AutoSize = value;
+                    RepositionButtons();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets auto size mode of the button. Default value is AutoSizeMode.GrowOnly.
+        /// </summary>
+        [Browsable(true), DefaultValue(AutoSizeMode.GrowOnly), Category("Wizard Buttons"), Description("Indicates button auto-size mode")]
+        public AutoSizeMode HelpButtonAutoSizeMode
+        {
+            get { return buttonHelp.AutoSizeMode; }
+            set
+            {
+                if (buttonHelp.AutoSizeMode != value)
+                {
+                    buttonHelp.AutoSizeMode = value;
+                    RepositionButtons();
+                }
+            }
+        }
+#endif
+
+        /// <summary>
+        /// Gets or sets the height of the wizard footer. Default value is 46
+        /// </summary>
+        [Browsable(true), DefaultValue(46), Category("Header and Footer"), Description("Indicates height of the wizard footer.")]
+        public int FooterHeight
+        {
+            get { return panelFooter.Height; }
+            set
+            {
+                if (panelFooter.Height != value)
+                {
+                    panelFooter.Height = value;
+                    RepositionButtons();
+                    SetupPage(this.SelectedPage);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the height of the wizard header. Default value is 60
+        /// </summary>
+        [Browsable(true), DefaultValue(60), Category("Header and Footer"), Description("Indicates height of the wizard header.")]
+        public int HeaderHeight
+        {
+            get { return panelHeader.Height; }
+            set
+            {
+                if (panelHeader.Height != value)
+                {
+                    panelHeader.Height = value;
+                    SetupPage(this.SelectedPage);
+                }
+            }
+        }
+
+        private eWizardTitleImageAlignment _HeaderImageAlignment = eWizardTitleImageAlignment.Right;
+        /// <summary>
+        /// Gets or sets the header image alignment. Default value is right.
+        /// </summary>
+        [DefaultValue(eWizardTitleImageAlignment.Right), Category("Header and Footer"), Description("Indicates header image alignment.")]
+        public eWizardTitleImageAlignment HeaderImageAlignment
+        {
+            get { return _HeaderImageAlignment; }
+            set { _HeaderImageAlignment = value; LayoutHeader(); }
+        }
+
+        /// <summary>
+        /// Gets or sets the header image size for interior wizard pages. Default value is 48x48
+        /// </summary>
+        [Browsable(true), Category("Header and Footer"), Description("Indicates header image size for interior wizard pages.")]
+        public Size HeaderImageSize
+        {
+            get { return pictureHeader.Size; }
+            set
+            {
+                if (pictureHeader.Size != value)
+                {
+                    pictureHeader.Size = value;
+                    LayoutHeader();
+                }
+            }
+        }
+        private bool ShouldSerializeHeaderImageSize()
+        {
+            return (pictureHeader.Size.Width != 48 || pictureHeader.Size.Height != 48);
+        }
+        private void ResetHeaderImageSize()
+        {
+            TypeDescriptor.GetProperties(this)["HeaderImageSize"].SetValue(this, new Size(48, 48));
+        }
+
+        /// <summary>
+        /// Gets or sets indentation of header title label. Default value is 16.
+        /// </summary>
+        [Browsable(true), DefaultValue(16),Category("Header and Footer"), Description("Indicates indentation of header title label.")]
+        public int HeaderTitleIndent
+        {
+            get { return labelCaption.Left; }
+            set
+            {
+                if (labelCaption.Left != value)
+                {
+                    labelCaption.Left = value;
+                    LayoutHeader();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets indentation of header description label. Default value is 44.
+        /// </summary>
+        [Browsable(true), DefaultValue(44), Category("Header and Footer"), Description("Indicates indentation of header description label.")]
+        public int HeaderDescriptionIndent
+        {
+            get { return labelDescription.Left; }
+            set
+            {
+                if (labelDescription.Left != value)
+                {
+                    labelDescription.Left = value;
+                    LayoutHeader();
+                }
+            }
+        }
+
+        // <summary>
+        /// Indicates the font used to render header description text.
+        /// </summary>
+        [Category("Header and Footer"), Description(" Indicates the font used to render header description text.")]
+        public Font HeaderDescriptionFont
+        {
+            get { return labelDescription.Font; }
+            set { labelDescription.Font = value; LayoutHeader(); }
+        }
+
+        /// <summary>
+        /// Indicates the font used to render caption header text.
+        /// </summary>
+        [Category("Header and Footer"), Description("Indicates the font used to render caption header text.")]
+        public Font HeaderCaptionFont
+        {
+            get { return labelCaption.Font; }
+            set { labelCaption.Font = value; LayoutHeader(); }
+        }
+
+        private bool _HeaderDescriptionVisible = true;
+        /// <summary>
+        /// Gets or sets whether description text displayed in wizard header is visible.
+        /// </summary>
+        [DefaultValue(true), Category("Header and Footer"), Description("Indicates whether description text displayed in wizard header is visible.")]
+        public bool HeaderDescriptionVisible
+        {
+            get { return _HeaderDescriptionVisible; }
+            set
+            {
+                _HeaderDescriptionVisible = value;
+                labelDescription.Visible = value;
+                LayoutHeader();
+            }
+        }
+        
+
+        /// <summary>
+        /// Gets or sets the header background style.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), NotifyParentPropertyAttribute(true), Category("Style"), Description("Gets or sets header background style."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ElementStyle HeaderStyle
+        {
+            get
+            {
+                return panelHeader.Style;
+            }
+        }
+        /// <summary>
+        ///     Resets the style to it's default value.
+        /// </summary>
+        private void ResetHeaderStyle()
+        {
+            panelHeader.ResetStyle();
+        }
+
+        /// <summary>
+        /// Gets or sets the footer background style.
+        /// </summary>
+        [Browsable(true), DevCoBrowsable(true), NotifyParentPropertyAttribute(true), Category("Style"), Description("Gets or sets footer background style."), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+        public ElementStyle FooterStyle
+        {
+            get
+            {
+                return panelFooter.Style;
+            }
+        }
+        /// <summary>
+        ///     Resets the style to it's default value.
+        /// </summary>
+        private void ResetFooterStyle()
+        {
+            panelFooter.ResetStyle();
+        }
+
+        #endregion
+
+        #region Internal Implementation
+        /// <summary>
+        /// Simulates Back button click on Wizard control. Note that this method will raise the same events as 
+        /// standard Wizard Back button click.
+        /// </summary>
+        public void NavigateBack()
+        {
+            CancelEventArgs ce = new CancelEventArgs();
+            OnBackButtonClick(ce);
+            if (ce.Cancel)
+                return;
+
+            WizardPage page = this.SelectedPage;
+            if (page != null)
+            {
+                page.InvokeBackButtonClick(ce);
+                if (ce.Cancel)
+                    return;
+            }
+
+            page = GetBackPage();
+
+            if (page != null)
+            {
+                ShowPage(page, eWizardPageChangeSource.BackButton);
+            }
+        }
+
+        /// <summary>
+        /// Simulates Next button click on Wizard control. Note that this method will raise the same events as 
+        /// standard Wizard Next button click.
+        /// </summary>
+        public void NavigateNext()
+        {
+            CancelEventArgs ce = new CancelEventArgs();
+            OnNextButtonClick(ce);
+            if (ce.Cancel)
+                return;
+
+            WizardPage page = this.SelectedPage;
+            if (page != null)
+            {
+                page.InvokeNextButtonClick(ce);
+                if (ce.Cancel)
+                    return;
+            }
+
+            // Go to next page
+            page = GetNextPage();
+            if (page == null)
+                return;
+
+            WizardPage oldPage = this.SelectedPage;
+            if (ShowPage(page, eWizardPageChangeSource.NextButton))
+            {
+                if (!this.DesignMode)
+                    m_PagesHistory.Push(oldPage);
+            }
+        }
+
+        /// <summary>
+        /// Simulates Cancel button click on Wizard control. Note that this method will raise the same events as 
+        /// standard Wizard Cancel button click.
+        /// </summary>
+        public void NavigateCancel()
+        {
+            CancelEventArgs ce = new CancelEventArgs();
+            OnCancelButtonClick(ce);
+            if (ce.Cancel)
+                return;
+
+            WizardPage page = this.SelectedPage;
+            if (page != null)
+            {
+                page.InvokeCancelButtonClick(ce);
+                if (ce.Cancel)
+                    return;
+            }
+        }
+
+        /// <summary>
+        /// Simulates Finish button click on Wizard control. Note that this method will raise the same events as 
+        /// standard Wizard Finish button click.
+        /// </summary>
+        public void NavigateFinish()
+        {
+            CancelEventArgs ce = new CancelEventArgs();
+            OnFinishButtonClick(ce);
+            if (ce.Cancel)
+                return;
+
+            WizardPage page = this.SelectedPage;
+            if (page != null)
+            {
+                page.InvokeFinishButtonClick(ce);
+                if (ce.Cancel)
+                    return;
+            }
+        }
+
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            if (this.DesignMode && this.WizardPages.Count == 0)
+            {
+                Rectangle r = this.ClientRectangle;
+                Graphics g = e.Graphics;
+                r.Inflate(6, 6);
+                TextDrawing.DrawString(g, "Right-click control and use context menu commands to create, delete, navigate and re-order wizard pages. You can use Next and Back button to navigate wizard just like in run-time.",
+                    this.Font, SystemColors.ControlDarkDark, r,
+                    eTextFormat.HorizontalCenter | eTextFormat.VerticalCenter | eTextFormat.WordBreak);
+            }
+            base.OnPaint(e);
+        }
+
+		protected override void OnResize(EventArgs e)
+		{
+			base.OnResize(e);
+			if(this.DesignMode)
+				this.Invalidate();
+		}
+
+        private void LayoutHeader()
+        {
+            int margin = 4;
+            int titleWidth = this.Width - labelCaption.Left - margin;
+            int descWidth = this.Width - labelDescription.Left - margin;
+
+            if (m_HeaderImageVisible || this.DesignMode)
+            {
+                if (_HeaderImageAlignment == eWizardTitleImageAlignment.Right)
+                {
+                    pictureHeader.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+                    pictureHeader.Location = new Point(this.Width - pictureHeader.Width - margin,
+                        (panelHeader.Height - pictureHeader.Height) / 2);
+                }
+                else
+                {
+                    pictureHeader.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)));
+                    pictureHeader.Location = new Point(margin,
+                        (panelHeader.Height - pictureHeader.Height) / 2);
+                }
+                titleWidth -= (pictureHeader.Width + margin);
+                descWidth -= (pictureHeader.Width + margin);
+            }
+
+            labelCaption.Width = titleWidth;
+            labelDescription.Width = descWidth;
+            labelCaption.Top = 5;
+            labelCaption.Height = labelCaption.Font.Height + 4;
+
+            if (_HeaderImageAlignment == eWizardTitleImageAlignment.Right)
+            {
+                labelCaption.Left = 16;
+            }
+            else
+            {
+                labelCaption.Left = pictureHeader.Bounds.Right + 10;
+                if (!_HeaderDescriptionVisible)
+                    labelCaption.Top = (panelHeader.Height - labelCaption.Height) / 2;
+            }
+            labelDescription.Left = labelCaption.Left;
+
+            if (this.IsRightToLeft)
+            {
+                pictureHeader.Left = this.Width - pictureHeader.Bounds.Right;
+                labelCaption.Left = this.Width - labelCaption.Bounds.Right;
+                labelDescription.Left = this.Width - labelDescription.Bounds.Right;
+            }
+        }
+
+        /// <summary>
+        /// Returns reference to internal Next button control.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public ButtonX NextButtonControl
+        {
+            get { return buttonNext; }
+        }
+
+        /// <summary>
+        /// Returns reference to internal Cancel button control.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public ButtonX CancelButtonControl
+        {
+            get { return buttonCancel; }
+        }
+
+        /// <summary>
+        /// Returns reference to internal Finish button control.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public ButtonX FinishButtonControl
+        {
+            get { return buttonFinish; }
+        }
+
+        /// <summary>
+        /// Returns reference to internal Help button control.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public ButtonX HelpButtonControl
+        {
+            get { return buttonHelp; }
+        }
+
+        /// <summary>
+        /// Returns reference to internal Back button control.
+        /// </summary>
+        [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public ButtonX BackButtonControl
+        {
+            get { return buttonBack; }
+        }
+
+        private bool IsRightToLeft
+        {
+            get
+            {
+                return this.RightToLeft == RightToLeft.Yes;
+            }
+        }
+
+        protected override void OnRightToLeftChanged(EventArgs e)
+        {
+            this.RepositionButtons();
+            this.LayoutHeader();
+            base.OnRightToLeftChanged(e);
+        }
+
+        private void RepositionButtons()
+        {
+            int buttonSpacingMajor = Dpi.Width(m_ButtonSpacingMajor);
+            int x=panelFooter.Width-buttonSpacingMajor;
+            int buttonHeight = Dpi.Height(m_ButtonHeight);
+            int y=(panelFooter.Height-buttonHeight)/2;
+
+            WizardButtonsLayoutEventArgs e=new WizardButtonsLayoutEventArgs();
+
+            if (buttonHelp.Visible)
+            {
+                x -= buttonHelp.Width;
+                e.HelpButtonBounds = new Rectangle(x, y, buttonHelp.Width, buttonHeight);
+                x -= buttonSpacingMajor;
+            }
+
+            if (buttonCancel.Visible)
+            {
+                x -= buttonCancel.Width;
+                e.CancelButtonBounds = new Rectangle(x, y, buttonCancel.Width, buttonHeight);
+                x -= buttonSpacingMajor;
+            }
+
+            if (buttonFinish.Visible)
+            {
+                x -= buttonFinish.Width;
+                e.FinishButtonBounds = new Rectangle(x, y, buttonFinish.Width, buttonHeight);
+                if(m_FinishButtonAlwaysVisible)
+                    x -= buttonSpacingMajor;
+                else
+                    x -= m_ButtonSpacingMinor;
+            }
+
+            if (buttonNext.Visible)
+            {
+                x -= buttonNext.Width;
+                e.NextButtonBounds = new Rectangle(x, y, buttonNext.Width, buttonHeight);
+                x -= m_ButtonSpacingMinor;
+            }
+
+            if (buttonBack.Visible)
+            {
+                x -= buttonBack.Width;
+                e.BackButtonBounds = new Rectangle(x, y, buttonBack.Width, buttonHeight);
+                x -= m_ButtonSpacingMinor;
+            }
+
+            if (IsRightToLeft)
+            {
+                int xOffset = panelFooter.Width-x;
+                if (!e.HelpButtonBounds.IsEmpty)
+                {
+                    Rectangle r = e.HelpButtonBounds;
+                    e.HelpButtonBounds = new Rectangle(panelFooter.Width - r.Right, r.Y, r.Width, r.Height);
+                }
+                if (!e.CancelButtonBounds.IsEmpty)
+                {
+                    Rectangle r = e.CancelButtonBounds;
+                    e.CancelButtonBounds = new Rectangle(panelFooter.Width - r.Right, r.Y, r.Width, r.Height);
+                }
+                if (!e.FinishButtonBounds.IsEmpty)
+                {
+                    Rectangle r = e.FinishButtonBounds;
+                    e.FinishButtonBounds = new Rectangle(panelFooter.Width - r.Right, r.Y, r.Width, r.Height);
+                }
+                if (!e.NextButtonBounds.IsEmpty)
+                {
+                    Rectangle r = e.NextButtonBounds;
+                    e.NextButtonBounds = new Rectangle(panelFooter.Width - r.Right, r.Y, r.Width, r.Height);
+                }
+                if (!e.BackButtonBounds.IsEmpty)
+                {
+                    Rectangle r = e.BackButtonBounds;
+                    e.BackButtonBounds = new Rectangle(panelFooter.Width - r.Right, r.Y, r.Width, r.Height);
+                }
+            }
+
+            OnLayoutWizardButtons(e);
+
+            if (buttonHelp.Visible)
+                buttonHelp.Bounds = e.HelpButtonBounds;
+
+            if (buttonCancel.Visible)
+                buttonCancel.Bounds = e.CancelButtonBounds;
+
+            if (buttonNext.Visible)
+                buttonNext.Bounds = e.NextButtonBounds;
+
+            if (buttonFinish.Visible)
+                buttonFinish.Bounds = e.FinishButtonBounds;
+
+            if (buttonBack.Visible)
+                buttonBack.Bounds = e.BackButtonBounds;
+        }
+
+        private void OnFinishButtonAlwaysVisibleChanged()
+        {
+        }
+
+        private void panelFooter_Resize(object sender, EventArgs e)
+        {
+            RepositionButtons();
+        }
+
+        private void CommandButtonVisibleChanged(object sender, EventArgs e)
+        {
+            RepositionButtons();
+        }
+
+        private void buttonBack_Click(object sender, EventArgs e)
+        {
+            NavigateBack();
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public WizardPage GetBackPage()
+        {
+            WizardPage page = null;
+
+            if (m_PagesHistory.Count > 0)
+            {
+                page = m_PagesHistory.Pop() as WizardPage;
+            }
+            else
+            {
+                if (this.SelectedPageIndex > 0)
+                {
+                    page = m_WizardPages[this.SelectedPageIndex - 1];
+                }
+            }
+
+            return page;
+        }
+
+        private void buttonNext_Click(object sender, EventArgs e)
+        {
+            NavigateNext();
+        }
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public WizardPage GetNextPage()
+        {
+            if (this.SelectedPageIndex + 1 < m_WizardPages.Count)
+                return m_WizardPages[this.SelectedPageIndex + 1];
+            return null;
+        }
+
+        private void buttonFinish_Click(object sender, EventArgs e)
+        {
+            NavigateFinish();
+        }
+
+        private void buttonCancel_Click(object sender, EventArgs e)
+        {
+            NavigateCancel();
+        }
+
+        private void buttonHelp_Click(object sender, EventArgs e)
+        {
+            CancelEventArgs ce = new CancelEventArgs();
+            OnHelpButtonClick(ce);
+            if (ce.Cancel)
+                return;
+
+            WizardPage page = this.SelectedPage;
+            if (page != null)
+            {
+                page.InvokeHelpButtonClick(ce);
+                if (ce.Cancel)
+                    return;
+            }
+        }
+
+        internal void OnWizardPageAdded(WizardPage page)
+        {
+            SetupPage(page);
+            if (m_WizardPages.IndexOf(page) == m_SelectedPageIndex)
+                ShowPage(page, eWizardPageChangeSource.Code);
+            else
+                page.Visible = false;
+                
+            this.Controls.Add(page);
+
+            SetupButtons(true);
+        }
+
+        internal void OnWizardPageRemoved(WizardPage page)
+        {
+            this.Controls.Remove(page);
+            if (page.Visible && this.SelectedPage!=null && !this.SelectedPage.Visible)
+            {
+                ShowPage(this.SelectedPage, eWizardPageChangeSource.Code);
+            }
+        }
+
+        private bool ShowPage(WizardPage page, eWizardPageChangeSource changeSource)
+        {
+            WizardPage oldPage = this.SelectedPage;
+
+            WizardCancelPageChangeEventArgs e = new WizardCancelPageChangeEventArgs(page, oldPage, changeSource);
+            OnWizardPageChanging(e);
+            if (e.Cancel || e.NewPage==null)
+                return false;
+
+            page = e.NewPage;
+
+            if (page != null)
+            {
+                page.InvokeBeforePageDisplayed(e);
+                if (e.Cancel || e.NewPage == null)
+                    return false;
+                page = e.NewPage;
+            }
+
+            if (m_PageChangeDisableButtons)
+            {
+                buttonBack.Enabled = false;
+                buttonNext.Enabled = false;
+                buttonFinish.Enabled = false;
+                buttonCancel.Enabled = false;
+            }
+
+            if(m_PageChangeWaitCursor)
+                this.Cursor = Cursors.WaitCursor;
+
+            // Change the page
+            if (oldPage != null)
+            {
+                if (oldPage != page)
+                {
+                    if (this.DesignMode)
+                        TypeDescriptor.GetProperties(oldPage)["Visible"].SetValue(oldPage, false);
+                    oldPage.Visible = false;
+                    oldPage.InvokeAfterPageHidden(new WizardPageChangeEventArgs(page, oldPage, changeSource));
+                }
+                else
+                {
+                    foreach (WizardPage wp in this.WizardPages)
+                    {
+                        if (wp != page)
+                        {
+                            if (this.DesignMode)
+                                TypeDescriptor.GetProperties(wp)["Visible"].SetValue(wp, false);
+                            wp.Visible = false;
+                        }
+                    }
+                }
+            }
+
+            if (page != null)
+            {
+                if (this.DesignMode)
+                    TypeDescriptor.GetProperties(page)["Visible"].SetValue(page, true);
+
+                page.Visible = true;
+            }
+
+            m_SelectedPageIndex = m_WizardPages.IndexOf(page);
+
+            SetupButtons(true);
+            UpdatePageDisplay();
+
+            // Raise event
+            e.Cancel = false;
+            OnWizardPageChanged(e);
+
+            if (page != null)
+            {
+                page.InvokeAfterPageDisplayed(new WizardPageChangeEventArgs(page, oldPage, changeSource));
+            }
+
+            if (m_PageChangeWaitCursor)
+                this.Cursor = Cursors.Default;
+
+            return true;
+        }
+
+        internal void UpdatePageDisplay()
+        {
+            WizardPage page = this.SelectedPage;
+            if (page == null)
+                return;
+
+            if (page.InteriorPage)
+            {
+                if (!panelHeader.Visible)
+                    panelHeader.Visible = true;
+				if(pictureHeader.Visible != m_HeaderImageVisible)
+				{
+					pictureHeader.Visible = m_HeaderImageVisible;
+					LayoutHeader();
+				}
+            }
+            else
+            {
+                if (panelHeader.Visible)
+                    panelHeader.Visible = false;
+            }
+
+            labelCaption.Text = page.PageTitle;
+            labelDescription.Text = page.PageDescription;
+
+            if (page.PageHeaderImage != null)
+            {
+                pictureHeader.BackgroundImage = page.PageHeaderImage;
+                m_HeaderImageChanged = true;
+            }
+            else if (m_HeaderImageChanged)
+            {
+                if (m_HeaderImage != null)
+                    pictureHeader.BackgroundImage = m_HeaderImage;
+                else
+                    pictureHeader.BackgroundImage = BarFunctions.LoadBitmap("SystemImages.WizardHeaderImage.png");
+
+                m_HeaderImageChanged = false;
+            }
+
+            if (page.FormCaption != "")
+            {
+                Form f = this.FindForm();
+                if (f != null)
+                    f.Text = page.FormCaption;
+            }
+
+#if !TRIAL
+			if (NativeFunctions.keyValidated2 != 266)
+				labelCaption.Text="Invalid DotNetBar License";
+#endif
+        }
+
+        internal void SetupButtons(bool canSetFocus)
+        {
+            eWizardButtonState backButtonEnabled = eWizardButtonState.Auto;
+            eWizardButtonState backButtonVisible = eWizardButtonState.Auto;
+            eWizardButtonState nextButtonEnabled = eWizardButtonState.Auto;
+            eWizardButtonState nextButtonVisible = eWizardButtonState.Auto;
+            eWizardButtonState finishButtonEnabled = eWizardButtonState.Auto;
+            eWizardButtonState cancelButtonEnabled = eWizardButtonState.Auto;
+            eWizardButtonState cancelButtonVisible = eWizardButtonState.Auto;
+            eWizardButtonState helpButtonEnabled = eWizardButtonState.Auto;
+            eWizardButtonState helpButtonVisible = eWizardButtonState.Auto;
+
+            WizardPage page = this.SelectedPage;
+            if (page != null)
+            {
+                backButtonEnabled = page.BackButtonEnabled;
+                backButtonVisible = page.BackButtonVisible;
+                nextButtonEnabled = page.NextButtonEnabled;
+                nextButtonVisible = page.NextButtonVisible;
+                finishButtonEnabled = page.FinishButtonEnabled;
+                cancelButtonEnabled = page.CancelButtonEnabled;
+                cancelButtonVisible = page.CancelButtonVisible;
+                helpButtonEnabled = page.HelpButtonEnabled;
+                helpButtonVisible = page.HelpButtonVisible;
+            }
+
+            if (!m_HelpButtonVisible)
+                helpButtonVisible = eWizardButtonState.False;
+
+            if (this.WizardPages.Count == 0 && this.DesignMode)
+            {
+                backButtonEnabled = eWizardButtonState.False;
+                nextButtonEnabled = eWizardButtonState.False;
+                finishButtonEnabled = eWizardButtonState.False;
+                cancelButtonEnabled = eWizardButtonState.False;
+            }
+
+            // Help button
+            if (helpButtonVisible == eWizardButtonState.False)
+                buttonHelp.Visible = false;
+            else if(!buttonHelp.Visible)
+                buttonHelp.Visible = true;
+            if (helpButtonEnabled == eWizardButtonState.False)
+                buttonHelp.Enabled = false;
+            else if(!buttonHelp.Enabled)
+                buttonHelp.Enabled = true;
+
+            // Cancel button
+            if (cancelButtonVisible == eWizardButtonState.False)
+                buttonCancel.Visible = false;
+            else if (!buttonCancel.Visible)
+                buttonCancel.Visible = true;
+            if (cancelButtonEnabled == eWizardButtonState.False)
+                buttonCancel.Enabled = false;
+            else if(!buttonCancel.Enabled)
+                buttonCancel.Enabled = true;
+            
+
+            // Finish button
+            if (m_FinishButtonAlwaysVisible ||
+                this.SelectedPageIndex == m_WizardPages.Count - 1 || finishButtonEnabled == eWizardButtonState.True)
+            {
+                if (!buttonFinish.Visible)
+                    buttonFinish.Visible = true;
+            }
+            else
+                buttonFinish.Visible = false;
+
+            if (finishButtonEnabled == eWizardButtonState.False ||
+                finishButtonEnabled == eWizardButtonState.Auto && this.SelectedPageIndex < m_WizardPages.Count - 1)
+            {
+                buttonFinish.Enabled = false;
+            }
+            else if (!buttonFinish.Enabled)
+                buttonFinish.Enabled = true;
+
+            // Next button
+            if (nextButtonVisible == eWizardButtonState.True)
+            {
+                if (!buttonNext.Visible)
+                    buttonNext.Visible = true;
+            }
+            else if (nextButtonVisible == eWizardButtonState.Auto)
+            {
+                if (buttonFinish.Visible && buttonFinish.Enabled && !m_FinishButtonAlwaysVisible)
+                    buttonNext.Visible = false;
+                else if (!buttonNext.Visible)
+                    buttonNext.Visible = true;
+            }
+            else if (buttonNext.Visible)
+                buttonNext.Visible = false;
+
+            if (nextButtonEnabled == eWizardButtonState.True)
+            {
+                if (!buttonNext.Enabled)
+                    buttonNext.Enabled = true;
+            }
+            else if (nextButtonEnabled == eWizardButtonState.Auto)
+            {
+                if (buttonFinish.Visible && buttonFinish.Enabled || this.SelectedPageIndex == m_WizardPages.Count - 1)
+                    buttonNext.Enabled = false;
+                else if (!buttonNext.Enabled)
+                    buttonNext.Enabled = true;
+            }
+            else if (buttonNext.Enabled)
+                buttonNext.Enabled = false;
+
+            if (canSetFocus)
+            {
+                if (buttonNext.Enabled && buttonNext.Visible)
+                    buttonNext.Select();
+                else if (buttonFinish.Enabled && buttonFinish.Visible)
+                    buttonFinish.Select();
+            }
+
+            if (backButtonVisible == eWizardButtonState.True || backButtonVisible == eWizardButtonState.Auto)
+            {
+                if (!buttonBack.Visible)
+                    buttonBack.Visible = true;
+            }
+            else if (buttonBack.Visible)
+                buttonBack.Visible = false;
+
+            if (backButtonEnabled == eWizardButtonState.True)
+            {
+                if (!buttonBack.Enabled)
+                    buttonBack.Enabled = true;
+            }
+            else if (backButtonEnabled == eWizardButtonState.Auto)
+            {
+                if (m_PagesHistory.Count > 0 || this.SelectedPageIndex > 0)
+                {
+                    if (!buttonBack.Enabled)
+                        buttonBack.Enabled = true;
+                }
+                else if (buttonBack.Enabled)
+                    buttonBack.Enabled = false;
+            }
+            else if (backButtonEnabled == eWizardButtonState.False)
+            {
+                if (buttonBack.Enabled)
+                    buttonBack.Enabled = false;
+            }
+
+            SetFormAcceptButton();
+            SetFormCancelButton();
+
+            RepositionButtons();
+        }
+
+        private void SetFormAcceptButton()
+        {
+            Form form = this.FindForm();
+            if (form == null)
+                return;
+
+            if (m_FormAcceptButton == eWizardFormAcceptButton.FinishAndNext)
+            {
+                if (buttonFinish.Visible && buttonFinish.Enabled)
+                {
+                    if(form.AcceptButton != buttonFinish)
+                        form.AcceptButton = buttonFinish;
+                }
+                else
+                {
+                    if (form.AcceptButton != buttonNext)
+                        form.AcceptButton = buttonNext;
+                }
+            }
+            else if (m_FormAcceptButton == eWizardFormAcceptButton.Next)
+            {
+                if (form.AcceptButton != buttonNext)
+                    form.AcceptButton = buttonNext;
+            }
+            else if (m_FormAcceptButton == eWizardFormAcceptButton.Finish)
+            {
+                if (form.AcceptButton != buttonFinish)
+                    form.AcceptButton = buttonFinish;
+            }
+            else if (m_FormAcceptButton == eWizardFormAcceptButton.None)
+            {
+                if (form.AcceptButton == buttonFinish || form.AcceptButton == buttonNext)
+                    form.AcceptButton = null;
+            }
+            
+        }
+
+        private void SetFormCancelButton()
+        {
+            Form form = this.FindForm();
+            if (form == null)
+                return;
+
+            if (m_FormCancelButton == eWizardFormCancelButton.Cancel)
+            {
+                if(form.CancelButton != buttonCancel)
+                    form.CancelButton = buttonCancel;
+            }
+            else if (form.CancelButton == buttonCancel)
+                form.CancelButton = null;
+        }
+
+        protected override void OnParentChanged(EventArgs e)
+        {
+            base.OnParentChanged(e);
+
+            SetFormCancelButton();
+            SetFormAcceptButton();
+        }
+
+        internal void SetupPage(WizardPage page)
+        {
+            if (page == null)
+                return;
+
+            Size innerPadding = new Size(7, 12);
+
+            this.SuspendLayout();
+
+            try
+            {
+                Rectangle bounds = Rectangle.Empty;
+                if (page.InteriorPage)
+                {
+                    bounds = new Rectangle(this.ClientRectangle.X + innerPadding.Width,
+                         this.ClientRectangle.Y + panelHeader.Height + innerPadding.Height,
+                         this.ClientRectangle.Width - innerPadding.Width * 2,
+                         this.ClientRectangle.Height - (panelHeader.Height + panelFooter.Height + innerPadding.Height * 2));
+                }
+                else
+                {
+                    bounds = new Rectangle(this.ClientRectangle.X,
+                         this.ClientRectangle.Y,
+                         this.ClientRectangle.Width,
+                         this.ClientRectangle.Height - panelFooter.Height);
+                }
+
+                TypeDescriptor.GetProperties(page)["Bounds"].SetValue(page, bounds);
+
+                TypeDescriptor.GetProperties(page)["Anchor"].SetValue(page, AnchorStyles.Left | AnchorStyles.Right | AnchorStyles.Top | AnchorStyles.Bottom);
+            }
+            finally
+            {
+                this.ResumeLayout();
+            }
+        }
+
+        private bool _ButtonFocusCuesEnabled = true;
+        /// <summary>
+        /// Gets or sets whether Focus cues on wizard navigation buttons are enabled. Default value is true.
+        /// </summary>
+        [DefaultValue(true), Category("Behavior"), Description("Indicates whether Focus cues on wizard navigation buttons are enabled.")]
+        public bool ButtonFocusCuesEnabled
+        {
+            get { return _ButtonFocusCuesEnabled; }
+            set
+            {
+                if (_ButtonFocusCuesEnabled != value)
+                {
+                    _ButtonFocusCuesEnabled = value;
+                    buttonHelp.FocusCuesEnabled = value;
+                    buttonCancel.FocusCuesEnabled = value;
+                    buttonFinish.FocusCuesEnabled = value;
+                    buttonNext.FocusCuesEnabled = value;
+                    buttonBack.FocusCuesEnabled = value;
+                }
+            }
+        }
+        
+
+        private eWizardStyle m_WizardStyle = eWizardStyle.Default;
+        
+        /// <summary>
+        /// Gets or sets the visual style used for wizard buttons.
+        /// </summary>
+        [Browsable(false), DefaultValue(eWizardStyle.Default)]
+        public eWizardStyle ButtonStyle
+        {
+            get { return m_WizardStyle; }
+            set
+            {
+                if (m_WizardStyle != value)
+                {
+                    m_WizardStyle = value;
+                    OnWizardStyleChanged();
+                }
+            }
+        }
+
+        private void OnWizardStyleChanged()
+        {
+            if (m_WizardStyle == eWizardStyle.Default)
+            {
+                buttonBack.Style = eDotNetBarStyle.Office2000;
+                buttonCancel.Style = eDotNetBarStyle.Office2000;
+                buttonFinish.Style = eDotNetBarStyle.Office2000;
+                buttonHelp.Style = eDotNetBarStyle.Office2000;
+                buttonNext.Style = eDotNetBarStyle.Office2000;
+                buttonBack.ThemeAware = true;
+                buttonCancel.ThemeAware = true;
+                buttonFinish.ThemeAware = true;
+                buttonHelp.ThemeAware = true;
+                buttonNext.ThemeAware = true;
+            }
+            else
+            {
+                buttonBack.Style = eDotNetBarStyle.Office2007;
+                buttonCancel.Style = eDotNetBarStyle.Office2007;
+                buttonFinish.Style = eDotNetBarStyle.Office2007;
+                buttonHelp.Style = eDotNetBarStyle.Office2007;
+                buttonNext.Style = eDotNetBarStyle.Office2007;
+
+                buttonBack.ThemeAware = false;
+                buttonCancel.ThemeAware = false;
+                buttonFinish.ThemeAware = false;
+                buttonHelp.ThemeAware = false;
+                buttonNext.ThemeAware = false;
+            }
+        }
+
+        #endregion
+
+        #region Event code
+        /// <summary>
+        /// Raises BackButtonClick event.
+        /// </summary>
+        /// <param name="e">Event arguments</param>
+        protected virtual void OnBackButtonClick(CancelEventArgs e)
+        {
+            if (BackButtonClick != null)
+                BackButtonClick(this, e);
+        }
+
+        /// <summary>
+        /// Raises NextButtonClick event.
+        /// </summary>
+        /// <param name="e">Event arguments</param>
+        protected virtual void OnNextButtonClick(CancelEventArgs e)
+        {
+            if (NextButtonClick != null)
+                NextButtonClick(this, e);
+        }
+
+        /// <summary>
+        /// Raises FinishButtonClick event.
+        /// </summary>
+        /// <param name="e">Event arguments</param>
+        protected virtual void OnFinishButtonClick(CancelEventArgs e)
+        {
+            if (FinishButtonClick != null)
+                FinishButtonClick(this, e);
+        }
+
+        /// <summary>
+        /// Raises CancelButtonClick event.
+        /// </summary>
+        /// <param name="e">Event arguments</param>
+        protected virtual void OnCancelButtonClick(CancelEventArgs e)
+        {
+            if (CancelButtonClick != null)
+                CancelButtonClick(this, e);
+        }
+
+        /// <summary>
+        /// Raises HelpButtonClick event.
+        /// </summary>
+        /// <param name="e">Event arguments</param>
+        protected virtual void OnHelpButtonClick(CancelEventArgs e)
+        {
+            if (HelpButtonClick != null)
+                HelpButtonClick(this, e);
+        }
+
+        /// <summary>
+        /// Raises WizardPageChanging event.
+        /// </summary>
+        /// <param name="e">Provides event arguments</param>
+        protected virtual void OnWizardPageChanging(WizardCancelPageChangeEventArgs e)
+        {
+            if (WizardPageChanging != null)
+                WizardPageChanging(this, e);
+        }
+
+        /// <summary>
+        /// Raises WizardPageChanged event.
+        /// </summary>
+        /// <param name="e">Provides event arguments</param>
+        protected virtual void OnWizardPageChanged(WizardCancelPageChangeEventArgs e)
+        {
+            if (WizardPageChanged != null)
+                WizardPageChanged(this, e);
+        }
+
+        protected virtual void OnLayoutWizardButtons(WizardButtonsLayoutEventArgs e)
+        {
+            if (LayoutWizardButtons != null)
+                LayoutWizardButtons(this, e);
+        }
+        #endregion
+
+		#region Licensing
+#if !TRIAL
+		private string m_LicenseKey = "";
+		[Browsable(false), DefaultValue("")]
+		public string LicenseKey
+		{
+			get { return m_LicenseKey; }
+			set
+			{
+				if (NativeFunctions.ValidateLicenseKey(value))
+					return;
+				m_LicenseKey = (!NativeFunctions.CheckLicenseKey(value) ? "9dsjkhds7" : value);
+			}
+		}
+#else
+		protected override void OnHandleCreated(EventArgs e)
+		{
+			base.OnHandleCreated(e);
+
+			RemindForm frm=new RemindForm();
+			frm.ShowDialog();
+			frm.Dispose();
+		}
+#endif
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Wizard/Wizard.ico b/PROMS/DotNetBar Source Code/Wizard/Wizard.ico
new file mode 100644
index 00000000..5db6ab4c
Binary files /dev/null and b/PROMS/DotNetBar Source Code/Wizard/Wizard.ico differ
diff --git a/PROMS/DotNetBar Source Code/Wizard/WizardButtonsEventArgs.cs b/PROMS/DotNetBar Source Code/Wizard/WizardButtonsEventArgs.cs
new file mode 100644
index 00000000..7a9a220b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Wizard/WizardButtonsEventArgs.cs	
@@ -0,0 +1,59 @@
+using System;
+using System.Text;
+using System.Drawing;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Provides data for LayoutWizardButtons event.
+    /// </summary>
+    public class WizardButtonsLayoutEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets or sets bounds of Back button.
+        /// </summary>
+        public Rectangle BackButtonBounds = Rectangle.Empty;
+
+        /// <summary>
+        /// Gets or sets bounds of Next button.
+        /// </summary>
+        public Rectangle NextButtonBounds = Rectangle.Empty;
+
+        /// <summary>
+        /// Gets or sets bounds of Finish button.
+        /// </summary>
+        public Rectangle FinishButtonBounds = Rectangle.Empty;
+
+        /// <summary>
+        /// Gets or sets bounds of Cancel button.
+        /// </summary>
+        public Rectangle CancelButtonBounds = Rectangle.Empty;
+
+        /// <summary>
+        /// Gets or sets bounds of Help button.
+        /// </summary>
+        public Rectangle HelpButtonBounds = Rectangle.Empty;
+
+        /// <summary>
+        /// Creates new instance of the class.
+        /// </summary>
+        public WizardButtonsLayoutEventArgs() { }
+
+        /// <summary>
+        /// Creates new instance of the class and initializes it with default values.
+        /// </summary>
+        public WizardButtonsLayoutEventArgs(Rectangle backBounds, Rectangle nextBounds, Rectangle finishBounds, Rectangle cancelBounds, Rectangle helpBounds)
+        {
+            this.BackButtonBounds = backBounds;
+            this.NextButtonBounds = nextBounds;
+            this.FinishButtonBounds = finishBounds;
+            this.CancelButtonBounds = cancelBounds;
+            this.HelpButtonBounds = helpBounds;
+        }
+    }
+
+    /// <summary>
+    /// Defines delegate for WizardPageChange events.
+    /// </summary>
+    public delegate void WizardButtonsLayoutEventHandler(object sender, WizardButtonsLayoutEventArgs e);
+}
diff --git a/PROMS/DotNetBar Source Code/Wizard/WizardPage.cs b/PROMS/DotNetBar Source Code/Wizard/WizardPage.cs
new file mode 100644
index 00000000..6113e62b
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Wizard/WizardPage.cs	
@@ -0,0 +1,552 @@
+using System;
+using System.Text;
+using System.ComponentModel;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+
+namespace DevComponents.DotNetBar
+{
+    [ToolboxItem(false), Designer("DevComponents.DotNetBar.Design.WizardPageDesigner, DevComponents.DotNetBar.Design, Version=14.1.0.37, Culture=neutral,  PublicKeyToken=90f470f34c89ccaf")]
+    public class WizardPage : PanelControl
+    {
+        #region Private Variables
+        private eWizardButtonState m_BackButtonEnabled = eWizardButtonState.Auto;
+        private eWizardButtonState m_BackButtonVisible = eWizardButtonState.Auto;
+
+        private eWizardButtonState m_NextButtonEnabled = eWizardButtonState.Auto;
+        private eWizardButtonState m_NextButtonVisible = eWizardButtonState.Auto;
+
+        private eWizardButtonState m_FinishButtonEnabled = eWizardButtonState.Auto;
+
+        private eWizardButtonState m_CancelButtonEnabled = eWizardButtonState.Auto;
+        private eWizardButtonState m_CancelButtonVisible = eWizardButtonState.Auto;
+
+        private eWizardButtonState m_HelpButtonEnabled = eWizardButtonState.Auto;
+        private eWizardButtonState m_HelpButtonVisible = eWizardButtonState.Auto;
+
+        private string m_PageTitle = "";
+        private string m_PageDescription = "";
+        private Image m_PageHeaderImage = null;
+        private string m_FormCaption = "";
+
+        private bool m_InteriorPage = true;
+        #endregion
+
+        #region Events
+        /// <summary>
+        /// Occurs before page is displayed. This event can cancel the page change. You can perform any additional setup of the Wizard page in this event.
+        /// </summary>
+        [Description("Occurs before page is displayed")]
+        public event WizardCancelPageChangeEventHandler BeforePageDisplayed;
+
+        /// <summary>
+        /// Occurs after page has been displayed.This event can cancel the page change. You can perform any additional setup of the Wizard page in this event.
+        /// </summary>
+        [Description("Occurs before page is displayed")]
+        public event WizardPageChangeEventHandler AfterPageDisplayed;
+
+        /// <summary>
+        /// Occurs after page is hidden. You can perform any additional steps that are needed to complete wizard step in this event.
+        /// </summary>
+        public event WizardPageChangeEventHandler AfterPageHidden;
+
+        /// <summary>
+        /// Occurs when Back button is clicked. You can cancel any default processing performed by Wizard control by setting Cancel=true on event arguments.
+        /// </summary>
+        [Description("Occurs when Back button is clicked.")]
+        public event CancelEventHandler BackButtonClick;
+        /// <summary>
+        /// Occurs when Next button is clicked. You can cancel any default processing performed by Wizard control by setting Cancel=true on event arguments.
+        /// </summary>
+        [Description("Occurs when Next button is clicked.")]
+        public event CancelEventHandler NextButtonClick;
+        /// <summary>
+        /// Occurs when Finish button is clicked. You can cancel any default processing performed by Wizard control by setting Cancel=true on event arguments.
+        /// </summary>
+        [Description("Occurs when Finish button is clicked.")]
+        public event CancelEventHandler FinishButtonClick;
+        /// <summary>
+        /// Occurs when Cancel button is clicked. You can cancel any default processing performed by Wizard control by setting Cancel=true on event arguments.
+        /// </summary>
+        [Description("Occurs when Cancel button is clicked.")]
+        public event CancelEventHandler CancelButtonClick;
+        /// <summary>
+        /// Occurs when Help button is clicked. You can cancel any default processing performed by Wizard control by setting Cancel=true on event arguments.
+        /// </summary>
+        [Description("Occurs when Help button is clicked.")]
+        public event CancelEventHandler HelpButtonClick;
+        #endregion
+
+		#region Constructor
+		public WizardPage() : base()
+		{
+			this.BackColor = SystemColors.Control;
+		}
+
+        protected override void Dispose(bool disposing)
+        {
+            if (BarUtilities.DisposeItemImages && !this.DesignMode)
+            {
+                BarUtilities.DisposeImage(ref m_PageHeaderImage);
+            }
+            base.Dispose(disposing);
+        }
+		#endregion
+
+        #region Public Properties
+        /// <summary>
+        /// Gets whether page is currently selected page in Wizard.
+        /// </summary>
+        [Browsable(false)]
+        public bool IsSelected
+        {
+            get
+            {
+                Wizard w = this.Parent as Wizard;
+                if (w != null)
+                {
+                    return w.SelectedPage == this;
+                }
+                return false;
+            }
+        }
+        /// <summary>
+        /// Gets or sets whether back button is enabled when page is active. Default value is eWizardButtonState.Auto which indicates that state is
+        /// automatically managed by control.
+        /// </summary>
+        [Browsable(true), DefaultValue(eWizardButtonState.Auto), Category("Page Options"), Description("Indicates whether back button is enabled when page is active.")]
+        public eWizardButtonState BackButtonEnabled
+        {
+            get { return m_BackButtonEnabled; }
+            set
+            {
+                m_BackButtonEnabled = value;
+                UpdatePageState();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether back button is visible when page is active. Default value is eWizardButtonState.Auto.
+        /// </summary>
+        [Browsable(true), DefaultValue(eWizardButtonState.Auto), Category("Page Options"), Description("Indicates whether back button is visible when page is active.")]
+        public eWizardButtonState BackButtonVisible
+        {
+            get { return m_BackButtonVisible; }
+            set
+            {
+                m_BackButtonVisible = value;
+                UpdatePageState();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether next button is enabled when page is active. Default value is eWizardButtonState.Auto which indicates that state is
+        /// automatically managed by control.
+        /// </summary>
+        [Browsable(true), DefaultValue(eWizardButtonState.Auto), Category("Page Options"), Description("Indicates whether next button is enabled when page is active.")]
+        public eWizardButtonState NextButtonEnabled
+        {
+            get { return m_NextButtonEnabled; }
+            set
+            {
+                m_NextButtonEnabled = value;
+                UpdatePageState();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether next button is visible when page is active. Default value is eWizardButtonState.Auto.
+        /// </summary>
+        [Browsable(true), DefaultValue(eWizardButtonState.Auto), Category("Page Options"), Description("Indicates whether next button is visible when page is active.")]
+        public eWizardButtonState NextButtonVisible
+        {
+            get { return m_NextButtonVisible; }
+            set
+            {
+                m_NextButtonVisible = value;
+                UpdatePageState();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether finish button is enabled when page is active. Default value is eWizardButtonState.Auto which indicates that state is
+        /// automatically managed by control.
+        /// </summary>
+        [Browsable(true), DefaultValue(eWizardButtonState.Auto), Category("Page Options"), Description("Indicates whether finish button is enabled when page is active.")]
+        public eWizardButtonState FinishButtonEnabled
+        {
+            get { return m_FinishButtonEnabled; }
+            set
+            {
+                m_FinishButtonEnabled = value;
+                UpdatePageState();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether cancel button is enabled when page is active. Default value is eWizardButtonState.Auto which indicates that state is
+        /// automatically managed by control.
+        /// </summary>
+        [Browsable(true), DefaultValue(eWizardButtonState.Auto), Category("Page Options"), Description("Indicates whether cancel button is enabled when page is active.")]
+        public eWizardButtonState CancelButtonEnabled
+        {
+            get { return m_CancelButtonEnabled; }
+            set
+            {
+                m_CancelButtonEnabled = value;
+                UpdatePageState();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether cancel button is visible when page is active. Default value is eWizardButtonState.Auto.
+        /// </summary>
+        [Browsable(true), DefaultValue(eWizardButtonState.Auto), Category("Page Options"), Description("Indicates whether cancel button is visible when page is active.")]
+        public eWizardButtonState CancelButtonVisible
+        {
+            get { return m_CancelButtonVisible; }
+            set
+            {
+                m_CancelButtonVisible = value;
+                UpdatePageState();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether help button is enabled when page is active. Default value is eWizardButtonState.Auto which indicates that state is
+        /// automatically managed by control.
+        /// </summary>
+        [Browsable(true), DefaultValue(eWizardButtonState.Auto), Category("Page Options"), Description("Indicates whether help button is enabled when page is active.")]
+        public eWizardButtonState HelpButtonEnabled
+        {
+            get { return m_HelpButtonEnabled; }
+            set
+            {
+                m_HelpButtonEnabled = value;
+                UpdatePageState();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether help button is visible when page is active. Default value is eWizardButtonState.Auto.
+        /// </summary>
+        [Browsable(true), DefaultValue(eWizardButtonState.Auto), Category("Page Options"), Description("Indicates whether help button is visible when page is active.")]
+        public eWizardButtonState HelpButtonVisible
+        {
+            get { return m_HelpButtonVisible; }
+            set
+            {
+                m_HelpButtonVisible = value;
+                UpdatePageState();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the page header image when page is an interior page, InteriorPage=true. Default value is null.
+        /// </summary>
+        [Browsable(true), DefaultValue(null), Category("Page Options"), Description("Indicates the page header image when page is an interior page.")]
+        public Image PageHeaderImage
+        {
+            get { return m_PageHeaderImage; }
+            set
+            {
+                m_PageHeaderImage = value;
+                UpdatePageState();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the text that is displayed as title in wizard header when page is active.
+        /// </summary>
+        [Browsable(true), Localizable(true), DefaultValue(""), Category("Page Options"), Description("Indicates text that is displayed as title in wizard header.")]
+        public string PageTitle
+        {
+            get { return m_PageTitle; }
+            set
+            {
+                m_PageTitle = value;
+                UpdatePageState();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the text that is displayed as description in wizard header when page is active.
+        /// </summary>
+        [Browsable(true), Localizable(true), DefaultValue(""), Category("Page Options"), Description("Indicates text that is displayed as description in wizard header when page is active.")]
+        public string PageDescription
+        {
+            get { return m_PageDescription; }
+            set
+            {
+                m_PageDescription = value;
+                UpdatePageState();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the text that is displayed on form caption when page is active. Default value is empty string which indicates that form caption
+        /// is not changed when page becomes active.
+        /// </summary>
+        [Browsable(true), Localizable(true), DefaultValue(""), Category("Page Options"), Description("Indicates text that is displayed on form caption when page is active.")]
+        public string FormCaption
+        {
+            get { return m_FormCaption; }
+            set
+            {
+                m_FormCaption = value;
+                UpdatePageState();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets whether page is interior page. Interior pages use wizard header area to display page title, description and optional image. They are also padded and do not
+        /// fill the client area of the Wizard. Default value is true.
+        /// You can set this value to false to hide header area and make page fill the client area of the wizard.
+        /// </summary>
+        [Browsable(true), DefaultValue(true), Category("Page Options"), Description("Indicates whether page is inner page.")]
+        public bool InteriorPage
+        {
+            get { return m_InteriorPage; }
+            set
+            {
+                if (m_InteriorPage != value)
+                {
+                    m_InteriorPage = value;
+                    OnInnerPageChanged();
+                }
+            }
+        }
+        #endregion
+
+        #region Internal Implementation
+        [Browsable(true), EditorBrowsable(EditorBrowsableState.Always), DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
+        public override Color BackColor
+        {
+            get { return base.BackColor; }
+            set { base.BackColor = value; }
+        }
+
+        public bool ShouldSerializeBackColor()
+        {
+            return (BackColor != SystemColors.Control);
+        }
+
+		/// <summary>
+		/// Gets or sets whether page is visible. Page visibility is managed by Wizard control and it should not be set directly.
+		/// </summary>
+		[Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public new bool Visible
+		{
+			get { return base.Visible; }
+			set { base.Visible = value; }
+		}
+
+        /// <summary>
+        /// Updates page state when one of the page appearance properties has changed.
+        /// </summary>
+        private void UpdatePageState()
+        {
+            if (this.Parent is Wizard && ((Wizard)this.Parent).SelectedPage==this)
+            {
+                ((Wizard)this.Parent).UpdatePageDisplay();
+                ((Wizard)this.Parent).SetupButtons(false);
+            }
+        }
+
+        private void OnInnerPageChanged()
+        {
+            if (this.Parent is Wizard)
+            {
+                Wizard w=this.Parent as Wizard;
+                w.SetupPage(this);
+                if(w.SelectedPage==this)
+                    w.UpdatePageDisplay();
+            }
+        }
+
+        protected override void OnPaint(System.Windows.Forms.PaintEventArgs e)
+        {
+            base.OnPaint(e);
+
+            if (this.DesignMode && this.InteriorPage)
+            {
+                Graphics g = e.Graphics;
+                Rectangle r = this.DisplayRectangle;
+                using (Pen pen = new Pen(Color.FromArgb(100,SystemColors.ControlDarkDark), 1))
+                {
+                    pen.DashStyle = DashStyle.Dot;
+                    
+                    System.Drawing.Drawing2D.SmoothingMode sm = g.SmoothingMode;
+                    g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.Default;
+
+                    // Outer guide
+                    r.Inflate(-12, 0);
+                    g.DrawLine(pen, r.X, r.Y, r.X, r.Bottom);
+                    g.DrawLine(pen, r.Right, r.Y, r.Right, r.Bottom);
+
+                    // Inner guide 1
+                    r.Inflate(-22, 0);
+                    g.DrawLine(pen, r.X, r.Y, r.X, r.Bottom);
+                    g.DrawLine(pen, r.Right, r.Y, r.Right, r.Bottom);
+
+                    // Inner guide 2
+                    r.Inflate(-22, 0);
+                    g.DrawLine(pen, r.X, r.Y, r.X, r.Bottom);
+                    g.DrawLine(pen, r.Right, r.Y, r.Right, r.Bottom);
+                    
+                    g.SmoothingMode = sm;
+                }
+            }
+        }
+        #endregion
+
+        #region Event Implementation
+        /// <summary>
+        /// Fires BeforePageDisplayed event.
+        /// </summary>
+        /// <param name="e">Event arguments</param>
+        protected virtual void OnBeforePageDisplayed(WizardCancelPageChangeEventArgs e)
+        {
+            if (BeforePageDisplayed != null)
+                BeforePageDisplayed(this, e);
+        }
+
+        /// <summary>
+        /// Invokes the BeforePageDisplayed event.
+        /// </summary>
+        /// <param name="e">Event arguments</param>
+        internal void InvokeBeforePageDisplayed(WizardCancelPageChangeEventArgs e)
+        {
+            OnBeforePageDisplayed(e);
+        }
+
+        /// <summary>
+        /// Fires AfterPageDisplayed event.
+        /// </summary>
+        /// <param name="e">Event arguments.</param>
+        protected virtual void OnAfterPageDisplayed(WizardPageChangeEventArgs e)
+        {
+            if (AfterPageDisplayed != null)
+                AfterPageDisplayed(this, e);
+        }
+
+        /// <summary>
+        /// Invokes AfterPageDisplayed event.
+        /// </summary>
+        /// <param name="e">Event arguments</param>
+        internal void InvokeAfterPageDisplayed(WizardPageChangeEventArgs e)
+        {
+            OnAfterPageDisplayed(e);
+        }
+
+        /// <summary>
+        /// Fires BeforePageDisplayed event.
+        /// </summary>
+        /// <param name="e">Event arguments</param>
+        protected virtual void OnAfterPageHidden(WizardPageChangeEventArgs e)
+        {
+            if (AfterPageHidden != null)
+                AfterPageHidden(this, e);
+        }
+
+        /// <summary>
+        /// Invokes the BeforePageDisplayed event.
+        /// </summary>
+        /// <param name="e">Event arguments</param>
+        internal void InvokeAfterPageHidden(WizardPageChangeEventArgs e)
+        {
+            OnAfterPageHidden(e);
+        }
+
+        /// <summary>
+        /// Raises BackButtonClick event.
+        /// </summary>
+        /// <param name="e">Event arguments</param>
+        protected virtual void OnBackButtonClick(CancelEventArgs e)
+        {
+            if (BackButtonClick != null)
+                BackButtonClick(this, e);
+        }
+
+        /// <summary>
+        /// Invokes BackButtonClick event.
+        /// </summary>
+        internal void InvokeBackButtonClick(CancelEventArgs e)
+        {
+            OnBackButtonClick(e);
+        }
+
+        /// <summary>
+        /// Raises NextButtonClick event.
+        /// </summary>
+        /// <param name="e">Event arguments</param>
+        protected virtual void OnNextButtonClick(CancelEventArgs e)
+        {
+            if (NextButtonClick != null)
+                NextButtonClick(this, e);
+        }
+
+        /// <summary>
+        /// Invokes NextButtonClick event.
+        /// </summary>
+        internal void InvokeNextButtonClick(CancelEventArgs e)
+        {
+            OnNextButtonClick(e);
+        }
+
+        /// <summary>
+        /// Raises FinishButtonClick event.
+        /// </summary>
+        /// <param name="e">Event arguments</param>
+        protected virtual void OnFinishButtonClick(CancelEventArgs e)
+        {
+            if (FinishButtonClick != null)
+                FinishButtonClick(this, e);
+        }
+
+        /// <summary>
+        /// Invokes FinishButtonClick event.
+        /// </summary>
+        internal void InvokeFinishButtonClick(CancelEventArgs e)
+        {
+            OnFinishButtonClick(e);
+        }
+
+        /// <summary>
+        /// Raises CancelButtonClick event.
+        /// </summary>
+        /// <param name="e">Event arguments</param>
+        protected virtual void OnCancelButtonClick(CancelEventArgs e)
+        {
+            if (CancelButtonClick != null)
+                CancelButtonClick(this, e);
+        }
+
+        /// <summary>
+        /// Invokes CancelButtonClick event.
+        /// </summary>
+        internal void InvokeCancelButtonClick(CancelEventArgs e)
+        {
+            OnCancelButtonClick(e);
+        }
+
+        /// <summary>
+        /// Raises HelpButtonClick event.
+        /// </summary>
+        /// <param name="e">Event arguments</param>
+        protected virtual void OnHelpButtonClick(CancelEventArgs e)
+        {
+            if (HelpButtonClick != null)
+                HelpButtonClick(this, e);
+        }
+
+        /// <summary>
+        /// Invokes HelpButtonClick event.
+        /// </summary>
+        internal void InvokeHelpButtonClick(CancelEventArgs e)
+        {
+            OnHelpButtonClick(e);
+        }
+        #endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/Wizard/WizardPageChangeEventArgs.cs b/PROMS/DotNetBar Source Code/Wizard/WizardPageChangeEventArgs.cs
new file mode 100644
index 00000000..a77933f9
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Wizard/WizardPageChangeEventArgs.cs	
@@ -0,0 +1,76 @@
+using System;
+using System.Text;
+
+namespace DevComponents.DotNetBar
+{
+    #region WizardPageChangeEventArgs
+    /// <summary>
+    /// Provides data for Wizard Page Change events.
+    /// </summary>
+    public class WizardPageChangeEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Specifies the new active wizard page. You can change this argument when handling WizardPageChanging event and provide newly selected page of your own.
+        /// </summary>
+        public WizardPage NewPage = null;
+
+        /// <summary>
+        /// Specifies page that was or currently is active.
+        /// </summary>
+        public WizardPage OldPage = null;
+
+        /// <summary>
+        /// Indicates the wizard button that was source of page change.
+        /// </summary>
+        public eWizardPageChangeSource PageChangeSource = eWizardPageChangeSource.NextButton;
+
+        /// <summary>
+        /// Creates new instance of the class with default values.
+        /// </summary>
+        /// <param name="newPage">New wizard page</param>
+        /// <param name="oldPage">Old or current wizard page</param>
+        /// <param name="pageChangeSource">Page change source</param>
+        public WizardPageChangeEventArgs(WizardPage newPage, WizardPage oldPage, eWizardPageChangeSource pageChangeSource)
+        {
+            this.NewPage = newPage;
+            this.OldPage = oldPage;
+            this.PageChangeSource = pageChangeSource;
+        }
+    }
+    #endregion
+
+    #region WizardCancelPageChangeEventArgs
+    /// <summary>
+    /// Provides data for Wizard Page Change events.
+    /// </summary>
+    public class WizardCancelPageChangeEventArgs : WizardPageChangeEventArgs
+    {
+        /// <summary>
+        /// Allows you to cancel the page change.
+        /// </summary>
+        public bool Cancel = false;
+
+        /// <summary>
+        /// Creates new instance of the class with default values.
+        /// </summary>
+        /// <param name="newPage">New wizard page</param>
+        /// <param name="oldPage">Old or current wizard page</param>
+        /// <param name="pageChangeSource">Page change source</param>
+        public WizardCancelPageChangeEventArgs(WizardPage newPage, WizardPage oldPage, eWizardPageChangeSource pageChangeSource) : base(newPage, oldPage, pageChangeSource)
+        {
+        }
+    }
+    #endregion
+
+    #region Event Delegates
+    /// <summary>
+    /// Defines delegate for WizardPageChange events.
+    /// </summary>
+    public delegate void WizardCancelPageChangeEventHandler(object sender, WizardCancelPageChangeEventArgs e);
+
+    /// <summary>
+    /// Defines delegate for WizardPageChange events.
+    /// </summary>
+    public delegate void WizardPageChangeEventHandler(object sender, WizardPageChangeEventArgs e);
+    #endregion
+}
diff --git a/PROMS/DotNetBar Source Code/Wizard/WizardPageCollection.cs b/PROMS/DotNetBar Source Code/Wizard/WizardPageCollection.cs
new file mode 100644
index 00000000..cf9eff3f
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/Wizard/WizardPageCollection.cs	
@@ -0,0 +1,197 @@
+using System;
+using System.Collections;
+using System.ComponentModel;
+
+namespace DevComponents.DotNetBar
+{
+    /// <summary>
+    /// Represents the collection of WizardPage objects which determines the flow of the wizard.
+    /// </summary>
+    public class WizardPageCollection : CollectionBase
+    {
+        #region Private Variables
+		private Wizard m_Parent=null;
+        [EditorBrowsable(EditorBrowsableState.Never), Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+        public bool IgnoreEvents = false;
+		#endregion
+
+		#region Internal Implementation
+        public WizardPageCollection()
+		{
+		}
+		/// <summary>
+		/// Gets the parent this collection is associated with.
+		/// </summary>
+		[Browsable(false),DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+		public Wizard Parent
+		{
+			get {return m_Parent;}
+		}
+
+		internal Wizard ParentWizard
+		{
+            get { return m_Parent; }
+            set { m_Parent = value; }
+		}
+
+		/// <summary>
+		/// Adds new object to the collection.
+		/// </summary>
+		/// <param name="WizardPage">Object to add.</param>
+		/// <returns>Index of newly added object.</returns>
+		public int Add(WizardPage WizardPage)
+		{
+			return List.Add(WizardPage);
+		}
+		
+		/// <summary>
+		/// Adds an array of objects to the collection. 
+		/// </summary>
+		/// <param name="WizardPages">Array of WizardPage objects.</param>
+		public void AddRange(WizardPage[] WizardPages)
+		{
+			foreach(WizardPage WizardPage in WizardPages)
+				List.Add(WizardPage);
+		}
+		
+		/// <summary>
+		/// Returns reference to the object in collection based on it's index.
+		/// </summary>
+		public WizardPage this[int index]
+		{
+			get {return (WizardPage)(List[index]);}
+			set {List[index] = value;}
+		}
+
+        /// <summary>
+        /// Returns reference to the object in collection based on it's name.
+        /// </summary>
+        public WizardPage this[string name]
+        {
+            get
+            {
+                foreach(WizardPage page in this.List)
+                {
+                    if (page.Name == name)
+                        return page;
+                }
+                return null;
+            }
+        }
+
+		/// <summary>
+		/// Inserts new object into the collection.
+		/// </summary>
+		/// <param name="index">Position of the object.</param>
+		/// <param name="value">Object to insert.</param>
+		public void Insert(int index, WizardPage value) 
+		{
+			List.Insert(index, value);
+		}
+		
+		/// <summary>
+		/// Returns index of the object inside of the collection.
+		/// </summary>
+		/// <param name="value">Reference to the object.</param>
+		/// <returns>Index of the object.</returns>
+		public int IndexOf(WizardPage value) 
+		{
+			return List.IndexOf(value);
+		}
+
+		/// <summary>
+		/// Returns whether collection contains specified object.
+		/// </summary>
+		/// <param name="value">Object to look for.</param>
+		/// <returns>true if object is part of the collection, otherwise false.</returns>
+		public bool Contains(WizardPage value) 
+		{
+			return List.Contains(value);
+		}
+
+		/// <summary>
+		/// Removes specified object from the collection.
+		/// </summary>
+		/// <param name="value"></param>
+		public void Remove(WizardPage value) 
+		{
+			List.Remove(value);
+		}
+		
+		protected override void OnRemove(int index, object value)
+		{
+			
+			base.OnRemove (index, value);
+		}
+
+
+		protected override void OnRemoveComplete(int index,object value)
+		{
+			base.OnRemoveComplete(index,value);
+            if (IgnoreEvents)
+                return;
+
+            if (m_Parent != null)
+                m_Parent.OnWizardPageRemoved(value as WizardPage);
+		}
+		
+		protected override void OnInsertComplete(int index,object value)
+		{
+			base.OnInsertComplete(index,value);
+
+            if (IgnoreEvents)
+                return;
+
+            if (m_Parent != null)
+                m_Parent.OnWizardPageAdded(value as WizardPage);
+		}
+
+		/// <summary>
+		/// Copies collection into the specified array.
+		/// </summary>
+		/// <param name="array">Array to copy collection to.</param>
+		/// <param name="index">Starting index.</param>
+		public void CopyTo(WizardPage[] array, int index) 
+		{
+			List.CopyTo(array, index);
+		}
+
+		/// <summary>
+		/// Copies contained items to the WizardPage array.
+		/// </summary>
+		/// <param name="array">Array to copy to.</param>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+		public void CopyTo(WizardPage[] array)
+		{
+			List.CopyTo(array,0);
+		}
+
+        /// <summary>
+        /// Copies contained items to the WizardPage array.
+        /// </summary>
+        /// <param name="array">Array to copy to.</param>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void CopyTo(WizardPageCollection col)
+        {
+            foreach (WizardPage page in this.List)
+                col.Add(page);
+        }
+
+		protected override void OnClear()
+		{
+            if (!IgnoreEvents)
+            {
+                if (m_Parent != null)
+                {
+                    foreach (WizardPage page in this.List)
+                    {
+                        m_Parent.OnWizardPageRemoved(page);
+                    }
+                }
+            }
+			base.OnClear();
+		}
+		
+		#endregion
+    }
+}
diff --git a/PROMS/DotNetBar Source Code/frmCustomize.cs b/PROMS/DotNetBar Source Code/frmCustomize.cs
new file mode 100644
index 00000000..3ea019ed
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/frmCustomize.cs	
@@ -0,0 +1,1370 @@
+namespace DevComponents.DotNetBar
+{
+	using System;
+	using System.Drawing;
+	using System.Collections;
+	using System.ComponentModel;
+	using System.Windows.Forms;
+
+	/// <summary>
+	///		Summary description for frmCustomize.
+	/// </summary>
+	[ToolboxItem(false),System.Runtime.InteropServices.ComVisible(false)]
+	public class frmCustomize : System.Windows.Forms.Form
+	{
+		private System.Windows.Forms.TabControl tabCtrl;
+		private System.Windows.Forms.Label label1;
+		private System.Windows.Forms.TabPage tabPage2;
+		private System.Windows.Forms.TabPage tabPage3;
+		private System.Windows.Forms.TabPage tabPage1;
+		private System.Windows.Forms.Button cmdNew;
+		private System.Windows.Forms.Button cmdDelete;
+		private System.Windows.Forms.Button cmdRename;
+		private System.Windows.Forms.Button cmdReset;
+		private System.Windows.Forms.CheckedListBox lstBars;
+		private DotNetBarManager m_DotNetBar;
+		private System.Windows.Forms.Button cmdKeyboard;
+		private System.Windows.Forms.Button cmdClose;
+		private System.Windows.Forms.Label label2;
+		private System.Windows.Forms.Label label3;
+		private System.Windows.Forms.Label label4;
+		private System.Windows.Forms.ListBox lstCategories;
+		private ItemsListBox lstCommands;
+		private bool m_ItemDrag;
+		private Cursor m_MoveCursor, m_CopyCursor, m_NACursor;
+		private IDesignTimeProvider m_DesignTimeProvider;
+		private int m_InsertPosition;
+		private bool m_InsertBefore;
+		private bool m_DragCopy;
+		private Point m_MouseDownPt;
+
+		public BaseItem DragItem;
+		private BaseItem m_EditItem;
+		private ButtonItem m_PopupMenu;
+		private System.Windows.Forms.Label label5;
+		private System.Windows.Forms.CheckBox chkShowFullMenus;
+		private System.Windows.Forms.CheckBox chkFullAfterDelay;
+		private System.Windows.Forms.Label label6;
+		private System.Windows.Forms.Button button1;
+		private System.Windows.Forms.CheckBox chkShowScreenTips;
+		private System.Windows.Forms.CheckBox chkTipsShowShortcuts;
+		private System.Windows.Forms.Label label7;
+		private DevComponents.Editors.ComboItem comboItem1;
+		private DevComponents.Editors.ComboItem comboItem2;
+		private DevComponents.Editors.ComboItem comboItem3;
+		private DevComponents.Editors.ComboItem comboItem4;
+		private DevComponents.Editors.ComboItem comboItem5;
+		private DevComponents.DotNetBar.Controls.ComboBoxEx cboAnimations;
+		private DevComponents.Editors.ComboItem comboItem6;
+
+		private System.Windows.Forms.Timer m_Timer=null;
+
+		/// <summary>
+		///		Required designer variable.
+		/// </summary>
+		private System.ComponentModel.Container components;
+
+		public frmCustomize(DotNetBarManager ctrl)
+		{
+			//
+			// Required for Windows Form Designer support
+			//
+			InitializeComponent();
+			m_DotNetBar=ctrl;
+			this.StartPosition=FormStartPosition.CenterScreen;
+			m_ItemDrag=false;
+			try
+			{
+				m_MoveCursor=new Cursor(typeof(DevComponents.DotNetBar.DotNetBarManager),"DRAGMOVE.CUR");
+				m_CopyCursor=new Cursor(typeof(DevComponents.DotNetBar.DotNetBarManager),"DRAGCOPY.CUR");
+				m_NACursor=new Cursor(typeof(DevComponents.DotNetBar.DotNetBarManager),"DRAGNONE.CUR");
+			}
+			catch(Exception)
+			{
+				m_MoveCursor=null;
+				m_CopyCursor=null;
+				m_NACursor=null;
+			}
+
+			m_DesignTimeProvider=null;
+			m_DragCopy=false;
+			m_EditItem=null;
+
+			// Load localized strings...
+			using(LocalizationManager lm=new LocalizationManager(m_DotNetBar))
+			{
+				this.cmdNew.Text=lm.GetLocalizedString(this.cmdNew.Text);
+				this.tabPage1.Text=lm.GetLocalizedString(this.tabPage1.Text);
+				this.cmdReset.Text=lm.GetLocalizedString(this.cmdReset.Text);
+				this.cmdRename.Text=lm.GetLocalizedString(this.cmdRename.Text);
+				this.cmdDelete.Text=lm.GetLocalizedString(this.cmdDelete.Text);
+				this.label1.Text=lm.GetLocalizedString(this.label1.Text);
+				this.tabPage2.Text=lm.GetLocalizedString(this.tabPage2.Text);
+				this.label4.Text=lm.GetLocalizedString(this.label4.Text);
+				this.label3.Text=lm.GetLocalizedString(this.label3.Text);
+				this.label2.Text=lm.GetLocalizedString(this.label2.Text);
+				this.tabPage3.Text=lm.GetLocalizedString(this.tabPage3.Text);
+				this.cmdKeyboard.Text=lm.GetLocalizedString(this.cmdKeyboard.Text);
+				this.cmdClose.Text=lm.GetLocalizedString(this.cmdClose.Text);
+				this.label5.Text=lm.GetLocalizedString(this.label5.Text);
+				this.chkShowFullMenus.Text=lm.GetLocalizedString(this.chkShowFullMenus.Text);
+				this.chkFullAfterDelay.Text=lm.GetLocalizedString(this.chkFullAfterDelay.Text);
+				this.label6.Text=lm.GetLocalizedString(this.label6.Text);
+				this.button1.Text=lm.GetLocalizedString(this.button1.Text);
+				this.chkShowScreenTips.Text=lm.GetLocalizedString(this.chkShowScreenTips.Text);
+				this.chkTipsShowShortcuts.Text=lm.GetLocalizedString(this.chkTipsShowShortcuts.Text);
+				this.label7.Text=lm.GetLocalizedString(this.label7.Text);
+				this.comboItem1.Text=lm.GetLocalizedString(this.comboItem1.Text);
+				this.comboItem2.Text=lm.GetLocalizedString(this.comboItem2.Text);
+				this.comboItem3.Text=lm.GetLocalizedString(this.comboItem3.Text);
+				this.comboItem4.Text=lm.GetLocalizedString(this.comboItem4.Text);
+				this.comboItem5.Text=lm.GetLocalizedString(this.comboItem5.Text);
+				this.comboItem6.Text=lm.GetLocalizedString(this.comboItem6.Text);
+				this.Text=lm.GetLocalizedString(this.Text);
+			}
+
+			this.cmdReset.Visible=m_DotNetBar.ShowResetButton;
+
+			//If we don't run on XP use Flat Style Buttons
+			// W2K and gang
+//			if(Environment.OSVersion.Version.Major==5 && Environment.OSVersion.Version.Minor<1 || Environment.OSVersion.Version.Major<5)
+//			{
+//				this.cmdReset.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+//                this.cmdRename.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+//                this.cmdDelete.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+//                this.cmdNew.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+//                this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+//				this.cmdKeyboard.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+//				this.cmdClose.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+//			}
+
+			cmdKeyboard.Visible=false;
+			this.KeyPreview=true;
+
+			if(!BarFunctions.SupportsAnimation)
+			{
+				cboAnimations.Visible=false;
+				this.label7.Visible=false;
+			}
+
+			lstCommands.Style=m_DotNetBar.Style;
+			
+		}
+
+		/// <summary>
+		///		Clean up any resources being used.
+		/// </summary>
+		protected override void Dispose(bool disposing)
+		{
+			if(m_PopupMenu!=null)
+			{
+				m_PopupMenu.Dispose();
+				m_PopupMenu=null;
+			}
+
+			m_DotNetBar=null;
+
+			if(m_MoveCursor!=null)
+				m_MoveCursor.Dispose();
+			if(m_CopyCursor!=null)
+				m_CopyCursor.Dispose();
+			if(m_NACursor!=null)
+				m_NACursor.Dispose();
+			m_MoveCursor=null;
+			m_CopyCursor=null;
+			m_NACursor=null;
+
+			if(components!=null)
+				components.Dispose();
+			components=null;
+			base.Dispose(disposing);
+		}
+
+		private bool m_BarsLoading=false;
+		public void RefreshBars()
+		{
+			m_BarsLoading=true;
+			try
+			{
+				CheckState check=CheckState.Checked;
+				lstBars.Items.Clear();
+
+				foreach(DevComponents.DotNetBar.Bar objBar in m_DotNetBar.Bars)
+				{
+					if(!objBar.CanHide && !objBar.CanCustomize && objBar.LayoutType==eLayoutType.Toolbar || objBar.LayoutType!=eLayoutType.Toolbar)
+					{
+						objBar.SetDesignMode(true);
+						objBar.RecalcLayout();
+						continue;
+					}
+					if(objBar.Visible)
+						check=CheckState.Checked;
+					else
+						check=CheckState.Unchecked;
+					lstBars.Items.Add(objBar,check);
+					objBar.SetDesignMode(true);
+					objBar.RecalcLayout();
+				}
+			}
+			finally
+			{
+				m_BarsLoading=false;
+			}
+		}
+
+		public void RefreshCategories()
+		{
+			Hashtable h=new Hashtable();
+			lstCategories.Items.Clear();
+			lstCategories.Sorted=true;
+			for(int i=0;i<m_DotNetBar.Items.Count;i++)
+			{
+				BaseItem objItem=m_DotNetBar.Items[i];
+				if(objItem.Category!="" && !h.ContainsKey(objItem.Category))
+					h.Add(objItem.Category,objItem.Category);
+			}
+			foreach(string s in h.Values)
+				lstCategories.Items.Add(s);
+//			if(h.Count>0)
+//				lstCategories.SelectedIndex=0;
+		}
+
+		protected void BarsCheck(object sender,ItemCheckEventArgs ec)
+		{
+			if(m_BarsLoading)
+				return;
+
+			DevComponents.DotNetBar.Bar objBar=lstBars.Items[ec.Index] as Bar;
+			if(objBar==null)
+				return;
+			if(!objBar.CanHide && objBar.Visible)
+			{
+				ec.NewValue=CheckState.Checked;
+				return;
+			}
+
+			if(ec.NewValue==CheckState.Checked)
+			{
+				if(!objBar.Visible)
+					objBar.ShowBar();
+			}
+			else
+			{
+				if(objBar.Visible)
+					objBar.HideBar();
+			}
+			objBar.InvokeUserVisibleChanged();
+			((IOwner)m_DotNetBar).InvokeUserCustomize(objBar,new EventArgs());
+			((IOwner)m_DotNetBar).InvokeEndUserCustomize(objBar,new EndUserCustomizeEventArgs(eEndUserCustomizeAction.BarVisibilityChanged));
+		}
+
+		protected override void OnLoad(EventArgs e)
+		{
+			base.OnLoad(e);
+			RefreshBars();
+			RefreshCategories();
+
+			// Load the customization settings
+			chkShowFullMenus.Checked=m_DotNetBar.AlwaysShowFullMenus;
+			chkFullAfterDelay.Checked=m_DotNetBar.ShowFullMenusOnHover;
+			chkShowScreenTips.Checked=m_DotNetBar.ShowToolTips;
+			chkTipsShowShortcuts.Checked=m_DotNetBar.ShowShortcutKeysInToolTips;
+			switch(m_DotNetBar.PopupAnimation)
+			{
+				case ePopupAnimation.Fade:
+					cboAnimations.SelectedItem=this.comboItem5;
+					break;
+				case ePopupAnimation.None:
+					cboAnimations.SelectedItem=this.comboItem1;
+					break;
+				case ePopupAnimation.Random:
+					cboAnimations.SelectedItem=this.comboItem2;
+					break;
+				case ePopupAnimation.Slide:
+					cboAnimations.SelectedItem=this.comboItem4;
+					break;
+				case ePopupAnimation.SystemDefault:
+					cboAnimations.SelectedItem=this.comboItem6;
+					break;
+				case ePopupAnimation.Unfold:
+					cboAnimations.SelectedItem=this.comboItem3;
+					break;
+			}
+
+		}
+
+		protected override void OnClosing(CancelEventArgs e)
+		{
+			IOwner owner=m_DotNetBar as IOwner;
+			owner.SetFocusItem(null);
+			foreach(DevComponents.DotNetBar.Bar objBar in m_DotNetBar.Bars)
+			{
+				objBar.SetDesignMode(false);
+				objBar.RecalcLayout();
+			}
+			
+			// Update user settings
+			m_DotNetBar.AlwaysShowFullMenus=chkShowFullMenus.Checked;
+			m_DotNetBar.ShowFullMenusOnHover=chkFullAfterDelay.Checked;
+			m_DotNetBar.ShowToolTips=chkShowScreenTips.Checked;
+			m_DotNetBar.ShowShortcutKeysInToolTips=chkTipsShowShortcuts.Checked;
+			if(cboAnimations.SelectedItem==this.comboItem5)
+			{
+				m_DotNetBar.PopupAnimation=ePopupAnimation.Fade;
+			}
+			else if(cboAnimations.SelectedItem==this.comboItem1)
+			{
+				m_DotNetBar.PopupAnimation=ePopupAnimation.None;
+			}
+			else if(cboAnimations.SelectedItem==this.comboItem2)
+			{
+				m_DotNetBar.PopupAnimation=ePopupAnimation.Random;
+			}
+			else if(cboAnimations.SelectedItem==this.comboItem4)
+			{
+				m_DotNetBar.PopupAnimation=ePopupAnimation.Slide;
+			}
+			else if(cboAnimations.SelectedItem==this.comboItem6)
+			{
+				m_DotNetBar.PopupAnimation=ePopupAnimation.SystemDefault;
+			}
+			else if(cboAnimations.SelectedItem==this.comboItem3)
+			{
+				m_DotNetBar.PopupAnimation=ePopupAnimation.Unfold;
+			}
+			else
+			{
+				m_DotNetBar.PopupAnimation=ePopupAnimation.SystemDefault;
+			}
+			
+			m_DotNetBar.CustomizeClosing();
+			base.OnClosing(e);
+		}
+
+		protected override void OnClosed(EventArgs e)
+		{
+			base.OnClosed(e);
+			if(m_DotNetBar!=null && m_DotNetBar.ParentForm!=null)
+				m_DotNetBar.ParentForm.BringToFront();
+		}
+
+		protected void Close_Click(object sender, System.EventArgs e)
+		{
+			this.Close();
+		}
+
+		protected void CatSelectedIndexChanged(object sender, System.EventArgs e)
+		{
+			if(lstCategories.SelectedIndex<0)
+			{
+                lstCommands.Items.Clear();
+				return;
+			}
+            string sCat=lstCategories.Items[lstCategories.SelectedIndex] as string;
+			ArrayList lst=new ArrayList();
+			BaseItem objCopy=null;
+			for(int i=0;i<m_DotNetBar.Items.Count;i++)
+			{
+				BaseItem objItem=m_DotNetBar.Items[i];
+				if(objItem.Category!=sCat || objItem.SystemItem)
+					continue;
+				objCopy=objItem.Copy();
+			    if (objCopy is ButtonItem) ((ButtonItem) objCopy).FixedSize = Size.Empty;
+				//objCopy.Enabled=true;  Issue: B1002
+				objCopy.SetDesignMode(true);
+				objCopy.SetOwner(m_DotNetBar);
+				lst.Add(objCopy);
+			}
+            lstCommands.SetItems(lst);
+		}
+
+		protected override void OnMouseMove(MouseEventArgs e)
+		{
+			base.OnMouseMove(e);
+		}
+
+		private void MouseMoveDrag(Point pScreen)
+		{
+			if(m_ItemDrag)
+			{
+				if(m_DesignTimeProvider!=null)
+				{
+					m_DesignTimeProvider.DrawReversibleMarker(m_InsertPosition,m_InsertBefore);
+					m_DesignTimeProvider=null;
+				}
+				foreach(DevComponents.DotNetBar.Bar bar in m_DotNetBar.Bars)
+				{
+					if(!bar.Visible || !bar.AcceptDropItems)
+						continue;
+					InsertPosition pos=((IDesignTimeProvider)bar.ItemsContainer).GetInsertPosition(pScreen, DragItem);
+					
+					if(pos!=null)
+					{
+						if(pos.TargetProvider==null)
+						{
+							// Cursor is over drag item
+							if(m_NACursor!=null)
+								System.Windows.Forms.Cursor.Current=m_NACursor;
+							else
+								System.Windows.Forms.Cursor.Current=System.Windows.Forms.Cursors.No;
+							break;
+						}
+						pos.TargetProvider.DrawReversibleMarker(pos.Position,pos.Before);
+						m_InsertPosition=pos.Position;
+						m_InsertBefore=pos.Before;
+						m_DesignTimeProvider=pos.TargetProvider;
+						if(m_DragCopy)
+						{
+							if(m_CopyCursor!=null)
+								System.Windows.Forms.Cursor.Current=m_CopyCursor;
+							else
+								System.Windows.Forms.Cursor.Current=System.Windows.Forms.Cursors.Hand;
+						}
+						else
+						{
+							if(m_MoveCursor!=null)
+								System.Windows.Forms.Cursor.Current=m_MoveCursor;
+							else
+								System.Windows.Forms.Cursor.Current=System.Windows.Forms.Cursors.Hand;
+						}
+						break;
+					}
+					else
+					{
+						if(m_NACursor!=null)
+							System.Windows.Forms.Cursor.Current=m_NACursor;
+						else
+							System.Windows.Forms.Cursor.Current=System.Windows.Forms.Cursors.No;
+					}
+				}
+			}
+		}
+
+		public bool DragInProgress
+		{
+			get
+			{
+				return m_ItemDrag;
+			}
+		}
+
+		protected override void OnMouseUp(MouseEventArgs e)
+		{
+			base.OnMouseUp(e);
+		}
+
+		private void MouseUpDrag(Point pScreen)
+		{
+			if(m_ItemDrag)
+			{
+				DestroyTimer();
+				this.DragItem.InternalMouseLeave();
+				if(m_DesignTimeProvider!=null)
+				{
+					m_DesignTimeProvider.DrawReversibleMarker(m_InsertPosition, m_InsertBefore);
+					BaseItem objParent=this.DragItem.Parent;
+					if(objParent!=null)
+					{
+						if(objParent==(BaseItem)m_DesignTimeProvider && m_InsertPosition>0)
+						{
+							if(objParent.SubItems.IndexOf(this.DragItem)<m_InsertPosition)
+								m_InsertPosition--;
+						}
+						else
+						{
+							Bar bar=objParent.ContainerControl as Bar;
+							if(bar!=null && this.DragItem.OriginalBarName=="")
+								this.DragItem.OriginalBarName=bar.Name;
+							else if(bar!=null && bar.Name==this.DragItem.OriginalBarName)
+								this.DragItem.OriginalBarName="";
+						}
+
+						if(this.DragItem.OriginalPosition<0)
+						{
+							if(objParent==(BaseItem)m_DesignTimeProvider)
+							{
+								if(objParent.SubItems.IndexOf(this.DragItem)!=m_InsertPosition)
+									this.DragItem.OriginalPosition=objParent.SubItems.IndexOf(this.DragItem);
+							}
+                            else
+								this.DragItem.OriginalPosition=objParent.SubItems.IndexOf(this.DragItem);
+						}
+						else if(objParent==(BaseItem)m_DesignTimeProvider && m_InsertPosition==this.DragItem.OriginalPosition)
+							this.DragItem.OriginalPosition=-1;
+
+						objParent.SubItems.Remove(this.DragItem);
+						Control ctrl=objParent.ContainerControl as Control;
+						if(ctrl is Bar)
+							((Bar)ctrl).RecalcLayout();
+						else if(ctrl is MenuPanel)
+							((MenuPanel)ctrl).RecalcSize();
+					}
+					else
+						this.DragItem.OriginalPosition=0;
+					m_DesignTimeProvider.InsertItemAt(this.DragItem,m_InsertPosition,m_InsertBefore);
+					m_DesignTimeProvider=null;
+					((IOwner)m_DotNetBar).InvokeUserCustomize(this.DragItem,new EventArgs());
+					((IOwner)m_DotNetBar).InvokeEndUserCustomize(this.DragItem,new EndUserCustomizeEventArgs(eEndUserCustomizeAction.ItemMoved));
+				}
+				else if(this.DragItem.Parent!=null)
+				{
+					// Remove item if item is out of bounds of the main form
+					Point p=pScreen;
+					if(m_DotNetBar.ParentForm!=null && !m_DotNetBar.ParentForm.Bounds.Contains(p))
+					{
+						BaseItem objParent=this.DragItem.Parent;
+						//objParent.SubItems.Remove(this.DragItem);
+                        this.DragItem.UserCustomized = true; // Instead of removing hide and mark as customized so if layout is saved this gets recorded.
+                        this.DragItem.Visible = false;
+						Control ctrl=objParent.ContainerControl as Control;
+						if(ctrl is Bar)
+							((Bar)ctrl).RecalcLayout();
+						else if(ctrl is MenuPanel)
+							((MenuPanel)ctrl).RecalcSize();
+						((IOwner)m_DotNetBar).InvokeUserCustomize(this.DragItem,new EventArgs());
+                        ((IOwner)m_DotNetBar).InvokeEndUserCustomize(this.DragItem, new EndUserCustomizeEventArgs(eEndUserCustomizeAction.ItemDeleted, ctrl));
+					}
+				}
+				m_ItemDrag=false;
+				System.Windows.Forms.Cursor.Current=System.Windows.Forms.Cursors.Default;
+				this.Capture=false;
+				IOwner owner=m_DotNetBar as IOwner;
+				owner.SetFocusItem(null);
+			}
+		}
+
+		protected override bool ProcessDialogKey(Keys keyData)
+		{
+			if(keyData==Keys.Escape && m_ItemDrag)
+			{
+                CancelDrag();
+				return true;			
+			}
+			return base.ProcessDialogKey(keyData);
+		}
+
+		internal void CancelDrag()
+		{
+			if(m_ItemDrag)
+			{
+				DestroyTimer();
+				// Cancel item drag...
+				if(m_DesignTimeProvider!=null)
+					m_DesignTimeProvider.DrawReversibleMarker(m_InsertPosition, m_InsertBefore);
+				m_ItemDrag=false;
+				System.Windows.Forms.Cursor.Current=System.Windows.Forms.Cursors.Default;
+				this.Capture=false;
+				IOwner owner=m_DotNetBar as IOwner;
+				owner.SetFocusItem(null);
+				if(this.DragItem!=null)
+				{
+					this.DragItem.InternalMouseUp(new MouseEventArgs(MouseButtons.Left,1,this.DragItem.LeftInternal+1,this.DragItem.TopInternal+1,0));
+					this.DragItem.Refresh();
+				}
+				this.DragItem=null;
+			}
+		}
+
+		protected void Commands_OnMouseDown(object sender, MouseEventArgs e)
+		{
+			m_MouseDownPt=new Point(e.X,e.Y);
+		}
+
+		protected void Commands_OnMouseMove(object sender, MouseEventArgs e)
+		{
+			if(e.Button==MouseButtons.Left && (Math.Abs(m_MouseDownPt.X-e.X)>2 || Math.Abs(m_MouseDownPt.Y-e.Y)>2) && !m_ItemDrag)
+			{
+				if(lstCommands.SelectedIndex<0)
+					return;
+				BaseItem objItem=lstCommands.Items[lstCommands.SelectedIndex] as BaseItem;
+				if(objItem==null)
+					return;
+
+				this.DragItem=objItem.Copy();
+				this.DragItem.SetDesignMode(true);
+				m_ItemDrag=true;
+				m_DragCopy=true;
+				this.Capture=true;
+				CreateTimer();
+				if(m_NACursor!=null)
+					System.Windows.Forms.Cursor.Current=m_NACursor;
+				else
+					System.Windows.Forms.Cursor.Current=System.Windows.Forms.Cursors.No;
+			}
+		}
+
+		public void DesignTimeContextMenu(BaseItem objItem)
+		{
+			using(LocalizationManager lm=new LocalizationManager(m_DotNetBar))
+			{
+				ButtonItem btn;
+				m_EditItem=objItem;
+				if(m_PopupMenu!=null)
+					m_PopupMenu.Dispose();
+
+				m_PopupMenu=new ButtonItem("syscustomizepopupmenu");
+				m_PopupMenu.Style=objItem.Style;
+
+				btn=new ButtonItem("reset");
+				btn.Text=lm.GetLocalizedString(LocalizationKeys.CustomizeMenuReset);
+				btn.Click+=new EventHandler(this.ResetItemClick);
+				m_PopupMenu.SubItems.Add(btn);
+				
+				btn=new ButtonItem("delete");
+				btn.Text=lm.GetLocalizedString(LocalizationKeys.CustomizeMenuDelete);
+				btn.Click+=new System.EventHandler(this.DeleteClick);
+				m_PopupMenu.SubItems.Add(btn);
+
+				TextBoxItem tx=new TextBoxItem("name");
+				tx.Text=lm.GetLocalizedString(LocalizationKeys.CustomizeMenuChangeName);
+				tx.BeginGroup=true;
+				tx.ControlText=objItem.Text;
+				tx.LostFocus+=new System.EventHandler(this.ItemNameLostFocus);
+				
+				m_PopupMenu.SubItems.Add(tx);
+
+				if(m_EditItem is ButtonItem)
+				{
+					ButtonItem objButton=m_EditItem as ButtonItem;
+					btn=new ButtonItem("defaultstyle");
+					btn.Text=lm.GetLocalizedString(LocalizationKeys.CustomizeMenuDefaultStyle);
+					btn.BeginGroup=true;
+					btn.Click+=new System.EventHandler(this.ButtonStyleClick);
+					if(objButton.ButtonStyle==eButtonStyle.Default)
+						btn.Checked=true;
+					m_PopupMenu.SubItems.Add(btn);
+
+					btn=new ButtonItem("textonly");
+					btn.Text=lm.GetLocalizedString(LocalizationKeys.CustomizeMenuTextOnly);
+					btn.Click+=new System.EventHandler(this.ButtonStyleClick);
+					if(objButton.ButtonStyle==eButtonStyle.TextOnlyAlways)
+						btn.Checked=true;
+					m_PopupMenu.SubItems.Add(btn);
+
+					btn=new ButtonItem("imageandtext");
+					btn.Text=lm.GetLocalizedString(LocalizationKeys.CustomizeMenuImageAndText);
+					btn.Click+=new System.EventHandler(this.ButtonStyleClick);
+					if(objButton.ButtonStyle==eButtonStyle.ImageAndText)
+						btn.Checked=true;
+					m_PopupMenu.SubItems.Add(btn);
+
+				}
+
+				btn=new ButtonItem("begingroup");
+				btn.BeginGroup=true;
+				btn.Text=lm.GetLocalizedString(LocalizationKeys.CustomizeMenuBeginGroup);
+				btn.Checked=m_EditItem.BeginGroup;
+				btn.Click+=new System.EventHandler(this.BeginGroupClick);
+			
+				m_PopupMenu.SubItems.Add(btn);
+	
+				m_DotNetBar.OnCustomizeContextMenu(this,m_PopupMenu);
+		        
+				//m_DotNetBar.RegisterPopup(m_PopupMenu);
+				m_PopupMenu.SetOwner(m_DotNetBar);
+				m_PopupMenu.PopupMenu(Control.MousePosition);
+			}
+		}
+
+		private void ResetItemClick(object sender, EventArgs e)
+		{
+			((IOwner)m_DotNetBar).InvokeResetDefinition(m_EditItem, e);
+		}
+
+		private void ItemNameLostFocus(object sender, System.EventArgs arg)
+		{
+			m_EditItem.Text=((TextBoxItem)m_PopupMenu.SubItems["name"]).ControlText;
+			m_EditItem.Refresh();
+			((IOwner)m_DotNetBar).InvokeUserCustomize(m_EditItem,new EventArgs());
+			((IOwner)m_DotNetBar).InvokeEndUserCustomize(m_EditItem,new EndUserCustomizeEventArgs(eEndUserCustomizeAction.ItemTextChanged));
+		}
+
+		private void ButtonStyleClick(object sender, System.EventArgs e)
+		{
+            ButtonItem objButton=sender as ButtonItem;
+			ButtonItem objEditItem=m_EditItem as ButtonItem;
+
+			if(objButton==null)
+				return;
+
+			if(objButton.Name=="defaultstyle" && !objButton.Checked)
+			{
+				objEditItem.ButtonStyle=eButtonStyle.Default;
+				objEditItem.Refresh();
+				((IOwner)m_DotNetBar).InvokeUserCustomize(m_EditItem,new EventArgs());
+				((IOwner)m_DotNetBar).InvokeEndUserCustomize(m_EditItem,new EndUserCustomizeEventArgs(eEndUserCustomizeAction.ItemStyleChanged));
+			}
+			else if(objButton.Name=="textonly" && !objButton.Checked)
+			{
+				objEditItem.ButtonStyle=eButtonStyle.TextOnlyAlways;
+				objEditItem.Refresh();
+				((IOwner)m_DotNetBar).InvokeUserCustomize(m_EditItem,new EventArgs());
+				((IOwner)m_DotNetBar).InvokeEndUserCustomize(m_EditItem,new EndUserCustomizeEventArgs(eEndUserCustomizeAction.ItemStyleChanged));
+			}
+			else if(objButton.Name=="imageandtext" && !objButton.Checked)
+			{
+				objEditItem.ButtonStyle=eButtonStyle.ImageAndText;
+				objEditItem.Refresh();
+				((IOwner)m_DotNetBar).InvokeUserCustomize(m_EditItem,new EventArgs());
+				((IOwner)m_DotNetBar).InvokeEndUserCustomize(m_EditItem,new EndUserCustomizeEventArgs(eEndUserCustomizeAction.ItemStyleChanged));
+			}
+		}
+
+		private void BeginGroupClick(object sender, System.EventArgs e)
+		{
+			ButtonItem objItem=sender as ButtonItem;
+			
+			if(objItem==null)
+				return;
+
+			objItem.Checked=!objItem.Checked;
+			m_EditItem.BeginGroup=objItem.Checked;
+			objItem.Refresh();
+			m_EditItem.Refresh();
+			((IOwner)m_DotNetBar).InvokeUserCustomize(m_EditItem,new EventArgs());
+			((IOwner)m_DotNetBar).InvokeEndUserCustomize(m_EditItem,new EndUserCustomizeEventArgs(eEndUserCustomizeAction.ItemBeginGroupChanged));
+		}
+
+		private void DeleteClick(object sender, System.EventArgs e)
+		{
+			BaseItem objParent=m_EditItem.Parent;
+            
+            //objParent.SubItems.Remove(m_EditItem);
+            m_EditItem.UserCustomized = true; // Instead of removing hide and mark as customized so if layout is saved this gets recorded.
+            m_EditItem.Visible = false;
+
+			objParent.Refresh();
+			Bar bar=objParent.ContainerControl as Bar;
+			if(bar!=null)
+				bar.RecalcLayout();
+			((IOwner)m_DotNetBar).InvokeUserCustomize(m_EditItem,new EventArgs());
+			((IOwner)m_DotNetBar).InvokeEndUserCustomize(m_EditItem,new EndUserCustomizeEventArgs(eEndUserCustomizeAction.ItemDeleted));
+		}
+
+		protected override void WndProc(ref Message m)
+		{
+			if(m.Msg==NativeFunctions.WM_USER+707)
+			{
+				this.Capture=true;
+				if(m_MoveCursor!=null)
+                    System.Windows.Forms.Cursor.Current=m_MoveCursor;
+				else
+					System.Windows.Forms.Cursor.Current=System.Windows.Forms.Cursors.Hand;
+				m_ItemDrag=true;
+				this.Focus();
+				CreateTimer();
+				return;
+			}
+			base.WndProc(ref m);
+		}
+
+		#region Windows Form 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.chkShowScreenTips = new System.Windows.Forms.CheckBox();
+			this.tabCtrl = new System.Windows.Forms.TabControl();
+			this.tabPage1 = new System.Windows.Forms.TabPage();
+			this.cmdReset = new System.Windows.Forms.Button();
+			this.cmdRename = new System.Windows.Forms.Button();
+			this.cmdDelete = new System.Windows.Forms.Button();
+			this.cmdNew = new System.Windows.Forms.Button();
+			this.label1 = new System.Windows.Forms.Label();
+			this.lstBars = new System.Windows.Forms.CheckedListBox();
+			this.tabPage2 = new System.Windows.Forms.TabPage();
+			this.lstCommands = new DevComponents.DotNetBar.ItemsListBox();
+			this.lstCategories = new System.Windows.Forms.ListBox();
+			this.label4 = new System.Windows.Forms.Label();
+			this.label3 = new System.Windows.Forms.Label();
+			this.label2 = new System.Windows.Forms.Label();
+			this.tabPage3 = new System.Windows.Forms.TabPage();
+            this.cboAnimations = new Controls.ComboBoxEx();
+			this.comboItem1 = new DevComponents.Editors.ComboItem();
+			this.comboItem6 = new DevComponents.Editors.ComboItem();
+			this.comboItem2 = new DevComponents.Editors.ComboItem();
+			this.comboItem3 = new DevComponents.Editors.ComboItem();
+			this.comboItem4 = new DevComponents.Editors.ComboItem();
+			this.comboItem5 = new DevComponents.Editors.ComboItem();
+			this.label7 = new System.Windows.Forms.Label();
+			this.chkTipsShowShortcuts = new System.Windows.Forms.CheckBox();
+			this.button1 = new System.Windows.Forms.Button();
+			this.label6 = new System.Windows.Forms.Label();
+			this.chkFullAfterDelay = new System.Windows.Forms.CheckBox();
+			this.chkShowFullMenus = new System.Windows.Forms.CheckBox();
+			this.label5 = new System.Windows.Forms.Label();
+			this.cmdKeyboard = new System.Windows.Forms.Button();
+			this.cmdClose = new System.Windows.Forms.Button();
+			this.tabCtrl.SuspendLayout();
+			this.tabPage1.SuspendLayout();
+			this.tabPage2.SuspendLayout();
+			this.tabPage3.SuspendLayout();
+			this.SuspendLayout();
+			// 
+			// chkShowScreenTips
+			// 
+			this.chkShowScreenTips.Location = new System.Drawing.Point(24, 152);
+			this.chkShowScreenTips.Name = "chkShowScreenTips";
+			this.chkShowScreenTips.Size = new System.Drawing.Size(320, 16);
+			this.chkShowScreenTips.TabIndex = 3;
+			this.chkShowScreenTips.Text = "cust_chk_showst";
+			// 
+			// tabCtrl
+			// 
+			this.tabCtrl.Controls.AddRange(new System.Windows.Forms.Control[] {
+																				  this.tabPage1,
+																				  this.tabPage2,
+																				  this.tabPage3});
+			this.tabCtrl.Location = new System.Drawing.Point(6, 6);
+			this.tabCtrl.Name = "tabCtrl";
+			this.tabCtrl.SelectedIndex = 0;
+			this.tabCtrl.Size = new System.Drawing.Size(354, 303);
+			this.tabCtrl.TabIndex = 0;
+			// 
+			// tabPage1
+			// 
+			this.tabPage1.Controls.AddRange(new System.Windows.Forms.Control[] {
+																				   this.cmdReset,
+																				   this.cmdRename,
+																				   this.cmdDelete,
+																				   this.cmdNew,
+																				   this.label1,
+																				   this.lstBars});
+			this.tabPage1.Location = new System.Drawing.Point(4, 22);
+			this.tabPage1.Name = "tabPage1";
+			this.tabPage1.Size = new System.Drawing.Size(346, 277);
+			this.tabPage1.TabIndex = 0;
+			this.tabPage1.Text = "cust_tab_toolbars";
+			this.tabPage1.Visible = false;
+			// 
+			// cmdReset
+			// 
+			//this.cmdReset.Anchor = (System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right);
+			this.cmdReset.Enabled = true;
+			this.cmdReset.FlatStyle = System.Windows.Forms.FlatStyle.System;
+			this.cmdReset.Location = new System.Drawing.Point(250, 118);
+			this.cmdReset.Name = "cmdReset";
+			this.cmdReset.Size = new System.Drawing.Size(90, 24);
+			this.cmdReset.TabIndex = 4;
+			this.cmdReset.Text = "cust_btn_reset";
+			this.cmdReset.Visible = false;
+			this.cmdReset.Click += new System.EventHandler(this.ResetBar);
+			// 
+			// cmdRename
+			// 
+			//this.cmdRename.Anchor = (System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right);
+			this.cmdRename.Enabled = false;
+			this.cmdRename.FlatStyle = System.Windows.Forms.FlatStyle.System;
+			this.cmdRename.Location = new System.Drawing.Point(250, 52);
+			this.cmdRename.Name = "cmdRename";
+			this.cmdRename.Size = new System.Drawing.Size(90, 24);
+			this.cmdRename.TabIndex = 2;
+			this.cmdRename.Text = "cust_btn_rename";
+			this.cmdRename.Click += new System.EventHandler(this.RenameBar);
+			// 
+			// cmdDelete
+			// 
+			//this.cmdDelete.Anchor = (System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right);
+			this.cmdDelete.Enabled = false;
+			this.cmdDelete.FlatStyle = System.Windows.Forms.FlatStyle.System;
+			this.cmdDelete.Location = new System.Drawing.Point(250, 85);
+			this.cmdDelete.Name = "cmdDelete";
+			this.cmdDelete.Size = new System.Drawing.Size(90, 24);
+			this.cmdDelete.TabIndex = 3;
+			this.cmdDelete.Text = "cust_btn_delete";
+			this.cmdDelete.Click += new System.EventHandler(this.DeleteBar);
+			// 
+			// cmdNew
+			// 
+			//this.cmdNew.Anchor = (System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right);
+			this.cmdNew.FlatStyle = System.Windows.Forms.FlatStyle.System;
+			this.cmdNew.Location = new System.Drawing.Point(250, 19);
+			this.cmdNew.Name = "cmdNew";
+			this.cmdNew.Size = new System.Drawing.Size(90, 24);
+			this.cmdNew.TabIndex = 1;
+			this.cmdNew.Text = "cust_btn_new";
+			this.cmdNew.Click += new System.EventHandler(this.NewBar);
+			// 
+			// label1
+			// 
+			this.label1.Location = new System.Drawing.Point(5, 5);
+			this.label1.Name = "label1";
+			this.label1.Size = new System.Drawing.Size(259, 12);
+			this.label1.TabIndex = 0;
+			this.label1.Text = "cust_lbl_tlbs";
+			// 
+			// lstBars
+			// 
+			//this.lstBars.Anchor = (((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+			//	| System.Windows.Forms.AnchorStyles.Left) 
+			//	| System.Windows.Forms.AnchorStyles.Right);
+			this.lstBars.Location = new System.Drawing.Point(5, 19);
+			this.lstBars.Name = "lstBars";
+			this.lstBars.IntegralHeight=false;
+			this.lstBars.Size = new System.Drawing.Size(239, 249);
+			this.lstBars.TabIndex = 0;
+			this.lstBars.SelectedIndexChanged += new System.EventHandler(this.BarSelectionChanged);
+			this.lstBars.ItemCheck += new System.Windows.Forms.ItemCheckEventHandler(this.BarsCheck);
+			// 
+			// tabPage2
+			// 
+			this.tabPage2.Controls.AddRange(new System.Windows.Forms.Control[] {
+																				   this.lstCategories,
+																				   this.lstCommands,
+																				   this.label4,
+																				   this.label3,
+																				   this.label2});
+			this.tabPage2.Location = new System.Drawing.Point(4, 22);
+			this.tabPage2.Name = "tabPage2";
+			this.tabPage2.Size = new System.Drawing.Size(346, 277);
+			this.tabPage2.TabIndex = 1;
+			this.tabPage2.Text = "cust_tab_commands";
+			this.tabPage2.Visible = false;
+			// 
+			// lstCommands
+			// 
+			this.lstCommands.BackColor = System.Drawing.SystemColors.Control;
+			this.lstCommands.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed;
+			this.lstCommands.IntegralHeight = false;
+			this.lstCommands.Location = new System.Drawing.Point(136, 71);
+			this.lstCommands.Name = "lstCommands";
+			this.lstCommands.Size = new System.Drawing.Size(200, 197);
+			this.lstCommands.TabIndex = 2;
+			this.lstCommands.MouseDown += new System.Windows.Forms.MouseEventHandler(this.Commands_OnMouseDown);
+			this.lstCommands.MouseMove += new System.Windows.Forms.MouseEventHandler(this.Commands_OnMouseMove);
+			// 
+			// lstCategories
+			// 
+			this.lstCategories.Location = new System.Drawing.Point(5, 71);
+			this.lstCategories.Name = "lstCategories";
+			this.lstCategories.IntegralHeight=false;
+			this.lstCategories.Size = new System.Drawing.Size(121, 197);
+			this.lstCategories.TabIndex = 2;
+			this.lstCategories.SelectedIndexChanged += new System.EventHandler(this.CatSelectedIndexChanged);
+			// 
+			// label4
+			// 
+			this.label4.Location = new System.Drawing.Point(136, 56);
+			this.label4.Name = "label4";
+			this.label4.Size = new System.Drawing.Size(197, 13);
+			this.label4.TabIndex = 1;
+			this.label4.Text = "cust_lbl_cmds";
+			// 
+			// label3
+			// 
+			this.label3.Location = new System.Drawing.Point(5, 56);
+			this.label3.Name = "label3";
+			this.label3.Size = new System.Drawing.Size(123, 13);
+			this.label3.TabIndex = 1;
+			this.label3.Text = "cust_lbl_cats";
+			// 
+			// label2
+			// 
+			//this.label2.Anchor = ((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+			//	| System.Windows.Forms.AnchorStyles.Right);
+			this.label2.Location = new System.Drawing.Point(4, 4);
+			this.label2.Name = "label2";
+			this.label2.Size = new System.Drawing.Size(336, 46);
+			this.label2.TabIndex = 0;
+			this.label2.Text = "cust_lbl_cmdsins";
+			// 
+			// tabPage3
+			// 
+			this.tabPage3.Controls.AddRange(new System.Windows.Forms.Control[] {
+																				   this.chkShowFullMenus,
+																				   this.chkFullAfterDelay,
+																				   this.button1,
+																				   this.chkShowScreenTips,
+																				   this.chkTipsShowShortcuts,
+																				   this.cboAnimations,
+																				   this.label7,
+																				   this.label6,
+																				   this.label5});
+			this.tabPage3.Location = new System.Drawing.Point(4, 22);
+			this.tabPage3.Name = "tabPage3";
+			this.tabPage3.Size = new System.Drawing.Size(346, 277);
+			this.tabPage3.TabIndex = 2;
+			this.tabPage3.Text = "cust_tab_options";
+			this.tabPage3.Visible = false;
+			// 
+			// cboAnimations
+			// 
+			this.cboAnimations.DefaultStyle = false;
+			this.cboAnimations.DisableInternalDrawing = false;
+			this.cboAnimations.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+			this.cboAnimations.DropDownWidth = 120;
+			this.cboAnimations.Images = null;
+			this.cboAnimations.Items.AddRange(new object[] {
+															   this.comboItem1,
+															   this.comboItem6,
+															   this.comboItem2,
+															   this.comboItem3,
+															   this.comboItem4,
+															   this.comboItem5});
+			this.cboAnimations.Location = new System.Drawing.Point(24, 224);
+			this.cboAnimations.Name = "cboAnimations";
+			this.cboAnimations.Size = new System.Drawing.Size(120, 21);
+			this.cboAnimations.Style = DevComponents.DotNetBar.eDotNetBarStyle.OfficeXP;
+			this.cboAnimations.TabIndex = 5;
+			// 
+			// comboItem1
+			// 
+			this.comboItem1.BackColor = System.Drawing.Color.Empty;
+			this.comboItem1.FontName = "";
+			this.comboItem1.FontSize = 8F;
+			this.comboItem1.FontStyle = System.Drawing.FontStyle.Regular;
+			this.comboItem1.ForeColor = System.Drawing.Color.Empty;
+			this.comboItem1.Image = null;
+			this.comboItem1.ImageIndex = -1;
+			this.comboItem1.ImagePosition = System.Windows.Forms.HorizontalAlignment.Left;
+			this.comboItem1.Tag = null;
+			this.comboItem1.Text = "cust_cbo_none";
+			this.comboItem1.TextAlignment = System.Drawing.StringAlignment.Near;
+			this.comboItem1.TextLineAlignment = System.Drawing.StringAlignment.Near;
+			// 
+			// comboItem6
+			// 
+			this.comboItem6.BackColor = System.Drawing.Color.Empty;
+			this.comboItem6.FontName = "";
+			this.comboItem6.FontSize = 8F;
+			this.comboItem6.FontStyle = System.Drawing.FontStyle.Regular;
+			this.comboItem6.ForeColor = System.Drawing.Color.Empty;
+			this.comboItem6.Image = null;
+			this.comboItem6.ImageIndex = -1;
+			this.comboItem6.ImagePosition = System.Windows.Forms.HorizontalAlignment.Left;
+			this.comboItem6.Tag = null;
+			this.comboItem6.Text = "cust_cbo_system";
+			this.comboItem6.TextAlignment = System.Drawing.StringAlignment.Near;
+			this.comboItem6.TextLineAlignment = System.Drawing.StringAlignment.Near;
+			// 
+			// comboItem2
+			// 
+			this.comboItem2.BackColor = System.Drawing.Color.Empty;
+			this.comboItem2.FontName = "";
+			this.comboItem2.FontSize = 8F;
+			this.comboItem2.FontStyle = System.Drawing.FontStyle.Regular;
+			this.comboItem2.ForeColor = System.Drawing.Color.Empty;
+			this.comboItem2.Image = null;
+			this.comboItem2.ImageIndex = -1;
+			this.comboItem2.ImagePosition = System.Windows.Forms.HorizontalAlignment.Left;
+			this.comboItem2.Tag = null;
+			this.comboItem2.Text = "cust_cbo_random";
+			this.comboItem2.TextAlignment = System.Drawing.StringAlignment.Near;
+			this.comboItem2.TextLineAlignment = System.Drawing.StringAlignment.Near;
+			// 
+			// comboItem3
+			// 
+			this.comboItem3.BackColor = System.Drawing.Color.Empty;
+			this.comboItem3.FontName = "";
+			this.comboItem3.FontSize = 8F;
+			this.comboItem3.FontStyle = System.Drawing.FontStyle.Regular;
+			this.comboItem3.ForeColor = System.Drawing.Color.Empty;
+			this.comboItem3.Image = null;
+			this.comboItem3.ImageIndex = -1;
+			this.comboItem3.ImagePosition = System.Windows.Forms.HorizontalAlignment.Left;
+			this.comboItem3.Tag = null;
+			this.comboItem3.Text = "cust_cbo_unfold";
+			this.comboItem3.TextAlignment = System.Drawing.StringAlignment.Near;
+			this.comboItem3.TextLineAlignment = System.Drawing.StringAlignment.Near;
+			// 
+			// comboItem4
+			// 
+			this.comboItem4.BackColor = System.Drawing.Color.Empty;
+			this.comboItem4.FontName = "";
+			this.comboItem4.FontSize = 8F;
+			this.comboItem4.FontStyle = System.Drawing.FontStyle.Regular;
+			this.comboItem4.ForeColor = System.Drawing.Color.Empty;
+			this.comboItem4.Image = null;
+			this.comboItem4.ImageIndex = -1;
+			this.comboItem4.ImagePosition = System.Windows.Forms.HorizontalAlignment.Left;
+			this.comboItem4.Tag = null;
+			this.comboItem4.Text = "cust_cbo_slide";
+			this.comboItem4.TextAlignment = System.Drawing.StringAlignment.Near;
+			this.comboItem4.TextLineAlignment = System.Drawing.StringAlignment.Near;
+			// 
+			// comboItem5
+			// 
+			this.comboItem5.BackColor = System.Drawing.Color.Empty;
+			this.comboItem5.FontName = "";
+			this.comboItem5.FontSize = 8F;
+			this.comboItem5.FontStyle = System.Drawing.FontStyle.Regular;
+			this.comboItem5.ForeColor = System.Drawing.Color.Empty;
+			this.comboItem5.Image = null;
+			this.comboItem5.ImageIndex = -1;
+			this.comboItem5.ImagePosition = System.Windows.Forms.HorizontalAlignment.Left;
+			this.comboItem5.Tag = null;
+			this.comboItem5.Text = "cust_cbo_fade";
+			this.comboItem5.TextAlignment = System.Drawing.StringAlignment.Near;
+			this.comboItem5.TextLineAlignment = System.Drawing.StringAlignment.Near;
+			// 
+			// label7
+			// 
+			this.label7.Location = new System.Drawing.Point(24, 208);
+			this.label7.Name = "label7";
+			this.label7.Size = new System.Drawing.Size(320, 16);
+			this.label7.TabIndex = 6;
+			this.label7.Text = "cust_lbl_menuan";
+			// 
+			// chkTipsShowShortcuts
+			// 
+			this.chkTipsShowShortcuts.Location = new System.Drawing.Point(40, 176);
+			this.chkTipsShowShortcuts.Name = "chkTipsShowShortcuts";
+			this.chkTipsShowShortcuts.Size = new System.Drawing.Size(304, 16);
+			this.chkTipsShowShortcuts.TabIndex = 4;
+			this.chkTipsShowShortcuts.Text = "cust_chk_showsk";
+			// 
+			// button1
+			// 
+			this.button1.FlatStyle = System.Windows.Forms.FlatStyle.System;
+			this.button1.Location = new System.Drawing.Point(24, 80);
+			this.button1.Name = "button1";
+			this.button1.Size = new System.Drawing.Size(180, 24);
+			this.button1.TabIndex = 2;
+			this.button1.Text = "cust_btn_resetusage";
+			this.button1.Click += new System.EventHandler(this.ResetUsageData);
+			// 
+			// label6
+			// 
+			this.label6.Location = new System.Drawing.Point(8, 128);
+			this.label6.Name = "label6";
+			this.label6.Size = new System.Drawing.Size(336, 16);
+			this.label6.TabIndex = 7;
+			this.label6.Text = "cust_lbl_other";
+			// 
+			// chkFullAfterDelay
+			// 
+			this.chkFullAfterDelay.Location = new System.Drawing.Point(40, 56);
+			this.chkFullAfterDelay.Name = "chkFullAfterDelay";
+			this.chkFullAfterDelay.Size = new System.Drawing.Size(304, 16);
+			this.chkFullAfterDelay.TabIndex = 1;
+			this.chkFullAfterDelay.Text = "cust_chk_delay";
+			// 
+			// chkShowFullMenus
+			// 
+			this.chkShowFullMenus.Location = new System.Drawing.Point(24, 32);
+			this.chkShowFullMenus.Name = "chkShowFullMenus";
+			this.chkShowFullMenus.Size = new System.Drawing.Size(320, 16);
+			this.chkShowFullMenus.TabIndex = 0;
+			this.chkShowFullMenus.Text = "cust_chk_fullmenus";
+			// 
+			// label5
+			// 
+			this.label5.Location = new System.Drawing.Point(8, 8);
+			this.label5.Name = "label5";
+			this.label5.Size = new System.Drawing.Size(336, 16);
+			this.label5.TabIndex = 8;
+			this.label5.Text = "cust_lbl_pmt";
+			// 
+			// cmdKeyboard
+			// 
+			//this.cmdKeyboard.Anchor = (System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right);
+			this.cmdKeyboard.FlatStyle = System.Windows.Forms.FlatStyle.System;
+			this.cmdKeyboard.Location = new System.Drawing.Point(160, 317);
+			this.cmdKeyboard.Name = "cmdKeyboard";
+			this.cmdKeyboard.Size = new System.Drawing.Size(96, 24);
+			this.cmdKeyboard.TabIndex = 1;
+			this.cmdKeyboard.Text = "cust_btn_keyboard";
+			// 
+			// cmdClose
+			// 
+			//this.cmdClose.Anchor = (System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right);
+			this.cmdClose.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.cmdClose.FlatStyle = System.Windows.Forms.FlatStyle.System;
+			this.cmdClose.Location = new System.Drawing.Point(264, 317);
+			this.cmdClose.Name = "cmdClose";
+			this.cmdClose.Size = new System.Drawing.Size(96, 24);
+			this.cmdClose.TabIndex = 2;
+			this.cmdClose.Text = "cust_btn_close";
+			this.cmdClose.Click += new System.EventHandler(this.Close_Click);
+			// 
+			// frmCustomize
+			// 
+			this.AutoScaleBaseSize = new System.Drawing.Size(5, 13);
+			this.ClientSize = new System.Drawing.Size(368, 347);
+			this.Controls.AddRange(new System.Windows.Forms.Control[] {
+																		  this.cmdClose,
+																		  this.cmdKeyboard,
+																		  this.tabCtrl});
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+			this.MaximizeBox = false;
+			this.MinimizeBox = false;
+			this.Name = "frmCustomize";
+			this.ShowInTaskbar = false;
+			this.Text = "cust_caption";
+			this.tabCtrl.ResumeLayout(false);
+			this.tabPage1.ResumeLayout(false);
+			this.tabPage2.ResumeLayout(false);
+			this.tabPage3.ResumeLayout(false);
+			this.AcceptButton=cmdClose;
+			this.CancelButton=cmdClose;
+			this.ResumeLayout(false);
+
+		}
+		#endregion
+
+		private void NewBar(object sender, System.EventArgs e)
+		{
+			ToolbarName nt=new ToolbarName();
+			nt.txtName.Text="Custom Bar";
+			using(LocalizationManager lm=new LocalizationManager(m_DotNetBar))
+			{
+				nt.txtName.Text=lm.GetLocalizedString("sys_custombar");
+			}
+
+			nt.StartPosition=FormStartPosition.CenterParent;
+
+			if(nt.ShowDialog(this)==DialogResult.OK)
+			{
+				Bar bar=new Bar(nt.txtName.Text);
+				bar.CustomBar=true;
+				bar.CanHide=true;
+				bar.SetDesignMode(true);
+				bar.GrabHandleStyle=eGrabHandleStyle.StripeFlat;
+
+				string name="userBar";
+				int i=0;
+				while(m_DotNetBar.Bars.Contains(name+i.ToString()))
+					i++;
+				bar.Name=name+i.ToString();
+
+				m_DotNetBar.Bars.Add(bar);
+				bar.DockSide=eDockSide.None;
+				lstBars.Items.Add(bar,CheckState.Checked);
+				if(m_DotNetBar.AllowUserBarCustomize)
+					bar.Items.Add(new CustomizeItem());
+				((IOwner)m_DotNetBar).InvokeUserCustomize(bar,new EventArgs());
+				((IOwner)m_DotNetBar).InvokeEndUserCustomize(bar,new EndUserCustomizeEventArgs(eEndUserCustomizeAction.NewBarCreated));
+			}
+			nt.Close();
+			nt.Dispose();
+		}
+
+		private void BarSelectionChanged(object sender, System.EventArgs e)
+		{
+			if(lstBars.SelectedIndex>=0)
+			{
+				Bar bar=lstBars.SelectedItem as Bar;
+				if(bar.CustomBar)
+				{
+					cmdRename.Enabled=true;
+					cmdReset.Enabled=false; // Work like Office, disable reset for custom bars
+					cmdDelete.Enabled=true;
+				}
+				else
+				{
+					cmdRename.Enabled=false;
+					cmdReset.Enabled=m_DotNetBar.ShowResetButton;
+					cmdDelete.Enabled=false;
+				}
+			}
+			else
+			{
+				cmdRename.Enabled=false;
+				cmdReset.Enabled=m_DotNetBar.ShowResetButton;
+				cmdDelete.Enabled=false;
+			}
+		}
+
+		private void RenameBar(object sender, System.EventArgs e)
+		{
+			if(lstBars.SelectedIndex<0)
+				return;
+			Bar bar=lstBars.SelectedItem as Bar;
+			if(bar==null)
+				return;
+            ToolbarName tn=new ToolbarName();
+			tn.RenameDialog=true;
+			tn.txtName.Text=bar.Text;
+			tn.StartPosition=FormStartPosition.CenterParent;
+			if(tn.ShowDialog(this)==DialogResult.OK)
+			{
+				bar.Text=tn.txtName.Text;
+				lstBars.Refresh();
+				((IOwner)m_DotNetBar).InvokeUserCustomize(bar,new EventArgs());
+				((IOwner)m_DotNetBar).InvokeEndUserCustomize(bar,new EndUserCustomizeEventArgs(eEndUserCustomizeAction.BarRenamed));
+			}
+			tn.Close();
+			tn.Dispose();
+		}
+
+		private void DeleteBar(object sender, System.EventArgs e)
+		{
+			if(lstBars.SelectedIndex<0)
+				return;
+			Bar bar=lstBars.SelectedItem as Bar;
+			if(bar==null || !bar.CustomBar)
+				return;
+			using(LocalizationManager lm=new LocalizationManager(m_DotNetBar))
+			{
+				if(MessageBox.Show(lm.GetLocalizedString(LocalizationKeys.CustomizeDialogOptionsConfirmDelete).Replace("<barname>","'"+bar.Text+"'"),this.Text,MessageBoxButtons.YesNo)==DialogResult.Yes)
+				{
+					lstBars.Items.Remove(bar);
+					m_DotNetBar.Bars.Remove(bar);
+					((IOwner)m_DotNetBar).InvokeUserCustomize(bar,new EventArgs());
+					((IOwner)m_DotNetBar).InvokeEndUserCustomize(bar,new EndUserCustomizeEventArgs(eEndUserCustomizeAction.BarDeleted));
+					bar.Dispose();
+				}
+			}
+		}
+
+		private void ResetBar(object sender, System.EventArgs e)
+		{
+			IOwner owner=m_DotNetBar as IOwner;
+			if(lstBars.SelectedIndex>=0)
+			{
+				Bar bar=lstBars.SelectedItem as Bar;
+				if(bar!=null && (bar.CustomBar || m_DotNetBar.ShowResetButton))
+				{
+					if(owner!=null)
+						owner.InvokeResetDefinition(bar.ItemsContainer,new EventArgs());
+				}
+			}
+			else if(owner!=null)
+                owner.InvokeResetDefinition(null,new EventArgs());
+		}
+
+		private void ResetUsageData(object sender, System.EventArgs e)
+		{
+			m_DotNetBar.ResetUsageData();
+		}
+
+		private void CreateTimer()
+		{
+			if(m_Timer!=null)
+			{
+				m_Timer.Start();
+				return;
+			}
+			m_Timer=new Timer();
+			m_Timer.Interval=100;
+			m_Timer.Tick+=new EventHandler(this.TimerTick);
+			m_Timer.Start();
+		}
+		private void TimerTick(object sender, EventArgs e)
+		{
+			if(Control.MouseButtons==MouseButtons.Left)
+			{
+				MouseMoveDrag(Control.MousePosition);
+			}
+			else
+			{
+				MouseUpDrag(Control.MousePosition);
+			}
+		}
+		private void DestroyTimer()
+		{
+			if(m_Timer==null)
+				return;
+			m_Timer.Stop();
+			m_Timer.Dispose();
+			m_Timer=null;
+		}
+
+		internal DotNetBarManager GetDotNetBarManager()
+		{
+			return m_DotNetBar;
+		}
+	}
+}
diff --git a/PROMS/DotNetBar Source Code/frmCustomize.resx b/PROMS/DotNetBar Source Code/frmCustomize.resx
new file mode 100644
index 00000000..929a6b94
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/frmCustomize.resx	
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+            Microsoft ResX Schema 
+        
+            Version 1.3
+                
+            The primary goals of this format is to allow a simple XML format 
+            that is mostly human readable. The generation and parsing of the 
+            various data types are done through the TypeConverter classes 
+            associated with the data types.
+        
+            Example:
+        
+                ... ado.net/XML headers & schema ...
+                <resheader name="resmimetype">text/microsoft-resx</resheader>
+                <resheader name="version">1.3</resheader>
+                <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+                <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+                <data name="Name1">this is my long string</data>
+                <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+                <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+                    [base64 mime encoded serialized .NET Framework object]
+                </data>
+                <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+                    [base64 mime encoded string representing a byte array form of the .NET Framework object]
+                </data>
+        
+            There are any number of "resheader" rows that contain simple 
+            name/value pairs.
+            
+            Each data row contains a name, and value. The row also contains a 
+            type or mimetype. Type corresponds to a .NET class that support 
+            text/value conversion through the TypeConverter architecture. 
+            Classes that don't support this are serialized and stored with the 
+            mimetype set.
+                     
+            The mimetype is used for serialized objects, and tells the 
+            ResXResourceReader how to depersist the object. This is currently not 
+            extensible. For a given mimetype the value must be set accordingly:
+        
+            Note - application/x-microsoft.net.object.binary.base64 is the format 
+                   that the ResXResourceWriter will generate, however the reader can 
+                   read any of the formats listed below.
+        
+            mimetype: application/x-microsoft.net.object.binary.base64
+            value   : The object must be serialized with 
+                    : System.Serialization.Formatters.Binary.BinaryFormatter
+                    : and then encoded with base64 encoding.
+        
+            mimetype: application/x-microsoft.net.object.soap.base64
+            value   : The object must be serialized with 
+                    : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+                    : and then encoded with base64 encoding.
+            mimetype: application/x-microsoft.net.object.bytearray.base64
+            value   : The object must be serialized into a byte array 
+                    : using a System.ComponentModel.TypeConverter
+                    : and then encoded with base64 encoding.
+        -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>1.3</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="$this.Name">
+    <value>frmCustomize</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/images1.resx b/PROMS/DotNetBar Source Code/images1.resx
new file mode 100644
index 00000000..d9dae5b3
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/images1.resx	
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <xsd:schema id="root" targetNamespace="" xmlns="" xmlns:xsd="http://www.w3.org/2000/10/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="data">
+      <xsd:complexType mixed="true">
+        <xsd:all>
+          <xsd:element name="value" minOccurs="0" type="xsd:string"/>
+        </xsd:all>
+        <xsd:attribute name="name" type="xsd:string"/>
+        <xsd:attribute name="type" type="xsd:string"/>
+        <xsd:attribute name="mimetype" type="xsd:string"/>
+      </xsd:complexType>
+    </xsd:element>
+    <xsd:element name="resheader">
+      <xsd:complexType mixed="true">
+        <xsd:all>
+          <xsd:element name="value" minOccurs="0" type="xsd:string"/>
+        </xsd:all>
+        <xsd:attribute name="name" use="required" type="xsd:string"/>
+      </xsd:complexType>
+    </xsd:element>
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element ref="data"/>
+          <xsd:element ref="resheader"/>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <data name="DragCopy" type="System.Byte[], mscorlib">
+    <value>System.Byte[]</value>
+  </data>
+  <resheader name="ResMimeType">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="Version">
+    <value>1.0.0.0</value>
+  </resheader>
+  <resheader name="Reader">
+    <value>System.Resources.ResXResourceReader</value>
+  </resheader>
+  <resheader name="Writer">
+    <value>System.Resources.ResXResourceWriter</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/PROMS/DotNetBar Source Code/licenses.licx b/PROMS/DotNetBar Source Code/licenses.licx
new file mode 100644
index 00000000..4e4551cd
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/licenses.licx	
@@ -0,0 +1 @@
+DevComponents.DotNetBar.DotNetBarManager, DevComponents.DotNetBar, Version=1.0.0.15599, Culture=neutral, PublicKeyToken=null
diff --git a/PROMS/DotNetBar Source Code/strings.resx b/PROMS/DotNetBar Source Code/strings.resx
new file mode 100644
index 00000000..91bf73fc
--- /dev/null
+++ b/PROMS/DotNetBar Source Code/strings.resx	
@@ -0,0 +1,363 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="cust_pm_reset" xml:space="preserve">
+    <value>Reset</value>
+  </data>
+  <data name="cust_pm_delete" xml:space="preserve">
+    <value>Delete</value>
+  </data>
+  <data name="cust_pm_name" xml:space="preserve">
+    <value>Name:</value>
+  </data>
+  <data name="cust_pm_stydef" xml:space="preserve">
+    <value>Default Style</value>
+  </data>
+  <data name="cust_pm_stytextonly" xml:space="preserve">
+    <value>Text Only (Always)</value>
+  </data>
+  <data name="cust_pm_styimagetext" xml:space="preserve">
+    <value>Image and Text (Always)</value>
+  </data>
+  <data name="cust_pm_begingroup" xml:space="preserve">
+    <value>Begin Group</value>
+  </data>
+  <data name="cust_caption" xml:space="preserve">
+    <value>Customize</value>
+  </data>
+  <data name="cust_tab_toolbars" xml:space="preserve">
+    <value>Toolbars</value>
+  </data>
+  <data name="cust_tab_commands" xml:space="preserve">
+    <value>Commands</value>
+  </data>
+  <data name="cust_tab_options" xml:space="preserve">
+    <value>Options</value>
+  </data>
+  <data name="cust_btn_keyboard" xml:space="preserve">
+    <value>&amp;Keyboard...</value>
+  </data>
+  <data name="cust_btn_close" xml:space="preserve">
+    <value>Close</value>
+  </data>
+  <data name="cust_btn_new" xml:space="preserve">
+    <value>&amp;New...</value>
+  </data>
+  <data name="cust_btn_rename" xml:space="preserve">
+    <value>&amp;Rename...</value>
+  </data>
+  <data name="cust_btn_delete" xml:space="preserve">
+    <value>Delete</value>
+  </data>
+  <data name="cust_btn_reset" xml:space="preserve">
+    <value>&amp;Reset...</value>
+  </data>
+  <data name="cust_lbl_cmdsins" xml:space="preserve">
+    <value>To add a command to Bar select the category and drag the command out of this box to a Bar.</value>
+  </data>
+  <data name="cust_lbl_cats" xml:space="preserve">
+    <value>Cate&amp;gories:</value>
+  </data>
+  <data name="cust_lbl_cmds" xml:space="preserve">
+    <value>Comman&amp;ds:</value>
+  </data>
+  <data name="cust_lbl_tlbs" xml:space="preserve">
+    <value>Toolb&amp;ars:</value>
+  </data>
+  <data name="cust_lbl_pmt" xml:space="preserve">
+    <value>Personalized Menus and Toolbars</value>
+  </data>
+  <data name="cust_chk_fullmenus" xml:space="preserve">
+    <value>Always show full menus</value>
+  </data>
+  <data name="cust_chk_delay" xml:space="preserve">
+    <value>Show full menus after a short delay</value>
+  </data>
+  <data name="cust_btn_resetusage" xml:space="preserve">
+    <value>&amp;Reset my usage data</value>
+  </data>
+  <data name="cust_lbl_other" xml:space="preserve">
+    <value>Other:</value>
+  </data>
+  <data name="cust_chk_showst" xml:space="preserve">
+    <value>Show Screen&amp;Tips on Toolbars</value>
+  </data>
+  <data name="cust_chk_showsk" xml:space="preserve">
+    <value>Show &amp;Shortcut Keys in ScreenTips</value>
+  </data>
+  <data name="cust_lbl_menuan" xml:space="preserve">
+    <value>Menu Animation:</value>
+  </data>
+  <data name="cust_cbo_none" xml:space="preserve">
+    <value>(None)</value>
+  </data>
+  <data name="cust_cbo_system" xml:space="preserve">
+    <value>System Default</value>
+  </data>
+  <data name="cust_cbo_random" xml:space="preserve">
+    <value>Random</value>
+  </data>
+  <data name="cust_cbo_unfold" xml:space="preserve">
+    <value>Unfold</value>
+  </data>
+  <data name="cust_cbo_slide" xml:space="preserve">
+    <value>Slide</value>
+  </data>
+  <data name="cust_cbo_fade" xml:space="preserve">
+    <value>Fade</value>
+  </data>
+  <data name="cust_msg_delete" xml:space="preserve">
+    <value>Are you sure you want to delete the &lt;barname&gt; toolbar?</value>
+  </data>
+  <data name="cust_mnu_addremove" xml:space="preserve">
+    <value>&amp;Add or Remove Buttons</value>
+  </data>
+  <data name="cust_mnu_reset" xml:space="preserve">
+    <value>Reset Bar</value>
+  </data>
+  <data name="cust_mnu_cust" xml:space="preserve">
+    <value>Customize...</value>
+  </data>
+  <data name="cust_mnu_tooltip" xml:space="preserve">
+    <value>Bar Options</value>
+  </data>
+  <data name="barname_caption" xml:space="preserve">
+    <value>New Toolbar</value>
+  </data>
+  <data name="barrename_caption" xml:space="preserve">
+    <value>Rename Toolbar</value>
+  </data>
+  <data name="barname_name" xml:space="preserve">
+    <value>&amp;Toolbar Name:</value>
+  </data>
+  <data name="barname_ok" xml:space="preserve">
+    <value>OK</value>
+  </data>
+  <data name="barname_cancel" xml:space="preserve">
+    <value>Cancel</value>
+  </data>
+  <data name="barname_msginvalidname" xml:space="preserve">
+    <value>Toolbar name cannot be empty.</value>
+  </data>
+  <data name="mdisystt_minimize" xml:space="preserve">
+    <value>Minimize</value>
+  </data>
+  <data name="mdisystt_restore" xml:space="preserve">
+    <value>Restore</value>
+  </data>
+  <data name="mdisystt_close" xml:space="preserve">
+    <value>Close</value>
+  </data>
+  <data name="mdisysmenu_restore" xml:space="preserve">
+    <value>Restore</value>
+  </data>
+  <data name="mdisysmenu_move" xml:space="preserve">
+    <value>Move</value>
+  </data>
+  <data name="mdisysmenu_size" xml:space="preserve">
+    <value>Size</value>
+  </data>
+  <data name="mdisysmenu_minimize" xml:space="preserve">
+    <value>Minimize</value>
+  </data>
+  <data name="mdisysmenu_maximize" xml:space="preserve">
+    <value>Maximize</value>
+  </data>
+  <data name="mdisysmenu_close" xml:space="preserve">
+    <value>Close</value>
+  </data>
+  <data name="mdisysmenu_next" xml:space="preserve">
+    <value>Next</value>
+  </data>
+  <data name="barsys_autohide_tooltip" xml:space="preserve">
+    <value>Auto-Hide</value>
+  </data>
+  <data name="barsys_customize_tooltip" xml:space="preserve">
+    <value>Customize</value>
+  </data>
+  <data name="barsys_close_tooltip" xml:space="preserve">
+    <value>Close</value>
+  </data>
+  <data name="sys_morebuttons" xml:space="preserve">
+    <value>More Buttons</value>
+  </data>
+  <data name="sys_custombar" xml:space="preserve">
+    <value>Custom Bar</value>
+  </data>
+  <data name="navbar_showmorebuttons" xml:space="preserve">
+    <value>Show &amp;More Buttons</value>
+  </data>
+  <data name="navbar_showfewerbuttons" xml:space="preserve">
+    <value>Show &amp;Fewer Buttons</value>
+  </data>
+  <data name="navbar_navpaneoptions" xml:space="preserve">
+    <value>Na&amp;vigation Pane Options...</value>
+  </data>
+  <data name="navPaneCollapseTooltip" xml:space="preserve">
+    <value>Collapse the Navigation Pane</value>
+  </data>
+  <data name="navPaneExpandTooltip" xml:space="preserve">
+    <value>Expand the Navigation Pane</value>
+  </data>
+  <data name="colorpicker_themecolorslabel" xml:space="preserve">
+    <value>Theme Colors</value>
+  </data>
+  <data name="colorpicker_standardcolorslabel" xml:space="preserve">
+    <value>Standard Colors</value>
+  </data>
+  <data name="colorpicker_morecolors" xml:space="preserve">
+    <value>&amp;More Colors...</value>
+  </data>
+  <data name="colorpickerdialog_caption" xml:space="preserve">
+    <value>Colors</value>
+  </data>
+  <data name="colorpickerdialog_okbutton" xml:space="preserve">
+    <value>OK</value>
+  </data>
+  <data name="colorpickerdialog_cancelbutton" xml:space="preserve">
+    <value>Cancel</value>
+  </data>
+  <data name="colorpickerdialog_newcolorlabel" xml:space="preserve">
+    <value>New</value>
+  </data>
+  <data name="colorpickerdialog_currentcolorlabel" xml:space="preserve">
+    <value>Current</value>
+  </data>
+  <data name="colorpickerdialog_standardcolorslabel" xml:space="preserve">
+    <value>Colors:</value>
+  </data>
+  <data name="colorpickerdialog_customcolorslabel" xml:space="preserve">
+    <value>Colors:</value>
+  </data>
+  <data name="colorpickerdialog_greenlabel" xml:space="preserve">
+    <value>&amp;Green:</value>
+  </data>
+  <data name="colorpickerdialog_bluelabel" xml:space="preserve">
+    <value>&amp;Blue:</value>
+  </data>
+  <data name="colorpickerdialog_redlabel" xml:space="preserve">
+    <value>&amp;Red:</value>
+  </data>
+  <data name="colorpickerdialog_tabstandard" xml:space="preserve">
+    <value>Standard</value>
+  </data>
+  <data name="colorpickerdialog_tabcustom" xml:space="preserve">
+    <value>Custom</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/PROMS/Formats/Formats.csproj b/PROMS/Formats/Formats.csproj
index af78045a..eee64d01 100644
--- a/PROMS/Formats/Formats.csproj
+++ b/PROMS/Formats/Formats.csproj
@@ -48,7 +48,7 @@
   <ItemGroup>
     <Reference Include="DevComponents.DotNetBar2, Version=14.1.0.37, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\Program Files (x86)\DotNetBar for Windows Forms\DevComponents.DotNetBar2.dll</HintPath>
+      <HintPath>..\..\..\..\3rdPartyLibraries\DotNetBar\DotNetBar4.8.1Build\DevComponents.DotNetBar2.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
@@ -575,7 +575,9 @@
     <Content Include="genmacall\wstdev.svg" />
     <Content Include="genmacall\wstsam.svg" />
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <WCFMetadata Include="Connected Services\" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/PROMS/RoAccessToSql/RoAccessToSql.csproj b/PROMS/RoAccessToSql/RoAccessToSql.csproj
index 9bdd03e9..544f8f3a 100644
--- a/PROMS/RoAccessToSql/RoAccessToSql.csproj
+++ b/PROMS/RoAccessToSql/RoAccessToSql.csproj
@@ -43,7 +43,7 @@
   <ItemGroup>
     <Reference Include="DevComponents.DotNetBar2, Version=14.1.0.37, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\Program Files (x86)\DotNetBar for Windows Forms\DevComponents.DotNetBar2.dll</HintPath>
+      <HintPath>..\..\..\..\3rdPartyLibraries\DotNetBar\DotNetBar4.8.1Build\DevComponents.DotNetBar2.dll</HintPath>
     </Reference>
     <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
diff --git a/PROMS/VEPROMS User Interface/VEPROMS_UI.csproj b/PROMS/VEPROMS User Interface/VEPROMS_UI.csproj
index 4fefad85..05d5f8d4 100644
--- a/PROMS/VEPROMS User Interface/VEPROMS_UI.csproj	
+++ b/PROMS/VEPROMS User Interface/VEPROMS_UI.csproj	
@@ -103,12 +103,13 @@
     <Reference Include="C1.Win.C1Command.2, Version=2.0.20213.532, Culture=neutral, PublicKeyToken=e808566f358766d8" />
     <Reference Include="C1.Win.C1FlexGrid.2, Version=2.0.20213.532, Culture=neutral, PublicKeyToken=79882d576c6336da, processorArchitecture=MSIL" />
     <Reference Include="C1.Win.C1Input.2, Version=2.0.20213.532, Culture=neutral, PublicKeyToken=7e7ff60f0c214f9a, processorArchitecture=MSIL" />
-    <Reference Include="Csla">
-      <HintPath>..\..\..\..\3rdPartyLibraries\CSLA\Csla.dll</HintPath>
+    <Reference Include="Csla, Version=2.1.4.0, Culture=neutral, PublicKeyToken=93be5fdc093e4c30, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\3rdPartyLibraries\CSLA\CSLA20cs_DLL_Net_4.8.1_Build\Csla.dll</HintPath>
     </Reference>
     <Reference Include="DevComponents.DotNetBar2, Version=14.1.0.37, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\Program Files (x86)\DotNetBar for Windows Forms\DevComponents.DotNetBar2.dll</HintPath>
+      <HintPath>..\..\..\..\3rdPartyLibraries\DotNetBar\DotNetBar4.8.1Build\DevComponents.DotNetBar2.dll</HintPath>
     </Reference>
     <Reference Include="Ionic.Zip, Version=1.9.1.8, Culture=neutral, PublicKeyToken=edbe51ad942a3f5c, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ContentExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ContentExt.cs
index 8f760c9a..eefa7dfe 100644
--- a/PROMS/VEPROMS.CSLA.Library/Extension/ContentExt.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Extension/ContentExt.cs
@@ -705,7 +705,7 @@ namespace VEPROMS.CSLA.Library
 								Match m = Regex.Match(newvalue, @"(\\f[0-9]+)(\\u[0-9]{1,4}\?)(\\f[0-9]+ ?)");
 								if (m == null)
 									newvalue = newvalue.Replace(@"\u916?", "^");
-								else if (m.Groups[1].Value == "" && !ContentItems[0].MyItem.MyItemInfo.MyDocVersion.MyFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta)
+								else if (m.Groups[1].Value == "" && !ContentItems[0].MyItem.MyItemInfo.MyDocVersion.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta)
 									newvalue = newvalue.Replace(@"\u916?", "^");
 								else if (m.Groups[1].Value == "")
                                 {
@@ -1420,7 +1420,7 @@ namespace VEPROMS.CSLA.Library
 							if (newvalue.Contains(@"\u916?"))
 							{
 								Match m = Regex.Match(gg, @"(\\f[0-9]+)(\\u[0-9]{1,4}\?)(\\f[0-9]+ ?)");
-								if (m.Groups.Count < 3 && !ContentItems[0].MyDocVersion.MyFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta)
+								if (m.Groups.Count < 3 && !ContentItems[0].MyDocVersion.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta)
 									newvalue = newvalue.Replace(@"\u916?", "^");
 								else if (m.Groups.Count < 3)
 									newvalue = newvalue.Replace(@"\u916?", $"{(char)916}");
diff --git a/PROMS/VEPROMS.CSLA.Library/VEPROMS.CSLA.Library.csproj b/PROMS/VEPROMS.CSLA.Library/VEPROMS.CSLA.Library.csproj
index 27ab4591..ce2d7c98 100644
--- a/PROMS/VEPROMS.CSLA.Library/VEPROMS.CSLA.Library.csproj
+++ b/PROMS/VEPROMS.CSLA.Library/VEPROMS.CSLA.Library.csproj
@@ -83,12 +83,13 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Csla">
-      <HintPath>..\..\..\..\3rdPartyLibraries\CSLA\Csla.dll</HintPath>
+    <Reference Include="Csla, Version=2.1.4.0, Culture=neutral, PublicKeyToken=93be5fdc093e4c30, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\3rdPartyLibraries\CSLA\CSLA20cs_DLL_Net_4.8.1_Build\Csla.dll</HintPath>
     </Reference>
     <Reference Include="DevComponents.DotNetBar2, Version=14.1.0.37, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\Program Files (x86)\DotNetBar for Windows Forms\DevComponents.DotNetBar2.dll</HintPath>
+      <HintPath>..\..\..\..\3rdPartyLibraries\DotNetBar\DotNetBar4.8.1Build\DevComponents.DotNetBar2.dll</HintPath>
     </Reference>
     <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
diff --git a/PROMS/Volian.Base.Library/Volian.Base.Library.csproj b/PROMS/Volian.Base.Library/Volian.Base.Library.csproj
index 8c135c78..f3da488c 100644
--- a/PROMS/Volian.Base.Library/Volian.Base.Library.csproj
+++ b/PROMS/Volian.Base.Library/Volian.Base.Library.csproj
@@ -66,7 +66,7 @@
   <ItemGroup>
     <Reference Include="DevComponents.DotNetBar2, Version=14.1.0.37, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\Program Files (x86)\DotNetBar for Windows Forms\DevComponents.DotNetBar2.dll</HintPath>
+      <HintPath>..\..\..\..\3rdPartyLibraries\DotNetBar\DotNetBar4.8.1Build\DevComponents.DotNetBar2.dll</HintPath>
     </Reference>
     <Reference Include="EnvDTE, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
     <Reference Include="EnvDTE80, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
diff --git a/PROMS/Volian.Controls.Library/Volian.Controls.Library.csproj b/PROMS/Volian.Controls.Library/Volian.Controls.Library.csproj
index 8a80731b..ef3e5f12 100644
--- a/PROMS/Volian.Controls.Library/Volian.Controls.Library.csproj
+++ b/PROMS/Volian.Controls.Library/Volian.Controls.Library.csproj
@@ -89,12 +89,13 @@
     </Reference>
     <Reference Include="C1.Win.C1FlexGrid.2, Version=2.0.20213.532, Culture=neutral, PublicKeyToken=79882d576c6336da, processorArchitecture=MSIL" />
     <Reference Include="C1.Win.C1SpellChecker.2, Version=2.0.20213.532, Culture=neutral, PublicKeyToken=79882d576c6336da, processorArchitecture=MSIL" />
-    <Reference Include="Csla">
-      <HintPath>..\..\..\..\3rdPartyLibraries\CSLA\Csla.dll</HintPath>
+    <Reference Include="Csla, Version=2.1.4.0, Culture=neutral, PublicKeyToken=93be5fdc093e4c30, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\3rdPartyLibraries\CSLA\CSLA20cs_DLL_Net_4.8.1_Build\Csla.dll</HintPath>
     </Reference>
     <Reference Include="DevComponents.DotNetBar2, Version=14.1.0.37, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\Program Files (x86)\DotNetBar for Windows Forms\DevComponents.DotNetBar2.dll</HintPath>
+      <HintPath>..\..\..\..\3rdPartyLibraries\DotNetBar\DotNetBar4.8.1Build\DevComponents.DotNetBar2.dll</HintPath>
     </Reference>
     <Reference Include="EnvDTE, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <SpecificVersion>False</SpecificVersion>
diff --git a/PROMS/Volian.Print.Library/Volian.Print.Library.csproj b/PROMS/Volian.Print.Library/Volian.Print.Library.csproj
index 0eefd34f..d272fbe1 100644
--- a/PROMS/Volian.Print.Library/Volian.Print.Library.csproj
+++ b/PROMS/Volian.Print.Library/Volian.Print.Library.csproj
@@ -66,8 +66,9 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="C1.Win.C1FlexGrid.2, Version=2.0.20213.532, Culture=neutral, PublicKeyToken=79882d576c6336da, processorArchitecture=MSIL" />
-    <Reference Include="Csla">
-      <HintPath>..\..\..\..\3rdPartyLibraries\CSLA\Csla.dll</HintPath>
+    <Reference Include="Csla, Version=2.1.4.0, Culture=neutral, PublicKeyToken=93be5fdc093e4c30, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\3rdPartyLibraries\CSLA\CSLA20cs_DLL_Net_4.8.1_Build\Csla.dll</HintPath>
     </Reference>
     <Reference Include="FlexableMessageBox">
       <HintPath>..\FlexableMessageBox\bin\Debug\FlexableMessageBox.dll</HintPath>
diff --git a/PROMS/csla20cs-2.1.4-070223/csla20cs/csla20cs/Csla/Csla.csproj b/PROMS/csla20cs-2.1.4-070223/csla20cs/csla20cs/Csla/Csla.csproj
index 27247cbd..14ceb0b1 100644
--- a/PROMS/csla20cs-2.1.4-070223/csla20cs/csla20cs/Csla/Csla.csproj
+++ b/PROMS/csla20cs-2.1.4-070223/csla20cs/csla20cs/Csla/Csla.csproj
@@ -12,12 +12,13 @@
     <AssemblyName>Csla</AssemblyName>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>CslaKey.snk</AssemblyOriginatorKeyFile>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
     <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -29,6 +30,7 @@
     <WarningLevel>4</WarningLevel>
     <RunCodeAnalysis>false</RunCodeAnalysis>
     <DocumentationFile>bin\Debug\Csla.XML</DocumentationFile>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -37,6 +39,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -173,12 +176,8 @@
     <Compile Include="Web\InsertObjectArgs.cs" />
     <Compile Include="Web\SelectObjectArgs.cs" />
     <Compile Include="Web\UpdateObjectArgs.cs" />
-    <Compile Include="Windows\BindingSourceRefresh.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="Windows\ReadWriteAuthorization.cs">
-      <SubType>Component</SubType>
-    </Compile>
+    <Compile Include="Windows\BindingSourceRefresh.cs" />
+    <Compile Include="Windows\ReadWriteAuthorization.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="CslaKey.snk" />
diff --git a/PROMS/csla20cs-2.1.4-070223/csla20cs/csla20cs/Csla/Properties/Resources.Designer.cs b/PROMS/csla20cs-2.1.4-070223/csla20cs/csla20cs/Csla/Properties/Resources.Designer.cs
index a943293f..dc077079 100644
--- a/PROMS/csla20cs-2.1.4-070223/csla20cs/csla20cs/Csla/Properties/Resources.Designer.cs
+++ b/PROMS/csla20cs-2.1.4-070223/csla20cs/csla20cs/Csla/Properties/Resources.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18408
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -19,7 +19,7 @@ namespace Csla.Properties {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
diff --git a/PROMS/csla20cs-2.1.4-070223/csla20cs/csla20cs/Csla/Properties/Settings.Designer.cs b/PROMS/csla20cs-2.1.4-070223/csla20cs/csla20cs/Csla/Properties/Settings.Designer.cs
index 1016da97..5eaf7fad 100644
--- a/PROMS/csla20cs-2.1.4-070223/csla20cs/csla20cs/Csla/Properties/Settings.Designer.cs
+++ b/PROMS/csla20cs-2.1.4-070223/csla20cs/csla20cs/Csla/Properties/Settings.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18408
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -12,7 +12,7 @@ namespace Csla.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
diff --git a/PROMS/csla20cs-2.1.4-070223/csla20cs/csla20cs/Csla/Web References/WebServiceHost/Reference.cs b/PROMS/csla20cs-2.1.4-070223/csla20cs/csla20cs/Csla/Web References/WebServiceHost/Reference.cs
index 60795ad3..02fa2abb 100644
--- a/PROMS/csla20cs-2.1.4-070223/csla20cs/csla20cs/Csla/Web References/WebServiceHost/Reference.cs	
+++ b/PROMS/csla20cs-2.1.4-070223/csla20cs/csla20cs/Csla/Web References/WebServiceHost/Reference.cs	
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18408
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -9,7 +9,7 @@
 //------------------------------------------------------------------------------
 
 // 
-// This source code was auto-generated by Microsoft.VSDesigner, Version 4.0.30319.18408.
+// This source code was auto-generated by Microsoft.VSDesigner, Version 4.0.30319.42000.
 // 
 #pragma warning disable 1591
 
@@ -23,7 +23,7 @@ namespace Csla.WebServiceHost {
     
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.18408")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     [System.Web.Services.WebServiceBindingAttribute(Name="WebServicePortalSoap", Namespace="http://ws.lhotka.net/Csla")]
@@ -227,11 +227,11 @@ namespace Csla.WebServiceHost {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.18408")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")]
     public delegate void CreateCompletedEventHandler(object sender, CreateCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.18408")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     public partial class CreateCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -253,11 +253,11 @@ namespace Csla.WebServiceHost {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.18408")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")]
     public delegate void FetchCompletedEventHandler(object sender, FetchCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.18408")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     public partial class FetchCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -279,11 +279,11 @@ namespace Csla.WebServiceHost {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.18408")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")]
     public delegate void UpdateCompletedEventHandler(object sender, UpdateCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.18408")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     public partial class UpdateCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
@@ -305,11 +305,11 @@ namespace Csla.WebServiceHost {
     }
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.18408")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")]
     public delegate void DeleteCompletedEventHandler(object sender, DeleteCompletedEventArgs e);
     
     /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.18408")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.9032.0")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     public partial class DeleteCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
diff --git a/PROMS/csla20cs-2.1.4-070223/csla20cs/csla20cs/Csla/app.config b/PROMS/csla20cs-2.1.4-070223/csla20cs/csla20cs/Csla/app.config
index 7eb143a4..d4167840 100644
--- a/PROMS/csla20cs-2.1.4-070223/csla20cs/csla20cs/Csla/app.config
+++ b/PROMS/csla20cs-2.1.4-070223/csla20cs/csla20cs/Csla/app.config
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <configSections>
-        <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
-            <section name="Csla.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+        <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+            <section name="Csla.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
         </sectionGroup>
     </configSections>
     <applicationSettings>
@@ -12,4 +12,4 @@
             </setting>
         </Csla.Properties.Settings>
     </applicationSettings>
-</configuration>
\ No newline at end of file
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/></startup></configuration>
diff --git a/PROMS/csla20cs-2.1.4-070223/csla20cs/csla20cs/cslacs.sln b/PROMS/csla20cs-2.1.4-070223/csla20cs/csla20cs/cslacs.sln
index 5a2886d1..efd2ead2 100644
--- a/PROMS/csla20cs-2.1.4-070223/csla20cs/csla20cs/cslacs.sln
+++ b/PROMS/csla20cs-2.1.4-070223/csla20cs/csla20cs/cslacs.sln
@@ -1,6 +1,8 @@
 
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.35706.149
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Csla", "Csla\Csla.csproj", "{9DA591ED-C570-47AC-8E5D-35B039E07973}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F19F70D9-566D-4303-B0CD-69327F32FCFF}"
@@ -23,6 +25,9 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {3DB3F350-552A-4162-8E47-3117D986B11F}
+	EndGlobalSection
 	GlobalSection(TestCaseManagementSettings) = postSolution
 		CategoryFile = cslacs.vsmdi
 	EndGlobalSection